diff --git a/.gitattributes b/.gitattributes
index 9fa544d91af..e71d3421e43 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,6 +3,9 @@
 *.vcproj     eol=crlf
 *.vcxproj*   eol=crlf
 
+src/shared/revision_nr.h eol=lf
+src/shared/revision_sql.h eol=lf
+
 # Whitespace rules
 # strict (no trailing, no tabs)
 *.cpp        whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
diff --git a/.gitignore b/.gitignore
index 3f09f30388e..23c653b0165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ tags
 TAGS
 !.gitignore
 !.gitattributes
+!.travis.yml
 
 #
 # Build generated files
@@ -39,6 +40,7 @@ autom4te.cache
 *~
 *.bak
 *.orig
+*.rej
 *.patch
 callgrind.out.*
 
@@ -52,6 +54,11 @@ patches-*
 # VS binaries output
 #
 bin/*
+*win32_Debug*
+*win32_Release*
+*x64_Debug*
+*x64_Release*
+win/*/*.log
 
 #
 # VS temporary files
@@ -64,6 +71,10 @@ bin/*
 *.vsp
 ipch
 *.user
+*.obj
+*.pdb
+*.tlog
+
 
 #
 # CMake temporary files
@@ -72,6 +83,11 @@ CMakeFiles
 CMakeCache.txt
 cmake_install.cmake
 
+#
+# System-internal temporary files
+#
+config.h
+
 #
 # OS specific
 #
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000000..e5b1f726b8e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/bindings/ScriptDev2"]
+	path = src/bindings/ScriptDev2
+	url = git://github.com/mangosR2/scriptdev2.git
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000000..993383ee529
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+language: cpp
+
+branches:
+  only:
+    - mangosr2-wotlk_ai
+
+compiler:
+  - gcc
+  - clang
+
+script:
+  - test -d _build || mkdir _build
+  - test -d _install || mkdir _install
+  - cd _build
+  - cmake -DPCH=1 -DCMAKE_INSTALL_PREFIX=../_install ..
+  - make -j4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a30019d849b..b6c080e3eb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,6 @@
 #
 
 project(MaNGOS)
-set(MANGOS_VERSION 0.17.0)
 
 # CMake policies
 cmake_minimum_required(VERSION 2.8)
@@ -27,6 +26,78 @@ set(CMAKE_MODULE_PATH
   ${CMAKE_SOURCE_DIR}/cmake
 )
 
+# define all options here
+option(DEBUG                "Debug mode"                            OFF)
+option(TBB_USE_EXTERNAL     "Use external TBB"                      OFF)
+#option(USE_STD_MALLOC       "Use standard malloc instead of TBB"    OFF)
+#option(USE_TBB_MALLOC       "Use included TBB malloc"               OFF)
+option(ACE_USE_EXTERNAL     "Use external ACE"                      ON)
+
+if(WIN32)
+  if(PLATFORM MATCHES X86) # 32-bit
+    option(USE_FASTMM_MALLOC "Use included FastMM malloc (default for win*)" 1)
+    option(USE_STD_MALLOC "Use standard malloc instead of TBB" 0)
+  else() # 64-bit
+    option(USE_STD_MALLOC "Use standard malloc instead of TBB" 0)
+    option(USE_FASTMM_MALLOC "Use included FastMM malloc (default for win*)" 1)
+  endif()
+else()
+#Unix and other platforms
+  option(USE_STD_MALLOC "Use standard malloc instead of TBB" 1)
+endif()
+
+option(POSTGRESQL           "Use PostgreSQL"                        OFF)
+
+if(PCHSupport_FOUND AND WIN32) # TODO: why only enable it on windows by default?
+  option(PCH                "Use precompiled headers"               ON)
+else()
+  option(PCH                "Use precompiled headers"               OFF)
+endif()
+# TODO: options that should be checked/created:
+#option(CLI                  "With CLI"                              ON)
+#option(RA                   "With Remote Access"                    OFF)
+#option(SQL                  "Copy SQL files"                        OFF)
+#option(TOOLS                "Build tools"                           OFF)
+
+find_package(PCHSupport)
+
+# Add options for compile of mangos
+if(PCHSupport_FOUND)
+  if(WIN32)
+    option(PCH "Use precompiled headers" 1)
+  else()
+    option(PCH "Use precompiled headers" 0)
+  endif()
+endif()
+
+# FIXME: options that should be checked
+# option(SQL "Copy SQL files" 0)
+# option(TOOLS "Build tools" 0)
+
+# Output description of this script
+message("")
+message(
+  "This script builds the MangosR2 server.
+  Options that can be used in order to configure the process:
+    CMAKE_INSTALL_PREFIX    Path where the server should be installed to
+    PCH                     Use precompiled headers
+    DEBUG                   Debug mode
+    INCLUDE_BINDINGS_DIR    Include a script library in src/bindings/ with the
+                            defined name. the name must corespond to the name of
+                            the folder and the folder must contain a valid
+                            CMakeLists.txt
+    TBB_USE_EXTERNAL        Use external TBB
+    USE_STD_MALLOC          Use standard malloc (default for *NIX)
+    USE_TBB_MALLOC          Use TBB malloc (not recommended)
+    USE_FASTMM_MALLOC       Use included FastMM malloc (default for win*)
+    ACE_USE_EXTERNAL        Use external ACE (default. usage included ACE not recommended, possible only for win*)
+
+  To set an option simply type -D<OPTION>=<VALUE> after 'cmake <srcs>'.
+  Also, you can specify the generator with -G. see 'cmake --help' for more details
+  For example: cmake .. -DDEBUG=1 -DCMAKE_INSTALL_PREFIX=/opt/mangos"
+)
+message("")
+
 # Force out-of-source build
 string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" BUILDING_IN_SOURCE)
 if(BUILDING_IN_SOURCE)
@@ -59,11 +130,11 @@ endif()
 message(
   "\nThis script builds the MaNGOS server.
   Options that can be used in order to configure the process:
-    PREFIX: Path where the server should be installed to
+    CMAKE_INSTALL_PREFIX: Path where the server should be installed to
     PCH: Use precompiled headers
     DEBUG: Debug mode
   To set an option simply type -D<OPTION>=<VALUE> after 'cmake <srcs>'.
-  For example: cmake .. -DDEBUG=1 -DPREFIX=/opt/mangos\n"
+  For example: cmake .. -DDEBUG=1 -DCMAKE_INSTALL_PREFIX=/opt/mangos\n"
 ) # TODO: PLATFORM: Sets the architecture for compile (X86,X64)
 
 # Override configuration-types - we don't use anything else than debug and release
@@ -97,41 +168,12 @@ endif()
 #   endif()
 # endif()
 
-option(DEBUG "Debug mode" 0)
-# option(CLI "With CLI" 1) # Not used by MaNGOS so far
-# option(RA "With Remote Access" 0) # TODO: support remote access
-option(TBB_USE_EXTERNAL "Use external TBB" 0)
-option(USE_STD_MALLOC "Use standard malloc instead of TBB" 0)
-option(ACE_USE_EXTERNAL "Use external ACE" 0)
 
-find_package(PCHSupport)
 
-# Add options for compile of mangos
-if(PCHSupport_FOUND)
-  if(WIN32)
-    option(PCH "Use precompiled headers" 1)
-  else()
-    option(PCH "Use precompiled headers" 0)
-  endif()
-endif()
-
-# FIXME: options that should be checked
-# option(SQL "Copy SQL files" 0)
-# option(TOOLS "Build tools" 0)
 
-# Set up the install-prefix
-if(CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
-  get_filename_component(PREFIX_ABSOLUTE "../mangos-server" ABSOLUTE)
-  set(CMAKE_INSTALL_PREFIX ${PREFIX_ABSOLUTE} CACHE PATH "Install path prefix." FORCE)
-endif()
+# TODO: remove this in the future! it has only been added to make the switch easier for end users
 if(PREFIX)
-  if(!WIN32)
-    string(REGEX REPLACE "^~" "$ENV{HOME}" PREFIX ${PREFIX})
-  endif()
-  get_filename_component(PREFIX_ABSOLUTE ${PREFIX} ABSOLUTE)
-  set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix." FORCE)
-else()
-  set(PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Install path prefix.")
+  message(FATAL_ERROR "The parameter PREFIX has been removed. Please re-run CMake and use CMAKE_INSTALL_PREFIX instead to define your installation location!")
 endif()
 
 set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
@@ -170,7 +212,7 @@ else()
   include(cmake/ImportACE.cmake)
 endif()
 
-if(NOT USE_STD_MALLOC)
+if(USE_TBB_MALLOC)
   unset(TBB_INCLUDE_DIR CACHE)
   unset(TBB_LIBRARIES CACHE)
   unset(TBB_LIBRARIES_DIR CACHE)
@@ -202,7 +244,17 @@ endif()
 
 # *nix-specific packages
 if(UNIX)
-  find_package(MySQL REQUIRED)
+  if(POSTGRESQL)
+    find_package(PostgreSQL REQUIRED)
+
+    if(POSTGRESQL_FOUND)
+      include_directories(${POSTGRESQL_INCLUDE_DIRS})
+    endif(POSTGRESQL_FOUND)
+
+  else()
+    find_package(MySQL REQUIRED)
+  endif()
+
   find_package(OpenSSL REQUIRED)
   find_package(ZLIB REQUIRED)
 endif()
@@ -284,8 +336,8 @@ endif()
 if(UNIX)
   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} --no-warnings")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} --no-warnings")
-  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra")
+  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wfatal-errors")
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wfatal-errors")
 elseif(WIN32)
   # Disable warnings in Visual Studio 8 and above and add /MP
   if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
@@ -398,24 +450,31 @@ if(XCODE)
   endif()
 endif()
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
 
 add_subdirectory(dep) # TODO: add vmap extractor build support
 
 # Add definitions for all build types
 # Don't place this above 'dep' subdirectory! Because of defines build will crash.
-set(DEFINITIONS
-  DO_MYSQL
-  HAVE_CONFIG_H
-  VERSION="${MANGOS_VERSION}"
-  SYSCONFDIR="${CONF_DIR}/"
-)
+if (UNIX)
+    set(DEFINITIONS DO_MYSQL SYSCONFDIR="${CONF_DIR}/")
+else()
+    set(DEFINITIONS DO_MYSQL SYSCONFDIR="../etc/")
+endif()
+
+if(POSTGRESQL)
+  set(DEFINITIONS ${DEFINITIONS} DO_POSTGRESQL)
+else()
+  set(DEFINITIONS ${DEFINITIONS} DO_MYSQL)
+endif()
+
 set(DEFINITIONS_RELEASE NDEBUG)
 set(DEFINITIONS_DEBUG _DEBUG MANGOS_DEBUG)
 if(WIN32)
   set(DEFINITIONS ${DEFINITIONS} WIN32 _WIN32)
   set(DEFINITIONS_RELEASE ${DEFINITIONS_RELEASE} _CRT_SECURE_NO_WARNINGS)
 endif()
+
 if(USE_STD_MALLOC)
   set(DEFINITIONS ${DEFINITIONS} USE_STANDARD_MALLOC)
 endif()
@@ -427,4 +486,4 @@ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_DEBUG "${DEFINITIONS_DEB
 add_subdirectory(src)
 # if(SQL)
 #   add_subdirectory(sql)
-# endif()
\ No newline at end of file
+# endif()
diff --git a/README.md b/README.md
new file mode 100644
index 00000000000..6b620ba28bf
--- /dev/null
+++ b/README.md
@@ -0,0 +1,30 @@
+= AI Playerbot -- README =
+
+This is a fork of playerbot with completely different AI based on strategies.
+Documentation can be found in doc/playerbot folder 
+
+Copyright (C) 2005-2012 MaNGOS project <http://getmangos.com/>
+
+MaNGOS is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+In addition, as a special exception, the MaNGOS project
+gives permission to link the code of its release of MaNGOS with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.
\ No newline at end of file
diff --git a/VERSION b/VERSION
new file mode 100644
index 00000000000..31172faa04d
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.2-random-bots
\ No newline at end of file
diff --git a/cmake/FindPCHSupport.cmake b/cmake/FindPCHSupport.cmake
index a75940eb441..3593cd79117 100644
--- a/cmake/FindPCHSupport.cmake
+++ b/cmake/FindPCHSupport.cmake
@@ -17,13 +17,13 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
         ARGS  ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
         OUTPUT_VARIABLE gcc_compiler_version)
     #MESSAGE("GCC Version: ${gcc_compiler_version}")
-    IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
+    IF(gcc_compiler_version MATCHES "4\\.[0-9](\\.[0-9])?")
         SET(PCHSupport_FOUND TRUE)
-    ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
-        IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
+    ELSE(gcc_compiler_version MATCHES "4\\.[0-9](\\.[0-9])?")
+        IF(gcc_compiler_version MATCHES "3\\.4(\\.[0-9])?")
             SET(PCHSupport_FOUND TRUE)
-        ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
-    ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
+        ENDIF(gcc_compiler_version MATCHES "3\\.4(\\.[0-9])?")
+    ENDIF(gcc_compiler_version MATCHES "4\\.[0-9](\\.[0-9])?")
 
   SET(_PCH_include_prefix "-I")
 
@@ -270,6 +270,8 @@ MACRO(GET_NATIVE_PRECOMPILED_HEADER _targetName _input)
     endif(EXISTS ${${_targetName}_pch})
   endif(CMAKE_GENERATOR MATCHES Visual*)
 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500")
+
 ENDMACRO(GET_NATIVE_PRECOMPILED_HEADER)
 
 
diff --git a/cmake/mingw32-i686.cmake b/cmake/mingw32-i686.cmake
new file mode 100644
index 00000000000..55bc3aede50
--- /dev/null
+++ b/cmake/mingw32-i686.cmake
@@ -0,0 +1,19 @@
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME      Windows)
+SET(CMAKE_SYSTEM_PROCESSOR i686)
+SET(COMPILER_PREFIX ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32)
+
+# which compilers to use for C and C++ and ASM-ATT
+find_program(CMAKE_RC_COMPILER NAMES ${COMPILER_PREFIX}-windres)
+find_program(CMAKE_C_COMPILER NAMES ${COMPILER_PREFIX}-gcc)
+find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
+find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-as)
+
+SET(CMAKE_FIND_ROOT_PATH  /usr/${COMPILER_PREFIX} ${USER_ROOT_PATH})
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search 
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/cmake/mingw32-x86_64.cmake b/cmake/mingw32-x86_64.cmake
new file mode 100644
index 00000000000..60d03806c9e
--- /dev/null
+++ b/cmake/mingw32-x86_64.cmake
@@ -0,0 +1,19 @@
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME      Windows)
+SET(CMAKE_SYSTEM_PROCESSOR x86_64)
+SET(COMPILER_PREFIX ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32)
+
+# which compilers to use for C and C++
+find_program(CMAKE_RC_COMPILER NAMES ${COMPILER_PREFIX}-windres)
+find_program(CMAKE_C_COMPILER NAMES ${COMPILER_PREFIX}-gcc)
+find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
+find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-as)
+
+SET(CMAKE_FIND_ROOT_PATH  /usr/${COMPILER_PREFIX} ${USER_ROOT_PATH})
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search 
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/config.h b/config.h
new file mode 100644
index 00000000000..87712bdc097
--- /dev/null
+++ b/config.h
@@ -0,0 +1,10 @@
+#ifndef MANGOS_CONFIG_H
+#define MANGOS_CONFIG_H
+
+#define HAVE_ACE_STACK_TRACE_H
+
+#define MANGOS_VERSION "0.17"
+
+#define CLIENT_VERSION 12340
+
+#endif /* MANGOS_CONFIG_H */
diff --git a/config.h.cmake b/config.h.cmake
index ecda10fd2bd..7e8e3e51c44 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,10 +1,10 @@
-#ifndef HAVE_CONFIG_H
-#define HAVE_CONFIG_H
+#ifndef MANGOS_CONFIG_H
+#define MANGOS_CONFIG_H
 
 #cmakedefine HAVE_ACE_STACK_TRACE_H
 
-#cmakedefine USE_MULTI_THREAD_MAP
+#define MANGOS_VERSION "0.17"
 
-#define VERSION "${MANGOS_VERSION}"
+#define CLIENT_VERSION 12340
 
-#endif /* HAVE_CONFIG_H */
+#endif /* MANGOS_CONFIG_H */
diff --git a/contrib/ACE_external/ace-tao.spec b/contrib/ACE_external/ace-tao.spec
new file mode 100644
index 00000000000..3f27ddc4727
--- /dev/null
+++ b/contrib/ACE_external/ace-tao.spec
@@ -0,0 +1,2566 @@
+# Set the version number here.
+%define ACEVER  6.1.1
+%define TAOVER  2.1.1
+%define CIAOVER 1.1.1
+
+# Conditional build
+# Default values are
+#                    --with ipv6         (IPv6 support)
+#                    --with opt          (Optimized build)
+#                    --with zlib         (Zlib compressor)
+#                    --with bzip2        (Bzip2 compressor)
+#                    --without autoconf  (Use MPC to build)
+#                    --without fltk      (No ftlk support)
+#                    --without tk        (No tk support)
+#                    --without xt        (No xt support)
+#                    --without fox       (No fox support)
+#                    --without qt        (No qt support)
+#                    --without inline    (Code inlining disabled)
+#                    --without versioned (Versioned namespace)
+
+#
+# Read: If neither macro exists, then add the default definition.
+%{!?_with_ipv6: %{!?_without_ipv6: %define _with_ipv6 --with-ipv6}}
+%{!?_with_opt: %{!?_without_opt: %define _with_opt --with-opt}}
+%{!?_with_zlib: %{!?_without_zlib: %define _with_zlib --with-zlib}}
+%{!?_with_bzip2: %{!?_without_bzip2: %define _with_bzip2 --with-bzip2}}
+%{!?_with_ftlk: %{!?_without_ftlk: %define _without_ftlk --without-ftlk}}
+%{!?_with_tk: %{!?_without_tk: %define _without_tk --without-tk}}
+%{!?_with_xt: %{!?_without_xt: %define _without_xt --without-xt}}
+%{!?_with_fox: %{!?_without_fox: %define _without_fox --without-fox}}
+%{!?_with_qt: %{!?_without_qt: %define _without_qt --without-qt}}
+%{!?_with_inline: %{!?_without_inline: %define _without_inline --without-inline}}
+%{!?_with_versioned: %{!?_without_versioned: %define _without_versioned 0}}
+#
+# Read: It's an error if both or neither required options exist.
+%{?_with_ipv6: %{?_without_ipv6: %{error: both _with_ipv6 and _without_ipv6}}}
+%{?_with_opt: %{?_without_opt: %{error: both _with_opt and _without_opt}}}
+%{?_with_zlib: %{?_without_zlib: %{error: both _with_zlib and _without_zlib}}}
+%{?_with_bzip2: %{?_without_bzip2: %{error: both _with_bzip2 and _without_bzip2}}}
+%{?_with_fltk: %{?_without_fltk: %{error: both _with_fltk and _without_fltk}}}
+%{?_with_tk: %{?_without_tk: %{error: both _with_tk and _without_tk}}}
+%{?_with_xt: %{?_without_xt: %{error: both _with_xt and _without_xt}}}
+%{?_with_fox: %{?_without_fox: %{error: both _with_fox and _without_fox}}}
+%{?_with_qt: %{?_without_qt: %{error: both _with_qt and _without_qt}}}
+%{?_with_inline: %{?_without_inline: %{error: both _with_inline and _without_inline}}}
+%{?_with_versioned: %{?_without_versioned: %{error: both _with_versioned and _without_versioned}}}
+
+%{!?skip_make:%define skip_make 0}
+%{!?make_nosrc:%define make_nosrc 0}
+
+%define have_fox 0
+
+%if %{?_with_opt:0}%{!?_with_opt:1}
+%define OPTTAG .O0
+%endif
+
+Summary:      The ADAPTIVE Communication Environment (ACE) and The ACE ORB (TAO)
+Name:         ace-tao
+Version:      %{ACEVER}
+
+%if 0%{?opensuse_bs}
+Release:      <CI_CNT>%{?OPTTAG}%{?dist}
+%else
+Release:      1%{?OPTTAG}%{?dist}
+%endif
+
+Group:        Development/Libraries/C and C++
+URL:          http://www.cs.wustl.edu/~schmidt/ACE.html
+License:      DOC License
+Source0:      http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-%{ACEVER}.tar.gz
+Source1:      ace-tao-rpmlintrc
+BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%define _extension .gz
+
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+BuildRequires: redhat-rpm-config elfutils sendmail
+%endif
+
+%if !0%{?suse_version}
+Requires(post):   /sbin/install-info
+Requires(preun):  /sbin/install-info
+Requires(postun): /sbin/ldconfig
+%else
+PreReq:         %install_info_prereq %insserv_prereq  %fillup_prereq
+PreReq:         pwdutils
+%endif
+
+%if 0%{?mdkversion}
+BuildRequires:  sendmail
+%endif
+
+BuildRequires:  openssl-devel
+BuildRequires:  gcc-c++
+BuildRequires:  libstdc++-devel
+BuildRequires:  lsb
+
+%if %{?_with_zlib:1}%{!?_with_zlib:0}
+BuildRequires:  zlib-devel
+%endif
+
+%if %{?_with_bzip2:1}%{!?_with_bzip2:0}
+BuildRequires:  bzip2
+%endif
+
+BuildRequires:  perl
+
+%if %{?_with_fltk:1}%{!?_with_fltk:0}
+BuildRequires:  fltk-devel
+%define fltk_pac ace-flreactor
+%endif
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+BuildRequires:  tcl-devel
+BuildRequires:  tk-devel
+BuildRequires:  tk
+%define tk_pac ace-tkreactor
+%define tao_tk_pac tao-tkresource
+%endif
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%define qt_pack ace-qtreactor
+%define tao_qt_pac tao-qtresource
+
+# qt3 has a name change in F9
+%if 0%{?fedora} > 8
+%define qtpacname qt3
+%else
+%define qtpacname qt
+%endif
+
+%if 0%{?suse_version}
+%define qtpacname qt3
+%endif
+
+BuildRequires:  %{qtpacname}-devel
+%endif
+
+%if %{?_with_fox:1}%{!?_with_fox:0}
+%if 0%{?suse_version} == 1020
+BuildRequires: fox16-devel
+%endif
+%define fox_pac ace_foxreactor
+%endif
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%define xt_pac ace-xtreactor
+%define tao_xt_pac tao-xtresource
+%endif
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%define tao_fl_pac tao-flresource
+%endif
+
+%if 0%{?suse_version}
+%define ace_packages ace ace-xml ace-gperf ace-kokyu
+%define tao_packages tao tao-utils tao tao-cosnaming tao-cosevent tao-cosnotification tao-costrading tao-rtevent tao-cosconcurrency
+%define all_ace_packages %{?ace_packages} %{?fltk_pac} %{?tk_pac} %{?qt_pac} %{?fox_pac} %{?xt_pac}
+%define all_tao_packages %{?tao_packages} %{?tao_fl_pac} %{?tao_qt_pac} %{?tao_xt_pac} %{?tao_tk_pac}
+%define debug_package_requires %{all_ace_packages} %{all_tao_packages}
+%endif
+
+%if %make_nosrc
+# Leave out the distro for now
+NoSource: 0
+%endif
+
+%description -n ace-tao
+
+The ADAPTIVE Communication Environment (ACE) is a freely available,
+open-source object-oriented (OO) framework that implements many core
+patterns for concurrent communication software. ACE provides a rich
+set of reusable C++ wrapper facades and framework components that
+perform common communication software tasks across a range of OS
+platforms. The communication software tasks provided by ACE include
+event demultiplexing and event handler dispatching, signal handling,
+service initialization, interprocess communication, shared memory
+management, message routing, dynamic (re)configuration of distributed
+services, concurrent execution and synchronization.
+
+TAO is a real-time implementation of CORBA built using the framework
+components and patterns provided by ACE. TAO contains the network
+interface, OS, communication protocol, and CORBA middleware components
+and features. TAO is based on the standard OMG CORBA reference model,
+with the enhancements designed to overcome the shortcomings of
+conventional ORBs for high-performance and real-time applications.
+
+# ---------------- ace ----------------
+
+%package -n     ace
+Summary:        The ADAPTIVE Communication Environment (ACE)
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       openssl
+
+%description -n ace
+
+The ADAPTIVE Communication Environment (ACE) is a freely available,
+open-source object-oriented (OO) framework that implements many core
+patterns for concurrent communication software. ACE provides a rich
+set of reusable C++ wrapper facades and framework components that
+perform common communication software tasks across a range of OS
+platforms. The communication software tasks provided by ACE include
+event demultiplexing and event handler dispatching, signal handling,
+service initialization, interprocess communication, shared memory
+management, message routing, dynamic (re)configuration of distributed
+services, concurrent execution and synchronization.
+
+# ---------------- ace-devel ----------------
+
+%package -n     ace-devel
+Summary:        Header files and development components for ACE
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace = %{ACEVER}
+Requires:       openssl-devel
+%if !0%{?suse_version}
+Provides:       perl(PerlACE::Run_Test) perl(Process) perl(VmsProcess) perl(Win32::Process)
+%endif
+
+%description -n ace-devel
+
+This package contains the components needed for developing programs
+using ACE.
+
+# ---------------- ace-xml ----------------
+
+%package -n     ace-xml
+Summary:        ACE XML Runtime Support
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace = %{ACEVER}
+
+%description -n ace-xml
+
+ACE XML Parser interfaces follows the the design of SAX 2.0, which is
+a public domain specification for Java.  The major difference between
+ACE XML Parser interfaces and SAX is that we added an reference of
+ACEXML_Env to every SAX method to accommodate platforms/compilers that
+don't support C++ exceptions.  SAX is defined by David Megginson
+<david@megginson.com>
+
+# ---------------- ace-gperf ----------------
+
+%package -n     ace-gperf
+Summary:        ACE gperf
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace = %{ACEVER}
+
+%description -n ace-gperf
+
+ACE gperf utility
+
+# ---------------- ace-xml-devel ----------------
+
+%package -n     ace-xml-devel
+Summary:        Header files and development components for ACE XML
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-devel = %{ACEVER}
+Requires:       ace-xml = %{ACEVER}
+
+%description -n ace-xml-devel
+
+This package contains the components needed for developing programs
+using ACEXML.
+
+# ---------------- ace-kokyu ----------------
+
+%package -n     ace-kokyu
+Summary:        Kokyu scheduling framework for ACE
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace = %{ACEVER}
+
+%description -n ace-kokyu
+
+Kokyu is a portable middleware scheduling framework designed to
+provide flexible scheduling and dispatching services within the
+context of higher-level middleware. Kokyu currently provides real-time
+scheduling and dispatching services for TAO's real-time Event Service
+which mediates supplier-consumer relationships between application
+operations. Kokyu also provides a scheduling and dispatching framework
+for threads. This is being used by the TAO RTCORBA 2.0 scheduler
+implementations.
+
+# ---------------- ace-kokyu-devel ----------------
+
+%package -n     ace-kokyu-devel
+Summary:        Header files and development components for the ACE Kokyu scheduler
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-devel = %{ACEVER}
+Requires:       ace-kokyu = %{ACEVER}
+
+%description -n ace-kokyu-devel
+
+This package contains the components needed for developing programs
+using Kokyu.
+
+
+# ---------------- ace-foxreactor ----------------
+
+%if %{?_with_fox:1}%{!?_with_fox:0}
+%if 0%{?have_fox} == 1
+%package -n     ace-foxreactor
+Summary:        ACE_FoxReactor for use with the FOX toolkit
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace = %{ACEVER}
+Requires:       fox16
+
+%description -n ace-foxreactor
+
+A Reactor implementation that uses the FOX toolkit for
+event demultiplexing.  This will let us integrate the FOX toolkit with
+ACE and/or TAO.
+%endif
+%endif
+
+# ---------------- ace-foxreactor-devel ----------------
+
+%if %{?_with_fox:1}%{!?_with_fox:0}
+%if 0%{?have_fox} == 1
+%package -n     ace-foxreactor-devel
+Summary:        Header files for development with ACE_FoxReactor
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-devel = %{ACEVER}
+Requires:       ace-foxreactor = %{ACEVER}
+Requires:       fox16-devel
+
+%description -n ace-foxreactor-devel
+
+This package contains the components needed for developing programs
+using the ACE_FoxReactor.
+%endif
+%endif
+
+# ---------------- ace-flreactor ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%package -n     ace-flreactor
+Summary:        ACE_FlReactor for use with the Fast-Light toolkit
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace = %{ACEVER}
+Requires:       fltk
+
+%description -n ace-flreactor
+
+A Reactor implementation that uses the Fast-Light (FL) toolkit for
+event demultiplexing.  This will let us integrate the FL toolkit with
+ACE and/or TAO.
+%endif
+
+# ---------------- ace-flreactor-devel ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%package -n     ace-flreactor-devel
+Summary:        Header files for development with ACE_FlReactor
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-devel = %{ACEVER}
+Requires:       ace-flreactor = %{ACEVER}
+Requires:       fltk-devel
+
+%description -n ace-flreactor-devel
+
+This package contains the components needed for developing programs
+using the ACE_FlReactor.
+%endif
+
+# ---------------- ace-qtreactor ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%package -n     ace-qtreactor
+Summary:        ACE_QtReactor for use with Qt library
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace = %{ACEVER}
+Requires:       qt4
+
+%description -n ace-qtreactor
+
+A Reactor implementation that uses the Qt toolkit for event
+demultiplexing.  This will let us integrate the Qt toolkit with ACE
+and/or TAO.
+%endif
+
+# ---------------- ace-qtreactor-devel ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%package -n     ace-qtreactor-devel
+Summary:        Header files for development with ACE_QtReactor
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-devel = %{ACEVER}
+Requires:       ace-qtreactor = %{ACEVER}
+Requires:       qt4-devel
+
+%description -n ace-qtreactor-devel
+
+This package contains the components needed for developing programs
+using the ACE_QtReactor.
+%endif
+
+# ---------------- ace-tkreactor ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+%package -n     ace-tkreactor
+Summary:        ACE_TkReactor for use with Tk toolkit
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace = %{ACEVER}
+Requires:       tk
+
+%description -n ace-tkreactor
+
+A Reactor implementation that uses the Tk toolkit for event
+demultiplexing.  This will let us integrate the Tk toolkit with ACE
+and/or TAO.
+%endif
+
+# ---------------- ace-tkreactor-devel ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+%package -n     ace-tkreactor-devel
+Summary:        Header files for development with ACE_TkReactor
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-devel = %{ACEVER}
+Requires:       ace-tkreactor = %{ACEVER}
+Requires:       tk-devel
+
+%description -n ace-tkreactor-devel
+
+This package contains the components needed for developing programs
+using the ACE_TkReactor.
+%endif
+
+# ---------------- ace-xtreactor ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%package -n     ace-xtreactor
+Summary:        ACE_XtReactor for use with the X Toolkit
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace = %{ACEVER}
+# The xorg packaging scheme changed, let autoreq to the job for now.
+# Requires: xorg-x11-libs
+
+%description -n ace-xtreactor
+
+A Reactor implementation that uses the X Toolkit for event
+demultiplexing.  This will let us integrate the X Toolkit with ACE
+and/or TAO.
+%endif
+
+# ---------------- ace-xtreactor-devel ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%package -n     ace-xtreactor-devel
+Summary:        Header files for development with ACE_XtReactor
+Version:        %{ACEVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-devel = %{ACEVER}
+Requires:       ace-xtreactor = %{ACEVER}
+# The xorg package naming scheme changed, use specific files for now.
+# old -> Requires: xorg-x11-devel
+# new -> Requires: libX11-devel
+Requires: %{_libdir}/libX11.so
+Requires: %{_libdir}/libXt.so
+
+%description -n ace-xtreactor-devel
+
+This package contains the components needed for developing programs
+using the ACE_XtReactor.
+%endif
+
+# ---------------- MPC ----------------
+
+%package -n   mpc
+Summary:      Make Project Creator
+Version:      %{ACEVER}
+Group:        Development/Tools/Building
+%if !0%{?suse_version}
+Provides:     perl(Driver) perl(MakeProjectBase) perl(ObjectGenerator) perl(ProjectCreator) perl(WorkspaceCreator) perl(WorkspaceHelper) perl(DependencyWriter) perl(WIXProjectCreator)
+%endif
+
+%description -n mpc
+
+The Makefile, Project and Workspace Creator.
+Designed by Justin Michel (michel_j@ociweb.com) and Chad Elliott.
+Implemented by Chad Elliott (elliott_c@ociweb.com).
+
+A single tool (MPC) can be used to generate tool specific input (i.e.
+Makefile, dsp, vcproj, etc). The generator takes platform and building
+tool generic files (mpc files) as input which describe basic information
+needed to generate a "project" file for various build tools. These tools
+include Make, NMake, Visual C++ 6, Visual C++ 7, etc.
+
+# ---------------- tao ----------------
+
+%package -n     tao
+Summary:        The ACE ORB (TAO)
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace = %{ACEVER}
+
+%description -n tao
+
+TAO is a real-time implementation of CORBA built using the framework
+components and patterns provided by ACE. TAO contains the network
+interface, OS, communication protocol, and CORBA middleware components
+and features. TAO is based on the standard OMG CORBA reference model,
+with the enhancements designed to overcome the shortcomings of
+conventional ORBs for high-performance and real-time applications.
+
+# ---------------- tao-devel ----------------
+
+%package -n     tao-devel
+Summary:        Header files and development components for TAO
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       tao = %{TAOVER}
+Requires:       ace-devel = %{ACEVER}
+Requires:       ace-gperf = %{ACEVER}
+
+%description -n tao-devel
+
+This package contains the components needed for developing programs
+using TAO.
+
+# ---------------- tao-utils ----------------
+
+%package -n     tao-utils
+Summary:        TAO naming service and IOR utilities
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       tao = %{TAOVER}
+
+%description -n tao-utils
+
+This package includes programs to query or control a CORBA naming service,
+and to dump an IOR.
+
+The following programs are included:
+* tao-nslist, to list naming context and object bindings
+* tao-nsadd, to create bindings
+* tao-nsdel, to remove bindings
+* tao-catior, to dump the content of an Interoperable Object Reference
+
+# ---------------- tao-cosnaming ----------------
+
+%package -n     tao-cosnaming
+Summary:        The TAO CORBA Naming Service (CosNaming) and Interoperable Naming Service (INS)
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       tao = %{TAOVER}
+Requires:       logrotate
+
+%description -n tao-cosnaming
+
+OMG defined CORBA Naming Service to provide a basic service location
+mechanism for CORBA systems. CosNaming manages a hierarchy of
+name-to-object-reference mappings. Anything, but typically the server
+process hosting an object, may bind an object reference with a name in
+the Naming Service by providing the name and object
+reference. Interested parties (typically clients) can then use the
+Naming Service to resolve a name to an object reference.
+
+More recently, CORBA Naming Service was subsumed/extended by the CORBA
+Interoperable Naming Service, a.k.a. INS. INS inherits all the
+functionality from the original Naming Service specification in
+addition to addressing some its shortcomings. In particular, INS
+defines a standard way for clients and servers to locate the Naming
+Service itself. It also allows the ORB to be administratively
+configured for bootstrapping to services not set up with the orb at
+install time.
+
+# ---------------- tao-cosevent ----------------
+
+%package -n     tao-cosevent
+Summary:        The TAO CORBA CosEvent Service
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       tao = %{TAOVER}
+Requires:       logrotate
+
+%description -n tao-cosevent
+
+The CosEvent_Service is a COS compliant Event Service.
+
+The service is registered with the naming service with the name
+"CosEventService" . It exposes the <EventChannel> interface which can be
+used by suppliers and consumers to send and receive events.
+
+# ---------------- tao-cosnotification ----------------
+
+%package -n     tao-cosnotification
+Summary:        The TAO CORBA Notification Service
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       tao = %{TAOVER}
+Requires:       logrotate
+
+%description -n tao-cosnotification
+
+The Notify_Service is a COS compliant Notification Service.
+
+The Notify_Service executable starts up a Notification Service factory
+and registers it with the Naming Service under the name
+"NotifyEventChannelFactory"
+
+# ---------------- tao-costrading ----------------
+
+%package -n     tao-costrading
+Summary:        The TAO CORBA Trading Service
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       tao = %{TAOVER}
+Requires:       logrotate
+
+%description -n tao-costrading
+
+The Trading_Service is a COS compliant Trading Service.
+
+# ---------------- tao-rtevent ----------------
+
+%package -n     tao-rtevent
+Summary:        The TAO Real-time Event Service
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       tao = %{TAOVER}
+Requires:       logrotate
+
+%description -n tao-rtevent
+
+The TAO Real-Time Event Service. This is a TAO specific service
+implementation
+
+# ---------------- tao-cosconcurrency ----------------
+
+%package -n     tao-cosconcurrency
+Summary:        The TAO CORBA Concurrency Service
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       tao = %{TAOVER}
+Requires:       logrotate
+
+%description -n tao-cosconcurrency
+
+The CORBA Concurrency Service. One of the standard CORBA services.
+
+# ---------------- tao-flresource ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%package -n     tao-flresource
+Summary:        FlResource_Factory for creating FlReactor
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-flreactor = %{ACEVER}
+Requires:       tao = %{TAOVER}
+
+%description -n tao-flresource
+
+This factory is intended for creating FlReactor for ORB. This factory
+can be feed into ORB using TAO_ORB_Core::set_gui_resource_factory
+method which is usually done by TAO_FlResource_Loader.
+%endif
+
+# ---------------- tao-flresource-devel ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%package -n     tao-flresource-devel
+Summary:        Header files for development with FlResource_Factory
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-flreactor-devel = %{ACEVER}
+Requires:       tao-devel = %{TAOVER}
+Requires:       tao-flresource = %{TAOVER}
+
+%description -n tao-flresource-devel
+
+This package contains the components needed for developing programs
+using the FlResource_Factory.
+%endif
+
+# ---------------- tao-qtresource ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%package -n     tao-qtresource
+Summary:        QtResource_Factory for creating QtReactor
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-qtreactor = %{ACEVER}
+Requires:       tao = %{TAOVER}
+
+%description -n tao-qtresource
+
+This factory is intended for creating QtReactor for ORB. This factory
+can be feed into ORB using TAO_ORB_Core::set_gui_resource_factory
+method which is usually done by TAO_QtResource_Loader.
+%endif
+
+# ---------------- tao-qtresource-devel ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%package -n     tao-qtresource-devel
+Summary:        Header files for development with QtResource_Factory
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-qtreactor-devel = %{ACEVER}
+Requires:       tao-devel = %{TAOVER}
+Requires:       tao-qtresource = %{TAOVER}
+
+%description -n tao-qtresource-devel
+
+This package contains the components needed for developing programs
+using the QtResource_Factory.
+%endif
+
+# ---------------- tao-tkresource ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+%package -n     tao-tkresource
+Summary:        TkResource_Factory for creating TkReactor
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-tkreactor = %{ACEVER}
+Requires:       tao = %{TAOVER}
+
+%description -n tao-tkresource
+
+This factory is intended for creating TkReactor for ORB. This factory
+can be feed into ORB using TAO_ORB_Core::set_gui_resource_factory
+method which is usually done by TAO_TkResource_Loader.
+%endif
+
+# ---------------- tao-tkresource-devel ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+%package -n     tao-tkresource-devel
+Summary:        Header files for development with TkResource_Factory
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-tkreactor-devel = %{ACEVER}
+Requires:       tao-devel = %{TAOVER}
+Requires:       tao-tkresource = %{TAOVER}
+
+%description -n tao-tkresource-devel
+
+This package contains the components needed for developing programs
+using the TkResource_Factory.
+%endif
+
+# ---------------- tao-xtresource ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%package -n     tao-xtresource
+Summary:        XtResource_Factory for creating XtReactor
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-xtreactor = %{ACEVER}
+Requires:       tao = %{TAOVER}
+
+%description -n tao-xtresource
+
+This factory is intended for creating XtReactor for ORB. This factory
+can be feed into ORB using TAO_ORB_Core::set_gui_resource_factory
+method which is usually done by TAO_XtResource_Loader.
+%endif
+
+# ---------------- tao-xtresource-devel ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%package -n     tao-xtresource-devel
+Summary:        Header files for development with XtResource_Factory
+Version:        %{TAOVER}
+Group:          Development/Libraries/C and C++
+Requires:       ace-xtreactor-devel = %{ACEVER}
+Requires:       tao-devel = %{TAOVER}
+Requires:       tao-xtresource = %{TAOVER}
+
+%description -n tao-xtresource-devel
+
+This package contains the components needed for developing programs
+using the XtResource_Factory.
+%endif
+
+# ================================================================
+# prep
+# ================================================================
+
+%prep
+%setup -q -n ACE_wrappers
+
+# ================================================================
+# build
+# ================================================================
+
+%build
+
+export ACE_ROOT=$(pwd)
+export MPC_ROOT=$ACE_ROOT/MPC
+export TAO_ROOT=$ACE_ROOT/TAO
+export CIAO_ROOT=$TAO_ROOT/CIAO
+export DANCE_ROOT=$TAO_ROOT/DAnCE
+export LD_LIBRARY_PATH=$ACE_ROOT/lib
+
+# Dump the g++ versions, in case the g++ version is broken we can
+# easily see this in the build log
+g++ --version
+g++ -dumpversion
+
+%if %skip_make
+
+cd .. && rm -rf ACE_wrappers && ln -s ACE_wrappers-BUILT ACE_wrappers
+
+%else
+
+cat > $ACE_ROOT/ace/config.h << EOF
+EOF
+
+# If ipv6 support is indicated insert some lines into the config.h file
+%if %{?_with_ipv6:1}%{!?_with_ipv6:0}
+cat >> $ACE_ROOT/ace/config.h << EOF
+#define ACE_HAS_IPV6
+#define ACE_USES_IPV4_IPV6_MIGRATION
+EOF
+%endif
+
+# Include platform include
+cat >> $ACE_ROOT/ace/config.h << EOF
+#include "ace/config-linux.h"
+EOF
+
+# platform_macros.GNU
+%if 0%{?suse_version}
+cat > $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+CCFLAGS += %optflags
+CFLAGS += %optflags
+EOF
+%endif
+
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+ssl = 1
+EOF
+
+%if %{?_with_inline:1}%{!?_with_inline:0}
+%define inline -D__ACE_INLINE__ -U__ACE_NO_INLINE__
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+inline = 1
+EOF
+%else
+%define inline -D__ACE_NO_INLINE__ -U__ACE_INLINE__
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+inline = 0
+EOF
+%endif
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+xt = 1
+ace_xtreactor = 1
+x11 = 1
+tao_xtresource = 1
+EOF
+%endif
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+ace_tkreactor = 1
+tao_tkresource = 1
+tk = 1
+EOF
+%endif
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+fl = 1
+tao_flresource = 1
+ace_flreactor = 1
+EOF
+%endif
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+qt4 = 1
+gl = 1
+ace_qt4reactor = 1
+tao_qt4resource = 1
+EOF
+%endif
+
+%if %{?_with_fox:1}%{!?_with_fox:0}
+%if 0%{?have_fox} == 1
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+fox = 1
+ace_foxreactor = 1
+tao_foxresource = 1
+%endif
+%endif
+
+# 64 bit machines need additional macro.
+%ifarch x86_64 ia64 ppc64 s390x
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+buildbits = 64
+EOF
+%endif
+
+%ifarch ppc64
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+minimaltoc = 1
+EOF
+%endif
+
+%if %{?_with_opt:0}%{!?_with_opt:1}
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+optimize = 0
+EOF
+%else
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+optimize = 1
+EOF
+%endif
+
+cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF
+include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+EOF
+
+cat > $ACE_ROOT/bin/MakeProjectCreator/config/default.features <<EOF
+ssl=1
+cidl=0
+EOF
+
+%if %{?_with_bzip2:1}%{!?_with_bzip2:0}
+cat >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features <<EOF
+bzip2 = 1
+EOF
+%endif
+
+%if %{?_with_zlib:1}%{!?_with_zlib:0}
+cat >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features <<EOF
+zlib = 1
+EOF
+%endif
+
+%if %{?_with_versioned:1}%{!?_with_versioned:0}
+cat >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features <<EOF
+versioned_namespace = 1
+EOF
+%endif
+
+# We don't use default.features to enable ipv6 cause it conflicts w/
+# the config.h generated version.  Config.h is superior because it is
+# shipped to the end-user machines and also defines
+# ACE_USES_IPV4_IPV6_MIGRATION which the default.features technique
+# does not seem to set.
+
+%if %{?_with_fox:1}%{!?_with_fox:0}
+%if 0%{?have_fox} == 1
+cat >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features <<EOF
+fox=1
+EOF
+%endif
+%endif
+
+# Need to regenerate all of the GNUMakefiles ...
+bin/mwc.pl -type gnuace TAO/TAO_ACE.mwc
+
+# Make everything that we have generated for
+make %{?_smp_mflags} -C $TAO_ROOT
+
+%endif
+
+# ================================================================
+# install
+# ================================================================
+
+%define ACEVERSO %{ACEVER}
+%define TAOVERSO %{TAOVER}
+%define CIAOVERSO %{CIAOVER}
+
+%install
+
+export ACE_ROOT=$(pwd)
+export TAO_ROOT=$ACE_ROOT/TAO
+export CIAO_ROOT=$TAO_ROOT/CIAO
+export DANCE_ROOT=$TAO_ROOT/DAnCE
+
+# ---------------- Runtime Components ----------------
+
+# install shared libraries
+install -d %{buildroot}%{_libdir}
+
+# ACE + XML libraries
+INSTLIBS=`ls ${ACE_ROOT}/lib/libACE*.so.%{ACEVERSO}`
+install $INSTLIBS %{buildroot}%{_libdir}
+
+# ACE-Kokyu libraries
+INSTLIBS=`ls ${ACE_ROOT}/lib/libKokyu.so.%{ACEVERSO}`
+install $INSTLIBS %{buildroot}%{_libdir}
+
+# TAO libraries
+INSTLIBS=`ls ${ACE_ROOT}/lib/libTAO*.so.%{TAOVERSO}`
+install $INSTLIBS %{buildroot}%{_libdir}
+
+# Create un-versioned symbolic links for libraries
+(cd %{buildroot}%{_libdir} && \
+ ls *.so.* | awk 'BEGIN{FS="."}{print "ln -sf " $0 " " $1 "." $2;}' | sh)
+
+# install binaries
+install -d %{buildroot}%{_sbindir}
+
+# Rename the service binaries:
+
+install ${ACE_ROOT}/TAO/orbsvcs/Naming_Service/tao_cosnaming \
+    %{buildroot}%{_sbindir}/tao-cosnaming
+
+install ${ACE_ROOT}/TAO/orbsvcs/CosEvent_Service/tao_cosevent \
+    %{buildroot}%{_sbindir}/tao-cosevent
+
+install ${ACE_ROOT}/TAO/orbsvcs/Notify_Service/tao_cosnotification \
+    %{buildroot}%{_sbindir}/tao-cosnotification
+
+install ${ACE_ROOT}/TAO/orbsvcs/Trading_Service/tao_costrading \
+    %{buildroot}%{_sbindir}/tao-costrading
+
+install ${ACE_ROOT}/TAO/orbsvcs/Event_Service/tao_rtevent \
+    %{buildroot}%{_sbindir}/tao-rtevent
+
+install ${ACE_ROOT}/TAO/orbsvcs/Concurrency_Service/tao_cosconcurrency \
+    %{buildroot}%{_sbindir}/tao-cosconcurrency
+
+#Create directories
+for dir in cache log; do
+        mkdir -p %{buildroot}%{_localstatedir}/${dir}/tao
+done
+
+# Create data files which will be ghosted.
+touch %{buildroot}%{_localstatedir}/cache/tao/tao-cosnaming.dat
+
+# Create data files which will be ghosted.
+for logfile in cosnaming cosconcurrency cosevent cosnotification costrading rtevent; do
+    touch %{buildroot}%{_localstatedir}/log/tao/tao-${logfile}.log
+done
+
+# ---------------- Development Components ----------------
+
+# INSTHDR="cp --preserve=timestamps"
+INSTHDR="install -m 0644 -p"
+
+# install headers
+install -d %{buildroot}%{_includedir}
+( set +x
+echo "Building list of headers..."
+
+# Generate raw dependency output
+BASEHDR=`find \
+    ace \
+    ACEXML/common \
+    ACEXML/parser/parser \
+    Kokyu \
+    TAO/tao \
+    TAO/orbsvcs/orbsvcs \
+    -name '*.h' -not -name 'config-*'`
+for j in $BASEHDR; do
+        echo $j >> rawhdrs.log
+        echo '#include <'$j'>' | \
+        g++ %{inline} \
+            -I . \
+            -I protocols \
+            -I TAO \
+            -I TAO/orbsvcs \
+            -I TAO/orbsvcs/orbsvcs \
+            -x c++ - -MM -MF mmout 2>> rawhdrs.log && cat mmout || true;
+done > mmraw.list
+
+# Append IDL headers to the raw list.
+find \
+    TAO/tao \
+    TAO/orbsvcs/orbsvcs \
+    -regex '.*\.p?idl$' >> mmraw.list
+
+# Cleanup dependency output:
+#   remove '-:' sequences
+#   change all sequences of whitespace into \n
+#   remove leading './'
+#   cannonicalize up to two levels of '/../../'
+#   remove duplicates
+cat mmraw.list |\
+        sed -e 's/^-://g' -e 's/\\//g' | \
+        tr -s [:space:] "\n" | \
+        sed -e 's#^./##g' | \
+        sed -e 's#/[^/]\+/\.\./#/#g' -e 's#/[^/]\+/\.\./#/#g' | \
+        sort -u > allhdrs.list
+
+# Add missing headers.
+echo ace/QtReactor/QtReactor.h >> allhdrs.list
+echo TAO/tao/QtResource/QtResource_Factory.h >> allhdrs.list
+echo TAO/tao/QtResource/QtResource_Loader.h >> allhdrs.list
+echo TAO/tao/PortableServer/get_arg.h >> allhdrs.list
+
+# Install headers and create header lists
+rm -f ace-headers.tmp
+rm -f acexml-headers.tmp
+rm -f kokyu-headers.tmp
+rm -f tao-headers.tmp
+
+for i in `cat allhdrs.list`; do
+    case "$i" in
+    protocols/ace/*)
+        mkdir -p `dirname %{buildroot}%{_includedir}/${i/protocols\/}`
+        $INSTHDR $i %{buildroot}%{_includedir}/${i/protocols/}
+        echo '%dir %{_includedir}/'`dirname ${i/protocols/}` >> ace-headers.tmp
+        echo '%{_includedir}/'${i/protocols/} >> ace-headers.tmp
+        ;;
+    ace/*)
+        mkdir -p `dirname %{buildroot}%{_includedir}/$i`
+        $INSTHDR $i %{buildroot}%{_includedir}/$i
+        echo '%dir %{_includedir}/'`dirname $i` >> ace-headers.tmp
+        echo '%{_includedir}/'$i >> ace-headers.tmp
+        ;;
+    ACEXML/*)
+        mkdir -p `dirname %{buildroot}%{_includedir}/$i`
+        $INSTHDR $i %{buildroot}%{_includedir}/$i
+        echo '%dir %{_includedir}/'`dirname $i` >> acexml-headers.tmp
+        echo '%{_includedir}/'$i >> acexml-headers.tmp
+        ;;
+    Kokyu/*)
+        mkdir -p `dirname %{buildroot}%{_includedir}/$i`
+        $INSTHDR $i %{buildroot}%{_includedir}/$i
+        echo '%dir %{_includedir}/'`dirname $i` >> kokyu-headers.tmp
+        echo '%{_includedir}/'$i >> kokyu-headers.tmp
+        ;;
+    TAO/tao/*)
+        mkdir -p `dirname %{buildroot}%{_includedir}/${i/TAO\/}`
+        $INSTHDR $i %{buildroot}%{_includedir}/${i/TAO\/}
+        echo '%dir %{_includedir}/'`dirname ${i/TAO\/}` >> tao-headers.tmp
+        echo '%{_includedir}/'${i/TAO\/} >> tao-headers.tmp
+        ;;
+    TAO/orbsvcs/orbsvcs/*)
+        mkdir -p `dirname %{buildroot}%{_includedir}/${i/TAO\/orbsvcs\/}`
+        $INSTHDR $i %{buildroot}%{_includedir}/${i/TAO\/orbsvcs\/}
+        echo '%dir %{_includedir}/'`dirname ${i/TAO\/orbsvcs\/}` >> tao-headers.tmp
+        echo '%{_includedir}/'${i/TAO\/orbsvcs\/} >> tao-headers.tmp
+        ;;
+    *)
+        echo $i
+        ;;
+    esac
+done
+
+echo '%defattr(-,root,root,-)' > ace-headers.list
+sort -u < ace-headers.tmp >> ace-headers.list
+rm -f ace-headers.tmp
+
+echo '%defattr(-,root,root,-)' > acexml-headers.list
+sort -u < acexml-headers.tmp >> acexml-headers.list
+rm -f acexml-headers.tmp
+
+echo '%defattr(-,root,root,-)' > kokyu-headers.list
+sort -u < kokyu-headers.tmp >> kokyu-headers.list
+rm -f kokyu-headers.tmp
+
+echo '%defattr(-,root,root,-)' > tao-headers.list
+sort -u < tao-headers.tmp >> tao-headers.list
+rm -f tao-headers.tmp
+)
+
+# install the TAO_IDL compiler
+install -d %{buildroot}%{_libdir}
+
+install -d %{buildroot}%{_bindir}
+install ${ACE_ROOT}/bin/ace_gperf %{buildroot}%{_bindir}
+install ${ACE_ROOT}/bin/tao_idl %{buildroot}%{_bindir}
+install ${ACE_ROOT}/bin/tao_imr %{buildroot}%{_bindir}
+install ${ACE_ROOT}/bin/tao_ifr %{buildroot}%{_bindir}
+install ${ACE_ROOT}/bin/tao_catior %{buildroot}%{_bindir}/tao_catior
+install ${ACE_ROOT}/bin/tao_nsadd %{buildroot}%{_bindir}/tao_nsadd
+install ${ACE_ROOT}/bin/tao_nsdel %{buildroot}%{_bindir}/tao_nsdel
+install ${ACE_ROOT}/bin/tao_nslist %{buildroot}%{_bindir}/tao_nslist
+
+# ================================================================
+# Config & Options
+# ================================================================
+
+install -d %{buildroot}%{_sysconfdir}
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+mkdir -p %{buildroot}%{_sysconfdir}/tao
+cp -R ${ACE_ROOT}/rpmbuild/etc/logrotate.d/* %{buildroot}%{_sysconfdir}/logrotate.d/
+cp -R ${ACE_ROOT}/rpmbuild/etc/tao/* %{buildroot}%{_sysconfdir}/tao/
+
+%if 0%{?suse_version}
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+mkdir -p %{buildroot}%{_localstatedir}/adm
+cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/init.d/* %{buildroot}%{_sysconfdir}/init.d/
+cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/tao/* %{buildroot}%{_sysconfdir}/tao/
+%else
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
+cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/rc.d/init.d/* %{buildroot}%{_sysconfdir}/rc.d/init.d/
+cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/tao/* %{buildroot}%{_sysconfdir}/tao/
+%endif
+
+%if 0%{?suse_version}
+pushd %{buildroot}%{_sysconfdir}/init.d
+for f in *; do
+        ln -s /etc/init.d/$f %{buildroot}%{_sbindir}/rc${f}
+done
+popd
+%endif
+
+# ================================================================
+# Makefiles
+# ================================================================
+
+install -d %{buildroot}%{_datadir}
+install -d %{buildroot}%{_datadir}/ace
+install -d %{buildroot}%{_datadir}/ace/include
+install -d %{buildroot}%{_datadir}/ace/include/makeinclude
+install -d %{buildroot}%{_datadir}/mpc
+install -d %{buildroot}%{_datadir}/tao
+install -d %{buildroot}%{_datadir}/tao/orbsvcs
+install -d %{buildroot}%{_datadir}/tao/MPC
+
+for mk_macros in \
+    all_in_one.GNU \
+    component_check.GNU \
+    macros.GNU \
+    platform_g++_common.GNU \
+    platform_linux.GNU \
+    platform_linux_common.GNU \
+    platform_macros.GNU \
+    rules.bin.GNU \
+    rules.common.GNU \
+    rules.lib.GNU \
+    rules.local.GNU \
+    rules.nested.GNU \
+    rules.nolocal.GNU \
+    rules.nonested.GNU \
+    wrapper_macros.GNU; do (
+        install ${ACE_ROOT}/include/makeinclude/$mk_macros %{buildroot}%{_datadir}/ace/include/makeinclude)
+done
+
+install ${TAO_ROOT}/rules.tao.GNU %{buildroot}%{_datadir}/tao
+
+cp -a ${ACE_ROOT}/MPC/* %{buildroot}%{_datadir}/mpc
+
+install -d %{buildroot}%{_datadir}/ace/bin
+cp -a ${ACE_ROOT}/bin/DependencyGenerator %{buildroot}%{_datadir}/ace/bin
+cp -a ${ACE_ROOT}/bin/MakeProjectCreator %{buildroot}%{_datadir}/ace/bin
+install -d %{buildroot}%{_datadir}/ace/bin/PerlACE
+cp -a ${ACE_ROOT}/bin/PerlACE/* %{buildroot}%{_datadir}/ace/bin/PerlACE
+install ${ACE_ROOT}/bin/mpc.pl %{buildroot}%{_datadir}/ace/bin
+install ${ACE_ROOT}/bin/mwc.pl %{buildroot}%{_datadir}/ace/bin
+install ${ACE_ROOT}/bin/g++dep %{buildroot}%{_datadir}/ace/bin
+install ${ACE_ROOT}/bin/depgen.pl %{buildroot}%{_datadir}/ace/bin
+install ${ACE_ROOT}/bin/generate_export_file.pl %{buildroot}%{_datadir}/ace/bin
+install ${ACE_ROOT}/bin/add_rel_link.sh %{buildroot}%{_datadir}/ace/bin
+install ${ACE_ROOT}/bin/{ACEutils,Uniqueid}.pm %{buildroot}%{_datadir}/ace/bin
+
+ln -sfn %{_includedir}/ace %{buildroot}%{_datadir}/ace
+ln -sfn %{_includedir}/tao %{buildroot}%{_datadir}/tao
+ln -sfn %{_includedir}/orbsvcs %{buildroot}%{_datadir}/tao/orbsvcs
+ln -sfn %{_libdir} %{buildroot}%{_datadir}/ace/lib
+
+cp -a ${TAO_ROOT}/MPC/* %{buildroot}%{_datadir}/tao/MPC
+
+# Set TAO_IDL setting for the user
+cat > %{buildroot}%{_datadir}/ace/include/makeinclude/platform_macros.GNU.tmp <<EOF
+TAO_IDL = %{_bindir}/tao_idl
+TAO_IDL_DEP = %{_bindir}/tao_idl
+EOF
+cat %{buildroot}%{_datadir}/ace/include/makeinclude/platform_macros.GNU >> %{buildroot}%{_datadir}/ace/include/makeinclude/platform_macros.GNU.tmp
+mv %{buildroot}%{_datadir}/ace/include/makeinclude/platform_macros.GNU.tmp %{buildroot}%{_datadir}/ace/include/makeinclude/platform_macros.GNU
+
+
+install -d %{buildroot}%{_sysconfdir}/profile.d
+cat > %{buildroot}%{_sysconfdir}/profile.d/mpc.sh <<EOF
+MPC_ROOT=/usr/share/mpc
+export MPC_ROOT
+EOF
+cat > %{buildroot}%{_sysconfdir}/profile.d/ace-devel.sh <<EOF
+ACE_ROOT=/usr/share/ace
+export ACE_ROOT
+EOF
+cat > %{buildroot}%{_sysconfdir}/profile.d/tao-devel.sh <<EOF
+TAO_ROOT=/usr/share/tao
+export TAO_ROOT
+EOF
+
+# convenience symlinks
+ln -sfn %{_datadir}/ace/bin/mpc.pl %{buildroot}%{_bindir}/mpc.pl
+ln -sfn %{_datadir}/ace/bin/mwc.pl %{buildroot}%{_bindir}/mwc.pl
+
+# ================================================================
+# Manuals
+# ================================================================
+install -d %{buildroot}%{_mandir}
+install -d %{buildroot}%{_mandir}/man1
+install ${TAO_ROOT}/TAO_IDL/tao_idl.1 %{buildroot}%{_mandir}/man1
+install ${ACE_ROOT}/apps/gperf/ace_gperf.1 %{buildroot}%{_mandir}/man1
+install -d  %{buildroot}%{_infodir}
+install ${ACE_ROOT}/apps/gperf/ace_gperf.info %{buildroot}%{_infodir}
+
+# ================================================================
+# Create lists of symlinked so's.  We need two lists because we need
+# the unversioned symlinks in the runtime package for so's that can
+# be loaded in the svc.conf.
+# ================================================================
+
+# Make a list of all shared objects.
+(cd %{buildroot}/%{_libdir} && ls *.so | \
+        awk '{ print "%{_libdir}/"$1; }' | \
+        sort) > all-so.list
+
+# Make a list of likely svc.conf targets.
+(cd %{buildroot}/%{_libdir} && ls *.so | \
+    nm --print-file-name *.so | \
+    grep _make_ | \
+    awk 'BEGIN { FS=":"} /^[^:]+:/ { print "%{_libdir}/"$1; }' | \
+    sort -u) > rough-svc-so.list
+
+# Remove false positives (IMPORTANT keep this list sorted!)
+cat > falsepos-svc-so.list <<EOF
+%{_libdir}/libACE.so
+%{_libdir}/libTAO.so
+EOF
+comm -2 -3 rough-svc-so.list falsepos-svc-so.list > svc-so.list
+
+# Find the list of non-sv.conf target files.
+comm -2 -3 all-so.list svc-so.list > nonsvc-so.list
+
+# Generate file lists.
+grep libACE svc-so.list > ace-svc-so.list
+grep libACE nonsvc-so.list > ace-nonsvc-so.list
+grep libTAO svc-so.list > tao-svc-so.list
+grep libTAO nonsvc-so.list > tao-nonsvc-so.list
+
+# Concatenate file lists as neccessary
+cat tao-headers.list tao-nonsvc-so.list > tao-devel-files.list
+cat ace-headers.list ace-nonsvc-so.list > ace-devel-files.list
+
+# ================================================================
+# clean
+# ================================================================
+
+%clean
+rm -rf %{buildroot}
+
+# ================================================================
+# pre install
+# ================================================================
+
+# ---------------- tao-cosnaming ----------------
+
+%pre -n tao-cosnaming
+
+getent group tao >/dev/null || /usr/sbin/groupadd -r tao
+getent passwd tao >/dev/null || \
+/usr/sbin/useradd -r -g tao -d %{_sysconfdir}/tao -s /sbin/nologin \
+    -c "TAO Services" tao
+exit 0
+
+# ---------------- tao-cosevent ----------------
+
+%pre -n tao-cosevent
+
+getent group tao >/dev/null || /usr/sbin/groupadd -r tao
+getent passwd tao >/dev/null || \
+/usr/sbin/useradd -r -g tao -d %{_sysconfdir}/tao -s /sbin/nologin \
+    -c "TAO Services" tao
+exit 0
+
+# ---------------- tao-cosnotification ----------------
+
+%pre -n tao-cosnotification
+
+getent group tao >/dev/null || /usr/sbin/groupadd -r tao
+getent passwd tao >/dev/null || \
+/usr/sbin/useradd -r -g tao -d %{_sysconfdir}/tao -s /sbin/nologin \
+    -c "TAO Services" tao
+exit 0
+
+# ---------------- tao-costrading ----------------
+
+%pre -n tao-costrading
+
+getent group tao >/dev/null || /usr/sbin/groupadd -r tao
+getent passwd tao >/dev/null || \
+/usr/sbin/useradd -r -g tao -d %{_sysconfdir}/tao -s /sbin/nologin \
+    -c "TAO Services" tao
+exit 0
+
+# ---------------- tao-rtevent ----------------
+
+%pre -n tao-rtevent
+
+getent group tao >/dev/null || /usr/sbin/groupadd -r tao
+getent passwd tao >/dev/null || \
+/usr/sbin/useradd -r -g tao -d %{_sysconfdir}/tao -s /sbin/nologin \
+    -c "TAO Services" tao
+exit 0
+
+# ---------------- tao-cosconcurrency ----------------
+
+%pre -n tao-cosconcurrency
+
+getent group tao >/dev/null || /usr/sbin/groupadd -r tao
+getent passwd tao >/dev/null || \
+/usr/sbin/useradd -r -g tao -d %{_sysconfdir}/tao -s /sbin/nologin \
+    -c "TAO Services" tao
+exit 0
+
+# ================================================================
+# post install
+# ================================================================
+
+# ---------------- ace ----------------
+
+%post -n ace
+/sbin/ldconfig
+
+# ---------------- ace-devel ----------------
+
+%post -n ace-devel
+/sbin/ldconfig
+
+# ---------------- ace-xml ----------------
+
+%post -n ace-xml
+/sbin/ldconfig
+
+# ---------------- ace-gperf ----------------
+
+%post -n ace-gperf
+
+%if 0%{?suse_version}
+%install_info --info-dir=%_infodir %_infodir/ace_gperf.info%{_extension}
+%else
+/sbin/install-info %{_infodir}/ace_gperf.info%{_extension} %{_infodir}/dir
+%endif
+
+# ---------------- ace-kokyu ----------------
+
+%post -n ace-kokyu
+/sbin/ldconfig
+
+# ---------------- ace-foxreactor ----------------
+
+%if %{?_with_fox:1}%{!?_with_fox:0}
+%if 0%{!?suse_version} || 0%{?suse_version} == 1020
+%post -n ace-foxreactor
+/sbin/ldconfig
+%endif
+%endif
+
+# ---------------- ace-flreactor ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%post -n ace-flreactor
+/sbin/ldconfig
+%endif
+
+# ---------------- ace-qtreactor ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%post -n ace-qtreactor
+/sbin/ldconfig
+%endif
+
+# ---------------- ace-tkreactor ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+%post -n ace-tkreactor
+/sbin/ldconfig
+%endif
+
+# ---------------- ace-xtreactor ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%post -n ace-xtreactor
+/sbin/ldconfig
+%endif
+
+# ---------------- tao ----------------
+
+%post -n tao
+/sbin/ldconfig
+
+# ---------------- tao-devel ----------------
+
+%post -n tao-devel
+/sbin/ldconfig
+
+# ---------------- tao-utils ----------------
+
+%post -n tao-utils
+/sbin/ldconfig
+
+# ---------------- tao-cosnaming ----------------
+
+%post -n tao-cosnaming
+%if 0%{?suse_version}
+%{fillup_and_insserv tao-cosnaming}
+%else
+/sbin/chkconfig --add tao-cosnaming
+%endif
+
+# ---------------- tao-cosevent ----------------
+
+%post -n tao-cosevent
+
+%if 0%{?suse_version}
+%{fillup_and_insserv tao-cosevent}
+%else
+/sbin/chkconfig --add tao-cosevent
+%endif
+
+# ---------------- tao-cosnotification ----------------
+
+%post -n tao-cosnotification
+
+%if 0%{?suse_version}
+%{fillup_and_insserv tao-cosnotification}
+%else
+/sbin/chkconfig --add tao-cosnotification
+%endif
+
+# ---------------- tao-costrading ----------------
+
+%post -n tao-costrading
+
+%if 0%{?suse_version}
+%{fillup_and_insserv tao-costrading}
+%else
+/sbin/chkconfig --add tao-costrading
+%endif
+
+# ---------------- tao-rtevent ----------------
+
+%post -n tao-rtevent
+
+%if 0%{?suse_version}
+%{fillup_and_insserv tao-rtevent}
+%else
+/sbin/chkconfig --add tao-rtevent
+%endif
+
+# ---------------- tao-cosconcurrency ----------------
+
+%post -n tao-cosconcurrency
+
+%if 0%{?suse_version}
+%{fillup_and_insserv tao-cosconcurrency}
+%else
+/sbin/chkconfig --add tao-cosconcurrency
+%endif
+
+# ---------------- tao-flresource ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%post -n tao-flresource
+/sbin/ldconfig
+%endif
+
+# ---------------- tao-qtresource ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%post -n tao-qtresource
+/sbin/ldconfig
+%endif
+
+# ---------------- tao-tkresource ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+%post -n tao-tkresource
+/sbin/ldconfig
+%endif
+
+# ---------------- tao-xtresource ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%post -n tao-xtresource
+/sbin/ldconfig
+%endif
+
+# ================================================================
+# pre uninstall
+# ================================================================
+
+# ---------------- ace-gperf ----------------
+
+%preun -n ace-gperf
+
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/ace_gperf.info%{_extension} %{_infodir}/dir
+fi
+
+# ---------------- tao-cosnaming ----------------
+
+%preun -n tao-cosnaming
+%if 0%{?suse_version}
+%stop_on_removal tao-cosnaming
+%else
+if [ $1 = 0 ]; then
+    /sbin/service tao-cosnaming stop > /dev/null 2>&1
+    /sbin/chkconfig --del tao-cosnaming
+fi
+%endif
+
+# ---------------- tao-cosevent ----------------
+
+%preun -n tao-cosevent
+
+%if 0%{?suse_version}
+%stop_on_removal tao-cosevent
+%else
+if [ $1 = 0 ]; then
+    /sbin/service tao-cosevent stop > /dev/null 2>&1
+    /sbin/chkconfig --del tao-cosevent
+fi
+%endif
+
+# ---------------- tao-cosnotification ----------------
+
+%preun -n tao-cosnotification
+
+%if 0%{?suse_version}
+%stop_on_removal tao-cosnotification
+%else
+if [ $1 = 0 ]; then
+    /sbin/service tao-cosnotification stop > /dev/null 2>&1
+    /sbin/chkconfig --del tao-cosnotification
+fi
+%endif
+
+# ---------------- tao-costrading ----------------
+
+%preun -n tao-costrading
+
+%if 0%{?suse_version}
+%stop_on_removal tao-costrading
+%else
+if [ $1 = 0 ]; then
+    /sbin/service tao-costrading stop > /dev/null 2>&1
+    /sbin/chkconfig --del tao-costrading
+fi
+%endif
+
+# ---------------- tao-rtevent ----------------
+
+%preun -n tao-rtevent
+
+%if 0%{?suse_version}
+%stop_on_removal tao-rtevent
+%else
+if [ $1 = 0 ]; then
+    /sbin/service tao-rtevent stop > /dev/null 2>&1
+    /sbin/chkconfig --del tao-rtevent
+fi
+%endif
+
+# ---------------- tao-cosconcurrency ----------------
+
+%preun -n tao-cosconcurrency
+
+%if 0%{?suse_version}
+%stop_on_removal tao-cosconcurrency
+%else
+if [ $1 = 0 ]; then
+    /sbin/service tao-cosconcurrency stop > /dev/null 2>&1
+    /sbin/chkconfig --del tao-cosconcurrency
+fi
+%endif
+
+# ================================================================
+# post uninstall
+# ================================================================
+
+# ---------------- ace ----------------
+
+%postun -n ace
+/sbin/ldconfig
+
+# ---------------- ace-xml ----------------
+
+%postun -n ace-xml
+/sbin/ldconfig
+
+# ---------------- ace-kokyu ----------------
+
+%postun -n ace-kokyu
+/sbin/ldconfig
+
+# ---------------- ace-foxreactor ----------------
+
+%if %{?_with_fox:1}%{!?_with_fox:0}
+%if 0%{?have_fox} == 1
+%postun -n ace-foxreactor
+/sbin/ldconfig
+%endif
+%endif
+
+# ---------------- ace-flreactor ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%postun -n ace-flreactor
+/sbin/ldconfig
+%endif
+
+# ---------------- ace-qtreactor ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%postun -n ace-qtreactor
+/sbin/ldconfig
+%endif
+
+# ---------------- ace-tkreactor ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+%postun -n ace-tkreactor
+/sbin/ldconfig
+%endif
+
+# ---------------- ace-xtreactor ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%postun -n ace-xtreactor
+/sbin/ldconfig
+%endif
+
+# ---------------- tao ----------------
+
+%postun -n tao
+/sbin/ldconfig
+
+# ---------------- tao-devel ----------------
+
+%postun -n tao-devel
+/sbin/ldconfig
+
+# ---------------- tao-utils ----------------
+
+%postun -n tao-utils
+/sbin/ldconfig
+
+# ---------------- tao-cosnaming ----------------
+
+%postun -n tao-cosnaming
+
+%if 0%{?suse_version}
+%restart_on_update tao-cosnaming
+%insserv_cleanup
+%else
+if [ "$1" -ge "1" ]; then
+    /sbin/service tao-cosnaming %{cond_restart} > /dev/null 2>&1
+fi
+%endif
+
+# ---------------- tao-cosevent ----------------
+
+%postun -n tao-cosevent
+
+%if 0%{?suse_version}
+%restart_on_update tao-cosevent
+%insserv_cleanup
+%else
+if [ "$1" -ge "1" ]; then
+    /sbin/service tao-cosevent %{cond_restart} > /dev/null 2>&1
+fi
+%endif
+
+# ---------------- tao-cosnotification ----------------
+
+%postun -n tao-cosnotification
+
+%if 0%{?suse_version}
+%restart_on_update tao-cosnotification
+%insserv_cleanup
+%else
+if [ "$1" -ge "1" ]; then
+    /sbin/service tao-cosnotification %{cond_restart} > /dev/null 2>&1
+fi
+%endif
+
+# ---------------- tao-costrading ----------------
+
+%postun -n tao-costrading
+
+%if 0%{?suse_version}
+%restart_on_update tao-costrading
+%insserv_cleanup
+%else
+if [ "$1" -ge "1" ]; then
+    /sbin/service tao-costrading %{cond_restart} > /dev/null 2>&1
+fi
+%endif
+
+# ---------------- tao-rtevent ----------------
+
+%postun -n tao-rtevent
+
+%if 0%{?suse_version}
+%restart_on_update tao-rtevent
+%insserv_cleanup
+%else
+if [ "$1" -ge "1" ]; then
+    /sbin/service tao-rtevent %{cond_restart} > /dev/null 2>&1
+fi
+%endif
+
+# ---------------- tao-cosconcurrency ----------------
+
+%postun -n tao-cosconcurrency
+
+%if 0%{?suse_version}
+%restart_on_update tao-cosconcurrency
+%insserv_cleanup
+%else
+if [ "$1" -ge "1" ]; then
+    /sbin/service tao-cosconcurrency %{cond_restart} > /dev/null 2>&1
+fi
+%endif
+
+# ---------------- tao-flresource ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%postun -n tao-flresource
+/sbin/ldconfig
+%endif
+
+# ---------------- tao-qtresource ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%postun -n tao-qtresource
+/sbin/ldconfig
+%endif
+
+# ---------------- tao-tkresource ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+%postun -n tao-tkresource
+/sbin/ldconfig
+%endif
+
+# ---------------- tao-xtresource ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%postun -n tao-xtresource
+/sbin/ldconfig
+%endif
+
+# ================================================================
+# files
+# ================================================================
+
+# ---------------- ace ----------------
+
+%files -n ace
+%defattr(-,root,root,-)
+%{_libdir}/libACE.so.%{ACEVERSO}
+%{_libdir}/libACE_ETCL_Parser.so.%{ACEVERSO}
+%{_libdir}/libACE_ETCL.so.%{ACEVERSO}
+%{_libdir}/libACE_HTBP.so.%{ACEVERSO}
+%{_libdir}/libACE_Monitor_Control.so.%{ACEVERSO}
+%{_libdir}/libACE_RMCast.so.%{ACEVERSO}
+%{_libdir}/libACE_TMCast.so.%{ACEVERSO}
+%{_libdir}/libACE_SSL.so.%{ACEVERSO}
+%{_libdir}/libACE_INet.so.%{ACEVERSO}
+%{_libdir}/libACE_INet_SSL.so.%{ACEVERSO}
+%{_libdir}/libACE_Compression.so.%{ACEVERSO}
+%{_libdir}/libACE_RLECompression.so.%{ACEVERSO}
+
+%doc ACE-INSTALL.html
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc THANKS
+%doc VERSION
+
+# ---------------- ace-devel ----------------
+
+%files -n ace-devel -f ace-devel-files.list
+%defattr(-,root,root,-)
+%{_libdir}/libACE_HTBP.so
+%{_libdir}/libACE_SSL.so
+%dir %{_datadir}/ace
+%{_datadir}/ace/include
+%{_datadir}/ace/bin
+%{_datadir}/ace/ace
+%{_datadir}/ace/lib
+%config %{_sysconfdir}/profile.d/ace-devel.sh
+
+%if %{?_with_fox:1}%{!?_with_fox:0}
+%exclude %{_includedir}/ace/FoxReactor/FoxReactor.h
+%exclude %{_includedir}/ace/FoxReactor/ACE_FoxReactor_export.h
+%endif
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%exclude %{_includedir}/ace/FlReactor/FlReactor.h
+%exclude %{_includedir}/ace/FlReactor/ACE_FlReactor_export.h
+%endif
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%exclude %{_includedir}/ace/QtReactor/QtReactor.h
+%exclude %{_includedir}/ace/QtReactor/ACE_QtReactor_export.h
+%endif
+%if %{?_with_tk:1}%{!?_with_tk:0}
+%exclude %{_includedir}/ace/TkReactor/TkReactor.h
+%exclude %{_includedir}/ace/TkReactor/ACE_TkReactor_export.h
+%endif
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%exclude %{_includedir}/ace/XtReactor/XtReactor.h
+%exclude %{_includedir}/ace/XtReactor/ACE_XtReactor_export.h
+%endif
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+# ---------------- ace-xml ----------------
+
+%files -n ace-xml
+%defattr(-,root,root,-)
+%{_libdir}/libACEXML*.so.%{ACEVERSO}
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+# ---------------- ace-gperf ----------------
+
+%files -n ace-gperf
+%defattr(-,root,root,-)
+%{_bindir}/ace_gperf
+%attr(0644,root,root) %{_mandir}/man1/ace_gperf.1%{_extension}
+%attr(0644,root,root) %{_infodir}/ace_gperf.info%{_extension}
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+# ---------------- ace-xml-devel ----------------
+
+%files -n ace-xml-devel -f acexml-headers.list
+%defattr(-,root,root,-)
+%{_libdir}/libACEXML*.so
+
+# These get missed by the automatic list generator because they
+# contain no immediate files.
+%dir %{_includedir}/ACEXML/parser
+%dir %{_includedir}/ACEXML
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+# ---------------- ace-kokyu ----------------
+
+%files -n ace-kokyu
+%defattr(-,root,root,-)
+%{_libdir}/libKokyu.so.%{ACEVERSO}
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+# ---------------- ace-kokyu-devel ----------------
+
+%files -n ace-kokyu-devel -f kokyu-headers.list
+%defattr(-,root,root,-)
+%{_libdir}/libKokyu.so
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+# ---------------- ace-foxreactor ----------------
+
+%if 0%{?have_fox} == 1
+%if %{?_with_fox:1}%{!?_with_fox:0}
+%files -n ace-foxreactor
+%defattr(-,root,root,-)
+%{_libdir}/libACE_FoxReactor.so.%{ACEVERSO}
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+%endif
+%endif
+# ---------------- ace-flreactor ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+
+%files -n ace-flreactor
+%defattr(-,root,root,-)
+%{_libdir}/libACE_FlReactor.so.%{ACEVERSO}
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+%endif
+
+# ---------------- ace-flreactor-devel ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+
+%files -n ace-flreactor-devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/ace/FlReactor
+%{_libdir}/libACE_FlReactor.so
+%{_includedir}/ace/FlReactor/FlReactor.h
+%{_includedir}/ace/FlReactor/ACE_FlReactor_export.h
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+%endif
+
+# ---------------- ace-qtreactor ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+
+%files -n ace-qtreactor
+%defattr(-,root,root,-)
+%{_libdir}/libACE_QtReactor.so.%{ACEVERSO}
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+%endif
+
+# ---------------- ace-qtreactor-devel ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+
+%files -n ace-qtreactor-devel
+%defattr(-,root,root,-)
+%{_libdir}/libACE_QtReactor.so
+%dir %{_includedir}/ace/QtReactor
+%{_includedir}/ace/QtReactor/QtReactor.h
+%{_includedir}/ace/QtReactor/ACE_QtReactor_export.h
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+%endif
+
+# ---------------- ace-tkreactor ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+
+%files -n ace-tkreactor
+%defattr(-,root,root,-)
+%{_libdir}/libACE_TkReactor.so.%{ACEVERSO}
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+%endif
+
+# ---------------- ace-tkreactor-devel ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+
+%files -n ace-tkreactor-devel
+%defattr(-,root,root,-)
+%{_libdir}/libACE_TkReactor.so
+%dir %{_includedir}/ace/TkReactor
+%{_includedir}/ace/TkReactor/TkReactor.h
+%{_includedir}/ace/TkReactor/ACE_TkReactor_export.h
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+%endif
+
+# ---------------- ace-xtreactor ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+
+%files -n ace-xtreactor
+%defattr(-,root,root,-)
+%{_libdir}/libACE_XtReactor.so.%{ACEVERSO}
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+%endif
+
+# ---------------- ace-xtreactor-devel ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+
+%files -n ace-xtreactor-devel
+%defattr(-,root,root,-)
+%{_libdir}/libACE_XtReactor.so
+%dir %{_includedir}/ace/XtReactor
+%{_includedir}/ace/XtReactor/XtReactor.h
+%{_includedir}/ace/XtReactor/ACE_XtReactor_export.h
+
+%doc AUTHORS
+%doc COPYING
+%doc PROBLEM-REPORT-FORM
+%doc README
+%doc VERSION
+
+%endif
+
+# ---------------- mpc ----------------
+
+%files -n mpc
+%defattr(-,root,root,-)
+%{_datadir}/mpc
+%config %{_sysconfdir}/profile.d/mpc.sh
+%{_bindir}/mpc.pl
+%{_bindir}/mwc.pl
+
+# ---------------- tao ----------------
+
+# NOTE - Some of the TAO service modules need to be found by dlopen at
+# runtime.  Currently this means these specific .so files need to be
+# shipped in the runtime package instead of the devel package.
+
+%files -n tao -f tao-svc-so.list
+%defattr(-,root,root,-)
+%{_datadir}/tao
+%exclude %{_datadir}/tao/MPC
+
+%{_libdir}/libTAO*.so.%{TAOVERSO}
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%exclude %{_libdir}/libTAO_FlResource.so*
+%endif
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%exclude %{_libdir}/libTAO_QtResource.so*
+%endif
+%if %{?_with_tk:1}%{!?_with_tk:0}
+%exclude %{_libdir}/libTAO_TkResource.so*
+%endif
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%exclude %{_libdir}/libTAO_XtResource.so*
+%endif
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/TAO-INSTALL.html
+%doc TAO/VERSION
+%doc TAO/README
+
+# ---------------- tao-devel ----------------
+
+# NOTE - Some of the TAO service modules need to be found by dlopen() at
+# runtime. Currently this means these specific .so files need to be
+# shipped in the runtime package instead of the development package.
+
+%files -n tao-devel -f tao-devel-files.list
+%defattr(-,root,root,-)
+%config %{_sysconfdir}/profile.d/tao-devel.sh
+
+%{_bindir}/tao_imr
+%{_bindir}/tao_ifr
+%{_datadir}/tao/MPC
+%{_bindir}/tao_idl
+%attr(0644,root,root) %doc %{_mandir}/man1/tao_idl.1%{_extension}
+%{_datadir}/tao/tao
+%{_datadir}/tao/orbsvcs
+
+# These get missed by the automatic list generator because they
+# contain no immediate files.
+%dir %{_includedir}/orbsvcs/FtRtEvent
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+%exclude %{_includedir}/tao/FlResource/FlResource_Factory.h
+%exclude %{_includedir}/tao/FlResource/FlResource_Loader.h
+%exclude %{_includedir}/tao/FlResource/TAO_FlResource_Export.h
+%exclude %{_libdir}/libTAO_FlResource.so
+%endif
+%if %{?_with_qt:1}%{!?_with_qt:0}
+%exclude %{_includedir}/tao/QtResource/QtResource_Factory.h
+%exclude %{_includedir}/tao/QtResource/QtResource_Loader.h
+%exclude %{_includedir}/tao/QtResource/TAO_QtResource_Export.h
+%exclude %{_libdir}/libTAO_QtResource.so
+%endif
+%if %{?_with_tk:1}%{!?_with_tk:0}
+%exclude %{_includedir}/tao/TkResource/TkResource_Factory.h
+%exclude %{_includedir}/tao/TkResource/TkResource_Loader.h
+%exclude %{_includedir}/tao/TkResource/TAO_TkResource_Export.h
+%exclude %{_libdir}/libTAO_TkResource.so
+%endif
+%if %{?_with_xt:1}%{!?_with_xt:0}
+%exclude %{_includedir}/tao/XtResource/XtResource_Factory.h
+%exclude %{_includedir}/tao/XtResource/XtResource_Loader.h
+%exclude %{_includedir}/tao/XtResource/TAO_XtResource_Export.h
+%exclude %{_libdir}/libTAO_XtResource.so
+%endif
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+# ---------------- tao-utils ----------------
+
+%files -n tao-utils
+%defattr(-,root,root,-)
+
+%{_bindir}/tao_catior
+%{_bindir}/tao_nsadd
+%{_bindir}/tao_nsdel
+%{_bindir}/tao_nslist
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+%doc TAO/utils/catior/README.catior
+%doc TAO/utils/nslist/README.nslist
+
+# ---------------- tao-cosnaming ----------------
+
+%files -n tao-cosnaming
+%defattr(-,root,root,-)
+
+%dir %{_sysconfdir}/tao
+
+%{_sbindir}/tao-cosnaming
+
+%if 0%{?suse_version}
+%{_sysconfdir}/init.d/tao-cosnaming
+%{_sbindir}/rctao-cosnaming
+%{_sysconfdir}/tao/tao-cosnaming
+%else
+%{_sysconfdir}/rc.d/init.d/tao-cosnaming
+%config(noreplace) %{_sysconfdir}/tao/tao-cosnaming.opt
+%endif
+
+%config(noreplace) %{_sysconfdir}/tao/tao-cosnaming.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tao-cosnaming
+%attr(-,tao,tao) %dir %{_localstatedir}/cache/tao
+%attr(0644,tao,tao) %ghost %{_localstatedir}/cache/tao/tao-cosnaming.dat
+%attr(-,tao,tao) %dir %{_localstatedir}/log/tao
+%attr(0644,tao,tao) %ghost %{_localstatedir}/log/tao/tao-cosnaming.log
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+# ---------------- tao-cosevent ----------------
+
+%files -n tao-cosevent
+%defattr(-,root,root,-)
+
+%dir %{_sysconfdir}/tao
+%{_sbindir}/tao-cosevent
+
+%if 0%{?suse_version}
+%{_sysconfdir}/init.d/tao-cosevent
+%{_sbindir}/rctao-cosevent
+%{_sysconfdir}/tao/tao-cosevent
+%else
+%{_sysconfdir}/rc.d/init.d/tao-cosevent
+%config(noreplace) %{_sysconfdir}/tao/tao-cosevent.opt
+%endif
+
+%config(noreplace) %{_sysconfdir}/tao/tao-cosevent.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tao-cosevent
+%attr(-,tao,tao) %dir %{_localstatedir}/log/tao
+%attr(0644,tao,tao) %ghost %{_localstatedir}/log/tao/tao-cosevent.log
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+# ---------------- tao-cosnotification ----------------
+
+%files -n tao-cosnotification
+%defattr(-,root,root,-)
+
+%{_sbindir}/tao-cosnotification
+%dir %{_sysconfdir}/tao
+
+%if 0%{?suse_version}
+%{_sysconfdir}/init.d/tao-cosnotification
+%{_sbindir}/rctao-cosnotification
+%{_sysconfdir}/tao/tao-cosnotification
+%else
+%{_sysconfdir}/rc.d/init.d/tao-cosnotification
+%config(noreplace) %{_sysconfdir}/tao/tao-cosnotification.opt
+%endif
+
+%config(noreplace) %{_sysconfdir}/tao/tao-cosnotification.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tao-cosnotification
+%attr(-,tao,tao) %dir %{_localstatedir}/log/tao
+%attr(0644,tao,tao) %ghost %{_localstatedir}/log/tao/tao-cosnotification.log
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+# ---------------- tao-costrading ----------------
+
+%files -n tao-costrading
+%defattr(-,root,root,-)
+
+%dir %{_sysconfdir}/tao
+
+%{_sbindir}/tao-costrading
+
+%if 0%{?suse_version}
+%{_sysconfdir}/init.d/tao-costrading
+%{_sbindir}/rctao-costrading
+%{_sysconfdir}/tao/tao-costrading
+%else
+%{_sysconfdir}/rc.d/init.d/tao-costrading
+%config(noreplace) %{_sysconfdir}/tao/tao-costrading.opt
+%endif
+
+%config(noreplace) %{_sysconfdir}/tao/tao-costrading.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tao-costrading
+%attr(-,tao,tao) %dir %{_localstatedir}/log/tao
+%attr(0644,tao,tao) %ghost %{_localstatedir}/log/tao/tao-costrading.log
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+# ---------------- tao-rtevent ----------------
+
+%files -n tao-rtevent
+%defattr(-,root,root,-)
+
+%dir %{_sysconfdir}/tao
+%{_sbindir}/tao-rtevent
+
+%if 0%{?suse_version}
+%{_sysconfdir}/init.d/tao-rtevent
+%{_sbindir}/rctao-rtevent
+%{_sysconfdir}/tao/tao-rtevent
+%else
+%{_sysconfdir}/rc.d/init.d/tao-rtevent
+%config(noreplace) %{_sysconfdir}/tao/tao-rtevent.opt
+%endif
+
+%config(noreplace) %{_sysconfdir}/tao/tao-rtevent.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tao-rtevent
+%attr(-,tao,tao) %dir %{_localstatedir}/log/tao
+%attr(0644,tao,tao) %ghost %{_localstatedir}/log/tao/tao-rtevent.log
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+# ---------------- tao-cosconcurrency ----------------
+
+%files -n tao-cosconcurrency
+%defattr(-,root,root,-)
+
+%dir %{_sysconfdir}/tao
+%{_sbindir}/tao-cosconcurrency
+
+%if 0%{?suse_version}
+%{_sysconfdir}/init.d/tao-cosconcurrency
+%{_sbindir}/rctao-cosconcurrency
+%{_sysconfdir}/tao/tao-cosconcurrency
+%else
+%{_sysconfdir}/rc.d/init.d/tao-cosconcurrency
+%config(noreplace) %{_sysconfdir}/tao/tao-cosconcurrency.opt
+%endif
+
+%config(noreplace) %{_sysconfdir}/tao/tao-cosconcurrency.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tao-cosconcurrency
+%attr(-,tao,tao) %dir %{_localstatedir}/log/tao
+%attr(0644,tao,tao) %ghost %{_localstatedir}/log/tao/tao-cosconcurrency.log
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+# ---------------- tao-flresource ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+
+%files -n tao-flresource
+%defattr(-,root,root,-)
+%{_libdir}/libTAO_FlResource.so.%{TAOVERSO}
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+%endif
+
+# ---------------- tao-flresource-devel ----------------
+
+%if %{?_with_fl:1}%{!?_with_fl:0}
+
+%files -n tao-flresource-devel
+%defattr(-,root,root,-)
+%{_libdir}/libTAO_FlResource.so
+%dir %{_includedir}/tao
+%{_includedir}/tao/FlResource/FlResource_Factory.h
+%{_includedir}/tao/FlResource/FlResource_Loader.h
+%{_includedir}/tao/FlResource/TAO_FlResource_Export.h
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+%endif
+
+# ---------------- tao-qtresource ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+
+%files -n tao-qtresource
+%defattr(-,root,root,-)
+%{_libdir}/libTAO_QtResource.so.%{TAOVERSO}
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+%endif
+
+# ---------------- tao-qtresource-devel ----------------
+
+%if %{?_with_qt:1}%{!?_with_qt:0}
+
+%files -n tao-qtresource-devel
+%defattr(-,root,root,-)
+%{_libdir}/libTAO_QtResource.so
+%dir %{_includedir}/tao
+%{_includedir}/tao/QtResource/QtResource_Factory.h
+%{_includedir}/tao/QtResource/QtResource_Loader.h
+%{_includedir}/tao/QtResource/TAO_QtResource_Export.h
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+%endif
+
+# ---------------- tao-tkresource ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+
+%files -n tao-tkresource
+%defattr(-,root,root,-)
+%{_libdir}/libTAO_TkResource.so.%{TAOVERSO}
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+%endif
+
+# ---------------- tao-tkresource-devel ----------------
+
+%if %{?_with_tk:1}%{!?_with_tk:0}
+
+%files -n tao-tkresource-devel
+%defattr(-,root,root,-)
+%{_libdir}/libTAO_TkResource.so
+%dir %{_includedir}/tao
+%{_includedir}/tao/TkResource/TkResource_Factory.h
+%{_includedir}/tao/TkResource/TkResource_Loader.h
+%{_includedir}/tao/TkResource/TAO_TkResource_Export.h
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+%endif
+
+# ---------------- tao-xtresource ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+
+%files -n tao-xtresource
+%defattr(-,root,root,-)
+%{_libdir}/libTAO_XtResource.so.%{TAOVERSO}
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+%endif
+
+# ---------------- tao-xtresource-devel ----------------
+
+%if %{?_with_xt:1}%{!?_with_xt:0}
+
+%files -n tao-xtresource-devel
+%defattr(-,root,root,-)
+%{_libdir}/libTAO_XtResource.so
+%dir %{_includedir}/tao
+%{_includedir}/tao/XtResource/XtResource_Factory.h
+%{_includedir}/tao/XtResource/XtResource_Loader.h
+%{_includedir}/tao/XtResource/TAO_XtResource_Export.h
+
+%doc TAO/COPYING
+%doc TAO/PROBLEM-REPORT-FORM
+%doc TAO/VERSION
+%doc TAO/README
+
+%endif
+
+
+%changelog
+* Thu Aug 11 2011 Thomas Lockhart <lockhart@fourpalms.org> 6.0.3-54
+- Parameterize code inlining. Defaults to not inlining which was the previous behavior.
+- Implement the rpmbuild options "--with inline" and "--without inline".
+
diff --git a/contrib/ACE_external/ace_external_6.0.3_install.sh b/contrib/ACE_external/ace_external_6.0.3_install.sh
new file mode 100755
index 00000000000..5b3b31f6376
--- /dev/null
+++ b/contrib/ACE_external/ace_external_6.0.3_install.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Manually set version of ACE before script run
+#
+version="6.0.3"
+prefix="/usr/local"
+#
+wget http://download.dre.vanderbilt.edu/previous_versions/ACE-$version.tar.gz
+tar xvfz ACE-$version.tar.gz
+cd ACE_wrappers
+mkdir objdir
+cd objdir
+../configure --disable-ace-tests --disable-ace-examples --prefix=$prefix
+make -j2
+make install
+cd /usr/lib
+ln -s $prefix/lib/libACE.so .
+ln -s $prefix/lib/libACE-$version.so .
+cd /usr/include/
+ln -s $prefix/include/ace/ .
diff --git a/contrib/ACE_external/ace_external_install.sh b/contrib/ACE_external/ace_external_install.sh
new file mode 100755
index 00000000000..28572c0d9b9
--- /dev/null
+++ b/contrib/ACE_external/ace_external_install.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# Manually set version of ACE before script run!
+# script usable for ACE versions 6.0.6 and above
+# insert your directories here
+# DO NOT FORGET remove preview version of ACE!
+#
+
+version="6.1.1"
+INSTALL_PREFIX=/usr/local; export INSTALL_PREFIX
+build_prefix="/usr/local/src"
+
+#
+ACE_ROOT=$build_prefix/ACE_wrappers; export ACE_ROOT
+
+setenv LD_LIBRARY_PATH $ACE_ROOT/lib:$LD_LIBRARY_PATH
+
+if [ ! -d $build_prefix ]; then
+    mkdir $build_prefix
+    fi
+
+cd $build_prefix
+wget http://download.dre.vanderbilt.edu/previous_versions/ACE-$version.tar.gz -P$build_prefix
+tar xvfz ACE-$version.tar.gz
+
+cd $ACE_ROOT
+
+echo '#include "ace/config-linux.h"' > $ACE_ROOT/ace/config.h
+echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > $ACE_ROOT/include/makeinclude/platform_macros.GNU
+
+make -j2 ACE TP_Reactor
+make install ACE TP_Reactor
diff --git a/contrib/addon/AiPlayerbot.toc b/contrib/addon/AiPlayerbot.toc
new file mode 100644
index 00000000000..cba03784d59
--- /dev/null
+++ b/contrib/addon/AiPlayerbot.toc
@@ -0,0 +1,6 @@
+## Title: Basic World of Warcraft AddOn
+## Version: 1.0
+## Author: skuzmin
+## Interface: 20400
+
+AiPlayerbotFrame.xml
\ No newline at end of file
diff --git a/contrib/addon/AiPlayerbot.wowproj b/contrib/addon/AiPlayerbot.wowproj
new file mode 100644
index 00000000000..b314b1bbad4
--- /dev/null
+++ b/contrib/addon/AiPlayerbot.wowproj
@@ -0,0 +1,38 @@
+<Project DefaultTargets="Deploy" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Default</Configuration>
+    <Name>AiPlayerbot</Name>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{87222322-7ac1-4154-9a3a-db6d944c5d7d}</ProjectGuid>
+    <AssemblyName>AiPlayerbot</AssemblyName>
+    <RootNamespace>AiPlayerbot</RootNamespace>
+    <WowPath>C:\Users\skuzmin\Projects\wow\wotlk\</WowPath>
+    <AddonTitle>AiPlayerbot</AddonTitle>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Default' ">
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WowAddonStudio\2.0\WowAddonStudio.targets" />
+  <ItemGroup>
+    <Content Include="AiPlayerbot.toc">
+      <SubType>TableOfContents</SubType>
+    </Content>
+    <Content Include="AiPlayerbotFrame.xml">
+      <SubType>Frame</SubType>
+    </Content>
+    <Content Include="AiPlayerbotFrame.lua">
+      <SubType>Code</SubType>
+      <DependentUpon>AiPlayerbotFrame.xml</DependentUpon>
+    </Content>
+  </ItemGroup>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it. 
+		
+	<Target Name="BeforeClean"></Target>
+	<Target Name="AfterClean"></Target>
+	<Target Name="BeforeRebuild"></Target>
+	<Target Name="AfterRebuild"></Target>
+	<Target Name="BeforeDeploy"></Target>
+	<Target Name="AfterDeploy"></Target>
+	-->
+</Project>
\ No newline at end of file
diff --git a/contrib/addon/AiPlayerbot.wowsln b/contrib/addon/AiPlayerbot.wowsln
new file mode 100644
index 00000000000..c99c35e005e
--- /dev/null
+++ b/contrib/addon/AiPlayerbot.wowsln
@@ -0,0 +1,17 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# WowAddonStudio Solution File, Format Version 10.00
+Project("{E6E1D386-69D8-4755-9E61-0950293915FC}") = "AiPlayerbot", "AiPlayerbot.wowproj", "{87222322-7AC1-4154-9A3A-DB6D944C5D7D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Default|Any CPU = Default|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{87222322-7AC1-4154-9A3A-DB6D944C5D7D}.Default|Any CPU.ActiveCfg = Default|Any CPU
+		{87222322-7AC1-4154-9A3A-DB6D944C5D7D}.Default|Any CPU.Build.0 = Default|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/contrib/addon/AiPlayerbotFrame.lua b/contrib/addon/AiPlayerbotFrame.lua
new file mode 100644
index 00000000000..10311c4f3d0
--- /dev/null
+++ b/contrib/addon/AiPlayerbotFrame.lua
@@ -0,0 +1,102 @@
+-- Author      : ike3
+
+botlist = {}
+
+function AiPlayerbotFrame_OnLoad(self)
+	print("Loading AiPlayerbot...")
+    self:RegisterEvent("CHAT_MSG_WHISPER")
+    self:RegisterEvent("PARTY_MEMBERS_CHANGED")
+    QueryBots()
+end
+
+function AiPlayerbotFrame_OnEvent(self, event, ...)
+    if (event == "CHAT_MSG_WHISPER") then
+        HandleWhisper(...)
+    elseif (event == "PARTY_MEMBERS_CHANGED") then
+        QueryBots()
+    end
+end
+
+function AiPlayerbotFrame_OnUpdate()
+end
+
+function AiPlayerbotFrame_OnClick()
+    SendToBots("co ?", function(bot, message)
+        bot.co = message
+        Update(bot)
+        SendToBot(bot, "nc ?", function(bot, message)
+            bot.nc = message
+            Update(bot)
+        end)
+    end)
+end
+
+function Update(bot)
+    print(bot.name .. " co " .. bot.co .. ", nc " .. bot.nc)
+end
+
+function QueryBots()
+    botlist = {}
+    IterateParty(function(name)
+        SendChatMessage("botquery", WHISPER, nil, name)
+    end)
+end
+
+function HandleWhisper(message, sender, language, channelString, target, flags, unknown, channelNumber, channelName, unknown, counter, guid)
+    if (message == nil) then
+        return
+    end
+
+    if (string.find(message, "botquery")) then
+        AddBot(sender)
+    end
+
+    if (botlist[sender]) then
+        HandleBotWhisper(sender, message)
+    end
+end
+
+function HandleBotWhisper(sender, message)
+    local bot = botlist[sender]
+    if (bot and bot.command and bot.callback) then
+        bot.callback(bot, message)
+    elseif (bot) then
+    end
+end
+
+function AddBot(botName)
+    print(botName .. " is a bot")
+    botlist[botName] = {name = botName}
+end
+
+function IterateParty(action)
+	local a,b = GetNumRaidMembers(), "raid" 
+    if a == 0 then 
+        a = GetNumPartyMembers() 
+        b="party" 
+    end 
+
+	for i = 1, a do 
+        local name=GetUnitName(b..i, false)
+        action(name)
+	end
+end
+
+function SendToBots(command, callback)
+    IterateParty(function(name) 
+        local bot = botlist[name]
+        if (bot) then
+            bot.command = command
+            bot.callback = callback
+            bot.co = "?"
+            bot.nc = "?"
+            SendChatMessage(command, WHISPER, nil, name)
+        end
+    end)
+end
+
+function SendToBot(bot, command, callback)
+    bot.command = command
+    bot.callback = callback
+    SendChatMessage(command, WHISPER, nil, bot.name)
+end
\ No newline at end of file
diff --git a/contrib/addon/AiPlayerbotFrame.xml b/contrib/addon/AiPlayerbotFrame.xml
new file mode 100644
index 00000000000..3ebe5f506d4
--- /dev/null
+++ b/contrib/addon/AiPlayerbotFrame.xml
@@ -0,0 +1,41 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Script file="AiPlayerbotFrame.lua" />
+  <Frame name="AiPlayerbotFrame" parent="UIParent" toplevel="false" movable="false" enableMouse="true" hidden="false">
+    <Size>
+      <AbsDimension x="50" y="50" />
+    </Size>
+    <Anchors>
+      <Anchor point="CENTER" />
+    </Anchors>
+    <Backdrop bgFile="Interface\DialogFrame\UI-DialogBox-Background" edgeFile="Interface\DialogFrame\UI-DialogBox-Border" tile="true">
+			<BackgroundInsets>
+				<AbsInset left="11" right="12" top="12" bottom="11" />
+			</BackgroundInsets>
+			<TileSize>
+				<AbsValue val="32" />
+			</TileSize>
+			<EdgeSize>
+				<AbsValue val="32" />
+			</EdgeSize>
+		</Backdrop>
+    <Frames>
+      <Button name="button" text="Clickme!">
+        <Anchors>
+          <Anchor point="CENTER" />
+        </Anchors>
+        <Size>
+          <AbsDimension x="50" y="50" />
+        </Size>
+        <Scripts>
+          <OnClick function="AiPlayerbotFrame_OnClick"/>
+        </Scripts>
+      </Button>
+    </Frames>
+    <Scripts>
+      <OnLoad function="AiPlayerbotFrame_OnLoad"/>
+      <OnEvent function="AiPlayerbotFrame_OnEvent"/>
+      <OnUpdate function="AiPlayerbotFrame_OnUpdate"/>
+    </Scripts>
+      
+	</Frame>
+</Ui>
\ No newline at end of file
diff --git a/contrib/cleanupTools/.gitignore b/contrib/cleanupTools/.gitignore
new file mode 100644
index 00000000000..5b5118b5b00
--- /dev/null
+++ b/contrib/cleanupTools/.gitignore
@@ -0,0 +1 @@
+cleanupTools.config
diff --git a/contrib/cleanupTools/cleanupHistory.sh b/contrib/cleanupTools/cleanupHistory.sh
new file mode 100644
index 00000000000..22ede2a3a42
--- /dev/null
+++ b/contrib/cleanupTools/cleanupHistory.sh
@@ -0,0 +1,133 @@
+#!/bin/sh
+#
+# Tool to rebase a branch with cleaned commits
+#
+# Required:
+# - some tool for the cleanup
+# - base commit from which on the current branch shall be cleaned
+
+# Do config stuff
+sh "${0%/*}/cleanupToolConfig.sh"
+if [ "$?" != "0" ]
+then
+  echo "You need to edit the configuration file before you can use this tool!"
+  echo "Configuration file: ${0%/*}/cleanupTools.config"
+  exit 0
+fi
+
+# And use config settings
+. "${0%/*}/cleanupTools.config"
+
+if [ "$BASE_COMMIT" = "" ]
+then
+  echo "You did not specify a base-commit onto which to rebuild history"
+  echo "or another unexpected error happened.."
+  exit 1
+fi
+
+# First: commit all changes onto current branch
+git commit -a -m"Cleanup History Commit: Pending Changes of WorkDir"
+
+# Create list of commits that needs to be processed
+COMMIT_LIST=`git log --reverse --format=format:"%H" $BASE_COMMIT..HEAD`
+
+# prepare history_cleanup branch
+git checkout -b history_cleanup $BASE_COMMIT
+# cleanup history
+echo "Cleanup History Tool: Cleanup initial state before rewriting history(might result in an empty commit)"
+$CLEANUP_TOOL > /dev/null
+git commit -a -m"Cleanup History Commit: Cleanup state before starting cleaning history"
+
+for commit in $COMMIT_LIST
+do
+  git checkout -b history_cleanup_tmp $commit
+  [[ $? != 0 ]] && exit 1
+  echo "Cleanup History Tool: Cleanup after commit $commit)"
+  $CLEANUP_TOOL > /dev/null
+  git commit -a -m"Cleanup History Commit: Temp cleaned" --allow-empty
+  [[ $? != 0 ]] && exit 1
+  git checkout history_cleanup
+  [[ $? != 0 ]] && exit 1
+
+  ## Catch differences
+  git diff --binary history_cleanup..history_cleanup_tmp > history_cleanup_tmp.patch
+
+  # Get committer information to store it
+  COMMITTER_N=$(git show -s --pretty=format:'%cn' ${commit})
+  [[ $? != 0 ]] && exit 1
+  COMMITTER_M=$(git show -s --pretty=format:'%ce' ${commit})
+  [[ $? != 0 ]] && exit 1
+  COMMITTER_D=$(git show -s --pretty=format:'%cd' ${commit})
+  [[ $? != 0 ]] && exit 1
+  GIT_COMMITTER_NAME=$COMMITTER_N; GIT_COMMITTER_EMAIL=$COMMITTER_M; GIT_COMMITTER_DATE=$COMMITTER_D;
+  export GIT_COMMITTER_NAME; export GIT_COMMITTER_EMAIL; export GIT_COMMITTER_DATE;
+
+  # Two cases: either diff is identical to original commit, or not
+  git diff --binary $commit^..$commit > history_cleanup_compare.patch
+  DIFF_COUNT=`diff history_cleanup_tmp.patch history_cleanup_compare.patch | grep ">" | grep -v "> index " | wc -l`
+  echo "Current State: Diffcount=$DIFF_COUNT"
+  if [ "$DIFF_COUNT" = "      0" ]
+  then  # identical# TODO this is too strict!
+    git cherry-pick $commit
+  else  # different, use new commit
+      # commit object hash
+      COMMIT_HASH=$(git show -s --pretty=format:'%h' ${commit})
+      [[ $? != 0 ]] && exit 1
+      # subject
+      COMMIT_SUBJECT=$(git show -s --pretty=format:'%s' ${commit})
+      [[ $? != 0 ]] && exit 1
+      # body
+      COMMIT_BODY=$(git show -s --pretty=format:'%b' ${commit})
+      [[ $? != 0 ]] && exit 1
+      # whole message
+      COMMIT_MESSAGE=$(echo -e "${COMMIT_SUBJECT}\n\n${COMMIT_BODY}\n\n(cleaned version of ${COMMIT_HASH})")
+      [[ $? != 0 ]] && exit 1
+
+      # Apply Cleaned changeset
+      git apply history_cleanup_tmp.patch
+      if [ $? != 0 ]
+      then
+        echo "Could not apply patch with git methods, try with patch tool directly? (y/n)"
+        read line
+        if [ "$line" = "y" ]
+        then
+          patch -p1 -d. < history_cleanup_tmp.patch
+          echo "Please check manually if this worked.."
+          echo "Did it work? (y/n)"
+          read line
+          if [ "$line" != "y" ]
+          then
+            exit 1
+          fi
+        fi
+      fi
+      if [ $? != 0 ]
+      then
+        echo "Could not apply patch, store in history_cleanup_tmp.patch"
+        exit 1
+      fi
+
+      # Git add new files
+      NEW_FILES_LIST=`grep -B1 "new file mode" history_cleanup_tmp.patch | grep "diff --git a/" | sed 's!diff --git a/\(.*\) .*!\1!'`
+      for fline in $NEW_FILES_LIST
+      do
+        git add $fline
+        [[ $? != 0 ]] && exit 1
+      done
+
+      # Commit just created commit with original information
+      git commit -a --allow-empty -C"$commit"
+      [[ $? != 0 ]] && exit 1
+      git commit --amend --allow-empty -m"${COMMIT_MESSAGE}"
+      [[ $? != 0 ]] && exit 1
+  fi
+
+  git branch -D history_cleanup_tmp
+  [[ $? != 0 ]] && exit 1
+done
+
+rm history_cleanup_tmp.patch
+rm history_cleanup_compare.patch
+
+GIT_COMMITTER_NAME=""; GIT_COMMITTER_EMAIL=""; GIT_COMMITTER_DATE="";
+export GIT_COMMITTER_NAME; export GIT_COMMITTER_EMAIL; export GIT_COMMITTER_DATE;
diff --git a/contrib/cleanupTools/cleanupStyle.sh b/contrib/cleanupTools/cleanupStyle.sh
new file mode 100644
index 00000000000..5b8dbb66ad7
--- /dev/null
+++ b/contrib/cleanupTools/cleanupStyle.sh
@@ -0,0 +1,203 @@
+#!/bin/sh
+
+# SUPPORTED: ASTYLE COMMENT_STYLE OVERRIDE_CORRECTNESS
+# ASTYLE                    <- runs AStyle
+# COMMENT_STYLE             <- converts //bla to // bla (note, // Bla might be better, but this would conflict with code (at least)
+# Use at own Risk:
+# OVERRIDE_CORRECTNESS[2]   <- Appends override correctness (add 2 for second pass)
+
+# Do config stuff
+sh "${0%/*}/cleanupToolConfig.sh"
+if [ "$?" != "0" ]
+then
+  echo "You need to edit the configuration file before you can use this tool!"
+  echo "Configuration file: ${0%/*}/cleanupTools.config"
+  exit 0
+fi
+
+# And use config settings
+. "${0%/*}/cleanupTools.config"
+
+
+## Internal Stuff
+
+# Mangos Cleanup options for AStyle
+OPTIONS="--convert-tabs --align-pointer=type --suffix=none \
+          --keep-one-line-blocks --keep-one-line-statements \
+          --indent-classes --indent-switches --indent-namespaces \
+          --pad-header --unpad-paren --pad-oper --style=allman"
+
+if [ "$DO_ON" = "MANGOS_SRC" ]
+then
+  FILEPATH=$BASEPATH/src
+  OPTIONS="$OPTIONS --exclude=ScriptDev2"
+elif [ "$DO_ON" = "MANGOS_CONTRIB" ]
+then
+  FILEPATH=$BASEPATH/contrib
+elif [ "$DO_ON" = "MANGOS_WHOLE" ]
+then
+  FILEPATH=$BASEPATH
+  OPTIONS="$OPTIONS --exclude=ScriptDev2"
+elif [ "$DO_ON" = "SD2" ]
+then
+  FILEPATH=$BASEPATH/src/bindings/ScriptDev2
+else
+  exit 1
+fi
+
+OPTIONS="$OPTIONS --recursive"
+
+####################################################################################################
+##                              USING ASTYLE UPDATING                                             ##
+####################################################################################################
+if [ $DO = ASTYLE ]
+then
+  echo "Process $FILEPATH with options $MOPTIONS"
+  $ASTYLE $OPTIONS "$FILEPATH/*.cpp" "$FILEPATH/*.h"
+
+  #Restore style of auto-generated sql-files
+  if [ "$DO_ON" = "MANGOS_SRC" -o "$DO_ON" = "MANGOS_WHOLE" ]
+  then
+      if [ -f "$BASEPATH/src/shared/revision_nr.h" ]
+      then
+        sed 's/^#define REVISION_NR/ #define REVISION_NR/g' < ${BASEPATH}/src/shared/revision_nr.h > temp
+        mv temp "$BASEPATH/src/shared/revision_nr.h"
+      fi
+      if [ -f "$BASEPATH/src/shared/revision_sql.h" ]
+      then
+        sed 's/^#define REVISION_DB/ #define REVISION_DB/g' < ${BASEPATH}/src/shared/revision_sql.h > temp
+        mv temp "$BASEPATH/src/shared/revision_sql.h"
+      fi
+  elif [ "$DO_ON" = "SD2" ]
+  then
+    if [ -f "$BASEPATH/src/bindings/ScriptDev2/sd2_revision_nr.h" ]
+      then
+        sed 's/^#define SD2_REVISION_NR/ #define SD2_REVISION_NR/g' < ${BASEPATH}/src/bindings/ScriptDev2/sd2_revision_nr.h > temp
+        mv temp "$BASEPATH/src/bindings/ScriptDev2/sd2_revision_nr.h"
+      fi
+  fi
+
+  echo "Processing $DO on $DO_ON done"
+  exit 0
+fi
+
+
+####################################################################################################
+##                                     UNIFYING COMMENTS                                          ##
+####################################################################################################
+## Make comments neater //bla => // bla ## note for uppercase  s:\// \([a-z]\):// \1:g
+if [ $DO = COMMENT_STYLE ]
+then
+  if [ "$DO_ON" = "MANGOS_SRC" ]
+  then
+    LIST=`find ${BASEPATH}/src/ -path "${BASEPATH}/src/bindings/ScriptDev2" -prune -o -type f -iname "*.cpp" -print -o -iname "*.h" -print `
+  elif [ "$DO_ON" = "SD2" ]
+  then
+    LIST=`find ${BASEPATH}/src/bindings/ScriptDev2 -type f -iname "*.cpp" -o -iname "*.h" `
+  else
+    echo "Unsupported combination with DO and DO_ON"
+    exit 1
+  fi
+
+  for l in $LIST
+  do
+    echo "Converting comments in $l"
+    sed '/http:/ !s:\//\([a-zA-Z0-9]\):// \1:g;
+         s#^\(............................................................\) [ ]*//#\1//#g;
+         /^..............................................\/[\/]*$/ !s#^\(..................................................\)//#\1          //#g; ' "$l" > temp
+    if [ "$?" != "0" ]
+    then
+      echo "An error HAPPENED"
+      exit 1
+    fi
+
+    mv temp "$l"
+  done
+
+  echo "Processing $DO on $DO_ON done"
+  exit 0
+fi
+
+####################################################################################################
+##                                    OVERRIDE CORRECTNESS                                        ##
+####################################################################################################
+# use OVERRIDE_CORRECTNESS  to create helper file listing all virtual methods
+# use OVERRIDE_CORRECTNESS2 to add the word "override" after all functions with virtual names
+
+if [ "$DO_ON" != "MANGOS_SRC" -a "$DO_ON" != "SD2" ]
+then
+  echo "OVERRIDE atm only supported for MANGOS_SRC or SD2 target"
+  exit 0
+fi
+
+if [ $DO = OVERRIDE_CORRECTNESS ]
+then
+  #Create a list of all virtual functions in mangos (class scope)
+  if [ $DO_ON = MANGOS_SRC ]
+  then
+    HEADERLIST=`find ${BASEPATH}/src/ -path "${BASEPATH}/src/bindings/ScriptDev2" -prune -o -type f -iname "*.h" -print`
+  else
+    HEADERLIST=`find ${BASEPATH}/src/bindings/ScriptDev2 -type f -iname "*.h"`
+    HEADERLIST="${HEADERLIST} ${BASEPATH}/src/game/CreatureAI.h"
+    HEADERLIST="${HEADERLIST} ${BASEPATH}/src/game/InstanceData.h"
+  fi
+
+  rm virtuals
+  for h in $HEADERLIST
+  do
+    grep "virtual" "$h" >> virtuals
+  done
+
+  #Filter comment lines
+  sed -n '/^[ ]*\/\// !p' virtuals | sed -n '/^[ ]*\/\*/ !p' | \
+  ##Get function name
+  sed -r -n '/^[ ]*virtual[ ][ ]*const[\*]*[ ][ ]*[a-zA-Z_~0-9\*:&]*[ ][ ]*const[\*]*[ ][]*[a-zA-Z_~0-9]*[ ]*\(.*\)/ { s/^[ ]*virtual[ ]*const[ ]*[a-zA-Z_~0-9\*:]*[ ]*const[ ]*([a-zA-Z_~0-9]*).*/\1/g; tEnde}
+       /^[ ]*virtual[ ][ ]*const[\*]*[ ][ ]*[a-zA-Z_~0-9\*:&]*[ ][ ]*[a-zA-Z_~0-9]*[ ]*\(.*\)/                       { s/^[ ]*virtual[ ]*const[ ]*[a-zA-Z_~0-9\*:]*[ ]*([a-zA-Z_~0-9]*).*/\1/g;          tEnde}
+       /^[ ]*virtual[ ][ ]*[a-zA-Z_~0-9\*:&]*[ ][ ]*const[\*]*[ ][ ]*[a-zA-Z_~0-9]*[ ]*\(.*\)/                       { s/^[ ]*virtual[ ]*[a-zA-Z_~0-9\*:]*[ ]*const[\*]*[ ]*([a-zA-Z_~0-9]*).*/\1/g;          tEnde}
+       /^[ ]*virtual[ ]*[a-zA-Z_~0-9\*:&]*[ ][ ]*[a-zA-Z_~0-9]*[ ]*\(.*\)/                                           { s/^[ ]*virtual[ ]*[a-zA-Z_~0-9\*:]*[ ][ ]*([a-zA-Z_~0-9]*).*/\1/g;}
+       :Ende; p' > virtualNames
+
+  ##Make its entries unique
+  sort < virtualNames > virtuals
+  uniq  < virtuals > virtualNames
+
+  echo "Check file virtualNames for inconsitencies!"
+  rm virtuals
+
+  echo "Processing $DO on $DO_ON done"
+  exit 0
+fi
+
+if [ $DO = OVERRIDE_CORRECTNESS2 ]
+then
+  ## Assume virtualNames is good
+  if [ $DO_ON = MANGOS_SRC ]
+  then
+    FILELIST=`find ${BASEPATH}/src/ -path "${BASEPATH}/src/bindings/ScriptDev2" -prune -o -type f -iname "*.h" -print`
+  else
+    FILELIST=`find ${BASEPATH}/src/bindings/ScriptDev2 -type f -iname "*.cpp" -o -iname "*.h"`
+  fi
+
+  for h in $FILELIST
+  do
+    echo "Progress file $h"
+    while read f
+    do
+      # basic pattern: NAME(..)...[;]
+      PARSE="s/( "$f"\(.*\)[ ]*const[\*]*);/\1 override;/g; t
+             s/( "$f"\(.*\));/\1 override;/g; t
+             s/( "$f"\(.*\)[ ]*const[\*]*)$/\1 override/g; t
+             s/( "$f"\(.*\))$/\1 override/g; t
+             s/( "$f"\(.*\)[ ]*const[\*]*)([ ].*)/\1 override\2/g; t
+             s/( "$f"\(.*\))([ ].*)/\1 override\2/g"
+      sed -r "$PARSE" "$h" > temp
+      mv temp "$h"
+    done < virtualNames
+  done
+
+  echo "Processing $DO on $DO_ON done"
+  exit 0
+
+fi
+
+exit 0
diff --git a/contrib/cleanupTools/cleanupToolConfig.sh b/contrib/cleanupTools/cleanupToolConfig.sh
new file mode 100644
index 00000000000..63a2f7cbe18
--- /dev/null
+++ b/contrib/cleanupTools/cleanupToolConfig.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# Helper script to create a config file for the cleanup tools
+# The created config file must be edited manually
+
+
+if [ -f "${0%/*}/cleanupTools.config" ]
+then
+  # file already exists, exit
+  exit 0
+fi
+
+# Create file
+cat << EOF > "${0%/*}/cleanupTools.config"
+#!/bin/sh
+
+# Basic configuration for the cleanup helper scripts with mangos
+# Be sure to read this whole file and edit the variables as required
+#
+############################################################
+#               Generic options:
+############################################################
+# Define the path to <MaNGOS> folder relatively from where you want to call the scripts.
+# The cleanupHistory.sh script must be called from within the repository that is to be cleaned!
+#
+BASEPATH="."
+#
+# Path to Astyle from the <MaNGOS> directory
+ASTYLE="../AStyle/bin/AStyle.exe"
+
+
+############################################################
+#               The cleanupStyle.sh tool:
+############################################################
+# Job selection options are:
+#   DO with possible choices:       ASTYLE (to call the Astyle tool)
+#                                   COMMENT_STYLE (to change comments from //foo to // foo and align them to column 61 if possible
+#                                   OVERRIDE_CORRECTNESS[2] use at own RISK, this is maybe not too usefull
+DO="ASTYLE"
+#
+#   DO_ON with possible choices:    MANGOS_SRC      to invoke the above cleanup routine on <MaNGOS>/src directory and subdirectories
+#                                   MANGOS_CONTRIB  to invoke the above cleanup routine on <MaNGOS>/contrib directory and subdirectories
+#                                   MANGOS_WHOLE    to invoke the above cleanup routine on <MaNGOS> directory and subdirectories
+#                                   SD2             to invoke the above cleanup routine on <MaNGOS>/src/bindings/ScriptDev2 directory and subdirectories
+DO_ON="MANGOS_SRC"
+
+
+############################################################
+#               The cleanupHistory.sh tool:
+############################################################
+# This tool will USE the cleanupStyle.sh tool to cleanup the history of the current branch with the settings above
+# It will clean the history based on the variable BASE_COMMIT that needs to be defined here
+BASE_COMMIT=""
+
+
+
+###
+# Internal variables, do not change except you know what you are doing
+###
+# cleanup-tool
+CLEANUP_TOOL="\$BASEPATH/contrib/cleanupTools/cleanupStyle.sh"
+# path from current's caller position to ASTYLE
+ASTYLE="\$BASEPATH/\$ASTYLE"
+
+EOF
+
+# Return wil error, to display message if file is not found
+exit 1
diff --git a/contrib/dbcEditer/SearchFrm.dfm b/contrib/dbcEditer/SearchFrm.dfm
index 06a3613a727..134c881cbfb 100644
--- a/contrib/dbcEditer/SearchFrm.dfm
+++ b/contrib/dbcEditer/SearchFrm.dfm
@@ -1,63 +1,63 @@
-object FrmSearch: TFrmSearch
-  Left = 261
-  Top = 194
-  Width = 324
-  Height = 215
-  Caption = 'Seach F3 Seach Next'
-  Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  OldCreateOrder = False
-  PixelsPerInch = 96
-  TextHeight = 13
-  object lbseach: TLabel
-    Left = 48
-    Top = 16
-    Width = 57
-    Height = 17
-    AutoSize = False
-    Caption = 'Input:'
-  end
-  object rgSI: TRadioGroup
-    Left = 64
-    Top = 40
-    Width = 185
-    Height = 97
-    Caption = 'Seach Dir'
-    ItemIndex = 1
-    Items.Strings = (
-      'Seach up'
-      'Seach down'
-      'Seach up Current rol'
-      'Seach down Current rol')
-    TabOrder = 0
-  end
-  object edSeach: TEdit
-    Left = 120
-    Top = 16
-    Width = 121
-    Height = 21
-    TabOrder = 1
-  end
-  object btOk: TButton
-    Left = 64
-    Top = 152
-    Width = 75
-    Height = 25
-    Caption = 'Ok'
-    TabOrder = 2
-    OnClick = btOkClick
-  end
-  object btCancel: TButton
-    Left = 176
-    Top = 152
-    Width = 75
-    Height = 25
-    Caption = 'Cancel'
-    TabOrder = 3
-    OnClick = btCancelClick
-  end
-end
+object FrmSearch: TFrmSearch
+  Left = 261
+  Top = 194
+  Width = 324
+  Height = 215
+  Caption = 'Seach F3 Seach Next'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  PixelsPerInch = 96
+  TextHeight = 13
+  object lbseach: TLabel
+    Left = 48
+    Top = 16
+    Width = 57
+    Height = 17
+    AutoSize = False
+    Caption = 'Input:'
+  end
+  object rgSI: TRadioGroup
+    Left = 64
+    Top = 40
+    Width = 185
+    Height = 97
+    Caption = 'Seach Dir'
+    ItemIndex = 1
+    Items.Strings = (
+      'Seach up'
+      'Seach down'
+      'Seach up Current rol'
+      'Seach down Current rol')
+    TabOrder = 0
+  end
+  object edSeach: TEdit
+    Left = 120
+    Top = 16
+    Width = 121
+    Height = 21
+    TabOrder = 1
+  end
+  object btOk: TButton
+    Left = 64
+    Top = 152
+    Width = 75
+    Height = 25
+    Caption = 'Ok'
+    TabOrder = 2
+    OnClick = btOkClick
+  end
+  object btCancel: TButton
+    Left = 176
+    Top = 152
+    Width = 75
+    Height = 25
+    Caption = 'Cancel'
+    TabOrder = 3
+    OnClick = btCancelClick
+  end
+end
diff --git a/contrib/dbcEditer/TitleFrm.dfm b/contrib/dbcEditer/TitleFrm.dfm
index 0d1570f38bf..3f472d59bcf 100644
--- a/contrib/dbcEditer/TitleFrm.dfm
+++ b/contrib/dbcEditer/TitleFrm.dfm
@@ -1,51 +1,51 @@
-object FrmTitle: TFrmTitle
-  Left = 328
-  Top = 252
-  Width = 235
-  Height = 112
-  BorderIcons = [biSystemMenu]
-  Caption = 'Col Title'
-  Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  OldCreateOrder = False
-  Position = poDesktopCenter
-  PixelsPerInch = 96
-  TextHeight = 13
-  object Label1: TLabel
-    Left = 8
-    Top = 24
-    Width = 65
-    Height = 13
-    AutoSize = False
-    Caption = 'Title:'
-  end
-  object edTitle: TEdit
-    Left = 80
-    Top = 16
-    Width = 121
-    Height = 21
-    TabOrder = 0
-  end
-  object Button1: TButton
-    Left = 24
-    Top = 48
-    Width = 75
-    Height = 25
-    Caption = 'Ok'
-    TabOrder = 1
-    OnClick = Button1Click
-  end
-  object Button2: TButton
-    Left = 136
-    Top = 48
-    Width = 75
-    Height = 25
-    Caption = 'Cancel'
-    TabOrder = 2
-    OnClick = Button2Click
-  end
-end
+object FrmTitle: TFrmTitle
+  Left = 328
+  Top = 252
+  Width = 235
+  Height = 112
+  BorderIcons = [biSystemMenu]
+  Caption = 'Col Title'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poDesktopCenter
+  PixelsPerInch = 96
+  TextHeight = 13
+  object Label1: TLabel
+    Left = 8
+    Top = 24
+    Width = 65
+    Height = 13
+    AutoSize = False
+    Caption = 'Title:'
+  end
+  object edTitle: TEdit
+    Left = 80
+    Top = 16
+    Width = 121
+    Height = 21
+    TabOrder = 0
+  end
+  object Button1: TButton
+    Left = 24
+    Top = 48
+    Width = 75
+    Height = 25
+    Caption = 'Ok'
+    TabOrder = 1
+    OnClick = Button1Click
+  end
+  object Button2: TButton
+    Left = 136
+    Top = 48
+    Width = 75
+    Height = 25
+    Caption = 'Cancel'
+    TabOrder = 2
+    OnClick = Button2Click
+  end
+end
diff --git a/contrib/dbcEditer/dbcedit.dfm b/contrib/dbcEditer/dbcedit.dfm
index 0750c97cd41..24bf375ab74 100644
--- a/contrib/dbcEditer/dbcedit.dfm
+++ b/contrib/dbcEditer/dbcedit.dfm
@@ -1,1259 +1,1259 @@
-object FrmMain: TFrmMain
-  Left = 162
-  Top = 122
-  Width = 544
-  Height = 375
-  Caption = 'Dbc Editer v1.4.2 Vendy  QQ:11177905'
-  Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  OldCreateOrder = False
-  OnDestroy = FormDestroy
-  PixelsPerInch = 96
-  TextHeight = 13
-  object Panel1: TPanel
-    Left = 0
-    Top = 33
-    Width = 536
-    Height = 315
-    Align = alClient
-    Caption = 'Panel1'
-    TabOrder = 0
-    object sgEdit: TStringGrid
-      Left = 1
-      Top = 1
-      Width = 534
-      Height = 287
-      Align = alClient
-      Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goDrawFocusSelected, goRowSizing, goColSizing, goEditing]
-      PopupMenu = PopupMenu1
-      TabOrder = 0
-      OnKeyDown = sgEditKeyDown
-      OnSelectCell = sgEditSelectCell
-    end
-    object pnFileName: TPanel
-      Left = 1
-      Top = 288
-      Width = 534
-      Height = 26
-      Align = alBottom
-      Alignment = taLeftJustify
-      Caption = 'pnFileName'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clRed
-      Font.Height = -11
-      Font.Name = 'MS Sans Serif'
-      Font.Style = [fsBold]
-      ParentFont = False
-      TabOrder = 1
-      object lbOpState: TLabel
-        Left = 444
-        Top = 1
-        Width = 89
-        Height = 24
-        Align = alRight
-        AutoSize = False
-        Caption = #25171#24320#25991#20214#29366#24577
-      end
-    end
-  end
-  object CoolBar1: TCoolBar
-    Left = 0
-    Top = 0
-    Width = 536
-    Height = 33
-    Bands = <
-      item
-        Control = ToolBar1
-        ImageIndex = -1
-        Width = 532
-      end>
-    object ToolBar1: TToolBar
-      Left = 9
-      Top = 0
-      Width = 519
-      Height = 25
-      Caption = 'ToolBar1'
-      Images = ImageList1
-      TabOrder = 0
-      object btOpen: TToolButton
-        Left = 0
-        Top = 2
-        Caption = 'btOpen'
-        ImageIndex = 7
-        OnClick = btOpenClick
-      end
-      object btSave: TToolButton
-        Left = 23
-        Top = 2
-        Caption = 'btSave'
-        Enabled = False
-        Grouped = True
-        ImageIndex = 8
-        OnClick = btSaveClick
-      end
-      object ToolButton2: TToolButton
-        Left = 46
-        Top = 2
-        Width = 8
-        Caption = 'ToolButton2'
-        ImageIndex = 10
-        Style = tbsSeparator
-      end
-      object ToolButton1: TToolButton
-        Left = 54
-        Top = 2
-        Caption = 'ToolButton1'
-        ImageIndex = 9
-        OnClick = ToolButton1Click
-      end
-      object ToolButton3: TToolButton
-        Left = 77
-        Top = 2
-        Caption = 'ToolButton3'
-        ImageIndex = 10
-        OnClick = ToolButton3Click
-      end
-      object ToolButton5: TToolButton
-        Left = 100
-        Top = 2
-        Width = 8
-        Caption = 'ToolButton5'
-        ImageIndex = 12
-        Style = tbsSeparator
-      end
-      object ToolButton4: TToolButton
-        Left = 108
-        Top = 2
-        Caption = 'ToolButton4'
-        ImageIndex = 11
-        OnClick = ToolButton4Click
-      end
-    end
-  end
-  object OpenDialog1: TOpenDialog
-    Filter = '.dbc|*.dbc'
-    Left = 216
-    Top = 96
-  end
-  object PopupMenu1: TPopupMenu
-    OnPopup = PopupMenu1Popup
-    Left = 264
-    Top = 96
-    object N1: TMenuItem
-      Caption = 'Set Current Col Title'
-      OnClick = N1Click
-    end
-    object N2: TMenuItem
-      Caption = 'Set Current Col Type'
-      object btIntType: TMenuItem
-        Caption = 'INT'
-        OnClick = btIntTypeClick
-      end
-      object btFloatType: TMenuItem
-        Caption = 'FLOAT'
-        OnClick = btFloatTypeClick
-      end
-      object btTxtType: TMenuItem
-        Caption = 'TEXT'
-        OnClick = btTxtTypeClick
-      end
-    end
-    object N4: TMenuItem
-      Caption = 'Write Current Grid'
-      OnClick = N4Click
-    end
-    object btRowSave: TMenuItem
-      Caption = 'Write Current Row'
-      OnClick = btRowSaveClick
-    end
-    object btColSave: TMenuItem
-      Caption = 'Write Current Col'
-      OnClick = btColSaveClick
-    end
-    object btRowClear: TMenuItem
-      Caption = 'Clear Current Row'
-      OnClick = btRowClearClick
-    end
-    object btColClear: TMenuItem
-      Caption = 'Clear Current Col'
-      OnClick = btColClearClick
-    end
-  end
-  object ImageList1: TImageList
-    Left = 352
-    Top = 112
-    Bitmap = {
-      494C010118001D00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
-      0000000000003600000028000000400000008000000001002000000000000080
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000800000008000000080000000800000008000000080000000800000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000FF000000FF00FFFFFF00FFFFFF00FFFFFF000000FF000000FF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000008000
-      000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF008000
-      000080000000000000000000000000000000000000000000000000000000FFFF
-      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00FFFF
-      FF00000000000000000000000000000000000000000000000000000000000000
-      000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF
-      000000FF00000000000000000000000000000000000000000000000000000000
-      00000000FF0080808000000000000000000000000000000000000000FF008080
-      8000000000000000000000000000000000000000000000000000800000008000
-      000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF008000
-      0000800000008000000000000000000000000000000000000000FFFFFF000000
-      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
-      FF00FFFFFF000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000FF00808080000000000000000000000000000000FF00808080000000
-      0000000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
-      00008000000080000000000000000000000000000000FFFFFF000000FF000000
-      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
-      FF000000FF00FFFFFF0000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000FF008080800000000000000000000000FF0080808000000000000000
-      0000000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
-      0000800000008000000080000000000000000000FF000000FF000000FF000000
-      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
-      FF000000FF000000FF000000FF00000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000FF0080808000000000000000FF008080800000000000000000000000
-      0000000000000000000000000000000000008000000080000000800000008000
-      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
-      0000800000008000000080000000000000000000FF000000FF000000FF000000
-      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
-      FF000000FF000000FF000000FF00000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000FF00808080000000FF00808080000000000000000000000000000000
-      0000000000000000000000000000000000008000000080000000800000008000
-      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
-      000080000000800000008000000000000000FFFFFF000000FF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF000000FF00FFFFFF00000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000FF000000FF000000FF000000FF000000FF000000FF000000FF008080
-      8000000000000000000000000000000000008000000080000000800000008000
-      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
-      000080000000800000008000000000000000FFFFFF000000FF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF000000FF00FFFFFF00000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000FF0080808000808080008080800080808000808080000000FF008080
-      8000000000000000000000000000000000008000000080000000800000008000
-      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
-      000080000000800000008000000000000000FFFFFF000000FF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF000000FF00FFFFFF00000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000FF0080808000000000000000000000000000000000000000FF008080
-      8000000000000000000000000000000000000000000080000000800000008000
-      000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00800000008000
-      0000800000008000000080000000000000000000FF000000FF000000FF000000
-      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
-      FF000000FF000000FF000000FF00000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000FF00808080000000000000000000000000000000FF000000FF008080
-      8000000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000800000008000000080000000000000000000FF000000FF000000FF000000
-      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
-      FF000000FF000000FF000000FF00000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000FF000000FF000000FF000000FF000000FF00808080000000
-      0000000000000000000000000000000000000000000080000000800000008000
-      00008000000080000000FFFFFF00FFFFFF00FFFFFF0080000000800000008000
-      00008000000080000000000000000000000000000000FFFFFF000000FF000000
-      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
-      FF000000FF00FFFFFF0000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000008080800080808000808080008080800080808000000000000000
-      0000000000000000000000000000000000000000000000000000800000008000
-      00008000000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00800000008000
-      0000800000000000000000000000000000000000000000000000FFFFFF000000
-      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
-      FF00FFFFFF000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000008000
-      00008000000080000000FFFFFF00FFFFFF00FFFFFF0080000000800000008000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00FFFF
-      FF00000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000080000000800000008000000080000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000FF000000FF00FFFFFF00FFFFFF00FFFFFF000000FF000000FF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000080000000800000008000000080000000800000008000
-      0000800000008000000080000000800000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000800000008000000000000000000000000000000000000000000000000000
-      0000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000000000000000000000000
-      0000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000000000000000000000000
-      0000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000000000000000000000000
-      000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF
-      000000FF00000000000000000000000000000000000000000000000000000000
-      000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF
-      000000FF00000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000000000000000000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000800000008000000080000000800000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000000000000000000008000
-      0000FFFFFF00FFFFFF0080000000800000008000000080000000800000008000
-      00008000000080000000FFFFFF00800000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000000000000000000008000
-      0000FFFFFF00FFFFFF0080000000800000008000000080000000800000008000
-      0000800000008000000080000000800000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000000000000000000008000
-      0000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00800000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000800000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000080000000FFFFFF008000
-      000080000000800000008000000080000000800000008000000080000000FFFF
-      FF00800000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000080000000FFFFFF008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000800000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000800000008000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00800000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000800000008000
-      00008000000080000000FFFFFF00800000008000000080000000800000008000
-      0000FFFFFF008000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000800000008000000000000000000000000000000080000000800000008000
-      00008000000080000000800000008000000080000000FFFFFF00800000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000800000008000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000008000
-      0000C0C0C0008000000080000000000000000000000000000000000000000000
-      0000000000000000000000000000000000008000000080000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000800000008000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000080000000C0C0
-      C000800000008000000080000000000000000000000000000000000000000000
-      0000000000000000000000000000800000008000000080000000000000000000
-      0000000000000000000000000000000000000000000000000000C0C0C000C0C0
-      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
-      0000C0C0C0000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000C0C0C0008000
-      0000800000008000000000000000000000000000000000000000000000000000
-      0000000000000000000080000000800000008000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000C0C0C00000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000080000000C0C0C000800000008000
-      000080000000000000000000000000000000000000000000000080808000C0C0
-      C000FFFFFF008080800000000000800000000000000000000000000000000000
-      00000000800000000000000000000000000000000000C0C0C000C0C0C000C0C0
-      C000C0C0C000C0C0C000C0C0C00000FFFF0000FFFF0000FFFF00C0C0C000C0C0
-      C000000000000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF008000000000000000000000000000000000000000000000000000
-      0000C0C0C000C0C0C000C0C0C000FFFFFF008080800080000000800000008000
-      0000000000000000000000000000000000000000000080808000C0C0C000C0C0
-      C000C0C0C000FFFFFF0080808000000000000000000000000000000000000000
-      80000000800000000000000000000000000000000000C0C0C000C0C0C000C0C0
-      C000C0C0C000C0C0C000C0C0C000808080008080800080808000C0C0C000C0C0
-      C00000000000C0C0C00000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      000080000000800000000000000000000000000000000000000080808000C0C0
-      C000C0C0C000C0C0C000C0C0C000C0C0C000FFFFFF0080808000000000000000
-      00000000000000000000000000000000000000000000C0C0C000C0C0C000C0C0
-      C000C0C0C000C0C0C000FFFFFF00000000000000000000000000000080000000
-      8000000080000000800000008000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000C0C0C000C0C0C000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000FFFFFF008000000000000000000000000000000000000000C0C0C000C0C0
-      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000FFFFFF00000000000000
-      00000000000000000000000000000000000000000000C0C0C000FFFFFF00FFFF
-      0000C0C0C000C0C0C000C0C0C000000000000000000000000000000000000000
-      80000000800000000000000000000000800000000000C0C0C000C0C0C000C0C0
-      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
-      0000C0C0C00000000000C0C0C000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      00008000000080000000000000000000000000000000C0C0C000C0C0C000C0C0
-      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
-      0000000000000000000000000000000000000000000080808000FFFFFF00FFFF
-      FF00C0C0C000C0C0C00080808000000000000000000000000000000000000000
-      0000000080000000000000000000000080000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000C0C0
-      C00000000000C0C0C00000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF0080000000000000000000000000000000C0C0C000C0C0C000C0C0
-      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
-      000000000000000000000000000000000000000000000000000080808000C0C0
-      C000C0C0C0008080800000000000000000000000000000000000000000000000
-      000000000000000000000000000000008000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
-      0000C0C0C00000000000C0C0C000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF0080000000000000000000000000000000C0C0C000FFFFFF00FFFF
-      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000008000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000FFFFFF000000000000000000000000000000000000000000FFFFFF000000
-      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF0080000000000000000000000000000000C0C0C000FFFFFF00FFFF
-      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000008000000000000000
-      0000000080000000000000000000000000000000000000000000000000000000
-      0000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000800000008000000000000000000000000000000000000000FFFFFF00FFFF
-      FF00FFFF0000FFFF0000C0C0C000C0C0C000C0C0C000C0C0C000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000008000000000000000
-      0000000080000000800000000000000000000000000000000000000000000000
-      000000000000FFFFFF000000000000000000000000000000000000000000FFFF
-      FF00000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000FFFFFF00800000000000000000000000000000000000000080808000FFFF
-      FF00FFFFFF00FFFFFF00C0C0C000C0C0C000C0C0C00080808000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000080000000
-      8000000080000000800000008000000000000000000000000000000000000000
-      000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF000000000000000000000000000000000080000000800000008000
-      0000800000008000000080000000800000008000000080000000800000008000
-      0000800000008000000000000000000000000000000000000000000000000000
-      0000C0C0C000C0C0C000C0C0C000C0C0C0000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000080000000800000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000080000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000008080000080
-      8000000000000000000000000000000000000000000000000000C0C0C000C0C0
-      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
-      00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000008080000080
-      8000000000000000000000000000000000000000000000000000C0C0C000C0C0
-      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
-      00000000000000000000000000000000000000000000FFFFFF00000000000000
-      0000FFFFFF000000000000000000000000000000000000000000FFFFFF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000800000008000
-      0000800000000000000000000000000000000000000000000000008080000080
-      8000000000000000000000000000000000000000000000000000C0C0C000C0C0
-      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF000000000080808000C0C0C000C0C0C0008080
-      80000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000800000008000
-      0000800000000000000000000000000000000000000000000000008080000080
-      8000000000000000000000000000000000000000000000000000000000000000
-      00000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF000000000080808000C0C0C000C0C0C000FFFF00008080
-      80008080800000000000000000000000000000000000FFFFFF00000000000000
-      0000FFFFFF000000000000000000000000000000000000000000FFFFFF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000008080000080
-      8000008080000080800000808000008080000080800000808000008080000080
-      80000080800000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF0000000000C0C0C000C0C0C000C0C0C000C0C0C0008080
-      8000C0C0C00000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000800000008000
-      0000800000000000000000000000000000000000000000000000008080000080
-      8000000000000000000000000000000000000000000000000000000000000000
-      00000080800000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF0000000000C0C0C000FFFF0000C0C0C000C0C0C0008080
-      8000C0C0C00000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF00FFFFFF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000800000008000
-      0000800000000000000000000000000000000000000000000000008080000000
-      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
-      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF000000000080808000FFFF0000FFFF0000C0C0C0008080
-      80008080800000000000000000000000000000000000FFFFFF00000000000000
-      0000FFFFFF00FFFFFF00FFFFFF0000000000C0C0C00000000000FFFFFF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000008000
-      0000800000008000000000000000000000000000000000000000008080000000
-      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
-      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF000000000080808000C0C0C000C0C0C0008080
-      80000000000000000000000000000000000000000000FFFFFF0000000000C0C0
-      C00000000000FFFFFF0000000000C0C0C00000000000C0C0C000000000000000
-      0000000000000000000080000000800000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000800000008000000080000000000000000000000000000000008080000000
-      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
-      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
-      00000000000000000000000000000000000000000000FFFFFF00FFFFFF000000
-      0000C0C0C00000000000C0C0C00000000000C0C0C00000000000C0C0C000C0C0
-      C000C0C0C0000000000080000000800000000000000000000000000000000000
-      0000000000000000000000000000800000008000000080000000000000000000
-      0000000000008000000080000000800000000000000000000000008080000000
-      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
-      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000C0C0C00000000000C0C0C00000000000C0C0C000C0C0C000C0C0
-      C000C0C0C000C0C0C00080000000800000000000000000000000000000000000
-      0000000000000000000000000000800000008000000080000000000000000000
-      0000000000008000000080000000800000000000000000000000008080000000
-      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
-      C0000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000C0C0C00000000000C0C0C000C0C0C000C0C0C000C0C0
-      C000C0C0C000C0C0C00080000000800000000000000000000000000000000000
-      0000000000000000000000000000800000008000000080000000000000000000
-      0000000000008000000080000000800000000000000000000000008080000000
-      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
-      C00000000000C0C0C000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000C0C0C000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
-      C000C0C0C0000000000080000000800000000000000000000000000000000000
-      0000000000000000000000000000000000008000000080000000800000008000
-      0000800000008000000080000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000080000000800000000000000000000000000000000000
-      0000000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00000000000000000000000000000000000000000000000000008080000080
-      8000008080000080800000808000008080000080800000808000008080000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00000000000000000000000000000000000000000000FFFF00000000000080
-      8000008080000080800000808000008080000080800000808000008080000080
-      8000000000000000000000000000000000000000000000000000000000008000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF000000000000000000000000000000000000000000FFFFFF0000FFFF000000
-      0000008080000080800000808000008080000080800000808000008080000080
-      8000008080000000000000000000000000000000000000000000000000008000
-      0000000000000000000000000000000000000000000080000000800000008000
-      0000800000008000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00000000000000000000000000000000000000000000FFFF00FFFFFF0000FF
-      FF00000000000080800000808000008080000080800000808000008080000080
-      8000008080000080800000000000000000000000000000000000800000000000
-      0000000000000000000000000000000000000000000000000000800000008000
-      0000800000008000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF000000000000000000000000000000000000000000FFFFFF0000FFFF00FFFF
-      FF0000FFFF000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000800000000000
-      0000000000000000000000000000000000000000000000000000000000008000
-      0000800000008000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00000000000000000000000000000000000000000000FFFF00FFFFFF0000FF
-      FF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00000000000000
-      0000000000000000000000000000000000000000000000000000800000000000
-      0000000000000000000000000000000000000000000000000000800000000000
-      0000800000008000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF000000000000000000000000000000000000000000FFFFFF0000FFFF00FFFF
-      FF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF00000000000000
-      0000000000000000000000000000000000000000000000000000000000008000
-      0000000000000000000000000000000000008000000080000000000000000000
-      0000000000008000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00000000000000000000000000000000000000000000FFFF00FFFFFF0000FF
-      FF00000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000800000008000000080000000800000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000008000000080000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000080000000800000008000000080000000800000008000
-      0000800000008000000080000000800000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000800000000000000000000000800000000000000000000000800000008000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000800000008000000080000000800000008000
-      0000800000008000000080000000800000000000000000000000000000000000
-      0000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000800000000000000000000000800000000000000080000000000000000000
-      0000800000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000080808000008080008080
-      8000008080008080800080000000FFFFFF000000000000000000000000000000
-      00000000000000000000FFFFFF00800000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000800000000000000000000000800000000000000080000000000000000000
-      0000800000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000080000000FFFFFF0000000000000000000000
-      00000000000000000000FFFFFF00800000000000000000808000808080000080
-      8000808080000080800080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000008000000080000000800000000000000080000000000000000000
-      0000800000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000080808000008080008080
-      8000008080008080800080000000FFFFFF00000000000000000000000000FFFF
-      FF00800000008000000080000000800000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000800000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000800000000000000080000000800000008000
-      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF0000000000000000000000
-      00000000000000000000FFFFFF00800000000000000000808000808080000080
-      8000808080000080800080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF0080000000FFFFFF0080000000000000000000000000000000800000008000
-      0000800000008000000080000000000000000000000000000000000000000000
-      0000800000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000800000000000000080000000000000000000
-      0000000000000000000000000000000000000000000000000000FFFFFF000000
-      000000000000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000080808000008080008080
-      8000008080008080800080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00800000008000000000000000000000000000000000000000800000008000
-      0000800000008000000000000000000000000000000000000000000000000000
-      0000000000008000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF000000000000000000FFFF
-      FF00800000008000000080000000800000000000000000808000808080000080
-      8000808080000080800080000000800000008000000080000000800000008000
-      0000800000000000000000000000000000000000000000000000800000008000
-      0000800000000000000000000000000000000000000000000000000000000000
-      0000000000008000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000FFFFFF000000
-      000000000000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF0080000000FFFFFF0080000000000000000000000080808000008080008080
-      8000008080008080800000808000808080000080800080808000008080008080
-      8000008080000000000000000000000000000000000000000000800000008000
-      0000000000008000000000000000000000000000000000000000000000000000
-      0000000000008000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00800000008000000000000000000000000000000000808000808080000000
-      0000000000000000000000000000000000000000000000000000000000008080
-      8000808080000000000000000000000000000000000000000000800000000000
-      0000000000000000000080000000800000000000000000000000000000000000
-      0000800000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000FFFFFF000000
-      000000000000FFFFFF0000000000800000008000000080000000800000008000
-      0000800000000000000000000000000000000000000080808000808080000000
-      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000000000008080
-      8000008080000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000008000000080000000800000008000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF0000000000FFFFFF000000000000000000000000000000
-      0000000000000000000000000000000000000000000000808000808080000080
-      80000000000000FFFF00000000000000000000FFFF0000000000808080000080
-      8000808080000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000FFFF0000FFFF000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000424D3E000000000000003E000000
-      2800000040000000800000000100010000000000000400000000000000000000
-      000000000000000000000000FFFFFF0000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000FFF7FFFFFC3FFFFFFFFBFFFFE00FF01F
-      E001FFFFC007E00FE003F3CF8003C007E7F7F39F80018003E7C3F33F00010001
-      E7EFF27F00000001E7F7F0FF00000001E7FBF00F00000001E7C3F00F00000001
-      E77FF3CF00010001E77FF38F00010001A37FF81F80018003C6BFF83FC003C007
-      EDDFFFFFE007E00FFFFFFFFFF01FF01FFFFFFC00FFF7FFF78003FC00FFFBFFFB
-      8003FC00E001E0018003FC00E003E0038003E000E7F7E7F78003E000E7DDE707
-      8003E000E7EBE7BF8003E007E7F7E7DF80038007E7EBE70F80038007E75DE7FF
-      80038007E77FE5DF8003801FE77FE6BF8003801FA37FA37F8003801FC6BFC6BF
-      FFFF801FEDDFEDDFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFE1FF3FC0078003
-      FFC1FE3F80038003FF83C07F00018003F00780F700018003C00F00E700018003
-      801F00C100008003801F00E600008003000F00F680008003000F81FEC0008003
-      000FC3BFE0018003000FFFB7E0078003801FFFB3F0078003801FFFC1F0038003
-      C03FFFF3F803FFFFF0FFFFF7FFFFFFFFFFFFFFFFFFFFFFFFC001000C000FF9FF
-      80010008000FF9FF80010001000FF3C780010003000F73C780010003000F27FF
-      80010003000F07C780010003000F00C780010003000F01E380010007000403F1
-      8001000F000006388001000F00000E388001000FF8001E388001001FFC003F01
-      8001003FFE047F83FFFF007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-      FFFFEFFDC007001FFFFFC7FFC007000FFFFFC3FBC0070007EFFFE3F7C0070003
-      EF83F1E7C0070001DFC3F8CFC0070000DFE3FC1FC007001FDFD3FE3FC007001F
-      EF3BFC1FC007001FF0FFF8CFC0078FF1FFFFE1E7C00FFFF9FFFFC3F3C01FFF75
-      FFFFC7FDC03FFF8FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF9FFFFFFFC00FFFF
-      F6CFFE008000FFFFF6B7FE000000FFFFF6B7FE000000FFFFF8B780000000FFF7
-      FE8F80000001C1F7FE3F80000003C3FBFF7F80000003C7FBFE3F80010003CBFB
-      FEBF80030003DCF7FC9F80070003FF0FFDDF807F0003FFFFFDDF80FF8007FFFF
-      FDDF81FFF87FFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000
-      000000000000}
-  end
-  object Timer1: TTimer
-    Interval = 300
-    OnTimer = Timer1Timer
-    Left = 440
-    Top = 48
-  end
-end
+object FrmMain: TFrmMain
+  Left = 162
+  Top = 122
+  Width = 544
+  Height = 375
+  Caption = 'Dbc Editer v1.4.2 Vendy  QQ:11177905'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  OnDestroy = FormDestroy
+  PixelsPerInch = 96
+  TextHeight = 13
+  object Panel1: TPanel
+    Left = 0
+    Top = 33
+    Width = 536
+    Height = 315
+    Align = alClient
+    Caption = 'Panel1'
+    TabOrder = 0
+    object sgEdit: TStringGrid
+      Left = 1
+      Top = 1
+      Width = 534
+      Height = 287
+      Align = alClient
+      Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goDrawFocusSelected, goRowSizing, goColSizing, goEditing]
+      PopupMenu = PopupMenu1
+      TabOrder = 0
+      OnKeyDown = sgEditKeyDown
+      OnSelectCell = sgEditSelectCell
+    end
+    object pnFileName: TPanel
+      Left = 1
+      Top = 288
+      Width = 534
+      Height = 26
+      Align = alBottom
+      Alignment = taLeftJustify
+      Caption = 'pnFileName'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clRed
+      Font.Height = -11
+      Font.Name = 'MS Sans Serif'
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 1
+      object lbOpState: TLabel
+        Left = 444
+        Top = 1
+        Width = 89
+        Height = 24
+        Align = alRight
+        AutoSize = False
+        Caption = #25171#24320#25991#20214#29366#24577
+      end
+    end
+  end
+  object CoolBar1: TCoolBar
+    Left = 0
+    Top = 0
+    Width = 536
+    Height = 33
+    Bands = <
+      item
+        Control = ToolBar1
+        ImageIndex = -1
+        Width = 532
+      end>
+    object ToolBar1: TToolBar
+      Left = 9
+      Top = 0
+      Width = 519
+      Height = 25
+      Caption = 'ToolBar1'
+      Images = ImageList1
+      TabOrder = 0
+      object btOpen: TToolButton
+        Left = 0
+        Top = 2
+        Caption = 'btOpen'
+        ImageIndex = 7
+        OnClick = btOpenClick
+      end
+      object btSave: TToolButton
+        Left = 23
+        Top = 2
+        Caption = 'btSave'
+        Enabled = False
+        Grouped = True
+        ImageIndex = 8
+        OnClick = btSaveClick
+      end
+      object ToolButton2: TToolButton
+        Left = 46
+        Top = 2
+        Width = 8
+        Caption = 'ToolButton2'
+        ImageIndex = 10
+        Style = tbsSeparator
+      end
+      object ToolButton1: TToolButton
+        Left = 54
+        Top = 2
+        Caption = 'ToolButton1'
+        ImageIndex = 9
+        OnClick = ToolButton1Click
+      end
+      object ToolButton3: TToolButton
+        Left = 77
+        Top = 2
+        Caption = 'ToolButton3'
+        ImageIndex = 10
+        OnClick = ToolButton3Click
+      end
+      object ToolButton5: TToolButton
+        Left = 100
+        Top = 2
+        Width = 8
+        Caption = 'ToolButton5'
+        ImageIndex = 12
+        Style = tbsSeparator
+      end
+      object ToolButton4: TToolButton
+        Left = 108
+        Top = 2
+        Caption = 'ToolButton4'
+        ImageIndex = 11
+        OnClick = ToolButton4Click
+      end
+    end
+  end
+  object OpenDialog1: TOpenDialog
+    Filter = '.dbc|*.dbc'
+    Left = 216
+    Top = 96
+  end
+  object PopupMenu1: TPopupMenu
+    OnPopup = PopupMenu1Popup
+    Left = 264
+    Top = 96
+    object N1: TMenuItem
+      Caption = 'Set Current Col Title'
+      OnClick = N1Click
+    end
+    object N2: TMenuItem
+      Caption = 'Set Current Col Type'
+      object btIntType: TMenuItem
+        Caption = 'INT'
+        OnClick = btIntTypeClick
+      end
+      object btFloatType: TMenuItem
+        Caption = 'FLOAT'
+        OnClick = btFloatTypeClick
+      end
+      object btTxtType: TMenuItem
+        Caption = 'TEXT'
+        OnClick = btTxtTypeClick
+      end
+    end
+    object N4: TMenuItem
+      Caption = 'Write Current Grid'
+      OnClick = N4Click
+    end
+    object btRowSave: TMenuItem
+      Caption = 'Write Current Row'
+      OnClick = btRowSaveClick
+    end
+    object btColSave: TMenuItem
+      Caption = 'Write Current Col'
+      OnClick = btColSaveClick
+    end
+    object btRowClear: TMenuItem
+      Caption = 'Clear Current Row'
+      OnClick = btRowClearClick
+    end
+    object btColClear: TMenuItem
+      Caption = 'Clear Current Col'
+      OnClick = btColClearClick
+    end
+  end
+  object ImageList1: TImageList
+    Left = 352
+    Top = 112
+    Bitmap = {
+      494C010118001D00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      0000000000003600000028000000400000008000000001002000000000000080
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000800000008000000080000000800000008000000080000000800000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000FF000000FF00FFFFFF00FFFFFF00FFFFFF000000FF000000FF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000008000
+      000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF008000
+      000080000000000000000000000000000000000000000000000000000000FFFF
+      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00FFFF
+      FF00000000000000000000000000000000000000000000000000000000000000
+      000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF
+      000000FF00000000000000000000000000000000000000000000000000000000
+      00000000FF0080808000000000000000000000000000000000000000FF008080
+      8000000000000000000000000000000000000000000000000000800000008000
+      000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF008000
+      0000800000008000000000000000000000000000000000000000FFFFFF000000
+      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
+      FF00FFFFFF000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000FF00808080000000000000000000000000000000FF00808080000000
+      0000000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
+      00008000000080000000000000000000000000000000FFFFFF000000FF000000
+      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
+      FF000000FF00FFFFFF0000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000FF008080800000000000000000000000FF0080808000000000000000
+      0000000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
+      0000800000008000000080000000000000000000FF000000FF000000FF000000
+      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
+      FF000000FF000000FF000000FF00000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000FF0080808000000000000000FF008080800000000000000000000000
+      0000000000000000000000000000000000008000000080000000800000008000
+      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
+      0000800000008000000080000000000000000000FF000000FF000000FF000000
+      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
+      FF000000FF000000FF000000FF00000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000FF00808080000000FF00808080000000000000000000000000000000
+      0000000000000000000000000000000000008000000080000000800000008000
+      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
+      000080000000800000008000000000000000FFFFFF000000FF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF000000FF00FFFFFF00000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000FF000000FF000000FF000000FF000000FF000000FF000000FF008080
+      8000000000000000000000000000000000008000000080000000800000008000
+      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
+      000080000000800000008000000000000000FFFFFF000000FF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF000000FF00FFFFFF00000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000FF0080808000808080008080800080808000808080000000FF008080
+      8000000000000000000000000000000000008000000080000000800000008000
+      0000800000008000000080000000FFFFFF00FFFFFF00FFFFFF00800000008000
+      000080000000800000008000000000000000FFFFFF000000FF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF000000FF00FFFFFF00000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000FF0080808000000000000000000000000000000000000000FF008080
+      8000000000000000000000000000000000000000000080000000800000008000
+      000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00800000008000
+      0000800000008000000080000000000000000000FF000000FF000000FF000000
+      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
+      FF000000FF000000FF000000FF00000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000FF00808080000000000000000000000000000000FF000000FF008080
+      8000000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000800000008000000080000000000000000000FF000000FF000000FF000000
+      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
+      FF000000FF000000FF000000FF00000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000FF000000FF000000FF000000FF000000FF00808080000000
+      0000000000000000000000000000000000000000000080000000800000008000
+      00008000000080000000FFFFFF00FFFFFF00FFFFFF0080000000800000008000
+      00008000000080000000000000000000000000000000FFFFFF000000FF000000
+      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
+      FF000000FF00FFFFFF0000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000008080800080808000808080008080800080808000000000000000
+      0000000000000000000000000000000000000000000000000000800000008000
+      00008000000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00800000008000
+      0000800000000000000000000000000000000000000000000000FFFFFF000000
+      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000
+      FF00FFFFFF000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000008000
+      00008000000080000000FFFFFF00FFFFFF00FFFFFF0080000000800000008000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00FFFF
+      FF00000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000080000000800000008000000080000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000FF000000FF00FFFFFF00FFFFFF00FFFFFF000000FF000000FF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000080000000800000008000000080000000800000008000
+      0000800000008000000080000000800000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000800000008000000000000000000000000000000000000000000000000000
+      0000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000000000000000000000000
+      0000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000000000000000000000000
+      0000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000000000000000000000000
+      000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF
+      000000FF00000000000000000000000000000000000000000000000000000000
+      000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF
+      000000FF00000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000000000000000000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000800000008000000080000000800000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000000000000000000008000
+      0000FFFFFF00FFFFFF0080000000800000008000000080000000800000008000
+      00008000000080000000FFFFFF00800000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000000000000000000008000
+      0000FFFFFF00FFFFFF0080000000800000008000000080000000800000008000
+      0000800000008000000080000000800000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000000000000000000008000
+      0000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00800000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000800000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000080000000FFFFFF008000
+      000080000000800000008000000080000000800000008000000080000000FFFF
+      FF00800000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000080000000FFFFFF008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000800000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000800000008000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00800000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000800000008000
+      00008000000080000000FFFFFF00800000008000000080000000800000008000
+      0000FFFFFF008000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000FF00000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000800000008000000000000000000000000000000080000000800000008000
+      00008000000080000000800000008000000080000000FFFFFF00800000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000800000008000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000008000
+      0000C0C0C0008000000080000000000000000000000000000000000000000000
+      0000000000000000000000000000000000008000000080000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000800000008000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000080000000C0C0
+      C000800000008000000080000000000000000000000000000000000000000000
+      0000000000000000000000000000800000008000000080000000000000000000
+      0000000000000000000000000000000000000000000000000000C0C0C000C0C0
+      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
+      0000C0C0C0000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000C0C0C0008000
+      0000800000008000000000000000000000000000000000000000000000000000
+      0000000000000000000080000000800000008000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000C0C0C00000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000080000000C0C0C000800000008000
+      000080000000000000000000000000000000000000000000000080808000C0C0
+      C000FFFFFF008080800000000000800000000000000000000000000000000000
+      00000000800000000000000000000000000000000000C0C0C000C0C0C000C0C0
+      C000C0C0C000C0C0C000C0C0C00000FFFF0000FFFF0000FFFF00C0C0C000C0C0
+      C000000000000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF008000000000000000000000000000000000000000000000000000
+      0000C0C0C000C0C0C000C0C0C000FFFFFF008080800080000000800000008000
+      0000000000000000000000000000000000000000000080808000C0C0C000C0C0
+      C000C0C0C000FFFFFF0080808000000000000000000000000000000000000000
+      80000000800000000000000000000000000000000000C0C0C000C0C0C000C0C0
+      C000C0C0C000C0C0C000C0C0C000808080008080800080808000C0C0C000C0C0
+      C00000000000C0C0C00000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      000080000000800000000000000000000000000000000000000080808000C0C0
+      C000C0C0C000C0C0C000C0C0C000C0C0C000FFFFFF0080808000000000000000
+      00000000000000000000000000000000000000000000C0C0C000C0C0C000C0C0
+      C000C0C0C000C0C0C000FFFFFF00000000000000000000000000000080000000
+      8000000080000000800000008000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000C0C0C000C0C0C000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000FFFFFF008000000000000000000000000000000000000000C0C0C000C0C0
+      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000FFFFFF00000000000000
+      00000000000000000000000000000000000000000000C0C0C000FFFFFF00FFFF
+      0000C0C0C000C0C0C000C0C0C000000000000000000000000000000000000000
+      80000000800000000000000000000000800000000000C0C0C000C0C0C000C0C0
+      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
+      0000C0C0C00000000000C0C0C000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      00008000000080000000000000000000000000000000C0C0C000C0C0C000C0C0
+      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
+      0000000000000000000000000000000000000000000080808000FFFFFF00FFFF
+      FF00C0C0C000C0C0C00080808000000000000000000000000000000000000000
+      0000000080000000000000000000000080000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000C0C0
+      C00000000000C0C0C00000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF0080000000000000000000000000000000C0C0C000C0C0C000C0C0
+      C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
+      000000000000000000000000000000000000000000000000000080808000C0C0
+      C000C0C0C0008080800000000000000000000000000000000000000000000000
+      000000000000000000000000000000008000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
+      0000C0C0C00000000000C0C0C000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF0080000000000000000000000000000000C0C0C000FFFFFF00FFFF
+      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000008000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000FFFFFF000000000000000000000000000000000000000000FFFFFF000000
+      0000000000000000000000000000000000000000000080000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF0080000000000000000000000000000000C0C0C000FFFFFF00FFFF
+      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C0000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000008000000000000000
+      0000000080000000000000000000000000000000000000000000000000000000
+      0000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000800000008000000000000000000000000000000000000000FFFFFF00FFFF
+      FF00FFFF0000FFFF0000C0C0C000C0C0C000C0C0C000C0C0C000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000008000000000000000
+      0000000080000000800000000000000000000000000000000000000000000000
+      000000000000FFFFFF000000000000000000000000000000000000000000FFFF
+      FF00000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000FFFFFF00800000000000000000000000000000000000000080808000FFFF
+      FF00FFFFFF00FFFFFF00C0C0C000C0C0C000C0C0C00080808000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000080000000
+      8000000080000000800000008000000000000000000000000000000000000000
+      000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF000000000000000000000000000000000080000000800000008000
+      0000800000008000000080000000800000008000000080000000800000008000
+      0000800000008000000000000000000000000000000000000000000000000000
+      0000C0C0C000C0C0C000C0C0C000C0C0C0000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000080000000800000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000080000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000008080000080
+      8000000000000000000000000000000000000000000000000000C0C0C000C0C0
+      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
+      00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000008080000080
+      8000000000000000000000000000000000000000000000000000C0C0C000C0C0
+      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
+      00000000000000000000000000000000000000000000FFFFFF00000000000000
+      0000FFFFFF000000000000000000000000000000000000000000FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000800000008000
+      0000800000000000000000000000000000000000000000000000008080000080
+      8000000000000000000000000000000000000000000000000000C0C0C000C0C0
+      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF000000000080808000C0C0C000C0C0C0008080
+      80000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000800000008000
+      0000800000000000000000000000000000000000000000000000008080000080
+      8000000000000000000000000000000000000000000000000000000000000000
+      00000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF000000000080808000C0C0C000C0C0C000FFFF00008080
+      80008080800000000000000000000000000000000000FFFFFF00000000000000
+      0000FFFFFF000000000000000000000000000000000000000000FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000008080000080
+      8000008080000080800000808000008080000080800000808000008080000080
+      80000080800000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF0000000000C0C0C000C0C0C000C0C0C000C0C0C0008080
+      8000C0C0C00000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000800000008000
+      0000800000000000000000000000000000000000000000000000008080000080
+      8000000000000000000000000000000000000000000000000000000000000000
+      00000080800000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF0000000000C0C0C000FFFF0000C0C0C000C0C0C0008080
+      8000C0C0C00000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000800000008000
+      0000800000000000000000000000000000000000000000000000008080000000
+      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
+      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF000000000080808000FFFF0000FFFF0000C0C0C0008080
+      80008080800000000000000000000000000000000000FFFFFF00000000000000
+      0000FFFFFF00FFFFFF00FFFFFF0000000000C0C0C00000000000FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000008000
+      0000800000008000000000000000000000000000000000000000008080000000
+      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
+      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF000000000080808000C0C0C000C0C0C0008080
+      80000000000000000000000000000000000000000000FFFFFF0000000000C0C0
+      C00000000000FFFFFF0000000000C0C0C00000000000C0C0C000000000000000
+      0000000000000000000080000000800000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000800000008000000080000000000000000000000000000000008080000000
+      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
+      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
+      00000000000000000000000000000000000000000000FFFFFF00FFFFFF000000
+      0000C0C0C00000000000C0C0C00000000000C0C0C00000000000C0C0C000C0C0
+      C000C0C0C0000000000080000000800000000000000000000000000000000000
+      0000000000000000000000000000800000008000000080000000000000000000
+      0000000000008000000080000000800000000000000000000000008080000000
+      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
+      C0000000000000808000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000C0C0C00000000000C0C0C00000000000C0C0C000C0C0C000C0C0
+      C000C0C0C000C0C0C00080000000800000000000000000000000000000000000
+      0000000000000000000000000000800000008000000080000000000000000000
+      0000000000008000000080000000800000000000000000000000008080000000
+      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
+      C0000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000C0C0C00000000000C0C0C000C0C0C000C0C0C000C0C0
+      C000C0C0C000C0C0C00080000000800000000000000000000000000000000000
+      0000000000000000000000000000800000008000000080000000000000000000
+      0000000000008000000080000000800000000000000000000000008080000000
+      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
+      C00000000000C0C0C000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000C0C0C000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000C0C0C000C0C0C000C0C0C000C0C0C000C0C0
+      C000C0C0C0000000000080000000800000000000000000000000000000000000
+      0000000000000000000000000000000000008000000080000000800000008000
+      0000800000008000000080000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000080000000800000000000000000000000000000000000
+      0000000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00000000000000000000000000000000000000000000000000008080000080
+      8000008080000080800000808000008080000080800000808000008080000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00000000000000000000000000000000000000000000FFFF00000000000080
+      8000008080000080800000808000008080000080800000808000008080000080
+      8000000000000000000000000000000000000000000000000000000000008000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF000000000000000000000000000000000000000000FFFFFF0000FFFF000000
+      0000008080000080800000808000008080000080800000808000008080000080
+      8000008080000000000000000000000000000000000000000000000000008000
+      0000000000000000000000000000000000000000000080000000800000008000
+      0000800000008000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00000000000000000000000000000000000000000000FFFF00FFFFFF0000FF
+      FF00000000000080800000808000008080000080800000808000008080000080
+      8000008080000080800000000000000000000000000000000000800000000000
+      0000000000000000000000000000000000000000000000000000800000008000
+      0000800000008000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF000000000000000000000000000000000000000000FFFFFF0000FFFF00FFFF
+      FF0000FFFF000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000800000000000
+      0000000000000000000000000000000000000000000000000000000000008000
+      0000800000008000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00000000000000000000000000000000000000000000FFFF00FFFFFF0000FF
+      FF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00000000000000
+      0000000000000000000000000000000000000000000000000000800000000000
+      0000000000000000000000000000000000000000000000000000800000000000
+      0000800000008000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF000000000000000000000000000000000000000000FFFFFF0000FFFF00FFFF
+      FF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF00000000000000
+      0000000000000000000000000000000000000000000000000000000000008000
+      0000000000000000000000000000000000008000000080000000000000000000
+      0000000000008000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00000000000000000000000000000000000000000000FFFF00FFFFFF0000FF
+      FF00000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000800000008000000080000000800000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000008000000080000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000080000000800000008000000080000000800000008000
+      0000800000008000000080000000800000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000800000000000000000000000800000000000000000000000800000008000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000800000008000000080000000800000008000
+      0000800000008000000080000000800000000000000000000000000000000000
+      0000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000800000000000000000000000800000000000000080000000000000000000
+      0000800000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000080808000008080008080
+      8000008080008080800080000000FFFFFF000000000000000000000000000000
+      00000000000000000000FFFFFF00800000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000800000000000000000000000800000000000000080000000000000000000
+      0000800000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000080000000FFFFFF0000000000000000000000
+      00000000000000000000FFFFFF00800000000000000000808000808080000080
+      8000808080000080800080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000008000000080000000800000000000000080000000000000000000
+      0000800000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000080808000008080008080
+      8000008080008080800080000000FFFFFF00000000000000000000000000FFFF
+      FF00800000008000000080000000800000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000800000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000800000000000000080000000800000008000
+      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF0000000000000000000000
+      00000000000000000000FFFFFF00800000000000000000808000808080000080
+      8000808080000080800080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF0080000000FFFFFF0080000000000000000000000000000000800000008000
+      0000800000008000000080000000000000000000000000000000000000000000
+      0000800000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000800000000000000080000000000000000000
+      0000000000000000000000000000000000000000000000000000FFFFFF000000
+      000000000000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00800000000000000080808000008080008080
+      8000008080008080800080000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00800000008000000000000000000000000000000000000000800000008000
+      0000800000008000000000000000000000000000000000000000000000000000
+      0000000000008000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF000000000000000000FFFF
+      FF00800000008000000080000000800000000000000000808000808080000080
+      8000808080000080800080000000800000008000000080000000800000008000
+      0000800000000000000000000000000000000000000000000000800000008000
+      0000800000000000000000000000000000000000000000000000000000000000
+      0000000000008000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000FFFFFF000000
+      000000000000000000000000000080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF0080000000FFFFFF0080000000000000000000000080808000008080008080
+      8000008080008080800000808000808080000080800080808000008080008080
+      8000008080000000000000000000000000000000000000000000800000008000
+      0000000000008000000000000000000000000000000000000000000000000000
+      0000000000008000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF0080000000FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00800000008000000000000000000000000000000000808000808080000000
+      0000000000000000000000000000000000000000000000000000000000008080
+      8000808080000000000000000000000000000000000000000000800000000000
+      0000000000000000000080000000800000000000000000000000000000000000
+      0000800000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000FFFFFF000000
+      000000000000FFFFFF0000000000800000008000000080000000800000008000
+      0000800000000000000000000000000000000000000080808000808080000000
+      0000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000000000008080
+      8000008080000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000008000000080000000800000008000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF0000000000FFFFFF000000000000000000000000000000
+      0000000000000000000000000000000000000000000000808000808080000080
+      80000000000000FFFF00000000000000000000FFFF0000000000808080000080
+      8000808080000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000FFFF0000FFFF000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000424D3E000000000000003E000000
+      2800000040000000800000000100010000000000000400000000000000000000
+      000000000000000000000000FFFFFF0000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000FFF7FFFFFC3FFFFFFFFBFFFFE00FF01F
+      E001FFFFC007E00FE003F3CF8003C007E7F7F39F80018003E7C3F33F00010001
+      E7EFF27F00000001E7F7F0FF00000001E7FBF00F00000001E7C3F00F00000001
+      E77FF3CF00010001E77FF38F00010001A37FF81F80018003C6BFF83FC003C007
+      EDDFFFFFE007E00FFFFFFFFFF01FF01FFFFFFC00FFF7FFF78003FC00FFFBFFFB
+      8003FC00E001E0018003FC00E003E0038003E000E7F7E7F78003E000E7DDE707
+      8003E000E7EBE7BF8003E007E7F7E7DF80038007E7EBE70F80038007E75DE7FF
+      80038007E77FE5DF8003801FE77FE6BF8003801FA37FA37F8003801FC6BFC6BF
+      FFFF801FEDDFEDDFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFE1FF3FC0078003
+      FFC1FE3F80038003FF83C07F00018003F00780F700018003C00F00E700018003
+      801F00C100008003801F00E600008003000F00F680008003000F81FEC0008003
+      000FC3BFE0018003000FFFB7E0078003801FFFB3F0078003801FFFC1F0038003
+      C03FFFF3F803FFFFF0FFFFF7FFFFFFFFFFFFFFFFFFFFFFFFC001000C000FF9FF
+      80010008000FF9FF80010001000FF3C780010003000F73C780010003000F27FF
+      80010003000F07C780010003000F00C780010003000F01E380010007000403F1
+      8001000F000006388001000F00000E388001000FF8001E388001001FFC003F01
+      8001003FFE047F83FFFF007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFEFFDC007001FFFFFC7FFC007000FFFFFC3FBC0070007EFFFE3F7C0070003
+      EF83F1E7C0070001DFC3F8CFC0070000DFE3FC1FC007001FDFD3FE3FC007001F
+      EF3BFC1FC007001FF0FFF8CFC0078FF1FFFFE1E7C00FFFF9FFFFC3F3C01FFF75
+      FFFFC7FDC03FFF8FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF9FFFFFFFC00FFFF
+      F6CFFE008000FFFFF6B7FE000000FFFFF6B7FE000000FFFFF8B780000000FFF7
+      FE8F80000001C1F7FE3F80000003C3FBFF7F80000003C7FBFE3F80010003CBFB
+      FEBF80030003DCF7FC9F80070003FF0FFDDF807F0003FFFFFDDF80FF8007FFFF
+      FDDF81FFF87FFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000
+      000000000000}
+  end
+  object Timer1: TTimer
+    Interval = 300
+    OnTimer = Timer1Timer
+    Left = 440
+    Top = 48
+  end
+end
diff --git a/contrib/dbcEditer/pjDbcEditer.bpr b/contrib/dbcEditer/pjDbcEditer.bpr
index 522df6660e6..43795ce5c28 100644
--- a/contrib/dbcEditer/pjDbcEditer.bpr
+++ b/contrib/dbcEditer/pjDbcEditer.bpr
@@ -1,124 +1,124 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
-  <MACROS>
-    <VERSION value="BCB.06.00"/>
-    <PROJECT value="pjDbcEditer.exe"/>
-    <OBJFILES value="pjDbcEditer.obj dbcedit.obj TitleFrm.obj thOpenSource.obj SearchFrm.obj"/>
-    <RESFILES value="pjDbcEditer.res"/>
-    <IDLFILES value=""/>
-    <IDLGENFILES value=""/>
-    <DEFFILE value=""/>
-    <RESDEPEN value="$(RESFILES) dbcedit.dfm TitleFrm.dfm SearchFrm.dfm"/>
-    <LIBFILES value=""/>
-    <LIBRARIES value=""/>
-    <SPARELIBS value="vcl.lib rtl.lib indy.lib"/>
-    <PACKAGES value="vcl.bpi rtl.bpi dbrtl.bpi adortl.bpi vcldb.bpi vclx.bpi bdertl.bpi 
-      vcldbx.bpi ibxpress.bpi dsnap.bpi cds.bpi bdecds.bpi qrpt.bpi teeui.bpi 
-      teedb.bpi tee.bpi dss.bpi teeqr.bpi visualclx.bpi visualdbclx.bpi 
-      dsnapcrba.bpi dsnapcon.bpi bcbsmp.bpi vclie.bpi xmlrtl.bpi inet.bpi 
-      inetdbbde.bpi inetdbxpress.bpi inetdb.bpi nmfast.bpi webdsnap.bpi 
-      bcbie.bpi websnap.bpi soaprtl.bpi dclocx.bpi dbexpress.bpi dbxcds.bpi 
-      indy.bpi bcb2kaxserver.bpi dclusr.bpi"/>
-    <PATHCPP value=".;"/>
-    <PATHPAS value=".;"/>
-    <PATHRC value=".;"/>
-    <PATHASM value=".;"/>
-    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
-    <RELEASELIBPATH value="$(BCB)\lib\release"/>
-    <LINKER value="ilink32"/>
-    <USERDEFINES value="_DEBUG"/>
-    <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
-    <MAINSOURCE value="pjDbcEditer.cpp"/>
-    <INCLUDEPATH value="&quot;C:\Program Files\Borland\CBuilder6\Projects&quot;;E:\moshou\dbcEdit;$(BCB)\include;$(BCB)\include\vcl"/>
-    <LIBPATH value="&quot;C:\Program Files\Borland\CBuilder6\Projects&quot;;E:\moshou\dbcEdit;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
-    <WARNINGS value="-w-par"/>
-    <OTHERFILES value=""/>
-  </MACROS>
-  <OPTIONS>
-    <IDLCFLAGS value="-I&quot;C:\Program Files\Borland\CBuilder6\Projects&quot; -IE:\moshou\dbcEdit 
-      -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_DEBUG -boa"/>
-    <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c 
-      -tW -tWM"/>
-    <PFLAGS value="-$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
-    <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zi"/>
-    <LFLAGS value="-D&quot;&quot; -aa -Tpe -x -Gn -v"/>
-    <OTHERFILES value=""/>
-  </OPTIONS>
-  <LINKER>
-    <ALLOBJ value="c0w32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
-    <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/>
-    <OTHERFILES value=""/>
-  </LINKER>
-  <FILELIST>
-      <FILE FILENAME="pjDbcEditer.res" FORMNAME="" UNITNAME="pjDbcEditer.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="pjDbcEditer.cpp" FORMNAME="" UNITNAME="pjDbcEditer" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="dbcedit.cpp" FORMNAME="FrmMain" UNITNAME="dbcedit" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="TitleFrm.cpp" FORMNAME="FrmTitle" UNITNAME="TitleFrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="thOpenSource.cpp" FORMNAME="" UNITNAME="thOpenSource" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="SearchFrm.cpp" FORMNAME="FrmSearch" UNITNAME="SearchFrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-  </FILELIST>
-  <BUILDTOOLS>
-  </BUILDTOOLS>
-
-  <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=2052
-CodePage=936
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=
-Launcher=
-UseLauncher=0
-DebugCWD=
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteLauncher=
-RemoteCWD=
-RemoteDebug=0
-
-[Compiler]
-ShowInfoMsgs=0
-LinkDebugVcl=0
-LinkCGLIB=0
-
-[CORBA]
-AddServerUnit=1
-AddClientUnit=1
-PrecompiledHeaders=1
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
-  </IDEOPTIONS>
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.06.00"/>
+    <PROJECT value="pjDbcEditer.exe"/>
+    <OBJFILES value="pjDbcEditer.obj dbcedit.obj TitleFrm.obj thOpenSource.obj SearchFrm.obj"/>
+    <RESFILES value="pjDbcEditer.res"/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES) dbcedit.dfm TitleFrm.dfm SearchFrm.dfm"/>
+    <LIBFILES value=""/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value="vcl.lib rtl.lib indy.lib"/>
+    <PACKAGES value="vcl.bpi rtl.bpi dbrtl.bpi adortl.bpi vcldb.bpi vclx.bpi bdertl.bpi 
+      vcldbx.bpi ibxpress.bpi dsnap.bpi cds.bpi bdecds.bpi qrpt.bpi teeui.bpi 
+      teedb.bpi tee.bpi dss.bpi teeqr.bpi visualclx.bpi visualdbclx.bpi 
+      dsnapcrba.bpi dsnapcon.bpi bcbsmp.bpi vclie.bpi xmlrtl.bpi inet.bpi 
+      inetdbbde.bpi inetdbxpress.bpi inetdb.bpi nmfast.bpi webdsnap.bpi 
+      bcbie.bpi websnap.bpi soaprtl.bpi dclocx.bpi dbexpress.bpi dbxcds.bpi 
+      indy.bpi bcb2kaxserver.bpi dclusr.bpi"/>
+    <PATHCPP value=".;"/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="ilink32"/>
+    <USERDEFINES value="_DEBUG"/>
+    <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
+    <MAINSOURCE value="pjDbcEditer.cpp"/>
+    <INCLUDEPATH value="&quot;C:\Program Files\Borland\CBuilder6\Projects&quot;;E:\moshou\dbcEdit;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="&quot;C:\Program Files\Borland\CBuilder6\Projects&quot;;E:\moshou\dbcEdit;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+    <OTHERFILES value=""/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I&quot;C:\Program Files\Borland\CBuilder6\Projects&quot; -IE:\moshou\dbcEdit 
+      -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_DEBUG -boa"/>
+    <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c 
+      -tW -tWM"/>
+    <PFLAGS value="-$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-D&quot;&quot; -aa -Tpe -x -Gn -v"/>
+    <OTHERFILES value=""/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0w32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/>
+    <OTHERFILES value=""/>
+  </LINKER>
+  <FILELIST>
+      <FILE FILENAME="pjDbcEditer.res" FORMNAME="" UNITNAME="pjDbcEditer.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="pjDbcEditer.cpp" FORMNAME="" UNITNAME="pjDbcEditer" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="dbcedit.cpp" FORMNAME="FrmMain" UNITNAME="dbcedit" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="TitleFrm.cpp" FORMNAME="FrmTitle" UNITNAME="TitleFrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="thOpenSource.cpp" FORMNAME="" UNITNAME="thOpenSource" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="SearchFrm.cpp" FORMNAME="FrmSearch" UNITNAME="SearchFrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+  </FILELIST>
+  <BUILDTOOLS>
+  </BUILDTOOLS>
+
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=2052
+CodePage=936
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+Launcher=
+UseLauncher=0
+DebugCWD=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteLauncher=
+RemoteCWD=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
 </PROJECT>
\ No newline at end of file
diff --git a/contrib/extractor/System.cpp b/contrib/extractor/System.cpp
index 21bc95d6881..01e02ab1eb7 100644
--- a/contrib/extractor/System.cpp
+++ b/contrib/extractor/System.cpp
@@ -18,13 +18,15 @@
 #include "loadlib/wdt.h"
 #include <fcntl.h>
 
-#if defined( __GNUC__ )
-    #define _open   open
-    #define _close close
+#if defined( __GNUC__ ) && !defined(WIN32)
+    #define _open   fopen
+    #define _close  fclose
     #ifndef O_BINARY
         #define O_BINARY 0
     #endif
+    #define _FILE FILE*
 #else
+    #define _FILE int
     #include <io.h>
 #endif
 
@@ -41,9 +43,9 @@ typedef struct
     uint32 id;
 } map_id;
 
-map_id *map_ids;
-uint16 *areas;
-uint16 *LiqType;
+map_id* map_ids;
+uint16* areas;
+uint16* LiqType;
 char output_path[128] = ".";
 char input_path[128] = ".";
 uint32 maxAreaId = 0;
@@ -72,7 +74,8 @@ float CONF_flat_height_delta_limit = 0.005f; // If max - min less this value - s
 float CONF_flat_liquid_delta_limit = 0.001f; // If max - min less this value - liquid surface is flat
 
 // List MPQ for extract from
-char *CONF_mpq_list[]={
+const char* CONF_mpq_list[] =
+{
     "common.MPQ",
     "common-2.MPQ",
     "lichking.MPQ",
@@ -87,19 +90,19 @@ char *CONF_mpq_list[]={
 static char* const langs[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koKR", "zhCN", "zhTW", "enCN", "enTW", "esMX", "ruRU" };
 #define LANG_COUNT 12
 
-void CreateDir( const std::string& Path )
+void CreateDir(const std::string& Path)
 {
-    #ifdef WIN32
-    _mkdir( Path.c_str());
-    #else
-    mkdir( Path.c_str(), 0777 );
-    #endif
+#ifdef WIN32
+    _mkdir(Path.c_str());
+#else
+    mkdir(Path.c_str(), 0777);
+#endif
 }
 
-bool FileExists( const char* FileName )
+bool FileExists(const char* FileName)
 {
     int fp = _open(FileName, OPEN_FLAGS);
-    if(fp != -1)
+    if (fp != -1)
     {
         _close(fp);
         return true;
@@ -121,43 +124,43 @@ void Usage(char* prg)
     exit(1);
 }
 
-void HandleArgs(int argc, char * arg[])
+void HandleArgs(int argc, char* arg[])
 {
-    for(int c = 1; c < argc; ++c)
+    for (int c = 1; c < argc; ++c)
     {
         // i - input path
         // o - output path
         // e - extract only MAP(1)/DBC(2) - standard both(3)
         // f - use float to int conversion
         // h - limit minimum height
-        if(arg[c][0] != '-')
+        if (arg[c][0] != '-')
             Usage(arg[0]);
 
-        switch(arg[c][1])
+        switch (arg[c][1])
         {
             case 'i':
-                if(c + 1 < argc)                            // all ok
+                if (c + 1 < argc)                           // all ok
                     strcpy(input_path, arg[(c++) + 1]);
                 else
                     Usage(arg[0]);
                 break;
             case 'o':
-                if(c + 1 < argc)                            // all ok
+                if (c + 1 < argc)                           // all ok
                     strcpy(output_path, arg[(c++) + 1]);
                 else
                     Usage(arg[0]);
                 break;
             case 'f':
-                if(c + 1 < argc)                            // all ok
-                    CONF_allow_float_to_int=atoi(arg[(c++) + 1])!=0;
+                if (c + 1 < argc)                           // all ok
+                    CONF_allow_float_to_int = atoi(arg[(c++) + 1]) != 0;
                 else
                     Usage(arg[0]);
                 break;
             case 'e':
-                if(c + 1 < argc)                            // all ok
+                if (c + 1 < argc)                           // all ok
                 {
-                    CONF_extract=atoi(arg[(c++) + 1]);
-                    if(!(CONF_extract > 0 && CONF_extract < 4))
+                    CONF_extract = atoi(arg[(c++) + 1]);
+                    if (!(CONF_extract > 0 && CONF_extract < 4))
                         Usage(arg[0]);
                 }
                 else
@@ -170,11 +173,11 @@ void HandleArgs(int argc, char * arg[])
 uint32 ReadBuild(int locale)
 {
     // include build info file also
-    std::string filename  = std::string("component.wow-")+langs[locale]+".txt";
+    std::string filename  = std::string("component.wow-") + langs[locale] + ".txt";
     //printf("Read %s file... ", filename.c_str());
 
     MPQFile m(filename.c_str());
-    if(m.isEof())
+    if (m.isEof())
     {
         printf("Fatal error: Not found %s file!\n", filename.c_str());
         exit(1);
@@ -185,14 +188,14 @@ uint32 ReadBuild(int locale)
 
     size_t pos = text.find("version=\"");
     size_t pos1 = pos + strlen("version=\"");
-    size_t pos2 = text.find("\"",pos1);
+    size_t pos2 = text.find("\"", pos1);
     if (pos == text.npos || pos2 == text.npos || pos1 >= pos2)
     {
         printf("Fatal error: Invalid  %s file format!\n", filename.c_str());
         exit(1);
     }
 
-    std::string build_str = text.substr(pos1,pos2-pos1);
+    std::string build_str = text.substr(pos1, pos2 - pos1);
 
     int build = atoi(build_str.c_str());
     if (build <= 0)
@@ -209,7 +212,7 @@ uint32 ReadMapDBC()
     printf("Read Map.dbc file... ");
     DBCFile dbc("DBFilesClient\\Map.dbc");
 
-    if(!dbc.open())
+    if (!dbc.open())
     {
         printf("Fatal error: Invalid Map.dbc file format!\n");
         exit(1);
@@ -217,7 +220,7 @@ uint32 ReadMapDBC()
 
     size_t map_count = dbc.getRecordCount();
     map_ids = new map_id[map_count];
-    for(uint32 x = 0; x < map_count; ++x)
+    for (uint32 x = 0; x < map_count; ++x)
     {
         map_ids[x].id = dbc.getRecord(x).getUInt(0);
         strcpy(map_ids[x].name, dbc.getRecord(x).getString(1));
@@ -231,7 +234,7 @@ void ReadAreaTableDBC()
     printf("Read AreaTable.dbc file...");
     DBCFile dbc("DBFilesClient\\AreaTable.dbc");
 
-    if(!dbc.open())
+    if (!dbc.open())
     {
         printf("Fatal error: Invalid AreaTable.dbc file format!\n");
         exit(1);
@@ -242,7 +245,7 @@ void ReadAreaTableDBC()
     areas = new uint16[maxid + 1];
     memset(areas, 0xff, (maxid + 1) * sizeof(uint16));
 
-    for(uint32 x = 0; x < area_count; ++x)
+    for (uint32 x = 0; x < area_count; ++x)
         areas[dbc.getRecord(x).getUInt(0)] = dbc.getRecord(x).getUInt(3);
 
     maxAreaId = dbc.getMaxId();
@@ -254,7 +257,7 @@ void ReadLiquidTypeTableDBC()
 {
     printf("Read LiquidType.dbc file...");
     DBCFile dbc("DBFilesClient\\LiquidType.dbc");
-    if(!dbc.open())
+    if (!dbc.open())
     {
         printf("Fatal error: Invalid LiquidType.dbc file format!\n");
         exit(1);
@@ -265,7 +268,7 @@ void ReadLiquidTypeTableDBC()
     LiqType = new uint16[LiqType_maxid + 1];
     memset(LiqType, 0xff, (LiqType_maxid + 1) * sizeof(uint16));
 
-    for(uint32 x = 0; x < LiqType_count; ++x)
+    for (uint32 x = 0; x < LiqType_count; ++x)
         LiqType[dbc.getRecord(x).getUInt(0)] = dbc.getRecord(x).getUInt(3);
 
     printf("Done! (%u LiqTypes loaded)\n", LiqType_count);
@@ -277,7 +280,7 @@ void ReadLiquidTypeTableDBC()
 
 // Map file format data
 static char const* MAP_MAGIC         = "MAPS";
-static char const* MAP_VERSION_MAGIC = "v1.2";
+static char const* MAP_VERSION_MAGIC = "v1.3"; // marker
 static char const* MAP_AREA_MAGIC    = "AREA";
 static char const* MAP_HEIGHT_MAGIC  = "MHGT";
 static char const* MAP_LIQUID_MAGIC  = "MLIQ";
@@ -356,24 +359,25 @@ float selectUInt16StepStore(float maxDiff)
 uint16 area_flags[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
 
 float V8[ADT_GRID_SIZE][ADT_GRID_SIZE];
-float V9[ADT_GRID_SIZE+1][ADT_GRID_SIZE+1];
+float V9[ADT_GRID_SIZE + 1][ADT_GRID_SIZE + 1];
 uint16 uint16_V8[ADT_GRID_SIZE][ADT_GRID_SIZE];
-uint16 uint16_V9[ADT_GRID_SIZE+1][ADT_GRID_SIZE+1];
+uint16 uint16_V9[ADT_GRID_SIZE + 1][ADT_GRID_SIZE + 1];
 uint8  uint8_V8[ADT_GRID_SIZE][ADT_GRID_SIZE];
-uint8  uint8_V9[ADT_GRID_SIZE+1][ADT_GRID_SIZE+1];
+uint8  uint8_V9[ADT_GRID_SIZE + 1][ADT_GRID_SIZE + 1];
 
-uint8 liquid_type[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
+uint16 liquid_entry[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
+uint8 liquid_flags[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
 bool  liquid_show[ADT_GRID_SIZE][ADT_GRID_SIZE];
-float liquid_height[ADT_GRID_SIZE+1][ADT_GRID_SIZE+1];
+float liquid_height[ADT_GRID_SIZE + 1][ADT_GRID_SIZE + 1];
 
-bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32 build)
+bool ConvertADT(char* filename, char* filename2, int cell_y, int cell_x, uint32 build)
 {
     ADT_file adt;
 
     if (!adt.loadFile(filename))
         return false;
 
-    adt_MCIN *cells = adt.a_grid->getMCIN();
+    adt_MCIN* cells = adt.a_grid->getMCIN();
     if (!cells)
     {
         printf("Can't find cells in '%s'\n", filename);
@@ -381,7 +385,8 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
     }
 
     memset(liquid_show, 0, sizeof(liquid_show));
-    memset(liquid_type, 0, sizeof(liquid_type));
+    memset(liquid_flags, 0, sizeof(liquid_flags));
+    memset(liquid_entry, 0, sizeof(liquid_entry));
 
     // Prepare map header
     map_fileheader map;
@@ -390,15 +395,15 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
     map.buildMagic = build;
 
     // Get area flags data
-    for (int i=0;i<ADT_CELLS_PER_GRID;i++)
+    for (int i = 0; i < ADT_CELLS_PER_GRID; i++)
     {
-        for(int j=0;j<ADT_CELLS_PER_GRID;j++)
+        for (int j = 0; j < ADT_CELLS_PER_GRID; j++)
         {
-            adt_MCNK * cell = cells->getMCNK(i,j);
+            adt_MCNK* cell = cells->getMCNK(i, j);
             uint32 areaid = cell->areaid;
-            if(areaid && areaid <= maxAreaId)
+            if (areaid && areaid <= maxAreaId)
             {
-                if(areas[areaid] != 0xffff)
+                if (areas[areaid] != 0xffff)
                 {
                     area_flags[i][j] = areas[areaid];
                     continue;
@@ -413,11 +418,11 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
     //============================================
     bool fullAreaData = false;
     uint32 areaflag = area_flags[0][0];
-    for (int y=0;y<ADT_CELLS_PER_GRID;y++)
+    for (int y = 0; y < ADT_CELLS_PER_GRID; y++)
     {
-        for(int x=0;x<ADT_CELLS_PER_GRID;x++)
+        for (int x = 0; x < ADT_CELLS_PER_GRID; x++)
         {
-            if(area_flags[y][x]!=areaflag)
+            if (area_flags[y][x] != areaflag)
             {
                 fullAreaData = true;
                 break;
@@ -434,7 +439,7 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
     if (fullAreaData)
     {
         areaHeader.gridArea = 0;
-        map.areaMapSize+=sizeof(area_flags);
+        map.areaMapSize += sizeof(area_flags);
     }
     else
     {
@@ -445,11 +450,11 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
     //
     // Get Height map from grid
     //
-    for (int i=0;i<ADT_CELLS_PER_GRID;i++)
+    for (int i = 0; i < ADT_CELLS_PER_GRID; i++)
     {
-        for(int j=0;j<ADT_CELLS_PER_GRID;j++)
+        for (int j = 0; j < ADT_CELLS_PER_GRID; j++)
         {
-            adt_MCNK * cell = cells->getMCNK(i,j);
+            adt_MCNK* cell = cells->getMCNK(i, j);
             if (!cell)
                 continue;
             // Height values for triangles stored in order:
@@ -469,46 +474,46 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
             // . . . . . . . .
 
             // Set map height as grid height
-            for (int y=0; y <= ADT_CELL_SIZE; y++)
+            for (int y = 0; y <= ADT_CELL_SIZE; y++)
             {
-                int cy = i*ADT_CELL_SIZE + y;
-                for (int x=0; x <= ADT_CELL_SIZE; x++)
+                int cy = i * ADT_CELL_SIZE + y;
+                for (int x = 0; x <= ADT_CELL_SIZE; x++)
                 {
-                    int cx = j*ADT_CELL_SIZE + x;
-                    V9[cy][cx]=cell->ypos;
+                    int cx = j * ADT_CELL_SIZE + x;
+                    V9[cy][cx] = cell->ypos;
                 }
             }
-            for (int y=0; y < ADT_CELL_SIZE; y++)
+            for (int y = 0; y < ADT_CELL_SIZE; y++)
             {
-                int cy = i*ADT_CELL_SIZE + y;
-                for (int x=0; x < ADT_CELL_SIZE; x++)
+                int cy = i * ADT_CELL_SIZE + y;
+                for (int x = 0; x < ADT_CELL_SIZE; x++)
                 {
-                    int cx = j*ADT_CELL_SIZE + x;
-                    V8[cy][cx]=cell->ypos;
+                    int cx = j * ADT_CELL_SIZE + x;
+                    V8[cy][cx] = cell->ypos;
                 }
             }
             // Get custom height
-            adt_MCVT *v = cell->getMCVT();
+            adt_MCVT* v = cell->getMCVT();
             if (!v)
                 continue;
             // get V9 height map
-            for (int y=0; y <= ADT_CELL_SIZE; y++)
+            for (int y = 0; y <= ADT_CELL_SIZE; y++)
             {
-                int cy = i*ADT_CELL_SIZE + y;
-                for (int x=0; x <= ADT_CELL_SIZE; x++)
+                int cy = i * ADT_CELL_SIZE + y;
+                for (int x = 0; x <= ADT_CELL_SIZE; x++)
                 {
-                    int cx = j*ADT_CELL_SIZE + x;
-                    V9[cy][cx]+=v->height_map[y*(ADT_CELL_SIZE*2+1)+x];
+                    int cx = j * ADT_CELL_SIZE + x;
+                    V9[cy][cx] += v->height_map[y * (ADT_CELL_SIZE * 2 + 1) + x];
                 }
             }
             // get V8 height map
-            for (int y=0; y < ADT_CELL_SIZE; y++)
+            for (int y = 0; y < ADT_CELL_SIZE; y++)
             {
-                int cy = i*ADT_CELL_SIZE + y;
-                for (int x=0; x < ADT_CELL_SIZE; x++)
+                int cy = i * ADT_CELL_SIZE + y;
+                for (int x = 0; x < ADT_CELL_SIZE; x++)
                 {
-                    int cx = j*ADT_CELL_SIZE + x;
-                    V8[cy][cx]+=v->height_map[y*(ADT_CELL_SIZE*2+1)+ADT_CELL_SIZE+1+x];
+                    int cx = j * ADT_CELL_SIZE + x;
+                    V8[cy][cx] += v->height_map[y * (ADT_CELL_SIZE * 2 + 1) + ADT_CELL_SIZE + 1 + x];
                 }
             }
         }
@@ -518,18 +523,18 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
     //============================================
     float maxHeight = -20000;
     float minHeight =  20000;
-    for (int y=0; y<ADT_GRID_SIZE; y++)
+    for (int y = 0; y < ADT_GRID_SIZE; y++)
     {
-        for(int x=0;x<ADT_GRID_SIZE;x++)
+        for (int x = 0; x < ADT_GRID_SIZE; x++)
         {
             float h = V8[y][x];
             if (maxHeight < h) maxHeight = h;
             if (minHeight > h) minHeight = h;
         }
     }
-    for (int y=0; y<=ADT_GRID_SIZE; y++)
+    for (int y = 0; y <= ADT_GRID_SIZE; y++)
     {
-        for(int x=0;x<=ADT_GRID_SIZE;x++)
+        for (int x = 0; x <= ADT_GRID_SIZE; x++)
         {
             float h = V9[y][x];
             if (maxHeight < h) maxHeight = h;
@@ -540,12 +545,12 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
     // Check for allow limit minimum height (not store height in deep ochean - allow save some memory)
     if (CONF_allow_height_limit && minHeight < CONF_use_minHeight)
     {
-        for (int y=0; y<ADT_GRID_SIZE; y++)
-            for(int x=0;x<ADT_GRID_SIZE;x++)
+        for (int y = 0; y < ADT_GRID_SIZE; y++)
+            for (int x = 0; x < ADT_GRID_SIZE; x++)
                 if (V8[y][x] < CONF_use_minHeight)
                     V8[y][x] = CONF_use_minHeight;
-        for (int y=0; y<=ADT_GRID_SIZE; y++)
-            for(int x=0;x<=ADT_GRID_SIZE;x++)
+        for (int y = 0; y <= ADT_GRID_SIZE; y++)
+            for (int x = 0; x <= ADT_GRID_SIZE; x++)
                 if (V9[y][x] < CONF_use_minHeight)
                     V9[y][x] = CONF_use_minHeight;
         if (minHeight < CONF_use_minHeight)
@@ -580,100 +585,162 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
             float diff = maxHeight - minHeight;
             if (diff < CONF_float_to_int8_limit)      // As uint8 (max accuracy = CONF_float_to_int8_limit/256)
             {
-                heightHeader.flags|=MAP_HEIGHT_AS_INT8;
+                heightHeader.flags |= MAP_HEIGHT_AS_INT8;
                 step = selectUInt8StepStore(diff);
             }
-            else if (diff<CONF_float_to_int16_limit)  // As uint16 (max accuracy = CONF_float_to_int16_limit/65536)
+            else if (diff < CONF_float_to_int16_limit) // As uint16 (max accuracy = CONF_float_to_int16_limit/65536)
             {
-                heightHeader.flags|=MAP_HEIGHT_AS_INT16;
+                heightHeader.flags |= MAP_HEIGHT_AS_INT16;
                 step = selectUInt16StepStore(diff);
             }
         }
 
         // Pack it to int values if need
-        if (heightHeader.flags&MAP_HEIGHT_AS_INT8)
+        if (heightHeader.flags & MAP_HEIGHT_AS_INT8)
         {
-            for (int y=0; y<ADT_GRID_SIZE; y++)
-                for(int x=0;x<ADT_GRID_SIZE;x++)
+            for (int y = 0; y < ADT_GRID_SIZE; y++)
+                for (int x = 0; x < ADT_GRID_SIZE; x++)
                     uint8_V8[y][x] = uint8((V8[y][x] - minHeight) * step + 0.5f);
-            for (int y=0; y<=ADT_GRID_SIZE; y++)
-                for(int x=0;x<=ADT_GRID_SIZE;x++)
+            for (int y = 0; y <= ADT_GRID_SIZE; y++)
+                for (int x = 0; x <= ADT_GRID_SIZE; x++)
                     uint8_V9[y][x] = uint8((V9[y][x] - minHeight) * step + 0.5f);
-            map.heightMapSize+= sizeof(uint8_V9) + sizeof(uint8_V8);
+            map.heightMapSize += sizeof(uint8_V9) + sizeof(uint8_V8);
         }
-        else if (heightHeader.flags&MAP_HEIGHT_AS_INT16)
+        else if (heightHeader.flags & MAP_HEIGHT_AS_INT16)
         {
-            for (int y=0; y<ADT_GRID_SIZE; y++)
-                for(int x=0;x<ADT_GRID_SIZE;x++)
+            for (int y = 0; y < ADT_GRID_SIZE; y++)
+                for (int x = 0; x < ADT_GRID_SIZE; x++)
                     uint16_V8[y][x] = uint16((V8[y][x] - minHeight) * step + 0.5f);
-            for (int y=0; y<=ADT_GRID_SIZE; y++)
-                for(int x=0;x<=ADT_GRID_SIZE;x++)
+            for (int y = 0; y <= ADT_GRID_SIZE; y++)
+                for (int x = 0; x <= ADT_GRID_SIZE; x++)
                     uint16_V9[y][x] = uint16((V9[y][x] - minHeight) * step + 0.5f);
-            map.heightMapSize+= sizeof(uint16_V9) + sizeof(uint16_V8);
+            map.heightMapSize += sizeof(uint16_V9) + sizeof(uint16_V8);
         }
         else
-            map.heightMapSize+= sizeof(V9) + sizeof(V8);
+            map.heightMapSize += sizeof(V9) + sizeof(V8);
+    }
+
+    // Get from MCLQ chunk (old)
+    for (int i = 0; i < ADT_CELLS_PER_GRID; i++)
+    {
+        for (int j = 0; j < ADT_CELLS_PER_GRID; j++)
+        {
+            adt_MCNK* cell = cells->getMCNK(i, j);
+            if (!cell)
+                continue;
+
+            adt_MCLQ* liquid = cell->getMCLQ();
+            int count = 0;
+            if (!liquid || cell->sizeMCLQ <= 8)
+                continue;
+
+            for (int y = 0; y < ADT_CELL_SIZE; y++)
+            {
+                int cy = i * ADT_CELL_SIZE + y;
+                for (int x = 0; x < ADT_CELL_SIZE; x++)
+                {
+                    int cx = j * ADT_CELL_SIZE + x;
+                    if (liquid->flags[y][x] != 0x0F)
+                    {
+                        liquid_show[cy][cx] = true;
+                        if (liquid->flags[y][x] & (1 << 7))
+                            liquid_flags[i][j] |= MAP_LIQUID_TYPE_DARK_WATER;
+                        ++count;
+                    }
+                }
+            }
+
+            uint32 c_flag = cell->flags;
+            if (c_flag & (1 << 2))
+            {
+                liquid_entry[i][j] = 1;
+                liquid_flags[i][j] |= MAP_LIQUID_TYPE_WATER;            // water
+            }
+            if (c_flag & (1 << 3))
+            {
+                liquid_entry[i][j] = 2;
+                liquid_flags[i][j] |= MAP_LIQUID_TYPE_OCEAN;            // ocean
+            }
+            if (c_flag & (1 << 4))
+            {
+                liquid_entry[i][j] = 3;
+                liquid_flags[i][j] |= MAP_LIQUID_TYPE_MAGMA;            // magma/slime
+            }
+
+            if (!count && liquid_flags[i][j])
+                fprintf(stderr, "Wrong liquid detect in MCLQ chunk");
+
+            for (int y = 0; y <= ADT_CELL_SIZE; y++)
+            {
+                int cy = i * ADT_CELL_SIZE + y;
+                for (int x = 0; x <= ADT_CELL_SIZE; x++)
+                {
+                    int cx = j * ADT_CELL_SIZE + x;
+                    liquid_height[cy][cx] = liquid->liquid[y][x].height;
+                }
+            }
+        }
     }
 
     // Get liquid map for grid (in WOTLK used MH2O chunk)
-    adt_MH2O * h2o = adt.a_grid->getMH2O();
+    adt_MH2O* h2o = adt.a_grid->getMH2O();
     if (h2o)
     {
-        for (int i=0;i<ADT_CELLS_PER_GRID;i++)
+        for (int i = 0; i < ADT_CELLS_PER_GRID; i++)
         {
-            for(int j=0;j<ADT_CELLS_PER_GRID;j++)
+            for (int j = 0; j < ADT_CELLS_PER_GRID; j++)
             {
-                adt_liquid_header *h = h2o->getLiquidData(i,j);
+                adt_liquid_header* h = h2o->getLiquidData(i, j);
                 if (!h)
                     continue;
 
                 int count = 0;
                 uint64 show = h2o->getLiquidShowMap(h);
-                for (int y=0; y < h->height;y++)
+                for (int y = 0; y < h->height; y++)
                 {
-                    int cy = i*ADT_CELL_SIZE + y + h->yOffset;
-                    for (int x=0; x < h->width; x++)
+                    int cy = i * ADT_CELL_SIZE + y + h->yOffset;
+                    for (int x = 0; x < h->width; x++)
                     {
-                        int cx = j*ADT_CELL_SIZE + x + h->xOffset;
+                        int cx = j * ADT_CELL_SIZE + x + h->xOffset;
                         if (show & 1)
                         {
                             liquid_show[cy][cx] = true;
                             ++count;
                         }
-                        show>>=1;
+                        show >>= 1;
                     }
                 }
 
-                uint32 type = LiqType[h->liquidType];
-                switch (type)
+                liquid_entry[i][j] = h->liquidType;
+                switch (LiqType[h->liquidType])
                 {
-                    case LIQUID_TYPE_WATER: liquid_type[i][j] |= MAP_LIQUID_TYPE_WATER; break;
-                    case LIQUID_TYPE_OCEAN: liquid_type[i][j] |= MAP_LIQUID_TYPE_OCEAN; break;
-                    case LIQUID_TYPE_MAGMA: liquid_type[i][j] |= MAP_LIQUID_TYPE_MAGMA; break;
-                    case LIQUID_TYPE_SLIME: liquid_type[i][j] |= MAP_LIQUID_TYPE_SLIME; break;
+                    case LIQUID_TYPE_WATER: liquid_flags[i][j] |= MAP_LIQUID_TYPE_WATER; break;
+                    case LIQUID_TYPE_OCEAN: liquid_flags[i][j] |= MAP_LIQUID_TYPE_OCEAN; break;
+                    case LIQUID_TYPE_MAGMA: liquid_flags[i][j] |= MAP_LIQUID_TYPE_MAGMA; break;
+                    case LIQUID_TYPE_SLIME: liquid_flags[i][j] |= MAP_LIQUID_TYPE_SLIME; break;
                     default:
                         printf("\nCan't find Liquid type %u for map %s\nchunk %d,%d\n", h->liquidType, filename, i, j);
                         break;
                 }
                 // Dark water detect
-                if (type == LIQUID_TYPE_OCEAN)
+                if (LiqType[h->liquidType] == LIQUID_TYPE_OCEAN)
                 {
-                    uint8 *lm = h2o->getLiquidLightMap(h);
+                    uint8* lm = h2o->getLiquidLightMap(h);
                     if (!lm)
-                        liquid_type[i][j]|=MAP_LIQUID_TYPE_DARK_WATER;
+                        liquid_flags[i][j] |= MAP_LIQUID_TYPE_DARK_WATER;
                 }
 
-                if (!count && liquid_type[i][j])
+                if (!count && liquid_flags[i][j])
                     printf("Wrong liquid detect in MH2O chunk");
 
-                float *height = h2o->getLiquidHeightMap(h);
+                float* height = h2o->getLiquidHeightMap(h);
                 int pos = 0;
-                for (int y=0; y<=h->height;y++)
+                for (int y = 0; y <= h->height; y++)
                 {
-                    int cy = i*ADT_CELL_SIZE + y + h->yOffset;
-                    for (int x=0; x<= h->width; x++)
+                    int cy = i * ADT_CELL_SIZE + y + h->yOffset;
+                    for (int x = 0; x <= h->width; x++)
                     {
-                        int cx = j*ADT_CELL_SIZE + x + h->xOffset;
+                        int cx = j * ADT_CELL_SIZE + x + h->xOffset;
                         if (height)
                             liquid_height[cy][cx] = height[pos];
                         else
@@ -684,72 +751,16 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
             }
         }
     }
-    else
-    {
-        // Get from MCLQ chunk (old)
-        for (int i=0;i<ADT_CELLS_PER_GRID;i++)
-        {
-            for(int j=0;j<ADT_CELLS_PER_GRID;j++)
-            {
-                adt_MCNK *cell = cells->getMCNK(i, j);
-                if (!cell)
-                    continue;
-
-                adt_MCLQ *liquid = cell->getMCLQ();
-                int count = 0;
-                if (!liquid || cell->sizeMCLQ <= 8)
-                    continue;
-
-                for (int y=0; y < ADT_CELL_SIZE; y++)
-                {
-                    int cy = i*ADT_CELL_SIZE + y;
-                    for (int x=0; x < ADT_CELL_SIZE; x++)
-                    {
-                        int cx = j*ADT_CELL_SIZE + x;
-                        if (liquid->flags[y][x] != 0x0F)
-                        {
-                            liquid_show[cy][cx] = true;
-                            if (liquid->flags[y][x]&(1<<7))
-                                liquid_type[i][j]|=MAP_LIQUID_TYPE_DARK_WATER;
-                            ++count;
-                        }
-                    }
-                }
-
-                uint32 c_flag = cell->flags;
-                if(c_flag & (1<<2))
-                    liquid_type[i][j]|=MAP_LIQUID_TYPE_WATER;            // water
-                if(c_flag & (1<<3))
-                    liquid_type[i][j]|=MAP_LIQUID_TYPE_OCEAN;            // ochean
-                if(c_flag & (1<<4))
-                    liquid_type[i][j]|=MAP_LIQUID_TYPE_MAGMA;            // magma/slime
-
-                if (!count && liquid_type[i][j])
-                    printf("Wrong liquid detect in MCLQ chunk");
-
-                for (int y=0; y <= ADT_CELL_SIZE; y++)
-                {
-                    int cy = i*ADT_CELL_SIZE + y;
-                    for (int x=0; x<= ADT_CELL_SIZE; x++)
-                    {
-                        int cx = j*ADT_CELL_SIZE + x;
-                        liquid_height[cy][cx] = liquid->liquid[y][x].height;
-                    }
-                }
-            }
-        }
-    }
-
     //============================================
     // Pack liquid data
     //============================================
-    uint8 type = liquid_type[0][0];
+    uint8 type = liquid_flags[0][0];
     bool fullType = false;
-    for (int y=0;y<ADT_CELLS_PER_GRID;y++)
+    for (int y = 0; y < ADT_CELLS_PER_GRID; y++)
     {
-        for(int x=0;x<ADT_CELLS_PER_GRID;x++)
+        for (int x = 0; x < ADT_CELLS_PER_GRID; x++)
         {
-            if (liquid_type[y][x]!=type)
+            if (liquid_flags[y][x] != type)
             {
                 fullType = true;
                 y = ADT_CELLS_PER_GRID;
@@ -773,9 +784,9 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
         int maxX = 0, maxY = 0;
         maxHeight = -20000;
         minHeight = 20000;
-        for (int y=0; y<ADT_GRID_SIZE; y++)
+        for (int y = 0; y < ADT_GRID_SIZE; y++)
         {
-            for(int x=0; x<ADT_GRID_SIZE; x++)
+            for (int x = 0; x < ADT_GRID_SIZE; x++)
             {
                 if (liquid_show[y][x])
                 {
@@ -815,16 +826,16 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
         if (liquidHeader.flags & MAP_LIQUID_NO_TYPE)
             liquidHeader.liquidType = type;
         else
-            map.liquidMapSize+=sizeof(liquid_type);
+            map.liquidMapSize += sizeof(liquid_entry) + sizeof(liquid_flags);
 
         if (!(liquidHeader.flags & MAP_LIQUID_NO_HEIGHT))
-            map.liquidMapSize += sizeof(float)*liquidHeader.width*liquidHeader.height;
+            map.liquidMapSize += sizeof(float) * liquidHeader.width * liquidHeader.height;
     }
 
     // map hole info
     uint16 holes[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
 
-    if(map.liquidMapOffset)
+    if (map.liquidMapOffset)
         map.holesOffset = map.liquidMapOffset + map.liquidMapSize;
     else
         map.holesOffset = map.heightMapOffset + map.heightMapSize;
@@ -832,20 +843,20 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
     map.holesSize = sizeof(holes);
     memset(holes, 0, map.holesSize);
 
-    for(int i = 0; i < ADT_CELLS_PER_GRID; ++i)
+    for (int i = 0; i < ADT_CELLS_PER_GRID; ++i)
     {
-        for(int j = 0; j < ADT_CELLS_PER_GRID; ++j)
+        for (int j = 0; j < ADT_CELLS_PER_GRID; ++j)
         {
-            adt_MCNK * cell = cells->getMCNK(i,j);
-            if(!cell)
+            adt_MCNK* cell = cells->getMCNK(i, j);
+            if (!cell)
                 continue;
             holes[i][j] = cell->holes;
         }
     }
 
     // Ok all data prepared - store it
-    FILE *output=fopen(filename2, "wb");
-    if(!output)
+    FILE* output = fopen(filename2, "wb");
+    if (!output)
     {
         printf("Can't create the output file '%s'\n", filename2);
         return false;
@@ -853,7 +864,7 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
     fwrite(&map, sizeof(map), 1, output);
     // Store area data
     fwrite(&areaHeader, sizeof(areaHeader), 1, output);
-    if (!(areaHeader.flags&MAP_AREA_NO_AREA))
+    if (!(areaHeader.flags & MAP_AREA_NO_AREA))
         fwrite(area_flags, sizeof(area_flags), 1, output);
 
     // Store height data
@@ -881,12 +892,15 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
     if (map.liquidMapOffset)
     {
         fwrite(&liquidHeader, sizeof(liquidHeader), 1, output);
-        if (!(liquidHeader.flags&MAP_LIQUID_NO_TYPE))
-            fwrite(liquid_type, sizeof(liquid_type), 1, output);
-        if (!(liquidHeader.flags&MAP_LIQUID_NO_HEIGHT))
+        if (!(liquidHeader.flags & MAP_LIQUID_NO_TYPE))
+        {
+            fwrite(liquid_entry, sizeof(liquid_entry), 1, output);
+            fwrite(liquid_flags, sizeof(liquid_flags), 1, output);
+        }
+        if (!(liquidHeader.flags & MAP_LIQUID_NO_HEIGHT))
         {
-            for (int y=0; y<liquidHeader.height;y++)
-                fwrite(&liquid_height[y+liquidHeader.offsetY][liquidHeader.offsetX], sizeof(float), liquidHeader.width, output);
+            for (int y = 0; y < liquidHeader.height; y++)
+                fwrite(&liquid_height[y + liquidHeader.offsetY][liquidHeader.offsetX], sizeof(float), liquidHeader.width, output);
         }
     }
 
@@ -916,9 +930,9 @@ void ExtractMapsFromMpq(uint32 build)
     CreateDir(path);
 
     printf("Convert map files\n");
-    for(uint32 z = 0; z < map_count; ++z)
+    for (uint32 z = 0; z < map_count; ++z)
     {
-        printf("Extract %s (%d/%d)                  \n", map_ids[z].name, z+1, map_count);
+        printf("Extract %s (%d/%d)                  \n", map_ids[z].name, z + 1, map_count);
         // Loadup map grid data
         sprintf(mpq_map_name, "World\\Maps\\%s\\%s.wdt", map_ids[z].name, map_ids[z].name);
         WDT_file wdt;
@@ -928,9 +942,9 @@ void ExtractMapsFromMpq(uint32 build)
             continue;
         }
 
-        for(uint32 y = 0; y < WDT_MAP_SIZE; ++y)
+        for (uint32 y = 0; y < WDT_MAP_SIZE; ++y)
         {
-            for(uint32 x = 0; x < WDT_MAP_SIZE; ++x)
+            for (uint32 x = 0; x < WDT_MAP_SIZE; ++x)
             {
                 if (!wdt.main->adt_list[y][x].exist)
                     continue;
@@ -939,23 +953,23 @@ void ExtractMapsFromMpq(uint32 build)
                 ConvertADT(mpq_filename, output_filename, y, x, build);
             }
             // draw progress bar
-            printf("Processing........................%d%%\r", (100 * (y+1)) / WDT_MAP_SIZE);
+            printf("Processing........................%d%%\r", (100 * (y + 1)) / WDT_MAP_SIZE);
         }
     }
     delete [] areas;
     delete [] map_ids;
 }
 
-bool ExtractFile( char const* mpq_name, std::string const& filename )
+bool ExtractFile(char const* mpq_name, std::string const& filename)
 {
-    FILE *output = fopen(filename.c_str(), "wb");
-    if(!output)
+    FILE* output = fopen(filename.c_str(), "wb");
+    if (!output)
     {
         printf("Can't create the output file '%s'\n", filename.c_str());
         return false;
     }
     MPQFile m(mpq_name);
-    if(!m.isEof())
+    if (!m.isEof())
         fwrite(m.getPointer(), 1, m.getSize(), output);
 
     fclose(output);
@@ -969,19 +983,19 @@ void ExtractDBCFiles(int locale, bool basicLocale)
     std::set<std::string> dbcfiles;
 
     // get DBC file list
-    for(ArchiveSet::iterator i = gOpenArchives.begin(); i != gOpenArchives.end();++i)
+    for (ArchiveSet::iterator i = gOpenArchives.begin(); i != gOpenArchives.end(); ++i)
     {
         vector<string> files;
         (*i)->GetFileListTo(files);
         for (vector<string>::iterator iter = files.begin(); iter != files.end(); ++iter)
             if (iter->rfind(".dbc") == iter->length() - strlen(".dbc"))
-                    dbcfiles.insert(*iter);
+                dbcfiles.insert(*iter);
     }
 
     std::string path = output_path;
     path += "/dbc/";
     CreateDir(path);
-    if(!basicLocale)
+    if (!basicLocale)
     {
         path += langs[locale];
         path += "/";
@@ -1003,7 +1017,7 @@ void ExtractDBCFiles(int locale, bool basicLocale)
         string filename = path;
         filename += (iter->c_str() + strlen("DBFilesClient\\"));
 
-        if(ExtractFile(iter->c_str(), filename))
+        if (ExtractFile(iter->c_str(), filename))
             ++count;
     }
     printf("Extracted %u DBC files\n\n", count);
@@ -1013,17 +1027,17 @@ void LoadLocaleMPQFiles(int const locale)
 {
     char filename[512];
 
-    sprintf(filename,"%s/Data/%s/locale-%s.MPQ", input_path, langs[locale], langs[locale]);
+    sprintf(filename, "%s/Data/%s/locale-%s.MPQ", input_path, langs[locale], langs[locale]);
     new MPQArchive(filename);
 
-    for(int i = 1; i < 5; ++i)
+    for (int i = 1; i < 5; ++i)
     {
         char ext[3] = "";
-        if(i > 1)
+        if (i > 1)
             sprintf(ext, "-%i", i);
 
-        sprintf(filename,"%s/Data/%s/patch-%s%s.MPQ", input_path, langs[locale], langs[locale], ext);
-        if(FileExists(filename))
+        sprintf(filename, "%s/Data/%s/patch-%s%s.MPQ", input_path, langs[locale], langs[locale], ext);
+        if (FileExists(filename))
             new MPQArchive(filename);
     }
 }
@@ -1031,22 +1045,22 @@ void LoadLocaleMPQFiles(int const locale)
 void LoadCommonMPQFiles()
 {
     char filename[512];
-    int count = sizeof(CONF_mpq_list)/sizeof(char*);
-    for(int i = 0; i < count; ++i)
+    int count = sizeof(CONF_mpq_list) / sizeof(char*);
+    for (int i = 0; i < count; ++i)
     {
         sprintf(filename, "%s/Data/%s", input_path, CONF_mpq_list[i]);
-        if(FileExists(filename))
+        if (FileExists(filename))
             new MPQArchive(filename);
     }
 }
 
 inline void CloseMPQFiles()
 {
-    for(ArchiveSet::iterator j = gOpenArchives.begin(); j != gOpenArchives.end();++j) (*j)->close();
-        gOpenArchives.clear();
+    for (ArchiveSet::iterator j = gOpenArchives.begin(); j != gOpenArchives.end(); ++j)(*j)->close();
+    gOpenArchives.clear();
 }
 
-int main(int argc, char * arg[])
+int main(int argc, char* arg[])
 {
     printf("Map & DBC Extractor\n");
     printf("===================\n\n");
@@ -1067,7 +1081,7 @@ int main(int argc, char * arg[])
             //Open MPQs
             LoadLocaleMPQFiles(i);
 
-            if((CONF_extract & EXTRACT_DBC) == 0)
+            if ((CONF_extract & EXTRACT_DBC) == 0)
             {
                 FirstLocale = i;
                 build = ReadBuild(FirstLocale);
@@ -1076,7 +1090,7 @@ int main(int argc, char * arg[])
             }
 
             //Extract DBC files
-            if(FirstLocale < 0)
+            if (FirstLocale < 0)
             {
                 FirstLocale = i;
                 build = ReadBuild(FirstLocale);
@@ -1091,7 +1105,7 @@ int main(int argc, char * arg[])
         }
     }
 
-    if(FirstLocale < 0)
+    if (FirstLocale < 0)
     {
         printf("No locales detected\n");
         return 0;
diff --git a/contrib/extractor/VC100_AD.sln b/contrib/extractor/VC100_AD.sln
deleted file mode 100644
index 0c148470f93..00000000000
--- a/contrib/extractor/VC100_AD.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "VC100_ad.vcxproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/contrib/extractor/VC100_ad.vcxproj b/contrib/extractor/VC100_ad.vcxproj
deleted file mode 100644
index 9b5bde66f3d..00000000000
--- a/contrib/extractor/VC100_ad.vcxproj
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ad</ProjectName>
-    <ProjectGuid>{D7552D4F-408F-4F8E-859B-366659150CF4}</ProjectGuid>
-    <RootNamespace>ad</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\debug\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\release\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./ad.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)ad.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <BrowseInformationFile>$(IntDir)</BrowseInformationFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>ad_debug.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>./debug/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>./ad_debug.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./ad.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)ad.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>./ad.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>./release/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBC.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ProgramDatabaseFile>./ad.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="loadlib\adt.cpp" />
-    <ClCompile Include="libmpq\common.cpp" />
-    <ClCompile Include="dbcfile.cpp" />
-    <ClCompile Include="libmpq\explode.cpp" />
-    <ClCompile Include="libmpq\extract.cpp" />
-    <ClCompile Include="libmpq\huffman.cpp" />
-    <ClCompile Include="loadlib\loadlib.cpp" />
-    <ClCompile Include="libmpq\mpq.cpp" />
-    <ClCompile Include="mpq_libmpq.cpp" />
-    <ClCompile Include="libmpq\parser.cpp" />
-    <ClCompile Include="system.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Full</Optimization>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="libmpq\wave.cpp" />
-    <ClCompile Include="loadlib\wdt.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="loadlib\adt.h" />
-    <ClInclude Include="libmpq\common.h" />
-    <ClInclude Include="dbcfile.h" />
-    <ClInclude Include="libmpq\explode.h" />
-    <ClInclude Include="libmpq\huffman.h" />
-    <ClInclude Include="loadlib\loadlib.h" />
-    <ClInclude Include="libmpq\mpq.h" />
-    <ClInclude Include="mpq_libmpq.h" />
-    <ClInclude Include="libmpq\wave.h" />
-    <ClInclude Include="loadlib\wdt.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/contrib/extractor/VC100_ad.vcxproj.filters b/contrib/extractor/VC100_ad.vcxproj.filters
deleted file mode 100644
index a32c32c7639..00000000000
--- a/contrib/extractor/VC100_ad.vcxproj.filters
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{7748a821-40c1-4432-a07e-ff4da1273091}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{bd48cc48-7a79-4088-9e3f-8bf123692891}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="loadlib\adt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="libmpq\common.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dbcfile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="libmpq\explode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="libmpq\extract.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="libmpq\huffman.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="loadlib\loadlib.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="libmpq\mpq.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mpq_libmpq.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="libmpq\parser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="system.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="libmpq\wave.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="loadlib\wdt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="loadlib\adt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="libmpq\common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dbcfile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="libmpq\explode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="libmpq\huffman.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="loadlib\loadlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="libmpq\mpq.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="mpq_libmpq.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="libmpq\wave.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="loadlib\wdt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/contrib/extractor/VC90_AD.sln b/contrib/extractor/VC90_AD.sln
deleted file mode 100644
index 68dd66e1f7f..00000000000
--- a/contrib/extractor/VC90_AD.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "VC90_ad.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/contrib/extractor/VC90_ad.vcproj b/contrib/extractor/VC90_ad.vcproj
deleted file mode 100644
index 9317a60c0aa..00000000000
--- a/contrib/extractor/VC90_ad.vcproj
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ad"
-	ProjectGUID="{D7552D4F-408F-4F8E-859B-366659150CF4}"
-	RootNamespace="ad"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory=".\debug\"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="./ad.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="libmpq"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)ad.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				XMLDocumentationFileName="$(IntDir)\"
-				BrowseInformation="1"
-				BrowseInformationFile="$(IntDir)"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1049"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib"
-				OutputFile="ad_debug.exe"
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="./debug/"
-				IgnoreDefaultLibraryNames="LIBCD.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="./ad_debug.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="."
-			IntermediateDirectory=".\release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="./ad.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="libmpq"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)ad.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				XMLDocumentationFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1049"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib"
-				OutputFile="./ad.exe"
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="./release/"
-				IgnoreDefaultLibraryNames="LIBC.lib"
-				ProgramDatabaseFile="./ad.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath=".\loadlib\adt.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\common.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\dbcfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\explode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\extract.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\huffman.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\loadlib\loadlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\mpq.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\mpq_libmpq.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\parser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="system.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="3"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\libmpq\wave.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\loadlib\wdt.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath=".\loadlib\adt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dbcfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\explode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\huffman.h"
-				>
-			</File>
-			<File
-				RelativePath=".\loadlib\loadlib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\mpq.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mpq_libmpq.h"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\wave.h"
-				>
-			</File>
-			<File
-				RelativePath=".\loadlib\wdt.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/extractor/ad.exe b/contrib/extractor/ad.exe
index 135a06f7721..5726d0d7e8f 100755
Binary files a/contrib/extractor/ad.exe and b/contrib/extractor/ad.exe differ
diff --git a/contrib/extractor/dbcfile.cpp b/contrib/extractor/dbcfile.cpp
index 9e42f876b7e..96427140c84 100644
--- a/contrib/extractor/dbcfile.cpp
+++ b/contrib/extractor/dbcfile.cpp
@@ -3,7 +3,7 @@
 #include "dbcfile.h"
 #include "mpq_libmpq.h"
 
-DBCFile::DBCFile(const std::string &filename):
+DBCFile::DBCFile(const std::string& filename):
     filename(filename),
     data(0)
 {
@@ -13,35 +13,35 @@ bool DBCFile::open()
 {
     MPQFile f(filename.c_str());
     char header[4];
-    unsigned int na,nb,es,ss;
+    unsigned int na, nb, es, ss;
 
-    if(f.read(header,4)!=4)                                 // Number of records
+    if (f.read(header, 4) != 4)                             // Number of records
         return false;
 
-    if(header[0]!='W' || header[1]!='D' || header[2]!='B' || header[3]!='C')
+    if (header[0] != 'W' || header[1] != 'D' || header[2] != 'B' || header[3] != 'C')
         return false;
 
-    if(f.read(&na,4)!=4)                                    // Number of records
+    if (f.read(&na, 4) != 4)                                // Number of records
         return false;
-    if(f.read(&nb,4)!=4)                                    // Number of fields
+    if (f.read(&nb, 4) != 4)                                // Number of fields
         return false;
-    if(f.read(&es,4)!=4)                                    // Size of a record
+    if (f.read(&es, 4) != 4)                                // Size of a record
         return false;
-    if(f.read(&ss,4)!=4)                                    // String size
+    if (f.read(&ss, 4) != 4)                                // String size
         return false;
 
     recordSize = es;
     recordCount = na;
     fieldCount = nb;
     stringSize = ss;
-    if(fieldCount*4 != recordSize)
+    if (fieldCount * 4 != recordSize)
         return false;
 
-    data = new unsigned char[recordSize*recordCount+stringSize];
-    stringTable = data + recordSize*recordCount;
+    data = new unsigned char[recordSize * recordCount + stringSize];
+    stringTable = data + recordSize * recordCount;
 
-    size_t data_size = recordSize*recordCount+stringSize;
-    if(f.read(data,data_size)!=data_size)
+    size_t data_size = recordSize * recordCount + stringSize;
+    if (f.read(data, data_size) != data_size)
         return false;
     f.close();
     return true;
@@ -54,7 +54,7 @@ DBCFile::~DBCFile()
 DBCFile::Record DBCFile::getRecord(size_t id)
 {
     assert(data);
-    return Record(*this, data + id*recordSize);
+    return Record(*this, data + id * recordSize);
 }
 
 size_t DBCFile::getMaxId()
@@ -62,9 +62,9 @@ size_t DBCFile::getMaxId()
     assert(data);
 
     size_t maxId = 0;
-    for(size_t i = 0; i < getRecordCount(); ++i)
+    for (size_t i = 0; i < getRecordCount(); ++i)
     {
-        if(maxId < getRecord(i).getUInt(0))
+        if (maxId < getRecord(i).getUInt(0))
             maxId = getRecord(i).getUInt(0);
     }
     return maxId;
diff --git a/contrib/extractor/dbcfile.h b/contrib/extractor/dbcfile.h
index 4af2606aff9..1ac49503bfe 100644
--- a/contrib/extractor/dbcfile.h
+++ b/contrib/extractor/dbcfile.h
@@ -5,114 +5,116 @@
 
 class DBCFile
 {
-public:
-    DBCFile(const std::string &filename);
-    ~DBCFile();
+    public:
+        DBCFile(const std::string& filename);
+        ~DBCFile();
 
-    // Open database. It must be openened before it can be used.
-    bool open();
+        // Open database. It must be openened before it can be used.
+        bool open();
 
-    // Database exceptions
-    class Exception
-    {
-    public:
-        Exception(const std::string &message): message(message)
-        { }
-        virtual ~Exception()
-        { }
-        const std::string &getMessage() {return message;}
-    private:
-        std::string message;
-    };
-    class NotFound: public Exception
-    {
-    public:
-        NotFound(): Exception("Key was not found")
-        { }
-    };
-    // Iteration over database
-    class Iterator;
-    class Record
-    {
-    public:
-        float getFloat(size_t field) const
-        {
-            assert(field < file.fieldCount);
-            return *reinterpret_cast<float*>(offset+field*4);
-        }
-        unsigned int getUInt(size_t field) const
+        // Database exceptions
+        class Exception
         {
-            assert(field < file.fieldCount);
-            return *reinterpret_cast<unsigned int*>(offset+field*4);
-        }
-        int getInt(size_t field) const
+            public:
+                Exception(const std::string& message): message(message)
+                { }
+                virtual ~Exception()
+                { }
+                const std::string& getMessage() {return message;}
+            private:
+                std::string message;
+        };
+        class NotFound: public Exception
         {
-            assert(field < file.fieldCount);
-            return *reinterpret_cast<int*>(offset+field*4);
-        }
-        const char *getString(size_t field) const
+            public:
+                NotFound(): Exception("Key was not found")
+                { }
+        };
+        // Iteration over database
+        class Iterator;
+        class Record
         {
-            assert(field < file.fieldCount);
-            size_t stringOffset = getUInt(field);
-            assert(stringOffset < file.stringSize);
-            return reinterpret_cast<char*>(file.stringTable + stringOffset);
-        }
-    private:
-        Record(DBCFile &file, unsigned char *offset): file(file), offset(offset) {}
-        unsigned char *offset;
-        DBCFile &file;
+            public:
+                float getFloat(size_t field) const
+                {
+                    assert(field < file.fieldCount);
+                    return *reinterpret_cast<float*>(offset + field * 4);
+                }
+                unsigned int getUInt(size_t field) const
+                {
+                    assert(field < file.fieldCount);
+                    return *reinterpret_cast<unsigned int*>(offset + field * 4);
+                }
+                int getInt(size_t field) const
+                {
+                    assert(field < file.fieldCount);
+                    return *reinterpret_cast<int*>(offset + field * 4);
+                }
+                const char* getString(size_t field) const
+                {
+                    assert(field < file.fieldCount);
+                    size_t stringOffset = getUInt(field);
+                    assert(stringOffset < file.stringSize);
+                    return reinterpret_cast<char*>(file.stringTable + stringOffset);
+                }
+            private:
+                Record(DBCFile& file, unsigned char* offset): file(file), offset(offset) {}
+                unsigned char* offset;
+                DBCFile& file;
 
-        friend class DBCFile;
-        friend class DBCFile::Iterator;
-    };
-    /** Iterator that iterates over records
-    */
-    class Iterator
-    {
-    public:
-        Iterator(DBCFile &file, unsigned char *offset):
-            record(file, offset) {}
-        /// Advance (prefix only)
-        Iterator & operator++() {
-            record.offset += record.file.recordSize;
-            return *this;
-        }
-        /// Return address of current instance
-        Record const & operator*() const { return record; }
-        const Record* operator->() const {
-            return &record;
-        }
-        /// Comparison
-        bool operator==(const Iterator &b) const
-        {
-            return record.offset == b.record.offset;
-        }
-        bool operator!=(const Iterator &b) const
+                friend class DBCFile;
+                friend class DBCFile::Iterator;
+        };
+        /** Iterator that iterates over records
+        */
+        class Iterator
         {
-            return record.offset != b.record.offset;
-        }
-    private:
-        Record record;
-    };
+            public:
+                Iterator(DBCFile& file, unsigned char* offset):
+                    record(file, offset) {}
+                /// Advance (prefix only)
+                Iterator& operator++()
+                {
+                    record.offset += record.file.recordSize;
+                    return *this;
+                }
+                /// Return address of current instance
+                Record const& operator*() const { return record; }
+                const Record* operator->() const
+                {
+                    return &record;
+                }
+                /// Comparison
+                bool operator==(const Iterator& b) const
+                {
+                    return record.offset == b.record.offset;
+                }
+                bool operator!=(const Iterator& b) const
+                {
+                    return record.offset != b.record.offset;
+                }
+            private:
+                Record record;
+        };
 
-    // Get record by id
-    Record getRecord(size_t id);
-    /// Get begin iterator over records
-    Iterator begin();
-    /// Get begin iterator over records
-    Iterator end();
-    /// Trivial
-    size_t getRecordCount() const { return recordCount;}
-    size_t getFieldCount() const { return fieldCount; }
-    size_t getMaxId();
-private:
-    std::string filename;
-    size_t recordSize;
-    size_t recordCount;
-    size_t fieldCount;
-    size_t stringSize;
-    unsigned char *data;
-    unsigned char *stringTable;
+        // Get record by id
+        Record getRecord(size_t id);
+        /// Get begin iterator over records
+        Iterator begin();
+        /// Get begin iterator over records
+        Iterator end();
+        /// Trivial
+        size_t getRecordCount() const { return recordCount;}
+        size_t getFieldCount() const { return fieldCount; }
+        size_t getMaxId();
+    private:
+        std::string filename;
+        size_t recordSize;
+        size_t recordCount;
+        size_t fieldCount;
+        size_t stringSize;
+        unsigned char* data;
+        unsigned char* stringTable;
 };
 
 #endif
diff --git a/contrib/extractor/libmpq/common.cpp b/contrib/extractor/libmpq/common.cpp
index bcb83f07160..711dfb0e3f8 100644
--- a/contrib/extractor/libmpq/common.cpp
+++ b/contrib/extractor/libmpq/common.cpp
@@ -48,185 +48,214 @@ unsigned int libmpq_lseek(mpq_archive* mpq_a, unsigned int pos)
 /*
  *  This function decrypts a MPQ block.
  */
-int libmpq_decrypt_block(mpq_archive *mpq_a, unsigned int *block, unsigned int length, unsigned int seed1) {
-	unsigned int seed2 = 0xEEEEEEEE;
-	unsigned int ch;
-
-	/* Round to unsigned int's */
-	length >>= 2;
-	while (length-- > 0) {
-		seed2    += mpq_a->buf[0x400 + (seed1 & 0xFF)];
-		ch        = *block ^ (seed1 + seed2);
-		seed1     = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
-		seed2     = ch + seed2 + (seed2 << 5) + 3;
-		*block++  = ch;
-	}
-	return LIBMPQ_TOOLS_SUCCESS;
+int libmpq_decrypt_block(mpq_archive* mpq_a, unsigned int* block, unsigned int length, unsigned int seed1)
+{
+    unsigned int seed2 = 0xEEEEEEEE;
+    unsigned int ch;
+
+    /* Round to unsigned int's */
+    length >>= 2;
+    while (length-- > 0)
+    {
+        seed2    += mpq_a->buf[0x400 + (seed1 & 0xFF)];
+        ch        = *block ^ (seed1 + seed2);
+        seed1     = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
+        seed2     = ch + seed2 + (seed2 << 5) + 3;
+        *block++  = ch;
+    }
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 
 /*
  *  This function decrypts the hashtable for the
  *  file informations.
  */
-int libmpq_decrypt_hashtable(mpq_archive *mpq_a, unsigned char *pbKey) {
-	unsigned int seed1 = 0x7FED7FED;
-	unsigned int seed2 = 0xEEEEEEEE;
-	unsigned int ch;			/* One key character */
-	unsigned int *pdwTable = (unsigned int *)(mpq_a->hashtable);
-	unsigned int length = mpq_a->header->hashtablesize * 4;
-
-	/* Prepare seeds */
-	while (*pbKey != 0) {
-		ch = toupper(*pbKey++);
-		seed1 = mpq_a->buf[0x300 + ch] ^ (seed1 + seed2);
-		seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
-	}
-
-	/* Decrypt it */
-	seed2 = 0xEEEEEEEE;
-	while (length-- > 0) {
-		seed2 += mpq_a->buf[0x400 + (seed1 & 0xFF)];
-		ch     = *pdwTable ^ (seed1 + seed2);
-		seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
-		seed2  = ch + seed2 + (seed2 << 5) + 3;
-		*pdwTable++ = ch;
-	}
-	return LIBMPQ_TOOLS_SUCCESS;
+int libmpq_decrypt_hashtable(mpq_archive* mpq_a, unsigned char* pbKey)
+{
+    unsigned int seed1 = 0x7FED7FED;
+    unsigned int seed2 = 0xEEEEEEEE;
+    unsigned int ch;            /* One key character */
+    unsigned int* pdwTable = (unsigned int*)(mpq_a->hashtable);
+    unsigned int length = mpq_a->header->hashtablesize * 4;
+
+    /* Prepare seeds */
+    while (*pbKey != 0)
+    {
+        ch = toupper(*pbKey++);
+        seed1 = mpq_a->buf[0x300 + ch] ^ (seed1 + seed2);
+        seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
+    }
+
+    /* Decrypt it */
+    seed2 = 0xEEEEEEEE;
+    while (length-- > 0)
+    {
+        seed2 += mpq_a->buf[0x400 + (seed1 & 0xFF)];
+        ch     = *pdwTable ^ (seed1 + seed2);
+        seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
+        seed2  = ch + seed2 + (seed2 << 5) + 3;
+        *pdwTable++ = ch;
+    }
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 
 /*
  *  This function decrypts the blocktable.
  */
-int libmpq_decrypt_blocktable(mpq_archive *mpq_a, unsigned char *pbKey) {
-	unsigned int seed1 = 0x7FED7FED;
-	unsigned int seed2 = 0xEEEEEEEE;
-	unsigned int ch;			/* One key character */
-	unsigned int *pdwTable = (unsigned int *)(mpq_a->blocktable);
-	unsigned int length = mpq_a->header->blocktablesize * 4;
-
-	/* Prepare seeds */
-	while(*pbKey != 0) {
-		ch = toupper(*pbKey++);
-		seed1 = mpq_a->buf[0x300 + ch] ^ (seed1 + seed2);
-		seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
-	}
-
-	/* Decrypt it */
-	seed2 = 0xEEEEEEEE;
-	while(length-- > 0) {
-		seed2 += mpq_a->buf[0x400 + (seed1 & 0xFF)];
-		ch     = *pdwTable ^ (seed1 + seed2);
-		seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
-		seed2  = ch + seed2 + (seed2 << 5) + 3;
-		*pdwTable++ = ch;
-	}
-	return LIBMPQ_TOOLS_SUCCESS;
+int libmpq_decrypt_blocktable(mpq_archive* mpq_a, unsigned char* pbKey)
+{
+    unsigned int seed1 = 0x7FED7FED;
+    unsigned int seed2 = 0xEEEEEEEE;
+    unsigned int ch;            /* One key character */
+    unsigned int* pdwTable = (unsigned int*)(mpq_a->blocktable);
+    unsigned int length = mpq_a->header->blocktablesize * 4;
+
+    /* Prepare seeds */
+    while (*pbKey != 0)
+    {
+        ch = toupper(*pbKey++);
+        seed1 = mpq_a->buf[0x300 + ch] ^ (seed1 + seed2);
+        seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
+    }
+
+    /* Decrypt it */
+    seed2 = 0xEEEEEEEE;
+    while (length-- > 0)
+    {
+        seed2 += mpq_a->buf[0x400 + (seed1 & 0xFF)];
+        ch     = *pdwTable ^ (seed1 + seed2);
+        seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
+        seed2  = ch + seed2 + (seed2 << 5) + 3;
+        *pdwTable++ = ch;
+    }
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 
-int libmpq_read_listfile(mpq_archive *mpq_a, FILE *fp) {
-	int mpq_size;
-	int mpq_ht_size;
-	int mpq_bt_size;
-	int mpq_blocksize;
-	int mpq_files;
-	int mpq_csize;
-	int mpq_fsize;
-	int entries;
-	char listdb_version[10];
-	char libmpq_version[10];
-	int listdb_temp_version = 0;
-	int libmpq_temp_version = 0;
-
-	/* first check header and version */
-	if (libmpq_conf_get_value(fp, "LIBMPQ_VERSION", mpq_a->mpq_l->mpq_version, LIBMPQ_CONF_TYPE_CHAR, sizeof(mpq_a->mpq_l->mpq_version))) {
-		return LIBMPQ_CONF_EFILE_CORRUPT;
-	} else {
-
-		/* copy to temp buffer for removing . characters */
-		sprintf(listdb_version, (char *)mpq_a->mpq_l->mpq_version);
-
-		/* remove . characters from listfile version */
-		libmpq_conf_delete_char(listdb_version, ".");
-
-		/* get libmpq version */
-		sprintf(libmpq_version, "%i%i%i",LIBMPQ_MAJOR_VERSION, LIBMPQ_MINOR_VERSION, LIBMPQ_PATCH_VERSION);
-
-		/* convert to number */
-		listdb_temp_version = atoi(listdb_version);
-		libmpq_temp_version = atoi(libmpq_version);
-
-		/* check if installed libmpq version is valid for listfile version */
-		if ((libmpq_temp_version < listdb_temp_version) || (libmpq_temp_version == 0) || (listdb_temp_version == 0)) {
-			return LIBMPQ_CONF_EFILE_VERSION;
-		}
-	}
-
-	/* check listfile header, the following entries must be set */
-	if (libmpq_conf_get_value(fp, "MPQ_SIZE", &mpq_size, LIBMPQ_CONF_TYPE_INT, 0)) {
-		return LIBMPQ_CONF_EFILE_CORRUPT;
-	}
-	if (libmpq_conf_get_value(fp, "MPQ_HASHTABLE_SIZE", &mpq_ht_size, LIBMPQ_CONF_TYPE_INT, 0)) {
-		return LIBMPQ_CONF_EFILE_CORRUPT;
-	}
-	if (libmpq_conf_get_value(fp, "MPQ_BLOCKTABLE_SIZE", &mpq_bt_size, LIBMPQ_CONF_TYPE_INT, 0)) {
-		return LIBMPQ_CONF_EFILE_CORRUPT;
-	}
-	if (libmpq_conf_get_value(fp, "MPQ_BLOCKSIZE", &mpq_blocksize, LIBMPQ_CONF_TYPE_INT, 0)) {
-		return LIBMPQ_CONF_EFILE_CORRUPT;
-	}
-	if (libmpq_conf_get_value(fp, "MPQ_FILES", &mpq_files, LIBMPQ_CONF_TYPE_INT, 0)) {
-		return LIBMPQ_CONF_EFILE_CORRUPT;
-	}
-	if (libmpq_conf_get_value(fp, "MPQ_COMPRESSED_SIZE", &mpq_csize, LIBMPQ_CONF_TYPE_INT, 0)) {
-		return LIBMPQ_CONF_EFILE_CORRUPT;
-	}
-	if (libmpq_conf_get_value(fp, "MPQ_UNCOMPRESSED_SIZE", &mpq_fsize, LIBMPQ_CONF_TYPE_INT, 0)) {
-		return LIBMPQ_CONF_EFILE_CORRUPT;
-	}
-	if (libmpq_conf_get_value(fp, "MPQ_NAME", mpq_a->mpq_l->mpq_name, LIBMPQ_CONF_TYPE_CHAR, PATH_MAX)) {
-		return LIBMPQ_CONF_EFILE_CORRUPT;
-	}
-	if (libmpq_conf_get_value(fp, "MPQ_TYPE", mpq_a->mpq_l->mpq_type, LIBMPQ_CONF_TYPE_CHAR, sizeof(mpq_a->mpq_l->mpq_type))) {
-		return LIBMPQ_CONF_EFILE_CORRUPT;
-	}
-
-	/* these are optional parameters, if they are empty we set the struct members empty */
-	libmpq_conf_get_value(fp, "MPQ_GAME", mpq_a->mpq_l->mpq_game, LIBMPQ_CONF_TYPE_CHAR, sizeof(mpq_a->mpq_l->mpq_game));
-	libmpq_conf_get_value(fp, "MPQ_GAME_VERSION", mpq_a->mpq_l->mpq_game_version, LIBMPQ_CONF_TYPE_CHAR, sizeof(mpq_a->mpq_l->mpq_game_version));
-
-	/* check if we found a valid listfile for the given archive */
-	if (mpq_a->header->hashtablesize == mpq_ht_size && mpq_a->header->blocktablesize == mpq_bt_size && mpq_a->blocksize == mpq_blocksize && libmpq_archive_info(mpq_a, LIBMPQ_MPQ_ARCHIVE_SIZE) == mpq_size && libmpq_archive_info(mpq_a, LIBMPQ_MPQ_NUMFILES) == mpq_files && libmpq_archive_info(mpq_a, LIBMPQ_MPQ_COMPRESSED_SIZE) == mpq_csize && libmpq_archive_info(mpq_a, LIBMPQ_MPQ_UNCOMPRESSED_SIZE) == mpq_fsize) {
-
-		/* check if the filelist is correct */
-		if (!libmpq_conf_get_array(fp, "FILE_NAMES", (char ***)&mpq_a->mpq_l->mpq_files, &entries)) {
-
-			/* we have a corrupt filelist, so return */
-			return LIBMPQ_CONF_EFILE_LIST_CORRUPT;
-		} else {
-
-			/* now check if filelist entries matches number of files in the archive. */
-			if (entries != libmpq_archive_info(mpq_a, LIBMPQ_MPQ_NUMFILES)) {
-				libmpq_free_listfile((char **)mpq_a->mpq_l->mpq_files);
-				mpq_a->mpq_l->mpq_files = NULL;
-				return LIBMPQ_CONF_EFILE_LIST_CORRUPT;
-			}
-		}
-	}
-
-	return LIBMPQ_TOOLS_SUCCESS;
+int libmpq_read_listfile(mpq_archive* mpq_a, FILE* fp)
+{
+    int mpq_size;
+    int mpq_ht_size;
+    int mpq_bt_size;
+    int mpq_blocksize;
+    int mpq_files;
+    int mpq_csize;
+    int mpq_fsize;
+    int entries;
+    char listdb_version[10];
+    char libmpq_version[10];
+    int listdb_temp_version = 0;
+    int libmpq_temp_version = 0;
+
+    /* first check header and version */
+    if (libmpq_conf_get_value(fp, "LIBMPQ_VERSION", mpq_a->mpq_l->mpq_version, LIBMPQ_CONF_TYPE_CHAR, sizeof(mpq_a->mpq_l->mpq_version)))
+    {
+        return LIBMPQ_CONF_EFILE_CORRUPT;
+    }
+    else
+    {
+
+        /* copy to temp buffer for removing . characters */
+        sprintf(listdb_version, (char*)mpq_a->mpq_l->mpq_version);
+
+        /* remove . characters from listfile version */
+        libmpq_conf_delete_char(listdb_version, ".");
+
+        /* get libmpq version */
+        sprintf(libmpq_version, "%i%i%i", LIBMPQ_MAJOR_VERSION, LIBMPQ_MINOR_VERSION, LIBMPQ_PATCH_VERSION);
+
+        /* convert to number */
+        listdb_temp_version = atoi(listdb_version);
+        libmpq_temp_version = atoi(libmpq_version);
+
+        /* check if installed libmpq version is valid for listfile version */
+        if ((libmpq_temp_version < listdb_temp_version) || (libmpq_temp_version == 0) || (listdb_temp_version == 0))
+        {
+            return LIBMPQ_CONF_EFILE_VERSION;
+        }
+    }
+
+    /* check listfile header, the following entries must be set */
+    if (libmpq_conf_get_value(fp, "MPQ_SIZE", &mpq_size, LIBMPQ_CONF_TYPE_INT, 0))
+    {
+        return LIBMPQ_CONF_EFILE_CORRUPT;
+    }
+    if (libmpq_conf_get_value(fp, "MPQ_HASHTABLE_SIZE", &mpq_ht_size, LIBMPQ_CONF_TYPE_INT, 0))
+    {
+        return LIBMPQ_CONF_EFILE_CORRUPT;
+    }
+    if (libmpq_conf_get_value(fp, "MPQ_BLOCKTABLE_SIZE", &mpq_bt_size, LIBMPQ_CONF_TYPE_INT, 0))
+    {
+        return LIBMPQ_CONF_EFILE_CORRUPT;
+    }
+    if (libmpq_conf_get_value(fp, "MPQ_BLOCKSIZE", &mpq_blocksize, LIBMPQ_CONF_TYPE_INT, 0))
+    {
+        return LIBMPQ_CONF_EFILE_CORRUPT;
+    }
+    if (libmpq_conf_get_value(fp, "MPQ_FILES", &mpq_files, LIBMPQ_CONF_TYPE_INT, 0))
+    {
+        return LIBMPQ_CONF_EFILE_CORRUPT;
+    }
+    if (libmpq_conf_get_value(fp, "MPQ_COMPRESSED_SIZE", &mpq_csize, LIBMPQ_CONF_TYPE_INT, 0))
+    {
+        return LIBMPQ_CONF_EFILE_CORRUPT;
+    }
+    if (libmpq_conf_get_value(fp, "MPQ_UNCOMPRESSED_SIZE", &mpq_fsize, LIBMPQ_CONF_TYPE_INT, 0))
+    {
+        return LIBMPQ_CONF_EFILE_CORRUPT;
+    }
+    if (libmpq_conf_get_value(fp, "MPQ_NAME", mpq_a->mpq_l->mpq_name, LIBMPQ_CONF_TYPE_CHAR, PATH_MAX))
+    {
+        return LIBMPQ_CONF_EFILE_CORRUPT;
+    }
+    if (libmpq_conf_get_value(fp, "MPQ_TYPE", mpq_a->mpq_l->mpq_type, LIBMPQ_CONF_TYPE_CHAR, sizeof(mpq_a->mpq_l->mpq_type)))
+    {
+        return LIBMPQ_CONF_EFILE_CORRUPT;
+    }
+
+    /* these are optional parameters, if they are empty we set the struct members empty */
+    libmpq_conf_get_value(fp, "MPQ_GAME", mpq_a->mpq_l->mpq_game, LIBMPQ_CONF_TYPE_CHAR, sizeof(mpq_a->mpq_l->mpq_game));
+    libmpq_conf_get_value(fp, "MPQ_GAME_VERSION", mpq_a->mpq_l->mpq_game_version, LIBMPQ_CONF_TYPE_CHAR, sizeof(mpq_a->mpq_l->mpq_game_version));
+
+    /* check if we found a valid listfile for the given archive */
+    if (mpq_a->header->hashtablesize == mpq_ht_size && mpq_a->header->blocktablesize == mpq_bt_size && mpq_a->blocksize == mpq_blocksize && libmpq_archive_info(mpq_a, LIBMPQ_MPQ_ARCHIVE_SIZE) == mpq_size && libmpq_archive_info(mpq_a, LIBMPQ_MPQ_NUMFILES) == mpq_files && libmpq_archive_info(mpq_a, LIBMPQ_MPQ_COMPRESSED_SIZE) == mpq_csize && libmpq_archive_info(mpq_a, LIBMPQ_MPQ_UNCOMPRESSED_SIZE) == mpq_fsize)
+    {
+
+        /* check if the filelist is correct */
+        if (!libmpq_conf_get_array(fp, "FILE_NAMES", (char***)&mpq_a->mpq_l->mpq_files, &entries))
+        {
+
+            /* we have a corrupt filelist, so return */
+            return LIBMPQ_CONF_EFILE_LIST_CORRUPT;
+        }
+        else
+        {
+
+            /* now check if filelist entries matches number of files in the archive. */
+            if (entries != libmpq_archive_info(mpq_a, LIBMPQ_MPQ_NUMFILES))
+            {
+                libmpq_free_listfile((char**)mpq_a->mpq_l->mpq_files);
+                mpq_a->mpq_l->mpq_files = NULL;
+                return LIBMPQ_CONF_EFILE_LIST_CORRUPT;
+            }
+        }
+    }
+
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 
 /*
  *  This function frees up the space reserved by libmpq_get_listfile()
  */
-int libmpq_free_listfile(char **filelist) {
-	int i = 0;
-	while (filelist[i]) {
-		free(filelist[i++]);
-	}
-	free(filelist);
-
-	return LIBMPQ_TOOLS_SUCCESS;
+int libmpq_free_listfile(char** filelist)
+{
+    int i = 0;
+    while (filelist[i])
+    {
+        free(filelist[i++]);
+    }
+    free(filelist);
+
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 
 /*
@@ -235,84 +264,84 @@ int libmpq_free_listfile(char **filelist) {
  *  array.
  */
 /*int libmpq_detect_listfile_rec(char path[PATH_MAX], char ***filelist, int *fl_count, int *fl_size) {
-	char nextpath[PATH_MAX];
-	DIR *dp = opendir(path);
-	FILE *fp;
-	struct dirent *entry;
-	struct stat statbuf;
-	char buf[LIBMPQ_CONF_BUFSIZE];
-
-	if (dp == NULL) {
-		return LIBMPQ_CONF_EOPEN_DIR;
-	} else {
-		while ((entry = readdir(dp)) != NULL) {
-			if (strncmp(entry->d_name, ".", 1) == 0 || strncmp(entry->d_name, "..", 2) == 0) {
-				continue;
-			}
-			if (strnlen(path, PATH_MAX) + strnlen(entry->d_name, PATH_MAX) + 2 > sizeof nextpath) {
-				continue;
-			}
-
-			snprintf(nextpath, PATH_MAX, "%s/%s", path, entry->d_name);
-
-			// check if file extension matches listdb file extension
-			if (strncmp(&entry->d_name[strlen(entry->d_name) - strlen(LIBMPQ_CONF_EXT)], LIBMPQ_CONF_EXT, strlen(LIBMPQ_CONF_EXT)) == 0) {
-
-				// check if it is really a listdb file
-				if ((fp = fopen(nextpath, "r")) != NULL ) {
-					while (fgets(buf, LIBMPQ_CONF_BUFSIZE, fp) != NULL) {
-						char *line;
-
-						buf[strlen(buf) - 1] = '\0';
-
-						// skip whitespace
-						for (line = buf; isspace(*line); line++) {
-							continue;
-						}
-
-						// skip empty line
-						if (line[0] == '\0') {
-							continue;
-						}
-
-						// skip comments
-						if (line[0] == '#') {
-							continue;
-						}
-
-						//search for listdb header; dirty but works :)
-						if (!strncasecmp(line, LIBMPQ_CONF_HEADER, strlen(LIBMPQ_CONF_HEADER))) {
-
-							// set the next filelist entry to a copy of the file path
-							(*filelist)[(*fl_count)++] = strdup(nextpath);
-
-							// increase the array size
-							if ((*fl_count) == (*fl_size)) {
-								(*filelist) = realloc((*filelist), ((*fl_size) + LIBMPQ_CONF_FL_INCREMENT) * sizeof(char *));
-								(*fl_size) += LIBMPQ_CONF_FL_INCREMENT;
-							}
-
-							// header found so we could stop reading the file.
-							break;
-						}
-					}
-					fclose(fp);
-				}
-			}
-
-			if (stat(nextpath, &statbuf) < 0) {
-				continue;
-			}
-
-			// if entry ia a subdirectory, read it
-			if (S_ISDIR(statbuf.st_mode)) {
-				libmpq_detect_listfile_rec(nextpath, filelist, fl_count, fl_size);
-			}
-		}
-		closedir(dp);
-	}
-
-	return LIBMPQ_TOOLS_SUCCESS;
+    char nextpath[PATH_MAX];
+    DIR *dp = opendir(path);
+    FILE *fp;
+    struct dirent *entry;
+    struct stat statbuf;
+    char buf[LIBMPQ_CONF_BUFSIZE];
+
+    if (dp == NULL) {
+        return LIBMPQ_CONF_EOPEN_DIR;
+    } else {
+        while ((entry = readdir(dp)) != NULL) {
+            if (strncmp(entry->d_name, ".", 1) == 0 || strncmp(entry->d_name, "..", 2) == 0) {
+                continue;
+            }
+            if (strnlen(path, PATH_MAX) + strnlen(entry->d_name, PATH_MAX) + 2 > sizeof nextpath) {
+                continue;
+            }
+
+            snprintf(nextpath, PATH_MAX, "%s/%s", path, entry->d_name);
+
+            // check if file extension matches listdb file extension
+            if (strncmp(&entry->d_name[strlen(entry->d_name) - strlen(LIBMPQ_CONF_EXT)], LIBMPQ_CONF_EXT, strlen(LIBMPQ_CONF_EXT)) == 0) {
+
+                // check if it is really a listdb file
+                if ((fp = fopen(nextpath, "r")) != NULL ) {
+                    while (fgets(buf, LIBMPQ_CONF_BUFSIZE, fp) != NULL) {
+                        char *line;
+
+                        buf[strlen(buf) - 1] = '\0';
+
+                        // skip whitespace
+                        for (line = buf; isspace(*line); line++) {
+                            continue;
+                        }
+
+                        // skip empty line
+                        if (line[0] == '\0') {
+                            continue;
+                        }
+
+                        // skip comments
+                        if (line[0] == '#') {
+                            continue;
+                        }
+
+                        //search for listdb header; dirty but works :)
+                        if (!strncasecmp(line, LIBMPQ_CONF_HEADER, strlen(LIBMPQ_CONF_HEADER))) {
+
+                            // set the next filelist entry to a copy of the file path
+                            (*filelist)[(*fl_count)++] = strdup(nextpath);
+
+                            // increase the array size
+                            if ((*fl_count) == (*fl_size)) {
+                                (*filelist) = realloc((*filelist), ((*fl_size) + LIBMPQ_CONF_FL_INCREMENT) * sizeof(char *));
+                                (*fl_size) += LIBMPQ_CONF_FL_INCREMENT;
+                            }
+
+                            // header found so we could stop reading the file.
+                            break;
+                        }
+                    }
+                    fclose(fp);
+                }
+            }
+
+            if (stat(nextpath, &statbuf) < 0) {
+                continue;
+            }
+
+            // if entry ia a subdirectory, read it
+            if (S_ISDIR(statbuf.st_mode)) {
+                libmpq_detect_listfile_rec(nextpath, filelist, fl_count, fl_size);
+            }
+        }
+        closedir(dp);
+    }
+
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 */
 
@@ -323,70 +352,77 @@ int libmpq_free_listfile(char **filelist) {
  *  int value in block position. And if we know encrypted and decrypted value,
  *  we can find the decryption key.
  */
-int libmpq_detect_fileseed(mpq_archive *mpq_a, unsigned int *block, unsigned int decrypted) {
-	unsigned int saveseed1;
-	unsigned int temp = *block ^ decrypted;		/* temp = seed1 + seed2 */
-	int i = 0;
-	temp -= 0xEEEEEEEE;				/* temp = seed1 + mpq_a->buf[0x400 + (seed1 & 0xFF)] */
-
-	for (i = 0; i < 0x100; i++) {			/* Try all 255 possibilities */
-		unsigned int seed1;
-		unsigned int seed2 = 0xEEEEEEEE;
-		unsigned int ch;
-
-		/* Try the first unsigned int's (We exactly know the value) */
-		seed1  = temp - mpq_a->buf[0x400 + i];
-		seed2 += mpq_a->buf[0x400 + (seed1 & 0xFF)];
-		ch     = block[0] ^ (seed1 + seed2);
-
-		if (ch != decrypted) {
-			continue;
-		}
-
-		/* Add 1 because we are decrypting block positions */
-		saveseed1 = seed1 + 1;
-
-		/*
-		 *  If OK, continue and test the second value. We don't know exactly the value,
-		 *  but we know that the second one has lower 16 bits set to zero
-		 *  (no compressed block is larger than 0xFFFF bytes)
-		 */
-		seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
-		seed2  = ch + seed2 + (seed2 << 5) + 3;
-		seed2 += mpq_a->buf[0x400 + (seed1 & 0xFF)];
-		ch     = block[1] ^ (seed1 + seed2);
-		if ((ch & 0xFFFF0000) == 0) {
-			return saveseed1;
-		}
-	}
-	return LIBMPQ_TOOLS_SUCCESS;
+int libmpq_detect_fileseed(mpq_archive* mpq_a, unsigned int* block, unsigned int decrypted)
+{
+    unsigned int saveseed1;
+    unsigned int temp = *block ^ decrypted;     /* temp = seed1 + seed2 */
+    int i = 0;
+    temp -= 0xEEEEEEEE;             /* temp = seed1 + mpq_a->buf[0x400 + (seed1 & 0xFF)] */
+
+    for (i = 0; i < 0x100; i++)             /* Try all 255 possibilities */
+    {
+        unsigned int seed1;
+        unsigned int seed2 = 0xEEEEEEEE;
+        unsigned int ch;
+
+        /* Try the first unsigned int's (We exactly know the value) */
+        seed1  = temp - mpq_a->buf[0x400 + i];
+        seed2 += mpq_a->buf[0x400 + (seed1 & 0xFF)];
+        ch     = block[0] ^ (seed1 + seed2);
+
+        if (ch != decrypted)
+        {
+            continue;
+        }
+
+        /* Add 1 because we are decrypting block positions */
+        saveseed1 = seed1 + 1;
+
+        /*
+         *  If OK, continue and test the second value. We don't know exactly the value,
+         *  but we know that the second one has lower 16 bits set to zero
+         *  (no compressed block is larger than 0xFFFF bytes)
+         */
+        seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
+        seed2  = ch + seed2 + (seed2 << 5) + 3;
+        seed2 += mpq_a->buf[0x400 + (seed1 & 0xFF)];
+        ch     = block[1] ^ (seed1 + seed2);
+        if ((ch & 0xFFFF0000) == 0)
+        {
+            return saveseed1;
+        }
+    }
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 
 /*
  *  This function initialize the decryption buffer
  */
-int libmpq_init_buffer(mpq_archive *mpq_a) {
-	unsigned int seed   = 0x00100001;
-	unsigned int index1 = 0;
-	unsigned int index2 = 0;
-	int i;
-
-	memset(mpq_a->buf, 0, sizeof(mpq_a->buf));
-
-	/* Initialize the decryption buffer. */
-	for (index1 = 0; index1 < 0x100; index1++) {
-		for(index2 = index1, i = 0; i < 5; i++, index2 += 0x100) {
-			unsigned int temp1, temp2;
-			seed  = (seed * 125 + 3) % 0x2AAAAB;
-			temp1 = (seed & 0xFFFF) << 0x10;
-
-			seed  = (seed * 125 + 3) % 0x2AAAAB;
-			temp2 = (seed & 0xFFFF);
-
-			mpq_a->buf[index2] = (temp1 | temp2);
-		}
-	}
-	return LIBMPQ_TOOLS_SUCCESS;
+int libmpq_init_buffer(mpq_archive* mpq_a)
+{
+    unsigned int seed   = 0x00100001;
+    unsigned int index1 = 0;
+    unsigned int index2 = 0;
+    int i;
+
+    memset(mpq_a->buf, 0, sizeof(mpq_a->buf));
+
+    /* Initialize the decryption buffer. */
+    for (index1 = 0; index1 < 0x100; index1++)
+    {
+        for (index2 = index1, i = 0; i < 5; i++, index2 += 0x100)
+        {
+            unsigned int temp1, temp2;
+            seed  = (seed * 125 + 3) % 0x2AAAAB;
+            temp1 = (seed & 0xFFFF) << 0x10;
+
+            seed  = (seed * 125 + 3) % 0x2AAAAB;
+            temp2 = (seed & 0xFFFF);
+
+            mpq_a->buf[index2] = (temp1 | temp2);
+        }
+    }
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 
 /*
@@ -394,49 +430,55 @@ int libmpq_init_buffer(mpq_archive *mpq_a) {
  *  hashtable found in the MPQ file. The hashtable will
  *  be decrypted for later use.
  */
-int libmpq_read_hashtable(mpq_archive *mpq_a) {
-	unsigned int bytes = 0;
-	int rb = 0;
-
-	/*
-	 *  Allocate memory. Note that the block table should be as large as the
-	 *  hash table. (for later file additions)
-	 */
-	mpq_a->hashtable = (mpq_hash *)malloc(sizeof(mpq_hash) * mpq_a->header->hashtablesize);
-
-	if (!mpq_a->hashtable) {
-		return LIBMPQ_EALLOCMEM;
-	}
+int libmpq_read_hashtable(mpq_archive* mpq_a)
+{
+    unsigned int bytes = 0;
+    int rb = 0;
+
+    /*
+     *  Allocate memory. Note that the block table should be as large as the
+     *  hash table. (for later file additions)
+     */
+    mpq_a->hashtable = (mpq_hash*)malloc(sizeof(mpq_hash) * mpq_a->header->hashtablesize);
+
+    if (!mpq_a->hashtable)
+    {
+        return LIBMPQ_EALLOCMEM;
+    }
 
-	/* Read the hash table into the buffer */
-	bytes = mpq_a->header->hashtablesize * sizeof(mpq_hash);
+    /* Read the hash table into the buffer */
+    bytes = mpq_a->header->hashtablesize * sizeof(mpq_hash);
 
     libmpq_lseek(mpq_a, mpq_a->header->hashtablepos);
 
-	rb = _read(mpq_a->fd, mpq_a->hashtable, bytes);
-	if (rb != bytes) {
-		return LIBMPQ_EFILE_CORRUPT;
-	}
+    rb = _read(mpq_a->fd, mpq_a->hashtable, bytes);
+    if (rb != bytes)
+    {
+        return LIBMPQ_EFILE_CORRUPT;
+    }
 
-	/* Decrypt hash table and check if it is correctly decrypted */
-	mpq_hash *mpq_h_end = mpq_a->hashtable + mpq_a->header->hashtablesize;
-	mpq_hash *mpq_h     = NULL;
+    /* Decrypt hash table and check if it is correctly decrypted */
+    mpq_hash* mpq_h_end = mpq_a->hashtable + mpq_a->header->hashtablesize;
+    mpq_hash* mpq_h     = NULL;
 
-	libmpq_decrypt_hashtable(mpq_a, (unsigned char *)"(hash table)");
+    libmpq_decrypt_hashtable(mpq_a, (unsigned char*)"(hash table)");
 
-	/* Check hash table if is correctly decrypted */
-	for (mpq_h = mpq_a->hashtable; mpq_h < mpq_h_end; mpq_h++) {
-		if (mpq_h->locale != 0xFFFFFFFF && (mpq_h->locale & 0xFFFF0000) != 0) {
-			return LIBMPQ_EFILE_FORMAT;
-		}
+    /* Check hash table if is correctly decrypted */
+    for (mpq_h = mpq_a->hashtable; mpq_h < mpq_h_end; mpq_h++)
+    {
+        if (mpq_h->locale != 0xFFFFFFFF && (mpq_h->locale & 0xFFFF0000) != 0)
+        {
+            return LIBMPQ_EFILE_FORMAT;
+        }
 
-		/* Remember the highest block table entry */
-		if (mpq_h->blockindex < LIBMPQ_HASH_ENTRY_DELETED && mpq_h->blockindex > 0) {
-			mpq_a->maxblockindex = mpq_h->blockindex;
-		}
-	}
+        /* Remember the highest block table entry */
+        if (mpq_h->blockindex < LIBMPQ_HASH_ENTRY_DELETED && mpq_h->blockindex > 0)
+        {
+            mpq_a->maxblockindex = mpq_h->blockindex;
+        }
+    }
 
-	return LIBMPQ_TOOLS_SUCCESS;
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 
 /*
@@ -447,346 +489,393 @@ int libmpq_read_hashtable(mpq_archive *mpq_a) {
  *  NOTICE: Some MPQs have decrypted block table, e.g.
  *          cracked Diablo versions.
  */
-int libmpq_read_blocktable(mpq_archive *mpq_a) {
-	unsigned int bytes = 0;
-	int rb = 0;
-
-	/*
-	 *  Allocate memory. Note that the block table should be as large as the
-	 *  hash table. (for later file additions)
-	 */
-	mpq_a->blocktable = (mpq_block *)malloc(sizeof(mpq_block) * mpq_a->header->hashtablesize);
-	mpq_a->blockbuf   = (unsigned char *)malloc(mpq_a->blocksize);
-
-	if (!mpq_a->blocktable || !mpq_a->blockbuf) {
-		return LIBMPQ_EALLOCMEM;
-	}
+int libmpq_read_blocktable(mpq_archive* mpq_a)
+{
+    unsigned int bytes = 0;
+    int rb = 0;
+
+    /*
+     *  Allocate memory. Note that the block table should be as large as the
+     *  hash table. (for later file additions)
+     */
+    mpq_a->blocktable = (mpq_block*)malloc(sizeof(mpq_block) * mpq_a->header->hashtablesize);
+    mpq_a->blockbuf   = (unsigned char*)malloc(mpq_a->blocksize);
+
+    if (!mpq_a->blocktable || !mpq_a->blockbuf)
+    {
+        return LIBMPQ_EALLOCMEM;
+    }
 
-	/* Read the block table into the buffer */
-	bytes = mpq_a->header->blocktablesize * sizeof(mpq_block);
-	memset(mpq_a->blocktable, 0, mpq_a->header->blocktablesize * sizeof(mpq_block));
+    /* Read the block table into the buffer */
+    bytes = mpq_a->header->blocktablesize * sizeof(mpq_block);
+    memset(mpq_a->blocktable, 0, mpq_a->header->blocktablesize * sizeof(mpq_block));
 
     libmpq_lseek(mpq_a, mpq_a->header->blocktablepos);
 
-	rb = _read(mpq_a->fd, mpq_a->blocktable, bytes);
-	if (rb != bytes) {
-		return LIBMPQ_EFILE_CORRUPT;
-	}
-
-	/*
-	 *  Decrypt block table. Some MPQs don't have encrypted block table,
-	 *  e.g. cracked Diablo version. We have to check if block table is
-	 *  already decrypted
-	 */
-	mpq_block *mpq_b_end     = mpq_a->blocktable + mpq_a->maxblockindex + 1;
-	mpq_block *mpq_b         = NULL;
-	unsigned int archivesize = mpq_a->header->archivesize + mpq_a->mpqpos;
-
-	if (mpq_a->header->offset != mpq_a->blocktable->filepos) {
-		libmpq_decrypt_blocktable(mpq_a, (unsigned char *)"(block table)");
-	}
-	for (mpq_b = mpq_a->blocktable; mpq_b < mpq_b_end; mpq_b++) {
-		if (mpq_b->filepos > archivesize || mpq_b->csize > archivesize) {
-			if ((mpq_a->flags & LIBMPQ_FLAG_PROTECTED) == 0) {
-				return LIBMPQ_EFILE_FORMAT;
-			}
-		}
-		mpq_b->filepos += mpq_a->mpqpos;
-	}
-
-	return LIBMPQ_TOOLS_SUCCESS;
-}
+    rb = _read(mpq_a->fd, mpq_a->blocktable, bytes);
+    if (rb != bytes)
+    {
+        return LIBMPQ_EFILE_CORRUPT;
+    }
 
-int libmpq_file_read_block(mpq_archive *mpq_a, mpq_file *mpq_f, unsigned int blockpos, char *buffer, unsigned int blockbytes) {
-	unsigned char *tempbuf = NULL;			/* Buffer for reading compressed data from the file */
-	unsigned int readpos;				/* Reading position from the file */
-	unsigned int toread = 0;			/* Number of bytes to read */
-	unsigned int blocknum;				/* Block number (needed for decrypt) */
-	unsigned int bytesread = 0;			/* Total number of bytes read */
-	unsigned int nblocks;				/* Number of blocks to load */
-	unsigned int i;
-
-	/* Test parameters. Block position and block size must be block-aligned, block size nonzero */
-	if ((blockpos & (mpq_a->blocksize - 1)) || blockbytes == 0) {
-		return 0;
-	}
-
-	/* Check the end of file */
-	if ((blockpos + blockbytes) > mpq_f->mpq_b->fsize) {
-		blockbytes = mpq_f->mpq_b->fsize - blockpos;
-	}
-	blocknum = blockpos   / mpq_a->blocksize;
-	nblocks  = blockbytes / mpq_a->blocksize;
-	if (blockbytes % mpq_a->blocksize) {
-		nblocks++;
-	}
-
-	/* If file has variable block positions, we have to load them */
-	if ((mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED) && mpq_f->blockposloaded == FALSE) {
-		unsigned int nread;
-
-		if (mpq_f->mpq_b->filepos != mpq_a->filepos) {
-            libmpq_lseek(mpq_a, mpq_f->mpq_b->filepos);
-		}
-
-		/* Read block positions from begin of file. */
-		nread = (mpq_f->nblocks + 1) * sizeof(int);
-		nread = _read(mpq_a->fd, mpq_f->blockpos, nread);
-
-		/*
-		 *  If the archive is protected some way, perform additional check
-		 *  Sometimes, the file appears not to be encrypted, but it is.
-		 */
-		/*if (mpq_f->blockpos[0] != nread) {
-			mpq_f->mpq_b->flags |= LIBMPQ_FILE_ENCRYPTED;
-		}*/
-
-        if ((mpq_f->mpq_b->flags & LIBMPQ_FILE_HAS_METADATA) == 0) {
-            if (mpq_f->blockpos[0] != nread) {
-			    mpq_f->mpq_b->flags |= LIBMPQ_FILE_ENCRYPTED;
-		    }
+    /*
+     *  Decrypt block table. Some MPQs don't have encrypted block table,
+     *  e.g. cracked Diablo version. We have to check if block table is
+     *  already decrypted
+     */
+    mpq_block* mpq_b_end     = mpq_a->blocktable + mpq_a->maxblockindex + 1;
+    mpq_block* mpq_b         = NULL;
+    unsigned int archivesize = mpq_a->header->archivesize + mpq_a->mpqpos;
+
+    if (mpq_a->header->offset != mpq_a->blocktable->filepos)
+    {
+        libmpq_decrypt_blocktable(mpq_a, (unsigned char*)"(block table)");
+    }
+    for (mpq_b = mpq_a->blocktable; mpq_b < mpq_b_end; mpq_b++)
+    {
+        if (mpq_b->filepos > archivesize || mpq_b->csize > archivesize)
+        {
+            if ((mpq_a->flags & LIBMPQ_FLAG_PROTECTED) == 0)
+            {
+                return LIBMPQ_EFILE_FORMAT;
+            }
         }
+        mpq_b->filepos += mpq_a->mpqpos;
+    }
 
-		/* Decrypt loaded block positions if necessary */
-		if (mpq_f->mpq_b->flags & LIBMPQ_FILE_ENCRYPTED) {
+    return LIBMPQ_TOOLS_SUCCESS;
+}
 
-			/* If we don't know the file seed, try to find it. */
-			if (mpq_f->seed == 0) {
-				mpq_f->seed = libmpq_detect_fileseed(mpq_a, mpq_f->blockpos, nread);
-			}
+int libmpq_file_read_block(mpq_archive* mpq_a, mpq_file* mpq_f, unsigned int blockpos, char* buffer, unsigned int blockbytes)
+{
+    unsigned char* tempbuf = NULL;          /* Buffer for reading compressed data from the file */
+    unsigned int readpos;               /* Reading position from the file */
+    unsigned int toread = 0;            /* Number of bytes to read */
+    unsigned int blocknum;              /* Block number (needed for decrypt) */
+    unsigned int bytesread = 0;         /* Total number of bytes read */
+    unsigned int nblocks;               /* Number of blocks to load */
+    unsigned int i;
+
+    /* Test parameters. Block position and block size must be block-aligned, block size nonzero */
+    if ((blockpos & (mpq_a->blocksize - 1)) || blockbytes == 0)
+    {
+        return 0;
+    }
+
+    /* Check the end of file */
+    if ((blockpos + blockbytes) > mpq_f->mpq_b->fsize)
+    {
+        blockbytes = mpq_f->mpq_b->fsize - blockpos;
+    }
+    blocknum = blockpos   / mpq_a->blocksize;
+    nblocks  = blockbytes / mpq_a->blocksize;
+    if (blockbytes % mpq_a->blocksize)
+    {
+        nblocks++;
+    }
 
-			/* If we don't know the file seed, sorry but we cannot extract the file. */
-			if (mpq_f->seed == 0) {
-				return 0;
-			}
+    /* If file has variable block positions, we have to load them */
+    if ((mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED) && mpq_f->blockposloaded == FALSE)
+    {
+        unsigned int nread;
 
-			/* Decrypt block positions */
-			libmpq_decrypt_block(mpq_a, mpq_f->blockpos, nread, mpq_f->seed - 1);
+        if (mpq_f->mpq_b->filepos != mpq_a->filepos)
+        {
+            libmpq_lseek(mpq_a, mpq_f->mpq_b->filepos);
+        }
 
-			/*
-			 *  Check if the block positions are correctly decrypted
-			 *  I don't know why, but sometimes it will result invalid
-			 *  block positions on some files.
-			 */
-			if (mpq_f->blockpos[0] != nread) {
+        /* Read block positions from begin of file. */
+        nread = (mpq_f->nblocks + 1) * sizeof(int);
+        nread = _read(mpq_a->fd, mpq_f->blockpos, nread);
+
+        /*
+         *  If the archive is protected some way, perform additional check
+         *  Sometimes, the file appears not to be encrypted, but it is.
+         */
+        /*if (mpq_f->blockpos[0] != nread) {
+            mpq_f->mpq_b->flags |= LIBMPQ_FILE_ENCRYPTED;
+        }*/
+
+        if ((mpq_f->mpq_b->flags & LIBMPQ_FILE_HAS_METADATA) == 0)
+        {
+            if (mpq_f->blockpos[0] != nread)
+            {
+                mpq_f->mpq_b->flags |= LIBMPQ_FILE_ENCRYPTED;
+            }
+        }
 
-				/* Try once again to detect file seed and decrypt the blocks */
+        /* Decrypt loaded block positions if necessary */
+        if (mpq_f->mpq_b->flags & LIBMPQ_FILE_ENCRYPTED)
+        {
+
+            /* If we don't know the file seed, try to find it. */
+            if (mpq_f->seed == 0)
+            {
+                mpq_f->seed = libmpq_detect_fileseed(mpq_a, mpq_f->blockpos, nread);
+            }
+
+            /* If we don't know the file seed, sorry but we cannot extract the file. */
+            if (mpq_f->seed == 0)
+            {
+                return 0;
+            }
+
+            /* Decrypt block positions */
+            libmpq_decrypt_block(mpq_a, mpq_f->blockpos, nread, mpq_f->seed - 1);
+
+            /*
+             *  Check if the block positions are correctly decrypted
+             *  I don't know why, but sometimes it will result invalid
+             *  block positions on some files.
+             */
+            if (mpq_f->blockpos[0] != nread)
+            {
+
+                /* Try once again to detect file seed and decrypt the blocks */
                 libmpq_lseek(mpq_a, mpq_f->mpq_b->filepos);
 
-				nread = _read(mpq_a->fd, mpq_f->blockpos, (mpq_f->nblocks + 1) * sizeof(int));
-				mpq_f->seed = libmpq_detect_fileseed(mpq_a, mpq_f->blockpos, nread);
-				libmpq_decrypt_block(mpq_a, mpq_f->blockpos, nread, mpq_f->seed - 1);
+                nread = _read(mpq_a->fd, mpq_f->blockpos, (mpq_f->nblocks + 1) * sizeof(int));
+                mpq_f->seed = libmpq_detect_fileseed(mpq_a, mpq_f->blockpos, nread);
+                libmpq_decrypt_block(mpq_a, mpq_f->blockpos, nread, mpq_f->seed - 1);
 
-				/* Check if the block positions are correctly decrypted. */
-				if (mpq_f->blockpos[0] != nread) {
-					return 0;
-				}
-			}
-		}
+                /* Check if the block positions are correctly decrypted. */
+                if (mpq_f->blockpos[0] != nread)
+                {
+                    return 0;
+                }
+            }
+        }
 
-		/* Update mpq_f's variables */
-		mpq_f->blockposloaded = TRUE;
-		mpq_a->filepos        = mpq_f->mpq_b->filepos + nread;
-	}
+        /* Update mpq_f's variables */
+        mpq_f->blockposloaded = TRUE;
+        mpq_a->filepos        = mpq_f->mpq_b->filepos + nread;
+    }
 
-	/* Get file position and number of bytes to read */
-	readpos = blockpos;
-	toread  = blockbytes;
+    /* Get file position and number of bytes to read */
+    readpos = blockpos;
+    toread  = blockbytes;
 
-	if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED) {
-		readpos = mpq_f->blockpos[blocknum];
-		toread  = mpq_f->blockpos[blocknum + nblocks] - readpos;
-	}
+    if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED)
+    {
+        readpos = mpq_f->blockpos[blocknum];
+        toread  = mpq_f->blockpos[blocknum + nblocks] - readpos;
+    }
 
-	readpos += mpq_f->mpq_b->filepos;
+    readpos += mpq_f->mpq_b->filepos;
 
-	/* Get work buffer for store read data */
-    if ((tempbuf = (unsigned char *)malloc(toread)) == NULL) {
+    /* Get work buffer for store read data */
+    if ((tempbuf = (unsigned char*)malloc(toread)) == NULL)
+    {
         /* Hmmm... We should add a better error handling here :) */
         return 0;
     }
 
-	/* Set file pointer, if necessary. */
-	if (mpq_a->filepos != readpos) {
+    /* Set file pointer, if necessary. */
+    if (mpq_a->filepos != readpos)
+    {
         mpq_a->filepos = libmpq_lseek(mpq_a, readpos);
-	}
-
-	/* 15018F87 - Read all requested blocks. */
-	bytesread = _read(mpq_a->fd, tempbuf, toread);
-	mpq_a->filepos = readpos + bytesread;
-
-	/* Block processing part. */
-	unsigned int blockstart = 0;			/* Index of block start in work buffer. */
-	unsigned int blocksize  = min(blockbytes, mpq_a->blocksize);
-	unsigned int index      = blocknum;		/* Current block index. */
-	bytesread = 0;					/* Clear read byte counter */
-
-	/* Walk through all blocks. */
-	for (i = 0; i < nblocks; i++, index++) {
-		int outlength = mpq_a->blocksize;
-
-		/* Get current block length */
-		if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED) {
-			blocksize = mpq_f->blockpos[index + 1] - mpq_f->blockpos[index];
-		}
-
-		/* If block is encrypted, we have to decrypt it. */
-		if (mpq_f->mpq_b->flags & LIBMPQ_FILE_ENCRYPTED) {
-			if (mpq_f->seed == 0) {
-				return 0;
-			}
-			libmpq_decrypt_block(mpq_a, (unsigned int *)&tempbuf[blockstart], blocksize, mpq_f->seed + index);
-		}
-
-		/*
-		 *  If the block is really compressed, recompress it.
-		 *  WARNING: Some block may not be compressed, it can
-		 *  only be determined by comparing uncompressed and
-		 *  compressed size!
-		 */
-		if (blocksize < blockbytes) {
-
-			/* Is the file compressed with PKWARE Data Compression Library? */
-			if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESS_PKWARE) {
-				libmpq_pkzip_decompress(buffer, &outlength, (char *)&tempbuf[blockstart], blocksize);
-			}
-
-			/*
-			 *  Is it a file compressed by Blizzard's multiple compression ?
-			 *  Note that Storm.dll v 1.0.9 distributed with Warcraft III
-			 *  passes the full path name of the opened archive as the new
-			 *  last parameter.
-			 */
-			if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESS_MULTI) {
-				libmpq_multi_decompress(buffer, &outlength, (char *)&tempbuf[blockstart], blocksize);
-			}
-			bytesread += outlength;
-			buffer    += outlength;
-		} else {
-			memcpy(buffer, tempbuf, blocksize);
-			bytesread += blocksize;
-			buffer    += blocksize;
-		}
-		blockstart += blocksize;
-	}
-
-	/* Delete input buffer, if necessary. */
+    }
+
+    /* 15018F87 - Read all requested blocks. */
+    bytesread = _read(mpq_a->fd, tempbuf, toread);
+    mpq_a->filepos = readpos + bytesread;
+
+    /* Block processing part. */
+    unsigned int blockstart = 0;            /* Index of block start in work buffer. */
+    unsigned int blocksize  = min(blockbytes, mpq_a->blocksize);
+    unsigned int index      = blocknum;     /* Current block index. */
+    bytesread = 0;                  /* Clear read byte counter */
+
+    /* Walk through all blocks. */
+    for (i = 0; i < nblocks; i++, index++)
+    {
+        int outlength = mpq_a->blocksize;
+
+        /* Get current block length */
+        if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED)
+        {
+            blocksize = mpq_f->blockpos[index + 1] - mpq_f->blockpos[index];
+        }
+
+        /* If block is encrypted, we have to decrypt it. */
+        if (mpq_f->mpq_b->flags & LIBMPQ_FILE_ENCRYPTED)
+        {
+            if (mpq_f->seed == 0)
+            {
+                return 0;
+            }
+            libmpq_decrypt_block(mpq_a, (unsigned int*)&tempbuf[blockstart], blocksize, mpq_f->seed + index);
+        }
+
+        /*
+         *  If the block is really compressed, recompress it.
+         *  WARNING: Some block may not be compressed, it can
+         *  only be determined by comparing uncompressed and
+         *  compressed size!
+         */
+        if (blocksize < blockbytes)
+        {
+
+            /* Is the file compressed with PKWARE Data Compression Library? */
+            if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESS_PKWARE)
+            {
+                libmpq_pkzip_decompress(buffer, &outlength, (char*)&tempbuf[blockstart], blocksize);
+            }
+
+            /*
+             *  Is it a file compressed by Blizzard's multiple compression ?
+             *  Note that Storm.dll v 1.0.9 distributed with Warcraft III
+             *  passes the full path name of the opened archive as the new
+             *  last parameter.
+             */
+            if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESS_MULTI)
+            {
+                libmpq_multi_decompress(buffer, &outlength, (char*)&tempbuf[blockstart], blocksize);
+            }
+            bytesread += outlength;
+            buffer    += outlength;
+        }
+        else
+        {
+            memcpy(buffer, tempbuf, blocksize);
+            bytesread += blocksize;
+            buffer    += blocksize;
+        }
+        blockstart += blocksize;
+    }
+
+    /* Delete input buffer, if necessary. */
     free(tempbuf);
 
     return bytesread;
 }
 
-int libmpq_file_read_file(mpq_archive *mpq_a, mpq_file *mpq_f, unsigned int filepos, char *buffer, unsigned int toread) {
-	unsigned int bytesread = 0;			/* Number of bytes read from the file */
-	unsigned int blockpos;				/* Position in the file aligned to the whole blocks */
-	unsigned int loaded = 0;
-
-	/* File position is greater or equal to file size? */
-	if (filepos >= mpq_f->mpq_b->fsize) {
-		return 0;
-	}
-
-	/* If to few bytes in the file remaining, cut them */
-	if ((mpq_f->mpq_b->fsize - filepos) < toread) {
-		toread = (mpq_f->mpq_b->fsize - filepos);
-	}
-
-	/* Block position in the file */
-	blockpos = filepos & ~(mpq_a->blocksize - 1);
-
-	/*
-	 *  Load the first block, if noncomplete. It may be loaded in the cache buffer.
-	 *  We have to check if this block is loaded. If not, load it.
-	 */
-	if ((filepos % mpq_a->blocksize) != 0) {
-		/* Number of bytes remaining in the buffer */
-		unsigned int tocopy;
-		unsigned int loaded = mpq_a->blocksize;
-
-		/* Check if data are loaded in the cache */
-		if (mpq_f->accessed == FALSE || blockpos != mpq_a->blockpos) {
-
-			/* Load one MPQ block into archive buffer */
-			loaded = libmpq_file_read_block(mpq_a, mpq_f, blockpos, (char *)mpq_a->blockbuf, mpq_a->blocksize);
-			if (loaded == 0) {
-				return 0;
-			}
-
-			/* Save lastly accessed file and block position for later use */
-			mpq_f->accessed = TRUE;
-			mpq_a->blockpos = blockpos;
-			mpq_a->bufpos   = filepos % mpq_a->blocksize;
-		}
-		tocopy = loaded - mpq_a->bufpos;
-		if (tocopy > toread) {
-			tocopy = toread;
-		}
-
-		/* Copy data from block buffer into target buffer */
-		memcpy(buffer, mpq_a->blockbuf + mpq_a->bufpos, tocopy);
-
-		/* Update pointers */
-		toread        -= tocopy;
-		bytesread     += tocopy;
-		buffer        += tocopy;
-		blockpos      += mpq_a->blocksize;
-		mpq_a->bufpos += tocopy;
-
-		/* If all, return. */
-		if (toread == 0) {
-			return bytesread;
-		}
-	}
-
-	/* Load the whole ("middle") blocks only if there are more or equal one block */
-	if (toread > mpq_a->blocksize) {
-		unsigned int blockbytes = toread & ~(mpq_a->blocksize - 1);
-		loaded = libmpq_file_read_block(mpq_a, mpq_f, blockpos, buffer, blockbytes);
-		if (loaded == 0) {
-			return 0;
-		}
-
-		/* Update pointers */
-		toread    -= loaded;
-		bytesread += loaded;
-		buffer    += loaded;
-		blockpos  += loaded;
-
-		/* If all, return. */
-		if (toread == 0) {
-			return bytesread;
-		}
-	}
-
-	/* Load the terminating block */
-	if (toread > 0) {
-		unsigned int tocopy = mpq_a->blocksize;
-
-		/* Check if data are loaded in the cache */
-		if (mpq_f->accessed == FALSE || blockpos != mpq_a->blockpos) {
-
-			/* Load one MPQ block into archive buffer */
-			tocopy = libmpq_file_read_block(mpq_a, mpq_f, blockpos, (char *)mpq_a->blockbuf, mpq_a->blocksize);
-			if (tocopy == 0) {
-				return 0;
-			}
-
-			/* Save lastly accessed file and block position for later use */
-			mpq_f->accessed = TRUE;
-			mpq_a->blockpos = blockpos;
-		}
-		mpq_a->bufpos  = 0;
-
-		/* Check number of bytes read */
-		if (tocopy > toread) {
-			tocopy = toread;
-		}
-
-		memcpy(buffer, mpq_a->blockbuf, tocopy);
-		bytesread     += tocopy;
-		mpq_a->bufpos  = tocopy;
-	}
-
-	/* Return what we've read */
-	return bytesread;
+int libmpq_file_read_file(mpq_archive* mpq_a, mpq_file* mpq_f, unsigned int filepos, char* buffer, unsigned int toread)
+{
+    unsigned int bytesread = 0;         /* Number of bytes read from the file */
+    unsigned int blockpos;              /* Position in the file aligned to the whole blocks */
+    unsigned int loaded = 0;
+
+    /* File position is greater or equal to file size? */
+    if (filepos >= mpq_f->mpq_b->fsize)
+    {
+        return 0;
+    }
+
+    /* If to few bytes in the file remaining, cut them */
+    if ((mpq_f->mpq_b->fsize - filepos) < toread)
+    {
+        toread = (mpq_f->mpq_b->fsize - filepos);
+    }
+
+    /* Block position in the file */
+    blockpos = filepos & ~(mpq_a->blocksize - 1);
+
+    /*
+     *  Load the first block, if noncomplete. It may be loaded in the cache buffer.
+     *  We have to check if this block is loaded. If not, load it.
+     */
+    if ((filepos % mpq_a->blocksize) != 0)
+    {
+        /* Number of bytes remaining in the buffer */
+        unsigned int tocopy;
+        unsigned int loaded = mpq_a->blocksize;
+
+        /* Check if data are loaded in the cache */
+        if (mpq_f->accessed == FALSE || blockpos != mpq_a->blockpos)
+        {
+
+            /* Load one MPQ block into archive buffer */
+            loaded = libmpq_file_read_block(mpq_a, mpq_f, blockpos, (char*)mpq_a->blockbuf, mpq_a->blocksize);
+            if (loaded == 0)
+            {
+                return 0;
+            }
+
+            /* Save lastly accessed file and block position for later use */
+            mpq_f->accessed = TRUE;
+            mpq_a->blockpos = blockpos;
+            mpq_a->bufpos   = filepos % mpq_a->blocksize;
+        }
+        tocopy = loaded - mpq_a->bufpos;
+        if (tocopy > toread)
+        {
+            tocopy = toread;
+        }
+
+        /* Copy data from block buffer into target buffer */
+        memcpy(buffer, mpq_a->blockbuf + mpq_a->bufpos, tocopy);
+
+        /* Update pointers */
+        toread        -= tocopy;
+        bytesread     += tocopy;
+        buffer        += tocopy;
+        blockpos      += mpq_a->blocksize;
+        mpq_a->bufpos += tocopy;
+
+        /* If all, return. */
+        if (toread == 0)
+        {
+            return bytesread;
+        }
+    }
+
+    /* Load the whole ("middle") blocks only if there are more or equal one block */
+    if (toread > mpq_a->blocksize)
+    {
+        unsigned int blockbytes = toread & ~(mpq_a->blocksize - 1);
+        loaded = libmpq_file_read_block(mpq_a, mpq_f, blockpos, buffer, blockbytes);
+        if (loaded == 0)
+        {
+            return 0;
+        }
+
+        /* Update pointers */
+        toread    -= loaded;
+        bytesread += loaded;
+        buffer    += loaded;
+        blockpos  += loaded;
+
+        /* If all, return. */
+        if (toread == 0)
+        {
+            return bytesread;
+        }
+    }
+
+    /* Load the terminating block */
+    if (toread > 0)
+    {
+        unsigned int tocopy = mpq_a->blocksize;
+
+        /* Check if data are loaded in the cache */
+        if (mpq_f->accessed == FALSE || blockpos != mpq_a->blockpos)
+        {
+
+            /* Load one MPQ block into archive buffer */
+            tocopy = libmpq_file_read_block(mpq_a, mpq_f, blockpos, (char*)mpq_a->blockbuf, mpq_a->blocksize);
+            if (tocopy == 0)
+            {
+                return 0;
+            }
+
+            /* Save lastly accessed file and block position for later use */
+            mpq_f->accessed = TRUE;
+            mpq_a->blockpos = blockpos;
+        }
+        mpq_a->bufpos  = 0;
+
+        /* Check number of bytes read */
+        if (tocopy > toread)
+        {
+            tocopy = toread;
+        }
+
+        memcpy(buffer, mpq_a->blockbuf, tocopy);
+        bytesread     += tocopy;
+        mpq_a->bufpos  = tocopy;
+    }
+
+    /* Return what we've read */
+    return bytesread;
 }
diff --git a/contrib/extractor/libmpq/common.h b/contrib/extractor/libmpq/common.h
index 57b34e9cdee..7bec3a3c17a 100644
--- a/contrib/extractor/libmpq/common.h
+++ b/contrib/extractor/libmpq/common.h
@@ -20,55 +20,55 @@
  *  $Id: common.h,v 1.4 2004/02/12 00:41:55 mbroemme Exp $
  */
 
-#define LIBMPQ_CONF_FL_INCREMENT	512			/* i hope we did not need more :) */
-#define LIBMPQ_CONF_EXT			".conf"			/* listdb file seems to be valid with this extension */
-#define LIBMPQ_CONF_HEADER		"LIBMPQ_VERSION"	/* listdb file must include this entry to be valid */
-#define LIBMPQ_CONF_BUFSIZE		4096			/* maximum number of bytes a line in the file could contain */
+#define LIBMPQ_CONF_FL_INCREMENT    512         /* i hope we did not need more :) */
+#define LIBMPQ_CONF_EXT         ".conf"         /* listdb file seems to be valid with this extension */
+#define LIBMPQ_CONF_HEADER      "LIBMPQ_VERSION"    /* listdb file must include this entry to be valid */
+#define LIBMPQ_CONF_BUFSIZE     4096            /* maximum number of bytes a line in the file could contain */
 
-#define LIBMPQ_CONF_TYPE_CHAR		1			/* value in config file is from type char */
-#define LIBMPQ_CONF_TYPE_INT		2			/* value in config file is from type int */
+#define LIBMPQ_CONF_TYPE_CHAR       1           /* value in config file is from type char */
+#define LIBMPQ_CONF_TYPE_INT        2           /* value in config file is from type int */
 
-#define LIBMPQ_CONF_EOPEN_DIR		-1			/* error on open directory */
-#define LIBMPQ_CONF_EVALUE_NOT_FOUND	-2			/* value for the option was not found */
+#define LIBMPQ_CONF_EOPEN_DIR       -1          /* error on open directory */
+#define LIBMPQ_CONF_EVALUE_NOT_FOUND    -2          /* value for the option was not found */
 
 #if defined( __GNUC__ )
-	#include <sys/types.h>
-	#include <unistd.h>
+#include <sys/types.h>
+#include <unistd.h>
 
-	#define _lseek  lseek
-	#define _read   read
-	#define _open	open
-	#define _write	write
-	#define _close	close
-	#define _strdup	strdup
+#define _lseek  lseek
+#define _read   read
+#define _open   open
+#define _write  write
+#define _close  close
+#define _strdup strdup
 
-	#ifndef O_BINARY
-		#define O_BINARY 0
-	#endif
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
 #else
-	#include <io.h>
+#include <io.h>
 #endif
 
 #ifdef O_LARGEFILE
-    #define MPQ_FILE_OPEN_FLAGS (O_RDONLY | O_BINARY | O_LARGEFILE)
+#define MPQ_FILE_OPEN_FLAGS (O_RDONLY | O_BINARY | O_LARGEFILE)
 #else
-    #define MPQ_FILE_OPEN_FLAGS (O_RDONLY | O_BINARY)
+#define MPQ_FILE_OPEN_FLAGS (O_RDONLY | O_BINARY)
 #endif
 
 #ifndef min
-	#define min(a, b) ((a < b) ? a : b)
+#define min(a, b) ((a < b) ? a : b)
 #endif
 
-int libmpq_init_buffer(mpq_archive *mpq_a);
-int libmpq_read_hashtable(mpq_archive *mpq_a);
-int libmpq_read_blocktable(mpq_archive *mpq_a);
-int libmpq_file_read_file(mpq_archive *mpq_a, mpq_file *mpq_f, unsigned int filepos, char *buffer, unsigned int toread);
-int libmpq_read_listfile(mpq_archive *mpq_a, FILE *fp);
+int libmpq_init_buffer(mpq_archive* mpq_a);
+int libmpq_read_hashtable(mpq_archive* mpq_a);
+int libmpq_read_blocktable(mpq_archive* mpq_a);
+int libmpq_file_read_file(mpq_archive* mpq_a, mpq_file* mpq_f, unsigned int filepos, char* buffer, unsigned int toread);
+int libmpq_read_listfile(mpq_archive* mpq_a, FILE* fp);
 
-int libmpq_conf_get_value(FILE *fp, char *search_value, void *return_value, int type, int size);
-char *libmpq_conf_delete_char(char *buf, char *chars);
-int libmpq_conf_get_array(FILE *fp, char *search_value, char ***filelist, int *entries);
-int libmpq_free_listfile(char **filelist);
-int libmpq_read_listfile(mpq_archive *mpq_a, FILE *fp);
+int libmpq_conf_get_value(FILE* fp, char* search_value, void* return_value, int type, int size);
+char* libmpq_conf_delete_char(char* buf, char* chars);
+int libmpq_conf_get_array(FILE* fp, char* search_value, char** *filelist, int* entries);
+int libmpq_free_listfile(char** filelist);
+int libmpq_read_listfile(mpq_archive* mpq_a, FILE* fp);
 
 unsigned int libmpq_lseek(mpq_archive* mpq_a, unsigned int pos);
diff --git a/contrib/extractor/libmpq/explode.cpp b/contrib/extractor/libmpq/explode.cpp
index 273718ff746..fd9545c78ac 100644
--- a/contrib/extractor/libmpq/explode.cpp
+++ b/contrib/extractor/libmpq/explode.cpp
@@ -30,89 +30,97 @@
 #include "explode.h"
 
 /* Tables */
-static unsigned char pkzip_dist_bits[] = {
-	0x02, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08
+static unsigned char pkzip_dist_bits[] =
+{
+    0x02, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+    0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+    0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+    0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08
 };
 
-static unsigned char pkzip_dist_code[] = {
-	0x03, 0x0D, 0x05, 0x19, 0x09, 0x11, 0x01, 0x3E, 0x1E, 0x2E, 0x0E, 0x36, 0x16, 0x26, 0x06, 0x3A,
-	0x1A, 0x2A, 0x0A, 0x32, 0x12, 0x22, 0x42, 0x02, 0x7C, 0x3C, 0x5C, 0x1C, 0x6C, 0x2C, 0x4C, 0x0C,
-	0x74, 0x34, 0x54, 0x14, 0x64, 0x24, 0x44, 0x04, 0x78, 0x38, 0x58, 0x18, 0x68, 0x28, 0x48, 0x08,
-	0xF0, 0x70, 0xB0, 0x30, 0xD0, 0x50, 0x90, 0x10, 0xE0, 0x60, 0xA0, 0x20, 0xC0, 0x40, 0x80, 0x00
+static unsigned char pkzip_dist_code[] =
+{
+    0x03, 0x0D, 0x05, 0x19, 0x09, 0x11, 0x01, 0x3E, 0x1E, 0x2E, 0x0E, 0x36, 0x16, 0x26, 0x06, 0x3A,
+    0x1A, 0x2A, 0x0A, 0x32, 0x12, 0x22, 0x42, 0x02, 0x7C, 0x3C, 0x5C, 0x1C, 0x6C, 0x2C, 0x4C, 0x0C,
+    0x74, 0x34, 0x54, 0x14, 0x64, 0x24, 0x44, 0x04, 0x78, 0x38, 0x58, 0x18, 0x68, 0x28, 0x48, 0x08,
+    0xF0, 0x70, 0xB0, 0x30, 0xD0, 0x50, 0x90, 0x10, 0xE0, 0x60, 0xA0, 0x20, 0xC0, 0x40, 0x80, 0x00
 };
 
-static unsigned char pkzip_clen_bits[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
+static unsigned char pkzip_clen_bits[] =
+{
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
 };
 
-static unsigned short pkzip_len_base[] = {
-	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
-	0x0008, 0x000A, 0x000E, 0x0016, 0x0026, 0x0046, 0x0086, 0x0106
+static unsigned short pkzip_len_base[] =
+{
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+    0x0008, 0x000A, 0x000E, 0x0016, 0x0026, 0x0046, 0x0086, 0x0106
 };
 
-static unsigned char pkzip_slen_bits[] = {
-	0x03, 0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x07, 0x07
+static unsigned char pkzip_slen_bits[] =
+{
+    0x03, 0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x07, 0x07
 };
 
-static unsigned char pkzip_len_code[] = {
-	0x05, 0x03, 0x01, 0x06, 0x0A, 0x02, 0x0C, 0x14, 0x04, 0x18, 0x08, 0x30, 0x10, 0x20, 0x40, 0x00
+static unsigned char pkzip_len_code[] =
+{
+    0x05, 0x03, 0x01, 0x06, 0x0A, 0x02, 0x0C, 0x14, 0x04, 0x18, 0x08, 0x30, 0x10, 0x20, 0x40, 0x00
 };
 
-static unsigned char pkzip_bits_asc[] = {
-	0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x08, 0x07, 0x0C, 0x0C, 0x07, 0x0C, 0x0C,
-	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-	0x04, 0x0A, 0x08, 0x0C, 0x0A, 0x0C, 0x0A, 0x08, 0x07, 0x07, 0x08, 0x09, 0x07, 0x06, 0x07, 0x08,
-	0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x08, 0x07, 0x07, 0x08, 0x08, 0x0C, 0x0B, 0x07, 0x09, 0x0B,
-	0x0C, 0x06, 0x07, 0x06, 0x06, 0x05, 0x07, 0x08, 0x08, 0x06, 0x0B, 0x09, 0x06, 0x07, 0x06, 0x06,
-	0x07, 0x0B, 0x06, 0x06, 0x06, 0x07, 0x09, 0x08, 0x09, 0x09, 0x0B, 0x08, 0x0B, 0x09, 0x0C, 0x08,
-	0x0C, 0x05, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x05, 0x0B, 0x07, 0x05, 0x06, 0x05, 0x05,
-	0x06, 0x0A, 0x05, 0x05, 0x05, 0x05, 0x08, 0x07, 0x08, 0x08, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C,
-	0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
-	0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
-	0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
-	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-	0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D,
-	0x0D, 0x0D, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D
+static unsigned char pkzip_bits_asc[] =
+{
+    0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x08, 0x07, 0x0C, 0x0C, 0x07, 0x0C, 0x0C,
+    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+    0x04, 0x0A, 0x08, 0x0C, 0x0A, 0x0C, 0x0A, 0x08, 0x07, 0x07, 0x08, 0x09, 0x07, 0x06, 0x07, 0x08,
+    0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x08, 0x07, 0x07, 0x08, 0x08, 0x0C, 0x0B, 0x07, 0x09, 0x0B,
+    0x0C, 0x06, 0x07, 0x06, 0x06, 0x05, 0x07, 0x08, 0x08, 0x06, 0x0B, 0x09, 0x06, 0x07, 0x06, 0x06,
+    0x07, 0x0B, 0x06, 0x06, 0x06, 0x07, 0x09, 0x08, 0x09, 0x09, 0x0B, 0x08, 0x0B, 0x09, 0x0C, 0x08,
+    0x0C, 0x05, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x05, 0x0B, 0x07, 0x05, 0x06, 0x05, 0x05,
+    0x06, 0x0A, 0x05, 0x05, 0x05, 0x05, 0x08, 0x07, 0x08, 0x08, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C,
+    0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
+    0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
+    0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
+    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+    0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D,
+    0x0D, 0x0D, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D
 };
 
-static unsigned short pkzip_code_asc[] = {
-	0x0490, 0x0FE0, 0x07E0, 0x0BE0, 0x03E0, 0x0DE0, 0x05E0, 0x09E0,
-	0x01E0, 0x00B8, 0x0062, 0x0EE0, 0x06E0, 0x0022, 0x0AE0, 0x02E0,
-	0x0CE0, 0x04E0, 0x08E0, 0x00E0, 0x0F60, 0x0760, 0x0B60, 0x0360,
-	0x0D60, 0x0560, 0x1240, 0x0960, 0x0160, 0x0E60, 0x0660, 0x0A60,
-	0x000F, 0x0250, 0x0038, 0x0260, 0x0050, 0x0C60, 0x0390, 0x00D8,
-	0x0042, 0x0002, 0x0058, 0x01B0, 0x007C, 0x0029, 0x003C, 0x0098,
-	0x005C, 0x0009, 0x001C, 0x006C, 0x002C, 0x004C, 0x0018, 0x000C,
-	0x0074, 0x00E8, 0x0068, 0x0460, 0x0090, 0x0034, 0x00B0, 0x0710,
-	0x0860, 0x0031, 0x0054, 0x0011, 0x0021, 0x0017, 0x0014, 0x00A8,
-	0x0028, 0x0001, 0x0310, 0x0130, 0x003E, 0x0064, 0x001E, 0x002E,
-	0x0024, 0x0510, 0x000E, 0x0036, 0x0016, 0x0044, 0x0030, 0x00C8,
-	0x01D0, 0x00D0, 0x0110, 0x0048, 0x0610, 0x0150, 0x0060, 0x0088,
-	0x0FA0, 0x0007, 0x0026, 0x0006, 0x003A, 0x001B, 0x001A, 0x002A,
-	0x000A, 0x000B, 0x0210, 0x0004, 0x0013, 0x0032, 0x0003, 0x001D,
-	0x0012, 0x0190, 0x000D, 0x0015, 0x0005, 0x0019, 0x0008, 0x0078,
-	0x00F0, 0x0070, 0x0290, 0x0410, 0x0010, 0x07A0, 0x0BA0, 0x03A0,
-	0x0240, 0x1C40, 0x0C40, 0x1440, 0x0440, 0x1840, 0x0840, 0x1040,
-	0x0040, 0x1F80, 0x0F80, 0x1780, 0x0780, 0x1B80, 0x0B80, 0x1380,
-	0x0380, 0x1D80, 0x0D80, 0x1580, 0x0580, 0x1980, 0x0980, 0x1180,
-	0x0180, 0x1E80, 0x0E80, 0x1680, 0x0680, 0x1A80, 0x0A80, 0x1280,
-	0x0280, 0x1C80, 0x0C80, 0x1480, 0x0480, 0x1880, 0x0880, 0x1080,
-	0x0080, 0x1F00, 0x0F00, 0x1700, 0x0700, 0x1B00, 0x0B00, 0x1300,
-	0x0DA0, 0x05A0, 0x09A0, 0x01A0, 0x0EA0, 0x06A0, 0x0AA0, 0x02A0,
-	0x0CA0, 0x04A0, 0x08A0, 0x00A0, 0x0F20, 0x0720, 0x0B20, 0x0320,
-	0x0D20, 0x0520, 0x0920, 0x0120, 0x0E20, 0x0620, 0x0A20, 0x0220,
-	0x0C20, 0x0420, 0x0820, 0x0020, 0x0FC0, 0x07C0, 0x0BC0, 0x03C0,
-	0x0DC0, 0x05C0, 0x09C0, 0x01C0, 0x0EC0, 0x06C0, 0x0AC0, 0x02C0,
-	0x0CC0, 0x04C0, 0x08C0, 0x00C0, 0x0F40, 0x0740, 0x0B40, 0x0340,
-	0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900,
-	0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600,
-	0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200,
-	0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000
+static unsigned short pkzip_code_asc[] =
+{
+    0x0490, 0x0FE0, 0x07E0, 0x0BE0, 0x03E0, 0x0DE0, 0x05E0, 0x09E0,
+    0x01E0, 0x00B8, 0x0062, 0x0EE0, 0x06E0, 0x0022, 0x0AE0, 0x02E0,
+    0x0CE0, 0x04E0, 0x08E0, 0x00E0, 0x0F60, 0x0760, 0x0B60, 0x0360,
+    0x0D60, 0x0560, 0x1240, 0x0960, 0x0160, 0x0E60, 0x0660, 0x0A60,
+    0x000F, 0x0250, 0x0038, 0x0260, 0x0050, 0x0C60, 0x0390, 0x00D8,
+    0x0042, 0x0002, 0x0058, 0x01B0, 0x007C, 0x0029, 0x003C, 0x0098,
+    0x005C, 0x0009, 0x001C, 0x006C, 0x002C, 0x004C, 0x0018, 0x000C,
+    0x0074, 0x00E8, 0x0068, 0x0460, 0x0090, 0x0034, 0x00B0, 0x0710,
+    0x0860, 0x0031, 0x0054, 0x0011, 0x0021, 0x0017, 0x0014, 0x00A8,
+    0x0028, 0x0001, 0x0310, 0x0130, 0x003E, 0x0064, 0x001E, 0x002E,
+    0x0024, 0x0510, 0x000E, 0x0036, 0x0016, 0x0044, 0x0030, 0x00C8,
+    0x01D0, 0x00D0, 0x0110, 0x0048, 0x0610, 0x0150, 0x0060, 0x0088,
+    0x0FA0, 0x0007, 0x0026, 0x0006, 0x003A, 0x001B, 0x001A, 0x002A,
+    0x000A, 0x000B, 0x0210, 0x0004, 0x0013, 0x0032, 0x0003, 0x001D,
+    0x0012, 0x0190, 0x000D, 0x0015, 0x0005, 0x0019, 0x0008, 0x0078,
+    0x00F0, 0x0070, 0x0290, 0x0410, 0x0010, 0x07A0, 0x0BA0, 0x03A0,
+    0x0240, 0x1C40, 0x0C40, 0x1440, 0x0440, 0x1840, 0x0840, 0x1040,
+    0x0040, 0x1F80, 0x0F80, 0x1780, 0x0780, 0x1B80, 0x0B80, 0x1380,
+    0x0380, 0x1D80, 0x0D80, 0x1580, 0x0580, 0x1980, 0x0980, 0x1180,
+    0x0180, 0x1E80, 0x0E80, 0x1680, 0x0680, 0x1A80, 0x0A80, 0x1280,
+    0x0280, 0x1C80, 0x0C80, 0x1480, 0x0480, 0x1880, 0x0880, 0x1080,
+    0x0080, 0x1F00, 0x0F00, 0x1700, 0x0700, 0x1B00, 0x0B00, 0x1300,
+    0x0DA0, 0x05A0, 0x09A0, 0x01A0, 0x0EA0, 0x06A0, 0x0AA0, 0x02A0,
+    0x0CA0, 0x04A0, 0x08A0, 0x00A0, 0x0F20, 0x0720, 0x0B20, 0x0320,
+    0x0D20, 0x0520, 0x0920, 0x0120, 0x0E20, 0x0620, 0x0A20, 0x0220,
+    0x0C20, 0x0420, 0x0820, 0x0020, 0x0FC0, 0x07C0, 0x0BC0, 0x03C0,
+    0x0DC0, 0x05C0, 0x09C0, 0x01C0, 0x0EC0, 0x06C0, 0x0AC0, 0x02C0,
+    0x0CC0, 0x04C0, 0x08C0, 0x00C0, 0x0F40, 0x0740, 0x0B40, 0x0340,
+    0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900,
+    0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600,
+    0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200,
+    0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000
 };
 
 /* Local variables */
@@ -123,98 +131,125 @@ static char copyright[] = "PKWARE Data Compression Library for Win32\r\n"
                           "Version 1.11\r\n";
 
 /* Local functions */
-static void libmpq_pkzip_gen_decode_tabs(long count, unsigned char *bits, unsigned char *code, unsigned char *buf2) {
-	long i;
-
-	for (i = count-1; i >= 0; i--) {		/* EBX - count */
-		unsigned long idx1 = code[i];
-		unsigned long idx2 = 1 << bits[i];
-		do {
-			buf2[idx1] = (unsigned char)i;
-			idx1      += idx2;
-		} while (idx1 < 0x100);
-	}
+static void libmpq_pkzip_gen_decode_tabs(long count, unsigned char* bits, unsigned char* code, unsigned char* buf2)
+{
+    long i;
+
+    for (i = count - 1; i >= 0; i--)        /* EBX - count */
+    {
+        unsigned long idx1 = code[i];
+        unsigned long idx2 = 1 << bits[i];
+        do
+        {
+            buf2[idx1] = (unsigned char)i;
+            idx1      += idx2;
+        }
+        while (idx1 < 0x100);
+    }
 }
 
-static void libmpq_pkzip_gen_asc_tabs(pkzip_data_cmp *mpq_pkzip) {
-	unsigned short *code_asc = &pkzip_code_asc[0xFF];
-	unsigned long acc, add;
-	unsigned short count;
-
-	for (count = 0x00FF; code_asc >= pkzip_code_asc; code_asc--, count--) {
-		unsigned char *bits_asc = mpq_pkzip->bits_asc + count;
-		unsigned char bits_tmp = *bits_asc;
-
-		if (bits_tmp <= 8) {
-			add = (1 << bits_tmp);
-			acc = *code_asc;
-			do {
-				mpq_pkzip->offs_2c34[acc] = (unsigned char)count;
-				acc += add;
-			} while (acc < 0x100);
-		} else {
-			if ((acc = (*code_asc & 0xFF)) != 0) {
-				mpq_pkzip->offs_2c34[acc] = 0xFF;
-				if (*code_asc & 0x3F) {
-					bits_tmp -= 4;
-					*bits_asc = bits_tmp;
-					add = (1 << bits_tmp);
-					acc = *code_asc >> 4;
-					do {
-						mpq_pkzip->offs_2d34[acc] = (unsigned char)count;
-						acc += add;
-					} while (acc < 0x100);
-				} else {
-					bits_tmp -= 6;
-					*bits_asc = bits_tmp;
-					add = (1 << bits_tmp);
-					acc = *code_asc >> 6;
-					do {
-						mpq_pkzip->offs_2e34[acc] = (unsigned char)count;
-						acc += add;
-					} while (acc < 0x80);
-				}
-			} else {
-				bits_tmp -= 8;
-				*bits_asc = bits_tmp;
-				add = (1 << bits_tmp);
-				acc = *code_asc >> 8;
-				do {
-					mpq_pkzip->offs_2eb4[acc] = (unsigned char)count;
-					acc += add;
-				} while (acc < 0x100);
-			}
-		}
-	}
+static void libmpq_pkzip_gen_asc_tabs(pkzip_data_cmp* mpq_pkzip)
+{
+    unsigned short* code_asc = &pkzip_code_asc[0xFF];
+    unsigned long acc, add;
+    unsigned short count;
+
+    for (count = 0x00FF; code_asc >= pkzip_code_asc; code_asc--, count--)
+    {
+        unsigned char* bits_asc = mpq_pkzip->bits_asc + count;
+        unsigned char bits_tmp = *bits_asc;
+
+        if (bits_tmp <= 8)
+        {
+            add = (1 << bits_tmp);
+            acc = *code_asc;
+            do
+            {
+                mpq_pkzip->offs_2c34[acc] = (unsigned char)count;
+                acc += add;
+            }
+            while (acc < 0x100);
+        }
+        else
+        {
+            if ((acc = (*code_asc & 0xFF)) != 0)
+            {
+                mpq_pkzip->offs_2c34[acc] = 0xFF;
+                if (*code_asc & 0x3F)
+                {
+                    bits_tmp -= 4;
+                    *bits_asc = bits_tmp;
+                    add = (1 << bits_tmp);
+                    acc = *code_asc >> 4;
+                    do
+                    {
+                        mpq_pkzip->offs_2d34[acc] = (unsigned char)count;
+                        acc += add;
+                    }
+                    while (acc < 0x100);
+                }
+                else
+                {
+                    bits_tmp -= 6;
+                    *bits_asc = bits_tmp;
+                    add = (1 << bits_tmp);
+                    acc = *code_asc >> 6;
+                    do
+                    {
+                        mpq_pkzip->offs_2e34[acc] = (unsigned char)count;
+                        acc += add;
+                    }
+                    while (acc < 0x80);
+                }
+            }
+            else
+            {
+                bits_tmp -= 8;
+                *bits_asc = bits_tmp;
+                add = (1 << bits_tmp);
+                acc = *code_asc >> 8;
+                do
+                {
+                    mpq_pkzip->offs_2eb4[acc] = (unsigned char)count;
+                    acc += add;
+                }
+                while (acc < 0x100);
+            }
+        }
+    }
 }
 
 /*
  *  Skips given number of bits in bit buffer. Result is stored in mpq_pkzip->bit_buf
  *  If no data in input buffer, returns true
  */
-static int libmpq_pkzip_skip_bits(pkzip_data_cmp *mpq_pkzip, unsigned long bits) {
-	/* If number of bits required is less than number of (bits in the buffer) ? */
-	if (bits <= mpq_pkzip->extra_bits) {
-		mpq_pkzip->extra_bits -= bits;
-		mpq_pkzip->bit_buf >>= bits;
-		return 0;
-	}
-
-	/* Load input buffer if necessary */
-	mpq_pkzip->bit_buf >>= mpq_pkzip->extra_bits;
-	if (mpq_pkzip->in_pos == mpq_pkzip->in_bytes) {
-		mpq_pkzip->in_pos = sizeof(mpq_pkzip->in_buf);
-		if ((mpq_pkzip->in_bytes = mpq_pkzip->read_buf((char *)mpq_pkzip->in_buf, &mpq_pkzip->in_pos, mpq_pkzip->param)) == 0) {
-			return 1;
-		}
-		mpq_pkzip->in_pos = 0;
-	}
-
-	/* Update bit buffer */
-	mpq_pkzip->bit_buf |= (mpq_pkzip->in_buf[mpq_pkzip->in_pos++] << 8);
-	mpq_pkzip->bit_buf >>= (bits - mpq_pkzip->extra_bits);
-	mpq_pkzip->extra_bits = (mpq_pkzip->extra_bits - bits) + 8;
-	return 0;
+static int libmpq_pkzip_skip_bits(pkzip_data_cmp* mpq_pkzip, unsigned long bits)
+{
+    /* If number of bits required is less than number of (bits in the buffer) ? */
+    if (bits <= mpq_pkzip->extra_bits)
+    {
+        mpq_pkzip->extra_bits -= bits;
+        mpq_pkzip->bit_buf >>= bits;
+        return 0;
+    }
+
+    /* Load input buffer if necessary */
+    mpq_pkzip->bit_buf >>= mpq_pkzip->extra_bits;
+    if (mpq_pkzip->in_pos == mpq_pkzip->in_bytes)
+    {
+        mpq_pkzip->in_pos = sizeof(mpq_pkzip->in_buf);
+        if ((mpq_pkzip->in_bytes = mpq_pkzip->read_buf((char*)mpq_pkzip->in_buf, &mpq_pkzip->in_pos, mpq_pkzip->param)) == 0)
+        {
+            return 1;
+        }
+        mpq_pkzip->in_pos = 0;
+    }
+
+    /* Update bit buffer */
+    mpq_pkzip->bit_buf |= (mpq_pkzip->in_buf[mpq_pkzip->in_pos++] << 8);
+    mpq_pkzip->bit_buf >>= (bits - mpq_pkzip->extra_bits);
+    mpq_pkzip->extra_bits = (mpq_pkzip->extra_bits - bits) + 8;
+    return 0;
 }
 
 /*
@@ -223,206 +258,247 @@ static int libmpq_pkzip_skip_bits(pkzip_data_cmp *mpq_pkzip, unsigned long bits)
  *           0x100 - 0x305 : Copy previous block (0x100 = 1 byte)
  *           0x306         : Out of buffer (?)
  */
-static unsigned long libmpq_pkzip_explode_lit(pkzip_data_cmp *mpq_pkzip) {
-	unsigned long bits;				/* Number of bits to skip */
-	unsigned long value;				/* Position in buffers */
-
-	/* Test the current bit in byte buffer. If is not set, simply return the next byte. */
-	if (mpq_pkzip->bit_buf & 1) {
-
-		/* Skip current bit in the buffer. */
-		if (libmpq_pkzip_skip_bits(mpq_pkzip, 1)) {
-			return 0x306;
-		}
-
-		/* The next bits are position in buffers. */
-		value = mpq_pkzip->pos2[(mpq_pkzip->bit_buf & 0xFF)];
-
-		/* Get number of bits to skip */
-		if (libmpq_pkzip_skip_bits(mpq_pkzip, mpq_pkzip->slen_bits[value])) {
-			return 0x306;
-		}
-		if ((bits = mpq_pkzip->clen_bits[value]) != 0) {
-			unsigned long val2 = mpq_pkzip->bit_buf & ((1 << bits) - 1);
-			if (libmpq_pkzip_skip_bits(mpq_pkzip, bits)) {
-				if ((value + val2) != 0x10E) {
-					return 0x306;
-				}
-			}
-			value = mpq_pkzip->len_base[value] + val2;
-		}
-		return value + 0x100;			/* Return number of bytes to repeat */
-	}
-
-	/* Skip one bit */
-	if (libmpq_pkzip_skip_bits(mpq_pkzip, 1)) {
-		return 0x306;
-	}
-
-	/* If the binary compression type, read 8 bits and return them as one byte. */
-	if (mpq_pkzip->cmp_type == LIBMPQ_PKZIP_CMP_BINARY) {
-		value = mpq_pkzip->bit_buf & 0xFF;
-		if (libmpq_pkzip_skip_bits(mpq_pkzip, 8)) {
-			return 0x306;
-		}
-		return value;
-	}
-
-	/* When ASCII compression ... */
-	if (mpq_pkzip->bit_buf & 0xFF) {
-		value = mpq_pkzip->offs_2c34[mpq_pkzip->bit_buf & 0xFF];
-		if (value == 0xFF) {
-			if (mpq_pkzip->bit_buf & 0x3F) {
-				if (libmpq_pkzip_skip_bits(mpq_pkzip, 4)) {
-					return 0x306;
-				}
-				value = mpq_pkzip->offs_2d34[mpq_pkzip->bit_buf & 0xFF];
-			} else {
-				if (libmpq_pkzip_skip_bits(mpq_pkzip, 6)) {
-					return 0x306;
-				}
-				value = mpq_pkzip->offs_2e34[mpq_pkzip->bit_buf & 0x7F];
-			}
-		}
-	} else {
-		if (libmpq_pkzip_skip_bits(mpq_pkzip, 8)) {
-			return 0x306;
-		}
-		value = mpq_pkzip->offs_2eb4[mpq_pkzip->bit_buf & 0xFF];
-	}
-	return libmpq_pkzip_skip_bits(mpq_pkzip, mpq_pkzip->bits_asc[value]) ? 0x306 : value;
+static unsigned long libmpq_pkzip_explode_lit(pkzip_data_cmp* mpq_pkzip)
+{
+    unsigned long bits;             /* Number of bits to skip */
+    unsigned long value;                /* Position in buffers */
+
+    /* Test the current bit in byte buffer. If is not set, simply return the next byte. */
+    if (mpq_pkzip->bit_buf & 1)
+    {
+
+        /* Skip current bit in the buffer. */
+        if (libmpq_pkzip_skip_bits(mpq_pkzip, 1))
+        {
+            return 0x306;
+        }
+
+        /* The next bits are position in buffers. */
+        value = mpq_pkzip->pos2[(mpq_pkzip->bit_buf & 0xFF)];
+
+        /* Get number of bits to skip */
+        if (libmpq_pkzip_skip_bits(mpq_pkzip, mpq_pkzip->slen_bits[value]))
+        {
+            return 0x306;
+        }
+        if ((bits = mpq_pkzip->clen_bits[value]) != 0)
+        {
+            unsigned long val2 = mpq_pkzip->bit_buf & ((1 << bits) - 1);
+            if (libmpq_pkzip_skip_bits(mpq_pkzip, bits))
+            {
+                if ((value + val2) != 0x10E)
+                {
+                    return 0x306;
+                }
+            }
+            value = mpq_pkzip->len_base[value] + val2;
+        }
+        return value + 0x100;           /* Return number of bytes to repeat */
+    }
+
+    /* Skip one bit */
+    if (libmpq_pkzip_skip_bits(mpq_pkzip, 1))
+    {
+        return 0x306;
+    }
+
+    /* If the binary compression type, read 8 bits and return them as one byte. */
+    if (mpq_pkzip->cmp_type == LIBMPQ_PKZIP_CMP_BINARY)
+    {
+        value = mpq_pkzip->bit_buf & 0xFF;
+        if (libmpq_pkzip_skip_bits(mpq_pkzip, 8))
+        {
+            return 0x306;
+        }
+        return value;
+    }
+
+    /* When ASCII compression ... */
+    if (mpq_pkzip->bit_buf & 0xFF)
+    {
+        value = mpq_pkzip->offs_2c34[mpq_pkzip->bit_buf & 0xFF];
+        if (value == 0xFF)
+        {
+            if (mpq_pkzip->bit_buf & 0x3F)
+            {
+                if (libmpq_pkzip_skip_bits(mpq_pkzip, 4))
+                {
+                    return 0x306;
+                }
+                value = mpq_pkzip->offs_2d34[mpq_pkzip->bit_buf & 0xFF];
+            }
+            else
+            {
+                if (libmpq_pkzip_skip_bits(mpq_pkzip, 6))
+                {
+                    return 0x306;
+                }
+                value = mpq_pkzip->offs_2e34[mpq_pkzip->bit_buf & 0x7F];
+            }
+        }
+    }
+    else
+    {
+        if (libmpq_pkzip_skip_bits(mpq_pkzip, 8))
+        {
+            return 0x306;
+        }
+        value = mpq_pkzip->offs_2eb4[mpq_pkzip->bit_buf & 0xFF];
+    }
+    return libmpq_pkzip_skip_bits(mpq_pkzip, mpq_pkzip->bits_asc[value]) ? 0x306 : value;
 }
 
 /*
  *  Retrieves the number of bytes to move back.
  */
-static unsigned long libmpq_pkzip_explode_dist(pkzip_data_cmp *mpq_pkzip, unsigned long length) {
-	unsigned long pos  = mpq_pkzip->pos1[(mpq_pkzip->bit_buf & 0xFF)];
-	unsigned long skip = mpq_pkzip->dist_bits[pos];	/* Number of bits to skip */
-
-	/* Skip the appropriate number of bits */
-	if (libmpq_pkzip_skip_bits(mpq_pkzip, skip) == 1) {
-		return 0;
-	}
-	if (length == 2) {
-		pos = (pos << 2) | (mpq_pkzip->bit_buf & 0x03);
-		if (libmpq_pkzip_skip_bits(mpq_pkzip, 2) == 1) {
-			return 0;
-		}
-	} else {
-		pos = (pos << mpq_pkzip->dsize_bits) | (mpq_pkzip->bit_buf & mpq_pkzip->dsize_mask);
-
-		/* Skip the bits */
-		if (libmpq_pkzip_skip_bits(mpq_pkzip, mpq_pkzip->dsize_bits) == 1) {
-			return 0;
-		}
-	}
-	return pos + 1;
+static unsigned long libmpq_pkzip_explode_dist(pkzip_data_cmp* mpq_pkzip, unsigned long length)
+{
+    unsigned long pos  = mpq_pkzip->pos1[(mpq_pkzip->bit_buf & 0xFF)];
+    unsigned long skip = mpq_pkzip->dist_bits[pos]; /* Number of bits to skip */
+
+    /* Skip the appropriate number of bits */
+    if (libmpq_pkzip_skip_bits(mpq_pkzip, skip) == 1)
+    {
+        return 0;
+    }
+    if (length == 2)
+    {
+        pos = (pos << 2) | (mpq_pkzip->bit_buf & 0x03);
+        if (libmpq_pkzip_skip_bits(mpq_pkzip, 2) == 1)
+        {
+            return 0;
+        }
+    }
+    else
+    {
+        pos = (pos << mpq_pkzip->dsize_bits) | (mpq_pkzip->bit_buf & mpq_pkzip->dsize_mask);
+
+        /* Skip the bits */
+        if (libmpq_pkzip_skip_bits(mpq_pkzip, mpq_pkzip->dsize_bits) == 1)
+        {
+            return 0;
+        }
+    }
+    return pos + 1;
 }
 
-static unsigned long libmpq_pkzip_expand(pkzip_data_cmp *mpq_pkzip) {
-	unsigned int copy_bytes;			/* Number of bytes to copy */
-	unsigned long one_byte;				/* One byte from compressed file */
-	unsigned long result;
-
-	mpq_pkzip->out_pos = 0x1000;			/* Initialize output buffer position */
-
-	/* If end of data or error, terminate decompress */
-	while ((result = one_byte = libmpq_pkzip_explode_lit(mpq_pkzip)) < 0x305) {
-
-		/* If one byte is greater than 0x100, means "Repeat n - 0xFE bytes" */
-		if (one_byte >= 0x100) {
-			unsigned char *source;		/* ECX */
-			unsigned char *target;		/* EDX */
-			unsigned long copy_length = one_byte - 0xFE;
-			unsigned long move_back;
-
-			/* Get length of data to copy */
-			if ((move_back = libmpq_pkzip_explode_dist(mpq_pkzip, copy_length)) == 0) {
-				result = 0x306;
-				break;
-			}
-
-			/* Target and source pointer */
-			target = &mpq_pkzip->out_buf[mpq_pkzip->out_pos];
-			source = target - move_back;
-			mpq_pkzip->out_pos += copy_length;
-			while (copy_length-- > 0) {
-				*target++ = *source++;
-			}
-		} else {
-			mpq_pkzip->out_buf[mpq_pkzip->out_pos++] = (unsigned char)one_byte;
-		}
-
-		/*
-		 * If number of extracted bytes has reached 1/2 of output buffer,
-		 * flush output buffer.
-		 */
-		if (mpq_pkzip->out_pos >= 0x2000) {
-
-			/* Copy decompressed data into user buffer. */
-			copy_bytes = 0x1000;
-			mpq_pkzip->write_buf((char *)&mpq_pkzip->out_buf[0x1000], &copy_bytes, mpq_pkzip->param);
-
-			/* If there are some data left, keep them alive */
-			memcpy(mpq_pkzip->out_buf, &mpq_pkzip->out_buf[0x1000], mpq_pkzip->out_pos - 0x1000);
-			mpq_pkzip->out_pos -= 0x1000;
-		}
-	}
-	copy_bytes = mpq_pkzip->out_pos - 0x1000;
-	mpq_pkzip->write_buf((char *)&mpq_pkzip->out_buf[0x1000], &copy_bytes, mpq_pkzip->param);
-	return result;
+static unsigned long libmpq_pkzip_expand(pkzip_data_cmp* mpq_pkzip)
+{
+    unsigned int copy_bytes;            /* Number of bytes to copy */
+    unsigned long one_byte;             /* One byte from compressed file */
+    unsigned long result;
+
+    mpq_pkzip->out_pos = 0x1000;            /* Initialize output buffer position */
+
+    /* If end of data or error, terminate decompress */
+    while ((result = one_byte = libmpq_pkzip_explode_lit(mpq_pkzip)) < 0x305)
+    {
+
+        /* If one byte is greater than 0x100, means "Repeat n - 0xFE bytes" */
+        if (one_byte >= 0x100)
+        {
+            unsigned char* source;      /* ECX */
+            unsigned char* target;      /* EDX */
+            unsigned long copy_length = one_byte - 0xFE;
+            unsigned long move_back;
+
+            /* Get length of data to copy */
+            if ((move_back = libmpq_pkzip_explode_dist(mpq_pkzip, copy_length)) == 0)
+            {
+                result = 0x306;
+                break;
+            }
+
+            /* Target and source pointer */
+            target = &mpq_pkzip->out_buf[mpq_pkzip->out_pos];
+            source = target - move_back;
+            mpq_pkzip->out_pos += copy_length;
+            while (copy_length-- > 0)
+            {
+                *target++ = *source++;
+            }
+        }
+        else
+        {
+            mpq_pkzip->out_buf[mpq_pkzip->out_pos++] = (unsigned char)one_byte;
+        }
+
+        /*
+         * If number of extracted bytes has reached 1/2 of output buffer,
+         * flush output buffer.
+         */
+        if (mpq_pkzip->out_pos >= 0x2000)
+        {
+
+            /* Copy decompressed data into user buffer. */
+            copy_bytes = 0x1000;
+            mpq_pkzip->write_buf((char*)&mpq_pkzip->out_buf[0x1000], &copy_bytes, mpq_pkzip->param);
+
+            /* If there are some data left, keep them alive */
+            memcpy(mpq_pkzip->out_buf, &mpq_pkzip->out_buf[0x1000], mpq_pkzip->out_pos - 0x1000);
+            mpq_pkzip->out_pos -= 0x1000;
+        }
+    }
+    copy_bytes = mpq_pkzip->out_pos - 0x1000;
+    mpq_pkzip->write_buf((char*)&mpq_pkzip->out_buf[0x1000], &copy_bytes, mpq_pkzip->param);
+    return result;
 }
 
 /*
  * Main exploding function.
  */
 unsigned int libmpq_pkzip_explode(
-	unsigned int	(*read_buf)(char *buf, unsigned  int *size, void *param),
-	void		(*write_buf)(char *buf, unsigned  int *size, void *param),
-	char		*work_buf,
-	void		*param) {
-
-	pkzip_data_cmp *mpq_pkzip = (pkzip_data_cmp *)work_buf;
-
-	/* Set the whole work buffer to zeros */
-	memset(mpq_pkzip, 0, sizeof(pkzip_data_cmp));
-
-	/* Initialize work struct and load compressed data */
-	mpq_pkzip->read_buf   = read_buf;
-	mpq_pkzip->write_buf  = write_buf;
-	mpq_pkzip->param      = param;
-	mpq_pkzip->in_pos     = sizeof(mpq_pkzip->in_buf);
-	mpq_pkzip->in_bytes   = mpq_pkzip->read_buf((char *)mpq_pkzip->in_buf, &mpq_pkzip->in_pos, mpq_pkzip->param);
-	if (mpq_pkzip->in_bytes <= 4) {
-		return LIBMPQ_PKZIP_CMP_BAD_DATA;
-	}
-	mpq_pkzip->cmp_type   = mpq_pkzip->in_buf[0];	/* Get the compression type */
-	mpq_pkzip->dsize_bits = mpq_pkzip->in_buf[1];	/* Get the dictionary size */
-	mpq_pkzip->bit_buf    = mpq_pkzip->in_buf[2];	/* Initialize 16-bit bit buffer */
-	mpq_pkzip->extra_bits = 0;			/* Extra (over 8) bits */
-	mpq_pkzip->in_pos     = 3;			/* Position in input buffer */
-
-	/* Test for the valid dictionary size */
-	if (4 > mpq_pkzip->dsize_bits || mpq_pkzip->dsize_bits > 6) {
-		return LIBMPQ_PKZIP_CMP_INV_DICTSIZE;
-	}
-	mpq_pkzip->dsize_mask = 0xFFFF >> (0x10 - mpq_pkzip->dsize_bits);	/* Shifted by 'sar' instruction */
-	if (mpq_pkzip->cmp_type != LIBMPQ_PKZIP_CMP_BINARY) {
-		if (mpq_pkzip->cmp_type != LIBMPQ_PKZIP_CMP_ASCII) {
-			return LIBMPQ_PKZIP_CMP_INV_MODE;
-		}
-		memcpy(mpq_pkzip->bits_asc, pkzip_bits_asc, sizeof(mpq_pkzip->bits_asc));
-		libmpq_pkzip_gen_asc_tabs(mpq_pkzip);
-	}
-	memcpy(mpq_pkzip->slen_bits, pkzip_slen_bits, sizeof(mpq_pkzip->slen_bits));
-	libmpq_pkzip_gen_decode_tabs(0x10, mpq_pkzip->slen_bits, pkzip_len_code, mpq_pkzip->pos2);
-	memcpy(mpq_pkzip->clen_bits, pkzip_clen_bits, sizeof(mpq_pkzip->clen_bits));
-	memcpy(mpq_pkzip->len_base, pkzip_len_base, sizeof(mpq_pkzip->len_base));
-	memcpy(mpq_pkzip->dist_bits, pkzip_dist_bits, sizeof(mpq_pkzip->dist_bits));
-	libmpq_pkzip_gen_decode_tabs(0x40, mpq_pkzip->dist_bits, pkzip_dist_code, mpq_pkzip->pos1);
-	if (libmpq_pkzip_expand(mpq_pkzip) != 0x306) {
-		return LIBMPQ_PKZIP_CMP_NO_ERROR;
-	}
-	return LIBMPQ_PKZIP_CMP_ABORT;
+    unsigned int (*read_buf)(char* buf, unsigned  int* size, void* param),
+    void (*write_buf)(char* buf, unsigned  int* size, void* param),
+    char*        work_buf,
+    void*        param)
+{
+
+    pkzip_data_cmp* mpq_pkzip = (pkzip_data_cmp*)work_buf;
+
+    /* Set the whole work buffer to zeros */
+    memset(mpq_pkzip, 0, sizeof(pkzip_data_cmp));
+
+    /* Initialize work struct and load compressed data */
+    mpq_pkzip->read_buf   = read_buf;
+    mpq_pkzip->write_buf  = write_buf;
+    mpq_pkzip->param      = param;
+    mpq_pkzip->in_pos     = sizeof(mpq_pkzip->in_buf);
+    mpq_pkzip->in_bytes   = mpq_pkzip->read_buf((char*)mpq_pkzip->in_buf, &mpq_pkzip->in_pos, mpq_pkzip->param);
+    if (mpq_pkzip->in_bytes <= 4)
+    {
+        return LIBMPQ_PKZIP_CMP_BAD_DATA;
+    }
+    mpq_pkzip->cmp_type   = mpq_pkzip->in_buf[0];   /* Get the compression type */
+    mpq_pkzip->dsize_bits = mpq_pkzip->in_buf[1];   /* Get the dictionary size */
+    mpq_pkzip->bit_buf    = mpq_pkzip->in_buf[2];   /* Initialize 16-bit bit buffer */
+    mpq_pkzip->extra_bits = 0;          /* Extra (over 8) bits */
+    mpq_pkzip->in_pos     = 3;          /* Position in input buffer */
+
+    /* Test for the valid dictionary size */
+    if (4 > mpq_pkzip->dsize_bits || mpq_pkzip->dsize_bits > 6)
+    {
+        return LIBMPQ_PKZIP_CMP_INV_DICTSIZE;
+    }
+    mpq_pkzip->dsize_mask = 0xFFFF >> (0x10 - mpq_pkzip->dsize_bits);   /* Shifted by 'sar' instruction */
+    if (mpq_pkzip->cmp_type != LIBMPQ_PKZIP_CMP_BINARY)
+    {
+        if (mpq_pkzip->cmp_type != LIBMPQ_PKZIP_CMP_ASCII)
+        {
+            return LIBMPQ_PKZIP_CMP_INV_MODE;
+        }
+        memcpy(mpq_pkzip->bits_asc, pkzip_bits_asc, sizeof(mpq_pkzip->bits_asc));
+        libmpq_pkzip_gen_asc_tabs(mpq_pkzip);
+    }
+    memcpy(mpq_pkzip->slen_bits, pkzip_slen_bits, sizeof(mpq_pkzip->slen_bits));
+    libmpq_pkzip_gen_decode_tabs(0x10, mpq_pkzip->slen_bits, pkzip_len_code, mpq_pkzip->pos2);
+    memcpy(mpq_pkzip->clen_bits, pkzip_clen_bits, sizeof(mpq_pkzip->clen_bits));
+    memcpy(mpq_pkzip->len_base, pkzip_len_base, sizeof(mpq_pkzip->len_base));
+    memcpy(mpq_pkzip->dist_bits, pkzip_dist_bits, sizeof(mpq_pkzip->dist_bits));
+    libmpq_pkzip_gen_decode_tabs(0x40, mpq_pkzip->dist_bits, pkzip_dist_code, mpq_pkzip->pos1);
+    if (libmpq_pkzip_expand(mpq_pkzip) != 0x306)
+    {
+        return LIBMPQ_PKZIP_CMP_NO_ERROR;
+    }
+    return LIBMPQ_PKZIP_CMP_ABORT;
 }
diff --git a/contrib/extractor/libmpq/explode.h b/contrib/extractor/libmpq/explode.h
index 1f916f778ae..64499b6fead 100644
--- a/contrib/extractor/libmpq/explode.h
+++ b/contrib/extractor/libmpq/explode.h
@@ -27,60 +27,62 @@
 #ifndef _EXPLODE_H
 #define _EXPLODE_H
 
-#define LIBMPQ_PKZIP_EXP_BUFFER_SIZE	12596		/* Size of decompress buffer */
-#define LIBMPQ_PKZIP_CMP_BINARY		0		/* Binary compression */
-#define LIBMPQ_PKZIP_CMP_ASCII		1		/* Ascii compression */
-#define LIBMPQ_PKZIP_CMP_NO_ERROR	0
-#define LIBMPQ_PKZIP_CMP_INV_DICTSIZE	1
-#define LIBMPQ_PKZIP_CMP_INV_MODE	2
-#define LIBMPQ_PKZIP_CMP_BAD_DATA	3
-#define LIBMPQ_PKZIP_CMP_ABORT		4
+#define LIBMPQ_PKZIP_EXP_BUFFER_SIZE    12596       /* Size of decompress buffer */
+#define LIBMPQ_PKZIP_CMP_BINARY     0       /* Binary compression */
+#define LIBMPQ_PKZIP_CMP_ASCII      1       /* Ascii compression */
+#define LIBMPQ_PKZIP_CMP_NO_ERROR   0
+#define LIBMPQ_PKZIP_CMP_INV_DICTSIZE   1
+#define LIBMPQ_PKZIP_CMP_INV_MODE   2
+#define LIBMPQ_PKZIP_CMP_BAD_DATA   3
+#define LIBMPQ_PKZIP_CMP_ABORT      4
 
 /* Compression structure (size: 12596 bytes on x86-32) */
-typedef struct {
-	unsigned long	offs0000;		/* 0000 */
-	unsigned long	cmp_type;		/* 0004 - Compression type (LIBMPQ_PZIP_CMP_BINARY or LIBMPQ_PKZIP_CMP_ASCII) */
-	unsigned long	out_pos;		/* 0008 - Position in output buffer */
-	unsigned long	dsize_bits;		/* 000C - Dict size (4, 5, 6 for 0x400, 0x800, 0x1000) */
-	unsigned long	dsize_mask;		/* 0010 - Dict size bitmask (0x0F, 0x1F, 0x3F for 0x400, 0x800, 0x1000) */
-	unsigned long	bit_buf;		/* 0014 - 16-bit buffer for processing input data */
-	unsigned long	extra_bits;		/* 0018 - Number of extra (above 8) bits in bit buffer */
-	unsigned int	in_pos;			/* 001C - Position in in_buf */
-	unsigned long	in_bytes;		/* 0020 - Number of bytes in input buffer */
-	void		*param;			/* 0024 - Custom parameter */
-	unsigned int	(*read_buf)(char *buf, unsigned  int *size, void *param);	/* 0028 */
-	void		(*write_buf)(char *buf, unsigned  int *size, void *param);	/* 002C */
-	unsigned char	out_buf[0x2000];	/* 0030 - Output circle buffer. Starting position is 0x1000 */
-	unsigned char	offs_2030[0x204];	/* 2030 - ??? */
-	unsigned char	in_buf[0x800];		/* 2234 - Buffer for data to be decompressed */
-	unsigned char	pos1[0x100];		/* 2A34 - Positions in buffers */
-	unsigned char	pos2[0x100];		/* 2B34 - Positions in buffers */
-	unsigned char	offs_2c34[0x100];	/* 2C34 - Buffer for */
-	unsigned char	offs_2d34[0x100];	/* 2D34 - Buffer for */
-	unsigned char	offs_2e34[0x80];	/* 2EB4 - Buffer for */
-	unsigned char	offs_2eb4[0x100];	/* 2EB4 - Buffer for */
-	unsigned char	bits_asc[0x100];	/* 2FB4 - Buffer for */
-	unsigned char	dist_bits[0x40];	/* 30B4 - Numbers of bytes to skip copied block length */
-	unsigned char	slen_bits[0x10];	/* 30F4 - Numbers of bits for skip copied block length */
-	unsigned char	clen_bits[0x10];	/* 3104 - Number of valid bits for copied block */
-	unsigned short	len_base[0x10];		/* 3114 - Buffer for */
+typedef struct
+{
+    unsigned long   offs0000;       /* 0000 */
+    unsigned long   cmp_type;       /* 0004 - Compression type (LIBMPQ_PZIP_CMP_BINARY or LIBMPQ_PKZIP_CMP_ASCII) */
+    unsigned long   out_pos;        /* 0008 - Position in output buffer */
+    unsigned long   dsize_bits;     /* 000C - Dict size (4, 5, 6 for 0x400, 0x800, 0x1000) */
+    unsigned long   dsize_mask;     /* 0010 - Dict size bitmask (0x0F, 0x1F, 0x3F for 0x400, 0x800, 0x1000) */
+    unsigned long   bit_buf;        /* 0014 - 16-bit buffer for processing input data */
+    unsigned long   extra_bits;     /* 0018 - Number of extra (above 8) bits in bit buffer */
+    unsigned int    in_pos;         /* 001C - Position in in_buf */
+    unsigned long   in_bytes;       /* 0020 - Number of bytes in input buffer */
+    void*        param;         /* 0024 - Custom parameter */
+    unsigned int (*read_buf)(char* buf, unsigned  int* size, void* param);      /* 0028 */
+    void (*write_buf)(char* buf, unsigned  int* size, void* param);         /* 002C */
+    unsigned char   out_buf[0x2000];    /* 0030 - Output circle buffer. Starting position is 0x1000 */
+    unsigned char   offs_2030[0x204];   /* 2030 - ??? */
+    unsigned char   in_buf[0x800];      /* 2234 - Buffer for data to be decompressed */
+    unsigned char   pos1[0x100];        /* 2A34 - Positions in buffers */
+    unsigned char   pos2[0x100];        /* 2B34 - Positions in buffers */
+    unsigned char   offs_2c34[0x100];   /* 2C34 - Buffer for */
+    unsigned char   offs_2d34[0x100];   /* 2D34 - Buffer for */
+    unsigned char   offs_2e34[0x80];    /* 2EB4 - Buffer for */
+    unsigned char   offs_2eb4[0x100];   /* 2EB4 - Buffer for */
+    unsigned char   bits_asc[0x100];    /* 2FB4 - Buffer for */
+    unsigned char   dist_bits[0x40];    /* 30B4 - Numbers of bytes to skip copied block length */
+    unsigned char   slen_bits[0x10];    /* 30F4 - Numbers of bits for skip copied block length */
+    unsigned char   clen_bits[0x10];    /* 3104 - Number of valid bits for copied block */
+    unsigned short  len_base[0x10];     /* 3114 - Buffer for */
 } pkzip_data_cmp;
 // __attribute__ ((packed)) pkzip_data_cmp;
 
-typedef struct {
-	char		*in_buf;	/* Pointer to input data buffer */
-	unsigned int	in_pos;		/* Current offset in input data buffer */
-	int		in_bytes;	/* Number of bytes in the input buffer */
-	char		*out_buf;	/* Pointer to output data buffer */
-	unsigned int	out_pos;	/* Position in the output buffer */
-	int		max_out;	/* Maximum number of bytes in the output buffer */
+typedef struct
+{
+    char*        in_buf;    /* Pointer to input data buffer */
+    unsigned int    in_pos;     /* Current offset in input data buffer */
+    int     in_bytes;   /* Number of bytes in the input buffer */
+    char*        out_buf;   /* Pointer to output data buffer */
+    unsigned int    out_pos;    /* Position in the output buffer */
+    int     max_out;    /* Maximum number of bytes in the output buffer */
 } pkzip_data;
 
 extern unsigned int libmpq_pkzip_explode(
-	unsigned int	(*read_buf)(char *buf, unsigned int *size, void *param),
-	void		(*write_buf)(char *buf, unsigned int *size, void *param),
-	char		*work_buf,
-	void		*param
+    unsigned int (*read_buf)(char* buf, unsigned int* size, void* param),
+    void (*write_buf)(char* buf, unsigned int* size, void* param),
+    char*        work_buf,
+    void*        param
 );
 
-#endif					/* _EXPLODE_H */
+#endif                  /* _EXPLODE_H */
diff --git a/contrib/extractor/libmpq/extract.cpp b/contrib/extractor/libmpq/extract.cpp
index 41472b3c426..dd3c7df0275 100644
--- a/contrib/extractor/libmpq/extract.cpp
+++ b/contrib/extractor/libmpq/extract.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
+#ifdef MANGOS_CONFIG_H
 #include "config.h"
 #endif
 
@@ -49,21 +49,23 @@
  *  unsigned int * size - Max. number of bytes to read
  *  void * param        - Custom pointer, parameter of implode/explode
  */
-static unsigned int libmpq_pkzip_read_input_data(char *buf, unsigned int *size, void *param) {
-	pkzip_data *info = (pkzip_data *)param;
-	unsigned int max_avail = (info->in_bytes - info->in_pos);
-	unsigned int to_read = *size;
-
-	/* Check the case when not enough data available */
-	if (to_read > max_avail) {
-		to_read = max_avail;
-	}
-
-	/* Load data and increment offsets */
-	memcpy(buf, info->in_buf + info->in_pos, to_read);
-	info->in_pos += to_read;
-
-	return to_read;
+static unsigned int libmpq_pkzip_read_input_data(char* buf, unsigned int* size, void* param)
+{
+    pkzip_data* info = (pkzip_data*)param;
+    unsigned int max_avail = (info->in_bytes - info->in_pos);
+    unsigned int to_read = *size;
+
+    /* Check the case when not enough data available */
+    if (to_read > max_avail)
+    {
+        to_read = max_avail;
+    }
+
+    /* Load data and increment offsets */
+    memcpy(buf, info->in_buf + info->in_pos, to_read);
+    info->in_pos += to_read;
+
+    return to_read;
 }
 
 /*
@@ -76,77 +78,84 @@ static unsigned int libmpq_pkzip_read_input_data(char *buf, unsigned int *size,
  *  unsigned int * size - Number of bytes to write
  *  void * param        - Custom pointer, parameter of implode/explode
  */
-static void libmpq_pkzip_write_output_data(char *buf, unsigned int *size, void *param) {
-	pkzip_data *info = (pkzip_data *)param;
-	unsigned int max_write = (info->max_out - info->out_pos);
-	unsigned int to_write = *size;
-
-	/* Check the case when not enough space in the output buffer */
-	if (to_write > max_write) {
-		to_write = max_write;
-	}
-
-	/* Write output data and increments offsets */
-	memcpy(info->out_buf + info->out_pos, buf, to_write);
-	info->out_pos += to_write;
+static void libmpq_pkzip_write_output_data(char* buf, unsigned int* size, void* param)
+{
+    pkzip_data* info = (pkzip_data*)param;
+    unsigned int max_write = (info->max_out - info->out_pos);
+    unsigned int to_write = *size;
+
+    /* Check the case when not enough space in the output buffer */
+    if (to_write > max_write)
+    {
+        to_write = max_write;
+    }
+
+    /* Write output data and increments offsets */
+    memcpy(info->out_buf + info->out_pos, buf, to_write);
+    info->out_pos += to_write;
 }
 
-int libmpq_pkzip_decompress(char *out_buf, int *out_length, char *in_buf, int in_length) {
-	pkzip_data info;					/* Data information */
-	char *work_buf = (char *)malloc(LIBMPQ_PKZIP_EXP_BUFFER_SIZE);	/* mpq_pkzip work buffer */
-
-	/* Fill data information structure */
-	info.in_buf   = in_buf;
-	info.in_pos   = 0;
-	info.in_bytes = in_length;
-	info.out_buf  = out_buf;
-	info.out_pos  = 0;
-	info.max_out  = *out_length;
-
-	/* Do the decompression */
-	libmpq_pkzip_explode(libmpq_pkzip_read_input_data, libmpq_pkzip_write_output_data, work_buf, &info);
-	*out_length = info.out_pos;
-	free(work_buf);
-	return 0;
+int libmpq_pkzip_decompress(char* out_buf, int* out_length, char* in_buf, int in_length)
+{
+    pkzip_data info;                    /* Data information */
+    char* work_buf = (char*)malloc(LIBMPQ_PKZIP_EXP_BUFFER_SIZE);   /* mpq_pkzip work buffer */
+
+    /* Fill data information structure */
+    info.in_buf   = in_buf;
+    info.in_pos   = 0;
+    info.in_bytes = in_length;
+    info.out_buf  = out_buf;
+    info.out_pos  = 0;
+    info.max_out  = *out_length;
+
+    /* Do the decompression */
+    libmpq_pkzip_explode(libmpq_pkzip_read_input_data, libmpq_pkzip_write_output_data, work_buf, &info);
+    *out_length = info.out_pos;
+    free(work_buf);
+    return 0;
 }
 
-int libmpq_wave_decompress_mono(char *out_buf, int *out_length, char *in_buf, int in_length) {
-	*out_length = libmpq_wave_decompress((unsigned char *)out_buf, *out_length, (unsigned char *)in_buf, in_length, 1);
-	return 1;
+int libmpq_wave_decompress_mono(char* out_buf, int* out_length, char* in_buf, int in_length)
+{
+    *out_length = libmpq_wave_decompress((unsigned char*)out_buf, *out_length, (unsigned char*)in_buf, in_length, 1);
+    return 1;
 }
 
-int libmpq_wave_decompress_stereo(char *out_buf, int *out_length, char *in_buf, int in_length) {
-	*out_length = libmpq_wave_decompress((unsigned char *)out_buf, *out_length, (unsigned char *)in_buf, in_length, 2);
-	return 1;
+int libmpq_wave_decompress_stereo(char* out_buf, int* out_length, char* in_buf, int in_length)
+{
+    *out_length = libmpq_wave_decompress((unsigned char*)out_buf, *out_length, (unsigned char*)in_buf, in_length, 2);
+    return 1;
 }
 
-int libmpq_zlib_decompress(char *out_buf, int *out_length, char *in_buf, int in_length) {
+int libmpq_zlib_decompress(char* out_buf, int* out_length, char* in_buf, int in_length)
+{
 #ifdef HAVE_LIBZ
-	z_stream z;					/* Stream information for zlib */
-	int result;
-
-	/* Fill the stream structure for zlib */
-	z.next_in   = (Bytef *)in_buf;
-	z.avail_in  = (uInt)in_length;
-	z.total_in  = in_length;
-	z.next_out  = (Bytef *)out_buf;
-	z.avail_out = *out_length;
-	z.total_out = 0;
-	z.zalloc    = NULL;
-	z.zfree     = NULL;
-
-	/* Initialize the decompression structure. Storm.dll uses zlib version 1.1.3 */
-	if ((result = inflateInit(&z)) == 0) {
-
-		/* Call zlib to decompress the data */
-		result = inflate(&z, Z_FINISH);
-		*out_length = z.total_out;
-		inflateEnd(&z);
-	}
-	return result;
+    z_stream z;                 /* Stream information for zlib */
+    int result;
+
+    /* Fill the stream structure for zlib */
+    z.next_in   = (Bytef*)in_buf;
+    z.avail_in  = (uInt)in_length;
+    z.total_in  = in_length;
+    z.next_out  = (Bytef*)out_buf;
+    z.avail_out = *out_length;
+    z.total_out = 0;
+    z.zalloc    = NULL;
+    z.zfree     = NULL;
+
+    /* Initialize the decompression structure. Storm.dll uses zlib version 1.1.3 */
+    if ((result = inflateInit(&z)) == 0)
+    {
+
+        /* Call zlib to decompress the data */
+        result = inflate(&z, Z_FINISH);
+        *out_length = z.total_out;
+        inflateEnd(&z);
+    }
+    return result;
 #else
-	memset(out_buf, '0', *out_length);
-	return 0;
+    memset(out_buf, '0', *out_length);
+    return 0;
 #endif
 }
 
@@ -156,107 +165,119 @@ int libmpq_zlib_decompress(char *out_buf, int *out_length, char *in_buf, int in_
  *
  *  1500F5F0
  */
-int libmpq_huff_decompress(char *out_buf, int *out_length, char *in_buf, int in_length) {
-	struct huffman_tree		*ht = (huffman_tree *)malloc(sizeof(struct huffman_tree));
-	struct huffman_input_stream	*is = (huffman_input_stream *)malloc(sizeof(struct huffman_input_stream));
-	struct huffman_tree_item	*hi = (huffman_tree_item *)malloc(sizeof(struct huffman_tree_item));
-	memset(ht, 0, sizeof(struct huffman_tree));
-	memset(is, 0, sizeof(struct huffman_input_stream));
-	memset(hi, 0, sizeof(struct huffman_tree_item));
-
-	/* Initialize input stream */
-	is->bit_buf  = *(unsigned long *)in_buf;
-	in_buf      += sizeof(unsigned long);
-	is->in_buf   = (unsigned char *)in_buf;
-	is->bits     = 32;
-
-	/* Initialize the Huffmann tree for decompression */
-	libmpq_huff_init_tree(ht, hi, LIBMPQ_HUFF_DECOMPRESS);
-
-	*out_length = libmpq_huff_do_decompress(ht, is, (unsigned char *)out_buf, *out_length);
-
-	free(hi);
-	free(is);
-	free(ht);
-	return 0;
+int libmpq_huff_decompress(char* out_buf, int* out_length, char* in_buf, int in_length)
+{
+    struct huffman_tree*     ht = (huffman_tree*)malloc(sizeof(struct huffman_tree));
+    struct huffman_input_stream* is = (huffman_input_stream*)malloc(sizeof(struct huffman_input_stream));
+    struct huffman_tree_item*    hi = (huffman_tree_item*)malloc(sizeof(struct huffman_tree_item));
+    memset(ht, 0, sizeof(struct huffman_tree));
+    memset(is, 0, sizeof(struct huffman_input_stream));
+    memset(hi, 0, sizeof(struct huffman_tree_item));
+
+    /* Initialize input stream */
+    is->bit_buf  = *(unsigned long*)in_buf;
+    in_buf      += sizeof(unsigned long);
+    is->in_buf   = (unsigned char*)in_buf;
+    is->bits     = 32;
+
+    /* Initialize the Huffmann tree for decompression */
+    libmpq_huff_init_tree(ht, hi, LIBMPQ_HUFF_DECOMPRESS);
+
+    *out_length = libmpq_huff_do_decompress(ht, is, (unsigned char*)out_buf, *out_length);
+
+    free(hi);
+    free(is);
+    free(ht);
+    return 0;
 }
 
-int libmpq_multi_decompress(char *out_buf, int *pout_length, char *in_buf, int in_length) {
-	char		*temp_buf = NULL;		/* Temporary storage for decompressed data */
-	char		*work_buf = NULL;		/* Where to store decompressed data */
-	int		out_length = *pout_length;	/* For storage number of output bytes */
-	unsigned	fDecompressions1;		/* Decompressions applied to the block */
-	unsigned	fDecompressions2;		/* Just another copy of decompressions applied to the block */
-	int		count = 0;			/* Counter for every use */
-	int		entries = (sizeof(dcmp_table) / sizeof(decompress_table));
-	int		i;
-
-	/* If the input length is the same as output, do nothing. */
-	if (in_length == out_length) {
-		if (in_buf == out_buf) {
-			return 1;
-		}
-		memcpy(out_buf, in_buf, in_length);
-		return 1;
-	}
-
-	/* Get applied compression types and decrement data length */
-	fDecompressions1 = fDecompressions2 = (unsigned char)*in_buf++;
-	in_length--;
-
-	/* Search decompression table type and get all types of compression */
-	for (i = 0; i < entries; i++) {
-		/* We have to apply this decompression? */
-		if (fDecompressions1 & dcmp_table[i].mask) {
-			count++;
-		}
-
-		/* Clear this flag from temporary variable. */
-		fDecompressions2 &= ~dcmp_table[i].mask;
-	}
-
-	/*
-	 *  Check if there is some method unhandled
-	 *  (E.g. compressed by future versions)
-	 */
-	if (fDecompressions2 != 0) {
-		printf("Unknown Compression\n");
-		return 0;
-	}
-
-	/* If there is more than only one compression, we have to allocate extra buffer */
-	if (count >= 2) {
-		temp_buf = (char *)malloc(out_length);
-	}
-
-	/* Apply all decompressions */
-	for (i = 0, count = 0; i < entries; i++) {
-
-		/* If not used this kind of compression, skip the loop */
-		if (fDecompressions1 & dcmp_table[i].mask) {
-
-			/* If odd case, use target buffer for output, otherwise use allocated tempbuf */
-			work_buf = (count++ & 1) ? temp_buf : out_buf;
-			out_length = *pout_length;
-
-			/* Decompress buffer using corresponding function */
-			dcmp_table[i].decompress(work_buf, &out_length, in_buf, in_length);
-
-			/* Move output length to src length for next compression */
-			in_length = out_length;
-			in_buf = work_buf;
-		}
-	}
-
-	/* If output buffer is not the same like target buffer, we have to copy data */
-	if (work_buf != out_buf) {
-		memcpy(out_buf, in_buf, out_length);
-	}
-	*pout_length = out_length;
-
-	/* Delete temporary buffer, if necessary */
-	if (temp_buf != NULL) {
-		free(temp_buf);
-	}
-	return 1;
+int libmpq_multi_decompress(char* out_buf, int* pout_length, char* in_buf, int in_length)
+{
+    char*        temp_buf = NULL;       /* Temporary storage for decompressed data */
+    char*        work_buf = NULL;       /* Where to store decompressed data */
+    int     out_length = *pout_length;  /* For storage number of output bytes */
+    unsigned    fDecompressions1;       /* Decompressions applied to the block */
+    unsigned    fDecompressions2;       /* Just another copy of decompressions applied to the block */
+    int     count = 0;          /* Counter for every use */
+    int     entries = (sizeof(dcmp_table) / sizeof(decompress_table));
+    int     i;
+
+    /* If the input length is the same as output, do nothing. */
+    if (in_length == out_length)
+    {
+        if (in_buf == out_buf)
+        {
+            return 1;
+        }
+        memcpy(out_buf, in_buf, in_length);
+        return 1;
+    }
+
+    /* Get applied compression types and decrement data length */
+    fDecompressions1 = fDecompressions2 = (unsigned char) * in_buf++;
+    in_length--;
+
+    /* Search decompression table type and get all types of compression */
+    for (i = 0; i < entries; i++)
+    {
+        /* We have to apply this decompression? */
+        if (fDecompressions1 & dcmp_table[i].mask)
+        {
+            count++;
+        }
+
+        /* Clear this flag from temporary variable. */
+        fDecompressions2 &= ~dcmp_table[i].mask;
+    }
+
+    /*
+     *  Check if there is some method unhandled
+     *  (E.g. compressed by future versions)
+     */
+    if (fDecompressions2 != 0)
+    {
+        printf("Unknown Compression\n");
+        return 0;
+    }
+
+    /* If there is more than only one compression, we have to allocate extra buffer */
+    if (count >= 2)
+    {
+        temp_buf = (char*)malloc(out_length);
+    }
+
+    /* Apply all decompressions */
+    for (i = 0, count = 0; i < entries; i++)
+    {
+
+        /* If not used this kind of compression, skip the loop */
+        if (fDecompressions1 & dcmp_table[i].mask)
+        {
+
+            /* If odd case, use target buffer for output, otherwise use allocated tempbuf */
+            work_buf = (count++ & 1) ? temp_buf : out_buf;
+            out_length = *pout_length;
+
+            /* Decompress buffer using corresponding function */
+            dcmp_table[i].decompress(work_buf, &out_length, in_buf, in_length);
+
+            /* Move output length to src length for next compression */
+            in_length = out_length;
+            in_buf = work_buf;
+        }
+    }
+
+    /* If output buffer is not the same like target buffer, we have to copy data */
+    if (work_buf != out_buf)
+    {
+        memcpy(out_buf, in_buf, out_length);
+    }
+    *pout_length = out_length;
+
+    /* Delete temporary buffer, if necessary */
+    if (temp_buf != NULL)
+    {
+        free(temp_buf);
+    }
+    return 1;
 }
diff --git a/contrib/extractor/libmpq/huffman.cpp b/contrib/extractor/libmpq/huffman.cpp
index 0c5fee3d87d..df3232c505b 100644
--- a/contrib/extractor/libmpq/huffman.cpp
+++ b/contrib/extractor/libmpq/huffman.cpp
@@ -35,799 +35,913 @@
 #include "mpq.h"
 #include "huffman.h"
 
-unsigned char table1502A630[] = {
-
-	/* Data for compression type 0x00 */
-	0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-	0x00, 0x00,
-
-	/* Data for compression type 0x01 */
-	0x54, 0x16, 0x16, 0x0D, 0x0C, 0x08, 0x06, 0x05, 0x06, 0x05, 0x06, 0x03, 0x04, 0x04, 0x03, 0x05,
-	0x0E, 0x0B, 0x14, 0x13, 0x13, 0x09, 0x0B, 0x06, 0x05, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02,
-	0x0D, 0x07, 0x09, 0x06, 0x06, 0x04, 0x03, 0x02, 0x04, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02,
-	0x09, 0x06, 0x04, 0x04, 0x04, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x04,
-	0x08, 0x03, 0x04, 0x07, 0x09, 0x05, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02,
-	0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02,
-	0x06, 0x0A, 0x08, 0x08, 0x06, 0x07, 0x04, 0x03, 0x04, 0x04, 0x02, 0x02, 0x04, 0x02, 0x03, 0x03,
-	0x04, 0x03, 0x07, 0x07, 0x09, 0x06, 0x04, 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02,
-	0x0A, 0x02, 0x02, 0x03, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x03, 0x05, 0x02, 0x03,
-	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x03, 0x01, 0x01, 0x01,
-	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x04, 0x04, 0x07, 0x09, 0x08, 0x0C, 0x02,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x03,
-	0x04, 0x01, 0x02, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
-	0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x4B,
-	0x00, 0x00,
-
-	/* Data for compression type 0x02 */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x27, 0x00, 0x00, 0x23, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x06, 0x0E, 0x10, 0x04,
-	0x06, 0x08, 0x05, 0x04, 0x04, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x01, 0x01, 0x02, 0x01, 0x01,
-	0x01, 0x04, 0x02, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x04, 0x01, 0x01, 0x02, 0x03, 0x03, 0x02,
-	0x03, 0x01, 0x03, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x01,
-	0x01, 0x29, 0x07, 0x16, 0x12, 0x40, 0x0A, 0x0A, 0x11, 0x25, 0x01, 0x03, 0x17, 0x10, 0x26, 0x2A,
-	0x10, 0x01, 0x23, 0x23, 0x2F, 0x10, 0x06, 0x07, 0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00,
-
-	/* Data for compression type 0x03 */
-	0xFF, 0x0B, 0x07, 0x05, 0x0B, 0x02, 0x02, 0x02, 0x06, 0x02, 0x02, 0x01, 0x04, 0x02, 0x01, 0x03,
-	0x09, 0x01, 0x01, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
-	0x05, 0x01, 0x01, 0x01, 0x0D, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x02, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
-	0x0A, 0x04, 0x02, 0x01, 0x06, 0x03, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01,
-	0x05, 0x02, 0x03, 0x04, 0x03, 0x03, 0x03, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x03, 0x03,
-	0x01, 0x03, 0x01, 0x01, 0x02, 0x05, 0x01, 0x01, 0x04, 0x03, 0x05, 0x01, 0x03, 0x01, 0x03, 0x03,
-	0x02, 0x01, 0x04, 0x03, 0x0A, 0x06, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x02, 0x02, 0x01, 0x0A, 0x02, 0x05, 0x01, 0x01, 0x02, 0x07, 0x02, 0x17, 0x01, 0x05, 0x01, 0x01,
-	0x0E, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x06, 0x02, 0x01, 0x04, 0x05, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
-	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x11,
-	0x00, 0x00,
-
-	/* Data for compression type 0x04 */
-	0xFF, 0xFB, 0x98, 0x9A, 0x84, 0x85, 0x63, 0x64, 0x3E, 0x3E, 0x22, 0x22, 0x13, 0x13, 0x18, 0x17,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00,
-
-	/* Data for compression type 0x05 */
-	0xFF, 0xF1, 0x9D, 0x9E, 0x9A, 0x9B, 0x9A, 0x97, 0x93, 0x93, 0x8C, 0x8E, 0x86, 0x88, 0x80, 0x82,
-	0x7C, 0x7C, 0x72, 0x73, 0x69, 0x6B, 0x5F, 0x60, 0x55, 0x56, 0x4A, 0x4B, 0x40, 0x41, 0x37, 0x37,
-	0x2F, 0x2F, 0x27, 0x27, 0x21, 0x21, 0x1B, 0x1C, 0x17, 0x17, 0x13, 0x13, 0x10, 0x10, 0x0D, 0x0D,
-	0x0B, 0x0B, 0x09, 0x09, 0x08, 0x08, 0x07, 0x07, 0x06, 0x05, 0x05, 0x04, 0x04, 0x04, 0x19, 0x18,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00,
-
-	/* Data for compression type 0x06 */
-	0xC3, 0xCB, 0xF5, 0x41, 0xFF, 0x7B, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xBF, 0xCC, 0xF2, 0x40, 0xFD, 0x7C, 0xF7, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x7A, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00,
-
-	/* Data for compression type 0x07 */
-	0xC3, 0xD9, 0xEF, 0x3D, 0xF9, 0x7C, 0xE9, 0x1E, 0xFD, 0xAB, 0xF1, 0x2C, 0xFC, 0x5B, 0xFE, 0x17,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xBD, 0xD9, 0xEC, 0x3D, 0xF5, 0x7D, 0xE8, 0x1D, 0xFB, 0xAE, 0xF0, 0x2C, 0xFB, 0x5C, 0xFF, 0x18,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x70, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00,
-
-	/* Data for compression type 0x08 */
-	0xBA, 0xC5, 0xDA, 0x33, 0xE3, 0x6D, 0xD8, 0x18, 0xE5, 0x94, 0xDA, 0x23, 0xDF, 0x4A, 0xD1, 0x10,
-	0xEE, 0xAF, 0xE4, 0x2C, 0xEA, 0x5A, 0xDE, 0x15, 0xF4, 0x87, 0xE9, 0x21, 0xF6, 0x43, 0xFC, 0x12,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xB0, 0xC7, 0xD8, 0x33, 0xE3, 0x6B, 0xD6, 0x18, 0xE7, 0x95, 0xD8, 0x23, 0xDB, 0x49, 0xD0, 0x11,
-	0xE9, 0xB2, 0xE2, 0x2B, 0xE8, 0x5C, 0xDD, 0x15, 0xF1, 0x87, 0xE7, 0x20, 0xF7, 0x44, 0xFF, 0x13,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x5F, 0x9E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00
+unsigned char table1502A630[] =
+{
+
+    /* Data for compression type 0x00 */
+    0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+    0x00, 0x00,
+
+    /* Data for compression type 0x01 */
+    0x54, 0x16, 0x16, 0x0D, 0x0C, 0x08, 0x06, 0x05, 0x06, 0x05, 0x06, 0x03, 0x04, 0x04, 0x03, 0x05,
+    0x0E, 0x0B, 0x14, 0x13, 0x13, 0x09, 0x0B, 0x06, 0x05, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02,
+    0x0D, 0x07, 0x09, 0x06, 0x06, 0x04, 0x03, 0x02, 0x04, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02,
+    0x09, 0x06, 0x04, 0x04, 0x04, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x04,
+    0x08, 0x03, 0x04, 0x07, 0x09, 0x05, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02,
+    0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02,
+    0x06, 0x0A, 0x08, 0x08, 0x06, 0x07, 0x04, 0x03, 0x04, 0x04, 0x02, 0x02, 0x04, 0x02, 0x03, 0x03,
+    0x04, 0x03, 0x07, 0x07, 0x09, 0x06, 0x04, 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02,
+    0x0A, 0x02, 0x02, 0x03, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x03, 0x05, 0x02, 0x03,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x03, 0x01, 0x01, 0x01,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x04, 0x04, 0x07, 0x09, 0x08, 0x0C, 0x02,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x03,
+    0x04, 0x01, 0x02, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+    0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x4B,
+    0x00, 0x00,
+
+    /* Data for compression type 0x02 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x27, 0x00, 0x00, 0x23, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x06, 0x0E, 0x10, 0x04,
+    0x06, 0x08, 0x05, 0x04, 0x04, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x01, 0x01, 0x02, 0x01, 0x01,
+    0x01, 0x04, 0x02, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x04, 0x01, 0x01, 0x02, 0x03, 0x03, 0x02,
+    0x03, 0x01, 0x03, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x01,
+    0x01, 0x29, 0x07, 0x16, 0x12, 0x40, 0x0A, 0x0A, 0x11, 0x25, 0x01, 0x03, 0x17, 0x10, 0x26, 0x2A,
+    0x10, 0x01, 0x23, 0x23, 0x2F, 0x10, 0x06, 0x07, 0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+
+    /* Data for compression type 0x03 */
+    0xFF, 0x0B, 0x07, 0x05, 0x0B, 0x02, 0x02, 0x02, 0x06, 0x02, 0x02, 0x01, 0x04, 0x02, 0x01, 0x03,
+    0x09, 0x01, 0x01, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+    0x05, 0x01, 0x01, 0x01, 0x0D, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x02, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
+    0x0A, 0x04, 0x02, 0x01, 0x06, 0x03, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01,
+    0x05, 0x02, 0x03, 0x04, 0x03, 0x03, 0x03, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x03, 0x03,
+    0x01, 0x03, 0x01, 0x01, 0x02, 0x05, 0x01, 0x01, 0x04, 0x03, 0x05, 0x01, 0x03, 0x01, 0x03, 0x03,
+    0x02, 0x01, 0x04, 0x03, 0x0A, 0x06, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x02, 0x02, 0x01, 0x0A, 0x02, 0x05, 0x01, 0x01, 0x02, 0x07, 0x02, 0x17, 0x01, 0x05, 0x01, 0x01,
+    0x0E, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x06, 0x02, 0x01, 0x04, 0x05, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x11,
+    0x00, 0x00,
+
+    /* Data for compression type 0x04 */
+    0xFF, 0xFB, 0x98, 0x9A, 0x84, 0x85, 0x63, 0x64, 0x3E, 0x3E, 0x22, 0x22, 0x13, 0x13, 0x18, 0x17,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+
+    /* Data for compression type 0x05 */
+    0xFF, 0xF1, 0x9D, 0x9E, 0x9A, 0x9B, 0x9A, 0x97, 0x93, 0x93, 0x8C, 0x8E, 0x86, 0x88, 0x80, 0x82,
+    0x7C, 0x7C, 0x72, 0x73, 0x69, 0x6B, 0x5F, 0x60, 0x55, 0x56, 0x4A, 0x4B, 0x40, 0x41, 0x37, 0x37,
+    0x2F, 0x2F, 0x27, 0x27, 0x21, 0x21, 0x1B, 0x1C, 0x17, 0x17, 0x13, 0x13, 0x10, 0x10, 0x0D, 0x0D,
+    0x0B, 0x0B, 0x09, 0x09, 0x08, 0x08, 0x07, 0x07, 0x06, 0x05, 0x05, 0x04, 0x04, 0x04, 0x19, 0x18,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+
+    /* Data for compression type 0x06 */
+    0xC3, 0xCB, 0xF5, 0x41, 0xFF, 0x7B, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xBF, 0xCC, 0xF2, 0x40, 0xFD, 0x7C, 0xF7, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x7A, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+
+    /* Data for compression type 0x07 */
+    0xC3, 0xD9, 0xEF, 0x3D, 0xF9, 0x7C, 0xE9, 0x1E, 0xFD, 0xAB, 0xF1, 0x2C, 0xFC, 0x5B, 0xFE, 0x17,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xBD, 0xD9, 0xEC, 0x3D, 0xF5, 0x7D, 0xE8, 0x1D, 0xFB, 0xAE, 0xF0, 0x2C, 0xFB, 0x5C, 0xFF, 0x18,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x70, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+
+    /* Data for compression type 0x08 */
+    0xBA, 0xC5, 0xDA, 0x33, 0xE3, 0x6D, 0xD8, 0x18, 0xE5, 0x94, 0xDA, 0x23, 0xDF, 0x4A, 0xD1, 0x10,
+    0xEE, 0xAF, 0xE4, 0x2C, 0xEA, 0x5A, 0xDE, 0x15, 0xF4, 0x87, 0xE9, 0x21, 0xF6, 0x43, 0xFC, 0x12,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xB0, 0xC7, 0xD8, 0x33, 0xE3, 0x6B, 0xD6, 0x18, 0xE7, 0x95, 0xD8, 0x23, 0xDB, 0x49, 0xD0, 0x11,
+    0xE9, 0xB2, 0xE2, 0x2B, 0xE8, 0x5C, 0xDD, 0x15, 0xF1, 0x87, 0xE7, 0x20, 0xF7, 0x44, 0xFF, 0x13,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x5F, 0x9E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00
 };
 
 /* Gets previous Huffman tree item (?) */
-struct huffman_tree_item *libmpq_huff_get_prev_item(struct huffman_tree_item *hi, long value) {
-	if (PTR_INT(hi->prev) < 0) {
-		return PTR_NOT(hi->prev);
-	}
-	if (value < 0) {
-		value = hi - hi->next->prev;
-	}
-	return hi->prev + value;
+struct huffman_tree_item* libmpq_huff_get_prev_item(struct huffman_tree_item* hi, long value)
+{
+    if (PTR_INT(hi->prev) < 0)
+    {
+        return PTR_NOT(hi->prev);
+    }
+    if (value < 0)
+    {
+        value = hi - hi->next->prev;
+    }
+    return hi->prev + value;
 }
 
 /* 1500BC90 */
-static void libmpq_huff_remove_item(struct huffman_tree_item *hi) {
-	struct huffman_tree_item *temp;			/* EDX */
-
-	if (hi->next != NULL) {
-		temp = hi->prev;
-		if (PTR_INT(temp) <= 0) {
-			temp = PTR_NOT(temp);
-		} else {
-			temp += (hi - hi->next->prev);
-		}
-		temp->next          = hi->next;
-		hi->next->prev      = hi->prev;
-		hi->next = hi->prev = NULL;
-	}
+static void libmpq_huff_remove_item(struct huffman_tree_item* hi)
+{
+    struct huffman_tree_item* temp;         /* EDX */
+
+    if (hi->next != NULL)
+    {
+        temp = hi->prev;
+        if (PTR_INT(temp) <= 0)
+        {
+            temp = PTR_NOT(temp);
+        }
+        else
+        {
+            temp += (hi - hi->next->prev);
+        }
+        temp->next          = hi->next;
+        hi->next->prev      = hi->prev;
+        hi->next = hi->prev = NULL;
+    }
 }
 
-static void libmpq_huff_insert_item(struct huffman_tree_item **p_item, struct huffman_tree_item *item, unsigned long where, struct huffman_tree_item *item2) {
-	struct huffman_tree_item *next = item->next;	/* EDI - next to the first item */
-	struct huffman_tree_item *prev = item->prev;	/* ESI - prev to the first item */
-	struct huffman_tree_item *prev2;		/* Pointer to previous item */
-	long next2;					/* Pointer to the next item */
-
-	/* The same code like in mpq_huff_remove_item(); */
-	if (next != 0) {				/* If the first item already has next one */
-		if (PTR_INT(prev) < 0) {
-			prev = PTR_NOT(prev);
-		} else {
-			prev += (item - next->prev);
-		}
-
-		/*
-		 * 150083C1
-		 * Remove the item from the tree
-		 */
-		prev->next = next;
-		next->prev = prev;
-
-		/* Invalidate 'prev' and 'next' pointer */
-		item->next = 0;
-		item->prev = 0;
-	}
-
-	if (item2 == NULL) {				/* EDX - If the second item is not entered, */
-		item2 = PTR_PTR(&p_item[1]);		/* take the first tree item */
-	}
-
-	switch (where) {
-		case SWITCH_ITEMS:			/* Switch the two items */
-			item->next  = item2->next;	/* item2->next (Pointer to pointer to first) */
-			item->prev  = item2->next->prev;
-			item2->next->prev = item;
-			item2->next = item;		/* Set the first item */
-			return;
-		case INSERT_ITEM:			/* Insert as the last item */
-			item->next = item2;		/* Set next item (or pointer to pointer to first item) */
-			item->prev = item2->prev;	/* Set prev item (or last item in the tree) */
-			next2 = PTR_INT(p_item[0]);	/* Usually NULL */
-			prev2 = item2->prev;		/* Prev item to the second (or last tree item) */
-			if (PTR_INT(prev2) < 0) {
-				prev2 = PTR_NOT(prev);
-				prev2->next = item;
-				item2->prev = item;	/* Next after last item */
-				return;
-			}
-			if (next2 < 0) {
-				next2 = item2 - item2->next->prev;
-			}
-			prev2 += next2;
-			prev2->next = item;
-			item2->prev = item;		/* Set the next/last item */
-			return;
-		default:
-			return;
-	}
+static void libmpq_huff_insert_item(struct huffman_tree_item** p_item, struct huffman_tree_item* item, unsigned long where, struct huffman_tree_item* item2)
+{
+    struct huffman_tree_item* next = item->next;    /* EDI - next to the first item */
+    struct huffman_tree_item* prev = item->prev;    /* ESI - prev to the first item */
+    struct huffman_tree_item* prev2;        /* Pointer to previous item */
+    long next2;                 /* Pointer to the next item */
+
+    /* The same code like in mpq_huff_remove_item(); */
+    if (next != 0)                  /* If the first item already has next one */
+    {
+        if (PTR_INT(prev) < 0)
+        {
+            prev = PTR_NOT(prev);
+        }
+        else
+        {
+            prev += (item - next->prev);
+        }
+
+        /*
+         * 150083C1
+         * Remove the item from the tree
+         */
+        prev->next = next;
+        next->prev = prev;
+
+        /* Invalidate 'prev' and 'next' pointer */
+        item->next = 0;
+        item->prev = 0;
+    }
+
+    if (item2 == NULL)                  /* EDX - If the second item is not entered, */
+    {
+        item2 = PTR_PTR(&p_item[1]);        /* take the first tree item */
+    }
+
+    switch (where)
+    {
+        case SWITCH_ITEMS:          /* Switch the two items */
+            item->next  = item2->next;  /* item2->next (Pointer to pointer to first) */
+            item->prev  = item2->next->prev;
+            item2->next->prev = item;
+            item2->next = item;     /* Set the first item */
+            return;
+        case INSERT_ITEM:           /* Insert as the last item */
+            item->next = item2;     /* Set next item (or pointer to pointer to first item) */
+            item->prev = item2->prev;   /* Set prev item (or last item in the tree) */
+            next2 = PTR_INT(p_item[0]); /* Usually NULL */
+            prev2 = item2->prev;        /* Prev item to the second (or last tree item) */
+            if (PTR_INT(prev2) < 0)
+            {
+                prev2 = PTR_NOT(prev);
+                prev2->next = item;
+                item2->prev = item; /* Next after last item */
+                return;
+            }
+            if (next2 < 0)
+            {
+                next2 = item2 - item2->next->prev;
+            }
+            prev2 += next2;
+            prev2->next = item;
+            item2->prev = item;     /* Set the next/last item */
+            return;
+        default:
+            return;
+    }
 }
 
 /* Builds Huffman tree. Called with the first 8 bits loaded from input stream. */
-static void libmpq_huff_build_tree(struct huffman_tree *ht, unsigned int cmp_type) {
-	unsigned long max_byte;				/* [ESP+10] - The greatest character found in table */
-	unsigned char *byte_array;			/* [ESP+1C] - Pointer to unsigned char in table1502A630 */
-	unsigned long i;				/* egcs in linux doesn't like multiple for loops without an explicit i */
-	unsigned int found;				/* Thats needed to replace the goto stuff from original source :) */
-	struct huffman_tree_item **p_item;		/* [ESP+14] - Pointer to Huffman tree item pointer array */
-	struct huffman_tree_item *child1;
-
-	/* Loop while pointer has a negative value. */
-	while (PTR_INT(ht->last) > 0) {			/* ESI - Last entry */
-		struct huffman_tree_item *temp;		/* EAX */
-
-		if (ht->last->next != NULL) {		/* ESI->next */
-			libmpq_huff_remove_item(ht->last);
-		}
-		ht->item3058   = PTR_PTR(&ht->item3054);/* [EDI+4] */
-		ht->last->prev = ht->item3058;		/* EAX */
-		temp           = libmpq_huff_get_prev_item(PTR_PTR(&ht->item3054), PTR_INT(&ht->item3050));
-		temp->next     = ht->last;
-		ht->item3054   = ht->last;
-	}
-
-	/* Clear all pointers in huffman tree item array. */
-	memset(ht->items306C, 0, sizeof(ht->items306C));
-
-	max_byte = 0;					/* Greatest character found init to zero. */
-	p_item = (struct huffman_tree_item **)&ht->items306C;	/* Pointer to current entry in huffman tree item pointer array */
-
-	/* Ensure we have low 8 bits only */
-	cmp_type   &= 0xFF;
-	byte_array  = table1502A630 + cmp_type * 258;	/* EDI also */
-
-	for (i = 0; i < 0x100; i++, p_item++) {
-		struct huffman_tree_item *item = ht->item3058;	/* Item to be created */
-		struct huffman_tree_item *p_item3 = ht->item3058;
-		unsigned char one_byte = byte_array[i];
-
-		/* Skip all the bytes which are zero. */
-		if (byte_array[i] == 0) {
-			continue;
-		}
-
-		/* If not valid pointer, take the first available item in the array. */
-		if (PTR_INT(item) <= 0) {
-			item = &ht->items0008[ht->items++];
-		}
-
-		/* Insert this item as the top of the tree. */
-		libmpq_huff_insert_item(&ht->item305C, item, SWITCH_ITEMS, NULL);
-
-		item->parent    = NULL;			/* Invalidate child and parent */
-		item->child     = NULL;
-		*p_item         = item;			/* Store pointer into pointer array */
-
-		item->dcmp_byte  = i;			/* Store counter */
-		item->byte_value = one_byte;		/* Store byte value */
-		if (one_byte >= max_byte) {
-			max_byte = one_byte;
-			continue;
-		}
-
-		/* Find the first item which has byte value greater than current one byte */
-		found = 0;
-		if (PTR_INT((p_item3 = ht->last)) > 0) {/* EDI - Pointer to the last item */
-
-			/* 15006AF7 */
-			if (p_item3 != NULL) {
-				do {			/* 15006AFB */
-					if (p_item3->byte_value >= one_byte) {
-						found = 1;
-						break;
-					}
-					p_item3 = p_item3->prev;
-				} while (PTR_INT(p_item3) > 0);
-			}
-		}
-
-		if (found == 0) {
-			p_item3 = NULL;
-		}
-
-		/* 15006B09 */
-		if (item->next != NULL) {
-			libmpq_huff_remove_item(item);
-		}
-
-		/* 15006B15 */
-		if (p_item3 == NULL) {
-			p_item3 = PTR_PTR(&ht->first);
-		}
-
-		/* 15006B1F */
-		item->next = p_item3->next;
-		item->prev = p_item3->next->prev;
-		p_item3->next->prev = item;
-		p_item3->next = item;
-	}
-
-	/* 15006B4A */
-	for (; i < 0x102; i++) {
-		struct huffman_tree_item **p_item2 = &ht->items306C[i];	/* EDI */
-
-		/* 15006B59  */
-		struct huffman_tree_item *item2 = ht->item3058;	/* ESI */
-		if (PTR_INT(item2) <= 0) {
-			item2 = &ht->items0008[ht->items++];
-		}
-		libmpq_huff_insert_item(&ht->item305C, item2, INSERT_ITEM, NULL);
-
-		/* 15006B89 */
-		item2->dcmp_byte  = i;
-		item2->byte_value = 1;
-		item2->parent     = NULL;
-		item2->child      = NULL;
-		*p_item2++        = item2;
-	}
-
-	/* 15006BAA */
-	if (PTR_INT((child1 = ht->last)) > 0) {		/* EDI - last item (first child to item */
-		struct huffman_tree_item *child2;	/* EBP */
-		struct huffman_tree_item *item;		/* ESI */
-
-		/* 15006BB8 */
-		while (PTR_INT((child2 = child1->prev)) > 0) {
-			if (PTR_INT((item = ht->item3058)) <= 0) {
-				item = &ht->items0008[ht->items++];
-			}
-			/* 15006BE3 */
-			libmpq_huff_insert_item(&ht->item305C, item, SWITCH_ITEMS, NULL);
-
-			/* 15006BF3 */
-			item->parent = NULL;
-			item->child  = NULL;
-
-			/*
-			 * EDX = child2->byte_value + child1->byte_value;
-			 * EAX = child1->byte_value;
-			 * ECX = max_byte;		The greatest character (0xFF usually)
-			 */
-			item->byte_value = child1->byte_value + child2->byte_value;	/* 0x02 */
-			item->child      = child1;	/* Prev item in the */
-			child1->parent   = item;
-			child2->parent   = item;
-
-			/* EAX = item->byte_value; */
-			if (item->byte_value >= max_byte) {
-				max_byte = item->byte_value;
-			} else {
-				struct huffman_tree_item *p_item2 = child2->prev;	/* EDI */
-				found = 0;
-				if (PTR_INT(p_item2) > 0) {
-
-					/* 15006C2D */
-					do {
-						if (p_item2->byte_value >= item->byte_value) {
-							found = 1;
-							break;
-						}
-						p_item2 = p_item2->prev;
-					} while (PTR_INT(p_item2) > 0);
-				}
-				if (found == 0) {
-					p_item2 = NULL;
-				}
-				if (item->next != 0) {
-					struct huffman_tree_item *temp4 = libmpq_huff_get_prev_item(item, -1);
-					temp4->next      = item->next;	/* The first item changed */
-					item->next->prev = item->prev;	/* First->prev changed to negative value */
-					item->next = NULL;
-					item->prev = NULL;
-				}
-
-				/* 15006C62 */
-				if (p_item2 == NULL) {
-					p_item2 = PTR_PTR(&ht->first);
-				}
-				item->next = p_item2->next;		/* Set item with 0x100 byte value */
-				item->prev = p_item2->next->prev;	/* Set item with 0x17 byte value */
-				p_item2->next->prev = item;		/* Changed prev of item with */
-				p_item2->next = item;
-			}
-
-			/* 15006C7B */
-			if (PTR_INT((child1 = child2->prev)) <= 0) {
-				break;
-			}
-		}
-	}
-
-	/* 15006C88 */
-	ht->offs0004 = 1;
+static void libmpq_huff_build_tree(struct huffman_tree* ht, unsigned int cmp_type)
+{
+    unsigned long max_byte;             /* [ESP+10] - The greatest character found in table */
+    unsigned char* byte_array;          /* [ESP+1C] - Pointer to unsigned char in table1502A630 */
+    unsigned long i;                /* egcs in linux doesn't like multiple for loops without an explicit i */
+    unsigned int found;             /* Thats needed to replace the goto stuff from original source :) */
+    struct huffman_tree_item** p_item;      /* [ESP+14] - Pointer to Huffman tree item pointer array */
+    struct huffman_tree_item* child1;
+
+    /* Loop while pointer has a negative value. */
+    while (PTR_INT(ht->last) > 0)           /* ESI - Last entry */
+    {
+        struct huffman_tree_item* temp;     /* EAX */
+
+        if (ht->last->next != NULL)         /* ESI->next */
+        {
+            libmpq_huff_remove_item(ht->last);
+        }
+        ht->item3058   = PTR_PTR(&ht->item3054);/* [EDI+4] */
+        ht->last->prev = ht->item3058;      /* EAX */
+        temp           = libmpq_huff_get_prev_item(PTR_PTR(&ht->item3054), PTR_INT(&ht->item3050));
+        temp->next     = ht->last;
+        ht->item3054   = ht->last;
+    }
+
+    /* Clear all pointers in huffman tree item array. */
+    memset(ht->items306C, 0, sizeof(ht->items306C));
+
+    max_byte = 0;                   /* Greatest character found init to zero. */
+    p_item = (struct huffman_tree_item**)&ht->items306C;    /* Pointer to current entry in huffman tree item pointer array */
+
+    /* Ensure we have low 8 bits only */
+    cmp_type   &= 0xFF;
+    byte_array  = table1502A630 + cmp_type * 258;   /* EDI also */
+
+    for (i = 0; i < 0x100; i++, p_item++)
+    {
+        struct huffman_tree_item* item = ht->item3058;  /* Item to be created */
+        struct huffman_tree_item* p_item3 = ht->item3058;
+        unsigned char one_byte = byte_array[i];
+
+        /* Skip all the bytes which are zero. */
+        if (byte_array[i] == 0)
+        {
+            continue;
+        }
+
+        /* If not valid pointer, take the first available item in the array. */
+        if (PTR_INT(item) <= 0)
+        {
+            item = &ht->items0008[ht->items++];
+        }
+
+        /* Insert this item as the top of the tree. */
+        libmpq_huff_insert_item(&ht->item305C, item, SWITCH_ITEMS, NULL);
+
+        item->parent    = NULL;         /* Invalidate child and parent */
+        item->child     = NULL;
+        *p_item         = item;         /* Store pointer into pointer array */
+
+        item->dcmp_byte  = i;           /* Store counter */
+        item->byte_value = one_byte;        /* Store byte value */
+        if (one_byte >= max_byte)
+        {
+            max_byte = one_byte;
+            continue;
+        }
+
+        /* Find the first item which has byte value greater than current one byte */
+        found = 0;
+        if (PTR_INT((p_item3 = ht->last)) > 0)  /* EDI - Pointer to the last item */
+        {
+
+            /* 15006AF7 */
+            if (p_item3 != NULL)
+            {
+                do              /* 15006AFB */
+                {
+                    if (p_item3->byte_value >= one_byte)
+                    {
+                        found = 1;
+                        break;
+                    }
+                    p_item3 = p_item3->prev;
+                }
+                while (PTR_INT(p_item3) > 0);
+            }
+        }
+
+        if (found == 0)
+        {
+            p_item3 = NULL;
+        }
+
+        /* 15006B09 */
+        if (item->next != NULL)
+        {
+            libmpq_huff_remove_item(item);
+        }
+
+        /* 15006B15 */
+        if (p_item3 == NULL)
+        {
+            p_item3 = PTR_PTR(&ht->first);
+        }
+
+        /* 15006B1F */
+        item->next = p_item3->next;
+        item->prev = p_item3->next->prev;
+        p_item3->next->prev = item;
+        p_item3->next = item;
+    }
+
+    /* 15006B4A */
+    for (; i < 0x102; i++)
+    {
+        struct huffman_tree_item** p_item2 = &ht->items306C[i]; /* EDI */
+
+        /* 15006B59  */
+        struct huffman_tree_item* item2 = ht->item3058; /* ESI */
+        if (PTR_INT(item2) <= 0)
+        {
+            item2 = &ht->items0008[ht->items++];
+        }
+        libmpq_huff_insert_item(&ht->item305C, item2, INSERT_ITEM, NULL);
+
+        /* 15006B89 */
+        item2->dcmp_byte  = i;
+        item2->byte_value = 1;
+        item2->parent     = NULL;
+        item2->child      = NULL;
+        *p_item2++        = item2;
+    }
+
+    /* 15006BAA */
+    if (PTR_INT((child1 = ht->last)) > 0)       /* EDI - last item (first child to item */
+    {
+        struct huffman_tree_item* child2;   /* EBP */
+        struct huffman_tree_item* item;     /* ESI */
+
+        /* 15006BB8 */
+        while (PTR_INT((child2 = child1->prev)) > 0)
+        {
+            if (PTR_INT((item = ht->item3058)) <= 0)
+            {
+                item = &ht->items0008[ht->items++];
+            }
+            /* 15006BE3 */
+            libmpq_huff_insert_item(&ht->item305C, item, SWITCH_ITEMS, NULL);
+
+            /* 15006BF3 */
+            item->parent = NULL;
+            item->child  = NULL;
+
+            /*
+             * EDX = child2->byte_value + child1->byte_value;
+             * EAX = child1->byte_value;
+             * ECX = max_byte;      The greatest character (0xFF usually)
+             */
+            item->byte_value = child1->byte_value + child2->byte_value; /* 0x02 */
+            item->child      = child1;  /* Prev item in the */
+            child1->parent   = item;
+            child2->parent   = item;
+
+            /* EAX = item->byte_value; */
+            if (item->byte_value >= max_byte)
+            {
+                max_byte = item->byte_value;
+            }
+            else
+            {
+                struct huffman_tree_item* p_item2 = child2->prev;   /* EDI */
+                found = 0;
+                if (PTR_INT(p_item2) > 0)
+                {
+
+                    /* 15006C2D */
+                    do
+                    {
+                        if (p_item2->byte_value >= item->byte_value)
+                        {
+                            found = 1;
+                            break;
+                        }
+                        p_item2 = p_item2->prev;
+                    }
+                    while (PTR_INT(p_item2) > 0);
+                }
+                if (found == 0)
+                {
+                    p_item2 = NULL;
+                }
+                if (item->next != 0)
+                {
+                    struct huffman_tree_item* temp4 = libmpq_huff_get_prev_item(item, -1);
+                    temp4->next      = item->next;  /* The first item changed */
+                    item->next->prev = item->prev;  /* First->prev changed to negative value */
+                    item->next = NULL;
+                    item->prev = NULL;
+                }
+
+                /* 15006C62 */
+                if (p_item2 == NULL)
+                {
+                    p_item2 = PTR_PTR(&ht->first);
+                }
+                item->next = p_item2->next;     /* Set item with 0x100 byte value */
+                item->prev = p_item2->next->prev;   /* Set item with 0x17 byte value */
+                p_item2->next->prev = item;     /* Changed prev of item with */
+                p_item2->next = item;
+            }
+
+            /* 15006C7B */
+            if (PTR_INT((child1 = child2->prev)) <= 0)
+            {
+                break;
+            }
+        }
+    }
+
+    /* 15006C88 */
+    ht->offs0004 = 1;
 }
 
 /* Gets the whole byte from the input stream. */
-static unsigned long libmpq_huff_get_8bits(struct huffman_input_stream *is) {
-	unsigned long one_byte;
-
-	if (is->bits <= 8) {
-		is->bit_buf |= *(unsigned short *)is->in_buf << is->bits;
-		is->in_buf  += sizeof(unsigned short);
-		is->bits    += 16;
-	}
-
-	one_byte      = (is->bit_buf & 0xFF);
-	is->bit_buf >>= 8;
-	is->bits     -= 8;
-
-	return one_byte;
+static unsigned long libmpq_huff_get_8bits(struct huffman_input_stream* is)
+{
+    unsigned long one_byte;
+
+    if (is->bits <= 8)
+    {
+        is->bit_buf |= *(unsigned short*)is->in_buf << is->bits;
+        is->in_buf  += sizeof(unsigned short);
+        is->bits    += 16;
+    }
+
+    one_byte      = (is->bit_buf & 0xFF);
+    is->bit_buf >>= 8;
+    is->bits     -= 8;
+
+    return one_byte;
 }
 
 /* Gets 7 bits from the stream. */
-static unsigned long libmpq_huff_get_7bits(struct huffman_input_stream *is) {
-	if (is->bits <= 7) {
-		is->bit_buf |= *(unsigned short *)is->in_buf << is->bits;
-		is->in_buf  += sizeof(unsigned short);
-		is->bits    += 16;
-	}
-
-	/* Get 7 bits from input stream. */
-	return (is->bit_buf & 0x7F);
+static unsigned long libmpq_huff_get_7bits(struct huffman_input_stream* is)
+{
+    if (is->bits <= 7)
+    {
+        is->bit_buf |= *(unsigned short*)is->in_buf << is->bits;
+        is->in_buf  += sizeof(unsigned short);
+        is->bits    += 16;
+    }
+
+    /* Get 7 bits from input stream. */
+    return (is->bit_buf & 0x7F);
 }
 
 /* Gets one bit from input stream. */
-unsigned long libmpq_huff_get_bit(struct huffman_input_stream *is) {
-	unsigned long bit = (is->bit_buf & 1);
-
-	is->bit_buf >>= 1;
-	if (--is->bits == 0) {
-		is->bit_buf  = *(unsigned long *)is->in_buf;
-		is->in_buf  += sizeof(unsigned long);
-		is->bits     = 32;
-	}
-	return bit;
+unsigned long libmpq_huff_get_bit(struct huffman_input_stream* is)
+{
+    unsigned long bit = (is->bit_buf & 1);
+
+    is->bit_buf >>= 1;
+    if (--is->bits == 0)
+    {
+        is->bit_buf  = *(unsigned long*)is->in_buf;
+        is->in_buf  += sizeof(unsigned long);
+        is->bits     = 32;
+    }
+    return bit;
 }
 
-static struct huffman_tree_item *libmpq_huff_call1500E740(struct huffman_tree *ht, unsigned int value) {
-	struct huffman_tree_item *p_item1 = ht->item3058;	/* EDX */
-	struct huffman_tree_item *p_item2;			/* EAX */
-	struct huffman_tree_item *p_next;
-	struct huffman_tree_item *p_prev;
-	struct huffman_tree_item **pp_item;
-
-	if (PTR_INT(p_item1) <= 0 || (p_item2 = p_item1) == NULL) {
-		if((p_item2 = &ht->items0008[ht->items++]) != NULL) {
-			p_item1 = p_item2;
-		} else {
-			p_item1 = ht->first;
-		}
-	} else {
-		p_item1 = p_item2;
-	}
-
-	p_next = p_item1->next;
-	if (p_next != NULL) {
-		p_prev = p_item1->prev;
-		if (PTR_INT(p_prev) <= 0) {
-			p_prev = PTR_NOT(p_prev);
-		} else {
-			p_prev += (p_item1 - p_item1->next->prev);
-		}
-
-		p_prev->next = p_next;
-		p_next->prev = p_prev;
-		p_item1->next = NULL;
-		p_item1->prev = NULL;
-	}
-	pp_item = &ht->first;				/* ESI */
-	if (value > 1) {
-
-		/* ECX = ht->first->next; */
-		p_item1->next = *pp_item;
-		p_item1->prev = (*pp_item)->prev;
-
-		(*pp_item)->prev = p_item2;
-		*pp_item = p_item1;
-
-		p_item2->parent = NULL;
-		p_item2->child  = NULL;
-	} else {
-		p_item1->next = (struct huffman_tree_item *)pp_item;
-		p_item1->prev = pp_item[1];
-		/* EDI = ht->item305C; */
-		p_prev = pp_item[1];			/* ECX */
-		if (p_prev <= 0) {
-			p_prev = PTR_NOT(p_prev);
-			p_prev->next = p_item1;
-			p_prev->prev = p_item2;
-
-			p_item2->parent = NULL;
-			p_item2->child  = NULL;
-		} else {
-			if (PTR_INT(ht->item305C) < 0) {
-				p_prev += (struct huffman_tree_item *)pp_item - (*pp_item)->prev;
-			} else {
-				p_prev += PTR_INT(ht->item305C);
-			}
-
-			p_prev->next    = p_item1;
-			pp_item[1]      = p_item2;
-			p_item2->parent = NULL;
-			p_item2->child  = NULL;
-		}
-	}
-	return p_item2;
+static struct huffman_tree_item* libmpq_huff_call1500E740(struct huffman_tree* ht, unsigned int value)
+{
+    struct huffman_tree_item* p_item1 = ht->item3058;   /* EDX */
+    struct huffman_tree_item* p_item2;          /* EAX */
+    struct huffman_tree_item* p_next;
+    struct huffman_tree_item* p_prev;
+    struct huffman_tree_item** pp_item;
+
+    if (PTR_INT(p_item1) <= 0 || (p_item2 = p_item1) == NULL)
+    {
+        if ((p_item2 = &ht->items0008[ht->items++]) != NULL)
+        {
+            p_item1 = p_item2;
+        }
+        else
+        {
+            p_item1 = ht->first;
+        }
+    }
+    else
+    {
+        p_item1 = p_item2;
+    }
+
+    p_next = p_item1->next;
+    if (p_next != NULL)
+    {
+        p_prev = p_item1->prev;
+        if (PTR_INT(p_prev) <= 0)
+        {
+            p_prev = PTR_NOT(p_prev);
+        }
+        else
+        {
+            p_prev += (p_item1 - p_item1->next->prev);
+        }
+
+        p_prev->next = p_next;
+        p_next->prev = p_prev;
+        p_item1->next = NULL;
+        p_item1->prev = NULL;
+    }
+    pp_item = &ht->first;               /* ESI */
+    if (value > 1)
+    {
+
+        /* ECX = ht->first->next; */
+        p_item1->next = *pp_item;
+        p_item1->prev = (*pp_item)->prev;
+
+        (*pp_item)->prev = p_item2;
+        *pp_item = p_item1;
+
+        p_item2->parent = NULL;
+        p_item2->child  = NULL;
+    }
+    else
+    {
+        p_item1->next = (struct huffman_tree_item*)pp_item;
+        p_item1->prev = pp_item[1];
+        /* EDI = ht->item305C; */
+        p_prev = pp_item[1];            /* ECX */
+        if (p_prev <= 0)
+        {
+            p_prev = PTR_NOT(p_prev);
+            p_prev->next = p_item1;
+            p_prev->prev = p_item2;
+
+            p_item2->parent = NULL;
+            p_item2->child  = NULL;
+        }
+        else
+        {
+            if (PTR_INT(ht->item305C) < 0)
+            {
+                p_prev += (struct huffman_tree_item*)pp_item - (*pp_item)->prev;
+            }
+            else
+            {
+                p_prev += PTR_INT(ht->item305C);
+            }
+
+            p_prev->next    = p_item1;
+            pp_item[1]      = p_item2;
+            p_item2->parent = NULL;
+            p_item2->child  = NULL;
+        }
+    }
+    return p_item2;
 }
 
-static void libmpq_huff_call1500E820(struct huffman_tree *ht, struct huffman_tree_item *p_item) {
-	struct huffman_tree_item *p_item1;		/* EDI */
-	struct huffman_tree_item *p_item2 = NULL;	/* EAX */
-	struct huffman_tree_item *p_item3;		/* EDX */
-	struct huffman_tree_item *p_prev;		/* EBX */
-
-	for (; p_item != NULL; p_item = p_item->parent) {
-		p_item->byte_value++;
-
-		for (p_item1 = p_item; ; p_item1 = p_prev) {
-			p_prev = p_item1->prev;
-			if (PTR_INT(p_prev) <= 0) {
-				p_prev = NULL;
-				break;
-			}
-			if (p_prev->byte_value >= p_item->byte_value) {
-				break;
-			}
-		}
-
-		if (p_item1 == p_item) {
-			continue;
-		}
-
-		if (p_item1->next != NULL) {
-			p_item2 = libmpq_huff_get_prev_item(p_item1, -1);
-			p_item2->next = p_item1->next;
-			p_item1->next->prev = p_item1->prev;
-			p_item1->next = NULL;
-			p_item1->prev = NULL;
-		}
-		p_item2 = p_item->next;
-		p_item1->next = p_item2;
-		p_item1->prev = p_item2->prev;
-		p_item2->prev = p_item1;
-		p_item->next = p_item1;
-		if ((p_item2 = p_item1) != NULL) {
-			p_item2 = libmpq_huff_get_prev_item(p_item, -1);
-			p_item2->next = p_item->next;
-			p_item->next->prev = p_item->prev;
-			p_item->next = NULL;
-			p_item->prev = NULL;
-		}
-
-		if (p_prev == NULL) {
-			p_prev = PTR_PTR(&ht->first);
-		}
-		p_item2       = p_prev->next;
-		p_item->next  = p_item2;
-		p_item->prev  = p_item2->prev;
-		p_item2->prev = p_item;
-		p_prev->next  = p_item;
-
-		p_item3 = p_item1->parent->child;
-		p_item2 = p_item->parent;
-		if (p_item2->child == p_item) {
-			p_item2->child = p_item1;
-		}
-
-		if (p_item3 == p_item1) {
-			p_item1->parent->child = p_item;
-		}
-
-		p_item2 = p_item->parent;
-		p_item->parent  = p_item1->parent;
-		p_item1->parent = p_item2;
-		ht->offs0004++;
-	}
+static void libmpq_huff_call1500E820(struct huffman_tree* ht, struct huffman_tree_item* p_item)
+{
+    struct huffman_tree_item* p_item1;      /* EDI */
+    struct huffman_tree_item* p_item2 = NULL;   /* EAX */
+    struct huffman_tree_item* p_item3;      /* EDX */
+    struct huffman_tree_item* p_prev;       /* EBX */
+
+    for (; p_item != NULL; p_item = p_item->parent)
+    {
+        p_item->byte_value++;
+
+        for (p_item1 = p_item; ; p_item1 = p_prev)
+        {
+            p_prev = p_item1->prev;
+            if (PTR_INT(p_prev) <= 0)
+            {
+                p_prev = NULL;
+                break;
+            }
+            if (p_prev->byte_value >= p_item->byte_value)
+            {
+                break;
+            }
+        }
+
+        if (p_item1 == p_item)
+        {
+            continue;
+        }
+
+        if (p_item1->next != NULL)
+        {
+            p_item2 = libmpq_huff_get_prev_item(p_item1, -1);
+            p_item2->next = p_item1->next;
+            p_item1->next->prev = p_item1->prev;
+            p_item1->next = NULL;
+            p_item1->prev = NULL;
+        }
+        p_item2 = p_item->next;
+        p_item1->next = p_item2;
+        p_item1->prev = p_item2->prev;
+        p_item2->prev = p_item1;
+        p_item->next = p_item1;
+        if ((p_item2 = p_item1) != NULL)
+        {
+            p_item2 = libmpq_huff_get_prev_item(p_item, -1);
+            p_item2->next = p_item->next;
+            p_item->next->prev = p_item->prev;
+            p_item->next = NULL;
+            p_item->prev = NULL;
+        }
+
+        if (p_prev == NULL)
+        {
+            p_prev = PTR_PTR(&ht->first);
+        }
+        p_item2       = p_prev->next;
+        p_item->next  = p_item2;
+        p_item->prev  = p_item2->prev;
+        p_item2->prev = p_item;
+        p_prev->next  = p_item;
+
+        p_item3 = p_item1->parent->child;
+        p_item2 = p_item->parent;
+        if (p_item2->child == p_item)
+        {
+            p_item2->child = p_item1;
+        }
+
+        if (p_item3 == p_item1)
+        {
+            p_item1->parent->child = p_item;
+        }
+
+        p_item2 = p_item->parent;
+        p_item->parent  = p_item1->parent;
+        p_item1->parent = p_item2;
+        ht->offs0004++;
+    }
 }
 
-int libmpq_huff_do_decompress(struct huffman_tree *ht, struct huffman_input_stream *is, unsigned char *out_buf, unsigned int out_length) {
-	unsigned int n8bits;				/* 8 bits loaded from input stream */
-	unsigned int n7bits;				/* 7 bits loaded from input stream */
-	unsigned int found;				/* Thats needed to replace the goto stuff from original source :) */
-	unsigned int dcmp_byte = 0;
-	unsigned long bit_count;
-	struct huffman_decompress *qd;
-	unsigned int has_qd;				/* Can we use quick decompression? */
-	struct huffman_tree_item *p_item1;
-	struct huffman_tree_item *p_item2;
-	unsigned char *out_pos = out_buf;
-
-	/* Test the output length. Must not be non zero. */
-	if (out_length == 0) {
-		return 0;
-	}
-
-	/* Get the compression type from the input stream. */
-	n8bits = libmpq_huff_get_8bits(is);
-
-	/* Build the Huffman tree */
-	libmpq_huff_build_tree(ht, n8bits);
-	ht->cmp0 = (n8bits == 0) ? TRUE : FALSE;
-
-	for(;;) {
-		n7bits = libmpq_huff_get_7bits(is);	/* Get 7 bits from input stream */
-
-		/*
-		 * Try to use quick decompression. Check huffman_decompress array for corresponding item.
-		 * If found, use the result byte instead.
-		 */
-		qd = &ht->qd3474[n7bits];
-
-		/* If there is a quick-pass possible (ebx) */
-		has_qd = (qd->offs00 >= ht->offs0004) ? TRUE : FALSE;
-
-		/* If we can use quick decompress, use it. */
-		if (has_qd) {
-			found = 0;
-			if (qd->bits > 7) {
-				is->bit_buf >>= 7;
-				is->bits -= 7;
-				p_item1 = qd->p_item;
-				found = 1;
-			}
-			if (found == 0) {
-				is->bit_buf >>= qd->bits;
-				is->bits     -= qd->bits;
-				dcmp_byte     = qd->dcmp_byte;
-			}
-		} else {
-			found = 1;
-			p_item1 = ht->first->next->prev;
-			if (PTR_INT(p_item1) <= 0) {
-				p_item1 = NULL;
-			}
-		}
-
-		if (found == 1) {
-			bit_count = 0;
-			p_item2 = NULL;
-			do {
-				p_item1 = p_item1->child;	/* Move down by one level */
-				if (libmpq_huff_get_bit(is)) {	/* If current bit is set, move to previous */
-					p_item1 = p_item1->prev;
-				}
-				if (++bit_count == 7) {		/* If we are at 7th bit, save current huffman tree item. */
-					p_item2 = p_item1;
-				}
-			} while (p_item1->child != NULL);	/* Walk until tree has no deeper level */
-
-			if (has_qd == FALSE) {
-				if (bit_count > 7) {
-					qd->offs00 = ht->offs0004;
-					qd->bits   = bit_count;
-					qd->p_item = p_item2;
-				} else {
-					unsigned long index = n7bits & (0xFFFFFFFF >> (32 - bit_count));
-					unsigned long add   = (1 << bit_count);
-
-					for (qd = &ht->qd3474[index]; index <= 0x7F; index += add, qd += add) {
-						qd->offs00    = ht->offs0004;
-						qd->bits      = bit_count;
-						qd->dcmp_byte = p_item1->dcmp_byte;
-					}
-				}
-			}
-			dcmp_byte = p_item1->dcmp_byte;
-		}
-
-		if (dcmp_byte == 0x101)	{		/* Huffman tree needs to be modified */
-			n8bits  = libmpq_huff_get_8bits(is);
-			p_item1 = (ht->last <= 0) ? NULL : ht->last;
-
-			p_item2 = libmpq_huff_call1500E740(ht, 1);
-			p_item2->parent     = p_item1;
-			p_item2->dcmp_byte  = p_item1->dcmp_byte;
-			p_item2->byte_value = p_item1->byte_value;
-			ht->items306C[p_item2->dcmp_byte] = p_item2;
-
-			p_item2 = libmpq_huff_call1500E740(ht, 1);
-			p_item2->parent     = p_item1;
-			p_item2->dcmp_byte  = n8bits;
-			p_item2->byte_value = 0;
-			ht->items306C[p_item2->dcmp_byte] = p_item2;
-
-			p_item1->child = p_item2;
-			libmpq_huff_call1500E820(ht, p_item2);
-			if (ht->cmp0 == 0) {
-				libmpq_huff_call1500E820(ht, ht->items306C[n8bits]);
-			}
-			dcmp_byte = n8bits;
-		}
-
-		if (dcmp_byte == 0x100) {
-			break;
-		}
-
-		*out_pos++ = (unsigned char)dcmp_byte;
-		if (--out_length == 0) {
-			break;
-		}
-		if (ht->cmp0) {
-			libmpq_huff_call1500E820(ht, ht->items306C[dcmp_byte]);
-		}
-	}
-	return (out_pos - out_buf);
+int libmpq_huff_do_decompress(struct huffman_tree* ht, struct huffman_input_stream* is, unsigned char* out_buf, unsigned int out_length)
+{
+    unsigned int n8bits;                /* 8 bits loaded from input stream */
+    unsigned int n7bits;                /* 7 bits loaded from input stream */
+    unsigned int found;             /* Thats needed to replace the goto stuff from original source :) */
+    unsigned int dcmp_byte = 0;
+    unsigned long bit_count;
+    struct huffman_decompress* qd;
+    unsigned int has_qd;                /* Can we use quick decompression? */
+    struct huffman_tree_item* p_item1;
+    struct huffman_tree_item* p_item2;
+    unsigned char* out_pos = out_buf;
+
+    /* Test the output length. Must not be non zero. */
+    if (out_length == 0)
+    {
+        return 0;
+    }
+
+    /* Get the compression type from the input stream. */
+    n8bits = libmpq_huff_get_8bits(is);
+
+    /* Build the Huffman tree */
+    libmpq_huff_build_tree(ht, n8bits);
+    ht->cmp0 = (n8bits == 0) ? TRUE : FALSE;
+
+    for (;;)
+    {
+        n7bits = libmpq_huff_get_7bits(is); /* Get 7 bits from input stream */
+
+        /*
+         * Try to use quick decompression. Check huffman_decompress array for corresponding item.
+         * If found, use the result byte instead.
+         */
+        qd = &ht->qd3474[n7bits];
+
+        /* If there is a quick-pass possible (ebx) */
+        has_qd = (qd->offs00 >= ht->offs0004) ? TRUE : FALSE;
+
+        /* If we can use quick decompress, use it. */
+        if (has_qd)
+        {
+            found = 0;
+            if (qd->bits > 7)
+            {
+                is->bit_buf >>= 7;
+                is->bits -= 7;
+                p_item1 = qd->p_item;
+                found = 1;
+            }
+            if (found == 0)
+            {
+                is->bit_buf >>= qd->bits;
+                is->bits     -= qd->bits;
+                dcmp_byte     = qd->dcmp_byte;
+            }
+        }
+        else
+        {
+            found = 1;
+            p_item1 = ht->first->next->prev;
+            if (PTR_INT(p_item1) <= 0)
+            {
+                p_item1 = NULL;
+            }
+        }
+
+        if (found == 1)
+        {
+            bit_count = 0;
+            p_item2 = NULL;
+            do
+            {
+                p_item1 = p_item1->child;   /* Move down by one level */
+                if (libmpq_huff_get_bit(is))    /* If current bit is set, move to previous */
+                {
+                    p_item1 = p_item1->prev;
+                }
+                if (++bit_count == 7)       /* If we are at 7th bit, save current huffman tree item. */
+                {
+                    p_item2 = p_item1;
+                }
+            }
+            while (p_item1->child != NULL);     /* Walk until tree has no deeper level */
+
+            if (has_qd == FALSE)
+            {
+                if (bit_count > 7)
+                {
+                    qd->offs00 = ht->offs0004;
+                    qd->bits   = bit_count;
+                    qd->p_item = p_item2;
+                }
+                else
+                {
+                    unsigned long index = n7bits & (0xFFFFFFFF >> (32 - bit_count));
+                    unsigned long add   = (1 << bit_count);
+
+                    for (qd = &ht->qd3474[index]; index <= 0x7F; index += add, qd += add)
+                    {
+                        qd->offs00    = ht->offs0004;
+                        qd->bits      = bit_count;
+                        qd->dcmp_byte = p_item1->dcmp_byte;
+                    }
+                }
+            }
+            dcmp_byte = p_item1->dcmp_byte;
+        }
+
+        if (dcmp_byte == 0x101)         /* Huffman tree needs to be modified */
+        {
+            n8bits  = libmpq_huff_get_8bits(is);
+            p_item1 = (ht->last <= 0) ? NULL : ht->last;
+
+            p_item2 = libmpq_huff_call1500E740(ht, 1);
+            p_item2->parent     = p_item1;
+            p_item2->dcmp_byte  = p_item1->dcmp_byte;
+            p_item2->byte_value = p_item1->byte_value;
+            ht->items306C[p_item2->dcmp_byte] = p_item2;
+
+            p_item2 = libmpq_huff_call1500E740(ht, 1);
+            p_item2->parent     = p_item1;
+            p_item2->dcmp_byte  = n8bits;
+            p_item2->byte_value = 0;
+            ht->items306C[p_item2->dcmp_byte] = p_item2;
+
+            p_item1->child = p_item2;
+            libmpq_huff_call1500E820(ht, p_item2);
+            if (ht->cmp0 == 0)
+            {
+                libmpq_huff_call1500E820(ht, ht->items306C[n8bits]);
+            }
+            dcmp_byte = n8bits;
+        }
+
+        if (dcmp_byte == 0x100)
+        {
+            break;
+        }
+
+        *out_pos++ = (unsigned char)dcmp_byte;
+        if (--out_length == 0)
+        {
+            break;
+        }
+        if (ht->cmp0)
+        {
+            libmpq_huff_call1500E820(ht, ht->items306C[dcmp_byte]);
+        }
+    }
+    return (out_pos - out_buf);
 }
 
-int libmpq_huff_init_tree(struct huffman_tree *ht, struct huffman_tree_item *hi, unsigned int cmp) {
-	int count;
-
-	/* Clear links for all the items in the tree */
-	for (hi = ht->items0008, count = 0x203; count != 0; hi++, count--) {
-		hi->next = hi->prev = NULL;
-	}
-
-	ht->item3050 = NULL;
-	ht->item3054 = PTR_PTR(&ht->item3054);
-	ht->item3058 = PTR_NOT(ht->item3054);
-
-	ht->item305C = NULL;
-	ht->first    = PTR_PTR(&ht->first);
-	ht->last     = PTR_NOT(ht->first);
-
-	ht->offs0004 = 1;
-	ht->items    = 0;
-
-	/* Clear all huffman_decompress items. Do this only if preparing for decompression */
-	if (cmp == LIBMPQ_HUFF_DECOMPRESS) {
-		for (count = 0; count < sizeof(ht->qd3474) / sizeof(struct huffman_decompress); count++) {
-			ht->qd3474[count].offs00 = 0;
-		}
-	}
+int libmpq_huff_init_tree(struct huffman_tree* ht, struct huffman_tree_item* hi, unsigned int cmp)
+{
+    int count;
+
+    /* Clear links for all the items in the tree */
+    for (hi = ht->items0008, count = 0x203; count != 0; hi++, count--)
+    {
+        hi->next = hi->prev = NULL;
+    }
+
+    ht->item3050 = NULL;
+    ht->item3054 = PTR_PTR(&ht->item3054);
+    ht->item3058 = PTR_NOT(ht->item3054);
+
+    ht->item305C = NULL;
+    ht->first    = PTR_PTR(&ht->first);
+    ht->last     = PTR_NOT(ht->first);
+
+    ht->offs0004 = 1;
+    ht->items    = 0;
+
+    /* Clear all huffman_decompress items. Do this only if preparing for decompression */
+    if (cmp == LIBMPQ_HUFF_DECOMPRESS)
+    {
+        for (count = 0; count < sizeof(ht->qd3474) / sizeof(struct huffman_decompress); count++)
+        {
+            ht->qd3474[count].offs00 = 0;
+        }
+    }
 
     return 0;
 }
diff --git a/contrib/extractor/libmpq/huffman.h b/contrib/extractor/libmpq/huffman.h
index 1f8eae54eb4..60faa2dcaa8 100644
--- a/contrib/extractor/libmpq/huffman.h
+++ b/contrib/extractor/libmpq/huffman.h
@@ -27,32 +27,34 @@
 #ifndef _HUFFMAN_H
 #define _HUFFMAN_H
 
-#define PTR_NOT(ptr)	(struct huffman_tree_item *)(~(unsigned long)(ptr))
-#define PTR_PTR(ptr)	((struct huffman_tree_item *)(ptr))
-#define PTR_INT(ptr)	(long)(ptr)
+#define PTR_NOT(ptr)    (struct huffman_tree_item *)(~(unsigned long)(ptr))
+#define PTR_PTR(ptr)    ((struct huffman_tree_item *)(ptr))
+#define PTR_INT(ptr)    (long)(ptr)
 
-#define INSERT_ITEM	1
-#define SWITCH_ITEMS	2				/* Switch the item1 and item2 */
+#define INSERT_ITEM 1
+#define SWITCH_ITEMS    2               /* Switch the item1 and item2 */
 
 /*
  *  Input stream for Huffmann decompression
  */
-struct huffman_input_stream {
-	unsigned char *in_buf;				/* 00 - Input data */
-	unsigned long bit_buf;				/* 04 - Input bit buffer */
-	unsigned int bits;				/* 08 - Number of bits remaining in 'byte' */
+struct huffman_input_stream
+{
+    unsigned char* in_buf;              /* 00 - Input data */
+    unsigned long bit_buf;              /* 04 - Input bit buffer */
+    unsigned int bits;              /* 08 - Number of bits remaining in 'byte' */
 };
 
 /*
  *  Huffmann tree item.
  */
-struct huffman_tree_item {
-	struct huffman_tree_item *next;			/* 00 - Pointer to next huffman_tree_item */
-	struct huffman_tree_item *prev;			/* 04 - Pointer to prev huffman_tree_item (< 0 if none) */
-	unsigned long dcmp_byte;			/* 08 - Index of this item in item pointer array, decompressed byte value */
-	unsigned long byte_value;			/* 0C - Some byte value */
-	struct huffman_tree_item *parent;		/* 10 - Pointer to parent huffman_tree_item (NULL if none) */
-	struct huffman_tree_item *child;		/* 14 - Pointer to child huffman_tree_item */
+struct huffman_tree_item
+{
+    struct huffman_tree_item* next;         /* 00 - Pointer to next huffman_tree_item */
+    struct huffman_tree_item* prev;         /* 04 - Pointer to prev huffman_tree_item (< 0 if none) */
+    unsigned long dcmp_byte;            /* 08 - Index of this item in item pointer array, decompressed byte value */
+    unsigned long byte_value;           /* 0C - Some byte value */
+    struct huffman_tree_item* parent;       /* 10 - Pointer to parent huffman_tree_item (NULL if none) */
+    struct huffman_tree_item* child;        /* 14 - Pointer to child huffman_tree_item */
 };
 
 /*
@@ -65,41 +67,44 @@ struct huffman_tree_item {
  *  decompression routine will not walk through Huffman tree and
  *  directly stores output byte to output stream.
  */
-struct huffman_decompress {
-	unsigned long offs00;				/* 00 - 1 if resolved */
-	unsigned long bits;				/* 04 - Bit count */
-	union {
-		unsigned long dcmp_byte;		/* 08 - Byte value for decompress (if bitCount <= 7) */
-		struct huffman_tree_item *p_item;	/* 08 - THTreeItem (if number of bits is greater than 7 */
-	};
+struct huffman_decompress
+{
+    unsigned long offs00;               /* 00 - 1 if resolved */
+    unsigned long bits;             /* 04 - Bit count */
+    union
+    {
+        unsigned long dcmp_byte;        /* 08 - Byte value for decompress (if bitCount <= 7) */
+        struct huffman_tree_item* p_item;   /* 08 - THTreeItem (if number of bits is greater than 7 */
+    };
 };
 
 /*
  *  Structure for Huffman tree.
  */
-struct huffman_tree {
-	unsigned long cmp0;				/* 0000 - 1 if compression type 0 */
-	unsigned long offs0004;				/* 0004 - Some flag */
+struct huffman_tree
+{
+    unsigned long cmp0;             /* 0000 - 1 if compression type 0 */
+    unsigned long offs0004;             /* 0004 - Some flag */
 
-	struct huffman_tree_item items0008[0x203];	/* 0008 - huffman tree items */
+    struct huffman_tree_item items0008[0x203];  /* 0008 - huffman tree items */
 
-	/* Sometimes used as huffman tree item */
-	struct huffman_tree_item *item3050;		/* 3050 - Always NULL (?) */
-	struct huffman_tree_item *item3054;		/* 3054 - Pointer to huffman_tree_item */
-	struct huffman_tree_item *item3058;		/* 3058 - Pointer to huffman_tree_item (< 0 if invalid) */
+    /* Sometimes used as huffman tree item */
+    struct huffman_tree_item* item3050;     /* 3050 - Always NULL (?) */
+    struct huffman_tree_item* item3054;     /* 3054 - Pointer to huffman_tree_item */
+    struct huffman_tree_item* item3058;     /* 3058 - Pointer to huffman_tree_item (< 0 if invalid) */
 
-	/* Sometimes used as huffman tree item */
-	struct huffman_tree_item *item305C;		/* 305C - Usually NULL */
-	struct huffman_tree_item *first;		/* 3060 - Pointer to top (first) Huffman tree item */
-	struct huffman_tree_item *last;			/* 3064 - Pointer to bottom (last) Huffman tree item (< 0 if invalid) */
-	unsigned long items;				/* 3068 - Number of used huffman tree items */
+    /* Sometimes used as huffman tree item */
+    struct huffman_tree_item* item305C;     /* 305C - Usually NULL */
+    struct huffman_tree_item* first;        /* 3060 - Pointer to top (first) Huffman tree item */
+    struct huffman_tree_item* last;         /* 3064 - Pointer to bottom (last) Huffman tree item (< 0 if invalid) */
+    unsigned long items;                /* 3068 - Number of used huffman tree items */
 
-	struct huffman_tree_item *items306C[0x102];	/* 306C - huffman_tree_item pointer array */
-	struct huffman_decompress qd3474[0x80];		/* 3474 - Array for quick decompression */
+    struct huffman_tree_item* items306C[0x102]; /* 306C - huffman_tree_item pointer array */
+    struct huffman_decompress qd3474[0x80];     /* 3474 - Array for quick decompression */
 
-	//unsigned char table1502A630[];			/* Some table to make struct size flexible */
+    //unsigned char table1502A630[];            /* Some table to make struct size flexible */
 };
 
-int libmpq_huff_init_tree(struct huffman_tree *ht, struct huffman_tree_item *hi, unsigned int cmp);
-int libmpq_huff_do_decompress(struct huffman_tree *ht, struct huffman_input_stream *is, unsigned char *out_buf, unsigned int out_length);
-#endif			/* _HUFFMAN_H */
+int libmpq_huff_init_tree(struct huffman_tree* ht, struct huffman_tree_item* hi, unsigned int cmp);
+int libmpq_huff_do_decompress(struct huffman_tree* ht, struct huffman_input_stream* is, unsigned char* out_buf, unsigned int out_length);
+#endif          /* _HUFFMAN_H */
diff --git a/contrib/extractor/libmpq/mpq.cpp b/contrib/extractor/libmpq/mpq.cpp
index 14b0e8a307f..a1c2670ae4f 100644
--- a/contrib/extractor/libmpq/mpq.cpp
+++ b/contrib/extractor/libmpq/mpq.cpp
@@ -35,10 +35,11 @@
  *  This function returns version information.
  *  format: MAJOR.MINOR.PATCH
  */
-char *libmpq_version() {
-	static char version[10];
-	sprintf(version, "%i.%i.%i", LIBMPQ_MAJOR_VERSION, LIBMPQ_MINOR_VERSION, LIBMPQ_PATCH_VERSION);
-	return version;
+char* libmpq_version()
+{
+    static char version[10];
+    sprintf(version, "%i.%i.%i", LIBMPQ_MAJOR_VERSION, LIBMPQ_MINOR_VERSION, LIBMPQ_PATCH_VERSION);
+    return version;
 }
 
 /*
@@ -46,194 +47,217 @@ char *libmpq_version() {
  *  or not. Then it fills the mpq_header structure and reads the hash
  *  table.
  */
-int libmpq_archive_open(mpq_archive *mpq_a, unsigned char *mpq_filename) {
-	int fd = 0;
-	int rb = 0;
-	int ncnt = FALSE;
-	struct stat fileinfo;
-
-	/* allocate memory */
-	mpq_a->mpq_l = (mpq_list *)malloc(sizeof(mpq_list));
-	memset(mpq_a->mpq_l, 0, sizeof(mpq_list));
-	mpq_a->header = (mpq_header *)malloc(sizeof(mpq_header));
-	memset(mpq_a->header, 0, sizeof(mpq_header));
-
-	/* Check if file exists and is readable */
-	fd = _open((char *)mpq_filename, MPQ_FILE_OPEN_FLAGS);
-	if (fd == LIBMPQ_EFILE) {
-		return LIBMPQ_EFILE;
-	}
-
-	/* fill the structures with informations */
-	strcpy((char *)mpq_a->filename, (char *)mpq_filename);
-	libmpq_init_buffer(mpq_a);
-	mpq_a->fd               = fd;
-	mpq_a->header->id       = 0;
-	mpq_a->maxblockindex    = 0;
-	mpq_a->mpq_l->mpq_files = NULL;
+int libmpq_archive_open(mpq_archive* mpq_a, unsigned char* mpq_filename)
+{
+    int fd = 0;
+    int rb = 0;
+    int ncnt = FALSE;
+    struct stat fileinfo;
+
+    /* allocate memory */
+    mpq_a->mpq_l = (mpq_list*)malloc(sizeof(mpq_list));
+    memset(mpq_a->mpq_l, 0, sizeof(mpq_list));
+    mpq_a->header = (mpq_header*)malloc(sizeof(mpq_header));
+    memset(mpq_a->header, 0, sizeof(mpq_header));
+
+    /* Check if file exists and is readable */
+    fd = _open((char*)mpq_filename, MPQ_FILE_OPEN_FLAGS);
+    if (fd == LIBMPQ_EFILE)
+    {
+        return LIBMPQ_EFILE;
+    }
+
+    /* fill the structures with informations */
+    strcpy((char*)mpq_a->filename, (char*)mpq_filename);
+    libmpq_init_buffer(mpq_a);
+    mpq_a->fd               = fd;
+    mpq_a->header->id       = 0;
+    mpq_a->maxblockindex    = 0;
+    mpq_a->mpq_l->mpq_files = NULL;
 
     mpq_a->mpqpos = 0; //k
 
-	while (!ncnt) {
-		mpq_a->header->id = 0;
+    while (!ncnt)
+    {
+        mpq_a->header->id = 0;
 
         libmpq_lseek(mpq_a, mpq_a->mpqpos);
 
         rb = _read(mpq_a->fd, mpq_a->header, sizeof(mpq_header));
 
-		/* if different number of bytes read, break the loop */
-		if (rb != sizeof(mpq_header)) {
-			return LIBMPQ_EFILE_FORMAT;
-		}
+        /* if different number of bytes read, break the loop */
+        if (rb != sizeof(mpq_header))
+        {
+            return LIBMPQ_EFILE_FORMAT;
+        }
 
-		/* special offset for protected MPQs */
-		if (mpq_a->header->offset == LIBMPQ_HEADER_W3M) {
-			mpq_a->flags |= LIBMPQ_FLAG_PROTECTED;
-			mpq_a->header->offset = sizeof(mpq_header);
-		}
+        /* special offset for protected MPQs */
+        if (mpq_a->header->offset == LIBMPQ_HEADER_W3M)
+        {
+            mpq_a->flags |= LIBMPQ_FLAG_PROTECTED;
+            mpq_a->header->offset = sizeof(mpq_header);
+        }
 
-		/* if valid signature has been found, break the loop */
-        if (mpq_a->header->id == LIBMPQ_ID_MPQ) {
+        /* if valid signature has been found, break the loop */
+        if (mpq_a->header->id == LIBMPQ_ID_MPQ)
+        {
             ncnt = true;
         }
         /*if (mpq_a->header->id == LIBMPQ_ID_MPQ &&
-		    mpq_a->header->offset == sizeof(mpq_header) &&
-		    mpq_a->header->hashtablepos < mpq_a->header->archivesize &&
-		    mpq_a->header->blocktablepos < mpq_a->header->archivesize) {
-			ncnt = TRUE;
-		}*/
-
-		/* move to the next possible offset */
-		if (!ncnt) {
-			mpq_a->mpqpos += 0x200;
-		}
-	}
-
-	/* get the right positions of the hash table and the block table. */
-	mpq_a->blocksize = (0x200 << mpq_a->header->blocksize);
-	fstat(mpq_a->fd, &fileinfo);
-
-	/* Normal MPQs must have position of */
-	/*if (mpq_a->header->hashtablepos + mpq_a->mpqpos < fileinfo.st_size &&
-	    mpq_a->header->blocktablepos + mpq_a->mpqpos < fileinfo.st_size) {
-		mpq_a->header->hashtablepos  += mpq_a->mpqpos;
-		mpq_a->header->blocktablepos += mpq_a->mpqpos;
-	} else {
-		return LIBMPQ_EFILE_FORMAT;
-	}*/
-
-	/* Try to read and decrypt the hashtable */
-	if (libmpq_read_hashtable(mpq_a) != 0) {
-		return LIBMPQ_EHASHTABLE;
-	}
-
-	/* Try to read and decrypt the blocktable */
-	if (libmpq_read_blocktable(mpq_a) != 0) {
-		return LIBMPQ_EBLOCKTABLE;
-	}
-
-	return LIBMPQ_TOOLS_SUCCESS;
+            mpq_a->header->offset == sizeof(mpq_header) &&
+            mpq_a->header->hashtablepos < mpq_a->header->archivesize &&
+            mpq_a->header->blocktablepos < mpq_a->header->archivesize) {
+            ncnt = TRUE;
+        }*/
+
+        /* move to the next possible offset */
+        if (!ncnt)
+        {
+            mpq_a->mpqpos += 0x200;
+        }
+    }
+
+    /* get the right positions of the hash table and the block table. */
+    mpq_a->blocksize = (0x200 << mpq_a->header->blocksize);
+    fstat(mpq_a->fd, &fileinfo);
+
+    /* Normal MPQs must have position of */
+    /*if (mpq_a->header->hashtablepos + mpq_a->mpqpos < fileinfo.st_size &&
+        mpq_a->header->blocktablepos + mpq_a->mpqpos < fileinfo.st_size) {
+        mpq_a->header->hashtablepos  += mpq_a->mpqpos;
+        mpq_a->header->blocktablepos += mpq_a->mpqpos;
+    } else {
+        return LIBMPQ_EFILE_FORMAT;
+    }*/
+
+    /* Try to read and decrypt the hashtable */
+    if (libmpq_read_hashtable(mpq_a) != 0)
+    {
+        return LIBMPQ_EHASHTABLE;
+    }
+
+    /* Try to read and decrypt the blocktable */
+    if (libmpq_read_blocktable(mpq_a) != 0)
+    {
+        return LIBMPQ_EBLOCKTABLE;
+    }
+
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 
 /*
  *  This function closes the file descriptor opened by
  *  mpq_open_archive(); and frees the decryption buffer.
  */
-int libmpq_archive_close(mpq_archive *mpq_a) {
-	memset(mpq_a->buf, 0, sizeof(mpq_a->buf));
+int libmpq_archive_close(mpq_archive* mpq_a)
+{
+    memset(mpq_a->buf, 0, sizeof(mpq_a->buf));
 
-	/* free the allocated memory. */
-	free(mpq_a->header);
-	free(mpq_a->mpq_l);
+    /* free the allocated memory. */
+    free(mpq_a->header);
+    free(mpq_a->mpq_l);
 
-	/* Check if file descriptor is valid. */
-	if ((_close(mpq_a->fd)) == LIBMPQ_EFILE) {
-		return LIBMPQ_EFILE;
-	}
+    /* Check if file descriptor is valid. */
+    if ((_close(mpq_a->fd)) == LIBMPQ_EFILE)
+    {
+        return LIBMPQ_EFILE;
+    }
 
-	return LIBMPQ_TOOLS_SUCCESS;
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 
 /*
  * This function returns the value for the given infotype.
  * If an error occurs something < 0 is returned.
  */
-int libmpq_archive_info(mpq_archive *mpq_a, unsigned int infotype) {
-	unsigned int filecount = 0;
-	unsigned int fsize = 0;
-	unsigned int csize = 0;
-	mpq_block *mpq_b_end = mpq_a->blocktable + mpq_a->header->blocktablesize;
-	mpq_block *mpq_b = NULL;
-
-	switch (infotype) {
-		case LIBMPQ_MPQ_ARCHIVE_SIZE:
-			return mpq_a->header->archivesize;
-		case LIBMPQ_MPQ_HASHTABLE_SIZE:
-			return mpq_a->header->hashtablesize;
-		case LIBMPQ_MPQ_BLOCKTABLE_SIZE:
-			return mpq_a->header->blocktablesize;
-		case LIBMPQ_MPQ_BLOCKSIZE:
-			return mpq_a->blocksize;
-		case LIBMPQ_MPQ_NUMFILES:
-			for (mpq_b = mpq_a->blocktable; mpq_b < mpq_b_end; mpq_b++) {
-				filecount++;
-			}
-			return filecount;
-		case LIBMPQ_MPQ_COMPRESSED_SIZE:
-			for (mpq_b = mpq_a->blocktable; mpq_b < mpq_b_end; mpq_b++) {
-				csize += mpq_b->csize;
-			}
-			return csize;
-		case LIBMPQ_MPQ_UNCOMPRESSED_SIZE:
-			for (mpq_b = mpq_a->blocktable; mpq_b < mpq_b_end; mpq_b++) {
-				fsize += mpq_b->fsize;
-			}
-			return fsize;
-		default:
-			return LIBMPQ_TOOLS_SUCCESS;
-	}
+int libmpq_archive_info(mpq_archive* mpq_a, unsigned int infotype)
+{
+    unsigned int filecount = 0;
+    unsigned int fsize = 0;
+    unsigned int csize = 0;
+    mpq_block* mpq_b_end = mpq_a->blocktable + mpq_a->header->blocktablesize;
+    mpq_block* mpq_b = NULL;
+
+    switch (infotype)
+    {
+        case LIBMPQ_MPQ_ARCHIVE_SIZE:
+            return mpq_a->header->archivesize;
+        case LIBMPQ_MPQ_HASHTABLE_SIZE:
+            return mpq_a->header->hashtablesize;
+        case LIBMPQ_MPQ_BLOCKTABLE_SIZE:
+            return mpq_a->header->blocktablesize;
+        case LIBMPQ_MPQ_BLOCKSIZE:
+            return mpq_a->blocksize;
+        case LIBMPQ_MPQ_NUMFILES:
+            for (mpq_b = mpq_a->blocktable; mpq_b < mpq_b_end; mpq_b++)
+            {
+                filecount++;
+            }
+            return filecount;
+        case LIBMPQ_MPQ_COMPRESSED_SIZE:
+            for (mpq_b = mpq_a->blocktable; mpq_b < mpq_b_end; mpq_b++)
+            {
+                csize += mpq_b->csize;
+            }
+            return csize;
+        case LIBMPQ_MPQ_UNCOMPRESSED_SIZE:
+            for (mpq_b = mpq_a->blocktable; mpq_b < mpq_b_end; mpq_b++)
+            {
+                fsize += mpq_b->fsize;
+            }
+            return fsize;
+        default:
+            return LIBMPQ_TOOLS_SUCCESS;
+    }
 }
 
 /*
  * This function returns some useful file information.
  */
-int libmpq_file_info(mpq_archive *mpq_a, unsigned int infotype, const unsigned int number) {
-	int blockindex = number;
-	int i = 0;
-	mpq_block *mpq_b = NULL;
-	mpq_hash *mpq_h = NULL;
-
-	/* check if given number is not out of range */
-	if (number < 0 || number >= mpq_a->header->blocktablesize) {
-		return LIBMPQ_EINV_RANGE;
-	}
-
-	/* check if sizes are correct */
-	mpq_b = mpq_a->blocktable + blockindex;
-	if (mpq_b->filepos > (mpq_a->header->archivesize + mpq_a->mpqpos) || mpq_b->csize > mpq_a->header->archivesize) {
-		return LIBMPQ_EFILE_CORRUPT;
-	}
-
-	/* check if file exists */
-	if ((mpq_b->flags & LIBMPQ_FILE_EXISTS) == 0) {
-		return LIBMPQ_EFILE_NOT_FOUND;
-	}
-
-	switch (infotype) {
-		case LIBMPQ_FILE_COMPRESSED_SIZE:
-			return mpq_b->csize;
-		case LIBMPQ_FILE_UNCOMPRESSED_SIZE:
-			return mpq_b->fsize;
-		case LIBMPQ_FILE_COMPRESSION_TYPE:
-			if (mpq_b->flags & LIBMPQ_FILE_COMPRESS_PKWARE) {
-				return LIBMPQ_FILE_COMPRESS_PKWARE;
-			}
-			if (mpq_b->flags & LIBMPQ_FILE_COMPRESS_MULTI) {
-				return LIBMPQ_FILE_COMPRESS_MULTI;
-			}
-		default:
-			return LIBMPQ_TOOLS_SUCCESS;
-	}
+int libmpq_file_info(mpq_archive* mpq_a, unsigned int infotype, const unsigned int number)
+{
+    int blockindex = number;
+    int i = 0;
+    mpq_block* mpq_b = NULL;
+    mpq_hash* mpq_h = NULL;
+
+    /* check if given number is not out of range */
+    if (number < 0 || number >= mpq_a->header->blocktablesize)
+    {
+        return LIBMPQ_EINV_RANGE;
+    }
+
+    /* check if sizes are correct */
+    mpq_b = mpq_a->blocktable + blockindex;
+    if (mpq_b->filepos > (mpq_a->header->archivesize + mpq_a->mpqpos) || mpq_b->csize > mpq_a->header->archivesize)
+    {
+        return LIBMPQ_EFILE_CORRUPT;
+    }
+
+    /* check if file exists */
+    if ((mpq_b->flags & LIBMPQ_FILE_EXISTS) == 0)
+    {
+        return LIBMPQ_EFILE_NOT_FOUND;
+    }
+
+    switch (infotype)
+    {
+        case LIBMPQ_FILE_COMPRESSED_SIZE:
+            return mpq_b->csize;
+        case LIBMPQ_FILE_UNCOMPRESSED_SIZE:
+            return mpq_b->fsize;
+        case LIBMPQ_FILE_COMPRESSION_TYPE:
+            if (mpq_b->flags & LIBMPQ_FILE_COMPRESS_PKWARE)
+            {
+                return LIBMPQ_FILE_COMPRESS_PKWARE;
+            }
+            if (mpq_b->flags & LIBMPQ_FILE_COMPRESS_MULTI)
+            {
+                return LIBMPQ_FILE_COMPRESS_MULTI;
+            }
+        default:
+            return LIBMPQ_TOOLS_SUCCESS;
+    }
 }
 
 /*
@@ -242,39 +266,44 @@ int libmpq_file_info(mpq_archive *mpq_a, unsigned int infotype, const unsigned i
  * like file000001.xxx and if number is out of range it
  * returns NULL.
  */
-char *libmpq_file_name(mpq_archive *mpq_a, const int number) {
-	static char tempfile[PATH_MAX];
+char* libmpq_file_name(mpq_archive* mpq_a, const int number)
+{
+    static char tempfile[PATH_MAX];
 
-	/* check if we are in the range of available files. */
-	if (number > libmpq_archive_info(mpq_a, LIBMPQ_MPQ_NUMFILES) || number < 1) {
-		return NULL;
-	}
+    /* check if we are in the range of available files. */
+    if (number > libmpq_archive_info(mpq_a, LIBMPQ_MPQ_NUMFILES) || number < 1)
+    {
+        return NULL;
+    }
 
-	/* this is safe because we built a fallback filelist, if something was wrong. */
-	sprintf(tempfile, (char *)mpq_a->mpq_l->mpq_files[number - 1], number);
+    /* this is safe because we built a fallback filelist, if something was wrong. */
+    sprintf(tempfile, (char*)mpq_a->mpq_l->mpq_files[number - 1], number);
 
-	return tempfile;
+    return tempfile;
 }
 
 /*
  *  This function returns the number to the given
  *  filename.
  */
-int libmpq_file_number(mpq_archive *mpq_a, const char *name) {
-	int i;
-	char tempfile[PATH_MAX];
-
-	for (i = 0; mpq_a->mpq_l->mpq_files[i]; i++) {
-		sprintf(tempfile, (char *)mpq_a->mpq_l->mpq_files[i], i + 1);
-		if (strncmp(tempfile, name, strlen(name)) == 0) {
-
-			/* if file found return the number */
-			return i + 1;
-		}
-	}
+int libmpq_file_number(mpq_archive* mpq_a, const char* name)
+{
+    int i;
+    char tempfile[PATH_MAX];
+
+    for (i = 0; mpq_a->mpq_l->mpq_files[i]; i++)
+    {
+        sprintf(tempfile, (char*)mpq_a->mpq_l->mpq_files[i], i + 1);
+        if (strncmp(tempfile, name, strlen(name)) == 0)
+        {
+
+            /* if file found return the number */
+            return i + 1;
+        }
+    }
 
-	/* if no matching entry found return LIBMPQ_EFILE_NOT_FOUND */
-	return LIBMPQ_EFILE_NOT_FOUND;
+    /* if no matching entry found return LIBMPQ_EFILE_NOT_FOUND */
+    return LIBMPQ_EFILE_NOT_FOUND;
 }
 
 /*
@@ -282,143 +311,166 @@ int libmpq_file_number(mpq_archive *mpq_a, const char *name) {
  *  or name) is in the opened mpq archive. On success
  *  it returns 0, otherwise LIBMPQ_EFILE_NOT_FOUND.
  */
-int libmpq_file_check(mpq_archive *mpq_a, void *file, int type) {
-	int found = 0;
-	int i;
-	char tempfile[PATH_MAX];
-
-	switch (type) {
-		case LIBMPQ_FILE_TYPE_INT:
-
-			/* check if we are in the range of available files. */
-			if (*(int *)file > libmpq_archive_info(mpq_a, LIBMPQ_MPQ_NUMFILES) || *(int *)file < 1) {
-				return LIBMPQ_EFILE_NOT_FOUND;
-			} else {
-				return LIBMPQ_TOOLS_SUCCESS;
-			}
-		case LIBMPQ_FILE_TYPE_CHAR:
-			for (i = 0; mpq_a->mpq_l->mpq_files[i]; i++) {
-				sprintf(tempfile, (char *)mpq_a->mpq_l->mpq_files[i], i);
-				if (strncmp(tempfile, (char *)file, strlen((char *)file)) == 0) {
-
-					/* if file found break */
-					found = 1;
-					break;
-				}
-			}
-
-			/* if a file was found return 0 */
-			if (found == 1) {
-				return LIBMPQ_TOOLS_SUCCESS;
-			} else {
-				return LIBMPQ_EFILE_NOT_FOUND;
-			}
-		default:
-			return LIBMPQ_TOOLS_SUCCESS;
-	}
+int libmpq_file_check(mpq_archive* mpq_a, void* file, int type)
+{
+    int found = 0;
+    int i;
+    char tempfile[PATH_MAX];
+
+    switch (type)
+    {
+        case LIBMPQ_FILE_TYPE_INT:
+
+            /* check if we are in the range of available files. */
+            if (*(int*)file > libmpq_archive_info(mpq_a, LIBMPQ_MPQ_NUMFILES) || *(int*)file < 1)
+            {
+                return LIBMPQ_EFILE_NOT_FOUND;
+            }
+            else
+            {
+                return LIBMPQ_TOOLS_SUCCESS;
+            }
+        case LIBMPQ_FILE_TYPE_CHAR:
+            for (i = 0; mpq_a->mpq_l->mpq_files[i]; i++)
+            {
+                sprintf(tempfile, (char*)mpq_a->mpq_l->mpq_files[i], i);
+                if (strncmp(tempfile, (char*)file, strlen((char*)file)) == 0)
+                {
+
+                    /* if file found break */
+                    found = 1;
+                    break;
+                }
+            }
+
+            /* if a file was found return 0 */
+            if (found == 1)
+            {
+                return LIBMPQ_TOOLS_SUCCESS;
+            }
+            else
+            {
+                return LIBMPQ_EFILE_NOT_FOUND;
+            }
+        default:
+            return LIBMPQ_TOOLS_SUCCESS;
+    }
 }
 
 /*
  *  This function extracts a file from a MPQ archive
  *  by the given number.
  */
-int libmpq_file_extract(mpq_archive *mpq_a, const int number, const char *filename) {
-	int blockindex = number; //-1;
-	int fd = 0;
-	int i = 0;
-	char buffer[0x1000];
-	//char tempfile[PATH_MAX];
-	unsigned int transferred = 1;
-	mpq_file *mpq_f = NULL;
-	mpq_block *mpq_b = NULL;
-	mpq_hash *mpq_h = NULL;
-
-/*	if (number < 1 || number > mpq_a->header->blocktablesize) {
-		return LIBMPQ_EINV_RANGE;
-	}*/
-/*
-	sprintf(tempfile, libmpq_file_name(mpq_a, number));
-*/
-	/* check if mpq_f->filename could be written here. */
-	fd = _open(filename, O_RDWR|O_CREAT|O_TRUNC, 0644);
-	if (fd == LIBMPQ_EFILE) {
-		return LIBMPQ_EFILE;
-	}
-
-	/* search for correct hashtable */
-	/*for (i = 0; i < mpq_a->header->hashtablesize; i++) {
-		if ((number - 1) == (mpq_a->hashtable[i]).blockindex) {
-			blockindex = (mpq_a->hashtable[i]).blockindex;
-			mpq_h = &(mpq_a->hashtable[i]);
-			break;
-		}
-	}*/
-
-	/* check if file was found */
-	if (blockindex == -1 || blockindex > mpq_a->header->blocktablesize) {
-		return LIBMPQ_EFILE_NOT_FOUND;
-	}
-
-	/* check if sizes are correct */
-	mpq_b = mpq_a->blocktable + blockindex;
-	if (mpq_b->filepos > (mpq_a->header->archivesize + mpq_a->mpqpos) || mpq_b->csize > mpq_a->header->archivesize) {
-		return LIBMPQ_EFILE_CORRUPT;
-	}
-
-	/* check if file exists */
-	if ((mpq_b->flags & LIBMPQ_FILE_EXISTS) == 0) {
-		return LIBMPQ_EFILE_NOT_FOUND;
-	}
-
-	/* allocate memory for file structure */
-	mpq_f = (mpq_file *)malloc(sizeof(mpq_file));
-	if (!mpq_f) {
-		return LIBMPQ_EALLOCMEM;
-	}
-
-	/* initialize file structure */
-	memset(mpq_f, 0, sizeof(mpq_file));
-	mpq_f->fd             = fd;
-	mpq_f->mpq_b          = mpq_b;
-	mpq_f->nblocks        = (mpq_f->mpq_b->fsize + mpq_a->blocksize - 1) / mpq_a->blocksize;
-	mpq_f->mpq_h          = mpq_h;
-	mpq_f->accessed       = FALSE;
-	mpq_f->blockposloaded = FALSE;
-	sprintf((char *)mpq_f->filename, filename);
-
-	/* allocate buffers for decompression. */
-	if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED) {
-
-		/*
-		 *  Allocate buffer for block positions. At the begin of file are stored
-		 *  unsigned ints holding positions of each block relative from begin of
-		 *  file in the archive.
-		 */
-		if ((mpq_f->blockpos = (unsigned int *)malloc(sizeof(int) * mpq_f->nblocks + 1)) == NULL) {
-			return LIBMPQ_EALLOCMEM;
-		}
-	}
-
-	while (transferred > 0) {
-		transferred = libmpq_file_read_file(mpq_a, mpq_f, mpq_f->filepos, buffer, sizeof(buffer));
-		if (transferred == 0) {
-			break;
-		} else {
-			mpq_f->accessed  = TRUE;
-			mpq_f->filepos  += transferred;
-		}
-
-		transferred = _write(mpq_f->fd, buffer, transferred);
-		if (transferred == 0) {
-			break;
-		}
-	}
-
-	_close(fd);
-
-	/* freeing the file structure */
-	free(mpq_f);
-	return LIBMPQ_TOOLS_SUCCESS;
+int libmpq_file_extract(mpq_archive* mpq_a, const int number, const char* filename)
+{
+    int blockindex = number; //-1;
+    int fd = 0;
+    int i = 0;
+    char buffer[0x1000];
+    //char tempfile[PATH_MAX];
+    unsigned int transferred = 1;
+    mpq_file* mpq_f = NULL;
+    mpq_block* mpq_b = NULL;
+    mpq_hash* mpq_h = NULL;
+
+    /*  if (number < 1 || number > mpq_a->header->blocktablesize) {
+            return LIBMPQ_EINV_RANGE;
+        }*/
+    /*
+        sprintf(tempfile, libmpq_file_name(mpq_a, number));
+    */
+    /* check if mpq_f->filename could be written here. */
+    fd = _open(filename, O_RDWR | O_CREAT | O_TRUNC, 0644);
+    if (fd == LIBMPQ_EFILE)
+    {
+        return LIBMPQ_EFILE;
+    }
+
+    /* search for correct hashtable */
+    /*for (i = 0; i < mpq_a->header->hashtablesize; i++) {
+        if ((number - 1) == (mpq_a->hashtable[i]).blockindex) {
+            blockindex = (mpq_a->hashtable[i]).blockindex;
+            mpq_h = &(mpq_a->hashtable[i]);
+            break;
+        }
+    }*/
+
+    /* check if file was found */
+    if (blockindex == -1 || blockindex > int(mpq_a->header->blocktablesize))
+    {
+        return LIBMPQ_EFILE_NOT_FOUND;
+    }
+
+    /* check if sizes are correct */
+    mpq_b = mpq_a->blocktable + blockindex;
+    if (mpq_b->filepos > (mpq_a->header->archivesize + mpq_a->mpqpos) || mpq_b->csize > mpq_a->header->archivesize)
+    {
+        return LIBMPQ_EFILE_CORRUPT;
+    }
+
+    /* check if file exists */
+    if ((mpq_b->flags & LIBMPQ_FILE_EXISTS) == 0)
+    {
+        return LIBMPQ_EFILE_NOT_FOUND;
+    }
+
+    /* allocate memory for file structure */
+    mpq_f = (mpq_file*)malloc(sizeof(mpq_file));
+    if (!mpq_f)
+    {
+        return LIBMPQ_EALLOCMEM;
+    }
+
+    /* initialize file structure */
+    memset(mpq_f, 0, sizeof(mpq_file));
+    mpq_f->fd             = fd;
+    mpq_f->mpq_b          = mpq_b;
+    mpq_f->nblocks        = (mpq_f->mpq_b->fsize + mpq_a->blocksize - 1) / mpq_a->blocksize;
+    mpq_f->mpq_h          = mpq_h;
+    mpq_f->accessed       = FALSE;
+    mpq_f->blockposloaded = FALSE;
+    sprintf((char*)mpq_f->filename, filename);
+
+    /* allocate buffers for decompression. */
+    if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED)
+    {
+
+        /*
+         *  Allocate buffer for block positions. At the begin of file are stored
+         *  unsigned ints holding positions of each block relative from begin of
+         *  file in the archive.
+         */
+        if ((mpq_f->blockpos = (unsigned int*)malloc(sizeof(int) * mpq_f->nblocks + 1)) == NULL)
+        {
+            return LIBMPQ_EALLOCMEM;
+        }
+    }
+
+    while (transferred > 0)
+    {
+        transferred = libmpq_file_read_file(mpq_a, mpq_f, mpq_f->filepos, buffer, sizeof(buffer));
+        if (transferred == 0)
+        {
+            break;
+        }
+        else
+        {
+            mpq_f->accessed  = TRUE;
+            mpq_f->filepos  += transferred;
+        }
+
+        transferred = _write(mpq_f->fd, buffer, transferred);
+        if (transferred == 0)
+        {
+            break;
+        }
+    }
+
+    _close(fd);
+
+    /* freeing the file structure */
+    free(mpq_f);
+    return LIBMPQ_TOOLS_SUCCESS;
 }
 
 /*
@@ -427,184 +479,204 @@ int libmpq_file_extract(mpq_archive *mpq_a, const int number, const char *filena
  *  some specific archive informations.
  */
 
-int libmpq_listfile_open(mpq_archive *mpq_a, char file[PATH_MAX]) {
-	FILE *fp;
-	//char **filelist;
-	int i = 0;
-	//int fl_count;
-	//int fl_size;
-	int fl_count_fb;
-	int fl_size_fb;
-	int result = LIBMPQ_TOOLS_SUCCESS;
-	struct stat statbuf;
-
-	/* get file status */
-	if (stat(file, &statbuf) < 0) {
-		result = LIBMPQ_CONF_EFILE_NOT_FOUND;
-	}
-
-	/* check if file is a filename or directory */
-	/*if (S_ISDIR(statbuf.st_mode)) {
-
-		// allocate memory for the file list
-		filelist = (char **)malloc(LIBMPQ_CONF_FL_INCREMENT * sizeof(char *));
-		fl_count = 0;
-		fl_size = LIBMPQ_CONF_FL_INCREMENT;
-
-		// check if it is a valid listfile
-		if (libmpq_detect_listfile_rec(file, &filelist, &fl_count, &fl_size)) {
-			filelist == NULL;
-		}
-
-		filelist[fl_count] = NULL;
-
-		// return if no listfile was found
-		if (filelist == NULL) {
-			result = LIBMPQ_CONF_EFILE_NOT_FOUND;
-		}
-
-		for (i = 0; filelist[i]; i++) {
-			if ((fp = fopen(filelist[i], "r")) != NULL ) {
-				result = libmpq_read_listfile(mpq_a, fp);
-				fclose(fp);
-			}
-		}
-
-		// freeing the listfile struct
-		libmpq_free_listfile(filelist);
-	}*/
-
-	/* if file is a regular file use it */
-	//if (S_ISREG(statbuf.st_mode)) {
-
-		/* if specific listfile was forced. */
-		if ((fp = fopen(file, "r")) != NULL ) {
-			result = libmpq_read_listfile(mpq_a, fp);
-			fclose(fp);
-		} else {
-			result = LIBMPQ_CONF_EFILE_OPEN;
-		}
-	//}
-
-	/* if error occured we need to create a fallback filelist. */
-	if (mpq_a->mpq_l->mpq_files == NULL) {
-
-		/* allocate memory for the file list */
-		mpq_a->mpq_l->mpq_files = (unsigned char **)malloc(LIBMPQ_CONF_FL_INCREMENT * sizeof(char *));
-		fl_count_fb = 0;
-		fl_size_fb = LIBMPQ_CONF_FL_INCREMENT;
-
-		for (i = 0; i < libmpq_archive_info(mpq_a, LIBMPQ_MPQ_NUMFILES); i++) {
-
-			/* set the next filelist entry to a copy of the file */
-			mpq_a->mpq_l->mpq_files[fl_count_fb++] = (unsigned char *)_strdup("file%06lu.xxx");
-
-			/* increase the array size */
-			if (fl_count_fb == fl_size_fb) {
-				mpq_a->mpq_l->mpq_files = (unsigned char **)realloc(mpq_a->mpq_l->mpq_files, (fl_size_fb + LIBMPQ_CONF_FL_INCREMENT) * sizeof(char *));
-				fl_size_fb += LIBMPQ_CONF_FL_INCREMENT;
-			}
-		}
-		mpq_a->mpq_l->mpq_files[fl_count_fb] = NULL;
-
-		/* if no error occurs and no listfile was assigned, we think there was no matching listfile. */
-		if (result == 0) {
-			result = LIBMPQ_CONF_EFILE_NOT_FOUND;
-		}
-	}
-
-	return result;
+int libmpq_listfile_open(mpq_archive* mpq_a, char file[PATH_MAX])
+{
+    FILE* fp;
+    //char **filelist;
+    int i = 0;
+    //int fl_count;
+    //int fl_size;
+    int fl_count_fb;
+    int fl_size_fb;
+    int result = LIBMPQ_TOOLS_SUCCESS;
+    struct stat statbuf;
+
+    /* get file status */
+    if (stat(file, &statbuf) < 0)
+    {
+        result = LIBMPQ_CONF_EFILE_NOT_FOUND;
+    }
+
+    /* check if file is a filename or directory */
+    /*if (S_ISDIR(statbuf.st_mode)) {
+
+        // allocate memory for the file list
+        filelist = (char **)malloc(LIBMPQ_CONF_FL_INCREMENT * sizeof(char *));
+        fl_count = 0;
+        fl_size = LIBMPQ_CONF_FL_INCREMENT;
+
+        // check if it is a valid listfile
+        if (libmpq_detect_listfile_rec(file, &filelist, &fl_count, &fl_size)) {
+            filelist == NULL;
+        }
+
+        filelist[fl_count] = NULL;
+
+        // return if no listfile was found
+        if (filelist == NULL) {
+            result = LIBMPQ_CONF_EFILE_NOT_FOUND;
+        }
+
+        for (i = 0; filelist[i]; i++) {
+            if ((fp = fopen(filelist[i], "r")) != NULL ) {
+                result = libmpq_read_listfile(mpq_a, fp);
+                fclose(fp);
+            }
+        }
+
+        // freeing the listfile struct
+        libmpq_free_listfile(filelist);
+    }*/
+
+    /* if file is a regular file use it */
+    //if (S_ISREG(statbuf.st_mode)) {
+
+    /* if specific listfile was forced. */
+    if ((fp = fopen(file, "r")) != NULL)
+    {
+        result = libmpq_read_listfile(mpq_a, fp);
+        fclose(fp);
+    }
+    else
+    {
+        result = LIBMPQ_CONF_EFILE_OPEN;
+    }
+    //}
+
+    /* if error occured we need to create a fallback filelist. */
+    if (mpq_a->mpq_l->mpq_files == NULL)
+    {
+
+        /* allocate memory for the file list */
+        mpq_a->mpq_l->mpq_files = (unsigned char**)malloc(LIBMPQ_CONF_FL_INCREMENT * sizeof(char*));
+        fl_count_fb = 0;
+        fl_size_fb = LIBMPQ_CONF_FL_INCREMENT;
+
+        for (i = 0; i < libmpq_archive_info(mpq_a, LIBMPQ_MPQ_NUMFILES); i++)
+        {
+
+            /* set the next filelist entry to a copy of the file */
+            mpq_a->mpq_l->mpq_files[fl_count_fb++] = (unsigned char*)_strdup("file%06lu.xxx");
+
+            /* increase the array size */
+            if (fl_count_fb == fl_size_fb)
+            {
+                mpq_a->mpq_l->mpq_files = (unsigned char**)realloc(mpq_a->mpq_l->mpq_files, (fl_size_fb + LIBMPQ_CONF_FL_INCREMENT) * sizeof(char*));
+                fl_size_fb += LIBMPQ_CONF_FL_INCREMENT;
+            }
+        }
+        mpq_a->mpq_l->mpq_files[fl_count_fb] = NULL;
+
+        /* if no error occurs and no listfile was assigned, we think there was no matching listfile. */
+        if (result == 0)
+        {
+            result = LIBMPQ_CONF_EFILE_NOT_FOUND;
+        }
+    }
+
+    return result;
 }
 
 /*
  *  This function frees the allocated memory for the listfile.
  */
-int libmpq_listfile_close(mpq_archive *mpq_a) {
-	int i = 0;
-
-	/* safety check if we really have a filelist. */
-	if (mpq_a->mpq_l->mpq_files != NULL) {
-		/* freeing the filelist */
-		while (mpq_a->mpq_l->mpq_files[i]) {
-			free(mpq_a->mpq_l->mpq_files[i++]);
-		}
-		free(mpq_a->mpq_l->mpq_files);
-	}
+int libmpq_listfile_close(mpq_archive* mpq_a)
+{
+    int i = 0;
+
+    /* safety check if we really have a filelist. */
+    if (mpq_a->mpq_l->mpq_files != NULL)
+    {
+        /* freeing the filelist */
+        while (mpq_a->mpq_l->mpq_files[i])
+        {
+            free(mpq_a->mpq_l->mpq_files[i++]);
+        }
+        free(mpq_a->mpq_l->mpq_files);
+    }
     return 0;
 }
 
-int libmpq_file_getdata(mpq_archive *mpq_a, mpq_hash mpq_h, const int number, unsigned char *dest) {
-	int blockindex = number; //-1;
-	int i = 0;
-	mpq_file *mpq_f = NULL;
-	mpq_block *mpq_b = NULL;
-	int success = 0;
-
-	/*if (number < 1 || number > mpq_a->header->blocktablesize) {
-		return LIBMPQ_EINV_RANGE;
-	}*/
-
-	/* search for correct hashtable */
-	/*for (i = 0; i < mpq_a->header->hashtablesize; i++) {
-		if ((number - 1) == (mpq_a->hashtable[i]).blockindex) {
-			blockindex = (mpq_a->hashtable[i]).blockindex;
-			mpq_h = &(mpq_a->hashtable[i]);
-			break;
-		}
-	}*/
-
-	/* check if file was found */
-	if (blockindex == -1 || blockindex > mpq_a->header->blocktablesize) {
-		return LIBMPQ_EFILE_NOT_FOUND;
-	}
-
-	/* check if sizes are correct */
-	mpq_b = mpq_a->blocktable + blockindex;
-	if (mpq_b->filepos > (mpq_a->header->archivesize + mpq_a->mpqpos) || mpq_b->csize > mpq_a->header->archivesize) {
-		return LIBMPQ_EFILE_CORRUPT;
-	}
-
-	/* check if file exists */
-	if ((mpq_b->flags & LIBMPQ_FILE_EXISTS) == 0) {
-		return LIBMPQ_EFILE_NOT_FOUND;
-	}
-
-	/* allocate memory for file structure */
-	mpq_f = (mpq_file*)malloc(sizeof(mpq_file));
-	if (!mpq_f) {
-		return LIBMPQ_EALLOCMEM;
-	}
-
-	/* initialize file structure */
-	memset(mpq_f, 0, sizeof(mpq_file));
-	mpq_f->mpq_b          = mpq_b;
-	mpq_f->nblocks        = (mpq_f->mpq_b->fsize + mpq_a->blocksize - 1) / mpq_a->blocksize;
-	mpq_f->mpq_h          = &mpq_h;
-	mpq_f->accessed       = FALSE;
-	mpq_f->blockposloaded = FALSE;
-
-	/* allocate buffers for decompression. */
-	if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED) {
-
-		/*
-		 *  Allocate buffer for block positions. At the begin of file are stored
-		 *  unsigned ints holding positions of each block relative from begin of
-		 *  file in the archive.
-		 */
-		if ((mpq_f->blockpos = (unsigned int*)malloc(sizeof(int) * (mpq_f->nblocks + 1))) == NULL) {
-			return LIBMPQ_EALLOCMEM;
-		}
-	}
-
-    if(libmpq_file_read_file(mpq_a, mpq_f, 0, (char*)dest, mpq_b->fsize) == mpq_b->fsize)
+int libmpq_file_getdata(mpq_archive* mpq_a, mpq_hash mpq_h, const int number, unsigned char* dest)
+{
+    int blockindex = number; //-1;
+    int i = 0;
+    mpq_file* mpq_f = NULL;
+    mpq_block* mpq_b = NULL;
+    int success = 0;
+
+    /*if (number < 1 || number > mpq_a->header->blocktablesize) {
+        return LIBMPQ_EINV_RANGE;
+    }*/
+
+    /* search for correct hashtable */
+    /*for (i = 0; i < mpq_a->header->hashtablesize; i++) {
+        if ((number - 1) == (mpq_a->hashtable[i]).blockindex) {
+            blockindex = (mpq_a->hashtable[i]).blockindex;
+            mpq_h = &(mpq_a->hashtable[i]);
+            break;
+        }
+    }*/
+
+    /* check if file was found */
+    if (blockindex == -1 || blockindex > int(mpq_a->header->blocktablesize))
+    {
+        return LIBMPQ_EFILE_NOT_FOUND;
+    }
+
+    /* check if sizes are correct */
+    mpq_b = mpq_a->blocktable + blockindex;
+    if (mpq_b->filepos > (mpq_a->header->archivesize + mpq_a->mpqpos) || mpq_b->csize > mpq_a->header->archivesize)
+    {
+        return LIBMPQ_EFILE_CORRUPT;
+    }
+
+    /* check if file exists */
+    if ((mpq_b->flags & LIBMPQ_FILE_EXISTS) == 0)
+    {
+        return LIBMPQ_EFILE_NOT_FOUND;
+    }
+
+    /* allocate memory for file structure */
+    mpq_f = (mpq_file*)malloc(sizeof(mpq_file));
+    if (!mpq_f)
+    {
+        return LIBMPQ_EALLOCMEM;
+    }
+
+    /* initialize file structure */
+    memset(mpq_f, 0, sizeof(mpq_file));
+    mpq_f->mpq_b          = mpq_b;
+    mpq_f->nblocks        = (mpq_f->mpq_b->fsize + mpq_a->blocksize - 1) / mpq_a->blocksize;
+    mpq_f->mpq_h          = &mpq_h;
+    mpq_f->accessed       = FALSE;
+    mpq_f->blockposloaded = FALSE;
+
+    /* allocate buffers for decompression. */
+    if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED)
+    {
+
+        /*
+         *  Allocate buffer for block positions. At the begin of file are stored
+         *  unsigned ints holding positions of each block relative from begin of
+         *  file in the archive.
+         */
+        if ((mpq_f->blockpos = (unsigned int*)malloc(sizeof(int) * (mpq_f->nblocks + 1))) == NULL)
+        {
+            return LIBMPQ_EALLOCMEM;
+        }
+    }
+
+    if (libmpq_file_read_file(mpq_a, mpq_f, 0, (char*)dest, mpq_b->fsize) == mpq_b->fsize)
         success = 1;
 
-    if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED) {
+    if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED)
+    {
         // Free buffer for block positions
 
-	       free(mpq_f->blockpos);
-	}
-	/* freeing the file structure */
-	free(mpq_f);
-	return success?LIBMPQ_TOOLS_SUCCESS:LIBMPQ_EFILE_CORRUPT;
+        free(mpq_f->blockpos);
+    }
+    /* freeing the file structure */
+    free(mpq_f);
+    return success ? LIBMPQ_TOOLS_SUCCESS : LIBMPQ_EFILE_CORRUPT;
 }
diff --git a/contrib/extractor/libmpq/mpq.h b/contrib/extractor/libmpq/mpq.h
index 55b72ad75a9..f5ae6da1764 100644
--- a/contrib/extractor/libmpq/mpq.h
+++ b/contrib/extractor/libmpq/mpq.h
@@ -33,61 +33,61 @@
 #include <limits.h>
 
 #ifndef PATH_MAX
-	#define PATH_MAX 260
+#define PATH_MAX 260
 #endif
 
 
-#define LIBMPQ_MAJOR_VERSION		0		/* Major version number... maybe sometimes we reach version 1 :) */
-#define LIBMPQ_MINOR_VERSION		3		/* Minor version number - increased only for small changes */
-#define LIBMPQ_PATCH_VERSION		0		/* Patchlevel - changed on bugfixes etc... */
-
-#define LIBMPQ_TOOLS_SUCCESS		0		/* return value for all functions which success */
-#define LIBMPQ_TOOLS_BUFSIZE		0x500		/* buffer size for the decryption engine */
-
-#define LIBMPQ_EFILE			-1		/* error on file operation */
-#define LIBMPQ_EFILE_FORMAT		-2		/* bad file format */
-#define LIBMPQ_EFILE_CORRUPT		-3		/* file corrupt */
-#define LIBMPQ_EFILE_NOT_FOUND		-4		/* file in archive not found */
-#define LIBMPQ_EFILE_READ		-5		/* Read error in archive */
-#define LIBMPQ_EALLOCMEM		-6		/* maybe not enough memory? :) */
-#define LIBMPQ_EFREEMEM			-7		/* can not free memory */
-#define LIBMPQ_EINV_RANGE		-8		/* Given filenumber is out of range */
-#define LIBMPQ_EHASHTABLE		-9		/* error in reading hashtable */
-#define LIBMPQ_EBLOCKTABLE		-10		/* error in reading blocktable */
-
-#define LIBMPQ_ID_MPQ			0x1A51504D	/* MPQ archive header ID ('MPQ\x1A') */
-#define LIBMPQ_HEADER_W3M		0x6D9E4B86	/* special value used by W3M Map Protector */
-#define LIBMPQ_FLAG_PROTECTED		0x00000002	/* Set on protected MPQs (like W3M maps) */
-#define LIBMPQ_HASH_ENTRY_DELETED	0xFFFFFFFE	/* Block index for deleted hash entry */
-
-#define LIBMPQ_FILE_COMPRESS_PKWARE	0x00000100	/* Compression made by PKWARE Data Compression Library */
-#define LIBMPQ_FILE_COMPRESS_MULTI	0x00000200	/* Multiple compressions */
-#define LIBMPQ_FILE_COMPRESSED		0x0000FF00	/* File is compressed */
-#define LIBMPQ_FILE_EXISTS		0x80000000	/* Set if file exists, reset when the file was deleted */
-#define LIBMPQ_FILE_ENCRYPTED		0x00010000	/* Indicates whether file is encrypted */
+#define LIBMPQ_MAJOR_VERSION        0       /* Major version number... maybe sometimes we reach version 1 :) */
+#define LIBMPQ_MINOR_VERSION        3       /* Minor version number - increased only for small changes */
+#define LIBMPQ_PATCH_VERSION        0       /* Patchlevel - changed on bugfixes etc... */
+
+#define LIBMPQ_TOOLS_SUCCESS        0       /* return value for all functions which success */
+#define LIBMPQ_TOOLS_BUFSIZE        0x500       /* buffer size for the decryption engine */
+
+#define LIBMPQ_EFILE            -1      /* error on file operation */
+#define LIBMPQ_EFILE_FORMAT     -2      /* bad file format */
+#define LIBMPQ_EFILE_CORRUPT        -3      /* file corrupt */
+#define LIBMPQ_EFILE_NOT_FOUND      -4      /* file in archive not found */
+#define LIBMPQ_EFILE_READ       -5      /* Read error in archive */
+#define LIBMPQ_EALLOCMEM        -6      /* maybe not enough memory? :) */
+#define LIBMPQ_EFREEMEM         -7      /* can not free memory */
+#define LIBMPQ_EINV_RANGE       -8      /* Given filenumber is out of range */
+#define LIBMPQ_EHASHTABLE       -9      /* error in reading hashtable */
+#define LIBMPQ_EBLOCKTABLE      -10     /* error in reading blocktable */
+
+#define LIBMPQ_ID_MPQ           0x1A51504D  /* MPQ archive header ID ('MPQ\x1A') */
+#define LIBMPQ_HEADER_W3M       0x6D9E4B86  /* special value used by W3M Map Protector */
+#define LIBMPQ_FLAG_PROTECTED       0x00000002  /* Set on protected MPQs (like W3M maps) */
+#define LIBMPQ_HASH_ENTRY_DELETED   0xFFFFFFFE  /* Block index for deleted hash entry */
+
+#define LIBMPQ_FILE_COMPRESS_PKWARE 0x00000100  /* Compression made by PKWARE Data Compression Library */
+#define LIBMPQ_FILE_COMPRESS_MULTI  0x00000200  /* Multiple compressions */
+#define LIBMPQ_FILE_COMPRESSED      0x0000FF00  /* File is compressed */
+#define LIBMPQ_FILE_EXISTS      0x80000000  /* Set if file exists, reset when the file was deleted */
+#define LIBMPQ_FILE_ENCRYPTED       0x00010000  /* Indicates whether file is encrypted */
 #define LIBMPQ_FILE_HAS_METADATA    0x04000000
 
-#define LIBMPQ_FILE_COMPRESSED_SIZE	1		/* MPQ compressed filesize of given file */
-#define LIBMPQ_FILE_UNCOMPRESSED_SIZE	2		/* MPQ uncompressed filesize of given file */
-#define LIBMPQ_FILE_COMPRESSION_TYPE	3		/* MPQ compression type of given file */
-#define LIBMPQ_FILE_TYPE_INT		4		/* file is given by number */
-#define LIBMPQ_FILE_TYPE_CHAR		5		/* file is given by name */
+#define LIBMPQ_FILE_COMPRESSED_SIZE 1       /* MPQ compressed filesize of given file */
+#define LIBMPQ_FILE_UNCOMPRESSED_SIZE   2       /* MPQ uncompressed filesize of given file */
+#define LIBMPQ_FILE_COMPRESSION_TYPE    3       /* MPQ compression type of given file */
+#define LIBMPQ_FILE_TYPE_INT        4       /* file is given by number */
+#define LIBMPQ_FILE_TYPE_CHAR       5       /* file is given by name */
 
-#define LIBMPQ_MPQ_ARCHIVE_SIZE		1		/* MPQ archive size */
-#define LIBMPQ_MPQ_HASHTABLE_SIZE	2		/* MPQ archive hashtable size */
-#define LIBMPQ_MPQ_BLOCKTABLE_SIZE	3		/* MPQ archive blocktable size */
-#define LIBMPQ_MPQ_BLOCKSIZE		4		/* MPQ archive blocksize */
-#define LIBMPQ_MPQ_NUMFILES		5		/* Number of files in the MPQ archive */
-#define LIBMPQ_MPQ_COMPRESSED_SIZE	6		/* Compressed archive size */
-#define LIBMPQ_MPQ_UNCOMPRESSED_SIZE	7		/* Uncompressed archive size */
+#define LIBMPQ_MPQ_ARCHIVE_SIZE     1       /* MPQ archive size */
+#define LIBMPQ_MPQ_HASHTABLE_SIZE   2       /* MPQ archive hashtable size */
+#define LIBMPQ_MPQ_BLOCKTABLE_SIZE  3       /* MPQ archive blocktable size */
+#define LIBMPQ_MPQ_BLOCKSIZE        4       /* MPQ archive blocksize */
+#define LIBMPQ_MPQ_NUMFILES     5       /* Number of files in the MPQ archive */
+#define LIBMPQ_MPQ_COMPRESSED_SIZE  6       /* Compressed archive size */
+#define LIBMPQ_MPQ_UNCOMPRESSED_SIZE    7       /* Uncompressed archive size */
 
-#define LIBMPQ_HUFF_DECOMPRESS		0		/* Defines that we want to decompress using huffman trees. */
+#define LIBMPQ_HUFF_DECOMPRESS      0       /* Defines that we want to decompress using huffman trees. */
 
-#define LIBMPQ_CONF_EFILE_OPEN		-1		/* error if a specific listfile was forced and could not be opened. */
-#define LIBMPQ_CONF_EFILE_CORRUPT	-2		/* listfile seems to be corrupt */
-#define LIBMPQ_CONF_EFILE_LIST_CORRUPT	-3		/* listfile seems correct, but filelist is broken */
-#define LIBMPQ_CONF_EFILE_NOT_FOUND	-4		/* error if no matching listfile found */
-#define LIBMPQ_CONF_EFILE_VERSION	-5		/* libmpq version does not match required listfile version */
+#define LIBMPQ_CONF_EFILE_OPEN      -1      /* error if a specific listfile was forced and could not be opened. */
+#define LIBMPQ_CONF_EFILE_CORRUPT   -2      /* listfile seems to be corrupt */
+#define LIBMPQ_CONF_EFILE_LIST_CORRUPT  -3      /* listfile seems correct, but filelist is broken */
+#define LIBMPQ_CONF_EFILE_NOT_FOUND -4      /* error if no matching listfile found */
+#define LIBMPQ_CONF_EFILE_VERSION   -5      /* libmpq version does not match required listfile version */
 
 #ifndef FALSE
 #define FALSE 0
@@ -102,124 +102,132 @@
 #endif
 */
 
-typedef unsigned int	mpq_buffer[LIBMPQ_TOOLS_BUFSIZE];
-typedef int		(*DECOMPRESS)(char *, int *, char *, int);
-typedef struct {
-	unsigned long	mask;		/* Decompression bit */
-	DECOMPRESS	decompress;	/* Decompression function */
+typedef unsigned int    mpq_buffer[LIBMPQ_TOOLS_BUFSIZE];
+typedef int (*DECOMPRESS)(char*, int*, char*, int);
+typedef struct
+{
+    unsigned long   mask;       /* Decompression bit */
+    DECOMPRESS  decompress; /* Decompression function */
 } decompress_table;
 
 /* MPQ file header */
-typedef struct {
-	unsigned int	id;		/* The 0x1A51504D ('MPQ\x1A') signature */
-	unsigned int	offset;		/* Offset of the first file (Relative to MPQ start) */
-	unsigned int	archivesize;	/* Size of MPQ archive */
-	unsigned short	offsetsc;	/* 0000 for SC and BW */
-	unsigned short	blocksize;	/* Size of file block is (0x200 << blockSize) */
-	unsigned int	hashtablepos;	/* File position of hashTable */
-	unsigned int	blocktablepos;	/* File position of blockTable. Each entry has 16 bytes */
-	unsigned int	hashtablesize;	/* Number of entries in hash table */
-	unsigned int	blocktablesize;	/* Number of entries in the block table */
+typedef struct
+{
+    unsigned int    id;     /* The 0x1A51504D ('MPQ\x1A') signature */
+    unsigned int    offset;     /* Offset of the first file (Relative to MPQ start) */
+    unsigned int    archivesize;    /* Size of MPQ archive */
+    unsigned short  offsetsc;   /* 0000 for SC and BW */
+    unsigned short  blocksize;  /* Size of file block is (0x200 << blockSize) */
+    unsigned int    hashtablepos;   /* File position of hashTable */
+    unsigned int    blocktablepos;  /* File position of blockTable. Each entry has 16 bytes */
+    unsigned int    hashtablesize;  /* Number of entries in hash table */
+    unsigned int    blocktablesize; /* Number of entries in the block table */
 } mpq_header;
 //} __attribute__ ((packed)) mpq_header;
 
 
 /* Hash entry. All files in the archive are searched by their hashes. */
-typedef struct {
-	unsigned int	name1;		/* The first two unsigned ints */
-	unsigned int	name2;		/* are the encrypted file name */
-	unsigned int	locale;		/* Locale information. */
-	unsigned int	blockindex;	/* Index to file description block */
+typedef struct
+{
+    unsigned int    name1;      /* The first two unsigned ints */
+    unsigned int    name2;      /* are the encrypted file name */
+    unsigned int    locale;     /* Locale information. */
+    unsigned int    blockindex; /* Index to file description block */
 } mpq_hash;
 
 /* File description block contains informations about the file */
-typedef struct {
-	unsigned int	filepos;	/* Block file starting position in the archive */
-	unsigned int	csize;		/* Compressed file size */
-	unsigned int	fsize;		/* Uncompressed file size */
-	unsigned int	flags;		/* Flags */
+typedef struct
+{
+    unsigned int    filepos;    /* Block file starting position in the archive */
+    unsigned int    csize;      /* Compressed file size */
+    unsigned int    fsize;      /* Uncompressed file size */
+    unsigned int    flags;      /* Flags */
 } mpq_block;
 
 /* File handle structure used since Diablo 1.00 (0x38 bytes) */
-typedef struct {
-	unsigned char	filename[PATH_MAX];	/* filename of the actual file in the archive */
-	int		fd;		/* File handle */
-	unsigned int	seed;		/* Seed used for file decrypt */
-	unsigned int	filepos;	/* Current file position */
-	unsigned int	offset;
-	unsigned int	nblocks;	/* Number of blocks in the file (incl. the last noncomplete one) */
-	unsigned int	*blockpos;	/* Position of each file block (only for compressed files) */
-	int		blockposloaded;	/* TRUE if block positions loaded */
-	unsigned int	offset2;	/* (Number of bytes somewhere ?) */
-	mpq_hash	*mpq_h;		/* Hash table entry */
-	mpq_block	*mpq_b;		/* File block pointer */
-
-	/* Non-Storm.dll members */
-
-	unsigned int	accessed;	/* Was something from the file already read? */
+typedef struct
+{
+    unsigned char   filename[PATH_MAX]; /* filename of the actual file in the archive */
+    int     fd;     /* File handle */
+    unsigned int    seed;       /* Seed used for file decrypt */
+    unsigned int    filepos;    /* Current file position */
+    unsigned int    offset;
+    unsigned int    nblocks;    /* Number of blocks in the file (incl. the last noncomplete one) */
+    unsigned int*    blockpos;  /* Position of each file block (only for compressed files) */
+    int     blockposloaded; /* TRUE if block positions loaded */
+    unsigned int    offset2;    /* (Number of bytes somewhere ?) */
+    mpq_hash*    mpq_h;     /* Hash table entry */
+    mpq_block*   mpq_b;     /* File block pointer */
+
+    /* Non-Storm.dll members */
+
+    unsigned int    accessed;   /* Was something from the file already read? */
 } mpq_file;
 
 /* List handle structure */
-typedef struct {
-	unsigned char	mpq_version[10];	/* libmpq version required by the listfile */
-	unsigned char	mpq_name[PATH_MAX];	/* mpq archive name without full path */
-	unsigned char	mpq_type[20];		/* mpq archive type */
-	unsigned char	mpq_game[40];		/* blizzard title the file matches */
-	unsigned char	mpq_game_version[10];	/* game version */
-	unsigned char	**mpq_files;		/* filelist */
+typedef struct
+{
+    unsigned char   mpq_version[10];    /* libmpq version required by the listfile */
+    unsigned char   mpq_name[PATH_MAX]; /* mpq archive name without full path */
+    unsigned char   mpq_type[20];       /* mpq archive type */
+    unsigned char   mpq_game[40];       /* blizzard title the file matches */
+    unsigned char   mpq_game_version[10];   /* game version */
+    unsigned char**   mpq_files;        /* filelist */
 } mpq_list;
 
 /* Archive handle structure used since Diablo 1.00 */
-typedef struct {
-	unsigned char	filename[PATH_MAX];	/* Opened archive file name */
-	int		fd;		/* File handle */
-	unsigned int	blockpos;	/* Position of loaded block in the file */
-	unsigned int	blocksize;	/* Size of file block */
-	unsigned char	*blockbuf;	/* Buffer (cache) for file block */
-	unsigned int	bufpos;		/* Position in block buffer */
-	unsigned int	mpqpos;		/* MPQ archive position in the file */
-	unsigned int	filepos;	/* Current file pointer */
-	unsigned int	openfiles;	/* Number of open files + 1 */
-	mpq_buffer	buf;		/* MPQ buffer */
-	mpq_header	*header;	/* MPQ file header */
-	mpq_hash	*hashtable;	/* Hash table */
-	mpq_block	*blocktable;	/* Block table */
-
-	/* Non-Storm.dll members */
-
-	mpq_list	*mpq_l;		/* Handle to file list from database */
-
-	unsigned int	flags;		/* See LIBMPQ_TOOLS_FLAG_XXXXX */
-	unsigned int	maxblockindex;	/* The highest block table entry */
+typedef struct
+{
+    unsigned char   filename[PATH_MAX]; /* Opened archive file name */
+    int     fd;     /* File handle */
+    unsigned int    blockpos;   /* Position of loaded block in the file */
+    unsigned int    blocksize;  /* Size of file block */
+    unsigned char*   blockbuf;  /* Buffer (cache) for file block */
+    unsigned int    bufpos;     /* Position in block buffer */
+    unsigned int    mpqpos;     /* MPQ archive position in the file */
+    unsigned int    filepos;    /* Current file pointer */
+    unsigned int    openfiles;  /* Number of open files + 1 */
+    mpq_buffer  buf;        /* MPQ buffer */
+    mpq_header*  header;    /* MPQ file header */
+    mpq_hash*    hashtable; /* Hash table */
+    mpq_block*   blocktable;    /* Block table */
+
+    /* Non-Storm.dll members */
+
+    mpq_list*    mpq_l;     /* Handle to file list from database */
+
+    unsigned int    flags;      /* See LIBMPQ_TOOLS_FLAG_XXXXX */
+    unsigned int    maxblockindex;  /* The highest block table entry */
 } mpq_archive;
 
-extern char *libmpq_version();
-extern int libmpq_archive_open(mpq_archive *mpq_a, unsigned char *mpq_filename);
-extern int libmpq_archive_close(mpq_archive *mpq_a);
-extern int libmpq_archive_info(mpq_archive *mpq_a, unsigned int infotype);
+extern char* libmpq_version();
+extern int libmpq_archive_open(mpq_archive* mpq_a, unsigned char* mpq_filename);
+extern int libmpq_archive_close(mpq_archive* mpq_a);
+extern int libmpq_archive_info(mpq_archive* mpq_a, unsigned int infotype);
 //extern int libmpq_file_extract(mpq_archive *mpq_a, const int number);
-extern int libmpq_file_info(mpq_archive *mpq_a, unsigned int infotype, const unsigned int number);
-extern char *libmpq_file_name(mpq_archive *mpq_a, const int number);
-extern int libmpq_file_number(mpq_archive *mpq_a, const char *name);
-extern int libmpq_file_check(mpq_archive *mpq_a, void *file, int type);
-extern int libmpq_listfile_open(mpq_archive *mpq_a, char file[PATH_MAX]);
-extern int libmpq_listfile_close(mpq_archive *mpq_a);
-
-extern int libmpq_pkzip_decompress(char *out_buf, int *out_length, char *in_buf, int in_length);
-extern int libmpq_zlib_decompress(char *out_buf, int *out_length, char *in_buf, int in_length);
-extern int libmpq_huff_decompress(char *out_buf, int *out_length, char *in_buf, int in_length);
-extern int libmpq_wave_decompress_stereo(char *out_buf, int *out_length, char *in_buf, int in_length);
-extern int libmpq_wave_decompress_mono(char *out_buf, int *out_length, char *in_buf, int in_length);
-extern int libmpq_multi_decompress(char *out_buf, int *pout_length, char *in_buf, int in_length);
-
-static decompress_table dcmp_table[] = {
-	{0x08, libmpq_pkzip_decompress},		/* Decompression with Pkware Data Compression Library */
-	{0x02, libmpq_zlib_decompress},			/* Decompression with the "zlib" library */
-	{0x01, libmpq_huff_decompress},			/* Huffmann decompression */
-	{0x80, libmpq_wave_decompress_stereo},		/* WAVE decompression for stereo waves */
-	{0x40, libmpq_wave_decompress_mono}		/* WAVE decompression for mono waves */
+extern int libmpq_file_info(mpq_archive* mpq_a, unsigned int infotype, const unsigned int number);
+extern char* libmpq_file_name(mpq_archive* mpq_a, const int number);
+extern int libmpq_file_number(mpq_archive* mpq_a, const char* name);
+extern int libmpq_file_check(mpq_archive* mpq_a, void* file, int type);
+extern int libmpq_listfile_open(mpq_archive* mpq_a, char file[PATH_MAX]);
+extern int libmpq_listfile_close(mpq_archive* mpq_a);
+
+extern int libmpq_pkzip_decompress(char* out_buf, int* out_length, char* in_buf, int in_length);
+extern int libmpq_zlib_decompress(char* out_buf, int* out_length, char* in_buf, int in_length);
+extern int libmpq_huff_decompress(char* out_buf, int* out_length, char* in_buf, int in_length);
+extern int libmpq_wave_decompress_stereo(char* out_buf, int* out_length, char* in_buf, int in_length);
+extern int libmpq_wave_decompress_mono(char* out_buf, int* out_length, char* in_buf, int in_length);
+extern int libmpq_multi_decompress(char* out_buf, int* pout_length, char* in_buf, int in_length);
+
+static decompress_table dcmp_table[] =
+{
+    {0x08, libmpq_pkzip_decompress},        /* Decompression with Pkware Data Compression Library */
+    {0x02, libmpq_zlib_decompress},         /* Decompression with the "zlib" library */
+    {0x01, libmpq_huff_decompress},         /* Huffmann decompression */
+    {0x80, libmpq_wave_decompress_stereo},      /* WAVE decompression for stereo waves */
+    {0x40, libmpq_wave_decompress_mono}     /* WAVE decompression for mono waves */
 };
 
-int libmpq_file_extract(mpq_archive *mpq_a, const int number, const char *filename);
-int libmpq_file_getdata(mpq_archive *mpq_a, mpq_hash mpq_h, const int number, unsigned char *dest);
-#endif					/* _MPQ_H */
+int libmpq_file_extract(mpq_archive* mpq_a, const int number, const char* filename);
+int libmpq_file_getdata(mpq_archive* mpq_a, mpq_hash mpq_h, const int number, unsigned char* dest);
+#endif                  /* _MPQ_H */
diff --git a/contrib/extractor/libmpq/parser.cpp b/contrib/extractor/libmpq/parser.cpp
index 435395b8767..7c8553bb3f5 100644
--- a/contrib/extractor/libmpq/parser.cpp
+++ b/contrib/extractor/libmpq/parser.cpp
@@ -33,159 +33,185 @@
  *  escape sequences unaffected. This means that " would be
  *  deleted but \" would not.
  */
-char *libmpq_conf_delete_char(char *buf, char *chars) {
-	static char *temp;
-	char ch;
-
-	temp = buf;
-
-	/* strip out special chars like " */
-	while (temp = strpbrk(temp, chars)) {
-		ch = temp[0];
-		memmove(&temp[0], &temp[1], strlen(temp));
-		if (ch == '\\') {
-			temp++;
-		}
-	}
-
-	return buf;
+char* libmpq_conf_delete_char(char* buf, char* chars)
+{
+    static char* temp;
+    char ch;
+
+    temp = buf;
+
+    /* strip out special chars like " */
+    while (temp = strpbrk(temp, chars))
+    {
+        ch = temp[0];
+        memmove(&temp[0], &temp[1], strlen(temp));
+        if (ch == '\\')
+        {
+            temp++;
+        }
+    }
+
+    return buf;
 }
 
 /*
  *  This function parses a line for the value to the given option. It
  *  return 1 on success and the byte array or 0 and null.
  */
-int libmpq_conf_parse_line(char *line, char *search_value, char *return_value, int size) {
-	int level = 0;
-	int found = 0;
-	int i = 0;
-	int pos = 0;
-
-	/* search value */
-	while (*(++line)) {
-
-		/* check for spaces */
-		if (!isspace(*line) && level == 1) {
-
-			/* we found our value so break */
-			found = 1;
-			break;
-		}
-
-		/* check for '=' so the value follows as next parameter */
-		if (*line == '=' && level == 0) {
-			level = 1;
-		}
-	}
-
-	/* now search for comment in this line */
-	for (i = 0; i < int(strlen(line)); i++) {
-		if (line[i] == '#') {
-			pos = i - 1;
-			break;
-		}
-	}
-
-	/* now set end of byte array behind value, but only if comment was found */
-	if (pos != 0) {
-		for (i = pos; i >= 0; i--) {
-			if (line[i] != ' ' && line[i] != '\t') {
-				line[i + 1] = '\0';
-				break;
-			}
-		}
-	}
-
-	/* now check if line has trailing spaces */
-	for (i = strlen(line); i >= 0; i--) {
-		if (line[i] != ' ' && line[i] != '\t') {
-			line[i + 1] = '\0';
-			break;
-		}
-	}
-
-	/* now check if value is quoted with "" and if there is a char behind. */
-	for (i = strlen(line); i >= 0; i--) {
-		if (line[i] == '"') {
-			line[i + 1] = '\0';
-			break;
-		}
-	}
-
-	/* return the values */
-	strncpy(return_value, line, size);
-	return found;
+int libmpq_conf_parse_line(char* line, char* search_value, char* return_value, int size)
+{
+    int level = 0;
+    int found = 0;
+    int i = 0;
+    int pos = 0;
+
+    /* search value */
+    while (*(++line))
+    {
+
+        /* check for spaces */
+        if (!isspace(*line) && level == 1)
+        {
+
+            /* we found our value so break */
+            found = 1;
+            break;
+        }
+
+        /* check for '=' so the value follows as next parameter */
+        if (*line == '=' && level == 0)
+        {
+            level = 1;
+        }
+    }
+
+    /* now search for comment in this line */
+    for (i = 0; i < int(strlen(line)); i++)
+    {
+        if (line[i] == '#')
+        {
+            pos = i - 1;
+            break;
+        }
+    }
+
+    /* now set end of byte array behind value, but only if comment was found */
+    if (pos != 0)
+    {
+        for (i = pos; i >= 0; i--)
+        {
+            if (line[i] != ' ' && line[i] != '\t')
+            {
+                line[i + 1] = '\0';
+                break;
+            }
+        }
+    }
+
+    /* now check if line has trailing spaces */
+    for (i = strlen(line); i >= 0; i--)
+    {
+        if (line[i] != ' ' && line[i] != '\t')
+        {
+            line[i + 1] = '\0';
+            break;
+        }
+    }
+
+    /* now check if value is quoted with "" and if there is a char behind. */
+    for (i = strlen(line); i >= 0; i--)
+    {
+        if (line[i] == '"')
+        {
+            line[i + 1] = '\0';
+            break;
+        }
+    }
+
+    /* return the values */
+    strncpy(return_value, line, size);
+    return found;
 }
 
 /*
  *  This function returns the value for a given option in the
  *  listdb or config file. On success it returns 1, otherwise 0.
  */
-int libmpq_conf_get_value(FILE *fp, char *search_value, void *return_value, int type, int size) {
-	char buf[LIBMPQ_CONF_BUFSIZE];
-	int found = 0;
-	int result = LIBMPQ_TOOLS_SUCCESS;
-
-	while (fgets(buf, LIBMPQ_CONF_BUFSIZE, fp) != NULL) {
-		char *line;
-
-		buf[strlen(buf) - 1] = '\0';
-
-		/* skip whitespace */
-		for (line = buf; isspace(*line); line++) {
-			continue;
-		}
-
-		/* skip empty line */
-		if (line[0] == '\0') {
-			continue;
-		}
-
-		/* skip comments */
-		if (line[0] == '#') {
-			continue;
-		}
-
-		/* process the line */
-		//if (!strncasecmp(line, search_value, strlen(search_value))) {
-        if (!strcmp(line, search_value)) {
-			found = libmpq_conf_parse_line(line, search_value, line, LIBMPQ_CONF_BUFSIZE);
-			if (found == 1) {
-				libmpq_conf_delete_char(line, "\"\\");
-
-				switch (type) {
-					case LIBMPQ_CONF_TYPE_INT:
-
-						/* if it is no valid number it is safe to return 0 */
-						*(int *)return_value = atoi(line);
-						break;
-					default:
-						strncpy((char *)return_value, line, size);
-						break;
-				}
-
-				/* value found, so rewind stream */
-				break;
-			}
-		}
-	}
-
-	/* if value was not found */
-	if (found == 0) {
-		switch (type) {
-			case LIBMPQ_CONF_TYPE_INT:
-				*(int *)return_value = 0;
-				result = LIBMPQ_CONF_EVALUE_NOT_FOUND;
-				break;
-			default:
-				strncpy((char *)return_value, "", size);
-				result = LIBMPQ_CONF_EVALUE_NOT_FOUND;
-				break;
-		}
-	}
-	fseek(fp, 0L, SEEK_SET);
-
-	return result;
+int libmpq_conf_get_value(FILE* fp, char* search_value, void* return_value, int type, int size)
+{
+    char buf[LIBMPQ_CONF_BUFSIZE];
+    int found = 0;
+    int result = LIBMPQ_TOOLS_SUCCESS;
+
+    while (fgets(buf, LIBMPQ_CONF_BUFSIZE, fp) != NULL)
+    {
+        char* line;
+
+        buf[strlen(buf) - 1] = '\0';
+
+        /* skip whitespace */
+        for (line = buf; isspace(*line); line++)
+        {
+            continue;
+        }
+
+        /* skip empty line */
+        if (line[0] == '\0')
+        {
+            continue;
+        }
+
+        /* skip comments */
+        if (line[0] == '#')
+        {
+            continue;
+        }
+
+        /* process the line */
+        //if (!strncasecmp(line, search_value, strlen(search_value))) {
+        if (!strcmp(line, search_value))
+        {
+            found = libmpq_conf_parse_line(line, search_value, line, LIBMPQ_CONF_BUFSIZE);
+            if (found == 1)
+            {
+                libmpq_conf_delete_char(line, "\"\\");
+
+                switch (type)
+                {
+                    case LIBMPQ_CONF_TYPE_INT:
+
+                        /* if it is no valid number it is safe to return 0 */
+                        *(int*)return_value = atoi(line);
+                        break;
+                    default:
+                        strncpy((char*)return_value, line, size);
+                        break;
+                }
+
+                /* value found, so rewind stream */
+                break;
+            }
+        }
+    }
+
+    /* if value was not found */
+    if (found == 0)
+    {
+        switch (type)
+        {
+            case LIBMPQ_CONF_TYPE_INT:
+                *(int*)return_value = 0;
+                result = LIBMPQ_CONF_EVALUE_NOT_FOUND;
+                break;
+            default:
+                strncpy((char*)return_value, "", size);
+                result = LIBMPQ_CONF_EVALUE_NOT_FOUND;
+                break;
+        }
+    }
+    fseek(fp, 0L, SEEK_SET);
+
+    return result;
 }
 
 /*
@@ -193,102 +219,115 @@ int libmpq_conf_get_value(FILE *fp, char *search_value, void *return_value, int
  *  found in the config file. As second value it returns th number of
  *  entries in the byte array. On success it returns 1, otherwise 0.
  */
-int libmpq_conf_get_array(FILE *fp, char *search_value, char ***filelist, int *entries) {
-	char buf[LIBMPQ_CONF_BUFSIZE];
-	char temp[LIBMPQ_CONF_BUFSIZE];
-	int level = 0;
-	int array_start = 0;
-	int array_end = 0;
-	int fl_count;
-	int fl_size;
-	int found = 0;
-	int i = 0;
-
-	*entries = 0;
-
-	/* allocate memory for the file list */
-	(*filelist) = (char **)malloc(LIBMPQ_CONF_FL_INCREMENT * sizeof(char *));
-	fl_count = 0;
-	fl_size = LIBMPQ_CONF_FL_INCREMENT;
-
-	while (fgets(buf, LIBMPQ_CONF_BUFSIZE, fp) != NULL) {
-		char *line;
-
-		buf[strlen(buf) - 1] = '\0';
-
-		/* skip whitespace */
-		for (line = buf; isspace(*line); line++) {
-			continue;
-		}
-
-		/* skip empty line */
-		if (line[0] == '\0') {
-			continue;
-		}
-
-		/* skip comments */
-		if (line[0] == '#') {
-			continue;
-		}
-
-		/* check for array end ) */
-		if (*line == ')') {
-			array_end = 1;
-			break;
-		}
-
-		/* process entries between () */
-		if (array_start == 1 && array_end == 0) {
-
-			/* add dummy option to use with libmpq_conf_parse_line() */
-			strncpy(temp, "MPQ_BUFFER = ", LIBMPQ_CONF_BUFSIZE);
-			strncat(temp, line, LIBMPQ_CONF_BUFSIZE);
-			found = libmpq_conf_parse_line(temp, "MPQ_BUFFER", temp, LIBMPQ_CONF_BUFSIZE);
-
-			if (found == 1) {
-				libmpq_conf_delete_char(temp, "\"\\");
-
-				/* set the next filelist entry to a copy of the file */
-				(*filelist)[fl_count++] = _strdup(temp);
-
-				/* increase the array size */
-				if (fl_count == fl_size) {
-					(*filelist) = (char **)realloc((*filelist), (fl_size + LIBMPQ_CONF_FL_INCREMENT) * sizeof(char *));
-					fl_size += LIBMPQ_CONF_FL_INCREMENT;
-				}
-
-				/* increase number of entries */
-				(*entries)++;
-			}
-		}
-
-		/* process the line and search array start */
-		//if (!strncasecmp(line, search_value, strlen(search_value))) {
-        if (!strcmp(line, search_value)) {
-
-			/* search value */
-			while (*(++line)) {
-
-				/* check for array start ( */
-				if (*line == '(' && level == 1) {
-
-					/* we found our value so break */
-					array_start = 1;
-					break;
-				}
-
-				/* check for '=' so the value follows as next parameter */
-				if (*line == '=' && level == 0) {
-					level = 1;
-				}
-			}
-		}
-	}
-
-	/* we got all files, so rewind stream */
-	fseek(fp, 0L, SEEK_SET);
-
-	(*filelist)[fl_count] = NULL;
-
-	return found;
+int libmpq_conf_get_array(FILE* fp, char* search_value, char** *filelist, int* entries)
+{
+    char buf[LIBMPQ_CONF_BUFSIZE];
+    char temp[LIBMPQ_CONF_BUFSIZE];
+    int level = 0;
+    int array_start = 0;
+    int array_end = 0;
+    int fl_count;
+    int fl_size;
+    int found = 0;
+    int i = 0;
+
+    *entries = 0;
+
+    /* allocate memory for the file list */
+    (*filelist) = (char**)malloc(LIBMPQ_CONF_FL_INCREMENT * sizeof(char*));
+    fl_count = 0;
+    fl_size = LIBMPQ_CONF_FL_INCREMENT;
+
+    while (fgets(buf, LIBMPQ_CONF_BUFSIZE, fp) != NULL)
+    {
+        char* line;
+
+        buf[strlen(buf) - 1] = '\0';
+
+        /* skip whitespace */
+        for (line = buf; isspace(*line); line++)
+        {
+            continue;
+        }
+
+        /* skip empty line */
+        if (line[0] == '\0')
+        {
+            continue;
+        }
+
+        /* skip comments */
+        if (line[0] == '#')
+        {
+            continue;
+        }
+
+        /* check for array end ) */
+        if (*line == ')')
+        {
+            array_end = 1;
+            break;
+        }
+
+        /* process entries between () */
+        if (array_start == 1 && array_end == 0)
+        {
+
+            /* add dummy option to use with libmpq_conf_parse_line() */
+            strncpy(temp, "MPQ_BUFFER = ", LIBMPQ_CONF_BUFSIZE);
+            strncat(temp, line, LIBMPQ_CONF_BUFSIZE);
+            found = libmpq_conf_parse_line(temp, "MPQ_BUFFER", temp, LIBMPQ_CONF_BUFSIZE);
+
+            if (found == 1)
+            {
+                libmpq_conf_delete_char(temp, "\"\\");
+
+                /* set the next filelist entry to a copy of the file */
+                (*filelist)[fl_count++] = _strdup(temp);
+
+                /* increase the array size */
+                if (fl_count == fl_size)
+                {
+                    (*filelist) = (char**)realloc((*filelist), (fl_size + LIBMPQ_CONF_FL_INCREMENT) * sizeof(char*));
+                    fl_size += LIBMPQ_CONF_FL_INCREMENT;
+                }
+
+                /* increase number of entries */
+                (*entries)++;
+            }
+        }
+
+        /* process the line and search array start */
+        //if (!strncasecmp(line, search_value, strlen(search_value))) {
+        if (!strcmp(line, search_value))
+        {
+
+            /* search value */
+            while (*(++line))
+            {
+
+                /* check for array start ( */
+                if (*line == '(' && level == 1)
+                {
+
+                    /* we found our value so break */
+                    array_start = 1;
+                    break;
+                }
+
+                /* check for '=' so the value follows as next parameter */
+                if (*line == '=' && level == 0)
+                {
+                    level = 1;
+                }
+            }
+        }
+    }
+
+    /* we got all files, so rewind stream */
+    fseek(fp, 0L, SEEK_SET);
+
+    (*filelist)[fl_count] = NULL;
+
+    return found;
 }
diff --git a/contrib/extractor/libmpq/wave.cpp b/contrib/extractor/libmpq/wave.cpp
index d8907611dc1..543c1e9e642 100644
--- a/contrib/extractor/libmpq/wave.cpp
+++ b/contrib/extractor/libmpq/wave.cpp
@@ -28,26 +28,28 @@
 #include "wave.h"
 
 /* Tables necessary dor decompression */
-static unsigned long wave_table_1503f120[] = {
-	0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000006,
-	0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
-	0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
-	0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008
+static unsigned long wave_table_1503f120[] =
+{
+    0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000006,
+    0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
+    0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
+    0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008
 };
 
-static unsigned long wave_table_1503f1a0[] = {
-	0x00000007, 0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E,
-	0x00000010, 0x00000011, 0x00000013, 0x00000015, 0x00000017, 0x00000019, 0x0000001C, 0x0000001F,
-	0x00000022, 0x00000025, 0x00000029, 0x0000002D, 0x00000032, 0x00000037, 0x0000003C, 0x00000042,
-	0x00000049, 0x00000050, 0x00000058, 0x00000061, 0x0000006B, 0x00000076, 0x00000082, 0x0000008F,
-	0x0000009D, 0x000000AD, 0x000000BE, 0x000000D1, 0x000000E6, 0x000000FD, 0x00000117, 0x00000133,
-	0x00000151, 0x00000173, 0x00000198, 0x000001C1, 0x000001EE, 0x00000220, 0x00000256, 0x00000292,
-	0x000002D4, 0x0000031C, 0x0000036C, 0x000003C3, 0x00000424, 0x0000048E, 0x00000502, 0x00000583,
-	0x00000610, 0x000006AB, 0x00000756, 0x00000812, 0x000008E0, 0x000009C3, 0x00000ABD, 0x00000BD0,
-	0x00000CFF, 0x00000E4C, 0x00000FBA, 0x0000114C, 0x00001307, 0x000014EE, 0x00001706, 0x00001954,
-	0x00001BDC, 0x00001EA5, 0x000021B6, 0x00002515, 0x000028CA, 0x00002CDF, 0x0000315B, 0x0000364B,
-	0x00003BB9, 0x000041B2, 0x00004844, 0x00004F7E, 0x00005771, 0x0000602F, 0x000069CE, 0x00007462,
-	0x00007FFF
+static unsigned long wave_table_1503f1a0[] =
+{
+    0x00000007, 0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E,
+    0x00000010, 0x00000011, 0x00000013, 0x00000015, 0x00000017, 0x00000019, 0x0000001C, 0x0000001F,
+    0x00000022, 0x00000025, 0x00000029, 0x0000002D, 0x00000032, 0x00000037, 0x0000003C, 0x00000042,
+    0x00000049, 0x00000050, 0x00000058, 0x00000061, 0x0000006B, 0x00000076, 0x00000082, 0x0000008F,
+    0x0000009D, 0x000000AD, 0x000000BE, 0x000000D1, 0x000000E6, 0x000000FD, 0x00000117, 0x00000133,
+    0x00000151, 0x00000173, 0x00000198, 0x000001C1, 0x000001EE, 0x00000220, 0x00000256, 0x00000292,
+    0x000002D4, 0x0000031C, 0x0000036C, 0x000003C3, 0x00000424, 0x0000048E, 0x00000502, 0x00000583,
+    0x00000610, 0x000006AB, 0x00000756, 0x00000812, 0x000008E0, 0x000009C3, 0x00000ABD, 0x00000BD0,
+    0x00000CFF, 0x00000E4C, 0x00000FBA, 0x0000114C, 0x00001307, 0x000014EE, 0x00001706, 0x00001954,
+    0x00001BDC, 0x00001EA5, 0x000021B6, 0x00002515, 0x000028CA, 0x00002CDF, 0x0000315B, 0x0000364B,
+    0x00003BB9, 0x000041B2, 0x00004844, 0x00004F7E, 0x00005771, 0x0000602F, 0x000069CE, 0x00007462,
+    0x00007FFF
 };
 
 /*
@@ -55,131 +57,162 @@ static unsigned long wave_table_1503f1a0[] = {
  *
  *  Offset: 1500F230
  */
-int libmpq_wave_decompress(unsigned char *out_buf, int out_length, unsigned char *in_buf, int in_length, int channels) {
-	byte_and_short out;
-	byte_and_short in;
-	unsigned char *in_end = in_buf + in_length;	/* End on input buffer */
-	unsigned long index;
-	long nr_array1[2];
-	long nr_array2[2];
-	int count = 0;
+int libmpq_wave_decompress(unsigned char* out_buf, int out_length, unsigned char* in_buf, int in_length, int channels)
+{
+    byte_and_short out;
+    byte_and_short in;
+    unsigned char* in_end = in_buf + in_length; /* End on input buffer */
+    unsigned long index;
+    long nr_array1[2];
+    long nr_array2[2];
+    int count = 0;
 
-	out.pb     = out_buf;
-	in.pb      = in_buf;
-	nr_array1[0] = 0x2C;
-	nr_array1[1] = 0x2C;
-	in.pw++;
+    out.pb     = out_buf;
+    in.pb      = in_buf;
+    nr_array1[0] = 0x2C;
+    nr_array1[1] = 0x2C;
+    in.pw++;
 
-	/* 15007AD7 */
-	for (count = 0; count < channels; count++) {
-		long temp;
-		temp = *(short *)in.pw++;
-		nr_array2[count] = temp;
-		if (out_length < 2) {
-			return out.pb - out_buf;
-		}
-		*out.pw++   = (unsigned short)temp;
-		out_length -= 2;
-	}
-	index = channels - 1;
-	while (in.pb < in_end) {
-		unsigned char one_byte = *in.pb++;
-		if (channels == 2) {
-			index = (index == 0) ? 1 : 0;
-		}
+    /* 15007AD7 */
+    for (count = 0; count < channels; count++)
+    {
+        long temp;
+        temp = *(short*)in.pw++;
+        nr_array2[count] = temp;
+        if (out_length < 2)
+        {
+            return out.pb - out_buf;
+        }
+        *out.pw++   = (unsigned short)temp;
+        out_length -= 2;
+    }
+    index = channels - 1;
+    while (in.pb < in_end)
+    {
+        unsigned char one_byte = *in.pb++;
+        if (channels == 2)
+        {
+            index = (index == 0) ? 1 : 0;
+        }
 
-		/*
-		 * Get one byte from input buffer
-		 * 15007B25
-		 */
-		if (one_byte & 0x80) {
-			/* 15007B32 */
-			switch(one_byte & 0x7F) {
-				case 0:					/* 15007B8E */
-					if (nr_array1[index] != 0) {
-						nr_array1[index]--;
-					}
-					if (out_length < 2) {
-						break;
-					}
-					*out.pw++ = (unsigned short)nr_array2[index];
-					out_length -= 2;
-					continue;
-				case 1:					/* 15007B72 */
-					nr_array1[index] += 8;		/* EBX also */
-					if (nr_array1[index] > 0x58) {
-						nr_array1[index] = 0x58;
-					}
-					if (channels == 2) {
-						index = (index == 0) ? 1 : 0;
-					}
-					continue;
-				case 2:
-					continue;
-				default:
-					nr_array1[index] -= 8;
-					if (nr_array1[index] < 0) {
-						nr_array1[index] = 0;
-					}
-					if (channels != 2) {
-						continue;
-					}
-					index = (index == 0) ? 1 : 0;
-					continue;
-			}
-		} else {
-			unsigned long temp1 = wave_table_1503f1a0[nr_array1[index]];	/* EDI */
-			unsigned long temp2 = temp1 >> in_buf[1];	/* ESI */
-			long temp3 = nr_array2[index];			/* ECX */
-			if (one_byte & 0x01) {				/* EBX = one_byte */
-				temp2 += (temp1 >> 0);
-			}
-			if (one_byte & 0x02) {
-				temp2 += (temp1 >> 1);
-			}
-			if (one_byte & 0x04) {
-				temp2 += (temp1 >> 2);
-			}
-			if (one_byte & 0x08) {
-				temp2 += (temp1 >> 3);
-			}
-			if (one_byte & 0x10) {
-				temp2 += (temp1 >> 4);
-			}
-			if (one_byte & 0x20) {
-				temp2 += (temp1 >> 5);
-			}
-			if(one_byte & 0x40) {
-				temp3 -= temp2;
-				if (temp3 <= (long)0xFFFF8000) {
-					temp3 = (long)0xFFFF8000;
-				}
-			} else {
-				temp3 += temp2;
-				if (temp3 >= 0x7FFF) {
-					temp3 = 0x7FFF;
-				}
-			}
-			nr_array2[index] = temp3;
-			if (out_length < 2) {
-				break;
-			}
+        /*
+         * Get one byte from input buffer
+         * 15007B25
+         */
+        if (one_byte & 0x80)
+        {
+            /* 15007B32 */
+            switch (one_byte & 0x7F)
+            {
+                case 0:                 /* 15007B8E */
+                    if (nr_array1[index] != 0)
+                    {
+                        nr_array1[index]--;
+                    }
+                    if (out_length < 2)
+                    {
+                        break;
+                    }
+                    *out.pw++ = (unsigned short)nr_array2[index];
+                    out_length -= 2;
+                    continue;
+                case 1:                 /* 15007B72 */
+                    nr_array1[index] += 8;      /* EBX also */
+                    if (nr_array1[index] > 0x58)
+                    {
+                        nr_array1[index] = 0x58;
+                    }
+                    if (channels == 2)
+                    {
+                        index = (index == 0) ? 1 : 0;
+                    }
+                    continue;
+                case 2:
+                    continue;
+                default:
+                    nr_array1[index] -= 8;
+                    if (nr_array1[index] < 0)
+                    {
+                        nr_array1[index] = 0;
+                    }
+                    if (channels != 2)
+                    {
+                        continue;
+                    }
+                    index = (index == 0) ? 1 : 0;
+                    continue;
+            }
+        }
+        else
+        {
+            unsigned long temp1 = wave_table_1503f1a0[nr_array1[index]];    /* EDI */
+            unsigned long temp2 = temp1 >> in_buf[1];   /* ESI */
+            long temp3 = nr_array2[index];          /* ECX */
+            if (one_byte & 0x01)                /* EBX = one_byte */
+            {
+                temp2 += (temp1 >> 0);
+            }
+            if (one_byte & 0x02)
+            {
+                temp2 += (temp1 >> 1);
+            }
+            if (one_byte & 0x04)
+            {
+                temp2 += (temp1 >> 2);
+            }
+            if (one_byte & 0x08)
+            {
+                temp2 += (temp1 >> 3);
+            }
+            if (one_byte & 0x10)
+            {
+                temp2 += (temp1 >> 4);
+            }
+            if (one_byte & 0x20)
+            {
+                temp2 += (temp1 >> 5);
+            }
+            if (one_byte & 0x40)
+            {
+                temp3 -= temp2;
+                if (temp3 <= (long)0xFFFF8000)
+                {
+                    temp3 = (long)0xFFFF8000;
+                }
+            }
+            else
+            {
+                temp3 += temp2;
+                if (temp3 >= 0x7FFF)
+                {
+                    temp3 = 0x7FFF;
+                }
+            }
+            nr_array2[index] = temp3;
+            if (out_length < 2)
+            {
+                break;
+            }
 
-			temp2 = nr_array1[index];
-			one_byte &= 0x1F;
-			*out.pw++ = (unsigned short)temp3;
-			out_length -= 2;
-			temp2 += wave_table_1503f120[one_byte];
-			nr_array1[index] = temp2;
+            temp2 = nr_array1[index];
+            one_byte &= 0x1F;
+            *out.pw++ = (unsigned short)temp3;
+            out_length -= 2;
+            temp2 += wave_table_1503f120[one_byte];
+            nr_array1[index] = temp2;
 
-			if (nr_array1[index] < 0) {
-				nr_array1[index] = 0;
-			} else {
-				if (nr_array1[index] > 0x58) {
-					nr_array1[index] = 0x58;
-				}
-			}
-		}
-	}
-	return (out.pb - out_buf);
+            if (nr_array1[index] < 0)
+            {
+                nr_array1[index] = 0;
+            }
+            else
+            {
+                if (nr_array1[index] > 0x58)
+                {
+                    nr_array1[index] = 0x58;
+                }
+            }
+        }
+    }
+    return (out.pb - out_buf);
 }
diff --git a/contrib/extractor/libmpq/wave.h b/contrib/extractor/libmpq/wave.h
index 5beb97a72be..e7ff3c495fa 100644
--- a/contrib/extractor/libmpq/wave.h
+++ b/contrib/extractor/libmpq/wave.h
@@ -27,11 +27,12 @@
 #ifndef _WAVE_H
 #define _WAVE_H
 
-typedef union {
-	unsigned short	*pw;
-	unsigned char	*pb;
+typedef union
+{
+    unsigned short*  pw;
+    unsigned char*   pb;
 } byte_and_short;
 
-int libmpq_wave_decompress(unsigned char *out_buf, int out_length, unsigned char *in_buf, int in_length, int channels);
+int libmpq_wave_decompress(unsigned char* out_buf, int out_length, unsigned char* in_buf, int in_length, int channels);
 
-#endif					/* _WAVE_H */
+#endif                  /* _WAVE_H */
diff --git a/contrib/extractor/libmpq/zconf.h b/contrib/extractor/libmpq/zconf.h
index 3cea897eda7..e97ac41b67b 100644
--- a/contrib/extractor/libmpq/zconf.h
+++ b/contrib/extractor/libmpq/zconf.h
@@ -152,7 +152,7 @@
  for small objects.
 */
 
-                        /* Type declarations */
+/* Type declarations */
 
 #ifndef OF /* function prototypes */
 #  ifdef STDC
@@ -170,7 +170,7 @@
  */
 #ifdef SYS16BIT
 #  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
+/* MSC small or medium model */
 #    define SMALL_MEDIUM
 #    ifdef _MSC_VER
 #      define FAR _far
@@ -179,7 +179,7 @@
 #    endif
 #  endif
 #  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
+/* Turbo C small or medium model */
 #    define SMALL_MEDIUM
 #    ifdef __BORLANDC__
 #      define FAR _far
@@ -190,9 +190,9 @@
 #endif
 
 #if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
+/* If building or using zlib as a DLL, define ZLIB_DLL.
+ * This is not mandatory, but it offers a little performance increase.
+ */
 #  ifdef ZLIB_DLL
 #    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
 #      ifdef ZLIB_INTERNAL
@@ -202,17 +202,17 @@
 #      endif
 #    endif
 #  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
+/* If building or using zlib with the WINAPI/WINAPIV calling convention,
+ * define ZLIB_WINAPI.
+ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+ */
 #  ifdef ZLIB_WINAPI
 #    ifdef FAR
 #      undef FAR
 #    endif
 #    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+/* No need for _export, use ZLIB.DEF instead. */
+/* For complete Windows compatibility, use WINAPI, not __stdcall. */
 #    define ZEXPORT WINAPI
 #    ifdef WIN32
 #      define ZEXPORTVA WINAPIV
@@ -255,10 +255,10 @@ typedef unsigned int   uInt;  /* 16 bits or more */
 typedef unsigned long  uLong; /* 32 bits or more */
 
 #ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
 #  define Bytef Byte FAR
 #else
-   typedef Byte  FAR Bytef;
+typedef Byte  FAR Bytef;
 #endif
 typedef char  FAR charf;
 typedef int   FAR intf;
@@ -266,13 +266,13 @@ typedef uInt  FAR uIntf;
 typedef uLong FAR uLongf;
 
 #ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
+typedef void const* voidpc;
+typedef void FAR*   voidpf;
+typedef void*       voidp;
 #else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
+typedef Byte const* voidpc;
+typedef Byte FAR*   voidpf;
+typedef Byte*       voidp;
 #endif
 
 #if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
diff --git a/contrib/extractor/libmpq/zlib.h b/contrib/extractor/libmpq/zlib.h
index 92edf96ff3e..ced8f3a55b1 100644
--- a/contrib/extractor/libmpq/zlib.h
+++ b/contrib/extractor/libmpq/zlib.h
@@ -40,103 +40,104 @@ extern "C" {
 #define ZLIB_VERSION "1.2.1"
 #define ZLIB_VERNUM 0x1210
 
-/*
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The compressed data format used by the in-memory functions is the zlib
-  format, which is a zlib wrapper documented in RFC 1950, wrapped around a
-  deflate stream, which is itself documented in RFC 1951.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-     The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-     This library does not provide any functions to write gzip files in memory.
-  However such functions could be easily written using zlib's deflate function,
-  the documentation in the gzip RFC, and the examples in gzio.c.
-
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: ascii or binary */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
+    /*
+         The 'zlib' compression library provides in-memory compression and
+      decompression functions, including integrity checks of the uncompressed
+      data.  This version of the library supports only one compression method
+      (deflation) but other algorithms will be added later and will have the same
+      stream interface.
+
+         Compression can be done in a single step if the buffers are large
+      enough (for example if an input file is mmap'ed), or can be done by
+      repeated calls of the compression function.  In the latter case, the
+      application must provide more input and/or consume the output
+      (providing more output space) before each call.
+
+         The compressed data format used by the in-memory functions is the zlib
+      format, which is a zlib wrapper documented in RFC 1950, wrapped around a
+      deflate stream, which is itself documented in RFC 1951.
+
+         The library also supports reading and writing files in gzip (.gz) format
+      with an interface similar to that of stdio using the functions that start
+      with "gz".  The gzip format is different from the zlib format.  gzip is a
+      gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+         The zlib format was designed to be compact and fast for use in memory
+      and on communications channels.  The gzip format was designed for single-
+      file compression on file systems, has a larger header than zlib to maintain
+      directory information, and uses a different, slower check method than zlib.
+
+         This library does not provide any functions to write gzip files in memory.
+      However such functions could be easily written using zlib's deflate function,
+      the documentation in the gzip RFC, and the examples in gzio.c.
+
+         The library does not install any signal handler. The decoder checks
+      the consistency of the compressed data, so the library should never
+      crash even in case of corrupted input.
+    */
+
+    typedef voidpf(*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+    typedef void (*free_func)  OF((voidpf opaque, voidpf address));
+
+    struct internal_state;
+
+    typedef struct z_stream_s
+    {
+        Bytef*    next_in;  /* next input byte */
+        uInt     avail_in;  /* number of bytes available at next_in */
+        uLong    total_in;  /* total nb of input bytes read so far */
+
+        Bytef*    next_out; /* next output byte should be put there */
+        uInt     avail_out; /* remaining free space at next_out */
+        uLong    total_out; /* total nb of bytes output so far */
+
+        char*     msg;      /* last error message, NULL if no error */
+        struct internal_state FAR* state; /* not visible by applications */
+
+        alloc_func zalloc;  /* used to allocate the internal state */
+        free_func  zfree;   /* used to free the internal state */
+        voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
+        int     data_type;  /* best guess about the data type: ascii or binary */
+        uLong   adler;      /* adler32 value of the uncompressed data */
+        uLong   reserved;   /* reserved for future use */
+    } z_stream;
+
+    typedef z_stream FAR* z_streamp;
+
+    /*
+       The application must update next_in and avail_in when avail_in has
+       dropped to zero. It must update next_out and avail_out when avail_out
+       has dropped to zero. The application must initialize zalloc, zfree and
+       opaque before calling the init function. All other fields are set by the
+       compression library and must not be updated by the application.
+
+       The opaque value provided by the application will be passed as the first
+       parameter for calls of zalloc and zfree. This can be useful for custom
+       memory management. The compression library attaches no meaning to the
+       opaque value.
+
+       zalloc must return Z_NULL if there is not enough memory for the object.
+       If zlib is used in a multi-threaded application, zalloc and zfree must be
+       thread safe.
+
+       On 16-bit systems, the functions zalloc and zfree must be able to allocate
+       exactly 65536 bytes, but will not be required to allocate more than this
+       if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+       pointers returned by zalloc for objects of exactly 65536 bytes *must*
+       have their offset normalized to zero. The default allocation function
+       provided by this library ensures this (see zutil.c). To reduce memory
+       requirements and avoid any allocation of 64K objects, at the expense of
+       compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
+
+       The fields total_in and total_out can be used for statistics or
+       progress reports. After compression, total_in holds the total size of
+       the uncompressed data and may be saved for use in the decompressor
+       (particularly if the decompressor wants to decompress everything in
+       a single step).
+    */
+
+    /* constants */
 
 #define Z_NO_FLUSH      0
 #define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
@@ -144,7 +145,7 @@ typedef z_stream FAR *z_streamp;
 #define Z_FULL_FLUSH    3
 #define Z_FINISH        4
 #define Z_BLOCK         5
-/* Allowed flush values; see deflate() and inflate() below for details */
+    /* Allowed flush values; see deflate() and inflate() below for details */
 
 #define Z_OK            0
 #define Z_STREAM_END    1
@@ -155,1022 +156,1022 @@ typedef z_stream FAR *z_streamp;
 #define Z_MEM_ERROR    (-4)
 #define Z_BUF_ERROR    (-5)
 #define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
+    /* Return codes for the compression/decompression functions. Negative
+     * values are errors, positive values are used for special but normal events.
+     */
 
 #define Z_NO_COMPRESSION         0
 #define Z_BEST_SPEED             1
 #define Z_BEST_COMPRESSION       9
 #define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
+    /* compression levels */
 
 #define Z_FILTERED            1
 #define Z_HUFFMAN_ONLY        2
 #define Z_RLE                 3
 #define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
+    /* compression strategy; see deflateInit2() below for details */
 
 #define Z_BINARY   0
 #define Z_ASCII    1
 #define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
+    /* Possible values of the data_type field (though see inflate()) */
 
 #define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
+    /* The deflate compression method (the only one supported in this version) */
 
 #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
 
 #define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  the compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  the value returned by deflateBound (see below). If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update data_type if it can make a good guess about
-  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  if and when it get to the next deflate block boundary. When decoding the zlib
-  or gzip format, this will cause inflate() to return immediately after the
-  header and before the first block. When doing a raw inflate, inflate() will
-  go ahead and process the first block, and will return when it gets to the end
-  of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64
-  if inflate() is currently decoding the last block in the deflate stream,
-  plus 128 if inflate() returned immediately after decoding an end-of-block
-  code or decoding the complete header up to just before the first byte of the
-  deflate stream. The end-of-block will not be indicated until all of the
-  uncompressed data from that block has been written to strm->next_out.  The
-  number of unused bits may in general be greater than seven, except when
-  bit 7 of data_type is set, in which case the number of unused bits will be
-  less than eight.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster approach
-  may be used for the single inflate() call.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call. So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm-adler to the adler32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below. At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically.  Any information
-  contained in the gzip header is not retained, so applications that need that
-  information should instead use raw inflate, see inflateInit2() below, or
-  inflateBack() and perform their own processing of the gzip header and
-  trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing. If Z_DATA_ERROR is returned, the application may then
-  call inflateSync() to look for a good compression block if a partial recovery
-  of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer). It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-   determines the window size. deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding. Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper. The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero),
-   no header crc, and the operating system will be set to 255 (unknown).
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding). Filtered data consists mostly of small values with a somewhat
-   random distribution. In this case, the compression algorithm is tuned to
-   compress them better. The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
-   parameter only affects the compression ratio but not the correctness of the
-   compressed output even if it is not set appropriately.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit()
-   or deflateInit2().  This would be used to allocate an output buffer
-   for deflation in a single pass, and so would be called before deflate().
-*/
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-  is that this function is used to start off the deflate output with the
-  bits leftover from a previous deflate stream when appending to it.  As such,
-  this function can only be used for raw deflate, and must be used before the
-  first deflate() call after a deflateInit2() or deflateReset().  bits must be
-  less than or equal to 16, and that many of the least significant bits of
-  value will be inserted in the output.
-
-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used. If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-   determines the window size. inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream. This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values. If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is. Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding. Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
-   memLevel). msg is set to null if there is no error message.  inflateInit2
-   does not perform any decompression apart from reading the zlib header if
-   present: this will be done by inflate(). (So next_in and avail_in may be
-   modified, but next_out and avail_out are unchanged.)
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate
-   if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by this call of
-   inflate. The compressor and decompressor must use exactly the same
-   dictionary (see deflateSetDictionary).
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-   be allocated, or Z_VERSION_ERROR if the version of the library does not
-   match the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR *strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free
-   the allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects
-   only the raw deflate stream to decompress.  This is different from the
-   normal behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format
-   error in the deflate stream (in which case strm->msg is set to indicate the
-   nature of the error), or Z_STREAM_ERROR if the stream was not properly
-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
-   distinguished using strm->next_in which will be Z_NULL only if in() returned
-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
-   out() returning non-zero.  (in() will always be called before out(), so
-   strm->next_in is assured to be defined if out() returns non-zero.)  Note
-   that inflateBack() cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_stream FAR *strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least the value returned
-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before
-   a compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
-*/
-
-
-typedef voidp gzFile;
-
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h", or 'R' for run-length encoding
-   as in "wb1R". (See the description of deflateInit2 for more information
-   about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-                                   voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).  The number of
-   uncompressed bytes written is limited to 4095. The caller should assure that
-   this limit is not exceeded. If it is exceeded, then gzprintf() will return
-   return an error (0) with nothing written. In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
-/*
-      Push one character back onto the stream to be read again later.
-   Only one character of push-back is allowed.  gzungetc() returns the
-   character pushed, or -1 on failure.  gzungetc() will fail if a
-   character has been pushed but not read yet, or if c is -1. The pushed
-   character will be discarded if the stream is repositioned with gzseek()
-   or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-                                      z_off_t offset, int whence));
-/*
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-/*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file. This is analogous to the
-   clearerr() function in stdio. This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running crc with the bytes buf[0..len-1] and return the updated
-   crc. If buf is NULL, this function returns the required initial value
-   for the crc. Pre- and post-conditioning (one's complement) is performed
-   within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
+    /* for compatibility with versions < 1.0.2 */
+
+    /* basic functions */
+
+    ZEXTERN const char* ZEXPORT zlibVersion OF((void));
+    /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+       If the first character differs, the library code actually used is
+       not compatible with the zlib.h header file used by the application.
+       This check is automatically made by deflateInit and inflateInit.
+     */
+
+    /*
+    ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+         Initializes the internal stream state for compression. The fields
+       zalloc, zfree and opaque must be initialized before by the caller.
+       If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+       use default allocation functions.
+
+         The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+       1 gives best speed, 9 gives best compression, 0 gives no compression at
+       all (the input data is simply copied a block at a time).
+       Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+       compression (currently equivalent to level 6).
+
+         deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+       enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+       Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+       with the version assumed by the caller (ZLIB_VERSION).
+       msg is set to null if there is no error message.  deflateInit does not
+       perform any compression: this will be done by deflate().
+    */
+
+
+    ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+    /*
+        deflate compresses as much data as possible, and stops when the input
+      buffer becomes empty or the output buffer becomes full. It may introduce some
+      output latency (reading input without producing any output) except when
+      forced to flush.
+
+        The detailed semantics are as follows. deflate performs one or both of the
+      following actions:
+
+      - Compress more input starting at next_in and update next_in and avail_in
+        accordingly. If not all input can be processed (because there is not
+        enough room in the output buffer), next_in and avail_in are updated and
+        processing will resume at this point for the next call of deflate().
+
+      - Provide more output starting at next_out and update next_out and avail_out
+        accordingly. This action is forced if the parameter flush is non zero.
+        Forcing flush frequently degrades the compression ratio, so this parameter
+        should be set only when necessary (in interactive applications).
+        Some output may be provided even if flush is not set.
+
+      Before the call of deflate(), the application should ensure that at least
+      one of the actions is possible, by providing more input and/or consuming
+      more output, and updating avail_in or avail_out accordingly; avail_out
+      should never be zero before the call. The application can consume the
+      compressed output when it wants, for example when the output buffer is full
+      (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+      and with zero avail_out, it must be called again after making room in the
+      output buffer because there might be more output pending.
+
+        If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+      flushed to the output buffer and the output is aligned on a byte boundary, so
+      that the decompressor can get all input data available so far. (In particular
+      avail_in is zero after the call if enough output space has been provided
+      before the call.)  Flushing may degrade compression for some compression
+      algorithms and so it should be used only when necessary.
+
+        If flush is set to Z_FULL_FLUSH, all output is flushed as with
+      Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+      restart from this point if previous compressed data has been damaged or if
+      random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+      the compression.
+
+        If deflate returns with avail_out == 0, this function must be called again
+      with the same value of the flush parameter and more output space (updated
+      avail_out), until the flush is complete (deflate returns with non-zero
+      avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+      avail_out is greater than six to avoid repeated flush markers due to
+      avail_out == 0 on return.
+
+        If the parameter flush is set to Z_FINISH, pending input is processed,
+      pending output is flushed and deflate returns with Z_STREAM_END if there
+      was enough output space; if deflate returns with Z_OK, this function must be
+      called again with Z_FINISH and more output space (updated avail_out) but no
+      more input data, until it returns with Z_STREAM_END or an error. After
+      deflate has returned Z_STREAM_END, the only possible operations on the
+      stream are deflateReset or deflateEnd.
+
+        Z_FINISH can be used immediately after deflateInit if all the compression
+      is to be done in a single step. In this case, avail_out must be at least
+      the value returned by deflateBound (see below). If deflate does not return
+      Z_STREAM_END, then it must be called again as described above.
+
+        deflate() sets strm->adler to the adler32 checksum of all input read
+      so far (that is, total_in bytes).
+
+        deflate() may update data_type if it can make a good guess about
+      the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
+      binary. This field is only for information purposes and does not affect
+      the compression algorithm in any manner.
+
+        deflate() returns Z_OK if some progress has been made (more input
+      processed or more output produced), Z_STREAM_END if all input has been
+      consumed and all output has been produced (only when flush is set to
+      Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+      if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
+      (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+      fatal, and deflate() can be called again with more input and more output
+      space to continue compressing.
+    */
+
+
+    ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+    /*
+         All dynamically allocated data structures for this stream are freed.
+       This function discards any unprocessed input and does not flush any
+       pending output.
+
+         deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+       stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+       prematurely (some input or output was discarded). In the error case,
+       msg may be set but then points to a static string (which must not be
+       deallocated).
+    */
+
+
+    /*
+    ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+         Initializes the internal stream state for decompression. The fields
+       next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+       the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
+       value depends on the compression method), inflateInit determines the
+       compression method from the zlib header and allocates all data structures
+       accordingly; otherwise the allocation will be deferred to the first call of
+       inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+       use default allocation functions.
+
+         inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+       memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+       version assumed by the caller.  msg is set to null if there is no error
+       message. inflateInit does not perform any decompression apart from reading
+       the zlib header if present: this will be done by inflate().  (So next_in and
+       avail_in may be modified, but next_out and avail_out are unchanged.)
+    */
+
+
+    ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+    /*
+        inflate decompresses as much data as possible, and stops when the input
+      buffer becomes empty or the output buffer becomes full. It may introduce
+      some output latency (reading input without producing any output) except when
+      forced to flush.
+
+      The detailed semantics are as follows. inflate performs one or both of the
+      following actions:
+
+      - Decompress more input starting at next_in and update next_in and avail_in
+        accordingly. If not all input can be processed (because there is not
+        enough room in the output buffer), next_in is updated and processing
+        will resume at this point for the next call of inflate().
+
+      - Provide more output starting at next_out and update next_out and avail_out
+        accordingly.  inflate() provides as much output as possible, until there
+        is no more input data or no more space in the output buffer (see below
+        about the flush parameter).
+
+      Before the call of inflate(), the application should ensure that at least
+      one of the actions is possible, by providing more input and/or consuming
+      more output, and updating the next_* and avail_* values accordingly.
+      The application can consume the uncompressed output when it wants, for
+      example when the output buffer is full (avail_out == 0), or after each
+      call of inflate(). If inflate returns Z_OK and with zero avail_out, it
+      must be called again after making room in the output buffer because there
+      might be more output pending.
+
+        The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
+      Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
+      output as possible to the output buffer. Z_BLOCK requests that inflate() stop
+      if and when it get to the next deflate block boundary. When decoding the zlib
+      or gzip format, this will cause inflate() to return immediately after the
+      header and before the first block. When doing a raw inflate, inflate() will
+      go ahead and process the first block, and will return when it gets to the end
+      of that block, or when it runs out of data.
+
+        The Z_BLOCK option assists in appending to or combining deflate streams.
+      Also to assist in this, on return inflate() will set strm->data_type to the
+      number of unused bits in the last byte taken from strm->next_in, plus 64
+      if inflate() is currently decoding the last block in the deflate stream,
+      plus 128 if inflate() returned immediately after decoding an end-of-block
+      code or decoding the complete header up to just before the first byte of the
+      deflate stream. The end-of-block will not be indicated until all of the
+      uncompressed data from that block has been written to strm->next_out.  The
+      number of unused bits may in general be greater than seven, except when
+      bit 7 of data_type is set, in which case the number of unused bits will be
+      less than eight.
+
+        inflate() should normally be called until it returns Z_STREAM_END or an
+      error. However if all decompression is to be performed in a single step
+      (a single call of inflate), the parameter flush should be set to
+      Z_FINISH. In this case all pending input is processed and all pending
+      output is flushed; avail_out must be large enough to hold all the
+      uncompressed data. (The size of the uncompressed data may have been saved
+      by the compressor for this purpose.) The next operation on this stream must
+      be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+      is never required, but can be used to inform inflate that a faster approach
+      may be used for the single inflate() call.
+
+         In this implementation, inflate() always flushes as much output as
+      possible to the output buffer, and always uses the faster approach on the
+      first call. So the only effect of the flush parameter in this implementation
+      is on the return value of inflate(), as noted below, or when it returns early
+      because Z_BLOCK is used.
+
+         If a preset dictionary is needed after this call (see inflateSetDictionary
+      below), inflate sets strm-adler to the adler32 checksum of the dictionary
+      chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+      strm->adler to the adler32 checksum of all output produced so far (that is,
+      total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+      below. At the end of the stream, inflate() checks that its computed adler32
+      checksum is equal to that saved by the compressor and returns Z_STREAM_END
+      only if the checksum is correct.
+
+        inflate() will decompress and check either zlib-wrapped or gzip-wrapped
+      deflate data.  The header type is detected automatically.  Any information
+      contained in the gzip header is not retained, so applications that need that
+      information should instead use raw inflate, see inflateInit2() below, or
+      inflateBack() and perform their own processing of the gzip header and
+      trailer.
+
+        inflate() returns Z_OK if some progress has been made (more input processed
+      or more output produced), Z_STREAM_END if the end of the compressed data has
+      been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+      preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+      corrupted (input stream not conforming to the zlib format or incorrect check
+      value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+      if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
+      Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+      output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
+      inflate() can be called again with more input and more output space to
+      continue decompressing. If Z_DATA_ERROR is returned, the application may then
+      call inflateSync() to look for a good compression block if a partial recovery
+      of the data is desired.
+    */
+
+
+    ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+    /*
+         All dynamically allocated data structures for this stream are freed.
+       This function discards any unprocessed input and does not flush any
+       pending output.
+
+         inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+       was inconsistent. In the error case, msg may be set but then points to a
+       static string (which must not be deallocated).
+    */
+
+    /* Advanced functions */
+
+    /*
+        The following functions are needed only in some special applications.
+    */
+
+    /*
+    ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                         int  level,
+                                         int  method,
+                                         int  windowBits,
+                                         int  memLevel,
+                                         int  strategy));
+
+         This is another version of deflateInit with more compression options. The
+       fields next_in, zalloc, zfree and opaque must be initialized before by
+       the caller.
+
+         The method parameter is the compression method. It must be Z_DEFLATED in
+       this version of the library.
+
+         The windowBits parameter is the base two logarithm of the window size
+       (the size of the history buffer). It should be in the range 8..15 for this
+       version of the library. Larger values of this parameter result in better
+       compression at the expense of memory usage. The default value is 15 if
+       deflateInit is used instead.
+
+         windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
+       determines the window size. deflate() will then generate raw deflate data
+       with no zlib header or trailer, and will not compute an adler32 check value.
+
+         windowBits can also be greater than 15 for optional gzip encoding. Add
+       16 to windowBits to write a simple gzip header and trailer around the
+       compressed data instead of a zlib wrapper. The gzip header will have no
+       file name, no extra data, no comment, no modification time (set to zero),
+       no header crc, and the operating system will be set to 255 (unknown).
+
+         The memLevel parameter specifies how much memory should be allocated
+       for the internal compression state. memLevel=1 uses minimum memory but
+       is slow and reduces compression ratio; memLevel=9 uses maximum memory
+       for optimal speed. The default value is 8. See zconf.h for total memory
+       usage as a function of windowBits and memLevel.
+
+         The strategy parameter is used to tune the compression algorithm. Use the
+       value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+       filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+       string match), or Z_RLE to limit match distances to one (run-length
+       encoding). Filtered data consists mostly of small values with a somewhat
+       random distribution. In this case, the compression algorithm is tuned to
+       compress them better. The effect of Z_FILTERED is to force more Huffman
+       coding and less string matching; it is somewhat intermediate between
+       Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
+       Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
+       parameter only affects the compression ratio but not the correctness of the
+       compressed output even if it is not set appropriately.
+
+          deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+       memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
+       method). msg is set to null if there is no error message.  deflateInit2 does
+       not perform any compression: this will be done by deflate().
+    */
+
+    ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+            const Bytef* dictionary,
+            uInt  dictLength));
+    /*
+         Initializes the compression dictionary from the given byte sequence
+       without producing any compressed output. This function must be called
+       immediately after deflateInit, deflateInit2 or deflateReset, before any
+       call of deflate. The compressor and decompressor must use exactly the same
+       dictionary (see inflateSetDictionary).
+
+         The dictionary should consist of strings (byte sequences) that are likely
+       to be encountered later in the data to be compressed, with the most commonly
+       used strings preferably put towards the end of the dictionary. Using a
+       dictionary is most useful when the data to be compressed is short and can be
+       predicted with good accuracy; the data can then be compressed better than
+       with the default empty dictionary.
+
+         Depending on the size of the compression data structures selected by
+       deflateInit or deflateInit2, a part of the dictionary may in effect be
+       discarded, for example if the dictionary is larger than the window size in
+       deflate or deflate2. Thus the strings most likely to be useful should be
+       put at the end of the dictionary, not at the front.
+
+         Upon return of this function, strm->adler is set to the adler32 value
+       of the dictionary; the decompressor may later use this value to determine
+       which dictionary has been used by the compressor. (The adler32 value
+       applies to the whole dictionary even if only a subset of the dictionary is
+       actually used by the compressor.) If a raw deflate was requested, then the
+       adler32 value is not computed and strm->adler is not set.
+
+         deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+       parameter is invalid (such as NULL dictionary) or the stream state is
+       inconsistent (for example if deflate has already been called for this stream
+       or if the compression method is bsort). deflateSetDictionary does not
+       perform any compression: this will be done by deflate().
+    */
+
+    ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                        z_streamp source));
+    /*
+         Sets the destination stream as a complete copy of the source stream.
+
+         This function can be useful when several compression strategies will be
+       tried, for example when there are several ways of pre-processing the input
+       data with a filter. The streams that will be discarded should then be freed
+       by calling deflateEnd.  Note that deflateCopy duplicates the internal
+       compression state which can be quite large, so this strategy is slow and
+       can consume lots of memory.
+
+         deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+       enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+       (such as zalloc being NULL). msg is left unchanged in both source and
+       destination.
+    */
+
+    ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+    /*
+         This function is equivalent to deflateEnd followed by deflateInit,
+       but does not free and reallocate all the internal compression state.
+       The stream will keep the same compression level and any other attributes
+       that may have been set by deflateInit2.
+
+          deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+       stream state was inconsistent (such as zalloc or state being NULL).
+    */
+
+    ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+                                          int level,
+                                          int strategy));
+    /*
+         Dynamically update the compression level and compression strategy.  The
+       interpretation of level and strategy is as in deflateInit2.  This can be
+       used to switch between compression and straight copy of the input data, or
+       to switch to a different kind of input data requiring a different
+       strategy. If the compression level is changed, the input available so far
+       is compressed with the old level (and may be flushed); the new level will
+       take effect only at the next call of deflate().
+
+         Before the call of deflateParams, the stream state must be set as for
+       a call of deflate(), since the currently available input may have to
+       be compressed and flushed. In particular, strm->avail_out must be non-zero.
+
+         deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+       stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
+       if strm->avail_out was zero.
+    */
+
+    ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                           uLong sourceLen));
+    /*
+         deflateBound() returns an upper bound on the compressed size after
+       deflation of sourceLen bytes.  It must be called after deflateInit()
+       or deflateInit2().  This would be used to allocate an output buffer
+       for deflation in a single pass, and so would be called before deflate().
+    */
+
+    ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                         int bits,
+                                         int value));
+    /*
+         deflatePrime() inserts bits in the deflate output stream.  The intent
+      is that this function is used to start off the deflate output with the
+      bits leftover from a previous deflate stream when appending to it.  As such,
+      this function can only be used for raw deflate, and must be used before the
+      first deflate() call after a deflateInit2() or deflateReset().  bits must be
+      less than or equal to 16, and that many of the least significant bits of
+      value will be inserted in the output.
+
+          deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+       stream state was inconsistent.
+    */
+
+    /*
+    ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                         int  windowBits));
+
+         This is another version of inflateInit with an extra parameter. The
+       fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+       before by the caller.
+
+         The windowBits parameter is the base two logarithm of the maximum window
+       size (the size of the history buffer).  It should be in the range 8..15 for
+       this version of the library. The default value is 15 if inflateInit is used
+       instead. windowBits must be greater than or equal to the windowBits value
+       provided to deflateInit2() while compressing, or it must be equal to 15 if
+       deflateInit2() was not used. If a compressed stream with a larger window
+       size is given as input, inflate() will return with the error code
+       Z_DATA_ERROR instead of trying to allocate a larger window.
+
+         windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
+       determines the window size. inflate() will then process raw deflate data,
+       not looking for a zlib or gzip header, not generating a check value, and not
+       looking for any check values for comparison at the end of the stream. This
+       is for use with other formats that use the deflate compressed data format
+       such as zip.  Those formats provide their own check values. If a custom
+       format is developed using the raw deflate format for compressed data, it is
+       recommended that a check value such as an adler32 or a crc32 be applied to
+       the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+       most applications, the zlib format should be used as is. Note that comments
+       above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+         windowBits can also be greater than 15 for optional gzip decoding. Add
+       32 to windowBits to enable zlib and gzip decoding with automatic header
+       detection, or add 16 to decode only the gzip format (the zlib format will
+       return a Z_DATA_ERROR).
+
+         inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+       memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
+       memLevel). msg is set to null if there is no error message.  inflateInit2
+       does not perform any decompression apart from reading the zlib header if
+       present: this will be done by inflate(). (So next_in and avail_in may be
+       modified, but next_out and avail_out are unchanged.)
+    */
+
+    ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+            const Bytef* dictionary,
+            uInt  dictLength));
+    /*
+         Initializes the decompression dictionary from the given uncompressed byte
+       sequence. This function must be called immediately after a call of inflate
+       if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
+       can be determined from the adler32 value returned by this call of
+       inflate. The compressor and decompressor must use exactly the same
+       dictionary (see deflateSetDictionary).
+
+         inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+       parameter is invalid (such as NULL dictionary) or the stream state is
+       inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+       expected one (incorrect adler32 value). inflateSetDictionary does not
+       perform any decompression: this will be done by subsequent calls of
+       inflate().
+    */
+
+    ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+    /*
+        Skips invalid compressed data until a full flush point (see above the
+      description of deflate with Z_FULL_FLUSH) can be found, or until all
+      available input is skipped. No output is provided.
+
+        inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+      if no more input was provided, Z_DATA_ERROR if no flush point has been found,
+      or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
+      case, the application may save the current current value of total_in which
+      indicates where valid compressed data was found. In the error case, the
+      application may repeatedly call inflateSync, providing more input each time,
+      until success or end of the input data.
+    */
+
+    ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                        z_streamp source));
+    /*
+         Sets the destination stream as a complete copy of the source stream.
+
+         This function can be useful when randomly accessing a large stream.  The
+       first pass through the stream can periodically record the inflate state,
+       allowing restarting inflate at those points when randomly accessing the
+       stream.
+
+         inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+       enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+       (such as zalloc being NULL). msg is left unchanged in both source and
+       destination.
+    */
+
+    ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+    /*
+         This function is equivalent to inflateEnd followed by inflateInit,
+       but does not free and reallocate all the internal decompression state.
+       The stream will keep attributes that may have been set by inflateInit2.
+
+          inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+       stream state was inconsistent (such as zalloc or state being NULL).
+    */
+
+    /*
+    ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits,
+                                            unsigned char FAR *window));
+
+         Initialize the internal stream state for decompression using inflateBack()
+       calls.  The fields zalloc, zfree and opaque in strm must be initialized
+       before the call.  If zalloc and zfree are Z_NULL, then the default library-
+       derived memory allocation routines are used.  windowBits is the base two
+       logarithm of the window size, in the range 8..15.  window is a caller
+       supplied buffer of that size.  Except for special applications where it is
+       assured that deflate was used with small window sizes, windowBits must be 15
+       and a 32K byte window must be supplied to be able to decompress general
+       deflate streams.
+
+         See inflateBack() for the usage of these routines.
+
+         inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+       the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+       be allocated, or Z_VERSION_ERROR if the version of the library does not
+       match the version of the header file.
+    */
+
+    typedef unsigned(*in_func) OF((void FAR*, unsigned char FAR* FAR*));
+    typedef int (*out_func) OF((void FAR*, unsigned char FAR*, unsigned));
+
+    ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR* strm,
+                                        in_func in, void FAR* in_desc,
+                                        out_func out, void FAR* out_desc));
+    /*
+         inflateBack() does a raw inflate with a single call using a call-back
+       interface for input and output.  This is more efficient than inflate() for
+       file i/o applications in that it avoids copying between the output and the
+       sliding window by simply making the window itself the output buffer.  This
+       function trusts the application to not change the output buffer passed by
+       the output function, at least until inflateBack() returns.
+
+         inflateBackInit() must be called first to allocate the internal state
+       and to initialize the state with the user-provided window buffer.
+       inflateBack() may then be used multiple times to inflate a complete, raw
+       deflate stream with each call.  inflateBackEnd() is then called to free
+       the allocated state.
+
+         A raw deflate stream is one with no zlib or gzip header or trailer.
+       This routine would normally be used in a utility that reads zip or gzip
+       files and writes out uncompressed files.  The utility would decode the
+       header and process the trailer on its own, hence this routine expects
+       only the raw deflate stream to decompress.  This is different from the
+       normal behavior of inflate(), which expects either a zlib or gzip header and
+       trailer around the deflate stream.
+
+         inflateBack() uses two subroutines supplied by the caller that are then
+       called by inflateBack() for input and output.  inflateBack() calls those
+       routines until it reads a complete deflate stream and writes out all of the
+       uncompressed data, or until it encounters an error.  The function's
+       parameters and return types are defined above in the in_func and out_func
+       typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+       number of bytes of provided input, and a pointer to that input in buf.  If
+       there is no input available, in() must return zero--buf is ignored in that
+       case--and inflateBack() will return a buffer error.  inflateBack() will call
+       out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
+       should return zero on success, or non-zero on failure.  If out() returns
+       non-zero, inflateBack() will return with an error.  Neither in() nor out()
+       are permitted to change the contents of the window provided to
+       inflateBackInit(), which is also the buffer that out() uses to write from.
+       The length written by out() will be at most the window size.  Any non-zero
+       amount of input may be provided by in().
+
+         For convenience, inflateBack() can be provided input on the first call by
+       setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+       in() will be called.  Therefore strm->next_in must be initialized before
+       calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+       immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+       must also be initialized, and then if strm->avail_in is not zero, input will
+       initially be taken from strm->next_in[0 .. strm->avail_in - 1].
+
+         The in_desc and out_desc parameters of inflateBack() is passed as the
+       first parameter of in() and out() respectively when they are called.  These
+       descriptors can be optionally used to pass any information that the caller-
+       supplied in() and out() functions need to do their job.
+
+         On return, inflateBack() will set strm->next_in and strm->avail_in to
+       pass back any unused input that was provided by the last in() call.  The
+       return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+       if in() or out() returned an error, Z_DATA_ERROR if there was a format
+       error in the deflate stream (in which case strm->msg is set to indicate the
+       nature of the error), or Z_STREAM_ERROR if the stream was not properly
+       initialized.  In the case of Z_BUF_ERROR, an input or output error can be
+       distinguished using strm->next_in which will be Z_NULL only if in() returned
+       an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
+       out() returning non-zero.  (in() will always be called before out(), so
+       strm->next_in is assured to be defined if out() returns non-zero.)  Note
+       that inflateBack() cannot return Z_OK.
+    */
+
+    ZEXTERN int ZEXPORT inflateBackEnd OF((z_stream FAR* strm));
+    /*
+         All memory allocated by inflateBackInit() is freed.
+
+         inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+       state was inconsistent.
+    */
+
+    ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+    /* Return flags indicating compile-time options.
+
+        Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+         1.0: size of uInt
+         3.2: size of uLong
+         5.4: size of voidpf (pointer)
+         7.6: size of z_off_t
+
+        Compiler, assembler, and debug options:
+         8: DEBUG
+         9: ASMV or ASMINF -- use ASM code
+         10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+         11: 0 (reserved)
+
+        One-time table building (smaller code, but not thread-safe if true):
+         12: BUILDFIXED -- build static block decoding tables when needed
+         13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+         14,15: 0 (reserved)
+
+        Library content (indicates missing functionality):
+         16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                              deflate code when not needed)
+         17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                        and decode gzip streams (to avoid linking crc code)
+         18-19: 0 (reserved)
+
+        Operation variations (changes in library functionality):
+         20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+         21: FASTEST -- deflate algorithm with only one, lowest compression level
+         22,23: 0 (reserved)
+
+        The sprintf variant used by gzprintf (zero is best):
+         24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+         25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+         26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+        Remainder:
+         27-31: 0 (reserved)
+     */
+
+
+    /* utility functions */
+
+    /*
+         The following utility functions are implemented on top of the
+       basic stream-oriented functions. To simplify the interface, some
+       default options are assumed (compression level and memory usage,
+       standard memory allocation functions). The source code of these
+       utility functions can easily be modified if you need special options.
+    */
+
+    ZEXTERN int ZEXPORT compress OF((Bytef* dest,   uLongf* destLen,
+                                     const Bytef* source, uLong sourceLen));
+    /*
+         Compresses the source buffer into the destination buffer.  sourceLen is
+       the byte length of the source buffer. Upon entry, destLen is the total
+       size of the destination buffer, which must be at least the value returned
+       by compressBound(sourceLen). Upon exit, destLen is the actual size of the
+       compressed buffer.
+         This function can be used to compress a whole file at once if the
+       input file is mmap'ed.
+         compress returns Z_OK if success, Z_MEM_ERROR if there was not
+       enough memory, Z_BUF_ERROR if there was not enough room in the output
+       buffer.
+    */
+
+    ZEXTERN int ZEXPORT compress2 OF((Bytef* dest,   uLongf* destLen,
+                                      const Bytef* source, uLong sourceLen,
+                                      int level));
+    /*
+         Compresses the source buffer into the destination buffer. The level
+       parameter has the same meaning as in deflateInit.  sourceLen is the byte
+       length of the source buffer. Upon entry, destLen is the total size of the
+       destination buffer, which must be at least the value returned by
+       compressBound(sourceLen). Upon exit, destLen is the actual size of the
+       compressed buffer.
+
+         compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+       memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+       Z_STREAM_ERROR if the level parameter is invalid.
+    */
+
+    ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+    /*
+         compressBound() returns an upper bound on the compressed size after
+       compress() or compress2() on sourceLen bytes.  It would be used before
+       a compress() or compress2() call to allocate the destination buffer.
+    */
+
+    ZEXTERN int ZEXPORT uncompress OF((Bytef* dest,   uLongf* destLen,
+                                       const Bytef* source, uLong sourceLen));
+    /*
+         Decompresses the source buffer into the destination buffer.  sourceLen is
+       the byte length of the source buffer. Upon entry, destLen is the total
+       size of the destination buffer, which must be large enough to hold the
+       entire uncompressed data. (The size of the uncompressed data must have
+       been saved previously by the compressor and transmitted to the decompressor
+       by some mechanism outside the scope of this compression library.)
+       Upon exit, destLen is the actual size of the compressed buffer.
+         This function can be used to decompress a whole file at once if the
+       input file is mmap'ed.
+
+         uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+       enough memory, Z_BUF_ERROR if there was not enough room in the output
+       buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+    */
+
+
+    typedef voidp gzFile;
+
+    ZEXTERN gzFile ZEXPORT gzopen  OF((const char* path, const char* mode));
+    /*
+         Opens a gzip (.gz) file for reading or writing. The mode parameter
+       is as in fopen ("rb" or "wb") but can also include a compression level
+       ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
+       Huffman only compression as in "wb1h", or 'R' for run-length encoding
+       as in "wb1R". (See the description of deflateInit2 for more information
+       about the strategy parameter.)
+
+         gzopen can be used to read a file which is not in gzip format; in this
+       case gzread will directly read from the file without decompression.
+
+         gzopen returns NULL if the file could not be opened or if there was
+       insufficient memory to allocate the (de)compression state; errno
+       can be checked to distinguish the two cases (if errno is zero, the
+       zlib error is Z_MEM_ERROR).  */
+
+    ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char* mode));
+    /*
+         gzdopen() associates a gzFile with the file descriptor fd.  File
+       descriptors are obtained from calls like open, dup, creat, pipe or
+       fileno (in the file has been previously opened with fopen).
+       The mode parameter is as in gzopen.
+         The next call of gzclose on the returned gzFile will also close the
+       file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
+       descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
+         gzdopen returns NULL if there was insufficient memory to allocate
+       the (de)compression state.
+    */
+
+    ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+    /*
+         Dynamically update the compression level or strategy. See the description
+       of deflateInit2 for the meaning of these parameters.
+         gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+       opened for writing.
+    */
+
+    ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
+    /*
+         Reads the given number of uncompressed bytes from the compressed file.
+       If the input file was not in gzip format, gzread copies the given number
+       of bytes into the buffer.
+         gzread returns the number of uncompressed bytes actually read (0 for
+       end of file, -1 for error). */
+
+    ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
+                                       voidpc buf, unsigned len));
+    /*
+         Writes the given number of uncompressed bytes into the compressed file.
+       gzwrite returns the number of uncompressed bytes actually written
+       (0 in case of error).
+    */
+
+    ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char* format, ...));
+    /*
+         Converts, formats, and writes the args to the compressed file under
+       control of the format string, as in fprintf. gzprintf returns the number of
+       uncompressed bytes actually written (0 in case of error).  The number of
+       uncompressed bytes written is limited to 4095. The caller should assure that
+       this limit is not exceeded. If it is exceeded, then gzprintf() will return
+       return an error (0) with nothing written. In this case, there may also be a
+       buffer overflow with unpredictable consequences, which is possible only if
+       zlib was compiled with the insecure functions sprintf() or vsprintf()
+       because the secure snprintf() or vsnprintf() functions were not available.
+    */
+
+    ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char* s));
+    /*
+          Writes the given null-terminated string to the compressed file, excluding
+       the terminating null character.
+          gzputs returns the number of characters written, or -1 in case of error.
+    */
+
+    ZEXTERN char* ZEXPORT gzgets OF((gzFile file, char* buf, int len));
+    /*
+          Reads bytes from the compressed file until len-1 characters are read, or
+       a newline character is read and transferred to buf, or an end-of-file
+       condition is encountered.  The string is then terminated with a null
+       character.
+          gzgets returns buf, or Z_NULL in case of error.
+    */
+
+    ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
+    /*
+          Writes c, converted to an unsigned char, into the compressed file.
+       gzputc returns the value that was written, or -1 in case of error.
+    */
+
+    ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
+    /*
+          Reads one byte from the compressed file. gzgetc returns this byte
+       or -1 in case of end of file or error.
+    */
+
+    ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
+    /*
+          Push one character back onto the stream to be read again later.
+       Only one character of push-back is allowed.  gzungetc() returns the
+       character pushed, or -1 on failure.  gzungetc() will fail if a
+       character has been pushed but not read yet, or if c is -1. The pushed
+       character will be discarded if the stream is repositioned with gzseek()
+       or gzrewind().
+    */
+
+    ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
+    /*
+         Flushes all pending output into the compressed file. The parameter
+       flush is as in the deflate() function. The return value is the zlib
+       error number (see function gzerror below). gzflush returns Z_OK if
+       the flush parameter is Z_FINISH and all output could be flushed.
+         gzflush should be called only when strictly necessary because it can
+       degrade compression.
+    */
+
+    ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
+                                          z_off_t offset, int whence));
+    /*
+          Sets the starting position for the next gzread or gzwrite on the
+       given compressed file. The offset represents a number of bytes in the
+       uncompressed data stream. The whence parameter is defined as in lseek(2);
+       the value SEEK_END is not supported.
+         If the file is opened for reading, this function is emulated but can be
+       extremely slow. If the file is opened for writing, only forward seeks are
+       supported; gzseek then compresses a sequence of zeroes up to the new
+       starting position.
+
+          gzseek returns the resulting offset location as measured in bytes from
+       the beginning of the uncompressed stream, or -1 in case of error, in
+       particular if the file is opened for writing and the new starting position
+       would be before the current position.
+    */
+
+    ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+    /*
+         Rewinds the given file. This function is supported only for reading.
+
+       gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+    */
+
+    ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+    /*
+         Returns the starting position for the next gzread or gzwrite on the
+       given compressed file. This position represents a number of bytes in the
+       uncompressed data stream.
+
+       gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+    */
+
+    ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+    /*
+         Returns 1 when EOF has previously been detected reading the given
+       input stream, otherwise zero.
+    */
+
+    ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+    /*
+         Flushes all pending output if necessary, closes the compressed file
+       and deallocates all the (de)compression state. The return value is the zlib
+       error number (see function gzerror below).
+    */
+
+    ZEXTERN const char* ZEXPORT gzerror OF((gzFile file, int* errnum));
+    /*
+         Returns the error message for the last error which occurred on the
+       given compressed file. errnum is set to zlib error number. If an
+       error occurred in the file system and not in the compression library,
+       errnum is set to Z_ERRNO and the application may consult errno
+       to get the exact error code.
+    */
+
+    ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+    /*
+         Clears the error and end-of-file flags for file. This is analogous to the
+       clearerr() function in stdio. This is useful for continuing to read a gzip
+       file that is being written concurrently.
+    */
+
+    /* checksum functions */
+
+    /*
+         These functions are not related to compression but are exported
+       anyway because they might be useful in applications using the
+       compression library.
+    */
+
+    ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef* buf, uInt len));
+
+    /*
+         Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+       return the updated checksum. If buf is NULL, this function returns
+       the required initial value for the checksum.
+       An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+       much faster. Usage example:
+
+         uLong adler = adler32(0L, Z_NULL, 0);
+
+         while (read_buffer(buffer, length) != EOF) {
+           adler = adler32(adler, buffer, length);
+         }
+         if (adler != original_adler) error();
+    */
+
+    ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef* buf, uInt len));
+    /*
+         Update a running crc with the bytes buf[0..len-1] and return the updated
+       crc. If buf is NULL, this function returns the required initial value
+       for the crc. Pre- and post-conditioning (one's complement) is performed
+       within this function so it shouldn't be done by the application.
+       Usage example:
+
+         uLong crc = crc32(0L, Z_NULL, 0);
+
+         while (read_buffer(buffer, length) != EOF) {
+           crc = crc32(crc, buffer, length);
+         }
+         if (crc != original_crc) error();
+    */
+
+
+    /* various hacks, don't look :) */
+
+    /* deflateInit and inflateInit are macros to allow checking the zlib version
+     * and the compiler's view of z_stream:
+     */
+    ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                         const char* version, int stream_size));
+    ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                         const char* version, int stream_size));
+    ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                          int windowBits, int memLevel,
+                                          int strategy, const char* version,
+                                          int stream_size));
+    ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                          const char* version, int stream_size));
+    ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR* strm, int windowBits,
+                                            unsigned char FAR* window,
+                                            const char* version,
+                                            int stream_size));
 #define deflateInit(strm, level) \
         deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
 #define inflateInit(strm) \
@@ -1189,9 +1190,9 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits,
     struct internal_state {int dummy;}; /* hack for buggy compilers */
 #endif
 
-ZEXTERN const char   * ZEXPORT zError           OF((int err));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+    ZEXTERN const char*    ZEXPORT zError           OF((int err));
+    ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
+    ZEXTERN const uLongf* ZEXPORT get_crc_table    OF((void));
 
 #ifdef __cplusplus
 }
diff --git a/contrib/extractor/loadlib/adt.cpp b/contrib/extractor/loadlib/adt.cpp
index fde70681113..4f5d019c445 100644
--- a/contrib/extractor/loadlib/adt.cpp
+++ b/contrib/extractor/loadlib/adt.cpp
@@ -10,8 +10,8 @@ bool isHole(int holes, int i, int j)
 {
     int testi = i / 2;
     int testj = j / 4;
-    if(testi > 3) testi = 3;
-    if(testj > 3) testj = 3;
+    if (testi > 3) testi = 3;
+    if (testj > 3) testj = 3;
     return (holes & holetab_h[testi] & holetab_v[testj]) != 0;
 }
 
@@ -44,7 +44,7 @@ bool ADT_file::prepareLoadedData()
         return false;
 
     // Check and prepare MHDR
-    a_grid = (adt_MHDR *)(GetData()+8+version->size);
+    a_grid = (adt_MHDR*)(GetData() + 8 + version->size);
     if (!a_grid->prepareLoadedData())
         return false;
 
@@ -56,7 +56,7 @@ bool adt_MHDR::prepareLoadedData()
     if (fcc != 'MHDR')
         return false;
 
-    if (size!=sizeof(adt_MHDR)-8)
+    if (size != sizeof(adt_MHDR) - 8)
         return false;
 
     // Check and prepare MCIN
@@ -76,9 +76,9 @@ bool adt_MCIN::prepareLoadedData()
         return false;
 
     // Check cells data
-    for (int i=0; i<ADT_CELLS_PER_GRID;i++)
-        for (int j=0; j<ADT_CELLS_PER_GRID;j++)
-            if (cells[i][j].offsMCNK && !getMCNK(i,j)->prepareLoadedData())
+    for (int i = 0; i < ADT_CELLS_PER_GRID; i++)
+        for (int j = 0; j < ADT_CELLS_PER_GRID; j++)
+            if (cells[i][j].offsMCNK && !getMCNK(i, j)->prepareLoadedData())
                 return false;
 
     return true;
@@ -116,7 +116,7 @@ bool adt_MCVT::prepareLoadedData()
     if (fcc != 'MCVT')
         return false;
 
-    if (size != sizeof(adt_MCVT)-8)
+    if (size != sizeof(adt_MCVT) - 8)
         return false;
 
     return true;
diff --git a/contrib/extractor/loadlib/adt.h b/contrib/extractor/loadlib/adt.h
index 9c9167376a9..dd6870fdb42 100644
--- a/contrib/extractor/loadlib/adt.h
+++ b/contrib/extractor/loadlib/adt.h
@@ -27,13 +27,14 @@ enum LiquidType
 //
 class adt_MCVT
 {
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
-public:
-    float height_map[(ADT_CELL_SIZE+1)*(ADT_CELL_SIZE+1)+ADT_CELL_SIZE*ADT_CELL_SIZE];
+        union
+        {
+            uint32 fcc;
+            char   fcc_txt[4];
+        };
+        uint32 size;
+    public:
+        float height_map[(ADT_CELL_SIZE + 1) * (ADT_CELL_SIZE + 1) + ADT_CELL_SIZE* ADT_CELL_SIZE];
 
     bool  prepareLoadedData();
 };
@@ -43,21 +44,23 @@ class adt_MCVT
 //
 class adt_MCLQ
 {
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
-public:
-    float height1;
-    float height2;
-    struct liquid_data{
-        uint32 light;
-        float  height;
-    } liquid[ADT_CELL_SIZE+1][ADT_CELL_SIZE+1];
+        union
+        {
+            uint32 fcc;
+            char   fcc_txt[4];
+        };
+        uint32 size;
+    public:
+        float height1;
+        float height2;
+        struct liquid_data
+        {
+            uint32 light;
+            float  height;
+        } liquid[ADT_CELL_SIZE + 1][ADT_CELL_SIZE + 1];
 
-    // 1<<0 - ochen
-    // 1<<1 - lava/slime
+        // 1<<0 - ochen
+        // 1<<1 - lava/slime
     // 1<<2 - water
     // 1<<6 - all water
     // 1<<7 - dark water
@@ -72,13 +75,14 @@ class adt_MCLQ
 //
 class adt_MCNK
 {
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
-public:
-    uint32 flags;
+        union
+        {
+            uint32 fcc;
+            char   fcc_txt[4];
+        };
+        uint32 size;
+    public:
+        uint32 flags;
     uint32 ix;
     uint32 iy;
     uint32 nLayers;
@@ -132,18 +136,20 @@ class adt_MCNK
 //
 class adt_MCIN
 {
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
-public:
-    struct adt_CELLS{
-        uint32 offsMCNK;
+        union
+        {
+            uint32 fcc;
+            char   fcc_txt[4];
+        };
         uint32 size;
-        uint32 flags;
-        uint32 asyncId;
-    } cells[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
+    public:
+        struct adt_CELLS
+        {
+            uint32 offsMCNK;
+            uint32 size;
+            uint32 flags;
+            uint32 asyncId;
+        } cells[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
 
     bool   prepareLoadedData();
     // offset from begin file (used this-84)
@@ -152,13 +158,14 @@ class adt_MCIN
         if (cells[x][y].offsMCNK)
             return (adt_MCNK *)((uint8 *)this + cells[x][y].offsMCNK - 84);
         return 0;
-    }
+        }
 };
 
 #define ADT_LIQUID_HEADER_FULL_LIGHT   0x01
 #define ADT_LIQUID_HEADER_NO_HIGHT     0x02
 
-struct adt_liquid_header{
+struct adt_liquid_header
+{
     uint16 liquidType;             // Index from LiquidType.dbc
     uint16 formatFlags;
     float  heightLevel1;
@@ -176,20 +183,22 @@ struct adt_liquid_header{
 //
 class adt_MH2O
 {
-public:
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
+    public:
+        union
+        {
+            uint32 fcc;
+            char   fcc_txt[4];
+        };
+        uint32 size;
 
-    struct adt_LIQUID{
-        uint32 offsData1;
-        uint32 used;
-        uint32 offsData2;
-    } liquid[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
+        struct adt_LIQUID
+        {
+            uint32 offsData1;
+            uint32 used;
+            uint32 offsData2;
+        } liquid[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
 
-    bool   prepareLoadedData();
+        bool   prepareLoadedData();
 
     adt_liquid_header *getLiquidData(int x, int y)
     {
@@ -198,7 +207,7 @@ class adt_MH2O
         return 0;
     }
 
-    float *getLiquidHeightMap(adt_liquid_header *h)
+    float *getLiquidHeightMap(adt_liquid_header *h) 
     {
         if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
             return 0;
@@ -207,7 +216,7 @@ class adt_MH2O
         return 0;
     }
 
-    uint8 *getLiquidLightMap(adt_liquid_header *h)
+    uint8 *getLiquidLightMap(adt_liquid_header *h) 
     {
         if (h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT)
             return 0;
@@ -220,7 +229,7 @@ class adt_MH2O
         return 0;
     }
 
-    uint32 *getLiquidFullLightMap(adt_liquid_header *h)
+    uint32 *getLiquidFullLightMap(adt_liquid_header *h) 
     {
         if (!(h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT))
             return 0;
@@ -233,7 +242,7 @@ class adt_MH2O
         return 0;
     }
 
-    uint64 getLiquidShowMap(adt_liquid_header *h)
+    uint64 getLiquidShowMap(adt_liquid_header *h)   
     {
         if (h->offsData2a)
             return *((uint64 *)((uint8*)this + 8 + h->offsData2a));
@@ -248,20 +257,21 @@ class adt_MH2O
 //
 class adt_MHDR
 {
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
+        union
+        {
+            uint32 fcc;
+            char   fcc_txt[4];
+        };
+        uint32 size;
 
-    uint32 pad;
+        uint32 pad;
     uint32 offsMCIN;           // MCIN
     uint32 offsTex;	           // MTEX
-    uint32 offsModels;	       // MMDX
-    uint32 offsModelsIds;	   // MMID
-    uint32 offsMapObejcts;	   // MWMO
-    uint32 offsMapObejctsIds;  // MWID
-    uint32 offsDoodsDef;       // MDDF
+    uint32 offsModels;	       // MMDX	
+    uint32 offsModelsIds;	   // MMID	
+    uint32 offsMapObejcts;	   // MWMO	
+    uint32 offsMapObejctsIds;  // MWID		
+    uint32 offsDoodsDef;       // MDDF	
     uint32 offsObjectsDef;     // MODF
     uint32 offsMFBO;           // MFBO
     uint32 offsMH2O;           // MH2O
@@ -271,17 +281,18 @@ class adt_MHDR
     uint32 data4;
     uint32 data5;
 public:
-    bool prepareLoadedData();
-    adt_MCIN *getMCIN(){ return (adt_MCIN *)((uint8 *)&pad+offsMCIN);}
-    adt_MH2O *getMH2O(){ return offsMH2O ? (adt_MH2O *)((uint8 *)&pad+offsMH2O) : 0;}
+        bool prepareLoadedData();
+        adt_MCIN* getMCIN() { return (adt_MCIN*)((uint8*)&pad + offsMCIN);}
+        adt_MH2O* getMH2O() { return offsMH2O ? (adt_MH2O*)((uint8*)&pad + offsMH2O) : 0;}
 
 };
 
-class ADT_file : public FileLoader{
-public:
-    bool prepareLoadedData();
-    ADT_file();
-    ~ADT_file();
+class ADT_file : public FileLoader
+{
+    public:
+        bool prepareLoadedData();
+        ADT_file();
+        ~ADT_file();
     void free();
 
     adt_MHDR *a_grid;
diff --git a/contrib/extractor/loadlib/loadlib.cpp b/contrib/extractor/loadlib/loadlib.cpp
index c8a76b7dc5c..3ecd9f3b063 100644
--- a/contrib/extractor/loadlib/loadlib.cpp
+++ b/contrib/extractor/loadlib/loadlib.cpp
@@ -19,11 +19,11 @@ FileLoader::~FileLoader()
     free();
 }
 
-bool FileLoader::loadFile(char *filename, bool log)
+bool FileLoader::loadFile(char* filename, bool log)
 {
     free();
     MPQFile mf(filename);
-    if(mf.isEof())
+    if (mf.isEof())
     {
         if (log)
             printf("No such file %s\n", filename);
@@ -49,7 +49,7 @@ bool FileLoader::loadFile(char *filename, bool log)
 bool FileLoader::prepareLoadedData()
 {
     // Check version
-    version = (file_MVER *) data;
+    version = (file_MVER*) data;
     if (version->fcc != 'MVER')
         return false;
     if (version->ver != FILE_FORMAT_VERSION)
diff --git a/contrib/extractor/loadlib/loadlib.h b/contrib/extractor/loadlib/loadlib.h
index 96cd25cedb2..86f9c937bd0 100644
--- a/contrib/extractor/loadlib/loadlib.h
+++ b/contrib/extractor/loadlib/loadlib.h
@@ -1,7 +1,7 @@
 #ifndef LOAD_LIB_H
 #define LOAD_LIB_H
 
-#ifdef WIN32
+#if defined (WIN32) && !defined (__MINGW32__)
 typedef __int64            int64;
 typedef __int32            int32;
 typedef __int16            int16;
@@ -12,10 +12,10 @@ typedef unsigned __int16   uint16;
 typedef unsigned __int8    uint8;
 #else
 #include <stdint.h>
-#ifndef uint64_t
-#ifdef __linux__
-#include <linux/types.h>
-#endif
+#if defined (__MINGW32__)
+    #include <sys/types.h>
+#elif defined(__linux__)
+    #include <linux/types.h>
 #endif
 typedef int64_t            int64;
 typedef int32_t            int32;
@@ -34,7 +34,8 @@ typedef uint8_t            uint8;
 //
 struct file_MVER
 {
-    union{
+    union
+    {
         uint32 fcc;
         char   fcc_txt[4];
     };
@@ -42,13 +43,14 @@ struct file_MVER
     uint32 ver;
 };
 
-class FileLoader{
-    uint8  *data;
-    uint32  data_size;
-public:
-    virtual bool prepareLoadedData();
-    uint8 *GetData()     {return data;}
-    uint32 GetDataSize() {return data_size;}
+class FileLoader
+{
+        uint8*  data;
+        uint32  data_size;
+    public:
+        virtual bool prepareLoadedData();
+        uint8* GetData()     {return data;}
+        uint32 GetDataSize() {return data_size;}
 
     file_MVER *version;
     FileLoader();
diff --git a/contrib/extractor/loadlib/wdt.cpp b/contrib/extractor/loadlib/wdt.cpp
index dedefbb64e5..3c5f20e51a6 100644
--- a/contrib/extractor/loadlib/wdt.cpp
+++ b/contrib/extractor/loadlib/wdt.cpp
@@ -49,13 +49,13 @@ bool WDT_file::prepareLoadedData()
     if (!FileLoader::prepareLoadedData())
         return false;
 
-    mphd = (wdt_MPHD *)((uint8*)version+version->size+8);
+    mphd = (wdt_MPHD*)((uint8*)version + version->size + 8);
     if (!mphd->prepareLoadedData())
         return false;
-    main = (wdt_MAIN *)((uint8*)mphd + mphd->size+8);
+    main = (wdt_MAIN*)((uint8*)mphd + mphd->size + 8);
     if (!main->prepareLoadedData())
         return false;
-    wmo = (wdt_MWMO *)((uint8*)main+ main->size+8);
+    wmo = (wdt_MWMO*)((uint8*)main + main->size + 8);
     if (!wmo->prepareLoadedData())
         return false;
     return true;
diff --git a/contrib/extractor/loadlib/wdt.h b/contrib/extractor/loadlib/wdt.h
index fcee8ac64f2..965a8e304c5 100644
--- a/contrib/extractor/loadlib/wdt.h
+++ b/contrib/extractor/loadlib/wdt.h
@@ -7,58 +7,66 @@
 //**************************************************************************************
 #define WDT_MAP_SIZE 64
 
-class wdt_MWMO{
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-public:
-    uint32 size;
-    bool prepareLoadedData();
+class wdt_MWMO
+{
+        union
+        {
+            uint32 fcc;
+            char   fcc_txt[4];
+        };
+    public:
+        uint32 size;
+        bool prepareLoadedData();
 };
 
-class wdt_MPHD{
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-public:
-    uint32 size;
+class wdt_MPHD
+{
+        union
+        {
+            uint32 fcc;
+            char   fcc_txt[4];
+        };
+    public:
+        uint32 size;
 
     uint32 data1;
     uint32 data2;
     uint32 data3;
     uint32 data4;
     uint32 data5;
-    uint32 data6;
-    uint32 data7;
-    uint32 data8;
-    bool   prepareLoadedData();
+        uint32 data6;
+        uint32 data7;
+        uint32 data8;
+        bool   prepareLoadedData();
 };
 
-class wdt_MAIN{
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-public:
-    uint32 size;
+class wdt_MAIN
+{
+        union
+        {
+            uint32 fcc;
+            char   fcc_txt[4];
+        };
+    public:
+        uint32 size;
 
-    struct adtData{
-        uint32 exist;
-        uint32 data1;
-    } adt_list[64][64];
+        struct adtData
+        {
+            uint32 exist;
+            uint32 data1;
+        } adt_list[64][64];
 
-    bool   prepareLoadedData();
+        bool   prepareLoadedData();
 };
 
-class WDT_file : public FileLoader{
-public:
-    bool   prepareLoadedData();
+class WDT_file : public FileLoader
+{
+    public:
+        bool   prepareLoadedData();
 
-    WDT_file();
-    ~WDT_file();
-    void free();
+        WDT_file();
+        ~WDT_file();
+        void free();
 
     wdt_MPHD *mphd;
     wdt_MAIN *main;
diff --git a/contrib/extractor/mpq_libmpq.cpp b/contrib/extractor/mpq_libmpq.cpp
index 65facbff3b2..d6a4826c7c7 100644
--- a/contrib/extractor/mpq_libmpq.cpp
+++ b/contrib/extractor/mpq_libmpq.cpp
@@ -8,8 +8,10 @@ MPQArchive::MPQArchive(const char* filename)
 {
     int result = libmpq_archive_open(&mpq_a, (unsigned char*)filename);
     printf("Opening %s\n", filename);
-    if(result) {
-        switch(result) {
+    if (result)
+    {
+        switch (result)
+        {
             case LIBMPQ_EFILE :                   /* error on file operation */
                 printf("Error opening archive '%s': File operation Error\n", filename);
                 break;
@@ -61,9 +63,9 @@ MPQFile::MPQFile(const char* filename):
     pointer(0),
     size(0)
 {
-    for(ArchiveSet::iterator i=gOpenArchives.begin(); i!=gOpenArchives.end();++i)
+    for (ArchiveSet::iterator i = gOpenArchives.begin(); i != gOpenArchives.end(); ++i)
     {
-        mpq_archive &mpq_a = (*i)->mpq_a;
+        mpq_archive& mpq_a = (*i)->mpq_a;
 
         mpq_hash hash = (*i)->GetHashEntry(filename);
         uint32 blockindex = hash.blockindex;
@@ -80,7 +82,8 @@ MPQFile::MPQFile(const char* filename):
         // Found!
         size = libmpq_file_info(&mpq_a, LIBMPQ_FILE_UNCOMPRESSED_SIZE, fileno);
         // HACK: in patch.mpq some files don't want to open and give 1 for filesize
-        if (size<=1) {
+        if (size <= 1)
+        {
             eof = true;
             buffer = 0;
             return;
@@ -101,7 +104,8 @@ size_t MPQFile::read(void* dest, size_t bytes)
     if (eof) return 0;
 
     size_t rpos = pointer + bytes;
-    if (rpos > size) {
+    if (rpos > size)
+    {
         bytes = size - pointer;
         eof = true;
     }
diff --git a/contrib/extractor/mpq_libmpq.h b/contrib/extractor/mpq_libmpq.h
index 7b5258e6a3c..fa6a75a1856 100644
--- a/contrib/extractor/mpq_libmpq.h
+++ b/contrib/extractor/mpq_libmpq.h
@@ -17,105 +17,111 @@ using namespace std;
 class MPQArchive
 {
 
-public:
-    mpq_archive mpq_a;
+    public:
+        mpq_archive mpq_a;
 
-    MPQArchive(const char* filename);
-    void close();
+        MPQArchive(const char* filename);
+        void close();
 
-    uint32 HashString(const char* Input, uint32 Offset) {
-        uint32 seed1 = 0x7fed7fed;
-        uint32 seed2 = 0xeeeeeeee;
+        uint32 HashString(const char* Input, uint32 Offset)
+        {
+            uint32 seed1 = 0x7fed7fed;
+            uint32 seed2 = 0xeeeeeeee;
 
-        for (uint32 i = 0; i < strlen(Input); i++) {
-            uint32 val = toupper(Input[i]);
-            seed1 = mpq_a.buf[Offset + val] ^ (seed1 + seed2);
-            seed2 = val + seed1 + seed2 + (seed2 << 5) + 3;
-        }
+            for (uint32 i = 0; i < strlen(Input); i++)
+            {
+                uint32 val = toupper(Input[i]);
+                seed1 = mpq_a.buf[Offset + val] ^ (seed1 + seed2);
+                seed2 = val + seed1 + seed2 + (seed2 << 5) + 3;
+            }
 
-        return seed1;
-    }
-    mpq_hash GetHashEntry(const char* Filename) {
-        uint32 index = HashString(Filename, 0);
-        index &= mpq_a.header->hashtablesize - 1;
-        uint32 name1 = HashString(Filename, 0x100);
-        uint32 name2 = HashString(Filename, 0x200);
-
-        for(uint32 i = index; i < mpq_a.header->hashtablesize; ++i) {
-            mpq_hash hash = mpq_a.hashtable[i];
-            if (hash.name1 == name1 && hash.name2 == name2) return hash;
+            return seed1;
+        }
+        mpq_hash GetHashEntry(const char* Filename)
+        {
+            uint32 index = HashString(Filename, 0);
+            index &= mpq_a.header->hashtablesize - 1;
+            uint32 name1 = HashString(Filename, 0x100);
+            uint32 name2 = HashString(Filename, 0x200);
+
+            for (uint32 i = index; i < mpq_a.header->hashtablesize; ++i)
+            {
+                mpq_hash hash = mpq_a.hashtable[i];
+                if (hash.name1 == name1 && hash.name2 == name2) return hash;
+            }
+
+            mpq_hash nullhash;
+            nullhash.blockindex = 0xFFFFFFFF;
+            return nullhash;
         }
 
-        mpq_hash nullhash;
-        nullhash.blockindex = 0xFFFFFFFF;
-        return nullhash;
-    }
+        void GetFileListTo(vector<string>& filelist)
+        {
+            mpq_hash hash = GetHashEntry("(listfile)");
+            uint32 blockindex = hash.blockindex;
 
-    void GetFileListTo(vector<string>& filelist) {
-        mpq_hash hash = GetHashEntry("(listfile)");
-        uint32 blockindex = hash.blockindex;
+            if ((blockindex == 0xFFFFFFFF) || (blockindex == 0))
+                return;
 
-        if ((blockindex == 0xFFFFFFFF) || (blockindex == 0))
-            return;
+            uint32 size = libmpq_file_info(&mpq_a, LIBMPQ_FILE_UNCOMPRESSED_SIZE, blockindex);
+            char* buffer = new char[size];
 
-        uint32 size = libmpq_file_info(&mpq_a, LIBMPQ_FILE_UNCOMPRESSED_SIZE, blockindex);
-        char *buffer = new char[size];
+            libmpq_file_getdata(&mpq_a, hash, blockindex, (unsigned char*)buffer);
 
-        libmpq_file_getdata(&mpq_a, hash, blockindex, (unsigned char*)buffer);
+            char seps[] = "\n";
+            char* token;
 
-        char seps[] = "\n";
-        char *token;
+            token = strtok(buffer, seps);
+            uint32 counter = 0;
+            while ((token != NULL) && (counter < size))
+            {
+                //cout << token << endl;
+                token[strlen(token) - 1] = 0;
+                string s = token;
+                filelist.push_back(s);
+                counter += strlen(token) + 2;
+                token = strtok(NULL, seps);
+            }
 
-        token = strtok( buffer, seps );
-        uint32 counter = 0;
-        while ((token != NULL) && (counter < size)) {
-            //cout << token << endl;
-            token[strlen(token) - 1] = 0;
-            string s = token;
-            filelist.push_back(s);
-            counter += strlen(token) + 2;
-            token = strtok(NULL, seps);
+            delete[] buffer;
         }
-
-        delete[] buffer;
-    }
 };
 typedef std::deque<MPQArchive*> ArchiveSet;
 
 class MPQFile
 {
-    //MPQHANDLE handle;
-    bool eof;
-    char *buffer;
-    size_t pointer,size;
-
-    // disable copying
-    MPQFile(const MPQFile &f) {}
-    void operator=(const MPQFile &f) {}
-
-public:
-    MPQFile(const char* filename);    // filenames are not case sensitive
-    ~MPQFile() { close(); }
-    size_t read(void* dest, size_t bytes);
-    size_t getSize() { return size; }
-    size_t getPos() { return pointer; }
-    char* getBuffer() { return buffer; }
-    char* getPointer() { return buffer + pointer; }
-    bool isEof() { return eof; }
-    void seek(int offset);
-    void seekRelative(int offset);
-    void close();
+        //MPQHANDLE handle;
+        bool eof;
+        char* buffer;
+        size_t pointer, size;
+
+        // disable copying
+        MPQFile(const MPQFile& f) {}
+        void operator=(const MPQFile& f) {}
+
+    public:
+        MPQFile(const char* filename);    // filenames are not case sensitive
+        ~MPQFile() { close(); }
+        size_t read(void* dest, size_t bytes);
+        size_t getSize() { return size; }
+        size_t getPos() { return pointer; }
+        char* getBuffer() { return buffer; }
+        char* getPointer() { return buffer + pointer; }
+        bool isEof() { return eof; }
+        void seek(int offset);
+        void seekRelative(int offset);
+        void close();
 };
 
-inline void flipcc(char *fcc)
+inline void flipcc(char* fcc)
 {
     char t;
-    t=fcc[0];
-    fcc[0]=fcc[3];
-    fcc[3]=t;
-    t=fcc[1];
-    fcc[1]=fcc[2];
-    fcc[2]=t;
+    t = fcc[0];
+    fcc[0] = fcc[3];
+    fcc[3] = t;
+    t = fcc[1];
+    fcc[1] = fcc[2];
+    fcc[2] = t;
 }
 
 #endif
diff --git a/contrib/extractor_binary/ExtractResources.sh b/contrib/extractor_binary/ExtractResources.sh
index 089e97a695e..fafae7dd78b 100644
--- a/contrib/extractor_binary/ExtractResources.sh
+++ b/contrib/extractor_binary/ExtractResources.sh
@@ -148,7 +148,7 @@ then
   echo "`date`: Extracting of vmaps finished" | tee -a $LOG_FILE
   mkdir vmaps
   echo "`date`: Start assembling of vmaps..." | tee -a $LOG_FILE
-  vmap_assembler.exe buildings vmaps | tee -a $DETAIL_LOG_FILE
+  vmap_assembler Buildings vmaps | tee -a $DETAIL_LOG_FILE
   echo "`date`: Assembling of vmaps finished" | tee -a $LOG_FILE
 
   echo | tee -a $LOG_FILE
diff --git a/contrib/extractor_binary/MoveMapGen.exe b/contrib/extractor_binary/MoveMapGen.exe
deleted file mode 100644
index 861b852544a..00000000000
Binary files a/contrib/extractor_binary/MoveMapGen.exe and /dev/null differ
diff --git a/contrib/extractor_binary/MoveMapGen.sh b/contrib/extractor_binary/MoveMapGen.sh
index a1be913f31a..08a3fdf424d 100644
--- a/contrib/extractor_binary/MoveMapGen.sh
+++ b/contrib/extractor_binary/MoveMapGen.sh
@@ -89,7 +89,7 @@ createMMaps()
         continue 2
       fi
     done
-    ./MoveMapGen $PARAMS $OFFMESH $i | tee -a $DETAIL_LOG_FILE
+    MoveMapGen $PARAMS $OFFMESH $i | tee -a $DETAIL_LOG_FILE
     echo "`date`: (Re)created map $i" | tee -a $LOG_FILE
   done
 }
@@ -140,7 +140,7 @@ case "$1" in
     echo "Recreate offmeshs from file $OFFMESH_FILE" | tee -a $DETAIL_LOG_FILE
     while read map tile line
     do
-      ./MoveMapGen $PARAMS $OFFMESH $map --tile $tile | tee -a $DETAIL_LOG_FILE
+      MoveMapGen $PARAMS $OFFMESH $map --tile $tile | tee -a $DETAIL_LOG_FILE
       echo "`date`: Recreated $map $tile from $OFFMESH_FILE" | tee -a $LOG_FILE
     done < $OFFMESH_FILE &
     ;;
diff --git a/contrib/extractor_binary/ad.exe b/contrib/extractor_binary/ad.exe
deleted file mode 100644
index 135a06f7721..00000000000
Binary files a/contrib/extractor_binary/ad.exe and /dev/null differ
diff --git a/contrib/extractor_binary/vmapExtractor3.exe b/contrib/extractor_binary/vmapExtractor3.exe
deleted file mode 100644
index 6bbc88357a4..00000000000
Binary files a/contrib/extractor_binary/vmapExtractor3.exe and /dev/null differ
diff --git a/contrib/extractor_binary/vmap_assembler.exe b/contrib/extractor_binary/vmap_assembler.exe
deleted file mode 100644
index ce4ca9407b2..00000000000
Binary files a/contrib/extractor_binary/vmap_assembler.exe and /dev/null differ
diff --git a/contrib/extractor_binary/win32/MoveMapGen.exe b/contrib/extractor_binary/win32/MoveMapGen.exe
new file mode 100755
index 00000000000..5fa6c2d70c5
Binary files /dev/null and b/contrib/extractor_binary/win32/MoveMapGen.exe differ
diff --git a/contrib/extractor_binary/win32/ad.exe b/contrib/extractor_binary/win32/ad.exe
new file mode 100755
index 00000000000..280533cb6d6
Binary files /dev/null and b/contrib/extractor_binary/win32/ad.exe differ
diff --git a/contrib/extractor_binary/win32/libACE.dll b/contrib/extractor_binary/win32/libACE.dll
new file mode 100755
index 00000000000..0924e6e6511
Binary files /dev/null and b/contrib/extractor_binary/win32/libACE.dll differ
diff --git a/contrib/extractor_binary/win32/libbz2-1.dll b/contrib/extractor_binary/win32/libbz2-1.dll
new file mode 100755
index 00000000000..5b03c03002c
Binary files /dev/null and b/contrib/extractor_binary/win32/libbz2-1.dll differ
diff --git a/contrib/extractor_binary/win32/libgcc_s_sjlj-1.dll b/contrib/extractor_binary/win32/libgcc_s_sjlj-1.dll
new file mode 100755
index 00000000000..5ad5b957d19
Binary files /dev/null and b/contrib/extractor_binary/win32/libgcc_s_sjlj-1.dll differ
diff --git a/contrib/extractor_binary/win32/libstdc++-6.dll b/contrib/extractor_binary/win32/libstdc++-6.dll
new file mode 100755
index 00000000000..5a5136d72da
Binary files /dev/null and b/contrib/extractor_binary/win32/libstdc++-6.dll differ
diff --git a/contrib/extractor_binary/win32/vmapExtractor3.exe b/contrib/extractor_binary/win32/vmapExtractor3.exe
new file mode 100755
index 00000000000..2238a55de98
Binary files /dev/null and b/contrib/extractor_binary/win32/vmapExtractor3.exe differ
diff --git a/contrib/extractor_binary/win32/vmap_assembler.exe b/contrib/extractor_binary/win32/vmap_assembler.exe
new file mode 100755
index 00000000000..ea9512f060c
Binary files /dev/null and b/contrib/extractor_binary/win32/vmap_assembler.exe differ
diff --git a/contrib/extractor_binary/win32/zlib1.dll b/contrib/extractor_binary/win32/zlib1.dll
new file mode 100755
index 00000000000..a2047dca121
Binary files /dev/null and b/contrib/extractor_binary/win32/zlib1.dll differ
diff --git a/contrib/extractor_binary/win64/MoveMapGen.exe b/contrib/extractor_binary/win64/MoveMapGen.exe
new file mode 100755
index 00000000000..69a636ed7bf
Binary files /dev/null and b/contrib/extractor_binary/win64/MoveMapGen.exe differ
diff --git a/contrib/extractor_binary/win64/ad.exe b/contrib/extractor_binary/win64/ad.exe
new file mode 100755
index 00000000000..a8c20eb8e6b
Binary files /dev/null and b/contrib/extractor_binary/win64/ad.exe differ
diff --git a/contrib/extractor_binary/win64/libACE.dll b/contrib/extractor_binary/win64/libACE.dll
new file mode 100755
index 00000000000..f302b2e0abb
Binary files /dev/null and b/contrib/extractor_binary/win64/libACE.dll differ
diff --git a/contrib/extractor_binary/win64/libbz2-1.dll b/contrib/extractor_binary/win64/libbz2-1.dll
new file mode 100755
index 00000000000..39bc08d512d
Binary files /dev/null and b/contrib/extractor_binary/win64/libbz2-1.dll differ
diff --git a/contrib/extractor_binary/win64/libgcc_s_sjlj-1.dll b/contrib/extractor_binary/win64/libgcc_s_sjlj-1.dll
new file mode 100755
index 00000000000..7bfb40c462c
Binary files /dev/null and b/contrib/extractor_binary/win64/libgcc_s_sjlj-1.dll differ
diff --git a/contrib/extractor_binary/win64/libstdc++-6.dll b/contrib/extractor_binary/win64/libstdc++-6.dll
new file mode 100755
index 00000000000..4911d9838ec
Binary files /dev/null and b/contrib/extractor_binary/win64/libstdc++-6.dll differ
diff --git a/contrib/extractor_binary/win64/vmapExtractor3.exe b/contrib/extractor_binary/win64/vmapExtractor3.exe
new file mode 100755
index 00000000000..511fa4aa932
Binary files /dev/null and b/contrib/extractor_binary/win64/vmapExtractor3.exe differ
diff --git a/contrib/extractor_binary/win64/vmap_assembler.exe b/contrib/extractor_binary/win64/vmap_assembler.exe
new file mode 100755
index 00000000000..0fd6c8e413a
Binary files /dev/null and b/contrib/extractor_binary/win64/vmap_assembler.exe differ
diff --git a/contrib/extractor_binary/win64/zlib1.dll b/contrib/extractor_binary/win64/zlib1.dll
new file mode 100755
index 00000000000..48b99f3b08b
Binary files /dev/null and b/contrib/extractor_binary/win64/zlib1.dll differ
diff --git a/contrib/extractor_binary_VC10/ExtractParams.txt b/contrib/extractor_binary_VC10/ExtractParams.txt
new file mode 100644
index 00000000000..96083599b13
--- /dev/null
+++ b/contrib/extractor_binary_VC10/ExtractParams.txt
@@ -0,0 +1,6 @@
+For best results (more size, but rather data):
+
+ad.exe -f 0
+vmapExtractor3.exe -l
+md vmaps
+vmap_assembler.exe buildings vmaps
diff --git a/contrib/extractor_binary_VC10/ExtractResources.sh b/contrib/extractor_binary_VC10/ExtractResources.sh
new file mode 100644
index 00000000000..fafae7dd78b
--- /dev/null
+++ b/contrib/extractor_binary_VC10/ExtractResources.sh
@@ -0,0 +1,162 @@
+#!/bin/sh
+
+# Copyright (C) 2005-2012 MaNGOS project <http://getmangos.com/>
+#
+# 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.
+
+## Expected param 1 to be 'a' for all, else ask some questions
+
+## Normal log file (if not overwritten by second param
+LOG_FILE="MaNGOSExtractor.log"
+## Detailed log file
+DETAIL_LOG_FILE="MaNGOSExtractor_detailed.log"
+
+## Change this to a value fitting for your sys!
+NUM_CPU="2"
+
+## ! Use below only for finetuning or if you know what you are doing !
+
+USE_AD="0"
+USE_VMAPS="0"
+USE_MMAPS="0"
+USE_MMAPS_OFFMESH="0"
+
+if [ "$1" = "a" ]
+then
+  ## extract all
+  USE_AD="1"
+  USE_VMAPS="1"
+  USE_MMAPS="1"
+else
+  ## do some questioning!
+  echo
+  echo "Welcome to helper script to extract required dataz for MaNGOS!"
+  echo "Should all dataz (dbc, maps, vmaps and mmaps be extracted? (y/n)"
+  read line
+  if [ "$line" = "y" ]
+  then
+    ## extract all
+    USE_AD="1"
+    USE_VMAPS="1"
+    USE_MMAPS="1"
+  else
+    echo
+    echo "Should dbc and maps be extracted? (y/n)"
+    read line
+    if [ "$line" = "y" ]; then USE_AD="1"; fi
+
+    echo
+    echo "Should vmaps be extracted? (y/n)"
+    read line
+    if [ "$line" = "y" ]; then USE_VMAPS="1"; fi
+
+    echo
+    echo "Should mmaps be extracted? (y/n)"
+    echo "WARNING! This will take several hours!"
+    read line
+    if [ "$line" = "y" ]
+    then
+      USE_MMAPS="1";
+    else
+      echo "Only reextract offmesh tiles for mmaps?"
+      read line
+      if [ "$line" = "y" ]
+      then
+        USE_MMAPS_OFFMESH="1";
+      fi
+    fi
+  fi
+fi
+
+## Special case: Only reextract offmesh tiles
+if [ "$USE_MMAPS_OFFMESH" = "1" ]
+then
+  echo "Only extracting offmesh meshes"
+  MoveMapGen.sh offmesh $LOG_FILE $DETAIL_LOG_FILE
+  exit 0
+fi
+
+## Obtain numbe ob processes
+if [ "$USE_MMAPS" = "1" ]
+then
+  echo "How many CPUs should be used for extracting mmaps? (1-4)"
+  read line
+  if [ "$line" -ge "1" -a "$line" -le "4" ]
+  then
+    NUM_CPU=$line
+  else
+    echo "Only number between 1 and 4 supported!"
+    exit 1
+  fi
+fi
+
+## Give some status
+echo "Current Settings: Extract DBCs/maps: $USE_AD, Extract vmaps: $USE_VMAPS, Extract mmaps: $USE_MMAPS on $NUM_CPU processes"
+if [ "$1" != "a" ]
+then
+  echo "If you don't like this settings, interrupt with CTRL+C"
+  read line
+fi
+
+echo "`date`: Start extracting dataz for MaNGOS" | tee $LOG_FILE
+
+## Handle log messages
+if [ "$USE_AD" = "1" ];
+then
+  echo "DBC and map files will be extracted" | tee -a $LOG_FILE
+else
+  echo "DBC and map files won't be extracted!" | tee -a $LOG_FILE
+fi
+if [ "$USE_VMAPS" = "1" ]
+then
+  echo "Vmaps will be extracted" | tee -a $LOG_FILE
+else
+  echo "Vmaps won't be extracted!" | tee -a $LOG_FILE
+fi
+if [ "$USE_MMAPS" = "1" ]
+then
+  echo "Mmaps will be extracted with $NUM_CPU processes" | tee -a $LOG_FILE
+else
+  echo "Mmaps files won't be extracted!" | tee -a $LOG_FILE
+fi
+echo | tee -a $LOG_FILE
+
+echo "`date`: Start extracting dataz for MaNGOS, DBCs/maps $USE_AD, vmaps $USE_VMAPS, mmaps $USE_MMAPS on $NUM_CPU processes" | tee $DETAIL_LOG_FILE
+echo | tee -a $DETAIL_LOG_FILE
+
+## Extract dbcs and maps
+if [ "$USE_AD" = "1" ]
+then
+ echo "`date`: Start extraction of DBCs and map files..." | tee -a $LOG_FILE
+ ad | tee -a $DETAIL_LOG_FILE
+ echo "`date`: Extracting of DBCs and map files finished" | tee -a $LOG_FILE
+ echo | tee -a $LOG_FILE
+ echo | tee -a $DETAIL_LOG_FILE
+fi
+
+## Extract vmaps
+if [ "$USE_VMAPS" = "1" ]
+then
+  echo "`date`: Start extraction of vmaps..." | tee -a $LOG_FILE
+  vmapExtractor3 | tee -a $DETAIL_LOG_FILE
+  echo "`date`: Extracting of vmaps finished" | tee -a $LOG_FILE
+  mkdir vmaps
+  echo "`date`: Start assembling of vmaps..." | tee -a $LOG_FILE
+  vmap_assembler Buildings vmaps | tee -a $DETAIL_LOG_FILE
+  echo "`date`: Assembling of vmaps finished" | tee -a $LOG_FILE
+
+  echo | tee -a $LOG_FILE
+  echo | tee -a $DETAIL_LOG_FILE
+fi
+
+## Extract mmaps
+if [ "$USE_MMAPS" = "1" ]
+then
+  MoveMapGen.sh $NUM_CPU $LOG_FILE $DETAIL_LOG_FILE
+fi
diff --git a/contrib/extractor_binary_VC10/MoveMapGen.sh b/contrib/extractor_binary_VC10/MoveMapGen.sh
new file mode 100644
index 00000000000..08a3fdf424d
--- /dev/null
+++ b/contrib/extractor_binary_VC10/MoveMapGen.sh
@@ -0,0 +1,158 @@
+#!/bin/sh
+
+# Copyright (C) 2005-2012 MaNGOS project <http://getmangos.com/>
+#
+# 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.
+
+## Syntax of this helper
+## First param must be number of to be used CPUs (only 1, 2, 3, 4 supported) or "offmesh" to recreate the special tiles from the OFFMESH_FILE
+## Second param can be an additional filename for storing log
+## Third param can be an addition filename for storing detailed log
+
+## Additional Parameters to be forwarded to MoveMapGen, see mmaps/readme for instructions
+PARAMS="--silent"
+
+## Already a few map extracted, and don't care anymore
+EXCLUDE_MAPS=""
+#EXCLUDE_MAPS="0 1 530 571" # example to exclude the continents
+
+## Offmesh file
+OFFMESH_FILE="offmesh.txt"
+
+## Normal log file (if not overwritten by second param
+LOG_FILE="MoveMapGen.log"
+## Detailed log file
+DETAIL_LOG_FILE="MoveMapGen_detailed.log"
+
+## ! Use below only for finetuning or if you know what you are doing !
+
+## All maps
+MAP_LIST_A="1 37 543 595 289 572 529 562 531 269 47 649 650 599 548 559 429 230 573 349 13 25 409 229 43 48 546 553 547 604 545 90 576"
+MAP_LIST_B="571 628 560 509 723 532 607 600 668 33 585 566 389 601 369 129 550 189 542 70 109 554 632 552 555 540 598 450 558 249 35 624 557"
+MAP_LIST_C="0 631 609 534 533 619 469 602 329 580 615 578 36 556 44 565 544 34 617 608 618 449 616 42 451 582 584 586 587 588 589 590 591 592"
+MAP_LIST_D="530 169 575 603 309 574 30 564 568 209 724 658 489  593 594 596 597 605 606 610 612 613 614 620 621 622 623 641 642 647 672 673 712 713 718"
+MAP_LIST_D1="209 724 658 489 606 610 612 613 614 620 621"
+MAP_LIST_D2="169 575 603 309 574 30 564 568 622 623 641 642 647 672 673 712 713 718"
+MAP_LIST_D3="530 593 594 596 597 605"
+
+badParam()
+{
+  echo "ERROR! Bad arguments!"
+  echo "You can (re)extract mmaps with this helper script,"
+  echo "or recreate only the tiles from the offmash file"
+  echo
+  echo "Call with number of processes (1 - 4) to create mmaps"
+  echo "Call with 'offmesh' to reextract the tiles from offmash file"
+  echo
+  echo "For further fine-tuning edit this helper script"
+  echo
+}
+
+if [ "$#" = "3" ]
+then
+  LOG_FILE=$2
+  DETAIL_LOG_FILE=$3
+elif [ "$#" = "2" ]
+then
+  LOG_FILE=$2
+fi
+
+# Offmesh file provided?
+OFFMESH=""
+if [ "$OFFMESH_FILE" != "" ]
+then
+  if [ ! -f "$OFFMESH_FILE" ]
+  then
+    echo "ERROR! Offmesh file $OFFMESH_FILE could not be found."
+    echo "Provide valid file or none. You need to edit the script"
+    exit 1
+  else
+    OFFMESH="--offMeshInput $OFFMESH_FILE"
+  fi
+fi
+
+# Function to process a list
+createMMaps()
+{
+  for i in $@
+  do
+    for j in $EXCLUDE_MAPS
+    do
+      if [ "$i" = "$j" ]
+      then
+        continue 2
+      fi
+    done
+    MoveMapGen $PARAMS $OFFMESH $i | tee -a $DETAIL_LOG_FILE
+    echo "`date`: (Re)created map $i" | tee -a $LOG_FILE
+  done
+}
+
+createHeader()
+{
+  echo "`date`: Start creating MoveMaps" | tee -a $LOG_FILE
+  echo "Used params: $PARAMS $OFFMESH" | tee -a $LOG_FILE
+  echo "Detailed log can be found in $DETAIL_LOG_FILE" | tee -a $LOG_FILE
+  echo "Start creating MoveMaps" | tee -a $DETAIL_LOG_FILE
+  echo
+  echo "Be PATIENT - This will take a long time and might also have gaps between visible changes on the console."
+  echo "WAIT until you are informed that 'creating MoveMaps' is 'finished'!"
+}
+
+# Create mmaps directory if not exist
+if [ ! -d mmaps ]
+then
+  mkdir mmaps
+fi
+
+# Param control
+case "$1" in
+  "1" )
+    createHeader $1
+    createMMaps $MAP_LIST_A $MAP_LIST_B $MAP_LIST_C $MAP_LIST_D &
+    ;;
+  "2" )
+    createHeader $1
+    createMMaps $MAP_LIST_A $MAP_LIST_D &
+    createMMaps $MAP_LIST_B $MAP_LIST_C &
+    ;;
+  "3" )
+    createHeader $1
+    createMMaps $MAP_LIST_A $MAP_LIST_D1&
+    createMMaps $MAP_LIST_B $MAP_LIST_D2&
+    createMMaps $MAP_LIST_C $MAP_LIST_D3&
+    ;;
+  "4" )
+    createHeader $1
+    createMMaps $MAP_LIST_A &
+    createMMaps $MAP_LIST_B &
+    createMMaps $MAP_LIST_C &
+    createMMaps $MAP_LIST_D &
+    ;;
+  "offmesh" )
+    echo "`date`: Recreate offmeshs from file $OFFMESH_FILE" | tee -a $LOG_FILE
+    echo "Recreate offmeshs from file $OFFMESH_FILE" | tee -a $DETAIL_LOG_FILE
+    while read map tile line
+    do
+      MoveMapGen $PARAMS $OFFMESH $map --tile $tile | tee -a $DETAIL_LOG_FILE
+      echo "`date`: Recreated $map $tile from $OFFMESH_FILE" | tee -a $LOG_FILE
+    done < $OFFMESH_FILE &
+    ;;
+  * )
+    badParam
+    exit 1
+    ;;
+esac
+
+wait
+
+echo  | tee -a $LOG_FILE
+echo  | tee -a $DETAIL_LOG_FILE
+echo "`date`: Finished creating MoveMaps" | tee -a $LOG_FILE
+echo "`date`: Finished creating MoveMaps" >> $DETAIL_LOG_FILE
diff --git a/contrib/extractor_binary_VC10/README.txt b/contrib/extractor_binary_VC10/README.txt
new file mode 100644
index 00000000000..0f6da3d51d8
--- /dev/null
+++ b/contrib/extractor_binary_VC10/README.txt
@@ -0,0 +1,36 @@
+# Copyright (C) 2005-2012 MaNGOS project <http://getmangos.com/>
+#
+# 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.
+
+Copy the content of this directory into your client directory.
+
+Then just run ExtractResources.sh
+On Windows, you can run the file within the "Git bash" (which should be shipped with your Git software)
+by invoking "sh ExtractResources.sh"
+
+This file will ask you what you want to extract.
+
+You can chose from the following:
+* Extract DBCs/ maps (required for MaNGOS to work)
+* Extract vmaps (expected for MaNGOS to work)
+* Extract mmaps (optional, and will require very long time to create)
+* Update mmaps with data from offmesh.txt (suggested after updates of this file)
+
+In case you want to extract mmaps you will be asked how many processes should be used for mmap-extraction;
+Recommanded is to use the number of CPUs
+
+By default the scripts will create log files
+MaNGOSExtractor.log for overall progress of the extraction, and
+MaNGOSExtractor_detailed.log which includes all the information about the extraction.
+
+If you want to toggle some parts in the extraction process, there are a few internal variables in the extraction scripts, that can be modified.
+
+Consider the Readme's in the directories extractor, vmap_assembler, vmap_extractor_v3 and mmap for further information about detail.
+
+Also especially related to mmaps updating you might be interested in using the MoveMapGen.sh script.
diff --git a/contrib/extractor_binary_VC10/Win32/MoveMapGen.exe b/contrib/extractor_binary_VC10/Win32/MoveMapGen.exe
new file mode 100644
index 00000000000..0f0b9522a4b
Binary files /dev/null and b/contrib/extractor_binary_VC10/Win32/MoveMapGen.exe differ
diff --git a/contrib/extractor_binary_VC10/Win32/ad.exe b/contrib/extractor_binary_VC10/Win32/ad.exe
new file mode 100644
index 00000000000..57fea27f844
Binary files /dev/null and b/contrib/extractor_binary_VC10/Win32/ad.exe differ
diff --git a/contrib/extractor_binary_VC10/Win32/vmapExtractor3.exe b/contrib/extractor_binary_VC10/Win32/vmapExtractor3.exe
new file mode 100644
index 00000000000..60078da64cc
Binary files /dev/null and b/contrib/extractor_binary_VC10/Win32/vmapExtractor3.exe differ
diff --git a/contrib/extractor_binary_VC10/Win32/vmap_assembler.exe b/contrib/extractor_binary_VC10/Win32/vmap_assembler.exe
new file mode 100644
index 00000000000..5597bda4a08
Binary files /dev/null and b/contrib/extractor_binary_VC10/Win32/vmap_assembler.exe differ
diff --git a/contrib/extractor_binary_VC10/Win64/MoveMapGen.exe b/contrib/extractor_binary_VC10/Win64/MoveMapGen.exe
new file mode 100644
index 00000000000..392ed773db9
Binary files /dev/null and b/contrib/extractor_binary_VC10/Win64/MoveMapGen.exe differ
diff --git a/contrib/extractor_binary_VC10/Win64/ad.exe b/contrib/extractor_binary_VC10/Win64/ad.exe
new file mode 100644
index 00000000000..5311624997a
Binary files /dev/null and b/contrib/extractor_binary_VC10/Win64/ad.exe differ
diff --git a/contrib/extractor_binary_VC10/Win64/vmapExtractor3.exe b/contrib/extractor_binary_VC10/Win64/vmapExtractor3.exe
new file mode 100644
index 00000000000..3702412bf8b
Binary files /dev/null and b/contrib/extractor_binary_VC10/Win64/vmapExtractor3.exe differ
diff --git a/contrib/extractor_binary_VC10/Win64/vmap_assembler.exe b/contrib/extractor_binary_VC10/Win64/vmap_assembler.exe
new file mode 100644
index 00000000000..4c7b6748b52
Binary files /dev/null and b/contrib/extractor_binary_VC10/Win64/vmap_assembler.exe differ
diff --git a/contrib/extractor_binary_VC10/offmesh.txt b/contrib/extractor_binary_VC10/offmesh.txt
new file mode 100644
index 00000000000..aec83859162
--- /dev/null
+++ b/contrib/extractor_binary_VC10/offmesh.txt
@@ -0,0 +1,3 @@
+0 31,59 (-14429.889648 450.344452 15.430828) (-14424.218750 444.332855 12.773965) 2.5 // booty bay dock
+562 31,20 (6234.545898 256.902100 11.075373) (6230.961914 252.127274 11.180979) 2.5 // Blade's Edge Arena
+562 31,20 (6243.081543 266.918854 11.059557) (6246.507324 271.623505 11.230524) 2.5 // Blade's Edge Arena
diff --git a/contrib/git_id/git_id.cpp b/contrib/git_id/git_id.cpp
index bbe1643e93b..89ceff9c018 100644
--- a/contrib/git_id/git_id.cpp
+++ b/contrib/git_id/git_id.cpp
@@ -458,6 +458,14 @@ bool find_sql_updates()
 
     pclose(cmd_pipe);
 
+    // Add last milestone's file information
+    last_sql_rev[0] = 11785;
+    last_sql_nr[0] = 2;
+    sscanf("11785_02_characters_instance", "%s", last_sql_update[0]);
+    last_sql_rev[2] = 10008;
+    last_sql_nr[2] = 1;
+    sscanf("10008_01_realmd_realmd_db_version", "%s", last_sql_update[2]);
+
     // remove updates from the last commit also found on origin
     snprintf(cmd, MAX_CMD, "git show %s:%s", origin_hash, sql_update_dir);
     if( (cmd_pipe = popen( cmd, "r" )) == NULL )
diff --git a/contrib/git_id/git_id_vc100.sln b/contrib/git_id/git_id_vc100.sln
deleted file mode 100644
index 5fddec2f660..00000000000
--- a/contrib/git_id/git_id_vc100.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "git_id", "git_id_vc100.vcxproj", "{AD81BF86-050B-4605-8AF2-03C01967D784}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AD81BF86-050B-4605-8AF2-03C01967D784}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AD81BF86-050B-4605-8AF2-03C01967D784}.Debug|Win32.Build.0 = Debug|Win32
-		{AD81BF86-050B-4605-8AF2-03C01967D784}.Release|Win32.ActiveCfg = Release|Win32
-		{AD81BF86-050B-4605-8AF2-03C01967D784}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/contrib/git_id/git_id_vc100.vcxproj b/contrib/git_id/git_id_vc100.vcxproj
deleted file mode 100644
index c934a89813d..00000000000
--- a/contrib/git_id/git_id_vc100.vcxproj
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>git_id</ProjectName>
-    <ProjectGuid>{AD81BF86-050B-4605-8AF2-03C01967D784}</ProjectGuid>
-    <RootNamespace>git_id</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="git_id.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/contrib/git_id/git_id_vc100.vcxproj.filters b/contrib/git_id/git_id_vc100.vcxproj.filters
deleted file mode 100644
index 158311880cc..00000000000
--- a/contrib/git_id/git_id_vc100.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="git_id.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/contrib/git_id/git_id_vc90.sln b/contrib/git_id/git_id_vc90.sln
deleted file mode 100644
index 25421889304..00000000000
--- a/contrib/git_id/git_id_vc90.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "git_id", "git_id_vc90.vcproj", "{AD81BF86-050B-4605-8AF2-03C01967D784}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AD81BF86-050B-4605-8AF2-03C01967D784}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AD81BF86-050B-4605-8AF2-03C01967D784}.Debug|Win32.Build.0 = Debug|Win32
-		{AD81BF86-050B-4605-8AF2-03C01967D784}.Release|Win32.ActiveCfg = Release|Win32
-		{AD81BF86-050B-4605-8AF2-03C01967D784}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/contrib/git_id/git_id_vc90.vcproj b/contrib/git_id/git_id_vc90.vcproj
deleted file mode 100644
index 67cff60cadf..00000000000
--- a/contrib/git_id/git_id_vc90.vcproj
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="git_id"
-	ProjectGUID="{AD81BF86-050B-4605-8AF2-03C01967D784}"
-	RootNamespace="git_id"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\git_id.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/git_id_R2/.gitignore b/contrib/git_id_R2/.gitignore
new file mode 100644
index 00000000000..2733a315ab0
--- /dev/null
+++ b/contrib/git_id_R2/.gitignore
@@ -0,0 +1,16 @@
+#
+# NOTE! Don't add files that are generated in specific
+# subdirectories here. Add them in the ".gitignore" file
+# in that subdirectory instead.
+#
+# NOTE! Please use 'git-ls-files -i --exclude-standard'
+# command after changing this file, to see if there are
+# any tracked files which get ignored after the change.
+#
+# Extractor generated files at Windows build
+#
+
+*.bsc
+*.pdb
+Debug
+Release
diff --git a/contrib/git_id_R2/CMakeLists.txt b/contrib/git_id_R2/CMakeLists.txt
new file mode 100644
index 00000000000..d126ab6bedb
--- /dev/null
+++ b/contrib/git_id_R2/CMakeLists.txt
@@ -0,0 +1,4 @@
+SET(CMAKE_VERBOSE_MAKEFILE ON)
+cmake_minimum_required (VERSION 2.6)
+ADD_EXECUTABLE (git_id git_id.cpp)
+
diff --git a/contrib/git_id_R2/git_id.cpp b/contrib/git_id_R2/git_id.cpp
new file mode 100644
index 00000000000..6ee33207e85
--- /dev/null
+++ b/contrib/git_id_R2/git_id.cpp
@@ -0,0 +1,449 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+#include <sstream>
+#include <assert.h>
+#include <set>
+#include <list>
+#include <sstream>
+
+#ifdef WIN32
+#include <direct.h>
+#define popen _popen
+#define pclose _pclose
+#define snprintf _snprintf
+#define putenv _putenv
+#pragma warning (disable:4996)
+#else
+#include <unistd.h>
+#endif
+
+// max string sizes
+
+#define MAX_REMOTE 256
+#define MAX_MSG 16384
+#define MAX_PATH 2048
+#define MAX_BUF 2048
+#define MAX_CMD 2048
+#define MAX_HASH 256
+#define MAX_DB 256
+
+// config
+
+#define NUM_REMOTES 2
+#define NUM_DATABASES 3
+
+char remotes[NUM_REMOTES][MAX_REMOTE] = {
+    "git@github.com:mangosR2/mangos.git",
+    "git://github.com/mangosR2/mangos.git"        // used for fetch if present
+};
+
+char remote_branch[MAX_REMOTE] = "master";
+char rev_nr_file[MAX_PATH] = "src/shared/revision_R2.h";
+char new_index_file[MAX_PATH] = ".git/git_id_index";
+
+bool allow_replace = false;
+bool local = false;
+bool do_fetch = false;
+bool use_new_index = true;
+bool generate_makefile = false;                             // not need for cmake build systems
+// aux
+
+char origins[NUM_REMOTES][MAX_REMOTE];
+int rev;
+
+char head_message[MAX_MSG];
+char path_prefix[MAX_PATH] = "";
+char base_path[MAX_PATH];
+char buffer[MAX_BUF];
+char cmd[MAX_CMD];
+char origin_hash[MAX_HASH];
+char old_index_cmd[MAX_CMD];
+char new_index_cmd[MAX_CMD];
+
+FILE *cmd_pipe;
+
+bool find_path()
+{
+    printf("+ finding path\n");
+    char *ptr;
+    char cur_path[MAX_PATH];
+    getcwd(cur_path, MAX_PATH);
+    size_t len = strlen(cur_path);
+    strncpy(base_path, cur_path, len+1);
+
+    if(cur_path[len-1] == '/' || cur_path[len-1] == '\\')
+    {
+        // we're in root, don't bother
+        return false;
+    }
+
+    // don't count the root
+    int count_fwd = 0, count_back = 0;
+    for(ptr = cur_path-1; ptr = strchr(ptr+1, '/'); count_fwd++);
+    for(ptr = cur_path-1; ptr = strchr(ptr+1, '\\'); count_back++);
+    int count = std::max(count_fwd, count_back);
+
+    char path[MAX_PATH];
+    for(int i = 0; i < count; i++)
+    {
+        snprintf(path, MAX_PATH, "%s.git", path_prefix);
+        if(0 == chdir(path))
+        {
+            chdir(cur_path);
+            return true;
+        }
+        strncat(path_prefix, "../", MAX_PATH);
+
+        ptr = strrchr(base_path, '\\');
+        if(ptr) *ptr = '\0';
+        else
+        {
+            ptr = strrchr(base_path, '/');
+            if(ptr) *ptr = '\0';
+        }
+    }
+
+    return false;
+}
+
+bool find_origin()
+{
+    printf("+ finding origin\n");
+    if( (cmd_pipe = popen( "git remote -v", "r" )) == NULL )
+        return false;
+
+    bool ret = false;
+    while(fgets(buffer, MAX_BUF, cmd_pipe))
+    {
+        char name[256], remote[MAX_REMOTE];
+        sscanf(buffer, "%s %s", name, remote);
+        for(int i = 0; i < NUM_REMOTES; i++)
+        {
+            if(strcmp(remote, remotes[i]) == 0)
+            {
+                strncpy(origins[i], name, MAX_REMOTE);
+                ret = true;
+            }
+        }
+    }
+    pclose(cmd_pipe);
+    return ret;
+}
+
+bool fetch_origin()
+{
+    printf("+ fetching origin\n");
+    // use the public clone url if present because the private may require a password
+    snprintf(cmd, MAX_CMD, "git fetch %s %s", (origins[1][0] ? origins[1] : origins[0]), remote_branch);
+    int ret = system(cmd);
+    return true;
+}
+
+bool check_fwd()
+{
+    printf("+ checking fast forward\n");
+    snprintf(cmd, MAX_CMD, "git log -n 1 --pretty=\"format:%%H\" %s/%s", (origins[1][0] ? origins[1] : origins[0]), remote_branch);
+    if( (cmd_pipe = popen( cmd, "r" )) == NULL )
+        return false;
+
+    if(!fgets(buffer, MAX_BUF, cmd_pipe)) return false;
+    strncpy(origin_hash, buffer, MAX_HASH);
+    pclose(cmd_pipe);
+
+    if( (cmd_pipe = popen( "git log --pretty=\"format:%H\"", "r" )) == NULL )
+        return false;
+
+    bool found = false;
+    while(fgets(buffer, MAX_BUF, cmd_pipe))
+    {
+        buffer[strlen(buffer) - 1] = '\0';
+        if(strncmp(origin_hash, buffer, MAX_BUF) == 0)
+        {
+            found = true;
+            break;
+        }
+    }
+    pclose(cmd_pipe);
+
+    if(!found)
+    {
+        // with fetch you still get the latest rev, you just rebase afterwards and push
+        // without it you may not get the right rev
+        if(do_fetch) printf("WARNING: non-fastforward, use rebase!\n");
+        else { printf("ERROR: non-fastforward, use rebase!\n"); return false; }
+    }
+    return true;
+}
+
+int get_rev(char *from_msg)
+{
+    // accept only the rev number format, not the sql update format
+    char * pch;
+    pch = strstr(from_msg,"[mr");
+    if (!pch) return 0;
+    strncpy (pch,"[00",3);
+    char nr_str[256];
+    if(sscanf(from_msg, "[%[0123456789]]",nr_str) != 1) return 0;
+//    if(from_msg[strlen(nr_str)+1] != ']') return 0;
+    return atoi(nr_str);
+}
+
+bool find_rev()
+{
+    printf("+ finding next revision number\n");
+    // find the highest rev number on either of the remotes
+    for(int i = 0; i < NUM_REMOTES; i++)
+    {
+        if(!local && !origins[i][0]) continue;
+
+        if(local) snprintf(cmd, MAX_CMD, "git log HEAD --pretty=\"format:%%s\"");
+        else sprintf(cmd, "git log %s/%s --pretty=\"format:%%s\"", origins[i], remote_branch);
+        if( (cmd_pipe = popen( cmd, "r" )) == NULL )
+            continue;
+
+        int nr;
+        while(fgets(buffer, MAX_BUF, cmd_pipe))
+        {
+            nr = get_rev(buffer);
+            if(nr >= rev)
+                rev = nr+1;
+        }
+        pclose(cmd_pipe);
+    }
+
+    if(rev > 0) printf("Found [%d].\n", rev);
+
+    return rev > 0;
+}
+
+std::string generateNrHeader(char const* rev_str)
+{
+    std::ostringstream newData;
+    newData << "#ifndef __REVISION_R2_H__" << std::endl;
+    newData << "#define __REVISION_R2_H__"  << std::endl;
+    newData << " #define REVISION_R2 \"" << rev_str << "\"" << std::endl;
+    newData << "#endif // __REVISION_R2_H__" << std::endl;
+    return newData.str();
+}
+
+void system_switch_index(const char *cmd)
+{
+    // do the command for the original index and then for the new index
+    // both need to be updated with the changes before commit
+    // but the new index will contains only the desired changes
+    // while the old may contain others
+    system(cmd);
+    if(!use_new_index) return;
+    if(putenv(new_index_cmd) != 0) return;
+    system(cmd);
+    if(putenv(old_index_cmd) != 0) return;
+}
+
+bool write_rev_nr()
+{
+    printf("+ writing revision_R2.h\n");
+    char rev_str[256];
+    sprintf(rev_str, "%d", rev);
+    std::string header = generateNrHeader(rev_str);
+
+    char prefixed_file[MAX_PATH];
+    snprintf(prefixed_file, MAX_PATH, "%s%s", path_prefix, rev_nr_file);
+
+    if(FILE* OutputFile = fopen(prefixed_file, "wb"))
+    {
+        fprintf(OutputFile,"%s", header.c_str());
+        fclose(OutputFile);
+
+        // add the file to both indices, to be committed later
+        snprintf(cmd, MAX_CMD, "git add %s", prefixed_file);
+        system_switch_index(cmd);
+
+        return true;
+    }
+
+    return false;
+}
+
+bool find_head_msg()
+{
+    printf("+ finding last message on HEAD\n");
+    if( (cmd_pipe = popen( "git log -n 1 --pretty=\"format:%s%n%n%b\"", "r" )) == NULL )
+        return false;
+
+    int poz = 0;
+    while(poz < 16384-1 && EOF != (head_message[poz++] = fgetc(cmd_pipe)));
+    head_message[poz-1] = '\0';
+
+    pclose(cmd_pipe);
+
+    if(int head_rev = get_rev(head_message))
+    {
+        if(!allow_replace)
+        {
+            printf("Last commit on HEAD is [%d]. Use -r to replace it with [%d].\n", head_rev, rev);
+            return false;
+        }
+
+        // skip the rev number in the commit
+        char *p = strchr(head_message, ']'), *q = head_message;
+        assert(p && *(p+1));
+        p+=2;
+        while(*p) *q = *p, p++, q++;
+        *q = 0;
+        return true;
+    }
+
+    return true;
+}
+
+bool amend_commit()
+{
+    printf("+ amending last commit\n");
+
+    // commit the contents of the (new) index
+    if(use_new_index && putenv(new_index_cmd) != 0) return false;
+    snprintf(cmd, MAX_CMD, "git commit --amend -F-");
+    if( (cmd_pipe = popen( cmd, "w" )) == NULL )
+        return false;
+
+    fprintf(cmd_pipe, "[mr%d] %s", rev, head_message);
+    pclose(cmd_pipe);
+    if(use_new_index && putenv(old_index_cmd) != 0) return false;
+
+    return true;
+}
+
+bool copy_file(const char *src_file, const char *dst_file)
+{
+    FILE * fin = fopen( src_file, "rb" );
+    if(!fin) return false;
+    FILE * fout = fopen( dst_file, "wb" );
+    if(!fout) { fclose(fin); return false; }
+
+    for(char c = getc(fin); !feof(fin); putc(c, fout), c = getc(fin));
+
+    fclose(fin);
+    fclose(fout);
+    return true;
+}
+
+bool prepare_new_index()
+{
+    if(!use_new_index) return true;
+
+    // only use a new index if there are staged changes that should be preserved
+    if( (cmd_pipe = popen( "git diff --cached", "r" )) == NULL ) {
+        use_new_index = false;
+        return false;
+    }
+
+    if(!fgets(buffer, MAX_BUF, cmd_pipe))
+    {
+        use_new_index = false;
+        pclose(cmd_pipe);
+        return true;
+    }
+
+    pclose(cmd_pipe);
+
+    printf("+ preparing new index\n");
+
+    // copy the existing index file to a new one
+    char src_file[MAX_PATH], dst_file[MAX_PATH];
+
+    char *old_index = getenv("GIT_INDEX_FILE");
+    if(old_index) strncpy(src_file, old_index, MAX_PATH);
+    else snprintf(src_file, MAX_PATH, "%s.git/index", path_prefix);
+    snprintf(dst_file, MAX_PATH, "%s%s", path_prefix, new_index_file);
+
+    if(!copy_file(src_file, dst_file)) return false;
+
+    // doesn't seem to work with path_prefix
+    snprintf(new_index_cmd, MAX_CMD, "GIT_INDEX_FILE=%s/%s", base_path, new_index_file);
+    if(putenv(new_index_cmd) != 0) return false;
+
+    // clear the new index
+    system("git reset -q --mixed HEAD");
+
+    // revert to old index
+    snprintf(old_index_cmd, MAX_CMD, "GIT_INDEX_FILE=");
+    if(putenv(old_index_cmd) != 0) return false;
+    return true;
+}
+
+bool cleanup_new_index()
+{
+    if(!use_new_index) return true;
+    printf("+ cleaning up the new index\n");
+    char idx_file[MAX_PATH];
+    snprintf(idx_file, MAX_PATH, "%s%s", path_prefix, new_index_file);
+    remove(idx_file);
+    return true;
+}
+
+#define DO(cmd) if(!cmd) { printf("FAILED\n"); return 1; }
+
+int main(int argc, char *argv[])
+{
+    for(int i = 1; i < argc; i++)
+    {
+        if(argv[i] == NULL) continue;
+        if(strncmp(argv[i], "-r", 2) == 0 || strncmp(argv[i], "--replace", 9) == 0)
+            allow_replace = true;
+        else if(strncmp(argv[i], "-l", 2) == 0 || strncmp(argv[i], "--local", 7) == 0)
+            local = true;
+        else if(strncmp(argv[i], "-f", 2) == 0 || strncmp(argv[i], "--fetch", 7) == 0)
+            do_fetch = true;
+        else if(strncmp(argv[i], "--branch=", 9) == 0)
+            snprintf(remote_branch, MAX_REMOTE, "%s", argv[i] + 9);
+        else if(strncmp(argv[i], "-h", 2) == 0 || strncmp(argv[i], "--help", 6) == 0)
+        {
+            printf("Usage: git_id [OPTION]\n");
+            printf("Generates a new rev number and updates revision_nr.h and the commit message.\n");
+            printf("Should be used just before push.\n");
+            printf("   -h, --help            show the usage\n");
+            printf("   -r, --replace         replace the rev number if it was already applied\n");
+            printf("                         to the last commit\n");
+            printf("   -l, --local           search for the highest rev number on HEAD\n");
+            printf("   -f, --fetch           fetch from origin before searching for the new rev\n");
+            printf("       --branch=BRANCH   specify which remote branch to use\n");
+            return 0;
+        }
+    }
+
+    DO( find_path()                     );
+    if(!local)
+    {
+        DO( find_origin()               );
+        if(do_fetch)
+            DO( fetch_origin()          );
+        DO( check_fwd()                 );
+    }
+    DO( find_rev()                      );
+    DO( find_head_msg()                 );
+    DO( prepare_new_index()             );
+    DO( write_rev_nr()                  );
+    DO( amend_commit()                  );
+    DO( cleanup_new_index()             );
+    return 0;
+}
diff --git a/contrib/git_id_R2_SD2/.gitignore b/contrib/git_id_R2_SD2/.gitignore
new file mode 100644
index 00000000000..02c4c5aa09d
--- /dev/null
+++ b/contrib/git_id_R2_SD2/.gitignore
@@ -0,0 +1,21 @@
+#
+# NOTE! Don't add files that are generated in specific
+# subdirectories here. Add them in the ".gitignore" file
+# in that subdirectory instead.
+#
+# NOTE! Please use 'git-ls-files -i --exclude-standard'
+# command after changing this file, to see if there are
+# any tracked files which get ignored after the change.
+#
+# Extractor generated files at Windows build
+#
+
+*.bsc
+*.pdb
+*.ncb
+*.sdf
+*.opensdf
+*.user
+Debug
+Release
+git_id
diff --git a/contrib/git_id_R2_SD2/CMakeLists.txt b/contrib/git_id_R2_SD2/CMakeLists.txt
new file mode 100644
index 00000000000..38737ec6486
--- /dev/null
+++ b/contrib/git_id_R2_SD2/CMakeLists.txt
@@ -0,0 +1,3 @@
+SET(CMAKE_VERBOSE_MAKEFILE ON)
+cmake_minimum_required (VERSION 2.6)
+ADD_EXECUTABLE (git_id_SD2 git_id.cpp)
diff --git a/contrib/git_id_R2_SD2/git_id.cpp b/contrib/git_id_R2_SD2/git_id.cpp
new file mode 100644
index 00000000000..a6ec97183cd
--- /dev/null
+++ b/contrib/git_id_R2_SD2/git_id.cpp
@@ -0,0 +1,459 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2005-2011 ScriptDev2 <http://www.scriptdev2.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+#include <sstream>
+#include <assert.h>
+#include <set>
+#include <list>
+#include <sstream>
+
+#ifdef WIN32
+#include <direct.h>
+#define popen _popen
+#define pclose _pclose
+#define snprintf _snprintf
+#define putenv _putenv
+#pragma warning (disable:4996)
+#else
+#include <unistd.h>
+#endif
+
+// max string sizes
+
+#define MAX_REMOTE 256
+#define MAX_MSG 16384
+#define MAX_PATH 2048
+#define MAX_BUF 2048
+#define MAX_CMD 2048
+#define MAX_HASH 256
+#define MAX_DB 256
+
+// config
+
+#define NUM_REMOTES 2
+#define NUM_DATABASES 2
+
+#define GIT_REV_PREFIX "sd2_mr"
+#define GIT_REV_PRINT  GIT_REV_PREFIX "%04d"
+#define GIT_REV_FORMAT "[" GIT_REV_PRINT "]"
+
+char remotes[NUM_REMOTES][MAX_REMOTE] = {
+    "git@github.com:mangosR2/scriptdev2.git",
+    "git://github.com/mangosR2/scriptdev2.git"                       // used for fetch if present
+};
+
+char remote_branch[MAX_REMOTE] = "master";
+char rev_nr_file[MAX_PATH] = "sd2_revision_R2.h";
+char new_index_file[MAX_PATH] = ".git/git_id_index";
+
+
+bool allow_replace = false;
+bool local = false;
+bool do_fetch = false;
+bool use_new_index = true;
+bool generate_makefile = false;                             // not need for cmake build systems
+// aux
+
+char origins[NUM_REMOTES][MAX_REMOTE];
+int rev;
+
+char head_message[MAX_MSG];
+char path_prefix[MAX_PATH] = "";
+char base_path[MAX_PATH];
+char buffer[MAX_BUF];
+char cmd[MAX_CMD];
+char origin_hash[MAX_HASH];
+char last_sql_update[NUM_DATABASES][MAX_PATH];
+char old_index_cmd[MAX_CMD];
+char new_index_cmd[MAX_CMD];
+
+std::set<std::string> new_sql_updates;
+
+FILE *cmd_pipe;
+
+bool find_path()
+{
+    printf("+ finding path\n");
+    char *ptr;
+    char cur_path[MAX_PATH];
+    getcwd(cur_path, MAX_PATH);
+    size_t len = strlen(cur_path);
+    strncpy(base_path, cur_path, len+1);
+
+    if(cur_path[len-1] == '/' || cur_path[len-1] == '\\')
+    {
+        // we're in root, don't bother
+        return false;
+    }
+
+    // don't count the root
+    int count_fwd = 0, count_back = 0;
+    for(ptr = cur_path-1; ptr = strchr(ptr+1, '/'); count_fwd++);
+    for(ptr = cur_path-1; ptr = strchr(ptr+1, '\\'); count_back++);
+    int count = std::max(count_fwd, count_back);
+
+    char path[MAX_PATH];
+    for(int i = 0; i < count; i++)
+    {
+        snprintf(path, MAX_PATH, "%s.git", path_prefix);
+        if(0 == chdir(path))
+        {
+            chdir(cur_path);
+            return true;
+        }
+        strncat(path_prefix, "../", MAX_PATH);
+
+        ptr = strrchr(base_path, '\\');
+        if(ptr) *ptr = '\0';
+        else
+        {
+            ptr = strrchr(base_path, '/');
+            if(ptr) *ptr = '\0';
+        }
+    }
+
+    return false;
+}
+
+bool find_origin()
+{
+    printf("+ finding origin\n");
+    if( (cmd_pipe = popen( "git remote -v", "r" )) == NULL )
+        return false;
+
+    bool ret = false;
+    while(fgets(buffer, MAX_BUF, cmd_pipe))
+    {
+        char name[256], remote[MAX_REMOTE];
+        sscanf(buffer, "%s %s", name, remote);
+        for(int i = 0; i < NUM_REMOTES; i++)
+        {
+            if(strcmp(remote, remotes[i]) == 0)
+            {
+                strncpy(origins[i], name, MAX_REMOTE);
+                ret = true;
+            }
+        }
+    }
+    pclose(cmd_pipe);
+    return ret;
+}
+
+bool fetch_origin()
+{
+    printf("+ fetching origin\n");
+    // use the public clone url if present because the private may require a password
+    snprintf(cmd, MAX_CMD, "git fetch %s %s", (origins[1][0] ? origins[1] : origins[0]), remote_branch);
+    int ret = system(cmd);
+    return true;
+}
+
+bool check_fwd()
+{
+    printf("+ checking fast forward\n");
+    snprintf(cmd, MAX_CMD, "git log -n 1 --pretty=\"format:%%H\" %s/%s", (origins[1][0] ? origins[1] : origins[0]), remote_branch);
+    if( (cmd_pipe = popen( cmd, "r" )) == NULL )
+        return false;
+
+    if(!fgets(buffer, MAX_BUF, cmd_pipe)) return false;
+    strncpy(origin_hash, buffer, MAX_HASH);
+    pclose(cmd_pipe);
+
+    if( (cmd_pipe = popen( "git log --pretty=\"format:%H\"", "r" )) == NULL )
+        return false;
+
+    bool found = false;
+    while(fgets(buffer, MAX_BUF, cmd_pipe))
+    {
+        buffer[strlen(buffer) - 1] = '\0';
+        if(strncmp(origin_hash, buffer, MAX_BUF) == 0)
+        {
+            found = true;
+            break;
+        }
+    }
+    pclose(cmd_pipe);
+
+    if(!found)
+    {
+        // with fetch you still get the latest rev, you just rebase afterwards and push
+        // without it you may not get the right rev
+        if(do_fetch) printf("WARNING: non-fastforward, use rebase!\n");
+        else { printf("ERROR: non-fastforward, use rebase!\n"); return false; }
+    }
+    return true;
+}
+
+int get_rev(const char *from_msg)
+{
+    // accept only the rev number format, not the sql update format
+    char nr_str[256];
+    if(sscanf(from_msg, "[" GIT_REV_PREFIX "%[0123456789]]", nr_str) != 1) return 0;
+    // ("[")+(REV_PREFIX)+("]")-1
+    if(from_msg[strlen(nr_str)+strlen(GIT_REV_PREFIX)+2-1] != ']') return 0;
+
+    return atoi(nr_str);
+}
+
+bool find_rev()
+{
+    printf("+ finding next revision number\n");
+    // find the highest rev number on either of the remotes
+    for(int i = 0; i < NUM_REMOTES; i++)
+    {
+        if(!local && !origins[i][0]) continue;
+
+        if(local) snprintf(cmd, MAX_CMD, "git log HEAD --pretty=\"format:%%s\"");
+        else sprintf(cmd, "git log %s/%s --pretty=\"format:%%s\"", origins[i], remote_branch);
+        if( (cmd_pipe = popen( cmd, "r" )) == NULL )
+            continue;
+
+        int nr;
+        while(fgets(buffer, MAX_BUF, cmd_pipe))
+        {
+            nr = get_rev(buffer);
+            if(nr >= rev)
+                rev = nr+1;
+        }
+        pclose(cmd_pipe);
+    }
+
+    if(rev > 0) printf("Found " GIT_REV_FORMAT ".\n", rev);
+
+    return rev > 0;
+}
+
+std::string generateNrHeader(char const* rev_str)
+{
+    std::ostringstream newData;
+    newData << "#ifndef __SD2_REVISION_R2_H__" << std::endl;
+    newData << "#define __SD2_REVISION_R2_H__"  << std::endl;
+    newData << " #define SD2_REVISION_R2 \"" << rev_str << "\"" << std::endl;
+    newData << "#endif // __SD2_REVISION_R2_H__" << std::endl;
+    return newData.str();
+}
+
+void system_switch_index(const char *cmd)
+{
+    // do the command for the original index and then for the new index
+    // both need to be updated with the changes before commit
+    // but the new index will contains only the desired changes
+    // while the old may contain others
+    system(cmd);
+    if(!use_new_index) return;
+    if(putenv(new_index_cmd) != 0) return;
+    system(cmd);
+    if(putenv(old_index_cmd) != 0) return;
+}
+
+bool write_rev_nr()
+{
+    printf("+ writing sd2_revision_nr.h\n");
+    char rev_str[256];
+    sprintf(rev_str, "%04d", rev);
+    std::string header = generateNrHeader(rev_str);
+
+    char prefixed_file[MAX_PATH];
+    snprintf(prefixed_file, MAX_PATH, "%s%s", path_prefix, rev_nr_file);
+
+    if(FILE* OutputFile = fopen(prefixed_file, "wb"))
+    {
+        fprintf(OutputFile,"%s", header.c_str());
+        fclose(OutputFile);
+
+        // add the file to both indices, to be committed later
+        snprintf(cmd, MAX_CMD, "git add %s", prefixed_file);
+        system_switch_index(cmd);
+
+        return true;
+    }
+
+    return false;
+}
+
+bool find_head_msg()
+{
+    printf("+ finding last message on HEAD\n");
+    if( (cmd_pipe = popen( "git log -n 1 --pretty=\"format:%s%n%n%b\"", "r" )) == NULL )
+        return false;
+
+    int poz = 0;
+    while(poz < 16384-1 && EOF != (head_message[poz++] = fgetc(cmd_pipe)));
+    head_message[poz-1] = '\0';
+
+    pclose(cmd_pipe);
+
+    if(int head_rev = get_rev(head_message))
+    {
+        if(!allow_replace)
+        {
+            printf("Last commit on HEAD is " GIT_REV_FORMAT ". Use -r to replace it with " GIT_REV_FORMAT ".\n", head_rev, rev);
+            return false;
+        }
+
+        // skip the rev number in the commit
+        char *p = strchr(head_message, ']'), *q = head_message;
+        assert(p && *(p+1));
+        p+=2;
+        while(*p) *q = *p, p++, q++;
+        *q = 0;
+        return true;
+    }
+
+    return true;
+}
+
+bool amend_commit()
+{
+    printf("+ amending last commit\n");
+
+    // commit the contents of the (new) index
+    if(use_new_index && putenv(new_index_cmd) != 0) return false;
+    snprintf(cmd, MAX_CMD, "git commit --amend -F-");
+    if( (cmd_pipe = popen( cmd, "w" )) == NULL )
+        return false;
+
+    fprintf(cmd_pipe, GIT_REV_FORMAT " %s", rev, head_message);
+    pclose(cmd_pipe);
+    if(use_new_index && putenv(old_index_cmd) != 0) return false;
+
+    return true;
+}
+
+
+bool copy_file(const char *src_file, const char *dst_file)
+{
+    FILE * fin = fopen( src_file, "rb" );
+    if(!fin) return false;
+    FILE * fout = fopen( dst_file, "wb" );
+    if(!fout) { fclose(fin); return false; }
+
+    for(char c = getc(fin); !feof(fin); putc(c, fout), c = getc(fin));
+
+    fclose(fin);
+    fclose(fout);
+    return true;
+}
+
+bool prepare_new_index()
+{
+    if(!use_new_index) return true;
+
+    // only use a new index if there are staged changes that should be preserved
+    if( (cmd_pipe = popen( "git diff --cached", "r" )) == NULL ) {
+        use_new_index = false;
+        return false;
+    }
+
+    if(!fgets(buffer, MAX_BUF, cmd_pipe))
+    {
+        use_new_index = false;
+        pclose(cmd_pipe);
+        return true;
+    }
+
+    pclose(cmd_pipe);
+
+    printf("+ preparing new index\n");
+
+    // copy the existing index file to a new one
+    char src_file[MAX_PATH], dst_file[MAX_PATH];
+
+    char *old_index = getenv("GIT_INDEX_FILE");
+    if(old_index) strncpy(src_file, old_index, MAX_PATH);
+    else snprintf(src_file, MAX_PATH, "%s.git/index", path_prefix);
+    snprintf(dst_file, MAX_PATH, "%s%s", path_prefix, new_index_file);
+
+    if(!copy_file(src_file, dst_file)) return false;
+
+    // doesn't seem to work with path_prefix
+    snprintf(new_index_cmd, MAX_CMD, "GIT_INDEX_FILE=%s/%s", base_path, new_index_file);
+    if(putenv(new_index_cmd) != 0) return false;
+
+    // clear the new index
+    system("git reset -q --mixed HEAD");
+
+    // revert to old index
+    snprintf(old_index_cmd, MAX_CMD, "GIT_INDEX_FILE=");
+    if(putenv(old_index_cmd) != 0) return false;
+    return true;
+}
+
+bool cleanup_new_index()
+{
+    if(!use_new_index) return true;
+    printf("+ cleaning up the new index\n");
+    char idx_file[MAX_PATH];
+    snprintf(idx_file, MAX_PATH, "%s%s", path_prefix, new_index_file);
+    remove(idx_file);
+    return true;
+}
+
+#define DO(cmd) if(!cmd) { printf("FAILED\n"); return 1; }
+
+int main(int argc, char *argv[])
+{
+    for(int i = 1; i < argc; i++)
+    {
+        if(argv[i] == NULL) continue;
+        if(strncmp(argv[i], "-r", 2) == 0 || strncmp(argv[i], "--replace", 9) == 0)
+            allow_replace = true;
+        else if(strncmp(argv[i], "-l", 2) == 0 || strncmp(argv[i], "--local", 7) == 0)
+            local = true;
+        else if(strncmp(argv[i], "-f", 2) == 0 || strncmp(argv[i], "--fetch", 7) == 0)
+            do_fetch = true;
+        else if(strncmp(argv[i], "--branch=", 9) == 0)
+            snprintf(remote_branch, MAX_REMOTE, "%s", argv[i] + 9);
+        else if(strncmp(argv[i], "-h", 2) == 0 || strncmp(argv[i], "--help", 6) == 0)
+        {
+            printf("Usage: git_id [OPTION]\n");
+            printf("Generates a new rev number and updates sd2_revision_nr.h and the commit message.\n");
+            printf("Should be used just before push.\n");
+            printf("   -h, --help            show the usage\n");
+            printf("   -r, --replace         replace the rev number if it was already applied\n");
+            printf("                         to the last commit\n");
+            printf("   -l, --local           search for the highest rev number on HEAD\n");
+            printf("   -f, --fetch           fetch from origin before searching for the new rev\n");
+            printf("                         for the new rev\n");
+            printf("       --branch=BRANCH   specify which remote branch to use\n");
+            return 0;
+        }
+    }
+
+    DO( find_path()                     );
+    if(!local)
+    {
+        DO( find_origin()               );
+        if(do_fetch)
+            DO( fetch_origin()          );
+        DO( check_fwd()                 );
+    }
+    DO( find_rev()                      );
+    DO( find_head_msg()                 );
+    DO( prepare_new_index()             );
+    DO( write_rev_nr()                  );
+    DO( amend_commit()                  );
+    DO( cleanup_new_index()             );
+
+    return 0;
+}
diff --git a/contrib/mmap/CMakeLists.txt b/contrib/mmap/CMakeLists.txt
index ae81e8574d9..fc56f77c4ac 100644
--- a/contrib/mmap/CMakeLists.txt
+++ b/contrib/mmap/CMakeLists.txt
@@ -27,8 +27,6 @@ include_directories(
     ../../src/game/vmap
     ../../dep/include/g3dlite
     ../../src/framework
-    ../../dep/ACE_wrappers
-    ../../objdir/dep/ACE_wrappers
     ../../dep/recastnavigation/Detour/Include
     ../../dep/recastnavigation/Recast/Include
     ../../dep/src/zlib
@@ -77,6 +75,7 @@ add_library(g3dlite
     ../../dep/src/g3dlite/Crypto_md5.cpp
     ../../dep/src/g3dlite/Cylinder.cpp
     ../../dep/src/g3dlite/debugAssert.cpp
+    ../../dep/src/g3dlite/FileSystem.cpp
     ../../dep/src/g3dlite/fileutils.cpp
     ../../dep/src/g3dlite/filter.cpp
     ../../dep/src/g3dlite/format.cpp
@@ -174,4 +173,4 @@ set(SOURCES
 
 add_executable( MoveMapGen ${SOURCES} )
 
-target_link_libraries( MoveMapGen g3dlite vmap Detour Recast zlib )
+target_link_libraries( MoveMapGen g3dlite vmap Detour Recast zlib pthread ACE)
diff --git a/contrib/mmap/src/IntermediateValues.cpp b/contrib/mmap/src/IntermediateValues.cpp
index 67e2ea7f847..f73b4f9f028 100644
--- a/contrib/mmap/src/IntermediateValues.cpp
+++ b/contrib/mmap/src/IntermediateValues.cpp
@@ -39,7 +39,7 @@ namespace MMAP
 
         string name("meshes/%03u%02i%02i.");
 
-        #define DEBUG_WRITE(fileExtension,data) \
+#define DEBUG_WRITE(fileExtension,data) \
         do { \
             sprintf(fileName, (name + fileExtension).c_str(), mapID, tileY, tileX); \
             FILE* file = fopen(fileName, "wb"); \
@@ -55,18 +55,18 @@ namespace MMAP
             printf("%sWriting debug output...                       \r", tileString); \
         } while (false)
 
-        if(heightfield)
+        if (heightfield)
             DEBUG_WRITE("hf", heightfield);
-        if(compactHeightfield)
+        if (compactHeightfield)
             DEBUG_WRITE("chf", compactHeightfield);
-        if(contours)
+        if (contours)
             DEBUG_WRITE("cs", contours);
-        if(polyMesh)
+        if (polyMesh)
             DEBUG_WRITE("pmesh", polyMesh);
-        if(polyMeshDetail)
+        if (polyMeshDetail)
             DEBUG_WRITE("dmesh", polyMeshDetail);
 
-        #undef DEBUG_WRITE
+#undef DEBUG_WRITE
     }
 
     void IntermediateValues::debugWrite(FILE* file, const rcHeightfield* mesh)
@@ -84,7 +84,7 @@ namespace MMAP
         for (int y = 0; y < mesh->height; ++y)
             for (int x = 0; x < mesh->width; ++x)
             {
-                rcSpan* span = mesh->spans[x+y*mesh->width];
+                rcSpan* span = mesh->spans[x + y * mesh->width];
 
                 // first, count the number of spans
                 int spanCount = 0;
@@ -98,7 +98,7 @@ namespace MMAP
                 fwrite(&spanCount, sizeof(int), 1, file);
 
                 // write the spans
-                span = mesh->spans[x+y*mesh->width];
+                span = mesh->spans[x + y * mesh->width];
                 while (span)
                 {
                     fwrite(span, sizeof(rcSpan), 1, file);
@@ -137,7 +137,7 @@ namespace MMAP
         fwrite(&tmp, sizeof(tmp), 1, file);
 
         if (chf->cells)
-            fwrite(chf->cells, sizeof(rcCompactCell), chf->width*chf->height, file);
+            fwrite(chf->cells, sizeof(rcCompactCell), chf->width * chf->height, file);
         if (chf->spans)
             fwrite(chf->spans, sizeof(rcCompactSpan), chf->spanCount, file);
         if (chf->dist)
@@ -161,9 +161,9 @@ namespace MMAP
             fwrite(&cs->conts[i].area, sizeof(unsigned char), 1, file);
             fwrite(&cs->conts[i].reg, sizeof(unsigned short), 1, file);
             fwrite(&cs->conts[i].nverts, sizeof(int), 1, file);
-            fwrite(cs->conts[i].verts, sizeof(int), cs->conts[i].nverts*4, file);
+            fwrite(cs->conts[i].verts, sizeof(int), cs->conts[i].nverts * 4, file);
             fwrite(&cs->conts[i].nrverts, sizeof(int), 1, file);
-            fwrite(cs->conts[i].rverts, sizeof(int), cs->conts[i].nrverts*4, file);
+            fwrite(cs->conts[i].rverts, sizeof(int), cs->conts[i].nrverts * 4, file);
         }
     }
 
@@ -178,9 +178,9 @@ namespace MMAP
         fwrite(mesh->bmin, sizeof(float), 3, file);
         fwrite(mesh->bmax, sizeof(float), 3, file);
         fwrite(&(mesh->nverts), sizeof(int), 1, file);
-        fwrite(mesh->verts, sizeof(unsigned short), mesh->nverts*3, file);
+        fwrite(mesh->verts, sizeof(unsigned short), mesh->nverts * 3, file);
         fwrite(&(mesh->npolys), sizeof(int), 1, file);
-        fwrite(mesh->polys, sizeof(unsigned short), mesh->npolys*mesh->nvp*2, file);
+        fwrite(mesh->polys, sizeof(unsigned short), mesh->npolys * mesh->nvp * 2, file);
         fwrite(mesh->flags, sizeof(unsigned short), mesh->npolys, file);
         fwrite(mesh->areas, sizeof(unsigned char), mesh->npolys, file);
         fwrite(mesh->regs, sizeof(unsigned short), mesh->npolys, file);
@@ -192,14 +192,14 @@ namespace MMAP
             return;
 
         fwrite(&(mesh->nverts), sizeof(int), 1, file);
-        fwrite(mesh->verts, sizeof(float), mesh->nverts*3, file);
+        fwrite(mesh->verts, sizeof(float), mesh->nverts * 3, file);
         fwrite(&(mesh->ntris), sizeof(int), 1, file);
-        fwrite(mesh->tris, sizeof(char), mesh->ntris*4, file);
+        fwrite(mesh->tris, sizeof(char), mesh->ntris * 4, file);
         fwrite(&(mesh->nmeshes), sizeof(int), 1, file);
-        fwrite(mesh->meshes, sizeof(int), mesh->nmeshes*4, file);
+        fwrite(mesh->meshes, sizeof(int), mesh->nmeshes * 4, file);
     }
 
-    void IntermediateValues::generateObjFile(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData)
+    void IntermediateValues::generateObjFile(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData)
     {
         char objFileName[255];
         sprintf(objFileName, "meshes/map%03u%02u%02u.obj", mapID, tileY, tileX);
@@ -227,10 +227,10 @@ namespace MMAP
         int triCount = allTris.size() / 3;
 
         for (int i = 0; i < allVerts.size() / 3; i++)
-            fprintf(objFile, "v %f %f %f\n", verts[i*3], verts[i*3 + 1], verts[i*3 + 2]);
+            fprintf(objFile, "v %f %f %f\n", verts[i * 3], verts[i * 3 + 1], verts[i * 3 + 2]);
 
         for (int i = 0; i < allTris.size() / 3; i++)
-            fprintf(objFile, "f %i %i %i\n", tris[i*3] + 1, tris[i*3 + 1] + 1, tris[i*3 + 2] + 1);
+            fprintf(objFile, "f %i %i %i\n", tris[i * 3] + 1, tris[i * 3 + 1] + 1, tris[i * 3 + 2] + 1);
 
         fclose(objFile);
 
@@ -265,11 +265,11 @@ namespace MMAP
         }
 
         fwrite(&vertCount, sizeof(int), 1, objFile);
-        fwrite(verts, sizeof(float), vertCount*3, objFile);
+        fwrite(verts, sizeof(float), vertCount * 3, objFile);
         fflush(objFile);
 
         fwrite(&triCount, sizeof(int), 1, objFile);
-        fwrite(tris, sizeof(int), triCount*3, objFile);
+        fwrite(tris, sizeof(int), triCount * 3, objFile);
         fflush(objFile);
 
         fclose(objFile);
diff --git a/contrib/mmap/src/IntermediateValues.h b/contrib/mmap/src/IntermediateValues.h
index 33c06312ec6..9c9cff8d53f 100644
--- a/contrib/mmap/src/IntermediateValues.h
+++ b/contrib/mmap/src/IntermediateValues.h
@@ -37,7 +37,7 @@ namespace MMAP
         rcPolyMeshDetail* polyMeshDetail;
 
         IntermediateValues() :  compactHeightfield(NULL), heightfield(NULL),
-                                contours(NULL), polyMesh(NULL), polyMeshDetail(NULL) {}
+            contours(NULL), polyMesh(NULL), polyMeshDetail(NULL) {}
         ~IntermediateValues();
 
         void writeIV(uint32 mapID, uint32 tileX, uint32 tileY);
@@ -48,7 +48,7 @@ namespace MMAP
         void debugWrite(FILE* file, const rcPolyMesh* mesh);
         void debugWrite(FILE* file, const rcPolyMeshDetail* mesh);
 
-        void generateObjFile(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData);
+        void generateObjFile(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData);
     };
 }
 #endif
diff --git a/contrib/mmap/src/MMapCommon.h b/contrib/mmap/src/MMapCommon.h
index 17a543f4aed..6690a763f6a 100644
--- a/contrib/mmap/src/MMapCommon.h
+++ b/contrib/mmap/src/MMapCommon.h
@@ -30,8 +30,8 @@
 #include "Platform/Define.h"
 
 #ifndef WIN32
-    #include <stddef.h>
-    #include <dirent.h>
+#include <stddef.h>
+#include <dirent.h>
 #endif
 
 using namespace std;
@@ -40,27 +40,27 @@ namespace MMAP
 {
     inline bool matchWildcardFilter(const char* filter, const char* str)
     {
-        if(!filter || !str)
+        if (!filter || !str)
             return false;
 
         // end on null character
-        while(*filter && *str)
+        while (*filter && *str)
         {
-            if(*filter == '*')
+            if (*filter == '*')
             {
-                if(*++filter == '\0')   // wildcard at end of filter means all remaing chars match
+                if (*++filter == '\0')  // wildcard at end of filter means all remaing chars match
                     return true;
 
-                while(true)
+                while (true)
                 {
-                    if(*filter == *str)
+                    if (*filter == *str)
                         break;
-                    if(*str == '\0')
+                    if (*str == '\0')
                         return false;   // reached end of string without matching next filter character
                     str++;
                 }
             }
-            else if(*filter != *str)
+            else if (*filter != *str)
                 return false;           // mismatch
 
             filter++;
@@ -76,9 +76,9 @@ namespace MMAP
         LISTFILE_OK = 1
     };
 
-    inline ListFilesResult getDirContents(vector<string> &fileList, string dirpath = ".", string filter = "*", bool includeSubDirs = false)
+    inline ListFilesResult getDirContents(vector<string>& fileList, string dirpath = ".", string filter = "*", bool includeSubDirs = false)
     {
-    #ifdef WIN32
+#ifdef WIN32
         HANDLE hFind;
         WIN32_FIND_DATA findFileInfo;
         string directory;
@@ -87,40 +87,40 @@ namespace MMAP
 
         hFind = FindFirstFile(directory.c_str(), &findFileInfo);
 
-        if(hFind == INVALID_HANDLE_VALUE)
+        if (hFind == INVALID_HANDLE_VALUE)
             return LISTFILE_DIRECTORY_NOT_FOUND;
 
         do
         {
-            if(includeSubDirs || (findFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+            if (includeSubDirs || (findFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
                 fileList.push_back(string(findFileInfo.cFileName));
         }
         while (FindNextFile(hFind, &findFileInfo));
 
         FindClose(hFind);
 
-    #else
-        const char *p = dirpath.c_str();
-        DIR * dirp = opendir(p);
-        struct dirent * dp;
+#else
+        const char* p = dirpath.c_str();
+        DIR* dirp = opendir(p);
+        struct dirent* dp;
 
         while (dirp)
         {
             errno = 0;
             if ((dp = readdir(dirp)) != NULL)
             {
-                if(matchWildcardFilter(filter.c_str(), dp->d_name))
+                if (matchWildcardFilter(filter.c_str(), dp->d_name))
                     fileList.push_back(string(dp->d_name));
             }
             else
                 break;
         }
 
-        if(dirp)
+        if (dirp)
             closedir(dirp);
         else
             return LISTFILE_DIRECTORY_NOT_FOUND;
-    #endif
+#endif
 
         return LISTFILE_OK;
     }
diff --git a/contrib/mmap/src/MangosMap.h b/contrib/mmap/src/MangosMap.h
index 598bebcc455..95963de56d6 100644
--- a/contrib/mmap/src/MangosMap.h
+++ b/contrib/mmap/src/MangosMap.h
@@ -47,9 +47,9 @@ namespace MaNGOS
     //    uint16 gridArea;
     //};
 
-    #define MAP_HEIGHT_NO_HEIGHT  0x0001
-    #define MAP_HEIGHT_AS_INT16   0x0002
-    #define MAP_HEIGHT_AS_INT8    0x0004
+#define MAP_HEIGHT_NO_HEIGHT  0x0001
+#define MAP_HEIGHT_AS_INT16   0x0002
+#define MAP_HEIGHT_AS_INT8    0x0004
 
     struct GridMapHeightHeader
     {
@@ -59,8 +59,8 @@ namespace MaNGOS
         float gridMaxHeight;
     };
 
-    #define MAP_LIQUID_NO_TYPE    0x0001
-    #define MAP_LIQUID_NO_HEIGHT  0x0002
+#define MAP_LIQUID_NO_TYPE    0x0001
+#define MAP_LIQUID_NO_HEIGHT  0x0002
 
     struct GridMapLiquidHeader
     {
@@ -83,16 +83,16 @@ namespace MaNGOS
     //    LIQUID_MAP_UNDER_WATER  = 0x00000008
     //};
 
-    #define MAP_LIQUID_TYPE_NO_WATER    0x00
-    #define MAP_LIQUID_TYPE_WATER       0x01
-    #define MAP_LIQUID_TYPE_OCEAN       0x02
-    #define MAP_LIQUID_TYPE_MAGMA       0x04
-    #define MAP_LIQUID_TYPE_SLIME       0x08
+#define MAP_LIQUID_TYPE_NO_WATER    0x00
+#define MAP_LIQUID_TYPE_WATER       0x01
+#define MAP_LIQUID_TYPE_OCEAN       0x02
+#define MAP_LIQUID_TYPE_MAGMA       0x04
+#define MAP_LIQUID_TYPE_SLIME       0x08
 
-    #define MAP_ALL_LIQUIDS   (MAP_LIQUID_TYPE_WATER | MAP_LIQUID_TYPE_OCEAN | MAP_LIQUID_TYPE_MAGMA | MAP_LIQUID_TYPE_SLIME)
+#define MAP_ALL_LIQUIDS   (MAP_LIQUID_TYPE_WATER | MAP_LIQUID_TYPE_OCEAN | MAP_LIQUID_TYPE_MAGMA | MAP_LIQUID_TYPE_SLIME)
 
-    #define MAP_LIQUID_TYPE_DARK_WATER  0x10
-    #define MAP_LIQUID_TYPE_WMO_WATER   0x20
+#define MAP_LIQUID_TYPE_DARK_WATER  0x10
+#define MAP_LIQUID_TYPE_WMO_WATER   0x20
 
     //struct GridMapLiquidData
     //{
diff --git a/contrib/mmap/src/MapBuilder.cpp b/contrib/mmap/src/MapBuilder.cpp
index 3b26604266a..1ebb796eaa8 100644
--- a/contrib/mmap/src/MapBuilder.cpp
+++ b/contrib/mmap/src/MapBuilder.cpp
@@ -32,15 +32,15 @@ namespace MMAP
     MapBuilder::MapBuilder(float maxWalkableAngle, bool skipLiquid,
                            bool skipContinents, bool skipJunkMaps, bool skipBattlegrounds,
                            bool debugOutput, bool bigBaseUnit, const char* offMeshFilePath) :
-                           m_terrainBuilder(NULL),
-                           m_debugOutput        (debugOutput),
-                           m_skipContinents     (skipContinents),
-                           m_skipJunkMaps       (skipJunkMaps),
-                           m_skipBattlegrounds  (skipBattlegrounds),
-                           m_maxWalkableAngle   (maxWalkableAngle),
-                           m_bigBaseUnit        (bigBaseUnit),
-                           m_rcContext          (NULL),
-                           m_offMeshFilePath    (offMeshFilePath)
+        m_terrainBuilder(NULL),
+        m_debugOutput(debugOutput),
+        m_skipContinents(skipContinents),
+        m_skipJunkMaps(skipJunkMaps),
+        m_skipBattlegrounds(skipBattlegrounds),
+        m_maxWalkableAngle(maxWalkableAngle),
+        m_bigBaseUnit(bigBaseUnit),
+        m_rcContext(NULL),
+        m_offMeshFilePath(offMeshFilePath)
     {
         m_terrainBuilder = new TerrainBuilder(skipLiquid);
 
@@ -55,7 +55,7 @@ namespace MMAP
         for (TileList::iterator it = m_tiles.begin(); it != m_tiles.end(); ++it)
         {
             (*it).second->clear();
-            delete (*it).second;
+            delete(*it).second;
         }
 
         delete m_terrainBuilder;
@@ -73,10 +73,10 @@ namespace MMAP
         getDirContents(files, "maps");
         for (uint32 i = 0; i < files.size(); ++i)
         {
-            mapID = uint32(atoi(files[i].substr(0,3).c_str()));
+            mapID = uint32(atoi(files[i].substr(0, 3).c_str()));
             if (m_tiles.find(mapID) == m_tiles.end())
             {
-                m_tiles.insert(pair<uint32,set<uint32>*>(mapID, new set<uint32>));
+                m_tiles.insert(pair<uint32, set<uint32>*>(mapID, new set<uint32>));
                 count++;
             }
         }
@@ -85,8 +85,8 @@ namespace MMAP
         getDirContents(files, "vmaps", "*.vmtree");
         for (uint32 i = 0; i < files.size(); ++i)
         {
-            mapID = uint32(atoi(files[i].substr(0,3).c_str()));
-            m_tiles.insert(pair<uint32,set<uint32>*>(mapID, new set<uint32>));
+            mapID = uint32(atoi(files[i].substr(0, 3).c_str()));
+            m_tiles.insert(pair<uint32, set<uint32>*>(mapID, new set<uint32>));
             count++;
         }
         printf("found %u.\n", count);
@@ -103,8 +103,8 @@ namespace MMAP
             getDirContents(files, "vmaps", filter);
             for (uint32 i = 0; i < files.size(); ++i)
             {
-                tileX = uint32(atoi(files[i].substr(7,2).c_str()));
-                tileY = uint32(atoi(files[i].substr(4,2).c_str()));
+                tileX = uint32(atoi(files[i].substr(7, 2).c_str()));
+                tileY = uint32(atoi(files[i].substr(4, 2).c_str()));
                 tileID = StaticMapTree::packTileID(tileY, tileX);
 
                 tiles->insert(tileID);
@@ -116,8 +116,8 @@ namespace MMAP
             getDirContents(files, "maps", filter);
             for (uint32 i = 0; i < files.size(); ++i)
             {
-                tileY = uint32(atoi(files[i].substr(3,2).c_str()));
-                tileX = uint32(atoi(files[i].substr(5,2).c_str()));
+                tileY = uint32(atoi(files[i].substr(3, 2).c_str()));
+                tileX = uint32(atoi(files[i].substr(5, 2).c_str()));
                 tileID = StaticMapTree::packTileID(tileX, tileY);
 
                 if (tiles->insert(tileID).second)
@@ -151,7 +151,7 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    void MapBuilder::getGridBounds(uint32 mapID, uint32 &minX, uint32 &minY, uint32 &maxX, uint32 &maxY)
+    void MapBuilder::getGridBounds(uint32 mapID, uint32& minX, uint32& minY, uint32& maxX, uint32& maxY)
     {
         maxX = INT_MAX;
         maxY = INT_MAX;
@@ -163,7 +163,7 @@ namespace MMAP
 
         // make sure we process maps which don't have tiles
         // initialize the static tree, which loads WDT models
-        if(!m_terrainBuilder->loadVMap(mapID, 64, 64, meshData))
+        if (!m_terrainBuilder->loadVMap(mapID, 64, 64, meshData))
             return;
 
         // get the coord bounds of the model data
@@ -197,7 +197,7 @@ namespace MMAP
         buildNavMesh(mapID, navMesh);
         if (!navMesh)
         {
-            printf("Failed creating navmesh!              \n");
+            printf("[Map %03i] Failed creating navmesh!\n", mapID);
             return;
         }
 
@@ -233,12 +233,12 @@ namespace MMAP
         buildNavMesh(mapID, navMesh);
         if (!navMesh)
         {
-            printf("Failed creating navmesh!              \n");
+            printf("[Map %03i] Failed creating navmesh!\n", mapID);
             return;
         }
 
         // now start building mmtiles for each tile
-        printf("We have %u tiles.                          \n", (unsigned int)tiles->size());
+        printf("[Map %03i] We have %u tiles.                          \n", mapID, (unsigned int)tiles->size());
         for (set<uint32>::iterator it = tiles->begin(); it != tiles->end(); ++it)
         {
             uint32 tileX, tileY;
@@ -254,13 +254,13 @@ namespace MMAP
 
         dtFreeNavMesh(navMesh);
 
-        printf("Complete!                               \n\n");
+        printf("[Map %03i] Complete!                               \n\n", mapID);
     }
 
     /**************************************************************************/
     void MapBuilder::buildTile(uint32 mapID, uint32 tileX, uint32 tileY, dtNavMesh* navMesh)
     {
-        printf("Building map %03u, tile [%02u,%02u]\n", mapID, tileX, tileY);
+        printf("[Map %03i] Building tile [%02u,%02u]\n", mapID, tileX, tileY);
 
         MeshData meshData;
 
@@ -297,7 +297,7 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    void MapBuilder::buildNavMesh(uint32 mapID, dtNavMesh* &navMesh)
+    void MapBuilder::buildNavMesh(uint32 mapID, dtNavMesh*& navMesh)
     {
         set<uint32>* tiles = getTileList(mapID);
 
@@ -347,10 +347,10 @@ namespace MMAP
         navMeshParams.maxPolys = maxPolysPerTile;
 
         navMesh = dtAllocNavMesh();
-        printf("Creating navMesh...                     \r");
+        printf("[Map %03i] Creating navMesh...                     \r", mapID);
         if (!navMesh->init(&navMeshParams))
         {
-            printf("Failed creating navmesh!                \n");
+            printf("[Map %03i] Failed creating navmesh!                \n", mapID);
             return;
         }
 
@@ -362,7 +362,7 @@ namespace MMAP
         {
             dtFreeNavMesh(navMesh);
             char message[1024];
-            sprintf(message, "Failed to open %s for writing!\n", fileName);
+            sprintf(message, "[Map %03i] Failed to open %s for writing!\n", mapID, fileName);
             perror(message);
             return;
         }
@@ -374,7 +374,7 @@ namespace MMAP
 
     /**************************************************************************/
     void MapBuilder::buildMoveMapTile(uint32 mapID, uint32 tileX, uint32 tileY,
-                                      MeshData &meshData, float bmin[3], float bmax[3],
+                                      MeshData& meshData, float bmin[3], float bmax[3],
                                       dtNavMesh* navMesh)
     {
         // console output
@@ -401,9 +401,9 @@ namespace MMAP
         const static float BASE_UNIT_DIM = m_bigBaseUnit ? 0.533333f : 0.266666f;
 
         // All are in UNIT metrics!
-        const static int VERTEX_PER_MAP = int(GRID_SIZE/BASE_UNIT_DIM + 0.5f);
+        const static int VERTEX_PER_MAP = int(GRID_SIZE / BASE_UNIT_DIM + 0.5f);
         const static int VERTEX_PER_TILE = m_bigBaseUnit ? 40 : 80; // must divide VERTEX_PER_MAP
-        const static int TILES_PER_MAP = VERTEX_PER_MAP/VERTEX_PER_TILE;
+        const static int TILES_PER_MAP = VERTEX_PER_MAP / VERTEX_PER_TILE;
 
         rcConfig config;
         memset(&config, 0, sizeof(rcConfig));
@@ -420,10 +420,10 @@ namespace MMAP
         config.borderSize = config.walkableRadius + 3;
         config.maxEdgeLen = VERTEX_PER_TILE + 1;        //anything bigger than tileSize
         config.walkableHeight = m_bigBaseUnit ? 3 : 6;
-        config.walkableClimb = m_bigBaseUnit ? 2 : 4;   // keep less than walkableHeight
+        config.walkableClimb = m_bigBaseUnit ? 1 : 2;   // keep less than walkableHeight
         config.minRegionArea = rcSqr(60);
         config.mergeRegionArea = rcSqr(50);
-        config.maxSimplificationError = 2.0f;       // eliminates most jagged edges (tinny polygons)
+        config.maxSimplificationError = 1.8f;       // eliminates most jagged edges (tinny polygons)
         config.detailSampleDist = config.cs * 64;
         config.detailSampleMaxError = config.ch * 2;
 
@@ -436,21 +436,21 @@ namespace MMAP
         // Initialize per tile config.
         rcConfig tileCfg;
         memcpy(&tileCfg, &config, sizeof(rcConfig));
-        tileCfg.width = config.tileSize + config.borderSize*2;
-        tileCfg.height = config.tileSize + config.borderSize*2;
+        tileCfg.width = config.tileSize + config.borderSize * 2;
+        tileCfg.height = config.tileSize + config.borderSize * 2;
 
         // build all tiles
         for (int y = 0; y < TILES_PER_MAP; ++y)
         {
             for (int x = 0; x < TILES_PER_MAP; ++x)
             {
-                Tile& tile = tiles[x + y*TILES_PER_MAP];
+                Tile& tile = tiles[x + y * TILES_PER_MAP];
 
                 // Calculate the per tile bounding box.
-                tileCfg.bmin[0] = config.bmin[0] + (x*config.tileSize - config.borderSize)*config.cs;
-                tileCfg.bmin[2] = config.bmin[2] + (y*config.tileSize - config.borderSize)*config.cs;
-                tileCfg.bmax[0] = config.bmin[0] + ((x+1)*config.tileSize + config.borderSize)*config.cs;
-                tileCfg.bmax[2] = config.bmin[2] + ((y+1)*config.tileSize + config.borderSize)*config.cs;
+                tileCfg.bmin[0] = config.bmin[0] + (x * config.tileSize - config.borderSize) * config.cs;
+                tileCfg.bmin[2] = config.bmin[2] + (y * config.tileSize - config.borderSize) * config.cs;
+                tileCfg.bmax[0] = config.bmin[0] + ((x + 1) * config.tileSize + config.borderSize) * config.cs;
+                tileCfg.bmax[2] = config.bmin[2] + ((y + 1) * config.tileSize + config.borderSize) * config.cs;
 
                 float tbmin[2], tbmax[2];
                 tbmin[0] = tileCfg.bmin[0];
@@ -468,7 +468,7 @@ namespace MMAP
 
                 // mark all walkable tiles, both liquids and solids
                 unsigned char* triFlags = new unsigned char[tTriCount];
-                memset(triFlags, NAV_GROUND, tTriCount*sizeof(unsigned char));
+                memset(triFlags, NAV_GROUND, tTriCount * sizeof(unsigned char));
                 rcClearUnwalkableTriangles(m_rcContext, tileCfg.walkableSlopeAngle, tVerts, tVertCount, tTris, tTriCount, triFlags);
                 rcRasterizeTriangles(m_rcContext, tVerts, tVertCount, tTris, triFlags, tTriCount, *tile.solid, config.walkableClimb);
                 delete [] triFlags;
@@ -560,7 +560,7 @@ namespace MMAP
         {
             for (int x = 0; x < TILES_PER_MAP; ++x)
             {
-                Tile& tile = tiles[x + y*TILES_PER_MAP];
+                Tile& tile = tiles[x + y * TILES_PER_MAP];
                 if (tile.pmesh)
                 {
                     pmmerge[nmerge] = tile.pmesh;
@@ -592,14 +592,6 @@ namespace MMAP
 
         delete [] tiles;
 
-        // remove padding for extraction
-        for (int i = 0; i < iv.polyMesh->nverts; ++i)
-        {
-            unsigned short* v = &iv.polyMesh->verts[i*3];
-            v[0] -= (unsigned short)config.borderSize;
-            v[2] -= (unsigned short)config.borderSize;
-        }
-
         // set polygons as walkable
         // TODO: special flags for DYNAMIC polygons, ie surfaces that can be turned on and off
         for (int i = 0; i < iv.polyMesh->npolys; ++i)
@@ -623,22 +615,26 @@ namespace MMAP
         params.detailTriCount = iv.polyMeshDetail->ntris;
 
         params.offMeshConVerts = meshData.offMeshConnections.getCArray();
-        params.offMeshConCount = meshData.offMeshConnections.size()/6;
+        params.offMeshConCount = meshData.offMeshConnections.size() / 6;
         params.offMeshConRad = meshData.offMeshConnectionRads.getCArray();
         params.offMeshConDir = meshData.offMeshConnectionDirs.getCArray();
         params.offMeshConAreas = meshData.offMeshConnectionsAreas.getCArray();
         params.offMeshConFlags = meshData.offMeshConnectionsFlags.getCArray();
 
-        params.walkableHeight = BASE_UNIT_DIM*config.walkableHeight;    // agent height
-        params.walkableRadius = BASE_UNIT_DIM*config.walkableRadius;    // agent radius
-        params.walkableClimb = BASE_UNIT_DIM*config.walkableClimb;      // keep less that walkableHeight (aka agent height)!
+        params.walkableHeight = BASE_UNIT_DIM * config.walkableHeight;  // agent height
+        params.walkableRadius = BASE_UNIT_DIM * config.walkableRadius;  // agent radius
+        params.walkableClimb = BASE_UNIT_DIM * config.walkableClimb;    // keep less that walkableHeight (aka agent height)!
         params.tileX = (((bmin[0] + bmax[0]) / 2) - navMesh->getParams()->orig[0]) / GRID_SIZE;
         params.tileY = (((bmin[2] + bmax[2]) / 2) - navMesh->getParams()->orig[2]) / GRID_SIZE;
         rcVcopy(params.bmin, bmin);
         rcVcopy(params.bmax, bmax);
         params.cs = config.cs;
         params.ch = config.ch;
-        params.tileSize = VERTEX_PER_MAP;
+
+        // no use of layer
+        params.tileLayer = 0;
+        // not sure we still need buildBvTree
+        params.buildBvTree = true;
 
         // will hold final navmesh
         unsigned char* navData = NULL;
@@ -668,7 +664,7 @@ namespace MMAP
                 continue;
             }
             if (!params.polyCount || !params.polys ||
-                    TILES_PER_MAP*TILES_PER_MAP == params.polyCount)
+                    TILES_PER_MAP * TILES_PER_MAP == params.polyCount)
             {
                 // we have flat tiles with no actual geometry - don't build those, its useless
                 // keep in mind that we do output those into debug info
@@ -694,7 +690,7 @@ namespace MMAP
             // DT_TILE_FREE_DATA tells detour to unallocate memory when the tile
             // is removed via removeTile()
             dtStatus dtResult = navMesh->addTile(navData, navDataSize, DT_TILE_FREE_DATA, 0, &tileRef);
-            if (!tileRef || dtResult != DT_SUCCESS)
+            if (!tileRef || dtStatusFailed(dtResult))
             {
                 printf("%s Failed adding tile to navmesh!           \n", tileString);
                 continue;
@@ -732,14 +728,6 @@ namespace MMAP
 
         if (m_debugOutput)
         {
-            // restore padding so that the debug visualization is correct
-            for (int i = 0; i < iv.polyMesh->nverts; ++i)
-            {
-                unsigned short* v = &iv.polyMesh->verts[i*3];
-                v[0] += (unsigned short)config.borderSize;
-                v[2] += (unsigned short)config.borderSize;
-            }
-
             iv.generateObjFile(mapID, tileX, tileY, meshData);
             iv.writeIV(mapID, tileX, tileY);
         }
diff --git a/contrib/mmap/src/MapBuilder.h b/contrib/mmap/src/MapBuilder.h
index 542fed7d86a..709eb14325d 100644
--- a/contrib/mmap/src/MapBuilder.h
+++ b/contrib/mmap/src/MapBuilder.h
@@ -38,7 +38,7 @@ using namespace VMAP;
 
 namespace MMAP
 {
-    typedef map<uint32,set<uint32>*> TileList;
+    typedef map<uint32, set<uint32>*> TileList;
     struct Tile
     {
         Tile() : chf(NULL), solid(NULL), cset(NULL), pmesh(NULL), dmesh(NULL) {}
@@ -60,7 +60,7 @@ namespace MMAP
     class MapBuilder
     {
         public:
-            MapBuilder(float maxWalkableAngle   = 60.f,
+            MapBuilder(float maxWalkableAngle   = 55.0f,
                        bool skipLiquid          = false,
                        bool skipContinents      = false,
                        bool skipJunkMaps        = true,
@@ -85,7 +85,7 @@ namespace MMAP
             void discoverTiles();
             set<uint32>* getTileList(uint32 mapID);
 
-            void buildNavMesh(uint32 mapID, dtNavMesh* &navMesh);
+            void buildNavMesh(uint32 mapID, dtNavMesh*& navMesh);
 
             void buildTile(uint32 mapID, uint32 tileX, uint32 tileY, dtNavMesh* navMesh);
 
@@ -93,7 +93,7 @@ namespace MMAP
             void buildMoveMapTile(uint32 mapID,
                                   uint32 tileX,
                                   uint32 tileY,
-                                  MeshData &meshData,
+                                  MeshData& meshData,
                                   float bmin[3],
                                   float bmax[3],
                                   dtNavMesh* navMesh);
@@ -101,7 +101,7 @@ namespace MMAP
             void getTileBounds(uint32 tileX, uint32 tileY,
                                float* verts, int vertCount,
                                float* bmin, float* bmax);
-            void getGridBounds(uint32 mapID, uint32 &minX, uint32 &minY, uint32 &maxX, uint32 &maxY);
+            void getGridBounds(uint32 mapID, uint32& minX, uint32& minY, uint32& maxX, uint32& maxY);
 
             bool shouldSkipMap(uint32 mapID);
             bool isTransportMap(uint32 mapID);
diff --git a/contrib/mmap/src/TerrainBuilder.cpp b/contrib/mmap/src/TerrainBuilder.cpp
index 82d21c4aa83..76bef232d80 100644
--- a/contrib/mmap/src/TerrainBuilder.cpp
+++ b/contrib/mmap/src/TerrainBuilder.cpp
@@ -28,11 +28,11 @@
 
 namespace MMAP
 {
-    TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid (skipLiquid){ }
+    TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid(skipLiquid) { }
     TerrainBuilder::~TerrainBuilder() { }
 
     /**************************************************************************/
-    void TerrainBuilder::getLoopVars(Spot portion, int &loopStart, int &loopEnd, int &loopInc)
+    void TerrainBuilder::getLoopVars(Spot portion, int& loopStart, int& loopEnd, int& loopInc)
     {
         switch (portion)
         {
@@ -65,19 +65,19 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    void TerrainBuilder::loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData)
+    void TerrainBuilder::loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData)
     {
         if (loadMap(mapID, tileX, tileY, meshData, ENTIRE))
         {
-            loadMap(mapID, tileX+1, tileY, meshData, LEFT);
-            loadMap(mapID, tileX-1, tileY, meshData, RIGHT);
-            loadMap(mapID, tileX, tileY+1, meshData, TOP);
-            loadMap(mapID, tileX, tileY-1, meshData, BOTTOM);
+            loadMap(mapID, tileX + 1, tileY, meshData, LEFT);
+            loadMap(mapID, tileX - 1, tileY, meshData, RIGHT);
+            loadMap(mapID, tileX, tileY + 1, meshData, TOP);
+            loadMap(mapID, tileX, tileY - 1, meshData, BOTTOM);
         }
     }
 
     /**************************************************************************/
-    bool TerrainBuilder::loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData, Spot portion)
+    bool TerrainBuilder::loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, Spot portion)
     {
         char mapFileName[255];
         sprintf(mapFileName, "maps/%03u%02u%02u.map", mapID, tileY, tileX);
@@ -134,10 +134,10 @@ namespace MMAP
                 heightMultiplier = (hheader.gridMaxHeight - hheader.gridHeight) / 255;
 
                 for (i = 0; i < V9_SIZE_SQ; ++i)
-                    V9[i] = (float)v9[i]*heightMultiplier + hheader.gridHeight;
+                    V9[i] = (float)v9[i] * heightMultiplier + hheader.gridHeight;
 
                 for (i = 0; i < V8_SIZE_SQ; ++i)
-                    V8[i] = (float)v8[i]*heightMultiplier + hheader.gridHeight;
+                    V8[i] = (float)v8[i] * heightMultiplier + hheader.gridHeight;
             }
             else if (hheader.flags & MAP_HEIGHT_AS_INT16)
             {
@@ -148,14 +148,14 @@ namespace MMAP
                 heightMultiplier = (hheader.gridMaxHeight - hheader.gridHeight) / 65535;
 
                 for (i = 0; i < V9_SIZE_SQ; ++i)
-                    V9[i] = (float)v9[i]*heightMultiplier + hheader.gridHeight;
+                    V9[i] = (float)v9[i] * heightMultiplier + hheader.gridHeight;
 
                 for (i = 0; i < V8_SIZE_SQ; ++i)
-                    V8[i] = (float)v8[i]*heightMultiplier + hheader.gridHeight;
+                    V8[i] = (float)v8[i] * heightMultiplier + hheader.gridHeight;
             }
             else
             {
-                fread (V9, sizeof(float), V9_SIZE_SQ, mapFile);
+                fread(V9, sizeof(float), V9_SIZE_SQ, mapFile);
                 fread(V8, sizeof(float), V8_SIZE_SQ, mapFile);
             }
 
@@ -165,8 +165,8 @@ namespace MMAP
             fread(holes, fheader.holesSize, 1, mapFile);
 
             int count = meshData.solidVerts.size() / 3;
-            float xoffset = (float(tileX)-32)*GRID_SIZE;
-            float yoffset = (float(tileY)-32)*GRID_SIZE;
+            float xoffset = (float(tileX) - 32) * GRID_SIZE;
+            float yoffset = (float(tileY) - 32) * GRID_SIZE;
 
             float coord[3];
 
@@ -188,8 +188,8 @@ namespace MMAP
 
             int j, indices[3], loopStart, loopEnd, loopInc;
             getLoopVars(portion, loopStart, loopEnd, loopInc);
-            for (i = loopStart; i < loopEnd; i+=loopInc)
-                for (j = TOP; j <= BOTTOM; j+=1)
+            for (i = loopStart; i < loopEnd; i += loopInc)
+                for (j = TOP; j <= BOTTOM; j += 1)
                 {
                     getHeightTriangle(i, Spot(j), indices);
                     ttriangles.append(indices[2] + count);
@@ -212,15 +212,15 @@ namespace MMAP
 
             if (!(lheader.flags & MAP_LIQUID_NO_HEIGHT))
             {
-                liquid_map = new float [lheader.width*lheader.height];
-                fread(liquid_map, sizeof(float), lheader.width*lheader.height, mapFile);
+                liquid_map = new float [lheader.width * lheader.height];
+                fread(liquid_map, sizeof(float), lheader.width * lheader.height, mapFile);
             }
 
             if (liquid_type && liquid_map)
             {
                 int count = meshData.liquidVerts.size() / 3;
-                float xoffset = (float(tileX)-32)*GRID_SIZE;
-                float yoffset = (float(tileY)-32)*GRID_SIZE;
+                float xoffset = (float(tileX) - 32) * GRID_SIZE;
+                float yoffset = (float(tileY) - 32) * GRID_SIZE;
 
                 float coord[3];
                 int row, col;
@@ -235,10 +235,10 @@ namespace MMAP
                         col = i % V9_SIZE;
 
                         if (row < lheader.offsetY || row >= lheader.offsetY + lheader.height ||
-                            col < lheader.offsetX || col >= lheader.offsetX + lheader.width)
+                                col < lheader.offsetX || col >= lheader.offsetX + lheader.width)
                         {
                             // dummy vert using invalid height
-                            meshData.liquidVerts.append((xoffset+col*GRID_PART_SIZE)*-1, INVALID_MAP_LIQ_HEIGHT, (yoffset+row*GRID_PART_SIZE)*-1);
+                            meshData.liquidVerts.append((xoffset + col * GRID_PART_SIZE) * -1, INVALID_MAP_LIQ_HEIGHT, (yoffset + row * GRID_PART_SIZE) * -1);
                             continue;
                         }
 
@@ -255,7 +255,7 @@ namespace MMAP
                     {
                         row = i / V9_SIZE;
                         col = i % V9_SIZE;
-                        meshData.liquidVerts.append((xoffset+col*GRID_PART_SIZE)*-1, lheader.liquidLevel, (yoffset+row*GRID_PART_SIZE)*-1);
+                        meshData.liquidVerts.append((xoffset + col * GRID_PART_SIZE) * -1, lheader.liquidLevel, (yoffset + row * GRID_PART_SIZE) * -1);
                     }
                 }
 
@@ -263,11 +263,11 @@ namespace MMAP
 
                 int indices[3], loopStart, loopEnd, loopInc, triInc;
                 getLoopVars(portion, loopStart, loopEnd, loopInc);
-                triInc = BOTTOM-TOP;
+                triInc = BOTTOM - TOP;
 
                 // generate triangles
-                for (int i = loopStart; i < loopEnd; i+=loopInc)
-                    for (int j = TOP; j <= BOTTOM; j+= triInc)
+                for (int i = loopStart; i < loopEnd; i += loopInc)
+                    for (int j = TOP; j <= BOTTOM; j += triInc)
                     {
                         getHeightTriangle(i, Spot(j), indices, true);
                         ltriangles.append(indices[2] + count);
@@ -296,14 +296,14 @@ namespace MMAP
         // make a copy of liquid vertices
         // used to pad right-bottom frame due to lost vertex data at extraction
         float* lverts_copy = NULL;
-        if(meshData.liquidVerts.size())
+        if (meshData.liquidVerts.size())
         {
             lverts_copy = new float[meshData.liquidVerts.size()];
             memcpy(lverts_copy, lverts, sizeof(float)*meshData.liquidVerts.size());
         }
 
         getLoopVars(portion, loopStart, loopEnd, loopInc);
-        for (int i = loopStart; i < loopEnd; i+=loopInc)
+        for (int i = loopStart; i < loopEnd; i += loopInc)
         {
             for (int j = 0; j < 2; ++j)
             {
@@ -314,7 +314,7 @@ namespace MMAP
 
                 // if there is no liquid, don't use liquid
                 if (!liquid_type || !meshData.liquidVerts.size() || !ltriangles.size())
-                     useLiquid = false;
+                    useLiquid = false;
                 else
                 {
                     liquidType = getLiquidType(i, liquid_type);
@@ -352,10 +352,10 @@ namespace MMAP
                 {
                     float quadHeight = 0;
                     uint32 validCount = 0;
-                    for(uint32 idx = 0; idx < 3; idx++)
+                    for (uint32 idx = 0; idx < 3; idx++)
                     {
-                        float h = lverts_copy[ltris[idx]*3 + 1];
-                        if(h != INVALID_MAP_LIQ_HEIGHT && h < INVALID_MAP_LIQ_HEIGHT_MAX)
+                        float h = lverts_copy[ltris[idx] * 3 + 1];
+                        if (h != INVALID_MAP_LIQ_HEIGHT && h < INVALID_MAP_LIQ_HEIGHT_MAX)
                         {
                             quadHeight += h;
                             validCount++;
@@ -363,19 +363,19 @@ namespace MMAP
                     }
 
                     // update vertex height data
-                    if(validCount > 0 && validCount < 3)
+                    if (validCount > 0 && validCount < 3)
                     {
                         quadHeight /= validCount;
-                        for(uint32 idx = 0; idx < 3; idx++)
+                        for (uint32 idx = 0; idx < 3; idx++)
                         {
-                            float h = lverts[ltris[idx]*3 + 1];
-                            if(h == INVALID_MAP_LIQ_HEIGHT || h > INVALID_MAP_LIQ_HEIGHT_MAX)
-                                lverts[ltris[idx]*3 + 1] = quadHeight;
+                            float h = lverts[ltris[idx] * 3 + 1];
+                            if (h == INVALID_MAP_LIQ_HEIGHT || h > INVALID_MAP_LIQ_HEIGHT_MAX)
+                                lverts[ltris[idx] * 3 + 1] = quadHeight;
                         }
                     }
 
                     // no valid vertexes - don't use this poly at all
-                    if(validCount == 0)
+                    if (validCount == 0)
                         useLiquid = false;
                 }
 
@@ -388,34 +388,34 @@ namespace MMAP
                 {
                     float minLLevel = INVALID_MAP_LIQ_HEIGHT_MAX;
                     float maxLLevel = INVALID_MAP_LIQ_HEIGHT;
-                    for(uint32 x = 0; x < 3; x++)
+                    for (uint32 x = 0; x < 3; x++)
                     {
-                        float h = lverts[ltris[x]*3 + 1];
-                        if(minLLevel > h)
+                        float h = lverts[ltris[x] * 3 + 1];
+                        if (minLLevel > h)
                             minLLevel = h;
 
-                        if(maxLLevel < h)
+                        if (maxLLevel < h)
                             maxLLevel = h;
                     }
 
                     float maxTLevel = INVALID_MAP_LIQ_HEIGHT;
                     float minTLevel = INVALID_MAP_LIQ_HEIGHT_MAX;
-                    for(uint32 x = 0; x < 6; x++)
+                    for (uint32 x = 0; x < 6; x++)
                     {
-                        float h = tverts[ttris[x]*3 + 1];
-                        if(maxTLevel < h)
-                             maxTLevel = h;
+                        float h = tverts[ttris[x] * 3 + 1];
+                        if (maxTLevel < h)
+                            maxTLevel = h;
 
-                        if(minTLevel > h)
-                             minTLevel = h;
+                        if (minTLevel > h)
+                            minTLevel = h;
                     }
 
                     // terrain under the liquid?
-                    if(minLLevel > maxTLevel)
+                    if (minLLevel > maxTLevel)
                         useTerrain = false;
 
                     //liquid under the terrain?
-                    if(minTLevel > maxLLevel)
+                    if (minTLevel > maxLLevel)
                         useLiquid = false;
                 }
 
@@ -428,16 +428,16 @@ namespace MMAP
                 }
 
                 if (useTerrain)
-                    for (int k = 0; k < 3*tTriCount/2; ++k)
+                    for (int k = 0; k < 3 * tTriCount / 2; ++k)
                         meshData.solidTris.append(ttris[k]);
 
                 // advance to next set of triangles
                 ltris += 3;
-                ttris += 3*tTriCount/2;
+                ttris += 3 * tTriCount / 2;
             }
         }
 
-        if(lverts_copy)
+        if (lverts_copy)
             delete [] lverts_copy;
 
         return meshData.solidTris.size() || meshData.liquidTris.size();
@@ -451,13 +451,13 @@ namespace MMAP
         switch (grid)
         {
             case GRID_V9:
-                coord[0] = (xOffset + index%(V9_SIZE)*GRID_PART_SIZE) * -1.f;
-                coord[1] = (yOffset + (int)(index/(V9_SIZE))*GRID_PART_SIZE) * -1.f;
+                coord[0] = (xOffset + index % (V9_SIZE) * GRID_PART_SIZE) * -1.f;
+                coord[1] = (yOffset + (int)(index / (V9_SIZE)) * GRID_PART_SIZE) * -1.f;
                 coord[2] = v[index];
                 break;
             case GRID_V8:
-                coord[0] = (xOffset + index%(V8_SIZE)*GRID_PART_SIZE + GRID_PART_SIZE/2.f) * -1.f;
-                coord[1] = (yOffset + (int)(index/(V8_SIZE))*GRID_PART_SIZE + GRID_PART_SIZE/2.f) * -1.f;
+                coord[0] = (xOffset + index % (V8_SIZE) * GRID_PART_SIZE + GRID_PART_SIZE / 2.f) * -1.f;
+                coord[1] = (yOffset + (int)(index / (V8_SIZE)) * GRID_PART_SIZE + GRID_PART_SIZE / 2.f) * -1.f;
                 coord[2] = v[index];
                 break;
         }
@@ -466,44 +466,45 @@ namespace MMAP
     /**************************************************************************/
     void TerrainBuilder::getHeightTriangle(int square, Spot triangle, int* indices, bool liquid/* = false*/)
     {
-        int rowOffset = square/V8_SIZE;
+        int rowOffset = square / V8_SIZE;
         if (!liquid)
             switch (triangle)
             {
                 case TOP:
-                    indices[0] = square+rowOffset;                  //           0-----1 .... 128
-                    indices[1] = square+1+rowOffset;                //           |\ T /|
-                    indices[2] = (V9_SIZE_SQ)+square;               //           | \ / |
+                    indices[0] = square + rowOffset;                //           0-----1 .... 128
+                    indices[1] = square + 1 + rowOffset;            //           |\ T /|
+                    indices[2] = (V9_SIZE_SQ) + square;             //           | \ / |
                     break;                                          //           |L 0 R| .. 127
                 case LEFT:                                          //           | / \ |
-                    indices[0] = square+rowOffset;                  //           |/ B \|
-                    indices[1] = (V9_SIZE_SQ)+square;               //          129---130 ... 386
-                    indices[2] = square+V9_SIZE+rowOffset;          //           |\   /|
+                    indices[0] = square + rowOffset;                //           |/ B \|
+                    indices[1] = (V9_SIZE_SQ) + square;             //          129---130 ... 386
+                    indices[2] = square + V9_SIZE + rowOffset;      //           |\   /|
                     break;                                          //           | \ / |
                 case RIGHT:                                         //           | 128 | .. 255
-                    indices[0] = square+1+rowOffset;                //           | / \ |
-                    indices[1] = square+V9_SIZE+1+rowOffset;        //           |/   \|
-                    indices[2] = (V9_SIZE_SQ)+square;               //          258---259 ... 515
+                    indices[0] = square + 1 + rowOffset;            //           | / \ |
+                    indices[1] = square + V9_SIZE + 1 + rowOffset;  //           |/   \|
+                    indices[2] = (V9_SIZE_SQ) + square;             //          258---259 ... 515
                     break;
                 case BOTTOM:
-                    indices[0] = (V9_SIZE_SQ)+square;
-                    indices[1] = square+V9_SIZE+1+rowOffset;
-                    indices[2] = square+V9_SIZE+rowOffset;
+                    indices[0] = (V9_SIZE_SQ) + square;
+                    indices[1] = square + V9_SIZE + 1 + rowOffset;
+                    indices[2] = square + V9_SIZE + rowOffset;
                     break;
                 default: break;
             }
         else
             switch (triangle)
-            {                                                           //           0-----1 .... 128
+            {
+                    //           0-----1 .... 128
                 case TOP:                                               //           |\    |
-                    indices[0] = square+rowOffset;                      //           | \ T |
-                    indices[1] = square+1+rowOffset;                    //           |  \  |
-                    indices[2] = square+V9_SIZE+1+rowOffset;            //           | B \ |
+                    indices[0] = square + rowOffset;                    //           | \ T |
+                    indices[1] = square + 1 + rowOffset;                //           |  \  |
+                    indices[2] = square + V9_SIZE + 1 + rowOffset;      //           | B \ |
                     break;                                              //           |    \|
                 case BOTTOM:                                            //          129---130 ... 386
-                    indices[0] = square+rowOffset;                      //           |\    |
-                    indices[1] = square+V9_SIZE+1+rowOffset;            //           | \   |
-                    indices[2] = square+V9_SIZE+rowOffset;              //           |  \  |
+                    indices[0] = square + rowOffset;                    //           |\    |
+                    indices[1] = square + V9_SIZE + 1 + rowOffset;      //           | \   |
+                    indices[2] = square + V9_SIZE + rowOffset;          //           |  \  |
                     break;                                              //           |   \ |
                 default: break;                                         //           |    \|
             }                                                           //          258---259 ... 515
@@ -515,8 +516,8 @@ namespace MMAP
     {
         // wow coords: x, y, height
         // coord is mirroed about the horizontal axes
-        coord[0] = (xOffset + index%(V9_SIZE)*GRID_PART_SIZE) * -1.f;
-        coord[1] = (yOffset + (int)(index/(V9_SIZE))*GRID_PART_SIZE) * -1.f;
+        coord[0] = (xOffset + index % (V9_SIZE) * GRID_PART_SIZE) * -1.f;
+        coord[1] = (yOffset + (int)(index / (V9_SIZE)) * GRID_PART_SIZE) * -1.f;
         coord[2] = v[index2];
     }
 
@@ -550,7 +551,7 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    bool TerrainBuilder::loadVMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData)
+    bool TerrainBuilder::loadVMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData)
     {
         IVMapManager* vmapManager = new VMapManager2();
         VMAPLoadResult result = vmapManager->loadMap("vmaps", mapID, tileX, tileY);
@@ -594,10 +595,10 @@ namespace MMAP
 
                 // transform data
                 float scale = instance.iScale;
-                G3D::Matrix3 rotation = G3D::Matrix3::fromEulerAnglesXYZ(G3D::pi()*instance.iRot.z/-180.f, G3D::pi()*instance.iRot.x/-180.f, G3D::pi()*instance.iRot.y/-180.f);
+                G3D::Matrix3 rotation = G3D::Matrix3::fromEulerAnglesXYZ(G3D::pi() * instance.iRot.z / -180.f, G3D::pi() * instance.iRot.x / -180.f, G3D::pi() * instance.iRot.y / -180.f);
                 Vector3 position = instance.iPos;
-                position.x -= 32*GRID_SIZE;
-                position.y -= 32*GRID_SIZE;
+                position.x -= 32 * GRID_SIZE;
+                position.y -= 32 * GRID_SIZE;
 
                 for (vector<GroupModel>::iterator it = groupModels.begin(); it != groupModels.end(); ++it)
                 {
@@ -655,7 +656,7 @@ namespace MMAP
                         for (uint32 x = 0; x < vertsX; ++x)
                             for (uint32 y = 0; y < vertsY; ++y)
                             {
-                                vert = Vector3(corner.x + x * GRID_PART_SIZE, corner.y + y * GRID_PART_SIZE, data[y*vertsX + x]);
+                                vert = Vector3(corner.x + x * GRID_PART_SIZE, corner.y + y * GRID_PART_SIZE, data[y * vertsX + x]);
                                 vert = vert * rotation * scale + position;
                                 vert.x *= -1.f;
                                 vert.y *= -1.f;
@@ -666,13 +667,13 @@ namespace MMAP
                         uint32 square;
                         for (uint32 x = 0; x < tilesX; ++x)
                             for (uint32 y = 0; y < tilesY; ++y)
-                                if ((flags[x+y*tilesX] & 0x0f) != 0x0f)
+                                if ((flags[x + y * tilesX] & 0x0f) != 0x0f)
                                 {
                                     square = x * tilesY + y;
-                                    idx1 = square+x;
-                                    idx2 = square+1+x;
-                                    idx3 = square+tilesY+1+1+x;
-                                    idx4 = square+tilesY+1+x;
+                                    idx1 = square + x;
+                                    idx2 = square + 1 + x;
+                                    idx3 = square + tilesY + 1 + 1 + x;
+                                    idx4 = square + tilesY + 1 + x;
 
                                     // top triangle
                                     liqTris.push_back(idx3);
@@ -690,7 +691,7 @@ namespace MMAP
 
                         for (uint32 i = 0; i < liqTris.size() / 3; ++i)
                         {
-                            meshData.liquidTris.append(liqTris[i*3+1] + liqOffset, liqTris[i*3+2] + liqOffset, liqTris[i*3] + liqOffset);
+                            meshData.liquidTris.append(liqTris[i * 3 + 1] + liqOffset, liqTris[i * 3 + 2] + liqOffset, liqTris[i * 3] + liqOffset);
                             meshData.liquidType.append(type);
                         }
                     }
@@ -706,7 +707,7 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    void TerrainBuilder::transform(vector<Vector3> &source, vector<Vector3> &transformedVertices, float scale, G3D::Matrix3 &rotation, Vector3 &position)
+    void TerrainBuilder::transform(vector<Vector3>& source, vector<Vector3>& transformedVertices, float scale, G3D::Matrix3& rotation, Vector3& position)
     {
         for (vector<Vector3>::iterator it = source.begin(); it != source.end(); ++it)
         {
@@ -719,7 +720,7 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    void TerrainBuilder::copyVertices(vector<Vector3> &source, G3D::Array<float> &dest)
+    void TerrainBuilder::copyVertices(vector<Vector3>& source, G3D::Array<float>& dest)
     {
         for (vector<Vector3>::iterator it = source.begin(); it != source.end(); ++it)
         {
@@ -730,30 +731,30 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    void TerrainBuilder::copyIndices(vector<MeshTriangle> &source, G3D::Array<int> &dest, int offset, bool flip)
+    void TerrainBuilder::copyIndices(vector<MeshTriangle>& source, G3D::Array<int>& dest, int offset, bool flip)
     {
         if (flip)
         {
             for (vector<MeshTriangle>::iterator it = source.begin(); it != source.end(); ++it)
             {
-                dest.push_back((*it).idx2+offset);
-                dest.push_back((*it).idx1+offset);
-                dest.push_back((*it).idx0+offset);
+                dest.push_back((*it).idx2 + offset);
+                dest.push_back((*it).idx1 + offset);
+                dest.push_back((*it).idx0 + offset);
             }
         }
         else
         {
             for (vector<MeshTriangle>::iterator it = source.begin(); it != source.end(); ++it)
             {
-                dest.push_back((*it).idx0+offset);
-                dest.push_back((*it).idx1+offset);
-                dest.push_back((*it).idx2+offset);
+                dest.push_back((*it).idx0 + offset);
+                dest.push_back((*it).idx1 + offset);
+                dest.push_back((*it).idx2 + offset);
             }
         }
     }
 
     /**************************************************************************/
-    void TerrainBuilder::copyIndices(G3D::Array<int> &source, G3D::Array<int> &dest, int offset)
+    void TerrainBuilder::copyIndices(G3D::Array<int>& source, G3D::Array<int>& dest, int offset)
     {
         int* src = source.getCArray();
         for (int32 i = 0; i < source.size(); ++i)
@@ -761,7 +762,7 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    void TerrainBuilder::cleanVertices(G3D::Array<float> &verts, G3D::Array<int> &tris)
+    void TerrainBuilder::cleanVertices(G3D::Array<float>& verts, G3D::Array<int>& tris)
     {
         map<int, int> vertMap;
 
@@ -784,7 +785,7 @@ namespace MMAP
         {
             index = (*it).first;
             (*it).second = count;
-            cleanVerts.append(v[index*3], v[index*3+1], v[index*3+2]);
+            cleanVerts.append(v[index * 3], v[index * 3 + 1], v[index * 3 + 2]);
             count++;
         }
         verts.fastClear();
@@ -805,10 +806,10 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    void TerrainBuilder::loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData, const char* offMeshFilePath)
+    void TerrainBuilder::loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, const char* offMeshFilePath)
     {
         // no meshfile input given?
-        if(offMeshFilePath == NULL)
+        if (offMeshFilePath == NULL)
             return;
 
         FILE* fp = fopen(offMeshFilePath, "rb");
@@ -821,16 +822,16 @@ namespace MMAP
         // pretty silly thing, as we parse entire file and load only the tile we need
         // but we don't expect this file to be too large
         char* buf = new char[512];
-        while(fgets(buf, 512, fp))
+        while (fgets(buf, 512, fp))
         {
             float p0[3], p1[3];
             int mid, tx, ty;
             float size;
-            if(10 != sscanf(buf, "%d %d,%d (%f %f %f) (%f %f %f) %f", &mid, &tx, &ty,
-                                    &p0[0], &p0[1], &p0[2], &p1[0], &p1[1], &p1[2], &size))
+            if (10 != sscanf(buf, "%d %d,%d (%f %f %f) (%f %f %f) %f", &mid, &tx, &ty,
+                             &p0[0], &p0[1], &p0[2], &p1[0], &p1[1], &p1[2], &size))
                 continue;
 
-            if(mapID == mid, tileX == tx, tileY == ty)
+            if (mapID == mid, tileX == tx, tileY == ty)
             {
                 meshData.offMeshConnections.append(p0[1]);
                 meshData.offMeshConnections.append(p0[2]);
diff --git a/contrib/mmap/src/TerrainBuilder.h b/contrib/mmap/src/TerrainBuilder.h
index d33c3aed8fe..7168d6d0aa9 100644
--- a/contrib/mmap/src/TerrainBuilder.h
+++ b/contrib/mmap/src/TerrainBuilder.h
@@ -49,11 +49,11 @@ namespace MMAP
     };
 
     static const int V9_SIZE = 129;
-    static const int V9_SIZE_SQ = V9_SIZE*V9_SIZE;
+    static const int V9_SIZE_SQ = V9_SIZE* V9_SIZE;
     static const int V8_SIZE = 128;
-    static const int V8_SIZE_SQ = V8_SIZE*V8_SIZE;
+    static const int V8_SIZE_SQ = V8_SIZE* V8_SIZE;
     static const float GRID_SIZE = 533.33333f;
-    static const float GRID_PART_SIZE = GRID_SIZE/V8_SIZE;
+    static const float GRID_PART_SIZE = GRID_SIZE / V8_SIZE;
 
     // see contrib/extractor/system.cpp, CONF_use_minHeight
     static const float INVALID_MAP_LIQ_HEIGHT = -500.f;
@@ -62,7 +62,7 @@ namespace MMAP
     // see following files:
     // contrib/extractor/system.cpp
     // src/game/GridMap.cpp
-    static char const* MAP_VERSION_MAGIC = "v1.2";
+    static char const* MAP_VERSION_MAGIC = "v1.3";
 
     struct MeshData
     {
@@ -87,31 +87,31 @@ namespace MMAP
             TerrainBuilder(bool skipLiquid);
             ~TerrainBuilder();
 
-            void loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData);
-            bool loadVMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData);
-            void loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData, const char* offMeshFilePath);
+            void loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData);
+            bool loadVMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData);
+            void loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, const char* offMeshFilePath);
 
             bool usesLiquids() { return !m_skipLiquid; }
 
             // vert and triangle methods
-            static void transform(vector<G3D::Vector3> &original, vector<G3D::Vector3> &transformed,
-                                    float scale, G3D::Matrix3 &rotation, G3D::Vector3 &position);
-            static void copyVertices(vector<G3D::Vector3> &source, G3D::Array<float> &dest);
-            static void copyIndices(vector<VMAP::MeshTriangle> &source, G3D::Array<int> &dest, int offest, bool flip);
-            static void copyIndices(G3D::Array<int> &src, G3D::Array<int> &dest, int offset);
-            static void cleanVertices(G3D::Array<float> &verts, G3D::Array<int> &tris);
+            static void transform(vector<G3D::Vector3>& original, vector<G3D::Vector3>& transformed,
+                                  float scale, G3D::Matrix3& rotation, G3D::Vector3& position);
+            static void copyVertices(vector<G3D::Vector3>& source, G3D::Array<float>& dest);
+            static void copyIndices(vector<VMAP::MeshTriangle>& source, G3D::Array<int>& dest, int offest, bool flip);
+            static void copyIndices(G3D::Array<int>& src, G3D::Array<int>& dest, int offset);
+            static void cleanVertices(G3D::Array<float>& verts, G3D::Array<int>& tris);
         private:
             /// Loads a portion of a map's terrain
-            bool loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData &meshData, Spot portion);
+            bool loadMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, Spot portion);
 
             /// Sets loop variables for selecting only certain parts of a map's terrain
-            void getLoopVars(Spot portion, int &loopStart, int &loopEnd, int &loopInc);
+            void getLoopVars(Spot portion, int& loopStart, int& loopEnd, int& loopInc);
 
             /// Controls whether liquids are loaded
             bool m_skipLiquid;
 
             /// Load the map terrain from file
-            bool loadHeightMap(uint32 mapID, uint32 tileX, uint32 tileY, G3D::Array<float> &vertices, G3D::Array<int> &triangles, Spot portion);
+            bool loadHeightMap(uint32 mapID, uint32 tileX, uint32 tileY, G3D::Array<float>& vertices, G3D::Array<int>& triangles, Spot portion);
 
             /// Get the vector coordinate for a specific position
             void getHeightCoord(int index, Grid grid, float xOffset, float yOffset, float* coord, float* v);
@@ -130,7 +130,7 @@ namespace MMAP
 
             // hide parameterless and copy constructor
             TerrainBuilder();
-            TerrainBuilder(const TerrainBuilder &tb);
+            TerrainBuilder(const TerrainBuilder& tb);
     };
 }
 
diff --git a/contrib/mmap/src/VMapExtensions.cpp b/contrib/mmap/src/VMapExtensions.cpp
index 936cea11518..465225042c7 100644
--- a/contrib/mmap/src/VMapExtensions.cpp
+++ b/contrib/mmap/src/VMapExtensions.cpp
@@ -31,26 +31,26 @@ namespace VMAP
     // maybe add MapBuilder as friend to all of the below classes would be better?
 
     // declared in src/shared/vmap/MapTree.h
-    void StaticMapTree::getModelInstances(ModelInstance* &models, uint32 &count)
+    void StaticMapTree::getModelInstances(ModelInstance*& models, uint32& count)
     {
         models = iTreeValues;
         count = iNTreeValues;
     }
 
     // declared in src/shared/vmap/VMapManager2.h
-    void VMapManager2::getInstanceMapTree(InstanceTreeMap &instanceMapTree)
+    void VMapManager2::getInstanceMapTree(InstanceTreeMap& instanceMapTree)
     {
         instanceMapTree = iInstanceMapTrees;
     }
 
     // declared in src/shared/vmap/WorldModel.h
-    void WorldModel::getGroupModels(vector<GroupModel> &groupModels)
+    void WorldModel::getGroupModels(vector<GroupModel>& groupModels)
     {
         groupModels = this->groupModels;
     }
 
     // declared in src/shared/vmap/WorldModel.h
-    void GroupModel::getMeshData(vector<Vector3> &vertices, vector<MeshTriangle> &triangles, WmoLiquid* &liquid)
+    void GroupModel::getMeshData(vector<Vector3>& vertices, vector<MeshTriangle>& triangles, WmoLiquid*& liquid)
     {
         vertices = this->vertices;
         triangles = this->triangles;
@@ -64,7 +64,7 @@ namespace VMAP
     }
 
     // declared in src/shared/vmap/WorldModel.h
-    void WmoLiquid::getPosInfo(uint32 &tilesX, uint32 &tilesY, Vector3 &corner) const
+    void WmoLiquid::getPosInfo(uint32& tilesX, uint32& tilesY, Vector3& corner) const
     {
         tilesX = iTilesX;
         tilesY = iTilesY;
diff --git a/contrib/mmap/src/generator.cpp b/contrib/mmap/src/generator.cpp
index 28d7a964a91..1b1a3e2819c 100644
--- a/contrib/mmap/src/generator.cpp
+++ b/contrib/mmap/src/generator.cpp
@@ -58,19 +58,40 @@ bool checkDirectories(bool debugOutput)
     return true;
 }
 
+void printUsage()
+{
+    printf("Generator command line args\n\n");
+    printf("-? or /? or -h : This help\n");
+    printf("[#] : Build only the map specified by #.\n");
+    printf("--maxAngle [#] : Max walkable inclination angle\n");
+    printf("--tile [#,#] : Build the specified tile\n");
+    printf("--skipLiquid [true|false] : liquid data for maps\n");
+    printf("--skipContinents [true|false] : skip continents\n");
+    printf("--skipJunkMaps [true|false] : junk maps include some unused\n");
+    printf("--skipBattlegrounds [true|false] : does not include PVP arenas\n");
+    printf("--debugOutput [true|false] : create debugging files for use with RecastDemo\n");
+    printf("--bigBaseUnit [true|false] : Generate tile/map using bigger basic unit.\n");
+    printf("--silent : Make script friendly. No wait for user input, error, completion.\n");
+    printf("--offMeshInput [file.*] : Path to file containing off mesh connections data.\n\n");
+    printf("Example:\nmovemapgen (generate all mmap with default arg\n"
+        "movemapgen 0 (generate map 0)\n"
+        "movemapgen 0 --tile 34,46 (builds only tile 34,46 of map 0)\n\n");
+    printf("Please read readme file for more information and examples.\n");
+}
+
 bool handleArgs(int argc, char** argv,
-               int &mapnum,
-               int &tileX,
-               int &tileY,
-               float &maxAngle,
-               bool &skipLiquid,
-               bool &skipContinents,
-               bool &skipJunkMaps,
-               bool &skipBattlegrounds,
-               bool &debugOutput,
-               bool &silent,
-               bool &bigBaseUnit,
-               char* &offMeshInputPath)
+                int& mapnum,
+                int& tileX,
+                int& tileY,
+                float& maxAngle,
+                bool& skipLiquid,
+                bool& skipContinents,
+                bool& skipJunkMaps,
+                bool& skipBattlegrounds,
+                bool& debugOutput,
+                bool& silent,
+                bool& bigBaseUnit,
+                char*& offMeshInputPath)
 {
     char* param = NULL;
     for (int i = 1; i < argc; ++i)
@@ -122,7 +143,7 @@ bool handleArgs(int argc, char** argv,
             else
                 printf("invalid option for '--skipLiquid', using default\n");
         }
-        else if(strcmp(argv[i], "--skipContinents") == 0)
+        else if (strcmp(argv[i], "--skipContinents") == 0)
         {
             param = argv[++i];
             if (!param)
@@ -199,6 +220,11 @@ bool handleArgs(int argc, char** argv,
 
             offMeshInputPath = param;
         }
+        else if ((strcmp(argv[i], "-?") == 0) || (strcmp(argv[i], "/?") == 0) || (strcmp(argv[i], "-h") == 0))
+        {
+            printUsage();
+            exit(1);
+        }
         else
         {
             int map = atoi(argv[i]);
@@ -225,7 +251,7 @@ int finish(const char* message, int returnValue)
 int main(int argc, char** argv)
 {
     int mapnum = -1;
-    float maxAngle = 60.0f;
+    float maxAngle = 55.0f;
     int tileX = -1, tileY = -1;
     bool skipLiquid = false,
          skipContinents = false,
@@ -242,7 +268,7 @@ int main(int argc, char** argv)
                                  debugOutput, silent, bigBaseUnit, offMeshInputPath);
 
     if (!validParam)
-        return silent ? -1 : finish("You have specified invalid parameters", -1);
+        return silent ? -1 : finish("You have specified invalid parameters (use -? for more help)", -1);
 
     if (mapnum == -1 && debugOutput)
     {
diff --git a/contrib/mmap/win/MoveMapGen_VC100.sln b/contrib/mmap/win/MoveMapGen_VC100.sln
deleted file mode 100644
index 7b12ffbf280..00000000000
--- a/contrib/mmap/win/MoveMapGen_VC100.sln
+++ /dev/null
@@ -1,87 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MoveMapGen", "VC100\MoveMapGen_VC100.vcxproj", "{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-		{00B9DC66-96A6-465D-A6C1-5DFF94E48A64} = {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\..\win\VC100\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC100\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Recast", "..\..\..\dep\recastnavigation\Recast\win\VC100\Recast.vcxproj", "{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "..\..\..\dep\recastnavigation\Detour\win\VC100\Detour.vcxproj", "{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
-		Debug_NoPCH|x64 = Debug_NoPCH|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|Win32.Build.0 = Debug|Win32
-		{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|x64.ActiveCfg = Debug|Win32
-		{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|Win32.ActiveCfg = Release|Win32
-		{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|Win32.Build.0 = Release|Win32
-		{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|x64.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64
-		{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|Win32.ActiveCfg = Debug|Win32
-		{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|Win32.Build.0 = Debug|Win32
-		{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|x64.ActiveCfg = Debug|Win32
-		{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|Win32.ActiveCfg = Release|Win32
-		{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|Win32.Build.0 = Release|Win32
-		{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|x64.ActiveCfg = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.Build.0 = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.ActiveCfg = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.Build.0 = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.ActiveCfg = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/contrib/mmap/win/MoveMapGen_VC90.sln b/contrib/mmap/win/MoveMapGen_VC90.sln
deleted file mode 100644
index d11c7505956..00000000000
--- a/contrib/mmap/win/MoveMapGen_VC90.sln
+++ /dev/null
@@ -1,89 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MoveMapGen", "VC90\MoveMapGen.vcproj", "{97193524-E639-4CBD-AFE4-0CFF84D9656E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C} = {B6137343-A2F6-4AE7-BA47-484EC0EF369C}
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7} = {5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\..\win\VC90\g3dlite.vcproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC90\zlib.vcproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Recast", "..\..\..\dep\recastnavigation\Recast\win\VC90\Recast.vcproj", "{B6137343-A2F6-4AE7-BA47-484EC0EF369C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "..\..\..\dep\recastnavigation\Detour\win\VC90\Detour.vcproj", "{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
-		Debug_NoPCH|x64 = Debug_NoPCH|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{97193524-E639-4CBD-AFE4-0CFF84D9656E}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{97193524-E639-4CBD-AFE4-0CFF84D9656E}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{97193524-E639-4CBD-AFE4-0CFF84D9656E}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{97193524-E639-4CBD-AFE4-0CFF84D9656E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{97193524-E639-4CBD-AFE4-0CFF84D9656E}.Debug|Win32.Build.0 = Debug|Win32
-		{97193524-E639-4CBD-AFE4-0CFF84D9656E}.Debug|x64.ActiveCfg = Debug|Win32
-		{97193524-E639-4CBD-AFE4-0CFF84D9656E}.Release|Win32.ActiveCfg = Release|Win32
-		{97193524-E639-4CBD-AFE4-0CFF84D9656E}.Release|Win32.Build.0 = Release|Win32
-		{97193524-E639-4CBD-AFE4-0CFF84D9656E}.Release|x64.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Debug|Win32.Build.0 = Debug|Win32
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Debug|x64.ActiveCfg = Debug|Win32
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Release|Win32.ActiveCfg = Release|Win32
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Release|Win32.Build.0 = Release|Win32
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Release|x64.ActiveCfg = Release|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug_NoPCH|Win32.ActiveCfg = Debug|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug_NoPCH|x64.ActiveCfg = Debug|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug_NoPCH|x64.Build.0 = Debug|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug|Win32.Build.0 = Debug|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug|x64.ActiveCfg = Debug|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug|x64.Build.0 = Debug|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Release|Win32.ActiveCfg = Release|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Release|Win32.Build.0 = Release|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Release|x64.ActiveCfg = Release|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/contrib/mmap/win/VC100/.gitignore b/contrib/mmap/win/VC100/.gitignore
deleted file mode 100644
index 7d89d1eaeee..00000000000
--- a/contrib/mmap/win/VC100/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-
-*Win32_Debug
-*Win32_Release
-*x64_Debug
-*x64_Release
-*.user
\ No newline at end of file
diff --git a/contrib/mmap/win/VC100/MoveMapGen_VC100.vcxproj b/contrib/mmap/win/VC100/MoveMapGen_VC100.vcxproj
deleted file mode 100644
index e63a518b588..00000000000
--- a/contrib/mmap/win/VC100/MoveMapGen_VC100.vcxproj
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}</ProjectGuid>
-    <RootNamespace>MoveMapGen_VC100</RootNamespace>
-    <ProjectName>MoveMapGen</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>.\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IntDir>.\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\;..\..\..\..\dep\recastnavigation\Detour\Include\;..\..\..\..\dep\recastnavigation\Recast\Include\;..\..\..\..\src\game\vmap;..\..\..\..\dep\include\g3dlite;..\..\..\..\src\framework\;..\..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;MMAP_GENERATOR;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>msvcrtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <LargeAddressAware>true</LargeAddressAware>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\src\;..\..\..\..\dep\recastnavigation\Detour\Include\;..\..\..\..\dep\recastnavigation\Recast\Include\;..\..\..\..\src\game\vmap;..\..\..\..\dep\include\g3dlite;..\..\..\..\src\framework\;..\..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <PreprocessorDefinitions>WIN32;NDEBUG;MMAP_GENERATOR;_CRT_SECURE_NO_WARNINGS;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>msvcrt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <GenerateMapFile>true</GenerateMapFile>
-      <LargeAddressAware>true</LargeAddressAware>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <ProjectReference>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\game\vmap\BIH.cpp" />
-    <ClCompile Include="..\..\..\..\src\game\vmap\MapTree.cpp" />
-    <ClCompile Include="..\..\..\..\src\game\vmap\ModelInstance.cpp" />
-    <ClCompile Include="..\..\..\..\src\game\vmap\TileAssembler.cpp" />
-    <ClCompile Include="..\..\..\..\src\game\vmap\VMapFactory.cpp" />
-    <ClCompile Include="..\..\..\..\src\game\vmap\VMapManager2.cpp" />
-    <ClCompile Include="..\..\..\..\src\game\vmap\WorldModel.cpp" />
-    <ClCompile Include="..\..\src\generator.cpp" />
-    <ClCompile Include="..\..\src\MapBuilder.cpp" />
-    <ClCompile Include="..\..\src\TerrainBuilder.cpp" />
-    <ClCompile Include="..\..\src\VMapExtensions.cpp" />
-    <ClCompile Include="..\..\src\IntermediateValues.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\game\vmap\BIH.h" />
-    <ClInclude Include="..\..\..\..\src\game\vmap\IVMapManager.h" />
-    <ClInclude Include="..\..\..\..\src\game\vmap\MapTree.h" />
-    <ClInclude Include="..\..\..\..\src\game\vmap\ModelInstance.h" />
-    <ClInclude Include="..\..\..\..\src\game\vmap\TileAssembler.h" />
-    <ClInclude Include="..\..\..\..\src\game\vmap\VMapDefinitions.h" />
-    <ClInclude Include="..\..\..\..\src\game\vmap\VMapFactory.h" />
-    <ClInclude Include="..\..\..\..\src\game\vmap\VMapManager2.h" />
-    <ClInclude Include="..\..\..\..\src\game\vmap\VMapTools.h" />
-    <ClInclude Include="..\..\..\..\src\game\vmap\WorldModel.h" />
-    <ClInclude Include="..\..\..\..\src\game\MoveMapSharedDefines.h" />
-    <ClInclude Include="..\..\src\MangosMap.h" />
-    <ClInclude Include="..\..\src\MapBuilder.h" />
-    <ClInclude Include="..\..\src\MMapCommon.h" />
-    <ClInclude Include="..\..\src\TerrainBuilder.h" />
-    <ClInclude Include="..\..\src\IntermediateValues.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\dep\recastnavigation\Detour\win\VC100\Detour.vcxproj">
-      <Project>{72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\dep\recastnavigation\Recast\win\VC100\Recast.vcxproj">
-      <Project>{00b9dc66-96a6-465d-a6c1-5dff94e48a64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\win\VC100\g3dlite.vcxproj">
-      <Project>{8072769e-cf10-48bf-b9e1-12752a5dac6e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\win\VC100\zlib.vcxproj">
-      <Project>{8f1dea42-6a5b-4b62-839d-c141a7bfacf2}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/contrib/mmap/win/VC100/MoveMapGen_VC100.vcxproj.filters b/contrib/mmap/win/VC100/MoveMapGen_VC100.vcxproj.filters
deleted file mode 100644
index 79abd60c379..00000000000
--- a/contrib/mmap/win/VC100/MoveMapGen_VC100.vcxproj.filters
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="generator">
-      <UniqueIdentifier>{dcfc8b46-b41f-4c19-9f6b-257a463f6c67}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="vmap">
-      <UniqueIdentifier>{8c2c5f18-4147-4fdb-bd45-aa9664476e6c}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\generator.cpp">
-      <Filter>generator</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\VMapExtensions.cpp">
-      <Filter>generator</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\MapBuilder.cpp">
-      <Filter>generator</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\game\vmap\BIH.cpp">
-      <Filter>vmap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\game\vmap\MapTree.cpp">
-      <Filter>vmap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\game\vmap\ModelInstance.cpp">
-      <Filter>vmap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\game\vmap\TileAssembler.cpp">
-      <Filter>vmap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\game\vmap\VMapFactory.cpp">
-      <Filter>vmap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\game\vmap\VMapManager2.cpp">
-      <Filter>vmap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\game\vmap\WorldModel.cpp">
-      <Filter>vmap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\TerrainBuilder.cpp">
-      <Filter>generator</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\IntermediateValues.cpp">
-      <Filter>generator</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\MMapCommon.h">
-      <Filter>generator</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\IntermediateValues.h">
-      <Filter>generator</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\MangosMap.h">
-      <Filter>generator</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\MapBuilder.h">
-      <Filter>generator</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\game\MoveMapSharedDefines.h">
-      <Filter>generator</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\game\vmap\BIH.h">
-      <Filter>vmap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\game\vmap\IVMapManager.h">
-      <Filter>vmap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\game\vmap\MapTree.h">
-      <Filter>vmap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\game\vmap\ModelInstance.h">
-      <Filter>vmap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\game\vmap\TileAssembler.h">
-      <Filter>vmap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\game\vmap\VMapDefinitions.h">
-      <Filter>vmap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\game\vmap\VMapFactory.h">
-      <Filter>vmap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\game\vmap\VMapManager2.h">
-      <Filter>vmap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\game\vmap\VMapTools.h">
-      <Filter>vmap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\game\vmap\WorldModel.h">
-      <Filter>vmap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\TerrainBuilder.h">
-      <Filter>generator</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/contrib/mmap/win/VC90/.gitignore b/contrib/mmap/win/VC90/.gitignore
deleted file mode 100644
index 562c2cd6f01..00000000000
--- a/contrib/mmap/win/VC90/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-
-*Win32_Release
-*Win32_Debug
-*x64_Release
-*x64_Debug
-*.user
\ No newline at end of file
diff --git a/contrib/mmap/win/VC90/MoveMapGen.vcproj b/contrib/mmap/win/VC90/MoveMapGen.vcproj
deleted file mode 100644
index 0092dfac66e..00000000000
--- a/contrib/mmap/win/VC90/MoveMapGen.vcproj
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="MoveMapGen"
-	ProjectGUID="{97193524-E639-4CBD-AFE4-0CFF84D9656E}"
-	RootNamespace="MoveMapGen"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				FavorSizeOrSpeed="1"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="..\..\src\;..\..\..\..\src\game\vmap;..\..\..\..\dep\include\g3dlite\;..\..\..\..\src\framework\;..\..\..\..\dep\ACE_wrappers\;..\..\..\..\dep\recastnavigation\Detour\Include\;..\..\..\..\dep\recastnavigation\Recast\Include\;"
-				PreprocessorDefinitions="WIN32;DEBUG;MMAP_GENERATOR;NO_CORE_FUNCS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Detour.lib Recast.lib g3dlite.lib zlib.lib"
-				AdditionalLibraryDirectories="..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\;..\..\..\..\win\VC90\g3dlite__$(PlatformName)_$(ConfigurationName)\;..\..\..\..\win\VC90\zlib__$(PlatformName)_$(ConfigurationName)\"
-				GenerateDebugInformation="true"
-				LargeAddressAware="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\src\;..\..\..\..\src\game\vmap;..\..\..\..\dep\include\g3dlite\;..\..\..\..\src\framework\;..\..\..\..\dep\ACE_wrappers\;..\..\..\..\dep\recastnavigation\Detour\Include\;..\..\..\..\dep\recastnavigation\Recast\Include\;"
-				PreprocessorDefinitions="WIN32;NDEBUG;MMAP_GENERATOR;NO_CORE_FUNCS;"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Detour.lib Recast.lib g3dlite.lib zlib.lib"
-				AdditionalLibraryDirectories="..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\;..\..\..\..\win\VC90\g3dlite__$(PlatformName)_$(ConfigurationName)\;..\..\..\..\win\VC90\zlib__$(PlatformName)_$(ConfigurationName)\"
-				GenerateDebugInformation="true"
-				LargeAddressAware="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="generator"
-			>
-			<File
-				RelativePath="..\..\src\generator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MangosMap.h"
-				>
-			</File>
-            <File
-				RelativePath="..\..\..\..\src\game\MoveMapSharedDefines.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MapBuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MapBuilder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MMapCommon.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TerrainBuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TerrainBuilder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\VMapExtensions.cpp"
-				>
-			</File>
-            <File
-				RelativePath="..\..\src\IntermediateValues.h"
-				>
-			</File>
-            <File
-				RelativePath="..\..\src\IntermediateValues.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="vmap"
-			>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\BIH.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\BIH.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\IVMapManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\MapTree.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\MapTree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\ModelInstance.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\ModelInstance.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\TileAssembler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\TileAssembler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\VMapDefinitions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\VMapFactory.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\VMapFactory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\VMapManager2.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\VMapManager2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\VMapTools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\WorldModel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\game\vmap\WorldModel.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/server_scripts/auto_update.sh b/contrib/server_scripts/auto_update.sh
new file mode 100755
index 00000000000..4f5b4dc1475
--- /dev/null
+++ b/contrib/server_scripts/auto_update.sh
@@ -0,0 +1,476 @@
+#!/bin/bash
+###############################################################################
+# configuration
+home="/home/mangos"
+mangosConf=$home"/etc/mangosd.conf"
+scriptConf=$home"/etc/scriptdev2.conf"
+mangosSource=$home"/Mangos-Sources/mangos"
+YTDBSource=$home"/Mangos-Sources/ytdbase/Wotlk"
+#
+echo "Please, setup directories and files in begin of this script!"
+exit
+###############################################################################
+r2searchDir=$mangosSource"/sql_mr"
+# functions
+function db_exec() 
+{
+    local IFS=$' \t\n'
+    MYCMD='mysql --host='$1' --user='$3' --password='$4' --database='$5' --batch --silent --execute '
+    echo $($MYCMD "$6")
+}
+
+function db_run()
+{
+    MYCMD='mysql --host='$1' --user='$3' --password='$4' --database='$5' '
+    echo $($MYCMD <"$6")
+}
+
+function db_config_extract()
+{
+    echo `cat $1|grep "^"$2 |sed 's/^.*=\t*//'|sed 's/\"//g' |sed 's/\<//'|sed 's/\>//'|sed 's/\;/ /g'|sed 's/\r/ /g'`
+}
+###############################################################################
+# some extended features. don't touch, if not sure!
+# dropDB : 0 - not drop before fill, 1 - drop only mangos DB, >1 - drop all DB's
+dropDB=1
+###############################################################################
+# check all needed sources
+if [ ! -f $mangosConf ]; 
+        then
+        echo "Cannot find config file "$mangosConf"! Please, true setup script!"
+        exit;
+fi
+echo "Mangos config found, version "`cat $mangosConf|grep "ConfVersion"|sed 's/^.*=\t*//g'`
+
+if [ ! -f $scriptConf ]; 
+        then
+        echo "Cannot find config file "$scriptConf"! Please, true setup script!"
+        exit;
+fi
+echo "ScriptDev2 config found, version "`cat $scriptConf|grep "ConfVersion"|sed 's/^.*=\t*//g'`
+
+# R2
+if [ ! -f $mangosSource"/sql_mr/readme.txt" ]; 
+    then
+    echo "Cannot find R2 sources in path! Please, true setup script!"
+    exit
+fi
+
+if [ ! -d $mangosSource ]; 
+        then
+        echo "Cannot find mangos sources in path "$mangosSource"! Please, true setup script!"
+        exit;
+fi
+echo "Mangos sources found, R2 revision "`cat $mangosSource/src/shared/revision_R2.h|grep "define REVISION_R2"|sed 's/^.*R2//g'|sed 's/\"//g'`
+
+if [ ! -d $YTDBSource ]; 
+        then
+        echo "Cannot find YTDB storage in path "$YTDBSource"! Please, true setup script!"
+        exit;
+fi
+echo "YTDB found, revision "`svn info $YTDBSource|grep "Revision:"|sed 's/^.*\://g'`
+
+
+###############################################################################
+# realm
+searchDir=$mangosSource"/sql/updates"
+dtemp=$(db_config_extract $mangosConf "LoginDatabaseInfo")
+read realmhost realmport realmuser realmpass realmdb <<<$dtemp
+count=0;
+
+###############################################################################
+# check (and create if need) DB
+if [ $dropDB -gt 1 ]; then
+    _rc=$(db_exec $realmhost $realmport $realmuser $realmpass $realmdb 'DROP DATABASE IF EXISTS '$realmdb)
+    fi;
+dbcheck=$(db_exec $realmhost $realmport $realmuser $realmpass "information_schema" "SHOW DATABASES LIKE '"$realmdb"'")
+if [[ $dbcheck != $realmdb ]];
+    then
+        echo "Realm DB $realmdb NOT found! Create and initial fill new!"
+        _rc=$(db_exec $realmhost $realmport $realmuser $realmpass "information_schema" "CREATE DATABASE $realmdb DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci")
+        _rc=$(db_exec $realmhost $realmport $realmuser $realmpass $realmdb 'GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, LOCK TABLES ON '$realmdb'.* TO '$realmuser'@')
+        _rc=$(db_run $realmhost $realmport $realmuser $realmpass $realmdb $mangosSource'/sql/realmd.sql')
+    else
+    echo "Realm DB $realmdb found! try update to current revision."
+fi
+
+checkupdateField=$(db_exec $realmhost $realmport $realmuser $realmpass $realmdb "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='"$realmdb"' AND TABLE_NAME='realmd_db_version' AND COLUMN_NAME='r2_db_version'")
+if [[ $checkupdateField == "" ]]; then
+    checkUpdateField=$(db_exec $realmhost $realmport $realmuser $realmpass $realmdb "ALTER TABLE realmd_db_version ADD COLUMN r2_db_version smallint NOT NULL default 0")
+    _rc=$(db_run $realmhost $realmport $realmuser $realmpass $realmdb $r2searchDir"/custom_realmd_tables.sql")
+fi
+
+###############################################################################
+while [ ! -z $realmdb ]
+do
+    dblastupdate=$(db_exec $realmhost $realmport $realmuser $realmpass $realmdb "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='"$realmdb"' AND TABLE_NAME='realmd_db_version' AND DATA_TYPE='bit'")
+    updateFile=`grep -lir "COLUMN.$dblastupdate" $searchDir/`
+#    echo $updateFile
+#    echo $dblastupdate
+#    exit
+    if [ -z $updateFile ]; 
+        then
+            break;
+    fi
+    _rc=$(db_run $realmhost $realmport $realmuser $realmpass $realmdb "$updateFile")
+    echo "Installed update "$updateFile" with rc="$_rc
+    echo
+    count=$(($count+1));
+done
+
+echo "Updating REALM DB completed. Count of updates:"$count
+echo "Last update REALM DB: "$dblastupdate
+echo
+
+###############################################################################
+# mangos
+dtemp=$(db_config_extract $mangosConf "WorldDatabaseInfo")
+read mangoshost mangosport mangosuser mangospass mangosdb <<<$dtemp
+
+###############################################################################
+# check (and create if need) DB
+
+if [ $dropDB -ge 1 ]; then
+    _rc=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb 'DROP DATABASE IF EXISTS '$mangosdb)
+    fi;
+dbcheck=$(db_exec $mangoshost $mangosport $mangosuser $mangospass "information_schema" "SHOW DATABASES LIKE '"$mangosdb"'")
+if [[ $dbcheck != $mangosdb ]];
+    then
+        echo "Mangos world DB $mangosdb NOT found! Try create and initial fill new!"
+        check7z=`locate bin/7za`
+        if [ -z "$check7z" ]; 
+        then
+            echo "P7zip not installed! Install p7zip and try again, or manually fill mangos DB!"
+            exit;
+        fi
+        _rc=$(db_exec $mangoshost $mangosport $mangosuser $mangospass "information_schema" "CREATE DATABASE $mangosdb DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci")
+        _rc=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb 'GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, LOCK TABLES ON '$mangosdb'.* TO '$mangosuser'@')
+        _rc=$(db_run  $mangoshost $mangosport $mangosuser $mangospass $mangosdb $mangosSource"/sql/mangos.sql")
+        _rc=$(db_run  $mangoshost $mangosport $mangosuser $mangospass $mangosdb $mangosSource"/sql/mangos_indexes.sql")
+        ytdbL=`ls $YTDBSource |sort -r|head -n 1`
+        echo $ytdbL
+        ytdbLast=`find "$YTDBSource/$ytdbL" -maxdepth 1 -name *.7z`
+        7za e -o/tmp $ytdbLast
+        ytdbLastsql=`find /tmp -maxdepth 1 -name *$ytdbL*.sql`
+        echo "Install database "$ytdbLastsql
+        _rc=$(db_run  $mangoshost $mangosport $mangosuser $mangospass $mangosdb $ytdbLastsql)
+        rm $ytdbLastsql
+    else
+    echo "Mangos world DB $mangosdb found! try update to current revision."
+fi
+
+checkupdateField=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='"$mangosdb"' AND TABLE_NAME='db_version' AND COLUMN_NAME='r2_db_version'")
+if [[ $checkupdateField == "" ]]; then
+    checkUpdateField=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "ALTER TABLE db_version ADD COLUMN r2_db_version smallint NOT NULL default 0")
+    _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb $r2searchDir"/custom_mangos_tables.sql")
+fi
+###############################################################################
+searchDir=$mangosSource"/sql/updates"
+
+dbverfull=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "SELECT version FROM db_version")
+echo "Full version of MANGOS DB:" $dbverfull
+count=0;
+
+# begin masquerade tables before apply YTDB updates (for structure compartibility)
+if [ -f $r2searchDir"/custom_mangos_masquerade_begin.sql" ]; then
+    _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb $r2searchDir"/custom_mangos_masquerade_begin.sql")
+fi;
+
+while [ ! -z $mangosdb ]
+do
+    dblastupdate=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='"$mangosdb"' AND TABLE_NAME='db_version_ytdb' AND DATA_TYPE='bit'")
+
+    YTDBlastVer=`echo $dblastupdate|cut -c 1,2,3`
+    YTDBnewVer=$(($YTDBlastVer+1));
+    echo "Searching update version: "$YTDBnewVer
+
+    updatepackName="mangos_FIX";
+    if [ $YTDBnewVer -ge 630 ]; 
+        then
+        updatepackName="updatepack_mangos";
+    fi;
+
+    YTDBDir=`echo $YTDBlastVer|cut -c 1,2`
+    ytdbsearchDir=$YTDBSource"/R"$YTDBDir"/Updates/"
+    if [ ! -d "$ytdbsearchDir" ]; 
+        then
+            break;
+    fi;
+
+    updateFile=`find "$ytdbsearchDir" -maxdepth 1 -name "$YTDBnewVer"_"$updatepackName"*.sql  |sort -n`
+    if [ -z "$updateFile" ]; 
+        then
+            break;
+    fi
+    updateFileCore=`find "$ytdbsearchDir" -maxdepth 1 -name "$YTDBnewVer"_corepatch_mangos*.sql  |sort -n`
+    if [ ! -z "$updateFileCore" ]; then
+        echo "Found core update file: "$updateFileCore
+        _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb "$updateFileCore")
+        count=$(($count+1));
+    fi
+
+    _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb "$updateFile")
+    echo "Installed YTDB update "$updateFile" with rc="$_rc
+    echo
+
+    count=$(($count+1));
+done
+
+# finish masquerade tables after apply YTDB updates 
+if [ -f $r2searchDir"/custom_mangos_masquerade_end.sql" ]; then
+    _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb $r2searchDir"/custom_mangos_masquerade_end.sql")
+fi;
+
+if [ $count -gt 0 ]; then
+    _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb $r2searchDir"/custom_rerun_every_mangos_DB_update.sql")
+    echo "Updating YTDB completed. Count of updates:"$count
+    fi;
+
+dbverfull=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "SELECT version FROM db_version")
+echo "Last update YTDB: "$dblastupdate" Full YTDB version: "$dbverfull
+
+count=0;
+while [ ! -z $mangosdb ]
+do
+    dblastupdate=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='"$mangosdb"' AND TABLE_NAME='db_version' AND DATA_TYPE='bit'")
+    updateFile=`grep -lir "COLUMN.$dblastupdate" $searchDir/`
+    if [ -z $updateFile ];
+        then
+            break;
+    fi
+    _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb "$updateFile")
+    echo "Installed update "$updateFile" with rc="$_rc
+    echo
+    count=$(($count+1));
+done
+
+if [ $count -gt 0 ]; then
+    _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb $r2searchDir"/custom_rerun_every_mangos_DB_update.sql")
+fi
+
+if [ $count -gt 0 ]; then
+    echo "Updating MANGOS DB completed. Count of updates:"$count
+    fi;
+
+echo "Last update MANGOS DB: "$dblastupdate
+echo
+###############################################################################
+# characters
+dtemp=$(db_config_extract $mangosConf "CharacterDatabaseInfo")
+read charhost charport charuser charpass chardb <<<$dtemp
+count=0;
+
+###############################################################################
+# check (and create if need) DB
+if [ $dropDB -gt 1 ]; then
+    _rc=$(db_exec $charhost $charport $charuser $charpass $chardb 'DROP DATABASE IF EXISTS '$chardb)
+    fi;
+
+dbcheck=$(db_exec $charhost $charport $charuser $charpass "information_schema" "SHOW DATABASES LIKE '"$chardb"'")
+if [[ $dbcheck != $chardb ]];
+    then
+        echo "Mangos characters DB $chardb NOT found! Create and initial fill new!"
+        _rc=$(db_exec $charhost $charport $charuser $charpass "information_schema" "CREATE DATABASE $chardb DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci")
+        _rc=$(db_exec $charhost $charport $charuser $charpass $chardb 'GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, LOCK TABLES ON '$mangosdb'.* TO '$charuser'@')
+        _rc=$(db_run  $charhost $charport $charuser $charpass $chardb $mangosSource"/sql/characters.sql")
+    else
+    echo "Mangos characters DB $chardb found! try update to current revision."
+fi
+
+checkupdateField=$(db_exec $charhost $charport $charuser $charpass $chardb "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='"$chardb"' AND TABLE_NAME='character_db_version' AND COLUMN_NAME='r2_db_version'")
+if [[ $checkupdateField == "" ]]; then
+    checkUpdateField=$(db_exec $charhost $charport $charuser $charpass $chardb "ALTER TABLE character_db_version ADD COLUMN r2_db_version smallint NOT NULL default 0")
+    _rc=$(db_run $charhost $charport $charuser $charpass $chardb $r2searchDir"/custom_characters_tables.sql")
+fi
+###############################################################################
+while [ ! -z $chardb ]
+do
+    dblastupdate=$(db_exec $charhost $charport $charuser $charpass $chardb "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='"$chardb"' AND TABLE_NAME='character_db_version' AND DATA_TYPE='bit'")
+    updateFile=`grep -lir "COLUMN.$dblastupdate" $searchDir/`
+    if [ -z $updateFile ]; 
+        then
+            break;
+    fi
+    _rc=$(db_run $charhost $charport $charuser $charpass $chardb "$updateFile")
+    echo "Installed update "$updateFile" with rc="$_rc
+    echo
+    count=$(($count+1));
+done
+
+echo "Updating CHARACTERS DB completed. Count of updates:"$count
+echo "Last update CHARACTERS DB: "$dblastupdate
+echo
+###############################################################################
+# scriptdev2
+searchDir=$mangosSource"/src/bindings/ScriptDev2/sql/updates"
+
+dtemp=$(db_config_extract $scriptConf "ScriptDev2DatabaseInfo")
+read sdhost sdport sduser sdpass sddb <<<$dtemp
+
+if [ $dropDB -gt 1 ]; then
+    _rc=$(db_exec $sdhost $sdport $sduser $sdpass $sddb 'DROP DATABASE IF EXISTS '$sddb)
+    fi;
+###############################################################################
+# check (and create if need) DB
+
+dbcheck=$(db_exec $sdhost $sdport $sduser $sdpass "information_schema" "SHOW DATABASES LIKE '"$sddb"'")
+if [[ $dbcheck != $sddb ]];
+    then
+        echo "SD2 DB $sddb NOT found! Create and initial fill new!"
+        _rc=$(db_exec $sdhost $sdport $sduser $sdpass "information_schema" "CREATE DATABASE $sddb DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci")
+        _rc=$(db_exec $sdhost $sdport $sduser $sdpass $sddb 'GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, LOCK TABLES ON '$sddb'.* TO '$sduser'@')
+        _rc=$(db_run  $sdhost $sdport $sduser $sdpass $sddb $mangosSource"/src/bindings/ScriptDev2/sql/scriptdev2_create_structure_mysql.sql")
+        _rc=$(db_run  $sdhost $sdport $sduser $sdpass $sddb $mangosSource"/src/bindings/ScriptDev2/sql/scriptdev2_script_full.sql")
+        _rc=$(db_run  $sdhost $sdport $sduser $sdpass $sddb $mangosSource"/src/bindings/ScriptDev2/sql_mr/custom_scriptdev2_bsw_table.sql")
+        echo "Pre-fill scriptnames in Mangos World DB"; 
+        _rc=$(db_run  $mangoshost $mangosport $mangosuser $mangospass $mangosdb $mangosSource"/src/bindings/ScriptDev2/sql/mangos_scriptname_full.sql")
+    else
+    echo "SD2 DB $sddb found! try update to current revision."
+fi
+
+checkupdateField=$(db_exec $sdhost $sdport $sduser $sdpass $sddb "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='"$sddb"' AND TABLE_NAME='sd2_db_version' AND COLUMN_NAME='db_version'")
+if [[ $checkupdateField == "" ]]; then
+    checkUpdateField=$(db_exec $sdhost $sdport $sduser $sdpass $sddb "ALTER TABLE sd2_db_version ADD COLUMN db_version smallint NOT NULL default 0 after version")
+    checkUpdateField=$(db_exec $sdhost $sdport $sduser $sdpass $sddb "UPDATE sd2_db_version SET db_version=0")
+fi
+
+checkupdateField=$(db_exec $sdhost $sdport $sduser $sdpass $sddb "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='"$sddb"' AND TABLE_NAME='sd2_db_version' AND COLUMN_NAME='r2_db_version'")
+if [[ $checkupdateField == "" ]]; then
+    checkUpdateField=$(db_exec $sdhost $sdport $sduser $sdpass $sddb "ALTER TABLE sd2_db_version ADD COLUMN r2_db_version smallint NOT NULL default 0 after db_version")
+    checkUpdateField=$(db_exec $sdhost $sdport $sduser $sdpass $sddb "UPDATE sd2_db_version SET r2_db_version=0")
+    customupdateFile=$searchDir"/custom_scriptdev2_stuff.sql"
+    if [ -f $customupdateFile ]; then
+        _rc=$(db_run $sdhost $sdport $sduser $sdpass $sddb $cusomupdateFile)
+    fi;
+fi
+
+checkupdateField=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='"$mangosdb"' AND TABLE_NAME='db_version' AND COLUMN_NAME='r2_sd2_db_version'")
+if [[ $checkupdateField == "" ]]; then
+    checkUpdateField=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "ALTER TABLE db_version ADD COLUMN r2_sd2_db_version smallint NOT NULL default 0")
+    checkUpdateField=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "UPDATE db_version SET r2_sd2_db_version=0")
+    customupdateFile=$r2searchDir"/custom_scriptdev2_stuff.sql"
+    if [ -f $customupdateFile ]; then
+        _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb $customupdateFile)
+    fi;
+fi
+
+###############################################################################
+dbverfull=$(db_exec $sdhost $sdport $sduser $sdpass $sddb "SELECT version FROM sd2_db_version")
+dblastupdate=$(db_exec $sdhost $sdport $sduser $sdpass $sddb "SELECT db_version FROM sd2_db_version")
+
+echo "Full version of SCRIPT DB:" $dbverfull" last update: "$dblastupdate
+count=0;
+
+length=$((${#searchDir}+2));
+length1=$((${#searchDir}+6));
+
+todb=`find $searchDir -maxdepth 1 -name "*.sql" -print |sort -n --key=$length,$length1`
+
+for j in $todb; do
+   num=`echo $j|sed -r "s/.*updates.*\/r//"|sed -r "s/_.*//"`
+   if [ $num -ge $dblastupdate ]; then
+        if [[ $j =~ .*_mangos.* ]]; then
+            _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb "$j")
+            echo "Installed update "$j"  with rc="$_rc
+        fi
+        if [[ $j =~ .*_scriptdev2.* ]]; then
+            _rc=$(db_run $sdhost $sdport $sduser $sdpass $sddb "$j")
+            echo "Installed update "$j"  with rc="$_rc
+        fi
+        count=$(($count+1));
+        dblastupdate=$num;
+        newlastupdate=$(db_exec $sdhost $sdport $sduser $sdpass $sddb "UPDATE sd2_db_version SET db_version='$num'")
+   fi
+done;
+
+echo "Last update SCRIPT DB: "$dblastupdate
+echo "Updating SCRIPT DB completed. Count of updates:"$count
+
+###############################################################################
+# R2 update
+
+length=$((${#r2searchDir}+3));
+length1=$((${#r2searchDir}+8));
+
+todb=`find $r2searchDir -maxdepth 1 -name "*.sql" -print |grep "\/mr"|sort -n --key=$length,$length1`
+
+for j in $todb; do
+_num=`echo $j|sed -r "s/.*sql_mr\/mr//"|sed -r "s/_.*//"|sed -r "s/^0*//g"`
+
+num=$(($_num));
+
+    if [[ $j =~ .*_mangos_.* ]]; then
+        dblastupdate=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "SELECT r2_db_version FROM db_version")
+        if [[ $num -ge $dblastupdate ]]; then
+            _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb "$j")
+            echo "Installed update "$j"  with rc="$_rc
+            newlastupdate=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "UPDATE db_version SET r2_db_version='$num'")
+            dblastupdate=$num;
+        fi
+    fi
+    if [[ $j =~ .*_characters_.* ]]; then
+        dblastupdate=$(db_exec $charhost $charport $charuser $charpass $chardb "SELECT r2_db_version FROM character_db_version")
+        if [[ $num -ge $dblastupdate ]]; then
+        _rc=$(db_run $charhost $charport $charuser $charpass $chardb "$j")
+            echo "Installed update "$j"  with rc="$_rc
+            newlastupdate=$(db_exec $charhost $charport $charuser $charpass $chardb "UPDATE character_db_version SET r2_db_version='$num'")
+            dblastupdate=$num;
+        fi
+    fi
+    if [[ $j =~ .*_realmd_.* ]]; then
+        dblastupdate=$(db_exec $realmhost $realmport $realmuser $realmpass $realmdb "SELECT r2_db_version FROM realmd_db_version")
+        if [[ $num -ge $dblastupdate ]]; then
+        _rc=$(db_run $realmhost $realmport $realmuser $realmpass $realmdb "$j")
+            echo "Installed update "$j"  with rc="$_rc
+            newlastupdate=$(db_exec $realmhost $realmport $realmuser $realmpass $realmdb "UPDATE realmd_db_version SET r2_db_version='$num'")
+            dblastupdate=$num;
+        fi
+    fi
+    count=$(($count+1));
+    dblastupdate=$num;
+done;
+
+if [ $count -gt 0 ]; then
+    _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb $r2searchDir"/custom_rerun_every_mangos_DB_update.sql")
+fi
+
+###############################################################################
+# R2 - SD2
+searchDir=$mangosSource"/src/bindings/ScriptDev2/sql_mr"
+
+if [ ! -f $searchDir"/readme.txt" ]; then
+    exit;
+fi
+
+length=$((${#searchDir}+3));
+length1=$((${#searchDir}+9));
+
+todb=`find $searchDir -maxdepth 1 -name "*.sql" -print |grep "\/mr"|sort -n --key=$length,$length1`
+
+for j in $todb; do
+_num=`echo $j|sed -r "s/.*sql_mr\/mr//"|sed -r "s/_.*//"|sed -r "s/^0*//g"`
+num=$(($_num));
+    if [[ $j =~ .*_mangos_.* ]]; then
+        dblastupdatemangos=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "SELECT r2_sd2_db_version FROM db_version")
+        if [[ $num -ge $dblastupdatemangos ]]; then
+            _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb "$j")
+            echo "Installed update "$j"  with rc="$_rc
+            newlastupdate=$(db_exec $mangoshost $mangosport $mangosuser $mangospass $mangosdb "UPDATE db_version SET r2_sd2_db_version='$num'")
+            dblastupdatemangos=$num;
+        fi
+    fi
+    if [[ $j =~ .*_scriptdev2_.* ]]; then
+        dblastupdatesd2=$(db_exec $sdhost $sdport $sduser $sdpass $sddb "SELECT r2_db_version FROM sd2_db_version")
+        if [[ $num -ge $dblastupdatesd2 ]]; then
+            _rc=$(db_run $charhost $sdport $sduser $sdpass $sddb "$j")
+            echo "Installed update "$j"  with rc="$_rc
+            newlastupdate=$(db_exec $sdhost $sdport $sduser $sdpass $sddb "UPDATE sd2_db_version SET r2_db_version='$num'")
+            dblastupdatesd2=$num;
+        fi
+    fi
+    count=$(($count+1));
+done;
+
+if [ $count -gt 0 ]; then
+    _rc=$(db_run $mangoshost $mangosport $mangosuser $mangospass $mangosdb  $searchDir"/last_mangos_sql_at_every_db_update.sql")
+fi
diff --git a/contrib/server_scripts/compile_r2.sh b/contrib/server_scripts/compile_r2.sh
new file mode 100755
index 00000000000..c2bcda9d246
--- /dev/null
+++ b/contrib/server_scripts/compile_r2.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+#
+
+cd ~/Mangos-Sources/mangos
+
+#patches=`find ./src/bindings/scriptdev2/patches -maxdepth 1 -name "*.patch"`
+patches=`find ../patches -maxdepth 1 -name "*.patch"`
+
+for j in $patches; do
+    echo "Apply patch : "$j
+    echo $(git apply <$j);
+    echo $?
+done
+
+echo "Do compile now";
+
+if [ ! -d ./build ]; then
+    echo "Reconfiguration...";
+    mkdir build
+    cd build
+    cmake \
+    -DACE_USE_EXTERNAL=1 \
+    -DUSE_STD_MALLOC=1 \
+    -DCMAKE_INSTALL_PREFIX=/home/mangos \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="-march=native -O2 -ggdb -pipe -D_LARGEFILE_SOURCE -frename-registers -fno-strict-aliasing -fno-strength-reduce -fno-delete-null-pointer-checks -finput-charset=utf-8 -fexec-charset=utf-8" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="-march=native -O2 -ggdb -pipe -D_LARGEFILE_SOURCE -frename-registers -fno-strict-aliasing -fno-strength-reduce -fno-delete-null-pointer-checks -finput-charset=utf-8 -fexec-charset=utf-8" \
+    -DPCH=1 \
+    ..
+else
+    cd build
+fi
+
+nice -15 make
+RETVAL=$?
+
+echo
+
+if [ $RETVAL -eq 0 ]; then
+    echo "Compiled fine!";
+    nice -15 make install
+    RETVAL=$?
+    if [ $RETVAL -eq 0 ]; then
+        echo "Installed OK!";
+        . ~/bin/auto_update.sh
+        . ~/bin/world_restart.sh
+    else
+        echo "Install ERROR!";
+    fi
+else
+    echo "Compilation ERROR!";
+fi
diff --git a/contrib/server_scripts/core_parser.sh b/contrib/server_scripts/core_parser.sh
new file mode 100644
index 00000000000..6f080ae75da
--- /dev/null
+++ b/contrib/server_scripts/core_parser.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+logfile=error_gdb.log;
+logtime=`date `;
+
+corefiles=`find ~/ -maxdepth 1 -name core*`
+for i in $corefiles; do
+echo "Crash time: $logtime " >> ~/$logfile
+gdb ~/bin/mangos-worldd -c $i -n --batch --command=~/bin/bt.sh >>~/$logfile
+rm $i
+done
diff --git a/contrib/server_scripts/opcode_parser.sh b/contrib/server_scripts/opcode_parser.sh
new file mode 100755
index 00000000000..fb18c9908d4
--- /dev/null
+++ b/contrib/server_scripts/opcode_parser.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+version="15952"
+_file=opcodes_mangos_$version.sql
+
+echo "-- Opcode table for client build $version" >./$_file
+echo "" >>./$_file
+echo 'CREATE TABLE IF NOT EXISTS `opcodes` (' >>./$_file
+echo '    `version` smallint(5) NOT NULL COMMENT "Client build",' >>./$_file
+echo '    `name` varchar(64) NOT NULL COMMENT "opcode name",' >>./$_file
+echo '    `value` int(10) NOT NULL COMMENT "opcode value",'>>./$_file
+echo '    `flags` int(10) unsigned NOT NULL DEFAULT "0" COMMENT "current opcode flags",' >>./$_file
+echo '    UNIQUE KEY `version` (`version`,`name`)' >>./$_file
+echo ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT="Universal opcode storage";' >>./$_file
+echo "" >>./$_file
+echo 'DELETE FROM `opcodes` WHERE `version` =' $version";" >>./$_file
+echo "" >>./$_file
+echo 'INSERT INTO `opcodes` (`name`, `value`, `version`, `flags`) VALUES' >>./$_file
+
+cat ./Opcodes.h |grep "^\ *.MSG"|sed 's/^\ */\(\"/'|sed 's/\ *= */\"\,/'|sed 's/ *\/.*$//'|sed "s/\,$/\,"$version"\,0\)\,/" >>./$_file
+echo '("NUM_MSG_TYPES",0x0,'$version',1);' >>./$_file
+
diff --git a/contrib/server_scripts/world.sh b/contrib/server_scripts/world.sh
new file mode 100755
index 00000000000..81c16335eb7
--- /dev/null
+++ b/contrib/server_scripts/world.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+lockfile=/var/lock/mangos
+cd ~
+while true; do
+    ulimit -c unlimited
+    ~/bin/core_parser.sh
+    logger -p user.warn -t mangos "Starting worldd realm 2..."
+    cat ~/log/worldd.log|grep ERROR >>~/log/error.log
+    ~/bin/mangos-worldd
+    rm -f ~/worldd.pid
+    [ ! -f $lockfile ] && break
+    screen -X hardcopy -h /home/mangos/log/dump/`date +%Y%m%d%H%M`dump.log
+    # send log by mail here
+    logger -p user.warn -t mangos " worldd stopped. Restarting..."
+    sleep 1
+done
diff --git a/contrib/server_scripts/world_restart.sh b/contrib/server_scripts/world_restart.sh
new file mode 100755
index 00000000000..367a699ce33
--- /dev/null
+++ b/contrib/server_scripts/world_restart.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+lockfile="/var/lock/mangos"
+
+if [ -f $lockfile ]; then
+   rm -f $lockfile
+fi
+
+expect ~/bin/mangos_cmd.exp .announce "Server shutdown after operation system request."
+sleep 1
+expect ~/bin/mangos_cmd.exp .server shutdown "60"
+
+    for (( i=1; $i<12; i++)); do
+    sleep 10
+    echo -n .
+    ps1=`ps -U mangos|grep worldd|sed 's/^ //'|sed 's/ .*//'`
+    [ -z "$ps1" ] && break
+    done
+
+echo
+if [ -f ~/worldd.pid ]; then
+    # Critical reboot
+    kill -9 $(ps -U mangos |grep worldd|sed 's/^ //'|sed 's/ .*//')
+fi
+
diff --git a/contrib/spell_dbc_extractor/README b/contrib/spell_dbc_extractor/README
new file mode 100644
index 00000000000..49c2170b346
--- /dev/null
+++ b/contrib/spell_dbc_extractor/README
@@ -0,0 +1,10 @@
+1. make work directory (ex. c:\sde)
+2. put all spell_dbc_extractor files to this directory
+3. extract and copy Spell.dbc to this directory
+
+enjoy, your may extract spells from command line, type 
+spell_dbc_extractor 55555 (enter)
+SQL files placed in this directory.
+
+PS require Net framework 3.5
+PPS default language for comment extract - 8 (russian). may change in XML.
diff --git a/contrib/spell_dbc_extractor/dbclayout.xml b/contrib/spell_dbc_extractor/dbclayout.xml
new file mode 100644
index 00000000000..d290b4c3a92
--- /dev/null
+++ b/contrib/spell_dbc_extractor/dbclayout.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0"?>
+<!-- $Id: dbclayout.xml 1 2011-07-55 21:39:18Z /dev/rsa $ -->
+<DBFilesClient>
+  <Spell build="12340">
+    <index>
+      <primary>Id</primary>
+    </index>
+    <field type="index" name="Id" method="read" />
+    <field type="uint" name="Category" method="read" />
+    <field type="uint" name="Dispel" method="read" />
+    <field type="uint" name="Mechanic" method="read" />
+    <field type="uint" name="Attributes" method="read" />
+    <field type="uint" name="AttributesEx" method="read" />
+    <field type="uint" name="AttributesEx2" method="read" />
+    <field type="uint" name="AttributesEx3" method="read" />
+    <field type="uint" name="AttributesEx4" method="read" />
+    <field type="uint" name="AttributesEx5" method="read" />
+    <field type="uint" name="AttributesEx6" method="read" />
+    <field type="uint" name="AttributesEx7" method="read" />
+    <field type="ulong" name="Stances" method="read" />
+    <field type="ulong" name="StancesNot" method="read" />
+    <field type="uint" name="Targets" method="read" />
+    <field type="uint" name="mtargetCreatureType" method="skip" />
+    <field type="uint" name="RequiresSpellFocus" method="read" />
+    <field type="uint" name="mfacingCasterFlags" method="skip" />
+    <field type="uint" name="CasterAuraState" method="read" />
+    <field type="uint" name="TargetAuraState" method="read" />
+    <field type="uint" name="CasterAuraStateNot" method="read" />
+    <field type="uint" name="TargetAuraStateNot" method="read" />
+    <field type="uint" name="CasterAuraSpell" method="read" />
+    <field type="uint" name="TargetAuraSpell" method="read" />
+    <field type="uint" name="ExcludeCasterAuraSpell" method="read" />
+    <field type="uint" name="ExcludeTargetAuraSpell" method="read" />
+    <field type="uint" name="CastingTimeIndex" method="read" />
+    <field type="uint" name="RecoveryTime" method="read" />
+    <field type="uint" name="CategoryRecoveryTime" method="read" />
+    <field type="uint" name="InterruptFlags" method="read" />
+    <field type="uint" name="AuraInterruptFlags" method="read" />
+    <field type="uint" name="mchannelInterruptFlags" method="skip" />
+    <field type="uint" name="ProcFlags" method="read" />
+    <field type="uint" name="ProcChance" method="read" />
+    <field type="uint" name="ProcCharges" method="read" />
+    <field type="uint" name="MaxLevel" method="read" />
+    <field type="uint" name="BaseLevel" method="read" />
+    <field type="uint" name="SpellLevel" method="read" />
+    <field type="uint" name="DurationIndex" method="read" />
+    <field type="int" name="PowerType" method="read" />
+    <field type="uint" name="ManaCost" method="read" />
+    <field type="uint" name="ManaCostPerLevel" method="read" />
+    <field type="uint" name="ManaPerSecond" method="read" />
+    <field type="uint" name="ManaPerSecondPerLevel" method="read" />
+    <field type="uint" name="RangeIndex" method="read" />
+    <field type="float" name="Speed" method="read" />
+    <field type="uint" name="mmodalNextSpell" method="skip" />
+    <field type="uint" name="StackAmount" method="read" />
+    <field type="uint" name="mtotem1" method="skip" />
+    <field type="uint" name="mtotem2" method="skip" />
+    <field type="int" name="mreagent1" method="skip" />
+    <field type="int" name="mreagent2" method="skip" />
+    <field type="int" name="mreagent3" method="skip" />
+    <field type="int" name="mreagent4" method="skip" />
+    <field type="int" name="mreagent5" method="skip" />
+    <field type="int" name="mreagent6" method="skip" />
+    <field type="int" name="mreagent7" method="skip" />
+    <field type="int" name="mreagent8" method="skip" />
+    <field type="int" name="mreagentCount1" method="skip" />
+    <field type="int" name="mreagentCount2" method="skip" />
+    <field type="int" name="mreagentCount3" method="skip" />
+    <field type="int" name="mreagentCount4" method="skip" />
+    <field type="int" name="mreagentCount5" method="skip" />
+    <field type="int" name="mreagentCount6" method="skip" />
+    <field type="int" name="mreagentCount7" method="skip" />
+    <field type="int" name="mreagentCount8" method="skip" />
+    <field type="int" name="EquippedItemClass" method="read" />
+    <field type="int" name="EquippedItemSubClassMask" method="read" />
+    <field type="int" name="EquippedItemInventoryTypeMask" method="read" />
+    <field type="uint" name="Effect1" method="read" />
+    <field type="uint" name="Effect2" method="read" />
+    <field type="uint" name="Effect3" method="read" />
+    <field type="int" name="EffectDieSides1" method="read" />
+    <field type="int" name="EffectDieSides2" method="read" />
+    <field type="int" name="EffectDieSides3" method="read" />
+    <field type="float" name="EffectRealPointsPerLevel1" method="read" />
+    <field type="float" name="EffectRealPointsPerLevel2" method="read" />
+    <field type="float" name="EffectRealPointsPerLevel3" method="read" />
+    <field type="int" name="EffectBasePoints1" method="read" />
+    <field type="int" name="EffectBasePoints2" method="read" />
+    <field type="int" name="EffectBasePoints3" method="read" />
+    <field type="uint" name="EffectMechanic1" method="read" />
+    <field type="uint" name="EffectMechanic2" method="read" />
+    <field type="uint" name="EffectMechanic3" method="read" />
+    <field type="uint" name="EffectImplicitTargetA1" method="read" />
+    <field type="uint" name="EffectImplicitTargetA2" method="read" />
+    <field type="uint" name="EffectImplicitTargetA3" method="read" />
+    <field type="uint" name="EffectImplicitTargetB1" method="read" />
+    <field type="uint" name="EffectImplicitTargetB2" method="read" />
+    <field type="uint" name="EffectImplicitTargetB3" method="read" />
+    <field type="uint" name="EffectRadiusIndex1" method="read" />
+    <field type="uint" name="EffectRadiusIndex2" method="read" />
+    <field type="uint" name="EffectRadiusIndex3" method="read" />
+    <field type="uint" name="EffectApplyAuraName1" method="read" />
+    <field type="uint" name="EffectApplyAuraName2" method="read" />
+    <field type="uint" name="EffectApplyAuraName3" method="read" />
+    <field type="uint" name="EffectAmplitude1" method="read" />
+    <field type="uint" name="EffectAmplitude2" method="read" />
+    <field type="uint" name="EffectAmplitude3" method="read" />
+    <field type="float" name="EffectMultipleValue1" method="read" />
+    <field type="float" name="EffectMultipleValue2" method="read" />
+    <field type="float" name="EffectMultipleValue3" method="read" />
+    <field type="uint" name="EffectChainTargets1" method="skip" />
+    <field type="uint" name="EffectChainTargets2" method="skip" />
+    <field type="uint" name="EffectChainTargets3" method="skip" />
+    <field type="uint" name="EffectItemType1" method="read" />
+    <field type="uint" name="EffectItemType2" method="read" />
+    <field type="uint" name="EffectItemType3" method="skip" />
+    <field type="int" name="EffectMiscValue1" method="read" />
+    <field type="int" name="EffectMiscValue2" method="read" />
+    <field type="int" name="EffectMiscValue3" method="read" />
+    <field type="int" name="EffectMiscValueB1" method="read" />
+    <field type="int" name="EffectMiscValueB2" method="read" />
+    <field type="int" name="EffectMiscValueB3" method="read" />
+    <field type="uint" name="EffectTriggerSpell1" method="read" />
+    <field type="uint" name="EffectTriggerSpell2" method="read" />
+    <field type="uint" name="EffectTriggerSpell3" method="read" />
+    <field type="float" name="EffectPointsPerCombo1" method="skip" />
+    <field type="float" name="EffectPointsPerCombo2" method="skip" />
+    <field type="float" name="EffectPointsPerCombo3" method="skip" />
+    <field type="uint" name="EffectSpellClassMaskA1" method="read" />
+    <field type="uint" name="EffectSpellClassMaskA2" method="read" />
+    <field type="uint" name="EffectSpellClassMaskA3" method="read" />
+    <field type="uint" name="EffectSpellClassMaskB1" method="read" />
+    <field type="uint" name="EffectSpellClassMaskB2" method="read" />
+    <field type="uint" name="EffectSpellClassMaskB3" method="read" />
+    <field type="uint" name="EffectSpellClassMaskC1" method="read" />
+    <field type="uint" name="EffectSpellClassMaskC2" method="read" />
+    <field type="uint" name="EffectSpellClassMaskC3" method="read" />
+    <field type="uint" name="mspellVisualID1" method="skip" />
+    <field type="uint" name="mspellVisualID2" method="skip" />
+    <field type="uint" name="SpellIconID" method="read" />
+    <field type="uint" name="mactiveIconID" method="skip" />
+    <field type="uint" name="mspellPriority" method="skip" />
+    <field type="comment" name="Comment" method="read" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="uint" name="mnameflag" method="skip" />
+    <field type="string" name="mnameSubtextlang1" method="skip" />
+    <field type="string" name="mnameSubtextlang2" method="skip" />
+    <field type="string" name="mnameSubtextlang3" method="skip" />
+    <field type="string" name="mnameSubtextlang4" method="skip" />
+    <field type="string" name="mnameSubtextlang5" method="skip" />
+    <field type="string" name="mnameSubtextlang6" method="skip" />
+    <field type="string" name="mnameSubtextlang7" method="skip" />
+    <field type="string" name="mnameSubtextlang8" method="skip" />
+    <field type="string" name="mnameSubtextlang9" method="skip" />
+    <field type="string" name="mnameSubtextlang10" method="skip" />
+    <field type="string" name="mnameSubtextlang11" method="skip" />
+    <field type="string" name="mnameSubtextlang12" method="skip" />
+    <field type="string" name="mnameSubtextlang13" method="skip" />
+    <field type="string" name="mnameSubtextlang14" method="skip" />
+    <field type="string" name="mnameSubtextlang15" method="skip" />
+    <field type="string" name="mnameSubtextlang16" method="skip" />
+    <field type="uint" name="mnameSubtextflag" method="skip" />
+    <field type="string" name="mdescriptionlang1" method="skip" />
+    <field type="string" name="mdescriptionlang2" method="skip" />
+    <field type="string" name="mdescriptionlang3" method="skip" />
+    <field type="string" name="mdescriptionlang4" method="skip" />
+    <field type="string" name="mdescriptionlang5" method="skip" />
+    <field type="string" name="mdescriptionlang6" method="skip" />
+    <field type="string" name="mdescriptionlang7" method="skip" />
+    <field type="string" name="mdescriptionlang8" method="skip" />
+    <field type="string" name="mdescriptionlang9" method="skip" />
+    <field type="string" name="mdescriptionlang10" method="skip" />
+    <field type="string" name="mdescriptionlang11" method="skip" />
+    <field type="string" name="mdescriptionlang12" method="skip" />
+    <field type="string" name="mdescriptionlang13" method="skip" />
+    <field type="string" name="mdescriptionlang14" method="skip" />
+    <field type="string" name="mdescriptionlang15" method="skip" />
+    <field type="string" name="mdescriptionlang16" method="skip" />
+    <field type="uint" name="mdescriptionflag" method="skip" />
+    <field type="string" name="mauraDescriptionlang1" method="skip" />
+    <field type="string" name="mauraDescriptionlang2" method="skip" />
+    <field type="string" name="mauraDescriptionlang3" method="skip" />
+    <field type="string" name="mauraDescriptionlang4" method="skip" />
+    <field type="string" name="mauraDescriptionlang5" method="skip" />
+    <field type="string" name="mauraDescriptionlang6" method="skip" />
+    <field type="string" name="mauraDescriptionlang7" method="skip" />
+    <field type="string" name="mauraDescriptionlang8" method="skip" />
+    <field type="string" name="mauraDescriptionlang9" method="skip" />
+    <field type="string" name="mauraDescriptionlang10" method="skip" />
+    <field type="string" name="mauraDescriptionlang11" method="skip" />
+    <field type="string" name="mauraDescriptionlang12" method="skip" />
+    <field type="string" name="mauraDescriptionlang13" method="skip" />
+    <field type="string" name="mauraDescriptionlang14" method="skip" />
+    <field type="string" name="mauraDescriptionlang15" method="skip" />
+    <field type="string" name="mauraDescriptionlang16" method="skip" />
+    <field type="uint" name="mauraDescriptionflag" method="skip" />
+    <field type="uint" name="ManaCostPercentage" method="read" />
+    <field type="uint" name="StartRecoveryCategory" method="read" />
+    <field type="uint" name="StartRecoveryTime" method="read" />
+    <field type="uint" name="MaxTargetLevel" method="read" />
+    <field type="uint" name="SpellFamilyName" method="read" />
+    <field type="uint" name="SpellFamilyFlags1" method="read" />
+    <field type="uint" name="SpellFamilyFlags2" method="read" />
+    <field type="uint" name="SpellFamilyFlags3" method="read" />
+    <field type="uint" name="MaxAffectedTargets" method="read" />
+    <field type="uint" name="DmgClass" method="read" />
+    <field type="uint" name="PreventionType" method="read" />
+    <field type="uint" name="mstanceBarOrder" method="skip" />
+    <field type="float" name="DmgMultiplier1" method="read" />
+    <field type="float" name="DmgMultiplier2" method="read" />
+    <field type="float" name="DmgMultiplier3" method="read" />
+    <field type="uint" name="mminFactionID" method="skip" />
+    <field type="uint" name="mminReputation" method="skip" />
+    <field type="uint" name="mrequiredAuraVision" method="skip" />
+    <field type="uint" name="mrequiredTotemCategoryID1" method="skip" />
+    <field type="uint" name="mrequiredTotemCategoryID2" method="skip" />
+    <field type="int" name="AreaGroupId" method="read" />
+    <field type="uint" name="SchoolMask" method="read" />
+    <field type="uint" name="RuneCostID" method="read" />
+    <field type="uint" name="mspellMissileID" method="skip" />
+    <field type="int" name="mpowerDisplayID" method="skip" />
+    <field type="float" name="munk11" method="skip" />
+    <field type="float" name="munk12" method="skip" />
+    <field type="float" name="munk13" method="skip" />
+    <field type="uint" name="mspellDescriptionVariableID" method="skip" />
+    <field type="uint" name="mspellDifficultyID" method="skip" />
+  </Spell>
+</DBFilesClient>
diff --git a/contrib/spell_dbc_extractor/spell_dbc_extractor.exe b/contrib/spell_dbc_extractor/spell_dbc_extractor.exe
new file mode 100644
index 00000000000..6090f35ccc0
Binary files /dev/null and b/contrib/spell_dbc_extractor/spell_dbc_extractor.exe differ
diff --git a/contrib/spell_dbc_extractor/src/BinaryReaderExtensions.cs b/contrib/spell_dbc_extractor/src/BinaryReaderExtensions.cs
new file mode 100644
index 00000000000..d3b7ef98e8d
--- /dev/null
+++ b/contrib/spell_dbc_extractor/src/BinaryReaderExtensions.cs
@@ -0,0 +1,184 @@
+using System;
+using System.Globalization;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace spell_dbc_extractor
+{
+    #region Coords3
+    /// <summary>
+    ///  Represents a coordinates of WoW object without orientation.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    struct Coords3
+    {
+        public float X, Y, Z;
+
+        /// <summary>
+        ///  Converts the numeric values of this instance to its equivalent string representations, separator is space.
+        /// </summary>
+        public string GetCoords()
+        {
+            string coords = String.Empty;
+
+            coords += X.ToString(CultureInfo.InvariantCulture);
+            coords += " ";
+            coords += Y.ToString(CultureInfo.InvariantCulture);
+            coords += " ";
+            coords += Z.ToString(CultureInfo.InvariantCulture);
+
+            return coords;
+        }
+    }
+    #endregion
+
+    #region Coords4
+    /// <summary>
+    ///  Represents a coordinates of WoW object with specified orientation.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    struct Coords4
+    {
+        public float X, Y, Z, O;
+
+        /// <summary>
+        ///  Converts the numeric values of this instance to its equivalent string representations, separator is space.
+        /// </summary>
+        public string GetCoordsAsString()
+        {
+            string coords = String.Empty;
+
+            coords += X.ToString(CultureInfo.InvariantCulture);
+            coords += " ";
+            coords += Y.ToString(CultureInfo.InvariantCulture);
+            coords += " ";
+            coords += Z.ToString(CultureInfo.InvariantCulture);
+            coords += " ";
+            coords += O.ToString(CultureInfo.InvariantCulture);
+
+            return coords;
+        }
+    }
+    #endregion
+
+    static class BinaryReaderExtensions
+    {
+        public static BinaryReader FromFile(string fileName)
+        {
+            return new BinaryReader(new FileStream(fileName, FileMode.Open), Encoding.UTF8);
+        }
+
+        #region ReadPackedGuid
+        /// <summary>
+        ///  Reads the packed guid from the current stream and advances the current position of the stream by packed guid size.
+        /// </summary>
+        public static ulong ReadPackedGuid(this BinaryReader reader)
+        {
+            ulong res = 0;
+            byte mask = reader.ReadByte();
+
+            if (mask == 0)
+                return res;
+
+            int i = 0;
+
+            while (i < 9)
+            {
+                if ((mask & 1 << i) != 0)
+                    res += (ulong)reader.ReadByte() << (i * 8);
+                i++;
+            }
+            return res;
+        }
+        #endregion
+
+        #region ReadStringNumber
+        /// <summary>
+        ///  Reads the string with known length from the current stream and advances the current position of the stream by string length.
+        /// <seealso cref="GenericReader.ReadStringNull"/>
+        /// </summary>
+        public static string ReadStringNumber(this BinaryReader reader)
+        {
+            string text = String.Empty;
+            uint num = reader.ReadUInt32(); // string length
+
+            for (uint i = 0; i < num; i++)
+            {
+                text += (char)reader.ReadByte();
+            }
+            return text;
+        }
+        #endregion
+
+        #region ReadStringNull
+        /// <summary>
+        ///  Reads the NULL terminated string from the current stream and advances the current position of the stream by string length + 1.
+        /// <seealso cref="GenericReader.ReadStringNumber"/>
+        /// </summary>
+        public static string ReadStringNull(this BinaryReader reader)
+        {
+            byte num;
+            string text = String.Empty;
+            System.Collections.Generic.List<byte> temp = new System.Collections.Generic.List<byte>();
+
+            while ((num = reader.ReadByte()) != 0)
+                temp.Add(num);
+
+            text = Encoding.UTF8.GetString(temp.ToArray());
+
+            return text;
+        }
+        #endregion
+
+        #region ReadCoords3
+        /// <summary>
+        ///  Reads the object coordinates from the current stream and advances the current position of the stream by 12 bytes.
+        /// </summary>
+        public static Coords3 ReadCoords3(this BinaryReader reader)
+        {
+            Coords3 v;
+
+            v.X = reader.ReadSingle();
+            v.Y = reader.ReadSingle();
+            v.Z = reader.ReadSingle();
+
+            return v;
+        }
+        #endregion
+
+        #region ReadCoords4
+        /// <summary>
+        ///  Reads the object coordinates and orientation from the current stream and advances the current position of the stream by 16 bytes.
+        /// </summary>
+        public static Coords4 ReadCoords4(this BinaryReader reader)
+        {
+            Coords4 v;
+
+            v.X = reader.ReadSingle();
+            v.Y = reader.ReadSingle();
+            v.Z = reader.ReadSingle();
+            v.O = reader.ReadSingle();
+
+            return v;
+        }
+        #endregion
+
+        #region ReadStruct
+        /// <summary>
+        /// Reads struct from the current stream and advances the current position if the stream by SizeOf(T) bytes.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="binReader"></param>
+        /// <returns></returns>
+        public static T ReadStruct<T>(this BinaryReader reader) where T : struct
+        {
+            byte[] rawData = reader.ReadBytes(Marshal.SizeOf(typeof(T)));
+            GCHandle handle = GCHandle.Alloc(rawData, GCHandleType.Pinned);
+            T returnObject = (T)Marshal.PtrToStructure(handle.AddrOfPinnedObject(), typeof(T));
+            handle.Free();
+            return returnObject;
+        }
+        #endregion
+    }
+}
diff --git a/contrib/spell_dbc_extractor/src/DB2Reader.cs b/contrib/spell_dbc_extractor/src/DB2Reader.cs
new file mode 100644
index 00000000000..7da9e9dd3d5
--- /dev/null
+++ b/contrib/spell_dbc_extractor/src/DB2Reader.cs
@@ -0,0 +1,83 @@
+using System;
+using System.IO;
+using System.Text;
+
+namespace spell_dbc_extractor
+{
+    class DB2Reader : IWowClientDBReader
+    {
+        private const int HeaderSize = 48;
+        private const uint DB2FmtSig = 0x32424457;          // WDB2
+        private const uint ADBFmtSig = 0x32484357;          // WCH2
+
+        public int RecordsCount { get; private set; }
+        public int FieldsCount { get; private set; }
+        public int RecordSize { get; private set; }
+        public int StringTableSize { get; private set; }
+
+        public StringTable StringTable { get; private set; }
+
+        private byte[][] m_rows;
+
+        public BinaryReader this[int row]
+        {
+            get { return new BinaryReader(new MemoryStream(m_rows[row]), Encoding.UTF8); }
+        }
+
+        public DB2Reader(string fileName)
+        {
+            using (var reader = BinaryReaderExtensions.FromFile(fileName))
+            {
+                if (reader.BaseStream.Length < HeaderSize)
+                {
+                    Console.WriteLine("File {0} is corrupted!", fileName);
+                    return;
+                }
+
+                var signature = reader.ReadUInt32();
+
+                if (signature != DB2FmtSig && signature != ADBFmtSig)
+                {
+                    Console.WriteLine("File {0} isn't valid DBC file!", fileName);
+                    return;
+                }
+
+                RecordsCount = reader.ReadInt32();
+                FieldsCount = reader.ReadInt32(); // not fields count in WCH2
+                RecordSize = reader.ReadInt32();
+                StringTableSize = reader.ReadInt32();
+
+                // WDB2/WCH2 specific fields
+                uint tableHash = reader.ReadUInt32(); // new field in WDB2
+                uint build = reader.ReadUInt32(); // new field in WDB2
+
+                int unk1 = reader.ReadInt32(); // new field in WDB2 (Unix time in WCH2)
+                int unk2 = reader.ReadInt32(); // new field in WDB2
+                int unk3 = reader.ReadInt32(); // new field in WDB2 (index table?)
+                int locale = reader.ReadInt32(); // new field in WDB2
+                int unk5 = reader.ReadInt32(); // new field in WDB2
+
+                if (unk3 != 0)
+                {
+                    reader.ReadBytes(unk3 * 4 - HeaderSize);     // an index for rows
+                    reader.ReadBytes(unk3 * 2 - HeaderSize * 2); // a memory allocation bank
+                }
+
+                m_rows = new byte[RecordsCount][];
+
+                for (int i = 0; i < RecordsCount; i++)
+                    m_rows[i] = reader.ReadBytes(RecordSize);
+
+                int stringTableStart = (int)reader.BaseStream.Position;
+
+                StringTable = new StringTable();
+
+                while (reader.BaseStream.Position != reader.BaseStream.Length)
+                {
+                    int index = (int)reader.BaseStream.Position - stringTableStart;
+                    StringTable[index] = reader.ReadStringNull();
+                }
+            }
+        }
+    }
+}
diff --git a/contrib/spell_dbc_extractor/src/DBCReader.cs b/contrib/spell_dbc_extractor/src/DBCReader.cs
new file mode 100644
index 00000000000..2eda03c2cdb
--- /dev/null
+++ b/contrib/spell_dbc_extractor/src/DBCReader.cs
@@ -0,0 +1,64 @@
+using System;
+using System.IO;
+using System.Text;
+
+namespace spell_dbc_extractor
+{
+    class DBCReader : IWowClientDBReader
+    {
+        private const uint HeaderSize = 20;
+        private const uint DBCFmtSig = 0x43424457;          // WDBC
+
+        public int RecordsCount { get; private set; }
+        public int FieldsCount { get; private set; }
+        public int RecordSize { get; private set; }
+        public int StringTableSize { get; private set; }
+
+        public StringTable StringTable { get; private set; }
+
+        private byte[][] m_rows;
+
+        public BinaryReader this[int row]
+        {
+            get { return new BinaryReader(new MemoryStream(m_rows[row]), Encoding.UTF8); }
+        }
+
+        public DBCReader(string fileName)
+        {
+            using (var reader = BinaryReaderExtensions.FromFile(fileName))
+            {
+                if (reader.BaseStream.Length < HeaderSize)
+                {
+                    Console.WriteLine("File {0} is corrupted!", fileName);
+                    return;
+                }
+
+                if (reader.ReadUInt32() != DBCFmtSig)
+                {
+                    Console.WriteLine("File {0} isn't valid DBC file!", fileName);
+                    return;
+                }
+
+                RecordsCount = reader.ReadInt32();
+                FieldsCount = reader.ReadInt32();
+                RecordSize = reader.ReadInt32();
+                StringTableSize = reader.ReadInt32();
+
+                m_rows = new byte[RecordsCount][];
+
+                for (int i = 0; i < RecordsCount; i++)
+                    m_rows[i] = reader.ReadBytes(RecordSize);
+
+                int stringTableStart = (int)reader.BaseStream.Position;
+
+                StringTable = new StringTable();
+
+                while (reader.BaseStream.Position != reader.BaseStream.Length)
+                {
+                    int index = (int)reader.BaseStream.Position - stringTableStart;
+                    StringTable[index] = reader.ReadStringNull();
+                }
+            }
+        }
+    }
+}
diff --git a/contrib/spell_dbc_extractor/src/IWowClientDBReader.cs b/contrib/spell_dbc_extractor/src/IWowClientDBReader.cs
new file mode 100644
index 00000000000..bcfb9e85fee
--- /dev/null
+++ b/contrib/spell_dbc_extractor/src/IWowClientDBReader.cs
@@ -0,0 +1,14 @@
+using System.IO;
+
+namespace spell_dbc_extractor
+{
+    interface IWowClientDBReader
+    {
+        int RecordsCount { get; }
+        int FieldsCount { get; }
+        int RecordSize { get; }
+        int StringTableSize { get; }
+        StringTable StringTable { get; }
+        BinaryReader this[int row] { get; }
+    }
+}
diff --git a/contrib/spell_dbc_extractor/src/Program.cs b/contrib/spell_dbc_extractor/src/Program.cs
new file mode 100644
index 00000000000..0a95cf594ac
--- /dev/null
+++ b/contrib/spell_dbc_extractor/src/Program.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+
+namespace spell_dbc_extractor
+{
+    class Program
+    {
+        static IWowClientDBReader m_reader;
+        static XmlDocument m_definitions;
+        static string DBCName;
+
+        static void Main(string[] args)
+        {
+            Console.WriteLine("Spell.dbc to spell_dbc extractor based on code from TOM_RUS (http://mywowtools.googlecode.com/svn/trunk)");
+            if (args.Length < 1)
+            {
+                Console.WriteLine("Please specify spell number!");
+                Console.WriteLine("example: spell_dbc_extractor Spell.dbc 7744");
+                return;
+            }
+
+            string fileName = "Spell.dbc";
+            uint    spellNum = Convert.ToUInt32(args[0]);
+            bool found = false;
+
+            if (!File.Exists(fileName))
+            {
+                Console.WriteLine("File {0} doesn't exist. Put {0} in work directory!", fileName);
+                return;
+            }
+
+            LoadDefinitions();
+
+            if (Path.GetExtension(fileName).ToLowerInvariant() == ".dbc")
+                m_reader = new DBCReader(fileName);
+            else
+                m_reader = new DB2Reader(fileName);
+
+            Console.WriteLine("Records: {0}, Fields: {1}, Row Size {2}, String Table Size: {3}", m_reader.RecordsCount, m_reader.FieldsCount, m_reader.RecordSize, m_reader.StringTableSize);
+
+            DBCName = Path.GetFileNameWithoutExtension(fileName);
+
+            XmlElement definition = m_definitions["DBFilesClient"][DBCName];
+
+            if (definition == null)
+            {
+                Console.WriteLine("Definition for file {0} not found! File name is case sensitive!", fileName);
+                return;
+            }
+
+            XmlNodeList fields = definition.GetElementsByTagName("field");
+            XmlNodeList indexes = definition.GetElementsByTagName("index");
+            string _comment = "";
+            
+            for (int i = 0; i < m_reader.RecordsCount; ++i)
+            {
+                BinaryReader reader = m_reader[i];
+                StringBuilder result = new StringBuilder();
+                result.Append("VALUES (");
+                
+                int flds = 0;
+                int recordIndex = 0;
+                
+                foreach (XmlElement field in fields)
+                {
+                    var status = field.Attributes["method"].Value;
+
+                    if (status != "skip")
+                    {
+                        if (flds > 0)
+                        {
+                            result.Append(", ");
+                        }
+
+                        switch (field.Attributes["type"].Value)
+                        {
+                            case "index":
+                                recordIndex = reader.ReadInt32();
+                                result.Append(recordIndex);
+                                break;
+                            case "long":
+                                result.Append(reader.ReadInt64());
+                                break;
+                            case "ulong":
+                                result.Append(reader.ReadUInt64());
+                                break;
+                            case "int":
+                                result.Append(reader.ReadInt32());
+                                break;
+                            case "uint":
+                                result.Append(reader.ReadUInt32());
+                                break;
+                            case "short":
+                                result.Append(reader.ReadInt16());
+                                break;
+                            case "ushort":
+                                result.Append(reader.ReadUInt16());
+                                break;
+                            case "sbyte":
+                                result.Append(reader.ReadSByte());
+                                break;
+                            case "byte":
+                                result.Append(reader.ReadByte());
+                                break;
+                            case "float":
+                                result.Append(reader.ReadSingle().ToString(CultureInfo.InvariantCulture));
+                                break;
+                            case "double":
+                                result.Append(reader.ReadDouble().ToString(CultureInfo.InvariantCulture));
+                                break;
+                            case "string":
+                                result.Append("\"" + StripBadCharacters(m_reader.StringTable[reader.ReadInt32()]) + "\"");
+                                break;
+                            case "comment":
+                                _comment = "\"" + StripBadCharacters(m_reader.StringTable[reader.ReadInt32()]) + "\"";
+                                result.Append(_comment);
+                                break;
+                            default:
+                                throw new Exception(String.Format("Unknown field type {0}!", field.Attributes["type"].Value));
+                        }
+                        flds++;
+                    }
+                    else
+                    {
+                        switch (field.Attributes["type"].Value)
+                        {
+                            case "uint":
+                            case "index":
+                            case "int":
+                                reader.ReadInt32();
+                                break;
+                            case "long":
+                            case "ulong":
+                                reader.ReadInt64();
+                                break;
+                            case "short":
+                            case "ushort":
+                                reader.ReadUInt16();
+                                break;
+                            case "sbyte":
+                                reader.ReadSByte();
+                                break;
+                            case "byte":
+                                reader.ReadByte();
+                                break;
+                            case "float":
+                                reader.ReadSingle();
+                                break;
+                            case "double":
+                                reader.ReadDouble();
+                                break;
+                            case "string":
+                            case "comment":
+                                StripBadCharacters(m_reader.StringTable[reader.ReadInt32()]);
+                                break;
+                            default:
+                                throw new Exception(String.Format("Unknown field type {0}!", field.Attributes["type"].Value));
+                        }
+                    }
+                }
+                result.Append(" );");
+                
+                if (recordIndex == spellNum)
+                {
+                    StreamWriter sqlWriter = new StreamWriter("mr9999_mangos_spell_" + spellNum + "_override.sql");
+                    sqlWriter.Write("-- Produced by spell_dbc_extractor by /dev/rsa based on code from TOM_RUS \n");
+                    sqlWriter.Write("-- Replace DBC values for spell {0} - {1} \n",spellNum,_comment);
+                    sqlWriter.Write("-- \n");
+                    sqlWriter.Write("DELETE FROM `spell_dbc` WHERE `Id` = {0};\n", spellNum);
+                    sqlWriter.Write("INSERT INTO `spell_dbc` \n");
+                    WriteSqlHeader(sqlWriter, fileName, fields, indexes);
+                    sqlWriter.Write(result);
+                    sqlWriter.Write("\n\n");
+                    sqlWriter.Write("-- Put there corrects for spell data values in readable form (example below) \n" );
+                    sqlWriter.Write("-- UPDATE `spell_dbc` SET \n");
+                    sqlWriter.Write("-- `Mechanic` = 0, \n");
+                    sqlWriter.Write("-- `Comment` = \'Replacement for spell {0} ({1})\' \n",spellNum, _comment);
+                    sqlWriter.Write("-- WHERE `Id` = {0};\n\n", spellNum);
+                    
+                    found = true;            
+                    Console.WriteLine("Found spell {0} - {1}, write to SQL...",spellNum, _comment);
+                    sqlWriter.Flush();
+                    sqlWriter.Close();
+                    break;
+                }
+
+                reader.Close();
+            }
+
+            
+            if (!found)
+            {
+                Console.WriteLine("Error: NOT Found spell {0} in dbc file.", spellNum);
+            }
+        }
+
+        static void LoadDefinitions()
+        {
+            Console.WriteLine("Loading XML configuration file...");
+            m_definitions = new XmlDocument();
+            m_definitions.Load("dbclayout.xml");
+            Console.WriteLine("Done!");
+        }
+
+        static void WriteSqlHeader(StreamWriter sqlWriter, string fileName, XmlNodeList fields, XmlNodeList indexes)
+        {
+            int flds = 0;
+            sqlWriter.Write("( ");
+            foreach (XmlElement field in fields)
+            {
+                var status = field.Attributes["method"].Value;
+                if (status != "skip")
+                {
+                    if (flds > 0)
+                    {
+                        sqlWriter.Write(", ");
+                    }
+                    sqlWriter.Write(String.Format("`{0}`", field.Attributes["name"].Value));
+                    
+                    flds++;
+                }
+            }
+            sqlWriter.Write(" )\n");
+            
+        }
+
+        static string StripBadCharacters(string input)
+        {
+            input = Regex.Replace(input, @"'", @"\'");
+            input = Regex.Replace(input, @"\""", @"\""");
+            return input;
+        }
+    }
+}
diff --git a/contrib/spell_dbc_extractor/src/Properties/AssemblyInfo.cs b/contrib/spell_dbc_extractor/src/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..641fb81d45f
--- /dev/null
+++ b/contrib/spell_dbc_extractor/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("spell_dbc_extractor")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("spell_dbc_extractor")]
+[assembly: AssemblyCopyright("Copyright © /dev/rsa 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("a7f16b05-94d6-47b1-9f93-7a47eaf26248")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.0.0.1")]
+[assembly: AssemblyFileVersion("0.0.0.12")]
diff --git a/contrib/spell_dbc_extractor/src/StringTable.cs b/contrib/spell_dbc_extractor/src/StringTable.cs
new file mode 100644
index 00000000000..ac72b77791a
--- /dev/null
+++ b/contrib/spell_dbc_extractor/src/StringTable.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+
+namespace spell_dbc_extractor
+{
+    class StringTable : Dictionary<int, string>
+    {
+        public StringTable()
+            : base()
+        {
+        }
+
+        public new string this[int offset]
+        {
+            get { return base[offset]; }
+            set { base[offset] = value; }
+        }
+    }
+}
diff --git a/contrib/spell_dbc_extractor/src/dbclayout.xml b/contrib/spell_dbc_extractor/src/dbclayout.xml
new file mode 100644
index 00000000000..faa656fff58
--- /dev/null
+++ b/contrib/spell_dbc_extractor/src/dbclayout.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0"?>
+<!-- $Id: dbclayout.xml 1 2011-07-55 21:39:18Z /dev/rsa $ -->
+<DBFilesClient>
+  <Spell build="12340">
+    <index>
+      <primary>Id</primary>
+    </index>
+    <field type="index" name="Id" method="read" />
+    <field type="uint" name="Category" method="read" />
+    <field type="uint" name="Dispel" method="read" />
+    <field type="uint" name="Mechanic" method="read" />
+    <field type="uint" name="Attributes" method="read" />
+    <field type="uint" name="AttributesEx" method="read" />
+    <field type="uint" name="AttributesEx2" method="read" />
+    <field type="uint" name="AttributesEx3" method="read" />
+    <field type="uint" name="AttributesEx4" method="read" />
+    <field type="uint" name="AttributesEx5" method="read" />
+    <field type="uint" name="AttributesEx6" method="read" />
+    <field type="uint" name="AttributesEx7" method="read" />
+    <field type="ulong" name="Stances" method="read" />
+    <field type="ulong" name="StancesNot" method="read" />
+    <field type="uint" name="Targets" method="read" />
+    <field type="uint" name="mtargetCreatureType" method="skip" />
+    <field type="uint" name="mrequiresSpellFocus" method="skip" />
+    <field type="uint" name="mfacingCasterFlags" method="skip" />
+    <field type="uint" name="mcasterAuraState" method="skip" />
+    <field type="uint" name="mtargetAuraState" method="skip" />
+    <field type="uint" name="mexcludeCasterAuraState" method="skip" />
+    <field type="uint" name="mexcludeTargetAuraState" method="skip" />
+    <field type="uint" name="CasterAuraSpell" method="read" />
+    <field type="uint" name="TargetAuraSpell" method="read" />
+    <field type="uint" name="ExcludeCasterAuraSpell" method="read" />
+    <field type="uint" name="ExcludeTargetAuraSpell" method="read" />
+    <field type="uint" name="CastingTimeIndex" method="read" />
+    <field type="uint" name="mrecoveryTime" method="skip" />
+    <field type="uint" name="mcategoryRecoveryTime" method="skip" />
+    <field type="uint" name="minterruptFlags" method="skip" />
+    <field type="uint" name="AuraInterruptFlags" method="read" />
+    <field type="uint" name="mchannelInterruptFlags" method="skip" />
+    <field type="uint" name="ProcFlags" method="read" />
+    <field type="uint" name="ProcChance" method="read" />
+    <field type="uint" name="ProcCharges" method="read" />
+    <field type="uint" name="MaxLevel" method="read" />
+    <field type="uint" name="BaseLevel" method="read" />
+    <field type="uint" name="SpellLevel" method="read" />
+    <field type="uint" name="DurationIndex" method="read" />
+    <field type="int" name="mpowerType" method="skip" />
+    <field type="uint" name="mmanaCost" method="skip" />
+    <field type="uint" name="mmanaCostPerLevel" method="skip" />
+    <field type="uint" name="mmanaPerSecond" method="skip" />
+    <field type="uint" name="mmanaPerSecondPerLevel" method="skip" />
+    <field type="uint" name="RangeIndex" method="read" />
+    <field type="float" name="mspeed" method="skip" />
+    <field type="uint" name="mmodalNextSpell" method="skip" />
+    <field type="uint" name="StackAmount" method="read" />
+    <field type="uint" name="mtotem1" method="skip" />
+    <field type="uint" name="mtotem2" method="skip" />
+    <field type="int" name="mreagent1" method="skip" />
+    <field type="int" name="mreagent2" method="skip" />
+    <field type="int" name="mreagent3" method="skip" />
+    <field type="int" name="mreagent4" method="skip" />
+    <field type="int" name="mreagent5" method="skip" />
+    <field type="int" name="mreagent6" method="skip" />
+    <field type="int" name="mreagent7" method="skip" />
+    <field type="int" name="mreagent8" method="skip" />
+    <field type="int" name="mreagentCount1" method="skip" />
+    <field type="int" name="mreagentCount2" method="skip" />
+    <field type="int" name="mreagentCount3" method="skip" />
+    <field type="int" name="mreagentCount4" method="skip" />
+    <field type="int" name="mreagentCount5" method="skip" />
+    <field type="int" name="mreagentCount6" method="skip" />
+    <field type="int" name="mreagentCount7" method="skip" />
+    <field type="int" name="mreagentCount8" method="skip" />
+    <field type="int" name="EquippedItemClass" method="read" />
+    <field type="int" name="EquippedItemSubClassMask" method="read" />
+    <field type="int" name="EquippedItemInventoryTypeMask" method="read" />
+    <field type="uint" name="Effect1" method="read" />
+    <field type="uint" name="Effect2" method="read" />
+    <field type="uint" name="Effect3" method="read" />
+    <field type="int" name="EffectDieSides1" method="read" />
+    <field type="int" name="EffectDieSides2" method="read" />
+    <field type="int" name="EffectDieSides3" method="read" />
+    <field type="float" name="EffectRealPointsPerLevel1" method="read" />
+    <field type="float" name="EffectRealPointsPerLevel2" method="read" />
+    <field type="float" name="EffectRealPointsPerLevel3" method="read" />
+    <field type="int" name="EffectBasePoints1" method="read" />
+    <field type="int" name="EffectBasePoints2" method="read" />
+    <field type="int" name="EffectBasePoints3" method="read" />
+    <field type="uint" name="EffectMechanic1" method="read" />
+    <field type="uint" name="EffectMechanic2" method="read" />
+    <field type="uint" name="EffectMechanic3" method="read" />
+    <field type="uint" name="EffectImplicitTargetA1" method="read" />
+    <field type="uint" name="EffectImplicitTargetA2" method="read" />
+    <field type="uint" name="EffectImplicitTargetA3" method="read" />
+    <field type="uint" name="EffectImplicitTargetB1" method="read" />
+    <field type="uint" name="EffectImplicitTargetB2" method="read" />
+    <field type="uint" name="EffectImplicitTargetB3" method="read" />
+    <field type="uint" name="EffectRadiusIndex1" method="read" />
+    <field type="uint" name="EffectRadiusIndex2" method="read" />
+    <field type="uint" name="EffectRadiusIndex3" method="read" />
+    <field type="uint" name="EffectApplyAuraName1" method="read" />
+    <field type="uint" name="EffectApplyAuraName2" method="read" />
+    <field type="uint" name="EffectApplyAuraName3" method="read" />
+    <field type="uint" name="EffectAmplitude1" method="read" />
+    <field type="uint" name="EffectAmplitude2" method="read" />
+    <field type="uint" name="EffectAmplitude3" method="read" />
+    <field type="float" name="EffectMultipleValue1" method="read" />
+    <field type="float" name="EffectMultipleValue2" method="read" />
+    <field type="float" name="EffectMultipleValue3" method="read" />
+    <field type="uint" name="EffectChainTargets1" method="skip" />
+    <field type="uint" name="EffectChainTargets2" method="skip" />
+    <field type="uint" name="EffectChainTargets3" method="skip" />
+    <field type="uint" name="EffectItemType1" method="skip" />
+    <field type="uint" name="EffectItemType2" method="skip" />
+    <field type="uint" name="EffectItemType3" method="skip" />
+    <field type="int" name="EffectMiscValue1" method="read" />
+    <field type="int" name="EffectMiscValue2" method="read" />
+    <field type="int" name="EffectMiscValue3" method="read" />
+    <field type="int" name="EffectMiscValueB1" method="read" />
+    <field type="int" name="EffectMiscValueB2" method="read" />
+    <field type="int" name="EffectMiscValueB3" method="read" />
+    <field type="uint" name="EffectTriggerSpell1" method="read" />
+    <field type="uint" name="EffectTriggerSpell2" method="read" />
+    <field type="uint" name="EffectTriggerSpell3" method="read" />
+    <field type="float" name="EffectPointsPerCombo1" method="skip" />
+    <field type="float" name="EffectPointsPerCombo2" method="skip" />
+    <field type="float" name="EffectPointsPerCombo3" method="skip" />
+    <field type="uint" name="EffectSpellClassMaskA1" method="read" />
+    <field type="uint" name="EffectSpellClassMaskA2" method="read" />
+    <field type="uint" name="EffectSpellClassMaskA3" method="read" />
+    <field type="uint" name="EffectSpellClassMaskB1" method="read" />
+    <field type="uint" name="EffectSpellClassMaskB2" method="read" />
+    <field type="uint" name="EffectSpellClassMaskB3" method="read" />
+    <field type="uint" name="EffectSpellClassMaskC1" method="read" />
+    <field type="uint" name="EffectSpellClassMaskC2" method="read" />
+    <field type="uint" name="EffectSpellClassMaskC3" method="read" />
+    <field type="uint" name="mspellVisualID1" method="skip" />
+    <field type="uint" name="mspellVisualID2" method="skip" />
+    <field type="uint" name="SpellIconID" method="read" />
+    <field type="uint" name="mactiveIconID" method="skip" />
+    <field type="uint" name="mspellPriority" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="comment" name="Comment" method="read" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="string" name="Comment" method="skip" />
+    <field type="uint" name="mnameflag" method="skip" />
+    <field type="string" name="mnameSubtextlang1" method="skip" />
+    <field type="string" name="mnameSubtextlang2" method="skip" />
+    <field type="string" name="mnameSubtextlang3" method="skip" />
+    <field type="string" name="mnameSubtextlang4" method="skip" />
+    <field type="string" name="mnameSubtextlang5" method="skip" />
+    <field type="string" name="mnameSubtextlang6" method="skip" />
+    <field type="string" name="mnameSubtextlang7" method="skip" />
+    <field type="string" name="mnameSubtextlang8" method="skip" />
+    <field type="string" name="mnameSubtextlang9" method="skip" />
+    <field type="string" name="mnameSubtextlang10" method="skip" />
+    <field type="string" name="mnameSubtextlang11" method="skip" />
+    <field type="string" name="mnameSubtextlang12" method="skip" />
+    <field type="string" name="mnameSubtextlang13" method="skip" />
+    <field type="string" name="mnameSubtextlang14" method="skip" />
+    <field type="string" name="mnameSubtextlang15" method="skip" />
+    <field type="string" name="mnameSubtextlang16" method="skip" />
+    <field type="uint" name="mnameSubtextflag" method="skip" />
+    <field type="string" name="mdescriptionlang1" method="skip" />
+    <field type="string" name="mdescriptionlang2" method="skip" />
+    <field type="string" name="mdescriptionlang3" method="skip" />
+    <field type="string" name="mdescriptionlang4" method="skip" />
+    <field type="string" name="mdescriptionlang5" method="skip" />
+    <field type="string" name="mdescriptionlang6" method="skip" />
+    <field type="string" name="mdescriptionlang7" method="skip" />
+    <field type="string" name="mdescriptionlang8" method="skip" />
+    <field type="string" name="mdescriptionlang9" method="skip" />
+    <field type="string" name="mdescriptionlang10" method="skip" />
+    <field type="string" name="mdescriptionlang11" method="skip" />
+    <field type="string" name="mdescriptionlang12" method="skip" />
+    <field type="string" name="mdescriptionlang13" method="skip" />
+    <field type="string" name="mdescriptionlang14" method="skip" />
+    <field type="string" name="mdescriptionlang15" method="skip" />
+    <field type="string" name="mdescriptionlang16" method="skip" />
+    <field type="uint" name="mdescriptionflag" method="skip" />
+    <field type="string" name="mauraDescriptionlang1" method="skip" />
+    <field type="string" name="mauraDescriptionlang2" method="skip" />
+    <field type="string" name="mauraDescriptionlang3" method="skip" />
+    <field type="string" name="mauraDescriptionlang4" method="skip" />
+    <field type="string" name="mauraDescriptionlang5" method="skip" />
+    <field type="string" name="mauraDescriptionlang6" method="skip" />
+    <field type="string" name="mauraDescriptionlang7" method="skip" />
+    <field type="string" name="mauraDescriptionlang8" method="skip" />
+    <field type="string" name="mauraDescriptionlang9" method="skip" />
+    <field type="string" name="mauraDescriptionlang10" method="skip" />
+    <field type="string" name="mauraDescriptionlang11" method="skip" />
+    <field type="string" name="mauraDescriptionlang12" method="skip" />
+    <field type="string" name="mauraDescriptionlang13" method="skip" />
+    <field type="string" name="mauraDescriptionlang14" method="skip" />
+    <field type="string" name="mauraDescriptionlang15" method="skip" />
+    <field type="string" name="mauraDescriptionlang16" method="skip" />
+    <field type="uint" name="mauraDescriptionflag" method="skip" />
+    <field type="uint" name="mmanaCostPct" method="skip" />
+    <field type="uint" name="mstartRecoveryCategory" method="skip" />
+    <field type="uint" name="mstartRecoveryTime" method="skip" />
+    <field type="uint" name="MaxTargetLevel" method="read" />
+    <field type="uint" name="SpellFamilyName" method="read" />
+    <field type="uint" name="SpellFamilyFlags1" method="read" />
+    <field type="uint" name="SpellFamilyFlags2" method="read" />
+    <field type="uint" name="SpellFamilyFlags3" method="read" />
+    <field type="uint" name="MaxAffectedTargets" method="read" />
+    <field type="uint" name="DmgClass" method="read" />
+    <field type="uint" name="PreventionType" method="read" />
+    <field type="uint" name="mstanceBarOrder" method="skip" />
+    <field type="float" name="DmgMultiplier1" method="read" />
+    <field type="float" name="DmgMultiplier2" method="read" />
+    <field type="float" name="DmgMultiplier3" method="read" />
+    <field type="uint" name="mminFactionID" method="skip" />
+    <field type="uint" name="mminReputation" method="skip" />
+    <field type="uint" name="mrequiredAuraVision" method="skip" />
+    <field type="uint" name="mrequiredTotemCategoryID1" method="skip" />
+    <field type="uint" name="mrequiredTotemCategoryID2" method="skip" />
+    <field type="int" name="AreaGroupId" method="read" />
+    <field type="uint" name="SchoolMask" method="read" />
+    <field type="uint" name="mruneCostID" method="skip" />
+    <field type="uint" name="mspellMissileID" method="skip" />
+    <field type="int" name="mpowerDisplayID" method="skip" />
+    <field type="float" name="munk11" method="skip" />
+    <field type="float" name="munk12" method="skip" />
+    <field type="float" name="munk13" method="skip" />
+    <field type="uint" name="mspellDescriptionVariableID" method="skip" />
+    <field type="uint" name="mspellDifficultyID" method="skip" />
+  </Spell>
+</DBFilesClient>
diff --git a/contrib/spell_dbc_extractor/src/spell_dbc_extractor.csproj b/contrib/spell_dbc_extractor/src/spell_dbc_extractor.csproj
new file mode 100644
index 00000000000..59cba978019
--- /dev/null
+++ b/contrib/spell_dbc_extractor/src/spell_dbc_extractor.csproj
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{7845F4CC-DA2D-46A7-8C31-5613CC139A74}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>spell_dbc_extractor</RootNamespace>
+    <AssemblyName>spell_dbc_extractor</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <NoWin32Manifest>true</NoWin32Manifest>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BinaryReaderExtensions.cs" />
+    <Compile Include="DB2Reader.cs" />
+    <Compile Include="DBCReader.cs" />
+    <Compile Include="IWowClientDBReader.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="StringTable.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="dbclayout.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>Клиентский профиль .NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Установщик Windows 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/contrib/vmap_assembler/CMakeLists.txt b/contrib/vmap_assembler/CMakeLists.txt
index 70b8b282f46..e13e8de601a 100644
--- a/contrib/vmap_assembler/CMakeLists.txt
+++ b/contrib/vmap_assembler/CMakeLists.txt
@@ -21,12 +21,12 @@ ADD_DEFINITIONS("-Wall")
 ADD_DEFINITIONS("-ggdb")
 ADD_DEFINITIONS("-O3")
 
-include_directories(../../src/shared)
-include_directories(../../src/game/vmap/)
-include_directories(../../dep/include/g3dlite/)
-include_directories(../../dep/ACE_wrappers/)
-include_directories(../../objdir/dep/ACE_wrappers)
-include_directories(../../src/framework/)
+include_directories(
+    ../../src/shared
+    ../../src/game/vmap/
+    ../../dep/include/g3dlite/
+    ../../src/framework/
+)
 
 add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
 	../../dep/src/g3dlite/Box.cpp
@@ -39,6 +39,7 @@ add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
 	../../dep/src/g3dlite/Vector3.cpp
 	../../dep/src/g3dlite/Vector4.cpp
 	../../dep/src/g3dlite/debugAssert.cpp
+	../../dep/src/g3dlite/FileSystem.cpp
 	../../dep/src/g3dlite/fileutils.cpp
 	../../dep/src/g3dlite/g3dmath.cpp
 	../../dep/src/g3dlite/g3dfnmatch.cpp
@@ -57,6 +58,8 @@ add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
 	../../dep/src/g3dlite/Log.cpp
 	../../dep/src/g3dlite/Matrix4.cpp
 	../../dep/src/g3dlite/MemoryManager.cpp
+	../../dep/src/g3dlite/PhysicsFrame.cpp
+	../../dep/src/g3dlite/PhysicsFrameSpline.cpp
 	../../dep/src/g3dlite/Quat.cpp
 	../../dep/src/g3dlite/Random.cpp
 	../../dep/src/g3dlite/Ray.cpp
@@ -65,6 +68,7 @@ add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
 	../../dep/src/g3dlite/TextInput.cpp
 	../../dep/src/g3dlite/TextOutput.cpp
 	../../dep/src/g3dlite/UprightFrame.cpp
+	../../dep/src/g3dlite/uint128.cpp
 	../../dep/src/g3dlite/Vector2.cpp
 	)
 
@@ -77,7 +81,7 @@ add_library(vmap
 	../../src/game/vmap/ModelInstance.cpp
 	)
 
-target_link_libraries(vmap g3dlite z)
+target_link_libraries(vmap g3dlite z pthread ACE)
 
 add_executable(vmap_assembler vmap_assembler.cpp)
 target_link_libraries(vmap_assembler vmap)
diff --git a/contrib/vmap_assembler/VC100/vmap_assembler.vcxproj b/contrib/vmap_assembler/VC100/vmap_assembler.vcxproj
deleted file mode 100644
index b24254d30c5..00000000000
--- a/contrib/vmap_assembler/VC100/vmap_assembler.vcxproj
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{572FFF74-480C-4472-8ABF-81733BB4049D}</ProjectGuid>
-    <RootNamespace>vmap_assembler</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)vmap_assembler.exe</OutputFile>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)vmap_assembler.exe</OutputFile>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)vmap_assembler.exe</OutputFile>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)vmap_assembler.exe</OutputFile>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\vmap_assembler.cpp" />
-    <ClCompile Include="..\..\..\src\game\vmap\BIH.cpp" />
-    <ClCompile Include="..\..\..\src\game\vmap\MapTree.cpp" />
-    <ClCompile Include="..\..\..\src\game\vmap\ModelInstance.cpp" />
-    <ClCompile Include="..\..\..\src\game\vmap\TileAssembler.cpp" />
-    <ClCompile Include="..\..\..\src\game\vmap\VMapManager2.cpp" />
-    <ClCompile Include="..\..\..\src\game\vmap\WorldModel.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\game\vmap\BIH.h" />
-    <ClInclude Include="..\..\..\src\game\vmap\MapTree.h" />
-    <ClInclude Include="..\..\..\src\game\vmap\ModelInstance.h" />
-    <ClInclude Include="..\..\..\src\game\vmap\TileAssembler.h" />
-    <ClInclude Include="..\..\..\src\game\vmap\VMapManager2.h" />
-    <ClInclude Include="..\..\..\src\game\vmap\VMapTools.h" />
-    <ClInclude Include="..\..\..\src\game\vmap\WorldModel.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\win\VC100\g3dlite.vcxproj">
-      <Project>{8072769e-cf10-48bf-b9e1-12752a5dac6e}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\win\VC100\zlib.vcxproj">
-      <Project>{8f1dea42-6a5b-4b62-839d-c141a7bfacf2}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/contrib/vmap_assembler/VC90/vmap_assembler.vcproj b/contrib/vmap_assembler/VC90/vmap_assembler.vcproj
deleted file mode 100644
index fee30343f66..00000000000
--- a/contrib/vmap_assembler/VC90/vmap_assembler.vcproj
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="vmap_assembler"
-	ProjectGUID="{572FFF74-480C-4472-8ABF-81733BB4049D}"
-	RootNamespace="vmap_assembler"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableEnhancedInstructionSet="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/vmap_assembler.exe"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/vmap_assembler.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS"
-				RuntimeLibrary="2"
-				EnableEnhancedInstructionSet="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/vmap_assembler.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\..\vmap_assembler.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="vmaplib"
-			>
-			<File
-				RelativePath="..\..\..\src\game\vmap\BIH.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\BIH.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\MapTree.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\MapTree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\ModelInstance.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\ModelInstance.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\TileAssembler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\TileAssembler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\VMapManager2.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\VMapManager2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\VMapTools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\WorldModel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\game\vmap\WorldModel.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/vmap_assembler/vmap_assemblerVC100.sln b/contrib/vmap_assembler/vmap_assemblerVC100.sln
deleted file mode 100644
index 368858561f9..00000000000
--- a/contrib/vmap_assembler/vmap_assemblerVC100.sln
+++ /dev/null
@@ -1,59 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "VC100\vmap_assembler.vcxproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\win\VC100\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\win\VC100\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
-		Debug_NoPCH|x64 = Debug_NoPCH|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|x64.ActiveCfg = Debug|x64
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|x64.Build.0 = Debug|x64
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|x64.ActiveCfg = Debug|x64
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|x64.Build.0 = Debug|x64
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|x64.ActiveCfg = Release|x64
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|x64.Build.0 = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/contrib/vmap_assembler/vmap_assemblerVC90.sln b/contrib/vmap_assembler/vmap_assemblerVC90.sln
deleted file mode 100644
index 9e94e750661..00000000000
--- a/contrib/vmap_assembler/vmap_assemblerVC90.sln
+++ /dev/null
@@ -1,42 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "VC90\vmap_assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\win\VC90\zlib.vcproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\win\VC90\g3dlite.vcproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/contrib/vmap_extractor_v3/CMakeLists.txt b/contrib/vmap_extractor_v3/CMakeLists.txt
index a7c085c434a..0a917f27397 100644
--- a/contrib/vmap_extractor_v3/CMakeLists.txt
+++ b/contrib/vmap_extractor_v3/CMakeLists.txt
@@ -20,6 +20,4 @@ ADD_DEFINITIONS("-Wall")
 ADD_DEFINITIONS("-ggdb")
 ADD_DEFINITIONS("-O3")
 
-include_directories(../../dep/libmpq)
-
 add_subdirectory(vmapextract)
diff --git a/contrib/vmap_extractor_v3/README b/contrib/vmap_extractor_v3/README
index 5c58b697c7c..7ec5992d778 100644
--- a/contrib/vmap_extractor_v3/README
+++ b/contrib/vmap_extractor_v3/README
@@ -9,7 +9,7 @@ Linux:
 	$ ./configure
 	$ make
 
-	After that, cd to contrib/vmap_extractor_v2/ and execute:
+	After that, cd to contrib/vmap_extractor/ and execute:
 
 	$ cmake .
 	$ make
@@ -30,8 +30,8 @@ Windows:
 
 1. Building
 
-	Just build the solution in contrib\vmap_extractor_v2\win
-	Resulting binaries will be in contrib\vmap_extractor_v2\bin\$(PlatformName)_$(ConfigurationName)
+	Just build the solution in contrib\vmap_extractor\win
+	Resulting binaries will be in contrib\vmap_extractor\bin\$(PlatformName)_$(ConfigurationName)
 
 2. Extracting
 
diff --git a/contrib/vmap_extractor_v3/vmapextract/CMakeLists.txt b/contrib/vmap_extractor_v3/vmapextract/CMakeLists.txt
index 9217b79dabc..af557eb662f 100644
--- a/contrib/vmap_extractor_v3/vmapextract/CMakeLists.txt
+++ b/contrib/vmap_extractor_v3/vmapextract/CMakeLists.txt
@@ -11,6 +11,5 @@
 cmake_minimum_required (VERSION 2.6)
 project (MANGOS_IOMAP_EXTRACTOR)
 
-LINK_DIRECTORIES( ${LINK_DIRECTORIES} ../../../dep/libmpq/libmpq/.libs/ )
-add_executable(vmapextractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
-target_link_libraries(vmapextractor libmpq.a bz2 z)
+add_executable(vmapExtractor3 adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp gameobject_extract.cpp)
+target_link_libraries(vmapExtractor3 libmpq.a bz2 z)
diff --git a/contrib/vmap_extractor_v3/vmapextract/adtfile.cpp b/contrib/vmap_extractor_v3/vmapextract/adtfile.cpp
index cdafb8095bb..574a5bfd911 100644
--- a/contrib/vmap_extractor_v3/vmapextract/adtfile.cpp
+++ b/contrib/vmap_extractor_v3/vmapextract/adtfile.cpp
@@ -26,49 +26,67 @@
 #define snprintf _snprintf
 #endif
 
-char * GetPlainName(char * FileName)
+const char* GetPlainName(const char* FileName)
 {
-    char * szTemp;
+    const char* szTemp;
 
-    if((szTemp = strrchr(FileName, '\\')) != NULL)
+    if ((szTemp = strrchr(FileName, '\\')) != NULL)
         FileName = szTemp + 1;
     return FileName;
 }
 
-void fixnamen(char *name, size_t len)
+char* GetPlainName(char* FileName)
 {
-    for (size_t i=0; i<len-3; i++)
+    char* szTemp;
+
+    if ((szTemp = strrchr(FileName, '\\')) != NULL)
+        FileName = szTemp + 1;
+    return FileName;
+}
+
+void fixnamen(char* name, size_t len)
+{
+    for (size_t i = 0; i < len - 3; i++)
     {
-        if (i>0 && name[i]>='A' && name[i]<='Z' && isalpha(name[i-1]))
+        if (i > 0 && name[i] >= 'A' && name[i] <= 'Z' && isalpha(name[i - 1]))
         {
             name[i] |= 0x20;
-        } else if ((i==0 || !isalpha(name[i-1])) && name[i]>='a' && name[i]<='z')
+        }
+        else if ((i == 0 || !isalpha(name[i - 1])) && name[i] >= 'a' && name[i] <= 'z')
         {
             name[i] &= ~0x20;
         }
     }
     //extension in lowercase
-    for(size_t i=len-3; i<len; i++)
+    for (size_t i = len - 3; i < len; i++)
         name[i] |= 0x20;
 }
 
-void fixname2(char *name, size_t len)
+void fixname2(char* name, size_t len)
 {
-    for (size_t i=0; i<len-3; i++)
+    for (size_t i = 0; i < len - 3; i++)
     {
-        if(name[i] == ' ')
-        name[i] = '_';
+        if (name[i] == ' ')
+            name[i] = '_';
     }
 }
 
+char const* GetExtension(char const* FileName)
+{
+    char const* szTemp;
+    if ((szTemp = strrchr(FileName, '.')) != NULL)
+        return szTemp;
+    return NULL;
+}
+
 ADTFile::ADTFile(char* filename): ADT(filename)
 {
     Adtfilename.append(filename);
 }
 
-bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
+bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY, StringSet& failedPaths)
 {
-    if(ADT.isEof ())
+    if (ADT.isEof())
         return false;
 
     uint32 size;
@@ -76,12 +94,12 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
     string xMap;
     string yMap;
 
-    Adtfilename.erase(Adtfilename.find(".adt"),4);
+    Adtfilename.erase(Adtfilename.find(".adt"), 4);
     string TempMapNumber;
-    TempMapNumber = Adtfilename.substr(Adtfilename.length()-6,6);
-    xMap = TempMapNumber.substr(TempMapNumber.find("_")+1,(TempMapNumber.find_last_of("_")-1) - (TempMapNumber.find("_")));
-    yMap = TempMapNumber.substr(TempMapNumber.find_last_of("_")+1,(TempMapNumber.length()) - (TempMapNumber.find_last_of("_")));
-    Adtfilename.erase((Adtfilename.length()-xMap.length()-yMap.length()-2), (xMap.length()+yMap.length()+2));
+    TempMapNumber = Adtfilename.substr(Adtfilename.length() - 6, 6);
+    xMap = TempMapNumber.substr(TempMapNumber.find("_") + 1, (TempMapNumber.find_last_of("_") - 1) - (TempMapNumber.find("_")));
+    yMap = TempMapNumber.substr(TempMapNumber.find_last_of("_") + 1, (TempMapNumber.length()) - (TempMapNumber.find_last_of("_")));
+    Adtfilename.erase((Adtfilename.length() - xMap.length() - yMap.length() - 2), (xMap.length() + yMap.length() + 2));
     string AdtMapNumber = xMap + ' ' + yMap + ' ' + GetPlainName((char*)Adtfilename.c_str());
     //printf("Processing map %s...\n", AdtMapNumber.c_str());
     //printf("MapNumber = %s\n", TempMapNumber.c_str());
@@ -89,9 +107,9 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
     //printf("yMap = %s\n", yMap.c_str());
 
     std::string dirname = std::string(szWorkDirWmo) + "/dir_bin";
-    FILE *dirfile;
+    FILE* dirfile;
     dirfile = fopen(dirname.c_str(), "ab");
-    if(!dirfile)
+    if (!dirfile)
     {
         printf("Can't open dirfile!'%s'\n", dirname.c_str());
         return false;
@@ -100,110 +118,90 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
     while (!ADT.isEof())
     {
         char fourcc[5];
-        ADT.read(&fourcc,4);
+        ADT.read(&fourcc, 4);
         ADT.read(&size, 4);
         flipcc(fourcc);
         fourcc[4] = 0;
 
         size_t nextpos = ADT.getPos() + size;
 
-        if (!strcmp(fourcc,"MCIN"))
+        if (!strcmp(fourcc, "MCIN"))
         {
         }
-        else if (!strcmp(fourcc,"MTEX"))
+        else if (!strcmp(fourcc, "MTEX"))
         {
         }
-        else if (!strcmp(fourcc,"MMDX"))
+        else if (!strcmp(fourcc, "MMDX"))
         {
             if (size)
             {
-                char *buf = new char[size];
+                char* buf = new char[size];
                 ADT.read(buf, size);
-                char *p=buf;
-                int t=0;
+                char* p = buf;
+                int t = 0;
                 ModelInstansName = new string[size];
-                while (p<buf+size)
+                while (p < buf + size)
                 {
-                    fixnamen(p,strlen(p));
-                    string path(p);
-                    char* s=GetPlainName(p);
-                    fixname2(s,strlen(s));
-                    p=p+strlen(p)+1;
-                    ModelInstansName[t++] = s;
-
-                    // < 3.1.0 ADT MMDX section store filename.mdx filenames for corresponded .m2 file
-                    std::string ext3 = path.size() >= 4 ? path.substr(path.size()-4,4) : "";
-                    std::transform( ext3.begin(), ext3.end(), ext3.begin(), ::tolower );
-                    if(ext3 == ".mdx")
-                    {
-                        // replace .mdx -> .m2
-                        path.erase(path.length()-2,2);
-                        path.append("2");
-                    }
-                    // >= 3.1.0 ADT MMDX section store filename.m2 filenames for corresponded .m2 file
-                    // nothing do
-
-                    char szLocalFile[1024];
-                    snprintf(szLocalFile, 1024, "%s/%s", szWorkDirWmo, s);
-                    FILE * output = fopen(szLocalFile,"rb");
-                    if(!output)
-                    {
-                        Model m2(path);
-                        if(m2.open())
-                            m2.ConvertToVMAPModel(szLocalFile);
-                    }
-                    else
-                        fclose(output);
+                    fixnamen(p, strlen(p));
+                    char* s = GetPlainName(p);
+                    fixname2(s, strlen(s));
+                    string path(p);                         // Store copy after name fixed
+
+                    std::string fixedName;
+                    ExtractSingleModel(path, fixedName, failedPaths);
+                    ModelInstansName[t++] = fixedName;
+
+                    p = p + strlen(p) + 1;
                 }
                 delete[] buf;
             }
         }
-        else if (!strcmp(fourcc,"MWMO"))
+        else if (!strcmp(fourcc, "MWMO"))
         {
             if (size)
             {
-                char *buf = new char[size];
+                char* buf = new char[size];
                 ADT.read(buf, size);
-                char *p=buf;
+                char* p = buf;
                 int q = 0;
                 WmoInstansName = new string[size];
-                while (p<buf+size)
+                while (p < buf + size)
                 {
                     string path(p);
-                    char* s=GetPlainName(p);
-                    fixnamen(s,strlen(s));
-                    fixname2(s,strlen(s));
-                    p=p+strlen(p)+1;
+                    char* s = GetPlainName(p);
+                    fixnamen(s, strlen(s));
+                    fixname2(s, strlen(s));
+                    p = p + strlen(p) + 1;
                     WmoInstansName[q++] = s;
                 }
                 delete[] buf;
             }
         }
         //======================
-        else if (!strcmp(fourcc,"MDDF"))
+        else if (!strcmp(fourcc, "MDDF"))
         {
             if (size)
             {
                 nMDX = (int)size / 36;
-                for (int i=0; i<nMDX; ++i)
+                for (int i = 0; i < nMDX; ++i)
                 {
                     uint32 id;
                     ADT.read(&id, 4);
-                    ModelInstance inst(ADT,ModelInstansName[id].c_str(), map_num, tileX, tileY, dirfile);
+                    ModelInstance inst(ADT, ModelInstansName[id].c_str(), map_num, tileX, tileY, dirfile);
                 }
                 delete[] ModelInstansName;
             }
         }
-        else if (!strcmp(fourcc,"MODF"))
+        else if (!strcmp(fourcc, "MODF"))
         {
             if (size)
             {
                 nWMO = (int)size / 64;
-                for (int i=0; i<nWMO; ++i)
+                for (int i = 0; i < nWMO; ++i)
                 {
                     uint32 id;
                     ADT.read(&id, 4);
-                    WMOInstance inst(ADT,WmoInstansName[id].c_str(), map_num, tileX, tileY, dirfile);
+                    WMOInstance inst(ADT, WmoInstansName[id].c_str(), map_num, tileX, tileY, dirfile);
                 }
                 delete[] WmoInstansName;
             }
@@ -213,6 +211,7 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
     }
     ADT.close();
     fclose(dirfile);
+
     return true;
 }
 
diff --git a/contrib/vmap_extractor_v3/vmapextract/adtfile.h b/contrib/vmap_extractor_v3/vmapextract/adtfile.h
index 13c8d0b9856..08a1d0edb08 100644
--- a/contrib/vmap_extractor_v3/vmapextract/adtfile.h
+++ b/contrib/vmap_extractor_v3/vmapextract/adtfile.h
@@ -21,7 +21,9 @@
 
 #include "mpq_libmpq04.h"
 #include "wmo.h"
+#include "vmapexport.h"
 #include "model.h"
+#include "libmpq/mpq.h"
 
 #define TILESIZE (533.33333f)
 #define CHUNKSIZE ((TILESIZE) / 16.0f)
@@ -34,7 +36,7 @@ typedef struct
     float x;
     float y;
     float z;
-}svec;
+} svec;
 
 struct vec
 {
@@ -50,9 +52,9 @@ struct triangle
 
 typedef struct
 {
-    float v9[16*8+1][16*8+1];
-    float v8[16*8][16*8];
-}Cell;
+    float v9[16 * 8 + 1][16 * 8 + 1];
+    float v8[16 * 8][16 * 8];
+} Cell;
 
 typedef struct
 {
@@ -62,12 +64,12 @@ typedef struct
     //Liquid *lq;
     float waterlevel[9][9];
     uint8 flag;
-}chunk;
+} chunk;
 
 typedef struct
 {
     chunk ch[16][16];
-}mcell;
+} mcell;
 
 struct MapChunkHeader
 {
@@ -109,31 +111,35 @@ struct MapChunkHeader
 
 class ADTFile
 {
-public:
-    ADTFile(char* filename);
-    ~ADTFile();
-    int nWMO;
-    int nMDX;
-    string* WmoInstansName;
-    string* ModelInstansName;
-    bool init(uint32 map_num, uint32 tileX, uint32 tileY);
-    //void LoadMapChunks();
-
-    //uint32 wmo_count;
-/*
-    const mcell& Getmcell() const
-    {
-        return Mcell;
-    }
-*/
-private:
-    //size_t mcnk_offsets[256], mcnk_sizes[256];
-    MPQFile ADT;
-    //mcell Mcell;
-    string Adtfilename;
+    public:
+        ADTFile(char* filename);
+        ~ADTFile();
+        int nWMO;
+        int nMDX;
+        string* WmoInstansName;
+        string* ModelInstansName;
+        bool init(uint32 map_num, uint32 tileX, uint32 tileY, StringSet& failedPaths);
+        //void LoadMapChunks();
+
+        //uint32 wmo_count;
+        /*
+            const mcell& Getmcell() const
+            {
+                return Mcell;
+            }
+        */
+    private:
+        //size_t mcnk_offsets[256], mcnk_sizes[256];
+        MPQFile ADT;
+        //mcell Mcell;
+        string Adtfilename;
 };
 
-void fixnamen(char *name, size_t len);
+const char* GetPlainName(const char* FileName);
+char* GetPlainName(char* FileName);
+char const* GetExtension(char const* FileName);
+void fixnamen(char* name, size_t len);
+void fixname2(char* name, size_t len);
 //void fixMapNamen(char *name, size_t len);
 
 #endif
diff --git a/contrib/vmap_extractor_v3/vmapextract/dbcfile.cpp b/contrib/vmap_extractor_v3/vmapextract/dbcfile.cpp
index 0dce4ff875b..e005dd39aef 100644
--- a/contrib/vmap_extractor_v3/vmapextract/dbcfile.cpp
+++ b/contrib/vmap_extractor_v3/vmapextract/dbcfile.cpp
@@ -23,7 +23,7 @@
 
 #include <cstdio>
 
-DBCFile::DBCFile(const std::string &filename) : filename(filename)
+DBCFile::DBCFile(const std::string& filename) : filename(filename)
 {
     data = NULL;
 }
@@ -38,11 +38,11 @@ bool DBCFile::open()
         return false;
 
     unsigned char header[4];
-    unsigned int na,nb,es,ss;
+    unsigned int na, nb, es, ss;
 
-    f.read(header,4); // File Header
+    f.read(header, 4); // File Header
 
-    if (header[0]!='W' || header[1]!='D' || header[2]!='B' || header[3] != 'C')
+    if (header[0] != 'W' || header[1] != 'D' || header[2] != 'B' || header[3] != 'C')
     {
         f.close();
         data = NULL;
@@ -52,21 +52,21 @@ bool DBCFile::open()
 
     //assert(header[0]=='W' && header[1]=='D' && header[2]=='B' && header[3] == 'C');
 
-    f.read(&na,4); // Number of records
-    f.read(&nb,4); // Number of fields
-    f.read(&es,4); // Size of a record
-    f.read(&ss,4); // String size
+    f.read(&na, 4); // Number of records
+    f.read(&nb, 4); // Number of fields
+    f.read(&es, 4); // Size of a record
+    f.read(&ss, 4); // String size
 
     recordSize = es;
     recordCount = na;
     fieldCount = nb;
     stringSize = ss;
     //assert(fieldCount*4 == recordSize);
-    assert(fieldCount*4 >= recordSize);
+    assert(fieldCount * 4 >= recordSize);
 
-    data = new unsigned char[recordSize*recordCount+stringSize];
-    stringTable = data + recordSize*recordCount;
-    f.read(data,recordSize*recordCount+stringSize);
+    data = new unsigned char[recordSize * recordCount + stringSize];
+    stringTable = data + recordSize * recordCount;
+    f.read(data, recordSize * recordCount + stringSize);
     f.close();
     return true;
 }
@@ -79,7 +79,7 @@ DBCFile::~DBCFile()
 DBCFile::Record DBCFile::getRecord(size_t id)
 {
     assert(data);
-    return Record(*this, data + id*recordSize);
+    return Record(*this, data + id * recordSize);
 }
 
 DBCFile::Iterator DBCFile::begin()
diff --git a/contrib/vmap_extractor_v3/vmapextract/dbcfile.h b/contrib/vmap_extractor_v3/vmapextract/dbcfile.h
index 527f96031ea..9e1fff73418 100644
--- a/contrib/vmap_extractor_v3/vmapextract/dbcfile.h
+++ b/contrib/vmap_extractor_v3/vmapextract/dbcfile.h
@@ -24,132 +24,134 @@
 
 class DBCFile
 {
-public:
-    DBCFile(const std::string &filename);
-    ~DBCFile();
-
-    // Open database. It must be openened before it can be used.
-    bool open();
-
-    // TODO: Add a close function?
-
-    // Database exceptions
-    class Exception
-    {
     public:
-        Exception(const std::string &message): message(message)
-        { }
-        virtual ~Exception()
-        { }
-        const std::string &getMessage() {return message;}
-    private:
-        std::string message;
-    };
+        DBCFile(const std::string& filename);
+        ~DBCFile();
 
-    //
-    class NotFound: public Exception
-    {
-    public:
-        NotFound(): Exception("Key was not found")
-        { }
-    };
+        // Open database. It must be openened before it can be used.
+        bool open();
 
-    // Iteration over database
-    class Iterator;
-    class Record
-    {
-    public:
-        Record& operator= (const Record& r)
-        {
-            file = r.file;
-            offset = r.offset;
-            return *this;
-        }
-        float getFloat(size_t field) const
-        {
-            assert(field < file.fieldCount);
-            return *reinterpret_cast<float*>(offset+field*4);
-        }
-        unsigned int getUInt(size_t field) const
-        {
-            assert(field < file.fieldCount);
-            return *reinterpret_cast<unsigned int*>(offset+(field*4));
-        }
-        int getInt(size_t field) const
+        // TODO: Add a close function?
+
+        // Database exceptions
+        class Exception
         {
-            assert(field < file.fieldCount);
-            return *reinterpret_cast<int*>(offset+field*4);
-        }
-        unsigned char getByte(size_t ofs) const
+            public:
+                Exception(const std::string& message): message(message)
+                { }
+                virtual ~Exception()
+                { }
+                const std::string& getMessage() {return message;}
+            private:
+                std::string message;
+        };
+
+        //
+        class NotFound: public Exception
         {
-            assert(ofs < file.recordSize);
-            return *reinterpret_cast<unsigned char*>(offset+ofs);
-        }
-        const char *getString(size_t field) const
+            public:
+                NotFound(): Exception("Key was not found")
+                { }
+        };
+
+        // Iteration over database
+        class Iterator;
+        class Record
         {
-            assert(field < file.fieldCount);
-            size_t stringOffset = getUInt(field);
-            assert(stringOffset < file.stringSize);
-            //char * tmp = (char*)file.stringTable + stringOffset;
-            //unsigned char * tmp2 = file.stringTable + stringOffset;
-            return reinterpret_cast<char*>(file.stringTable + stringOffset);
-        }
-    private:
-        Record(DBCFile &file, unsigned char *offset): file(file), offset(offset) {}
-        DBCFile &file;
-        unsigned char *offset;
+            public:
+                Record& operator= (const Record& r)
+                {
+                    file = r.file;
+                    offset = r.offset;
+                    return *this;
+                }
+                float getFloat(size_t field) const
+                {
+                    assert(field < file.fieldCount);
+                    return *reinterpret_cast<float*>(offset + field * 4);
+                }
+                unsigned int getUInt(size_t field) const
+                {
+                    assert(field < file.fieldCount);
+                    return *reinterpret_cast<unsigned int*>(offset + (field * 4));
+                }
+                int getInt(size_t field) const
+                {
+                    assert(field < file.fieldCount);
+                    return *reinterpret_cast<int*>(offset + field * 4);
+                }
+                unsigned char getByte(size_t ofs) const
+                {
+                    assert(ofs < file.recordSize);
+                    return *reinterpret_cast<unsigned char*>(offset + ofs);
+                }
+                const char* getString(size_t field) const
+                {
+                    assert(field < file.fieldCount);
+                    size_t stringOffset = getUInt(field);
+                    assert(stringOffset < file.stringSize);
+                    //char * tmp = (char*)file.stringTable + stringOffset;
+                    //unsigned char * tmp2 = file.stringTable + stringOffset;
+                    return reinterpret_cast<char*>(file.stringTable + stringOffset);
+                }
+            private:
+                Record(DBCFile& file, unsigned char* offset): file(file), offset(offset) {}
+                DBCFile& file;
+                unsigned char* offset;
 
-        friend class DBCFile;
-        friend class Iterator;
-    };
+                friend class DBCFile;
+                friend class Iterator;
+        };
 
-    /* Iterator that iterates over records */
-    class Iterator
-    {
-    public:
-        Iterator(DBCFile &file, unsigned char *offset):
-            record(file, offset) {}
-        /// Advance (prefix only)
-        Iterator & operator++() {
-            record.offset += record.file.recordSize;
-            return *this;
-        }
-        /// Return address of current instance
-        Record const & operator*() const { return record; }
-        const Record* operator->() const {
-            return &record;
-        }
-        /// Comparison
-        bool operator==(const Iterator &b) const
-        {
-            return record.offset == b.record.offset;
-        }
-        bool operator!=(const Iterator &b) const
+        /* Iterator that iterates over records */
+        class Iterator
         {
-            return record.offset != b.record.offset;
-        }
-    private:
-        Record record;
-    };
+            public:
+                Iterator(DBCFile& file, unsigned char* offset):
+                    record(file, offset) {}
+                /// Advance (prefix only)
+                Iterator& operator++()
+                {
+                    record.offset += record.file.recordSize;
+                    return *this;
+                }
+                /// Return address of current instance
+                Record const& operator*() const { return record; }
+                const Record* operator->() const
+                {
+                    return &record;
+                }
+                /// Comparison
+                bool operator==(const Iterator& b) const
+                {
+                    return record.offset == b.record.offset;
+                }
+                bool operator!=(const Iterator& b) const
+                {
+                    return record.offset != b.record.offset;
+                }
+            private:
+                Record record;
+        };
 
-    // Get record by id
-    Record getRecord(size_t id);
-    /// Get begin iterator over records
-    Iterator begin();
-    /// Get begin iterator over records
-    Iterator end();
-    /// Trivial
-    size_t getRecordCount() const { return recordCount;}
-    size_t getFieldCount() const { return fieldCount; }
+        // Get record by id
+        Record getRecord(size_t id);
+        /// Get begin iterator over records
+        Iterator begin();
+        /// Get begin iterator over records
+        Iterator end();
+        /// Trivial
+        size_t getRecordCount() const { return recordCount;}
+        size_t getFieldCount() const { return fieldCount; }
 
-private:
-    std::string filename;
-    size_t recordSize;
-    size_t recordCount;
-    size_t fieldCount;
-    size_t stringSize;
-    unsigned char *data;
-    unsigned char *stringTable;
+    private:
+        std::string filename;
+        size_t recordSize;
+        size_t recordCount;
+        size_t fieldCount;
+        size_t stringSize;
+        unsigned char* data;
+        unsigned char* stringTable;
 };
 
 #endif
diff --git a/contrib/vmap_extractor_v3/vmapextract/gameobject_extract.cpp b/contrib/vmap_extractor_v3/vmapextract/gameobject_extract.cpp
new file mode 100644
index 00000000000..4f1b6262898
--- /dev/null
+++ b/contrib/vmap_extractor_v3/vmapextract/gameobject_extract.cpp
@@ -0,0 +1,111 @@
+#include "model.h"
+#include "dbcfile.h"
+#include "adtfile.h"
+#include "vmapexport.h"
+
+#include <algorithm>
+#include <stdio.h>
+
+bool ExtractSingleModel(std::string& origPath, std::string& fixedName, StringSet& failedPaths)
+{
+    char const* ext = GetExtension(GetPlainName(origPath.c_str()));
+
+    // < 3.1.0 ADT MMDX section store filename.mdx filenames for corresponded .m2 file
+    if (!strcmp(ext, ".mdx"))
+    {
+        // replace .mdx -> .m2
+        origPath.erase(origPath.length() - 2, 2);
+        origPath.append("2");
+    }
+    // >= 3.1.0 ADT MMDX section store filename.m2 filenames for corresponded .m2 file
+    // nothing do
+
+    fixedName = GetPlainName(origPath.c_str());
+
+    std::string output(szWorkDirWmo);                       // Stores output filename (possible changed)
+    output += "/";
+    output += fixedName;
+
+    if (FileExists(output.c_str()))
+        return true;
+
+    Model mdl(origPath);                                    // Possible changed fname
+    if (!mdl.open(failedPaths))
+        return false;
+
+    return mdl.ConvertToVMAPModel(output.c_str());
+}
+
+void ExtractGameobjectModels()
+{
+    printf("\n");
+    printf("Extracting GameObject models...\n");
+    DBCFile dbc("DBFilesClient\\GameObjectDisplayInfo.dbc");
+    if (!dbc.open())
+    {
+        printf("Fatal error: Invalid GameObjectDisplayInfo.dbc file format!\n");
+        exit(1);
+    }
+
+    std::string basepath = szWorkDirWmo;
+    basepath += "/";
+    std::string path;
+    StringSet failedPaths;
+
+    FILE* model_list = fopen((basepath + "temp_gameobject_models").c_str(), "wb");
+
+    for (DBCFile::Iterator it = dbc.begin(); it != dbc.end(); ++it)
+    {
+        path = it->getString(1);
+
+        if (path.length() < 4)
+            continue;
+
+        fixnamen((char*)path.c_str(), path.size());
+        char* name = GetPlainName((char*)path.c_str());
+        fixname2(name, strlen(name));
+
+        char const* ch_ext = GetExtension(name);
+        if (!ch_ext)
+            continue;
+
+        //strToLower(ch_ext);
+
+        bool result = false;
+        if (!strcmp(ch_ext, ".wmo"))
+        {
+            result = ExtractSingleWmo(path);
+        }
+        else if (!strcmp(ch_ext, ".mdl"))
+        {
+            // TODO: extract .mdl files, if needed
+            continue;
+        }
+        else //if (!strcmp(ch_ext, ".mdx") || !strcmp(ch_ext, ".m2"))
+        {
+            std::string fixedName;
+            result = ExtractSingleModel(path, fixedName, failedPaths);
+        }
+
+        if (result)
+        {
+            uint32 displayId = it->getUInt(0);
+            uint32 path_length = strlen(name);
+            fwrite(&displayId, sizeof(uint32), 1, model_list);
+            fwrite(&path_length, sizeof(uint32), 1, model_list);
+            fwrite(name, sizeof(char), path_length, model_list);
+        }
+    }
+
+    fclose(model_list);
+
+    if (!failedPaths.empty())
+    {
+        printf("Warning: Some models could not be extracted, see below\n");
+        for (StringSet::const_iterator itr = failedPaths.begin(); itr != failedPaths.end(); ++itr)
+            printf("Could not find file of model %s\n", itr->c_str());
+        printf("A few of these warnings are expected to happen, so be not alarmed!\n");
+    }
+
+    printf("Done!\n");
+}
diff --git a/contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h b/contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h
index 31fa7a47682..960f9c3e073 100644
--- a/contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h
+++ b/contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h
@@ -19,7 +19,7 @@
 #ifndef LOAD_LIB_H
 #define LOAD_LIB_H
 
-#ifdef WIN32
+#if defined (WIN32) && !defined (__MINGW32__)
 typedef __int64            int64;
 typedef __int32            int32;
 typedef __int16            int16;
@@ -30,10 +30,10 @@ typedef unsigned __int16   uint16;
 typedef unsigned __int8    uint8;
 #else
 #include <stdint.h>
-#ifndef uint64_t
-#ifdef __linux__
-#include <linux/types.h>
-#endif
+#if defined (__MINGW32__)
+    #include <sys/types.h>
+#elif defined(__linux__)
+    #include <linux/types.h>
 #endif
 typedef int64_t            int64;
 typedef int32_t            int32;
@@ -52,7 +52,8 @@ typedef uint8_t            uint8;
 //
 struct file_MVER
 {
-    union{
+    union
+    {
         uint32 fcc;
         char   fcc_txt[4];
     };
@@ -60,18 +61,19 @@ struct file_MVER
     uint32 ver;
 };
 
-class FileLoader{
-    uint8  *data;
-    uint32  data_size;
-public:
-    virtual bool prepareLoadedData();
-    uint8 *GetData()     {return data;}
-    uint32 GetDataSize() {return data_size;}
+class FileLoader
+{
+        uint8*  data;
+        uint32  data_size;
+    public:
+        virtual bool prepareLoadedData();
+        uint8* GetData()     {return data;}
+        uint32 GetDataSize() {return data_size;}
 
-    file_MVER *version;
-    FileLoader();
-    ~FileLoader();
-    bool loadFile(char *filename, bool log = true);
-    virtual void free();
+        file_MVER* version;
+        FileLoader();
+        ~FileLoader();
+        bool loadFile(char* filename, bool log = true);
+        virtual void free();
 };
 #endif
diff --git a/contrib/vmap_extractor_v3/vmapextract/model.cpp b/contrib/vmap_extractor_v3/vmapextract/model.cpp
index 4b7d629416a..fba609827f3 100644
--- a/contrib/vmap_extractor_v3/vmapextract/model.cpp
+++ b/contrib/vmap_extractor_v3/vmapextract/model.cpp
@@ -24,11 +24,12 @@
 #include <algorithm>
 #include <cstdio>
 
-Model::Model(std::string &filename) : filename(filename)
+Model::Model(std::string& filename) : filename(filename), vertices(0), indices(0)
 {
+    memset(&header, 0, sizeof(header));
 }
 
-bool Model::open()
+bool Model::open(StringSet& failedPaths)
 {
     MPQFile f(filename.c_str());
 
@@ -37,25 +38,27 @@ bool Model::open()
     if (!ok)
     {
         f.close();
-        printf("Error loading model %s\n", filename.c_str());
+        failedPaths.insert(filename);
         return false;
     }
 
+    _unload();
+
     memcpy(&header, f.getBuffer(), sizeof(ModelHeader));
-    if(header.nBoundingTriangles > 0)
+    if (header.nBoundingTriangles > 0)
     {
         f.seek(0);
         f.seekRelative(header.ofsBoundingVertices);
         vertices = new Vec3D[header.nBoundingVertices];
-        f.read(vertices,header.nBoundingVertices*12);
-        for (uint32 i=0; i<header.nBoundingVertices; i++)
+        f.read(vertices, header.nBoundingVertices * 12);
+        for (uint32 i = 0; i < header.nBoundingVertices; i++)
         {
             vertices[i] = fixCoordSystem(vertices[i]);
         }
         f.seek(0);
         f.seekRelative(header.ofsBoundingTriangles);
         indices = new uint16[header.nBoundingTriangles];
-        f.read(indices,header.nBoundingTriangles*2);
+        f.read(indices, header.nBoundingTriangles * 2);
         f.close();
     }
     else
@@ -67,67 +70,57 @@ bool Model::open()
     return true;
 }
 
-bool Model::ConvertToVMAPModel(char * outfilename)
+bool Model::ConvertToVMAPModel(const char* outfilename)
 {
-    int N[12] = {0,0,0,0,0,0,0,0,0,0,0,0};
-    FILE * output=fopen(outfilename,"wb");
-    if(!output)
+    int N[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    FILE* output = fopen(outfilename, "wb");
+    if (!output)
     {
-        printf("Can't create the output file '%s'\n",outfilename);
+        printf("Can't create the output file '%s'\n", outfilename);
         return false;
     }
-    fwrite(szRawVMAPMagic,8,1,output);
-    uint32 nVertices = 0;
-    nVertices = header.nBoundingVertices;
+    fwrite(szRawVMAPMagic, 8, 1, output);
+    uint32 nVertices = header.nBoundingVertices;
     fwrite(&nVertices, sizeof(int), 1, output);
     uint32 nofgroups = 1;
-    fwrite(&nofgroups,sizeof(uint32), 1, output);
-    fwrite(N,4*3,1,output);// rootwmoid, flags, groupid
-    fwrite(N,sizeof(float),3*2,output);//bbox, only needed for WMO currently
-    fwrite(N,4,1,output);// liquidflags
-    fwrite("GRP ",4,1,output);
+    fwrite(&nofgroups, sizeof(uint32), 1, output);
+    fwrite(N, 4 * 3, 1, output); // rootwmoid, flags, groupid
+    fwrite(N, sizeof(float), 3 * 2, output); //bbox, only needed for WMO currently
+    fwrite(N, 4, 1, output); // liquidflags
+    fwrite("GRP ", 4, 1, output);
     uint32 branches = 1;
     int wsize;
     wsize = sizeof(branches) + sizeof(uint32) * branches;
     fwrite(&wsize, sizeof(int), 1, output);
-    fwrite(&branches,sizeof(branches), 1, output);
-    uint32 nIndexes = 0;
-    nIndexes = header.nBoundingTriangles;
-    fwrite(&nIndexes,sizeof(uint32), 1, output);
-    fwrite("INDX",4, 1, output);
+    fwrite(&branches, sizeof(branches), 1, output);
+    uint32 nIndexes = header.nBoundingTriangles;
+    fwrite(&nIndexes, sizeof(uint32), 1, output);
+    fwrite("INDX", 4, 1, output);
     wsize = sizeof(uint32) + sizeof(unsigned short) * nIndexes;
     fwrite(&wsize, sizeof(int), 1, output);
     fwrite(&nIndexes, sizeof(uint32), 1, output);
-    if(nIndexes >0)
+    if (nIndexes > 0)
     {
         fwrite(indices, sizeof(unsigned short), nIndexes, output);
     }
-    fwrite("VERT",4, 1, output);
+    fwrite("VERT", 4, 1, output);
     wsize = sizeof(int) + sizeof(float) * 3 * nVertices;
     fwrite(&wsize, sizeof(int), 1, output);
     fwrite(&nVertices, sizeof(int), 1, output);
-    if(nVertices >0)
+    if (nVertices > 0)
     {
-        for(uint32 vpos=0; vpos <nVertices; ++vpos)
+        for (uint32 vpos = 0; vpos < nVertices; ++vpos)
         {
-            float sy = vertices[vpos].y;
-            vertices[vpos].y = vertices[vpos].z;
-            vertices[vpos].z = sy;
+            std::swap(vertices[vpos].y, vertices[vpos].z);
         }
-        fwrite(vertices, sizeof(float)*3, nVertices, output);
+        fwrite(vertices, sizeof(float) * 3, nVertices, output);
     }
 
-    delete[] vertices;
-    delete[] indices;
-
     fclose(output);
 
     return true;
 }
 
-Model::~Model()
-{
-}
 
 Vec3D fixCoordSystem(Vec3D v)
 {
@@ -139,24 +132,24 @@ Vec3D fixCoordSystem2(Vec3D v)
     return Vec3D(v.x, v.z, v.y);
 }
 
-ModelInstance::ModelInstance(MPQFile &f,const char* ModelInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE *pDirfile)
+ModelInstance::ModelInstance(MPQFile& f, const char* ModelInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE* pDirfile)
 {
     float ff[3];
     f.read(&id, 4);
-    f.read(ff,12);
-    pos = fixCoords(Vec3D(ff[0],ff[1],ff[2]));
-    f.read(ff,12);
-    rot = Vec3D(ff[0],ff[1],ff[2]);
-    f.read(&scale,4);
+    f.read(ff, 12);
+    pos = fixCoords(Vec3D(ff[0], ff[1], ff[2]));
+    f.read(ff, 12);
+    rot = Vec3D(ff[0], ff[1], ff[2]);
+    f.read(&scale, 2);
+    f.read(&flags, 2);
     // scale factor - divide by 1024. blizzard devs must be on crack, why not just use a float?
     sc = scale / 1024.0f;
 
     char tempname[512];
     sprintf(tempname, "%s/%s", szWorkDirWmo, ModelInstName);
-    FILE *input;
-    input = fopen(tempname, "r+b");
+    FILE* input = fopen(tempname, "r+b");
 
-    if(!input)
+    if (!input)
     {
         //printf("ModelInstance::ModelInstance couldn't open %s\n", tempname);
         return;
@@ -164,15 +157,17 @@ ModelInstance::ModelInstance(MPQFile &f,const char* ModelInstName, uint32 mapID,
 
     fseek(input, 8, SEEK_SET); // get the correct no of vertices
     int nVertices;
-    fread(&nVertices, sizeof (int), 1, input);
+    int count = fread(&nVertices, sizeof (int), 1, input);
     fclose(input);
 
-    if(nVertices == 0)
+    if (count != 1 || nVertices == 0)
         return;
 
     uint16 adtId = 0;// not used for models
     uint32 flags = MOD_M2;
-	if(tileX == 65 && tileY == 65) flags |= MOD_WORLDSPAWN;
+    if (tileX == 65 && tileY == 65)
+        flags |= MOD_WORLDSPAWN;
+
     //write mapID, tileX, tileY, Flags, ID, Pos, Rot, Scale, name
     fwrite(&mapID, sizeof(uint32), 1, pDirfile);
     fwrite(&tileX, sizeof(uint32), 1, pDirfile);
@@ -183,7 +178,7 @@ ModelInstance::ModelInstance(MPQFile &f,const char* ModelInstName, uint32 mapID,
     fwrite(&pos, sizeof(float), 3, pDirfile);
     fwrite(&rot, sizeof(float), 3, pDirfile);
     fwrite(&sc, sizeof(float), 1, pDirfile);
-    uint32 nlen=strlen(ModelInstName);
+    uint32 nlen = strlen(ModelInstName);
     fwrite(&nlen, sizeof(uint32), 1, pDirfile);
     fwrite(ModelInstName, sizeof(char), nlen, pDirfile);
 
diff --git a/contrib/vmap_extractor_v3/vmapextract/model.h b/contrib/vmap_extractor_v3/vmapextract/model.h
index b30124783da..3debb18c2ca 100644
--- a/contrib/vmap_extractor_v3/vmapextract/model.h
+++ b/contrib/vmap_extractor_v3/vmapextract/model.h
@@ -24,8 +24,8 @@
 //#include "mpq.h"
 #include "modelheaders.h"
 #include <vector>
+#include "vmapexport.h"
 
-class Model;
 class WMOInstance;
 class MPQFile;
 
@@ -33,38 +33,43 @@ Vec3D fixCoordSystem(Vec3D v);
 
 class Model
 {
-public:
-    ModelHeader header;
-    uint32 offsBB_vertices, offsBB_indices;
-    Vec3D *BB_vertices, *vertices;
-    uint16 *BB_indices, *indices;
-    size_t nIndices;
+    public:
+        ModelHeader header;
+        uint32 offsBB_vertices, offsBB_indices;
+        Vec3D* BB_vertices, *vertices;
+        uint16* BB_indices, *indices;
+        size_t nIndices;
 
-    bool open();
-    bool ConvertToVMAPModel(char * outfilename);
+        bool open(StringSet& failedPaths);
+        bool ConvertToVMAPModel(const char* outfilename);
 
-    bool ok;
+        bool ok;
 
-    Model(std::string &filename);
-    ~Model();
+        Model(std::string& filename);
+        ~Model() {_unload();}
 
-private:
-    std::string filename;
-    char outfilename;
+    private:
+        void _unload()
+        {
+            delete[] vertices;
+            delete[] indices;
+            vertices = NULL;
+            indices = NULL;
+        }
+        std::string filename;
+        char outfilename;
 };
 
 class ModelInstance
 {
-public:
-    Model *model;
+    public:
+	    uint32 id;
+	    Vec3D pos, rot;
+	    uint16 scale, flags;
+	    float sc;
 
-    uint32 id;
-    Vec3D pos, rot;
-    unsigned int d1, scale;
-    float w,sc;
-
-    ModelInstance() {}
-    ModelInstance(MPQFile &f,const char* ModelInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE *pDirfile);
+	    ModelInstance() : id(0), scale(0), flags(0), sc(0.0f) {}
+        ModelInstance(MPQFile& f, const char* ModelInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE* pDirfile);
 
 };
 
diff --git a/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq.cpp b/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq.cpp
index 528b9679a58..6881364b49b 100644
--- a/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq.cpp
+++ b/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq.cpp
@@ -8,8 +8,10 @@ MPQArchive::MPQArchive(const char* filename)
 {
     int result = libmpq__archive_open(&mpq_a, filename, -1);
     printf("Opening %s\n", filename);
-    if(result) {
-        switch(result) {
+    if (result)
+    {
+        switch (result)
+        {
             case LIBMPQ_ERROR_OPEN :
                 printf("Error opening archive '%s': Does file really exist?\n", filename);
                 break;
@@ -46,17 +48,18 @@ MPQFile::MPQFile(const char* filename):
     pointer(0),
     size(0)
 {
-    for(ArchiveSet::iterator i=gOpenArchives.begin(); i!=gOpenArchives.end();++i)
+    for (ArchiveSet::iterator i = gOpenArchives.begin(); i != gOpenArchives.end(); ++i)
     {
-        mpq_archive *mpq_a = (*i)->mpq_a;
+        mpq_archive* mpq_a = (*i)->mpq_a;
 
         uint32 filenum;
-        if(libmpq__file_number(mpq_a, filename, &filenum)) continue;
+        if (libmpq__file_number(mpq_a, filename, &filenum)) continue;
         libmpq__off_t transferred;
         libmpq__file_unpacked_size(mpq_a, filenum, &size);
 
         // HACK: in patch.mpq some files don't want to open and give 1 for filesize
-        if (size<=1) {
+        if (size <= 1)
+        {
             // printf("info: file %s has size %d; considered dummy file.\n", filename, size);
             eof = true;
             buffer = 0;
@@ -79,7 +82,8 @@ size_t MPQFile::read(void* dest, size_t bytes)
     if (eof) return 0;
 
     size_t rpos = pointer + bytes;
-    if (rpos > size) {
+    if (rpos > size)
+    {
         bytes = size - pointer;
         eof = true;
     }
diff --git a/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq04.h b/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq04.h
index 4b0a2465bfd..0a3b21f5f1e 100644
--- a/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq04.h
+++ b/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq04.h
@@ -17,75 +17,77 @@ using namespace std;
 class MPQArchive
 {
 
-public:
-    mpq_archive_s *mpq_a;
-
-    MPQArchive(const char* filename);
-    void close();
-
-    void GetFileListTo(vector<string>& filelist) {
-    	uint32 filenum;
-    	if(libmpq__file_number(mpq_a, "(listfile)", &filenum)) return;
-    	libmpq__off_t size, transferred;
-		libmpq__file_unpacked_size(mpq_a, filenum, &size);
-
-        char *buffer = new char[size];
-
-		libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred);
-
-        char seps[] = "\n";
-        char *token;
-
-        token = strtok( buffer, seps );
-        uint32 counter = 0;
-        while ((token != NULL) && (counter < size)) {
-            //cout << token << endl;
-            token[strlen(token) - 1] = 0;
-            string s = token;
-            filelist.push_back(s);
-            counter += strlen(token) + 2;
-            token = strtok(NULL, seps);
+    public:
+        mpq_archive_s* mpq_a;
+
+        MPQArchive(const char* filename);
+        void close();
+
+        void GetFileListTo(vector<string>& filelist)
+        {
+            uint32 filenum;
+            if (libmpq__file_number(mpq_a, "(listfile)", &filenum)) return;
+            libmpq__off_t size, transferred;
+            libmpq__file_unpacked_size(mpq_a, filenum, &size);
+
+            char* buffer = new char[size];
+
+            libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred);
+
+            char seps[] = "\n";
+            char* token;
+
+            token = strtok(buffer, seps);
+            uint32 counter = 0;
+            while ((token != NULL) && (counter < size))
+            {
+                //cout << token << endl;
+                token[strlen(token) - 1] = 0;
+                string s = token;
+                filelist.push_back(s);
+                counter += strlen(token) + 2;
+                token = strtok(NULL, seps);
+            }
+
+            delete[] buffer;
         }
-
-        delete[] buffer;
-    }
 };
 typedef std::deque<MPQArchive*> ArchiveSet;
 
 class MPQFile
 {
-    //MPQHANDLE handle;
-    bool eof;
-    char *buffer;
-    libmpq__off_t pointer,size;
-
-    // disable copying
-    MPQFile(const MPQFile &f) {}
-    void operator=(const MPQFile &f) {}
-
-public:
-    MPQFile(const char* filename);    // filenames are not case sensitive
-    ~MPQFile() { close(); }
-    size_t read(void* dest, size_t bytes);
-    size_t getSize() { return size; }
-    size_t getPos() { return pointer; }
-    char* getBuffer() { return buffer; }
-    char* getPointer() { return buffer + pointer; }
-    bool isEof() { return eof; }
-    void seek(int offset);
-    void seekRelative(int offset);
-    void close();
+        //MPQHANDLE handle;
+        bool eof;
+        char* buffer;
+        libmpq__off_t pointer, size;
+
+        // disable copying
+        MPQFile(const MPQFile& f) {}
+        void operator=(const MPQFile& f) {}
+
+    public:
+        MPQFile(const char* filename);    // filenames are not case sensitive
+        ~MPQFile() { close(); }
+        size_t read(void* dest, size_t bytes);
+        size_t getSize() { return size; }
+        size_t getPos() { return pointer; }
+        char* getBuffer() { return buffer; }
+        char* getPointer() { return buffer + pointer; }
+        bool isEof() { return eof; }
+        void seek(int offset);
+        void seekRelative(int offset);
+        void close();
 };
 
-inline void flipcc(char *fcc)
+inline void flipcc(char* fcc)
 {
     char t;
-    t=fcc[0];
-    fcc[0]=fcc[3];
-    fcc[3]=t;
-    t=fcc[1];
-    fcc[1]=fcc[2];
-    fcc[2]=t;
+    t = fcc[0];
+    fcc[0] = fcc[3];
+    fcc[3] = t;
+    t = fcc[1];
+    fcc[1] = fcc[2];
+    fcc[2] = t;
 }
 
 #endif
diff --git a/contrib/vmap_extractor_v3/vmapextract/vec3d.h b/contrib/vmap_extractor_v3/vmapextract/vec3d.h
index 06a5b730f16..be53961253e 100644
--- a/contrib/vmap_extractor_v3/vmapextract/vec3d.h
+++ b/contrib/vmap_extractor_v3/vmapextract/vec3d.h
@@ -6,225 +6,227 @@
 
 class Vec3D
 {
-public:
-    float x,y,z;
-
-    Vec3D(float x0 = 0.0f, float y0 = 0.0f, float z0 = 0.0f) : x(x0), y(y0), z(z0) {}
-
-    Vec3D(const Vec3D& v) : x(v.x), y(v.y), z(v.z) {}
-
-    Vec3D& operator= (const Vec3D &v) {
-        x = v.x;
-        y = v.y;
-        z = v.z;
-        return *this;
-    }
-
-    Vec3D operator+ (const Vec3D &v) const
-    {
-        Vec3D r(x+v.x,y+v.y,z+v.z);
-        return r;
-    }
-
-    Vec3D operator- (const Vec3D &v) const
-    {
-        Vec3D r(x-v.x,y-v.y,z-v.z);
-        return r;
-    }
-
-    float operator* (const Vec3D &v) const
-    {
-        return x*v.x + y*v.y + z*v.z;
-    }
-
-    Vec3D operator* (float d) const
-    {
-        Vec3D r(x*d,y*d,z*d);
-        return r;
-    }
-
-    friend Vec3D operator* (float d, const Vec3D& v)
-    {
-        return v * d;
-    }
-
-    Vec3D operator% (const Vec3D &v) const
-    {
-        Vec3D r(y*v.z-z*v.y, z*v.x-x*v.z, x*v.y-y*v.x);
-        return r;
-    }
-
-    Vec3D& operator+= (const Vec3D &v)
-    {
-        x += v.x;
-        y += v.y;
-        z += v.z;
-        return *this;
-    }
-
-    Vec3D& operator-= (const Vec3D &v)
-    {
-        x -= v.x;
-        y -= v.y;
-        z -= v.z;
-        return *this;
-    }
-
-    Vec3D& operator*= (float d)
-    {
-        x *= d;
-        y *= d;
-        z *= d;
-        return *this;
-    }
-
-    float lengthSquared() const
-    {
-        return x*x+y*y+z*z;
-    }
-
-    float length() const
-    {
-        return sqrt(x*x+y*y+z*z);
-    }
-
-    Vec3D& normalize()
-    {
-        this->operator*= (1.0f/length());
-        return *this;
-    }
-
-    Vec3D operator~ () const
-    {
-        Vec3D r(*this);
-        r.normalize();
-        return r;
-    }
-
-    friend std::istream& operator>>(std::istream& in, Vec3D& v)
-    {
-        in >> v.x >> v.y >> v.z;
-        return in;
-    }
-
-    friend std::ostream& operator<<(std::ostream& out, const Vec3D& v)
-    {
-        out << v.x << " " << v.y << " " << v.z;
-        return out;
-    }
-
-    operator float*()
-    {
-        return (float*)this;
-    }
+    public:
+        float x, y, z;
+
+        Vec3D(float x0 = 0.0f, float y0 = 0.0f, float z0 = 0.0f) : x(x0), y(y0), z(z0) {}
+
+        Vec3D(const Vec3D& v) : x(v.x), y(v.y), z(v.z) {}
+
+        Vec3D& operator= (const Vec3D& v)
+        {
+            x = v.x;
+            y = v.y;
+            z = v.z;
+            return *this;
+        }
+
+        Vec3D operator+ (const Vec3D& v) const
+        {
+            Vec3D r(x + v.x, y + v.y, z + v.z);
+            return r;
+        }
+
+        Vec3D operator- (const Vec3D& v) const
+        {
+            Vec3D r(x - v.x, y - v.y, z - v.z);
+            return r;
+        }
+
+        float operator* (const Vec3D& v) const
+        {
+            return x * v.x + y * v.y + z * v.z;
+        }
+
+        Vec3D operator* (float d) const
+        {
+            Vec3D r(x * d, y * d, z * d);
+            return r;
+        }
+
+        friend Vec3D operator* (float d, const Vec3D& v)
+        {
+            return v * d;
+        }
+
+        Vec3D operator% (const Vec3D& v) const
+        {
+            Vec3D r(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x);
+            return r;
+        }
+
+        Vec3D& operator+= (const Vec3D& v)
+        {
+            x += v.x;
+            y += v.y;
+            z += v.z;
+            return *this;
+        }
+
+        Vec3D& operator-= (const Vec3D& v)
+        {
+            x -= v.x;
+            y -= v.y;
+            z -= v.z;
+            return *this;
+        }
+
+        Vec3D& operator*= (float d)
+        {
+            x *= d;
+            y *= d;
+            z *= d;
+            return *this;
+        }
+
+        float lengthSquared() const
+        {
+            return x * x + y * y + z * z;
+        }
+
+        float length() const
+        {
+            return sqrt(x * x + y * y + z * z);
+        }
+
+        Vec3D& normalize()
+        {
+            this->operator*= (1.0f / length());
+            return *this;
+        }
+
+        Vec3D operator~() const
+        {
+            Vec3D r(*this);
+            r.normalize();
+            return r;
+        }
+
+        friend std::istream& operator>>(std::istream& in, Vec3D& v)
+        {
+            in >> v.x >> v.y >> v.z;
+            return in;
+        }
+
+        friend std::ostream& operator<<(std::ostream& out, const Vec3D& v)
+        {
+            out << v.x << " " << v.y << " " << v.z;
+            return out;
+        }
+
+        operator float* ()
+        {
+            return (float*)this;
+        }
 };
 
 
 class Vec2D
 {
-public:
-    float x,y;
-
-    Vec2D(float x0 = 0.0f, float y0 = 0.0f) : x(x0), y(y0) {}
-
-    Vec2D(const Vec2D& v) : x(v.x), y(v.y) {}
-
-    Vec2D& operator= (const Vec2D &v) {
-        x = v.x;
-        y = v.y;
-        return *this;
-    }
-
-    Vec2D operator+ (const Vec2D &v) const
-    {
-        Vec2D r(x+v.x,y+v.y);
-        return r;
-    }
-
-    Vec2D operator- (const Vec2D &v) const
-    {
-        Vec2D r(x-v.x,y-v.y);
-        return r;
-    }
-
-    float operator* (const Vec2D &v) const
-    {
-        return x*v.x + y*v.y;
-    }
-
-    Vec2D operator* (float d) const
-    {
-        Vec2D r(x*d,y*d);
-        return r;
-    }
-
-    friend Vec2D operator* (float d, const Vec2D& v)
-    {
-        return v * d;
-    }
-
-    Vec2D& operator+= (const Vec2D &v)
-    {
-        x += v.x;
-        y += v.y;
-        return *this;
-    }
-
-    Vec2D& operator-= (const Vec2D &v)
-    {
-        x -= v.x;
-        y -= v.y;
-        return *this;
-    }
-
-    Vec2D& operator*= (float d)
-    {
-        x *= d;
-        y *= d;
-        return *this;
-    }
-
-    float lengthSquared() const
-    {
-        return x*x+y*y;
-    }
-
-    float length() const
-    {
-        return sqrt(x*x+y*y);
-    }
-
-    Vec2D& normalize()
-    {
-        this->operator*= (1.0f/length());
-        return *this;
-    }
-
-    Vec2D operator~ () const
-    {
-        Vec2D r(*this);
-        r.normalize();
-        return r;
-    }
-
-
-    friend std::istream& operator>>(std::istream& in, Vec2D& v)
-    {
-        in >> v.x >> v.y;
-        return in;
-    }
-
-    operator float*()
-    {
-        return (float*)this;
-    }
+    public:
+        float x, y;
+
+        Vec2D(float x0 = 0.0f, float y0 = 0.0f) : x(x0), y(y0) {}
+
+        Vec2D(const Vec2D& v) : x(v.x), y(v.y) {}
+
+        Vec2D& operator= (const Vec2D& v)
+        {
+            x = v.x;
+            y = v.y;
+            return *this;
+        }
+
+        Vec2D operator+ (const Vec2D& v) const
+        {
+            Vec2D r(x + v.x, y + v.y);
+            return r;
+        }
+
+        Vec2D operator- (const Vec2D& v) const
+        {
+            Vec2D r(x - v.x, y - v.y);
+            return r;
+        }
+
+        float operator* (const Vec2D& v) const
+        {
+            return x * v.x + y * v.y;
+        }
+
+        Vec2D operator* (float d) const
+        {
+            Vec2D r(x * d, y * d);
+            return r;
+        }
+
+        friend Vec2D operator* (float d, const Vec2D& v)
+        {
+            return v * d;
+        }
+
+        Vec2D& operator+= (const Vec2D& v)
+        {
+            x += v.x;
+            y += v.y;
+            return *this;
+        }
+
+        Vec2D& operator-= (const Vec2D& v)
+        {
+            x -= v.x;
+            y -= v.y;
+            return *this;
+        }
+
+        Vec2D& operator*= (float d)
+        {
+            x *= d;
+            y *= d;
+            return *this;
+        }
+
+        float lengthSquared() const
+        {
+            return x * x + y * y;
+        }
+
+        float length() const
+        {
+            return sqrt(x * x + y * y);
+        }
+
+        Vec2D& normalize()
+        {
+            this->operator*= (1.0f / length());
+            return *this;
+        }
+
+        Vec2D operator~() const
+        {
+            Vec2D r(*this);
+            r.normalize();
+            return r;
+        }
+
+
+        friend std::istream& operator>>(std::istream& in, Vec2D& v)
+        {
+            in >> v.x >> v.y;
+            return in;
+        }
+
+        operator float* ()
+        {
+            return (float*)this;
+        }
 };
 
-inline void rotate(float x0, float y0, float *x, float *y, float angle)
+inline void rotate(float x0, float y0, float* x, float* y, float angle)
 {
     float xa = *x - x0, ya = *y - y0;
-    *x = xa*cosf(angle) - ya*sinf(angle) + x0;
-    *y = xa*sinf(angle) + ya*cosf(angle) + y0;
+    *x = xa * cosf(angle) - ya * sinf(angle) + x0;
+    *y = xa * sinf(angle) + ya * cosf(angle) + y0;
 }
 
 #endif
diff --git a/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp b/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp
index 12a028ce8d7..15535c80ccf 100644
--- a/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp
+++ b/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp
@@ -23,11 +23,16 @@
 #include <list>
 #include <errno.h>
 
-#ifdef WIN32
-    #include <Windows.h>
-    #include <sys/stat.h>
-    #include <direct.h>
-    #define mkdir _mkdir
+#if defined (WIN32)
+    #if defined (__MINGW32__)
+        #include <windows.h>
+        #include <sys/stat.h>
+    #else
+        #include <Windows.h>
+        #include <sys/stat.h>
+        #include <direct.h>
+        #define mkdir _mkdir
+    #endif
 #else
     #include <sys/stat.h>
 #endif
@@ -47,6 +52,8 @@
 #include "wmo.h"
 #include "mpq_libmpq04.h"
 
+#include "vmapexport.h"
+
 //------------------------------------------------------------------------------
 // Defines
 
@@ -60,31 +67,41 @@ typedef struct
 {
     char name[64];
     unsigned int id;
-}map_id;
+} map_id;
 
-map_id * map_ids;
-uint16 *LiqType = 0;
+map_id* map_ids;
+uint16* LiqType = 0;
 uint32 map_count;
-char output_path[128]=".";
-char input_path[1024]=".";
+char output_path[128] = ".";
+char input_path[1024] = ".";
 bool hasInputPathParam = false;
 bool preciseVectorData = false;
 
 // Constants
 
 //static const char * szWorkDirMaps = ".\\Maps";
-const char * szWorkDirWmo = "./Buildings";
-const char * szRawVMAPMagic = "VMAP003";
+const char* szWorkDirWmo = "./Buildings";
+const char* szRawVMAPMagic = "VMAP004";
 
 // Local testing functions
 
-static const char * GetPlainName(const char * szFileName)
+bool FileExists(const char* file)
 {
-    const char * szTemp;
+    if (FILE* n = fopen(file, "rb"))
+    {
+        fclose(n);
+        return true;
+    }
+    return false;
+}
 
-    if((szTemp = strrchr(szFileName, '\\')) != NULL)
-        szFileName = szTemp + 1;
-    return szFileName;
+void strToLower(char* str)
+{
+    while (*str)
+    {
+        *str = tolower(*str);
+        ++str;
+    }
 }
 
 // copied from contrib/extractor/System.cpp
@@ -92,7 +109,7 @@ void ReadLiquidTypeTableDBC()
 {
     printf("Read LiquidType.dbc file...");
     DBCFile dbc("DBFilesClient\\LiquidType.dbc");
-    if(!dbc.open())
+    if (!dbc.open())
     {
         printf("Fatal error: Invalid LiquidType.dbc file format!\n");
         exit(1);
@@ -103,16 +120,15 @@ void ReadLiquidTypeTableDBC()
     LiqType = new uint16[LiqType_maxid + 1];
     memset(LiqType, 0xff, (LiqType_maxid + 1) * sizeof(uint16));
 
-    for(uint32 x = 0; x < LiqType_count; ++x)
+    for (uint32 x = 0; x < LiqType_count; ++x)
         LiqType[dbc.getRecord(x).getUInt(0)] = dbc.getRecord(x).getUInt(3);
 
     printf("Done! (%u LiqTypes loaded)\n", (unsigned int)LiqType_count);
 }
 
-int ExtractWmo()
+bool ExtractWmo()
 {
-    char   szLocalFile[1024] = "";
-    bool success=true;
+    bool success = true;
 
     //const char* ParsArchiveNames[] = {"patch-2.MPQ", "patch.MPQ", "common.MPQ", "expansion.MPQ"};
 
@@ -121,118 +137,122 @@ int ExtractWmo()
         vector<string> filelist;
 
         (*ar_itr)->GetFileListTo(filelist);
-        for (vector<string>::iterator fname=filelist.begin(); fname != filelist.end() && success; ++fname)
+        for (vector<string>::iterator fname = filelist.begin(); fname != filelist.end() && success; ++fname)
         {
-            bool file_ok=true;
             if (fname->find(".wmo") != string::npos)
-            {
-                // Copy files from archive
-                //std::cout << "found *.wmo file " << *fname << std::endl;
-                sprintf(szLocalFile, "%s/%s", szWorkDirWmo, GetPlainName(fname->c_str()));
-                fixnamen(szLocalFile,strlen(szLocalFile));
-                FILE * n;
-                if ((n = fopen(szLocalFile, "rb"))== NULL)
-                {
-                    int p = 0;
-                    //Select root wmo files
-                    const char * rchr = strrchr(GetPlainName(fname->c_str()),0x5f);
-                    if(rchr != NULL)
-                    {
-                        char cpy[4];
-                        strncpy((char*)cpy,rchr,4);
-                        for (int i=0;i<4; ++i)
-                        {
-                            int m = cpy[i];
-                            if(isdigit(m))
-                                p++;
-                        }
-                    }
-                    if(p != 3)
-                    {
-                        std::cout << "Extracting " << *fname << std::endl;
-                        WMORoot * froot = new WMORoot(*fname);
-                        if(!froot->open())
-                        {
-                            printf("Couldn't open RootWmo!!!\n");
-                            delete froot;
-                            continue;
-                        }
-                        FILE *output=fopen(szLocalFile,"wb");
-                        if(!output)
-                        {
-                            printf("couldn't open %s for writing!\n", szLocalFile);
-                            success=false;
-                        }
-                        froot->ConvertToVMAPRootWmo(output);
-                        int Wmo_nVertices = 0;
-                        //printf("root has %d groups\n", froot->nGroups);
-                        if(froot->nGroups !=0)
-                        {
-                            for (uint32 i=0; i<froot->nGroups; ++i)
-                            {
-                                char temp[1024];
-                                strcpy(temp, fname->c_str());
-                                temp[fname->length()-4] = 0;
-                                char groupFileName[1024];
-                                sprintf(groupFileName,"%s_%03d.wmo",temp, i);
-                                //printf("Trying to open groupfile %s\n",groupFileName);
-                                string s = groupFileName;
-                                WMOGroup * fgroup = new WMOGroup(s);
-                                if(!fgroup->open())
-                                {
-                                    printf("Could not open all Group file for: %s\n",GetPlainName(fname->c_str()));
-                                    file_ok=false;
-                                    break;
-                                }
-
-                                Wmo_nVertices += fgroup->ConvertToVMAPGroupWmo(output, froot, preciseVectorData);
-                                delete fgroup;
-                            }
-                        }
-                        fseek(output, 8, SEEK_SET); // store the correct no of vertices
-                        fwrite(&Wmo_nVertices,sizeof(int),1,output);
-                        fclose(output);
-                        delete froot;
-                    }
-                }
-                else
-                {
-                    fclose(n);
-                }
-            }
-            // Delete the extracted file in the case of an error
-            if(!file_ok)
-                remove(szLocalFile);
+                success = ExtractSingleWmo(*fname);
         }
     }
 
-    if(success)
+    if (success)
         printf("\nExtract wmo complete (No (fatal) errors)\n");
 
     return success;
 }
 
+bool ExtractSingleWmo(std::string& fname)
+{
+    // Copy files from archive
+
+    char szLocalFile[1024];
+    const char* plain_name = GetPlainName(fname.c_str());
+    sprintf(szLocalFile, "%s/%s", szWorkDirWmo, plain_name);
+    fixnamen(szLocalFile, strlen(szLocalFile));
+
+    if (FileExists(szLocalFile))
+        return true;
+
+    int p = 0;
+    //Select root wmo files
+    const char* rchr = strrchr(plain_name, '_');
+    if (rchr != NULL)
+    {
+        char cpy[4];
+        strncpy((char*)cpy, rchr, 4);
+        for (int i = 0; i < 4; ++i)
+        {
+            int m = cpy[i];
+            if (isdigit(m))
+                p++;
+        }
+    }
+
+    if (p == 3)
+        return true;
+
+    bool file_ok = true;
+    std::cout << "Extracting " << fname << std::endl;
+    WMORoot froot(fname);
+    if (!froot.open())
+    {
+        printf("Couldn't open RootWmo!!!\n");
+        return true;
+    }
+    FILE* output = fopen(szLocalFile, "wb");
+    if (!output)
+    {
+        printf("couldn't open %s for writing!\n", szLocalFile);
+        return false;
+    }
+    froot.ConvertToVMAPRootWmo(output);
+    int Wmo_nVertices = 0;
+    //printf("root has %d groups\n", froot->nGroups);
+    if (froot.nGroups != 0)
+    {
+        for (uint32 i = 0; i < froot.nGroups; ++i)
+        {
+            char temp[1024];
+            strcpy(temp, fname.c_str());
+            temp[fname.length() - 4] = 0;
+            char groupFileName[1024];
+            sprintf(groupFileName, "%s_%03d.wmo", temp, i);
+            //printf("Trying to open groupfile %s\n",groupFileName);
+
+            string s = groupFileName;
+            WMOGroup fgroup(s);
+            if (!fgroup.open())
+            {
+                printf("Could not open all Group file for: %s\n", plain_name);
+                file_ok = false;
+                break;
+            }
+
+            Wmo_nVertices += fgroup.ConvertToVMAPGroupWmo(output, &froot, preciseVectorData);
+        }
+    }
+
+    fseek(output, 8, SEEK_SET); // store the correct no of vertices
+    fwrite(&Wmo_nVertices, sizeof(int), 1, output);
+    fclose(output);
+
+    // Delete the extracted file in the case of an error
+    if (!file_ok)
+        remove(szLocalFile);
+    return true;
+}
+
 void ParsMapFiles()
 {
     char fn[512];
     //char id_filename[64];
     char id[10];
-    for (unsigned int i=0; i<map_count; ++i)
+    StringSet failedPaths;
+    for (unsigned int i = 0; i < map_count; ++i)
     {
-        sprintf(id,"%03u",map_ids[i].id);
-        sprintf(fn,"World\\Maps\\%s\\%s.wdt", map_ids[i].name, map_ids[i].name);
-        WDTFile WDT(fn,map_ids[i].name);
-        if(WDT.init(id, map_ids[i].id))
+        sprintf(id, "%03u", map_ids[i].id);
+        sprintf(fn, "World\\Maps\\%s\\%s.wdt", map_ids[i].name, map_ids[i].name);
+        WDTFile WDT(fn, map_ids[i].name);
+        if (WDT.init(id, map_ids[i].id))
         {
             printf("Processing Map %u\n[", map_ids[i].id);
-            for (int x=0; x<64; ++x)
+            for (int x = 0; x < 64; ++x)
             {
-                for (int y=0; y<64; ++y)
+                for (int y = 0; y < 64; ++y)
                 {
-                    if (ADTFile *ADT = WDT.GetMap(x,y))
+                    if (ADTFile* ADT = WDT.GetMap(x, y))
                     {
                         //sprintf(id_filename,"%02u %02u %03u",x,y,map_ids[i].id);//!!!!!!!!!
-                        ADT->init(map_ids[i].id, x, y);
+                        ADT->init(map_ids[i].id, x, y, failedPaths);
                         delete ADT;
                     }
                 }
@@ -242,27 +262,22 @@ void ParsMapFiles()
             printf("]\n");
         }
     }
+
+    if (!failedPaths.empty())
+    {
+        printf("Warning: Some models could not be extracted, see below\n");
+        for (StringSet::const_iterator itr = failedPaths.begin(); itr != failedPaths.end(); ++itr)
+            printf("Could not find file of model %s\n", itr->c_str());
+        printf("A few not found models can be expected and are not alarming.\n");
+    }
 }
 
 void getGamePath()
 {
 #ifdef _WIN32
-    HKEY key;
-    DWORD t,s;
-    LONG l;
-    s = sizeof(input_path);
-    memset(input_path,0,s);
-    l = RegOpenKeyEx(HKEY_LOCAL_MACHINE,"SOFTWARE\\Blizzard Entertainment\\World of Warcraft",0,KEY_QUERY_VALUE,&key);
-    //l = RegOpenKeyEx(HKEY_LOCAL_MACHINE,"SOFTWARE\\Blizzard Entertainment\\Burning Crusade Closed Beta",0,KEY_QUERY_VALUE,&key);
-    l = RegQueryValueEx(key,"InstallPath",0,&t,(LPBYTE)input_path,&s);
-    RegCloseKey(key);
-    if (strlen(input_path) > 0)
-    {
-        if (input_path[strlen(input_path) - 1] != '\\') strcat(input_path, "\\");
-    }
-    strcat(input_path,"Data\\");
+    strcpy(input_path, "Data\\");
 #else
-    strcpy(input_path,"Data/");
+    strcpy(input_path, "Data/");
 #endif
 }
 
@@ -282,9 +297,9 @@ bool scan_patches(char* scanmatch, std::vector<std::string>& pArchiveNames)
             sprintf(path, "%s.MPQ", scanmatch);
         }
 #ifdef __linux__
-        if(FILE* h = fopen64(path, "rb"))
+        if (FILE* h = fopen64(path, "rb"))
 #else
-        if(FILE* h = fopen(path, "rb"))
+        if (FILE* h = fopen(path, "rb"))
 #endif
         {
             fclose(h);
@@ -298,7 +313,7 @@ bool scan_patches(char* scanmatch, std::vector<std::string>& pArchiveNames)
 
 bool fillArchiveNameVector(std::vector<std::string>& pArchiveNames)
 {
-    if(!hasInputPathParam)
+    if (!hasInputPathParam)
         getGamePath();
 
     printf("\nGame path: %s\n", input_path);
@@ -362,13 +377,13 @@ bool fillArchiveNameVector(std::vector<std::string>& pArchiveNames)
     {
         printf("Locale: %s\n", i->c_str());
         sprintf(path, "%s%s/patch-%s", input_path, i->c_str(), i->c_str());
-        if(scan_patches(path, pArchiveNames))
+        if (scan_patches(path, pArchiveNames))
             foundOne = true;
     }
 
     printf("\n");
 
-    if(!foundOne)
+    if (!foundOne)
     {
         printf("no locale found\n");
         return false;
@@ -377,24 +392,24 @@ bool fillArchiveNameVector(std::vector<std::string>& pArchiveNames)
     return true;
 }
 
-bool processArgv(int argc, char ** argv, const char *versionString)
+bool processArgv(int argc, char** argv)
 {
     bool result = true;
     hasInputPathParam = false;
     bool preciseVectorData = false;
 
-    for(int i=1; i< argc; ++i)
+    for (int i = 1; i < argc; ++i)
     {
-        if(strcmp("-s",argv[i]) == 0)
+        if (strcmp("-s", argv[i]) == 0)
         {
             preciseVectorData = false;
         }
-        else if(strcmp("-d",argv[i]) == 0)
+        else if (strcmp("-d", argv[i]) == 0)
         {
-            if((i+1)<argc)
+            if ((i + 1) < argc)
             {
                 hasInputPathParam = true;
-                strcpy(input_path, argv[i+1]);
+                strcpy(input_path, argv[i + 1]);
                 if (input_path[strlen(input_path) - 1] != '\\' || input_path[strlen(input_path) - 1] != '/')
                     strcat(input_path, "/");
                 ++i;
@@ -404,11 +419,11 @@ bool processArgv(int argc, char ** argv, const char *versionString)
                 result = false;
             }
         }
-        else if(strcmp("-?",argv[1]) == 0)
+        else if (strcmp("-?", argv[1]) == 0)
         {
             result = false;
         }
-        else if(strcmp("-l",argv[i]) == 0)
+        else if (strcmp("-l", argv[i]) == 0)
         {
             preciseVectorData = true;
         }
@@ -418,9 +433,9 @@ bool processArgv(int argc, char ** argv, const char *versionString)
             break;
         }
     }
-    if(!result)
+    if (!result)
     {
-        printf("Extract %s.\n",versionString);
+        printf("Extract for %s.\n", szRawVMAPMagic);
         printf("%s [-?][-s][-l][-d <path>]\n", argv[0]);
         printf("   -s : (default) small size (data size optimization), ~500MB less vmap data.\n");
         printf("   -l : large size, ~500MB more vmap data. (might contain more details)\n");
@@ -430,6 +445,7 @@ bool processArgv(int argc, char ** argv, const char *versionString)
     return result;
 }
 
+
 //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 // Main
 //
@@ -439,13 +455,12 @@ bool processArgv(int argc, char ** argv, const char *versionString)
 // Arg2 - Listfile name
 //
 
-int main(int argc, char ** argv)
+int main(int argc, char** argv)
 {
-    bool success=true;
-    const char *versionString = "V3.00 2010_07";
+    bool success = true;
 
     // Use command line arguments, when some
-    if(!processArgv(argc, argv, versionString))
+    if (!processArgv(argc, argv))
         return 1;
 
     // some simple check if working dir is dirty
@@ -464,55 +479,55 @@ int main(int argc, char ** argv)
         }
     }
 
-    printf("Extract %s. Beginning work ....\n",versionString);
+    printf("Extract for %s. Beginning work ....\n", szRawVMAPMagic);
     //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     // Create the working directory
-    if(mkdir(szWorkDirWmo
+    if (mkdir(szWorkDirWmo
 #ifdef __linux__
-                    , 0711
+              , 0711
 #endif
-                    ))
-            success = (errno == EEXIST);
+             ))
+        success = (errno == EEXIST);
 
     // prepare archive name list
     std::vector<std::string> archiveNames;
     fillArchiveNameVector(archiveNames);
-    for (size_t i=0; i < archiveNames.size(); ++i)
+    for (size_t i = 0; i < archiveNames.size(); ++i)
     {
-        MPQArchive *archive = new MPQArchive(archiveNames[i].c_str());
-        if(!gOpenArchives.size() || gOpenArchives.front() != archive)
+        MPQArchive* archive = new MPQArchive(archiveNames[i].c_str());
+        if (!gOpenArchives.size() || gOpenArchives.front() != archive)
             delete archive;
     }
 
-    if(gOpenArchives.empty())
+    if (gOpenArchives.empty())
     {
-        printf("FATAL ERROR: None MPQ archive found by path '%s'. Use -d option with proper path.\n",input_path);
+        printf("FATAL ERROR: None MPQ archive found by path '%s'. Use -d option with proper path.\n", input_path);
         return 1;
     }
     ReadLiquidTypeTableDBC();
 
     // extract data
-    if(success)
+    if (success)
         success = ExtractWmo();
 
     //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     //map.dbc
-    if(success)
+    if (success)
     {
-        DBCFile * dbc = new DBCFile("DBFilesClient\\Map.dbc");
-        if(!dbc->open())
+        DBCFile* dbc = new DBCFile("DBFilesClient\\Map.dbc");
+        if (!dbc->open())
         {
             delete dbc;
             printf("FATAL ERROR: Map.dbc not found in data file.\n");
             return 1;
         }
-        map_count=dbc->getRecordCount ();
-        map_ids=new map_id[map_count];
-        for(unsigned int x=0;x<map_count;++x)
+        map_count = dbc->getRecordCount();
+        map_ids = new map_id[map_count];
+        for (unsigned int x = 0; x < map_count; ++x)
         {
-            map_ids[x].id=dbc->getRecord (x).getUInt(0);
-            strcpy(map_ids[x].name,dbc->getRecord(x).getString(1));
-            printf("Map - %s\n",map_ids[x].name);
+            map_ids[x].id = dbc->getRecord(x).getUInt(0);
+            strcpy(map_ids[x].name, dbc->getRecord(x).getString(1));
+            printf("Map - %s\n", map_ids[x].name);
         }
 
 
@@ -520,16 +535,18 @@ int main(int argc, char ** argv)
         ParsMapFiles();
         delete [] map_ids;
         //nError = ERROR_SUCCESS;
+        // Extract models, listed in DameObjectDisplayInfo.dbc
+        ExtractGameobjectModels();
     }
 
     printf("\n");
-    if(!success)
+    if (!success)
     {
-        printf("ERROR: Extract %s. Work NOT complete.\n   Precise vector data=%d.\nPress any key.\n",versionString, preciseVectorData);
+        printf("ERROR: Extract for %s. Work NOT complete.\n   Precise vector data=%d.\nPress any key.\n", szRawVMAPMagic, preciseVectorData);
         getchar();
     }
 
-    printf("Extract %s. Work complete. No errors.\n",versionString);
+    printf("Extract for %s. Work complete. No errors.\n", szRawVMAPMagic);
     delete [] LiqType;
     return 0;
 }
diff --git a/contrib/vmap_extractor_v3/vmapextract/vmapexport.h b/contrib/vmap_extractor_v3/vmapextract/vmapexport.h
index 400f311cd0b..b05fe3128b3 100644
--- a/contrib/vmap_extractor_v3/vmapextract/vmapexport.h
+++ b/contrib/vmap_extractor_v3/vmapextract/vmapexport.h
@@ -19,14 +19,32 @@
 #ifndef VMAPEXPORT_H
 #define VMAPEXPORT_H
 
+#include <string>
+#include <set>
+
+typedef std::set<std::string> StringSet;
+
 enum ModelFlags
 {
-	MOD_M2 = 1,
-	MOD_WORLDSPAWN = 1<<1,
-    MOD_HAS_BOUND = 1<<2
+    MOD_M2 = 1,
+    MOD_WORLDSPAWN = 1 << 1,
+    MOD_HAS_BOUND = 1 << 2
 };
 
-extern const char * szWorkDirWmo;
-extern const char * szRawVMAPMagic;                         // vmap magic string for extracted raw vmap data
+extern const char* szWorkDirWmo;
+extern const char* szRawVMAPMagic;                          // vmap magic string for extracted raw vmap data
+
+bool FileExists(const char* file);
+void strToLower(char* str);
+
+bool ExtractSingleWmo(std::string& fname);
+
+/* @param origPath = original path of the model, cleaned with fixnamen and fixname2
+ * @param fixedName = will store the translated name (if changed)
+ * @param failedPaths = Set to collect errors
+ */
+bool ExtractSingleModel(std::string& origPath, std::string& fixedName, StringSet& failedPaths);
+
+void ExtractGameobjectModels();
 
 #endif
diff --git a/contrib/vmap_extractor_v3/vmapextract/wdtfile.cpp b/contrib/vmap_extractor_v3/vmapextract/wdtfile.cpp
index 8f7443c3faf..a3ae3c63dbe 100644
--- a/contrib/vmap_extractor_v3/vmapextract/wdtfile.cpp
+++ b/contrib/vmap_extractor_v3/vmapextract/wdtfile.cpp
@@ -21,21 +21,21 @@
 #include "adtfile.h"
 #include <cstdio>
 
-char * wdtGetPlainName(char * FileName)
+char* wdtGetPlainName(char* FileName)
 {
-    char * szTemp;
+    char* szTemp;
 
-    if((szTemp = strrchr(FileName, '\\')) != NULL)
+    if ((szTemp = strrchr(FileName, '\\')) != NULL)
         FileName = szTemp + 1;
     return FileName;
 }
 
-WDTFile::WDTFile(char* file_name, char* file_name1):WDT(file_name)
+WDTFile::WDTFile(char* file_name, char* file_name1): WDT(file_name)
 {
-    filename.append(file_name1,strlen(file_name1));
+    filename.append(file_name1, strlen(file_name1));
 }
 
-bool WDTFile::init(char *map_id, unsigned int mapID)
+bool WDTFile::init(char* map_id, unsigned int mapID)
 {
     if (WDT.isEof())
     {
@@ -47,9 +47,9 @@ bool WDTFile::init(char *map_id, unsigned int mapID)
     uint32 size;
 
     std::string dirname = std::string(szWorkDirWmo) + "/dir_bin";
-    FILE *dirfile;
+    FILE* dirfile;
     dirfile = fopen(dirname.c_str(), "ab");
-    if(!dirfile)
+    if (!dirfile)
     {
         printf("Can't open dirfile!'%s'\n", dirname.c_str());
         return false;
@@ -57,7 +57,7 @@ bool WDTFile::init(char *map_id, unsigned int mapID)
 
     while (!WDT.isEof())
     {
-        WDT.read(fourcc,4);
+        WDT.read(fourcc, 4);
         WDT.read(&size, 4);
 
         flipcc(fourcc);
@@ -65,31 +65,31 @@ bool WDTFile::init(char *map_id, unsigned int mapID)
 
         size_t nextpos = WDT.getPos() + size;
 
-        if (!strcmp(fourcc,"MAIN"))
+        if (!strcmp(fourcc, "MAIN"))
         {
         }
-        if (!strcmp(fourcc,"MWMO"))
+        if (!strcmp(fourcc, "MWMO"))
         {
             // global map objects
             if (size)
             {
-                char *buf = new char[size];
+                char* buf = new char[size];
                 WDT.read(buf, size);
-                char *p=buf;
+                char* p = buf;
                 int q = 0;
                 gWmoInstansName = new string[size];
-                while (p<buf+size)
+                while (p < buf + size)
                 {
                     string path(p);
-                    char* s=wdtGetPlainName(p);
-                    fixnamen(s,strlen(s));
-                    p=p+strlen(p)+1;
+                    char* s = wdtGetPlainName(p);
+                    fixnamen(s, strlen(s));
+                    p = p + strlen(p) + 1;
                     gWmoInstansName[q++] = s;
                 }
                 delete[] buf;
             }
         }
-        else if (!strcmp(fourcc,"MODF"))
+        else if (!strcmp(fourcc, "MODF"))
         {
             // global wmo instance data
             if (size)
@@ -100,11 +100,11 @@ bool WDTFile::init(char *map_id, unsigned int mapID)
                 fake_mapname = "65 65 ";
                 //gWMO_mapname = fake_mapname + filename;
                 gWMO_mapname = fake_mapname + std::string(map_id);
-                for (int i=0; i<gnWMO; ++i)
+                for (int i = 0; i < gnWMO; ++i)
                 {
                     int id;
                     WDT.read(&id, 4);
-                    WMOInstance inst(WDT,gWmoInstansName[id].c_str(),mapID, 65, 65, dirfile);
+                    WMOInstance inst(WDT, gWmoInstansName[id].c_str(), mapID, 65, 65, dirfile);
                 }
                 delete[] gWmoInstansName;
             }
@@ -124,11 +124,11 @@ WDTFile::~WDTFile(void)
 
 ADTFile* WDTFile::GetMap(int x, int z)
 {
-    if(!(x>=0 && z >= 0 && x<64 && z<64))
+    if (!(x >= 0 && z >= 0 && x < 64 && z < 64))
         return NULL;
 
     char name[512];
 
-    sprintf(name,"World\\Maps\\%s\\%s_%d_%d.adt", filename.c_str(), filename.c_str(), x, z);
+    sprintf(name, "World\\Maps\\%s\\%s_%d_%d.adt", filename.c_str(), filename.c_str(), x, z);
     return new ADTFile(name);
 }
diff --git a/contrib/vmap_extractor_v3/vmapextract/wdtfile.h b/contrib/vmap_extractor_v3/vmapextract/wdtfile.h
index ed634fb0706..1504376638e 100644
--- a/contrib/vmap_extractor_v3/vmapextract/wdtfile.h
+++ b/contrib/vmap_extractor_v3/vmapextract/wdtfile.h
@@ -28,20 +28,20 @@ class ADTFile;
 
 class WDTFile
 {
-public:
-    WDTFile(char* file_name, char* file_name1);
-    ~WDTFile(void);
-    bool init(char *map_id, unsigned int mapID);
+    public:
+        WDTFile(char* file_name, char* file_name1);
+        ~WDTFile(void);
+        bool init(char* map_id, unsigned int mapID);
 
-    string* gWmoInstansName;
-    int gnWMO, nMaps;
+        string* gWmoInstansName;
+        int gnWMO, nMaps;
 
-    ADTFile* GetMap(int x, int z);
+        ADTFile* GetMap(int x, int z);
 
-private:
-    MPQFile WDT;
-    bool maps[64][64];
-    string filename;
+    private:
+        MPQFile WDT;
+        bool maps[64][64];
+        string filename;
 };
 
 #endif
diff --git a/contrib/vmap_extractor_v3/vmapextract/wmo.cpp b/contrib/vmap_extractor_v3/vmapextract/wmo.cpp
index fbb3519a38d..c93a90174c6 100644
--- a/contrib/vmap_extractor_v3/vmapextract/wmo.cpp
+++ b/contrib/vmap_extractor_v3/vmapextract/wmo.cpp
@@ -29,18 +29,18 @@
 #include "mpq_libmpq04.h"
 
 using namespace std;
-extern uint16 *LiqType;
+extern uint16* LiqType;
 
-WMORoot::WMORoot(std::string &filename) : filename(filename)
+WMORoot::WMORoot(std::string& filename) : filename(filename)
 {
 }
 
 bool WMORoot::open()
 {
     MPQFile f(filename.c_str());
-    if(f.isEof ())
+    if (f.isEof())
     {
-        printf("No such file.\n");
+        printf("No such file %s.\n", filename.c_str());
         return false;
     }
 
@@ -49,7 +49,7 @@ bool WMORoot::open()
 
     while (!f.isEof())
     {
-        f.read(fourcc,4);
+        f.read(fourcc, 4);
         f.read(&size, 4);
 
         flipcc(fourcc);
@@ -57,7 +57,7 @@ bool WMORoot::open()
 
         size_t nextpos = f.getPos() + size;
 
-        if (!strcmp(fourcc,"MOHD"))//header
+        if (!strcmp(fourcc, "MOHD")) //header
         {
             f.read(&nTextures, 4);
             f.read(&nGroups, 4);
@@ -68,8 +68,8 @@ bool WMORoot::open()
             f.read(&nDoodadSets, 4);
             f.read(&col, 4);
             f.read(&RootWMOID, 4);
-            f.read(bbcorn1,12);
-            f.read(bbcorn2,12);
+            f.read(bbcorn1, 12);
+            f.read(bbcorn2, 12);
             f.read(&liquidType, 4);
             break;
         }
@@ -116,19 +116,19 @@ bool WMORoot::open()
         */
         f.seek((int)nextpos);
     }
-    f.close ();
+    f.close();
     return true;
 }
 
-bool WMORoot::ConvertToVMAPRootWmo(FILE *pOutfile)
+bool WMORoot::ConvertToVMAPRootWmo(FILE* pOutfile)
 {
     //printf("Convert RootWmo...\n");
 
-    fwrite(szRawVMAPMagic,1,8,pOutfile);
+    fwrite(szRawVMAPMagic, 1, 8, pOutfile);
     unsigned int nVectors = 0;
-    fwrite(&nVectors,sizeof(nVectors),1,pOutfile); // will be filled later
-    fwrite(&nGroups,4,1,pOutfile);
-    fwrite(&RootWMOID,4,1,pOutfile);
+    fwrite(&nVectors, sizeof(nVectors), 1, pOutfile); // will be filled later
+    fwrite(&nGroups, 4, 1, pOutfile);
+    fwrite(&RootWMOID, 4, 1, pOutfile);
     return true;
 }
 
@@ -136,15 +136,15 @@ WMORoot::~WMORoot()
 {
 }
 
-WMOGroup::WMOGroup(std::string &filename) : filename(filename),
-        MOPY(0), MOVI(0), MoviEx(0), MOVT(0), MOBA(0), MobaEx(0), hlq(0), LiquEx(0), LiquBytes(0)
+WMOGroup::WMOGroup(std::string& filename) : filename(filename),
+    MOPY(0), MOVI(0), MoviEx(0), MOVT(0), MOBA(0), MobaEx(0), hlq(0), LiquEx(0), LiquBytes(0)
 {
 }
 
 bool WMOGroup::open()
 {
     MPQFile f(filename.c_str());
-    if(f.isEof ())
+    if (f.isEof())
     {
         printf("No such file.\n");
         return false;
@@ -153,10 +153,10 @@ bool WMOGroup::open()
     char fourcc[5];
     while (!f.isEof())
     {
-        f.read(fourcc,4);
+        f.read(fourcc, 4);
         f.read(&size, 4);
         flipcc(fourcc);
-        if (!strcmp(fourcc,"MOGP"))//Fix sizeoff = Data size.
+        if (!strcmp(fourcc, "MOGP")) //Fix sizeoff = Data size.
         {
             size = 68;
         }
@@ -165,7 +165,7 @@ bool WMOGroup::open()
         LiquEx_size = 0;
         liquflags = 0;
 
-        if (!strcmp(fourcc,"MOGP"))//header
+        if (!strcmp(fourcc, "MOGP")) //header
         {
             f.read(&groupName, 4);
             f.read(&descGroupName, 4);
@@ -179,40 +179,39 @@ bool WMOGroup::open()
             f.read(&nBatchC, 4);
             f.read(&fogIdx, 4);
             f.read(&liquidType, 4);
-            f.read(&groupWMOID,4);
-
+            f.read(&groupWMOID, 4);
         }
-        else if (!strcmp(fourcc,"MOPY"))
+        else if (!strcmp(fourcc, "MOPY"))
         {
             MOPY = new char[size];
             mopy_size = size;
             nTriangles = (int)size / 2;
             f.read(MOPY, size);
         }
-        else if (!strcmp(fourcc,"MOVI"))
+        else if (!strcmp(fourcc, "MOVI"))
         {
-            MOVI = new uint16[size/2];
+            MOVI = new uint16[size / 2];
             f.read(MOVI, size);
         }
-        else if (!strcmp(fourcc,"MOVT"))
+        else if (!strcmp(fourcc, "MOVT"))
         {
-            MOVT = new float[size/4];
+            MOVT = new float[size / 4];
             f.read(MOVT, size);
             nVertices = (int)size / 12;
         }
-        else if (!strcmp(fourcc,"MONR"))
+        else if (!strcmp(fourcc, "MONR"))
         {
         }
-        else if (!strcmp(fourcc,"MOTV"))
+        else if (!strcmp(fourcc, "MOTV"))
         {
         }
-        else if (!strcmp(fourcc,"MOBA"))
+        else if (!strcmp(fourcc, "MOBA"))
         {
-            MOBA = new uint16[size/2];
-            moba_size = size/2;
+            MOBA = new uint16[size / 2];
+            moba_size = size / 2;
             f.read(MOBA, size);
         }
-        else if (!strcmp(fourcc,"MLIQ"))
+        else if (!strcmp(fourcc, "MLIQ"))
         {
             liquflags |= 1;
             hlq = new WMOLiquidHeader;
@@ -237,79 +236,79 @@ bool WMOGroup::open()
     return true;
 }
 
-int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool pPreciseVectorData)
+int WMOGroup::ConvertToVMAPGroupWmo(FILE* output, WMORoot* rootWMO, bool pPreciseVectorData)
 {
-    fwrite(&mogpFlags,sizeof(uint32),1,output);
-    fwrite(&groupWMOID,sizeof(uint32),1,output);
+    fwrite(&mogpFlags, sizeof(uint32), 1, output);
+    fwrite(&groupWMOID, sizeof(uint32), 1, output);
     // group bound
     fwrite(bbcorn1, sizeof(float), 3, output);
     fwrite(bbcorn2, sizeof(float), 3, output);
-    fwrite(&liquflags,sizeof(uint32),1,output);
+    fwrite(&liquflags, sizeof(uint32), 1, output);
     int nColTriangles = 0;
-    if(pPreciseVectorData)
+    if (pPreciseVectorData)
     {
         char GRP[] = "GRP ";
-        fwrite(GRP,1,4,output);
+        fwrite(GRP, 1, 4, output);
 
         int k = 0;
-        int moba_batch = moba_size/12;
-        MobaEx = new int[moba_batch*4];
-        for(int i=8; i<moba_size; i+=12)
+        int moba_batch = moba_size / 12;
+        MobaEx = new int[moba_batch * 4];
+        for (int i = 8; i < moba_size; i += 12)
         {
             MobaEx[k++] = MOBA[i];
         }
-        int moba_size_grp = moba_batch*4+4;
-        fwrite(&moba_size_grp,4,1,output);
-        fwrite(&moba_batch,4,1,output);
-        fwrite(MobaEx,4,k,output);
+        int moba_size_grp = moba_batch * 4 + 4;
+        fwrite(&moba_size_grp, 4, 1, output);
+        fwrite(&moba_batch, 4, 1, output);
+        fwrite(MobaEx, 4, k, output);
         delete [] MobaEx;
 
         uint32 nIdexes = nTriangles * 3;
 
-        if(fwrite("INDX",4, 1, output) != 1)
+        if (fwrite("INDX", 4, 1, output) != 1)
         {
             printf("Error while writing file nbraches ID");
             exit(0);
         }
         int wsize = sizeof(uint32) + sizeof(unsigned short) * nIdexes;
-        if(fwrite(&wsize, sizeof(int), 1, output) != 1)
+        if (fwrite(&wsize, sizeof(int), 1, output) != 1)
         {
             printf("Error while writing file wsize");
             // no need to exit?
         }
-        if(fwrite(&nIdexes, sizeof(uint32), 1, output) != 1)
+        if (fwrite(&nIdexes, sizeof(uint32), 1, output) != 1)
         {
             printf("Error while writing file nIndexes");
             exit(0);
         }
-        if(nIdexes >0)
+        if (nIdexes > 0)
         {
-            if(fwrite(MOVI, sizeof(unsigned short), nIdexes, output) != nIdexes)
+            if (fwrite(MOVI, sizeof(unsigned short), nIdexes, output) != nIdexes)
             {
                 printf("Error while writing file indexarray");
                 exit(0);
             }
         }
 
-        if(fwrite("VERT",4, 1, output) != 1)
+        if (fwrite("VERT", 4, 1, output) != 1)
         {
             printf("Error while writing file nbraches ID");
             exit(0);
         }
         wsize = sizeof(int) + sizeof(float) * 3 * nVertices;
-        if(fwrite(&wsize, sizeof(int), 1, output) != 1)
+        if (fwrite(&wsize, sizeof(int), 1, output) != 1)
         {
             printf("Error while writing file wsize");
             // no need to exit?
         }
-        if(fwrite(&nVertices, sizeof(int), 1, output) != 1)
+        if (fwrite(&nVertices, sizeof(int), 1, output) != 1)
         {
             printf("Error while writing file nVertices");
             exit(0);
         }
-        if(nVertices >0)
+        if (nVertices > 0)
         {
-            if(fwrite(MOVT, sizeof(float)*3, nVertices, output) != nVertices)
+            if (fwrite(MOVT, sizeof(float) * 3, nVertices, output) != nVertices)
             {
                 printf("Error while writing file vectors");
                 exit(0);
@@ -321,44 +320,44 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool pPrecis
     else
     {
         char GRP[] = "GRP ";
-        fwrite(GRP,1,4,output);
+        fwrite(GRP, 1, 4, output);
         int k = 0;
-        int moba_batch = moba_size/12;
-        MobaEx = new int[moba_batch*4];
-        for(int i=8; i<moba_size; i+=12)
+        int moba_batch = moba_size / 12;
+        MobaEx = new int[moba_batch * 4];
+        for (int i = 8; i < moba_size; i += 12)
         {
             MobaEx[k++] = MOBA[i];
         }
 
-        int moba_size_grp = moba_batch*4+4;
-        fwrite(&moba_size_grp,4,1,output);
-        fwrite(&moba_batch,4,1,output);
-        fwrite(MobaEx,4,k,output);
+        int moba_size_grp = moba_batch * 4 + 4;
+        fwrite(&moba_size_grp, 4, 1, output);
+        fwrite(&moba_batch, 4, 1, output);
+        fwrite(MobaEx, 4, k, output);
         delete [] MobaEx;
 
         //-------INDX------------------------------------
         //-------MOPY--------
-        MoviEx = new uint16[nTriangles*3]; // "worst case" size...
-        int *IndexRenum = new int[nVertices];
-        memset(IndexRenum, 0xFF, nVertices*sizeof(int));
-        for (int i=0; i<nTriangles; ++i)
+        MoviEx = new uint16[nTriangles * 3]; // "worst case" size...
+        int* IndexRenum = new int[nVertices];
+        memset(IndexRenum, 0xFF, nVertices * sizeof(int));
+        for (int i = 0; i < nTriangles; ++i)
         {
             // Skip no collision triangles
-            if (MOPY[2*i]&WMO_MATERIAL_NO_COLLISION ||
-              !(MOPY[2*i]&(WMO_MATERIAL_HINT|WMO_MATERIAL_COLLIDE_HIT)) )
+            if (MOPY[2 * i]&WMO_MATERIAL_NO_COLLISION ||
+                    !(MOPY[2 * i] & (WMO_MATERIAL_HINT | WMO_MATERIAL_COLLIDE_HIT)))
                 continue;
             // Use this triangle
-            for (int j=0; j<3; ++j)
+            for (int j = 0; j < 3; ++j)
             {
-                IndexRenum[MOVI[3*i + j]] = 1;
-                MoviEx[3*nColTriangles + j] = MOVI[3*i + j];
+                IndexRenum[MOVI[3 * i + j]] = 1;
+                MoviEx[3 * nColTriangles + j] = MOVI[3 * i + j];
             }
             ++nColTriangles;
         }
 
         // assign new vertex index numbers
         int nColVertices = 0;
-        for (uint32 i=0; i<nVertices; ++i)
+        for (uint32 i = 0; i < nVertices; ++i)
         {
             if (IndexRenum[i] == 1)
             {
@@ -368,35 +367,35 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool pPrecis
         }
 
         // translate triangle indices to new numbers
-        for (int i=0; i<3*nColTriangles; ++i)
+        for (int i = 0; i < 3 * nColTriangles; ++i)
         {
             assert(MoviEx[i] < nVertices);
             MoviEx[i] = IndexRenum[MoviEx[i]];
         }
 
         // write triangle indices
-        int INDX[] = {0x58444E49, nColTriangles*6+4, nColTriangles*3};
-        fwrite(INDX,4,3,output);
-        fwrite(MoviEx,2,nColTriangles*3,output);
+        int INDX[] = {0x58444E49, nColTriangles * 6 + 4, nColTriangles * 3};
+        fwrite(INDX, 4, 3, output);
+        fwrite(MoviEx, 2, nColTriangles * 3, output);
 
         // write vertices
-        int VERT[] = {0x54524556, nColVertices*3*sizeof(float)+4, nColVertices};// "VERT"
-        int check = 3*nColVertices;
-        fwrite(VERT,4,3,output);
-        for (uint32 i=0; i<nVertices; ++i)
-            if(IndexRenum[i] >= 0)
-                check -= fwrite(MOVT+3*i, sizeof(float), 3, output);
+        int VERT[] = {0x54524556, nColVertices * 3 * sizeof(float) + 4, nColVertices}; // "VERT"
+        int check = 3 * nColVertices;
+        fwrite(VERT, 4, 3, output);
+        for (uint32 i = 0; i < nVertices; ++i)
+            if (IndexRenum[i] >= 0)
+                check -= fwrite(MOVT + 3 * i, sizeof(float), 3, output);
 
-        assert(check==0);
+        assert(check == 0);
 
         delete [] MoviEx;
         delete [] IndexRenum;
     }
 
     //------LIQU------------------------
-    if(LiquEx_size != 0)
+    if (LiquEx_size != 0)
     {
-        int LIQU_h[] = {0x5551494C, sizeof(WMOLiquidHeader) + LiquEx_size + hlq->xtiles*hlq->ytiles};// "LIQU"
+        int LIQU_h[] = {0x5551494C, sizeof(WMOLiquidHeader) + LiquEx_size + hlq->xtiles* hlq->ytiles}; // "LIQU"
         fwrite(LIQU_h, 4, 2, output);
 
         // according to WoW.Dev Wiki:
@@ -404,11 +403,53 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool pPrecis
         if (rootWMO->liquidType & 4)
             liquidEntry = liquidType;
         else if (liquidType == 15)
-            liquidEntry = 1; // first entry, generic "Water"
+            liquidEntry = 0;
         else
             liquidEntry = liquidType + 1;
-        // overwrite material type in header...
-        hlq->type = LiqType[liquidEntry];
+
+        if (!liquidEntry)
+        {
+            int v1; // edx@1
+            int v2; // eax@1
+
+            v1 = hlq->xtiles * hlq->ytiles;
+            v2 = 0;
+            if (v1 > 0)
+            {
+                while ((LiquBytes[v2] & 0xF) == 15)
+                {
+                    ++v2;
+                    if (v2 >= v1)
+                        break;
+                }
+
+                if (v2 < v1 && (LiquBytes[v2] & 0xF) != 15)
+                    liquidEntry = (LiquBytes[v2] & 0xF) + 1;
+            }
+        }
+
+        if (liquidEntry && liquidEntry < 21)
+        {
+            switch (((uint8)liquidEntry - 1) & 3)
+            {
+                case 0:
+                    liquidEntry = ((mogpFlags & 0x80000) != 0) + 13;
+                    break;
+                case 1:
+                    liquidEntry = 14;
+                    break;
+                case 2:
+                    liquidEntry = 19;
+                    break;
+                case 3:
+                    liquidEntry = 20;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        hlq->type = liquidEntry;
 
         /* std::ofstream llog("Buildings/liquid.log", ios_base::out | ios_base::app);
         llog << filename;
@@ -417,10 +458,10 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool pPrecis
 
         fwrite(hlq, sizeof(WMOLiquidHeader), 1, output);
         // only need height values, the other values are unknown anyway
-        for (uint32 i = 0; i<LiquEx_size/sizeof(WMOLiquidVert); ++i)
+        for (uint32 i = 0; i < LiquEx_size / sizeof(WMOLiquidVert); ++i)
             fwrite(&LiquEx[i].height, sizeof(float), 1, output);
         // todo: compress to bit field
-        fwrite(LiquBytes, 1, hlq->xtiles*hlq->ytiles, output);
+        fwrite(LiquBytes, 1, hlq->xtiles * hlq->ytiles, output);
     }
 
     return nColTriangles;
@@ -437,34 +478,34 @@ WMOGroup::~WMOGroup()
     delete [] LiquBytes;
 }
 
-WMOInstance::WMOInstance(MPQFile &f,const char* WmoInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE *pDirfile)
+WMOInstance::WMOInstance(MPQFile& f, const char* WmoInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE* pDirfile)
 {
-    pos = Vec3D(0,0,0);
+    pos = Vec3D(0, 0, 0);
 
     float ff[3];
     f.read(&id, 4);
-    f.read(ff,12);
-    pos = Vec3D(ff[0],ff[1],ff[2]);
-    f.read(ff,12);
-    rot = Vec3D(ff[0],ff[1],ff[2]);
-    f.read(ff,12);
-    pos2 = Vec3D(ff[0],ff[1],ff[2]);
-    f.read(ff,12);
-    pos3 = Vec3D(ff[0],ff[1],ff[2]);
-    f.read(&d2,4);
-
-    uint16 trash,adtId;
-    f.read(&adtId,2);
-    f.read(&trash,2);
+    f.read(ff, 12);
+    pos = Vec3D(ff[0], ff[1], ff[2]);
+    f.read(ff, 12);
+    rot = Vec3D(ff[0], ff[1], ff[2]);
+    f.read(ff, 12);
+    pos2 = Vec3D(ff[0], ff[1], ff[2]);
+    f.read(ff, 12);
+    pos3 = Vec3D(ff[0], ff[1], ff[2]);
+    f.read(&d2, 4);
+
+    uint16 trash, adtId;
+    f.read(&adtId, 2);
+    f.read(&trash, 2);
 
     //-----------add_in _dir_file----------------
 
     char tempname[512];
     sprintf(tempname, "%s/%s", szWorkDirWmo, WmoInstName);
-    FILE *input;
+    FILE* input;
     input = fopen(tempname, "r+b");
 
-    if(!input)
+    if (!input)
     {
         printf("WMOInstance::WMOInstance: couldn't open %s\n", tempname);
         return;
@@ -472,19 +513,19 @@ WMOInstance::WMOInstance(MPQFile &f,const char* WmoInstName, uint32 mapID, uint3
 
     fseek(input, 8, SEEK_SET); // get the correct no of vertices
     int nVertices;
-    fread(&nVertices, sizeof (int), 1, input);
+    fread(&nVertices, sizeof(int), 1, input);
     fclose(input);
 
-    if(nVertices == 0)
+    if (nVertices == 0)
         return;
 
-    float x,z;
+    float x, z;
     x = pos.x;
     z = pos.z;
-    if(x==0 && z == 0)
+    if (x == 0 && z == 0)
     {
-        pos.x = 533.33333f*32;
-        pos.z = 533.33333f*32;
+        pos.x = 533.33333f * 32;
+        pos.z = 533.33333f * 32;
     }
     pos = fixCoords(pos);
     pos2 = fixCoords(pos2);
@@ -492,7 +533,7 @@ WMOInstance::WMOInstance(MPQFile &f,const char* WmoInstName, uint32 mapID, uint3
 
     float scale = 1.0f;
     uint32 flags = MOD_HAS_BOUND;
-    if(tileX == 65 && tileY == 65) flags |= MOD_WORLDSPAWN;
+    if (tileX == 65 && tileY == 65) flags |= MOD_WORLDSPAWN;
     //write mapID, tileX, tileY, Flags, ID, Pos, Rot, Scale, Bound_lo, Bound_hi, name
     fwrite(&mapID, sizeof(uint32), 1, pDirfile);
     fwrite(&tileX, sizeof(uint32), 1, pDirfile);
@@ -505,7 +546,7 @@ WMOInstance::WMOInstance(MPQFile &f,const char* WmoInstName, uint32 mapID, uint3
     fwrite(&scale, sizeof(float), 1, pDirfile);
     fwrite(&pos2, sizeof(float), 3, pDirfile);
     fwrite(&pos3, sizeof(float), 3, pDirfile);
-    uint32 nlen=strlen(WmoInstName);
+    uint32 nlen = strlen(WmoInstName);
     fwrite(&nlen, sizeof(uint32), 1, pDirfile);
     fwrite(WmoInstName, sizeof(char), nlen, pDirfile);
 
diff --git a/contrib/vmap_extractor_v3/vmapextract/wmo.h b/contrib/vmap_extractor_v3/vmapextract/wmo.h
index f536bef384d..cb14c0ffab8 100644
--- a/contrib/vmap_extractor_v3/vmapextract/wmo.h
+++ b/contrib/vmap_extractor_v3/vmapextract/wmo.h
@@ -40,24 +40,24 @@ class WMOManager;
 class MPQFile;
 
 /* for whatever reason a certain company just can't stick to one coordinate system... */
-static inline Vec3D fixCoords(const Vec3D &v){ return Vec3D(v.z, v.x, v.y); }
+static inline Vec3D fixCoords(const Vec3D& v) { return Vec3D(v.z, v.x, v.y); }
 
 class WMORoot
 {
-public:
-    uint32 nTextures, nGroups, nP, nLights, nModels, nDoodads, nDoodadSets, RootWMOID, liquidType;
-    unsigned int col;
-    float bbcorn1[3];
-    float bbcorn2[3];
-
-    WMORoot(std::string &filename);
-    ~WMORoot();
-
-    bool open();
-    bool ConvertToVMAPRootWmo(FILE *output);
-private:
-    std::string filename;
-    char outfilename;
+    public:
+        uint32 nTextures, nGroups, nP, nLights, nModels, nDoodads, nDoodadSets, RootWMOID, liquidType;
+        unsigned int col;
+        float bbcorn1[3];
+        float bbcorn2[3];
+
+        WMORoot(std::string& filename);
+        ~WMORoot();
+
+        bool open();
+        bool ConvertToVMAPRootWmo(FILE* output);
+    private:
+        std::string filename;
+        char outfilename;
 };
 
 struct WMOLiquidHeader
@@ -78,59 +78,59 @@ struct WMOLiquidVert
 
 class WMOGroup
 {
-public:
-    // MOGP
-    int groupName, descGroupName, mogpFlags;
-    float bbcorn1[3];
-    float bbcorn2[3];
-    uint16 moprIdx;
-    uint16 moprNItems;
-    uint16 nBatchA;
-    uint16 nBatchB;
-    uint32 nBatchC, fogIdx, liquidType, groupWMOID;
-
-    int mopy_size,moba_size;
-    int LiquEx_size;
-    unsigned int nVertices; // number when loaded
-    int nTriangles; // number when loaded
-    char *MOPY;
-    uint16 *MOVI;
-    uint16 *MoviEx;
-    float *MOVT;
-    uint16 *MOBA;
-    int *MobaEx;
-    WMOLiquidHeader *hlq;
-    WMOLiquidVert *LiquEx;
-    char *LiquBytes;
-    uint32 liquflags;
-
-    WMOGroup(std::string &filename);
-    ~WMOGroup();
-
-    bool open();
-    int ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool pPreciseVectorData);
-
-private:
-    std::string filename;
-    char outfilename;
+    public:
+        // MOGP
+        int groupName, descGroupName, mogpFlags;
+        float bbcorn1[3];
+        float bbcorn2[3];
+        uint16 moprIdx;
+        uint16 moprNItems;
+        uint16 nBatchA;
+        uint16 nBatchB;
+        uint32 nBatchC, fogIdx, liquidType, groupWMOID;
+
+        int mopy_size, moba_size;
+        int LiquEx_size;
+        unsigned int nVertices; // number when loaded
+        int nTriangles; // number when loaded
+        char* MOPY;
+        uint16* MOVI;
+        uint16* MoviEx;
+        float* MOVT;
+        uint16* MOBA;
+        int* MobaEx;
+        WMOLiquidHeader* hlq;
+        WMOLiquidVert* LiquEx;
+        char* LiquBytes;
+        uint32 liquflags;
+
+        WMOGroup(std::string& filename);
+        ~WMOGroup();
+
+        bool open();
+        int ConvertToVMAPGroupWmo(FILE* output, WMORoot* rootWMO, bool pPreciseVectorData);
+
+    private:
+        std::string filename;
+        char outfilename;
 };
 
 class WMOInstance
 {
-    static std::set<int> ids;
-public:
-    std::string MapName;
-    int currx;
-    int curry;
-    WMOGroup *wmo;
-    Vec3D pos;
-    Vec3D pos2, pos3, rot;
-    uint32 indx,id, d2, d3;
-    int doodadset;
-
-    WMOInstance(MPQFile &f,const char* WmoInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE *pDirfile);
-
-    static void reset();
+        static std::set<int> ids;
+    public:
+        std::string MapName;
+        int currx;
+        int curry;
+        WMOGroup* wmo;
+        Vec3D pos;
+        Vec3D pos2, pos3, rot;
+        uint32 indx, id, d2, d3;
+        int doodadset;
+
+        WMOInstance(MPQFile& f, const char* WmoInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE* pDirfile);
+
+        static void reset();
 };
 
 #endif
diff --git a/contrib/vmap_extractor_v3/win/VC100/vmapExtractor3.vcxproj b/contrib/vmap_extractor_v3/win/VC100/vmapExtractor3.vcxproj
deleted file mode 100644
index 78e8c8765b7..00000000000
--- a/contrib/vmap_extractor_v3/win/VC100/vmapExtractor3.vcxproj
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}</ProjectGuid>
-    <RootNamespace>vmapExtractor3</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libmpq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\dep\libmpq\bin\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libmpq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\dep\libmpq\bin\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\vmapextract\adtfile.cpp" />
-    <ClCompile Include="..\..\vmapextract\dbcfile.cpp" />
-    <ClCompile Include="..\..\vmapextract\model.cpp" />
-    <ClCompile Include="..\..\vmapextract\mpq_libmpq.cpp" />
-    <ClCompile Include="..\..\vmapextract\vmapexport.cpp" />
-    <ClCompile Include="..\..\vmapextract\wdtfile.cpp" />
-    <ClCompile Include="..\..\vmapextract\wmo.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\vmapextract\adtfile.h" />
-    <ClInclude Include="..\..\vmapextract\dbcfile.h" />
-    <ClInclude Include="..\..\vmapextract\model.h" />
-    <ClInclude Include="..\..\vmapextract\modelheaders.h" />
-    <ClInclude Include="..\..\vmapextract\mpq_libmpq04.h" />
-    <ClInclude Include="..\..\vmapextract\vec3d.h" />
-    <ClInclude Include="..\..\vmapextract\vmapexport.h" />
-    <ClInclude Include="..\..\vmapextract\wdtfile.h" />
-    <ClInclude Include="..\..\vmapextract\wmo.h" />
-    <ClInclude Include="..\..\vmapextract\loadlib\loadlib.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/contrib/vmap_extractor_v3/win/VC90/vmapExtractor3.vcproj b/contrib/vmap_extractor_v3/win/VC90/vmapExtractor3.vcproj
deleted file mode 100644
index 83801906ab0..00000000000
--- a/contrib/vmap_extractor_v3/win/VC90/vmapExtractor3.vcproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="vmapExtractor3"
-	ProjectGUID="{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
-	RootNamespace="vmapExtractor3"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="..\bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\dep\libmpq;..\..\..\..\dep\include\zlib;..\..\..\..\dep\libmpq\win"
-				PreprocessorDefinitions="WIN32;USE_LIBMPQ04"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmpq.lib"
-				AdditionalLibraryDirectories="..\..\..\..\dep\libmpq\bin\$(PlatformName)_$(ConfigurationName)"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="..\bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\dep\libmpq;..\..\..\..\dep\include\zlib;..\..\..\..\dep\libmpq\win"
-				PreprocessorDefinitions="WIN32;USE_LIBMPQ04"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmpq.lib"
-				AdditionalLibraryDirectories="..\..\..\..\dep\libmpq\bin\$(PlatformName)_$(ConfigurationName)"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="vmapextractor"
-			>
-			<File
-				RelativePath="..\..\vmapextract\adtfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\adtfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\dbcfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\dbcfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\model.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\model.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\modelheaders.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\mpq_libmpq.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\mpq_libmpq04.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\vec3d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\vmapexport.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\vmapexport.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\wdtfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\wdtfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\wmo.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\vmapextract\wmo.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="loadlib"
-			>
-			<File
-				RelativePath="..\..\vmapextract\loadlib\loadlib.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/vmap_extractor_v3/win/vmapExtractor3_VC100.sln b/contrib/vmap_extractor_v3/win/vmapExtractor3_VC100.sln
deleted file mode 100644
index 7fed404d0d5..00000000000
--- a/contrib/vmap_extractor_v3/win/vmapExtractor3_VC100.sln
+++ /dev/null
@@ -1,42 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor3", "VC100\vmapExtractor3.vcxproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C} = {B96F612A-C91D-43B3-A4C3-D4294817EC6C}
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "..\..\..\dep\libmpq\win\VC100\libmpq.vcxproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC100\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\..\win\VC100\bzip2.vcxproj", "{B96F612A-C91D-43B3-A4C3-D4294817EC6C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|Win32.Build.0 = Debug|Win32
-		{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|Win32.ActiveCfg = Release|Win32
-		{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|Win32.Build.0 = Release|Win32
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.ActiveCfg = Debug|Win32
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.Build.0 = Debug|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.ActiveCfg = Release|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/contrib/vmap_extractor_v3/win/vmapExtractor3_VC90.sln b/contrib/vmap_extractor_v3/win/vmapExtractor3_VC90.sln
deleted file mode 100644
index f353a972b8c..00000000000
--- a/contrib/vmap_extractor_v3/win/vmapExtractor3_VC90.sln
+++ /dev/null
@@ -1,42 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor3", "VC90\vmapExtractor3.vcproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C} = {B96F612A-C91D-43B3-A4C3-D4294817EC6C}
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "..\..\..\dep\libmpq\win\VC90\libmpq.vcproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC90\zlib.vcproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\..\win\VC90\bzip2.vcproj", "{B96F612A-C91D-43B3-A4C3-D4294817EC6C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|Win32.Build.0 = Debug|Win32
-		{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|Win32.ActiveCfg = Release|Win32
-		{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|Win32.Build.0 = Release|Win32
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.ActiveCfg = Debug|Win32
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.Build.0 = Debug|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.ActiveCfg = Release|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/createprojects.bat b/createprojects.bat
deleted file mode 100755
index c943a08fd4a..00000000000
--- a/createprojects.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@ECHO off
-mkdir build
-cd build
-
-if %1!==! goto without
-
-cmake .. -G %1
-if errorlevel 1 call cmake --help
-goto end
-
-:without
-cmake ..
-
-:end
-cd ..
\ No newline at end of file
diff --git a/dep/ACE_wrappers/ACE_vc10.sln b/dep/ACE_wrappers/ACE_vc10.sln
index 347575b7a17..27234c7885b 100644
--- a/dep/ACE_wrappers/ACE_vc10.sln
+++ b/dep/ACE_wrappers/ACE_vc10.sln
@@ -1,111 +1,111 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc10.vcxproj", "{47BC56ED-FECA-1BAD-6757-8A6300006755}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ace\ETCL\ACE_ETCL_Parser_vc10.vcxproj", "{42B1A787-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
-		{17692659-FECA-1BAD-007E-8A67757B007A} = {17692659-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ace\ETCL\ACE_ETCL_vc10.vcxproj", "{17692659-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "ace\Monitor_Control\Monitor_Control_vc10.vcxproj", "{7153B6F4-FECA-1BAD-D619-74620E01B14C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
-		{17692659-FECA-1BAD-007E-8A67757B007A} = {17692659-FECA-1BAD-007E-8A67757B007A}
-		{42B1A787-FECA-1BAD-007E-8A67757B007A} = {42B1A787-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "ace\QoS\QoS_vc10.vcxproj", "{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "bin\PerlACE\PerlACE_vc10.vcxproj", "{47B934A1-FECA-1BAD-A757-FC47A624E189}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin\bin_vc10.vcxproj", "{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc10.vcxproj", "{47BC56ED-FECA-1BAD-6757-8A6300006755}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ace\ETCL\ACE_ETCL_Parser_vc10.vcxproj", "{42B1A787-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
+		{17692659-FECA-1BAD-007E-8A67757B007A} = {17692659-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ace\ETCL\ACE_ETCL_vc10.vcxproj", "{17692659-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "ace\Monitor_Control\Monitor_Control_vc10.vcxproj", "{7153B6F4-FECA-1BAD-D619-74620E01B14C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
+		{17692659-FECA-1BAD-007E-8A67757B007A} = {17692659-FECA-1BAD-007E-8A67757B007A}
+		{42B1A787-FECA-1BAD-007E-8A67757B007A} = {42B1A787-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "ace\QoS\QoS_vc10.vcxproj", "{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "bin\PerlACE\PerlACE_vc10.vcxproj", "{47B934A1-FECA-1BAD-A757-FC47A624E189}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin\bin_vc10.vcxproj", "{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ACE_vc8.sln b/dep/ACE_wrappers/ACE_vc8.sln
index efa8af456b6..363acffce36 100644
--- a/dep/ACE_wrappers/ACE_vc8.sln
+++ b/dep/ACE_wrappers/ACE_vc8.sln
@@ -1,111 +1,111 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6300006755}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ace\ETCL\ACE_ETCL_Parser_vc8.vcproj", "{C756716B-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A} = {1903A9EA-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ace\ETCL\ACE_ETCL_vc8.vcproj", "{1903A9EA-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "ace\Monitor_Control\Monitor_Control_vc8.vcproj", "{B465937A-FECA-1BAD-D619-74620E01B14C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A} = {1903A9EA-FECA-1BAD-007E-8A67757B007A}
-		{C756716B-FECA-1BAD-007E-8A67757B007A} = {C756716B-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "ace\QoS\QoS_vc8.vcproj", "{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "bin\PerlACE\PerlACE_vc8.vcproj", "{E15379F8-FECA-1BAD-A757-FC47A624E189}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin\bin_vc8.vcproj", "{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6300006755}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ace\ETCL\ACE_ETCL_Parser_vc8.vcproj", "{C756716B-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A} = {1903A9EA-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ace\ETCL\ACE_ETCL_vc8.vcproj", "{1903A9EA-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "ace\Monitor_Control\Monitor_Control_vc8.vcproj", "{B465937A-FECA-1BAD-D619-74620E01B14C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A} = {1903A9EA-FECA-1BAD-007E-8A67757B007A}
+		{C756716B-FECA-1BAD-007E-8A67757B007A} = {C756716B-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "ace\QoS\QoS_vc8.vcproj", "{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "bin\PerlACE\PerlACE_vc8.vcproj", "{E15379F8-FECA-1BAD-A757-FC47A624E189}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin\bin_vc8.vcproj", "{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ACE_vc9.sln b/dep/ACE_wrappers/ACE_vc9.sln
index 28c6ff64bd8..b592f0cf006 100644
--- a/dep/ACE_wrappers/ACE_vc9.sln
+++ b/dep/ACE_wrappers/ACE_vc9.sln
@@ -1,111 +1,111 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6300006755}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ace\ETCL\ACE_ETCL_Parser_vc9.vcproj", "{D756716B-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A} = {0903A9EA-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ace\ETCL\ACE_ETCL_vc9.vcproj", "{0903A9EA-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "ace\Monitor_Control\Monitor_Control_vc9.vcproj", "{A465937A-FECA-1BAD-D619-74620E01B14C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A} = {0903A9EA-FECA-1BAD-007E-8A67757B007A}
-		{D756716B-FECA-1BAD-007E-8A67757B007A} = {D756716B-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "ace\QoS\QoS_vc9.vcproj", "{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "bin\PerlACE\PerlACE_vc9.vcproj", "{F15379F8-FECA-1BAD-A757-FC47A624E189}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin\bin_vc9.vcproj", "{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6300006755}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ace\ETCL\ACE_ETCL_Parser_vc9.vcproj", "{D756716B-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A} = {0903A9EA-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ace\ETCL\ACE_ETCL_vc9.vcproj", "{0903A9EA-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "ace\Monitor_Control\Monitor_Control_vc9.vcproj", "{A465937A-FECA-1BAD-D619-74620E01B14C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A} = {0903A9EA-FECA-1BAD-007E-8A67757B007A}
+		{D756716B-FECA-1BAD-007E-8A67757B007A} = {D756716B-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "ace\QoS\QoS_vc9.vcproj", "{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "bin\PerlACE\PerlACE_vc9.vcproj", "{F15379F8-FECA-1BAD-A757-FC47A624E189}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin\bin_vc9.vcproj", "{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ACE_wrappers_vc10.sln b/dep/ACE_wrappers/ACE_wrappers_vc10.sln
index 10c68317d19..e962b0f2fe1 100644
--- a/dep/ACE_wrappers/ACE_wrappers_vc10.sln
+++ b/dep/ACE_wrappers/ACE_wrappers_vc10.sln
@@ -1,41 +1,41 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc10.vcxproj", "{47BC56ED-FECA-1BAD-6757-8A6300006755}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
-		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.Build.0 = Debug|Win32
-		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.ActiveCfg = Debug|x64
-		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.Build.0 = Debug|x64
-		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.ActiveCfg = Release|Win32
-		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.Build.0 = Release|Win32
-		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Release|x64.ActiveCfg = Release|x64
-		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc10.vcxproj", "{47BC56ED-FECA-1BAD-6757-8A6300006755}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
+		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.Build.0 = Debug|Win32
+		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.ActiveCfg = Debug|x64
+		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.Build.0 = Debug|x64
+		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.ActiveCfg = Release|Win32
+		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.Build.0 = Release|Win32
+		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Release|x64.ActiveCfg = Release|x64
+		{348C50EF-FECA-1BAD-6244-8A036423F5D3}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ACE_wrappers_vc8.sln b/dep/ACE_wrappers/ACE_wrappers_vc8.sln
index 8114f7761a1..0f106553e34 100644
--- a/dep/ACE_wrappers/ACE_wrappers_vc8.sln
+++ b/dep/ACE_wrappers/ACE_wrappers_vc8.sln
@@ -1,41 +1,41 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6300006755}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
-		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.Build.0 = Debug|Win32
-		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.ActiveCfg = Debug|x64
-		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.Build.0 = Debug|x64
-		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.ActiveCfg = Release|Win32
-		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.Build.0 = Release|Win32
-		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|x64.ActiveCfg = Release|x64
-		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6300006755}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
+		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.Build.0 = Debug|Win32
+		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.ActiveCfg = Debug|x64
+		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.Build.0 = Debug|x64
+		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.ActiveCfg = Release|Win32
+		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.Build.0 = Release|Win32
+		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|x64.ActiveCfg = Release|x64
+		{AF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ACE_wrappers_vc9.sln b/dep/ACE_wrappers/ACE_wrappers_vc9.sln
index 9b4f0859216..34828a28639 100644
--- a/dep/ACE_wrappers/ACE_wrappers_vc9.sln
+++ b/dep/ACE_wrappers/ACE_wrappers_vc9.sln
@@ -1,41 +1,41 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6300006755}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
-		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.Build.0 = Debug|Win32
-		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.ActiveCfg = Debug|x64
-		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.Build.0 = Debug|x64
-		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.ActiveCfg = Release|Win32
-		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.Build.0 = Release|Win32
-		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|x64.ActiveCfg = Release|x64
-		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ace\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6300006755}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
+		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|Win32.Build.0 = Debug|Win32
+		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.ActiveCfg = Debug|x64
+		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Debug|x64.Build.0 = Debug|x64
+		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.ActiveCfg = Release|Win32
+		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|Win32.Build.0 = Release|Win32
+		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|x64.ActiveCfg = Release|x64
+		{BF204C9C-FECA-1BAD-6244-8A036423F5D3}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/CMakeLists.txt b/dep/ACE_wrappers/CMakeLists.txt
index 42205c091c7..2e04d93b986 100644
--- a/dep/ACE_wrappers/CMakeLists.txt
+++ b/dep/ACE_wrappers/CMakeLists.txt
@@ -55,20 +55,12 @@ if(WIN32 AND MSVC)
     ALWAYS 0
   )
 elseif(UNIX)
-  if(CMAKE_BUILD_TOOL MATCHES "/gmake")
-    set(ACE_BUILD_TOOL gmake)
-  else()
-    set(ACE_BUILD_TOOL make)
-  endif()
-
   ExternalProject_Add(ACE_Project
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
     BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
     INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
     DOWNLOAD_COMMAND ""
-    CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-ssl
-    BUILD_COMMAND ${ACE_BUILD_TOOL} -j2 # export arch="ia32" &&
-    INSTALL_COMMAND ${ACE_BUILD_TOOL} install
+    CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/configure --prefix=${CMAKE_INSTALL_PREFIX} --disable-ssl
   )
 else()
   message(FATAL_ERROR
diff --git a/dep/ACE_wrappers/ace/ACE_vc10.vcxproj b/dep/ACE_wrappers/ace/ACE_vc10.vcxproj
index 5aa6296379a..14b728e9964 100644
--- a/dep/ACE_wrappers/ace/ACE_vc10.vcxproj
+++ b/dep/ACE_wrappers/ace/ACE_vc10.vcxproj
@@ -1,2455 +1,2455 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ACE</ProjectName>
-    <ProjectGuid>{47BC56ED-FECA-1BAD-6757-8A6300006755}</ProjectGuid>
-    <RootNamespace>ACE</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\ACE_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACEd</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\ACE_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\ACE_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ACEd</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\ACE_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ACE</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACEd.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\lib\ACEd.lib</ImportLibrary>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\lib\ACE.lib</ImportLibrary>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACEd.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\lib\ACEd.lib</ImportLibrary>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\lib\ACE.lib</ImportLibrary>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ACE.cpp">
-    </ClCompile>
-    <ClCompile Include="ACE_crc32.cpp">
-    </ClCompile>
-    <ClCompile Include="ACE_crc_ccitt.cpp">
-    </ClCompile>
-    <ClCompile Include="ace_wchar.cpp">
-    </ClCompile>
-    <ClCompile Include="Activation_Queue.cpp">
-    </ClCompile>
-    <ClCompile Include="Active_Map_Manager.cpp">
-    </ClCompile>
-    <ClCompile Include="Addr.cpp">
-    </ClCompile>
-    <ClCompile Include="Argv_Type_Converter.cpp">
-    </ClCompile>
-    <ClCompile Include="Assert.cpp">
-    </ClCompile>
-    <ClCompile Include="Asynch_IO.cpp">
-    </ClCompile>
-    <ClCompile Include="Asynch_IO_Impl.cpp">
-    </ClCompile>
-    <ClCompile Include="Asynch_Pseudo_Task.cpp">
-    </ClCompile>
-    <ClCompile Include="ATM_Acceptor.cpp">
-    </ClCompile>
-    <ClCompile Include="ATM_Addr.cpp">
-    </ClCompile>
-    <ClCompile Include="ATM_Connector.cpp">
-    </ClCompile>
-    <ClCompile Include="ATM_Params.cpp">
-    </ClCompile>
-    <ClCompile Include="ATM_QoS.cpp">
-    </ClCompile>
-    <ClCompile Include="ATM_Stream.cpp">
-    </ClCompile>
-    <ClCompile Include="Atomic_Op.cpp">
-    </ClCompile>
-    <ClCompile Include="Atomic_Op_Sparc.c">
-    </ClCompile>
-    <ClCompile Include="Auto_Event.cpp">
-    </ClCompile>
-    <ClCompile Include="Barrier.cpp">
-    </ClCompile>
-    <ClCompile Include="Base_Thread_Adapter.cpp">
-    </ClCompile>
-    <ClCompile Include="Based_Pointer_Repository.cpp">
-    </ClCompile>
-    <ClCompile Include="Basic_Stats.cpp">
-    </ClCompile>
-    <ClCompile Include="Basic_Types.cpp">
-    </ClCompile>
-    <ClCompile Include="Capabilities.cpp">
-    </ClCompile>
-    <ClCompile Include="CDR_Base.cpp">
-    </ClCompile>
-    <ClCompile Include="CDR_Size.cpp">
-    </ClCompile>
-    <ClCompile Include="CDR_Stream.cpp">
-    </ClCompile>
-    <ClCompile Include="Cleanup.cpp">
-    </ClCompile>
-    <ClCompile Include="Codecs.cpp">
-    </ClCompile>
-    <ClCompile Include="Codeset_IBM1047.cpp">
-    </ClCompile>
-    <ClCompile Include="Codeset_Registry.cpp">
-    </ClCompile>
-    <ClCompile Include="Codeset_Registry_db.cpp">
-    </ClCompile>
-    <ClCompile Include="Condition_Recursive_Thread_Mutex.cpp">
-    </ClCompile>
-    <ClCompile Include="Condition_Thread_Mutex.cpp">
-    </ClCompile>
-    <ClCompile Include="Configuration.cpp">
-    </ClCompile>
-    <ClCompile Include="Configuration_Import_Export.cpp">
-    </ClCompile>
-    <ClCompile Include="Connection_Recycling_Strategy.cpp">
-    </ClCompile>
-    <ClCompile Include="Containers.cpp">
-    </ClCompile>
-    <ClCompile Include="Copy_Disabled.cpp">
-    </ClCompile>
-    <ClCompile Include="Countdown_Time.cpp">
-    </ClCompile>
-    <ClCompile Include="Date_Time.cpp">
-    </ClCompile>
-    <ClCompile Include="DEV.cpp">
-    </ClCompile>
-    <ClCompile Include="DEV_Addr.cpp">
-    </ClCompile>
-    <ClCompile Include="DEV_Connector.cpp">
-    </ClCompile>
-    <ClCompile Include="DEV_IO.cpp">
-    </ClCompile>
-    <ClCompile Include="Dev_Poll_Reactor.cpp">
-    </ClCompile>
-    <ClCompile Include="Dirent.cpp">
-    </ClCompile>
-    <ClCompile Include="Dirent_Selector.cpp">
-    </ClCompile>
-    <ClCompile Include="DLL.cpp">
-    </ClCompile>
-    <ClCompile Include="DLL_Manager.cpp">
-    </ClCompile>
-    <ClCompile Include="Dump.cpp">
-    </ClCompile>
-    <ClCompile Include="Dynamic.cpp">
-    </ClCompile>
-    <ClCompile Include="Dynamic_Message_Strategy.cpp">
-    </ClCompile>
-    <ClCompile Include="Dynamic_Service_Base.cpp">
-    </ClCompile>
-    <ClCompile Include="Dynamic_Service_Dependency.cpp">
-    </ClCompile>
-    <ClCompile Include="Encoding_Converter.cpp">
-    </ClCompile>
-    <ClCompile Include="Encoding_Converter_Factory.cpp">
-    </ClCompile>
-    <ClCompile Include="Event.cpp">
-    </ClCompile>
-    <ClCompile Include="Event_Handler.cpp">
-    </ClCompile>
-    <ClCompile Include="FIFO.cpp">
-    </ClCompile>
-    <ClCompile Include="FIFO_Recv.cpp">
-    </ClCompile>
-    <ClCompile Include="FIFO_Recv_Msg.cpp">
-    </ClCompile>
-    <ClCompile Include="FIFO_Send.cpp">
-    </ClCompile>
-    <ClCompile Include="FIFO_Send_Msg.cpp">
-    </ClCompile>
-    <ClCompile Include="FILE.cpp">
-    </ClCompile>
-    <ClCompile Include="FILE_Addr.cpp">
-    </ClCompile>
-    <ClCompile Include="FILE_Connector.cpp">
-    </ClCompile>
-    <ClCompile Include="FILE_IO.cpp">
-    </ClCompile>
-    <ClCompile Include="File_Lock.cpp">
-    </ClCompile>
-    <ClCompile Include="Filecache.cpp">
-    </ClCompile>
-    <ClCompile Include="Flag_Manip.cpp">
-    </ClCompile>
-    <ClCompile Include="Framework_Component.cpp">
-    </ClCompile>
-    <ClCompile Include="Functor.cpp">
-    </ClCompile>
-    <ClCompile Include="Functor_String.cpp">
-    </ClCompile>
-    <ClCompile Include="Get_Opt.cpp">
-    </ClCompile>
-    <ClCompile Include="gethrtime.cpp">
-    </ClCompile>
-    <ClCompile Include="Handle_Ops.cpp">
-    </ClCompile>
-    <ClCompile Include="Handle_Set.cpp">
-    </ClCompile>
-    <ClCompile Include="Hashable.cpp">
-    </ClCompile>
-    <ClCompile Include="High_Res_Timer.cpp">
-    </ClCompile>
-    <ClCompile Include="ICMP_Socket.cpp">
-    </ClCompile>
-    <ClCompile Include="INET_Addr.cpp">
-    </ClCompile>
-    <ClCompile Include="Init_ACE.cpp">
-    </ClCompile>
-    <ClCompile Include="IO_Cntl_Msg.cpp">
-    </ClCompile>
-    <ClCompile Include="IO_SAP.cpp">
-    </ClCompile>
-    <ClCompile Include="IOStream.cpp">
-    </ClCompile>
-    <ClCompile Include="IPC_SAP.cpp">
-    </ClCompile>
-    <ClCompile Include="Lib_Find.cpp">
-    </ClCompile>
-    <ClCompile Include="Local_Memory_Pool.cpp">
-    </ClCompile>
-    <ClCompile Include="Local_Name_Space.cpp">
-    </ClCompile>
-    <ClCompile Include="Local_Tokens.cpp">
-    </ClCompile>
-    <ClCompile Include="Lock.cpp">
-    </ClCompile>
-    <ClCompile Include="Log_Msg.cpp">
-    </ClCompile>
-    <ClCompile Include="Log_Msg_Backend.cpp">
-    </ClCompile>
-    <ClCompile Include="Log_Msg_Callback.cpp">
-    </ClCompile>
-    <ClCompile Include="Log_Msg_IPC.cpp">
-    </ClCompile>
-    <ClCompile Include="Log_Msg_NT_Event_Log.cpp">
-    </ClCompile>
-    <ClCompile Include="Log_Msg_UNIX_Syslog.cpp">
-    </ClCompile>
-    <ClCompile Include="Log_Record.cpp">
-    </ClCompile>
-    <ClCompile Include="Logging_Strategy.cpp">
-    </ClCompile>
-    <ClCompile Include="LSOCK.cpp">
-    </ClCompile>
-    <ClCompile Include="LSOCK_Acceptor.cpp">
-    </ClCompile>
-    <ClCompile Include="LSOCK_CODgram.cpp">
-    </ClCompile>
-    <ClCompile Include="LSOCK_Connector.cpp">
-    </ClCompile>
-    <ClCompile Include="LSOCK_Dgram.cpp">
-    </ClCompile>
-    <ClCompile Include="LSOCK_Stream.cpp">
-    </ClCompile>
-    <ClCompile Include="Malloc.cpp">
-    </ClCompile>
-    <ClCompile Include="Malloc_Allocator.cpp">
-    </ClCompile>
-    <ClCompile Include="Manual_Event.cpp">
-    </ClCompile>
-    <ClCompile Include="MEM_Acceptor.cpp">
-    </ClCompile>
-    <ClCompile Include="MEM_Addr.cpp">
-    </ClCompile>
-    <ClCompile Include="MEM_Connector.cpp">
-    </ClCompile>
-    <ClCompile Include="MEM_IO.cpp">
-    </ClCompile>
-    <ClCompile Include="Mem_Map.cpp">
-    </ClCompile>
-    <ClCompile Include="MEM_SAP.cpp">
-    </ClCompile>
-    <ClCompile Include="MEM_Stream.cpp">
-    </ClCompile>
-    <ClCompile Include="Message_Block.cpp">
-    </ClCompile>
-    <ClCompile Include="Message_Queue.cpp">
-    </ClCompile>
-    <ClCompile Include="Message_Queue_NT.cpp">
-    </ClCompile>
-    <ClCompile Include="Message_Queue_Vx.cpp">
-    </ClCompile>
-    <ClCompile Include="Method_Request.cpp">
-    </ClCompile>
-    <ClCompile Include="MMAP_Memory_Pool.cpp">
-    </ClCompile>
-    <ClCompile Include="Monitor_Admin.cpp">
-    </ClCompile>
-    <ClCompile Include="Monitor_Admin_Manager.cpp">
-    </ClCompile>
-    <ClCompile Include="Monitor_Base.cpp">
-    </ClCompile>
-    <ClCompile Include="Monitor_Control_Action.cpp">
-    </ClCompile>
-    <ClCompile Include="Monitor_Control_Types.cpp">
-    </ClCompile>
-    <ClCompile Include="Monitor_Point_Registry.cpp">
-    </ClCompile>
-    <ClCompile Include="Monitor_Size.cpp">
-    </ClCompile>
-    <ClCompile Include="Msg_WFMO_Reactor.cpp">
-    </ClCompile>
-    <ClCompile Include="Multihomed_INET_Addr.cpp">
-    </ClCompile>
-    <ClCompile Include="Mutex.cpp">
-    </ClCompile>
-    <ClCompile Include="Name_Proxy.cpp">
-    </ClCompile>
-    <ClCompile Include="Name_Request_Reply.cpp">
-    </ClCompile>
-    <ClCompile Include="Name_Space.cpp">
-    </ClCompile>
-    <ClCompile Include="Naming_Context.cpp">
-    </ClCompile>
-    <ClCompile Include="Netlink_Addr.cpp">
-    </ClCompile>
-    <ClCompile Include="Notification_Queue.cpp">
-    </ClCompile>
-    <ClCompile Include="Notification_Strategy.cpp">
-    </ClCompile>
-    <ClCompile Include="NT_Service.cpp">
-    </ClCompile>
-    <ClCompile Include="Obchunk.cpp">
-    </ClCompile>
-    <ClCompile Include="Object_Manager.cpp">
-    </ClCompile>
-    <ClCompile Include="Object_Manager_Base.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_Errno.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_Log_Msg_Attributes.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_main.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_arpa_inet.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_ctype.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_dirent.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_dlfcn.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_errno.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_fcntl.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_math.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_netdb.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_poll.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_pwd.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_regex.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_signal.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_stdio.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_stdlib.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_string.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_strings.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_stropts.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_mman.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_msg.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_resource.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_select.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_sendfile.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_shm.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_socket.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_stat.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_time.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_uio.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_utsname.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_wait.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_Thread.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_time.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_unistd.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_wchar.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_NS_wctype.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_QoS.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_Thread_Adapter.cpp">
-    </ClCompile>
-    <ClCompile Include="OS_TLI.cpp">
-    </ClCompile>
-    <ClCompile Include="Pagefile_Memory_Pool.cpp">
-    </ClCompile>
-    <ClCompile Include="Parse_Node.cpp">
-    </ClCompile>
-    <ClCompile Include="PI_Malloc.cpp">
-    </ClCompile>
-    <ClCompile Include="Ping_Socket.cpp">
-    </ClCompile>
-    <ClCompile Include="Pipe.cpp">
-    </ClCompile>
-    <ClCompile Include="POSIX_Asynch_IO.cpp">
-    </ClCompile>
-    <ClCompile Include="POSIX_CB_Proactor.cpp">
-    </ClCompile>
-    <ClCompile Include="POSIX_Proactor.cpp">
-    </ClCompile>
-    <ClCompile Include="Priority_Reactor.cpp">
-    </ClCompile>
-    <ClCompile Include="Proactor.cpp">
-    </ClCompile>
-    <ClCompile Include="Proactor_Impl.cpp">
-    </ClCompile>
-    <ClCompile Include="Process.cpp">
-    </ClCompile>
-    <ClCompile Include="Process_Manager.cpp">
-    </ClCompile>
-    <ClCompile Include="Process_Mutex.cpp">
-    </ClCompile>
-    <ClCompile Include="Process_Semaphore.cpp">
-    </ClCompile>
-    <ClCompile Include="Profile_Timer.cpp">
-    </ClCompile>
-    <ClCompile Include="Reactor.cpp">
-    </ClCompile>
-    <ClCompile Include="Reactor_Impl.cpp">
-    </ClCompile>
-    <ClCompile Include="Reactor_Notification_Strategy.cpp">
-    </ClCompile>
-    <ClCompile Include="Reactor_Timer_Interface.cpp">
-    </ClCompile>
-    <ClCompile Include="Read_Buffer.cpp">
-    </ClCompile>
-    <ClCompile Include="Recursive_Thread_Mutex.cpp">
-    </ClCompile>
-    <ClCompile Include="Recyclable.cpp">
-    </ClCompile>
-    <ClCompile Include="Registry.cpp">
-    </ClCompile>
-    <ClCompile Include="Registry_Name_Space.cpp">
-    </ClCompile>
-    <ClCompile Include="Remote_Name_Space.cpp">
-    </ClCompile>
-    <ClCompile Include="Remote_Tokens.cpp">
-    </ClCompile>
-    <ClCompile Include="Rtems_init.c">
-    </ClCompile>
-    <ClCompile Include="RW_Mutex.cpp">
-    </ClCompile>
-    <ClCompile Include="RW_Process_Mutex.cpp">
-    </ClCompile>
-    <ClCompile Include="RW_Thread_Mutex.cpp">
-    </ClCompile>
-    <ClCompile Include="Sample_History.cpp">
-    </ClCompile>
-    <ClCompile Include="Sbrk_Memory_Pool.cpp">
-    </ClCompile>
-    <ClCompile Include="Sched_Params.cpp">
-    </ClCompile>
-    <ClCompile Include="Select_Reactor_Base.cpp">
-    </ClCompile>
-    <ClCompile Include="Semaphore.cpp">
-    </ClCompile>
-    <ClCompile Include="Service_Config.cpp">
-    </ClCompile>
-    <ClCompile Include="Service_Gestalt.cpp">
-    </ClCompile>
-    <ClCompile Include="Service_Manager.cpp">
-    </ClCompile>
-    <ClCompile Include="Service_Object.cpp">
-    </ClCompile>
-    <ClCompile Include="Service_Repository.cpp">
-    </ClCompile>
-    <ClCompile Include="Service_Types.cpp">
-    </ClCompile>
-    <ClCompile Include="Shared_Memory.cpp">
-    </ClCompile>
-    <ClCompile Include="Shared_Memory_MM.cpp">
-    </ClCompile>
-    <ClCompile Include="Shared_Memory_Pool.cpp">
-    </ClCompile>
-    <ClCompile Include="Shared_Memory_SV.cpp">
-    </ClCompile>
-    <ClCompile Include="Shared_Object.cpp">
-    </ClCompile>
-    <ClCompile Include="Sig_Adapter.cpp">
-    </ClCompile>
-    <ClCompile Include="Sig_Handler.cpp">
-    </ClCompile>
-    <ClCompile Include="Signal.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_Acceptor.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_CODgram.cpp">
-    </ClCompile>
-    <ClCompile Include="Sock_Connect.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_Connector.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_Dgram.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_Dgram_Bcast.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_Dgram_Mcast.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_IO.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_Netlink.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_SEQPACK_Acceptor.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_SEQPACK_Association.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_SEQPACK_Connector.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_Stream.cpp">
-    </ClCompile>
-    <ClCompile Include="SPIPE.cpp">
-    </ClCompile>
-    <ClCompile Include="SPIPE_Acceptor.cpp">
-    </ClCompile>
-    <ClCompile Include="SPIPE_Addr.cpp">
-    </ClCompile>
-    <ClCompile Include="SPIPE_Connector.cpp">
-    </ClCompile>
-    <ClCompile Include="SPIPE_Stream.cpp">
-    </ClCompile>
-    <ClCompile Include="SString.cpp">
-    </ClCompile>
-    <ClCompile Include="Stack_Trace.cpp">
-    </ClCompile>
-    <ClCompile Include="Stats.cpp">
-    </ClCompile>
-    <ClCompile Include="String_Base_Const.cpp">
-    </ClCompile>
-    <ClCompile Include="SUN_Proactor.cpp">
-    </ClCompile>
-    <ClCompile Include="SV_Message.cpp">
-    </ClCompile>
-    <ClCompile Include="SV_Message_Queue.cpp">
-    </ClCompile>
-    <ClCompile Include="SV_Semaphore_Complex.cpp">
-    </ClCompile>
-    <ClCompile Include="SV_Semaphore_Simple.cpp">
-    </ClCompile>
-    <ClCompile Include="SV_Shared_Memory.cpp">
-    </ClCompile>
-    <ClCompile Include="Svc_Conf_Lexer.cpp">
-    </ClCompile>
-    <ClCompile Include="Svc_Conf_y.cpp">
-    </ClCompile>
-    <ClCompile Include="Synch_Options.cpp">
-    </ClCompile>
-    <ClCompile Include="System_Time.cpp">
-    </ClCompile>
-    <ClCompile Include="Task.cpp">
-    </ClCompile>
-    <ClCompile Include="Thread.cpp">
-    </ClCompile>
-    <ClCompile Include="Thread_Adapter.cpp">
-    </ClCompile>
-    <ClCompile Include="Thread_Control.cpp">
-    </ClCompile>
-    <ClCompile Include="Thread_Exit.cpp">
-    </ClCompile>
-    <ClCompile Include="Thread_Hook.cpp">
-    </ClCompile>
-    <ClCompile Include="Thread_Manager.cpp">
-    </ClCompile>
-    <ClCompile Include="Thread_Mutex.cpp">
-    </ClCompile>
-    <ClCompile Include="Thread_Semaphore.cpp">
-    </ClCompile>
-    <ClCompile Include="Throughput_Stats.cpp">
-    </ClCompile>
-    <ClCompile Include="Time_Value.cpp">
-    </ClCompile>
-    <ClCompile Include="Timeprobe.cpp">
-    </ClCompile>
-    <ClCompile Include="TLI.cpp">
-    </ClCompile>
-    <ClCompile Include="TLI_Acceptor.cpp">
-    </ClCompile>
-    <ClCompile Include="TLI_Connector.cpp">
-    </ClCompile>
-    <ClCompile Include="TLI_Stream.cpp">
-    </ClCompile>
-    <ClCompile Include="Token.cpp">
-    </ClCompile>
-    <ClCompile Include="Token_Collection.cpp">
-    </ClCompile>
-    <ClCompile Include="Token_Invariants.cpp">
-    </ClCompile>
-    <ClCompile Include="Token_Manager.cpp">
-    </ClCompile>
-    <ClCompile Include="Token_Request_Reply.cpp">
-    </ClCompile>
-    <ClCompile Include="TP_Reactor.cpp">
-    </ClCompile>
-    <ClCompile Include="Trace.cpp">
-    </ClCompile>
-    <ClCompile Include="TSS_Adapter.cpp">
-    </ClCompile>
-    <ClCompile Include="TTY_IO.cpp">
-    </ClCompile>
-    <ClCompile Include="UNIX_Addr.cpp">
-    </ClCompile>
-    <ClCompile Include="UPIPE_Acceptor.cpp">
-    </ClCompile>
-    <ClCompile Include="UPIPE_Connector.cpp">
-    </ClCompile>
-    <ClCompile Include="UPIPE_Stream.cpp">
-    </ClCompile>
-    <ClCompile Include="UTF16_Encoding_Converter.cpp">
-    </ClCompile>
-    <ClCompile Include="UTF32_Encoding_Converter.cpp">
-    </ClCompile>
-    <ClCompile Include="UTF8_Encoding_Converter.cpp">
-    </ClCompile>
-    <ClCompile Include="UUID.cpp">
-    </ClCompile>
-    <ClCompile Include="WFMO_Reactor.cpp">
-    </ClCompile>
-    <ClCompile Include="WIN32_Asynch_IO.cpp">
-    </ClCompile>
-    <ClCompile Include="WIN32_Proactor.cpp">
-    </ClCompile>
-    <ClCompile Include="XML_Svc_Conf.cpp">
-    </ClCompile>
-    <ClCompile Include="XTI_ATM_Mcast.cpp">
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Acceptor.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Active_Map_Manager_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Arg_Shifter.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="ARGV.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Array_Base.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Array_Map.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Asynch_Acceptor.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Asynch_Connector.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Atomic_Op_GCC_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Atomic_Op_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Auto_Functor.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Auto_IncDec_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Auto_Ptr.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Based_Pointer_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Cache_Map_Manager_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Cached_Connect_Strategy_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Caching_Strategies_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Caching_Utility_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Cleanup_Strategies_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Condition_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Connector.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Containers_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Dump_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Dynamic_Service.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Env_Value_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Event_Handler_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Framework_Component_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Free_List.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Functor_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Future.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Future_Set.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Guard_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Hash_Cache_Map_Manager_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Hash_Map_Manager_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Hash_Map_With_Allocator_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Hash_Multi_Map_Manager_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Intrusive_Auto_Ptr.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Intrusive_List.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Intrusive_List_Node.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="IOStream_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Local_Name_Space_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Lock_Adapter_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="LOCK_SOCK_Acceptor.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Malloc_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Managed_Object.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Map_Manager.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Map_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Message_Block_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Message_Queue_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Metrics_Cache_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Module.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Node.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Obstack_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Pair_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="RB_Tree.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Reactor_Token_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Refcountable_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Refcounted_Auto_Ptr.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Reverse_Lock_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Select_Reactor_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Singleton.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Strategies_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Stream.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Stream_Modules.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="String_Base.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Svc_Handler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Task_Ex_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Task_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Test_and_Set.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Timeprobe_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Timer_Hash_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Timer_Heap_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Timer_List_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Timer_Queue_Adapters.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Timer_Queue_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Timer_Wheel_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Tokenizer_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="TSS_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Typed_SV_Message.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Typed_SV_Message_Queue.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Unbounded_Queue.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Unbounded_Set.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Unbounded_Set_Ex.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Vector_T.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Acceptor.h" />
-    <ClInclude Include="ACE.h" />
-    <ClInclude Include="ACE_export.h" />
-    <ClInclude Include="ace_wchar.h" />
-    <ClInclude Include="Activation_Queue.h" />
-    <ClInclude Include="Active_Map_Manager.h" />
-    <ClInclude Include="Active_Map_Manager_T.h" />
-    <ClInclude Include="Addr.h" />
-    <ClInclude Include="Arg_Shifter.h" />
-    <ClInclude Include="ARGV.h" />
-    <ClInclude Include="Argv_Type_Converter.h" />
-    <ClInclude Include="Array_Base.h" />
-    <ClInclude Include="Array_Map.h" />
-    <ClInclude Include="Assert.h" />
-    <ClInclude Include="Asynch_Acceptor.h" />
-    <ClInclude Include="Asynch_Connector.h" />
-    <ClInclude Include="Asynch_IO.h" />
-    <ClInclude Include="Asynch_IO_Impl.h" />
-    <ClInclude Include="Asynch_Pseudo_Task.h" />
-    <ClInclude Include="ATM_Acceptor.h" />
-    <ClInclude Include="ATM_Addr.h" />
-    <ClInclude Include="ATM_Connector.h" />
-    <ClInclude Include="ATM_Params.h" />
-    <ClInclude Include="ATM_QoS.h" />
-    <ClInclude Include="ATM_Stream.h" />
-    <ClInclude Include="Atomic_Op.h" />
-    <ClInclude Include="Atomic_Op_GCC_T.h" />
-    <ClInclude Include="Atomic_Op_Sparc.h" />
-    <ClInclude Include="Atomic_Op_T.h" />
-    <ClInclude Include="Auto_Event.h" />
-    <ClInclude Include="Auto_Functor.h" />
-    <ClInclude Include="Auto_IncDec_T.h" />
-    <ClInclude Include="Auto_Ptr.h" />
-    <ClInclude Include="Barrier.h" />
-    <ClInclude Include="Base_Thread_Adapter.h" />
-    <ClInclude Include="Based_Pointer_Repository.h" />
-    <ClInclude Include="Based_Pointer_T.h" />
-    <ClInclude Include="Basic_Stats.h" />
-    <ClInclude Include="Basic_Types.h" />
-    <ClInclude Include="Bound_Ptr.h" />
-    <ClInclude Include="Cache_Map_Manager_T.h" />
-    <ClInclude Include="Cached_Connect_Strategy_T.h" />
-    <ClInclude Include="Caching_Strategies_T.h" />
-    <ClInclude Include="Caching_Utility_T.h" />
-    <ClInclude Include="Capabilities.h" />
-    <ClInclude Include="CDR_Base.h" />
-    <ClInclude Include="CDR_Size.h" />
-    <ClInclude Include="CDR_Stream.h" />
-    <ClInclude Include="CE_Screen_Output.h" />
-    <ClInclude Include="checked_iterator.h" />
-    <ClInclude Include="Cleanup.h" />
-    <ClInclude Include="Cleanup_Strategies_T.h" />
-    <ClInclude Include="Codecs.h" />
-    <ClInclude Include="Codeset_IBM1047.h" />
-    <ClInclude Include="Codeset_Registry.h" />
-    <ClInclude Include="Codeset_Symbols.h" />
-    <ClInclude Include="Condition_Recursive_Thread_Mutex.h" />
-    <ClInclude Include="Condition_T.h" />
-    <ClInclude Include="Condition_Thread_Mutex.h" />
-    <ClInclude Include="config-aix-5.x.h" />
-    <ClInclude Include="config-all.h" />
-    <ClInclude Include="config-cygwin32.h" />
-    <ClInclude Include="config-doxygen.h" />
-    <ClInclude Include="config-freebsd.h" />
-    <ClInclude Include="config-g++-common.h" />
-    <ClInclude Include="config-ghs-common.h" />
-    <ClInclude Include="config-hpux-11.00.h" />
-    <ClInclude Include="config-icc-common.h" />
-    <ClInclude Include="config-integritySCA.h" />
-    <ClInclude Include="config-kfreebsd.h" />
-    <ClInclude Include="config-linux-common.h" />
-    <ClInclude Include="config-linux.h" />
-    <ClInclude Include="config-lite.h" />
-    <ClInclude Include="config-lynxos.h" />
-    <ClInclude Include="config-macosx-iphone-hardware.h" />
-    <ClInclude Include="config-macosx-iphone-simulator.h" />
-    <ClInclude Include="config-macosx-leopard.h" />
-    <ClInclude Include="config-macosx-panther.h" />
-    <ClInclude Include="config-macosx-snowleopard.h" />
-    <ClInclude Include="config-macosx-tiger.h" />
-    <ClInclude Include="config-macosx.h" />
-    <ClInclude Include="config-macros.h" />
-    <ClInclude Include="config-minimal.h" />
-    <ClInclude Include="config-mvs.h" />
-    <ClInclude Include="config-netbsd.h" />
-    <ClInclude Include="config-openbsd.h" />
-    <ClInclude Include="config-openvms.h" />
-    <ClInclude Include="config-pharlap.h" />
-    <ClInclude Include="config-posix-nonetworking.h" />
-    <ClInclude Include="config-posix.h" />
-    <ClInclude Include="config-qnx-neutrino.h" />
-    <ClInclude Include="config-qnx-rtp-62x.h" />
-    <ClInclude Include="config-qnx-rtp-common.h" />
-    <ClInclude Include="config-qnx-rtp-pre62x.h" />
-    <ClInclude Include="config-qnx-rtp.h" />
-    <ClInclude Include="config-rtems.h" />
-    <ClInclude Include="config-suncc-common.h" />
-    <ClInclude Include="config-sunos5.10.h" />
-    <ClInclude Include="config-sunos5.11.h" />
-    <ClInclude Include="config-sunos5.4-g++.h" />
-    <ClInclude Include="config-sunos5.4-sunc++-4.x.h" />
-    <ClInclude Include="config-sunos5.5.h" />
-    <ClInclude Include="config-sunos5.6.h" />
-    <ClInclude Include="config-sunos5.7.h" />
-    <ClInclude Include="config-sunos5.8.h" />
-    <ClInclude Include="config-sunos5.9.h" />
-    <ClInclude Include="config-tandem-nsk-mips-v2.h" />
-    <ClInclude Include="config-tandem-nsk-mips-v3.h" />
-    <ClInclude Include="config-tandem.h" />
-    <ClInclude Include="config-visualage.h" />
-    <ClInclude Include="config-vxworks.h" />
-    <ClInclude Include="config-vxworks6.4.h" />
-    <ClInclude Include="config-vxworks6.5.h" />
-    <ClInclude Include="config-vxworks6.6.h" />
-    <ClInclude Include="config-vxworks6.7.h" />
-    <ClInclude Include="config-vxworks6.8.h" />
-    <ClInclude Include="config-win32-borland.h" />
-    <ClInclude Include="config-win32-cegcc.h" />
-    <ClInclude Include="config-win32-common.h" />
-    <ClInclude Include="config-win32-dmc.h" />
-    <ClInclude Include="config-win32-interix.h" />
-    <ClInclude Include="config-win32-mingw.h" />
-    <ClInclude Include="config-win32-msvc-10.h" />
-    <ClInclude Include="config-win32-msvc-7.h" />
-    <ClInclude Include="config-win32-msvc-8.h" />
-    <ClInclude Include="config-win32-msvc-9.h" />
-    <ClInclude Include="config-win32-msvc.h" />
-    <ClInclude Include="config-win32.h" />
-    <ClInclude Include="config-WinCE.h" />
-    <ClInclude Include="config.h" />
-    <ClInclude Include="Configuration.h" />
-    <ClInclude Include="Configuration_Import_Export.h" />
-    <ClInclude Include="Connection_Recycling_Strategy.h" />
-    <ClInclude Include="Connector.h" />
-    <ClInclude Include="Containers.h" />
-    <ClInclude Include="Containers_T.h" />
-    <ClInclude Include="Copy_Disabled.h" />
-    <ClInclude Include="CORBA_macros.h" />
-    <ClInclude Include="Countdown_Time.h" />
-    <ClInclude Include="Date_Time.h" />
-    <ClInclude Include="Default_Constants.h" />
-    <ClInclude Include="DEV.h" />
-    <ClInclude Include="DEV_Addr.h" />
-    <ClInclude Include="DEV_Connector.h" />
-    <ClInclude Include="DEV_IO.h" />
-    <ClInclude Include="Dev_Poll_Reactor.h" />
-    <ClInclude Include="Dirent.h" />
-    <ClInclude Include="Dirent_Selector.h" />
-    <ClInclude Include="DLL.h" />
-    <ClInclude Include="DLL_Manager.h" />
-    <ClInclude Include="Dump.h" />
-    <ClInclude Include="Dump_T.h" />
-    <ClInclude Include="Dynamic.h" />
-    <ClInclude Include="Dynamic_Message_Strategy.h" />
-    <ClInclude Include="Dynamic_Service.h" />
-    <ClInclude Include="Dynamic_Service_Base.h" />
-    <ClInclude Include="Dynamic_Service_Dependency.h" />
-    <ClInclude Include="Encoding_Converter.h" />
-    <ClInclude Include="Encoding_Converter_Factory.h" />
-    <ClInclude Include="Env_Value_T.h" />
-    <ClInclude Include="Event.h" />
-    <ClInclude Include="Event_Handler.h" />
-    <ClInclude Include="Event_Handler_T.h" />
-    <ClInclude Include="FIFO.h" />
-    <ClInclude Include="FIFO_Recv.h" />
-    <ClInclude Include="FIFO_Recv_Msg.h" />
-    <ClInclude Include="FIFO_Send.h" />
-    <ClInclude Include="FIFO_Send_Msg.h" />
-    <ClInclude Include="FILE.h" />
-    <ClInclude Include="FILE_Addr.h" />
-    <ClInclude Include="FILE_Connector.h" />
-    <ClInclude Include="FILE_IO.h" />
-    <ClInclude Include="File_Lock.h" />
-    <ClInclude Include="Filecache.h" />
-    <ClInclude Include="Flag_Manip.h" />
-    <ClInclude Include="Framework_Component.h" />
-    <ClInclude Include="Framework_Component_T.h" />
-    <ClInclude Include="Free_List.h" />
-    <ClInclude Include="Functor.h" />
-    <ClInclude Include="Functor_String.h" />
-    <ClInclude Include="Functor_T.h" />
-    <ClInclude Include="Future.h" />
-    <ClInclude Include="Future_Set.h" />
-    <ClInclude Include="Get_Opt.h" />
-    <ClInclude Include="Global_Macros.h" />
-    <ClInclude Include="Guard_T.h" />
-    <ClInclude Include="Handle_Gobbler.h" />
-    <ClInclude Include="Handle_Ops.h" />
-    <ClInclude Include="Handle_Set.h" />
-    <ClInclude Include="Hash_Cache_Map_Manager_T.h" />
-    <ClInclude Include="Hash_Map_Manager.h" />
-    <ClInclude Include="Hash_Map_Manager_T.h" />
-    <ClInclude Include="Hash_Map_With_Allocator_T.h" />
-    <ClInclude Include="Hash_Multi_Map_Manager_T.h" />
-    <ClInclude Include="Hashable.h" />
-    <ClInclude Include="High_Res_Timer.h" />
-    <ClInclude Include="ICMP_Socket.h" />
-    <ClInclude Include="If_Then_Else.h" />
-    <ClInclude Include="INET_Addr.h" />
-    <ClInclude Include="Init_ACE.h" />
-    <ClInclude Include="Intrusive_Auto_Ptr.h" />
-    <ClInclude Include="Intrusive_List.h" />
-    <ClInclude Include="Intrusive_List_Node.h" />
-    <ClInclude Include="IO_Cntl_Msg.h" />
-    <ClInclude Include="IO_SAP.h" />
-    <ClInclude Include="iosfwd.h" />
-    <ClInclude Include="IOStream.h" />
-    <ClInclude Include="IOStream_T.h" />
-    <ClInclude Include="IPC_SAP.h" />
-    <ClInclude Include="Lib_Find.h" />
-    <ClInclude Include="Local_Memory_Pool.h" />
-    <ClInclude Include="Local_Name_Space.h" />
-    <ClInclude Include="Local_Name_Space_T.h" />
-    <ClInclude Include="Local_Tokens.h" />
-    <ClInclude Include="Lock.h" />
-    <ClInclude Include="Lock_Adapter_T.h" />
-    <ClInclude Include="LOCK_SOCK_Acceptor.h" />
-    <ClInclude Include="Log_Msg.h" />
-    <ClInclude Include="Log_Msg_Backend.h" />
-    <ClInclude Include="Log_Msg_Callback.h" />
-    <ClInclude Include="Log_Msg_IPC.h" />
-    <ClInclude Include="Log_Msg_NT_Event_Log.h" />
-    <ClInclude Include="Log_Msg_UNIX_Syslog.h" />
-    <ClInclude Include="Log_Priority.h" />
-    <ClInclude Include="Log_Record.h" />
-    <ClInclude Include="Logging_Strategy.h" />
-    <ClInclude Include="LSOCK.h" />
-    <ClInclude Include="LSOCK_Acceptor.h" />
-    <ClInclude Include="LSOCK_CODgram.h" />
-    <ClInclude Include="LSOCK_Connector.h" />
-    <ClInclude Include="LSOCK_Dgram.h" />
-    <ClInclude Include="LSOCK_Stream.h" />
-    <ClInclude Include="Malloc.h" />
-    <ClInclude Include="Malloc_Allocator.h" />
-    <ClInclude Include="Malloc_Base.h" />
-    <ClInclude Include="Malloc_T.h" />
-    <ClInclude Include="Managed_Object.h" />
-    <ClInclude Include="Manual_Event.h" />
-    <ClInclude Include="Map_Manager.h" />
-    <ClInclude Include="Map_T.h" />
-    <ClInclude Include="MEM_Acceptor.h" />
-    <ClInclude Include="MEM_Addr.h" />
-    <ClInclude Include="MEM_Connector.h" />
-    <ClInclude Include="MEM_IO.h" />
-    <ClInclude Include="Mem_Map.h" />
-    <ClInclude Include="MEM_SAP.h" />
-    <ClInclude Include="MEM_Stream.h" />
-    <ClInclude Include="Memory_Pool.h" />
-    <ClInclude Include="Message_Block.h" />
-    <ClInclude Include="Message_Block_T.h" />
-    <ClInclude Include="Message_Queue.h" />
-    <ClInclude Include="Message_Queue_NT.h" />
-    <ClInclude Include="Message_Queue_T.h" />
-    <ClInclude Include="Message_Queue_Vx.h" />
-    <ClInclude Include="Method_Request.h" />
-    <ClInclude Include="Metrics_Cache.h" />
-    <ClInclude Include="Metrics_Cache_T.h" />
-    <ClInclude Include="Min_Max.h" />
-    <ClInclude Include="MMAP_Memory_Pool.h" />
-    <ClInclude Include="Module.h" />
-    <ClInclude Include="Monitor_Admin.h" />
-    <ClInclude Include="Monitor_Admin_Manager.h" />
-    <ClInclude Include="Monitor_Base.h" />
-    <ClInclude Include="Monitor_Control_Action.h" />
-    <ClInclude Include="Monitor_Control_Types.h" />
-    <ClInclude Include="Monitor_Point_Registry.h" />
-    <ClInclude Include="Monitor_Size.h" />
-    <ClInclude Include="Msg_WFMO_Reactor.h" />
-    <ClInclude Include="Multihomed_INET_Addr.h" />
-    <ClInclude Include="Mutex.h" />
-    <ClInclude Include="Name_Proxy.h" />
-    <ClInclude Include="Name_Request_Reply.h" />
-    <ClInclude Include="Name_Space.h" />
-    <ClInclude Include="Naming_Context.h" />
-    <ClInclude Include="Netlink_Addr.h" />
-    <ClInclude Include="Node.h" />
-    <ClInclude Include="Notification_Queue.h" />
-    <ClInclude Include="Notification_Strategy.h" />
-    <ClInclude Include="NT_Service.h" />
-    <ClInclude Include="Null_Barrier.h" />
-    <ClInclude Include="Null_Condition.h" />
-    <ClInclude Include="Null_Mutex.h" />
-    <ClInclude Include="Null_Semaphore.h" />
-    <ClInclude Include="Numeric_Limits.h" />
-    <ClInclude Include="Obchunk.h" />
-    <ClInclude Include="Object_Manager.h" />
-    <ClInclude Include="Object_Manager_Base.h" />
-    <ClInclude Include="Obstack.h" />
-    <ClInclude Include="Obstack_T.h" />
-    <ClInclude Include="OS_Errno.h" />
-    <ClInclude Include="os_include\arpa\os_inet.h" />
-    <ClInclude Include="os_include\net\os_if.h" />
-    <ClInclude Include="os_include\netinet\os_in.h" />
-    <ClInclude Include="os_include\netinet\os_tcp.h" />
-    <ClInclude Include="os_include\os_aio.h" />
-    <ClInclude Include="os_include\os_assert.h" />
-    <ClInclude Include="os_include\os_byteswap.h" />
-    <ClInclude Include="os_include\os_complex.h" />
-    <ClInclude Include="os_include\os_cpio.h" />
-    <ClInclude Include="os_include\os_ctype.h" />
-    <ClInclude Include="os_include\os_dirent.h" />
-    <ClInclude Include="os_include\os_dlfcn.h" />
-    <ClInclude Include="os_include\os_errno.h" />
-    <ClInclude Include="os_include\os_fcntl.h" />
-    <ClInclude Include="os_include\os_fenv.h" />
-    <ClInclude Include="os_include\os_float.h" />
-    <ClInclude Include="os_include\os_fmtmsg.h" />
-    <ClInclude Include="os_include\os_fnmatch.h" />
-    <ClInclude Include="os_include\os_ftw.h" />
-    <ClInclude Include="os_include\os_glob.h" />
-    <ClInclude Include="os_include\os_grp.h" />
-    <ClInclude Include="os_include\os_iconv.h" />
-    <ClInclude Include="os_include\os_intrin.h" />
-    <ClInclude Include="os_include\os_inttypes.h" />
-    <ClInclude Include="os_include\os_iso646.h" />
-    <ClInclude Include="os_include\os_kstat.h" />
-    <ClInclude Include="os_include\os_langinfo.h" />
-    <ClInclude Include="os_include\os_libgen.h" />
-    <ClInclude Include="os_include\os_limits.h" />
-    <ClInclude Include="os_include\os_local.h" />
-    <ClInclude Include="os_include\os_math.h" />
-    <ClInclude Include="os_include\os_monetary.h" />
-    <ClInclude Include="os_include\os_mqueue.h" />
-    <ClInclude Include="os_include\os_ndbm.h" />
-    <ClInclude Include="os_include\os_netdb.h" />
-    <ClInclude Include="os_include\os_nl_types.h" />
-    <ClInclude Include="os_include\os_pdh.h" />
-    <ClInclude Include="os_include\os_pdhmsg.h" />
-    <ClInclude Include="os_include\os_poll.h" />
-    <ClInclude Include="os_include\os_pthread.h" />
-    <ClInclude Include="os_include\os_pwd.h" />
-    <ClInclude Include="os_include\os_regex.h" />
-    <ClInclude Include="os_include\os_sched.h" />
-    <ClInclude Include="os_include\os_search.h" />
-    <ClInclude Include="os_include\os_semaphore.h" />
-    <ClInclude Include="os_include\os_setjmp.h" />
-    <ClInclude Include="os_include\os_signal.h" />
-    <ClInclude Include="os_include\os_spawn.h" />
-    <ClInclude Include="os_include\os_stdarg.h" />
-    <ClInclude Include="os_include\os_stdbool.h" />
-    <ClInclude Include="os_include\os_stddef.h" />
-    <ClInclude Include="os_include\os_stdint.h" />
-    <ClInclude Include="os_include\os_stdio.h" />
-    <ClInclude Include="os_include\os_stdlib.h" />
-    <ClInclude Include="os_include\os_string.h" />
-    <ClInclude Include="os_include\os_strings.h" />
-    <ClInclude Include="os_include\os_stropts.h" />
-    <ClInclude Include="os_include\os_syslog.h" />
-    <ClInclude Include="os_include\os_tar.h" />
-    <ClInclude Include="os_include\os_termios.h" />
-    <ClInclude Include="os_include\os_tgmath.h" />
-    <ClInclude Include="os_include\os_time.h" />
-    <ClInclude Include="os_include\os_trace.h" />
-    <ClInclude Include="os_include\os_typeinfo.h" />
-    <ClInclude Include="os_include\os_ucontext.h" />
-    <ClInclude Include="os_include\os_ulimit.h" />
-    <ClInclude Include="os_include\os_unistd.h" />
-    <ClInclude Include="os_include\os_utime.h" />
-    <ClInclude Include="os_include\os_utmpx.h" />
-    <ClInclude Include="os_include\os_wchar.h" />
-    <ClInclude Include="os_include\os_wctype.h" />
-    <ClInclude Include="os_include\os_wordexp.h" />
-    <ClInclude Include="os_include\sys\os_ipc.h" />
-    <ClInclude Include="os_include\sys\os_loadavg.h" />
-    <ClInclude Include="os_include\sys\os_mman.h" />
-    <ClInclude Include="os_include\sys\os_msg.h" />
-    <ClInclude Include="os_include\sys\os_pstat.h" />
-    <ClInclude Include="os_include\sys\os_resource.h" />
-    <ClInclude Include="os_include\sys\os_select.h" />
-    <ClInclude Include="os_include\sys\os_sem.h" />
-    <ClInclude Include="os_include\sys\os_shm.h" />
-    <ClInclude Include="os_include\sys\os_socket.h" />
-    <ClInclude Include="os_include\sys\os_stat.h" />
-    <ClInclude Include="os_include\sys\os_statvfs.h" />
-    <ClInclude Include="os_include\sys\os_sysctl.h" />
-    <ClInclude Include="os_include\sys\os_sysinfo.h" />
-    <ClInclude Include="os_include\sys\os_time.h" />
-    <ClInclude Include="os_include\sys\os_timeb.h" />
-    <ClInclude Include="os_include\sys\os_times.h" />
-    <ClInclude Include="os_include\sys\os_types.h" />
-    <ClInclude Include="os_include\sys\os_uio.h" />
-    <ClInclude Include="os_include\sys\os_un.h" />
-    <ClInclude Include="os_include\sys\os_utsname.h" />
-    <ClInclude Include="os_include\sys\os_wait.h" />
-    <ClInclude Include="OS_Log_Msg_Attributes.h" />
-    <ClInclude Include="OS_main.h" />
-    <ClInclude Include="OS_Memory.h" />
-    <ClInclude Include="OS_NS_arpa_inet.h" />
-    <ClInclude Include="OS_NS_ctype.h" />
-    <ClInclude Include="OS_NS_dirent.h" />
-    <ClInclude Include="OS_NS_dlfcn.h" />
-    <ClInclude Include="OS_NS_errno.h" />
-    <ClInclude Include="OS_NS_fcntl.h" />
-    <ClInclude Include="OS_NS_macros.h" />
-    <ClInclude Include="OS_NS_math.h" />
-    <ClInclude Include="OS_NS_netdb.h" />
-    <ClInclude Include="OS_NS_poll.h" />
-    <ClInclude Include="OS_NS_pwd.h" />
-    <ClInclude Include="OS_NS_regex.h" />
-    <ClInclude Include="OS_NS_signal.h" />
-    <ClInclude Include="OS_NS_stdio.h" />
-    <ClInclude Include="OS_NS_stdlib.h" />
-    <ClInclude Include="OS_NS_string.h" />
-    <ClInclude Include="OS_NS_strings.h" />
-    <ClInclude Include="OS_NS_stropts.h" />
-    <ClInclude Include="OS_NS_sys_mman.h" />
-    <ClInclude Include="OS_NS_sys_msg.h" />
-    <ClInclude Include="OS_NS_sys_resource.h" />
-    <ClInclude Include="OS_NS_sys_select.h" />
-    <ClInclude Include="OS_NS_sys_sendfile.h" />
-    <ClInclude Include="OS_NS_sys_shm.h" />
-    <ClInclude Include="OS_NS_sys_socket.h" />
-    <ClInclude Include="OS_NS_sys_stat.h" />
-    <ClInclude Include="OS_NS_sys_time.h" />
-    <ClInclude Include="OS_NS_sys_uio.h" />
-    <ClInclude Include="OS_NS_sys_utsname.h" />
-    <ClInclude Include="OS_NS_sys_wait.h" />
-    <ClInclude Include="OS_NS_Thread.h" />
-    <ClInclude Include="OS_NS_time.h" />
-    <ClInclude Include="OS_NS_unistd.h" />
-    <ClInclude Include="OS_NS_wchar.h" />
-    <ClInclude Include="OS_NS_wctype.h" />
-    <ClInclude Include="OS_QoS.h" />
-    <ClInclude Include="OS_Thread_Adapter.h" />
-    <ClInclude Include="OS_TLI.h" />
-    <ClInclude Include="Pagefile_Memory_Pool.h" />
-    <ClInclude Include="Pair_T.h" />
-    <ClInclude Include="Parse_Node.h" />
-    <ClInclude Include="PI_Malloc.h" />
-    <ClInclude Include="Ping_Socket.h" />
-    <ClInclude Include="Pipe.h" />
-    <ClInclude Include="POSIX_Asynch_IO.h" />
-    <ClInclude Include="POSIX_CB_Proactor.h" />
-    <ClInclude Include="POSIX_Proactor.h" />
-    <ClInclude Include="post.h" />
-    <ClInclude Include="pre.h" />
-    <ClInclude Include="Priority_Reactor.h" />
-    <ClInclude Include="Proactor.h" />
-    <ClInclude Include="Proactor_Impl.h" />
-    <ClInclude Include="Process.h" />
-    <ClInclude Include="Process_Manager.h" />
-    <ClInclude Include="Process_Mutex.h" />
-    <ClInclude Include="Process_Semaphore.h" />
-    <ClInclude Include="Profile_Timer.h" />
-    <ClInclude Include="RB_Tree.h" />
-    <ClInclude Include="Reactor.h" />
-    <ClInclude Include="Reactor_Impl.h" />
-    <ClInclude Include="Reactor_Notification_Strategy.h" />
-    <ClInclude Include="Reactor_Timer_Interface.h" />
-    <ClInclude Include="Reactor_Token_T.h" />
-    <ClInclude Include="Read_Buffer.h" />
-    <ClInclude Include="Recursive_Thread_Mutex.h" />
-    <ClInclude Include="Recyclable.h" />
-    <ClInclude Include="Refcountable_T.h" />
-    <ClInclude Include="Refcounted_Auto_Ptr.h" />
-    <ClInclude Include="Registry.h" />
-    <ClInclude Include="Registry_Name_Space.h" />
-    <ClInclude Include="Remote_Name_Space.h" />
-    <ClInclude Include="Remote_Tokens.h" />
-    <ClInclude Include="Reverse_Lock_T.h" />
-    <ClInclude Include="RW_Mutex.h" />
-    <ClInclude Include="RW_Process_Mutex.h" />
-    <ClInclude Include="RW_Thread_Mutex.h" />
-    <ClInclude Include="Sample_History.h" />
-    <ClInclude Include="Sbrk_Memory_Pool.h" />
-    <ClInclude Include="Sched_Params.h" />
-    <ClInclude Include="Select_Reactor.h" />
-    <ClInclude Include="Select_Reactor_Base.h" />
-    <ClInclude Include="Select_Reactor_T.h" />
-    <ClInclude Include="Semaphore.h" />
-    <ClInclude Include="Service_Config.h" />
-    <ClInclude Include="Service_Gestalt.h" />
-    <ClInclude Include="Service_Manager.h" />
-    <ClInclude Include="Service_Object.h" />
-    <ClInclude Include="Service_Repository.h" />
-    <ClInclude Include="Service_Types.h" />
-    <ClInclude Include="Shared_Memory.h" />
-    <ClInclude Include="Shared_Memory_MM.h" />
-    <ClInclude Include="Shared_Memory_Pool.h" />
-    <ClInclude Include="Shared_Memory_SV.h" />
-    <ClInclude Include="Shared_Object.h" />
-    <ClInclude Include="Sig_Adapter.h" />
-    <ClInclude Include="Sig_Handler.h" />
-    <ClInclude Include="Signal.h" />
-    <ClInclude Include="Singleton.h" />
-    <ClInclude Include="SOCK.h" />
-    <ClInclude Include="SOCK_Acceptor.h" />
-    <ClInclude Include="SOCK_CODgram.h" />
-    <ClInclude Include="Sock_Connect.h" />
-    <ClInclude Include="SOCK_Connector.h" />
-    <ClInclude Include="SOCK_Dgram.h" />
-    <ClInclude Include="SOCK_Dgram_Bcast.h" />
-    <ClInclude Include="SOCK_Dgram_Mcast.h" />
-    <ClInclude Include="SOCK_IO.h" />
-    <ClInclude Include="SOCK_Netlink.h" />
-    <ClInclude Include="SOCK_SEQPACK_Acceptor.h" />
-    <ClInclude Include="SOCK_SEQPACK_Association.h" />
-    <ClInclude Include="SOCK_SEQPACK_Connector.h" />
-    <ClInclude Include="SOCK_Stream.h" />
-    <ClInclude Include="SPIPE.h" />
-    <ClInclude Include="SPIPE_Acceptor.h" />
-    <ClInclude Include="SPIPE_Addr.h" />
-    <ClInclude Include="SPIPE_Connector.h" />
-    <ClInclude Include="SPIPE_Stream.h" />
-    <ClInclude Include="SString.h" />
-    <ClInclude Include="SStringfwd.h" />
-    <ClInclude Include="Stack_Trace.h" />
-    <ClInclude Include="Static_Object_Lock.h" />
-    <ClInclude Include="Stats.h" />
-    <ClInclude Include="Strategies.h" />
-    <ClInclude Include="Strategies_T.h" />
-    <ClInclude Include="Stream.h" />
-    <ClInclude Include="Stream_Modules.h" />
-    <ClInclude Include="streams.h" />
-    <ClInclude Include="String_Base.h" />
-    <ClInclude Include="String_Base_Const.h" />
-    <ClInclude Include="SUN_Proactor.h" />
-    <ClInclude Include="SV_Message.h" />
-    <ClInclude Include="SV_Message_Queue.h" />
-    <ClInclude Include="SV_Semaphore_Complex.h" />
-    <ClInclude Include="SV_Semaphore_Simple.h" />
-    <ClInclude Include="SV_Shared_Memory.h" />
-    <ClInclude Include="Svc_Conf.h" />
-    <ClInclude Include="Svc_Conf_Lexer.h" />
-    <ClInclude Include="Svc_Conf_Param.h" />
-    <ClInclude Include="Svc_Conf_Token_Table.h" />
-    <ClInclude Include="Svc_Conf_Tokens.h" />
-    <ClInclude Include="svc_export.h" />
-    <ClInclude Include="Svc_Handler.h" />
-    <ClInclude Include="Synch.h" />
-    <ClInclude Include="Synch_Options.h" />
-    <ClInclude Include="Synch_Traits.h" />
-    <ClInclude Include="System_Time.h" />
-    <ClInclude Include="Task.h" />
-    <ClInclude Include="Task_Ex_T.h" />
-    <ClInclude Include="Task_T.h" />
-    <ClInclude Include="Test_and_Set.h" />
-    <ClInclude Include="Thread.h" />
-    <ClInclude Include="Thread_Adapter.h" />
-    <ClInclude Include="Thread_Control.h" />
-    <ClInclude Include="Thread_Exit.h" />
-    <ClInclude Include="Thread_Hook.h" />
-    <ClInclude Include="Thread_Manager.h" />
-    <ClInclude Include="Thread_Mutex.h" />
-    <ClInclude Include="Thread_Semaphore.h" />
-    <ClInclude Include="Throughput_Stats.h" />
-    <ClInclude Include="Time_Value.h" />
-    <ClInclude Include="Timeprobe.h" />
-    <ClInclude Include="Timeprobe_T.h" />
-    <ClInclude Include="Timer_Hash.h" />
-    <ClInclude Include="Timer_Hash_T.h" />
-    <ClInclude Include="Timer_Heap.h" />
-    <ClInclude Include="Timer_Heap_T.h" />
-    <ClInclude Include="Timer_List.h" />
-    <ClInclude Include="Timer_List_T.h" />
-    <ClInclude Include="Timer_Queue.h" />
-    <ClInclude Include="Timer_Queue_Adapters.h" />
-    <ClInclude Include="Timer_Queue_T.h" />
-    <ClInclude Include="Timer_Queuefwd.h" />
-    <ClInclude Include="Timer_Wheel.h" />
-    <ClInclude Include="Timer_Wheel_T.h" />
-    <ClInclude Include="TLI.h" />
-    <ClInclude Include="TLI_Acceptor.h" />
-    <ClInclude Include="TLI_Connector.h" />
-    <ClInclude Include="TLI_Stream.h" />
-    <ClInclude Include="Token.h" />
-    <ClInclude Include="Token_Collection.h" />
-    <ClInclude Include="Token_Invariants.h" />
-    <ClInclude Include="Token_Manager.h" />
-    <ClInclude Include="Token_Request_Reply.h" />
-    <ClInclude Include="Tokenizer_T.h" />
-    <ClInclude Include="TP_Reactor.h" />
-    <ClInclude Include="Trace.h" />
-    <ClInclude Include="Truncate.h" />
-    <ClInclude Include="TSS_Adapter.h" />
-    <ClInclude Include="TSS_T.h" />
-    <ClInclude Include="TTY_IO.h" />
-    <ClInclude Include="Typed_SV_Message.h" />
-    <ClInclude Include="Typed_SV_Message_Queue.h" />
-    <ClInclude Include="Unbounded_Queue.h" />
-    <ClInclude Include="Unbounded_Set.h" />
-    <ClInclude Include="Unbounded_Set_Ex.h" />
-    <ClInclude Include="UNIX_Addr.h" />
-    <ClInclude Include="UPIPE_Acceptor.h" />
-    <ClInclude Include="UPIPE_Addr.h" />
-    <ClInclude Include="UPIPE_Connector.h" />
-    <ClInclude Include="UPIPE_Stream.h" />
-    <ClInclude Include="UTF16_Encoding_Converter.h" />
-    <ClInclude Include="UTF32_Encoding_Converter.h" />
-    <ClInclude Include="UTF8_Encoding_Converter.h" />
-    <ClInclude Include="UUID.h" />
-    <ClInclude Include="Value_Ptr.h" />
-    <ClInclude Include="Vector_T.h" />
-    <ClInclude Include="Version.h" />
-    <ClInclude Include="Versioned_Namespace.h" />
-    <ClInclude Include="WFMO_Reactor.h" />
-    <ClInclude Include="WIN32_Asynch_IO.h" />
-    <ClInclude Include="WIN32_Proactor.h" />
-    <ClInclude Include="XML_Svc_Conf.h" />
-    <ClInclude Include="XTI_ATM_Mcast.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ace.mpc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="ace.mwc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="ace_for_tao.mpc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="codecs.mpb">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="filecache.mpb">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="other.mpb">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="svcconf.mpb">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="svcconfgen.mpc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="token.mpb">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="uuid.mpb">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\AUTHORS">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\bin\add_rel_link.sh">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\bin\DependencyGenerator">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\bin\depgen.pl">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\bin\MakeProjectCreator">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\bin\mpc.pl">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\bin\mwc.pl">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\COPYING">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\docs">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\include\makeinclude">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\NEWS">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\PROBLEM-REPORT-FORM">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\README">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\THANKS">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\VERSION">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ACE.pc.in">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ACE.inl" />
-    <None Include="ace_wchar.inl" />
-    <None Include="Activation_Queue.inl" />
-    <None Include="Active_Map_Manager.inl" />
-    <None Include="Active_Map_Manager_T.inl" />
-    <None Include="Addr.inl" />
-    <None Include="ARGV.inl" />
-    <None Include="Argv_Type_Converter.inl" />
-    <None Include="Array_Base.inl" />
-    <None Include="Array_Map.inl" />
-    <None Include="Asynch_IO_Impl.inl" />
-    <None Include="ATM_Acceptor.inl" />
-    <None Include="ATM_Addr.inl" />
-    <None Include="ATM_Connector.inl" />
-    <None Include="ATM_Params.inl" />
-    <None Include="ATM_QoS.inl" />
-    <None Include="ATM_Stream.inl" />
-    <None Include="Atomic_Op.inl" />
-    <None Include="Atomic_Op_GCC_T.inl" />
-    <None Include="Atomic_Op_T.inl" />
-    <None Include="Auto_Event.inl" />
-    <None Include="Auto_Functor.inl" />
-    <None Include="Auto_IncDec_T.inl" />
-    <None Include="Auto_Ptr.inl" />
-    <None Include="Barrier.inl" />
-    <None Include="Base_Thread_Adapter.inl" />
-    <None Include="Based_Pointer_T.inl" />
-    <None Include="Basic_Stats.inl" />
-    <None Include="Basic_Types.inl" />
-    <None Include="Bound_Ptr.inl" />
-    <None Include="Cache_Map_Manager_T.inl" />
-    <None Include="Caching_Strategies_T.inl" />
-    <None Include="Capabilities.inl" />
-    <None Include="CDR_Base.inl" />
-    <None Include="CDR_Size.inl" />
-    <None Include="CDR_Stream.inl" />
-    <None Include="Cleanup.inl" />
-    <None Include="Codeset_Registry.inl" />
-    <None Include="Condition_T.inl" />
-    <None Include="Condition_Thread_Mutex.inl" />
-    <None Include="Configuration.inl" />
-    <None Include="Containers.inl" />
-    <None Include="Containers_T.inl" />
-    <None Include="Countdown_Time.inl" />
-    <None Include="Date_Time.inl" />
-    <None Include="DEV.inl" />
-    <None Include="DEV_Addr.inl" />
-    <None Include="DEV_Connector.inl" />
-    <None Include="DEV_IO.inl" />
-    <None Include="Dev_Poll_Reactor.inl" />
-    <None Include="Dirent.inl" />
-    <None Include="Dirent_Selector.inl" />
-    <None Include="Dynamic.inl" />
-    <None Include="Dynamic_Message_Strategy.inl" />
-    <None Include="Dynamic_Service.inl" />
-    <None Include="Env_Value_T.inl" />
-    <None Include="Event.inl" />
-    <None Include="Event_Handler.inl" />
-    <None Include="Event_Handler_T.inl" />
-    <None Include="FIFO.inl" />
-    <None Include="FIFO_Recv.inl" />
-    <None Include="FIFO_Recv_Msg.inl" />
-    <None Include="FIFO_Send.inl" />
-    <None Include="FIFO_Send_Msg.inl" />
-    <None Include="FILE.inl" />
-    <None Include="FILE_Addr.inl" />
-    <None Include="FILE_Connector.inl" />
-    <None Include="FILE_IO.inl" />
-    <None Include="File_Lock.inl" />
-    <None Include="Flag_Manip.inl" />
-    <None Include="Framework_Component.inl" />
-    <None Include="Functor.inl" />
-    <None Include="Functor_String.inl" />
-    <None Include="Functor_T.inl" />
-    <None Include="Get_Opt.inl" />
-    <None Include="Guard_T.inl" />
-    <None Include="Handle_Gobbler.inl" />
-    <None Include="Handle_Set.inl" />
-    <None Include="Hash_Cache_Map_Manager_T.inl" />
-    <None Include="Hash_Map_Manager_T.inl" />
-    <None Include="Hash_Map_With_Allocator_T.inl" />
-    <None Include="Hash_Multi_Map_Manager_T.inl" />
-    <None Include="Hashable.inl" />
-    <None Include="High_Res_Timer.inl" />
-    <None Include="INET_Addr.inl" />
-    <None Include="Intrusive_Auto_Ptr.inl" />
-    <None Include="Intrusive_List.inl" />
-    <None Include="Intrusive_List_Node.inl" />
-    <None Include="IO_Cntl_Msg.inl" />
-    <None Include="IO_SAP.inl" />
-    <None Include="IOStream_T.inl" />
-    <None Include="IPC_SAP.inl" />
-    <None Include="Local_Tokens.inl" />
-    <None Include="Lock.inl" />
-    <None Include="Lock_Adapter_T.inl" />
-    <None Include="Log_Msg.inl" />
-    <None Include="Log_Record.inl" />
-    <None Include="LSOCK.inl" />
-    <None Include="LSOCK_CODgram.inl" />
-    <None Include="LSOCK_Connector.inl" />
-    <None Include="LSOCK_Dgram.inl" />
-    <None Include="LSOCK_Stream.inl" />
-    <None Include="Malloc.inl" />
-    <None Include="Malloc_Allocator.inl" />
-    <None Include="Malloc_T.inl" />
-    <None Include="Managed_Object.inl" />
-    <None Include="Manual_Event.inl" />
-    <None Include="Map_Manager.inl" />
-    <None Include="Map_T.inl" />
-    <None Include="MEM_Acceptor.inl" />
-    <None Include="MEM_Addr.inl" />
-    <None Include="MEM_Connector.inl" />
-    <None Include="MEM_IO.inl" />
-    <None Include="Mem_Map.inl" />
-    <None Include="MEM_SAP.inl" />
-    <None Include="MEM_Stream.inl" />
-    <None Include="Message_Block.inl" />
-    <None Include="Message_Block_T.inl" />
-    <None Include="Message_Queue.inl" />
-    <None Include="Message_Queue_NT.inl" />
-    <None Include="Message_Queue_Vx.inl" />
-    <None Include="Metrics_Cache_T.inl" />
-    <None Include="MMAP_Memory_Pool.inl" />
-    <None Include="Module.inl" />
-    <None Include="Monitor_Base.inl" />
-    <None Include="Msg_WFMO_Reactor.inl" />
-    <None Include="Multihomed_INET_Addr.inl" />
-    <None Include="Mutex.inl" />
-    <None Include="Naming_Context.inl" />
-    <None Include="Netlink_Addr.inl" />
-    <None Include="Notification_Queue.inl" />
-    <None Include="Notification_Strategy.inl" />
-    <None Include="NT_Service.inl" />
-    <None Include="Obchunk.inl" />
-    <None Include="Object_Manager.inl" />
-    <None Include="Obstack_T.inl" />
-    <None Include="OS_Errno.inl" />
-    <None Include="OS_Log_Msg_Attributes.inl" />
-    <None Include="OS_NS_arpa_inet.inl" />
-    <None Include="OS_NS_ctype.inl" />
-    <None Include="OS_NS_dirent.inl" />
-    <None Include="OS_NS_dlfcn.inl" />
-    <None Include="OS_NS_errno.inl" />
-    <None Include="OS_NS_fcntl.inl" />
-    <None Include="OS_NS_math.inl" />
-    <None Include="OS_NS_netdb.inl" />
-    <None Include="OS_NS_poll.inl" />
-    <None Include="OS_NS_pwd.inl" />
-    <None Include="OS_NS_regex.inl" />
-    <None Include="OS_NS_signal.inl" />
-    <None Include="OS_NS_stdio.inl" />
-    <None Include="OS_NS_stdlib.inl" />
-    <None Include="OS_NS_string.inl" />
-    <None Include="OS_NS_strings.inl" />
-    <None Include="OS_NS_stropts.inl" />
-    <None Include="OS_NS_sys_mman.inl" />
-    <None Include="OS_NS_sys_msg.inl" />
-    <None Include="OS_NS_sys_resource.inl" />
-    <None Include="OS_NS_sys_select.inl" />
-    <None Include="OS_NS_sys_sendfile.inl" />
-    <None Include="OS_NS_sys_shm.inl" />
-    <None Include="OS_NS_sys_socket.inl" />
-    <None Include="OS_NS_sys_stat.inl" />
-    <None Include="OS_NS_sys_time.inl" />
-    <None Include="OS_NS_sys_uio.inl" />
-    <None Include="OS_NS_sys_wait.inl" />
-    <None Include="OS_NS_Thread.inl" />
-    <None Include="OS_NS_time.inl" />
-    <None Include="OS_NS_unistd.inl" />
-    <None Include="OS_NS_wchar.inl" />
-    <None Include="OS_NS_wctype.inl" />
-    <None Include="OS_TLI.inl" />
-    <None Include="Pagefile_Memory_Pool.inl" />
-    <None Include="Pair_T.inl" />
-    <None Include="PI_Malloc.inl" />
-    <None Include="Ping_Socket.inl" />
-    <None Include="Pipe.inl" />
-    <None Include="POSIX_Proactor.inl" />
-    <None Include="Proactor.inl" />
-    <None Include="Process.inl" />
-    <None Include="Process_Manager.inl" />
-    <None Include="Process_Mutex.inl" />
-    <None Include="Process_Semaphore.inl" />
-    <None Include="Profile_Timer.inl" />
-    <None Include="RB_Tree.inl" />
-    <None Include="Reactor.inl" />
-    <None Include="Reactor_Notification_Strategy.inl" />
-    <None Include="Read_Buffer.inl" />
-    <None Include="Recursive_Thread_Mutex.inl" />
-    <None Include="Recyclable.inl" />
-    <None Include="Refcountable_T.inl" />
-    <None Include="Refcounted_Auto_Ptr.inl" />
-    <None Include="Remote_Tokens.inl" />
-    <None Include="Reverse_Lock_T.inl" />
-    <None Include="RW_Mutex.inl" />
-    <None Include="RW_Process_Mutex.inl" />
-    <None Include="RW_Thread_Mutex.inl" />
-    <None Include="Sample_History.inl" />
-    <None Include="Sched_Params.inl" />
-    <None Include="Select_Reactor_Base.inl" />
-    <None Include="Select_Reactor_T.inl" />
-    <None Include="Semaphore.inl" />
-    <None Include="Service_Config.inl" />
-    <None Include="Service_Gestalt.inl" />
-    <None Include="Service_Object.inl" />
-    <None Include="Service_Repository.inl" />
-    <None Include="Service_Types.inl" />
-    <None Include="Shared_Memory_MM.inl" />
-    <None Include="Shared_Memory_SV.inl" />
-    <None Include="Shared_Object.inl" />
-    <None Include="Sig_Handler.inl" />
-    <None Include="Signal.inl" />
-    <None Include="Singleton.inl" />
-    <None Include="SOCK.inl" />
-    <None Include="SOCK_Acceptor.inl" />
-    <None Include="SOCK_CODgram.inl" />
-    <None Include="SOCK_Connector.inl" />
-    <None Include="SOCK_Dgram.inl" />
-    <None Include="SOCK_Dgram_Bcast.inl" />
-    <None Include="SOCK_Dgram_Mcast.inl" />
-    <None Include="SOCK_IO.inl" />
-    <None Include="SOCK_Netlink.inl" />
-    <None Include="SOCK_SEQPACK_Acceptor.inl" />
-    <None Include="SOCK_SEQPACK_Association.inl" />
-    <None Include="SOCK_SEQPACK_Connector.inl" />
-    <None Include="SOCK_Stream.inl" />
-    <None Include="SPIPE.inl" />
-    <None Include="SPIPE_Addr.inl" />
-    <None Include="SPIPE_Connector.inl" />
-    <None Include="SPIPE_Stream.inl" />
-    <None Include="SString.inl" />
-    <None Include="Stats.inl" />
-    <None Include="Strategies_T.inl" />
-    <None Include="Stream.inl" />
-    <None Include="String_Base.inl" />
-    <None Include="SV_Message.inl" />
-    <None Include="SV_Message_Queue.inl" />
-    <None Include="SV_Semaphore_Complex.inl" />
-    <None Include="SV_Semaphore_Simple.inl" />
-    <None Include="SV_Shared_Memory.inl" />
-    <None Include="Task.inl" />
-    <None Include="Task_Ex_T.inl" />
-    <None Include="Task_T.inl" />
-    <None Include="Thread.inl" />
-    <None Include="Thread_Adapter.inl" />
-    <None Include="Thread_Control.inl" />
-    <None Include="Thread_Manager.inl" />
-    <None Include="Thread_Mutex.inl" />
-    <None Include="Thread_Semaphore.inl" />
-    <None Include="Time_Value.inl" />
-    <None Include="Timeprobe.inl" />
-    <None Include="Timer_Queue_Adapters.inl" />
-    <None Include="Timer_Queue_T.inl" />
-    <None Include="TLI.inl" />
-    <None Include="TLI_Connector.inl" />
-    <None Include="TLI_Stream.inl" />
-    <None Include="Token.inl" />
-    <None Include="Token_Collection.inl" />
-    <None Include="Token_Manager.inl" />
-    <None Include="Token_Request_Reply.inl" />
-    <None Include="TP_Reactor.inl" />
-    <None Include="TSS_T.inl" />
-    <None Include="Typed_SV_Message.inl" />
-    <None Include="Typed_SV_Message_Queue.inl" />
-    <None Include="Unbounded_Queue.inl" />
-    <None Include="Unbounded_Set.inl" />
-    <None Include="Unbounded_Set_Ex.inl" />
-    <None Include="UNIX_Addr.inl" />
-    <None Include="UPIPE_Acceptor.inl" />
-    <None Include="UPIPE_Connector.inl" />
-    <None Include="UPIPE_Stream.inl" />
-    <None Include="UTF16_Encoding_Converter.inl" />
-    <None Include="UUID.inl" />
-    <None Include="Vector_T.inl" />
-    <None Include="WFMO_Reactor.inl" />
-    <None Include="XTI_ATM_Mcast.inl" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\VERSION">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuild>
-    <CustomBuild Include="README">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ace.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ACE</ProjectName>
+    <ProjectGuid>{47BC56ED-FECA-1BAD-6757-8A6300006755}</ProjectGuid>
+    <RootNamespace>ACE</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\ACE_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACEd</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\ACE_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\ACE_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ACEd</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\ACE_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ACE</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACEd.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImportLibrary>..\lib\ACEd.lib</ImportLibrary>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\lib\ACE.lib</ImportLibrary>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACEd.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImportLibrary>..\lib\ACEd.lib</ImportLibrary>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\lib\ACE.lib</ImportLibrary>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ACE.cpp">
+    </ClCompile>
+    <ClCompile Include="ACE_crc32.cpp">
+    </ClCompile>
+    <ClCompile Include="ACE_crc_ccitt.cpp">
+    </ClCompile>
+    <ClCompile Include="ace_wchar.cpp">
+    </ClCompile>
+    <ClCompile Include="Activation_Queue.cpp">
+    </ClCompile>
+    <ClCompile Include="Active_Map_Manager.cpp">
+    </ClCompile>
+    <ClCompile Include="Addr.cpp">
+    </ClCompile>
+    <ClCompile Include="Argv_Type_Converter.cpp">
+    </ClCompile>
+    <ClCompile Include="Assert.cpp">
+    </ClCompile>
+    <ClCompile Include="Asynch_IO.cpp">
+    </ClCompile>
+    <ClCompile Include="Asynch_IO_Impl.cpp">
+    </ClCompile>
+    <ClCompile Include="Asynch_Pseudo_Task.cpp">
+    </ClCompile>
+    <ClCompile Include="ATM_Acceptor.cpp">
+    </ClCompile>
+    <ClCompile Include="ATM_Addr.cpp">
+    </ClCompile>
+    <ClCompile Include="ATM_Connector.cpp">
+    </ClCompile>
+    <ClCompile Include="ATM_Params.cpp">
+    </ClCompile>
+    <ClCompile Include="ATM_QoS.cpp">
+    </ClCompile>
+    <ClCompile Include="ATM_Stream.cpp">
+    </ClCompile>
+    <ClCompile Include="Atomic_Op.cpp">
+    </ClCompile>
+    <ClCompile Include="Atomic_Op_Sparc.c">
+    </ClCompile>
+    <ClCompile Include="Auto_Event.cpp">
+    </ClCompile>
+    <ClCompile Include="Barrier.cpp">
+    </ClCompile>
+    <ClCompile Include="Base_Thread_Adapter.cpp">
+    </ClCompile>
+    <ClCompile Include="Based_Pointer_Repository.cpp">
+    </ClCompile>
+    <ClCompile Include="Basic_Stats.cpp">
+    </ClCompile>
+    <ClCompile Include="Basic_Types.cpp">
+    </ClCompile>
+    <ClCompile Include="Capabilities.cpp">
+    </ClCompile>
+    <ClCompile Include="CDR_Base.cpp">
+    </ClCompile>
+    <ClCompile Include="CDR_Size.cpp">
+    </ClCompile>
+    <ClCompile Include="CDR_Stream.cpp">
+    </ClCompile>
+    <ClCompile Include="Cleanup.cpp">
+    </ClCompile>
+    <ClCompile Include="Codecs.cpp">
+    </ClCompile>
+    <ClCompile Include="Codeset_IBM1047.cpp">
+    </ClCompile>
+    <ClCompile Include="Codeset_Registry.cpp">
+    </ClCompile>
+    <ClCompile Include="Codeset_Registry_db.cpp">
+    </ClCompile>
+    <ClCompile Include="Condition_Recursive_Thread_Mutex.cpp">
+    </ClCompile>
+    <ClCompile Include="Condition_Thread_Mutex.cpp">
+    </ClCompile>
+    <ClCompile Include="Configuration.cpp">
+    </ClCompile>
+    <ClCompile Include="Configuration_Import_Export.cpp">
+    </ClCompile>
+    <ClCompile Include="Connection_Recycling_Strategy.cpp">
+    </ClCompile>
+    <ClCompile Include="Containers.cpp">
+    </ClCompile>
+    <ClCompile Include="Copy_Disabled.cpp">
+    </ClCompile>
+    <ClCompile Include="Countdown_Time.cpp">
+    </ClCompile>
+    <ClCompile Include="Date_Time.cpp">
+    </ClCompile>
+    <ClCompile Include="DEV.cpp">
+    </ClCompile>
+    <ClCompile Include="DEV_Addr.cpp">
+    </ClCompile>
+    <ClCompile Include="DEV_Connector.cpp">
+    </ClCompile>
+    <ClCompile Include="DEV_IO.cpp">
+    </ClCompile>
+    <ClCompile Include="Dev_Poll_Reactor.cpp">
+    </ClCompile>
+    <ClCompile Include="Dirent.cpp">
+    </ClCompile>
+    <ClCompile Include="Dirent_Selector.cpp">
+    </ClCompile>
+    <ClCompile Include="DLL.cpp">
+    </ClCompile>
+    <ClCompile Include="DLL_Manager.cpp">
+    </ClCompile>
+    <ClCompile Include="Dump.cpp">
+    </ClCompile>
+    <ClCompile Include="Dynamic.cpp">
+    </ClCompile>
+    <ClCompile Include="Dynamic_Message_Strategy.cpp">
+    </ClCompile>
+    <ClCompile Include="Dynamic_Service_Base.cpp">
+    </ClCompile>
+    <ClCompile Include="Dynamic_Service_Dependency.cpp">
+    </ClCompile>
+    <ClCompile Include="Encoding_Converter.cpp">
+    </ClCompile>
+    <ClCompile Include="Encoding_Converter_Factory.cpp">
+    </ClCompile>
+    <ClCompile Include="Event.cpp">
+    </ClCompile>
+    <ClCompile Include="Event_Handler.cpp">
+    </ClCompile>
+    <ClCompile Include="FIFO.cpp">
+    </ClCompile>
+    <ClCompile Include="FIFO_Recv.cpp">
+    </ClCompile>
+    <ClCompile Include="FIFO_Recv_Msg.cpp">
+    </ClCompile>
+    <ClCompile Include="FIFO_Send.cpp">
+    </ClCompile>
+    <ClCompile Include="FIFO_Send_Msg.cpp">
+    </ClCompile>
+    <ClCompile Include="FILE.cpp">
+    </ClCompile>
+    <ClCompile Include="FILE_Addr.cpp">
+    </ClCompile>
+    <ClCompile Include="FILE_Connector.cpp">
+    </ClCompile>
+    <ClCompile Include="FILE_IO.cpp">
+    </ClCompile>
+    <ClCompile Include="File_Lock.cpp">
+    </ClCompile>
+    <ClCompile Include="Filecache.cpp">
+    </ClCompile>
+    <ClCompile Include="Flag_Manip.cpp">
+    </ClCompile>
+    <ClCompile Include="Framework_Component.cpp">
+    </ClCompile>
+    <ClCompile Include="Functor.cpp">
+    </ClCompile>
+    <ClCompile Include="Functor_String.cpp">
+    </ClCompile>
+    <ClCompile Include="Get_Opt.cpp">
+    </ClCompile>
+    <ClCompile Include="gethrtime.cpp">
+    </ClCompile>
+    <ClCompile Include="Handle_Ops.cpp">
+    </ClCompile>
+    <ClCompile Include="Handle_Set.cpp">
+    </ClCompile>
+    <ClCompile Include="Hashable.cpp">
+    </ClCompile>
+    <ClCompile Include="High_Res_Timer.cpp">
+    </ClCompile>
+    <ClCompile Include="ICMP_Socket.cpp">
+    </ClCompile>
+    <ClCompile Include="INET_Addr.cpp">
+    </ClCompile>
+    <ClCompile Include="Init_ACE.cpp">
+    </ClCompile>
+    <ClCompile Include="IO_Cntl_Msg.cpp">
+    </ClCompile>
+    <ClCompile Include="IO_SAP.cpp">
+    </ClCompile>
+    <ClCompile Include="IOStream.cpp">
+    </ClCompile>
+    <ClCompile Include="IPC_SAP.cpp">
+    </ClCompile>
+    <ClCompile Include="Lib_Find.cpp">
+    </ClCompile>
+    <ClCompile Include="Local_Memory_Pool.cpp">
+    </ClCompile>
+    <ClCompile Include="Local_Name_Space.cpp">
+    </ClCompile>
+    <ClCompile Include="Local_Tokens.cpp">
+    </ClCompile>
+    <ClCompile Include="Lock.cpp">
+    </ClCompile>
+    <ClCompile Include="Log_Msg.cpp">
+    </ClCompile>
+    <ClCompile Include="Log_Msg_Backend.cpp">
+    </ClCompile>
+    <ClCompile Include="Log_Msg_Callback.cpp">
+    </ClCompile>
+    <ClCompile Include="Log_Msg_IPC.cpp">
+    </ClCompile>
+    <ClCompile Include="Log_Msg_NT_Event_Log.cpp">
+    </ClCompile>
+    <ClCompile Include="Log_Msg_UNIX_Syslog.cpp">
+    </ClCompile>
+    <ClCompile Include="Log_Record.cpp">
+    </ClCompile>
+    <ClCompile Include="Logging_Strategy.cpp">
+    </ClCompile>
+    <ClCompile Include="LSOCK.cpp">
+    </ClCompile>
+    <ClCompile Include="LSOCK_Acceptor.cpp">
+    </ClCompile>
+    <ClCompile Include="LSOCK_CODgram.cpp">
+    </ClCompile>
+    <ClCompile Include="LSOCK_Connector.cpp">
+    </ClCompile>
+    <ClCompile Include="LSOCK_Dgram.cpp">
+    </ClCompile>
+    <ClCompile Include="LSOCK_Stream.cpp">
+    </ClCompile>
+    <ClCompile Include="Malloc.cpp">
+    </ClCompile>
+    <ClCompile Include="Malloc_Allocator.cpp">
+    </ClCompile>
+    <ClCompile Include="Manual_Event.cpp">
+    </ClCompile>
+    <ClCompile Include="MEM_Acceptor.cpp">
+    </ClCompile>
+    <ClCompile Include="MEM_Addr.cpp">
+    </ClCompile>
+    <ClCompile Include="MEM_Connector.cpp">
+    </ClCompile>
+    <ClCompile Include="MEM_IO.cpp">
+    </ClCompile>
+    <ClCompile Include="Mem_Map.cpp">
+    </ClCompile>
+    <ClCompile Include="MEM_SAP.cpp">
+    </ClCompile>
+    <ClCompile Include="MEM_Stream.cpp">
+    </ClCompile>
+    <ClCompile Include="Message_Block.cpp">
+    </ClCompile>
+    <ClCompile Include="Message_Queue.cpp">
+    </ClCompile>
+    <ClCompile Include="Message_Queue_NT.cpp">
+    </ClCompile>
+    <ClCompile Include="Message_Queue_Vx.cpp">
+    </ClCompile>
+    <ClCompile Include="Method_Request.cpp">
+    </ClCompile>
+    <ClCompile Include="MMAP_Memory_Pool.cpp">
+    </ClCompile>
+    <ClCompile Include="Monitor_Admin.cpp">
+    </ClCompile>
+    <ClCompile Include="Monitor_Admin_Manager.cpp">
+    </ClCompile>
+    <ClCompile Include="Monitor_Base.cpp">
+    </ClCompile>
+    <ClCompile Include="Monitor_Control_Action.cpp">
+    </ClCompile>
+    <ClCompile Include="Monitor_Control_Types.cpp">
+    </ClCompile>
+    <ClCompile Include="Monitor_Point_Registry.cpp">
+    </ClCompile>
+    <ClCompile Include="Monitor_Size.cpp">
+    </ClCompile>
+    <ClCompile Include="Msg_WFMO_Reactor.cpp">
+    </ClCompile>
+    <ClCompile Include="Multihomed_INET_Addr.cpp">
+    </ClCompile>
+    <ClCompile Include="Mutex.cpp">
+    </ClCompile>
+    <ClCompile Include="Name_Proxy.cpp">
+    </ClCompile>
+    <ClCompile Include="Name_Request_Reply.cpp">
+    </ClCompile>
+    <ClCompile Include="Name_Space.cpp">
+    </ClCompile>
+    <ClCompile Include="Naming_Context.cpp">
+    </ClCompile>
+    <ClCompile Include="Netlink_Addr.cpp">
+    </ClCompile>
+    <ClCompile Include="Notification_Queue.cpp">
+    </ClCompile>
+    <ClCompile Include="Notification_Strategy.cpp">
+    </ClCompile>
+    <ClCompile Include="NT_Service.cpp">
+    </ClCompile>
+    <ClCompile Include="Obchunk.cpp">
+    </ClCompile>
+    <ClCompile Include="Object_Manager.cpp">
+    </ClCompile>
+    <ClCompile Include="Object_Manager_Base.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_Errno.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_Log_Msg_Attributes.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_main.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_arpa_inet.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_ctype.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_dirent.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_dlfcn.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_errno.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_fcntl.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_math.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_netdb.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_poll.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_pwd.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_regex.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_signal.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_stdio.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_stdlib.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_string.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_strings.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_stropts.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_mman.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_msg.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_resource.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_select.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_sendfile.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_shm.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_socket.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_stat.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_time.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_uio.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_utsname.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_wait.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_Thread.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_time.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_unistd.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_wchar.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_NS_wctype.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_QoS.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_Thread_Adapter.cpp">
+    </ClCompile>
+    <ClCompile Include="OS_TLI.cpp">
+    </ClCompile>
+    <ClCompile Include="Pagefile_Memory_Pool.cpp">
+    </ClCompile>
+    <ClCompile Include="Parse_Node.cpp">
+    </ClCompile>
+    <ClCompile Include="PI_Malloc.cpp">
+    </ClCompile>
+    <ClCompile Include="Ping_Socket.cpp">
+    </ClCompile>
+    <ClCompile Include="Pipe.cpp">
+    </ClCompile>
+    <ClCompile Include="POSIX_Asynch_IO.cpp">
+    </ClCompile>
+    <ClCompile Include="POSIX_CB_Proactor.cpp">
+    </ClCompile>
+    <ClCompile Include="POSIX_Proactor.cpp">
+    </ClCompile>
+    <ClCompile Include="Priority_Reactor.cpp">
+    </ClCompile>
+    <ClCompile Include="Proactor.cpp">
+    </ClCompile>
+    <ClCompile Include="Proactor_Impl.cpp">
+    </ClCompile>
+    <ClCompile Include="Process.cpp">
+    </ClCompile>
+    <ClCompile Include="Process_Manager.cpp">
+    </ClCompile>
+    <ClCompile Include="Process_Mutex.cpp">
+    </ClCompile>
+    <ClCompile Include="Process_Semaphore.cpp">
+    </ClCompile>
+    <ClCompile Include="Profile_Timer.cpp">
+    </ClCompile>
+    <ClCompile Include="Reactor.cpp">
+    </ClCompile>
+    <ClCompile Include="Reactor_Impl.cpp">
+    </ClCompile>
+    <ClCompile Include="Reactor_Notification_Strategy.cpp">
+    </ClCompile>
+    <ClCompile Include="Reactor_Timer_Interface.cpp">
+    </ClCompile>
+    <ClCompile Include="Read_Buffer.cpp">
+    </ClCompile>
+    <ClCompile Include="Recursive_Thread_Mutex.cpp">
+    </ClCompile>
+    <ClCompile Include="Recyclable.cpp">
+    </ClCompile>
+    <ClCompile Include="Registry.cpp">
+    </ClCompile>
+    <ClCompile Include="Registry_Name_Space.cpp">
+    </ClCompile>
+    <ClCompile Include="Remote_Name_Space.cpp">
+    </ClCompile>
+    <ClCompile Include="Remote_Tokens.cpp">
+    </ClCompile>
+    <ClCompile Include="Rtems_init.c">
+    </ClCompile>
+    <ClCompile Include="RW_Mutex.cpp">
+    </ClCompile>
+    <ClCompile Include="RW_Process_Mutex.cpp">
+    </ClCompile>
+    <ClCompile Include="RW_Thread_Mutex.cpp">
+    </ClCompile>
+    <ClCompile Include="Sample_History.cpp">
+    </ClCompile>
+    <ClCompile Include="Sbrk_Memory_Pool.cpp">
+    </ClCompile>
+    <ClCompile Include="Sched_Params.cpp">
+    </ClCompile>
+    <ClCompile Include="Select_Reactor_Base.cpp">
+    </ClCompile>
+    <ClCompile Include="Semaphore.cpp">
+    </ClCompile>
+    <ClCompile Include="Service_Config.cpp">
+    </ClCompile>
+    <ClCompile Include="Service_Gestalt.cpp">
+    </ClCompile>
+    <ClCompile Include="Service_Manager.cpp">
+    </ClCompile>
+    <ClCompile Include="Service_Object.cpp">
+    </ClCompile>
+    <ClCompile Include="Service_Repository.cpp">
+    </ClCompile>
+    <ClCompile Include="Service_Types.cpp">
+    </ClCompile>
+    <ClCompile Include="Shared_Memory.cpp">
+    </ClCompile>
+    <ClCompile Include="Shared_Memory_MM.cpp">
+    </ClCompile>
+    <ClCompile Include="Shared_Memory_Pool.cpp">
+    </ClCompile>
+    <ClCompile Include="Shared_Memory_SV.cpp">
+    </ClCompile>
+    <ClCompile Include="Shared_Object.cpp">
+    </ClCompile>
+    <ClCompile Include="Sig_Adapter.cpp">
+    </ClCompile>
+    <ClCompile Include="Sig_Handler.cpp">
+    </ClCompile>
+    <ClCompile Include="Signal.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_Acceptor.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_CODgram.cpp">
+    </ClCompile>
+    <ClCompile Include="Sock_Connect.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_Connector.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_Dgram.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_Dgram_Bcast.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_Dgram_Mcast.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_IO.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_Netlink.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_SEQPACK_Acceptor.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_SEQPACK_Association.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_SEQPACK_Connector.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_Stream.cpp">
+    </ClCompile>
+    <ClCompile Include="SPIPE.cpp">
+    </ClCompile>
+    <ClCompile Include="SPIPE_Acceptor.cpp">
+    </ClCompile>
+    <ClCompile Include="SPIPE_Addr.cpp">
+    </ClCompile>
+    <ClCompile Include="SPIPE_Connector.cpp">
+    </ClCompile>
+    <ClCompile Include="SPIPE_Stream.cpp">
+    </ClCompile>
+    <ClCompile Include="SString.cpp">
+    </ClCompile>
+    <ClCompile Include="Stack_Trace.cpp">
+    </ClCompile>
+    <ClCompile Include="Stats.cpp">
+    </ClCompile>
+    <ClCompile Include="String_Base_Const.cpp">
+    </ClCompile>
+    <ClCompile Include="SUN_Proactor.cpp">
+    </ClCompile>
+    <ClCompile Include="SV_Message.cpp">
+    </ClCompile>
+    <ClCompile Include="SV_Message_Queue.cpp">
+    </ClCompile>
+    <ClCompile Include="SV_Semaphore_Complex.cpp">
+    </ClCompile>
+    <ClCompile Include="SV_Semaphore_Simple.cpp">
+    </ClCompile>
+    <ClCompile Include="SV_Shared_Memory.cpp">
+    </ClCompile>
+    <ClCompile Include="Svc_Conf_Lexer.cpp">
+    </ClCompile>
+    <ClCompile Include="Svc_Conf_y.cpp">
+    </ClCompile>
+    <ClCompile Include="Synch_Options.cpp">
+    </ClCompile>
+    <ClCompile Include="System_Time.cpp">
+    </ClCompile>
+    <ClCompile Include="Task.cpp">
+    </ClCompile>
+    <ClCompile Include="Thread.cpp">
+    </ClCompile>
+    <ClCompile Include="Thread_Adapter.cpp">
+    </ClCompile>
+    <ClCompile Include="Thread_Control.cpp">
+    </ClCompile>
+    <ClCompile Include="Thread_Exit.cpp">
+    </ClCompile>
+    <ClCompile Include="Thread_Hook.cpp">
+    </ClCompile>
+    <ClCompile Include="Thread_Manager.cpp">
+    </ClCompile>
+    <ClCompile Include="Thread_Mutex.cpp">
+    </ClCompile>
+    <ClCompile Include="Thread_Semaphore.cpp">
+    </ClCompile>
+    <ClCompile Include="Throughput_Stats.cpp">
+    </ClCompile>
+    <ClCompile Include="Time_Value.cpp">
+    </ClCompile>
+    <ClCompile Include="Timeprobe.cpp">
+    </ClCompile>
+    <ClCompile Include="TLI.cpp">
+    </ClCompile>
+    <ClCompile Include="TLI_Acceptor.cpp">
+    </ClCompile>
+    <ClCompile Include="TLI_Connector.cpp">
+    </ClCompile>
+    <ClCompile Include="TLI_Stream.cpp">
+    </ClCompile>
+    <ClCompile Include="Token.cpp">
+    </ClCompile>
+    <ClCompile Include="Token_Collection.cpp">
+    </ClCompile>
+    <ClCompile Include="Token_Invariants.cpp">
+    </ClCompile>
+    <ClCompile Include="Token_Manager.cpp">
+    </ClCompile>
+    <ClCompile Include="Token_Request_Reply.cpp">
+    </ClCompile>
+    <ClCompile Include="TP_Reactor.cpp">
+    </ClCompile>
+    <ClCompile Include="Trace.cpp">
+    </ClCompile>
+    <ClCompile Include="TSS_Adapter.cpp">
+    </ClCompile>
+    <ClCompile Include="TTY_IO.cpp">
+    </ClCompile>
+    <ClCompile Include="UNIX_Addr.cpp">
+    </ClCompile>
+    <ClCompile Include="UPIPE_Acceptor.cpp">
+    </ClCompile>
+    <ClCompile Include="UPIPE_Connector.cpp">
+    </ClCompile>
+    <ClCompile Include="UPIPE_Stream.cpp">
+    </ClCompile>
+    <ClCompile Include="UTF16_Encoding_Converter.cpp">
+    </ClCompile>
+    <ClCompile Include="UTF32_Encoding_Converter.cpp">
+    </ClCompile>
+    <ClCompile Include="UTF8_Encoding_Converter.cpp">
+    </ClCompile>
+    <ClCompile Include="UUID.cpp">
+    </ClCompile>
+    <ClCompile Include="WFMO_Reactor.cpp">
+    </ClCompile>
+    <ClCompile Include="WIN32_Asynch_IO.cpp">
+    </ClCompile>
+    <ClCompile Include="WIN32_Proactor.cpp">
+    </ClCompile>
+    <ClCompile Include="XML_Svc_Conf.cpp">
+    </ClCompile>
+    <ClCompile Include="XTI_ATM_Mcast.cpp">
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Acceptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Active_Map_Manager_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Arg_Shifter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARGV.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Array_Base.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Array_Map.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Asynch_Acceptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Asynch_Connector.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Atomic_Op_GCC_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Atomic_Op_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Auto_Functor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Auto_IncDec_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Auto_Ptr.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Based_Pointer_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Cache_Map_Manager_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Cached_Connect_Strategy_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Caching_Strategies_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Caching_Utility_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Cleanup_Strategies_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Condition_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Connector.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Containers_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Dump_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Dynamic_Service.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Env_Value_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Event_Handler_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Framework_Component_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Free_List.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Functor_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Future.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Future_Set.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Guard_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Hash_Cache_Map_Manager_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Hash_Map_Manager_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Hash_Map_With_Allocator_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Hash_Multi_Map_Manager_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Intrusive_Auto_Ptr.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Intrusive_List.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Intrusive_List_Node.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="IOStream_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Local_Name_Space_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Lock_Adapter_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="LOCK_SOCK_Acceptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Malloc_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Managed_Object.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Map_Manager.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Map_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Message_Block_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Message_Queue_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Metrics_Cache_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Module.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Node.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Obstack_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Pair_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="RB_Tree.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Reactor_Token_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Refcountable_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Refcounted_Auto_Ptr.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Reverse_Lock_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Select_Reactor_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Singleton.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Strategies_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Stream.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Stream_Modules.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="String_Base.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Svc_Handler.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Task_Ex_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Task_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Test_and_Set.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Timeprobe_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Timer_Hash_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Timer_Heap_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Timer_List_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Timer_Queue_Adapters.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Timer_Queue_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Timer_Wheel_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Tokenizer_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="TSS_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Typed_SV_Message.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Typed_SV_Message_Queue.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Unbounded_Queue.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Unbounded_Set.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Unbounded_Set_Ex.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Vector_T.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Acceptor.h" />
+    <ClInclude Include="ACE.h" />
+    <ClInclude Include="ACE_export.h" />
+    <ClInclude Include="ace_wchar.h" />
+    <ClInclude Include="Activation_Queue.h" />
+    <ClInclude Include="Active_Map_Manager.h" />
+    <ClInclude Include="Active_Map_Manager_T.h" />
+    <ClInclude Include="Addr.h" />
+    <ClInclude Include="Arg_Shifter.h" />
+    <ClInclude Include="ARGV.h" />
+    <ClInclude Include="Argv_Type_Converter.h" />
+    <ClInclude Include="Array_Base.h" />
+    <ClInclude Include="Array_Map.h" />
+    <ClInclude Include="Assert.h" />
+    <ClInclude Include="Asynch_Acceptor.h" />
+    <ClInclude Include="Asynch_Connector.h" />
+    <ClInclude Include="Asynch_IO.h" />
+    <ClInclude Include="Asynch_IO_Impl.h" />
+    <ClInclude Include="Asynch_Pseudo_Task.h" />
+    <ClInclude Include="ATM_Acceptor.h" />
+    <ClInclude Include="ATM_Addr.h" />
+    <ClInclude Include="ATM_Connector.h" />
+    <ClInclude Include="ATM_Params.h" />
+    <ClInclude Include="ATM_QoS.h" />
+    <ClInclude Include="ATM_Stream.h" />
+    <ClInclude Include="Atomic_Op.h" />
+    <ClInclude Include="Atomic_Op_GCC_T.h" />
+    <ClInclude Include="Atomic_Op_Sparc.h" />
+    <ClInclude Include="Atomic_Op_T.h" />
+    <ClInclude Include="Auto_Event.h" />
+    <ClInclude Include="Auto_Functor.h" />
+    <ClInclude Include="Auto_IncDec_T.h" />
+    <ClInclude Include="Auto_Ptr.h" />
+    <ClInclude Include="Barrier.h" />
+    <ClInclude Include="Base_Thread_Adapter.h" />
+    <ClInclude Include="Based_Pointer_Repository.h" />
+    <ClInclude Include="Based_Pointer_T.h" />
+    <ClInclude Include="Basic_Stats.h" />
+    <ClInclude Include="Basic_Types.h" />
+    <ClInclude Include="Bound_Ptr.h" />
+    <ClInclude Include="Cache_Map_Manager_T.h" />
+    <ClInclude Include="Cached_Connect_Strategy_T.h" />
+    <ClInclude Include="Caching_Strategies_T.h" />
+    <ClInclude Include="Caching_Utility_T.h" />
+    <ClInclude Include="Capabilities.h" />
+    <ClInclude Include="CDR_Base.h" />
+    <ClInclude Include="CDR_Size.h" />
+    <ClInclude Include="CDR_Stream.h" />
+    <ClInclude Include="CE_Screen_Output.h" />
+    <ClInclude Include="checked_iterator.h" />
+    <ClInclude Include="Cleanup.h" />
+    <ClInclude Include="Cleanup_Strategies_T.h" />
+    <ClInclude Include="Codecs.h" />
+    <ClInclude Include="Codeset_IBM1047.h" />
+    <ClInclude Include="Codeset_Registry.h" />
+    <ClInclude Include="Codeset_Symbols.h" />
+    <ClInclude Include="Condition_Recursive_Thread_Mutex.h" />
+    <ClInclude Include="Condition_T.h" />
+    <ClInclude Include="Condition_Thread_Mutex.h" />
+    <ClInclude Include="config-aix-5.x.h" />
+    <ClInclude Include="config-all.h" />
+    <ClInclude Include="config-cygwin32.h" />
+    <ClInclude Include="config-doxygen.h" />
+    <ClInclude Include="config-freebsd.h" />
+    <ClInclude Include="config-g++-common.h" />
+    <ClInclude Include="config-ghs-common.h" />
+    <ClInclude Include="config-hpux-11.00.h" />
+    <ClInclude Include="config-icc-common.h" />
+    <ClInclude Include="config-integritySCA.h" />
+    <ClInclude Include="config-kfreebsd.h" />
+    <ClInclude Include="config-linux-common.h" />
+    <ClInclude Include="config-linux.h" />
+    <ClInclude Include="config-lite.h" />
+    <ClInclude Include="config-lynxos.h" />
+    <ClInclude Include="config-macosx-iphone-hardware.h" />
+    <ClInclude Include="config-macosx-iphone-simulator.h" />
+    <ClInclude Include="config-macosx-leopard.h" />
+    <ClInclude Include="config-macosx-panther.h" />
+    <ClInclude Include="config-macosx-snowleopard.h" />
+    <ClInclude Include="config-macosx-tiger.h" />
+    <ClInclude Include="config-macosx.h" />
+    <ClInclude Include="config-macros.h" />
+    <ClInclude Include="config-minimal.h" />
+    <ClInclude Include="config-mvs.h" />
+    <ClInclude Include="config-netbsd.h" />
+    <ClInclude Include="config-openbsd.h" />
+    <ClInclude Include="config-openvms.h" />
+    <ClInclude Include="config-pharlap.h" />
+    <ClInclude Include="config-posix-nonetworking.h" />
+    <ClInclude Include="config-posix.h" />
+    <ClInclude Include="config-qnx-neutrino.h" />
+    <ClInclude Include="config-qnx-rtp-62x.h" />
+    <ClInclude Include="config-qnx-rtp-common.h" />
+    <ClInclude Include="config-qnx-rtp-pre62x.h" />
+    <ClInclude Include="config-qnx-rtp.h" />
+    <ClInclude Include="config-rtems.h" />
+    <ClInclude Include="config-suncc-common.h" />
+    <ClInclude Include="config-sunos5.10.h" />
+    <ClInclude Include="config-sunos5.11.h" />
+    <ClInclude Include="config-sunos5.4-g++.h" />
+    <ClInclude Include="config-sunos5.4-sunc++-4.x.h" />
+    <ClInclude Include="config-sunos5.5.h" />
+    <ClInclude Include="config-sunos5.6.h" />
+    <ClInclude Include="config-sunos5.7.h" />
+    <ClInclude Include="config-sunos5.8.h" />
+    <ClInclude Include="config-sunos5.9.h" />
+    <ClInclude Include="config-tandem-nsk-mips-v2.h" />
+    <ClInclude Include="config-tandem-nsk-mips-v3.h" />
+    <ClInclude Include="config-tandem.h" />
+    <ClInclude Include="config-visualage.h" />
+    <ClInclude Include="config-vxworks.h" />
+    <ClInclude Include="config-vxworks6.4.h" />
+    <ClInclude Include="config-vxworks6.5.h" />
+    <ClInclude Include="config-vxworks6.6.h" />
+    <ClInclude Include="config-vxworks6.7.h" />
+    <ClInclude Include="config-vxworks6.8.h" />
+    <ClInclude Include="config-win32-borland.h" />
+    <ClInclude Include="config-win32-cegcc.h" />
+    <ClInclude Include="config-win32-common.h" />
+    <ClInclude Include="config-win32-dmc.h" />
+    <ClInclude Include="config-win32-interix.h" />
+    <ClInclude Include="config-win32-mingw.h" />
+    <ClInclude Include="config-win32-msvc-10.h" />
+    <ClInclude Include="config-win32-msvc-7.h" />
+    <ClInclude Include="config-win32-msvc-8.h" />
+    <ClInclude Include="config-win32-msvc-9.h" />
+    <ClInclude Include="config-win32-msvc.h" />
+    <ClInclude Include="config-win32.h" />
+    <ClInclude Include="config-WinCE.h" />
+    <ClInclude Include="config.h" />
+    <ClInclude Include="Configuration.h" />
+    <ClInclude Include="Configuration_Import_Export.h" />
+    <ClInclude Include="Connection_Recycling_Strategy.h" />
+    <ClInclude Include="Connector.h" />
+    <ClInclude Include="Containers.h" />
+    <ClInclude Include="Containers_T.h" />
+    <ClInclude Include="Copy_Disabled.h" />
+    <ClInclude Include="CORBA_macros.h" />
+    <ClInclude Include="Countdown_Time.h" />
+    <ClInclude Include="Date_Time.h" />
+    <ClInclude Include="Default_Constants.h" />
+    <ClInclude Include="DEV.h" />
+    <ClInclude Include="DEV_Addr.h" />
+    <ClInclude Include="DEV_Connector.h" />
+    <ClInclude Include="DEV_IO.h" />
+    <ClInclude Include="Dev_Poll_Reactor.h" />
+    <ClInclude Include="Dirent.h" />
+    <ClInclude Include="Dirent_Selector.h" />
+    <ClInclude Include="DLL.h" />
+    <ClInclude Include="DLL_Manager.h" />
+    <ClInclude Include="Dump.h" />
+    <ClInclude Include="Dump_T.h" />
+    <ClInclude Include="Dynamic.h" />
+    <ClInclude Include="Dynamic_Message_Strategy.h" />
+    <ClInclude Include="Dynamic_Service.h" />
+    <ClInclude Include="Dynamic_Service_Base.h" />
+    <ClInclude Include="Dynamic_Service_Dependency.h" />
+    <ClInclude Include="Encoding_Converter.h" />
+    <ClInclude Include="Encoding_Converter_Factory.h" />
+    <ClInclude Include="Env_Value_T.h" />
+    <ClInclude Include="Event.h" />
+    <ClInclude Include="Event_Handler.h" />
+    <ClInclude Include="Event_Handler_T.h" />
+    <ClInclude Include="FIFO.h" />
+    <ClInclude Include="FIFO_Recv.h" />
+    <ClInclude Include="FIFO_Recv_Msg.h" />
+    <ClInclude Include="FIFO_Send.h" />
+    <ClInclude Include="FIFO_Send_Msg.h" />
+    <ClInclude Include="FILE.h" />
+    <ClInclude Include="FILE_Addr.h" />
+    <ClInclude Include="FILE_Connector.h" />
+    <ClInclude Include="FILE_IO.h" />
+    <ClInclude Include="File_Lock.h" />
+    <ClInclude Include="Filecache.h" />
+    <ClInclude Include="Flag_Manip.h" />
+    <ClInclude Include="Framework_Component.h" />
+    <ClInclude Include="Framework_Component_T.h" />
+    <ClInclude Include="Free_List.h" />
+    <ClInclude Include="Functor.h" />
+    <ClInclude Include="Functor_String.h" />
+    <ClInclude Include="Functor_T.h" />
+    <ClInclude Include="Future.h" />
+    <ClInclude Include="Future_Set.h" />
+    <ClInclude Include="Get_Opt.h" />
+    <ClInclude Include="Global_Macros.h" />
+    <ClInclude Include="Guard_T.h" />
+    <ClInclude Include="Handle_Gobbler.h" />
+    <ClInclude Include="Handle_Ops.h" />
+    <ClInclude Include="Handle_Set.h" />
+    <ClInclude Include="Hash_Cache_Map_Manager_T.h" />
+    <ClInclude Include="Hash_Map_Manager.h" />
+    <ClInclude Include="Hash_Map_Manager_T.h" />
+    <ClInclude Include="Hash_Map_With_Allocator_T.h" />
+    <ClInclude Include="Hash_Multi_Map_Manager_T.h" />
+    <ClInclude Include="Hashable.h" />
+    <ClInclude Include="High_Res_Timer.h" />
+    <ClInclude Include="ICMP_Socket.h" />
+    <ClInclude Include="If_Then_Else.h" />
+    <ClInclude Include="INET_Addr.h" />
+    <ClInclude Include="Init_ACE.h" />
+    <ClInclude Include="Intrusive_Auto_Ptr.h" />
+    <ClInclude Include="Intrusive_List.h" />
+    <ClInclude Include="Intrusive_List_Node.h" />
+    <ClInclude Include="IO_Cntl_Msg.h" />
+    <ClInclude Include="IO_SAP.h" />
+    <ClInclude Include="iosfwd.h" />
+    <ClInclude Include="IOStream.h" />
+    <ClInclude Include="IOStream_T.h" />
+    <ClInclude Include="IPC_SAP.h" />
+    <ClInclude Include="Lib_Find.h" />
+    <ClInclude Include="Local_Memory_Pool.h" />
+    <ClInclude Include="Local_Name_Space.h" />
+    <ClInclude Include="Local_Name_Space_T.h" />
+    <ClInclude Include="Local_Tokens.h" />
+    <ClInclude Include="Lock.h" />
+    <ClInclude Include="Lock_Adapter_T.h" />
+    <ClInclude Include="LOCK_SOCK_Acceptor.h" />
+    <ClInclude Include="Log_Msg.h" />
+    <ClInclude Include="Log_Msg_Backend.h" />
+    <ClInclude Include="Log_Msg_Callback.h" />
+    <ClInclude Include="Log_Msg_IPC.h" />
+    <ClInclude Include="Log_Msg_NT_Event_Log.h" />
+    <ClInclude Include="Log_Msg_UNIX_Syslog.h" />
+    <ClInclude Include="Log_Priority.h" />
+    <ClInclude Include="Log_Record.h" />
+    <ClInclude Include="Logging_Strategy.h" />
+    <ClInclude Include="LSOCK.h" />
+    <ClInclude Include="LSOCK_Acceptor.h" />
+    <ClInclude Include="LSOCK_CODgram.h" />
+    <ClInclude Include="LSOCK_Connector.h" />
+    <ClInclude Include="LSOCK_Dgram.h" />
+    <ClInclude Include="LSOCK_Stream.h" />
+    <ClInclude Include="Malloc.h" />
+    <ClInclude Include="Malloc_Allocator.h" />
+    <ClInclude Include="Malloc_Base.h" />
+    <ClInclude Include="Malloc_T.h" />
+    <ClInclude Include="Managed_Object.h" />
+    <ClInclude Include="Manual_Event.h" />
+    <ClInclude Include="Map_Manager.h" />
+    <ClInclude Include="Map_T.h" />
+    <ClInclude Include="MEM_Acceptor.h" />
+    <ClInclude Include="MEM_Addr.h" />
+    <ClInclude Include="MEM_Connector.h" />
+    <ClInclude Include="MEM_IO.h" />
+    <ClInclude Include="Mem_Map.h" />
+    <ClInclude Include="MEM_SAP.h" />
+    <ClInclude Include="MEM_Stream.h" />
+    <ClInclude Include="Memory_Pool.h" />
+    <ClInclude Include="Message_Block.h" />
+    <ClInclude Include="Message_Block_T.h" />
+    <ClInclude Include="Message_Queue.h" />
+    <ClInclude Include="Message_Queue_NT.h" />
+    <ClInclude Include="Message_Queue_T.h" />
+    <ClInclude Include="Message_Queue_Vx.h" />
+    <ClInclude Include="Method_Request.h" />
+    <ClInclude Include="Metrics_Cache.h" />
+    <ClInclude Include="Metrics_Cache_T.h" />
+    <ClInclude Include="Min_Max.h" />
+    <ClInclude Include="MMAP_Memory_Pool.h" />
+    <ClInclude Include="Module.h" />
+    <ClInclude Include="Monitor_Admin.h" />
+    <ClInclude Include="Monitor_Admin_Manager.h" />
+    <ClInclude Include="Monitor_Base.h" />
+    <ClInclude Include="Monitor_Control_Action.h" />
+    <ClInclude Include="Monitor_Control_Types.h" />
+    <ClInclude Include="Monitor_Point_Registry.h" />
+    <ClInclude Include="Monitor_Size.h" />
+    <ClInclude Include="Msg_WFMO_Reactor.h" />
+    <ClInclude Include="Multihomed_INET_Addr.h" />
+    <ClInclude Include="Mutex.h" />
+    <ClInclude Include="Name_Proxy.h" />
+    <ClInclude Include="Name_Request_Reply.h" />
+    <ClInclude Include="Name_Space.h" />
+    <ClInclude Include="Naming_Context.h" />
+    <ClInclude Include="Netlink_Addr.h" />
+    <ClInclude Include="Node.h" />
+    <ClInclude Include="Notification_Queue.h" />
+    <ClInclude Include="Notification_Strategy.h" />
+    <ClInclude Include="NT_Service.h" />
+    <ClInclude Include="Null_Barrier.h" />
+    <ClInclude Include="Null_Condition.h" />
+    <ClInclude Include="Null_Mutex.h" />
+    <ClInclude Include="Null_Semaphore.h" />
+    <ClInclude Include="Numeric_Limits.h" />
+    <ClInclude Include="Obchunk.h" />
+    <ClInclude Include="Object_Manager.h" />
+    <ClInclude Include="Object_Manager_Base.h" />
+    <ClInclude Include="Obstack.h" />
+    <ClInclude Include="Obstack_T.h" />
+    <ClInclude Include="OS_Errno.h" />
+    <ClInclude Include="os_include\arpa\os_inet.h" />
+    <ClInclude Include="os_include\net\os_if.h" />
+    <ClInclude Include="os_include\netinet\os_in.h" />
+    <ClInclude Include="os_include\netinet\os_tcp.h" />
+    <ClInclude Include="os_include\os_aio.h" />
+    <ClInclude Include="os_include\os_assert.h" />
+    <ClInclude Include="os_include\os_byteswap.h" />
+    <ClInclude Include="os_include\os_complex.h" />
+    <ClInclude Include="os_include\os_cpio.h" />
+    <ClInclude Include="os_include\os_ctype.h" />
+    <ClInclude Include="os_include\os_dirent.h" />
+    <ClInclude Include="os_include\os_dlfcn.h" />
+    <ClInclude Include="os_include\os_errno.h" />
+    <ClInclude Include="os_include\os_fcntl.h" />
+    <ClInclude Include="os_include\os_fenv.h" />
+    <ClInclude Include="os_include\os_float.h" />
+    <ClInclude Include="os_include\os_fmtmsg.h" />
+    <ClInclude Include="os_include\os_fnmatch.h" />
+    <ClInclude Include="os_include\os_ftw.h" />
+    <ClInclude Include="os_include\os_glob.h" />
+    <ClInclude Include="os_include\os_grp.h" />
+    <ClInclude Include="os_include\os_iconv.h" />
+    <ClInclude Include="os_include\os_intrin.h" />
+    <ClInclude Include="os_include\os_inttypes.h" />
+    <ClInclude Include="os_include\os_iso646.h" />
+    <ClInclude Include="os_include\os_kstat.h" />
+    <ClInclude Include="os_include\os_langinfo.h" />
+    <ClInclude Include="os_include\os_libgen.h" />
+    <ClInclude Include="os_include\os_limits.h" />
+    <ClInclude Include="os_include\os_local.h" />
+    <ClInclude Include="os_include\os_math.h" />
+    <ClInclude Include="os_include\os_monetary.h" />
+    <ClInclude Include="os_include\os_mqueue.h" />
+    <ClInclude Include="os_include\os_ndbm.h" />
+    <ClInclude Include="os_include\os_netdb.h" />
+    <ClInclude Include="os_include\os_nl_types.h" />
+    <ClInclude Include="os_include\os_pdh.h" />
+    <ClInclude Include="os_include\os_pdhmsg.h" />
+    <ClInclude Include="os_include\os_poll.h" />
+    <ClInclude Include="os_include\os_pthread.h" />
+    <ClInclude Include="os_include\os_pwd.h" />
+    <ClInclude Include="os_include\os_regex.h" />
+    <ClInclude Include="os_include\os_sched.h" />
+    <ClInclude Include="os_include\os_search.h" />
+    <ClInclude Include="os_include\os_semaphore.h" />
+    <ClInclude Include="os_include\os_setjmp.h" />
+    <ClInclude Include="os_include\os_signal.h" />
+    <ClInclude Include="os_include\os_spawn.h" />
+    <ClInclude Include="os_include\os_stdarg.h" />
+    <ClInclude Include="os_include\os_stdbool.h" />
+    <ClInclude Include="os_include\os_stddef.h" />
+    <ClInclude Include="os_include\os_stdint.h" />
+    <ClInclude Include="os_include\os_stdio.h" />
+    <ClInclude Include="os_include\os_stdlib.h" />
+    <ClInclude Include="os_include\os_string.h" />
+    <ClInclude Include="os_include\os_strings.h" />
+    <ClInclude Include="os_include\os_stropts.h" />
+    <ClInclude Include="os_include\os_syslog.h" />
+    <ClInclude Include="os_include\os_tar.h" />
+    <ClInclude Include="os_include\os_termios.h" />
+    <ClInclude Include="os_include\os_tgmath.h" />
+    <ClInclude Include="os_include\os_time.h" />
+    <ClInclude Include="os_include\os_trace.h" />
+    <ClInclude Include="os_include\os_typeinfo.h" />
+    <ClInclude Include="os_include\os_ucontext.h" />
+    <ClInclude Include="os_include\os_ulimit.h" />
+    <ClInclude Include="os_include\os_unistd.h" />
+    <ClInclude Include="os_include\os_utime.h" />
+    <ClInclude Include="os_include\os_utmpx.h" />
+    <ClInclude Include="os_include\os_wchar.h" />
+    <ClInclude Include="os_include\os_wctype.h" />
+    <ClInclude Include="os_include\os_wordexp.h" />
+    <ClInclude Include="os_include\sys\os_ipc.h" />
+    <ClInclude Include="os_include\sys\os_loadavg.h" />
+    <ClInclude Include="os_include\sys\os_mman.h" />
+    <ClInclude Include="os_include\sys\os_msg.h" />
+    <ClInclude Include="os_include\sys\os_pstat.h" />
+    <ClInclude Include="os_include\sys\os_resource.h" />
+    <ClInclude Include="os_include\sys\os_select.h" />
+    <ClInclude Include="os_include\sys\os_sem.h" />
+    <ClInclude Include="os_include\sys\os_shm.h" />
+    <ClInclude Include="os_include\sys\os_socket.h" />
+    <ClInclude Include="os_include\sys\os_stat.h" />
+    <ClInclude Include="os_include\sys\os_statvfs.h" />
+    <ClInclude Include="os_include\sys\os_sysctl.h" />
+    <ClInclude Include="os_include\sys\os_sysinfo.h" />
+    <ClInclude Include="os_include\sys\os_time.h" />
+    <ClInclude Include="os_include\sys\os_timeb.h" />
+    <ClInclude Include="os_include\sys\os_times.h" />
+    <ClInclude Include="os_include\sys\os_types.h" />
+    <ClInclude Include="os_include\sys\os_uio.h" />
+    <ClInclude Include="os_include\sys\os_un.h" />
+    <ClInclude Include="os_include\sys\os_utsname.h" />
+    <ClInclude Include="os_include\sys\os_wait.h" />
+    <ClInclude Include="OS_Log_Msg_Attributes.h" />
+    <ClInclude Include="OS_main.h" />
+    <ClInclude Include="OS_Memory.h" />
+    <ClInclude Include="OS_NS_arpa_inet.h" />
+    <ClInclude Include="OS_NS_ctype.h" />
+    <ClInclude Include="OS_NS_dirent.h" />
+    <ClInclude Include="OS_NS_dlfcn.h" />
+    <ClInclude Include="OS_NS_errno.h" />
+    <ClInclude Include="OS_NS_fcntl.h" />
+    <ClInclude Include="OS_NS_macros.h" />
+    <ClInclude Include="OS_NS_math.h" />
+    <ClInclude Include="OS_NS_netdb.h" />
+    <ClInclude Include="OS_NS_poll.h" />
+    <ClInclude Include="OS_NS_pwd.h" />
+    <ClInclude Include="OS_NS_regex.h" />
+    <ClInclude Include="OS_NS_signal.h" />
+    <ClInclude Include="OS_NS_stdio.h" />
+    <ClInclude Include="OS_NS_stdlib.h" />
+    <ClInclude Include="OS_NS_string.h" />
+    <ClInclude Include="OS_NS_strings.h" />
+    <ClInclude Include="OS_NS_stropts.h" />
+    <ClInclude Include="OS_NS_sys_mman.h" />
+    <ClInclude Include="OS_NS_sys_msg.h" />
+    <ClInclude Include="OS_NS_sys_resource.h" />
+    <ClInclude Include="OS_NS_sys_select.h" />
+    <ClInclude Include="OS_NS_sys_sendfile.h" />
+    <ClInclude Include="OS_NS_sys_shm.h" />
+    <ClInclude Include="OS_NS_sys_socket.h" />
+    <ClInclude Include="OS_NS_sys_stat.h" />
+    <ClInclude Include="OS_NS_sys_time.h" />
+    <ClInclude Include="OS_NS_sys_uio.h" />
+    <ClInclude Include="OS_NS_sys_utsname.h" />
+    <ClInclude Include="OS_NS_sys_wait.h" />
+    <ClInclude Include="OS_NS_Thread.h" />
+    <ClInclude Include="OS_NS_time.h" />
+    <ClInclude Include="OS_NS_unistd.h" />
+    <ClInclude Include="OS_NS_wchar.h" />
+    <ClInclude Include="OS_NS_wctype.h" />
+    <ClInclude Include="OS_QoS.h" />
+    <ClInclude Include="OS_Thread_Adapter.h" />
+    <ClInclude Include="OS_TLI.h" />
+    <ClInclude Include="Pagefile_Memory_Pool.h" />
+    <ClInclude Include="Pair_T.h" />
+    <ClInclude Include="Parse_Node.h" />
+    <ClInclude Include="PI_Malloc.h" />
+    <ClInclude Include="Ping_Socket.h" />
+    <ClInclude Include="Pipe.h" />
+    <ClInclude Include="POSIX_Asynch_IO.h" />
+    <ClInclude Include="POSIX_CB_Proactor.h" />
+    <ClInclude Include="POSIX_Proactor.h" />
+    <ClInclude Include="post.h" />
+    <ClInclude Include="pre.h" />
+    <ClInclude Include="Priority_Reactor.h" />
+    <ClInclude Include="Proactor.h" />
+    <ClInclude Include="Proactor_Impl.h" />
+    <ClInclude Include="Process.h" />
+    <ClInclude Include="Process_Manager.h" />
+    <ClInclude Include="Process_Mutex.h" />
+    <ClInclude Include="Process_Semaphore.h" />
+    <ClInclude Include="Profile_Timer.h" />
+    <ClInclude Include="RB_Tree.h" />
+    <ClInclude Include="Reactor.h" />
+    <ClInclude Include="Reactor_Impl.h" />
+    <ClInclude Include="Reactor_Notification_Strategy.h" />
+    <ClInclude Include="Reactor_Timer_Interface.h" />
+    <ClInclude Include="Reactor_Token_T.h" />
+    <ClInclude Include="Read_Buffer.h" />
+    <ClInclude Include="Recursive_Thread_Mutex.h" />
+    <ClInclude Include="Recyclable.h" />
+    <ClInclude Include="Refcountable_T.h" />
+    <ClInclude Include="Refcounted_Auto_Ptr.h" />
+    <ClInclude Include="Registry.h" />
+    <ClInclude Include="Registry_Name_Space.h" />
+    <ClInclude Include="Remote_Name_Space.h" />
+    <ClInclude Include="Remote_Tokens.h" />
+    <ClInclude Include="Reverse_Lock_T.h" />
+    <ClInclude Include="RW_Mutex.h" />
+    <ClInclude Include="RW_Process_Mutex.h" />
+    <ClInclude Include="RW_Thread_Mutex.h" />
+    <ClInclude Include="Sample_History.h" />
+    <ClInclude Include="Sbrk_Memory_Pool.h" />
+    <ClInclude Include="Sched_Params.h" />
+    <ClInclude Include="Select_Reactor.h" />
+    <ClInclude Include="Select_Reactor_Base.h" />
+    <ClInclude Include="Select_Reactor_T.h" />
+    <ClInclude Include="Semaphore.h" />
+    <ClInclude Include="Service_Config.h" />
+    <ClInclude Include="Service_Gestalt.h" />
+    <ClInclude Include="Service_Manager.h" />
+    <ClInclude Include="Service_Object.h" />
+    <ClInclude Include="Service_Repository.h" />
+    <ClInclude Include="Service_Types.h" />
+    <ClInclude Include="Shared_Memory.h" />
+    <ClInclude Include="Shared_Memory_MM.h" />
+    <ClInclude Include="Shared_Memory_Pool.h" />
+    <ClInclude Include="Shared_Memory_SV.h" />
+    <ClInclude Include="Shared_Object.h" />
+    <ClInclude Include="Sig_Adapter.h" />
+    <ClInclude Include="Sig_Handler.h" />
+    <ClInclude Include="Signal.h" />
+    <ClInclude Include="Singleton.h" />
+    <ClInclude Include="SOCK.h" />
+    <ClInclude Include="SOCK_Acceptor.h" />
+    <ClInclude Include="SOCK_CODgram.h" />
+    <ClInclude Include="Sock_Connect.h" />
+    <ClInclude Include="SOCK_Connector.h" />
+    <ClInclude Include="SOCK_Dgram.h" />
+    <ClInclude Include="SOCK_Dgram_Bcast.h" />
+    <ClInclude Include="SOCK_Dgram_Mcast.h" />
+    <ClInclude Include="SOCK_IO.h" />
+    <ClInclude Include="SOCK_Netlink.h" />
+    <ClInclude Include="SOCK_SEQPACK_Acceptor.h" />
+    <ClInclude Include="SOCK_SEQPACK_Association.h" />
+    <ClInclude Include="SOCK_SEQPACK_Connector.h" />
+    <ClInclude Include="SOCK_Stream.h" />
+    <ClInclude Include="SPIPE.h" />
+    <ClInclude Include="SPIPE_Acceptor.h" />
+    <ClInclude Include="SPIPE_Addr.h" />
+    <ClInclude Include="SPIPE_Connector.h" />
+    <ClInclude Include="SPIPE_Stream.h" />
+    <ClInclude Include="SString.h" />
+    <ClInclude Include="SStringfwd.h" />
+    <ClInclude Include="Stack_Trace.h" />
+    <ClInclude Include="Static_Object_Lock.h" />
+    <ClInclude Include="Stats.h" />
+    <ClInclude Include="Strategies.h" />
+    <ClInclude Include="Strategies_T.h" />
+    <ClInclude Include="Stream.h" />
+    <ClInclude Include="Stream_Modules.h" />
+    <ClInclude Include="streams.h" />
+    <ClInclude Include="String_Base.h" />
+    <ClInclude Include="String_Base_Const.h" />
+    <ClInclude Include="SUN_Proactor.h" />
+    <ClInclude Include="SV_Message.h" />
+    <ClInclude Include="SV_Message_Queue.h" />
+    <ClInclude Include="SV_Semaphore_Complex.h" />
+    <ClInclude Include="SV_Semaphore_Simple.h" />
+    <ClInclude Include="SV_Shared_Memory.h" />
+    <ClInclude Include="Svc_Conf.h" />
+    <ClInclude Include="Svc_Conf_Lexer.h" />
+    <ClInclude Include="Svc_Conf_Param.h" />
+    <ClInclude Include="Svc_Conf_Token_Table.h" />
+    <ClInclude Include="Svc_Conf_Tokens.h" />
+    <ClInclude Include="svc_export.h" />
+    <ClInclude Include="Svc_Handler.h" />
+    <ClInclude Include="Synch.h" />
+    <ClInclude Include="Synch_Options.h" />
+    <ClInclude Include="Synch_Traits.h" />
+    <ClInclude Include="System_Time.h" />
+    <ClInclude Include="Task.h" />
+    <ClInclude Include="Task_Ex_T.h" />
+    <ClInclude Include="Task_T.h" />
+    <ClInclude Include="Test_and_Set.h" />
+    <ClInclude Include="Thread.h" />
+    <ClInclude Include="Thread_Adapter.h" />
+    <ClInclude Include="Thread_Control.h" />
+    <ClInclude Include="Thread_Exit.h" />
+    <ClInclude Include="Thread_Hook.h" />
+    <ClInclude Include="Thread_Manager.h" />
+    <ClInclude Include="Thread_Mutex.h" />
+    <ClInclude Include="Thread_Semaphore.h" />
+    <ClInclude Include="Throughput_Stats.h" />
+    <ClInclude Include="Time_Value.h" />
+    <ClInclude Include="Timeprobe.h" />
+    <ClInclude Include="Timeprobe_T.h" />
+    <ClInclude Include="Timer_Hash.h" />
+    <ClInclude Include="Timer_Hash_T.h" />
+    <ClInclude Include="Timer_Heap.h" />
+    <ClInclude Include="Timer_Heap_T.h" />
+    <ClInclude Include="Timer_List.h" />
+    <ClInclude Include="Timer_List_T.h" />
+    <ClInclude Include="Timer_Queue.h" />
+    <ClInclude Include="Timer_Queue_Adapters.h" />
+    <ClInclude Include="Timer_Queue_T.h" />
+    <ClInclude Include="Timer_Queuefwd.h" />
+    <ClInclude Include="Timer_Wheel.h" />
+    <ClInclude Include="Timer_Wheel_T.h" />
+    <ClInclude Include="TLI.h" />
+    <ClInclude Include="TLI_Acceptor.h" />
+    <ClInclude Include="TLI_Connector.h" />
+    <ClInclude Include="TLI_Stream.h" />
+    <ClInclude Include="Token.h" />
+    <ClInclude Include="Token_Collection.h" />
+    <ClInclude Include="Token_Invariants.h" />
+    <ClInclude Include="Token_Manager.h" />
+    <ClInclude Include="Token_Request_Reply.h" />
+    <ClInclude Include="Tokenizer_T.h" />
+    <ClInclude Include="TP_Reactor.h" />
+    <ClInclude Include="Trace.h" />
+    <ClInclude Include="Truncate.h" />
+    <ClInclude Include="TSS_Adapter.h" />
+    <ClInclude Include="TSS_T.h" />
+    <ClInclude Include="TTY_IO.h" />
+    <ClInclude Include="Typed_SV_Message.h" />
+    <ClInclude Include="Typed_SV_Message_Queue.h" />
+    <ClInclude Include="Unbounded_Queue.h" />
+    <ClInclude Include="Unbounded_Set.h" />
+    <ClInclude Include="Unbounded_Set_Ex.h" />
+    <ClInclude Include="UNIX_Addr.h" />
+    <ClInclude Include="UPIPE_Acceptor.h" />
+    <ClInclude Include="UPIPE_Addr.h" />
+    <ClInclude Include="UPIPE_Connector.h" />
+    <ClInclude Include="UPIPE_Stream.h" />
+    <ClInclude Include="UTF16_Encoding_Converter.h" />
+    <ClInclude Include="UTF32_Encoding_Converter.h" />
+    <ClInclude Include="UTF8_Encoding_Converter.h" />
+    <ClInclude Include="UUID.h" />
+    <ClInclude Include="Value_Ptr.h" />
+    <ClInclude Include="Vector_T.h" />
+    <ClInclude Include="Version.h" />
+    <ClInclude Include="Versioned_Namespace.h" />
+    <ClInclude Include="WFMO_Reactor.h" />
+    <ClInclude Include="WIN32_Asynch_IO.h" />
+    <ClInclude Include="WIN32_Proactor.h" />
+    <ClInclude Include="XML_Svc_Conf.h" />
+    <ClInclude Include="XTI_ATM_Mcast.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ace.mpc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="ace.mwc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="ace_for_tao.mpc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="codecs.mpb">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="filecache.mpb">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="other.mpb">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="svcconf.mpb">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="svcconfgen.mpc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="token.mpb">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="uuid.mpb">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\AUTHORS">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\bin\add_rel_link.sh">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\bin\DependencyGenerator">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\bin\depgen.pl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\bin\MakeProjectCreator">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\bin\mpc.pl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\bin\mwc.pl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\COPYING">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\docs">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\include\makeinclude">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\NEWS">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\PROBLEM-REPORT-FORM">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\README">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\THANKS">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\VERSION">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ACE.pc.in">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ACE.inl" />
+    <None Include="ace_wchar.inl" />
+    <None Include="Activation_Queue.inl" />
+    <None Include="Active_Map_Manager.inl" />
+    <None Include="Active_Map_Manager_T.inl" />
+    <None Include="Addr.inl" />
+    <None Include="ARGV.inl" />
+    <None Include="Argv_Type_Converter.inl" />
+    <None Include="Array_Base.inl" />
+    <None Include="Array_Map.inl" />
+    <None Include="Asynch_IO_Impl.inl" />
+    <None Include="ATM_Acceptor.inl" />
+    <None Include="ATM_Addr.inl" />
+    <None Include="ATM_Connector.inl" />
+    <None Include="ATM_Params.inl" />
+    <None Include="ATM_QoS.inl" />
+    <None Include="ATM_Stream.inl" />
+    <None Include="Atomic_Op.inl" />
+    <None Include="Atomic_Op_GCC_T.inl" />
+    <None Include="Atomic_Op_T.inl" />
+    <None Include="Auto_Event.inl" />
+    <None Include="Auto_Functor.inl" />
+    <None Include="Auto_IncDec_T.inl" />
+    <None Include="Auto_Ptr.inl" />
+    <None Include="Barrier.inl" />
+    <None Include="Base_Thread_Adapter.inl" />
+    <None Include="Based_Pointer_T.inl" />
+    <None Include="Basic_Stats.inl" />
+    <None Include="Basic_Types.inl" />
+    <None Include="Bound_Ptr.inl" />
+    <None Include="Cache_Map_Manager_T.inl" />
+    <None Include="Caching_Strategies_T.inl" />
+    <None Include="Capabilities.inl" />
+    <None Include="CDR_Base.inl" />
+    <None Include="CDR_Size.inl" />
+    <None Include="CDR_Stream.inl" />
+    <None Include="Cleanup.inl" />
+    <None Include="Codeset_Registry.inl" />
+    <None Include="Condition_T.inl" />
+    <None Include="Condition_Thread_Mutex.inl" />
+    <None Include="Configuration.inl" />
+    <None Include="Containers.inl" />
+    <None Include="Containers_T.inl" />
+    <None Include="Countdown_Time.inl" />
+    <None Include="Date_Time.inl" />
+    <None Include="DEV.inl" />
+    <None Include="DEV_Addr.inl" />
+    <None Include="DEV_Connector.inl" />
+    <None Include="DEV_IO.inl" />
+    <None Include="Dev_Poll_Reactor.inl" />
+    <None Include="Dirent.inl" />
+    <None Include="Dirent_Selector.inl" />
+    <None Include="Dynamic.inl" />
+    <None Include="Dynamic_Message_Strategy.inl" />
+    <None Include="Dynamic_Service.inl" />
+    <None Include="Env_Value_T.inl" />
+    <None Include="Event.inl" />
+    <None Include="Event_Handler.inl" />
+    <None Include="Event_Handler_T.inl" />
+    <None Include="FIFO.inl" />
+    <None Include="FIFO_Recv.inl" />
+    <None Include="FIFO_Recv_Msg.inl" />
+    <None Include="FIFO_Send.inl" />
+    <None Include="FIFO_Send_Msg.inl" />
+    <None Include="FILE.inl" />
+    <None Include="FILE_Addr.inl" />
+    <None Include="FILE_Connector.inl" />
+    <None Include="FILE_IO.inl" />
+    <None Include="File_Lock.inl" />
+    <None Include="Flag_Manip.inl" />
+    <None Include="Framework_Component.inl" />
+    <None Include="Functor.inl" />
+    <None Include="Functor_String.inl" />
+    <None Include="Functor_T.inl" />
+    <None Include="Get_Opt.inl" />
+    <None Include="Guard_T.inl" />
+    <None Include="Handle_Gobbler.inl" />
+    <None Include="Handle_Set.inl" />
+    <None Include="Hash_Cache_Map_Manager_T.inl" />
+    <None Include="Hash_Map_Manager_T.inl" />
+    <None Include="Hash_Map_With_Allocator_T.inl" />
+    <None Include="Hash_Multi_Map_Manager_T.inl" />
+    <None Include="Hashable.inl" />
+    <None Include="High_Res_Timer.inl" />
+    <None Include="INET_Addr.inl" />
+    <None Include="Intrusive_Auto_Ptr.inl" />
+    <None Include="Intrusive_List.inl" />
+    <None Include="Intrusive_List_Node.inl" />
+    <None Include="IO_Cntl_Msg.inl" />
+    <None Include="IO_SAP.inl" />
+    <None Include="IOStream_T.inl" />
+    <None Include="IPC_SAP.inl" />
+    <None Include="Local_Tokens.inl" />
+    <None Include="Lock.inl" />
+    <None Include="Lock_Adapter_T.inl" />
+    <None Include="Log_Msg.inl" />
+    <None Include="Log_Record.inl" />
+    <None Include="LSOCK.inl" />
+    <None Include="LSOCK_CODgram.inl" />
+    <None Include="LSOCK_Connector.inl" />
+    <None Include="LSOCK_Dgram.inl" />
+    <None Include="LSOCK_Stream.inl" />
+    <None Include="Malloc.inl" />
+    <None Include="Malloc_Allocator.inl" />
+    <None Include="Malloc_T.inl" />
+    <None Include="Managed_Object.inl" />
+    <None Include="Manual_Event.inl" />
+    <None Include="Map_Manager.inl" />
+    <None Include="Map_T.inl" />
+    <None Include="MEM_Acceptor.inl" />
+    <None Include="MEM_Addr.inl" />
+    <None Include="MEM_Connector.inl" />
+    <None Include="MEM_IO.inl" />
+    <None Include="Mem_Map.inl" />
+    <None Include="MEM_SAP.inl" />
+    <None Include="MEM_Stream.inl" />
+    <None Include="Message_Block.inl" />
+    <None Include="Message_Block_T.inl" />
+    <None Include="Message_Queue.inl" />
+    <None Include="Message_Queue_NT.inl" />
+    <None Include="Message_Queue_Vx.inl" />
+    <None Include="Metrics_Cache_T.inl" />
+    <None Include="MMAP_Memory_Pool.inl" />
+    <None Include="Module.inl" />
+    <None Include="Monitor_Base.inl" />
+    <None Include="Msg_WFMO_Reactor.inl" />
+    <None Include="Multihomed_INET_Addr.inl" />
+    <None Include="Mutex.inl" />
+    <None Include="Naming_Context.inl" />
+    <None Include="Netlink_Addr.inl" />
+    <None Include="Notification_Queue.inl" />
+    <None Include="Notification_Strategy.inl" />
+    <None Include="NT_Service.inl" />
+    <None Include="Obchunk.inl" />
+    <None Include="Object_Manager.inl" />
+    <None Include="Obstack_T.inl" />
+    <None Include="OS_Errno.inl" />
+    <None Include="OS_Log_Msg_Attributes.inl" />
+    <None Include="OS_NS_arpa_inet.inl" />
+    <None Include="OS_NS_ctype.inl" />
+    <None Include="OS_NS_dirent.inl" />
+    <None Include="OS_NS_dlfcn.inl" />
+    <None Include="OS_NS_errno.inl" />
+    <None Include="OS_NS_fcntl.inl" />
+    <None Include="OS_NS_math.inl" />
+    <None Include="OS_NS_netdb.inl" />
+    <None Include="OS_NS_poll.inl" />
+    <None Include="OS_NS_pwd.inl" />
+    <None Include="OS_NS_regex.inl" />
+    <None Include="OS_NS_signal.inl" />
+    <None Include="OS_NS_stdio.inl" />
+    <None Include="OS_NS_stdlib.inl" />
+    <None Include="OS_NS_string.inl" />
+    <None Include="OS_NS_strings.inl" />
+    <None Include="OS_NS_stropts.inl" />
+    <None Include="OS_NS_sys_mman.inl" />
+    <None Include="OS_NS_sys_msg.inl" />
+    <None Include="OS_NS_sys_resource.inl" />
+    <None Include="OS_NS_sys_select.inl" />
+    <None Include="OS_NS_sys_sendfile.inl" />
+    <None Include="OS_NS_sys_shm.inl" />
+    <None Include="OS_NS_sys_socket.inl" />
+    <None Include="OS_NS_sys_stat.inl" />
+    <None Include="OS_NS_sys_time.inl" />
+    <None Include="OS_NS_sys_uio.inl" />
+    <None Include="OS_NS_sys_wait.inl" />
+    <None Include="OS_NS_Thread.inl" />
+    <None Include="OS_NS_time.inl" />
+    <None Include="OS_NS_unistd.inl" />
+    <None Include="OS_NS_wchar.inl" />
+    <None Include="OS_NS_wctype.inl" />
+    <None Include="OS_TLI.inl" />
+    <None Include="Pagefile_Memory_Pool.inl" />
+    <None Include="Pair_T.inl" />
+    <None Include="PI_Malloc.inl" />
+    <None Include="Ping_Socket.inl" />
+    <None Include="Pipe.inl" />
+    <None Include="POSIX_Proactor.inl" />
+    <None Include="Proactor.inl" />
+    <None Include="Process.inl" />
+    <None Include="Process_Manager.inl" />
+    <None Include="Process_Mutex.inl" />
+    <None Include="Process_Semaphore.inl" />
+    <None Include="Profile_Timer.inl" />
+    <None Include="RB_Tree.inl" />
+    <None Include="Reactor.inl" />
+    <None Include="Reactor_Notification_Strategy.inl" />
+    <None Include="Read_Buffer.inl" />
+    <None Include="Recursive_Thread_Mutex.inl" />
+    <None Include="Recyclable.inl" />
+    <None Include="Refcountable_T.inl" />
+    <None Include="Refcounted_Auto_Ptr.inl" />
+    <None Include="Remote_Tokens.inl" />
+    <None Include="Reverse_Lock_T.inl" />
+    <None Include="RW_Mutex.inl" />
+    <None Include="RW_Process_Mutex.inl" />
+    <None Include="RW_Thread_Mutex.inl" />
+    <None Include="Sample_History.inl" />
+    <None Include="Sched_Params.inl" />
+    <None Include="Select_Reactor_Base.inl" />
+    <None Include="Select_Reactor_T.inl" />
+    <None Include="Semaphore.inl" />
+    <None Include="Service_Config.inl" />
+    <None Include="Service_Gestalt.inl" />
+    <None Include="Service_Object.inl" />
+    <None Include="Service_Repository.inl" />
+    <None Include="Service_Types.inl" />
+    <None Include="Shared_Memory_MM.inl" />
+    <None Include="Shared_Memory_SV.inl" />
+    <None Include="Shared_Object.inl" />
+    <None Include="Sig_Handler.inl" />
+    <None Include="Signal.inl" />
+    <None Include="Singleton.inl" />
+    <None Include="SOCK.inl" />
+    <None Include="SOCK_Acceptor.inl" />
+    <None Include="SOCK_CODgram.inl" />
+    <None Include="SOCK_Connector.inl" />
+    <None Include="SOCK_Dgram.inl" />
+    <None Include="SOCK_Dgram_Bcast.inl" />
+    <None Include="SOCK_Dgram_Mcast.inl" />
+    <None Include="SOCK_IO.inl" />
+    <None Include="SOCK_Netlink.inl" />
+    <None Include="SOCK_SEQPACK_Acceptor.inl" />
+    <None Include="SOCK_SEQPACK_Association.inl" />
+    <None Include="SOCK_SEQPACK_Connector.inl" />
+    <None Include="SOCK_Stream.inl" />
+    <None Include="SPIPE.inl" />
+    <None Include="SPIPE_Addr.inl" />
+    <None Include="SPIPE_Connector.inl" />
+    <None Include="SPIPE_Stream.inl" />
+    <None Include="SString.inl" />
+    <None Include="Stats.inl" />
+    <None Include="Strategies_T.inl" />
+    <None Include="Stream.inl" />
+    <None Include="String_Base.inl" />
+    <None Include="SV_Message.inl" />
+    <None Include="SV_Message_Queue.inl" />
+    <None Include="SV_Semaphore_Complex.inl" />
+    <None Include="SV_Semaphore_Simple.inl" />
+    <None Include="SV_Shared_Memory.inl" />
+    <None Include="Task.inl" />
+    <None Include="Task_Ex_T.inl" />
+    <None Include="Task_T.inl" />
+    <None Include="Thread.inl" />
+    <None Include="Thread_Adapter.inl" />
+    <None Include="Thread_Control.inl" />
+    <None Include="Thread_Manager.inl" />
+    <None Include="Thread_Mutex.inl" />
+    <None Include="Thread_Semaphore.inl" />
+    <None Include="Time_Value.inl" />
+    <None Include="Timeprobe.inl" />
+    <None Include="Timer_Queue_Adapters.inl" />
+    <None Include="Timer_Queue_T.inl" />
+    <None Include="TLI.inl" />
+    <None Include="TLI_Connector.inl" />
+    <None Include="TLI_Stream.inl" />
+    <None Include="Token.inl" />
+    <None Include="Token_Collection.inl" />
+    <None Include="Token_Manager.inl" />
+    <None Include="Token_Request_Reply.inl" />
+    <None Include="TP_Reactor.inl" />
+    <None Include="TSS_T.inl" />
+    <None Include="Typed_SV_Message.inl" />
+    <None Include="Typed_SV_Message_Queue.inl" />
+    <None Include="Unbounded_Queue.inl" />
+    <None Include="Unbounded_Set.inl" />
+    <None Include="Unbounded_Set_Ex.inl" />
+    <None Include="UNIX_Addr.inl" />
+    <None Include="UPIPE_Acceptor.inl" />
+    <None Include="UPIPE_Connector.inl" />
+    <None Include="UPIPE_Stream.inl" />
+    <None Include="UTF16_Encoding_Converter.inl" />
+    <None Include="UUID.inl" />
+    <None Include="Vector_T.inl" />
+    <None Include="WFMO_Reactor.inl" />
+    <None Include="XTI_ATM_Mcast.inl" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\VERSION">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuild>
+    <CustomBuild Include="README">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ace.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/dep/ACE_wrappers/ace/ACE_vc10.vcxproj.filters b/dep/ACE_wrappers/ace/ACE_vc10.vcxproj.filters
index 6ae8d1c6716..fa85e12c2f9 100644
--- a/dep/ACE_wrappers/ace/ACE_vc10.vcxproj.filters
+++ b/dep/ACE_wrappers/ace/ACE_vc10.vcxproj.filters
@@ -1,3944 +1,3944 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{B1F27843-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
-      <Extensions>cpp;cxx;cc;c;C</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{06319535-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hh</Extensions>
-    </Filter>
-    <Filter Include="Build Files">
-      <UniqueIdentifier>{A1909F1C-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
-      <Extensions>mpc;mpb;mwc</Extensions>
-    </Filter>
-    <Filter Include="Installdata Files">
-      <UniqueIdentifier>{B0B7506A-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Pkgconfig Files">
-      <UniqueIdentifier>{8441A3A3-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
-      <Extensions>pcin</Extensions>
-    </Filter>
-    <Filter Include="Inline Files">
-      <UniqueIdentifier>{763028EF-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
-      <Extensions>i;ipp;inl</Extensions>
-    </Filter>
-    <Filter Include="Template Files">
-      <UniqueIdentifier>{5635C877-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Documentation">
-      <UniqueIdentifier>{B14BBA74-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{502A2050-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ACE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ACE_crc32.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ACE_crc_ccitt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ace_wchar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Activation_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Active_Map_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Argv_Type_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Assert.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Asynch_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Asynch_IO_Impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Asynch_Pseudo_Task.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ATM_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ATM_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ATM_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ATM_Params.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ATM_QoS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ATM_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Atomic_Op.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Atomic_Op_Sparc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Auto_Event.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Barrier.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Base_Thread_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Based_Pointer_Repository.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Basic_Stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Basic_Types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Capabilities.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CDR_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CDR_Size.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CDR_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Cleanup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codecs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codeset_IBM1047.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codeset_Registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Codeset_Registry_db.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Condition_Recursive_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Condition_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Configuration.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Configuration_Import_Export.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Connection_Recycling_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Containers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Copy_Disabled.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Countdown_Time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Date_Time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DEV.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DEV_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DEV_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DEV_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Dev_Poll_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Dirent.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Dirent_Selector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DLL.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DLL_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Dump.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Dynamic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Dynamic_Message_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Dynamic_Service_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Dynamic_Service_Dependency.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Encoding_Converter_Factory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Event.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Event_Handler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FIFO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FIFO_Recv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FIFO_Recv_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FIFO_Send.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FIFO_Send_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FILE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FILE_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FILE_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FILE_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="File_Lock.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Filecache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Flag_Manip.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Framework_Component.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Functor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Functor_String.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Get_Opt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gethrtime.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Handle_Ops.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Handle_Set.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Hashable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="High_Res_Timer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ICMP_Socket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="INET_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Init_ACE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IO_Cntl_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IO_SAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IOStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_SAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib_Find.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Local_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Local_Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Local_Tokens.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Lock.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log_Msg_Backend.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log_Msg_Callback.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log_Msg_IPC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log_Msg_NT_Event_Log.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log_Msg_UNIX_Syslog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log_Record.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Logging_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LSOCK.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LSOCK_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LSOCK_CODgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LSOCK_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LSOCK_Dgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LSOCK_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Malloc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Malloc_Allocator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Manual_Event.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MEM_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MEM_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MEM_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MEM_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Mem_Map.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MEM_SAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MEM_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Message_Block.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Message_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Message_Queue_NT.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Message_Queue_Vx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Method_Request.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MMAP_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Monitor_Admin.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Monitor_Admin_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Monitor_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Monitor_Control_Action.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Monitor_Control_Types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Monitor_Point_Registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Monitor_Size.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Msg_WFMO_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Multihomed_INET_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Name_Proxy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Name_Request_Reply.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Naming_Context.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Netlink_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Notification_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Notification_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="NT_Service.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Obchunk.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Object_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Object_Manager_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_Errno.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_Log_Msg_Attributes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_arpa_inet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_ctype.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_dirent.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_dlfcn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_errno.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_fcntl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_math.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_netdb.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_poll.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_pwd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_regex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_signal.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_stdio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_stdlib.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_string.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_strings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_stropts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_mman.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_resource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_select.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_sendfile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_shm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_socket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_stat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_uio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_utsname.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_sys_wait.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_Thread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_unistd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_wchar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_NS_wctype.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_QoS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_Thread_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OS_TLI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Pagefile_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Parse_Node.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PI_Malloc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Ping_Socket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Pipe.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="POSIX_Asynch_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="POSIX_CB_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="POSIX_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Priority_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Proactor_Impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Process.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Process_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Process_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Process_Semaphore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Profile_Timer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Reactor_Impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Reactor_Notification_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Reactor_Timer_Interface.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Read_Buffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Recursive_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Recyclable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Registry_Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Remote_Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Remote_Tokens.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Rtems_init.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RW_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RW_Process_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RW_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sample_History.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sbrk_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sched_Params.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Select_Reactor_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Semaphore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Service_Config.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Service_Gestalt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Service_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Service_Object.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Service_Repository.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Service_Types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Shared_Memory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Shared_Memory_MM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Shared_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Shared_Memory_SV.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Shared_Object.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sig_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sig_Handler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Signal.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_CODgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sock_Connect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_Dgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_Dgram_Bcast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_Dgram_Mcast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_Netlink.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_SEQPACK_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_SEQPACK_Association.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_SEQPACK_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SPIPE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SPIPE_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SPIPE_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SPIPE_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SPIPE_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Stack_Trace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="String_Base_Const.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SUN_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SV_Message.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SV_Message_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SV_Semaphore_Complex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SV_Semaphore_Simple.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SV_Shared_Memory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Svc_Conf_Lexer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Svc_Conf_y.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Synch_Options.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="System_Time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Task.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Thread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Thread_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Thread_Control.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Thread_Exit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Thread_Hook.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Thread_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Thread_Semaphore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Throughput_Stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Time_Value.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Timeprobe.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TLI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TLI_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TLI_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TLI_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Token.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Token_Collection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Token_Invariants.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Token_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Token_Request_Reply.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TP_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Trace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TSS_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TTY_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UNIX_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UPIPE_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UPIPE_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UPIPE_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UTF16_Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UTF32_Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UTF8_Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UUID.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WFMO_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WIN32_Asynch_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WIN32_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="XML_Svc_Conf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="XTI_ATM_Mcast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ACE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ACE_export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ace_wchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Activation_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Active_Map_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Active_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Arg_Shifter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ARGV.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Argv_Type_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Array_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Array_Map.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Assert.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Asynch_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Asynch_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Asynch_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Asynch_IO_Impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Asynch_Pseudo_Task.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ATM_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ATM_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ATM_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ATM_Params.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ATM_QoS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ATM_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Atomic_Op.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Atomic_Op_GCC_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Atomic_Op_Sparc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Atomic_Op_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Auto_Event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Auto_Functor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Auto_IncDec_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Auto_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Barrier.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Base_Thread_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Based_Pointer_Repository.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Based_Pointer_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Basic_Stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Basic_Types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Bound_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Cache_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Cached_Connect_Strategy_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Caching_Strategies_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Caching_Utility_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Capabilities.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CDR_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CDR_Size.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CDR_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CE_Screen_Output.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="checked_iterator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Cleanup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Cleanup_Strategies_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codecs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codeset_IBM1047.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codeset_Registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Codeset_Symbols.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Condition_Recursive_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Condition_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Condition_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-aix-5.x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-all.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-cygwin32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-doxygen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-freebsd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-g++-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-ghs-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-hpux-11.00.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-icc-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-integritySCA.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-kfreebsd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-linux-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-linux.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-lite.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-lynxos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-macosx-iphone-hardware.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-macosx-iphone-simulator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-macosx-leopard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-macosx-panther.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-macosx-snowleopard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-macosx-tiger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-macosx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-minimal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-mvs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-netbsd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-openbsd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-openvms.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-pharlap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-posix-nonetworking.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-posix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-qnx-neutrino.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-qnx-rtp-62x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-qnx-rtp-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-qnx-rtp-pre62x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-qnx-rtp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-rtems.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-suncc-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-sunos5.10.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-sunos5.11.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-sunos5.4-g++.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-sunos5.4-sunc++-4.x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-sunos5.5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-sunos5.6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-sunos5.7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-sunos5.8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-sunos5.9.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-tandem-nsk-mips-v2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-tandem-nsk-mips-v3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-tandem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-visualage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-vxworks.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-vxworks6.4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-vxworks6.5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-vxworks6.6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-vxworks6.7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-vxworks6.8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32-borland.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32-cegcc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32-dmc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32-interix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32-mingw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32-msvc-10.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32-msvc-7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32-msvc-8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32-msvc-9.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32-msvc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-win32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config-WinCE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Configuration.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Configuration_Import_Export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Connection_Recycling_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Containers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Containers_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Copy_Disabled.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CORBA_macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Countdown_Time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Date_Time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Default_Constants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DEV.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DEV_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DEV_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DEV_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Dev_Poll_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Dirent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Dirent_Selector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DLL.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DLL_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Dump.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Dump_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Dynamic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Dynamic_Message_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Dynamic_Service.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Dynamic_Service_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Dynamic_Service_Dependency.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Encoding_Converter_Factory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Env_Value_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Event_Handler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Event_Handler_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FIFO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FIFO_Recv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FIFO_Recv_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FIFO_Send.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FIFO_Send_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FILE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FILE_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FILE_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FILE_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="File_Lock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Filecache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Flag_Manip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Framework_Component.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Framework_Component_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Free_List.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Functor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Functor_String.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Functor_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Future.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Future_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Get_Opt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Global_Macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Guard_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Handle_Gobbler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Handle_Ops.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Handle_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Hash_Cache_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Hash_Map_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Hash_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Hash_Map_With_Allocator_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Hash_Multi_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Hashable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="High_Res_Timer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ICMP_Socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="If_Then_Else.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="INET_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Init_ACE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Intrusive_Auto_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Intrusive_List.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Intrusive_List_Node.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IO_Cntl_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IO_SAP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="iosfwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IOStream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IOStream_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_SAP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib_Find.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Local_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Local_Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Local_Name_Space_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Local_Tokens.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Lock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Lock_Adapter_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LOCK_SOCK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log_Msg_Backend.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log_Msg_Callback.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log_Msg_IPC.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log_Msg_NT_Event_Log.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log_Msg_UNIX_Syslog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log_Priority.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log_Record.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Logging_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LSOCK.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LSOCK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LSOCK_CODgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LSOCK_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LSOCK_Dgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LSOCK_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Malloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Malloc_Allocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Malloc_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Malloc_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Managed_Object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Manual_Event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Map_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Map_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MEM_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MEM_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MEM_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MEM_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Mem_Map.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MEM_SAP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MEM_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Message_Block.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Message_Block_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Message_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Message_Queue_NT.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Message_Queue_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Message_Queue_Vx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Method_Request.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Metrics_Cache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Metrics_Cache_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Min_Max.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MMAP_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Module.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Admin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Admin_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Control_Action.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Control_Types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Point_Registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Size.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Msg_WFMO_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Multihomed_INET_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Name_Proxy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Name_Request_Reply.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Naming_Context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Netlink_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Node.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Notification_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Notification_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="NT_Service.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Null_Barrier.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Null_Condition.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Null_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Null_Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Numeric_Limits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Obchunk.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Object_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Object_Manager_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Obstack.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Obstack_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_Errno.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\arpa\os_inet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\net\os_if.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\netinet\os_in.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\netinet\os_tcp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_aio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_assert.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_byteswap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_complex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_cpio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_ctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_dirent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_dlfcn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_errno.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_fcntl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_fenv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_float.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_fmtmsg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_fnmatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_ftw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_glob.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_grp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_iconv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_intrin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_inttypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_iso646.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_kstat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_langinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_libgen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_limits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_local.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_monetary.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_mqueue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_ndbm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_netdb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_nl_types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_pdh.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_pdhmsg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_poll.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_pthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_pwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_regex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_sched.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_search.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_setjmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_signal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_spawn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_stdarg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_stdbool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_stddef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_stdint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_stdio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_stdlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_strings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_stropts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_syslog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_tar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_termios.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_tgmath.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_typeinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_ucontext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_ulimit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_unistd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_utime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_utmpx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_wchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_wctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\os_wordexp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_ipc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_loadavg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_mman.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_pstat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_select.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_sem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_shm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_stat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_statvfs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_sysctl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_sysinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_timeb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_times.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_uio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_un.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_utsname.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os_include\sys\os_wait.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_Log_Msg_Attributes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_main.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_Memory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_arpa_inet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_ctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_dirent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_dlfcn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_errno.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_fcntl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_netdb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_poll.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_pwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_regex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_signal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_stdio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_stdlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_strings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_stropts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_mman.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_select.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_sendfile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_shm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_stat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_uio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_utsname.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_sys_wait.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_Thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_unistd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_wchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_NS_wctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_QoS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_Thread_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OS_TLI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Pagefile_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Pair_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Parse_Node.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PI_Malloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Ping_Socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Pipe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="POSIX_Asynch_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="POSIX_CB_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="POSIX_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="post.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pre.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Priority_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Proactor_Impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Process.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Process_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Process_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Process_Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Profile_Timer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RB_Tree.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Reactor_Impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Reactor_Notification_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Reactor_Timer_Interface.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Reactor_Token_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Read_Buffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Recursive_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Recyclable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Refcountable_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Refcounted_Auto_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Registry_Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Remote_Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Remote_Tokens.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Reverse_Lock_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RW_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RW_Process_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RW_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sample_History.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sbrk_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sched_Params.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Select_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Select_Reactor_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Select_Reactor_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Service_Config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Service_Gestalt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Service_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Service_Object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Service_Repository.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Service_Types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Shared_Memory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Shared_Memory_MM.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Shared_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Shared_Memory_SV.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Shared_Object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sig_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sig_Handler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Signal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Singleton.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_CODgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Sock_Connect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_Dgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_Dgram_Bcast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_Dgram_Mcast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_Netlink.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_SEQPACK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_SEQPACK_Association.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_SEQPACK_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SPIPE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SPIPE_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SPIPE_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SPIPE_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SPIPE_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SString.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SStringfwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Stack_Trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Static_Object_Lock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Strategies.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Strategies_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Stream_Modules.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="streams.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="String_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="String_Base_Const.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SUN_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SV_Message.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SV_Message_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SV_Semaphore_Complex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SV_Semaphore_Simple.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SV_Shared_Memory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Svc_Conf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Svc_Conf_Lexer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Svc_Conf_Param.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Svc_Conf_Token_Table.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Svc_Conf_Tokens.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="svc_export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Svc_Handler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Synch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Synch_Options.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Synch_Traits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="System_Time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Task.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Task_Ex_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Task_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Test_and_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Thread_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Thread_Control.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Thread_Exit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Thread_Hook.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Thread_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Thread_Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Throughput_Stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Time_Value.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timeprobe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timeprobe_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_Hash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_Hash_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_Heap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_Heap_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_List.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_List_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_Queue_Adapters.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_Queue_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_Queuefwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_Wheel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Timer_Wheel_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TLI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TLI_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TLI_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TLI_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Token.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Token_Collection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Token_Invariants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Token_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Token_Request_Reply.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Tokenizer_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TP_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Truncate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TSS_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TSS_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TTY_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Typed_SV_Message.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Typed_SV_Message_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Unbounded_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Unbounded_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Unbounded_Set_Ex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UNIX_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UPIPE_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UPIPE_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UPIPE_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UPIPE_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UTF16_Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UTF32_Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UTF8_Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UUID.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Value_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Vector_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Versioned_Namespace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WFMO_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WIN32_Asynch_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WIN32_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="XML_Svc_Conf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="XTI_ATM_Mcast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ace.mpc">
-      <Filter>Build Files</Filter>
-    </None>
-    <None Include="ace.mwc">
-      <Filter>Build Files</Filter>
-    </None>
-    <None Include="ace_for_tao.mpc">
-      <Filter>Build Files</Filter>
-    </None>
-    <None Include="codecs.mpb">
-      <Filter>Build Files</Filter>
-    </None>
-    <None Include="filecache.mpb">
-      <Filter>Build Files</Filter>
-    </None>
-    <None Include="other.mpb">
-      <Filter>Build Files</Filter>
-    </None>
-    <None Include="svcconf.mpb">
-      <Filter>Build Files</Filter>
-    </None>
-    <None Include="svcconfgen.mpc">
-      <Filter>Build Files</Filter>
-    </None>
-    <None Include="token.mpb">
-      <Filter>Build Files</Filter>
-    </None>
-    <None Include="uuid.mpb">
-      <Filter>Build Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\AUTHORS">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\bin\add_rel_link.sh">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\bin\DependencyGenerator">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\bin\depgen.pl">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\bin\MakeProjectCreator">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\bin\mpc.pl">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\bin\mwc.pl">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\COPYING">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\docs">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\include\makeinclude">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\NEWS">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\PROBLEM-REPORT-FORM">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\README">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\THANKS">
-      <Filter>Installdata Files</Filter>
-    </None>
-    <None Include="..\VERSION">
-      <Filter>Installdata Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ACE.pc.in">
-      <Filter>Pkgconfig Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ACE.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="ace_wchar.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Activation_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Active_Map_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Active_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="ARGV.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Argv_Type_Converter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Array_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Array_Map.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Asynch_IO_Impl.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="ATM_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="ATM_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="ATM_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="ATM_Params.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="ATM_QoS.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="ATM_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Atomic_Op.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Atomic_Op_GCC_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Atomic_Op_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Auto_Event.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Auto_Functor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Auto_IncDec_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Auto_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Barrier.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Base_Thread_Adapter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Based_Pointer_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Basic_Stats.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Basic_Types.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Bound_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Cache_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Caching_Strategies_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Capabilities.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="CDR_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="CDR_Size.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="CDR_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Cleanup.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Codeset_Registry.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Condition_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Condition_Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Configuration.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Containers.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Containers_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Countdown_Time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Date_Time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="DEV.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="DEV_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="DEV_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="DEV_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Dev_Poll_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Dirent.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Dirent_Selector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Dynamic.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Dynamic_Message_Strategy.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Dynamic_Service.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Env_Value_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Event.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Event_Handler.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Event_Handler_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="FIFO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="FIFO_Recv.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="FIFO_Recv_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="FIFO_Send.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="FIFO_Send_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="FILE.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="FILE_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="FILE_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="FILE_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="File_Lock.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Flag_Manip.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Framework_Component.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Functor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Functor_String.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Functor_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Get_Opt.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Guard_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Handle_Gobbler.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Handle_Set.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Hash_Cache_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Hash_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Hash_Map_With_Allocator_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Hash_Multi_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Hashable.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="High_Res_Timer.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="INET_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Intrusive_Auto_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Intrusive_List.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Intrusive_List_Node.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="IO_Cntl_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="IO_SAP.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="IOStream_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="IPC_SAP.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Local_Tokens.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Lock.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Lock_Adapter_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Log_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Log_Record.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="LSOCK.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="LSOCK_CODgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="LSOCK_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="LSOCK_Dgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="LSOCK_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Malloc.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Malloc_Allocator.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Malloc_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Managed_Object.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Manual_Event.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Map_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Map_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="MEM_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="MEM_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="MEM_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="MEM_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Mem_Map.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="MEM_SAP.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="MEM_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Message_Block.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Message_Block_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Message_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Message_Queue_NT.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Message_Queue_Vx.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Metrics_Cache_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="MMAP_Memory_Pool.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Module.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Monitor_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Msg_WFMO_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Multihomed_INET_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Naming_Context.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Netlink_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Notification_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Notification_Strategy.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="NT_Service.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Obchunk.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Object_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Obstack_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_Errno.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_Log_Msg_Attributes.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_arpa_inet.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_ctype.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_dirent.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_dlfcn.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_errno.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_fcntl.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_math.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_netdb.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_poll.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_pwd.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_regex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_signal.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_stdio.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_stdlib.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_string.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_strings.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_stropts.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_sys_mman.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_sys_msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_sys_resource.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_sys_select.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_sys_sendfile.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_sys_shm.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_sys_socket.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_sys_stat.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_sys_time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_sys_uio.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_sys_wait.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_Thread.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_unistd.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_wchar.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_NS_wctype.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="OS_TLI.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Pagefile_Memory_Pool.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Pair_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="PI_Malloc.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Ping_Socket.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Pipe.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="POSIX_Proactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Proactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Process.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Process_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Process_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Process_Semaphore.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Profile_Timer.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="RB_Tree.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Reactor_Notification_Strategy.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Read_Buffer.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Recursive_Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Recyclable.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Refcountable_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Refcounted_Auto_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Remote_Tokens.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Reverse_Lock_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="RW_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="RW_Process_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="RW_Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Sample_History.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Sched_Params.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Select_Reactor_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Select_Reactor_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Semaphore.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Service_Config.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Service_Gestalt.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Service_Object.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Service_Repository.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Service_Types.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Shared_Memory_MM.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Shared_Memory_SV.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Shared_Object.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Sig_Handler.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Signal.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Singleton.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_CODgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_Dgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_Dgram_Bcast.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_Dgram_Mcast.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_Netlink.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_SEQPACK_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_SEQPACK_Association.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_SEQPACK_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SPIPE.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SPIPE_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SPIPE_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SPIPE_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SString.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Stats.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Strategies_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="String_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SV_Message.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SV_Message_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SV_Semaphore_Complex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SV_Semaphore_Simple.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SV_Shared_Memory.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Task.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Task_Ex_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Task_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Thread.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Thread_Adapter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Thread_Control.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Thread_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Thread_Semaphore.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Time_Value.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Timeprobe.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Timer_Queue_Adapters.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Timer_Queue_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="TLI.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="TLI_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="TLI_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Token.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Token_Collection.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Token_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Token_Request_Reply.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="TP_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="TSS_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Typed_SV_Message.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Typed_SV_Message_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Unbounded_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Unbounded_Set.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Unbounded_Set_Ex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="UNIX_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="UPIPE_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="UPIPE_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="UPIPE_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="UTF16_Encoding_Converter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="UUID.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="Vector_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="WFMO_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="XTI_ATM_Mcast.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Acceptor.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Active_Map_Manager_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Arg_Shifter.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ARGV.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Array_Base.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Array_Map.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Asynch_Acceptor.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Asynch_Connector.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Atomic_Op_GCC_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Atomic_Op_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Auto_Functor.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Auto_IncDec_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Auto_Ptr.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Based_Pointer_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Cache_Map_Manager_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Cached_Connect_Strategy_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Caching_Strategies_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Caching_Utility_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Cleanup_Strategies_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Condition_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Connector.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Containers_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Dump_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Dynamic_Service.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Env_Value_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Event_Handler_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Framework_Component_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Free_List.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Functor_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Future.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Future_Set.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Guard_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Hash_Cache_Map_Manager_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Hash_Map_Manager_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Hash_Map_With_Allocator_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Hash_Multi_Map_Manager_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Intrusive_Auto_Ptr.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Intrusive_List.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Intrusive_List_Node.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IOStream_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Local_Name_Space_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Lock_Adapter_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LOCK_SOCK_Acceptor.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Malloc_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Managed_Object.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Map_Manager.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Map_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Message_Block_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Message_Queue_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Metrics_Cache_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Module.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Node.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Obstack_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Pair_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RB_Tree.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Reactor_Token_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Refcountable_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Refcounted_Auto_Ptr.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Reverse_Lock_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Select_Reactor_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Singleton.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Strategies_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Stream.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Stream_Modules.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="String_Base.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Svc_Handler.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Task_Ex_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Task_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Test_and_Set.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Timeprobe_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Timer_Hash_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Timer_Heap_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Timer_List_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Timer_Queue_Adapters.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Timer_Queue_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Timer_Wheel_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Tokenizer_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TSS_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Typed_SV_Message.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Typed_SV_Message_Queue.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Unbounded_Queue.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Unbounded_Set.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Unbounded_Set_Ex.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Vector_T.cpp">
-      <Filter>Template Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\VERSION">
-      <Filter>Documentation</Filter>
-    </CustomBuild>
-    <CustomBuild Include="README">
-      <Filter>Documentation</Filter>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ace.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{B1F27843-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
+      <Extensions>cpp;cxx;cc;c;C</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{06319535-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hh</Extensions>
+    </Filter>
+    <Filter Include="Build Files">
+      <UniqueIdentifier>{A1909F1C-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
+      <Extensions>mpc;mpb;mwc</Extensions>
+    </Filter>
+    <Filter Include="Installdata Files">
+      <UniqueIdentifier>{B0B7506A-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Pkgconfig Files">
+      <UniqueIdentifier>{8441A3A3-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
+      <Extensions>pcin</Extensions>
+    </Filter>
+    <Filter Include="Inline Files">
+      <UniqueIdentifier>{763028EF-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
+      <Extensions>i;ipp;inl</Extensions>
+    </Filter>
+    <Filter Include="Template Files">
+      <UniqueIdentifier>{5635C877-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Documentation">
+      <UniqueIdentifier>{B14BBA74-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{502A2050-FECA-1BAD-6757-8A6300006755}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ACE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ACE_crc32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ACE_crc_ccitt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ace_wchar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Activation_Queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Active_Map_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Argv_Type_Converter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Assert.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Asynch_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Asynch_IO_Impl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Asynch_Pseudo_Task.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ATM_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ATM_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ATM_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ATM_Params.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ATM_QoS.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ATM_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Atomic_Op.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Atomic_Op_Sparc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Auto_Event.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Barrier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Base_Thread_Adapter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Based_Pointer_Repository.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Basic_Stats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Basic_Types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Capabilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CDR_Base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CDR_Size.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CDR_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Cleanup.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Codecs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Codeset_IBM1047.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Codeset_Registry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Codeset_Registry_db.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Condition_Recursive_Thread_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Condition_Thread_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Configuration.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Configuration_Import_Export.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Connection_Recycling_Strategy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Containers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Copy_Disabled.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Countdown_Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Date_Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DEV_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Dev_Poll_Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Dirent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Dirent_Selector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DLL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DLL_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Dump.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Dynamic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Dynamic_Message_Strategy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Dynamic_Service_Base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Dynamic_Service_Dependency.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Encoding_Converter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Encoding_Converter_Factory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Event.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Event_Handler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FIFO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FIFO_Recv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FIFO_Recv_Msg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FIFO_Send.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FIFO_Send_Msg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FILE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FILE_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FILE_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FILE_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="File_Lock.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Filecache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Flag_Manip.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Framework_Component.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Functor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Functor_String.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Get_Opt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="gethrtime.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Handle_Ops.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Handle_Set.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Hashable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="High_Res_Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ICMP_Socket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="INET_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Init_ACE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="IO_Cntl_Msg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="IO_SAP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="IOStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_SAP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Lib_Find.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Local_Memory_Pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Local_Name_Space.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Local_Tokens.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Lock.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log_Msg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log_Msg_Backend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log_Msg_Callback.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log_Msg_IPC.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log_Msg_NT_Event_Log.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log_Msg_UNIX_Syslog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log_Record.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Logging_Strategy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LSOCK.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LSOCK_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LSOCK_CODgram.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LSOCK_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LSOCK_Dgram.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LSOCK_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Malloc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Malloc_Allocator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Manual_Event.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MEM_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MEM_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MEM_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MEM_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Mem_Map.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MEM_SAP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MEM_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Message_Block.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Message_Queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Message_Queue_NT.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Message_Queue_Vx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Method_Request.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MMAP_Memory_Pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Monitor_Admin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Monitor_Admin_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Monitor_Base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Monitor_Control_Action.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Monitor_Control_Types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Monitor_Point_Registry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Monitor_Size.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Msg_WFMO_Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Multihomed_INET_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Name_Proxy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Name_Request_Reply.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Name_Space.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Naming_Context.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Netlink_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Notification_Queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Notification_Strategy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="NT_Service.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Obchunk.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Object_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Object_Manager_Base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_Errno.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_Log_Msg_Attributes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_arpa_inet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_ctype.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_dirent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_dlfcn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_errno.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_fcntl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_math.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_netdb.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_poll.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_pwd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_regex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_signal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_stdio.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_stdlib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_string.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_strings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_stropts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_mman.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_msg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_resource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_select.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_sendfile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_shm.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_socket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_stat.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_uio.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_utsname.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_sys_wait.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_unistd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_wchar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_NS_wctype.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_QoS.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_Thread_Adapter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OS_TLI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Pagefile_Memory_Pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Parse_Node.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PI_Malloc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Ping_Socket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Pipe.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="POSIX_Asynch_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="POSIX_CB_Proactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="POSIX_Proactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Priority_Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Proactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Proactor_Impl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Process.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Process_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Process_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Process_Semaphore.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Profile_Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Reactor_Impl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Reactor_Notification_Strategy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Reactor_Timer_Interface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Read_Buffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Recursive_Thread_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Recyclable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Registry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Registry_Name_Space.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Remote_Name_Space.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Remote_Tokens.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Rtems_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RW_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RW_Process_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RW_Thread_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sample_History.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sbrk_Memory_Pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sched_Params.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Select_Reactor_Base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Semaphore.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Service_Config.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Service_Gestalt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Service_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Service_Object.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Service_Repository.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Service_Types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Shared_Memory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Shared_Memory_MM.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Shared_Memory_Pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Shared_Memory_SV.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Shared_Object.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sig_Adapter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sig_Handler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Signal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_CODgram.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sock_Connect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_Dgram.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_Dgram_Bcast.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_Dgram_Mcast.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_Netlink.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_SEQPACK_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_SEQPACK_Association.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_SEQPACK_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SPIPE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SPIPE_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SPIPE_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SPIPE_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SPIPE_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SString.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Stack_Trace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Stats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="String_Base_Const.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SUN_Proactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SV_Message.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SV_Message_Queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SV_Semaphore_Complex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SV_Semaphore_Simple.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SV_Shared_Memory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Svc_Conf_Lexer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Svc_Conf_y.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Synch_Options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="System_Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Task.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Thread_Adapter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Thread_Control.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Thread_Exit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Thread_Hook.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Thread_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Thread_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Thread_Semaphore.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Throughput_Stats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Time_Value.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Timeprobe.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TLI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TLI_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TLI_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TLI_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Token.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Token_Collection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Token_Invariants.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Token_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Token_Request_Reply.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TP_Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Trace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TSS_Adapter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TTY_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UNIX_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UPIPE_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UPIPE_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UPIPE_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UTF16_Encoding_Converter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UTF32_Encoding_Converter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UTF8_Encoding_Converter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UUID.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WFMO_Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WIN32_Asynch_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WIN32_Proactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="XML_Svc_Conf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="XTI_ATM_Mcast.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ACE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ACE_export.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ace_wchar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Activation_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Active_Map_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Active_Map_Manager_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Arg_Shifter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ARGV.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Argv_Type_Converter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Array_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Array_Map.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Assert.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Asynch_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Asynch_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Asynch_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Asynch_IO_Impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Asynch_Pseudo_Task.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ATM_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ATM_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ATM_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ATM_Params.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ATM_QoS.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ATM_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Atomic_Op.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Atomic_Op_GCC_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Atomic_Op_Sparc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Atomic_Op_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Auto_Event.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Auto_Functor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Auto_IncDec_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Auto_Ptr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Barrier.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Base_Thread_Adapter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Based_Pointer_Repository.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Based_Pointer_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Basic_Stats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Basic_Types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Bound_Ptr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Cache_Map_Manager_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Cached_Connect_Strategy_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Caching_Strategies_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Caching_Utility_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Capabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CDR_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CDR_Size.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CDR_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CE_Screen_Output.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="checked_iterator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Cleanup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Cleanup_Strategies_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Codecs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Codeset_IBM1047.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Codeset_Registry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Codeset_Symbols.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Condition_Recursive_Thread_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Condition_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Condition_Thread_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-aix-5.x.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-all.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-cygwin32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-doxygen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-freebsd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-g++-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-ghs-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-hpux-11.00.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-icc-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-integritySCA.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-kfreebsd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-linux-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-linux.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-lite.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-lynxos.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-macosx-iphone-hardware.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-macosx-iphone-simulator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-macosx-leopard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-macosx-panther.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-macosx-snowleopard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-macosx-tiger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-macosx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-macros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-minimal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-mvs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-netbsd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-openbsd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-openvms.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-pharlap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-posix-nonetworking.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-posix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-qnx-neutrino.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-qnx-rtp-62x.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-qnx-rtp-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-qnx-rtp-pre62x.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-qnx-rtp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-rtems.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-suncc-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-sunos5.10.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-sunos5.11.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-sunos5.4-g++.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-sunos5.4-sunc++-4.x.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-sunos5.5.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-sunos5.6.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-sunos5.7.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-sunos5.8.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-sunos5.9.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-tandem-nsk-mips-v2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-tandem-nsk-mips-v3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-tandem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-visualage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-vxworks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-vxworks6.4.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-vxworks6.5.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-vxworks6.6.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-vxworks6.7.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-vxworks6.8.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32-borland.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32-cegcc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32-dmc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32-interix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32-mingw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32-msvc-10.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32-msvc-7.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32-msvc-8.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32-msvc-9.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32-msvc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config-WinCE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Configuration.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Configuration_Import_Export.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Connection_Recycling_Strategy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Containers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Containers_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Copy_Disabled.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CORBA_macros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Countdown_Time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Date_Time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Default_Constants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DEV_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Dev_Poll_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Dirent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Dirent_Selector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DLL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DLL_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Dump.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Dump_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Dynamic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Dynamic_Message_Strategy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Dynamic_Service.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Dynamic_Service_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Dynamic_Service_Dependency.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Encoding_Converter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Encoding_Converter_Factory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Env_Value_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Event.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Event_Handler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Event_Handler_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FIFO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FIFO_Recv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FIFO_Recv_Msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FIFO_Send.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FIFO_Send_Msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FILE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FILE_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FILE_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FILE_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="File_Lock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Filecache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Flag_Manip.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Framework_Component.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Framework_Component_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Free_List.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Functor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Functor_String.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Functor_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Future.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Future_Set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Get_Opt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Global_Macros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Guard_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Handle_Gobbler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Handle_Ops.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Handle_Set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Hash_Cache_Map_Manager_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Hash_Map_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Hash_Map_Manager_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Hash_Map_With_Allocator_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Hash_Multi_Map_Manager_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Hashable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="High_Res_Timer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ICMP_Socket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="If_Then_Else.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="INET_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Init_ACE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Intrusive_Auto_Ptr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Intrusive_List.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Intrusive_List_Node.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IO_Cntl_Msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IO_SAP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="iosfwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IOStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IOStream_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_SAP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Lib_Find.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Local_Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Local_Name_Space.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Local_Name_Space_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Local_Tokens.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Lock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Lock_Adapter_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LOCK_SOCK_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log_Msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log_Msg_Backend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log_Msg_Callback.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log_Msg_IPC.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log_Msg_NT_Event_Log.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log_Msg_UNIX_Syslog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log_Priority.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log_Record.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Logging_Strategy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LSOCK.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LSOCK_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LSOCK_CODgram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LSOCK_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LSOCK_Dgram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LSOCK_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Malloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Malloc_Allocator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Malloc_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Malloc_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Managed_Object.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Manual_Event.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Map_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Map_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MEM_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MEM_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MEM_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MEM_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Mem_Map.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MEM_SAP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MEM_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Message_Block.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Message_Block_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Message_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Message_Queue_NT.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Message_Queue_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Message_Queue_Vx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Method_Request.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Metrics_Cache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Metrics_Cache_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Min_Max.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MMAP_Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Module.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Admin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Admin_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Control_Action.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Control_Types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Point_Registry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Size.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Msg_WFMO_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Multihomed_INET_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Name_Proxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Name_Request_Reply.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Name_Space.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Naming_Context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Netlink_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Node.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Notification_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Notification_Strategy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="NT_Service.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Null_Barrier.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Null_Condition.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Null_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Null_Semaphore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Numeric_Limits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Obchunk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Object_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Object_Manager_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Obstack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Obstack_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_Errno.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\arpa\os_inet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\net\os_if.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\netinet\os_in.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\netinet\os_tcp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_aio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_assert.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_byteswap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_complex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_cpio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_ctype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_dirent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_dlfcn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_errno.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_fcntl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_fenv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_float.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_fmtmsg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_fnmatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_ftw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_glob.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_grp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_iconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_intrin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_inttypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_iso646.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_kstat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_langinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_libgen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_limits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_local.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_math.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_monetary.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_mqueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_ndbm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_netdb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_nl_types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_pdh.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_pdhmsg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_poll.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_pthread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_pwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_regex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_sched.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_search.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_semaphore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_setjmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_signal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_spawn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_stdarg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_stdbool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_stddef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_stdint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_stdio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_stdlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_string.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_strings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_stropts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_syslog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_tar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_termios.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_tgmath.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_typeinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_ucontext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_ulimit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_unistd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_utime.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_utmpx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_wchar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_wctype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\os_wordexp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_ipc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_loadavg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_mman.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_pstat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_select.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_sem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_shm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_socket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_stat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_statvfs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_sysctl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_sysinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_timeb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_times.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_uio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_un.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_utsname.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os_include\sys\os_wait.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_Log_Msg_Attributes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_Memory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_arpa_inet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_ctype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_dirent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_dlfcn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_errno.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_fcntl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_macros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_math.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_netdb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_poll.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_pwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_regex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_signal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_stdio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_stdlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_string.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_strings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_stropts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_mman.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_select.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_sendfile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_shm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_socket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_stat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_uio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_utsname.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_sys_wait.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_Thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_unistd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_wchar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_NS_wctype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_QoS.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_Thread_Adapter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OS_TLI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Pagefile_Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Pair_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Parse_Node.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PI_Malloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Ping_Socket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Pipe.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="POSIX_Asynch_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="POSIX_CB_Proactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="POSIX_Proactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="post.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pre.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Priority_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Proactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Proactor_Impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Process.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Process_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Process_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Process_Semaphore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Profile_Timer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RB_Tree.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Reactor_Impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Reactor_Notification_Strategy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Reactor_Timer_Interface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Reactor_Token_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Read_Buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Recursive_Thread_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Recyclable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Refcountable_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Refcounted_Auto_Ptr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Registry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Registry_Name_Space.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Remote_Name_Space.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Remote_Tokens.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Reverse_Lock_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RW_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RW_Process_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RW_Thread_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Sample_History.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Sbrk_Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Sched_Params.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Select_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Select_Reactor_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Select_Reactor_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Semaphore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Service_Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Service_Gestalt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Service_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Service_Object.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Service_Repository.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Service_Types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Shared_Memory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Shared_Memory_MM.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Shared_Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Shared_Memory_SV.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Shared_Object.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Sig_Adapter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Sig_Handler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Signal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Singleton.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_CODgram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Sock_Connect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_Dgram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_Dgram_Bcast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_Dgram_Mcast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_Netlink.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_SEQPACK_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_SEQPACK_Association.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_SEQPACK_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SPIPE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SPIPE_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SPIPE_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SPIPE_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SPIPE_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SString.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SStringfwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Stack_Trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Static_Object_Lock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Stats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Strategies.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Strategies_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Stream_Modules.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="streams.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="String_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="String_Base_Const.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SUN_Proactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SV_Message.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SV_Message_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SV_Semaphore_Complex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SV_Semaphore_Simple.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SV_Shared_Memory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Svc_Conf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Svc_Conf_Lexer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Svc_Conf_Param.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Svc_Conf_Token_Table.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Svc_Conf_Tokens.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="svc_export.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Svc_Handler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Synch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Synch_Options.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Synch_Traits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="System_Time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Task.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Task_Ex_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Task_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Test_and_Set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Thread_Adapter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Thread_Control.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Thread_Exit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Thread_Hook.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Thread_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Thread_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Thread_Semaphore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Throughput_Stats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Time_Value.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timeprobe.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timeprobe_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_Hash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_Hash_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_Heap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_Heap_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_List.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_List_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_Queue_Adapters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_Queue_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_Queuefwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_Wheel.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer_Wheel_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TLI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TLI_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TLI_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TLI_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Token.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Token_Collection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Token_Invariants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Token_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Token_Request_Reply.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Tokenizer_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TP_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Truncate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TSS_Adapter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TSS_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TTY_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Typed_SV_Message.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Typed_SV_Message_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Unbounded_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Unbounded_Set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Unbounded_Set_Ex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UNIX_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UPIPE_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UPIPE_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UPIPE_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UPIPE_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UTF16_Encoding_Converter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UTF32_Encoding_Converter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UTF8_Encoding_Converter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UUID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Value_Ptr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Vector_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Versioned_Namespace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WFMO_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WIN32_Asynch_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WIN32_Proactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="XML_Svc_Conf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="XTI_ATM_Mcast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ace.mpc">
+      <Filter>Build Files</Filter>
+    </None>
+    <None Include="ace.mwc">
+      <Filter>Build Files</Filter>
+    </None>
+    <None Include="ace_for_tao.mpc">
+      <Filter>Build Files</Filter>
+    </None>
+    <None Include="codecs.mpb">
+      <Filter>Build Files</Filter>
+    </None>
+    <None Include="filecache.mpb">
+      <Filter>Build Files</Filter>
+    </None>
+    <None Include="other.mpb">
+      <Filter>Build Files</Filter>
+    </None>
+    <None Include="svcconf.mpb">
+      <Filter>Build Files</Filter>
+    </None>
+    <None Include="svcconfgen.mpc">
+      <Filter>Build Files</Filter>
+    </None>
+    <None Include="token.mpb">
+      <Filter>Build Files</Filter>
+    </None>
+    <None Include="uuid.mpb">
+      <Filter>Build Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\AUTHORS">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\bin\add_rel_link.sh">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\bin\DependencyGenerator">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\bin\depgen.pl">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\bin\MakeProjectCreator">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\bin\mpc.pl">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\bin\mwc.pl">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\COPYING">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\docs">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\include\makeinclude">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\NEWS">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\PROBLEM-REPORT-FORM">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\README">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\THANKS">
+      <Filter>Installdata Files</Filter>
+    </None>
+    <None Include="..\VERSION">
+      <Filter>Installdata Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ACE.pc.in">
+      <Filter>Pkgconfig Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ACE.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="ace_wchar.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Activation_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Active_Map_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Active_Map_Manager_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="ARGV.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Argv_Type_Converter.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Array_Base.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Array_Map.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Asynch_IO_Impl.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="ATM_Acceptor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="ATM_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="ATM_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="ATM_Params.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="ATM_QoS.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="ATM_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Atomic_Op.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Atomic_Op_GCC_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Atomic_Op_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Auto_Event.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Auto_Functor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Auto_IncDec_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Auto_Ptr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Barrier.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Base_Thread_Adapter.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Based_Pointer_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Basic_Stats.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Basic_Types.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Bound_Ptr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Cache_Map_Manager_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Caching_Strategies_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Capabilities.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="CDR_Base.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="CDR_Size.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="CDR_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Cleanup.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Codeset_Registry.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Condition_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Condition_Thread_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Configuration.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Containers.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Containers_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Countdown_Time.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Date_Time.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="DEV.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="DEV_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="DEV_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="DEV_IO.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Dev_Poll_Reactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Dirent.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Dirent_Selector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Dynamic.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Dynamic_Message_Strategy.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Dynamic_Service.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Env_Value_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Event.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Event_Handler.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Event_Handler_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="FIFO.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="FIFO_Recv.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="FIFO_Recv_Msg.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="FIFO_Send.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="FIFO_Send_Msg.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="FILE.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="FILE_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="FILE_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="FILE_IO.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="File_Lock.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Flag_Manip.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Framework_Component.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Functor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Functor_String.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Functor_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Get_Opt.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Guard_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Handle_Gobbler.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Handle_Set.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Hash_Cache_Map_Manager_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Hash_Map_Manager_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Hash_Map_With_Allocator_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Hash_Multi_Map_Manager_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Hashable.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="High_Res_Timer.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="INET_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Intrusive_Auto_Ptr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Intrusive_List.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Intrusive_List_Node.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="IO_Cntl_Msg.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="IO_SAP.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="IOStream_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="IPC_SAP.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Local_Tokens.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Lock.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Lock_Adapter_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Log_Msg.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Log_Record.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="LSOCK.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="LSOCK_CODgram.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="LSOCK_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="LSOCK_Dgram.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="LSOCK_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Malloc.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Malloc_Allocator.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Malloc_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Managed_Object.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Manual_Event.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Map_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Map_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="MEM_Acceptor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="MEM_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="MEM_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="MEM_IO.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Mem_Map.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="MEM_SAP.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="MEM_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Message_Block.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Message_Block_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Message_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Message_Queue_NT.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Message_Queue_Vx.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Metrics_Cache_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="MMAP_Memory_Pool.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Module.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Monitor_Base.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Msg_WFMO_Reactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Multihomed_INET_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Naming_Context.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Netlink_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Notification_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Notification_Strategy.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="NT_Service.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Obchunk.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Object_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Obstack_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_Errno.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_Log_Msg_Attributes.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_arpa_inet.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_ctype.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_dirent.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_dlfcn.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_errno.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_fcntl.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_math.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_netdb.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_poll.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_pwd.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_regex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_signal.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_stdio.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_stdlib.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_string.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_strings.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_stropts.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_sys_mman.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_sys_msg.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_sys_resource.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_sys_select.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_sys_sendfile.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_sys_shm.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_sys_socket.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_sys_stat.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_sys_time.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_sys_uio.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_sys_wait.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_Thread.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_time.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_unistd.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_wchar.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_NS_wctype.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="OS_TLI.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Pagefile_Memory_Pool.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Pair_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="PI_Malloc.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Ping_Socket.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Pipe.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="POSIX_Proactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Proactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Process.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Process_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Process_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Process_Semaphore.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Profile_Timer.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="RB_Tree.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Reactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Reactor_Notification_Strategy.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Read_Buffer.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Recursive_Thread_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Recyclable.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Refcountable_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Refcounted_Auto_Ptr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Remote_Tokens.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Reverse_Lock_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="RW_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="RW_Process_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="RW_Thread_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Sample_History.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Sched_Params.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Select_Reactor_Base.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Select_Reactor_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Semaphore.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Service_Config.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Service_Gestalt.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Service_Object.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Service_Repository.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Service_Types.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Shared_Memory_MM.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Shared_Memory_SV.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Shared_Object.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Sig_Handler.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Signal.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Singleton.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_Acceptor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_CODgram.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_Dgram.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_Dgram_Bcast.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_Dgram_Mcast.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_IO.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_Netlink.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_SEQPACK_Acceptor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_SEQPACK_Association.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_SEQPACK_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SPIPE.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SPIPE_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SPIPE_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SPIPE_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SString.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Stats.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Strategies_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="String_Base.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SV_Message.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SV_Message_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SV_Semaphore_Complex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SV_Semaphore_Simple.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SV_Shared_Memory.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Task.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Task_Ex_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Task_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Thread.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Thread_Adapter.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Thread_Control.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Thread_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Thread_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Thread_Semaphore.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Time_Value.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Timeprobe.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Timer_Queue_Adapters.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Timer_Queue_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="TLI.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="TLI_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="TLI_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Token.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Token_Collection.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Token_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Token_Request_Reply.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="TP_Reactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="TSS_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Typed_SV_Message.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Typed_SV_Message_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Unbounded_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Unbounded_Set.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Unbounded_Set_Ex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="UNIX_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="UPIPE_Acceptor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="UPIPE_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="UPIPE_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="UTF16_Encoding_Converter.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="UUID.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="Vector_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="WFMO_Reactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="XTI_ATM_Mcast.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Acceptor.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Active_Map_Manager_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Arg_Shifter.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ARGV.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Array_Base.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Array_Map.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Asynch_Acceptor.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Asynch_Connector.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Atomic_Op_GCC_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Atomic_Op_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Auto_Functor.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Auto_IncDec_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Auto_Ptr.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Based_Pointer_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Cache_Map_Manager_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Cached_Connect_Strategy_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Caching_Strategies_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Caching_Utility_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Cleanup_Strategies_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Condition_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Connector.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Containers_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Dump_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Dynamic_Service.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Env_Value_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Event_Handler_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Framework_Component_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Free_List.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Functor_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Future.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Future_Set.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Guard_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Hash_Cache_Map_Manager_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Hash_Map_Manager_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Hash_Map_With_Allocator_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Hash_Multi_Map_Manager_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Intrusive_Auto_Ptr.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Intrusive_List.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Intrusive_List_Node.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="IOStream_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Local_Name_Space_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Lock_Adapter_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LOCK_SOCK_Acceptor.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Malloc_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Managed_Object.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Map_Manager.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Map_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Message_Block_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Message_Queue_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Metrics_Cache_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Module.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Node.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Obstack_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Pair_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RB_Tree.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Reactor_Token_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Refcountable_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Refcounted_Auto_Ptr.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Reverse_Lock_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Select_Reactor_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Singleton.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Strategies_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Stream.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Stream_Modules.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="String_Base.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Svc_Handler.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Task_Ex_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Task_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Test_and_Set.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Timeprobe_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Timer_Hash_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Timer_Heap_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Timer_List_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Timer_Queue_Adapters.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Timer_Queue_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Timer_Wheel_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Tokenizer_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TSS_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Typed_SV_Message.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Typed_SV_Message_Queue.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Unbounded_Queue.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Unbounded_Set.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Unbounded_Set_Ex.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Vector_T.cpp">
+      <Filter>Template Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\VERSION">
+      <Filter>Documentation</Filter>
+    </CustomBuild>
+    <CustomBuild Include="README">
+      <Filter>Documentation</Filter>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ace.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
diff --git a/dep/ACE_wrappers/ace/ACE_vc9.vcproj b/dep/ACE_wrappers/ace/ACE_vc9.vcproj
index d811040013f..e563e20a8a5 100644
--- a/dep/ACE_wrappers/ace/ACE_vc9.vcproj
+++ b/dep/ACE_wrappers/ace/ACE_vc9.vcproj
@@ -1,6869 +1,6869 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ACE"
-	ProjectGUID="{BD537C9A-FECA-1BAD-6757-8A6300006755}"
-	RootNamespace="ACE"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\lib"
-			IntermediateDirectory="Debug\ACE_vc9\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)\ACEd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\lib\ACEd.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\lib"
-			IntermediateDirectory="Release\ACE_vc9\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)\ACE.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\lib\ACE.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\lib"
-			IntermediateDirectory="Debug\ACE_vc9\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)\ACEd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\lib\ACEd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\lib"
-			IntermediateDirectory="Release\ACE_vc9\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)\ACE.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\lib\ACE.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C">
-			<File
-				RelativePath="ACE.cpp">
-			</File>
-			<File
-				RelativePath="ACE_crc32.cpp">
-			</File>
-			<File
-				RelativePath="ACE_crc_ccitt.cpp">
-			</File>
-			<File
-				RelativePath="ace_wchar.cpp">
-			</File>
-			<File
-				RelativePath="Activation_Queue.cpp">
-			</File>
-			<File
-				RelativePath="Active_Map_Manager.cpp">
-			</File>
-			<File
-				RelativePath="Addr.cpp">
-			</File>
-			<File
-				RelativePath="Argv_Type_Converter.cpp">
-			</File>
-			<File
-				RelativePath="Assert.cpp">
-			</File>
-			<File
-				RelativePath="Asynch_IO.cpp">
-			</File>
-			<File
-				RelativePath="Asynch_IO_Impl.cpp">
-			</File>
-			<File
-				RelativePath="Asynch_Pseudo_Task.cpp">
-			</File>
-			<File
-				RelativePath="ATM_Acceptor.cpp">
-			</File>
-			<File
-				RelativePath="ATM_Addr.cpp">
-			</File>
-			<File
-				RelativePath="ATM_Connector.cpp">
-			</File>
-			<File
-				RelativePath="ATM_Params.cpp">
-			</File>
-			<File
-				RelativePath="ATM_QoS.cpp">
-			</File>
-			<File
-				RelativePath="ATM_Stream.cpp">
-			</File>
-			<File
-				RelativePath="Atomic_Op.cpp">
-			</File>
-			<File
-				RelativePath="Atomic_Op_Sparc.c">
-			</File>
-			<File
-				RelativePath="Auto_Event.cpp">
-			</File>
-			<File
-				RelativePath="Barrier.cpp">
-			</File>
-			<File
-				RelativePath="Base_Thread_Adapter.cpp">
-			</File>
-			<File
-				RelativePath="Based_Pointer_Repository.cpp">
-			</File>
-			<File
-				RelativePath="Basic_Stats.cpp">
-			</File>
-			<File
-				RelativePath="Basic_Types.cpp">
-			</File>
-			<File
-				RelativePath="Capabilities.cpp">
-			</File>
-			<File
-				RelativePath="CDR_Base.cpp">
-			</File>
-			<File
-				RelativePath="CDR_Size.cpp">
-			</File>
-			<File
-				RelativePath="CDR_Stream.cpp">
-			</File>
-			<File
-				RelativePath="Cleanup.cpp">
-			</File>
-			<File
-				RelativePath="Codecs.cpp">
-			</File>
-			<File
-				RelativePath="Codeset_IBM1047.cpp">
-			</File>
-			<File
-				RelativePath="Codeset_Registry.cpp">
-			</File>
-			<File
-				RelativePath="Codeset_Registry_db.cpp">
-			</File>
-			<File
-				RelativePath="Condition_Recursive_Thread_Mutex.cpp">
-			</File>
-			<File
-				RelativePath="Condition_Thread_Mutex.cpp">
-			</File>
-			<File
-				RelativePath="Configuration.cpp">
-			</File>
-			<File
-				RelativePath="Configuration_Import_Export.cpp">
-			</File>
-			<File
-				RelativePath="Connection_Recycling_Strategy.cpp">
-			</File>
-			<File
-				RelativePath="Containers.cpp">
-			</File>
-			<File
-				RelativePath="Copy_Disabled.cpp">
-			</File>
-			<File
-				RelativePath="Countdown_Time.cpp">
-			</File>
-			<File
-				RelativePath="Date_Time.cpp">
-			</File>
-			<File
-				RelativePath="DEV.cpp">
-			</File>
-			<File
-				RelativePath="DEV_Addr.cpp">
-			</File>
-			<File
-				RelativePath="DEV_Connector.cpp">
-			</File>
-			<File
-				RelativePath="DEV_IO.cpp">
-			</File>
-			<File
-				RelativePath="Dev_Poll_Reactor.cpp">
-			</File>
-			<File
-				RelativePath="Dirent.cpp">
-			</File>
-			<File
-				RelativePath="Dirent_Selector.cpp">
-			</File>
-			<File
-				RelativePath="DLL.cpp">
-			</File>
-			<File
-				RelativePath="DLL_Manager.cpp">
-			</File>
-			<File
-				RelativePath="Dump.cpp">
-			</File>
-			<File
-				RelativePath="Dynamic.cpp">
-			</File>
-			<File
-				RelativePath="Dynamic_Message_Strategy.cpp">
-			</File>
-			<File
-				RelativePath="Dynamic_Service_Base.cpp">
-			</File>
-			<File
-				RelativePath="Dynamic_Service_Dependency.cpp">
-			</File>
-			<File
-				RelativePath="Encoding_Converter.cpp">
-			</File>
-			<File
-				RelativePath="Encoding_Converter_Factory.cpp">
-			</File>
-			<File
-				RelativePath="Event.cpp">
-			</File>
-			<File
-				RelativePath="Event_Handler.cpp">
-			</File>
-			<File
-				RelativePath="FIFO.cpp">
-			</File>
-			<File
-				RelativePath="FIFO_Recv.cpp">
-			</File>
-			<File
-				RelativePath="FIFO_Recv_Msg.cpp">
-			</File>
-			<File
-				RelativePath="FIFO_Send.cpp">
-			</File>
-			<File
-				RelativePath="FIFO_Send_Msg.cpp">
-			</File>
-			<File
-				RelativePath="FILE.cpp">
-			</File>
-			<File
-				RelativePath="FILE_Addr.cpp">
-			</File>
-			<File
-				RelativePath="FILE_Connector.cpp">
-			</File>
-			<File
-				RelativePath="FILE_IO.cpp">
-			</File>
-			<File
-				RelativePath="File_Lock.cpp">
-			</File>
-			<File
-				RelativePath="Filecache.cpp">
-			</File>
-			<File
-				RelativePath="Flag_Manip.cpp">
-			</File>
-			<File
-				RelativePath="Framework_Component.cpp">
-			</File>
-			<File
-				RelativePath="Functor.cpp">
-			</File>
-			<File
-				RelativePath="Functor_String.cpp">
-			</File>
-			<File
-				RelativePath="Get_Opt.cpp">
-			</File>
-			<File
-				RelativePath="gethrtime.cpp">
-			</File>
-			<File
-				RelativePath="Handle_Ops.cpp">
-			</File>
-			<File
-				RelativePath="Handle_Set.cpp">
-			</File>
-			<File
-				RelativePath="Hashable.cpp">
-			</File>
-			<File
-				RelativePath="High_Res_Timer.cpp">
-			</File>
-			<File
-				RelativePath="ICMP_Socket.cpp">
-			</File>
-			<File
-				RelativePath="INET_Addr.cpp">
-			</File>
-			<File
-				RelativePath="Init_ACE.cpp">
-			</File>
-			<File
-				RelativePath="IO_Cntl_Msg.cpp">
-			</File>
-			<File
-				RelativePath="IO_SAP.cpp">
-			</File>
-			<File
-				RelativePath="IOStream.cpp">
-			</File>
-			<File
-				RelativePath="IPC_SAP.cpp">
-			</File>
-			<File
-				RelativePath="Lib_Find.cpp">
-			</File>
-			<File
-				RelativePath="Local_Memory_Pool.cpp">
-			</File>
-			<File
-				RelativePath="Local_Name_Space.cpp">
-			</File>
-			<File
-				RelativePath="Local_Tokens.cpp">
-			</File>
-			<File
-				RelativePath="Lock.cpp">
-			</File>
-			<File
-				RelativePath="Log_Msg.cpp">
-			</File>
-			<File
-				RelativePath="Log_Msg_Backend.cpp">
-			</File>
-			<File
-				RelativePath="Log_Msg_Callback.cpp">
-			</File>
-			<File
-				RelativePath="Log_Msg_IPC.cpp">
-			</File>
-			<File
-				RelativePath="Log_Msg_NT_Event_Log.cpp">
-			</File>
-			<File
-				RelativePath="Log_Msg_UNIX_Syslog.cpp">
-			</File>
-			<File
-				RelativePath="Log_Record.cpp">
-			</File>
-			<File
-				RelativePath="Logging_Strategy.cpp">
-			</File>
-			<File
-				RelativePath="LSOCK.cpp">
-			</File>
-			<File
-				RelativePath="LSOCK_Acceptor.cpp">
-			</File>
-			<File
-				RelativePath="LSOCK_CODgram.cpp">
-			</File>
-			<File
-				RelativePath="LSOCK_Connector.cpp">
-			</File>
-			<File
-				RelativePath="LSOCK_Dgram.cpp">
-			</File>
-			<File
-				RelativePath="LSOCK_Stream.cpp">
-			</File>
-			<File
-				RelativePath="Malloc.cpp">
-			</File>
-			<File
-				RelativePath="Malloc_Allocator.cpp">
-			</File>
-			<File
-				RelativePath="Manual_Event.cpp">
-			</File>
-			<File
-				RelativePath="MEM_Acceptor.cpp">
-			</File>
-			<File
-				RelativePath="MEM_Addr.cpp">
-			</File>
-			<File
-				RelativePath="MEM_Connector.cpp">
-			</File>
-			<File
-				RelativePath="MEM_IO.cpp">
-			</File>
-			<File
-				RelativePath="Mem_Map.cpp">
-			</File>
-			<File
-				RelativePath="MEM_SAP.cpp">
-			</File>
-			<File
-				RelativePath="MEM_Stream.cpp">
-			</File>
-			<File
-				RelativePath="Message_Block.cpp">
-			</File>
-			<File
-				RelativePath="Message_Queue.cpp">
-			</File>
-			<File
-				RelativePath="Message_Queue_NT.cpp">
-			</File>
-			<File
-				RelativePath="Message_Queue_Vx.cpp">
-			</File>
-			<File
-				RelativePath="Method_Request.cpp">
-			</File>
-			<File
-				RelativePath="MMAP_Memory_Pool.cpp">
-			</File>
-			<File
-				RelativePath="Monitor_Admin.cpp">
-			</File>
-			<File
-				RelativePath="Monitor_Admin_Manager.cpp">
-			</File>
-			<File
-				RelativePath="Monitor_Base.cpp">
-			</File>
-			<File
-				RelativePath="Monitor_Control_Action.cpp">
-			</File>
-			<File
-				RelativePath="Monitor_Control_Types.cpp">
-			</File>
-			<File
-				RelativePath="Monitor_Point_Registry.cpp">
-			</File>
-			<File
-				RelativePath="Monitor_Size.cpp">
-			</File>
-			<File
-				RelativePath="Msg_WFMO_Reactor.cpp">
-			</File>
-			<File
-				RelativePath="Multihomed_INET_Addr.cpp">
-			</File>
-			<File
-				RelativePath="Mutex.cpp">
-			</File>
-			<File
-				RelativePath="Name_Proxy.cpp">
-			</File>
-			<File
-				RelativePath="Name_Request_Reply.cpp">
-			</File>
-			<File
-				RelativePath="Name_Space.cpp">
-			</File>
-			<File
-				RelativePath="Naming_Context.cpp">
-			</File>
-			<File
-				RelativePath="Netlink_Addr.cpp">
-			</File>
-			<File
-				RelativePath="Notification_Queue.cpp">
-			</File>
-			<File
-				RelativePath="Notification_Strategy.cpp">
-			</File>
-			<File
-				RelativePath="NT_Service.cpp">
-			</File>
-			<File
-				RelativePath="Obchunk.cpp">
-			</File>
-			<File
-				RelativePath="Object_Manager.cpp">
-			</File>
-			<File
-				RelativePath="Object_Manager_Base.cpp">
-			</File>
-			<File
-				RelativePath="OS_Errno.cpp">
-			</File>
-			<File
-				RelativePath="OS_Log_Msg_Attributes.cpp">
-			</File>
-			<File
-				RelativePath="OS_main.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_arpa_inet.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_ctype.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_dirent.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_dlfcn.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_errno.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_fcntl.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_math.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_netdb.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_poll.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_pwd.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_regex.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_signal.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_stdio.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_stdlib.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_string.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_strings.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_stropts.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_mman.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_msg.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_resource.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_select.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_sendfile.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_shm.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_socket.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_stat.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_time.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_uio.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_utsname.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_wait.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_Thread.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_time.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_unistd.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_wchar.cpp">
-			</File>
-			<File
-				RelativePath="OS_NS_wctype.cpp">
-			</File>
-			<File
-				RelativePath="OS_QoS.cpp">
-			</File>
-			<File
-				RelativePath="OS_Thread_Adapter.cpp">
-			</File>
-			<File
-				RelativePath="OS_TLI.cpp">
-			</File>
-			<File
-				RelativePath="Pagefile_Memory_Pool.cpp">
-			</File>
-			<File
-				RelativePath="Parse_Node.cpp">
-			</File>
-			<File
-				RelativePath="PI_Malloc.cpp">
-			</File>
-			<File
-				RelativePath="Ping_Socket.cpp">
-			</File>
-			<File
-				RelativePath="Pipe.cpp">
-			</File>
-			<File
-				RelativePath="POSIX_Asynch_IO.cpp">
-			</File>
-			<File
-				RelativePath="POSIX_CB_Proactor.cpp">
-			</File>
-			<File
-				RelativePath="POSIX_Proactor.cpp">
-			</File>
-			<File
-				RelativePath="Priority_Reactor.cpp">
-			</File>
-			<File
-				RelativePath="Proactor.cpp">
-			</File>
-			<File
-				RelativePath="Proactor_Impl.cpp">
-			</File>
-			<File
-				RelativePath="Process.cpp">
-			</File>
-			<File
-				RelativePath="Process_Manager.cpp">
-			</File>
-			<File
-				RelativePath="Process_Mutex.cpp">
-			</File>
-			<File
-				RelativePath="Process_Semaphore.cpp">
-			</File>
-			<File
-				RelativePath="Profile_Timer.cpp">
-			</File>
-			<File
-				RelativePath="Reactor.cpp">
-			</File>
-			<File
-				RelativePath="Reactor_Impl.cpp">
-			</File>
-			<File
-				RelativePath="Reactor_Notification_Strategy.cpp">
-			</File>
-			<File
-				RelativePath="Reactor_Timer_Interface.cpp">
-			</File>
-			<File
-				RelativePath="Read_Buffer.cpp">
-			</File>
-			<File
-				RelativePath="Recursive_Thread_Mutex.cpp">
-			</File>
-			<File
-				RelativePath="Recyclable.cpp">
-			</File>
-			<File
-				RelativePath="Registry.cpp">
-			</File>
-			<File
-				RelativePath="Registry_Name_Space.cpp">
-			</File>
-			<File
-				RelativePath="Remote_Name_Space.cpp">
-			</File>
-			<File
-				RelativePath="Remote_Tokens.cpp">
-			</File>
-			<File
-				RelativePath="Rtems_init.c">
-			</File>
-			<File
-				RelativePath="RW_Mutex.cpp">
-			</File>
-			<File
-				RelativePath="RW_Process_Mutex.cpp">
-			</File>
-			<File
-				RelativePath="RW_Thread_Mutex.cpp">
-			</File>
-			<File
-				RelativePath="Sample_History.cpp">
-			</File>
-			<File
-				RelativePath="Sbrk_Memory_Pool.cpp">
-			</File>
-			<File
-				RelativePath="Sched_Params.cpp">
-			</File>
-			<File
-				RelativePath="Select_Reactor_Base.cpp">
-			</File>
-			<File
-				RelativePath="Semaphore.cpp">
-			</File>
-			<File
-				RelativePath="Service_Config.cpp">
-			</File>
-			<File
-				RelativePath="Service_Gestalt.cpp">
-			</File>
-			<File
-				RelativePath="Service_Manager.cpp">
-			</File>
-			<File
-				RelativePath="Service_Object.cpp">
-			</File>
-			<File
-				RelativePath="Service_Repository.cpp">
-			</File>
-			<File
-				RelativePath="Service_Types.cpp">
-			</File>
-			<File
-				RelativePath="Shared_Memory.cpp">
-			</File>
-			<File
-				RelativePath="Shared_Memory_MM.cpp">
-			</File>
-			<File
-				RelativePath="Shared_Memory_Pool.cpp">
-			</File>
-			<File
-				RelativePath="Shared_Memory_SV.cpp">
-			</File>
-			<File
-				RelativePath="Shared_Object.cpp">
-			</File>
-			<File
-				RelativePath="Sig_Adapter.cpp">
-			</File>
-			<File
-				RelativePath="Sig_Handler.cpp">
-			</File>
-			<File
-				RelativePath="Signal.cpp">
-			</File>
-			<File
-				RelativePath="SOCK.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_Acceptor.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_CODgram.cpp">
-			</File>
-			<File
-				RelativePath="Sock_Connect.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_Connector.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Bcast.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Mcast.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_IO.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_Netlink.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_SEQPACK_Acceptor.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_SEQPACK_Association.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_SEQPACK_Connector.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_Stream.cpp">
-			</File>
-			<File
-				RelativePath="SPIPE.cpp">
-			</File>
-			<File
-				RelativePath="SPIPE_Acceptor.cpp">
-			</File>
-			<File
-				RelativePath="SPIPE_Addr.cpp">
-			</File>
-			<File
-				RelativePath="SPIPE_Connector.cpp">
-			</File>
-			<File
-				RelativePath="SPIPE_Stream.cpp">
-			</File>
-			<File
-				RelativePath="SString.cpp">
-			</File>
-			<File
-				RelativePath="Stack_Trace.cpp">
-			</File>
-			<File
-				RelativePath="Stats.cpp">
-			</File>
-			<File
-				RelativePath="String_Base_Const.cpp">
-			</File>
-			<File
-				RelativePath="SUN_Proactor.cpp">
-			</File>
-			<File
-				RelativePath="SV_Message.cpp">
-			</File>
-			<File
-				RelativePath="SV_Message_Queue.cpp">
-			</File>
-			<File
-				RelativePath="SV_Semaphore_Complex.cpp">
-			</File>
-			<File
-				RelativePath="SV_Semaphore_Simple.cpp">
-			</File>
-			<File
-				RelativePath="SV_Shared_Memory.cpp">
-			</File>
-			<File
-				RelativePath="Svc_Conf_Lexer.cpp">
-			</File>
-			<File
-				RelativePath="Svc_Conf_y.cpp">
-			</File>
-			<File
-				RelativePath="Synch_Options.cpp">
-			</File>
-			<File
-				RelativePath="System_Time.cpp">
-			</File>
-			<File
-				RelativePath="Task.cpp">
-			</File>
-			<File
-				RelativePath="Thread.cpp">
-			</File>
-			<File
-				RelativePath="Thread_Adapter.cpp">
-			</File>
-			<File
-				RelativePath="Thread_Control.cpp">
-			</File>
-			<File
-				RelativePath="Thread_Exit.cpp">
-			</File>
-			<File
-				RelativePath="Thread_Hook.cpp">
-			</File>
-			<File
-				RelativePath="Thread_Manager.cpp">
-			</File>
-			<File
-				RelativePath="Thread_Mutex.cpp">
-			</File>
-			<File
-				RelativePath="Thread_Semaphore.cpp">
-			</File>
-			<File
-				RelativePath="Throughput_Stats.cpp">
-			</File>
-			<File
-				RelativePath="Time_Value.cpp">
-			</File>
-			<File
-				RelativePath="Timeprobe.cpp">
-			</File>
-			<File
-				RelativePath="TLI.cpp">
-			</File>
-			<File
-				RelativePath="TLI_Acceptor.cpp">
-			</File>
-			<File
-				RelativePath="TLI_Connector.cpp">
-			</File>
-			<File
-				RelativePath="TLI_Stream.cpp">
-			</File>
-			<File
-				RelativePath="Token.cpp">
-			</File>
-			<File
-				RelativePath="Token_Collection.cpp">
-			</File>
-			<File
-				RelativePath="Token_Invariants.cpp">
-			</File>
-			<File
-				RelativePath="Token_Manager.cpp">
-			</File>
-			<File
-				RelativePath="Token_Request_Reply.cpp">
-			</File>
-			<File
-				RelativePath="TP_Reactor.cpp">
-			</File>
-			<File
-				RelativePath="Trace.cpp">
-			</File>
-			<File
-				RelativePath="TSS_Adapter.cpp">
-			</File>
-			<File
-				RelativePath="TTY_IO.cpp">
-			</File>
-			<File
-				RelativePath="UNIX_Addr.cpp">
-			</File>
-			<File
-				RelativePath="UPIPE_Acceptor.cpp">
-			</File>
-			<File
-				RelativePath="UPIPE_Connector.cpp">
-			</File>
-			<File
-				RelativePath="UPIPE_Stream.cpp">
-			</File>
-			<File
-				RelativePath="UTF16_Encoding_Converter.cpp">
-			</File>
-			<File
-				RelativePath="UTF32_Encoding_Converter.cpp">
-			</File>
-			<File
-				RelativePath="UTF8_Encoding_Converter.cpp">
-			</File>
-			<File
-				RelativePath="UUID.cpp">
-			</File>
-			<File
-				RelativePath="WFMO_Reactor.cpp">
-			</File>
-			<File
-				RelativePath="WIN32_Asynch_IO.cpp">
-			</File>
-			<File
-				RelativePath="WIN32_Proactor.cpp">
-			</File>
-			<File
-				RelativePath="XML_Svc_Conf.cpp">
-			</File>
-			<File
-				RelativePath="XTI_ATM_Mcast.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hh">
-			<File
-				RelativePath="Acceptor.h">
-			</File>
-			<File
-				RelativePath="ACE.h">
-			</File>
-			<File
-				RelativePath="ACE_export.h">
-			</File>
-			<File
-				RelativePath="ace_wchar.h">
-			</File>
-			<File
-				RelativePath="Activation_Queue.h">
-			</File>
-			<File
-				RelativePath="Active_Map_Manager.h">
-			</File>
-			<File
-				RelativePath="Active_Map_Manager_T.h">
-			</File>
-			<File
-				RelativePath="Addr.h">
-			</File>
-			<File
-				RelativePath="Arg_Shifter.h">
-			</File>
-			<File
-				RelativePath="ARGV.h">
-			</File>
-			<File
-				RelativePath="Argv_Type_Converter.h">
-			</File>
-			<File
-				RelativePath="Array_Base.h">
-			</File>
-			<File
-				RelativePath="Array_Map.h">
-			</File>
-			<File
-				RelativePath="Assert.h">
-			</File>
-			<File
-				RelativePath="Asynch_Acceptor.h">
-			</File>
-			<File
-				RelativePath="Asynch_Connector.h">
-			</File>
-			<File
-				RelativePath="Asynch_IO.h">
-			</File>
-			<File
-				RelativePath="Asynch_IO_Impl.h">
-			</File>
-			<File
-				RelativePath="Asynch_Pseudo_Task.h">
-			</File>
-			<File
-				RelativePath="ATM_Acceptor.h">
-			</File>
-			<File
-				RelativePath="ATM_Addr.h">
-			</File>
-			<File
-				RelativePath="ATM_Connector.h">
-			</File>
-			<File
-				RelativePath="ATM_Params.h">
-			</File>
-			<File
-				RelativePath="ATM_QoS.h">
-			</File>
-			<File
-				RelativePath="ATM_Stream.h">
-			</File>
-			<File
-				RelativePath="Atomic_Op.h">
-			</File>
-			<File
-				RelativePath="Atomic_Op_GCC_T.h">
-			</File>
-			<File
-				RelativePath="Atomic_Op_Sparc.h">
-			</File>
-			<File
-				RelativePath="Atomic_Op_T.h">
-			</File>
-			<File
-				RelativePath="Auto_Event.h">
-			</File>
-			<File
-				RelativePath="Auto_Functor.h">
-			</File>
-			<File
-				RelativePath="Auto_IncDec_T.h">
-			</File>
-			<File
-				RelativePath="Auto_Ptr.h">
-			</File>
-			<File
-				RelativePath="Barrier.h">
-			</File>
-			<File
-				RelativePath="Base_Thread_Adapter.h">
-			</File>
-			<File
-				RelativePath="Based_Pointer_Repository.h">
-			</File>
-			<File
-				RelativePath="Based_Pointer_T.h">
-			</File>
-			<File
-				RelativePath="Basic_Stats.h">
-			</File>
-			<File
-				RelativePath="Basic_Types.h">
-			</File>
-			<File
-				RelativePath="Bound_Ptr.h">
-			</File>
-			<File
-				RelativePath="Cache_Map_Manager_T.h">
-			</File>
-			<File
-				RelativePath="Cached_Connect_Strategy_T.h">
-			</File>
-			<File
-				RelativePath="Caching_Strategies_T.h">
-			</File>
-			<File
-				RelativePath="Caching_Utility_T.h">
-			</File>
-			<File
-				RelativePath="Capabilities.h">
-			</File>
-			<File
-				RelativePath="CDR_Base.h">
-			</File>
-			<File
-				RelativePath="CDR_Size.h">
-			</File>
-			<File
-				RelativePath="CDR_Stream.h">
-			</File>
-			<File
-				RelativePath="CE_Screen_Output.h">
-			</File>
-			<File
-				RelativePath="checked_iterator.h">
-			</File>
-			<File
-				RelativePath="Cleanup.h">
-			</File>
-			<File
-				RelativePath="Cleanup_Strategies_T.h">
-			</File>
-			<File
-				RelativePath="Codecs.h">
-			</File>
-			<File
-				RelativePath="Codeset_IBM1047.h">
-			</File>
-			<File
-				RelativePath="Codeset_Registry.h">
-			</File>
-			<File
-				RelativePath="Codeset_Symbols.h">
-			</File>
-			<File
-				RelativePath="Condition_Recursive_Thread_Mutex.h">
-			</File>
-			<File
-				RelativePath="Condition_T.h">
-			</File>
-			<File
-				RelativePath="Condition_Thread_Mutex.h">
-			</File>
-			<File
-				RelativePath="config-aix-5.x.h">
-			</File>
-			<File
-				RelativePath="config-all.h">
-			</File>
-			<File
-				RelativePath="config-cygwin32.h">
-			</File>
-			<File
-				RelativePath="config-doxygen.h">
-			</File>
-			<File
-				RelativePath="config-freebsd.h">
-			</File>
-			<File
-				RelativePath="config-g++-common.h">
-			</File>
-			<File
-				RelativePath="config-ghs-common.h">
-			</File>
-			<File
-				RelativePath="config-hpux-11.00.h">
-			</File>
-			<File
-				RelativePath="config-icc-common.h">
-			</File>
-			<File
-				RelativePath="config-integritySCA.h">
-			</File>
-			<File
-				RelativePath="config-kfreebsd.h">
-			</File>
-			<File
-				RelativePath="config-linux-common.h">
-			</File>
-			<File
-				RelativePath="config-linux.h">
-			</File>
-			<File
-				RelativePath="config-lite.h">
-			</File>
-			<File
-				RelativePath="config-lynxos.h">
-			</File>
-			<File
-				RelativePath="config-macosx-iphone-hardware.h">
-			</File>
-			<File
-				RelativePath="config-macosx-iphone-simulator.h">
-			</File>
-			<File
-				RelativePath="config-macosx-leopard.h">
-			</File>
-			<File
-				RelativePath="config-macosx-panther.h">
-			</File>
-			<File
-				RelativePath="config-macosx-snowleopard.h">
-			</File>
-			<File
-				RelativePath="config-macosx-tiger.h">
-			</File>
-			<File
-				RelativePath="config-macosx.h">
-			</File>
-			<File
-				RelativePath="config-macros.h">
-			</File>
-			<File
-				RelativePath="config-minimal.h">
-			</File>
-			<File
-				RelativePath="config-mvs.h">
-			</File>
-			<File
-				RelativePath="config-netbsd.h">
-			</File>
-			<File
-				RelativePath="config-openbsd.h">
-			</File>
-			<File
-				RelativePath="config-openvms.h">
-			</File>
-			<File
-				RelativePath="config-pharlap.h">
-			</File>
-			<File
-				RelativePath="config-posix-nonetworking.h">
-			</File>
-			<File
-				RelativePath="config-posix.h">
-			</File>
-			<File
-				RelativePath="config-qnx-neutrino.h">
-			</File>
-			<File
-				RelativePath="config-qnx-rtp-62x.h">
-			</File>
-			<File
-				RelativePath="config-qnx-rtp-common.h">
-			</File>
-			<File
-				RelativePath="config-qnx-rtp-pre62x.h">
-			</File>
-			<File
-				RelativePath="config-qnx-rtp.h">
-			</File>
-			<File
-				RelativePath="config-rtems.h">
-			</File>
-			<File
-				RelativePath="config-suncc-common.h">
-			</File>
-			<File
-				RelativePath="config-sunos5.10.h">
-			</File>
-			<File
-				RelativePath="config-sunos5.11.h">
-			</File>
-			<File
-				RelativePath="config-sunos5.4-g++.h">
-			</File>
-			<File
-				RelativePath="config-sunos5.4-sunc++-4.x.h">
-			</File>
-			<File
-				RelativePath="config-sunos5.5.h">
-			</File>
-			<File
-				RelativePath="config-sunos5.6.h">
-			</File>
-			<File
-				RelativePath="config-sunos5.7.h">
-			</File>
-			<File
-				RelativePath="config-sunos5.8.h">
-			</File>
-			<File
-				RelativePath="config-sunos5.9.h">
-			</File>
-			<File
-				RelativePath="config-tandem-nsk-mips-v2.h">
-			</File>
-			<File
-				RelativePath="config-tandem-nsk-mips-v3.h">
-			</File>
-			<File
-				RelativePath="config-tandem.h">
-			</File>
-			<File
-				RelativePath="config-visualage.h">
-			</File>
-			<File
-				RelativePath="config-vxworks.h">
-			</File>
-			<File
-				RelativePath="config-vxworks6.4.h">
-			</File>
-			<File
-				RelativePath="config-vxworks6.5.h">
-			</File>
-			<File
-				RelativePath="config-vxworks6.6.h">
-			</File>
-			<File
-				RelativePath="config-vxworks6.7.h">
-			</File>
-			<File
-				RelativePath="config-vxworks6.8.h">
-			</File>
-			<File
-				RelativePath="config-win32-borland.h">
-			</File>
-			<File
-				RelativePath="config-win32-cegcc.h">
-			</File>
-			<File
-				RelativePath="config-win32-common.h">
-			</File>
-			<File
-				RelativePath="config-win32-dmc.h">
-			</File>
-			<File
-				RelativePath="config-win32-interix.h">
-			</File>
-			<File
-				RelativePath="config-win32-mingw.h">
-			</File>
-			<File
-				RelativePath="config-win32-msvc-10.h">
-			</File>
-			<File
-				RelativePath="config-win32-msvc-7.h">
-			</File>
-			<File
-				RelativePath="config-win32-msvc-8.h">
-			</File>
-			<File
-				RelativePath="config-win32-msvc-9.h">
-			</File>
-			<File
-				RelativePath="config-win32-msvc.h">
-			</File>
-			<File
-				RelativePath="config-win32.h">
-			</File>
-			<File
-				RelativePath="config-WinCE.h">
-			</File>
-			<File
-				RelativePath="config.h">
-			</File>
-			<File
-				RelativePath="Configuration.h">
-			</File>
-			<File
-				RelativePath="Configuration_Import_Export.h">
-			</File>
-			<File
-				RelativePath="Connection_Recycling_Strategy.h">
-			</File>
-			<File
-				RelativePath="Connector.h">
-			</File>
-			<File
-				RelativePath="Containers.h">
-			</File>
-			<File
-				RelativePath="Containers_T.h">
-			</File>
-			<File
-				RelativePath="Copy_Disabled.h">
-			</File>
-			<File
-				RelativePath="CORBA_macros.h">
-			</File>
-			<File
-				RelativePath="Countdown_Time.h">
-			</File>
-			<File
-				RelativePath="Date_Time.h">
-			</File>
-			<File
-				RelativePath="Default_Constants.h">
-			</File>
-			<File
-				RelativePath="DEV.h">
-			</File>
-			<File
-				RelativePath="DEV_Addr.h">
-			</File>
-			<File
-				RelativePath="DEV_Connector.h">
-			</File>
-			<File
-				RelativePath="DEV_IO.h">
-			</File>
-			<File
-				RelativePath="Dev_Poll_Reactor.h">
-			</File>
-			<File
-				RelativePath="Dirent.h">
-			</File>
-			<File
-				RelativePath="Dirent_Selector.h">
-			</File>
-			<File
-				RelativePath="DLL.h">
-			</File>
-			<File
-				RelativePath="DLL_Manager.h">
-			</File>
-			<File
-				RelativePath="Dump.h">
-			</File>
-			<File
-				RelativePath="Dump_T.h">
-			</File>
-			<File
-				RelativePath="Dynamic.h">
-			</File>
-			<File
-				RelativePath="Dynamic_Message_Strategy.h">
-			</File>
-			<File
-				RelativePath="Dynamic_Service.h">
-			</File>
-			<File
-				RelativePath="Dynamic_Service_Base.h">
-			</File>
-			<File
-				RelativePath="Dynamic_Service_Dependency.h">
-			</File>
-			<File
-				RelativePath="Encoding_Converter.h">
-			</File>
-			<File
-				RelativePath="Encoding_Converter_Factory.h">
-			</File>
-			<File
-				RelativePath="Env_Value_T.h">
-			</File>
-			<File
-				RelativePath="Event.h">
-			</File>
-			<File
-				RelativePath="Event_Handler.h">
-			</File>
-			<File
-				RelativePath="Event_Handler_T.h">
-			</File>
-			<File
-				RelativePath="FIFO.h">
-			</File>
-			<File
-				RelativePath="FIFO_Recv.h">
-			</File>
-			<File
-				RelativePath="FIFO_Recv_Msg.h">
-			</File>
-			<File
-				RelativePath="FIFO_Send.h">
-			</File>
-			<File
-				RelativePath="FIFO_Send_Msg.h">
-			</File>
-			<File
-				RelativePath="FILE.h">
-			</File>
-			<File
-				RelativePath="FILE_Addr.h">
-			</File>
-			<File
-				RelativePath="FILE_Connector.h">
-			</File>
-			<File
-				RelativePath="FILE_IO.h">
-			</File>
-			<File
-				RelativePath="File_Lock.h">
-			</File>
-			<File
-				RelativePath="Filecache.h">
-			</File>
-			<File
-				RelativePath="Flag_Manip.h">
-			</File>
-			<File
-				RelativePath="Framework_Component.h">
-			</File>
-			<File
-				RelativePath="Framework_Component_T.h">
-			</File>
-			<File
-				RelativePath="Free_List.h">
-			</File>
-			<File
-				RelativePath="Functor.h">
-			</File>
-			<File
-				RelativePath="Functor_String.h">
-			</File>
-			<File
-				RelativePath="Functor_T.h">
-			</File>
-			<File
-				RelativePath="Future.h">
-			</File>
-			<File
-				RelativePath="Future_Set.h">
-			</File>
-			<File
-				RelativePath="Get_Opt.h">
-			</File>
-			<File
-				RelativePath="Global_Macros.h">
-			</File>
-			<File
-				RelativePath="Guard_T.h">
-			</File>
-			<File
-				RelativePath="Handle_Gobbler.h">
-			</File>
-			<File
-				RelativePath="Handle_Ops.h">
-			</File>
-			<File
-				RelativePath="Handle_Set.h">
-			</File>
-			<File
-				RelativePath="Hash_Cache_Map_Manager_T.h">
-			</File>
-			<File
-				RelativePath="Hash_Map_Manager.h">
-			</File>
-			<File
-				RelativePath="Hash_Map_Manager_T.h">
-			</File>
-			<File
-				RelativePath="Hash_Map_With_Allocator_T.h">
-			</File>
-			<File
-				RelativePath="Hash_Multi_Map_Manager_T.h">
-			</File>
-			<File
-				RelativePath="Hashable.h">
-			</File>
-			<File
-				RelativePath="High_Res_Timer.h">
-			</File>
-			<File
-				RelativePath="ICMP_Socket.h">
-			</File>
-			<File
-				RelativePath="If_Then_Else.h">
-			</File>
-			<File
-				RelativePath="INET_Addr.h">
-			</File>
-			<File
-				RelativePath="Init_ACE.h">
-			</File>
-			<File
-				RelativePath="Intrusive_Auto_Ptr.h">
-			</File>
-			<File
-				RelativePath="Intrusive_List.h">
-			</File>
-			<File
-				RelativePath="Intrusive_List_Node.h">
-			</File>
-			<File
-				RelativePath="IO_Cntl_Msg.h">
-			</File>
-			<File
-				RelativePath="IO_SAP.h">
-			</File>
-			<File
-				RelativePath="iosfwd.h">
-			</File>
-			<File
-				RelativePath="IOStream.h">
-			</File>
-			<File
-				RelativePath="IOStream_T.h">
-			</File>
-			<File
-				RelativePath="IPC_SAP.h">
-			</File>
-			<File
-				RelativePath="Lib_Find.h">
-			</File>
-			<File
-				RelativePath="Local_Memory_Pool.h">
-			</File>
-			<File
-				RelativePath="Local_Name_Space.h">
-			</File>
-			<File
-				RelativePath="Local_Name_Space_T.h">
-			</File>
-			<File
-				RelativePath="Local_Tokens.h">
-			</File>
-			<File
-				RelativePath="Lock.h">
-			</File>
-			<File
-				RelativePath="Lock_Adapter_T.h">
-			</File>
-			<File
-				RelativePath="LOCK_SOCK_Acceptor.h">
-			</File>
-			<File
-				RelativePath="Log_Msg.h">
-			</File>
-			<File
-				RelativePath="Log_Msg_Backend.h">
-			</File>
-			<File
-				RelativePath="Log_Msg_Callback.h">
-			</File>
-			<File
-				RelativePath="Log_Msg_IPC.h">
-			</File>
-			<File
-				RelativePath="Log_Msg_NT_Event_Log.h">
-			</File>
-			<File
-				RelativePath="Log_Msg_UNIX_Syslog.h">
-			</File>
-			<File
-				RelativePath="Log_Priority.h">
-			</File>
-			<File
-				RelativePath="Log_Record.h">
-			</File>
-			<File
-				RelativePath="Logging_Strategy.h">
-			</File>
-			<File
-				RelativePath="LSOCK.h">
-			</File>
-			<File
-				RelativePath="LSOCK_Acceptor.h">
-			</File>
-			<File
-				RelativePath="LSOCK_CODgram.h">
-			</File>
-			<File
-				RelativePath="LSOCK_Connector.h">
-			</File>
-			<File
-				RelativePath="LSOCK_Dgram.h">
-			</File>
-			<File
-				RelativePath="LSOCK_Stream.h">
-			</File>
-			<File
-				RelativePath="Malloc.h">
-			</File>
-			<File
-				RelativePath="Malloc_Allocator.h">
-			</File>
-			<File
-				RelativePath="Malloc_Base.h">
-			</File>
-			<File
-				RelativePath="Malloc_T.h">
-			</File>
-			<File
-				RelativePath="Managed_Object.h">
-			</File>
-			<File
-				RelativePath="Manual_Event.h">
-			</File>
-			<File
-				RelativePath="Map_Manager.h">
-			</File>
-			<File
-				RelativePath="Map_T.h">
-			</File>
-			<File
-				RelativePath="MEM_Acceptor.h">
-			</File>
-			<File
-				RelativePath="MEM_Addr.h">
-			</File>
-			<File
-				RelativePath="MEM_Connector.h">
-			</File>
-			<File
-				RelativePath="MEM_IO.h">
-			</File>
-			<File
-				RelativePath="Mem_Map.h">
-			</File>
-			<File
-				RelativePath="MEM_SAP.h">
-			</File>
-			<File
-				RelativePath="MEM_Stream.h">
-			</File>
-			<File
-				RelativePath="Memory_Pool.h">
-			</File>
-			<File
-				RelativePath="Message_Block.h">
-			</File>
-			<File
-				RelativePath="Message_Block_T.h">
-			</File>
-			<File
-				RelativePath="Message_Queue.h">
-			</File>
-			<File
-				RelativePath="Message_Queue_NT.h">
-			</File>
-			<File
-				RelativePath="Message_Queue_T.h">
-			</File>
-			<File
-				RelativePath="Message_Queue_Vx.h">
-			</File>
-			<File
-				RelativePath="Method_Request.h">
-			</File>
-			<File
-				RelativePath="Metrics_Cache.h">
-			</File>
-			<File
-				RelativePath="Metrics_Cache_T.h">
-			</File>
-			<File
-				RelativePath="Min_Max.h">
-			</File>
-			<File
-				RelativePath="MMAP_Memory_Pool.h">
-			</File>
-			<File
-				RelativePath="Module.h">
-			</File>
-			<File
-				RelativePath="Monitor_Admin.h">
-			</File>
-			<File
-				RelativePath="Monitor_Admin_Manager.h">
-			</File>
-			<File
-				RelativePath="Monitor_Base.h">
-			</File>
-			<File
-				RelativePath="Monitor_Control_Action.h">
-			</File>
-			<File
-				RelativePath="Monitor_Control_Types.h">
-			</File>
-			<File
-				RelativePath="Monitor_Point_Registry.h">
-			</File>
-			<File
-				RelativePath="Monitor_Size.h">
-			</File>
-			<File
-				RelativePath="Msg_WFMO_Reactor.h">
-			</File>
-			<File
-				RelativePath="Multihomed_INET_Addr.h">
-			</File>
-			<File
-				RelativePath="Mutex.h">
-			</File>
-			<File
-				RelativePath="Name_Proxy.h">
-			</File>
-			<File
-				RelativePath="Name_Request_Reply.h">
-			</File>
-			<File
-				RelativePath="Name_Space.h">
-			</File>
-			<File
-				RelativePath="Naming_Context.h">
-			</File>
-			<File
-				RelativePath="Netlink_Addr.h">
-			</File>
-			<File
-				RelativePath="Node.h">
-			</File>
-			<File
-				RelativePath="Notification_Queue.h">
-			</File>
-			<File
-				RelativePath="Notification_Strategy.h">
-			</File>
-			<File
-				RelativePath="NT_Service.h">
-			</File>
-			<File
-				RelativePath="Null_Barrier.h">
-			</File>
-			<File
-				RelativePath="Null_Condition.h">
-			</File>
-			<File
-				RelativePath="Null_Mutex.h">
-			</File>
-			<File
-				RelativePath="Null_Semaphore.h">
-			</File>
-			<File
-				RelativePath="Numeric_Limits.h">
-			</File>
-			<File
-				RelativePath="Obchunk.h">
-			</File>
-			<File
-				RelativePath="Object_Manager.h">
-			</File>
-			<File
-				RelativePath="Object_Manager_Base.h">
-			</File>
-			<File
-				RelativePath="Obstack.h">
-			</File>
-			<File
-				RelativePath="Obstack_T.h">
-			</File>
-			<File
-				RelativePath="OS_Errno.h">
-			</File>
-			<File
-				RelativePath="os_include\arpa\os_inet.h">
-			</File>
-			<File
-				RelativePath="os_include\net\os_if.h">
-			</File>
-			<File
-				RelativePath="os_include\netinet\os_in.h">
-			</File>
-			<File
-				RelativePath="os_include\netinet\os_tcp.h">
-			</File>
-			<File
-				RelativePath="os_include\os_aio.h">
-			</File>
-			<File
-				RelativePath="os_include\os_assert.h">
-			</File>
-			<File
-				RelativePath="os_include\os_byteswap.h">
-			</File>
-			<File
-				RelativePath="os_include\os_complex.h">
-			</File>
-			<File
-				RelativePath="os_include\os_cpio.h">
-			</File>
-			<File
-				RelativePath="os_include\os_ctype.h">
-			</File>
-			<File
-				RelativePath="os_include\os_dirent.h">
-			</File>
-			<File
-				RelativePath="os_include\os_dlfcn.h">
-			</File>
-			<File
-				RelativePath="os_include\os_errno.h">
-			</File>
-			<File
-				RelativePath="os_include\os_fcntl.h">
-			</File>
-			<File
-				RelativePath="os_include\os_fenv.h">
-			</File>
-			<File
-				RelativePath="os_include\os_float.h">
-			</File>
-			<File
-				RelativePath="os_include\os_fmtmsg.h">
-			</File>
-			<File
-				RelativePath="os_include\os_fnmatch.h">
-			</File>
-			<File
-				RelativePath="os_include\os_ftw.h">
-			</File>
-			<File
-				RelativePath="os_include\os_glob.h">
-			</File>
-			<File
-				RelativePath="os_include\os_grp.h">
-			</File>
-			<File
-				RelativePath="os_include\os_iconv.h">
-			</File>
-			<File
-				RelativePath="os_include\os_intrin.h">
-			</File>
-			<File
-				RelativePath="os_include\os_inttypes.h">
-			</File>
-			<File
-				RelativePath="os_include\os_iso646.h">
-			</File>
-			<File
-				RelativePath="os_include\os_kstat.h">
-			</File>
-			<File
-				RelativePath="os_include\os_langinfo.h">
-			</File>
-			<File
-				RelativePath="os_include\os_libgen.h">
-			</File>
-			<File
-				RelativePath="os_include\os_limits.h">
-			</File>
-			<File
-				RelativePath="os_include\os_local.h">
-			</File>
-			<File
-				RelativePath="os_include\os_math.h">
-			</File>
-			<File
-				RelativePath="os_include\os_monetary.h">
-			</File>
-			<File
-				RelativePath="os_include\os_mqueue.h">
-			</File>
-			<File
-				RelativePath="os_include\os_ndbm.h">
-			</File>
-			<File
-				RelativePath="os_include\os_netdb.h">
-			</File>
-			<File
-				RelativePath="os_include\os_nl_types.h">
-			</File>
-			<File
-				RelativePath="os_include\os_pdh.h">
-			</File>
-			<File
-				RelativePath="os_include\os_pdhmsg.h">
-			</File>
-			<File
-				RelativePath="os_include\os_poll.h">
-			</File>
-			<File
-				RelativePath="os_include\os_pthread.h">
-			</File>
-			<File
-				RelativePath="os_include\os_pwd.h">
-			</File>
-			<File
-				RelativePath="os_include\os_regex.h">
-			</File>
-			<File
-				RelativePath="os_include\os_sched.h">
-			</File>
-			<File
-				RelativePath="os_include\os_search.h">
-			</File>
-			<File
-				RelativePath="os_include\os_semaphore.h">
-			</File>
-			<File
-				RelativePath="os_include\os_setjmp.h">
-			</File>
-			<File
-				RelativePath="os_include\os_signal.h">
-			</File>
-			<File
-				RelativePath="os_include\os_spawn.h">
-			</File>
-			<File
-				RelativePath="os_include\os_stdarg.h">
-			</File>
-			<File
-				RelativePath="os_include\os_stdbool.h">
-			</File>
-			<File
-				RelativePath="os_include\os_stddef.h">
-			</File>
-			<File
-				RelativePath="os_include\os_stdint.h">
-			</File>
-			<File
-				RelativePath="os_include\os_stdio.h">
-			</File>
-			<File
-				RelativePath="os_include\os_stdlib.h">
-			</File>
-			<File
-				RelativePath="os_include\os_string.h">
-			</File>
-			<File
-				RelativePath="os_include\os_strings.h">
-			</File>
-			<File
-				RelativePath="os_include\os_stropts.h">
-			</File>
-			<File
-				RelativePath="os_include\os_syslog.h">
-			</File>
-			<File
-				RelativePath="os_include\os_tar.h">
-			</File>
-			<File
-				RelativePath="os_include\os_termios.h">
-			</File>
-			<File
-				RelativePath="os_include\os_tgmath.h">
-			</File>
-			<File
-				RelativePath="os_include\os_time.h">
-			</File>
-			<File
-				RelativePath="os_include\os_trace.h">
-			</File>
-			<File
-				RelativePath="os_include\os_typeinfo.h">
-			</File>
-			<File
-				RelativePath="os_include\os_ucontext.h">
-			</File>
-			<File
-				RelativePath="os_include\os_ulimit.h">
-			</File>
-			<File
-				RelativePath="os_include\os_unistd.h">
-			</File>
-			<File
-				RelativePath="os_include\os_utime.h">
-			</File>
-			<File
-				RelativePath="os_include\os_utmpx.h">
-			</File>
-			<File
-				RelativePath="os_include\os_wchar.h">
-			</File>
-			<File
-				RelativePath="os_include\os_wctype.h">
-			</File>
-			<File
-				RelativePath="os_include\os_wordexp.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_ipc.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_loadavg.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_mman.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_msg.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_pstat.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_resource.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_select.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_sem.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_shm.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_socket.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_stat.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_statvfs.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_sysctl.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_sysinfo.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_time.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_timeb.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_times.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_types.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_uio.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_un.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_utsname.h">
-			</File>
-			<File
-				RelativePath="os_include\sys\os_wait.h">
-			</File>
-			<File
-				RelativePath="OS_Log_Msg_Attributes.h">
-			</File>
-			<File
-				RelativePath="OS_main.h">
-			</File>
-			<File
-				RelativePath="OS_Memory.h">
-			</File>
-			<File
-				RelativePath="OS_NS_arpa_inet.h">
-			</File>
-			<File
-				RelativePath="OS_NS_ctype.h">
-			</File>
-			<File
-				RelativePath="OS_NS_dirent.h">
-			</File>
-			<File
-				RelativePath="OS_NS_dlfcn.h">
-			</File>
-			<File
-				RelativePath="OS_NS_errno.h">
-			</File>
-			<File
-				RelativePath="OS_NS_fcntl.h">
-			</File>
-			<File
-				RelativePath="OS_NS_macros.h">
-			</File>
-			<File
-				RelativePath="OS_NS_math.h">
-			</File>
-			<File
-				RelativePath="OS_NS_netdb.h">
-			</File>
-			<File
-				RelativePath="OS_NS_poll.h">
-			</File>
-			<File
-				RelativePath="OS_NS_pwd.h">
-			</File>
-			<File
-				RelativePath="OS_NS_regex.h">
-			</File>
-			<File
-				RelativePath="OS_NS_signal.h">
-			</File>
-			<File
-				RelativePath="OS_NS_stdio.h">
-			</File>
-			<File
-				RelativePath="OS_NS_stdlib.h">
-			</File>
-			<File
-				RelativePath="OS_NS_string.h">
-			</File>
-			<File
-				RelativePath="OS_NS_strings.h">
-			</File>
-			<File
-				RelativePath="OS_NS_stropts.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_mman.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_msg.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_resource.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_select.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_sendfile.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_shm.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_socket.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_stat.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_time.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_uio.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_utsname.h">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_wait.h">
-			</File>
-			<File
-				RelativePath="OS_NS_Thread.h">
-			</File>
-			<File
-				RelativePath="OS_NS_time.h">
-			</File>
-			<File
-				RelativePath="OS_NS_unistd.h">
-			</File>
-			<File
-				RelativePath="OS_NS_wchar.h">
-			</File>
-			<File
-				RelativePath="OS_NS_wctype.h">
-			</File>
-			<File
-				RelativePath="OS_QoS.h">
-			</File>
-			<File
-				RelativePath="OS_Thread_Adapter.h">
-			</File>
-			<File
-				RelativePath="OS_TLI.h">
-			</File>
-			<File
-				RelativePath="Pagefile_Memory_Pool.h">
-			</File>
-			<File
-				RelativePath="Pair_T.h">
-			</File>
-			<File
-				RelativePath="Parse_Node.h">
-			</File>
-			<File
-				RelativePath="PI_Malloc.h">
-			</File>
-			<File
-				RelativePath="Ping_Socket.h">
-			</File>
-			<File
-				RelativePath="Pipe.h">
-			</File>
-			<File
-				RelativePath="POSIX_Asynch_IO.h">
-			</File>
-			<File
-				RelativePath="POSIX_CB_Proactor.h">
-			</File>
-			<File
-				RelativePath="POSIX_Proactor.h">
-			</File>
-			<File
-				RelativePath="post.h">
-			</File>
-			<File
-				RelativePath="pre.h">
-			</File>
-			<File
-				RelativePath="Priority_Reactor.h">
-			</File>
-			<File
-				RelativePath="Proactor.h">
-			</File>
-			<File
-				RelativePath="Proactor_Impl.h">
-			</File>
-			<File
-				RelativePath="Process.h">
-			</File>
-			<File
-				RelativePath="Process_Manager.h">
-			</File>
-			<File
-				RelativePath="Process_Mutex.h">
-			</File>
-			<File
-				RelativePath="Process_Semaphore.h">
-			</File>
-			<File
-				RelativePath="Profile_Timer.h">
-			</File>
-			<File
-				RelativePath="RB_Tree.h">
-			</File>
-			<File
-				RelativePath="Reactor.h">
-			</File>
-			<File
-				RelativePath="Reactor_Impl.h">
-			</File>
-			<File
-				RelativePath="Reactor_Notification_Strategy.h">
-			</File>
-			<File
-				RelativePath="Reactor_Timer_Interface.h">
-			</File>
-			<File
-				RelativePath="Reactor_Token_T.h">
-			</File>
-			<File
-				RelativePath="Read_Buffer.h">
-			</File>
-			<File
-				RelativePath="Recursive_Thread_Mutex.h">
-			</File>
-			<File
-				RelativePath="Recyclable.h">
-			</File>
-			<File
-				RelativePath="Refcountable_T.h">
-			</File>
-			<File
-				RelativePath="Refcounted_Auto_Ptr.h">
-			</File>
-			<File
-				RelativePath="Registry.h">
-			</File>
-			<File
-				RelativePath="Registry_Name_Space.h">
-			</File>
-			<File
-				RelativePath="Remote_Name_Space.h">
-			</File>
-			<File
-				RelativePath="Remote_Tokens.h">
-			</File>
-			<File
-				RelativePath="Reverse_Lock_T.h">
-			</File>
-			<File
-				RelativePath="RW_Mutex.h">
-			</File>
-			<File
-				RelativePath="RW_Process_Mutex.h">
-			</File>
-			<File
-				RelativePath="RW_Thread_Mutex.h">
-			</File>
-			<File
-				RelativePath="Sample_History.h">
-			</File>
-			<File
-				RelativePath="Sbrk_Memory_Pool.h">
-			</File>
-			<File
-				RelativePath="Sched_Params.h">
-			</File>
-			<File
-				RelativePath="Select_Reactor.h">
-			</File>
-			<File
-				RelativePath="Select_Reactor_Base.h">
-			</File>
-			<File
-				RelativePath="Select_Reactor_T.h">
-			</File>
-			<File
-				RelativePath="Semaphore.h">
-			</File>
-			<File
-				RelativePath="Service_Config.h">
-			</File>
-			<File
-				RelativePath="Service_Gestalt.h">
-			</File>
-			<File
-				RelativePath="Service_Manager.h">
-			</File>
-			<File
-				RelativePath="Service_Object.h">
-			</File>
-			<File
-				RelativePath="Service_Repository.h">
-			</File>
-			<File
-				RelativePath="Service_Types.h">
-			</File>
-			<File
-				RelativePath="Shared_Memory.h">
-			</File>
-			<File
-				RelativePath="Shared_Memory_MM.h">
-			</File>
-			<File
-				RelativePath="Shared_Memory_Pool.h">
-			</File>
-			<File
-				RelativePath="Shared_Memory_SV.h">
-			</File>
-			<File
-				RelativePath="Shared_Object.h">
-			</File>
-			<File
-				RelativePath="Sig_Adapter.h">
-			</File>
-			<File
-				RelativePath="Sig_Handler.h">
-			</File>
-			<File
-				RelativePath="Signal.h">
-			</File>
-			<File
-				RelativePath="Singleton.h">
-			</File>
-			<File
-				RelativePath="SOCK.h">
-			</File>
-			<File
-				RelativePath="SOCK_Acceptor.h">
-			</File>
-			<File
-				RelativePath="SOCK_CODgram.h">
-			</File>
-			<File
-				RelativePath="Sock_Connect.h">
-			</File>
-			<File
-				RelativePath="SOCK_Connector.h">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram.h">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Bcast.h">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Mcast.h">
-			</File>
-			<File
-				RelativePath="SOCK_IO.h">
-			</File>
-			<File
-				RelativePath="SOCK_Netlink.h">
-			</File>
-			<File
-				RelativePath="SOCK_SEQPACK_Acceptor.h">
-			</File>
-			<File
-				RelativePath="SOCK_SEQPACK_Association.h">
-			</File>
-			<File
-				RelativePath="SOCK_SEQPACK_Connector.h">
-			</File>
-			<File
-				RelativePath="SOCK_Stream.h">
-			</File>
-			<File
-				RelativePath="SPIPE.h">
-			</File>
-			<File
-				RelativePath="SPIPE_Acceptor.h">
-			</File>
-			<File
-				RelativePath="SPIPE_Addr.h">
-			</File>
-			<File
-				RelativePath="SPIPE_Connector.h">
-			</File>
-			<File
-				RelativePath="SPIPE_Stream.h">
-			</File>
-			<File
-				RelativePath="SString.h">
-			</File>
-			<File
-				RelativePath="SStringfwd.h">
-			</File>
-			<File
-				RelativePath="Stack_Trace.h">
-			</File>
-			<File
-				RelativePath="Static_Object_Lock.h">
-			</File>
-			<File
-				RelativePath="Stats.h">
-			</File>
-			<File
-				RelativePath="Strategies.h">
-			</File>
-			<File
-				RelativePath="Strategies_T.h">
-			</File>
-			<File
-				RelativePath="Stream.h">
-			</File>
-			<File
-				RelativePath="Stream_Modules.h">
-			</File>
-			<File
-				RelativePath="streams.h">
-			</File>
-			<File
-				RelativePath="String_Base.h">
-			</File>
-			<File
-				RelativePath="String_Base_Const.h">
-			</File>
-			<File
-				RelativePath="SUN_Proactor.h">
-			</File>
-			<File
-				RelativePath="SV_Message.h">
-			</File>
-			<File
-				RelativePath="SV_Message_Queue.h">
-			</File>
-			<File
-				RelativePath="SV_Semaphore_Complex.h">
-			</File>
-			<File
-				RelativePath="SV_Semaphore_Simple.h">
-			</File>
-			<File
-				RelativePath="SV_Shared_Memory.h">
-			</File>
-			<File
-				RelativePath="Svc_Conf.h">
-			</File>
-			<File
-				RelativePath="Svc_Conf_Lexer.h">
-			</File>
-			<File
-				RelativePath="Svc_Conf_Param.h">
-			</File>
-			<File
-				RelativePath="Svc_Conf_Token_Table.h">
-			</File>
-			<File
-				RelativePath="Svc_Conf_Tokens.h">
-			</File>
-			<File
-				RelativePath="svc_export.h">
-			</File>
-			<File
-				RelativePath="Svc_Handler.h">
-			</File>
-			<File
-				RelativePath="Synch.h">
-			</File>
-			<File
-				RelativePath="Synch_Options.h">
-			</File>
-			<File
-				RelativePath="Synch_Traits.h">
-			</File>
-			<File
-				RelativePath="System_Time.h">
-			</File>
-			<File
-				RelativePath="Task.h">
-			</File>
-			<File
-				RelativePath="Task_Ex_T.h">
-			</File>
-			<File
-				RelativePath="Task_T.h">
-			</File>
-			<File
-				RelativePath="Test_and_Set.h">
-			</File>
-			<File
-				RelativePath="Thread.h">
-			</File>
-			<File
-				RelativePath="Thread_Adapter.h">
-			</File>
-			<File
-				RelativePath="Thread_Control.h">
-			</File>
-			<File
-				RelativePath="Thread_Exit.h">
-			</File>
-			<File
-				RelativePath="Thread_Hook.h">
-			</File>
-			<File
-				RelativePath="Thread_Manager.h">
-			</File>
-			<File
-				RelativePath="Thread_Mutex.h">
-			</File>
-			<File
-				RelativePath="Thread_Semaphore.h">
-			</File>
-			<File
-				RelativePath="Throughput_Stats.h">
-			</File>
-			<File
-				RelativePath="Time_Value.h">
-			</File>
-			<File
-				RelativePath="Timeprobe.h">
-			</File>
-			<File
-				RelativePath="Timeprobe_T.h">
-			</File>
-			<File
-				RelativePath="Timer_Hash.h">
-			</File>
-			<File
-				RelativePath="Timer_Hash_T.h">
-			</File>
-			<File
-				RelativePath="Timer_Heap.h">
-			</File>
-			<File
-				RelativePath="Timer_Heap_T.h">
-			</File>
-			<File
-				RelativePath="Timer_List.h">
-			</File>
-			<File
-				RelativePath="Timer_List_T.h">
-			</File>
-			<File
-				RelativePath="Timer_Queue.h">
-			</File>
-			<File
-				RelativePath="Timer_Queue_Adapters.h">
-			</File>
-			<File
-				RelativePath="Timer_Queue_T.h">
-			</File>
-			<File
-				RelativePath="Timer_Queuefwd.h">
-			</File>
-			<File
-				RelativePath="Timer_Wheel.h">
-			</File>
-			<File
-				RelativePath="Timer_Wheel_T.h">
-			</File>
-			<File
-				RelativePath="TLI.h">
-			</File>
-			<File
-				RelativePath="TLI_Acceptor.h">
-			</File>
-			<File
-				RelativePath="TLI_Connector.h">
-			</File>
-			<File
-				RelativePath="TLI_Stream.h">
-			</File>
-			<File
-				RelativePath="Token.h">
-			</File>
-			<File
-				RelativePath="Token_Collection.h">
-			</File>
-			<File
-				RelativePath="Token_Invariants.h">
-			</File>
-			<File
-				RelativePath="Token_Manager.h">
-			</File>
-			<File
-				RelativePath="Token_Request_Reply.h">
-			</File>
-			<File
-				RelativePath="Tokenizer_T.h">
-			</File>
-			<File
-				RelativePath="TP_Reactor.h">
-			</File>
-			<File
-				RelativePath="Trace.h">
-			</File>
-			<File
-				RelativePath="Truncate.h">
-			</File>
-			<File
-				RelativePath="TSS_Adapter.h">
-			</File>
-			<File
-				RelativePath="TSS_T.h">
-			</File>
-			<File
-				RelativePath="TTY_IO.h">
-			</File>
-			<File
-				RelativePath="Typed_SV_Message.h">
-			</File>
-			<File
-				RelativePath="Typed_SV_Message_Queue.h">
-			</File>
-			<File
-				RelativePath="Unbounded_Queue.h">
-			</File>
-			<File
-				RelativePath="Unbounded_Set.h">
-			</File>
-			<File
-				RelativePath="Unbounded_Set_Ex.h">
-			</File>
-			<File
-				RelativePath="UNIX_Addr.h">
-			</File>
-			<File
-				RelativePath="UPIPE_Acceptor.h">
-			</File>
-			<File
-				RelativePath="UPIPE_Addr.h">
-			</File>
-			<File
-				RelativePath="UPIPE_Connector.h">
-			</File>
-			<File
-				RelativePath="UPIPE_Stream.h">
-			</File>
-			<File
-				RelativePath="UTF16_Encoding_Converter.h">
-			</File>
-			<File
-				RelativePath="UTF32_Encoding_Converter.h">
-			</File>
-			<File
-				RelativePath="UTF8_Encoding_Converter.h">
-			</File>
-			<File
-				RelativePath="UUID.h">
-			</File>
-			<File
-				RelativePath="Value_Ptr.h">
-			</File>
-			<File
-				RelativePath="Vector_T.h">
-			</File>
-			<File
-				RelativePath="Version.h">
-			</File>
-			<File
-				RelativePath="Versioned_Namespace.h">
-			</File>
-			<File
-				RelativePath="WFMO_Reactor.h">
-			</File>
-			<File
-				RelativePath="WIN32_Asynch_IO.h">
-			</File>
-			<File
-				RelativePath="WIN32_Proactor.h">
-			</File>
-			<File
-				RelativePath="XML_Svc_Conf.h">
-			</File>
-			<File
-				RelativePath="XTI_ATM_Mcast.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			Filter="mpc;mpb;mwc">
-			<File
-				RelativePath="ace.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="ace.mwc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="ace_for_tao.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="codecs.mpb">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="filecache.mpb">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="other.mpb">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="svcconf.mpb">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="svcconfgen.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="token.mpb">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="uuid.mpb">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Installdata Files"
-			Filter="">
-			<File
-				RelativePath="..\AUTHORS">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\bin\add_rel_link.sh">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\bin\DependencyGenerator">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\bin\depgen.pl">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\bin\MakeProjectCreator">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\bin\mpc.pl">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\bin\mwc.pl">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\COPYING">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\docs">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\include\makeinclude">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\NEWS">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\PROBLEM-REPORT-FORM">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\README">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\THANKS">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\VERSION">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Pkgconfig Files"
-			Filter="pcin">
-			<File
-				RelativePath="ACE.pc.in">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Inline Files"
-			Filter="i;ipp;inl">
-			<File
-				RelativePath="ACE.inl">
-			</File>
-			<File
-				RelativePath="ace_wchar.inl">
-			</File>
-			<File
-				RelativePath="Activation_Queue.inl">
-			</File>
-			<File
-				RelativePath="Active_Map_Manager.inl">
-			</File>
-			<File
-				RelativePath="Active_Map_Manager_T.inl">
-			</File>
-			<File
-				RelativePath="Addr.inl">
-			</File>
-			<File
-				RelativePath="ARGV.inl">
-			</File>
-			<File
-				RelativePath="Argv_Type_Converter.inl">
-			</File>
-			<File
-				RelativePath="Array_Base.inl">
-			</File>
-			<File
-				RelativePath="Array_Map.inl">
-			</File>
-			<File
-				RelativePath="Asynch_IO_Impl.inl">
-			</File>
-			<File
-				RelativePath="ATM_Acceptor.inl">
-			</File>
-			<File
-				RelativePath="ATM_Addr.inl">
-			</File>
-			<File
-				RelativePath="ATM_Connector.inl">
-			</File>
-			<File
-				RelativePath="ATM_Params.inl">
-			</File>
-			<File
-				RelativePath="ATM_QoS.inl">
-			</File>
-			<File
-				RelativePath="ATM_Stream.inl">
-			</File>
-			<File
-				RelativePath="Atomic_Op.inl">
-			</File>
-			<File
-				RelativePath="Atomic_Op_GCC_T.inl">
-			</File>
-			<File
-				RelativePath="Atomic_Op_T.inl">
-			</File>
-			<File
-				RelativePath="Auto_Event.inl">
-			</File>
-			<File
-				RelativePath="Auto_Functor.inl">
-			</File>
-			<File
-				RelativePath="Auto_IncDec_T.inl">
-			</File>
-			<File
-				RelativePath="Auto_Ptr.inl">
-			</File>
-			<File
-				RelativePath="Barrier.inl">
-			</File>
-			<File
-				RelativePath="Base_Thread_Adapter.inl">
-			</File>
-			<File
-				RelativePath="Based_Pointer_T.inl">
-			</File>
-			<File
-				RelativePath="Basic_Stats.inl">
-			</File>
-			<File
-				RelativePath="Basic_Types.inl">
-			</File>
-			<File
-				RelativePath="Bound_Ptr.inl">
-			</File>
-			<File
-				RelativePath="Cache_Map_Manager_T.inl">
-			</File>
-			<File
-				RelativePath="Caching_Strategies_T.inl">
-			</File>
-			<File
-				RelativePath="Capabilities.inl">
-			</File>
-			<File
-				RelativePath="CDR_Base.inl">
-			</File>
-			<File
-				RelativePath="CDR_Size.inl">
-			</File>
-			<File
-				RelativePath="CDR_Stream.inl">
-			</File>
-			<File
-				RelativePath="Cleanup.inl">
-			</File>
-			<File
-				RelativePath="Codeset_Registry.inl">
-			</File>
-			<File
-				RelativePath="Condition_T.inl">
-			</File>
-			<File
-				RelativePath="Condition_Thread_Mutex.inl">
-			</File>
-			<File
-				RelativePath="Configuration.inl">
-			</File>
-			<File
-				RelativePath="Containers.inl">
-			</File>
-			<File
-				RelativePath="Containers_T.inl">
-			</File>
-			<File
-				RelativePath="Countdown_Time.inl">
-			</File>
-			<File
-				RelativePath="Date_Time.inl">
-			</File>
-			<File
-				RelativePath="DEV.inl">
-			</File>
-			<File
-				RelativePath="DEV_Addr.inl">
-			</File>
-			<File
-				RelativePath="DEV_Connector.inl">
-			</File>
-			<File
-				RelativePath="DEV_IO.inl">
-			</File>
-			<File
-				RelativePath="Dev_Poll_Reactor.inl">
-			</File>
-			<File
-				RelativePath="Dirent.inl">
-			</File>
-			<File
-				RelativePath="Dirent_Selector.inl">
-			</File>
-			<File
-				RelativePath="Dynamic.inl">
-			</File>
-			<File
-				RelativePath="Dynamic_Message_Strategy.inl">
-			</File>
-			<File
-				RelativePath="Dynamic_Service.inl">
-			</File>
-			<File
-				RelativePath="Env_Value_T.inl">
-			</File>
-			<File
-				RelativePath="Event.inl">
-			</File>
-			<File
-				RelativePath="Event_Handler.inl">
-			</File>
-			<File
-				RelativePath="Event_Handler_T.inl">
-			</File>
-			<File
-				RelativePath="FIFO.inl">
-			</File>
-			<File
-				RelativePath="FIFO_Recv.inl">
-			</File>
-			<File
-				RelativePath="FIFO_Recv_Msg.inl">
-			</File>
-			<File
-				RelativePath="FIFO_Send.inl">
-			</File>
-			<File
-				RelativePath="FIFO_Send_Msg.inl">
-			</File>
-			<File
-				RelativePath="FILE.inl">
-			</File>
-			<File
-				RelativePath="FILE_Addr.inl">
-			</File>
-			<File
-				RelativePath="FILE_Connector.inl">
-			</File>
-			<File
-				RelativePath="FILE_IO.inl">
-			</File>
-			<File
-				RelativePath="File_Lock.inl">
-			</File>
-			<File
-				RelativePath="Flag_Manip.inl">
-			</File>
-			<File
-				RelativePath="Framework_Component.inl">
-			</File>
-			<File
-				RelativePath="Functor.inl">
-			</File>
-			<File
-				RelativePath="Functor_String.inl">
-			</File>
-			<File
-				RelativePath="Functor_T.inl">
-			</File>
-			<File
-				RelativePath="Get_Opt.inl">
-			</File>
-			<File
-				RelativePath="Guard_T.inl">
-			</File>
-			<File
-				RelativePath="Handle_Gobbler.inl">
-			</File>
-			<File
-				RelativePath="Handle_Set.inl">
-			</File>
-			<File
-				RelativePath="Hash_Cache_Map_Manager_T.inl">
-			</File>
-			<File
-				RelativePath="Hash_Map_Manager_T.inl">
-			</File>
-			<File
-				RelativePath="Hash_Map_With_Allocator_T.inl">
-			</File>
-			<File
-				RelativePath="Hash_Multi_Map_Manager_T.inl">
-			</File>
-			<File
-				RelativePath="Hashable.inl">
-			</File>
-			<File
-				RelativePath="High_Res_Timer.inl">
-			</File>
-			<File
-				RelativePath="INET_Addr.inl">
-			</File>
-			<File
-				RelativePath="Intrusive_Auto_Ptr.inl">
-			</File>
-			<File
-				RelativePath="Intrusive_List.inl">
-			</File>
-			<File
-				RelativePath="Intrusive_List_Node.inl">
-			</File>
-			<File
-				RelativePath="IO_Cntl_Msg.inl">
-			</File>
-			<File
-				RelativePath="IO_SAP.inl">
-			</File>
-			<File
-				RelativePath="IOStream_T.inl">
-			</File>
-			<File
-				RelativePath="IPC_SAP.inl">
-			</File>
-			<File
-				RelativePath="Local_Tokens.inl">
-			</File>
-			<File
-				RelativePath="Lock.inl">
-			</File>
-			<File
-				RelativePath="Lock_Adapter_T.inl">
-			</File>
-			<File
-				RelativePath="Log_Msg.inl">
-			</File>
-			<File
-				RelativePath="Log_Record.inl">
-			</File>
-			<File
-				RelativePath="LSOCK.inl">
-			</File>
-			<File
-				RelativePath="LSOCK_CODgram.inl">
-			</File>
-			<File
-				RelativePath="LSOCK_Connector.inl">
-			</File>
-			<File
-				RelativePath="LSOCK_Dgram.inl">
-			</File>
-			<File
-				RelativePath="LSOCK_Stream.inl">
-			</File>
-			<File
-				RelativePath="Malloc.inl">
-			</File>
-			<File
-				RelativePath="Malloc_Allocator.inl">
-			</File>
-			<File
-				RelativePath="Malloc_T.inl">
-			</File>
-			<File
-				RelativePath="Managed_Object.inl">
-			</File>
-			<File
-				RelativePath="Manual_Event.inl">
-			</File>
-			<File
-				RelativePath="Map_Manager.inl">
-			</File>
-			<File
-				RelativePath="Map_T.inl">
-			</File>
-			<File
-				RelativePath="MEM_Acceptor.inl">
-			</File>
-			<File
-				RelativePath="MEM_Addr.inl">
-			</File>
-			<File
-				RelativePath="MEM_Connector.inl">
-			</File>
-			<File
-				RelativePath="MEM_IO.inl">
-			</File>
-			<File
-				RelativePath="Mem_Map.inl">
-			</File>
-			<File
-				RelativePath="MEM_SAP.inl">
-			</File>
-			<File
-				RelativePath="MEM_Stream.inl">
-			</File>
-			<File
-				RelativePath="Message_Block.inl">
-			</File>
-			<File
-				RelativePath="Message_Block_T.inl">
-			</File>
-			<File
-				RelativePath="Message_Queue.inl">
-			</File>
-			<File
-				RelativePath="Message_Queue_NT.inl">
-			</File>
-			<File
-				RelativePath="Message_Queue_Vx.inl">
-			</File>
-			<File
-				RelativePath="Metrics_Cache_T.inl">
-			</File>
-			<File
-				RelativePath="MMAP_Memory_Pool.inl">
-			</File>
-			<File
-				RelativePath="Module.inl">
-			</File>
-			<File
-				RelativePath="Monitor_Base.inl">
-			</File>
-			<File
-				RelativePath="Msg_WFMO_Reactor.inl">
-			</File>
-			<File
-				RelativePath="Multihomed_INET_Addr.inl">
-			</File>
-			<File
-				RelativePath="Mutex.inl">
-			</File>
-			<File
-				RelativePath="Naming_Context.inl">
-			</File>
-			<File
-				RelativePath="Netlink_Addr.inl">
-			</File>
-			<File
-				RelativePath="Notification_Queue.inl">
-			</File>
-			<File
-				RelativePath="Notification_Strategy.inl">
-			</File>
-			<File
-				RelativePath="NT_Service.inl">
-			</File>
-			<File
-				RelativePath="Obchunk.inl">
-			</File>
-			<File
-				RelativePath="Object_Manager.inl">
-			</File>
-			<File
-				RelativePath="Obstack_T.inl">
-			</File>
-			<File
-				RelativePath="OS_Errno.inl">
-			</File>
-			<File
-				RelativePath="OS_Log_Msg_Attributes.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_arpa_inet.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_ctype.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_dirent.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_dlfcn.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_errno.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_fcntl.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_math.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_netdb.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_poll.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_pwd.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_regex.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_signal.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_stdio.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_stdlib.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_string.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_strings.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_stropts.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_mman.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_msg.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_resource.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_select.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_sendfile.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_shm.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_socket.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_stat.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_time.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_uio.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_sys_wait.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_Thread.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_time.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_unistd.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_wchar.inl">
-			</File>
-			<File
-				RelativePath="OS_NS_wctype.inl">
-			</File>
-			<File
-				RelativePath="OS_TLI.inl">
-			</File>
-			<File
-				RelativePath="Pagefile_Memory_Pool.inl">
-			</File>
-			<File
-				RelativePath="Pair_T.inl">
-			</File>
-			<File
-				RelativePath="PI_Malloc.inl">
-			</File>
-			<File
-				RelativePath="Ping_Socket.inl">
-			</File>
-			<File
-				RelativePath="Pipe.inl">
-			</File>
-			<File
-				RelativePath="POSIX_Proactor.inl">
-			</File>
-			<File
-				RelativePath="Proactor.inl">
-			</File>
-			<File
-				RelativePath="Process.inl">
-			</File>
-			<File
-				RelativePath="Process_Manager.inl">
-			</File>
-			<File
-				RelativePath="Process_Mutex.inl">
-			</File>
-			<File
-				RelativePath="Process_Semaphore.inl">
-			</File>
-			<File
-				RelativePath="Profile_Timer.inl">
-			</File>
-			<File
-				RelativePath="RB_Tree.inl">
-			</File>
-			<File
-				RelativePath="Reactor.inl">
-			</File>
-			<File
-				RelativePath="Reactor_Notification_Strategy.inl">
-			</File>
-			<File
-				RelativePath="Read_Buffer.inl">
-			</File>
-			<File
-				RelativePath="Recursive_Thread_Mutex.inl">
-			</File>
-			<File
-				RelativePath="Recyclable.inl">
-			</File>
-			<File
-				RelativePath="Refcountable_T.inl">
-			</File>
-			<File
-				RelativePath="Refcounted_Auto_Ptr.inl">
-			</File>
-			<File
-				RelativePath="Remote_Tokens.inl">
-			</File>
-			<File
-				RelativePath="Reverse_Lock_T.inl">
-			</File>
-			<File
-				RelativePath="RW_Mutex.inl">
-			</File>
-			<File
-				RelativePath="RW_Process_Mutex.inl">
-			</File>
-			<File
-				RelativePath="RW_Thread_Mutex.inl">
-			</File>
-			<File
-				RelativePath="Sample_History.inl">
-			</File>
-			<File
-				RelativePath="Sched_Params.inl">
-			</File>
-			<File
-				RelativePath="Select_Reactor_Base.inl">
-			</File>
-			<File
-				RelativePath="Select_Reactor_T.inl">
-			</File>
-			<File
-				RelativePath="Semaphore.inl">
-			</File>
-			<File
-				RelativePath="Service_Config.inl">
-			</File>
-			<File
-				RelativePath="Service_Gestalt.inl">
-			</File>
-			<File
-				RelativePath="Service_Object.inl">
-			</File>
-			<File
-				RelativePath="Service_Repository.inl">
-			</File>
-			<File
-				RelativePath="Service_Types.inl">
-			</File>
-			<File
-				RelativePath="Shared_Memory_MM.inl">
-			</File>
-			<File
-				RelativePath="Shared_Memory_SV.inl">
-			</File>
-			<File
-				RelativePath="Shared_Object.inl">
-			</File>
-			<File
-				RelativePath="Sig_Handler.inl">
-			</File>
-			<File
-				RelativePath="Signal.inl">
-			</File>
-			<File
-				RelativePath="Singleton.inl">
-			</File>
-			<File
-				RelativePath="SOCK.inl">
-			</File>
-			<File
-				RelativePath="SOCK_Acceptor.inl">
-			</File>
-			<File
-				RelativePath="SOCK_CODgram.inl">
-			</File>
-			<File
-				RelativePath="SOCK_Connector.inl">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram.inl">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Bcast.inl">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Mcast.inl">
-			</File>
-			<File
-				RelativePath="SOCK_IO.inl">
-			</File>
-			<File
-				RelativePath="SOCK_Netlink.inl">
-			</File>
-			<File
-				RelativePath="SOCK_SEQPACK_Acceptor.inl">
-			</File>
-			<File
-				RelativePath="SOCK_SEQPACK_Association.inl">
-			</File>
-			<File
-				RelativePath="SOCK_SEQPACK_Connector.inl">
-			</File>
-			<File
-				RelativePath="SOCK_Stream.inl">
-			</File>
-			<File
-				RelativePath="SPIPE.inl">
-			</File>
-			<File
-				RelativePath="SPIPE_Addr.inl">
-			</File>
-			<File
-				RelativePath="SPIPE_Connector.inl">
-			</File>
-			<File
-				RelativePath="SPIPE_Stream.inl">
-			</File>
-			<File
-				RelativePath="SString.inl">
-			</File>
-			<File
-				RelativePath="Stats.inl">
-			</File>
-			<File
-				RelativePath="Strategies_T.inl">
-			</File>
-			<File
-				RelativePath="Stream.inl">
-			</File>
-			<File
-				RelativePath="String_Base.inl">
-			</File>
-			<File
-				RelativePath="SV_Message.inl">
-			</File>
-			<File
-				RelativePath="SV_Message_Queue.inl">
-			</File>
-			<File
-				RelativePath="SV_Semaphore_Complex.inl">
-			</File>
-			<File
-				RelativePath="SV_Semaphore_Simple.inl">
-			</File>
-			<File
-				RelativePath="SV_Shared_Memory.inl">
-			</File>
-			<File
-				RelativePath="Task.inl">
-			</File>
-			<File
-				RelativePath="Task_Ex_T.inl">
-			</File>
-			<File
-				RelativePath="Task_T.inl">
-			</File>
-			<File
-				RelativePath="Thread.inl">
-			</File>
-			<File
-				RelativePath="Thread_Adapter.inl">
-			</File>
-			<File
-				RelativePath="Thread_Control.inl">
-			</File>
-			<File
-				RelativePath="Thread_Manager.inl">
-			</File>
-			<File
-				RelativePath="Thread_Mutex.inl">
-			</File>
-			<File
-				RelativePath="Thread_Semaphore.inl">
-			</File>
-			<File
-				RelativePath="Time_Value.inl">
-			</File>
-			<File
-				RelativePath="Timeprobe.inl">
-			</File>
-			<File
-				RelativePath="Timer_Queue_Adapters.inl">
-			</File>
-			<File
-				RelativePath="Timer_Queue_T.inl">
-			</File>
-			<File
-				RelativePath="TLI.inl">
-			</File>
-			<File
-				RelativePath="TLI_Connector.inl">
-			</File>
-			<File
-				RelativePath="TLI_Stream.inl">
-			</File>
-			<File
-				RelativePath="Token.inl">
-			</File>
-			<File
-				RelativePath="Token_Collection.inl">
-			</File>
-			<File
-				RelativePath="Token_Manager.inl">
-			</File>
-			<File
-				RelativePath="Token_Request_Reply.inl">
-			</File>
-			<File
-				RelativePath="TP_Reactor.inl">
-			</File>
-			<File
-				RelativePath="TSS_T.inl">
-			</File>
-			<File
-				RelativePath="Typed_SV_Message.inl">
-			</File>
-			<File
-				RelativePath="Typed_SV_Message_Queue.inl">
-			</File>
-			<File
-				RelativePath="Unbounded_Queue.inl">
-			</File>
-			<File
-				RelativePath="Unbounded_Set.inl">
-			</File>
-			<File
-				RelativePath="Unbounded_Set_Ex.inl">
-			</File>
-			<File
-				RelativePath="UNIX_Addr.inl">
-			</File>
-			<File
-				RelativePath="UPIPE_Acceptor.inl">
-			</File>
-			<File
-				RelativePath="UPIPE_Connector.inl">
-			</File>
-			<File
-				RelativePath="UPIPE_Stream.inl">
-			</File>
-			<File
-				RelativePath="UTF16_Encoding_Converter.inl">
-			</File>
-			<File
-				RelativePath="UUID.inl">
-			</File>
-			<File
-				RelativePath="Vector_T.inl">
-			</File>
-			<File
-				RelativePath="WFMO_Reactor.inl">
-			</File>
-			<File
-				RelativePath="XTI_ATM_Mcast.inl">
-			</File>
-		</Filter>
-		<Filter
-			Name="Template Files"
-			Filter="">
-			<File
-				RelativePath="Acceptor.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Active_Map_Manager_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Arg_Shifter.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="ARGV.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Array_Base.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Array_Map.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Asynch_Acceptor.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Asynch_Connector.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Atomic_Op_GCC_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Atomic_Op_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Auto_Functor.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Auto_IncDec_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Auto_Ptr.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Based_Pointer_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Cache_Map_Manager_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Cached_Connect_Strategy_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Caching_Strategies_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Caching_Utility_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Cleanup_Strategies_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Condition_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Connector.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Containers_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Dump_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Dynamic_Service.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Env_Value_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Event_Handler_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Framework_Component_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Free_List.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Functor_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Future.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Future_Set.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Guard_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Hash_Cache_Map_Manager_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Hash_Map_Manager_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Hash_Map_With_Allocator_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Hash_Multi_Map_Manager_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Intrusive_Auto_Ptr.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Intrusive_List.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Intrusive_List_Node.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="IOStream_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Local_Name_Space_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Lock_Adapter_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="LOCK_SOCK_Acceptor.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Malloc_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Managed_Object.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Map_Manager.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Map_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Message_Block_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Message_Queue_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Metrics_Cache_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Module.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Node.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Obstack_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Pair_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="RB_Tree.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Reactor_Token_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Refcountable_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Refcounted_Auto_Ptr.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Reverse_Lock_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Select_Reactor_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Singleton.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Strategies_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Stream.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Stream_Modules.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="String_Base.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Svc_Handler.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Task_Ex_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Task_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Test_and_Set.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Timeprobe_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Timer_Hash_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Timer_Heap_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Timer_List_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Timer_Queue_Adapters.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Timer_Queue_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Timer_Wheel_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Tokenizer_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="TSS_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Typed_SV_Message.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Typed_SV_Message_Queue.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Unbounded_Queue.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Unbounded_Set.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Unbounded_Set_Ex.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Vector_T.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Documentation"
-			Filter="">
-			<File
-				RelativePath="..\VERSION">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="README">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">
-			<File
-				RelativePath="ace.rc">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="ACE"
+	ProjectGUID="{BD537C9A-FECA-1BAD-6757-8A6300006755}"
+	RootNamespace="ACE"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\lib"
+			IntermediateDirectory="Debug\ACE_vc9\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				OutputFile="$(OutDir)\ACEd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\lib\ACEd.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\lib"
+			IntermediateDirectory="Release\ACE_vc9\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				OutputFile="$(OutDir)\ACE.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\lib\ACE.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\lib"
+			IntermediateDirectory="Debug\ACE_vc9\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies=""
+				OutputFile="$(OutDir)\ACEd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\lib\ACEd.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\lib"
+			IntermediateDirectory="Release\ACE_vc9\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies=""
+				OutputFile="$(OutDir)\ACE.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\lib\ACE.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;c;C">
+			<File
+				RelativePath="ACE.cpp">
+			</File>
+			<File
+				RelativePath="ACE_crc32.cpp">
+			</File>
+			<File
+				RelativePath="ACE_crc_ccitt.cpp">
+			</File>
+			<File
+				RelativePath="ace_wchar.cpp">
+			</File>
+			<File
+				RelativePath="Activation_Queue.cpp">
+			</File>
+			<File
+				RelativePath="Active_Map_Manager.cpp">
+			</File>
+			<File
+				RelativePath="Addr.cpp">
+			</File>
+			<File
+				RelativePath="Argv_Type_Converter.cpp">
+			</File>
+			<File
+				RelativePath="Assert.cpp">
+			</File>
+			<File
+				RelativePath="Asynch_IO.cpp">
+			</File>
+			<File
+				RelativePath="Asynch_IO_Impl.cpp">
+			</File>
+			<File
+				RelativePath="Asynch_Pseudo_Task.cpp">
+			</File>
+			<File
+				RelativePath="ATM_Acceptor.cpp">
+			</File>
+			<File
+				RelativePath="ATM_Addr.cpp">
+			</File>
+			<File
+				RelativePath="ATM_Connector.cpp">
+			</File>
+			<File
+				RelativePath="ATM_Params.cpp">
+			</File>
+			<File
+				RelativePath="ATM_QoS.cpp">
+			</File>
+			<File
+				RelativePath="ATM_Stream.cpp">
+			</File>
+			<File
+				RelativePath="Atomic_Op.cpp">
+			</File>
+			<File
+				RelativePath="Atomic_Op_Sparc.c">
+			</File>
+			<File
+				RelativePath="Auto_Event.cpp">
+			</File>
+			<File
+				RelativePath="Barrier.cpp">
+			</File>
+			<File
+				RelativePath="Base_Thread_Adapter.cpp">
+			</File>
+			<File
+				RelativePath="Based_Pointer_Repository.cpp">
+			</File>
+			<File
+				RelativePath="Basic_Stats.cpp">
+			</File>
+			<File
+				RelativePath="Basic_Types.cpp">
+			</File>
+			<File
+				RelativePath="Capabilities.cpp">
+			</File>
+			<File
+				RelativePath="CDR_Base.cpp">
+			</File>
+			<File
+				RelativePath="CDR_Size.cpp">
+			</File>
+			<File
+				RelativePath="CDR_Stream.cpp">
+			</File>
+			<File
+				RelativePath="Cleanup.cpp">
+			</File>
+			<File
+				RelativePath="Codecs.cpp">
+			</File>
+			<File
+				RelativePath="Codeset_IBM1047.cpp">
+			</File>
+			<File
+				RelativePath="Codeset_Registry.cpp">
+			</File>
+			<File
+				RelativePath="Codeset_Registry_db.cpp">
+			</File>
+			<File
+				RelativePath="Condition_Recursive_Thread_Mutex.cpp">
+			</File>
+			<File
+				RelativePath="Condition_Thread_Mutex.cpp">
+			</File>
+			<File
+				RelativePath="Configuration.cpp">
+			</File>
+			<File
+				RelativePath="Configuration_Import_Export.cpp">
+			</File>
+			<File
+				RelativePath="Connection_Recycling_Strategy.cpp">
+			</File>
+			<File
+				RelativePath="Containers.cpp">
+			</File>
+			<File
+				RelativePath="Copy_Disabled.cpp">
+			</File>
+			<File
+				RelativePath="Countdown_Time.cpp">
+			</File>
+			<File
+				RelativePath="Date_Time.cpp">
+			</File>
+			<File
+				RelativePath="DEV.cpp">
+			</File>
+			<File
+				RelativePath="DEV_Addr.cpp">
+			</File>
+			<File
+				RelativePath="DEV_Connector.cpp">
+			</File>
+			<File
+				RelativePath="DEV_IO.cpp">
+			</File>
+			<File
+				RelativePath="Dev_Poll_Reactor.cpp">
+			</File>
+			<File
+				RelativePath="Dirent.cpp">
+			</File>
+			<File
+				RelativePath="Dirent_Selector.cpp">
+			</File>
+			<File
+				RelativePath="DLL.cpp">
+			</File>
+			<File
+				RelativePath="DLL_Manager.cpp">
+			</File>
+			<File
+				RelativePath="Dump.cpp">
+			</File>
+			<File
+				RelativePath="Dynamic.cpp">
+			</File>
+			<File
+				RelativePath="Dynamic_Message_Strategy.cpp">
+			</File>
+			<File
+				RelativePath="Dynamic_Service_Base.cpp">
+			</File>
+			<File
+				RelativePath="Dynamic_Service_Dependency.cpp">
+			</File>
+			<File
+				RelativePath="Encoding_Converter.cpp">
+			</File>
+			<File
+				RelativePath="Encoding_Converter_Factory.cpp">
+			</File>
+			<File
+				RelativePath="Event.cpp">
+			</File>
+			<File
+				RelativePath="Event_Handler.cpp">
+			</File>
+			<File
+				RelativePath="FIFO.cpp">
+			</File>
+			<File
+				RelativePath="FIFO_Recv.cpp">
+			</File>
+			<File
+				RelativePath="FIFO_Recv_Msg.cpp">
+			</File>
+			<File
+				RelativePath="FIFO_Send.cpp">
+			</File>
+			<File
+				RelativePath="FIFO_Send_Msg.cpp">
+			</File>
+			<File
+				RelativePath="FILE.cpp">
+			</File>
+			<File
+				RelativePath="FILE_Addr.cpp">
+			</File>
+			<File
+				RelativePath="FILE_Connector.cpp">
+			</File>
+			<File
+				RelativePath="FILE_IO.cpp">
+			</File>
+			<File
+				RelativePath="File_Lock.cpp">
+			</File>
+			<File
+				RelativePath="Filecache.cpp">
+			</File>
+			<File
+				RelativePath="Flag_Manip.cpp">
+			</File>
+			<File
+				RelativePath="Framework_Component.cpp">
+			</File>
+			<File
+				RelativePath="Functor.cpp">
+			</File>
+			<File
+				RelativePath="Functor_String.cpp">
+			</File>
+			<File
+				RelativePath="Get_Opt.cpp">
+			</File>
+			<File
+				RelativePath="gethrtime.cpp">
+			</File>
+			<File
+				RelativePath="Handle_Ops.cpp">
+			</File>
+			<File
+				RelativePath="Handle_Set.cpp">
+			</File>
+			<File
+				RelativePath="Hashable.cpp">
+			</File>
+			<File
+				RelativePath="High_Res_Timer.cpp">
+			</File>
+			<File
+				RelativePath="ICMP_Socket.cpp">
+			</File>
+			<File
+				RelativePath="INET_Addr.cpp">
+			</File>
+			<File
+				RelativePath="Init_ACE.cpp">
+			</File>
+			<File
+				RelativePath="IO_Cntl_Msg.cpp">
+			</File>
+			<File
+				RelativePath="IO_SAP.cpp">
+			</File>
+			<File
+				RelativePath="IOStream.cpp">
+			</File>
+			<File
+				RelativePath="IPC_SAP.cpp">
+			</File>
+			<File
+				RelativePath="Lib_Find.cpp">
+			</File>
+			<File
+				RelativePath="Local_Memory_Pool.cpp">
+			</File>
+			<File
+				RelativePath="Local_Name_Space.cpp">
+			</File>
+			<File
+				RelativePath="Local_Tokens.cpp">
+			</File>
+			<File
+				RelativePath="Lock.cpp">
+			</File>
+			<File
+				RelativePath="Log_Msg.cpp">
+			</File>
+			<File
+				RelativePath="Log_Msg_Backend.cpp">
+			</File>
+			<File
+				RelativePath="Log_Msg_Callback.cpp">
+			</File>
+			<File
+				RelativePath="Log_Msg_IPC.cpp">
+			</File>
+			<File
+				RelativePath="Log_Msg_NT_Event_Log.cpp">
+			</File>
+			<File
+				RelativePath="Log_Msg_UNIX_Syslog.cpp">
+			</File>
+			<File
+				RelativePath="Log_Record.cpp">
+			</File>
+			<File
+				RelativePath="Logging_Strategy.cpp">
+			</File>
+			<File
+				RelativePath="LSOCK.cpp">
+			</File>
+			<File
+				RelativePath="LSOCK_Acceptor.cpp">
+			</File>
+			<File
+				RelativePath="LSOCK_CODgram.cpp">
+			</File>
+			<File
+				RelativePath="LSOCK_Connector.cpp">
+			</File>
+			<File
+				RelativePath="LSOCK_Dgram.cpp">
+			</File>
+			<File
+				RelativePath="LSOCK_Stream.cpp">
+			</File>
+			<File
+				RelativePath="Malloc.cpp">
+			</File>
+			<File
+				RelativePath="Malloc_Allocator.cpp">
+			</File>
+			<File
+				RelativePath="Manual_Event.cpp">
+			</File>
+			<File
+				RelativePath="MEM_Acceptor.cpp">
+			</File>
+			<File
+				RelativePath="MEM_Addr.cpp">
+			</File>
+			<File
+				RelativePath="MEM_Connector.cpp">
+			</File>
+			<File
+				RelativePath="MEM_IO.cpp">
+			</File>
+			<File
+				RelativePath="Mem_Map.cpp">
+			</File>
+			<File
+				RelativePath="MEM_SAP.cpp">
+			</File>
+			<File
+				RelativePath="MEM_Stream.cpp">
+			</File>
+			<File
+				RelativePath="Message_Block.cpp">
+			</File>
+			<File
+				RelativePath="Message_Queue.cpp">
+			</File>
+			<File
+				RelativePath="Message_Queue_NT.cpp">
+			</File>
+			<File
+				RelativePath="Message_Queue_Vx.cpp">
+			</File>
+			<File
+				RelativePath="Method_Request.cpp">
+			</File>
+			<File
+				RelativePath="MMAP_Memory_Pool.cpp">
+			</File>
+			<File
+				RelativePath="Monitor_Admin.cpp">
+			</File>
+			<File
+				RelativePath="Monitor_Admin_Manager.cpp">
+			</File>
+			<File
+				RelativePath="Monitor_Base.cpp">
+			</File>
+			<File
+				RelativePath="Monitor_Control_Action.cpp">
+			</File>
+			<File
+				RelativePath="Monitor_Control_Types.cpp">
+			</File>
+			<File
+				RelativePath="Monitor_Point_Registry.cpp">
+			</File>
+			<File
+				RelativePath="Monitor_Size.cpp">
+			</File>
+			<File
+				RelativePath="Msg_WFMO_Reactor.cpp">
+			</File>
+			<File
+				RelativePath="Multihomed_INET_Addr.cpp">
+			</File>
+			<File
+				RelativePath="Mutex.cpp">
+			</File>
+			<File
+				RelativePath="Name_Proxy.cpp">
+			</File>
+			<File
+				RelativePath="Name_Request_Reply.cpp">
+			</File>
+			<File
+				RelativePath="Name_Space.cpp">
+			</File>
+			<File
+				RelativePath="Naming_Context.cpp">
+			</File>
+			<File
+				RelativePath="Netlink_Addr.cpp">
+			</File>
+			<File
+				RelativePath="Notification_Queue.cpp">
+			</File>
+			<File
+				RelativePath="Notification_Strategy.cpp">
+			</File>
+			<File
+				RelativePath="NT_Service.cpp">
+			</File>
+			<File
+				RelativePath="Obchunk.cpp">
+			</File>
+			<File
+				RelativePath="Object_Manager.cpp">
+			</File>
+			<File
+				RelativePath="Object_Manager_Base.cpp">
+			</File>
+			<File
+				RelativePath="OS_Errno.cpp">
+			</File>
+			<File
+				RelativePath="OS_Log_Msg_Attributes.cpp">
+			</File>
+			<File
+				RelativePath="OS_main.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_arpa_inet.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_ctype.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_dirent.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_dlfcn.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_errno.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_fcntl.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_math.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_netdb.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_poll.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_pwd.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_regex.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_signal.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_stdio.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_stdlib.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_string.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_strings.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_stropts.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_mman.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_msg.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_resource.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_select.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_sendfile.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_shm.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_socket.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_stat.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_time.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_uio.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_utsname.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_wait.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_Thread.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_time.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_unistd.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_wchar.cpp">
+			</File>
+			<File
+				RelativePath="OS_NS_wctype.cpp">
+			</File>
+			<File
+				RelativePath="OS_QoS.cpp">
+			</File>
+			<File
+				RelativePath="OS_Thread_Adapter.cpp">
+			</File>
+			<File
+				RelativePath="OS_TLI.cpp">
+			</File>
+			<File
+				RelativePath="Pagefile_Memory_Pool.cpp">
+			</File>
+			<File
+				RelativePath="Parse_Node.cpp">
+			</File>
+			<File
+				RelativePath="PI_Malloc.cpp">
+			</File>
+			<File
+				RelativePath="Ping_Socket.cpp">
+			</File>
+			<File
+				RelativePath="Pipe.cpp">
+			</File>
+			<File
+				RelativePath="POSIX_Asynch_IO.cpp">
+			</File>
+			<File
+				RelativePath="POSIX_CB_Proactor.cpp">
+			</File>
+			<File
+				RelativePath="POSIX_Proactor.cpp">
+			</File>
+			<File
+				RelativePath="Priority_Reactor.cpp">
+			</File>
+			<File
+				RelativePath="Proactor.cpp">
+			</File>
+			<File
+				RelativePath="Proactor_Impl.cpp">
+			</File>
+			<File
+				RelativePath="Process.cpp">
+			</File>
+			<File
+				RelativePath="Process_Manager.cpp">
+			</File>
+			<File
+				RelativePath="Process_Mutex.cpp">
+			</File>
+			<File
+				RelativePath="Process_Semaphore.cpp">
+			</File>
+			<File
+				RelativePath="Profile_Timer.cpp">
+			</File>
+			<File
+				RelativePath="Reactor.cpp">
+			</File>
+			<File
+				RelativePath="Reactor_Impl.cpp">
+			</File>
+			<File
+				RelativePath="Reactor_Notification_Strategy.cpp">
+			</File>
+			<File
+				RelativePath="Reactor_Timer_Interface.cpp">
+			</File>
+			<File
+				RelativePath="Read_Buffer.cpp">
+			</File>
+			<File
+				RelativePath="Recursive_Thread_Mutex.cpp">
+			</File>
+			<File
+				RelativePath="Recyclable.cpp">
+			</File>
+			<File
+				RelativePath="Registry.cpp">
+			</File>
+			<File
+				RelativePath="Registry_Name_Space.cpp">
+			</File>
+			<File
+				RelativePath="Remote_Name_Space.cpp">
+			</File>
+			<File
+				RelativePath="Remote_Tokens.cpp">
+			</File>
+			<File
+				RelativePath="Rtems_init.c">
+			</File>
+			<File
+				RelativePath="RW_Mutex.cpp">
+			</File>
+			<File
+				RelativePath="RW_Process_Mutex.cpp">
+			</File>
+			<File
+				RelativePath="RW_Thread_Mutex.cpp">
+			</File>
+			<File
+				RelativePath="Sample_History.cpp">
+			</File>
+			<File
+				RelativePath="Sbrk_Memory_Pool.cpp">
+			</File>
+			<File
+				RelativePath="Sched_Params.cpp">
+			</File>
+			<File
+				RelativePath="Select_Reactor_Base.cpp">
+			</File>
+			<File
+				RelativePath="Semaphore.cpp">
+			</File>
+			<File
+				RelativePath="Service_Config.cpp">
+			</File>
+			<File
+				RelativePath="Service_Gestalt.cpp">
+			</File>
+			<File
+				RelativePath="Service_Manager.cpp">
+			</File>
+			<File
+				RelativePath="Service_Object.cpp">
+			</File>
+			<File
+				RelativePath="Service_Repository.cpp">
+			</File>
+			<File
+				RelativePath="Service_Types.cpp">
+			</File>
+			<File
+				RelativePath="Shared_Memory.cpp">
+			</File>
+			<File
+				RelativePath="Shared_Memory_MM.cpp">
+			</File>
+			<File
+				RelativePath="Shared_Memory_Pool.cpp">
+			</File>
+			<File
+				RelativePath="Shared_Memory_SV.cpp">
+			</File>
+			<File
+				RelativePath="Shared_Object.cpp">
+			</File>
+			<File
+				RelativePath="Sig_Adapter.cpp">
+			</File>
+			<File
+				RelativePath="Sig_Handler.cpp">
+			</File>
+			<File
+				RelativePath="Signal.cpp">
+			</File>
+			<File
+				RelativePath="SOCK.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_Acceptor.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_CODgram.cpp">
+			</File>
+			<File
+				RelativePath="Sock_Connect.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_Connector.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Bcast.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Mcast.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_IO.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_Netlink.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_SEQPACK_Acceptor.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_SEQPACK_Association.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_SEQPACK_Connector.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_Stream.cpp">
+			</File>
+			<File
+				RelativePath="SPIPE.cpp">
+			</File>
+			<File
+				RelativePath="SPIPE_Acceptor.cpp">
+			</File>
+			<File
+				RelativePath="SPIPE_Addr.cpp">
+			</File>
+			<File
+				RelativePath="SPIPE_Connector.cpp">
+			</File>
+			<File
+				RelativePath="SPIPE_Stream.cpp">
+			</File>
+			<File
+				RelativePath="SString.cpp">
+			</File>
+			<File
+				RelativePath="Stack_Trace.cpp">
+			</File>
+			<File
+				RelativePath="Stats.cpp">
+			</File>
+			<File
+				RelativePath="String_Base_Const.cpp">
+			</File>
+			<File
+				RelativePath="SUN_Proactor.cpp">
+			</File>
+			<File
+				RelativePath="SV_Message.cpp">
+			</File>
+			<File
+				RelativePath="SV_Message_Queue.cpp">
+			</File>
+			<File
+				RelativePath="SV_Semaphore_Complex.cpp">
+			</File>
+			<File
+				RelativePath="SV_Semaphore_Simple.cpp">
+			</File>
+			<File
+				RelativePath="SV_Shared_Memory.cpp">
+			</File>
+			<File
+				RelativePath="Svc_Conf_Lexer.cpp">
+			</File>
+			<File
+				RelativePath="Svc_Conf_y.cpp">
+			</File>
+			<File
+				RelativePath="Synch_Options.cpp">
+			</File>
+			<File
+				RelativePath="System_Time.cpp">
+			</File>
+			<File
+				RelativePath="Task.cpp">
+			</File>
+			<File
+				RelativePath="Thread.cpp">
+			</File>
+			<File
+				RelativePath="Thread_Adapter.cpp">
+			</File>
+			<File
+				RelativePath="Thread_Control.cpp">
+			</File>
+			<File
+				RelativePath="Thread_Exit.cpp">
+			</File>
+			<File
+				RelativePath="Thread_Hook.cpp">
+			</File>
+			<File
+				RelativePath="Thread_Manager.cpp">
+			</File>
+			<File
+				RelativePath="Thread_Mutex.cpp">
+			</File>
+			<File
+				RelativePath="Thread_Semaphore.cpp">
+			</File>
+			<File
+				RelativePath="Throughput_Stats.cpp">
+			</File>
+			<File
+				RelativePath="Time_Value.cpp">
+			</File>
+			<File
+				RelativePath="Timeprobe.cpp">
+			</File>
+			<File
+				RelativePath="TLI.cpp">
+			</File>
+			<File
+				RelativePath="TLI_Acceptor.cpp">
+			</File>
+			<File
+				RelativePath="TLI_Connector.cpp">
+			</File>
+			<File
+				RelativePath="TLI_Stream.cpp">
+			</File>
+			<File
+				RelativePath="Token.cpp">
+			</File>
+			<File
+				RelativePath="Token_Collection.cpp">
+			</File>
+			<File
+				RelativePath="Token_Invariants.cpp">
+			</File>
+			<File
+				RelativePath="Token_Manager.cpp">
+			</File>
+			<File
+				RelativePath="Token_Request_Reply.cpp">
+			</File>
+			<File
+				RelativePath="TP_Reactor.cpp">
+			</File>
+			<File
+				RelativePath="Trace.cpp">
+			</File>
+			<File
+				RelativePath="TSS_Adapter.cpp">
+			</File>
+			<File
+				RelativePath="TTY_IO.cpp">
+			</File>
+			<File
+				RelativePath="UNIX_Addr.cpp">
+			</File>
+			<File
+				RelativePath="UPIPE_Acceptor.cpp">
+			</File>
+			<File
+				RelativePath="UPIPE_Connector.cpp">
+			</File>
+			<File
+				RelativePath="UPIPE_Stream.cpp">
+			</File>
+			<File
+				RelativePath="UTF16_Encoding_Converter.cpp">
+			</File>
+			<File
+				RelativePath="UTF32_Encoding_Converter.cpp">
+			</File>
+			<File
+				RelativePath="UTF8_Encoding_Converter.cpp">
+			</File>
+			<File
+				RelativePath="UUID.cpp">
+			</File>
+			<File
+				RelativePath="WFMO_Reactor.cpp">
+			</File>
+			<File
+				RelativePath="WIN32_Asynch_IO.cpp">
+			</File>
+			<File
+				RelativePath="WIN32_Proactor.cpp">
+			</File>
+			<File
+				RelativePath="XML_Svc_Conf.cpp">
+			</File>
+			<File
+				RelativePath="XTI_ATM_Mcast.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hh">
+			<File
+				RelativePath="Acceptor.h">
+			</File>
+			<File
+				RelativePath="ACE.h">
+			</File>
+			<File
+				RelativePath="ACE_export.h">
+			</File>
+			<File
+				RelativePath="ace_wchar.h">
+			</File>
+			<File
+				RelativePath="Activation_Queue.h">
+			</File>
+			<File
+				RelativePath="Active_Map_Manager.h">
+			</File>
+			<File
+				RelativePath="Active_Map_Manager_T.h">
+			</File>
+			<File
+				RelativePath="Addr.h">
+			</File>
+			<File
+				RelativePath="Arg_Shifter.h">
+			</File>
+			<File
+				RelativePath="ARGV.h">
+			</File>
+			<File
+				RelativePath="Argv_Type_Converter.h">
+			</File>
+			<File
+				RelativePath="Array_Base.h">
+			</File>
+			<File
+				RelativePath="Array_Map.h">
+			</File>
+			<File
+				RelativePath="Assert.h">
+			</File>
+			<File
+				RelativePath="Asynch_Acceptor.h">
+			</File>
+			<File
+				RelativePath="Asynch_Connector.h">
+			</File>
+			<File
+				RelativePath="Asynch_IO.h">
+			</File>
+			<File
+				RelativePath="Asynch_IO_Impl.h">
+			</File>
+			<File
+				RelativePath="Asynch_Pseudo_Task.h">
+			</File>
+			<File
+				RelativePath="ATM_Acceptor.h">
+			</File>
+			<File
+				RelativePath="ATM_Addr.h">
+			</File>
+			<File
+				RelativePath="ATM_Connector.h">
+			</File>
+			<File
+				RelativePath="ATM_Params.h">
+			</File>
+			<File
+				RelativePath="ATM_QoS.h">
+			</File>
+			<File
+				RelativePath="ATM_Stream.h">
+			</File>
+			<File
+				RelativePath="Atomic_Op.h">
+			</File>
+			<File
+				RelativePath="Atomic_Op_GCC_T.h">
+			</File>
+			<File
+				RelativePath="Atomic_Op_Sparc.h">
+			</File>
+			<File
+				RelativePath="Atomic_Op_T.h">
+			</File>
+			<File
+				RelativePath="Auto_Event.h">
+			</File>
+			<File
+				RelativePath="Auto_Functor.h">
+			</File>
+			<File
+				RelativePath="Auto_IncDec_T.h">
+			</File>
+			<File
+				RelativePath="Auto_Ptr.h">
+			</File>
+			<File
+				RelativePath="Barrier.h">
+			</File>
+			<File
+				RelativePath="Base_Thread_Adapter.h">
+			</File>
+			<File
+				RelativePath="Based_Pointer_Repository.h">
+			</File>
+			<File
+				RelativePath="Based_Pointer_T.h">
+			</File>
+			<File
+				RelativePath="Basic_Stats.h">
+			</File>
+			<File
+				RelativePath="Basic_Types.h">
+			</File>
+			<File
+				RelativePath="Bound_Ptr.h">
+			</File>
+			<File
+				RelativePath="Cache_Map_Manager_T.h">
+			</File>
+			<File
+				RelativePath="Cached_Connect_Strategy_T.h">
+			</File>
+			<File
+				RelativePath="Caching_Strategies_T.h">
+			</File>
+			<File
+				RelativePath="Caching_Utility_T.h">
+			</File>
+			<File
+				RelativePath="Capabilities.h">
+			</File>
+			<File
+				RelativePath="CDR_Base.h">
+			</File>
+			<File
+				RelativePath="CDR_Size.h">
+			</File>
+			<File
+				RelativePath="CDR_Stream.h">
+			</File>
+			<File
+				RelativePath="CE_Screen_Output.h">
+			</File>
+			<File
+				RelativePath="checked_iterator.h">
+			</File>
+			<File
+				RelativePath="Cleanup.h">
+			</File>
+			<File
+				RelativePath="Cleanup_Strategies_T.h">
+			</File>
+			<File
+				RelativePath="Codecs.h">
+			</File>
+			<File
+				RelativePath="Codeset_IBM1047.h">
+			</File>
+			<File
+				RelativePath="Codeset_Registry.h">
+			</File>
+			<File
+				RelativePath="Codeset_Symbols.h">
+			</File>
+			<File
+				RelativePath="Condition_Recursive_Thread_Mutex.h">
+			</File>
+			<File
+				RelativePath="Condition_T.h">
+			</File>
+			<File
+				RelativePath="Condition_Thread_Mutex.h">
+			</File>
+			<File
+				RelativePath="config-aix-5.x.h">
+			</File>
+			<File
+				RelativePath="config-all.h">
+			</File>
+			<File
+				RelativePath="config-cygwin32.h">
+			</File>
+			<File
+				RelativePath="config-doxygen.h">
+			</File>
+			<File
+				RelativePath="config-freebsd.h">
+			</File>
+			<File
+				RelativePath="config-g++-common.h">
+			</File>
+			<File
+				RelativePath="config-ghs-common.h">
+			</File>
+			<File
+				RelativePath="config-hpux-11.00.h">
+			</File>
+			<File
+				RelativePath="config-icc-common.h">
+			</File>
+			<File
+				RelativePath="config-integritySCA.h">
+			</File>
+			<File
+				RelativePath="config-kfreebsd.h">
+			</File>
+			<File
+				RelativePath="config-linux-common.h">
+			</File>
+			<File
+				RelativePath="config-linux.h">
+			</File>
+			<File
+				RelativePath="config-lite.h">
+			</File>
+			<File
+				RelativePath="config-lynxos.h">
+			</File>
+			<File
+				RelativePath="config-macosx-iphone-hardware.h">
+			</File>
+			<File
+				RelativePath="config-macosx-iphone-simulator.h">
+			</File>
+			<File
+				RelativePath="config-macosx-leopard.h">
+			</File>
+			<File
+				RelativePath="config-macosx-panther.h">
+			</File>
+			<File
+				RelativePath="config-macosx-snowleopard.h">
+			</File>
+			<File
+				RelativePath="config-macosx-tiger.h">
+			</File>
+			<File
+				RelativePath="config-macosx.h">
+			</File>
+			<File
+				RelativePath="config-macros.h">
+			</File>
+			<File
+				RelativePath="config-minimal.h">
+			</File>
+			<File
+				RelativePath="config-mvs.h">
+			</File>
+			<File
+				RelativePath="config-netbsd.h">
+			</File>
+			<File
+				RelativePath="config-openbsd.h">
+			</File>
+			<File
+				RelativePath="config-openvms.h">
+			</File>
+			<File
+				RelativePath="config-pharlap.h">
+			</File>
+			<File
+				RelativePath="config-posix-nonetworking.h">
+			</File>
+			<File
+				RelativePath="config-posix.h">
+			</File>
+			<File
+				RelativePath="config-qnx-neutrino.h">
+			</File>
+			<File
+				RelativePath="config-qnx-rtp-62x.h">
+			</File>
+			<File
+				RelativePath="config-qnx-rtp-common.h">
+			</File>
+			<File
+				RelativePath="config-qnx-rtp-pre62x.h">
+			</File>
+			<File
+				RelativePath="config-qnx-rtp.h">
+			</File>
+			<File
+				RelativePath="config-rtems.h">
+			</File>
+			<File
+				RelativePath="config-suncc-common.h">
+			</File>
+			<File
+				RelativePath="config-sunos5.10.h">
+			</File>
+			<File
+				RelativePath="config-sunos5.11.h">
+			</File>
+			<File
+				RelativePath="config-sunos5.4-g++.h">
+			</File>
+			<File
+				RelativePath="config-sunos5.4-sunc++-4.x.h">
+			</File>
+			<File
+				RelativePath="config-sunos5.5.h">
+			</File>
+			<File
+				RelativePath="config-sunos5.6.h">
+			</File>
+			<File
+				RelativePath="config-sunos5.7.h">
+			</File>
+			<File
+				RelativePath="config-sunos5.8.h">
+			</File>
+			<File
+				RelativePath="config-sunos5.9.h">
+			</File>
+			<File
+				RelativePath="config-tandem-nsk-mips-v2.h">
+			</File>
+			<File
+				RelativePath="config-tandem-nsk-mips-v3.h">
+			</File>
+			<File
+				RelativePath="config-tandem.h">
+			</File>
+			<File
+				RelativePath="config-visualage.h">
+			</File>
+			<File
+				RelativePath="config-vxworks.h">
+			</File>
+			<File
+				RelativePath="config-vxworks6.4.h">
+			</File>
+			<File
+				RelativePath="config-vxworks6.5.h">
+			</File>
+			<File
+				RelativePath="config-vxworks6.6.h">
+			</File>
+			<File
+				RelativePath="config-vxworks6.7.h">
+			</File>
+			<File
+				RelativePath="config-vxworks6.8.h">
+			</File>
+			<File
+				RelativePath="config-win32-borland.h">
+			</File>
+			<File
+				RelativePath="config-win32-cegcc.h">
+			</File>
+			<File
+				RelativePath="config-win32-common.h">
+			</File>
+			<File
+				RelativePath="config-win32-dmc.h">
+			</File>
+			<File
+				RelativePath="config-win32-interix.h">
+			</File>
+			<File
+				RelativePath="config-win32-mingw.h">
+			</File>
+			<File
+				RelativePath="config-win32-msvc-10.h">
+			</File>
+			<File
+				RelativePath="config-win32-msvc-7.h">
+			</File>
+			<File
+				RelativePath="config-win32-msvc-8.h">
+			</File>
+			<File
+				RelativePath="config-win32-msvc-9.h">
+			</File>
+			<File
+				RelativePath="config-win32-msvc.h">
+			</File>
+			<File
+				RelativePath="config-win32.h">
+			</File>
+			<File
+				RelativePath="config-WinCE.h">
+			</File>
+			<File
+				RelativePath="config.h">
+			</File>
+			<File
+				RelativePath="Configuration.h">
+			</File>
+			<File
+				RelativePath="Configuration_Import_Export.h">
+			</File>
+			<File
+				RelativePath="Connection_Recycling_Strategy.h">
+			</File>
+			<File
+				RelativePath="Connector.h">
+			</File>
+			<File
+				RelativePath="Containers.h">
+			</File>
+			<File
+				RelativePath="Containers_T.h">
+			</File>
+			<File
+				RelativePath="Copy_Disabled.h">
+			</File>
+			<File
+				RelativePath="CORBA_macros.h">
+			</File>
+			<File
+				RelativePath="Countdown_Time.h">
+			</File>
+			<File
+				RelativePath="Date_Time.h">
+			</File>
+			<File
+				RelativePath="Default_Constants.h">
+			</File>
+			<File
+				RelativePath="DEV.h">
+			</File>
+			<File
+				RelativePath="DEV_Addr.h">
+			</File>
+			<File
+				RelativePath="DEV_Connector.h">
+			</File>
+			<File
+				RelativePath="DEV_IO.h">
+			</File>
+			<File
+				RelativePath="Dev_Poll_Reactor.h">
+			</File>
+			<File
+				RelativePath="Dirent.h">
+			</File>
+			<File
+				RelativePath="Dirent_Selector.h">
+			</File>
+			<File
+				RelativePath="DLL.h">
+			</File>
+			<File
+				RelativePath="DLL_Manager.h">
+			</File>
+			<File
+				RelativePath="Dump.h">
+			</File>
+			<File
+				RelativePath="Dump_T.h">
+			</File>
+			<File
+				RelativePath="Dynamic.h">
+			</File>
+			<File
+				RelativePath="Dynamic_Message_Strategy.h">
+			</File>
+			<File
+				RelativePath="Dynamic_Service.h">
+			</File>
+			<File
+				RelativePath="Dynamic_Service_Base.h">
+			</File>
+			<File
+				RelativePath="Dynamic_Service_Dependency.h">
+			</File>
+			<File
+				RelativePath="Encoding_Converter.h">
+			</File>
+			<File
+				RelativePath="Encoding_Converter_Factory.h">
+			</File>
+			<File
+				RelativePath="Env_Value_T.h">
+			</File>
+			<File
+				RelativePath="Event.h">
+			</File>
+			<File
+				RelativePath="Event_Handler.h">
+			</File>
+			<File
+				RelativePath="Event_Handler_T.h">
+			</File>
+			<File
+				RelativePath="FIFO.h">
+			</File>
+			<File
+				RelativePath="FIFO_Recv.h">
+			</File>
+			<File
+				RelativePath="FIFO_Recv_Msg.h">
+			</File>
+			<File
+				RelativePath="FIFO_Send.h">
+			</File>
+			<File
+				RelativePath="FIFO_Send_Msg.h">
+			</File>
+			<File
+				RelativePath="FILE.h">
+			</File>
+			<File
+				RelativePath="FILE_Addr.h">
+			</File>
+			<File
+				RelativePath="FILE_Connector.h">
+			</File>
+			<File
+				RelativePath="FILE_IO.h">
+			</File>
+			<File
+				RelativePath="File_Lock.h">
+			</File>
+			<File
+				RelativePath="Filecache.h">
+			</File>
+			<File
+				RelativePath="Flag_Manip.h">
+			</File>
+			<File
+				RelativePath="Framework_Component.h">
+			</File>
+			<File
+				RelativePath="Framework_Component_T.h">
+			</File>
+			<File
+				RelativePath="Free_List.h">
+			</File>
+			<File
+				RelativePath="Functor.h">
+			</File>
+			<File
+				RelativePath="Functor_String.h">
+			</File>
+			<File
+				RelativePath="Functor_T.h">
+			</File>
+			<File
+				RelativePath="Future.h">
+			</File>
+			<File
+				RelativePath="Future_Set.h">
+			</File>
+			<File
+				RelativePath="Get_Opt.h">
+			</File>
+			<File
+				RelativePath="Global_Macros.h">
+			</File>
+			<File
+				RelativePath="Guard_T.h">
+			</File>
+			<File
+				RelativePath="Handle_Gobbler.h">
+			</File>
+			<File
+				RelativePath="Handle_Ops.h">
+			</File>
+			<File
+				RelativePath="Handle_Set.h">
+			</File>
+			<File
+				RelativePath="Hash_Cache_Map_Manager_T.h">
+			</File>
+			<File
+				RelativePath="Hash_Map_Manager.h">
+			</File>
+			<File
+				RelativePath="Hash_Map_Manager_T.h">
+			</File>
+			<File
+				RelativePath="Hash_Map_With_Allocator_T.h">
+			</File>
+			<File
+				RelativePath="Hash_Multi_Map_Manager_T.h">
+			</File>
+			<File
+				RelativePath="Hashable.h">
+			</File>
+			<File
+				RelativePath="High_Res_Timer.h">
+			</File>
+			<File
+				RelativePath="ICMP_Socket.h">
+			</File>
+			<File
+				RelativePath="If_Then_Else.h">
+			</File>
+			<File
+				RelativePath="INET_Addr.h">
+			</File>
+			<File
+				RelativePath="Init_ACE.h">
+			</File>
+			<File
+				RelativePath="Intrusive_Auto_Ptr.h">
+			</File>
+			<File
+				RelativePath="Intrusive_List.h">
+			</File>
+			<File
+				RelativePath="Intrusive_List_Node.h">
+			</File>
+			<File
+				RelativePath="IO_Cntl_Msg.h">
+			</File>
+			<File
+				RelativePath="IO_SAP.h">
+			</File>
+			<File
+				RelativePath="iosfwd.h">
+			</File>
+			<File
+				RelativePath="IOStream.h">
+			</File>
+			<File
+				RelativePath="IOStream_T.h">
+			</File>
+			<File
+				RelativePath="IPC_SAP.h">
+			</File>
+			<File
+				RelativePath="Lib_Find.h">
+			</File>
+			<File
+				RelativePath="Local_Memory_Pool.h">
+			</File>
+			<File
+				RelativePath="Local_Name_Space.h">
+			</File>
+			<File
+				RelativePath="Local_Name_Space_T.h">
+			</File>
+			<File
+				RelativePath="Local_Tokens.h">
+			</File>
+			<File
+				RelativePath="Lock.h">
+			</File>
+			<File
+				RelativePath="Lock_Adapter_T.h">
+			</File>
+			<File
+				RelativePath="LOCK_SOCK_Acceptor.h">
+			</File>
+			<File
+				RelativePath="Log_Msg.h">
+			</File>
+			<File
+				RelativePath="Log_Msg_Backend.h">
+			</File>
+			<File
+				RelativePath="Log_Msg_Callback.h">
+			</File>
+			<File
+				RelativePath="Log_Msg_IPC.h">
+			</File>
+			<File
+				RelativePath="Log_Msg_NT_Event_Log.h">
+			</File>
+			<File
+				RelativePath="Log_Msg_UNIX_Syslog.h">
+			</File>
+			<File
+				RelativePath="Log_Priority.h">
+			</File>
+			<File
+				RelativePath="Log_Record.h">
+			</File>
+			<File
+				RelativePath="Logging_Strategy.h">
+			</File>
+			<File
+				RelativePath="LSOCK.h">
+			</File>
+			<File
+				RelativePath="LSOCK_Acceptor.h">
+			</File>
+			<File
+				RelativePath="LSOCK_CODgram.h">
+			</File>
+			<File
+				RelativePath="LSOCK_Connector.h">
+			</File>
+			<File
+				RelativePath="LSOCK_Dgram.h">
+			</File>
+			<File
+				RelativePath="LSOCK_Stream.h">
+			</File>
+			<File
+				RelativePath="Malloc.h">
+			</File>
+			<File
+				RelativePath="Malloc_Allocator.h">
+			</File>
+			<File
+				RelativePath="Malloc_Base.h">
+			</File>
+			<File
+				RelativePath="Malloc_T.h">
+			</File>
+			<File
+				RelativePath="Managed_Object.h">
+			</File>
+			<File
+				RelativePath="Manual_Event.h">
+			</File>
+			<File
+				RelativePath="Map_Manager.h">
+			</File>
+			<File
+				RelativePath="Map_T.h">
+			</File>
+			<File
+				RelativePath="MEM_Acceptor.h">
+			</File>
+			<File
+				RelativePath="MEM_Addr.h">
+			</File>
+			<File
+				RelativePath="MEM_Connector.h">
+			</File>
+			<File
+				RelativePath="MEM_IO.h">
+			</File>
+			<File
+				RelativePath="Mem_Map.h">
+			</File>
+			<File
+				RelativePath="MEM_SAP.h">
+			</File>
+			<File
+				RelativePath="MEM_Stream.h">
+			</File>
+			<File
+				RelativePath="Memory_Pool.h">
+			</File>
+			<File
+				RelativePath="Message_Block.h">
+			</File>
+			<File
+				RelativePath="Message_Block_T.h">
+			</File>
+			<File
+				RelativePath="Message_Queue.h">
+			</File>
+			<File
+				RelativePath="Message_Queue_NT.h">
+			</File>
+			<File
+				RelativePath="Message_Queue_T.h">
+			</File>
+			<File
+				RelativePath="Message_Queue_Vx.h">
+			</File>
+			<File
+				RelativePath="Method_Request.h">
+			</File>
+			<File
+				RelativePath="Metrics_Cache.h">
+			</File>
+			<File
+				RelativePath="Metrics_Cache_T.h">
+			</File>
+			<File
+				RelativePath="Min_Max.h">
+			</File>
+			<File
+				RelativePath="MMAP_Memory_Pool.h">
+			</File>
+			<File
+				RelativePath="Module.h">
+			</File>
+			<File
+				RelativePath="Monitor_Admin.h">
+			</File>
+			<File
+				RelativePath="Monitor_Admin_Manager.h">
+			</File>
+			<File
+				RelativePath="Monitor_Base.h">
+			</File>
+			<File
+				RelativePath="Monitor_Control_Action.h">
+			</File>
+			<File
+				RelativePath="Monitor_Control_Types.h">
+			</File>
+			<File
+				RelativePath="Monitor_Point_Registry.h">
+			</File>
+			<File
+				RelativePath="Monitor_Size.h">
+			</File>
+			<File
+				RelativePath="Msg_WFMO_Reactor.h">
+			</File>
+			<File
+				RelativePath="Multihomed_INET_Addr.h">
+			</File>
+			<File
+				RelativePath="Mutex.h">
+			</File>
+			<File
+				RelativePath="Name_Proxy.h">
+			</File>
+			<File
+				RelativePath="Name_Request_Reply.h">
+			</File>
+			<File
+				RelativePath="Name_Space.h">
+			</File>
+			<File
+				RelativePath="Naming_Context.h">
+			</File>
+			<File
+				RelativePath="Netlink_Addr.h">
+			</File>
+			<File
+				RelativePath="Node.h">
+			</File>
+			<File
+				RelativePath="Notification_Queue.h">
+			</File>
+			<File
+				RelativePath="Notification_Strategy.h">
+			</File>
+			<File
+				RelativePath="NT_Service.h">
+			</File>
+			<File
+				RelativePath="Null_Barrier.h">
+			</File>
+			<File
+				RelativePath="Null_Condition.h">
+			</File>
+			<File
+				RelativePath="Null_Mutex.h">
+			</File>
+			<File
+				RelativePath="Null_Semaphore.h">
+			</File>
+			<File
+				RelativePath="Numeric_Limits.h">
+			</File>
+			<File
+				RelativePath="Obchunk.h">
+			</File>
+			<File
+				RelativePath="Object_Manager.h">
+			</File>
+			<File
+				RelativePath="Object_Manager_Base.h">
+			</File>
+			<File
+				RelativePath="Obstack.h">
+			</File>
+			<File
+				RelativePath="Obstack_T.h">
+			</File>
+			<File
+				RelativePath="OS_Errno.h">
+			</File>
+			<File
+				RelativePath="os_include\arpa\os_inet.h">
+			</File>
+			<File
+				RelativePath="os_include\net\os_if.h">
+			</File>
+			<File
+				RelativePath="os_include\netinet\os_in.h">
+			</File>
+			<File
+				RelativePath="os_include\netinet\os_tcp.h">
+			</File>
+			<File
+				RelativePath="os_include\os_aio.h">
+			</File>
+			<File
+				RelativePath="os_include\os_assert.h">
+			</File>
+			<File
+				RelativePath="os_include\os_byteswap.h">
+			</File>
+			<File
+				RelativePath="os_include\os_complex.h">
+			</File>
+			<File
+				RelativePath="os_include\os_cpio.h">
+			</File>
+			<File
+				RelativePath="os_include\os_ctype.h">
+			</File>
+			<File
+				RelativePath="os_include\os_dirent.h">
+			</File>
+			<File
+				RelativePath="os_include\os_dlfcn.h">
+			</File>
+			<File
+				RelativePath="os_include\os_errno.h">
+			</File>
+			<File
+				RelativePath="os_include\os_fcntl.h">
+			</File>
+			<File
+				RelativePath="os_include\os_fenv.h">
+			</File>
+			<File
+				RelativePath="os_include\os_float.h">
+			</File>
+			<File
+				RelativePath="os_include\os_fmtmsg.h">
+			</File>
+			<File
+				RelativePath="os_include\os_fnmatch.h">
+			</File>
+			<File
+				RelativePath="os_include\os_ftw.h">
+			</File>
+			<File
+				RelativePath="os_include\os_glob.h">
+			</File>
+			<File
+				RelativePath="os_include\os_grp.h">
+			</File>
+			<File
+				RelativePath="os_include\os_iconv.h">
+			</File>
+			<File
+				RelativePath="os_include\os_intrin.h">
+			</File>
+			<File
+				RelativePath="os_include\os_inttypes.h">
+			</File>
+			<File
+				RelativePath="os_include\os_iso646.h">
+			</File>
+			<File
+				RelativePath="os_include\os_kstat.h">
+			</File>
+			<File
+				RelativePath="os_include\os_langinfo.h">
+			</File>
+			<File
+				RelativePath="os_include\os_libgen.h">
+			</File>
+			<File
+				RelativePath="os_include\os_limits.h">
+			</File>
+			<File
+				RelativePath="os_include\os_local.h">
+			</File>
+			<File
+				RelativePath="os_include\os_math.h">
+			</File>
+			<File
+				RelativePath="os_include\os_monetary.h">
+			</File>
+			<File
+				RelativePath="os_include\os_mqueue.h">
+			</File>
+			<File
+				RelativePath="os_include\os_ndbm.h">
+			</File>
+			<File
+				RelativePath="os_include\os_netdb.h">
+			</File>
+			<File
+				RelativePath="os_include\os_nl_types.h">
+			</File>
+			<File
+				RelativePath="os_include\os_pdh.h">
+			</File>
+			<File
+				RelativePath="os_include\os_pdhmsg.h">
+			</File>
+			<File
+				RelativePath="os_include\os_poll.h">
+			</File>
+			<File
+				RelativePath="os_include\os_pthread.h">
+			</File>
+			<File
+				RelativePath="os_include\os_pwd.h">
+			</File>
+			<File
+				RelativePath="os_include\os_regex.h">
+			</File>
+			<File
+				RelativePath="os_include\os_sched.h">
+			</File>
+			<File
+				RelativePath="os_include\os_search.h">
+			</File>
+			<File
+				RelativePath="os_include\os_semaphore.h">
+			</File>
+			<File
+				RelativePath="os_include\os_setjmp.h">
+			</File>
+			<File
+				RelativePath="os_include\os_signal.h">
+			</File>
+			<File
+				RelativePath="os_include\os_spawn.h">
+			</File>
+			<File
+				RelativePath="os_include\os_stdarg.h">
+			</File>
+			<File
+				RelativePath="os_include\os_stdbool.h">
+			</File>
+			<File
+				RelativePath="os_include\os_stddef.h">
+			</File>
+			<File
+				RelativePath="os_include\os_stdint.h">
+			</File>
+			<File
+				RelativePath="os_include\os_stdio.h">
+			</File>
+			<File
+				RelativePath="os_include\os_stdlib.h">
+			</File>
+			<File
+				RelativePath="os_include\os_string.h">
+			</File>
+			<File
+				RelativePath="os_include\os_strings.h">
+			</File>
+			<File
+				RelativePath="os_include\os_stropts.h">
+			</File>
+			<File
+				RelativePath="os_include\os_syslog.h">
+			</File>
+			<File
+				RelativePath="os_include\os_tar.h">
+			</File>
+			<File
+				RelativePath="os_include\os_termios.h">
+			</File>
+			<File
+				RelativePath="os_include\os_tgmath.h">
+			</File>
+			<File
+				RelativePath="os_include\os_time.h">
+			</File>
+			<File
+				RelativePath="os_include\os_trace.h">
+			</File>
+			<File
+				RelativePath="os_include\os_typeinfo.h">
+			</File>
+			<File
+				RelativePath="os_include\os_ucontext.h">
+			</File>
+			<File
+				RelativePath="os_include\os_ulimit.h">
+			</File>
+			<File
+				RelativePath="os_include\os_unistd.h">
+			</File>
+			<File
+				RelativePath="os_include\os_utime.h">
+			</File>
+			<File
+				RelativePath="os_include\os_utmpx.h">
+			</File>
+			<File
+				RelativePath="os_include\os_wchar.h">
+			</File>
+			<File
+				RelativePath="os_include\os_wctype.h">
+			</File>
+			<File
+				RelativePath="os_include\os_wordexp.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_ipc.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_loadavg.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_mman.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_msg.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_pstat.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_resource.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_select.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_sem.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_shm.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_socket.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_stat.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_statvfs.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_sysctl.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_sysinfo.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_time.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_timeb.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_times.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_types.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_uio.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_un.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_utsname.h">
+			</File>
+			<File
+				RelativePath="os_include\sys\os_wait.h">
+			</File>
+			<File
+				RelativePath="OS_Log_Msg_Attributes.h">
+			</File>
+			<File
+				RelativePath="OS_main.h">
+			</File>
+			<File
+				RelativePath="OS_Memory.h">
+			</File>
+			<File
+				RelativePath="OS_NS_arpa_inet.h">
+			</File>
+			<File
+				RelativePath="OS_NS_ctype.h">
+			</File>
+			<File
+				RelativePath="OS_NS_dirent.h">
+			</File>
+			<File
+				RelativePath="OS_NS_dlfcn.h">
+			</File>
+			<File
+				RelativePath="OS_NS_errno.h">
+			</File>
+			<File
+				RelativePath="OS_NS_fcntl.h">
+			</File>
+			<File
+				RelativePath="OS_NS_macros.h">
+			</File>
+			<File
+				RelativePath="OS_NS_math.h">
+			</File>
+			<File
+				RelativePath="OS_NS_netdb.h">
+			</File>
+			<File
+				RelativePath="OS_NS_poll.h">
+			</File>
+			<File
+				RelativePath="OS_NS_pwd.h">
+			</File>
+			<File
+				RelativePath="OS_NS_regex.h">
+			</File>
+			<File
+				RelativePath="OS_NS_signal.h">
+			</File>
+			<File
+				RelativePath="OS_NS_stdio.h">
+			</File>
+			<File
+				RelativePath="OS_NS_stdlib.h">
+			</File>
+			<File
+				RelativePath="OS_NS_string.h">
+			</File>
+			<File
+				RelativePath="OS_NS_strings.h">
+			</File>
+			<File
+				RelativePath="OS_NS_stropts.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_mman.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_msg.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_resource.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_select.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_sendfile.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_shm.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_socket.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_stat.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_time.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_uio.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_utsname.h">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_wait.h">
+			</File>
+			<File
+				RelativePath="OS_NS_Thread.h">
+			</File>
+			<File
+				RelativePath="OS_NS_time.h">
+			</File>
+			<File
+				RelativePath="OS_NS_unistd.h">
+			</File>
+			<File
+				RelativePath="OS_NS_wchar.h">
+			</File>
+			<File
+				RelativePath="OS_NS_wctype.h">
+			</File>
+			<File
+				RelativePath="OS_QoS.h">
+			</File>
+			<File
+				RelativePath="OS_Thread_Adapter.h">
+			</File>
+			<File
+				RelativePath="OS_TLI.h">
+			</File>
+			<File
+				RelativePath="Pagefile_Memory_Pool.h">
+			</File>
+			<File
+				RelativePath="Pair_T.h">
+			</File>
+			<File
+				RelativePath="Parse_Node.h">
+			</File>
+			<File
+				RelativePath="PI_Malloc.h">
+			</File>
+			<File
+				RelativePath="Ping_Socket.h">
+			</File>
+			<File
+				RelativePath="Pipe.h">
+			</File>
+			<File
+				RelativePath="POSIX_Asynch_IO.h">
+			</File>
+			<File
+				RelativePath="POSIX_CB_Proactor.h">
+			</File>
+			<File
+				RelativePath="POSIX_Proactor.h">
+			</File>
+			<File
+				RelativePath="post.h">
+			</File>
+			<File
+				RelativePath="pre.h">
+			</File>
+			<File
+				RelativePath="Priority_Reactor.h">
+			</File>
+			<File
+				RelativePath="Proactor.h">
+			</File>
+			<File
+				RelativePath="Proactor_Impl.h">
+			</File>
+			<File
+				RelativePath="Process.h">
+			</File>
+			<File
+				RelativePath="Process_Manager.h">
+			</File>
+			<File
+				RelativePath="Process_Mutex.h">
+			</File>
+			<File
+				RelativePath="Process_Semaphore.h">
+			</File>
+			<File
+				RelativePath="Profile_Timer.h">
+			</File>
+			<File
+				RelativePath="RB_Tree.h">
+			</File>
+			<File
+				RelativePath="Reactor.h">
+			</File>
+			<File
+				RelativePath="Reactor_Impl.h">
+			</File>
+			<File
+				RelativePath="Reactor_Notification_Strategy.h">
+			</File>
+			<File
+				RelativePath="Reactor_Timer_Interface.h">
+			</File>
+			<File
+				RelativePath="Reactor_Token_T.h">
+			</File>
+			<File
+				RelativePath="Read_Buffer.h">
+			</File>
+			<File
+				RelativePath="Recursive_Thread_Mutex.h">
+			</File>
+			<File
+				RelativePath="Recyclable.h">
+			</File>
+			<File
+				RelativePath="Refcountable_T.h">
+			</File>
+			<File
+				RelativePath="Refcounted_Auto_Ptr.h">
+			</File>
+			<File
+				RelativePath="Registry.h">
+			</File>
+			<File
+				RelativePath="Registry_Name_Space.h">
+			</File>
+			<File
+				RelativePath="Remote_Name_Space.h">
+			</File>
+			<File
+				RelativePath="Remote_Tokens.h">
+			</File>
+			<File
+				RelativePath="Reverse_Lock_T.h">
+			</File>
+			<File
+				RelativePath="RW_Mutex.h">
+			</File>
+			<File
+				RelativePath="RW_Process_Mutex.h">
+			</File>
+			<File
+				RelativePath="RW_Thread_Mutex.h">
+			</File>
+			<File
+				RelativePath="Sample_History.h">
+			</File>
+			<File
+				RelativePath="Sbrk_Memory_Pool.h">
+			</File>
+			<File
+				RelativePath="Sched_Params.h">
+			</File>
+			<File
+				RelativePath="Select_Reactor.h">
+			</File>
+			<File
+				RelativePath="Select_Reactor_Base.h">
+			</File>
+			<File
+				RelativePath="Select_Reactor_T.h">
+			</File>
+			<File
+				RelativePath="Semaphore.h">
+			</File>
+			<File
+				RelativePath="Service_Config.h">
+			</File>
+			<File
+				RelativePath="Service_Gestalt.h">
+			</File>
+			<File
+				RelativePath="Service_Manager.h">
+			</File>
+			<File
+				RelativePath="Service_Object.h">
+			</File>
+			<File
+				RelativePath="Service_Repository.h">
+			</File>
+			<File
+				RelativePath="Service_Types.h">
+			</File>
+			<File
+				RelativePath="Shared_Memory.h">
+			</File>
+			<File
+				RelativePath="Shared_Memory_MM.h">
+			</File>
+			<File
+				RelativePath="Shared_Memory_Pool.h">
+			</File>
+			<File
+				RelativePath="Shared_Memory_SV.h">
+			</File>
+			<File
+				RelativePath="Shared_Object.h">
+			</File>
+			<File
+				RelativePath="Sig_Adapter.h">
+			</File>
+			<File
+				RelativePath="Sig_Handler.h">
+			</File>
+			<File
+				RelativePath="Signal.h">
+			</File>
+			<File
+				RelativePath="Singleton.h">
+			</File>
+			<File
+				RelativePath="SOCK.h">
+			</File>
+			<File
+				RelativePath="SOCK_Acceptor.h">
+			</File>
+			<File
+				RelativePath="SOCK_CODgram.h">
+			</File>
+			<File
+				RelativePath="Sock_Connect.h">
+			</File>
+			<File
+				RelativePath="SOCK_Connector.h">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram.h">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Bcast.h">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Mcast.h">
+			</File>
+			<File
+				RelativePath="SOCK_IO.h">
+			</File>
+			<File
+				RelativePath="SOCK_Netlink.h">
+			</File>
+			<File
+				RelativePath="SOCK_SEQPACK_Acceptor.h">
+			</File>
+			<File
+				RelativePath="SOCK_SEQPACK_Association.h">
+			</File>
+			<File
+				RelativePath="SOCK_SEQPACK_Connector.h">
+			</File>
+			<File
+				RelativePath="SOCK_Stream.h">
+			</File>
+			<File
+				RelativePath="SPIPE.h">
+			</File>
+			<File
+				RelativePath="SPIPE_Acceptor.h">
+			</File>
+			<File
+				RelativePath="SPIPE_Addr.h">
+			</File>
+			<File
+				RelativePath="SPIPE_Connector.h">
+			</File>
+			<File
+				RelativePath="SPIPE_Stream.h">
+			</File>
+			<File
+				RelativePath="SString.h">
+			</File>
+			<File
+				RelativePath="SStringfwd.h">
+			</File>
+			<File
+				RelativePath="Stack_Trace.h">
+			</File>
+			<File
+				RelativePath="Static_Object_Lock.h">
+			</File>
+			<File
+				RelativePath="Stats.h">
+			</File>
+			<File
+				RelativePath="Strategies.h">
+			</File>
+			<File
+				RelativePath="Strategies_T.h">
+			</File>
+			<File
+				RelativePath="Stream.h">
+			</File>
+			<File
+				RelativePath="Stream_Modules.h">
+			</File>
+			<File
+				RelativePath="streams.h">
+			</File>
+			<File
+				RelativePath="String_Base.h">
+			</File>
+			<File
+				RelativePath="String_Base_Const.h">
+			</File>
+			<File
+				RelativePath="SUN_Proactor.h">
+			</File>
+			<File
+				RelativePath="SV_Message.h">
+			</File>
+			<File
+				RelativePath="SV_Message_Queue.h">
+			</File>
+			<File
+				RelativePath="SV_Semaphore_Complex.h">
+			</File>
+			<File
+				RelativePath="SV_Semaphore_Simple.h">
+			</File>
+			<File
+				RelativePath="SV_Shared_Memory.h">
+			</File>
+			<File
+				RelativePath="Svc_Conf.h">
+			</File>
+			<File
+				RelativePath="Svc_Conf_Lexer.h">
+			</File>
+			<File
+				RelativePath="Svc_Conf_Param.h">
+			</File>
+			<File
+				RelativePath="Svc_Conf_Token_Table.h">
+			</File>
+			<File
+				RelativePath="Svc_Conf_Tokens.h">
+			</File>
+			<File
+				RelativePath="svc_export.h">
+			</File>
+			<File
+				RelativePath="Svc_Handler.h">
+			</File>
+			<File
+				RelativePath="Synch.h">
+			</File>
+			<File
+				RelativePath="Synch_Options.h">
+			</File>
+			<File
+				RelativePath="Synch_Traits.h">
+			</File>
+			<File
+				RelativePath="System_Time.h">
+			</File>
+			<File
+				RelativePath="Task.h">
+			</File>
+			<File
+				RelativePath="Task_Ex_T.h">
+			</File>
+			<File
+				RelativePath="Task_T.h">
+			</File>
+			<File
+				RelativePath="Test_and_Set.h">
+			</File>
+			<File
+				RelativePath="Thread.h">
+			</File>
+			<File
+				RelativePath="Thread_Adapter.h">
+			</File>
+			<File
+				RelativePath="Thread_Control.h">
+			</File>
+			<File
+				RelativePath="Thread_Exit.h">
+			</File>
+			<File
+				RelativePath="Thread_Hook.h">
+			</File>
+			<File
+				RelativePath="Thread_Manager.h">
+			</File>
+			<File
+				RelativePath="Thread_Mutex.h">
+			</File>
+			<File
+				RelativePath="Thread_Semaphore.h">
+			</File>
+			<File
+				RelativePath="Throughput_Stats.h">
+			</File>
+			<File
+				RelativePath="Time_Value.h">
+			</File>
+			<File
+				RelativePath="Timeprobe.h">
+			</File>
+			<File
+				RelativePath="Timeprobe_T.h">
+			</File>
+			<File
+				RelativePath="Timer_Hash.h">
+			</File>
+			<File
+				RelativePath="Timer_Hash_T.h">
+			</File>
+			<File
+				RelativePath="Timer_Heap.h">
+			</File>
+			<File
+				RelativePath="Timer_Heap_T.h">
+			</File>
+			<File
+				RelativePath="Timer_List.h">
+			</File>
+			<File
+				RelativePath="Timer_List_T.h">
+			</File>
+			<File
+				RelativePath="Timer_Queue.h">
+			</File>
+			<File
+				RelativePath="Timer_Queue_Adapters.h">
+			</File>
+			<File
+				RelativePath="Timer_Queue_T.h">
+			</File>
+			<File
+				RelativePath="Timer_Queuefwd.h">
+			</File>
+			<File
+				RelativePath="Timer_Wheel.h">
+			</File>
+			<File
+				RelativePath="Timer_Wheel_T.h">
+			</File>
+			<File
+				RelativePath="TLI.h">
+			</File>
+			<File
+				RelativePath="TLI_Acceptor.h">
+			</File>
+			<File
+				RelativePath="TLI_Connector.h">
+			</File>
+			<File
+				RelativePath="TLI_Stream.h">
+			</File>
+			<File
+				RelativePath="Token.h">
+			</File>
+			<File
+				RelativePath="Token_Collection.h">
+			</File>
+			<File
+				RelativePath="Token_Invariants.h">
+			</File>
+			<File
+				RelativePath="Token_Manager.h">
+			</File>
+			<File
+				RelativePath="Token_Request_Reply.h">
+			</File>
+			<File
+				RelativePath="Tokenizer_T.h">
+			</File>
+			<File
+				RelativePath="TP_Reactor.h">
+			</File>
+			<File
+				RelativePath="Trace.h">
+			</File>
+			<File
+				RelativePath="Truncate.h">
+			</File>
+			<File
+				RelativePath="TSS_Adapter.h">
+			</File>
+			<File
+				RelativePath="TSS_T.h">
+			</File>
+			<File
+				RelativePath="TTY_IO.h">
+			</File>
+			<File
+				RelativePath="Typed_SV_Message.h">
+			</File>
+			<File
+				RelativePath="Typed_SV_Message_Queue.h">
+			</File>
+			<File
+				RelativePath="Unbounded_Queue.h">
+			</File>
+			<File
+				RelativePath="Unbounded_Set.h">
+			</File>
+			<File
+				RelativePath="Unbounded_Set_Ex.h">
+			</File>
+			<File
+				RelativePath="UNIX_Addr.h">
+			</File>
+			<File
+				RelativePath="UPIPE_Acceptor.h">
+			</File>
+			<File
+				RelativePath="UPIPE_Addr.h">
+			</File>
+			<File
+				RelativePath="UPIPE_Connector.h">
+			</File>
+			<File
+				RelativePath="UPIPE_Stream.h">
+			</File>
+			<File
+				RelativePath="UTF16_Encoding_Converter.h">
+			</File>
+			<File
+				RelativePath="UTF32_Encoding_Converter.h">
+			</File>
+			<File
+				RelativePath="UTF8_Encoding_Converter.h">
+			</File>
+			<File
+				RelativePath="UUID.h">
+			</File>
+			<File
+				RelativePath="Value_Ptr.h">
+			</File>
+			<File
+				RelativePath="Vector_T.h">
+			</File>
+			<File
+				RelativePath="Version.h">
+			</File>
+			<File
+				RelativePath="Versioned_Namespace.h">
+			</File>
+			<File
+				RelativePath="WFMO_Reactor.h">
+			</File>
+			<File
+				RelativePath="WIN32_Asynch_IO.h">
+			</File>
+			<File
+				RelativePath="WIN32_Proactor.h">
+			</File>
+			<File
+				RelativePath="XML_Svc_Conf.h">
+			</File>
+			<File
+				RelativePath="XTI_ATM_Mcast.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Build Files"
+			Filter="mpc;mpb;mwc">
+			<File
+				RelativePath="ace.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ace.mwc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ace_for_tao.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="codecs.mpb">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="filecache.mpb">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="other.mpb">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="svcconf.mpb">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="svcconfgen.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="token.mpb">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="uuid.mpb">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Installdata Files"
+			Filter="">
+			<File
+				RelativePath="..\AUTHORS">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\bin\add_rel_link.sh">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\bin\DependencyGenerator">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\bin\depgen.pl">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\bin\MakeProjectCreator">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\bin\mpc.pl">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\bin\mwc.pl">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\COPYING">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\docs">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\include\makeinclude">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\NEWS">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\PROBLEM-REPORT-FORM">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\README">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\THANKS">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\VERSION">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Pkgconfig Files"
+			Filter="pcin">
+			<File
+				RelativePath="ACE.pc.in">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Inline Files"
+			Filter="i;ipp;inl">
+			<File
+				RelativePath="ACE.inl">
+			</File>
+			<File
+				RelativePath="ace_wchar.inl">
+			</File>
+			<File
+				RelativePath="Activation_Queue.inl">
+			</File>
+			<File
+				RelativePath="Active_Map_Manager.inl">
+			</File>
+			<File
+				RelativePath="Active_Map_Manager_T.inl">
+			</File>
+			<File
+				RelativePath="Addr.inl">
+			</File>
+			<File
+				RelativePath="ARGV.inl">
+			</File>
+			<File
+				RelativePath="Argv_Type_Converter.inl">
+			</File>
+			<File
+				RelativePath="Array_Base.inl">
+			</File>
+			<File
+				RelativePath="Array_Map.inl">
+			</File>
+			<File
+				RelativePath="Asynch_IO_Impl.inl">
+			</File>
+			<File
+				RelativePath="ATM_Acceptor.inl">
+			</File>
+			<File
+				RelativePath="ATM_Addr.inl">
+			</File>
+			<File
+				RelativePath="ATM_Connector.inl">
+			</File>
+			<File
+				RelativePath="ATM_Params.inl">
+			</File>
+			<File
+				RelativePath="ATM_QoS.inl">
+			</File>
+			<File
+				RelativePath="ATM_Stream.inl">
+			</File>
+			<File
+				RelativePath="Atomic_Op.inl">
+			</File>
+			<File
+				RelativePath="Atomic_Op_GCC_T.inl">
+			</File>
+			<File
+				RelativePath="Atomic_Op_T.inl">
+			</File>
+			<File
+				RelativePath="Auto_Event.inl">
+			</File>
+			<File
+				RelativePath="Auto_Functor.inl">
+			</File>
+			<File
+				RelativePath="Auto_IncDec_T.inl">
+			</File>
+			<File
+				RelativePath="Auto_Ptr.inl">
+			</File>
+			<File
+				RelativePath="Barrier.inl">
+			</File>
+			<File
+				RelativePath="Base_Thread_Adapter.inl">
+			</File>
+			<File
+				RelativePath="Based_Pointer_T.inl">
+			</File>
+			<File
+				RelativePath="Basic_Stats.inl">
+			</File>
+			<File
+				RelativePath="Basic_Types.inl">
+			</File>
+			<File
+				RelativePath="Bound_Ptr.inl">
+			</File>
+			<File
+				RelativePath="Cache_Map_Manager_T.inl">
+			</File>
+			<File
+				RelativePath="Caching_Strategies_T.inl">
+			</File>
+			<File
+				RelativePath="Capabilities.inl">
+			</File>
+			<File
+				RelativePath="CDR_Base.inl">
+			</File>
+			<File
+				RelativePath="CDR_Size.inl">
+			</File>
+			<File
+				RelativePath="CDR_Stream.inl">
+			</File>
+			<File
+				RelativePath="Cleanup.inl">
+			</File>
+			<File
+				RelativePath="Codeset_Registry.inl">
+			</File>
+			<File
+				RelativePath="Condition_T.inl">
+			</File>
+			<File
+				RelativePath="Condition_Thread_Mutex.inl">
+			</File>
+			<File
+				RelativePath="Configuration.inl">
+			</File>
+			<File
+				RelativePath="Containers.inl">
+			</File>
+			<File
+				RelativePath="Containers_T.inl">
+			</File>
+			<File
+				RelativePath="Countdown_Time.inl">
+			</File>
+			<File
+				RelativePath="Date_Time.inl">
+			</File>
+			<File
+				RelativePath="DEV.inl">
+			</File>
+			<File
+				RelativePath="DEV_Addr.inl">
+			</File>
+			<File
+				RelativePath="DEV_Connector.inl">
+			</File>
+			<File
+				RelativePath="DEV_IO.inl">
+			</File>
+			<File
+				RelativePath="Dev_Poll_Reactor.inl">
+			</File>
+			<File
+				RelativePath="Dirent.inl">
+			</File>
+			<File
+				RelativePath="Dirent_Selector.inl">
+			</File>
+			<File
+				RelativePath="Dynamic.inl">
+			</File>
+			<File
+				RelativePath="Dynamic_Message_Strategy.inl">
+			</File>
+			<File
+				RelativePath="Dynamic_Service.inl">
+			</File>
+			<File
+				RelativePath="Env_Value_T.inl">
+			</File>
+			<File
+				RelativePath="Event.inl">
+			</File>
+			<File
+				RelativePath="Event_Handler.inl">
+			</File>
+			<File
+				RelativePath="Event_Handler_T.inl">
+			</File>
+			<File
+				RelativePath="FIFO.inl">
+			</File>
+			<File
+				RelativePath="FIFO_Recv.inl">
+			</File>
+			<File
+				RelativePath="FIFO_Recv_Msg.inl">
+			</File>
+			<File
+				RelativePath="FIFO_Send.inl">
+			</File>
+			<File
+				RelativePath="FIFO_Send_Msg.inl">
+			</File>
+			<File
+				RelativePath="FILE.inl">
+			</File>
+			<File
+				RelativePath="FILE_Addr.inl">
+			</File>
+			<File
+				RelativePath="FILE_Connector.inl">
+			</File>
+			<File
+				RelativePath="FILE_IO.inl">
+			</File>
+			<File
+				RelativePath="File_Lock.inl">
+			</File>
+			<File
+				RelativePath="Flag_Manip.inl">
+			</File>
+			<File
+				RelativePath="Framework_Component.inl">
+			</File>
+			<File
+				RelativePath="Functor.inl">
+			</File>
+			<File
+				RelativePath="Functor_String.inl">
+			</File>
+			<File
+				RelativePath="Functor_T.inl">
+			</File>
+			<File
+				RelativePath="Get_Opt.inl">
+			</File>
+			<File
+				RelativePath="Guard_T.inl">
+			</File>
+			<File
+				RelativePath="Handle_Gobbler.inl">
+			</File>
+			<File
+				RelativePath="Handle_Set.inl">
+			</File>
+			<File
+				RelativePath="Hash_Cache_Map_Manager_T.inl">
+			</File>
+			<File
+				RelativePath="Hash_Map_Manager_T.inl">
+			</File>
+			<File
+				RelativePath="Hash_Map_With_Allocator_T.inl">
+			</File>
+			<File
+				RelativePath="Hash_Multi_Map_Manager_T.inl">
+			</File>
+			<File
+				RelativePath="Hashable.inl">
+			</File>
+			<File
+				RelativePath="High_Res_Timer.inl">
+			</File>
+			<File
+				RelativePath="INET_Addr.inl">
+			</File>
+			<File
+				RelativePath="Intrusive_Auto_Ptr.inl">
+			</File>
+			<File
+				RelativePath="Intrusive_List.inl">
+			</File>
+			<File
+				RelativePath="Intrusive_List_Node.inl">
+			</File>
+			<File
+				RelativePath="IO_Cntl_Msg.inl">
+			</File>
+			<File
+				RelativePath="IO_SAP.inl">
+			</File>
+			<File
+				RelativePath="IOStream_T.inl">
+			</File>
+			<File
+				RelativePath="IPC_SAP.inl">
+			</File>
+			<File
+				RelativePath="Local_Tokens.inl">
+			</File>
+			<File
+				RelativePath="Lock.inl">
+			</File>
+			<File
+				RelativePath="Lock_Adapter_T.inl">
+			</File>
+			<File
+				RelativePath="Log_Msg.inl">
+			</File>
+			<File
+				RelativePath="Log_Record.inl">
+			</File>
+			<File
+				RelativePath="LSOCK.inl">
+			</File>
+			<File
+				RelativePath="LSOCK_CODgram.inl">
+			</File>
+			<File
+				RelativePath="LSOCK_Connector.inl">
+			</File>
+			<File
+				RelativePath="LSOCK_Dgram.inl">
+			</File>
+			<File
+				RelativePath="LSOCK_Stream.inl">
+			</File>
+			<File
+				RelativePath="Malloc.inl">
+			</File>
+			<File
+				RelativePath="Malloc_Allocator.inl">
+			</File>
+			<File
+				RelativePath="Malloc_T.inl">
+			</File>
+			<File
+				RelativePath="Managed_Object.inl">
+			</File>
+			<File
+				RelativePath="Manual_Event.inl">
+			</File>
+			<File
+				RelativePath="Map_Manager.inl">
+			</File>
+			<File
+				RelativePath="Map_T.inl">
+			</File>
+			<File
+				RelativePath="MEM_Acceptor.inl">
+			</File>
+			<File
+				RelativePath="MEM_Addr.inl">
+			</File>
+			<File
+				RelativePath="MEM_Connector.inl">
+			</File>
+			<File
+				RelativePath="MEM_IO.inl">
+			</File>
+			<File
+				RelativePath="Mem_Map.inl">
+			</File>
+			<File
+				RelativePath="MEM_SAP.inl">
+			</File>
+			<File
+				RelativePath="MEM_Stream.inl">
+			</File>
+			<File
+				RelativePath="Message_Block.inl">
+			</File>
+			<File
+				RelativePath="Message_Block_T.inl">
+			</File>
+			<File
+				RelativePath="Message_Queue.inl">
+			</File>
+			<File
+				RelativePath="Message_Queue_NT.inl">
+			</File>
+			<File
+				RelativePath="Message_Queue_Vx.inl">
+			</File>
+			<File
+				RelativePath="Metrics_Cache_T.inl">
+			</File>
+			<File
+				RelativePath="MMAP_Memory_Pool.inl">
+			</File>
+			<File
+				RelativePath="Module.inl">
+			</File>
+			<File
+				RelativePath="Monitor_Base.inl">
+			</File>
+			<File
+				RelativePath="Msg_WFMO_Reactor.inl">
+			</File>
+			<File
+				RelativePath="Multihomed_INET_Addr.inl">
+			</File>
+			<File
+				RelativePath="Mutex.inl">
+			</File>
+			<File
+				RelativePath="Naming_Context.inl">
+			</File>
+			<File
+				RelativePath="Netlink_Addr.inl">
+			</File>
+			<File
+				RelativePath="Notification_Queue.inl">
+			</File>
+			<File
+				RelativePath="Notification_Strategy.inl">
+			</File>
+			<File
+				RelativePath="NT_Service.inl">
+			</File>
+			<File
+				RelativePath="Obchunk.inl">
+			</File>
+			<File
+				RelativePath="Object_Manager.inl">
+			</File>
+			<File
+				RelativePath="Obstack_T.inl">
+			</File>
+			<File
+				RelativePath="OS_Errno.inl">
+			</File>
+			<File
+				RelativePath="OS_Log_Msg_Attributes.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_arpa_inet.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_ctype.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_dirent.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_dlfcn.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_errno.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_fcntl.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_math.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_netdb.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_poll.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_pwd.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_regex.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_signal.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_stdio.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_stdlib.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_string.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_strings.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_stropts.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_mman.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_msg.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_resource.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_select.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_sendfile.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_shm.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_socket.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_stat.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_time.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_uio.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_sys_wait.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_Thread.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_time.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_unistd.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_wchar.inl">
+			</File>
+			<File
+				RelativePath="OS_NS_wctype.inl">
+			</File>
+			<File
+				RelativePath="OS_TLI.inl">
+			</File>
+			<File
+				RelativePath="Pagefile_Memory_Pool.inl">
+			</File>
+			<File
+				RelativePath="Pair_T.inl">
+			</File>
+			<File
+				RelativePath="PI_Malloc.inl">
+			</File>
+			<File
+				RelativePath="Ping_Socket.inl">
+			</File>
+			<File
+				RelativePath="Pipe.inl">
+			</File>
+			<File
+				RelativePath="POSIX_Proactor.inl">
+			</File>
+			<File
+				RelativePath="Proactor.inl">
+			</File>
+			<File
+				RelativePath="Process.inl">
+			</File>
+			<File
+				RelativePath="Process_Manager.inl">
+			</File>
+			<File
+				RelativePath="Process_Mutex.inl">
+			</File>
+			<File
+				RelativePath="Process_Semaphore.inl">
+			</File>
+			<File
+				RelativePath="Profile_Timer.inl">
+			</File>
+			<File
+				RelativePath="RB_Tree.inl">
+			</File>
+			<File
+				RelativePath="Reactor.inl">
+			</File>
+			<File
+				RelativePath="Reactor_Notification_Strategy.inl">
+			</File>
+			<File
+				RelativePath="Read_Buffer.inl">
+			</File>
+			<File
+				RelativePath="Recursive_Thread_Mutex.inl">
+			</File>
+			<File
+				RelativePath="Recyclable.inl">
+			</File>
+			<File
+				RelativePath="Refcountable_T.inl">
+			</File>
+			<File
+				RelativePath="Refcounted_Auto_Ptr.inl">
+			</File>
+			<File
+				RelativePath="Remote_Tokens.inl">
+			</File>
+			<File
+				RelativePath="Reverse_Lock_T.inl">
+			</File>
+			<File
+				RelativePath="RW_Mutex.inl">
+			</File>
+			<File
+				RelativePath="RW_Process_Mutex.inl">
+			</File>
+			<File
+				RelativePath="RW_Thread_Mutex.inl">
+			</File>
+			<File
+				RelativePath="Sample_History.inl">
+			</File>
+			<File
+				RelativePath="Sched_Params.inl">
+			</File>
+			<File
+				RelativePath="Select_Reactor_Base.inl">
+			</File>
+			<File
+				RelativePath="Select_Reactor_T.inl">
+			</File>
+			<File
+				RelativePath="Semaphore.inl">
+			</File>
+			<File
+				RelativePath="Service_Config.inl">
+			</File>
+			<File
+				RelativePath="Service_Gestalt.inl">
+			</File>
+			<File
+				RelativePath="Service_Object.inl">
+			</File>
+			<File
+				RelativePath="Service_Repository.inl">
+			</File>
+			<File
+				RelativePath="Service_Types.inl">
+			</File>
+			<File
+				RelativePath="Shared_Memory_MM.inl">
+			</File>
+			<File
+				RelativePath="Shared_Memory_SV.inl">
+			</File>
+			<File
+				RelativePath="Shared_Object.inl">
+			</File>
+			<File
+				RelativePath="Sig_Handler.inl">
+			</File>
+			<File
+				RelativePath="Signal.inl">
+			</File>
+			<File
+				RelativePath="Singleton.inl">
+			</File>
+			<File
+				RelativePath="SOCK.inl">
+			</File>
+			<File
+				RelativePath="SOCK_Acceptor.inl">
+			</File>
+			<File
+				RelativePath="SOCK_CODgram.inl">
+			</File>
+			<File
+				RelativePath="SOCK_Connector.inl">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram.inl">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Bcast.inl">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Mcast.inl">
+			</File>
+			<File
+				RelativePath="SOCK_IO.inl">
+			</File>
+			<File
+				RelativePath="SOCK_Netlink.inl">
+			</File>
+			<File
+				RelativePath="SOCK_SEQPACK_Acceptor.inl">
+			</File>
+			<File
+				RelativePath="SOCK_SEQPACK_Association.inl">
+			</File>
+			<File
+				RelativePath="SOCK_SEQPACK_Connector.inl">
+			</File>
+			<File
+				RelativePath="SOCK_Stream.inl">
+			</File>
+			<File
+				RelativePath="SPIPE.inl">
+			</File>
+			<File
+				RelativePath="SPIPE_Addr.inl">
+			</File>
+			<File
+				RelativePath="SPIPE_Connector.inl">
+			</File>
+			<File
+				RelativePath="SPIPE_Stream.inl">
+			</File>
+			<File
+				RelativePath="SString.inl">
+			</File>
+			<File
+				RelativePath="Stats.inl">
+			</File>
+			<File
+				RelativePath="Strategies_T.inl">
+			</File>
+			<File
+				RelativePath="Stream.inl">
+			</File>
+			<File
+				RelativePath="String_Base.inl">
+			</File>
+			<File
+				RelativePath="SV_Message.inl">
+			</File>
+			<File
+				RelativePath="SV_Message_Queue.inl">
+			</File>
+			<File
+				RelativePath="SV_Semaphore_Complex.inl">
+			</File>
+			<File
+				RelativePath="SV_Semaphore_Simple.inl">
+			</File>
+			<File
+				RelativePath="SV_Shared_Memory.inl">
+			</File>
+			<File
+				RelativePath="Task.inl">
+			</File>
+			<File
+				RelativePath="Task_Ex_T.inl">
+			</File>
+			<File
+				RelativePath="Task_T.inl">
+			</File>
+			<File
+				RelativePath="Thread.inl">
+			</File>
+			<File
+				RelativePath="Thread_Adapter.inl">
+			</File>
+			<File
+				RelativePath="Thread_Control.inl">
+			</File>
+			<File
+				RelativePath="Thread_Manager.inl">
+			</File>
+			<File
+				RelativePath="Thread_Mutex.inl">
+			</File>
+			<File
+				RelativePath="Thread_Semaphore.inl">
+			</File>
+			<File
+				RelativePath="Time_Value.inl">
+			</File>
+			<File
+				RelativePath="Timeprobe.inl">
+			</File>
+			<File
+				RelativePath="Timer_Queue_Adapters.inl">
+			</File>
+			<File
+				RelativePath="Timer_Queue_T.inl">
+			</File>
+			<File
+				RelativePath="TLI.inl">
+			</File>
+			<File
+				RelativePath="TLI_Connector.inl">
+			</File>
+			<File
+				RelativePath="TLI_Stream.inl">
+			</File>
+			<File
+				RelativePath="Token.inl">
+			</File>
+			<File
+				RelativePath="Token_Collection.inl">
+			</File>
+			<File
+				RelativePath="Token_Manager.inl">
+			</File>
+			<File
+				RelativePath="Token_Request_Reply.inl">
+			</File>
+			<File
+				RelativePath="TP_Reactor.inl">
+			</File>
+			<File
+				RelativePath="TSS_T.inl">
+			</File>
+			<File
+				RelativePath="Typed_SV_Message.inl">
+			</File>
+			<File
+				RelativePath="Typed_SV_Message_Queue.inl">
+			</File>
+			<File
+				RelativePath="Unbounded_Queue.inl">
+			</File>
+			<File
+				RelativePath="Unbounded_Set.inl">
+			</File>
+			<File
+				RelativePath="Unbounded_Set_Ex.inl">
+			</File>
+			<File
+				RelativePath="UNIX_Addr.inl">
+			</File>
+			<File
+				RelativePath="UPIPE_Acceptor.inl">
+			</File>
+			<File
+				RelativePath="UPIPE_Connector.inl">
+			</File>
+			<File
+				RelativePath="UPIPE_Stream.inl">
+			</File>
+			<File
+				RelativePath="UTF16_Encoding_Converter.inl">
+			</File>
+			<File
+				RelativePath="UUID.inl">
+			</File>
+			<File
+				RelativePath="Vector_T.inl">
+			</File>
+			<File
+				RelativePath="WFMO_Reactor.inl">
+			</File>
+			<File
+				RelativePath="XTI_ATM_Mcast.inl">
+			</File>
+		</Filter>
+		<Filter
+			Name="Template Files"
+			Filter="">
+			<File
+				RelativePath="Acceptor.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Active_Map_Manager_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Arg_Shifter.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ARGV.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Array_Base.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Array_Map.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Asynch_Acceptor.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Asynch_Connector.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Atomic_Op_GCC_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Atomic_Op_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Auto_Functor.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Auto_IncDec_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Auto_Ptr.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Based_Pointer_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Cache_Map_Manager_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Cached_Connect_Strategy_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Caching_Strategies_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Caching_Utility_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Cleanup_Strategies_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Condition_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Connector.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Containers_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Dump_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Dynamic_Service.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Env_Value_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Event_Handler_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Framework_Component_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Free_List.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Functor_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Future.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Future_Set.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Guard_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Hash_Cache_Map_Manager_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Hash_Map_Manager_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Hash_Map_With_Allocator_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Hash_Multi_Map_Manager_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Intrusive_Auto_Ptr.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Intrusive_List.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Intrusive_List_Node.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="IOStream_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Local_Name_Space_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Lock_Adapter_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="LOCK_SOCK_Acceptor.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Malloc_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Managed_Object.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Map_Manager.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Map_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Message_Block_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Message_Queue_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Metrics_Cache_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Module.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Node.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Obstack_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Pair_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="RB_Tree.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Reactor_Token_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Refcountable_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Refcounted_Auto_Ptr.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Reverse_Lock_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Select_Reactor_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Singleton.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Strategies_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Stream.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Stream_Modules.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="String_Base.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Svc_Handler.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Task_Ex_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Task_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Test_and_Set.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Timeprobe_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Timer_Hash_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Timer_Heap_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Timer_List_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Timer_Queue_Adapters.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Timer_Queue_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Timer_Wheel_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Tokenizer_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="TSS_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Typed_SV_Message.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Typed_SV_Message_Queue.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Unbounded_Queue.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Unbounded_Set.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Unbounded_Set_Ex.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Vector_T.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Documentation"
+			Filter="">
+			<File
+				RelativePath="..\VERSION">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="README">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">
+			<File
+				RelativePath="ace.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc10.vcxproj b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc10.vcxproj
index 0202c346447..05947d96d6d 100644
--- a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc10.vcxproj
+++ b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc10.vcxproj
@@ -1,301 +1,301 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ACE_ETCL_Parser</ProjectName>
-    <ProjectGuid>{42B1A787-FECA-1BAD-007E-8A67757B007A}</ProjectGuid>
-    <RootNamespace>ACE_ETCL_Parser</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\ACE_ETCL_Parser_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACE_ETCL_Parserd</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\ACE_ETCL_Parser_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE_ETCL_Parser</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\ACE_ETCL_Parser_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ACE_ETCL_Parserd</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\ACE_ETCL_Parser_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ACE_ETCL_Parser</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACEd.lib;ACE_ETCLd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_ETCL_Parserd.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\..\lib\ACE_ETCL_Parserd.lib</ImportLibrary>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACE.lib;ACE_ETCL.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_ETCL_Parser.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\..\lib\ACE_ETCL_Parser.lib</ImportLibrary>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACEd.lib;ACE_ETCLd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_ETCL_Parserd.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\..\lib\ACE_ETCL_Parserd.lib</ImportLibrary>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACE.lib;ACE_ETCL.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_ETCL_Parser.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\..\lib\ACE_ETCL_Parser.lib</ImportLibrary>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ETCL_Interpreter.cpp">
-    </ClCompile>
-    <ClCompile Include="ETCL_l.cpp">
-    </ClCompile>
-    <ClCompile Include="ETCL_y.cpp">
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ETCL_Interpreter.h" />
-    <ClInclude Include="etcl_parser_export.h" />
-    <ClInclude Include="ETCL_y.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ETCL.mpc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ACE_ETCL_Parser.pc.in">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ACE_ETCL_Parser</ProjectName>
+    <ProjectGuid>{42B1A787-FECA-1BAD-007E-8A67757B007A}</ProjectGuid>
+    <RootNamespace>ACE_ETCL_Parser</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\ACE_ETCL_Parser_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACE_ETCL_Parserd</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\ACE_ETCL_Parser_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE_ETCL_Parser</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\ACE_ETCL_Parser_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ACE_ETCL_Parserd</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\ACE_ETCL_Parser_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ACE_ETCL_Parser</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACEd.lib;ACE_ETCLd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_ETCL_Parserd.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImportLibrary>..\..\lib\ACE_ETCL_Parserd.lib</ImportLibrary>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACE.lib;ACE_ETCL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_ETCL_Parser.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\lib\ACE_ETCL_Parser.lib</ImportLibrary>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACEd.lib;ACE_ETCLd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_ETCL_Parserd.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImportLibrary>..\..\lib\ACE_ETCL_Parserd.lib</ImportLibrary>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACE.lib;ACE_ETCL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_ETCL_Parser.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\lib\ACE_ETCL_Parser.lib</ImportLibrary>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ETCL_Interpreter.cpp">
+    </ClCompile>
+    <ClCompile Include="ETCL_l.cpp">
+    </ClCompile>
+    <ClCompile Include="ETCL_y.cpp">
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ETCL_Interpreter.h" />
+    <ClInclude Include="etcl_parser_export.h" />
+    <ClInclude Include="ETCL_y.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ETCL.mpc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ACE_ETCL_Parser.pc.in">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc10.vcxproj.filters b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc10.vcxproj.filters
index 84f32bc8770..b5755469254 100644
--- a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc10.vcxproj.filters
+++ b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc10.vcxproj.filters
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{B1F27843-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
-      <Extensions>cpp;cxx;cc;c;C</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{06319535-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hh</Extensions>
-    </Filter>
-    <Filter Include="Build Files">
-      <UniqueIdentifier>{A1909F1C-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
-      <Extensions>mpc;mpb;mwc</Extensions>
-    </Filter>
-    <Filter Include="Pkgconfig Files">
-      <UniqueIdentifier>{8441A3A3-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
-      <Extensions>pcin</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ETCL_Interpreter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ETCL_l.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ETCL_y.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ETCL_Interpreter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="etcl_parser_export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ETCL_y.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ETCL.mpc">
-      <Filter>Build Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ACE_ETCL_Parser.pc.in">
-      <Filter>Pkgconfig Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{B1F27843-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
+      <Extensions>cpp;cxx;cc;c;C</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{06319535-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hh</Extensions>
+    </Filter>
+    <Filter Include="Build Files">
+      <UniqueIdentifier>{A1909F1C-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
+      <Extensions>mpc;mpb;mwc</Extensions>
+    </Filter>
+    <Filter Include="Pkgconfig Files">
+      <UniqueIdentifier>{8441A3A3-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
+      <Extensions>pcin</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ETCL_Interpreter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ETCL_l.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ETCL_y.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ETCL_Interpreter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="etcl_parser_export.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ETCL_y.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ETCL.mpc">
+      <Filter>Build Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ACE_ETCL_Parser.pc.in">
+      <Filter>Pkgconfig Files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc8.vcproj b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc8.vcproj
index d7b39c6b76d..91690144b71 100644
--- a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc8.vcproj
+++ b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc8.vcproj
@@ -1,441 +1,441 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ACE_ETCL_Parser"
-	ProjectGUID="{C756716B-FECA-1BAD-007E-8A67757B007A}"
-	RootNamespace="ACE_ETCL_Parser"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\ACE_ETCL_Parser_vc8\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib"
-				OutputFile="$(OutDir)\ACE_ETCL_Parserd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_ETCL_Parserd.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\ACE_ETCL_Parser_vc8\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib ACE_ETCL.lib"
-				OutputFile="$(OutDir)\ACE_ETCL_Parser.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_ETCL_Parser.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\ACE_ETCL_Parser_vc8\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib"
-				OutputFile="$(OutDir)\ACE_ETCL_Parserd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_ETCL_Parserd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\ACE_ETCL_Parser_vc8\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACE.lib ACE_ETCL.lib"
-				OutputFile="$(OutDir)\ACE_ETCL_Parser.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_ETCL_Parser.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C">
-			<File
-				RelativePath="ETCL_Interpreter.cpp">
-			</File>
-			<File
-				RelativePath="ETCL_l.cpp">
-			</File>
-			<File
-				RelativePath="ETCL_y.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hh">
-			<File
-				RelativePath="ETCL_Interpreter.h">
-			</File>
-			<File
-				RelativePath="etcl_parser_export.h">
-			</File>
-			<File
-				RelativePath="ETCL_y.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			Filter="mpc;mpb;mwc">
-			<File
-				RelativePath="ETCL.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Pkgconfig Files"
-			Filter="pcin">
-			<File
-				RelativePath="ACE_ETCL_Parser.pc.in">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ACE_ETCL_Parser"
+	ProjectGUID="{C756716B-FECA-1BAD-007E-8A67757B007A}"
+	RootNamespace="ACE_ETCL_Parser"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\ACE_ETCL_Parser_vc8\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib"
+				OutputFile="$(OutDir)\ACE_ETCL_Parserd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_ETCL_Parserd.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\ACE_ETCL_Parser_vc8\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACE.lib ACE_ETCL.lib"
+				OutputFile="$(OutDir)\ACE_ETCL_Parser.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_ETCL_Parser.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\ACE_ETCL_Parser_vc8\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib"
+				OutputFile="$(OutDir)\ACE_ETCL_Parserd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_ETCL_Parserd.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\ACE_ETCL_Parser_vc8\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACE.lib ACE_ETCL.lib"
+				OutputFile="$(OutDir)\ACE_ETCL_Parser.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_ETCL_Parser.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;c;C">
+			<File
+				RelativePath="ETCL_Interpreter.cpp">
+			</File>
+			<File
+				RelativePath="ETCL_l.cpp">
+			</File>
+			<File
+				RelativePath="ETCL_y.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hh">
+			<File
+				RelativePath="ETCL_Interpreter.h">
+			</File>
+			<File
+				RelativePath="etcl_parser_export.h">
+			</File>
+			<File
+				RelativePath="ETCL_y.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Build Files"
+			Filter="mpc;mpb;mwc">
+			<File
+				RelativePath="ETCL.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Pkgconfig Files"
+			Filter="pcin">
+			<File
+				RelativePath="ACE_ETCL_Parser.pc.in">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc9.vcproj b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc9.vcproj
index 8b1b32a28d6..14ce1b72c25 100644
--- a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc9.vcproj
+++ b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc9.vcproj
@@ -1,441 +1,441 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ACE_ETCL_Parser"
-	ProjectGUID="{D756716B-FECA-1BAD-007E-8A67757B007A}"
-	RootNamespace="ACE_ETCL_Parser"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\ACE_ETCL_Parser_vc9\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib"
-				OutputFile="$(OutDir)\ACE_ETCL_Parserd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_ETCL_Parserd.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\ACE_ETCL_Parser_vc9\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib ACE_ETCL.lib"
-				OutputFile="$(OutDir)\ACE_ETCL_Parser.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_ETCL_Parser.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\ACE_ETCL_Parser_vc9\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib"
-				OutputFile="$(OutDir)\ACE_ETCL_Parserd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_ETCL_Parserd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\ACE_ETCL_Parser_vc9\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACE.lib ACE_ETCL.lib"
-				OutputFile="$(OutDir)\ACE_ETCL_Parser.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_ETCL_Parser.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C">
-			<File
-				RelativePath="ETCL_Interpreter.cpp">
-			</File>
-			<File
-				RelativePath="ETCL_l.cpp">
-			</File>
-			<File
-				RelativePath="ETCL_y.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hh">
-			<File
-				RelativePath="ETCL_Interpreter.h">
-			</File>
-			<File
-				RelativePath="etcl_parser_export.h">
-			</File>
-			<File
-				RelativePath="ETCL_y.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			Filter="mpc;mpb;mwc">
-			<File
-				RelativePath="ETCL.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Pkgconfig Files"
-			Filter="pcin">
-			<File
-				RelativePath="ACE_ETCL_Parser.pc.in">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="ACE_ETCL_Parser"
+	ProjectGUID="{D756716B-FECA-1BAD-007E-8A67757B007A}"
+	RootNamespace="ACE_ETCL_Parser"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\ACE_ETCL_Parser_vc9\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib"
+				OutputFile="$(OutDir)\ACE_ETCL_Parserd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_ETCL_Parserd.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\ACE_ETCL_Parser_vc9\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACE.lib ACE_ETCL.lib"
+				OutputFile="$(OutDir)\ACE_ETCL_Parser.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_ETCL_Parser.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\ACE_ETCL_Parser_vc9\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib"
+				OutputFile="$(OutDir)\ACE_ETCL_Parserd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_ETCL_Parserd.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\ACE_ETCL_Parser_vc9\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ETCL_PARSER_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACE.lib ACE_ETCL.lib"
+				OutputFile="$(OutDir)\ACE_ETCL_Parser.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_ETCL_Parser.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;c;C">
+			<File
+				RelativePath="ETCL_Interpreter.cpp">
+			</File>
+			<File
+				RelativePath="ETCL_l.cpp">
+			</File>
+			<File
+				RelativePath="ETCL_y.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hh">
+			<File
+				RelativePath="ETCL_Interpreter.h">
+			</File>
+			<File
+				RelativePath="etcl_parser_export.h">
+			</File>
+			<File
+				RelativePath="ETCL_y.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Build Files"
+			Filter="mpc;mpb;mwc">
+			<File
+				RelativePath="ETCL.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Pkgconfig Files"
+			Filter="pcin">
+			<File
+				RelativePath="ACE_ETCL_Parser.pc.in">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc10.vcxproj b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc10.vcxproj
index 0955341e60a..5130a6063a7 100644
--- a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc10.vcxproj
+++ b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc10.vcxproj
@@ -1,302 +1,302 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ACE_ETCL</ProjectName>
-    <ProjectGuid>{17692659-FECA-1BAD-007E-8A67757B007A}</ProjectGuid>
-    <RootNamespace>ACE_ETCL</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\ACE_ETCL_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACE_ETCLd</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\ACE_ETCL_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE_ETCL</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\ACE_ETCL_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ACE_ETCLd</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\ACE_ETCL_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ACE_ETCL</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_ETCLd.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\..\lib\ACE_ETCLd.lib</ImportLibrary>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_ETCL.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\..\lib\ACE_ETCL.lib</ImportLibrary>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_ETCLd.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\..\lib\ACE_ETCLd.lib</ImportLibrary>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_ETCL.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\..\lib\ACE_ETCL.lib</ImportLibrary>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ETCL_Constraint.cpp">
-    </ClCompile>
-    <ClCompile Include="ETCL_Constraint_Visitor.cpp">
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ace_etcl_export.h" />
-    <ClInclude Include="ETCL_Constraint.h" />
-    <ClInclude Include="ETCL_Constraint_Visitor.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ETCL.mpc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ACE_ETCL.pc.in">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ETCL_Constraint.inl" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ACE_ETCL</ProjectName>
+    <ProjectGuid>{17692659-FECA-1BAD-007E-8A67757B007A}</ProjectGuid>
+    <RootNamespace>ACE_ETCL</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\ACE_ETCL_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACE_ETCLd</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\ACE_ETCL_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE_ETCL</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\ACE_ETCL_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ACE_ETCLd</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\ACE_ETCL_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ACE_ETCL</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_ETCLd.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImportLibrary>..\..\lib\ACE_ETCLd.lib</ImportLibrary>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_ETCL.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\lib\ACE_ETCL.lib</ImportLibrary>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_ETCLd.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImportLibrary>..\..\lib\ACE_ETCLd.lib</ImportLibrary>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_ETCL.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\lib\ACE_ETCL.lib</ImportLibrary>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ETCL_Constraint.cpp">
+    </ClCompile>
+    <ClCompile Include="ETCL_Constraint_Visitor.cpp">
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ace_etcl_export.h" />
+    <ClInclude Include="ETCL_Constraint.h" />
+    <ClInclude Include="ETCL_Constraint_Visitor.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ETCL.mpc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ACE_ETCL.pc.in">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ETCL_Constraint.inl" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc10.vcxproj.filters b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc10.vcxproj.filters
index fc80715251b..556b246771b 100644
--- a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc10.vcxproj.filters
+++ b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc10.vcxproj.filters
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{B1F27843-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
-      <Extensions>cpp;cxx;cc;c;C</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{06319535-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hh</Extensions>
-    </Filter>
-    <Filter Include="Build Files">
-      <UniqueIdentifier>{A1909F1C-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
-      <Extensions>mpc;mpb;mwc</Extensions>
-    </Filter>
-    <Filter Include="Pkgconfig Files">
-      <UniqueIdentifier>{8441A3A3-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
-      <Extensions>pcin</Extensions>
-    </Filter>
-    <Filter Include="Inline Files">
-      <UniqueIdentifier>{763028EF-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
-      <Extensions>i;ipp;inl</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ETCL_Constraint.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ETCL_Constraint_Visitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ace_etcl_export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ETCL_Constraint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ETCL_Constraint_Visitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ETCL.mpc">
-      <Filter>Build Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ACE_ETCL.pc.in">
-      <Filter>Pkgconfig Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ETCL_Constraint.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{B1F27843-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
+      <Extensions>cpp;cxx;cc;c;C</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{06319535-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hh</Extensions>
+    </Filter>
+    <Filter Include="Build Files">
+      <UniqueIdentifier>{A1909F1C-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
+      <Extensions>mpc;mpb;mwc</Extensions>
+    </Filter>
+    <Filter Include="Pkgconfig Files">
+      <UniqueIdentifier>{8441A3A3-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
+      <Extensions>pcin</Extensions>
+    </Filter>
+    <Filter Include="Inline Files">
+      <UniqueIdentifier>{763028EF-FECA-1BAD-007E-8A67757B007A}</UniqueIdentifier>
+      <Extensions>i;ipp;inl</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ETCL_Constraint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ETCL_Constraint_Visitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ace_etcl_export.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ETCL_Constraint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ETCL_Constraint_Visitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ETCL.mpc">
+      <Filter>Build Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ACE_ETCL.pc.in">
+      <Filter>Pkgconfig Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ETCL_Constraint.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc8.vcproj b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc8.vcproj
index d01e4a17b81..02b9f315758 100644
--- a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc8.vcproj
+++ b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc8.vcproj
@@ -1,445 +1,445 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ACE_ETCL"
-	ProjectGUID="{1903A9EA-FECA-1BAD-007E-8A67757B007A}"
-	RootNamespace="ACE_ETCL"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\ACE_ETCL_vc8\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\ACE_ETCLd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_ETCLd.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\ACE_ETCL_vc8\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\ACE_ETCL.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_ETCL.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\ACE_ETCL_vc8\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\ACE_ETCLd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_ETCLd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\ACE_ETCL_vc8\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\ACE_ETCL.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_ETCL.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C">
-			<File
-				RelativePath="ETCL_Constraint.cpp">
-			</File>
-			<File
-				RelativePath="ETCL_Constraint_Visitor.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hh">
-			<File
-				RelativePath="ace_etcl_export.h">
-			</File>
-			<File
-				RelativePath="ETCL_Constraint.h">
-			</File>
-			<File
-				RelativePath="ETCL_Constraint_Visitor.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			Filter="mpc;mpb;mwc">
-			<File
-				RelativePath="ETCL.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Pkgconfig Files"
-			Filter="pcin">
-			<File
-				RelativePath="ACE_ETCL.pc.in">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Inline Files"
-			Filter="i;ipp;inl">
-			<File
-				RelativePath="ETCL_Constraint.inl">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ACE_ETCL"
+	ProjectGUID="{1903A9EA-FECA-1BAD-007E-8A67757B007A}"
+	RootNamespace="ACE_ETCL"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\ACE_ETCL_vc8\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\ACE_ETCLd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_ETCLd.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\ACE_ETCL_vc8\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\ACE_ETCL.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_ETCL.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\ACE_ETCL_vc8\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\ACE_ETCLd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_ETCLd.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\ACE_ETCL_vc8\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\ACE_ETCL.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_ETCL.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;c;C">
+			<File
+				RelativePath="ETCL_Constraint.cpp">
+			</File>
+			<File
+				RelativePath="ETCL_Constraint_Visitor.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hh">
+			<File
+				RelativePath="ace_etcl_export.h">
+			</File>
+			<File
+				RelativePath="ETCL_Constraint.h">
+			</File>
+			<File
+				RelativePath="ETCL_Constraint_Visitor.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Build Files"
+			Filter="mpc;mpb;mwc">
+			<File
+				RelativePath="ETCL.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Pkgconfig Files"
+			Filter="pcin">
+			<File
+				RelativePath="ACE_ETCL.pc.in">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Inline Files"
+			Filter="i;ipp;inl">
+			<File
+				RelativePath="ETCL_Constraint.inl">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc9.vcproj b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc9.vcproj
index 3c3883c441f..83522bc3683 100644
--- a/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc9.vcproj
+++ b/dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc9.vcproj
@@ -1,445 +1,445 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ACE_ETCL"
-	ProjectGUID="{0903A9EA-FECA-1BAD-007E-8A67757B007A}"
-	RootNamespace="ACE_ETCL"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\ACE_ETCL_vc9\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\ACE_ETCLd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_ETCLd.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\ACE_ETCL_vc9\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\ACE_ETCL.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_ETCL.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\ACE_ETCL_vc9\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\ACE_ETCLd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_ETCLd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\ACE_ETCL_vc9\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\ACE_ETCL.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_ETCL.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C">
-			<File
-				RelativePath="ETCL_Constraint.cpp">
-			</File>
-			<File
-				RelativePath="ETCL_Constraint_Visitor.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hh">
-			<File
-				RelativePath="ace_etcl_export.h">
-			</File>
-			<File
-				RelativePath="ETCL_Constraint.h">
-			</File>
-			<File
-				RelativePath="ETCL_Constraint_Visitor.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			Filter="mpc;mpb;mwc">
-			<File
-				RelativePath="ETCL.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Pkgconfig Files"
-			Filter="pcin">
-			<File
-				RelativePath="ACE_ETCL.pc.in">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Inline Files"
-			Filter="i;ipp;inl">
-			<File
-				RelativePath="ETCL_Constraint.inl">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="ACE_ETCL"
+	ProjectGUID="{0903A9EA-FECA-1BAD-007E-8A67757B007A}"
+	RootNamespace="ACE_ETCL"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\ACE_ETCL_vc9\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\ACE_ETCLd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_ETCLd.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\ACE_ETCL_vc9\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\ACE_ETCL.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_ETCL.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\ACE_ETCL_vc9\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\ACE_ETCLd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_ETCLd.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\ACE_ETCL_vc9\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_ETCL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\ACE_ETCL.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_ETCL.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;c;C">
+			<File
+				RelativePath="ETCL_Constraint.cpp">
+			</File>
+			<File
+				RelativePath="ETCL_Constraint_Visitor.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hh">
+			<File
+				RelativePath="ace_etcl_export.h">
+			</File>
+			<File
+				RelativePath="ETCL_Constraint.h">
+			</File>
+			<File
+				RelativePath="ETCL_Constraint_Visitor.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Build Files"
+			Filter="mpc;mpb;mwc">
+			<File
+				RelativePath="ETCL.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Pkgconfig Files"
+			Filter="pcin">
+			<File
+				RelativePath="ACE_ETCL.pc.in">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Inline Files"
+			Filter="i;ipp;inl">
+			<File
+				RelativePath="ETCL_Constraint.inl">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/ace/ETCL/ETCL_vc10.sln b/dep/ACE_wrappers/ace/ETCL/ETCL_vc10.sln
index 1fde2cdb440..db153b910d9 100644
--- a/dep/ACE_wrappers/ace/ETCL/ETCL_vc10.sln
+++ b/dep/ACE_wrappers/ace/ETCL/ETCL_vc10.sln
@@ -1,46 +1,46 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ACE_ETCL_Parser_vc10.vcxproj", "{42B1A787-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{17692659-FECA-1BAD-007E-8A67757B007A} = {17692659-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ACE_ETCL_vc10.vcxproj", "{17692659-FECA-1BAD-007E-8A67757B007A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ACE_ETCL_Parser_vc10.vcxproj", "{42B1A787-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{17692659-FECA-1BAD-007E-8A67757B007A} = {17692659-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ACE_ETCL_vc10.vcxproj", "{17692659-FECA-1BAD-007E-8A67757B007A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/ETCL/ETCL_vc8.sln b/dep/ACE_wrappers/ace/ETCL/ETCL_vc8.sln
index 97ed802b1d0..51ec7804bcf 100644
--- a/dep/ACE_wrappers/ace/ETCL/ETCL_vc8.sln
+++ b/dep/ACE_wrappers/ace/ETCL/ETCL_vc8.sln
@@ -1,46 +1,46 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ACE_ETCL_Parser_vc8.vcproj", "{C756716B-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A} = {1903A9EA-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ACE_ETCL_vc8.vcproj", "{1903A9EA-FECA-1BAD-007E-8A67757B007A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ACE_ETCL_Parser_vc8.vcproj", "{C756716B-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A} = {1903A9EA-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ACE_ETCL_vc8.vcproj", "{1903A9EA-FECA-1BAD-007E-8A67757B007A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/ETCL/ETCL_vc9.sln b/dep/ACE_wrappers/ace/ETCL/ETCL_vc9.sln
index a46f24ca69d..9b375a7266c 100644
--- a/dep/ACE_wrappers/ace/ETCL/ETCL_vc9.sln
+++ b/dep/ACE_wrappers/ace/ETCL/ETCL_vc9.sln
@@ -1,46 +1,46 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ACE_ETCL_Parser_vc9.vcproj", "{D756716B-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A} = {0903A9EA-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ACE_ETCL_vc9.vcproj", "{0903A9EA-FECA-1BAD-007E-8A67757B007A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ACE_ETCL_Parser_vc9.vcproj", "{D756716B-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A} = {0903A9EA-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ACE_ETCL_vc9.vcproj", "{0903A9EA-FECA-1BAD-007E-8A67757B007A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.sln b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.sln
index b292a286639..70469a1df24 100644
--- a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.sln
+++ b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.sln
@@ -1,33 +1,33 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control_vc10.vcxproj", "{7153B6F4-FECA-1BAD-D619-74620E01B14C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control_vc10.vcxproj", "{7153B6F4-FECA-1BAD-D619-74620E01B14C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.vcxproj b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.vcxproj
index efd7f654e60..c986c6e1f46 100644
--- a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.vcxproj
+++ b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.vcxproj
@@ -1,344 +1,344 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Monitor_Control</ProjectName>
-    <ProjectGuid>{7153B6F4-FECA-1BAD-D619-74620E01B14C}</ProjectGuid>
-    <RootNamespace>Monitor_Control</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\Monitor_Control_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACE_Monitor_Controld</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\Monitor_Control_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE_Monitor_Control</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\Monitor_Control_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ACE_Monitor_Controld</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\Monitor_Control_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ACE_Monitor_Control</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACEd.lib;ACE_ETCLd.lib;ACE_ETCL_Parserd.lib;pdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_Monitor_Controld.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\..\lib\ACE_Monitor_Controld.lib</ImportLibrary>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACE.lib;ACE_ETCL.lib;ACE_ETCL_Parser.lib;pdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_Monitor_Control.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\..\lib\ACE_Monitor_Control.lib</ImportLibrary>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACEd.lib;ACE_ETCLd.lib;ACE_ETCL_Parserd.lib;pdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_Monitor_Controld.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\..\lib\ACE_Monitor_Controld.lib</ImportLibrary>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACE.lib;ACE_ETCL.lib;ACE_ETCL_Parser.lib;pdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_Monitor_Control.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\..\lib\ACE_Monitor_Control.lib</ImportLibrary>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Auto_Update_Starter.cpp">
-    </ClCompile>
-    <ClCompile Include="BSD_Network_Interface_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Bytes_Received_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Bytes_Sent_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Constraint_Interpreter.cpp">
-    </ClCompile>
-    <ClCompile Include="Constraint_Visitor.cpp">
-    </ClCompile>
-    <ClCompile Include="CPU_Load_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="FreeBSD_Network_Interface_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Linux_Network_Interface_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Memory_Usage_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Monitor_Group.cpp">
-    </ClCompile>
-    <ClCompile Include="Monitor_Query.cpp">
-    </ClCompile>
-    <ClCompile Include="Null_Network_Interface_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Num_Threads_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Packets_Received_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Packets_Sent_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Solaris_Network_Interface_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Windows_Monitor.cpp">
-    </ClCompile>
-    <ClCompile Include="Windows_Multi_Instance_Monitor.cpp">
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Auto_Update_Starter.h" />
-    <ClInclude Include="BSD_Network_Interface_Monitor.h" />
-    <ClInclude Include="Bytes_Received_Monitor.h" />
-    <ClInclude Include="Bytes_Sent_Monitor.h" />
-    <ClInclude Include="Constraint_Interpreter.h" />
-    <ClInclude Include="Constraint_Visitor.h" />
-    <ClInclude Include="CPU_Load_Monitor.h" />
-    <ClInclude Include="FreeBSD_Network_Interface_Monitor.h" />
-    <ClInclude Include="Linux_Network_Interface_Monitor.h" />
-    <ClInclude Include="Memory_Usage_Monitor.h" />
-    <ClInclude Include="Monitor_Control.h" />
-    <ClInclude Include="Monitor_Control_export.h" />
-    <ClInclude Include="Monitor_Control_utils.h" />
-    <ClInclude Include="Monitor_Group.h" />
-    <ClInclude Include="Monitor_Query.h" />
-    <ClInclude Include="Null_Network_Interface_Monitor.h" />
-    <ClInclude Include="Num_Threads_Monitor.h" />
-    <ClInclude Include="Packets_Received_Monitor.h" />
-    <ClInclude Include="Packets_Sent_Monitor.h" />
-    <ClInclude Include="Solaris_Network_Interface_Monitor.h" />
-    <ClInclude Include="Windows_Monitor.h" />
-    <ClInclude Include="Windows_Multi_Instance_Monitor.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Monitor_Control.mpc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>Monitor_Control</ProjectName>
+    <ProjectGuid>{7153B6F4-FECA-1BAD-D619-74620E01B14C}</ProjectGuid>
+    <RootNamespace>Monitor_Control</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\Monitor_Control_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACE_Monitor_Controld</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\Monitor_Control_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE_Monitor_Control</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\Monitor_Control_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ACE_Monitor_Controld</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\Monitor_Control_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ACE_Monitor_Control</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACEd.lib;ACE_ETCLd.lib;ACE_ETCL_Parserd.lib;pdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_Monitor_Controld.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImportLibrary>..\..\lib\ACE_Monitor_Controld.lib</ImportLibrary>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACE.lib;ACE_ETCL.lib;ACE_ETCL_Parser.lib;pdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_Monitor_Control.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\lib\ACE_Monitor_Control.lib</ImportLibrary>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACEd.lib;ACE_ETCLd.lib;ACE_ETCL_Parserd.lib;pdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_Monitor_Controld.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImportLibrary>..\..\lib\ACE_Monitor_Controld.lib</ImportLibrary>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACE.lib;ACE_ETCL.lib;ACE_ETCL_Parser.lib;pdh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_Monitor_Control.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\lib\ACE_Monitor_Control.lib</ImportLibrary>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Auto_Update_Starter.cpp">
+    </ClCompile>
+    <ClCompile Include="BSD_Network_Interface_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Bytes_Received_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Bytes_Sent_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Constraint_Interpreter.cpp">
+    </ClCompile>
+    <ClCompile Include="Constraint_Visitor.cpp">
+    </ClCompile>
+    <ClCompile Include="CPU_Load_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="FreeBSD_Network_Interface_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Linux_Network_Interface_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Memory_Usage_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Monitor_Group.cpp">
+    </ClCompile>
+    <ClCompile Include="Monitor_Query.cpp">
+    </ClCompile>
+    <ClCompile Include="Null_Network_Interface_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Num_Threads_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Packets_Received_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Packets_Sent_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Solaris_Network_Interface_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Windows_Monitor.cpp">
+    </ClCompile>
+    <ClCompile Include="Windows_Multi_Instance_Monitor.cpp">
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Auto_Update_Starter.h" />
+    <ClInclude Include="BSD_Network_Interface_Monitor.h" />
+    <ClInclude Include="Bytes_Received_Monitor.h" />
+    <ClInclude Include="Bytes_Sent_Monitor.h" />
+    <ClInclude Include="Constraint_Interpreter.h" />
+    <ClInclude Include="Constraint_Visitor.h" />
+    <ClInclude Include="CPU_Load_Monitor.h" />
+    <ClInclude Include="FreeBSD_Network_Interface_Monitor.h" />
+    <ClInclude Include="Linux_Network_Interface_Monitor.h" />
+    <ClInclude Include="Memory_Usage_Monitor.h" />
+    <ClInclude Include="Monitor_Control.h" />
+    <ClInclude Include="Monitor_Control_export.h" />
+    <ClInclude Include="Monitor_Control_utils.h" />
+    <ClInclude Include="Monitor_Group.h" />
+    <ClInclude Include="Monitor_Query.h" />
+    <ClInclude Include="Null_Network_Interface_Monitor.h" />
+    <ClInclude Include="Num_Threads_Monitor.h" />
+    <ClInclude Include="Packets_Received_Monitor.h" />
+    <ClInclude Include="Packets_Sent_Monitor.h" />
+    <ClInclude Include="Solaris_Network_Interface_Monitor.h" />
+    <ClInclude Include="Windows_Monitor.h" />
+    <ClInclude Include="Windows_Multi_Instance_Monitor.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Monitor_Control.mpc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.vcxproj.filters b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.vcxproj.filters
index fce01e76276..8bdc921d497 100644
--- a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.vcxproj.filters
+++ b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.vcxproj.filters
@@ -1,149 +1,149 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{B1F27843-FECA-1BAD-D619-74620E01B14C}</UniqueIdentifier>
-      <Extensions>cpp;cxx;cc;c;C</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{06319535-FECA-1BAD-D619-74620E01B14C}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hh</Extensions>
-    </Filter>
-    <Filter Include="Build Files">
-      <UniqueIdentifier>{A1909F1C-FECA-1BAD-D619-74620E01B14C}</UniqueIdentifier>
-      <Extensions>mpc;mpb;mwc</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Auto_Update_Starter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BSD_Network_Interface_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Bytes_Received_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Bytes_Sent_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Constraint_Interpreter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Constraint_Visitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CPU_Load_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FreeBSD_Network_Interface_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Linux_Network_Interface_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Memory_Usage_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Monitor_Group.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Monitor_Query.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Null_Network_Interface_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Num_Threads_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Packets_Received_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Packets_Sent_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Solaris_Network_Interface_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Windows_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Windows_Multi_Instance_Monitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Auto_Update_Starter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BSD_Network_Interface_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Bytes_Received_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Bytes_Sent_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Constraint_Interpreter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Constraint_Visitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CPU_Load_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FreeBSD_Network_Interface_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Linux_Network_Interface_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Memory_Usage_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Control.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Control_export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Control_utils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Group.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Monitor_Query.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Null_Network_Interface_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Num_Threads_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Packets_Received_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Packets_Sent_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Solaris_Network_Interface_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Windows_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Windows_Multi_Instance_Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Monitor_Control.mpc">
-      <Filter>Build Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{B1F27843-FECA-1BAD-D619-74620E01B14C}</UniqueIdentifier>
+      <Extensions>cpp;cxx;cc;c;C</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{06319535-FECA-1BAD-D619-74620E01B14C}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hh</Extensions>
+    </Filter>
+    <Filter Include="Build Files">
+      <UniqueIdentifier>{A1909F1C-FECA-1BAD-D619-74620E01B14C}</UniqueIdentifier>
+      <Extensions>mpc;mpb;mwc</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Auto_Update_Starter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="BSD_Network_Interface_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Bytes_Received_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Bytes_Sent_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Constraint_Interpreter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Constraint_Visitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CPU_Load_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FreeBSD_Network_Interface_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Linux_Network_Interface_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Memory_Usage_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Monitor_Group.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Monitor_Query.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Null_Network_Interface_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Num_Threads_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Packets_Received_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Packets_Sent_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Solaris_Network_Interface_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Windows_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Windows_Multi_Instance_Monitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Auto_Update_Starter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BSD_Network_Interface_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Bytes_Received_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Bytes_Sent_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Constraint_Interpreter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Constraint_Visitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CPU_Load_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FreeBSD_Network_Interface_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Linux_Network_Interface_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Memory_Usage_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Control.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Control_export.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Control_utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Group.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Monitor_Query.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Null_Network_Interface_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Num_Threads_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Packets_Received_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Packets_Sent_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Solaris_Network_Interface_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Windows_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Windows_Multi_Instance_Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Monitor_Control.mpc">
+      <Filter>Build Files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc8.sln b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc8.sln
index 2717d6b066c..3019e04488d 100644
--- a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc8.sln
+++ b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc8.sln
@@ -1,33 +1,33 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control_vc8.vcproj", "{B465937A-FECA-1BAD-D619-74620E01B14C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control_vc8.vcproj", "{B465937A-FECA-1BAD-D619-74620E01B14C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc8.vcproj b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc8.vcproj
index 6e0c1bc66db..846e99d46e6 100644
--- a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc8.vcproj
+++ b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc8.vcproj
@@ -1,519 +1,519 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="Monitor_Control"
-	ProjectGUID="{B465937A-FECA-1BAD-D619-74620E01B14C}"
-	RootNamespace="Monitor_Control"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\Monitor_Control_vc8\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib ACE_ETCL_Parserd.lib pdh.lib"
-				OutputFile="$(OutDir)\ACE_Monitor_Controld.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_Monitor_Controld.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\Monitor_Control_vc8\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib ACE_ETCL.lib ACE_ETCL_Parser.lib pdh.lib"
-				OutputFile="$(OutDir)\ACE_Monitor_Control.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_Monitor_Control.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\Monitor_Control_vc8\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib ACE_ETCL_Parserd.lib pdh.lib"
-				OutputFile="$(OutDir)\ACE_Monitor_Controld.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_Monitor_Controld.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\Monitor_Control_vc8\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACE.lib ACE_ETCL.lib ACE_ETCL_Parser.lib pdh.lib"
-				OutputFile="$(OutDir)\ACE_Monitor_Control.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_Monitor_Control.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C">
-			<File
-				RelativePath="Auto_Update_Starter.cpp">
-			</File>
-			<File
-				RelativePath="BSD_Network_Interface_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Bytes_Received_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Bytes_Sent_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Constraint_Interpreter.cpp">
-			</File>
-			<File
-				RelativePath="Constraint_Visitor.cpp">
-			</File>
-			<File
-				RelativePath="CPU_Load_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="FreeBSD_Network_Interface_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Linux_Network_Interface_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Memory_Usage_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Monitor_Group.cpp">
-			</File>
-			<File
-				RelativePath="Monitor_Query.cpp">
-			</File>
-			<File
-				RelativePath="Null_Network_Interface_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Num_Threads_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Packets_Received_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Packets_Sent_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Solaris_Network_Interface_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Windows_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Windows_Multi_Instance_Monitor.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hh">
-			<File
-				RelativePath="Auto_Update_Starter.h">
-			</File>
-			<File
-				RelativePath="BSD_Network_Interface_Monitor.h">
-			</File>
-			<File
-				RelativePath="Bytes_Received_Monitor.h">
-			</File>
-			<File
-				RelativePath="Bytes_Sent_Monitor.h">
-			</File>
-			<File
-				RelativePath="Constraint_Interpreter.h">
-			</File>
-			<File
-				RelativePath="Constraint_Visitor.h">
-			</File>
-			<File
-				RelativePath="CPU_Load_Monitor.h">
-			</File>
-			<File
-				RelativePath="FreeBSD_Network_Interface_Monitor.h">
-			</File>
-			<File
-				RelativePath="Linux_Network_Interface_Monitor.h">
-			</File>
-			<File
-				RelativePath="Memory_Usage_Monitor.h">
-			</File>
-			<File
-				RelativePath="Monitor_Control.h">
-			</File>
-			<File
-				RelativePath="Monitor_Control_export.h">
-			</File>
-			<File
-				RelativePath="Monitor_Control_utils.h">
-			</File>
-			<File
-				RelativePath="Monitor_Group.h">
-			</File>
-			<File
-				RelativePath="Monitor_Query.h">
-			</File>
-			<File
-				RelativePath="Null_Network_Interface_Monitor.h">
-			</File>
-			<File
-				RelativePath="Num_Threads_Monitor.h">
-			</File>
-			<File
-				RelativePath="Packets_Received_Monitor.h">
-			</File>
-			<File
-				RelativePath="Packets_Sent_Monitor.h">
-			</File>
-			<File
-				RelativePath="Solaris_Network_Interface_Monitor.h">
-			</File>
-			<File
-				RelativePath="Windows_Monitor.h">
-			</File>
-			<File
-				RelativePath="Windows_Multi_Instance_Monitor.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			Filter="mpc;mpb;mwc">
-			<File
-				RelativePath="Monitor_Control.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Monitor_Control"
+	ProjectGUID="{B465937A-FECA-1BAD-D619-74620E01B14C}"
+	RootNamespace="Monitor_Control"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\Monitor_Control_vc8\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib ACE_ETCL_Parserd.lib pdh.lib"
+				OutputFile="$(OutDir)\ACE_Monitor_Controld.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_Monitor_Controld.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\Monitor_Control_vc8\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACE.lib ACE_ETCL.lib ACE_ETCL_Parser.lib pdh.lib"
+				OutputFile="$(OutDir)\ACE_Monitor_Control.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_Monitor_Control.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\Monitor_Control_vc8\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib ACE_ETCL_Parserd.lib pdh.lib"
+				OutputFile="$(OutDir)\ACE_Monitor_Controld.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_Monitor_Controld.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\Monitor_Control_vc8\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACE.lib ACE_ETCL.lib ACE_ETCL_Parser.lib pdh.lib"
+				OutputFile="$(OutDir)\ACE_Monitor_Control.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_Monitor_Control.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;c;C">
+			<File
+				RelativePath="Auto_Update_Starter.cpp">
+			</File>
+			<File
+				RelativePath="BSD_Network_Interface_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Bytes_Received_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Bytes_Sent_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Constraint_Interpreter.cpp">
+			</File>
+			<File
+				RelativePath="Constraint_Visitor.cpp">
+			</File>
+			<File
+				RelativePath="CPU_Load_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="FreeBSD_Network_Interface_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Linux_Network_Interface_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Memory_Usage_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Monitor_Group.cpp">
+			</File>
+			<File
+				RelativePath="Monitor_Query.cpp">
+			</File>
+			<File
+				RelativePath="Null_Network_Interface_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Num_Threads_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Packets_Received_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Packets_Sent_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Solaris_Network_Interface_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Windows_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Windows_Multi_Instance_Monitor.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hh">
+			<File
+				RelativePath="Auto_Update_Starter.h">
+			</File>
+			<File
+				RelativePath="BSD_Network_Interface_Monitor.h">
+			</File>
+			<File
+				RelativePath="Bytes_Received_Monitor.h">
+			</File>
+			<File
+				RelativePath="Bytes_Sent_Monitor.h">
+			</File>
+			<File
+				RelativePath="Constraint_Interpreter.h">
+			</File>
+			<File
+				RelativePath="Constraint_Visitor.h">
+			</File>
+			<File
+				RelativePath="CPU_Load_Monitor.h">
+			</File>
+			<File
+				RelativePath="FreeBSD_Network_Interface_Monitor.h">
+			</File>
+			<File
+				RelativePath="Linux_Network_Interface_Monitor.h">
+			</File>
+			<File
+				RelativePath="Memory_Usage_Monitor.h">
+			</File>
+			<File
+				RelativePath="Monitor_Control.h">
+			</File>
+			<File
+				RelativePath="Monitor_Control_export.h">
+			</File>
+			<File
+				RelativePath="Monitor_Control_utils.h">
+			</File>
+			<File
+				RelativePath="Monitor_Group.h">
+			</File>
+			<File
+				RelativePath="Monitor_Query.h">
+			</File>
+			<File
+				RelativePath="Null_Network_Interface_Monitor.h">
+			</File>
+			<File
+				RelativePath="Num_Threads_Monitor.h">
+			</File>
+			<File
+				RelativePath="Packets_Received_Monitor.h">
+			</File>
+			<File
+				RelativePath="Packets_Sent_Monitor.h">
+			</File>
+			<File
+				RelativePath="Solaris_Network_Interface_Monitor.h">
+			</File>
+			<File
+				RelativePath="Windows_Monitor.h">
+			</File>
+			<File
+				RelativePath="Windows_Multi_Instance_Monitor.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Build Files"
+			Filter="mpc;mpb;mwc">
+			<File
+				RelativePath="Monitor_Control.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc9.sln b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc9.sln
index 7f440e01546..c4cdc7c9a09 100644
--- a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc9.sln
+++ b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc9.sln
@@ -1,33 +1,33 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control_vc9.vcproj", "{A465937A-FECA-1BAD-D619-74620E01B14C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control_vc9.vcproj", "{A465937A-FECA-1BAD-D619-74620E01B14C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc9.vcproj b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc9.vcproj
index 97b97e00f92..e5dffdf56a6 100644
--- a/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc9.vcproj
+++ b/dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc9.vcproj
@@ -1,519 +1,519 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="Monitor_Control"
-	ProjectGUID="{A465937A-FECA-1BAD-D619-74620E01B14C}"
-	RootNamespace="Monitor_Control"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\Monitor_Control_vc9\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib ACE_ETCL_Parserd.lib pdh.lib"
-				OutputFile="$(OutDir)\ACE_Monitor_Controld.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_Monitor_Controld.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\Monitor_Control_vc9\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib ACE_ETCL.lib ACE_ETCL_Parser.lib pdh.lib"
-				OutputFile="$(OutDir)\ACE_Monitor_Control.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_Monitor_Control.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\Monitor_Control_vc9\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib ACE_ETCL_Parserd.lib pdh.lib"
-				OutputFile="$(OutDir)\ACE_Monitor_Controld.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_Monitor_Controld.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\Monitor_Control_vc9\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACE.lib ACE_ETCL.lib ACE_ETCL_Parser.lib pdh.lib"
-				OutputFile="$(OutDir)\ACE_Monitor_Control.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_Monitor_Control.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C">
-			<File
-				RelativePath="Auto_Update_Starter.cpp">
-			</File>
-			<File
-				RelativePath="BSD_Network_Interface_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Bytes_Received_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Bytes_Sent_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Constraint_Interpreter.cpp">
-			</File>
-			<File
-				RelativePath="Constraint_Visitor.cpp">
-			</File>
-			<File
-				RelativePath="CPU_Load_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="FreeBSD_Network_Interface_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Linux_Network_Interface_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Memory_Usage_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Monitor_Group.cpp">
-			</File>
-			<File
-				RelativePath="Monitor_Query.cpp">
-			</File>
-			<File
-				RelativePath="Null_Network_Interface_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Num_Threads_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Packets_Received_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Packets_Sent_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Solaris_Network_Interface_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Windows_Monitor.cpp">
-			</File>
-			<File
-				RelativePath="Windows_Multi_Instance_Monitor.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hh">
-			<File
-				RelativePath="Auto_Update_Starter.h">
-			</File>
-			<File
-				RelativePath="BSD_Network_Interface_Monitor.h">
-			</File>
-			<File
-				RelativePath="Bytes_Received_Monitor.h">
-			</File>
-			<File
-				RelativePath="Bytes_Sent_Monitor.h">
-			</File>
-			<File
-				RelativePath="Constraint_Interpreter.h">
-			</File>
-			<File
-				RelativePath="Constraint_Visitor.h">
-			</File>
-			<File
-				RelativePath="CPU_Load_Monitor.h">
-			</File>
-			<File
-				RelativePath="FreeBSD_Network_Interface_Monitor.h">
-			</File>
-			<File
-				RelativePath="Linux_Network_Interface_Monitor.h">
-			</File>
-			<File
-				RelativePath="Memory_Usage_Monitor.h">
-			</File>
-			<File
-				RelativePath="Monitor_Control.h">
-			</File>
-			<File
-				RelativePath="Monitor_Control_export.h">
-			</File>
-			<File
-				RelativePath="Monitor_Control_utils.h">
-			</File>
-			<File
-				RelativePath="Monitor_Group.h">
-			</File>
-			<File
-				RelativePath="Monitor_Query.h">
-			</File>
-			<File
-				RelativePath="Null_Network_Interface_Monitor.h">
-			</File>
-			<File
-				RelativePath="Num_Threads_Monitor.h">
-			</File>
-			<File
-				RelativePath="Packets_Received_Monitor.h">
-			</File>
-			<File
-				RelativePath="Packets_Sent_Monitor.h">
-			</File>
-			<File
-				RelativePath="Solaris_Network_Interface_Monitor.h">
-			</File>
-			<File
-				RelativePath="Windows_Monitor.h">
-			</File>
-			<File
-				RelativePath="Windows_Multi_Instance_Monitor.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			Filter="mpc;mpb;mwc">
-			<File
-				RelativePath="Monitor_Control.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="Monitor_Control"
+	ProjectGUID="{A465937A-FECA-1BAD-D619-74620E01B14C}"
+	RootNamespace="Monitor_Control"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\Monitor_Control_vc9\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib ACE_ETCL_Parserd.lib pdh.lib"
+				OutputFile="$(OutDir)\ACE_Monitor_Controld.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_Monitor_Controld.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\Monitor_Control_vc9\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACE.lib ACE_ETCL.lib ACE_ETCL_Parser.lib pdh.lib"
+				OutputFile="$(OutDir)\ACE_Monitor_Control.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_Monitor_Control.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\Monitor_Control_vc9\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACEd.lib ACE_ETCLd.lib ACE_ETCL_Parserd.lib pdh.lib"
+				OutputFile="$(OutDir)\ACE_Monitor_Controld.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_Monitor_Controld.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\Monitor_Control_vc9\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="MONITOR_CONTROL_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACE.lib ACE_ETCL.lib ACE_ETCL_Parser.lib pdh.lib"
+				OutputFile="$(OutDir)\ACE_Monitor_Control.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_Monitor_Control.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;c;C">
+			<File
+				RelativePath="Auto_Update_Starter.cpp">
+			</File>
+			<File
+				RelativePath="BSD_Network_Interface_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Bytes_Received_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Bytes_Sent_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Constraint_Interpreter.cpp">
+			</File>
+			<File
+				RelativePath="Constraint_Visitor.cpp">
+			</File>
+			<File
+				RelativePath="CPU_Load_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="FreeBSD_Network_Interface_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Linux_Network_Interface_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Memory_Usage_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Monitor_Group.cpp">
+			</File>
+			<File
+				RelativePath="Monitor_Query.cpp">
+			</File>
+			<File
+				RelativePath="Null_Network_Interface_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Num_Threads_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Packets_Received_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Packets_Sent_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Solaris_Network_Interface_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Windows_Monitor.cpp">
+			</File>
+			<File
+				RelativePath="Windows_Multi_Instance_Monitor.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hh">
+			<File
+				RelativePath="Auto_Update_Starter.h">
+			</File>
+			<File
+				RelativePath="BSD_Network_Interface_Monitor.h">
+			</File>
+			<File
+				RelativePath="Bytes_Received_Monitor.h">
+			</File>
+			<File
+				RelativePath="Bytes_Sent_Monitor.h">
+			</File>
+			<File
+				RelativePath="Constraint_Interpreter.h">
+			</File>
+			<File
+				RelativePath="Constraint_Visitor.h">
+			</File>
+			<File
+				RelativePath="CPU_Load_Monitor.h">
+			</File>
+			<File
+				RelativePath="FreeBSD_Network_Interface_Monitor.h">
+			</File>
+			<File
+				RelativePath="Linux_Network_Interface_Monitor.h">
+			</File>
+			<File
+				RelativePath="Memory_Usage_Monitor.h">
+			</File>
+			<File
+				RelativePath="Monitor_Control.h">
+			</File>
+			<File
+				RelativePath="Monitor_Control_export.h">
+			</File>
+			<File
+				RelativePath="Monitor_Control_utils.h">
+			</File>
+			<File
+				RelativePath="Monitor_Group.h">
+			</File>
+			<File
+				RelativePath="Monitor_Query.h">
+			</File>
+			<File
+				RelativePath="Null_Network_Interface_Monitor.h">
+			</File>
+			<File
+				RelativePath="Num_Threads_Monitor.h">
+			</File>
+			<File
+				RelativePath="Packets_Received_Monitor.h">
+			</File>
+			<File
+				RelativePath="Packets_Sent_Monitor.h">
+			</File>
+			<File
+				RelativePath="Solaris_Network_Interface_Monitor.h">
+			</File>
+			<File
+				RelativePath="Windows_Monitor.h">
+			</File>
+			<File
+				RelativePath="Windows_Multi_Instance_Monitor.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Build Files"
+			Filter="mpc;mpb;mwc">
+			<File
+				RelativePath="Monitor_Control.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.h b/dep/ACE_wrappers/ace/OS_NS_Thread.h
index 4145210889b..07a1a9cda6c 100644
--- a/dep/ACE_wrappers/ace/OS_NS_Thread.h
+++ b/dep/ACE_wrappers/ace/OS_NS_Thread.h
@@ -38,6 +38,11 @@
 # include "ace/ACE_export.h"
 # include "ace/Object_Manager_Base.h"
 
+#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 700110 && __FreeBSD_version < 800000) || __FreeBSD_version >= 800024))
+# include <sys/cpuset.h>
+# define cpu_set_t cpuset_t
+#endif
+
 # if defined (ACE_EXPORT_MACRO)
 #   undef ACE_EXPORT_MACRO
 # endif
diff --git a/dep/ACE_wrappers/ace/OS_NS_netdb.inl b/dep/ACE_wrappers/ace/OS_NS_netdb.inl
index 0888c72f934..d802ed352c7 100644
--- a/dep/ACE_wrappers/ace/OS_NS_netdb.inl
+++ b/dep/ACE_wrappers/ace/OS_NS_netdb.inl
@@ -125,7 +125,7 @@ ACE_OS::gethostbyaddr_r (const char *addr,
       *h_errnop = h_errno;
       return (struct hostent *) 0;
     }
-#   elif defined (__GLIBC__)
+#   elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
   // GNU C library has a different signature
   ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
 
@@ -317,7 +317,7 @@ ACE_OS::gethostbyname_r (const char *name,
       *h_errnop = h_errno;
       return (struct hostent *) 0;
     }
-#   elif defined (__GLIBC__)
+#   elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
   // GNU C library has a different signature
   ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
 
@@ -531,7 +531,7 @@ ACE_OS::getprotobyname_r (const char *name,
   else
     return 0;
   //FUZZ: enable check_for_lack_ACE_OS
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
   // GNU C library has a different signature
   //FUZZ: disable check_for_lack_ACE_OS
   if (::getprotobyname_r (name,
@@ -612,7 +612,7 @@ ACE_OS::getprotobynumber_r (int proto,
   //FUZZ: enable check_for_lack_ACE_OS
   else
     return 0;
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
   // GNU C library has a different signature
   //FUZZ: disable check_for_lack_ACE_OS
   if (::getprotobynumber_r (proto,
@@ -698,7 +698,7 @@ ACE_OS::getservbyname_r (const char *svc,
   //FUZZ: enable check_for_lack_ACE_OS
   else
     return (struct servent *) 0;
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
   // GNU C library has a different signature
   ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA));
 
diff --git a/dep/ACE_wrappers/ace/OS_NS_signal.h b/dep/ACE_wrappers/ace/OS_NS_signal.h
index 8dc02c10ab2..99fff73651d 100644
--- a/dep/ACE_wrappers/ace/OS_NS_signal.h
+++ b/dep/ACE_wrappers/ace/OS_NS_signal.h
@@ -33,10 +33,10 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-#if defined (__Lynx__)
-// LynxOS defines pthread_sigmask() in pthread.h
+#if defined (__Lynx__) || defined (__OpenBSD__) || defined (__FreeBSD__)
+// LynxOS, OpenBSD and FreeBSD define pthread_sigmask() in pthread.h
 # include "ace/os_include/os_pthread.h"
-#endif /* __Lynx__ */
+#endif /* __Lynx__ || OpenBSD || FreeBSD */
 
 /*
  * We inline and undef some functions that may be implemented
diff --git a/dep/ACE_wrappers/ace/QoS/QoS_vc10.sln b/dep/ACE_wrappers/ace/QoS/QoS_vc10.sln
index 6f04edfb764..b86d7353170 100644
--- a/dep/ACE_wrappers/ace/QoS/QoS_vc10.sln
+++ b/dep/ACE_wrappers/ace/QoS/QoS_vc10.sln
@@ -1,33 +1,33 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS_vc10.vcxproj", "{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS_vc10.vcxproj", "{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/QoS/QoS_vc10.vcxproj b/dep/ACE_wrappers/ace/QoS/QoS_vc10.vcxproj
index 6b897677ca9..305c9c2c42b 100644
--- a/dep/ACE_wrappers/ace/QoS/QoS_vc10.vcxproj
+++ b/dep/ACE_wrappers/ace/QoS/QoS_vc10.vcxproj
@@ -1,322 +1,322 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>QoS</ProjectName>
-    <ProjectGuid>{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}</ProjectGuid>
-    <RootNamespace>QoS</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\QoS_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACE_QoSd</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\QoS_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE_QoS</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\QoS_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ACE_QoSd</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\QoS_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ACE_QoS</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_QoSd.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\..\lib\ACE_QoSd.lib</ImportLibrary>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_QoS.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\..\lib\ACE_QoS.lib</ImportLibrary>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_QoSd.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\..\lib\ACE_QoSd.lib</ImportLibrary>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ACE_QoS.dll</OutputFile>
-      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\..\lib\ACE_QoS.lib</ImportLibrary>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="QoS_Decorator.cpp">
-    </ClCompile>
-    <ClCompile Include="QoS_Manager.cpp">
-    </ClCompile>
-    <ClCompile Include="QoS_Session_Factory.cpp">
-    </ClCompile>
-    <ClCompile Include="QoS_Session_Impl.cpp">
-    </ClCompile>
-    <ClCompile Include="SOCK_Dgram_Mcast_QoS.cpp">
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ACE_QoS_Export.h" />
-    <ClInclude Include="QoS_Decorator.h" />
-    <ClInclude Include="QoS_Manager.h" />
-    <ClInclude Include="QoS_Session.h" />
-    <ClInclude Include="QoS_Session_Factory.h" />
-    <ClInclude Include="QoS_Session_Impl.h" />
-    <ClInclude Include="SOCK_Dgram_Mcast_QoS.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="qos.mpc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ACE_QoS.pc.in">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="QoS_Session_Impl.inl" />
-    <None Include="SOCK_Dgram_Mcast_QoS.inl" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="README">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuild>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>QoS</ProjectName>
+    <ProjectGuid>{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}</ProjectGuid>
+    <RootNamespace>QoS</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\QoS_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACE_QoSd</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\QoS_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE_QoS</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\QoS_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ACE_QoSd</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\QoS_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ACE_QoS</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_QoSd.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImportLibrary>..\..\lib\ACE_QoSd.lib</ImportLibrary>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_QoS.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\lib\ACE_QoS.lib</ImportLibrary>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_QoSd.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImportLibrary>..\..\lib\ACE_QoSd.lib</ImportLibrary>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)ACE_QoS.dll</OutputFile>
+      <AdditionalLibraryDirectories>.;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\..\lib\ACE_QoS.lib</ImportLibrary>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="QoS_Decorator.cpp">
+    </ClCompile>
+    <ClCompile Include="QoS_Manager.cpp">
+    </ClCompile>
+    <ClCompile Include="QoS_Session_Factory.cpp">
+    </ClCompile>
+    <ClCompile Include="QoS_Session_Impl.cpp">
+    </ClCompile>
+    <ClCompile Include="SOCK_Dgram_Mcast_QoS.cpp">
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ACE_QoS_Export.h" />
+    <ClInclude Include="QoS_Decorator.h" />
+    <ClInclude Include="QoS_Manager.h" />
+    <ClInclude Include="QoS_Session.h" />
+    <ClInclude Include="QoS_Session_Factory.h" />
+    <ClInclude Include="QoS_Session_Impl.h" />
+    <ClInclude Include="SOCK_Dgram_Mcast_QoS.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="qos.mpc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ACE_QoS.pc.in">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="QoS_Session_Impl.inl" />
+    <None Include="SOCK_Dgram_Mcast_QoS.inl" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="README">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuild>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/dep/ACE_wrappers/ace/QoS/QoS_vc10.vcxproj.filters b/dep/ACE_wrappers/ace/QoS/QoS_vc10.vcxproj.filters
index 19cc34fe16b..c1c59aa3b96 100644
--- a/dep/ACE_wrappers/ace/QoS/QoS_vc10.vcxproj.filters
+++ b/dep/ACE_wrappers/ace/QoS/QoS_vc10.vcxproj.filters
@@ -1,91 +1,91 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{B1F27843-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
-      <Extensions>cpp;cxx;cc;c;C</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{06319535-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hh</Extensions>
-    </Filter>
-    <Filter Include="Build Files">
-      <UniqueIdentifier>{A1909F1C-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
-      <Extensions>mpc;mpb;mwc</Extensions>
-    </Filter>
-    <Filter Include="Pkgconfig Files">
-      <UniqueIdentifier>{8441A3A3-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
-      <Extensions>pcin</Extensions>
-    </Filter>
-    <Filter Include="Inline Files">
-      <UniqueIdentifier>{763028EF-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
-      <Extensions>i;ipp;inl</Extensions>
-    </Filter>
-    <Filter Include="Documentation">
-      <UniqueIdentifier>{B14BBA74-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="QoS_Decorator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="QoS_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="QoS_Session_Factory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="QoS_Session_Impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SOCK_Dgram_Mcast_QoS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ACE_QoS_Export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="QoS_Decorator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="QoS_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="QoS_Session.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="QoS_Session_Factory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="QoS_Session_Impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SOCK_Dgram_Mcast_QoS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="qos.mpc">
-      <Filter>Build Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ACE_QoS.pc.in">
-      <Filter>Pkgconfig Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="QoS_Session_Impl.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="SOCK_Dgram_Mcast_QoS.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="README">
-      <Filter>Documentation</Filter>
-    </CustomBuild>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{B1F27843-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
+      <Extensions>cpp;cxx;cc;c;C</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{06319535-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hh</Extensions>
+    </Filter>
+    <Filter Include="Build Files">
+      <UniqueIdentifier>{A1909F1C-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
+      <Extensions>mpc;mpb;mwc</Extensions>
+    </Filter>
+    <Filter Include="Pkgconfig Files">
+      <UniqueIdentifier>{8441A3A3-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
+      <Extensions>pcin</Extensions>
+    </Filter>
+    <Filter Include="Inline Files">
+      <UniqueIdentifier>{763028EF-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
+      <Extensions>i;ipp;inl</Extensions>
+    </Filter>
+    <Filter Include="Documentation">
+      <UniqueIdentifier>{B14BBA74-FECA-1BAD-7781-8A636757A7A3}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="QoS_Decorator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="QoS_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="QoS_Session_Factory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="QoS_Session_Impl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SOCK_Dgram_Mcast_QoS.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ACE_QoS_Export.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="QoS_Decorator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="QoS_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="QoS_Session.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="QoS_Session_Factory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="QoS_Session_Impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SOCK_Dgram_Mcast_QoS.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="qos.mpc">
+      <Filter>Build Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ACE_QoS.pc.in">
+      <Filter>Pkgconfig Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="QoS_Session_Impl.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="SOCK_Dgram_Mcast_QoS.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="README">
+      <Filter>Documentation</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
diff --git a/dep/ACE_wrappers/ace/QoS/QoS_vc8.sln b/dep/ACE_wrappers/ace/QoS/QoS_vc8.sln
index 17be0c113e9..0371161baff 100644
--- a/dep/ACE_wrappers/ace/QoS/QoS_vc8.sln
+++ b/dep/ACE_wrappers/ace/QoS/QoS_vc8.sln
@@ -1,33 +1,33 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS_vc8.vcproj", "{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS_vc8.vcproj", "{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/QoS/QoS_vc8.vcproj b/dep/ACE_wrappers/ace/QoS/QoS_vc8.vcproj
index 7a7bf06371a..83f1ee4d964 100644
--- a/dep/ACE_wrappers/ace/QoS/QoS_vc8.vcproj
+++ b/dep/ACE_wrappers/ace/QoS/QoS_vc8.vcproj
@@ -1,500 +1,500 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="QoS"
-	ProjectGUID="{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
-	RootNamespace="QoS"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\QoS_vc8\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\ACE_QoSd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_QoSd.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\QoS_vc8\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\ACE_QoS.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_QoS.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\QoS_vc8\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\ACE_QoSd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_QoSd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\QoS_vc8\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\ACE_QoS.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_QoS.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C">
-			<File
-				RelativePath="QoS_Decorator.cpp">
-			</File>
-			<File
-				RelativePath="QoS_Manager.cpp">
-			</File>
-			<File
-				RelativePath="QoS_Session_Factory.cpp">
-			</File>
-			<File
-				RelativePath="QoS_Session_Impl.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Mcast_QoS.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hh">
-			<File
-				RelativePath="ACE_QoS_Export.h">
-			</File>
-			<File
-				RelativePath="QoS_Decorator.h">
-			</File>
-			<File
-				RelativePath="QoS_Manager.h">
-			</File>
-			<File
-				RelativePath="QoS_Session.h">
-			</File>
-			<File
-				RelativePath="QoS_Session_Factory.h">
-			</File>
-			<File
-				RelativePath="QoS_Session_Impl.h">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Mcast_QoS.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			Filter="mpc;mpb;mwc">
-			<File
-				RelativePath="qos.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Pkgconfig Files"
-			Filter="pcin">
-			<File
-				RelativePath="ACE_QoS.pc.in">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Inline Files"
-			Filter="i;ipp;inl">
-			<File
-				RelativePath="QoS_Session_Impl.inl">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Mcast_QoS.inl">
-			</File>
-		</Filter>
-		<Filter
-			Name="Documentation"
-			Filter="">
-			<File
-				RelativePath="README">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="QoS"
+	ProjectGUID="{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
+	RootNamespace="QoS"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\QoS_vc8\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\ACE_QoSd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_QoSd.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\QoS_vc8\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\ACE_QoS.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_QoS.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\QoS_vc8\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\ACE_QoSd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_QoSd.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\QoS_vc8\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\ACE_QoS.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_QoS.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;c;C">
+			<File
+				RelativePath="QoS_Decorator.cpp">
+			</File>
+			<File
+				RelativePath="QoS_Manager.cpp">
+			</File>
+			<File
+				RelativePath="QoS_Session_Factory.cpp">
+			</File>
+			<File
+				RelativePath="QoS_Session_Impl.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Mcast_QoS.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hh">
+			<File
+				RelativePath="ACE_QoS_Export.h">
+			</File>
+			<File
+				RelativePath="QoS_Decorator.h">
+			</File>
+			<File
+				RelativePath="QoS_Manager.h">
+			</File>
+			<File
+				RelativePath="QoS_Session.h">
+			</File>
+			<File
+				RelativePath="QoS_Session_Factory.h">
+			</File>
+			<File
+				RelativePath="QoS_Session_Impl.h">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Mcast_QoS.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Build Files"
+			Filter="mpc;mpb;mwc">
+			<File
+				RelativePath="qos.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Pkgconfig Files"
+			Filter="pcin">
+			<File
+				RelativePath="ACE_QoS.pc.in">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Inline Files"
+			Filter="i;ipp;inl">
+			<File
+				RelativePath="QoS_Session_Impl.inl">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Mcast_QoS.inl">
+			</File>
+		</Filter>
+		<Filter
+			Name="Documentation"
+			Filter="">
+			<File
+				RelativePath="README">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/ace/QoS/QoS_vc9.sln b/dep/ACE_wrappers/ace/QoS/QoS_vc9.sln
index 0c2470faa18..a88abfef80f 100644
--- a/dep/ACE_wrappers/ace/QoS/QoS_vc9.sln
+++ b/dep/ACE_wrappers/ace/QoS/QoS_vc9.sln
@@ -1,33 +1,33 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS_vc9.vcproj", "{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS_vc9.vcproj", "{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/QoS/QoS_vc9.vcproj b/dep/ACE_wrappers/ace/QoS/QoS_vc9.vcproj
index 8cb2291c8bb..7d354a109fb 100644
--- a/dep/ACE_wrappers/ace/QoS/QoS_vc9.vcproj
+++ b/dep/ACE_wrappers/ace/QoS/QoS_vc9.vcproj
@@ -1,500 +1,500 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="QoS"
-	ProjectGUID="{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
-	RootNamespace="QoS"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\QoS_vc9\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\ACE_QoSd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_QoSd.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\QoS_vc9\I386"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\ACE_QoS.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_QoS.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Debug\QoS_vc9\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\ACE_QoSd.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="..\..\lib\ACE_QoSd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\lib"
-			IntermediateDirectory="Release\QoS_vc9\AMD64"
-			ConfigurationType="2"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\.."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\ACE_QoS.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\lib\ACE_QoS.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C">
-			<File
-				RelativePath="QoS_Decorator.cpp">
-			</File>
-			<File
-				RelativePath="QoS_Manager.cpp">
-			</File>
-			<File
-				RelativePath="QoS_Session_Factory.cpp">
-			</File>
-			<File
-				RelativePath="QoS_Session_Impl.cpp">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Mcast_QoS.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hh">
-			<File
-				RelativePath="ACE_QoS_Export.h">
-			</File>
-			<File
-				RelativePath="QoS_Decorator.h">
-			</File>
-			<File
-				RelativePath="QoS_Manager.h">
-			</File>
-			<File
-				RelativePath="QoS_Session.h">
-			</File>
-			<File
-				RelativePath="QoS_Session_Factory.h">
-			</File>
-			<File
-				RelativePath="QoS_Session_Impl.h">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Mcast_QoS.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			Filter="mpc;mpb;mwc">
-			<File
-				RelativePath="qos.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Pkgconfig Files"
-			Filter="pcin">
-			<File
-				RelativePath="ACE_QoS.pc.in">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Inline Files"
-			Filter="i;ipp;inl">
-			<File
-				RelativePath="QoS_Session_Impl.inl">
-			</File>
-			<File
-				RelativePath="SOCK_Dgram_Mcast_QoS.inl">
-			</File>
-		</Filter>
-		<Filter
-			Name="Documentation"
-			Filter="">
-			<File
-				RelativePath="README">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCustomBuildTool"/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="QoS"
+	ProjectGUID="{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
+	RootNamespace="QoS"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\QoS_vc9\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\ACE_QoSd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_QoSd.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\QoS_vc9\I386"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\ACE_QoS.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_QoS.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Debug\QoS_vc9\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\ACE_QoSd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\ACE_QoSd.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory="Release\QoS_vc9\AMD64"
+			ConfigurationType="2"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\.."
+				PreprocessorDefinitions="ACE_QoS_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;ACE_HAS_QOS;ACE_HAS_WINSOCK2_GQOS;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\.."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\ACE_QoS.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="..\..\lib\ACE_QoS.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;c;C">
+			<File
+				RelativePath="QoS_Decorator.cpp">
+			</File>
+			<File
+				RelativePath="QoS_Manager.cpp">
+			</File>
+			<File
+				RelativePath="QoS_Session_Factory.cpp">
+			</File>
+			<File
+				RelativePath="QoS_Session_Impl.cpp">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Mcast_QoS.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hh">
+			<File
+				RelativePath="ACE_QoS_Export.h">
+			</File>
+			<File
+				RelativePath="QoS_Decorator.h">
+			</File>
+			<File
+				RelativePath="QoS_Manager.h">
+			</File>
+			<File
+				RelativePath="QoS_Session.h">
+			</File>
+			<File
+				RelativePath="QoS_Session_Factory.h">
+			</File>
+			<File
+				RelativePath="QoS_Session_Impl.h">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Mcast_QoS.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Build Files"
+			Filter="mpc;mpb;mwc">
+			<File
+				RelativePath="qos.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Pkgconfig Files"
+			Filter="pcin">
+			<File
+				RelativePath="ACE_QoS.pc.in">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Inline Files"
+			Filter="i;ipp;inl">
+			<File
+				RelativePath="QoS_Session_Impl.inl">
+			</File>
+			<File
+				RelativePath="SOCK_Dgram_Mcast_QoS.inl">
+			</File>
+		</Filter>
+		<Filter
+			Name="Documentation"
+			Filter="">
+			<File
+				RelativePath="README">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCustomBuildTool"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/ace/ace_vc10.sln b/dep/ACE_wrappers/ace/ace_vc10.sln
index 1c64a6d5508..d127b48d388 100644
--- a/dep/ACE_wrappers/ace/ace_vc10.sln
+++ b/dep/ACE_wrappers/ace/ace_vc10.sln
@@ -1,88 +1,88 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ACE_vc10.vcxproj", "{47BC56ED-FECA-1BAD-6757-8A6300006755}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ETCL\ACE_ETCL_Parser_vc10.vcxproj", "{42B1A787-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
-		{17692659-FECA-1BAD-007E-8A67757B007A} = {17692659-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ETCL\ACE_ETCL_vc10.vcxproj", "{17692659-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control\Monitor_Control_vc10.vcxproj", "{7153B6F4-FECA-1BAD-D619-74620E01B14C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
-		{17692659-FECA-1BAD-007E-8A67757B007A} = {17692659-FECA-1BAD-007E-8A67757B007A}
-		{42B1A787-FECA-1BAD-007E-8A67757B007A} = {42B1A787-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS\QoS_vc10.vcxproj", "{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
-		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
-		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
-		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ACE_vc10.vcxproj", "{47BC56ED-FECA-1BAD-6757-8A6300006755}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ETCL\ACE_ETCL_Parser_vc10.vcxproj", "{42B1A787-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
+		{17692659-FECA-1BAD-007E-8A67757B007A} = {17692659-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ETCL\ACE_ETCL_vc10.vcxproj", "{17692659-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control\Monitor_Control_vc10.vcxproj", "{7153B6F4-FECA-1BAD-D619-74620E01B14C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
+		{17692659-FECA-1BAD-007E-8A67757B007A} = {17692659-FECA-1BAD-007E-8A67757B007A}
+		{42B1A787-FECA-1BAD-007E-8A67757B007A} = {42B1A787-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS\QoS_vc10.vcxproj", "{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{47BC56ED-FECA-1BAD-6757-8A6300006755} = {47BC56ED-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
+		{47BC56ED-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{42B1A787-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{17692659-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
+		{7153B6F4-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
+		{6ADC56EC-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/ace_vc8.sln b/dep/ACE_wrappers/ace/ace_vc8.sln
index 73be7a48418..43bd2beaec8 100644
--- a/dep/ACE_wrappers/ace/ace_vc8.sln
+++ b/dep/ACE_wrappers/ace/ace_vc8.sln
@@ -1,88 +1,88 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6300006755}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ETCL\ACE_ETCL_Parser_vc8.vcproj", "{C756716B-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A} = {1903A9EA-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ETCL\ACE_ETCL_vc8.vcproj", "{1903A9EA-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control\Monitor_Control_vc8.vcproj", "{B465937A-FECA-1BAD-D619-74620E01B14C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A} = {1903A9EA-FECA-1BAD-007E-8A67757B007A}
-		{C756716B-FECA-1BAD-007E-8A67757B007A} = {C756716B-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS\QoS_vc8.vcproj", "{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
-		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
-		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
-		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6300006755}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ETCL\ACE_ETCL_Parser_vc8.vcproj", "{C756716B-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A} = {1903A9EA-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ETCL\ACE_ETCL_vc8.vcproj", "{1903A9EA-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control\Monitor_Control_vc8.vcproj", "{B465937A-FECA-1BAD-D619-74620E01B14C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A} = {1903A9EA-FECA-1BAD-007E-8A67757B007A}
+		{C756716B-FECA-1BAD-007E-8A67757B007A} = {C756716B-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS\QoS_vc8.vcproj", "{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
+		{AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{C756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{1903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
+		{B465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
+		{AC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/ace_vc9.sln b/dep/ACE_wrappers/ace/ace_vc9.sln
index d40a609e019..42b29223608 100644
--- a/dep/ACE_wrappers/ace/ace_vc9.sln
+++ b/dep/ACE_wrappers/ace/ace_vc9.sln
@@ -1,88 +1,88 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6300006755}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ETCL\ACE_ETCL_Parser_vc9.vcproj", "{D756716B-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A} = {0903A9EA-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ETCL\ACE_ETCL_vc9.vcproj", "{0903A9EA-FECA-1BAD-007E-8A67757B007A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control\Monitor_Control_vc9.vcproj", "{A465937A-FECA-1BAD-D619-74620E01B14C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A} = {0903A9EA-FECA-1BAD-007E-8A67757B007A}
-		{D756716B-FECA-1BAD-007E-8A67757B007A} = {D756716B-FECA-1BAD-007E-8A67757B007A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS\QoS_vc9.vcproj", "{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
-		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
-		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
-		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6300006755}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL_Parser", "ETCL\ACE_ETCL_Parser_vc9.vcproj", "{D756716B-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A} = {0903A9EA-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_ETCL", "ETCL\ACE_ETCL_vc9.vcproj", "{0903A9EA-FECA-1BAD-007E-8A67757B007A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor_Control", "Monitor_Control\Monitor_Control_vc9.vcproj", "{A465937A-FECA-1BAD-D619-74620E01B14C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A} = {0903A9EA-FECA-1BAD-007E-8A67757B007A}
+		{D756716B-FECA-1BAD-007E-8A67757B007A} = {D756716B-FECA-1BAD-007E-8A67757B007A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoS", "QoS\QoS_vc9.vcproj", "{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
+		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{D756716B-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|Win32.Build.0 = Debug|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.ActiveCfg = Debug|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Debug|x64.Build.0 = Debug|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.ActiveCfg = Release|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|Win32.Build.0 = Release|Win32
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.ActiveCfg = Release|x64
+		{0903A9EA-FECA-1BAD-007E-8A67757B007A}.Release|x64.Build.0 = Release|x64
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|Win32.Build.0 = Debug|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.ActiveCfg = Debug|x64
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Debug|x64.Build.0 = Debug|x64
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.ActiveCfg = Release|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|Win32.Build.0 = Release|Win32
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.ActiveCfg = Release|x64
+		{A465937A-FECA-1BAD-D619-74620E01B14C}.Release|x64.Build.0 = Release|x64
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|Win32.Build.0 = Debug|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.ActiveCfg = Debug|x64
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Debug|x64.Build.0 = Debug|x64
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.ActiveCfg = Release|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|Win32.Build.0 = Release|Win32
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.ActiveCfg = Release|x64
+		{BC7E1C9A-FECA-1BAD-7781-8A636757A7A3}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/ace/os_include/os_pthread.h b/dep/ACE_wrappers/ace/os_include/os_pthread.h
index 64f1b75537d..1755e6f9eca 100644
--- a/dep/ACE_wrappers/ace/os_include/os_pthread.h
+++ b/dep/ACE_wrappers/ace/os_include/os_pthread.h
@@ -299,7 +299,11 @@
 #    undef THR_DAEMON
 
 #    define THR_BOUND               0x00000001
+# if defined (__FreeBSD__)
+#    define THR_NEW_LWP             0x00000000
+# else
 #    define THR_NEW_LWP             0x00000002
+# endif
 #    define THR_DETACHED            0x00000040
 #    define THR_SUSPENDED           0x00000080
 #    define THR_DAEMON              0x00000100
diff --git a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.sln b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.sln
index d89b26da4a1..223094cefaa 100644
--- a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.sln
+++ b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.sln
@@ -1,33 +1,33 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE_vc10.vcxproj", "{47B934A1-FECA-1BAD-A757-FC47A624E189}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE_vc10.vcxproj", "{47B934A1-FECA-1BAD-A757-FC47A624E189}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.vcxproj b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.vcxproj
index ec0e51e41e3..6a25cf2b540 100644
--- a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.vcxproj
+++ b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.vcxproj
@@ -1,290 +1,290 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>PerlACE</ProjectName>
-    <ProjectGuid>{47B934A1-FECA-1BAD-A757-FC47A624E189}</ProjectGuid>
-    <RootNamespace>PerlACE</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\PerlACE_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"></TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\PerlACE_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"></TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\PerlACE_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\PerlACE_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions>/noentry %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <AdditionalOptions>/noentry %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/noentry /machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/noentry /machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ConfigList.pm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="Process.pm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="Process_Unix.pm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="Process_Win32.pm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="Run_Test.pm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>PerlACE</ProjectName>
+    <ProjectGuid>{47B934A1-FECA-1BAD-A757-FC47A624E189}</ProjectGuid>
+    <RootNamespace>PerlACE</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\PerlACE_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"></TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\PerlACE_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"></TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\PerlACE_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\PerlACE_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>.;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalOptions>/noentry %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>.;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalOptions>/noentry %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>.;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/noentry /machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>.;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/noentry /machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ConfigList.pm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="Process.pm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="Process_Unix.pm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="Process_Win32.pm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="Run_Test.pm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.vcxproj.filters b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.vcxproj.filters
index 3efae1616bf..8265ba23de6 100644
--- a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.vcxproj.filters
+++ b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.vcxproj.filters
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Script Files">
-      <UniqueIdentifier>{7197AE6D-FECA-1BAD-A757-FC47A624E189}</UniqueIdentifier>
-      <Extensions>sh</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ConfigList.pm">
-      <Filter>Script Files</Filter>
-    </None>
-    <None Include="Process.pm">
-      <Filter>Script Files</Filter>
-    </None>
-    <None Include="Process_Unix.pm">
-      <Filter>Script Files</Filter>
-    </None>
-    <None Include="Process_Win32.pm">
-      <Filter>Script Files</Filter>
-    </None>
-    <None Include="Run_Test.pm">
-      <Filter>Script Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Script Files">
+      <UniqueIdentifier>{7197AE6D-FECA-1BAD-A757-FC47A624E189}</UniqueIdentifier>
+      <Extensions>sh</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ConfigList.pm">
+      <Filter>Script Files</Filter>
+    </None>
+    <None Include="Process.pm">
+      <Filter>Script Files</Filter>
+    </None>
+    <None Include="Process_Unix.pm">
+      <Filter>Script Files</Filter>
+    </None>
+    <None Include="Process_Win32.pm">
+      <Filter>Script Files</Filter>
+    </None>
+    <None Include="Run_Test.pm">
+      <Filter>Script Files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc8.sln b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc8.sln
index 2c5cd5db7d0..567cc426ec4 100644
--- a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc8.sln
+++ b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc8.sln
@@ -1,33 +1,33 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE_vc8.vcproj", "{E15379F8-FECA-1BAD-A757-FC47A624E189}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE_vc8.vcproj", "{E15379F8-FECA-1BAD-A757-FC47A624E189}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc8.vcproj b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc8.vcproj
index e4c600b4e17..6f485033a8f 100644
--- a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc8.vcproj
+++ b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc8.vcproj
@@ -1,220 +1,220 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="PerlACE"
-	ProjectGUID="{E15379F8-FECA-1BAD-A757-FC47A624E189}"
-	RootNamespace="PerlACE"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Debug\PerlACE_vc8\I386"
-			ConfigurationType="10"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release\PerlACE_vc8\I386"
-			ConfigurationType="10"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="."
-			IntermediateDirectory="Debug\PerlACE_vc8\AMD64"
-			ConfigurationType="10"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release\PerlACE_vc8\AMD64"
-			ConfigurationType="10"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Script Files"
-			Filter="sh">
-			<File
-				RelativePath="ConfigList.pm">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Process.pm">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Process_Unix.pm">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Process_Win32.pm">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Run_Test.pm">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="PerlACE"
+	ProjectGUID="{E15379F8-FECA-1BAD-A757-FC47A624E189}"
+	RootNamespace="PerlACE"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Debug\PerlACE_vc8\I386"
+			ConfigurationType="10"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release\PerlACE_vc8\I386"
+			ConfigurationType="10"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="."
+			IntermediateDirectory="Debug\PerlACE_vc8\AMD64"
+			ConfigurationType="10"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release\PerlACE_vc8\AMD64"
+			ConfigurationType="10"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Script Files"
+			Filter="sh">
+			<File
+				RelativePath="ConfigList.pm">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Process.pm">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Process_Unix.pm">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Process_Win32.pm">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Run_Test.pm">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc9.sln b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc9.sln
index 9ca462ee532..932e766b539 100644
--- a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc9.sln
+++ b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc9.sln
@@ -1,33 +1,33 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE_vc9.vcproj", "{F15379F8-FECA-1BAD-A757-FC47A624E189}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE_vc9.vcproj", "{F15379F8-FECA-1BAD-A757-FC47A624E189}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc9.vcproj b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc9.vcproj
index a7c48566013..a6bb1cc39a6 100644
--- a/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc9.vcproj
+++ b/dep/ACE_wrappers/bin/PerlACE/PerlACE_vc9.vcproj
@@ -1,220 +1,220 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="PerlACE"
-	ProjectGUID="{F15379F8-FECA-1BAD-A757-FC47A624E189}"
-	RootNamespace="PerlACE"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Debug\PerlACE_vc9\I386"
-			ConfigurationType="10"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release\PerlACE_vc9\I386"
-			ConfigurationType="10"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="."
-			IntermediateDirectory="Debug\PerlACE_vc9\AMD64"
-			ConfigurationType="10"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release\PerlACE_vc9\AMD64"
-			ConfigurationType="10"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Script Files"
-			Filter="sh">
-			<File
-				RelativePath="ConfigList.pm">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Process.pm">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Process_Unix.pm">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Process_Win32.pm">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Run_Test.pm">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="PerlACE"
+	ProjectGUID="{F15379F8-FECA-1BAD-A757-FC47A624E189}"
+	RootNamespace="PerlACE"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Debug\PerlACE_vc9\I386"
+			ConfigurationType="10"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release\PerlACE_vc9\I386"
+			ConfigurationType="10"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="."
+			IntermediateDirectory="Debug\PerlACE_vc9\AMD64"
+			ConfigurationType="10"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release\PerlACE_vc9\AMD64"
+			ConfigurationType="10"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Script Files"
+			Filter="sh">
+			<File
+				RelativePath="ConfigList.pm">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Process.pm">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Process_Unix.pm">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Process_Win32.pm">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Run_Test.pm">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/bin/bin_vc10.sln b/dep/ACE_wrappers/bin/bin_vc10.sln
index 214bbe0ea33..a6d88593b2e 100644
--- a/dep/ACE_wrappers/bin/bin_vc10.sln
+++ b/dep/ACE_wrappers/bin/bin_vc10.sln
@@ -1,43 +1,43 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE\PerlACE_vc10.vcxproj", "{47B934A1-FECA-1BAD-A757-FC47A624E189}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin_vc10.vcxproj", "{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
-		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
-		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# $Id: VC10WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc10 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc10"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE\PerlACE_vc10.vcxproj", "{47B934A1-FECA-1BAD-A757-FC47A624E189}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin_vc10.vcxproj", "{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
+		{47B934A1-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
+		{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/bin/bin_vc10.vcxproj b/dep/ACE_wrappers/bin/bin_vc10.vcxproj
index e9228942622..d6fb8731830 100644
--- a/dep/ACE_wrappers/bin/bin_vc10.vcxproj
+++ b/dep/ACE_wrappers/bin/bin_vc10.vcxproj
@@ -1,298 +1,298 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>bin</ProjectName>
-    <ProjectGuid>{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}</ProjectGuid>
-    <RootNamespace>bin</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\bin_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">envinfo</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\bin_vc10\I386\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">envinfo</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\bin_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">envinfo</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\bin_vc10\AMD64\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">envinfo</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)envinfo.exe</OutputFile>
-      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)envinfo.exe</OutputFile>
-      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)envinfo.exe</OutputFile>
-      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>1033</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)envinfo.exe</OutputFile>
-      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-<!--
-  Though we can set TargetMachine explicitly, VC++
-  can figure it out by project type. We don't need
-  to set it by ourselves.
--->
-<!--      <TargetMachine>0</TargetMachine>-->
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
-     Check if msbuild has any support for a custom post-cleaning step
- -->
-<!-- No known equivalent for DeploymentTool in vc10:
--->
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="envinfo.cpp">
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="bin.mpc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ace_tests.lst">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-    <None Include="auto_run_tests.pl">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>bin</ProjectName>
+    <ProjectGuid>{5F0C56EF-FECA-1BAD-64FC-8A63000064FE}</ProjectGuid>
+    <RootNamespace>bin</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\bin_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">envinfo</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\bin_vc10\I386\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">envinfo</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\bin_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">envinfo</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\bin_vc10\AMD64\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">envinfo</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)envinfo.exe</OutputFile>
+      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)envinfo.exe</OutputFile>
+      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=&quot;d&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)envinfo.exe</OutputFile>
+      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>1033</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)envinfo.exe</OutputFile>
+      <AdditionalLibraryDirectories>.;..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+<!--
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
+  to set it by ourselves.
+-->
+<!--      <TargetMachine>0</TargetMachine>-->
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+<!-- "postclean" was made-up by MPC for use by vs_postclean.pl.
+     Check if msbuild has any support for a custom post-cleaning step
+ -->
+<!-- No known equivalent for DeploymentTool in vc10:
+-->
+  </ItemDefinitionGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="envinfo.cpp">
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="bin.mpc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ace_tests.lst">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="auto_run_tests.pl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/dep/ACE_wrappers/bin/bin_vc10.vcxproj.filters b/dep/ACE_wrappers/bin/bin_vc10.vcxproj.filters
index fc98ca18abb..a16f6948970 100644
--- a/dep/ACE_wrappers/bin/bin_vc10.vcxproj.filters
+++ b/dep/ACE_wrappers/bin/bin_vc10.vcxproj.filters
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{B1F27843-FECA-1BAD-64FC-8A63000064FE}</UniqueIdentifier>
-      <Extensions>cpp;cxx;cc;c;C</Extensions>
-    </Filter>
-    <Filter Include="Build Files">
-      <UniqueIdentifier>{A1909F1C-FECA-1BAD-64FC-8A63000064FE}</UniqueIdentifier>
-      <Extensions>mpc;mpb;mwc</Extensions>
-    </Filter>
-    <Filter Include="Script Files">
-      <UniqueIdentifier>{7197AE6D-FECA-1BAD-64FC-8A63000064FE}</UniqueIdentifier>
-      <Extensions>sh</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="envinfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="bin.mpc">
-      <Filter>Build Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ace_tests.lst">
-      <Filter>Script Files</Filter>
-    </None>
-    <None Include="auto_run_tests.pl">
-      <Filter>Script Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{B1F27843-FECA-1BAD-64FC-8A63000064FE}</UniqueIdentifier>
+      <Extensions>cpp;cxx;cc;c;C</Extensions>
+    </Filter>
+    <Filter Include="Build Files">
+      <UniqueIdentifier>{A1909F1C-FECA-1BAD-64FC-8A63000064FE}</UniqueIdentifier>
+      <Extensions>mpc;mpb;mwc</Extensions>
+    </Filter>
+    <Filter Include="Script Files">
+      <UniqueIdentifier>{7197AE6D-FECA-1BAD-64FC-8A63000064FE}</UniqueIdentifier>
+      <Extensions>sh</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="envinfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="bin.mpc">
+      <Filter>Build Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ace_tests.lst">
+      <Filter>Script Files</Filter>
+    </None>
+    <None Include="auto_run_tests.pl">
+      <Filter>Script Files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/dep/ACE_wrappers/bin/bin_vc8.sln b/dep/ACE_wrappers/bin/bin_vc8.sln
index ad5e0ab611a..ac4e7186746 100644
--- a/dep/ACE_wrappers/bin/bin_vc8.sln
+++ b/dep/ACE_wrappers/bin/bin_vc8.sln
@@ -1,43 +1,43 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE\PerlACE_vc8.vcproj", "{E15379F8-FECA-1BAD-A757-FC47A624E189}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin_vc8.vcproj", "{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
-		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
-		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+# $Id: VC8WorkspaceCreator.pm 1893 2010-08-26 15:06:15Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc8 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc8"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE\PerlACE_vc8.vcproj", "{E15379F8-FECA-1BAD-A757-FC47A624E189}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin_vc8.vcproj", "{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
+		{E15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
+		{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/bin/bin_vc8.vcproj b/dep/ACE_wrappers/bin/bin_vc8.vcproj
index ead58162374..a791787d6d4 100644
--- a/dep/ACE_wrappers/bin/bin_vc8.vcproj
+++ b/dep/ACE_wrappers/bin/bin_vc8.vcproj
@@ -1,441 +1,441 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="bin"
-	ProjectGUID="{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
-	RootNamespace="bin"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Debug\bin_vc8\I386"
-			ConfigurationType="1"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\envinfo.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release\bin_vc8\I386"
-			ConfigurationType="1"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\envinfo.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="."
-			IntermediateDirectory="Debug\bin_vc8\AMD64"
-			ConfigurationType="1"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\envinfo.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release\bin_vc8\AMD64"
-			ConfigurationType="1"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\envinfo.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C">
-			<File
-				RelativePath="envinfo.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			Filter="mpc;mpb;mwc">
-			<File
-				RelativePath="bin.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Script Files"
-			Filter="sh">
-			<File
-				RelativePath="ace_tests.lst">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="auto_run_tests.pl">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="bin"
+	ProjectGUID="{AF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
+	RootNamespace="bin"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Debug\bin_vc8\I386"
+			ConfigurationType="1"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\envinfo.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release\bin_vc8\I386"
+			ConfigurationType="1"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\envinfo.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="."
+			IntermediateDirectory="Debug\bin_vc8\AMD64"
+			ConfigurationType="1"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\envinfo.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release\bin_vc8\AMD64"
+			ConfigurationType="1"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\envinfo.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;c;C">
+			<File
+				RelativePath="envinfo.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Build Files"
+			Filter="mpc;mpb;mwc">
+			<File
+				RelativePath="bin.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Script Files"
+			Filter="sh">
+			<File
+				RelativePath="ace_tests.lst">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="auto_run_tests.pl">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/bin/bin_vc9.sln b/dep/ACE_wrappers/bin/bin_vc9.sln
index fd9e164e3fe..9ae40270afb 100644
--- a/dep/ACE_wrappers/bin/bin_vc9.sln
+++ b/dep/ACE_wrappers/bin/bin_vc9.sln
@@ -1,43 +1,43 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE\PerlACE_vc9.vcproj", "{F15379F8-FECA-1BAD-A757-FC47A624E189}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin_vc9.vcproj", "{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
-		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
-		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# $Id: VC9WorkspaceCreator.pm 1890 2010-08-24 19:48:23Z mitza $
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# /tmp/DOC_ROOT/stage-1367/ACE_wrappers/bin/mwc.pl -type vc9 -recurse -hierarchy -relative ACE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers -relative TAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO -relative CIAO_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/CIAO -relative DANCE_ROOT=/tmp/DOC_ROOT/stage-1367/ACE_wrappers/TAO/DAnCE -name_modifier "*_vc9"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlACE", "PerlACE\PerlACE_vc9.vcproj", "{F15379F8-FECA-1BAD-A757-FC47A624E189}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin", "bin_vc9.vcproj", "{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|Win32.Build.0 = Debug|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.ActiveCfg = Debug|x64
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Debug|x64.Build.0 = Debug|x64
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.ActiveCfg = Release|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|Win32.Build.0 = Release|Win32
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.ActiveCfg = Release|x64
+		{F15379F8-FECA-1BAD-A757-FC47A624E189}.Release|x64.Build.0 = Release|x64
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|Win32.Build.0 = Debug|Win32
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.ActiveCfg = Debug|x64
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Debug|x64.Build.0 = Debug|x64
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.ActiveCfg = Release|Win32
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|Win32.Build.0 = Release|Win32
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.ActiveCfg = Release|x64
+		{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/ACE_wrappers/bin/bin_vc9.vcproj b/dep/ACE_wrappers/bin/bin_vc9.vcproj
index da500fde4f8..df43a425c13 100644
--- a/dep/ACE_wrappers/bin/bin_vc9.vcproj
+++ b/dep/ACE_wrappers/bin/bin_vc9.vcproj
@@ -1,441 +1,441 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="bin"
-	ProjectGUID="{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
-	RootNamespace="bin"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Debug\bin_vc9\I386"
-			ConfigurationType="1"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\envinfo.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release\bin_vc9\I386"
-			ConfigurationType="1"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\envinfo.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="."
-			IntermediateDirectory="Debug\bin_vc9\AMD64"
-			ConfigurationType="1"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACEd.lib"
-				OutputFile="$(OutDir)\envinfo.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release\bin_vc9\AMD64"
-			ConfigurationType="1"
-			CharacterSet="0"
-
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="ACE.lib"
-				OutputFile="$(OutDir)\envinfo.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;..\lib"
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C">
-			<File
-				RelativePath="envinfo.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			Filter="mpc;mpb;mwc">
-			<File
-				RelativePath="bin.mpc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Script Files"
-			Filter="sh">
-			<File
-				RelativePath="ace_tests.lst">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="auto_run_tests.pl">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-				>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="bin"
+	ProjectGUID="{BF4BCC9A-FECA-1BAD-64FC-8A63000064FE}"
+	RootNamespace="bin"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Debug\bin_vc9\I386"
+			ConfigurationType="1"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\envinfo.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release\bin_vc9\I386"
+			ConfigurationType="1"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\envinfo.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="."
+			IntermediateDirectory="Debug\bin_vc9\AMD64"
+			ConfigurationType="1"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MPC_LIB_MODIFIER=\&quot;d\&quot;"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACEd.lib"
+				OutputFile="$(OutDir)\envinfo.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release\bin_vc9\AMD64"
+			ConfigurationType="1"
+			CharacterSet="0"
+
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories=".."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="ACE.lib"
+				OutputFile="$(OutDir)\envinfo.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;..\lib"
+				GenerateDebugInformation="false"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;c;C">
+			<File
+				RelativePath="envinfo.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Build Files"
+			Filter="mpc;mpb;mwc">
+			<File
+				RelativePath="bin.mpc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Script Files"
+			Filter="sh">
+			<File
+				RelativePath="ace_tests.lst">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="auto_run_tests.pl">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+				>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dep/ACE_wrappers/configure b/dep/ACE_wrappers/configure
index db806c68118..bc7ca96d499 100755
--- a/dep/ACE_wrappers/configure
+++ b/dep/ACE_wrappers/configure
@@ -10697,7 +10697,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
            CXXFLAGS="$CXXFLAGS"
            ACE_CXXFLAGS="$ACE_CXXFLAGS"
            DCXXFLAGS="$DCXXFLAGS"
-           OCXXFLAGS="-O3"
          fi
          ;;
      esac
@@ -27898,16 +27897,19 @@ _ACEOF
 
   fi
 
-    ACE_INT64=""
+  ACE_INT64=""
   ACE_UINT64=""
-                if test $ac_cv_sizeof_long = 8; then
-    ACE_INT64="signed long"
-    ACE_UINT64="unsigned long"
-    ace_u_long_long_typedef_set=yes
+##     CMaNGOS modification: Attention - order of checks size_of [long] / [long long] is required to allow/disallow build on MacOS/ some Linux machines
+##     this must (!) be fixed properly - if you experience problems on your system, try to reverse the order
+  if test $ac_cv_sizeof_long = 8; then
+     ACE_INT64="signed long"
+     ACE_UINT64="unsigned long"
+     ace_u_long_long_typedef_set=yes
   elif test $ac_cv_sizeof_long_long = 8; then
-    ACE_INT64="signed long long"
-    ACE_UINT64="unsigned long long"
-    ace_u_long_long_typedef_set=yes
+     ACE_INT64="signed long long"
+     ACE_UINT64="unsigned long long"
+     ace_u_long_long_typedef_set=yes
+##     CMaNGOS modification end
   else
     ace_u_long_long_typedef_set=no
   fi
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
index 5ac94776772..0052b72f499 100644
--- a/dep/CMakeLists.txt
+++ b/dep/CMakeLists.txt
@@ -16,7 +16,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-if(NOT (TBB_USE_EXTERNAL OR USE_STD_MALLOC))
+if(NOT (TBB_USE_EXTERNAL OR USE_STD_MALLOC OR USE_FASTMM_MALLOC))
   add_subdirectory(tbb)
 endif()
 
diff --git a/dep/cppunit/include/Makefile.am b/dep/cppunit/include/Makefile.am
new file mode 100644
index 00000000000..872ec706360
--- /dev/null
+++ b/dep/cppunit/include/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = cppunit
+
+# already handled by toplevel dist-hook.
+# DIST_SUBDIRS = msvc6
diff --git a/dep/cppunit/include/cppunit/AdditionalMessage.h b/dep/cppunit/include/cppunit/AdditionalMessage.h
new file mode 100644
index 00000000000..917d75414eb
--- /dev/null
+++ b/dep/cppunit/include/cppunit/AdditionalMessage.h
@@ -0,0 +1,76 @@
+#ifndef CPPUNIT_ADDITIONALMESSAGE_H
+#define CPPUNIT_ADDITIONALMESSAGE_H
+
+#include <cppunit/Message.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief An additional Message for assertions.
+ * \ingroup CreatingNewAssertions
+ *
+ * Provides a implicit constructor that takes a single string. This allow this
+ * class to be used as the message arguments in macros.
+ *
+ * The constructed object is either a Message with a single detail string if
+ * a string was passed to the macro, or a copy of the Message passed to the macro.
+ *
+ * Here is an example of usage:
+ * \code
+ * 
+ *   void checkStringEquals( const std::string &expected,
+ *                          const std::string &actual,
+ *                           const CppUnit::SourceLine &sourceLine,
+ *                           const CppUnit::AdditionalMessage &message );
+ *  
+ *   #define XTLUT_ASSERT_STRING_EQUAL_MESSAGE( expected, actual, message )  \
+ *     ::XtlUt::Impl::checkStringEquals( ::Xtl::toString(expected),        \
+ *                                       ::Xtl::toString(actual),          \
+ *                                       CPPUNIT_SOURCELINE(),             \
+ *                                       message )
+ * \endcode
+ *
+ * In the previous example, the user can specify a simple string for \a message,
+ * or a complex Message object.
+ *
+ * \see Message
+ */
+class CPPUNIT_API AdditionalMessage : public Message
+{
+public:
+  typedef Message SuperClass;
+
+  /// Constructs an empty Message.
+  AdditionalMessage();
+
+  /*! \brief Constructs a Message with the specified detail string.
+   * \param detail1 Detail string of the message. If empty, then it is not added.
+   */
+  AdditionalMessage( const std::string &detail1 );
+
+  /*! \brief Constructs a Message with the specified detail string.
+   * \param detail1 Detail string of the message. If empty, then it is not added.
+   */
+  AdditionalMessage( const char *detail1 );
+
+  /*! \brief Constructs a copy of the specified message.
+   * \param other Message to copy.
+   */
+  AdditionalMessage( const Message &other );
+
+  /*! \brief Assignment operator.
+   * \param other Message to copy.
+   * \return Reference on this object.
+   */
+  AdditionalMessage &operator =( const Message &other );
+
+private:
+};
+
+
+CPPUNIT_NS_END
+
+
+
+#endif  // CPPUNIT_ADDITIONALMESSAGE_H
diff --git a/dep/cppunit/include/cppunit/Asserter.h b/dep/cppunit/include/cppunit/Asserter.h
new file mode 100644
index 00000000000..94dadaad711
--- /dev/null
+++ b/dep/cppunit/include/cppunit/Asserter.h
@@ -0,0 +1,143 @@
+#ifndef CPPUNIT_ASSERTER_H
+#define CPPUNIT_ASSERTER_H
+
+#include <cppunit/AdditionalMessage.h>
+#include <cppunit/SourceLine.h>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+
+class Message;
+
+
+/*! \brief A set of functions to help writing assertion macros.
+ * \ingroup CreatingNewAssertions
+ *
+ * Here is an example of assertion, a simplified version of the
+ * actual assertion implemented in examples/cppunittest/XmlUniformiser.h:
+ * \code
+ * #include <cppunit/SourceLine.h>
+ * #include <cppunit/TestAssert.h>
+ * 
+ * void 
+ * checkXmlEqual( std::string expectedXml,
+ *                std::string actualXml,
+ *                CppUnit::SourceLine sourceLine )
+ * {
+ *   std::string expected = XmlUniformiser( expectedXml ).stripped();
+ *   std::string actual = XmlUniformiser( actualXml ).stripped();
+ * 
+ *   if ( expected == actual )
+ *     return;
+ * 
+ *   ::CppUnit::Asserter::failNotEqual( expected,
+ *                                      actual,
+ *                                      sourceLine );
+ * }
+ * 
+ * /// Asserts that two XML strings are equivalent.
+ * #define CPPUNITTEST_ASSERT_XML_EQUAL( expected, actual ) \
+ *     checkXmlEqual( expected, actual,                     \
+ *                    CPPUNIT_SOURCELINE() )
+ * \endcode
+ */
+struct Asserter
+{
+  /*! \brief Throws a Exception with the specified message and location.
+   */
+  static void CPPUNIT_API fail( const Message &message, 
+                                const SourceLine &sourceLine = SourceLine() );
+
+  /*! \brief Throws a Exception with the specified message and location.
+   * \deprecated Use fail( Message, SourceLine ) instead.
+   */
+  static void CPPUNIT_API fail( std::string message, 
+                                const SourceLine &sourceLine = SourceLine() );
+
+  /*! \brief Throws a Exception with the specified message and location.
+   * \param shouldFail if \c true then the exception is thrown. Otherwise
+   *                   nothing happen.
+   * \param message Message explaining the assertion failiure.
+   * \param sourceLine Location of the assertion.
+   */
+  static void CPPUNIT_API failIf( bool shouldFail, 
+                                  const Message &message, 
+                                  const SourceLine &sourceLine = SourceLine() );
+
+  /*! \brief Throws a Exception with the specified message and location.
+   * \deprecated Use failIf( bool, Message, SourceLine ) instead.
+   * \param shouldFail if \c true then the exception is thrown. Otherwise
+   *                   nothing happen.
+   * \param message Message explaining the assertion failiure.
+   * \param sourceLine Location of the assertion.
+   */
+  static void CPPUNIT_API failIf( bool shouldFail, 
+                                  std::string message, 
+                                  const SourceLine &sourceLine = SourceLine() );
+
+  /*! \brief Returns a expected value string for a message.
+   * Typically used to create 'not equal' message, or to check that a message
+   * contains the expected content when writing unit tests for your custom 
+   * assertions.
+   *
+   * \param expectedValue String that represents the expected value.
+   * \return \a expectedValue prefixed with "Expected: ".
+   * \see makeActual().
+   */
+  static std::string CPPUNIT_API makeExpected( const std::string &expectedValue );
+
+  /*! \brief Returns an actual value string for a message.
+   * Typically used to create 'not equal' message, or to check that a message
+   * contains the expected content when writing unit tests for your custom 
+   * assertions.
+   *
+   * \param actualValue String that represents the actual value.
+   * \return \a actualValue prefixed with "Actual  : ".
+   * \see makeExpected().
+   */
+  static std::string CPPUNIT_API makeActual( const std::string &actualValue );
+
+  static Message CPPUNIT_API makeNotEqualMessage( const std::string &expectedValue,
+                                                  const std::string &actualValue,
+                                                  const AdditionalMessage &additionalMessage = AdditionalMessage(),
+                                                  const std::string &shortDescription = "equality assertion failed");
+
+  /*! \brief Throws an Exception with the specified message and location.
+   * \param expected Text describing the expected value.
+   * \param actual Text describing the actual value.
+   * \param sourceLine Location of the assertion.
+   * \param additionalMessage Additional message. Usually used to report
+   *                          what are the differences between the expected and actual value.
+   * \param shortDescription Short description for the failure message.
+   */
+  static void CPPUNIT_API failNotEqual( std::string expected, 
+                                        std::string actual, 
+                                        const SourceLine &sourceLine,
+                                        const AdditionalMessage &additionalMessage = AdditionalMessage(),
+                                        std::string shortDescription = "equality assertion failed" );
+
+  /*! \brief Throws an Exception with the specified message and location.
+   * \param shouldFail if \c true then the exception is thrown. Otherwise
+   *                   nothing happen.
+   * \param expected Text describing the expected value.
+   * \param actual Text describing the actual value.
+   * \param sourceLine Location of the assertion.
+   * \param additionalMessage Additional message. Usually used to report
+   *                          where the "difference" is located.
+   * \param shortDescription Short description for the failure message.
+   */
+  static void CPPUNIT_API failNotEqualIf( bool shouldFail,
+                                          std::string expected, 
+                                          std::string actual, 
+                                          const SourceLine &sourceLine,
+                                          const AdditionalMessage &additionalMessage = AdditionalMessage(),
+                                          std::string shortDescription = "equality assertion failed" );
+
+};
+
+
+CPPUNIT_NS_END
+
+
+#endif  // CPPUNIT_ASSERTER_H
diff --git a/dep/cppunit/include/cppunit/BriefTestProgressListener.h b/dep/cppunit/include/cppunit/BriefTestProgressListener.h
new file mode 100644
index 00000000000..137ca44b31e
--- /dev/null
+++ b/dep/cppunit/include/cppunit/BriefTestProgressListener.h
@@ -0,0 +1,43 @@
+#ifndef CPPUNIT_BRIEFTESTPROGRESSLISTENER_H
+#define CPPUNIT_BRIEFTESTPROGRESSLISTENER_H
+
+#include <cppunit/TestListener.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief TestListener that prints the name of each test before running it.
+ * \ingroup TrackingTestExecution
+ */
+class CPPUNIT_API BriefTestProgressListener : public TestListener
+{
+public:
+  /*! Constructs a BriefTestProgressListener object.
+   */
+  BriefTestProgressListener();
+
+  /// Destructor.
+  virtual ~BriefTestProgressListener();
+
+  void startTest( Test *test );
+
+  void addFailure( const TestFailure &failure );
+
+  void endTest( Test *test );
+
+private:
+  /// Prevents the use of the copy constructor.
+  BriefTestProgressListener( const BriefTestProgressListener &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const BriefTestProgressListener &copy );
+
+private:
+  bool m_lastTestFailed;
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_BRIEFTESTPROGRESSLISTENER_H
diff --git a/dep/cppunit/include/cppunit/CompilerOutputter.h b/dep/cppunit/include/cppunit/CompilerOutputter.h
new file mode 100644
index 00000000000..885fe652654
--- /dev/null
+++ b/dep/cppunit/include/cppunit/CompilerOutputter.h
@@ -0,0 +1,146 @@
+#ifndef CPPUNIT_COMPILERTESTRESULTOUTPUTTER_H
+#define CPPUNIT_COMPILERTESTRESULTOUTPUTTER_H
+
+#include <cppunit/Portability.h>
+#include <cppunit/Outputter.h>
+#include <cppunit/portability/Stream.h>
+
+CPPUNIT_NS_BEGIN
+
+
+class Exception;
+class SourceLine;
+class Test;
+class TestFailure;
+class TestResultCollector;
+
+/*! 
+ * \brief Outputs a TestResultCollector in a compiler compatible format.
+ * \ingroup WritingTestResult
+ *
+ * Printing the test results in a compiler compatible format (assertion
+ * location has the same format as compiler error), allow you to use your
+ * IDE to jump to the assertion failure. Location format can be customized (see
+ * setLocationFormat() ).
+ *
+ * For example, when running the test in a post-build with VC++, if an assertion
+ * fails, you can jump to the assertion by pressing F4 (jump to next error).
+ *
+ * Heres is an example of usage (from examples/cppunittest/CppUnitTestMain.cpp):
+ * \code
+ * int main( int argc, char* argv[] ) {
+ *   // if command line contains "-selftest" then this is the post build check
+ *   // => the output must be in the compiler error format.
+ *   bool selfTest = (argc > 1)  &&  
+ *                   (std::string("-selftest") == argv[1]);
+ *
+ *   CppUnit::TextUi::TestRunner runner;
+ *   runner.addTest( CppUnitTest::suite() );   // Add the top suite to the test runner
+ * 
+ *  if ( selfTest )
+ *   { // Change the default outputter to a compiler error format outputter
+ *     // The test runner owns the new outputter.
+ *     runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(),
+ *                                                          std::cerr ) );
+ *   }
+ * 
+ *  // Run the test and don't wait a key if post build check.
+ *   bool wasSuccessful = runner.run( "", !selfTest );
+ * 
+ *   // Return error code 1 if the one of test failed.
+ *   return wasSuccessful ? 0 : 1;
+ * }
+ * \endcode
+ */
+class CPPUNIT_API CompilerOutputter : public Outputter
+{
+public:
+  /*! \brief Constructs a CompilerOutputter object.
+   * \param result Result of the test run.
+   * \param stream Stream used to output test result.
+   * \param locationFormat Error location format used by your compiler. Default
+   *                       to \c CPPUNIT_COMPILER_LOCATION_FORMAT which is defined
+   *                       in the configuration file. See setLocationFormat() for detail.
+   * \see setLocationFormat().
+   */
+  CompilerOutputter( TestResultCollector *result,
+                     OStream &stream,
+                     const std::string &locationFormat = CPPUNIT_COMPILER_LOCATION_FORMAT );
+
+  /// Destructor.
+  virtual ~CompilerOutputter();
+
+  /*! \brief Sets the error location format.
+   * 
+   * Indicates the format used to report location of failed assertion. This format should
+   * match the one used by your compiler.
+   *
+   * The location format is a string in which the occurence of the following character
+   * sequence are replaced:
+   *
+   * - "%l" => replaced by the line number
+   * - "%p" => replaced by the full path name of the file ("G:\prg\vc\cppunit\MyTest.cpp")
+   * - "%f" => replaced by the base name of the file ("MyTest.cpp")
+   *
+   * Some examples:
+   *
+   * - VC++ error location format: "%p(%l):" => produce "G:\prg\MyTest.cpp(43):"
+   * - GCC error location format: "%f:%l:" => produce "MyTest.cpp:43:"
+   * 
+   * Thoses are the two compilers currently <em>supported</em> (gcc format is used if
+   * VC++ is not detected). If you want your compiler to be automatically supported by
+   * CppUnit, send a mail to the mailing list (preferred), or submit a feature request
+   * that indicates how to detect your compiler with the preprocessor (\#ifdef...) and
+   * your compiler location format.
+   */
+  void setLocationFormat( const std::string &locationFormat );
+
+  /*! \brief Creates an instance of an outputter that matches your current compiler.
+   * \deprecated This class is specialized through parameterization instead of subclassing...
+   *             Use CompilerOutputter::CompilerOutputter instead.
+   */
+  static CompilerOutputter *defaultOutputter( TestResultCollector *result,
+                                              OStream &stream );
+
+  void write();
+
+  void setNoWrap();
+
+  void setWrapColumn( int wrapColumn );
+
+  int wrapColumn() const;
+
+  virtual void printSuccess();
+  virtual void printFailureReport();
+  virtual void printFailuresList();
+  virtual void printStatistics();
+  virtual void printFailureDetail( TestFailure *failure );
+  virtual void printFailureLocation( SourceLine sourceLine );
+  virtual void printFailureType( TestFailure *failure );
+  virtual void printFailedTestName( TestFailure *failure );
+  virtual void printFailureMessage( TestFailure *failure );
+
+private:
+  /// Prevents the use of the copy constructor.
+  CompilerOutputter( const CompilerOutputter &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const CompilerOutputter &copy );
+
+  virtual bool processLocationFormatCommand( char command, 
+                                             const SourceLine &sourceLine );
+
+  virtual std::string extractBaseName( const std::string &fileName ) const;
+
+private:
+  TestResultCollector *m_result;
+  OStream &m_stream;
+  std::string m_locationFormat;
+  int m_wrapColumn;
+};
+
+
+CPPUNIT_NS_END
+
+
+#endif  // CPPUNIT_COMPILERTESTRESULTOUTPUTTER_H
diff --git a/dep/cppunit/include/cppunit/Exception.h b/dep/cppunit/include/cppunit/Exception.h
new file mode 100644
index 00000000000..bf5fcacf665
--- /dev/null
+++ b/dep/cppunit/include/cppunit/Exception.h
@@ -0,0 +1,90 @@
+#ifndef CPPUNIT_EXCEPTION_H
+#define CPPUNIT_EXCEPTION_H
+
+#include <cppunit/Portability.h>
+#include <cppunit/Message.h>
+#include <cppunit/SourceLine.h>
+#include <exception>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Exceptions thrown by failed assertions.
+ * \ingroup BrowsingCollectedTestResult
+ *
+ * Exception is an exception that serves
+ * descriptive strings through its what() method
+ */
+class CPPUNIT_API Exception : public std::exception
+{
+public:
+  /*! \brief Constructs the exception with the specified message and source location.
+   * \param message Message associated to the exception.
+   * \param sourceLine Source location related to the exception.
+   */
+  Exception( const Message &message = Message(), 
+             const SourceLine &sourceLine = SourceLine() );
+
+#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED
+  /*!
+   * \deprecated Use other constructor instead.
+   */
+  Exception( std::string  message, 
+	     long lineNumber, 
+	     std::string fileName );
+#endif
+
+  /*! \brief Constructs a copy of an exception.
+   * \param other Exception to copy.
+   */
+  Exception( const Exception &other );
+
+  /// Destructs the exception
+  virtual ~Exception() throw();
+
+  /// Performs an assignment
+  Exception &operator =( const Exception &other );
+
+  /// Returns descriptive message
+  const char *what() const throw();
+
+  /// Location where the error occured
+  SourceLine sourceLine() const;
+
+  /// Message related to the exception.
+  Message message() const;
+
+  /// Set the message.
+  void setMessage( const Message &message );
+
+#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED
+  /// The line on which the error occurred
+  long lineNumber() const;
+
+  /// The file in which the error occurred
+  std::string fileName() const;
+
+  static const std::string UNKNOWNFILENAME;
+  static const long UNKNOWNLINENUMBER;
+#endif
+
+  /// Clones the exception.
+  virtual Exception *clone() const;
+
+protected:
+  // VC++ does not recognize call to parent class when prefixed
+  // with a namespace. This is a workaround.
+  typedef std::exception SuperClass;
+
+  Message m_message;
+  SourceLine m_sourceLine;
+  std::string m_whatMessage;
+};
+
+
+CPPUNIT_NS_END
+
+
+#endif // CPPUNIT_EXCEPTION_H
+
diff --git a/dep/cppunit/include/cppunit/Makefile.am b/dep/cppunit/include/cppunit/Makefile.am
new file mode 100644
index 00000000000..c743a67c549
--- /dev/null
+++ b/dep/cppunit/include/cppunit/Makefile.am
@@ -0,0 +1,42 @@
+SUBDIRS = extensions ui plugin config tools portability
+
+DISTCLEANFILES = config-auto.h
+
+libcppunitincludedir = $(includedir)/cppunit
+libcppunitinclude_HEADERS =  \
+	config-auto.h \
+  AdditionalMessage.h \
+	Asserter.h \
+	BriefTestProgressListener.h \
+	CompilerOutputter.h \
+	Exception.h \
+	Message.h \
+	Outputter.h \
+	Portability.h \
+	Protector.h \
+	SourceLine.h \
+	SynchronizedObject.h \
+	Test.h \
+	TestAssert.h \
+	TestCase.h \
+	TestCaller.h \
+	TestComposite.h \
+	TestFailure.h \
+	TestFixture.h \
+	TestLeaf.h \
+	TestPath.h \
+	TestResult.h \
+	TestResultCollector.h \
+	TestRunner.h \
+	TestSuccessListener.h \
+	TestSuite.h \
+	TextOutputter.h \
+	TextTestProgressListener.h \
+	TextTestResult.h \
+	TextTestRunner.h \
+	TestListener.h \
+	XmlOutputter.h \
+	XmlOutputterHook.h
+
+dist-hook:
+	rm -f $(distdir)/config-auto.h
diff --git a/dep/cppunit/include/cppunit/Makefile.in b/dep/cppunit/include/cppunit/Makefile.in
new file mode 100644
index 00000000000..4594fa0459c
--- /dev/null
+++ b/dep/cppunit/include/cppunit/Makefile.in
@@ -0,0 +1,587 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# 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.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = include/cppunit
+DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
+	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
+	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
+	$(top_srcdir)/config/ac_cxx_rtti.m4 \
+	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
+	$(top_srcdir)/config/ac_dll.m4 \
+	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_cxx_have_isfinite.m4 \
+	$(top_srcdir)/config/bb_enable_doxygen.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libcppunitincludedir)"
+libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libcppunitinclude_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@
+CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@
+CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@
+CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@
+CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@
+CPPUNIT_VERSION = @CPPUNIT_VERSION@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_dot = @enable_dot@
+enable_html_docs = @enable_html_docs@
+enable_latex_docs = @enable_latex_docs@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = extensions ui plugin config tools portability
+DISTCLEANFILES = config-auto.h
+libcppunitincludedir = $(includedir)/cppunit
+libcppunitinclude_HEADERS = \
+	config-auto.h \
+  AdditionalMessage.h \
+	Asserter.h \
+	BriefTestProgressListener.h \
+	CompilerOutputter.h \
+	Exception.h \
+	Message.h \
+	Outputter.h \
+	Portability.h \
+	Protector.h \
+	SourceLine.h \
+	SynchronizedObject.h \
+	Test.h \
+	TestAssert.h \
+	TestCase.h \
+	TestCaller.h \
+	TestComposite.h \
+	TestFailure.h \
+	TestFixture.h \
+	TestLeaf.h \
+	TestPath.h \
+	TestResult.h \
+	TestResultCollector.h \
+	TestRunner.h \
+	TestSuccessListener.h \
+	TestSuite.h \
+	TextOutputter.h \
+	TextTestProgressListener.h \
+	TextTestResult.h \
+	TextTestRunner.h \
+	TestListener.h \
+	XmlOutputter.h \
+	XmlOutputterHook.h
+
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/cppunit/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  include/cppunit/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)"
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+uninstall-libcppunitincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(HEADERS)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(libcppunitincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-libcppunitincludeHEADERS
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-libcppunitincludeHEADERS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive dist-hook distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libcppunitincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-libcppunitincludeHEADERS
+
+
+dist-hook:
+	rm -f $(distdir)/config-auto.h
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/dep/cppunit/include/cppunit/Message.h b/dep/cppunit/include/cppunit/Message.h
new file mode 100644
index 00000000000..1ae51cc2bd7
--- /dev/null
+++ b/dep/cppunit/include/cppunit/Message.h
@@ -0,0 +1,156 @@
+#ifndef CPPUNIT_MESSAGE_H
+#define CPPUNIT_MESSAGE_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+#include <cppunit/portability/CppUnitDeque.h>
+#include <string>
+
+
+CPPUNIT_NS_BEGIN
+
+
+#if CPPUNIT_NEED_DLL_DECL
+//  template class CPPUNIT_API std::deque<std::string>;
+#endif
+
+/*! \brief Message associated to an Exception.
+ * \ingroup CreatingNewAssertions
+ *  A message is composed of two items:
+ *  - a short description (~20/30 characters)
+ *  - a list of detail strings
+ *
+ *  The short description is used to indicate how the detail strings should be
+ *  interpreted. It usually indicates the failure types, such as
+ *  "assertion failed", "forced failure", "unexpected exception caught",
+ *  "equality assertion failed"... It should not contains new line character (\n).
+ *
+ *  Detail strings are used to provide more information about the failure. It
+ *  can contains the asserted expression, the expected and actual values in an
+ *  equality assertion, some addional messages... Detail strings can contains
+ *  new line characters (\n).
+ */
+class CPPUNIT_API Message
+{
+public:
+  Message();
+
+  // Ensure thread-safe copy by detaching the string.
+  Message( const Message &other );
+
+  explicit Message( const std::string &shortDescription );
+
+  Message( const std::string &shortDescription,
+           const std::string &detail1 );
+
+  Message( const std::string &shortDescription,
+           const std::string &detail1,
+           const std::string &detail2 );
+
+  Message( const std::string &shortDescription,
+           const std::string &detail1,
+           const std::string &detail2,
+           const std::string &detail3 );
+
+  Message &operator =( const Message &other );
+
+  /*! \brief Returns the short description.
+   * \return Short description.
+   */
+  const std::string &shortDescription() const;
+
+  /*! \brief Returns the number of detail string.
+   * \return Number of detail string.
+   */
+  int detailCount() const;
+
+  /*! \brief Returns the detail at the specified index.
+   * \param index Zero based index of the detail string to return.
+   * \returns Detail string at the specified index.
+   * \exception std::invalid_argument if \a index < 0 or index >= detailCount().
+   */
+  std::string detailAt( int index ) const;
+
+  /*! \brief Returns a string that represents a list of the detail strings.
+   *
+   * Example:
+   * \code
+   * Message message( "not equal", "Expected: 3", "Actual: 7" );
+   * std::string details = message.details();
+   * // details contains:
+   * // "- Expected: 3\n- Actual: 7\n"  \endcode
+   *
+   * \return A string that is a concatenation of all the detail strings. Each detail
+   *         string is prefixed with '- ' and suffixed with '\n' before being
+   *         concatenated to the other.
+   */
+  std::string details() const;
+
+  /*! \brief Removes all detail strings.
+   */
+  void clearDetails();
+
+  /*! \brief Adds a single detail string.
+   * \param detail Detail string to add.
+   */
+  void addDetail( const std::string &detail );
+
+  /*! \brief Adds two detail strings.
+   * \param detail1 Detail string to add.
+   * \param detail2 Detail string to add.
+   */
+  void addDetail( const std::string &detail1,
+                  const std::string &detail2 );
+
+  /*! \brief Adds three detail strings.
+   * \param detail1 Detail string to add.
+   * \param detail2 Detail string to add.
+   * \param detail3 Detail string to add.
+   */
+  void addDetail( const std::string &detail1,
+                  const std::string &detail2,
+                  const std::string &detail3 );
+
+  /*! \brief Adds the detail strings of the specified message.
+   * \param message All the detail strings of this message are added to this one.
+   */
+  void addDetail( const Message &message );
+
+  /*! \brief Sets the short description.
+   * \param shortDescription New short description.
+   */
+  void setShortDescription( const std::string &shortDescription );
+
+  /*! \brief Tests if a message is identical to another one.
+   * \param other Message this message is compared to.
+   * \return \c true if the two message are identical, \c false otherwise.
+   */
+  bool operator ==( const Message &other ) const;
+
+  /*! \brief Tests if a message is different from another one.
+   * \param other Message this message is compared to.
+   * \return \c true if the two message are not identical, \c false otherwise.
+   */
+  bool operator !=( const Message &other ) const;
+
+private:
+  std::string m_shortDescription;
+
+  typedef CppUnitDeque<std::string> Details;
+  Details m_details;
+};
+
+
+CPPUNIT_NS_END
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+
+#endif  // CPPUNIT_MESSAGE_H
diff --git a/dep/cppunit/include/cppunit/Outputter.h b/dep/cppunit/include/cppunit/Outputter.h
new file mode 100644
index 00000000000..f31d6815dce
--- /dev/null
+++ b/dep/cppunit/include/cppunit/Outputter.h
@@ -0,0 +1,26 @@
+#ifndef CPPUNIT_OUTPUTTER_H
+#define CPPUNIT_OUTPUTTER_H
+
+#include <cppunit/Portability.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Abstract outputter to print test result summary.
+ * \ingroup WritingTestResult
+ */
+class CPPUNIT_API Outputter
+{
+public:
+  /// Destructor.
+  virtual ~Outputter() {}
+
+  virtual void write() =0;
+};
+
+
+CPPUNIT_NS_END
+
+
+#endif  // CPPUNIT_OUTPUTTER_H
diff --git a/dep/cppunit/include/cppunit/Portability.h b/dep/cppunit/include/cppunit/Portability.h
new file mode 100644
index 00000000000..ddf03169181
--- /dev/null
+++ b/dep/cppunit/include/cppunit/Portability.h
@@ -0,0 +1,177 @@
+#ifndef CPPUNIT_PORTABILITY_H
+#define CPPUNIT_PORTABILITY_H
+
+#if defined(_WIN32) && !defined(WIN32)
+# define WIN32 1
+#endif
+
+/* include platform specific config */
+#if defined(__BORLANDC__)
+#  include <cppunit/config/config-bcb5.h>
+#elif defined (_MSC_VER)
+#  if _MSC_VER == 1200 && defined(_WIN32_WCE) //evc4
+#    include <cppunit/config/config-evc4.h>
+#  else
+#    include <cppunit/config/config-msvc6.h>
+#  endif
+#else
+#    include <cppunit/config-auto.h>
+#endif
+
+// Version number of package
+#ifndef CPPUNIT_VERSION 
+#define CPPUNIT_VERSION  "1.12.0"
+#endif
+ 
+#include <cppunit/config/CppUnitApi.h>    // define CPPUNIT_API & CPPUNIT_NEED_DLL_DECL
+#include <cppunit/config/SelectDllLoader.h>
+
+
+/* Options that the library user may switch on or off.
+ * If the user has not done so, we chose default values.
+ */
+
+
+/* Define to 1 if you wish to have the old-style macros
+   assert(), assertEqual(), assertDoublesEqual(), and assertLongsEqual() */
+#if !defined(CPPUNIT_ENABLE_NAKED_ASSERT)
+# define CPPUNIT_ENABLE_NAKED_ASSERT          0
+#endif
+
+/* Define to 1 if you wish to have the old-style CU_TEST family
+   of macros. */
+#if !defined(CPPUNIT_ENABLE_CU_TEST_MACROS)
+# define CPPUNIT_ENABLE_CU_TEST_MACROS        0
+#endif
+
+/* Define to 1 if the preprocessor expands (#foo) to "foo" (quotes incl.) 
+   I don't think there is any C preprocess that does NOT support this! */
+#if !defined(CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION)
+# define CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION   1
+#endif
+
+/* Assumes that STL and CppUnit are in global space if the compiler does not
+   support namespace. */
+#if !defined(CPPUNIT_HAVE_NAMESPACES)
+# if !defined(CPPUNIT_NO_NAMESPACE)
+#  define CPPUNIT_NO_NAMESPACE 1
+# endif // !defined(CPPUNIT_NO_NAMESPACE)
+# if !defined(CPPUNIT_NO_STD_NAMESPACE)
+#  define CPPUNIT_NO_STD_NAMESPACE 1
+# endif // !defined(CPPUNIT_NO_STD_NAMESPACE)
+#endif // !defined(CPPUNIT_HAVE_NAMESPACES)
+
+/* Define CPPUNIT_STD_NEED_ALLOCATOR to 1 if you need to specify
+ * the allocator you used when instantiating STL container. Typically
+ * used for compilers that do not support template default parameter.
+ * CPPUNIT_STD_ALLOCATOR will be used as the allocator. Default is
+ * std::allocator. On some compilers, you may need to change this to
+ * std::allocator<T>.
+ */
+#if CPPUNIT_STD_NEED_ALLOCATOR
+# if !defined(CPPUNIT_STD_ALLOCATOR)
+#  define CPPUNIT_STD_ALLOCATOR std::allocator
+# endif // !defined(CPPUNIT_STD_ALLOCATOR)
+#endif // defined(CPPUNIT_STD_NEED_ALLOCATOR)
+
+
+// Compiler error location format for CompilerOutputter
+// If not define, assumes that it's gcc
+// See class CompilerOutputter for format.
+#if !defined(CPPUNIT_COMPILER_LOCATION_FORMAT)
+#if defined(__GNUC__) && ( defined(__APPLE_CPP__) || defined(__APPLE_CC__) )
+// gcc/Xcode integration on Mac OS X
+# define CPPUNIT_COMPILER_LOCATION_FORMAT "%p:%l: " 
+#else
+# define CPPUNIT_COMPILER_LOCATION_FORMAT "%f:%l:"
+#endif
+#endif
+
+// If CPPUNIT_HAVE_CPP_CAST is defined, then c++ style cast will be used,
+// otherwise, C style cast are used.
+#if defined( CPPUNIT_HAVE_CPP_CAST )
+# define CPPUNIT_CONST_CAST( TargetType, pointer ) \
+    const_cast<TargetType>( pointer )
+
+# define CPPUNIT_STATIC_CAST( TargetType, pointer ) \
+    static_cast<TargetType>( pointer )
+#else // defined( CPPUNIT_HAVE_CPP_CAST )
+# define CPPUNIT_CONST_CAST( TargetType, pointer ) \
+    ((TargetType)( pointer ))
+# define CPPUNIT_STATIC_CAST( TargetType, pointer ) \
+    ((TargetType)( pointer ))
+#endif // defined( CPPUNIT_HAVE_CPP_CAST )
+
+// If CPPUNIT_NO_STD_NAMESPACE is defined then STL are in the global space.
+// => Define macro 'std' to nothing
+#if defined(CPPUNIT_NO_STD_NAMESPACE)
+# undef std
+# define std
+#endif  // defined(CPPUNIT_NO_STD_NAMESPACE)
+
+// If CPPUNIT_NO_NAMESPACE is defined, then put CppUnit classes in the
+// global namespace: the compiler does not support namespace.
+#if defined(CPPUNIT_NO_NAMESPACE)
+# define CPPUNIT_NS_BEGIN
+# define CPPUNIT_NS_END
+# define CPPUNIT_NS
+#else   // defined(CPPUNIT_NO_NAMESPACE)
+# define CPPUNIT_NS_BEGIN namespace CppUnit {
+# define CPPUNIT_NS_END }
+# define CPPUNIT_NS CppUnit
+#endif  // defined(CPPUNIT_NO_NAMESPACE)
+
+/*! Stringize a symbol.
+ * 
+ * Use this macro to convert a preprocessor symbol to a string.
+ *
+ * Example of usage:
+ * \code
+ * #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn
+ * const char *name = CPPUNIT_STRINGIZE( CPPUNIT_PLUGIN_EXPORTED_NAME );
+ * \endcode
+ */
+#define CPPUNIT_STRINGIZE( symbol ) _CPPUNIT_DO_STRINGIZE( symbol )
+
+/// \internal
+#define _CPPUNIT_DO_STRINGIZE( symbol ) #symbol
+
+/*! Joins to symbol after expanding them into string.
+ *
+ * Use this macro to join two symbols. Example of usage:
+ *
+ * \code
+ * #define MAKE_UNIQUE_NAME(prefix) CPPUNIT_JOIN( prefix, __LINE__ )
+ * \endcode
+ *
+ * The macro defined in the example concatenate a given prefix with the line number
+ * to obtain a 'unique' identifier.
+ *
+ * \internal From boost documentation:
+ * The following piece of macro magic joins the two 
+ * arguments together, even when one of the arguments is
+ * itself a macro (see 16.3.1 in C++ standard).  The key
+ * is that macro expansion of macro arguments does not
+ * occur in CPPUNIT_JOIN2 but does in CPPUNIT_JOIN.
+ */
+#define CPPUNIT_JOIN( symbol1, symbol2 ) _CPPUNIT_DO_JOIN( symbol1, symbol2 )
+
+/// \internal
+#define _CPPUNIT_DO_JOIN( symbol1, symbol2 ) _CPPUNIT_DO_JOIN2( symbol1, symbol2 )
+
+/// \internal
+#define _CPPUNIT_DO_JOIN2( symbol1, symbol2 ) symbol1##symbol2
+
+/*! Adds the line number to the specified string to create a unique identifier.
+ * \param prefix Prefix added to the line number to create a unique identifier.
+ * \see CPPUNIT_TEST_SUITE_REGISTRATION for an example of usage.
+ */
+#define CPPUNIT_MAKE_UNIQUE_NAME( prefix ) CPPUNIT_JOIN( prefix, __LINE__ )
+
+/*! Defines wrap colunm for %CppUnit. Used by CompilerOuputter.
+ */
+#if !defined(CPPUNIT_WRAP_COLUMN)
+# define CPPUNIT_WRAP_COLUMN 79
+#endif
+
+#endif // CPPUNIT_PORTABILITY_H
diff --git a/dep/cppunit/include/cppunit/Protector.h b/dep/cppunit/include/cppunit/Protector.h
new file mode 100644
index 00000000000..d14e75f641e
--- /dev/null
+++ b/dep/cppunit/include/cppunit/Protector.h
@@ -0,0 +1,94 @@
+#ifndef CPPUNIT_PROTECTOR_H
+#define CPPUNIT_PROTECTOR_H
+
+#include <cppunit/SourceLine.h>
+
+CPPUNIT_NS_BEGIN
+
+class Exception;
+class Message;
+class ProtectorContext;
+class TestResult;
+
+
+class CPPUNIT_API Functor
+{
+public:
+  virtual ~Functor();
+
+  virtual bool operator()() const =0;
+};
+
+
+/*! \brief Protects one or more test case run.
+ *
+ * Protector are used to globably 'decorate' a test case. The most common
+ * usage of Protector is to catch exception that do not subclass std::exception,
+ * such as MFC CException class or Rogue Wave RWXMsg class, and capture the
+ * message associated to the exception. In fact, CppUnit capture message from
+ * Exception and std::exception using a Protector.
+ *
+ * Protector are chained. When you add a Protector using 
+ * TestResult::pushProtector(), your protector is in fact passed as a Functor
+ * to the first protector of the chain.
+ *
+ * TestCase protects call to setUp(), runTest() and tearDown() by calling
+ * TestResult::protect().
+ *
+ * Because the protector chain is handled by TestResult, a protector can be
+ * active for a single test, or a complete test run.
+ *
+ * Here are some possible usages:
+ * - run all test case in a separate thread and assumes the test failed if it
+ *   did not finish in a given time (infinite loop work around)
+ * - performance tracing : time only the runTest() time.
+ * \sa TestResult, TestCase, TestListener.
+ */
+class CPPUNIT_API Protector
+{
+public:
+  virtual ~Protector();
+  
+  virtual bool protect( const Functor &functor,
+                        const ProtectorContext &context ) =0;
+
+protected:
+  void reportError( const ProtectorContext &context,
+                    const Exception &error ) const;
+
+  void reportError( const ProtectorContext &context,
+                    const Message &message,
+                    const SourceLine &sourceLine = SourceLine() ) const;
+
+  void reportFailure( const ProtectorContext &context,
+                      const Exception &failure ) const;
+
+  Message actualMessage( const Message &message,
+                         const ProtectorContext &context ) const;
+};
+
+
+/*! \brief Scoped protector push to TestResult.
+ *
+ * Adds the specified Protector to the specified TestResult for the object
+ * life-time.
+ */
+class CPPUNIT_API ProtectorGuard
+{
+public:
+  /// Pushes the specified protector.
+  ProtectorGuard( TestResult *result,
+                  Protector *protector );
+
+  /// Pops the protector.
+  ~ProtectorGuard();
+
+private:
+  TestResult *m_result;
+};
+
+CPPUNIT_NS_END
+
+
+#endif // CPPUNIT_PROTECTOR_H
+
diff --git a/dep/cppunit/include/cppunit/SourceLine.h b/dep/cppunit/include/cppunit/SourceLine.h
new file mode 100644
index 00000000000..f7a85df7f03
--- /dev/null
+++ b/dep/cppunit/include/cppunit/SourceLine.h
@@ -0,0 +1,63 @@
+#ifndef CPPUNIT_SOURCELINE_H
+#define CPPUNIT_SOURCELINE_H
+
+#include <cppunit/Portability.h>
+#include <string>
+
+/*! \brief Constructs a SourceLine object initialized with the location where the macro is expanded.
+ * \ingroup CreatingNewAssertions
+ * \relates CppUnit::SourceLine
+ * Used to write your own assertion macros.
+ * \see Asserter for example of usage.
+ */
+#define CPPUNIT_SOURCELINE() CPPUNIT_NS::SourceLine( __FILE__, __LINE__ )
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Represents a source line location.
+ * \ingroup CreatingNewAssertions
+ * \ingroup BrowsingCollectedTestResult
+ *
+ * Used to capture the failure location in assertion.
+ * 
+ * Use the CPPUNIT_SOURCELINE() macro to construct that object. Typically used when
+ * writing an assertion macro in association with Asserter.
+ *
+ * \see Asserter.
+ */
+class CPPUNIT_API SourceLine
+{
+public:
+  SourceLine();
+
+  // Ensure thread-safe copy by detaching the string buffer.
+  SourceLine( const SourceLine &other );
+
+  SourceLine( const std::string &fileName,
+              int lineNumber );
+
+  SourceLine &operator =( const SourceLine &other );
+
+  /// Destructor.
+  virtual ~SourceLine();
+
+  bool isValid() const;
+
+  int lineNumber() const;
+
+  std::string fileName() const;
+
+  bool operator ==( const SourceLine &other ) const;
+  bool operator !=( const SourceLine &other ) const;
+
+private:
+  std::string m_fileName;
+  int m_lineNumber;
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_SOURCELINE_H
diff --git a/dep/cppunit/include/cppunit/SynchronizedObject.h b/dep/cppunit/include/cppunit/SynchronizedObject.h
new file mode 100644
index 00000000000..0f7d094aa53
--- /dev/null
+++ b/dep/cppunit/include/cppunit/SynchronizedObject.h
@@ -0,0 +1,80 @@
+#ifndef CPPUNIT_SYNCHRONIZEDOBJECT_H
+#define CPPUNIT_SYNCHRONIZEDOBJECT_H
+
+#include <cppunit/Portability.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Base class for synchronized object.
+ *
+ * Synchronized object are object which members are used concurrently by mutiple
+ * threads.
+ *
+ * This class define the class SynchronizationObject which must be subclassed
+ * to implement an actual lock.
+ *
+ * Each instance of this class holds a pointer on a lock object.
+ *
+ * See src/msvc6/MfcSynchronizedObject.h for an example.
+ */
+class CPPUNIT_API SynchronizedObject
+{
+public:
+  /*! \brief Abstract synchronization object (mutex)
+   */
+  class SynchronizationObject
+  {
+    public:
+      SynchronizationObject() {}
+      virtual ~SynchronizationObject() {}
+
+      virtual void lock() {}
+      virtual void unlock() {}
+  };
+
+  /*! Constructs a SynchronizedObject object.
+   */
+  SynchronizedObject( SynchronizationObject *syncObject =0 );
+
+  /// Destructor.
+  virtual ~SynchronizedObject();
+
+protected:
+  /*! \brief Locks a synchronization object in the current scope.
+   */
+  class ExclusiveZone
+  {
+    SynchronizationObject *m_syncObject;
+
+  public:
+    ExclusiveZone( SynchronizationObject *syncObject ) 
+        : m_syncObject( syncObject ) 
+    { 
+      m_syncObject->lock(); 
+    }
+
+    ~ExclusiveZone() 
+    { 
+      m_syncObject->unlock (); 
+    }
+  };
+
+  virtual void setSynchronizationObject( SynchronizationObject *syncObject );
+
+protected:
+  SynchronizationObject *m_syncObject;
+
+private:
+  /// Prevents the use of the copy constructor.
+  SynchronizedObject( const SynchronizedObject &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const SynchronizedObject &copy );
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_SYNCHRONIZEDOBJECT_H
diff --git a/dep/cppunit/include/cppunit/Test.h b/dep/cppunit/include/cppunit/Test.h
new file mode 100644
index 00000000000..a56be0fbeac
--- /dev/null
+++ b/dep/cppunit/include/cppunit/Test.h
@@ -0,0 +1,117 @@
+#ifndef CPPUNIT_TEST_H
+#define CPPUNIT_TEST_H
+
+#include <cppunit/Portability.h>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+
+class TestResult;
+class TestPath;
+
+/*! \brief Base class for all test objects.
+ * \ingroup BrowsingCollectedTestResult
+ *
+ * All test objects should be a subclass of Test.  Some test objects,
+ * TestCase for example, represent one individual test.  Other test
+ * objects, such as TestSuite, are comprised of several tests.  
+ *
+ * When a Test is run, the result is collected by a TestResult object.
+ *
+ * \see TestCase
+ * \see TestSuite
+ */
+class CPPUNIT_API Test
+{
+public:
+  virtual ~Test() {};
+
+  /*! \brief Run the test, collecting results.
+   */
+  virtual void run( TestResult *result ) =0;
+
+  /*! \brief Return the number of test cases invoked by run().
+   *
+   * The base unit of testing is the class TestCase.  This
+   * method returns the number of TestCase objects invoked by
+   * the run() method.
+   */
+  virtual int countTestCases () const =0;
+
+  /*! \brief Returns the number of direct child of the test.
+   */
+  virtual int getChildTestCount() const =0;
+
+  /*! \brief Returns the child test of the specified index.
+   *
+   * This method test if the index is valid, then call doGetChildTestAt() if 
+   * the index is valid. Otherwise std::out_of_range exception is thrown.
+   *
+   * You should override doGetChildTestAt() method.
+   * 
+   * \param index Zero based index of the child test to return.
+   * \return Pointer on the test. Never \c NULL.
+   * \exception std::out_of_range is \a index is < 0 or >= getChildTestCount().
+   */
+  virtual Test *getChildTestAt( int index ) const;
+
+  /*! \brief Returns the test name.
+   * 
+   * Each test has a name.  This name may be used to find the
+   * test in a suite or registry of tests.
+   */
+  virtual std::string getName () const =0;
+
+  /*! \brief Finds the test with the specified name and its parents test.
+   * \param testName Name of the test to find.
+   * \param testPath If the test is found, then all the tests traversed to access
+   *                 \a test are added to \a testPath, including \c this and \a test.
+   * \return \c true if a test with the specified name is found, \c false otherwise.
+   */
+  virtual bool findTestPath( const std::string &testName,
+                             TestPath &testPath ) const;
+
+  /*! \brief Finds the specified test and its parents test.
+   * \param test Test to find.
+   * \param testPath If the test is found, then all the tests traversed to access
+   *                 \a test are added to \a testPath, including \c this and \a test.
+   * \return \c true if the specified test is found, \c false otherwise.
+   */
+  virtual bool findTestPath( const Test *test,
+                             TestPath &testPath ) const;
+
+  /*! \brief Finds the test with the specified name in the hierarchy.
+   * \param testName Name of the test to find.
+   * \return Pointer on the first test found that is named \a testName. Never \c NULL.
+   * \exception std::invalid_argument if no test named \a testName is found.
+   */
+  virtual Test *findTest( const std::string &testName ) const;
+
+  /*! \brief Resolved the specified test path with this test acting as 'root'.
+   * \param testPath Test path string to resolve.
+   * \return Resolved TestPath. 
+   * \exception std::invalid_argument if \a testPath could not be resolved.
+   * \see TestPath.
+   */
+  virtual TestPath resolveTestPath( const std::string &testPath ) const;
+
+protected:
+  /*! Throws an exception if the specified index is invalid.
+   * \param index Zero base index of a child test.
+   * \exception std::out_of_range is \a index is < 0 or >= getChildTestCount().
+   */
+  virtual void checkIsValidIndex( int index ) const;
+
+  /*! \brief Returns the child test of the specified valid index.
+   * \param index Zero based valid index of the child test to return.
+   * \return Pointer on the test. Never \c NULL.
+   */
+  virtual Test *doGetChildTestAt( int index ) const =0;
+};
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_TEST_H
+
diff --git a/dep/cppunit/include/cppunit/TestAssert.h b/dep/cppunit/include/cppunit/TestAssert.h
new file mode 100644
index 00000000000..f74797b9dac
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestAssert.h
@@ -0,0 +1,428 @@
+#ifndef CPPUNIT_TESTASSERT_H
+#define CPPUNIT_TESTASSERT_H
+
+#include <cppunit/Portability.h>
+#include <cppunit/Exception.h>
+#include <cppunit/Asserter.h>
+#include <cppunit/portability/Stream.h>
+#include <stdio.h>
+#include <float.h> // For struct assertion_traits<double>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Traits used by CPPUNIT_ASSERT_EQUAL().
+ *
+ * Here is an example of specialising these traits: 
+ *
+ * \code
+ * template<>
+ * struct assertion_traits<std::string>   // specialization for the std::string type
+ * {
+ *   static bool equal( const std::string& x, const std::string& y )
+ *   {
+ *     return x == y;
+ *   }
+ * 
+ *   static std::string toString( const std::string& x )
+ *   {
+ *     std::string text = '"' + x + '"';    // adds quote around the string to see whitespace
+ *     OStringStream ost;
+ *     ost << text;
+ *     return ost.str();
+ *   }
+ * };
+ * \endcode
+ */
+template <class T>
+struct assertion_traits 
+{  
+    static bool equal( const T& x, const T& y )
+    {
+        return x == y;
+    }
+
+    static std::string toString( const T& x )
+    {
+        OStringStream ost;
+        ost << x;
+        return ost.str();
+    }
+};
+
+
+/*! \brief Traits used by CPPUNIT_ASSERT_DOUBLES_EQUAL(). 
+ * 
+ * This specialisation from @c struct @c assertion_traits<> ensures that 
+ * doubles are converted in full, instead of being rounded to the default 
+ * 6 digits of precision. Use the system defined ISO C99 macro DBL_DIG 
+ * within float.h is available to define the maximum precision, otherwise
+ * use the hard-coded maximum precision of 15.
+ */
+template <>
+struct assertion_traits<double>
+{  
+    static bool equal( double x, double y )
+    {
+        return x == y;
+    }
+
+    static std::string toString( double x )
+    {
+#ifdef DBL_DIG
+       const int precision = DBL_DIG;
+#else
+       const int precision = 15;
+#endif  // #ifdef DBL_DIG
+       char buffer[128];
+#ifdef __STDC_SECURE_LIB__ // Use secure version with visual studio 2005 to avoid warning.
+       sprintf_s(buffer, sizeof(buffer), "%.*g", precision, x); 
+#else	
+       sprintf(buffer, "%.*g", precision, x); 
+#endif
+       return buffer;
+    }
+};
+
+
+/*! \brief (Implementation) Asserts that two objects of the same type are equals.
+ * Use CPPUNIT_ASSERT_EQUAL instead of this function.
+ * \sa assertion_traits, Asserter::failNotEqual().
+ */
+template <class T>
+void assertEquals( const T& expected,
+                   const T& actual,
+                   SourceLine sourceLine,
+                   const std::string &message )
+{
+  if ( !assertion_traits<T>::equal(expected,actual) ) // lazy toString conversion...
+  {
+    Asserter::failNotEqual( assertion_traits<T>::toString(expected),
+                            assertion_traits<T>::toString(actual),
+                            sourceLine,
+                            message );
+  }
+}
+
+
+/*! \brief (Implementation) Asserts that two double are equals given a tolerance.
+ * Use CPPUNIT_ASSERT_DOUBLES_EQUAL instead of this function.
+ * \sa Asserter::failNotEqual().
+ * \sa CPPUNIT_ASSERT_DOUBLES_EQUAL for detailed semantic of the assertion.
+ */
+void CPPUNIT_API assertDoubleEquals( double expected,
+                                     double actual,
+                                     double delta,
+                                     SourceLine sourceLine, 
+                                     const std::string &message );
+
+
+/* A set of macros which allow us to get the line number
+ * and file name at the point of an error.
+ * Just goes to show that preprocessors do have some
+ * redeeming qualities.
+ */
+#if CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION
+/** Assertions that a condition is \c true.
+ * \ingroup Assertions
+ */
+#define CPPUNIT_ASSERT(condition)                                                 \
+  ( CPPUNIT_NS::Asserter::failIf( !(condition),                                   \
+                                 CPPUNIT_NS::Message( "assertion failed",         \
+                                                      "Expression: " #condition), \
+                                 CPPUNIT_SOURCELINE() ) )
+#else
+#define CPPUNIT_ASSERT(condition)                                            \
+  ( CPPUNIT_NS::Asserter::failIf( !(condition),                              \
+                                  CPPUNIT_NS::Message( "assertion failed" ), \
+                                  CPPUNIT_SOURCELINE() ) )
+#endif
+
+/** Assertion with a user specified message.
+ * \ingroup Assertions
+ * \param message Message reported in diagnostic if \a condition evaluates
+ *                to \c false.
+ * \param condition If this condition evaluates to \c false then the
+ *                  test failed.
+ */
+#define CPPUNIT_ASSERT_MESSAGE(message,condition)                          \
+  ( CPPUNIT_NS::Asserter::failIf( !(condition),                            \
+                                  CPPUNIT_NS::Message( "assertion failed", \
+                                                       "Expression: "      \
+                                                       #condition,         \
+                                                       message ),          \
+                                  CPPUNIT_SOURCELINE() ) )
+
+/** Fails with the specified message.
+ * \ingroup Assertions
+ * \param message Message reported in diagnostic.
+ */
+#define CPPUNIT_FAIL( message )                                         \
+  ( CPPUNIT_NS::Asserter::fail( CPPUNIT_NS::Message( "forced failure",  \
+                                                     message ),         \
+                                CPPUNIT_SOURCELINE() ) )
+
+#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED
+/// Generalized macro for primitive value comparisons
+#define CPPUNIT_ASSERT_EQUAL(expected,actual)                     \
+  ( CPPUNIT_NS::assertEquals( (expected),             \
+                              (actual),               \
+                              __LINE__, __FILE__ ) )
+#else
+/** Asserts that two values are equals.
+ * \ingroup Assertions
+ *
+ * Equality and string representation can be defined with
+ * an appropriate CppUnit::assertion_traits class.
+ *
+ * A diagnostic is printed if actual and expected values disagree.
+ *
+ * Requirement for \a expected and \a actual parameters:
+ * - They are exactly of the same type
+ * - They are serializable into a std::strstream using operator <<.
+ * - They can be compared using operator ==. 
+ *
+ * The last two requirements (serialization and comparison) can be
+ * removed by specializing the CppUnit::assertion_traits.
+ */
+#define CPPUNIT_ASSERT_EQUAL(expected,actual)          \
+  ( CPPUNIT_NS::assertEquals( (expected),              \
+                              (actual),                \
+                              CPPUNIT_SOURCELINE(),    \
+                              "" ) )
+
+/** Asserts that two values are equals, provides additional message on failure.
+ * \ingroup Assertions
+ *
+ * Equality and string representation can be defined with
+ * an appropriate assertion_traits class.
+ *
+ * A diagnostic is printed if actual and expected values disagree.
+ * The message is printed in addition to the expected and actual value
+ * to provide additional information.
+ *
+ * Requirement for \a expected and \a actual parameters:
+ * - They are exactly of the same type
+ * - They are serializable into a std::strstream using operator <<.
+ * - They can be compared using operator ==. 
+ *
+ * The last two requirements (serialization and comparison) can be
+ * removed by specializing the CppUnit::assertion_traits.
+ */
+#define CPPUNIT_ASSERT_EQUAL_MESSAGE(message,expected,actual)      \
+  ( CPPUNIT_NS::assertEquals( (expected),              \
+                              (actual),                \
+                              CPPUNIT_SOURCELINE(),    \
+                              (message) ) )
+#endif
+
+/*! \brief Macro for primitive double value comparisons. 
+ * \ingroup Assertions
+ *
+ * The assertion pass if both expected and actual are finite and
+ * \c fabs( \c expected - \c actual ) <= \c delta.
+ * If either \c expected or actual are infinite (+/- inf), the 
+ * assertion pass if \c expected == \c actual.
+ * If either \c expected or \c actual is a NaN (not a number), then
+ * the assertion fails.
+ */
+#define CPPUNIT_ASSERT_DOUBLES_EQUAL(expected,actual,delta)        \
+  ( CPPUNIT_NS::assertDoubleEquals( (expected),            \
+                                    (actual),              \
+                                    (delta),               \
+                                    CPPUNIT_SOURCELINE(),  \
+                                    "" ) )
+
+
+/*! \brief Macro for primitive double value comparisons, setting a 
+ * user-supplied message in case of failure. 
+ * \ingroup Assertions
+ * \sa CPPUNIT_ASSERT_DOUBLES_EQUAL for detailed semantic of the assertion.
+ */
+#define CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(message,expected,actual,delta)  \
+  ( CPPUNIT_NS::assertDoubleEquals( (expected),            \
+                                    (actual),              \
+                                    (delta),               \
+                                    CPPUNIT_SOURCELINE(),  \
+                                    (message) ) )
+
+
+/** Asserts that the given expression throws an exception of the specified type. 
+ * \ingroup Assertions
+ * Example of usage:
+ * \code
+ *   std::vector<int> v;
+ *  CPPUNIT_ASSERT_THROW( v.at( 50 ), std::out_of_range );
+ * \endcode
+ */
+# define CPPUNIT_ASSERT_THROW( expression, ExceptionType )              \
+   CPPUNIT_ASSERT_THROW_MESSAGE( CPPUNIT_NS::AdditionalMessage(),       \
+                                 expression,                            \
+                                 ExceptionType )
+
+
+// implementation detail
+#if CPPUNIT_USE_TYPEINFO_NAME
+#define CPPUNIT_EXTRACT_EXCEPTION_TYPE_( exception, no_rtti_message ) \
+   CPPUNIT_NS::TypeInfoHelper::getClassName( typeid(exception) )
+#else
+#define CPPUNIT_EXTRACT_EXCEPTION_TYPE_( exception, no_rtti_message ) \
+   std::string( no_rtti_message )
+#endif // CPPUNIT_USE_TYPEINFO_NAME
+
+// implementation detail
+#define CPPUNIT_GET_PARAMETER_STRING( parameter ) #parameter
+
+/** Asserts that the given expression throws an exception of the specified type, 
+ * setting a user supplied message in case of failure. 
+ * \ingroup Assertions
+ * Example of usage:
+ * \code
+ *   std::vector<int> v;
+ *  CPPUNIT_ASSERT_THROW_MESSAGE( "- std::vector<int> v;", v.at( 50 ), std::out_of_range );
+ * \endcode
+ */
+# define CPPUNIT_ASSERT_THROW_MESSAGE( message, expression, ExceptionType )   \
+   do {                                                                       \
+      bool cpputCorrectExceptionThrown_ = false;                              \
+      CPPUNIT_NS::Message cpputMsg_( "expected exception not thrown" );       \
+      cpputMsg_.addDetail( message );                                         \
+      cpputMsg_.addDetail( "Expected: "                                       \
+                           CPPUNIT_GET_PARAMETER_STRING( ExceptionType ) );   \
+                                                                              \
+      try {                                                                   \
+         expression;                                                          \
+      } catch ( const ExceptionType & ) {                                     \
+         cpputCorrectExceptionThrown_ = true;                                 \
+      } catch ( const std::exception &e) {                                    \
+         cpputMsg_.addDetail( "Actual  : " +                                  \
+                              CPPUNIT_EXTRACT_EXCEPTION_TYPE_( e,             \
+                                          "std::exception or derived") );     \
+         cpputMsg_.addDetail( std::string("What()  : ") + e.what() );         \
+      } catch ( ... ) {                                                       \
+         cpputMsg_.addDetail( "Actual  : unknown.");                          \
+      }                                                                       \
+                                                                              \
+      if ( cpputCorrectExceptionThrown_ )                                     \
+         break;                                                               \
+                                                                              \
+      CPPUNIT_NS::Asserter::fail( cpputMsg_,                                  \
+                                  CPPUNIT_SOURCELINE() );                     \
+   } while ( false )
+
+
+/** Asserts that the given expression does not throw any exceptions.
+ * \ingroup Assertions
+ * Example of usage:
+ * \code
+ *   std::vector<int> v;
+ *   v.push_back( 10 );
+ *  CPPUNIT_ASSERT_NO_THROW( v.at( 0 ) );
+ * \endcode
+ */
+# define CPPUNIT_ASSERT_NO_THROW( expression )                             \
+   CPPUNIT_ASSERT_NO_THROW_MESSAGE( CPPUNIT_NS::AdditionalMessage(),       \
+                                    expression )
+
+
+/** Asserts that the given expression does not throw any exceptions, 
+ * setting a user supplied message in case of failure. 
+ * \ingroup Assertions
+ * Example of usage:
+ * \code
+ *   std::vector<int> v;
+ *   v.push_back( 10 );
+ *  CPPUNIT_ASSERT_NO_THROW( "std::vector<int> v;", v.at( 0 ) );
+ * \endcode
+ */
+# define CPPUNIT_ASSERT_NO_THROW_MESSAGE( message, expression )               \
+   do {                                                                       \
+      CPPUNIT_NS::Message cpputMsg_( "unexpected exception caught" );         \
+      cpputMsg_.addDetail( message );                                         \
+                                                                              \
+      try {                                                                   \
+         expression;                                                          \
+      } catch ( const std::exception &e ) {                                   \
+         cpputMsg_.addDetail( "Caught: " +                                    \
+                              CPPUNIT_EXTRACT_EXCEPTION_TYPE_( e,             \
+                                          "std::exception or derived" ) );    \
+         cpputMsg_.addDetail( std::string("What(): ") + e.what() );           \
+         CPPUNIT_NS::Asserter::fail( cpputMsg_,                               \
+                                     CPPUNIT_SOURCELINE() );                  \
+      } catch ( ... ) {                                                       \
+         cpputMsg_.addDetail( "Caught: unknown." );                           \
+         CPPUNIT_NS::Asserter::fail( cpputMsg_,                               \
+                                     CPPUNIT_SOURCELINE() );                  \
+      }                                                                       \
+   } while ( false )
+
+
+/** Asserts that an assertion fail.
+ * \ingroup Assertions
+ * Use to test assertions.
+ * Example of usage:
+ * \code
+ *   CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT( 1 == 2 ) );
+ * \endcode
+ */
+# define CPPUNIT_ASSERT_ASSERTION_FAIL( assertion )                 \
+   CPPUNIT_ASSERT_THROW( assertion, CPPUNIT_NS::Exception )
+
+
+/** Asserts that an assertion fail, with a user-supplied message in 
+ * case of error.
+ * \ingroup Assertions
+ * Use to test assertions.
+ * Example of usage:
+ * \code
+ *   CPPUNIT_ASSERT_ASSERTION_FAIL_MESSAGE( "1 == 2", CPPUNIT_ASSERT( 1 == 2 ) );
+ * \endcode
+ */
+# define CPPUNIT_ASSERT_ASSERTION_FAIL_MESSAGE( message, assertion )    \
+   CPPUNIT_ASSERT_THROW_MESSAGE( message, assertion, CPPUNIT_NS::Exception )
+
+
+/** Asserts that an assertion pass.
+ * \ingroup Assertions
+ * Use to test assertions.
+ * Example of usage:
+ * \code
+ *   CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT( 1 == 1 ) );
+ * \endcode
+ */
+# define CPPUNIT_ASSERT_ASSERTION_PASS( assertion )                 \
+   CPPUNIT_ASSERT_NO_THROW( assertion )
+
+
+/** Asserts that an assertion pass, with a user-supplied message in 
+ * case of failure. 
+ * \ingroup Assertions
+ * Use to test assertions.
+ * Example of usage:
+ * \code
+ *   CPPUNIT_ASSERT_ASSERTION_PASS_MESSAGE( "1 != 1", CPPUNIT_ASSERT( 1 == 1 ) );
+ * \endcode
+ */
+# define CPPUNIT_ASSERT_ASSERTION_PASS_MESSAGE( message, assertion )    \
+   CPPUNIT_ASSERT_NO_THROW_MESSAGE( message, assertion )
+
+
+
+
+// Backwards compatibility
+
+#if CPPUNIT_ENABLE_NAKED_ASSERT
+
+#undef assert
+#define assert(c)                 CPPUNIT_ASSERT(c)
+#define assertEqual(e,a)          CPPUNIT_ASSERT_EQUAL(e,a)
+#define assertDoublesEqual(e,a,d) CPPUNIT_ASSERT_DOUBLES_EQUAL(e,a,d)
+#define assertLongsEqual(e,a)     CPPUNIT_ASSERT_EQUAL(e,a)
+
+#endif
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_TESTASSERT_H
diff --git a/dep/cppunit/include/cppunit/TestCaller.h b/dep/cppunit/include/cppunit/TestCaller.h
new file mode 100644
index 00000000000..dc4d82ed9b2
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestCaller.h
@@ -0,0 +1,204 @@
+#ifndef CPPUNIT_TESTCALLER_H    // -*- C++ -*-
+#define CPPUNIT_TESTCALLER_H
+
+#include <cppunit/Exception.h>
+#include <cppunit/TestCase.h>
+
+
+#if CPPUNIT_USE_TYPEINFO_NAME
+#  include <cppunit/extensions/TypeInfoHelper.h>
+#endif
+
+
+CPPUNIT_NS_BEGIN
+
+#if 0
+/*! \brief Marker class indicating that no exception is expected by TestCaller.
+ * This class is an implementation detail. You should never use this class directly.
+ */
+class CPPUNIT_API NoExceptionExpected
+{
+private:
+  //! Prevent class instantiation.
+  NoExceptionExpected();
+};
+
+
+/*! \brief (Implementation) Traits used by TestCaller to expect an exception.
+ *
+ * This class is an implementation detail. You should never use this class directly.
+ */
+template<class ExceptionType>
+struct ExpectedExceptionTraits
+{
+  static void expectedException()
+  {
+#if CPPUNIT_USE_TYPEINFO_NAME
+    throw Exception( Message(
+                         "expected exception not thrown",
+                         "Expected exception type: " + 
+                           TypeInfoHelper::getClassName( typeid( ExceptionType ) ) ) );
+#else
+    throw Exception( "expected exception not thrown" );
+#endif
+  }
+};
+
+
+/*! \brief (Implementation) Traits specialization used by TestCaller to 
+ * expect no exception.
+ *
+ * This class is an implementation detail. You should never use this class directly.
+ */
+template<>
+struct ExpectedExceptionTraits<NoExceptionExpected>
+{
+  static void expectedException()
+  {
+  }
+};
+
+
+#endif
+
+//*** FIXME: rework this when class Fixture is implemented. ***//
+
+
+/*! \brief Generate a test case from a fixture method.
+ * \ingroup WritingTestFixture
+ *
+ * A test caller provides access to a test case method 
+ * on a test fixture class.  Test callers are useful when 
+ * you want to run an individual test or add it to a 
+ * suite.
+ * Test Callers invoke only one Test (i.e. test method) on one 
+ * Fixture of a TestFixture.
+ * 
+ * Here is an example:
+ * \code
+ * class MathTest : public CppUnit::TestFixture {
+ *         ...
+ *     public:
+ *         void         setUp();
+ *         void         tearDown();
+ *
+ *         void         testAdd();
+ *         void         testSubtract();
+ * };
+ *
+ * CppUnit::Test *MathTest::suite() {
+ *     CppUnit::TestSuite *suite = new CppUnit::TestSuite;
+ *
+ *     suite->addTest( new CppUnit::TestCaller<MathTest>( "testAdd", testAdd ) );
+ *     return suite;
+ * }
+ * \endcode
+ *
+ * You can use a TestCaller to bind any test method on a TestFixture
+ * class, as long as it accepts void and returns void.
+ * 
+ * \see TestCase
+ */
+
+template <class Fixture>
+class TestCaller : public TestCase
+{ 
+  typedef void (Fixture::*TestMethod)();
+    
+public:
+  /*!
+   * Constructor for TestCaller. This constructor builds a new Fixture
+   * instance owned by the TestCaller.
+   * \param name name of this TestCaller
+   * \param test the method this TestCaller calls in runTest()
+   */
+  TestCaller( std::string name, TestMethod test ) :
+	    TestCase( name ), 
+	    m_ownFixture( true ),
+	    m_fixture( new Fixture() ),
+	    m_test( test )
+  {
+  }
+
+  /*!
+   * Constructor for TestCaller. 
+   * This constructor does not create a new Fixture instance but accepts
+   * an existing one as parameter. The TestCaller will not own the
+   * Fixture object.
+   * \param name name of this TestCaller
+   * \param test the method this TestCaller calls in runTest()
+   * \param fixture the Fixture to invoke the test method on.
+   */
+  TestCaller(std::string name, TestMethod test, Fixture& fixture) :
+	    TestCase( name ), 
+	    m_ownFixture( false ),
+	    m_fixture( &fixture ),
+	    m_test( test )
+  {
+  }
+    
+  /*!
+   * Constructor for TestCaller. 
+   * This constructor does not create a new Fixture instance but accepts
+   * an existing one as parameter. The TestCaller will own the
+   * Fixture object and delete it in its destructor.
+   * \param name name of this TestCaller
+   * \param test the method this TestCaller calls in runTest()
+   * \param fixture the Fixture to invoke the test method on.
+   */
+  TestCaller(std::string name, TestMethod test, Fixture* fixture) :
+	    TestCase( name ), 
+	    m_ownFixture( true ),
+	    m_fixture( fixture ),
+	    m_test( test )
+  {
+  }
+    
+  ~TestCaller() 
+  {
+    if (m_ownFixture)
+      delete m_fixture;
+  }
+
+  void runTest()
+  { 
+//	  try {
+	    (m_fixture->*m_test)();
+//	  }
+//	  catch ( ExpectedException & ) {
+//	    return;
+//	  }
+
+//  	ExpectedExceptionTraits<ExpectedException>::expectedException();
+  }  
+
+  void setUp()
+  { 
+  	m_fixture->setUp (); 
+  }
+
+  void tearDown()
+  { 
+	  m_fixture->tearDown (); 
+  }
+
+  std::string toString() const
+  { 
+  	return "TestCaller " + getName(); 
+  }
+
+private: 
+  TestCaller( const TestCaller &other ); 
+  TestCaller &operator =( const TestCaller &other );
+
+private:
+  bool m_ownFixture;
+  Fixture *m_fixture;
+  TestMethod m_test;
+};
+
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_TESTCALLER_H
diff --git a/dep/cppunit/include/cppunit/TestCase.h b/dep/cppunit/include/cppunit/TestCase.h
new file mode 100644
index 00000000000..d4b7a46a8f1
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestCase.h
@@ -0,0 +1,55 @@
+#ifndef CPPUNIT_TESTCASE_H
+#define CPPUNIT_TESTCASE_H
+
+#include <cppunit/Portability.h>
+#include <cppunit/TestLeaf.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <string>
+
+
+CPPUNIT_NS_BEGIN
+
+
+class TestResult;
+
+
+/*! \brief A single test object.
+ *
+ * This class is used to implement a simple test case: define a subclass
+ * that overrides the runTest method.
+ *
+ * You don't usually need to use that class, but TestFixture and TestCaller instead.
+ *
+ * You are expected to subclass TestCase is you need to write a class similiar
+ * to TestCaller.
+ */
+class CPPUNIT_API TestCase : public TestLeaf,
+                             public TestFixture
+{
+public:
+
+    TestCase( const std::string &name );
+
+    TestCase();
+
+    ~TestCase();
+    
+    virtual void run(TestResult *result);
+
+    std::string getName() const;
+
+    //! FIXME: this should probably be pure virtual.
+    virtual void runTest();
+    
+private:
+    TestCase( const TestCase &other ); 
+    TestCase &operator=( const TestCase &other ); 
+    
+private:
+    const std::string m_name;
+};
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_TESTCASE_H 
diff --git a/dep/cppunit/include/cppunit/TestComposite.h b/dep/cppunit/include/cppunit/TestComposite.h
new file mode 100644
index 00000000000..0ded95fcdbc
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestComposite.h
@@ -0,0 +1,45 @@
+#ifndef CPPUNIT_TESTCOMPSITE_H    // -*- C++ -*-
+#define CPPUNIT_TESTCOMPSITE_H
+
+#include <cppunit/Test.h>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief A Composite of Tests.
+ *
+ * Base class for all test composites. Subclass this class if you need to implement
+ * a custom TestSuite.
+ * 
+ * \see Test, TestSuite.
+ */
+class CPPUNIT_API TestComposite : public Test
+{
+public:
+  TestComposite( const std::string &name = "" );
+
+  ~TestComposite();
+
+  void run( TestResult *result );
+
+  int countTestCases() const;
+  
+  std::string getName() const;
+
+private:
+  TestComposite( const TestComposite &other );
+  TestComposite &operator =( const TestComposite &other ); 
+
+  virtual void doStartSuite( TestResult *controller );
+  virtual void doRunChildTests( TestResult *controller );
+  virtual void doEndSuite( TestResult *controller );
+
+private:
+  const std::string m_name;
+};
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_TESTCOMPSITE_H
diff --git a/dep/cppunit/include/cppunit/TestFailure.h b/dep/cppunit/include/cppunit/TestFailure.h
new file mode 100644
index 00000000000..64199790dfe
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestFailure.h
@@ -0,0 +1,58 @@
+#ifndef CPPUNIT_TESTFAILURE_H    // -*- C++ -*-
+#define CPPUNIT_TESTFAILURE_H
+
+#include <cppunit/Portability.h>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+
+class Exception;
+class SourceLine;
+class Test;
+
+
+/*! \brief Record of a failed Test execution.
+ * \ingroup BrowsingCollectedTestResult
+ *
+ * A TestFailure collects a failed test together with
+ * the caught exception.
+ *
+ * TestFailure assumes lifetime control for any exception
+ * passed to it.
+ */
+class CPPUNIT_API TestFailure 
+{
+public:
+  TestFailure( Test *failedTest,
+               Exception *thrownException,
+               bool isError );
+
+  virtual ~TestFailure ();
+
+  virtual Test *failedTest() const;
+
+  virtual Exception *thrownException() const;
+
+  virtual SourceLine sourceLine() const;
+
+  virtual bool isError() const;
+
+  virtual std::string failedTestName() const;
+
+  virtual TestFailure *clone() const;
+
+protected:
+  Test *m_failedTest;
+  Exception *m_thrownException;
+  bool m_isError;
+
+private: 
+  TestFailure( const TestFailure &other ); 
+  TestFailure &operator =( const TestFailure& other ); 
+};
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_TESTFAILURE_H
diff --git a/dep/cppunit/include/cppunit/TestFixture.h b/dep/cppunit/include/cppunit/TestFixture.h
new file mode 100644
index 00000000000..1223adbc93f
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestFixture.h
@@ -0,0 +1,99 @@
+#ifndef CPPUNIT_TESTFIXTURE_H    // -*- C++ -*-
+#define CPPUNIT_TESTFIXTURE_H
+
+#include <cppunit/Portability.h>
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Wraps a test case with setUp and tearDown methods.
+ * \ingroup WritingTestFixture
+ *
+ * A TestFixture is used to provide a common environment for a set
+ * of test cases.
+ *
+ * To define a test fixture, do the following:
+ * - implement a subclass of TestCase 
+ * - the fixture is defined by instance variables 
+ * - initialize the fixture state by overriding setUp
+ *   (i.e. construct the instance variables of the fixture)
+ * - clean-up after a test by overriding tearDown.
+ *
+ * Each test runs in its own fixture so there
+ * can be no side effects among test runs.
+ * Here is an example:
+ * 
+ * \code
+ * class MathTest : public CppUnit::TestFixture {
+ * protected:
+ *   int m_value1, m_value2;
+ *
+ * public:
+ *   MathTest() {}
+ *
+ *   void setUp () {
+ *     m_value1 = 2;
+ *     m_value2 = 3;
+ *   }
+ * }
+ * \endcode
+ *
+ * For each test implement a method which interacts
+ * with the fixture. Verify the expected results with assertions specified
+ * by calling CPPUNIT_ASSERT on the expression you want to test:
+ * 
+ * \code
+ * public: 
+ *   void testAdd () {
+ *     int result = m_value1 + m_value2;
+ *     CPPUNIT_ASSERT( result == 5 );
+ *   }
+ * \endcode
+ * 
+ * Once the methods are defined you can run them. To do this, use
+ * a TestCaller.
+ *
+ * \code
+ * CppUnit::Test *test = new CppUnit::TestCaller<MathTest>( "testAdd", 
+ *                                                          &MathTest::testAdd );
+ * test->run();
+ * \endcode
+ *
+ *
+ * The tests to be run can be collected into a TestSuite. 
+ * 
+ * \code
+ * public: 
+ *   static CppUnit::TestSuite *MathTest::suite () {
+ *      CppUnit::TestSuite *suiteOfTests = new CppUnit::TestSuite;
+ *      suiteOfTests->addTest(new CppUnit::TestCaller<MathTest>(
+ *                              "testAdd", &MathTest::testAdd));
+ *      suiteOfTests->addTest(new CppUnit::TestCaller<MathTest>(
+ *                              "testDivideByZero", &MathTest::testDivideByZero));
+ *      return suiteOfTests;
+ *  }
+ * \endcode
+ * 
+ * A set of macros have been created for convenience. They are located in HelperMacros.h.
+ *
+ * \see TestResult, TestSuite, TestCaller,
+ * \see CPPUNIT_TEST_SUB_SUITE, CPPUNIT_TEST, CPPUNIT_TEST_SUITE_END, 
+ * \see CPPUNIT_TEST_SUITE_REGISTRATION, CPPUNIT_TEST_EXCEPTION, CPPUNIT_TEST_FAIL.
+ */
+class CPPUNIT_API TestFixture
+{
+public:
+  virtual ~TestFixture() {};
+
+  //! \brief Set up context before running a test.
+  virtual void setUp() {};
+
+  //! Clean up after the test run.
+  virtual void tearDown() {};
+};
+
+
+CPPUNIT_NS_END
+
+
+#endif
diff --git a/dep/cppunit/include/cppunit/TestLeaf.h b/dep/cppunit/include/cppunit/TestLeaf.h
new file mode 100644
index 00000000000..c83b0759753
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestLeaf.h
@@ -0,0 +1,44 @@
+#ifndef CPPUNIT_TESTLEAF_H
+#define CPPUNIT_TESTLEAF_H
+
+#include <cppunit/Test.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief A single test object.
+ *
+ * Base class for single test case: a test that doesn't have any children.
+ *
+ */
+class CPPUNIT_API TestLeaf: public Test
+{
+public:
+  /*! Returns 1 as the default number of test cases invoked by run().
+   * 
+   * You may override this method when many test cases are invoked (RepeatedTest
+   * for example).
+   * 
+   * \return 1.
+   * \see Test::countTestCases().
+   */
+  int countTestCases() const;
+
+  /*! Returns the number of child of this test case: 0.
+   *
+   * You should never override this method: a TestLeaf as no children by definition.
+   *
+   * \return 0.
+   */
+  int getChildTestCount() const;
+
+  /*! Always throws std::out_of_range.
+   * \see Test::doGetChildTestAt().
+   */
+  Test *doGetChildTestAt( int index ) const;
+};
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_TESTLEAF_H
diff --git a/dep/cppunit/include/cppunit/TestListener.h b/dep/cppunit/include/cppunit/TestListener.h
new file mode 100644
index 00000000000..330262d331b
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestListener.h
@@ -0,0 +1,148 @@
+#ifndef CPPUNIT_TESTLISTENER_H    // -*- C++ -*-
+#define CPPUNIT_TESTLISTENER_H
+
+#include <cppunit/Portability.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+class Exception;
+class Test;
+class TestFailure;
+class TestResult;
+
+
+/*! \brief Listener for test progress and result.
+ * \ingroup TrackingTestExecution
+ *
+ * Implementing the Observer pattern a TestListener may be registered
+ * to a TestResult to obtain information on the testing progress. Use
+ * specialized sub classes of TestListener for text output
+ * (TextTestProgressListener). Do not use the Listener for the test
+ * result output, use a subclass of Outputter instead.
+ *
+ * The test framework distinguishes between failures and errors.
+ * A failure is anticipated and checked for with assertions. Errors are
+ * unanticipated problems signified by exceptions that are not generated
+ * by the framework.
+ *
+ * Here is an example to track test time:
+ *
+ *
+ * \code
+ * #include <cppunit/TestListener.h>
+ * #include <cppunit/Test.h>
+ * #include <time.h>    // for clock()
+ *
+ * class TimingListener : public CppUnit::TestListener
+ * {
+ * public:
+ *   void startTest( CppUnit::Test *test )
+ *   {
+ *     _chronometer.start();
+ *   }
+ *  
+ *   void endTest( CppUnit::Test *test )
+ *   {
+ *     _chronometer.end();
+ *     addTest( test, _chronometer.elapsedTime() );
+ *   }
+ *
+ *   // ... (interface to add/read test timing result)
+ *
+ * private:
+ *   Clock _chronometer;
+ * };
+ * \endcode
+ *   
+ * And another example that track failure/success at test suite level and captures
+ * the TestPath of each suite:
+ * \code
+ * class SuiteTracker : public CppUnit::TestListener
+ * {
+ * public:
+ *   void startSuite( CppUnit::Test *suite )
+ *   {
+ *     m_currentPath.add( suite );
+ *   }
+ *   
+ *   void addFailure( const TestFailure &failure )
+ *   {
+ *     m_suiteFailure.top() = false;
+ *   }
+ * 
+ *   void endSuite( CppUnit::Test *suite )
+ *   {
+ *     m_suiteStatus.insert( std::make_pair( suite, m_suiteFailure.top() ) );
+ *     m_suitePaths.insert( std::make_pair( suite, m_currentPath ) );
+ *
+ *     m_currentPath.up();
+ *     m_suiteFailure.pop();
+ *   }
+ *
+ * private:
+ *   std::stack<bool> m_suiteFailure;
+ *   CppUnit::TestPath m_currentPath;
+ *   std::map<CppUnit::Test *, bool> m_suiteStatus;
+ *   std::map<CppUnit::Test *, CppUnit::TestPath> m_suitePaths;
+ * };
+ * \endcode
+ *
+ * \see TestResult
+ */
+class CPPUNIT_API TestListener
+{
+public:
+  virtual ~TestListener() {}
+  
+  /// Called when just before a TestCase is run.
+  virtual void startTest( Test * /*test*/ ) {}
+
+  /*! \brief Called when a failure occurs while running a test.
+   * \see TestFailure.
+   * \warning \a failure is a temporary object that is destroyed after the 
+   *          method call. Use TestFailure::clone() to create a duplicate.
+   */
+  virtual void addFailure( const TestFailure & /*failure*/ ) {}
+
+  /// Called just after a TestCase was run (even if a failure occured).
+  virtual void endTest( Test * /*test*/ ) {}
+
+  /*! \brief Called by a TestComposite just before running its child tests.
+   */
+  virtual void startSuite( Test * /*suite*/ ) {}
+
+  /*! \brief Called by a TestComposite after running its child tests.
+   */
+  virtual void endSuite( Test * /*suite*/ ) {}
+
+  /*! \brief Called by a TestRunner before running the test.
+   * 
+   * You can use this to do some global initialisation. A listener
+   * could also use to output a 'prolog' to the test run.
+   *
+   * \param test Test that is going to be run.
+   * \param eventManager Event manager used for the test run.
+   */
+  virtual void startTestRun( Test * /*test*/, 
+                             TestResult * /*eventManager*/ ) {}
+
+  /*! \brief Called by a TestRunner after running the test.
+   *
+   * TextTestProgressListener use this to emit a line break. You can also use this
+   * to do some global uninitialisation.
+   *
+   * \param test Test that was run.
+   * \param eventManager Event manager used for the test run.
+   */
+  virtual void endTestRun( Test * /*test*/, 
+                           TestResult * /*eventManager*/ ) {}
+};
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_TESTLISTENER_H
+
+
diff --git a/dep/cppunit/include/cppunit/TestPath.h b/dep/cppunit/include/cppunit/TestPath.h
new file mode 100644
index 00000000000..c3c851cc5bd
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestPath.h
@@ -0,0 +1,211 @@
+#ifndef CPPUNIT_TESTPATH_H
+#define CPPUNIT_TESTPATH_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+#include <cppunit/portability/CppUnitDeque.h>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+
+class Test;
+
+#if CPPUNIT_NEED_DLL_DECL
+//  template class CPPUNIT_API std::deque<Test *>;
+#endif
+
+
+/*! \brief A List of Test representing a path to access a Test.
+ * \ingroup ExecutingTest
+ *
+ * The path can be converted to a string and resolved from a string with toString()
+ * and TestPath( Test *root, const std::string &pathAsString ).
+ *
+ * Pointed tests are not owned by the class.
+ *
+ * \see Test::resolvedTestPath()
+ */
+class CPPUNIT_API TestPath
+{
+public:
+  /*! \brief Constructs an invalid path.
+   * 
+   * The path is invalid until a test is added with add().
+   */
+  TestPath();
+
+  /*! \brief Constructs a valid path.
+   *
+   * \param root Test to add.
+   */
+  TestPath( Test *root );
+
+  /*! \brief Constructs a path using a slice of another path.
+   * \param otherPath Path the test are copied from.
+   * \param indexFirst Zero based index of the first test to copy. Adjusted to be in valid
+   *                   range. \a count is adjusted with \a indexFirst.
+   * \param count Number of tests to copy. If < 0 then all test starting from index
+   *              \a indexFirst are copied.
+   */
+  TestPath( const TestPath &otherPath, 
+            int indexFirst, 
+            int count = -1 );
+
+  /*! \brief Resolves a path from a string returned by toString().
+   *
+   * If \a pathAsString is an absolute path (begins with '/'), then the first test name
+   * of the path must be the name of \a searchRoot. Otherwise, \a pathAsString is a 
+   * relative path, and the first test found using Test::findTest() matching the first
+   * test name is used as root. An empty string resolve to a path containing 
+   * \a searchRoot.
+   *
+   * The resolved path is always valid.
+   *
+   * \param searchRoot Test used to resolve the path.
+   * \param pathAsString String that contains the path as a string created by toString().
+   * \exception std::invalid_argument if one of the test names can not be resolved.
+   * \see toString().
+   */
+  TestPath( Test *searchRoot, 
+            const std::string &pathAsString );
+
+  /*! \brief Copy constructor.
+   * \param other Object to copy.
+   */
+  TestPath( const TestPath &other );
+
+  virtual ~TestPath();
+
+  /*! \brief Tests if the path contains at least one test.
+   * \return \c true if the path contains at least one test, otherwise returns \c false.
+   */
+  virtual bool isValid() const;
+
+  /*! \brief Adds a test to the path.
+   * \param test Pointer on the test to add. Must not be \c NULL.
+   */
+  virtual void add( Test *test );
+
+  /*! \brief Adds all the tests of the specified path.
+   * \param path Path that contains the test to add.
+   */
+  virtual void add( const TestPath &path );
+
+  /*! \brief Inserts a test at the specified index.
+   * \param test Pointer on the test to insert. Must not be \c NULL.
+   * \param index Zero based index indicating where the test is inserted.
+   * \exception std::out_of_range is \a index < 0 or \a index > getTestCount().
+   */
+  virtual void insert( Test *test, int index );
+
+  /*! \brief Inserts all the tests at the specified path at a given index.
+   * \param path Path that contains the test to insert.
+   * \param index Zero based index indicating where the tests are inserted.
+   * \exception std::out_of_range is \a index < 0 or \a index > getTestCount(), and
+   *            \a path is valid.
+   */
+  virtual void insert( const TestPath &path, int index );
+
+  /*! \brief Removes all the test from the path.
+   *
+   * The path becomes invalid after this call.
+   */
+  virtual void removeTests();
+
+  /*! \brief Removes the test at the specified index of the path.
+   * \param index Zero based index of the test to remove.
+   * \exception std::out_of_range is \a index < 0 or \a index >= getTestCount().
+   */
+  virtual void removeTest( int index );
+
+  /*! \brief Removes the last test.
+   * \exception std::out_of_range is the path is invalid.
+   * \see isValid().
+   */
+  virtual void up();
+
+  /*! \brief Returns the number of tests in the path.
+   * \return Number of tests in the path.
+   */
+  virtual int getTestCount() const;
+
+  /*! \brief Returns the test of the specified index.
+   * \param index Zero based index of the test to return.
+   * \return Pointer on the test at index \a index. Never \c NULL.
+   * \exception std::out_of_range is \a index < 0 or \a index >= getTestCount().
+   */
+  virtual Test *getTestAt( int index ) const;
+
+  /*! \brief Get the last test of the path.
+   * \return Pointer on the last test (test at the bottom of the hierarchy). Never \c NULL.
+   * \exception std::out_of_range if the path is not valid ( isValid() returns \c false ).
+   */
+  virtual Test *getChildTest() const;
+
+  /*! \brief Returns the path as a string.
+   *
+   * For example, if a path is composed of three tests named "All Tests", "Math" and
+   * "Math::testAdd", toString() will return:
+   *
+   * "All Tests/Math/Math::testAdd".
+   * 
+   * \return A string composed of the test names separated with a '/'. It is a relative
+   *         path.
+   */
+  virtual std::string toString() const;
+
+  /*! \brief Assignment operator.
+   * \param other Object to copy.
+   * \return This object.
+   */
+  TestPath &operator =( const TestPath &other );
+
+protected:
+  /*! \brief Checks that the specified test index is within valid range.
+   * \param index Zero based index to check.
+   * \exception std::out_of_range is \a index < 0 or \a index >= getTestCount().
+   */
+  void checkIndexValid( int index ) const;
+
+  /// A list of test names.
+  typedef CppUnitDeque<std::string> PathTestNames;
+
+  /*! \brief Splits a path string into its test name components.
+   * \param pathAsString Path string created with toString().
+   * \param testNames Test name components are added to that container.
+   * \return \c true if the path is relative (does not begin with '/'), \c false
+   *         if it is absolute (begin with '/').
+   */
+  bool splitPathString( const std::string &pathAsString,
+                        PathTestNames &testNames );
+
+  /*! \brief Finds the actual root of a path string and get the path string name components.
+   * \param searchRoot Test used as root if the path string is absolute, or to search
+   *                   the root test if the path string is relative.
+   * \param pathAsString Path string. May be absolute or relative.
+   * \param testNames Test name components are added to that container.
+   * \return Pointer on the resolved root test. Never \c NULL.
+   * \exception std::invalid_argument if either the root name can not be resolved or if
+   *            pathAsString contains no name components.
+   */
+  Test *findActualRoot( Test *searchRoot,
+                        const std::string &pathAsString,
+                        PathTestNames &testNames );
+
+protected:
+  typedef CppUnitDeque<Test *> Tests;
+  Tests m_tests;
+
+};
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_TESTPATH_H
+
diff --git a/dep/cppunit/include/cppunit/TestResult.h b/dep/cppunit/include/cppunit/TestResult.h
new file mode 100644
index 00000000000..e7e1050a087
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestResult.h
@@ -0,0 +1,156 @@
+#ifndef CPPUNIT_TESTRESULT_H
+#define CPPUNIT_TESTRESULT_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+#include <cppunit/SynchronizedObject.h>
+#include <cppunit/portability/CppUnitDeque.h>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+
+class Exception;
+class Functor;
+class Protector;
+class ProtectorChain;
+class Test;
+class TestFailure;
+class TestListener;
+
+
+#if CPPUNIT_NEED_DLL_DECL
+//  template class CPPUNIT_API std::deque<TestListener *>;
+#endif
+
+/*! \brief Manages TestListener.
+ * \ingroup TrackingTestExecution
+ *
+ * A single instance of this class is used when running the test. It is usually
+ * created by the test runner (TestRunner).
+ *
+ * This class shouldn't have to be inherited from. Use a TestListener
+ * or one of its subclasses to be informed of the ongoing tests.
+ * Use a Outputter to receive a test summary once it has finished
+ *
+ * TestResult supplies a template method 'setSynchronizationObject()'
+ * so that subclasses can provide mutual exclusion in the face of multiple
+ * threads.  This can be useful when tests execute in one thread and
+ * they fill a subclass of TestResult which effects change in another 
+ * thread.  To have mutual exclusion, override setSynchronizationObject()
+ * and make sure that you create an instance of ExclusiveZone at the 
+ * beginning of each method.
+ *
+ * \see Test, TestListener, TestResultCollector, Outputter.
+ */
+class CPPUNIT_API TestResult : protected SynchronizedObject
+{
+public:
+  /// Construct a TestResult
+  TestResult( SynchronizationObject *syncObject = 0 );
+
+  /// Destroys a test result
+  virtual ~TestResult();
+
+  virtual void addListener( TestListener *listener );
+
+  virtual void removeListener( TestListener *listener );
+
+  /// Resets the stop flag.
+  virtual void reset();
+  
+  /// Stop testing
+  virtual void stop();
+
+  /// Returns whether testing should be stopped
+  virtual bool shouldStop() const;
+
+  /// Informs TestListener that a test will be started.
+  virtual void startTest( Test *test );
+
+  /*! \brief Adds an error to the list of errors. 
+   *  The passed in exception
+   *  caused the error
+   */
+  virtual void addError( Test *test, Exception *e );
+
+  /*! \brief Adds a failure to the list of failures. The passed in exception
+   * caused the failure.
+   */
+  virtual void addFailure( Test *test, Exception *e );
+
+  /// Informs TestListener that a test was completed.
+  virtual void endTest( Test *test );
+
+  /// Informs TestListener that a test suite will be started.
+  virtual void startSuite( Test *test );
+
+  /// Informs TestListener that a test suite was completed.
+  virtual void endSuite( Test *test );
+
+  /*! \brief Run the specified test.
+   * 
+   * Calls startTestRun(), test->run(this), and finally endTestRun().
+   */
+  virtual void runTest( Test *test );
+
+  /*! \brief Protects a call to the specified functor.
+   *
+   * See Protector to understand how protector works. A default protector is
+   * always present. It captures CppUnit::Exception, std::exception and
+   * any other exceptions, retrieving as much as possible information about
+   * the exception as possible.
+   *
+   * Additional Protector can be added to the chain to support other exception
+   * types using pushProtector() and popProtector().
+   *
+   * \param functor Functor to call (typically a call to setUp(), runTest() or
+   *                tearDown().
+   * \param test Test the functor is associated to (used for failure reporting).
+   * \param shortDescription Short description override for the failure message.
+   */
+  virtual bool protect( const Functor &functor,
+                        Test *test,
+                        const std::string &shortDescription = std::string("") );
+
+  /// Adds the specified protector to the protector chain.
+  virtual void pushProtector( Protector *protector );
+
+  /// Removes the last protector from the protector chain.
+  virtual void popProtector();
+
+protected:
+  /*! \brief Called to add a failure to the list of failures.
+   */
+  void addFailure( const TestFailure &failure );
+
+  virtual void startTestRun( Test *test );
+  virtual void endTestRun( Test *test );
+  
+protected:
+  typedef CppUnitDeque<TestListener *> TestListeners;
+  TestListeners m_listeners;
+  ProtectorChain *m_protectorChain;
+  bool m_stop;
+
+private: 
+  TestResult( const TestResult &other );
+  TestResult &operator =( const TestResult &other );
+};
+
+
+CPPUNIT_NS_END
+
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+#endif // CPPUNIT_TESTRESULT_H
+
+
diff --git a/dep/cppunit/include/cppunit/TestResultCollector.h b/dep/cppunit/include/cppunit/TestResultCollector.h
new file mode 100644
index 00000000000..01b0a547abd
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestResultCollector.h
@@ -0,0 +1,87 @@
+#ifndef CPPUNIT_TESTRESULTCOLLECTOR_H
+#define CPPUNIT_TESTRESULTCOLLECTOR_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 4660 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+#include <cppunit/TestSuccessListener.h>
+#include <cppunit/portability/CppUnitDeque.h>
+
+
+CPPUNIT_NS_BEGIN
+
+#if CPPUNIT_NEED_DLL_DECL
+//  template class CPPUNIT_API std::deque<TestFailure *>;
+//  template class CPPUNIT_API std::deque<Test *>;
+#endif
+
+
+/*! \brief Collects test result.
+ * \ingroup WritingTestResult
+ * \ingroup BrowsingCollectedTestResult
+ * 
+ * A TestResultCollector is a TestListener which collects the results of executing 
+ * a test case. It is an instance of the Collecting Parameter pattern.
+ *
+ * The test framework distinguishes between failures and errors.
+ * A failure is anticipated and checked for with assertions. Errors are
+ * unanticipated problems signified by exceptions that are not generated
+ * by the framework.
+ * \see TestListener, TestFailure.
+ */
+class CPPUNIT_API TestResultCollector : public TestSuccessListener
+{
+public:
+  typedef CppUnitDeque<TestFailure *> TestFailures;
+  typedef CppUnitDeque<Test *> Tests;
+
+
+  /*! Constructs a TestResultCollector object.
+   */
+  TestResultCollector( SynchronizationObject *syncObject = 0 );
+
+  /// Destructor.
+  virtual ~TestResultCollector();
+
+  void startTest( Test *test );
+  void addFailure( const TestFailure &failure );
+
+  virtual void reset();
+
+  virtual int runTests() const;
+  virtual int testErrors() const;
+  virtual int testFailures() const;
+  virtual int testFailuresTotal() const;
+
+  virtual const TestFailures& failures() const;
+  virtual const Tests &tests() const;
+
+protected:
+  void freeFailures();
+
+  Tests m_tests;
+  TestFailures m_failures;
+  int m_testErrors;
+
+private:
+  /// Prevents the use of the copy constructor.
+  TestResultCollector( const TestResultCollector &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const TestResultCollector &copy );
+};
+
+
+
+CPPUNIT_NS_END
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+
+#endif  // CPPUNIT_TESTRESULTCOLLECTOR_H
diff --git a/dep/cppunit/include/cppunit/TestRunner.h b/dep/cppunit/include/cppunit/TestRunner.h
new file mode 100644
index 00000000000..930370ad970
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestRunner.h
@@ -0,0 +1,135 @@
+#ifndef CPPUNIT_TESTRUNNER_H
+#define CPPUNIT_TESTRUNNER_H
+
+#include <cppunit/TestSuite.h>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+
+class Test;
+class TestResult;
+
+
+/*! \brief Generic test runner.
+ * \ingroup ExecutingTest
+ *
+ * The TestRunner assumes ownership of all added tests: you can not add test
+ * or suite that are local variable since they can't be deleted.
+ *
+ * Example of usage:
+ * \code
+ * #include <cppunit/extensions/TestFactoryRegistry.h>
+ * #include <cppunit/CompilerOutputter.h>
+ * #include <cppunit/TestResult.h>
+ * #include <cppunit/TestResultCollector.h>
+ * #include <cppunit/TestRunner.h>
+ * #include <cppunit/TextTestProgressListener.h>
+ * 
+ * 
+ * int 
+ * main( int argc, char* argv[] )
+ * {
+ *   std::string testPath = (argc > 1) ? std::string(argv[1]) : "";
+ * 
+ *   // Create the event manager and test controller
+ *   CppUnit::TestResult controller;
+ * 
+ *   // Add a listener that colllects test result
+ *   CppUnit::TestResultCollector result;
+ *   controller.addListener( &result );        
+ * 
+ *   // Add a listener that print dots as test run.
+ *   CppUnit::TextTestProgressListener progress;
+ *   controller.addListener( &progress );      
+ * 
+ *   // Add the top suite to the test runner
+ *   CppUnit::TestRunner runner;
+ *   runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );   
+ *   try
+ *   {
+ *     std::cout << "Running "  <<  testPath;
+ *     runner.run( controller, testPath );
+ * 
+ *     std::cerr << std::endl;
+ * 
+ *     // Print test in a compiler compatible format.
+ *     CppUnit::CompilerOutputter outputter( &result, std::cerr );
+ *     outputter.write();                      
+ *   }
+ *   catch ( std::invalid_argument &e )  // Test path not resolved
+ *   {
+ *     std::cerr  <<  std::endl  
+ *                <<  "ERROR: "  <<  e.what()
+ *                << std::endl;
+ *     return 0;
+ *   }
+ * 
+ *   return result.wasSuccessful() ? 0 : 1;
+ * }
+ * \endcode
+ */
+class CPPUNIT_API TestRunner
+{
+public:
+  /*! \brief Constructs a TestRunner object.
+   */
+  TestRunner(  );
+
+  /// Destructor.
+  virtual ~TestRunner();
+
+  /*! \brief Adds the specified test.
+   * \param test Test to add. The TestRunner takes ownership of the test.
+   */
+  virtual void addTest( Test *test );
+
+  /*! \brief Runs a test using the specified controller.
+   * \param controller Event manager and controller used for testing
+   * \param testPath Test path string. See Test::resolveTestPath() for detail.
+   * \exception std::invalid_argument if no test matching \a testPath is found.
+   *                                  see TestPath::TestPath( Test*, const std::string &)
+   *                                  for detail.
+   */
+  virtual void run( TestResult &controller,
+                    const std::string &testPath = "" );
+
+protected:
+  /*! \brief (INTERNAL) Mutating test suite.
+   */
+  class CPPUNIT_API WrappingSuite : public TestSuite
+  {
+  public:
+    WrappingSuite( const std::string &name = "All Tests" );
+
+    int getChildTestCount() const;
+
+    std::string getName() const;
+
+    void run( TestResult *result );
+
+  protected:
+    Test *doGetChildTestAt( int index ) const;
+
+    bool hasOnlyOneTest() const;
+
+    Test *getUniqueChildTest() const;
+  };
+
+protected:
+  WrappingSuite *m_suite;
+
+private:
+  /// Prevents the use of the copy constructor.
+  TestRunner( const TestRunner &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const TestRunner &copy );
+
+private:
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_TESTRUNNER_H
diff --git a/dep/cppunit/include/cppunit/TestSuccessListener.h b/dep/cppunit/include/cppunit/TestSuccessListener.h
new file mode 100644
index 00000000000..60c5ff50045
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestSuccessListener.h
@@ -0,0 +1,39 @@
+#ifndef CPPUNIT_TESTSUCCESSLISTENER_H
+#define CPPUNIT_TESTSUCCESSLISTENER_H
+
+#include <cppunit/SynchronizedObject.h>
+#include <cppunit/TestListener.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief TestListener that checks if any test case failed.
+ * \ingroup TrackingTestExecution
+ */
+class CPPUNIT_API TestSuccessListener : public TestListener,
+                                        public SynchronizedObject
+{
+public:
+  /*! Constructs a TestSuccessListener object.
+   */
+  TestSuccessListener( SynchronizationObject *syncObject = 0 );
+
+  /// Destructor.
+  virtual ~TestSuccessListener();
+
+  virtual void reset();
+
+  void addFailure( const TestFailure &failure );
+
+  /// Returns whether the entire test was successful or not.
+  virtual bool wasSuccessful() const;
+
+private:
+  bool m_success;
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_TESTSUCCESSLISTENER_H
diff --git a/dep/cppunit/include/cppunit/TestSuite.h b/dep/cppunit/include/cppunit/TestSuite.h
new file mode 100644
index 00000000000..2b9cd8d497b
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TestSuite.h
@@ -0,0 +1,80 @@
+#ifndef CPPUNIT_TESTSUITE_H    // -*- C++ -*-
+#define CPPUNIT_TESTSUITE_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+#include <cppunit/TestComposite.h>
+#include <cppunit/portability/CppUnitVector.h>
+
+CPPUNIT_NS_BEGIN
+
+
+#if CPPUNIT_NEED_DLL_DECL
+//  template class CPPUNIT_API std::vector<Test *>;
+#endif
+
+
+/*! \brief A Composite of Tests.
+ * \ingroup CreatingTestSuite
+ *
+ * It runs a collection of test cases. Here is an example.
+ * \code
+ * CppUnit::TestSuite *suite= new CppUnit::TestSuite();
+ * suite->addTest(new CppUnit::TestCaller<MathTest> (
+ *                  "testAdd", testAdd));
+ * suite->addTest(new CppUnit::TestCaller<MathTest> (
+ *                  "testDivideByZero", testDivideByZero));
+ * \endcode
+ * Note that \link TestSuite TestSuites \endlink assume lifetime
+ * control for any tests added to them.
+ *
+ * TestSuites do not register themselves in the TestRegistry.
+ * \see Test 
+ * \see TestCaller
+ */
+class CPPUNIT_API TestSuite : public TestComposite
+{
+public:
+  /*! Constructs a test suite with the specified name.
+   */
+  TestSuite( std::string name = "" );
+
+  ~TestSuite();
+
+  /*! Adds the specified test to the suite.
+   * \param test Test to add. Must not be \c NULL.
+    */
+  void addTest( Test *test );
+
+  /*! Returns the list of the tests (DEPRECATED).
+   * \deprecated Use getChildTestCount() & getChildTestAt() of the 
+   *             TestComposite interface instead.
+   * \return Reference on a vector that contains the tests of the suite.
+   */
+  const CppUnitVector<Test *> &getTests() const;
+
+  /*! Destroys all the tests of the suite.
+   */
+  virtual void deleteContents();
+
+  int getChildTestCount() const;
+
+  Test *doGetChildTestAt( int index ) const;
+
+private:
+  CppUnitVector<Test *> m_tests;
+};
+
+
+CPPUNIT_NS_END
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+#endif // CPPUNIT_TESTSUITE_H
diff --git a/dep/cppunit/include/cppunit/TextOutputter.h b/dep/cppunit/include/cppunit/TextOutputter.h
new file mode 100644
index 00000000000..6bd9ceaae1d
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TextOutputter.h
@@ -0,0 +1,59 @@
+#ifndef CPPUNIT_TEXTOUTPUTTER_H
+#define CPPUNIT_TEXTOUTPUTTER_H
+
+#include <cppunit/Portability.h>
+#include <cppunit/Outputter.h>
+#include <cppunit/portability/Stream.h>
+
+CPPUNIT_NS_BEGIN
+
+
+class Exception;
+class SourceLine;
+class TestResultCollector;
+class TestFailure;
+
+
+/*! \brief Prints a TestResultCollector to a text stream.
+ * \ingroup WritingTestResult
+ */
+class CPPUNIT_API TextOutputter : public Outputter
+{
+public:
+  TextOutputter( TestResultCollector *result,
+                 OStream &stream );
+
+  /// Destructor.
+  virtual ~TextOutputter();
+
+  void write();
+  virtual void printFailures();
+  virtual void printHeader();
+
+  virtual void printFailure( TestFailure *failure,
+                             int failureNumber );
+  virtual void printFailureListMark( int failureNumber );
+  virtual void printFailureTestName( TestFailure *failure );
+  virtual void printFailureType( TestFailure *failure );
+  virtual void printFailureLocation( SourceLine sourceLine );
+  virtual void printFailureDetail( Exception *thrownException );
+  virtual void printFailureWarning();
+  virtual void printStatistics();
+
+protected:
+  TestResultCollector *m_result;
+  OStream &m_stream;
+
+private:
+  /// Prevents the use of the copy constructor.
+  TextOutputter( const TextOutputter &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const TextOutputter &copy );
+};
+
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_TEXTOUTPUTTER_H
diff --git a/dep/cppunit/include/cppunit/TextTestProgressListener.h b/dep/cppunit/include/cppunit/TextTestProgressListener.h
new file mode 100644
index 00000000000..7521c40bcd4
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TextTestProgressListener.h
@@ -0,0 +1,44 @@
+#ifndef CPPUNIT_TEXTTESTPROGRESSLISTENER_H
+#define CPPUNIT_TEXTTESTPROGRESSLISTENER_H
+
+#include <cppunit/TestListener.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! 
+ * \brief TestListener that show the status of each TestCase test result.
+ * \ingroup TrackingTestExecution
+ */
+class CPPUNIT_API TextTestProgressListener : public TestListener
+{
+public:
+  /*! Constructs a TextTestProgressListener object.
+   */
+  TextTestProgressListener();
+
+  /// Destructor.
+  virtual ~TextTestProgressListener();
+
+  void startTest( Test *test );
+
+  void addFailure( const TestFailure &failure );
+
+  void endTestRun( Test *test, 
+                   TestResult *eventManager );
+
+private:
+  /// Prevents the use of the copy constructor.
+  TextTestProgressListener( const TextTestProgressListener &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const TextTestProgressListener &copy );
+
+private:
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_TEXTTESTPROGRESSLISTENER_H
diff --git a/dep/cppunit/include/cppunit/TextTestResult.h b/dep/cppunit/include/cppunit/TextTestResult.h
new file mode 100644
index 00000000000..e7b1fa3ea6e
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TextTestResult.h
@@ -0,0 +1,39 @@
+#ifndef CPPUNIT_TEXTTESTRESULT_H
+#define CPPUNIT_TEXTTESTRESULT_H
+
+#include <cppunit/TestResult.h>
+#include <cppunit/TestResultCollector.h>
+#include <cppunit/portability/Stream.h>
+
+CPPUNIT_NS_BEGIN
+
+
+class SourceLine;
+class Exception;
+class Test;
+
+/*! \brief Holds printable test result (DEPRECATED).
+ * \ingroup TrackingTestExecution
+ * 
+ * deprecated Use class TextTestProgressListener and TextOutputter instead.
+ */
+class CPPUNIT_API TextTestResult : public TestResult,
+                                   public TestResultCollector
+{
+public:
+  TextTestResult();
+
+  virtual void addFailure( const TestFailure &failure );
+  virtual void startTest( Test *test );
+  virtual void print( OStream &stream );
+};
+
+/** insertion operator for easy output */
+CPPUNIT_API OStream &operator <<( OStream &stream, 
+                                  TextTestResult &result );
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_TEXTTESTRESULT_H
+
+
diff --git a/dep/cppunit/include/cppunit/TextTestRunner.h b/dep/cppunit/include/cppunit/TextTestRunner.h
new file mode 100644
index 00000000000..23890e08655
--- /dev/null
+++ b/dep/cppunit/include/cppunit/TextTestRunner.h
@@ -0,0 +1,6 @@
+#ifndef CPPUNIT_TEXTTESTRUNNER_H
+#define CPPUNIT_TEXTTESTRUNNER_H
+
+#include <cppunit/ui/text/TextTestRunner.h>
+
+#endif  // CPPUNIT_TEXTTESTRUNNER_H
diff --git a/dep/cppunit/include/cppunit/XmlOutputter.h b/dep/cppunit/include/cppunit/XmlOutputter.h
new file mode 100644
index 00000000000..0de9676d8f9
--- /dev/null
+++ b/dep/cppunit/include/cppunit/XmlOutputter.h
@@ -0,0 +1,167 @@
+#ifndef CPPUNIT_XMLTESTRESULTOUTPUTTER_H
+#define CPPUNIT_XMLTESTRESULTOUTPUTTER_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+#include <cppunit/Outputter.h>
+#include <cppunit/portability/CppUnitDeque.h>
+#include <cppunit/portability/CppUnitMap.h>
+#include <cppunit/portability/Stream.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+class Test;
+class TestFailure;
+class TestResultCollector;
+class XmlDocument;
+class XmlElement;
+class XmlOutputterHook;
+
+
+/*! \brief Outputs a TestResultCollector in XML format.
+ * \ingroup WritingTestResult
+ *
+ * Save the test result as a XML stream. 
+ *
+ * Additional datas can be added to the XML document using XmlOutputterHook. 
+ * Hook are not owned by the XmlOutputter. They should be valid until 
+ * destruction of the XmlOutputter. They can be removed with removeHook().
+ *
+ * \see XmlDocument, XmlElement, XmlOutputterHook.
+ */
+class CPPUNIT_API XmlOutputter : public Outputter
+{
+public:
+  /*! \brief Constructs a XmlOutputter object.
+   * \param result Result of the test run.
+   * \param stream Stream used to output the XML output.
+   * \param encoding Encoding used in the XML file (default is Latin-1). 
+   */
+  XmlOutputter( TestResultCollector *result,
+                OStream &stream,
+                std::string encoding = std::string("ISO-8859-1") );
+
+  /// Destructor.
+  virtual ~XmlOutputter();
+
+  /*! \brief Adds the specified hook to the outputter.
+   * \param hook Hook to add. Must not be \c NULL.
+   */
+  virtual void addHook( XmlOutputterHook *hook );
+
+  /*! \brief Removes the specified hook from the outputter.
+   * \param hook Hook to remove.
+   */
+  virtual void removeHook( XmlOutputterHook *hook );
+
+  /*! \brief Writes the specified result as an XML document to the stream.
+   *
+   * Refer to examples/cppunittest/XmlOutputterTest.cpp for example
+   * of use and XML document structure.
+   */
+  virtual void write();
+
+  /*! \brief Sets the XSL style sheet used.
+   *
+   * \param styleSheet Name of the style sheet used. If empty, then no style sheet
+   *                   is used (default).
+   */
+  virtual void setStyleSheet( const std::string &styleSheet );
+
+  /*! \brief set the output document as standalone or not.
+   *
+   *  For the output document, specify wether it's a standalone XML
+   *  document, or not.
+   *
+   *  \param standalone if true, the output will be specified as standalone.
+   *         if false, it will be not.
+   */
+  virtual void setStandalone( bool standalone );
+
+  typedef CppUnitMap<Test *,TestFailure*, std::less<Test*> > FailedTests;
+
+  /*! \brief Sets the root element and adds its children.
+   *
+   * Set the root element of the XML Document and add its child elements.
+   *
+   * For all hooks, call beginDocument() just after creating the root element (it
+   * is empty at this time), and endDocument() once all the datas have been added
+   * to the root element.
+   */
+  virtual void setRootNode();
+
+  virtual void addFailedTests( FailedTests &failedTests,
+                               XmlElement *rootNode );
+
+  virtual void addSuccessfulTests( FailedTests &failedTests,
+                                   XmlElement *rootNode );
+
+  /*! \brief Adds the statics element to the root node.
+   * 
+   * Creates a new element containing statistics data and adds it to the root element.
+   * Then, for all hooks, call statisticsAdded().
+   * \param rootNode Root element.
+   */
+  virtual void addStatistics( XmlElement *rootNode );
+
+  /*! \brief Adds a failed test to the failed tests node.
+   * Creates a new element containing datas about the failed test, and adds it to 
+   * the failed tests element.
+   * Then, for all hooks, call failTestAdded().
+   */
+  virtual void addFailedTest( Test *test,
+                              TestFailure *failure,
+                              int testNumber,
+                              XmlElement *testsNode );
+
+  virtual void addFailureLocation( TestFailure *failure,
+                                   XmlElement *testElement );
+
+
+  /*! \brief Adds a successful test to the successful tests node.
+   * Creates a new element containing datas about the successful test, and adds it to 
+   * the successful tests element.
+   * Then, for all hooks, call successfulTestAdded().
+   */
+  virtual void addSuccessfulTest( Test *test, 
+                                  int testNumber,
+                                  XmlElement *testsNode );
+protected:
+  virtual void fillFailedTestsMap( FailedTests &failedTests );
+
+protected:
+  typedef CppUnitDeque<XmlOutputterHook *> Hooks;
+
+  TestResultCollector *m_result;
+  OStream &m_stream;
+  std::string m_encoding;
+  std::string m_styleSheet;
+  XmlDocument *m_xml;
+  Hooks m_hooks;
+
+private:
+  /// Prevents the use of the copy constructor.
+  XmlOutputter( const XmlOutputter &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const XmlOutputter &copy );
+
+private:
+};
+
+
+CPPUNIT_NS_END
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+
+#endif  // CPPUNIT_XMLTESTRESULTOUTPUTTER_H
diff --git a/dep/cppunit/include/cppunit/XmlOutputterHook.h b/dep/cppunit/include/cppunit/XmlOutputterHook.h
new file mode 100644
index 00000000000..5ded3b1ee88
--- /dev/null
+++ b/dep/cppunit/include/cppunit/XmlOutputterHook.h
@@ -0,0 +1,163 @@
+#ifndef CPPUNIT_XMLOUTPUTTERHOOK_H
+#define CPPUNIT_XMLOUTPUTTERHOOK_H
+
+#include <cppunit/Portability.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+class Test;
+class TestFailure;
+class XmlDocument;
+class XmlElement;
+
+
+
+/*! \brief Hook to customize Xml output.
+ *
+ * XmlOutputterHook can be passed to XmlOutputter to customize the XmlDocument.
+ *
+ * Common customizations are:
+ * - adding some datas to successfull or failed test with
+ *   failTestAdded() and successfulTestAdded(),
+ * - adding some statistics with statisticsAdded(),
+ * - adding other datas with beginDocument() or endDocument().
+ *
+ * See examples/ClockerPlugIn which makes use of most the hook.
+ *
+ * Another simple example of an outputter hook is shown below. It may be  
+ * used to add some meta information to your result files. In the example,
+ * the author name as well as the project name and test creation date is
+ * added to the head of the xml file.
+ *
+ * In order to make this information stored within the xml file, the virtual 
+ * member function beginDocument() is overriden where a new 
+ * XmlElement object is created.
+ *
+ * This element is simply added to the root node of the document which
+ * makes the information automatically being stored when the xml file
+ * is written.
+ *
+ * \code
+ * #include <cppunit/XmlOutputterHook.h>
+ * #include <cppunit/XmlElement.h>
+ * #include <cppunit/tools/StringTools.h>
+ * 
+ * ...
+ * 
+ * class MyXmlOutputterHook : public CppUnit::XmlOutputterHook
+ * {
+ * public:
+ *   MyXmlOutputterHook(const std::string projectName,
+ *                      const std::string author)
+ *   {
+ *      m_projectName = projectName;
+ *      m_author      = author;
+ *   };
+ * 
+ *   virtual ~MyXmlOutputterHook()
+ *   {
+ *   };
+ * 
+ *   void beginDocument(CppUnit::XmlDocument* document)
+ *   {
+ *     if (!document)
+ *       return;
+ *
+ *     // dump current time
+ *     std::string szDate          = CppUnit::StringTools::toString( (int)time(0) );
+ *     CppUnit::XmlElement* metaEl = new CppUnit::XmlElement("SuiteInfo", 
+ *                                                           "");
+ *
+ *     metaEl->addElement( new CppUnit::XmlElement("Author", m_author) );
+ *     metaEl->addElement( new CppUnit::XmlElement("Project", m_projectName) );
+ *     metaEl->addElement( new CppUnit::XmlElement("Date", szDate ) );
+ *    
+ *     document->rootElement().addElement(metaEl);
+ *   };
+ * private:
+ *   std::string m_projectName;
+ *   std::string m_author;
+ * }; 
+ * \endcode
+ *
+ * Within your application's main code, you need to snap the hook 
+ * object into your xml outputter object like shown below:
+ *
+ * \code
+ * CppUnit::TextUi::TestRunner runner;
+ * std::ofstream outputFile("testResults.xml");
+ * 
+ * CppUnit::XmlOutputter* outputter = new CppUnit::XmlOutputter( &runner.result(),
+ *                                                               outputFile );    
+ * MyXmlOutputterHook hook("myProject", "meAuthor");
+ * outputter->addHook(&hook);
+ * runner.setOutputter(outputter);    
+ * runner.addTest( VectorFixture::suite() );   
+ * runner.run();
+ * outputFile.close();
+ * \endcode
+ *
+ * This results into the following output:
+ *
+ * \code
+ * <TestRun>
+ *   <suiteInfo>
+ *     <author>meAuthor</author>
+ *     <project>myProject</project>
+ *     <date>1028143912</date>
+ *   </suiteInfo>
+ *   <FailedTests>
+ *    ...
+ * \endcode
+ *
+ * \see XmlOutputter, CppUnitTestPlugIn.
+ */
+class CPPUNIT_API XmlOutputterHook
+{
+public:
+  /*! Called before any elements is added to the root element.
+   * \param document XML Document being created.
+   */
+  virtual void beginDocument( XmlDocument *document );
+
+  /*! Called after adding all elements to the root element.
+   * \param document XML Document being created.
+   */
+  virtual void endDocument( XmlDocument *document );
+
+  /*! Called after adding a fail test element.
+   * \param document XML Document being created.
+   * \param testElement \<FailedTest\> element.
+   * \param test Test that failed.
+   * \param failure Test failure data.
+   */
+  virtual void failTestAdded( XmlDocument *document,
+                              XmlElement *testElement,
+                              Test *test,
+                              TestFailure *failure );
+
+  /*! Called after adding a successful test element.
+   * \param document XML Document being created.
+   * \param testElement \<Test\> element.
+   * \param test Test that was successful.
+   */
+  virtual void successfulTestAdded( XmlDocument *document,
+                                    XmlElement *testElement,
+                                    Test *test );
+
+  /*! Called after adding the statistic element.
+   * \param document XML Document being created.
+   * \param statisticsElement \<Statistics\> element.
+   */
+  virtual void statisticsAdded( XmlDocument *document,
+                                XmlElement *statisticsElement );
+
+  virtual ~XmlOutputterHook() {}
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_XMLOUTPUTTERHOOK_H
diff --git a/dep/cppunit/include/cppunit/config/CppUnitApi.h b/dep/cppunit/include/cppunit/config/CppUnitApi.h
new file mode 100644
index 00000000000..a068bbd543f
--- /dev/null
+++ b/dep/cppunit/include/cppunit/config/CppUnitApi.h
@@ -0,0 +1,33 @@
+#ifndef CPPUNIT_CONFIG_CPPUNITAPI
+#define CPPUNIT_CONFIG_CPPUNITAPI
+
+#undef CPPUNIT_API
+
+#ifdef WIN32
+
+// define CPPUNIT_DLL_BUILD when building CppUnit dll.
+#ifdef CPPUNIT_BUILD_DLL
+#define CPPUNIT_API __declspec(dllexport)
+#endif
+
+// define CPPUNIT_DLL when linking to CppUnit dll.
+#ifdef CPPUNIT_DLL
+#define CPPUNIT_API __declspec(dllimport)
+#endif
+
+#ifdef CPPUNIT_API
+#undef CPPUNIT_NEED_DLL_DECL
+#define CPPUNIT_NEED_DLL_DECL 1
+#endif
+
+#endif
+
+
+#ifndef CPPUNIT_API
+#define CPPUNIT_API
+#undef CPPUNIT_NEED_DLL_DECL
+#define CPPUNIT_NEED_DLL_DECL 0
+#endif
+
+ 
+#endif  // CPPUNIT_CONFIG_CPPUNITAPI
diff --git a/dep/cppunit/include/cppunit/config/Makefile.am b/dep/cppunit/include/cppunit/config/Makefile.am
new file mode 100644
index 00000000000..2f0b1f80671
--- /dev/null
+++ b/dep/cppunit/include/cppunit/config/Makefile.am
@@ -0,0 +1,10 @@
+libcppunitincludedir = $(includedir)/cppunit/config
+
+libcppunitinclude_HEADERS = \
+	config-bcb5.h \
+	config-evc4.h \
+	config-mac.h \
+	config-msvc6.h \
+	SelectDllLoader.h \
+	CppUnitApi.h \
+  SourcePrefix.h
diff --git a/dep/cppunit/include/cppunit/config/Makefile.in b/dep/cppunit/include/cppunit/config/Makefile.in
new file mode 100644
index 00000000000..4c21edb957a
--- /dev/null
+++ b/dep/cppunit/include/cppunit/config/Makefile.in
@@ -0,0 +1,438 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# 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.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = include/cppunit/config
+DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
+	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
+	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
+	$(top_srcdir)/config/ac_cxx_rtti.m4 \
+	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
+	$(top_srcdir)/config/ac_dll.m4 \
+	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_cxx_have_isfinite.m4 \
+	$(top_srcdir)/config/bb_enable_doxygen.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libcppunitincludedir)"
+libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libcppunitinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@
+CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@
+CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@
+CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@
+CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@
+CPPUNIT_VERSION = @CPPUNIT_VERSION@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_dot = @enable_dot@
+enable_html_docs = @enable_html_docs@
+enable_latex_docs = @enable_latex_docs@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+libcppunitincludedir = $(includedir)/cppunit/config
+libcppunitinclude_HEADERS = \
+	config-bcb5.h \
+	config-evc4.h \
+	config-mac.h \
+	config-msvc6.h \
+	SelectDllLoader.h \
+	CppUnitApi.h \
+  SourcePrefix.h
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/cppunit/config/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  include/cppunit/config/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)"
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+uninstall-libcppunitincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libcppunitincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libcppunitincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libcppunitincludeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libcppunitincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-libcppunitincludeHEADERS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/dep/cppunit/include/cppunit/config/SelectDllLoader.h b/dep/cppunit/include/cppunit/config/SelectDllLoader.h
new file mode 100644
index 00000000000..dc1c0115586
--- /dev/null
+++ b/dep/cppunit/include/cppunit/config/SelectDllLoader.h
@@ -0,0 +1,76 @@
+#ifndef CPPUNIT_CONFIG_SELECTDLLLOADER_H
+#define CPPUNIT_CONFIG_SELECTDLLLOADER_H
+
+/*! \file
+ * Selects DynamicLibraryManager implementation.
+ *
+ * Don't include this file directly. Include Portability.h instead.
+ */
+
+/*!
+ * \def CPPUNIT_NO_TESTPLUGIN
+ * \brief If defined, then plug-in related classes and functions will not be compiled.
+ * 
+ * \internal
+ * CPPUNIT_HAVE_WIN32_DLL_LOADER
+ * If defined, Win32 implementation of DynamicLibraryManager will be used.
+ * 
+ * CPPUNIT_HAVE_BEOS_DLL_LOADER
+ * If defined, BeOs implementation of DynamicLibraryManager will be used.
+ * 
+ * CPPUNIT_HAVE_UNIX_DLL_LOADER
+ * If defined, Unix implementation (dlfcn.h) of DynamicLibraryManager will be used.
+ */
+
+/*!
+ * \def CPPUNIT_PLUGIN_EXPORT
+ * \ingroup WritingTestPlugIn
+ * \brief A macro to export a function from a dynamic library
+ *
+ * This macro export the C function following it from a dynamic library. 
+ * Exporting the function makes it accessible to the DynamicLibraryManager.
+ *
+ * Example of usage:
+ * \code
+ * #include <cppunit/include/plugin/TestPlugIn.h>
+ *
+ * CPPUNIT_PLUGIN_EXPORT CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void)
+ * {
+ *   ...
+ *   return &myPlugInInterface;
+ * }
+ * \endcode
+ */
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+// Is WIN32 platform ?
+#if defined(WIN32)
+#define CPPUNIT_HAVE_WIN32_DLL_LOADER 1
+#undef CPPUNIT_PLUGIN_EXPORT
+#define CPPUNIT_PLUGIN_EXPORT extern "C" __declspec(dllexport)
+
+// Is BeOS platform ?
+#elif defined(__BEOS__)
+#define CPPUNIT_HAVE_BEOS_DLL_LOADER 1
+
+// Is Unix platform and have shl_load() (hp-ux)
+#elif defined(CPPUNIT_HAVE_SHL_LOAD)
+#define CPPUNIT_HAVE_UNIX_SHL_LOADER 1
+
+// Is Unix platform and have include <dlfcn.h>
+#elif defined(CPPUNIT_HAVE_LIBDL)
+#define CPPUNIT_HAVE_UNIX_DLL_LOADER 1
+
+// Otherwise, disable support for DllLoader
+#else
+#define CPPUNIT_NO_TESTPLUGIN 1
+#endif
+
+#if !defined(CPPUNIT_PLUGIN_EXPORT)
+#define CPPUNIT_PLUGIN_EXPORT extern "C"
+#endif // !defined(CPPUNIT_PLUGIN_EXPORT)
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
+
+#endif // CPPUNIT_CONFIG_SELECTDLLLOADER_H
diff --git a/dep/cppunit/include/cppunit/config/SourcePrefix.h b/dep/cppunit/include/cppunit/config/SourcePrefix.h
new file mode 100644
index 00000000000..2334601b595
--- /dev/null
+++ b/dep/cppunit/include/cppunit/config/SourcePrefix.h
@@ -0,0 +1,14 @@
+#ifndef CPPUNIT_CONFIG_H_INCLUDED
+#define CPPUNIT_CONFIG_H_INCLUDED
+
+#include <cppunit/Portability.h>
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4018 4284 4146)
+#if _MSC_VER >= 1400
+#pragma warning(disable: 4996)		// sprintf is deprecated
+#endif
+#endif
+
+
+#endif // CPPUNIT_CONFIG_H_INCLUDED
diff --git a/dep/cppunit/include/cppunit/config/config-bcb5.h b/dep/cppunit/include/cppunit/config/config-bcb5.h
new file mode 100644
index 00000000000..d4914520629
--- /dev/null
+++ b/dep/cppunit/include/cppunit/config/config-bcb5.h
@@ -0,0 +1,47 @@
+#ifndef _INCLUDE_CPPUNIT_CONFIG_BCB5_H
+#define _INCLUDE_CPPUNIT_CONFIG_BCB5_H 1
+
+#define HAVE_CMATH 1
+ 
+/* include/cppunit/config-bcb5.h. Manually adapted from 
+   include/cppunit/config-auto.h */
+
+/* define to 1 if the compiler implements namespaces */
+#ifndef CPPUNIT_HAVE_NAMESPACES 
+#define CPPUNIT_HAVE_NAMESPACES  1 
+#endif
+
+/* define if library uses std::string::compare(string,pos,n) */
+#ifndef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 
+#define CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST  0
+#endif
+
+/* Define if you have the <dlfcn.h> header file. */
+#ifdef CPPUNIT_HAVE_DLFCN_H 
+#undef CPPUNIT_HAVE_DLFCN_H 
+#endif
+
+/* define to 1 if the compiler implements namespaces */
+#ifndef CPPUNIT_HAVE_NAMESPACES 
+#define CPPUNIT_HAVE_NAMESPACES  1 
+#endif
+
+/* define if the compiler supports Run-Time Type Identification */
+#ifndef CPPUNIT_HAVE_RTTI 
+#define CPPUNIT_HAVE_RTTI  1 
+#endif
+
+/* Define to 1 to use type_info::name() for class names */
+#ifndef CPPUNIT_USE_TYPEINFO_NAME 
+#define CPPUNIT_USE_TYPEINFO_NAME  CPPUNIT_HAVE_RTTI 
+#endif
+
+#define CPPUNIT_HAVE_SSTREAM 1
+
+/* Name of package */
+#ifndef CPPUNIT_PACKAGE 
+#define CPPUNIT_PACKAGE  "cppunit" 
+#endif
+ 
+/* _INCLUDE_CPPUNIT_CONFIG_BCB5_H */
+#endif
diff --git a/dep/cppunit/include/cppunit/config/config-evc4.h b/dep/cppunit/include/cppunit/config/config-evc4.h
new file mode 100644
index 00000000000..a79169812df
--- /dev/null
+++ b/dep/cppunit/include/cppunit/config/config-evc4.h
@@ -0,0 +1,78 @@
+#ifndef _INCLUDE_CPPUNIT_CONFIG_EVC4_H
+#define _INCLUDE_CPPUNIT_CONFIG_EVC4_H 1
+
+#if _MSC_VER > 1000     // VC++
+#pragma warning( disable : 4786 )   // disable warning debug symbol > 255...
+#endif // _MSC_VER > 1000
+
+#define HAVE_CMATH 1
+ 
+/* include/cppunit/config-msvc6.h. Manually adapted from 
+   include/cppunit/config-auto.h */
+
+/* define to 1 if the compiler implements namespaces */
+#ifndef CPPUNIT_HAVE_NAMESPACES 
+#define CPPUNIT_HAVE_NAMESPACES  1 
+#endif
+
+/* define if library uses std::string::compare(string,pos,n) */
+#ifdef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 
+#undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST
+#endif
+
+/* Define if you have the <dlfcn.h> header file. */
+#ifdef CPPUNIT_HAVE_DLFCN_H 
+#undef CPPUNIT_HAVE_DLFCN_H 
+#endif
+
+/* define to 1 if the compiler implements namespaces */
+#ifndef CPPUNIT_HAVE_NAMESPACES 
+#define CPPUNIT_HAVE_NAMESPACES  1 
+#endif
+
+/* define if the compiler supports Run-Time Type Identification */
+#ifndef CPPUNIT_HAVE_RTTI 
+#define CPPUNIT_HAVE_RTTI  0
+#endif
+
+/* Define to 1 to use type_info::name() for class names */
+#ifndef CPPUNIT_USE_TYPEINFO_NAME 
+#define CPPUNIT_USE_TYPEINFO_NAME  CPPUNIT_HAVE_RTTI 
+#endif
+
+#define CPPUNIT_NO_STREAM 1
+#define CPPUNIT_NO_ASSERT 1
+
+#define CPPUNIT_HAVE_SSTREAM 0
+
+/* Name of package */
+#ifndef CPPUNIT_PACKAGE 
+#define CPPUNIT_PACKAGE  "cppunit" 
+#endif
+
+
+// Compiler error location format for CompilerOutputter
+// See class CompilerOutputter for format.
+#undef CPPUNIT_COMPILER_LOCATION_FORMAT
+#if _MSC_VER >= 1300    // VS 7.0
+# define CPPUNIT_COMPILER_LOCATION_FORMAT "%p(%l) : error : "
+#else
+# define CPPUNIT_COMPILER_LOCATION_FORMAT "%p(%l):"
+#endif
+
+/* define to 1 if the compiler has _finite() */
+#ifndef CPPUNIT_HAVE__FINITE
+#define CPPUNIT_HAVE__FINITE 1 
+#endif
+
+// Uncomment to turn on STL wrapping => use this to test compilation. 
+// This will make CppUnit subclass std::vector & co to provide default
+// parameter.
+/*#define CPPUNIT_STD_NEED_ALLOCATOR 1
+#define CPPUNIT_STD_ALLOCATOR std::allocator<T>
+//#define CPPUNIT_NO_NAMESPACE 1
+*/
+
+
+/* _INCLUDE_CPPUNIT_CONFIG_EVC4_H */
+#endif
diff --git a/dep/cppunit/include/cppunit/config/config-mac.h b/dep/cppunit/include/cppunit/config/config-mac.h
new file mode 100644
index 00000000000..4ace906cf95
--- /dev/null
+++ b/dep/cppunit/include/cppunit/config/config-mac.h
@@ -0,0 +1,58 @@
+#ifndef _INCLUDE_CPPUNIT_CONFIG_MAC_H
+#define _INCLUDE_CPPUNIT_CONFIG_MAC_H 1
+
+/* MacOS X should be installed using the configure script.
+   This file is for other macs.
+
+   It is not integrated into <cppunit/Portability.h> because we don't
+   know a suitable preprocessor symbol that will distinguish MacOS X
+   from other MacOS versions.  Email us if you know the answer.
+*/
+ 
+/* define if library uses std::string::compare(string,pos,n) */
+#ifdef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 
+#undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST
+#endif
+
+/* define if the library defines strstream */
+#ifndef CPPUNIT_HAVE_CLASS_STRSTREAM 
+#define CPPUNIT_HAVE_CLASS_STRSTREAM  1 
+#endif
+
+/* Define if you have the <cmath> header file. */
+#ifdef CPPUNIT_HAVE_CMATH 
+#undef CPPUNIT_HAVE_CMATH
+#endif
+
+/* Define if you have the <dlfcn.h> header file. */
+#ifdef CPPUNIT_HAVE_DLFCN_H 
+#undef CPPUNIT_HAVE_DLFCN_H
+#endif
+
+/* define to 1 if the compiler implements namespaces */
+#ifndef CPPUNIT_HAVE_NAMESPACES 
+#define CPPUNIT_HAVE_NAMESPACES  1 
+#endif
+
+/* define if the compiler supports Run-Time Type Identification */
+#ifndef CPPUNIT_HAVE_RTTI 
+#define CPPUNIT_HAVE_RTTI  1 
+#endif
+
+/* define if the compiler has stringstream */
+#ifndef CPPUNIT_HAVE_SSTREAM 
+#define CPPUNIT_HAVE_SSTREAM  1 
+#endif
+
+/* Define if you have the <strstream> header file. */
+#ifndef CPPUNIT_HAVE_STRSTREAM 
+#define CPPUNIT_HAVE_STRSTREAM  1 
+#endif
+
+/* Define to 1 to use type_info::name() for class names */
+#ifndef CPPUNIT_USE_TYPEINFO_NAME 
+#define CPPUNIT_USE_TYPEINFO_NAME  CPPUNIT_HAVE_RTTI 
+#endif
+
+/* _INCLUDE_CPPUNIT_CONFIG_MAC_H */
+#endif
diff --git a/dep/cppunit/include/cppunit/config/config-msvc6.h b/dep/cppunit/include/cppunit/config/config-msvc6.h
new file mode 100644
index 00000000000..d6881711ab5
--- /dev/null
+++ b/dep/cppunit/include/cppunit/config/config-msvc6.h
@@ -0,0 +1,83 @@
+#ifndef _INCLUDE_CPPUNIT_CONFIG_MSVC6_H
+#define _INCLUDE_CPPUNIT_CONFIG_MSVC6_H 1
+
+#if _MSC_VER > 1000     // VC++
+#pragma warning( disable : 4786 )   // disable warning debug symbol > 255...
+#endif // _MSC_VER > 1000
+
+#define HAVE_CMATH 1
+ 
+/* include/cppunit/config-msvc6.h. Manually adapted from 
+   include/cppunit/config-auto.h */
+
+/* define to 1 if the compiler implements namespaces */
+#ifndef CPPUNIT_HAVE_NAMESPACES 
+#define CPPUNIT_HAVE_NAMESPACES  1 
+#endif
+
+/* define if library uses std::string::compare(string,pos,n) */
+#ifdef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 
+#undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST
+#endif
+
+/* Define if you have the <dlfcn.h> header file. */
+#ifdef CPPUNIT_HAVE_DLFCN_H 
+#undef CPPUNIT_HAVE_DLFCN_H 
+#endif
+
+/* define to 1 if the compiler implements namespaces */
+#ifndef CPPUNIT_HAVE_NAMESPACES 
+#define CPPUNIT_HAVE_NAMESPACES  1 
+#endif
+
+/* define if the compiler supports Run-Time Type Identification */
+#ifndef CPPUNIT_HAVE_RTTI
+# ifdef _CPPRTTI // Defined by the compiler option /GR
+#  define CPPUNIT_HAVE_RTTI 1
+# else
+#  define CPPUNIT_HAVE_RTTI 0
+# endif
+#endif
+
+/* Define to 1 to use type_info::name() for class names */
+#ifndef CPPUNIT_USE_TYPEINFO_NAME 
+#define CPPUNIT_USE_TYPEINFO_NAME  CPPUNIT_HAVE_RTTI 
+#endif
+
+#define CPPUNIT_HAVE_SSTREAM 1
+
+/* Name of package */
+#ifndef CPPUNIT_PACKAGE 
+#define CPPUNIT_PACKAGE  "cppunit" 
+#endif
+
+
+// Compiler error location format for CompilerOutputter
+// See class CompilerOutputter for format.
+#undef CPPUNIT_COMPILER_LOCATION_FORMAT
+#if _MSC_VER >= 1300    // VS 7.0
+# define CPPUNIT_COMPILER_LOCATION_FORMAT "%p(%l) : error : "
+#else
+# define CPPUNIT_COMPILER_LOCATION_FORMAT "%p(%l):"
+#endif
+
+// Define to 1 if the compiler support C++ style cast.
+#define CPPUNIT_HAVE_CPP_CAST 1
+
+/* define to 1 if the compiler has _finite() */
+#ifndef CPPUNIT_HAVE__FINITE
+#define CPPUNIT_HAVE__FINITE 1 
+#endif
+
+
+// Uncomment to turn on STL wrapping => use this to test compilation. 
+// This will make CppUnit subclass std::vector & co to provide default
+// parameter.
+/*#define CPPUNIT_STD_NEED_ALLOCATOR 1
+#define CPPUNIT_STD_ALLOCATOR std::allocator<T>
+//#define CPPUNIT_NO_NAMESPACE 1
+*/
+
+
+/* _INCLUDE_CPPUNIT_CONFIG_MSVC6_H */
+#endif
diff --git a/dep/cppunit/include/cppunit/extensions/AutoRegisterSuite.h b/dep/cppunit/include/cppunit/extensions/AutoRegisterSuite.h
new file mode 100644
index 00000000000..e04adb5d937
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/AutoRegisterSuite.h
@@ -0,0 +1,83 @@
+#ifndef CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H
+#define CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H
+
+#include <cppunit/extensions/TestSuiteFactory.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief (Implementation) Automatically register the test suite of the specified type.
+ *
+ * You should not use this class directly. Instead, use the following macros:
+ * - CPPUNIT_TEST_SUITE_REGISTRATION()
+ * - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION()
+ *
+ * This object will register the test returned by TestCaseType::suite()
+ * when constructed to the test registry.
+ *
+ * This object is intented to be used as a static variable.
+ *
+ *
+ * \param TestCaseType Type of the test case which suite is registered.
+ * \see CPPUNIT_TEST_SUITE_REGISTRATION, CPPUNIT_TEST_SUITE_NAMED_REGISTRATION
+ * \see CppUnit::TestFactoryRegistry.
+ */
+template<class TestCaseType>
+class AutoRegisterSuite
+{
+public:
+  /** Auto-register the suite factory in the global registry.
+   */
+  AutoRegisterSuite()
+      : m_registry( &TestFactoryRegistry::getRegistry() )
+  {
+    m_registry->registerFactory( &m_factory );
+  }
+
+  /** Auto-register the suite factory in the specified registry.
+   * \param name Name of the registry.
+   */
+  AutoRegisterSuite( const std::string &name )
+      : m_registry( &TestFactoryRegistry::getRegistry( name ) )
+  {
+    m_registry->registerFactory( &m_factory );
+  }
+
+  ~AutoRegisterSuite()
+  {
+    if ( TestFactoryRegistry::isValid() )
+      m_registry->unregisterFactory( &m_factory );
+  }
+
+private:
+  TestFactoryRegistry *m_registry;
+  TestSuiteFactory<TestCaseType> m_factory;
+};
+
+
+/*! \brief (Implementation) Automatically adds a registry into another registry.
+ *
+ * Don't use this class. Use the macros CPPUNIT_REGISTRY_ADD() and
+ * CPPUNIT_REGISTRY_ADD_TO_DEFAULT() instead.
+ */
+class AutoRegisterRegistry
+{
+public:
+  AutoRegisterRegistry( const std::string &which,
+                        const std::string &to )
+  {
+    TestFactoryRegistry::getRegistry( to ).addRegistry( which );
+  }
+
+  AutoRegisterRegistry( const std::string &which )
+  {
+    TestFactoryRegistry::getRegistry().addRegistry( which );
+  }
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H
diff --git a/dep/cppunit/include/cppunit/extensions/ExceptionTestCaseDecorator.h b/dep/cppunit/include/cppunit/extensions/ExceptionTestCaseDecorator.h
new file mode 100644
index 00000000000..9c816addb38
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/ExceptionTestCaseDecorator.h
@@ -0,0 +1,104 @@
+#ifndef CPPUNIT_EXTENSIONS_EXCEPTIONTESTCASEDECORATOR_H
+#define CPPUNIT_EXTENSIONS_EXCEPTIONTESTCASEDECORATOR_H
+
+#include <cppunit/Portability.h>
+#include <cppunit/Exception.h>
+#include <cppunit/extensions/TestCaseDecorator.h>
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Expected exception test case decorator.
+ *
+ * A decorator used to assert that a specific test case should throw an
+ * exception of a given type.
+ *
+ * You should use this class only if you need to check the exception object
+ * state (that a specific cause is set for example). If you don't need to
+ * do that, you might consider using CPPUNIT_TEST_EXCEPTION() instead.
+ *
+ * Intended use is to subclass and override checkException(). Example:
+ *
+ * \code
+ *
+ * class NetworkErrorTestCaseDecorator : 
+ *           public ExceptionTestCaseDecorator<NetworkError>
+ * {
+ * public:
+ *   NetworkErrorTestCaseDecorator( NetworkError::Cause expectedCause )
+ *       : m_expectedCause( expectedCause )
+ *   {
+ *   }
+ * private:
+ *   void checkException( ExpectedExceptionType &e )
+ *   {
+ *     CPPUNIT_ASSERT_EQUAL( m_expectedCause, e.getCause() );
+ *   }
+ *
+ *   NetworkError::Cause m_expectedCause;
+ * };
+ * \endcode
+ *
+ */ 
+template<class ExpectedException>
+class ExceptionTestCaseDecorator : public TestCaseDecorator
+{
+public:
+  typedef ExpectedException ExpectedExceptionType;
+
+  /*! \brief Decorates the specified test.
+   * \param test TestCase to decorate. Assumes ownership of the test.
+   */
+  ExceptionTestCaseDecorator( TestCase *test )
+      : TestCaseDecorator( test )
+  {
+  }
+
+  /*! \brief Checks that the expected exception is thrown by the decorated test.
+   * is thrown.
+   *
+   * Calls the decorated test runTest() and checks that an exception of
+   * type ExpectedException is thrown. Call checkException() passing the
+   * exception that was caught so that some assertions can be made if
+   * needed.
+   */
+  void runTest()
+  {
+    try
+    {
+      TestCaseDecorator::runTest();
+    }
+    catch ( ExpectedExceptionType &e )
+    {
+      checkException( e );
+      return;
+    }
+
+    // Moved outside the try{} statement to handle the case where the
+    // expected exception type is Exception (expecting assertion failure).
+#if CPPUNIT_USE_TYPEINFO_NAME
+      throw Exception( Message(
+                         "expected exception not thrown",
+                         "Expected exception type: " + 
+                           TypeInfoHelper::getClassName( 
+                               typeid( ExpectedExceptionType ) ) ) );
+#else
+      throw Exception( Message("expected exception not thrown") );
+#endif
+  }
+
+private:
+  /*! \brief Called when the exception is caught.
+   *
+   * Should be overriden to check the exception.
+   */
+  virtual void checkException( ExpectedExceptionType &e )
+  {
+  }
+};
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_EXTENSIONS_EXCEPTIONTESTCASEDECORATOR_H
+
diff --git a/dep/cppunit/include/cppunit/extensions/HelperMacros.h b/dep/cppunit/include/cppunit/extensions/HelperMacros.h
new file mode 100644
index 00000000000..12431e46578
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/HelperMacros.h
@@ -0,0 +1,541 @@
+// //////////////////////////////////////////////////////////////////////////
+// Header file HelperMacros.h
+// (c)Copyright 2000, Baptiste Lepilleur.
+// Created: 2001/04/15
+// //////////////////////////////////////////////////////////////////////////
+#ifndef CPPUNIT_EXTENSIONS_HELPERMACROS_H
+#define CPPUNIT_EXTENSIONS_HELPERMACROS_H
+
+#include <cppunit/TestCaller.h>
+#include <cppunit/TestSuite.h>
+#include <cppunit/extensions/AutoRegisterSuite.h>
+#include <cppunit/extensions/ExceptionTestCaseDecorator.h>
+#include <cppunit/extensions/TestFixtureFactory.h>
+#include <cppunit/extensions/TestNamer.h>
+#include <cppunit/extensions/TestSuiteBuilderContext.h>
+#include <memory>
+
+
+/*! \addtogroup WritingTestFixture Writing test fixture
+ */
+/** @{
+ */
+
+
+/** \file
+ * Macros intended to ease the definition of test suites.
+ *
+ * The macros
+ * CPPUNIT_TEST_SUITE(), CPPUNIT_TEST(), and CPPUNIT_TEST_SUITE_END()
+ * are designed to facilitate easy creation of a test suite.
+ * For example,
+ *
+ * \code
+ * #include <cppunit/extensions/HelperMacros.h>
+ * class MyTest : public CppUnit::TestFixture {
+ *   CPPUNIT_TEST_SUITE( MyTest );
+ *   CPPUNIT_TEST( testEquality );
+ *   CPPUNIT_TEST( testSetName );
+ *   CPPUNIT_TEST_SUITE_END();
+ * public:
+ *   void testEquality();
+ *   void testSetName();
+ * };
+ * \endcode
+ * 
+ * The effect of these macros is to define two methods in the
+ * class MyTest.  The first method is an auxiliary function
+ * named registerTests that you will not need to call directly.
+ * The second function
+ * \code static CppUnit::TestSuite *suite()\endcode
+ * returns a pointer to the suite of tests defined by the CPPUNIT_TEST()
+ * macros.  
+ *
+ * Rather than invoking suite() directly,
+ * the macro CPPUNIT_TEST_SUITE_REGISTRATION() is
+ * used to create a static variable that automatically
+ * registers its test suite in a global registry.
+ * The registry yields a Test instance containing all the
+ * registered suites.
+ * \code
+ * CPPUNIT_TEST_SUITE_REGISTRATION( MyTest );
+ * CppUnit::Test* tp =
+ *   CppUnit::TestFactoryRegistry::getRegistry().makeTest();
+ * \endcode
+ * 
+ * The test suite macros can even be used with templated test classes.
+ * For example:
+ *
+ * \code
+ * template<typename CharType>
+ * class StringTest : public CppUnit::TestFixture {
+ *   CPPUNIT_TEST_SUITE( StringTest );
+ *   CPPUNIT_TEST( testAppend );
+ *   CPPUNIT_TEST_SUITE_END();
+ * public:  
+ *   ...
+ * };
+ * \endcode
+ *
+ * You need to add in an implementation file:
+ *
+ * \code
+ * CPPUNIT_TEST_SUITE_REGISTRATION( StringTest<char> );
+ * CPPUNIT_TEST_SUITE_REGISTRATION( StringTest<wchar_t> );
+ * \endcode
+ */
+
+
+/*! \brief Begin test suite
+ *
+ * This macro starts the declaration of a new test suite.
+ * Use CPPUNIT_TEST_SUB_SUITE() instead, if you wish to include the
+ * test suite of the parent class.
+ *
+ * \param ATestFixtureType Type of the test case class. This type \b MUST
+ *                         be derived from TestFixture.
+ * \see CPPUNIT_TEST_SUB_SUITE, CPPUNIT_TEST, CPPUNIT_TEST_SUITE_END, 
+ * \see CPPUNIT_TEST_SUITE_REGISTRATION, CPPUNIT_TEST_EXCEPTION, CPPUNIT_TEST_FAIL.
+ */
+#define CPPUNIT_TEST_SUITE( ATestFixtureType )                              \
+  public:                                                                   \
+    typedef ATestFixtureType TestFixtureType;                               \
+                                                                            \
+  private:                                                                  \
+    static const CPPUNIT_NS::TestNamer &getTestNamer__()                    \
+    {                                                                       \
+      static CPPUNIT_TESTNAMER_DECL( testNamer, ATestFixtureType );         \
+      return testNamer;                                                     \
+    }                                                                       \
+                                                                            \
+  public:                                                                   \
+    typedef CPPUNIT_NS::TestSuiteBuilderContext<TestFixtureType>            \
+                TestSuiteBuilderContextType;                                \
+                                                                            \
+    static void                                                             \
+    addTestsToSuite( CPPUNIT_NS::TestSuiteBuilderContextBase &baseContext ) \
+    {                                                                       \
+      TestSuiteBuilderContextType context( baseContext )
+
+
+/*! \brief Begin test suite (includes parent suite)
+ * 
+ * This macro may only be used in a class whose parent class
+ * defines a test suite using CPPUNIT_TEST_SUITE() or CPPUNIT_TEST_SUB_SUITE().
+ *
+ * This macro begins the declaration of a test suite, in the same
+ * manner as CPPUNIT_TEST_SUITE().  In addition, the test suite of the
+ * parent is automatically inserted in the test suite being
+ * defined.
+ * 
+ * Here is an example:
+ *
+ * \code
+ * #include <cppunit/extensions/HelperMacros.h>
+ * class MySubTest : public MyTest {
+ *   CPPUNIT_TEST_SUB_SUITE( MySubTest, MyTest );
+ *   CPPUNIT_TEST( testAdd );
+ *   CPPUNIT_TEST( testSub );
+ *   CPPUNIT_TEST_SUITE_END();
+ * public:
+ *   void testAdd();
+ *   void testSub();
+ * };
+ * \endcode
+ *
+ * \param ATestFixtureType Type of the test case class. This type \b MUST
+ *                         be derived from TestFixture.
+ * \param ASuperClass   Type of the parent class.
+ * \see CPPUNIT_TEST_SUITE.
+ */
+#define CPPUNIT_TEST_SUB_SUITE( ATestFixtureType, ASuperClass )  \
+  public:                                                        \
+    typedef ASuperClass ParentTestFixtureType;                   \
+  private:                                                       \
+    CPPUNIT_TEST_SUITE( ATestFixtureType );                      \
+      ParentTestFixtureType::addTestsToSuite( baseContext )
+
+
+/*! \brief End declaration of the test suite.
+ *
+ * After this macro, member access is set to "private".
+ *
+ * \see  CPPUNIT_TEST_SUITE.
+ * \see  CPPUNIT_TEST_SUITE_REGISTRATION.
+ */
+#define CPPUNIT_TEST_SUITE_END()                                               \
+    }                                                                          \
+                                                                               \
+    static CPPUNIT_NS::TestSuite *suite()                                      \
+    {                                                                          \
+      const CPPUNIT_NS::TestNamer &namer = getTestNamer__();                   \
+      std::auto_ptr<CPPUNIT_NS::TestSuite> suite(                              \
+             new CPPUNIT_NS::TestSuite( namer.getFixtureName() ));             \
+      CPPUNIT_NS::ConcretTestFixtureFactory<TestFixtureType> factory;          \
+      CPPUNIT_NS::TestSuiteBuilderContextBase context( *suite.get(),           \
+                                                       namer,                  \
+                                                       factory );              \
+      TestFixtureType::addTestsToSuite( context );                             \
+      return suite.release();                                                  \
+    }                                                                          \
+  private: /* dummy typedef so that the macro can still end with ';'*/         \
+    typedef int CppUnitDummyTypedefForSemiColonEnding__
+
+/*! \brief End declaration of an abstract test suite.
+ *
+ * Use this macro to indicate that the %TestFixture is abstract. No
+ * static suite() method will be declared. 
+ *
+ * After this macro, member access is set to "private".
+ *
+ * Here is an example of usage:
+ *
+ * The abstract test fixture:
+ * \code
+ * #include <cppunit/extensions/HelperMacros.h>
+ * class AbstractDocument;
+ * class AbstractDocumentTest : public CppUnit::TestFixture {
+ *   CPPUNIT_TEST_SUITE( AbstractDocumentTest );
+ *   CPPUNIT_TEST( testInsertText );
+ *   CPPUNIT_TEST_SUITE_END_ABSTRACT();
+ * public:
+ *   void testInsertText();
+ * 
+ *   void setUp()
+ *   {
+ *     m_document = makeDocument();
+ *   }
+ *
+ *   void tearDown()
+ *   {
+ *     delete m_document;
+ *   }
+ * protected:
+ *   virtual AbstractDocument *makeDocument() =0;
+ *
+ *   AbstractDocument *m_document;
+ * };\endcode
+ *
+ * The concret test fixture:
+ * \code
+ * class RichTextDocumentTest : public AbstractDocumentTest {
+ *   CPPUNIT_TEST_SUB_SUITE( RichTextDocumentTest, AbstractDocumentTest );
+ *   CPPUNIT_TEST( testInsertFormatedText );
+ *   CPPUNIT_TEST_SUITE_END();
+ * public:
+ *   void testInsertFormatedText();
+ * protected:
+ *   AbstractDocument *makeDocument()
+ *   {
+ *     return new RichTextDocument();
+ *   }
+ * };\endcode
+ *
+ * \see  CPPUNIT_TEST_SUB_SUITE.
+ * \see  CPPUNIT_TEST_SUITE_REGISTRATION.
+ */
+#define CPPUNIT_TEST_SUITE_END_ABSTRACT()                                      \
+    }                                                                          \
+  private: /* dummy typedef so that the macro can still end with ';'*/         \
+    typedef int CppUnitDummyTypedefForSemiColonEnding__
+
+
+/*! \brief Add a test to the suite (for custom test macro).
+ *
+ * The specified test will be added to the test suite being declared. This macro
+ * is intended for \e advanced usage, to extend %CppUnit by creating new macro such
+ * as CPPUNIT_TEST_EXCEPTION()...
+ *
+ * Between macro CPPUNIT_TEST_SUITE() and CPPUNIT_TEST_SUITE_END(), you can assume
+ * that the following variables can be used:
+ * \code
+ * typedef TestSuiteBuilder<TestFixtureType> TestSuiteBuilderType;
+ * TestSuiteBuilderType &context;
+ * \endcode
+ *
+ * \c context can be used to name test case, create new test fixture instance,
+ * or add test case to the test fixture suite.
+ *
+ * Below is an example that show how to use this macro to create new macro to add
+ * test to the fixture suite. The macro below show how you would add a new type
+ * of test case which fails if the execution last more than a given time limit.
+ * It relies on an imaginary TimeOutTestCaller class which has an interface similar
+ * to TestCaller.
+ * 
+ * \code
+ * #define CPPUNITEX_TEST_TIMELIMIT( testMethod, timeLimit )            \
+ *      CPPUNIT_TEST_SUITE_ADD_TEST( (new TimeOutTestCaller<TestFixtureType>(  \
+ *                  namer.getTestNameFor( #testMethod ),                \
+ *                  &TestFixtureType::testMethod,                   \
+ *                  factory.makeFixture(),                              \
+ *                  timeLimit ) ) )
+ *   
+ * class PerformanceTest : CppUnit::TestFixture
+ * {
+ * public:
+ *   CPPUNIT_TEST_SUITE( PerformanceTest );
+ *   CPPUNITEX_TEST_TIMELIMIT( testSortReverseOrder, 5.0 );
+ *   CPPUNIT_TEST_SUITE_END();
+ *
+ *   void testSortReverseOrder();
+ * };
+ * \endcode
+ *
+ * \param test Test to add to the suite. Must be a subclass of Test. The test name
+ *             should have been obtained using TestNamer::getTestNameFor().
+ */
+#define CPPUNIT_TEST_SUITE_ADD_TEST( test ) \
+      context.addTest( test )
+
+/*! \brief Add a method to the suite.
+ * \param testMethod Name of the method of the test case to add to the
+ *                   suite. The signature of the method must be of
+ *                   type: void testMethod();
+ * \see  CPPUNIT_TEST_SUITE.
+ */
+#define CPPUNIT_TEST( testMethod )                        \
+    CPPUNIT_TEST_SUITE_ADD_TEST(                           \
+        ( new CPPUNIT_NS::TestCaller<TestFixtureType>(    \
+                  context.getTestNameFor( #testMethod),   \
+                  &TestFixtureType::testMethod,           \
+                  context.makeFixture() ) ) )
+
+/*! \brief Add a test which fail if the specified exception is not caught.
+ *
+ * Example:
+ * \code
+ * #include <cppunit/extensions/HelperMacros.h>
+ * #include <vector>
+ * class MyTest : public CppUnit::TestFixture {
+ *   CPPUNIT_TEST_SUITE( MyTest );
+ *   CPPUNIT_TEST_EXCEPTION( testVectorAtThrow, std::invalid_argument );
+ *   CPPUNIT_TEST_SUITE_END();
+ * public:
+ *   void testVectorAtThrow()
+ *   {
+ *     std::vector<int> v;
+ *     v.at( 1 );     // must throw exception std::invalid_argument
+ *   }
+ * };
+ * \endcode
+ *
+ * \param testMethod Name of the method of the test case to add to the suite.
+ * \param ExceptionType Type of the exception that must be thrown by the test 
+ *                      method.
+ * \deprecated Use the assertion macro CPPUNIT_ASSERT_THROW instead.
+ */
+#define CPPUNIT_TEST_EXCEPTION( testMethod, ExceptionType )          \
+  CPPUNIT_TEST_SUITE_ADD_TEST(                                        \
+      (new CPPUNIT_NS::ExceptionTestCaseDecorator< ExceptionType >(  \
+          new CPPUNIT_NS::TestCaller< TestFixtureType >(             \
+                               context.getTestNameFor( #testMethod ),  \
+                               &TestFixtureType::testMethod,         \
+                               context.makeFixture() ) ) ) )
+
+/*! \brief Adds a test case which is excepted to fail.
+ *
+ * The added test case expect an assertion to fail. You usually used that type
+ * of test case when testing custom assertion macros.
+ *
+ * \code
+ * CPPUNIT_TEST_FAIL( testAssertFalseFail );
+ * 
+ * void testAssertFalseFail()
+ * {
+ *   CPPUNIT_ASSERT( false );
+ * }
+ * \endcode
+ * \see CreatingNewAssertions.
+ * \deprecated Use the assertion macro CPPUNIT_ASSERT_ASSERTION_FAIL instead.
+ */
+#define CPPUNIT_TEST_FAIL( testMethod ) \
+              CPPUNIT_TEST_EXCEPTION( testMethod, CPPUNIT_NS::Exception )
+
+/*! \brief Adds some custom test cases.
+ *
+ * Use this to add one or more test cases to the fixture suite. The specified
+ * method is called with a context parameter that can be used to name, 
+ * instantiate fixture, and add instantiated test case to the fixture suite.
+ * The specified method must have the following signature:
+ * \code
+ * static void aMethodName( TestSuiteBuilderContextType &context );
+ * \endcode
+ *
+ * \c TestSuiteBuilderContextType is typedef to 
+ * TestSuiteBuilderContext<TestFixtureType> declared by CPPUNIT_TEST_SUITE().
+ *
+ * Here is an example that add two custom tests:
+ *
+ * \code
+ * #include <cppunit/extensions/HelperMacros.h>
+ *
+ * class MyTest : public CppUnit::TestFixture {
+ *   CPPUNIT_TEST_SUITE( MyTest );
+ *   CPPUNIT_TEST_SUITE_ADD_CUSTOM_TESTS( addTimeOutTests );
+ *   CPPUNIT_TEST_SUITE_END();
+ * public:
+ *   static void addTimeOutTests( TestSuiteBuilderContextType &context )
+ *   {
+ *     context.addTest( new TimeOutTestCaller( context.getTestNameFor( "test1" ) ),
+ *                                             &MyTest::test1,
+ *                                             context.makeFixture(),
+ *                                             5.0 );
+ *     context.addTest( new TimeOutTestCaller( context.getTestNameFor( "test2" ) ),
+ *                                             &MyTest::test2,
+ *                                             context.makeFixture(),
+ *                                             5.0 );
+ *   }
+ *
+ *   void test1()
+ *   {
+ *     // Do some test that may never end...
+ *   }
+ *
+ *   void test2()
+ *   {
+ *     // Do some test that may never end...
+ *   }
+ * };
+ * \endcode
+ * @param testAdderMethod Name of the method called to add the test cases.
+ */
+#define CPPUNIT_TEST_SUITE_ADD_CUSTOM_TESTS( testAdderMethod ) \
+      testAdderMethod( context )
+
+/*! \brief Adds a property to the test suite builder context.
+ * \param APropertyKey   Key of the property to add.
+ * \param APropertyValue Value for the added property.
+ * Example:
+ * \code
+ * CPPUNIT_TEST_SUITE_PROPERTY("XmlFileName", "paraTest.xml"); \endcode
+ */
+#define CPPUNIT_TEST_SUITE_PROPERTY( APropertyKey, APropertyValue ) \
+    context.addProperty( std::string(APropertyKey),                 \
+                         std::string(APropertyValue) )
+
+/** @}
+ */
+
+
+/*! Adds the specified fixture suite to the unnamed registry.
+ * \ingroup CreatingTestSuite
+ *
+ * This macro declares a static variable whose construction
+ * causes a test suite factory to be inserted in a global registry
+ * of such factories.  The registry is available by calling
+ * the static function CppUnit::TestFactoryRegistry::getRegistry().
+ * 
+ * \param ATestFixtureType Type of the test case class.
+ * \warning This macro should be used only once per line of code (the line
+ *          number is used to name a hidden static variable).
+ * \see CPPUNIT_TEST_SUITE_NAMED_REGISTRATION
+ * \see CPPUNIT_REGISTRY_ADD_TO_DEFAULT
+ * \see CPPUNIT_REGISTRY_ADD
+ * \see CPPUNIT_TEST_SUITE, CppUnit::AutoRegisterSuite, 
+ *      CppUnit::TestFactoryRegistry.
+ */
+#define CPPUNIT_TEST_SUITE_REGISTRATION( ATestFixtureType )      \
+  static CPPUNIT_NS::AutoRegisterSuite< ATestFixtureType >       \
+             CPPUNIT_MAKE_UNIQUE_NAME(autoRegisterRegistry__ )
+
+
+/** Adds the specified fixture suite to the specified registry suite.
+ * \ingroup CreatingTestSuite
+ *
+ * This macro declares a static variable whose construction
+ * causes a test suite factory to be inserted in the global registry
+ * suite of the specified name. The registry is available by calling
+ * the static function CppUnit::TestFactoryRegistry::getRegistry().
+ * 
+ * For the suite name, use a string returned by a static function rather
+ * than a hardcoded string. That way, you can know what are the name of
+ * named registry and you don't risk mistyping the registry name.
+ *
+ * \code
+ * // MySuites.h
+ * namespace MySuites {
+ *   std::string math() { 
+ *     return "Math";
+ *   }
+ * }
+ *
+ * // ComplexNumberTest.cpp
+ * #include "MySuites.h"
+ * 
+ * CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ComplexNumberTest, MySuites::math() );
+ * \endcode
+ *
+ * \param ATestFixtureType Type of the test case class.
+ * \param suiteName Name of the global registry suite the test suite is 
+ *                  registered into.
+ * \warning This macro should be used only once per line of code (the line
+ *          number is used to name a hidden static variable).
+ * \see CPPUNIT_TEST_SUITE_REGISTRATION
+ * \see CPPUNIT_REGISTRY_ADD_TO_DEFAULT
+ * \see CPPUNIT_REGISTRY_ADD
+ * \see CPPUNIT_TEST_SUITE, CppUnit::AutoRegisterSuite, 
+ *      CppUnit::TestFactoryRegistry..
+ */
+#define CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ATestFixtureType, suiteName ) \
+  static CPPUNIT_NS::AutoRegisterSuite< ATestFixtureType >                   \
+             CPPUNIT_MAKE_UNIQUE_NAME(autoRegisterRegistry__ )(suiteName)
+
+/*! Adds that the specified registry suite to another registry suite.
+ * \ingroup CreatingTestSuite
+ *
+ * Use this macros to automatically create test registry suite hierarchy. For example,
+ * if you want to create the following hierarchy:
+ * - Math
+ *   - IntegerMath
+ *   - FloatMath
+ *     - FastFloat
+ *     - StandardFloat
+ * 
+ * You can do this automatically with:
+ * \code
+ * CPPUNIT_REGISTRY_ADD( "FastFloat", "FloatMath" );
+ * CPPUNIT_REGISTRY_ADD( "IntegerMath", "Math" );
+ * CPPUNIT_REGISTRY_ADD( "FloatMath", "Math" );
+ * CPPUNIT_REGISTRY_ADD( "StandardFloat", "FloatMath" );
+ * \endcode
+ *
+ * There is no specific order of declaration. Think of it as declaring links.
+ *
+ * You register the test in each suite using CPPUNIT_TEST_SUITE_NAMED_REGISTRATION.
+ *
+ * \param which Name of the registry suite to add to the registry suite named \a to.
+ * \param to Name of the registry suite \a which is added to.
+ * \see CPPUNIT_REGISTRY_ADD_TO_DEFAULT, CPPUNIT_TEST_SUITE_NAMED_REGISTRATION.
+ */
+#define CPPUNIT_REGISTRY_ADD( which, to )                                     \
+  static CPPUNIT_NS::AutoRegisterRegistry                                     \
+             CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterRegistry__ )( which, to )
+
+/*! Adds that the specified registry suite to the default registry suite.
+ * \ingroup CreatingTestSuite
+ *
+ * This macro is just like CPPUNIT_REGISTRY_ADD except the specified registry
+ * suite is added to the default suite (root suite).
+ *
+ * \param which Name of the registry suite to add to the default registry suite.
+ * \see CPPUNIT_REGISTRY_ADD.
+ */
+#define CPPUNIT_REGISTRY_ADD_TO_DEFAULT( which )                         \
+  static CPPUNIT_NS::AutoRegisterRegistry                                \
+             CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterRegistry__ )( which )
+
+// Backwards compatibility
+// (Not tested!)
+
+#if CPPUNIT_ENABLE_CU_TEST_MACROS
+
+#define CU_TEST_SUITE(tc) CPPUNIT_TEST_SUITE(tc)
+#define CU_TEST_SUB_SUITE(tc,sc) CPPUNIT_TEST_SUB_SUITE(tc,sc)
+#define CU_TEST(tm) CPPUNIT_TEST(tm)
+#define CU_TEST_SUITE_END() CPPUNIT_TEST_SUITE_END()
+#define CU_TEST_SUITE_REGISTRATION(tc) CPPUNIT_TEST_SUITE_REGISTRATION(tc)
+
+#endif
+
+
+#endif  // CPPUNIT_EXTENSIONS_HELPERMACROS_H
diff --git a/dep/cppunit/include/cppunit/extensions/Makefile.am b/dep/cppunit/include/cppunit/extensions/Makefile.am
new file mode 100644
index 00000000000..ff96de31837
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/Makefile.am
@@ -0,0 +1,19 @@
+libcppunitincludedir = $(includedir)/cppunit/extensions
+
+libcppunitinclude_HEADERS = \
+	TestFactory.h \
+	AutoRegisterSuite.h \
+	HelperMacros.h \
+	Orthodox.h \
+	RepeatedTest.h \
+	ExceptionTestCaseDecorator.h \
+	TestCaseDecorator.h \
+	TestDecorator.h \
+	TestFactoryRegistry.h \
+	TestFixtureFactory.h \
+	TestNamer.h \
+	TestSetUp.h \
+	TestSuiteBuilderContext.h \
+	TestSuiteFactory.h \
+	TypeInfoHelper.h
+
diff --git a/dep/cppunit/include/cppunit/extensions/Makefile.in b/dep/cppunit/include/cppunit/extensions/Makefile.in
new file mode 100644
index 00000000000..c088904781c
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/Makefile.in
@@ -0,0 +1,446 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# 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.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = include/cppunit/extensions
+DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
+	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
+	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
+	$(top_srcdir)/config/ac_cxx_rtti.m4 \
+	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
+	$(top_srcdir)/config/ac_dll.m4 \
+	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_cxx_have_isfinite.m4 \
+	$(top_srcdir)/config/bb_enable_doxygen.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libcppunitincludedir)"
+libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libcppunitinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@
+CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@
+CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@
+CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@
+CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@
+CPPUNIT_VERSION = @CPPUNIT_VERSION@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_dot = @enable_dot@
+enable_html_docs = @enable_html_docs@
+enable_latex_docs = @enable_latex_docs@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+libcppunitincludedir = $(includedir)/cppunit/extensions
+libcppunitinclude_HEADERS = \
+	TestFactory.h \
+	AutoRegisterSuite.h \
+	HelperMacros.h \
+	Orthodox.h \
+	RepeatedTest.h \
+	ExceptionTestCaseDecorator.h \
+	TestCaseDecorator.h \
+	TestDecorator.h \
+	TestFactoryRegistry.h \
+	TestFixtureFactory.h \
+	TestNamer.h \
+	TestSetUp.h \
+	TestSuiteBuilderContext.h \
+	TestSuiteFactory.h \
+	TypeInfoHelper.h
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/cppunit/extensions/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  include/cppunit/extensions/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)"
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+uninstall-libcppunitincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libcppunitincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libcppunitincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libcppunitincludeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libcppunitincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-libcppunitincludeHEADERS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/dep/cppunit/include/cppunit/extensions/Orthodox.h b/dep/cppunit/include/cppunit/extensions/Orthodox.h
new file mode 100644
index 00000000000..722125937e4
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/Orthodox.h
@@ -0,0 +1,95 @@
+#ifndef CPPUNIT_EXTENSIONS_ORTHODOX_H
+#define CPPUNIT_EXTENSIONS_ORTHODOX_H
+
+#include <cppunit/TestCase.h>
+
+CPPUNIT_NS_BEGIN
+
+
+/*
+ * Orthodox performs a simple set of tests on an arbitary
+ * class to make sure that it supports at least the
+ * following operations:
+ *
+ *      default construction    - constructor
+ *      equality/inequality     - operator== && operator!=
+ *      assignment              - operator=
+ *      negation                - operator!
+ *      safe passage            - copy construction
+ *
+ * If operations for each of these are not declared
+ * the template will not instantiate.  If it does 
+ * instantiate, tests are performed to make sure
+ * that the operations have correct semantics.
+ *      
+ * Adding an orthodox test to a suite is very 
+ * easy: 
+ * 
+ * public: Test *suite ()  {
+ *     TestSuite *suiteOfTests = new TestSuite;
+ *     suiteOfTests->addTest (new ComplexNumberTest ("testAdd");
+ *     suiteOfTests->addTest (new TestCaller<Orthodox<Complex> > ());
+ *     return suiteOfTests;
+ *  }
+ *
+ * Templated test cases be very useful when you are want to
+ * make sure that a group of classes have the same form.
+ *
+ * see TestSuite
+ */
+
+
+template <class ClassUnderTest> class Orthodox : public TestCase
+{
+public:
+                    Orthodox () : TestCase ("Orthodox") {}
+
+protected:
+    ClassUnderTest  call (ClassUnderTest object);
+    void            runTest ();
+
+
+};
+
+
+// Run an orthodoxy test
+template <class ClassUnderTest> void Orthodox<ClassUnderTest>::runTest ()
+{
+    // make sure we have a default constructor
+    ClassUnderTest   a, b, c;
+
+    // make sure we have an equality operator
+    CPPUNIT_ASSERT (a == b);
+
+    // check the inverse
+    b.operator= (a.operator! ());
+    CPPUNIT_ASSERT (a != b);
+
+    // double inversion
+    b = !!a;
+    CPPUNIT_ASSERT (a == b);
+
+    // invert again
+    b = !a;
+
+    // check calls
+    c = a;
+    CPPUNIT_ASSERT (c == call (a));
+
+    c = b;
+    CPPUNIT_ASSERT (c == call (b));
+
+}
+
+
+// Exercise a call
+template <class ClassUnderTest> 
+ClassUnderTest Orthodox<ClassUnderTest>::call (ClassUnderTest object)
+{
+    return object;
+}
+
+
+CPPUNIT_NS_END
+
+#endif
diff --git a/dep/cppunit/include/cppunit/extensions/RepeatedTest.h b/dep/cppunit/include/cppunit/extensions/RepeatedTest.h
new file mode 100644
index 00000000000..390ce4807be
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/RepeatedTest.h
@@ -0,0 +1,43 @@
+#ifndef CPPUNIT_EXTENSIONS_REPEATEDTEST_H
+#define CPPUNIT_EXTENSIONS_REPEATEDTEST_H
+
+#include <cppunit/Portability.h>
+#include <cppunit/extensions/TestDecorator.h>
+
+CPPUNIT_NS_BEGIN
+
+
+class Test;
+class TestResult;
+
+
+/*! \brief Decorator that runs a test repeatedly.
+ *
+ * Does not assume ownership of the test it decorates
+ */
+class CPPUNIT_API RepeatedTest : public TestDecorator 
+{
+public:
+  RepeatedTest( Test *test, 
+                int timesRepeat ) : 
+      TestDecorator( test ), 
+      m_timesRepeat(timesRepeat) 
+  {
+  }
+
+  void run( TestResult *result );
+
+  int countTestCases() const;
+
+private:
+  RepeatedTest( const RepeatedTest & );
+  void operator=( const RepeatedTest & );
+
+  const int m_timesRepeat;
+};
+
+
+CPPUNIT_NS_END
+
+
+#endif // CPPUNIT_EXTENSIONS_REPEATEDTEST_H
diff --git a/dep/cppunit/include/cppunit/extensions/TestCaseDecorator.h b/dep/cppunit/include/cppunit/extensions/TestCaseDecorator.h
new file mode 100644
index 00000000000..3a15ba97474
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/TestCaseDecorator.h
@@ -0,0 +1,40 @@
+#ifndef CPPUNIT_EXTENSIONS_TESTCASEDECORATOR_H
+#define CPPUNIT_EXTENSIONS_TESTCASEDECORATOR_H
+
+#include <cppunit/Portability.h>
+#include <cppunit/TestCase.h>
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief  Decorator for Test cases.
+ *
+ * TestCaseDecorator provides an alternate means to extend functionality
+ * of a test class without subclassing the test.  Instead, one can
+ * subclass the decorater and use it to wrap the test class.
+ *
+ * Does not assume ownership of the test it decorates
+ */ 
+class CPPUNIT_API TestCaseDecorator : public TestCase
+{
+public:
+  TestCaseDecorator( TestCase *test );
+  ~TestCaseDecorator();
+
+  std::string getName() const;
+
+  void setUp();
+
+  void tearDown();
+
+  void runTest();
+
+protected:
+  TestCase *m_test;
+};
+
+
+CPPUNIT_NS_END
+
+#endif
+
diff --git a/dep/cppunit/include/cppunit/extensions/TestDecorator.h b/dep/cppunit/include/cppunit/extensions/TestDecorator.h
new file mode 100644
index 00000000000..59d9a302e55
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/TestDecorator.h
@@ -0,0 +1,49 @@
+#ifndef CPPUNIT_EXTENSIONS_TESTDECORATOR_H
+#define CPPUNIT_EXTENSIONS_TESTDECORATOR_H
+
+#include <cppunit/Portability.h>
+#include <cppunit/Test.h>
+
+CPPUNIT_NS_BEGIN
+
+
+class TestResult;
+
+
+/*! \brief  Decorator for Tests.
+ *
+ * TestDecorator provides an alternate means to extend functionality
+ * of a test class without subclassing the test.  Instead, one can
+ * subclass the decorater and use it to wrap the test class.
+ *
+ * Does not assume ownership of the test it decorates
+ */ 
+class CPPUNIT_API TestDecorator : public Test
+{
+public:
+  TestDecorator( Test *test );
+  ~TestDecorator();
+
+  int countTestCases() const;
+
+  std::string getName() const;
+
+  void run( TestResult *result );
+
+  int getChildTestCount() const;
+
+protected:
+  Test *doGetChildTestAt( int index ) const;
+
+  Test *m_test;
+
+private:
+  TestDecorator( const TestDecorator &);
+  void operator =( const TestDecorator & );
+};
+
+
+CPPUNIT_NS_END
+
+#endif
+
diff --git a/dep/cppunit/include/cppunit/extensions/TestFactory.h b/dep/cppunit/include/cppunit/extensions/TestFactory.h
new file mode 100644
index 00000000000..214d353490d
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/TestFactory.h
@@ -0,0 +1,27 @@
+#ifndef CPPUNIT_EXTENSIONS_TESTFACTORY_H
+#define CPPUNIT_EXTENSIONS_TESTFACTORY_H
+
+#include <cppunit/Portability.h>
+
+CPPUNIT_NS_BEGIN
+
+
+class Test;
+
+/*! \brief Abstract Test factory.
+ */
+class CPPUNIT_API TestFactory 
+{
+public:
+  virtual ~TestFactory() {}
+
+  /*! Makes a new test.
+   * \return A new Test.
+   */
+  virtual Test* makeTest() = 0;
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_EXTENSIONS_TESTFACTORY_H
diff --git a/dep/cppunit/include/cppunit/extensions/TestFactoryRegistry.h b/dep/cppunit/include/cppunit/extensions/TestFactoryRegistry.h
new file mode 100644
index 00000000000..fc8723e400a
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/TestFactoryRegistry.h
@@ -0,0 +1,182 @@
+#ifndef CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H
+#define CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251)  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+#include <cppunit/portability/CppUnitSet.h>
+#include <cppunit/extensions/TestFactory.h>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+
+class TestSuite;
+
+#if CPPUNIT_NEED_DLL_DECL
+//  template class CPPUNIT_API std::set<TestFactory *>;
+#endif
+
+
+/*! \brief Registry for TestFactory.
+ * \ingroup CreatingTestSuite
+ *
+ * Notes that the registry \b DON'T assumes lifetime control for any registered tests
+ * anymore.
+ *
+ * The <em>default</em> registry is the registry returned by getRegistry() with the 
+ * default name parameter value.
+ *
+ * To register tests, use the macros:
+ * - CPPUNIT_TEST_SUITE_REGISTRATION(): to add tests in the default registry.
+ * - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(): to add tests in a named registry.
+ *
+ * Example 1: retreiving a suite that contains all the test registered with
+ * CPPUNIT_TEST_SUITE_REGISTRATION().
+ * \code
+ * CppUnit::TestFactoryRegistry &registry = CppUnit::TestFactoryRegistry::getRegistry();
+ * CppUnit::TestSuite *suite = registry.makeTest();
+ * \endcode
+ *
+ * Example 2: retreiving a suite that contains all the test registered with
+ * \link CPPUNIT_TEST_SUITE_NAMED_REGISTRATION() CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ..., "Math" )\endlink.
+ * \code
+ * CppUnit::TestFactoryRegistry &mathRegistry = CppUnit::TestFactoryRegistry::getRegistry( "Math" );
+ * CppUnit::TestSuite *mathSuite = mathRegistry.makeTest();
+ * \endcode
+ *
+ * Example 3: creating a test suite hierarchy composed of unnamed registration and
+ * named registration:
+ * - All Tests
+ *   - tests registered with CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ..., "Graph" )
+ *   - tests registered with CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ..., "Math" )
+ *   - tests registered with CPPUNIT_TEST_SUITE_REGISTRATION
+ *
+ * \code
+ * CppUnit::TestSuite *rootSuite = new CppUnit::TestSuite( "All tests" );
+ * rootSuite->addTest( CppUnit::TestFactoryRegistry::getRegistry( "Graph" ).makeTest() );
+ * rootSuite->addTest( CppUnit::TestFactoryRegistry::getRegistry( "Math" ).makeTest() );
+ * CppUnit::TestFactoryRegistry::getRegistry().addTestToSuite( rootSuite );
+ * \endcode
+ *
+ * The same result can be obtained with:
+ * \code
+ * CppUnit::TestFactoryRegistry &registry = CppUnit::TestFactoryRegistry::getRegistry();
+ * registry.addRegistry( "Graph" );
+ * registry.addRegistry( "Math" );
+ * CppUnit::TestSuite *suite = registry.makeTest();
+ * \endcode
+ *
+ * Since a TestFactoryRegistry is a TestFactory, the named registries can be 
+ * registered in the unnamed registry, creating the hierarchy links.
+ *
+ * \see TestSuiteFactory, AutoRegisterSuite
+ * \see CPPUNIT_TEST_SUITE_REGISTRATION, CPPUNIT_TEST_SUITE_NAMED_REGISTRATION
+ */
+class CPPUNIT_API TestFactoryRegistry : public TestFactory
+{
+public:
+  /** Constructs the registry with the specified name.
+   * \param name Name of the registry. It is the name of TestSuite returned by
+   *             makeTest().
+   */
+  TestFactoryRegistry( std::string name );
+
+  /// Destructor.
+  virtual ~TestFactoryRegistry();
+
+  /** Returns a new TestSuite that contains the registered test.
+   * \return A new TestSuite which contains all the test added using 
+   * registerFactory(TestFactory *).
+   */
+  virtual Test *makeTest();
+
+  /** Returns a named registry.
+   *
+   * If the \a name is left to its default value, then the registry that is returned is
+   * the one used by CPPUNIT_TEST_SUITE_REGISTRATION(): the 'top' level registry.
+   *
+   * \param name Name of the registry to return.
+   * \return Registry. If the registry does not exist, it is created with the
+   *         specified name.
+   */
+  static TestFactoryRegistry &getRegistry( const std::string &name = "All Tests" );
+
+  /** Adds the registered tests to the specified suite.
+   * \param suite Suite the tests are added to.
+   */
+  void addTestToSuite( TestSuite *suite );
+
+  /** Adds the specified TestFactory to the registry.
+   *
+   * \param factory Factory to register. 
+   */
+  void registerFactory( TestFactory *factory );
+
+  /*! Removes the specified TestFactory from the registry.
+   * 
+   * The specified factory is not destroyed.
+   * \param factory Factory to remove from the registry.
+   * \todo Address case when trying to remove a TestRegistryFactory.
+   */
+  void unregisterFactory( TestFactory *factory );
+
+  /*! Adds a registry to the registry.
+   * 
+   * Convenience method to help create test hierarchy. See TestFactoryRegistry detail
+   * for examples of use. Calling this method is equivalent to:
+   * \code
+   * this->registerFactory( TestFactoryRegistry::getRegistry( name ) );
+   * \endcode
+   *
+   * \param name Name of the registry to add.
+   */
+  void addRegistry( const std::string &name );
+
+  /*! Tests if the registry is valid.
+   *
+   * This method should be used when unregistering test factory on static variable 
+   * destruction to ensure that the registry has not been already destroyed (in 
+   * that case there is no need to unregister the test factory).
+   *
+   * You should not concern yourself with this method unless you are writing a class
+   * like AutoRegisterSuite.
+   *
+   * \return \c true if the specified registry has not been destroyed, 
+   *         otherwise returns \c false.
+   * \see AutoRegisterSuite.
+   */
+  static bool isValid();
+
+  /** Adds the specified TestFactory with a specific name (DEPRECATED).
+   * \param name Name associated to the factory.
+   * \param factory Factory to register. 
+   * \deprecated Use registerFactory( TestFactory *) instead.
+   */
+  void registerFactory( const std::string &name,
+                        TestFactory *factory );
+
+private:
+  TestFactoryRegistry( const TestFactoryRegistry &copy );
+  void operator =( const TestFactoryRegistry &copy );
+
+private:
+  typedef CppUnitSet<TestFactory *, std::less<TestFactory*> > Factories;
+  Factories m_factories;
+
+  std::string m_name;
+};
+
+
+CPPUNIT_NS_END
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+
+#endif  // CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H
diff --git a/dep/cppunit/include/cppunit/extensions/TestFixtureFactory.h b/dep/cppunit/include/cppunit/extensions/TestFixtureFactory.h
new file mode 100644
index 00000000000..45354c62be8
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/TestFixtureFactory.h
@@ -0,0 +1,50 @@
+#ifndef CPPUNIT_EXTENSIONS_TESTFIXTUREFACTORY_H
+#define CPPUNIT_EXTENSIONS_TESTFIXTUREFACTORY_H
+
+#include <cppunit/Portability.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+class TestFixture;
+
+/*! \brief Abstract TestFixture factory (Implementation).
+ *
+ * Implementation detail. Use by HelperMacros to handle TestFixture hierarchy.
+ */
+class TestFixtureFactory
+{
+public:
+  //! Creates a new TestFixture instance.
+  virtual TestFixture *makeFixture() =0;
+
+  virtual ~TestFixtureFactory() {}
+};
+
+
+/*! \brief Concret TestFixture factory (Implementation).
+ *
+ * Implementation detail. Use by HelperMacros to handle TestFixture hierarchy.
+ */
+template<class TestFixtureType>
+class ConcretTestFixtureFactory : public CPPUNIT_NS::TestFixtureFactory
+{
+  /*! \brief Returns a new TestFixture instance.
+   * \return A new fixture instance. The fixture instance is returned by
+   *         the TestFixtureFactory passed on construction. The actual type 
+   *         is that of the fixture on which the static method suite() 
+   *         was called.
+   */
+  TestFixture *makeFixture()
+  {
+    return new TestFixtureType();
+  }
+};
+
+
+CPPUNIT_NS_END
+
+
+#endif // CPPUNIT_EXTENSIONS_TESTFIXTUREFACTORY_H
+
diff --git a/dep/cppunit/include/cppunit/extensions/TestNamer.h b/dep/cppunit/include/cppunit/extensions/TestNamer.h
new file mode 100644
index 00000000000..5a6471c0c3e
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/TestNamer.h
@@ -0,0 +1,89 @@
+#ifndef CPPUNIT_EXTENSIONS_TESTNAMER_H
+#define CPPUNIT_EXTENSIONS_TESTNAMER_H
+
+#include <cppunit/Portability.h>
+#include <string>
+
+#if CPPUNIT_HAVE_RTTI
+#  include <typeinfo>
+#endif
+
+
+
+/*! \def CPPUNIT_TESTNAMER_DECL( variableName, FixtureType )
+ * \brief Declares a TestNamer.
+ *
+ * Declares a TestNamer for the specified type, using RTTI if enabled, otherwise
+ * using macro string expansion.
+ *
+ * RTTI is used if CPPUNIT_USE_TYPEINFO_NAME is defined and not null.
+ *
+ * \code
+ * void someMethod() 
+ * {
+ *   CPPUNIT_TESTNAMER_DECL( namer, AFixtureType );
+ *   std::string fixtureName = namer.getFixtureName();
+ *   ...
+ * \endcode
+ *
+ * \relates TestNamer
+ * \see TestNamer
+ */
+#if CPPUNIT_USE_TYPEINFO_NAME
+#  define CPPUNIT_TESTNAMER_DECL( variableName, FixtureType )       \
+              CPPUNIT_NS::TestNamer variableName( typeid(FixtureType) )
+#else
+#  define CPPUNIT_TESTNAMER_DECL( variableName, FixtureType )       \
+              CPPUNIT_NS::TestNamer variableName( std::string(#FixtureType) )
+#endif
+
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Names a test or a fixture suite.
+ *
+ * TestNamer is usually instantiated using CPPUNIT_TESTNAMER_DECL.
+ *
+ */
+class CPPUNIT_API TestNamer
+{
+public:
+#if CPPUNIT_HAVE_RTTI
+  /*! \brief Constructs a namer using the fixture's type-info.
+   * \param typeInfo Type-info of the fixture type. Use to name the fixture suite.
+   */
+  TestNamer( const std::type_info &typeInfo );
+#endif
+
+  /*! \brief Constructs a namer using the specified fixture name.
+   * \param fixtureName Name of the fixture suite. Usually extracted using a macro.
+   */
+  TestNamer( const std::string &fixtureName );
+
+  virtual ~TestNamer();
+
+  /*! \brief Returns the name of the fixture.
+   * \return Name of the fixture.
+   */
+  virtual std::string getFixtureName() const;
+
+  /*! \brief Returns the name of the test for the specified method.
+   * \param testMethodName Name of the method that implements a test.
+   * \return A string that is the concatenation of the test fixture name 
+   *         (returned by getFixtureName()) and\a testMethodName, 
+   *         separated using '::'. This provides a fairly unique name for a given
+   *         test.
+   */
+  virtual std::string getTestNameFor( const std::string &testMethodName ) const;
+
+protected:
+  std::string m_fixtureName;
+};
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_EXTENSIONS_TESTNAMER_H
+
diff --git a/dep/cppunit/include/cppunit/extensions/TestSetUp.h b/dep/cppunit/include/cppunit/extensions/TestSetUp.h
new file mode 100644
index 00000000000..f2128ecd74f
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/TestSetUp.h
@@ -0,0 +1,34 @@
+#ifndef CPPUNIT_EXTENSIONS_TESTSETUP_H
+#define CPPUNIT_EXTENSIONS_TESTSETUP_H
+
+#include <cppunit/extensions/TestDecorator.h>
+
+CPPUNIT_NS_BEGIN
+
+
+class Test;
+class TestResult;
+
+/*! \brief Decorates a test by providing a specific setUp() and tearDown().
+ */
+class CPPUNIT_API TestSetUp : public TestDecorator 
+{
+public:
+  TestSetUp( Test *test );
+
+  void run( TestResult *result );
+
+protected:
+  virtual void setUp();
+  virtual void tearDown();
+
+private:
+  TestSetUp( const TestSetUp & );
+  void operator =( const TestSetUp & );
+};
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_EXTENSIONS_TESTSETUP_H
+
diff --git a/dep/cppunit/include/cppunit/extensions/TestSuiteBuilderContext.h b/dep/cppunit/include/cppunit/extensions/TestSuiteBuilderContext.h
new file mode 100644
index 00000000000..db26926cd40
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/TestSuiteBuilderContext.h
@@ -0,0 +1,131 @@
+#ifndef CPPUNIT_HELPER_TESTSUITEBUILDERCONTEXT_H
+#define CPPUNIT_HELPER_TESTSUITEBUILDERCONTEXT_H
+
+#include <cppunit/Portability.h>
+#include <cppunit/portability/CppUnitMap.h>
+#include <string>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+
+CPPUNIT_NS_BEGIN
+
+class TestSuite;
+class TestFixture;
+class TestFixtureFactory;
+class TestNamer;
+
+/*! \brief Context used when creating test suite in HelperMacros.
+ *
+ * Base class for all context used when creating test suite. The
+ * actual context type during test suite creation is TestSuiteBuilderContext.
+ *
+ * \sa CPPUNIT_TEST_SUITE, CPPUNIT_TEST_SUITE_ADD_TEST, 
+ *     CPPUNIT_TEST_SUITE_ADD_CUSTOM_TESTS.
+ */
+class CPPUNIT_API TestSuiteBuilderContextBase
+{
+public:
+  /*! \brief Constructs a new context.
+   *
+   * You should not use this. The context is created in 
+   * CPPUNIT_TEST_SUITE().
+   */
+  TestSuiteBuilderContextBase( TestSuite &suite,
+                               const TestNamer &namer,
+                               TestFixtureFactory &factory );
+
+  virtual ~TestSuiteBuilderContextBase();
+
+  /*! \brief Adds a test to the fixture suite.
+   *
+   * \param test Test to add to the fixture suite. Must not be \c NULL.
+   */
+  void addTest( Test *test );
+
+  /*! \brief Returns the fixture name.
+   * \return Fixture name. It is the name used to name the fixture
+   *         suite.
+   */
+  std::string getFixtureName() const;
+
+  /*! \brief Returns the name of the test for the specified method.
+   *
+   * \param testMethodName Name of the method that implements a test.
+   * \return A string that is the concatenation of the test fixture name 
+   *         (returned by getFixtureName()) and\a testMethodName, 
+   *         separated using '::'. This provides a fairly unique name for a given
+   *         test.
+   */
+  std::string getTestNameFor( const std::string &testMethodName ) const;
+
+  /*! \brief Adds property pair.
+   * \param key   PropertyKey string to add.
+   * \param value PropertyValue string to add.
+   */
+  void addProperty( const std::string &key, 
+                    const std::string &value );
+  
+  /*! \brief Returns property value assigned to param key.
+   * \param key PropertyKey string.
+   */
+  const std::string getStringProperty( const std::string &key ) const;
+
+protected:
+  TestFixture *makeTestFixture() const;
+
+  // Notes: we use a vector here instead of a map to work-around the
+  // shared std::map in dll bug in VC6.
+  // See http://www.dinkumware.com/vc_fixes.html for detail.
+  typedef std::pair<std::string,std::string> Property;
+  typedef CppUnitVector<Property> Properties;
+
+  TestSuite &m_suite;
+  const TestNamer &m_namer;
+  TestFixtureFactory &m_factory;
+
+private:
+  Properties m_properties;
+};
+
+
+/*! \brief Type-sage context used when creating test suite in HelperMacros.
+ * 
+ * \sa TestSuiteBuilderContextBase.
+ */
+template<class Fixture>
+class TestSuiteBuilderContext : public TestSuiteBuilderContextBase
+{
+public:
+  typedef Fixture FixtureType;
+
+  TestSuiteBuilderContext( TestSuiteBuilderContextBase &contextBase )
+      : TestSuiteBuilderContextBase( contextBase )
+  {
+  }
+
+  /*! \brief Returns a new TestFixture instance.
+   * \return A new fixture instance. The fixture instance is returned by
+   *         the TestFixtureFactory passed on construction. The actual type 
+   *         is that of the fixture on which the static method suite() 
+   *         was called.
+   */
+  FixtureType *makeFixture() const
+  {
+    return CPPUNIT_STATIC_CAST( FixtureType *, 
+                                TestSuiteBuilderContextBase::makeTestFixture() );
+  }
+};
+
+
+CPPUNIT_NS_END
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+#endif // CPPUNIT_HELPER_TESTSUITEBUILDERCONTEXT_H
+
diff --git a/dep/cppunit/include/cppunit/extensions/TestSuiteFactory.h b/dep/cppunit/include/cppunit/extensions/TestSuiteFactory.h
new file mode 100644
index 00000000000..260b4831512
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/TestSuiteFactory.h
@@ -0,0 +1,27 @@
+#ifndef CPPUNIT_EXTENSIONS_TESTSUITEFACTORY_H
+#define CPPUNIT_EXTENSIONS_TESTSUITEFACTORY_H
+
+#include <cppunit/extensions/TestFactory.h>
+
+CPPUNIT_NS_BEGIN
+
+
+  class Test;
+
+  /*! \brief TestFactory for TestFixture that implements a static suite() method.
+   * \see AutoRegisterSuite.
+   */
+  template<class TestCaseType>
+  class TestSuiteFactory : public TestFactory
+  {
+  public:
+    virtual Test *makeTest()
+    {
+      return TestCaseType::suite();
+    }
+  };
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_EXTENSIONS_TESTSUITEFACTORY_H
diff --git a/dep/cppunit/include/cppunit/extensions/TypeInfoHelper.h b/dep/cppunit/include/cppunit/extensions/TypeInfoHelper.h
new file mode 100644
index 00000000000..c0ecdbc6e4e
--- /dev/null
+++ b/dep/cppunit/include/cppunit/extensions/TypeInfoHelper.h
@@ -0,0 +1,33 @@
+#ifndef CPPUNIT_TYPEINFOHELPER_H
+#define CPPUNIT_TYPEINFOHELPER_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_HAVE_RTTI
+
+#include <typeinfo>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+
+  /**! \brief Helper to use type_info.
+   */
+  class CPPUNIT_API TypeInfoHelper
+  {
+  public:
+    /*! \brief Get the class name of the specified type_info.
+     * \param info Info which the class name is extracted from.
+     * \return The string returned by type_info::name() without
+     *         the "class" prefix. If the name is not prefixed
+     *         by "class", it is returned as this.
+     */
+    static std::string getClassName( const std::type_info &info );
+  };
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_HAVE_RTTI
+
+#endif  // CPPUNIT_TYPEINFOHELPER_H
diff --git a/dep/cppunit/include/cppunit/plugin/DynamicLibraryManager.h b/dep/cppunit/include/cppunit/plugin/DynamicLibraryManager.h
new file mode 100644
index 00000000000..d70ccde4629
--- /dev/null
+++ b/dep/cppunit/include/cppunit/plugin/DynamicLibraryManager.h
@@ -0,0 +1,121 @@
+#ifndef CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGER_H
+#define CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGER_H
+
+#include <cppunit/Portability.h>
+#include <string>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Manages dynamic libraries.
+ *
+ * The Dynamic Library Manager provides a platform independent way to work with
+ * dynamic library. It load a specific dynamic library, and can returns specific
+ * symbol exported by the dynamic library.
+ *
+ * If an error occurs, a DynamicLibraryManagerException is thrown.
+ *
+ * \internal Implementation of the OS independent methods is in 
+ * DynamicLibraryManager.cpp.
+ *
+ * \internal Porting to a new platform:
+ * - Adds platform detection in config/SelectDllLoader.h. Should define a specific
+ *   macro for that platform of the form: CPPUNIT_HAVE_XYZ_DLL_LOADER, where
+ *   XYZ is the platform.
+ * - Makes a copy of UnixDynamicLibraryManager.cpp and named it after the platform.
+ * - Updated the 'guard' in your file (CPPUNIT_HAVE_XYZ_DLL_LOADER) so that it is
+ *   only processed if the matching platform has been detected.
+ * - Change the implementation of methods doLoadLibrary(), doReleaseLibrary(), 
+ *   doFindSymbol() in your copy. Those methods usually maps directly to OS calls.
+ * - Adds the file to the project.
+ */
+class DynamicLibraryManager
+{
+public:
+  typedef void *Symbol;
+  typedef void *LibraryHandle;
+
+  /*! \brief Loads the specified library.
+   * \param libraryFileName Name of the library to load.
+   * \exception DynamicLibraryManagerException if a failure occurs while loading
+   *            the library (fail to found or load the library).
+   */
+  DynamicLibraryManager( const std::string &libraryFileName );
+
+  /// Releases the loaded library..
+  ~DynamicLibraryManager();
+
+  /*! \brief Returns a pointer on the specified symbol exported by the library.
+   * \param symbol Name of the symbol exported by the library.
+   * \return Pointer on the symbol. Should be casted to the actual type. Never \c NULL.
+   * \exception DynamicLibraryManagerException if the symbol is not found.
+   */
+  Symbol findSymbol( const std::string &symbol );
+
+private:
+  /*! Loads the specified library.
+   * \param libraryName Name of the library to load.
+   * \exception DynamicLibraryManagerException if a failure occurs while loading
+   *            the library (fail to found or load the library).
+   */
+  void loadLibrary( const std::string &libraryName );
+
+  /*! Releases the loaded library.
+   * 
+   * \warning Must NOT throw any exceptions (called from destructor).
+   */
+  void releaseLibrary();
+
+  /*! Loads the specified library.
+   * 
+   * May throw any exceptions (indicates failure).
+   * \param libraryName Name of the library to load.
+   * \return Handle of the loaded library. \c NULL indicates failure.
+   */
+  LibraryHandle doLoadLibrary( const std::string &libraryName );
+
+  /*! Releases the loaded library.
+   *
+   * The handle of the library to free is in \c m_libraryHandle. It is never
+   * \c NULL.
+   * \warning Must NOT throw any exceptions (called from destructor).
+   */
+  void doReleaseLibrary();
+
+  /*! Returns a pointer on the specified symbol exported by the library.
+   * 
+   * May throw any exceptions (indicates failure).
+   * \param symbol Name of the symbol exported by the library.
+   * \return Pointer on the symbol. \c NULL indicates failure.
+   */
+  Symbol doFindSymbol( const std::string &symbol );
+
+  /*! Returns detailed information about doLoadLibrary() failure.
+   *
+   * Called just after a failed call to doLoadLibrary() to get extra
+   * error information.
+   *
+   * \return Detailed information about the failure of the call to
+   *         doLoadLibrary() that just failed.
+   */
+  std::string getLastErrorDetail() const;
+
+  /// Prevents the use of the copy constructor.
+  DynamicLibraryManager( const DynamicLibraryManager &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const DynamicLibraryManager &copy );
+
+private:
+  LibraryHandle m_libraryHandle;
+  std::string m_libraryName;
+};
+
+
+CPPUNIT_NS_END
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
+
+#endif  // CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGER_H
diff --git a/dep/cppunit/include/cppunit/plugin/DynamicLibraryManagerException.h b/dep/cppunit/include/cppunit/plugin/DynamicLibraryManagerException.h
new file mode 100644
index 00000000000..11ebbd9da6e
--- /dev/null
+++ b/dep/cppunit/include/cppunit/plugin/DynamicLibraryManagerException.h
@@ -0,0 +1,53 @@
+#ifndef CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGEREXCEPTION_H
+#define CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGEREXCEPTION_H
+
+#include <cppunit/Portability.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+#include <stdexcept>
+#include <string>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Exception thrown by DynamicLibraryManager when a failure occurs.
+ *
+ * Use getCause() to know what function caused the failure.
+ *
+ */
+class DynamicLibraryManagerException : public std::runtime_error
+{
+public:
+  enum Cause
+  {
+    /// Failed to load the dynamic library
+    loadingFailed =0,
+    /// Symbol not found in the dynamic library
+    symbolNotFound
+  };
+
+  /// Failed to load the dynamic library or Symbol not found in the dynamic library.
+  DynamicLibraryManagerException( const std::string &libraryName,
+                                  const std::string &errorDetail,
+                                  Cause cause );
+
+  ~DynamicLibraryManagerException() throw()
+  {
+  }
+
+  Cause getCause() const;
+
+  const char *what() const throw();
+
+private:
+  std::string m_message;
+  Cause m_cause;
+};
+
+
+CPPUNIT_NS_END
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
+
+#endif  // CPPUNIT_PLUGIN_DYNAMICLIBRARYMANAGEREXCEPTION_H
diff --git a/dep/cppunit/include/cppunit/plugin/Makefile.am b/dep/cppunit/include/cppunit/plugin/Makefile.am
new file mode 100644
index 00000000000..5221a669384
--- /dev/null
+++ b/dep/cppunit/include/cppunit/plugin/Makefile.am
@@ -0,0 +1,9 @@
+libcppunitincludedir = $(includedir)/cppunit/plugin
+
+libcppunitinclude_HEADERS = \
+	DynamicLibraryManager.h \
+	DynamicLibraryManagerException.h \
+	TestPlugIn.h \
+	TestPlugInDefaultImpl.h \
+	PlugInManager.h \
+	PlugInParameters.h
diff --git a/dep/cppunit/include/cppunit/plugin/Makefile.in b/dep/cppunit/include/cppunit/plugin/Makefile.in
new file mode 100644
index 00000000000..c97e6e4d953
--- /dev/null
+++ b/dep/cppunit/include/cppunit/plugin/Makefile.in
@@ -0,0 +1,437 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# 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.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = include/cppunit/plugin
+DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
+	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
+	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
+	$(top_srcdir)/config/ac_cxx_rtti.m4 \
+	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
+	$(top_srcdir)/config/ac_dll.m4 \
+	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_cxx_have_isfinite.m4 \
+	$(top_srcdir)/config/bb_enable_doxygen.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libcppunitincludedir)"
+libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libcppunitinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@
+CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@
+CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@
+CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@
+CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@
+CPPUNIT_VERSION = @CPPUNIT_VERSION@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_dot = @enable_dot@
+enable_html_docs = @enable_html_docs@
+enable_latex_docs = @enable_latex_docs@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+libcppunitincludedir = $(includedir)/cppunit/plugin
+libcppunitinclude_HEADERS = \
+	DynamicLibraryManager.h \
+	DynamicLibraryManagerException.h \
+	TestPlugIn.h \
+	TestPlugInDefaultImpl.h \
+	PlugInManager.h \
+	PlugInParameters.h
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/cppunit/plugin/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  include/cppunit/plugin/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)"
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+uninstall-libcppunitincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libcppunitincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libcppunitincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libcppunitincludeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libcppunitincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-libcppunitincludeHEADERS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/dep/cppunit/include/cppunit/plugin/PlugInManager.h b/dep/cppunit/include/cppunit/plugin/PlugInManager.h
new file mode 100644
index 00000000000..6ecedc89b58
--- /dev/null
+++ b/dep/cppunit/include/cppunit/plugin/PlugInManager.h
@@ -0,0 +1,113 @@
+#ifndef CPPUNIT_PLUGIN_PLUGINMANAGER_H
+#define CPPUNIT_PLUGIN_PLUGINMANAGER_H
+
+#include <cppunit/Portability.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+#include <cppunit/plugin/PlugInParameters.h>
+struct CppUnitTestPlugIn;
+
+CPPUNIT_NS_BEGIN
+
+
+class DynamicLibraryManager;
+class TestResult;
+class XmlOutputter;
+
+
+/*! \brief Manges TestPlugIn.
+ */
+class CPPUNIT_API PlugInManager
+{
+public:
+  /*! Constructs a PlugInManager object.
+   */
+  PlugInManager();
+
+  /// Destructor.
+  virtual ~PlugInManager();
+
+  /*! \brief Loads the specified plug-in.
+   *
+   * After being loaded, the CppUnitTestPlugIn::initialize() is called.
+   *
+   * \param libraryFileName Name of the file that contains the TestPlugIn.
+   * \param parameters List of string passed to the plug-in.
+   * \return Pointer on the DynamicLibraryManager associated to the library.
+   *         Valid until the library is unloaded. Never \c NULL.
+   * \exception DynamicLibraryManagerException is thrown if an error occurs during loading.
+   */
+  void load( const std::string &libraryFileName,
+             const PlugInParameters &parameters = PlugInParameters() );
+
+  /*! \brief Unloads the specified plug-in.
+   * \param libraryFileName Name of the file that contains the TestPlugIn passed
+   *                        to a previous call to load().
+   */
+  void unload( const std::string &libraryFileName );
+
+  /*! \brief Gives a chance to each loaded plug-in to register TestListener.
+   *
+   * For each plug-in, call CppUnitTestPlugIn::addListener().
+   */
+  void addListener( TestResult *eventManager );
+
+  /*! \brief Gives a chance to each loaded plug-in to unregister TestListener.
+   * For each plug-in, call CppUnitTestPlugIn::removeListener().
+   */
+  void removeListener( TestResult *eventManager );
+
+  /*! \brief Provides a way for the plug-in to register some XmlOutputterHook.
+   */
+  void addXmlOutputterHooks( XmlOutputter *outputter );
+
+  /*! \brief Called when the XmlOutputter is destroyed.
+   * 
+   * Can be used to free some resources allocated by addXmlOutputterHooks().
+   */
+  void removeXmlOutputterHooks();
+
+protected:
+  /*! \brief (INTERNAL) Information about a specific plug-in.
+   */
+  struct PlugInInfo
+  {
+    std::string m_fileName;
+    DynamicLibraryManager *m_manager;
+    CppUnitTestPlugIn *m_interface;
+  };
+
+  /*! Unloads the specified plug-in.
+   * \param plugIn Information about the plug-in.
+   */
+  void unload( PlugInInfo &plugIn );
+
+private:
+  /// Prevents the use of the copy constructor.
+  PlugInManager( const PlugInManager &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const PlugInManager &copy );
+
+private:
+  typedef CppUnitDeque<PlugInInfo> PlugIns;
+  PlugIns m_plugIns;
+};
+
+
+CPPUNIT_NS_END
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
+
+
+#endif  // CPPUNIT_PLUGIN_PLUGINMANAGER_H
diff --git a/dep/cppunit/include/cppunit/plugin/PlugInParameters.h b/dep/cppunit/include/cppunit/plugin/PlugInParameters.h
new file mode 100644
index 00000000000..c67d0f1d24a
--- /dev/null
+++ b/dep/cppunit/include/cppunit/plugin/PlugInParameters.h
@@ -0,0 +1,36 @@
+#ifndef CPPUNIT_PLUGIN_PARAMETERS
+#define CPPUNIT_PLUGIN_PARAMETERS
+
+#include <cppunit/Portability.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+#include <cppunit/portability/CppUnitDeque.h>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+/*! \brief Test plug-ins parameters.
+ */
+class CPPUNIT_API PlugInParameters
+{
+public:
+  /// Constructs plug-in parameters from the specified command-line.
+  PlugInParameters( const std::string &commandLine = "" );
+
+  virtual ~PlugInParameters();
+
+  /// Returns the command line that was passed on construction.
+  std::string getCommandLine() const;
+
+private:
+  std::string m_commandLine;
+};
+
+
+CPPUNIT_NS_END
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
+
+
+#endif // CPPUNIT_PLUGIN_PARAMETERS
diff --git a/dep/cppunit/include/cppunit/plugin/TestPlugIn.h b/dep/cppunit/include/cppunit/plugin/TestPlugIn.h
new file mode 100644
index 00000000000..1c9b929a5f1
--- /dev/null
+++ b/dep/cppunit/include/cppunit/plugin/TestPlugIn.h
@@ -0,0 +1,200 @@
+#ifndef CPPUNIT_PLUGIN_TESTPLUGIN
+#define CPPUNIT_PLUGIN_TESTPLUGIN
+
+#include <cppunit/Portability.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+#include <cppunit/plugin/PlugInParameters.h>
+
+CPPUNIT_NS_BEGIN
+
+
+class Test;
+class TestFactoryRegistry;
+class TestResult;
+class XmlOutputter;
+
+CPPUNIT_NS_END
+
+/*! \file
+ */
+
+
+/*! \brief Test plug-in interface.
+ * \ingroup WritingTestPlugIn
+ *
+ * This class define the interface implemented by test plug-in. A pointer to that
+ * interface is returned by the function exported by the test plug-in.
+ *
+ * Plug-in are loaded/unloaded by PlugInManager. When a plug-in is loaded, 
+ * initialize() is called. Before unloading the plug-in, the PlugInManager
+ * call uninitialize().
+ *
+ * addListener() and removeListener() are called respectively before and after
+ * the test run.
+ *
+ * addXmlOutputterHooks() and removeXmlOutputterHooks() are called respectively
+ * before and after writing the XML output using a XmlOutputter.
+ *
+ * \see CPPUNIT_PLUGIN_IMPLEMENT, CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL
+ * \see CppUnit::TestPlugInDefaultImpl, CppUnit::XmlOutputter.
+ */
+struct CppUnitTestPlugIn
+{
+  /*! \brief Called just after loading the dynamic library. 
+   *
+   * Override this method to add additional suite to the registry, though this
+   * is preferably done using the macros (CPPUNIT_TEST_SUITE_REGISTRATION...).
+   * If you are creating a custom listener to extends the plug-in runner,
+   * you can use this to configure the listener using the \a parameters.
+   *
+   * You could also use the parameters to specify some global parameter, such
+   * as test datas location, database name...
+   *
+   * N.B.: Parameters interface is not define yet, and the plug-in runner does
+   * not yet support plug-in parameter.
+   */
+  virtual void initialize( CPPUNIT_NS::TestFactoryRegistry *registry,
+                           const CPPUNIT_NS::PlugInParameters &parameters ) =0;
+
+  /*! \brief Gives a chance to the plug-in to register TestListener.
+   * 
+   * Override this method to add a TestListener for the test run. This is useful
+   * if you are writing a custom TestListener, but also if you need to
+   * setUp some global resource: listen to TestListener::startTestRun(), 
+   * and TestListener::endTestRun().
+   */
+  virtual void addListener( CPPUNIT_NS::TestResult *eventManager ) =0;
+
+  /*! \brief Gives a chance to the plug-in to remove its registered TestListener.
+   *
+   * Override this method to remove a TestListener that has been added.
+   */
+  virtual void removeListener( CPPUNIT_NS::TestResult *eventManager ) =0;
+
+  /*! \brief Provides a way for the plug-in to register some XmlOutputterHook.
+   */
+  virtual void addXmlOutputterHooks( CPPUNIT_NS::XmlOutputter *outputter ) =0;
+
+  /*! \brief Called when the XmlOutputter is destroyed.
+   * 
+   * Can be used to free some resources allocated by addXmlOutputterHooks().
+   */
+  virtual void removeXmlOutputterHooks() = 0;
+
+  /*! \brief Called just before unloading the dynamic library.
+   * 
+   * Override this method to unregister test factory added in initialize().
+   * This is necessary to keep the TestFactoryRegistry 'clean'. When
+   * the plug-in is unloaded from memory, the TestFactoryRegistry will hold
+   * reference on test that are no longer available if they are not 
+   * unregistered.
+   */
+  virtual void uninitialize( CPPUNIT_NS::TestFactoryRegistry *registry ) =0;
+
+  virtual ~CppUnitTestPlugIn() {}
+};
+
+
+
+/*! \brief Name of the function exported by a test plug-in.
+ * \ingroup WritingTestPlugIn
+ *
+ * The signature of the exported function is:
+ * \code
+ * CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void);
+ * \endcode
+ */
+#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn
+
+/*! \brief Type of the function exported by a plug-in.
+ * \ingroup WritingTestPlugIn
+ */
+typedef CppUnitTestPlugIn *(*TestPlugInSignature)();
+
+
+/*! \brief Implements the function exported by the test plug-in
+ * \ingroup WritingTestPlugIn
+ */
+#define CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( TestPlugInInterfaceType )       \
+  CPPUNIT_PLUGIN_EXPORT CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void)  \
+  {                                                                            \
+    static TestPlugInInterfaceType plugIn;                                     \
+    return &plugIn;                                                            \
+  }                                                                            \
+  typedef char __CppUnitPlugInExportFunctionDummyTypeDef  // dummy typedef so it can end with ';'
+
+
+// Note: This include should remain after definition of CppUnitTestPlugIn
+#include <cppunit/plugin/TestPlugInDefaultImpl.h>
+
+
+/*! \def CPPUNIT_PLUGIN_IMPLEMENT_MAIN()
+ * \brief Implements the 'main' function for the plug-in.
+ *
+ * This macros implements the main() function for dynamic library.
+ * For example, WIN32 requires a DllMain function, while some Unix 
+ * requires a main() function. This macros takes care of the implementation.
+ */
+
+// Win32
+#if defined(CPPUNIT_HAVE_WIN32_DLL_LOADER)
+#if !defined(APIENTRY)
+#define WIN32_LEAN_AND_MEAN 
+#define NOGDI
+#define NOUSER
+#define NOKERNEL
+#define NOSOUND
+#define NOMINMAX
+#define BLENDFUNCTION void    // for mingw & gcc
+#include <windows.h>
+#endif
+#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
+  BOOL APIENTRY DllMain( HANDLE hModule,              \
+                         DWORD  ul_reason_for_call,   \
+                         LPVOID lpReserved )          \
+  {                                                   \
+      return TRUE;                                    \
+  }                                                   \
+  typedef char __CppUnitPlugInImplementMainDummyTypeDef
+
+// Unix
+#elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
+#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
+  int main( int argc, char *argv[] )                  \
+  {                                                   \
+    return 0;                                         \
+  }                                                   \
+  typedef char __CppUnitPlugInImplementMainDummyTypeDef
+
+
+// Other
+#else     // other platforms don't require anything specifics
+#endif
+
+
+
+/*! \brief Implements and exports the test plug-in interface.
+ * \ingroup WritingTestPlugIn
+ *
+ * This macro exports the test plug-in function using the subclass, 
+ * and implements the 'main' function for the plug-in using 
+ * CPPUNIT_PLUGIN_IMPLEMENT_MAIN().
+ *
+ * When using this macro, CppUnit must be linked as a DLL (shared library).
+ * Otherwise, tests registered to the TestFactoryRegistry in the DLL will 
+ * not be visible to the DllPlugInTester.
+ *
+ * \see CppUnitTestPlugIn
+ * \see CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL(), CPPUNIT_PLUGIN_IMPLEMENT_MAIN().
+ */
+#define CPPUNIT_PLUGIN_IMPLEMENT()                                          \
+  CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( CPPUNIT_NS::TestPlugInDefaultImpl );  \
+  CPPUNIT_PLUGIN_IMPLEMENT_MAIN()
+
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
+
+
+#endif // CPPUNIT_PLUGIN_TESTPLUGIN
diff --git a/dep/cppunit/include/cppunit/plugin/TestPlugInDefaultImpl.h b/dep/cppunit/include/cppunit/plugin/TestPlugInDefaultImpl.h
new file mode 100644
index 00000000000..fa4b8078f93
--- /dev/null
+++ b/dep/cppunit/include/cppunit/plugin/TestPlugInDefaultImpl.h
@@ -0,0 +1,52 @@
+#ifndef CPPUNIT_PLUGIN_TESTPLUGINADAPTER
+#define CPPUNIT_PLUGIN_TESTPLUGINADAPTER
+
+#include <cppunit/Portability.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+#include <cppunit/plugin/TestPlugIn.h>
+
+CPPUNIT_NS_BEGIN
+
+
+class TestSuite;
+
+
+/*! \brief Default implementation of test plug-in interface.
+ * \ingroup WritingTestPlugIn
+ *
+ * Override getSuiteName() to specify the suite name. Default is "All Tests".
+ *
+ * CppUnitTestPlugIn::getTestSuite() returns a suite that contains
+ * all the test registered to the default test factory registry 
+ * ( TestFactoryRegistry::getRegistry() ).
+ *
+ */
+class CPPUNIT_API TestPlugInDefaultImpl : public CppUnitTestPlugIn
+{
+public:
+  TestPlugInDefaultImpl();
+
+  virtual ~TestPlugInDefaultImpl();
+
+  void initialize( TestFactoryRegistry *registry,
+                   const PlugInParameters &parameters );
+
+  void addListener( TestResult *eventManager );
+
+  void removeListener( TestResult *eventManager );
+
+  void addXmlOutputterHooks( XmlOutputter *outputter );
+
+  void removeXmlOutputterHooks();
+
+  void uninitialize( TestFactoryRegistry *registry );
+};
+
+
+CPPUNIT_NS_END
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
+
+#endif // CPPUNIT_PLUGIN_TESTPLUGINADAPTER
diff --git a/dep/cppunit/include/cppunit/portability/CppUnitDeque.h b/dep/cppunit/include/cppunit/portability/CppUnitDeque.h
new file mode 100644
index 00000000000..bbab21f56c2
--- /dev/null
+++ b/dep/cppunit/include/cppunit/portability/CppUnitDeque.h
@@ -0,0 +1,25 @@
+#ifndef CPPUNIT_PORTABILITY_CPPUNITDEQUE_H
+#define CPPUNIT_PORTABILITY_CPPUNITDEQUE_H
+
+// The technic used is similar to the wrapper of STLPort.
+ 
+#include <cppunit/Portability.h>
+#include <deque>
+
+
+#if CPPUNIT_STD_NEED_ALLOCATOR
+
+template<class T>
+class CppUnitDeque : public std::deque<T,CPPUNIT_STD_ALLOCATOR>
+{
+public:
+};
+
+#else // CPPUNIT_STD_NEED_ALLOCATOR
+
+#define CppUnitDeque std::deque
+
+#endif
+
+#endif // CPPUNIT_PORTABILITY_CPPUNITDEQUE_H
+
diff --git a/dep/cppunit/include/cppunit/portability/CppUnitMap.h b/dep/cppunit/include/cppunit/portability/CppUnitMap.h
new file mode 100644
index 00000000000..0cdc723a207
--- /dev/null
+++ b/dep/cppunit/include/cppunit/portability/CppUnitMap.h
@@ -0,0 +1,29 @@
+#ifndef CPPUNIT_PORTABILITY_CPPUNITMAP_H
+#define CPPUNIT_PORTABILITY_CPPUNITMAP_H
+
+// The technic used is similar to the wrapper of STLPort.
+ 
+#include <cppunit/Portability.h>
+#include <functional>
+#include <map>
+
+
+#if CPPUNIT_STD_NEED_ALLOCATOR
+
+template<class Key, class T>
+class CppUnitMap : public std::map<Key
+                                  ,T
+                                  ,std::less<Key>
+                                  ,CPPUNIT_STD_ALLOCATOR>
+{
+public:
+};
+
+#else // CPPUNIT_STD_NEED_ALLOCATOR
+
+#define CppUnitMap std::map
+
+#endif
+
+#endif // CPPUNIT_PORTABILITY_CPPUNITMAP_H
+
diff --git a/dep/cppunit/include/cppunit/portability/CppUnitSet.h b/dep/cppunit/include/cppunit/portability/CppUnitSet.h
new file mode 100644
index 00000000000..18b8662ebfd
--- /dev/null
+++ b/dep/cppunit/include/cppunit/portability/CppUnitSet.h
@@ -0,0 +1,28 @@
+#ifndef CPPUNIT_PORTABILITY_CPPUNITSET_H
+#define CPPUNIT_PORTABILITY_CPPUNITSET_H
+
+// The technic used is similar to the wrapper of STLPort.
+ 
+#include <cppunit/Portability.h>
+#include <functional>
+#include <set>
+
+
+#if CPPUNIT_STD_NEED_ALLOCATOR
+
+template<class T>
+class CppUnitSet : public std::set<T
+                                  ,std::less<T>
+                                  ,CPPUNIT_STD_ALLOCATOR>
+{
+public:
+};
+
+#else // CPPUNIT_STD_NEED_ALLOCATOR
+
+#define CppUnitSet std::set
+
+#endif
+
+#endif // CPPUNIT_PORTABILITY_CPPUNITSET_H
+
diff --git a/dep/cppunit/include/cppunit/portability/CppUnitStack.h b/dep/cppunit/include/cppunit/portability/CppUnitStack.h
new file mode 100644
index 00000000000..bc7785b0375
--- /dev/null
+++ b/dep/cppunit/include/cppunit/portability/CppUnitStack.h
@@ -0,0 +1,26 @@
+#ifndef CPPUNIT_PORTABILITY_CPPUNITSTACK_H
+#define CPPUNIT_PORTABILITY_CPPUNITSTACK_H
+
+// The technic used is similar to the wrapper of STLPort.
+ 
+#include <cppunit/Portability.h>
+#include <deque>
+#include <stack>
+
+
+#if CPPUNIT_STD_NEED_ALLOCATOR
+
+template<class T>
+class CppUnitStack : public std::stack<T
+                                      ,std::deque<T,CPPUNIT_STD_ALLOCATOR> >
+{
+public:
+};
+
+#else // CPPUNIT_STD_NEED_ALLOCATOR
+
+#define CppUnitStack std::stack
+
+#endif
+
+#endif // CPPUNIT_PORTABILITY_CPPUNITSTACK_H
\ No newline at end of file
diff --git a/dep/cppunit/include/cppunit/portability/CppUnitVector.h b/dep/cppunit/include/cppunit/portability/CppUnitVector.h
new file mode 100644
index 00000000000..6666a63b0d0
--- /dev/null
+++ b/dep/cppunit/include/cppunit/portability/CppUnitVector.h
@@ -0,0 +1,25 @@
+#ifndef CPPUNIT_PORTABILITY_CPPUNITVECTOR_H
+#define CPPUNIT_PORTABILITY_CPPUNITVECTOR_H
+
+// The technic used is similar to the wrapper of STLPort.
+ 
+#include <cppunit/Portability.h>
+#include <vector>
+
+
+#if CPPUNIT_STD_NEED_ALLOCATOR
+
+template<class T>
+class CppUnitVector : public std::vector<T,CPPUNIT_STD_ALLOCATOR>
+{
+public:
+};
+
+#else // CPPUNIT_STD_NEED_ALLOCATOR
+
+#define CppUnitVector std::vector
+
+#endif
+
+#endif // CPPUNIT_PORTABILITY_CPPUNITVECTOR_H
+
diff --git a/dep/cppunit/include/cppunit/portability/FloatingPoint.h b/dep/cppunit/include/cppunit/portability/FloatingPoint.h
new file mode 100644
index 00000000000..e8c91b3f5c4
--- /dev/null
+++ b/dep/cppunit/include/cppunit/portability/FloatingPoint.h
@@ -0,0 +1,54 @@
+#ifndef CPPUNIT_PORTABILITY_FLOATINGPOINT_H_INCLUDED
+#define CPPUNIT_PORTABILITY_FLOATINGPOINT_H_INCLUDED
+
+#include <cppunit/Portability.h>
+#include <math.h>
+
+CPPUNIT_NS_BEGIN
+
+/// \brief Tests if a floating-point is a NaN.
+// According to IEEE-754 floating point standard, 
+// (see e.g. page 8 of
+// http://www.cs.berkeley.edu/~wkahan/ieee754status/ieee754.ps) 
+// all comparisons with NaN are false except "x != x", which is true.
+//
+// At least Microsoft Visual Studio 6 is known not to implement this test correctly.
+// It emits the following code to test equality:
+//  fcomp       qword ptr [nan]
+//  fnstsw      ax                        // copie fp (floating-point) status register to ax
+//  test        ah,40h                    // test bit 14 of ax (0x4000) => C3 of fp status register
+// According to the following documentation on the x86 floating point status register,
+// the C2 bit should be tested to test for NaN value. 
+// http://webster.cs.ucr.edu/AoA/Windows/HTML/RealArithmetic.html#1000117
+// In Microsoft Visual Studio 2003 & 2005, the test is implemented with:
+//  test        ah,44h         // Visual Studio 2005 test both C2 & C3...
+//
+// To work around this, a NaN is assumed to be detected if no strict ordering is found.
+inline bool floatingPointIsUnordered( double x )
+{
+   // x != x will detect a NaN on conformant platform
+   // (2.0 < x  &&  x < 1.0) will detect a NaN on non conformant platform:
+   // => no ordering can be found for x.
+   return  (x != x) ||  (2.0 < x  &&  x < 1.0);
+}
+
+
+/// \brief Tests if a floating-point is finite.
+/// @return \c true if x is neither a NaN, nor +inf, nor -inf, \c false otherwise.
+inline int floatingPointIsFinite( double x )
+{
+#if defined(CPPUNIT_HAVE_ISFINITE)
+   return isfinite( x );
+#elif defined(CPPUNIT_HAVE_FINITE)
+   return finite( x );
+#elif defined(CPPUNIT_HAVE__FINITE)
+   return _finite(x);
+#else
+   double testInf = x * 0.0;  // Produce 0.0 if x is finite, a NaN otherwise.
+   return testInf == 0.0  &&  !floatingPointIsUnordered(testInf);
+#endif
+}
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_PORTABILITY_FLOATINGPOINT_H_INCLUDED
diff --git a/dep/cppunit/include/cppunit/portability/Makefile.am b/dep/cppunit/include/cppunit/portability/Makefile.am
new file mode 100644
index 00000000000..2caeb321a52
--- /dev/null
+++ b/dep/cppunit/include/cppunit/portability/Makefile.am
@@ -0,0 +1,10 @@
+libcppunitincludedir = $(includedir)/cppunit/portability
+
+libcppunitinclude_HEADERS = \
+	CppUnitDeque.h  \
+	CppUnitMap.h    \
+	CppUnitSet.h    \
+	CppUnitStack.h  \
+	CppUnitVector.h \
+   FloatingPoint.h \
+   Stream.h
diff --git a/dep/cppunit/include/cppunit/portability/Makefile.in b/dep/cppunit/include/cppunit/portability/Makefile.in
new file mode 100644
index 00000000000..80278e97659
--- /dev/null
+++ b/dep/cppunit/include/cppunit/portability/Makefile.in
@@ -0,0 +1,438 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# 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.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = include/cppunit/portability
+DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
+	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
+	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
+	$(top_srcdir)/config/ac_cxx_rtti.m4 \
+	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
+	$(top_srcdir)/config/ac_dll.m4 \
+	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_cxx_have_isfinite.m4 \
+	$(top_srcdir)/config/bb_enable_doxygen.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libcppunitincludedir)"
+libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libcppunitinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@
+CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@
+CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@
+CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@
+CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@
+CPPUNIT_VERSION = @CPPUNIT_VERSION@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_dot = @enable_dot@
+enable_html_docs = @enable_html_docs@
+enable_latex_docs = @enable_latex_docs@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+libcppunitincludedir = $(includedir)/cppunit/portability
+libcppunitinclude_HEADERS = \
+	CppUnitDeque.h  \
+	CppUnitMap.h    \
+	CppUnitSet.h    \
+	CppUnitStack.h  \
+	CppUnitVector.h \
+   FloatingPoint.h \
+   Stream.h
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/cppunit/portability/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  include/cppunit/portability/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)"
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+uninstall-libcppunitincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libcppunitincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libcppunitincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libcppunitincludeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libcppunitincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-libcppunitincludeHEADERS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/dep/cppunit/include/cppunit/portability/Stream.h b/dep/cppunit/include/cppunit/portability/Stream.h
new file mode 100644
index 00000000000..e9beb8c1b29
--- /dev/null
+++ b/dep/cppunit/include/cppunit/portability/Stream.h
@@ -0,0 +1,347 @@
+#ifndef CPPUNIT_PORTABILITY_STREAM_H_INCLUDED
+#define CPPUNIT_PORTABILITY_STREAM_H_INCLUDED
+
+// This module define:
+// Type CppUT::Stream (either std::stream or a custom type)
+// Type CppUT::OStringStream (eitjer std::ostringstream, older alternate or a custom type)
+// Functions stdCOut() & stdCErr() which returns a reference on cout & cerr stream (or our
+// custom stream).
+
+#include <cppunit/Portability.h>
+
+
+#if defined( CPPUNIT_NO_STREAM )
+
+#include <string>
+#include <stdio.h>
+#include <string.h>
+
+CPPUNIT_NS_BEGIN
+
+class StreamBuffer
+{
+public:
+   virtual ~StreamBuffer() {}
+
+   virtual void write( const char *text, unsigned int length ) = 0;
+
+   virtual void flush() {}
+};
+
+
+class StringStreamBuffer : public StreamBuffer
+{
+public:
+   std::string str() const
+   {
+      return str_;
+   }
+
+public: // overridden from StreamBuffer
+   void write( const char *text, unsigned int length )
+   {
+      str_.append( text, length );
+   }
+
+private:
+   std::string str_;
+};
+
+
+class FileStreamBuffer : public StreamBuffer
+{
+public:
+   FileStreamBuffer( FILE *file )
+      : file_( file )
+   {
+   }
+
+   FILE *file() const
+   {
+      return file_;
+   }
+
+public: // overridden from StreamBuffer
+   void write( const char *text, unsigned int length )
+   {
+      if ( file_ )
+         fwrite( text, sizeof(char), length, file_ );
+   }
+
+   void flush() 
+   {
+      if ( file_ )
+         fflush( file_ );
+   }
+
+private:
+   FILE *file_;
+};
+
+
+class OStream
+{
+public:
+   OStream()
+      : buffer_( 0 )
+   {
+   }
+
+   OStream( StreamBuffer *buffer )
+      : buffer_( buffer )
+   {
+   }
+
+   virtual ~OStream()
+   {
+     flush();
+   }
+
+   OStream &flush()
+   {
+	   if ( buffer_ )
+		    buffer_->flush();
+	   return *this;
+   }
+
+   void setBuffer( StreamBuffer *buffer )
+   {
+      buffer_ = buffer;
+   }
+
+   OStream &write( const char *text, unsigned int length )
+   {
+      if ( buffer_ )
+         buffer_->write( text, length );
+      return *this;
+   }
+
+   OStream &write( const char *text )
+   {
+      return write( text, strlen(text) );
+   }
+
+   OStream &operator <<( bool v )
+   {
+      const char *out = v ? "true" : "false";
+      return write( out );
+   }
+
+   OStream &operator <<( short v )
+   {
+      char buffer[64];
+      sprintf( buffer, "%hd", v );
+      return write( buffer );
+   }
+
+   OStream &operator <<( unsigned short v )
+   {
+      char buffer[64];
+      sprintf( buffer, "%hu", v );
+      return write( buffer );
+   }
+
+   OStream &operator <<( int v )
+   {
+      char buffer[64];
+      sprintf( buffer, "%d", v );
+      return write( buffer );
+   }
+
+   OStream &operator <<( unsigned int v )
+   {
+      char buffer[64];
+      sprintf( buffer, "%u", v );
+      return write( buffer );
+   }
+
+   OStream &operator <<( long v )
+   {
+      char buffer[64];
+      sprintf( buffer, "%ld", v );
+      return write( buffer );
+   }
+
+   OStream &operator <<( unsigned long v )
+   {
+      char buffer[64];
+      sprintf( buffer, "%lu", v );
+      return write( buffer );
+   }
+
+   OStream &operator <<( float v )
+   {
+      char buffer[128];
+      sprintf( buffer, "%.16g", double(v) );
+      return write( buffer );
+   }
+
+   OStream &operator <<( double v )
+   {
+      char buffer[128];
+      sprintf( buffer, "%.16g", v );
+      return write( buffer );
+   }
+
+   OStream &operator <<( long double v )
+   {
+      char buffer[128];
+      sprintf( buffer, "%.16g", double(v) );
+      return write( buffer );
+   }
+
+   OStream &operator <<( const void *v )
+   {
+      char buffer[64];
+      sprintf( buffer, "%p", v );
+      return write( buffer );
+   }
+
+   OStream &operator <<( const char *v )
+   {
+      return write( v ? v : "NULL" );
+   }
+
+   OStream &operator <<( char c )
+   {
+      char buffer[16];
+      sprintf( buffer, "%c", c );
+      return write( buffer );
+   }
+
+   OStream &operator <<( const std::string &s )
+   {
+      return write( s.c_str(), s.length() );
+   }
+
+private:
+   StreamBuffer *buffer_;
+};
+
+
+class OStringStream : public OStream
+{
+public:
+	OStringStream()
+		: OStream( &buffer_ )
+	{
+	}
+
+	std::string str() const
+	{
+		return buffer_.str();
+	}
+
+private:
+	StringStreamBuffer buffer_;
+};
+
+
+class OFileStream : public OStream
+{
+public:
+   OFileStream( FILE *file )
+      : OStream( &buffer_ )
+      , buffer_( file )
+      , ownFile_( false )
+   {
+   }
+
+   OFileStream( const char *path )
+      : OStream( &buffer_ )
+      , buffer_( fopen( path, "wt" ) )
+      , ownFile_( true )
+   {
+   }
+
+   virtual ~OFileStream()
+   {
+      if ( ownFile_  &&  buffer_.file() )
+         fclose( buffer_.file() );
+   }
+
+private:
+   FileStreamBuffer buffer_;
+   bool ownFile_;
+};
+
+inline OStream &stdCOut() 
+{
+   static OFileStream stream( stdout );
+   return stream;
+}
+
+inline OStream &stdCErr() 
+{
+   static OFileStream stream( stderr );
+   return stream;
+}
+
+CPPUNIT_NS_END
+
+#elif CPPUNIT_HAVE_SSTREAM // #if defined( CPPUNIT_NO_STREAM )
+# include <sstream>
+# include <fstream>
+
+    CPPUNIT_NS_BEGIN
+    typedef std::ostringstream OStringStream;      // The standard C++ way
+    typedef std::ofstream OFileStream;
+    CPPUNIT_NS_END
+
+
+#elif CPPUNIT_HAVE_CLASS_STRSTREAM
+# include <string>
+# if CPPUNIT_HAVE_STRSTREAM
+#   include <strstream>
+# else // CPPUNIT_HAVE_STRSTREAM
+#  include <strstream.h>
+# endif // CPPUNIT_HAVE_CLASS_STRSTREAM
+
+    CPPUNIT_NS_BEGIN
+
+    class OStringStream : public std::ostrstream 
+    {
+    public:
+        std::string str()
+        {
+//            (*this) << '\0';
+//            std::string msg(std::ostrstream::str());
+//            std::ostrstream::freeze(false);
+//            return msg;
+// Alternative implementation that don't rely on freeze which is not
+// available on some platforms:
+            return std::string( std::ostrstream::str(), pcount() );
+        }
+    };
+
+    CPPUNIT_NS_END
+#else // CPPUNIT_HAVE_CLASS_STRSTREAM
+#   error Cannot define CppUnit::OStringStream.
+#endif // #if defined( CPPUNIT_NO_STREAM )
+
+
+
+#if !defined( CPPUNIT_NO_STREAM )
+
+#include <iostream>
+
+    CPPUNIT_NS_BEGIN
+
+    typedef std::ostream OStream;
+
+    inline OStream &stdCOut() 
+    {
+        return std::cout;
+    }
+
+    inline OStream &stdCErr() 
+    {
+       return std::cerr;
+    }
+
+    CPPUNIT_NS_END
+   
+#endif // #if !defined( CPPUNIT_NO_STREAM )
+
+#endif // CPPUNIT_PORTABILITY_STREAM_H_INCLUDED
+
diff --git a/dep/cppunit/include/cppunit/tools/Algorithm.h b/dep/cppunit/include/cppunit/tools/Algorithm.h
new file mode 100644
index 00000000000..e5746a2bf50
--- /dev/null
+++ b/dep/cppunit/include/cppunit/tools/Algorithm.h
@@ -0,0 +1,23 @@
+#ifndef CPPUNIT_TOOLS_ALGORITHM_H_INCLUDED
+#define CPPUNIT_TOOLS_ALGORITHM_H_INCLUDED
+
+#include <cppunit/Portability.h>
+
+CPPUNIT_NS_BEGIN
+
+template<class SequenceType, class ValueType>
+void
+removeFromSequence( SequenceType &sequence, 
+                    const ValueType &valueToRemove )
+{
+   for ( unsigned int index =0; index < sequence.size(); ++index )
+   {
+      if ( sequence[ index ] == valueToRemove )
+         sequence.erase( sequence.begin() + index );
+   }
+}
+
+CPPUNIT_NS_END
+
+
+#endif // CPPUNIT_TOOLS_ALGORITHM_H_INCLUDED
diff --git a/dep/cppunit/include/cppunit/tools/Makefile.am b/dep/cppunit/include/cppunit/tools/Makefile.am
new file mode 100644
index 00000000000..8ce080867c3
--- /dev/null
+++ b/dep/cppunit/include/cppunit/tools/Makefile.am
@@ -0,0 +1,7 @@
+libcppunitincludedir = $(includedir)/cppunit/tools
+
+libcppunitinclude_HEADERS = \
+	Algorithm.h		\
+	StringTools.h \
+	XmlElement.h \
+	XmlDocument.h
\ No newline at end of file
diff --git a/dep/cppunit/include/cppunit/tools/Makefile.in b/dep/cppunit/include/cppunit/tools/Makefile.in
new file mode 100644
index 00000000000..5b7d3e6c1f4
--- /dev/null
+++ b/dep/cppunit/include/cppunit/tools/Makefile.in
@@ -0,0 +1,435 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# 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.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = include/cppunit/tools
+DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
+	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
+	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
+	$(top_srcdir)/config/ac_cxx_rtti.m4 \
+	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
+	$(top_srcdir)/config/ac_dll.m4 \
+	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_cxx_have_isfinite.m4 \
+	$(top_srcdir)/config/bb_enable_doxygen.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libcppunitincludedir)"
+libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libcppunitinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@
+CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@
+CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@
+CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@
+CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@
+CPPUNIT_VERSION = @CPPUNIT_VERSION@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_dot = @enable_dot@
+enable_html_docs = @enable_html_docs@
+enable_latex_docs = @enable_latex_docs@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+libcppunitincludedir = $(includedir)/cppunit/tools
+libcppunitinclude_HEADERS = \
+	Algorithm.h		\
+	StringTools.h \
+	XmlElement.h \
+	XmlDocument.h
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/cppunit/tools/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  include/cppunit/tools/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)"
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+uninstall-libcppunitincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libcppunitincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libcppunitincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libcppunitincludeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libcppunitincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-libcppunitincludeHEADERS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/dep/cppunit/include/cppunit/tools/StringTools.h b/dep/cppunit/include/cppunit/tools/StringTools.h
new file mode 100644
index 00000000000..7a6b6d710df
--- /dev/null
+++ b/dep/cppunit/include/cppunit/tools/StringTools.h
@@ -0,0 +1,34 @@
+#ifndef CPPUNIT_TOOLS_STRINGTOOLS_H
+#define CPPUNIT_TOOLS_STRINGTOOLS_H
+
+#include <cppunit/Portability.h>
+#include <string>
+#include <cppunit/portability/CppUnitVector.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! \brief Tool functions to manipulate string.
+ */
+struct StringTools
+{
+
+  typedef CppUnitVector<std::string> Strings;
+
+  static std::string CPPUNIT_API toString( int value );
+
+  static std::string CPPUNIT_API toString( double value );
+
+  static Strings CPPUNIT_API split( const std::string &text, 
+                                    char separator );
+
+  static std::string CPPUNIT_API wrap( const std::string &text,
+                                       int wrapColumn = CPPUNIT_WRAP_COLUMN );
+
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_TOOLS_STRINGTOOLS_H
diff --git a/dep/cppunit/include/cppunit/tools/XmlDocument.h b/dep/cppunit/include/cppunit/tools/XmlDocument.h
new file mode 100644
index 00000000000..4ee73257ada
--- /dev/null
+++ b/dep/cppunit/include/cppunit/tools/XmlDocument.h
@@ -0,0 +1,86 @@
+#ifndef CPPUNIT_TOOLS_XMLDOCUMENT_H
+#define CPPUNIT_TOOLS_XMLDOCUMENT_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+#include <string>
+
+
+CPPUNIT_NS_BEGIN
+
+
+class XmlElement;
+
+
+/*! \brief A XML Document.
+ *
+ * A XmlDocument represents a XML file. It holds a pointer on the root XmlElement
+ * of the document. It also holds the encoding and style sheet used.
+ *
+ * By default, the XML document is stand-alone and tagged with enconding "ISO-8859-1".
+ */
+class CPPUNIT_API XmlDocument
+{
+public:
+  /*! \brief Constructs a XmlDocument object.
+   * \param encoding Encoding used in the XML file (default is Latin-1, ISO-8859-1 ). 
+   * \param styleSheet Name of the XSL style sheet file used. If empty then no
+   *                   style sheet will be specified in the output.
+   */
+  XmlDocument( const std::string &encoding = "",
+               const std::string &styleSheet = "" );
+
+  /// Destructor.
+  virtual ~XmlDocument();
+
+  std::string encoding() const;
+  void setEncoding( const std::string &encoding = "" );
+  
+  std::string styleSheet() const;
+  void setStyleSheet( const std::string &styleSheet = "" );
+
+  bool standalone() const;
+
+  /*! \brief set the output document as standalone or not.
+   *
+   *  For the output document, specify wether it's a standalone XML
+   *  document, or not.
+   *
+   *  \param standalone if true, the output will be specified as standalone.
+   *         if false, it will be not.
+   */
+  void setStandalone( bool standalone );
+ 
+  void setRootElement( XmlElement *rootElement );
+  XmlElement &rootElement() const;
+
+  std::string toString() const;
+
+private:
+  /// Prevents the use of the copy constructor.
+  XmlDocument( const XmlDocument &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const XmlDocument &copy );
+
+protected:
+  std::string m_encoding;
+  std::string m_styleSheet;
+  XmlElement *m_rootElement;
+  bool m_standalone;
+};
+
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_TOOLS_XMLDOCUMENT_H
diff --git a/dep/cppunit/include/cppunit/tools/XmlElement.h b/dep/cppunit/include/cppunit/tools/XmlElement.h
new file mode 100644
index 00000000000..0b36bd23884
--- /dev/null
+++ b/dep/cppunit/include/cppunit/tools/XmlElement.h
@@ -0,0 +1,149 @@
+#ifndef CPPUNIT_TOOLS_XMLELEMENT_H
+#define CPPUNIT_TOOLS_XMLELEMENT_H
+
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+#include <cppunit/portability/CppUnitDeque.h>
+#include <string>
+
+
+CPPUNIT_NS_BEGIN
+
+
+class XmlElement;
+
+#if CPPUNIT_NEED_DLL_DECL
+//  template class CPPUNIT_API std::deque<XmlElement *>;
+#endif
+
+
+/*! \brief A XML Element.
+ * 
+ * A XML element has:
+ * - a name, specified on construction,
+ * - a content, specified on construction (may be empty),
+ * - zero or more attributes, added with addAttribute(),
+ * - zero or more child elements, added with addElement().
+ */
+class CPPUNIT_API XmlElement
+{
+public:
+  /*! \brief Constructs an element with the specified name and string content.
+   * \param elementName Name of the element. Must not be empty.
+   * \param content Content of the element.
+   */
+  XmlElement( std::string elementName,
+              std::string content ="" );
+
+  /*! \brief Constructs an element with the specified name and numeric content.
+   * \param elementName Name of the element. Must not be empty.
+   * \param numericContent Content of the element.
+   */
+  XmlElement( std::string elementName,
+              int numericContent );
+
+  /*! \brief Destructs the element and its child elements.
+   */
+  virtual ~XmlElement();
+
+  /*! \brief Returns the name of the element.
+   * \return Name of the element.
+   */
+  std::string name() const;
+
+  /*! \brief Returns the content of the element.
+   * \return Content of the element.
+   */
+  std::string content() const;
+
+  /*! \brief Sets the name of the element.
+   * \param name New name for the element.
+   */
+  void setName( const std::string &name );
+
+  /*! \brief Sets the content of the element.
+   * \param content New content for the element.
+   */
+  void setContent( const std::string &content );
+
+  /*! \overload void setContent( const std::string &content )
+   */
+  void setContent( int numericContent );
+
+  /*! \brief Adds an attribute with the specified string value.
+   * \param attributeName Name of the attribute. Must not be an empty.
+   * \param value Value of the attribute.
+   */
+  void addAttribute( std::string attributeName,
+                     std::string value );
+
+  /*! \brief Adds an attribute with the specified numeric value.
+   * \param attributeName Name of the attribute. Must not be empty.
+   * \param numericValue Numeric value of the attribute.
+   */
+  void addAttribute( std::string attributeName,
+                     int numericValue );
+
+  /*! \brief Adds a child element to the element.
+   * \param element Child element to add. Must not be \c NULL.
+   */
+  void addElement( XmlElement *element );
+
+  /*! \brief Returns the number of child elements.
+   * \return Number of child elements (element added with addElement()).
+   */
+  int elementCount() const;
+
+  /*! \brief Returns the child element at the specified index.
+   * \param index Zero based index of the element to return.
+   * \returns Element at the specified index. Never \c NULL.
+   * \exception std::invalid_argument if \a index < 0 or index >= elementCount().
+   */
+  XmlElement *elementAt( int index ) const;
+
+  /*! \brief Returns the first child element with the specified name.
+   * \param name Name of the child element to return.
+   * \return First child element found which is named \a name.
+   * \exception std::invalid_argument if there is no child element with the specified
+   *            name.
+   */
+  XmlElement *elementFor( const std::string &name ) const;
+
+  /*! \brief Returns a XML string that represents the element.
+   * \param indent String of spaces representing the amount of 'indent'.
+   * \return XML string that represents the element, its attributes and its
+   *         child elements.
+   */
+  std::string toString( const std::string &indent = "" ) const;
+
+private:
+  typedef std::pair<std::string,std::string> Attribute;
+
+  std::string attributesAsString() const;
+  std::string escape( std::string value ) const;
+
+private:
+  std::string m_name;
+  std::string m_content;
+
+  typedef CppUnitDeque<Attribute> Attributes;
+  Attributes m_attributes;
+
+  typedef CppUnitDeque<XmlElement *> Elements;
+  Elements m_elements;
+};
+
+
+CPPUNIT_NS_END
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+
+#endif  // CPPUNIT_TOOLS_XMLELEMENT_H
diff --git a/dep/cppunit/include/cppunit/ui/Makefile.am b/dep/cppunit/include/cppunit/ui/Makefile.am
new file mode 100644
index 00000000000..1b9f08efe77
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = text mfc qt
diff --git a/dep/cppunit/include/cppunit/ui/Makefile.in b/dep/cppunit/include/cppunit/ui/Makefile.in
new file mode 100644
index 00000000000..e8a9d5903d1
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/Makefile.in
@@ -0,0 +1,511 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# 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.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = include/cppunit/ui
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
+	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
+	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
+	$(top_srcdir)/config/ac_cxx_rtti.m4 \
+	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
+	$(top_srcdir)/config/ac_dll.m4 \
+	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_cxx_have_isfinite.m4 \
+	$(top_srcdir)/config/bb_enable_doxygen.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@
+CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@
+CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@
+CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@
+CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@
+CPPUNIT_VERSION = @CPPUNIT_VERSION@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_dot = @enable_dot@
+enable_html_docs = @enable_html_docs@
+enable_latex_docs = @enable_latex_docs@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = text mfc qt
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/cppunit/ui/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  include/cppunit/ui/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/dep/cppunit/include/cppunit/ui/mfc/Makefile.am b/dep/cppunit/include/cppunit/ui/mfc/Makefile.am
new file mode 100644
index 00000000000..1ea8b5edf8e
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/mfc/Makefile.am
@@ -0,0 +1,5 @@
+libcppunitincludedir = $(includedir)/cppunit/ui/mfc
+
+libcppunitinclude_HEADERS = \
+	TestRunner.h \
+  MfcTestRunner.h
diff --git a/dep/cppunit/include/cppunit/ui/mfc/Makefile.in b/dep/cppunit/include/cppunit/ui/mfc/Makefile.in
new file mode 100644
index 00000000000..abe488a114d
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/mfc/Makefile.in
@@ -0,0 +1,433 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# 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.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = include/cppunit/ui/mfc
+DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
+	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
+	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
+	$(top_srcdir)/config/ac_cxx_rtti.m4 \
+	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
+	$(top_srcdir)/config/ac_dll.m4 \
+	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_cxx_have_isfinite.m4 \
+	$(top_srcdir)/config/bb_enable_doxygen.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libcppunitincludedir)"
+libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libcppunitinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@
+CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@
+CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@
+CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@
+CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@
+CPPUNIT_VERSION = @CPPUNIT_VERSION@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_dot = @enable_dot@
+enable_html_docs = @enable_html_docs@
+enable_latex_docs = @enable_latex_docs@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+libcppunitincludedir = $(includedir)/cppunit/ui/mfc
+libcppunitinclude_HEADERS = \
+	TestRunner.h \
+  MfcTestRunner.h
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/cppunit/ui/mfc/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  include/cppunit/ui/mfc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)"
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+uninstall-libcppunitincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libcppunitincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libcppunitincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libcppunitincludeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libcppunitincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-libcppunitincludeHEADERS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/dep/cppunit/include/cppunit/ui/mfc/MfcTestRunner.h b/dep/cppunit/include/cppunit/ui/mfc/MfcTestRunner.h
new file mode 100644
index 00000000000..6a5f7b770f3
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/mfc/MfcTestRunner.h
@@ -0,0 +1,76 @@
+#ifndef CPPUNITUI_MFC_MFCTESTRUNNER_H
+#define CPPUNITUI_MFC_MFCTESTRUNNER_H
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+#include <cppunit/Portability.h>
+#include <cppunit/portability/CppUnitVector.h>
+
+/* Refer to MSDN documentation to know how to write and use MFC extension DLL:
+   mk:@MSITStore:h:\DevStudio\MSDN\98VSa\1036\vcmfc.chm::/html/_mfcnotes_tn033.htm#_mfcnotes_how_to_write_an_mfc_extension_dll
+   
+   This can be found in the index with "mfc extension"
+   The basic:
+   Using:
+   - your application must use MFC DLL
+   - memory allocation is done using the same heap
+   - you must define the symbol _AFX_DLL
+
+   Building:
+   - you must define the symbol _AFX_DLL and _AFX_EXT
+   - export class using AFX_EXT_CLASS
+ */
+
+CPPUNIT_NS_BEGIN
+
+  class Test;
+  class TestSuite;
+
+
+/*! \brief MFC test runner.
+ * \ingroup ExecutingTest
+ *
+ * Use this to launch the MFC TestRunner. Usually called from you CWinApp subclass:
+ *
+ * \code
+ * #include <cppunit/ui/mfc/MfcTestRunner.h>
+ * #include <cppunit/extensions/TestFactoryRegistry.h>
+ *
+ * void 
+ * CHostAppApp::RunUnitTests()
+ * {
+ *   CppUnit::MfcTestRunner runner;
+ *   runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+ *
+ *   runner.run();    
+ * }
+ * \endcode
+ * \see CppUnit::TextTestRunner, CppUnit::TestFactoryRegistry.
+ */
+class AFX_EXT_CLASS MfcTestRunner
+{
+public:
+  MfcTestRunner();
+  virtual ~MfcTestRunner();
+
+  void run();
+
+  void addTest( Test *test );
+
+  void addTests( const CppUnitVector<Test *> &tests );
+
+protected:
+  Test *getRootTest();
+
+  TestSuite *m_suite;
+
+  typedef CppUnitVector<Test *> Tests;
+  Tests m_tests;
+};
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNITUI_MFC_MFCTESTRUNNER_H
\ No newline at end of file
diff --git a/dep/cppunit/include/cppunit/ui/mfc/TestRunner.h b/dep/cppunit/include/cppunit/ui/mfc/TestRunner.h
new file mode 100644
index 00000000000..c4d6afface6
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/mfc/TestRunner.h
@@ -0,0 +1,21 @@
+#ifndef CPPUNITUI_MFC_TESTRUNNER_H
+#define CPPUNITUI_MFC_TESTRUNNER_H
+
+#include <cppunit/ui/mfc/MfcTestRunner.h>
+
+CPPUNIT_NS_BEGIN
+
+#if defined(CPPUNIT_HAVE_NAMESPACES)
+namespace MfcUi
+{
+  /*! Mfc TestRunner (DEPRECATED).
+   * \deprecated Use CppUnit::MfcTestRunner instead.
+   */
+  typedef CPPUNIT_NS::MfcTestRunner TestRunner;
+}
+#endif // defined(CPPUNIT_HAVE_NAMESPACES)
+
+CPPUNIT_NS_END
+
+
+#endif  // CPPUNITUI_MFC_TESTRUNNER_H
diff --git a/dep/cppunit/include/cppunit/ui/qt/Config.h b/dep/cppunit/include/cppunit/ui/qt/Config.h
new file mode 100644
index 00000000000..beaf9ad4e1d
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/qt/Config.h
@@ -0,0 +1,21 @@
+#ifndef CPPUNIT_QTUI_CONFIG_H
+#define CPPUNIT_QTUI_CONFIG_H
+
+/*! Macro to export symbol to DLL with VC++.
+ *
+ * - QTTESTRUNNER_DLL_BUILD must be defined when building the DLL.
+ * - QTTESTRUNNER_DLL must be defined if linking against the DLL.
+ * - If none of the above are defined then you are building or linking against
+ *   the static library.
+ */
+
+#if defined( QTTESTRUNNER_DLL_BUILD )
+#  define QTTESTRUNNER_API __declspec(dllexport)
+#elif defined ( QTTESTRUNNER_DLL )
+#  define QTTESTRUNNER_API __declspec(dllimport)
+#else
+#  define QTTESTRUNNER_API
+#endif
+
+
+#endif // CPPUNIT_QTUI_CONFIG_H
diff --git a/dep/cppunit/include/cppunit/ui/qt/Makefile.am b/dep/cppunit/include/cppunit/ui/qt/Makefile.am
new file mode 100644
index 00000000000..7d4fb46c03a
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/qt/Makefile.am
@@ -0,0 +1,6 @@
+libcppunitincludedir = $(includedir)/cppunit/ui/qt
+
+libcppunitinclude_HEADERS = \
+	TestRunner.h \
+	QtTestRunner.h \
+	Config.h
diff --git a/dep/cppunit/include/cppunit/ui/qt/Makefile.in b/dep/cppunit/include/cppunit/ui/qt/Makefile.in
new file mode 100644
index 00000000000..1154d40084e
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/qt/Makefile.in
@@ -0,0 +1,434 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# 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.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = include/cppunit/ui/qt
+DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
+	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
+	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
+	$(top_srcdir)/config/ac_cxx_rtti.m4 \
+	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
+	$(top_srcdir)/config/ac_dll.m4 \
+	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_cxx_have_isfinite.m4 \
+	$(top_srcdir)/config/bb_enable_doxygen.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libcppunitincludedir)"
+libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libcppunitinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@
+CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@
+CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@
+CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@
+CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@
+CPPUNIT_VERSION = @CPPUNIT_VERSION@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_dot = @enable_dot@
+enable_html_docs = @enable_html_docs@
+enable_latex_docs = @enable_latex_docs@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+libcppunitincludedir = $(includedir)/cppunit/ui/qt
+libcppunitinclude_HEADERS = \
+	TestRunner.h \
+	QtTestRunner.h \
+	Config.h
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/cppunit/ui/qt/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  include/cppunit/ui/qt/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)"
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+uninstall-libcppunitincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libcppunitincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libcppunitincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libcppunitincludeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libcppunitincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-libcppunitincludeHEADERS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/dep/cppunit/include/cppunit/ui/qt/QtTestRunner.h b/dep/cppunit/include/cppunit/ui/qt/QtTestRunner.h
new file mode 100644
index 00000000000..4b6ab4e4efc
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/qt/QtTestRunner.h
@@ -0,0 +1,85 @@
+// //////////////////////////////////////////////////////////////////////////
+// Header file TestRunner.h for class TestRunner
+// (c)Copyright 2000, Baptiste Lepilleur.
+// Created: 2001/09/19
+// //////////////////////////////////////////////////////////////////////////
+#ifndef CPPUNIT_QTUI_QTTESTRUNNER_H
+#define CPPUNIT_QTUI_QTTESTRUNNER_H
+
+#include <cppunit/portability/CppUnitVector.h>
+#include "Config.h"
+
+CPPUNIT_NS_BEGIN
+
+
+  class Test;
+  class TestSuite;
+
+
+/*! 
+ * \brief QT test runner.
+ * \ingroup ExecutingTest
+ *
+ * Here is an example of usage:
+ * \code
+ * #include <cppunit/extensions/TestFactoryRegistry.h>
+ * #include <cppunit/ui/qt/TestRunner.h>
+ *
+ * [...]
+ *
+ * void 
+ * QDepWindow::runTests()
+ * {
+ *   CppUnit::QtUi::TestRunner runner;
+ *   runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+ *   runner.run( true );
+ * }
+ * \endcode
+ *
+ */
+class QTTESTRUNNER_API QtTestRunner
+{
+public:
+  /*! Constructs a TestRunner object.
+   */
+  QtTestRunner();
+
+  /*! Destructor.
+   */
+  virtual ~QtTestRunner();
+
+  void run( bool autoRun =false );
+
+  void addTest( Test *test );
+
+private:
+  /// Prevents the use of the copy constructor.
+  QtTestRunner( const QtTestRunner &copy );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const QtTestRunner &copy );
+
+  Test *getRootTest();
+
+private:
+  typedef CppUnitVector<Test *> Tests;
+  Tests *_tests;
+
+  TestSuite *_suite;
+};
+
+
+#if CPPUNIT_HAVE_NAMESPACES
+  namespace QtUi
+  {
+    /*! Qt TestRunner (DEPRECATED).
+     * \deprecated Use CppUnit::QtTestRunner instead.
+     */
+    typedef CPPUNIT_NS::QtTestRunner TestRunner;
+  }
+#endif
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_QTUI_QTTESTRUNNER_H
diff --git a/dep/cppunit/include/cppunit/ui/qt/TestRunner.h b/dep/cppunit/include/cppunit/ui/qt/TestRunner.h
new file mode 100644
index 00000000000..9c53e4ba600
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/qt/TestRunner.h
@@ -0,0 +1,11 @@
+// //////////////////////////////////////////////////////////////////////////
+// Header file TestRunner.h for class TestRunner
+// (c)Copyright 2000, Baptiste Lepilleur.
+// Created: 2001/09/19
+// //////////////////////////////////////////////////////////////////////////
+#ifndef CPPUNIT_QTUI_TESTRUNNER_H
+#define CPPUNIT_QTUI_TESTRUNNER_H
+
+#include <cppunit/ui/qt/QtTestRunner.h>
+
+#endif  // CPPUNIT_QTUI_TESTRUNNER_H
diff --git a/dep/cppunit/include/cppunit/ui/text/Makefile.am b/dep/cppunit/include/cppunit/ui/text/Makefile.am
new file mode 100644
index 00000000000..5f01d81462f
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/text/Makefile.am
@@ -0,0 +1,5 @@
+libcppunitincludedir = $(includedir)/cppunit/ui/text
+
+libcppunitinclude_HEADERS = \
+	TestRunner.h \
+  TextTestRunner.h
diff --git a/dep/cppunit/include/cppunit/ui/text/Makefile.in b/dep/cppunit/include/cppunit/ui/text/Makefile.in
new file mode 100644
index 00000000000..db794f6943b
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/text/Makefile.in
@@ -0,0 +1,433 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# 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.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = include/cppunit/ui/text
+DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
+	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
+	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
+	$(top_srcdir)/config/ac_cxx_rtti.m4 \
+	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
+	$(top_srcdir)/config/ac_dll.m4 \
+	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_cxx_have_isfinite.m4 \
+	$(top_srcdir)/config/bb_enable_doxygen.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libcppunitincludedir)"
+libcppunitincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libcppunitinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_BINARY_AGE = @CPPUNIT_BINARY_AGE@
+CPPUNIT_INTERFACE_AGE = @CPPUNIT_INTERFACE_AGE@
+CPPUNIT_MAJOR_VERSION = @CPPUNIT_MAJOR_VERSION@
+CPPUNIT_MICRO_VERSION = @CPPUNIT_MICRO_VERSION@
+CPPUNIT_MINOR_VERSION = @CPPUNIT_MINOR_VERSION@
+CPPUNIT_VERSION = @CPPUNIT_VERSION@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_dot = @enable_dot@
+enable_html_docs = @enable_html_docs@
+enable_latex_docs = @enable_latex_docs@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+libcppunitincludedir = $(includedir)/cppunit/ui/text
+libcppunitinclude_HEADERS = \
+	TestRunner.h \
+  TextTestRunner.h
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/cppunit/ui/text/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  include/cppunit/ui/text/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libcppunitincludeHEADERS: $(libcppunitinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libcppunitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcppunitincludedir)"
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libcppunitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  $(libcppunitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+uninstall-libcppunitincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libcppunitinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libcppunitincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libcppunitincludedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libcppunitincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libcppunitincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libcppunitincludeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libcppunitincludeHEADERS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-libcppunitincludeHEADERS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/dep/cppunit/include/cppunit/ui/text/TestRunner.h b/dep/cppunit/include/cppunit/ui/text/TestRunner.h
new file mode 100644
index 00000000000..023eb834896
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/text/TestRunner.h
@@ -0,0 +1,24 @@
+#ifndef CPPUNIT_UI_TEXT_TESTRUNNER_H
+#define CPPUNIT_UI_TEXT_TESTRUNNER_H
+
+#include <cppunit/ui/text/TextTestRunner.h>
+
+
+#if defined(CPPUNIT_HAVE_NAMESPACES)
+
+CPPUNIT_NS_BEGIN
+namespace TextUi
+{
+
+  /*! Text TestRunner (DEPRECATED).
+   * \deprecated Use TextTestRunner instead.
+   */
+  typedef TextTestRunner TestRunner;
+
+}
+CPPUNIT_NS_END
+
+#endif // defined(CPPUNIT_HAVE_NAMESPACES)
+
+
+#endif  // CPPUNIT_UI_TEXT_TESTRUNNER_H
diff --git a/dep/cppunit/include/cppunit/ui/text/TextTestRunner.h b/dep/cppunit/include/cppunit/ui/text/TextTestRunner.h
new file mode 100644
index 00000000000..86da4d4b304
--- /dev/null
+++ b/dep/cppunit/include/cppunit/ui/text/TextTestRunner.h
@@ -0,0 +1,97 @@
+#ifndef CPPUNIT_UI_TEXT_TEXTTESTRUNNER_H
+#define CPPUNIT_UI_TEXT_TEXTTESTRUNNER_H
+
+
+#include <cppunit/Portability.h>
+#include <string>
+#include <cppunit/TestRunner.h>
+
+CPPUNIT_NS_BEGIN
+
+
+class Outputter;
+class Test;
+class TestSuite;
+class TextOutputter;
+class TestResult;
+class TestResultCollector;
+
+
+
+/*!
+ * \brief A text mode test runner.
+ * \ingroup WritingTestResult
+ * \ingroup ExecutingTest
+ *
+ * The test runner manage the life cycle of the added tests.
+ *
+ * The test runner can run only one of the added tests or all the tests. 
+ *
+ * TestRunner prints out a trace as the tests are executed followed by a
+ * summary at the end. The trace and summary print are optional.
+ *
+ * Here is an example of use:
+ *
+ * \code
+ * CppUnit::TextTestRunner runner;
+ * runner.addTest( ExampleTestCase::suite() );
+ * runner.run( "", true );    // Run all tests and wait
+ * \endcode
+ *
+ * The trace is printed using a TextTestProgressListener. The summary is printed
+ * using a TextOutputter. 
+ *
+ * You can specify an alternate Outputter at construction
+ * or later with setOutputter(). 
+ *
+ * After construction, you can register additional TestListener to eventManager(),
+ * for a custom progress trace, for example.
+ *
+ * \code
+ * CppUnit::TextTestRunner runner;
+ * runner.addTest( ExampleTestCase::suite() );
+ * runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter( 
+ *                          &runner.result(),
+ *                          std::cerr ) );
+ * MyCustomProgressTestListener progress;
+ * runner.eventManager().addListener( &progress );
+ * runner.run( "", true );    // Run all tests and wait
+ * \endcode
+ *
+ * \see CompilerOutputter, XmlOutputter, TextOutputter.
+ */
+class CPPUNIT_API TextTestRunner : public CPPUNIT_NS::TestRunner
+{
+public:
+  TextTestRunner( Outputter *outputter =NULL );
+
+  virtual ~TextTestRunner();
+
+  bool run( std::string testPath ="",
+            bool doWait = false,
+            bool doPrintResult = true,
+            bool doPrintProgress = true );
+
+  void setOutputter( Outputter *outputter );
+
+  TestResultCollector &result() const;
+
+  TestResult &eventManager() const;
+
+public: // overridden from TestRunner (to avoid hidden virtual function warning)
+  virtual void run( TestResult &controller,
+                    const std::string &testPath = "" );
+
+protected:
+  virtual void wait( bool doWait );
+  virtual void printResult( bool doPrintResult );
+
+  TestResultCollector *m_result;
+  TestResult *m_eventManager;
+  Outputter *m_outputter;
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_UI_TEXT_TEXTTESTRUNNER_H
diff --git a/dep/cppunit/include/msvc6/DSPlugin/TestRunnerDSPluginVC6.h b/dep/cppunit/include/msvc6/DSPlugin/TestRunnerDSPluginVC6.h
new file mode 100644
index 00000000000..c19b4b0759c
--- /dev/null
+++ b/dep/cppunit/include/msvc6/DSPlugin/TestRunnerDSPluginVC6.h
@@ -0,0 +1,190 @@
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+/* File created by MIDL compiler version 5.01.0164 */
+/* at Sat Apr 13 11:47:16 2002
+ */
+/* Compiler settings for G:\prg\vc\Lib\cppunit\src\msvc6\DSPlugIn\TestRunnerDSPlugin.idl:
+    Os (OptLev=s), W1, Zp8, env=Win32, ms_ext, c_ext
+    error checks: allocation ref bounds_check enum stub_data 
+*/
+//@@MIDL_FILE_HEADING(  )
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 440
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __TestRunnerDSPluginVC6_h__
+#define __TestRunnerDSPluginVC6_h__
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+/* Forward Declarations */ 
+
+#ifndef __ITestRunnerDSPlugin_FWD_DEFINED__
+#define __ITestRunnerDSPlugin_FWD_DEFINED__
+typedef interface ITestRunnerDSPlugin ITestRunnerDSPlugin;
+#endif 	/* __ITestRunnerDSPlugin_FWD_DEFINED__ */
+
+
+#ifndef __DSAddIn_FWD_DEFINED__
+#define __DSAddIn_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class DSAddIn DSAddIn;
+#else
+typedef struct DSAddIn DSAddIn;
+#endif /* __cplusplus */
+
+#endif 	/* __DSAddIn_FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "oaidl.h"
+#include "ocidl.h"
+
+void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t);
+void __RPC_USER MIDL_user_free( void __RPC_FAR * ); 
+
+#ifndef __ITestRunnerDSPlugin_INTERFACE_DEFINED__
+#define __ITestRunnerDSPlugin_INTERFACE_DEFINED__
+
+/* interface ITestRunnerDSPlugin */
+/* [oleautomation][unique][helpstring][uuid][object] */ 
+
+
+EXTERN_C const IID IID_ITestRunnerDSPlugin;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("3ADE0E37-5A56-4a68-BD8D-67E9E7502971")
+    ITestRunnerDSPlugin : public IUnknown
+    {
+    public:
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE goToLineInSourceCode( 
+            /* [in] */ BSTR fileName,
+            /* [in] */ int lineNumber) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct ITestRunnerDSPluginVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+            ITestRunnerDSPlugin __RPC_FAR * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+            ITestRunnerDSPlugin __RPC_FAR * This);
+        
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+            ITestRunnerDSPlugin __RPC_FAR * This);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *goToLineInSourceCode )( 
+            ITestRunnerDSPlugin __RPC_FAR * This,
+            /* [in] */ BSTR fileName,
+            /* [in] */ int lineNumber);
+        
+        END_INTERFACE
+    } ITestRunnerDSPluginVtbl;
+
+    interface ITestRunnerDSPlugin
+    {
+        CONST_VTBL struct ITestRunnerDSPluginVtbl __RPC_FAR *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define ITestRunnerDSPlugin_QueryInterface(This,riid,ppvObject)	\
+    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
+
+#define ITestRunnerDSPlugin_AddRef(This)	\
+    (This)->lpVtbl -> AddRef(This)
+
+#define ITestRunnerDSPlugin_Release(This)	\
+    (This)->lpVtbl -> Release(This)
+
+
+#define ITestRunnerDSPlugin_goToLineInSourceCode(This,fileName,lineNumber)	\
+    (This)->lpVtbl -> goToLineInSourceCode(This,fileName,lineNumber)
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE ITestRunnerDSPlugin_goToLineInSourceCode_Proxy( 
+    ITestRunnerDSPlugin __RPC_FAR * This,
+    /* [in] */ BSTR fileName,
+    /* [in] */ int lineNumber);
+
+
+void __RPC_STUB ITestRunnerDSPlugin_goToLineInSourceCode_Stub(
+    IRpcStubBuffer *This,
+    IRpcChannelBuffer *_pRpcChannelBuffer,
+    PRPC_MESSAGE _pRpcMessage,
+    DWORD *_pdwStubPhase);
+
+
+
+#endif 	/* __ITestRunnerDSPlugin_INTERFACE_DEFINED__ */
+
+
+
+#ifndef __TestRunnerDSPluginLib_LIBRARY_DEFINED__
+#define __TestRunnerDSPluginLib_LIBRARY_DEFINED__
+
+/* library TestRunnerDSPluginLib */
+/* [helpstring][version][uuid] */ 
+
+
+EXTERN_C const IID LIBID_TestRunnerDSPluginLib;
+
+EXTERN_C const CLSID CLSID_DSAddIn;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("F193CE54-716C-41CB-80B2-FA74CA3EE2AC")
+DSAddIn;
+#endif
+#endif /* __TestRunnerDSPluginLib_LIBRARY_DEFINED__ */
+
+/* Additional Prototypes for ALL interfaces */
+
+unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long __RPC_FAR *, unsigned long            , BSTR __RPC_FAR * ); 
+unsigned char __RPC_FAR * __RPC_USER  BSTR_UserMarshal(  unsigned long __RPC_FAR *, unsigned char __RPC_FAR *, BSTR __RPC_FAR * ); 
+unsigned char __RPC_FAR * __RPC_USER  BSTR_UserUnmarshal(unsigned long __RPC_FAR *, unsigned char __RPC_FAR *, BSTR __RPC_FAR * ); 
+void                      __RPC_USER  BSTR_UserFree(     unsigned long __RPC_FAR *, BSTR __RPC_FAR * ); 
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/dep/cppunit/include/msvc6/DSPlugin/TestRunnerDSPluginVC6_i.c b/dep/cppunit/include/msvc6/DSPlugin/TestRunnerDSPluginVC6_i.c
new file mode 100644
index 00000000000..9490f9ebd04
--- /dev/null
+++ b/dep/cppunit/include/msvc6/DSPlugin/TestRunnerDSPluginVC6_i.c
@@ -0,0 +1,50 @@
+/* this file contains the actual definitions of */
+/* the IIDs and CLSIDs */
+
+/* link this file in with the server and any clients */
+
+
+/* File created by MIDL compiler version 5.01.0164 */
+/* at Sat Apr 13 11:47:16 2002
+ */
+/* Compiler settings for G:\prg\vc\Lib\cppunit\src\msvc6\DSPlugIn\TestRunnerDSPlugin.idl:
+    Os (OptLev=s), W1, Zp8, env=Win32, ms_ext, c_ext
+    error checks: allocation ref bounds_check enum stub_data 
+*/
+//@@MIDL_FILE_HEADING(  )
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+#ifndef __IID_DEFINED__
+#define __IID_DEFINED__
+
+typedef struct _IID
+{
+    unsigned long x;
+    unsigned short s1;
+    unsigned short s2;
+    unsigned char  c[8];
+} IID;
+
+#endif // __IID_DEFINED__
+
+#ifndef CLSID_DEFINED
+#define CLSID_DEFINED
+typedef IID CLSID;
+#endif // CLSID_DEFINED
+
+const IID IID_ITestRunnerDSPlugin = {0x3ADE0E37,0x5A56,0x4a68,{0xBD,0x8D,0x67,0xE9,0xE7,0x50,0x29,0x71}};
+
+
+const IID LIBID_TestRunnerDSPluginLib = {0x3ADE0E38,0x5A56,0x4a68,{0xBD,0x8D,0x67,0xE9,0xE7,0x50,0x29,0x71}};
+
+
+const CLSID CLSID_DSAddIn = {0xF193CE54,0x716C,0x41CB,{0x80,0xB2,0xFA,0x74,0xCA,0x3E,0xE2,0xAC}};
+
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/dep/cppunit/include/msvc6/testrunner/TestPlugInInterface.h b/dep/cppunit/include/msvc6/testrunner/TestPlugInInterface.h
new file mode 100644
index 00000000000..031f2a01f8c
--- /dev/null
+++ b/dep/cppunit/include/msvc6/testrunner/TestPlugInInterface.h
@@ -0,0 +1,55 @@
+#ifndef CPPUNIT_TESTPLUGINRUNNER_TESTPLUGININTERFACE_H
+#define CPPUNIT_TESTPLUGINRUNNER_TESTPLUGININTERFACE_H
+
+#include <cppunit/Test.h>
+#include <cppunit/TestSuite.h>
+
+#if !defined(WINAPI)
+#define WIN32_LEAN_AND_MEAN 
+#define NOGDI
+#define NOUSER
+#define NOKERNEL
+#define NOSOUND
+#define NOMINMAX
+#include <windows.h>
+#endif
+
+/*! \brief Abstract TestPlugIn for DLL.
+ * \deprecated Use CppUnitTestPlugIn instead.
+ *
+ * A Test plug-in DLL must subclass this class and "publish" an instance
+ * using the following exported function:
+ * \code
+ * extern "C" {
+ *   __declspec(dllimport) TestPlugInInterface *GetTestPlugInInterface();
+ * }
+ * \endcode
+ *
+ * When loading the DLL, the TestPlugIn runner look-up this function and
+ * retreives the 
+ *
+ * See the TestPlugIn example for VC++ for details.
+ */
+class TestPlugInInterface
+{
+public:
+  virtual ~TestPlugInInterface() {}
+
+  /*! Returns an instance of the "All Tests" suite.
+   *
+   * \return Instance of the top-level suite that contains all test. Ownership
+   *         is granted to the method caller.
+   */
+  virtual CppUnit::Test *makeTest() =0;
+};
+
+typedef TestPlugInInterface* (WINAPI *GetTestPlugInInterfaceFunction)(void);
+
+
+extern "C" {
+  __declspec(dllexport) TestPlugInInterface *GetTestPlugInInterface();
+}
+
+
+
+#endif // CPPUNIT_TESTPLUGINRUNNER_TESTPLUGININTERFACE_H
diff --git a/dep/cppunit/include/msvc6/testrunner/TestRunner.h b/dep/cppunit/include/msvc6/testrunner/TestRunner.h
new file mode 100644
index 00000000000..0bee97a9023
--- /dev/null
+++ b/dep/cppunit/include/msvc6/testrunner/TestRunner.h
@@ -0,0 +1,17 @@
+#ifndef CPPUNIT_MSVC_TESTRUNNER_H
+#define CPPUNIT_MSVC_TESTRUNNER_H
+
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+#include <cppunit/ui/mfc/MfcTestRunner.h>
+
+/*! \brief MFC test runner (DEPRECATED)
+ * \ingroup ExecutingTest
+ * \deprecated Use CppUnit::MfcUi::TestRunner instead.
+ */
+typedef CPPUNIT_NS::MfcTestRunner TestRunner;
+
+#endif  // CPPUNIT_MSVC_TESTRUNNER_H
diff --git a/dep/cppunit/lib/DllPlugInTesteru.exe b/dep/cppunit/lib/DllPlugInTesteru.exe
new file mode 100644
index 00000000000..02e36ad6e31
Binary files /dev/null and b/dep/cppunit/lib/DllPlugInTesteru.exe differ
diff --git a/dep/cppunit/lib/DllPlugInTesterud.exe b/dep/cppunit/lib/DllPlugInTesterud.exe
new file mode 100644
index 00000000000..3007937b496
Binary files /dev/null and b/dep/cppunit/lib/DllPlugInTesterud.exe differ
diff --git a/dep/cppunit/lib/cppunit.lib b/dep/cppunit/lib/cppunit.lib
new file mode 100644
index 00000000000..c48c77dad83
Binary files /dev/null and b/dep/cppunit/lib/cppunit.lib differ
diff --git a/dep/cppunit/lib/cppunit_dll.dll b/dep/cppunit/lib/cppunit_dll.dll
new file mode 100644
index 00000000000..7e0c07b86f3
Binary files /dev/null and b/dep/cppunit/lib/cppunit_dll.dll differ
diff --git a/dep/cppunit/lib/cppunit_dll.lib b/dep/cppunit/lib/cppunit_dll.lib
new file mode 100644
index 00000000000..4dc750f51bd
Binary files /dev/null and b/dep/cppunit/lib/cppunit_dll.lib differ
diff --git a/dep/cppunit/lib/cppunitd.lib b/dep/cppunit/lib/cppunitd.lib
new file mode 100644
index 00000000000..2116da8518d
Binary files /dev/null and b/dep/cppunit/lib/cppunitd.lib differ
diff --git a/dep/cppunit/lib/cppunitd_dll.dll b/dep/cppunit/lib/cppunitd_dll.dll
new file mode 100644
index 00000000000..a7edee770f8
Binary files /dev/null and b/dep/cppunit/lib/cppunitd_dll.dll differ
diff --git a/dep/cppunit/lib/cppunitd_dll.lib b/dep/cppunit/lib/cppunitd_dll.lib
new file mode 100644
index 00000000000..d5e30eb3d53
Binary files /dev/null and b/dep/cppunit/lib/cppunitd_dll.lib differ
diff --git a/dep/cppunit/lib2008/cppunitd.lib b/dep/cppunit/lib2008/cppunitd.lib
new file mode 100644
index 00000000000..7ae340c864f
Binary files /dev/null and b/dep/cppunit/lib2008/cppunitd.lib differ
diff --git a/dep/fastmm/Delphi/FastMM.dpr b/dep/fastmm/Delphi/FastMM.dpr
new file mode 100644
index 00000000000..6260520c33a
--- /dev/null
+++ b/dep/fastmm/Delphi/FastMM.dpr
@@ -0,0 +1,57 @@
+(*
+* LICENSE
+*
+* Copyright (c) 2010 Vladimir Bochkarev.
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the author be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This license may not be removed or altered from any source distribution.
+*
+* --------------------------------------------------------------------------
+* Vladimir Bochkarev <boxa@mail.ru>.
+*)
+
+library FastMM;
+
+uses
+  Windows, FastMM4;
+
+{x$R *.res}
+
+{$SETPEFLAGS IMAGE_FILE_LARGE_ADDRESS_AWARE or IMAGE_FILE_DEBUG_STRIPPED or
+  IMAGE_FILE_LINE_NUMS_STRIPPED or IMAGE_FILE_LOCAL_SYMS_STRIPPED}
+
+{$IMAGEBASE $00D20000}
+
+{$Include FastMM4Options.inc}
+
+function FastMM_malloc(ASize: Integer): Pointer; cdecl;
+begin
+  Result := GetMemory(ASize);
+end;
+
+procedure FastMM_free(APointer: Pointer); cdecl;
+begin
+  FreeMem(APointer);
+end;
+
+exports
+  FastMM_malloc,
+  FastMM_free;
+
+begin
+  IsMultiThread := True;
+  DisableThreadLibraryCalls(HInstance); // not needed for current MaNGOS, but not superfluous in future :)
+end.
diff --git a/dep/fastmm/Delphi/FastMM4.pas b/dep/fastmm/Delphi/FastMM4.pas
new file mode 100644
index 00000000000..df219ce0144
--- /dev/null
+++ b/dep/fastmm/Delphi/FastMM4.pas
@@ -0,0 +1,11699 @@
+(*
+
+Fast Memory Manager 4.991
+
+Description:
+ A fast replacement memory manager for Embarcadero Delphi Win32 applications
+ that scales well under multi-threaded usage, is not prone to memory
+ fragmentation, and supports shared memory without the use of external .DLL
+ files.
+
+Homepage:
+ http://fastmm.sourceforge.net
+
+Advantages:
+ - Fast
+ - Low overhead. FastMM is designed for an average of 5% and maximum of 10%
+   overhead per block.
+ - Supports up to 3GB of user mode address space under Windows 32-bit and 4GB
+   under Windows 64-bit. Add the "$SetPEFlags $20" option (in curly braces)
+   to your .dpr to enable this.
+ - Highly aligned memory blocks. Can be configured for either 8-byte or 16-byte
+   alignment.
+ - Good scaling under multi-threaded applications
+ - Intelligent reallocations. Avoids slow memory move operations through
+   not performing unneccesary downsizes and by having a minimum percentage
+   block size growth factor when an in-place block upsize is not possible.
+ - Resistant to address space fragmentation
+ - No external DLL required when sharing memory between the application and
+   external libraries (provided both use this memory manager)
+ - Optionally reports memory leaks on program shutdown. (This check can be set
+   to be performed only if Delphi is currently running on the machine, so end
+   users won't be bothered by the error message.)
+ - Supports Delphi 4 (or later), C++ Builder 4 (or later), Kylix 3.
+
+Usage:
+ Delphi:
+  Place this unit as the very first unit under the "uses" section in your
+  project's .dpr file. When sharing memory between an application and a DLL
+  (e.g. when passing a long string or dynamic array to a DLL function), both the
+  main application and the DLL must be compiled using this memory manager (with
+  the required conditional defines set). There are some conditional defines
+  (inside FastMM4Options.inc) that may be used to tweak the memory manager. To
+  enable support for a user mode address space greater than 2GB you will have to
+  use the EditBin* tool to set the LARGE_ADDRESS_AWARE flag in the EXE header.
+  This informs Windows x64 or Windows 32-bit (with the /3GB option set) that the
+  application supports an address space larger than 2GB (up to 4GB). In Delphi 6
+  and later you can also specify this flag through the compiler directive
+  {$SetPEFlags $20}
+  *The EditBin tool ships with the MS Visual C compiler.
+ C++ Builder 6:
+  Refer to the instructions inside FastMM4BCB.cpp.
+
+License:
+ This work is copyright Professional Software Development / Pierre le Riche. It
+ is released under a dual license, and you may choose to use it under either the
+ Mozilla Public License 1.1 (MPL 1.1, available from
+ http://www.mozilla.org/MPL/MPL-1.1.html) or the GNU Lesser General Public
+ License 2.1 (LGPL 2.1, available from
+ http://www.opensource.org/licenses/lgpl-license.php). If you find FastMM useful
+ or you would like to support further development, a donation would be much
+ appreciated. My banking details are:
+   Country: South Africa
+   Bank: ABSA Bank Ltd
+   Branch: Somerset West
+   Branch Code: 334-712
+   Account Name: PSD (Distribution)
+   Account No.: 4041827693
+   Swift Code: ABSAZAJJ
+ My PayPal account is:
+   bof@psd.co.za
+
+Contact Details:
+ My contact details are shown below if you would like to get in touch with me.
+ If you use this memory manager I would like to hear from you: please e-mail me
+ your comments - good and bad.
+ Snailmail:
+   PO Box 2514
+   Somerset West
+   7129
+   South Africa
+ E-mail:
+   plr@psd.co.za
+
+Support:
+ If you have trouble using FastMM, you are welcome to drop me an e-mail at the
+ address above, or you may post your questions in the BASM newsgroup on the
+ Embarcadero news server (which is where I hang out quite frequently).
+
+Disclaimer:
+ FastMM has been tested extensively with both single and multithreaded
+ applications on various hardware platforms, but unfortunately I am not in a
+ position to make any guarantees. Use it at your own risk.
+
+Acknowledgements (for version 4):
+ - Eric Grange for his RecyclerMM on which the earlier versions of FastMM were
+   based. RecyclerMM was what inspired me to try and write my own memory
+   manager back in early 2004.
+ - Primoz Gabrijelcic for helping to track down various bugs.
+ - Dennis Christensen for his tireless efforts with the Fastcode project:
+   helping to develop, optimize and debug the growing Fastcode library.
+ - JiYuan Xie for implementing the leak reporting code for C++ Builder.
+ - Sebastian Zierer for implementing the OS X support.
+ - Pierre Y. for his suggestions regarding the extension of the memory leak
+   checking options.
+ - Hanspeter Widmer for his suggestion to have an option to display install and
+   uninstall debug messages and moving options to a separate file, as well as
+   the new usage tracker.
+ - Anders Isaksson and Greg for finding and identifying the "DelphiIsRunning"
+   bug under Delphi 5.
+ - Francois Malan for various suggestions and bug reports.
+ - Craig Peterson for helping me identify the cache associativity issues that
+   could arise due to medium blocks always being an exact multiple of 256 bytes.
+   Also for various other bug reports and enhancement suggestions.
+ - Jarek Karciarz, Vladimir Ulchenko (Vavan) and Bob Gonder for their help in
+   implementing the BCB support.
+ - Ben Taylor for his suggestion to display the object class of all memory
+   leaks.
+ - Jean Marc Eber and Vincent Mahon (the Memcheck guys) for the call stack
+   trace code and also the method used to catch virtual method calls on freed
+   objects.
+ - Nahan Hyn for the suggestion to be able to enable or disable memory leak
+   reporting through a global variable (the "ManualLeakReportingControl"
+   option.)
+ - Leonel Togniolli for various suggestions with regard to enhancing the bug
+   tracking features of FastMM and other helpful advice.
+ - Joe Bain and Leonel Togniolli for the workaround to QC#10922 affecting
+   compilation under Delphi 2005.
+ - Robert Marquardt for the suggestion to make localisation of FastMM easier by
+   having all string constants together.
+ - Simon Kissel and Fikret Hasovic for their help in implementing Kylix support.
+ - Matthias Thoma, Petr Vones, Robert Rossmair and the rest of the JCL team for
+   their debug info library used in the debug info support DLL and also the
+   code used to check for a valid call site in the "raw" stack trace code.
+ - Andreas Hausladen for the suggestion to use an external DLL to enable the
+   reporting of debug information.
+ - Alexander Tabakov for various good suggestions regarding the debugging
+   facilities of FastMM.
+ - M. Skloff for some useful suggestions and bringing to my attention some
+   compiler warnings.
+ - Martin Aignesberger for the code to use madExcept instead of the JCL library
+   inside the debug info support DLL.
+ - Diederik and Dennis Passmore for the suggestion to be able to register
+   expected leaks.
+ - Dario Tiraboschi and Mark Gebauer for pointing out the problems that occur
+   when range checking and complete boolean evaluation is turned on.
+ - Arthur Hoornweg for notifying me of the image base being incorrect for
+   borlndmm.dll.
+ - Theo Carr-Brion and Hanspeter Widmer for finding the false alarm error
+   message "Block Header Has Been Corrupted" bug in FullDebugMode.
+ - Danny Heijl for reporting the compiler error in "release" mode.
+ - Omar Zelaya for reporting the BCB support regression bug.
+ - Dan Miser for various good suggestions, e.g. not logging expected leaks to
+   file, enhancements the stack trace and messagebox functionality, etc.
+ - Arjen de Ruijter for fixing the bug in GetMemoryLeakType that caused it
+   to not properly detect expected leaks registered by class when in
+   "FullDebugMode".
+ - Aleksander Oven for reporting the installation problem when trying to use
+   FastMM in an application together with libraries that all use runtime
+   packages.
+ - Kristofer Skaug for reporting the bug that sometimes causes the leak report
+   to be shown, even when all the leaks have been registered as expected leaks.
+   Also for some useful enhancement suggestions.
+ - G�nther Schoch for the "RequireDebuggerPresenceForLeakReporting" option.
+ - Jan Schl�ter for the "ForceMMX" option.
+ - Hallvard Vassbotn for various good enhancement suggestions.
+ - Mark Edington for some good suggestions and bug reports.
+ - Paul Ishenin for reporting the compilation error when the NoMessageBoxes
+   option is set and also the missing call stack entries issue when "raw" stack
+   traces are enabled, as well as for the Russian translation.
+ - Cristian Nicola for reporting the compilation bug when the
+   CatchUseOfFreedInterfaces option was enabled (4.40).
+ - Mathias Rauen (madshi) for improving the support for madExcept in the debug
+   info support DLL.
+ - Roddy Pratt for the BCB5 support code.
+ - Rene Mihula for the Czech translation and the suggestion to have dynamic
+   loading of the FullDebugMode DLL as an option.
+ - Artur Redzko for the Polish translation.
+ - Bart van der Werf for helping me solve the DLL unload order problem when
+   using the debug mode borlndmm.dll library, as well as various other
+   suggestions.
+ - JRG ("The Delphi Guy") for the Spanish translation.
+ - Justus Janssen for Delphi 4 support.
+ - Vadim Lopushansky and Charles Vinal for reporting the Delphi 5 compiler
+   error in version 4.50.
+ - Johni Jeferson Capeletto for the Brazilian Portuguese translation.
+ - Kurt Fitzner for reporting the BCB6 compiler error in 4.52.
+ - Michal Niklas for reporting the Kylix compiler error in 4.54.
+ - Thomas Speck and Uwe Queisser for German translations.
+ - Zaenal Mutaqin for the Indonesian translation.
+ - Carlos Macao for the Portuguese translation.
+ - Michael Winter for catching the performance issue when reallocating certain
+   block sizes.
+ - dzmitry[li] for the Belarussian translation.
+ - Marcelo Montenegro for the updated Spanish translation.
+ - Jud Cole for finding and reporting the bug which may trigger a read access
+   violation when upsizing certain small block sizes together with the
+   "UseCustomVariableSizeMoveRoutines" option.
+ - Zdenek Vasku for reporting and fixing the memory manager sharing bug
+   affecting Windows 95/98/Me.
+ - RB Winston for suggesting the improvement to GExperts "backup" support.
+ - Thomas Schulz for reporting the bug affecting large address space support
+   under FullDebugMode, as well as the recursive call bug when attempting to
+   report memory leaks when EnableMemoryLeakReporting is disabled.
+ - Luigi Sandon for the Italian translation.
+ - Werner Bochtler for various suggestions and bug reports.
+ - Markus Beth for suggesting the "NeverSleepOnThreadContention" option.
+ - JiYuan Xie for the Simplified Chinese translation.
+ - Andrey Shtukaturov for the updated Russian translation, as well as the
+   Ukrainian translation.
+ - Dimitry Timokhov for finding two elusive bugs in the memory leak class
+   detection code.
+ - Paulo Moreno for fixing the AllocMem bug in FullDebugMode that prevented
+   large blocks from being cleared.
+ - Vladimir Bochkarev for the suggestion to remove some unnecessary code if the
+   MM sharing mechanism is disabled.
+ - Loris Luise for the version constant suggestion.
+ - J.W. de Bokx for the MessageBox bugfix.
+ - Igor Lindunen for reporting the bug that caused the Align16Bytes option to
+   not work in FullDebugMode.
+ - Ionut Muntean for the Romanian translation.
+ - Florent Ouchet for the French translation.
+ - Marcus M�nnig for the ScanMemoryPoolForCorruptions suggestion and the
+   suggestion to have the option to scan the memory pool before every
+   operation when in FullDebugMode.
+ - Francois Piette for bringing under my attention that
+   ScanMemoryPoolForCorruption was not thread safe.
+ - Michael Rabatscher for reporting some compiler warnings.
+ - QianYuan Wang for the Simplified Chinese translation of FastMM4Options.inc.
+ - Maurizio Lotauro and Christian-W. Budde for reporting some Delphi 5
+   compiler errors.
+ - Patrick van Logchem for the DisableLoggingOfMemoryDumps option.
+ - Norbert Spiegel for the BCB4 support code.
+ - Uwe Schuster for the improved string leak detection code.
+ - Murray McGowan for improvements to the usage tracker.
+ - Michael Hieke for the SuppressFreeMemErrorsInsideException option as well
+   as a bugfix to GetMemoryMap.
+ - Richard Bradbrook for fixing the Windows 95 FullDebugMode support that was
+   broken in version 4.94.
+ - Zach Saw for the suggestion to (optionally) use SwitchToThread when
+   waiting for a lock on a shared resource to be released.
+ - Everyone who have made donations. Thanks!
+ - Any other Fastcoders or supporters that I have forgotten, and also everyone
+   that helped with the older versions.
+
+Change log:
+ Version 1.00 (28 June 2004):
+  - First version (called PSDMemoryManager). Based on RecyclerMM (free block
+    stack approach) by Eric Grange.
+ Version 2.00 (3 November 2004):
+  - Complete redesign and rewrite from scratch. Name changed to FastMM to
+    reflect this fact. Uses a linked-list approach. Is faster, has less memory
+    overhead, and will now catch most bad pointers on FreeMem calls.
+ Version 3.00 (1 March 2005):
+  - Another rewrite. Reduced the memory overhead by: (a) not having a separate
+    memory area for the linked list of free blocks (uses space inside free
+    blocks themselves) (b) batch managers are allocated as part of chunks (c)
+    block size lookup table size reduced. This should make FastMM more CPU
+    cache friendly.
+ Version 4.00 (7 June 2005):
+  - Yet another rewrite. FastMM4 is in fact three memory managers in one: Small
+    blocks (up to a few KB) are managed through the binning model in the same
+    way as previous versions, medium blocks (from a few KB up to approximately
+    256K) are allocated in a linked-list fashion, and large blocks are grabbed
+    directly from the system through VirtualAlloc. This 3-layered design allows
+    very fast operation with the most frequently used block sizes (small
+    blocks), while also minimizing fragmentation and imparting significant
+    overhead savings with blocks larger than a few KB.
+ Version 4.01 (8 June 2005):
+  - Added the options "RequireDebugInfoForLeakReporting" and
+    "RequireIDEPresenceForLeakReporting" as suggested by Pierre Y.
+  - Fixed the "DelphiIsRunning" function not working under Delphi 5, and
+    consequently no leak checking. (Reported by Anders Isaksson and Greg.)
+ Version 4.02 (8 June 2005):
+  - Fixed the compilation error when both the "AssumeMultiThreaded" and
+    "CheckHeapForCorruption options were set. (Reported by Francois Malan.)
+ Version 4.03 (9 June 2005):
+  - Added descriptive error messages when FastMM4 cannot be installed because
+    another MM has already been installed or memory has already been allocated.
+ Version 4.04 (13 June 2005):
+  - Added a small fixed offset to the size of medium blocks (previously always
+    exact multiples of 256 bytes). This makes performance problems due to CPU
+    cache associativity limitations much less likely. (Reported by Craig
+    Peterson.)
+ Version 4.05 (17 June 2005):
+  - Added the Align16Bytes option. Disable this option to drop the 16 byte
+    alignment restriction and reduce alignment to 8 bytes for the smallest
+    block sizes. Disabling Align16Bytes should lower memory consumption at the
+    cost of complicating the use of aligned SSE move instructions. (Suggested
+    by Craig Peterson.)
+  - Added a support unit for C++ Builder 6 - Add FastMM4BCB.cpp and
+    FastMM4.pas to your BCB project to use FastMM instead of the RTL MM. Memory
+    leak checking is not supported because (unfortunately) once an MM is
+    installed under BCB you cannot uninstall it... at least not without
+    modifying the RTL code in exit.c or patching the RTL code runtime. (Thanks
+    to Jarek Karciarz, Vladimir Ulchenko and Bob Gonder.)
+ Version 4.06 (22 June 2005):
+  - Displays the class of all leaked objects on the memory leak report and also
+    tries to identify leaked long strings. Previously it only displayed the
+    sizes of all leaked blocks. (Suggested by Ben Taylor.)
+  - Added support for displaying the sizes of medium and large block memory
+    leaks. Previously it only displayed details for small block leaks.
+ Version 4.07 (22 June 2005):
+  - Fixed the detection of the class of leaked objects not working under
+    Windows 98/Me.
+ Version 4.08 (27 June 2005):
+  - Added a BorlndMM.dpr project to allow you to build a borlndmm.dll that uses
+    FastMM4 instead of the default memory manager. You may replace the old
+    DLL in the Delphi \Bin directory to make the IDE use this memory manager
+    instead.
+ Version 4.09 (30 June 2005):
+  - Included a patch fix for the bug affecting replacement borlndmm.dll files
+    with Delphi 2005 (QC#14007). Compile the patch, close Delphi, and run it
+    once to patch your vclide90.bpl. You will now be able to use the
+    replacement borlndmm.dll to speed up the Delphi 2005 IDE as well.
+ Version 4.10 (7 July 2005):
+  - Due to QC#14070 ("Delphi IDE attempts to free memory after the shutdown
+    code of borlndmm.dll has been called"), FastMM cannot be uninstalled
+    safely when used inside a replacement borlndmm.dll for the IDE. Added a
+    conditional define "NeverUninstall" for this purpose.
+  - Added the "FullDebugMode" option to pad all blocks with a header and footer
+    to help you catch memory overwrite bugs in your applications. All blocks
+    returned to freemem are also zeroed out to help catch bugs involving the
+    use of previously freed blocks. Also catches attempts at calling virtual
+    methods of freed objects provided the block in question has not been reused
+    since the object was freed. Displays stack traces on error to aid debugging.
+  - Added the "LogErrorsToFile" option to log all errors to a text file in the
+    same folder as the application.
+  - Added the "ManualLeakReportingControl" option (suggested by Nahan Hyn) to
+    enable control over whether the memory leak report should be done or not
+    via a global variable.
+ Version 4.11 (7 July 2005):
+  - Fixed a compilation error under Delphi 2005 due to QC#10922. (Thanks to Joe
+    Bain and Leonel Togniolli.)
+  - Fixed leaked object classes not displaying in the leak report in
+    "FullDebugMode".
+  Version 4.12 (8 July 2005):
+  - Moved all the string constants to one place to make it easier to do
+    translations into other languages. (Thanks to Robert Marquardt.)
+  - Added support for Kylix. Some functionality is currently missing: No
+    support for detecting the object class on leaks and also no MM sharing.
+    (Thanks to Simon Kissel and Fikret Hasovic).
+  Version 4.13 (11 July 2005):
+  - Added the FastMM_DebugInfo.dll support library to display debug info for
+    stack traces.
+  - Stack traces for the memory leak report is now logged to the log file in
+    "FullDebugMode".
+  Version 4.14 (14 July 2005):
+  - Fixed string leaks not being detected as such in "FullDebugMode". (Thanks
+    to Leonel Togniolli.)
+  - Fixed the compilation error in "FullDebugMode" when "LogErrorsToFile" is
+    not set. (Thanks to Leonel Togniolli.)
+  - Added a "Release" option to allow the grouping of various options and to
+    make it easier to make debug and release builds. (Thanks to Alexander
+    Tabakov.)
+  - Added a "HideMemoryLeakHintMessage" option to not display the hint below
+    the memory leak message. (Thanks to Alexander Tabakov.)
+  - Changed the fill character for "FullDebugMode" from zero to $80 to be able
+    to differentiate between invalid memory accesses using nil pointers to
+    invalid memory accesses using fields of freed objects. FastMM tries to
+    reserve the 64K block starting at $80800000 at startup to ensure that an
+    A/V will occur when this block is accessed. (Thanks to Alexander Tabakov.)
+  - Fixed some compiler warnings. (Thanks to M. Skloff)
+  - Fixed some display bugs in the memory leak report. (Thanks to Leonel
+    Togniolli.)
+  - Added a "LogMemoryLeakDetailToFile" option. Some applications leak a lot of
+    memory and can make the log file grow very large very quickly.
+  - Added the option to use madExcept instead of the JCL Debug library in the
+    debug info support DLL. (Thanks to Martin Aignesberger.)
+  - Added procedures "GetMemoryManagerState" and "GetMemoryMap" to retrieve
+    statistics about the current state of the memory manager and memory pool.
+    (A usage tracker form together with a demo is also available.)
+  Version 4.15 (14 July 2005):
+  - Fixed a false 4GB(!) memory leak reported in some instances.
+  Version 4.16 (15 July 2005):
+  - Added the "CatchUseOfFreedInterfaces" option to catch the use of interfaces
+    of freed objects. This option is not compatible with checking that a freed
+    block has not been modified, so enable this option only when hunting an
+    invalid interface reference. (Only relevant if "FullDebugMode" is set.)
+  - During shutdown FastMM now checks that all free blocks have not been
+    modified since being freed. (Only when "FullDebugMode" is set and
+    "CatchUseOfFreedInterfaces" is disabled.)
+  Version 4.17 (15 July 2005):
+ - Added the AddExpectedMemoryLeaks and RemoveExpectedMemoryLeaks procedures to
+   register/unregister expected leaks, thus preventing the leak report from
+   displaying if only expected leaks occurred. (Thanks to Diederik and Dennis
+   Passmore for the suggestion.) (Note: these functions were renamed in later
+   versions.)
+ - Fixed the "LogMemoryLeakDetailToFile" not logging memory leak detail to file
+   as it is supposed to. (Thanks to Leonel Togniolli.)
+ Version 4.18 (18 July 2005):
+ - Fixed some issues when range checking or complete boolean evaluation is
+   switched on. (Thanks to Dario Tiraboschi and Mark Gebauer.)
+ - Added the "OutputInstallUninstallDebugString" option to display a message when
+   FastMM is installed or uninstalled. (Thanks to Hanspeter Widmer.)
+ - Moved the options to a separate include file. (Thanks to Hanspeter Widmer.)
+ - Moved message strings to a separate file for easy translation.
+ Version 4.19 (19 July 2005):
+ - Fixed Kylix support that was broken in 4.14.
+ Version 4.20 (20 July 2005):
+ - Fixed a false memory overwrite report at shutdown in "FullDebugMode". If you
+   consistently got a "Block Header Has Been Corrupted" error message during
+   shutdown at address $xxxx0070 then it was probably a false alarm. (Thanks to
+   Theo Carr-Brion and Hanspeter Widmer.}
+ Version 4.21 (27 July 2005):
+ - Minor change to the block header flags to make it possible to immediately
+   tell whether a medium block is being used as a small block pool or not.
+   (Simplifies the leak checking and status reporting code.)
+ - Expanded the functionality around the management of expected memory leaks.
+ - Added the "ClearLogFileOnStartup" option. Deletes the log file during
+   initialization. (Thanks to M. Skloff.)
+ - Changed "OutputInstallUninstallDebugString" to use OutputDebugString instead
+   of MessageBox. (Thanks to Hanspeter Widmer.)
+ Version 4.22 (1 August 2005):
+ - Added a FastAllocMem function that avoids an unnecessary FillChar call with
+   large blocks.
+ - Changed large block resizing behavior to be a bit more conservative. Large
+   blocks will be downsized if the new size is less than half of the old size
+   (the threshold was a quarter previously).
+ Version 4.23 (6 August 2005):
+ - Fixed BCB6 support (Thanks to Omar Zelaya).
+ - Renamed "OutputInstallUninstallDebugString" to "UseOutputDebugString", and
+   added debug string output on memory leak or error detection.
+ Version 4.24 (11 August 2005):
+ - Added the "NoMessageBoxes" option to suppress the display of message boxes,
+   which is useful for services that should not be interrupted. (Thanks to Dan
+   Miser).
+ - Changed the stack trace code to return the line number of the caller and not
+   the line number of the return address. (Thanks to Dan Miser).
+ Version 4.25 (15 August 2005):
+ - Fixed GetMemoryLeakType not detecting expected leaks registered by class
+   when in "FullDebugMode". (Thanks to Arjen de Ruijter).
+ Version 4.26 (18 August 2005):
+ - Added a "UseRuntimePackages" option that allows FastMM to be used in a main
+   application together with DLLs that all use runtime packages. (Thanks to
+   Aleksander Oven.)
+ Version 4.27 (24 August 2005):
+ - Fixed a bug that sometimes caused the leak report to be shown even though all
+   leaks were registered as expected leaks. (Thanks to Kristofer Skaug.)
+ Version 4.29 (30 September 2005):
+ - Added the "RequireDebuggerPresenceForLeakReporting" option to only display
+   the leak report if the application is run inside the IDE. (Thanks to G�nther
+   Schoch.)
+ - Added the "ForceMMX" option, which when disabled will check the CPU for
+   MMX compatibility before using MMX. (Thanks to Jan Schl�ter.)
+ - Added the module name to the title of error dialogs to more easily identify
+   which application caused the error. (Thanks to Kristofer Skaug.)
+ - Added an ASCII dump to the "FullDebugMode" memory dumps. (Thanks to Hallvard
+   Vassbotn.)
+ - Added the option "HideExpectedLeaksRegisteredByPointer" to suppress the
+   display and logging of expected memory leaks that were registered by pointer.
+   (Thanks to Dan Miser.) Leaks registered by size or class are often ambiguous,
+   so these expected leaks are always logged to file (in FullDebugMode) and are
+   never hidden from the leak display (only displayed if there is at least one
+   unexpected leak).
+ - Added a procedure "GetRegisteredMemoryLeaks" to return a list of all
+   registered memory leaks. (Thanks to Dan Miser.)
+ - Added the "RawStackTraces" option to perform "raw" stack traces, negating
+   the need for stack frames. This will usually result in more complete stack
+   traces in FullDebugMode error reports, but it is significantly slower.
+   (Thanks to Hallvard Vassbotn, Dan Miser and the JCL team.)
+ Version 4.31 (2 October 2005):
+ - Fixed the crash bug when both "RawStackTraces" and "FullDebugMode" were
+   enabled. (Thanks to Dan Miser and Mark Edington.)
+ Version 4.33 (6 October 2005):
+ - Added a header corruption check to all memory blocks that are identified as
+   leaks in FullDebugMode. This allows better differentiation between memory
+   pool corruption bugs and actual memory leaks.
+ - Fixed the stack overflow bug when using "RawStackTraces".
+ Version 4.35 (6 October 2005):
+ - Fixed a compilation error when the "NoMessageBoxes" option is set. (Thanks
+   to Paul Ishenin.)
+ - Before performing a "raw" stack trace, FastMM now checks whether exception
+   handling is in place. If exception handling is not in place FastMM falls
+   back to stack frame tracing. (Exception handling is required to handle the
+   possible A/Vs when reading invalid call addresses. Exception handling is
+   usually always available except when SysUtils hasn't been initialized yet or
+   after SysUtils has been finalized.)
+ Version 4.37 (8 October 2005):
+ - Fixed the missing call stack trace entry issue when dynamically loading DLLs.
+   (Thanks to Paul Ishenin.)
+ Version 4.39 (12 October 2005):
+ - Restored the performance with "RawStackTraces" enabled back to the level it
+   was in 4.35.
+ - Fixed the stack overflow error when using "RawStackTraces" that I thought I
+   had fixed in 4.31, but unfortunately didn't. (Thanks to Craig Peterson.)
+ Version 4.40 (13 October 2005):
+ - Improved "RawStackTraces" to have less incorrect extra entries. (Thanks to
+   Craig Peterson.)
+ - Added the Russian (by Paul Ishenin) and Afrikaans translations of
+   FastMM4Messages.pas.
+ Version 4.42 (13 October 2005):
+ - Fixed the compilation error when "CatchUseOfFreedInterfaces" is enabled.
+   (Thanks to Cristian Nicola.)
+ Version 4.44 (25 October 2005):
+ - Implemented a FastGetHeapStatus function in analogy with GetHeapStatus.
+   (Suggested by Cristian Nicola.)
+ - Shifted more of the stack trace code over to the support dll to allow third
+   party vendors to make available their own stack tracing and stack trace
+   logging facilities.
+ - Mathias Rauen (madshi) improved the support for madExcept in the debug info
+   support DLL. Thanks!
+ - Added support for BCB5. (Thanks to Roddy Pratt.)
+ - Added the Czech translation by Rene Mihula.
+ - Added the "DetectMMOperationsAfterUninstall" option. This will catch
+   attempts to use the MM after FastMM has been uninstalled, and is useful for
+   debugging.
+ Version 4.46 (26 October 2005):
+ - Renamed FastMM_DebugInfo.dll to FastMM_FullDebugMode.dll and made the
+   dependency on this library a static one. This solves a DLL unload order
+   problem when using FullDebugMode together with the replacement
+   borlndmm.dll. (Thanks to Bart van der Werf.)
+ - Added the Polish translation by Artur Redzko.
+ Version 4.48 (10 November 2005):
+ - Fixed class detection for objects leaked in dynamically loaded DLLs that
+   were relocated.
+ - Fabio Dell'Aria implemented support for EurekaLog in the FullDebugMode
+   support DLL. Thanks!
+ - Added the Spanish translation by JRG ("The Delphi Guy").
+ Version 4.49 (10 November 2005):
+ - Implemented support for installing replacement AllocMem and leak
+   registration mechanisms for Delphi/BCB versions that support it.
+ - Added support for Delphi 4. (Thanks to Justus Janssen.)
+ Version 4.50 (5 December 2005):
+ - Renamed the ReportMemoryLeaks global variable to ReportMemoryLeaksOnShutdown
+   to be more consistent with the Delphi 2006 memory manager.
+ - Improved the handling of large blocks. Large blocks can now consist of
+   several consecutive segments allocated through VirtualAlloc. This
+   significantly improves speed when frequently resizing large blocks, since
+   these blocks can now often be upsized in-place.
+ Version 4.52 (7 December 2005):
+ - Fixed the compilation error with Delphi 5. (Thanks to Vadim Lopushansky and
+   Charles Vinal for reporting the error.)
+ Version 4.54 (15 December 2005):
+ - Added the Brazilian Portuguese translation by Johni Jeferson Capeletto.
+ - Fixed the compilation error with BCB6. (Thanks to Kurt Fitzner.)
+ Version 4.56 (20 December 2005):
+ - Fixed the Kylix compilation problem. (Thanks to Michal Niklas.)
+ Version 4.58 (1 February 2006):
+ - Added the German translations by Thomas Speck and Uwe Queisser.
+ - Added the Indonesian translation by Zaenal Mutaqin.
+ - Added the Portuguese translation by Carlos Macao.
+ Version 4.60 (21 February 2006):
+ - Fixed a performance issue due to an unnecessary block move operation when
+   allocating a block in the range 1261-1372 bytes and then reallocating it in
+   the range 1373-1429 bytes twice. (Thanks to Michael Winter.)
+ - Added the Belarussian translation by dzmitry[li].
+ - Added the updated Spanish translation by Marcelo Montenegro.
+ - Added a new option "EnableSharingWithDefaultMM". This option allows FastMM
+   to be shared with the default MM of Delphi 2006. It is on by default, but
+   MM sharing has to be enabled otherwise it has no effect (refer to the
+   documentation for the "ShareMM" and "AttemptToUseSharedMM" options).
+ Version 4.62 (22 February 2006):
+ - Fixed a possible read access violation in the MoveX16LP routine when the
+   UseCustomVariableSizeMoveRoutines option is enabled. (Thanks to Jud Cole for
+   some great detective work in finding this bug.)
+ - Improved the downsizing behaviour of medium blocks to better correlate with
+   the reallocation behaviour of small blocks. This change reduces the number
+   of transitions between small and medium block types when reallocating blocks
+   in the 0.7K to 2.6K range. It cuts down on the number of memory move
+   operations and improves performance.
+ Version 4.64 (31 March 2006):
+ - Added the following functions for use with FullDebugMode (and added the
+   exports to the replacement BorlndMM.dll): SetMMLogFileName,
+   GetCurrentAllocationGroup, PushAllocationGroup, PopAllocationGroup and
+   LogAllocatedBlocksToFile. The purpose of these functions are to allow you to
+   identify and log related memory leaks while your application is still
+   running.
+ - Fixed a bug in the memory manager sharing mechanism affecting Windows
+   95/98/ME. (Thanks to Zdenek Vasku.)
+ Version 4.66 (9 May 2006):
+ - Added a hint comment in this file so that FastMM4Messages.pas will also be
+   backed up by GExperts. (Thanks to RB Winston.)
+ - Fixed a bug affecting large address space (> 2GB) support under
+   FullDebugMode. (Thanks to Thomas Schulz.)
+ Version 4.68 (3 July 2006):
+ - Added the Italian translation by Luigi Sandon.
+ - If FastMM is used inside a DLL it will now use the name of the DLL as base
+   for the log file name. (Previously it always used the name of the main
+   application executable file.)
+ - Fixed a rare A/V when both the FullDebugMode and RawStackTraces options were
+   enabled. (Thanks to Primoz Gabrijelcic.)
+ - Added the "NeverSleepOnThreadContention" option. This option may improve
+   performance if the ratio of the the number of active threads to the number
+   of CPU cores is low (typically < 2). This option is only useful for 4+ CPU
+   systems, it almost always hurts performance on single and dual CPU systems.
+   (Thanks to Werner Bochtler and Markus Beth.)
+ Version 4.70 (4 August 2006):
+  - Added the Simplified Chinese translation by JiYuan Xie.
+  - Added the updated Russian as well as the Ukrainian translation by Andrey
+    Shtukaturov.
+  - Fixed two bugs in the leak class detection code that would sometimes fail
+    to detect the class of leaked objects and strings, and report them as
+    'unknown'. (Thanks to Dimitry Timokhov)
+  Version 4.72 (24 September 2006):
+  - Fixed a bug that caused AllocMem to not clear blocks > 256K in
+    FullDebugMode. (Thanks to Paulo Moreno.)
+  Version 4.74 (9 November 2006):
+  - Fixed a bug in the segmented large block functionality that could lead to
+    an application freeze when upsizing blocks greater than 256K in a
+    multithreaded application (one of those "what the heck was I thinking?"
+    type bugs).
+  Version 4.76 (12 January 2007):
+  - Changed the RawStackTraces code in the FullDebugMode DLL
+    to prevent it from modifying the Windows "GetLastError" error code.
+    (Thanks to Primoz Gabrijelcic.)
+  - Fixed a threading issue when the "CheckHeapForCorruption" option was
+    enabled, but the "FullDebugMode" option was disabled. (Thanks to Primoz
+    Gabrijelcic.)
+  - Removed some unnecessary startup code when the MM sharing mechanism is
+    disabled. (Thanks to Vladimir Bochkarev.)
+  - In FullDebugMode leaked blocks would sometimes be reported as belonging to
+    the class "TFreedObject" if they were allocated but never used. Such blocks
+    will now be reported as "unknown". (Thanks to Francois Malan.)
+  - In recent versions the replacement borlndmm.dll created a log file (when
+    enabled) that used the "borlndmm" prefix instead of the application name.
+    It is now fixed to use the application name, however if FastMM is used
+    inside other DLLs the name of those DLLs will be used. (Thanks to Bart van
+    der Werf.)
+  - Added a "FastMMVersion" constant. (Suggested by Loris Luise.)
+  - Fixed an issue with error message boxes not displaying under certain
+    configurations. (Thanks to J.W. de Bokx.)
+  - FastMM will now display only one error message at a time. If many errors
+    occur in quick succession, only the first error will be shown (but all will
+    be logged). This avoids a stack overflow with badly misbehaved programs.
+    (Thanks to Bart van der Werf.)
+  - Added a LoadDebugDLLDynamically option to be used in conjunction with
+    FullDebugMode. In this mode FastMM_FullDebugMode.dll is loaded dynamically.
+    If the DLL cannot be found, stack traces will not be available. (Thanks to
+    Rene Mihula.)
+  Version 4.78 (1 March 2007):
+  - The MB_DEFAULT_DESKTOP_ONLY constant that is used when displaying messages
+    boxes since 4.76 is not defined under Kylix, and the source would thus not
+    compile. That constant is now defined. (Thanks to Werner Bochtler.)
+  - Moved the medium block locking code that was duplicated in several places
+    to a subroutine to reduce code size. (Thanks to Hallvard Vassbotn.)
+  - Fixed a bug in the leak registration code that sometimes caused registered
+    leaks to be reported erroneously. (Thanks to Primoz Gabrijelcic.)
+  - Added the NoDebugInfo option (on by default) that suppresses the generation
+    of debug info for the FastMM4.pas unit. This will prevent the integrated
+    debugger from stepping into the memory manager. (Thanks to Primoz
+    Gabrijelcic.)
+  - Increased the default stack trace depth in FullDebugMode from 9 to 10 to
+    ensure that the Align16Bytes setting works in FullDebugMode. (Thanks to
+    Igor Lindunen.)
+  - Updated the Czech translation. (Thanks to Rene Mihula.)
+  Version 4.84 (7 July 2008):
+  - Added the Romanian translation. (Thanks to Ionut Muntean.)
+  - Optimized the GetMemoryMap procedure to improve speed.
+  - Added the GetMemoryManagerUsageSummary function that returns a summary of
+    the GetMemoryManagerState call. (Thanks to Hallvard Vassbotn.)
+  - Added the French translation. (Thanks to Florent Ouchet.)
+  - Added the "AlwaysAllocateTopDown" FullDebugMode option to help with
+    catching bad pointer arithmetic code in an address space > 2GB. This option
+    is enabled by default.
+  - Added the "InstallOnlyIfRunningInIDE" option. Enable this option to
+    only install FastMM as the memory manager when the application is run
+    inside the Delphi IDE. This is useful when you want to deploy the same EXE
+    that you use for testing, but only want the debugging features active on
+    development machines. When this option is enabled and the application is
+    not being run inside the IDE, then the default Delphi memory manager will
+    be used (which, since Delphi 2006, is FastMM without FullDebugMode.) This
+    option is off by default.
+  - Added the "FullDebugModeInIDE" option. This is a convenient shorthand for
+    enabling FullDebugMode, InstallOnlyIfRunningInIDE and
+    LoadDebugDLLDynamically. This causes FastMM to be used in FullDebugMode
+    when the application is being debugged on development machines, and the
+    default memory manager when the same executable is deployed. This allows
+    the debugging and deployment of an application without having to compile
+    separate executables. This option is off by default.
+  - Added a ScanMemoryPoolForCorruptions procedure that checks the entire
+    memory pool for corruptions and raises an exception if one is found. It can
+    be called at any time, but is only available in FullDebugMode. (Thanks to
+    Marcus M�nnig.)
+  - Added a global variable "FullDebugModeScanMemoryPoolBeforeEveryOperation".
+    When this variable is set to true and FullDebugMode is enabled, then the
+    entire memory pool is checked for consistency before every GetMem, FreeMem
+    and ReallocMem operation. An "Out of Memory" error is raised if a
+    corruption is found (and this variable is set to false to prevent recursive
+    errors). This obviously incurs a massive performance hit, so enable it only
+    when hunting for elusive memory corruption bugs. (Thanks to Marcus M�nnig.)
+  - Fixed a bug in AllocMem that caused the FPU stack to be shifted by one
+    position.
+  - Changed the default for option "EnableMMX" to false, since using MMX may
+    cause unexpected behaviour in code that passes parameters on the FPU stack
+    (like some "compiler magic" routines, e.g. VarFromReal).
+  - Removed the "EnableSharingWithDefaultMM" option. This is now the default
+    behaviour and cannot be disabled. (FastMM will always try to share memory
+    managers between itself and the default memory manager when memory manager
+    sharing is enabled.)
+  - Introduced a new memory manager sharing mechanism based on memory mapped
+    files. This solves compatibility issues with console and service
+    applications. This sharing mechanism currently runs in parallel with the
+    old mechanism, but the old mechanism can be disabled by undefining
+    "EnableBackwardCompatibleMMSharing" in FastMM4Options.inc.
+  - Fixed the recursive call error when the EnableMemoryLeakReporting option
+    is disabled and an attempt is made to register a memory leak under Delphi
+    2006 or later. (Thanks to Thomas Schulz.)
+  - Added a global variable "SuppressMessageBoxes" to enable or disable
+    messageboxes at runtime. (Thanks to Craig Peterson.)
+  - Added the leak reporting code for C++ Builder, as well as various other
+    C++ Builder bits written by JiYuan Xie. (Thank you!)
+  - Added the new Usage Tracker written by Hanspeter Widmer. (Thank you!)
+  Version 4.86 (31 July 2008):
+  - Tweaked the string detection algorithm somewhat to be less strict, and
+    allow non-class leaks to be more often categorized as strings.
+  - Fixed a compilation error under Delphi 5.
+  - Made LogAllocatedBlocksToFile and ScanMemoryPoolForCorruptions thread
+    safe. (Thanks to Francois Piette.)
+  Version 4.88 (13 August 2008):
+  - Fixed compiler warnings in NoOpRegisterExpectedMemoryLeak and
+    NoOpUnRegisterExpectedMemoryLeak. (Thanks to Michael Rabatscher.)
+  - Added the Simplified Chinese translation of FastMM4Options.inc by
+    QianYuan Wang. (Thank you!)
+  - Included the updated C++ Builder files with support for BCB6 without
+    update 4 applied. (Submitted by JiYuan Xie. Thanks!)
+  - Fixed a compilation error under Delphi 5.
+  - Made LogAllocatedBlocksToFile and ScanMemoryPoolForCorruptions thread
+    safe - for real this time. (Thanks to Francois Piette.)
+  Version 4.90 (9 September 2008):
+  - Added logging of the thread ID when capturing and displaying stack
+    traces. (Suggested by Allen Bauer and Mark Edington.)
+  - Fixed a Delphi 5 compiler error under FullDebugMode. (Thanks to Maurizio
+    Lotauro and Christian-W. Budde.)
+  - Changed a default setting in FastMM4Options.inc: RawStackTraces is now
+    off by default due to the high number of support requests I receive with
+    regards to the false postives it may cause. I recommend compiling debug
+    builds of applications with the "Stack Frames" option enabled.
+  - Fixed a compilation error under Kylix. (Thanks to Werner Bochtler.)
+  - Official support for Delphi 2009.
+  Version 4.92 (25 November 2008):
+  - Added the DisableLoggingOfMemoryDumps option under FullDebugMode. When
+    this option is set, memory dumps will not be logged for memory leaks or
+    errors. (Thanks to Patrick van Logchem.)
+  - Exposed the class and string type detection code in the interface section
+    for use in application code (if required). (Requested by Patrick van
+    Logchem.)
+  - Fixed a bug in SetMMLogFileName that could cause the log file name to be
+    set incorrectly.
+  - Added BCB4 support. (Thanks to Norbert Spiegel.)
+  - Included the updated Czech translation by Rene Mihula.
+  - When FastMM raises an error due to a freed block being modified, it now
+    logs detail about which bytes in the block were modified.
+  Version 4.94 (28 August 2009):
+  - Added the DoNotInstallIfDLLMissing option that prevents FastMM from
+    installing itself if the FastMM_FullDebugMode.dll library is not
+    available. (Only applicable when FullDebugMode and LoadDebugDLLDynamically
+    are both enabled.) This is useful when the same executable will be used for
+    both debugging and deployment - when the debug support DLL is available
+    FastMM will be installed in FullDebugMode, and otherwise the default memory
+    manager will be used.
+  - Added the FullDebugModeWhenDLLAvailable option that combines the
+    FullDebugMode, LoadDebugDLLDynamically and DoNotInstallIfDLLMissing options.
+  - Re-enabled RawStackTraces by default. The frame based stack traces (even
+    when compiling with stack frames enabled) are generally too incomplete.
+  - Improved the speed of large block operations under FullDebugMode: Since
+    large blocks are never reused, there is no point in clearing them before
+    and after use (so it does not do that anymore).
+  - If an error occurs in FullDebugMode and FastMM is unable to append to the
+    log file, it will attempt to write to a log file of the same name in the
+    "My Documents" folder. This feature is helpful when the executable resides
+    in a read-only location and the default log file, which is derived from the
+    executable name, would thus not be writeable.
+  - Added support for controlling the error log file location through an
+    environment variable. If the 'FastMMLogFilePath' environment variable is
+    set then any generated error logs will be written to the specified folder
+    instead of the default location (which is the same folder as the
+    application).
+  - Improved the call instruction detection code in the FastMM_FullDebugMode
+    library. (Thanks to the JCL team.)
+  - Improved the string leak detection and reporting code. (Thanks to Uwe
+    Schuster.)
+  - New FullDebugMode feature: Whenever FreeMem or ReallocMem is called, FastMM
+    will check that the block was actually allocated through the same FastMM
+    instance. This is useful for tracking down memory manager sharing issues.
+  - Compatible with Delphi 2010.
+  Version 4.96 (31 August 2010):
+  - Reduced the minimum block size to 4 bytes from the previous value of 12
+    bytes (only applicable to 8 byte alignment). This reduces memory usage if
+    the application allocates many blocks <= 4 bytes in size.
+  - Added colour-coded change indication to the FastMM usage tracker, making
+    it easier to spot changes in the memory usage grid. (Thanks to Murray
+    McGowan.)
+  - Added the SuppressFreeMemErrorsInsideException FullDebugMode option: If
+    FastMM encounters a problem with a memory block inside the FullDebugMode
+    FreeMem handler then an "invalid pointer operation" exception will usually
+    be raised. If the FreeMem occurs while another exception is being handled
+    (perhaps in the try.. finally code) then the original exception will be
+    lost. With this option set FastMM will ignore errors inside FreeMem when an
+    exception is being handled, thus allowing the original exception to
+    propagate. This option is on by default. (Thanks to Michael Hieke.)
+  - Fixed Windows 95 FullDebugMode support that was broken in 4.94. (Thanks to
+    Richard Bradbrook.)
+  - Fixed a bug affecting GetMemoryMap performance and accuracy of measurements
+    above 2GB if a large address space is not enabled for the project. (Thanks
+    to Michael Hieke.)
+  - Added the FullDebugModeRegisterAllAllocsAsExpectedMemoryLeak boolean flag.
+    When set, all allocations are automatically registered as expected memory
+    leaks. Only available in FullDebugMode. (Thanks to Brian Cook.)
+  - Compatible with Delphi XE.
+  Version 4.97 (30 September 2010):
+  - Fixed a crash bug (that crept in in 4.96) that may manifest itself when
+    resizing a block to 4 bytes or less.
+  - Added the UseSwitchToThread option. Set this option to call SwitchToThread
+    instead of sitting in a "busy waiting" loop when a thread contention
+    occurs. This is used in conjunction with the NeverSleepOnThreadContention
+    option, and has no effect unless NeverSleepOnThreadContention is also
+    defined. This option may improve performance with many CPU cores and/or
+    threads of different priorities. Note that the SwitchToThread API call is
+    only available on Windows 2000 and later. (Thanks to Zach Saw.)
+  Version 4.98 (23 September 2011):
+  - Added the FullDebugModeCallBacks define which adds support for memory
+    manager event callbacks. This allows the application to be notified of
+    memory allocations, frees and reallocations as they occur. (Thanks to
+    Jeroen Pluimers.)
+  - Added security options ClearMemoryBeforeReturningToOS and
+    AlwaysClearFreedMemory to force the clearing of memory blocks after being
+    freed. This could possibly provide some protection against information
+    theft, but at a significant performance penalty. (Thanks to Andrey
+    Sozonov.)
+  - Shifted the code in the initialization section to a procedure
+    RunInitializationCode. This allows the startup code to be called before
+    InitUnits, which is required by some software protection tools.
+  - Added support for Delphi XE2 (Windows 32-bit and Windows 64-bit platforms
+    only).
+  Version 4.99 (6 November 2011):
+  - Fixed crashes in the 64-bit BASM codepath when more than 4GB of memory is
+    allocated.
+  - Fixed bad record alignment under 64-bit that affected performance.
+  - Fixed compilation errors with some older compilers.
+  Version 4.991 (3 September 2012)
+  - Added the LogMemoryManagerStateToFile call. This call logs a summary of
+    the memory manager state to file: The total allocated memory, overhead,
+    efficiency, and a breakdown of allocated memory by class and string type.
+    This call may be useful to catch objects that do not necessarily leak, but
+    do linger longer than they should.
+  - OS X support added by Sebastian Zierer
+  - Compatible with Delphi XE3
+
+*)
+
+unit FastMM4;
+
+interface
+
+{$Include FastMM4Options.inc}
+
+{$RANGECHECKS OFF}
+{$BOOLEVAL OFF}
+{$OVERFLOWCHECKS OFF}
+{$OPTIMIZATION ON}
+{$TYPEDADDRESS OFF}
+{$LONGSTRINGS ON}
+
+{Compiler version defines}
+{$ifndef BCB}
+  {$ifdef ver120}
+    {$define Delphi4or5}
+  {$endif}
+  {$ifdef ver130}
+    {$define Delphi4or5}
+  {$endif}
+  {$ifdef ver140}
+    {$define Delphi6}
+  {$endif}
+  {$ifdef ver150}
+    {$define Delphi7}
+  {$endif}
+  {$ifdef ver170}
+    {$define Delphi2005}
+  {$endif}
+{$else}
+  {for BCB4, use the Delphi 5 codepath}
+  {$ifdef ver120}
+    {$define Delphi4or5}
+    {$define BCB4}
+  {$endif}
+  {for BCB5, use the Delphi 5 codepath}
+  {$ifdef ver130}
+    {$define Delphi4or5}
+  {$endif}
+{$endif}
+{$ifdef ver180}
+  {$define BDS2006}
+{$endif}
+{$define 32Bit}
+{$ifndef Delphi4or5}
+  {$if SizeOf(Pointer) = 8}
+    {$define 64Bit}
+    {$undef 32Bit}
+  {$ifend}
+  {$if CompilerVersion >= 23}
+    {$define XE2AndUp}
+  {$ifend}
+  {$define BCB6OrDelphi6AndUp}
+  {$ifndef BCB}
+    {$define Delphi6AndUp}
+  {$endif}
+  {$ifndef Delphi6}
+    {$define BCB6OrDelphi7AndUp}
+    {$ifndef BCB}
+      {$define Delphi7AndUp}
+    {$endif}
+    {$ifndef BCB}
+      {$ifndef Delphi7}
+        {$ifndef Delphi2005}
+          {$define BDS2006AndUp}
+        {$endif}
+      {$endif}
+    {$endif}
+  {$endif}
+{$endif}
+
+{$ifdef 64Bit}
+  {Under 64 bit memory blocks must always be 16-byte aligned}
+  {$define Align16Bytes}
+  {No need for MMX under 64-bit, since SSE2 is available}
+  {$undef EnableMMX}
+  {There is little need for raw stack traces under 64-bit, since frame based
+   stack traces are much more accurate than under 32-bit. (And frame based
+   stack tracing is much faster.)}
+  {$undef RawStackTraces}
+{$endif}
+
+{IDE debug mode always enables FullDebugMode and dynamic loading of the FullDebugMode DLL.}
+{$ifdef FullDebugModeInIDE}
+  {$define InstallOnlyIfRunningInIDE}
+  {$define FullDebugMode}
+  {$define LoadDebugDLLDynamically}
+{$endif}
+
+{Install in FullDebugMode only when the DLL is available?}
+{$ifdef FullDebugModeWhenDLLAvailable}
+  {$define FullDebugMode}
+  {$define LoadDebugDLLDynamically}
+  {$define DoNotInstallIfDLLMissing}
+{$endif}
+
+{$ifdef Linux}
+  {$define POSIX}
+{$endif}
+
+{Some features not currently supported under Kylix / OS X}
+{$ifdef POSIX}
+  {$undef FullDebugMode}
+  {$undef LogErrorsToFile}
+  {$undef LogMemoryLeakDetailToFile}
+  {$undef ShareMM}
+  {$undef AttemptToUseSharedMM}
+  {$undef RequireIDEPresenceForLeakReporting}
+  {$undef UseOutputDebugString}
+  {$ifdef PIC}
+    {BASM version does not support position independent code}
+    {$undef ASMVersion}
+  {$endif}
+{$endif}
+
+{Do we require debug info for leak checking?}
+{$ifdef RequireDebugInfoForLeakReporting}
+  {$ifopt D-}
+    {$undef EnableMemoryLeakReporting}
+  {$endif}
+{$endif}
+
+{Enable heap checking and leak reporting in full debug mode}
+{$ifdef FullDebugMode}
+  {$STACKFRAMES ON}
+  {$define CheckHeapForCorruption}
+  {$ifndef CatchUseOfFreedInterfaces}
+    {$define CheckUseOfFreedBlocksOnShutdown}
+  {$endif}
+{$else}
+  {Error logging requires FullDebugMode}
+  {$undef LogErrorsToFile}
+  {$undef CatchUseOfFreedInterfaces}
+  {$undef RawStackTraces}
+  {$undef AlwaysAllocateTopDown}
+{$endif}
+
+{Set defines for security options}
+{$ifdef FullDebugMode}
+  {In FullDebugMode small and medium blocks are always cleared when calling
+   FreeMem. Large blocks are always returned to the OS immediately.}
+  {$ifdef ClearMemoryBeforeReturningToOS}
+    {$define ClearLargeBlocksBeforeReturningToOS}
+  {$endif}
+  {$ifdef AlwaysClearFreedMemory}
+    {$define ClearLargeBlocksBeforeReturningToOS}
+  {$endif}
+{$else}
+  {If memory blocks are cleared in FreeMem then they do not need to be cleared
+   before returning the memory to the OS.}
+  {$ifdef AlwaysClearFreedMemory}
+    {$define ClearSmallAndMediumBlocksInFreeMem}
+    {$define ClearLargeBlocksBeforeReturningToOS}
+  {$else}
+    {$ifdef ClearMemoryBeforeReturningToOS}
+      {$define ClearMediumBlockPoolsBeforeReturningToOS}
+      {$define ClearLargeBlocksBeforeReturningToOS}
+    {$endif}
+  {$endif}
+{$endif}
+
+{Only the Pascal version supports extended heap corruption checking.}
+{$ifdef CheckHeapForCorruption}
+  {$undef ASMVersion}
+{$endif}
+
+{For BASM bits that are not implemented in 64-bit.}
+{$ifdef 32Bit}
+  {$ifdef ASMVersion}
+    {$define Use32BitAsm}
+  {$endif}
+{$endif}
+
+{$ifdef UseRuntimePackages}
+  {$define AssumeMultiThreaded}
+{$endif}
+
+{$ifdef BCB6OrDelphi6AndUp}
+  {$WARN SYMBOL_PLATFORM OFF}
+  {$WARN SYMBOL_DEPRECATED OFF}
+{$endif}
+
+{Leak detail logging requires error logging}
+{$ifndef LogErrorsToFile}
+  {$undef LogMemoryLeakDetailToFile}
+  {$undef ClearLogFileOnStartup}
+{$endif}
+
+{$ifndef EnableMemoryLeakReporting}
+  {Manual leak reporting control requires leak reporting to be enabled}
+  {$undef ManualLeakReportingControl}
+{$endif}
+
+{$ifndef EnableMMX}
+  {$undef ForceMMX}
+{$endif}
+
+{Are any of the MM sharing options enabled?}
+{$ifdef ShareMM}
+  {$define MMSharingEnabled}
+{$endif}
+{$ifdef AttemptToUseSharedMM}
+  {$define MMSharingEnabled}
+{$endif}
+
+{Instruct GExperts to back up the messages file as well.}
+{#BACKUP FastMM4Messages.pas}
+
+{Should debug info be disabled?}
+{$ifdef NoDebugInfo}
+  {$DEBUGINFO OFF}
+{$endif}
+
+{$ifdef BCB}
+  {$ifdef borlndmmdll}
+    {$OBJEXPORTALL OFF}
+  {$endif}
+  {$ifndef PatchBCBTerminate}
+    {Cannot uninstall safely under BCB}
+    {$define NeverUninstall}
+    {Disable memory leak reporting}
+    {$undef EnableMemoryLeakReporting}
+  {$endif}
+{$endif}
+
+{-------------------------Public constants-----------------------------}
+const
+  {The current version of FastMM}
+  FastMMVersion = '4.991';
+  {The number of small block types}
+{$ifdef Align16Bytes}
+  NumSmallBlockTypes = 46;
+{$else}
+  NumSmallBlockTypes = 56;
+{$endif}
+
+{----------------------------Public types------------------------------}
+type
+
+  {Make sure all the required types are available}
+{$ifdef BCB6OrDelphi6AndUp}
+  {$if CompilerVersion < 20}
+  PByte = PAnsiChar;
+  {NativeInt didn't exist or was broken before Delphi 2009.}
+  NativeInt = Integer;
+  {$ifend}
+  {$if CompilerVersion < 21}
+  {NativeUInt didn't exist or was broken before Delphi 2010.}
+  NativeUInt = Cardinal;
+  {$ifend}
+  {$if CompilerVersion < 22}
+  {PNativeUInt didn't exist before Delphi XE.}
+  PNativeUInt = ^Cardinal;
+  {$ifend}
+  {$if CompilerVersion < 23}
+  {IntPtr and UIntPtr didn't exist before Delphi XE2.}
+  IntPtr = Integer;
+  UIntPtr = Cardinal;
+  {$ifend}
+{$else}
+  PByte = PAnsiChar;
+  NativeInt = Integer;
+  NativeUInt = Cardinal;
+  PNativeUInt = ^Cardinal;
+  IntPtr = Integer;
+  UIntPtr = Cardinal;
+{$endif}
+
+  TSmallBlockTypeState = record
+    {The internal size of the block type}
+    InternalBlockSize: Cardinal;
+    {Useable block size: The number of non-reserved bytes inside the block.}
+    UseableBlockSize: Cardinal;
+    {The number of allocated blocks}
+    AllocatedBlockCount: NativeUInt;
+    {The total address space reserved for this block type (both allocated and
+     free blocks)}
+    ReservedAddressSpace: NativeUInt;
+  end;
+  TSmallBlockTypeStates = array[0..NumSmallBlockTypes - 1] of TSmallBlockTypeState;
+
+  TMemoryManagerState = record
+    {Small block type states}
+    SmallBlockTypeStates: TSmallBlockTypeStates;
+    {Medium block stats}
+    AllocatedMediumBlockCount: Cardinal;
+    TotalAllocatedMediumBlockSize: NativeUInt;
+    ReservedMediumBlockAddressSpace: NativeUInt;
+    {Large block stats}
+    AllocatedLargeBlockCount: Cardinal;
+    TotalAllocatedLargeBlockSize: NativeUInt;
+    ReservedLargeBlockAddressSpace: NativeUInt;
+  end;
+
+  TMemoryManagerUsageSummary = record
+    {The total number of bytes allocated by the application.}
+    AllocatedBytes: NativeUInt;
+    {The total number of address space bytes used by control structures, or
+     lost due to fragmentation and other overhead.}
+    OverheadBytes: NativeUInt;
+    {The efficiency of the memory manager expressed as a percentage. This is
+     100 * AllocatedBytes / (AllocatedBytes + OverheadBytes).}
+    EfficiencyPercentage: Double;
+  end;
+
+  {Memory map}
+  TChunkStatus = (csUnallocated, csAllocated, csReserved, csSysAllocated,
+    csSysReserved);
+  TMemoryMap = array[0..65535] of TChunkStatus;
+
+{$ifdef EnableMemoryLeakReporting}
+  {List of registered leaks}
+  TRegisteredMemoryLeak = record
+    LeakAddress: Pointer;
+    LeakedClass: TClass;
+    {$ifdef CheckCppObjectTypeEnabled}
+    LeakedCppTypeIdPtr: Pointer;
+    {$endif}
+    LeakSize: NativeInt;
+    LeakCount: Integer;
+  end;
+  TRegisteredMemoryLeaks = array of TRegisteredMemoryLeak;
+{$endif}
+
+  {Used by the DetectStringData routine to detect whether a leaked block
+   contains string data.}
+  TStringDataType = (stUnknown, stAnsiString, stUnicodeString);
+
+  {The callback procedure for WalkAllocatedBlocks.}
+  TWalkAllocatedBlocksCallback = procedure(APBlock: Pointer; ABlockSize: NativeInt; AUserData: Pointer);
+
+{--------------------------Public variables----------------------------}
+var
+  {If this variable is set to true and FullDebugMode is enabled, then the
+   entire memory pool is checked for consistency before every memory
+   operation. Note that this incurs a massive performance hit on top of
+   the already significant FullDebugMode overhead, so enable this option
+   only when absolutely necessary.}
+  FullDebugModeScanMemoryPoolBeforeEveryOperation: Boolean = False;
+  FullDebugModeRegisterAllAllocsAsExpectedMemoryLeak: Boolean = False;
+{$ifdef ManualLeakReportingControl}
+  {Variable is declared in system.pas in newer Delphi versions.}
+  {$ifndef BDS2006AndUp}
+  ReportMemoryLeaksOnShutdown: Boolean;
+  {$endif}
+{$endif}
+  {If set to True, disables the display of all messageboxes}
+  SuppressMessageBoxes: Boolean;
+
+{-------------------------Public procedures----------------------------}
+{Executes the code normally run in the initialization section. Running it
+ earlier may be required with e.g. some software protection tools.}
+procedure RunInitializationCode;
+{Installation procedures must be exposed for the BCB helper unit FastMM4BCB.cpp}
+{$ifdef BCB}
+procedure InitializeMemoryManager;
+function CheckCanInstallMemoryManager: Boolean;
+procedure InstallMemoryManager;
+
+{$ifdef FullDebugMode}
+(*$HPPEMIT '#define FullDebugMode' *)
+
+{$ifdef ClearLogFileOnStartup}
+(*$HPPEMIT '  #define ClearLogFileOnStartup' *)
+procedure DeleteEventLog;
+{$endif}
+
+{$ifdef LoadDebugDLLDynamically}
+(*$HPPEMIT '  #define LoadDebugDLLDynamically' *)
+{$endif}
+
+{$ifdef RawStackTraces}
+(*$HPPEMIT '  #define RawStackTraces' *)
+{$endif}
+
+{$endif}
+
+{$ifdef PatchBCBTerminate}
+(*$HPPEMIT ''#13#10 *)
+(*$HPPEMIT '#define PatchBCBTerminate' *)
+
+{$ifdef EnableMemoryLeakReporting}
+(*$HPPEMIT ''#13#10 *)
+(*$HPPEMIT '#define EnableMemoryLeakReporting' *)
+{$endif}
+
+{$ifdef DetectMMOperationsAfterUninstall}
+(*$HPPEMIT ''#13#10 *)
+(*$HPPEMIT '#define DetectMMOperationsAfterUninstall' *)
+{$endif}
+
+{Called in FastMM4BCB.cpp, should contain codes of original "finalization" section}
+procedure FinalizeMemoryManager;
+
+{For completion of "RequireDebuggerPresenceForLeakReporting" checking in "FinalizeMemoryManager"}
+var
+  pCppDebugHook: ^Integer = nil; //PInteger not defined in BCB5
+
+{$ifdef CheckCppObjectTypeEnabled}
+(*$HPPEMIT ''#13#10 *)
+(*$HPPEMIT '#define CheckCppObjectTypeEnabled' *)
+
+type
+  TGetCppVirtObjSizeByTypeIdPtrFunc = function(APointer: Pointer): Cardinal;
+  TGetCppVirtObjTypeIdPtrFunc = function(APointer: Pointer; ASize: Cardinal): Pointer;
+  TGetCppVirtObjTypeNameFunc = function(APointer: Pointer; ASize: Cardinal): PAnsiChar;
+  TGetCppVirtObjTypeNameByTypeIdPtrFunc = function (APointer: Pointer): PAnsiChar;
+  TGetCppVirtObjTypeNameByVTablePtrFunc = function(AVTablePtr: Pointer; AVTablePtrOffset: Cardinal): PAnsiChar;
+var
+  {Return virtual object's size from typeId pointer}
+  GetCppVirtObjSizeByTypeIdPtrFunc: TGetCppVirtObjSizeByTypeIdPtrFunc = nil;
+  {Retrieve virtual object's typeId pointer}
+  GetCppVirtObjTypeIdPtrFunc: TGetCppVirtObjTypeIdPtrFunc = nil;
+  {Retrieve virtual object's type name}
+  GetCppVirtObjTypeNameFunc: TGetCppVirtObjTypeNameFunc = nil;
+  {Return virtual object's type name from typeId pointer}
+  GetCppVirtObjTypeNameByTypeIdPtrFunc: TGetCppVirtObjTypeNameByTypeIdPtrFunc = nil;
+  {Retrieve virtual object's typeId pointer from it's virtual table pointer}
+  GetCppVirtObjTypeNameByVTablePtrFunc: TGetCppVirtObjTypeNameByVTablePtrFunc = nil;
+{$endif}
+{$endif}
+{$endif}
+
+{$ifndef FullDebugMode}
+{The standard memory manager functions}
+function FastGetMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer;
+function FastFreeMem(APointer: Pointer): Integer;
+function FastReallocMem(APointer: Pointer; ANewSize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer;
+function FastAllocMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Cardinal{$endif}): Pointer;
+{$else}
+{The FullDebugMode memory manager functions}
+function DebugGetMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer;
+function DebugFreeMem(APointer: Pointer): Integer;
+function DebugReallocMem(APointer: Pointer; ANewSize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer;
+function DebugAllocMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Cardinal{$endif}): Pointer;
+{Scans the memory pool for any corruptions. If a corruption is encountered an "Out of Memory" exception is
+ raised.}
+procedure ScanMemoryPoolForCorruptions;
+{Specify the full path and name for the filename to be used for logging memory
+ errors, etc. If ALogFileName is nil or points to an empty string it will
+ revert to the default log file name.}
+procedure SetMMLogFileName(ALogFileName: PAnsiChar = nil);
+{Returns the current "allocation group". Whenever a GetMem request is serviced
+ in FullDebugMode, the current "allocation group" is stored in the block header.
+ This may help with debugging. Note that if a block is subsequently reallocated
+ that it keeps its original "allocation group" and "allocation number" (all
+ allocations are also numbered sequentially).}
+function GetCurrentAllocationGroup: Cardinal;
+{Allocation groups work in a stack like fashion. Group numbers are pushed onto
+ and popped off the stack. Note that the stack size is limited, so every push
+ should have a matching pop.}
+procedure PushAllocationGroup(ANewCurrentAllocationGroup: Cardinal);
+procedure PopAllocationGroup;
+{Logs detail about currently allocated memory blocks for the specified range of
+ allocation groups. if ALastAllocationGroupToLog is less than
+ AFirstAllocationGroupToLog or it is zero, then all allocation groups are
+ logged. This routine also checks the memory pool for consistency at the same
+ time, raising an "Out of Memory" error if the check fails.}
+procedure LogAllocatedBlocksToFile(AFirstAllocationGroupToLog, ALastAllocationGroupToLog: Cardinal);
+{$endif}
+
+{Releases all allocated memory (use with extreme care)}
+procedure FreeAllMemory;
+
+{Returns summarised information about the state of the memory manager. (For
+ backward compatibility.)}
+function FastGetHeapStatus: THeapStatus;
+{Returns statistics about the current state of the memory manager}
+procedure GetMemoryManagerState(var AMemoryManagerState: TMemoryManagerState);
+{Returns a summary of the information returned by GetMemoryManagerState}
+procedure GetMemoryManagerUsageSummary(
+  var AMemoryManagerUsageSummary: TMemoryManagerUsageSummary);
+{$ifndef POSIX}
+{Gets the state of every 64K block in the 4GB address space}
+procedure GetMemoryMap(var AMemoryMap: TMemoryMap);
+{$endif}
+
+{$ifdef EnableMemoryLeakReporting}
+{Registers expected memory leaks. Returns true on success. The list of leaked
+ blocks is limited, so failure is possible if the list is full.}
+function RegisterExpectedMemoryLeak(ALeakedPointer: Pointer): Boolean; overload;
+function RegisterExpectedMemoryLeak(ALeakedObjectClass: TClass; ACount: Integer = 1): Boolean; overload;
+function RegisterExpectedMemoryLeak(ALeakedBlockSize: NativeInt; ACount: Integer = 1): Boolean; overload;
+{$ifdef CheckCppObjectTypeEnabled}
+{Registers expected memory leaks by virtual object's typeId pointer.
+ Usage: RegisterExpectedMemoryLeak(typeid(ACppObject).tpp, Count);}
+function RegisterExpectedMemoryLeak(ALeakedCppVirtObjTypeIdPtr: Pointer; ACount: Integer): boolean; overload;
+{$endif}
+{Removes expected memory leaks. Returns true on success.}
+function UnregisterExpectedMemoryLeak(ALeakedPointer: Pointer): Boolean; overload;
+function UnregisterExpectedMemoryLeak(ALeakedObjectClass: TClass; ACount: Integer = 1): Boolean; overload;
+function UnregisterExpectedMemoryLeak(ALeakedBlockSize: NativeInt; ACount: Integer = 1): Boolean; overload;
+{$ifdef CheckCppObjectTypeEnabled}
+{Usage: UnregisterExpectedMemoryLeak(typeid(ACppObject).tpp, Count);}
+function UnregisterExpectedMemoryLeak(ALeakedCppVirtObjTypeIdPtr: Pointer; ACount: Integer): boolean; overload;
+{$endif}
+{Returns a list of all expected memory leaks}
+function GetRegisteredMemoryLeaks: TRegisteredMemoryLeaks;
+{$endif}
+
+{Returns the class for a memory block. Returns nil if it is not a valid class.
+ Used by the leak detection code.}
+function DetectClassInstance(APointer: Pointer): TClass;
+{Detects the probable string data type for a memory block. Used by the leak
+ classification code when a block cannot be identified as a known class
+ instance.}
+function DetectStringData(APMemoryBlock: Pointer;
+  AAvailableSpaceInBlock: NativeInt): TStringDataType;
+{Walks all allocated blocks, calling ACallBack for each. Passes the user block size and AUserData to the callback.
+ Important note: All block types will be locked during the callback, so the memory manager cannot be used inside it.}
+procedure WalkAllocatedBlocks(ACallBack: TWalkAllocatedBlocksCallback; AUserData: Pointer);
+{Writes a log file containing a summary of the memory mananger state and a summary of allocated blocks grouped by
+ class. The file will be saved in UTF-8 encoding (in supported Delphi versions). Returns True on success. }
+function LogMemoryManagerStateToFile(const AFileName: string; const AAdditionalDetails: string = ''): Boolean;
+
+{$ifdef FullDebugMode}
+{-------------FullDebugMode constants---------------}
+const
+  {The stack trace depth. (Must be an *uneven* number to ensure that the
+   Align16Bytes option works in FullDebugMode.)}
+  StackTraceDepth = 11;
+  {The number of entries in the allocation group stack}
+  AllocationGroupStackSize = 1000;
+  {The number of fake VMT entries - used to track virtual method calls on
+   freed objects. Do not change this value without also updating TFreedObject.GetVirtualMethodIndex}
+  MaxFakeVMTEntries = 200;
+  {The pattern used to fill unused memory}
+  DebugFillByte = $80;
+{$ifdef 32Bit}
+  DebugFillPattern = $01010101 * Cardinal(DebugFillByte);
+  {The address that is reserved so that accesses to the address of the fill
+   pattern will result in an A/V. (Not used under 64-bit, since the upper half
+   of the address space is always reserved by the OS.)}
+  DebugReservedAddress = $01010000 * Cardinal(DebugFillByte);
+{$else}
+  DebugFillPattern = $8080808080808080;
+{$endif}
+
+{-------------------------FullDebugMode structures--------------------}
+type
+  PStackTrace = ^TStackTrace;
+  TStackTrace = array[0..StackTraceDepth - 1] of NativeUInt;
+
+  TBlockOperation = (boBlockCheck, boGetMem, boFreeMem, boReallocMem);
+
+  {The header placed in front of blocks in FullDebugMode (just after the
+   standard header). Must be a multiple of 16 bytes in size otherwise the
+   Align16Bytes option will not work. Current size = 128 bytes under 32-bit,
+   and 240 bytes under 64-bit.}
+  PFullDebugBlockHeader = ^TFullDebugBlockHeader;
+  TFullDebugBlockHeader = record
+    {Space used by the medium block manager for previous/next block management.
+     If a medium block is binned then these two fields will be modified.}
+    Reserved1: Pointer;
+    Reserved2: Pointer;
+    {Is the block currently allocated? If it is allocated this will be the
+     address of the getmem routine through which it was allocated, otherwise it
+     will be nil.}
+    AllocatedByRoutine: Pointer;
+    {The allocation group: Can be used in the debugging process to group
+     related memory leaks together}
+    AllocationGroup: Cardinal;
+    {The allocation number: All new allocations are numbered sequentially. This
+     number may be useful in memory leak analysis. If it reaches 4G it wraps
+     back to 0.}
+    AllocationNumber: Cardinal;
+    {The call stack when the block was allocated}
+    AllocationStackTrace: TStackTrace;
+    {The thread that allocated the block}
+    AllocatedByThread: Cardinal;
+    {The thread that freed the block}
+    FreedByThread: Cardinal;
+    {The call stack when the block was freed}
+    FreeStackTrace: TStackTrace;
+    {The user requested size for the block. 0 if this is the first time the
+     block is used.}
+    UserSize: NativeUInt;
+    {The object class this block was used for the previous time it was
+     allocated. When a block is freed, the pointer that would normally be in the
+     space of the class pointer is copied here, so if it is detected that
+     the block was used after being freed we have an idea what class it is.}
+    PreviouslyUsedByClass: NativeUInt;
+    {The sum of all the dwords(32-bit)/qwords(64-bit) in this structure
+     excluding the initial two reserved fields and this field.}
+    HeaderCheckSum: NativeUInt;
+  end;
+  {The NativeUInt following the user area of the block is the inverse of
+   HeaderCheckSum. This is used to catch buffer overrun errors.}
+
+  {The class used to catch attempts to execute a virtual method of a freed
+   object}
+  TFreedObject = class
+  public
+    procedure GetVirtualMethodIndex;
+    procedure VirtualMethodError;
+{$ifdef CatchUseOfFreedInterfaces}
+    procedure InterfaceError;
+{$endif}
+  end;
+
+{$ifdef FullDebugModeCallBacks}
+  {FullDebugMode memory manager event callbacks. Note that APHeaderFreedBlock in the TOnDebugFreeMemFinish
+   will not be valid for large (>260K) blocks.}
+  TOnDebugGetMemFinish = procedure(APHeaderNewBlock: PFullDebugBlockHeader; ASize: NativeInt);
+  TOnDebugFreeMemStart = procedure(APHeaderBlockToFree: PFullDebugBlockHeader);
+  TOnDebugFreeMemFinish = procedure(APHeaderFreedBlock: PFullDebugBlockHeader; AResult: Integer);
+  TOnDebugReallocMemStart = procedure(APHeaderBlockToReallocate: PFullDebugBlockHeader; ANewSize: NativeInt);
+  TOnDebugReallocMemFinish = procedure(APHeaderReallocatedBlock: PFullDebugBlockHeader; ANewSize: NativeInt);
+
+var
+  {Note: FastMM will not catch exceptions inside these hooks, so make sure your hook code runs without
+   exceptions.}
+  OnDebugGetMemFinish: TOnDebugGetMemFinish = nil;
+  OnDebugFreeMemStart: TOnDebugFreeMemStart = nil;
+  OnDebugFreeMemFinish: TOnDebugFreeMemFinish = nil;
+  OnDebugReallocMemStart: TOnDebugReallocMemStart = nil;
+  OnDebugReallocMemFinish: TOnDebugReallocMemFinish = nil;
+{$endif}
+{$endif}
+
+implementation
+
+uses
+{$ifndef POSIX}
+  Windows,
+  {$ifdef FullDebugMode}
+    {$ifdef Delphi4or5}
+  ShlObj,
+    {$else}
+  SHFolder,
+    {$endif}
+  {$endif}
+{$else}
+  {$ifdef MACOS}
+  Posix.Stdlib, Posix.Unistd, Posix.Fcntl,
+  {$ELSE}
+  Libc,
+  {$endif}
+{$endif}
+  FastMM4Messages;
+
+{Fixed size move procedures. The 64-bit versions assume 16-byte alignment.}
+procedure Move4(const ASource; var ADest; ACount: NativeInt); forward;
+procedure Move12(const ASource; var ADest; ACount: NativeInt); forward;
+procedure Move20(const ASource; var ADest; ACount: NativeInt); forward;
+procedure Move28(const ASource; var ADest; ACount: NativeInt); forward;
+procedure Move36(const ASource; var ADest; ACount: NativeInt); forward;
+procedure Move44(const ASource; var ADest; ACount: NativeInt); forward;
+procedure Move52(const ASource; var ADest; ACount: NativeInt); forward;
+procedure Move60(const ASource; var ADest; ACount: NativeInt); forward;
+procedure Move68(const ASource; var ADest; ACount: NativeInt); forward;
+{$ifdef 64Bit}
+{These are not needed and thus unimplemented under 32-bit}
+procedure Move8(const ASource; var ADest; ACount: NativeInt); forward;
+procedure Move24(const ASource; var ADest; ACount: NativeInt); forward;
+procedure Move40(const ASource; var ADest; ACount: NativeInt); forward;
+procedure Move56(const ASource; var ADest; ACount: NativeInt); forward;
+{$endif}
+
+{$ifdef DetectMMOperationsAfterUninstall}
+{Invalid handlers to catch MM operations after uninstall}
+function InvalidFreeMem(APointer: Pointer): Integer; forward;
+function InvalidGetMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer; forward;
+function InvalidReallocMem(APointer: Pointer; ANewSize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer; forward;
+function InvalidAllocMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Cardinal{$endif}): Pointer; forward;
+function InvalidRegisterAndUnRegisterMemoryLeak(APointer: Pointer): Boolean; forward;
+{$endif}
+
+{-------------------------Private constants----------------------------}
+const
+  {The size of a medium block pool. This is allocated through VirtualAlloc and
+   is used to serve medium blocks. The size must be a multiple of 16 and at
+   least 4 bytes less than a multiple of 4K (the page size) to prevent a
+   possible read access violation when reading past the end of a memory block
+   in the optimized move routine (MoveX16LP). In Full Debug mode we leave a
+   trailing 256 bytes to be able to safely do a memory dump.}
+  MediumBlockPoolSize = 20 * 64 * 1024{$ifndef FullDebugMode} - 16{$else} - 256{$endif};
+  {The granularity of small blocks}
+{$ifdef Align16Bytes}
+  SmallBlockGranularity = 16;
+{$else}
+  SmallBlockGranularity = 8;
+{$endif}
+  {The granularity of medium blocks. Newly allocated medium blocks are
+   a multiple of this size plus MediumBlockSizeOffset, to avoid cache line
+   conflicts}
+  MediumBlockGranularity = 256;
+  MediumBlockSizeOffset = 48;
+  {The granularity of large blocks}
+  LargeBlockGranularity = 65536;
+  {The maximum size of a small block. Blocks Larger than this are either
+   medium or large blocks.}
+  MaximumSmallBlockSize = 2608;
+  {The smallest medium block size. (Medium blocks are rounded up to the nearest
+   multiple of MediumBlockGranularity plus MediumBlockSizeOffset)}
+  MinimumMediumBlockSize = 11 * 256 + MediumBlockSizeOffset;
+  {The number of bins reserved for medium blocks}
+  MediumBlockBinsPerGroup = 32;
+  MediumBlockBinGroupCount = 32;
+  MediumBlockBinCount = MediumBlockBinGroupCount * MediumBlockBinsPerGroup;
+  {The maximum size allocatable through medium blocks. Blocks larger than this
+   fall through to VirtualAlloc ( = large blocks).}
+  MaximumMediumBlockSize = MinimumMediumBlockSize + (MediumBlockBinCount - 1) * MediumBlockGranularity;
+  {The target number of small blocks per pool. The actual number of blocks per
+   pool may be much greater for very small sizes and less for larger sizes. The
+   cost of allocating the small block pool is amortized across all the small
+   blocks in the pool, however the blocks may not all end up being used so they
+   may be lying idle.}
+  TargetSmallBlocksPerPool = 48;
+  {The minimum number of small blocks per pool. Any available medium block must
+   have space for roughly this many small blocks (or more) to be useable as a
+   small block pool.}
+  MinimumSmallBlocksPerPool = 12;
+  {The lower and upper limits for the optimal small block pool size}
+  OptimalSmallBlockPoolSizeLowerLimit = 29 * 1024 - MediumBlockGranularity + MediumBlockSizeOffset;
+  OptimalSmallBlockPoolSizeUpperLimit = 64 * 1024 - MediumBlockGranularity + MediumBlockSizeOffset;
+  {The maximum small block pool size. If a free block is this size or larger
+   then it will be split.}
+  MaximumSmallBlockPoolSize = OptimalSmallBlockPoolSizeUpperLimit + MinimumMediumBlockSize;
+  {-------------Block type flags--------------}
+  {The lower 3 bits in the dword header of small blocks (4 bits in medium and
+   large blocks) are used as flags to indicate the state of the block}
+  {Set if the block is not in use}
+  IsFreeBlockFlag = 1;
+  {Set if this is a medium block}
+  IsMediumBlockFlag = 2;
+  {Set if it is a medium block being used as a small block pool. Only valid if
+   IsMediumBlockFlag is set.}
+  IsSmallBlockPoolInUseFlag = 4;
+  {Set if it is a large block. Only valid if IsMediumBlockFlag is not set.}
+  IsLargeBlockFlag = 4;
+  {Is the medium block preceding this block available? (Only used by medium
+   blocks)}
+  PreviousMediumBlockIsFreeFlag = 8;
+  {Is this large block segmented? I.e. is it actually built up from more than
+   one chunk allocated through VirtualAlloc? (Only used by large blocks.)}
+  LargeBlockIsSegmented = 8;
+  {The flags masks for small blocks}
+  DropSmallFlagsMask = -8;
+  ExtractSmallFlagsMask = 7;
+  {The flags masks for medium and large blocks}
+  DropMediumAndLargeFlagsMask = -16;
+  ExtractMediumAndLargeFlagsMask = 15;
+  {-------------Block resizing constants---------------}
+  SmallBlockDownsizeCheckAdder = 64;
+  SmallBlockUpsizeAdder = 32;
+  {When a medium block is reallocated to a size smaller than this, then it must
+   be reallocated to a small block and the data moved. If not, then it is
+   shrunk in place down to MinimumMediumBlockSize. Currently the limit is set
+   at a quarter of the minimum medium block size.}
+  MediumInPlaceDownsizeLimit = MinimumMediumBlockSize div 4;
+  {-------------Memory leak reporting constants---------------}
+  ExpectedMemoryLeaksListSize = 64 * 1024;
+  {-------------Other constants---------------}
+{$ifndef NeverSleepOnThreadContention}
+  {Sleep time when a resource (small/medium/large block manager) is in use}
+  InitialSleepTime = 0;
+  {Used when the resource is still in use after the first sleep}
+  AdditionalSleepTime = 1;
+{$endif}
+  {Hexadecimal characters}
+  HexTable: array[0..15] of AnsiChar = ('0', '1', '2', '3', '4', '5', '6', '7',
+    '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
+  {Copyright message - not used anywhere in the code}
+  Copyright: AnsiString = 'FastMM4 (c) 2004 - 2011 Pierre le Riche / Professional Software Development';
+{$ifdef FullDebugMode}
+  {Virtual Method Called On Freed Object Errors}
+  StandardVirtualMethodNames: array[1 + vmtParent div SizeOf(Pointer) .. vmtDestroy div SizeOf(Pointer)] of PAnsiChar = (
+{$ifdef BCB6OrDelphi6AndUp}
+  {$if RTLVersion >= 20}
+    'Equals',
+    'GetHashCode',
+    'ToString',
+  {$ifend}
+{$endif}
+    'SafeCallException',
+    'AfterConstruction',
+    'BeforeDestruction',
+    'Dispatch',
+    'DefaultHandler',
+    'NewInstance',
+    'FreeInstance',
+    'Destroy');
+  {The name of the FullDebugMode support DLL. The support DLL implements stack
+   tracing and the conversion of addresses to unit and line number information.}
+{$ifdef 32Bit}
+  FullDebugModeLibraryName = FullDebugModeLibraryName32Bit;
+{$else}
+  FullDebugModeLibraryName = FullDebugModeLibraryName64Bit;
+{$endif}
+{$endif}
+
+{-------------------------Private types----------------------------}
+type
+
+{$ifdef Delphi4or5}
+  {Delphi 5 Compatibility}
+  PCardinal = ^Cardinal;
+  PPointer = ^Pointer;
+{$endif}
+{$ifdef BCB4}
+  {Define some additional types for BCB4}
+  PInteger  = ^Integer;
+{$endif}
+
+  {Move procedure type}
+  TMoveProc = procedure(const ASource; var ADest; ACount: NativeInt);
+
+  {Registers structure (for GetCPUID)}
+  TRegisters = record
+    RegEAX, RegEBX, RegECX, RegEDX: Integer;
+  end;
+
+  {The layout of a string allocation. Used to detect string leaks.}
+  PStrRec = ^StrRec;
+  StrRec = packed record
+{$ifdef 64Bit}
+    _Padding: Integer;
+{$endif}
+{$ifdef BCB6OrDelphi6AndUp}
+  {$if RTLVersion >= 20}
+    codePage: Word;
+    elemSize: Word;
+  {$ifend}
+{$endif}
+    refCnt: Integer;
+    length: Integer;
+  end;
+
+{$ifdef EnableMemoryLeakReporting}
+  {Different kinds of memory leaks}
+  TMemoryLeakType = (mltUnexpectedLeak, mltExpectedLeakRegisteredByPointer,
+    mltExpectedLeakRegisteredByClass, mltExpectedLeakRegisteredBySize);
+{$endif}
+
+  {---------------Small block structures-------------}
+
+  {Pointer to the header of a small block pool}
+  PSmallBlockPoolHeader = ^TSmallBlockPoolHeader;
+
+  {Small block type (Size = 32 bytes for 32-bit, 64 bytes for 64-bit).}
+  PSmallBlockType = ^TSmallBlockType;
+  TSmallBlockType = record
+    {True = Block type is locked}
+    BlockTypeLocked: Boolean;
+    {Bitmap indicating which of the first 8 medium block groups contain blocks
+     of a suitable size for a block pool.}
+    AllowedGroupsForBlockPoolBitmap: Byte;
+    {The block size for this block type}
+    BlockSize: Word;
+    {The minimum and optimal size of a small block pool for this block type}
+    MinimumBlockPoolSize: Word;
+    OptimalBlockPoolSize: Word;
+    {The first partially free pool for the given small block. This field must
+     be at the same offset as TSmallBlockPoolHeader.NextPartiallyFreePool.}
+    NextPartiallyFreePool: PSmallBlockPoolHeader;
+    {The last partially free pool for the small block type. This field must
+     be at the same offset as TSmallBlockPoolHeader.PreviousPartiallyFreePool.}
+    PreviousPartiallyFreePool: PSmallBlockPoolHeader;
+    {The offset of the last block that was served sequentially. The field must
+     be at the same offset as TSmallBlockPoolHeader.FirstFreeBlock.}
+    NextSequentialFeedBlockAddress: Pointer;
+    {The last block that can be served sequentially.}
+    MaxSequentialFeedBlockAddress: Pointer;
+    {The pool that is current being used to serve blocks in sequential order}
+    CurrentSequentialFeedPool: PSmallBlockPoolHeader;
+{$ifdef UseCustomFixedSizeMoveRoutines}
+    {The fixed size move procedure used to move data for this block size when
+     it is upsized. When a block is downsized (which usually does not occur
+     that often) the variable size move routine is used.}
+    UpsizeMoveProcedure: TMoveProc;
+{$else}
+    Reserved1: Pointer;
+{$endif}
+{$ifdef 64Bit}
+    {Pad to 64 bytes for 64-bit}
+    Reserved2: Pointer;
+{$endif}
+  end;
+
+  {Small block pool (Size = 32 bytes for 32-bit, 48 bytes for 64-bit).}
+  TSmallBlockPoolHeader = record
+    {BlockType}
+    BlockType: PSmallBlockType;
+{$ifdef 32Bit}
+    {Align the next fields to the same fields in TSmallBlockType and pad this
+     structure to 32 bytes for 32-bit}
+    Reserved1: Cardinal;
+{$endif}
+    {The next and previous pool that has free blocks of this size. Do not
+     change the position of these two fields: They must be at the same offsets
+     as the fields in TSmallBlockType of the same name.}
+    NextPartiallyFreePool: PSmallBlockPoolHeader;
+    PreviousPartiallyFreePool: PSmallBlockPoolHeader;
+    {Pointer to the first free block inside this pool. This field must be at
+     the same offset as TSmallBlockType.NextSequentialFeedBlockAddress.}
+    FirstFreeBlock: Pointer;
+    {The number of blocks allocated in this pool.}
+    BlocksInUse: Cardinal;
+    {Padding}
+    Reserved2: Cardinal;
+    {The pool pointer and flags of the first block}
+    FirstBlockPoolPointerAndFlags: NativeUInt;
+  end;
+
+  {Small block layout:
+   At offset -SizeOf(Pointer) = Flags + address of the small block pool.
+   At offset BlockSize - SizeOf(Pointer) = Flags + address of the small block
+   pool for the next small block.
+  }
+
+  {------------------------Medium block structures------------------------}
+
+  {The medium block pool from which medium blocks are drawn. Size = 16 bytes
+   for 32-bit and 32 bytes for 64-bit.}
+  PMediumBlockPoolHeader = ^TMediumBlockPoolHeader;
+  TMediumBlockPoolHeader = record
+    {Points to the previous and next medium block pools. This circular linked
+     list is used to track memory leaks on program shutdown.}
+    PreviousMediumBlockPoolHeader: PMediumBlockPoolHeader;
+    NextMediumBlockPoolHeader: PMediumBlockPoolHeader;
+    {Padding}
+    Reserved1: NativeUInt;
+    {The block size and flags of the first medium block in the block pool}
+    FirstMediumBlockSizeAndFlags: NativeUInt;
+  end;
+
+  {Medium block layout:
+   Offset: -2 * SizeOf(Pointer) = Previous Block Size (only if the previous block is free)
+   Offset: -SizeOf(Pointer) = This block size and flags
+   Offset: 0 = User data / Previous Free Block (if this block is free)
+   Offset: SizeOf(Pointer) = Next Free Block (if this block is free)
+   Offset: BlockSize - 2*SizeOf(Pointer) = Size of this block (if this block is free)
+   Offset: BlockSize - SizeOf(Pointer) = Size of the next block and flags
+
+  {A medium block that is unused}
+  PMediumFreeBlock = ^TMediumFreeBlock;
+  TMediumFreeBlock = record
+    PreviousFreeBlock: PMediumFreeBlock;
+    NextFreeBlock: PMediumFreeBlock;
+  end;
+
+  {-------------------------Large block structures------------------------}
+
+  {Large block header record (Size = 16 for 32-bit, 32 for 64-bit)}
+  PLargeBlockHeader = ^TLargeBlockHeader;
+  TLargeBlockHeader = record
+    {Points to the previous and next large blocks. This circular linked
+     list is used to track memory leaks on program shutdown.}
+    PreviousLargeBlockHeader: PLargeBlockHeader;
+    NextLargeBlockHeader: PLargeBlockHeader;
+    {The user allocated size of the Large block}
+    UserAllocatedSize: NativeUInt;
+    {The size of this block plus the flags}
+    BlockSizeAndFlags: NativeUInt;
+  end;
+
+  {-------------------------Expected Memory Leak Structures--------------------}
+{$ifdef EnableMemoryLeakReporting}
+
+  {The layout of an expected leak. All fields may not be specified, in which
+   case it may be harder to determine which leaks are expected and which are
+   not.}
+  PExpectedMemoryLeak = ^TExpectedMemoryLeak;
+  PPExpectedMemoryLeak = ^PExpectedMemoryLeak;
+  TExpectedMemoryLeak = record
+    {Linked list pointers}
+    PreviousLeak, NextLeak: PExpectedMemoryLeak;
+    {Information about the expected leak}
+    LeakAddress: Pointer;
+    LeakedClass: TClass;
+    {$ifdef CheckCppObjectTypeEnabled}
+    LeakedCppTypeIdPtr: Pointer;
+    {$endif}
+    LeakSize: NativeInt;
+    LeakCount: Integer;
+  end;
+
+  TExpectedMemoryLeaks = record
+    {The number of entries used in the expected leaks buffer}
+    EntriesUsed: Integer;
+    {Freed entries}
+    FirstFreeSlot: PExpectedMemoryLeak;
+    {Entries with the address specified}
+    FirstEntryByAddress: PExpectedMemoryLeak;
+    {Entries with no address specified, but with the class specified}
+    FirstEntryByClass: PExpectedMemoryLeak;
+    {Entries with only size specified}
+    FirstEntryBySizeOnly: PExpectedMemoryLeak;
+    {The expected leaks buffer (Need to leave space for this header)}
+    ExpectedLeaks: array[0..(ExpectedMemoryLeaksListSize - 64) div SizeOf(TExpectedMemoryLeak) - 1] of TExpectedMemoryLeak;
+  end;
+  PExpectedMemoryLeaks = ^TExpectedMemoryLeaks;
+
+{$endif}
+
+{-------------------------Private constants----------------------------}
+const
+{$ifndef BCB6OrDelphi7AndUp}
+  reOutOfMemory = 1;
+  reInvalidPtr = 2;
+{$endif}
+  {The size of the block header in front of small and medium blocks}
+  BlockHeaderSize = SizeOf(Pointer);
+  {The size of a small block pool header}
+  SmallBlockPoolHeaderSize = SizeOf(TSmallBlockPoolHeader);
+  {The size of a medium block pool header}
+  MediumBlockPoolHeaderSize = SizeOf(TMediumBlockPoolHeader);
+  {The size of the header in front of Large blocks}
+  LargeBlockHeaderSize = SizeOf(TLargeBlockHeader);
+{$ifdef FullDebugMode}
+  {We need space for the header, the trailer checksum and the trailing block
+   size (only used by freed medium blocks).}
+  FullDebugBlockOverhead = SizeOf(TFullDebugBlockHeader) + SizeOf(NativeUInt) + SizeOf(Pointer);
+{$endif}
+
+{-------------------------Private variables----------------------------}
+var
+  {-----------------Small block management------------------}
+  {The small block types. Sizes include the leading header. Sizes are
+   picked to limit maximum wastage to about 10% or 256 bytes (whichever is
+   less) where possible.}
+  SmallBlockTypes: array[0..NumSmallBlockTypes - 1] of TSmallBlockType =(
+    {8/16 byte jumps}
+{$ifndef Align16Bytes}
+    (BlockSize: 8 {$ifdef UseCustomFixedSizeMoveRoutines}; UpsizeMoveProcedure: Move4{$endif}),
+{$endif}
+    (BlockSize: 16 {$ifdef UseCustomFixedSizeMoveRoutines}; UpsizeMoveProcedure: {$ifdef 32Bit}Move12{$else}Move8{$endif}{$endif}),
+{$ifndef Align16Bytes}
+    (BlockSize: 24 {$ifdef UseCustomFixedSizeMoveRoutines}; UpsizeMoveProcedure: Move20{$endif}),
+{$endif}
+    (BlockSize: 32 {$ifdef UseCustomFixedSizeMoveRoutines}; UpsizeMoveProcedure: {$ifdef 32Bit}Move28{$else}Move24{$endif}{$endif}),
+{$ifndef Align16Bytes}
+    (BlockSize: 40 {$ifdef UseCustomFixedSizeMoveRoutines}; UpsizeMoveProcedure: Move36{$endif}),
+{$endif}
+    (BlockSize: 48 {$ifdef UseCustomFixedSizeMoveRoutines}; UpsizeMoveProcedure: {$ifdef 32Bit}Move44{$else}Move40{$endif}{$endif}),
+{$ifndef Align16Bytes}
+    (BlockSize: 56 {$ifdef UseCustomFixedSizeMoveRoutines}; UpsizeMoveProcedure: Move52{$endif}),
+{$endif}
+    (BlockSize: 64 {$ifdef UseCustomFixedSizeMoveRoutines}; UpsizeMoveProcedure: {$ifdef 32Bit}Move60{$else}Move56{$endif}{$endif}),
+{$ifndef Align16Bytes}
+    (BlockSize: 72 {$ifdef UseCustomFixedSizeMoveRoutines}; UpsizeMoveProcedure: Move68{$endif}),
+{$endif}
+    (BlockSize: 80),
+{$ifndef Align16Bytes}
+    (BlockSize: 88),
+{$endif}
+    (BlockSize: 96),
+{$ifndef Align16Bytes}
+    (BlockSize: 104),
+{$endif}
+    (BlockSize: 112),
+{$ifndef Align16Bytes}
+    (BlockSize: 120),
+{$endif}
+    (BlockSize: 128),
+{$ifndef Align16Bytes}
+    (BlockSize: 136),
+{$endif}
+    (BlockSize: 144),
+{$ifndef Align16Bytes}
+    (BlockSize: 152),
+{$endif}
+    (BlockSize: 160),
+    {16 byte jumps}
+    (BlockSize: 176),
+    (BlockSize: 192),
+    (BlockSize: 208),
+    (BlockSize: 224),
+    (BlockSize: 240),
+    (BlockSize: 256),
+    (BlockSize: 272),
+    (BlockSize: 288),
+    (BlockSize: 304),
+    (BlockSize: 320),
+    {32 byte jumps}
+    (BlockSize: 352),
+    (BlockSize: 384),
+    (BlockSize: 416),
+    (BlockSize: 448),
+    (BlockSize: 480),
+    {48 byte jumps}
+    (BlockSize: 528),
+    (BlockSize: 576),
+    (BlockSize: 624),
+    (BlockSize: 672),
+    {64 byte jumps}
+    (BlockSize: 736),
+    (BlockSize: 800),
+    {80 byte jumps}
+    (BlockSize: 880),
+    (BlockSize: 960),
+    {96 byte jumps}
+    (BlockSize: 1056),
+    (BlockSize: 1152),
+    {112 byte jumps}
+    (BlockSize: 1264),
+    (BlockSize: 1376),
+    {128 byte jumps}
+    (BlockSize: 1504),
+    {144 byte jumps}
+    (BlockSize: 1648),
+    {160 byte jumps}
+    (BlockSize: 1808),
+    {176 byte jumps}
+    (BlockSize: 1984),
+    {192 byte jumps}
+    (BlockSize: 2176),
+    {208 byte jumps}
+    (BlockSize: 2384),
+    {224 byte jumps}
+    (BlockSize: MaximumSmallBlockSize),
+    {The last block size occurs three times. If, during a GetMem call, the
+     requested block size is already locked by another thread then up to two
+     larger block sizes may be used instead. Having the last block size occur
+     three times avoids the need to have a size overflow check.}
+    (BlockSize: MaximumSmallBlockSize),
+    (BlockSize: MaximumSmallBlockSize));
+  {Size to small block type translation table}
+  AllocSize2SmallBlockTypeIndX4: array[0..(MaximumSmallBlockSize - 1) div SmallBlockGranularity] of Byte;
+  {-----------------Medium block management------------------}
+  {A dummy medium block pool header: Maintains a circular list of all medium
+   block pools to enable memory leak detection on program shutdown.}
+  MediumBlockPoolsCircularList: TMediumBlockPoolHeader;
+  {Are medium blocks locked?}
+  MediumBlocksLocked: Boolean;
+  {The sequential feed medium block pool.}
+  LastSequentiallyFedMediumBlock: Pointer;
+  MediumSequentialFeedBytesLeft: Cardinal;
+  {The medium block bins are divided into groups of 32 bins. If a bit
+   is set in this group bitmap, then at least one bin in the group has free
+   blocks.}
+  MediumBlockBinGroupBitmap: Cardinal;
+  {The medium block bins: total of 32 * 32 = 1024 bins of a certain
+   minimum size.}
+  MediumBlockBinBitmaps: array[0..MediumBlockBinGroupCount - 1] of Cardinal;
+  {The medium block bins. There are 1024 LIFO circular linked lists each
+   holding blocks of a specified minimum size. The sizes vary in size from
+   MinimumMediumBlockSize to MaximumMediumBlockSize. The bins are treated as
+   type TMediumFreeBlock to avoid pointer checks.}
+  MediumBlockBins: array[0..MediumBlockBinCount - 1] of TMediumFreeBlock;
+  {-----------------Large block management------------------}
+  {Are large blocks locked?}
+  LargeBlocksLocked: Boolean;
+  {A dummy large block header: Maintains a list of all allocated large blocks
+   to enable memory leak detection on program shutdown.}
+  LargeBlocksCircularList: TLargeBlockHeader;
+  {-------------------------Expected Memory Leak Structures--------------------}
+{$ifdef EnableMemoryLeakReporting}
+  {The expected memory leaks}
+  ExpectedMemoryLeaks: PExpectedMemoryLeaks;
+  ExpectedMemoryLeaksListLocked: Boolean;
+{$endif}
+  {---------------------Full Debug Mode structures--------------------}
+{$ifdef FullDebugMode}
+  {The allocation group stack}
+  AllocationGroupStack: array[0..AllocationGroupStackSize - 1] of Cardinal;
+  {The allocation group stack top (it is an index into AllocationGroupStack)}
+  AllocationGroupStackTop: Cardinal;
+  {The last allocation number used}
+  CurrentAllocationNumber: Cardinal;
+  {This is a count of the number of threads currently inside any of the
+   FullDebugMode GetMem, Freemem or ReallocMem handlers. If this value
+   is negative then a block scan is in progress and no thread may
+   allocate, free or reallocate any block or modify any FullDebugMode
+   block header or footer.}
+  ThreadsInFullDebugModeRoutine: Integer;
+  {The current log file name}
+  MMLogFileName: array[0..1023] of AnsiChar;
+  {The 64K block of reserved memory used to trap invalid memory accesses using
+   fields in a freed object.}
+  ReservedBlock: Pointer;
+  {The virtual method index count - used to get the virtual method index for a
+   virtual method call on a freed object.}
+  VMIndex: Integer;
+  {The fake VMT used to catch virtual method calls on freed objects.}
+  FreedObjectVMT: packed record
+    VMTData: array[vmtSelfPtr .. vmtParent + SizeOf(Pointer) - 1] of byte;
+    VMTMethods: array[SizeOf(Pointer) + vmtParent .. vmtParent + MaxFakeVMTEntries * SizeOf(Pointer) + SizeOf(Pointer) - 1] of Byte;
+  end;
+  {$ifdef CatchUseOfFreedInterfaces}
+  VMTBadInterface: array[0..MaxFakeVMTEntries - 1] of Pointer;
+  {$endif}
+{$endif}
+  {--------------Other info--------------}
+  {The memory manager that was replaced}
+  OldMemoryManager: {$ifndef BDS2006AndUp}TMemoryManager{$else}TMemoryManagerEx{$endif};
+  {The replacement memory manager}
+  NewMemoryManager: {$ifndef BDS2006AndUp}TMemoryManager{$else}TMemoryManagerEx{$endif};
+{$ifdef DetectMMOperationsAfterUninstall}
+  {Invalid handlers to catch MM operations after uninstall}
+  InvalidMemoryManager: {$ifndef BDS2006AndUp}TMemoryManager{$else}TMemoryManagerEx{$endif} = (
+    GetMem: InvalidGetMem;
+    FreeMem: InvalidFreeMem;
+    ReallocMem: InvalidReallocMem
+  {$ifdef BDS2006AndUp};
+    AllocMem: InvalidAllocMem;
+    RegisterExpectedMemoryLeak: InvalidRegisterAndUnRegisterMemoryLeak;
+    UnRegisterExpectedMemoryLeak: InvalidRegisterAndUnRegisterMemoryLeak;
+  {$endif}
+  );
+{$endif}
+
+{$ifdef MMSharingEnabled}
+  {A string uniquely identifying the current process (for sharing the memory
+   manager between DLLs and the main application)}
+  MappingObjectName: array[0..25] of AnsiChar = ('L', 'o', 'c', 'a', 'l', '\',
+    'F', 'a', 's', 't', 'M', 'M', '_', 'P', 'I', 'D', '_', '?', '?', '?', '?',
+    '?', '?', '?', '?', #0);
+{$ifdef EnableBackwardCompatibleMMSharing}
+  UniqueProcessIDString: array[1..20] of AnsiChar = ('?', '?', '?', '?', '?',
+    '?', '?', '?', '_', 'P', 'I', 'D', '_', 'F', 'a', 's', 't', 'M', 'M', #0);
+  UniqueProcessIDStringBE: array[1..23] of AnsiChar = ('?', '?', '?', '?', '?',
+    '?', '?', '?', '_', 'P', 'I', 'D', '_', 'F', 'a', 's', 't', 'M', 'M', '_',
+    'B', 'E', #0);
+  {The handle of the MM window}
+  MMWindow: HWND;
+  {The handle of the MM window (for default MM of Delphi 2006 compatibility)}
+  MMWindowBE: HWND;
+{$endif}
+  {The handle of the memory mapped file}
+  MappingObjectHandle: NativeUInt;
+{$endif}
+  {Has FastMM been installed?}
+  FastMMIsInstalled: Boolean;
+  {Is the MM in place a shared memory manager?}
+  IsMemoryManagerOwner: Boolean;
+  {Must MMX be used for move operations?}
+{$ifdef EnableMMX}
+  {$ifndef ForceMMX}
+  UseMMX: Boolean;
+  {$endif}
+{$endif}
+  {Is a MessageBox currently showing? If so, do not show another one.}
+  ShowingMessageBox: Boolean;
+  {True if RunInitializationCode has been called already.}
+  InitializationCodeHasRun: Boolean = False;
+
+{----------------Utility Functions------------------}
+
+{A copy of StrLen in order to avoid the SysUtils unit, which would have
+ introduced overhead like exception handling code.}
+function StrLen(const AStr: PAnsiChar): NativeUInt;
+{$ifndef Use32BitAsm}
+begin
+  Result := 0;
+  while AStr[Result] <> #0 do
+    Inc(Result);
+end;
+{$else}
+asm
+  {Check the first byte}
+  cmp byte ptr [eax], 0
+  je @ZeroLength
+  {Get the negative of the string start in edx}
+  mov edx, eax
+  neg edx
+  {Word align}
+  add eax, 1
+  and eax, -2
+@ScanLoop:
+  mov cx, [eax]
+  add eax, 2
+  test cl, ch
+  jnz @ScanLoop
+  test cl, cl
+  jz @ReturnLess2
+  test ch, ch
+  jnz @ScanLoop
+  lea eax, [eax + edx - 1]
+  ret
+@ReturnLess2:
+  lea eax, [eax + edx - 2]
+  ret
+@ZeroLength:
+  xor eax, eax
+end;
+{$endif}
+
+{$ifdef EnableMMX}
+{$ifndef ForceMMX}
+{Returns true if the CPUID instruction is supported}
+function CPUID_Supported: Boolean;
+asm
+  pushfd
+  pop eax
+  mov edx, eax
+  xor eax, $200000
+  push eax
+  popfd
+  pushfd
+  pop eax
+  xor eax, edx
+  setnz al
+end;
+
+{Gets the CPUID}
+function GetCPUID(AInfoRequired: Integer): TRegisters;
+asm
+  push ebx
+  push esi
+  mov esi, edx
+  {cpuid instruction}
+{$ifdef Delphi4or5}
+  db $0f, $a2
+{$else}
+  cpuid
+{$endif}
+  {Save registers}
+  mov TRegisters[esi].RegEAX, eax
+  mov TRegisters[esi].RegEBX, ebx
+  mov TRegisters[esi].RegECX, ecx
+  mov TRegisters[esi].RegEDX, edx
+  pop esi
+  pop ebx
+end;
+
+{Returns true if the CPU supports MMX}
+function MMX_Supported: Boolean;
+var
+  LReg: TRegisters;
+begin
+  if CPUID_Supported then
+  begin
+    {Get the CPUID}
+    LReg := GetCPUID(1);
+    {Bit 23 must be set for MMX support}
+    Result := LReg.RegEDX and $800000 <> 0;
+  end
+  else
+    Result := False;
+end;
+{$endif}
+{$endif}
+
+{Compare [AAddress], CompareVal:
+ If Equal: [AAddress] := NewVal and result = CompareVal
+ If Unequal: Result := [AAddress]}
+function LockCmpxchg(CompareVal, NewVal: Byte; AAddress: PByte): Byte;
+asm
+{$ifdef 32Bit}
+  {On entry:
+    al = CompareVal,
+    dl = NewVal,
+    ecx = AAddress}
+  {$ifndef LINUX}
+  lock cmpxchg [ecx], dl
+  {$else}
+  {Workaround for Kylix compiler bug}
+  db $F0, $0F, $B0, $11
+  {$endif}
+{$else}
+  {On entry:
+    cl = CompareVal
+    dl = NewVal
+    r8 = AAddress}
+  .noframe
+  mov rax, rcx
+  lock cmpxchg [r8], dl
+{$endif}
+end;
+
+{$ifndef ASMVersion}
+{Gets the first set bit in the 32-bit number, returning the bit index}
+function FindFirstSetBit(ACardinal: Cardinal): Cardinal;
+asm
+{$ifdef 64Bit}
+  .noframe
+  mov rax, rcx
+{$endif}
+  bsf eax, eax
+end;
+{$endif}
+
+{$ifdef MACOS}
+
+function StrLCopy(Dest: PAnsiChar; const Source: PAnsiChar; MaxLen: Cardinal): PAnsiChar;
+var
+  Len: Cardinal;
+begin
+  Result := Dest;
+  Len := StrLen(Source);
+  if Len > MaxLen then
+    Len := MaxLen;
+  Move(Source^, Dest^, Len * SizeOf(AnsiChar));
+  Dest[Len] := #0;
+end;
+
+function GetModuleFileName(Module: HMODULE; Buffer: PAnsiChar; BufLen: Integer): Integer;
+const
+  CUnknown: AnsiString = 'unknown';
+var
+  tmp: array[0..512] of Char;
+begin
+  if FastMMIsInstalled then
+  begin
+    Result := System.GetModuleFileName(Module, tmp, BufLen);
+    StrLCopy(Buffer, PAnsiChar(AnsiString(tmp)), BufLen);
+  end
+  else
+  begin
+    Result := Length(CUnknown);
+    StrLCopy(Buffer, Pointer(CUnknown), Result + 1);
+  end;
+end;
+
+const
+  INVALID_HANDLE_VALUE = THandle(-1);
+
+function FileCreate(const FileName: string): THandle;
+begin
+  Result := THandle(__open(PAnsiChar(UTF8String(FileName)), O_RDWR or O_CREAT or O_TRUNC or O_EXCL, FileAccessRights));
+end;
+
+{$endif}
+
+{Writes the module filename to the specified buffer and returns the number of
+ characters written.}
+function AppendModuleFileName(ABuffer: PAnsiChar): Integer;
+var
+  LModuleHandle: HModule;
+begin
+  {Get the module handle}
+{$ifndef borlndmmdll}
+  if IsLibrary then
+    LModuleHandle := HInstance
+  else
+{$endif}
+    LModuleHandle := 0;
+  {Get the module name}
+{$ifndef POSIX}
+  Result := GetModuleFileNameA(LModuleHandle, ABuffer, 512);
+{$else}
+  Result := GetModuleFileName(LModuleHandle, ABuffer, 512);
+{$endif}
+end;
+
+{Copies the name of the module followed by the given string to the buffer,
+ returning the pointer following the buffer.}
+function AppendStringToModuleName(AString, ABuffer: PAnsiChar): PAnsiChar;
+var
+  LModuleNameLength: Cardinal;
+  LCopyStart: PAnsiChar;
+begin
+  {Get the name of the application}
+  LModuleNameLength := AppendModuleFileName(ABuffer);
+  {Replace the last few characters}
+  if LModuleNameLength > 0 then
+  begin
+    {Find the last backslash}
+    LCopyStart := PAnsiChar(PByte(ABuffer) + LModuleNameLength - 1);
+    LModuleNameLength := 0;
+    while (UIntPtr(LCopyStart) >= UIntPtr(ABuffer))
+      and (LCopyStart^ <> '\') do
+    begin
+      Inc(LModuleNameLength);
+      Dec(LCopyStart);
+    end;
+    {Copy the name to the start of the buffer}
+    Inc(LCopyStart);
+    System.Move(LCopyStart^, ABuffer^, LModuleNameLength);
+    Inc(ABuffer, LModuleNameLength);
+    ABuffer^ := ':';
+    Inc(ABuffer);
+    ABuffer^ := ' ';
+    Inc(ABuffer);
+  end;
+  {Append the string}
+  while AString^ <> #0 do
+  begin
+    ABuffer^ := AString^;
+    Inc(ABuffer);
+    {Next char}
+    Inc(AString);
+  end;
+  ABuffer^ := #0;
+  Result := ABuffer;
+end;
+
+{----------------Faster Move Procedures-------------------}
+
+{Fixed size move operations ignore the size parameter. All moves are assumed to
+ be non-overlapping.}
+
+procedure Move4(const ASource; var ADest; ACount: NativeInt);
+asm
+{$ifdef 32Bit}
+  mov eax, [eax]
+  mov [edx], eax
+{$else}
+.noframe
+  mov eax, [rcx]
+  mov [rdx], eax
+{$endif}
+end;
+
+{$ifdef 64Bit}
+procedure Move8(const ASource; var ADest; ACount: NativeInt);
+asm
+  mov rax, [rcx]
+  mov [rdx], rax
+end;
+{$endif}
+
+procedure Move12(const ASource; var ADest; ACount: NativeInt);
+asm
+{$ifdef 32Bit}
+  mov ecx, [eax]
+  mov [edx], ecx
+  mov ecx, [eax + 4]
+  mov eax, [eax + 8]
+  mov [edx + 4], ecx
+  mov [edx + 8], eax
+{$else}
+.noframe
+  mov rax, [rcx]
+  mov ecx, [rcx + 8]
+  mov [rdx], rax
+  mov [rdx + 8], ecx
+{$endif}
+end;
+
+procedure Move20(const ASource; var ADest; ACount: NativeInt);
+asm
+{$ifdef 32Bit}
+  mov ecx, [eax]
+  mov [edx], ecx
+  mov ecx, [eax + 4]
+  mov [edx + 4], ecx
+  mov ecx, [eax + 8]
+  mov [edx + 8], ecx
+  mov ecx, [eax + 12]
+  mov eax, [eax + 16]
+  mov [edx + 12], ecx
+  mov [edx + 16], eax
+{$else}
+.noframe
+  movdqa xmm0, [rcx]
+  mov ecx, [rcx + 16]
+  movdqa [rdx], xmm0
+  mov [rdx + 16], ecx
+{$endif}
+end;
+
+{$ifdef 64Bit}
+procedure Move24(const ASource; var ADest; ACount: NativeInt);
+asm
+  movdqa xmm0, [rcx]
+  mov r8, [rcx + 16]
+  movdqa [rdx], xmm0
+  mov [rdx + 16], r8
+end;
+{$endif}
+
+procedure Move28(const ASource; var ADest; ACount: NativeInt);
+asm
+{$ifdef 32Bit}
+  mov ecx, [eax]
+  mov [edx], ecx
+  mov ecx, [eax + 4]
+  mov [edx + 4], ecx
+  mov ecx, [eax + 8]
+  mov [edx + 8], ecx
+  mov ecx, [eax + 12]
+  mov [edx + 12], ecx
+  mov ecx, [eax + 16]
+  mov [edx + 16], ecx
+  mov ecx, [eax + 20]
+  mov eax, [eax + 24]
+  mov [edx + 20], ecx
+  mov [edx + 24], eax
+{$else}
+.noframe
+  movdqa xmm0, [rcx]
+  mov r8, [rcx + 16]
+  mov ecx, [rcx + 24]
+  movdqa [rdx], xmm0
+  mov [rdx + 16], r8
+  mov [rdx + 24], ecx
+{$endif}
+end;
+
+procedure Move36(const ASource; var ADest; ACount: NativeInt);
+asm
+{$ifdef 32Bit}
+  fild qword ptr [eax]
+  fild qword ptr [eax + 8]
+  fild qword ptr [eax + 16]
+  fild qword ptr [eax + 24]
+  mov ecx, [eax + 32]
+  mov [edx + 32], ecx
+  fistp qword ptr [edx + 24]
+  fistp qword ptr [edx + 16]
+  fistp qword ptr [edx + 8]
+  fistp qword ptr [edx]
+{$else}
+.noframe
+  movdqa xmm0, [rcx]
+  movdqa xmm1, [rcx + 16]
+  mov ecx, [rcx + 32]
+  movdqa [rdx], xmm0
+  movdqa [rdx + 16], xmm1
+  mov [rdx + 32], ecx
+{$endif}
+end;
+
+{$ifdef 64Bit}
+procedure Move40(const ASource; var ADest; ACount: NativeInt);
+asm
+  movdqa xmm0, [rcx]
+  movdqa xmm1, [rcx + 16]
+  mov r8, [rcx + 32]
+  movdqa [rdx], xmm0
+  movdqa [rdx + 16], xmm1
+  mov [rdx + 32], r8
+end;
+{$endif}
+
+procedure Move44(const ASource; var ADest; ACount: NativeInt);
+asm
+{$ifdef 32Bit}
+  fild qword ptr [eax]
+  fild qword ptr [eax + 8]
+  fild qword ptr [eax + 16]
+  fild qword ptr [eax + 24]
+  fild qword ptr [eax + 32]
+  mov ecx, [eax + 40]
+  mov [edx + 40], ecx
+  fistp qword ptr [edx + 32]
+  fistp qword ptr [edx + 24]
+  fistp qword ptr [edx + 16]
+  fistp qword ptr [edx + 8]
+  fistp qword ptr [edx]
+{$else}
+.noframe
+  movdqa xmm0, [rcx]
+  movdqa xmm1, [rcx + 16]
+  mov r8, [rcx + 32]
+  mov ecx, [rcx + 40]
+  movdqa [rdx], xmm0
+  movdqa [rdx + 16], xmm1
+  mov [rdx + 32], r8
+  mov [rdx + 40], ecx
+{$endif}
+end;
+
+procedure Move52(const ASource; var ADest; ACount: NativeInt);
+asm
+{$ifdef 32Bit}
+  fild qword ptr [eax]
+  fild qword ptr [eax + 8]
+  fild qword ptr [eax + 16]
+  fild qword ptr [eax + 24]
+  fild qword ptr [eax + 32]
+  fild qword ptr [eax + 40]
+  mov ecx, [eax + 48]
+  mov [edx + 48], ecx
+  fistp qword ptr [edx + 40]
+  fistp qword ptr [edx + 32]
+  fistp qword ptr [edx + 24]
+  fistp qword ptr [edx + 16]
+  fistp qword ptr [edx + 8]
+  fistp qword ptr [edx]
+{$else}
+.noframe
+  movdqa xmm0, [rcx]
+  movdqa xmm1, [rcx + 16]
+  movdqa xmm2, [rcx + 32]
+  mov ecx, [rcx + 48]
+  movdqa [rdx], xmm0
+  movdqa [rdx + 16], xmm1
+  movdqa [rdx + 32], xmm2
+  mov [rdx + 48], ecx
+{$endif}
+end;
+
+{$ifdef 64Bit}
+procedure Move56(const ASource; var ADest; ACount: NativeInt);
+asm
+  movdqa xmm0, [rcx]
+  movdqa xmm1, [rcx + 16]
+  movdqa xmm2, [rcx + 32]
+  mov r8, [rcx + 48]
+  movdqa [rdx], xmm0
+  movdqa [rdx + 16], xmm1
+  movdqa [rdx + 32], xmm2
+  mov [rdx + 48], r8
+end;
+{$endif}
+
+procedure Move60(const ASource; var ADest; ACount: NativeInt);
+asm
+{$ifdef 32Bit}
+  fild qword ptr [eax]
+  fild qword ptr [eax + 8]
+  fild qword ptr [eax + 16]
+  fild qword ptr [eax + 24]
+  fild qword ptr [eax + 32]
+  fild qword ptr [eax + 40]
+  fild qword ptr [eax + 48]
+  mov ecx, [eax + 56]
+  mov [edx + 56], ecx
+  fistp qword ptr [edx + 48]
+  fistp qword ptr [edx + 40]
+  fistp qword ptr [edx + 32]
+  fistp qword ptr [edx + 24]
+  fistp qword ptr [edx + 16]
+  fistp qword ptr [edx + 8]
+  fistp qword ptr [edx]
+{$else}
+.noframe
+  movdqa xmm0, [rcx]
+  movdqa xmm1, [rcx + 16]
+  movdqa xmm2, [rcx + 32]
+  mov r8, [rcx + 48]
+  mov ecx, [rcx + 56]
+  movdqa [rdx], xmm0
+  movdqa [rdx + 16], xmm1
+  movdqa [rdx + 32], xmm2
+  mov [rdx + 48], r8
+  mov [rdx + 56], ecx
+{$endif}
+end;
+
+procedure Move68(const ASource; var ADest; ACount: NativeInt);
+asm
+{$ifdef 32Bit}
+  fild qword ptr [eax]
+  fild qword ptr [eax + 8]
+  fild qword ptr [eax + 16]
+  fild qword ptr [eax + 24]
+  fild qword ptr [eax + 32]
+  fild qword ptr [eax + 40]
+  fild qword ptr [eax + 48]
+  fild qword ptr [eax + 56]
+  mov ecx, [eax + 64]
+  mov [edx + 64], ecx
+  fistp qword ptr [edx + 56]
+  fistp qword ptr [edx + 48]
+  fistp qword ptr [edx + 40]
+  fistp qword ptr [edx + 32]
+  fistp qword ptr [edx + 24]
+  fistp qword ptr [edx + 16]
+  fistp qword ptr [edx + 8]
+  fistp qword ptr [edx]
+{$else}
+.noframe
+  movdqa xmm0, [rcx]
+  movdqa xmm1, [rcx + 16]
+  movdqa xmm2, [rcx + 32]
+  movdqa xmm3, [rcx + 48]
+  mov ecx, [rcx + 64]
+  movdqa [rdx], xmm0
+  movdqa [rdx + 16], xmm1
+  movdqa [rdx + 32], xmm2
+  movdqa [rdx + 48], xmm3
+  mov [rdx + 64], ecx
+{$endif}
+end;
+
+{Variable size move procedure: Rounds ACount up to the next multiple of 16 less
+ SizeOf(Pointer). Important note: Always moves at least 16 - SizeOf(Pointer)
+ bytes (the minimum small block size with 16 byte alignment), irrespective of
+ ACount.}
+procedure MoveX16LP(const ASource; var ADest; ACount: NativeInt);
+asm
+{$ifdef 32Bit}
+  {Make the counter negative based: The last 12 bytes are moved separately}
+  sub ecx, 12
+  add eax, ecx
+  add edx, ecx
+{$ifdef EnableMMX}
+  {$ifndef ForceMMX}
+  cmp UseMMX, True
+  jne @FPUMove
+  {$endif}
+  {Make the counter negative based: The last 12 bytes are moved separately}
+  neg ecx
+  jns @MMXMoveLast12
+@MMXMoveLoop:
+  {Move a 16 byte block}
+  {$ifdef Delphi4or5}
+  {Delphi 5 compatibility}
+  db $0f, $6f, $04, $01
+  db $0f, $6f, $4c, $01, $08
+  db $0f, $7f, $04, $11
+  db $0f, $7f, $4c, $11, $08
+  {$else}
+  movq mm0, [eax + ecx]
+  movq mm1, [eax + ecx + 8]
+  movq [edx + ecx], mm0
+  movq [edx + ecx + 8], mm1
+  {$endif}
+  {Are there another 16 bytes to move?}
+  add ecx, 16
+  js @MMXMoveLoop
+@MMXMoveLast12:
+  {Do the last 12 bytes}
+  {$ifdef Delphi4or5}
+  {Delphi 5 compatibility}
+  db $0f, $6f, $04, $01
+  {$else}
+  movq mm0, [eax + ecx]
+  {$endif}
+  mov eax, [eax + ecx + 8]
+  {$ifdef Delphi4or5}
+  {Delphi 5 compatibility}
+  db $0f, $7f, $04, $11
+  {$else}
+  movq [edx + ecx], mm0
+  {$endif}
+  mov [edx + ecx + 8], eax
+  {Exit MMX state}
+  {$ifdef Delphi4or5}
+  {Delphi 5 compatibility}
+  db $0f, $77
+  {$else}
+  emms
+  {$endif}
+  {$ifndef ForceMMX}
+  ret
+  {$endif}
+{$endif}
+{FPU code is only used if MMX is not forced}
+{$ifndef ForceMMX}
+@FPUMove:
+  neg ecx
+  jns @FPUMoveLast12
+@FPUMoveLoop:
+  {Move a 16 byte block}
+  fild qword ptr [eax + ecx]
+  fild qword ptr [eax + ecx + 8]
+  fistp qword ptr [edx + ecx + 8]
+  fistp qword ptr [edx + ecx]
+  {Are there another 16 bytes to move?}
+  add ecx, 16
+  js @FPUMoveLoop
+@FPUMoveLast12:
+  {Do the last 12 bytes}
+  fild qword ptr [eax + ecx]
+  fistp qword ptr [edx + ecx]
+  mov eax, [eax + ecx + 8]
+  mov [edx + ecx + 8], eax
+{$endif}
+{$else}
+.noframe
+  {Make the counter negative based: The last 8 bytes are moved separately}
+  sub r8, 8
+  add rcx, r8
+  add rdx, r8
+  neg r8
+  jns @MoveLast12
+@MoveLoop:
+  {Move a 16 byte block}
+  movdqa xmm0, [rcx + r8]
+  movdqa [rdx + r8], xmm0
+  {Are there another 16 bytes to move?}
+  add r8, 16
+  js @MoveLoop
+@MoveLast12:
+  {Do the last 8 bytes}
+  mov r9, [rcx + r8]
+  mov [rdx + r8], r9
+{$endif}
+end;
+
+{Variable size move procedure: Rounds ACount up to the next multiple of 8 less
+ SizeOf(Pointer). Important note: Always moves at least 8 - SizeOf(Pointer)
+ bytes (the minimum small block size with 8 byte alignment), irrespective of
+ ACount.}
+procedure MoveX8LP(const ASource; var ADest; ACount: NativeInt);
+asm
+{$ifdef 32Bit}
+  {Make the counter negative based: The last 4 bytes are moved separately}
+  sub ecx, 4
+  {4 bytes or less? -> Use the Move4 routine.}
+  jle @FourBytesOrLess
+  add eax, ecx
+  add edx, ecx
+  neg ecx
+{$ifdef EnableMMX}
+  {$ifndef ForceMMX}
+  cmp UseMMX, True
+  jne @FPUMoveLoop
+  {$endif}
+@MMXMoveLoop:
+  {Move an 8 byte block}
+{$ifdef Delphi4or5}
+  {Delphi 5 compatibility}
+  db $0f, $6f, $04, $01
+  db $0f, $7f, $04, $11
+{$else}
+  movq mm0, [eax + ecx]
+  movq [edx + ecx], mm0
+{$endif}
+  {Are there another 8 bytes to move?}
+  add ecx, 8
+  js @MMXMoveLoop
+  {Exit MMX state}
+{$ifdef Delphi4or5}
+  {Delphi 5 compatibility}
+  db $0f, $77
+{$else}
+  emms
+{$endif}
+  {Do the last 4 bytes}
+  mov eax, [eax + ecx]
+  mov [edx + ecx], eax
+  ret
+{$endif}
+{FPU code is only used if MMX is not forced}
+{$ifndef ForceMMX}
+@FPUMoveLoop:
+  {Move an 8 byte block}
+  fild qword ptr [eax + ecx]
+  fistp qword ptr [edx + ecx]
+  {Are there another 8 bytes to move?}
+  add ecx, 8
+  js @FPUMoveLoop
+  {Do the last 4 bytes}
+  mov eax, [eax + ecx]
+  mov [edx + ecx], eax
+  ret
+{$endif}
+@FourBytesOrLess:
+  {Four or less bytes to move}
+  mov eax, [eax]
+  mov [edx], eax
+{$else}
+.noframe
+  {Make the counter negative based}
+  add rcx, r8
+  add rdx, r8
+  neg r8
+@MoveLoop:
+  {Move an 8 byte block}
+  mov r9, [rcx + r8]
+  mov [rdx + r8], r9
+  {Are there another 8 bytes to move?}
+  add r8, 8
+  js @MoveLoop
+{$endif}
+end;
+
+{----------------Windows Emulation Functions for Kylix / OS X Support-----------------}
+
+{$ifdef POSIX}
+
+const
+  {Messagebox constants}
+  MB_OK = 0;
+  MB_ICONERROR = $10;
+  MB_TASKMODAL = $2000;
+  MB_DEFAULT_DESKTOP_ONLY = $20000;
+  {Virtual memory constants}
+  MEM_COMMIT = $1000;
+  MEM_RELEASE = $8000;
+  MEM_TOP_DOWN = $100000;
+  PAGE_READWRITE = 4;
+
+procedure MessageBoxA(hWnd: Cardinal; AMessageText, AMessageTitle: PAnsiChar; uType: Cardinal); stdcall;
+begin
+  if FastMMIsInstalled then
+    writeln(AMessageText)
+  else
+    __write(STDERR_FILENO, AMessageText, StrLen(AMessageText));
+end;
+
+function VirtualAlloc(lpvAddress: Pointer; dwSize, flAllocationType, flProtect: Cardinal): Pointer; stdcall;
+begin
+  Result := valloc(dwSize);
+end;
+
+function VirtualFree(lpAddress: Pointer; dwSize, dwFreeType: Cardinal): LongBool; stdcall;
+begin
+  free(lpAddress);
+  Result := True;
+end;
+
+function WriteFile(hFile: THandle; const Buffer; nNumberOfBytesToWrite: Cardinal;
+  var lpNumberOfBytesWritten: Cardinal; lpOverlapped: Pointer): Boolean; stdcall;
+begin
+  lpNumberOfBytesWritten := __write(hFile, @Buffer, nNumberOfBytesToWrite);
+  if lpNumberOfBytesWritten = Cardinal(-1) then
+  begin
+    lpNumberOfBytesWritten := 0;
+    Result := False;
+  end
+  else
+    Result := True;
+end;
+
+{$ifndef NeverSleepOnThreadContention}
+procedure Sleep(dwMilliseconds: Cardinal); stdcall;
+begin
+  {Convert to microseconds (more or less)}
+  usleep(dwMilliseconds shl 10);
+end;
+{$endif}
+{$endif}
+
+{-----------------Debugging Support Functions and Procedures------------------}
+
+{$ifdef FullDebugMode}
+
+{Returns the current thread ID}
+function GetThreadID: Cardinal;
+{$ifdef 32Bit}
+asm
+  mov eax, FS:[$24]
+end;
+{$else}
+begin
+  Result := GetCurrentThreadId;
+end;
+{$endif}
+
+{Fills a block of memory with the given dword (32-bit) or qword (64-bit).
+ Always fills a multiple of SizeOf(Pointer) bytes}
+procedure DebugFillMem(var AAddress; AByteCount: NativeInt; AFillValue: NativeUInt);
+asm
+{$ifdef 32Bit}
+  {On Entry:
+   eax = AAddress
+   edx = AByteCount
+   ecx = AFillValue}
+  add eax, edx
+  neg edx
+  jns @Done
+@FillLoop:
+  mov [eax + edx], ecx
+  add edx, 4
+  js @FillLoop
+@Done:
+{$else}
+  {On Entry:
+   rcx = AAddress
+   rdx = AByteCount
+   r8 = AFillValue}
+  add rcx, rdx
+  neg rdx
+  jns @Done
+@FillLoop:
+  mov [rcx + rdx], r8
+  add rdx, 8
+  js @FillLoop
+@Done:
+{$endif}
+end;
+
+  {$ifndef LoadDebugDLLDynamically}
+
+{The stack trace procedure. The stack trace module is external since it may
+ raise handled access violations that result in the creation of exception
+ objects and the stack trace code is not re-entrant.}
+procedure GetStackTrace(AReturnAddresses: PNativeUInt;
+  AMaxDepth, ASkipFrames: Cardinal); external FullDebugModeLibraryName
+  name {$ifdef RawStackTraces}'GetRawStackTrace'{$else}'GetFrameBasedStackTrace'{$endif};
+
+{The exported procedure in the FastMM_FullDebugMode.dll library used to convert
+ the return addresses of a stack trace to a text string.}
+function LogStackTrace(AReturnAddresses: PNativeUInt;
+  AMaxDepth: Cardinal; ABuffer: PAnsiChar): PAnsiChar; external FullDebugModeLibraryName
+  name 'LogStackTrace';
+
+  {$else}
+
+  {Default no-op stack trace and logging handlers}
+  procedure NoOpGetStackTrace(AReturnAddresses: PNativeUInt;
+    AMaxDepth, ASkipFrames: Cardinal);
+  begin
+    DebugFillMem(AReturnAddresses^, AMaxDepth * SizeOf(Pointer), 0);
+  end;
+
+  function NoOpLogStackTrace(AReturnAddresses: PNativeUInt;
+    AMaxDepth: Cardinal; ABuffer: PAnsiChar): PAnsiChar;
+  begin
+    Result := ABuffer;
+  end;
+
+var
+
+  {Handle to the FullDebugMode DLL}
+  FullDebugModeDLL: HMODULE;
+
+  GetStackTrace: procedure (AReturnAddresses: PNativeUInt;
+    AMaxDepth, ASkipFrames: Cardinal) = NoOpGetStackTrace;
+
+  LogStackTrace: function (AReturnAddresses: PNativeUInt;
+    AMaxDepth: Cardinal; ABuffer: PAnsiChar): PAnsiChar = NoOpLogStackTrace;
+
+  {$endif}
+
+{$endif}
+
+{$ifndef POSIX}
+function DelphiIsRunning: Boolean;
+begin
+  Result := FindWindowA('TAppBuilder', nil) <> 0;
+end;
+{$endif}
+
+{Converts an unsigned integer to string at the buffer location, returning the
+ new buffer position. Note: The 32-bit asm version only supports numbers up to
+ 2^31 - 1.}
+function NativeUIntToStrBuf(ANum: NativeUInt; APBuffer: PAnsiChar): PAnsiChar;
+{$ifndef Use32BitAsm}
+const
+  MaxDigits = 20;
+var
+  LDigitBuffer: array[0..MaxDigits - 1] of AnsiChar;
+  LCount: Cardinal;
+  LDigit: NativeUInt;
+begin
+  {Generate the digits in the local buffer}
+  LCount := 0;
+  repeat
+    LDigit := ANum;
+    ANum := ANum div 10;
+    LDigit := LDigit - ANum * 10;
+    Inc(LCount);
+    LDigitBuffer[MaxDigits - LCount] := AnsiChar(Ord('0') + LDigit);
+  until ANum = 0;
+  {Copy the digits to the output buffer and advance it}
+  System.Move(LDigitBuffer[MaxDigits - LCount], APBuffer^, LCount);
+  Result := APBuffer + LCount;
+end;
+{$else}
+asm
+  {On entry: eax = ANum, edx = ABuffer}
+  push edi
+  mov edi, edx                //Pointer to the first character in edi
+  {Calculate leading digit: divide the number by 1e9}
+  add eax, 1                  //Increment the number
+  mov edx, $89705F41          //1e9 reciprocal
+  mul edx                     //Multplying with reciprocal
+  shr eax, 30                 //Save fraction bits
+  mov ecx, edx                //First digit in bits <31:29>
+  and edx, $1FFFFFFF          //Filter fraction part edx<28:0>
+  shr ecx, 29                 //Get leading digit into accumulator
+  lea edx, [edx + 4 * edx]    //Calculate ...
+  add edx, eax                //... 5*fraction
+  mov eax, ecx                //Copy leading digit
+  or eax, '0'                 //Convert digit to ASCII
+  mov [edi], al               //Store digit out to memory
+  {Calculate digit #2}
+  mov eax, edx                //Point format such that 1.0 = 2^28
+  cmp ecx, 1                  //Any non-zero digit yet ?
+  sbb edi, -1                 //Yes->increment ptr, No->keep old ptr
+  shr eax, 28                 //Next digit
+  and edx, $0fffffff          //Fraction part edx<27:0>
+  or ecx, eax                 //Accumulate next digit
+  or eax, '0'                 //Convert digit to ASCII
+  mov [edi], al               //Store digit out to memory
+  {Calculate digit #3}
+  lea eax, [edx * 4 + edx]    //5*fraction, new digit eax<31:27>
+  lea edx, [edx * 4 + edx]    //5*fraction, new fraction edx<26:0>
+  cmp ecx, 1                  //Any non-zero digit yet ?
+  sbb edi, -1                 //Yes->increment ptr, No->keep old ptr
+  shr eax, 27                 //Next digit
+  and edx, $07ffffff          //Fraction part
+  or ecx, eax                 //Accumulate next digit
+  or eax, '0'                 //Convert digit to ASCII
+  mov [edi], al               //Store digit out to memory
+  {Calculate digit #4}
+  lea eax, [edx * 4 + edx]    //5*fraction, new digit eax<31:26>
+  lea edx, [edx * 4 + edx]    //5*fraction, new fraction edx<25:0>
+  cmp ecx, 1                  //Any non-zero digit yet ?
+  sbb edi, -1                 //Yes->increment ptr, No->keep old ptr
+  shr eax, 26                 //Next digit
+  and edx, $03ffffff          //Fraction part
+  or ecx, eax                 //Accumulate next digit
+  or eax, '0'                 //Convert digit to ASCII
+  mov [edi], al               //Store digit out to memory
+  {Calculate digit #5}
+  lea eax, [edx * 4 + edx]    //5*fraction, new digit eax<31:25>
+  lea edx, [edx * 4 + edx]    //5*fraction, new fraction edx<24:0>
+  cmp ecx, 1                  //Any non-zero digit yet ?
+  sbb edi, -1                 //Yes->increment ptr, No->keep old ptr
+  shr eax, 25                 //Next digit
+  and edx, $01ffffff          //Fraction part
+  or ecx, eax                 //Accumulate next digit
+  or eax, '0'                 //Convert digit to ASCII
+  mov [edi], al               //Store digit out to memory
+  {Calculate digit #6}
+  lea eax, [edx * 4 + edx]    //5*fraction, new digit eax<31:24>
+  lea edx, [edx * 4 + edx]    //5*fraction, new fraction edx<23:0>
+  cmp ecx, 1                  //Any non-zero digit yet ?
+  sbb edi, -1                 //Yes->increment ptr, No->keep old ptr
+  shr eax, 24                 //Next digit
+  and edx, $00ffffff          //Fraction part
+  or ecx, eax                 //Accumulate next digit
+  or eax, '0'                 //Convert digit to ASCII
+  mov [edi], al               //Store digit out to memory
+  {Calculate digit #7}
+  lea eax, [edx * 4 + edx]    //5*fraction, new digit eax<31:23>
+  lea edx, [edx * 4 + edx]    //5*fraction, new fraction edx<31:23>
+  cmp ecx, 1                  //Any non-zero digit yet ?
+  sbb edi, -1                 //Yes->increment ptr, No->keep old ptr
+  shr eax, 23                 //Next digit
+  and edx, $007fffff          //Fraction part
+  or ecx, eax                 //Accumulate next digit
+  or eax, '0'                 //Convert digit to ASCII
+  mov [edi], al               //Store digit out to memory
+  {Calculate digit #8}
+  lea eax, [edx * 4 + edx]    //5*fraction, new digit eax<31:22>
+  lea edx, [edx * 4 + edx]    //5*fraction, new fraction edx<22:0>
+  cmp ecx, 1                  //Any non-zero digit yet ?
+  sbb edi, -1                 //Yes->increment ptr, No->keep old ptr
+  shr eax, 22                 //Next digit
+  and edx, $003fffff          //Fraction part
+  or ecx, eax                 //Accumulate next digit
+  or eax, '0'                 //Convert digit to ASCII
+  mov [edi], al               //Store digit out to memory
+  {Calculate digit #9}
+  lea eax, [edx * 4 + edx]    //5*fraction, new digit eax<31:21>
+  lea edx, [edx * 4 + edx]    //5*fraction, new fraction edx<21:0>
+  cmp ecx, 1                  //Any non-zero digit yet ?
+  sbb edi, -1                 //Yes->increment ptr, No->keep old ptr
+  shr eax, 21                 //Next digit
+  and edx, $001fffff          //Fraction part
+  or ecx, eax                 //Accumulate next digit
+  or eax, '0'                 //Convert digit to ASCII
+  mov [edi], al               //Store digit out to memory
+  {Calculate digit #10}
+  lea eax, [edx * 4 + edx]    //5*fraction, new digit eax<31:20>
+  cmp ecx, 1                  //Any-non-zero digit yet ?
+  sbb edi, -1                 //Yes->increment ptr, No->keep old ptr
+  shr eax, 20                 //Next digit
+  or eax, '0'                 //Convert digit to ASCII
+  mov [edi], al               //Store last digit and end marker out to memory
+  {Return a pointer to the next character}
+  lea eax, [edi + 1]
+  {Restore edi}
+  pop edi
+end;
+{$endif}
+
+{Converts an unsigned integer to a hexadecimal string at the buffer location,
+ returning the new buffer position.}
+function NativeUIntToHexBuf(ANum: NativeUInt; APBuffer: PAnsiChar): PAnsiChar;
+{$ifndef Use32BitAsm}
+const
+  MaxDigits = 16;
+var
+  LDigitBuffer: array[0..MaxDigits - 1] of AnsiChar;
+  LCount: Cardinal;
+  LDigit: NativeUInt;
+begin
+  {Generate the digits in the local buffer}
+  LCount := 0;
+  repeat
+    LDigit := ANum;
+    ANum := ANum div 16;
+    LDigit := LDigit - ANum * 16;
+    Inc(LCount);
+    LDigitBuffer[MaxDigits - LCount] := HexTable[LDigit];
+  until ANum = 0;
+  {Copy the digits to the output buffer and advance it}
+  System.Move(LDigitBuffer[MaxDigits - LCount], APBuffer^, LCount);
+  Result := APBuffer + LCount;
+end;
+{$else}
+asm
+  {On entry:
+    eax = ANum
+    edx = ABuffer}
+  push ebx
+  push edi
+  {Save ANum in ebx}
+  mov ebx, eax
+  {Get a pointer to the first character in edi}
+  mov edi, edx
+  {Get the number in ecx as well}
+  mov ecx, eax
+  {Keep the low nibbles in ebx and the high nibbles in ecx}
+  and ebx, $0f0f0f0f
+  and ecx, $f0f0f0f0
+  {Swap the bytes into the right order}
+  ror ebx, 16
+  ror ecx, 20
+  {Get nibble 7}
+  movzx eax, ch
+  mov dl, ch
+  mov al, byte ptr HexTable[eax]
+  mov [edi], al
+  cmp dl, 1
+  sbb edi, -1
+  {Get nibble 6}
+  movzx eax, bh
+  or dl, bh
+  mov al, byte ptr HexTable[eax]
+  mov [edi], al
+  cmp dl, 1
+  sbb edi, -1
+  {Get nibble 5}
+  movzx eax, cl
+  or dl, cl
+  mov al, byte ptr HexTable[eax]
+  mov [edi], al
+  cmp dl, 1
+  sbb edi, -1
+  {Get nibble 4}
+  movzx eax, bl
+  or dl, bl
+  mov al, byte ptr HexTable[eax]
+  mov [edi], al
+  cmp dl, 1
+  sbb edi, -1
+  {Rotate ecx and ebx so we get access to the rest}
+  shr ebx, 16
+  shr ecx, 16
+  {Get nibble 3}
+  movzx eax, ch
+  or dl, ch
+  mov al, byte ptr HexTable[eax]
+  mov [edi], al
+  cmp dl, 1
+  sbb edi, -1
+  {Get nibble 2}
+  movzx eax, bh
+  or dl, bh
+  mov al, byte ptr HexTable[eax]
+  mov [edi], al
+  cmp dl, 1
+  sbb edi, -1
+  {Get nibble 1}
+  movzx eax, cl
+  or dl, cl
+  mov al, byte ptr HexTable[eax]
+  mov [edi], al
+  cmp dl, 1
+  sbb edi, -1
+  {Get nibble 0}
+  movzx eax, bl
+  mov al, byte ptr HexTable[eax]
+  mov [edi], al
+  {Return a pointer to the end of the string}
+  lea eax, [edi + 1]
+  {Restore registers}
+  pop edi
+  pop ebx
+end;
+{$endif}
+
+{Appends the source text to the destination and returns the new destination
+ position}
+function AppendStringToBuffer(const ASource, ADestination: PAnsiChar; ACount: Cardinal): PAnsiChar;
+begin
+  System.Move(ASource^, ADestination^, ACount);
+  Result := Pointer(PByte(ADestination) + ACount);
+end;
+
+{Appends the name of the class to the destination buffer and returns the new
+ destination position}
+function AppendClassNameToBuffer(AClass: TClass; ADestination: PAnsiChar): PAnsiChar;
+var
+  LPClassName: PShortString;
+begin
+  {Get a pointer to the class name}
+  if AClass <> nil then
+  begin
+    LPClassName := PShortString(PPointer(PByte(AClass) + vmtClassName)^);
+    {Append the class name}
+    Result := AppendStringToBuffer(@LPClassName^[1], ADestination, Length(LPClassName^));
+  end
+  else
+  begin
+    Result := AppendStringToBuffer(UnknownClassNameMsg, ADestination, Length(UnknownClassNameMsg));
+  end;
+end;
+
+{Shows a message box if the program is not showing one already.}
+procedure ShowMessageBox(AText, ACaption: PAnsiChar);
+begin
+  if (not ShowingMessageBox) and (not SuppressMessageBoxes) then
+  begin
+    ShowingMessageBox := True;
+    MessageBoxA(0, AText, ACaption,
+      MB_OK or MB_ICONERROR or MB_TASKMODAL or MB_DEFAULT_DESKTOP_ONLY);
+    ShowingMessageBox := False;
+  end;
+end;
+
+{Returns the class for a memory block. Returns nil if it is not a valid class}
+function DetectClassInstance(APointer: Pointer): TClass;
+{$ifndef POSIX}
+var
+  LMemInfo: TMemoryBasicInformation;
+
+  {Checks whether the given address is a valid address for a VMT entry.}
+  function IsValidVMTAddress(APAddress: Pointer): Boolean;
+  begin
+    {Do some basic pointer checks: Must be dword aligned and beyond 64K}
+    if (UIntPtr(APAddress) > 65535)
+      and (UIntPtr(APAddress) and 3 = 0) then
+    begin
+      {Do we need to recheck the virtual memory?}
+      if (UIntPtr(LMemInfo.BaseAddress) > UIntPtr(APAddress))
+        or ((UIntPtr(LMemInfo.BaseAddress) + LMemInfo.RegionSize) < (UIntPtr(APAddress) + 4)) then
+      begin
+        {Get the VM status for the pointer}
+        LMemInfo.RegionSize := 0;
+        VirtualQuery(APAddress,  LMemInfo, SizeOf(LMemInfo));
+      end;
+      {Check the readability of the memory address}
+      Result := (LMemInfo.RegionSize >= 4)
+        and (LMemInfo.State = MEM_COMMIT)
+        and (LMemInfo.Protect and (PAGE_READONLY or PAGE_READWRITE or PAGE_EXECUTE or PAGE_EXECUTE_READ or PAGE_EXECUTE_READWRITE or PAGE_EXECUTE_WRITECOPY) <> 0)
+        and (LMemInfo.Protect and PAGE_GUARD = 0);
+    end
+    else
+      Result := False;
+  end;
+
+  {Returns true if AClassPointer points to a class VMT}
+  function InternalIsValidClass(AClassPointer: Pointer; ADepth: Integer = 0): Boolean;
+  var
+    LParentClassSelfPointer: PPointer;
+  begin
+    {Check that the self pointer as well as parent class self pointer addresses
+     are valid}
+    if (ADepth < 1000)
+      and IsValidVMTAddress(Pointer(PByte(AClassPointer) + vmtSelfPtr))
+      and IsValidVMTAddress(Pointer(PByte(AClassPointer) + vmtParent)) then
+    begin
+      {Get a pointer to the parent class' self pointer}
+      LParentClassSelfPointer := PPointer(PByte(AClassPointer) + vmtParent)^;
+      {Check that the self pointer as well as the parent class is valid}
+      Result := (PPointer(PByte(AClassPointer) + vmtSelfPtr)^ = AClassPointer)
+        and ((LParentClassSelfPointer = nil)
+          or (IsValidVMTAddress(LParentClassSelfPointer)
+            and InternalIsValidClass(LParentClassSelfPointer^, ADepth + 1)));
+    end
+    else
+      Result := False;
+  end;
+
+begin
+  {Get the class pointer from the (suspected) object}
+  Result := TClass(PPointer(APointer)^);
+  {No VM info yet}
+  LMemInfo.RegionSize := 0;
+  {Check the block}
+  if (not InternalIsValidClass(Pointer(Result), 0))
+{$ifdef FullDebugMode}
+    or (Result = @FreedObjectVMT.VMTMethods[0])
+{$endif}
+  then
+    Result := nil;
+end;
+{$else}
+begin
+  {Not currently supported under Linux / OS X}
+  Result := nil;
+end;
+{$endif}
+
+{Gets the available size inside a block}
+function GetAvailableSpaceInBlock(APointer: Pointer): NativeUInt;
+var
+  LBlockHeader: NativeUInt;
+  LPSmallBlockPool: PSmallBlockPoolHeader;
+begin
+  LBlockHeader := PNativeUInt(PByte(APointer) - BlockHeaderSize)^;
+  if LBlockHeader and (IsMediumBlockFlag or IsLargeBlockFlag) = 0 then
+  begin
+    LPSmallBlockPool := PSmallBlockPoolHeader(LBlockHeader and DropSmallFlagsMask);
+    Result := LPSmallBlockPool.BlockType.BlockSize - BlockHeaderSize;
+  end
+  else
+  begin
+    Result := (LBlockHeader and DropMediumAndLargeFlagsMask) - BlockHeaderSize;
+    if (LBlockHeader and IsMediumBlockFlag) = 0 then
+      Dec(Result, LargeBlockHeaderSize);
+  end;
+end;
+
+{-----------------Small Block Management------------------}
+
+{Locks all small block types}
+procedure LockAllSmallBlockTypes;
+var
+  LInd: Cardinal;
+begin
+  {Lock the medium blocks}
+{$ifndef AssumeMultiThreaded}
+  if IsMultiThread then
+{$endif}
+  begin
+    for LInd := 0 to NumSmallBlockTypes - 1 do
+    begin
+      while LockCmpxchg(0, 1, @SmallBlockTypes[LInd].BlockTypeLocked) <> 0 do
+      begin
+{$ifdef NeverSleepOnThreadContention}
+  {$ifdef UseSwitchToThread}
+        SwitchToThread;
+  {$endif}
+{$else}
+        Sleep(InitialSleepTime);
+        if LockCmpxchg(0, 1, @SmallBlockTypes[LInd].BlockTypeLocked) = 0 then
+          Break;
+        Sleep(AdditionalSleepTime);
+{$endif}
+      end;
+    end;
+  end;
+end;
+
+{Gets the first and last block pointer for a small block pool}
+procedure GetFirstAndLastSmallBlockInPool(APSmallBlockPool: PSmallBlockPoolHeader;
+  var AFirstPtr, ALastPtr: Pointer);
+var
+  LBlockSize: NativeUInt;
+begin
+  {Get the pointer to the first block}
+  AFirstPtr := Pointer(PByte(APSmallBlockPool) + SmallBlockPoolHeaderSize);
+  {Get a pointer to the last block}
+  if (APSmallBlockPool.BlockType.CurrentSequentialFeedPool <> APSmallBlockPool)
+    or (UIntPtr(APSmallBlockPool.BlockType.NextSequentialFeedBlockAddress) > UIntPtr(APSmallBlockPool.BlockType.MaxSequentialFeedBlockAddress)) then
+  begin
+    {Not the sequential feed - point to the end of the block}
+    LBlockSize := PNativeUInt(PByte(APSmallBlockPool) - BlockHeaderSize)^ and DropMediumAndLargeFlagsMask;
+    ALastPtr := Pointer(PByte(APSmallBlockPool) + LBlockSize - APSmallBlockPool.BlockType.BlockSize);
+  end
+  else
+  begin
+    {The sequential feed pool - point to before the next sequential feed block}
+    ALastPtr := Pointer(PByte(APSmallBlockPool.BlockType.NextSequentialFeedBlockAddress) - 1);
+  end;
+end;
+
+{-----------------Medium Block Management------------------}
+
+{Advances to the next medium block. Returns nil if the end of the medium block
+ pool has been reached}
+function NextMediumBlock(APMediumBlock: Pointer): Pointer;
+var
+  LBlockSize: NativeUInt;
+begin
+  {Get the size of this block}
+  LBlockSize := PNativeUInt(PByte(APMediumBlock) - BlockHeaderSize)^ and DropMediumAndLargeFlagsMask;
+  {Advance the pointer}
+  Result := Pointer(PByte(APMediumBlock) + LBlockSize);
+  {Is the next block the end of medium pool marker?}
+  LBlockSize := PNativeUInt(PByte(Result) - BlockHeaderSize)^ and DropMediumAndLargeFlagsMask;
+  if LBlockSize = 0 then
+    Result := nil;
+end;
+
+{Gets the first medium block in the medium block pool}
+function GetFirstMediumBlockInPool(APMediumBlockPoolHeader: PMediumBlockPoolHeader): Pointer;
+begin
+  if (MediumSequentialFeedBytesLeft = 0)
+    or (UIntPtr(LastSequentiallyFedMediumBlock) < UIntPtr(APMediumBlockPoolHeader))
+    or (UIntPtr(LastSequentiallyFedMediumBlock) > UIntPtr(APMediumBlockPoolHeader) + MediumBlockPoolSize) then
+  begin
+    Result := Pointer(PByte(APMediumBlockPoolHeader) + MediumBlockPoolHeaderSize);
+  end
+  else
+  begin
+    {Is the sequential feed pool empty?}
+    if MediumSequentialFeedBytesLeft <> MediumBlockPoolSize - MediumBlockPoolHeaderSize then
+      Result := LastSequentiallyFedMediumBlock
+    else
+      Result := nil;
+  end;
+end;
+
+{Locks the medium blocks. Note that the 32-bit asm version is assumed to
+ preserve all registers except eax.}
+{$ifndef Use32BitAsm}
+procedure LockMediumBlocks;
+begin
+  {Lock the medium blocks}
+{$ifndef AssumeMultiThreaded}
+  if IsMultiThread then
+{$endif}
+  begin
+    while LockCmpxchg(0, 1, @MediumBlocksLocked) <> 0 do
+    begin
+{$ifdef NeverSleepOnThreadContention}
+  {$ifdef UseSwitchToThread}
+      SwitchToThread;
+  {$endif}
+{$else}
+      Sleep(InitialSleepTime);
+      if LockCmpxchg(0, 1, @MediumBlocksLocked) = 0 then
+        Break;
+      Sleep(AdditionalSleepTime);
+{$endif}
+    end;
+  end;
+end;
+{$else}
+procedure LockMediumBlocks;
+asm
+  {Note: This routine is assumed to preserve all registers except eax}
+@MediumBlockLockLoop:
+  mov eax, $100
+  {Attempt to lock the medium blocks}
+  lock cmpxchg MediumBlocksLocked, ah
+  je @Done
+{$ifdef NeverSleepOnThreadContention}
+  {Pause instruction (improves performance on P4)}
+  rep nop
+  {$ifdef UseSwitchToThread}
+  push ecx
+  push edx
+  call SwitchToThread
+  pop edx
+  pop ecx
+  {$endif}
+  {Try again}
+  jmp @MediumBlockLockLoop
+{$else}
+  {Couldn't lock the medium blocks - sleep and try again}
+  push ecx
+  push edx
+  push InitialSleepTime
+  call Sleep
+  pop edx
+  pop ecx
+  {Try again}
+  mov eax, $100
+  {Attempt to grab the block type}
+  lock cmpxchg MediumBlocksLocked, ah
+  je @Done
+  {Couldn't lock the medium blocks - sleep and try again}
+  push ecx
+  push edx
+  push AdditionalSleepTime
+  call Sleep
+  pop edx
+  pop ecx
+  {Try again}
+  jmp @MediumBlockLockLoop
+{$endif}
+@Done:
+end;
+{$endif}
+
+{Removes a medium block from the circular linked list of free blocks.
+ Does not change any header flags. Medium blocks should be locked
+ before calling this procedure.}
+procedure RemoveMediumFreeBlock(APMediumFreeBlock: PMediumFreeBlock);
+{$ifndef ASMVersion}
+var
+  LPreviousFreeBlock, LNextFreeBlock: PMediumFreeBlock;
+  LBinNumber, LBinGroupNumber: Cardinal;
+begin
+  {Get the current previous and next blocks}
+  LNextFreeBlock := APMediumFreeBlock.NextFreeBlock;
+  LPreviousFreeBlock := APMediumFreeBlock.PreviousFreeBlock;
+  {Remove this block from the linked list}
+  LPreviousFreeBlock.NextFreeBlock := LNextFreeBlock;
+  LNextFreeBlock.PreviousFreeBlock := LPreviousFreeBlock;
+  {Is this bin now empty? If the previous and next free block pointers are
+   equal, they must point to the bin.}
+  if LPreviousFreeBlock = LNextFreeBlock then
+  begin
+    {Get the bin number for this block size}
+    LBinNumber := (UIntPtr(LNextFreeBlock) - UIntPtr(@MediumBlockBins)) div SizeOf(TMediumFreeBlock);
+    LBinGroupNumber := LBinNumber div 32;
+    {Flag this bin as empty}
+    MediumBlockBinBitmaps[LBinGroupNumber] := MediumBlockBinBitmaps[LBinGroupNumber]
+      and (not (1 shl (LBinNumber and 31)));
+    {Is the group now entirely empty?}
+    if MediumBlockBinBitmaps[LBinGroupNumber] = 0 then
+    begin
+      {Flag this group as empty}
+      MediumBlockBinGroupBitmap := MediumBlockBinGroupBitmap
+        and (not (1 shl LBinGroupNumber));
+    end;
+  end;
+end;
+{$else}
+{$ifdef 32Bit}
+asm
+  {On entry: eax = APMediumFreeBlock}
+  {Get the current previous and next blocks}
+  mov ecx, TMediumFreeBlock[eax].NextFreeBlock
+  mov edx, TMediumFreeBlock[eax].PreviousFreeBlock
+  {Is this bin now empty? If the previous and next free block pointers are
+   equal, they must point to the bin.}
+  cmp ecx, edx
+  {Remove this block from the linked list}
+  mov TMediumFreeBlock[ecx].PreviousFreeBlock, edx
+  mov TMediumFreeBlock[edx].NextFreeBlock, ecx
+  {Is this bin now empty? If the previous and next free block pointers are
+   equal, they must point to the bin.}
+  je @BinIsNowEmpty
+@Done:
+  ret
+  {Align branch target}
+  nop
+@BinIsNowEmpty:
+  {Get the bin number for this block size in ecx}
+  sub ecx, offset MediumBlockBins
+  mov edx, ecx
+  shr ecx, 3
+  {Get the group number in edx}
+  movzx edx, dh
+  {Flag this bin as empty}
+  mov eax, -2
+  rol eax, cl
+  and dword ptr [MediumBlockBinBitmaps + edx * 4], eax
+  jnz @Done
+  {Flag this group as empty}
+  mov eax, -2
+  mov ecx, edx
+  rol eax, cl
+  and MediumBlockBinGroupBitmap, eax
+end;
+{$else}
+asm
+  {On entry: rcx = APMediumFreeBlock}
+  mov rax, rcx
+  {Get the current previous and next blocks}
+  mov rcx, TMediumFreeBlock[rax].NextFreeBlock
+  mov rdx, TMediumFreeBlock[rax].PreviousFreeBlock
+  {Is this bin now empty? If the previous and next free block pointers are
+   equal, they must point to the bin.}
+  cmp rcx, rdx
+  {Remove this block from the linked list}
+  mov TMediumFreeBlock[rcx].PreviousFreeBlock, rdx
+  mov TMediumFreeBlock[rdx].NextFreeBlock, rcx
+  {Is this bin now empty? If the previous and next free block pointers are
+   equal, they must point to the bin.}
+  jne @Done
+  {Get the bin number for this block size in rcx}
+  lea r8, MediumBlockBins
+  sub rcx, r8
+  mov edx, ecx
+  shr ecx, 4
+  {Get the group number in edx}
+  shr edx, 9
+  {Flag this bin as empty}
+  mov eax, -2
+  rol eax, cl
+  lea r8, MediumBlockBinBitmaps
+  and dword ptr [r8 + rdx * 4], eax
+  jnz @Done
+  {Flag this group as empty}
+  mov eax, -2
+  mov ecx, edx
+  rol eax, cl
+  and MediumBlockBinGroupBitmap, eax
+@Done:
+end;
+{$endif}
+{$endif}
+
+{Inserts a medium block into the appropriate medium block bin.}
+procedure InsertMediumBlockIntoBin(APMediumFreeBlock: PMediumFreeBlock; AMediumBlockSize: Cardinal);
+{$ifndef ASMVersion}
+var
+  LBinNumber, LBinGroupNumber: Cardinal;
+  LPBin, LPFirstFreeBlock: PMediumFreeBlock;
+begin
+  {Get the bin number for this block size. Get the bin that holds blocks of at
+   least this size.}
+  LBinNumber := (AMediumBlockSize - MinimumMediumBlockSize) div MediumBlockGranularity;
+  if LBinNumber >= MediumBlockBinCount then
+    LBinNumber := MediumBlockBinCount - 1;
+  {Get the bin}
+  LPBin := @MediumBlockBins[LBinNumber];
+  {Bins are LIFO, se we insert this block as the first free block in the bin}
+  LPFirstFreeBlock := LPBin.NextFreeBlock;
+  APMediumFreeBlock.PreviousFreeBlock := LPBin;
+  APMediumFreeBlock.NextFreeBlock := LPFirstFreeBlock;
+  LPFirstFreeBlock.PreviousFreeBlock := APMediumFreeBlock;
+  LPBin.NextFreeBlock := APMediumFreeBlock;
+  {Was this bin empty?}
+  if LPFirstFreeBlock = LPBin then
+  begin
+    {Get the group number}
+    LBinGroupNumber := LBinNumber div 32;
+    {Flag this bin as used}
+    MediumBlockBinBitmaps[LBinGroupNumber] := MediumBlockBinBitmaps[LBinGroupNumber]
+      or (1 shl (LBinNumber and 31));
+    {Flag the group as used}
+    MediumBlockBinGroupBitmap := MediumBlockBinGroupBitmap
+      or (1 shl LBinGroupNumber);
+  end;
+end;
+{$else}
+{$ifdef 32Bit}
+asm
+  {On entry: eax = APMediumFreeBlock, edx = AMediumBlockSize}
+  {Get the bin number for this block size. Get the bin that holds blocks of at
+   least this size.}
+  sub edx, MinimumMediumBlockSize
+  shr edx, 8
+  {Validate the bin number}
+  sub edx, MediumBlockBinCount - 1
+  sbb ecx, ecx
+  and edx, ecx
+  add edx, MediumBlockBinCount - 1
+  {Get the bin in ecx}
+  lea ecx, [MediumBlockBins + edx * 8]
+  {Bins are LIFO, se we insert this block as the first free block in the bin}
+  mov edx, TMediumFreeBlock[ecx].NextFreeBlock
+  {Was this bin empty?}
+  cmp edx, ecx
+  mov TMediumFreeBlock[eax].PreviousFreeBlock, ecx
+  mov TMediumFreeBlock[eax].NextFreeBlock, edx
+  mov TMediumFreeBlock[edx].PreviousFreeBlock, eax
+  mov TMediumFreeBlock[ecx].NextFreeBlock, eax
+  {Was this bin empty?}
+  je @BinWasEmpty
+  ret
+  {Align branch target}
+  nop
+  nop
+@BinWasEmpty:
+  {Get the bin number in ecx}
+  sub ecx, offset MediumBlockBins
+  mov edx, ecx
+  shr ecx, 3
+  {Get the group number in edx}
+  movzx edx, dh
+  {Flag this bin as not empty}
+  mov eax, 1
+  shl eax, cl
+  or dword ptr [MediumBlockBinBitmaps + edx * 4], eax
+  {Flag the group as not empty}
+  mov eax, 1
+  mov ecx, edx
+  shl eax, cl
+  or MediumBlockBinGroupBitmap, eax
+end;
+{$else}
+asm
+  {On entry: rax = APMediumFreeBlock, edx = AMediumBlockSize}
+  mov rax, rcx
+  {Get the bin number for this block size. Get the bin that holds blocks of at
+   least this size.}
+  sub edx, MinimumMediumBlockSize
+  shr edx, 8
+  {Validate the bin number}
+  sub edx, MediumBlockBinCount - 1
+  sbb ecx, ecx
+  and edx, ecx
+  add edx, MediumBlockBinCount - 1
+  mov r9, rdx
+  {Get the bin address in rcx}
+  lea rcx, MediumBlockBins
+  shl edx, 4
+  add rcx, rdx
+  {Bins are LIFO, se we insert this block as the first free block in the bin}
+  mov rdx, TMediumFreeBlock[rcx].NextFreeBlock
+  {Was this bin empty?}
+  cmp rdx, rcx
+  mov TMediumFreeBlock[rax].PreviousFreeBlock, rcx
+  mov TMediumFreeBlock[rax].NextFreeBlock, rdx
+  mov TMediumFreeBlock[rdx].PreviousFreeBlock, rax
+  mov TMediumFreeBlock[rcx].NextFreeBlock, rax
+  {Was this bin empty?}
+  jne @Done
+  {Get the bin number in ecx}
+  mov rcx, r9
+  {Get the group number in edx}
+  mov rdx, r9
+  shr edx, 5
+  {Flag this bin as not empty}
+  mov eax, 1
+  shl eax, cl
+  lea r8, MediumBlockBinBitmaps
+  or dword ptr [r8 + rdx * 4], eax
+  {Flag the group as not empty}
+  mov eax, 1
+  mov ecx, edx
+  shl eax, cl
+  or MediumBlockBinGroupBitmap, eax
+@Done:
+end;
+{$endif}
+{$endif}
+
+{Bins what remains in the current sequential feed medium block pool. Medium
+ blocks must be locked.}
+procedure BinMediumSequentialFeedRemainder;
+{$ifndef ASMVersion}
+var
+  LSequentialFeedFreeSize, LNextBlockSizeAndFlags: NativeUInt;
+  LPRemainderBlock, LNextMediumBlock: Pointer;
+begin
+  LSequentialFeedFreeSize := MediumSequentialFeedBytesLeft;
+  if LSequentialFeedFreeSize > 0 then
+  begin
+    {Get the block after the open space}
+    LNextMediumBlock := LastSequentiallyFedMediumBlock;
+    LNextBlockSizeAndFlags := PNativeUInt(PByte(LNextMediumBlock) - BlockHeaderSize)^;
+    {Point to the remainder}
+    LPRemainderBlock := Pointer(PByte(LNextMediumBlock) - LSequentialFeedFreeSize);
+{$ifndef FullDebugMode}
+    {Can the next block be combined with the remainder?}
+    if (LNextBlockSizeAndFlags and IsFreeBlockFlag) <> 0 then
+    begin
+      {Increase the size of this block}
+      Inc(LSequentialFeedFreeSize, LNextBlockSizeAndFlags and DropMediumAndLargeFlagsMask);
+      {Remove the next block as well}
+      if (LNextBlockSizeAndFlags and DropMediumAndLargeFlagsMask) >= MinimumMediumBlockSize then
+        RemoveMediumFreeBlock(LNextMediumBlock);
+    end
+    else
+    begin
+{$endif}
+      {Set the "previous block is free" flag of the next block}
+      PNativeUInt(PByte(LNextMediumBlock) - BlockHeaderSize)^ := LNextBlockSizeAndFlags or PreviousMediumBlockIsFreeFlag;
+{$ifndef FullDebugMode}
+    end;
+{$endif}
+    {Store the size of the block as well as the flags}
+    PNativeUInt(PByte(LPRemainderBlock) - BlockHeaderSize)^ := LSequentialFeedFreeSize or IsMediumBlockFlag or IsFreeBlockFlag;
+    {Store the trailing size marker}
+    PNativeUInt(PByte(LPRemainderBlock) + LSequentialFeedFreeSize - BlockHeaderSize * 2)^ := LSequentialFeedFreeSize;
+{$ifdef FullDebugMode}
+    {In full debug mode the sequential feed remainder will never be too small to
+     fit a full debug header.}
+    {Clear the user area of the block}
+    DebugFillMem(Pointer(PByte(LPRemainderBlock) + SizeOf(TFullDebugBlockHeader) + SizeOf(NativeUInt))^,
+      LSequentialFeedFreeSize - FullDebugBlockOverhead - SizeOf(NativeUInt),
+      {$ifndef CatchUseOfFreedInterfaces}DebugFillPattern{$else}NativeUInt(@VMTBadInterface){$endif});
+    {We need to set a valid debug header and footer in the remainder}
+    PFullDebugBlockHeader(LPRemainderBlock).HeaderCheckSum := NativeUInt(LPRemainderBlock);
+    PNativeUInt(PByte(LPRemainderBlock) + SizeOf(TFullDebugBlockHeader))^ := not NativeUInt(LPRemainderBlock);
+{$endif}
+    {Bin this medium block}
+    if LSequentialFeedFreeSize >= MinimumMediumBlockSize then
+      InsertMediumBlockIntoBin(LPRemainderBlock, LSequentialFeedFreeSize);
+  end;
+end;
+{$else}
+{$ifdef 32Bit}
+asm
+  cmp MediumSequentialFeedBytesLeft, 0
+  jne @MustBinMedium
+  {Nothing to bin}
+  ret
+  {Align branch target}
+  nop
+  nop
+@MustBinMedium:
+  {Get a pointer to the last sequentially allocated medium block}
+  mov eax, LastSequentiallyFedMediumBlock
+  {Is the block that was last fed sequentially free?}
+  test byte ptr [eax - 4], IsFreeBlockFlag
+  jnz @LastBlockFedIsFree
+  {Set the "previous block is free" flag in the last block fed}
+  or dword ptr [eax - 4], PreviousMediumBlockIsFreeFlag
+  {Get the remainder in edx}
+  mov edx, MediumSequentialFeedBytesLeft
+  {Point eax to the start of the remainder}
+  sub eax, edx
+@BinTheRemainder:
+  {Status: eax = start of remainder, edx = size of remainder}
+  {Store the size of the block as well as the flags}
+  lea ecx, [edx + IsMediumBlockFlag + IsFreeBlockFlag]
+  mov [eax - 4], ecx
+  {Store the trailing size marker}
+  mov [eax + edx - 8], edx
+  {Bin this medium block}
+  cmp edx, MinimumMediumBlockSize
+  jnb InsertMediumBlockIntoBin
+  ret
+  {Align branch target}
+  nop
+  nop
+@LastBlockFedIsFree:
+  {Drop the flags}
+  mov edx, DropMediumAndLargeFlagsMask
+  and edx, [eax - 4]
+  {Free the last block fed}
+  cmp edx, MinimumMediumBlockSize
+  jb @DontRemoveLastFed
+  {Last fed block is free - remove it from its size bin}
+  call RemoveMediumFreeBlock
+  {Re-read eax and edx}
+  mov eax, LastSequentiallyFedMediumBlock
+  mov edx, DropMediumAndLargeFlagsMask
+  and edx, [eax - 4]
+@DontRemoveLastFed:
+  {Get the number of bytes left in ecx}
+  mov ecx, MediumSequentialFeedBytesLeft
+  {Point eax to the start of the remainder}
+  sub eax, ecx
+  {edx = total size of the remainder}
+  add edx, ecx
+  jmp @BinTheRemainder
+@Done:
+end;
+{$else}
+asm
+  .params 2
+  xor eax, eax
+  cmp MediumSequentialFeedBytesLeft, eax
+  je @Done
+  {Get a pointer to the last sequentially allocated medium block}
+  mov rax, LastSequentiallyFedMediumBlock
+  {Is the block that was last fed sequentially free?}
+  test byte ptr [rax - BlockHeaderSize], IsFreeBlockFlag
+  jnz @LastBlockFedIsFree
+  {Set the "previous block is free" flag in the last block fed}
+  or qword ptr [rax - BlockHeaderSize], PreviousMediumBlockIsFreeFlag
+  {Get the remainder in edx}
+  mov edx, MediumSequentialFeedBytesLeft
+  {Point eax to the start of the remainder}
+  sub rax, rdx
+@BinTheRemainder:
+  {Status: rax = start of remainder, edx = size of remainder}
+  {Store the size of the block as well as the flags}
+  lea rcx, [rdx + IsMediumBlockFlag + IsFreeBlockFlag]
+  mov [rax - BlockHeaderSize], rcx
+  {Store the trailing size marker}
+  mov [rax + rdx - 2 * BlockHeaderSize], rdx
+  {Bin this medium block}
+  cmp edx, MinimumMediumBlockSize
+  jb @Done
+  mov rcx, rax
+  call InsertMediumBlockIntoBin
+  jmp @Done
+@LastBlockFedIsFree:
+  {Drop the flags}
+  mov rdx, DropMediumAndLargeFlagsMask
+  and rdx, [rax - BlockHeaderSize]
+  {Free the last block fed}
+  cmp edx, MinimumMediumBlockSize
+  jb @DontRemoveLastFed
+  {Last fed block is free - remove it from its size bin}
+  mov rcx, rax
+  call RemoveMediumFreeBlock
+  {Re-read rax and rdx}
+  mov rax, LastSequentiallyFedMediumBlock
+  mov rdx, DropMediumAndLargeFlagsMask
+  and rdx, [rax - BlockHeaderSize]
+@DontRemoveLastFed:
+  {Get the number of bytes left in ecx}
+  mov ecx, MediumSequentialFeedBytesLeft
+  {Point rax to the start of the remainder}
+  sub rax, rcx
+  {edx = total size of the remainder}
+  add edx, ecx
+  jmp @BinTheRemainder
+@Done:
+end;
+{$endif}
+{$endif}
+
+{Allocates a new sequential feed medium block pool and immediately splits off a
+ block of the requested size. The block size must be a multiple of 16 and
+ medium blocks must be locked.}
+function AllocNewSequentialFeedMediumPool(AFirstBlockSize: Cardinal): Pointer;
+var
+  LOldFirstMediumBlockPool: PMediumBlockPoolHeader;
+  LNewPool: Pointer;
+begin
+  {Bin the current sequential feed remainder}
+  BinMediumSequentialFeedRemainder;
+  {Allocate a new sequential feed block pool}
+  LNewPool := VirtualAlloc(nil, MediumBlockPoolSize,
+    MEM_COMMIT{$ifdef AlwaysAllocateTopDown} or MEM_TOP_DOWN{$endif}, PAGE_READWRITE);
+  if LNewPool <> nil then
+  begin
+    {Insert this block pool into the list of block pools}
+    LOldFirstMediumBlockPool := MediumBlockPoolsCircularList.NextMediumBlockPoolHeader;
+    PMediumBlockPoolHeader(LNewPool).PreviousMediumBlockPoolHeader := @MediumBlockPoolsCircularList;
+    MediumBlockPoolsCircularList.NextMediumBlockPoolHeader := LNewPool;
+    PMediumBlockPoolHeader(LNewPool).NextMediumBlockPoolHeader := LOldFirstMediumBlockPool;
+    LOldFirstMediumBlockPool.PreviousMediumBlockPoolHeader := LNewPool;
+    {Store the sequential feed pool trailer}
+    PNativeUInt(PByte(LNewPool) + MediumBlockPoolSize - BlockHeaderSize)^ := IsMediumBlockFlag;
+    {Get the number of bytes still available}
+    MediumSequentialFeedBytesLeft := (MediumBlockPoolSize - MediumBlockPoolHeaderSize) - AFirstBlockSize;
+    {Get the result}
+    Result := Pointer(PByte(LNewPool) + MediumBlockPoolSize - AFirstBlockSize);
+    LastSequentiallyFedMediumBlock := Result;
+    {Store the block header}
+    PNativeUInt(PByte(Result) - BlockHeaderSize)^ := AFirstBlockSize or IsMediumBlockFlag;
+  end
+  else
+  begin
+    {Out of memory}
+    MediumSequentialFeedBytesLeft := 0;
+    Result := nil;
+  end;
+end;
+
+{-----------------Large Block Management------------------}
+
+{Locks the large blocks}
+procedure LockLargeBlocks;
+begin
+  {Lock the large blocks}
+{$ifndef AssumeMultiThreaded}
+  if IsMultiThread then
+{$endif}
+  begin
+    while LockCmpxchg(0, 1, @LargeBlocksLocked) <> 0 do
+    begin
+{$ifdef NeverSleepOnThreadContention}
+  {$ifdef UseSwitchToThread}
+      SwitchToThread;
+  {$endif}
+{$else}
+      Sleep(InitialSleepTime);
+      if LockCmpxchg(0, 1, @LargeBlocksLocked) = 0 then
+        Break;
+      Sleep(AdditionalSleepTime);
+{$endif}
+    end;
+  end;
+end;
+
+{Allocates a Large block of at least ASize (actual size may be larger to
+ allow for alignment etc.). ASize must be the actual user requested size. This
+ procedure will pad it to the appropriate page boundary and also add the space
+ required by the header.}
+function AllocateLargeBlock(ASize: NativeUInt): Pointer;
+var
+  LLargeUsedBlockSize: NativeUInt;
+  LOldFirstLargeBlock: PLargeBlockHeader;
+begin
+  {Pad the block size to include the header and granularity. We also add a
+   SizeOf(Pointer) overhead so a huge block size is a multiple of 16 bytes less
+   SizeOf(Pointer) (so we can use a single move function for reallocating all
+   block types)}
+  LLargeUsedBlockSize := (ASize + LargeBlockHeaderSize + LargeBlockGranularity - 1 + BlockHeaderSize)
+    and -LargeBlockGranularity;
+  {Get the Large block}
+  Result := VirtualAlloc(nil, LLargeUsedBlockSize, MEM_COMMIT or MEM_TOP_DOWN,
+    PAGE_READWRITE);
+  {Set the Large block fields}
+  if Result <> nil then
+  begin
+    {Set the large block size and flags}
+    PLargeBlockHeader(Result).UserAllocatedSize := ASize;
+    PLargeBlockHeader(Result).BlockSizeAndFlags := LLargeUsedBlockSize or IsLargeBlockFlag;
+    {Insert the large block into the linked list of large blocks}
+    LockLargeBlocks;
+    LOldFirstLargeBlock := LargeBlocksCircularList.NextLargeBlockHeader;
+    PLargeBlockHeader(Result).PreviousLargeBlockHeader := @LargeBlocksCircularList;
+    LargeBlocksCircularList.NextLargeBlockHeader := Result;
+    PLargeBlockHeader(Result).NextLargeBlockHeader := LOldFirstLargeBlock;
+    LOldFirstLargeBlock.PreviousLargeBlockHeader := Result;
+    LargeBlocksLocked := False;
+    {Add the size of the header}
+    Inc(PByte(Result), LargeBlockHeaderSize);
+{$ifdef FullDebugMode}
+    {Since large blocks are never reused, the user area is not initialized to
+     the debug fill pattern, but the debug header and footer must be set.}
+    PFullDebugBlockHeader(Result).HeaderCheckSum := NativeUInt(Result);
+    PNativeUInt(PByte(Result) + SizeOf(TFullDebugBlockHeader))^ := not NativeUInt(Result);
+{$endif}
+  end;
+end;
+
+{Frees a large block, returning 0 on success, -1 otherwise}
+function FreeLargeBlock(APointer: Pointer): Integer;
+var
+  LPreviousLargeBlockHeader, LNextLargeBlockHeader: PLargeBlockHeader;
+{$ifndef POSIX}
+  LRemainingSize: NativeUInt;
+  LCurrentSegment: Pointer;
+  LMemInfo: TMemoryBasicInformation;
+{$endif}
+begin
+{$ifdef ClearLargeBlocksBeforeReturningToOS}
+  FillChar(APointer^,
+    (PLargeBlockHeader(PByte(APointer) - LargeBlockHeaderSize).BlockSizeAndFlags
+      and DropMediumAndLargeFlagsMask) - LargeBlockHeaderSize, 0);
+{$endif}
+  {Point to the start of the large block}
+  APointer := Pointer(PByte(APointer) - LargeBlockHeaderSize);
+  {Get the previous and next large blocks}
+  LockLargeBlocks;
+  LPreviousLargeBlockHeader := PLargeBlockHeader(APointer).PreviousLargeBlockHeader;
+  LNextLargeBlockHeader := PLargeBlockHeader(APointer).NextLargeBlockHeader;
+{$ifndef POSIX}
+  {Is the large block segmented?}
+  if PLargeBlockHeader(APointer).BlockSizeAndFlags and LargeBlockIsSegmented = 0 then
+  begin
+{$endif}
+    {Single segment large block: Try to free it}
+    if VirtualFree(APointer, 0, MEM_RELEASE) then
+      Result := 0
+    else
+      Result := -1;
+{$ifndef POSIX}
+  end
+  else
+  begin
+    {The large block is segmented - free all segments}
+    LCurrentSegment := APointer;
+    LRemainingSize := PLargeBlockHeader(APointer).BlockSizeAndFlags and DropMediumAndLargeFlagsMask;
+    Result := 0;
+    while True do
+    begin
+      {Get the size of the current segment}
+      VirtualQuery(LCurrentSegment, LMemInfo, SizeOf(LMemInfo));
+      {Free the segment}
+      if not VirtualFree(LCurrentSegment, 0, MEM_RELEASE) then
+      begin
+        Result := -1;
+        Break;
+      end;
+      {Done?}
+      if NativeUInt(LMemInfo.RegionSize) >= LRemainingSize then
+        Break;
+      {Decrement the remaining size}
+      Dec(LRemainingSize, NativeUInt(LMemInfo.RegionSize));
+      Inc(PByte(LCurrentSegment), NativeUInt(LMemInfo.RegionSize));
+    end;
+  end;
+{$endif}
+  {Success?}
+  if Result = 0 then
+  begin
+    {Remove the large block from the linked list}
+    LNextLargeBlockHeader.PreviousLargeBlockHeader := LPreviousLargeBlockHeader;
+    LPreviousLargeBlockHeader.NextLargeBlockHeader := LNextLargeBlockHeader;
+  end;
+  {Unlock the large blocks}
+  LargeBlocksLocked := False;
+end;
+
+{$ifndef FullDebugMode}
+{Reallocates a large block to at least the requested size. Returns the new
+ pointer, or nil on error}
+function ReallocateLargeBlock(APointer: Pointer; ANewSize: NativeUInt): Pointer;
+var
+  LOldAvailableSize, LBlockHeader, LOldUserSize, LMinimumUpsize,
+    LNewAllocSize: NativeUInt;
+{$ifndef POSIX}
+  LNewSegmentSize: NativeUInt;
+  LNextSegmentPointer: Pointer;
+  LMemInfo: TMemoryBasicInformation;
+{$endif}
+begin
+  {Get the block header}
+  LBlockHeader := PNativeUInt(PByte(APointer) - BlockHeaderSize)^;
+  {Large block - size is (16 + 4) less than the allocated size}
+  LOldAvailableSize := (LBlockHeader and DropMediumAndLargeFlagsMask) - (LargeBlockHeaderSize + BlockHeaderSize);
+  {Is it an upsize or a downsize?}
+  if ANewSize > LOldAvailableSize then
+  begin
+    {This pointer is being reallocated to a larger block and therefore it is
+     logical to assume that it may be enlarged again. Since reallocations are
+     expensive, there is a minimum upsize percentage to avoid unnecessary
+     future move operations.}
+    {Add 25% for large block upsizes}
+    LMinimumUpsize := LOldAvailableSize + (LOldAvailableSize shr 2);
+    if ANewSize < LMinimumUpsize then
+      LNewAllocSize := LMinimumUpsize
+    else
+      LNewAllocSize := ANewSize;
+{$ifndef POSIX}
+    {Can another large block segment be allocated directly after this segment,
+     thus negating the need to move the data?}
+    LNextSegmentPointer := Pointer(PByte(APointer) - LargeBlockHeaderSize + (LBlockHeader and DropMediumAndLargeFlagsMask));
+    VirtualQuery(LNextSegmentPointer, LMemInfo, SizeOf(LMemInfo));
+    if LMemInfo.State = MEM_FREE then
+    begin
+      {Round the region size to the previous 64K}
+      LMemInfo.RegionSize := LMemInfo.RegionSize and -LargeBlockGranularity;
+      {Enough space to grow in place?}
+      if NativeUInt(LMemInfo.RegionSize) > (ANewSize - LOldAvailableSize) then
+      begin
+        {There is enough space after the block to extend it - determine by how
+         much}
+        LNewSegmentSize := (LNewAllocSize - LOldAvailableSize + LargeBlockGranularity - 1) and -LargeBlockGranularity;
+        if LNewSegmentSize > LMemInfo.RegionSize then
+          LNewSegmentSize := LMemInfo.RegionSize;
+        {Attempy to reserve the address range (which will fail if another
+         thread has just reserved it) and commit it immediately afterwards.}
+        if (VirtualAlloc(LNextSegmentPointer, LNewSegmentSize, MEM_RESERVE, PAGE_READWRITE) <> nil)
+          and (VirtualAlloc(LNextSegmentPointer, LNewSegmentSize, MEM_COMMIT, PAGE_READWRITE) <> nil) then
+        begin
+          {Update the requested size}
+          PLargeBlockHeader(PByte(APointer) - LargeBlockHeaderSize).UserAllocatedSize := ANewSize;
+          PLargeBlockHeader(PByte(APointer) - LargeBlockHeaderSize).BlockSizeAndFlags :=
+            (PLargeBlockHeader(PByte(APointer) - LargeBlockHeaderSize).BlockSizeAndFlags + LNewSegmentSize)
+            or LargeBlockIsSegmented;
+          {Success}
+          Result := APointer;
+          Exit;
+        end;
+      end;
+    end;
+{$endif}
+    {Could not resize in place: Allocate the new block}
+    Result := FastGetMem(LNewAllocSize);
+    if Result <> nil then
+    begin
+      {If it's a large block - store the actual user requested size (it may
+       not be if the block that is being reallocated from was previously
+       downsized)}
+      if LNewAllocSize > (MaximumMediumBlockSize - BlockHeaderSize) then
+        PLargeBlockHeader(PByte(Result) - LargeBlockHeaderSize).UserAllocatedSize := ANewSize;
+      {The user allocated size is stored for large blocks}
+      LOldUserSize := PLargeBlockHeader(PByte(APointer) - LargeBlockHeaderSize).UserAllocatedSize;
+      {The number of bytes to move is the old user size.}
+{$ifdef UseCustomVariableSizeMoveRoutines}
+      MoveX16LP(APointer^, Result^, LOldUserSize);
+{$else}
+      System.Move(APointer^, Result^, LOldUserSize);
+{$endif}
+      {Free the old block}
+      FastFreeMem(APointer);
+    end;
+  end
+  else
+  begin
+    {It's a downsize: do we need to reallocate? Only if the new size is less
+     than half the old size}
+    if ANewSize >= (LOldAvailableSize shr 1) then
+    begin
+      {No need to reallocate}
+      Result := APointer;
+      {Update the requested size}
+      PLargeBlockHeader(PByte(APointer) - LargeBlockHeaderSize).UserAllocatedSize := ANewSize;
+    end
+    else
+    begin
+      {The block is less than half the old size, and the current size is
+       greater than the minimum block size allowing a downsize: reallocate}
+      Result := FastGetMem(ANewSize);
+      if Result <> nil then
+      begin
+        {Still a large block? -> Set the user size}
+        if ANewSize > (MaximumMediumBlockSize - BlockHeaderSize) then
+          PLargeBlockHeader(PByte(APointer) - LargeBlockHeaderSize).UserAllocatedSize := ANewSize;
+        {Move the data across}
+{$ifdef UseCustomVariableSizeMoveRoutines}
+{$ifdef Align16Bytes}
+        MoveX16LP(APointer^, Result^, ANewSize);
+{$else}
+        MoveX8LP(APointer^, Result^, ANewSize);
+{$endif}
+{$else}
+        System.Move(APointer^, Result^, ANewSize);
+{$endif}
+        {Free the old block}
+        FastFreeMem(APointer);
+      end;
+    end;
+  end;
+end;
+{$endif}
+
+{---------------------Replacement Memory Manager Interface---------------------}
+
+{Replacement for SysGetMem}
+
+function FastGetMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer;
+{$ifndef ASMVersion}
+var
+  LMediumBlock{$ifndef FullDebugMode}, LNextFreeBlock, LSecondSplit{$endif}: PMediumFreeBlock;
+  LNextMediumBlockHeader: PNativeUInt;
+  LBlockSize, LAvailableBlockSize{$ifndef FullDebugMode}, LSecondSplitSize{$endif},
+    LSequentialFeedFreeSize: NativeUInt;
+  LPSmallBlockType: PSmallBlockType;
+  LPSmallBlockPool, LPNewFirstPool: PSmallBlockPoolHeader;
+  LNewFirstFreeBlock: Pointer;
+  LPMediumBin: PMediumFreeBlock;
+  LBinNumber, {$ifndef FullDebugMode}LBinGroupsMasked, {$endif}LBinGroupMasked,
+    LBinGroupNumber: Cardinal;
+begin
+  {Is it a small block? -> Take the header size into account when
+   determining the required block size}
+  if NativeUInt(ASize) <= (MaximumSmallBlockSize - BlockHeaderSize) then
+  begin
+    {-------------------------Allocate a small block---------------------------}
+    {Get the block type from the size}
+    LPSmallBlockType := PSmallBlockType(AllocSize2SmallBlockTypeIndX4[
+      (NativeUInt(ASize) + (BlockHeaderSize - 1)) div SmallBlockGranularity]
+      * (SizeOf(TSmallBlockType) div 4)
+      + UIntPtr(@SmallBlockTypes));
+    {Lock the block type}
+{$ifndef AssumeMultiThreaded}
+    if IsMultiThread then
+{$endif}
+    begin
+      while True do
+      begin
+        {Try to lock the small block type}
+        if LockCmpxchg(0, 1, @LPSmallBlockType.BlockTypeLocked) = 0 then
+          Break;
+        {Try the next block type}
+        Inc(PByte(LPSmallBlockType), SizeOf(TSmallBlockType));
+        if LockCmpxchg(0, 1, @LPSmallBlockType.BlockTypeLocked) = 0 then
+          Break;
+        {Try up to two sizes past the requested size}
+        Inc(PByte(LPSmallBlockType), SizeOf(TSmallBlockType));
+        if LockCmpxchg(0, 1, @LPSmallBlockType.BlockTypeLocked) = 0 then
+          Break;
+        {All three sizes locked - given up and sleep}
+        Dec(PByte(LPSmallBlockType), 2 * SizeOf(TSmallBlockType));
+{$ifdef NeverSleepOnThreadContention}
+  {$ifdef UseSwitchToThread}
+        SwitchToThread;
+  {$endif}
+{$else}
+        {Both this block type and the next is in use: sleep}
+        Sleep(InitialSleepTime);
+        {Try the lock again}
+        if LockCmpxchg(0, 1, @LPSmallBlockType.BlockTypeLocked) = 0 then
+          Break;
+        {Sleep longer}
+        Sleep(AdditionalSleepTime);
+{$endif}
+      end;
+    end;
+    {Get the first pool with free blocks}
+    LPSmallBlockPool := LPSmallBlockType.NextPartiallyFreePool;
+    {Is the pool valid?}
+    if UIntPtr(LPSmallBlockPool) <> UIntPtr(LPSmallBlockType) then
+    begin
+      {Get the first free offset}
+      Result := LPSmallBlockPool.FirstFreeBlock;
+      {Get the new first free block}
+      LNewFirstFreeBlock := PPointer(PByte(Result) - BlockHeaderSize)^;
+{$ifdef CheckHeapForCorruption}
+      {The block should be free}
+      if (NativeUInt(LNewFirstFreeBlock) and ExtractSmallFlagsMask) <> IsFreeBlockFlag then
+  {$ifdef BCB6OrDelphi7AndUp}
+        System.Error(reInvalidPtr);
+  {$else}
+        System.RunError(reInvalidPtr);
+  {$endif}
+{$endif}
+      LNewFirstFreeBlock := Pointer(UIntPtr(LNewFirstFreeBlock) and DropSmallFlagsMask);
+      {Increment the number of used blocks}
+      Inc(LPSmallBlockPool.BlocksInUse);
+      {Set the new first free block}
+      LPSmallBlockPool.FirstFreeBlock := LNewFirstFreeBlock;
+      {Is the pool now full?}
+      if LNewFirstFreeBlock = nil then
+      begin
+        {Pool is full - remove it from the partially free list}
+        LPNewFirstPool := LPSmallBlockPool.NextPartiallyFreePool;
+        LPSmallBlockType.NextPartiallyFreePool := LPNewFirstPool;
+        LPNewFirstPool.PreviousPartiallyFreePool := PSmallBlockPoolHeader(LPSmallBlockType);
+      end;
+    end
+    else
+    begin
+      {Try to feed a small block sequentially}
+      Result := LPSmallBlockType.NextSequentialFeedBlockAddress;
+      {Can another block fit?}
+      if UIntPtr(Result) <= UIntPtr(LPSmallBlockType.MaxSequentialFeedBlockAddress) then
+      begin
+        {Get the sequential feed block pool}
+        LPSmallBlockPool := LPSmallBlockType.CurrentSequentialFeedPool;
+        {Increment the number of used blocks in the sequential feed pool}
+        Inc(LPSmallBlockPool.BlocksInUse);
+        {Store the next sequential feed block address}
+        LPSmallBlockType.NextSequentialFeedBlockAddress := Pointer(PByte(Result) + LPSmallBlockType.BlockSize);
+      end
+      else
+      begin
+        {Need to allocate a pool: Lock the medium blocks}
+        LockMediumBlocks;
+{$ifndef FullDebugMode}
+        {Are there any available blocks of a suitable size?}
+        LBinGroupsMasked := MediumBlockBinGroupBitmap and ($ffffff00 or LPSmallBlockType.AllowedGroupsForBlockPoolBitmap);
+        if LBinGroupsMasked <> 0 then
+        begin
+          {Get the bin group with free blocks}
+          LBinGroupNumber := FindFirstSetBit(LBinGroupsMasked);
+          {Get the bin in the group with free blocks}
+          LBinNumber := FindFirstSetBit(MediumBlockBinBitmaps[LBinGroupNumber])
+            + LBinGroupNumber * 32;
+          LPMediumBin := @MediumBlockBins[LBinNumber];
+          {Get the first block in the bin}
+          LMediumBlock := LPMediumBin.NextFreeBlock;
+          {Remove the first block from the linked list (LIFO)}
+          LNextFreeBlock := LMediumBlock.NextFreeBlock;
+          LPMediumBin.NextFreeBlock := LNextFreeBlock;
+          LNextFreeBlock.PreviousFreeBlock := LPMediumBin;
+          {Is this bin now empty?}
+          if LNextFreeBlock = LPMediumBin then
+          begin
+            {Flag this bin as empty}
+            MediumBlockBinBitmaps[LBinGroupNumber] := MediumBlockBinBitmaps[LBinGroupNumber]
+              and (not (1 shl (LBinNumber and 31)));
+            {Is the group now entirely empty?}
+            if MediumBlockBinBitmaps[LBinGroupNumber] = 0 then
+            begin
+              {Flag this group as empty}
+              MediumBlockBinGroupBitmap := MediumBlockBinGroupBitmap
+                and (not (1 shl LBinGroupNumber));
+            end;
+          end;
+          {Get the size of the available medium block}
+          LBlockSize := PNativeUInt(PByte(LMediumBlock) - BlockHeaderSize)^ and DropMediumAndLargeFlagsMask;
+  {$ifdef CheckHeapForCorruption}
+          {Check that this block is actually free and the next and previous blocks
+           are both in use.}
+          if ((PNativeUInt(PByte(LMediumBlock) - BlockHeaderSize)^ and ExtractMediumAndLargeFlagsMask) <> (IsMediumBlockFlag or IsFreeBlockFlag))
+            or ((PNativeUInt(PByte(LMediumBlock) + (PNativeUInt(PByte(LMediumBlock) - BlockHeaderSize)^ and DropMediumAndLargeFlagsMask) - BlockHeaderSize)^ and IsFreeBlockFlag) <> 0)
+          then
+          begin
+    {$ifdef BCB6OrDelphi7AndUp}
+            System.Error(reInvalidPtr);
+    {$else}
+            System.RunError(reInvalidPtr);
+    {$endif}
+          end;
+  {$endif}
+          {Should the block be split?}
+          if LBlockSize >= MaximumSmallBlockPoolSize then
+          begin
+            {Get the size of the second split}
+            LSecondSplitSize := LBlockSize - LPSmallBlockType.OptimalBlockPoolSize;
+            {Adjust the block size}
+            LBlockSize := LPSmallBlockType.OptimalBlockPoolSize;
+            {Split the block in two}
+            LSecondSplit := PMediumFreeBlock(PByte(LMediumBlock) + LBlockSize);
+            PNativeUInt(PByte(LSecondSplit) - BlockHeaderSize)^ := LSecondSplitSize or (IsMediumBlockFlag or IsFreeBlockFlag);
+            {Store the size of the second split as the second last dword/qword}
+            PNativeUInt(PByte(LSecondSplit) + LSecondSplitSize - 2 * BlockHeaderSize)^ := LSecondSplitSize;
+            {Put the remainder in a bin (it will be big enough)}
+            InsertMediumBlockIntoBin(LSecondSplit, LSecondSplitSize);
+          end
+          else
+          begin
+            {Mark this block as used in the block following it}
+            LNextMediumBlockHeader := PNativeUInt(PByte(LMediumBlock) + LBlockSize - BlockHeaderSize);
+            LNextMediumBlockHeader^ := LNextMediumBlockHeader^ and (not PreviousMediumBlockIsFreeFlag);
+          end;
+        end
+        else
+        begin
+{$endif}
+          {Check the sequential feed medium block pool for space}
+          LSequentialFeedFreeSize := MediumSequentialFeedBytesLeft;
+          if LSequentialFeedFreeSize >= LPSmallBlockType.MinimumBlockPoolSize then
+          begin
+            {Enough sequential feed space: Will the remainder be usable?}
+            if LSequentialFeedFreeSize >= (LPSmallBlockType.OptimalBlockPoolSize + MinimumMediumBlockSize) then
+            begin
+              LBlockSize := LPSmallBlockType.OptimalBlockPoolSize;
+            end
+            else
+              LBlockSize := LSequentialFeedFreeSize;
+            {Get the block}
+            LMediumBlock := Pointer(PByte(LastSequentiallyFedMediumBlock) - LBlockSize);
+            {Update the sequential feed parameters}
+            LastSequentiallyFedMediumBlock := LMediumBlock;
+            MediumSequentialFeedBytesLeft := LSequentialFeedFreeSize - LBlockSize;
+          end
+          else
+          begin
+            {Need to allocate a new sequential feed medium block pool: use the
+             optimal size for this small block pool}
+            LBlockSize := LPSmallBlockType.OptimalBlockPoolSize;
+            {Allocate the medium block pool}
+            LMediumBlock := AllocNewSequentialFeedMediumPool(LBlockSize);
+            if LMediumBlock = nil then
+            begin
+              {Out of memory}
+              {Unlock the medium blocks}
+              MediumBlocksLocked := False;
+              {Unlock the block type}
+              LPSmallBlockType.BlockTypeLocked := False;
+              {Failed}
+              Result := nil;
+              {done}
+              Exit;
+            end;
+          end;
+{$ifndef FullDebugMode}
+        end;
+{$endif}
+        {Mark this block as in use}
+        {Set the size and flags for this block}
+        PNativeUInt(PByte(LMediumBlock) - BlockHeaderSize)^ := LBlockSize or IsMediumBlockFlag or IsSmallBlockPoolInUseFlag;
+        {Unlock medium blocks}
+        MediumBlocksLocked := False;
+        {Set up the block pool}
+        LPSmallBlockPool := PSmallBlockPoolHeader(LMediumBlock);
+        LPSmallBlockPool.BlockType := LPSmallBlockType;
+        LPSmallBlockPool.FirstFreeBlock := nil;
+        LPSmallBlockPool.BlocksInUse := 1;
+        {Set it up for sequential block serving}
+        LPSmallBlockType.CurrentSequentialFeedPool := LPSmallBlockPool;
+        Result := Pointer(PByte(LPSmallBlockPool) + SmallBlockPoolHeaderSize);
+        LPSmallBlockType.NextSequentialFeedBlockAddress := Pointer(PByte(Result) + LPSmallBlockType.BlockSize);
+        LPSmallBlockType.MaxSequentialFeedBlockAddress := Pointer(PByte(LPSmallBlockPool) + LBlockSize - LPSmallBlockType.BlockSize);
+      end;
+{$ifdef FullDebugMode}
+      {Clear the user area of the block}
+      DebugFillMem(Pointer(PByte(Result) + (SizeOf(TFullDebugBlockHeader) + SizeOf(NativeUInt)))^,
+        LPSmallBlockType.BlockSize - FullDebugBlockOverhead - SizeOf(NativeUInt),
+        {$ifndef CatchUseOfFreedInterfaces}DebugFillPattern{$else}NativeUInt(@VMTBadInterface){$endif});
+      {Block was fed sequentially - we need to set a valid debug header. Use
+       the block address.}
+      PFullDebugBlockHeader(Result).HeaderCheckSum := NativeUInt(Result);
+      PNativeUInt(PByte(Result) + SizeOf(TFullDebugBlockHeader))^ := not NativeUInt(Result);
+{$endif}
+    end;
+    {Unlock the block type}
+    LPSmallBlockType.BlockTypeLocked := False;
+    {Set the block header}
+    PNativeUInt(PByte(Result) - BlockHeaderSize)^ := UIntPtr(LPSmallBlockPool);
+  end
+  else
+  begin
+    {Medium block or Large block?}
+    if NativeUInt(ASize) <= (MaximumMediumBlockSize - BlockHeaderSize) then
+    begin
+      {------------------------Allocate a medium block--------------------------}
+      {Get the block size and bin number for this block size. Block sizes are
+       rounded up to the next bin size.}
+      LBlockSize := ((NativeUInt(ASize) + (MediumBlockGranularity - 1 + BlockHeaderSize - MediumBlockSizeOffset))
+        and -MediumBlockGranularity) + MediumBlockSizeOffset;
+      {Get the bin number}
+      LBinNumber := (LBlockSize - MinimumMediumBlockSize) div MediumBlockGranularity;
+      {Lock the medium blocks}
+      LockMediumBlocks;
+      {Calculate the bin group}
+      LBinGroupNumber := LBinNumber div 32;
+      {Is there a suitable block inside this group?}
+      LBinGroupMasked := MediumBlockBinBitmaps[LBinGroupNumber] and -(1 shl (LBinNumber and 31));
+      if LBinGroupMasked <> 0 then
+      begin
+        {Get the actual bin number}
+        LBinNumber := FindFirstSetBit(LBinGroupMasked) + LBinGroupNumber * 32;
+      end
+      else
+      begin
+{$ifndef FullDebugMode}
+        {Try all groups greater than this group}
+        LBinGroupsMasked := MediumBlockBinGroupBitmap and -(2 shl LBinGroupNumber);
+        if LBinGroupsMasked <> 0 then
+        begin
+          {There is a suitable group with space: get the bin number}
+          LBinGroupNumber := FindFirstSetBit(LBinGroupsMasked);
+          {Get the bin in the group with free blocks}
+          LBinNumber := FindFirstSetBit(MediumBlockBinBitmaps[LBinGroupNumber])
+            + LBinGroupNumber * 32;
+        end
+        else
+        begin
+{$endif}
+          {There are no bins with a suitable block: Sequentially feed the required block}
+          LSequentialFeedFreeSize := MediumSequentialFeedBytesLeft;
+          if LSequentialFeedFreeSize >= LBlockSize then
+          begin
+{$ifdef FullDebugMode}
+            {In full debug mode a medium block must have enough bytes to fit
+             all the debug info, so we must make sure there are no tiny medium
+             blocks at the start of the pool.}
+            if LSequentialFeedFreeSize - LBlockSize < (FullDebugBlockOverhead + BlockHeaderSize) then
+              LBlockSize := LSequentialFeedFreeSize;
+{$endif}
+            {Block can be fed sequentially}
+            Result := Pointer(PByte(LastSequentiallyFedMediumBlock) - LBlockSize);
+            {Store the last sequentially fed block}
+            LastSequentiallyFedMediumBlock := Result;
+            {Store the remaining bytes}
+            MediumSequentialFeedBytesLeft := LSequentialFeedFreeSize - LBlockSize;
+            {Set the flags for the block}
+            PNativeUInt(PByte(Result) - BlockHeaderSize)^ := LBlockSize or IsMediumBlockFlag;
+          end
+          else
+          begin
+            {Need to allocate a new sequential feed block}
+            Result := AllocNewSequentialFeedMediumPool(LBlockSize);
+          end;
+{$ifdef FullDebugMode}
+          {Block was fed sequentially - we need to set a valid debug header}
+          if Result <> nil then
+          begin
+            PFullDebugBlockHeader(Result).HeaderCheckSum := NativeUInt(Result);
+            PNativeUInt(PByte(Result) + SizeOf(TFullDebugBlockHeader))^ := not NativeUInt(Result);
+            {Clear the user area of the block}
+            DebugFillMem(Pointer(PByte(Result) + SizeOf(TFullDebugBlockHeader) + SizeOf(NativeUInt))^,
+              LBlockSize - FullDebugBlockOverhead - SizeOf(NativeUInt),
+              {$ifndef CatchUseOfFreedInterfaces}DebugFillPattern{$else}NativeUInt(@VMTBadInterface){$endif});
+          end;
+{$endif}
+          {Done}
+          MediumBlocksLocked := False;
+          Exit;
+{$ifndef FullDebugMode}
+        end;
+{$endif}
+      end;
+      {If we get here we have a valid LBinGroupNumber and LBinNumber:
+       Use the first block in the bin, splitting it if necessary}
+      {Get a pointer to the bin}
+      LPMediumBin := @MediumBlockBins[LBinNumber];
+      {Get the result}
+      Result := LPMediumBin.NextFreeBlock;
+{$ifdef CheckHeapForCorruption}
+      {Check that this block is actually free and the next and previous blocks
+       are both in use (except in full debug mode).}
+      if ((PNativeUInt(PByte(Result) - BlockHeaderSize)^ and {$ifndef FullDebugMode}ExtractMediumAndLargeFlagsMask{$else}(IsMediumBlockFlag or IsFreeBlockFlag){$endif}) <> (IsFreeBlockFlag or IsMediumBlockFlag))
+  {$ifndef FullDebugMode}
+        or ((PNativeUInt(PByte(Result) + (PNativeUInt(PByte(Result) - BlockHeaderSize)^ and DropMediumAndLargeFlagsMask) - BlockHeaderSize)^ and (ExtractMediumAndLargeFlagsMask - IsSmallBlockPoolInUseFlag)) <> (IsMediumBlockFlag or PreviousMediumBlockIsFreeFlag))
+  {$endif}
+      then
+      begin
+  {$ifdef BCB6OrDelphi7AndUp}
+        System.Error(reInvalidPtr);
+  {$else}
+        System.RunError(reInvalidPtr);
+  {$endif}
+      end;
+{$endif}
+      {Remove the block from the bin containing it}
+      RemoveMediumFreeBlock(Result);
+      {Get the block size}
+      LAvailableBlockSize := PNativeUInt(PByte(Result) - BlockHeaderSize)^ and DropMediumAndLargeFlagsMask;
+{$ifndef FullDebugMode}
+      {Is it an exact fit or not?}
+      LSecondSplitSize := LAvailableBlockSize - LBlockSize;
+      if LSecondSplitSize <> 0 then
+      begin
+        {Split the block in two}
+        LSecondSplit := PMediumFreeBlock(PByte(Result) + LBlockSize);
+        {Set the size of the second split}
+        PNativeUInt(PByte(LSecondSplit) - BlockHeaderSize)^ := LSecondSplitSize or (IsMediumBlockFlag or IsFreeBlockFlag);
+        {Store the size of the second split}
+        PNativeUInt(PByte(LSecondSplit) + LSecondSplitSize - 2 * BlockHeaderSize)^ := LSecondSplitSize;
+        {Put the remainder in a bin if it is big enough}
+        if LSecondSplitSize >= MinimumMediumBlockSize then
+          InsertMediumBlockIntoBin(LSecondSplit, LSecondSplitSize);
+      end
+      else
+      begin
+{$else}
+        {In full debug mode blocks are never split or coalesced}
+        LBlockSize := LAvailableBlockSize;
+{$endif}
+        {Mark this block as used in the block following it}
+        LNextMediumBlockHeader := Pointer(PByte(Result) + LBlockSize - BlockHeaderSize);
+{$ifndef FullDebugMode}
+  {$ifdef CheckHeapForCorruption}
+        {The next block must be in use}
+        if (LNextMediumBlockHeader^ and (ExtractMediumAndLargeFlagsMask - IsSmallBlockPoolInUseFlag)) <> (IsMediumBlockFlag or PreviousMediumBlockIsFreeFlag) then
+    {$ifdef BCB6OrDelphi7AndUp}
+        System.Error(reInvalidPtr);
+    {$else}
+        System.RunError(reInvalidPtr);
+    {$endif}
+  {$endif}
+{$endif}
+        LNextMediumBlockHeader^ :=
+          LNextMediumBlockHeader^ and (not PreviousMediumBlockIsFreeFlag);
+{$ifndef FullDebugMode}
+      end;
+      {Set the size and flags for this block}
+      PNativeUInt(PByte(Result) - BlockHeaderSize)^ := LBlockSize or IsMediumBlockFlag;
+{$else}
+      {In full debug mode blocks are never split or coalesced}
+      Dec(PNativeUInt(PByte(Result) - BlockHeaderSize)^, IsFreeBlockFlag);
+{$endif}
+      {Unlock the medium blocks}
+      MediumBlocksLocked := False;
+    end
+    else
+    begin
+      {Allocate a Large block}
+      if ASize > 0 then
+        Result := AllocateLargeBlock(ASize)
+      else
+        Result := nil;
+    end;
+  end;
+end;
+{$else}
+{$ifdef 32Bit}
+asm
+  {On entry:
+    eax = ASize}
+  {Since most allocations are for small blocks, determine the small block type
+   index so long}
+  lea edx, [eax + BlockHeaderSize - 1]
+{$ifdef Align16Bytes}
+  shr edx, 4
+{$else}
+  shr edx, 3
+{$endif}
+  {Is it a small block?}
+  cmp eax, (MaximumSmallBlockSize - BlockHeaderSize)
+  {Save ebx}
+  push ebx
+  {Get the IsMultiThread variable so long}
+{$ifndef AssumeMultiThreaded}
+  mov cl, IsMultiThread
+{$endif}
+  {Is it a small block?}
+  ja @NotASmallBlock
+  {Do we need to lock the block type?}
+{$ifndef AssumeMultiThreaded}
+  test cl, cl
+{$endif}
+  {Get the small block type in ebx}
+  movzx eax, byte ptr [AllocSize2SmallBlockTypeIndX4 + edx]
+  lea ebx, [SmallBlockTypes + eax * 8]
+  {Do we need to lock the block type?}
+{$ifndef AssumeMultiThreaded}
+  jnz @LockBlockTypeLoop
+{$else}
+  jmp @LockBlockTypeLoop
+  {Align branch target}
+  nop
+  nop
+{$endif}
+@GotLockOnSmallBlockType:
+  {Find the next free block: Get the first pool with free blocks in edx}
+  mov edx, TSmallBlockType[ebx].NextPartiallyFreePool
+  {Get the first free block (or the next sequential feed address if edx = ebx)}
+  mov eax, TSmallBlockPoolHeader[edx].FirstFreeBlock
+  {Get the drop flags mask in ecx so long}
+  mov ecx, DropSmallFlagsMask
+  {Is there a pool with free blocks?}
+  cmp edx, ebx
+  je @TrySmallSequentialFeed
+  {Increment the number of used blocks}
+  add TSmallBlockPoolHeader[edx].BlocksInUse, 1
+  {Get the new first free block}
+  and ecx, [eax - 4]
+  {Set the new first free block}
+  mov TSmallBlockPoolHeader[edx].FirstFreeBlock, ecx
+  {Set the block header}
+  mov [eax - 4], edx
+  {Is the chunk now full?}
+  jz @RemoveSmallPool
+  {Unlock the block type}
+  mov TSmallBlockType[ebx].BlockTypeLocked, False
+  {Restore ebx}
+  pop ebx
+  {All done}
+  ret
+  {Align branch target}
+{$ifndef AssumeMultiThreaded}
+  nop
+  nop
+{$endif}
+  nop
+@TrySmallSequentialFeed:
+  {Try to feed a small block sequentially: Get the sequential feed block pool}
+  mov edx, TSmallBlockType[ebx].CurrentSequentialFeedPool
+  {Get the next sequential feed address so long}
+  movzx ecx, TSmallBlockType[ebx].BlockSize
+  add ecx, eax
+  {Can another block fit?}
+  cmp eax, TSmallBlockType[ebx].MaxSequentialFeedBlockAddress
+  ja @AllocateSmallBlockPool
+  {Increment the number of used blocks in the sequential feed pool}
+  add TSmallBlockPoolHeader[edx].BlocksInUse, 1
+  {Store the next sequential feed block address}
+  mov TSmallBlockType[ebx].NextSequentialFeedBlockAddress, ecx
+  {Unlock the block type}
+  mov TSmallBlockType[ebx].BlockTypeLocked, False
+  {Set the block header}
+  mov [eax - 4], edx
+  {Restore ebx}
+  pop ebx
+  {All done}
+  ret
+  {Align branch target}
+  nop
+  nop
+  nop
+@RemoveSmallPool:
+  {Pool is full - remove it from the partially free list}
+  mov ecx, TSmallBlockPoolHeader[edx].NextPartiallyFreePool
+  mov TSmallBlockPoolHeader[ecx].PreviousPartiallyFreePool, ebx
+  mov TSmallBlockType[ebx].NextPartiallyFreePool, ecx
+  {Unlock the block type}
+  mov TSmallBlockType[ebx].BlockTypeLocked, False
+  {Restore ebx}
+  pop ebx
+  {All done}
+  ret
+  {Align branch target}
+  nop
+  nop
+@LockBlockTypeLoop:
+  mov eax, $100
+  {Attempt to grab the block type}
+  lock cmpxchg TSmallBlockType([ebx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+  {Try the next size}
+  add ebx, Type(TSmallBlockType)
+  mov eax, $100
+  lock cmpxchg TSmallBlockType([ebx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+  {Try the next size (up to two sizes larger)}
+  add ebx, Type(TSmallBlockType)
+  mov eax, $100
+  lock cmpxchg TSmallBlockType([ebx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+  {Block type and two sizes larger are all locked - give up and sleep}
+  sub ebx, 2 * Type(TSmallBlockType)
+{$ifdef NeverSleepOnThreadContention}
+  {Pause instruction (improves performance on P4)}
+  rep nop
+  {$ifdef UseSwitchToThread}
+  call SwitchToThread
+  {$endif}
+  {Try again}
+  jmp @LockBlockTypeLoop
+  {Align branch target}
+  nop
+  {$ifndef UseSwitchToThread}
+  nop
+  {$endif}
+{$else}
+  {Couldn't grab the block type - sleep and try again}
+  push InitialSleepTime
+  call Sleep
+  {Try again}
+  mov eax, $100
+  {Attempt to grab the block type}
+  lock cmpxchg TSmallBlockType([ebx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+  {Couldn't grab the block type - sleep and try again}
+  push AdditionalSleepTime
+  call Sleep
+  {Try again}
+  jmp @LockBlockTypeLoop
+  {Align branch target}
+  nop
+  nop
+  nop
+{$endif}
+@AllocateSmallBlockPool:
+  {save additional registers}
+  push esi
+  push edi
+  {Do we need to lock the medium blocks?}
+{$ifndef AssumeMultiThreaded}
+  cmp IsMultiThread, False
+  je @MediumBlocksLockedForPool
+{$endif}
+  call LockMediumBlocks
+@MediumBlocksLockedForPool:
+  {Are there any available blocks of a suitable size?}
+  movsx esi, TSmallBlockType[ebx].AllowedGroupsForBlockPoolBitmap
+  and esi, MediumBlockBinGroupBitmap
+  jz @NoSuitableMediumBlocks
+  {Get the bin group number with free blocks in eax}
+  bsf eax, esi
+  {Get the bin number in ecx}
+  lea esi, [eax * 8]
+  mov ecx, dword ptr [MediumBlockBinBitmaps + eax * 4]
+  bsf ecx, ecx
+  lea ecx, [ecx + esi * 4]
+  {Get a pointer to the bin in edi}
+  lea edi, [MediumBlockBins + ecx * 8]
+  {Get the free block in esi}
+  mov esi, TMediumFreeBlock[edi].NextFreeBlock
+  {Remove the first block from the linked list (LIFO)}
+  mov edx, TMediumFreeBlock[esi].NextFreeBlock
+  mov TMediumFreeBlock[edi].NextFreeBlock, edx
+  mov TMediumFreeBlock[edx].PreviousFreeBlock, edi
+  {Is this bin now empty?}
+  cmp edi, edx
+  jne @MediumBinNotEmpty
+  {eax = bin group number, ecx = bin number, edi = @bin, esi = free block, ebx = block type}
+  {Flag this bin as empty}
+  mov edx, -2
+  rol edx, cl
+  and dword ptr [MediumBlockBinBitmaps + eax * 4], edx
+  jnz @MediumBinNotEmpty
+  {Flag the group as empty}
+  btr MediumBlockBinGroupBitmap, eax
+@MediumBinNotEmpty:
+  {esi = free block, ebx = block type}
+  {Get the size of the available medium block in edi}
+  mov edi, DropMediumAndLargeFlagsMask
+  and edi, [esi - 4]
+  cmp edi, MaximumSmallBlockPoolSize
+  jb @UseWholeBlock
+  {Split the block: get the size of the second part, new block size is the
+   optimal size}
+  mov edx, edi
+  movzx edi, TSmallBlockType[ebx].OptimalBlockPoolSize
+  sub edx, edi
+  {Split the block in two}
+  lea eax, [esi + edi]
+  lea ecx, [edx + IsMediumBlockFlag + IsFreeBlockFlag]
+  mov [eax - 4], ecx
+  {Store the size of the second split as the second last dword}
+  mov [eax + edx - 8], edx
+  {Put the remainder in a bin (it will be big enough)}
+  call InsertMediumBlockIntoBin
+  jmp @GotMediumBlock
+  {Align branch target}
+{$ifdef AssumeMultiThreaded}
+  nop
+{$endif}
+@NoSuitableMediumBlocks:
+  {Check the sequential feed medium block pool for space}
+  movzx ecx, TSmallBlockType[ebx].MinimumBlockPoolSize
+  mov edi, MediumSequentialFeedBytesLeft
+  cmp edi, ecx
+  jb @AllocateNewSequentialFeed
+  {Get the address of the last block that was fed}
+  mov esi, LastSequentiallyFedMediumBlock
+  {Enough sequential feed space: Will the remainder be usable?}
+  movzx ecx, TSmallBlockType[ebx].OptimalBlockPoolSize
+  lea edx, [ecx + MinimumMediumBlockSize]
+  cmp edi, edx
+  jb @NotMuchSpace
+  mov edi, ecx
+@NotMuchSpace:
+  sub esi, edi
+  {Update the sequential feed parameters}
+  sub MediumSequentialFeedBytesLeft, edi
+  mov LastSequentiallyFedMediumBlock, esi
+  {Get the block pointer}
+  jmp @GotMediumBlock
+  {Align branch target}
+@AllocateNewSequentialFeed:
+  {Need to allocate a new sequential feed medium block pool: use the
+   optimal size for this small block pool}
+  movzx eax, TSmallBlockType[ebx].OptimalBlockPoolSize
+  mov edi, eax
+  {Allocate the medium block pool}
+  call AllocNewSequentialFeedMediumPool
+  mov esi, eax
+  test eax, eax
+  jnz @GotMediumBlock
+  mov MediumBlocksLocked, al
+  mov TSmallBlockType[ebx].BlockTypeLocked, al
+  pop edi
+  pop esi
+  pop ebx
+  ret
+  {Align branch target}
+@UseWholeBlock:
+  {esi = free block, ebx = block type, edi = block size}
+  {Mark this block as used in the block following it}
+  and byte ptr [esi + edi - 4], not PreviousMediumBlockIsFreeFlag
+@GotMediumBlock:
+  {esi = free block, ebx = block type, edi = block size}
+  {Set the size and flags for this block}
+  lea ecx, [edi + IsMediumBlockFlag + IsSmallBlockPoolInUseFlag]
+  mov [esi - 4], ecx
+  {Unlock medium blocks}
+  xor eax, eax
+  mov MediumBlocksLocked, al
+  {Set up the block pool}
+  mov TSmallBlockPoolHeader[esi].BlockType, ebx
+  mov TSmallBlockPoolHeader[esi].FirstFreeBlock, eax
+  mov TSmallBlockPoolHeader[esi].BlocksInUse, 1
+  {Set it up for sequential block serving}
+  mov TSmallBlockType[ebx].CurrentSequentialFeedPool, esi
+  {Return the pointer to the first block}
+  lea eax, [esi + SmallBlockPoolHeaderSize]
+  movzx ecx, TSmallBlockType[ebx].BlockSize
+  lea edx, [eax + ecx]
+  mov TSmallBlockType[ebx].NextSequentialFeedBlockAddress, edx
+  add edi, esi
+  sub edi, ecx
+  mov TSmallBlockType[ebx].MaxSequentialFeedBlockAddress, edi
+  {Unlock the small block type}
+  mov TSmallBlockType[ebx].BlockTypeLocked, False
+  {Set the small block header}
+  mov [eax - 4], esi
+  {Restore registers}
+  pop edi
+  pop esi
+  pop ebx
+  {Done}
+  ret
+{-------------------Medium block allocation-------------------}
+  {Align branch target}
+  nop
+@NotASmallBlock:
+  cmp eax, (MaximumMediumBlockSize - BlockHeaderSize)
+  ja @IsALargeBlockRequest
+  {Get the bin size for this block size. Block sizes are
+   rounded up to the next bin size.}
+  lea ebx, [eax + MediumBlockGranularity - 1 + BlockHeaderSize - MediumBlockSizeOffset]
+  and ebx, -MediumBlockGranularity
+  add ebx, MediumBlockSizeOffset
+  {Do we need to lock the medium blocks?}
+{$ifndef AssumeMultiThreaded}
+  test cl, cl
+  jz @MediumBlocksLocked
+{$endif}
+  call LockMediumBlocks
+@MediumBlocksLocked:
+  {Get the bin number in ecx and the group number in edx}
+  lea edx, [ebx - MinimumMediumBlockSize]
+  mov ecx, edx
+  shr edx, 8 + 5
+  shr ecx, 8
+  {Is there a suitable block inside this group?}
+  mov eax, -1
+  shl eax, cl
+  and eax, dword ptr [MediumBlockBinBitmaps + edx * 4]
+  jz @GroupIsEmpty
+  {Get the actual bin number}
+  and ecx, -32
+  bsf eax, eax
+  or ecx, eax
+  jmp @GotBinAndGroup
+  {Align branch target}
+  nop
+@GroupIsEmpty:
+  {Try all groups greater than this group}
+  mov eax, -2
+  mov ecx, edx
+  shl eax, cl
+  and eax, MediumBlockBinGroupBitmap
+  jz @TrySequentialFeedMedium
+  {There is a suitable group with space: get the bin number}
+  bsf edx, eax
+  {Get the bin in the group with free blocks}
+  mov eax, dword ptr [MediumBlockBinBitmaps + edx * 4]
+  bsf ecx, eax
+  mov eax, edx
+  shl eax, 5
+  or ecx, eax
+  jmp @GotBinAndGroup
+  {Align branch target}
+  nop
+@TrySequentialFeedMedium:
+  mov ecx, MediumSequentialFeedBytesLeft
+  {Block can be fed sequentially?}
+  sub ecx, ebx
+  jc @AllocateNewSequentialFeedForMedium
+  {Get the block address}
+  mov eax, LastSequentiallyFedMediumBlock
+  sub eax, ebx
+  mov LastSequentiallyFedMediumBlock, eax
+  {Store the remaining bytes}
+  mov MediumSequentialFeedBytesLeft, ecx
+  {Set the flags for the block}
+  or ebx, IsMediumBlockFlag
+  mov [eax - 4], ebx
+  jmp @MediumBlockGetDone
+  {Align branch target}
+@AllocateNewSequentialFeedForMedium:
+  mov eax, ebx
+  call AllocNewSequentialFeedMediumPool
+@MediumBlockGetDone:
+  mov MediumBlocksLocked, False
+  pop ebx
+  ret
+  {Align branch target}
+@GotBinAndGroup:
+  {ebx = block size, ecx = bin number, edx = group number}
+  push esi
+  push edi
+  {Get a pointer to the bin in edi}
+  lea edi, [MediumBlockBins + ecx * 8]
+  {Get the free block in esi}
+  mov esi, TMediumFreeBlock[edi].NextFreeBlock
+  {Remove the first block from the linked list (LIFO)}
+  mov eax, TMediumFreeBlock[esi].NextFreeBlock
+  mov TMediumFreeBlock[edi].NextFreeBlock, eax
+  mov TMediumFreeBlock[eax].PreviousFreeBlock, edi
+  {Is this bin now empty?}
+  cmp edi, eax
+  jne @MediumBinNotEmptyForMedium
+  {eax = bin group number, ecx = bin number, edi = @bin, esi = free block, ebx = block size}
+  {Flag this bin as empty}
+  mov eax, -2
+  rol eax, cl
+  and dword ptr [MediumBlockBinBitmaps + edx * 4], eax
+  jnz @MediumBinNotEmptyForMedium
+  {Flag the group as empty}
+  btr MediumBlockBinGroupBitmap, edx
+@MediumBinNotEmptyForMedium:
+  {esi = free block, ebx = block size}
+  {Get the size of the available medium block in edi}
+  mov edi, DropMediumAndLargeFlagsMask
+  and edi, [esi - 4]
+  {Get the size of the second split in edx}
+  mov edx, edi
+  sub edx, ebx
+  jz @UseWholeBlockForMedium
+  {Split the block in two}
+  lea eax, [esi + ebx]
+  lea ecx, [edx + IsMediumBlockFlag + IsFreeBlockFlag]
+  mov [eax - 4], ecx
+  {Store the size of the second split as the second last dword}
+  mov [eax + edx - 8], edx
+  {Put the remainder in a bin}
+  cmp edx, MinimumMediumBlockSize
+  jb @GotMediumBlockForMedium
+  call InsertMediumBlockIntoBin
+  jmp @GotMediumBlockForMedium
+  {Align branch target}
+  nop
+  nop
+  nop
+@UseWholeBlockForMedium:
+  {Mark this block as used in the block following it}
+  and byte ptr [esi + edi - 4], not PreviousMediumBlockIsFreeFlag
+@GotMediumBlockForMedium:
+  {Set the size and flags for this block}
+  lea ecx, [ebx + IsMediumBlockFlag]
+  mov [esi - 4], ecx
+  {Unlock medium blocks}
+  mov MediumBlocksLocked, False
+  mov eax, esi
+  pop edi
+  pop esi
+  pop ebx
+  ret
+{-------------------Large block allocation-------------------}
+  {Align branch target}
+@IsALargeBlockRequest:
+  pop ebx
+  test eax, eax
+  jns AllocateLargeBlock
+  xor eax, eax
+end;
+{$else}
+{64-bit BASM implementation}
+asm
+  {On entry:
+    rcx = ASize}
+  .params 2
+  .pushnv rbx
+  .pushnv rsi
+  .pushnv rdi
+  {Since most allocations are for small blocks, determine the small block type
+   index so long}
+  lea edx, [ecx + BlockHeaderSize - 1]
+{$ifdef Align16Bytes}
+  shr edx, 4
+{$else}
+  shr edx, 3
+{$endif}
+  {Preload the addresses of some small block structures}
+  lea r8, AllocSize2SmallBlockTypeIndX4
+  lea rbx, SmallBlockTypes
+{$ifndef AssumeMultiThreaded}
+  {Get the IsMultiThread variable so long}
+  movzx esi, IsMultiThread
+{$endif}
+  {Is it a small block?}
+  cmp rcx, (MaximumSmallBlockSize - BlockHeaderSize)
+  ja @NotASmallBlock
+  {Get the small block type pointer in rbx}
+  movzx ecx, byte ptr [r8 + rdx]
+  shl ecx, 4 //SizeOf(TSmallBlockType) = 64
+  add rbx, rcx
+  {Do we need to lock the block type?}
+{$ifndef AssumeMultiThreaded}
+  test esi, esi
+  jnz @LockBlockTypeLoop
+{$else}
+  jmp @LockBlockTypeLoop
+{$endif}
+@GotLockOnSmallBlockType:
+  {Find the next free block: Get the first pool with free blocks in rdx}
+  mov rdx, TSmallBlockType[rbx].NextPartiallyFreePool
+  {Get the first free block (or the next sequential feed address if rdx = rbx)}
+  mov rax, TSmallBlockPoolHeader[rdx].FirstFreeBlock
+  {Get the drop flags mask in rcx so long}
+  mov rcx, DropSmallFlagsMask
+  {Is there a pool with free blocks?}
+  cmp rdx, rbx
+  je @TrySmallSequentialFeed
+  {Increment the number of used blocks}
+  add TSmallBlockPoolHeader[rdx].BlocksInUse, 1
+  {Get the new first free block}
+  and rcx, [rax - BlockHeaderSize]
+  {Set the new first free block}
+  mov TSmallBlockPoolHeader[rdx].FirstFreeBlock, rcx
+  {Set the block header}
+  mov [rax - BlockHeaderSize], rdx
+  {Is the chunk now full?}
+  jz @RemoveSmallPool
+  {Unlock the block type}
+  mov TSmallBlockType[rbx].BlockTypeLocked, False
+  jmp @Done
+@TrySmallSequentialFeed:
+  {Try to feed a small block sequentially: Get the sequential feed block pool}
+  mov rdx, TSmallBlockType[rbx].CurrentSequentialFeedPool
+  {Get the next sequential feed address so long}
+  movzx ecx, TSmallBlockType[rbx].BlockSize
+  add rcx, rax
+  {Can another block fit?}
+  cmp rax, TSmallBlockType[rbx].MaxSequentialFeedBlockAddress
+  ja @AllocateSmallBlockPool
+  {Increment the number of used blocks in the sequential feed pool}
+  add TSmallBlockPoolHeader[rdx].BlocksInUse, 1
+  {Store the next sequential feed block address}
+  mov TSmallBlockType[rbx].NextSequentialFeedBlockAddress, rcx
+  {Unlock the block type}
+  mov TSmallBlockType[rbx].BlockTypeLocked, False
+  {Set the block header}
+  mov [rax - BlockHeaderSize], rdx
+  jmp @Done
+@RemoveSmallPool:
+  {Pool is full - remove it from the partially free list}
+  mov rcx, TSmallBlockPoolHeader[rdx].NextPartiallyFreePool
+  mov TSmallBlockPoolHeader[rcx].PreviousPartiallyFreePool, rbx
+  mov TSmallBlockType[rbx].NextPartiallyFreePool, rcx
+  {Unlock the block type}
+  mov TSmallBlockType[rbx].BlockTypeLocked, False
+  jmp @Done
+@LockBlockTypeLoop:
+  mov eax, $100
+  {Attempt to grab the block type}
+  lock cmpxchg TSmallBlockType([rbx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+  {Try the next size}
+  add rbx, Type(TSmallBlockType)
+  mov eax, $100
+  lock cmpxchg TSmallBlockType([rbx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+  {Try the next size (up to two sizes larger)}
+  add rbx, Type(TSmallBlockType)
+  mov eax, $100
+  lock cmpxchg TSmallBlockType([rbx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+  {Block type and two sizes larger are all locked - give up and sleep}
+  sub rbx, 2 * Type(TSmallBlockType)
+{$ifdef NeverSleepOnThreadContention}
+  {Pause instruction (improves performance on P4)}
+  pause
+  {$ifdef UseSwitchToThread}
+  call SwitchToThread
+  {$endif}
+  {Try again}
+  jmp @LockBlockTypeLoop
+{$else}
+  {Couldn't grab the block type - sleep and try again}
+  mov ecx, InitialSleepTime
+  call Sleep
+  {Try again}
+  mov eax, $100
+  {Attempt to grab the block type}
+  lock cmpxchg TSmallBlockType([rbx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+  {Couldn't grab the block type - sleep and try again}
+  mov ecx, AdditionalSleepTime
+  call Sleep
+  {Try again}
+  jmp @LockBlockTypeLoop
+{$endif}
+@AllocateSmallBlockPool:
+  {Do we need to lock the medium blocks?}
+{$ifndef AssumeMultiThreaded}
+  test esi, esi
+  jz @MediumBlocksLockedForPool
+{$endif}
+  call LockMediumBlocks
+@MediumBlocksLockedForPool:
+  {Are there any available blocks of a suitable size?}
+  movsx esi, TSmallBlockType[rbx].AllowedGroupsForBlockPoolBitmap
+  and esi, MediumBlockBinGroupBitmap
+  jz @NoSuitableMediumBlocks
+  {Get the bin group number with free blocks in eax}
+  bsf eax, esi
+  {Get the bin number in ecx}
+  lea r8, MediumBlockBinBitmaps
+  lea r9, [rax * 4]
+  mov ecx, [r8 + r9]
+  bsf ecx, ecx
+  lea ecx, [ecx + r9d * 8]
+  {Get a pointer to the bin in edi}
+  lea rdi, MediumBlockBins
+  lea esi, [ecx * 8]
+  lea rdi, [rdi + rsi * 2] //SizeOf(TMediumBlockBin) = 16
+  {Get the free block in rsi}
+  mov rsi, TMediumFreeBlock[rdi].NextFreeBlock
+  {Remove the first block from the linked list (LIFO)}
+  mov rdx, TMediumFreeBlock[rsi].NextFreeBlock
+  mov TMediumFreeBlock[rdi].NextFreeBlock, rdx
+  mov TMediumFreeBlock[rdx].PreviousFreeBlock, rdi
+  {Is this bin now empty?}
+  cmp rdi, rdx
+  jne @MediumBinNotEmpty
+  {r8 = @MediumBlockBinBitmaps, eax = bin group number,
+   r9 = bin group number * 4, ecx = bin number, edi = @bin, esi = free block,
+   ebx = block type}
+  {Flag this bin as empty}
+  mov edx, -2
+  rol edx, cl
+  and [r8 + r9], edx
+  jnz @MediumBinNotEmpty
+  {Flag the group as empty}
+  btr MediumBlockBinGroupBitmap, eax
+@MediumBinNotEmpty:
+  {esi = free block, ebx = block type}
+  {Get the size of the available medium block in edi}
+  mov rdi, DropMediumAndLargeFlagsMask
+  and rdi, [rsi - BlockHeaderSize]
+  cmp edi, MaximumSmallBlockPoolSize
+  jb @UseWholeBlock
+  {Split the block: get the size of the second part, new block size is the
+   optimal size}
+  mov edx, edi
+  movzx edi, TSmallBlockType[rbx].OptimalBlockPoolSize
+  sub edx, edi
+  {Split the block in two}
+  lea rcx, [rsi + rdi]
+  lea rax, [rdx + IsMediumBlockFlag + IsFreeBlockFlag]
+  mov [rcx - BlockHeaderSize], rax
+  {Store the size of the second split as the second last qword}
+  mov [rcx + rdx - BlockHeaderSize * 2], rdx
+  {Put the remainder in a bin (it will be big enough)}
+  call InsertMediumBlockIntoBin
+  jmp @GotMediumBlock
+@NoSuitableMediumBlocks:
+  {Check the sequential feed medium block pool for space}
+  movzx ecx, TSmallBlockType[rbx].MinimumBlockPoolSize
+  mov edi, MediumSequentialFeedBytesLeft
+  cmp edi, ecx
+  jb @AllocateNewSequentialFeed
+  {Get the address of the last block that was fed}
+  mov rsi, LastSequentiallyFedMediumBlock
+  {Enough sequential feed space: Will the remainder be usable?}
+  movzx ecx, TSmallBlockType[rbx].OptimalBlockPoolSize
+  lea edx, [ecx + MinimumMediumBlockSize]
+  cmp edi, edx
+  jb @NotMuchSpace
+  mov edi, ecx
+@NotMuchSpace:
+  sub rsi, rdi
+  {Update the sequential feed parameters}
+  sub MediumSequentialFeedBytesLeft, edi
+  mov LastSequentiallyFedMediumBlock, rsi
+  {Get the block pointer}
+  jmp @GotMediumBlock
+  {Align branch target}
+@AllocateNewSequentialFeed:
+  {Need to allocate a new sequential feed medium block pool: use the
+   optimal size for this small block pool}
+  movzx ecx, TSmallBlockType[rbx].OptimalBlockPoolSize
+  mov edi, ecx
+  {Allocate the medium block pool}
+  call AllocNewSequentialFeedMediumPool
+  mov rsi, rax
+  test rax, rax
+  jnz @GotMediumBlock
+  mov MediumBlocksLocked, al
+  mov TSmallBlockType[rbx].BlockTypeLocked, al
+  jmp @Done
+@UseWholeBlock:
+  {rsi = free block, rbx = block type, edi = block size}
+  {Mark this block as used in the block following it}
+  and byte ptr [rsi + rdi - BlockHeaderSize], not PreviousMediumBlockIsFreeFlag
+@GotMediumBlock:
+  {rsi = free block, rbx = block type, edi = block size}
+  {Set the size and flags for this block}
+  lea ecx, [edi + IsMediumBlockFlag + IsSmallBlockPoolInUseFlag]
+  mov [rsi - BlockHeaderSize], rcx
+  {Unlock medium blocks}
+  xor eax, eax
+  mov MediumBlocksLocked, al
+  {Set up the block pool}
+  mov TSmallBlockPoolHeader[rsi].BlockType, rbx
+  mov TSmallBlockPoolHeader[rsi].FirstFreeBlock, rax
+  mov TSmallBlockPoolHeader[rsi].BlocksInUse, 1
+  {Set it up for sequential block serving}
+  mov TSmallBlockType[rbx].CurrentSequentialFeedPool, rsi
+  {Return the pointer to the first block}
+  lea rax, [rsi + SmallBlockPoolHeaderSize]
+  movzx ecx, TSmallBlockType[rbx].BlockSize
+  lea rdx, [rax + rcx]
+  mov TSmallBlockType[rbx].NextSequentialFeedBlockAddress, rdx
+  add rdi, rsi
+  sub rdi, rcx
+  mov TSmallBlockType[rbx].MaxSequentialFeedBlockAddress, rdi
+  {Unlock the small block type}
+  mov TSmallBlockType[rbx].BlockTypeLocked, False
+  {Set the small block header}
+  mov [rax - BlockHeaderSize], rsi
+  jmp @Done
+{-------------------Medium block allocation-------------------}
+@NotASmallBlock:
+  cmp rcx, (MaximumMediumBlockSize - BlockHeaderSize)
+  ja @IsALargeBlockRequest
+  {Get the bin size for this block size. Block sizes are
+   rounded up to the next bin size.}
+  lea ebx, [ecx + MediumBlockGranularity - 1 + BlockHeaderSize - MediumBlockSizeOffset]
+  and ebx, -MediumBlockGranularity
+  add ebx, MediumBlockSizeOffset
+  {Do we need to lock the medium blocks?}
+{$ifndef AssumeMultiThreaded}
+  test esi, esi
+  jz @MediumBlocksLocked
+{$endif}
+  call LockMediumBlocks
+@MediumBlocksLocked:
+  {Get the bin number in ecx and the group number in edx}
+  lea edx, [ebx - MinimumMediumBlockSize]
+  mov ecx, edx
+  shr edx, 8 + 5
+  shr ecx, 8
+  {Is there a suitable block inside this group?}
+  mov eax, -1
+  shl eax, cl
+  lea r8, MediumBlockBinBitmaps
+  and eax, [r8 + rdx * 4]
+  jz @GroupIsEmpty
+  {Get the actual bin number}
+  and ecx, -32
+  bsf eax, eax
+  or ecx, eax
+  jmp @GotBinAndGroup
+@GroupIsEmpty:
+  {Try all groups greater than this group}
+  mov eax, -2
+  mov ecx, edx
+  shl eax, cl
+  and eax, MediumBlockBinGroupBitmap
+  jz @TrySequentialFeedMedium
+  {There is a suitable group with space: get the bin number}
+  bsf edx, eax
+  {Get the bin in the group with free blocks}
+  mov eax, [r8 + rdx * 4]
+  bsf ecx, eax
+  mov eax, edx
+  shl eax, 5
+  or ecx, eax
+  jmp @GotBinAndGroup
+@TrySequentialFeedMedium:
+  mov ecx, MediumSequentialFeedBytesLeft
+  {Block can be fed sequentially?}
+  sub ecx, ebx
+  jc @AllocateNewSequentialFeedForMedium
+  {Get the block address}
+  mov rax, LastSequentiallyFedMediumBlock
+  sub rax, rbx
+  mov LastSequentiallyFedMediumBlock, rax
+  {Store the remaining bytes}
+  mov MediumSequentialFeedBytesLeft, ecx
+  {Set the flags for the block}
+  or rbx, IsMediumBlockFlag
+  mov [rax - BlockHeaderSize], rbx
+  jmp @MediumBlockGetDone
+@AllocateNewSequentialFeedForMedium:
+  mov ecx, ebx
+  call AllocNewSequentialFeedMediumPool
+@MediumBlockGetDone:
+  xor cl, cl
+  mov MediumBlocksLocked, cl //workaround for QC99023
+  jmp @Done
+@GotBinAndGroup:
+  {ebx = block size, ecx = bin number, edx = group number}
+  {Get a pointer to the bin in edi}
+  lea rdi, MediumBlockBins
+  lea eax, [ecx + ecx]
+  lea rdi, [rdi + rax * 8]
+  {Get the free block in esi}
+  mov rsi, TMediumFreeBlock[rdi].NextFreeBlock
+  {Remove the first block from the linked list (LIFO)}
+  mov rax, TMediumFreeBlock[rsi].NextFreeBlock
+  mov TMediumFreeBlock[rdi].NextFreeBlock, rax
+  mov TMediumFreeBlock[rax].PreviousFreeBlock, rdi
+  {Is this bin now empty?}
+  cmp rdi, rax
+  jne @MediumBinNotEmptyForMedium
+  {edx = bin group number, ecx = bin number, rdi = @bin, rsi = free block, ebx = block size}
+  {Flag this bin as empty}
+  mov eax, -2
+  rol eax, cl
+  lea r8, MediumBlockBinBitmaps
+  and [r8 + rdx * 4], eax
+  jnz @MediumBinNotEmptyForMedium
+  {Flag the group as empty}
+  btr MediumBlockBinGroupBitmap, edx
+@MediumBinNotEmptyForMedium:
+  {rsi = free block, ebx = block size}
+  {Get the size of the available medium block in edi}
+  mov rdi, DropMediumAndLargeFlagsMask
+  and rdi, [rsi - BlockHeaderSize]
+  {Get the size of the second split in edx}
+  mov edx, edi
+  sub edx, ebx
+  jz @UseWholeBlockForMedium
+  {Split the block in two}
+  lea rcx, [rsi + rbx]
+  lea rax, [rdx + IsMediumBlockFlag + IsFreeBlockFlag]
+  mov [rcx - BlockHeaderSize], rax
+  {Store the size of the second split as the second last dword}
+  mov [rcx + rdx - BlockHeaderSize * 2], rdx
+  {Put the remainder in a bin}
+  cmp edx, MinimumMediumBlockSize
+  jb @GotMediumBlockForMedium
+  call InsertMediumBlockIntoBin
+  jmp @GotMediumBlockForMedium
+@UseWholeBlockForMedium:
+  {Mark this block as used in the block following it}
+  and byte ptr [rsi + rdi - BlockHeaderSize], not PreviousMediumBlockIsFreeFlag
+@GotMediumBlockForMedium:
+  {Set the size and flags for this block}
+  lea rcx, [rbx + IsMediumBlockFlag]
+  mov [rsi - BlockHeaderSize], rcx
+  {Unlock medium blocks}
+  xor cl, cl
+  mov MediumBlocksLocked, cl //workaround for QC99023
+  mov rax, rsi
+  jmp @Done
+{-------------------Large block allocation-------------------}
+@IsALargeBlockRequest:
+  xor rax, rax
+  test rcx, rcx
+  js @Done
+  call AllocateLargeBlock
+@Done:
+end;
+{$endif}
+{$endif}
+
+{$ifndef ASMVersion}
+{Frees a medium block, returning 0 on success, -1 otherwise}
+function FreeMediumBlock(APointer: Pointer): Integer;
+var
+  LNextMediumBlock{$ifndef FullDebugMode}, LPreviousMediumBlock{$endif}: PMediumFreeBlock;
+  LNextMediumBlockSizeAndFlags: NativeUInt;
+  LBlockSize{$ifndef FullDebugMode}, LPreviousMediumBlockSize{$endif}: Cardinal;
+{$ifndef FullDebugMode}
+  LPPreviousMediumBlockPoolHeader, LPNextMediumBlockPoolHeader: PMediumBlockPoolHeader;
+{$endif}
+  LBlockHeader: NativeUInt;
+begin
+  {Get the block header}
+  LBlockHeader := PNativeUInt(PByte(APointer) - BlockHeaderSize)^;
+  {Get the medium block size}
+  LBlockSize := LBlockHeader and DropMediumAndLargeFlagsMask;
+  {Lock the medium blocks}
+  LockMediumBlocks;
+  {Can we combine this block with the next free block?}
+  LNextMediumBlock := PMediumFreeBlock(PByte(APointer) + LBlockSize);
+  LNextMediumBlockSizeAndFlags := PNativeUInt(PByte(LNextMediumBlock) - BlockHeaderSize)^;
+{$ifndef FullDebugMode}
+{$ifdef CheckHeapForCorruption}
+  {Check that this block was flagged as in use in the next block}
+  if (LNextMediumBlockSizeAndFlags and PreviousMediumBlockIsFreeFlag) <> 0 then
+{$ifdef BCB6OrDelphi7AndUp}
+    System.Error(reInvalidPtr);
+{$else}
+    System.RunError(reInvalidPtr);
+{$endif}
+{$endif}
+  if (LNextMediumBlockSizeAndFlags and IsFreeBlockFlag) <> 0 then
+  begin
+    {Increase the size of this block}
+    Inc(LBlockSize, LNextMediumBlockSizeAndFlags and DropMediumAndLargeFlagsMask);
+    {Remove the next block as well}
+    if LNextMediumBlockSizeAndFlags >= MinimumMediumBlockSize then
+      RemoveMediumFreeBlock(LNextMediumBlock);
+  end
+  else
+  begin
+{$endif}
+    {Reset the "previous in use" flag of the next block}
+    PNativeUInt(PByte(LNextMediumBlock) - BlockHeaderSize)^ := LNextMediumBlockSizeAndFlags or PreviousMediumBlockIsFreeFlag;
+{$ifndef FullDebugMode}
+  end;
+  {Can we combine this block with the previous free block? We need to
+   re-read the flags since it could have changed before we could lock the
+   medium blocks.}
+  if (PNativeUInt(PByte(APointer) - BlockHeaderSize)^ and PreviousMediumBlockIsFreeFlag) <> 0 then
+  begin
+    {Get the size of the free block just before this one}
+    LPreviousMediumBlockSize := PNativeUInt(PByte(APointer) - 2 * BlockHeaderSize)^;
+    {Get the start of the previous block}
+    LPreviousMediumBlock := PMediumFreeBlock(PByte(APointer) - LPreviousMediumBlockSize);
+{$ifdef CheckHeapForCorruption}
+    {Check that the previous block is actually free}
+    if (PNativeUInt(PByte(LPreviousMediumBlock) - BlockHeaderSize)^ and ExtractMediumAndLargeFlagsMask) <> (IsMediumBlockFlag or IsFreeBlockFlag) then
+{$ifdef BCB6OrDelphi7AndUp}
+    System.Error(reInvalidPtr);
+{$else}
+    System.RunError(reInvalidPtr);
+{$endif}
+{$endif}
+    {Set the new block size}
+    Inc(LBlockSize, LPreviousMediumBlockSize);
+    {This is the new current block}
+    APointer := LPreviousMediumBlock;
+    {Remove the previous block from the linked list}
+    if LPreviousMediumBlockSize >= MinimumMediumBlockSize then
+      RemoveMediumFreeBlock(LPreviousMediumBlock);
+  end;
+{$ifdef CheckHeapForCorruption}
+  {Check that the previous block is currently flagged as in use}
+  if (PNativeUInt(PByte(APointer) - BlockHeaderSize)^ and PreviousMediumBlockIsFreeFlag) <> 0 then
+{$ifdef BCB6OrDelphi7AndUp}
+    System.Error(reInvalidPtr);
+{$else}
+    System.RunError(reInvalidPtr);
+{$endif}
+{$endif}
+  {Is the entire medium block pool free, and there are other free blocks
+   that can fit the largest possible medium block? -> free it. (Except in
+   full debug mode where medium pools are never freed.)}
+  if (LBlockSize <> (MediumBlockPoolSize - MediumBlockPoolHeaderSize)) then
+  begin
+    {Store the size of the block as well as the flags}
+    PNativeUInt(PByte(APointer) - BlockHeaderSize)^ := LBlockSize or (IsMediumBlockFlag or IsFreeBlockFlag);
+{$else}
+    {Mark the block as free}
+    Inc(PNativeUInt(PByte(APointer) - BlockHeaderSize)^, IsFreeBlockFlag);
+{$endif}
+    {Store the trailing size marker}
+    PNativeUInt(PByte(APointer) + LBlockSize - 2 * BlockHeaderSize)^ := LBlockSize;
+    {Insert this block back into the bins: Size check not required here,
+     since medium blocks that are in use are not allowed to be
+     shrunk smaller than MinimumMediumBlockSize}
+    InsertMediumBlockIntoBin(APointer, LBlockSize);
+{$ifndef FullDebugMode}
+{$ifdef CheckHeapForCorruption}
+    {Check that this block is actually free and the next and previous blocks are both in use.}
+    if ((PNativeUInt(PByte(APointer) - BlockHeaderSize)^ and ExtractMediumAndLargeFlagsMask) <> (IsMediumBlockFlag or IsFreeBlockFlag))
+      or ((PNativeUInt(PByte(APointer) + (PNativeUInt(PByte(APointer) - BlockHeaderSize)^ and DropMediumAndLargeFlagsMask) - BlockHeaderSize)^ and IsFreeBlockFlag) <> 0) then
+    begin
+{$ifdef BCB6OrDelphi7AndUp}
+    System.Error(reInvalidPtr);
+{$else}
+    System.RunError(reInvalidPtr);
+{$endif}
+    end;
+{$endif}
+{$endif}
+    {Unlock medium blocks}
+    MediumBlocksLocked := False;
+    {All OK}
+    Result := 0;
+{$ifndef FullDebugMode}
+  end
+  else
+  begin
+    {Should this become the new sequential feed?}
+    if MediumSequentialFeedBytesLeft <> MediumBlockPoolSize - MediumBlockPoolHeaderSize then
+    begin
+      {Bin the current sequential feed}
+      BinMediumSequentialFeedRemainder;
+      {Set this medium pool up as the new sequential feed pool:
+       Store the sequential feed pool trailer}
+      PNativeUInt(PByte(APointer) + LBlockSize - BlockHeaderSize)^ := IsMediumBlockFlag;
+      {Store the number of bytes available in the sequential feed chunk}
+      MediumSequentialFeedBytesLeft := MediumBlockPoolSize - MediumBlockPoolHeaderSize;
+      {Set the last sequentially fed block}
+      LastSequentiallyFedMediumBlock := Pointer(PByte(APointer) + LBlockSize);
+      {Unlock medium blocks}
+      MediumBlocksLocked := False;
+      {Success}
+      Result := 0;
+    end
+    else
+    begin
+      {Remove this medium block pool from the linked list}
+      Dec(PByte(APointer), MediumBlockPoolHeaderSize);
+      LPPreviousMediumBlockPoolHeader := PMediumBlockPoolHeader(APointer).PreviousMediumBlockPoolHeader;
+      LPNextMediumBlockPoolHeader := PMediumBlockPoolHeader(APointer).NextMediumBlockPoolHeader;
+      LPPreviousMediumBlockPoolHeader.NextMediumBlockPoolHeader := LPNextMediumBlockPoolHeader;
+      LPNextMediumBlockPoolHeader.PreviousMediumBlockPoolHeader := LPPreviousMediumBlockPoolHeader;
+      {Unlock medium blocks}
+      MediumBlocksLocked := False;
+{$ifdef ClearMediumBlockPoolsBeforeReturningToOS}
+      FillChar(APointer^, MediumBlockPoolSize, 0);
+{$endif}
+      {Free the medium block pool}
+      if VirtualFree(APointer, 0, MEM_RELEASE) then
+        Result := 0
+      else
+        Result := -1;
+    end;
+  end;
+{$endif}
+end;
+{$endif}
+
+{Replacement for SysFreeMem}
+function FastFreeMem(APointer: Pointer): Integer;
+{$ifndef ASMVersion}
+var
+  LPSmallBlockPool{$ifndef FullDebugMode}, LPPreviousPool, LPNextPool{$endif},
+    LPOldFirstPool: PSmallBlockPoolHeader;
+  LPSmallBlockType: PSmallBlockType;
+  LOldFirstFreeBlock: Pointer;
+  LBlockHeader: NativeUInt;
+begin
+  {Get the small block header: Is it actually a small block?}
+  LBlockHeader := PNativeUInt(PByte(APointer) - BlockHeaderSize)^;
+  {Is it a small block that is in use?}
+  if LBlockHeader and (IsFreeBlockFlag or IsMediumBlockFlag or IsLargeBlockFlag) = 0 then
+  begin
+    {Get a pointer to the block pool}
+    LPSmallBlockPool := PSmallBlockPoolHeader(LBlockHeader);
+    {Get the block type}
+    LPSmallBlockType := LPSmallBlockPool.BlockType;
+{$ifdef ClearSmallAndMediumBlocksInFreeMem}
+    FillChar(APointer^, LPSmallBlockType.BlockSize - BlockHeaderSize, 0);
+{$endif}
+    {Lock the block type}
+{$ifndef AssumeMultiThreaded}
+    if IsMultiThread then
+{$endif}
+    begin
+      while (LockCmpxchg(0, 1, @LPSmallBlockType.BlockTypeLocked) <> 0) do
+      begin
+{$ifdef NeverSleepOnThreadContention}
+  {$ifdef UseSwitchToThread}
+        SwitchToThread;
+  {$endif}
+{$else}
+        Sleep(InitialSleepTime);
+        if LockCmpxchg(0, 1, @LPSmallBlockType.BlockTypeLocked) = 0 then
+          Break;
+        Sleep(AdditionalSleepTime);
+{$endif}
+      end;
+    end;
+    {Get the old first free block}
+    LOldFirstFreeBlock := LPSmallBlockPool.FirstFreeBlock;
+    {Was the pool manager previously full?}
+    if LOldFirstFreeBlock = nil then
+    begin
+      {Insert this as the first partially free pool for the block size}
+      LPOldFirstPool := LPSmallBlockType.NextPartiallyFreePool;
+      LPSmallBlockPool.NextPartiallyFreePool := LPOldFirstPool;
+      LPOldFirstPool.PreviousPartiallyFreePool := LPSmallBlockPool;
+      LPSmallBlockPool.PreviousPartiallyFreePool := PSmallBlockPoolHeader(LPSmallBlockType);
+      LPSmallBlockType.NextPartiallyFreePool := LPSmallBlockPool;
+    end;
+    {Store the old first free block}
+    PNativeUInt(PByte(APointer) - BlockHeaderSize)^ := UIntPtr(LOldFirstFreeBlock) or IsFreeBlockFlag;
+    {Store this as the new first free block}
+    LPSmallBlockPool.FirstFreeBlock := APointer;
+    {Decrement the number of allocated blocks}
+    Dec(LPSmallBlockPool.BlocksInUse);
+    {Small block pools are never freed in full debug mode. This increases the
+     likehood of success in catching objects still being used after being
+     destroyed.}
+{$ifndef FullDebugMode}
+    {Is the entire pool now free? -> Free it.}
+    if LPSmallBlockPool.BlocksInUse = 0 then
+    begin
+      {Get the previous and next chunk managers}
+      LPPreviousPool := LPSmallBlockPool.PreviousPartiallyFreePool;
+      LPNextPool := LPSmallBlockPool.NextPartiallyFreePool;
+      {Remove this manager}
+      LPPreviousPool.NextPartiallyFreePool := LPNextPool;
+      LPNextPool.PreviousPartiallyFreePool := LPPreviousPool;
+      {Is this the sequential feed pool? If so, stop sequential feeding}
+      if (LPSmallBlockType.CurrentSequentialFeedPool = LPSmallBlockPool) then
+        LPSmallBlockType.MaxSequentialFeedBlockAddress := nil;
+      {Unlock this block type}
+      LPSmallBlockType.BlockTypeLocked := False;
+      {Free the block pool}
+      FreeMediumBlock(LPSmallBlockPool);
+    end
+    else
+    begin
+{$endif}
+      {Unlock this block type}
+      LPSmallBlockType.BlockTypeLocked := False;
+{$ifndef FullDebugMode}
+    end;
+{$endif}
+    {No error}
+    Result := 0;
+  end
+  else
+  begin
+    {Is this a medium block or a large block?}
+    if LBlockHeader and (IsFreeBlockFlag or IsLargeBlockFlag) = 0 then
+    begin
+{$ifdef ClearSmallAndMediumBlocksInFreeMem}
+      {Get the block header, extract the block size and clear the block it.}
+      LBlockHeader := PNativeUInt(PByte(APointer) - BlockHeaderSize)^;
+      FillChar(APointer^,
+        (LBlockHeader and DropMediumAndLargeFlagsMask) - BlockHeaderSize, 0);
+{$endif}
+      Result := FreeMediumBlock(APointer);
+    end
+    else
+    begin
+      {Validate: Is this actually a Large block, or is it an attempt to free an
+       already freed small block?}
+      if LBlockHeader and (IsFreeBlockFlag or IsMediumBlockFlag) = 0 then
+        Result := FreeLargeBlock(APointer)
+      else
+        Result := -1;
+    end;
+  end;
+end;
+{$else}
+{$ifdef 32Bit}
+asm
+  {Get the block header in edx}
+  mov edx, [eax - 4]
+  {Is it a small block in use?}
+  test dl, IsFreeBlockFlag + IsMediumBlockFlag + IsLargeBlockFlag
+  {Save the pointer in ecx}
+  mov ecx, eax
+  {Save ebx}
+  push ebx
+  {Get the IsMultiThread variable in bl}
+{$ifndef AssumeMultiThreaded}
+  mov bl, IsMultiThread
+{$endif}
+  {Is it a small block that is in use?}
+  jnz @NotSmallBlockInUse
+{$ifdef ClearSmallAndMediumBlocksInFreeMem}
+  push edx
+  push ecx
+  mov edx, TSmallBlockPoolHeader[edx].BlockType
+  movzx edx, TSmallBlockType(edx).BlockSize
+  sub edx, BlockHeaderSize
+  xor ecx, ecx
+  call System.@FillChar
+  pop ecx
+  pop edx
+{$endif}
+  {Do we need to lock the block type?}
+{$ifndef AssumeMultiThreaded}
+  test bl, bl
+{$endif}
+  {Get the small block type in ebx}
+  mov ebx, TSmallBlockPoolHeader[edx].BlockType
+  {Do we need to lock the block type?}
+{$ifndef AssumeMultiThreaded}
+  jnz @LockBlockTypeLoop
+{$else}
+  jmp @LockBlockTypeLoop
+  {Align branch target}
+  nop
+{$endif}
+@GotLockOnSmallBlockType:
+  {Current state: edx = @SmallBlockPoolHeader, ecx = APointer, ebx = @SmallBlockType}
+  {Decrement the number of blocks in use}
+  sub TSmallBlockPoolHeader[edx].BlocksInUse, 1
+  {Get the old first free block}
+  mov eax, TSmallBlockPoolHeader[edx].FirstFreeBlock
+  {Is the pool now empty?}
+  jz @PoolIsNowEmpty
+  {Was the pool full?}
+  test eax, eax
+  {Store this as the new first free block}
+  mov TSmallBlockPoolHeader[edx].FirstFreeBlock, ecx
+  {Store the previous first free block as the block header}
+  lea eax, [eax + IsFreeBlockFlag]
+  mov [ecx - 4], eax
+  {Insert the pool back into the linked list if it was full}
+  jz @SmallPoolWasFull
+  {All ok}
+  xor eax, eax
+  {Unlock the block type}
+  mov TSmallBlockType[ebx].BlockTypeLocked, al
+  {Restore registers}
+  pop ebx
+  {Done}
+  ret
+  {Align branch target}
+{$ifndef AssumeMultiThreaded}
+  nop
+{$endif}
+@SmallPoolWasFull:
+  {Insert this as the first partially free pool for the block size}
+  mov ecx, TSmallBlockType[ebx].NextPartiallyFreePool
+  mov TSmallBlockPoolHeader[edx].PreviousPartiallyFreePool, ebx
+  mov TSmallBlockPoolHeader[edx].NextPartiallyFreePool, ecx
+  mov TSmallBlockPoolHeader[ecx].PreviousPartiallyFreePool, edx
+  mov TSmallBlockType[ebx].NextPartiallyFreePool, edx
+  {Unlock the block type}
+  mov TSmallBlockType[ebx].BlockTypeLocked, False
+  {All ok}
+  xor eax, eax
+  {Restore registers}
+  pop ebx
+  {Done}
+  ret
+  {Align branch target}
+  nop
+  nop
+@PoolIsNowEmpty:
+  {Was this pool actually in the linked list of pools with space? If not, it
+   can only be the sequential feed pool (it is the only pool that may contain
+   only one block, i.e. other blocks have not been split off yet)}
+  test eax, eax
+  jz @IsSequentialFeedPool
+  {Pool is now empty: Remove it from the linked list and free it}
+  mov eax, TSmallBlockPoolHeader[edx].PreviousPartiallyFreePool
+  mov ecx, TSmallBlockPoolHeader[edx].NextPartiallyFreePool
+  {Remove this manager}
+  mov TSmallBlockPoolHeader[eax].NextPartiallyFreePool, ecx
+  mov TSmallBlockPoolHeader[ecx].PreviousPartiallyFreePool, eax
+  {Zero out eax}
+  xor eax, eax
+  {Is this the sequential feed pool? If so, stop sequential feeding}
+  cmp TSmallBlockType[ebx].CurrentSequentialFeedPool, edx
+  jne @NotSequentialFeedPool
+@IsSequentialFeedPool:
+  mov TSmallBlockType[ebx].MaxSequentialFeedBlockAddress, eax
+@NotSequentialFeedPool:
+  {Unlock the block type}
+  mov TSmallBlockType[ebx].BlockTypeLocked, al
+  {Release this pool}
+  mov eax, edx
+  mov edx, [edx - 4]
+{$ifndef AssumeMultiThreaded}
+  mov bl, IsMultiThread
+{$endif}
+  jmp @FreeMediumBlock
+  {Align branch target}
+{$ifndef AssumeMultiThreaded}
+  nop
+  nop
+{$endif}
+  nop
+@LockBlockTypeLoop:
+  mov eax, $100
+  {Attempt to grab the block type}
+  lock cmpxchg TSmallBlockType([ebx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+{$ifdef NeverSleepOnThreadContention}
+  {Pause instruction (improves performance on P4)}
+  rep nop
+  {$ifdef UseSwitchToThread}
+  push ecx
+  push edx
+  call SwitchToThread
+  pop edx
+  pop ecx
+  {$endif}
+  {Try again}
+  jmp @LockBlockTypeLoop
+  {Align branch target}
+  {$ifndef UseSwitchToThread}
+  nop
+  {$endif}
+{$else}
+  {Couldn't grab the block type - sleep and try again}
+  push ecx
+  push edx
+  push InitialSleepTime
+  call Sleep
+  pop edx
+  pop ecx
+  {Try again}
+  mov eax, $100
+  {Attempt to grab the block type}
+  lock cmpxchg TSmallBlockType([ebx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+  {Couldn't grab the block type - sleep and try again}
+  push ecx
+  push edx
+  push AdditionalSleepTime
+  call Sleep
+  pop edx
+  pop ecx
+  {Try again}
+  jmp @LockBlockTypeLoop
+  {Align branch target}
+  nop
+  nop
+{$endif}
+  {---------------------Medium blocks------------------------------}
+  {Align branch target}
+@NotSmallBlockInUse:
+  {Not a small block in use: is it a medium or large block?}
+  test dl, IsFreeBlockFlag + IsLargeBlockFlag
+  jnz @NotASmallOrMediumBlock
+@FreeMediumBlock:
+{$ifdef ClearSmallAndMediumBlocksInFreeMem}
+  push eax
+  push edx
+  and edx, DropMediumAndLargeFlagsMask
+  sub edx, BlockHeaderSize
+  xor ecx, ecx
+  call System.@FillChar
+  pop edx
+  pop eax
+{$endif}
+  {Drop the flags}
+  and edx, DropMediumAndLargeFlagsMask
+  {Free the medium block pointed to by eax, header in edx, bl = IsMultiThread}
+{$ifndef AssumeMultiThreaded}
+  {Do we need to lock the medium blocks?}
+  test bl, bl
+{$endif}
+  {Block size in ebx}
+  mov ebx, edx
+  {Save registers}
+  push esi
+  {Pointer in esi}
+  mov esi, eax
+  {Do we need to lock the medium blocks?}
+{$ifndef AssumeMultiThreaded}
+  jz @MediumBlocksLocked
+{$endif}
+  call LockMediumBlocks
+@MediumBlocksLocked:
+  {Can we combine this block with the next free block?}
+  test dword ptr [esi + ebx - 4], IsFreeBlockFlag
+  {Get the next block size and flags in ecx}
+  mov ecx, [esi + ebx - 4]
+  jnz @NextBlockIsFree
+  {Set the "PreviousIsFree" flag in the next block}
+  or ecx, PreviousMediumBlockIsFreeFlag
+  mov [esi + ebx - 4], ecx
+@NextBlockChecked:
+  {Can we combine this block with the previous free block? We need to
+   re-read the flags since it could have changed before we could lock the
+   medium blocks.}
+  test byte ptr [esi - 4], PreviousMediumBlockIsFreeFlag
+  jnz @PreviousBlockIsFree
+@PreviousBlockChecked:
+  {Is the entire medium block pool free, and there are other free blocks
+   that can fit the largest possible medium block -> free it.}
+  cmp ebx, (MediumBlockPoolSize - MediumBlockPoolHeaderSize)
+  je @EntireMediumPoolFree
+@BinFreeMediumBlock:
+  {Store the size of the block as well as the flags}
+  lea eax, [ebx + IsMediumBlockFlag + IsFreeBlockFlag]
+  mov [esi - 4], eax
+  {Store the trailing size marker}
+  mov [esi + ebx - 8], ebx
+  {Insert this block back into the bins: Size check not required here,
+   since medium blocks that are in use are not allowed to be
+   shrunk smaller than MinimumMediumBlockSize}
+  mov eax, esi
+  mov edx, ebx
+  {Insert into bin}
+  call InsertMediumBlockIntoBin
+  {Unlock medium blocks}
+  mov MediumBlocksLocked, False;
+  {All OK}
+  xor eax, eax
+  {Restore registers}
+  pop esi
+  pop ebx
+  {Return}
+  ret
+  {Align branch target}
+@NextBlockIsFree:
+  {Get the next block address in eax}
+  lea eax, [esi + ebx]
+  {Increase the size of this block}
+  and ecx, DropMediumAndLargeFlagsMask
+  add ebx, ecx
+  {Was the block binned?}
+  cmp ecx, MinimumMediumBlockSize
+  jb @NextBlockChecked
+  call RemoveMediumFreeBlock
+  jmp @NextBlockChecked
+  {Align branch target}
+  nop
+@PreviousBlockIsFree:
+  {Get the size of the free block just before this one}
+  mov ecx, [esi - 8]
+  {Include the previous block}
+  sub esi, ecx
+  {Set the new block size}
+  add ebx, ecx
+  {Remove the previous block from the linked list}
+  cmp ecx, MinimumMediumBlockSize
+  jb @PreviousBlockChecked
+  mov eax, esi
+  call RemoveMediumFreeBlock
+  jmp @PreviousBlockChecked
+  {Align branch target}
+@EntireMediumPoolFree:
+  {Should we make this the new sequential feed medium block pool? If the
+   current sequential feed pool is not entirely free, we make this the new
+   sequential feed pool.}
+  cmp MediumSequentialFeedBytesLeft, MediumBlockPoolSize - MediumBlockPoolHeaderSize
+  jne @MakeEmptyMediumPoolSequentialFeed
+  {Point esi to the medium block pool header}
+  sub esi, MediumBlockPoolHeaderSize
+  {Remove this medium block pool from the linked list}
+  mov eax, TMediumBlockPoolHeader[esi].PreviousMediumBlockPoolHeader
+  mov edx, TMediumBlockPoolHeader[esi].NextMediumBlockPoolHeader
+  mov TMediumBlockPoolHeader[eax].NextMediumBlockPoolHeader, edx
+  mov TMediumBlockPoolHeader[edx].PreviousMediumBlockPoolHeader, eax
+  {Unlock medium blocks}
+  mov MediumBlocksLocked, False;
+{$ifdef ClearMediumBlockPoolsBeforeReturningToOS}
+  mov eax, esi
+  mov edx, MediumBlockPoolSize
+  xor ecx, ecx
+  call System.@FillChar
+{$endif}
+  {Free the medium block pool}
+  push MEM_RELEASE
+  push 0
+  push esi
+  call VirtualFree
+  {VirtualFree returns >0 if all is ok}
+  cmp eax, 1
+  {Return 0 on all ok}
+  sbb eax, eax
+  {Restore registers}
+  pop esi
+  pop ebx
+  ret
+  {Align branch target}
+  nop
+  nop
+  nop
+@MakeEmptyMediumPoolSequentialFeed:
+  {Get a pointer to the end-marker block}
+  lea ebx, [esi + MediumBlockPoolSize - MediumBlockPoolHeaderSize]
+  {Bin the current sequential feed pool}
+  call BinMediumSequentialFeedRemainder
+  {Set this medium pool up as the new sequential feed pool:
+   Store the sequential feed pool trailer}
+  mov dword ptr [ebx - BlockHeaderSize], IsMediumBlockFlag
+  {Store the number of bytes available in the sequential feed chunk}
+  mov MediumSequentialFeedBytesLeft, MediumBlockPoolSize - MediumBlockPoolHeaderSize
+  {Set the last sequentially fed block}
+  mov LastSequentiallyFedMediumBlock, ebx
+  {Unlock medium blocks}
+  mov MediumBlocksLocked, False;
+  {Success}
+  xor eax, eax
+  {Restore registers}
+  pop esi
+  pop ebx
+  ret
+  {Align branch target}
+  nop
+  nop
+@NotASmallOrMediumBlock:
+  {Restore ebx}
+  pop ebx
+  {Is it in fact a large block?}
+  test dl, IsFreeBlockFlag + IsMediumBlockFlag
+  jz FreeLargeBlock
+  {Attempt to free an already free block}
+  mov eax, -1
+end;
+
+{$else}
+
+{---------------64-bit BASM FastFreeMem---------------}
+asm
+  .params 3
+  .pushnv rbx
+  .pushnv rsi
+  {Get the block header in rdx}
+  mov rdx, [rcx - BlockHeaderSize]
+  {Is it a small block in use?}
+  test dl, IsFreeBlockFlag + IsMediumBlockFlag + IsLargeBlockFlag
+  {Get the IsMultiThread variable in bl}
+{$ifndef AssumeMultiThreaded}
+  mov bl, IsMultiThread
+{$endif}
+  {Is it a small block that is in use?}
+  jnz @NotSmallBlockInUse
+{$ifdef ClearSmallAndMediumBlocksInFreeMem}
+  mov rsi, rcx
+  mov rdx, TSmallBlockPoolHeader[rdx].BlockType
+  movzx edx, TSmallBlockType(rdx).BlockSize
+  sub edx, BlockHeaderSize
+  xor r8, r8
+  call System.@FillChar
+  mov rcx, rsi
+  mov rdx, [rcx - BlockHeaderSize]
+{$endif}
+  {Do we need to lock the block type?}
+{$ifndef AssumeMultiThreaded}
+  test bl, bl
+{$endif}
+  {Get the small block type in rbx}
+  mov rbx, TSmallBlockPoolHeader[rdx].BlockType
+  {Do we need to lock the block type?}
+{$ifndef AssumeMultiThreaded}
+  jnz @LockBlockTypeLoop
+{$else}
+  jmp @LockBlockTypeLoop
+{$endif}
+@GotLockOnSmallBlockType:
+  {Current state: rdx = @SmallBlockPoolHeader, rcx = APointer, rbx = @SmallBlockType}
+  {Decrement the number of blocks in use}
+  sub TSmallBlockPoolHeader[rdx].BlocksInUse, 1
+  {Get the old first free block}
+  mov rax, TSmallBlockPoolHeader[rdx].FirstFreeBlock
+  {Is the pool now empty?}
+  jz @PoolIsNowEmpty
+  {Was the pool full?}
+  test rax, rax
+  {Store this as the new first free block}
+  mov TSmallBlockPoolHeader[rdx].FirstFreeBlock, rcx
+  {Store the previous first free block as the block header}
+  lea rax, [rax + IsFreeBlockFlag]
+  mov [rcx - BlockHeaderSize], rax
+  {Insert the pool back into the linked list if it was full}
+  jz @SmallPoolWasFull
+  {All ok}
+  xor eax, eax
+  {Unlock the block type}
+  mov TSmallBlockType[rbx].BlockTypeLocked, al
+  jmp @Done
+@SmallPoolWasFull:
+  {Insert this as the first partially free pool for the block size}
+  mov rcx, TSmallBlockType[rbx].NextPartiallyFreePool
+  mov TSmallBlockPoolHeader[rdx].PreviousPartiallyFreePool, rbx
+  mov TSmallBlockPoolHeader[rdx].NextPartiallyFreePool, rcx
+  mov TSmallBlockPoolHeader[rcx].PreviousPartiallyFreePool, rdx
+  mov TSmallBlockType[rbx].NextPartiallyFreePool, rdx
+  {Unlock the block type}
+  mov TSmallBlockType[rbx].BlockTypeLocked, False
+  {All ok}
+  xor eax, eax
+  jmp @Done
+@PoolIsNowEmpty:
+  {Was this pool actually in the linked list of pools with space? If not, it
+   can only be the sequential feed pool (it is the only pool that may contain
+   only one block, i.e. other blocks have not been split off yet)}
+  test rax, rax
+  jz @IsSequentialFeedPool
+  {Pool is now empty: Remove it from the linked list and free it}
+  mov rax, TSmallBlockPoolHeader[rdx].PreviousPartiallyFreePool
+  mov rcx, TSmallBlockPoolHeader[rdx].NextPartiallyFreePool
+  {Remove this manager}
+  mov TSmallBlockPoolHeader[rax].NextPartiallyFreePool, rcx
+  mov TSmallBlockPoolHeader[rcx].PreviousPartiallyFreePool, rax
+  {Zero out eax}
+  xor rax, rax
+  {Is this the sequential feed pool? If so, stop sequential feeding}
+  cmp TSmallBlockType[rbx].CurrentSequentialFeedPool, rdx
+  jne @NotSequentialFeedPool
+@IsSequentialFeedPool:
+  mov TSmallBlockType[rbx].MaxSequentialFeedBlockAddress, rax
+@NotSequentialFeedPool:
+  {Unlock the block type}
+  mov TSmallBlockType[rbx].BlockTypeLocked, al
+  {Release this pool}
+  mov rcx, rdx
+  mov rdx, [rdx - BlockHeaderSize]
+{$ifndef AssumeMultiThreaded}
+  mov bl, IsMultiThread
+{$endif}
+  jmp @FreeMediumBlock
+@LockBlockTypeLoop:
+  mov eax, $100
+  {Attempt to grab the block type}
+  lock cmpxchg TSmallBlockType([rbx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+{$ifdef NeverSleepOnThreadContention}
+  {Pause instruction (improves performance on P4)}
+  pause
+  {$ifdef UseSwitchToThread}
+  mov rsi, rcx
+  call SwitchToThread
+  mov rcx, rsi
+  mov rdx, [rcx - BlockHeaderSize]
+  {$endif}
+  {Try again}
+  jmp @LockBlockTypeLoop
+{$else}
+  {Couldn't grab the block type - sleep and try again}
+  mov rsi, rcx
+  mov ecx, InitialSleepTime
+  call Sleep
+  mov rcx, rsi
+  mov rdx, [rcx - BlockHeaderSize]
+  {Try again}
+  mov eax, $100
+  {Attempt to grab the block type}
+  lock cmpxchg TSmallBlockType([rbx]).BlockTypeLocked, ah
+  je @GotLockOnSmallBlockType
+  {Couldn't grab the block type - sleep and try again}
+  mov rsi, rcx
+  mov ecx, AdditionalSleepTime
+  call Sleep
+  mov rcx, rsi
+  mov rdx, [rcx - BlockHeaderSize]
+  {Try again}
+  jmp @LockBlockTypeLoop
+{$endif}
+  {---------------------Medium blocks------------------------------}
+@NotSmallBlockInUse:
+  {Not a small block in use: is it a medium or large block?}
+  test dl, IsFreeBlockFlag + IsLargeBlockFlag
+  jnz @NotASmallOrMediumBlock
+@FreeMediumBlock:
+{$ifdef ClearSmallAndMediumBlocksInFreeMem}
+  mov rsi, rcx
+  and rdx, DropMediumAndLargeFlagsMask
+  sub rdx, BlockHeaderSize
+  xor r8, r8
+  call System.@FillChar
+  mov rcx, rsi
+  mov rdx, [rcx - BlockHeaderSize]
+{$endif}
+  {Drop the flags}
+  and rdx, DropMediumAndLargeFlagsMask
+  {Free the medium block pointed to by eax, header in edx, bl = IsMultiThread}
+{$ifndef AssumeMultiThreaded}
+  {Do we need to lock the medium blocks?}
+  test bl, bl
+{$endif}
+  {Block size in rbx}
+  mov rbx, rdx
+  {Pointer in rsi}
+  mov rsi, rcx
+  {Do we need to lock the medium blocks?}
+{$ifndef AssumeMultiThreaded}
+  jz @MediumBlocksLocked
+{$endif}
+  call LockMediumBlocks
+@MediumBlocksLocked:
+  {Can we combine this block with the next free block?}
+  test qword ptr [rsi + rbx - BlockHeaderSize], IsFreeBlockFlag
+  {Get the next block size and flags in rcx}
+  mov rcx, [rsi + rbx - BlockHeaderSize]
+  jnz @NextBlockIsFree
+  {Set the "PreviousIsFree" flag in the next block}
+  or rcx, PreviousMediumBlockIsFreeFlag
+  mov [rsi + rbx - BlockHeaderSize], rcx
+@NextBlockChecked:
+  {Can we combine this block with the previous free block? We need to
+   re-read the flags since it could have changed before we could lock the
+   medium blocks.}
+  test byte ptr [rsi - BlockHeaderSize], PreviousMediumBlockIsFreeFlag
+  jnz @PreviousBlockIsFree
+@PreviousBlockChecked:
+  {Is the entire medium block pool free, and there are other free blocks
+   that can fit the largest possible medium block -> free it.}
+  cmp ebx, (MediumBlockPoolSize - MediumBlockPoolHeaderSize)
+  je @EntireMediumPoolFree
+@BinFreeMediumBlock:
+  {Store the size of the block as well as the flags}
+  lea rax, [rbx + IsMediumBlockFlag + IsFreeBlockFlag]
+  mov [rsi - BlockHeaderSize], rax
+  {Store the trailing size marker}
+  mov [rsi + rbx - 2 * BlockHeaderSize], rbx
+  {Insert this block back into the bins: Size check not required here,
+   since medium blocks that are in use are not allowed to be
+   shrunk smaller than MinimumMediumBlockSize}
+  mov rcx, rsi
+  mov rdx, rbx
+  {Insert into bin}
+  call InsertMediumBlockIntoBin
+  {All OK}
+  xor eax, eax
+  {Unlock medium blocks}
+  mov MediumBlocksLocked, al
+  jmp @Done
+@NextBlockIsFree:
+  {Get the next block address in rax}
+  lea rax, [rsi + rbx]
+  {Increase the size of this block}
+  and rcx, DropMediumAndLargeFlagsMask
+  add rbx, rcx
+  {Was the block binned?}
+  cmp rcx, MinimumMediumBlockSize
+  jb @NextBlockChecked
+  mov rcx, rax
+  call RemoveMediumFreeBlock
+  jmp @NextBlockChecked
+@PreviousBlockIsFree:
+  {Get the size of the free block just before this one}
+  mov rcx, [rsi - 2 * BlockHeaderSize]
+  {Include the previous block}
+  sub rsi, rcx
+  {Set the new block size}
+  add rbx, rcx
+  {Remove the previous block from the linked list}
+  cmp ecx, MinimumMediumBlockSize
+  jb @PreviousBlockChecked
+  mov rcx, rsi
+  call RemoveMediumFreeBlock
+  jmp @PreviousBlockChecked
+@EntireMediumPoolFree:
+  {Should we make this the new sequential feed medium block pool? If the
+   current sequential feed pool is not entirely free, we make this the new
+   sequential feed pool.}
+  lea r8, MediumSequentialFeedBytesLeft
+  cmp dword ptr [r8], MediumBlockPoolSize - MediumBlockPoolHeaderSize //workaround for QC99023
+  jne @MakeEmptyMediumPoolSequentialFeed
+  {Point esi to the medium block pool header}
+  sub rsi, MediumBlockPoolHeaderSize
+  {Remove this medium block pool from the linked list}
+  mov rax, TMediumBlockPoolHeader[rsi].PreviousMediumBlockPoolHeader
+  mov rdx, TMediumBlockPoolHeader[rsi].NextMediumBlockPoolHeader
+  mov TMediumBlockPoolHeader[rax].NextMediumBlockPoolHeader, rdx
+  mov TMediumBlockPoolHeader[rdx].PreviousMediumBlockPoolHeader, rax
+  {Unlock medium blocks}
+  xor eax, eax
+  mov MediumBlocksLocked, al
+{$ifdef ClearMediumBlockPoolsBeforeReturningToOS}
+  mov rcx, rsi
+  mov edx, MediumBlockPoolSize
+  xor r8, r8
+  call System.@FillChar
+{$endif}
+  {Free the medium block pool}
+  mov rcx, rsi
+  xor edx, edx
+  mov r8d, MEM_RELEASE
+  call VirtualFree
+  {VirtualFree returns >0 if all is ok}
+  cmp eax, 1
+  {Return 0 on all ok}
+  sbb eax, eax
+  jmp @Done
+@MakeEmptyMediumPoolSequentialFeed:
+  {Get a pointer to the end-marker block}
+  lea rbx, [rsi + MediumBlockPoolSize - MediumBlockPoolHeaderSize]
+  {Bin the current sequential feed pool}
+  call BinMediumSequentialFeedRemainder
+  {Set this medium pool up as the new sequential feed pool:
+   Store the sequential feed pool trailer}
+  mov qword ptr [rbx - BlockHeaderSize], IsMediumBlockFlag
+  {Store the number of bytes available in the sequential feed chunk}
+  lea rax, MediumSequentialFeedBytesLeft
+  mov dword ptr [rax], MediumBlockPoolSize - MediumBlockPoolHeaderSize //QC99023 workaround
+  {Set the last sequentially fed block}
+  mov LastSequentiallyFedMediumBlock, rbx
+  {Success}
+  xor eax, eax
+  {Unlock medium blocks}
+  mov MediumBlocksLocked, al
+  jmp @Done
+@NotASmallOrMediumBlock:
+  {Attempt to free an already free block?}
+  mov eax, -1
+  {Is it in fact a large block?}
+  test dl, IsFreeBlockFlag + IsMediumBlockFlag
+  jnz @Done
+  call FreeLargeBlock
+@Done:
+end;
+{$endif}
+{$endif}
+
+{$ifndef FullDebugMode}
+{Replacement for SysReallocMem}
+function FastReallocMem(APointer: Pointer; ANewSize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer;
+{$ifndef ASMVersion}
+var
+  LBlockHeader, LNextBlockSizeAndFlags, LNewAllocSize, LBlockFlags,
+    LOldAvailableSize, LNextBlockSize, LNewAvailableSize, LMinimumUpsize,
+    LSecondSplitSize, LNewBlockSize: NativeUInt;
+  LPSmallBlockType: PSmallBlockType;
+  LPNextBlock, LPNextBlockHeader: Pointer;
+
+  {Upsizes a large block in-place. The following variables are assumed correct:
+    LBlockFlags, LOldAvailableSize, LPNextBlock, LNextBlockSizeAndFlags,
+    LNextBlockSize, LNewAvailableSize. Medium blocks must be locked on entry if
+    required.}
+  procedure MediumBlockInPlaceUpsize;
+  begin
+    {Remove the next block}
+    if LNextBlockSizeAndFlags >= MinimumMediumBlockSize then
+      RemoveMediumFreeBlock(LPNextBlock);
+    {Add 25% for medium block in-place upsizes}
+    LMinimumUpsize := LOldAvailableSize + (LOldAvailableSize shr 2);
+    if NativeUInt(ANewSize) < LMinimumUpsize then
+      LNewAllocSize := LMinimumUpsize
+    else
+      LNewAllocSize := NativeUInt(ANewSize);
+    {Round up to the nearest block size granularity}
+    LNewBlockSize := ((LNewAllocSize + (BlockHeaderSize + MediumBlockGranularity - 1 - MediumBlockSizeOffset))
+      and -MediumBlockGranularity) + MediumBlockSizeOffset;
+    {Calculate the size of the second split}
+    LSecondSplitSize := LNewAvailableSize + BlockHeaderSize - LNewBlockSize;
+    {Does it fit?}
+    if NativeInt(LSecondSplitSize) <= 0 then
+    begin
+      {The block size is the full available size plus header}
+      LNewBlockSize := LNewAvailableSize + BlockHeaderSize;
+      {Grab the whole block: Mark it as used in the block following it}
+      LPNextBlockHeader := Pointer(PByte(APointer) + LNewAvailableSize);
+      PNativeUInt(LPNextBlockHeader)^ :=
+        PNativeUInt(LPNextBlockHeader)^ and (not PreviousMediumBlockIsFreeFlag);
+    end
+    else
+    begin
+      {Split the block in two}
+      LPNextBlock := PMediumFreeBlock(PByte(APointer) + LNewBlockSize);
+      {Set the size of the second split}
+      PNativeUInt(PByte(LPNextBlock) - BlockHeaderSize)^ := LSecondSplitSize or (IsMediumBlockFlag or IsFreeBlockFlag);
+      {Store the size of the second split before the header of the next block}
+      PNativeUInt(PByte(LPNextBlock) + LSecondSplitSize - 2 * BlockHeaderSize)^ := LSecondSplitSize;
+      {Put the remainder in a bin if it is big enough}
+      if LSecondSplitSize >= MinimumMediumBlockSize then
+        InsertMediumBlockIntoBin(LPNextBlock, LSecondSplitSize);
+    end;
+    {Set the size and flags for this block}
+    PNativeUInt(PByte(APointer) - BlockHeaderSize)^ := LNewBlockSize or LBlockFlags;
+  end;
+
+  {In-place downsize of a medium block. On entry Size must be less than half of
+   LOldAvailableSize.}
+  procedure MediumBlockInPlaceDownsize;
+  begin
+    {Round up to the next medium block size}
+    LNewBlockSize := ((ANewSize + (BlockHeaderSize + MediumBlockGranularity - 1 - MediumBlockSizeOffset))
+      and -MediumBlockGranularity) + MediumBlockSizeOffset;
+    {Get the size of the second split}
+    LSecondSplitSize := (LOldAvailableSize + BlockHeaderSize) - LNewBlockSize;
+    {Lock the medium blocks}
+    LockMediumBlocks;
+    {Set the new size}
+    PNativeUInt(PByte(APointer) - BlockHeaderSize)^ :=
+      (PNativeUInt(PByte(APointer) - BlockHeaderSize)^ and ExtractMediumAndLargeFlagsMask)
+      or LNewBlockSize;
+    {Is the next block in use?}
+    LPNextBlock := PNativeUInt(PByte(APointer) + LOldAvailableSize + BlockHeaderSize);
+    LNextBlockSizeAndFlags := PNativeUInt(PByte(LPNextBlock) - BlockHeaderSize)^;
+    if LNextBlockSizeAndFlags and IsFreeBlockFlag = 0 then
+    begin
+      {The next block is in use: flag its previous block as free}
+      PNativeUInt(PByte(LPNextBlock) - BlockHeaderSize)^ :=
+        LNextBlockSizeAndFlags or PreviousMediumBlockIsFreeFlag;
+    end
+    else
+    begin
+      {The next block is free: combine it}
+      LNextBlockSizeAndFlags := LNextBlockSizeAndFlags and DropMediumAndLargeFlagsMask;
+      Inc(LSecondSplitSize, LNextBlockSizeAndFlags);
+      if LNextBlockSizeAndFlags >= MinimumMediumBlockSize then
+        RemoveMediumFreeBlock(LPNextBlock);
+    end;
+    {Set the split}
+    LPNextBlock := PNativeUInt(PByte(APointer) + LNewBlockSize);
+    {Store the free part's header}
+    PNativeUInt(PByte(LPNextBlock) - BlockHeaderSize)^ := LSecondSplitSize or (IsMediumBlockFlag or IsFreeBlockFlag);
+    {Store the trailing size field}
+    PNativeUInt(PByte(LPNextBlock) + LSecondSplitSize - 2 * BlockHeaderSize)^ := LSecondSplitSize;
+    {Bin this free block}
+    if LSecondSplitSize >= MinimumMediumBlockSize then
+      InsertMediumBlockIntoBin(LPNextBlock, LSecondSplitSize);
+    {Unlock the medium blocks}
+    MediumBlocksLocked := False;
+  end;
+
+begin
+  {Get the block header: Is it actually a small block?}
+  LBlockHeader := PNativeUInt(PByte(APointer) - BlockHeaderSize)^;
+  {Is it a small block that is in use?}
+  if LBlockHeader and (IsFreeBlockFlag or IsMediumBlockFlag or IsLargeBlockFlag) = 0 then
+  begin
+    {-----------------------------------Small block-------------------------------------}
+    {The block header is a pointer to the block pool: Get the block type}
+    LPSmallBlockType := PSmallBlockPoolHeader(LBlockHeader).BlockType;
+    {Get the available size inside blocks of this type.}
+    LOldAvailableSize := LPSmallBlockType.BlockSize - BlockHeaderSize;
+    {Is it an upsize or a downsize?}
+    if LOldAvailableSize >= NativeUInt(ANewSize) then
+    begin
+      {It's a downsize. Do we need to allocate a smaller block? Only if the new
+       block size is less than a quarter of the available size less
+       SmallBlockDownsizeCheckAdder bytes}
+      if (NativeUInt(ANewSize) * 4 + SmallBlockDownsizeCheckAdder) >= LOldAvailableSize then
+      begin
+        {In-place downsize - return the pointer}
+        Result := APointer;
+        Exit;
+      end
+      else
+      begin
+        {Allocate a smaller block}
+        Result := FastGetMem(ANewSize);
+        {Allocated OK?}
+        if Result <> nil then
+        begin
+          {Move the data across}
+{$ifdef UseCustomVariableSizeMoveRoutines}
+  {$ifdef Align16Bytes}
+          MoveX16LP(APointer^, Result^, ANewSize);
+  {$else}
+          MoveX8LP(APointer^, Result^, ANewSize);
+  {$endif}
+{$else}
+          System.Move(APointer^, Result^, ANewSize);
+{$endif}
+          {Free the old pointer}
+          FastFreeMem(APointer);
+        end;
+      end;
+    end
+    else
+    begin
+      {This pointer is being reallocated to a larger block and therefore it is
+       logical to assume that it may be enlarged again. Since reallocations are
+       expensive, there is a minimum upsize percentage to avoid unnecessary
+       future move operations.}
+      {Must grow with at least 100% + x bytes}
+      LNewAllocSize := LOldAvailableSize * 2 + SmallBlockUpsizeAdder;
+      {Still not large enough?}
+      if LNewAllocSize < NativeUInt(ANewSize) then
+        LNewAllocSize := NativeUInt(ANewSize);
+      {Allocate the new block}
+      Result := FastGetMem(LNewAllocSize);
+      {Allocated OK?}
+      if Result <> nil then
+      begin
+        {Do we need to store the requested size? Only large blocks store the
+         requested size.}
+        if LNewAllocSize > (MaximumMediumBlockSize - BlockHeaderSize) then
+          PLargeBlockHeader(PByte(Result) - LargeBlockHeaderSize).UserAllocatedSize := ANewSize;
+        {Move the data across}
+{$ifdef UseCustomFixedSizeMoveRoutines}
+        LPSmallBlockType.UpsizeMoveProcedure(APointer^, Result^, LOldAvailableSize);
+{$else}
+        System.Move(APointer^, Result^, LOldAvailableSize);
+{$endif}
+        {Free the old pointer}
+        FastFreeMem(APointer);
+      end;
+    end;
+  end
+  else
+  begin
+    {Is this a medium block or a large block?}
+    if LBlockHeader and (IsFreeBlockFlag or IsLargeBlockFlag) = 0 then
+    begin
+      {-------------------------------Medium block--------------------------------------}
+      {What is the available size in the block being reallocated?}
+      LOldAvailableSize := (LBlockHeader and DropMediumAndLargeFlagsMask);
+      {Get a pointer to the next block}
+      LPNextBlock := PNativeUInt(PByte(APointer) + LOldAvailableSize);
+      {Subtract the block header size from the old available size}
+      Dec(LOldAvailableSize, BlockHeaderSize);
+      {Is it an upsize or a downsize?}
+      if NativeUInt(ANewSize) > LOldAvailableSize then
+      begin
+        {Can we do an in-place upsize?}
+        LNextBlockSizeAndFlags := PNativeUInt(PByte(LPNextBlock) - BlockHeaderSize)^;
+        {Is the next block free?}
+        if LNextBlockSizeAndFlags and IsFreeBlockFlag <> 0 then
+        begin
+          LNextBlockSize := LNextBlockSizeAndFlags and DropMediumAndLargeFlagsMask;
+          {The available size including the next block}
+          LNewAvailableSize := LOldAvailableSize + LNextBlockSize;
+          {Can the block fit?}
+          if NativeUInt(ANewSize) <= LNewAvailableSize then
+          begin
+            {The next block is free and there is enough space to grow this
+             block in place.}
+{$ifndef AssumeMultiThreaded}
+            if IsMultiThread then
+            begin
+{$endif}
+              {Multi-threaded application - lock medium blocks and re-read the
+               information on the blocks.}
+              LockMediumBlocks;
+              {Re-read the info for this block}
+              LBlockFlags := PNativeUInt(PByte(APointer) - BlockHeaderSize)^ and ExtractMediumAndLargeFlagsMask;
+              {Re-read the info for the next block}
+              LNextBlockSizeAndFlags := PNativeUInt(PByte(LPNextBlock) - BlockHeaderSize)^;
+              {Recalculate the next block size}
+              LNextBlockSize := LNextBlockSizeAndFlags and DropMediumAndLargeFlagsMask;
+              {The available size including the next block}
+              LNewAvailableSize := LOldAvailableSize + LNextBlockSize;
+              {Is the next block still free and the size still sufficient?}
+              if (LNextBlockSizeAndFlags and IsFreeBlockFlag <> 0)
+                and (NativeUInt(ANewSize) <= LNewAvailableSize) then
+              begin
+                {Upsize the block in-place}
+                MediumBlockInPlaceUpsize;
+                {Unlock the medium blocks}
+                MediumBlocksLocked := False;
+                {Return the result}
+                Result := APointer;
+                {Done}
+                Exit;
+              end;
+              {Couldn't use the block: Unlock the medium blocks}
+              MediumBlocksLocked := False;
+{$ifndef AssumeMultiThreaded}
+            end
+            else
+            begin
+              {Extract the block flags}
+              LBlockFlags := ExtractMediumAndLargeFlagsMask and LBlockHeader;
+              {Upsize the block in-place}
+              MediumBlockInPlaceUpsize;
+              {Return the result}
+              Result := APointer;
+              {Done}
+              Exit;
+            end;
+{$endif}
+          end;
+        end;
+        {Couldn't upsize in place. Grab a new block and move the data across:
+         If we have to reallocate and move medium blocks, we grow by at
+         least 25%}
+        LMinimumUpsize := LOldAvailableSize + (LOldAvailableSize shr 2);
+        if NativeUInt(ANewSize) < LMinimumUpsize then
+          LNewAllocSize := LMinimumUpsize
+        else
+          LNewAllocSize := NativeUInt(ANewSize);
+        {Allocate the new block}
+        Result := FastGetMem(LNewAllocSize);
+        if Result <> nil then
+        begin
+          {If it's a large block - store the actual user requested size}
+          if LNewAllocSize > (MaximumMediumBlockSize - BlockHeaderSize) then
+            PLargeBlockHeader(PByte(Result) - LargeBlockHeaderSize).UserAllocatedSize := ANewSize;
+          {Move the data across}
+{$ifdef UseCustomVariableSizeMoveRoutines}
+          MoveX16LP(APointer^, Result^, LOldAvailableSize);
+{$else}
+          System.Move(APointer^, Result^, LOldAvailableSize);
+{$endif}
+          {Free the old block}
+          FastFreeMem(APointer);
+        end;
+      end
+      else
+      begin
+        {Must be less than half the current size or we don't bother resizing.}
+        if NativeUInt(ANewSize * 2) >= LOldAvailableSize then
+        begin
+          Result := APointer;
+        end
+        else
+        begin
+          {In-place downsize? Balance the cost of moving the data vs. the cost
+           of fragmenting the memory pool. Medium blocks in use may never be
+           smaller than MinimumMediumBlockSize.}
+          if NativeUInt(ANewSize) >= (MinimumMediumBlockSize - BlockHeaderSize) then
+          begin
+            MediumBlockInPlaceDownsize;
+            Result := APointer;
+          end
+          else
+          begin
+            {The requested size is less than the minimum medium block size. If
+             the requested size is less than the threshold value (currently a
+             quarter of the minimum medium block size), move the data to a small
+             block, otherwise shrink the medium block to the minimum allowable
+             medium block size.}
+            if NativeUInt(ANewSize) >= MediumInPlaceDownsizeLimit then
+            begin
+              {The request is for a size smaller than the minimum medium block
+               size, but not small enough to justify moving data: Reduce the
+               block size to the minimum medium block size}
+              ANewSize := MinimumMediumBlockSize - BlockHeaderSize;
+              {Is it already at the minimum medium block size?}
+              if LOldAvailableSize > NativeUInt(ANewSize) then
+                MediumBlockInPlaceDownsize;
+              Result := APointer;
+            end
+            else
+            begin
+              {Allocate the new block}
+              Result := FastGetMem(ANewSize);
+              if Result <> nil then
+              begin
+                {Move the data across}
+{$ifdef UseCustomVariableSizeMoveRoutines}
+  {$ifdef Align16Bytes}
+                MoveX16LP(APointer^, Result^, ANewSize);
+  {$else}
+                MoveX8LP(APointer^, Result^, ANewSize);
+  {$endif}
+{$else}
+                System.Move(APointer^, Result^, ANewSize);
+{$endif}
+                {Free the old block}
+                FastFreeMem(APointer);
+              end;
+            end;
+          end;
+        end;
+      end;
+    end
+    else
+    begin
+      {Is this a valid large block?}
+      if LBlockHeader and (IsFreeBlockFlag or IsMediumBlockFlag) = 0 then
+      begin
+        {-----------------------Large block------------------------------}
+        Result := ReallocateLargeBlock(APointer, ANewSize);
+      end
+      else
+      begin
+        {-----------------------Invalid block------------------------------}
+        {Bad pointer: probably an attempt to reallocate a free memory block.}
+        Result := nil;
+      end;
+    end;
+  end;
+end;
+{$else}
+{$ifdef 32Bit}
+asm
+  {On entry: eax = APointer; edx = ANewSize}
+  {Get the block header: Is it actually a small block?}
+  mov ecx, [eax - 4]
+  {Is it a small block?}
+  test cl, IsFreeBlockFlag + IsMediumBlockFlag + IsLargeBlockFlag
+  {Save ebx}
+  push ebx
+  {Save esi}
+  push esi
+  {Save the original pointer in esi}
+  mov esi, eax
+  {Is it a small block?}
+  jnz @NotASmallBlock
+  {-----------------------------------Small block-------------------------------------}
+  {Get the block type in ebx}
+  mov ebx, TSmallBlockPoolHeader[ecx].BlockType
+  {Get the available size inside blocks of this type.}
+  movzx ecx, TSmallBlockType[ebx].BlockSize
+  sub ecx, 4
+  {Is it an upsize or a downsize?}
+  cmp ecx, edx
+  jb @SmallUpsize
+  {It's a downsize. Do we need to allocate a smaller block? Only if the new
+   size is less than a quarter of the available size less
+   SmallBlockDownsizeCheckAdder bytes}
+  lea ebx, [edx * 4 + SmallBlockDownsizeCheckAdder]
+  cmp ebx, ecx
+  jb @NotSmallInPlaceDownsize
+  {In-place downsize - return the original pointer}
+  pop esi
+  pop ebx
+  ret
+  {Align branch target}
+  nop
+@NotSmallInPlaceDownsize:
+  {Save the requested size}
+  mov ebx, edx
+  {Allocate a smaller block}
+  mov eax, edx
+  call FastGetMem
+  {Allocated OK?}
+  test eax, eax
+  jz @SmallDownsizeDone
+  {Move data across: count in ecx}
+  mov ecx, ebx
+  {Destination in edx}
+  mov edx, eax
+  {Save the result in ebx}
+  mov ebx, eax
+  {Original pointer in eax}
+  mov eax, esi
+  {Move the data across}
+{$ifdef UseCustomVariableSizeMoveRoutines}
+  {$ifdef Align16Bytes}
+  call MoveX16LP
+  {$else}
+  call MoveX8LP
+  {$endif}
+{$else}
+  call System.Move
+{$endif}
+  {Free the original pointer}
+  mov eax, esi
+  call FastFreeMem
+  {Return the pointer}
+  mov eax, ebx
+@SmallDownsizeDone:
+  pop esi
+  pop ebx
+  ret
+  {Align branch target}
+  nop
+  nop
+@SmallUpsize:
+  {State: esi = APointer, edx = ANewSize, ecx = Current Block Size, ebx = Current Block Type}
+  {This pointer is being reallocated to a larger block and therefore it is
+   logical to assume that it may be enlarged again. Since reallocations are
+   expensive, there is a minimum upsize percentage to avoid unnecessary
+   future move operations.}
+  {Small blocks always grow with at least 100% + SmallBlockUpsizeAdder bytes}
+  lea ecx, [ecx + ecx + SmallBlockUpsizeAdder]
+  {save edi}
+  push edi
+  {Save the requested size in edi}
+  mov edi, edx
+  {New allocated size is the maximum of the requested size and the minimum
+   upsize}
+  xor eax, eax
+  sub ecx, edx
+  adc eax, -1
+  and eax, ecx
+  add eax, edx
+  {Allocate the new block}
+  call FastGetMem
+  {Allocated OK?}
+  test eax, eax
+  jz @SmallUpsizeDone
+  {Do we need to store the requested size? Only large blocks store the
+   requested size.}
+  cmp edi, MaximumMediumBlockSize - BlockHeaderSize
+  jbe @NotSmallUpsizeToLargeBlock
+  {Store the user requested size}
+  mov [eax - 8], edi
+@NotSmallUpsizeToLargeBlock:
+  {Get the size to move across}
+  movzx ecx, TSmallBlockType[ebx].BlockSize
+  sub ecx, BlockHeaderSize
+  {Move to the new block}
+  mov edx, eax
+  {Save the result in edi}
+  mov edi, eax
+  {Move from the old block}
+  mov eax, esi
+  {Move the data across}
+{$ifdef UseCustomFixedSizeMoveRoutines}
+  call TSmallBlockType[ebx].UpsizeMoveProcedure
+{$else}
+  call System.Move
+{$endif}
+  {Free the old pointer}
+  mov eax, esi
+  call FastFreeMem
+  {Done}
+  mov eax, edi
+@SmallUpsizeDone:
+  pop edi
+  pop esi
+  pop ebx
+  ret
+  {Align branch target}
+  nop
+@NotASmallBlock:
+  {Is this a medium block or a large block?}
+  test cl, IsFreeBlockFlag + IsLargeBlockFlag
+  jnz @PossibleLargeBlock
+  {-------------------------------Medium block--------------------------------------}
+  {Status: ecx = Current Block Size + Flags, eax/esi = APointer,
+   edx = Requested Size}
+  mov ebx, ecx
+  {Drop the flags from the header}
+  and ecx, DropMediumAndLargeFlagsMask
+  {Save edi}
+  push edi
+  {Get a pointer to the next block in edi}
+  lea edi, [eax + ecx]
+  {Subtract the block header size from the old available size}
+  sub ecx, BlockHeaderSize
+  {Get the complete flags in ebx}
+  and ebx, ExtractMediumAndLargeFlagsMask
+  {Is it an upsize or a downsize?}
+  cmp edx, ecx
+  {Save ebp}
+  push ebp
+  {Is it an upsize or a downsize?}
+  ja @MediumBlockUpsize
+  {Status: ecx = Current Block Size - 4, bl = Current Block Flags,
+   edi = @Next Block, eax/esi = APointer, edx = Requested Size}
+  {Must be less than half the current size or we don't bother resizing.}
+  lea ebp, [edx + edx]
+  cmp ebp, ecx
+  jb @MediumMustDownsize
+@MediumNoResize:
+  {Restore registers}
+  pop ebp
+  pop edi
+  pop esi
+  pop ebx
+  {Return}
+  ret
+  {Align branch target}
+  nop
+  nop
+  nop
+@MediumMustDownsize:
+  {In-place downsize? Balance the cost of moving the data vs. the cost of
+   fragmenting the memory pool. Medium blocks in use may never be smaller
+   than MinimumMediumBlockSize.}
+  cmp edx, MinimumMediumBlockSize - BlockHeaderSize
+  jae @MediumBlockInPlaceDownsize
+  {The requested size is less than the minimum medium block size. If the
+  requested size is less than the threshold value (currently a quarter of the
+  minimum medium block size), move the data to a small block, otherwise shrink
+  the medium block to the minimum allowable medium block size.}
+  cmp edx, MediumInPlaceDownsizeLimit
+  jb @MediumDownsizeRealloc
+  {The request is for a size smaller than the minimum medium block size, but
+   not small enough to justify moving data: Reduce the block size to the
+   minimum medium block size}
+  mov edx, MinimumMediumBlockSize - BlockHeaderSize
+  {Is it already at the minimum medium block size?}
+  cmp ecx, edx
+  jna @MediumNoResize
+@MediumBlockInPlaceDownsize:
+  {Round up to the next medium block size}
+  lea ebp, [edx + BlockHeaderSize + MediumBlockGranularity - 1 - MediumBlockSizeOffset]
+  and ebp, -MediumBlockGranularity;
+  add ebp, MediumBlockSizeOffset
+  {Get the size of the second split}
+  add ecx, BlockHeaderSize
+  sub ecx, ebp
+  {Lock the medium blocks}
+{$ifndef AssumeMultiThreaded}
+  cmp IsMultiThread, False
+  je @DoMediumInPlaceDownsize
+{$endif}
+@DoMediumLockForDownsize:
+  {Lock the medium blocks (ecx *must* be preserved)}
+  call LockMediumBlocks
+  {Reread the flags - they may have changed before medium blocks could be
+   locked.}
+  mov ebx, ExtractMediumAndLargeFlagsMask
+  and ebx, [esi - 4]
+@DoMediumInPlaceDownsize:
+  {Set the new size}
+  or ebx, ebp
+  mov [esi - 4], ebx
+  {Get the second split size in ebx}
+  mov ebx, ecx
+  {Is the next block in use?}
+  mov edx, [edi - 4]
+  test dl, IsFreeBlockFlag
+  jnz @MediumDownsizeNextBlockFree
+  {The next block is in use: flag its previous block as free}
+  or edx, PreviousMediumBlockIsFreeFlag
+  mov [edi - 4], edx
+  jmp @MediumDownsizeDoSplit
+  {Align branch target}
+  nop
+  nop
+{$ifdef AssumeMultiThreaded}
+  nop
+{$endif}
+@MediumDownsizeNextBlockFree:
+  {The next block is free: combine it}
+  mov eax, edi
+  and edx, DropMediumAndLargeFlagsMask
+  add ebx, edx
+  add edi, edx
+  cmp edx, MinimumMediumBlockSize
+  jb @MediumDownsizeDoSplit
+  call RemoveMediumFreeBlock
+@MediumDownsizeDoSplit:
+  {Store the trailing size field}
+  mov [edi - 8], ebx
+  {Store the free part's header}
+  lea eax, [ebx + IsMediumBlockFlag + IsFreeBlockFlag];
+  mov [esi + ebp - 4], eax
+  {Bin this free block}
+  cmp ebx, MinimumMediumBlockSize
+  jb @MediumBlockDownsizeDone
+  lea eax, [esi + ebp]
+  mov edx, ebx
+  call InsertMediumBlockIntoBin
+@MediumBlockDownsizeDone:
+  {Unlock the medium blocks}
+  mov MediumBlocksLocked, False
+  {Result = old pointer}
+  mov eax, esi
+  {Restore registers}
+  pop ebp
+  pop edi
+  pop esi
+  pop ebx
+  {Return}
+  ret
+  {Align branch target}
+@MediumDownsizeRealloc:
+  {Save the requested size}
+  mov edi, edx
+  mov eax, edx
+  {Allocate the new block}
+  call FastGetMem
+  test eax, eax
+  jz @MediumBlockDownsizeExit
+  {Save the result}
+  mov ebp, eax
+  mov edx, eax
+  mov eax, esi
+  mov ecx, edi
+  {Move the data across}
+{$ifdef UseCustomVariableSizeMoveRoutines}
+  {$ifdef Align16Bytes}
+  call MoveX16LP
+  {$else}
+  call MoveX8LP
+  {$endif}
+{$else}
+  call System.Move
+{$endif}
+  mov eax, esi
+  call FastFreeMem
+  {Return the result}
+  mov eax, ebp
+@MediumBlockDownsizeExit:
+  pop ebp
+  pop edi
+  pop esi
+  pop ebx
+  ret
+  {Align branch target}
+@MediumBlockUpsize:
+  {Status: ecx = Current Block Size - 4, bl = Current Block Flags,
+   edi = @Next Block, eax/esi = APointer, edx = Requested Size}
+  {Can we do an in-place upsize?}
+  mov eax, [edi - 4]
+  test al, IsFreeBlockFlag
+  jz @CannotUpsizeMediumBlockInPlace
+  {Get the total available size including the next block}
+  and eax, DropMediumAndLargeFlagsMask
+  {ebp = total available size including the next block (excluding the header)}
+  lea ebp, [eax + ecx]
+  {Can the block fit?}
+  cmp edx, ebp
+  ja @CannotUpsizeMediumBlockInPlace
+  {The next block is free and there is enough space to grow this
+   block in place.}
+{$ifndef AssumeMultiThreaded}
+  cmp IsMultiThread, False
+  je @DoMediumInPlaceUpsize
+{$endif}
+@DoMediumLockForUpsize:
+  {Lock the medium blocks (ecx and edx *must* be preserved}
+  call LockMediumBlocks
+  {Re-read the info for this block (since it may have changed before the medium
+   blocks could be locked)}
+  mov ebx, ExtractMediumAndLargeFlagsMask
+  and ebx, [esi - 4]
+  {Re-read the info for the next block}
+  mov eax, [edi - 4]
+  {Next block still free?}
+  test al, IsFreeBlockFlag
+  jz @NextMediumBlockChanged
+  {Recalculate the next block size}
+  and eax, DropMediumAndLargeFlagsMask
+  {The available size including the next block}
+  lea ebp, [eax + ecx]
+  {Can the block still fit?}
+  cmp edx, ebp
+  ja @NextMediumBlockChanged
+@DoMediumInPlaceUpsize:
+  {Is the next block binnable?}
+  cmp eax, MinimumMediumBlockSize
+  {Remove the next block}
+  jb @MediumInPlaceNoNextRemove
+  mov eax, edi
+  push ecx
+  push edx
+  call RemoveMediumFreeBlock
+  pop edx
+  pop ecx
+@MediumInPlaceNoNextRemove:
+  {Medium blocks grow a minimum of 25% in in-place upsizes}
+  mov eax, ecx
+  shr eax, 2
+  add eax, ecx
+  {Get the maximum of the requested size and the minimum growth size}
+  xor edi, edi
+  sub eax, edx
+  adc edi, -1
+  and eax, edi
+  {Round up to the nearest block size granularity}
+  lea eax, [eax + edx + BlockHeaderSize + MediumBlockGranularity - 1 - MediumBlockSizeOffset]
+  and eax, -MediumBlockGranularity
+  add eax, MediumBlockSizeOffset
+  {Calculate the size of the second split}
+  lea edx, [ebp + BlockHeaderSize]
+  sub edx, eax
+  {Does it fit?}
+  ja @MediumInPlaceUpsizeSplit
+  {Grab the whole block: Mark it as used in the block following it}
+  and dword ptr [esi + ebp], not PreviousMediumBlockIsFreeFlag
+  {The block size is the full available size plus header}
+  add ebp, 4
+  {Upsize done}
+  jmp @MediumUpsizeInPlaceDone
+  {Align branch target}
+{$ifndef AssumeMultiThreaded}
+  nop
+  nop
+  nop
+{$endif}
+@MediumInPlaceUpsizeSplit:
+  {Store the size of the second split as the second last dword}
+  mov [esi + ebp - 4], edx
+  {Set the second split header}
+  lea edi, [edx + IsMediumBlockFlag + IsFreeBlockFlag]
+  mov [esi + eax - 4], edi
+  mov ebp, eax
+  cmp edx, MinimumMediumBlockSize
+  jb @MediumUpsizeInPlaceDone
+  add eax, esi
+  call InsertMediumBlockIntoBin
+@MediumUpsizeInPlaceDone:
+  {Set the size and flags for this block}
+  or ebp, ebx
+  mov [esi - 4], ebp
+  {Unlock the medium blocks}
+  mov MediumBlocksLocked, False
+  {Result = old pointer}
+  mov eax, esi
+@MediumBlockResizeDone2:
+  {Restore registers}
+  pop ebp
+  pop edi
+  pop esi
+  pop ebx
+  {Return}
+  ret
+  {Align branch target for "@CannotUpsizeMediumBlockInPlace"}
+  nop
+  nop
+@NextMediumBlockChanged:
+  {The next medium block changed while the medium blocks were being locked}
+  mov MediumBlocksLocked, False
+@CannotUpsizeMediumBlockInPlace:
+  {Couldn't upsize in place. Grab a new block and move the data across:
+   If we have to reallocate and move medium blocks, we grow by at
+   least 25%}
+  mov eax, ecx
+  shr eax, 2
+  add eax, ecx
+  {Get the maximum of the requested size and the minimum growth size}
+  xor edi, edi
+  sub eax, edx
+  adc edi, -1
+  and eax, edi
+  add eax, edx
+  {Save the size to allocate}
+  mov ebp, eax
+  {Save the size to move across}
+  mov edi, ecx
+  {Get the block}
+  push edx
+  call FastGetMem
+  pop edx
+  {Success?}
+  test eax, eax
+  jz @MediumBlockResizeDone2
+  {If it's a Large block - store the actual user requested size}
+  cmp ebp, MaximumMediumBlockSize - BlockHeaderSize
+  jbe @MediumUpsizeNotLarge
+  mov [eax - 8], edx
+@MediumUpsizeNotLarge:
+  {Save the result}
+  mov ebp, eax
+  {Move the data across}
+  mov edx, eax
+  mov eax, esi
+  mov ecx, edi
+{$ifdef UseCustomVariableSizeMoveRoutines}
+  call MoveX16LP
+{$else}
+  call System.Move
+{$endif}
+  {Free the old block}
+  mov eax, esi
+  call FastFreeMem
+  {Restore the result}
+  mov eax, ebp
+  {Restore registers}
+  pop ebp
+  pop edi
+  pop esi
+  pop ebx
+  {Return}
+  ret
+  {Align branch target}
+  nop
+@PossibleLargeBlock:
+  {-----------------------Large block------------------------------}
+  {Restore registers}
+  pop esi
+  pop ebx
+  {Is this a valid large block?}
+  test cl, IsFreeBlockFlag + IsMediumBlockFlag
+  jz ReallocateLargeBlock
+  {-----------------------Invalid block------------------------------}
+  xor eax, eax
+end;
+
+{$else}
+
+{-----------------64-bit BASM FastReallocMem-----------------}
+asm
+  .params 3
+  .pushnv rbx
+  .pushnv rsi
+  .pushnv rdi
+  .pushnv r14
+  .pushnv r15
+  {On entry: rcx = APointer; rdx = ANewSize}
+  {Save the original pointer in rsi}
+  mov rsi, rcx
+  {Get the block header}
+  mov rcx, [rcx - BlockHeaderSize]
+  {Is it a small block?}
+  test cl, IsFreeBlockFlag + IsMediumBlockFlag + IsLargeBlockFlag
+  jnz @NotASmallBlock
+  {-----------------------------------Small block-------------------------------------}
+  {Get the block type in rbx}
+  mov rbx, TSmallBlockPoolHeader[rcx].BlockType
+  {Get the available size inside blocks of this type.}
+  movzx ecx, TSmallBlockType[rbx].BlockSize
+  sub ecx, BlockHeaderSize
+  {Is it an upsize or a downsize?}
+  cmp rcx, rdx
+  jb @SmallUpsize
+  {It's a downsize. Do we need to allocate a smaller block? Only if the new
+   size is less than a quarter of the available size less
+   SmallBlockDownsizeCheckAdder bytes}
+  lea ebx, [edx * 4 + SmallBlockDownsizeCheckAdder]
+  cmp ebx, ecx
+  jb @NotSmallInPlaceDownsize
+  {In-place downsize - return the original pointer}
+  mov rax, rsi
+  jmp @Done
+@NotSmallInPlaceDownsize:
+  {Save the requested size}
+  mov rbx, rdx
+  {Allocate a smaller block}
+  mov rcx, rdx
+  call FastGetMem
+  {Allocated OK?}
+  test rax, rax
+  jz @Done
+  {Move data across: count in r8}
+  mov r8, rbx
+  {Destination in edx}
+  mov rdx, rax
+  {Save the result in ebx}
+  mov rbx, rax
+  {Original pointer in ecx}
+  mov rcx, rsi
+  {Move the data across}
+{$ifdef UseCustomVariableSizeMoveRoutines}
+  {$ifdef Align16Bytes}
+  call MoveX16LP
+  {$else}
+  call MoveX8LP
+  {$endif}
+{$else}
+  call System.Move
+{$endif}
+  {Free the original pointer}
+  mov rcx, rsi
+  call FastFreeMem
+  {Return the pointer}
+  mov rax, rbx
+  jmp @Done
+@SmallUpsize:
+  {State: rsi = APointer, rdx = ANewSize, rcx = Current Block Size, rbx = Current Block Type}
+  {This pointer is being reallocated to a larger block and therefore it is
+   logical to assume that it may be enlarged again. Since reallocations are
+   expensive, there is a minimum upsize percentage to avoid unnecessary
+   future move operations.}
+  {Small blocks always grow with at least 100% + SmallBlockUpsizeAdder bytes}
+  lea ecx, [ecx + ecx + SmallBlockUpsizeAdder]
+  {Save the requested size in rdi}
+  mov rdi, rdx
+  {New allocated size is the maximum of the requested size and the minimum
+   upsize}
+  xor rax, rax
+  sub rcx, rdx
+  adc rax, -1
+  and rcx, rax
+  add rcx, rdx
+  {Allocate the new block}
+  call FastGetMem
+  {Allocated OK?}
+  test rax, rax
+  jz @Done
+  {Do we need to store the requested size? Only large blocks store the
+   requested size.}
+  cmp rdi, MaximumMediumBlockSize - BlockHeaderSize
+  jbe @NotSmallUpsizeToLargeBlock
+  {Store the user requested size}
+  mov [rax - 2 * BlockHeaderSize], rdi
+@NotSmallUpsizeToLargeBlock:
+  {Get the size to move across}
+  movzx r8d, TSmallBlockType[rbx].BlockSize
+  sub r8d, BlockHeaderSize
+  {Move to the new block}
+  mov rdx, rax
+  {Save the result in edi}
+  mov rdi, rax
+  {Move from the old block}
+  mov rcx, rsi
+  {Move the data across}
+{$ifdef UseCustomFixedSizeMoveRoutines}
+  call TSmallBlockType[rbx].UpsizeMoveProcedure
+{$else}
+  call System.Move
+{$endif}
+  {Free the old pointer}
+  mov rcx, rsi
+  call FastFreeMem
+  {Done}
+  mov rax, rdi
+  jmp @Done
+@NotASmallBlock:
+  {Is this a medium block or a large block?}
+  test cl, IsFreeBlockFlag + IsLargeBlockFlag
+  jnz @PossibleLargeBlock
+  {-------------------------------Medium block--------------------------------------}
+  {Status: rcx = Current Block Size + Flags, rsi = APointer,
+   rdx = Requested Size}
+  mov rbx, rcx
+  {Drop the flags from the header}
+  and ecx, DropMediumAndLargeFlagsMask
+  {Get a pointer to the next block in rdi}
+  lea rdi, [rsi + rcx]
+  {Subtract the block header size from the old available size}
+  sub ecx, BlockHeaderSize
+  {Get the complete flags in ebx}
+  and ebx, ExtractMediumAndLargeFlagsMask
+  {Is it an upsize or a downsize?}
+  cmp rdx, rcx
+  ja @MediumBlockUpsize
+  {Status: ecx = Current Block Size - BlockHeaderSize, bl = Current Block Flags,
+   rdi = @Next Block, rsi = APointer, rdx = Requested Size}
+  {Must be less than half the current size or we don't bother resizing.}
+  lea r15, [rdx + rdx]
+  cmp r15, rcx
+  jb @MediumMustDownsize
+@MediumNoResize:
+  mov rax, rsi
+  jmp @Done
+@MediumMustDownsize:
+  {In-place downsize? Balance the cost of moving the data vs. the cost of
+   fragmenting the memory pool. Medium blocks in use may never be smaller
+   than MinimumMediumBlockSize.}
+  cmp edx, MinimumMediumBlockSize - BlockHeaderSize
+  jae @MediumBlockInPlaceDownsize
+  {The requested size is less than the minimum medium block size. If the
+  requested size is less than the threshold value (currently a quarter of the
+  minimum medium block size), move the data to a small block, otherwise shrink
+  the medium block to the minimum allowable medium block size.}
+  cmp edx, MediumInPlaceDownsizeLimit
+  jb @MediumDownsizeRealloc
+  {The request is for a size smaller than the minimum medium block size, but
+   not small enough to justify moving data: Reduce the block size to the
+   minimum medium block size}
+  mov edx, MinimumMediumBlockSize - BlockHeaderSize
+  {Is it already at the minimum medium block size?}
+  cmp ecx, edx
+  jna @MediumNoResize
+@MediumBlockInPlaceDownsize:
+  {Round up to the next medium block size}
+  lea r15, [rdx + BlockHeaderSize + MediumBlockGranularity - 1 - MediumBlockSizeOffset]
+  and r15, -MediumBlockGranularity
+  add r15, MediumBlockSizeOffset
+  {Get the size of the second split}
+  add ecx, BlockHeaderSize
+  sub ecx, r15d
+  {Lock the medium blocks}
+{$ifndef AssumeMultiThreaded}
+  lea r8, IsMultiThread
+  cmp byte ptr [r8], False
+  je @DoMediumInPlaceDownsize
+{$endif}
+@DoMediumLockForDownsize:
+  {Lock the medium blocks}
+  mov ebx, ecx
+  call LockMediumBlocks
+  mov ecx, ebx
+  {Reread the flags - they may have changed before medium blocks could be
+   locked.}
+  mov rbx, ExtractMediumAndLargeFlagsMask
+  and rbx, [rsi - BlockHeaderSize]
+@DoMediumInPlaceDownsize:
+  {Set the new size}
+  or rbx, r15
+  mov [rsi - BlockHeaderSize], rbx
+  {Get the second split size in ebx}
+  mov ebx, ecx
+  {Is the next block in use?}
+  mov rdx, [rdi - BlockHeaderSize]
+  test dl, IsFreeBlockFlag
+  jnz @MediumDownsizeNextBlockFree
+  {The next block is in use: flag its previous block as free}
+  or rdx, PreviousMediumBlockIsFreeFlag
+  mov [rdi - BlockHeaderSize], rdx
+  jmp @MediumDownsizeDoSplit
+@MediumDownsizeNextBlockFree:
+  {The next block is free: combine it}
+  mov rcx, rdi
+  and rdx, DropMediumAndLargeFlagsMask
+  add rbx, rdx
+  add rdi, rdx
+  cmp edx, MinimumMediumBlockSize
+  jb @MediumDownsizeDoSplit
+  call RemoveMediumFreeBlock
+@MediumDownsizeDoSplit:
+  {Store the trailing size field}
+  mov [rdi - 2 * BlockHeaderSize], rbx
+  {Store the free part's header}
+  lea rcx, [rbx + IsMediumBlockFlag + IsFreeBlockFlag];
+  mov [rsi + r15 - BlockHeaderSize], rcx
+  {Bin this free block}
+  cmp rbx, MinimumMediumBlockSize
+  jb @MediumBlockDownsizeDone
+  lea rcx, [rsi + r15]
+  mov rdx, rbx
+  call InsertMediumBlockIntoBin
+@MediumBlockDownsizeDone:
+  {Unlock the medium blocks}
+  lea rax, MediumBlocksLocked
+  mov byte ptr [rax], False
+  {Result = old pointer}
+  mov rax, rsi
+  jmp @Done
+@MediumDownsizeRealloc:
+  {Save the requested size}
+  mov rdi, rdx
+  mov rcx, rdx
+  {Allocate the new block}
+  call FastGetMem
+  test rax, rax
+  jz @Done
+  {Save the result}
+  mov r15, rax
+  mov rdx, rax
+  mov rcx, rsi
+  mov r8, rdi
+  {Move the data across}
+{$ifdef UseCustomVariableSizeMoveRoutines}
+  {$ifdef Align16Bytes}
+  call MoveX16LP
+  {$else}
+  call MoveX8LP
+  {$endif}
+{$else}
+  call System.Move
+{$endif}
+  mov rcx, rsi
+  call FastFreeMem
+  {Return the result}
+  mov rax, r15
+  jmp @Done
+@MediumBlockUpsize:
+  {Status: ecx = Current Block Size - BlockHeaderSize, bl = Current Block Flags,
+   rdi = @Next Block, rsi = APointer, rdx = Requested Size}
+  {Can we do an in-place upsize?}
+  mov rax, [rdi - BlockHeaderSize]
+  test al, IsFreeBlockFlag
+  jz @CannotUpsizeMediumBlockInPlace
+  {Get the total available size including the next block}
+  and rax, DropMediumAndLargeFlagsMask
+  {r15 = total available size including the next block (excluding the header)}
+  lea r15, [rax + rcx]
+  {Can the block fit?}
+  cmp rdx, r15
+  ja @CannotUpsizeMediumBlockInPlace
+  {The next block is free and there is enough space to grow this
+   block in place.}
+{$ifndef AssumeMultiThreaded}
+  lea r8, IsMultiThread
+  cmp byte ptr [r8], False
+  je @DoMediumInPlaceUpsize
+{$endif}
+@DoMediumLockForUpsize:
+  {Lock the medium blocks.}
+  mov rbx, rcx
+  mov r15, rdx
+  call LockMediumBlocks
+  mov rcx, rbx
+  mov rdx, r15
+  {Re-read the info for this block (since it may have changed before the medium
+   blocks could be locked)}
+  mov rbx, ExtractMediumAndLargeFlagsMask
+  and rbx, [rsi - BlockHeaderSize]
+  {Re-read the info for the next block}
+  mov rax, [rdi - BlockheaderSize]
+  {Next block still free?}
+  test al, IsFreeBlockFlag
+  jz @NextMediumBlockChanged
+  {Recalculate the next block size}
+  and eax, DropMediumAndLargeFlagsMask
+  {The available size including the next block}
+  lea r15, [rax + rcx]
+  {Can the block still fit?}
+  cmp rdx, r15
+  ja @NextMediumBlockChanged
+@DoMediumInPlaceUpsize:
+  {Is the next block binnable?}
+  cmp eax, MinimumMediumBlockSize
+  {Remove the next block}
+  jb @MediumInPlaceNoNextRemove
+  mov r14, rcx
+  mov rcx, rdi
+  mov rdi, rdx
+  call RemoveMediumFreeBlock
+  mov rcx, r14
+  mov rdx, rdi
+@MediumInPlaceNoNextRemove:
+  {Medium blocks grow a minimum of 25% in in-place upsizes}
+  mov eax, ecx
+  shr eax, 2
+  add eax, ecx
+  {Get the maximum of the requested size and the minimum growth size}
+  xor edi, edi
+  sub eax, edx
+  adc edi, -1
+  and eax, edi
+  {Round up to the nearest block size granularity}
+  lea eax, [eax + edx + BlockHeaderSize + MediumBlockGranularity - 1 - MediumBlockSizeOffset]
+  and eax, -MediumBlockGranularity
+  add eax, MediumBlockSizeOffset
+  {Calculate the size of the second split}
+  lea rdx, [r15 + BlockHeaderSize]
+  sub edx, eax
+  {Does it fit?}
+  ja @MediumInPlaceUpsizeSplit
+  {Grab the whole block: Mark it as used in the block following it}
+  and qword ptr [rsi + r15], not PreviousMediumBlockIsFreeFlag
+  {The block size is the full available size plus header}
+  add r15, BlockHeaderSize
+  {Upsize done}
+  jmp @MediumUpsizeInPlaceDone
+@MediumInPlaceUpsizeSplit:
+  {Store the size of the second split as the second last dword}
+  mov [rsi + r15 - BlockHeaderSize], rdx
+  {Set the second split header}
+  lea edi, [edx + IsMediumBlockFlag + IsFreeBlockFlag]
+  mov [rsi + rax - BlockHeaderSize], rdi
+  mov r15, rax
+  cmp edx, MinimumMediumBlockSize
+  jb @MediumUpsizeInPlaceDone
+  lea rcx, [rsi + rax]
+  call InsertMediumBlockIntoBin
+@MediumUpsizeInPlaceDone:
+  {Set the size and flags for this block}
+  or r15, rbx
+  mov [rsi - BlockHeaderSize], r15
+  {Unlock the medium blocks}
+  lea rax, MediumBlocksLocked
+  mov byte ptr [rax], False
+  {Result = old pointer}
+  mov rax, rsi
+  jmp @Done
+@NextMediumBlockChanged:
+  {The next medium block changed while the medium blocks were being locked}
+  lea rax, MediumBlocksLocked
+  mov byte ptr [rax], False
+@CannotUpsizeMediumBlockInPlace:
+  {Couldn't upsize in place. Grab a new block and move the data across:
+   If we have to reallocate and move medium blocks, we grow by at
+   least 25%}
+  mov eax, ecx
+  shr eax, 2
+  add eax, ecx
+  {Get the maximum of the requested size and the minimum growth size}
+  xor rdi, rdi
+  sub rax, rdx
+  adc rdi, -1
+  and rax, rdi
+  add rax, rdx
+  {Save the size to allocate}
+  mov r15, rax
+  {Save the size to move across}
+  mov edi, ecx
+  {Save the requested size}
+  mov rbx, rdx
+  {Get the block}
+  mov rcx, rax
+  call FastGetMem
+  mov rdx, rbx
+  {Success?}
+  test eax, eax
+  jz @Done
+  {If it's a Large block - store the actual user requested size}
+  cmp r15, MaximumMediumBlockSize - BlockHeaderSize
+  jbe @MediumUpsizeNotLarge
+  mov [rax - 2 * BlockHeaderSize], rdx
+@MediumUpsizeNotLarge:
+  {Save the result}
+  mov r15, rax
+  {Move the data across}
+  mov rdx, rax
+  mov rcx, rsi
+  mov r8, rdi
+{$ifdef UseCustomVariableSizeMoveRoutines}
+  call MoveX16LP
+{$else}
+  call System.Move
+{$endif}
+  {Free the old block}
+  mov rcx, rsi
+  call FastFreeMem
+  {Restore the result}
+  mov rax, r15
+  jmp @Done
+@PossibleLargeBlock:
+  {-----------------------Large block------------------------------}
+  {Is this a valid large block?}
+  test cl, IsFreeBlockFlag + IsMediumBlockFlag
+  jnz @Error
+  mov rcx, rsi
+  call ReallocateLargeBlock
+  jmp @Done
+  {-----------------------Invalid block------------------------------}
+@Error:
+  xor eax, eax
+@Done:
+end;
+{$endif}
+{$endif}
+{$endif}
+
+{Allocates a block and fills it with zeroes}
+function FastAllocMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Cardinal{$endif}): Pointer;
+{$ifndef ASMVersion}
+begin
+  Result := FastGetMem(ASize);
+  {Large blocks are already zero filled}
+  if (Result <> nil) and (ASize <= (MaximumMediumBlockSize - BlockHeaderSize)) then
+    FillChar(Result^, ASize, 0);
+end;
+{$else}
+{$ifdef 32Bit}
+asm
+  push ebx
+  {Get the size rounded down to the previous multiple of 4 into ebx}
+  lea ebx, [eax - 1]
+  and ebx, -4
+  {Get the block}
+  call FastGetMem
+  {Could a block be allocated? ecx = 0 if yes, $ffffffff if no}
+  cmp eax, 1
+  sbb ecx, ecx
+  {Point edx to the last dword}
+  lea edx, [eax + ebx]
+  {ebx = $ffffffff if no block could be allocated, otherwise size rounded down
+   to previous multiple of 4. If ebx = 0 then the block size is 1..4 bytes and
+   the FPU based clearing loop should not be used (since it clears 8 bytes per
+   iteration).}
+  or ebx, ecx
+  jz @ClearLastDWord
+  {Large blocks are already zero filled}
+  cmp ebx, MaximumMediumBlockSize - BlockHeaderSize
+  jae @Done
+  {Make the counter negative based}
+  neg ebx
+  {Load zero into st(0)}
+  fldz
+  {Clear groups of 8 bytes. Block sizes are always four less than a multiple
+   of 8.}
+@FillLoop:
+  fst qword ptr [edx + ebx]
+  add ebx, 8
+  js @FillLoop
+  {Clear st(0)}
+  ffree st(0)
+  {Correct the stack top}
+  fincstp
+  {Clear the last four bytes}
+@ClearLastDWord:
+  mov [edx], ecx
+@Done:
+  pop ebx
+end;
+
+{$else}
+
+{---------------64-bit BASM FastAllocMem---------------}
+asm
+  .params 1
+  .pushnv rbx
+  {Get the size rounded down to the previous multiple of SizeOf(Pointer) into
+   ebx}
+  lea rbx, [rcx - 1]
+  and rbx, -8
+  {Get the block}
+  call FastGetMem
+  {Could a block be allocated? rcx = 0 if yes, -1 if no}
+  cmp rax, 1
+  sbb rcx, rcx
+  {Point rdx to the last dword}
+  lea rdx, [rax + rbx]
+  {rbx = -1 if no block could be allocated, otherwise size rounded down
+   to previous multiple of 8. If rbx = 0 then the block size is 1..8 bytes and
+   the SSE2 based clearing loop should not be used (since it clears 16 bytes per
+   iteration).}
+  or rbx, rcx
+  jz @ClearLastQWord
+  {Large blocks are already zero filled}
+  cmp rbx, MaximumMediumBlockSize - BlockHeaderSize
+  jae @Done
+  {Make the counter negative based}
+  neg rbx
+  {Load zero into xmm0}
+  pxor xmm0, xmm0
+  {Clear groups of 16 bytes. Block sizes are always 8 less than a multiple of
+   16.}
+@FillLoop:
+  movdqa [rdx + rbx], xmm0
+  add rbx, 16
+  js @FillLoop
+  {Clear the last 8 bytes}
+@ClearLastQWord:
+  xor rcx, rcx
+  mov [rdx], rcx
+@Done:
+end;
+{$endif}
+{$endif}
+
+{-----------------Post Uninstall GetMem/FreeMem/ReallocMem-------------------}
+
+{$ifdef DetectMMOperationsAfterUninstall}
+
+function InvalidGetMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer;
+{$ifndef NoMessageBoxes}
+var
+  LErrorMessageTitle: array[0..1023] of AnsiChar;
+{$endif}
+begin
+{$ifdef UseOutputDebugString}
+  OutputDebugStringA(InvalidGetMemMsg);
+{$endif}
+{$ifndef NoMessageBoxes}
+  AppendStringToModuleName(InvalidOperationTitle, LErrorMessageTitle);
+  ShowMessageBox(InvalidGetMemMsg, LErrorMessageTitle);
+{$endif}
+  Result := nil;
+end;
+
+function InvalidFreeMem(APointer: Pointer): Integer;
+{$ifndef NoMessageBoxes}
+var
+  LErrorMessageTitle: array[0..1023] of AnsiChar;
+{$endif}
+begin
+{$ifdef UseOutputDebugString}
+  OutputDebugStringA(InvalidFreeMemMsg);
+{$endif}
+{$ifndef NoMessageBoxes}
+  AppendStringToModuleName(InvalidOperationTitle, LErrorMessageTitle);
+  ShowMessageBox(InvalidFreeMemMsg, LErrorMessageTitle);
+{$endif}
+  Result := -1;
+end;
+
+function InvalidReallocMem(APointer: Pointer; ANewSize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer;
+{$ifndef NoMessageBoxes}
+var
+  LErrorMessageTitle: array[0..1023] of AnsiChar;
+{$endif}
+begin
+{$ifdef UseOutputDebugString}
+  OutputDebugStringA(InvalidReallocMemMsg);
+{$endif}
+{$ifndef NoMessageBoxes}
+  AppendStringToModuleName(InvalidOperationTitle, LErrorMessageTitle);
+  ShowMessageBox(InvalidReallocMemMsg, LErrorMessageTitle);
+{$endif}
+  Result := nil;
+end;
+
+function InvalidAllocMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Cardinal{$endif}): Pointer;
+{$ifndef NoMessageBoxes}
+var
+  LErrorMessageTitle: array[0..1023] of AnsiChar;
+{$endif}
+begin
+{$ifdef UseOutputDebugString}
+  OutputDebugStringA(InvalidAllocMemMsg);
+{$endif}
+{$ifndef NoMessageBoxes}
+  AppendStringToModuleName(InvalidOperationTitle, LErrorMessageTitle);
+  ShowMessageBox(InvalidAllocMemMsg, LErrorMessageTitle);
+{$endif}
+  Result := nil;
+end;
+
+function InvalidRegisterAndUnRegisterMemoryLeak(APointer: Pointer): Boolean;
+begin
+  Result := False;
+end;
+
+{$endif}
+
+{-----------------Full Debug Mode Memory Manager Interface--------------------}
+
+{$ifdef FullDebugMode}
+
+{Compare [AAddress], CompareVal:
+ If Equal: [AAddress] := NewVal and result = CompareVal
+ If Unequal: Result := [AAddress]}
+function LockCmpxchg32(CompareVal, NewVal: Integer; AAddress: PInteger): Integer;
+asm
+{$ifdef 32Bit}
+  {On entry:
+    eax = CompareVal,
+    edx = NewVal,
+    ecx = AAddress}
+  lock cmpxchg [ecx], edx
+{$else}
+.noframe
+  {On entry:
+    ecx = CompareVal,
+    edx = NewVal,
+    r8 = AAddress}
+  mov eax, ecx
+  lock cmpxchg [r8], edx
+{$endif}
+end;
+
+{Called by DebugGetMem, DebugFreeMem and DebugReallocMem in order to block a
+ free block scan operation while the memory pool is being modified.}
+procedure StartChangingFullDebugModeBlock;
+var
+  LOldCount: Integer;
+begin
+  while True do
+  begin
+    {Get the old thread count}
+    LOldCount := ThreadsInFullDebugModeRoutine;
+    if (LOldCount >= 0)
+      and (LockCmpxchg32(LOldCount, LOldCount + 1, @ThreadsInFullDebugModeRoutine) = LOldCount) then
+    begin
+      Break;
+    end;
+  {$ifdef NeverSleepOnThreadContention}
+    {$ifdef UseSwitchToThread}
+    SwitchToThread;
+    {$endif}
+  {$else}
+    Sleep(InitialSleepTime);
+    {Try again}
+    LOldCount := ThreadsInFullDebugModeRoutine;
+    if (LOldCount >= 0)
+      and (LockCmpxchg32(LOldCount, LOldCount + 1, @ThreadsInFullDebugModeRoutine) = LOldCount) then
+    begin
+      Break;
+    end;
+    Sleep(AdditionalSleepTime);
+  {$endif}
+  end;
+end;
+
+procedure DoneChangingFullDebugModeBlock;
+asm
+{$ifdef 32Bit}
+  lock dec ThreadsInFullDebugModeRoutine
+{$else}
+.noframe
+  lea rax, ThreadsInFullDebugModeRoutine
+  lock dec dword ptr [rax]
+{$endif}
+end;
+
+{Increments the allocation number}
+procedure IncrementAllocationNumber;
+asm
+{$ifdef 32Bit}
+  lock inc CurrentAllocationNumber
+{$else}
+.noframe
+  lea rax, CurrentAllocationNumber
+  lock inc dword ptr [rax]
+{$endif}
+end;
+
+{Called by a routine wanting to lock the entire memory pool in FullDebugMode, e.g. before scanning the memory
+ pool for corruptions.}
+procedure BlockFullDebugModeMMRoutines;
+begin
+  while True do
+  begin
+    {Get the old thread count}
+    if LockCmpxchg32(0, -1, @ThreadsInFullDebugModeRoutine) = 0 then
+      Break;
+{$ifdef NeverSleepOnThreadContention}
+  {$ifdef UseSwitchToThread}
+    SwitchToThread;
+  {$endif}
+{$else}
+    Sleep(InitialSleepTime);
+    {Try again}
+    if LockCmpxchg32(0, -1, @ThreadsInFullDebugModeRoutine) = 0 then
+      Break;
+    Sleep(AdditionalSleepTime);
+{$endif}
+  end;
+end;
+
+procedure UnblockFullDebugModeMMRoutines;
+begin
+  {Currently blocked? If so, unblock the FullDebugMode routines.}
+  if ThreadsInFullDebugModeRoutine = -1 then
+    ThreadsInFullDebugModeRoutine := 0;
+end;
+
+procedure DeleteEventLog;
+begin
+  {Delete the file}
+  DeleteFileA(MMLogFileName);
+end;
+
+{Finds the start and length of the file name given a full path.}
+procedure ExtractFileName(APFullPath: PAnsiChar; var APFileNameStart: PAnsiChar; var AFileNameLength: Integer);
+var
+  LChar: AnsiChar;
+begin
+  {Initialize}
+  APFileNameStart := APFullPath;
+  AFileNameLength := 0;
+  {Find the file }
+  while True do
+  begin
+    {Get the next character}
+    LChar := APFullPath^;
+    {End of the path string?}
+    if LChar = #0 then
+      Break;
+    {Advance the buffer position}
+    Inc(APFullPath);
+    {Found a backslash? -> May be the start of the file name}
+    if LChar = '\' then
+      APFileNameStart := APFullPath;
+  end;
+  {Calculate the length of the file name}
+  AFileNameLength := IntPtr(APFullPath) - IntPtr(APFileNameStart);
+end;
+
+procedure AppendEventLog(ABuffer: Pointer; ACount: Cardinal);
+const
+  {Declared here, because it is not declared in the SHFolder.pas unit of some older Delphi versions.}
+  SHGFP_TYPE_CURRENT = 0;
+var
+  LFileHandle, LBytesWritten: Cardinal;
+  LEventHeader: array[0..1023] of AnsiChar;
+  LAlternateLogFileName: array[0..2047] of AnsiChar;
+  LPathLen, LNameLength: Integer;
+  LMsgPtr, LPFileName: PAnsiChar;
+  LSystemTime: TSystemTime;
+begin
+  {Try to open the log file in read/write mode.}
+  LFileHandle := CreateFileA(MMLogFileName, GENERIC_READ or GENERIC_WRITE,
+    0, nil, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+  {Did log file creation fail? If so, the destination folder is perhaps read-only:
+   Try to redirect logging to a file in the user's "My Documents" folder.}
+  if (LFileHandle = INVALID_HANDLE_VALUE)
+{$ifdef Delphi4or5}
+    and SHGetSpecialFolderPathA(0, @LAlternateLogFileName, CSIDL_PERSONAL, True) then
+{$else}
+    and (SHGetFolderPathA(0, CSIDL_PERSONAL or CSIDL_FLAG_CREATE, 0,
+      SHGFP_TYPE_CURRENT, @LAlternateLogFileName) = S_OK) then
+{$endif}
+  begin
+    {Extract the filename part from MMLogFileName and append it to the path of
+     the "My Documents" folder.}
+    LPathLen := StrLen(LAlternateLogFileName);
+    {Ensure that there is a trailing backslash in the path}
+    if (LPathLen = 0) or (LAlternateLogFileName[LPathLen - 1] <> '\') then
+    begin
+      LAlternateLogFileName[LPathLen] := '\';
+      Inc(LPathLen);
+    end;
+    {Add the filename to the path}
+    ExtractFileName(@MMLogFileName, LPFileName, LNameLength);
+    System.Move(LPFileName^, LAlternateLogFileName[LPathLen], LNameLength + 1);
+    {Try to open the alternate log file}
+    LFileHandle := CreateFileA(LAlternateLogFileName, GENERIC_READ or GENERIC_WRITE,
+      0, nil, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+  end;
+  {Was the log file opened/created successfully?}
+  if LFileHandle <> INVALID_HANDLE_VALUE then
+  begin
+    {Seek to the end of the file}
+    SetFilePointer(LFileHandle, 0, nil, FILE_END);
+    {Set the separator}
+    LMsgPtr := AppendStringToBuffer(CRLF, @LEventHeader[0], Length(CRLF));
+    LMsgPtr := AppendStringToBuffer(EventSeparator, LMsgPtr, Length(EventSeparator));
+    {Set the date & time}
+    GetLocalTime(LSystemTime);
+    LMsgPtr := NativeUIntToStrBuf(LSystemTime.wYear, LMsgPtr);
+    LMsgPtr^ := '/';
+    Inc(LMsgPtr);
+    LMsgPtr := NativeUIntToStrBuf(LSystemTime.wMonth, LMsgPtr);
+    LMsgPtr^ := '/';
+    Inc(LMsgPtr);
+    LMsgPtr := NativeUIntToStrBuf(LSystemTime.wDay, LMsgPtr);
+    LMsgPtr^ := ' ';
+    Inc(LMsgPtr);
+    LMsgPtr := NativeUIntToStrBuf(LSystemTime.wHour, LMsgPtr);
+    LMsgPtr^ := ':';
+    Inc(LMsgPtr);
+    if LSystemTime.wMinute < 10 then
+    begin
+      LMsgPtr^ := '0';
+      Inc(LMsgPtr);
+    end;
+    LMsgPtr := NativeUIntToStrBuf(LSystemTime.wMinute, LMsgPtr);
+    LMsgPtr^ := ':';
+    Inc(LMsgPtr);
+    if LSystemTime.wSecond < 10 then
+    begin
+      LMsgPtr^ := '0';
+      Inc(LMsgPtr);
+    end;
+    LMsgPtr := NativeUIntToStrBuf(LSystemTime.WSecond, LMsgPtr);
+    {Write the header}
+    LMsgPtr := AppendStringToBuffer(EventSeparator, LMsgPtr, Length(EventSeparator));
+    LMsgPtr := AppendStringToBuffer(CRLF, LMsgPtr, Length(CRLF));
+    WriteFile(LFileHandle, LEventHeader[0], NativeUInt(LMsgPtr) - NativeUInt(@LEventHeader[0]), LBytesWritten, nil);
+    {Write the data}
+    WriteFile(LFileHandle, ABuffer^, ACount, LBytesWritten, nil);
+    {Close the file}
+    CloseHandle(LFileHandle);
+  end;
+end;
+
+{Sets the default log filename}
+procedure SetDefaultMMLogFileName;
+const
+  LogFileExtAnsi: PAnsiChar = LogFileExtension;
+var
+  LEnvVarLength, LModuleNameLength: Cardinal;
+  LPathOverride: array[0..2047] of AnsiChar;
+  LPFileName: PAnsiChar;
+  LFileNameLength: Integer;
+begin
+  {Get the name of the application}
+  LModuleNameLength := AppendModuleFileName(@MMLogFileName[0]);
+  {Replace the last few characters of the module name, and optionally override
+   the path.}
+  if LModuleNameLength > 0 then
+  begin
+    {Change the filename}
+    System.Move(LogFileExtAnsi^, MMLogFileName[LModuleNameLength - 4],
+      StrLen(LogFileExtAnsi) + 1);
+    {Try to read the FastMMLogFilePath environment variable}
+    LEnvVarLength := GetEnvironmentVariableA('FastMMLogFilePath',
+      @LPathOverride, 1023);
+    {Does the environment variable exist? If so, override the log file path.}
+    if LEnvVarLength > 0 then
+    begin
+      {Ensure that there's a trailing backslash.}
+      if LPathOverride[LEnvVarLength - 1] <> '\' then
+      begin
+        LPathOverride[LEnvVarLength] := '\';
+        Inc(LEnvVarLength);
+      end;
+      {Add the filename to the path override}
+      ExtractFileName(@MMLogFileName[0], LPFileName, LFileNameLength);
+      System.Move(LPFileName^, LPathOverride[LEnvVarLength], LFileNameLength + 1);
+      {Copy the override path back to the filename buffer}
+      System.Move(LPathOverride, MMLogFileName, SizeOf(MMLogFileName) - 1);
+    end;
+  end;
+end;
+
+{Specify the full path and name for the filename to be used for logging memory
+ errors, etc. If ALogFileName is nil or points to an empty string it will
+ revert to the default log file name.}
+procedure SetMMLogFileName(ALogFileName: PAnsiChar = nil);
+var
+  LLogFileNameLen: Integer;
+begin
+  {Is ALogFileName valid?}
+  if (ALogFileName <> nil) and (ALogFileName^ <> #0) then
+  begin
+    LLogFileNameLen := StrLen(ALogFileName);
+    if LLogFileNameLen < Length(MMLogFileName) then
+    begin
+      {Set the log file name}
+      System.Move(ALogFileName^, MMLogFileName, LLogFileNameLen + 1);
+      Exit;
+    end;
+  end;
+  {Invalid log file name}
+  SetDefaultMMLogFileName;
+end;
+
+{Returns the current "allocation group". Whenever a GetMem request is serviced
+ in FullDebugMode, the current "allocation group" is stored in the block header.
+ This may help with debugging. Note that if a block is subsequently reallocated
+ that it keeps its original "allocation group" and "allocation number" (all
+ allocations are also numbered sequentially).}
+function GetCurrentAllocationGroup: Cardinal;
+begin
+  Result := AllocationGroupStack[AllocationGroupStackTop];
+end;
+
+{Allocation groups work in a stack like fashion. Group numbers are pushed onto
+ and popped off the stack. Note that the stack size is limited, so every push
+ should have a matching pop.}
+procedure PushAllocationGroup(ANewCurrentAllocationGroup: Cardinal);
+begin
+  if AllocationGroupStackTop < AllocationGroupStackSize - 1 then
+  begin
+    Inc(AllocationGroupStackTop);
+    AllocationGroupStack[AllocationGroupStackTop] := ANewCurrentAllocationGroup;
+  end
+  else
+  begin
+    {Raise a runtime error if the stack overflows}
+  {$ifdef BCB6OrDelphi7AndUp}
+    System.Error(reInvalidPtr);
+  {$else}
+    System.RunError(reInvalidPtr);
+  {$endif}
+  end;
+end;
+
+procedure PopAllocationGroup;
+begin
+  if AllocationGroupStackTop > 0 then
+  begin
+    Dec(AllocationGroupStackTop);
+  end
+  else
+  begin
+    {Raise a runtime error if the stack underflows}
+  {$ifdef BCB6OrDelphi7AndUp}
+    System.Error(reInvalidPtr);
+  {$else}
+    System.RunError(reInvalidPtr);
+  {$endif}
+  end;
+end;
+
+{Sums all the dwords starting at the given address. ACount must be > 0 and a
+ multiple of SizeOf(Pointer).}
+function SumNativeUInts(AStartValue: NativeUInt; APointer: PNativeUInt;
+  ACount: NativeUInt): NativeUInt;
+asm
+{$ifdef 32Bit}
+  {On entry: eax = AStartValue, edx = APointer; ecx = ACount}
+  add edx, ecx
+  neg ecx
+@AddLoop:
+  add eax, [edx + ecx]
+  add ecx, 4
+  js @AddLoop
+{$else}
+  {On entry: rcx = AStartValue, rdx = APointer; r8 = ACount}
+  add rdx, r8
+  neg r8
+  mov rax, rcx
+@AddLoop:
+  add rax, [rdx + r8]
+  add r8, 8
+  js @AddLoop
+{$endif}
+end;
+
+{Checks the memory starting at the given address for the fill pattern.
+ Returns True if all bytes are all valid. ACount must be >0 and a multiple of
+ SizeOf(Pointer).}
+function CheckFillPattern(APointer: Pointer; ACount: NativeUInt;
+  AFillPattern: NativeUInt): Boolean;
+asm
+{$ifdef 32Bit}
+  {On entry: eax = APointer; edx = ACount; ecx = AFillPattern}
+  add eax, edx
+  neg edx
+@CheckLoop:
+  cmp [eax + edx], ecx
+  jne @Done
+  add edx, 4
+  js @CheckLoop
+@Done:
+  sete al
+{$else}
+  {On entry: rcx = APointer; rdx = ACount; r8 = AFillPattern}
+  add rcx, rdx
+  neg rdx
+@CheckLoop:
+  cmp [rcx + rdx], r8
+  jne @Done
+  add rdx, 8
+  js @CheckLoop
+@Done:
+  sete al
+{$endif}
+end;
+
+{Calculates the checksum for the debug header. Adds all dwords in the debug
+ header to the start address of the block.}
+function CalculateHeaderCheckSum(APointer: PFullDebugBlockHeader): NativeUInt;
+begin
+  Result := SumNativeUInts(
+    NativeUInt(APointer),
+    PNativeUInt(PByte(APointer) + 2 * SizeOf(Pointer)),
+    SizeOf(TFullDebugBlockHeader) - 2 * SizeOf(Pointer) - SizeOf(NativeUInt));
+end;
+
+procedure UpdateHeaderAndFooterCheckSums(APointer: PFullDebugBlockHeader);
+var
+  LHeaderCheckSum: NativeUInt;
+begin
+  LHeaderCheckSum := CalculateHeaderCheckSum(APointer);
+  APointer.HeaderCheckSum := LHeaderCheckSum;
+  PNativeUInt(PByte(APointer) + SizeOf(TFullDebugBlockHeader) + APointer.UserSize)^ := not LHeaderCheckSum;
+end;
+
+function LogCurrentThreadAndStackTrace(ASkipFrames: Cardinal; ABuffer: PAnsiChar): PAnsiChar;
+var
+  LCurrentStackTrace: TStackTrace;
+begin
+  {Get the current call stack}
+  GetStackTrace(@LCurrentStackTrace[0], StackTraceDepth, ASkipFrames);
+  {Log the thread ID}
+  Result := AppendStringToBuffer(CurrentThreadIDMsg, ABuffer, Length(CurrentThreadIDMsg));
+  Result := NativeUIntToHexBuf(GetThreadID, Result);
+  {List the stack trace}
+  Result := AppendStringToBuffer(CurrentStackTraceMsg, Result, Length(CurrentStackTraceMsg));
+  Result := LogStackTrace(@LCurrentStackTrace, StackTraceDepth, Result);
+end;
+
+{$ifndef DisableLoggingOfMemoryDumps}
+function LogMemoryDump(APointer: PFullDebugBlockHeader; ABuffer: PAnsiChar): PAnsiChar;
+var
+  LByteNum, LVal: Cardinal;
+  LDataPtr: PByte;
+begin
+  Result := AppendStringToBuffer(MemoryDumpMsg, ABuffer, Length(MemoryDumpMsg));
+  Result := NativeUIntToHexBuf(NativeUInt(APointer) + SizeOf(TFullDebugBlockHeader), Result);
+  Result^ := ':';
+  Inc(Result);
+  {Add the bytes}
+  LDataPtr := PByte(PByte(APointer) + SizeOf(TFullDebugBlockHeader));
+  for LByteNum := 0 to 255 do
+  begin
+    if LByteNum and 31 = 0 then
+    begin
+      Result^ := #13;
+      Inc(Result);
+      Result^ := #10;
+      Inc(Result);
+    end
+    else
+    begin
+      Result^ := ' ';
+      Inc(Result);
+    end;
+    {Set the hex data}
+    LVal := Byte(LDataPtr^);
+    Result^ := HexTable[LVal shr 4];
+    Inc(Result);
+    Result^ := HexTable[LVal and $f];
+    Inc(Result);
+    {Next byte}
+    Inc(LDataPtr);
+  end;
+  {Dump ASCII}
+  LDataPtr := PByte(PByte(APointer) + SizeOf(TFullDebugBlockHeader));
+  for LByteNum := 0 to 255 do
+  begin
+    if LByteNum and 31 = 0 then
+    begin
+      Result^ := #13;
+      Inc(Result);
+      Result^ := #10;
+      Inc(Result);
+    end
+    else
+    begin
+      Result^ := ' ';
+      Inc(Result);
+      Result^ := ' ';
+      Inc(Result);
+    end;
+    {Set the hex data}
+    LVal := Byte(LDataPtr^);
+    if LVal < 32 then
+      Result^ := '.'
+    else
+      Result^ := AnsiChar(LVal);
+    Inc(Result);
+    {Next byte}
+    Inc(LDataPtr);
+  end;
+end;
+{$endif}
+
+{Rotates AValue ABitCount bits to the right}
+function RotateRight(AValue, ABitCount: NativeUInt): NativeUInt;
+asm
+{$ifdef 32Bit}
+  mov ecx, edx
+  ror eax, cl
+{$else}
+  mov rax, rcx
+  mov rcx, rdx
+  ror rax, cl
+{$endif}
+end;
+
+{Determines whether a byte in the user portion of the freed block has been modified. Does not work beyond
+ the end of the user portion (i.e. footer and beyond).}
+function FreeBlockByteWasModified(APointer: PFullDebugBlockHeader; AUserOffset: NativeUInt): Boolean;
+var
+  LFillPattern: NativeUInt;
+begin
+  {Get the expected fill pattern}
+  if AUserOffset < SizeOf(Pointer) then
+  begin
+    LFillPattern := NativeUInt(@FreedObjectVMT.VMTMethods[0]);
+  end
+  else
+  begin
+{$ifndef CatchUseOfFreedInterfaces}
+    LFillPattern := DebugFillPattern;
+{$else}
+    LFillPattern := NativeUInt(@VMTBadInterface);
+{$endif}
+  end;
+  {Compare the byte value}
+  Result := Byte(PByte(PByte(APointer) + SizeOf(TFullDebugBlockHeader) + AUserOffset)^) <>
+    Byte(RotateRight(LFillPattern, (AUserOffset and (SizeOf(Pointer) - 1)) * 8));
+end;
+
+function LogBlockChanges(APointer: PFullDebugBlockHeader; ABuffer: PAnsiChar): PAnsiChar;
+var
+  LOffset, LChangeStart, LCount: NativeUInt;
+  LLogCount: Integer;
+begin
+  {No errors logged so far}
+  LLogCount := 0;
+  {Log a maximum of 32 changes}
+  LOffset := 0;
+  while (LOffset < APointer.UserSize) and (LLogCount < 32) do
+  begin
+    {Has the byte been modified?}
+    if FreeBlockByteWasModified(APointer, LOffset) then
+    begin
+      {Found the start of a changed block, now find the length}
+      LChangeStart := LOffset;
+      LCount := 0;
+      while True do
+      begin
+        Inc(LCount);
+        Inc(LOffset);
+        if (LOffset >= APointer.UserSize)
+          or (not FreeBlockByteWasModified(APointer, LOffset)) then
+        begin
+          Break;
+        end;
+      end;
+      {Got the offset and length, now log it.}
+      if LLogCount = 0 then
+      begin
+        ABuffer := AppendStringToBuffer(FreeModifiedDetailMsg, ABuffer, Length(FreeModifiedDetailMsg));
+      end
+      else
+      begin
+        ABuffer^ := ',';
+        Inc(ABuffer);
+        ABuffer^ := ' ';
+        Inc(ABuffer);
+      end;
+      ABuffer := NativeUIntToStrBuf(LChangeStart, ABuffer);
+      ABuffer^ := '(';
+      Inc(ABuffer);
+      ABuffer := NativeUIntToStrBuf(LCount, ABuffer);
+      ABuffer^ := ')';
+      Inc(ABuffer);
+      {Increment the log count}
+      Inc(LLogCount);
+    end;
+    {Next byte}
+    Inc(LOffset);
+  end;
+  {Return the current buffer position}
+  Result := ABuffer;
+end;
+
+procedure LogBlockError(APointer: PFullDebugBlockHeader; AOperation: TBlockOperation; LHeaderValid, LFooterValid: Boolean);
+var
+  LMsgPtr: PAnsiChar;
+  LErrorMessage: array[0..32767] of AnsiChar;
+{$ifndef NoMessageBoxes}
+  LErrorMessageTitle: array[0..1023] of AnsiChar;
+{$endif}
+  LClass: TClass;
+  {$ifdef CheckCppObjectTypeEnabled}
+  LCppObjectTypeName: PAnsiChar;
+  {$endif}
+begin
+  {Display the error header and the operation type.}
+  LMsgPtr := AppendStringToBuffer(ErrorMsgHeader, @LErrorMessage[0], Length(ErrorMsgHeader));
+  case AOperation of
+    boGetMem: LMsgPtr := AppendStringToBuffer(GetMemMsg, LMsgPtr, Length(GetMemMsg));
+    boFreeMem: LMsgPtr := AppendStringToBuffer(FreeMemMsg, LMsgPtr, Length(FreeMemMsg));
+    boReallocMem: LMsgPtr := AppendStringToBuffer(ReallocMemMsg, LMsgPtr, Length(ReallocMemMsg));
+    boBlockCheck: LMsgPtr := AppendStringToBuffer(BlockCheckMsg, LMsgPtr, Length(BlockCheckMsg));
+  end;
+  LMsgPtr := AppendStringToBuffer(OperationMsg, LMsgPtr, Length(OperationMsg));
+  {Is the header still intact?}
+  if LHeaderValid then
+  begin
+    {Is the footer still valid?}
+    if LFooterValid then
+    begin
+      {A freed block has been modified, a double free has occurred, or an
+       attempt was made to free a memory block allocated by a different
+       instance of FastMM.}
+      if AOperation <= boGetMem then
+      begin
+        LMsgPtr := AppendStringToBuffer(FreeModifiedErrorMsg, LMsgPtr, Length(FreeModifiedErrorMsg));
+        {Log the exact changes that caused the error.}
+        LMsgPtr := LogBlockChanges(APointer, LMsgPtr);
+      end
+      else
+      begin
+        {It is either a double free, or an attempt was made to free a block
+         that was allocated via a different memory manager.}
+        if APointer.AllocatedByRoutine = nil then
+          LMsgPtr := AppendStringToBuffer(DoubleFreeErrorMsg, LMsgPtr, Length(DoubleFreeErrorMsg))
+        else
+          LMsgPtr := AppendStringToBuffer(WrongMMFreeErrorMsg, LMsgPtr, Length(WrongMMFreeErrorMsg));
+      end;
+    end
+    else
+    begin
+      LMsgPtr := AppendStringToBuffer(BlockFooterCorruptedMsg, LMsgPtr, Length(BlockFooterCorruptedMsg))
+    end;
+    {Set the block size message}
+    if AOperation <= boGetMem then
+      LMsgPtr := AppendStringToBuffer(PreviousBlockSizeMsg, LMsgPtr, Length(PreviousBlockSizeMsg))
+    else
+      LMsgPtr := AppendStringToBuffer(CurrentBlockSizeMsg, LMsgPtr, Length(CurrentBlockSizeMsg));
+    LMsgPtr := NativeUIntToStrBuf(APointer.UserSize, LMsgPtr);
+    {The header is still intact - display info about the this/previous allocation}
+    if APointer.AllocationStackTrace[0] <> 0 then
+    begin
+      if AOperation <= boGetMem then
+        LMsgPtr := AppendStringToBuffer(ThreadIDPrevAllocMsg, LMsgPtr, Length(ThreadIDPrevAllocMsg))
+      else
+        LMsgPtr := AppendStringToBuffer(ThreadIDAtAllocMsg, LMsgPtr, Length(ThreadIDAtAllocMsg));
+      LMsgPtr := NativeUIntToHexBuf(APointer.AllocatedByThread, LMsgPtr);
+      LMsgPtr := AppendStringToBuffer(StackTraceMsg, LMsgPtr, Length(StackTraceMsg));
+      LMsgPtr := LogStackTrace(@APointer.AllocationStackTrace, StackTraceDepth, LMsgPtr);
+    end;
+    {Get the class this block was used for previously}
+    LClass := DetectClassInstance(@APointer.PreviouslyUsedByClass);
+    if (LClass <> nil) and (IntPtr(LClass) <> IntPtr(@FreedObjectVMT.VMTMethods[0])) then
+    begin
+      LMsgPtr := AppendStringToBuffer(PreviousObjectClassMsg, LMsgPtr, Length(PreviousObjectClassMsg));
+      LMsgPtr := AppendClassNameToBuffer(LClass, LMsgPtr);
+    end;
+    {$ifdef CheckCppObjectTypeEnabled}
+    if (LClass = nil) and Assigned(GetCppVirtObjTypeNameByVTablePtrFunc) then
+    begin
+      LCppObjectTypeName := GetCppVirtObjTypeNameByVTablePtrFunc(Pointer(APointer.PreviouslyUsedByClass), 0);
+      if Assigned(LCppObjectTypeName) then
+      begin
+        LMsgPtr := AppendStringToBuffer(PreviousObjectClassMsg, LMsgPtr, Length(PreviousObjectClassMsg));
+        LMsgPtr := AppendStringToBuffer(LCppObjectTypeName, LMsgPtr, StrLen(LCppObjectTypeName));
+      end;
+    end;
+    {$endif}
+    {Get the current class for this block}
+    if (AOperation > boGetMem) and (APointer.AllocatedByRoutine <> nil) then
+    begin
+      LMsgPtr := AppendStringToBuffer(CurrentObjectClassMsg, LMsgPtr, Length(CurrentObjectClassMsg));
+      LClass := DetectClassInstance(Pointer(PByte(APointer) + SizeOf(TFullDebugBlockHeader)));
+      if IntPtr(LClass) = IntPtr(@FreedObjectVMT.VMTMethods[0]) then
+        LClass := nil;
+      {$ifndef CheckCppObjectTypeEnabled}
+      LMsgPtr := AppendClassNameToBuffer(LClass, LMsgPtr);
+      {$else}
+      if (LClass = nil) and Assigned(GetCppVirtObjTypeNameFunc) then
+      begin
+        LCppObjectTypeName := GetCppVirtObjTypeNameFunc(Pointer(PByte(APointer) + SizeOf(TFullDebugBlockHeader)),
+          APointer.UserSize);
+        if LCppObjectTypeName <> nil then
+          LMsgPtr := AppendStringToBuffer(LCppObjectTypeName, LMsgPtr, StrLen(LCppObjectTypeName))
+        else
+          LMsgPtr := AppendClassNameToBuffer(LClass, LMsgPtr);
+      end
+      else
+      begin
+        LMsgPtr := AppendClassNameToBuffer(LClass, LMsgPtr);
+      end;
+      {$endif}
+      {Log the allocation group}
+      if APointer.AllocationGroup > 0 then
+      begin
+        LMsgPtr := AppendStringToBuffer(CurrentAllocationGroupMsg, LMsgPtr, Length(CurrentAllocationGroupMsg));
+        LMsgPtr := NativeUIntToStrBuf(APointer.AllocationGroup, LMsgPtr);
+      end;
+      {Log the allocation number}
+      LMsgPtr := AppendStringToBuffer(CurrentAllocationNumberMsg, LMsgPtr, Length(CurrentAllocationNumberMsg));
+      LMsgPtr := NativeUIntToStrBuf(APointer.AllocationNumber, LMsgPtr);
+    end
+    else
+    begin
+      {Log the allocation group}
+      if APointer.AllocationGroup > 0 then
+      begin
+        LMsgPtr := AppendStringToBuffer(PreviousAllocationGroupMsg, LMsgPtr, Length(PreviousAllocationGroupMsg));
+        LMsgPtr := NativeUIntToStrBuf(APointer.AllocationGroup, LMsgPtr);
+      end;
+      {Log the allocation number}
+      LMsgPtr := AppendStringToBuffer(PreviousAllocationNumberMsg, LMsgPtr, Length(PreviousAllocationNumberMsg));
+      LMsgPtr := NativeUIntToStrBuf(APointer.AllocationNumber, LMsgPtr);
+    end;
+    {Get the call stack for the previous free}
+    if APointer.FreeStackTrace[0] <> 0 then
+    begin
+      LMsgPtr := AppendStringToBuffer(ThreadIDAtFreeMsg, LMsgPtr, Length(ThreadIDAtFreeMsg));
+      LMsgPtr := NativeUIntToHexBuf(APointer.FreedByThread, LMsgPtr);
+      LMsgPtr := AppendStringToBuffer(StackTraceMsg, LMsgPtr, Length(StackTraceMsg));
+      LMsgPtr := LogStackTrace(@APointer.FreeStackTrace, StackTraceDepth, LMsgPtr);
+    end;
+  end
+  else
+  begin
+    {Header has been corrupted}
+    LMsgPtr := AppendStringToBuffer(BlockHeaderCorruptedMsg, LMsgPtr, Length(BlockHeaderCorruptedMsg));
+  end;
+  {Add the current stack trace}
+  LMsgPtr := LogCurrentThreadAndStackTrace(3 + Ord(AOperation <> boGetMem) + Ord(AOperation = boReallocMem), LMsgPtr);
+{$ifndef DisableLoggingOfMemoryDumps}
+  {Add the memory dump}
+  LMsgPtr := LogMemoryDump(APointer, LMsgPtr);
+{$endif}
+  {Trailing CRLF}
+  LMsgPtr^ := #13;
+  Inc(LMsgPtr);
+  LMsgPtr^ := #10;
+  Inc(LMsgPtr);
+  {Trailing #0}
+  LMsgPtr^ := #0;
+{$ifdef LogErrorsToFile}
+  {Log the error}
+  AppendEventLog(@LErrorMessage[0], NativeUInt(LMsgPtr) - NativeUInt(@LErrorMessage[0]));
+{$endif}
+{$ifdef UseOutputDebugString}
+  OutputDebugStringA(LErrorMessage);
+{$endif}
+  {Show the message}
+{$ifndef NoMessageBoxes}
+  AppendStringToModuleName(BlockErrorMsgTitle, LErrorMessageTitle);
+  ShowMessageBox(LErrorMessage, LErrorMessageTitle);
+{$endif}
+end;
+
+{Logs the stack traces for a memory leak to file}
+procedure LogMemoryLeakOrAllocatedBlock(APointer: PFullDebugBlockHeader; IsALeak: Boolean);
+var
+  LHeaderValid: Boolean;
+  LMsgPtr: PAnsiChar;
+  LErrorMessage: array[0..32767] of AnsiChar;
+  LClass: TClass;
+  {$ifdef CheckCppObjectTypeEnabled}
+  LCppObjectTypeName: PAnsiChar;
+  {$endif}
+begin
+  {Display the error header and the operation type.}
+  if IsALeak then
+    LMsgPtr := AppendStringToBuffer(LeakLogHeader, @LErrorMessage[0], Length(LeakLogHeader))
+  else
+    LMsgPtr := AppendStringToBuffer(BlockScanLogHeader, @LErrorMessage[0], Length(BlockScanLogHeader));
+  LMsgPtr := NativeUIntToStrBuf(GetAvailableSpaceInBlock(APointer) - FullDebugBlockOverhead, LMsgPtr);
+  {Is the debug info surrounding the block valid?}
+  LHeaderValid := CalculateHeaderCheckSum(APointer) = APointer.HeaderCheckSum;
+  {Is the header still intact?}
+  if LHeaderValid then
+  begin
+    {The header is still intact - display info about this/previous allocation}
+    if APointer.AllocationStackTrace[0] <> 0 then
+    begin
+      LMsgPtr := AppendStringToBuffer(ThreadIDAtAllocMsg, LMsgPtr, Length(ThreadIDAtAllocMsg));
+      LMsgPtr := NativeUIntToHexBuf(APointer.AllocatedByThread, LMsgPtr);
+      LMsgPtr := AppendStringToBuffer(StackTraceMsg, LMsgPtr, Length(StackTraceMsg));
+      LMsgPtr := LogStackTrace(@APointer.AllocationStackTrace, StackTraceDepth, LMsgPtr);
+    end;
+    LMsgPtr := AppendStringToBuffer(CurrentObjectClassMsg, LMsgPtr, Length(CurrentObjectClassMsg));
+    {Get the current class for this block}
+    LClass := DetectClassInstance(Pointer(PByte(APointer) + SizeOf(TFullDebugBlockHeader)));
+    if IntPtr(LClass) = IntPtr(@FreedObjectVMT.VMTMethods[0]) then
+      LClass := nil;
+    {$ifndef CheckCppObjectTypeEnabled}
+    if LClass <> nil then
+    begin
+      LMsgPtr := AppendClassNameToBuffer(LClass, LMsgPtr);
+    end
+    else
+    begin
+      case DetectStringData(Pointer(PByte(APointer) + SizeOf(TFullDebugBlockHeader)), APointer.UserSize) of
+        stUnknown: LMsgPtr := AppendClassNameToBuffer(nil, LMsgPtr);
+        stAnsiString: LMsgPtr := AppendStringToBuffer(AnsiStringBlockMessage, LMsgPtr, Length(AnsiStringBlockMessage));
+        stUnicodeString: LMsgPtr := AppendStringToBuffer(UnicodeStringBlockMessage, LMsgPtr, Length(UnicodeStringBlockMessage));
+      end;
+    end;
+    {$else}
+    if (LClass = nil) and Assigned(GetCppVirtObjTypeNameFunc) then
+    begin
+      LCppObjectTypeName := GetCppVirtObjTypeNameFunc(Pointer(PByte(APointer) + SizeOf(TFullDebugBlockHeader)),
+        APointer.UserSize);
+      if LCppObjectTypeName <> nil then
+        LMsgPtr := AppendStringToBuffer(LCppObjectTypeName, LMsgPtr, StrLen(LCppObjectTypeName))
+      else
+      begin
+        case DetectStringData(Pointer(PByte(APointer) + SizeOf(TFullDebugBlockHeader)), APointer.UserSize) of
+          stUnknown: LMsgPtr := AppendClassNameToBuffer(nil, LMsgPtr);
+          stAnsiString: LMsgPtr := AppendStringToBuffer(AnsiStringBlockMessage, LMsgPtr, Length(AnsiStringBlockMessage));
+          stUnicodeString: LMsgPtr := AppendStringToBuffer(UnicodeStringBlockMessage, LMsgPtr, Length(UnicodeStringBlockMessage));
+        end;
+      end;
+    end
+    else
+      LMsgPtr := AppendClassNameToBuffer(LClass, LMsgPtr);
+    {$endif}
+    {Log the allocation group}
+    if APointer.AllocationGroup > 0 then
+    begin
+      LMsgPtr := AppendStringToBuffer(CurrentAllocationGroupMsg, LMsgPtr, Length(CurrentAllocationGroupMsg));
+      LMsgPtr := NativeUIntToStrBuf(APointer.AllocationGroup, LMsgPtr);
+    end;
+    {Log the allocation number}
+    LMsgPtr := AppendStringToBuffer(CurrentAllocationNumberMsg, LMsgPtr, Length(CurrentAllocationNumberMsg));
+    LMsgPtr := NativeUIntToStrBuf(APointer.AllocationNumber, LMsgPtr);
+  end
+  else
+  begin
+    {Header has been corrupted}
+    LMsgPtr^ := '.';
+    Inc(LMsgPtr);
+    LMsgPtr^ := ' ';
+    Inc(LMsgPtr);
+    LMsgPtr := AppendStringToBuffer(BlockHeaderCorruptedMsg, LMsgPtr, Length(BlockHeaderCorruptedMsg));
+  end;
+{$ifndef DisableLoggingOfMemoryDumps}
+  {Add the memory dump}
+  LMsgPtr := LogMemoryDump(APointer, LMsgPtr);
+{$endif}
+  {Trailing CRLF}
+  LMsgPtr^ := #13;
+  Inc(LMsgPtr);
+  LMsgPtr^ := #10;
+  Inc(LMsgPtr);
+  {Trailing #0}
+  LMsgPtr^ := #0;
+  {Log the error}
+  AppendEventLog(@LErrorMessage[0], NativeUInt(LMsgPtr) - NativeUInt(@LErrorMessage[0]));
+end;
+
+{Checks that a free block is unmodified}
+function CheckFreeBlockUnmodified(APBlock: PFullDebugBlockHeader; ABlockSize: NativeUInt;
+  AOperation: TBlockOperation): Boolean;
+var
+  LHeaderCheckSum: NativeUInt;
+  LHeaderValid, LFooterValid, LBlockUnmodified: Boolean;
+begin
+  LHeaderCheckSum := CalculateHeaderCheckSum(APBlock);
+  LHeaderValid := LHeaderCheckSum = APBlock.HeaderCheckSum;
+  {Is the footer itself still in place}
+  LFooterValid := LHeaderValid
+    and (PNativeUInt(PByte(APBlock) + SizeOf(TFullDebugBlockHeader) + APBlock.UserSize)^ = (not LHeaderCheckSum));
+  {Is the footer and debug VMT in place? The debug VMT is only valid if the user size is greater than the size of a pointer.}
+  if LFooterValid
+    and (APBlock.UserSize < SizeOf(Pointer)) or (PNativeUInt(PByte(APBlock) + SizeOf(TFullDebugBlockHeader))^ = NativeUInt(@FreedObjectVMT.VMTMethods[0])) then
+  begin
+    {Store the debug fill pattern in place of the footer in order to simplify
+     checking for block modifications.}
+    PNativeUInt(PByte(APBlock) + SizeOf(TFullDebugBlockHeader) + APBlock.UserSize)^ :=
+    {$ifndef CatchUseOfFreedInterfaces}
+      DebugFillPattern;
+    {$else}
+      RotateRight(NativeUInt(@VMTBadInterface), (APBlock.UserSize and (SizeOf(Pointer) - 1)) * 8);
+    {$endif}
+    {Check that all the filler bytes are valid inside the block, except for
+     the "dummy" class header}
+    LBlockUnmodified := CheckFillPattern(PNativeUInt(PByte(APBlock) + (SizeOf(TFullDebugBlockHeader) + SizeOf(Pointer))),
+      ABlockSize - (FullDebugBlockOverhead + SizeOf(Pointer)),
+      {$ifndef CatchUseOfFreedInterfaces}DebugFillPattern{$else}NativeUInt(@VMTBadInterface){$endif});
+    {Reset the old footer}
+    PNativeUInt(PByte(APBlock) + SizeOf(TFullDebugBlockHeader) + APBlock.UserSize)^ := not LHeaderCheckSum;
+  end
+  else
+    LBlockUnmodified := False;
+  if (not LHeaderValid) or (not LFooterValid) or (not LBlockUnmodified) then
+  begin
+    LogBlockError(APBlock, AOperation, LHeaderValid, LFooterValid);
+    Result := False;
+  end
+  else
+    Result := True;
+end;
+
+function DebugGetMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer;
+begin
+  {Scan the entire memory pool first?}
+  if FullDebugModeScanMemoryPoolBeforeEveryOperation then
+    ScanMemoryPoolForCorruptions;
+  {Enter the memory manager: block scans may not be performed now}
+  StartChangingFullDebugModeBlock;
+  try
+    {We need extra space for (a) The debug header, (b) the block debug trailer
+     and (c) the trailing block size pointer for free blocks}
+    Result := FastGetMem(ASize + FullDebugBlockOverhead);
+    if Result <> nil then
+    begin
+      {Large blocks are always newly allocated (and never reused), so checking
+       for a modify-after-free is not necessary.}
+      if (ASize > (MaximumMediumBlockSize - BlockHeaderSize - FullDebugBlockOverhead))
+        or CheckFreeBlockUnmodified(Result, GetAvailableSpaceInBlock(Result) + BlockHeaderSize, boGetMem) then
+      begin
+        {Set the allocation call stack}
+        GetStackTrace(@PFullDebugBlockHeader(Result).AllocationStackTrace, StackTraceDepth, 1);
+        {Set the thread ID of the thread that allocated the block}
+        PFullDebugBlockHeader(Result).AllocatedByThread := GetThreadID;
+        {Block is now in use: It was allocated by this routine}
+        PFullDebugBlockHeader(Result).AllocatedByRoutine := @DebugGetMem;
+        {Set the group number}
+        PFullDebugBlockHeader(Result).AllocationGroup := AllocationGroupStack[AllocationGroupStackTop];
+        {Set the allocation number}
+        IncrementAllocationNumber;
+        PFullDebugBlockHeader(Result).AllocationNumber := CurrentAllocationNumber;
+        {Clear the previous block trailer}
+        PNativeUInt(PByte(Result) + SizeOf(TFullDebugBlockHeader) + PFullDebugBlockHeader(Result).UserSize)^ :=
+        {$ifndef CatchUseOfFreedInterfaces}
+          DebugFillPattern;
+        {$else}
+          RotateRight(NativeUInt(@VMTBadInterface), (PFullDebugBlockHeader(Result).UserSize and (SizeOf(Pointer) - 1)) * 8);
+        {$endif}
+        {Set the user size for the block}
+        PFullDebugBlockHeader(Result).UserSize := ASize;
+        {Set the checksums}
+        UpdateHeaderAndFooterCheckSums(Result);
+        {$ifdef FullDebugModeCallBacks}
+        if Assigned(OnDebugGetMemFinish) then
+          OnDebugGetMemFinish(PFullDebugBlockHeader(Result), ASize);
+        {$endif}
+        {Return the start of the actual block}
+        Result := Pointer(PByte(Result) + SizeOf(TFullDebugBlockHeader));
+{$ifdef EnableMemoryLeakReporting}
+        {Should this block be marked as an expected leak automatically?}
+        if FullDebugModeRegisterAllAllocsAsExpectedMemoryLeak then
+          RegisterExpectedMemoryLeak(Result);
+{$endif}
+      end
+      else
+      begin
+        Result := nil;
+      end;
+    end;
+  finally
+    {Leaving the memory manager routine: Block scans may be performed again.}
+    DoneChangingFullDebugModeBlock;
+  end;
+end;
+
+function CheckBlockBeforeFreeOrRealloc(APBlock: PFullDebugBlockHeader;
+  AOperation: TBlockOperation): Boolean;
+var
+  LHeaderValid, LFooterValid: Boolean;
+  LPFooter: PNativeUInt;
+{$ifndef CatchUseOfFreedInterfaces}
+  LBlockSize: NativeUInt;
+  LPTrailingByte, LPFillPatternEnd: PByte;
+{$endif}
+begin
+  {Is the checksum for the block header valid?}
+  LHeaderValid := CalculateHeaderCheckSum(APBlock) = APBlock.HeaderCheckSum;
+  {If the header is corrupted then the footer is assumed to be corrupt too.}
+  if LHeaderValid then
+  begin
+    {Check the footer checksum: The footer checksum should equal the header
+     checksum with all bits inverted.}
+    LPFooter := PNativeUInt(PByte(APBlock) + SizeOf(TFullDebugBlockHeader) + PFullDebugBlockHeader(APBlock).UserSize);
+    if APBlock.HeaderCheckSum = (not (LPFooter^)) then
+    begin
+      LFooterValid := True;
+{$ifndef CatchUseOfFreedInterfaces}
+      {Large blocks do not have the debug fill pattern, since they are never reused.}
+      if PNativeUInt(PByte(APBlock) - BlockHeaderSize)^ and (IsMediumBlockFlag or IsLargeBlockFlag) <> IsLargeBlockFlag then
+      begin
+        {Check that the application has not modified bytes beyond the block
+         footer. The $80 fill pattern should extend up to 2 nativeints before
+         the start of the next block (leaving space for the free block size and
+         next block header.)}
+        LBlockSize := GetAvailableSpaceInBlock(APBlock);
+        LPFillPatternEnd := PByte(PByte(APBlock) + LBlockSize - SizeOf(Pointer));
+        LPTrailingByte := PByte(PByte(LPFooter) + SizeOf(NativeUInt));
+        while UIntPtr(LPTrailingByte) < UIntPtr(LPFillPatternEnd) do
+        begin
+          if Byte(LPTrailingByte^) <> DebugFillByte then
+          begin
+            LFooterValid := False;
+            Break;
+          end;
+          Inc(LPTrailingByte);
+        end;
+      end;
+{$endif}
+    end
+    else
+      LFooterValid := False;
+  end
+  else
+    LFooterValid := False;
+  {The header and footer must be intact and the block must have been allocated
+   by this memory manager instance.}
+  if LFooterValid and (APBlock.AllocatedByRoutine = @DebugGetMem) then
+  begin
+    Result := True;
+  end
+  else
+  begin
+    {Log the error}
+    LogBlockError(APBlock, AOperation, LHeaderValid, LFooterValid);
+    {Return an error}
+    Result := False;
+  end;
+end;
+
+function DebugFreeMem(APointer: Pointer): Integer;
+var
+  LActualBlock: PFullDebugBlockHeader;
+  LBlockHeader: NativeUInt;
+begin
+  {Scan the entire memory pool first?}
+  if FullDebugModeScanMemoryPoolBeforeEveryOperation then
+    ScanMemoryPoolForCorruptions;
+  {Get a pointer to the start of the actual block}
+  LActualBlock := PFullDebugBlockHeader(PByte(APointer)
+    - SizeOf(TFullDebugBlockHeader));
+  {Is the debug info surrounding the block valid?}
+  if CheckBlockBeforeFreeOrRealloc(LActualBlock, boFreeMem) then
+  begin
+    {Enter the memory manager: block scans may not be performed now}
+    StartChangingFullDebugModeBlock;
+    try
+      {$ifdef FullDebugModeCallBacks}
+      if Assigned(OnDebugFreeMemStart) then
+        OnDebugFreeMemStart(LActualBlock);
+      {$endif}
+      {Large blocks are never reused, so there is no point in updating their
+       headers and fill pattern.}
+      LBlockHeader := PNativeUInt(PByte(LActualBlock) - BlockHeaderSize)^;
+      if LBlockHeader and (IsFreeBlockFlag or IsMediumBlockFlag or IsLargeBlockFlag) <> IsLargeBlockFlag then
+      begin
+        {Get the class the block was used for}
+        LActualBlock.PreviouslyUsedByClass := PNativeUInt(APointer)^;
+        {Set the free call stack}
+        GetStackTrace(@LActualBlock.FreeStackTrace, StackTraceDepth, 1);
+        {Set the thread ID of the thread that freed the block}
+        LActualBlock.FreedByThread := GetThreadID;
+        {Block is now free}
+        LActualBlock.AllocatedByRoutine := nil;
+        {Clear the user area of the block}
+        DebugFillMem(APointer^, LActualBlock.UserSize,
+          {$ifndef CatchUseOfFreedInterfaces}DebugFillPattern{$else}NativeUInt(@VMTBadInterface){$endif});
+        {Set a pointer to the dummy VMT}
+        PNativeUInt(APointer)^ := NativeUInt(@FreedObjectVMT.VMTMethods[0]);
+        {Recalculate the checksums}
+        UpdateHeaderAndFooterCheckSums(LActualBlock);
+      end;
+{$ifdef EnableMemoryLeakReporting}
+      {Automatically deregister the expected memory leak?}
+      if FullDebugModeRegisterAllAllocsAsExpectedMemoryLeak then
+        UnregisterExpectedMemoryLeak(APointer);
+{$endif}
+      {Free the actual block}
+      Result := FastFreeMem(LActualBlock);
+      {$ifdef FullDebugModeCallBacks}
+      if Assigned(OnDebugFreeMemFinish) then
+        OnDebugFreeMemFinish(LActualBlock, Result);
+      {$endif}
+    finally
+      {Leaving the memory manager routine: Block scans may be performed again.}
+      DoneChangingFullDebugModeBlock;
+    end;
+  end
+  else
+  begin
+{$ifdef SuppressFreeMemErrorsInsideException}
+    if {$ifdef BDS2006AndUp}ExceptObject{$else}RaiseList{$endif} <> nil then
+      Result := 0
+    else
+{$endif}
+      Result := -1;
+  end;
+end;
+
+function DebugReallocMem(APointer: Pointer; ANewSize: {$ifdef XE2AndUp}NativeInt{$else}Integer{$endif}): Pointer;
+var
+  LMoveSize, LBlockSpace: NativeUInt;
+  LActualBlock, LNewActualBlock: PFullDebugBlockHeader;
+begin
+  {Scan the entire memory pool first?}
+  if FullDebugModeScanMemoryPoolBeforeEveryOperation then
+    ScanMemoryPoolForCorruptions;
+  {Get a pointer to the start of the actual block}
+  LActualBlock := PFullDebugBlockHeader(PByte(APointer)
+    - SizeOf(TFullDebugBlockHeader));
+  {Is the debug info surrounding the block valid?}
+  if CheckBlockBeforeFreeOrRealloc(LActualBlock, boReallocMem) then
+  begin
+    {Get the current block size}
+    LBlockSpace := GetAvailableSpaceInBlock(LActualBlock);
+    {Can the block fit? We need space for the debug overhead and the block header
+     of the next block}
+    if LBlockSpace < (NativeUInt(ANewSize) + FullDebugBlockOverhead) then
+    begin
+      {Get a new block of the requested size.}
+      Result := DebugGetMem(ANewSize);
+      if Result <> nil then
+      begin
+        {Block scans may not be performed now}
+        StartChangingFullDebugModeBlock;
+        try
+          {$ifdef FullDebugModeCallBacks}
+          if Assigned(OnDebugReallocMemStart) then
+            OnDebugReallocMemStart(LActualBlock, ANewSize);
+          {$endif}
+          {We reuse the old allocation number. Since DebugGetMem always bumps
+           CurrentAllocationGroup, there may be gaps in the sequence of
+           allocation numbers.}
+          LNewActualBlock := PFullDebugBlockHeader(PByte(Result)
+            - SizeOf(TFullDebugBlockHeader));
+          LNewActualBlock.AllocationGroup := LActualBlock.AllocationGroup;
+          LNewActualBlock.AllocationNumber := LActualBlock.AllocationNumber;
+          {Recalculate the header and footer checksums}
+          UpdateHeaderAndFooterCheckSums(LNewActualBlock);
+          {$ifdef FullDebugModeCallBacks}
+          if Assigned(OnDebugReallocMemFinish) then
+            OnDebugReallocMemFinish(LNewActualBlock, ANewSize);
+          {$endif}
+        finally
+          {Block scans can again be performed safely}
+          DoneChangingFullDebugModeBlock;
+        end;
+        {How many bytes to move?}
+        LMoveSize := LActualBlock.UserSize;
+        if LMoveSize > NativeUInt(ANewSize) then
+          LMoveSize := ANewSize;
+        {Move the data across}
+        System.Move(APointer^, Result^, LMoveSize);
+        {Free the old block}
+        DebugFreeMem(APointer);
+      end
+      else
+      begin
+        Result := nil;
+      end;
+    end
+    else
+    begin
+      {Block scans may not be performed now}
+      StartChangingFullDebugModeBlock;
+      try
+        {$ifdef FullDebugModeCallBacks}
+        if Assigned(OnDebugReallocMemStart) then
+          OnDebugReallocMemStart(LActualBlock, ANewSize);
+        {$endif}
+        {Clear all data after the new end of the block up to the old end of the
+         block, including the trailer.}
+        DebugFillMem(Pointer(PByte(APointer) + NativeUInt(ANewSize) + SizeOf(NativeUInt))^,
+          NativeInt(LActualBlock.UserSize) - ANewSize,
+{$ifndef CatchUseOfFreedInterfaces}
+          DebugFillPattern);
+{$else}
+          RotateRight(NativeUInt(@VMTBadInterface), (ANewSize and (SizeOf(Pointer) - 1)) * 8));
+{$endif}
+        {Update the user size}
+        LActualBlock.UserSize := ANewSize;
+        {Set the new checksums}
+        UpdateHeaderAndFooterCheckSums(LActualBlock);
+        {$ifdef FullDebugModeCallBacks}
+        if Assigned(OnDebugReallocMemFinish) then
+          OnDebugReallocMemFinish(LActualBlock, ANewSize);
+        {$endif}
+      finally
+        {Block scans can again be performed safely}
+        DoneChangingFullDebugModeBlock;
+      end;
+      {Return the old pointer}
+      Result := APointer;
+    end;
+  end
+  else
+  begin
+    Result := nil;
+  end;
+end;
+
+{Allocates a block and fills it with zeroes}
+function DebugAllocMem(ASize: {$ifdef XE2AndUp}NativeInt{$else}Cardinal{$endif}): Pointer;
+begin
+  Result := DebugGetMem(ASize);
+  {Clear the block}
+  if Result <>  nil then
+    FillChar(Result^, ASize, 0);
+end;
+
+{Raises a runtime error if a memory corruption was encountered. Subroutine for
+ InternalScanMemoryPool and InternalScanSmallBlockPool.}
+procedure RaiseMemoryCorruptionError;
+begin
+  {Disable exhaustive checking in order to prevent recursive exceptions.}
+  FullDebugModeScanMemoryPoolBeforeEveryOperation := False;
+  {Unblock the memory manager in case the creation of the exception below
+   causes an attempt to be made to allocate memory.}
+  UnblockFullDebugModeMMRoutines;
+  {Raise the runtime error}
+{$ifdef BCB6OrDelphi7AndUp}
+  System.Error(reOutOfMemory);
+{$else}
+  System.RunError(reOutOfMemory);
+{$endif}
+end;
+
+{Subroutine for InternalScanMemoryPool: Checks the given small block pool for
+ allocated blocks}
+procedure InternalScanSmallBlockPool(APSmallBlockPool: PSmallBlockPoolHeader;
+  AFirstAllocationGroupToLog, ALastAllocationGroupToLog: Cardinal);
+var
+  LCurPtr, LEndPtr: Pointer;
+begin
+  {Get the first and last pointer for the pool}
+  GetFirstAndLastSmallBlockInPool(APSmallBlockPool, LCurPtr, LEndPtr);
+  {Step through all blocks}
+  while UIntPtr(LCurPtr) <= UIntPtr(LEndPtr) do
+  begin
+    {Is this block in use? If so, is the debug info intact?}
+    if ((PNativeUInt(PByte(LCurPtr) - BlockHeaderSize)^ and IsFreeBlockFlag) = 0) then
+    begin
+      if CheckBlockBeforeFreeOrRealloc(LCurPtr, boBlockCheck) then
+      begin
+        if (PFullDebugBlockHeader(LCurPtr).AllocationGroup >= AFirstAllocationGroupToLog)
+          and (PFullDebugBlockHeader(LCurPtr).AllocationGroup <= ALastAllocationGroupToLog) then
+        begin
+          LogMemoryLeakOrAllocatedBlock(LCurPtr, False);
+        end;
+      end
+      else
+        RaiseMemoryCorruptionError;
+    end
+    else
+    begin
+      {Check that the block has not been modified since being freed}
+      if not CheckFreeBlockUnmodified(LCurPtr, APSmallBlockPool.BlockType.BlockSize, boBlockCheck) then
+        RaiseMemoryCorruptionError;
+    end;
+    {Next block}
+    Inc(PByte(LCurPtr), APSmallBlockPool.BlockType.BlockSize);
+  end;
+end;
+
+{Subroutine for LogAllocatedBlocksToFile and ScanMemoryPoolForCorruptions:
+ Scans the memory pool for corruptions and optionally logs allocated blocks
+ in the allocation group range.}
+procedure InternalScanMemoryPool(AFirstAllocationGroupToLog, ALastAllocationGroupToLog: Cardinal);
+var
+  LPLargeBlock: PLargeBlockHeader;
+  LPMediumBlock: Pointer;
+  LPMediumBlockPoolHeader: PMediumBlockPoolHeader;
+  LMediumBlockHeader: NativeUInt;
+begin
+  {Block all the memory manager routines while performing the scan. No memory
+   block may be allocated or freed, and no FullDebugMode block header or
+   footer may be modified, while the scan is in progress.}
+  BlockFullDebugModeMMRoutines;
+  try
+    {Step through all the medium block pools}
+    LPMediumBlockPoolHeader := MediumBlockPoolsCircularList.NextMediumBlockPoolHeader;
+    while LPMediumBlockPoolHeader <> @MediumBlockPoolsCircularList do
+    begin
+      LPMediumBlock := GetFirstMediumBlockInPool(LPMediumBlockPoolHeader);
+      while LPMediumBlock <> nil do
+      begin
+        LMediumBlockHeader := PNativeUInt(PByte(LPMediumBlock) - BlockHeaderSize)^;
+        {Is the block in use?}
+        if LMediumBlockHeader and IsFreeBlockFlag = 0 then
+        begin
+          {Block is in use: Is it a medium block or small block pool?}
+          if (LMediumBlockHeader and IsSmallBlockPoolInUseFlag) <> 0 then
+          begin
+            {Get all the leaks for the small block pool}
+            InternalScanSmallBlockPool(LPMediumBlock, AFirstAllocationGroupToLog, ALastAllocationGroupToLog);
+          end
+          else
+          begin
+            if CheckBlockBeforeFreeOrRealloc(LPMediumBlock, boBlockCheck) then
+            begin
+              if (PFullDebugBlockHeader(LPMediumBlock).AllocationGroup >= AFirstAllocationGroupToLog)
+                and (PFullDebugBlockHeader(LPMediumBlock).AllocationGroup <= ALastAllocationGroupToLog) then
+              begin
+                LogMemoryLeakOrAllocatedBlock(LPMediumBlock, False);
+              end;
+            end
+            else
+              RaiseMemoryCorruptionError;
+          end;
+        end
+        else
+        begin
+          {Check that the block has not been modified since being freed}
+          if not CheckFreeBlockUnmodified(LPMediumBlock, LMediumBlockHeader and DropMediumAndLargeFlagsMask, boBlockCheck) then
+            RaiseMemoryCorruptionError;
+        end;
+        {Next medium block}
+        LPMediumBlock := NextMediumBlock(LPMediumBlock);
+      end;
+      {Get the next medium block pool}
+      LPMediumBlockPoolHeader := LPMediumBlockPoolHeader.NextMediumBlockPoolHeader;
+    end;
+    {Scan large blocks}
+    LPLargeBlock := LargeBlocksCircularList.NextLargeBlockHeader;
+    while LPLargeBlock <> @LargeBlocksCircularList do
+    begin
+      if CheckBlockBeforeFreeOrRealloc(Pointer(PByte(LPLargeBlock) + LargeBlockHeaderSize), boBlockCheck) then
+      begin
+        if (PFullDebugBlockHeader(PByte(LPLargeBlock) + LargeBlockHeaderSize).AllocationGroup >= AFirstAllocationGroupToLog)
+          and (PFullDebugBlockHeader(PByte(LPLargeBlock) + LargeBlockHeaderSize).AllocationGroup <= ALastAllocationGroupToLog) then
+        begin
+          LogMemoryLeakOrAllocatedBlock(Pointer(PByte(LPLargeBlock) + LargeBlockHeaderSize), False);
+        end;
+      end
+      else
+        RaiseMemoryCorruptionError;
+      {Get the next large block}
+      LPLargeBlock := LPLargeBlock.NextLargeBlockHeader;
+    end;
+  finally
+    {Unblock the FullDebugMode memory manager routines.}
+    UnblockFullDebugModeMMRoutines;
+  end;
+end;
+
+{Logs detail about currently allocated memory blocks for the specified range of
+ allocation groups. if ALastAllocationGroupToLog is less than
+ AFirstAllocationGroupToLog or it is zero, then all allocation groups are
+ logged. This routine also checks the memory pool for consistency at the same
+ time, raising an "Out of Memory" error if the check fails.}
+procedure LogAllocatedBlocksToFile(AFirstAllocationGroupToLog, ALastAllocationGroupToLog: Cardinal);
+begin
+  {Validate input}
+  if (ALastAllocationGroupToLog = 0) or (ALastAllocationGroupToLog < AFirstAllocationGroupToLog) then
+  begin
+    {Bad input: log all groups}
+    AFirstAllocationGroupToLog := 0;
+    ALastAllocationGroupToLog := $ffffffff;
+  end;
+  {Scan the memory pool, logging allocated blocks in the requested range.}
+  InternalScanMemoryPool(AFirstAllocationGroupToLog, ALastAllocationGroupToLog);
+end;
+
+{Scans the memory pool for any corruptions. If a corruption is encountered an "Out of Memory" exception is
+ raised.}
+procedure ScanMemoryPoolForCorruptions;
+begin
+  {Scan the memory pool for corruptions, but don't log any allocated blocks}
+  InternalScanMemoryPool($ffffffff, 0);
+end;
+
+{-----------------------Invalid Virtual Method Calls-------------------------}
+
+{ TFreedObject }
+
+{Used to determine the index of the virtual method call on the freed object.
+ Do not change this without updating MaxFakeVMTEntries. Currently 200.}
+procedure TFreedObject.GetVirtualMethodIndex;
+asm
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+  Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex); Inc(VMIndex);
+
+  jmp TFreedObject.VirtualMethodError
+end;
+
+procedure TFreedObject.VirtualMethodError;
+var
+  LVMOffset: Integer;
+  LMsgPtr: PAnsiChar;
+  LErrorMessage: array[0..32767] of AnsiChar;
+{$ifndef NoMessageBoxes}
+  LErrorMessageTitle: array[0..1023] of AnsiChar;
+{$endif}
+  LClass: TClass;
+  LActualBlock: PFullDebugBlockHeader;
+begin
+  {Get the offset of the virtual method}
+  LVMOffset := (MaxFakeVMTEntries - VMIndex) * SizeOf(Pointer) + vmtParent + SizeOf(Pointer);
+  {Reset the index for the next error}
+  VMIndex := 0;
+  {Get the address of the actual block}
+  LActualBlock := PFullDebugBlockHeader(PByte(Self) - SizeOf(TFullDebugBlockHeader));
+  {Display the error header}
+  LMsgPtr := AppendStringToBuffer(VirtualMethodErrorHeader, @LErrorMessage[0], Length(VirtualMethodErrorHeader));
+  {Is the debug info surrounding the block valid?}
+  if CalculateHeaderCheckSum(LActualBlock) = LActualBlock.HeaderCheckSum then
+  begin
+    {Get the class this block was used for previously}
+    LClass := DetectClassInstance(@LActualBlock.PreviouslyUsedByClass);
+    if (LClass <> nil) and (IntPtr(LClass) <> IntPtr(@FreedObjectVMT.VMTMethods[0])) then
+    begin
+      LMsgPtr := AppendStringToBuffer(FreedObjectClassMsg, LMsgPtr, Length(FreedObjectClassMsg));
+      LMsgPtr := AppendClassNameToBuffer(LClass, LMsgPtr);
+    end;
+    {Get the virtual method name}
+    LMsgPtr := AppendStringToBuffer(VirtualMethodName, LMsgPtr, Length(VirtualMethodName));
+    if LVMOffset < 0 then
+    begin
+      LMsgPtr := AppendStringToBuffer(StandardVirtualMethodNames[LVMOffset div SizeOf(Pointer)], LMsgPtr, Length(StandardVirtualMethodNames[LVMOffset div SizeOf(Pointer)]));
+    end
+    else
+    begin
+      LMsgPtr := AppendStringToBuffer(VirtualMethodOffset, LMsgPtr, Length(VirtualMethodOffset));
+      LMsgPtr := NativeUIntToStrBuf(LVMOffset, LMsgPtr);
+    end;
+    {Virtual method address}
+    if (LClass <> nil) and (IntPtr(LClass) <> IntPtr(@FreedObjectVMT.VMTMethods[0])) then
+    begin
+      LMsgPtr := AppendStringToBuffer(VirtualMethodAddress, LMsgPtr, Length(VirtualMethodAddress));
+      LMsgPtr := NativeUIntToHexBuf(PNativeUInt(PByte(LClass) + LVMOffset)^, LMsgPtr);
+    end;
+    {Log the allocation group}
+    if LActualBlock.AllocationGroup > 0 then
+    begin
+      LMsgPtr := AppendStringToBuffer(PreviousAllocationGroupMsg, LMsgPtr, Length(PreviousAllocationGroupMsg));
+      LMsgPtr := NativeUIntToStrBuf(LActualBlock.AllocationGroup, LMsgPtr);
+    end;
+    {Log the allocation number}
+    LMsgPtr := AppendStringToBuffer(PreviousAllocationNumberMsg, LMsgPtr, Length(PreviousAllocationNumberMsg));
+    LMsgPtr := NativeUIntToStrBuf(LActualBlock.AllocationNumber, LMsgPtr);
+    {The header is still intact - display info about the this/previous allocation}
+    if LActualBlock.AllocationStackTrace[0] <> 0 then
+    begin
+      LMsgPtr := AppendStringToBuffer(ThreadIDAtObjectAllocMsg, LMsgPtr, Length(ThreadIDAtObjectAllocMsg));
+      LMsgPtr := NativeUIntToHexBuf(LActualBlock.AllocatedByThread, LMsgPtr);
+      LMsgPtr := AppendStringToBuffer(StackTraceMsg, LMsgPtr, Length(StackTraceMsg));
+      LMsgPtr := LogStackTrace(@LActualBlock.AllocationStackTrace, StackTraceDepth, LMsgPtr);
+    end;
+    {Get the call stack for the previous free}
+    if LActualBlock.FreeStackTrace[0] <> 0 then
+    begin
+      LMsgPtr := AppendStringToBuffer(ThreadIDAtObjectFreeMsg, LMsgPtr, Length(ThreadIDAtObjectFreeMsg));
+      LMsgPtr := NativeUIntToHexBuf(LActualBlock.FreedByThread, LMsgPtr);
+      LMsgPtr := AppendStringToBuffer(StackTraceMsg, LMsgPtr, Length(StackTraceMsg));
+      LMsgPtr := LogStackTrace(@LActualBlock.FreeStackTrace, StackTraceDepth, LMsgPtr);
+    end;
+  end
+  else
+  begin
+    {Header has been corrupted}
+    LMsgPtr := AppendStringToBuffer(BlockHeaderCorruptedNoHistoryMsg, LMsgPtr, Length(BlockHeaderCorruptedNoHistoryMsg));
+  end;
+  {Add the current stack trace}
+  LMsgPtr := LogCurrentThreadAndStackTrace(2, LMsgPtr);
+{$ifndef DisableLoggingOfMemoryDumps}
+  {Add the pointer address}
+  LMsgPtr := LogMemoryDump(LActualBlock, LMsgPtr);
+{$endif}
+  {Trailing CRLF}
+  LMsgPtr^ := #13;
+  Inc(LMsgPtr);
+  LMsgPtr^ := #10;
+  Inc(LMsgPtr);
+  {Trailing #0}
+  LMsgPtr^ := #0;
+{$ifdef LogErrorsToFile}
+  {Log the error}
+  AppendEventLog(@LErrorMessage[0], NativeUInt(LMsgPtr) - NativeUInt(@LErrorMessage[0]));
+{$endif}
+{$ifdef UseOutputDebugString}
+  OutputDebugStringA(LErrorMessage);
+{$endif}
+{$ifndef NoMessageBoxes}
+  {Show the message}
+  AppendStringToModuleName(BlockErrorMsgTitle, LErrorMessageTitle);
+  ShowMessageBox(LErrorMessage, LErrorMessageTitle);
+{$endif}
+  {Raise an access violation}
+  RaiseException(EXCEPTION_ACCESS_VIOLATION, 0, 0, nil);
+end;
+
+{$ifdef CatchUseOfFreedInterfaces}
+procedure TFreedObject.InterfaceError;
+var
+  LMsgPtr: PAnsiChar;
+{$ifndef NoMessageBoxes}
+  LErrorMessageTitle: array[0..1023] of AnsiChar;
+{$endif}
+  LErrorMessage: array[0..4000] of AnsiChar;
+begin
+  {Display the error header}
+  LMsgPtr := AppendStringToBuffer(InterfaceErrorHeader, @LErrorMessage[0], Length(InterfaceErrorHeader));
+  {Add the current stack trace}
+  LMsgPtr := LogCurrentThreadAndStackTrace(2, LMsgPtr);
+  {Trailing CRLF}
+  LMsgPtr^ := #13;
+  Inc(LMsgPtr);
+  LMsgPtr^ := #10;
+  Inc(LMsgPtr);
+  {Trailing #0}
+  LMsgPtr^ := #0;
+{$ifdef LogErrorsToFile}
+  {Log the error}
+  AppendEventLog(@LErrorMessage[0], NativeUInt(LMsgPtr) - NativeUInt(@LErrorMessage[0]));
+{$endif}
+{$ifdef UseOutputDebugString}
+  OutputDebugStringA(LErrorMessage);
+{$endif}
+{$ifndef NoMessageBoxes}
+  {Show the message}
+  AppendStringToModuleName(BlockErrorMsgTitle, LErrorMessageTitle);
+  ShowMessageBox(LErrorMessage, LErrorMessageTitle);
+{$endif}
+  {Raise an access violation}
+  RaiseException(EXCEPTION_ACCESS_VIOLATION, 0, 0, nil);
+end;
+{$endif}
+
+{$endif}
+
+{----------------------------Memory Leak Checking-----------------------------}
+
+{$ifdef EnableMemoryLeakReporting}
+
+{Adds a leak to the specified list}
+function UpdateExpectedLeakList(APLeakList: PPExpectedMemoryLeak;
+  APNewEntry: PExpectedMemoryLeak; AExactSizeMatch: Boolean = True): Boolean;
+var
+  LPInsertAfter, LPNewEntry: PExpectedMemoryLeak;
+begin
+  {Default to error}
+  Result := False;
+  {Find the insertion spot}
+  LPInsertAfter := APLeakList^;
+  while LPInsertAfter <> nil do
+  begin
+    {Too big?}
+    if LPInsertAfter.LeakSize > APNewEntry.LeakSize then
+    begin
+      LPInsertAfter := LPInsertAfter.PreviousLeak;
+      Break;
+    end;
+    {Find a matching entry. If an exact size match is not required and the leak
+     is larger than the current entry, use it if the expected size of the next
+     entry is too large.}
+    if (IntPtr(LPInsertAfter.LeakAddress) = IntPtr(APNewEntry.LeakAddress))
+      and ((IntPtr(LPInsertAfter.LeakedClass) = IntPtr(APNewEntry.LeakedClass))
+      {$ifdef CheckCppObjectTypeEnabled}
+       or (LPInsertAfter.LeakedCppTypeIdPtr = APNewEntry.LeakedCppTypeIdPtr)
+      {$endif}
+      )
+      and ((LPInsertAfter.LeakSize = APNewEntry.LeakSize)
+        or ((not AExactSizeMatch)
+          and (LPInsertAfter.LeakSize < APNewEntry.LeakSize)
+          and ((LPInsertAfter.NextLeak = nil)
+            or (LPInsertAfter.NextLeak.LeakSize > APNewEntry.LeakSize))
+          )) then
+    begin
+      if (LPInsertAfter.LeakCount + APNewEntry.LeakCount) >= 0 then
+      begin
+        Inc(LPInsertAfter.LeakCount, APNewEntry.LeakCount);
+        {Is the count now 0?}
+        if LPInsertAfter.LeakCount = 0 then
+        begin
+          {Delete the entry}
+          if LPInsertAfter.NextLeak <> nil then
+            LPInsertAfter.NextLeak.PreviousLeak := LPInsertAfter.PreviousLeak;
+          if LPInsertAfter.PreviousLeak <> nil then
+            LPInsertAfter.PreviousLeak.NextLeak := LPInsertAfter.NextLeak
+          else
+            APLeakList^ := LPInsertAfter.NextLeak;
+          {Insert it as the first free slot}
+          LPInsertAfter.NextLeak := ExpectedMemoryLeaks.FirstFreeSlot;
+          ExpectedMemoryLeaks.FirstFreeSlot := LPInsertAfter;
+        end;
+        Result := True;
+      end;
+      Exit;
+    end;
+    {Next entry}
+    if LPInsertAfter.NextLeak <> nil then
+      LPInsertAfter := LPInsertAfter.NextLeak
+    else
+      Break;
+  end;
+  if APNewEntry.LeakCount > 0 then
+  begin
+    {Get a position for the entry}
+    LPNewEntry := ExpectedMemoryLeaks.FirstFreeSlot;
+    if LPNewEntry <> nil then
+    begin
+      ExpectedMemoryLeaks.FirstFreeSlot := LPNewEntry.NextLeak;
+    end
+    else
+    begin
+      if ExpectedMemoryLeaks.EntriesUsed < Length(ExpectedMemoryLeaks.ExpectedLeaks) then
+      begin
+        LPNewEntry := @ExpectedMemoryLeaks.ExpectedLeaks[ExpectedMemoryLeaks.EntriesUsed];
+        Inc(ExpectedMemoryLeaks.EntriesUsed);
+      end
+      else
+      begin
+        {No more space}
+        Exit;
+      end;
+    end;
+    {Set the entry}
+    LPNewEntry^ := APNewEntry^;
+    {Insert it into the list}
+    LPNewEntry.PreviousLeak := LPInsertAfter;
+    if LPInsertAfter <> nil then
+    begin
+      LPNewEntry.NextLeak := LPInsertAfter.NextLeak;
+      if LPNewEntry.NextLeak <> nil then
+        LPNewEntry.NextLeak.PreviousLeak := LPNewEntry;
+      LPInsertAfter.NextLeak := LPNewEntry;
+    end
+    else
+    begin
+      LPNewEntry.NextLeak := APLeakList^;
+      if LPNewEntry.NextLeak <> nil then
+        LPNewEntry.NextLeak.PreviousLeak := LPNewEntry;
+      APLeakList^ := LPNewEntry;
+    end;
+    Result := True;
+  end;
+end;
+
+{Locks the expected leaks. Returns false if the list could not be allocated.}
+function LockExpectedMemoryLeaksList: Boolean;
+begin
+  {Lock the expected leaks list}
+{$ifndef AssumeMultiThreaded}
+  if IsMultiThread then
+{$endif}
+  begin
+    while LockCmpxchg(0, 1, @ExpectedMemoryLeaksListLocked) <> 0 do
+    begin
+{$ifdef NeverSleepOnThreadContention}
+  {$ifdef UseSwitchToThread}
+      SwitchToThread;
+  {$endif}
+{$else}
+      Sleep(InitialSleepTime);
+      if LockCmpxchg(0, 1, @ExpectedMemoryLeaksListLocked) = 0 then
+        Break;
+      Sleep(AdditionalSleepTime);
+{$endif}
+    end;
+  end;
+  {Allocate the list if it does not exist}
+  if ExpectedMemoryLeaks = nil then
+    ExpectedMemoryLeaks := VirtualAlloc(nil, ExpectedMemoryLeaksListSize, MEM_COMMIT, PAGE_READWRITE);
+  {Done}
+  Result := ExpectedMemoryLeaks <> nil;
+end;
+
+{Registers expected memory leaks. Returns true on success. The list of leaked
+ blocks is limited, so failure is possible if the list is full.}
+function RegisterExpectedMemoryLeak(ALeakedPointer: Pointer): Boolean; overload;
+var
+  LNewEntry: TExpectedMemoryLeak;
+begin
+  {Fill out the structure}
+{$ifndef FullDebugMode}
+  LNewEntry.LeakAddress := ALeakedPointer;
+{$else}
+  LNewEntry.LeakAddress := Pointer(PByte(ALeakedPointer) - SizeOf(TFullDebugBlockHeader));
+{$endif}
+  LNewEntry.LeakedClass := nil;
+  {$ifdef CheckCppObjectTypeEnabled}
+  LNewEntry.LeakedCppTypeIdPtr := nil;
+  {$endif}
+  LNewEntry.LeakSize := 0;
+  LNewEntry.LeakCount := 1;
+  {Add it to the correct list}
+  Result := LockExpectedMemoryLeaksList
+    and UpdateExpectedLeakList(@ExpectedMemoryLeaks.FirstEntryByAddress, @LNewEntry);
+  ExpectedMemoryLeaksListLocked := False;
+end;
+
+function RegisterExpectedMemoryLeak(ALeakedObjectClass: TClass; ACount: Integer = 1): Boolean; overload;
+var
+  LNewEntry: TExpectedMemoryLeak;
+begin
+  {Fill out the structure}
+  LNewEntry.LeakAddress := nil;
+  LNewEntry.LeakedClass := ALeakedObjectClass;
+  {$ifdef CheckCppObjectTypeEnabled}
+  LNewEntry.LeakedCppTypeIdPtr := nil;
+  {$endif}
+  LNewEntry.LeakSize := ALeakedObjectClass.InstanceSize;
+  LNewEntry.LeakCount := ACount;
+  {Add it to the correct list}
+  Result := LockExpectedMemoryLeaksList
+    and UpdateExpectedLeakList(@ExpectedMemoryLeaks.FirstEntryByClass, @LNewEntry);
+  ExpectedMemoryLeaksListLocked := False;
+end;
+
+{$ifdef CheckCppObjectTypeEnabled}
+function RegisterExpectedMemoryLeak(ALeakedCppVirtObjTypeIdPtr: Pointer; ACount: Integer): Boolean; overload;
+var
+  LNewEntry: TExpectedMemoryLeak;
+begin
+  {Fill out the structure}
+  if Assigned(GetCppVirtObjSizeByTypeIdPtrFunc) then
+  begin
+    //Return 0 if not a proper type
+    LNewEntry.LeakSize := GetCppVirtObjSizeByTypeIdPtrFunc(ALeakedCppVirtObjTypeIdPtr);
+    if LNewEntry.LeakSize > 0 then
+    begin
+      LNewEntry.LeakAddress := nil;
+      LNewEntry.LeakedClass := nil;
+      LNewEntry.LeakedCppTypeIdPtr := ALeakedCppVirtObjTypeIdPtr;
+      LNewEntry.LeakCount := ACount;
+      {Add it to the correct list}
+      Result := LockExpectedMemoryLeaksList
+        and UpdateExpectedLeakList(@ExpectedMemoryLeaks.FirstEntryByClass, @LNewEntry);
+      ExpectedMemoryLeaksListLocked := False;
+    end
+    else
+    begin
+      Result := False;
+    end;
+  end
+  else
+  begin
+    Result := False;
+  end;
+end;
+{$endif}
+
+function RegisterExpectedMemoryLeak(ALeakedBlockSize: NativeInt; ACount: Integer = 1): Boolean; overload;
+var
+  LNewEntry: TExpectedMemoryLeak;
+begin
+  {Fill out the structure}
+  LNewEntry.LeakAddress := nil;
+  LNewEntry.LeakedClass := nil;
+  {$ifdef CheckCppObjectTypeEnabled}
+  LNewEntry.LeakedCppTypeIdPtr := nil;
+  {$endif}
+  LNewEntry.LeakSize := ALeakedBlockSize;
+  LNewEntry.LeakCount := ACount;
+  {Add it to the correct list}
+  Result := LockExpectedMemoryLeaksList
+    and UpdateExpectedLeakList(@ExpectedMemoryLeaks.FirstEntryBySizeOnly, @LNewEntry);
+  ExpectedMemoryLeaksListLocked := False;
+end;
+
+function UnregisterExpectedMemoryLeak(ALeakedPointer: Pointer): Boolean; overload;
+var
+  LNewEntry: TExpectedMemoryLeak;
+begin
+  {Fill out the structure}
+{$ifndef FullDebugMode}
+  LNewEntry.LeakAddress := ALeakedPointer;
+{$else}
+  LNewEntry.LeakAddress := Pointer(PByte(ALeakedPointer) - SizeOf(TFullDebugBlockHeader));
+{$endif}
+  LNewEntry.LeakedClass := nil;
+  {$ifdef CheckCppObjectTypeEnabled}
+  LNewEntry.LeakedCppTypeIdPtr := nil;
+  {$endif}
+  LNewEntry.LeakSize := 0;
+  LNewEntry.LeakCount := -1;
+  {Remove it from the list}
+  Result := LockExpectedMemoryLeaksList
+    and UpdateExpectedLeakList(@ExpectedMemoryLeaks.FirstEntryByAddress, @LNewEntry);
+  ExpectedMemoryLeaksListLocked := False;
+end;
+
+function UnregisterExpectedMemoryLeak(ALeakedObjectClass: TClass; ACount: Integer = 1): Boolean; overload;
+begin
+  Result := RegisterExpectedMemoryLeak(ALeakedObjectClass, - ACount);
+end;
+
+{$ifdef CheckCppObjectTypeEnabled}
+function UnregisterExpectedMemoryLeak(ALeakedCppVirtObjTypeIdPtr: Pointer; ACount: Integer): Boolean; overload;
+begin
+  Result := RegisterExpectedMemoryLeak(ALeakedCppVirtObjTypeIdPtr, - ACount);
+end;
+{$endif}
+
+function UnregisterExpectedMemoryLeak(ALeakedBlockSize: NativeInt; ACount: Integer = 1): Boolean; overload;
+begin
+  Result := RegisterExpectedMemoryLeak(ALeakedBlockSize, - ACount);
+end;
+
+{Returns a list of all expected memory leaks}
+function GetRegisteredMemoryLeaks: TRegisteredMemoryLeaks;
+
+  procedure AddEntries(AEntry: PExpectedMemoryLeak);
+  var
+    LInd: Integer;
+  begin
+    while AEntry <> nil do
+    begin
+      LInd := Length(Result);
+      SetLength(Result, LInd + 1);
+      {Add the entry}
+{$ifndef FullDebugMode}
+      Result[LInd].LeakAddress := AEntry.LeakAddress;
+{$else}
+      Result[LInd].LeakAddress := Pointer(PByte(AEntry.LeakAddress) + SizeOf(TFullDebugBlockHeader));
+{$endif}
+      Result[LInd].LeakedClass := AEntry.LeakedClass;
+{$ifdef CheckCppObjectTypeEnabled}
+      Result[LInd].LeakedCppTypeIdPtr := AEntry.LeakedCppTypeIdPtr;
+{$endif}
+      Result[LInd].LeakSize := AEntry.LeakSize;
+      Result[LInd].LeakCount := AEntry.LeakCount;
+      {Next entry}
+      AEntry := AEntry.NextLeak;
+    end;
+  end;
+
+begin
+  SetLength(Result, 0);
+  if (ExpectedMemoryLeaks <> nil) and LockExpectedMemoryLeaksList then
+  begin
+    {Add all entries}
+    AddEntries(ExpectedMemoryLeaks.FirstEntryByAddress);
+    AddEntries(ExpectedMemoryLeaks.FirstEntryByClass);
+    AddEntries(ExpectedMemoryLeaks.FirstEntryBySizeOnly);
+    {Unlock the list}
+    ExpectedMemoryLeaksListLocked := False;
+  end;
+end;
+
+{$else}
+  {$ifdef BDS2006AndUp}
+function NoOpRegisterExpectedMemoryLeak(ALeakedPointer: Pointer): Boolean;
+begin
+  {Do nothing. Used when memory leak reporting is disabled under Delphi 2006 and later.}
+  Result := False;
+end;
+
+function NoOpUnregisterExpectedMemoryLeak(ALeakedPointer: Pointer): Boolean;
+begin
+  {Do nothing. Used when memory leak reporting is disabled under Delphi 2006 and later.}
+  Result := False;
+end;
+  {$endif}
+{$endif}
+
+{Detects the probable string data type for a memory block.}
+function DetectStringData(APMemoryBlock: Pointer;
+  AAvailableSpaceInBlock: NativeInt): TStringDataType;
+const
+  {If the string reference count field contains a value greater than this,
+   then it is assumed that the block is not a string.}
+  MaxRefCount = 255;
+  {The lowest ASCII character code considered valid string data. If there are
+   any characters below this code point then the data is assumed not to be a
+   string. #9 = Tab.}
+  MinCharCode = #9;
+var
+  LStringLength, LElemSize, LCharInd: Integer;
+  LPAnsiStr: PAnsiChar;
+  LPUniStr: PWideChar;
+begin
+  {Check that the reference count is within a reasonable range}
+  if PStrRec(APMemoryBlock).refCnt > MaxRefCount then
+  begin
+    Result := stUnknown;
+    Exit;
+  end;
+{$ifdef BCB6OrDelphi6AndUp}
+  {$if RTLVersion >= 20}
+  LElemSize := PStrRec(APMemoryBlock).elemSize;
+  {Element size must be either 1 (Ansi) or 2 (Unicode)}
+  if (LElemSize <> 1) and (LElemSize <> 2) then
+  begin
+    Result := stUnknown;
+    Exit;
+  end;
+  {$ifend}
+  {$if RTLVersion < 20}
+  LElemSize := 1;
+  {$ifend}
+{$else}
+  LElemSize := 1;
+{$endif}
+  {Get the string length}
+  LStringLength := PStrRec(APMemoryBlock).length;
+  {Does the string fit?}
+  if (LStringLength <= 0)
+    or (LStringLength >= (AAvailableSpaceInBlock - SizeOf(StrRec)) div LElemSize) then
+  begin
+    Result := stUnknown;
+    Exit;
+  end;
+  {Check for no characters outside the expected range. If there are,
+   then it is probably not a string.}
+  if LElemSize = 1 then
+  begin
+    {Check that all characters are in the range considered valid.}
+    LPAnsiStr := PAnsiChar(PByte(APMemoryBlock) + SizeOf(StrRec));
+    for LCharInd := 1 to LStringLength do
+    begin
+      if LPAnsiStr^ < MinCharCode then
+      begin
+        Result := stUnknown;
+        Exit;
+      end;
+      Inc(LPAnsiStr);
+    end;
+    {Must have a trailing #0}
+    if LPAnsiStr^ = #0 then
+      Result := stAnsiString
+    else
+      Result := stUnknown;
+  end
+  else
+  begin
+    {Check that all characters are in the range considered valid.}
+    LPUniStr := PWideChar(PByte(APMemoryBlock) + SizeOf(StrRec));
+    for LCharInd := 1 to LStringLength do
+    begin
+      if LPUniStr^ < MinCharCode then
+      begin
+        Result := stUnknown;
+        Exit;
+      end;
+      Inc(LPUniStr);
+    end;
+    {Must have a trailing #0}
+    if LPUniStr^ = #0 then
+      Result := stUnicodeString
+    else
+      Result := stUnknown;
+  end;
+end;
+
+{Walks all allocated blocks, calling ACallBack for each. Passes the user block size and AUserData to the callback.
+ Important note: All block types will be locked during the callback, so the memory manager cannot be used inside it.}
+procedure WalkAllocatedBlocks(ACallBack: TWalkAllocatedBlocksCallback; AUserData: Pointer);
+const
+  DebugHeaderSize = {$ifdef FullDebugMode}SizeOf(TFullDebugBlockHeader){$else}0{$endif};
+  TotalDebugOverhead = {$ifdef FullDebugMode}FullDebugBlockOverhead{$else}0{$endif};
+var
+  LPMediumBlock: Pointer;
+  LPMediumBlockPoolHeader: PMediumBlockPoolHeader;
+  LMediumBlockHeader: NativeUInt;
+  LPLargeBlock: PLargeBlockHeader;
+  LBlockSize: NativeInt;
+  LPSmallBlockPool: PSmallBlockPoolHeader;
+  LCurPtr, LEndPtr: Pointer;
+  LInd: Integer;
+begin
+  {Lock all small block types}
+  LockAllSmallBlockTypes;
+  {Lock the medium blocks}
+  LockMediumBlocks;
+  try
+    {Step through all the medium block pools}
+    LPMediumBlockPoolHeader := MediumBlockPoolsCircularList.NextMediumBlockPoolHeader;
+    while LPMediumBlockPoolHeader <> @MediumBlockPoolsCircularList do
+    begin
+      LPMediumBlock := GetFirstMediumBlockInPool(LPMediumBlockPoolHeader);
+      while LPMediumBlock <> nil do
+      begin
+        LMediumBlockHeader := PNativeUInt(PByte(LPMediumBlock) - BlockHeaderSize)^;
+        {Is the block in use?}
+        if LMediumBlockHeader and IsFreeBlockFlag = 0 then
+        begin
+          if (LMediumBlockHeader and IsSmallBlockPoolInUseFlag) <> 0 then
+          begin
+            {Step through all the blocks in the small block pool}
+            LPSmallBlockPool := LPMediumBlock;
+            {Get the useable size inside a block}
+            LBlockSize := LPSmallBlockPool.BlockType.BlockSize - BlockHeaderSize - TotalDebugOverhead;
+            {Get the first and last pointer for the pool}
+            GetFirstAndLastSmallBlockInPool(LPSmallBlockPool, LCurPtr, LEndPtr);
+            {Step through all blocks}
+            while UIntPtr(LCurPtr) <= UIntPtr(LEndPtr) do
+            begin
+              {Is this block in use?}
+              if (PNativeUInt(PByte(LCurPtr) - BlockHeaderSize)^ and IsFreeBlockFlag) = 0 then
+              begin
+                ACallBack(PByte(LCurPtr) + DebugHeaderSize, LBlockSize, AUserData);
+              end;
+              {Next block}
+              Inc(PByte(LCurPtr), LPSmallBlockPool.BlockType.BlockSize);
+            end;
+          end
+          else
+          begin
+            LBlockSize := (LMediumBlockHeader and DropMediumAndLargeFlagsMask) - BlockHeaderSize - TotalDebugOverhead;
+            ACallBack(PByte(LPMediumBlock) + DebugHeaderSize, LBlockSize, AUserData);
+          end;
+        end;
+        {Next medium block}
+        LPMediumBlock := NextMediumBlock(LPMediumBlock);
+      end;
+      {Get the next medium block pool}
+      LPMediumBlockPoolHeader := LPMediumBlockPoolHeader.NextMediumBlockPoolHeader;
+    end;
+  finally
+    {Unlock medium blocks}
+    MediumBlocksLocked := False;
+    {Unlock all the small block types}
+    for LInd := 0 to NumSmallBlockTypes - 1 do
+      SmallBlockTypes[LInd].BlockTypeLocked := False;
+  end;
+  {Step through all the large blocks}
+  LockLargeBlocks;
+  try
+    {Get all leaked large blocks}
+    LPLargeBlock := LargeBlocksCircularList.NextLargeBlockHeader;
+    while LPLargeBlock <> @LargeBlocksCircularList do
+    begin
+      LBlockSize := (LPLargeBlock.BlockSizeAndFlags and DropMediumAndLargeFlagsMask) - BlockHeaderSize - LargeBlockHeaderSize - TotalDebugOverhead;
+      ACallBack(PByte(LPLargeBlock) + LargeBlockHeaderSize + DebugHeaderSize, LBlockSize, AUserData);
+      {Get the next large block}
+      LPLargeBlock := LPLargeBlock.NextLargeBlockHeader;
+    end;
+  finally
+    LargeBlocksLocked := False;
+  end;
+end;
+
+{-----------LogMemoryManagerStateToFile implementation------------}
+const
+  MaxMemoryLogNodes = 100000;
+  QuickSortMinimumItemsInPartition = 4;
+
+type
+  {While scanning the memory pool the list of classes is built up in a binary search tree.}
+  PMemoryLogNode = ^TMemoryLogNode;
+  TMemoryLogNode = record
+    {The left and right child nodes}
+    LeftAndRightNodePointers: array[Boolean] of PMemoryLogNode;
+    {The class this node belongs to}
+    ClassPtr: Pointer;
+    {The number of instances of the class}
+    InstanceCount: NativeInt;
+    {The total memory usage for this class}
+    TotalMemoryUsage: NativeInt;
+  end;
+  TMemoryLogNodes = array[0..MaxMemoryLogNodes - 1] of TMemoryLogNode;
+  PMemoryLogNodes = ^TMemoryLogNodes;
+
+  TMemoryLogInfo = record
+    {The number of nodes in "Nodes" that are used.}
+    NodeCount: Integer;
+    {The root node of the binary search tree. The content of this node is not actually used, it just simplifies the
+     binary search code.}
+    RootNode: TMemoryLogNode;
+    Nodes: TMemoryLogNodes;
+  end;
+  PMemoryLogInfo = ^TMemoryLogInfo;
+
+{LogMemoryManagerStateToFile callback subroutine}
+procedure LogMemoryManagerStateCallBack(APBlock: Pointer; ABlockSize: NativeInt; AUserData: Pointer);
+var
+  LClass, LClassHashBits: NativeUInt;
+  LPLogInfo: PMemoryLogInfo;
+  LPParentNode, LPClassNode: PMemoryLogNode;
+  LChildNodeDirection: Boolean;
+begin
+  LPLogInfo := AUserData;
+  {Detecting an object is very expensive (due to the VirtualQuery call), so we do some basic checks and try to find
+   the "class" in the tree first.}
+  LClass := PNativeUInt(APBlock)^;
+  {Do some basic pointer checks: The "class" must be dword aligned and beyond 64K}
+  if (LClass > 65535)
+    and (LClass and 3 = 0) then
+  begin
+    LPParentNode := @LPLogInfo.RootNode;
+    LClassHashBits := LClass;
+    repeat
+      LChildNodeDirection := Boolean(LClassHashBits and 1);
+      {Split off the next bit of the class pointer and traverse in the appropriate direction.}
+      LPClassNode := LPParentNode.LeftAndRightNodePointers[LChildNodeDirection];
+      {Is this child node the node the class we're looking for?}
+      if (LPClassNode = nil) or (NativeUInt(LPClassNode.ClassPtr) = LClass) then
+        Break;
+      {The node was not found: Keep on traversing the tree.}
+      LClassHashBits := LClassHashBits shr 1;
+      LPParentNode := LPClassNode;
+    until False;
+  end
+  else
+    LPClassNode := nil;
+  {Was the "class" found?}
+  if LPClassNode = nil then
+  begin
+    {The "class" is not yet in the tree: Determine if it is actually a class.}
+    LClass := NativeUInt(DetectClassInstance(APBlock));
+    {If it is not a class, try to detect the string type.}
+    if LClass = 0 then
+      LClass := Ord(DetectStringData(APBlock, ABlockSize));
+    {Is this class already in the tree?}
+    LPParentNode := @LPLogInfo.RootNode;
+    LClassHashBits := LClass;
+    repeat
+      LChildNodeDirection := Boolean(LClassHashBits and 1);
+      {Split off the next bit of the class pointer and traverse in the appropriate direction.}
+      LPClassNode := LPParentNode.LeftAndRightNodePointers[LChildNodeDirection];
+      {Is this child node the node the class we're looking for?}
+      if LPClassNode = nil then
+      begin
+        {The end of the tree was reached: Add a new child node.}
+        LPClassNode := @LPLogInfo.Nodes[LPLogInfo.NodeCount];
+        Inc(LPLogInfo.NodeCount);
+        LPParentNode.LeftAndRightNodePointers[LChildNodeDirection] := LPClassNode;
+        LPClassNode.ClassPtr := Pointer(LClass);
+        Break;
+      end
+      else
+      begin
+        if NativeUInt(LPClassNode.ClassPtr) = LClass then
+          Break;
+      end;
+      {The node was not found: Keep on traversing the tree.}
+      LClassHashBits := LClassHashBits shr 1;
+      LPParentNode := LPClassNode;
+    until False;
+  end;
+  {Update the statistics for the class}
+  Inc(LPClassNode.InstanceCount);
+  Inc(LPClassNode.TotalMemoryUsage, ABlockSize);
+end;
+
+{LogMemoryManagerStateToFile subroutine: A median-of-3 quicksort routine for sorting a TMemoryLogNodes array.}
+procedure QuickSortLogNodes(APLeftItem: PMemoryLogNodes; ARightIndex: Integer);
+var
+  M, I, J: Integer;
+  LPivot, LTempItem: TMemoryLogNode;
+begin
+  while True do
+  begin
+    {Order the left, middle and right items in ascending order}
+    M := ARightIndex shr 1;
+    {Is the middle item larger than the left item?}
+    if APLeftItem[0].TotalMemoryUsage > APLeftItem[M].TotalMemoryUsage then
+    begin
+      {Swap items 0 and M}
+      LTempItem := APLeftItem[0];
+      APLeftItem[0] := APLeftItem[M];
+      APLeftItem[M] := LTempItem;
+    end;
+    {Is the middle item larger than the right?}
+    if APLeftItem[M].TotalMemoryUsage > APLeftItem[ARightIndex].TotalMemoryUsage then
+    begin
+      {The right-hand item is not larger - swap it with the middle}
+      LTempItem := APLeftItem[ARightIndex];
+      APLeftItem[ARightIndex] := APLeftItem[M];
+      APLeftItem[M] := LTempItem;
+      {Is the left larger than the new middle?}
+      if APLeftItem[0].TotalMemoryUsage > APLeftItem[M].TotalMemoryUsage then
+      begin
+        {Swap items 0 and M}
+        LTempItem := APLeftItem[0];
+        APLeftItem[0] := APLeftItem[M];
+        APLeftItem[M] := LTempItem;
+      end;
+    end;
+    {Move the pivot item out of the way by swapping M with R - 1}
+    LPivot := APLeftItem[M];
+    APLeftItem[M] := APLeftItem[ARightIndex - 1];
+    APLeftItem[ARightIndex - 1] := LPivot;
+    {Set up the loop counters}
+    I := 0;
+    J := ARightIndex - 1;
+    while true do
+    begin
+      {Find the first item from the left that is not smaller than the pivot}
+      repeat
+        Inc(I);
+      until APLeftItem[I].TotalMemoryUsage >= LPivot.TotalMemoryUsage;
+      {Find the first item from the right that is not larger than the pivot}
+      repeat
+        Dec(J);
+      until APLeftItem[J].TotalMemoryUsage <= LPivot.TotalMemoryUsage;
+      {Stop the loop when the two indexes cross}
+      if J < I then
+        Break;
+      {Swap item I and J}
+      LTempItem := APLeftItem[I];
+      APLeftItem[I] := APLeftItem[J];
+      APLeftItem[J] := LTempItem;
+    end;
+    {Put the pivot item back in the correct position by swapping I with R - 1}
+    APLeftItem[ARightIndex - 1] := APLeftItem[I];
+    APLeftItem[I] := LPivot;
+    {Sort the left-hand partition}
+    if J >= (QuickSortMinimumItemsInPartition - 1) then
+      QuickSortLogNodes(APLeftItem, J);
+    {Sort the right-hand partition}
+    APLeftItem := @APLeftItem[I + 1];
+    ARightIndex := ARightIndex - I - 1;
+    if ARightIndex < (QuickSortMinimumItemsInPartition - 1) then
+      Break;
+  end;
+end;
+
+{LogMemoryManagerStateToFile subroutine: An InsertionSort routine for sorting a TMemoryLogNodes array.}
+procedure InsertionSortLogNodes(APLeftItem: PMemoryLogNodes; ARightIndex: Integer);
+var
+  I, J: Integer;
+  LCurNode: TMemoryLogNode;
+begin
+  for I := 1 to ARightIndex do
+  begin
+    LCurNode := APLeftItem[I];
+    {Scan backwards to find the best insertion spot}
+    J := I;
+    while (J > 0) and (APLeftItem[J - 1].TotalMemoryUsage > LCurNode.TotalMemoryUsage) do
+    begin
+      APLeftItem[J] := APLeftItem[J - 1];
+      Dec(J);
+    end;
+    APLeftItem[J] := LCurNode;
+  end;
+end;
+
+{Writes a log file containing a summary of the memory mananger state and a summary of allocated blocks grouped by
+ class. The file will be saved in UTF-8 encoding (in supported Delphi versions). Returns True on success. }
+function LogMemoryManagerStateToFile(const AFileName: string; const AAdditionalDetails: string): Boolean;
+const
+  MsgBufferSize = 65536;
+  MaxLineLength = 512;
+  {Write the UTF-8 BOM in Delphi versions that support UTF-8 conversion.}
+  LogStateHeaderMsg = {$ifdef BCB6OrDelphi7AndUp}#$EF#$BB#$BF + {$endif}
+    'FastMM State Capture:'#13#10'---------------------'#13#10#13#10;
+  LogStateAllocatedMsg = 'K Allocated'#13#10;
+  LogStateOverheadMsg = 'K Overhead'#13#10;
+  LogStateEfficiencyMsg = '% Efficiency'#13#10#13#10'Usage Detail:'#13#10;
+  LogStateAdditionalInfoMsg = #13#10'Additional Information:'#13#10'-----------------------'#13#10;
+var
+  LPLogInfo: PMemoryLogInfo;
+  LInd: Integer;
+  LPNode: PMemoryLogNode;
+  LMsgBuffer: array[0..MsgBufferSize - 1] of AnsiChar;
+  LPMsg: PAnsiChar;
+  LBufferSpaceUsed, LBytesWritten: Cardinal;
+  LFileHandle: NativeUInt;
+  LMemoryManagerUsageSummary: TMemoryManagerUsageSummary;
+  LUTF8Str: AnsiString;
+begin
+  {Get the current memory manager usage summary.}
+  GetMemoryManagerUsageSummary(LMemoryManagerUsageSummary);
+  {Allocate the memory required to capture detailed allocation information.}
+  LPLogInfo := VirtualAlloc(nil, SizeOf(TMemoryLogInfo), MEM_COMMIT or MEM_TOP_DOWN, PAGE_READWRITE);
+  if LPLogInfo <> nil then
+  begin
+    try
+      {Log all allocated blocks by class.}
+      WalkAllocatedBlocks(LogMemoryManagerStateCallBack, LPLogInfo);
+      {Sort the classes by total memory usage: Do the initial QuickSort pass over the list to sort the list in groups
+       of QuickSortMinimumItemsInPartition size.}
+      if LPLogInfo.NodeCount >= QuickSortMinimumItemsInPartition then
+        QuickSortLogNodes(@LPLogInfo.Nodes[0], LPLogInfo.NodeCount - 1);
+      {Do the final InsertionSort pass.}
+      InsertionSortLogNodes(@LPLogInfo.Nodes[0], LPLogInfo.NodeCount - 1);
+      {Create the output file}
+      {$ifdef POSIX}
+      lFileHandle := FileCreate(AFilename);
+      {$else}
+      LFileHandle := CreateFile(PChar(AFilename), GENERIC_READ or GENERIC_WRITE, 0,
+        nil, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+      {$endif}
+      if LFileHandle <> INVALID_HANDLE_VALUE then
+      begin
+        try
+          {Log the usage summary}
+          LPMsg := @LMsgBuffer;
+          LPMsg := AppendStringToBuffer(LogStateHeaderMsg, LPMsg, Length(LogStateHeaderMsg));
+          LPMsg := NativeUIntToStrBuf(LMemoryManagerUsageSummary.AllocatedBytes shr 10, LPMsg);
+          LPMsg := AppendStringToBuffer(LogStateAllocatedMsg, LPMsg, Length(LogStateAllocatedMsg));
+          LPMsg := NativeUIntToStrBuf(LMemoryManagerUsageSummary.OverheadBytes shr 10, LPMsg);
+          LPMsg := AppendStringToBuffer(LogStateOverheadMsg, LPMsg, Length(LogStateOverheadMsg));
+          LPMsg := NativeUIntToStrBuf(Round(LMemoryManagerUsageSummary.EfficiencyPercentage), LPMsg);
+          LPMsg := AppendStringToBuffer(LogStateEfficiencyMsg, LPMsg, Length(LogStateEfficiencyMsg));
+          {Log the allocation detail}
+          for LInd := LPLogInfo.NodeCount - 1 downto 0 do
+          begin
+            LPNode := @LPLogInfo.Nodes[LInd];
+            {Add the allocated size}
+            LPMsg^ := ' ';
+            Inc(LPMsg);
+            LPMsg := NativeUIntToStrBuf(LPNode.TotalMemoryUsage, LPMsg);
+            LPMsg := AppendStringToBuffer(BytesMessage, LPMsg, Length(BytesMessage));
+            {Add the class type}
+            case NativeInt(LPNode.ClassPtr) of
+              {Unknown}
+              0:
+              begin
+                LPMsg := AppendStringToBuffer(UnknownClassNameMsg, LPMsg, Length(UnknownClassNameMsg));
+              end;
+              {AnsiString}
+              1:
+              begin
+                LPMsg := AppendStringToBuffer(AnsiStringBlockMessage, LPMsg, Length(AnsiStringBlockMessage));
+              end;
+              {UnicodeString}
+              2:
+              begin
+                LPMsg := AppendStringToBuffer(UnicodeStringBlockMessage, LPMsg, Length(UnicodeStringBlockMessage));
+              end;
+              {Classes}
+            else
+              begin
+                LPMsg := AppendClassNameToBuffer(LPNode.ClassPtr, LPMsg);
+              end;
+            end;
+            {Add the count}
+            LPMsg^ := ' ';
+            Inc(LPMsg);
+            LPMsg^ := 'x';
+            Inc(LPMsg);
+            LPMsg^ := ' ';
+            Inc(LPMsg);
+            LPMsg := NativeUIntToStrBuf(LPNode.InstanceCount, LPMsg);
+            LPMsg^ := #13;
+            Inc(LPMsg);
+            LPMsg^ := #10;
+            Inc(LPMsg);
+            {Flush the buffer?}
+            LBufferSpaceUsed := NativeInt(LPMsg) - NativeInt(@LMsgBuffer);
+            if LBufferSpaceUsed > (MsgBufferSize - MaxLineLength) then
+            begin
+              WriteFile(LFileHandle, LMsgBuffer, LBufferSpaceUsed, LBytesWritten, nil);
+              LPMsg := @LMsgBuffer;
+            end;
+          end;
+          if AAdditionalDetails <> '' then
+            LPMsg := AppendStringToBuffer(LogStateAdditionalInfoMsg, LPMsg, Length(LogStateAdditionalInfoMsg));
+          {Flush any remaining bytes}
+          LBufferSpaceUsed := NativeInt(LPMsg) - NativeInt(@LMsgBuffer);
+          if LBufferSpaceUsed > 0 then
+            WriteFile(LFileHandle, LMsgBuffer, LBufferSpaceUsed, LBytesWritten, nil);
+          {Write the additional info}
+          if AAdditionalDetails <> '' then
+          begin
+            {$ifdef BCB6OrDelphi7AndUp}
+            LUTF8Str := UTF8Encode(AAdditionalDetails);
+            {$else}
+            LUTF8Str := AAdditionalDetails;
+            {$endif}
+            WriteFile(LFileHandle, LUTF8Str[1], Length(LUTF8Str), LBytesWritten, nil);
+          end;
+          {Success}
+          Result := True;
+        finally
+          {Close the file}
+          {$ifdef POSIX}
+          __close(LFileHandle)
+          {$else}
+          CloseHandle(LFileHandle);
+          {$endif}
+        end;
+      end
+      else
+        Result := False;
+    finally
+      VirtualFree(LPLogInfo, 0, MEM_RELEASE);
+    end;
+  end
+  else
+    Result := False;
+end;
+
+{-----------CheckBlocksOnShutdown implementation------------}
+
+{Checks blocks for modification after free and also for memory leaks}
+procedure CheckBlocksOnShutdown(ACheckForLeakedBlocks: Boolean);
+{$ifdef EnableMemoryLeakReporting}
+type
+  {Leaked class type}
+  TLeakedClass = record
+    ClassPointer: TClass;
+    {$ifdef CheckCppObjectTypeEnabled}
+    CppTypeIdPtr: Pointer;
+    {$endif}
+    NumLeaks: Cardinal;
+  end;
+  TLeakedClasses = array[0..255] of TLeakedClass;
+  PLeakedClasses = ^TLeakedClasses;
+  {Leak statistics for a small block type}
+  TSmallBlockLeaks = array[0..NumSmallBlockTypes - 1] of TLeakedClasses;
+  {A leaked medium or large block}
+  TMediumAndLargeBlockLeaks = array[0..4095] of NativeUInt;
+{$endif}
+var
+{$ifdef EnableMemoryLeakReporting}
+  {The leaked classes for small blocks}
+  LSmallBlockLeaks: TSmallBlockLeaks;
+  LLeakType: TMemoryLeakType;
+  {$ifdef CheckCppObjectTypeEnabled}
+  LLeakedCppTypeIdPtr: Pointer;
+  LCppTypeName: PAnsiChar;
+  {$endif}
+  LMediumAndLargeBlockLeaks: TMediumAndLargeBlockLeaks;
+  LNumMediumAndLargeLeaks: Integer;
+  LPLargeBlock: PLargeBlockHeader;
+  LLeakMessage: array[0..32767] of AnsiChar;
+  {$ifndef NoMessageBoxes}
+  LMessageTitleBuffer: array[0..1023] of AnsiChar;
+  {$endif}
+  LMsgPtr: PAnsiChar;
+  LExpectedLeaksOnly, LSmallLeakHeaderAdded, LBlockSizeHeaderAdded: Boolean;
+  LBlockTypeInd, LClassInd, LBlockInd: Cardinal;
+  LMediumBlockSize, LPreviousBlockSize, LLargeBlockSize, LThisBlockSize: NativeUInt;
+{$endif}
+  LPMediumBlock: Pointer;
+  LPMediumBlockPoolHeader: PMediumBlockPoolHeader;
+  LMediumBlockHeader: NativeUInt;
+
+{$ifdef EnableMemoryLeakReporting}
+  {Tries to account for a memory leak. Returns true if the leak is expected and
+   removes the leak from the list}
+  function GetMemoryLeakType(AAddress: Pointer; ASpaceInsideBlock: NativeUInt): TMemoryLeakType;
+  var
+    LLeak: TExpectedMemoryLeak;
+  begin
+    {Default to not found}
+    Result := mltUnexpectedLeak;
+    if ExpectedMemoryLeaks <> nil then
+    begin
+      {Check by pointer address}
+      LLeak.LeakAddress := AAddress;
+      LLeak.LeakedClass := nil;
+      {$ifdef CheckCppObjectTypeEnabled}
+      LLeak.LeakedCppTypeIdPtr := nil;
+      {$endif}
+      LLeak.LeakSize := 0;
+      LLeak.LeakCount := -1;
+      if UpdateExpectedLeakList(@ExpectedMemoryLeaks.FirstEntryByAddress, @LLeak, False) then
+      begin
+        Result := mltExpectedLeakRegisteredByPointer;
+        Exit;
+      end;
+      {Check by class}
+      LLeak.LeakAddress := nil;
+      {$ifdef FullDebugMode}
+      LLeak.LeakedClass := TClass(PNativeUInt(PByte(AAddress)+ SizeOf(TFullDebugBlockHeader))^);
+      {$else}
+      LLeak.LeakedClass := TClass(PNativeUInt(AAddress)^);
+      {$endif}
+      {$ifdef CheckCppObjectTypeEnabled}
+      if Assigned(GetCppVirtObjTypeIdPtrFunc) then
+      begin
+        {$ifdef FullDebugMode}
+        LLeak.LeakedCppTypeIdPtr := GetCppVirtObjTypeIdPtrFunc(Pointer(PByte(AAddress)
+          + SizeOf(TFullDebugBlockHeader)), ASpaceInsideBlock);
+        {$else}
+        LLeak.LeakedCppTypeIdPtr := GetCppVirtObjTypeIdPtrFunc(AAddress, ASpaceInsideBlock);
+        {$endif}
+      end;
+      LLeakedCppTypeIdPtr := LLeak.LeakedCppTypeIdPtr;
+      {$endif}
+      LLeak.LeakSize := ASpaceInsideBlock;
+      if UpdateExpectedLeakList(@ExpectedMemoryLeaks.FirstEntryByClass, @LLeak, False) then
+      begin
+        Result := mltExpectedLeakRegisteredByClass;
+        Exit;
+      end;
+      {Check by size: the block must be large enough to hold the leak}
+      LLeak.LeakedClass := nil;
+      if UpdateExpectedLeakList(@ExpectedMemoryLeaks.FirstEntryBySizeOnly, @LLeak, False) then
+        Result := mltExpectedLeakRegisteredBySize;
+    end;
+  end;
+
+  {Checks the small block pool for leaks.}
+  procedure CheckSmallBlockPoolForLeaks(APSmallBlockPool: PSmallBlockPoolHeader);
+  var
+    LLeakedClass: TClass;
+    {$ifdef CheckCppObjectTypeEnabled}
+    LLeakedCppObjectTypeId: Pointer;
+    {$endif}
+    LSmallBlockLeakType: TMemoryLeakType;
+    LClassIndex: Integer;
+    LCurPtr, LEndPtr, LDataPtr: Pointer;
+    LBlockTypeIndex: Cardinal;
+    LPLeakedClasses: PLeakedClasses;
+    LSmallBlockSize: Cardinal;
+  begin
+    {Get the useable size inside a block}
+    LSmallBlockSize := APSmallBlockPool.BlockType.BlockSize - BlockHeaderSize;
+  {$ifdef FullDebugMode}
+    Dec(LSmallBlockSize, FullDebugBlockOverhead);
+  {$endif}
+    {Get the block type index}
+    LBlockTypeIndex := (UIntPtr(APSmallBlockPool.BlockType) - UIntPtr(@SmallBlockTypes[0])) div SizeOf(TSmallBlockType);
+    LPLeakedClasses := @LSmallBlockLeaks[LBlockTypeIndex];
+    {Get the first and last pointer for the pool}
+    GetFirstAndLastSmallBlockInPool(APSmallBlockPool, LCurPtr, LEndPtr);
+    {Step through all blocks}
+    while UIntPtr(LCurPtr) <= UIntPtr(LEndPtr) do
+    begin
+      {Is this block in use? If so, is the debug info intact?}
+      if ((PNativeUInt(PByte(LCurPtr) - BlockHeaderSize)^ and IsFreeBlockFlag) = 0) then
+      begin
+  {$ifdef FullDebugMode}
+        if CheckBlockBeforeFreeOrRealloc(LCurPtr, boBlockCheck) then
+  {$endif}
+        begin
+          {$ifdef CheckCppObjectTypeEnabled}
+          LLeakedCppTypeIdPtr := nil;
+          {$endif}
+          {Get the leak type}
+          LSmallBlockLeakType := GetMemoryLeakType(LCurPtr, LSmallBlockSize);
+    {$ifdef LogMemoryLeakDetailToFile}
+      {$ifdef HideExpectedLeaksRegisteredByPointer}
+          if LSmallBlockLeakType <> mltExpectedLeakRegisteredByPointer then
+      {$endif}
+            LogMemoryLeakOrAllocatedBlock(LCurPtr, True);
+    {$endif}
+          {Only expected leaks?}
+          LExpectedLeaksOnly := LExpectedLeaksOnly and (LSmallBlockLeakType <> mltUnexpectedLeak);
+    {$ifdef HideExpectedLeaksRegisteredByPointer}
+          if LSmallBlockLeakType <> mltExpectedLeakRegisteredByPointer then
+    {$endif}
+          begin
+            {Get a pointer to the user data}
+    {$ifndef FullDebugMode}
+            LDataPtr := LCurPtr;
+    {$else}
+            LDataPtr := Pointer(PByte(LCurPtr) + SizeOf(TFullDebugBlockHeader));
+    {$endif}
+            {Default to an unknown block}
+            LClassIndex := 0;
+            {Get the class contained by the block}
+            LLeakedClass := DetectClassInstance(LDataPtr);
+            {Not a Delphi class? -> is it perhaps a string or C++ object type?}
+            if LLeakedClass = nil then
+            begin
+              {$ifdef CheckCppObjectTypeEnabled}
+              LLeakedCppObjectTypeId := LLeakedCppTypeIdPtr;
+              if (LLeakedCppObjectTypeId = nil) and (ExpectedMemoryLeaks = nil) then
+              begin
+                if Assigned(GetCppVirtObjTypeIdPtrFunc) then
+                begin
+                  LLeakedCppObjectTypeId := GetCppVirtObjTypeIdPtrFunc(LDataPtr, LSmallBlockSize);
+                end;
+              end;
+              if Assigned(LLeakedCppObjectTypeId) then
+              begin
+                LClassIndex := 3;
+                while LClassIndex <= High(TLeakedClasses) do
+                begin
+                  if (Pointer(LPLeakedClasses[LClassIndex].CppTypeIdPtr) = LLeakedCppObjectTypeId)
+                    or ((LPLeakedClasses[LClassIndex].CppTypeIdPtr = nil)
+                    and (LPLeakedClasses[LClassIndex].ClassPointer = nil)) then
+                  begin
+                    Break;
+                  end;
+                  Inc(LClassIndex);
+                end;
+                if LClassIndex <= High(TLeakedClasses) then
+                  Pointer(LPLeakedClasses[LClassIndex].CppTypeIdPtr) := LLeakedCppObjectTypeId
+                else
+                  LClassIndex := 0;
+              end
+              else
+              begin
+              {$endif}
+                {Not a known class: Is it perhaps string data?}
+                case DetectStringData(LDataPtr, APSmallBlockPool.BlockType.BlockSize - (BlockHeaderSize {$ifdef FullDebugMode} + FullDebugBlockOverhead{$endif})) of
+                  stAnsiString: LClassIndex := 1;
+                  stUnicodeString: LClassIndex := 2;
+                end;
+              {$ifdef CheckCppObjectTypeEnabled}
+              end;
+              {$endif}
+            end
+            else
+            begin
+              LClassIndex := 3;
+              while LClassIndex <= High(TLeakedClasses) do
+              begin
+                if (LPLeakedClasses[LClassIndex].ClassPointer = LLeakedClass)
+                  or ((LPLeakedClasses[LClassIndex].ClassPointer = nil)
+                  {$ifdef CheckCppObjectTypeEnabled}
+                  and (LPLeakedClasses[LClassIndex].CppTypeIdPtr = nil)
+                  {$endif}
+                  ) then
+                begin
+                  Break;
+                end;
+                Inc(LClassIndex);
+              end;
+              if LClassIndex <= High(TLeakedClasses) then
+                LPLeakedClasses[LClassIndex].ClassPointer := LLeakedClass
+              else
+                LClassIndex := 0;
+            end;
+            {Add to the number of leaks for the class}
+            Inc(LPLeakedClasses[LClassIndex].NumLeaks);
+          end;
+        end;
+      end
+      else
+      begin
+  {$ifdef CheckUseOfFreedBlocksOnShutdown}
+        {Check that the block has not been modified since being freed}
+        CheckFreeBlockUnmodified(LCurPtr, APSmallBlockPool.BlockType.BlockSize, boBlockCheck);
+  {$endif}
+      end;
+      {Next block}
+      Inc(PByte(LCurPtr), APSmallBlockPool.BlockType.BlockSize);
+    end;
+  end;
+{$endif}
+
+begin
+{$ifdef EnableMemoryLeakReporting}
+  {Clear the leak arrays}
+  FillChar(LSmallBlockLeaks, SizeOf(LSmallBlockLeaks), 0);
+  FillChar(LMediumAndLargeBlockLeaks, SizeOf(LMediumAndLargeBlockLeaks), 0);
+  {Step through all the medium block pools}
+  LNumMediumAndLargeLeaks := 0;
+  {No unexpected leaks so far}
+  LExpectedLeaksOnly := True;
+{$endif}
+  {Step through all the medium block pools}
+  LPMediumBlockPoolHeader := MediumBlockPoolsCircularList.NextMediumBlockPoolHeader;
+  while LPMediumBlockPoolHeader <> @MediumBlockPoolsCircularList do
+  begin
+    LPMediumBlock := GetFirstMediumBlockInPool(LPMediumBlockPoolHeader);
+    while LPMediumBlock <> nil do
+    begin
+      LMediumBlockHeader := PNativeUInt(PByte(LPMediumBlock) - BlockHeaderSize)^;
+      {Is the block in use?}
+      if LMediumBlockHeader and IsFreeBlockFlag = 0 then
+      begin
+{$ifdef EnableMemoryLeakReporting}
+        if ACheckForLeakedBlocks then
+        begin
+          if (LMediumBlockHeader and IsSmallBlockPoolInUseFlag) <> 0 then
+          begin
+            {Get all the leaks for the small block pool}
+            CheckSmallBlockPoolForLeaks(LPMediumBlock);
+          end
+          else
+          begin
+            if (LNumMediumAndLargeLeaks < Length(LMediumAndLargeBlockLeaks))
+  {$ifdef FullDebugMode}
+              and CheckBlockBeforeFreeOrRealloc(LPMediumBlock, boBlockCheck)
+  {$endif}
+            then
+            begin
+              LMediumBlockSize := (LMediumBlockHeader and DropMediumAndLargeFlagsMask) - BlockHeaderSize;
+  {$ifdef FullDebugMode}
+              Dec(LMediumBlockSize, FullDebugBlockOverhead);
+  {$endif}
+              {Get the leak type}
+              LLeakType := GetMemoryLeakType(LPMediumBlock, LMediumBlockSize);
+              {Is it an expected leak?}
+              LExpectedLeaksOnly := LExpectedLeaksOnly and (LLeakType <> mltUnexpectedLeak);
+  {$ifdef LogMemoryLeakDetailToFile}
+    {$ifdef HideExpectedLeaksRegisteredByPointer}
+              if LLeakType <> mltExpectedLeakRegisteredByPointer then
+    {$endif}
+                LogMemoryLeakOrAllocatedBlock(LPMediumBlock, True);
+  {$endif}
+  {$ifdef HideExpectedLeaksRegisteredByPointer}
+              if LLeakType <> mltExpectedLeakRegisteredByPointer then
+  {$endif}
+              begin
+                {Add the leak to the list}
+                LMediumAndLargeBlockLeaks[LNumMediumAndLargeLeaks] := LMediumBlockSize;
+                Inc(LNumMediumAndLargeLeaks);
+              end;
+            end;
+          end;
+        end;
+{$endif}
+      end
+      else
+      begin
+{$ifdef CheckUseOfFreedBlocksOnShutdown}
+        {Check that the block has not been modified since being freed}
+        CheckFreeBlockUnmodified(LPMediumBlock, LMediumBlockHeader and DropMediumAndLargeFlagsMask, boBlockCheck);
+{$endif}
+      end;
+      {Next medium block}
+      LPMediumBlock := NextMediumBlock(LPMediumBlock);
+    end;
+    {Get the next medium block pool}
+    LPMediumBlockPoolHeader := LPMediumBlockPoolHeader.NextMediumBlockPoolHeader;
+  end;
+{$ifdef EnableMemoryLeakReporting}
+  if ACheckForLeakedBlocks then
+  begin
+    {Get all leaked large blocks}
+    LPLargeBlock := LargeBlocksCircularList.NextLargeBlockHeader;
+    while LPLargeBlock <> @LargeBlocksCircularList do
+    begin
+      if (LNumMediumAndLargeLeaks < length(LMediumAndLargeBlockLeaks))
+  {$ifdef FullDebugMode}
+        and CheckBlockBeforeFreeOrRealloc(Pointer(PByte(LPLargeBlock) + LargeBlockHeaderSize), boBlockCheck)
+  {$endif}
+      then
+      begin
+        LLargeBlockSize := (LPLargeBlock.BlockSizeAndFlags and DropMediumAndLargeFlagsMask) - BlockHeaderSize - LargeBlockHeaderSize;
+  {$ifdef FullDebugMode}
+        Dec(LLargeBlockSize, FullDebugBlockOverhead);
+  {$endif}
+        {Get the leak type}
+        LLeakType := GetMemoryLeakType(Pointer(PByte(LPLargeBlock) + LargeBlockHeaderSize), LLargeBlockSize);
+        {Is it an expected leak?}
+        LExpectedLeaksOnly := LExpectedLeaksOnly and (LLeakType <> mltUnexpectedLeak);
+  {$ifdef LogMemoryLeakDetailToFile}
+    {$ifdef HideExpectedLeaksRegisteredByPointer}
+        if LLeakType <> mltExpectedLeakRegisteredByPointer then
+    {$endif}
+          LogMemoryLeakOrAllocatedBlock(Pointer(PByte(LPLargeBlock) + LargeBlockHeaderSize), True);
+  {$endif}
+  {$ifdef HideExpectedLeaksRegisteredByPointer}
+        if LLeakType <> mltExpectedLeakRegisteredByPointer then
+  {$endif}
+        begin
+          {Add the leak}
+          LMediumAndLargeBlockLeaks[LNumMediumAndLargeLeaks] := LLargeBlockSize;
+          Inc(LNumMediumAndLargeLeaks);
+        end;
+      end;
+      {Get the next large block}
+      LPLargeBlock := LPLargeBlock.NextLargeBlockHeader;
+    end;
+    {Display the leak message if required}
+    if not LExpectedLeaksOnly then
+    begin
+      {Small leak header has not been added}
+      LSmallLeakHeaderAdded := False;
+      LPreviousBlockSize := 0;
+      {Set up the leak message header so long}
+      LMsgPtr := AppendStringToBuffer(LeakMessageHeader, @LLeakMessage[0], length(LeakMessageHeader));
+      {Step through all the small block types}
+      for LBlockTypeInd := 0 to NumSmallBlockTypes - 1 do
+      begin
+        LThisBlockSize := SmallBlockTypes[LBlockTypeInd].BlockSize - BlockHeaderSize;
+  {$ifdef FullDebugMode}
+        Dec(LThisBlockSize, FullDebugBlockOverhead);
+        if NativeInt(LThisBlockSize) < 0 then
+          LThisBlockSize := 0;
+  {$endif}
+        LBlockSizeHeaderAdded := False;
+        {Any leaks?}
+        for LClassInd := High(LSmallBlockLeaks[LBlockTypeInd]) downto 0 do
+        begin
+          {Is there still space in the message buffer? Reserve space for the message
+           footer.}
+          if LMsgPtr > @LLeakMessage[High(LLeakMessage) - 2048] then
+            Break;
+          {Check the count}
+          if LSmallBlockLeaks[LBlockTypeInd][LClassInd].NumLeaks > 0 then
+          begin
+            {Need to add the header?}
+            if not LSmallLeakHeaderAdded then
+            begin
+              LMsgPtr := AppendStringToBuffer(SmallLeakDetail, LMsgPtr, Length(SmallLeakDetail));
+              LSmallLeakHeaderAdded := True;
+            end;
+            {Need to add the size header?}
+            if not LBlockSizeHeaderAdded then
+            begin
+              LMsgPtr^ := #13;
+              Inc(LMsgPtr);
+              LMsgPtr^ := #10;
+              Inc(LMsgPtr);
+              LMsgPtr := NativeUIntToStrBuf(LPreviousBlockSize + 1, LMsgPtr);
+              LMsgPtr^ := ' ';
+              Inc(LMsgPtr);
+              LMsgPtr^ := '-';
+              Inc(LMsgPtr);
+              LMsgPtr^ := ' ';
+              Inc(LMsgPtr);
+              LMsgPtr := NativeUIntToStrBuf(LThisBlockSize, LMsgPtr);
+              LMsgPtr := AppendStringToBuffer(BytesMessage, LMsgPtr, Length(BytesMessage));
+              LBlockSizeHeaderAdded := True;
+            end
+            else
+            begin
+              LMsgPtr^ := ',';
+              Inc(LMsgPtr);
+              LMsgPtr^ := ' ';
+              Inc(LMsgPtr);
+            end;
+            {Show the count}
+            case LClassInd of
+              {Unknown}
+              0:
+              begin
+                LMsgPtr := AppendStringToBuffer(UnknownClassNameMsg, LMsgPtr, Length(UnknownClassNameMsg));
+              end;
+              {AnsiString}
+              1:
+              begin
+                LMsgPtr := AppendStringToBuffer(AnsiStringBlockMessage, LMsgPtr, Length(AnsiStringBlockMessage));
+              end;
+              {UnicodeString}
+              2:
+              begin
+                LMsgPtr := AppendStringToBuffer(UnicodeStringBlockMessage, LMsgPtr, Length(UnicodeStringBlockMessage));
+              end;
+              {Classes}
+            else
+              begin
+                {$ifdef CheckCppObjectTypeEnabled}
+                if LSmallBlockLeaks[LBlockTypeInd][LClassInd].CppTypeIdPtr <> nil then
+                begin
+                  if Assigned(GetCppVirtObjTypeNameByTypeIdPtrFunc) then
+                  begin
+                    LCppTypeName := GetCppVirtObjTypeNameByTypeIdPtrFunc(LSmallBlockLeaks[LBlockTypeInd][LClassInd].CppTypeIdPtr);
+                    LMsgPtr := AppendStringToBuffer(LCppTypeName, LMsgPtr, StrLen(LCppTypeName));
+                  end
+                  else
+                    LMsgPtr := AppendClassNameToBuffer(nil, LMsgPtr);
+                end
+                else
+                begin
+                {$endif}
+                  LMsgPtr := AppendClassNameToBuffer(LSmallBlockLeaks[LBlockTypeInd][LClassInd].ClassPointer, LMsgPtr);
+                {$ifdef CheckCppObjectTypeEnabled}
+                end;
+                {$endif}
+              end;
+            end;
+            {Add the count}
+            LMsgPtr^ := ' ';
+            Inc(LMsgPtr);
+            LMsgPtr^ := 'x';
+            Inc(LMsgPtr);
+            LMsgPtr^ := ' ';
+            Inc(LMsgPtr);
+            LMsgPtr := NativeUIntToStrBuf(LSmallBlockLeaks[LBlockTypeInd][LClassInd].NumLeaks, LMsgPtr);
+          end;
+        end;
+        LPreviousBlockSize := LThisBlockSize;
+      end;
+      {Add the medium/large block leak message}
+      if LNumMediumAndLargeLeaks > 0 then
+      begin
+        {Any non-small leaks?}
+        if LSmallLeakHeaderAdded then
+        begin
+          LMsgPtr^ := #13;
+          Inc(LMsgPtr);
+          LMsgPtr^ := #10;
+          Inc(LMsgPtr);
+          LMsgPtr^ := #13;
+          Inc(LMsgPtr);
+          LMsgPtr^ := #10;
+          Inc(LMsgPtr);
+        end;
+        {Add the medium/large block leak message}
+        LMsgPtr := AppendStringToBuffer(LargeLeakDetail, LMsgPtr, Length(LargeLeakDetail));
+        {List all the blocks}
+        for LBlockInd := 0 to LNumMediumAndLargeLeaks - 1 do
+        begin
+          if LBlockInd <> 0 then
+          begin
+            LMsgPtr^ := ',';
+            Inc(LMsgPtr);
+            LMsgPtr^ :=  ' ';
+            Inc(LMsgPtr);
+          end;
+          LMsgPtr := NativeUIntToStrBuf(LMediumAndLargeBlockLeaks[LBlockInd], LMsgPtr);
+          {Is there still space in the message buffer? Reserve space for the
+           message footer.}
+          if LMsgPtr > @LLeakMessage[High(LLeakMessage) - 2048] then
+            Break;
+        end;
+      end;
+  {$ifdef LogErrorsToFile}
+     {Set the message footer}
+      LMsgPtr := AppendStringToBuffer(LeakMessageFooter, LMsgPtr, Length(LeakMessageFooter));
+      {Append the message to the memory errors file}
+      AppendEventLog(@LLeakMessage[0], UIntPtr(LMsgPtr) - UIntPtr(@LLeakMessage[1]));
+  {$else}
+      {Set the message footer}
+      AppendStringToBuffer(LeakMessageFooter, LMsgPtr, Length(LeakMessageFooter));
+  {$endif}
+  {$ifdef UseOutputDebugString}
+      OutputDebugStringA(LLeakMessage);
+  {$endif}
+  {$ifndef NoMessageBoxes}
+      {Show the message}
+      AppendStringToModuleName(LeakMessageTitle, LMessageTitleBuffer);
+      ShowMessageBox(LLeakMessage, LMessageTitleBuffer);
+  {$endif}
+    end;
+  end;
+{$endif}
+end;
+
+{Returns statistics about the current state of the memory manager}
+procedure GetMemoryManagerState(var AMemoryManagerState: TMemoryManagerState);
+var
+  LPMediumBlockPoolHeader: PMediumBlockPoolHeader;
+  LPMediumBlock: Pointer;
+  LInd: Integer;
+  LBlockTypeIndex, LMediumBlockSize: Cardinal;
+  LMediumBlockHeader, LLargeBlockSize: NativeUInt;
+  LPLargeBlock: PLargeBlockHeader;
+begin
+  {Clear the structure}
+  FillChar(AMemoryManagerState, SizeOf(AMemoryManagerState), 0);
+  {Set the small block size stats}
+  for LInd := 0 to NumSmallBlockTypes - 1 do
+  begin
+    AMemoryManagerState.SmallBlockTypeStates[LInd].InternalBlockSize :=
+      SmallBlockTypes[LInd].BlockSize;
+    AMemoryManagerState.SmallBlockTypeStates[LInd].UseableBlockSize :=
+      SmallBlockTypes[LInd].BlockSize - BlockHeaderSize{$ifdef FullDebugMode} - FullDebugBlockOverhead{$endif};
+    if NativeInt(AMemoryManagerState.SmallBlockTypeStates[LInd].UseableBlockSize) < 0 then
+      AMemoryManagerState.SmallBlockTypeStates[LInd].UseableBlockSize := 0;
+  end;
+  {Lock all small block types}
+  LockAllSmallBlockTypes;
+  {Lock the medium blocks}
+  LockMediumBlocks;
+  {Step through all the medium block pools}
+  LPMediumBlockPoolHeader := MediumBlockPoolsCircularList.NextMediumBlockPoolHeader;
+  while LPMediumBlockPoolHeader <> @MediumBlockPoolsCircularList do
+  begin
+    {Add to the medium block used space}
+    Inc(AMemoryManagerState.ReservedMediumBlockAddressSpace, MediumBlockPoolSize);
+    LPMediumBlock := GetFirstMediumBlockInPool(LPMediumBlockPoolHeader);
+    while LPMediumBlock <> nil do
+    begin
+      LMediumBlockHeader := PNativeUInt(PByte(LPMediumBlock) - BlockHeaderSize)^;
+      {Is the block in use?}
+      if LMediumBlockHeader and IsFreeBlockFlag = 0 then
+      begin
+        {Get the block size}
+        LMediumBlockSize := LMediumBlockHeader and DropMediumAndLargeFlagsMask;
+        if (LMediumBlockHeader and IsSmallBlockPoolInUseFlag) <> 0 then
+        begin
+          {Get the block type index}
+          LBlockTypeIndex := (UIntPtr(PSmallBlockPoolHeader(LPMediumBlock).BlockType) - UIntPtr(@SmallBlockTypes[0])) div SizeOf(TSmallBlockType);
+          {Subtract from medium block usage}
+          Dec(AMemoryManagerState.ReservedMediumBlockAddressSpace, LMediumBlockSize);
+          {Add it to the reserved space for the block size}
+          Inc(AMemoryManagerState.SmallBlockTypeStates[LBlockTypeIndex].ReservedAddressSpace, LMediumBlockSize);
+          {Add the usage for the pool}
+          Inc(AMemoryManagerState.SmallBlockTypeStates[LBlockTypeIndex].AllocatedBlockCount,
+            PSmallBlockPoolHeader(LPMediumBlock).BlocksInUse);
+        end
+        else
+        begin
+{$ifdef FullDebugMode}
+          Dec(LMediumBlockSize, FullDebugBlockOverhead);
+{$endif}
+          Inc(AMemoryManagerState.AllocatedMediumBlockCount);
+          Inc(AMemoryManagerState.TotalAllocatedMediumBlockSize, LMediumBlockSize - BlockHeaderSize);
+        end;
+      end;
+      {Next medium block}
+      LPMediumBlock := NextMediumBlock(LPMediumBlock);
+    end;
+    {Get the next medium block pool}
+    LPMediumBlockPoolHeader := LPMediumBlockPoolHeader.NextMediumBlockPoolHeader;
+  end;
+  {Unlock medium blocks}
+  MediumBlocksLocked := False;
+  {Unlock all the small block types}
+  for LInd := 0 to NumSmallBlockTypes - 1 do
+    SmallBlockTypes[LInd].BlockTypeLocked := False;
+  {Step through all the large blocks}
+  LockLargeBlocks;
+  LPLargeBlock := LargeBlocksCircularList.NextLargeBlockHeader;
+  while LPLargeBlock <> @LargeBlocksCircularList do
+  begin
+    LLargeBlockSize := LPLargeBlock.BlockSizeAndFlags and DropMediumAndLargeFlagsMask;
+    Inc(AMemoryManagerState.AllocatedLargeBlockCount);
+    Inc(AMemoryManagerState.ReservedLargeBlockAddressSpace, LLargeBlockSize);
+    Inc(AMemoryManagerState.TotalAllocatedLargeBlockSize, LPLargeBlock.UserAllocatedSize);
+    {Get the next large block}
+    LPLargeBlock := LPLargeBlock.NextLargeBlockHeader;
+  end;
+  LargeBlocksLocked := False;
+end;
+
+{Returns a summary of the information returned by GetMemoryManagerState}
+procedure GetMemoryManagerUsageSummary(
+  var AMemoryManagerUsageSummary: TMemoryManagerUsageSummary);
+var
+  LMMS: TMemoryManagerState;
+  LAllocatedBytes, LReservedBytes: NativeUInt;
+  LSBTIndex: Integer;
+begin
+  {Get the memory manager state}
+  GetMemoryManagerState(LMMS);
+  {Add up the totals}
+  LAllocatedBytes := LMMS.TotalAllocatedMediumBlockSize
+    + LMMS.TotalAllocatedLargeBlockSize;
+  LReservedBytes := LMMS.ReservedMediumBlockAddressSpace
+    + LMMS.ReservedLargeBlockAddressSpace;
+  for LSBTIndex := 0 to NumSmallBlockTypes - 1 do
+  begin
+    Inc(LAllocatedBytes, LMMS.SmallBlockTypeStates[LSBTIndex].UseableBlockSize
+      * LMMS.SmallBlockTypeStates[LSBTIndex].AllocatedBlockCount);
+    Inc(LReservedBytes, LMMS.SmallBlockTypeStates[LSBTIndex].ReservedAddressSpace);
+  end;
+  {Set the structure values}
+  AMemoryManagerUsageSummary.AllocatedBytes := LAllocatedBytes;
+  AMemoryManagerUsageSummary.OverheadBytes := LReservedBytes - LAllocatedBytes;
+  if LReservedBytes > 0 then
+  begin
+    AMemoryManagerUsageSummary.EfficiencyPercentage :=
+      LAllocatedBytes / LReservedBytes * 100;
+  end
+  else
+    AMemoryManagerUsageSummary.EfficiencyPercentage := 100;
+end;
+
+{$ifndef POSIX}
+{Gets the state of every 64K block in the 4GB address space. Under 64-bit this
+ returns only the state for the low 4GB.}
+procedure GetMemoryMap(var AMemoryMap: TMemoryMap);
+var
+  LPMediumBlockPoolHeader: PMediumBlockPoolHeader;
+  LPLargeBlock: PLargeBlockHeader;
+  LInd, LChunkIndex, LNextChunk, LLargeBlockSize: NativeUInt;
+  LMBI: TMemoryBasicInformation;
+begin
+  {Clear the map}
+  FillChar(AMemoryMap, SizeOf(AMemoryMap), Ord(csUnallocated));
+  {Step through all the medium block pools}
+  LockMediumBlocks;
+  LPMediumBlockPoolHeader := MediumBlockPoolsCircularList.NextMediumBlockPoolHeader;
+  while LPMediumBlockPoolHeader <> @MediumBlockPoolsCircularList do
+  begin
+    {Add to the medium block used space}
+    LChunkIndex := NativeUInt(LPMediumBlockPoolHeader) shr 16;
+    for LInd := 0 to (MediumBlockPoolSize - 1) shr 16 do
+    begin
+      if (LChunkIndex + LInd) > High(AMemoryMap) then
+        Break;
+      AMemoryMap[LChunkIndex + LInd] := csAllocated;
+    end;
+    {Get the next medium block pool}
+    LPMediumBlockPoolHeader := LPMediumBlockPoolHeader.NextMediumBlockPoolHeader;
+  end;
+  MediumBlocksLocked := False;
+  {Step through all the large blocks}
+  LockLargeBlocks;
+  LPLargeBlock := LargeBlocksCircularList.NextLargeBlockHeader;
+  while LPLargeBlock <> @LargeBlocksCircularList do
+  begin
+    LChunkIndex := UIntPtr(LPLargeBlock) shr 16;
+    LLargeBlockSize := LPLargeBlock.BlockSizeAndFlags and DropMediumAndLargeFlagsMask;
+    for LInd := 0 to (LLargeBlockSize - 1) shr 16 do
+    begin
+      if (LChunkIndex + LInd) > High(AMemoryMap) then
+        Break;
+      AMemoryMap[LChunkIndex + LInd] := csAllocated;
+    end;
+    {Get the next large block}
+    LPLargeBlock := LPLargeBlock.NextLargeBlockHeader;
+  end;
+  LargeBlocksLocked := False;
+  {Fill in the rest of the map}
+  LInd := 0;
+  while LInd <= 65535 do
+  begin
+    {If the chunk is not allocated by this MM, what is its status?}
+    if AMemoryMap[LInd] = csUnallocated then
+    begin
+      {Query the address space starting at the chunk boundary}
+      if VirtualQuery(Pointer(LInd * 65536), LMBI, SizeOf(LMBI)) = 0 then
+      begin
+        {VirtualQuery may fail for addresses >2GB if a large address space is
+         not enabled.}
+        FillChar(AMemoryMap[LInd], 65536 - LInd, csSysReserved);
+        Break;
+      end;
+      {Get the chunk number after the region}
+      LNextChunk := (LMBI.RegionSize - 1) shr 16 + LInd + 1;
+      {Validate}
+      if LNextChunk > 65536 then
+        LNextChunk := 65536;
+      {Set the status of all the chunks in the region}
+      if LMBI.State = MEM_COMMIT then
+      begin
+        FillChar(AMemoryMap[LInd], LNextChunk - LInd, csSysAllocated);
+      end
+      else
+      begin
+        if LMBI.State = MEM_RESERVE then
+          FillChar(AMemoryMap[LInd], LNextChunk - LInd, csSysReserved);
+      end;
+      {Point to the start of the next chunk}
+      LInd := LNextChunk;
+    end
+    else
+    begin
+      {Next chunk}
+      Inc(LInd);
+    end;
+  end;
+end;
+{$endif}
+
+{Returns summarised information about the state of the memory manager. (For
+ backward compatibility.)}
+function FastGetHeapStatus: THeapStatus;
+var
+  LPMediumBlockPoolHeader: PMediumBlockPoolHeader;
+  LPMediumBlock: Pointer;
+  LBlockTypeIndex, LMediumBlockSize: Cardinal;
+  LSmallBlockUsage, LSmallBlockOverhead, LMediumBlockHeader, LLargeBlockSize: NativeUInt;
+  LInd: Integer;
+  LPLargeBlock: PLargeBlockHeader;
+begin
+  {Clear the structure}
+  FillChar(Result, SizeOf(Result), 0);
+  {Lock all small block types}
+  LockAllSmallBlockTypes;
+  {Lock the medium blocks}
+  LockMediumBlocks;
+  {Step through all the medium block pools}
+  LPMediumBlockPoolHeader := MediumBlockPoolsCircularList.NextMediumBlockPoolHeader;
+  while LPMediumBlockPoolHeader <> @MediumBlockPoolsCircularList do
+  begin
+    {Add to the total and committed address space}
+    Inc(Result.TotalAddrSpace, ((MediumBlockPoolSize + $ffff) and $ffff0000));
+    Inc(Result.TotalCommitted, ((MediumBlockPoolSize + $ffff) and $ffff0000));
+    {Add the medium block pool overhead}
+    Inc(Result.Overhead, (((MediumBlockPoolSize + $ffff) and $ffff0000)
+      - MediumBlockPoolSize + MediumBlockPoolHeaderSize));
+    {Get the first medium block in the pool}
+    LPMediumBlock := GetFirstMediumBlockInPool(LPMediumBlockPoolHeader);
+    while LPMediumBlock <> nil do
+    begin
+      {Get the block header}
+      LMediumBlockHeader := PNativeUInt(PByte(LPMediumBlock) - BlockHeaderSize)^;
+      {Get the block size}
+      LMediumBlockSize := LMediumBlockHeader and DropMediumAndLargeFlagsMask;
+      {Is the block in use?}
+      if LMediumBlockHeader and IsFreeBlockFlag = 0 then
+      begin
+        if (LMediumBlockHeader and IsSmallBlockPoolInUseFlag) <> 0 then
+        begin
+          {Get the block type index}
+          LBlockTypeIndex := (UIntPtr(PSmallBlockPoolHeader(LPMediumBlock).BlockType) - UIntPtr(@SmallBlockTypes[0])) div SizeOf(TSmallBlockType);
+          {Get the usage in the block}
+          LSmallBlockUsage := PSmallBlockPoolHeader(LPMediumBlock).BlocksInUse
+            * SmallBlockTypes[LBlockTypeIndex].BlockSize;
+          {Get the total overhead for all the small blocks}
+          LSmallBlockOverhead := PSmallBlockPoolHeader(LPMediumBlock).BlocksInUse
+              * (BlockHeaderSize{$ifdef FullDebugMode} + FullDebugBlockOverhead{$endif});
+          {Add to the totals}
+          Inc(Result.FreeSmall, LMediumBlockSize - LSmallBlockUsage - BlockHeaderSize);
+          Inc(Result.Overhead, LSmallBlockOverhead + BlockHeaderSize);
+          Inc(Result.TotalAllocated, LSmallBlockUsage - LSmallBlockOverhead);
+        end
+        else
+        begin
+{$ifdef FullDebugMode}
+          Dec(LMediumBlockSize, FullDebugBlockOverhead);
+          Inc(Result.Overhead, FullDebugBlockOverhead);
+{$endif}
+          {Add to the result}
+          Inc(Result.TotalAllocated, LMediumBlockSize - BlockHeaderSize);
+          Inc(Result.Overhead, BlockHeaderSize);
+        end;
+      end
+      else
+      begin
+        {The medium block is free}
+        Inc(Result.FreeBig, LMediumBlockSize);
+      end;
+      {Next medium block}
+      LPMediumBlock := NextMediumBlock(LPMediumBlock);
+    end;
+    {Get the next medium block pool}
+    LPMediumBlockPoolHeader := LPMediumBlockPoolHeader.NextMediumBlockPoolHeader;
+  end;
+  {Add the sequential feed unused space}
+  Inc(Result.Unused, MediumSequentialFeedBytesLeft);
+  {Unlock the medium blocks}
+  MediumBlocksLocked := False;
+  {Unlock all the small block types}
+  for LInd := 0 to NumSmallBlockTypes - 1 do
+    SmallBlockTypes[LInd].BlockTypeLocked := False;
+  {Step through all the large blocks}
+  LockLargeBlocks;
+  LPLargeBlock := LargeBlocksCircularList.NextLargeBlockHeader;
+  while LPLargeBlock <> @LargeBlocksCircularList do
+  begin
+    LLargeBlockSize := LPLargeBlock.BlockSizeAndFlags and DropMediumAndLargeFlagsMask;
+    Inc(Result.TotalAddrSpace, LLargeBlockSize);
+    Inc(Result.TotalCommitted, LLargeBlockSize);
+    Inc(Result.TotalAllocated, LPLargeBlock.UserAllocatedSize
+      {$ifdef FullDebugMode} - FullDebugBlockOverhead{$endif});
+    Inc(Result.Overhead, LLargeBlockSize - LPLargeBlock.UserAllocatedSize
+      {$ifdef FullDebugMode} + FullDebugBlockOverhead{$endif});
+    {Get the next large block}
+    LPLargeBlock := LPLargeBlock.NextLargeBlockHeader;
+  end;
+  LargeBlocksLocked := False;
+  {Set the total number of free bytes}
+  Result.TotalFree := Result.FreeSmall + Result.FreeBig + Result.Unused;
+end;
+
+{Frees all allocated memory. Does not support segmented large blocks (yet).}
+procedure FreeAllMemory;
+var
+  LPMediumBlockPoolHeader, LPNextMediumBlockPoolHeader: PMediumBlockPoolHeader;
+  LPMediumFreeBlock: PMediumFreeBlock;
+  LPLargeBlock, LPNextLargeBlock: PLargeBlockHeader;
+  LInd: Integer;
+begin
+  {Free all block pools}
+  LPMediumBlockPoolHeader := MediumBlockPoolsCircularList.NextMediumBlockPoolHeader;
+  while LPMediumBlockPoolHeader <> @MediumBlockPoolsCircularList do
+  begin
+    {Get the next medium block pool so long}
+    LPNextMediumBlockPoolHeader := LPMediumBlockPoolHeader.NextMediumBlockPoolHeader;
+{$ifdef ClearMediumBlockPoolsBeforeReturningToOS}
+    FillChar(LPMediumBlockPoolHeader^, MediumBlockPoolSize, 0);
+{$else}
+    {$ifdef ClearSmallAndMediumBlocksInFreeMem}
+    FillChar(LPMediumBlockPoolHeader^, MediumBlockPoolSize, 0);
+    {$endif}
+{$endif}
+    {Free this pool}
+    VirtualFree(LPMediumBlockPoolHeader, 0, MEM_RELEASE);
+    {Next pool}
+    LPMediumBlockPoolHeader := LPNextMediumBlockPoolHeader;
+  end;
+  {Clear all small block types}
+  for LInd := 0 to High(SmallBlockTypes) do
+  begin
+    SmallBlockTypes[Lind].PreviousPartiallyFreePool := @SmallBlockTypes[Lind];
+    SmallBlockTypes[Lind].NextPartiallyFreePool := @SmallBlockTypes[Lind];
+    SmallBlockTypes[Lind].NextSequentialFeedBlockAddress := Pointer(1);
+    SmallBlockTypes[Lind].MaxSequentialFeedBlockAddress := nil;
+  end;
+  {Clear all medium block pools}
+  MediumBlockPoolsCircularList.PreviousMediumBlockPoolHeader := @MediumBlockPoolsCircularList;
+  MediumBlockPoolsCircularList.NextMediumBlockPoolHeader := @MediumBlockPoolsCircularList;
+  {All medium bins are empty}
+  for LInd := 0 to High(MediumBlockBins) do
+  begin
+    LPMediumFreeBlock := @MediumBlockBins[LInd];
+    LPMediumFreeBlock.PreviousFreeBlock := LPMediumFreeBlock;
+    LPMediumFreeBlock.NextFreeBlock := LPMediumFreeBlock;
+  end;
+  MediumBlockBinGroupBitmap := 0;
+  FillChar(MediumBlockBinBitmaps, SizeOf(MediumBlockBinBitmaps), 0);
+  MediumSequentialFeedBytesLeft := 0;
+  {Free all large blocks}
+  LPLargeBlock := LargeBlocksCircularList.NextLargeBlockHeader;
+  while LPLargeBlock <> @LargeBlocksCircularList do
+  begin
+    {Get the next large block}
+    LPNextLargeBlock := LPLargeBlock.NextLargeBlockHeader;
+{$ifdef ClearLargeBlocksBeforeReturningToOS}
+    FillChar(LPLargeBlock^,
+      LPLargeBlock.BlockSizeAndFlags and DropMediumAndLargeFlagsMask, 0);
+{$endif}
+    {Free this large block}
+    VirtualFree(LPLargeBlock, 0, MEM_RELEASE);
+    {Next large block}
+    LPLargeBlock := LPNextLargeBlock;
+  end;
+  {There are no large blocks allocated}
+  LargeBlocksCircularList.PreviousLargeBlockHeader := @LargeBlocksCircularList;
+  LargeBlocksCircularList.NextLargeBlockHeader := @LargeBlocksCircularList;
+end;
+
+{----------------------------Memory Manager Setup-----------------------------}
+
+{Checks that no other memory manager has been installed after the RTL MM and
+ that there are currently no live pointers allocated through the RTL MM.}
+function CheckCanInstallMemoryManager: Boolean;
+{$ifndef NoMessageBoxes}
+var
+  LErrorMessageTitle: array[0..1023] of AnsiChar;
+{$endif}
+begin
+  {Default to error}
+  Result := False;
+{$ifdef FullDebugMode}
+  {$ifdef LoadDebugDLLDynamically}
+    {$ifdef DoNotInstallIfDLLMissing}
+  {Should FastMM be installed only if the FastMM_FullDebugMode.dll file is
+   available?}
+  if FullDebugModeDLL = 0 then
+    Exit;
+    {$endif}
+  {$endif}
+{$endif}
+  {Is FastMM already installed?}
+  if FastMMIsInstalled then
+  begin
+{$ifdef UseOutputDebugString}
+    OutputDebugStringA(AlreadyInstalledMsg);
+{$endif}
+{$ifndef NoMessageBoxes}
+    AppendStringToModuleName(AlreadyInstalledTitle, LErrorMessageTitle);
+    ShowMessageBox(AlreadyInstalledMsg, LErrorMessageTitle);
+{$endif}
+    Exit;
+  end;
+  {Has another MM been set, or has the Embarcadero MM been used? If so, this
+   file is not the first unit in the uses clause of the project's .dpr file.}
+  if IsMemoryManagerSet then
+  begin
+    {When using runtime packages, another library may already have installed
+     FastMM: Silently ignore the installation request.}
+{$ifndef UseRuntimePackages}
+    {Another memory manager has been set.}
+  {$ifdef UseOutputDebugString}
+    OutputDebugStringA(OtherMMInstalledMsg);
+  {$endif}
+  {$ifndef NoMessageBoxes}
+    AppendStringToModuleName(OtherMMInstalledTitle, LErrorMessageTitle);
+    ShowMessageBox(OtherMMInstalledMsg, LErrorMessageTitle);
+  {$endif}
+{$endif}
+    Exit;
+  end;
+{$ifndef POSIX}
+  if GetHeapStatus.TotalAllocated <> 0 then
+  begin
+    {Memory has been already been allocated with the RTL MM}
+{$ifdef UseOutputDebugString}
+    OutputDebugStringA(MemoryAllocatedMsg);
+{$endif}
+  {$ifndef NoMessageBoxes}
+    AppendStringToModuleName(MemoryAllocatedTitle, LErrorMessageTitle);
+    ShowMessageBox(MemoryAllocatedMsg, LErrorMessageTitle);
+  {$endif}
+    Exit;
+  end;
+{$endif}
+  {All OK}
+  Result := True;
+end;
+
+{Initializes the lookup tables for the memory manager}
+procedure InitializeMemoryManager;
+const
+  {The size of the Inc(VMTIndex) code in TFreedObject.GetVirtualMethodIndex}
+  VMTIndexIncCodeSize = 6;
+var
+  LInd, LSizeInd, LMinimumPoolSize, LOptimalPoolSize, LGroupNumber,
+    LBlocksPerPool, LPreviousBlockSize: Cardinal;
+  LPMediumFreeBlock: PMediumFreeBlock;
+begin
+{$ifdef FullDebugMode}
+  {$ifdef LoadDebugDLLDynamically}
+  {Attempt to load the FullDebugMode DLL dynamically.}
+  FullDebugModeDLL := LoadLibrary(FullDebugModeLibraryName);
+  if FullDebugModeDLL <> 0 then
+  begin
+    GetStackTrace := GetProcAddress(FullDebugModeDLL,
+      {$ifdef RawStackTraces}'GetRawStackTrace'{$else}'GetFrameBasedStackTrace'{$endif});
+    LogStackTrace := GetProcAddress(FullDebugModeDLL, 'LogStackTrace');
+  end;
+  {$endif}
+{$endif}
+{$ifdef EnableMMX}
+  {$ifndef ForceMMX}
+  UseMMX := MMX_Supported;
+  {$endif}
+{$endif}
+  {Initialize the memory manager}
+  {-------------Set up the small block types-------------}
+  LPreviousBlockSize := 0;
+  for LInd := 0 to High(SmallBlockTypes) do
+  begin
+    {Set the move procedure}
+{$ifdef UseCustomFixedSizeMoveRoutines}
+    {The upsize move procedure may move chunks in 16 bytes even with 8-byte
+    alignment, since the new size will always be at least 8 bytes bigger than
+    the old size.}
+    if not Assigned(SmallBlockTypes[LInd].UpsizeMoveProcedure) then
+  {$ifdef UseCustomVariableSizeMoveRoutines}
+      SmallBlockTypes[LInd].UpsizeMoveProcedure := MoveX16LP;
+  {$else}
+      SmallBlockTypes[LInd].UpsizeMoveProcedure := @System.Move;
+  {$endif}
+{$endif}
+    {Set the first "available pool" to the block type itself, so that the
+     allocation routines know that there are currently no pools with free
+     blocks of this size.}
+    SmallBlockTypes[LInd].PreviousPartiallyFreePool := @SmallBlockTypes[LInd];
+    SmallBlockTypes[LInd].NextPartiallyFreePool := @SmallBlockTypes[LInd];
+    {Set the block size to block type index translation table}
+    for LSizeInd := (LPreviousBlockSize div SmallBlockGranularity) to ((SmallBlockTypes[LInd].BlockSize - 1) div SmallBlockGranularity) do
+      AllocSize2SmallBlockTypeIndX4[LSizeInd] := LInd * 4;
+    {Cannot sequential feed yet: Ensure that the next address is greater than
+     the maximum address}
+    SmallBlockTypes[LInd].MaxSequentialFeedBlockAddress := Pointer(0);
+    SmallBlockTypes[LInd].NextSequentialFeedBlockAddress := Pointer(1);
+    {Get the mask to use for finding a medium block suitable for a block pool}
+    LMinimumPoolSize :=
+      ((SmallBlockTypes[LInd].BlockSize * MinimumSmallBlocksPerPool
+        + SmallBlockPoolHeaderSize + MediumBlockGranularity - 1 - MediumBlockSizeOffset)
+      and -MediumBlockGranularity) + MediumBlockSizeOffset;
+    if LMinimumPoolSize < MinimumMediumBlockSize then
+      LMinimumPoolSize := MinimumMediumBlockSize;
+    {Get the closest group number for the minimum pool size}
+    LGroupNumber := (LMinimumPoolSize - MinimumMediumBlockSize + MediumBlockBinsPerGroup * MediumBlockGranularity div 2)
+      div (MediumBlockBinsPerGroup * MediumBlockGranularity);
+    {Too large?}
+    if LGroupNumber > 7 then
+      LGroupNumber := 7;
+    {Set the bitmap}
+    SmallBlockTypes[LInd].AllowedGroupsForBlockPoolBitmap := Byte(-(1 shl LGroupNumber));
+    {Set the minimum pool size}
+    SmallBlockTypes[LInd].MinimumBlockPoolSize := MinimumMediumBlockSize + LGroupNumber * (MediumBlockBinsPerGroup * MediumBlockGranularity);
+    {Get the optimal block pool size}
+    LOptimalPoolSize := ((SmallBlockTypes[LInd].BlockSize * TargetSmallBlocksPerPool
+        + SmallBlockPoolHeaderSize + MediumBlockGranularity - 1 - MediumBlockSizeOffset)
+      and -MediumBlockGranularity) + MediumBlockSizeOffset;
+    {Limit the optimal pool size to within range}
+    if LOptimalPoolSize < OptimalSmallBlockPoolSizeLowerLimit then
+      LOptimalPoolSize := OptimalSmallBlockPoolSizeLowerLimit;
+    if LOptimalPoolSize > OptimalSmallBlockPoolSizeUpperLimit then
+      LOptimalPoolSize := OptimalSmallBlockPoolSizeUpperLimit;
+    {How many blocks will fit in the adjusted optimal size?}
+    LBlocksPerPool := (LOptimalPoolSize - SmallBlockPoolHeaderSize) div SmallBlockTypes[LInd].BlockSize;
+    {Recalculate the optimal pool size to minimize wastage due to a partial
+     last block.}
+    SmallBlockTypes[LInd].OptimalBlockPoolSize :=
+      ((LBlocksPerPool * SmallBlockTypes[LInd].BlockSize + SmallBlockPoolHeaderSize + MediumBlockGranularity - 1 - MediumBlockSizeOffset) and -MediumBlockGranularity) + MediumBlockSizeOffset;
+{$ifdef CheckHeapForCorruption}
+    {Debug checks}
+    if (SmallBlockTypes[LInd].OptimalBlockPoolSize < MinimumMediumBlockSize)
+      or (SmallBlockTypes[LInd].BlockSize div SmallBlockGranularity * SmallBlockGranularity <> SmallBlockTypes[LInd].BlockSize) then
+    begin
+  {$ifdef BCB6OrDelphi7AndUp}
+      System.Error(reInvalidPtr);
+  {$else}
+      System.RunError(reInvalidPtr);
+  {$endif}
+    end;
+{$endif}
+    {Set the previous small block size}
+    LPreviousBlockSize := SmallBlockTypes[LInd].BlockSize;
+  end;
+  {-------------------Set up the medium blocks-------------------}
+{$ifdef CheckHeapForCorruption}
+  {Check that there are no gaps between where the small blocks end and the
+   medium blocks start}
+  if (((MaximumSmallBlockSize - 3) + (MediumBlockGranularity - 1 + BlockHeaderSize - MediumBlockSizeOffset))
+    and -MediumBlockGranularity) + MediumBlockSizeOffset < MinimumMediumBlockSize then
+  begin
+  {$ifdef BCB6OrDelphi7AndUp}
+    System.Error(reInvalidPtr);
+  {$else}
+    System.RunError(reInvalidPtr);
+  {$endif}
+  end;
+{$endif}
+  {There are currently no medium block pools}
+  MediumBlockPoolsCircularList.PreviousMediumBlockPoolHeader := @MediumBlockPoolsCircularList;
+  MediumBlockPoolsCircularList.NextMediumBlockPoolHeader := @MediumBlockPoolsCircularList;
+  {All medium bins are empty}
+  for LInd := 0 to High(MediumBlockBins) do
+  begin
+    LPMediumFreeBlock := @MediumBlockBins[LInd];
+    LPMediumFreeBlock.PreviousFreeBlock := LPMediumFreeBlock;
+    LPMediumFreeBlock.NextFreeBlock := LPMediumFreeBlock;
+  end;
+  {------------------Set up the large blocks---------------------}
+  LargeBlocksCircularList.PreviousLargeBlockHeader := @LargeBlocksCircularList;
+  LargeBlocksCircularList.NextLargeBlockHeader := @LargeBlocksCircularList;
+  {------------------Set up the debugging structures---------------------}
+{$ifdef FullDebugMode}
+  {Set up the fake VMT}
+  {Copy the basic info from the TFreedObject class}
+  System.Move(Pointer(PByte(TFreedObject) + vmtSelfPtr + SizeOf(Pointer))^,
+    FreedObjectVMT.VMTData[vmtSelfPtr + SizeOf(Pointer)], vmtParent - vmtSelfPtr);
+  PNativeUInt(@FreedObjectVMT.VMTData[vmtSelfPtr])^ := NativeUInt(@FreedObjectVMT.VMTMethods[0]);
+  {Set up the virtual method table}
+  for LInd := 0 to MaxFakeVMTEntries - 1 do
+  begin
+    PNativeUInt(@FreedObjectVMT.VMTMethods[Low(FreedObjectVMT.VMTMethods) + Integer(LInd * SizeOf(Pointer))])^ :=
+      NativeUInt(@TFreedObject.GetVirtualMethodIndex) + LInd * VMTIndexIncCodeSize;
+  {$ifdef CatchUseOfFreedInterfaces}
+    VMTBadInterface[LInd] := @TFreedObject.InterfaceError;
+  {$endif}
+  end;
+  {Set up the default log file name}
+  SetDefaultMMLogFileName;
+{$endif}
+end;
+
+{Installs the memory manager (InitializeMemoryManager should be called first)}
+procedure InstallMemoryManager;
+{$ifdef MMSharingEnabled}
+var
+  i, LCurrentProcessID: Cardinal;
+  LPMapAddress: PPointer;
+  LChar: AnsiChar;
+{$endif}
+begin
+  if not FastMMIsInstalled then
+  begin
+{$ifdef FullDebugMode}
+  {$ifdef 32Bit}
+    {Try to reserve the 64K block covering address $80808080}
+    ReservedBlock := VirtualAlloc(Pointer(DebugReservedAddress), 65536, MEM_RESERVE, PAGE_NOACCESS);
+  {$endif}
+{$endif}
+{$ifdef MMSharingEnabled}
+    {Build a string identifying the current process}
+    LCurrentProcessID := GetCurrentProcessId;
+    for i := 0 to 7 do
+    begin
+      LChar := HexTable[((LCurrentProcessID shr (i * 4)) and $F)];
+      MappingObjectName[(High(MappingObjectName) - 1) - i] := LChar;
+  {$ifdef EnableBackwardCompatibleMMSharing}
+      UniqueProcessIDString[8 - i] := LChar;
+      UniqueProcessIDStringBE[8 - i] := LChar;
+  {$endif}
+    end;
+{$endif}
+{$ifdef AttemptToUseSharedMM}
+    {Is the replacement memory manager already installed for this process?}
+{$ifdef EnableBackwardCompatibleMMSharing}
+    MMWindow := FindWindowA('STATIC', PAnsiChar(@UniqueProcessIDString[1]));
+    MMWindowBE := FindWindowA('STATIC', PAnsiChar(@UniqueProcessIDStringBE[1]));
+{$endif}
+    MappingObjectHandle := OpenFileMappingA(FILE_MAP_READ, False, MappingObjectName);
+    {Is no MM being shared?}
+{$ifdef EnableBackwardCompatibleMMSharing}
+    if (MMWindow or MMWindowBE or MappingObjectHandle) = 0 then
+{$else}
+    if MappingObjectHandle = 0 then
+{$endif}
+    begin
+{$endif}
+{$ifdef ShareMM}
+      {Share the MM with other DLLs? - if this DLL is unloaded, then
+       dependent DLLs will cause a crash.}
+  {$ifndef ShareMMIfLibrary}
+      if not IsLibrary then
+  {$endif}
+      begin
+  {$ifdef EnableBackwardCompatibleMMSharing}
+        {No memory manager installed yet - create the invisible window}
+        MMWindow := CreateWindowA('STATIC', PAnsiChar(@UniqueProcessIDString[1]),
+          WS_POPUP, 0, 0, 0, 0, 0, 0, hInstance, nil);
+        MMWindowBE := CreateWindowA('STATIC', PAnsiChar(@UniqueProcessIDStringBE[1]),
+          WS_POPUP, 0, 0, 0, 0, 0, 0, hInstance, nil);
+        {The window data is a pointer to this memory manager}
+        if MMWindow <> 0 then
+          SetWindowLongA(MMWindow, GWL_USERDATA, NativeInt(@NewMemoryManager));
+        if MMWindowBE <> 0 then
+          SetWindowLongA(MMWindowBE, GWL_USERDATA, NativeInt(@NewMemoryManager));
+  {$endif}
+        {Create the memory mapped file}
+        MappingObjectHandle := CreateFileMappingA(INVALID_HANDLE_VALUE, nil,
+          PAGE_READWRITE, 0, SizeOf(Pointer), MappingObjectName);
+        {Map a view of the memory}
+        LPMapAddress := MapViewOfFile(MappingObjectHandle, FILE_MAP_WRITE, 0, 0, 0);
+        {Set a pointer to the new memory manager}
+        LPMapAddress^ := @NewMemoryManager;
+        {Unmap the file}
+        UnmapViewOfFile(LPMapAddress);
+      end;
+{$endif}
+      {We will be using this memory manager}
+{$ifndef FullDebugMode}
+      NewMemoryManager.GetMem := FastGetMem;
+      NewMemoryManager.FreeMem := FastFreeMem;
+      NewMemoryManager.ReallocMem := FastReallocMem;
+{$else}
+      NewMemoryManager.GetMem := DebugGetMem;
+      NewMemoryManager.FreeMem := DebugFreeMem;
+      NewMemoryManager.ReallocMem := DebugReallocMem;
+{$endif}
+{$ifdef BDS2006AndUp}
+  {$ifndef FullDebugMode}
+      NewMemoryManager.AllocMem := FastAllocMem;
+  {$else}
+      NewMemoryManager.AllocMem := DebugAllocMem;
+  {$endif}
+  {$ifdef EnableMemoryLeakReporting}
+      NewMemoryManager.RegisterExpectedMemoryLeak := RegisterExpectedMemoryLeak;
+      NewMemoryManager.UnRegisterExpectedMemoryLeak := UnRegisterExpectedMemoryLeak;
+  {$else}
+      NewMemoryManager.RegisterExpectedMemoryLeak := NoOpRegisterExpectedMemoryLeak;
+      NewMemoryManager.UnRegisterExpectedMemoryLeak := NoOpUnRegisterExpectedMemoryLeak;
+  {$endif}
+{$endif}
+      {Owns the memory manager}
+      IsMemoryManagerOwner := True;
+{$ifdef AttemptToUseSharedMM}
+    end
+    else
+    begin
+      {Get the address of the shared memory manager}
+  {$ifndef BDS2006AndUp}
+    {$ifdef EnableBackwardCompatibleMMSharing}
+      if MappingObjectHandle <> 0 then
+      begin
+    {$endif}
+        {Map a view of the memory}
+        LPMapAddress := MapViewOfFile(MappingObjectHandle, FILE_MAP_READ, 0, 0, 0);
+        {Set the new memory manager}
+        NewMemoryManager := PMemoryManager(LPMapAddress^)^;
+        {Unmap the file}
+        UnmapViewOfFile(LPMapAddress);
+    {$ifdef EnableBackwardCompatibleMMSharing}
+      end
+      else
+      begin
+        if MMWindow <> 0 then
+        begin
+          NewMemoryManager := PMemoryManager(GetWindowLong(MMWindow, GWL_USERDATA))^;
+        end
+        else
+        begin
+          NewMemoryManager := PMemoryManager(GetWindowLong(MMWindowBE, GWL_USERDATA))^;
+        end;
+      end;
+    {$endif}
+  {$else}
+    {$ifdef EnableBackwardCompatibleMMSharing}
+      if MappingObjectHandle <> 0 then
+      begin
+    {$endif}
+        {Map a view of the memory}
+        LPMapAddress := MapViewOfFile(MappingObjectHandle, FILE_MAP_READ, 0, 0, 0);
+        {Set the new memory manager}
+        NewMemoryManager := PMemoryManagerEx(LPMapAddress^)^;
+        {Unmap the file}
+        UnmapViewOfFile(LPMapAddress);
+    {$ifdef EnableBackwardCompatibleMMSharing}
+      end
+      else
+      begin
+        if MMWindow <> 0 then
+        begin
+          NewMemoryManager := PMemoryManagerEx(GetWindowLong(MMWindow, GWL_USERDATA))^;
+        end
+        else
+        begin
+          NewMemoryManager := PMemoryManagerEx(GetWindowLong(MMWindowBE, GWL_USERDATA))^;
+        end;
+      end;
+    {$endif}
+  {$endif}
+      {Close the file mapping handle}
+      CloseHandle(MappingObjectHandle);
+      MappingObjectHandle := 0;
+      {The memory manager is not owned by this module}
+      IsMemoryManagerOwner := False;
+    end;
+{$endif}
+    {Save the old memory manager}
+    GetMemoryManager(OldMemoryManager);
+    {Replace the memory manager with either this one or the shared one.}
+    SetMemoryManager(NewMemoryManager);
+    {FastMM is now installed}
+    FastMMIsInstalled := True;
+{$ifdef UseOutputDebugString}
+    if IsMemoryManagerOwner then
+      OutputDebugStringA(FastMMInstallMsg)
+    else
+      OutputDebugStringA(FastMMInstallSharedMsg);
+{$endif}
+  end;
+end;
+
+procedure UninstallMemoryManager;
+begin
+  {Is this the owner of the shared MM window?}
+  if IsMemoryManagerOwner then
+  begin
+{$ifdef ShareMM}
+  {$ifdef EnableBackwardCompatibleMMSharing}
+    {Destroy the window}
+    if MMWindow <> 0 then
+    begin
+      DestroyWindow(MMWindow);
+      MMWindow := 0;
+    end;
+    if MMWindowBE <> 0 then
+    begin
+      DestroyWindow(MMWindowBE);
+      MMWindowBE := 0;
+    end;
+  {$endif}
+    {Destroy the memory mapped file handle}
+    if MappingObjectHandle <> 0 then
+    begin
+      CloseHandle(MappingObjectHandle);
+      MappingObjectHandle := 0;
+    end;
+{$endif}
+{$ifdef FullDebugMode}
+    {Release the reserved block}
+    if ReservedBlock <> nil then
+    begin
+      VirtualFree(ReservedBlock, 0, MEM_RELEASE);
+      ReservedBlock := nil;
+    end;
+{$endif}
+  end;
+{$ifndef DetectMMOperationsAfterUninstall}
+  {Restore the old memory manager}
+  SetMemoryManager(OldMemoryManager);
+{$else}
+  {Set the invalid memory manager: no more MM operations allowed}
+  SetMemoryManager(InvalidMemoryManager);
+{$endif}
+  {Memory manager has been uninstalled}
+  FastMMIsInstalled := False;
+{$ifdef UseOutputDebugString}
+  if IsMemoryManagerOwner then
+    OutputDebugStringA(FastMMUninstallMsg)
+  else
+    OutputDebugStringA(FastMMUninstallSharedMsg);
+{$endif}
+end;
+
+procedure FinalizeMemoryManager;
+begin
+  {Restore the old memory manager if FastMM has been installed}
+  if FastMMIsInstalled then
+  begin
+{$ifndef NeverUninstall}
+    {Uninstall FastMM}
+    UninstallMemoryManager;
+{$endif}
+    {Do we own the memory manager, or are we just sharing it?}
+    if IsMemoryManagerOwner then
+    begin
+{$ifdef CheckUseOfFreedBlocksOnShutdown}
+      CheckBlocksOnShutdown(
+  {$ifdef EnableMemoryLeakReporting}
+        True
+    {$ifdef RequireIDEPresenceForLeakReporting}
+        and DelphiIsRunning
+    {$endif}
+    {$ifdef RequireDebuggerPresenceForLeakReporting}
+        and ((DebugHook <> 0)
+        {$ifdef PatchBCBTerminate}
+        or (Assigned(pCppDebugHook) and (pCppDebugHook^ <> 0))
+        {$endif PatchBCBTerminate}
+        )
+    {$endif}
+    {$ifdef ManualLeakReportingControl}
+        and ReportMemoryLeaksOnShutdown
+    {$endif}
+  {$else}
+        False
+  {$endif}
+      );
+{$else}
+  {$ifdef EnableMemoryLeakReporting}
+      if True
+    {$ifdef RequireIDEPresenceForLeakReporting}
+        and DelphiIsRunning
+    {$endif}
+    {$ifdef RequireDebuggerPresenceForLeakReporting}
+        and ((DebugHook <> 0)
+        {$ifdef PatchBCBTerminate}
+        or (Assigned(pCppDebugHook) and (pCppDebugHook^ <> 0))
+        {$endif PatchBCBTerminate}
+        )
+    {$endif}
+    {$ifdef ManualLeakReportingControl}
+        and ReportMemoryLeaksOnShutdown
+    {$endif}
+      then
+        CheckBlocksOnShutdown(True);
+  {$endif}
+{$endif}
+{$ifdef EnableMemoryLeakReporting}
+      {Free the expected memory leaks list}
+      if ExpectedMemoryLeaks <> nil then
+      begin
+        VirtualFree(ExpectedMemoryLeaks, 0, MEM_RELEASE);
+        ExpectedMemoryLeaks := nil;
+      end;
+{$endif}
+{$ifndef NeverUninstall}
+      {Clean up: Free all memory. If this is a .DLL that owns its own MM, then
+       it is necessary to prevent the main application from running out of
+       address space.}
+      FreeAllMemory;
+{$endif}
+    end;
+  end;
+end;
+
+procedure RunInitializationCode;
+begin
+  {Only run this code once during startup.}
+  if InitializationCodeHasRun then
+    Exit;
+  InitializationCodeHasRun := True;
+{$ifndef BCB}
+  {$ifdef InstallOnlyIfRunningInIDE}
+  if (DebugHook <> 0) and DelphiIsRunning then
+  {$endif}
+  begin
+    {Initialize all the lookup tables, etc. for the memory manager}
+    InitializeMemoryManager;
+    {Has another MM been set, or has the Embarcadero MM been used? If so, this
+     file is not the first unit in the uses clause of the project's .dpr
+     file.}
+    if CheckCanInstallMemoryManager then
+    begin
+    {$ifdef ClearLogFileOnStartup}
+      DeleteEventLog;
+    {$endif}
+      InstallMemoryManager;
+    end;
+  end;
+{$endif}
+end;
+
+initialization
+  RunInitializationCode;
+
+finalization
+{$ifndef PatchBCBTerminate}
+  FinalizeMemoryManager;
+{$endif}
+
+end.
\ No newline at end of file
diff --git a/dep/fastmm/Delphi/FastMM4Messages.pas b/dep/fastmm/Delphi/FastMM4Messages.pas
new file mode 100644
index 00000000000..0c9485d6071
--- /dev/null
+++ b/dep/fastmm/Delphi/FastMM4Messages.pas
@@ -0,0 +1,135 @@
+{
+
+Fast Memory Manager: Messages
+
+English translation by Pierre le Riche.
+
+}
+
+unit FastMM4Messages;
+
+interface
+
+{$Include FastMM4Options.inc}
+
+const
+  {The name of the debug info support DLL}
+  FullDebugModeLibraryName32Bit = 'FastMM_FullDebugMode.dll';
+  FullDebugModeLibraryName64Bit = 'FastMM_FullDebugMode64.dll';
+  {Event log strings}
+  LogFileExtension = '_MemoryManager_EventLog.txt'#0;
+  CRLF = #13#10;
+  EventSeparator = '--------------------------------';
+  {Class name messages}
+  UnknownClassNameMsg = 'Unknown';
+  {Memory dump message}
+  MemoryDumpMsg = #13#10#13#10'Current memory dump of 256 bytes starting at pointer address ';
+  {Block Error Messages}
+  BlockScanLogHeader = 'Allocated block logged by LogAllocatedBlocksToFile. The size is: ';
+  ErrorMsgHeader = 'FastMM has detected an error during a ';
+  GetMemMsg = 'GetMem';
+  FreeMemMsg = 'FreeMem';
+  ReallocMemMsg = 'ReallocMem';
+  BlockCheckMsg = 'free block scan';
+  OperationMsg = ' operation. ';
+  BlockHeaderCorruptedMsg = 'The block header has been corrupted. ';
+  BlockFooterCorruptedMsg = 'The block footer has been corrupted. ';
+  FreeModifiedErrorMsg = 'FastMM detected that a block has been modified after being freed. ';
+  FreeModifiedDetailMsg = #13#10#13#10'Modified byte offsets (and lengths): ';
+  DoubleFreeErrorMsg = 'An attempt has been made to free/reallocate an unallocated block.';
+  WrongMMFreeErrorMsg = 'An attempt has been made to free/reallocate a block that was allocated through a different FastMM instance. Check your memory manager sharing settings.';
+  PreviousBlockSizeMsg = #13#10#13#10'The previous block size was: ';
+  CurrentBlockSizeMsg = #13#10#13#10'The block size is: ';
+  PreviousObjectClassMsg = #13#10#13#10'The block was previously used for an object of class: ';
+  CurrentObjectClassMsg = #13#10#13#10'The block is currently used for an object of class: ';
+  PreviousAllocationGroupMsg = #13#10#13#10'The allocation group was: ';
+  PreviousAllocationNumberMsg = #13#10#13#10'The allocation number was: ';
+  CurrentAllocationGroupMsg = #13#10#13#10'The allocation group is: ';
+  CurrentAllocationNumberMsg = #13#10#13#10'The allocation number is: ';
+  BlockErrorMsgTitle = 'Memory Error Detected';
+  VirtualMethodErrorHeader = 'FastMM has detected an attempt to call a virtual method on a freed object. An access violation will now be raised in order to abort the current operation.';
+  InterfaceErrorHeader = 'FastMM has detected an attempt to use an interface of a freed object. An access violation will now be raised in order to abort the current operation.';
+  BlockHeaderCorruptedNoHistoryMsg = ' Unfortunately the block header has been corrupted so no history is available.';
+  FreedObjectClassMsg = #13#10#13#10'Freed object class: ';
+  VirtualMethodName = #13#10#13#10'Virtual method: ';
+  VirtualMethodOffset = 'Offset +';
+  VirtualMethodAddress = #13#10#13#10'Virtual method address: ';
+  {Stack trace messages}
+  CurrentThreadIDMsg = #13#10#13#10'The current thread ID is 0x';
+  CurrentStackTraceMsg = ', and the stack trace (return addresses) leading to this error is:';
+  ThreadIDPrevAllocMsg = #13#10#13#10'This block was previously allocated by thread 0x';
+  ThreadIDAtAllocMsg = #13#10#13#10'This block was allocated by thread 0x';
+  ThreadIDAtFreeMsg = #13#10#13#10'The block was previously freed by thread 0x';
+  ThreadIDAtObjectAllocMsg = #13#10#13#10'The object was allocated by thread 0x';
+  ThreadIDAtObjectFreeMsg = #13#10#13#10'The object was subsequently freed by thread 0x';
+  StackTraceMsg = ', and the stack trace (return addresses) at the time was:';
+  {Installation Messages}
+  AlreadyInstalledMsg = 'FastMM4 is already installed.';
+  AlreadyInstalledTitle = 'Already installed.';
+  OtherMMInstalledMsg = 'FastMM4 cannot be installed since another third party memory '
+    + 'manager has already installed itself.'#13#10'If you want to use FastMM4, '
+    + 'please make sure that FastMM4.pas is the very first unit in the "uses"'
+    + #13#10'section of your project''s .dpr file.';
+  OtherMMInstalledTitle = 'Cannot install FastMM4 - Another memory manager is already installed';
+  MemoryAllocatedMsg = 'FastMM4 cannot install since memory has already been '
+    + 'allocated through the default memory manager.'#13#10'FastMM4.pas MUST '
+    + 'be the first unit in your project''s .dpr file, otherwise memory may '
+    + 'be allocated'#13#10'through the default memory manager before FastMM4 '
+    + 'gains control. '#13#10#13#10'If you are using an exception trapper '
+    + 'like MadExcept (or any tool that modifies the unit initialization '
+    + 'order),'#13#10'go into its configuration page and ensure that the '
+    + 'FastMM4.pas unit is initialized before any other unit.';
+  MemoryAllocatedTitle = 'Cannot install FastMM4 - Memory has already been allocated';
+  {Leak checking messages}
+  LeakLogHeader = 'A memory block has been leaked. The size is: ';
+  LeakMessageHeader = 'This application has leaked memory. ';
+  SmallLeakDetail = 'The small block leaks are'
+{$ifdef HideExpectedLeaksRegisteredByPointer}
+    + ' (excluding expected leaks registered by pointer)'
+{$endif}
+    + ':'#13#10;
+  LargeLeakDetail = 'The sizes of leaked medium and large blocks are'
+{$ifdef HideExpectedLeaksRegisteredByPointer}
+    + ' (excluding expected leaks registered by pointer)'
+{$endif}
+    + ': ';
+  BytesMessage = ' bytes: ';
+  AnsiStringBlockMessage = 'AnsiString';
+  UnicodeStringBlockMessage = 'UnicodeString';
+  LeakMessageFooter = #13#10
+{$ifndef HideMemoryLeakHintMessage}
+    + #13#10'Note: '
+  {$ifdef RequireIDEPresenceForLeakReporting}
+    + 'This memory leak check is only performed if Delphi is currently running on the same computer. '
+  {$endif}
+  {$ifdef FullDebugMode}
+    {$ifdef LogMemoryLeakDetailToFile}
+    + 'Memory leak detail is logged to a text file in the same folder as this application. '
+    {$else}
+    + 'Enable the "LogMemoryLeakDetailToFile" to obtain a log file containing detail on memory leaks. '
+    {$endif}
+  {$else}
+    + 'To obtain a log file containing detail on memory leaks, enable the "FullDebugMode" and "LogMemoryLeakDetailToFile" conditional defines. '
+  {$endif}
+    + 'To disable this memory leak check, undefine "EnableMemoryLeakReporting".'#13#10
+{$endif}
+    + #0;
+  LeakMessageTitle = 'Memory Leak Detected';
+{$ifdef UseOutputDebugString}
+  FastMMInstallMsg = 'FastMM has been installed.';
+  FastMMInstallSharedMsg = 'Sharing an existing instance of FastMM.';
+  FastMMUninstallMsg = 'FastMM has been uninstalled.';
+  FastMMUninstallSharedMsg = 'Stopped sharing an existing instance of FastMM.';
+{$endif}
+{$ifdef DetectMMOperationsAfterUninstall}
+  InvalidOperationTitle = 'MM Operation after uninstall.';
+  InvalidGetMemMsg = 'FastMM has detected a GetMem call after FastMM was uninstalled.';
+  InvalidFreeMemMsg = 'FastMM has detected a FreeMem call after FastMM was uninstalled.';
+  InvalidReallocMemMsg = 'FastMM has detected a ReallocMem call after FastMM was uninstalled.';
+  InvalidAllocMemMsg = 'FastMM has detected an AllocMem call after FastMM was uninstalled.';
+{$endif}
+
+implementation
+
+end.
+
diff --git a/dep/fastmm/Delphi/FastMM4Options.inc b/dep/fastmm/Delphi/FastMM4Options.inc
new file mode 100644
index 00000000000..a159e833c00
--- /dev/null
+++ b/dep/fastmm/Delphi/FastMM4Options.inc
@@ -0,0 +1,426 @@
+{
+
+Fast Memory Manager: Options Include File
+
+Set the default options for FastMM here.
+
+}
+
+{---------------------------Miscellaneous Options-----------------------------}
+
+{Enable this define to align all blocks on 16 byte boundaries so aligned SSE
+ instructions can be used safely. If this option is disabled then some of the
+ smallest block sizes will be 8-byte aligned instead which may result in a
+ reduction in memory usage. Medium and large blocks are always 16-byte aligned
+ irrespective of this setting.}
+{$define Align16Bytes}
+
+{Enable to use faster fixed-size move routines when upsizing small blocks.
+ These routines are much faster than the Borland RTL move procedure since they
+ are optimized to move a fixed number of bytes. This option may be used
+ together with the FastMove library for even better performance.}
+{$define UseCustomFixedSizeMoveRoutines}
+
+{Enable this option to use an optimized procedure for moving a memory block of
+ an arbitrary size. Disable this option when using the Fastcode move
+ ("FastMove") library. Using the Fastcode move library allows your whole
+ application to gain from faster move routines, not just the memory manager. It
+ is thus recommended that you use the Fastcode move library in conjunction with
+ this memory manager and disable this option.}
+{$define UseCustomVariableSizeMoveRoutines}
+
+{Enable this option to only install FastMM as the memory manager when the
+ application is running inside the Delphi IDE. This is useful when you want
+ to deploy the same EXE that you use for testing, but only want the debugging
+ features active on development machines. When this option is enabled and
+ the application is not being run inside the IDE debugger, then the default
+ Delphi memory manager will be used (which, since Delphi 2006, is FastMM
+ without FullDebugMode.}
+{.$define InstallOnlyIfRunningInIDE}
+
+{Due to QC#14070 ("Delphi IDE attempts to free memory after the shutdown code
+ of borlndmm.dll has been called"), FastMM cannot be uninstalled safely when
+ used inside a replacement borlndmm.dll for the IDE. Setting this option will
+ circumvent this problem by never uninstalling the memory manager.}
+{.$define NeverUninstall}
+
+{Set this option when you use runtime packages in this application or library.
+ This will automatically set the "AssumeMultiThreaded" option. Note that you
+ have to ensure that FastMM is finalized after all live pointers have been
+ freed - failure to do so will result in a large leak report followed by a lot
+ of A/Vs. (See the FAQ for more detail.) You may have to combine this option
+ with the NeverUninstall option.}
+{.$define UseRuntimePackages}
+
+{-----------------------Concurrency Management Options------------------------}
+
+{Enable to always assume that the application is multithreaded. Enabling this
+ option will cause a significant performance hit with single threaded
+ applications. Enable if you are using multi-threaded third party tools that do
+ not properly set the IsMultiThread variable. Also set this option if you are
+ going to share this memory manager between a single threaded application and a
+ multi-threaded DLL.}
+{$define AssumeMultiThreaded}
+
+{Enable this option to not call Sleep when a thread contention occurs. This
+ option will improve performance if the ratio of the number of active threads
+ to the number of CPU cores is low (typically < 2). With this option set a
+ thread will usually enter a "busy waiting" loop instead of relinquishing its
+ timeslice when a thread contention occurs, unless UseSwitchToThread is
+ also defined (see below) in which case it will call SwitchToThread instead of
+ Sleep.}
+{$define NeverSleepOnThreadContention}
+
+  {Set this option to call SwitchToThread instead of sitting in a "busy waiting"
+   loop when a thread contention occurs. This is used in conjunction with the
+   NeverSleepOnThreadContention option, and has no effect unless
+   NeverSleepOnThreadContention is also defined. This option may improve
+   performance with many CPU cores and/or threads of different priorities. Note
+   that the SwitchToThread API call is only available on Windows 2000 and later.
+  {$define UseSwitchToThread}
+
+{-----------------------------Debugging Options-------------------------------}
+
+{Enable this option to suppress the generation of debug info for the
+ FastMM4.pas unit. This will prevent the integrated debugger from stepping into
+ the memory manager code.}
+{$define NoDebugInfo}
+
+{Enable this option to suppress the display of all message dialogs. This is
+ useful in service applications that should not be interrupted.}
+{$define NoMessageBoxes}
+
+{Set this option to use the Windows API OutputDebugString procedure to output
+ debug strings on startup/shutdown and when errors occur.}
+{.$define UseOutputDebugString}
+
+{Set this option to use the assembly language version which is faster than the
+ pascal version. Disable only for debugging purposes. Setting the
+ CheckHeapForCorruption option automatically disables this option.}
+{$define ASMVersion}
+
+{FastMM always catches attempts to free the same memory block twice, however it
+ can also check for corruption of the memory heap (typically due to the user
+ program overwriting the bounds of allocated memory). These checks are
+ expensive, and this option should thus only be used for debugging purposes.
+ If this option is set then the ASMVersion option is automatically disabled.}
+{.$define CheckHeapForCorruption}
+
+{Enable this option to catch attempts to perform MM operations after FastMM has
+ been uninstalled. With this option set when FastMM is uninstalled it will not
+ install the previous MM, but instead a dummy MM handler that throws an error
+ if any MM operation is attempted. This will catch attempts to use the MM
+ after FastMM has been uninstalled.}
+{X$define DetectMMOperationsAfterUninstall}
+
+{Set the following option to do extensive checking of all memory blocks. All
+ blocks are padded with both a header and trailer that are used to verify the
+ integrity of the heap. Freed blocks are also cleared to to ensure that they
+ cannot be reused after being freed. This option slows down memory operations
+ dramatically and should only be used to debug an application that is
+ overwriting memory or reusing freed pointers. Setting this option
+ automatically enables CheckHeapForCorruption and disables ASMVersion.
+ Very important: If you enable this option your application will require the
+ FastMM_FullDebugMode.dll library. If this library is not available you will
+ get an error on startup.}
+{.$define FullDebugMode}
+
+  {Set this option to perform "raw" stack traces, i.e. check all entries on the
+   stack for valid return addresses. Note that this is significantly slower
+   than using the stack frame tracing method, but is usually more complete. Has
+   no effect unless FullDebugMode is enabled}
+  {$define RawStackTraces}
+
+  {Set this option to check for user code that uses an interface of a freed
+   object. Note that this will disable the checking of blocks modified after
+   being freed (the two are not compatible). This option has no effect if
+   FullDebugMode is not also enabled.}
+  {.$define CatchUseOfFreedInterfaces}
+
+  {Set this option to log all errors to a text file in the same folder as the
+   application. Memory errors (with the FullDebugMode option set) will be
+   appended to the log file. Has no effect if "FullDebugMode" is not set.}
+  {$define LogErrorsToFile}
+
+  {Set this option to log all memory leaks to a text file in the same folder as
+   the application. Memory leak reports (with the FullDebugMode option set)
+   will be appended to the log file. Has no effect if "LogErrorsToFile" and
+   "FullDebugMode" are not also set. Note that usually all leaks are always
+   logged, even if they are "expected" leaks registered through
+   AddExpectedMemoryLeaks. Expected leaks registered by pointer may be excluded
+   through the HideExpectedLeaksRegisteredByPointer option.}
+  {$define LogMemoryLeakDetailToFile}
+
+  {Deletes the error log file on startup. No effect if LogErrorsToFile is not
+   also set.}
+  {.$define ClearLogFileOnStartup}
+
+  {Loads the FASTMM_FullDebugMode.dll dynamically. If the DLL cannot be found
+   then stack traces will not be available. Note that this may cause problems
+   due to a changed DLL unload order when sharing the memory manager. Use with
+   care.}
+  {.$define LoadDebugDLLDynamically}
+
+    {.$define DoNotInstallIfDLLMissing}
+    {If the FastMM_FullDebugMode.dll file is not available then FastMM will not
+     install itself. No effect unless FullDebugMode and LoadDebugDLLDynamically
+     are also defined.}
+
+  {FastMM usually allocates large blocks from the topmost available address and
+   medium and small blocks from the lowest available address (This reduces
+   fragmentation somewhat). With this option set all blocks are always
+   allocated from the highest available address. If the process has a >2GB
+   address space and contains bad pointer arithmetic code, this option should
+   help to catch those errors sooner.}
+  {$define AlwaysAllocateTopDown}
+
+  {Disables the logging of memory dumps together with the other detail for
+   memory errors.}
+  {.$define DisableLoggingOfMemoryDumps}
+
+  {If FastMM encounters a problem with a memory block inside the FullDebugMode
+   FreeMem handler then an "invalid pointer operation" exception will usually
+   be raised. If the FreeMem occurs while another exception is being handled
+   (perhaps in the try.. finally code) then the original exception will be
+   lost. With this option set FastMM will ignore errors inside FreeMem when an
+   exception is being handled, thus allowing the original exception to
+   propagate.}
+  {$define SuppressFreeMemErrorsInsideException}
+
+  {Adds support for notification of memory manager events in FullDebugMode.
+   With this define set, the application may assign the OnDebugGetMemFinish,
+   OnDebugFreeMemStart, etc. callbacks in order to be notified when the
+   particular memory manager event occurs.}
+  {.$define FullDebugModeCallBacks}
+
+{---------------------------Memory Leak Reporting-----------------------------}
+
+{Set this option to enable reporting of memory leaks. Combine it with the two
+ options below for further fine-tuning.}
+{X$define EnableMemoryLeakReporting}
+
+  {Set this option to suppress the display and logging of expected memory leaks
+   that were registered by pointer. Leaks registered by size or class are often
+   ambiguous, so these expected leaks are always logged to file (in
+   FullDebugMode with the LogMemoryLeakDetailToFile option set) and are never
+   hidden from the leak display if there are more leaks than are expected.}
+  {$define HideExpectedLeaksRegisteredByPointer}
+
+  {Set this option to require the presence of the Delphi IDE to report memory
+   leaks. This option has no effect if the option "EnableMemoryLeakReporting"
+   is not also set.}
+  {.$define RequireIDEPresenceForLeakReporting}
+
+  {Set this option to require the program to be run inside the IDE debugger to
+   report memory leaks. This option has no effect if the option
+   "EnableMemoryLeakReporting" is not also set. Note that this option does not
+   work with libraries, only EXE projects.}
+  {$define RequireDebuggerPresenceForLeakReporting}
+
+  {Set this option to require the presence of debug info ($D+ option) in the
+   compiled unit to perform memory leak checking. This option has no effect if
+   the option "EnableMemoryLeakReporting" is not also set.}
+  {.$define RequireDebugInfoForLeakReporting}
+
+  {Set this option to enable manual control of the memory leak report. When
+   this option is set the ReportMemoryLeaksOnShutdown variable (default = false)
+   may be changed to select whether leak reporting should be done or not. When
+   this option is selected then both the variable must be set to true and the
+   other leak checking options must be applicable for the leak checking to be
+   done.}
+  {.$define ManualLeakReportingControl}
+
+  {Set this option to disable the display of the hint below the memory leak
+   message.}
+  {.$define HideMemoryLeakHintMessage}
+
+{--------------------------Instruction Set Options----------------------------}
+
+{Set this option to enable the use of MMX instructions. Disabling this option
+ will result in a slight performance hit, but will enable compatibility with
+ AMD K5, Pentium I and earlier CPUs. MMX is currently only used in the variable
+ size move routines, so if UseCustomVariableSizeMoveRoutines is not set then
+ this option has no effect.}
+{$define EnableMMX}
+
+  {Set this option to force the use of MMX instructions without checking
+   whether the CPU supports it. If this option is disabled then the CPU will be
+   checked for compatibility first, and if MMX is not supported it will fall
+   back to the FPU move code. Has no effect unless EnableMMX is also set.}
+  {$define ForceMMX}
+
+{-----------------------Memory Manager Sharing Options------------------------}
+
+{Allow sharing of the memory manager between a main application and DLLs that
+ were also compiled with FastMM. This allows you to pass dynamic arrays and
+ long strings to DLL functions provided both are compiled to use FastMM.
+ Sharing will only work if the library that is supposed to share the memory
+ manager was compiled with the "AttemptToUseSharedMM" option set. Note that if
+ the main application is single threaded and the DLL is multi-threaded that you
+ have to set the IsMultiThread variable in the main application to true or it
+ will crash when a thread contention occurs. Note that statically linked DLL
+ files are initialized before the main application, so the main application may
+ well end up sharing a statically loaded DLL's memory manager and not the other
+ way around. }
+{.$define ShareMM}
+
+  {Allow sharing of the memory manager by a DLL with other DLLs (or the main
+   application if this is a statically loaded DLL) that were also compiled with
+   FastMM. Set this option with care in dynamically loaded DLLs, because if the
+   DLL that is sharing its MM is unloaded and any other DLL is still sharing
+   the MM then the application will crash. This setting is only relevant for
+   DLL libraries and requires ShareMM to also be set to have any effect.
+   Sharing will only work if the library that is supposed to share the memory
+   manager was compiled with the "AttemptToUseSharedMM" option set. Note that
+   if DLLs are statically linked then they will be initialized before the main
+   application and then the DLL will in fact share its MM with the main
+   application. This option has no effect unless ShareMM is also set.}
+  {.$define ShareMMIfLibrary}
+
+{Define this to attempt to share the MM of the main application or other loaded
+ DLLs in the same process that were compiled with ShareMM set. When sharing a
+ memory manager, memory leaks caused by the sharer will not be freed
+ automatically. Take into account that statically linked DLLs are initialized
+ before the main application, so set the sharing options accordingly.}
+{.$define AttemptToUseSharedMM}
+
+{Define this to enable backward compatibility for the memory manager sharing
+ mechanism used by Delphi 2006 and 2007, as well as older FastMM versions.}
+{x$define EnableBackwardCompatibleMMSharing}
+
+{-----------------------Security Options------------------------}
+
+{Windows clears physical memory before reusing it in another process. However,
+ it is not known how quickly this clearing is performed, so it is conceivable
+ that confidential data may linger in physical memory longer than absolutely
+ necessary. If you're paranoid about this kind of thing, enable this option to
+ clear all freed memory before returning it to the operating system. Note that
+ this incurs a noticeable performance hit.}
+{.$define ClearMemoryBeforeReturningToOS}
+
+{With this option enabled freed memory will immediately be cleared inside the
+ FreeMem routine. This incurs a big performance hit, but may be worthwhile for
+ additional peace of mind when working with highly sensitive data. This option
+ supersedes the ClearMemoryBeforeReturningToOS option.}
+{.$define AlwaysClearFreedMemory}
+
+{--------------------------------Option Grouping------------------------------}
+
+{Enabling this option enables FullDebugMode, InstallOnlyIfRunningInIDE and
+ LoadDebugDLLDynamically. Consequently, FastMM will install itself in
+ FullDebugMode if the application is being debugged inside the Delphi IDE.
+ Otherwise the default Delphi memory manager will be used (which is equivalent
+ to the non-FullDebugMode FastMM since Delphi 2006.)}
+{.$define FullDebugModeInIDE}
+
+{Combines the FullDebugMode, LoadDebugDLLDynamically and
+ DoNotInstallIfDLLMissing options. Consequently FastMM will only be installed
+ (In FullDebugMode) when the FastMM_FullDebugMode.dll file is available. This
+ is useful when the same executable will be distributed for both debugging as
+ well as deployment.}
+{.$define FullDebugModeWhenDLLAvailable}
+
+{Group the options you use for release and debug versions below}
+{$ifdef Release}
+  {Specify the options you use for release versions below}
+  {.$undef FullDebugMode}
+  {.$undef CheckHeapForCorruption}
+  {.$define ASMVersion}
+  {.$undef EnableMemoryLeakReporting}
+  {.$undef UseOutputDebugString}
+{$else}
+  {Specify the options you use for debugging below}
+  {.$define FullDebugMode}
+  {.$define EnableMemoryLeakReporting}
+  {.$define UseOutputDebugString}
+{$endif}
+
+{--------------------Compilation Options For borlndmm.dll---------------------}
+{If you're compiling the replacement borlndmm.dll, set the defines below
+ for the kind of dll you require.}
+
+{Set this option when compiling the borlndmm.dll}
+{.$define borlndmmdll}
+
+{Set this option if the dll will be used by the Delphi IDE}
+{.$define dllforide}
+
+{Set this option if you're compiling a debug dll}
+{.$define debugdll}
+
+{Do not change anything below this line}
+{$ifdef borlndmmdll}
+  {$define AssumeMultiThreaded}
+  {$undef HideExpectedLeaksRegisteredByPointer}
+  {$undef RequireDebuggerPresenceForLeakReporting}
+  {$undef RequireDebugInfoForLeakReporting}
+  {$define DetectMMOperationsAfterUninstall}
+  {$undef ManualLeakReportingControl}
+  {$undef ShareMM}
+  {$undef AttemptToUseSharedMM}
+  {$ifdef dllforide}
+    {$define NeverUninstall}
+    {$define HideMemoryLeakHintMessage}
+    {$undef RequireIDEPresenceForLeakReporting}
+    {$ifndef debugdll}
+      {$undef EnableMemoryLeakReporting}
+    {$endif}
+  {$else}
+    {$define EnableMemoryLeakReporting}
+    {$undef NeverUninstall}
+    {$undef HideMemoryLeakHintMessage}
+    {$define RequireIDEPresenceForLeakReporting}
+  {$endif}
+  {$ifdef debugdll}
+    {$define FullDebugMode}
+    {$define RawStackTraces}
+    {$undef CatchUseOfFreedInterfaces}
+    {$define LogErrorsToFile}
+    {$define LogMemoryLeakDetailToFile}
+    {$undef ClearLogFileOnStartup}
+  {$else}
+    {$undef FullDebugMode}
+  {$endif}
+{$endif}
+
+{Move BCB related definitions here, because CB2006/CB2007 can build borlndmm.dll
+ for tracing memory leaks in BCB applications with "Build with Dynamic RTL"
+ switched on}
+{------------------------------Patch BCB Terminate----------------------------}
+{To enable the patching for BCB to make uninstallation and leak reporting
+ possible, you may need to add "BCB" definition
+ in "Project Options->Pascal/Delphi Compiler->Defines".
+ (Thanks to JiYuan Xie for implementing this.)}
+
+{$ifdef BCB}
+  {$ifdef CheckHeapForCorruption}
+    {$define PatchBCBTerminate}
+  {$else}
+    {$ifdef DetectMMOperationsAfterUninstall}
+      {$define PatchBCBTerminate}
+    {$else}
+       {$ifdef EnableMemoryLeakReporting}
+         {$define PatchBCBTerminate}
+       {$endif}
+    {$endif}
+  {$endif}
+
+  {$ifdef PatchBCBTerminate}
+    {$define CheckCppObjectType}
+    {$undef CheckCppObjectTypeEnabled}
+
+    {$ifdef CheckCppObjectType}
+      {$define CheckCppObjectTypeEnabled}
+    {$endif}
+
+    {Turn off "CheckCppObjectTypeEnabled" option if neither "CheckHeapForCorruption"
+     option or "EnableMemoryLeakReporting" option were defined.}
+    {$ifdef CheckHeapForCorruption}
+    {$else}
+      {$ifdef EnableMemoryLeakReporting}
+      {$else}
+        {$undef CheckCppObjectTypeEnabled}
+      {$endif}
+    {$endif}
+  {$endif}
+{$endif}
diff --git a/dep/fastmm/Delphi/FastMMx64.dpr b/dep/fastmm/Delphi/FastMMx64.dpr
new file mode 100644
index 00000000000..7bc3fa2df7a
--- /dev/null
+++ b/dep/fastmm/Delphi/FastMMx64.dpr
@@ -0,0 +1,57 @@
+(*
+* LICENSE
+*
+* Copyright (c) 2010 Vladimir Bochkarev.
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the author be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This license may not be removed or altered from any source distribution.
+*
+* --------------------------------------------------------------------------
+* Vladimir Bochkarev <boxa@mail.ru>.
+*)
+
+library FastMMx64;
+
+uses
+  Windows, FastMM4;
+
+{x$R *.res}
+
+{$SETPEFLAGS IMAGE_FILE_LARGE_ADDRESS_AWARE or IMAGE_FILE_DEBUG_STRIPPED or
+  IMAGE_FILE_LINE_NUMS_STRIPPED or IMAGE_FILE_LOCAL_SYMS_STRIPPED}
+
+{$IMAGEBASE $00D20000}
+
+{$Include FastMM4Options.inc}
+
+function FastMM_malloc(ASize: Integer): Pointer; cdecl;
+begin
+  Result := GetMemory(ASize);
+end;
+
+procedure FastMM_free(APointer: Pointer); cdecl;
+begin
+  FreeMem(APointer);
+end;
+
+exports
+  FastMM_malloc,
+  FastMM_free;
+
+begin
+  IsMultiThread := True;
+  DisableThreadLibraryCalls(HInstance); // not needed for current MaNGOS, but not superfluous in future :)
+end.
diff --git a/dep/fastmm/FastMM.h b/dep/fastmm/FastMM.h
new file mode 100644
index 00000000000..c8fc2d0b47e
--- /dev/null
+++ b/dep/fastmm/FastMM.h
@@ -0,0 +1,16 @@
+
+#ifndef __FastMM_H
+#define __FastMM_H
+
+#include <stddef.h> /* Need size_t from here. */
+
+#define _FASTMM_IMPORT_  __declspec(dllimport)
+#define _FASTMM_CALL_    __cdecl
+
+extern "C"
+{
+    _FASTMM_IMPORT_ void * _FASTMM_CALL_ FastMM_malloc(size_t size);
+    _FASTMM_IMPORT_ void   _FASTMM_CALL_ FastMM_free(void* ptr);
+}
+
+#endif
diff --git a/dep/fastmm/FastMM.lib b/dep/fastmm/FastMM.lib
new file mode 100644
index 00000000000..a6a3f2827f5
Binary files /dev/null and b/dep/fastmm/FastMM.lib differ
diff --git a/dep/fastmm/FastMMx64.lib b/dep/fastmm/FastMMx64.lib
new file mode 100644
index 00000000000..33557d39b41
Binary files /dev/null and b/dep/fastmm/FastMMx64.lib differ
diff --git a/dep/fastmm/lib/FastMM.bat b/dep/fastmm/lib/FastMM.bat
new file mode 100644
index 00000000000..b5b2ad6a698
--- /dev/null
+++ b/dep/fastmm/lib/FastMM.bat
@@ -0,0 +1,7 @@
+
+lib.exe /def:FastMM.def
+lib.exe /def:FastMMx64.def /machine:X64
+
+del *.exp
+move FastMM.lib .\..\
+move FastMMx64.lib .\..\
diff --git a/dep/fastmm/lib/FastMM.def b/dep/fastmm/lib/FastMM.def
new file mode 100644
index 00000000000..055261d6184
--- /dev/null
+++ b/dep/fastmm/lib/FastMM.def
@@ -0,0 +1,6 @@
+LIBRARY FastMM
+
+EXPORTS
+
+FastMM_malloc
+FastMM_free
diff --git a/dep/fastmm/lib/FastMMx64.def b/dep/fastmm/lib/FastMMx64.def
new file mode 100644
index 00000000000..f8436a28ef9
--- /dev/null
+++ b/dep/fastmm/lib/FastMMx64.def
@@ -0,0 +1,6 @@
+LIBRARY FastMMx64
+
+EXPORTS
+
+FastMM_malloc
+FastMM_free
diff --git a/dep/fastmm/lib/c1.dll b/dep/fastmm/lib/c1.dll
new file mode 100644
index 00000000000..27d5598881b
Binary files /dev/null and b/dep/fastmm/lib/c1.dll differ
diff --git a/dep/fastmm/lib/lib.exe b/dep/fastmm/lib/lib.exe
new file mode 100644
index 00000000000..9bedc625d89
Binary files /dev/null and b/dep/fastmm/lib/lib.exe differ
diff --git a/dep/fastmm/lib/link.exe b/dep/fastmm/lib/link.exe
new file mode 100644
index 00000000000..e569d9398ed
Binary files /dev/null and b/dep/fastmm/lib/link.exe differ
diff --git a/dep/fastmm/lib/mspdb100.dll b/dep/fastmm/lib/mspdb100.dll
new file mode 100644
index 00000000000..f3f913ea393
Binary files /dev/null and b/dep/fastmm/lib/mspdb100.dll differ
diff --git a/dep/include/g3dlite/G3D/AABox.h b/dep/include/g3dlite/G3D/AABox.h
index 2e8da1f6098..d57320d73eb 100644
--- a/dep/include/g3dlite/G3D/AABox.h
+++ b/dep/include/g3dlite/G3D/AABox.h
@@ -20,6 +20,7 @@
 #include "G3D/debug.h"
 #include "G3D/Array.h"
 #include "G3D/Plane.h"
+#include "G3D/Sphere.h"
 
 namespace G3D {
 
@@ -259,6 +260,8 @@ class AABox {
     void getBounds(AABox& out) const {
         out = *this;
     }
+
+    void getBounds(Sphere& out) const;
 };
 
 }
diff --git a/dep/include/g3dlite/G3D/Any.h b/dep/include/g3dlite/G3D/Any.h
index 49701202ca9..e2d0fbe7e62 100644
--- a/dep/include/g3dlite/G3D/Any.h
+++ b/dep/include/g3dlite/G3D/Any.h
@@ -5,7 +5,7 @@
  @maintainer Morgan McGuire
   
  @created 2006-06-11
- @edited  2009-12-16
+ @edited  2010-03-16
 
  Copyright 2000-2010, Morgan McGuire.
  All rights reserved.
@@ -17,7 +17,9 @@
 #include "G3D/platform.h"
 #include "G3D/Table.h"
 #include "G3D/Array.h"
+#include "G3D/Set.h"
 #include "G3D/AtomicInt32.h"
+#include "G3D/stringutils.h"
 #include <string>
 
 // needed for Token
@@ -34,11 +36,14 @@ class TextOutput;
 /** 
 \brief Easy loading and saving of human-readable configuration files.
 
-Encodes typed, structured data and can serialize it to a human
+Any encodes typed, structured data and can serialize it to a human
 readable format that is very similar to the Python language's data
-syntax.  Well-suited for quickly creating human-readable file formats,
-especially since deserialization and serialization preserve comments and
-an Any can tell you what file and line it came from.
+syntax.  It is well-suited for quickly creating human-readable file
+formats, especially since deserialization and serialization preserve
+comments and an Any can tell you what file and line it came from.  The
+syntax allows most C++ editors to properly highlight Any files, and
+makes it easy to design little ad-hoc C-like languages in
+configuration files.
 
 The class is designed so that copying Anys generally is fast, even if
 it is a large array or table.  This is because data is shared between
@@ -50,15 +55,17 @@ Sample File:
 {
    shape = "round",
 
-   # in meters
+   // in meters
    radius = 3.7,
 
    position = Vector3(1.0, -1.0, 0.0),
-   texture = { format = "RGB8", size = (320, 200)}
+   video = { format = "RGB8", size = (320, 200)},
+
+   material = #include("rocks.mat")
 }
 </pre>
 
-Sample code using:
+Sample code using Any:
 <pre>
 Any x;
 x.load("ball.txt");
@@ -110,6 +117,21 @@ Vector3::Vector3(const Any& any) {
 }
 </pre>
 
+It is often convenient to iterate through the table portion:
+
+<pre>
+    for (Any::AnyTable::Iterator it = any.table().begin(); it.hasMore(); ++it) {
+        const std::string& k = toLower(it->key);
+        if (key == "hello") {
+           ...
+        } else if (key == "goodbye") {
+           ...
+        } else {
+           any.verify(false, "Unsupported key: " + it->key);
+        }
+    }
+</pre>
+
 \section BNF
 Serialized format BNF:
 
@@ -119,27 +141,38 @@ identifier-op ::= "::" | "->" | "."
 
 identifier-exp ::= [identifier-op] identifier (identifier-op identifier)*
 
-comment     ::= "#" <any characters> "\n"
+comment     ::= C++ single or multi-line comments
 separator   ::= "," | ";"
 
 number      ::= <legal C printf number format>
 string      ::= <legal C double-quoted string; backslashes must be escaped>
 boolean     ::= "True" | "False"
 none        ::= "None"
-array       ::= "(" [value ("," value)*] ")"
+array       ::= ("(" | "[") [ value (separator value)* [separator] ] (")" | "]")
 pair        ::= (identifier | string) "=" value
-table       ::= "{" [pair (separator pair)*] "}"
-named-array ::= identifier-exp tuple
-named-table ::= identifier-exp dict
+table       ::= "{" [ pair (separator pair)* [separator] ] "}"
+named-array ::= identifier-exp array
+named-table ::= identifier-exp table
+include     ::= "#" "include" "(" string ")"
 
-value       ::= [comment] (none | number | boolean | string | array | table | named-array | named-table)
+value       ::= [comment] (none | number | boolean | string | array | table | named-array | named-table | include)
 </pre>
 
 Except for single-line comments, whitespace is not significant.  
 All parsing is case-insensitive.
 
+The include expression pastes the contents of the named file in as if
+they appeared in the original source.  Note that an include expression
+can only appear in the locations where a value is expected.  This means
+that it cannot yield more than one element of an array and cannot serve
+as the pair in a table.
+
 The deserializer allows the substitution of [] for () when writing
-tuples and ";" for ",".
+tuples and ";" for ",".  These are convenient when mimicing a
+programming language, e.g., <code>"[ printf("hello world."); clearScreen();]"</code> 
+parses as an array containing two named arrays within it. The 
+deserializer also allows a trailing comma inside any array or table,
+which also convenient when commenting out the last element.
 
 The serializer indents four spaces for each level of nesting. 
 Tables are written with the keys in alphabetic order.
@@ -407,9 +440,31 @@ class Any {
     const std::string& string() const;
     bool boolean() const;
 
+    /** If a valid string, takes the string value and creates a fully qualified filename.
+        If not found, the returned string is empty.
+
+        The file is searched for the following ways:
+        
+        - In the directory from which the Any was loaded.
+        - By calling System::findDataFile as you would with other data files.
+     */
+    std::string resolveStringAsFilename() const;
+
     /** If this is named ARRAY or TABLE, returns the name. */
     const std::string& name() const;
 
+    /** If this is named ARRAY or TABLE, returns true if the name begins with \a s.  The comparision is case insensitive. */
+    bool nameBeginsWith(const std::string& s) const;
+
+    /** If this is named ARRAY or TABLE, returns true if the name begins with \a s.  The comparision is case insensitive. */
+    bool nameBeginsWith(const char* s) const;
+
+    /** If this is named ARRAY or TABLE, returns true if the name is \a s.  The comparision is case insensitive. */
+    bool nameEquals(const std::string& s) const;
+
+    /** If this is named ARRAY or TABLE, returns true if the name is\a s.  The comparision is case insensitive. */
+    bool nameEquals(const char* s) const;
+
     /** \brief Set the name used when serializing an ARRAY or TABLE.
     
        Only legal for ARRAY or TABLE.  The \a name must begin with a letter
@@ -439,6 +494,14 @@ class Any {
     const Any& operator[](int i) const;
     Any& operator[](int i);
 
+    const Any& last() const {
+        return (*this)[size() - 1];
+    }
+
+    Any& last() {
+        return (*this)[size() - 1];
+    }
+
     /** Directly exposes the underlying data structure for an ARRAY. */
     const Array<Any>& array() const;
     void append(const Any& v0);
@@ -456,7 +519,7 @@ class Any {
 
     // Needed to prevent the operator[](int) overload from catching
     // string literals
-    inline const Any& operator[](const char* key) const {
+    const Any& operator[](const char* key) const {
         return operator[](std::string(key));
     }
 
@@ -486,7 +549,7 @@ class Any {
     Any& operator[](const std::string& key);
 
     /** \copydoc Any::operator[](const std::string&) */
-    inline Any& operator[](const char* key) {
+    Any& operator[](const char* key) {
         return operator[](std::string(key));
     }
     
@@ -503,6 +566,10 @@ class Any {
     /** for an ARRAY, resizes and returns the last element */
     Any& next();
 
+    /** The parent directory of the location from which this Any was loaded.  This is useful for 
+       interpreting filenames relative to the Any's source location,
+       which may not match the current directory if the Any was from an included file. */
+    std::string sourceDirectory() const;
 
     /** True if the Anys are exactly equal, ignoring comments.  Applies deeply on arrays and tables. */
     bool operator==(const Any& x) const;
@@ -542,10 +609,15 @@ class Any {
     */
     void verify(bool value, const std::string& message = "") const;
 
-    /** Verifies that the name begins with identifier \a n.  It may contain
-        identifier operators after this */
+
+    /** Verifies that the name <i>begins with</i> identifier \a n (case insensitive). 
+        It may contain identifier operators after this */
     void verifyName(const std::string& n) const;
 
+    /** Verifies that the name <i>begins with</i> identifier \a n or \a m (case insensitive). 
+        It may contain identifier operators after this */
+    void verifyName(const std::string& n, const std::string& m) const;
+
     /** Verifies that the type is \a t. */
     void verifyType(Type t) const;
 
@@ -565,6 +637,124 @@ class Any {
 
 };    // class Any
 
+
+/**
+   Convenient iteration over the keys of a Any::TABLE, usually
+   for implementing construction of an object from an Any.
+
+   Getting an element using either iteration or explicit requests
+   consumes that element from the iterator (but not from the Any!)
+   It is an error to consume the same element more than once from
+   the same iterator.
+
+   <pre>
+    AnyKeyIterator r(a);
+    r.getIfPresent("enabled",            enabled);
+    r.getIfPresent("showSamples",        showSamples);
+    r.getIfPresent("showTiles",          showTiles);
+
+    r.verifyDone();
+    </pre>
+
+    \beta
+*/
+class AnyTableReader {
+private:
+   Any              m_any;
+   Set<std::string> m_alreadyRead;
+public:
+    
+    /** Verifies that \a is a TABLE with the given \a name. */
+    AnyTableReader(const std::string& name, const Any& a) : m_any(a) {
+        try {
+            m_any.verifyType(Any::TABLE);
+            m_any.verifyName(name);
+        } catch (const ParseError& e) {
+            // If an exception is thrown, the destructors will not be 
+            // invoked automatically.
+            m_any.~Any();
+            m_alreadyRead.~Set();
+            throw e;
+        }
+    }
+
+    /** Verifies that \a is a TABLE. */
+    AnyTableReader(const Any& a) : m_any(a) {
+        try {
+            m_any.verifyType(Any::TABLE);
+        } catch (const ParseError& e) {
+            // If an exception is thrown, the destructors will not be 
+            // invoked automatically.
+            m_any.~Any();
+            m_alreadyRead.~Set();
+            throw e;
+        }
+    }
+
+    bool hasMore() const {
+        return m_any.size() > m_alreadyRead.size();
+    }
+
+    /** Verifies that all keys have been read. */
+    void verifyDone() const {
+        if (hasMore()) {
+            // Generate all keys
+            // Remove the ones we've read
+            // Assert the rest
+          //  any.verify("");
+        }
+    }
+
+#if 0
+    /** Returns the current key */
+    const std::string& key() const;
+
+    /** Returns the current value */
+    const Any& value() const;
+
+    AnyKeyIterator& operator++();
+#endif   
+    
+    /** If key \s appears in the any, reads its value into \a v and 
+        removes that key from the ones available to iterate over.
+
+        If key \s does not appear in the any, throws a G3D::ParseError.
+
+        Assumes that if key \s appears in the any it has not already been extracted
+        by this iterator.  If it has been read before, an assertion will fail in debug mode.
+
+      */
+    template<class ValueType>
+    void get(const std::string& s, ValueType& v) {
+        v = m_any[s];
+        m_alreadyRead.insert(toLower(s));
+    }
+
+    /** Get the value associated with a key only if the key is actually present.
+    
+        If key \s appears in the any, reads its value into \a v and 
+        removes that key from the ones available to iterate over.
+
+        If key \s does not appear in the any, does nothing.
+
+        Assumes that if key \s appears in the any it has not already been extracted
+        by this iterator.  If it has been read before, an assertion will fail in debug mode.
+
+        \return True if the value was read.
+      */
+    template<class ValueType>
+    bool getIfPresent(const std::string& s, ValueType& v) {
+        if (m_any.containsKey(s)) {
+            debugAssertM(! m_alreadyRead.contains(toLower(s)), "read twice");
+
+            get(s, v);
+            return true;
+        } else {
+            return false;
+        }
+    }
+};
+
 }    // namespace G3D
 
 #endif
diff --git a/dep/include/g3dlite/G3D/BinaryInput.h b/dep/include/g3dlite/G3D/BinaryInput.h
index 1dac93ea55e..e8a9b88618b 100644
--- a/dep/include/g3dlite/G3D/BinaryInput.h
+++ b/dep/include/g3dlite/G3D/BinaryInput.h
@@ -1,12 +1,12 @@
 /**
  @file BinaryInput.h
  
- @maintainer Morgan McGuire, graphics3d.com
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
  
  @created 2001-08-09
- @edited  2006-07-19
+ @edited  2010-03-19
 
- Copyright 2000-2009, Morgan McGuire.
+ Copyright 2000-2010, Morgan McGuire.
  All rights reserved.
  */
 
@@ -370,6 +370,9 @@ class BinaryInput {
      */
     std::string readString();
 
+    /** Reads until \r, \r\n, \n\r, \n or the end of the file is encountered. Consumes the newline.*/
+    std::string readStringNewline();
+
     /**
      Reads until NULL or the end of the file is encountered.
      If the string has odd length (including NULL), reads 
diff --git a/dep/include/g3dlite/G3D/Color3uint8.h b/dep/include/g3dlite/G3D/Color3uint8.h
index bd4b00d7fd6..7a1cc79d94d 100644
--- a/dep/include/g3dlite/G3D/Color3uint8.h
+++ b/dep/include/g3dlite/G3D/Color3uint8.h
@@ -1,20 +1,27 @@
 /** 
   @file Color3uint8.h
  
-  @maintainer Morgan McGuire, graphics3d.com
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
  
   @created 2003-04-07
-  @edited  2006-06-24
+  @edited  2010-03-24
 
-  Copyright 2000-2006, Morgan McGuire.
+  Copyright 2000-2010, Morgan McGuire.
   All rights reserved.
  */
 
-#ifndef G3D_COLOR3UINT8_H
-#define G3D_COLOR3UINT8_H
+#ifndef G3D_Color3uint8_h
+#define G3D_Color3uint8_h
 
 #include "G3D/platform.h"
 #include "G3D/g3dmath.h"
+#ifdef max
+#undef max
+#endif
+
+#ifdef min
+#undef min
+#endif
 
 namespace G3D {
 
@@ -53,7 +60,7 @@ class Color3uint8 {
 
     Color3uint8(class BinaryInput& bi);
 
-    inline static Color3uint8 fromARGB(uint32 i) {
+    static Color3uint8 fromARGB(uint32 i) {
         Color3uint8 c;
         c.r = (i >> 16) & 0xFF;
         c.g = (i >> 8) & 0xFF;
@@ -61,15 +68,23 @@ class Color3uint8 {
         return c;
     }
 
-    inline Color3uint8 bgr() const {
+    Color3uint8 bgr() const {
         return Color3uint8(b, g, r);
     }
 
+    Color3uint8 max(const Color3uint8 x) const {
+        return Color3uint8(G3D::max(r, x.r), G3D::max(g, x.g), G3D::max(b, x.b));
+    }
+
+    Color3uint8 min(const Color3uint8 x) const {
+        return Color3uint8(G3D::min(r, x.r), G3D::min(g, x.g), G3D::min(b, x.b));
+    }
+
     /**
      Returns the color packed into a uint32
      (the upper byte is 0xFF)
      */
-    inline uint32 asUInt32() const {
+    uint32 asUInt32() const {
         return (0xFF << 24) + ((uint32)r << 16) + ((uint32)g << 8) + b;
     }
 
@@ -95,12 +110,12 @@ class Color3uint8 {
         return (uint8*)this;
     }
 
-    bool operator==(const Color3uint8& other) const {
+    bool operator==(const Color3uint8 other) const {
         return (other.r == r) && (other.g == g) && (other.b == b);
     }
 
-    bool operator!=(const Color3uint8& other) const {
-        return (other.r != r) && (other.g != g) && (other.b != b);
+    bool operator!=(const Color3uint8 other) const {
+        return ! (*this == other);
     }
 }
 G3D_END_PACKED_CLASS(1)
diff --git a/dep/include/g3dlite/G3D/Color4.h b/dep/include/g3dlite/G3D/Color4.h
index d8858abbce2..0be0c25879f 100644
--- a/dep/include/g3dlite/G3D/Color4.h
+++ b/dep/include/g3dlite/G3D/Color4.h
@@ -117,9 +117,18 @@ class Color4 {
     Color4 operator+ (const Color4& rkVector) const;
     Color4 operator- (const Color4& rkVector) const;
     Color4 operator* (float fScalar) const;
-    inline Color4 operator* (const Color4& k) const {
+    Color4 operator* (const Color4& k) const {
         return Color4(r*k.r, g*k.g, b*k.b, a * k.a); 
     }
+
+    Color4& operator*= (const Color4& c) {
+        r *= c.r;
+        g *= c.g;
+        b *= c.b;
+        a *= c.a;
+        return *this;
+    }
+
     Color4 operator/ (float fScalar) const;
     Color4 operator- () const;
     friend Color4 operator* (double fScalar, const Color4& rkVector);
diff --git a/dep/include/g3dlite/G3D/Color4uint8.h b/dep/include/g3dlite/G3D/Color4uint8.h
index ab8c0729276..2cd3c662788 100644
--- a/dep/include/g3dlite/G3D/Color4uint8.h
+++ b/dep/include/g3dlite/G3D/Color4uint8.h
@@ -1,12 +1,12 @@
 /** 
   @file Color4uint8.h
  
-  @maintainer Morgan McGuire, graphics3d.com
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
  
   @created 2003-04-07
-  @edited  2006-03-24
+  @edited  2010-03-24
 
-  Copyright 2000-2006, Morgan McGuire.
+  Copyright 2000-2010, Morgan McGuire.
   All rights reserved.
  */
 
@@ -50,6 +50,14 @@ class Color4uint8 {
 
     Color4uint8(const class Color4& c);
 
+    Color4uint8 max(const Color4uint8 x) const {
+        return Color4uint8(G3D::max(r, x.r), G3D::max(g, x.g), G3D::max(b, x.b), G3D::max(a, x.a));
+    }
+
+    Color4uint8 min(const Color4uint8 x) const {
+        return Color4uint8(G3D::min(r, x.r), G3D::min(g, x.g), G3D::min(b, x.b), G3D::min(a, x.a));
+    }
+
     Color4uint8(const uint8 _r, const uint8 _g, const uint8 _b, const uint8 _a) : r(_r), g(_g), b(_b), a(_a) {}
 
     Color4uint8(const Color3uint8& c, const uint8 _a) : r(c.r), g(c.g), b(c.b), a(_a) {}
diff --git a/dep/include/g3dlite/G3D/CoordinateFrame.h b/dep/include/g3dlite/G3D/CoordinateFrame.h
index 7ed4d0acc65..c83754abb77 100644
--- a/dep/include/g3dlite/G3D/CoordinateFrame.h
+++ b/dep/include/g3dlite/G3D/CoordinateFrame.h
@@ -68,6 +68,8 @@ class CoordinateFrame {
         - CFrame((matrix3 expr), (vector3 expr))
         - CFrame::fromXYZYPRDegrees(#, #, #, #, #, #)
         - CFrame {  rotation = (matrix3 expr), translation = (vector3 expr) }
+        - Vector3( ... )
+        - Matrix3( ... )
         */
     CoordinateFrame(const Any& any);
     
@@ -109,6 +111,8 @@ class CoordinateFrame {
 
     static CoordinateFrame fromXYZYPRRadians(float x, float y, float z, float yaw = 0.0f, float pitch = 0.0f, float roll = 0.0f);
 
+    std::string toXYZYPRDegreesString() const;
+
     /** Construct a coordinate frame from translation = (x,y,z) and
      rotations (in that order) about Y, object space X, object space
      Z.  Note that because object-space axes are used, these are not
diff --git a/dep/include/g3dlite/G3D/FileSystem.h b/dep/include/g3dlite/G3D/FileSystem.h
new file mode 100644
index 00000000000..b2a6e86520c
--- /dev/null
+++ b/dep/include/g3dlite/G3D/FileSystem.h
@@ -0,0 +1,466 @@
+/**
+ @file FileSystem.h
+ 
+ @author Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @author  2002-06-06
+ @edited  2010-02-05
+ */
+#ifndef G3D_FileSystem_h
+#define G3D_FileSystem_h
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/Table.h"
+
+namespace G3D {
+
+/** 
+ OS-independent file system layer that optimizes the performance
+ of queries by caching and prefetching.
+
+ This class uses the following definitions:
+ <ul>
+   <li> "file" = document that can be opened for reading or writing
+   <li> "directory" = folder containing files and other directories
+   <li> "node" = file or directory
+   <li> "path" = string identifying a (see the FSPath class)
+   <li> "zipfile" = a compressed file storing an archive of files and directories in the zip format
+ </ul>
+
+ In G3D, Zipfiles are transparently treated as if they were directories, provided:
+ <ul>
+   <li> The zipfile name contains an extension (e.g., map.pk3, files.zip)
+   <li> There are no nested zipfiles
+ </ul>
+
+ The extension requirement allows G3D to quickly identify whether a path could enter a
+ zipfile without forcing it to open all parent directories for reading.
+
+ \sa FilePath
+ TODO: make threadsafe!
+*/
+class FileSystem {
+public:
+
+    class ListSettings {
+    public:
+        /** Defaults to true */
+        bool    files;
+
+        /** Defaults to true */
+        bool    directories;
+
+        /** Defaults to true on Windows, false on other platforms.*/
+        bool    caseSensitive;
+
+        /** Can get recurse into subdirectories? Defaults to true. */
+        bool    recursive;
+
+        /** Prefix the full path onto names that are returned. Defaults to true */
+        bool    includeParentPath;
+
+        ListSettings() :
+            files(true),
+            directories(true),
+#           ifdef G3D_WIN32
+                caseSensitive(true),
+#           else
+              caseSensitive(false),
+#           endif
+            recursive(false),
+            includeParentPath(true) {}
+    };
+
+private:
+
+    /** Drive letters.  Only used on windows, but defined on all platforms to help
+       avoid breaking the Windows build when compiling on another platform. */
+    Array<std::string>          m_winDrive;
+
+    float                       m_cacheLifetime;
+
+    enum Type {
+        /** Not yet checked */
+        UNKNOWN, 
+        FILE_TYPE, 
+        DIR_TYPE
+    };
+
+    class Entry {
+    public: 
+        /** Name, not including parent path */
+        std::string             name;
+        Type                    type;
+        Entry() : type(UNKNOWN) {}
+        Entry(const char* n) : name(n), type(UNKNOWN) {}
+    };
+
+    class Dir {
+    public:
+        
+        /** If false, this path did not exist (even inside a zipfile) when last checked, or it is not a directory. */
+        bool                    exists;
+
+        bool                    isZipfile;
+        bool                    inZipfile;
+
+        /** Files and directories */
+        Array<Entry>            nodeArray;
+        
+        /** When this entry was last updated */
+        double                  lastChecked;
+
+        /** Case-independent comparison on Windows */
+        bool contains(const std::string& child) const;
+
+        /** Compute the contents of nodeArray from this zipfile. */
+        void computeZipListing(const std::string& zipfile, const std::string& pathInsideZipfile);
+
+        Dir() : exists(false), isZipfile(false), inZipfile(false), lastChecked(0) {}
+    };
+
+    /** Maps path names (without trailing slashes, except for the file system root) to contents.
+        On Windows, all paths are lowercase */
+    Table<std::string, Dir>     m_cache;
+
+    /** Update the cache entry for path if it is not already present.
+     \param forceUpdate If true, always override the current cache value.*/
+    Dir& getContents(const std::string& path, bool forceUpdate);
+
+    /** Don't allow public construction. */
+    FileSystem();
+
+    static FileSystem& instance();
+
+#   ifdef G3D_WIN32
+    /** On Windows, the drive letters that form the file system roots.*/
+    const Array<std::string>& _drives();
+#   endif 
+
+    /** Returns true if some sub-path of \a path is a zipfile. 
+        
+       If the path itself is a zipfile, returns false.
+       
+       \param zipfile The part of \a path that was the zipfile */
+    bool _inZipfile(const std::string& path, std::string& zipfile);
+
+    /** Clears old cache entries so that exists() and list() will reflect recent changes to the file system.
+       \param path Clear only \a path and its subdirectories ("" means clear the entire cache) */
+    void _clearCache(const std::string& path);
+
+    bool _inZipfile(const std::string& path) {
+        std::string ignore;
+        return inZipfile(path, ignore);
+    }
+
+    /** Set the cacheLifetime().
+       \param t in seconds */
+    void _setCacheLifetime(float t);
+
+
+    /** A cache is used to optimize repeated calls.  A cache entry is considered
+        valid for this many seconds after it has been checked. */
+    float _cacheLifetime() const {
+        return m_cacheLifetime;
+    }
+
+    /** Creates the directory named, including any subdirectories 
+        that do not already exist.
+
+        The directory must not be inside a zipfile.
+
+        Flushes the cache.
+     */
+    void _createDirectory(const std::string& path);
+
+    /** Returns true if a node named \a f exists.
+
+        \param f If \a f contains wildcards, the function returns true if any file 
+        matches those wildcards.  Wildcards may only appear in the base or ext, not the
+        path.
+
+        \param trustCache If true, uses the cache for optimizing repeated calls 
+        in the same parent directory. 
+     */
+    bool _exists(const std::string& f, bool trustCache = true);
+
+    /** Known bug: does not work inside zipfiles */
+    bool _isDirectory(const std::string& path);
+    
+    /** Known bug: does not work inside zipfiles */
+    bool _isFile(const std::string& path) {
+        return ! isDirectory(path);
+    }
+    
+    /**
+    \param srcPath Must name a file.
+    \param dstPath Must not contain a zipfile.
+
+    Flushes the cache.
+    */
+    void _copyFile(const std::string& srcPath, const std::string& dstPath);
+
+    /** Fully qualifies a filename.
+
+        The filename may contain wildcards, in which case the wildcards will be preserved in the returned value.
+
+        \param cwd The directory to treat as the "current" directory when resolving a relative path.  The default 
+        value is the actual current directory.  (G3D::Any::sourceDirectory is a common alternative) 
+    */
+    std::string _resolve(const std::string& path, const std::string& cwd = currentDirectory());
+
+    /** Returns true if \param dst does not exist or \param src is newer than \param dst,
+       according to their time stamps.
+       
+       Known bug: does not work inside zipfiles.
+       */
+    bool _isNewer(const std::string& src, const std::string& dst);
+
+    /** The current working directory (cwd).  Only ends in a slash if this is the root of the file system. */
+    std::string _currentDirectory();
+
+    /** Returns the length of the file in bytes, or -1 if the file could not be opened. */
+    int64 _size(const std::string& path);
+
+    /** Called from list() */
+    void listHelper(const std::string& shortSpec, const std::string& parentPath, Array<std::string>& result, const ListSettings& settings);
+
+    /** Appends all nodes matching \a spec to the \a result array.
+
+      Wildcards can only appear to the right of the last slash in \a spec.
+
+      The names will not contain parent paths unless \a includePath == true. 
+      These may be relative to the current directory unless \a spec 
+      is fully qualified (can be done with resolveFilename). 
+      
+     */
+    void _list(const std::string& spec, Array<std::string>& result, const ListSettings& listSettings = ListSettings());
+
+    /** Returns true if \a path is a file that is a zipfile. Note that G3D requires zipfiles to have
+        some extension, although it is not required to be "zip" */
+    bool _isZipfile(const std::string& path);
+
+    /** list() files */
+    void _getFiles(const std::string& spec, Array<std::string>& result, bool includeParentPath = false) {
+        ListSettings set;
+        set.includeParentPath = includeParentPath;
+        set.directories = false;
+        set.files = true;
+        return list(spec, result, set);
+    }
+
+    /** list() directories */
+    void _getDirectories(const std::string& spec, Array<std::string>& result, bool includeParentPath = false) {
+        ListSettings set;
+        set.includeParentPath = includeParentPath;
+        set.directories = true;
+        set.files = false;
+        return list(spec, result, set);
+    }
+
+    /** Same as the C standard library fopen, but updates the file cache
+    to acknowledge the new file on a write operation. */
+    FILE* _fopen(const char* filename, const char* mode);
+
+public:
+
+
+    /** Create the common instance. */
+    static void init();
+
+    /** Destroy the common instance. */
+    static void cleanup();
+
+#   ifdef G3D_WIN32
+    /** \copydoc _drives */
+    static const Array<std::string>& drives() {
+        return instance()._drives();
+    }
+#   endif
+
+    /** \copydoc _inZipfile */
+    static bool inZipfile(const std::string& path, std::string& zipfile) {
+        return instance()._inZipfile(path, zipfile);
+    }
+
+    /** \copydoc _clearCache */
+    static void clearCache(const std::string& path = "") {
+        instance()._clearCache(path);
+    }
+
+    /** \copydoc _fopen */
+    static FILE* fopen(const char* filename, const char* mode) {
+        return instance()._fopen(filename, mode);
+    }
+
+    static void fclose(FILE* f) {
+        ::fclose(f);
+    }
+
+    static bool inZipfile(const std::string& path) {
+        return instance()._inZipfile(path);
+    }
+
+    /** \copydoc isZipfile */
+    static bool isZipfile(const std::string& path) {
+        return instance()._isZipfile(path);
+    }
+
+    /** \copydoc _setCacheLifetime */
+    void setCacheLifetime(float t) {
+        instance()._setCacheLifetime(t);
+    }
+
+    /** \copydoc _cacheLifetime */
+    static float cacheLifetime() {
+        return instance()._cacheLifetime();
+    }
+
+    /** \copydoc _createDirectory */
+    static void createDirectory(const std::string& path) {
+        instance()._createDirectory(path);
+    }
+
+    /** \copydoc _currentDirectory */
+    static std::string currentDirectory() {
+        return instance()._currentDirectory();
+    }
+
+    /** \copydoc _copyFile */
+    static void copyFile(const std::string& srcPath, const std::string& dstPath) {
+        instance()._copyFile(srcPath, dstPath);
+    }
+
+    /** \copydoc _exists */
+    static bool exists(const std::string& f, bool trustCache = true) {
+        return instance()._exists(f, trustCache);
+    }
+
+    /** \copydoc _isDirectory */
+    static bool isDirectory(const std::string& path) {
+        return instance()._isDirectory(path);
+    }
+
+    /** \copydoc _isFile */
+    static bool isFile(const std::string& path) {
+        return instance()._isFile(path);
+    }
+
+    /** \copydoc _resolve */
+    static std::string resolve(const std::string& path, const std::string& cwd = currentDirectory()) {
+        return instance()._resolve(path, cwd);
+    }
+
+    /** \copydoc _isNewer */
+    static bool isNewer(const std::string& src, const std::string& dst) {
+        return instance()._isNewer(src, dst);
+    }
+
+    /** \copydoc _size */
+    static int64 size(const std::string& path) {
+        return instance()._size(path);
+    }
+
+    /** \copydoc _list */
+    static void list(const std::string& spec, Array<std::string>& result,
+        const ListSettings& listSettings = ListSettings()) {
+        return instance()._list(spec, result, listSettings);
+    }
+
+    /** \copydoc _getFiles */
+    static void getFiles(const std::string& spec, Array<std::string>& result, bool includeParentPath = false) {
+        return instance()._getFiles(spec, result, includeParentPath);
+    }
+
+    /** \copydoc getDirectories */
+    static void getDirectories(const std::string& spec, Array<std::string>& result, bool includeParentPath = false) {
+        return instance()._getDirectories(spec, result, includeParentPath);
+    }
+};
+
+
+/** \brief Parsing of file system paths.  
+
+    None of these routines touch the disk--they are purely string manipulation.
+
+    In "/a/b/base.ext",
+
+    <ul>
+      <li> base = "base"
+      <li> ext = "ext"
+      <li> parentPath = "/a/b"
+      <li> baseExt = "base.ext"
+    </ul>
+
+*/
+class FilePath {
+public:
+
+    /** Appends file onto dirname, ensuring a / if needed. */
+    static std::string concat(const std::string& a, const std::string& b);
+
+    static bool isRoot(const std::string& f);
+
+    /** Removes the trailing slash unless \a f is a filesystem root */
+    static std::string removeTrailingSlash(const std::string& f);
+
+    /** Returns everything to the right of the last '.' */
+    static std::string ext(const std::string& path);
+
+    /** Returns everything to the right of the last slash (or, on Windows, the last ':') */
+    static std::string baseExt(const std::string& path);
+
+    /** Returns everything between the right-most slash and the following '.' */
+    static std::string base(const std::string& path);
+
+    /** Returns everything to the left of the right-most slash */
+    static std::string parent(const std::string& path);
+
+    /** Returns true if '*' or '?' appear in the filename */
+    static bool containsWildcards(const std::string& p);
+
+    /** Convert all slashes to '/' */
+    static std::string canonicalize(std::string x);
+
+    /**
+      Parses a filename into four useful pieces.
+
+      Examples:
+
+      c:\\a\\b\\d.e   
+        root  = "c:\\"
+        path  = "a" "b"
+        base  = "d"
+        ext   = "e"
+     
+      /a/b/d.e
+        root = "/"
+        path  = "a" "b"
+        base  = "d"
+        ext   = "e"
+
+      /a/b
+        root  = "/"
+        path  = "a"
+        base  = "b"
+        ext   = "e"
+
+     */
+    static void parse
+    (const std::string&  filename,
+     std::string&        drive,    
+     Array<std::string>& path,
+     std::string&        base,
+     std::string&        ext);
+
+
+    /**
+      Returns true if \a path matches \a pattern, with standard filesystem wildcards.
+     */
+    static bool matches(const std::string& path, const std::string& pattern, bool caseSensitive = true);
+};
+
+} // namespace G3D
+#endif
+
diff --git a/dep/include/g3dlite/G3D/G3D.h b/dep/include/g3dlite/G3D/G3D.h
index 5b56b9c71dc..082d6434842 100644
--- a/dep/include/g3dlite/G3D/G3D.h
+++ b/dep/include/g3dlite/G3D/G3D.h
@@ -7,7 +7,7 @@
  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
 
  @created 2001-08-25
- @edited  2010-01-30
+ @edited  2010-03-20
 
  Copyright 2000-2010, Morgan McGuire.
  All rights reserved.
@@ -44,6 +44,7 @@
 #include "G3D/Matrix4.h"
 #include "G3D/CoordinateFrame.h"
 #include "G3D/PhysicsFrame.h"
+#include "G3D/PhysicsFrameSpline.h"
 #include "G3D/Plane.h"
 #include "G3D/Line.h"
 #include "G3D/Ray.h"
@@ -57,6 +58,7 @@
 #include "G3D/stringutils.h"
 #include "G3D/prompt.h"
 #include "G3D/Table.h"
+#include "G3D/FileSystem.h"
 #include "G3D/Set.h"
 #include "G3D/GUniqueID.h"
 #include "G3D/BinaryFormat.h"
@@ -118,6 +120,7 @@ template<class T> struct HashTrait< G3D::ReferenceCountedPointer<T> > {
 #include "G3D/ThreadSet.h"
 #include "G3D/RegistryUtil.h"
 #include "G3D/Any.h"
+#include "G3D/XML.h"
 #include "G3D/PointHashGrid.h"
 #include "G3D/Map2D.h"
 #include "G3D/Image1.h"
diff --git a/dep/include/g3dlite/G3D/GCamera.h b/dep/include/g3dlite/G3D/GCamera.h
index 018fbc85d59..1b7b2511b43 100644
--- a/dep/include/g3dlite/G3D/GCamera.h
+++ b/dep/include/g3dlite/G3D/GCamera.h
@@ -38,6 +38,9 @@ class Any;
 
   All viewport arguments are the pixel bounds of the viewport-- e.g.,
   RenderDevice::viewport().
+
+  See http://bittermanandy.wordpress.com/2009/04/10/a-view-to-a-thrill-part-one-camera-concepts/
+  for a nice introduction to camera transformations.
  */
 class GCamera  {
 
@@ -64,6 +67,8 @@ class GCamera  {
     /** Horizontal or Vertical */
     FOVDirection                m_direction;
 
+    Vector2                     m_pixelOffset;
+
 public:
 
     /** Must be of the format produced by the Any cast, e.g.,
@@ -117,6 +122,18 @@ class GCamera  {
         return m_cframe;
     }
 
+    /** Displacement from the upper left added in pixels in screen
+        space to the projection matrix.  This is useful for shifting
+        the sampled location from the pixel center (OpenGL convention)
+        to other locations, such as the upper-left.*/
+    void setPixelOffset(const Vector2& p) {
+        m_pixelOffset = p;
+    }
+
+    const Vector2& pixelOffset() const {
+        return m_pixelOffset;
+    }
+    
     /** Sets c to the camera's coordinate frame */
     void getCoordinateFrame(CoordinateFrame& c) const;
 
@@ -154,7 +171,7 @@ class GCamera  {
        This is the full angle, i.e., from the left side of the
        viewport to the right side.
     */
-    void setFieldOfView(float angle, FOVDirection direction);
+    void setFieldOfView(float edgeToEdgeAngleRadians, FOVDirection direction);
 
     /** Returns the current full field of view angle (from the left side of the
        viewport to the right side) and direction */
diff --git a/dep/include/g3dlite/G3D/GImage.h b/dep/include/g3dlite/G3D/GImage.h
index 8ae11134fc9..9a6851d32b3 100644
--- a/dep/include/g3dlite/G3D/GImage.h
+++ b/dep/include/g3dlite/G3D/GImage.h
@@ -43,9 +43,9 @@ class BinaryOutput;
   Interface to image compression & file formats. 
  
   Supported formats (decode and encode): Color JPEG, PNG,
-  (Uncompressed)TGA 24, (Uncompressed)TGA 32, BMP 1, BMP 4, BMP 8, BMP
+  (Uncompressed) TGA 24, (Uncompressed) TGA 32, BMP 1, BMP 4, BMP 8, BMP
   24, PPM (P6), and PPM ASCII (P1, P2, P3), which includes PPM, PGM,
-  and PBM.  8-bit paletted PCX, 24-bit PCX, and ICO are supported for
+  and PBM.  (Compressed) TGA 24, (Compressed) TGA 32, 8-bit paletted PCX, 24-bit PCX, and ICO are supported for
   decoding only.
 
   Sample usage:
@@ -78,6 +78,10 @@ class BinaryOutput;
   recommended over GImage (we don't include it directly in G3D because their license
   is more restrictive than the BSD one).
 
+  \cite http://tfcduke.developpez.com/tutoriel/format/tga/fichiers/tga_specs.pdf
+
+  \sa Image3, Image3uint8, Image4, Image4uint8, Image1, Image1uint8, Texture, Map2D
+
   */
 class GImage {
 private:
diff --git a/dep/include/g3dlite/G3D/GLight.h b/dep/include/g3dlite/G3D/GLight.h
index 3a95f1a8114..48e017d365d 100644
--- a/dep/include/g3dlite/G3D/GLight.h
+++ b/dep/include/g3dlite/G3D/GLight.h
@@ -90,6 +90,13 @@ class GLight  {
                        const Color3& color, float constAtt = 1, float linAtt = 0, float quadAtt = 0,
                        bool specular = true, bool diffuse = true);
 
+    /** Creates a spot light that looks at a specific point (by calling spot() ) */
+    static GLight spotTarget(const Vector3& pos, const Vector3& target, float cutOffAngleDegrees, 
+                       const Color3& color, float constAtt = 1, float linAtt = 0, float quadAtt = 0,
+                       bool specular = true, bool diffuse = true) {
+           return spot(pos, target - pos, cutOffAngleDegrees, color, constAtt, linAtt, quadAtt, specular, diffuse);
+    }
+
     /** Returns the sphere within which this light has some noticable effect.  May be infinite.
         @param cutoff The value at which the light intensity is considered negligible. */
     class Sphere effectSphere(float cutoff = 30.0f / 255) const;
diff --git a/dep/include/g3dlite/G3D/GMutex.h b/dep/include/g3dlite/G3D/GMutex.h
index 3469b812736..e0365ce24db 100644
--- a/dep/include/g3dlite/G3D/GMutex.h
+++ b/dep/include/g3dlite/G3D/GMutex.h
@@ -16,9 +16,9 @@
 #ifndef G3D_WIN32
 #   include <pthread.h>
 #   include <signal.h>
+#   include <unistd.h>
 #endif
 
-
 namespace G3D {
 
 /**
diff --git a/dep/include/g3dlite/G3D/HashTrait.h b/dep/include/g3dlite/G3D/HashTrait.h
index ca35da48643..72de3da52fd 100644
--- a/dep/include/g3dlite/G3D/HashTrait.h
+++ b/dep/include/g3dlite/G3D/HashTrait.h
@@ -52,7 +52,7 @@ template <> struct HashTrait <G3D::uint32> {
     static size_t hashCode(G3D::uint32 k) { return static_cast<size_t>(k); }
 };
 
-#if 0
+#ifdef G3D_OSX
 template <> struct HashTrait <long unsigned int> {
     static size_t hashCode(G3D::uint32 k) { return static_cast<size_t>(k); }
 };
diff --git a/dep/include/g3dlite/G3D/ImageFormat.h b/dep/include/g3dlite/G3D/ImageFormat.h
index 7f098322d26..15d2564330f 100644
--- a/dep/include/g3dlite/G3D/ImageFormat.h
+++ b/dep/include/g3dlite/G3D/ImageFormat.h
@@ -4,7 +4,7 @@
   @maintainer Morgan McGuire, http://graphics.cs.williams.edu
 
   @created 2003-05-23
-  @edited  2010-01-01
+  @edited  2010-05-01
 */
 
 #ifndef GLG3D_ImageFormat_H
@@ -13,6 +13,7 @@
 #include "G3D/platform.h"
 #include "G3D/Table.h"
 #include "G3D/enumclass.h"
+#include "G3D/Any.h"
 
 namespace G3D {
 
@@ -57,13 +58,19 @@ class ImageFormat {
         CODE_RGB8I,
         CODE_RGB8UI,
 
+        CODE_RGBA8UI,
+
         CODE_ARGB8,
         CODE_BGR8,
 
+        CODE_R8,
+
         CODE_RG8,
         CODE_RG8I,
         CODE_RG8UI,
 
+        CODE_RG16F,
+
         CODE_RGBA8,
         CODE_RGBA16,
         CODE_RGBA16F,
@@ -260,10 +267,14 @@ class ImageFormat {
 
     static const ImageFormat* BGR8();
 
+    static const ImageFormat* R8();
+
     static const ImageFormat* RG8();
     static const ImageFormat* RG8I();
     static const ImageFormat* RG8UI();
 
+    static const ImageFormat* RG16F();
+
     static const ImageFormat* RGB5();
 
     static const ImageFormat* RGB5A1();
@@ -297,6 +308,8 @@ class ImageFormat {
     static const ImageFormat* RGB8I();    
 
     static const ImageFormat* RGB8UI();    
+
+    static const ImageFormat* RGBA8UI();    
     
     static const ImageFormat* RGB_DXT1();
 
@@ -376,9 +389,18 @@ class ImageFormat {
             NEAREST,
             BILINEAR,
             MHC,
-            HIGH_QUALITY = MHC
+            BEST = MHC
         };
     private:
+        static const char* toString(int i, Value& v) {
+            static const char* str[] = {"NEAREST", "BILINEAR", "MHC", "BEST", NULL}; 
+            static const Value val[] = {NEAREST, BILINEAR, MHC, BEST};
+            const char* s = str[i];
+            if (s) {
+                v = val[i];
+            }
+            return s;
+        }
 
         Value value;
 
@@ -399,7 +421,7 @@ class ImageFormat {
     */
     static bool convert(const Array<const void*>& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits,
 	                    const Array<void*>& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits,
-	                    bool invertY = false, BayerAlgorithm bayerAlg = BayerAlgorithm::HIGH_QUALITY);
+	                    bool invertY = false, BayerAlgorithm bayerAlg = BayerAlgorithm::MHC);
 
     /* Checks if a conversion between two formats is available. */
     static bool conversionAvailable(const ImageFormat* srcFormat, int srcRowPadBits, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY = false);
diff --git a/dep/include/g3dlite/G3D/Matrix2.h b/dep/include/g3dlite/G3D/Matrix2.h
index eaf4aefa220..cab70c83e44 100644
--- a/dep/include/g3dlite/G3D/Matrix2.h
+++ b/dep/include/g3dlite/G3D/Matrix2.h
@@ -1,5 +1,5 @@
-#ifndef G3D_MATRIX2_H
-#define G3D_MATRIX2_H
+#ifndef G3D_Matrix2_h
+#define G3D_Matrix2_h
 
 #include "G3D/platform.h"
 #include "G3D/Vector2.h"
@@ -14,54 +14,59 @@ class Matrix2 {
 
 public:
 
-    inline Matrix2() {
+    Matrix2() {
         data[0][0] = 1.0f; data[0][1] = 0.0f;
         data[1][0] = 0.0f; data[1][1] = 1.0f;
     }
 
-    inline Matrix2(float v00, float v01, float v10, float v11) {
+    Matrix2(float v00, float v01, float v10, float v11) {
         data[0][0] = v00; data[0][1] = v01;
         data[1][0] = v10; data[1][1] = v11;
     }
 
-    inline Vector2 operator*(const Vector2& v) const {
+    static Matrix2 identity() {
+        return Matrix2(1.0f, 0.0f, 0.0f, 1.0f);
+    }
+
+    Vector2 operator*(const Vector2& v) const {
         return Vector2(data[0][0] * v[0] + data[0][1] * v[1],
                        data[1][0] * v[0] + data[1][1] * v[1]);
     }
     
-    inline Matrix2 inverse() const {
-        return Matrix2(data[0][0], data[1][0],
-                       data[0][1], data[1][1]) * (1.0f / determinant());
+    Matrix2 inverse() const {
+        return Matrix2(data[1][1], -data[0][1],
+                       -data[1][0], data[0][0]) * (1.0f / determinant());
     }
 
-    inline Matrix2 transpose() const {
+    Matrix2 transpose() const {
         return Matrix2(data[0][0], data[1][0],
                        data[0][1], data[1][1]);
     }
 
-    inline float determinant() const {
+    float determinant() const {
         return data[0][0] * data[1][1] - data[0][1] * data[1][0];
     }
 
-    inline Matrix2 operator*(float f) const {
+    Matrix2 operator*(float f) const {
         return Matrix2(data[0][0] * f, data[0][1] * f,
                        data[1][0] * f, data[1][1] * f);
     }
 
-    inline Matrix2 operator/(float f) const {
+    Matrix2 operator/(float f) const {
         return Matrix2(data[0][0] / f, data[0][1] / f,
                        data[1][0] / f, data[1][1] / f);
     }
 
-    inline float* operator[](int i) {
+    float* operator[](int i) {
         debugAssert(i >= 0 && i <= 2);
         return data[i];
     }
 
-    inline const float* operator[](int i) const {
+    const float* operator[](int i) const {
         debugAssert(i >= 0 && i <= 1);
         return data[i];
     }
+
 };
 
 }
diff --git a/dep/include/g3dlite/G3D/Matrix4.h b/dep/include/g3dlite/G3D/Matrix4.h
index 9ce87d875b8..6b810ba77e8 100644
--- a/dep/include/g3dlite/G3D/Matrix4.h
+++ b/dep/include/g3dlite/G3D/Matrix4.h
@@ -119,6 +119,15 @@ class Matrix4 {
     }
 
     Matrix4 operator*(const Matrix4& other) const;
+    Matrix4 operator+(const Matrix4& other) const {
+        Matrix4 result;
+        for (int r = 0; r < 4; ++r) {
+            for (int c = 0; c < 4; ++c) {
+                result.elt[r][c] = elt[r][c] + other.elt[r][c];
+            }
+        }
+        return result;
+    }
 
     class Matrix3 upper3x3() const;
 
diff --git a/dep/include/g3dlite/G3D/MeshAlg.h b/dep/include/g3dlite/G3D/MeshAlg.h
index 1decea10105..da55d13000a 100644
--- a/dep/include/g3dlite/G3D/MeshAlg.h
+++ b/dep/include/g3dlite/G3D/MeshAlg.h
@@ -600,7 +600,7 @@ class MeshAlg {
             outIndices.resize(N + (inSize - 2) * 3);
 
             bool atEven = false;
-            for (IndexType i = 0, outIndex = N; i <= (inSize - 2); ++i, outIndex += 3) {
+            for (IndexType i = 0, outIndex = N; i < (inSize - 2); ++i, outIndex += 3) {
                 if (atEven) {
                     outIndices[outIndex] = inIndices[i + 1];
                     outIndices[outIndex + 1] = inIndices[i];
diff --git a/dep/include/g3dlite/G3D/NetAddress.h b/dep/include/g3dlite/G3D/NetAddress.h
index 8ed20a06690..fd5a199593b 100644
--- a/dep/include/g3dlite/G3D/NetAddress.h
+++ b/dep/include/g3dlite/G3D/NetAddress.h
@@ -1,33 +1,9 @@
-#ifndef G3D_NETADDRESS_H
-#define G3D_NETADDRESS_H
+#ifndef G3D_NetAddress_h
+#define G3D_NetAddress_h
 
 #include "G3D/platform.h"
 #include "G3D/Table.h"
-
-/** These control the version of Winsock used by G3D.
-    Version 2.0 is standard for G3D 6.09 and later.
-    Version 1.1 is standard for G3D 6.08 and earlier.
- */
-#define G3D_WINSOCK_MAJOR_VERSION 2
-#define G3D_WINSOCK_MINOR_VERSION 0
-
-#ifdef G3D_WIN32
-#   if (G3D_WINSOCK_MAJOR_VERSION == 2)
-#       include <winsock2.h>
-#   elif (G3D_WINSOCK_MAJOR_VERSION == 1)
-#       include <winsock.h>
-#   endif
-#else
-#   include <sys/types.h>
-#   include <sys/socket.h>
-#   include <netinet/in.h>
-#   ifndef SOCKADDR_IN
-#       define SOCKADDR_IN struct sockaddr_in
-#   endif
-#   ifndef SOCKET
-#       define SOCKET int
-#   endif
-#endif
+#include "G3D/netheaders.h"
 
 #include "G3D/g3dmath.h"
 
diff --git a/dep/include/g3dlite/G3D/NetworkDevice.h b/dep/include/g3dlite/G3D/NetworkDevice.h
index ea3290cbc09..7a3f8ed4aca 100644
--- a/dep/include/g3dlite/G3D/NetworkDevice.h
+++ b/dep/include/g3dlite/G3D/NetworkDevice.h
@@ -258,8 +258,8 @@ class ReliableConduit : public Conduit {
     ~ReliableConduit();
 
 
-    // The message is actually copied from the socket to an internal buffer during
-    // this call.  Receive only deserializes.
+    /** The message is actually copied from the socket to an internal buffer during
+     this call.  Receive only deserializes.*/
     virtual bool messageWaiting();
 
     /**
@@ -348,6 +348,7 @@ class ReliableConduit : public Conduit {
         messageWaiting();
     }
 
+    /** The address of the other end of the conduit */
     NetAddress address() const;
 };
 
diff --git a/dep/include/g3dlite/G3D/PhysicsFrame.h b/dep/include/g3dlite/G3D/PhysicsFrame.h
index a5a9305b83e..9aee5e5a883 100644
--- a/dep/include/g3dlite/G3D/PhysicsFrame.h
+++ b/dep/include/g3dlite/G3D/PhysicsFrame.h
@@ -43,19 +43,27 @@ class PhysicsFrame {
     PhysicsFrame();
 
     /**
-     Purely translational force
+     Purely translational.
      */
     PhysicsFrame(const Vector3& translation) : translation(translation) {}
-
+    PhysicsFrame(const Quat& rot, const Vector3& translation) : rotation(rot), translation(translation) {}
+    PhysicsFrame(const Matrix3& rot, const Vector3& translation) : rotation(rot), translation(translation) {}
+    PhysicsFrame(const Matrix3& rot) : rotation(rot), translation(Vector3::zero()) {}
     PhysicsFrame(const CoordinateFrame& coordinateFrame);
 
+    /**
+      - PhysicsFrame( [quat], [vec3] )
+      - Vector3( ... )
+      - CFrame( ... )
+      - CFrame::from...( ... )
+     */
+    PhysicsFrame(const class Any& any);
+
     /** Compose: create the transformation that is <I>other</I> followed by <I>this</I>.*/
     PhysicsFrame operator*(const PhysicsFrame& other) const;
 
     virtual ~PhysicsFrame() {}
 
-    CoordinateFrame toCoordinateFrame() const;
-
     /**
      Linear interpolation (spherical linear for the rotations).
      */
@@ -67,8 +75,35 @@ class PhysicsFrame {
 
     void serialize(class BinaryOutput& b) const;
 
+    operator CFrame() const;
+
+    /** Multiplies both pieces by \a f; note that this will result in a non-unit 
+    quaternion that needs to be normalized */
+    PhysicsFrame& operator*=(float f) {
+        rotation *= f;
+        translation *= f;
+        return *this;
+    }
+
+    /** Multiplies both pieces by \a f; note that this will result in a non-unit 
+    quaternion that needs to be normalized */
+    PhysicsFrame operator*(float f) const {
+        return PhysicsFrame(rotation * f, translation * f);
+    }
+
+    PhysicsFrame operator+(const PhysicsFrame& f) const {
+        return PhysicsFrame(rotation + f.rotation, translation + f.translation);
+    }
+
+    PhysicsFrame& operator+=(const PhysicsFrame& f) {
+        rotation += f.rotation;
+        translation += f.translation;
+        return *this;
+    }
 };
 
+typedef PhysicsFrame PFrame;
+
 } // namespace
 
 #endif
diff --git a/dep/include/g3dlite/G3D/PhysicsFrameSpline.h b/dep/include/g3dlite/G3D/PhysicsFrameSpline.h
new file mode 100644
index 00000000000..4a21503df35
--- /dev/null
+++ b/dep/include/g3dlite/G3D/PhysicsFrameSpline.h
@@ -0,0 +1,37 @@
+/**
+  @file PhysicsFrameSpline.h
+
+  @author Morgan McGuire, http://graphics.cs.williams.edu
+ */
+#ifndef G3D_PhysicsFrameSpline_h
+#define G3D_PhysicsFrameSpline_h
+
+#include "G3D/platform.h"
+#include "G3D/PhysicsFrame.h"
+#include "G3D/Spline.h"
+
+namespace G3D {
+
+/**
+ A subclass of Spline that keeps the rotation field of a
+ PhysicsFrame normalized and rotating the short direction.
+
+ \sa UprightFrameSpline
+ */
+class PhysicsFrameSpline : public Spline<PhysicsFrame> {
+public:
+    PhysicsFrameSpline();
+
+    /** Accepts a table of properties, or any valid PhysicsFrame specification for a single control*/
+    PhysicsFrameSpline(const Any& any);
+
+    /** Clear and then reset all values from the any */
+    PhysicsFrameSpline& operator=(const Any& any);
+
+    virtual void correct(PhysicsFrame& frame) const;
+    virtual void ensureShortestPath(PhysicsFrame* A, int N) const;
+};
+
+}
+
+#endif
diff --git a/dep/include/g3dlite/G3D/PointHashGrid.h b/dep/include/g3dlite/G3D/PointHashGrid.h
index 0db9e677321..d0b60a88ae5 100644
--- a/dep/include/g3dlite/G3D/PointHashGrid.h
+++ b/dep/include/g3dlite/G3D/PointHashGrid.h
@@ -5,7 +5,7 @@
    @created 2008-07-01
    @edited  2009-05-28
 
-   Copyright 2000-2009, Morgan McGuire.
+   Copyright 2000-2010, Morgan McGuire.
    All rights reserved.
 */
 #ifndef G3D_PointHashGrid_h
@@ -30,18 +30,44 @@ namespace G3D {
     approximately uniform density (with respect to the radius hint),
     the time cost of searching for neighbors is O(1).
 
-    <i>Value</i> must be supported by a G3D::PositionTrait,
-    G3D::EqualsTrait, and G3D::HashFunc.  overrides are provided for
-    common G3D classes like G3D::Vector3.
+    <i>Value</i> must be supported by a G3D::PositionTrait and
+    G3D::EqualsTrait.  Overloads are provided for
+    common G3D classes like G3D::Vector3.  For example:
+
+   <pre>
+    class EqualsFunc {
+    public:
+        static bool equals(const Data& p, const Data& q) {
+            return p == q;
+        }
+    };
+    
+    class PosFunc {
+    public:
+        static void getPosition(const Data& d, Vector3& pos) {
+            pos = d.location;
+        }
+    };
+
+    PointHashGrid<Data, Data::PosFunc, Data::EqualsFunc> grid;
+   </pre>
+
+   If the Value class defines operator==, the Equalsfunc is optional:
+
+   <pre>
+    PointHashGrid<Data, Data::PosFunc> grid;
+   </pre>
+
 */
 template<class Value,
          class PosFunc    = PositionTrait<Value>, 
-         class EqualsFunc = EqualsTrait<Value>, 
-         class HashFunc   = HashTrait<Vector3int32> >
+         class EqualsFunc = EqualsTrait<Value> >
 class PointHashGrid {
 private:
 
-#define ThisType PointHashGrid<Value, PosFunc, EqualsFunc, HashFunc>
+#   define expectedCellSize (3)
+
+#   define ThisType PointHashGrid<Value, PosFunc, EqualsFunc>
 
     /** A value annotated with precomputed position and hash code.*/
     class Entry {
@@ -51,8 +77,8 @@ class PointHashGrid {
     };
 
     /** One cell of the grid. */
-    typedef Array<Entry> Cell;
-    typedef Table<Vector3int32, Cell, HashFunc> CellTable;
+    typedef SmallArray<Entry, expectedCellSize> Cell;
+    typedef Table<Vector3int32, Cell >          CellTable;
 
     /** The cube of +/-1 along each dimension. Initialized by initOffsetArray.*/
     Vector3int32        m_offsetArray[3*3*3];
@@ -182,11 +208,11 @@ class PointHashGrid {
         Array<Entry> entry(init.size());
         for (int i = 0; i < entry.size(); ++i) {
             const Value& value = init[i];
-            Vector3 pos        = m_posFunc(value);
+            Vector3 pos;
 
             entry[i].value     = value;
             entry[i].hashCode  = m_hashFunc(value);
-            entry[i].position  = pos;
+            PosFunc::getPosition(value, entry[i].position);
 
             lo = lo.min(pos);
             hi = hi.max(pos);
@@ -334,7 +360,7 @@ class PointHashGrid {
                      m_arrayIndex(0), m_epoch(0) {}
 
         Iterator(const ThisType* grid) : 
-            m_isEnd(false),
+            m_isEnd(grid->size() == 0),
             m_grid(grid),
             m_tableIterator( grid->m_data.begin() ),
             m_arrayIndex(0),
@@ -361,6 +387,10 @@ class PointHashGrid {
             }
         }
 
+        bool hasMore() const {
+            return ! m_isEnd;
+        }
+
         bool operator==(const Iterator& other) const {
             return !(*this != other);
         }
diff --git a/dep/include/g3dlite/G3D/Quat.h b/dep/include/g3dlite/G3D/Quat.h
index 9ef3d57b301..d8fdfafeca4 100644
--- a/dep/include/g3dlite/G3D/Quat.h
+++ b/dep/include/g3dlite/G3D/Quat.h
@@ -21,6 +21,8 @@
 namespace G3D {
 
 /**
+  Arbitrary quaternion (not necessarily unit)
+
   Unit quaternions are used in computer graphics to represent
   rotation about an axis.  Any 3x3 rotation matrix can
   be stored as a quaternion.
@@ -42,7 +44,7 @@ namespace G3D {
   Do not subclass.
 
   <B>BETA API -- subject to change</B>
-  @cite Erik B. Dam, Martin Koch, Martin Lillholm, Quaternions, Interpolation and Animation.  Technical Report DIKU-TR-98/5, Department of Computer Science, University of Copenhagen, Denmark.  1998.
+  \cite Erik B. Dam, Martin Koch, Martin Lillholm, Quaternions, Interpolation and Animation.  Technical Report DIKU-TR-98/5, Department of Computer Science, University of Copenhagen, Denmark.  1998.
  */
 class Quat {
 private:
@@ -63,31 +65,100 @@ class Quat {
     float x, y, z, w;
 
     /**
-     Initializes to a zero degree rotation.
+     Initializes to a zero degree rotation, (0,0,0,1)
      */
-    inline Quat() : x(0), y(0), z(0), w(1) {}
+    Quat() : x(0), y(0), z(0), w(1) {}
+
+    /** Expects "Quat(x,y,z,w)" or a Matrix3 constructor. */
+    Quat(const class Any& a);
 
-    Quat(
-        const Matrix3& rot);
+    Quat(const Matrix3& rot);
 
-    inline Quat(float _x, float _y, float _z, float _w) :
+    Quat(float _x, float _y, float _z, float _w) :
         x(_x), y(_y), z(_z), w(_w) {}
 
     /** Defaults to a pure vector quaternion */
-    inline Quat(const Vector3& v, float _w = 0) : x(v.x), y(v.y), z(v.z), w(_w) {
+    Quat(const Vector3& v, float _w = 0) : x(v.x), y(v.y), z(v.z), w(_w) {
     }
 
     /**
      The real part of the quaternion.
      */
-    inline const float& real() const {
+    const float& real() const {
         return w;
     }
 
-    inline float& real() {
+    float& real() {
         return w;
     }
 
+	Quat operator-() const {
+		return Quat(-x, -y, -z, -w);
+	}
+
+    Quat operator-(const Quat& other) const {
+        return Quat(x - other.x, y - other.y, z - other.z, w - other.w);
+    }
+
+    Quat& operator-=(const Quat& q) {
+        x -= q.x;
+        y -= q.y;
+        z -= q.z;
+        w -= q.w;
+        return *this;
+    }
+
+    Quat operator+(const Quat& q) const {
+        return Quat(x + q.x, y + q.y, z + q.z, w + q.w);
+    }
+    
+    Quat& operator+=(const Quat& q) {
+        x += q.x;
+        y += q.y;
+        z += q.z;
+        w += q.w;
+        return *this;
+    }
+
+    /**
+     Negates the imaginary part.
+     */
+    Quat conj() const {
+        return Quat(-x, -y, -z, w);
+    }
+
+    float sum() const {
+        return x + y + z + w;
+    }
+
+    float average() const {
+        return sum() / 4.0f;
+    }
+
+    Quat operator*(float s) const {
+        return Quat(x * s, y * s, z * s, w * s);
+    }
+
+    Quat& operator*=(float s) {
+        x *= s;
+        y *= s;
+        z *= s;
+        w *= s;
+        return *this;
+    }
+
+
+	/** @cite Based on Watt & Watt, page 360 */
+    friend Quat operator* (float s, const Quat& q);
+
+    inline Quat operator/(float s) const {
+        return Quat(x / s, y / s, z / s, w / s);
+    }
+
+    float dot(const Quat& other) const {
+        return (x * other.x) + (y * other.y) + (z * other.z) + (w * other.w);
+    }
+
     /** Note: two quats can represent the Quat::sameRotation and not be equal. */
     bool fuzzyEq(const Quat& q) {
       return G3D::fuzzyEq(x, q.x) && G3D::fuzzyEq(y, q.y) && G3D::fuzzyEq(z, q.z) && G3D::fuzzyEq(w, q.w);
@@ -100,18 +171,14 @@ class Quat {
         return fuzzyEq(q) || fuzzyEq(-q);
     }
 
-	inline Quat operator-() const {
-		return Quat(-x, -y, -z, -w);
-	}
-
     /**
      Returns the imaginary part (x, y, z)
      */
-    inline const Vector3& imag() const {
+    const Vector3& imag() const {
         return *(reinterpret_cast<const Vector3*>(this));
     }
 
-    inline Vector3& imag() {
+    Vector3& imag() {
         return *(reinterpret_cast<Vector3*>(this));
     }
 
@@ -158,43 +225,7 @@ class Quat {
 	/** Normalized linear interpolation of quaternion components. */
 	Quat nlerp(const Quat& other, float alpha) const;
 
-    /**
-     Negates the imaginary part.
-     */
-    inline Quat conj() const {
-        return Quat(-x, -y, -z, w);
-    }
 
-    inline float sum() const {
-        return x + y + z + w;
-    }
-
-    inline float average() const {
-        return sum() / 4.0f;
-    }
-
-    inline Quat operator*(float s) const {
-        return Quat(x * s, y * s, z * s, w * s);
-    }
-
-    inline Quat& operator*=(float s) {
-        x *= s;
-        y *= s;
-        z *= s;
-        w *= s;
-        return *this;
-    }
-
-	/** @cite Based on Watt & Watt, page 360 */
-    friend Quat operator* (float s, const Quat& q);
-
-    inline Quat operator/(float s) const {
-        return Quat(x / s, y / s, z / s, w / s);
-    }
-
-    inline float dot(const Quat& other) const {
-        return (x * other.x) + (y * other.y) + (z * other.z) + (w * other.w);
-    }
 
     /** Note that q<SUP>-1</SUP> = q.conj() for a unit quaternion. 
         @cite Dam99 page 13 */
@@ -202,10 +233,6 @@ class Quat {
         return conj() / dot(*this);
     }
 
-    Quat operator-(const Quat& other) const;
-
-    Quat operator+(const Quat& other) const;
-
     /**
      Quaternion multiplication (composition of rotations).
      Note that this does not commute.
@@ -217,18 +244,16 @@ class Quat {
         return (*this) * other.inverse();
     }
 
-
     /** Is the magnitude nearly 1.0? */
-    inline bool isUnit(float tolerance = 1e-5) const {
+    bool isUnit(float tolerance = 1e-5) const {
         return abs(dot(*this) - 1.0f) < tolerance;
-    }
-    
+    }    
 
-    inline float magnitude() const {
+    float magnitude() const {
         return sqrtf(dot(*this));
     }
 
-    inline Quat log() const {
+    Quat log() const {
         if ((x == 0) && (y == 0) && (z == 0)) {
             if (w > 0) {
                 return Quat(0, 0, 0, ::logf(w));
@@ -289,18 +314,16 @@ class Quat {
         return (log() * x).exp();
     }
 
-    inline void unitize() {
-        float mag2 = dot(*this);
-        if (! G3D::fuzzyEq(mag2, 1.0f)) {
-            *this *= rsq(mag2);
-        }
+    /** Make unit length in place */
+    void unitize() {
+        *this *= rsq(dot(*this));
     }
 
     /**
      Returns a unit quaterion obtained by dividing through by
      the magnitude.
      */
-    inline Quat toUnit() const {
+    Quat toUnit() const {
         Quat x = *this;
         x.unitize();
         return x;
@@ -312,7 +335,7 @@ class Quat {
      n(q) value used in Eberly's 1999 paper, which is the square of the
      norm.
      */
-    inline float norm() const {
+    float norm() const {
         return magnitude();
     }
 
@@ -706,13 +729,6 @@ inline const float& Quat::operator[] (int i) const {
     return ((float*)this)[i];
 }
 
-inline Quat Quat::operator-(const Quat& other) const {
-    return Quat(x - other.x, y - other.y, z - other.z, w - other.w);
-}
-
-inline Quat Quat::operator+(const Quat& other) const {
-    return Quat(x + other.x, y + other.y, z + other.z, w + other.w);
-}
 
 } // Namespace G3D
 
diff --git a/dep/include/g3dlite/G3D/Set.h b/dep/include/g3dlite/G3D/Set.h
index 9a8e1b619bb..0ea96b880cf 100644
--- a/dep/include/g3dlite/G3D/Set.h
+++ b/dep/include/g3dlite/G3D/Set.h
@@ -57,9 +57,12 @@ class Set {
 
     /**
      Inserts into the table if not already present.
+     Returns true if this is the first time the element was added.
      */
-    void insert(const T& member) {
-        memberTable.set(member, true);
+    bool insert(const T& member) {
+        bool isNew = false;
+        memberTable.getCreate(member, isNew) = true;
+        return isNew;
     }
 
     /**
diff --git a/dep/include/g3dlite/G3D/SmallArray.h b/dep/include/g3dlite/G3D/SmallArray.h
index 41f9959e264..900d2335ee1 100644
--- a/dep/include/g3dlite/G3D/SmallArray.h
+++ b/dep/include/g3dlite/G3D/SmallArray.h
@@ -2,9 +2,9 @@
   @file SmallArray.h
   
   @created 2009-04-26
-  @edited  2009-04-26
+  @edited  2010-02-26
 
-  Copyright 2000-2009, Morgan McGuire, http://graphics.cs.williams.edu
+  Copyright 2000-2010, Morgan McGuire, http://graphics.cs.williams.edu
   All rights reserved.
  */
 #ifndef G3D_SmallArray_h
@@ -12,6 +12,7 @@
 
 #include "G3D/platform.h"
 #include "G3D/Array.h"
+#include "G3D/MemoryManager.h"
 
 namespace G3D {
 
@@ -46,6 +47,11 @@ class SmallArray {
         resize(0, shrinkIfNecessary);
     }
 
+    void clearAndSetMemoryManager(MemoryManager::Ref& m) {
+        clear();
+        m_rest.clearAndSetMemoryManager(m);
+    }
+
     inline T& operator[](int i) {
         debugAssert(i < m_size && i >= 0);
         if (i < N) {
@@ -77,7 +83,7 @@ class SmallArray {
         push(v);
     }
 
-    void fastRemove(int i) {
+    void fastRemove(int i, bool shrinkIfNecessary = false) {
         debugAssert(i < m_size && i >= 0);
         if (i < N) {
             if (m_size <= N) {
@@ -89,7 +95,7 @@ class SmallArray {
             }
         } else {
             // Removing from the rest array
-            m_rest.fastRemove(i - N);
+            m_rest.fastRemove(i - N, shrinkIfNecessary);
         }
         --m_size;
     }
diff --git a/dep/include/g3dlite/G3D/Sphere.h b/dep/include/g3dlite/G3D/Sphere.h
index 595b61c4bf1..d1448261d9f 100644
--- a/dep/include/g3dlite/G3D/Sphere.h
+++ b/dep/include/g3dlite/G3D/Sphere.h
@@ -15,7 +15,6 @@
 #include "G3D/platform.h"
 #include "G3D/Vector3.h"
 #include "G3D/Array.h"
-#include "G3D/Sphere.h"
 
 namespace G3D {
 
diff --git a/dep/include/g3dlite/G3D/Spline.h b/dep/include/g3dlite/G3D/Spline.h
index fdd29e69ce9..89f89194f1e 100644
--- a/dep/include/g3dlite/G3D/Spline.h
+++ b/dep/include/g3dlite/G3D/Spline.h
@@ -100,7 +100,7 @@ class SplineBase {
  See Real Time Rendering, 2nd edition, ch 12 for a general discussion
  of splines and their properties.
 
- @sa G3D::UprightSpline, G3D::QuatSpline
+ \sa G3D::UprightSpline
  */
 template<typename Control>
 class Spline : public SplineBase {
@@ -270,7 +270,7 @@ class Spline : public SplineBase {
     }
 
     /**
-       Mutates the array of N control points. It is useful to override this
+       Mutates the array of N control points that begins at \a A. It is useful to override this
        method by one that wraps the values if they are angles or quaternions
        for which "shortest path" interpolation is significant.
      */
@@ -333,10 +333,6 @@ class Spline : public SplineBase {
         const Control& p2 = p[2];
         const Control& p3 = p[3];
 
-        const Control& dp0 = p1 + (p0*-1.0f);
-        const Control& dp1 = p2 + (p1*-1.0f);
-        const Control& dp2 = p3 + (p2*-1.0f);
-
         // The factor of 1/2 from averaging two time intervals is 
         // already factored into the basis
         
@@ -346,12 +342,17 @@ class Spline : public SplineBase {
         float n0 = x / dt0;
         float n1 = x / dt1;
         float n2 = x / dt2;
+
+        const Control& dp0 = p1 + (p0*-1.0f);
+        const Control& dp1 = p2 + (p1*-1.0f);
+        const Control& dp2 = p3 + (p2*-1.0f);
+
         const Control& dp1n1 = dp1 * n1;
         const Control& tan1 = dp0 * n0 + dp1n1;
         const Control& tan2 = dp1n1 + dp2 * n2;
 
         sum = 
-            tan1 * weights[0]+
+            tan1 * weights[0] +
              p1  * weights[1] +
              p2  * weights[2] +
             tan2 * weights[3]; 
diff --git a/dep/include/g3dlite/G3D/System.h b/dep/include/g3dlite/G3D/System.h
old mode 100644
new mode 100755
index 56ef9c8e3dc..3183064e1ea
--- a/dep/include/g3dlite/G3D/System.h
+++ b/dep/include/g3dlite/G3D/System.h
@@ -1,8 +1,8 @@
-/**
+/** 
   @file System.h
-
+ 
   @maintainer Morgan McGuire, http://graphics.cs.williams.edu
-
+ 
   @cite Rob Wyatt http://www.gamasutra.com/features/wyatts_world/19990709/processor_detection_01.htm
   @cite Benjamin Jurke http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-ProcessorDetectionClass&forum=cotd&id=-1
   @cite Michael Herf http://www.stereopsis.com/memcpy.html
@@ -39,7 +39,7 @@ std::string demoFindData(bool errorIfNotFound = true);
 
 /** G3D, SDL, and IJG libraries require license documentation
     to be distributed with your program.  This generates the
-    string that must appear in your documentation.
+    string that must appear in your documentation. 
     <B>Your program can be commercial, closed-source</B> under
     any license you want.
     @deprecated Use System::license
@@ -48,19 +48,19 @@ std::string license();
 
 /**
 @brief The order in which the bytes of an integer are stored on a
-machine.
+machine. 
 
 Intel/AMD chips tend to be G3D_LITTLE_ENDIAN, Mac PPC's and Suns are
 G3D_BIG_ENDIAN. However, this is primarily used to specify the byte
 order of file formats, which are fixed.
 */
 enum G3DEndian {
-    G3D_BIG_ENDIAN,
+    G3D_BIG_ENDIAN, 
     G3D_LITTLE_ENDIAN
 };
 
 /**
- @brief OS and processor abstraction.
+ @brief OS and processor abstraction.  
 
  The first time any method is called the processor will be analyzed.
  Future calls are then fast.
@@ -83,7 +83,7 @@ class System {
        @param size Size of memory that the system was trying to allocate
 
        @param recoverable If true, the system will attempt to allocate again
-       if the callback returns true.  If false, malloc is going to return
+       if the callback returns true.  If false, malloc is going to return 
        NULL and this invocation is just to notify the application.
 
        @return Return true to force malloc to attempt allocation again if the
@@ -140,7 +140,7 @@ class System {
     /** @brief Used for the singleton instance only. */
     System();
 
-    /** @brief The singleton instance.
+    /** @brief The singleton instance. 
 
         Used instead of a global variable to ensure that the order of
         intialization is correct, which is critical because other
@@ -155,7 +155,7 @@ class System {
         CPUID_GET_HIGHEST_FUNCTION   = 0x80000000,
         CPUID_EXTENDED_FEATURES      = 0x80000001};
 
-    /** Helper macro to call cpuid functions and return all values
+    /** Helper macro to call cpuid functions and return all values 
 
        See http://software.intel.com/en-us/articles/intel-64-architecture-processor-topology-enumeration/
        or  http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/25481.pdf
@@ -171,10 +171,10 @@ class System {
 
     /** Called from init() */
     void initTime();
-
+    
 public:
 
-    /** Returns the speed of processor 0 in MHz.
+    /** Returns the speed of processor 0 in MHz. 
         Always returns 0 on linux.*/
     inline static int cpuSpeedMHz() {
         return instance().m_cpuSpeed;
@@ -229,7 +229,7 @@ class System {
     inline static const std::string& operatingSystem() {
         return instance().m_operatingSystem;
     }
-
+    
     /** e.g., 80686 */
     inline static const std::string& cpuArchitecture() {
         return instance().m_cpuArch;
@@ -241,24 +241,24 @@ class System {
     static std::string currentDateString();
 
     /**
-       Guarantees that the start of the array is aligned to the
+       Guarantees that the start of the array is aligned to the 
        specified number of bytes.
     */
     static void* alignedMalloc(size_t bytes, size_t alignment);
-
+    
     /**
        Uses pooled storage to optimize small allocations (1 byte to 5
        kilobytes).  Can be 10x to 100x faster than calling ::malloc or
        new.
-
+       
        The result must be freed with free.
-
+       
        Threadsafe on Win32.
-
+       
        @sa calloc realloc OutOfMemoryCallback free
     */
     static void* malloc(size_t bytes);
-
+    
     static void* calloc(size_t n, size_t x);
 
     /**
@@ -272,7 +272,7 @@ class System {
     static std::string mallocPerformance();
     static void resetMallocPerformanceCounters();
 
-    /**
+    /** 
        Returns a string describing the current usage of the buffer pools used for
        optimizing System::malloc.
      */
@@ -294,12 +294,12 @@ class System {
         one on some processors.  Guaranteed to have the same behavior as memcpy
         in all cases. */
     static void memcpy(void* dst, const void* src, size_t numBytes);
-
+    
     /** An implementation of memset that may be up to 2x as fast as the C library
         one on some processors.  Guaranteed to have the same behavior as memset
         in all cases. */
     static void memset(void* dst, uint8 value, size_t numBytes);
-
+    
     /**
      Returns the fully qualified filename for the currently running executable.
 
@@ -331,7 +331,7 @@ class System {
     /**
      Causes the current thread to yield for the specified duration
      and consume almost no CPU.
-     The sleep will be extremely precise; it uses System::time()
+     The sleep will be extremely precise; it uses System::time() 
      to calibrate the exact yeild time.
      */
     static void sleep(RealTime t);
@@ -347,7 +347,7 @@ class System {
      Console programs only.
      */
     static bool consoleKeyPressed();
-
+    
     /**
      Blocks until a key is read (use consoleKeyPressed to determine if
      a key is waiting to be read) then returns the character code for
@@ -358,7 +358,7 @@ class System {
     /**
      The actual time (measured in seconds since
      Jan 1 1970 midnight).
-
+     
      Adjusted for local timezone and daylight savings
      time.   This is as accurate and fast as getCycleCount().
     */
@@ -375,10 +375,12 @@ class System {
      // count now contains the cycle count for the intervening operation.
      </PRE>
      */
-    /* static void beginCycleCount(uint64& cycleCount);
+#if SOMEONE_MADE_THIS_USEFUL /* G3DFIX: Not required and not portable to Win64 */
+    static void beginCycleCount(uint64& cycleCount);
     static void endCycleCount(uint64& cycleCount);
 
-    static uint64 getCycleCount(); */
+    static uint64 getCycleCount();
+#endif /* G3DFIX: Not required and not portable to Win64 */
 
     inline static void setOutOfMemoryCallback(OutOfMemoryCallback c) {
         instance().m_outOfMemoryCallback = c;
@@ -392,7 +394,7 @@ class System {
      true, System::malloc will attempt to allocate the memory again.
      If the callback returns false, then System::malloc will return NULL.
 
-     You can use outOfMemoryCallback to free data structures or to
+     You can use outOfMemoryCallback to free data structures or to 
      register the failure.
      */
     inline static OutOfMemoryCallback outOfMemoryCallback() {
@@ -401,7 +403,7 @@ class System {
 
     /** Set an environment variable for the current process */
     static void setEnv(const std::string& name, const std::string& value);
-
+	
     /** Get an environment variable for the current process.  Returns NULL if the variable doesn't exist. */
     static const char* getEnv(const std::string& name);
 
@@ -426,7 +428,7 @@ class System {
      Tries to locate the resource by looking in related directories.
      If found, returns the full path to the resource, otherwise
      returns the empty string.
-     */
+     */    
     static std::string findDataFile(const std::string& full, bool errorIfNotFound = true);
 
     /**
@@ -438,7 +440,8 @@ class System {
 
 };
 
-/* don't need that for MaNGOS, not portable to Win64...
+#if SOMEONE_MADE_THIS_USEFUL /* G3DFIX: Not required and not portable to Win64 */
+
 #ifdef _MSC_VER
     inline uint64 System::getCycleCount() {
         uint32 timehi, timelo;
@@ -472,11 +475,11 @@ class System {
 #elif defined(G3D_OSX)
 
     inline uint64 System::getCycleCount() {
-		//Note:  To put off extra processing until the end, this does not
+		//Note:  To put off extra processing until the end, this does not 
 		//return the actual clock cycle count.  It is a bus cycle count.
 		//When endCycleCount() is called, it converts the two into a difference
 		//of clock cycles
-
+		
         return (uint64) UnsignedWideToUInt64(UpTime());
 		//return (uint64) mach_absolute_time();
     }
@@ -493,14 +496,15 @@ inline void System::endCycleCount(uint64& cycleCount) {
     cycleCount = getCycleCount() - cycleCount;
 #else
     AbsoluteTime end = UpTime();
-    Nanoseconds diffNS =
+    Nanoseconds diffNS = 
         AbsoluteDeltaToNanoseconds(end, UInt64ToUnsignedWide(cycleCount));
-    cycleCount =
-        (uint64) ((double) (instance().m_OSXCPUSpeed) *
+    cycleCount = 
+        (uint64) ((double) (instance().m_OSXCPUSpeed) * 
                   (double) UnsignedWideToUInt64(diffNS) * instance().m_secondsPerNS);
 #endif
 }
- */
+
+#endif /* G3DFIX: Not required and not portable to Win64 */
 
 } // namespace
 
diff --git a/dep/include/g3dlite/G3D/Table.h b/dep/include/g3dlite/G3D/Table.h
index 287efa94d97..ab0b114b1c4 100644
--- a/dep/include/g3dlite/G3D/Table.h
+++ b/dep/include/g3dlite/G3D/Table.h
@@ -86,12 +86,11 @@ namespace G3D {
 
   <PRE>
     template<> struct HashTrait<MyEnum> {
-        static size_t equals(const MyEnum& key) const { return reinterpret_cast<size_t>( key ); }
+        static size_t hashCode(const MyEnum& key) const { return reinterpret_cast<size_t>( key ); }
     };
   </PRE>
 
-  And rely on the default enum operator==.
-
+  and rely on the default enum operator==.
 
   Periodically check that debugGetLoad() is low (> 0.1).  When it gets near
   1.0 your hash function is badly designed and maps too many inputs to
@@ -846,7 +845,7 @@ class Table {
               return true;
            }
            node = node->next;
-       } while (node != NULL);
+       }
 
        return false;
    }
diff --git a/dep/include/g3dlite/G3D/TextInput.h b/dep/include/g3dlite/G3D/TextInput.h
index 33eb8c48e53..7aefb50ffa8 100644
--- a/dep/include/g3dlite/G3D/TextInput.h
+++ b/dep/include/g3dlite/G3D/TextInput.h
@@ -8,9 +8,9 @@
  @cite Based on a lexer written by Aaron Orenstein. 
 
  @created 2002-11-27
- @edited  2009-11-24
+ @edited  2010-07-03
 
- Copyright 2000-2009, Morgan McGuire.
+ Copyright 2000-2010, Morgan McGuire.
  All rights reserved.
  */
 
@@ -76,6 +76,7 @@ class Token {
     bool                    _bool;
     int                     _line;
     int                     _character;
+    uint64                  _bytePosition;
     Type                    _type;
     ExtendedType            _extendedType;
 
@@ -86,14 +87,15 @@ class Token {
         _bool(false),
         _line(0), 
         _character(0), 
+        _bytePosition(0),
         _type(END), 
         _extendedType(END_TYPE) {}
 
-    Token(Type t, ExtendedType e, const std::string& s, int L, int c)
-        : _string(s), _bool(false), _line(L), _character(c), _type(t), _extendedType(e) {}
+    Token(Type t, ExtendedType e, const std::string& s, int L, int c, uint64 byte)
+        : _string(s), _bool(false), _line(L), _character(c), _bytePosition(byte), _type(t), _extendedType(e) {}
 
-    Token(Type t, ExtendedType e, const std::string& s, bool b, int L, int c)
-        : _string(s), _bool(b), _line(L), _character(c), _type(t), _extendedType(e) {}
+    Token(Type t, ExtendedType e, const std::string& s, bool b, int L, int c, uint64 byte)
+        : _string(s), _bool(b), _line(L), _character(c), _bytePosition(byte), _type(t), _extendedType(e) {}
 
     Type type() const {
         return _type;
@@ -132,6 +134,12 @@ class Token {
         return _character;
     }
 
+    /** Number of bytes from the beginning of the buffer that this token was parsed from. 
+      Begins at 0 */
+    uint64 bytePosition() const {
+        return _bytePosition;
+    }
+
     /** Return the numeric value for a number type, or zero if this is
         not a number type.
     */
@@ -212,6 +220,12 @@ class Token {
  */
 class TextInput {
 public:
+    /** Includes MSVC specials parsing */
+    static double parseNumber(const std::string& _string);
+
+    /** toLower(_string) == "true" */
+    static bool parseBoolean(const std::string& _string);
+
 
     /** Tokenizer configuration options.  */
     class Settings {
@@ -316,12 +330,13 @@ class TextInput {
 
         /** 
           Parse -1.#IND00 as the floating point number returned by
-          nan(), -1.#INF00 as -inf(), and 1.#INF00 as inf().  Note
-          that the C99 standard specifies that a variety of formats
-          like "NaN" and "nan" are to be used; these are easier to
-          parse yourself and not currently supported by readNumber.
+          nan(), -1.#INF00 as -G3D::inf(), and 1.#INF00 as G3D::inf().  
+          
+          Note that the C99 standard specifies that a variety of formats
+          like "nan" are to be used; these are supported by 
+          G3D::TextInput::Settings::simpleFloatSpecials.
 
-          An alternative to specifying msvcSpecials is to read numbers as:
+          An alternative to specifying msvcFloatSpecials is to read numbers as:
           <pre>
             Token x = t.read();
             Token y = t.peek();
@@ -339,10 +354,14 @@ class TextInput {
           special format overrides the comment and will be parsed
           instead.
 
-          If signedNumbers is false msvcSpecials will not be parsed.
+          If signedNumbers is false msvcFloatSpecials will not be parsed.
 
           Default is true. */
-        bool                msvcSpecials;
+        bool                msvcFloatSpecials;
+
+        /** Parses "+inf', "-inf", "inf", "nan" as floats instead of symbols. 
+            Defaults to true.*/
+        bool                simpleFloatSpecials;
 
         /**
          Parse the following set of useful proof symbols:
@@ -362,7 +381,7 @@ class TextInput {
         bool                proofSymbols;
 
         /**
-         When parsing booleans and msvcSpecials, is case significant?
+         When parsing booleans and msvcFloatSpecials, is case significant?
          Default is {true}
         */
         bool                caseSensitive;
@@ -623,9 +642,17 @@ class TextInput {
         is not a string.  WrongString will be thrown if the next token in the
         input stream is a string but does not match the @p s parameter.  When
         an exception is thrown, no tokens are consumed.
+
+        \sa readString(), readStringToken(), readUntilNewlineAsString()
       */
     void readString(const std::string& s);
 
+    /** Read from the beginning of the next token until the following newline 
+      and return the result as a string, ignoring all parsing in between. The newline 
+      is not returned in the string, and the following token read will be a newline or
+      end of file token (if they are enabled for parsing).*/
+    std::string readUntilNewlineAsString();
+
     /** Reads a comment token or throws WrongTokenType, and returns the token.
 
         Use this method (rather than readComment) if you want the token's
@@ -733,13 +760,13 @@ class TextInput {
 
 
     /** Read a series of two specific symbols.  See readSymbol.  */
-    inline void readSymbols(const std::string& s1, const std::string& s2) {
+    void readSymbols(const std::string& s1, const std::string& s2) {
         readSymbol(s1);
         readSymbol(s2);
     }
 
     /** Read a series of three specific symbols.  See readSymbol.  */
-    inline void readSymbols(
+    void readSymbols(
         const std::string& s1, 
         const std::string& s2, 
         const std::string& s3) {
@@ -749,7 +776,7 @@ class TextInput {
     }
 
     /** Read a series of four specific symbols.  See readSymbol.  */
-    inline void readSymbols(
+    void readSymbols(
         const std::string& s1, 
         const std::string& s2, 
         const std::string& s3,     
diff --git a/dep/include/g3dlite/G3D/Vector3.h b/dep/include/g3dlite/G3D/Vector3.h
index 4825efb9985..b4e684b92e5 100644
--- a/dep/include/g3dlite/G3D/Vector3.h
+++ b/dep/include/g3dlite/G3D/Vector3.h
@@ -209,9 +209,9 @@ class Vector3 {
      */
     inline Vector3 directionOrZero() const {
         float mag = magnitude();
-        if (G3D::fuzzyEq(mag, 0.0f)) {
+        if (mag < 0.0000001f) {
             return Vector3::zero();
-        } else if (G3D::fuzzyEq(mag, 1.0f)) {
+        } else if (mag < 1.00001f && mag > 0.99999f) {
             return *this;
         } else {
             return *this * (1.0f / mag);
diff --git a/dep/include/g3dlite/G3D/Vector3int16.h b/dep/include/g3dlite/G3D/Vector3int16.h
index 3197ea49d1a..6043aea9f61 100644
--- a/dep/include/g3dlite/G3D/Vector3int16.h
+++ b/dep/include/g3dlite/G3D/Vector3int16.h
@@ -80,7 +80,7 @@ class Vector3int16 {
     inline Vector3int16& operator+=(const Vector3int16& other) {
         x += other.x;
         y += other.y;
-        z += other.y;
+        z += other.z;
         return *this;
     }
 
diff --git a/dep/include/g3dlite/G3D/Vector3int32.h b/dep/include/g3dlite/G3D/Vector3int32.h
index 2f256ea0300..c1a6b21e100 100644
--- a/dep/include/g3dlite/G3D/Vector3int32.h
+++ b/dep/include/g3dlite/G3D/Vector3int32.h
@@ -74,7 +74,7 @@ class Vector3int32 {
     inline Vector3int32& operator+=(const Vector3int32& other) {
         x += other.x;
         y += other.y;
-        z += other.y;
+        z += other.z;
         return *this;
     }
 
diff --git a/dep/include/g3dlite/G3D/WrapMode.h b/dep/include/g3dlite/G3D/WrapMode.h
index 8ef38a77c23..25a2fb47256 100644
--- a/dep/include/g3dlite/G3D/WrapMode.h
+++ b/dep/include/g3dlite/G3D/WrapMode.h
@@ -4,7 +4,7 @@
   @maintainer Morgan McGuire, http://graphics.cs.williams.edu
  
   @created 2007-04-17
-  @edited  2007-04-17
+  @edited  2010-04-17
 
   Copyright 2000-2010, Morgan McGuire.
   All rights reserved.
@@ -15,6 +15,7 @@
 
 #include "G3D/platform.h"
 #include "G3D/enumclass.h"
+#include "G3D/Any.h"
 
 #ifdef IGNORE
 #   undef IGNORE
@@ -65,25 +66,22 @@ class WrapMode {
 
 private:
     
+    static const char* toString(int i, Value& v) {
+        static const char* str[] = {"CLAMP", "TILE", "ZERO", "IGNORE", "ERROR", NULL}; 
+        static const Value val[] = {CLAMP, TILE, ZERO, IGNORE, ERROR};
+        const char* s = str[i];
+        if (s) {
+            v = val[i];
+        }
+        return s;
+    }
+
     Value value;
 
 public:
 
     G3D_DECLARE_ENUM_CLASS_METHODS(WrapMode);
 
-    inline const char* toString() const {
-        static const char* s[] = {"CLAMP", "TILE", "ZERO", "IGNORE", "ERROR"};
-        return s[value];
-    }
-
-    inline explicit WrapMode(const std::string& x) : value(ERROR) {
-        static const char* s[] = {"CLAMP", "TILE", "ZERO", "IGNORE", "ERROR"};
-        for (int i = 0; i < 5; ++i) {
-            if (x == s[i]) {
-                value = (Value)i;
-            }
-        }
-    }
 };
 
 } // namespace G3D
diff --git a/dep/include/g3dlite/G3D/XML.h b/dep/include/g3dlite/G3D/XML.h
new file mode 100644
index 00000000000..9ff98f9d171
--- /dev/null
+++ b/dep/include/g3dlite/G3D/XML.h
@@ -0,0 +1,204 @@
+/**
+ @file XML.h
+  
+ @author Morgan McGuire
+ @maintainer Morgan McGuire
+  
+ @created 2010-02-11
+ @edited  2010-02-24
+
+ Copyright 2000-2010, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_XML_h
+#define G3D_XML_h
+
+#include "G3D/platform.h"
+#include "G3D/Table.h"
+#include "G3D/Array.h"
+#include "G3D/format.h"
+#include <string>
+
+namespace G3D {
+
+class TextInput;
+class TextOutput;
+
+/** 
+\brief Easy loading and saving of XML and HTML files.
+
+The XML class is intended primarily for interchange with other
+programs. We recommend using G3D::Any to make your own human-readable
+formats because it is a more general syntax, the implementation is
+more efficient, and contains better error handling.
+
+Every XML is either a <i>VALUE</i>, or a <i>TAG</i> that contains both
+a table of its XML attributes and an array of its children. Children
+are nested tags and the strings between the nested tags.
+
+No validation is performed, and the XML must be completely legal.  XML
+Entity references (e.g., the ampersand codes for greater than and less
+than) are not automatically converted.
+
+Tags with names that begin with "!" or "?" are ignored. Comment tags must
+end with "-->" e.g.,
+
+<pre>
+  <?xml version="1.0" encoding="ISO-8859-1"?>
+  <!DOCTYPE note SYSTEM "Note.dtd">
+  <!-- a comment -->
+</pre>
+
+\sa G3D::Any, http://www.grinninglizard.com/tinyxml/
+
+<pre>
+<foo key0="value0" key1="value1">
+  child0 ...
+  <child1>...</child1>
+  child2 ...
+</foo>
+</pre>
+*/
+class XML {
+public:
+
+    enum Type {VALUE, TAG};
+
+    typedef Table<std::string, XML> AttributeTable;
+
+private:
+
+    Type                      m_type;
+    std::string               m_name;
+    std::string               m_value;
+    AttributeTable            m_attribute;
+    Array<XML>                m_child;
+
+public:
+
+    XML() : m_type(VALUE) {}
+
+    XML(const std::string& v) : m_type(VALUE), m_value(v) {}
+
+    XML(const double& v) : m_type(VALUE), m_value(format("%f", v)) {}
+
+    XML(float v) : m_type(VALUE), m_value(format("%f", v)) {}
+
+    XML(int v) : m_type(VALUE), m_value(format("%d", v)) {}
+
+    /** \param tagType Must be XML::TAG to dismbiguate from the string constructor */
+    XML(Type tagType, const std::string& name, const AttributeTable& at, const Array<XML>& ch = Array<XML>()) : m_type(TAG), m_name(name), m_attribute(at), m_child(ch) {
+        (void)tagType;
+        debugAssert(tagType == TAG);
+    }
+
+    /** \param tagType Must be XML::TAG to dismbiguate from the string constructor */
+    XML(Type tagType, const std::string& name, const Array<XML>& ch = Array<XML>()) : m_type(TAG), m_name(name), m_child(ch) {
+        (void)tagType;
+        debugAssert(tagType == TAG);
+    }
+
+    XML(TextInput& t);
+
+    void serialize(TextOutput& t) const;
+
+    void deserialize(TextInput& t);
+
+    void load(const std::string& filename);
+
+    void save(const std::string& filename) const;
+
+    void parse(const std::string &s);
+
+    void unparse(std::string& s) const;
+
+    const AttributeTable& attributeTable() const {
+        return m_attribute;
+    }
+
+    const Array<XML> childArray() const {
+        return m_child;
+    }
+    
+    /** Array size; zero for a VALUE */
+    int numChildren() const {
+        return m_child.size();
+    }
+
+    /** Attribute table size; zero for a TAG */
+    int numAttributes() const {
+        return m_attribute.size();
+    }
+
+    /** Return child \a i.  Children are nested tags and the unquoted
+     strings of characters between tags.*/
+    const XML& operator[](int i) const {
+        return m_child[i];
+    }
+
+    /** Return the attribute with this name. */
+    const XML& operator[](const std::string& k) const {
+        return m_attribute[k];
+    }
+
+    const bool containsAttribute(const std::string& k) const {
+        return m_attribute.containsKey(k);
+    }
+
+    /** Note that the result is always copied, making this inefficient
+        for return values that are not VALUEs. */
+    XML get(const std::string& k, const XML& defaultVal) const {
+        const XML* x = m_attribute.getPointer(k);
+        if (x) {
+            return *x;
+        } else {
+            return defaultVal;
+        }
+    }
+
+    Type type() const {
+        return m_type;
+    }
+
+    /** The name, if this is a TAG. */
+    const std::string name() const {
+        return m_name;
+    }
+
+    /** Returns "" if a TAG. */
+    const std::string& string() const {
+        return m_value;
+    }
+
+    /** Parse as a number.  Returns nan() if a TAG or unparseable as a number. */
+    double number() const;
+
+    /** Returns false if a TAG. */
+    bool boolean() const;
+
+    operator std::string() const {
+        return m_value;
+    }
+
+    operator bool() const {
+        return boolean();
+    }
+
+    operator double() const {
+        return number();
+    }
+
+    operator float() const {
+        return float(number());
+    }
+
+    operator int() const {
+        return iRound(number());
+    }
+
+};    // class XML
+
+}    // namespace G3D
+
+#endif
diff --git a/dep/include/g3dlite/G3D/constants.h b/dep/include/g3dlite/G3D/constants.h
index dd5cb3649e5..4121f744e17 100644
--- a/dep/include/g3dlite/G3D/constants.h
+++ b/dep/include/g3dlite/G3D/constants.h
@@ -3,13 +3,14 @@
 
   @maintainer Morgan McGuire, http://graphics.cs.williams.edu
   @created 2009-05-20
-  @edited  2009-05-20
+  @edited  2010-05-20
 */
 #ifndef G3D_constants_h
 #define G3D_constants_h
 
 #include "G3D/platform.h"
 #include "G3D/enumclass.h"
+#include "G3D/Any.h"
 
 namespace G3D {
 
@@ -29,6 +30,16 @@ class PrimitiveType {
     };
 
 private:
+    
+    static const char* toString(int i, Value& v) {
+        static const char* str[] = {"POINTS", "LINES", "LINE_STRIP", "TRIANGLES", "TRIANGLE_FAN", "QUADS", "QUAD_STRIP", NULL}; 
+        static const Value val[] = {POINTS, LINES, LINE_STRIP, TRIANGLES, TRIANGLE_FAN, QUADS, QUAD_STRIP};
+        const char* s = str[i];
+        if (s) {
+            v = val[i];
+        }
+        return s;
+    }
 
     Value value;
 
@@ -66,18 +77,21 @@ class RefractionQuality {
 
 private:
 
-    /** Used for to/from string conversion.  Last is the emtpy string as a sentinel */
-    static const std::string    str[7];
-    static const Value          enm[6];
+    static const char* toString(int i, Value& v) {
+        static const char* str[] = {"NONE", "STATIC_ENV", "DYNAMIC_FLAT", "DYNAMIC_FLAT_MULTILAYER", "DYNAMIC_ENV", "BEST", NULL}; 
+        static const Value val[] = {NONE, STATIC_ENV, DYNAMIC_FLAT, DYNAMIC_FLAT_MULTILAYER, DYNAMIC_ENV, BEST};
+        const char* s = str[i];
+        if (s) {
+            v = val[i];
+        }
+        return s;
+    }
+
     Value value;
 
 public:
     G3D_DECLARE_ENUM_CLASS_METHODS(RefractionQuality);
 
-    RefractionQuality(const class Any&);
-    RefractionQuality& operator=(const Any&);
-    operator Any() const;
-    const std::string& toString() const;
 };
 
 
@@ -105,18 +119,20 @@ class MirrorQuality {
 
 private:
 
-    /** Used for to/from string conversion.  Last is the emtpy string as a sentinel */
-    static const std::string    str[6];
-    static const Value          enm[5];
+    static const char* toString(int i, Value& v) {
+        static const char* str[] = {"NONE", "STATIC_ENV", "DYNAMIC_PLANAR", "DYNAMIC_ENV", "BEST", NULL}; 
+        static const Value val[] = {NONE, STATIC_ENV, DYNAMIC_PLANAR, DYNAMIC_ENV, BEST};
+        const char* s = str[i];
+        if (s) {
+            v = val[i];
+        }
+        return s;
+    }
 
     Value value;
 
 public:
     G3D_DECLARE_ENUM_CLASS_METHODS(MirrorQuality);
-    MirrorQuality(const class Any&);
-    MirrorQuality& operator=(const Any&);
-    operator Any() const;
-    const std::string& toString() const;
 };
 
 } // namespace G3D
diff --git a/dep/include/g3dlite/G3D/debugAssert.h b/dep/include/g3dlite/G3D/debugAssert.h
index 432e97e679d..f521101ff74 100644
--- a/dep/include/g3dlite/G3D/debugAssert.h
+++ b/dep/include/g3dlite/G3D/debugAssert.h
@@ -37,13 +37,13 @@
 #endif
 
 #ifdef G3D_LINUX
+#if SOMEONE_MADE_THIS_USEFUL /* G3DFIX: Disabled to avoid requirement for X11 libraries */
     // Needed so we can define a global display
     // pointer for debugAssert.
-#if SOMEONE_MADE_THIS_USEFUL
     #include <X11/Xlib.h>
     #include <X11/Xutil.h>
     #include <X11/Xatom.h>
-#endif
+#endif /* G3DFIX: Disabled to avoid requirement for X11 libraries */
 #endif
 
 
@@ -180,7 +180,7 @@ namespace _internal {
 namespace G3D {  namespace _internal {
 
 #ifdef G3D_LINUX
-#if SOMEONE_MADE_THIS_USEFUL
+#if SOMEONE_MADE_THIS_USEFUL /* G3DFIX: Disabled to avoid requirement for X11 libraries */
     /**
      A pointer to the X11 display.  Initially NULL.  If set to a
      non-null value (e.g. by SDLWindow), debugAssert attempts to use
@@ -196,7 +196,7 @@ namespace G3D {  namespace _internal {
      fails.
      */
     extern Window        x11Window;
-#endif
+#endif /* G3DFIX: Disabled to avoid requirement for X11 libraries */
 #endif
 
 /**
diff --git a/dep/include/g3dlite/G3D/enumclass.h b/dep/include/g3dlite/G3D/enumclass.h
index c7dfe45f14f..2874a630ad9 100644
--- a/dep/include/g3dlite/G3D/enumclass.h
+++ b/dep/include/g3dlite/G3D/enumclass.h
@@ -22,112 +22,170 @@
 
   Enum classes are initialized to their zero value by default.
 
+  You must implement the following method before calling G3D_DECLARE_ENUM_CLASS_METHODS, as either:
+
+  <pre>
+    static const char* toString(int i, Value& v) {
+        static const char* str[] = {"FUEL", "FOOD", "WATER", NULL}; // Whatever your enum values are
+        static const Value val[] = {FUEL, FOOD, WATER};             // Whatever your enum values are
+        const char* s = str[i];
+        if (s) {
+            v = val[i];
+        }
+        return s;
+    }
+  </pre>
+
   See GLG3D/GKey.h for an example.
   \sa G3D_DECLARE_ENUM_CLASS_HASHCODE
  */
 #define G3D_DECLARE_ENUM_CLASS_METHODS(Classname)\
-    inline Classname(char v) : value((Value)v) {}\
+private: \
+    void fromString(const std::string& x) {\
+        Value v;\
+        const char* s;\
+        int i = 0;\
+\
+        do {\
+            s = toString(i, v);\
+            if (x == s) {\
+                value = v;\
+                return;\
+            }\
+            ++i;\
+        } while (s);\
+    }\
+\
+public:\
+\
+    const char* toString() const {\
+        const char* s;\
+        int i = 0;\
+        Value v = (Value)0;\
+        while (true) {\
+            s = toString(i, v);\
+            if ((s == NULL) || (v == value)) {\
+                return s;\
+            }\
+            ++i;\
+        }\
+        return NULL;\
+    }\
+\
+    explicit Classname(const std::string& x) : value((Value)0) {\
+        fromString(x);\
+    }\
+\
+    Classname(const Any& a) : value((Value)0) {\
+        fromString(a.string());\
+    }\
+\
+    operator Any() const {\
+        return Any(toString());\
+    }\
+\
+    Classname(char v) : value((Value)v) {}\
 \
-    inline Classname() : value((Value)0) {}\
+    Classname() : value((Value)0) {}\
 \
-    inline Classname(const Value v) : value(v) {}\
+    Classname(const Value v) : value(v) {}\
 \
-    explicit inline Classname(int v) : value((Value)v) {}\
+    explicit Classname(int v) : value((Value)v) {}\
 \
     /** Support cast back to the Value type, which is needed to allow implicit assignment inside unions. */\
     /*inline operator Value() const {
         return value;
 	}*/\
 \
-    inline operator int() const {\
+    operator int() const {\
         return (int)value;\
     }\
 \
-    inline bool operator== (const Classname other) const {\
+    bool operator== (const Classname other) const {\
         return value == other.value;\
     }\
 \
-    inline bool operator== (const Classname::Value other) const {\
+    bool operator== (const Classname::Value other) const {\
         return value == other;\
     }\
 \
-    inline bool operator!= (const Classname other) const {\
+    bool operator!= (const Classname other) const {\
         return value != other.value;\
     }\
 \
-    inline bool operator!= (const Classname::Value other) const {\
+    bool operator!= (const Classname::Value other) const {\
         return value != other;\
     }\
 \
-    inline bool operator< (const Classname other) const {\
+    bool operator< (const Classname other) const {\
         return value < other.value;\
     }\
 \
-    inline bool operator> (const Classname other) const {\
+    bool operator> (const Classname other) const {\
         return value > other.value;\
     }\
 \
-    inline bool operator>= (const Classname other) const {\
+    bool operator>= (const Classname other) const {\
         return value >= other.value;\
     }\
 \
-    inline bool operator<= (const Classname other) const {\
+    bool operator<= (const Classname other) const {\
         return value <= other.value;\
     }\
 \
-    inline bool operator< (const Value other) const {\
+    bool operator< (const Value other) const {\
         return value < other;\
     }\
 \
-    inline bool operator> (const Value other) const {\
+    bool operator> (const Value other) const {\
         return value > other;\
     }\
 \
-    inline bool operator<= (const Value other) const {\
+    bool operator<= (const Value other) const {\
         return value <= other;\
     }\
 \
-    inline bool operator>= (const Value other) const {\
+    bool operator>= (const Value other) const {\
         return value >= other;\
     }\
 \
-    inline Classname& operator-- () {\
+    Classname& operator-- () {\
         value = (Value)((int)value - 1);\
         return *this;\
     }\
 \
-    inline Classname& operator++ () {\
+    Classname& operator++ () {\
         value = (Value)((int)value + 1);\
         return *this;\
     }\
 \
-    inline Classname& operator+= (const int x) {\
+    Classname& operator+= (const int x) {\
         value = (Value)((int)value + x);\
         return *this;\
     }\
 \
-    inline Classname& operator-= (const int x) {\
+    Classname& operator-= (const int x) {\
         value = (Value)((int)value - x);\
         return *this;\
     }\
 \
-    inline Classname operator+ (const int x) const {\
+    Classname operator+ (const int x) const {\
         return Classname((int)value + x);\
     }\
 \
-    inline Classname operator- (const int x) const {\
+    Classname operator- (const int x) const {\
         return Classname((int)value - x);\
     }\
 \
-    inline unsigned int hashCode() const {\
+    unsigned int hashCode() const {\
         return (unsigned int)value;\
     }\
 \
-    inline void serialize(BinaryOutput& b) const {\
+    void serialize(BinaryOutput& b) const {\
         b.writeInt32(value);\
     }\
 \
-    inline void deserialize(BinaryInput& b) {\
+    void deserialize(BinaryInput& b) {\
         value = (Value)b.readInt32();\
     }
 
diff --git a/dep/include/g3dlite/G3D/fileutils.h b/dep/include/g3dlite/G3D/fileutils.h
index 9e49777d93a..89b41690206 100644
--- a/dep/include/g3dlite/G3D/fileutils.h
+++ b/dep/include/g3dlite/G3D/fileutils.h
@@ -4,14 +4,14 @@
  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
  
  @author  2002-06-06
- @edited  2010-02-06
+ @edited  2010-03-06
 
  Copyright 2000-2010, Morgan McGuire.
  All rights reserved.
  */
 
-#ifndef G3D_fileUtils_h
-#define G3D_fileUtils_h
+#ifndef G3D_fileutils_h
+#define G3D_fileutils_h
 
 #include "G3D/platform.h"
 #include <string>
@@ -68,97 +68,11 @@ void writeWholeFile(
     const std::string& str, 
     bool    flush = true);
 
-/**
- Creates the directory (which may optionally end in a /)
- and any parents needed to reach it.
- */
-void createDirectory(
-    const std::string&          dir);
-
-/**
- Fully qualifies a filename.  The filename may contain wildcards,
- in which case the wildcards will be preserved in the returned value.
- */
-std::string resolveFilename(const std::string& filename);
-
-/**
- Appends all files matching filespec to the files array.  The names
- will not contain paths unless includePath == true.  These may be
- relative to the current directory unless the filespec is fully qualified
- (can be done with resolveFilename).
- Wildcards can only appear to the right of the last slash in filespec.
- Works with .zip files used as paths, if filespec is passed in the form
- C:\\...\\something.zip\\*  Does not work recursively with zipfiles (a
- .zip within a .zip will not work)
- */
-void getFiles(
-	const std::string&			filespec,
-	Array<std::string>&			files,
-	bool						includePath    = false);
-
-/**
- Appends all directories matching filespec to the files array. The names
- will not contain paths unless includePath == true.  These may be
- relative to the current directory unless the filespec is fully qualified
- (can be done with resolveFilename).
- Does not append special directories "." or "..".
- Works with .zip files used as paths, if filespec is passed in the form
- C:\\...\\something.zip\\*  Does not work recursively with zipfiles (a
- .zip within a .zip will not work)
- */
-void getDirs(
-	const std::string&			filespec,
-	Array<std::string>&			files,
-	bool						includePath = false);
-
-
-/** Returns true if the specified path exists and is a directory */
-bool isDirectory(const std::string& filespec);
-
-
-/** Returns true if the specified filename exists and is a zipfile */
-bool isZipfile(const std::string& filename);
-
-
-/** Returns the length of the file.  If 
-	filename specifies a path that contains a zipfile, but the 
-	contents within are specified correctly, returns the 
-	uncompressed size of the requested file.  Returns -1 if
-	the file does not exist. 
-	
-	@param filename the path to test, may contain .zip
-*/
-int64 fileLength(const std::string& filename);
-
-/**
- Copies the file
- */
-void copyFile(
-    const std::string&          source,
-    const std::string&          dest);
 
 /** Returns a temporary file that is open for read/write access.  This
     tries harder than the ANSI tmpfile, so it may succeed when that fails. */
 FILE* createTempFile();
 
-/**
- Returns true if the given file (or directory) exists.
-
- \param filename the path to test. must not end in a trailing slash.
- \param lookInZipfiles if the path does not exist, calls zipfileExists()
- \param trustCache If true and \a lookInZipfiles is true, cache directory and zipfile contents
-  so that subsequent calls to the same directory are fast.
-
- \sa G3D::clearFileSystemCache, G3D::zipfileExists
- */
-bool fileExists
-(const std::string&          filename,
- bool	                     lookInZipfiles = true,
- bool                        trustCache = true);
-
-
-/** Clears the cache used by fileExists */
-void clearFileSystemCache();
 
 /**
  Returns true if the given file (or directory) exists
@@ -242,10 +156,7 @@ std::string filenamePath(const std::string& filename);
 /** Returns true if '*' or '?' appears in the string */
 bool filenameContainsWildcards(const std::string& filename);
 
-/** Returns true if dst does not exist or src is newer than dst.  Works on both files and directories. */
-bool fileIsNewer(const std::string& src, const std::string& dst);
-
-/** Appends file onto dirname, ensuring a / if needed. */
+/** Appends file onto dirname, ensuring a / if needed. \deprecated Use FilePath::concat */
 std::string pathConcat(const std::string& dirname, const std::string& file);
 
 } // namespace
diff --git a/dep/include/g3dlite/G3D/g3dmath.h b/dep/include/g3dlite/G3D/g3dmath.h
old mode 100644
new mode 100755
index d16214ebb37..c68a125e397
--- a/dep/include/g3dlite/G3D/g3dmath.h
+++ b/dep/include/g3dlite/G3D/g3dmath.h
@@ -65,8 +65,6 @@ inline double __fastcall drand48() {
     return ::rand() / double(RAND_MAX);
 }
 
-#if !defined(_WIN64)
-
 /**
    Win32 implementation of the C99 fast rounding routines.
    
@@ -80,6 +78,8 @@ inline double __fastcall drand48() {
    provided "as is" without express or implied warranty.
 */
 
+
+#if !defined(_WIN64)
 __inline long int lrint (double flt) {
     int intgr;
 
@@ -101,7 +101,6 @@ __inline long int lrintf(float flt) {
 
     return intgr;
 }
-
 #else
 
     __inline long int lrint (double flt) {
@@ -135,6 +134,10 @@ inline double pi() {
     return 3.1415926535898;
 }
 
+inline float pif() {
+    return 3.1415926535898f;
+}
+
 inline double halfPi() {
     return 1.57079633;
 }
@@ -608,6 +611,18 @@ inline double aCos (double fValue) {
     }
 }
 
+inline float acos (float fValue) {
+    if ( -1.0f < fValue ) {
+        if ( fValue < 1.0f ) {
+            return ::acos(fValue);
+        } else {
+            return 0.0f;
+        }
+    } else {
+        return pif();
+    }
+}
+
 //----------------------------------------------------------------------------
 inline double aSin (double fValue) {
     if ( -1.0 < fValue ) {
diff --git a/dep/include/g3dlite/G3D/netheaders.h b/dep/include/g3dlite/G3D/netheaders.h
new file mode 100644
index 00000000000..a82d7c36f36
--- /dev/null
+++ b/dep/include/g3dlite/G3D/netheaders.h
@@ -0,0 +1,24 @@
+#ifndef G3D_netheaders_h
+#define G3D_netheaders_h
+
+#include "G3D/platform.h"
+
+#ifdef G3D_WIN32
+#   if (G3D_WINSOCK_MAJOR_VERSION == 2)
+#       include <winsock2.h>
+#   elif (G3D_WINSOCK_MAJOR_VERSION == 1)
+#       include <winsock.h>
+#   endif
+#else
+#   include <sys/types.h>
+#   include <sys/socket.h>
+#   include <netinet/in.h>
+#   ifndef SOCKADDR_IN
+#       define SOCKADDR_IN struct sockaddr_in
+#   endif
+#   ifndef SOCKET
+#       define SOCKET int
+#   endif
+#endif
+
+#endif
diff --git a/dep/include/g3dlite/G3D/networkHelpers.h b/dep/include/g3dlite/G3D/networkHelpers.h
new file mode 100644
index 00000000000..7a532d71ee6
--- /dev/null
+++ b/dep/include/g3dlite/G3D/networkHelpers.h
@@ -0,0 +1,91 @@
+// Included by NetworkDevice.cpp and TCPConduit.cpp to provide a platform-independent networking base
+
+#include <cstring>
+#include <stdlib.h>
+#include <time.h>
+
+#if defined(G3D_LINUX) || defined(G3D_OSX) || defined(G3D_FREEBSD)
+#   include <sys/types.h>
+#   include <sys/socket.h>
+#   include <ifaddrs.h>
+#   include <netinet/in.h>
+#   include <net/if.h>
+#   ifdef __linux__
+#       include <sys/ioctl.h>
+#       include <netinet/in.h>
+#       include <unistd.h>
+#       include <string.h>
+//    Match Linux to FreeBSD
+#       define AF_LINK AF_PACKET
+#   else
+#       include <net/if_dl.h>
+#       include <sys/sockio.h>
+#   endif
+
+    #include <unistd.h>
+    #include <errno.h>
+    #include <sys/socket.h>
+    #include <netinet/in.h>
+    #include <arpa/inet.h>
+    #include <netdb.h>
+    #include <netinet/tcp.h>
+    #include <sys/ioctl.h>
+    #include <netinet/if_ether.h>
+    #include <net/ethernet.h>
+    #include <net/if.h>
+
+    #include <sys/types.h>
+
+    #define _alloca alloca
+
+    /** Define an error code for non-windows platforms. */
+    int WSAGetLastError() {
+        return -1;
+    }
+
+    #define SOCKET_ERROR -1
+
+    static std::string socketErrorCode(int code) {
+        return G3D::format("CODE %d: %s\n", code, strerror(code));
+    }
+
+    static std::string socketErrorCode() {
+        return socketErrorCode(errno);
+    }
+
+    static const int WSAEWOULDBLOCK = -100;
+
+    typedef int SOCKET;
+    typedef struct sockaddr_in SOCKADDR_IN;
+
+#else 
+
+    // Windows
+    static std::string socketErrorCode(int code) {
+        LPTSTR formatMsg = NULL;
+
+        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                      FORMAT_MESSAGE_IGNORE_INSERTS |
+                      FORMAT_MESSAGE_FROM_SYSTEM,
+                        NULL,
+                        code,
+                        0,
+                        (LPTSTR)&formatMsg,
+                        0,
+                        NULL);
+
+        return G3D::format("CODE %d: %s\n", code, formatMsg);
+    }
+
+    static std::string socketErrorCode() {
+        return socketErrorCode(GetLastError());
+    }
+
+#endif
+
+
+#ifndef _SOCKLEN_T
+#   if defined(G3D_WIN32) || defined(G3D_OSX)
+        typedef int socklen_t;
+#   endif
+#endif
diff --git a/dep/include/g3dlite/G3D/platform.h b/dep/include/g3dlite/G3D/platform.h
index 11ba0127a16..0a86ec1dcc9 100644
--- a/dep/include/g3dlite/G3D/platform.h
+++ b/dep/include/g3dlite/G3D/platform.h
@@ -6,17 +6,17 @@
  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
 
  @created 2003-06-09
- @edited  2010-01-11
+ @edited  2010-08-11
  */
 
 #ifndef G3D_platform_h
 #define G3D_platform_h
 
 /**
- The version number of G3D in the form: MmmBB ->
+ The version number of G3D in the form: MmmBB -> 
  version M.mm [beta BB]
  */
-#define G3D_VER 80004
+#define G3D_VER 80100
 
 // fatal error for unsupported architectures
 #if defined(__powerpc__)
@@ -37,13 +37,19 @@
 #   define G3D_DEBUG
 #endif
 
-#ifndef _MSC_VER
+/** These control the version of Winsock used by G3D.
+    Version 2.0 is standard for G3D 6.09 and later.
+    Version 1.1 is standard for G3D 6.08 and earlier.
+ */
+#define G3D_WINSOCK_MAJOR_VERSION 2
+#define G3D_WINSOCK_MINOR_VERSION 0
+
+#if !defined (_MSC_VER) && !defined(__MINGW32__)
 /// Fast call is a register-based optimized calling convention supported only by Visual C++
 #define __fastcall
-
 #endif
 
-#ifdef _MSC_VER
+#if defined (_MSC_VER) || defined(__MINGW32__)
     #define G3D_WIN32
 #elif  defined(__FreeBSD__) || defined(__OpenBSD__)
     #define G3D_FREEBSD
@@ -57,15 +63,12 @@
    // pi as a constant, which creates a conflict with G3D
 #define __FP__
 #else
-    #error Unknown platform
+    #error Unknown platform 
 #endif
 
 // Detect 64-bit under various compilers
 #if (defined(_M_X64) || defined(_WIN64) || defined(__LP64__) || defined(_LP64))
 #    define G3D_64BIT
-	#if defined(WIN32)
-        #include <intrin.h>
-    #endif
 #else
 #    define G3D_32BIT
 #endif
@@ -89,7 +92,7 @@
 #    ifndef __GNUC__
 #        error G3D only supports the gcc compiler on OS X.
 #    endif
-
+	
 #    if defined(__i386__)
 #        define G3D_OSX_INTEL
 #    elif defined(__PPC__)
@@ -130,11 +133,13 @@
 // TODO: remove
 #   pragma warning (disable : 4244)
 
+// #   define ZLIB_WINAPI /* G3DFIX: caused some unresolved external errors with MSVC */
+
 #   define restrict
 
 /** @def G3D_CHECK_PRINTF_METHOD_ARGS()
     Enables printf parameter validation on gcc. */
-#   define G3D_CHECK_PRINTF_ARGS
+#   define G3D_CHECK_PRINTF_ARGS 
 
 /** @def G3D_CHECK_PRINTF_METHOD_ARGS()
     Enables printf parameter validation on gcc. */
@@ -142,7 +147,7 @@
 
 /** @def G3D_CHECK_PRINTF_METHOD_ARGS()
     Enables printf parameter validation on gcc. */
-#   define G3D_CHECK_PRINTF_METHOD_ARGS
+#   define G3D_CHECK_PRINTF_METHOD_ARGS 
 
 /** @def G3D_CHECK_PRINTF_METHOD_ARGS()
     Enables printf parameter validation on gcc. */
@@ -151,7 +156,7 @@
     // On MSVC, we need to link against the multithreaded DLL version of
     // the C++ runtime because that is what SDL and ZLIB are compiled
     // against.  This is not the default for MSVC, so we set the following
-    // defines to force correct linking.
+    // defines to force correct linking.  
     //
     // For documentation on compiler options, see:
     //  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/_core_.2f.md.2c_2f.ml.2c_2f.mt.2c_2f.ld.asp
@@ -225,12 +230,16 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
     return G3D_WinMain(hInst, hPrev, szCmdLine, sw);\
 }
 
-#else
+//#else
 
 /** @def G3D_START_AT_MAIN()
     Defines necessary wrapper around WinMain on Windows to allow transfer of execution to main(). */
-#   define G3D_START_AT_MAIN()
+// #   define G3D_START_AT_MAIN()
 
+#elif defined(__MINGW32__)
+#   include <windows.h>
+#   undef WIN32_LEAN_AND_MEAN
+#   undef NOMINMAX
 #endif  // win32
 
 #ifdef __GNUC__
@@ -285,18 +294,18 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
 #endif
 
 
-/**
+/** 
   @def STR(expression)
 
   Creates a string from the expression.  Frequently used with G3D::Shader
-  to express shading programs inline.
+  to express shading programs inline.  
 
   <CODE>STR(this becomes a string)\verbatim<PRE>\endverbatim evaluates the same as \verbatim<CODE>\endverbatim"this becomes a string"</CODE>
  */
 #define STR(x) #x
 
 /** @def PRAGMA(expression)
-    \#pragma may not appear inside a macro, so this uses the pragma operator
+    \#pragma may not appear inside a macro, so this uses the pragma operator 
     to create an equivalent statement.*/
 #ifdef _MSC_VER
 // Microsoft's version http://msdn.microsoft.com/en-us/library/d9x1s805.aspx
@@ -322,7 +331,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
 #    define G3D_END_PACKED_CLASS(byteAlign)  ; PRAGMA( pack(pop) )
 #elif defined(__GNUC__)
 #    define G3D_END_PACKED_CLASS(byteAlign)  __attribute((aligned(byteAlign))) ;
-#else
+#else 
 #    define G3D_END_PACKED_CLASS(byteAlign)  ;
 #endif
 
diff --git a/dep/include/g3dlite/G3D/stringutils.h b/dep/include/g3dlite/G3D/stringutils.h
index e15a757a7a6..42a4886521a 100644
--- a/dep/include/g3dlite/G3D/stringutils.h
+++ b/dep/include/g3dlite/G3D/stringutils.h
@@ -4,11 +4,11 @@
  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
  
  @author  2000-09-09
- @edited  2008-08-05
+ @edited  2010-03-05
  */
 
-#ifndef G3D_STRINGUTILS_H
-#define G3D_STRINGUTILS_H
+#ifndef G3D_stringutils_h
+#define G3D_stringutils_h
 
 #include "G3D/platform.h"
 #include "G3D/Array.h"
@@ -28,6 +28,33 @@ extern const char* NEWLINE;
 */
 void parseCommaSeparated(const std::string s, Array<std::string>& array, bool stripQuotes = true);
 
+/** Finds the index of the first '\\' or '/' character, starting at index \a start. 
+  \sa G3D::findLastSlash, G3D::isSlash
+*/
+inline int findSlash(const std::string& f, int start = 0) {
+    int i = f.find('/', start);
+    int j = f.find('\\', start);
+    if (((i != -1) && (i < j)) || (j == -1)) {
+        return i;
+    } else {
+        return j;
+    }
+}
+
+
+/** Finds the index of the first '\\' or '/' character, starting at index \a start (if \a start is -1, starts at the end of the string).
+  \sa G3D::findSlash, G3D::isSlash
+  */
+inline int findLastSlash(const std::string& f, int start = -1) {
+    if (start == -1) {
+        start = f.length() - 1;
+    }
+
+    int i = f.rfind('/', start);
+    int j = f.rfind('\\', start);
+    return max(i, j);
+}
+
 /**
  Returns true if the test string begins with the pattern string.
  */
diff --git a/dep/include/gsoap/stdsoap2.h b/dep/include/gsoap/stdsoap2.h
index 8b1f92298e5..3b5ba843077 100644
--- a/dep/include/gsoap/stdsoap2.h
+++ b/dep/include/gsoap/stdsoap2.h
@@ -205,8 +205,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
 # endif
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
+#ifdef MANGOS_CONFIG_H
 # if defined(WITH_OPENSSL)
 #  ifndef HAVE_OPENSSL_SSL_H
 #   undef WITH_OPENSSL
diff --git a/dep/include/utf8cpp/doc/ReleaseNotes b/dep/include/utf8cpp/doc/ReleaseNotes
index 857a72b7569..50f697b0635 100644
--- a/dep/include/utf8cpp/doc/ReleaseNotes
+++ b/dep/include/utf8cpp/doc/ReleaseNotes
@@ -1,9 +1,12 @@
 utf8 cpp library
-Release 2.2.4
+Release 2.3.4
 
-This is a minor bug fix release that improves converting from utf-16 to utf-8 error detection.
+A minor bug fix release. Thanks to all who reported bugs.
 
-Changes from version 2.2.3
-- Bug fix [2857454]	dereference invalid iterator when lead surrogate was last element of the string.
+Note: Version 2.3.3 contained a regression, and therefore was removed.
+
+Changes from version 2.3.2
+- Bug fix [39]: checked.h Line 273 and unchecked.h Line 182 have an extra ';'
+- Bug fix [36]: replace_invalid() only works with back_inserter
 
 Files included in the release: utf8.h, core.h, checked.h, unchecked.h, utf8cpp.html, ReleaseNotes
diff --git a/dep/include/utf8cpp/doc/utf8cpp.html b/dep/include/utf8cpp/doc/utf8cpp.html
index 069c2be5210..f9bad9d0e6c 100644
--- a/dep/include/utf8cpp/doc/utf8cpp.html
+++ b/dep/include/utf8cpp/doc/utf8cpp.html
@@ -28,7 +28,7 @@
       color: green;
     }
     code {
-      font-weight: bold; 
+      font-weight: bold;
     }
     ul.toc {
       list-style-type: none;
@@ -67,7 +67,7 @@ <h2>
             <li>
               <a href=#fixinvalid>Ensure that a string contains valid UTF-8 text</a>
             </li>
-        </li>
+          </ul>
         <li>
           <a href="#reference">Reference</a>
           <ul class="toc">
@@ -88,9 +88,6 @@ <h2>
         <li>
           <a href="#points">Points of Interest</a>
         </li>
-        <li>
-          <a href="#conclusion">Conclusion</a>
-        </li>
         <li>
           <a href="#links">Links</a>
         </li>
@@ -101,10 +98,12 @@ <h2 id="introduction">
     </h2>
     <p>
       Many C++ developers miss an easy and portable way of handling Unicode encoded
-      strings. The original C++ Standard (known as C++98 or C++03) is Unicode agnostic,
-      and while some work is being done to introduce Unicode to the next incarnation
-      called C++0x, for the moment nothing of the sort is available. In the meantime,
-      developers use third party libraries like ICU, OS specific capabilities, or simply
+      strings. The original C++ Standard (known as C++98 or C++03) is Unicode agnostic.
+      C++11 provides some support for Unicode on core language and library level:
+      u8, u, and U character and string literals, char16_t and char32_t character types,
+      u16string and u32string library classes, and codecvt support for conversions
+      between Unicode encoding forms.
+      In the meantime, developers use third party libraries like ICU, OS specific capabilities, or simply
       roll out their own solutions.
     </p>
     <p>
@@ -129,7 +128,7 @@ <h3 id="introsample">
       Introductionary Sample
     </h3>
     <p>
-      To illustrate the use of the library, let's start with a small but complete program 
+      To illustrate the use of the library, let's start with a small but complete program
       that opens a file containing UTF-8 encoded text, reads it line by line, checks each line
       for invalid UTF-8 byte sequences, and converts it to UTF-16 encoding and back to UTF-8:
     </p>
@@ -182,14 +181,14 @@ <h3 id="introsample">
         utf8::utf8to16(line.begin(), end_it, back_inserter(utf16line));
 
         <span class="comment">// And back to utf-8</span>
-        string utf8line; 
+        string utf8line;
         utf8::utf16to8(utf16line.begin(), utf16line.end(), back_inserter(utf8line));
 
         <span class="comment">// Confirm that the conversion went OK:</span>
         <span class="keyword">if</span> (utf8line != string(line.begin(), end_it))
             cout &lt;&lt; <span class=
 "literal">"Error in UTF-16 conversion at line: "</span> &lt;&lt; line_count &lt;&lt; <span
- class="literal">"\n"</span>;        
+ class="literal">"\n"</span>;
 
         line_count++;
     }
@@ -210,7 +209,7 @@ <h3 id="validfile">Checking if a file contains valid UTF-8 text</h3>
 Here is a function that checks whether the content of a file is valid UTF-8 encoded text without
 reading the content into the memory:
 </p>
-<pre>    
+<pre>
 <span class="keyword">bool</span> valid_utf8_file(i<span class="keyword">const char</span>* file_name)
 {
     ifstream ifs(file_name);
@@ -225,11 +224,11 @@ <h3 id="validfile">Checking if a file contains valid UTF-8 text</h3>
 </pre>
 <p>
 Because the function <code>utf8::is_valid()</code> works with input iterators, we were able
-to pass an <code>istreambuf_iterator</code> to it and read the content of the file directly 
+to pass an <code>istreambuf_iterator</code> to it and read the content of the file directly
 without loading it to the memory first.</p>
 <p>
 Note that other functions that take input iterator arguments can be used in a similar way. For
-instance, to read the content of a UTF-8 encoded text file and convert the text to UTF-16, just 
+instance, to read the content of a UTF-8 encoded text file and convert the text to UTF-16, just
 do something like:
 </p>
 <pre>
@@ -238,7 +237,7 @@ <h3 id="validfile">Checking if a file contains valid UTF-8 text</h3>
     <h3 id="fixinvalid">Ensure that a string contains valid UTF-8 text</h3>
 <p>
 If we have some text that "probably" contains UTF-8 encoded text and we want to
-replace any invalid UTF-8 sequence with a replacement character, something like 
+replace any invalid UTF-8 sequence with a replacement character, something like
 the following function may be used:
 </p>
 <pre>
@@ -249,7 +248,7 @@ <h3 id="fixinvalid">Ensure that a string contains valid UTF-8 text</h3>
     str = temp;
 }
 </pre>
-<p>The function will replace any invalid UTF-8 sequence with a Unicode replacement character. 
+<p>The function will replace any invalid UTF-8 sequence with a Unicode replacement character.
 There is an overloaded function that enables the caller to supply their own replacement character.
 </p>
     <h2 id="reference">
@@ -272,14 +271,15 @@ <h4>
 <span class="keyword">template</span> &lt;<span class=
 "keyword">typename</span> octet_iterator&gt;
 octet_iterator append(uint32_t cp, octet_iterator result);
-   
+
 </pre>
     <p>
-      <code>cp</code>: A 32 bit integer representing a code point to append to the
+      <code>octet_iterator</code>: an output iterator.<br>
+      <code>cp</code>: a 32 bit integer representing a code point to append to the
       sequence.<br>
-       <code>result</code>: An output iterator to the place in the sequence where to
+       <code>result</code>: an output iterator to the place in the sequence where to
       append the code point.<br>
-       <span class="return_value">Return value</span>: An iterator pointing to the place
+       <span class="return_value">Return value</span>: an iterator pointing to the place
       after the newly appended sequence.
     </p>
     <p>
@@ -321,11 +321,12 @@ <h4>
     </p>
 <pre>
 <span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
+"keyword">typename</span> octet_iterator&gt;
 uint32_t next(octet_iterator&amp; it, octet_iterator end);
-   
+
 </pre>
     <p>
+      <code>octet_iterator</code>: an input iterator.<br>
       <code>it</code>: a reference to an iterator pointing to the beginning of an UTF-8
       encoded code point. After the function returns, it is incremented to point to the
       beginning of the next code point.<br>
@@ -361,15 +362,16 @@ <h4>
     </p>
     <p>
       Given the iterator to the beginning of the UTF-8 sequence, it returns the code
-      point for the following sequence without changing the value of the iterator. 
+      point for the following sequence without changing the value of the iterator.
     </p>
 <pre>
 <span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
+"keyword">typename</span> octet_iterator&gt;
 uint32_t peek_next(octet_iterator it, octet_iterator end);
-   
+
 </pre>
     <p>
+      <code>octet_iterator</code>: an input iterator.<br>
       <code>it</code>: an iterator pointing to the beginning of an UTF-8
       encoded code point.<br>
        <code>end</code>: end of the UTF-8 sequence to be processed. If <code>it</code>
@@ -400,17 +402,18 @@ <h4>
     Available in version 1.02 and later.
     </p>
     <p>
-      Given a reference to an iterator pointing to an octet in a UTF-8 seqence, it
+      Given a reference to an iterator pointing to an octet in a UTF-8 sequence, it
       decreases the iterator until it hits the beginning of the previous UTF-8 encoded
       code point and returns the 32 bits representation of the code point.
     </p>
 <pre>
 <span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
+"keyword">typename</span> octet_iterator&gt;
 uint32_t prior(octet_iterator&amp; it, octet_iterator start);
-   
+
 </pre>
     <p>
+      <code>octet_iterator</code>: a bidirectional iterator.<br>
       <code>it</code>: a reference pointing to an octet within a UTF-8 encoded string.
       After the function returns, it is decremented to point to the beginning of the
       previous code point.<br>
@@ -433,12 +436,14 @@ <h4>
 assert (cp == <span class="literal">0x65e5</span>);
 assert (w == twochars);
 </pre>
-    <p> 
+    <p>
       This function has two purposes: one is two iterate backwards through a UTF-8
       encoded string. Note that it is usually a better idea to iterate forward instead,
       since <code>utf8::next</code> is faster. The second purpose is to find a beginning
-      of a UTF-8 sequence if we have a random position within a string.
-    </p> 
+      of a UTF-8 sequence if we have a random position within a string. Note that in that
+      case <code>utf8::prior</code> may not detect an invalid UTF-8 sequence in some scenarios:
+      for instance if there are superfluous trail octets, it will just skip them.
+    </p>
     <p>
       <code>it</code> will typically point to the beginning of
       a code point, and <code>start</code> will point to the
@@ -447,10 +452,12 @@ <h4>
       beginning with that octet is decoded to a 32 bit representation and returned.
     </p>
     <p>
-      In case <code>pass_end</code> is reached before a UTF-8 lead octet is hit, or if an
+      In case <code>start</code> is reached before a UTF-8 lead octet is hit, or if an
       invalid UTF-8 sequence is started by the lead octet, an <code>invalid_utf8</code>
       exception is thrown.
     </p>
+    <p>In case <code>start</code> equals <code>it</code>, a <code>not_enough_room</code>
+      exception is thrown.
     <h4>
       utf8::previous
     </h4>
@@ -464,11 +471,12 @@ <h4>
     </p>
 <pre>
 <span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
+"keyword">typename</span> octet_iterator&gt;
 uint32_t previous(octet_iterator&amp; it, octet_iterator pass_start);
-   
+
 </pre>
     <p>
+      <code>octet_iterator</code>: a random access iterator.<br>
       <code>it</code>: a reference pointing to an octet within a UTF-8 encoded string.
       After the function returns, it is decremented to point to the beginning of the
       previous code point.<br>
@@ -496,7 +504,7 @@ <h4>
       <code>utf8::previous</code> is deprecated, and <code>utf8::prior</code> should
       be used instead, although the existing code can continue using this function.
       The problem is the parameter <code>pass_start</code> that points to the position
-      just before the beginning of the sequence. Standard containers don't have the 
+      just before the beginning of the sequence. Standard containers don't have the
       concept of "pass start" and the function can not be used with their iterators.
     </p>
     <p>
@@ -507,7 +515,7 @@ <h4>
       beginning with that octet is decoded to a 32 bit representation and returned.
     </p>
     <p>
-      In case <code>pass_end</code> is reached before a UTF-8 lead octet is hit, or if an
+      In case <code>pass_start</code> is reached before a UTF-8 lead octet is hit, or if an
       invalid UTF-8 sequence is started by the lead octet, an <code>invalid_utf8</code>
       exception is thrown
     </p>
@@ -523,12 +531,14 @@ <h4>
     </p>
 <pre>
 <span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator, typename distance_type&gt; 
+"keyword">typename</span> octet_iterator, typename distance_type&gt;
 <span class=
 "keyword">void</span> advance (octet_iterator&amp; it, distance_type n, octet_iterator end);
-   
+
 </pre>
     <p>
+      <code>octet_iterator</code>: an input iterator.<br>
+      <code>distance_type</code>: an integral type convertible to <code>octet_iterator</code>'s difference type.<br>
       <code>it</code>: a reference to an iterator pointing to the beginning of an UTF-8
       encoded code point. After the function returns, it is incremented to point to the
       nth following code point.<br>
@@ -568,14 +578,15 @@ <h4>
     </p>
 <pre>
 <span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
+"keyword">typename</span> octet_iterator&gt;
 <span class=
 "keyword">typename</span> std::iterator_traits&lt;octet_iterator&gt;::difference_type distance (octet_iterator first, octet_iterator last);
-   
+
 </pre>
     <p>
+      <code>octet_iterator</code>: an input iterator.<br>
       <code>first</code>: an iterator to a beginning of a UTF-8 encoded code point.<br>
-       <code>last</code>: an iterator to a "post-end" of the last UTF-8 encoded code
+      <code>last</code>: an iterator to a "post-end" of the last UTF-8 encoded code
       point in the sequence we are trying to determine the length. It can be the
       beginning of a new code point, or not.<br>
        <span class="return_value">Return value</span> the distance between the iterators,
@@ -616,9 +627,11 @@ <h4>
 "keyword">typename</span> u16bit_iterator, <span class=
 "keyword">typename</span> octet_iterator&gt;
 octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result);
-   
+
 </pre>
     <p>
+      <code>u16bit_iterator</code>: an input iterator.<br>
+      <code>octet_iterator</code>: an output iterator.<br>
       <code>start</code>: an iterator pointing to the beginning of the UTF-16 encoded
       string to convert.<br>
        <code>end</code>: an iterator pointing to pass-the-end of the UTF-16 encoded
@@ -639,7 +652,7 @@ <h4>
 vector&lt;<span class="keyword">unsigned char</span>&gt; utf8result;
 utf16to8(utf16string, utf16string + <span class=
 "literal">5</span>, back_inserter(utf8result));
-assert (utf8result.size() == <span class="literal">10</span>);    
+assert (utf8result.size() == <span class="literal">10</span>);
 </pre>
     <p>
       In case of invalid UTF-16 sequence, a <code>utf8::invalid_utf16</code> exception is
@@ -658,9 +671,11 @@ <h4>
 <span class="keyword">template</span> &lt;<span class=
 "keyword">typename</span> u16bit_iterator, typename octet_iterator&gt;
 u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result);
-   
+
 </pre>
     <p>
+      <code>octet_iterator</code>: an input iterator.<br>
+      <code>u16bit_iterator</code>: an output iterator.<br>
       <code>start</code>: an iterator pointing to the beginning of the UTF-8 encoded
       string to convert. &lt; br /&gt; <code>end</code>: an iterator pointing to
       pass-the-end of the UTF-8 encoded string to convert.<br>
@@ -702,9 +717,11 @@ <h4>
 <span class="keyword">template</span> &lt;<span class=
 "keyword">typename</span> octet_iterator, typename u32bit_iterator&gt;
 octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result);
-   
+
 </pre>
     <p>
+      <code>octet_iterator</code>: an output iterator.<br>
+      <code>u32bit_iterator</code>: an input iterator.<br>
       <code>start</code>: an iterator pointing to the beginning of the UTF-32 encoded
       string to convert.<br>
        <code>end</code>: an iterator pointing to pass-the-end of the UTF-32 encoded
@@ -744,9 +761,11 @@ <h4>
 "keyword">typename</span> octet_iterator, <span class=
 "keyword">typename</span> u32bit_iterator&gt;
 u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result);
-   
+
 </pre>
     <p>
+      <code>octet_iterator</code>: an input iterator.<br>
+      <code>u32bit_iterator</code>: an output iterator.<br>
       <code>start</code>: an iterator pointing to the beginning of the UTF-8 encoded
       string to convert.<br>
        <code>end</code>: an iterator pointing to pass-the-end of the UTF-8 encoded string
@@ -783,10 +802,11 @@ <h4>
     </p>
 <pre>
 <span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
+"keyword">typename</span> octet_iterator&gt;
 octet_iterator find_invalid(octet_iterator start, octet_iterator end);
 </pre>
     <p>
+      <code>octet_iterator</code>: an input iterator.<br>
       <code>start</code>: an iterator pointing to the beginning of the UTF-8 string to
       test for validity.<br>
        <code>end</code>: an iterator pointing to pass-the-end of the UTF-8 string to test
@@ -822,11 +842,12 @@ <h4>
     </p>
 <pre>
 <span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
+"keyword">typename</span> octet_iterator&gt;
 <span class="keyword">bool</span> is_valid(octet_iterator start, octet_iterator end);
-   
+
 </pre>
     <p>
+      <code>octet_iterator</code>: an input iterator.<br>
       <code>start</code>: an iterator pointing to the beginning of the UTF-8 string to
       test for validity.<br>
        <code>end</code>: an iterator pointing to pass-the-end of the UTF-8 string to test
@@ -834,7 +855,7 @@ <h4>
        <span class="return_value">Return value</span>: <code>true</code> if the sequence
       is a valid UTF-8 string; <code>false</code> if not.
     </p>
-    Example of use: 
+    Example of use:
 <pre>
 <span class="keyword">char</span> utf_invalid[] = <span class=
 "literal">"\xe6\x97\xa5\xd1\x88\xfa"</span>;
@@ -865,9 +886,11 @@ <h4>
 "keyword">typename</span> octet_iterator, <span class=
 "keyword">typename</span> output_iterator&gt;
 output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out);
-   
+
 </pre>
     <p>
+      <code>octet_iterator</code>: an input iterator.<br>
+      <code>output_iterator</code>: an output iterator.<br>
       <code>start</code>: an iterator pointing to the beginning of the UTF-8 string to
       look for invalid UTF-8 sequences.<br>
        <code>end</code>: an iterator pointing to pass-the-end of the UTF-8 string to look
@@ -904,21 +927,59 @@ <h4>
       If <code>end</code> does not point to the past-of-end of a UTF-8 sequence, a
       <code>utf8::not_enough_room</code> exception is thrown.
     </p>
+    <h4>
+      utf8::starts_with_bom
+    </h4>
+    <p class="version">
+    Available in version 2.3 and later. Relaces deprecated <code>is_bom()</code> function.
+    </p>
+    <p>
+      Checks whether an octet sequence starts with a UTF-8 byte order mark (BOM)
+    </p>
+<pre>
+<span class="keyword">template</span> &lt;<span class=
+"keyword">typename</span> octet_iterator&gt;
+<span class="keyword">bool</span> starts_with_bom (octet_iterator it, octet_iterator end);
+</pre>
+    <p>
+      <code>octet_iterator</code>: an input iterator.<br>
+      <code>it</code>: beginning of the octet sequence to check<br>
+      <code>end</code>: pass-end of the sequence to check<br>
+       <span class="return_value">Return value</span>: <code>true</code> if the sequence
+      starts with a UTF-8 byte order mark; <code>false</code> if not.
+    </p>
+    <p>
+      Example of use:
+    </p>
+<pre>
+<span class="keyword">unsigned char</span> byte_order_mark[] = {<span class=
+"literal">0xef</span>, <span class="literal">0xbb</span>, <span class=
+"literal">0xbf</span>};
+<span class="keyword">bool</span> bbom = starts_with_bom(byte_order_mark, byte_order_mark + <span class="keyword">sizeof</span>(byte_order_mark));
+assert (bbom == <span class="literal">true</span>);
+</pre>
+    <p>
+      The typical use of this function is to check the first three bytes of a file. If
+      they form the UTF-8 BOM, we want to skip them before processing the actual UTF-8
+      encoded text.
+    </p>
     <h4>
       utf8::is_bom
     </h4>
     <p class="version">
-    Available in version 1.0 and later.
+    Available in version 1.0 and later. Deprecated in version 2.3. <code>starts_with_bom()</code> should be used
+    instead.
     </p>
     <p>
       Checks whether a sequence of three octets is a UTF-8 byte order mark (BOM)
     </p>
 <pre>
 <span class="keyword">template</span> &lt;<span class=
-"keyword">typename</span> octet_iterator&gt; 
-<span class="keyword">bool</span> is_bom (octet_iterator it);
+"keyword">typename</span> octet_iterator&gt;
+<span class="keyword">bool</span> is_bom (octet_iterator it); <span class="comment"> // Deprecated</span>
 </pre>
     <p>
+      <code>octet_iterator</code>: an input iterator.<br>
       <code>it</code>: beginning of the 3-octet sequence to check<br>
        <span class="return_value">Return value</span>: <code>true</code> if the sequence
       is UTF-8 byte order mark; <code>false</code> if not.
@@ -938,9 +999,113 @@ <h4>
       they form the UTF-8 BOM, we want to skip them before processing the actual UTF-8
       encoded text.
     </p>
+    <p>
+      If a sequence is
+      shorter than three bytes, an invalid iterator will be dereferenced. Therefore, this function is deprecated
+      in favor of <code>starts_with_bom()</code>that takes the end of sequence as an argument.
+    </p>
     <h3 id="typesutf8">
       Types From utf8 Namespace
     </h3>
+    <h4>utf8::exception
+    </h4>
+    <p class="version">
+    Available in version 2.3 and later.
+    </p>
+    <p>
+    Base class for the exceptions thrown by UTF CPP library functions.
+    </p>
+<pre>
+<span class="keyword">class</span> exception : <span class="keyword">public</span> std::exception {};
+</pre>
+    <p>
+    Example of use:
+    </p>
+<pre>
+<span class="keyword">try</span> {
+  code_that_uses_utf_cpp_library();
+}
+<span class="keyword">catch</span>(<span class="keyword">const</span> utf8::exception&amp; utfcpp_ex) {
+  cerr &lt;&lt; utfcpp_ex.what();
+}
+</pre>
+
+    <h4>utf8::invalid_code_point
+    </h4>
+    <p class="version">
+    Available in version 1.0 and later.
+    </p>
+    <p>
+    Thrown by UTF8 CPP functions such as <code>advance</code> and <code>next</code> if an UTF-8 sequence represents and invalid code point.
+    </p>
+
+<pre>
+<span class="keyword">class</span> invalid_code_point : <span class="keyword">public</span> exception {
+<span class="keyword">public</span>:
+    uint32_t code_point() <span class="keyword">const</span>;
+};
+
+</pre>
+    <p>
+    Member function <code>code_point()</code> can be used to determine the invalid code point that
+    caused the exception to be thrown.
+    </p>
+    <h4>utf8::invalid_utf8
+    </h4>
+    <p class="version">
+    Available in version 1.0 and later.
+    </p>
+    <p>
+    Thrown by UTF8 CPP functions such as <code>next</code> and <code>prior</code> if an invalid UTF-8 sequence
+    is detected during decoding.
+    </p>
+
+<pre>
+<span class="keyword">class</span> invalid_utf8 : <span class="keyword">public</span> exception {
+<span class="keyword">public</span>:
+    uint8_t utf8_octet() <span class="keyword">const</span>;
+};
+</pre>
+
+    <p>
+    Member function <code>utf8_octet()</code> can be used to determine the beginning of the byte
+    sequence that caused the exception to be thrown.
+    </p>
+</pre>
+    <h4>utf8::invalid_utf16
+    </h4>
+    <p class="version">
+    Available in version 1.0 and later.
+    </p>
+    <p>
+    Thrown by UTF8 CPP function <code>utf16to8</code> if an invalid UTF-16 sequence
+    is detected during decoding.
+    </p>
+
+<pre>
+<span class="keyword">class</span> invalid_utf16 : <span class="keyword">public</span> exception {
+<span class="keyword">public</span>:
+    uint16_t utf16_word() <span class="keyword">const</span>;
+};
+</pre>
+
+    <p>
+    Member function <code>utf16_word()</code> can be used to determine the UTF-16 code unit
+    that caused the exception to be thrown.
+    </p>
+    <h4>utf8::not_enough_room
+    </h4>
+    <p class="version">
+    Available in version 1.0 and later.
+    </p>
+    <p>
+    Thrown by UTF8 CPP functions such as <code>next</code> if the end of the decoded UTF-8 sequence
+    was reached before the code point was decoded.
+    </p>
+
+<pre>
+<span class="keyword">class</span> not_enough_room : <span class="keyword">public</span> exception {};
+</pre>
     <h4>
       utf8::iterator
     </h4>
@@ -955,17 +1120,17 @@ <h4>
 <span class="keyword">template</span> &lt;<span class="keyword">typename</span> octet_iterator&gt;
 <span class="keyword">class</span> iterator;
 </pre>
-    
+
     <h5>Member functions</h5>
       <dl>
       <dt><code>iterator();</code> <dd> the deafult constructor; the underlying <code>octet_iterator</code> is
       constructed with its default constructor.
-      <dt><code><span class="keyword">explicit</span> iterator (const octet_iterator&amp; octet_it, 
+      <dt><code><span class="keyword">explicit</span> iterator (const octet_iterator&amp; octet_it,
                          const octet_iterator&amp; range_start,
-                         const octet_iterator&amp; range_end);</code> <dd> a constructor 
+                         const octet_iterator&amp; range_end);</code> <dd> a constructor
       that initializes the underlying <code>octet_iterator</code> with <code>octet_it</code>
       and sets the range in which the iterator is considered valid.
-      <dt><code>octet_iterator base () <span class="keyword">const</span>;</code> <dd> returns the 
+      <dt><code>octet_iterator base () <span class="keyword">const</span>;</code> <dd> returns the
       underlying <code>octet_iterator</code>.
       <dt><code>uint32_t operator * () <span class="keyword">const</span>;</code> <dd> decodes the utf-8 sequence
       the underlying <code>octet_iterator</code> is pointing to and returns the code point.
@@ -997,7 +1162,7 @@ <h5>Member functions</h5>
 assert ((*it++) == <span class="literal">0x65e5</span>);
 assert (*it == <span class="literal">0x0448</span>);
 assert (it != it2);
-utf8::iterator&lt;<span class="keyword">char</span>*&gt; endit (threechars + <span class="literal">9</span>, threechars, threechars + <span class="literal">9</span>);  
+utf8::iterator&lt;<span class="keyword">char</span>*&gt; endit (threechars + <span class="literal">9</span>, threechars, threechars + <span class="literal">9</span>);
 assert (++it == endit);
 assert (*(--it) == <span class="literal">0x0448</span>);
 assert ((*it--) == <span class="literal">0x0448</span>);
@@ -1007,8 +1172,8 @@ <h5>Member functions</h5>
 </pre>
       <p>
       The purpose of <code>utf8::iterator</code> adapter is to enable easy iteration as well as the use of STL
-      algorithms with UTF-8 encoded strings. Increment and decrement operators are implemented in terms of 
-      <code>utf8::next()</code> and <code>utf8::prior()</code> functions. 
+      algorithms with UTF-8 encoded strings. Increment and decrement operators are implemented in terms of
+      <code>utf8::next()</code> and <code>utf8::prior()</code> functions.
       </p>
       <p>
       Note that <code>utf8::iterator</code> adapter is a checked iterator. It operates on the range specified in
@@ -1037,7 +1202,7 @@ <h4>
 <span class="keyword">template</span> &lt;<span class=
 "keyword">typename</span> octet_iterator&gt;
 octet_iterator append(uint32_t cp, octet_iterator result);
-   
+
 </pre>
     <p>
       <code>cp</code>: A 32 bit integer representing a code point to append to the
@@ -1082,7 +1247,7 @@ <h4>
 <span class="keyword">template</span> &lt;<span class=
 "keyword">typename</span> octet_iterator&gt;
 uint32_t next(octet_iterator&amp; it);
-   
+
 </pre>
     <p>
       <code>it</code>: a reference to an iterator pointing to the beginning of an UTF-8
@@ -1119,7 +1284,7 @@ <h4>
 <span class="keyword">template</span> &lt;<span class=
 "keyword">typename</span> octet_iterator&gt;
 uint32_t peek_next(octet_iterator it);
-   
+
 </pre>
     <p>
       <code>it</code>: an iterator pointing to the beginning of an UTF-8
@@ -1157,7 +1322,7 @@ <h4>
 <span class="keyword">template</span> &lt;<span class=
 "keyword">typename</span> octet_iterator&gt;
 uint32_t prior(octet_iterator&amp; it);
-   
+
 </pre>
     <p>
       <code>it</code>: a reference pointing to an octet within a UTF-8 encoded string.
@@ -1196,7 +1361,7 @@ <h4>
 <span class="keyword">template</span> &lt;<span class=
 "keyword">typename</span> octet_iterator&gt;
 uint32_t previous(octet_iterator&amp; it);
-   
+
 </pre>
     <p>
       <code>it</code>: a reference pointing to an octet within a UTF-8 encoded string.
@@ -1240,7 +1405,7 @@ <h4>
 <span class="keyword">template</span> &lt;<span class=
 "keyword">typename</span> octet_iterator, typename distance_type&gt;
 <span class="keyword">void</span> advance (octet_iterator&amp; it, distance_type n);
-   
+
 </pre>
     <p>
       <code>it</code>: a reference to an iterator pointing to the beginning of an UTF-8
@@ -1319,7 +1484,7 @@ <h4>
 "keyword">typename</span> u16bit_iterator, <span class=
 "keyword">typename</span> octet_iterator&gt;
 octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result);
-   
+
 </pre>
     <p>
       <code>start</code>: an iterator pointing to the beginning of the UTF-16 encoded
@@ -1342,7 +1507,7 @@ <h4>
 vector&lt;<span class="keyword">unsigned char</span>&gt; utf8result;
 unchecked::utf16to8(utf16string, utf16string + <span class=
 "literal">5</span>, back_inserter(utf8result));
-assert (utf8result.size() == <span class="literal">10</span>);    
+assert (utf8result.size() == <span class="literal">10</span>);
 </pre>
     <p>
       This is a faster but less safe version of <code>utf8::utf16to8</code>. It does not
@@ -1361,7 +1526,7 @@ <h4>
 <span class="keyword">template</span> &lt;<span class=
 "keyword">typename</span> u16bit_iterator, typename octet_iterator&gt;
 u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result);
-   
+
 </pre>
     <p>
       <code>start</code>: an iterator pointing to the beginning of the UTF-8 encoded
@@ -1405,7 +1570,7 @@ <h4>
 "keyword">typename</span> octet_iterator, <span class=
 "keyword">typename</span> u32bit_iterator&gt;
 octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result);
-   
+
 </pre>
     <p>
       <code>start</code>: an iterator pointing to the beginning of the UTF-32 encoded
@@ -1446,7 +1611,7 @@ <h4>
 <span class="keyword">template</span> &lt;<span class=
 "keyword">typename</span> octet_iterator, typename u32bit_iterator&gt;
 u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result);
-   
+
 </pre>
     <p>
       <code>start</code>: an iterator pointing to the beginning of the UTF-8 encoded
@@ -1490,15 +1655,15 @@ <h4>
 <span class="keyword">template</span> &lt;<span class="keyword">typename</span> octet_iterator&gt;
 <span class="keyword">class</span> iterator;
 </pre>
-    
+
     <h5>Member functions</h5>
       <dl>
       <dt><code>iterator();</code> <dd> the deafult constructor; the underlying <code>octet_iterator</code> is
       constructed with its default constructor.
-      <dt><code><span class="keyword">explicit</span> iterator (const octet_iterator&amp; octet_it); 
-                         </code> <dd> a constructor 
+      <dt><code><span class="keyword">explicit</span> iterator (const octet_iterator&amp; octet_it);
+                         </code> <dd> a constructor
       that initializes the underlying <code>octet_iterator</code> with <code>octet_it</code>
-      <dt><code>octet_iterator base () <span class="keyword">const</span>;</code> <dd> returns the 
+      <dt><code>octet_iterator base () <span class="keyword">const</span>;</code> <dd> returns the
       underlying <code>octet_iterator</code>.
       <dt><code>uint32_t operator * () <span class="keyword">const</span>;</code> <dd> decodes the utf-8 sequence
       the underlying <code>octet_iterator</code> is pointing to and returns the code point.
@@ -1530,7 +1695,7 @@ <h5>Member functions</h5>
 assert ((*un_it++) == <span class="literal">0x65e5</span>);
 assert (*un_it == <span class="literal">0x0448</span>);
 assert (un_it != un_it2);
-utf8::::unchecked::iterator&lt;<span class="keyword">char</span>*&gt; un_endit (threechars + <span class="literal">9</span>);  
+utf8::::unchecked::iterator&lt;<span class="keyword">char</span>*&gt; un_endit (threechars + <span class="literal">9</span>);
 assert (++un_it == un_endit);
 assert (*(--un_it) == <span class="literal">0x0448</span>);
 assert ((*un_it--) == <span class="literal">0x0448</span>);
@@ -1564,7 +1729,7 @@ <h4>
         for Windows (both 32 and 64 bit), and most 32 bit and 64 bit Unix derivatives.
       </li>
       <li>
-        Lightweight: follow the "pay only for what you use" guidline.
+        Lightweight: follow the "pay only for what you use" guideline.
       </li>
       <li>
         Unintrusive: avoid forcing any particular design or even programming style on the
@@ -1585,6 +1750,10 @@ <h4>
         non-generic, and doesn't play well with the Standard Library. I definitelly
         recommend looking at ICU even if you don't plan to use it.
       </li>
+      <li>
+        C++11 language and library features. Still far from complete, and not widely
+        supported by compiler vendors.
+      </li>
       <li>
         <a href=
         "http://www.gtkmm.org/gtkmm2/docs/tutorial/html/ch03s04.html">Glib::ustring</a>.
@@ -1595,18 +1764,9 @@ <h4>
       <li>
         Platform dependent solutions: Windows and POSIX have functions to convert strings
         from one encoding to another. That is only a subset of what my library offers,
-        but if that is all you need it may be good enough, especially given the fact that
-        these functions are mature and tested in production.
+        but if that is all you need it may be good enough.
       </li>
     </ol>
-    <h2 id="conclusion">
-      Conclusion
-    </h2>
-    <p>
-      Until Unicode becomes officially recognized by the C++ Standard Library, we need to
-      use other means to work with UTF-8 strings. Template functions I describe in this
-      article may be a good step in this direction.
-    </p>
     <h2 id="links">
       Links
     </h2>
diff --git a/dep/include/utf8cpp/utf8/checked.h b/dep/include/utf8cpp/utf8/checked.h
index ff75eb78923..8fa6578eed9 100644
--- a/dep/include/utf8cpp/utf8/checked.h
+++ b/dep/include/utf8cpp/utf8/checked.h
@@ -33,8 +33,12 @@ DEALINGS IN THE SOFTWARE.
 
 namespace utf8
 {
+    // Base for the exceptions that may be thrown from the library
+    class exception : public ::std::exception {
+    };
+
     // Exceptions that may be thrown from the library functions.
-    class invalid_code_point : public std::exception {
+    class invalid_code_point : public exception {
         uint32_t cp;
     public:
         invalid_code_point(uint32_t cp) : cp(cp) {}
@@ -42,7 +46,7 @@ namespace utf8
         uint32_t code_point() const {return cp;}
     };
 
-    class invalid_utf8 : public std::exception {
+    class invalid_utf8 : public exception {
         uint8_t u8;
     public:
         invalid_utf8 (uint8_t u) : u8(u) {}
@@ -50,7 +54,7 @@ namespace utf8
         uint8_t utf8_octet() const {return u8;}
     };
 
-    class invalid_utf16 : public std::exception {
+    class invalid_utf16 : public exception {
         uint16_t u16;
     public:
         invalid_utf16 (uint16_t u) : u16(u) {}
@@ -58,19 +62,45 @@ namespace utf8
         uint16_t utf16_word() const {return u16;}
     };
 
-    class not_enough_room : public std::exception {
+    class not_enough_room : public exception {
     public:
         virtual const char* what() const throw() { return "Not enough space"; }
     };
 
     /// The library API - functions intended to be called by the users
 
+    template <typename octet_iterator>
+    octet_iterator append(uint32_t cp, octet_iterator result)
+    {
+        if (!utf8::internal::is_code_point_valid(cp))
+            throw invalid_code_point(cp);
+
+        if (cp < 0x80)                        // one octet
+            *(result++) = static_cast<uint8_t>(cp);
+        else if (cp < 0x800) {                // two octets
+            *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
+        else if (cp < 0x10000) {              // three octets
+            *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
+            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
+        else {                                // four octets
+            *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
+            *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)  | 0x80);
+            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
+        return result;
+    }
+
     template <typename octet_iterator, typename output_iterator>
     output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
     {
         while (start != end) {
             octet_iterator sequence_start = start;
-            internal::utf_error err_code = internal::validate_next(start, end);
+            internal::utf_error err_code = utf8::internal::validate_next(start, end);
             switch (err_code) {
                 case internal::UTF8_OK :
                     for (octet_iterator it = sequence_start; it != start; ++it)
@@ -79,16 +109,16 @@ namespace utf8
                 case internal::NOT_ENOUGH_ROOM:
                     throw not_enough_room();
                 case internal::INVALID_LEAD:
-                    append (replacement, out);
+                    out = utf8::append (replacement, out);
                     ++start;
                     break;
                 case internal::INCOMPLETE_SEQUENCE:
                 case internal::OVERLONG_SEQUENCE:
                 case internal::INVALID_CODE_POINT:
-                    append (replacement, out);
+                    out = utf8::append (replacement, out);
                     ++start;
                     // just one replacement mark for the sequence
-                    while (internal::is_trail(*start) && start != end)
+                    while (start != end && utf8::internal::is_trail(*start))
                         ++start;
                     break;
             }
@@ -99,41 +129,15 @@ namespace utf8
     template <typename octet_iterator, typename output_iterator>
     inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
     {
-        static const uint32_t replacement_marker = internal::mask16(0xfffd);
-        return replace_invalid(start, end, out, replacement_marker);
-    }
-
-    template <typename octet_iterator>
-    octet_iterator append(uint32_t cp, octet_iterator result)
-    {
-        if (!internal::is_code_point_valid(cp))
-            throw invalid_code_point(cp);
-
-        if (cp < 0x80)                        // one octet
-            *(result++) = static_cast<uint8_t>(cp);
-        else if (cp < 0x800) {                // two octets
-            *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        else if (cp < 0x10000) {              // three octets
-            *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
-            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        else {      // four octets
-            *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
-            *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)  | 0x80);
-            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        return result;
+        static const uint32_t replacement_marker = utf8::internal::mask16(0xfffd);
+        return utf8::replace_invalid(start, end, out, replacement_marker);
     }
 
     template <typename octet_iterator>
     uint32_t next(octet_iterator& it, octet_iterator end)
     {
         uint32_t cp = 0;
-        internal::utf_error err_code = internal::validate_next(it, end, &cp);
+        internal::utf_error err_code = utf8::internal::validate_next(it, end, cp);
         switch (err_code) {
             case internal::UTF8_OK :
                 break;
@@ -152,18 +156,22 @@ namespace utf8
     template <typename octet_iterator>
     uint32_t peek_next(octet_iterator it, octet_iterator end)
     {
-        return next(it, end);
+        return utf8::next(it, end);
     }
 
     template <typename octet_iterator>
     uint32_t prior(octet_iterator& it, octet_iterator start)
     {
+        // can't do much if it == start
+        if (it == start)
+            throw not_enough_room();
+
         octet_iterator end = it;
-        while (internal::is_trail(*(--it)))
-            if (it < start)
+        // Go back until we hit either a lead octet or start
+        while (utf8::internal::is_trail(*(--it)))
+            if (it == start)
                 throw invalid_utf8(*it); // error - no lead byte in the sequence
-        octet_iterator temp = it;
-        return next(temp, end);
+        return utf8::peek_next(it, end);
     }
 
     /// Deprecated in versions that include "prior"
@@ -171,18 +179,18 @@ namespace utf8
     uint32_t previous(octet_iterator& it, octet_iterator pass_start)
     {
         octet_iterator end = it;
-        while (internal::is_trail(*(--it)))
+        while (utf8::internal::is_trail(*(--it)))
             if (it == pass_start)
                 throw invalid_utf8(*it); // error - no lead byte in the sequence
         octet_iterator temp = it;
-        return next(temp, end);
+        return utf8::next(temp, end);
     }
 
     template <typename octet_iterator, typename distance_type>
     void advance (octet_iterator& it, distance_type n, octet_iterator end)
     {
         for (distance_type i = 0; i < n; ++i)
-            next(it, end);
+            utf8::next(it, end);
     }
 
     template <typename octet_iterator>
@@ -191,7 +199,7 @@ namespace utf8
     {
         typename std::iterator_traits<octet_iterator>::difference_type dist;
         for (dist = 0; first < last; ++dist)
-            next(first, last);
+            utf8::next(first, last);
         return dist;
     }
 
@@ -199,12 +207,12 @@ namespace utf8
     octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
     {
         while (start != end) {
-            uint32_t cp = internal::mask16(*start++);
+            uint32_t cp = utf8::internal::mask16(*start++);
             // Take care of surrogate pairs first
-            if (internal::is_lead_surrogate(cp)) {
+            if (utf8::internal::is_lead_surrogate(cp)) {
                 if (start != end) {
-                    uint32_t trail_surrogate = internal::mask16(*start++);
-                    if (internal::is_trail_surrogate(trail_surrogate))
+                    uint32_t trail_surrogate = utf8::internal::mask16(*start++);
+                    if (utf8::internal::is_trail_surrogate(trail_surrogate))
                         cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
                     else
                         throw invalid_utf16(static_cast<uint16_t>(trail_surrogate));
@@ -214,10 +222,10 @@ namespace utf8
 
             }
             // Lone trail surrogate
-            else if (internal::is_trail_surrogate(cp))
+            else if (utf8::internal::is_trail_surrogate(cp))
                 throw invalid_utf16(static_cast<uint16_t>(cp));
 
-            result = append(cp, result);
+            result = utf8::append(cp, result);
         }
         return result;
     }
@@ -226,7 +234,7 @@ namespace utf8
     u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
     {
         while (start != end) {
-            uint32_t cp = next(start, end);
+            uint32_t cp = utf8::next(start, end);
             if (cp > 0xffff) { //make a surrogate pair
                 *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
                 *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
@@ -241,7 +249,7 @@ namespace utf8
     octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
     {
         while (start != end)
-            result = append(*(start++), result);
+            result = utf8::append(*(start++), result);
 
         return result;
     }
@@ -249,8 +257,8 @@ namespace utf8
     template <typename octet_iterator, typename u32bit_iterator>
     u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
     {
-        while (start < end)
-            (*result++) = next(start, end);
+        while (start != end)
+            (*result++) = utf8::next(start, end);
 
         return result;
     }
@@ -262,7 +270,7 @@ namespace utf8
       octet_iterator range_start;
       octet_iterator range_end;
       public:
-      iterator () {};
+      iterator () {}
       explicit iterator (const octet_iterator& octet_it,
                          const octet_iterator& range_start,
                          const octet_iterator& range_end) :
@@ -276,7 +284,7 @@ namespace utf8
       uint32_t operator * () const
       {
           octet_iterator temp = it;
-          return next(temp, range_end);
+          return utf8::next(temp, range_end);
       }
       bool operator == (const iterator& rhs) const
       {
@@ -290,24 +298,24 @@ namespace utf8
       }
       iterator& operator ++ ()
       {
-          next(it, range_end);
+          utf8::next(it, range_end);
           return *this;
       }
       iterator operator ++ (int)
       {
           iterator temp = *this;
-          next(it, range_end);
+          utf8::next(it, range_end);
           return temp;
       }
       iterator& operator -- ()
       {
-          prior(it, range_start);
+          utf8::prior(it, range_start);
           return *this;
       }
       iterator operator -- (int)
       {
           iterator temp = *this;
-          prior(it, range_start);
+          utf8::prior(it, range_start);
           return temp;
       }
     }; // class iterator
@@ -315,5 +323,3 @@ namespace utf8
 } // namespace utf8
 
 #endif //header guard
-
-
diff --git a/dep/include/utf8cpp/utf8/core.h b/dep/include/utf8cpp/utf8/core.h
index 5a55f0655ce..2cdea7c1bf0 100644
--- a/dep/include/utf8cpp/utf8/core.h
+++ b/dep/include/utf8cpp/utf8/core.h
@@ -68,7 +68,7 @@ namespace internal
     template<typename octet_type>
     inline bool is_trail(octet_type oc)
     {
-        return ((mask8(oc) >> 6) == 0x2);
+        return ((utf8::internal::mask8(oc) >> 6) == 0x2);
     }
 
     template <typename u16>
@@ -92,14 +92,14 @@ namespace internal
     template <typename u32>
     inline bool is_code_point_valid(u32 cp)
     {
-        return (cp <= CODE_POINT_MAX && !is_surrogate(cp) && cp != 0xfffe && cp != 0xffff);
+        return (cp <= CODE_POINT_MAX && !utf8::internal::is_surrogate(cp));
     }
 
     template <typename octet_iterator>
     inline typename std::iterator_traits<octet_iterator>::difference_type
     sequence_length(octet_iterator lead_it)
     {
-        uint8_t lead = mask8(*lead_it);
+        uint8_t lead = utf8::internal::mask8(*lead_it);
         if (lead < 0x80)
             return 1;
         else if ((lead >> 5) == 0x6)
@@ -112,18 +112,19 @@ namespace internal
             return 0;
     }
 
-    inline bool is_overlong_sequence(uint32_t cp, int length)
+    template <typename octet_difference_type>
+    inline bool is_overlong_sequence(uint32_t cp, octet_difference_type length)
     {
         if (cp < 0x80) {
-            if (length != 1) 
+            if (length != 1)
                 return true;
         }
         else if (cp < 0x800) {
-            if (length != 2) 
+            if (length != 2)
                 return true;
         }
         else if (cp < 0x10000) {
-            if (length != 3) 
+            if (length != 3)
                 return true;
         }
 
@@ -132,123 +133,94 @@ namespace internal
 
     enum utf_error {UTF8_OK, NOT_ENOUGH_ROOM, INVALID_LEAD, INCOMPLETE_SEQUENCE, OVERLONG_SEQUENCE, INVALID_CODE_POINT};
 
-    /// get_sequence_x functions decode utf-8 sequences of the length x
+    /// Helper for get_sequence_x
+    template <typename octet_iterator>
+    utf_error increase_safely(octet_iterator& it, octet_iterator end)
+    {
+        if (++it == end)
+            return NOT_ENOUGH_ROOM;
+
+        if (!utf8::internal::is_trail(*it))
+            return INCOMPLETE_SEQUENCE;
+
+        return UTF8_OK;
+    }
 
+    #define UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(IT, END) {utf_error ret = increase_safely(IT, END); if (ret != UTF8_OK) return ret;}
+
+    /// get_sequence_x functions decode utf-8 sequences of the length x
     template <typename octet_iterator>
-    utf_error get_sequence_1(octet_iterator& it, octet_iterator end, uint32_t* code_point)
+    utf_error get_sequence_1(octet_iterator& it, octet_iterator end, uint32_t& code_point)
     {
-        if (it != end) {
-            if (code_point)
-                *code_point = mask8(*it);
-            return UTF8_OK;
-        }
-        return NOT_ENOUGH_ROOM;
+        if (it == end)
+            return NOT_ENOUGH_ROOM;
+
+        code_point = utf8::internal::mask8(*it);
+
+        return UTF8_OK;
     }
 
     template <typename octet_iterator>
-    utf_error get_sequence_2(octet_iterator& it, octet_iterator end, uint32_t* code_point)
+    utf_error get_sequence_2(octet_iterator& it, octet_iterator end, uint32_t& code_point)
     {
-        utf_error ret_code = NOT_ENOUGH_ROOM;
+        if (it == end)
+            return NOT_ENOUGH_ROOM;
 
-        if (it != end) {
-            uint32_t cp = mask8(*it);
-            if (++it != end) {
-                if (is_trail(*it)) {
-                    cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
+        code_point = utf8::internal::mask8(*it);
 
-                    if (code_point)
-                        *code_point = cp;
-                    ret_code = UTF8_OK;
-                }
-                else
-                    ret_code = INCOMPLETE_SEQUENCE;
-            }
-            else
-                ret_code = NOT_ENOUGH_ROOM;
-        }
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+
+        code_point = ((code_point << 6) & 0x7ff) + ((*it) & 0x3f);
 
-        return ret_code;
+        return UTF8_OK;
     }
 
     template <typename octet_iterator>
-    utf_error get_sequence_3(octet_iterator& it, octet_iterator end, uint32_t* code_point)
+    utf_error get_sequence_3(octet_iterator& it, octet_iterator end, uint32_t& code_point)
     {
-        utf_error ret_code = NOT_ENOUGH_ROOM;
-
-        if (it != end) {
-            uint32_t cp = mask8(*it);
-            if (++it != end) {
-                if (is_trail(*it)) {
-                    cp = ((cp << 12) & 0xffff) + ((mask8(*it) << 6) & 0xfff);
-                    if (++it != end) {
-                        if (is_trail(*it)) {
-                            cp += (*it) & 0x3f;
-
-                            if (code_point)
-                                *code_point = cp;
-                            ret_code = UTF8_OK;
-                        }
-                        else 
-                            ret_code = INCOMPLETE_SEQUENCE;
-                    }
-                    else
-                        ret_code = NOT_ENOUGH_ROOM;
-                }
-                else
-                    ret_code = INCOMPLETE_SEQUENCE;
-            }
-            else
-                ret_code = NOT_ENOUGH_ROOM;
-        }
+        if (it == end)
+            return NOT_ENOUGH_ROOM;
+
+        code_point = utf8::internal::mask8(*it);
+
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
 
-        return ret_code;
+        code_point = ((code_point << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
+
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+
+        code_point += (*it) & 0x3f;
+
+        return UTF8_OK;
     }
 
     template <typename octet_iterator>
-    utf_error get_sequence_4(octet_iterator& it, octet_iterator end, uint32_t* code_point)
+    utf_error get_sequence_4(octet_iterator& it, octet_iterator end, uint32_t& code_point)
     {
-        utf_error ret_code = NOT_ENOUGH_ROOM;
-
-        if (it != end) {
-            uint32_t cp = mask8(*it);
-            if (++it != end) {
-                if (is_trail(*it)) {
-                    cp = ((cp << 18) & 0x1fffff) + ((mask8(*it) << 12) & 0x3ffff);
-                    if (++it != end) {
-                        if (is_trail(*it)) {
-                            cp += (mask8(*it) << 6) & 0xfff;
-                            if (++it != end) {
-                                if (is_trail(*it)) {
-                                    cp += (*it) & 0x3f;
-
-                                    if (code_point)
-                                        *code_point = cp;
-                                    ret_code = UTF8_OK;
-                                }
-                                else
-                                    ret_code = INCOMPLETE_SEQUENCE;
-                            }
-                            else
-                                ret_code = NOT_ENOUGH_ROOM;
-                        }
-                        else
-                            ret_code = INCOMPLETE_SEQUENCE;
-                    }
-                    else
-                        ret_code = NOT_ENOUGH_ROOM;
-                }
-                else 
-                    ret_code = INCOMPLETE_SEQUENCE;
-            }
-            else
-                ret_code = NOT_ENOUGH_ROOM;
-        }
+        if (it == end)
+           return NOT_ENOUGH_ROOM;
+
+        code_point = utf8::internal::mask8(*it);
+
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+
+        code_point = ((code_point << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
+
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+
+        code_point += (utf8::internal::mask8(*it) << 6) & 0xfff;
 
-        return ret_code;
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+
+        code_point += (*it) & 0x3f;
+
+        return UTF8_OK;
     }
 
+    #undef UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR
+
     template <typename octet_iterator>
-    utf_error validate_next(octet_iterator& it, octet_iterator end, uint32_t* code_point)
+    utf_error validate_next(octet_iterator& it, octet_iterator end, uint32_t& code_point)
     {
         // Save the original value of it so we can go back in case of failure
         // Of course, it does not make much sense with i.e. stream iterators
@@ -257,41 +229,40 @@ namespace internal
         uint32_t cp = 0;
         // Determine the sequence length based on the lead octet
         typedef typename std::iterator_traits<octet_iterator>::difference_type octet_difference_type;
-        octet_difference_type length = sequence_length(it);
-        if (length == 0)
-            return INVALID_LEAD;
+        const octet_difference_type length = utf8::internal::sequence_length(it);
 
-        // Now that we have a valid sequence length, get trail octets and calculate the code point
+        // Get trail octets and calculate the code point
         utf_error err = UTF8_OK;
         switch (length) {
+            case 0:
+                return INVALID_LEAD;
             case 1:
-                err = get_sequence_1(it, end, &cp);
+                err = utf8::internal::get_sequence_1(it, end, cp);
                 break;
             case 2:
-                err = get_sequence_2(it, end, &cp);
+                err = utf8::internal::get_sequence_2(it, end, cp);
             break;
             case 3:
-                err = get_sequence_3(it, end, &cp);
+                err = utf8::internal::get_sequence_3(it, end, cp);
             break;
             case 4:
-                err = get_sequence_4(it, end, &cp);
+                err = utf8::internal::get_sequence_4(it, end, cp);
             break;
         }
 
         if (err == UTF8_OK) {
             // Decoding succeeded. Now, security checks...
-            if (is_code_point_valid(cp)) {
-                if (!is_overlong_sequence(cp, length)){
+            if (utf8::internal::is_code_point_valid(cp)) {
+                if (!utf8::internal::is_overlong_sequence(cp, length)){
                     // Passed! Return here.
-                    if (code_point)
-                        *code_point = cp;
+                    code_point = cp;
                     ++it;
                     return UTF8_OK;
                 }
                 else
                     err = OVERLONG_SEQUENCE;
             }
-            else 
+            else
                 err = INVALID_CODE_POINT;
         }
 
@@ -302,7 +273,8 @@ namespace internal
 
     template <typename octet_iterator>
     inline utf_error validate_next(octet_iterator& it, octet_iterator end) {
-        return validate_next(it, end, 0);
+        uint32_t ignored;
+        return utf8::internal::validate_next(it, end, ignored);
     }
 
 } // namespace internal
@@ -317,7 +289,7 @@ namespace internal
     {
         octet_iterator result = start;
         while (result != end) {
-            internal::utf_error err_code = internal::validate_next(result, end);
+            utf8::internal::utf_error err_code = utf8::internal::validate_next(result, end);
             if (err_code != internal::UTF8_OK)
                 return result;
         }
@@ -327,20 +299,29 @@ namespace internal
     template <typename octet_iterator>
     inline bool is_valid(octet_iterator start, octet_iterator end)
     {
-        return (find_invalid(start, end) == end);
+        return (utf8::find_invalid(start, end) == end);
+    }
+
+    template <typename octet_iterator>
+    inline bool starts_with_bom (octet_iterator it, octet_iterator end)
+    {
+        return (
+            ((it != end) && (utf8::internal::mask8(*it++)) == bom[0]) &&
+            ((it != end) && (utf8::internal::mask8(*it++)) == bom[1]) &&
+            ((it != end) && (utf8::internal::mask8(*it))   == bom[2])
+           );
     }
 
+    //Deprecated in release 2.3
     template <typename octet_iterator>
     inline bool is_bom (octet_iterator it)
     {
         return (
-            (internal::mask8(*it++)) == bom[0] &&
-            (internal::mask8(*it++)) == bom[1] &&
-            (internal::mask8(*it))   == bom[2]
+            (utf8::internal::mask8(*it++)) == bom[0] &&
+            (utf8::internal::mask8(*it++)) == bom[1] &&
+            (utf8::internal::mask8(*it))   == bom[2]
            );
     }
 } // namespace utf8
 
 #endif // header guard
-
-
diff --git a/dep/include/utf8cpp/utf8/unchecked.h b/dep/include/utf8cpp/utf8/unchecked.h
index d3110cb88e4..149388754bc 100644
--- a/dep/include/utf8cpp/utf8/unchecked.h
+++ b/dep/include/utf8cpp/utf8/unchecked.h
@@ -32,13 +32,13 @@ DEALINGS IN THE SOFTWARE.
 
 namespace utf8
 {
-    namespace unchecked 
+    namespace unchecked
     {
         template <typename octet_iterator>
         octet_iterator append(uint32_t cp, octet_iterator result)
         {
             if (cp < 0x80)                        // one octet
-                *(result++) = static_cast<uint8_t>(cp);  
+                *(result++) = static_cast<uint8_t>(cp);
             else if (cp < 0x800) {                // two octets
                 *(result++) = static_cast<uint8_t>((cp >> 6)          | 0xc0);
                 *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
@@ -60,7 +60,7 @@ namespace utf8
         template <typename octet_iterator>
         uint32_t next(octet_iterator& it)
         {
-            uint32_t cp = internal::mask8(*it);
+            uint32_t cp = utf8::internal::mask8(*it);
             typename std::iterator_traits<octet_iterator>::difference_type length = utf8::internal::sequence_length(it);
             switch (length) {
                 case 1:
@@ -70,50 +70,50 @@ namespace utf8
                     cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
                     break;
                 case 3:
-                    ++it; 
-                    cp = ((cp << 12) & 0xffff) + ((internal::mask8(*it) << 6) & 0xfff);
+                    ++it;
+                    cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
                     ++it;
                     cp += (*it) & 0x3f;
                     break;
                 case 4:
                     ++it;
-                    cp = ((cp << 18) & 0x1fffff) + ((internal::mask8(*it) << 12) & 0x3ffff);                
+                    cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
                     ++it;
-                    cp += (internal::mask8(*it) << 6) & 0xfff;
+                    cp += (utf8::internal::mask8(*it) << 6) & 0xfff;
                     ++it;
-                    cp += (*it) & 0x3f; 
+                    cp += (*it) & 0x3f;
                     break;
             }
             ++it;
-            return cp;        
+            return cp;
         }
 
         template <typename octet_iterator>
         uint32_t peek_next(octet_iterator it)
         {
-            return next(it);    
+            return utf8::unchecked::next(it);
         }
 
         template <typename octet_iterator>
         uint32_t prior(octet_iterator& it)
         {
-            while (internal::is_trail(*(--it))) ;
+            while (utf8::internal::is_trail(*(--it))) ;
             octet_iterator temp = it;
-            return next(temp);
+            return utf8::unchecked::next(temp);
         }
 
         // Deprecated in versions that include prior, but only for the sake of consistency (see utf8::previous)
         template <typename octet_iterator>
         inline uint32_t previous(octet_iterator& it)
         {
-            return prior(it);
+            return utf8::unchecked::prior(it);
         }
 
         template <typename octet_iterator, typename distance_type>
         void advance (octet_iterator& it, distance_type n)
         {
             for (distance_type i = 0; i < n; ++i)
-                next(it);
+                utf8::unchecked::next(it);
         }
 
         template <typename octet_iterator>
@@ -121,31 +121,31 @@ namespace utf8
         distance (octet_iterator first, octet_iterator last)
         {
             typename std::iterator_traits<octet_iterator>::difference_type dist;
-            for (dist = 0; first < last; ++dist) 
-                next(first);
+            for (dist = 0; first < last; ++dist)
+                utf8::unchecked::next(first);
             return dist;
         }
 
         template <typename u16bit_iterator, typename octet_iterator>
         octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
-        {       
+        {
             while (start != end) {
-                uint32_t cp = internal::mask16(*start++);
+                uint32_t cp = utf8::internal::mask16(*start++);
             // Take care of surrogate pairs first
-                if (internal::is_lead_surrogate(cp)) {
-                    uint32_t trail_surrogate = internal::mask16(*start++);
+                if (utf8::internal::is_lead_surrogate(cp)) {
+                    uint32_t trail_surrogate = utf8::internal::mask16(*start++);
                     cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
                 }
-                result = append(cp, result);
+                result = utf8::unchecked::append(cp, result);
             }
-            return result;         
+            return result;
         }
 
         template <typename u16bit_iterator, typename octet_iterator>
         u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
         {
-            while (start != end) {
-                uint32_t cp = next(start);
+            while (start < end) {
+                uint32_t cp = utf8::unchecked::next(start);
                 if (cp > 0xffff) { //make a surrogate pair
                     *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
                     *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
@@ -160,7 +160,7 @@ namespace utf8
         octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
         {
             while (start != end)
-                result = append(*(start++), result);
+                result = utf8::unchecked::append(*(start++), result);
 
             return result;
         }
@@ -169,60 +169,59 @@ namespace utf8
         u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
         {
             while (start < end)
-                (*result++) = next(start);
+                (*result++) = utf8::unchecked::next(start);
 
             return result;
         }
 
         // The iterator class
         template <typename octet_iterator>
-          class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> { 
+          class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
             octet_iterator it;
             public:
-            iterator () {};
+            iterator () {}
             explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
             // the default "big three" are OK
             octet_iterator base () const { return it; }
             uint32_t operator * () const
             {
                 octet_iterator temp = it;
-                return next(temp);
+                return utf8::unchecked::next(temp);
             }
-            bool operator == (const iterator& rhs) const 
-            { 
+            bool operator == (const iterator& rhs) const
+            {
                 return (it == rhs.it);
             }
             bool operator != (const iterator& rhs) const
             {
                 return !(operator == (rhs));
             }
-            iterator& operator ++ () 
+            iterator& operator ++ ()
             {
-                std::advance(it, internal::sequence_length(it));
+                ::std::advance(it, utf8::internal::sequence_length(it));
                 return *this;
             }
             iterator operator ++ (int)
             {
                 iterator temp = *this;
-                std::advance(it, internal::sequence_length(it));
+                ::std::advance(it, utf8::internal::sequence_length(it));
                 return temp;
-            }  
+            }
             iterator& operator -- ()
             {
-                prior(it);
+                utf8::unchecked::prior(it);
                 return *this;
             }
             iterator operator -- (int)
             {
                 iterator temp = *this;
-                prior(it);
+                utf8::unchecked::prior(it);
                 return temp;
             }
           }; // class iterator
 
     } // namespace utf8::unchecked
-} // namespace utf8 
+} // namespace utf8
 
 
 #endif // header guard
-
diff --git a/dep/include/zlib/zconf.h b/dep/include/zlib/zconf.h
index 03a9431c8be..9987a775530 100644
--- a/dep/include/zlib/zconf.h
+++ b/dep/include/zlib/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -11,52 +11,145 @@
 /*
  * If you *really* need a unique prefix for all types and library functions,
  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
  */
-#ifdef Z_PREFIX
-#  define deflateInit_          z_deflateInit_
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
+
+/* all linked symbols */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
 #  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd
-#  define inflateInit_          z_inflateInit_
-#  define inflate               z_inflate
-#  define inflateEnd            z_inflateEnd
 #  define deflateInit2_         z_deflateInit2_
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateCopy           z_deflateCopy
-#  define deflateReset          z_deflateReset
+#  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
-#  define deflateBound          z_deflateBound
+#  define deflatePending        z_deflatePending
 #  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzvprintf             z_gzvprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzwrite               z_gzwrite
+#  endif
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetHeader      z_inflateGetHeader
 #  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
 #  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateCopy           z_inflateCopy
-#  define inflateReset          z_inflateReset
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  define uncompress            z_uncompress
-#  define adler32               z_adler32
-#  define crc32                 z_crc32
-#  define get_crc_table         z_get_crc_table
+#  define inflateUndermine      z_inflateUndermine
+#  define inflateResetKeep      z_inflateResetKeep
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#  endif
 #  define zError                z_zError
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
 
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
 #  define alloc_func            z_alloc_func
+#  define charf                 z_charf
 #  define free_func             z_free_func
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
 #  define in_func               z_in_func
+#  define intf                  z_intf
 #  define out_func              z_out_func
-#  define Byte                  z_Byte
 #  define uInt                  z_uInt
-#  define uLong                 z_uLong
-#  define Bytef                 z_Bytef
-#  define charf                 z_charf
-#  define intf                  z_intf
 #  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
 #  define uLongf                z_uLongf
-#  define voidpf                z_voidpf
 #  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
 #endif
 
 #if defined(__MSDOS__) && !defined(MSDOS)
@@ -125,6 +218,12 @@
 #  endif
 #endif
 
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
 /* Some Mac compilers merge all .h files incorrectly: */
 #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
 #  define NO_DUMMY_DECL
@@ -171,6 +270,14 @@
 #  endif
 #endif
 
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have
@@ -284,49 +391,121 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
 #  endif
-#  define z_off_t off_t
 #endif
-#ifndef SEEK_SET
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
+#  define Z_HAVE_UNISTD_H
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
+#  endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
 #endif
+
 #ifndef z_off_t
 #  define z_off_t long
 #endif
 
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#  ifdef FAR
-#    undef FAR
+#if !defined(_WIN32) && defined(Z_LARGE64)
+#  define z_off64_t off64_t
+#else
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
 #  endif
 #endif
 
 /* MVS linker does not support external names larger than 8 bytes */
 #if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(deflateBound,"DEBND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(compressBound,"CMBND")
-#   pragma map(inflate_table,"INTABL")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_copyright,"INCOPY")
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
 #endif
 
 #endif /* ZCONF_H */
diff --git a/dep/include/zlib/zlib.h b/dep/include/zlib/zlib.h
index 022817927ce..3e0c7672ac5 100644
--- a/dep/include/zlib/zlib.h
+++ b/dep/include/zlib/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.3, July 18th, 2005
+  version 1.2.8, April 28th, 2013
 
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -24,8 +24,8 @@
 
 
   The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
 #ifndef ZLIB_H
@@ -37,41 +37,44 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
+#define ZLIB_VERSION "1.2.8"
+#define ZLIB_VERNUM 0x1280
+#define ZLIB_VER_MAJOR 1
+#define ZLIB_VER_MINOR 2
+#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_SUBREVISION 0
 
 /*
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
+    The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed data.
+  This version of the library supports only one compression method (deflation)
+  but other algorithms will be added later and will have the same stream
+  interface.
+
+    Compression can be done in a single step if the buffers are large enough,
+  or can be done by repeated calls of the compression function.  In the latter
+  case, the application must provide more input and/or consume the output
   (providing more output space) before each call.
 
-     The compressed data format used by default by the in-memory functions is
+    The compressed data format used by default by the in-memory functions is
   the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
   around a deflate stream, which is itself documented in RFC 1951.
 
-     The library also supports reading and writing files in gzip (.gz) format
+    The library also supports reading and writing files in gzip (.gz) format
   with an interface similar to that of stdio using the functions that start
   with "gz".  The gzip format is different from the zlib format.  gzip is a
   gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
 
-     This library can optionally read and write gzip streams in memory as well.
+    This library can optionally read and write gzip streams in memory as well.
 
-     The zlib format was designed to be compact and fast for use in memory
+    The zlib format was designed to be compact and fast for use in memory
   and on communications channels.  The gzip format was designed for single-
   file compression on file systems, has a larger header than zlib to maintain
   directory information, and uses a different, slower check method than zlib.
 
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
+    The library does not install any signal handler.  The decoder checks
+  the consistency of the compressed data, so the library should never crash
+  even in case of corrupted input.
 */
 
 typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@@ -80,15 +83,15 @@ typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
 struct internal_state;
 
 typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
+    z_const Bytef *next_in;     /* next input byte */
     uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
+    uLong    total_in;  /* total number of input bytes read so far */
 
     Bytef    *next_out; /* next output byte should be put there */
     uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
+    uLong    total_out; /* total number of bytes output so far */
 
-    char     *msg;      /* last error message, NULL if no error */
+    z_const char *msg;  /* last error message, NULL if no error */
     struct internal_state FAR *state; /* not visible by applications */
 
     alloc_func zalloc;  /* used to allocate the internal state */
@@ -126,45 +129,45 @@ typedef struct gz_header_s {
 typedef gz_header FAR *gz_headerp;
 
 /*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
+     The application must update next_in and avail_in when avail_in has dropped
+   to zero.  It must update next_out and avail_out when avail_out has dropped
+   to zero.  The application must initialize zalloc, zfree and opaque before
+   calling the init function.  All other fields are set by the compression
+   library and must not be updated by the application.
+
+     The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree.  This can be useful for custom
+   memory management.  The compression library attaches no meaning to the
    opaque value.
 
-   zalloc must return Z_NULL if there is not enough memory for the object.
+     zalloc must return Z_NULL if there is not enough memory for the object.
    If zlib is used in a multi-threaded application, zalloc and zfree must be
    thread safe.
 
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
+     On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this if
+   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
+   returned by zalloc for objects of exactly 65536 bytes *must* have their
+   offset normalized to zero.  The default allocation function provided by this
+   library ensures this (see zutil.c).  To reduce memory requirements and avoid
+   any allocation of 64K objects, at the expense of compression ratio, compile
+   the library with -DMAX_WBITS=14 (see zconf.h).
+
+     The fields total_in and total_out can be used for statistics or progress
+   reports.  After compression, total_in holds the total size of the
+   uncompressed data and may be saved for use in the decompressor (particularly
+   if the decompressor wants to decompress everything in a single step).
 */
 
                         /* constants */
 
 #define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
+#define Z_PARTIAL_FLUSH 1
 #define Z_SYNC_FLUSH    2
 #define Z_FULL_FLUSH    3
 #define Z_FINISH        4
 #define Z_BLOCK         5
+#define Z_TREES         6
 /* Allowed flush values; see deflate() and inflate() below for details */
 
 #define Z_OK            0
@@ -176,8 +179,8 @@ typedef gz_header FAR *gz_headerp;
 #define Z_MEM_ERROR    (-4)
 #define Z_BUF_ERROR    (-5)
 #define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
  */
 
 #define Z_NO_COMPRESSION         0
@@ -207,119 +210,141 @@ typedef gz_header FAR *gz_headerp;
 #define zlib_version zlibVersion()
 /* for compatibility with versions < 1.0.2 */
 
+
                         /* basic functions */
 
 ZEXTERN const char * ZEXPORT zlibVersion OF((void));
 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
+   If the first character differs, the library code actually used is not
+   compatible with the zlib.h header file used by the application.  This check
+   is automatically made by deflateInit and inflateInit.
  */
 
 /*
 ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
 
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
+     Initializes the internal stream state for compression.  The fields
+   zalloc, zfree and opaque must be initialized before by the caller.  If
+   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
+   allocation functions.
 
      The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
+   1 gives best speed, 9 gives best compression, 0 gives no compression at all
+   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
+   requests a default compromise between speed and compression (currently
+   equivalent to level 6).
 
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if level is not a valid compression level, or
    Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
+   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
+   if there is no error message.  deflateInit does not perform any compression:
+   this will be done by deflate().
 */
 
 
 ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 /*
     deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
   forced to flush.
 
-    The detailed semantics are as follows. deflate performs one or both of the
+    The detailed semantics are as follows.  deflate performs one or both of the
   following actions:
 
   - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
+    accordingly.  If not all input can be processed (because there is not
     enough room in the output buffer), next_in and avail_in are updated and
     processing will resume at this point for the next call of deflate().
 
   - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
+    accordingly.  This action is forced if the parameter flush is non zero.
     Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
+    should be set only when necessary (in interactive applications).  Some
+    output may be provided even if flush is not set.
+
+    Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating avail_in or avail_out accordingly; avail_out should
+  never be zero before the call.  The application can consume the compressed
+  output when it wants, for example when the output buffer is full (avail_out
+  == 0), or after each call of deflate().  If deflate returns Z_OK and with
+  zero avail_out, it must be called again after making room in the output
+  buffer because there might be more output pending.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumualte before producing output, in order to
+  decide how much data to accumulate before producing output, in order to
   maximize compression.
 
     If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
   flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
+  that the decompressor can get all input data available so far.  (In
+  particular avail_in is zero after the call if enough output space has been
+  provided before the call.) Flushing may degrade compression for some
+  compression algorithms and so it should be used only when necessary.  This
+  completes the current deflate block and follows it with an empty stored block
+  that is three bits plus filler bits to the next byte, followed by four bytes
+  (00 00 ff ff).
+
+    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
+  output buffer, but the output is not aligned to a byte boundary.  All of the
+  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
+  This completes the current deflate block and follows it with an empty fixed
+  codes block that is 10 bits long.  This assures that enough bytes are output
+  in order for the decompressor to finish the block before the empty fixed code
+  block.
+
+    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
+  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
+  seven bits of the current block are held to be written as the next byte after
+  the next deflate block is completed.  In this case, the decompressor may not
+  be provided enough bits at this point in order to complete decompression of
+  the data provided so far to the compressor.  It may need to wait for the next
+  block to be emitted.  This is for advanced applications that need to control
+  the emission of deflate blocks.
 
     If flush is set to Z_FULL_FLUSH, all output is flushed as with
   Z_SYNC_FLUSH, and the compression state is reset so that decompression can
   restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
   compression.
 
     If deflate returns with avail_out == 0, this function must be called again
   with the same value of the flush parameter and more output space (updated
   avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
   avail_out is greater than six to avoid repeated flush markers due to
   avail_out == 0 on return.
 
     If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
+  pending output is flushed and deflate returns with Z_STREAM_END if there was
+  enough output space; if deflate returns with Z_OK, this function must be
   called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
+  more input data, until it returns with Z_STREAM_END or an error.  After
+  deflate has returned Z_STREAM_END, the only possible operations on the stream
+  are deflateReset or deflateEnd.
 
     Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  the value returned by deflateBound (see below). If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
+  is to be done in a single step.  In this case, avail_out must be at least the
+  value returned by deflateBound (see below).  Then deflate is guaranteed to
+  return Z_STREAM_END.  If not enough output space is provided, deflate will
+  not return Z_STREAM_END, and it must be called again as described above.
 
     deflate() sets strm->adler to the adler32 checksum of all input read
   so far (that is, total_in bytes).
 
     deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
+  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
+  binary.  This field is only for information purposes and does not affect the
+  compression algorithm in any manner.
 
     deflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if all input has been
   consumed and all output has been produced (only when flush is set to
   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
+  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
   fatal, and deflate() can be called again with more input and more output
   space to continue compressing.
 */
@@ -328,13 +353,13 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
 /*
      All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
+   This function discards any unprocessed input and does not flush any pending
+   output.
 
      deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
    stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
+   prematurely (some input or output was discarded).  In the error case, msg
+   may be set but then points to a static string (which must not be
    deallocated).
 */
 
@@ -342,10 +367,10 @@ ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
 /*
 ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 
-     Initializes the internal stream state for decompression. The fields
+     Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
+   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
+   exact value depends on the compression method), inflateInit determines the
    compression method from the zlib header and allocates all data structures
    accordingly; otherwise the allocation will be deferred to the first call of
    inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
@@ -353,95 +378,116 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit() does not process any header information -- that is deferred
+   until inflate() is called.
 */
 
 
 ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
 /*
     inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce
+  buffer becomes empty or the output buffer becomes full.  It may introduce
   some output latency (reading input without producing any output) except when
   forced to flush.
 
-  The detailed semantics are as follows. inflate performs one or both of the
+  The detailed semantics are as follows.  inflate performs one or both of the
   following actions:
 
   - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), next_in is updated and processing will
+    resume at this point for the next call of inflate().
 
   - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  if and when it gets to the next deflate block boundary. When decoding the
-  zlib or gzip format, this will cause inflate() to return immediately after
-  the header and before the first block. When doing a raw inflate, inflate()
-  will go ahead and process the first block, and will return when it gets to
-  the end of that block, or when it runs out of data.
+    accordingly.  inflate() provides as much output as possible, until there is
+    no more input data or no more space in the output buffer (see below about
+    the flush parameter).
+
+    Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating the next_* and avail_* values accordingly.  The
+  application can consume the uncompressed output when it wants, for example
+  when the output buffer is full (avail_out == 0), or after each call of
+  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
+  called again after making room in the output buffer because there might be
+  more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
+  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer.  Z_BLOCK requests that inflate()
+  stop if and when it gets to the next deflate block boundary.  When decoding
+  the zlib or gzip format, this will cause inflate() to return immediately
+  after the header and before the first block.  When doing a raw inflate,
+  inflate() will go ahead and process the first block, and will return when it
+  gets to the end of that block, or when it runs out of data.
 
     The Z_BLOCK option assists in appending to or combining deflate streams.
   Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64
-  if inflate() is currently decoding the last block in the deflate stream,
-  plus 128 if inflate() returned immediately after decoding an end-of-block
-  code or decoding the complete header up to just before the first byte of the
-  deflate stream. The end-of-block will not be indicated until all of the
-  uncompressed data from that block has been written to strm->next_out.  The
-  number of unused bits may in general be greater than seven, except when
-  bit 7 of data_type is set, in which case the number of unused bits will be
-  less than eight.
+  number of unused bits in the last byte taken from strm->next_in, plus 64 if
+  inflate() is currently decoding the last block in the deflate stream, plus
+  128 if inflate() returned immediately after decoding an end-of-block code or
+  decoding the complete header up to just before the first byte of the deflate
+  stream.  The end-of-block will not be indicated until all of the uncompressed
+  data from that block has been written to strm->next_out.  The number of
+  unused bits may in general be greater than seven, except when bit 7 of
+  data_type is set, in which case the number of unused bits will be less than
+  eight.  data_type is set as noted here every time inflate() returns for all
+  flush options, and so can be used to determine the amount of currently
+  consumed input in bits.
+
+    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
+  end of each deflate block header is reached, before any actual data in that
+  block is decoded.  This allows the caller to determine the length of the
+  deflate block header for later use in random access within a deflate block.
+  256 is added to the value of strm->data_type when inflate() returns
+  immediately after reaching the end of the deflate block header.
 
     inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster approach
-  may be used for the single inflate() call.
+  error.  However if all decompression is to be performed in a single step (a
+  single call of inflate), the parameter flush should be set to Z_FINISH.  In
+  this case all pending input is processed and all pending output is flushed;
+  avail_out must be large enough to hold all of the uncompressed data for the
+  operation to complete.  (The size of the uncompressed data may have been
+  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  required to perform an inflation in one step.  However it may be used to
+  inform inflate that a faster approach can be used for the single inflate()
+  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
+  stream completes, which reduces inflate's memory footprint.  If the stream
+  does not complete, either because not all of the stream is provided or not
+  enough output space is provided, then a sliding window will be allocated and
+  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
+  been used.
 
      In this implementation, inflate() always flushes as much output as
   possible to the output buffer, and always uses the faster approach on the
-  first call. So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK is used.
+  first call.  So the effects of the flush parameter in this implementation are
+  on the return value of inflate() as noted below, when inflate() returns early
+  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
+  memory for a sliding window when Z_FINISH is used.
 
      If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
+  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
+  strm->adler to the Adler-32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below. At the end of the stream, inflate() checks that its computed adler32
+  below.  At the end of the stream, inflate() checks that its computed adler32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
   only if the checksum is correct.
 
-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically.  Any information
-  contained in the gzip header is not retained, so applications that need that
-  information should instead use raw inflate, see inflateInit2() below, or
-  inflateBack() and perform their own processing of the gzip header and
-  trailer.
+    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically, if requested when
+  initializing with inflateInit2().  Any information contained in the gzip
+  header is not retained, so applications that need that information should
+  instead use raw inflate, see inflateInit2() below, or inflateBack() and
+  perform their own processing of the gzip header and trailer.  When processing
+  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
+  producted so far.  The CRC-32 is checked against the gzip trailer.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
@@ -449,27 +495,28 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
   corrupted (input stream not conforming to the zlib format or incorrect check
   value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
+  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
   Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
+  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
   inflate() can be called again with more input and more output space to
-  continue decompressing. If Z_DATA_ERROR is returned, the application may then
-  call inflateSync() to look for a good compression block if a partial recovery
-  of the data is desired.
+  continue decompressing.  If Z_DATA_ERROR is returned, the application may
+  then call inflateSync() to look for a good compression block if a partial
+  recovery of the data is desired.
 */
 
 
 ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
 /*
      All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
+   This function discards any unprocessed input and does not flush any pending
+   output.
 
      inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
+   was inconsistent.  In the error case, msg may be set but then points to a
    static string (which must not be deallocated).
 */
 
+
                         /* Advanced functions */
 
 /*
@@ -484,55 +531,57 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
                                      int  memLevel,
                                      int  strategy));
 
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
+     This is another version of deflateInit with more compression options.  The
+   fields next_in, zalloc, zfree and opaque must be initialized before by the
+   caller.
 
-     The method parameter is the compression method. It must be Z_DEFLATED in
+     The method parameter is the compression method.  It must be Z_DEFLATED in
    this version of the library.
 
      The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer). It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
+   (the size of the history buffer).  It should be in the range 8..15 for this
+   version of the library.  Larger values of this parameter result in better
+   compression at the expense of memory usage.  The default value is 15 if
    deflateInit is used instead.
 
-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-   determines the window size. deflate() will then generate raw deflate data
+     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
+   determines the window size.  deflate() will then generate raw deflate data
    with no zlib header or trailer, and will not compute an adler32 check value.
 
-     windowBits can also be greater than 15 for optional gzip encoding. Add
+     windowBits can also be greater than 15 for optional gzip encoding.  Add
    16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper. The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero),
-   no header crc, and the operating system will be set to 255 (unknown).  If a
+   compressed data instead of a zlib wrapper.  The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero), no
+   header crc, and the operating system will be set to 255 (unknown).  If a
    gzip stream is being written, strm->adler is a crc32 instead of an adler32.
 
      The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
+   for the internal compression state.  memLevel=1 uses minimum memory but is
+   slow and reduces compression ratio; memLevel=9 uses maximum memory for
+   optimal speed.  The default value is 8.  See zconf.h for total memory usage
+   as a function of windowBits and memLevel.
 
-     The strategy parameter is used to tune the compression algorithm. Use the
+     The strategy parameter is used to tune the compression algorithm.  Use the
    value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
    filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
    string match), or Z_RLE to limit match distances to one (run-length
-   encoding). Filtered data consists mostly of small values with a somewhat
-   random distribution. In this case, the compression algorithm is tuned to
-   compress them better. The effect of Z_FILTERED is to force more Huffman
+   encoding).  Filtered data consists mostly of small values with a somewhat
+   random distribution.  In this case, the compression algorithm is tuned to
+   compress them better.  The effect of Z_FILTERED is to force more Huffman
    coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
-   parameter only affects the compression ratio but not the correctness of the
-   compressed output even if it is not set appropriately.  Z_FIXED prevents the
-   use of dynamic Huffman codes, allowing for a simpler decoder for special
-   applications.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
+   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
+   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
+   strategy parameter only affects the compression ratio but not the
+   correctness of the compressed output even if it is not set appropriately.
+   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
+   decoder for special applications.
+
+     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
+   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
+   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
+   set to null if there is no error message.  deflateInit2 does not perform any
+   compression: this will be done by deflate().
 */
 
 ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
@@ -540,38 +589,43 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
                                              uInt  dictLength));
 /*
      Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
+   without producing any compressed output.  When using the zlib format, this
+   function must be called immediately after deflateInit, deflateInit2 or
+   deflateReset, and before any call of deflate.  When doing raw deflate, this
+   function must be called either before any call of deflate, or immediately
+   after the completion of a deflate block, i.e. after all input has been
+   consumed and all output has been delivered when using any of the flush
+   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
+   compressor and decompressor must use exactly the same dictionary (see
+   inflateSetDictionary).
 
      The dictionary should consist of strings (byte sequences) that are likely
    to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
+   used strings preferably put towards the end of the dictionary.  Using a
    dictionary is most useful when the data to be compressed is short and can be
    predicted with good accuracy; the data can then be compressed better than
    with the default empty dictionary.
 
      Depending on the size of the compression data structures selected by
    deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front. In addition, the
-   current implementation of deflate will use at most the window size minus
-   262 bytes of the provided dictionary.
+   discarded, for example if the dictionary is larger than the window size
+   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
+   useful should be put at the end of the dictionary, not at the front.  In
+   addition, the current implementation of deflate will use at most the window
+   size minus 262 bytes of the provided dictionary.
 
      Upon return of this function, strm->adler is set to the adler32 value
    of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The adler32 value
+   which dictionary has been used by the compressor.  (The adler32 value
    applies to the whole dictionary even if only a subset of the dictionary is
    actually used by the compressor.) If a raw deflate was requested, then the
    adler32 value is not computed and strm->adler is not set.
 
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
+   or if not at a block boundary for raw deflate).  deflateSetDictionary does
+   not perform any compression: this will be done by deflate().
 */
 
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
@@ -581,26 +635,26 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
 
      This function can be useful when several compression strategies will be
    tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
+   data with a filter.  The streams that will be discarded should then be freed
    by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
+   compression state which can be quite large, so this strategy is slow and can
+   consume lots of memory.
 
      deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
    destination.
 */
 
 ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
 /*
      This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
+   but does not free and reallocate all the internal compression state.  The
+   stream will keep the same compression level and any other attributes that
+   may have been set by deflateInit2.
 
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
+     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
 */
 
 ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
@@ -610,18 +664,18 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
      Dynamically update the compression level and compression strategy.  The
    interpretation of level and strategy is as in deflateInit2.  This can be
    used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
+   to switch to a different kind of input data requiring a different strategy.
+   If the compression level is changed, the input available so far is
+   compressed with the old level (and may be flushed); the new level will take
+   effect only at the next call of deflate().
 
      Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
+   a call of deflate(), since the currently available input may have to be
+   compressed and flushed.  In particular, strm->avail_out must be non-zero.
 
      deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
+   strm->avail_out was zero.
 */
 
 ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
@@ -645,31 +699,53 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
                                        uLong sourceLen));
 /*
      deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit()
-   or deflateInit2().  This would be used to allocate an output buffer
-   for deflation in a single pass, and so would be called before deflate().
+   deflation of sourceLen bytes.  It must be called after deflateInit() or
+   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
+   to allocate an output buffer for deflation in a single pass, and so would be
+   called before deflate().  If that first deflate() call is provided the
+   sourceLen input bytes, an output buffer allocated to the size returned by
+   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
+   to return Z_STREAM_END.  Note that it is possible for the compressed size to
+   be larger than the value returned by deflateBound() if flush options other
+   than Z_FINISH or Z_NO_FLUSH are used.
 */
 
+ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
+                                       unsigned *pending,
+                                       int *bits));
+/*
+     deflatePending() returns the number of bytes and bits of output that have
+   been generated, but not yet provided in the available output.  The bytes not
+   provided would be due to the available output space having being consumed.
+   The number of bits of output not provided are between 0 and 7, where they
+   await more bits to join them in order to fill out a full byte.  If pending
+   or bits are Z_NULL, then those values are not set.
+
+     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+ */
+
 ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
                                      int bits,
                                      int value));
 /*
      deflatePrime() inserts bits in the deflate output stream.  The intent
-  is that this function is used to start off the deflate output with the
-  bits leftover from a previous deflate stream when appending to it.  As such,
-  this function can only be used for raw deflate, and must be used before the
-  first deflate() call after a deflateInit2() or deflateReset().  bits must be
-  less than or equal to 16, and that many of the least significant bits of
-  value will be inserted in the output.
-
-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
+   is that this function is used to start off the deflate output with the bits
+   leftover from a previous deflate stream when appending to it.  As such, this
+   function can only be used for raw deflate, and must be used before the first
+   deflate() call after a deflateInit2() or deflateReset().  bits must be less
+   than or equal to 16, and that many of the least significant bits of value
+   will be inserted in the output.
+
+     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
+   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
+   source stream state was inconsistent.
 */
 
 ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
                                          gz_headerp head));
 /*
-      deflateSetHeader() provides gzip header information for when a gzip
+     deflateSetHeader() provides gzip header information for when a gzip
    stream is requested by deflateInit2().  deflateSetHeader() may be called
    after deflateInit2() or deflateReset() and before the first call of
    deflate().  The text, time, os, extra field, name, and comment information
@@ -682,11 +758,11 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
    1.3.x) do not support header crc's, and will report that it is a "multi-part
    gzip file" and give up.
 
-      If deflateSetHeader is not used, the default gzip header has text false,
+     If deflateSetHeader is not used, the default gzip header has text false,
    the time set to zero, and os set to 255, with no extra, name, or comment
    fields.  The gzip header is returned to the default state by deflateReset().
 
-      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
 */
 
@@ -694,43 +770,50 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
 ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
                                      int  windowBits));
 
-     This is another version of inflateInit with an extra parameter. The
+     This is another version of inflateInit with an extra parameter.  The
    fields next_in, avail_in, zalloc, zfree and opaque must be initialized
    before by the caller.
 
      The windowBits parameter is the base two logarithm of the maximum window
    size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. windowBits must be greater than or equal to the windowBits value
+   this version of the library.  The default value is 15 if inflateInit is used
+   instead.  windowBits must be greater than or equal to the windowBits value
    provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used. If a compressed stream with a larger window
+   deflateInit2() was not used.  If a compressed stream with a larger window
    size is given as input, inflate() will return with the error code
    Z_DATA_ERROR instead of trying to allocate a larger window.
 
-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-   determines the window size. inflate() will then process raw deflate data,
+     windowBits can also be zero to request that inflate use the window size in
+   the zlib header of the compressed stream.
+
+     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
+   determines the window size.  inflate() will then process raw deflate data,
    not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream. This
+   looking for any check values for comparison at the end of the stream.  This
    is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values. If a custom
+   such as zip.  Those formats provide their own check values.  If a custom
    format is developed using the raw deflate format for compressed data, it is
    recommended that a check value such as an adler32 or a crc32 be applied to
    the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is. Note that comments
+   most applications, the zlib format should be used as is.  Note that comments
    above on the use in deflateInit2() applies to the magnitude of windowBits.
 
-     windowBits can also be greater than 15 for optional gzip decoding. Add
+     windowBits can also be greater than 15 for optional gzip decoding.  Add
    32 to windowBits to enable zlib and gzip decoding with automatic header
    detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
-   a crc32 instead of an adler32.
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
+   crc32 instead of an adler32.
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
-   is set to null if there is no error message.  inflateInit2 does not perform
-   any decompression apart from reading the zlib header if present: this will
-   be done by inflate(). (So next_in and avail_in may be modified, but next_out
-   and avail_out are unchanged.)
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit2 does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit2() does not process any header information -- that is
+   deferred until inflate() is called.
 */
 
 ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
@@ -738,36 +821,56 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
                                              uInt  dictLength));
 /*
      Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
+   sequence.  This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
    can be determined from the adler32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  The application must insure that the
-   dictionary that was used for compression is provided.
+   deflateSetDictionary).  For raw inflate, this function can be called at any
+   time to set the dictionary.  If the provided dictionary is smaller than the
+   window and there is already data in the window, then the provided dictionary
+   will amend what's there.  The application must insure that the dictionary
+   that was used for compression is provided.
 
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value). inflateSetDictionary does not
+   expected one (incorrect adler32 value).  inflateSetDictionary does not
    perform any decompression: this will be done by subsequent calls of
    inflate().
 */
 
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
 /*
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
+     Returns the sliding dictionary being maintained by inflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If inflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
 
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+     Skips invalid compressed data until a possible full flush point (see above
+   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
+   available input is skipped.  No output is provided.
+
+     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+   All full flush points have this pattern, but not all occurrences of this
+   pattern are full flush points.
+
+     inflateSync returns Z_OK if a possible full flush point has been found,
+   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
+   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
+   In the success case, the application may save the current current value of
+   total_in which indicates where valid compressed data was found.  In the
+   error case, the application may repeatedly call inflateSync, providing more
+   input each time, until success or end of the input data.
 */
 
 ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
@@ -782,18 +885,30 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
 
      inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
    destination.
 */
 
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
+   but does not free and reallocate all the internal decompression state.  The
+   stream will keep attributes that may have been set by inflateInit2.
 
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
+     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
+                                      int windowBits));
+/*
+     This function is the same as inflateReset, but it also permits changing
+   the wrap and window size requests.  The windowBits parameter is interpreted
+   the same as it is for inflateInit2.
+
+     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
+   the windowBits parameter is invalid.
 */
 
 ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
@@ -801,54 +916,87 @@ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
                                      int value));
 /*
      This function inserts bits in the inflate input stream.  The intent is
-  that this function is used to start inflating at a bit position in the
-  middle of a byte.  The provided bits will be used before any bytes are used
-  from next_in.  This function should only be used with raw inflate, and
-  should be used before the first inflate() call after inflateInit2() or
-  inflateReset().  bits must be less than or equal to 16, and that many of the
-  least significant bits of value will be inserted in the input.
-
-      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   that this function is used to start inflating at a bit position in the
+   middle of a byte.  The provided bits will be used before any bytes are used
+   from next_in.  This function should only be used with raw inflate, and
+   should be used before the first inflate() call after inflateInit2() or
+   inflateReset().  bits must be less than or equal to 16, and that many of the
+   least significant bits of value will be inserted in the input.
+
+     If bits is negative, then the input stream bit buffer is emptied.  Then
+   inflatePrime() can be called again to put bits in the buffer.  This is used
+   to clear out bits leftover after feeding inflate a block description prior
+   to feeding inflate codes.
+
+     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
 */
 
+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+/*
+     This function returns two values, one in the lower 16 bits of the return
+   value, and the other in the remaining upper bits, obtained by shifting the
+   return value down 16 bits.  If the upper value is -1 and the lower value is
+   zero, then inflate() is currently decoding information outside of a block.
+   If the upper value is -1 and the lower value is non-zero, then inflate is in
+   the middle of a stored block, with the lower value equaling the number of
+   bytes from the input remaining to copy.  If the upper value is not -1, then
+   it is the number of bits back from the current bit position in the input of
+   the code (literal or length/distance pair) currently being processed.  In
+   that case the lower value is the number of bytes already emitted for that
+   code.
+
+     A code is being processed if inflate is waiting for more input to complete
+   decoding of the code, or if it has completed decoding but is waiting for
+   more output space to write the literal or match data.
+
+     inflateMark() is used to mark locations in the input data for random
+   access, which may be at bit positions, and to note those cases where the
+   output of a code may span boundaries of random access blocks.  The current
+   location in the input stream can be determined from avail_in and data_type
+   as noted in the description for the Z_BLOCK flush parameter for inflate.
+
+     inflateMark returns the value noted above or -1 << 16 if the provided
+   source stream state was inconsistent.
+*/
+
 ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
                                          gz_headerp head));
 /*
-      inflateGetHeader() requests that gzip header information be stored in the
+     inflateGetHeader() requests that gzip header information be stored in the
    provided gz_header structure.  inflateGetHeader() may be called after
    inflateInit2() or inflateReset(), and before the first call of inflate().
    As inflate() processes the gzip stream, head->done is zero until the header
    is completed, at which time head->done is set to one.  If a zlib stream is
    being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
-   force inflate() to return immediately after header processing is complete
-   and before any actual data is decompressed.
+   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
+   used to force inflate() to return immediately after header processing is
+   complete and before any actual data is decompressed.
 
-      The text, time, xflags, and os fields are filled in with the gzip header
+     The text, time, xflags, and os fields are filled in with the gzip header
    contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
+   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
    contains the maximum number of bytes to write to extra.  Once done is true,
    extra_len contains the actual extra field length, and extra contains the
    extra field, or that field truncated if extra_max is less than extra_len.
    If name is not Z_NULL, then up to name_max characters are written there,
    terminated with a zero unless the length is greater than name_max.  If
    comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When
-   any of extra, name, or comment are not Z_NULL and the respective field is
-   not present in the header, then that field is set to Z_NULL to signal its
+   terminated with a zero unless the length is greater than comm_max.  When any
+   of extra, name, or comment are not Z_NULL and the respective field is not
+   present in the header, then that field is set to Z_NULL to signal its
    absence.  This allows the use of deflateSetHeader() with the returned
    structure to duplicate the header.  However if those fields are set to
    allocated memory, then the application will need to save those pointers
    elsewhere so that they can be eventually freed.
 
-      If inflateGetHeader is not used, then the header information is simply
+     If inflateGetHeader is not used, then the header information is simply
    discarded.  The header is always checked for validity, including the header
    CRC if present.  inflateReset() will reset the process to discard the header
    information.  The application would need to call inflateGetHeader() again to
    retrieve the header from the next gzip stream.
 
-      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
 */
 
@@ -869,12 +1017,13 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
      See inflateBack() for the usage of these routines.
 
      inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-   be allocated, or Z_VERSION_ERROR if the version of the library does not
-   match the version of the header file.
+   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
+   allocated, or Z_VERSION_ERROR if the version of the library does not match
+   the version of the header file.
 */
 
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef unsigned (*in_func) OF((void FAR *,
+                                z_const unsigned char FAR * FAR *));
 typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
 
 ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
@@ -882,24 +1031,25 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
                                     out_func out, void FAR *out_desc));
 /*
      inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
+   interface for input and output.  This is potentially more efficient than
+   inflate() for file i/o applications, in that it avoids copying between the
+   output and the sliding window by simply making the window itself the output
+   buffer.  inflate() can be faster on modern CPUs when used with large
+   buffers.  inflateBack() trusts the application to not change the output
+   buffer passed by the output function, at least until inflateBack() returns.
 
      inflateBackInit() must be called first to allocate the internal state
    and to initialize the state with the user-provided window buffer.
    inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free
-   the allocated state.
+   deflate stream with each call.  inflateBackEnd() is then called to free the
+   allocated state.
 
      A raw deflate stream is one with no zlib or gzip header or trailer.
    This routine would normally be used in a utility that reads zip or gzip
    files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects
-   only the raw deflate stream to decompress.  This is different from the
-   normal behavior of inflate(), which expects either a zlib or gzip header and
+   header and process the trailer on its own, hence this routine expects only
+   the raw deflate stream to decompress.  This is different from the normal
+   behavior of inflate(), which expects either a zlib or gzip header and
    trailer around the deflate stream.
 
      inflateBack() uses two subroutines supplied by the caller that are then
@@ -925,7 +1075,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
    immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
    must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
+   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
 
      The in_desc and out_desc parameters of inflateBack() is passed as the
    first parameter of in() and out() respectively when they are called.  These
@@ -935,15 +1085,15 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
      On return, inflateBack() will set strm->next_in and strm->avail_in to
    pass back any unused input that was provided by the last in() call.  The
    return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format
-   error in the deflate stream (in which case strm->msg is set to indicate the
-   nature of the error), or Z_STREAM_ERROR if the stream was not properly
-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
-   distinguished using strm->next_in which will be Z_NULL only if in() returned
-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
-   out() returning non-zero.  (in() will always be called before out(), so
-   strm->next_in is assured to be defined if out() returns non-zero.)  Note
-   that inflateBack() cannot return Z_OK.
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
+   in the deflate stream (in which case strm->msg is set to indicate the nature
+   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
+   In the case of Z_BUF_ERROR, an input or output error can be distinguished
+   using strm->next_in which will be Z_NULL only if in() returned an error.  If
+   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
+   non-zero.  (in() will always be called before out(), so strm->next_in is
+   assured to be defined if out() returns non-zero.) Note that inflateBack()
+   cannot return Z_OK.
 */
 
 ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
@@ -995,27 +1145,27 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
      27-31: 0 (reserved)
  */
 
+#ifndef Z_SOLO
 
                         /* utility functions */
 
 /*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
+     The following utility functions are implemented on top of the basic
+   stream-oriented functions.  To simplify the interface, some default options
+   are assumed (compression level and memory usage, standard memory allocation
+   functions).  The source code of these utility functions can be modified if
+   you need special options.
 */
 
 ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
                                  const Bytef *source, uLong sourceLen));
 /*
      Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least the value returned
-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
    compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
+
      compress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
    buffer.
@@ -1025,11 +1175,11 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
                                   const Bytef *source, uLong sourceLen,
                                   int level));
 /*
-     Compresses the source buffer into the destination buffer. The level
+     Compresses the source buffer into the destination buffer.  The level
    parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
+   length of the source buffer.  Upon entry, destLen is the total size of the
    destination buffer, which must be at least the value returned by
-   compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
    compressed buffer.
 
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
@@ -1040,159 +1190,255 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
 ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
 /*
      compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before
-   a compress() or compress2() call to allocate the destination buffer.
+   compress() or compress2() on sourceLen bytes.  It would be used before a
+   compress() or compress2() call to allocate the destination buffer.
 */
 
 ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
                                    const Bytef *source, uLong sourceLen));
 /*
      Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data.  (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit, destLen
+   is the actual size of the uncompressed buffer.
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
+   the case where there is not enough room, uncompress() will fill the output
+   buffer with the uncompressed data up to that point.
 */
 
+                        /* gzip file access functions */
 
-typedef voidp gzFile;
+/*
+     This library supports reading and writing files in gzip (.gz) format with
+   an interface similar to that of stdio, using the functions that start with
+   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
+   wrapper, documented in RFC 1952, wrapped around a deflate stream.
+*/
+
+typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
 
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
 /*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h", or 'R' for run-length encoding
-   as in "wb1R". (See the description of deflateInit2 for more information
-   about the strategy parameter.)
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+
+     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
+   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
+   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
+   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
+   for fixed code compression as in "wb9F".  (See the description of
+   deflateInit2 for more information about the strategy parameter.)  'T' will
+   request transparent writing or appending with no compression and not using
+   the gzip format.
+
+     "a" can be used instead of "w" to request that the gzip stream that will
+   be written be appended to the file.  "+" will result in an error, since
+   reading and writing to the same gzip file is not supported.  The addition of
+   "x" when writing will create the file exclusively, which fails if the file
+   already exists.  On systems that support it, the addition of "e" when
+   reading or writing will set the flag to close the file on an execve() call.
+
+     These functions, as well as gzip, will read and decode a sequence of gzip
+   streams in a file.  The append function of gzopen() can be used to create
+   such a file.  (Also see gzflush() for another way to do this.)  When
+   appending, gzopen does not test whether the file begins with a gzip stream,
+   nor does it look for the end of the gzip streams to begin appending.  gzopen
+   will simply append a gzip stream to the existing file.
 
      gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
+   case gzread will directly read from the file without decompression.  When
+   reading, this will be detected automatically by looking for the magic two-
+   byte gzip header.
+
+     gzopen returns NULL if the file could not be opened, if there was
+   insufficient memory to allocate the gzFile state, or if an invalid mode was
+   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
+   errno can be checked to determine if the reason gzopen failed was that the
+   file could not be opened.
+*/
 
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
+   are obtained from calls like open, dup, creat, pipe or fileno (if the file
+   has been previously opened with fopen).  The mode parameter is as in gzopen.
+
+     The next call of gzclose on the returned gzFile will also close the file
+   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
+   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
+   mode);.  The duplicated descriptor should be saved to avoid a leak, since
+   gzdopen does not close fd if it fails.  If you are using fileno() to get the
+   file descriptor from a FILE *, then you will have to use dup() to avoid
+   double-close()ing the file descriptor.  Both gzclose() and fclose() will
+   close the associated file descriptor, so they need to have different file
+   descriptors.
+
+     gzdopen returns NULL if there was insufficient memory to allocate the
+   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
+   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
+   used until the next gz* read, write, seek, or close operation, so gzdopen
+   will not detect if fd is invalid (unless fd is -1).
+*/
 
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
 /*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
+     Set the internal buffer size used by this library's functions.  The
+   default buffer size is 8192 bytes.  This function must be called after
+   gzopen() or gzdopen(), and before any other calls that read or write the
+   file.  The buffer memory allocation is always deferred to the first read or
+   write.  Two buffers are allocated, either both of the specified size when
+   writing, or one of the specified size and the other twice that size when
+   reading.  A larger buffer size of, for example, 64K or 128K bytes will
+   noticeably increase the speed of decompression (reading).
+
+     The new buffer size also affects the maximum length for gzprintf().
+
+     gzbuffer() returns 0 on success, or -1 on failure, such as being called
+   too late.
 */
 
 ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 /*
-     Dynamically update the compression level or strategy. See the description
+     Dynamically update the compression level or strategy.  See the description
    of deflateInit2 for the meaning of these parameters.
+
      gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
    opened for writing.
 */
 
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
 /*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
+     Reads the given number of uncompressed bytes from the compressed file.  If
+   the input file is not in gzip format, gzread copies the given number of
+   bytes into the buffer directly from the file.
+
+     After reaching the end of a gzip stream in the input, gzread will continue
+   to read, looking for another gzip stream.  Any number of gzip streams may be
+   concatenated in the input file, and will all be decompressed by gzread().
+   If something other than a gzip stream is encountered after a gzip stream,
+   that remaining trailing garbage is ignored (and no error is returned).
+
+     gzread can be used to read a gzip file that is being concurrently written.
+   Upon reaching the end of the input, gzread will return with the available
+   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
+   gzclearerr can be used to clear the end of file indicator in order to permit
+   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
+   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
+   middle of a gzip stream.  Note that gzread does not return -1 in the event
+   of an incomplete gzip stream.  This error is deferred until gzclose(), which
+   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
+   stream.  Alternatively, gzerror can be used before gzclose to detect this
+   case.
+
+     gzread returns the number of uncompressed bytes actually read, less than
+   len for end of file, or -1 for error.
+*/
 
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-                                   voidpc buf, unsigned len));
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
+                                voidpc buf, unsigned len));
 /*
      Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
+   gzwrite returns the number of uncompressed bytes written or 0 in case of
+   error.
 */
 
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
 /*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).  The number of
-   uncompressed bytes written is limited to 4095. The caller should assure that
-   this limit is not exceeded. If it is exceeded, then gzprintf() will return
-   return an error (0) with nothing written. In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
+     Converts, formats, and writes the arguments to the compressed file under
+   control of the format string, as in fprintf.  gzprintf returns the number of
+   uncompressed bytes actually written, or 0 in case of error.  The number of
+   uncompressed bytes written is limited to 8191, or one less than the buffer
+   size given to gzbuffer().  The caller should assure that this limit is not
+   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
+   nothing written.  In this case, there may also be a buffer overflow with
+   unpredictable consequences, which is possible only if zlib was compiled with
+   the insecure functions sprintf() or vsprintf() because the secure snprintf()
+   or vsnprintf() functions were not available.  This can be determined using
+   zlibCompileFlags().
 */
 
 ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
 /*
-      Writes the given null-terminated string to the compressed file, excluding
+     Writes the given null-terminated string to the compressed file, excluding
    the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
+
+     gzputs returns the number of characters written, or -1 in case of error.
 */
 
 ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
 /*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
+     Reads bytes from the compressed file until len-1 characters are read, or a
+   newline character is read and transferred to buf, or an end-of-file
+   condition is encountered.  If any characters are read or if len == 1, the
+   string is terminated with a null character.  If no characters are read due
+   to an end-of-file or len < 1, then the buffer is left untouched.
+
+     gzgets returns buf which is a null-terminated string, or it returns NULL
+   for end-of-file or in case of error.  If there was an error, the contents at
+   buf are indeterminate.
 */
 
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
 /*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
+     Writes c, converted to an unsigned char, into the compressed file.  gzputc
+   returns the value that was written, or -1 in case of error.
 */
 
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
 /*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
+     Reads one byte from the compressed file.  gzgetc returns this byte or -1
+   in case of end of file or error.  This is implemented as a macro for speed.
+   As such, it does not do all of the checking the other functions do.  I.e.
+   it does not check to see if file is NULL, nor whether the structure file
+   points to has been clobbered or not.
 */
 
-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
 /*
-      Push one character back onto the stream to be read again later.
-   Only one character of push-back is allowed.  gzungetc() returns the
-   character pushed, or -1 on failure.  gzungetc() will fail if a
-   character has been pushed but not read yet, or if c is -1. The pushed
-   character will be discarded if the stream is repositioned with gzseek()
-   or gzrewind().
+     Push one character back onto the stream to be read as the first character
+   on the next read.  At least one character of push-back is allowed.
+   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
+   fail if c is -1, and may fail if a character has been pushed but not read
+   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
+   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
+   The pushed character will be discarded if the stream is repositioned with
+   gzseek() or gzrewind().
 */
 
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
 /*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
+     Flushes all pending output into the compressed file.  The parameter flush
+   is as in the deflate() function.  The return value is the zlib error number
+   (see function gzerror below).  gzflush is only permitted when writing.
+
+     If the flush parameter is Z_FINISH, the remaining data is written and the
+   gzip stream is completed in the output.  If gzwrite() is called again, a new
+   gzip stream will be started in the output.  gzread() is able to read such
+   concatented gzip streams.
+
+     gzflush should be called only when strictly necessary because it will
+   degrade compression if called too often.
 */
 
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-                                      z_off_t offset, int whence));
 /*
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+                                   z_off_t offset, int whence));
+
+     Sets the starting position for the next gzread or gzwrite on the given
+   compressed file.  The offset represents a number of bytes in the
+   uncompressed data stream.  The whence parameter is defined as in lseek(2);
    the value SEEK_END is not supported.
+
      If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
+   extremely slow.  If the file is opened for writing, only forward seeks are
    supported; gzseek then compresses a sequence of zeroes up to the new
    starting position.
 
-      gzseek returns the resulting offset location as measured in bytes from
+     gzseek returns the resulting offset location as measured in bytes from
    the beginning of the uncompressed stream, or -1 in case of error, in
    particular if the file is opened for writing and the new starting position
    would be before the current position.
@@ -1202,68 +1448,134 @@ ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
 /*
      Rewinds the given file. This function is supported only for reading.
 
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
 */
 
+/*
 ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+
+     Returns the starting position for the next gzread or gzwrite on the given
+   compressed file.  This position represents a number of bytes in the
+   uncompressed data stream, and is zero when starting, even if appending or
+   reading a gzip stream from the middle of a file using gzdopen().
+
+     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
 /*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
 
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+     Returns the current offset in the file being read or written.  This offset
+   includes the count of bytes that precede the gzip stream, for example when
+   appending or when using gzdopen() for reading.  When reading, the offset
+   does not include as yet unused buffered input.  This information can be used
+   for a progress indicator.  On error, gzoffset() returns -1.
 */
 
 ZEXTERN int ZEXPORT gzeof OF((gzFile file));
 /*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
+     Returns true (1) if the end-of-file indicator has been set while reading,
+   false (0) otherwise.  Note that the end-of-file indicator is set only if the
+   read tried to go past the end of the input, but came up short.  Therefore,
+   just like feof(), gzeof() may return false even if there is no more data to
+   read, in the event that the last read request was for the exact number of
+   bytes remaining in the input file.  This will happen if the input file size
+   is an exact multiple of the buffer size.
+
+     If gzeof() returns true, then the read functions will return no more data,
+   unless the end-of-file indicator is reset by gzclearerr() and the input file
+   has grown since the previous end of file was detected.
 */
 
 ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
 /*
-     Returns 1 if file is being read directly without decompression, otherwise
-   zero.
+     Returns true (1) if file is being copied directly while reading, or false
+   (0) if file is a gzip stream being decompressed.
+
+     If the input file is empty, gzdirect() will return true, since the input
+   does not contain a gzip stream.
+
+     If gzdirect() is used immediately after gzopen() or gzdopen() it will
+   cause buffers to be allocated to allow reading the file to determine if it
+   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
+   gzdirect().
+
+     When writing, gzdirect() returns true (1) if transparent writing was
+   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
+   gzdirect() is not needed when writing.  Transparent writing must be
+   explicitly requested, so the application already knows the answer.  When
+   linking statically, using gzdirect() will include all of the zlib code for
+   gzip file reading and decompression, which may not be desired.)
 */
 
 ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
 /*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
+     Flushes all pending output if necessary, closes the compressed file and
+   deallocates the (de)compression state.  Note that once file is closed, you
+   cannot call gzerror with file, since its structures have been deallocated.
+   gzclose must not be called more than once on the same file, just as free
+   must not be called more than once on the same allocation.
+
+     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
+   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
+   last read ended in the middle of a gzip stream, or Z_OK on success.
+*/
+
+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+/*
+     Same as gzclose(), but gzclose_r() is only for use when reading, and
+   gzclose_w() is only for use when writing or appending.  The advantage to
+   using these instead of gzclose() is that they avoid linking in zlib
+   compression or decompression code that is not used when only reading or only
+   writing respectively.  If gzclose() is used, then both compression and
+   decompression code will be included the application when linking to a static
+   zlib library.
 */
 
 ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
 /*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
+     Returns the error message for the last error which occurred on the given
+   compressed file.  errnum is set to zlib error number.  If an error occurred
+   in the file system and not in the compression library, errnum is set to
+   Z_ERRNO and the application may consult errno to get the exact error code.
+
+     The application must not modify the returned string.  Future calls to
+   this function may invalidate the previously returned string.  If file is
+   closed, then the string previously returned by gzerror will no longer be
+   available.
+
+     gzerror() should be used to distinguish errors from end-of-file for those
+   functions above that do not distinguish those cases in their return values.
 */
 
 ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
 /*
-     Clears the error and end-of-file flags for file. This is analogous to the
-   clearerr() function in stdio. This is useful for continuing to read a gzip
+     Clears the error and end-of-file flags for file.  This is analogous to the
+   clearerr() function in stdio.  This is useful for continuing to read a gzip
    file that is being written concurrently.
 */
 
+#endif /* !Z_SOLO */
+
                         /* checksum functions */
 
 /*
      These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
+   anyway because they might be useful in applications using the compression
+   library.
 */
 
 ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
 /*
      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
+   return the updated checksum.  If buf is Z_NULL, this function returns the
+   required initial value for the checksum.
+
+     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+   much faster.
+
+   Usage example:
 
      uLong adler = adler32(0L, Z_NULL, 0);
 
@@ -1273,21 +1585,25 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
      if (adler != original_adler) error();
 */
 
+/*
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
                                           z_off_t len2));
-/*
+
      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
    each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
+   that the z_off_t type (like off_t) is a signed integer.  If len2 is
+   negative, the result has no meaning or utility.
 */
 
 ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
 /*
      Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32. If buf is NULL, this function returns the required initial
-   value for the for the crc. Pre- and post-conditioning (one's complement) is
+   updated CRC-32.  If buf is Z_NULL, this function returns the required
+   initial value for the crc.  Pre- and post-conditioning (one's complement) is
    performed within this function so it shouldn't be done by the application.
+
    Usage example:
 
      uLong crc = crc32(0L, Z_NULL, 0);
@@ -1298,9 +1614,9 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
      if (crc != original_crc) error();
 */
 
+/*
 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
 
-/*
      Combine two CRC-32 check values into one.  For two sequences of bytes,
    seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
    calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
@@ -1329,26 +1645,121 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
                                          const char *version,
                                          int stream_size));
 #define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
 #define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
 #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
         deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
 #define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                      (int)sizeof(z_stream))
 #define inflateBackInit(strm, windowBits, window) \
         inflateBackInit_((strm), (windowBits), (window), \
-        ZLIB_VERSION, sizeof(z_stream))
+                      ZLIB_VERSION, (int)sizeof(z_stream))
+
+#ifndef Z_SOLO
+
+/* gzgetc() macro and its supporting function and exposed data structure.  Note
+ * that the real internal state is much larger than the exposed structure.
+ * This abbreviated structure exposes just enough for the gzgetc() macro.  The
+ * user should not mess with these exposed elements, since their names or
+ * behavior could change in the future, perhaps even capriciously.  They can
+ * only be used by the gzgetc() macro.  You have been warned.
+ */
+struct gzFile_s {
+    unsigned have;
+    unsigned char *next;
+    z_off64_t pos;
+};
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#  define z_gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#else
+#  define gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#endif
 
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
+ * both are true, the application gets the *64 functions, and the regular
+ * functions are changed to 64 bits) -- in case these are set on systems
+ * without large file support, _LFS64_LARGEFILE must also be true
+ */
+#ifdef Z_LARGE64
+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+#endif
+
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+#  ifdef Z_PREFIX_SET
+#    define z_gzopen z_gzopen64
+#    define z_gzseek z_gzseek64
+#    define z_gztell z_gztell64
+#    define z_gzoffset z_gzoffset64
+#    define z_adler32_combine z_adler32_combine64
+#    define z_crc32_combine z_crc32_combine64
+#  else
+#    define gzopen gzopen64
+#    define gzseek gzseek64
+#    define gztell gztell64
+#    define gzoffset gzoffset64
+#    define adler32_combine adler32_combine64
+#    define crc32_combine crc32_combine64
+#  endif
+#  ifndef Z_LARGE64
+     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#  endif
+#else
+   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+#endif
+
+#else /* Z_SOLO */
 
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+
+#endif /* !Z_SOLO */
+
+/* hack for buggy compilers */
 #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
+    struct internal_state {int dummy;};
 #endif
 
+/* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
+ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
+ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                            const char *mode));
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
+#  endif
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/dep/lib/win32_release/FastMM.dll b/dep/lib/win32_release/FastMM.dll
new file mode 100644
index 00000000000..988f7fe11fb
Binary files /dev/null and b/dep/lib/win32_release/FastMM.dll differ
diff --git a/dep/lib/x64_release/FastMMx64.dll b/dep/lib/x64_release/FastMMx64.dll
new file mode 100644
index 00000000000..f47edbffcee
Binary files /dev/null and b/dep/lib/x64_release/FastMMx64.dll differ
diff --git a/dep/recastnavigation/DebugUtils/Include/DebugDraw.h b/dep/recastnavigation/DebugUtils/Include/DebugDraw.h
deleted file mode 100644
index 8c95416833d..00000000000
--- a/dep/recastnavigation/DebugUtils/Include/DebugDraw.h
+++ /dev/null
@@ -1,208 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DEBUGDRAW_H
-#define DEBUGDRAW_H
-
-// Some math headers don't have PI defined.
-static const float DU_PI = 3.14159265f;
-
-enum duDebugDrawPrimitives
-{
-	DU_DRAW_POINTS,
-	DU_DRAW_LINES,
-	DU_DRAW_TRIS,
-	DU_DRAW_QUADS,	
-};
-
-// Abstrace debug draw interface.
-struct duDebugDraw
-{
-	virtual ~duDebugDraw() = 0;
-	
-	virtual void depthMask(bool state) = 0;
-
-	// Begin drawing primitives.
-	// Params:
-	//  prim - (in) primitive type to draw, one of rcDebugDrawPrimitives.
-	//  nverts - (in) number of vertices to be submitted.
-	//  size - (in) size of a primitive, applies to point size and line width only.
-	virtual void begin(duDebugDrawPrimitives prim, float size = 1.0f) = 0;
-
-	// Submit a vertex
-	// Params:
-	//  pos - (in) position of the verts.
-	//  color - (in) color of the verts.
-	virtual void vertex(const float* pos, unsigned int color) = 0;
-
-	// Submit a vertex
-	// Params:
-	//  x,y,z - (in) position of the verts.
-	//  color - (in) color of the verts.
-	virtual void vertex(const float x, const float y, const float z, unsigned int color) = 0;
-
-	// End drawing primitives.
-	virtual void end() = 0;
-};
-
-inline unsigned int duRGBA(int r, int g, int b, int a)
-{
-	return ((unsigned int)r) | ((unsigned int)g << 8) | ((unsigned int)b << 16) | ((unsigned int)a << 24);
-}
-
-inline unsigned int duRGBAf(float fr, float fg, float fb, float fa)
-{
-	unsigned char r = (unsigned char)(fr*255.0f);
-	unsigned char g = (unsigned char)(fg*255.0f);
-	unsigned char b = (unsigned char)(fb*255.0f);
-	unsigned char a = (unsigned char)(fa*255.0f);
-	return duRGBA(r,g,b,a);
-}
-
-unsigned int duIntToCol(int i, int a);
-void duIntToCol(int i, float* col);
-
-inline unsigned int duMultCol(const unsigned int col, const unsigned int d)
-{
-	const unsigned int r = col & 0xff;
-	const unsigned int g = (col >> 8) & 0xff;
-	const unsigned int b = (col >> 16) & 0xff;
-	const unsigned int a = (col >> 24) & 0xff;
-	return duRGBA((r*d) >> 8, (g*d) >> 8, (b*d) >> 8, a);
-}
-
-inline unsigned int duDarkenCol(unsigned int col)
-{
-	return ((col >> 1) & 0x007f7f7f) | (col & 0xff000000);
-}
-
-inline unsigned int duLerpCol(unsigned int ca, unsigned int cb, unsigned int u)
-{
-	const unsigned int ra = ca & 0xff;
-	const unsigned int ga = (ca >> 8) & 0xff;
-	const unsigned int ba = (ca >> 16) & 0xff;
-	const unsigned int aa = (ca >> 24) & 0xff;
-	const unsigned int rb = cb & 0xff;
-	const unsigned int gb = (cb >> 8) & 0xff;
-	const unsigned int bb = (cb >> 16) & 0xff;
-	const unsigned int ab = (cb >> 24) & 0xff;
-	
-	unsigned int r = (ra*(255-u) + rb*u)/255;
-	unsigned int g = (ga*(255-u) + gb*u)/255;
-	unsigned int b = (ba*(255-u) + bb*u)/255;
-	unsigned int a = (aa*(255-u) + ab*u)/255;
-	return duRGBA(r,g,b,a);
-}
-
-inline unsigned int duTransCol(unsigned int c, unsigned int a)
-{
-	return (a<<24) | (c & 0x00ffffff);
-}
-
-
-void duCalcBoxColors(unsigned int* colors, unsigned int colTop, unsigned int colSide);
-
-void duDebugDrawCylinderWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-							 float maxx, float maxy, float maxz, unsigned int col, const float lineWidth);
-
-void duDebugDrawBoxWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-						float maxx, float maxy, float maxz, unsigned int col, const float lineWidth);
-
-void duDebugDrawArc(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-					const float x1, const float y1, const float z1, const float h,
-					const float as0, const float as1, unsigned int col, const float lineWidth);
-
-void duDebugDrawArrow(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-					  const float x1, const float y1, const float z1,
-					  const float as0, const float as1, unsigned int col, const float lineWidth);
-
-void duDebugDrawCircle(struct duDebugDraw* dd, const float x, const float y, const float z,
-					   const float r, unsigned int col, const float lineWidth);
-
-void duDebugDrawCross(struct duDebugDraw* dd, const float x, const float y, const float z,
-					  const float size, unsigned int col, const float lineWidth);
-
-void duDebugDrawBox(struct duDebugDraw* dd, float minx, float miny, float minz,
-					float maxx, float maxy, float maxz, const unsigned int* fcol);
-
-void duDebugDrawCylinder(struct duDebugDraw* dd, float minx, float miny, float minz,
-						 float maxx, float maxy, float maxz, unsigned int col);
-
-void duDebugDrawGridXZ(struct duDebugDraw* dd, const float ox, const float oy, const float oz,
-					   const int w, const int h, const float size,
-					   const unsigned int col, const float lineWidth);
-
-
-// Versions without begin/end, can be used to draw multiple primitives.
-void duAppendCylinderWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-						  float maxx, float maxy, float maxz, unsigned int col);
-
-void duAppendBoxWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-					 float maxx, float maxy, float maxz, unsigned int col);
-
-void duAppendBoxPoints(struct duDebugDraw* dd, float minx, float miny, float minz,
-					   float maxx, float maxy, float maxz, unsigned int col);
-
-void duAppendArc(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-				 const float x1, const float y1, const float z1, const float h,
-				 const float as0, const float as1, unsigned int col);
-
-void duAppendArrow(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-				   const float x1, const float y1, const float z1,
-				   const float as0, const float as1, unsigned int col);
-
-void duAppendCircle(struct duDebugDraw* dd, const float x, const float y, const float z,
-					const float r, unsigned int col);
-
-void duAppendCross(struct duDebugDraw* dd, const float x, const float y, const float z,
-				   const float size, unsigned int col);
-
-void duAppendBox(struct duDebugDraw* dd, float minx, float miny, float minz,
-				 float maxx, float maxy, float maxz, const unsigned int* fcol);
-
-void duAppendCylinder(struct duDebugDraw* dd, float minx, float miny, float minz,
-					  float maxx, float maxy, float maxz, unsigned int col);
-
-
-class duDisplayList : public duDebugDraw
-{
-	float* m_pos;
-	unsigned int* m_color;
-	int m_size;
-	int m_cap;
-
-	bool m_depthMask;
-	duDebugDrawPrimitives m_prim;
-	float m_primSize;
-	
-	void resize(int cap);
-	
-public:
-	duDisplayList(int cap = 512);
-	~duDisplayList();
-	virtual void depthMask(bool state);
-	virtual void begin(duDebugDrawPrimitives prim, float size = 1.0f);
-	virtual void vertex(const float x, const float y, const float z, unsigned int color);
-	virtual void vertex(const float* pos, unsigned int color);
-	virtual void end();
-	void clear();
-	void draw(struct duDebugDraw* dd);
-};
-
-
-#endif // DEBUGDRAW_H
diff --git a/dep/recastnavigation/DebugUtils/Include/DetourDebugDraw.h b/dep/recastnavigation/DebugUtils/Include/DetourDebugDraw.h
deleted file mode 100644
index d0d1d5d180c..00000000000
--- a/dep/recastnavigation/DebugUtils/Include/DetourDebugDraw.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOURDEBUGDRAW_H
-#define DETOURDEBUGDRAW_H
-
-#include "DetourNavMesh.h"
-#include "DetourNavMeshQuery.h"
-
-enum DrawNavMeshFlags
-{
-	DU_DRAWNAVMESH_OFFMESHCONS = 0x01,
-	DU_DRAWNAVMESH_CLOSEDLIST = 0x02,
-};
-
-void duDebugDrawNavMesh(struct duDebugDraw* dd, const dtNavMesh& mesh, unsigned char flags);
-void duDebugDrawNavMeshWithClosedList(struct duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery& query, unsigned char flags);
-void duDebugDrawNavMeshNodes(struct duDebugDraw* dd, const dtNavMeshQuery& query);
-void duDebugDrawNavMeshBVTree(struct duDebugDraw* dd, const dtNavMesh& mesh);
-void duDebugDrawNavMeshPortals(struct duDebugDraw* dd, const dtNavMesh& mesh);
-void duDebugDrawNavMeshPoly(struct duDebugDraw* dd, const dtNavMesh& mesh, dtPolyRef ref, const unsigned int col);
-
-#endif // DETOURDEBUGDRAW_H
\ No newline at end of file
diff --git a/dep/recastnavigation/DebugUtils/Include/RecastDebugDraw.h b/dep/recastnavigation/DebugUtils/Include/RecastDebugDraw.h
deleted file mode 100644
index 3d204d27b21..00000000000
--- a/dep/recastnavigation/DebugUtils/Include/RecastDebugDraw.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef RECAST_DEBUGDRAW_H
-#define RECAST_DEBUGDRAW_H
-
-void duDebugDrawTriMesh(struct duDebugDraw* dd, const float* verts, int nverts, const int* tris, const float* normals, int ntris, const unsigned char* flags);
-void duDebugDrawTriMeshSlope(struct duDebugDraw* dd, const float* verts, int nverts, const int* tris, const float* normals, int ntris, const float walkableSlopeAngle);
-
-void duDebugDrawHeightfieldSolid(struct duDebugDraw* dd, const struct rcHeightfield& hf);
-void duDebugDrawHeightfieldWalkable(struct duDebugDraw* dd, const struct rcHeightfield& hf);
-
-void duDebugDrawCompactHeightfieldSolid(struct duDebugDraw* dd, const struct rcCompactHeightfield& chf);
-void duDebugDrawCompactHeightfieldRegions(struct duDebugDraw* dd, const struct rcCompactHeightfield& chf);
-void duDebugDrawCompactHeightfieldDistance(struct duDebugDraw* dd, const struct rcCompactHeightfield& chf);
-
-void duDebugDrawRegionConnections(struct duDebugDraw* dd, const struct rcContourSet& cset, const float alpha = 1.0f);
-void duDebugDrawRawContours(struct duDebugDraw* dd, const struct rcContourSet& cset, const float alpha = 1.0f);
-void duDebugDrawContours(struct duDebugDraw* dd, const struct rcContourSet& cset, const float alpha = 1.0f);
-void duDebugDrawPolyMesh(struct duDebugDraw* dd, const struct rcPolyMesh& mesh);
-void duDebugDrawPolyMeshDetail(struct duDebugDraw* dd, const struct rcPolyMeshDetail& dmesh);
-
-#endif // RECAST_DEBUGDRAW_H
diff --git a/dep/recastnavigation/DebugUtils/Include/RecastDump.h b/dep/recastnavigation/DebugUtils/Include/RecastDump.h
deleted file mode 100644
index 6a722fdaea8..00000000000
--- a/dep/recastnavigation/DebugUtils/Include/RecastDump.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef RECAST_DUMP_H
-#define RECAST_DUMP_H
-
-struct duFileIO
-{
-	virtual ~duFileIO() = 0;
-	virtual bool isWriting() const = 0;
-	virtual bool isReading() const = 0;
-	virtual bool write(const void* ptr, const size_t size) = 0;
-	virtual bool read(void* ptr, const size_t size) = 0;
-};
-
-bool duDumpPolyMeshToObj(struct rcPolyMesh& pmesh, duFileIO* io);
-bool duDumpPolyMeshDetailToObj(struct rcPolyMeshDetail& dmesh, duFileIO* io);
-
-bool duDumpContourSet(struct rcContourSet& cset, duFileIO* io);
-bool duReadContourSet(struct rcContourSet& cset, duFileIO* io);
-
-bool duDumpCompactHeightfield(struct rcCompactHeightfield& chf, duFileIO* io);
-bool duReadCompactHeightfield(struct rcCompactHeightfield& chf, duFileIO* io);
-
-void duLogBuildTimes(rcContext& ctx, const int totalTileUsec);
-
-
-#endif // RECAST_DUMP_H
diff --git a/dep/recastnavigation/DebugUtils/Source/DebugDraw.cpp b/dep/recastnavigation/DebugUtils/Source/DebugDraw.cpp
deleted file mode 100644
index a9c1ac12f4d..00000000000
--- a/dep/recastnavigation/DebugUtils/Source/DebugDraw.cpp
+++ /dev/null
@@ -1,599 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <string.h>
-#include "DebugDraw.h"
-
-
-duDebugDraw::~duDebugDraw()
-{
-	// Empty
-}
-	
-
-inline int bit(int a, int b)
-{
-	return (a & (1 << b)) >> b;
-}
-
-unsigned int duIntToCol(int i, int a)
-{
-	int	r = bit(i, 1) + bit(i, 3) * 2 + 1;
-	int	g = bit(i, 2) + bit(i, 4) * 2 + 1;
-	int	b = bit(i, 0) + bit(i, 5) * 2 + 1;
-	return duRGBA(r*63,g*63,b*63,a);
-}
-
-void duIntToCol(int i, float* col)
-{
-	int	r = bit(i, 0) + bit(i, 3) * 2 + 1;
-	int	g = bit(i, 1) + bit(i, 4) * 2 + 1;
-	int	b = bit(i, 2) + bit(i, 5) * 2 + 1;
-	col[0] = 1 - r*63.0f/255.0f;
-	col[1] = 1 - g*63.0f/255.0f;
-	col[2] = 1 - b*63.0f/255.0f;
-}
-
-void duCalcBoxColors(unsigned int* colors, unsigned int colTop, unsigned int colSide)
-{
-	if (!colors) return;
-	
-	colors[0] = duMultCol(colTop, 250);
-	colors[1] = duMultCol(colSide, 140);
-	colors[2] = duMultCol(colSide, 165);
-	colors[3] = duMultCol(colSide, 217);
-	colors[4] = duMultCol(colSide, 165);
-	colors[5] = duMultCol(colSide, 217);
-}
-
-void duDebugDrawCylinderWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-							 float maxx, float maxy, float maxz, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendCylinderWire(dd, minx,miny,minz, maxx,maxy,maxz, col);
-	dd->end();
-}
-
-void duDebugDrawBoxWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-						float maxx, float maxy, float maxz, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendBoxWire(dd, minx,miny,minz, maxx,maxy,maxz, col);
-	dd->end();
-}
-
-void duDebugDrawArc(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-					const float x1, const float y1, const float z1, const float h,
-					const float as0, const float as1, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendArc(dd, x0,y0,z0, x1,y1,z1, h, as0, as1, col);
-	dd->end();
-}
-
-void duDebugDrawArrow(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-					  const float x1, const float y1, const float z1,
-					  const float as0, const float as1, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendArrow(dd, x0,y0,z0, x1,y1,z1, as0, as1, col);
-	dd->end();
-}
-
-void duDebugDrawCircle(struct duDebugDraw* dd, const float x, const float y, const float z,
-					   const float r, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendCircle(dd, x,y,z, r, col);
-	dd->end();
-}
-
-void duDebugDrawCross(struct duDebugDraw* dd, const float x, const float y, const float z,
-					  const float size, unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	duAppendCross(dd, x,y,z, size, col);
-	dd->end();
-}
-
-void duDebugDrawBox(struct duDebugDraw* dd, float minx, float miny, float minz,
-					float maxx, float maxy, float maxz, const unsigned int* fcol)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_TRIS);
-	duAppendBox(dd, minx,miny,minz, maxx,maxy,maxz, fcol);
-	dd->end();
-}
-
-void duDebugDrawCylinder(struct duDebugDraw* dd, float minx, float miny, float minz,
-						 float maxx, float maxy, float maxz, unsigned int col)
-{
-	if (!dd) return;
-	
-	dd->begin(DU_DRAW_TRIS);
-	duAppendCylinder(dd, minx,miny,minz, maxx,maxy,maxz, col);
-	dd->end();
-}
-
-void duDebugDrawGridXZ(struct duDebugDraw* dd, const float ox, const float oy, const float oz,
-					   const int w, const int h, const float size,
-					   const unsigned int col, const float lineWidth)
-{
-	if (!dd) return;
-
-	dd->begin(DU_DRAW_LINES, lineWidth);
-	for (int i = 0; i <= h; ++i)
-	{
-		dd->vertex(ox,oy,oz+i*size, col);
-		dd->vertex(ox+w*size,oy,oz+i*size, col);
-	}
-	for (int i = 0; i <= w; ++i)
-	{
-		dd->vertex(ox+i*size,oy,oz, col);
-		dd->vertex(ox+i*size,oy,oz+h*size, col);
-	}
-	dd->end();
-}
-		 
-
-void duAppendCylinderWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-						  float maxx, float maxy, float maxz, unsigned int col)
-{
-	if (!dd) return;
-
-	static const int NUM_SEG = 16;
-	static float dir[NUM_SEG*2];
-	static bool init = false;
-	if (!init)
-	{
-		init = true;
-		for (int i = 0; i < NUM_SEG; ++i)
-		{
-			const float a = (float)i/(float)NUM_SEG*DU_PI*2;
-			dir[i*2] = cosf(a);
-			dir[i*2+1] = sinf(a);
-		}
-	}
-	
-	const float cx = (maxx + minx)/2;
-	const float cz = (maxz + minz)/2;
-	const float rx = (maxx - minx)/2;
-	const float rz = (maxz - minz)/2;
-	
-	for (int i = 0, j = NUM_SEG-1; i < NUM_SEG; j = i++)
-	{
-		dd->vertex(cx+dir[j*2+0]*rx, miny, cz+dir[j*2+1]*rz, col);
-		dd->vertex(cx+dir[i*2+0]*rx, miny, cz+dir[i*2+1]*rz, col);
-		dd->vertex(cx+dir[j*2+0]*rx, maxy, cz+dir[j*2+1]*rz, col);
-		dd->vertex(cx+dir[i*2+0]*rx, maxy, cz+dir[i*2+1]*rz, col);
-	}
-	for (int i = 0; i < NUM_SEG; i += NUM_SEG/4)
-	{
-		dd->vertex(cx+dir[i*2+0]*rx, miny, cz+dir[i*2+1]*rz, col);
-		dd->vertex(cx+dir[i*2+0]*rx, maxy, cz+dir[i*2+1]*rz, col);
-	}
-}
-
-void duAppendBoxWire(struct duDebugDraw* dd, float minx, float miny, float minz,
-					 float maxx, float maxy, float maxz, unsigned int col)
-{
-	if (!dd) return;
-	// Top
-	dd->vertex(minx, miny, minz, col);
-	dd->vertex(maxx, miny, minz, col);
-	dd->vertex(maxx, miny, minz, col);
-	dd->vertex(maxx, miny, maxz, col);
-	dd->vertex(maxx, miny, maxz, col);
-	dd->vertex(minx, miny, maxz, col);
-	dd->vertex(minx, miny, maxz, col);
-	dd->vertex(minx, miny, minz, col);
-	
-	// bottom
-	dd->vertex(minx, maxy, minz, col);
-	dd->vertex(maxx, maxy, minz, col);
-	dd->vertex(maxx, maxy, minz, col);
-	dd->vertex(maxx, maxy, maxz, col);
-	dd->vertex(maxx, maxy, maxz, col);
-	dd->vertex(minx, maxy, maxz, col);
-	dd->vertex(minx, maxy, maxz, col);
-	dd->vertex(minx, maxy, minz, col);
-	
-	// Sides
-	dd->vertex(minx, miny, minz, col);
-	dd->vertex(minx, maxy, minz, col);
-	dd->vertex(maxx, miny, minz, col);
-	dd->vertex(maxx, maxy, minz, col);
-	dd->vertex(maxx, miny, maxz, col);
-	dd->vertex(maxx, maxy, maxz, col);
-	dd->vertex(minx, miny, maxz, col);
-	dd->vertex(minx, maxy, maxz, col);
-}
-
-void duAppendBoxPoints(struct duDebugDraw* dd, float minx, float miny, float minz,
-					   float maxx, float maxy, float maxz, unsigned int col)
-{
-	if (!dd) return;
-	// Top
-	dd->vertex(minx, miny, minz, col);
-	dd->vertex(maxx, miny, minz, col);
-	dd->vertex(maxx, miny, minz, col);
-	dd->vertex(maxx, miny, maxz, col);
-	dd->vertex(maxx, miny, maxz, col);
-	dd->vertex(minx, miny, maxz, col);
-	dd->vertex(minx, miny, maxz, col);
-	dd->vertex(minx, miny, minz, col);
-	
-	// bottom
-	dd->vertex(minx, maxy, minz, col);
-	dd->vertex(maxx, maxy, minz, col);
-	dd->vertex(maxx, maxy, minz, col);
-	dd->vertex(maxx, maxy, maxz, col);
-	dd->vertex(maxx, maxy, maxz, col);
-	dd->vertex(minx, maxy, maxz, col);
-	dd->vertex(minx, maxy, maxz, col);
-	dd->vertex(minx, maxy, minz, col);
-}
-
-void duAppendBox(struct duDebugDraw* dd, float minx, float miny, float minz,
-				 float maxx, float maxy, float maxz, const unsigned int* fcol)
-{
-	if (!dd) return;
-	const float verts[8*3] =
-	{
-		minx, miny, minz,
-		maxx, miny, minz,
-		maxx, miny, maxz,
-		minx, miny, maxz,
-		minx, maxy, minz,
-		maxx, maxy, minz,
-		maxx, maxy, maxz,
-		minx, maxy, maxz,
-	};
-	static const unsigned char inds[6*4] =
-	{
-		7, 6, 5, 4,
-		0, 1, 2, 3,
-		1, 5, 6, 2,
-		3, 7, 4, 0,
-		2, 6, 7, 3,
-		0, 4, 5, 1,
-	};
-	
-	const unsigned char* in = inds;
-	for (int i = 0; i < 6; ++i)
-	{
-		dd->vertex(&verts[*in*3], fcol[i]); in++;
-		dd->vertex(&verts[*in*3], fcol[i]); in++;
-		dd->vertex(&verts[*in*3], fcol[i]); in++;
-		dd->vertex(&verts[*in*3], fcol[i]); in++;
-	}
-}
-
-void duAppendCylinder(struct duDebugDraw* dd, float minx, float miny, float minz,
-					  float maxx, float maxy, float maxz, unsigned int col)
-{
-	if (!dd) return;
-	
-	static const int NUM_SEG = 16;
-	static float dir[NUM_SEG*2];
-	static bool init = false;
-	if (!init)
-	{
-		init = true;
-		for (int i = 0; i < NUM_SEG; ++i)
-		{
-			const float a = (float)i/(float)NUM_SEG*DU_PI*2;
-			dir[i*2] = cosf(a);
-			dir[i*2+1] = sinf(a);
-		}
-	}
-	
-	unsigned int col2 = duMultCol(col, 160);
-	
-	const float cx = (maxx + minx)/2;
-	const float cz = (maxz + minz)/2;
-	const float rx = (maxx - minx)/2;
-	const float rz = (maxz - minz)/2;
-
-	for (int i = 2; i < NUM_SEG; ++i)
-	{
-		const int a = 0, b = i-1, c = i;
-		dd->vertex(cx+dir[a*2+0]*rx, miny, cz+dir[a*2+1]*rz, col2);
-		dd->vertex(cx+dir[b*2+0]*rx, miny, cz+dir[b*2+1]*rz, col2);
-		dd->vertex(cx+dir[c*2+0]*rx, miny, cz+dir[c*2+1]*rz, col2);
-	}
-	for (int i = 2; i < NUM_SEG; ++i)
-	{
-		const int a = 0, b = i, c = i-1;
-		dd->vertex(cx+dir[a*2+0]*rx, maxy, cz+dir[a*2+1]*rz, col);
-		dd->vertex(cx+dir[b*2+0]*rx, maxy, cz+dir[b*2+1]*rz, col);
-		dd->vertex(cx+dir[c*2+0]*rx, maxy, cz+dir[c*2+1]*rz, col);
-	}
-	for (int i = 0, j = NUM_SEG-1; i < NUM_SEG; j = i++)
-	{
-		dd->vertex(cx+dir[i*2+0]*rx, miny, cz+dir[i*2+1]*rz, col2);
-		dd->vertex(cx+dir[j*2+0]*rx, miny, cz+dir[j*2+1]*rz, col2);
-		dd->vertex(cx+dir[j*2+0]*rx, maxy, cz+dir[j*2+1]*rz, col);
-
-		dd->vertex(cx+dir[i*2+0]*rx, miny, cz+dir[i*2+1]*rz, col2);
-		dd->vertex(cx+dir[j*2+0]*rx, maxy, cz+dir[j*2+1]*rz, col);
-		dd->vertex(cx+dir[i*2+0]*rx, maxy, cz+dir[i*2+1]*rz, col);
-	}
-}
-
-
-inline void evalArc(const float x0, const float y0, const float z0,
-					const float dx, const float dy, const float dz,
-					const float h, const float u, float* res)
-{
-	res[0] = x0 + dx * u;
-	res[1] = y0 + dy * u + h * (1-(u*2-1)*(u*2-1));
-	res[2] = z0 + dz * u;
-}
-
-
-inline void vcross(float* dest, const float* v1, const float* v2)
-{
-	dest[0] = v1[1]*v2[2] - v1[2]*v2[1];
-	dest[1] = v1[2]*v2[0] - v1[0]*v2[2];
-	dest[2] = v1[0]*v2[1] - v1[1]*v2[0]; 
-}
-
-inline void vnormalize(float* v)
-{
-	float d = 1.0f / sqrtf(v[0]*v[0] + v[1]*v[1] + v[2]*v[2]);
-	v[0] *= d;
-	v[1] *= d;
-	v[2] *= d;
-}
-
-inline void vsub(float* dest, const float* v1, const float* v2)
-{
-	dest[0] = v1[0]-v2[0];
-	dest[1] = v1[1]-v2[1];
-	dest[2] = v1[2]-v2[2];
-}
-
-inline float vdistSqr(const float* v1, const float* v2)
-{
-	const float x = v1[0]-v2[0];
-	const float y = v1[1]-v2[1];
-	const float z = v1[2]-v2[2];
-	return x*x + y*y + z*z;
-}
-
-
-void appendArrowHead(struct duDebugDraw* dd, const float* p, const float* q,
-					 const float s, unsigned int col)
-{
-	const float eps = 0.001f;
-	if (!dd) return;
-	if (vdistSqr(p,q) < eps*eps) return;
-	float ax[3], ay[3] = {0,1,0}, az[3];
-	vsub(az, q, p);
-	vnormalize(az);
-	vcross(ax, ay, az);
-	vcross(ay, az, ax);
-	vnormalize(ay);
-
-	dd->vertex(p, col);
-//	dd->vertex(p[0]+az[0]*s+ay[0]*s/2, p[1]+az[1]*s+ay[1]*s/2, p[2]+az[2]*s+ay[2]*s/2, col);
-	dd->vertex(p[0]+az[0]*s+ax[0]*s/3, p[1]+az[1]*s+ax[1]*s/3, p[2]+az[2]*s+ax[2]*s/3, col);
-
-	dd->vertex(p, col);
-//	dd->vertex(p[0]+az[0]*s-ay[0]*s/2, p[1]+az[1]*s-ay[1]*s/2, p[2]+az[2]*s-ay[2]*s/2, col);
-	dd->vertex(p[0]+az[0]*s-ax[0]*s/3, p[1]+az[1]*s-ax[1]*s/3, p[2]+az[2]*s-ax[2]*s/3, col);
-	
-}
-
-void duAppendArc(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-				 const float x1, const float y1, const float z1, const float h,
-				 const float as0, const float as1, unsigned int col)
-{
-	if (!dd) return;
-	static const int NUM_ARC_PTS = 8;
-	static const float PAD = 0.05f;
-	static const float ARC_PTS_SCALE = (1.0f-PAD*2) / (float)NUM_ARC_PTS;
-	const float dx = x1 - x0;
-	const float dy = y1 - y0;
-	const float dz = z1 - z0;
-	const float len = sqrtf(dx*dx + dy*dy + dz*dz);
-	float prev[3];
-	evalArc(x0,y0,z0, dx,dy,dz, len*h, PAD, prev);
-	for (int i = 1; i <= NUM_ARC_PTS; ++i)
-	{
-		const float u = PAD + i * ARC_PTS_SCALE;
-		float pt[3];
-		evalArc(x0,y0,z0, dx,dy,dz, len*h, u, pt);
-		dd->vertex(prev[0],prev[1],prev[2], col);
-		dd->vertex(pt[0],pt[1],pt[2], col);
-		prev[0] = pt[0]; prev[1] = pt[1]; prev[2] = pt[2];
-	}
-	
-	// End arrows
-	if (as0 > 0.001f)
-	{
-		float p[3], q[3];
-		evalArc(x0,y0,z0, dx,dy,dz, len*h, PAD, p);
-		evalArc(x0,y0,z0, dx,dy,dz, len*h, PAD+0.05f, q);
-		appendArrowHead(dd, p, q, as0, col);
-	}
-
-	if (as1 > 0.001f)
-	{
-		float p[3], q[3];
-		evalArc(x0,y0,z0, dx,dy,dz, len*h, 1-PAD, p);
-		evalArc(x0,y0,z0, dx,dy,dz, len*h, 1-(PAD+0.05f), q);
-		appendArrowHead(dd, p, q, as1, col);
-	}
-}
-
-void duAppendArrow(struct duDebugDraw* dd, const float x0, const float y0, const float z0,
-				   const float x1, const float y1, const float z1,
-				   const float as0, const float as1, unsigned int col)
-{
-	if (!dd) return;
-
-	dd->vertex(x0,y0,z0, col);
-	dd->vertex(x1,y1,z1, col);
-	
-	// End arrows
-	const float p[3] = {x0,y0,z0}, q[3] = {x1,y1,z1};
-	if (as0 > 0.001f)
-		appendArrowHead(dd, p, q, as0, col);
-	if (as1 > 0.001f)
-		appendArrowHead(dd, q, p, as1, col);
-}
-
-void duAppendCircle(struct duDebugDraw* dd, const float x, const float y, const float z,
-					const float r, unsigned int col)
-{
-	if (!dd) return;
-	static const int NUM_SEG = 40;
-	static float dir[40*2];
-	static bool init = false;
-	if (!init)
-	{
-		init = true;
-		for (int i = 0; i < NUM_SEG; ++i)
-		{
-			const float a = (float)i/(float)NUM_SEG*DU_PI*2;
-			dir[i*2] = cosf(a);
-			dir[i*2+1] = sinf(a);
-		}
-	}
-	
-	for (int i = 0, j = NUM_SEG-1; i < NUM_SEG; j = i++)
-	{
-		dd->vertex(x+dir[j*2+0]*r, y, z+dir[j*2+1]*r, col);
-		dd->vertex(x+dir[i*2+0]*r, y, z+dir[i*2+1]*r, col);
-	}
-}
-
-void duAppendCross(struct duDebugDraw* dd, const float x, const float y, const float z,
-				   const float s, unsigned int col)
-{
-	if (!dd) return;
-	dd->vertex(x-s,y,z, col);
-	dd->vertex(x+s,y,z, col);
-	dd->vertex(x,y-s,z, col);
-	dd->vertex(x,y+s,z, col);
-	dd->vertex(x,y,z-s, col);
-	dd->vertex(x,y,z+s, col);
-}
-
-duDisplayList::duDisplayList(int cap) :
-	m_pos(0),
-	m_color(0),
-	m_size(0),
-	m_cap(0),
-	m_depthMask(true),
-	m_prim(DU_DRAW_LINES),
-	m_primSize(1.0f)
-{
-	if (cap < 8)
-		cap = 8;
-	resize(cap);
-}
-
-duDisplayList::~duDisplayList()
-{
-	delete [] m_pos;
-	delete [] m_color;
-}
-
-void duDisplayList::resize(int cap)
-{
-	float* newPos = new float[cap*3];
-	if (m_size)
-		memcpy(newPos, m_pos, sizeof(float)*3*m_size);
-	delete [] m_pos;
-	m_pos = newPos;
-
-	unsigned int* newColor = new unsigned int[cap];
-	if (m_size)
-		memcpy(newColor, m_color, sizeof(unsigned int)*m_size);
-	delete [] m_color;
-	m_color = newColor;
-	
-	m_cap = cap;
-}
-
-void duDisplayList::clear()
-{
-	m_size = 0;
-}
-
-void duDisplayList::depthMask(bool state)
-{
-	m_depthMask = state;
-}
-
-void duDisplayList::begin(duDebugDrawPrimitives prim, float size)
-{
-	clear();
-	m_prim = prim;
-	m_primSize = size;
-}
-
-void duDisplayList::vertex(const float x, const float y, const float z, unsigned int color)
-{
-	if (m_size+1 >= m_cap)
-		resize(m_cap*2);
-	float* p = &m_pos[m_size*3];
-	p[0] = x;
-	p[1] = y;
-	p[2] = z;
-	m_color[m_size] = color;
-	m_size++;
-}
-
-void duDisplayList::vertex(const float* pos, unsigned int color)
-{
-	vertex(pos[0],pos[1],pos[2],color);
-}
-
-void duDisplayList::end()
-{
-}
-
-void duDisplayList::draw(struct duDebugDraw* dd)
-{
-	if (!dd) return;
-	if (!m_size) return;
-	dd->depthMask(m_depthMask);
-	dd->begin(m_prim, m_primSize);
-	for (int i = 0; i < m_size; ++i)
-		dd->vertex(&m_pos[i*3], m_color[i]);
-	dd->end();
-}
diff --git a/dep/recastnavigation/DebugUtils/Source/DetourDebugDraw.cpp b/dep/recastnavigation/DebugUtils/Source/DetourDebugDraw.cpp
deleted file mode 100644
index 78e4fc6771e..00000000000
--- a/dep/recastnavigation/DebugUtils/Source/DetourDebugDraw.cpp
+++ /dev/null
@@ -1,484 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <math.h>
-#include "DebugDraw.h"
-#include "DetourDebugDraw.h"
-#include "DetourNavMesh.h"
-#include "DetourCommon.h"
-#include "DetourNode.h"
-
-#include "../../RecastDemo/Include/Debug.h"
-
-static float distancePtLine2d(const float* pt, const float* p, const float* q)
-{
-	float pqx = q[0] - p[0];
-	float pqz = q[2] - p[2];
-	float dx = pt[0] - p[0];
-	float dz = pt[2] - p[2];
-	float d = pqx*pqx + pqz*pqz;
-	float t = pqx*dx + pqz*dz;
-	if (d != 0) t /= d;
-	dx = p[0] + t*pqx - pt[0];
-	dz = p[2] + t*pqz - pt[2];
-	return dx*dx + dz*dz;
-}
-
-static void drawPolyBoundaries(duDebugDraw* dd, const dtMeshTile* tile,
-							   const unsigned int col, const float linew,
-							   bool inner)
-{
-	static const float thr = 0.01f*0.01f;
-
-	dd->begin(DU_DRAW_LINES, linew);
-
-	for (int i = 0; i < tile->header->polyCount; ++i)
-	{
-		const dtPoly* p = &tile->polys[i];
-		
-		if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION) continue;
-		
-		const dtPolyDetail* pd = &tile->detailMeshes[i];
-		
-		for (int j = 0, nj = (int)p->vertCount; j < nj; ++j)
-		{
-			unsigned int c = col;
-			if (inner)
-			{
-				if (p->neis[j] == 0) continue;
-				if (p->neis[j] & DT_EXT_LINK)
-				{
-					bool con = false;
-					for (unsigned int k = p->firstLink; k != DT_NULL_LINK; k = tile->links[k].next)
-					{
-						if (tile->links[k].edge == j)
-						{
-							con = true;
-							break;
-						}
-					}
-					if (con)
-						c = duRGBA(255,255,255,24);
-					else
-						c = duRGBA(0,0,0,48);
-				}
-				else
-					c = duRGBA(0,48,64,32);
-			}
-			else
-			{
-				if (p->neis[j] != 0) continue;
-			}
-			
-			const float* v0 = &tile->verts[p->verts[j]*3];
-			const float* v1 = &tile->verts[p->verts[(j+1) % nj]*3];
-			
-			// Draw detail mesh edges which align with the actual poly edge.
-			// This is really slow.
-			for (int k = 0; k < pd->triCount; ++k)
-			{
-				const unsigned char* t = &tile->detailTris[(pd->triBase+k)*4];
-				const float* tv[3];
-				for (int m = 0; m < 3; ++m)
-				{
-					if (t[m] < p->vertCount)
-						tv[m] = &tile->verts[p->verts[t[m]]*3];
-					else
-						tv[m] = &tile->detailVerts[(pd->vertBase+(t[m]-p->vertCount))*3];
-				}
-				for (int m = 0, n = 2; m < 3; n=m++)
-				{
-					if (((t[3] >> (n*2)) & 0x3) == 0) continue;	// Skip inner detail edges.
-					if (distancePtLine2d(tv[n],v0,v1) < thr &&
-						distancePtLine2d(tv[m],v0,v1) < thr)
-					{
-						dd->vertex(tv[n], c);
-						dd->vertex(tv[m], c);
-					}
-				}
-			}
-		}
-	}
-	dd->end();
-}
-
-static void drawMeshTile(duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery* query,
-						 const dtMeshTile* tile, unsigned char flags)
-{
-	dtPolyRef base = mesh.getPolyRefBase(tile);
-
-	dd->depthMask(false);
-
-	dd->begin(DU_DRAW_TRIS);
-	for (int i = 0; i < tile->header->polyCount; ++i)
-	{
-		const dtPoly* p = &tile->polys[i];
-		if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)	// Skip off-mesh links.
-			continue;
-			
-		const dtPolyDetail* pd = &tile->detailMeshes[i];
-
-		unsigned int col;
-		if (query && query->isInClosedList(base | (dtPolyRef)i))
-			col = duRGBA(255,196,0,64);
-		else
-		{
-			if (p->getArea() == 0) // Treat zero area type as default.
-				col = duRGBA(0,192,255,64);
-			else
-                switch(p->getArea())
-			    {
-				    case NAV_GROUND:
-					    col = duRGBA(160,128,40,64);
-					    break;
-				    case NAV_MAGMA:
-					    col = duRGBA(240,95,50,64);
-					    break;
-				    case NAV_SLIME:
-					    col = duRGBA(85,225,85,64);
-					    break;
-				    case NAV_WATER:
-					    col = duRGBA(160,160,245,64);
-					    break;
-				    default:
-					    col = duRGBA(0,192,255,64);
-					    break;
-			    }
-		}
-		
-		for (int j = 0; j < pd->triCount; ++j)
-		{
-			const unsigned char* t = &tile->detailTris[(pd->triBase+j)*4];
-			for (int k = 0; k < 3; ++k)
-			{
-				if (t[k] < p->vertCount)
-					dd->vertex(&tile->verts[p->verts[t[k]]*3], col);
-				else
-					dd->vertex(&tile->detailVerts[(pd->vertBase+t[k]-p->vertCount)*3], col);
-			}
-		}
-	}
-	dd->end();
-	
-	// Draw inter poly boundaries
-	drawPolyBoundaries(dd, tile, duRGBA(0,48,64,32), 1.5f, true);
-	
-	// Draw outer poly boundaries
-	drawPolyBoundaries(dd, tile, duRGBA(0,48,64,220), 2.5f, false);
-
-	if (flags & DU_DRAWNAVMESH_OFFMESHCONS)
-	{
-		dd->begin(DU_DRAW_LINES, 2.0f);
-		for (int i = 0; i < tile->header->polyCount; ++i)
-		{
-			const dtPoly* p = &tile->polys[i];
-			if (p->getType() != DT_POLYTYPE_OFFMESH_CONNECTION)	// Skip regular polys.
-				continue;
-			
-			unsigned int col;
-			if (query && query->isInClosedList(base | (dtPolyRef)i))
-				col = duRGBA(255,196,0,220);
-			else
-				col = duDarkenCol(duIntToCol(p->getArea(), 220));
-			
-			const dtOffMeshConnection* con = &tile->offMeshCons[i - tile->header->offMeshBase];
-			const float* va = &tile->verts[p->verts[0]*3];
-			const float* vb = &tile->verts[p->verts[1]*3];
-
-			// Check to see if start and end end-points have links.
-			bool startSet = false;
-			bool endSet = false;
-			for (unsigned int k = p->firstLink; k != DT_NULL_LINK; k = tile->links[k].next)
-			{
-				if (tile->links[k].edge == 0)
-					startSet = true;
-				if (tile->links[k].edge == 1)
-					endSet = true;
-			}
-			
-			// End points and their on-mesh locations. 
-			if (startSet)
-			{
-				dd->vertex(va[0],va[1],va[2], col);
-				dd->vertex(con->pos[0],con->pos[1],con->pos[2], col);
-				duAppendCircle(dd, con->pos[0],con->pos[1]+0.1f,con->pos[2], con->rad, duRGBA(0,48,64,196));
-			}
-			if (endSet)
-			{
-				dd->vertex(vb[0],vb[1],vb[2], col);
-				dd->vertex(con->pos[3],con->pos[4],con->pos[5], col);
-				duAppendCircle(dd, con->pos[3],con->pos[4]+0.1f,con->pos[5], con->rad, duRGBA(0,48,64,196));
-			}	
-			
-			// End point vertices.
-			dd->vertex(con->pos[0],con->pos[1],con->pos[2], duRGBA(0,48,64,196));
-			dd->vertex(con->pos[0],con->pos[1]+0.2f,con->pos[2], duRGBA(0,48,64,196));
-			
-			dd->vertex(con->pos[3],con->pos[4],con->pos[5], duRGBA(0,48,64,196));
-			dd->vertex(con->pos[3],con->pos[4]+0.2f,con->pos[5], duRGBA(0,48,64,196));
-			
-			// Connection arc.
-			duAppendArc(dd, con->pos[0],con->pos[1],con->pos[2], con->pos[3],con->pos[4],con->pos[5], 0.25f,
-						(con->flags & 1) ? 0.6f : 0, 0.6f, col);
-		}
-		dd->end();
-	}
-	
-	const unsigned int vcol = duRGBA(0,0,0,196);
-	dd->begin(DU_DRAW_POINTS, 3.0f);
-	for (int i = 0; i < tile->header->vertCount; ++i)
-	{
-		const float* v = &tile->verts[i*3];
-		dd->vertex(v[0], v[1], v[2], vcol);
-	}
-	dd->end();
-
-	dd->depthMask(true);
-}
-
-void duDebugDrawNavMesh(duDebugDraw* dd, const dtNavMesh& mesh, unsigned char flags)
-{
-	if (!dd) return;
-	
-	for (int i = 0; i < mesh.getMaxTiles(); ++i)
-	{
-		const dtMeshTile* tile = mesh.getTile(i);
-		if (!tile->header) continue;
-		drawMeshTile(dd, mesh, 0, tile, flags);
-	}
-}
-
-void duDebugDrawNavMeshWithClosedList(struct duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery& query, unsigned char flags)
-{
-	if (!dd) return;
-
-	const dtNavMeshQuery* q = (flags & DU_DRAWNAVMESH_CLOSEDLIST) ? &query : 0;
-	
-	for (int i = 0; i < mesh.getMaxTiles(); ++i)
-	{
-		const dtMeshTile* tile = mesh.getTile(i);
-		if (!tile->header) continue;
-		drawMeshTile(dd, mesh, q, tile, flags);
-	}
-}
-
-void duDebugDrawNavMeshNodes(struct duDebugDraw* dd, const dtNavMeshQuery& query)
-{
-	if (!dd) return;
-	
-	const dtNodePool* pool = query.getNodePool();
-	if (pool)
-	{
-		const float off = 0.5f;
-		dd->begin(DU_DRAW_POINTS, 4.0f);
-		for (int i = 0; i < pool->getHashSize(); ++i)
-		{
-			for (unsigned short j = pool->getFirst(i); j != DT_NULL_IDX; j = pool->getNext(j))
-			{
-				const dtNode* node = pool->getNodeAtIdx(j+1);
-				if (!node) continue;
-				dd->vertex(node->pos[0],node->pos[1]+off,node->pos[2], duRGBA(255,192,0,255));
-			}
-		}
-		dd->end();
-		
-		dd->begin(DU_DRAW_LINES, 2.0f);
-		for (int i = 0; i < pool->getHashSize(); ++i)
-		{
-			for (unsigned short j = pool->getFirst(i); j != DT_NULL_IDX; j = pool->getNext(j))
-			{
-				const dtNode* node = pool->getNodeAtIdx(j+1);
-				if (!node) continue;
-				if (!node->pidx) continue;
-				const dtNode* parent = pool->getNodeAtIdx(node->pidx);
-				if (!parent) continue;
-				dd->vertex(node->pos[0],node->pos[1]+off,node->pos[2], duRGBA(255,192,0,128));
-				dd->vertex(parent->pos[0],parent->pos[1]+off,parent->pos[2], duRGBA(255,192,0,128));
-			}
-		}
-		dd->end();
-	}
-}
-
-
-static void drawMeshTileBVTree(duDebugDraw* dd, const dtMeshTile* tile)
-{
-	// Draw BV nodes.
-	const float cs = 1.0f / tile->header->bvQuantFactor;
-	dd->begin(DU_DRAW_LINES, 1.0f);
-	for (int i = 0; i < tile->header->bvNodeCount; ++i)
-	{
-		const dtBVNode* n = &tile->bvTree[i];
-		if (n->i < 0) // Leaf indices are positive.
-			continue;
-		duAppendBoxWire(dd, tile->header->bmin[0] + n->bmin[0]*cs,
-						tile->header->bmin[1] + n->bmin[1]*cs,
-						tile->header->bmin[2] + n->bmin[2]*cs,
-						tile->header->bmin[0] + n->bmax[0]*cs,
-						tile->header->bmin[1] + n->bmax[1]*cs,
-						tile->header->bmin[2] + n->bmax[2]*cs,
-						duRGBA(255,255,255,128));
-	}
-	dd->end();
-}
-
-void duDebugDrawNavMeshBVTree(duDebugDraw* dd, const dtNavMesh& mesh)
-{
-	if (!dd) return;
-	
-	for (int i = 0; i < mesh.getMaxTiles(); ++i)
-	{
-		const dtMeshTile* tile = mesh.getTile(i);
-		if (!tile->header) continue;
-		drawMeshTileBVTree(dd, tile);
-	}
-}
-
-static void drawMeshTilePortal(duDebugDraw* dd, const dtMeshTile* tile)
-{
-	// Draw portals
-	const float padx = 0.02f;
-	const float pady = tile->header->walkableClimb;
-
-	dd->begin(DU_DRAW_LINES, 2.0f);
-
-	for (int side = 0; side < 8; ++side)
-	{
-		unsigned short m = DT_EXT_LINK | (unsigned short)side;
-		
-		for (int i = 0; i < tile->header->polyCount; ++i)
-		{
-			dtPoly* poly = &tile->polys[i];
-			
-			// Create new links.
-			const int nv = poly->vertCount;
-			for (int j = 0; j < nv; ++j)
-			{
-				// Skip edges which do not point to the right side.
-				if (poly->neis[j] != m)
-					continue;
-				
-				// Create new links
-				const float* va = &tile->verts[poly->verts[j]*3];
-				const float* vb = &tile->verts[poly->verts[(j+1) % nv]*3];
-				
-				if (side == 0 || side == 4)
-				{
-					unsigned int col = side == 0 ? duRGBA(128,0,0,128) : duRGBA(128,0,128,128);
-
-					const float x = va[0] + ((side == 0) ? -padx : padx);
-					
-					dd->vertex(x,va[1]-pady,va[2], col);
-					dd->vertex(x,va[1]+pady,va[2], col);
-
-					dd->vertex(x,va[1]+pady,va[2], col);
-					dd->vertex(x,vb[1]+pady,vb[2], col);
-
-					dd->vertex(x,vb[1]+pady,vb[2], col);
-					dd->vertex(x,vb[1]-pady,vb[2], col);
-
-					dd->vertex(x,vb[1]-pady,vb[2], col);
-					dd->vertex(x,va[1]-pady,va[2], col);
-				}
-				else if (side == 2 || side == 6)
-				{
-					unsigned int col = side == 2 ? duRGBA(0,128,0,128) : duRGBA(0,128,128,128);
-
-					const float z = va[2] + ((side == 2) ? -padx : padx);
-					
-					dd->vertex(va[0],va[1]-pady,z, col);
-					dd->vertex(va[0],va[1]+pady,z, col);
-					
-					dd->vertex(va[0],va[1]+pady,z, col);
-					dd->vertex(vb[0],vb[1]+pady,z, col);
-					
-					dd->vertex(vb[0],vb[1]+pady,z, col);
-					dd->vertex(vb[0],vb[1]-pady,z, col);
-					
-					dd->vertex(vb[0],vb[1]-pady,z, col);
-					dd->vertex(va[0],va[1]-pady,z, col);
-				}
-
-			}
-		}
-	}
-	
-	dd->end();
-}
-
-void duDebugDrawNavMeshPortals(duDebugDraw* dd, const dtNavMesh& mesh)
-{
-	if (!dd) return;
-	
-	for (int i = 0; i < mesh.getMaxTiles(); ++i)
-	{
-		const dtMeshTile* tile = mesh.getTile(i);
-		if (!tile->header) continue;
-		drawMeshTilePortal(dd, tile);
-	}
-}
-
-void duDebugDrawNavMeshPoly(duDebugDraw* dd, const dtNavMesh& mesh, dtPolyRef ref, const unsigned int col)
-{
-	if (!dd) return;
-	
-	const dtMeshTile* tile = 0;
-	const dtPoly* poly = 0;
-	if (mesh.getTileAndPolyByRef(ref, &tile, &poly) != DT_SUCCESS)
-		return;
-	
-	dd->depthMask(false);
-	
-	const unsigned int c = (col & 0x00ffffff) | (64 << 24);
-	const unsigned int ip = (unsigned int)(poly - tile->polys);
-
-	if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
-	{
-		dtOffMeshConnection* con = &tile->offMeshCons[ip - tile->header->offMeshBase];
-
-		dd->begin(DU_DRAW_LINES, 2.0f);
-
-		// Connection arc.
-		duAppendArc(dd, con->pos[0],con->pos[1],con->pos[2], con->pos[3],con->pos[4],con->pos[5], 0.25f,
-					(con->flags & 1) ? 0.6f : 0, 0.6f, c);
-		
-		dd->end();
-	}
-	else
-	{
-		const dtPolyDetail* pd = &tile->detailMeshes[ip];
-
-		dd->begin(DU_DRAW_TRIS);
-		for (int i = 0; i < pd->triCount; ++i)
-		{
-			const unsigned char* t = &tile->detailTris[(pd->triBase+i)*4];
-			for (int j = 0; j < 3; ++j)
-			{
-				if (t[j] < poly->vertCount)
-					dd->vertex(&tile->verts[poly->verts[t[j]]*3], c);
-				else
-					dd->vertex(&tile->detailVerts[(pd->vertBase+t[j]-poly->vertCount)*3], c);
-			}
-		}
-		dd->end();
-	}
-	
-	dd->depthMask(true);
-
-}
-
diff --git a/dep/recastnavigation/DebugUtils/Source/RecastDebugDraw.cpp b/dep/recastnavigation/DebugUtils/Source/RecastDebugDraw.cpp
deleted file mode 100644
index 52861e19778..00000000000
--- a/dep/recastnavigation/DebugUtils/Source/RecastDebugDraw.cpp
+++ /dev/null
@@ -1,689 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include "DebugDraw.h"
-#include "RecastDebugDraw.h"
-#include "Recast.h"
-
-void duDebugDrawTriMesh(duDebugDraw* dd, const float* verts, int /*nverts*/,
-						const int* tris, const float* normals, int ntris,
-						const unsigned char* flags)
-{
-	if (!dd) return;
-	if (!verts) return;
-	if (!tris) return;
-	if (!normals) return;
-
-	dd->begin(DU_DRAW_TRIS);
-	for (int i = 0; i < ntris*3; i += 3)
-	{
-		unsigned int color;
-		unsigned char a = (unsigned char)(150*(2+normals[i+0]+normals[i+1])/4);
-		if (flags && !flags[i/3])
-			color = duRGBA(a,a/4,a/16,255);
-		else
-			color = duRGBA(a,a,a,255);
-			
-		dd->vertex(&verts[tris[i+0]*3], color);
-		dd->vertex(&verts[tris[i+1]*3], color);
-		dd->vertex(&verts[tris[i+2]*3], color);
-	}
-	dd->end();
-}
-
-void duDebugDrawTriMeshSlope(duDebugDraw* dd, const float* verts, int /*nverts*/,
-							 const int* tris, const float* normals, int ntris,
-							 const float walkableSlopeAngle)
-{
-	if (!dd) return;
-	if (!verts) return;
-	if (!tris) return;
-	if (!normals) return;
-	
-	const float walkableThr = cosf(walkableSlopeAngle/180.0f*DU_PI);
-
-	dd->begin(DU_DRAW_TRIS);
-	for (int i = 0; i < ntris*3; i += 3)
-	{
-		const float* norm = &normals[i];
-		unsigned int color;
-		unsigned char a = (unsigned char)(255*(2+normals[i+0]+normals[i+1])/4);
-		if (norm[1] < walkableThr)
-			color = duRGBA(a,a/4,a/16,255);
-		else
-			color = duRGBA(a,a,a,255);
-		
-		dd->vertex(&verts[tris[i+0]*3], color);
-		dd->vertex(&verts[tris[i+1]*3], color);
-		dd->vertex(&verts[tris[i+2]*3], color);
-	}
-	dd->end();
-}
-
-void duDebugDrawHeightfieldSolid(duDebugDraw* dd, const rcHeightfield& hf)
-{
-	if (!dd) return;
-
-	const float* orig = hf.bmin;
-	const float cs = hf.cs;
-	const float ch = hf.ch;
-	
-	const int w = hf.width;
-	const int h = hf.height;
-		
-	unsigned int fcol[6];
-	duCalcBoxColors(fcol, duRGBA(255,255,255,255), duRGBA(255,255,255,255));
-	
-	dd->begin(DU_DRAW_QUADS);
-	
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			float fx = orig[0] + x*cs;
-			float fz = orig[2] + y*cs;
-			const rcSpan* s = hf.spans[x + y*w];
-			while (s)
-			{
-				duAppendBox(dd, fx, orig[1]+s->smin*ch, fz, fx+cs, orig[1] + s->smax*ch, fz+cs, fcol);
-				s = s->next;
-			}
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawHeightfieldWalkable(duDebugDraw* dd, const rcHeightfield& hf)
-{
-	if (!dd) return;
-
-	const float* orig = hf.bmin;
-	const float cs = hf.cs;
-	const float ch = hf.ch;
-	
-	const int w = hf.width;
-	const int h = hf.height;
-	
-	unsigned int fcol[6];
-	duCalcBoxColors(fcol, duRGBA(255,255,255,255), duRGBA(217,217,217,255));
-
-	dd->begin(DU_DRAW_QUADS);
-	
-	for (int y = 0; y < h; ++y)
-	{
-		for (int x = 0; x < w; ++x)
-		{
-			float fx = orig[0] + x*cs;
-			float fz = orig[2] + y*cs;
-			const rcSpan* s = hf.spans[x + y*w];
-			while (s)
-			{
-				if (s->area == RC_WALKABLE_AREA)
-					fcol[0] = duRGBA(64,128,160,255);
-				else if (s->area == RC_NULL_AREA)
-					fcol[0] = duRGBA(64,64,64,255);
-				else
-					fcol[0] = duMultCol(duIntToCol(s->area, 255), 200);
-				
-				duAppendBox(dd, fx, orig[1]+s->smin*ch, fz, fx+cs, orig[1] + s->smax*ch, fz+cs, fcol);
-				s = s->next;
-			}
-		}
-	}
-	
-	dd->end();
-}
-
-void duDebugDrawCompactHeightfieldSolid(duDebugDraw* dd, const rcCompactHeightfield& chf)
-{
-	if (!dd) return;
-
-	const float cs = chf.cs;
-	const float ch = chf.ch;
-
-	dd->begin(DU_DRAW_QUADS);
-	
-	for (int y = 0; y < chf.height; ++y)
-	{
-		for (int x = 0; x < chf.width; ++x)
-		{
-			const float fx = chf.bmin[0] + x*cs;
-			const float fz = chf.bmin[2] + y*cs;
-			const rcCompactCell& c = chf.cells[x+y*chf.width];
-
-			for (unsigned i = c.index, ni = c.index+c.count; i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-
-				unsigned int color;
-				if (chf.areas[i] == RC_WALKABLE_AREA)
-					color = duRGBA(0,192,255,64);
-				else if (chf.areas[i] == RC_NULL_AREA)
-					color = duRGBA(0,0,0,64);
-				else
-					color = duIntToCol(chf.areas[i], 255);
-				
-				const float fy = chf.bmin[1] + (s.y+1)*ch;
-				dd->vertex(fx, fy, fz, color);
-				dd->vertex(fx, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz, color);
-			}
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawCompactHeightfieldRegions(duDebugDraw* dd, const rcCompactHeightfield& chf)
-{
-	if (!dd) return;
-
-	const float cs = chf.cs;
-	const float ch = chf.ch;
-
-	dd->begin(DU_DRAW_QUADS);
-
-	for (int y = 0; y < chf.height; ++y)
-	{
-		for (int x = 0; x < chf.width; ++x)
-		{
-			const float fx = chf.bmin[0] + x*cs;
-			const float fz = chf.bmin[2] + y*cs;
-			const rcCompactCell& c = chf.cells[x+y*chf.width];
-			
-			for (unsigned i = c.index, ni = c.index+c.count; i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				const float fy = chf.bmin[1] + (s.y)*ch;
-				unsigned int color;
-				if (s.reg)
-					color = duIntToCol(s.reg, 192);
-				else
-					color = duRGBA(0,0,0,64);
-
-				dd->vertex(fx, fy, fz, color);
-				dd->vertex(fx, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz, color);
-			}
-		}
-	}
-	
-	dd->end();
-}
-
-
-void duDebugDrawCompactHeightfieldDistance(duDebugDraw* dd, const rcCompactHeightfield& chf)
-{
-	if (!dd) return;
-	if (!chf.dist) return;
-		
-	const float cs = chf.cs;
-	const float ch = chf.ch;
-			
-	float maxd = chf.maxDistance;
-	if (maxd < 1.0f) maxd = 1;
-	const float dscale = 255.0f / maxd;
-	
-	dd->begin(DU_DRAW_QUADS);
-	
-	for (int y = 0; y < chf.height; ++y)
-	{
-		for (int x = 0; x < chf.width; ++x)
-		{
-			const float fx = chf.bmin[0] + x*cs;
-			const float fz = chf.bmin[2] + y*cs;
-			const rcCompactCell& c = chf.cells[x+y*chf.width];
-			
-			for (unsigned i = c.index, ni = c.index+c.count; i < ni; ++i)
-			{
-				const rcCompactSpan& s = chf.spans[i];
-				const float fy = chf.bmin[1] + (s.y+1)*ch;
-				const unsigned char cd = (unsigned char)(chf.dist[i] * dscale);
-				const unsigned int color = duRGBA(cd,cd,cd,255);
-				dd->vertex(fx, fy, fz, color);
-				dd->vertex(fx, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz+cs, color);
-				dd->vertex(fx+cs, fy, fz, color);
-			}
-		}
-	}
-	dd->end();
-}
-
-static void getContourCenter(const rcContour* cont, const float* orig, float cs, float ch, float* center)
-{
-	center[0] = 0;
-	center[1] = 0;
-	center[2] = 0;
-	if (!cont->nverts)
-		return;
-	for (int i = 0; i < cont->nverts; ++i)
-	{
-		const int* v = &cont->verts[i*4];
-		center[0] += (float)v[0];
-		center[1] += (float)v[1];
-		center[2] += (float)v[2];
-	}
-	const float s = 1.0f / cont->nverts;
-	center[0] *= s * cs;
-	center[1] *= s * ch;
-	center[2] *= s * cs;
-	center[0] += orig[0];
-	center[1] += orig[1] + 4*ch;
-	center[2] += orig[2];
-}
-
-static const rcContour* findContourFromSet(const rcContourSet& cset, unsigned short reg)
-{
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		if (cset.conts[i].reg == reg)
-			return &cset.conts[i];
-	}
-	return 0;
-}
-
-void duDebugDrawRegionConnections(duDebugDraw* dd, const rcContourSet& cset, const float alpha)
-{
-	if (!dd) return;
-	
-	const float* orig = cset.bmin;
-	const float cs = cset.cs;
-	const float ch = cset.ch;
-	
-	// Draw centers
-	float pos[3], pos2[3];
-
-	unsigned int color = duRGBA(0,0,0,196);
-
-	dd->begin(DU_DRAW_LINES, 2.0f);
-
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour* cont = &cset.conts[i];
-		getContourCenter(cont, orig, cs, ch, pos);
-		for (int j = 0; j < cont->nverts; ++j)
-		{
-			const int* v = &cont->verts[j*4];
-			if (v[3] == 0 || (unsigned short)v[3] < cont->reg) continue;
-			const rcContour* cont2 = findContourFromSet(cset, (unsigned short)v[3]);
-			if (cont2)
-			{
-				getContourCenter(cont2, orig, cs, ch, pos2);
-				duAppendArc(dd, pos[0],pos[1],pos[2], pos2[0],pos2[1],pos2[2], 0.25f, 0.6f, 0.6f, color);
-			}
-		}
-	}
-	
-	dd->end();
-
-	unsigned char a = (unsigned char)(alpha * 255.0f);
-
-	dd->begin(DU_DRAW_POINTS, 7.0f);
-
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour* cont = &cset.conts[i];
-		unsigned int color = duDarkenCol(duIntToCol(cont->reg,a));
-		getContourCenter(cont, orig, cs, ch, pos);
-		dd->vertex(pos, color);
-	}
-	dd->end();
-}
-
-void duDebugDrawRawContours(duDebugDraw* dd, const rcContourSet& cset, const float alpha)
-{
-	if (!dd) return;
-
-	const float* orig = cset.bmin;
-	const float cs = cset.cs;
-	const float ch = cset.ch;
-	
-	const unsigned char a = (unsigned char)(alpha*255.0f);
-	
-	dd->begin(DU_DRAW_LINES, 2.0f);
-			
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour& c = cset.conts[i];
-		unsigned int color = duIntToCol(c.reg, a);
-
-		for (int j = 0; j < c.nrverts; ++j)
-		{
-			const int* v = &c.rverts[j*4];
-			float fx = orig[0] + v[0]*cs;
-			float fy = orig[1] + (v[1]+1+(i&1))*ch;
-			float fz = orig[2] + v[2]*cs;
-			dd->vertex(fx,fy,fz,color);
-			if (j > 0)
-				dd->vertex(fx,fy,fz,color);
-		}
-		// Loop last segment.
-		const int* v = &c.rverts[0];
-		float fx = orig[0] + v[0]*cs;
-		float fy = orig[1] + (v[1]+1+(i&1))*ch;
-		float fz = orig[2] + v[2]*cs;
-		dd->vertex(fx,fy,fz,color);
-	}
-	dd->end();
-
-	dd->begin(DU_DRAW_POINTS, 2.0f);	
-
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour& c = cset.conts[i];
-		unsigned int color = duDarkenCol(duIntToCol(c.reg, a));
-		
-		for (int j = 0; j < c.nrverts; ++j)
-		{
-			const int* v = &c.rverts[j*4];
-			float off = 0;
-			unsigned int colv = color;
-			if (v[3] & RC_BORDER_VERTEX)
-			{
-				colv = duRGBA(255,255,255,a);
-				off = ch*2;
-			}
-			
-			float fx = orig[0] + v[0]*cs;
-			float fy = orig[1] + (v[1]+1+(i&1))*ch + off;
-			float fz = orig[2] + v[2]*cs;
-			dd->vertex(fx,fy,fz, colv);
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawContours(duDebugDraw* dd, const rcContourSet& cset, const float alpha)
-{
-	if (!dd) return;
-
-	const float* orig = cset.bmin;
-	const float cs = cset.cs;
-	const float ch = cset.ch;
-	
-	const unsigned char a = (unsigned char)(alpha*255.0f);
-	
-	dd->begin(DU_DRAW_LINES, 2.5f);
-	
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour& c = cset.conts[i];
-		if (!c.nverts)
-			continue;
-		unsigned int color = duIntToCol(c.reg, a);
-
-		for (int j = 0; j < c.nverts; ++j)
-		{
-			const int* v = &c.verts[j*4];
-			float fx = orig[0] + v[0]*cs;
-			float fy = orig[1] + (v[1]+1+(i&1))*ch;
-			float fz = orig[2] + v[2]*cs;
-			dd->vertex(fx,fy,fz, color);
-			if (j > 0)
-				dd->vertex(fx,fy,fz, color);
-		}
-		// Loop last segment
-		const int* v = &c.verts[0];
-		float fx = orig[0] + v[0]*cs;
-		float fy = orig[1] + (v[1]+1+(i&1))*ch;
-		float fz = orig[2] + v[2]*cs;
-		dd->vertex(fx,fy,fz, color);
-	}
-	dd->end();
-
-	dd->begin(DU_DRAW_POINTS, 3.0f);
-	
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour& c = cset.conts[i];
-		unsigned int color = duDarkenCol(duIntToCol(c.reg, a));
-		for (int j = 0; j < c.nverts; ++j)
-		{
-			const int* v = &c.verts[j*4];
-			float off = 0;
-			unsigned int colv = color;
-			if (v[3] & RC_BORDER_VERTEX)
-			{
-				colv = duRGBA(255,255,255,a);
-				off = ch*2;
-			}
-
-			float fx = orig[0] + v[0]*cs;
-			float fy = orig[1] + (v[1]+1+(i&1))*ch + off;
-			float fz = orig[2] + v[2]*cs;
-			dd->vertex(fx,fy,fz, colv);
-		}
-	}
-	dd->end();
-}
-
-void duDebugDrawPolyMesh(duDebugDraw* dd, const struct rcPolyMesh& mesh)
-{
-	if (!dd) return;
-
-	const int nvp = mesh.nvp;
-	const float cs = mesh.cs;
-	const float ch = mesh.ch;
-	const float* orig = mesh.bmin;
-	
-	dd->begin(DU_DRAW_TRIS);
-	
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		const unsigned short* p = &mesh.polys[i*nvp*2];
-		
-		unsigned int color;
-		if (mesh.areas[i] == RC_WALKABLE_AREA)
-			color = duRGBA(0,192,255,64);
-		else if (mesh.areas[i] == RC_NULL_AREA)
-			color = duRGBA(0,0,0,64);
-		else
-			color = duIntToCol(mesh.areas[i], 255);
-		
-		unsigned short vi[3];
-		for (int j = 2; j < nvp; ++j)
-		{
-			if (p[j] == RC_MESH_NULL_IDX) break;
-			vi[0] = p[0];
-			vi[1] = p[j-1];
-			vi[2] = p[j];
-			for (int k = 0; k < 3; ++k)
-			{
-				const unsigned short* v = &mesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x,y,z, color);
-			}
-		}
-	}
-	dd->end();
-
-	// Draw neighbours edges
-	const unsigned int coln = duRGBA(0,48,64,32);
-	dd->begin(DU_DRAW_LINES, 1.5f);
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		const unsigned short* p = &mesh.polys[i*nvp*2];
-		for (int j = 0; j < nvp; ++j)
-		{
-			if (p[j] == RC_MESH_NULL_IDX) break;
-			if (p[nvp+j] == RC_MESH_NULL_IDX) continue;
-			int vi[2];
-			vi[0] = p[j];
-			if (j+1 >= nvp || p[j+1] == RC_MESH_NULL_IDX)
-				vi[1] = p[0];
-			else
-				vi[1] = p[j+1];
-			for (int k = 0; k < 2; ++k)
-			{
-				const unsigned short* v = &mesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x, y, z, coln);
-			}
-		}
-	}
-	dd->end();
-	
-	// Draw boundary edges
-	const unsigned int colb = duRGBA(0,48,64,220);
-	dd->begin(DU_DRAW_LINES, 2.5f);
-	for (int i = 0; i < mesh.npolys; ++i)
-	{
-		const unsigned short* p = &mesh.polys[i*nvp*2];
-		for (int j = 0; j < nvp; ++j)
-		{
-			if (p[j] == RC_MESH_NULL_IDX) break;
-			if (p[nvp+j] != RC_MESH_NULL_IDX) continue;
-			int vi[2];
-			vi[0] = p[j];
-			if (j+1 >= nvp || p[j+1] == RC_MESH_NULL_IDX)
-				vi[1] = p[0];
-			else
-				vi[1] = p[j+1];
-			for (int k = 0; k < 2; ++k)
-			{
-				const unsigned short* v = &mesh.verts[vi[k]*3];
-				const float x = orig[0] + v[0]*cs;
-				const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-				const float z = orig[2] + v[2]*cs;
-				dd->vertex(x, y, z, colb);
-			}
-		}
-	}
-	dd->end();
-	
-	dd->begin(DU_DRAW_POINTS, 3.0f);
-	const unsigned int colv = duRGBA(0,0,0,220);
-	for (int i = 0; i < mesh.nverts; ++i)
-	{
-		const unsigned short* v = &mesh.verts[i*3];
-		const float x = orig[0] + v[0]*cs;
-		const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-		const float z = orig[2] + v[2]*cs;
-		dd->vertex(x,y,z, colv);
-	}
-	dd->end();
-}
-
-void duDebugDrawPolyMeshDetail(duDebugDraw* dd, const struct rcPolyMeshDetail& dmesh)
-{
-	if (!dd) return;
-
-	dd->begin(DU_DRAW_TRIS);
-	
-	for (int i = 0; i < dmesh.nmeshes; ++i)
-	{
-		const unsigned int* m = &dmesh.meshes[i*4];
-		const unsigned int bverts = m[0];
-		const unsigned int btris = m[2];
-		const int ntris = (int)m[3];
-		const float* verts = &dmesh.verts[bverts*3];
-		const unsigned char* tris = &dmesh.tris[btris*4];
-
-		unsigned int color = duIntToCol(i, 192);
-
-		for (int j = 0; j < ntris; ++j)
-		{
-			dd->vertex(&verts[tris[j*4+0]*3], color);
-			dd->vertex(&verts[tris[j*4+1]*3], color);
-			dd->vertex(&verts[tris[j*4+2]*3], color);
-		}
-	}
-	dd->end();
-
-	// Internal edges.
-	dd->begin(DU_DRAW_LINES, 1.0f);
-	const unsigned int coli = duRGBA(0,0,0,64);
-	for (int i = 0; i < dmesh.nmeshes; ++i)
-	{
-		const unsigned int* m = &dmesh.meshes[i*4];
-		const unsigned int bverts = m[0];
-		const unsigned int btris = m[2];
-		const int ntris = (int)m[3];
-		const float* verts = &dmesh.verts[bverts*3];
-		const unsigned char* tris = &dmesh.tris[btris*4];
-		
-		for (int j = 0; j < ntris; ++j)
-		{
-			const unsigned char* t = &tris[j*4];
-			for (int k = 0, kp = 2; k < 3; kp=k++)
-			{
-				unsigned char ef = (t[3] >> (kp*2)) & 0x3;
-				if (ef == 0)
-				{
-					// Internal edge
-					if (t[kp] < t[k])
-					{
-						dd->vertex(&verts[t[kp]*3], coli);
-						dd->vertex(&verts[t[k]*3], coli);
-					}
-				}
-			}
-		}
-	}
-	dd->end();
-	
-	// External edges.
-	dd->begin(DU_DRAW_LINES, 2.0f);
-	const unsigned int cole = duRGBA(0,0,0,64);
-	for (int i = 0; i < dmesh.nmeshes; ++i)
-	{
-		const unsigned int* m = &dmesh.meshes[i*4];
-		const unsigned int bverts = m[0];
-		const unsigned int btris = m[2];
-		const int ntris = (int)m[3];
-		const float* verts = &dmesh.verts[bverts*3];
-		const unsigned char* tris = &dmesh.tris[btris*4];
-		
-		for (int j = 0; j < ntris; ++j)
-		{
-			const unsigned char* t = &tris[j*4];
-			for (int k = 0, kp = 2; k < 3; kp=k++)
-			{
-				unsigned char ef = (t[3] >> (kp*2)) & 0x3;
-				if (ef != 0)
-				{
-					// Ext edge
-					dd->vertex(&verts[t[kp]*3], cole);
-					dd->vertex(&verts[t[k]*3], cole);
-				}
-			}
-		}
-	}
-	dd->end();
-	
-	dd->begin(DU_DRAW_POINTS, 3.0f);
-	const unsigned int colv = duRGBA(0,0,0,64);
-	for (int i = 0; i < dmesh.nmeshes; ++i)
-	{
-		const unsigned int* m = &dmesh.meshes[i*4];
-		const unsigned int bverts = m[0];
-		const int nverts = (int)m[1];
-		const float* verts = &dmesh.verts[bverts*3];
-		for (int j = 0; j < nverts; ++j)
-			dd->vertex(&verts[j*3], colv);
-	}
-	dd->end();
-}
diff --git a/dep/recastnavigation/DebugUtils/Source/RecastDump.cpp b/dep/recastnavigation/DebugUtils/Source/RecastDump.cpp
deleted file mode 100644
index 4def9a06f7c..00000000000
--- a/dep/recastnavigation/DebugUtils/Source/RecastDump.cpp
+++ /dev/null
@@ -1,439 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include "Recast.h"
-#include "RecastAlloc.h"
-#include "RecastDump.h"
-
-
-duFileIO::~duFileIO()
-{
-	// Empty
-}
-	
-static void ioprintf(duFileIO* io, const char* format, ...)
-{
-	char line[256];
-	va_list ap;
-	va_start(ap, format);
-	const int n = vsnprintf(line, sizeof(line), format, ap);
-	va_end(ap);
-	if (n > 0)
-		io->write(line, sizeof(char)*n);
-}
-
-bool duDumpPolyMeshToObj(rcPolyMesh& pmesh, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duDumpPolyMeshToObj: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isWriting())
-	{
-		printf("duDumpPolyMeshToObj: input IO not writing.\n"); 
-		return false;
-	}
-	
-	const int nvp = pmesh.nvp;
-	const float cs = pmesh.cs;
-	const float ch = pmesh.ch;
-	const float* orig = pmesh.bmin;
-	
-	ioprintf(io, "# Recast Navmesh\n");
-	ioprintf(io, "o NavMesh\n");
-
-	ioprintf(io, "\n");
-	
-	for (int i = 0; i < pmesh.nverts; ++i)
-	{
-		const unsigned short* v = &pmesh.verts[i*3];
-		const float x = orig[0] + v[0]*cs;
-		const float y = orig[1] + (v[1]+1)*ch + 0.1f;
-		const float z = orig[2] + v[2]*cs;
-		ioprintf(io, "v %f %f %f\n", x,y,z);
-	}
-
-	ioprintf(io, "\n");
-
-	for (int i = 0; i < pmesh.npolys; ++i)
-	{
-		const unsigned short* p = &pmesh.polys[i*nvp*2];
-		for (int j = 2; j < nvp; ++j)
-		{
-			if (p[j] == RC_MESH_NULL_IDX) break;
-			ioprintf(io, "f %d %d %d\n", p[0]+1, p[j-1]+1, p[j]+1); 
-		}
-	}
-	
-	return true;
-}
-
-bool duDumpPolyMeshDetailToObj(rcPolyMeshDetail& dmesh, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duDumpPolyMeshDetailToObj: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isWriting())
-	{
-		printf("duDumpPolyMeshDetailToObj: input IO not writing.\n"); 
-		return false;
-	}
-	
-	ioprintf(io, "# Recast Navmesh\n");
-	ioprintf(io, "o NavMesh\n");
-	
-	ioprintf(io, "\n");
-
-	for (int i = 0; i < dmesh.nverts; ++i)
-	{
-		const float* v = &dmesh.verts[i*3];
-		ioprintf(io, "v %f %f %f\n", v[0],v[1],v[2]);
-	}
-	
-	ioprintf(io, "\n");
-	
-	for (int i = 0; i < dmesh.nmeshes; ++i)
-	{
-		const unsigned int* m = &dmesh.meshes[i*4];
-		const unsigned int bverts = m[0];
-		const unsigned int btris = m[2];
-		const unsigned int ntris = m[3];
-		const unsigned char* tris = &dmesh.tris[btris*4];
-		for (unsigned int j = 0; j < ntris; ++j)
-		{
-			ioprintf(io, "f %d %d %d\n",
-					(int)(bverts+tris[j*4+0])+1,
-					(int)(bverts+tris[j*4+1])+1,
-					(int)(bverts+tris[j*4+2])+1);
-		}
-	}
-	
-	return true;
-}
-
-static const int CSET_MAGIC = ('c' << 24) | ('s' << 16) | ('e' << 8) | 't';
-static const int CSET_VERSION = 1;
-
-bool duDumpContourSet(struct rcContourSet& cset, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duDumpContourSet: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isWriting())
-	{
-		printf("duDumpContourSet: input IO not writing.\n"); 
-		return false;
-	}
-	
-	io->write(&CSET_MAGIC, sizeof(CSET_MAGIC));
-	io->write(&CSET_VERSION, sizeof(CSET_VERSION));
-
-	io->write(&cset.nconts, sizeof(cset.nconts));
-	
-	io->write(cset.bmin, sizeof(cset.bmin));
-	io->write(cset.bmax, sizeof(cset.bmax));
-	
-	io->write(&cset.cs, sizeof(cset.cs));
-	io->write(&cset.ch, sizeof(cset.ch));
-
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		const rcContour& cont = cset.conts[i];
-		io->write(&cont.nverts, sizeof(cont.nverts));
-		io->write(&cont.nrverts, sizeof(cont.nrverts));
-		io->write(&cont.reg, sizeof(cont.reg));
-		io->write(&cont.area, sizeof(cont.area));
-		io->write(cont.verts, sizeof(int)*4*cont.nverts);
-		io->write(cont.rverts, sizeof(int)*4*cont.nrverts);
-	}
-
-	return true;
-}
-
-bool duReadContourSet(struct rcContourSet& cset, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duReadContourSet: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isReading())
-	{
-		printf("duReadContourSet: input IO not reading.\n"); 
-		return false;
-	}
-	
-	int magic = 0;
-	int version = 0;
-	
-	io->read(&magic, sizeof(magic));
-	io->read(&version, sizeof(version));
-	
-	if (magic != CSET_MAGIC)
-	{
-		printf("duReadContourSet: Bad voodoo.\n");
-		return false;
-	}
-	if (version != CSET_VERSION)
-	{
-		printf("duReadContourSet: Bad version.\n");
-		return false;
-	}
-	
-	io->read(&cset.nconts, sizeof(cset.nconts));
-
-	cset.conts = (rcContour*)rcAlloc(sizeof(rcContour)*cset.nconts, RC_ALLOC_PERM);
-	if (!cset.conts)
-	{
-		printf("duReadContourSet: Could not alloc contours (%d)\n", cset.nconts);
-		return false;
-	}
-	memset(cset.conts, 0, sizeof(rcContour)*cset.nconts);
-	
-	io->read(cset.bmin, sizeof(cset.bmin));
-	io->read(cset.bmax, sizeof(cset.bmax));
-	
-	io->read(&cset.cs, sizeof(cset.cs));
-	io->read(&cset.ch, sizeof(cset.ch));
-	
-	for (int i = 0; i < cset.nconts; ++i)
-	{
-		rcContour& cont = cset.conts[i];
-		io->read(&cont.nverts, sizeof(cont.nverts));
-		io->read(&cont.nrverts, sizeof(cont.nrverts));
-		io->read(&cont.reg, sizeof(cont.reg));
-		io->read(&cont.area, sizeof(cont.area));
-
-		cont.verts = (int*)rcAlloc(sizeof(int)*4*cont.nverts, RC_ALLOC_PERM);
-		if (!cont.verts)
-		{
-			printf("duReadContourSet: Could not alloc contour verts (%d)\n", cont.nverts);
-			return false;
-		}
-		cont.rverts = (int*)rcAlloc(sizeof(int)*4*cont.nrverts, RC_ALLOC_PERM);
-		if (!cont.rverts)
-		{
-			printf("duReadContourSet: Could not alloc contour rverts (%d)\n", cont.nrverts);
-			return false;
-		}
-		
-		io->read(cont.verts, sizeof(int)*4*cont.nverts);
-		io->read(cont.rverts, sizeof(int)*4*cont.nrverts);
-	}
-	
-	return true;
-}
-	
-
-static const int CHF_MAGIC = ('r' << 24) | ('c' << 16) | ('h' << 8) | 'f';
-static const int CHF_VERSION = 2;
-
-bool duDumpCompactHeightfield(struct rcCompactHeightfield& chf, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duDumpCompactHeightfield: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isWriting())
-	{
-		printf("duDumpCompactHeightfield: input IO not writing.\n"); 
-		return false;
-	}
-	
-	io->write(&CHF_MAGIC, sizeof(CHF_MAGIC));
-	io->write(&CHF_VERSION, sizeof(CHF_VERSION));
-	
-	io->write(&chf.width, sizeof(chf.width));
-	io->write(&chf.height, sizeof(chf.height));
-	io->write(&chf.spanCount, sizeof(chf.spanCount));
-
-	io->write(&chf.walkableHeight, sizeof(chf.walkableHeight));
-	io->write(&chf.walkableClimb, sizeof(chf.walkableClimb));
-
-	io->write(&chf.maxDistance, sizeof(chf.maxDistance));
-	io->write(&chf.maxRegions, sizeof(chf.maxRegions));
-
-	io->write(chf.bmin, sizeof(chf.bmin));
-	io->write(chf.bmax, sizeof(chf.bmax));
-
-	io->write(&chf.cs, sizeof(chf.cs));
-	io->write(&chf.ch, sizeof(chf.ch));
-
-	int tmp = 0;
-	if (chf.cells) tmp |= 1;
-	if (chf.spans) tmp |= 2;
-	if (chf.dist) tmp |= 4;
-	if (chf.areas) tmp |= 8;
-
-	io->write(&tmp, sizeof(tmp));
-
-	if (chf.cells)
-		io->write(chf.cells, sizeof(rcCompactCell)*chf.width*chf.height);
-	if (chf.spans)
-		io->write(chf.spans, sizeof(rcCompactSpan)*chf.spanCount);
-	if (chf.dist)
-		io->write(chf.dist, sizeof(unsigned short)*chf.spanCount);
-	if (chf.areas)
-		io->write(chf.areas, sizeof(unsigned char)*chf.spanCount);
-
-	return true;
-}
-
-bool duReadCompactHeightfield(struct rcCompactHeightfield& chf, duFileIO* io)
-{
-	if (!io)
-	{
-		printf("duReadCompactHeightfield: input IO is null.\n"); 
-		return false;
-	}
-	if (!io->isReading())
-	{
-		printf("duReadCompactHeightfield: input IO not reading.\n"); 
-		return false;
-	}
-
-	int magic = 0;
-	int version = 0;
-	
-	io->read(&magic, sizeof(magic));
-	io->read(&version, sizeof(version));
-	
-	if (magic != CHF_MAGIC)
-	{
-		printf("duReadCompactHeightfield: Bad voodoo.\n");
-		return false;
-	}
-	if (version != CHF_VERSION)
-	{
-		printf("duReadCompactHeightfield: Bad version.\n");
-		return false;
-	}
-	
-	io->read(&chf.width, sizeof(chf.width));
-	io->read(&chf.height, sizeof(chf.height));
-	io->read(&chf.spanCount, sizeof(chf.spanCount));
-	
-	io->read(&chf.walkableHeight, sizeof(chf.walkableHeight));
-	io->read(&chf.walkableClimb, sizeof(chf.walkableClimb));
-	
-	io->read(&chf.maxDistance, sizeof(chf.maxDistance));
-	io->read(&chf.maxRegions, sizeof(chf.maxRegions));
-	
-	io->read(chf.bmin, sizeof(chf.bmin));
-	io->read(chf.bmax, sizeof(chf.bmax));
-	
-	io->read(&chf.cs, sizeof(chf.cs));
-	io->read(&chf.ch, sizeof(chf.ch));
-	
-	int tmp = 0;
-	io->read(&tmp, sizeof(tmp));
-	
-	if (tmp & 1)
-	{
-		chf.cells = (rcCompactCell*)rcAlloc(sizeof(rcCompactCell)*chf.width*chf.height, RC_ALLOC_PERM);
-		if (!chf.cells)
-		{
-			printf("duReadCompactHeightfield: Could not alloc cells (%d)\n", chf.width*chf.height);
-			return false;
-		}
-		io->read(chf.cells, sizeof(rcCompactCell)*chf.width*chf.height);
-	}
-	if (tmp & 2)
-	{
-		chf.spans = (rcCompactSpan*)rcAlloc(sizeof(rcCompactSpan)*chf.spanCount, RC_ALLOC_PERM);
-		if (!chf.spans)
-		{
-			printf("duReadCompactHeightfield: Could not alloc spans (%d)\n", chf.spanCount);
-			return false;
-		}
-		io->read(chf.spans, sizeof(rcCompactSpan)*chf.spanCount);
-	}
-	if (tmp & 4)
-	{
-		chf.dist = (unsigned short*)rcAlloc(sizeof(unsigned short)*chf.spanCount, RC_ALLOC_PERM);
-		if (!chf.dist)
-		{
-			printf("duReadCompactHeightfield: Could not alloc dist (%d)\n", chf.spanCount);
-			return false;
-		}
-		io->read(chf.dist, sizeof(unsigned short)*chf.spanCount);
-	}
-	if (tmp & 8)
-	{
-		chf.areas = (unsigned char*)rcAlloc(sizeof(unsigned char)*chf.spanCount, RC_ALLOC_PERM);
-		if (!chf.areas)
-		{
-			printf("duReadCompactHeightfield: Could not alloc areas (%d)\n", chf.spanCount);
-			return false;
-		}
-		io->read(chf.areas, sizeof(unsigned char)*chf.spanCount);
-	}
-	
-	return true;
-}
-
-
-static void logLine(rcContext& ctx, rcTimerLabel label, const char* name, const float pc)
-{
-	const int t = ctx.getAccumulatedTime(label);
-	if (t < 0) return;
-	ctx.log(RC_LOG_PROGRESS, "%s:\t%.2fms\t(%.1f%%)", name, t/1000.0f, t*pc);
-}
-
-void duLogBuildTimes(rcContext& ctx, const int totalTimeUsec)
-{
-	const float pc = 100.0f / totalTimeUsec;
- 
-	ctx.log(RC_LOG_PROGRESS, "Build Times");
-	logLine(ctx, RC_TIMER_RASTERIZE_TRIANGLES,		"- Rasterize", pc);
-	logLine(ctx, RC_TIMER_BUILD_COMPACTHEIGHTFIELD,	"- Build Compact", pc);
-	logLine(ctx, RC_TIMER_FILTER_BORDER,				"- Filter Border", pc);
-	logLine(ctx, RC_TIMER_FILTER_WALKABLE,			"- Filter Walkable", pc);
-	logLine(ctx, RC_TIMER_ERODE_AREA,				"- Erode Area", pc);
-	logLine(ctx, RC_TIMER_MEDIAN_AREA,				"- Median Area", pc);
-	logLine(ctx, RC_TIMER_MARK_BOX_AREA,				"- Mark Box Area", pc);
-	logLine(ctx, RC_TIMER_MARK_CONVEXPOLY_AREA,		"- Mark Convex Area", pc);
-	logLine(ctx, RC_TIMER_BUILD_DISTANCEFIELD,		"- Build Disntace Field", pc);
-	logLine(ctx, RC_TIMER_BUILD_DISTANCEFIELD_DIST,	"    - Distance", pc);
-	logLine(ctx, RC_TIMER_BUILD_DISTANCEFIELD_BLUR,	"    - Blur", pc);
-	logLine(ctx, RC_TIMER_BUILD_REGIONS,				"- Build Regions", pc);
-	logLine(ctx, RC_TIMER_BUILD_REGIONS_WATERSHED,	"    - Watershed", pc);
-	logLine(ctx, RC_TIMER_BUILD_REGIONS_EXPAND,		"      - Expand", pc);
-	logLine(ctx, RC_TIMER_BUILD_REGIONS_FLOOD,		"      - Find Basins", pc);
-	logLine(ctx, RC_TIMER_BUILD_REGIONS_FILTER,		"    - Filter", pc);
-	logLine(ctx, RC_TIMER_BUILD_CONTOURS,			"- Build Contours", pc);
-	logLine(ctx, RC_TIMER_BUILD_CONTOURS_TRACE,		"    - Trace", pc);
-	logLine(ctx, RC_TIMER_BUILD_CONTOURS_SIMPLIFY,	"    - Simplify", pc);
-	logLine(ctx, RC_TIMER_BUILD_POLYMESH,			"- Build Polymesh", pc);
-	logLine(ctx, RC_TIMER_BUILD_POLYMESHDETAIL,		"- Build Polymesh Detail", pc);
-	logLine(ctx, RC_TIMER_MERGE_POLYMESH,			"- Merge Polymeshes", pc);
-	logLine(ctx, RC_TIMER_MERGE_POLYMESHDETAIL,		"- Merge Polymesh Details", pc);
-	ctx.log(RC_LOG_PROGRESS, "=== TOTAL:\t%.2fms", totalTimeUsec/1000.0f);
-}
-
diff --git a/dep/recastnavigation/Detour/CMakeLists.txt b/dep/recastnavigation/Detour/CMakeLists.txt
index eec47ef0a0e..3c836ec20df 100644
--- a/dep/recastnavigation/Detour/CMakeLists.txt
+++ b/dep/recastnavigation/Detour/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2005-2011 MaNGOS project <http://getmangos.com/>
+# This file is part of the CMaNGOS Project. See AUTHORS file for Copyright information
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/dep/recastnavigation/Detour/Include/DetourAlloc.h b/dep/recastnavigation/Detour/Include/DetourAlloc.h
index 8693475419e..e814b62a716 100644
--- a/dep/recastnavigation/Detour/Include/DetourAlloc.h
+++ b/dep/recastnavigation/Detour/Include/DetourAlloc.h
@@ -19,18 +19,41 @@
 #ifndef DETOURALLOCATOR_H
 #define DETOURALLOCATOR_H
 
+/// Provides hint values to the memory allocator on how long the
+/// memory is expected to be used.
 enum dtAllocHint
 {
-	DT_ALLOC_PERM,		// Memory persist after a function call.
-	DT_ALLOC_TEMP		// Memory used temporarily within a function.
+	DT_ALLOC_PERM,		///< Memory persist after a function call.
+	DT_ALLOC_TEMP		///< Memory used temporarily within a function.
 };
 
+/// A memory allocation function.
+//  @param[in]		size			The size, in bytes of memory, to allocate.
+//  @param[in]		rcAllocHint	A hint to the allocator on how long the memory is expected to be in use.
+//  @return A pointer to the beginning of the allocated memory block, or null if the allocation failed.
+///  @see dtAllocSetCustom
 typedef void* (dtAllocFunc)(int size, dtAllocHint hint);
+
+/// A memory deallocation function.
+///  @param[in]		ptr		A pointer to a memory block previously allocated using #dtAllocFunc.
+/// @see dtAllocSetCustom
 typedef void (dtFreeFunc)(void* ptr);
 
+/// Sets the base custom allocation functions to be used by Detour.
+///  @param[in]		allocFunc	The memory allocation function to be used by #dtAlloc
+///  @param[in]		freeFunc	The memory de-allocation function to be used by #dtFree
 void dtAllocSetCustom(dtAllocFunc *allocFunc, dtFreeFunc *freeFunc);
 
+/// Allocates a memory block.
+///  @param[in]		size	The size, in bytes of memory, to allocate.
+///  @param[in]		hint	A hint to the allocator on how long the memory is expected to be in use.
+///  @return A pointer to the beginning of the allocated memory block, or null if the allocation failed.
+/// @see dtFree
 void* dtAlloc(int size, dtAllocHint hint);
+
+/// Deallocates a memory block.
+///  @param[in]		ptr		A pointer to a memory block previously allocated using #dtAlloc.
+/// @see dtAlloc
 void dtFree(void* ptr);
 
 #endif
diff --git a/dep/recastnavigation/Detour/Include/DetourAssert.h b/dep/recastnavigation/Detour/Include/DetourAssert.h
index 709ebd9f5f8..3cf652288fa 100644
--- a/dep/recastnavigation/Detour/Include/DetourAssert.h
+++ b/dep/recastnavigation/Detour/Include/DetourAssert.h
@@ -24,7 +24,7 @@
 
 #ifdef NDEBUG
 // From http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/
-#	define dtAssert(x) do { (void)sizeof(x); } while(__LINE__==-1,false)  
+#	define dtAssert(x) do { (void)sizeof(x); } while((void)(__LINE__==-1),false)  
 #else
 #	include <assert.h> 
 #	define dtAssert assert
diff --git a/dep/recastnavigation/Detour/Include/DetourCommon.h b/dep/recastnavigation/Detour/Include/DetourCommon.h
index 3cee3f63510..ed7c5149db9 100644
--- a/dep/recastnavigation/Detour/Include/DetourCommon.h
+++ b/dep/recastnavigation/Detour/Include/DetourCommon.h
@@ -19,15 +19,66 @@
 #ifndef DETOURCOMMON_H
 #define DETOURCOMMON_H
 
+/**
+@defgroup detour Detour
+
+Members in this module are used to create, manipulate, and query navigation 
+meshes.
+
+@note This is a summary list of members.  Use the index or search 
+feature to find minor members.
+*/
+
+/// @name General helper functions
+/// @{
+
+/// Swaps the values of the two parameters.
+///  @param[in,out]	a	Value A
+///  @param[in,out]	b	Value B
 template<class T> inline void dtSwap(T& a, T& b) { T t = a; a = b; b = t; }
+
+/// Returns the minimum of two values.
+///  @param[in]		a	Value A
+///  @param[in]		b	Value B
+///  @return The minimum of the two values.
 template<class T> inline T dtMin(T a, T b) { return a < b ? a : b; }
+
+/// Returns the maximum of two values.
+///  @param[in]		a	Value A
+///  @param[in]		b	Value B
+///  @return The maximum of the two values.
 template<class T> inline T dtMax(T a, T b) { return a > b ? a : b; }
+
+/// Returns the absolute value.
+///  @param[in]		a	The value.
+///  @return The absolute value of the specified value.
 template<class T> inline T dtAbs(T a) { return a < 0 ? -a : a; }
+
+/// Returns the square of the value.
+///  @param[in]		a	The value.
+///  @return The square of the value.
 template<class T> inline T dtSqr(T a) { return a*a; }
+
+/// Clamps the value to the specified range.
+///  @param[in]		v	The value to clamp.
+///  @param[in]		mn	The minimum permitted return value.
+///  @param[in]		mx	The maximum permitted return value.
+///  @return The value, clamped to the specified range.
 template<class T> inline T dtClamp(T v, T mn, T mx) { return v < mn ? mn : (v > mx ? mx : v); }
 
+/// Returns the square root of the value.
+///  @param[in]		x	The value.
+///  @return The square root of the vlaue.
 float dtSqrt(float x);
 
+/// @}
+/// @name Vector helper functions.
+/// @{
+
+/// Derives the cross product of two vectors. (@p v1 x @p v2)
+///  @param[out]	dest	The cross product. [(x, y, z)]
+///  @param[in]		v1		A Vector [(x, y, z)]
+///  @param[in]		v2		A vector [(x, y, z)]
 inline void dtVcross(float* dest, const float* v1, const float* v2)
 {
 	dest[0] = v1[1]*v2[2] - v1[2]*v2[1];
@@ -35,11 +86,20 @@ inline void dtVcross(float* dest, const float* v1, const float* v2)
 	dest[2] = v1[0]*v2[1] - v1[1]*v2[0]; 
 }
 
+/// Derives the dot product of two vectors. (@p v1 . @p v2)
+///  @param[in]		v1	A Vector [(x, y, z)]
+///  @param[in]		v2	A vector [(x, y, z)]
+/// @return The dot product.
 inline float dtVdot(const float* v1, const float* v2)
 {
 	return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2];
 }
 
+/// Performs a scaled vector addition. (@p v1 + (@p v2 * @p s))
+///  @param[out]	dest	The result vector. [(x, y, z)]
+///  @param[in]		v1		The base vector. [(x, y, z)]
+///  @param[in]		v2		The vector to scale and add to @p v1. [(x, y, z)]
+///  @param[in]		s		The amount to scale @p v2 by before adding to @p v1.
 inline void dtVmad(float* dest, const float* v1, const float* v2, const float s)
 {
 	dest[0] = v1[0]+v2[0]*s;
@@ -47,6 +107,11 @@ inline void dtVmad(float* dest, const float* v1, const float* v2, const float s)
 	dest[2] = v1[2]+v2[2]*s;
 }
 
+/// Performs a linear interpolation between two vectors. (@p v1 toward @p v2)
+///  @param[out]	dest	The result vector. [(x, y, x)]
+///  @param[in]		v1		The starting vector.
+///  @param[in]		v2		The destination vector.
+///	 @param[in]		t		The interpolation factor. [Limits: 0 <= value <= 1.0]
 inline void dtVlerp(float* dest, const float* v1, const float* v2, const float t)
 {
 	dest[0] = v1[0]+(v2[0]-v1[0])*t;
@@ -54,6 +119,10 @@ inline void dtVlerp(float* dest, const float* v1, const float* v2, const float t
 	dest[2] = v1[2]+(v2[2]-v1[2])*t;
 }
 
+/// Performs a vector addition. (@p v1 + @p v2)
+///  @param[out]	dest	The result vector. [(x, y, z)]
+///  @param[in]		v1		The base vector. [(x, y, z)]
+///  @param[in]		v2		The vector to add to @p v1. [(x, y, z)]
 inline void dtVadd(float* dest, const float* v1, const float* v2)
 {
 	dest[0] = v1[0]+v2[0];
@@ -61,6 +130,10 @@ inline void dtVadd(float* dest, const float* v1, const float* v2)
 	dest[2] = v1[2]+v2[2];
 }
 
+/// Performs a vector subtraction. (@p v1 - @p v2)
+///  @param[out]	dest	The result vector. [(x, y, z)]
+///  @param[in]		v1		The base vector. [(x, y, z)]
+///  @param[in]		v2		The vector to subtract from @p v1. [(x, y, z)]
 inline void dtVsub(float* dest, const float* v1, const float* v2)
 {
 	dest[0] = v1[0]-v2[0];
@@ -68,6 +141,10 @@ inline void dtVsub(float* dest, const float* v1, const float* v2)
 	dest[2] = v1[2]-v2[2];
 }
 
+/// Scales the vector by the specified value. (@p v * @p t)
+///  @param[out]	dest	The result vector. [(x, y, z)]
+///  @param[in]		v		The vector to scale. [(x, y, z)]
+///  @param[in]		t		The scaling factor.
 inline void dtVscale(float* dest, const float* v, const float t)
 {
 	dest[0] = v[0]*t;
@@ -75,6 +152,9 @@ inline void dtVscale(float* dest, const float* v, const float t)
 	dest[2] = v[2]*t;
 }
 
+/// Selects the minimum value of each element from the specified vectors.
+///  @param[in,out]	mn	A vector.  (Will be updated with the result.) [(x, y, z)]
+///  @param[in]	v	A vector. [(x, y, z)]
 inline void dtVmin(float* mn, const float* v)
 {
 	mn[0] = dtMin(mn[0], v[0]);
@@ -82,6 +162,9 @@ inline void dtVmin(float* mn, const float* v)
 	mn[2] = dtMin(mn[2], v[2]);
 }
 
+/// Selects the maximum value of each element from the specified vectors.
+///  @param[in,out]	mx	A vector.  (Will be updated with the result.) [(x, y, z)]
+///  @param[in]		v	A vector. [(x, y, z)]
 inline void dtVmax(float* mx, const float* v)
 {
 	mx[0] = dtMax(mx[0], v[0]);
@@ -89,11 +172,19 @@ inline void dtVmax(float* mx, const float* v)
 	mx[2] = dtMax(mx[2], v[2]);
 }
 
+/// Sets the vector elements to the specified values.
+///  @param[out]	dest	The result vector. [(x, y, z)]
+///  @param[in]		x		The x-value of the vector.
+///  @param[in]		y		The y-value of the vector.
+///  @param[in]		z		The z-value of the vector.
 inline void dtVset(float* dest, const float x, const float y, const float z)
 {
 	dest[0] = x; dest[1] = y; dest[2] = z;
 }
 
+/// Performs a vector copy.
+///  @param[out]	dest	The result. [(x, y, z)]
+///  @param[in]		a		The vector to copy. [(x, y, z)]
 inline void dtVcopy(float* dest, const float* a)
 {
 	dest[0] = a[0];
@@ -101,16 +192,26 @@ inline void dtVcopy(float* dest, const float* a)
 	dest[2] = a[2];
 }
 
+/// Derives the scalar length of the vector.
+///  @param[in]		v The vector. [(x, y, z)]
+/// @return The scalar length of the vector.
 inline float dtVlen(const float* v)
 {
 	return dtSqrt(v[0]*v[0] + v[1]*v[1] + v[2]*v[2]);
 }
 
+/// Derives the square of the scalar length of the vector. (len * len)
+///  @param[in]		v The vector. [(x, y, z)]
+/// @return The square of the scalar length of the vector.
 inline float dtVlenSqr(const float* v)
 {
 	return v[0]*v[0] + v[1]*v[1] + v[2]*v[2];
 }
 
+/// Returns the distance between two points.
+///  @param[in]		v1	A point. [(x, y, z)]
+///  @param[in]		v2	A point. [(x, y, z)]
+/// @return The distance between the two points.
 inline float dtVdist(const float* v1, const float* v2)
 {
 	const float dx = v2[0] - v1[0];
@@ -119,6 +220,10 @@ inline float dtVdist(const float* v1, const float* v2)
 	return dtSqrt(dx*dx + dy*dy + dz*dz);
 }
 
+/// Returns the square of the distance between two points.
+///  @param[in]		v1	A point. [(x, y, z)]
+///  @param[in]		v2	A point. [(x, y, z)]
+/// @return The square of the distance between the two points.
 inline float dtVdistSqr(const float* v1, const float* v2)
 {
 	const float dx = v2[0] - v1[0];
@@ -127,6 +232,12 @@ inline float dtVdistSqr(const float* v1, const float* v2)
 	return dx*dx + dy*dy + dz*dz;
 }
 
+/// Derives the distance between the specified points on the xz-plane.
+///  @param[in]		v1	A point. [(x, y, z)]
+///  @param[in]		v2	A point. [(x, y, z)]
+/// @return The distance between the point on the xz-plane.
+///
+/// The vectors are projected onto the xz-plane, so the y-values are ignored.
 inline float dtVdist2D(const float* v1, const float* v2)
 {
 	const float dx = v2[0] - v1[0];
@@ -134,6 +245,10 @@ inline float dtVdist2D(const float* v1, const float* v2)
 	return dtSqrt(dx*dx + dz*dz);
 }
 
+/// Derives the square of the distance between the specified points on the xz-plane.
+///  @param[in]		v1	A point. [(x, y, z)]
+///  @param[in]		v2	A point. [(x, y, z)]
+/// @return The square of the distance between the point on the xz-plane.
 inline float dtVdist2DSqr(const float* v1, const float* v2)
 {
 	const float dx = v2[0] - v1[0];
@@ -141,6 +256,8 @@ inline float dtVdist2DSqr(const float* v1, const float* v2)
 	return dx*dx + dz*dz;
 }
 
+/// Normalizes the vector.
+///  @param[in,out]	v	The vector to normalize. [(x, y, z)]
 inline void dtVnormalize(float* v)
 {
 	float d = 1.0f / dtSqrt(dtSqr(v[0]) + dtSqr(v[1]) + dtSqr(v[2]));
@@ -149,6 +266,13 @@ inline void dtVnormalize(float* v)
 	v[2] *= d;
 }
 
+/// Performs a 'sloppy' colocation check of the specified points.
+///  @param[in]		p0	A point. [(x, y, z)]
+///  @param[in]		p1	A point. [(x, y, z)]
+/// @return True if the points are considered to be at the same location.
+///
+/// Basically, this function will return true if the specified points are 
+/// close enough to eachother to be considered colocated.
 inline bool dtVequal(const float* p0, const float* p1)
 {
 	static const float thr = dtSqr(1.0f/16384.0f);
@@ -156,44 +280,37 @@ inline bool dtVequal(const float* p0, const float* p1)
 	return d < thr;
 }
 
-inline unsigned int dtNextPow2(unsigned int v)
-{
-	v--;
-	v |= v >> 1;
-	v |= v >> 2;
-	v |= v >> 4;
-	v |= v >> 8;
-	v |= v >> 16;
-	v++;
-	return v;
-}
-
-inline unsigned int dtIlog2(unsigned int v)
-{
-	unsigned int r;
-	unsigned int shift;
-	r = (v > 0xffff) << 4; v >>= r;
-	shift = (v > 0xff) << 3; v >>= shift; r |= shift;
-	shift = (v > 0xf) << 2; v >>= shift; r |= shift;
-	shift = (v > 0x3) << 1; v >>= shift; r |= shift;
-	r |= (v >> 1);
-	return r;
-}
-
-inline int dtAlign4(int x) { return (x+3) & ~3; }
-
-inline int dtOppositeTile(int side) { return (side+4) & 0x7; }
-
+/// Derives the dot product of two vectors on the xz-plane. (@p u . @p v)
+///  @param[in]		u		A vector [(x, y, z)]
+///  @param[in]		v		A vector [(x, y, z)]
+/// @return The dot product on the xz-plane.
+///
+/// The vectors are projected onto the xz-plane, so the y-values are ignored.
 inline float dtVdot2D(const float* u, const float* v)
 {
 	return u[0]*v[0] + u[2]*v[2];
 }
 
+/// Derives the xz-plane 2D perp product of the two vectors. (uz*vx - ux*vz)
+///  @param[in]		u		The LHV vector [(x, y, z)]
+///  @param[in]		v		The RHV vector [(x, y, z)]
+/// @return The dot product on the xz-plane.
+///
+/// The vectors are projected onto the xz-plane, so the y-values are ignored.
 inline float dtVperp2D(const float* u, const float* v)
 {
 	return u[2]*v[0] - u[0]*v[2];
 }
 
+/// @}
+/// @name Computational geometry helper functions.
+/// @{
+
+/// Derives the signed xz-plane area of the triangle ABC, or the relationship of line AB to point C.
+///  @param[in]		a		Vertex A. [(x, y, z)]
+///  @param[in]		b		Vertex B. [(x, y, z)]
+///  @param[in]		c		Vertex C. [(x, y, z)]
+/// @return The signed xz-plane area of the triangle.
 inline float dtTriArea2D(const float* a, const float* b, const float* c)
 {
 	const float abx = b[0] - a[0];
@@ -203,6 +320,13 @@ inline float dtTriArea2D(const float* a, const float* b, const float* c)
 	return acx*abz - abx*acz;
 }
 
+/// Determines if two axis-aligned bounding boxes overlap.
+///  @param[in]		amin	Minimum bounds of box A. [(x, y, z)]
+///  @param[in]		amax	Maximum bounds of box A. [(x, y, z)]
+///  @param[in]		bmin	Minimum bounds of box B. [(x, y, z)]
+///  @param[in]		bmax	Maximum bounds of box B. [(x, y, z)]
+/// @return True if the two AABB's overlap.
+/// @see dtOverlapBounds
 inline bool dtOverlapQuantBounds(const unsigned short amin[3], const unsigned short amax[3],
 								 const unsigned short bmin[3], const unsigned short bmax[3])
 {
@@ -213,6 +337,13 @@ inline bool dtOverlapQuantBounds(const unsigned short amin[3], const unsigned sh
 	return overlap;
 }
 
+/// Determines if two axis-aligned bounding boxes overlap.
+///  @param[in]		amin	Minimum bounds of box A. [(x, y, z)]
+///  @param[in]		amax	Maximum bounds of box A. [(x, y, z)]
+///  @param[in]		bmin	Minimum bounds of box B. [(x, y, z)]
+///  @param[in]		bmax	Maximum bounds of box B. [(x, y, z)]
+/// @return True if the two AABB's overlap.
+/// @see dtOverlapQuantBounds
 inline bool dtOverlapBounds(const float* amin, const float* amax,
 							const float* bmin, const float* bmax)
 {
@@ -223,9 +354,21 @@ inline bool dtOverlapBounds(const float* amin, const float* amax,
 	return overlap;
 }
 
+/// Derives the closest point on a triangle from the specified reference point.
+///  @param[out]	closest	The closest point on the triangle.	
+///  @param[in]		p		The reference point from which to test. [(x, y, z)]
+///  @param[in]		a		Vertex A of triangle ABC. [(x, y, z)]
+///  @param[in]		b		Vertex B of triangle ABC. [(x, y, z)]
+///  @param[in]		c		Vertex C of triangle ABC. [(x, y, z)]
 void dtClosestPtPointTriangle(float* closest, const float* p,
 							  const float* a, const float* b, const float* c);
 
+/// Derives the y-axis height of the closest point on the triangle from the specified reference point.
+///  @param[in]		p		The reference point from which to test. [(x, y, z)]
+///  @param[in]		a		Vertex A of triangle ABC. [(x, y, z)]
+///  @param[in]		b		Vertex B of triangle ABC. [(x, y, z)]
+///  @param[in]		c		Vertex C of triangle ABC. [(x, y, z)]
+///  @param[out]	h		The resulting height.
 bool dtClosestHeightPointTriangle(const float* p, const float* a, const float* b, const float* c, float& h);
 
 bool dtIntersectSegmentPoly2D(const float* p0, const float* p1,
@@ -233,6 +376,15 @@ bool dtIntersectSegmentPoly2D(const float* p0, const float* p1,
 							  float& tmin, float& tmax,
 							  int& segMin, int& segMax);
 
+bool dtIntersectSegSeg2D(const float* ap, const float* aq,
+						 const float* bp, const float* bq,
+						 float& s, float& t);
+
+/// Determines if the specified point is inside the convex polygon on the xz-plane.
+///  @param[in]		pt		The point to check. [(x, y, z)]
+///  @param[in]		verts	The polygon vertices. [(x, y, z) * @p nverts]
+///  @param[in]		nverts	The number of vertices. [Limit: >= 3]
+/// @return True if the point is inside the polygon.
 bool dtPointInPolygon(const float* pt, const float* verts, const int nverts);
 
 bool dtDistancePtPolyEdgesSqr(const float* pt, const float* verts, const int nverts,
@@ -240,9 +392,139 @@ bool dtDistancePtPolyEdgesSqr(const float* pt, const float* verts, const int nve
 
 float dtDistancePtSegSqr2D(const float* pt, const float* p, const float* q, float& t);
 
+/// Derives the centroid of a convex polygon.
+///  @param[out]	tc		The centroid of the polgyon. [(x, y, z)]
+///  @param[in]		idx		The polygon indices. [(vertIndex) * @p nidx]
+///  @param[in]		nidx	The number of indices in the polygon. [Limit: >= 3]
+///  @param[in]		verts	The polygon vertices. [(x, y, z) * vertCount]
 void dtCalcPolyCenter(float* tc, const unsigned short* idx, int nidx, const float* verts);
 
+/// Determines if the two convex polygons overlap on the xz-plane.
+///  @param[in]		polya		Polygon A vertices.	[(x, y, z) * @p npolya]
+///  @param[in]		npolya		The number of vertices in polygon A.
+///  @param[in]		polyb		Polygon B vertices.	[(x, y, z) * @p npolyb]
+///  @param[in]		npolyb		The number of vertices in polygon B.
+/// @return True if the two polygons overlap.
 bool dtOverlapPolyPoly2D(const float* polya, const int npolya,
 						 const float* polyb, const int npolyb);
 
+/// @}
+/// @name Miscellanious functions.
+/// @{
+
+inline unsigned int dtNextPow2(unsigned int v)
+{
+	v--;
+	v |= v >> 1;
+	v |= v >> 2;
+	v |= v >> 4;
+	v |= v >> 8;
+	v |= v >> 16;
+	v++;
+	return v;
+}
+
+inline unsigned int dtIlog2(unsigned int v)
+{
+	unsigned int r;
+	unsigned int shift;
+	r = (v > 0xffff) << 4; v >>= r;
+	shift = (v > 0xff) << 3; v >>= shift; r |= shift;
+	shift = (v > 0xf) << 2; v >>= shift; r |= shift;
+	shift = (v > 0x3) << 1; v >>= shift; r |= shift;
+	r |= (v >> 1);
+	return r;
+}
+
+inline int dtAlign4(int x) { return (x+3) & ~3; }
+
+inline int dtOppositeTile(int side) { return (side+4) & 0x7; }
+
+inline void dtSwapByte(unsigned char* a, unsigned char* b)
+{
+	unsigned char tmp = *a;
+	*a = *b;
+	*b = tmp;
+}
+
+inline void dtSwapEndian(unsigned short* v)
+{
+	unsigned char* x = (unsigned char*)v;
+	dtSwapByte(x+0, x+1);
+}
+
+inline void dtSwapEndian(short* v)
+{
+	unsigned char* x = (unsigned char*)v;
+	dtSwapByte(x+0, x+1);
+}
+
+inline void dtSwapEndian(unsigned int* v)
+{
+	unsigned char* x = (unsigned char*)v;
+	dtSwapByte(x+0, x+3); dtSwapByte(x+1, x+2);
+}
+
+inline void dtSwapEndian(int* v)
+{
+	unsigned char* x = (unsigned char*)v;
+	dtSwapByte(x+0, x+3); dtSwapByte(x+1, x+2);
+}
+
+inline void dtSwapEndian(float* v)
+{
+	unsigned char* x = (unsigned char*)v;
+	dtSwapByte(x+0, x+3); dtSwapByte(x+1, x+2);
+}
+
+void dtRandomPointInConvexPoly(const float* pts, const int npts, float* areas,
+							   const float s, const float t, float* out);
+
+/// @}
+
 #endif // DETOURCOMMON_H
+
+///////////////////////////////////////////////////////////////////////////
+
+// This section contains detailed documentation for members that don't have
+// a source file. It reduces clutter in the main section of the header.
+
+/**
+
+@fn float dtTriArea2D(const float* a, const float* b, const float* c)
+@par
+
+The vertices are projected onto the xz-plane, so the y-values are ignored.
+
+This is a low cost function than can be used for various purposes.  Its main purpose
+is for point/line relationship testing.
+
+In all cases: A value of zero indicates that all vertices are collinear or represent the same point.
+(On the xz-plane.)
+
+When used for point/line relationship tests, AB usually represents a line against which
+the C point is to be tested.  In this case:
+
+A positive value indicates that point C is to the left of line AB, looking from A toward B.<br/>
+A negative value indicates that point C is to the right of lineAB, looking from A toward B.
+
+When used for evaluating a triangle:
+
+The absolute value of the return value is two times the area of the triangle when it is
+projected onto the xz-plane.
+
+A positive return value indicates:
+
+<ul>
+<li>The vertices are wrapped in the normal Detour wrap direction.</li>
+<li>The triangle's 3D face normal is in the general up direction.</li>
+</ul>
+
+A negative return value indicates:
+
+<ul>
+<li>The vertices are reverse wrapped. (Wrapped opposite the normal Detour wrap direction.)</li>
+<li>The triangle's 3D face normal is in the general down direction.</li>
+</ul>
+
+*/
diff --git a/dep/recastnavigation/Detour/Include/DetourNavMesh.h b/dep/recastnavigation/Detour/Include/DetourNavMesh.h
index 52d2c505ec9..77590d338fd 100644
--- a/dep/recastnavigation/Detour/Include/DetourNavMesh.h
+++ b/dep/recastnavigation/Detour/Include/DetourNavMesh.h
@@ -20,9 +20,14 @@
 #define DETOURNAVMESH_H
 
 #include "DetourAlloc.h"
-
-#ifdef WIN32
-    typedef unsigned __int64   uint64;
+#include "DetourStatus.h"
+
+#if defined (_MSC_VER)
+    typedef unsigned __int64 uint64;
+#elif defined(__MINGW32__)
+# include <stdint.h>
+# include <sys/types.h>
+    typedef unsigned __int64 uint64;
 #else
 #include <stdint.h>
 #ifndef uint64_t
@@ -30,399 +35,677 @@
 #include <linux/types.h>
 #endif
 #endif
-    typedef uint64_t           uint64;
+    typedef uint64_t uint64;
 #endif
-
 // Note: If you want to use 64-bit refs, change the types of both dtPolyRef & dtTileRef.
-// It is also recommended to change dtHashRef() to proper 64-bit hash too.
+// It is also recommended that you change dtHashRef() to a proper 64-bit hash.
 
-// Reference to navigation polygon.
-typedef uint64 dtPolyRef;
+// added for CMaNGOS
+// we cannot have over 31 bits for either tile nor poly
+// without changing polyCount to use 64bits too.
+static const int STATIC_SALT_BITS = 12;
+static const int STATIC_TILE_BITS = 21;
+static const int STATIC_POLY_BITS = 31;
 
-// Reference to navigation mesh tile.
-typedef uint64 dtTileRef;
+/// A handle to a polygon within a navigation mesh tile.
+/// @ingroup detour
+typedef uint64 dtPolyRef;   // modified for CMaNGOS
 
-// Maximum number of vertices per navigation polygon.
+/// A handle to a tile within a navigation mesh.
+/// @ingroup detour
+typedef uint64 dtTileRef;   // modified for CMaNGOS
+
+/// The maximum number of vertices per navigation polygon.
+/// @ingroup detour
 static const int DT_VERTS_PER_POLYGON = 6;
 
-static const int DT_NAVMESH_MAGIC = 'D'<<24 | 'N'<<16 | 'A'<<8 | 'V'; //'DNAV';
-static const int DT_NAVMESH_VERSION = 6;
+/// @{
+/// @name Tile Serialization Constants
+/// These constants are used to detect whether a navigation tile's data
+/// and state format is compatible with the current build.
+///
+
+/// A magic number used to detect compatibility of navigation tile data.
+static const int DT_NAVMESH_MAGIC = 'D'<<24 | 'N'<<16 | 'A'<<8 | 'V';
 
-static const int DT_NAVMESH_STATE_MAGIC = 'D'<<24 | 'N'<<16 | 'M'<<8 | 'S'; //'DNMS';
+/// A version number used to detect compatibility of navigation tile data.
+static const int DT_NAVMESH_VERSION = 7;
+
+/// A magic number used to detect the compatibility of navigation tile states.
+static const int DT_NAVMESH_STATE_MAGIC = 'D'<<24 | 'N'<<16 | 'M'<<8 | 'S';
+
+/// A version number used to detect compatibility of navigation tile states.
 static const int DT_NAVMESH_STATE_VERSION = 1;
 
+/// @}
+
+/// A flag that indicates that an entity links to an external entity.
+/// (E.g. A polygon edge is a portal that links to another polygon.)
 static const unsigned short DT_EXT_LINK = 0x8000;
+
+/// A value that indicates the entity does not link to anything.
 static const unsigned int DT_NULL_LINK = 0xffffffff;
+
+/// A flag that indicates that an off-mesh connection can be traversed in both directions. (Is bidirectional.)
 static const unsigned int DT_OFFMESH_CON_BIDIR = 1;
 
+/// The maximum number of user defined area ids.
+/// @ingroup detour
 static const int DT_MAX_AREAS = 64;
 
-static const int STATIC_SALT_BITS = 12;
-static const int STATIC_TILE_BITS = 21;
-static const int STATIC_POLY_BITS = 31;
-// we cannot have over 31 bits for either tile nor poly
-// without changing polyCount to use 64bits too.
-
-// Flags for addTile
+/// Tile flags used for various functions and fields.
+/// For an example, see dtNavMesh::addTile().
 enum dtTileFlags
 {
-	DT_TILE_FREE_DATA = 0x01,					// Navmesh owns the tile memory and should free it.
+    /// The navigation mesh owns the tile memory and is responsible for freeing it.
+    DT_TILE_FREE_DATA = 0x01,
 };
 
-// Flags returned by findStraightPath().
+/// Vertex flags returned by dtNavMeshQuery::findStraightPath.
 enum dtStraightPathFlags
 {
-	DT_STRAIGHTPATH_START = 0x01,				// The vertex is the start position.
-	DT_STRAIGHTPATH_END = 0x02,					// The vertex is the end position.
-	DT_STRAIGHTPATH_OFFMESH_CONNECTION = 0x04,	// The vertex is start of an off-mesh link.
+    DT_STRAIGHTPATH_START = 0x01,               ///< The vertex is the start position in the path.
+    DT_STRAIGHTPATH_END = 0x02,                 ///< The vertex is the end position in the path.
+    DT_STRAIGHTPATH_OFFMESH_CONNECTION = 0x04,  ///< The vertex is the start of an off-mesh connection.
 };
 
-// Flags describing polygon properties.
-enum dtPolyTypes
+/// Options for dtNavMeshQuery::findStraightPath.
+enum dtStraightPathOptions
 {
-	DT_POLYTYPE_GROUND = 0,						// Regular ground polygons.
-	DT_POLYTYPE_OFFMESH_CONNECTION = 1,			// Off-mesh connections.
+    DT_STRAIGHTPATH_AREA_CROSSINGS = 0x01,  ///< Add a vertex at every polygon edge crossing where area changes.
+    DT_STRAIGHTPATH_ALL_CROSSINGS = 0x02,   ///< Add a vertex at every polygon edge crossing.
 };
 
-enum dtStatus
+/// Flags representing the type of a navigation mesh polygon.
+enum dtPolyTypes
 {
-	DT_FAILURE = 0,								// Operation failed.
-	DT_FAILURE_DATA_MAGIC,
-	DT_FAILURE_DATA_VERSION,
-	DT_FAILURE_OUT_OF_MEMORY,
-	DT_SUCCESS,									// Operation succeed.
-	DT_IN_PROGRESS,								// Operation still in progress.
+    /// The polygon is a standard convex polygon that is part of the surface of the mesh.
+    DT_POLYTYPE_GROUND = 0,
+    /// The polygon is an off-mesh connection consisting of two vertices.
+    DT_POLYTYPE_OFFMESH_CONNECTION = 1,
 };
 
 
-// Structure describing the navigation polygon data.
+/// Defines a polyogn within a dtMeshTile object.
+/// @ingroup detour
 struct dtPoly
 {
-	unsigned int firstLink;						// Index to first link in linked list. 
-	unsigned short verts[DT_VERTS_PER_POLYGON];	// Indices to vertices of the poly.
-	unsigned short neis[DT_VERTS_PER_POLYGON];	// Refs to neighbours of the poly.
-	unsigned short flags;						// Flags (see dtPolyFlags).
-	unsigned char vertCount;					// Number of vertices.
-	unsigned char areaAndtype;					// Bit packed: Area ID of the polygon, and Polygon type, see dtPolyTypes..
-	inline void setArea(unsigned char a) { areaAndtype = (areaAndtype & 0xc0) | (a & 0x3f); }
-	inline void setType(unsigned char t) { areaAndtype = (areaAndtype & 0x3f) | (t << 6); }
-	inline unsigned char getArea() const { return areaAndtype & 0x3f; }
-	inline unsigned char getType() const { return areaAndtype >> 6; }
+    /// Index to first link in linked list. (Or #DT_NULL_LINK if there is no link.)
+    unsigned int firstLink;
+
+    /// The indices of the polygon's vertices.
+    /// The actual vertices are located in dtMeshTile::verts.
+    unsigned short verts[DT_VERTS_PER_POLYGON];
+
+    /// Packed data representing neighbor polygons references and flags for each edge.
+    unsigned short neis[DT_VERTS_PER_POLYGON];
+
+    /// The user defined polygon flags.
+    unsigned short flags;
+
+    /// The number of vertices in the polygon.
+    unsigned char vertCount;
+
+    /// The bit packed area id and polygon type.
+    /// @note Use the structure's set and get methods to acess this value.
+    unsigned char areaAndtype;
+
+    /// Sets the user defined area id. [Limit: < #DT_MAX_AREAS]
+    inline void setArea(unsigned char a) { areaAndtype = (areaAndtype & 0xc0) | (a & 0x3f); }
+
+    /// Sets the polygon type. (See: #dtPolyTypes.)
+    inline void setType(unsigned char t) { areaAndtype = (areaAndtype & 0x3f) | (t << 6); }
+
+    /// Gets the user defined area id.
+    inline unsigned char getArea() const { return areaAndtype & 0x3f; }
+
+    /// Gets the polygon type. (See: #dtPolyTypes)
+    inline unsigned char getType() const { return areaAndtype >> 6; }
 };
 
-// Stucture describing polygon detail triangles.
+/// Defines the location of detail sub-mesh data within a dtMeshTile.
 struct dtPolyDetail
 {
-	unsigned int vertBase;						// Offset to detail vertex array.
-	unsigned int triBase;						// Offset to detail triangle array.
-	unsigned char vertCount;					// Number of vertices in the detail mesh.
-	unsigned char triCount;						// Number of triangles.
+    unsigned int vertBase;          ///< The offset of the vertices in the dtMeshTile::detailVerts array.
+    unsigned int triBase;           ///< The offset of the triangles in the dtMeshTile::detailTris array.
+    unsigned char vertCount;        ///< The number of vertices in the sub-mesh.
+    unsigned char triCount;         ///< The number of triangles in the sub-mesh.
 };
 
-// Stucture describing a link to another polygon.
+/// Defines a link between polygons.
+/// @note This structure is rarely if ever used by the end user.
+/// @see dtMeshTile
 struct dtLink
 {
-	dtPolyRef ref;							// Neighbour reference.
-	unsigned int next;						// Index to next link.
-	unsigned char edge;						// Index to polygon edge which owns this link. 
-	unsigned char side;						// If boundary link, defines on which side the link is.
-	unsigned char bmin, bmax;				// If boundary link, defines the sub edge area.
+    dtPolyRef ref;                  ///< Neighbour reference. (The neighbor that is linked to.)
+    unsigned int next;              ///< Index of the next link.
+    unsigned char edge;             ///< Index of the polygon edge that owns this link.
+    unsigned char side;             ///< If a boundary link, defines on which side the link is.
+    unsigned char bmin;             ///< If a boundary link, defines the minimum sub-edge area.
+    unsigned char bmax;             ///< If a boundary link, defines the maximum sub-edge area.
 };
 
+/// Bounding volume node.
+/// @note This structure is rarely if ever used by the end user.
+/// @see dtMeshTile
 struct dtBVNode
 {
-	unsigned short bmin[3], bmax[3];		// BVnode bounds
-	int i;									// Index to item or if negative, escape index.
+    unsigned short bmin[3];         ///< Minimum bounds of the node's AABB. [(x, y, z)]
+    unsigned short bmax[3];         ///< Maximum bounds of the node's AABB. [(x, y, z)]
+    int i;                          ///< The node's index. (Negative for escape sequence.)
 };
 
+/// Defines an navigation mesh off-mesh connection within a dtMeshTile object.
+/// An off-mesh connection is a user defined traversable connection made up to two vertices.
 struct dtOffMeshConnection
 {
-	float pos[6];							// Both end point locations.
-	float rad;								// Link connection radius.
-	unsigned short poly;					// Poly Id
-	unsigned char flags;					// Link flags
-	unsigned char side;						// End point side.
-	unsigned int userId;					// User ID to identify this connection.
+    /// The endpoints of the connection. [(ax, ay, az, bx, by, bz)]
+    float pos[6];
+
+    /// The radius of the endpoints. [Limit: >= 0]
+    float rad;
+
+    /// The polygon reference of the connection within the tile.
+    unsigned short poly;
+
+    /// Link flags.
+    /// @note These are not the connection's user defined flags. Those are assigned via the
+    /// connection's dtPoly definition. These are link flags used for internal purposes.
+    unsigned char flags;
+
+    /// End point side.
+    unsigned char side;
+
+    /// The id of the offmesh connection. (User assigned when the navigation mesh is built.)
+    unsigned int userId;
 };
 
+/// Provides high level information related to a dtMeshTile object.
+/// @ingroup detour
 struct dtMeshHeader
 {
-	int magic;								// Magic number, used to identify the data.
-	int version;							// Data version number.
-	int x, y;								// Location of the time on the grid.
-	unsigned int userId;					// User ID of the tile.
-	int polyCount;							// Number of polygons in the tile.
-	int vertCount;							// Number of vertices in the tile.
-	int maxLinkCount;						// Number of allocated links.
-	int detailMeshCount;					// Number of detail meshes.
-	int detailVertCount;					// Number of detail vertices.
-	int detailTriCount;						// Number of detail triangles.
-	int bvNodeCount;						// Number of BVtree nodes.
-	int offMeshConCount;					// Number of Off-Mesh links.
-	int offMeshBase;						// Index to first polygon which is Off-Mesh link.
-	float walkableHeight;					// Height of the agent.
-	float walkableRadius;					// Radius of the agent
-	float walkableClimb;					// Max climb height of the agent.
-	float bmin[3], bmax[3];					// Bounding box of the tile.
-	float bvQuantFactor;					// BVtree quantization factor (world to bvnode coords)
+    int magic;              ///< Tile magic number. (Used to identify the data format.)
+    int version;            ///< Tile data format version number.
+    int x;                  ///< The x-position of the tile within the dtNavMesh tile grid. (x, y, layer)
+    int y;                  ///< The y-position of the tile within the dtNavMesh tile grid. (x, y, layer)
+    int layer;              ///< The layer of the tile within the dtNavMesh tile grid. (x, y, layer)
+    unsigned int userId;    ///< The user defined id of the tile.
+    int polyCount;          ///< The number of polygons in the tile.
+    int vertCount;          ///< The number of vertices in the tile.
+    int maxLinkCount;       ///< The number of allocated links.
+    int detailMeshCount;    ///< The number of sub-meshes in the detail mesh.
+
+    /// The number of unique vertices in the detail mesh. (In addition to the polygon vertices.)
+    int detailVertCount;
+
+    int detailTriCount;         ///< The number of triangles in the detail mesh.
+    int bvNodeCount;            ///< The number of bounding volume nodes. (Zero if bounding volumes are disabled.)
+    int offMeshConCount;        ///< The number of off-mesh connections.
+    int offMeshBase;            ///< The index of the first polygon which is an off-mesh connection.
+    float walkableHeight;       ///< The height of the agents using the tile.
+    float walkableRadius;       ///< The radius of the agents using the tile.
+    float walkableClimb;        ///< The maximum climb height of the agents using the tile.
+    float bmin[3];              ///< The minimum bounds of the tile's AABB. [(x, y, z)]
+    float bmax[3];              ///< The maximum bounds of the tile's AABB. [(x, y, z)]
+
+    /// The bounding volume quantization factor.
+    float bvQuantFactor;
 };
 
+/// Defines a navigation mesh tile.
+/// @ingroup detour
 struct dtMeshTile
 {
-	unsigned int salt;						// Counter describing modifications to the tile.
-
-	unsigned int linksFreeList;				// Index to next free link.
-	dtMeshHeader* header;					// Pointer to tile header.
-	dtPoly* polys;							// Pointer to the polygons (will be updated when tile is added).
-	float* verts;							// Pointer to the vertices (will be updated when tile added).
-	dtLink* links;							// Pointer to the links (will be updated when tile added).
-	dtPolyDetail* detailMeshes;				// Pointer to detail meshes (will be updated when tile added).
-	float* detailVerts;						// Pointer to detail vertices (will be updated when tile added).
-	unsigned char* detailTris;				// Pointer to detail triangles (will be updated when tile added).
-	dtBVNode* bvTree;						// Pointer to BVtree nodes (will be updated when tile added).
-	dtOffMeshConnection* offMeshCons;		// Pointer to Off-Mesh links. (will be updated when tile added).
-		
-	unsigned char* data;					// Pointer to tile data.
-	int dataSize;							// Size of the tile data.
-	int flags;								// Tile flags, see dtTileFlags.
-	dtMeshTile* next;						// Next free tile or, next tile in spatial grid.
+    unsigned int salt;                  ///< Counter describing modifications to the tile.
+
+    unsigned int linksFreeList;         ///< Index to the next free link.
+    dtMeshHeader* header;               ///< The tile header.
+    dtPoly* polys;                      ///< The tile polygons. [Size: dtMeshHeader::polyCount]
+    float* verts;                       ///< The tile vertices. [Size: dtMeshHeader::vertCount]
+    dtLink* links;                      ///< The tile links. [Size: dtMeshHeader::maxLinkCount]
+    dtPolyDetail* detailMeshes;         ///< The tile's detail sub-meshes. [Size: dtMeshHeader::detailMeshCount]
+
+    /// The detail mesh's unique vertices. [(x, y, z) * dtMeshHeader::detailVertCount]
+    float* detailVerts;
+
+    /// The detail mesh's triangles. [(vertA, vertB, vertC) * dtMeshHeader::detailTriCount]
+    unsigned char* detailTris;
+
+    /// The tile bounding volume nodes. [Size: dtMeshHeader::bvNodeCount]
+    /// (Will be null if bounding volumes are disabled.)
+    dtBVNode* bvTree;
+
+    dtOffMeshConnection* offMeshCons;       ///< The tile off-mesh connections. [Size: dtMeshHeader::offMeshConCount]
+
+    unsigned char* data;                    ///< The tile data. (Not directly accessed under normal situations.)
+    int dataSize;                           ///< Size of the tile data.
+    int flags;                              ///< Tile flags. (See: #dtTileFlags)
+    dtMeshTile* next;                       ///< The next free tile, or the next tile in the spatial grid.
 };
 
+/// Configuration parameters used to define multi-tile navigation meshes.
+/// The values are used to allocate space during the initialization of a navigation mesh.
+/// @see dtNavMesh::init()
+/// @ingroup detour
 struct dtNavMeshParams
 {
-	float orig[3];					// Origin of the nav mesh tile space.
-	float tileWidth, tileHeight;	// Width and height of each tile.
-	int maxTiles;					// Maximum number of tiles the navmesh can contain.
-	int maxPolys;					// Maximum number of polygons each tile can contain.
+    float orig[3];                  ///< The world space origin of the navigation mesh's tile space. [(x, y, z)]
+    float tileWidth;                ///< The width of each tile. (Along the x-axis.)
+    float tileHeight;               ///< The height of each tile. (Along the z-axis.)
+    int maxTiles;                   ///< The maximum number of tiles the navigation mesh can contain.
+    int maxPolys;                   ///< The maximum number of polygons each tile can contain.
 };
 
-
+/// A navigation mesh based on tiles of convex polygons.
+/// @ingroup detour
 class dtNavMesh
 {
 public:
-	dtNavMesh();
-	~dtNavMesh();
-
-	// Initializes the nav mesh for tiled use.
-	// Params:
-	//  params - (in) navmesh initialization params, see dtNavMeshParams.
-	// Returns: True if succeed, else false.
-	dtStatus init(const dtNavMeshParams* params);
-
-	// Initializes the nav mesh for single tile use.
-	// Params:
-	//  data - (in) Data of the new tile mesh.
-	//  dataSize - (in) Data size of the new tile mesh.
-	//	flags - (in) Tile flags, see dtTileFlags.
-	// Returns: True if succeed, else false.
-	dtStatus init(unsigned char* data, const int dataSize, const int flags);
-	
-	// Returns pointer to navmesh initialization params.
-	const dtNavMeshParams* getParams() const;
-	
-	// Adds new tile into the navmesh.
-	// The add will fail if the data is in wrong format,
-	// there is not enough tiles left, or if there is a tile already at the location.
-	// Params:
-	//  data - (in) Data of the new tile mesh.
-	//  dataSize - (in) Data size of the new tile mesh.
-	//	flags - (in) Tile flags, see dtTileFlags.
-	//  lastRef - (in,optional) Last tile ref, the tile will be restored so that
-	//            the reference (as well as poly references) will be the same. Default: 0.
-	//  result - (out,optional) tile ref if the tile was succesfully added.
-	dtStatus addTile(unsigned char* data, int dataSize, int flags, dtTileRef lastRef, dtTileRef* result);
-	
-	// Removes specified tile.
-	// Params:
-	//  ref - (in) Reference to the tile to remove.
-	//  data - (out) Data associated with deleted tile.
-	//  dataSize - (out) Size of the data associated with deleted tile. 
-	dtStatus removeTile(dtTileRef ref, unsigned char** data, int* dataSize);
-
-	// Calculates tile location based in input world position.
-	// Params:
-	//  pos - (in) world position of the query.
-	//  tx - (out) tile x location.
-	//  ty - (out) tile y location.
-	void calcTileLoc(const float* pos, int* tx, int* ty) const;
-
-	// Returns pointer to tile at specified location.
-	// Params:
-	//  x,y - (in) Location of the tile to get.
-	// Returns: pointer to tile if tile exists or 0 tile does not exists.
-	const dtMeshTile* getTileAt(int x, int y) const;
-
-	// Returns reference to tile at specified location.
-	// Params:
-	//  x,y - (in) Location of the tile to get.
-	// Returns: reference to tile if tile exists or 0 tile does not exists.
-	dtTileRef getTileRefAt(int x, int y) const;
-	
-	// Returns tile references of a tile based on tile pointer.
-	dtTileRef getTileRef(const dtMeshTile* tile) const;
-
-	// Returns tile based on references.
-	const dtMeshTile* getTileByRef(dtTileRef ref) const;
-	
-	// Returns max number of tiles.
-	int getMaxTiles() const;
-	
-	// Returns pointer to tile in the tile array.
-	// Params:
-	//  i - (in) Index to the tile to retrieve, max index is getMaxTiles()-1.
-	// Returns: Pointer to specified tile.
-	const dtMeshTile* getTile(int i) const;
-
-	// Returns pointer to tile and polygon pointed by the polygon reference.
-	// Params:
-	//  ref - (in) reference to a polygon.
-	//  tile - (out) pointer to the tile containing the polygon.
-	//  poly - (out) pointer to the polygon.
-	dtStatus getTileAndPolyByRef(const dtPolyRef ref, const dtMeshTile** tile, const dtPoly** poly) const;
-	
-	// Returns pointer to tile and polygon pointed by the polygon reference.
-	// Note: this function does not check if 'ref' s valid, and is thus faster. Use only with valid refs!
-	// Params:
-	//  ref - (in) reference to a polygon.
-	//  tile - (out) pointer to the tile containing the polygon.
-	//  poly - (out) pointer to the polygon.
-	void getTileAndPolyByRefUnsafe(const dtPolyRef ref, const dtMeshTile** tile, const dtPoly** poly) const;
-
-	// Returns true if polygon reference points to valid data.
-	bool isValidPolyRef(dtPolyRef ref) const;
-	
-	// Returns base poly id for specified tile, polygon refs can be deducted from this.
-	dtPolyRef getPolyRefBase(const dtMeshTile* tile) const;
-	
-	// Returns start and end location of an off-mesh link polygon.
-	// Params:
-	//	prevRef - (in) ref to the polygon before the link (used to select direction).
-	//	polyRef - (in) ref to the off-mesh link polygon.
-	//	startPos[3] - (out) start point of the link.
-	//	endPos[3] - (out) end point of the link.
-	// Returns: true if link is found.
-	dtStatus getOffMeshConnectionPolyEndPoints(dtPolyRef prevRef, dtPolyRef polyRef, float* startPos, float* endPos) const;
-
-	// Returns pointer to off-mesh connection based on polyref, or null if ref not valid.
-	const dtOffMeshConnection* getOffMeshConnectionByRef(dtPolyRef ref) const;
-	
-	// Sets polygon flags.
-	dtStatus setPolyFlags(dtPolyRef ref, unsigned short flags);
-
-	// Return polygon flags.
-	dtStatus getPolyFlags(dtPolyRef ref, unsigned short* resultFlags) const;
-
-	// Set polygon type.
-	dtStatus setPolyArea(dtPolyRef ref, unsigned char area);
-
-	// Return polygon area type.
-	dtStatus getPolyArea(dtPolyRef ref, unsigned char* resultArea) const;
-
-
-	// Returns number of bytes required to store tile state.
-	int getTileStateSize(const dtMeshTile* tile) const;
-	
-	// Stores tile state to buffer.
-	dtStatus storeTileState(const dtMeshTile* tile, unsigned char* data, const int maxDataSize) const;
-	
-	// Restores tile state.
-	dtStatus restoreTileState(dtMeshTile* tile, const unsigned char* data, const int maxDataSize);
-	
-
-	// Encodes a tile id.
-	inline dtPolyRef encodePolyId(unsigned int salt, unsigned int it, unsigned int ip) const
-	{
-		return ((dtPolyRef)salt << (m_polyBits+m_tileBits)) | ((dtPolyRef)it << m_polyBits) | (dtPolyRef)ip;
-	}
-	
-	// Decodes a tile id.
-	inline void decodePolyId(dtPolyRef ref, unsigned int& salt, unsigned int& it, unsigned int& ip) const
-	{
-		const dtPolyRef saltMask = ((dtPolyRef)1<<m_saltBits)-1;
-		const dtPolyRef tileMask = ((dtPolyRef)1<<m_tileBits)-1;
-		const dtPolyRef polyMask = ((dtPolyRef)1<<m_polyBits)-1;
-		salt = (unsigned int)((ref >> (m_polyBits+m_tileBits)) & saltMask);
-		it = (unsigned int)((ref >> m_polyBits) & tileMask);
-		ip = (unsigned int)(ref & polyMask);
-	}
-
-	// Decodes a tile salt.
-	inline unsigned int decodePolyIdSalt(dtPolyRef ref) const
-	{
-		const dtPolyRef saltMask = ((dtPolyRef)1<<m_saltBits)-1;
-		return (unsigned int)((ref >> (m_polyBits+m_tileBits)) & saltMask);
-	}
-	
-	// Decodes a tile id.
-	inline unsigned int decodePolyIdTile(dtPolyRef ref) const
-	{
-		const dtPolyRef tileMask = ((dtPolyRef)1<<m_tileBits)-1;
-		return (unsigned int)((ref >> m_polyBits) & tileMask);
-	}
-	
-	// Decodes a poly id.
-	inline unsigned int decodePolyIdPoly(dtPolyRef ref) const
-	{
-		const dtPolyRef polyMask = ((dtPolyRef)1<<m_polyBits)-1;
-		return (unsigned int)(ref & polyMask);
-	}
-	
+    dtNavMesh();
+    ~dtNavMesh();
+
+    /// @{
+    /// @name Initialization and Tile Management
+
+    /// Initializes the navigation mesh for tiled use.
+    ///  @param[in] params      Initialization parameters.
+    /// @return The status flags for the operation.
+    dtStatus init(const dtNavMeshParams* params);
+
+    /// Initializes the navigation mesh for single tile use.
+    ///  @param[in] data        Data of the new tile. (See: #dtCreateNavMeshData)
+    ///  @param[in] dataSize    The data size of the new tile.
+    ///  @param[in] flags       The tile flags. (See: #dtTileFlags)
+    /// @return The status flags for the operation.
+    ///  @see dtCreateNavMeshData
+    dtStatus init(unsigned char* data, const int dataSize, const int flags);
+
+    /// The navigation mesh initialization params.
+    const dtNavMeshParams* getParams() const;
+
+    /// Adds a tile to the navigation mesh.
+    ///  @param[in]     data        Data for the new tile mesh. (See: #dtCreateNavMeshData)
+    ///  @param[in]     dataSize    Data size of the new tile mesh.
+    ///  @param[in]     flags       Tile flags. (See: #dtTileFlags)
+    ///  @param[in]     lastRef     The desired reference for the tile. (When reloading a tile.) [opt] [Default: 0]
+    ///  @param[out]    result      The tile reference. (If the tile was succesfully added.) [opt]
+    /// @return The status flags for the operation.
+    dtStatus addTile(unsigned char* data, int dataSize, int flags, dtTileRef lastRef, dtTileRef* result);
+
+    /// Removes the specified tile from the navigation mesh.
+    ///  @param[in]     ref         The reference of the tile to remove.
+    ///  @param[out]    data        Data associated with deleted tile.
+    ///  @param[out]    dataSize    Size of the data associated with deleted tile.
+    /// @return The status flags for the operation.
+    dtStatus removeTile(dtTileRef ref, unsigned char** data, int* dataSize);
+
+    /// @}
+
+    /// @{
+    /// @name Query Functions
+
+    /// Calculates the tile grid location for the specified world position.
+    ///  @param[in] pos  The world position for the query. [(x, y, z)]
+    ///  @param[out]    tx      The tile's x-location. (x, y)
+    ///  @param[out]    ty      The tile's y-location. (x, y)
+    void calcTileLoc(const float* pos, int* tx, int* ty) const;
+
+    /// Gets the tile at the specified grid location.
+    ///  @param[in] x       The tile's x-location. (x, y, layer)
+    ///  @param[in] y       The tile's y-location. (x, y, layer)
+    ///  @param[in] layer   The tile's layer. (x, y, layer)
+    /// @return The tile, or null if the tile does not exist.
+    const dtMeshTile* getTileAt(const int x, const int y, const int layer) const;
+
+    /// Gets all tiles at the specified grid location. (All layers.)
+    ///  @param[in]     x           The tile's x-location. (x, y)
+    ///  @param[in]     y           The tile's y-location. (x, y)
+    ///  @param[out]    tiles       A pointer to an array of tiles that will hold the result.
+    ///  @param[in]     maxTiles    The maximum tiles the tiles parameter can hold.
+    /// @return The number of tiles returned in the tiles array.
+    int getTilesAt(const int x, const int y,
+                   dtMeshTile const** tiles, const int maxTiles) const;
+
+    /// Gets the tile reference for the tile at specified grid location.
+    ///  @param[in] x       The tile's x-location. (x, y, layer)
+    ///  @param[in] y       The tile's y-location. (x, y, layer)
+    ///  @param[in] layer   The tile's layer. (x, y, layer)
+    /// @return The tile reference of the tile, or 0 if there is none.
+    dtTileRef getTileRefAt(int x, int y, int layer) const;
+
+    /// Gets the tile reference for the specified tile.
+    ///  @param[in] tile    The tile.
+    /// @return The tile reference of the tile.
+    dtTileRef getTileRef(const dtMeshTile* tile) const;
+
+    /// Gets the tile for the specified tile reference.
+    ///  @param[in] ref     The tile reference of the tile to retrieve.
+    /// @return The tile for the specified reference, or null if the
+    ///     reference is invalid.
+    const dtMeshTile* getTileByRef(dtTileRef ref) const;
+
+    /// The maximum number of tiles supported by the navigation mesh.
+    /// @return The maximum number of tiles supported by the navigation mesh.
+    int getMaxTiles() const;
+
+    /// Gets the tile at the specified index.
+    ///  @param[in] i       The tile index. [Limit: 0 >= index < #getMaxTiles()]
+    /// @return The tile at the specified index.
+    const dtMeshTile* getTile(int i) const;
+
+    /// Gets the tile and polygon for the specified polygon reference.
+    ///  @param[in]     ref     The reference for the a polygon.
+    ///  @param[out]    tile    The tile containing the polygon.
+    ///  @param[out]    poly    The polygon.
+    /// @return The status flags for the operation.
+    dtStatus getTileAndPolyByRef(const dtPolyRef ref, const dtMeshTile** tile, const dtPoly** poly) const;
+
+    /// Returns the tile and polygon for the specified polygon reference.
+    ///  @param[in]     ref     A known valid reference for a polygon.
+    ///  @param[out]    tile    The tile containing the polygon.
+    ///  @param[out]    poly    The polygon.
+    void getTileAndPolyByRefUnsafe(const dtPolyRef ref, const dtMeshTile** tile, const dtPoly** poly) const;
+
+    /// Checks the validity of a polygon reference.
+    ///  @param[in] ref     The polygon reference to check.
+    /// @return True if polygon reference is valid for the navigation mesh.
+    bool isValidPolyRef(dtPolyRef ref) const;
+
+    /// Gets the polygon reference for the tile's base polygon.
+    ///  @param[in] tile        The tile.
+    /// @return The polygon reference for the base polygon in the specified tile.
+    dtPolyRef getPolyRefBase(const dtMeshTile* tile) const;
+
+    /// Gets the endpoints for an off-mesh connection, ordered by "direction of travel".
+    ///  @param[in]     prevRef     The reference of the polygon before the connection.
+    ///  @param[in]     polyRef     The reference of the off-mesh connection polygon.
+    ///  @param[out]    startPos    The start position of the off-mesh connection. [(x, y, z)]
+    ///  @param[out]    endPos      The end position of the off-mesh connection. [(x, y, z)]
+    /// @return The status flags for the operation.
+    dtStatus getOffMeshConnectionPolyEndPoints(dtPolyRef prevRef, dtPolyRef polyRef, float* startPos, float* endPos) const;
+
+    /// Gets the specified off-mesh connection.
+    ///  @param[in] ref     The polygon reference of the off-mesh connection.
+    /// @return The specified off-mesh connection, or null if the polygon reference is not valid.
+    const dtOffMeshConnection* getOffMeshConnectionByRef(dtPolyRef ref) const;
+
+    /// @}
+
+    /// @{
+    /// @name State Management
+    /// These functions do not effect #dtTileRef or #dtPolyRef's.
+
+    /// Sets the user defined flags for the specified polygon.
+    ///  @param[in] ref     The polygon reference.
+    ///  @param[in] flags   The new flags for the polygon.
+    /// @return The status flags for the operation.
+    dtStatus setPolyFlags(dtPolyRef ref, unsigned short flags);
+
+    /// Gets the user defined flags for the specified polygon.
+    ///  @param[in]     ref             The polygon reference.
+    ///  @param[out]    resultFlags     The polygon flags.
+    /// @return The status flags for the operation.
+    dtStatus getPolyFlags(dtPolyRef ref, unsigned short* resultFlags) const;
+
+    /// Sets the user defined area for the specified polygon.
+    ///  @param[in] ref     The polygon reference.
+    ///  @param[in] area    The new area id for the polygon. [Limit: < #DT_MAX_AREAS]
+    /// @return The status flags for the operation.
+    dtStatus setPolyArea(dtPolyRef ref, unsigned char area);
+
+    /// Gets the user defined area for the specified polygon.
+    ///  @param[in]     ref         The polygon reference.
+    ///  @param[out]    resultArea  The area id for the polygon.
+    /// @return The status flags for the operation.
+    dtStatus getPolyArea(dtPolyRef ref, unsigned char* resultArea) const;
+
+    /// Gets the size of the buffer required by #storeTileState to store the specified tile's state.
+    ///  @param[in] tile    The tile.
+    /// @return The size of the buffer required to store the state.
+    int getTileStateSize(const dtMeshTile* tile) const;
+
+    /// Stores the non-structural state of the tile in the specified buffer. (Flags, area ids, etc.)
+    ///  @param[in]     tile            The tile.
+    ///  @param[out]    data            The buffer to store the tile's state in.
+    ///  @param[in]     maxDataSize     The size of the data buffer. [Limit: >= #getTileStateSize]
+    /// @return The status flags for the operation.
+    dtStatus storeTileState(const dtMeshTile* tile, unsigned char* data, const int maxDataSize) const;
+
+    /// Restores the state of the tile.
+    ///  @param[in] tile            The tile.
+    ///  @param[in] data            The new state. (Obtained from #storeTileState.)
+    ///  @param[in] maxDataSize     The size of the state within the data buffer.
+    /// @return The status flags for the operation.
+    dtStatus restoreTileState(dtMeshTile* tile, const unsigned char* data, const int maxDataSize);
+
+    /// @}
+
+    /// @{
+    /// @name Encoding and Decoding
+    /// These functions are generally meant for internal use only.
+
+    /// Derives a standard polygon reference.
+    ///  @note This function is generally meant for internal use only.
+    ///  @param[in] salt    The tile's salt value.
+    ///  @param[in] it      The index of the tile.
+    ///  @param[in] ip      The index of the polygon within the tile.
+    inline dtPolyRef encodePolyId(unsigned int salt, unsigned int it, unsigned int ip) const
+    {
+        return ((dtPolyRef)salt << (m_polyBits+m_tileBits)) | ((dtPolyRef)it << m_polyBits) | (dtPolyRef)ip;
+    }
+
+    /// Decodes a standard polygon reference.
+    ///  @note This function is generally meant for internal use only.
+    ///  @param[in] ref   The polygon reference to decode.
+    ///  @param[out]    salt    The tile's salt value.
+    ///  @param[out]    it      The index of the tile.
+    ///  @param[out]    ip      The index of the polygon within the tile.
+    ///  @see #encodePolyId
+    inline void decodePolyId(dtPolyRef ref, unsigned int& salt, unsigned int& it, unsigned int& ip) const
+    {
+        const dtPolyRef saltMask = ((dtPolyRef)1<<m_saltBits)-1;
+        const dtPolyRef tileMask = ((dtPolyRef)1<<m_tileBits)-1;
+        const dtPolyRef polyMask = ((dtPolyRef)1<<m_polyBits)-1;
+        salt = (unsigned int)((ref >> (m_polyBits+m_tileBits)) & saltMask);
+        it = (unsigned int)((ref >> m_polyBits) & tileMask);
+        ip = (unsigned int)(ref & polyMask);
+    }
+
+    /// Extracts a tile's salt value from the specified polygon reference.
+    ///  @note This function is generally meant for internal use only.
+    ///  @param[in] ref     The polygon reference.
+    ///  @see #encodePolyId
+    inline unsigned int decodePolyIdSalt(dtPolyRef ref) const
+    {
+        const dtPolyRef saltMask = ((dtPolyRef)1<<m_saltBits)-1;
+        return (unsigned int)((ref >> (m_polyBits+m_tileBits)) & saltMask);
+    }
+
+    /// Extracts the tile's index from the specified polygon reference.
+    ///  @note This function is generally meant for internal use only.
+    ///  @param[in] ref     The polygon reference.
+    ///  @see #encodePolyId
+    inline unsigned int decodePolyIdTile(dtPolyRef ref) const
+    {
+        const dtPolyRef tileMask = ((dtPolyRef)1<<m_tileBits)-1;
+        return (unsigned int)((ref >> m_polyBits) & tileMask);
+    }
+
+    /// Extracts the polygon's index (within its tile) from the specified polygon reference.
+    ///  @note This function is generally meant for internal use only.
+    ///  @param[in] ref     The polygon reference.
+    ///  @see #encodePolyId
+    inline unsigned int decodePolyIdPoly(dtPolyRef ref) const
+    {
+        const dtPolyRef polyMask = ((dtPolyRef)1<<m_polyBits)-1;
+        return (unsigned int)(ref & polyMask);
+    }
+
+    /// @}
+
 private:
 
-	// Returns pointer to tile in the tile array.
-	dtMeshTile* getTile(int i);
-
-	// Returns neighbour tile based on side. 
-	dtMeshTile* getNeighbourTileAt(int x, int y, int side) const;
-	// Returns all polygons in neighbour tile based on portal defined by the segment.
-	int findConnectingPolys(const float* va, const float* vb,
-							const dtMeshTile* tile, int side,
-							dtPolyRef* con, float* conarea, int maxcon) const;
-	
-	// Builds internal polygons links for a tile.
-	void connectIntLinks(dtMeshTile* tile);
-	// Builds internal polygons links for a tile.
-	void connectIntOffMeshLinks(dtMeshTile* tile);
-
-	// Builds external polygon links for a tile.
-	void connectExtLinks(dtMeshTile* tile, dtMeshTile* target, int side);
-	// Builds external polygon links for a tile.
-	void connectExtOffMeshLinks(dtMeshTile* tile, dtMeshTile* target, int side);
-	
-	// Removes external links at specified side.
-	void unconnectExtLinks(dtMeshTile* tile, int side);
-	
-
-	// TODO: These methods are duplicates from dtNavMeshQuery, but are needed for off-mesh connection finding.
-	
-	// Queries polygons within a tile.
-	int queryPolygonsInTile(const dtMeshTile* tile, const float* qmin, const float* qmax,
-							dtPolyRef* polys, const int maxPolys) const;
-	// Find nearest polygon within a tile.
-	dtPolyRef findNearestPolyInTile(const dtMeshTile* tile, const float* center,
-									const float* extents, float* nearestPt) const;
-	// Returns closest point on polygon.
-	dtStatus closestPointOnPolyInTile(const dtMeshTile* tile, unsigned int ip,
-									  const float* pos, float* closest) const;
-	
-	dtNavMeshParams m_params;			// Current initialization params. TODO: do not store this info twice.
-	float m_orig[3];					// Origin of the tile (0,0)
-	float m_tileWidth, m_tileHeight;	// Dimensions of each tile.
-	int m_maxTiles;						// Max number of tiles.
-	int m_tileLutSize;					// Tile hash lookup size (must be pot).
-	int m_tileLutMask;					// Tile hash lookup mask.
-
-	dtMeshTile** m_posLookup;			// Tile hash lookup.
-	dtMeshTile* m_nextFree;				// Freelist of tiles.
-	dtMeshTile* m_tiles;				// List of tiles.
-		
-	unsigned int m_saltBits;			// Number of salt bits in the tile ID.
-	unsigned int m_tileBits;			// Number of tile bits in the tile ID.
-	unsigned int m_polyBits;			// Number of poly bits in the tile ID.
+    /// Returns pointer to tile in the tile array.
+    dtMeshTile* getTile(int i);
+
+    /// Returns neighbour tile based on side.
+    int getTilesAt(const int x, const int y,
+                   dtMeshTile** tiles, const int maxTiles) const;
+
+    /// Returns neighbour tile based on side.
+    int getNeighbourTilesAt(const int x, const int y, const int side,
+                            dtMeshTile** tiles, const int maxTiles) const;
+
+    /// Returns all polygons in neighbour tile based on portal defined by the segment.
+    int findConnectingPolys(const float* va, const float* vb,
+                            const dtMeshTile* tile, int side,
+                            dtPolyRef* con, float* conarea, int maxcon) const;
+
+    /// Builds internal polygons links for a tile.
+    void connectIntLinks(dtMeshTile* tile);
+    /// Builds internal polygons links for a tile.
+    void baseOffMeshLinks(dtMeshTile* tile);
+
+    /// Builds external polygon links for a tile.
+    void connectExtLinks(dtMeshTile* tile, dtMeshTile* target, int side);
+    /// Builds external polygon links for a tile.
+    void connectExtOffMeshLinks(dtMeshTile* tile, dtMeshTile* target, int side);
+
+    /// Removes external links at specified side.
+    void unconnectExtLinks(dtMeshTile* tile, dtMeshTile* target);
+
+
+    // TODO: These methods are duplicates from dtNavMeshQuery, but are needed for off-mesh connection finding.
+
+    /// Queries polygons within a tile.
+    int queryPolygonsInTile(const dtMeshTile* tile, const float* qmin, const float* qmax,
+                            dtPolyRef* polys, const int maxPolys) const;
+    /// Find nearest polygon within a tile.
+    dtPolyRef findNearestPolyInTile(const dtMeshTile* tile, const float* center,
+                                    const float* extents, float* nearestPt) const;
+    /// Returns closest point on polygon.
+    void closestPointOnPolyInTile(const dtMeshTile* tile, unsigned int ip,
+                                  const float* pos, float* closest) const;
+
+    dtNavMeshParams m_params;           ///< Current initialization params. TODO: do not store this info twice.
+    float m_orig[3];                    ///< Origin of the tile (0,0)
+    float m_tileWidth, m_tileHeight;    ///< Dimensions of each tile.
+    int m_maxTiles;                     ///< Max number of tiles.
+    int m_tileLutSize;                  ///< Tile hash lookup size (must be pot).
+    int m_tileLutMask;                  ///< Tile hash lookup mask.
+
+    dtMeshTile** m_posLookup;           ///< Tile hash lookup.
+    dtMeshTile* m_nextFree;             ///< Freelist of tiles.
+    dtMeshTile* m_tiles;                ///< List of tiles.
+
+    unsigned int m_saltBits;            ///< Number of salt bits in the tile ID.
+    unsigned int m_tileBits;            ///< Number of tile bits in the tile ID.
+    unsigned int m_polyBits;            ///< Number of poly bits in the tile ID.
 };
 
-// Helper function to allocate navmesh class using Detour allocator.
+/// Allocates a navigation mesh object using the Detour allocator.
+/// @return A navigation mesh that is ready for initialization, or null on failure.
+///  @ingroup detour
 dtNavMesh* dtAllocNavMesh();
+
+/// Frees the specified navigation mesh object using the Detour allocator.
+///  @param[in] navmesh     A navigation mesh allocated using #dtAllocNavMesh
+///  @ingroup detour
 void dtFreeNavMesh(dtNavMesh* navmesh);
 
 #endif // DETOURNAVMESH_H
+
+///////////////////////////////////////////////////////////////////////////
+
+// This section contains detailed documentation for members that don't have
+// a source file. It reduces clutter in the main section of the header.
+
+/**
+
+@typedef dtPolyRef
+@par
+
+Polygon references are subject to the same invalidate/preserve/restore
+rules that apply to #dtTileRef's.  If the #dtTileRef for the polygon's
+tile changes, the polygon reference becomes invalid.
+
+Changing a polygon's flags, area id, etc. does not impact its polygon
+reference.
+
+@typedef dtTileRef
+@par
+
+The following changes will invalidate a tile reference:
+
+- The referenced tile has been removed from the navigation mesh.
+- The navigation mesh has been initialized using a different set
+  of #dtNavMeshParams.
+
+A tile reference is preserved/restored if the tile is added to a navigation
+mesh initialized with the original #dtNavMeshParams and is added at the
+original reference location. (E.g. The lastRef parameter is used with
+dtNavMesh::addTile.)
+
+Basically, if the storage structure of a tile changes, its associated
+tile reference changes.
+
+
+@var unsigned short dtPoly::neis[DT_VERTS_PER_POLYGON]
+@par
+
+Each entry represents data for the edge starting at the vertex of the same index.
+E.g. The entry at index n represents the edge data for vertex[n] to vertex[n+1].
+
+A value of zero indicates the edge has no polygon connection. (It makes up the
+border of the navigation mesh.)
+
+The information can be extracted as follows:
+@code
+neighborRef = neis[n] & 0xff; // Get the neighbor polygon reference.
+
+if (neis[n] & #DT_EX_LINK)
+{
+    // The edge is an external (portal) edge.
+}
+@endcode
+
+@var float dtMeshHeader::bvQuantFactor
+@par
+
+This value is used for converting between world and bounding volume coordinates.
+For example:
+@code
+const float cs = 1.0f / tile->header->bvQuantFactor;
+const dtBVNode* n = &tile->bvTree[i];
+if (n->i >= 0)
+{
+    // This is a leaf node.
+    float worldMinX = tile->header->bmin[0] + n->bmin[0]*cs;
+    float worldMinY = tile->header->bmin[0] + n->bmin[1]*cs;
+    // Etc...
+}
+@endcode
+
+@struct dtMeshTile
+@par
+
+Tiles generally only exist within the context of a dtNavMesh object.
+
+Some tile content is optional.  For example, a tile may not contain any
+off-mesh connections.  In this case the associated pointer will be null.
+
+If a detail mesh exists it will share vertices with the base polygon mesh.
+Only the vertices unique to the detail mesh will be stored in #detailVerts.
+
+@warning Tiles returned by a dtNavMesh object are not guarenteed to be populated.
+For example: The tile at a location might not have been loaded yet, or may have been removed.
+In this case, pointers will be null.  So if in doubt, check the polygon count in the
+tile's header to determine if a tile has polygons defined.
+
+@var float dtOffMeshConnection::pos[6]
+@par
+
+For a properly built navigation mesh, vertex A will always be within the bounds of the mesh.
+Vertex B is not required to be within the bounds of the mesh.
+
+*/
diff --git a/dep/recastnavigation/Detour/Include/DetourNavMeshBuilder.h b/dep/recastnavigation/Detour/Include/DetourNavMeshBuilder.h
index 8d8ef2e6546..8a6ba108739 100644
--- a/dep/recastnavigation/Detour/Include/DetourNavMeshBuilder.h
+++ b/dep/recastnavigation/Detour/Include/DetourNavMeshBuilder.h
@@ -21,57 +21,128 @@
 
 #include "DetourAlloc.h"
 
-
-// The units of the parameters are specified in parenthesis as follows:
-// (vx) voxels, (wu) world units
+/// Represents the source data used to build an navigation mesh tile.
+/// @ingroup detour
 struct dtNavMeshCreateParams
 {
-	// Navmesh vertices.
-	const unsigned short* verts;			// Array of vertices, each vertex has 3 components. (vx).
-	int vertCount;							// Vertex count
-	// Navmesh polygons
-	const unsigned short* polys;			// Array of polygons, uses same format as rcPolyMesh. 
-	const unsigned short* polyFlags;		// Array of flags per polygon.
-	const unsigned char* polyAreas;			// Array of area ids per polygon.
-	int polyCount;							// Number of polygons
-	int nvp;								// Number of verts per polygon.
-	// Navmesh Detail
-	const unsigned int* detailMeshes;		// Detail meshes, uses same format as rcPolyMeshDetail.
-	const float* detailVerts;				// Detail mesh vertices, uses same format as rcPolyMeshDetail (wu).
-	int detailVertsCount;					// Total number of detail vertices
-	const unsigned char* detailTris;		// Array of detail tris per detail mesh.
-	int detailTriCount;						// Total number of detail triangles.
-	// Off-Mesh Connections.
-	const float* offMeshConVerts;			// Off-mesh connection vertices (wu).
-	const float* offMeshConRad;				// Off-mesh connection radii (wu).
-	const unsigned short* offMeshConFlags;	// Off-mesh connection flags.
-	const unsigned char* offMeshConAreas;	// Off-mesh connection area ids.
-	const unsigned char* offMeshConDir;		// Off-mesh connection direction flags (1 = bidir, 0 = oneway).
-	const unsigned int* offMeshConUserID;	// Off-mesh connection user id (optional).
-	int offMeshConCount;					// Number of off-mesh connections
-	// Tile location
-	unsigned int userId;					// User ID bound to the tile.
-	int tileX, tileY;						// Tile location (tile coords).
-	float bmin[3], bmax[3];					// Tile bounds (wu).
-	// Settings
-	float walkableHeight;					// Agent height (wu).
-	float walkableRadius;					// Agent radius (wu).
-	float walkableClimb;					// Agent max climb (wu).
-	float cs;								// Cell size (xz) (wu).
-	float ch;								// Cell height (y) (wu).
-	int tileSize;							// Tile size (width & height) (vx).
+
+	/// @name Polygon Mesh Attributes
+	/// Used to create the base navigation graph.
+	/// See #rcPolyMesh for details related to these attributes.
+	/// @{
+
+	const unsigned short* verts;			///< The polygon mesh vertices. [(x, y, z) * #vertCount] [Unit: vx]
+	int vertCount;							///< The number vertices in the polygon mesh. [Limit: >= 3]
+	const unsigned short* polys;			///< The polygon data. [Size: #polyCount * 2 * #nvp]
+	const unsigned short* polyFlags;		///< The user defined flags assigned to each polygon. [Size: #polyCount]
+	const unsigned char* polyAreas;			///< The user defined area ids assigned to each polygon. [Size: #polyCount]
+	int polyCount;							///< Number of polygons in the mesh. [Limit: >= 1]
+	int nvp;								///< Number maximum number of vertices per polygon. [Limit: >= 3]
+
+	/// @}
+	/// @name Height Detail Attributes (Optional)
+	/// See #rcPolyMeshDetail for details related to these attributes.
+	/// @{
+
+	const unsigned int* detailMeshes;		///< The height detail sub-mesh data. [Size: 4 * #polyCount]
+	const float* detailVerts;				///< The detail mesh vertices. [Size: 3 * #detailVertsCount] [Unit: wu]
+	int detailVertsCount;					///< The number of vertices in the detail mesh.
+	const unsigned char* detailTris;		///< The detail mesh triangles. [Size: 4 * #detailTriCount]
+	int detailTriCount;						///< The number of triangles in the detail mesh.
+
+	/// @}
+	/// @name Off-Mesh Connections Attributes (Optional)
+	/// Used to define a custom point-to-point edge within the navigation graph, an 
+	/// off-mesh connection is a user defined traversable connection made up to two vertices, 
+	/// at least one of which resides within a navigation mesh polygon.
+	/// @{
+
+	/// Off-mesh connection vertices. [(ax, ay, az, bx, by, bz) * #offMeshConCount] [Unit: wu]
+	const float* offMeshConVerts;
+	/// Off-mesh connection radii. [Size: #offMeshConCount] [Unit: wu]
+	const float* offMeshConRad;
+	/// User defined flags assigned to the off-mesh connections. [Size: #offMeshConCount]
+	const unsigned short* offMeshConFlags;
+	/// User defined area ids assigned to the off-mesh connections. [Size: #offMeshConCount]
+	const unsigned char* offMeshConAreas;
+	/// The permitted travel direction of the off-mesh connections. [Size: #offMeshConCount]
+	///
+	/// 0 = Travel only from endpoint A to endpoint B.<br/>
+	/// #DT_OFFMESH_CON_BIDIR = Bidirectional travel.
+	const unsigned char* offMeshConDir;	
+	/// The user defined ids of the off-mesh connection. [Size: #offMeshConCount]
+	const unsigned int* offMeshConUserID;
+	/// The number of off-mesh connections. [Limit: >= 0]
+	int offMeshConCount;
+
+	/// @}
+	/// @name Tile Attributes
+	/// @note The tile grid/layer data can be left at zero if the destination is a single tile mesh.
+	/// @{
+
+	unsigned int userId;	///< The user defined id of the tile.
+	int tileX;				///< The tile's x-grid location within the multi-tile destination mesh. (Along the x-axis.)
+	int tileY;				///< The tile's y-grid location within the multi-tile desitation mesh. (Along the z-axis.)
+	int tileLayer;			///< The tile's layer within the layered destination mesh. [Limit: >= 0] (Along the y-axis.)
+	float bmin[3];			///< The minimum bounds of the tile. [(x, y, z)] [Unit: wu]
+	float bmax[3];			///< The maximum bounds of the tile. [(x, y, z)] [Unit: wu]
+
+	/// @}
+	/// @name General Configuration Attributes
+	/// @{
+
+	float walkableHeight;	///< The agent height. [Unit: wu]
+	float walkableRadius;	///< The agent radius. [Unit: wu]
+	float walkableClimb;	///< The agent maximum traversable ledge. (Up/Down) [Unit: wu]
+	float cs;				///< The xz-plane cell size of the polygon mesh. [Limit: > 0] [Unit: wu]
+	float ch;				///< The y-axis cell height of the polygon mesh. [Limit: > 0] [Unit: wu]
+
+	/// True if a bounding volume tree should be built for the tile.
+	/// @note The BVTree is not normally needed for layered navigation meshes.
+	bool buildBvTree;
+
+	/// @}
 };
 
-// Build navmesh data from given input data.
+/// Builds navigation mesh tile data from the provided tile creation data.
+/// @ingroup detour
+///  @param[in]		params		Tile creation data.
+///  @param[out]	outData		The resulting tile data.
+///  @param[out]	outDataSize	The size of the tile data array.
+/// @return True if the tile data was successfully created.
 bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData, int* outDataSize);
 
-// Swaps endianess of navmesh header.
+/// Swaps the endianess of the tile data's header (#dtMeshHeader).
+///  @param[in,out]	data		The tile data array.
+///  @param[in]		dataSize	The size of the data array.
 bool dtNavMeshHeaderSwapEndian(unsigned char* data, const int dataSize);
 
-// Swaps endianess of the navmesh data. This function assumes that the header is in correct
-// endianess already. Call dtNavMeshHeaderSwapEndian() first on the data if the data is
-// assumed to be in wrong endianess to start with. If converting from native endianess to foreign,
-// call dtNavMeshHeaderSwapEndian() after the data has been swapped.
+/// Swaps endianess of the tile data.
+///  @param[in,out]	data		The tile data array.
+///  @param[in]		dataSize	The size of the data array.
 bool dtNavMeshDataSwapEndian(unsigned char* data, const int dataSize);
 
 #endif // DETOURNAVMESHBUILDER_H
+
+// This section contains detailed documentation for members that don't have
+// a source file. It reduces clutter in the main section of the header.
+
+/**
+
+@struct dtNavMeshCreateParams
+@par
+
+This structure is used to marshal data between the Recast mesh generation pipeline and Detour navigation components.
+
+See the rcPolyMesh and rcPolyMeshDetail documentation for detailed information related to mesh structure.
+
+Units are usually in voxels (vx) or world units (wu). The units for voxels, grid size, and cell size 
+are all based on the values of #cs and #ch.
+
+The standard navigation mesh build process is to create tile data using dtCreateNavMeshData, then add the tile 
+to a navigation mesh using either the dtNavMesh single tile <tt>init()</tt> function or the dtNavMesh::addTile()
+function.
+
+@see dtCreateNavMeshData
+
+*/
diff --git a/dep/recastnavigation/Detour/Include/DetourNavMeshQuery.h b/dep/recastnavigation/Detour/Include/DetourNavMeshQuery.h
index f5046d83290..d431bf177bd 100644
--- a/dep/recastnavigation/Detour/Include/DetourNavMeshQuery.h
+++ b/dep/recastnavigation/Detour/Include/DetourNavMeshQuery.h
@@ -20,39 +20,31 @@
 #define DETOURNAVMESHQUERY_H
 
 #include "DetourNavMesh.h"
+#include "DetourStatus.h"
 
 
 // Define DT_VIRTUAL_QUERYFILTER if you wish to derive a custom filter from dtQueryFilter.
 // On certain platforms indirect or virtual function call is expensive. The default
-// setting is to use non-virtual functions, the actualy implementations of the functions
+// setting is to use non-virtual functions, the actual implementations of the functions
 // are declared as inline for maximum speed. 
 
 //#define DT_VIRTUAL_QUERYFILTER 1
 
-// Class for polygon filtering and cost calculation during query operations.
-// - It is possible to derive a custom query filter from dtQueryFilter by overriding
-//   the virtual functions passFilter() and getCost().
-// - Both functions should be as fast as possible. Use cached local copy of data
-//   instead of accessing your own objects where possible.
-// - You do not need to adhere to the flags and cost logic provided by the default
-//   implementation.
-// - In order for the A* to work properly, the cost should be proportional to
-//   the travel distance. Using cost modifier less than 1.0 is likely to lead
-//   to problems during pathfinding.
+/// Defines polygon filtering and traversal costs for navigation mesh query operations.
+/// @ingroup detour
 class dtQueryFilter
 {
-	float m_areaCost[DT_MAX_AREAS];		// Array storing cost per area type, used by default implementation.
-	unsigned short m_includeFlags;		// Include poly flags, used by default implementation.
-	unsigned short m_excludeFlags;		// Exclude poly flags, used by default implementation.
+	float m_areaCost[DT_MAX_AREAS];		///< Cost per area type. (Used by default implementation.)
+	unsigned short m_includeFlags;		///< Flags for polygons that can be visited. (Used by default implementation.)
+	unsigned short m_excludeFlags;		///< Flags for polygons that should not be visted. (Used by default implementation.)
 	
 public:
 	dtQueryFilter();
 	
-	// Returns true if the polygon is can visited.
-	// Params:
-	//  ref - (in) reference to the polygon test.
-	//  tile - (in) pointer to the tile of the polygon test.
-	//  poly - (in) pointer to the polygon test.
+	/// Returns true if the polygon can be visited.  (I.e. Is traversable.)
+	///  @param[in]		ref		The reference id of the polygon test.
+	///  @param[in]		tile	The tile containing the polygon.
+	///  @param[in]		poly  The polygon to test.
 #ifdef DT_VIRTUAL_QUERYFILTER
 	virtual bool passFilter(const dtPolyRef ref,
 							const dtMeshTile* tile,
@@ -63,16 +55,19 @@ class dtQueryFilter
 					const dtPoly* poly) const;
 #endif
 
-	// Returns cost to travel from 'pa' to 'pb'.'
-	// The segment is fully contained inside 'cur'.
-	// 'pa' lies on the edge between 'prev' and 'cur', 
-	// 'pb' lies on the edge between 'cur' and 'next'.
-	// Params:
-	//  pa - (in) segment start position.
-	//  pb - (in) segment end position.
-	//  prevRef, prevTile, prevPoly - (in) data describing the previous polygon, can be null.
-	//  curRef, curTile, curPoly - (in) data describing the current polygon.
-	//  nextRef, nextTile, nextPoly - (in) data describing the next polygon, can be null.
+	/// Returns cost to move from the beginning to the end of a line segment
+	/// that is fully contained within a polygon.
+	///  @param[in]		pa			The start position on the edge of the previous and current polygon. [(x, y, z)]
+	///  @param[in]		pb			The end position on the edge of the current and next polygon. [(x, y, z)]
+	///  @param[in]		prevRef		The reference id of the previous polygon. [opt]
+	///  @param[in]		prevTile	The tile containing the previous polygon. [opt]
+	///  @param[in]		prevPoly	The previous polygon. [opt]
+	///  @param[in]		curRef		The reference id of the current polygon.
+	///  @param[in]		curTile		The tile containing the current polygon.
+	///  @param[in]		curPoly		The current polygon.
+	///  @param[in]		nextRef		The refernece id of the next polygon. [opt]
+	///  @param[in]		nextTile	The tile containing the next polygon. [opt]
+	///  @param[in]		nextPoly	The next polygon. [opt]
 #ifdef DT_VIRTUAL_QUERYFILTER
 	virtual float getCost(const float* pa, const float* pb,
 						  const dtPolyRef prevRef, const dtMeshTile* prevTile, const dtPoly* prevPoly,
@@ -84,305 +79,385 @@ class dtQueryFilter
 				  const dtPolyRef curRef, const dtMeshTile* curTile, const dtPoly* curPoly,
 				  const dtPolyRef nextRef, const dtMeshTile* nextTile, const dtPoly* nextPoly) const;
 #endif
-	
-	// Getters and setters for the default implementation data.
+
+	/// @name Getters and setters for the default implementation data.
+	///@{
+
+	/// Returns the traversal cost of the area.
+	///  @param[in]		i		The id of the area.
+	/// @returns The traversal cost of the area.
 	inline float getAreaCost(const int i) const { return m_areaCost[i]; }
+
+	/// Sets the traversal cost of the area.
+	///  @param[in]		i		The id of the area.
+	///  @param[in]		cost	The new cost of traversing the area.
 	inline void setAreaCost(const int i, const float cost) { m_areaCost[i] = cost; } 
 
+	/// Returns the include flags for the filter.
+	/// Any polygons that include one or more of these flags will be
+	/// included in the operation.
 	inline unsigned short getIncludeFlags() const { return m_includeFlags; }
+
+	/// Sets the include flags for the filter.
+	/// @param[in]		flags	The new flags.
 	inline void setIncludeFlags(const unsigned short flags) { m_includeFlags = flags; }
 
+	/// Returns the exclude flags for the filter.
+	/// Any polygons that include one ore more of these flags will be
+	/// excluded from the operation.
 	inline unsigned short getExcludeFlags() const { return m_excludeFlags; }
+
+	/// Sets the exclude flags for the filter.
+	/// @param[in]		flags		The new flags.
 	inline void setExcludeFlags(const unsigned short flags) { m_excludeFlags = flags; }	
+
+	///@}
+
 };
 
+/// Provides the ability to perform pathfinding related queries against
+/// a navigation mesh.
+/// @ingroup detour
 class dtNavMeshQuery
 {
 public:
 	dtNavMeshQuery();
 	~dtNavMeshQuery();
 	
-	// Initializes the nav mesh query.
-	// Params:
-	//  nav - (in) pointer to navigation mesh data.
-	//  maxNodes - (in) Maximum number of search nodes to use (max 65536).
-	// Returns: True if succeed, else false.
+	/// Initializes the query object.
+	///  @param[in]		nav			Pointer to the dtNavMesh object to use for all queries.
+	///  @param[in]		maxNodes	Maximum number of search nodes. [Limits: 0 < value <= 65536]
+	/// @returns The status flags for the query.
 	dtStatus init(const dtNavMesh* nav, const int maxNodes);
 	
-	// Finds the nearest navigation polygon around the center location.
-	// Params:
-	//	center[3] - (in) The center of the search box.
-	//	extents[3] - (in) The extents of the search box.
-	//  filter - (in) path polygon filter.
-	//  nearestRef - (out) Reference to the nearest polygon.
-	//  nearestPt[3] - (out, opt) The nearest point on found polygon, null if not needed.
-	// Returns: Reference identifier for the polygon, or 0 if no polygons found.
-	dtStatus findNearestPoly(const float* center, const float* extents,
-							 const dtQueryFilter* filter,
-							 dtPolyRef* nearestRef, float* nearestPt) const;
-	
-	// Returns polygons which overlap the query box.
-	// Params:
-	//	center[3] - (in) the center of the search box.
-	//	extents[3] - (in) the extents of the search box.
-	//  filter - (in) path polygon filter.
-	//	polys - (out) array holding the search result.
-	//  polyCount - (out) Number of polygons in search result array.
-	//	maxPolys - (in) The max number of polygons the polys array can hold.
-	dtStatus queryPolygons(const float* center, const float* extents,
-						   const dtQueryFilter* filter,
-						   dtPolyRef* polys, int* polyCount, const int maxPolys) const;
-	
-	// Finds path from start polygon to end polygon.
-	// If target polygon canno be reached through the navigation graph,
-	// the last node on the array is nearest node to the end polygon.
-	// Start end end positions are needed to calculate more accurate
-	// traversal cost at start end end polygons.
-	// Params:
-	//	startRef - (in) ref to path start polygon.
-	//	endRef - (in) ref to path end polygon.
-	//	startPos[3] - (in) Path start location.
-	//	endPos[3] - (in) Path end location.
-	//  filter - (in) path polygon filter.
-	//	path - (out) array holding the search result.
-	//  pathCount - (out) Number of polygons in search result array.
-	//	maxPath - (in) The max number of polygons the path array can hold. Must be at least 1.
+	/// @name Standard Pathfinding Functions
+	// /@{
+
+	/// Finds a path from the start polygon to the end polygon.
+	///  @param[in]		startRef	The refrence id of the start polygon.
+	///  @param[in]		endRef		The reference id of the end polygon.
+	///  @param[in]		startPos	A position within the start polygon. [(x, y, z)]
+	///  @param[in]		endPos		A position within the end polygon. [(x, y, z)]
+	///  @param[in]		filter		The polygon filter to apply to the query.
+	///  @param[out]	path		An ordered list of polygon references representing the path. (Start to end.) 
+	///  							[(polyRef) * @p pathCount]
+	///  @param[out]	pathCount	The number of polygons returned in the @p path array.
+	///  @param[in]		maxPath		The maximum number of polygons the @p path array can hold. [Limit: >= 1]
 	dtStatus findPath(dtPolyRef startRef, dtPolyRef endRef,
 					  const float* startPos, const float* endPos,
 					  const dtQueryFilter* filter,
 					  dtPolyRef* path, int* pathCount, const int maxPath) const;
 	
-	// Intializes sliced path find query.
-	// Note 1: calling any other dtNavMeshQuery method before calling findPathEnd()
-	// may results in corrupted data!
-	// Note 2: The pointer to filter is store, and used in subsequent
-	// calls to updateSlicedFindPath().
-	// Params:
-	//	startRef - (in) ref to path start polygon.
-	//	endRef - (in) ref to path end polygon.
-	//	startPos[3] - (in) Path start location.
-	//	endPos[3] - (in) Path end location.
-	//  filter - (in) path polygon filter.
+	/// Finds the straight path from the start to the end position within the polygon corridor.
+	///  @param[in]		startPos			Path start position. [(x, y, z)]
+	///  @param[in]		endPos				Path end position. [(x, y, z)]
+	///  @param[in]		path				An array of polygon references that represent the path corridor.
+	///  @param[in]		pathSize			The number of polygons in the @p path array.
+	///  @param[out]	straightPath		Points describing the straight path. [(x, y, z) * @p straightPathCount].
+	///  @param[out]	straightPathFlags	Flags describing each point. (See: #dtStraightPathFlags) [opt]
+	///  @param[out]	straightPathRefs	The reference id of the polygon that is being entered at each point. [opt]
+	///  @param[out]	straightPathCount	The number of points in the straight path.
+	///  @param[in]		maxStraightPath		The maximum number of points the straight path arrays can hold.  [Limit: > 0]
+	///  @param[in]		options				Query options. (see: #dtStraightPathOptions)
+	/// @returns The status flags for the query.
+	dtStatus findStraightPath(const float* startPos, const float* endPos,
+							  const dtPolyRef* path, const int pathSize,
+							  float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
+							  int* straightPathCount, const int maxStraightPath, const int options = 0) const;
+
+	///@}
+	/// @name Sliced Pathfinding Functions
+	/// Common use case:
+	///	-# Call initSlicedFindPath() to initialize the sliced path query.
+	///	-# Call updateSlicedFindPath() until it returns complete.
+	///	-# Call finalizeSlicedFindPath() to get the path.
+	///@{ 
+
+	/// Intializes a sliced path query.
+	///  @param[in]		startRef	The refrence id of the start polygon.
+	///  @param[in]		endRef		The reference id of the end polygon.
+	///  @param[in]		startPos	A position within the start polygon. [(x, y, z)]
+	///  @param[in]		endPos		A position within the end polygon. [(x, y, z)]
+	///  @param[in]		filter		The polygon filter to apply to the query.
+	/// @returns The status flags for the query.
 	dtStatus initSlicedFindPath(dtPolyRef startRef, dtPolyRef endRef,
 								const float* startPos, const float* endPos,
 								const dtQueryFilter* filter);
 
-	// Updates sliced path find query.
-	// Params:
-	//  maxIter - (in) max number of iterations to update.
-	// Returns: Path query state.
-	dtStatus updateSlicedFindPath(const int maxIter);
+	/// Updates an in-progress sliced path query.
+	///  @param[in]		maxIter		The maximum number of iterations to perform.
+	///  @param[out]	doneIters	The actual number of iterations completed. [opt]
+	/// @returns The status flags for the query.
+	dtStatus updateSlicedFindPath(const int maxIter, int* doneIters);
 
-	// Finalizes sliced path find query and returns found path.
-	//	path - (out) array holding the search result.
-	//  pathCount - (out) Number of polygons in search result array.
-	//	maxPath - (in) The max number of polygons the path array can hold.
+	/// Finalizes and returns the results of a sliced path query.
+	///  @param[out]	path		An ordered list of polygon references representing the path. (Start to end.) 
+	///  							[(polyRef) * @p pathCount]
+	///  @param[out]	pathCount	The number of polygons returned in the @p path array.
+	///  @param[in]		maxPath		The max number of polygons the path array can hold. [Limit: >= 1]
+	/// @returns The status flags for the query.
 	dtStatus finalizeSlicedFindPath(dtPolyRef* path, int* pathCount, const int maxPath);
 	
-	// Finalizes partial sliced path find query and returns path to the furthest
-	// polygon on the existing path that was visited during the search.
-	//	existing - (out) Array of polygons in the existing path.
-	//  existingSize - (out) Number of polygons in existing path array.
-	//	path - (out) array holding the search result.
-	//  pathCount - (out) Number of polygons in search result array.
-	//	maxPath - (in) The max number of polygons the path array can hold.
+	/// Finalizes and returns the results of an incomplete sliced path query, returning the path to the furthest
+	/// polygon on the existing path that was visited during the search.
+	///  @param[out]	existing		An array of polygon references for the existing path.
+	///  @param[out]	existingSize	The number of polygon in the @p existing array.
+	///  @param[out]	path			An ordered list of polygon references representing the path. (Start to end.) 
+	///  								[(polyRef) * @p pathCount]
+	///  @param[out]	pathCount		The number of polygons returned in the @p path array.
+	///  @param[in]		maxPath			The max number of polygons the @p path array can hold. [Limit: >= 1]
+	/// @returns The status flags for the query.
 	dtStatus finalizeSlicedFindPathPartial(const dtPolyRef* existing, const int existingSize,
 										   dtPolyRef* path, int* pathCount, const int maxPath);
-	
-	// Finds a straight path from start to end locations within the corridor
-	// described by the path polygons.
-	// Start and end locations will be clamped on the corridor.
-	// The returned polygon references are point to polygon which was entered when
-	// a path point was added. For the end point, zero will be returned. This allows
-	// to match for example off-mesh link points to their representative polygons.
-	// Params:
-	//	startPos[3] - (in) Path start location.
-	//	endPo[3] - (in) Path end location.
-	//	path - (in) Array of connected polygons describing the corridor.
-	//	pathSize - (in) Number of polygons in path array.
-	//	straightPath - (out) Points describing the straight path.
-	//  straightPathFlags - (out, opt) Flags describing each point type, see dtStraightPathFlags.
-	//  straightPathRefs - (out, opt) References to polygons at point locations.
-	//  straightPathCount - (out) Number of points in the path.
-	//	maxStraightPath - (in) The max number of points the straight path array can hold. Must be at least 1.
-	dtStatus findStraightPath(const float* startPos, const float* endPos,
-							  const dtPolyRef* path, const int pathSize,
-							  float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
-							  int* straightPathCount, const int maxStraightPath) const;
-	
-	// Moves from startPos to endPos constrained to the navmesh.
-	// If the endPos is reachable, the resultPos will be endPos,
-	// or else the resultPos will be the nearest point in navmesh.
-	// Note: The resulting point is not projected to the ground, use getPolyHeight() to get height.
-	// Note: The algorithm is optimized for small delta movement and small number of polygons. 
-	// Params:
-	//  startRef - (in) ref to the polygon where startPos lies.
-	//  startPos[3] - (in) start position of the mover.
-	//  endPos[3] - (in) desired end position of the mover.
-	//  filter - (in) path polygon filter.
-	//  resultPos[3] - (out) new position of the mover.
-	//  visited - (out) array of visited polygons.
-	//  visitedCount - (out) Number of entries in the visited array.
-	//  maxVisitedSize - (in) max number of polygons in the visited array.
-	dtStatus moveAlongSurface(dtPolyRef startRef, const float* startPos, const float* endPos,
-							  const dtQueryFilter* filter,
-							  float* resultPos, dtPolyRef* visited, int* visitedCount, const int maxVisitedSize) const;
-	
-	// Casts 'walkability' ray along the navmesh surface from startPos towards the endPos.
-	// Params:
-	//	startRef - (in) ref to the polygon where the start lies.
-	//	startPos[3] - (in) start position of the query.
-	//	endPos[3] - (in) end position of the query.
-	//	t - (out) hit parameter along the segment, FLT_MAX if no hit.
-	//	hitNormal[3] - (out) normal of the nearest hit.
-	//  filter - (in) path polygon filter.
-	//  path - (out,opt) visited path polygons.
-	//  pathCount - (out,opt) Number of polygons visited.
-	//  maxPath - (in) max number of polygons in the path array.
-	dtStatus raycast(dtPolyRef startRef, const float* startPos, const float* endPos,
-					 const dtQueryFilter* filter,
-					 float* t, float* hitNormal, dtPolyRef* path, int* pathCount, const int maxPath) const;
-	
-	// Returns distance to nearest wall from the specified location.
-	// Params:
-	//	startRef - (in) ref to the polygon where the center lies.
-	//	centerPos[3] - (in) center if the query circle.
-	//	maxRadius - (in) max search radius.
-	//  filter - (in) path polygon filter.
-	//  hitDist - (out) distance to nearest wall from the test location.
-	//	hitPos[3] - (out) location of the nearest hit.
-	//	hitNormal[3] - (out) normal of the nearest hit.
-	dtStatus findDistanceToWall(dtPolyRef startRef, const float* centerPos, const float maxRadius,
-								const dtQueryFilter* filter,
-								float* hitDist, float* hitPos, float* hitNormal) const;
-	
-	// Finds polygons found along the navigation graph which touch the specified circle.
-	// Params:
-	//	startRef - (in) ref to the polygon where the search starts.
-	//	centerPos[3] - (in) center if the query circle.
-	//	radius - (in) radius of the query circle.
-	//  filter - (in) path polygon filter.
-	//	resultRef - (out, opt) refs to the polygons touched by the circle.
-	//	resultParent - (out, opt) parent of each result polygon.
-	//	resultCost - (out, opt) search cost at each result polygon.
-	//  resultCount - (out, opt) Number of results.
-	//	maxResult - (int) maximum capacity of search results.
+
+	///@}
+	/// @name Dijkstra Search Functions
+	/// @{ 
+
+	/// Finds the polygons along the navigation graph that touch the specified circle.
+	///  @param[in]		startRef		The reference id of the polygon where the search starts.
+	///  @param[in]		centerPos		The center of the search circle. [(x, y, z)]
+	///  @param[in]		radius			The radius of the search circle.
+	///  @param[in]		filter			The polygon filter to apply to the query.
+	///  @param[out]	resultRef		The reference ids of the polygons touched by the circle. [opt]
+	///  @param[out]	resultParent	The reference ids of the parent polygons for each result. 
+	///  								Zero if a result polygon has no parent. [opt]
+	///  @param[out]	resultCost		The search cost from @p centerPos to the polygon. [opt]
+	///  @param[out]	resultCount		The number of polygons found. [opt]
+	///  @param[in]		maxResult		The maximum number of polygons the result arrays can hold.
+	/// @returns The status flags for the query.
 	dtStatus findPolysAroundCircle(dtPolyRef startRef, const float* centerPos, const float radius,
 								   const dtQueryFilter* filter,
 								   dtPolyRef* resultRef, dtPolyRef* resultParent, float* resultCost,
 								   int* resultCount, const int maxResult) const;
 	
-	// Finds polygons found along the navigation graph which touch the convex polygon shape.
-	// Params:
-	//	startRef - (in) ref to the polygon where the search starts.
-	//	verts[3*n] - (in) vertices describing convex polygon shape (CCW).
-	//	nverts - (in) number of vertices in the polygon.
-	//  filter - (in) path polygon filter.
-	//	resultRef - (out, opt) refs to the polygons touched by the circle.
-	//	resultParent - (out, opt) parent of each result polygon.
-	//	resultCost - (out, opt) search cost at each result polygon.
-	//  resultCount - (out) number of results.
-	//	maxResult - (int) maximum capacity of search results.
+	/// Finds the polygons along the naviation graph that touch the specified convex polygon.
+	///  @param[in]		startRef		The reference id of the polygon where the search starts.
+	///  @param[in]		verts			The vertices describing the convex polygon. (CCW) 
+	///  								[(x, y, z) * @p nverts]
+	///  @param[in]		nverts			The number of vertices in the polygon.
+	///  @param[in]		filter			The polygon filter to apply to the query.
+	///  @param[out]	resultRef		The reference ids of the polygons touched by the search polygon. [opt]
+	///  @param[out]	resultParent	The reference ids of the parent polygons for each result. Zero if a 
+	///  								result polygon has no parent. [opt]
+	///  @param[out]	resultCost		The search cost from the centroid point to the polygon. [opt]
+	///  @param[out]	resultCount		The number of polygons found.
+	///  @param[in]		maxResult		The maximum number of polygons the result arrays can hold.
+	/// @returns The status flags for the query.
 	dtStatus findPolysAroundShape(dtPolyRef startRef, const float* verts, const int nverts,
 								  const dtQueryFilter* filter,
 								  dtPolyRef* resultRef, dtPolyRef* resultParent, float* resultCost,
 								  int* resultCount, const int maxResult) const;
 	
-	// Finds non-overlapping local neighbourhood around center location.
-	// Note: The algorithm is optimized for small query radius and small number of polygons. 
-	// Params:
-	//	startRef - (in) ref to the polygon where the search starts.
-	//	centerPos[3] - (in) center if the query circle.
-	//	radius - (in) radius of the query circle.
-	//  filter - (in) path polygon filter.
-	//	resultRef - (out) refs to the polygons touched by the circle.
-	//	resultParent - (out, opt) parent of each result polygon.
-	//  resultCount - (out) number of results.
-	//	maxResult - (int) maximum capacity of search results.
+	/// @}
+	/// @name Local Query Functions
+	///@{
+
+	/// Finds the polygon nearest to the specified center point.
+	///  @param[in]		center		The center of the search box. [(x, y, z)]
+	///  @param[in]		extents		The search distance along each axis. [(x, y, z)]
+	///  @param[in]		filter		The polygon filter to apply to the query.
+	///  @param[out]	nearestRef	The reference id of the nearest polygon.
+	///  @param[out]	nearestPt	The nearest point on the polygon. [opt] [(x, y, z)]
+	/// @returns The status flags for the query.
+	dtStatus findNearestPoly(const float* center, const float* extents,
+							 const dtQueryFilter* filter,
+							 dtPolyRef* nearestRef, float* nearestPt) const;
+	
+	/// Finds polygons that overlap the search box.
+	///  @param[in]		center		The center of the search box. [(x, y, z)]
+	///  @param[in]		extents		The search distance along each axis. [(x, y, z)]
+	///  @param[in]		filter		The polygon filter to apply to the query.
+	///  @param[out]	polys		The reference ids of the polygons that overlap the query box.
+	///  @param[out]	polyCount	The number of polygons in the search result.
+	///  @param[in]		maxPolys	The maximum number of polygons the search result can hold.
+	/// @returns The status flags for the query.
+	dtStatus queryPolygons(const float* center, const float* extents,
+						   const dtQueryFilter* filter,
+						   dtPolyRef* polys, int* polyCount, const int maxPolys) const;
+
+	/// Finds the non-overlapping navigation polygons in the local neighbourhood around the center position.
+	///  @param[in]		startRef		The reference id of the polygon where the search starts.
+	///  @param[in]		centerPos		The center of the query circle. [(x, y, z)]
+	///  @param[in]		radius			The radius of the query circle.
+	///  @param[in]		filter			The polygon filter to apply to the query.
+	///  @param[out]	resultRef		The reference ids of the polygons touched by the circle.
+	///  @param[out]	resultParent	The reference ids of the parent polygons for each result. 
+	///  								Zero if a result polygon has no parent. [opt]
+	///  @param[out]	resultCount		The number of polygons found.
+	///  @param[in]		maxResult		The maximum number of polygons the result arrays can hold.
+	/// @returns The status flags for the query.
 	dtStatus findLocalNeighbourhood(dtPolyRef startRef, const float* centerPos, const float radius,
 									const dtQueryFilter* filter,
 									dtPolyRef* resultRef, dtPolyRef* resultParent,
 									int* resultCount, const int maxResult) const;
+
+	/// Moves from the start to the end position constrained to the navigation mesh.
+	///  @param[in]		startRef		The reference id of the start polygon.
+	///  @param[in]		startPos		A position of the mover within the start polygon. [(x, y, x)]
+	///  @param[in]		endPos			The desired end position of the mover. [(x, y, z)]
+	///  @param[in]		filter			The polygon filter to apply to the query.
+	///  @param[out]	resultPos		The result position of the mover. [(x, y, z)]
+	///  @param[out]	visited			The reference ids of the polygons visited during the move.
+	///  @param[out]	visitedCount	The number of polygons visited during the move.
+	///  @param[in]		maxVisitedSize	The maximum number of polygons the @p visited array can hold.
+	/// @returns The status flags for the query.
+	dtStatus moveAlongSurface(dtPolyRef startRef, const float* startPos, const float* endPos,
+							  const dtQueryFilter* filter,
+							  float* resultPos, dtPolyRef* visited, int* visitedCount, const int maxVisitedSize) const;
+	
+	/// Casts a 'walkability' ray along the surface of the navigation mesh from 
+	/// the start position toward the end position.
+	///  @param[in]		startRef	The reference id of the start polygon.
+	///  @param[in]		startPos	A position within the start polygon representing 
+	///  							the start of the ray. [(x, y, z)]
+	///  @param[in]		endPos		The position to cast the ray toward. [(x, y, z)]
+	///  @param[out]	t			The hit parameter. (FLT_MAX if no wall hit.)
+	///  @param[out]	hitNormal	The normal of the nearest wall hit. [(x, y, z)]
+	///  @param[in]		filter		The polygon filter to apply to the query.
+	///  @param[out]	path		The reference ids of the visited polygons. [opt]
+	///  @param[out]	pathCount	The number of visited polygons. [opt]
+	///  @param[in]		maxPath		The maximum number of polygons the @p path array can hold.
+	/// @returns The status flags for the query.
+	dtStatus raycast(dtPolyRef startRef, const float* startPos, const float* endPos,
+					 const dtQueryFilter* filter,
+					 float* t, float* hitNormal, dtPolyRef* path, int* pathCount, const int maxPath) const;
 	
-	// Returns wall segments of specified polygon.
-	// Params:
-	//  ref - (in) ref to the polygon.
-	//  filter - (in) path polygon filter.
-	//  segments[6*maxSegments] - (out) wall segments (2 endpoints per segment).
-	//  segmentCount - (out) number of wall segments.
-	//  maxSegments - (in) max number of segments that can be stored in 'segments'.
+	/// Finds the distance from the specified position to the nearest polygon wall.
+	///  @param[in]		startRef		The reference id of the polygon containing @p centerPos.
+	///  @param[in]		centerPos		The center of the search circle. [(x, y, z)]
+	///  @param[in]		maxRadius		The radius of the search circle.
+	///  @param[in]		filter			The polygon filter to apply to the query.
+	///  @param[out]	hitDist			The distance to the nearest wall from @p centerPos.
+	///  @param[out]	hitPos			The nearest position on the wall that was hit. [(x, y, z)]
+	///  @param[out]	hitNormal		The normalized ray formed from the wall point to the 
+	///  								source point. [(x, y, z)]
+	/// @returns The status flags for the query.
+	dtStatus findDistanceToWall(dtPolyRef startRef, const float* centerPos, const float maxRadius,
+								const dtQueryFilter* filter,
+								float* hitDist, float* hitPos, float* hitNormal) const;
+	
+	/// Returns the segments for the specified polygon, optionally including portals.
+	///  @param[in]		ref				The reference id of the polygon.
+	///  @param[in]		filter			The polygon filter to apply to the query.
+	///  @param[out]	segmentVerts	The segments. [(ax, ay, az, bx, by, bz) * segmentCount]
+	///  @param[out]	segmentRefs		The reference ids of each segment's neighbor polygon. 
+	///  								Or zero if the segment is a wall. [opt] [(parentRef) * @p segmentCount] 
+	///  @param[out]	segmentCount	The number of segments returned.
+	///  @param[in]		maxSegments		The maximum number of segments the result arrays can hold.
+	/// @returns The status flags for the query.
 	dtStatus getPolyWallSegments(dtPolyRef ref, const dtQueryFilter* filter,
-								 float* segments, int* segmentCount, const int maxSegments) const;
+								 float* segmentVerts, dtPolyRef* segmentRefs, int* segmentCount,
+								 const int maxSegments) const;
+
+	/// Returns random location on navmesh.
+	/// Polygons are chosen weighted by area. The search runs in linear related to number of polygon.
+	///  @param[in]		filter			The polygon filter to apply to the query.
+	///  @param[in]		frand			Function returning a random number [0..1).
+	///  @param[out]	randomRef		The reference id of the random location.
+	///  @param[out]	randomPt		The random location. 
+	/// @returns The status flags for the query.
+	dtStatus findRandomPoint(const dtQueryFilter* filter, float (*frand)(),
+							 dtPolyRef* randomRef, float* randomPt) const;
+
+	/// Returns random location on navmesh within the reach of specified location.
+	/// Polygons are chosen weighted by area. The search runs in linear related to number of polygon.
+	/// The location is not exactly constrained by the circle, but it limits the visited polygons.
+	///  @param[in]		startRef		The reference id of the polygon where the search starts.
+	///  @param[in]		centerPos		The center of the search circle. [(x, y, z)]
+	///  @param[in]		filter			The polygon filter to apply to the query.
+	///  @param[in]		frand			Function returning a random number [0..1).
+	///  @param[out]	randomRef		The reference id of the random location.
+	///  @param[out]	randomPt		The random location. [(x, y, z)]
+	/// @returns The status flags for the query.
+	dtStatus findRandomPointAroundCircle(dtPolyRef startRef, const float* centerPos, const float maxRadius,
+										 const dtQueryFilter* filter, float (*frand)(),
+										 dtPolyRef* randomRef, float* randomPt) const;
 	
-	// Returns closest point on navigation polygon.
-	// Uses detail polygons to find the closest point to the navigation polygon surface. 
-	// Params:
-	//	ref - (in) ref to the polygon.
-	//	pos[3] - (in) the point to check.
-	//	closest[3] - (out) closest point.
-	// Returns: true if closest point found.
+	/// Finds the closest point on the specified polygon.
+	///  @param[in]		ref			The reference id of the polygon.
+	///  @param[in]		pos			The position to check. [(x, y, z)]
+	///  @param[out]	closest		The closest point on the polygon. [(x, y, z)]
+	/// @returns The status flags for the query.
 	dtStatus closestPointOnPoly(dtPolyRef ref, const float* pos, float* closest) const;
 	
-	// Returns closest point on navigation polygon boundary.
-	// Uses the navigation polygon boundary to snap the point to poly boundary
-	// if it is outside the polygon. Much faster than closestPointToPoly. Does not affect height.
-	// Params:
-	//	ref - (in) ref to the polygon.
-	//	pos[3] - (in) the point to check.
-	//	closest[3] - (out) closest point.
-	// Returns: true if closest point found.
+	/// Returns a point on the boundary closest to the source point if the source point is outside the 
+	/// polygon's xz-bounds.
+	///  @param[in]		ref			The reference id to the polygon.
+	///  @param[in]		pos			The position to check. [(x, y, z)]
+	///  @param[out]	closest		The closest point. [(x, y, z)]
+	/// @returns The status flags for the query.
 	dtStatus closestPointOnPolyBoundary(dtPolyRef ref, const float* pos, float* closest) const;
 	
-	// Returns start and end location of an off-mesh link polygon.
-	// Params:
-	//	prevRef - (in) ref to the polygon before the link (used to select direction).
-	//	polyRef - (in) ref to the off-mesh link polygon.
-	//	startPos[3] - (out) start point of the link.
-	//	endPos[3] - (out) end point of the link.
-	// Returns: true if link is found.
-	dtStatus getOffMeshConnectionPolyEndPoints(dtPolyRef prevRef, dtPolyRef polyRef, float* startPos, float* endPos) const;
-	
-	// Returns height of the polygon at specified location.
-	// Params:
-	//	ref - (in) ref to the polygon.
-	//	pos[3] - (in) the point where to locate the height.
-	//	height - (out) height at the location.
-	// Returns: true if over polygon.
+	/// Gets the height of the polygon at the provided position using the height detail. (Most accurate.)
+	///  @param[in]		ref			The reference id of the polygon.
+	///  @param[in]		pos			A position within the xz-bounds of the polygon. [(x, y, z)]
+	///  @param[out]	height		The height at the surface of the polygon.
+	/// @returns The status flags for the query.
 	dtStatus getPolyHeight(dtPolyRef ref, const float* pos, float* height) const;
-		
-	// Returns true if poly reference ins in closed list.
+
+	/// @}
+	/// @name Miscellaneous Functions
+	/// @{
+
+	/// Returns true if the polygon reference is valid and passes the filter restrictions.
+	///  @param[in]		ref			The polygon reference to check.
+	///  @param[in]		filter		The filter to apply.
+	bool isValidPolyRef(dtPolyRef ref, const dtQueryFilter* filter) const;
+
+	/// Returns true if the polygon reference is in the closed list. 
+	///  @param[in]		ref		The reference id of the polygon to check.
+	/// @returns True if the polygon is in closed list.
 	bool isInClosedList(dtPolyRef ref) const;
 	
+	/// Gets the node pool.
+	/// @returns The node pool.
 	class dtNodePool* getNodePool() const { return m_nodePool; }
 	
+	/// Gets the navigation mesh the query object is using.
+	/// @return The navigation mesh the query object is using.
+	const dtNavMesh* getAttachedNavMesh() const { return m_nav; }
+
+	/// @}
+	
 private:
 	
-	// Returns neighbour tile based on side. 
+	/// Returns neighbour tile based on side.
 	dtMeshTile* getNeighbourTileAt(int x, int y, int side) const;
 
-	// Queries polygons within a tile.
+	/// Queries polygons within a tile.
 	int queryPolygonsInTile(const dtMeshTile* tile, const float* qmin, const float* qmax, const dtQueryFilter* filter,
 							dtPolyRef* polys, const int maxPolys) const;
-	// Find nearest polygon within a tile.
+	/// Find nearest polygon within a tile.
 	dtPolyRef findNearestPolyInTile(const dtMeshTile* tile, const float* center, const float* extents,
 									const dtQueryFilter* filter, float* nearestPt) const;
-	// Returns closest point on polygon.
-	dtStatus closestPointOnPolyInTile(const dtMeshTile* tile, const dtPoly* poly, const float* pos, float* closest) const;
+	/// Returns closest point on polygon.
+	void closestPointOnPolyInTile(const dtMeshTile* tile, const dtPoly* poly, const float* pos, float* closest) const;
 	
-	// Returns portal points between two polygons.
+	/// Returns portal points between two polygons.
 	dtStatus getPortalPoints(dtPolyRef from, dtPolyRef to, float* left, float* right,
 							 unsigned char& fromType, unsigned char& toType) const;
 	dtStatus getPortalPoints(dtPolyRef from, const dtPoly* fromPoly, const dtMeshTile* fromTile,
 							 dtPolyRef to, const dtPoly* toPoly, const dtMeshTile* toTile,
 							 float* left, float* right) const;
 	
-	// Returns edge mid point between two polygons.
+	/// Returns edge mid point between two polygons.
 	dtStatus getEdgeMidPoint(dtPolyRef from, dtPolyRef to, float* mid) const;
 	dtStatus getEdgeMidPoint(dtPolyRef from, const dtPoly* fromPoly, const dtMeshTile* fromTile,
 							 dtPolyRef to, const dtPoly* toPoly, const dtMeshTile* toTile,
 							 float* mid) const;
 	
-	const dtNavMesh* m_nav;				// Pointer to navmesh data.
+	// Appends vertex to a straight path
+	dtStatus appendVertex(const float* pos, const unsigned char flags, const dtPolyRef ref,
+						  float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
+						  int* straightPathCount, const int maxStraightPath) const;
+
+	// Appends intermediate portal points to a straight path.
+	dtStatus appendPortals(const int startIdx, const int endIdx, const float* endPos, const dtPolyRef* path,
+						   float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
+						   int* straightPathCount, const int maxStraightPath, const int options) const;
+	
+	const dtNavMesh* m_nav;				///< Pointer to navmesh data.
 
 	struct dtQueryData
 	{
@@ -393,15 +468,21 @@ class dtNavMeshQuery
 		float startPos[3], endPos[3];
 		const dtQueryFilter* filter;
 	};
-	dtQueryData m_query;				// Sliced query state.
+	dtQueryData m_query;				///< Sliced query state.
 
-	class dtNodePool* m_tinyNodePool;	// Pointer to small node pool.
-	class dtNodePool* m_nodePool;		// Pointer to node pool.
-	class dtNodeQueue* m_openList;		// Pointer to open list queue.
+	class dtNodePool* m_tinyNodePool;	///< Pointer to small node pool.
+	class dtNodePool* m_nodePool;		///< Pointer to node pool.
+	class dtNodeQueue* m_openList;		///< Pointer to open list queue.
 };
 
-// Helper function to allocate navmesh query class using Detour allocator.
+/// Allocates a query object using the Detour allocator.
+/// @return An allocated query object, or null on failure.
+/// @ingroup detour
 dtNavMeshQuery* dtAllocNavMeshQuery();
+
+/// Frees the specified query object using the Detour allocator.
+///  @param[in]		query		A query object allocated using #dtAllocNavMeshQuery
+/// @ingroup detour
 void dtFreeNavMeshQuery(dtNavMeshQuery* query);
 
 #endif // DETOURNAVMESHQUERY_H
diff --git a/dep/recastnavigation/Detour/Include/DetourNode.h b/dep/recastnavigation/Detour/Include/DetourNode.h
index e893f784dcc..2d644d9ad6e 100644
--- a/dep/recastnavigation/Detour/Include/DetourNode.h
+++ b/dep/recastnavigation/Detour/Include/DetourNode.h
@@ -27,18 +27,20 @@ enum dtNodeFlags
 	DT_NODE_CLOSED = 0x02,
 };
 
-static const unsigned short DT_NULL_IDX = 0xffff;
+typedef unsigned short dtNodeIndex;
+static const dtNodeIndex DT_NULL_IDX = (dtNodeIndex)~0;
 
 struct dtNode
 {
-	float pos[3];				// Position of the node.
-	float cost;					// Cost from previous node to current node.
-	float total;				// Cost up to the node.
-	unsigned int pidx : 30;		// Index to parent node.
-	unsigned int flags : 2;		// Node flags 0/open/closed.
-	dtPolyRef id;				// Polygon ref the node corresponds to.
+	float pos[3];				///< Position of the node.
+	float cost;					///< Cost from previous node to current node.
+	float total;				///< Cost up to the node.
+	unsigned int pidx : 30;		///< Index to parent node.
+	unsigned int flags : 2;		///< Node flags 0/open/closed.
+	dtPolyRef id;				///< Polygon ref the node corresponds to.
 };
 
+
 class dtNodePool
 {
 public:
@@ -70,22 +72,22 @@ class dtNodePool
 	inline int getMemUsed() const
 	{
 		return sizeof(*this) +
-		sizeof(dtNode)*m_maxNodes +
-		sizeof(unsigned short)*m_maxNodes +
-		sizeof(unsigned short)*m_hashSize;
+			sizeof(dtNode)*m_maxNodes +
+			sizeof(dtNodeIndex)*m_maxNodes +
+			sizeof(dtNodeIndex)*m_hashSize;
 	}
 	
 	inline int getMaxNodes() const { return m_maxNodes; }
 	
 	inline int getHashSize() const { return m_hashSize; }
-	inline unsigned short getFirst(int bucket) const { return m_first[bucket]; }
-	inline unsigned short getNext(int i) const { return m_next[i]; }
+	inline dtNodeIndex getFirst(int bucket) const { return m_first[bucket]; }
+	inline dtNodeIndex getNext(int i) const { return m_next[i]; }
 	
 private:
 	
 	dtNode* m_nodes;
-	unsigned short* m_first;
-	unsigned short* m_next;
+	dtNodeIndex* m_first;
+	dtNodeIndex* m_next;
 	const int m_maxNodes;
 	const int m_hashSize;
 	int m_nodeCount;
diff --git a/dep/recastnavigation/Detour/Include/DetourObstacleAvoidance.h b/dep/recastnavigation/Detour/Include/DetourObstacleAvoidance.h
deleted file mode 100644
index 4a7187a7998..00000000000
--- a/dep/recastnavigation/Detour/Include/DetourObstacleAvoidance.h
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef DETOUROBSTACLEAVOIDANCE_H
-#define DETOUROBSTACLEAVOIDANCE_H
-
-struct dtObstacleCircle
-{
-	float p[3];				// Position of the obstacle
-	float vel[3];			// Velocity of the obstacle
-	float dvel[3];			// Velocity of the obstacle
-	float rad;				// Radius of the obstacle
-	float dp[3], np[3];		// Use for side selection during sampling.
-};
-
-struct dtObstacleSegment
-{
-	float p[3], q[3];		// End points of the obstacle segment
-	bool touch;
-};
-
-static const int RVO_SAMPLE_RAD = 15;
-static const int MAX_RVO_SAMPLES = (RVO_SAMPLE_RAD*2+1)*(RVO_SAMPLE_RAD*2+1) + 100;
-
-class dtObstacleAvoidanceDebugData
-{
-public:
-	dtObstacleAvoidanceDebugData();
-	~dtObstacleAvoidanceDebugData();
-	
-	bool init(const int maxSamples);
-	void reset();
-	void addSample(const float* vel, const float ssize, const float pen,
-				   const float vpen, const float vcpen, const float spen, const float tpen);
-	
-	void normalizeSamples();
-	
-	inline int getSampleCount() const { return m_nsamples; }
-	inline const float* getSampleVelocity(const int i) const { return &m_vel[i*3]; }
-	inline float getSampleSize(const int i) const { return m_ssize[i]; }
-	inline float getSamplePenalty(const int i) const { return m_pen[i]; }
-	inline float getSampleDesiredVelocityPenalty(const int i) const { return m_vpen[i]; }
-	inline float getSampleCurrentVelocityPenalty(const int i) const { return m_vcpen[i]; }
-	inline float getSamplePreferredSidePenalty(const int i) const { return m_spen[i]; }
-	inline float getSampleCollisionTimePenalty(const int i) const { return m_tpen[i]; }
-
-private:
-	int m_nsamples;
-	int m_maxSamples;
-	float* m_vel;
-	float* m_ssize;
-	float* m_pen;
-	float* m_vpen;
-	float* m_vcpen;
-	float* m_spen;
-	float* m_tpen;
-};
-
-dtObstacleAvoidanceDebugData* dtAllocObstacleAvoidanceDebugData();
-void dtFreeObstacleAvoidanceDebugData(dtObstacleAvoidanceDebugData* ptr);
-
-
-class dtObstacleAvoidanceQuery
-{
-public:
-	dtObstacleAvoidanceQuery();
-	~dtObstacleAvoidanceQuery();
-	
-	bool init(const int maxCircles, const int maxSegments);
-	
-	void reset();
-
-	void addCircle(const float* pos, const float rad,
-				   const float* vel, const float* dvel);
-				   
-	void addSegment(const float* p, const float* q);
-
-	inline void setVelocitySelectionBias(float v) { m_velBias = v; }
-	inline void setDesiredVelocityWeight(float w) { m_weightDesVel = w; }
-	inline void setCurrentVelocityWeight(float w) { m_weightCurVel = w; }
-	inline void setPreferredSideWeight(float w) { m_weightSide = w; }
-	inline void setCollisionTimeWeight(float w) { m_weightToi = w; }
-	inline void setTimeHorizon(float t) { m_horizTime = t; }
-
-	void sampleVelocityGrid(const float* pos, const float rad, const float vmax,
-							const float* vel, const float* dvel, float* nvel,
-							const int gsize,
-							dtObstacleAvoidanceDebugData* debug = 0);
-
-	void sampleVelocityAdaptive(const float* pos, const float rad, const float vmax,
-								const float* vel, const float* dvel, float* nvel,
-								const int ndivs, const int nrings, const int depth, 
-								dtObstacleAvoidanceDebugData* debug = 0);
-	
-	inline int getObstacleCircleCount() const { return m_ncircles; }
-	const dtObstacleCircle* getObstacleCircle(const int i) { return &m_circles[i]; }
-
-	inline int getObstacleSegmentCount() const { return m_nsegments; }
-	const dtObstacleSegment* getObstacleSegment(const int i) { return &m_segments[i]; }
-
-private:
-
-	void prepare(const float* pos, const float* dvel);
-
-	float processSample(const float* vcand, const float cs,
-						const float* pos, const float rad,
-						const float vmax, const float* vel, const float* dvel,
-						dtObstacleAvoidanceDebugData* debug);
-
-	dtObstacleCircle* insertCircle(const float dist);
-	dtObstacleSegment* insertSegment(const float dist);
-
-	float m_velBias;
-	float m_weightDesVel;
-	float m_weightCurVel;
-	float m_weightSide;
-	float m_weightToi;
-	float m_horizTime;
-	
-	int m_maxCircles;
-	dtObstacleCircle* m_circles;
-	int m_ncircles;
-
-	int m_maxSegments;
-	dtObstacleSegment* m_segments;
-	int m_nsegments;
-};
-
-dtObstacleAvoidanceQuery* dtAllocObstacleAvoidanceQuery();
-void dtFreeObstacleAvoidanceQuery(dtObstacleAvoidanceQuery* ptr);
-
-
-#endif // DETOUROBSTACLEAVOIDANCE_H
\ No newline at end of file
diff --git a/dep/recastnavigation/Detour/Include/DetourStatus.h b/dep/recastnavigation/Detour/Include/DetourStatus.h
new file mode 100644
index 00000000000..af822c4a92d
--- /dev/null
+++ b/dep/recastnavigation/Detour/Include/DetourStatus.h
@@ -0,0 +1,64 @@
+//
+// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
+//
+// This software is provided 'as-is', without any express or implied
+// warranty.  In no event will the authors be held liable for any damages
+// arising from the use of this software.
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+// 1. The origin of this software must not be misrepresented; you must not
+//    claim that you wrote the original software. If you use this software
+//    in a product, an acknowledgment in the product documentation would be
+//    appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//    misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+//
+
+#ifndef DETOURSTATUS_H
+#define DETOURSTATUS_H
+
+typedef unsigned int dtStatus;
+
+// High level status.
+static const unsigned int DT_FAILURE = 1u << 31;			// Operation failed.
+static const unsigned int DT_SUCCESS = 1u << 30;			// Operation succeed.
+static const unsigned int DT_IN_PROGRESS = 1u << 29;		// Operation still in progress.
+
+// Detail information for status.
+static const unsigned int DT_STATUS_DETAIL_MASK = 0x0ffffff;
+static const unsigned int DT_WRONG_MAGIC = 1 << 0;		// Input data is not recognized.
+static const unsigned int DT_WRONG_VERSION = 1 << 1;	// Input data is in wrong version.
+static const unsigned int DT_OUT_OF_MEMORY = 1 << 2;	// Operation ran out of memory.
+static const unsigned int DT_INVALID_PARAM = 1 << 3;	// An input parameter was invalid.
+static const unsigned int DT_BUFFER_TOO_SMALL = 1 << 4;	// Result buffer for the query was too small to store all results.
+static const unsigned int DT_OUT_OF_NODES = 1 << 5;		// Query ran out of nodes during search.
+static const unsigned int DT_PARTIAL_RESULT = 1 << 6;	// Query did not reach the end location, returning best guess. 
+
+
+// Returns true of status is success.
+inline bool dtStatusSucceed(dtStatus status)
+{
+	return (status & DT_SUCCESS) != 0;
+}
+
+// Returns true of status is failure.
+inline bool dtStatusFailed(dtStatus status)
+{
+	return (status & DT_FAILURE) != 0;
+}
+
+// Returns true of status is in progress.
+inline bool dtStatusInProgress(dtStatus status)
+{
+	return (status & DT_IN_PROGRESS) != 0;
+}
+
+// Returns true if specific detail is set.
+inline bool dtStatusDetail(dtStatus status, unsigned int detail)
+{
+	return (status & detail) != 0;
+}
+
+#endif // DETOURSTATUS_H
diff --git a/dep/recastnavigation/Detour/Source/CMakeLists.txt b/dep/recastnavigation/Detour/Source/CMakeLists.txt
index f30da69afb5..f8b8e0d68ba 100644
--- a/dep/recastnavigation/Detour/Source/CMakeLists.txt
+++ b/dep/recastnavigation/Detour/Source/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2005-2011 MaNGOS project <http://getmangos.com/>
+# This file is part of the CMaNGOS Project. See AUTHORS file for Copyright information
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ set(detour_SRCS
     DetourNavMesh.cpp
     DetourNavMeshQuery.cpp
     DetourNode.cpp
-    DetourObstacleAvoidance.cpp
 )
 
 include_directories(
diff --git a/dep/recastnavigation/Detour/Source/DetourCommon.cpp b/dep/recastnavigation/Detour/Source/DetourCommon.cpp
index c0b973e4a75..b5700f5930b 100644
--- a/dep/recastnavigation/Detour/Source/DetourCommon.cpp
+++ b/dep/recastnavigation/Detour/Source/DetourCommon.cpp
@@ -238,6 +238,9 @@ bool dtClosestHeightPointTriangle(const float* p, const float* a, const float* b
 	return false;
 }
 
+/// @par
+///
+/// All points are projected onto the xz-plane, so the y-values are ignored.
 bool dtPointInPolygon(const float* pt, const float* verts, const int nverts)
 {
 	// TODO: Replace pnpoly with triArea2D tests?
@@ -291,6 +294,9 @@ inline bool overlapRange(const float amin, const float amax,
 	return ((amin+eps) > bmax || (amax-eps) < bmin) ? false : true;
 }
 
+/// @par
+///
+/// All vertices are projected onto the xz-plane, so the y-values are ignored.
 bool dtOverlapPolyPoly2D(const float* polya, const int npolya,
 						 const float* polyb, const int npolyb)
 {
@@ -327,3 +333,61 @@ bool dtOverlapPolyPoly2D(const float* polya, const int npolya,
 	return true;
 }
 
+// Returns a random point in a convex polygon.
+// Adapted from Graphics Gems article.
+void dtRandomPointInConvexPoly(const float* pts, const int npts, float* areas,
+							   const float s, const float t, float* out)
+{
+	// Calc triangle araes
+	float areasum = 0.0f;
+	for (int i = 2; i < npts; i++) {
+		areas[i] = dtTriArea2D(&pts[0], &pts[(i-1)*3], &pts[i*3]);
+		areasum += dtMax(0.001f, areas[i]);
+	}
+	// Find sub triangle weighted by area.
+	const float thr = s*areasum;
+	float acc = 0.0f;
+	float u = 0.0f;
+	int tri = 0;
+	for (int i = 2; i < npts; i++) {
+		const float dacc = areas[i];
+		if (thr >= acc && thr < (acc+dacc))
+		{
+			u = (thr - acc) / dacc;
+			tri = i;
+			break;
+		}
+		acc += dacc;
+	}
+	
+	float v = dtSqrt(t);
+	
+	const float a = 1 - v;
+	const float b = (1 - u) * v;
+	const float c = u * v;
+	const float* pa = &pts[0];
+	const float* pb = &pts[(tri-1)*3];
+	const float* pc = &pts[tri*3];
+	
+	out[0] = a*pa[0] + b*pb[0] + c*pc[0];
+	out[1] = a*pa[1] + b*pb[1] + c*pc[1];
+	out[2] = a*pa[2] + b*pb[2] + c*pc[2];
+}
+
+inline float vperpXZ(const float* a, const float* b) { return a[0]*b[2] - a[2]*b[0]; }
+
+bool dtIntersectSegSeg2D(const float* ap, const float* aq,
+						 const float* bp, const float* bq,
+						 float& s, float& t)
+{
+	float u[3], v[3], w[3];
+	dtVsub(u,aq,ap);
+	dtVsub(v,bq,bp);
+	dtVsub(w,ap,bp);
+	float d = vperpXZ(u,v);
+	if (fabsf(d) < 1e-6f) return false;
+	s = vperpXZ(v,w) / d;
+	t = vperpXZ(u,w) / d;
+	return true;
+}
+
diff --git a/dep/recastnavigation/Detour/Source/DetourNavMesh.cpp b/dep/recastnavigation/Detour/Source/DetourNavMesh.cpp
index e139e3f5c63..37f3887986d 100644
--- a/dep/recastnavigation/Detour/Source/DetourNavMesh.cpp
+++ b/dep/recastnavigation/Detour/Source/DetourNavMesh.cpp
@@ -64,6 +64,15 @@ inline bool overlapSlabs(const float* amin, const float* amax,
 	return false;
 }
 
+static float getSlabCoord(const float* va, const int side)
+{
+	if (side == 0 || side == 4)
+		return va[0];
+	else if (side == 2 || side == 6)
+		return va[2];
+	return 0;
+}
+
 static void calcSlabEndPoints(const float* va, const float* vb, float* bmin, float* bmax, const int side)
 {
 	if (side == 0 || side == 4)
@@ -133,6 +142,10 @@ dtNavMesh* dtAllocNavMesh()
 	return new(mem) dtNavMesh;
 }
 
+/// @par
+///
+/// This function will only free the memory for tiles with the #DT_TILE_FREE_DATA
+/// flag set.
 void dtFreeNavMesh(dtNavMesh* navmesh)
 {
 	if (!navmesh) return;
@@ -141,6 +154,37 @@ void dtFreeNavMesh(dtNavMesh* navmesh)
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+@class dtNavMesh
+
+The navigation mesh consists of one or more tiles defining three primary types of structural data:
+
+A polygon mesh which defines most of the navigation graph. (See rcPolyMesh for its structure.)
+A detail mesh used for determining surface height on the polygon mesh. (See rcPolyMeshDetail for its structure.)
+Off-mesh connections, which define custom point-to-point edges within the navigation graph.
+
+The general build process is as follows:
+
+-# Create rcPolyMesh and rcPolyMeshDetail data using the Recast build pipeline.
+-# Optionally, create off-mesh connection data.
+-# Combine the source data into a dtNavMeshCreateParams structure.
+-# Create a tile data array using dtCreateNavMeshData().
+-# Allocate at dtNavMesh object and initialize it. (For single tile navigation meshes,
+   the tile data is loaded during this step.)
+-# For multi-tile navigation meshes, load the tile data using dtNavMesh::addTile().
+
+Notes:
+
+- This class is usually used in conjunction with the dtNavMeshQuery class for pathfinding.
+- Technically, all navigation meshes are tiled. A 'solo' mesh is simply a navigation mesh initialized 
+  to have only a single tile.
+- This class does not implement any asynchronous methods. So the ::dtStatus result of all methods will 
+  always contain either a success or failure flag.
+
+@see dtNavMeshQuery, dtCreateNavMeshData, dtNavMeshCreateParams, #dtAllocNavMesh, #dtFreeNavMesh
+*/
+
 dtNavMesh::dtNavMesh() :
 	m_tileWidth(0),
 	m_tileHeight(0),
@@ -154,6 +198,7 @@ dtNavMesh::dtNavMesh() :
 	m_tileBits(0),
 	m_polyBits(0)
 {
+	memset(&m_params, 0, sizeof(dtNavMeshParams));
 	m_orig[0] = 0;
 	m_orig[1] = 0;
 	m_orig[2] = 0;
@@ -189,10 +234,10 @@ dtStatus dtNavMesh::init(const dtNavMeshParams* params)
 	
 	m_tiles = (dtMeshTile*)dtAlloc(sizeof(dtMeshTile)*m_maxTiles, DT_ALLOC_PERM);
 	if (!m_tiles)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_OUT_OF_MEMORY;
 	m_posLookup = (dtMeshTile**)dtAlloc(sizeof(dtMeshTile*)*m_tileLutSize, DT_ALLOC_PERM);
 	if (!m_posLookup)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_OUT_OF_MEMORY;
 	memset(m_tiles, 0, sizeof(dtMeshTile)*m_maxTiles);
 	memset(m_posLookup, 0, sizeof(dtMeshTile*)*m_tileLutSize);
 	m_nextFree = 0;
@@ -203,12 +248,18 @@ dtStatus dtNavMesh::init(const dtNavMeshParams* params)
 		m_nextFree = &m_tiles[i];
 	}
 	
-	// Init ID generator values.
-	m_tileBits = STATIC_TILE_BITS;    //dtIlog2(dtNextPow2((unsigned int)params->maxTiles));
-	m_polyBits = STATIC_POLY_BITS;    //dtIlog2(dtNextPow2((unsigned int)params->maxPolys));
-	m_saltBits = STATIC_SALT_BITS;    //sizeof(dtPolyRef)*8 - m_tileBits - m_polyBits;
-	//if (m_saltBits < SALT_MIN_BITS)
-		//return DT_FAILURE;
+	/*// Init ID generator values.
+	m_tileBits = dtIlog2(dtNextPow2((unsigned int)params->maxTiles));
+	m_polyBits = dtIlog2(dtNextPow2((unsigned int)params->maxPolys));
+	// Only allow 31 salt bits, since the salt mask is calculated using 32bit uint and it will overflow.
+	m_saltBits = dtMin((unsigned int)31, 32 - m_tileBits - m_polyBits);
+	if (m_saltBits < 10)
+		return DT_FAILURE | DT_INVALID_PARAM;*/
+
+    // modified for CMaNGOS
+    m_tileBits = STATIC_TILE_BITS;
+    m_polyBits = STATIC_POLY_BITS;
+    m_saltBits = STATIC_SALT_BITS;
 	
 	return DT_SUCCESS;
 }
@@ -218,9 +269,9 @@ dtStatus dtNavMesh::init(unsigned char* data, const int dataSize, const int flag
 	// Make sure the data is in right format.
 	dtMeshHeader* header = (dtMeshHeader*)data;
 	if (header->magic != DT_NAVMESH_MAGIC)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_WRONG_MAGIC;
 	if (header->version != DT_NAVMESH_VERSION)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_WRONG_VERSION;
 
 	dtNavMeshParams params;
 	dtVcopy(params.orig, header->bmin);
@@ -229,13 +280,17 @@ dtStatus dtNavMesh::init(unsigned char* data, const int dataSize, const int flag
 	params.maxTiles = 1;
 	params.maxPolys = header->polyCount;
 	
-	dtStatus res = init(&params);
-	if (res != DT_SUCCESS)
-		return res;
+	dtStatus status = init(&params);
+	if (dtStatusFailed(status))
+		return status;
 
 	return addTile(data, dataSize, flags, 0, 0);
 }
 
+/// @par
+///
+/// @note The parameters are created automatically when the single tile
+/// initialization is performed.
 const dtNavMeshParams* dtNavMesh::getParams() const
 {
 	return &m_params;
@@ -250,6 +305,7 @@ int dtNavMesh::findConnectingPolys(const float* va, const float* vb,
 	
 	float amin[2], amax[2];
 	calcSlabEndPoints(va,vb, amin,amax, side);
+	const float apos = getSlabCoord(va, side);
 
 	// Remove links pointing to 'side' and compact the links array. 
 	float bmin[2], bmax[2];
@@ -266,11 +322,18 @@ int dtNavMesh::findConnectingPolys(const float* va, const float* vb,
 		{
 			// Skip edges which do not point to the right side.
 			if (poly->neis[j] != m) continue;
-			// Check if the segments touch.
+			
 			const float* vc = &tile->verts[poly->verts[j]*3];
 			const float* vd = &tile->verts[poly->verts[(j+1) % nv]*3];
+			const float bpos = getSlabCoord(vc, side);
+			
+			// Segments are not close enough.
+			if (dtAbs(apos-bpos) > 0.01f)
+				continue;
+			
+			// Check if the segments touch.
 			calcSlabEndPoints(vc,vd, bmin,bmax, side);
-
+			
 			if (!overlapSlabs(amin,amax, bmin,bmax, 0.01f, tile->header->walkableClimb)) continue;
 			
 			// Add return value.
@@ -287,9 +350,11 @@ int dtNavMesh::findConnectingPolys(const float* va, const float* vb,
 	return n;
 }
 
-void dtNavMesh::unconnectExtLinks(dtMeshTile* tile, int side)
+void dtNavMesh::unconnectExtLinks(dtMeshTile* tile, dtMeshTile* target)
 {
-	if (!tile) return;
+	if (!tile || !target) return;
+
+	const unsigned int targetNum = decodePolyIdTile(getTileRef(target));
 
 	for (int i = 0; i < tile->header->polyCount; ++i)
 	{
@@ -298,7 +363,8 @@ void dtNavMesh::unconnectExtLinks(dtMeshTile* tile, int side)
 		unsigned int pj = DT_NULL_LINK;
 		while (j != DT_NULL_LINK)
 		{
-			if (tile->links[j].side == side)
+			if (tile->links[j].side != 0xff &&
+				decodePolyIdTile(tile->links[j].ref) == targetNum)
 			{
 				// Revove link.
 				unsigned int nj = tile->links[j].next;
@@ -329,19 +395,25 @@ void dtNavMesh::connectExtLinks(dtMeshTile* tile, dtMeshTile* target, int side)
 		dtPoly* poly = &tile->polys[i];
 
 		// Create new links.
-		unsigned short m = DT_EXT_LINK | (unsigned short)side;
+//		unsigned short m = DT_EXT_LINK | (unsigned short)side;
+		
 		const int nv = poly->vertCount;
 		for (int j = 0; j < nv; ++j)
 		{
-			// Skip edges which do not point to the right side.
-			if (poly->neis[j] != m) continue;
+			// Skip non-portal edges.
+			if ((poly->neis[j] & DT_EXT_LINK) == 0)
+				continue;
+			
+			const int dir = (int)(poly->neis[j] & 0xff);
+			if (side != -1 && dir != side)
+				continue;
 			
 			// Create new links
 			const float* va = &tile->verts[poly->verts[j]*3];
 			const float* vb = &tile->verts[poly->verts[(j+1) % nv]*3];
 			dtPolyRef nei[4];
 			float neia[4*2];
-			int nnei = findConnectingPolys(va,vb, target, dtOppositeTile(side), nei,neia,4);
+			int nnei = findConnectingPolys(va,vb, target, dtOppositeTile(dir), nei,neia,4);
 			for (int k = 0; k < nnei; ++k)
 			{
 				unsigned int idx = allocLink(tile);
@@ -350,13 +422,13 @@ void dtNavMesh::connectExtLinks(dtMeshTile* tile, dtMeshTile* target, int side)
 					dtLink* link = &tile->links[idx];
 					link->ref = nei[k];
 					link->edge = (unsigned char)j;
-					link->side = (unsigned char)side;
+					link->side = (unsigned char)dir;
 					
 					link->next = poly->firstLink;
 					poly->firstLink = idx;
 
 					// Compress portal limits to a byte value.
-					if (side == 0 || side == 4)
+					if (dir == 0 || dir == 4)
 					{
 						float tmin = (neia[k*2+0]-va[2]) / (vb[2]-va[2]);
 						float tmax = (neia[k*2+1]-va[2]) / (vb[2]-va[2]);
@@ -365,7 +437,7 @@ void dtNavMesh::connectExtLinks(dtMeshTile* tile, dtMeshTile* target, int side)
 						link->bmin = (unsigned char)(dtClamp(tmin, 0.0f, 1.0f)*255.0f);
 						link->bmax = (unsigned char)(dtClamp(tmax, 0.0f, 1.0f)*255.0f);
 					}
-					else if (side == 2 || side == 6)
+					else if (dir == 2 || dir == 6)
 					{
 						float tmin = (neia[k*2+0]-va[0]) / (vb[0]-va[0]);
 						float tmax = (neia[k*2+1]-va[0]) / (vb[0]-va[0]);
@@ -386,15 +458,18 @@ void dtNavMesh::connectExtOffMeshLinks(dtMeshTile* tile, dtMeshTile* target, int
 	
 	// Connect off-mesh links.
 	// We are interested on links which land from target tile to this tile.
-	const unsigned char oppositeSide = (unsigned char)dtOppositeTile(side);
+	const unsigned char oppositeSide = (side == -1) ? 0xff : (unsigned char)dtOppositeTile(side);
 	
 	for (int i = 0; i < target->header->offMeshConCount; ++i)
 	{
 		dtOffMeshConnection* targetCon = &target->offMeshCons[i];
 		if (targetCon->side != oppositeSide)
 			continue;
-		
+
 		dtPoly* targetPoly = &target->polys[targetCon->poly];
+		// Skip off-mesh connections which start location could not be connected at all.
+		if (targetPoly->firstLink == DT_NULL_LINK)
+			continue;
 		
 		const float ext[3] = { targetCon->rad, target->header->walkableClimb, targetCon->rad };
 		
@@ -402,7 +477,8 @@ void dtNavMesh::connectExtOffMeshLinks(dtMeshTile* tile, dtMeshTile* target, int
 		const float* p = &targetCon->pos[3];
 		float nearestPt[3];
 		dtPolyRef ref = findNearestPolyInTile(tile, p, ext, nearestPt);
-		if (!ref) continue;
+		if (!ref)
+			continue;
 		// findNearestPoly may return too optimistic results, further check to make sure. 
 		if (dtSqr(nearestPt[0]-p[0])+dtSqr(nearestPt[2]-p[2]) > dtSqr(targetCon->rad))
 			continue;
@@ -427,19 +503,19 @@ void dtNavMesh::connectExtOffMeshLinks(dtMeshTile* tile, dtMeshTile* target, int
 		// Link target poly to off-mesh connection.
 		if (targetCon->flags & DT_OFFMESH_CON_BIDIR)
 		{
-			unsigned int idx = allocLink(tile);
-			if (idx != DT_NULL_LINK)
+			unsigned int tidx = allocLink(tile);
+			if (tidx != DT_NULL_LINK)
 			{
 				const unsigned short landPolyIdx = (unsigned short)decodePolyIdPoly(ref);
 				dtPoly* landPoly = &tile->polys[landPolyIdx];
-				dtLink* link = &tile->links[idx];
+				dtLink* link = &tile->links[tidx];
 				link->ref = getPolyRefBase(target) | (dtPolyRef)(targetCon->poly);
 				link->edge = 0xff;
-				link->side = (unsigned char)side;
+				link->side = (unsigned char)(side == -1 ? 0xff : side);
 				link->bmin = link->bmax = 0;
 				// Add to linked list.
 				link->next = landPoly->firstLink;
-				landPoly->firstLink = idx;
+				landPoly->firstLink = tidx;
 			}
 		}
 	}
@@ -483,13 +559,13 @@ void dtNavMesh::connectIntLinks(dtMeshTile* tile)
 	}
 }
 
-void dtNavMesh::connectIntOffMeshLinks(dtMeshTile* tile)
+void dtNavMesh::baseOffMeshLinks(dtMeshTile* tile)
 {
 	if (!tile) return;
 	
 	dtPolyRef base = getPolyRefBase(tile);
 	
-	// Find Off-mesh connection end points.
+	// Base off-mesh connection start points.
 	for (int i = 0; i < tile->header->offMeshConCount; ++i)
 	{
 		dtOffMeshConnection* con = &tile->offMeshCons[i];
@@ -497,72 +573,96 @@ void dtNavMesh::connectIntOffMeshLinks(dtMeshTile* tile)
 	
 		const float ext[3] = { con->rad, tile->header->walkableClimb, con->rad };
 		
-		for (int j = 0; j < 2; ++j)
-		{
-			unsigned char side = j == 0 ? 0xff : con->side;
+		// Find polygon to connect to.
+		const float* p = &con->pos[0]; // First vertex
+		float nearestPt[3];
+		dtPolyRef ref = findNearestPolyInTile(tile, p, ext, nearestPt);
+		if (!ref) continue;
+		// findNearestPoly may return too optimistic results, further check to make sure. 
+		if (dtSqr(nearestPt[0]-p[0])+dtSqr(nearestPt[2]-p[2]) > dtSqr(con->rad))
+			continue;
+		// Make sure the location is on current mesh.
+		float* v = &tile->verts[poly->verts[0]*3];
+		dtVcopy(v, nearestPt);
 
-			if (side == 0xff)
-			{
-				// Find polygon to connect to.
-				const float* p = &con->pos[j*3];
-				float nearestPt[3];
-				dtPolyRef ref = findNearestPolyInTile(tile, p, ext, nearestPt);
-				if (!ref) continue;
-				// findNearestPoly may return too optimistic results, further check to make sure. 
-				if (dtSqr(nearestPt[0]-p[0])+dtSqr(nearestPt[2]-p[2]) > dtSqr(con->rad))
-					continue;
-				// Make sure the location is on current mesh.
-				float* v = &tile->verts[poly->verts[j]*3];
-				dtVcopy(v, nearestPt);
-
-				// Link off-mesh connection to target poly.
-				unsigned int idx = allocLink(tile);
-				if (idx != DT_NULL_LINK)
-				{
-					dtLink* link = &tile->links[idx];
-					link->ref = ref;
-					link->edge = (unsigned char)j;
-					link->side = 0xff;
-					link->bmin = link->bmax = 0;
-					// Add to linked list.
-					link->next = poly->firstLink;
-					poly->firstLink = idx;
-				}
+		// Link off-mesh connection to target poly.
+		unsigned int idx = allocLink(tile);
+		if (idx != DT_NULL_LINK)
+		{
+			dtLink* link = &tile->links[idx];
+			link->ref = ref;
+			link->edge = (unsigned char)0;
+			link->side = 0xff;
+			link->bmin = link->bmax = 0;
+			// Add to linked list.
+			link->next = poly->firstLink;
+			poly->firstLink = idx;
+		}
 
-				// Start end-point is always connect back to off-mesh connection,
-				// Destination end-point only if it is bidirectional link. 
-				if (j == 0 || (j == 1 && (con->flags & DT_OFFMESH_CON_BIDIR)))
-				{
-					// Link target poly to off-mesh connection.
-					unsigned int idx = allocLink(tile);
-					if (idx != DT_NULL_LINK)
-					{
-						const unsigned short landPolyIdx = (unsigned short)decodePolyIdPoly(ref);
-						dtPoly* landPoly = &tile->polys[landPolyIdx];
-						dtLink* link = &tile->links[idx];
-						link->ref = base | (dtPolyRef)(con->poly);
-						link->edge = 0xff;
-						link->side = 0xff;
-						link->bmin = link->bmax = 0;
-						// Add to linked list.
-						link->next = landPoly->firstLink;
-						landPoly->firstLink = idx;
-					}
-				}
-				
-			}
+		// Start end-point is always connect back to off-mesh connection. 
+		unsigned int tidx = allocLink(tile);
+		if (tidx != DT_NULL_LINK)
+		{
+			const unsigned short landPolyIdx = (unsigned short)decodePolyIdPoly(ref);
+			dtPoly* landPoly = &tile->polys[landPolyIdx];
+			dtLink* link = &tile->links[tidx];
+			link->ref = base | (dtPolyRef)(con->poly);
+			link->edge = 0xff;
+			link->side = 0xff;
+			link->bmin = link->bmax = 0;
+			// Add to linked list.
+			link->next = landPoly->firstLink;
+			landPoly->firstLink = tidx;
 		}
 	}
 }
 
-dtStatus dtNavMesh::closestPointOnPolyInTile(const dtMeshTile* tile, unsigned int ip,
-											 const float* pos, float* closest) const
+void dtNavMesh::closestPointOnPolyInTile(const dtMeshTile* tile, unsigned int ip,
+										 const float* pos, float* closest) const
 {
 	const dtPoly* poly = &tile->polys[ip];
+	// Off-mesh connections don't have detail polygons.
+	if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
+	{
+		const float* v0 = &tile->verts[poly->verts[0]*3];
+		const float* v1 = &tile->verts[poly->verts[1]*3];
+		const float d0 = dtVdist(pos, v0);
+		const float d1 = dtVdist(pos, v1);
+		const float u = d0 / (d0+d1);
+		dtVlerp(closest, v0, v1, u);
+		return;
+	}
 	
-	float closestDistSqr = FLT_MAX;
 	const dtPolyDetail* pd = &tile->detailMeshes[ip];
+
+	// Clamp point to be inside the polygon.
+	float verts[DT_VERTS_PER_POLYGON*3];	
+	float edged[DT_VERTS_PER_POLYGON];
+	float edget[DT_VERTS_PER_POLYGON];
+	const int nv = poly->vertCount;
+	for (int i = 0; i < nv; ++i)
+		dtVcopy(&verts[i*3], &tile->verts[poly->verts[i]*3]);
+	
+	dtVcopy(closest, pos);
+	if (!dtDistancePtPolyEdgesSqr(pos, verts, nv, edged, edget))
+	{
+		// Point is outside the polygon, dtClamp to nearest edge.
+		float dmin = FLT_MAX;
+		int imin = -1;
+		for (int i = 0; i < nv; ++i)
+		{
+			if (edged[i] < dmin)
+			{
+				dmin = edged[i];
+				imin = i;
+			}
+		}
+		const float* va = &verts[imin*3];
+		const float* vb = &verts[((imin+1)%nv)*3];
+		dtVlerp(closest, va, vb, edget[imin]);
+	}
 	
+	// Find height at the location.
 	for (int j = 0; j < pd->triCount; ++j)
 	{
 		const unsigned char* t = &tile->detailTris[(pd->triBase+j)*4];
@@ -574,17 +674,13 @@ dtStatus dtNavMesh::closestPointOnPolyInTile(const dtMeshTile* tile, unsigned in
 			else
 				v[k] = &tile->detailVerts[(pd->vertBase+(t[k]-poly->vertCount))*3];
 		}
-		float pt[3];
-		dtClosestPtPointTriangle(pt, pos, v[0], v[1], v[2]);
-		float d = dtVdistSqr(pos, pt);
-		if (d < closestDistSqr)
+		float h;
+		if (dtClosestHeightPointTriangle(pos, v[0], v[1], v[2], h))
 		{
-			dtVcopy(closest, pt);
-			closestDistSqr = d;
+			closest[1] = h;
+			break;
 		}
 	}
-	
-	return DT_SUCCESS;
 }
 
 dtPolyRef dtNavMesh::findNearestPolyInTile(const dtMeshTile* tile,
@@ -606,8 +702,7 @@ dtPolyRef dtNavMesh::findNearestPolyInTile(const dtMeshTile* tile,
 	{
 		dtPolyRef ref = polys[i];
 		float closestPtPoly[3];
-		if (closestPointOnPolyInTile(tile, decodePolyIdPoly(ref), center, closestPtPoly) != DT_SUCCESS)
-			continue;
+		closestPointOnPolyInTile(tile, decodePolyIdPoly(ref), center, closestPtPoly);
 		float d = dtVdistSqr(center, closestPtPoly);
 		if (d < nearestDistanceSqr)
 		{
@@ -681,8 +776,11 @@ int dtNavMesh::queryPolygonsInTile(const dtMeshTile* tile, const float* qmin, co
 		dtPolyRef base = getPolyRefBase(tile);
 		for (int i = 0; i < tile->header->polyCount; ++i)
 		{
-			// Calc polygon bounds.
 			dtPoly* p = &tile->polys[i];
+			// Do not return off-mesh connection polygons.
+			if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
+				continue;
+			// Calc polygon bounds.
 			const float* v = &tile->verts[p->verts[0]*3];
 			dtVcopy(bmin, v);
 			dtVcopy(bmax, v);
@@ -702,18 +800,29 @@ int dtNavMesh::queryPolygonsInTile(const dtMeshTile* tile, const float* qmin, co
 	}
 }
 
+/// @par
+///
+/// The add operation will fail if the data is in the wrong format, the allocated tile
+/// space is full, or there is a tile already at the specified reference.
+///
+/// The lastRef parameter is used to restore a tile with the same tile
+/// reference it had previously used.  In this case the #dtPolyRef's for the
+/// tile will be restored to the same values they were before the tile was 
+/// removed.
+///
+/// @see dtCreateNavMeshData, #removeTile
 dtStatus dtNavMesh::addTile(unsigned char* data, int dataSize, int flags,
 							dtTileRef lastRef, dtTileRef* result)
 {
 	// Make sure the data is in right format.
 	dtMeshHeader* header = (dtMeshHeader*)data;
 	if (header->magic != DT_NAVMESH_MAGIC)
-		return DT_FAILURE_DATA_MAGIC;
+		return DT_FAILURE | DT_WRONG_MAGIC;
 	if (header->version != DT_NAVMESH_VERSION)
-		return DT_FAILURE_DATA_VERSION;
+		return DT_FAILURE | DT_WRONG_VERSION;
 		
 	// Make sure the location is free.
-	if (getTileAt(header->x, header->y))
+	if (getTileAt(header->x, header->y, header->layer))
 		return DT_FAILURE;
 		
 	// Allocate a tile.
@@ -732,7 +841,7 @@ dtStatus dtNavMesh::addTile(unsigned char* data, int dataSize, int flags,
 		// Try to relocate the tile to specific index with same salt.
 		int tileIndex = (int)decodePolyIdTile((dtPolyRef)lastRef);
 		if (tileIndex >= m_maxTiles)
-			return DT_FAILURE_OUT_OF_MEMORY;
+			return DT_FAILURE | DT_OUT_OF_MEMORY;
 		// Try to find the specific tile id from the free list.
 		dtMeshTile* target = &m_tiles[tileIndex];
 		dtMeshTile* prev = 0;
@@ -744,7 +853,7 @@ dtStatus dtNavMesh::addTile(unsigned char* data, int dataSize, int flags,
 		}
 		// Could not find the correct location.
 		if (tile != target)
-			return DT_FAILURE_OUT_OF_MEMORY;
+			return DT_FAILURE | DT_OUT_OF_MEMORY;
 		// Remove from freelist
 		if (!prev)
 			m_nextFree = tile->next;
@@ -757,7 +866,7 @@ dtStatus dtNavMesh::addTile(unsigned char* data, int dataSize, int flags,
 
 	// Make sure we could allocate a tile.
 	if (!tile)
-		return DT_FAILURE_OUT_OF_MEMORY;
+		return DT_FAILURE | DT_OUT_OF_MEMORY;
 	
 	// Insert tile into the position lut.
 	int h = computeTileHash(header->x, header->y, m_tileLutMask);
@@ -785,6 +894,10 @@ dtStatus dtNavMesh::addTile(unsigned char* data, int dataSize, int flags,
 	tile->bvTree = (dtBVNode*)d; d += bvtreeSize;
 	tile->offMeshCons = (dtOffMeshConnection*)d; d += offMeshLinksSize;
 
+	// If there are no items in the bvtree, reset the tree pointer.
+	if (!bvtreeSize)
+		tile->bvTree = 0;
+
 	// Build links freelist
 	tile->linksFreeList = 0;
 	tile->links[header->maxLinkCount-1].next = DT_NULL_LINK;
@@ -798,18 +911,36 @@ dtStatus dtNavMesh::addTile(unsigned char* data, int dataSize, int flags,
 	tile->flags = flags;
 
 	connectIntLinks(tile);
-	connectIntOffMeshLinks(tile);
+	baseOffMeshLinks(tile);
 
-	// Create connections connections.
+	// Create connections with neighbour tiles.
+	static const int MAX_NEIS = 32;
+	dtMeshTile* neis[MAX_NEIS];
+	int nneis;
+	
+	// Connect with layers in current tile.
+	nneis = getTilesAt(header->x, header->y, neis, MAX_NEIS);
+	for (int j = 0; j < nneis; ++j)
+	{
+		if (neis[j] != tile)
+		{
+			connectExtLinks(tile, neis[j], -1);
+			connectExtLinks(neis[j], tile, -1);
+		}
+		connectExtOffMeshLinks(tile, neis[j], -1);
+		connectExtOffMeshLinks(neis[j], tile, -1);
+	}
+	
+	// Connect with neighbour tiles.
 	for (int i = 0; i < 8; ++i)
 	{
-		dtMeshTile* nei = getNeighbourTileAt(header->x, header->y, i);
-		if (nei)
+		nneis = getNeighbourTilesAt(header->x, header->y, i, neis, MAX_NEIS);
+		for (int j = 0; j < nneis; ++j)
 		{
-			connectExtLinks(tile, nei, i);
-			connectExtLinks(nei, tile, dtOppositeTile(i));
-			connectExtOffMeshLinks(tile, nei, i);
-			connectExtOffMeshLinks(nei, tile, dtOppositeTile(i));
+			connectExtLinks(tile, neis[j], i);
+			connectExtLinks(neis[j], tile, dtOppositeTile(i));
+			connectExtOffMeshLinks(tile, neis[j], i);
+			connectExtOffMeshLinks(neis[j], tile, dtOppositeTile(i));
 		}
 	}
 	
@@ -819,55 +950,106 @@ dtStatus dtNavMesh::addTile(unsigned char* data, int dataSize, int flags,
 	return DT_SUCCESS;
 }
 
-const dtMeshTile* dtNavMesh::getTileAt(int x, int y) const
+const dtMeshTile* dtNavMesh::getTileAt(const int x, const int y, const int layer) const
 {
 	// Find tile based on hash.
 	int h = computeTileHash(x,y,m_tileLutMask);
 	dtMeshTile* tile = m_posLookup[h];
 	while (tile)
 	{
-		if (tile->header && tile->header->x == x && tile->header->y == y)
+		if (tile->header &&
+			tile->header->x == x &&
+			tile->header->y == y &&
+			tile->header->layer == layer)
+		{
 			return tile;
+		}
 		tile = tile->next;
 	}
 	return 0;
 }
 
-dtMeshTile* dtNavMesh::getNeighbourTileAt(int x, int y, int side) const
+int dtNavMesh::getNeighbourTilesAt(const int x, const int y, const int side, dtMeshTile** tiles, const int maxTiles) const
 {
+	int nx = x, ny = y;
 	switch (side)
 	{
-		case 0: x++; break;
-		case 1: x++; y++; break;
-		case 2: y++; break;
-		case 3: x--; y++; break;
-		case 4: x--; break;
-		case 5: x--; y--; break;
-		case 6: y--; break;
-		case 7: x++; y--; break;
+		case 0: nx++; break;
+		case 1: nx++; ny++; break;
+		case 2: ny++; break;
+		case 3: nx--; ny++; break;
+		case 4: nx--; break;
+		case 5: nx--; ny--; break;
+		case 6: ny--; break;
+		case 7: nx++; ny--; break;
 	};
 
+	return getTilesAt(nx, ny, tiles, maxTiles);
+}
+
+int dtNavMesh::getTilesAt(const int x, const int y, dtMeshTile** tiles, const int maxTiles) const
+{
+	int n = 0;
+	
 	// Find tile based on hash.
 	int h = computeTileHash(x,y,m_tileLutMask);
 	dtMeshTile* tile = m_posLookup[h];
 	while (tile)
 	{
-		if (tile->header && tile->header->x == x && tile->header->y == y)
-			return tile;
+		if (tile->header &&
+			tile->header->x == x &&
+			tile->header->y == y)
+		{
+			if (n < maxTiles)
+				tiles[n++] = tile;
+		}
 		tile = tile->next;
 	}
-	return 0;
+	
+	return n;
 }
 
-dtTileRef dtNavMesh::getTileRefAt(int x, int y) const
+/// @par
+///
+/// This function will not fail if the tiles array is too small to hold the
+/// entire result set.  It will simply fill the array to capacity.
+int dtNavMesh::getTilesAt(const int x, const int y, dtMeshTile const** tiles, const int maxTiles) const
+{
+	int n = 0;
+	
+	// Find tile based on hash.
+	int h = computeTileHash(x,y,m_tileLutMask);
+	dtMeshTile* tile = m_posLookup[h];
+	while (tile)
+	{
+		if (tile->header &&
+			tile->header->x == x &&
+			tile->header->y == y)
+		{
+			if (n < maxTiles)
+				tiles[n++] = tile;
+		}
+		tile = tile->next;
+	}
+	
+	return n;
+}
+
+
+dtTileRef dtNavMesh::getTileRefAt(const int x, const int y, const int layer) const
 {
 	// Find tile based on hash.
 	int h = computeTileHash(x,y,m_tileLutMask);
 	dtMeshTile* tile = m_posLookup[h];
 	while (tile)
 	{
-		if (tile->header && tile->header->x == x && tile->header->y == y)
+		if (tile->header &&
+			tile->header->x == x &&
+			tile->header->y == y &&
+			tile->header->layer == layer)
+		{
 			return getTileRef(tile);
+		}
 		tile = tile->next;
 	}
 	return 0;
@@ -910,16 +1092,22 @@ void dtNavMesh::calcTileLoc(const float* pos, int* tx, int* ty) const
 
 dtStatus dtNavMesh::getTileAndPolyByRef(const dtPolyRef ref, const dtMeshTile** tile, const dtPoly** poly) const
 {
+	if (!ref) return DT_FAILURE;
 	unsigned int salt, it, ip;
 	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE;
-	if (ip >= (unsigned int)m_tiles[it].header->polyCount) return DT_FAILURE;
+	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
+	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
+	if (ip >= (unsigned int)m_tiles[it].header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
 	*tile = &m_tiles[it];
 	*poly = &m_tiles[it].polys[ip];
 	return DT_SUCCESS;
 }
 
+/// @par
+///
+/// @warning Only use this function if it is known that the provided polygon
+/// reference is valid. This function is faster than #getTileAndPolyByRef, but
+/// it does not validate the reference.
 void dtNavMesh::getTileAndPolyByRefUnsafe(const dtPolyRef ref, const dtMeshTile** tile, const dtPoly** poly) const
 {
 	unsigned int salt, it, ip;
@@ -930,6 +1118,7 @@ void dtNavMesh::getTileAndPolyByRefUnsafe(const dtPolyRef ref, const dtMeshTile*
 
 bool dtNavMesh::isValidPolyRef(dtPolyRef ref) const
 {
+	if (!ref) return false;
 	unsigned int salt, it, ip;
 	decodePolyId(ref, salt, it, ip);
 	if (it >= (unsigned int)m_maxTiles) return false;
@@ -938,17 +1127,23 @@ bool dtNavMesh::isValidPolyRef(dtPolyRef ref) const
 	return true;
 }
 
+/// @par
+///
+/// This function returns the data for the tile so that, if desired,
+/// it can be added back to the navigation mesh at a later point.
+///
+/// @see #addTile
 dtStatus dtNavMesh::removeTile(dtTileRef ref, unsigned char** data, int* dataSize)
 {
 	if (!ref)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	unsigned int tileIndex = decodePolyIdTile((dtPolyRef)ref);
 	unsigned int tileSalt = decodePolyIdSalt((dtPolyRef)ref);
 	if ((int)tileIndex >= m_maxTiles)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	dtMeshTile* tile = &m_tiles[tileIndex];
 	if (tile->salt != tileSalt)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	// Remove tile from hash lookup.
 	int h = computeTileHash(tile->header->x,tile->header->y,m_tileLutMask);
@@ -969,14 +1164,27 @@ dtStatus dtNavMesh::removeTile(dtTileRef ref, unsigned char** data, int* dataSiz
 	}
 	
 	// Remove connections to neighbour tiles.
-	for (int i = 0; i < 8; ++i)
+	// Create connections with neighbour tiles.
+	static const int MAX_NEIS = 32;
+	dtMeshTile* neis[MAX_NEIS];
+	int nneis;
+	
+	// Connect with layers in current tile.
+	nneis = getTilesAt(tile->header->x, tile->header->y, neis, MAX_NEIS);
+	for (int j = 0; j < nneis; ++j)
 	{
-		dtMeshTile* nei = getNeighbourTileAt(tile->header->x,tile->header->y,i);
-		if (!nei) continue;
-		unconnectExtLinks(nei, dtOppositeTile(i));
+		if (neis[j] == tile) continue;
+		unconnectExtLinks(neis[j], tile);
 	}
 	
-	
+	// Connect with neighbour tiles.
+	for (int i = 0; i < 8; ++i)
+	{
+		nneis = getNeighbourTilesAt(tile->header->x, tile->header->y, i, neis, MAX_NEIS);
+		for (int j = 0; j < nneis; ++j)
+			unconnectExtLinks(neis[j], tile);
+	}
+		
 	// Reset tile.
 	if (tile->flags & DT_TILE_FREE_DATA)
 	{
@@ -1020,14 +1228,28 @@ dtStatus dtNavMesh::removeTile(dtTileRef ref, unsigned char** data, int* dataSiz
 dtTileRef dtNavMesh::getTileRef(const dtMeshTile* tile) const
 {
 	if (!tile) return 0;
-	const unsigned int it = tile - m_tiles;
+	const unsigned int it = (unsigned int)(tile - m_tiles);
 	return (dtTileRef)encodePolyId(tile->salt, it, 0);
 }
 
+/// @par
+///
+/// Example use case:
+/// @code
+///
+/// const dtPolyRef base = navmesh->getPolyRefBase(tile);
+/// for (int i = 0; i < tile->header->polyCount; ++i)
+/// {
+///     const dtPoly* p = &tile->polys[i];
+///     const dtPolyRef ref = base | (dtPolyRef)i;
+///     
+///     // Use the reference to access the polygon data.
+/// }
+/// @endcode
 dtPolyRef dtNavMesh::getPolyRefBase(const dtMeshTile* tile) const
 {
 	if (!tile) return 0;
-	const unsigned int it = tile - m_tiles;
+	const unsigned int it = (unsigned int)(tile - m_tiles);
 	return encodePolyId(tile->salt, it, 0);
 }
 
@@ -1044,6 +1266,7 @@ struct dtPolyState
 	unsigned char area;							// Area ID of the polygon.
 };
 
+///  @see #storeTileState
 int dtNavMesh::getTileStateSize(const dtMeshTile* tile) const
 {
 	if (!tile) return 0;
@@ -1052,12 +1275,17 @@ int dtNavMesh::getTileStateSize(const dtMeshTile* tile) const
 	return headerSize + polyStateSize;
 }
 
+/// @par
+///
+/// Tile state includes non-structural data such as polygon flags, area ids, etc.
+/// @note The state data is only valid until the tile reference changes.
+/// @see #getTileStateSize, #restoreTileState
 dtStatus dtNavMesh::storeTileState(const dtMeshTile* tile, unsigned char* data, const int maxDataSize) const
 {
 	// Make sure there is enough space to store the state.
 	const int sizeReq = getTileStateSize(tile);
 	if (maxDataSize < sizeReq)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_BUFFER_TOO_SMALL;
 		
 	dtTileState* tileState = (dtTileState*)data; data += dtAlign4(sizeof(dtTileState));
 	dtPolyState* polyStates = (dtPolyState*)data; data += dtAlign4(sizeof(dtPolyState) * tile->header->polyCount);
@@ -1079,23 +1307,28 @@ dtStatus dtNavMesh::storeTileState(const dtMeshTile* tile, unsigned char* data,
 	return DT_SUCCESS;
 }
 
+/// @par
+///
+/// Tile state includes non-structural data such as polygon flags, area ids, etc.
+/// @note This function does not impact the tile's #dtTileRef and #dtPolyRef's.
+/// @see #storeTileState
 dtStatus dtNavMesh::restoreTileState(dtMeshTile* tile, const unsigned char* data, const int maxDataSize)
 {
 	// Make sure there is enough space to store the state.
 	const int sizeReq = getTileStateSize(tile);
 	if (maxDataSize < sizeReq)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	const dtTileState* tileState = (const dtTileState*)data; data += dtAlign4(sizeof(dtTileState));
 	const dtPolyState* polyStates = (const dtPolyState*)data; data += dtAlign4(sizeof(dtPolyState) * tile->header->polyCount);
 	
 	// Check that the restore is possible.
 	if (tileState->magic != DT_NAVMESH_STATE_MAGIC)
-		return DT_FAILURE_DATA_MAGIC;
+		return DT_FAILURE | DT_WRONG_MAGIC;
 	if (tileState->version != DT_NAVMESH_STATE_VERSION)
-		return DT_FAILURE_DATA_VERSION;
+		return DT_FAILURE | DT_WRONG_VERSION;
 	if (tileState->ref != getTileRef(tile))
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	// Restore per poly state.
 	for (int i = 0; i < tile->header->polyCount; ++i)
@@ -1109,17 +1342,26 @@ dtStatus dtNavMesh::restoreTileState(dtMeshTile* tile, const unsigned char* data
 	return DT_SUCCESS;
 }
 
-// Returns start and end location of an off-mesh link polygon.
+/// @par
+///
+/// Off-mesh connections are stored in the navigation mesh as special 2-vertex 
+/// polygons with a single edge. At least one of the vertices is expected to be 
+/// inside a normal polygon. So an off-mesh connection is "entered" from a 
+/// normal polygon at one of its endpoints. This is the polygon identified by 
+/// the prevRef parameter.
 dtStatus dtNavMesh::getOffMeshConnectionPolyEndPoints(dtPolyRef prevRef, dtPolyRef polyRef, float* startPos, float* endPos) const
 {
 	unsigned int salt, it, ip;
 
+	if (!polyRef)
+		return DT_FAILURE;
+	
 	// Get current polygon
 	decodePolyId(polyRef, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE;
+	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
+	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
 	const dtMeshTile* tile = &m_tiles[it];
-	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE;
+	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
 	const dtPoly* poly = &tile->polys[ip];
 
 	// Make sure that the current poly is indeed off-mesh link.
@@ -1154,6 +1396,9 @@ const dtOffMeshConnection* dtNavMesh::getOffMeshConnectionByRef(dtPolyRef ref) c
 {
 	unsigned int salt, it, ip;
 	
+	if (!ref)
+		return 0;
+	
 	// Get current polygon
 	decodePolyId(ref, salt, it, ip);
 	if (it >= (unsigned int)m_maxTiles) return 0;
@@ -1174,12 +1419,13 @@ const dtOffMeshConnection* dtNavMesh::getOffMeshConnectionByRef(dtPolyRef ref) c
 
 dtStatus dtNavMesh::setPolyFlags(dtPolyRef ref, unsigned short flags)
 {
+	if (!ref) return DT_FAILURE;
 	unsigned int salt, it, ip;
 	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE;
+	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
+	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
 	dtMeshTile* tile = &m_tiles[it];
-	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE;
+	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
 	dtPoly* poly = &tile->polys[ip];
 	
 	// Change flags.
@@ -1190,12 +1436,13 @@ dtStatus dtNavMesh::setPolyFlags(dtPolyRef ref, unsigned short flags)
 
 dtStatus dtNavMesh::getPolyFlags(dtPolyRef ref, unsigned short* resultFlags) const
 {
+	if (!ref) return DT_FAILURE;
 	unsigned int salt, it, ip;
 	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE;
+	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
+	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
 	const dtMeshTile* tile = &m_tiles[it];
-	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE;
+	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
 	const dtPoly* poly = &tile->polys[ip];
 
 	*resultFlags = poly->flags;
@@ -1205,12 +1452,13 @@ dtStatus dtNavMesh::getPolyFlags(dtPolyRef ref, unsigned short* resultFlags) con
 
 dtStatus dtNavMesh::setPolyArea(dtPolyRef ref, unsigned char area)
 {
+	if (!ref) return DT_FAILURE;
 	unsigned int salt, it, ip;
 	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE;
+	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
+	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
 	dtMeshTile* tile = &m_tiles[it];
-	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE;
+	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
 	dtPoly* poly = &tile->polys[ip];
 	
 	poly->setArea(area);
@@ -1220,12 +1468,13 @@ dtStatus dtNavMesh::setPolyArea(dtPolyRef ref, unsigned char area)
 
 dtStatus dtNavMesh::getPolyArea(dtPolyRef ref, unsigned char* resultArea) const
 {
+	if (!ref) return DT_FAILURE;
 	unsigned int salt, it, ip;
 	decodePolyId(ref, salt, it, ip);
-	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE;
-	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE;
+	if (it >= (unsigned int)m_maxTiles) return DT_FAILURE | DT_INVALID_PARAM;
+	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return DT_FAILURE | DT_INVALID_PARAM;
 	const dtMeshTile* tile = &m_tiles[it];
-	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE;
+	if (ip >= (unsigned int)tile->header->polyCount) return DT_FAILURE | DT_INVALID_PARAM;
 	const dtPoly* poly = &tile->polys[ip];
 	
 	*resultArea = poly->getArea();
diff --git a/dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp b/dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp
index f64857160db..9d8471b96a1 100644
--- a/dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp
+++ b/dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <float.h>
 #include "DetourNavMesh.h"
 #include "DetourCommon.h"
 #include "DetourNavMeshBuilder.h"
@@ -237,11 +238,19 @@ static unsigned char classifyOffMeshPoint(const float* pt, const float* bmin, co
 	case ZM: return 6;
 	case XP|ZM: return 7;
 	};
+
 	return 0xff;	
 }
 
 // TODO: Better error handling.
 
+/// @par
+/// 
+/// The output data array is allocated using the detour allocator (dtAlloc()).  The method
+/// used to free the memory will be determined by how the tile is added to the navigation
+/// mesh.
+///
+/// @see dtNavMesh, dtNavMesh::addTile()
 bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData, int* outDataSize)
 {
 	if (params->nvp > DT_VERTS_PER_POLYGON)
@@ -252,8 +261,6 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
 		return false;
 	if (!params->polyCount || !params->polys)
 		return false;
-	if (!params->detailMeshes || !params->detailVerts || !params->detailTris)
-		return false;
 
 	const int nvp = params->nvp;
 	
@@ -269,10 +276,50 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
 		if (!offMeshConClass)
 			return false;
 
+		// Find tight heigh bounds, used for culling out off-mesh start locations.
+		float hmin = FLT_MAX;
+		float hmax = -FLT_MAX;
+		
+		if (params->detailVerts && params->detailVertsCount)
+		{
+			for (int i = 0; i < params->detailVertsCount; ++i)
+			{
+				const float h = params->detailVerts[i*3+1];
+				hmin = dtMin(hmin,h);
+				hmax = dtMax(hmax,h);
+			}
+		}
+		else
+		{
+			for (int i = 0; i < params->vertCount; ++i)
+			{
+				const unsigned short* iv = &params->verts[i*3];
+				const float h = params->bmin[1] + iv[1] * params->ch;
+				hmin = dtMin(hmin,h);
+				hmax = dtMax(hmax,h);
+			}
+		}
+		hmin -= params->walkableClimb;
+		hmax += params->walkableClimb;
+		float bmin[3], bmax[3];
+		dtVcopy(bmin, params->bmin);
+		dtVcopy(bmax, params->bmax);
+		bmin[1] = hmin;
+		bmax[1] = hmax;
+
 		for (int i = 0; i < params->offMeshConCount; ++i)
 		{
-			offMeshConClass[i*2+0] = classifyOffMeshPoint(&params->offMeshConVerts[(i*2+0)*3], params->bmin, params->bmax);
-			offMeshConClass[i*2+1] = classifyOffMeshPoint(&params->offMeshConVerts[(i*2+1)*3], params->bmin, params->bmax);
+			const float* p0 = &params->offMeshConVerts[(i*2+0)*3];
+			const float* p1 = &params->offMeshConVerts[(i*2+1)*3];
+			offMeshConClass[i*2+0] = classifyOffMeshPoint(p0, bmin, bmax);
+			offMeshConClass[i*2+1] = classifyOffMeshPoint(p1, bmin, bmax);
+
+			// Zero out off-mesh start positions which are not even potentially touching the mesh.
+			if (offMeshConClass[i*2+0] == 0xff)
+			{
+				if (p0[1] < bmin[1] || p0[1] > bmax[1])
+					offMeshConClass[i*2+0] = 0;
+			}
 
 			// Cound how many links should be allocated for off-mesh connections.
 			if (offMeshConClass[i*2+0] == 0xff)
@@ -298,23 +345,13 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
 		for (int j = 0; j < nvp; ++j)
 		{
 			if (p[j] == MESH_NULL_IDX) break;
-			int nj = j+1;
-			if (nj >= nvp || p[nj] == MESH_NULL_IDX) nj = 0;
-			const unsigned short* va = &params->verts[p[j]*3];
-			const unsigned short* vb = &params->verts[p[nj]*3];
-			
 			edgeCount++;
 			
-			if (params->tileSize > 0)
+			if (p[nvp+j] & 0x8000)
 			{
-				if (va[0] == params->tileSize && vb[0] == params->tileSize)
-					portalCount++; // x+
-				else if (va[2] == params->tileSize && vb[2] == params->tileSize)
-					portalCount++; // z+
-				else if (va[0] == 0 && vb[0] == 0)
-					portalCount++; // x-
-				else if (va[2] == 0 && vb[2] == 0)
-					portalCount++; // z-
+				unsigned short dir = p[nvp+j] & 0xf;
+				if (dir != 0xf)
+					portalCount++;
 			}
 		}
 	}
@@ -323,18 +360,41 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
 	
 	// Find unique detail vertices.
 	int uniqueDetailVertCount = 0;
-	for (int i = 0; i < params->polyCount; ++i)
+	int detailTriCount = 0;
+	if (params->detailMeshes)
 	{
-		const unsigned short* p = &params->polys[i*nvp*2];
-		int ndv = params->detailMeshes[i*4+1];
-		int nv = 0;
-		for (int j = 0; j < nvp; ++j)
+		// Has detail mesh, count unique detail vertex count and use input detail tri count.
+		detailTriCount = params->detailTriCount;
+		for (int i = 0; i < params->polyCount; ++i)
 		{
-			if (p[j] == MESH_NULL_IDX) break;
-			nv++;
+			const unsigned short* p = &params->polys[i*nvp*2];
+			int ndv = params->detailMeshes[i*4+1];
+			int nv = 0;
+			for (int j = 0; j < nvp; ++j)
+			{
+				if (p[j] == MESH_NULL_IDX) break;
+				nv++;
+			}
+			ndv -= nv;
+			uniqueDetailVertCount += ndv;
+		}
+	}
+	else
+	{
+		// No input detail mesh, build detail mesh from nav polys.
+		uniqueDetailVertCount = 0; // No extra detail verts.
+		detailTriCount = 0;
+		for (int i = 0; i < params->polyCount; ++i)
+		{
+			const unsigned short* p = &params->polys[i*nvp*2];
+			int nv = 0;
+			for (int j = 0; j < nvp; ++j)
+			{
+				if (p[j] == MESH_NULL_IDX) break;
+				nv++;
+			}
+			detailTriCount += nv-2;
 		}
-		ndv -= nv;
-		uniqueDetailVertCount += ndv;
 	}
 	
 	// Calculate data size
@@ -344,8 +404,8 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
 	const int linksSize = dtAlign4(sizeof(dtLink)*maxLinkCount);
 	const int detailMeshesSize = dtAlign4(sizeof(dtPolyDetail)*params->polyCount);
 	const int detailVertsSize = dtAlign4(sizeof(float)*3*uniqueDetailVertCount);
-	const int detailTrisSize = dtAlign4(sizeof(unsigned char)*4*params->detailTriCount);
-	const int bvTreeSize = dtAlign4(sizeof(dtBVNode)*params->polyCount*2);
+	const int detailTrisSize = dtAlign4(sizeof(unsigned char)*4*detailTriCount);
+	const int bvTreeSize = params->buildBvTree ? dtAlign4(sizeof(dtBVNode)*params->polyCount*2) : 0;
 	const int offMeshConsSize = dtAlign4(sizeof(dtOffMeshConnection)*storedOffMeshConCount);
 	
 	const int dataSize = headerSize + vertsSize + polysSize + linksSize +
@@ -377,6 +437,7 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
 	header->version = DT_NAVMESH_VERSION;
 	header->x = params->tileX;
 	header->y = params->tileY;
+	header->layer = params->tileLayer;
 	header->userId = params->userId;
 	header->polyCount = totPolyCount;
 	header->vertCount = totVertCount;
@@ -385,14 +446,14 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
 	dtVcopy(header->bmax, params->bmax);
 	header->detailMeshCount = params->polyCount;
 	header->detailVertCount = uniqueDetailVertCount;
-	header->detailTriCount = params->detailTriCount;
+	header->detailTriCount = detailTriCount;
 	header->bvQuantFactor = 1.0f / params->cs;
 	header->offMeshBase = params->polyCount;
 	header->walkableHeight = params->walkableHeight;
 	header->walkableRadius = params->walkableRadius;
 	header->walkableClimb = params->walkableClimb;
 	header->offMeshConCount = storedOffMeshConCount;
-	header->bvNodeCount = params->polyCount*2;
+	header->bvNodeCount = params->buildBvTree ? params->polyCount*2 : 0;
 	
 	const int offMeshVertsBase = params->vertCount;
 	const int offMeshPolyBase = params->polyCount;
@@ -436,7 +497,27 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
 		{
 			if (src[j] == MESH_NULL_IDX) break;
 			p->verts[j] = src[j];
-			p->neis[j] = (src[nvp+j]+1) & 0xffff;
+			if (src[nvp+j] & 0x8000)
+			{
+				// Border or portal edge.
+				unsigned short dir = src[nvp+j] & 0xf;
+				if (dir == 0xf) // Border
+					p->neis[j] = 0;
+				else if (dir == 0) // Portal x-
+					p->neis[j] = DT_EXT_LINK | 4;
+				else if (dir == 1) // Portal z+
+					p->neis[j] = DT_EXT_LINK | 2;
+				else if (dir == 2) // Portal x+
+					p->neis[j] = DT_EXT_LINK | 0;
+				else if (dir == 3) // Portal z-
+					p->neis[j] = DT_EXT_LINK | 6;
+			}
+			else
+			{
+				// Normal connection
+				p->neis[j] = src[nvp+j]+1;
+			}
+			
 			p->vertCount++;
 		}
 		src += nvp*2;
@@ -458,61 +539,68 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
 			n++;
 		}
 	}
-	
-	// Store portal edges.
-	if (params->tileSize > 0)
+
+	// Store detail meshes and vertices.
+	// The nav polygon vertices are stored as the first vertices on each mesh.
+	// We compress the mesh data by skipping them and using the navmesh coordinates.
+	if (params->detailMeshes)
 	{
+		unsigned short vbase = 0;
 		for (int i = 0; i < params->polyCount; ++i)
 		{
-			dtPoly* poly = &navPolys[i];
-			for (int j = 0; j < poly->vertCount; ++j)
+			dtPolyDetail& dtl = navDMeshes[i];
+			const int vb = (int)params->detailMeshes[i*4+0];
+			const int ndv = (int)params->detailMeshes[i*4+1];
+			const int nv = navPolys[i].vertCount;
+			dtl.vertBase = (unsigned int)vbase;
+			dtl.vertCount = (unsigned char)(ndv-nv);
+			dtl.triBase = (unsigned int)params->detailMeshes[i*4+2];
+			dtl.triCount = (unsigned char)params->detailMeshes[i*4+3];
+			// Copy vertices except the first 'nv' verts which are equal to nav poly verts.
+			if (ndv-nv)
 			{
-				int nj = j+1;
-				if (nj >= poly->vertCount) nj = 0;
-
-				const unsigned short* va = &params->verts[poly->verts[j]*3];
-				const unsigned short* vb = &params->verts[poly->verts[nj]*3];
-							
-				if (va[0] == params->tileSize && vb[0] == params->tileSize) // x+
-					poly->neis[j] = DT_EXT_LINK | 0;
-				else if (va[2] == params->tileSize && vb[2]  == params->tileSize) // z+
-					poly->neis[j] = DT_EXT_LINK | 2;
-				else if (va[0] == 0 && vb[0] == 0) // x-
-					poly->neis[j] = DT_EXT_LINK | 4;
-				else if (va[2] == 0 && vb[2] == 0) // z-
-					poly->neis[j] = DT_EXT_LINK | 6;
+				memcpy(&navDVerts[vbase*3], &params->detailVerts[(vb+nv)*3], sizeof(float)*3*(ndv-nv));
+				vbase += (unsigned short)(ndv-nv);
 			}
 		}
+		// Store triangles.
+		memcpy(navDTris, params->detailTris, sizeof(unsigned char)*4*params->detailTriCount);
 	}
-
-	// Store detail meshes and vertices.
-	// The nav polygon vertices are stored as the first vertices on each mesh.
-	// We compress the mesh data by skipping them and using the navmesh coordinates.
-	unsigned short vbase = 0;
-	for (int i = 0; i < params->polyCount; ++i)
+	else
 	{
-		dtPolyDetail& dtl = navDMeshes[i];
-		const int vb = (int)params->detailMeshes[i*4+0];
-		const int ndv = (int)params->detailMeshes[i*4+1];
-		const int nv = navPolys[i].vertCount;
-		dtl.vertBase = (unsigned int)vbase;
-		dtl.vertCount = (unsigned char)(ndv-nv);
-		dtl.triBase = (unsigned int)params->detailMeshes[i*4+2];
-		dtl.triCount = (unsigned char)params->detailMeshes[i*4+3];
-		// Copy vertices except the first 'nv' verts which are equal to nav poly verts.
-		if (ndv-nv)
+		// Create dummy detail mesh by triangulating polys.
+		int tbase = 0;
+		for (int i = 0; i < params->polyCount; ++i)
 		{
-			memcpy(&navDVerts[vbase*3], &params->detailVerts[(vb+nv)*3], sizeof(float)*3*(ndv-nv));
-			vbase += (unsigned short)(ndv-nv);
+			dtPolyDetail& dtl = navDMeshes[i];
+			const int nv = navPolys[i].vertCount;
+			dtl.vertBase = 0;
+			dtl.vertCount = 0;
+			dtl.triBase = (unsigned int)tbase;
+			dtl.triCount = (unsigned char)(nv-2);
+			// Triangulate polygon (local indices).
+			for (int j = 2; j < nv; ++j)
+			{
+				unsigned char* t = &navDTris[tbase*4];
+				t[0] = 0;
+				t[1] = (unsigned char)(j-1);
+				t[2] = (unsigned char)j;
+				// Bit for each edge that belongs to poly boundary.
+				t[3] = (1<<2);
+				if (j == 2) t[3] |= (1<<0);
+				if (j == nv-1) t[3] |= (1<<4);
+				tbase++;
+			}
 		}
 	}
-	// Store triangles.
-	memcpy(navDTris, params->detailTris, sizeof(unsigned char)*4*params->detailTriCount);
 
 	// Store and create BVtree.
 	// TODO: take detail mesh into account! use byte per bbox extent?
-	createBVTree(params->verts, params->vertCount, params->polys, params->polyCount,
-				 nvp, params->cs, params->ch, params->polyCount*2, navBvtree);
+	if (params->buildBvTree)
+	{
+		createBVTree(params->verts, params->vertCount, params->polys, params->polyCount,
+					 nvp, params->cs, params->ch, params->polyCount*2, navBvtree);
+	}
 	
 	// Store Off-Mesh connections.
 	n = 0;
@@ -544,51 +632,14 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
 	return true;
 }
 
-inline void swapByte(unsigned char* a, unsigned char* b)
-{
-	unsigned char tmp = *a;
-	*a = *b;
-	*b = tmp;
-}
-
-inline void swapEndian(unsigned short* v)
-{
-	unsigned char* x = (unsigned char*)v;
-	swapByte(x+0, x+1);
-}
-
-inline void swapEndian(short* v)
-{
-	unsigned char* x = (unsigned char*)v;
-	swapByte(x+0, x+1);
-}
-
-inline void swapEndian(unsigned int* v)
-{
-	unsigned char* x = (unsigned char*)v;
-	swapByte(x+0, x+3); swapByte(x+1, x+2);
-}
-
-inline void swapEndian(int* v)
-{
-	unsigned char* x = (unsigned char*)v;
-	swapByte(x+0, x+3); swapByte(x+1, x+2);
-}
-
-inline void swapEndian(float* v)
-{
-	unsigned char* x = (unsigned char*)v;
-	swapByte(x+0, x+3); swapByte(x+1, x+2);
-}
-
 bool dtNavMeshHeaderSwapEndian(unsigned char* data, const int /*dataSize*/)
 {
 	dtMeshHeader* header = (dtMeshHeader*)data;
 	
 	int swappedMagic = DT_NAVMESH_MAGIC;
 	int swappedVersion = DT_NAVMESH_VERSION;
-	swapEndian(&swappedMagic);
-	swapEndian(&swappedVersion);
+	dtSwapEndian(&swappedMagic);
+	dtSwapEndian(&swappedVersion);
 	
 	if ((header->magic != DT_NAVMESH_MAGIC || header->version != DT_NAVMESH_VERSION) &&
 		(header->magic != swappedMagic || header->version != swappedVersion))
@@ -596,36 +647,43 @@ bool dtNavMeshHeaderSwapEndian(unsigned char* data, const int /*dataSize*/)
 		return false;
 	}
 		
-	swapEndian(&header->magic);
-	swapEndian(&header->version);
-	swapEndian(&header->x);
-	swapEndian(&header->y);
-	swapEndian(&header->userId);
-	swapEndian(&header->polyCount);
-	swapEndian(&header->vertCount);
-	swapEndian(&header->maxLinkCount);
-	swapEndian(&header->detailMeshCount);
-	swapEndian(&header->detailVertCount);
-	swapEndian(&header->detailTriCount);
-	swapEndian(&header->bvNodeCount);
-	swapEndian(&header->offMeshConCount);
-	swapEndian(&header->offMeshBase);
-	swapEndian(&header->walkableHeight);
-	swapEndian(&header->walkableRadius);
-	swapEndian(&header->walkableClimb);
-	swapEndian(&header->bmin[0]);
-	swapEndian(&header->bmin[1]);
-	swapEndian(&header->bmin[2]);
-	swapEndian(&header->bmax[0]);
-	swapEndian(&header->bmax[1]);
-	swapEndian(&header->bmax[2]);
-	swapEndian(&header->bvQuantFactor);
+	dtSwapEndian(&header->magic);
+	dtSwapEndian(&header->version);
+	dtSwapEndian(&header->x);
+	dtSwapEndian(&header->y);
+	dtSwapEndian(&header->layer);
+	dtSwapEndian(&header->userId);
+	dtSwapEndian(&header->polyCount);
+	dtSwapEndian(&header->vertCount);
+	dtSwapEndian(&header->maxLinkCount);
+	dtSwapEndian(&header->detailMeshCount);
+	dtSwapEndian(&header->detailVertCount);
+	dtSwapEndian(&header->detailTriCount);
+	dtSwapEndian(&header->bvNodeCount);
+	dtSwapEndian(&header->offMeshConCount);
+	dtSwapEndian(&header->offMeshBase);
+	dtSwapEndian(&header->walkableHeight);
+	dtSwapEndian(&header->walkableRadius);
+	dtSwapEndian(&header->walkableClimb);
+	dtSwapEndian(&header->bmin[0]);
+	dtSwapEndian(&header->bmin[1]);
+	dtSwapEndian(&header->bmin[2]);
+	dtSwapEndian(&header->bmax[0]);
+	dtSwapEndian(&header->bmax[1]);
+	dtSwapEndian(&header->bmax[2]);
+	dtSwapEndian(&header->bvQuantFactor);
 
 	// Freelist index and pointers are updated when tile is added, no need to swap.
 
 	return true;
 }
 
+/// @par
+///
+/// @warning This function assumes that the header is in the correct endianess already. 
+/// Call #dtNavMeshHeaderSwapEndian() first on the data if the data is expected to be in wrong endianess 
+/// to start with. Call #dtNavMeshHeaderSwapEndian() after the data has been swapped if converting from 
+/// native to foreign endianess.
 bool dtNavMeshDataSwapEndian(unsigned char* data, const int /*dataSize*/)
 {
 	// Make sure the data is in right format.
@@ -659,7 +717,7 @@ bool dtNavMeshDataSwapEndian(unsigned char* data, const int /*dataSize*/)
 	// Vertices
 	for (int i = 0; i < header->vertCount*3; ++i)
 	{
-		swapEndian(&verts[i]);
+		dtSwapEndian(&verts[i]);
 	}
 
 	// Polys
@@ -669,10 +727,10 @@ bool dtNavMeshDataSwapEndian(unsigned char* data, const int /*dataSize*/)
 		// poly->firstLink is update when tile is added, no need to swap.
 		for (int j = 0; j < DT_VERTS_PER_POLYGON; ++j)
 		{
-			swapEndian(&p->verts[j]);
-			swapEndian(&p->neis[j]);
+			dtSwapEndian(&p->verts[j]);
+			dtSwapEndian(&p->neis[j]);
 		}
-		swapEndian(&p->flags);
+		dtSwapEndian(&p->flags);
 	}
 
 	// Links are rebuild when tile is added, no need to swap.
@@ -681,14 +739,14 @@ bool dtNavMeshDataSwapEndian(unsigned char* data, const int /*dataSize*/)
 	for (int i = 0; i < header->detailMeshCount; ++i)
 	{
 		dtPolyDetail* pd = &detailMeshes[i];
-		swapEndian(&pd->vertBase);
-		swapEndian(&pd->triBase);
+		dtSwapEndian(&pd->vertBase);
+		dtSwapEndian(&pd->triBase);
 	}
 	
 	// Detail verts
 	for (int i = 0; i < header->detailVertCount*3; ++i)
 	{
-		swapEndian(&detailVerts[i]);
+		dtSwapEndian(&detailVerts[i]);
 	}
 
 	// BV-tree
@@ -697,10 +755,10 @@ bool dtNavMeshDataSwapEndian(unsigned char* data, const int /*dataSize*/)
 		dtBVNode* node = &bvTree[i];
 		for (int j = 0; j < 3; ++j)
 		{
-			swapEndian(&node->bmin[j]);
-			swapEndian(&node->bmax[j]);
+			dtSwapEndian(&node->bmin[j]);
+			dtSwapEndian(&node->bmax[j]);
 		}
-		swapEndian(&node->i);
+		dtSwapEndian(&node->i);
 	}
 
 	// Off-mesh Connections.
@@ -708,9 +766,9 @@ bool dtNavMeshDataSwapEndian(unsigned char* data, const int /*dataSize*/)
 	{
 		dtOffMeshConnection* con = &offMeshCons[i];
 		for (int j = 0; j < 6; ++j)
-			swapEndian(&con->pos[j]);
-		swapEndian(&con->rad);
-		swapEndian(&con->poly);
+			dtSwapEndian(&con->pos[j]);
+		dtSwapEndian(&con->rad);
+		dtSwapEndian(&con->poly);
 	}
 	
 	return true;
diff --git a/dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp b/dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
index 6a6eb94b6d4..a5a3948f2e5 100644
--- a/dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
+++ b/dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
@@ -27,6 +27,38 @@
 #include "DetourAssert.h"
 #include <new>
 
+/// @class dtQueryFilter
+///
+/// <b>The Default Implementation</b>
+/// 
+/// At construction: All area costs default to 1.0.  All flags are included
+/// and none are excluded.
+/// 
+/// If a polygon has both an include and an exclude flag, it will be excluded.
+/// 
+/// The way filtering works, a navigation mesh polygon must have at least one flag 
+/// set to ever be considered by a query. So a polygon with no flags will never
+/// be considered.
+///
+/// Setting the include flags to 0 will result in all polygons being excluded.
+///
+/// <b>Custom Implementations</b>
+/// 
+/// DT_VIRTUAL_QUERYFILTER must be defined in order to extend this class.
+/// 
+/// Implement a custom query filter by overriding the virtual passFilter() 
+/// and getCost() functions. If this is done, both functions should be as 
+/// fast as possible. Use cached local copies of data rather than accessing 
+/// your own objects where possible.
+/// 
+/// Custom implementations do not need to adhere to the flags or cost logic 
+/// used by the default implementation.  
+/// 
+/// In order for A* searches to work properly, the cost should be proportional to
+/// the travel distance. Implementing a cost modifier less than 1.0 is likely 
+/// to lead to problems during pathfinding.
+///
+/// @see dtNavMeshQuery
 
 dtQueryFilter::dtQueryFilter() :
 	m_includeFlags(0xffff),
@@ -49,7 +81,7 @@ float dtQueryFilter::getCost(const float* pa, const float* pb,
 							 const dtPolyRef /*curRef*/, const dtMeshTile* /*curTile*/, const dtPoly* curPoly,
 							 const dtPolyRef /*nextRef*/, const dtMeshTile* /*nextTile*/, const dtPoly* /*nextPoly*/) const
 {
-	return dtVdist(pa, pb) * m_areaCost[curPoly->area];
+	return dtVdist(pa, pb) * m_areaCost[curPoly->getArea()];
 }
 #else
 inline bool dtQueryFilter::passFilter(const dtPolyRef /*ref*/,
@@ -67,7 +99,8 @@ inline float dtQueryFilter::getCost(const float* pa, const float* pb,
 	return dtVdist(pa, pb) * m_areaCost[curPoly->getArea()];
 }
 #endif	
-	
+
+// modified for CMaNGOS
 static const float H_SCALE = 2.0f; // Search heuristic scale.
 
 
@@ -86,7 +119,25 @@ void dtFreeNavMeshQuery(dtNavMeshQuery* navmesh)
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
+
+/// @class dtNavMeshQuery
+///
+/// For methods that support undersized buffers, if the buffer is too small 
+/// to hold the entire result set the return status of the method will include 
+/// the #DT_BUFFER_TOO_SMALL flag.
+///
+/// Constant member functions can be used by multiple clients without side
+/// effects. (E.g. No change to the closed list. No impact on an in-progress
+/// sliced path query. Etc.)
+/// 
+/// Walls and portals: A @e wall is a polygon segment that is 
+/// considered impassable. A @e portal is a passable segment between polygons.
+/// A portal may be treated as a wall based on the dtQueryFilter used for a query.
+///
+/// @see dtNavMesh, dtQueryFilter, #dtAllocNavMeshQuery(), #dtAllocNavMeshQuery()
+
 dtNavMeshQuery::dtNavMeshQuery() :
+	m_nav(0),
 	m_tinyNodePool(0),
 	m_nodePool(0),
 	m_openList(0)
@@ -107,6 +158,12 @@ dtNavMeshQuery::~dtNavMeshQuery()
 	dtFree(m_openList);
 }
 
+/// @par 
+///
+/// Must be the first function called after construction, before other
+/// functions are used.
+///
+/// This function can be used multiple times.
 dtStatus dtNavMeshQuery::init(const dtNavMesh* nav, const int maxNodes)
 {
 	m_nav = nav;
@@ -121,7 +178,7 @@ dtStatus dtNavMeshQuery::init(const dtNavMesh* nav, const int maxNodes)
 		}
 		m_nodePool = new (dtAlloc(sizeof(dtNodePool), DT_ALLOC_PERM)) dtNodePool(maxNodes, dtNextPow2(maxNodes/4));
 		if (!m_nodePool)
-			return DT_FAILURE_OUT_OF_MEMORY;
+			return DT_FAILURE | DT_OUT_OF_MEMORY;
 	}
 	else
 	{
@@ -132,7 +189,7 @@ dtStatus dtNavMeshQuery::init(const dtNavMesh* nav, const int maxNodes)
 	{
 		m_tinyNodePool = new (dtAlloc(sizeof(dtNodePool), DT_ALLOC_PERM)) dtNodePool(64, 32);
 		if (!m_tinyNodePool)
-			return DT_FAILURE_OUT_OF_MEMORY;
+			return DT_FAILURE | DT_OUT_OF_MEMORY;
 	}
 	else
 	{
@@ -150,7 +207,7 @@ dtStatus dtNavMeshQuery::init(const dtNavMesh* nav, const int maxNodes)
 		}
 		m_openList = new (dtAlloc(sizeof(dtNodeQueue), DT_ALLOC_PERM)) dtNodeQueue(maxNodes);
 		if (!m_openList)
-			return DT_FAILURE_OUT_OF_MEMORY;
+			return DT_FAILURE | DT_OUT_OF_MEMORY;
 	}
 	else
 	{
@@ -160,33 +217,328 @@ dtStatus dtNavMeshQuery::init(const dtNavMesh* nav, const int maxNodes)
 	return DT_SUCCESS;
 }
 
+dtStatus dtNavMeshQuery::findRandomPoint(const dtQueryFilter* filter, float (*frand)(),
+										 dtPolyRef* randomRef, float* randomPt) const
+{
+	dtAssert(m_nav);
+	
+	// Randomly pick one tile. Assume that all tiles cover roughly the same area.
+	const dtMeshTile* tile = 0;
+	float tsum = 0.0f;
+	for (int i = 0; i < m_nav->getMaxTiles(); i++)
+	{
+		const dtMeshTile* t = m_nav->getTile(i);
+		if (!t || !t->header) continue;
+		
+		// Choose random tile using reservoi sampling.
+		const float area = 1.0f; // Could be tile area too.
+		tsum += area;
+		const float u = frand();
+		if (u*tsum <= area)
+			tile = t;
+	}
+	if (!tile)
+		return DT_FAILURE;
+
+	// Randomly pick one polygon weighted by polygon area.
+	const dtPoly* poly = 0;
+	dtPolyRef polyRef = 0;
+	const dtPolyRef base = m_nav->getPolyRefBase(tile);
+
+	float areaSum = 0.0f;
+	for (int i = 0; i < tile->header->polyCount; ++i)
+	{
+		const dtPoly* p = &tile->polys[i];
+		// Do not return off-mesh connection polygons.
+		if (p->getType() != DT_POLYTYPE_GROUND)
+			continue;
+		// Must pass filter
+		const dtPolyRef ref = base | (dtPolyRef)i;
+		if (!filter->passFilter(ref, tile, p))
+			continue;
+
+		// Calc area of the polygon.
+		float polyArea = 0.0f;
+		for (int j = 2; j < p->vertCount; ++j)
+		{
+			const float* va = &tile->verts[p->verts[0]*3];
+			const float* vb = &tile->verts[p->verts[j-1]*3];
+			const float* vc = &tile->verts[p->verts[j]*3];
+			polyArea += dtTriArea2D(va,vb,vc);
+		}
+
+		// Choose random polygon weighted by area, using reservoi sampling.
+		areaSum += polyArea;
+		const float u = frand();
+		if (u*areaSum <= polyArea)
+		{
+			poly = p;
+			polyRef = ref;
+		}
+	}
+	
+	if (!poly)
+		return DT_FAILURE;
+
+	// Randomly pick point on polygon.
+	const float* v = &tile->verts[poly->verts[0]*3];
+	float verts[3*DT_VERTS_PER_POLYGON];
+	float areas[DT_VERTS_PER_POLYGON];
+	dtVcopy(&verts[0*3],v);
+	for (int j = 1; j < poly->vertCount; ++j)
+	{
+		v = &tile->verts[poly->verts[j]*3];
+		dtVcopy(&verts[j*3],v);
+	}
+	
+	const float s = frand();
+	const float t = frand();
+	
+	float pt[3];
+	dtRandomPointInConvexPoly(verts, poly->vertCount, areas, s, t, pt);
+	
+	float h = 0.0f;
+	dtStatus status = getPolyHeight(polyRef, pt, &h);
+	if (dtStatusFailed(status))
+		return status;
+	pt[1] = h;
+	
+	dtVcopy(randomPt, pt);
+	*randomRef = polyRef;
+
+	return DT_SUCCESS;
+}
+
+dtStatus dtNavMeshQuery::findRandomPointAroundCircle(dtPolyRef startRef, const float* centerPos, const float radius,
+													 const dtQueryFilter* filter, float (*frand)(),
+													 dtPolyRef* randomRef, float* randomPt) const
+{
+	dtAssert(m_nav);
+	dtAssert(m_nodePool);
+	dtAssert(m_openList);
+	
+	// Validate input
+	if (!startRef || !m_nav->isValidPolyRef(startRef))
+		return DT_FAILURE | DT_INVALID_PARAM;
+	
+	const dtMeshTile* startTile = 0;
+	const dtPoly* startPoly = 0;
+	m_nav->getTileAndPolyByRefUnsafe(startRef, &startTile, &startPoly);
+	if (!filter->passFilter(startRef, startTile, startPoly))
+		return DT_FAILURE | DT_INVALID_PARAM;
+	
+	m_nodePool->clear();
+	m_openList->clear();
+	
+	dtNode* startNode = m_nodePool->getNode(startRef);
+	dtVcopy(startNode->pos, centerPos);
+	startNode->pidx = 0;
+	startNode->cost = 0;
+	startNode->total = 0;
+	startNode->id = startRef;
+	startNode->flags = DT_NODE_OPEN;
+	m_openList->push(startNode);
+	
+	dtStatus status = DT_SUCCESS;
+	
+	const float radiusSqr = dtSqr(radius);
+	float areaSum = 0.0f;
+
+	const dtMeshTile* randomTile = 0;
+	const dtPoly* randomPoly = 0;
+	dtPolyRef randomPolyRef = 0;
+
+	while (!m_openList->empty())
+	{
+		dtNode* bestNode = m_openList->pop();
+		bestNode->flags &= ~DT_NODE_OPEN;
+		bestNode->flags |= DT_NODE_CLOSED;
+		
+		// Get poly and tile.
+		// The API input has been cheked already, skip checking internal data.
+		const dtPolyRef bestRef = bestNode->id;
+		const dtMeshTile* bestTile = 0;
+		const dtPoly* bestPoly = 0;
+		m_nav->getTileAndPolyByRefUnsafe(bestRef, &bestTile, &bestPoly);
+
+		// Place random locations on on ground.
+		if (bestPoly->getType() == DT_POLYTYPE_GROUND)
+		{
+			// Calc area of the polygon.
+			float polyArea = 0.0f;
+			for (int j = 2; j < bestPoly->vertCount; ++j)
+			{
+				const float* va = &bestTile->verts[bestPoly->verts[0]*3];
+				const float* vb = &bestTile->verts[bestPoly->verts[j-1]*3];
+				const float* vc = &bestTile->verts[bestPoly->verts[j]*3];
+				polyArea += dtTriArea2D(va,vb,vc);
+			}
+			// Choose random polygon weighted by area, using reservoi sampling.
+			areaSum += polyArea;
+			const float u = frand();
+			if (u*areaSum <= polyArea)
+			{
+				randomTile = bestTile;
+				randomPoly = bestPoly;
+				randomPolyRef = bestRef;
+			}
+		}
+		
+		
+		// Get parent poly and tile.
+		dtPolyRef parentRef = 0;
+		const dtMeshTile* parentTile = 0;
+		const dtPoly* parentPoly = 0;
+		if (bestNode->pidx)
+			parentRef = m_nodePool->getNodeAtIdx(bestNode->pidx)->id;
+		if (parentRef)
+			m_nav->getTileAndPolyByRefUnsafe(parentRef, &parentTile, &parentPoly);
+		
+		for (unsigned int i = bestPoly->firstLink; i != DT_NULL_LINK; i = bestTile->links[i].next)
+		{
+			const dtLink* link = &bestTile->links[i];
+			dtPolyRef neighbourRef = link->ref;
+			// Skip invalid neighbours and do not follow back to parent.
+			if (!neighbourRef || neighbourRef == parentRef)
+				continue;
+			
+			// Expand to neighbour
+			const dtMeshTile* neighbourTile = 0;
+			const dtPoly* neighbourPoly = 0;
+			m_nav->getTileAndPolyByRefUnsafe(neighbourRef, &neighbourTile, &neighbourPoly);
+			
+			// Do not advance if the polygon is excluded by the filter.
+			if (!filter->passFilter(neighbourRef, neighbourTile, neighbourPoly))
+				continue;
+			
+			// Find edge and calc distance to the edge.
+			float va[3], vb[3];
+			if (!getPortalPoints(bestRef, bestPoly, bestTile, neighbourRef, neighbourPoly, neighbourTile, va, vb))
+				continue;
+			
+			// If the circle is not touching the next polygon, skip it.
+			float tseg;
+			float distSqr = dtDistancePtSegSqr2D(centerPos, va, vb, tseg);
+			if (distSqr > radiusSqr)
+				continue;
+			
+			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef);
+			if (!neighbourNode)
+			{
+				status |= DT_OUT_OF_NODES;
+				continue;
+			}
+			
+			if (neighbourNode->flags & DT_NODE_CLOSED)
+				continue;
+			
+			// Cost
+			if (neighbourNode->flags == 0)
+				dtVlerp(neighbourNode->pos, va, vb, 0.5f);
+			
+			const float total = bestNode->total + dtVdist(bestNode->pos, neighbourNode->pos);
+			
+			// The node is already in open list and the new result is worse, skip.
+			if ((neighbourNode->flags & DT_NODE_OPEN) && total >= neighbourNode->total)
+				continue;
+			
+			neighbourNode->id = neighbourRef;
+			neighbourNode->flags = (neighbourNode->flags & ~DT_NODE_CLOSED);
+			neighbourNode->pidx = m_nodePool->getNodeIdx(bestNode);
+			neighbourNode->total = total;
+			
+			if (neighbourNode->flags & DT_NODE_OPEN)
+			{
+				m_openList->modify(neighbourNode);
+			}
+			else
+			{
+				neighbourNode->flags = DT_NODE_OPEN;
+				m_openList->push(neighbourNode);
+			}
+		}
+	}
+	
+	if (!randomPoly)
+		return DT_FAILURE;
+	
+	// Randomly pick point on polygon.
+	const float* v = &randomTile->verts[randomPoly->verts[0]*3];
+	float verts[3*DT_VERTS_PER_POLYGON];
+	float areas[DT_VERTS_PER_POLYGON];
+	dtVcopy(&verts[0*3],v);
+	for (int j = 1; j < randomPoly->vertCount; ++j)
+	{
+		v = &randomTile->verts[randomPoly->verts[j]*3];
+		dtVcopy(&verts[j*3],v);
+	}
+	
+	const float s = frand();
+	const float t = frand();
+	
+	float pt[3];
+	dtRandomPointInConvexPoly(verts, randomPoly->vertCount, areas, s, t, pt);
+	
+	float h = 0.0f;
+	dtStatus stat = getPolyHeight(randomPolyRef, pt, &h);
+	if (dtStatusFailed(status))
+		return stat;
+	pt[1] = h;
+	
+	dtVcopy(randomPt, pt);
+	*randomRef = randomPolyRef;
+	
+	return DT_SUCCESS;
+}
+
+
 //////////////////////////////////////////////////////////////////////////////////////////
+
+/// @par
+///
+/// Uses the detail polygons to find the surface height. (Most accurate.)
+///
+/// @p pos does not have to be within the bounds of the polygon or navigation mesh.
+///
+/// See closestPointOnPolyBoundary() for a limited but faster option.
+///
 dtStatus dtNavMeshQuery::closestPointOnPoly(dtPolyRef ref, const float* pos, float* closest) const
 {
 	dtAssert(m_nav);
 	const dtMeshTile* tile = 0;
 	const dtPoly* poly = 0;
-	if (m_nav->getTileAndPolyByRef(ref, &tile, &poly) != DT_SUCCESS)
-		return DT_FAILURE;
-	if (!tile) return DT_FAILURE;
+	if (dtStatusFailed(m_nav->getTileAndPolyByRef(ref, &tile, &poly)))
+		return DT_FAILURE | DT_INVALID_PARAM;
+	if (!tile)
+		return DT_FAILURE | DT_INVALID_PARAM;
 
+    // modified for CMaNGOS
     if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
         return DT_FAILURE;
-
-	if (closestPointOnPolyInTile(tile, poly, pos, closest) != DT_SUCCESS)
-		return DT_FAILURE;
+	
+	closestPointOnPolyInTile(tile, poly, pos, closest);
+	
 	return DT_SUCCESS;
 }
 
-dtStatus dtNavMeshQuery::closestPointOnPolyInTile(const dtMeshTile* tile, const dtPoly* poly,
-												  const float* pos, float* closest) const
+void dtNavMeshQuery::closestPointOnPolyInTile(const dtMeshTile* tile, const dtPoly* poly,
+											  const float* pos, float* closest) const
 {
+	// Off-mesh connections don't have detail polygons.
+	if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
+	{
+		const float* v0 = &tile->verts[poly->verts[0]*3];
+		const float* v1 = &tile->verts[poly->verts[1]*3];
+		const float d0 = dtVdist(pos, v0);
+		const float d1 = dtVdist(pos, v1);
+		const float u = d0 / (d0+d1);
+		dtVlerp(closest, v0, v1, u);
+		return;
+	}
+
 	const unsigned int ip = (unsigned int)(poly - tile->polys);
 	const dtPolyDetail* pd = &tile->detailMeshes[ip];
 
-	// TODO: The commented out version finds 'cylinder distance' instead of 'sphere distance' to the navmesh.
-	// Test and enable.
-/*
 	// Clamp point to be inside the polygon.
 	float verts[DT_VERTS_PER_POLYGON*3];	
 	float edged[DT_VERTS_PER_POLYGON];
@@ -233,8 +585,8 @@ dtStatus dtNavMeshQuery::closestPointOnPolyInTile(const dtMeshTile* tile, const
 			break;
 		}
 	}
-*/
-	float closestDistSqr = FLT_MAX;
+
+/*	float closestDistSqr = FLT_MAX;
 	for (int j = 0; j < pd->triCount; ++j)
 	{
 		const unsigned char* t = &tile->detailTris[(pd->triBase+j)*4];
@@ -256,19 +608,28 @@ dtStatus dtNavMeshQuery::closestPointOnPolyInTile(const dtMeshTile* tile, const
 			dtVcopy(closest, pt);
 			closestDistSqr = d;
 		}
-	}
-	
-	return DT_SUCCESS;
+	}*/
 }
 
+/// @par
+///
+/// Much faster than closestPointOnPoly().
+///
+/// If the provided position lies within the polygon's xz-bounds (above or below), 
+/// then @p pos and @p closest will be equal.
+///
+/// The height of @p closest will be the polygon boundary.  The height detail is not used.
+/// 
+/// @p pos does not have to be within the bounds of the polybon or the navigation mesh.
+/// 
 dtStatus dtNavMeshQuery::closestPointOnPolyBoundary(dtPolyRef ref, const float* pos, float* closest) const
 {
 	dtAssert(m_nav);
 	
 	const dtMeshTile* tile = 0;
 	const dtPoly* poly = 0;
-	if (m_nav->getTileAndPolyByRef(ref, &tile, &poly) != DT_SUCCESS)
-		return DT_FAILURE;
+	if (dtStatusFailed(m_nav->getTileAndPolyByRef(ref, &tile, &poly)))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	// Collect vertices.
 	float verts[DT_VERTS_PER_POLYGON*3];	
@@ -308,15 +669,19 @@ dtStatus dtNavMeshQuery::closestPointOnPolyBoundary(dtPolyRef ref, const float*
 	return DT_SUCCESS;
 }
 
-
+/// @par
+///
+/// Will return #DT_FAILURE if the provided position is outside the xz-bounds 
+/// of the polygon.
+/// 
 dtStatus dtNavMeshQuery::getPolyHeight(dtPolyRef ref, const float* pos, float* height) const
 {
 	dtAssert(m_nav);
 
 	const dtMeshTile* tile = 0;
 	const dtPoly* poly = 0;
-	if (m_nav->getTileAndPolyByRef(ref, &tile, &poly) != DT_SUCCESS)
-		return DT_FAILURE;
+	if (dtStatusFailed(m_nav->getTileAndPolyByRef(ref, &tile, &poly)))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
 	{
@@ -354,9 +719,18 @@ dtStatus dtNavMeshQuery::getPolyHeight(dtPolyRef ref, const float* pos, float* h
 		}
 	}
 	
-	return DT_FAILURE;
+	return DT_FAILURE | DT_INVALID_PARAM;
 }
 
+/// @par 
+///
+/// @note If the search box does not intersect any polygons the search will 
+/// return #DT_SUCCESS, but @p nearestRef will be zero. So if in doubt, check 
+/// @p nearestRef before using @p nearestPt.
+///
+/// @warning This function is not suitable for large area searches.  If the search
+/// extents overlaps more than 128 polygons it may return an invalid result.
+///
 dtStatus dtNavMeshQuery::findNearestPoly(const float* center, const float* extents,
 										 const dtQueryFilter* filter,
 										 dtPolyRef* nearestRef, float* nearestPt) const
@@ -368,8 +742,8 @@ dtStatus dtNavMeshQuery::findNearestPoly(const float* center, const float* exten
 	// Get nearby polygons from proximity grid.
 	dtPolyRef polys[128];
 	int polyCount = 0;
-	if (queryPolygons(center, extents, filter, polys, &polyCount, 128) != DT_SUCCESS)
-		return DT_FAILURE;
+	if (dtStatusFailed(queryPolygons(center, extents, filter, polys, &polyCount, 128)))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	// Find nearest polygon amongst the nearby polygons.
 	dtPolyRef nearest = 0;
@@ -378,8 +752,7 @@ dtStatus dtNavMeshQuery::findNearestPoly(const float* center, const float* exten
 	{
 		dtPolyRef ref = polys[i];
 		float closestPtPoly[3];
-		if (closestPointOnPoly(ref, center, closestPtPoly) != DT_SUCCESS)
-			continue;
+		closestPointOnPoly(ref, center, closestPtPoly);
 		float d = dtVdistSqr(center, closestPtPoly);
 		if (d < nearestDistanceSqr)
 		{
@@ -417,8 +790,7 @@ dtPolyRef dtNavMeshQuery::findNearestPolyInTile(const dtMeshTile* tile, const fl
 		dtPolyRef ref = polys[i];
 		const dtPoly* poly = &tile->polys[m_nav->decodePolyIdPoly(ref)];
 		float closestPtPoly[3];
-		if (closestPointOnPolyInTile(tile, poly, center, closestPtPoly) != DT_SUCCESS)
-			continue;
+		closestPointOnPolyInTile(tile, poly, center, closestPtPoly);
 			
 		float d = dtVdistSqr(center, closestPtPoly);
 		if (d < nearestDistanceSqr)
@@ -500,8 +872,15 @@ int dtNavMeshQuery::queryPolygonsInTile(const dtMeshTile* tile, const float* qmi
 		const dtPolyRef base = m_nav->getPolyRefBase(tile);
 		for (int i = 0; i < tile->header->polyCount; ++i)
 		{
+			const dtPoly* p = &tile->polys[i];
+			// Do not return off-mesh connection polygons.
+			if (p->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
+				continue;
+			// Must pass filter
+			const dtPolyRef ref = base | (dtPolyRef)i;
+			if (!filter->passFilter(ref, tile, p))
+				continue;
 			// Calc polygon bounds.
-			dtPoly* p = &tile->polys[i];
 			const float* v = &tile->verts[p->verts[0]*3];
 			dtVcopy(bmin, v);
 			dtVcopy(bmax, v);
@@ -513,18 +892,23 @@ int dtNavMeshQuery::queryPolygonsInTile(const dtMeshTile* tile, const float* qmi
 			}
 			if (dtOverlapBounds(qmin,qmax, bmin,bmax))
 			{
-				const dtPolyRef ref = base | (dtPolyRef)i;
-				if (filter->passFilter(ref, tile, p))
-				{
-					if (n < maxPolys)
-						polys[n++] = ref;
-				}
+				if (n < maxPolys)
+					polys[n++] = ref;
 			}
 		}
 		return n;
 	}
 }
 
+/// @par 
+///
+/// If no polygons are found, the function will return #DT_SUCCESS with a
+/// @p polyCount of zero.
+///
+/// If @p polys is too small to hold the entire result set, then the array will 
+/// be filled to capacity. The method of choosing which polygons from the 
+/// full set are included in the partial result set is undefined.
+///
 dtStatus dtNavMeshQuery::queryPolygons(const float* center, const float* extents,
 									   const dtQueryFilter* filter,
 									   dtPolyRef* polys, int* polyCount, const int maxPolys) const
@@ -540,18 +924,23 @@ dtStatus dtNavMeshQuery::queryPolygons(const float* center, const float* extents
 	m_nav->calcTileLoc(bmin, &minx, &miny);
 	m_nav->calcTileLoc(bmax, &maxx, &maxy);
 
+	static const int MAX_NEIS = 32;
+	const dtMeshTile* neis[MAX_NEIS];
+	
 	int n = 0;
 	for (int y = miny; y <= maxy; ++y)
 	{
 		for (int x = minx; x <= maxx; ++x)
 		{
-			const dtMeshTile* tile = m_nav->getTileAt(x,y);
-			if (!tile) continue;
-			n += queryPolygonsInTile(tile, bmin, bmax, filter, polys+n, maxPolys-n);
-			if (n >= maxPolys)
+			const int nneis = m_nav->getTilesAt(x,y,neis,MAX_NEIS);
+			for (int j = 0; j < nneis; ++j)
 			{
-				*polyCount = n;
-				return DT_SUCCESS;
+				n += queryPolygonsInTile(neis[j], bmin, bmax, filter, polys+n, maxPolys-n);
+				if (n >= maxPolys)
+				{
+					*polyCount = n;
+					return DT_SUCCESS | DT_BUFFER_TOO_SMALL;
+				}
 			}
 		}
 	}
@@ -560,6 +949,17 @@ dtStatus dtNavMeshQuery::queryPolygons(const float* center, const float* extents
 	return DT_SUCCESS;
 }
 
+/// @par
+///
+/// If the end polygon cannot be reached through the navigation graph,
+/// the last polygon in the path will be the nearest the end polygon.
+///
+/// If the path array is to small to hold the full result, it will be filled as 
+/// far as possible from the start polygon toward the end polygon.
+///
+/// The start and end positions are used to calculate traversal costs. 
+/// (The y-values impact the result.)
+///
 dtStatus dtNavMeshQuery::findPath(dtPolyRef startRef, dtPolyRef endRef,
 								  const float* startPos, const float* endPos,
 								  const dtQueryFilter* filter,
@@ -572,14 +972,14 @@ dtStatus dtNavMeshQuery::findPath(dtPolyRef startRef, dtPolyRef endRef,
 	*pathCount = 0;
 	
 	if (!startRef || !endRef)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	if (!maxPath)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	// Validate input
 	if (!m_nav->isValidPolyRef(startRef) || !m_nav->isValidPolyRef(endRef))
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	if (startRef == endRef)
 	{
@@ -603,6 +1003,8 @@ dtStatus dtNavMeshQuery::findPath(dtPolyRef startRef, dtPolyRef endRef,
 	dtNode* lastBestNode = startNode;
 	float lastBestNodeCost = startNode->total;
 	
+	dtStatus status = DT_SUCCESS;
+	
 	while (!m_openList->empty())
 	{
 		// Remove node from open list and put it in closed list.
@@ -652,7 +1054,10 @@ dtStatus dtNavMeshQuery::findPath(dtPolyRef startRef, dtPolyRef endRef,
 
 			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef);
 			if (!neighbourNode)
+			{
+				status |= DT_OUT_OF_NODES;
 				continue;
+			}
 			
 			// If the node is visited the first time, calculate node position.
 			if (neighbourNode->flags == 0)
@@ -705,7 +1110,7 @@ dtStatus dtNavMeshQuery::findPath(dtPolyRef startRef, dtPolyRef endRef,
 			// Add or update the node.
 			neighbourNode->pidx = m_nodePool->getNodeIdx(bestNode);
 			neighbourNode->id = neighbourRef;
-			neighbourNode->flags &= ~DT_NODE_CLOSED;
+			neighbourNode->flags = (neighbourNode->flags & ~DT_NODE_CLOSED);
 			neighbourNode->cost = cost;
 			neighbourNode->total = total;
 			
@@ -730,6 +1135,9 @@ dtStatus dtNavMeshQuery::findPath(dtPolyRef startRef, dtPolyRef endRef,
 		}
 	}
 	
+	if (lastBestNode->id != endRef)
+		status |= DT_PARTIAL_RESULT;
+	
 	// Reverse the path.
 	dtNode* prev = 0;
 	dtNode* node = lastBestNode;
@@ -748,15 +1156,28 @@ dtStatus dtNavMeshQuery::findPath(dtPolyRef startRef, dtPolyRef endRef,
 	do
 	{
 		path[n++] = node->id;
+		if (n >= maxPath)
+		{
+			status |= DT_BUFFER_TOO_SMALL;
+			break;
+		}
 		node = m_nodePool->getNodeAtIdx(node->pidx);
 	}
-	while (node && n < maxPath);
+	while (node);
 	
 	*pathCount = n;
 	
-	return DT_SUCCESS;
+	return status;
 }
 
+/// @par
+///
+/// @warning Calling any non-slice methods before calling finalizeSlicedFindPath() 
+/// or finalizeSlicedFindPathPartial() may result in corrupted data!
+///
+/// The @p filter pointer is stored and used for the duration of the sliced
+/// path query.
+///
 dtStatus dtNavMeshQuery::initSlicedFindPath(dtPolyRef startRef, dtPolyRef endRef,
 											const float* startPos, const float* endPos,
 											const dtQueryFilter* filter)
@@ -775,11 +1196,11 @@ dtStatus dtNavMeshQuery::initSlicedFindPath(dtPolyRef startRef, dtPolyRef endRef
 	m_query.filter = filter;
 	
 	if (!startRef || !endRef)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	// Validate input
 	if (!m_nav->isValidPolyRef(startRef) || !m_nav->isValidPolyRef(endRef))
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 
 	if (startRef == endRef)
 	{
@@ -806,9 +1227,9 @@ dtStatus dtNavMeshQuery::initSlicedFindPath(dtPolyRef startRef, dtPolyRef endRef
 	return m_query.status;
 }
 	
-dtStatus dtNavMeshQuery::updateSlicedFindPath(const int maxIter)
+dtStatus dtNavMeshQuery::updateSlicedFindPath(const int maxIter, int* doneIters)
 {
-	if (m_query.status!= DT_IN_PROGRESS)
+	if (!dtStatusInProgress(m_query.status))
 		return m_query.status;
 
 	// Make sure the request is still valid.
@@ -832,7 +1253,10 @@ dtStatus dtNavMeshQuery::updateSlicedFindPath(const int maxIter)
 		if (bestNode->id == m_query.endRef)
 		{
 			m_query.lastBestNode = bestNode;
-			m_query.status = DT_SUCCESS;
+			const dtStatus details = m_query.status & DT_STATUS_DETAIL_MASK;
+			m_query.status = DT_SUCCESS | details;
+			if (doneIters)
+				*doneIters = iter;
 			return m_query.status;
 		}
 		
@@ -841,10 +1265,12 @@ dtStatus dtNavMeshQuery::updateSlicedFindPath(const int maxIter)
 		const dtPolyRef bestRef = bestNode->id;
 		const dtMeshTile* bestTile = 0;
 		const dtPoly* bestPoly = 0;
-		if (m_nav->getTileAndPolyByRef(bestRef, &bestTile, &bestPoly) != DT_SUCCESS)
+		if (dtStatusFailed(m_nav->getTileAndPolyByRef(bestRef, &bestTile, &bestPoly)))
 		{
 			// The polygon has disappeared during the sliced query, fail.
 			m_query.status = DT_FAILURE;
+			if (doneIters)
+				*doneIters = iter;
 			return m_query.status;
 		}
 		
@@ -856,10 +1282,12 @@ dtStatus dtNavMeshQuery::updateSlicedFindPath(const int maxIter)
 			parentRef = m_nodePool->getNodeAtIdx(bestNode->pidx)->id;
 		if (parentRef)
 		{
-			if (m_nav->getTileAndPolyByRef(parentRef, &parentTile, &parentPoly) != DT_SUCCESS)
+			if (dtStatusFailed(m_nav->getTileAndPolyByRef(parentRef, &parentTile, &parentPoly)))
 			{
 				// The polygon has disappeared during the sliced query, fail.
 				m_query.status = DT_FAILURE;
+				if (doneIters)
+					*doneIters = iter;
 				return m_query.status;
 			}
 		}
@@ -883,7 +1311,10 @@ dtStatus dtNavMeshQuery::updateSlicedFindPath(const int maxIter)
 			
 			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef);
 			if (!neighbourNode)
+			{
+				m_query.status |= DT_OUT_OF_NODES;
 				continue;
+			}
 			
 			// If the node is visited the first time, calculate node position.
 			if (neighbourNode->flags == 0)
@@ -936,7 +1367,7 @@ dtStatus dtNavMeshQuery::updateSlicedFindPath(const int maxIter)
 			// Add or update the node.
 			neighbourNode->pidx = m_nodePool->getNodeIdx(bestNode);
 			neighbourNode->id = neighbourRef;
-			neighbourNode->flags &= ~DT_NODE_CLOSED;
+			neighbourNode->flags = (neighbourNode->flags & ~DT_NODE_CLOSED);
 			neighbourNode->cost = cost;
 			neighbourNode->total = total;
 			
@@ -963,7 +1394,13 @@ dtStatus dtNavMeshQuery::updateSlicedFindPath(const int maxIter)
 	
 	// Exhausted all nodes, but could not find path.
 	if (m_openList->empty())
-		m_query.status = DT_SUCCESS;
+	{
+		const dtStatus details = m_query.status & DT_STATUS_DETAIL_MASK;
+		m_query.status = DT_SUCCESS | details;
+	}
+
+	if (doneIters)
+		*doneIters = iter;
 
 	return m_query.status;
 }
@@ -972,7 +1409,7 @@ dtStatus dtNavMeshQuery::finalizeSlicedFindPath(dtPolyRef* path, int* pathCount,
 {
 	*pathCount = 0;
 	
-	if (m_query.status != DT_SUCCESS)
+	if (dtStatusFailed(m_query.status))
 	{
 		// Reset query.
 		memset(&m_query, 0, sizeof(dtQueryData));
@@ -990,6 +1427,10 @@ dtStatus dtNavMeshQuery::finalizeSlicedFindPath(dtPolyRef* path, int* pathCount,
 	{
 		// Reverse the path.
 		dtAssert(m_query.lastBestNode);
+		
+		if (m_query.lastBestNode->id != m_query.endRef)
+			m_query.status |= DT_PARTIAL_RESULT;
+		
 		dtNode* prev = 0;
 		dtNode* node = m_query.lastBestNode;
 		do
@@ -1006,17 +1447,24 @@ dtStatus dtNavMeshQuery::finalizeSlicedFindPath(dtPolyRef* path, int* pathCount,
 		do
 		{
 			path[n++] = node->id;
+			if (n >= maxPath)
+			{
+				m_query.status |= DT_BUFFER_TOO_SMALL;
+				break;
+			}
 			node = m_nodePool->getNodeAtIdx(node->pidx);
 		}
-		while (node && n < maxPath);
+		while (node);
 	}
 	
+	const dtStatus details = m_query.status & DT_STATUS_DETAIL_MASK;
+
 	// Reset query.
 	memset(&m_query, 0, sizeof(dtQueryData));
 	
 	*pathCount = n;
 	
-	return DT_SUCCESS;
+	return DT_SUCCESS | details;
 }
 
 dtStatus dtNavMeshQuery::finalizeSlicedFindPathPartial(const dtPolyRef* existing, const int existingSize,
@@ -1029,7 +1477,7 @@ dtStatus dtNavMeshQuery::finalizeSlicedFindPathPartial(const dtPolyRef* existing
 		return DT_FAILURE;
 	}
 	
-	if (m_query.status != DT_SUCCESS && m_query.status != DT_IN_PROGRESS)
+	if (dtStatusFailed(m_query.status))
 	{
 		// Reset query.
 		memset(&m_query, 0, sizeof(dtQueryData));
@@ -1057,7 +1505,9 @@ dtStatus dtNavMeshQuery::finalizeSlicedFindPathPartial(const dtPolyRef* existing
 		
 		if (!node)
 		{
-			return DT_FAILURE;
+			m_query.status |= DT_PARTIAL_RESULT;
+			dtAssert(m_query.lastBestNode);
+			node = m_query.lastBestNode;
 		}
 		
 		// Reverse the path.
@@ -1075,58 +1525,156 @@ dtStatus dtNavMeshQuery::finalizeSlicedFindPathPartial(const dtPolyRef* existing
 		do
 		{
 			path[n++] = node->id;
+			if (n >= maxPath)
+			{
+				m_query.status |= DT_BUFFER_TOO_SMALL;
+				break;
+			}
 			node = m_nodePool->getNodeAtIdx(node->pidx);
 		}
-		while (node && n < maxPath);
+		while (node);
 	}
 	
+	const dtStatus details = m_query.status & DT_STATUS_DETAIL_MASK;
+
 	// Reset query.
 	memset(&m_query, 0, sizeof(dtQueryData));
 	
 	*pathCount = n;
 	
-	return DT_SUCCESS;
+	return DT_SUCCESS | details;
 }
 
 
+dtStatus dtNavMeshQuery::appendVertex(const float* pos, const unsigned char flags, const dtPolyRef ref,
+									  float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
+									  int* straightPathCount, const int maxStraightPath) const
+{
+	if ((*straightPathCount) > 0 && dtVequal(&straightPath[((*straightPathCount)-1)*3], pos))
+	{
+		// The vertices are equal, update flags and poly.
+		if (straightPathFlags)
+			straightPathFlags[(*straightPathCount)-1] = flags;
+		if (straightPathRefs)
+			straightPathRefs[(*straightPathCount)-1] = ref;
+	}
+	else
+	{
+		// Append new vertex.
+		dtVcopy(&straightPath[(*straightPathCount)*3], pos);
+		if (straightPathFlags)
+			straightPathFlags[(*straightPathCount)] = flags;
+		if (straightPathRefs)
+			straightPathRefs[(*straightPathCount)] = ref;
+		(*straightPathCount)++;
+		// If reached end of path or there is no space to append more vertices, return.
+		if (flags == DT_STRAIGHTPATH_END || (*straightPathCount) >= maxStraightPath)
+		{
+			return DT_SUCCESS | (((*straightPathCount) >= maxStraightPath) ? DT_BUFFER_TOO_SMALL : 0);
+		}
+	}
+	return DT_IN_PROGRESS;
+}
+
+dtStatus dtNavMeshQuery::appendPortals(const int startIdx, const int endIdx, const float* endPos, const dtPolyRef* path,
+									  float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
+									  int* straightPathCount, const int maxStraightPath, const int options) const
+{
+	const float* startPos = &straightPath[(*straightPathCount-1)*3];
+	// Append or update last vertex
+	dtStatus stat = 0;
+	for (int i = startIdx; i < endIdx; i++)
+	{
+		// Calculate portal
+		const dtPolyRef from = path[i];
+		const dtMeshTile* fromTile = 0;
+		const dtPoly* fromPoly = 0;
+		if (dtStatusFailed(m_nav->getTileAndPolyByRef(from, &fromTile, &fromPoly)))
+			return DT_FAILURE | DT_INVALID_PARAM;
+		
+		const dtPolyRef to = path[i+1];
+		const dtMeshTile* toTile = 0;
+		const dtPoly* toPoly = 0;
+		if (dtStatusFailed(m_nav->getTileAndPolyByRef(to, &toTile, &toPoly)))
+			return DT_FAILURE | DT_INVALID_PARAM;
+		
+		float left[3], right[3];
+		if (dtStatusFailed(getPortalPoints(from, fromPoly, fromTile, to, toPoly, toTile, left, right)))
+			break;
+	
+		if (options & DT_STRAIGHTPATH_AREA_CROSSINGS)
+		{
+			// Skip intersection if only area crossings are requested.
+			if (fromPoly->getArea() == toPoly->getArea())
+				continue;
+		}
+		
+		// Append intersection
+		float s,t;
+		if (dtIntersectSegSeg2D(startPos, endPos, left, right, s, t))
+		{
+			float pt[3];
+			dtVlerp(pt, left,right, t);
+
+			stat = appendVertex(pt, 0, path[i+1],
+								straightPath, straightPathFlags, straightPathRefs,
+								straightPathCount, maxStraightPath);
+			if (stat != DT_IN_PROGRESS)
+				return stat;
+		}
+	}
+	return DT_IN_PROGRESS;
+}
+
+/// @par
+/// 
+/// This method peforms what is often called 'string pulling'.
+///
+/// The start position is clamped to the first polygon in the path, and the 
+/// end position is clamped to the last. So the start and end positions should 
+/// normally be within or very near the first and last polygons respectively.
+///
+/// The returned polygon references represent the reference id of the polygon 
+/// that is entered at the associated path position. The reference id associated 
+/// with the end point will always be zero.  This allows, for example, matching 
+/// off-mesh link points to their representative polygons.
+///
+/// If the provided result buffers are too small for the entire result set, 
+/// they will be filled as far as possible from the start toward the end 
+/// position.
+///
 dtStatus dtNavMeshQuery::findStraightPath(const float* startPos, const float* endPos,
 										  const dtPolyRef* path, const int pathSize,
 										  float* straightPath, unsigned char* straightPathFlags, dtPolyRef* straightPathRefs,
-										  int* straightPathCount, const int maxStraightPath) const
+										  int* straightPathCount, const int maxStraightPath, const int options) const
 {
 	dtAssert(m_nav);
 	
 	*straightPathCount = 0;
 	
 	if (!maxStraightPath)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	if (!path[0])
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
-	int n = 0;
+	dtStatus stat = 0;
 	
 	// TODO: Should this be callers responsibility?
 	float closestStartPos[3];
-	if (closestPointOnPolyBoundary(path[0], startPos, closestStartPos) != DT_SUCCESS)
-		return DT_FAILURE;
+	if (dtStatusFailed(closestPointOnPolyBoundary(path[0], startPos, closestStartPos)))
+		return DT_FAILURE | DT_INVALID_PARAM;
+
+	float closestEndPos[3];
+	if (dtStatusFailed(closestPointOnPolyBoundary(path[pathSize-1], endPos, closestEndPos)))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	// Add start point.
-	dtVcopy(&straightPath[n*3], closestStartPos);
-	if (straightPathFlags)
-		straightPathFlags[n] = DT_STRAIGHTPATH_START;
-	if (straightPathRefs)
-		straightPathRefs[n] = path[0];
-	n++;
-	if (n >= maxStraightPath)
-	{
-		*straightPathCount = n;
-		return DT_SUCCESS;
-	}
-	
-	float closestEndPos[3];
-	if (closestPointOnPolyBoundary(path[pathSize-1], endPos, closestEndPos) != DT_SUCCESS)
-		return DT_FAILURE;
+	stat = appendVertex(closestStartPos, DT_STRAIGHTPATH_START, path[0],
+						straightPath, straightPathFlags, straightPathRefs,
+						straightPathCount, maxStraightPath);
+	if (stat != DT_IN_PROGRESS)
+		return stat;
 	
 	if (pathSize > 1)
 	{
@@ -1152,19 +1700,30 @@ dtStatus dtNavMeshQuery::findStraightPath(const float* startPos, const float* en
 			if (i+1 < pathSize)
 			{
 				// Next portal.
-				if (getPortalPoints(path[i], path[i+1], left, right, fromType, toType) != DT_SUCCESS)
+				if (dtStatusFailed(getPortalPoints(path[i], path[i+1], left, right, fromType, toType)))
 				{
-					if (closestPointOnPolyBoundary(path[i], endPos, closestEndPos) != DT_SUCCESS)
-						return DT_FAILURE;
+					// Failed to get portal points, in practice this means that path[i+1] is invalid polygon.
+					// Clamp the end point to path[i], and return the path so far.
 					
-					dtVcopy(&straightPath[n*3], closestEndPos);
-					if (straightPathFlags)
-						straightPathFlags[n] = 0;
-					if (straightPathRefs)
-						straightPathRefs[n] = path[i];
-					n++;
+					if (dtStatusFailed(closestPointOnPolyBoundary(path[i], endPos, closestEndPos)))
+					{
+						// This should only happen when the first polygon is invalid.
+						return DT_FAILURE | DT_INVALID_PARAM;
+					}
+
+					// Apeend portals along the current straight path segment.
+					if (options & (DT_STRAIGHTPATH_AREA_CROSSINGS | DT_STRAIGHTPATH_ALL_CROSSINGS))
+					{
+						stat = appendPortals(apexIndex, i, closestEndPos, path,
+											 straightPath, straightPathFlags, straightPathRefs,
+											 straightPathCount, maxStraightPath, options);
+					}
+
+					stat = appendVertex(closestEndPos, 0, path[i],
+										straightPath, straightPathFlags, straightPathRefs,
+										straightPathCount, maxStraightPath);
 					
-					return DT_SUCCESS;
+					return DT_SUCCESS | DT_PARTIAL_RESULT | ((*straightPathCount >= maxStraightPath) ? DT_BUFFER_TOO_SMALL : 0);
 				}
 				
 				// If starting really close the portal, advance.
@@ -1196,6 +1755,16 @@ dtStatus dtNavMeshQuery::findStraightPath(const float* startPos, const float* en
 				}
 				else
 				{
+					// Append portals along the current straight path segment.
+					if (options & (DT_STRAIGHTPATH_AREA_CROSSINGS | DT_STRAIGHTPATH_ALL_CROSSINGS))
+					{
+						stat = appendPortals(apexIndex, leftIndex, portalLeft, path,
+											 straightPath, straightPathFlags, straightPathRefs,
+											 straightPathCount, maxStraightPath, options);
+						if (stat != DT_IN_PROGRESS)
+							return stat;					
+					}
+				
 					dtVcopy(portalApex, portalLeft);
 					apexIndex = leftIndex;
 					
@@ -1206,30 +1775,12 @@ dtStatus dtNavMeshQuery::findStraightPath(const float* startPos, const float* en
 						flags = DT_STRAIGHTPATH_OFFMESH_CONNECTION;
 					dtPolyRef ref = leftPolyRef;
 					
-					if (!dtVequal(&straightPath[(n-1)*3], portalApex))
-					{
-						// Append new vertex.
-						dtVcopy(&straightPath[n*3], portalApex);
-						if (straightPathFlags)
-							straightPathFlags[n] = flags;
-						if (straightPathRefs)
-							straightPathRefs[n] = ref;
-						n++;
-						// If reached end of path or there is no space to append more vertices, return.
-						if (flags == DT_STRAIGHTPATH_END || n >= maxStraightPath)
-						{
-							*straightPathCount = n;
-							return DT_SUCCESS;
-						}
-					}
-					else
-					{
-						// The vertices are equal, update flags and poly.
-						if (straightPathFlags)
-							straightPathFlags[n-1] = flags;
-						if (straightPathRefs)
-							straightPathRefs[n-1] = ref;
-					}
+					// Append or update vertex
+					stat = appendVertex(portalApex, flags, ref,
+										straightPath, straightPathFlags, straightPathRefs,
+										straightPathCount, maxStraightPath);
+					if (stat != DT_IN_PROGRESS)
+						return stat;
 					
 					dtVcopy(portalLeft, portalApex);
 					dtVcopy(portalRight, portalApex);
@@ -1255,6 +1806,16 @@ dtStatus dtNavMeshQuery::findStraightPath(const float* startPos, const float* en
 				}
 				else
 				{
+					// Append portals along the current straight path segment.
+					if (options & (DT_STRAIGHTPATH_AREA_CROSSINGS | DT_STRAIGHTPATH_ALL_CROSSINGS))
+					{
+						stat = appendPortals(apexIndex, rightIndex, portalRight, path,
+											 straightPath, straightPathFlags, straightPathRefs,
+											 straightPathCount, maxStraightPath, options);
+						if (stat != DT_IN_PROGRESS)
+							return stat;
+					}
+
 					dtVcopy(portalApex, portalRight);
 					apexIndex = rightIndex;
 					
@@ -1264,31 +1825,13 @@ dtStatus dtNavMeshQuery::findStraightPath(const float* startPos, const float* en
 					else if (rightPolyType == DT_POLYTYPE_OFFMESH_CONNECTION)
 						flags = DT_STRAIGHTPATH_OFFMESH_CONNECTION;
 					dtPolyRef ref = rightPolyRef;
-					
-					if (!dtVequal(&straightPath[(n-1)*3], portalApex))
-					{
-						// Append new vertex.
-						dtVcopy(&straightPath[n*3], portalApex);
-						if (straightPathFlags)
-							straightPathFlags[n] = flags;
-						if (straightPathRefs)
-							straightPathRefs[n] = ref;
-						n++;
-						// If reached end of path or there is no space to append more vertices, return.
-						if (flags == DT_STRAIGHTPATH_END || n >= maxStraightPath)
-						{
-							*straightPathCount = n;
-							return DT_SUCCESS;
-						}
-					}
-					else
-					{
-						// The vertices are equal, update flags and poly.
-						if (straightPathFlags)
-							straightPathFlags[n-1] = flags;
-						if (straightPathRefs)
-							straightPathRefs[n-1] = ref;
-					}
+
+					// Append or update vertex
+					stat = appendVertex(portalApex, flags, ref,
+										straightPath, straightPathFlags, straightPathRefs,
+										straightPathCount, maxStraightPath);
+					if (stat != DT_IN_PROGRESS)
+						return stat;
 					
 					dtVcopy(portalLeft, portalApex);
 					dtVcopy(portalRight, portalApex);
@@ -1302,27 +1845,45 @@ dtStatus dtNavMeshQuery::findStraightPath(const float* startPos, const float* en
 				}
 			}
 		}
+
+		// Append portals along the current straight path segment.
+		if (options & (DT_STRAIGHTPATH_AREA_CROSSINGS | DT_STRAIGHTPATH_ALL_CROSSINGS))
+		{
+			stat = appendPortals(apexIndex, pathSize-1, closestEndPos, path,
+								 straightPath, straightPathFlags, straightPathRefs,
+								 straightPathCount, maxStraightPath, options);
+			if (stat != DT_IN_PROGRESS)
+				return stat;
+		}
 	}
+
+	stat = appendVertex(closestEndPos, DT_STRAIGHTPATH_END, 0,
+						straightPath, straightPathFlags, straightPathRefs,
+						straightPathCount, maxStraightPath);
 	
-	// If the point already exists, remove it and add reappend the actual end location.  
-	if (n > 0 && dtVequal(&straightPath[(n-1)*3], closestEndPos))
-		n--;
-	
-	// Add end point.
-	if (n < maxStraightPath)
-	{
-		dtVcopy(&straightPath[n*3], closestEndPos);
-		if (straightPathFlags)
-			straightPathFlags[n] = DT_STRAIGHTPATH_END;
-		if (straightPathRefs)
-			straightPathRefs[n] = 0;
-		n++;
-	}
-	
-	*straightPathCount = n;
-	return DT_SUCCESS;
+	return DT_SUCCESS | ((*straightPathCount >= maxStraightPath) ? DT_BUFFER_TOO_SMALL : 0);
 }
 
+/// @par
+///
+/// This method is optimized for small delta movement and a small number of 
+/// polygons. If used for too great a distance, the result set will form an 
+/// incomplete path.
+///
+/// @p resultPos will equal the @p endPos if the end is reached. 
+/// Otherwise the closest reachable position will be returned.
+/// 
+/// @p resultPos is not projected onto the surface of the navigation 
+/// mesh. Use #getPolyHeight if this is needed.
+///
+/// This method treats the end position in the same manner as 
+/// the #raycast method. (As a 2D point.) See that method's documentation 
+/// for details.
+/// 
+/// If the @p visited array is too small to hold the entire result set, it will 
+/// be filled as far as possible from the start position toward the end 
+/// position.
+///
 dtStatus dtNavMeshQuery::moveAlongSurface(dtPolyRef startRef, const float* startPos, const float* endPos,
 										  const dtQueryFilter* filter,
 										  float* resultPos, dtPolyRef* visited, int* visitedCount, const int maxVisitedSize) const
@@ -1333,8 +1894,12 @@ dtStatus dtNavMeshQuery::moveAlongSurface(dtPolyRef startRef, const float* start
 	*visitedCount = 0;
 	
 	// Validate input
-	if (!startRef) return DT_FAILURE;
-	if (!m_nav->isValidPolyRef(startRef)) return DT_FAILURE;
+	if (!startRef)
+		return DT_FAILURE | DT_INVALID_PARAM;
+	if (!m_nav->isValidPolyRef(startRef))
+		return DT_FAILURE | DT_INVALID_PARAM;
+	
+	dtStatus status = DT_SUCCESS;
 	
 	static const int MAX_STACK = 48;
 	dtNode* stack[MAX_STACK];
@@ -1499,16 +2064,21 @@ dtStatus dtNavMeshQuery::moveAlongSurface(dtPolyRef startRef, const float* start
 		do
 		{
 			visited[n++] = node->id;
+			if (n >= maxVisitedSize)
+			{
+				status |= DT_BUFFER_TOO_SMALL;
+				break;
+			}
 			node = m_tinyNodePool->getNodeAtIdx(node->pidx);
 		}
-		while (node && n < maxVisitedSize);
+		while (node);
 	}
 	
 	dtVcopy(resultPos, bestPos);
 	
 	*visitedCount = n;
 	
-	return DT_SUCCESS;
+	return status;
 }
 
 
@@ -1519,14 +2089,14 @@ dtStatus dtNavMeshQuery::getPortalPoints(dtPolyRef from, dtPolyRef to, float* le
 	
 	const dtMeshTile* fromTile = 0;
 	const dtPoly* fromPoly = 0;
-	if (m_nav->getTileAndPolyByRef(from, &fromTile, &fromPoly) != DT_SUCCESS)
-		return DT_FAILURE;
+	if (dtStatusFailed(m_nav->getTileAndPolyByRef(from, &fromTile, &fromPoly)))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	fromType = fromPoly->getType();
 
 	const dtMeshTile* toTile = 0;
 	const dtPoly* toPoly = 0;
-	if (m_nav->getTileAndPolyByRef(to, &toTile, &toPoly) != DT_SUCCESS)
-		return DT_FAILURE;
+	if (dtStatusFailed(m_nav->getTileAndPolyByRef(to, &toTile, &toPoly)))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	toType = toPoly->getType();
 		
 	return getPortalPoints(from, fromPoly, fromTile, to, toPoly, toTile, left, right);
@@ -1548,7 +2118,7 @@ dtStatus dtNavMeshQuery::getPortalPoints(dtPolyRef from, const dtPoly* fromPoly,
 		}
 	}
 	if (!link)
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	// Handle off-mesh connections.
 	if (fromPoly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
@@ -1564,7 +2134,7 @@ dtStatus dtNavMeshQuery::getPortalPoints(dtPolyRef from, const dtPoly* fromPoly,
 				return DT_SUCCESS;
 			}
 		}
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	}
 	
 	if (toPoly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
@@ -1579,7 +2149,7 @@ dtStatus dtNavMeshQuery::getPortalPoints(dtPolyRef from, const dtPoly* fromPoly,
 				return DT_SUCCESS;
 			}
 		}
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	}
 	
 	// Find portal vertices.
@@ -1611,7 +2181,8 @@ dtStatus dtNavMeshQuery::getEdgeMidPoint(dtPolyRef from, dtPolyRef to, float* mi
 {
 	float left[3], right[3];
 	unsigned char fromType, toType;
-	if (!getPortalPoints(from, to, left,right, fromType, toType)) return DT_FAILURE;
+	if (dtStatusFailed(getPortalPoints(from, to, left,right, fromType, toType)))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	mid[0] = (left[0]+right[0])*0.5f;
 	mid[1] = (left[1]+right[1])*0.5f;
 	mid[2] = (left[2]+right[2])*0.5f;
@@ -1623,14 +2194,52 @@ dtStatus dtNavMeshQuery::getEdgeMidPoint(dtPolyRef from, const dtPoly* fromPoly,
 										 float* mid) const
 {
 	float left[3], right[3];
-	if (getPortalPoints(from, fromPoly, fromTile, to, toPoly, toTile, left, right) != DT_SUCCESS)
-		return DT_FAILURE;
+	if (dtStatusFailed(getPortalPoints(from, fromPoly, fromTile, to, toPoly, toTile, left, right)))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	mid[0] = (left[0]+right[0])*0.5f;
 	mid[1] = (left[1]+right[1])*0.5f;
 	mid[2] = (left[2]+right[2])*0.5f;
 	return DT_SUCCESS;
 }
 
+/// @par
+///
+/// This method is meant to be used for quick, short distance checks.
+///
+/// If the path array is too small to hold the result, it will be filled as 
+/// far as possible from the start postion toward the end position.
+///
+/// <b>Using the Hit Parameter (t)</b>
+/// 
+/// If the hit parameter is a very high value (FLT_MAX), then the ray has hit 
+/// the end position. In this case the path represents a valid corridor to the 
+/// end position and the value of @p hitNormal is undefined.
+///
+/// If the hit parameter is zero, then the start position is on the wall that 
+/// was hit and the value of @p hitNormal is undefined.
+///
+/// If 0 < t < 1.0 then the following applies:
+///
+/// @code
+/// distanceToHitBorder = distanceToEndPosition * t
+/// hitPoint = startPos + (endPos - startPos) * t
+/// @endcode
+///
+/// <b>Use Case Restriction</b>
+///
+/// The raycast ignores the y-value of the end position. (2D check.) This 
+/// places significant limits on how it can be used. For example:
+///
+/// Consider a scene where there is a main floor with a second floor balcony 
+/// that hangs over the main floor. So the first floor mesh extends below the 
+/// balcony mesh. The start position is somewhere on the first floor. The end 
+/// position is on the balcony.
+///
+/// The raycast will search toward the end position along the first floor mesh. 
+/// If it reaches the end position's xz-coordinates it will indicate FLT_MAX
+/// (no wall hit), meaning it reached the end position. This is one example of why
+/// this method is meant for short distance checks.
+///
 dtStatus dtNavMeshQuery::raycast(dtPolyRef startRef, const float* startPos, const float* endPos,
 								 const dtQueryFilter* filter,
 								 float* t, float* hitNormal, dtPolyRef* path, int* pathCount, const int maxPath) const
@@ -1643,7 +2252,7 @@ dtStatus dtNavMeshQuery::raycast(dtPolyRef startRef, const float* startPos, cons
 	
 	// Validate input
 	if (!startRef || !m_nav->isValidPolyRef(startRef))
-		return DT_FAILURE;
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	dtPolyRef curRef = startRef;
 	float verts[DT_VERTS_PER_POLYGON*3];	
@@ -1653,6 +2262,8 @@ dtStatus dtNavMeshQuery::raycast(dtPolyRef startRef, const float* startPos, cons
 	hitNormal[1] = 0;
 	hitNormal[2] = 0;
 	
+	dtStatus status = DT_SUCCESS;
+	
 	while (curRef)
 	{
 		// Cast ray against current polygon.
@@ -1677,7 +2288,7 @@ dtStatus dtNavMeshQuery::raycast(dtPolyRef startRef, const float* startPos, cons
 			// Could not hit the polygon, keep the old t and report hit.
 			if (pathCount)
 				*pathCount = n;
-			return DT_SUCCESS;
+			return status;
 		}
 		// Keep track of furthest t so far.
 		if (tmax > *t)
@@ -1686,6 +2297,8 @@ dtStatus dtNavMeshQuery::raycast(dtPolyRef startRef, const float* startPos, cons
 		// Store visited polygons.
 		if (n < maxPath)
 			path[n++] = curRef;
+		else
+			status |= DT_BUFFER_TOO_SMALL;
 		
 		// Ray end is completely inside the polygon.
 		if (segMax == -1)
@@ -1693,7 +2306,7 @@ dtStatus dtNavMeshQuery::raycast(dtPolyRef startRef, const float* startPos, cons
 			*t = FLT_MAX;
 			if (pathCount)
 				*pathCount = n;
-			return DT_SUCCESS;
+			return status;
 		}
 		
 		// Follow neighbours.
@@ -1795,7 +2408,7 @@ dtStatus dtNavMeshQuery::raycast(dtPolyRef startRef, const float* startPos, cons
 			
 			if (pathCount)
 				*pathCount = n;
-			return DT_SUCCESS;
+			return status;
 		}
 		
 		// No hit, advance to neighbour polygon.
@@ -1805,9 +2418,38 @@ dtStatus dtNavMeshQuery::raycast(dtPolyRef startRef, const float* startPos, cons
 	if (pathCount)
 		*pathCount = n;
 	
-	return DT_SUCCESS;
+	return status;
 }
 
+/// @par
+///
+/// At least one result array must be provided.
+///
+/// The order of the result set is from least to highest cost to reach the polygon.
+///
+/// A common use case for this method is to perform Dijkstra searches. 
+/// Candidate polygons are found by searching the graph beginning at the start polygon.
+///
+/// If a polygon is not found via the graph search, even if it intersects the 
+/// search circle, it will not be included in the result set. For example:
+///
+/// polyA is the start polygon.
+/// polyB shares an edge with polyA. (Is adjacent.)
+/// polyC shares an edge with polyB, but not with polyA
+/// Even if the search circle overlaps polyC, it will not be included in the 
+/// result set unless polyB is also in the set.
+/// 
+/// The value of the center point is used as the start position for cost 
+/// calculations. It is not projected onto the surface of the mesh, so its 
+/// y-value will effect the costs.
+///
+/// Intersection tests occur in 2D. All polygons and the search circle are 
+/// projected onto the xz-plane. So the y-value of the center point does not 
+/// effect intersection tests.
+///
+/// If the result arrays are to small to hold the entire result set, they will be 
+/// filled to capacity.
+/// 
 dtStatus dtNavMeshQuery::findPolysAroundCircle(dtPolyRef startRef, const float* centerPos, const float radius,
 											   const dtQueryFilter* filter,
 											   dtPolyRef* resultRef, dtPolyRef* resultParent, float* resultCost,
@@ -1820,8 +2462,8 @@ dtStatus dtNavMeshQuery::findPolysAroundCircle(dtPolyRef startRef, const float*
 	*resultCount = 0;
 	
 	// Validate input
-	if (!startRef) return DT_FAILURE;
-	if (!m_nav->isValidPolyRef(startRef)) return DT_FAILURE;
+	if (!startRef || !m_nav->isValidPolyRef(startRef))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	m_nodePool->clear();
 	m_openList->clear();
@@ -1835,6 +2477,8 @@ dtStatus dtNavMeshQuery::findPolysAroundCircle(dtPolyRef startRef, const float*
 	startNode->flags = DT_NODE_OPEN;
 	m_openList->push(startNode);
 	
+	dtStatus status = DT_SUCCESS;
+	
 	int n = 0;
 	if (n < maxResult)
 	{
@@ -1846,6 +2490,10 @@ dtStatus dtNavMeshQuery::findPolysAroundCircle(dtPolyRef startRef, const float*
 			resultCost[n] = 0;
 		++n;
 	}
+	else
+	{
+		status |= DT_BUFFER_TOO_SMALL;
+	}
 	
 	const float radiusSqr = dtSqr(radius);
 	
@@ -1901,7 +2549,10 @@ dtStatus dtNavMeshQuery::findPolysAroundCircle(dtPolyRef startRef, const float*
 			
 			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef);
 			if (!neighbourNode)
+			{
+				status |= DT_OUT_OF_NODES;
 				continue;
+			}
 				
 			if (neighbourNode->flags & DT_NODE_CLOSED)
 				continue;
@@ -1917,7 +2568,7 @@ dtStatus dtNavMeshQuery::findPolysAroundCircle(dtPolyRef startRef, const float*
 				continue;
 			
 			neighbourNode->id = neighbourRef;
-			neighbourNode->flags &= ~DT_NODE_CLOSED;
+			neighbourNode->flags = (neighbourNode->flags & ~DT_NODE_CLOSED);
 			neighbourNode->pidx = m_nodePool->getNodeIdx(bestNode);
 			neighbourNode->total = total;
 			
@@ -1937,6 +2588,10 @@ dtStatus dtNavMeshQuery::findPolysAroundCircle(dtPolyRef startRef, const float*
 						resultCost[n] = neighbourNode->total;
 					++n;
 				}
+				else
+				{
+					status |= DT_BUFFER_TOO_SMALL;
+				}
 				neighbourNode->flags = DT_NODE_OPEN;
 				m_openList->push(neighbourNode);
 			}
@@ -1945,9 +2600,31 @@ dtStatus dtNavMeshQuery::findPolysAroundCircle(dtPolyRef startRef, const float*
 	
 	*resultCount = n;
 	
-	return DT_SUCCESS;
+	return status;
 }
 
+/// @par
+///
+/// The order of the result set is from least to highest cost.
+/// 
+/// At least one result array must be provided.
+///
+/// A common use case for this method is to perform Dijkstra searches. 
+/// Candidate polygons are found by searching the graph beginning at the start 
+/// polygon.
+/// 
+/// The same intersection test restrictions that apply to findPolysAroundCircle()
+/// method apply to this method.
+/// 
+/// The 3D centroid of the search polygon is used as the start position for cost 
+/// calculations.
+/// 
+/// Intersection tests occur in 2D. All polygons are projected onto the 
+/// xz-plane. So the y-values of the vertices do not effect intersection tests.
+/// 
+/// If the result arrays are is too small to hold the entire result set, they will 
+/// be filled to capacity.
+///
 dtStatus dtNavMeshQuery::findPolysAroundShape(dtPolyRef startRef, const float* verts, const int nverts,
 											  const dtQueryFilter* filter,
 											  dtPolyRef* resultRef, dtPolyRef* resultParent, float* resultCost,
@@ -1960,8 +2637,8 @@ dtStatus dtNavMeshQuery::findPolysAroundShape(dtPolyRef startRef, const float* v
 	*resultCount = 0;
 	
 	// Validate input
-	if (!startRef) return DT_FAILURE;
-	if (!m_nav->isValidPolyRef(startRef)) return DT_FAILURE;
+	if (!startRef || !m_nav->isValidPolyRef(startRef))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	m_nodePool->clear();
 	m_openList->clear();
@@ -1980,6 +2657,8 @@ dtStatus dtNavMeshQuery::findPolysAroundShape(dtPolyRef startRef, const float* v
 	startNode->flags = DT_NODE_OPEN;
 	m_openList->push(startNode);
 	
+	dtStatus status = DT_SUCCESS;
+
 	int n = 0;
 	if (n < maxResult)
 	{
@@ -1991,6 +2670,10 @@ dtStatus dtNavMeshQuery::findPolysAroundShape(dtPolyRef startRef, const float* v
 			resultCost[n] = 0;
 		++n;
 	}
+	else
+	{
+		status |= DT_BUFFER_TOO_SMALL;
+	}
 	
 	while (!m_openList->empty())
 	{
@@ -2046,7 +2729,10 @@ dtStatus dtNavMeshQuery::findPolysAroundShape(dtPolyRef startRef, const float* v
 			
 			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef);
 			if (!neighbourNode)
+			{
+				status |= DT_OUT_OF_NODES;
 				continue;
+			}
 			
 			if (neighbourNode->flags & DT_NODE_CLOSED)
 				continue;
@@ -2062,7 +2748,7 @@ dtStatus dtNavMeshQuery::findPolysAroundShape(dtPolyRef startRef, const float* v
 				continue;
 			
 			neighbourNode->id = neighbourRef;
-			neighbourNode->flags &= ~DT_NODE_CLOSED;
+			neighbourNode->flags = (neighbourNode->flags & ~DT_NODE_CLOSED);
 			neighbourNode->pidx = m_nodePool->getNodeIdx(bestNode);
 			neighbourNode->total = total;
 			
@@ -2082,6 +2768,10 @@ dtStatus dtNavMeshQuery::findPolysAroundShape(dtPolyRef startRef, const float* v
 						resultCost[n] = neighbourNode->total;
 					++n;
 				}
+				else
+				{
+					status |= DT_BUFFER_TOO_SMALL;
+				}
 				neighbourNode->flags = DT_NODE_OPEN;
 				m_openList->push(neighbourNode);
 			}
@@ -2090,9 +2780,31 @@ dtStatus dtNavMeshQuery::findPolysAroundShape(dtPolyRef startRef, const float* v
 	
 	*resultCount = n;
 	
-	return DT_SUCCESS;
+	return status;
 }
 
+/// @par
+///
+/// This method is optimized for a small search radius and small number of result 
+/// polygons.
+///
+/// Candidate polygons are found by searching the navigation graph beginning at 
+/// the start polygon.
+///
+/// The same intersection test restrictions that apply to the findPolysAroundCircle 
+/// mehtod applies to this method.
+///
+/// The value of the center point is used as the start point for cost calculations. 
+/// It is not projected onto the surface of the mesh, so its y-value will effect 
+/// the costs.
+/// 
+/// Intersection tests occur in 2D. All polygons and the search circle are 
+/// projected onto the xz-plane. So the y-value of the center point does not 
+/// effect intersection tests.
+/// 
+/// If the result arrays are is too small to hold the entire result set, they will 
+/// be filled to capacity.
+/// 
 dtStatus dtNavMeshQuery::findLocalNeighbourhood(dtPolyRef startRef, const float* centerPos, const float radius,
 												const dtQueryFilter* filter,
 												dtPolyRef* resultRef, dtPolyRef* resultParent,
@@ -2104,8 +2816,8 @@ dtStatus dtNavMeshQuery::findLocalNeighbourhood(dtPolyRef startRef, const float*
 	*resultCount = 0;
 
 	// Validate input
-	if (!startRef) return DT_FAILURE;
-	if (!m_nav->isValidPolyRef(startRef)) return DT_FAILURE;
+	if (!startRef || !m_nav->isValidPolyRef(startRef))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	static const int MAX_STACK = 48;
 	dtNode* stack[MAX_STACK];
@@ -2124,6 +2836,8 @@ dtStatus dtNavMeshQuery::findLocalNeighbourhood(dtPolyRef startRef, const float*
 	float pa[DT_VERTS_PER_POLYGON*3];
 	float pb[DT_VERTS_PER_POLYGON*3];
 	
+	dtStatus status = DT_SUCCESS;
+	
 	int n = 0;
 	if (n < maxResult)
 	{
@@ -2132,6 +2846,10 @@ dtStatus dtNavMeshQuery::findLocalNeighbourhood(dtPolyRef startRef, const float*
 			resultParent[n] = 0;
 		++n;
 	}
+	else
+	{
+		status |= DT_BUFFER_TOO_SMALL;
+	}
 	
 	while (nstack)
 	{
@@ -2245,6 +2963,10 @@ dtStatus dtNavMeshQuery::findLocalNeighbourhood(dtPolyRef startRef, const float*
 					resultParent[n] = curRef;
 				++n;
 			}
+			else
+			{
+				status |= DT_BUFFER_TOO_SMALL;
+			}
 			
 			if (nstack < MAX_STACK)
 			{
@@ -2255,17 +2977,18 @@ dtStatus dtNavMeshQuery::findLocalNeighbourhood(dtPolyRef startRef, const float*
 	
 	*resultCount = n;
 	
-	return DT_SUCCESS;
+	return status;
 }
 
 
 struct dtSegInterval
 {
+	dtPolyRef ref;
 	short tmin, tmax;
 };
 
 static void insertInterval(dtSegInterval* ints, int& nints, const int maxInts,
-						   const short tmin, const short tmax)
+						   const short tmin, const short tmax, const dtPolyRef ref)
 {
 	if (nints+1 > maxInts) return;
 	// Find insertion point.
@@ -2280,13 +3003,26 @@ static void insertInterval(dtSegInterval* ints, int& nints, const int maxInts,
 	if (nints-idx)
 		memmove(ints+idx+1, ints+idx, sizeof(dtSegInterval)*(nints-idx));
 	// Store
+	ints[idx].ref = ref;
 	ints[idx].tmin = tmin;
 	ints[idx].tmax = tmax;
 	nints++;
 }
 
+/// @par
+///
+/// If the @p segmentRefs parameter is provided, then all polygon segments will be returned. 
+/// Otherwise only the wall segments are returned.
+/// 
+/// A segment that is normally a portal will be included in the result set as a 
+/// wall if the @p filter results in the neighbor polygon becoomming impassable.
+/// 
+/// The @p segmentVerts and @p segmentRefs buffers should normally be sized for the 
+/// maximum segments per polygon of the source navigation mesh.
+/// 
 dtStatus dtNavMeshQuery::getPolyWallSegments(dtPolyRef ref, const dtQueryFilter* filter,
-											 float* segments, int* segmentCount, const int maxSegments) const
+											 float* segmentVerts, dtPolyRef* segmentRefs, int* segmentCount,
+											 const int maxSegments) const
 {
 	dtAssert(m_nav);
 	
@@ -2294,14 +3030,18 @@ dtStatus dtNavMeshQuery::getPolyWallSegments(dtPolyRef ref, const dtQueryFilter*
 	
 	const dtMeshTile* tile = 0;
 	const dtPoly* poly = 0;
-	if (m_nav->getTileAndPolyByRef(ref, &tile, &poly) != DT_SUCCESS)
-		return DT_FAILURE;
+	if (dtStatusFailed(m_nav->getTileAndPolyByRef(ref, &tile, &poly)))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	int n = 0;
 	static const int MAX_INTERVAL = 16;
 	dtSegInterval ints[MAX_INTERVAL];
 	int nints;
 	
+	const bool storePortals = segmentRefs != 0;
+	
+	dtStatus status = DT_SUCCESS;
+	
 	for (int i = 0, j = (int)poly->vertCount-1; i < (int)poly->vertCount; j = i++)
 	{
 		// Skip non-solid edges.
@@ -2321,54 +3061,95 @@ dtStatus dtNavMeshQuery::getPolyWallSegments(dtPolyRef ref, const dtQueryFilter*
 						m_nav->getTileAndPolyByRefUnsafe(link->ref, &neiTile, &neiPoly);
 						if (filter->passFilter(link->ref, neiTile, neiPoly))
 						{
-							insertInterval(ints, nints, MAX_INTERVAL, link->bmin, link->bmax);
+							insertInterval(ints, nints, MAX_INTERVAL, link->bmin, link->bmax, link->ref);
 						}
 					}
 				}
 			}
 		}
-		else if (poly->neis[j])
+		else
 		{
 			// Internal edge
-			const unsigned int idx = (unsigned int)(poly->neis[j]-1);
-			const dtPolyRef ref = m_nav->getPolyRefBase(tile) | idx;
-			if (filter->passFilter(ref, tile, &tile->polys[idx]))
+			dtPolyRef neiRef = 0;
+			if (poly->neis[j])
+			{
+				const unsigned int idx = (unsigned int)(poly->neis[j]-1);
+				neiRef = m_nav->getPolyRefBase(tile) | idx;
+				if (!filter->passFilter(neiRef, tile, &tile->polys[idx]))
+					neiRef = 0;
+			}
+
+			// If the edge leads to another polygon and portals are not stored, skip.
+			if (neiRef != 0 && !storePortals)
 				continue;
+			
+			if (n < maxSegments)
+			{
+				const float* vj = &tile->verts[poly->verts[j]*3];
+				const float* vi = &tile->verts[poly->verts[i]*3];
+				float* seg = &segmentVerts[n*6];
+				dtVcopy(seg+0, vj);
+				dtVcopy(seg+3, vi);
+				if (segmentRefs)
+					segmentRefs[n] = neiRef;
+				n++;
+			}
+			else
+			{
+				status |= DT_BUFFER_TOO_SMALL;
+			}
+			
+			continue;
 		}
 		
 		// Add sentinels
-		insertInterval(ints, nints, MAX_INTERVAL, -1, 0);
-		insertInterval(ints, nints, MAX_INTERVAL, 255, 256);
+		insertInterval(ints, nints, MAX_INTERVAL, -1, 0, 0);
+		insertInterval(ints, nints, MAX_INTERVAL, 255, 256, 0);
 		
-		// Store segment.
+		// Store segments.
 		const float* vj = &tile->verts[poly->verts[j]*3];
 		const float* vi = &tile->verts[poly->verts[i]*3];
 		for (int k = 1; k < nints; ++k)
 		{
-			// Find the space inbetween the opening areas.
-			const int imin = ints[k-1].tmax;
-			const int imax = ints[k].tmin;
-			if (imin == imax) continue;
-			if (imin == 0 && imax == 255)
+			// Portal segment.
+			if (storePortals && ints[k].ref)
 			{
+				const float tmin = ints[k].tmin/255.0f; 
+				const float tmax = ints[k].tmax/255.0f; 
 				if (n < maxSegments)
 				{
-					float* seg = &segments[n*6];
+					float* seg = &segmentVerts[n*6];
+					dtVlerp(seg+0, vj,vi, tmin);
+					dtVlerp(seg+3, vj,vi, tmax);
+					if (segmentRefs)
+						segmentRefs[n] = ints[k].ref;
 					n++;
-					dtVcopy(seg+0, vj);
-					dtVcopy(seg+3, vi);
+				}
+				else
+				{
+					status |= DT_BUFFER_TOO_SMALL;
 				}
 			}
-			else
+
+			// Wall segment.
+			const int imin = ints[k-1].tmax;
+			const int imax = ints[k].tmin;
+			if (imin != imax)
 			{
 				const float tmin = imin/255.0f; 
 				const float tmax = imax/255.0f; 
 				if (n < maxSegments)
 				{
-					float* seg = &segments[n*6];
-					n++;
+					float* seg = &segmentVerts[n*6];
 					dtVlerp(seg+0, vj,vi, tmin);
 					dtVlerp(seg+3, vj,vi, tmax);
+					if (segmentRefs)
+						segmentRefs[n] = 0;
+					n++;
+				}
+				else
+				{
+					status |= DT_BUFFER_TOO_SMALL;
 				}
 			}
 		}
@@ -2376,9 +3157,19 @@ dtStatus dtNavMeshQuery::getPolyWallSegments(dtPolyRef ref, const dtQueryFilter*
 	
 	*segmentCount = n;
 	
-	return DT_SUCCESS;
+	return status;
 }
 
+/// @par
+///
+/// @p hitPos is not adjusted using the height detail data.
+///
+/// @p hitDist will equal the search radius if there is no wall within the 
+/// radius. In this case the values of @p hitPos and @p hitNormal are
+/// undefined.
+///
+/// The normal will become unpredicable if @p hitDist is a very small number.
+///
 dtStatus dtNavMeshQuery::findDistanceToWall(dtPolyRef startRef, const float* centerPos, const float maxRadius,
 											const dtQueryFilter* filter,
 											float* hitDist, float* hitPos, float* hitNormal) const
@@ -2388,8 +3179,8 @@ dtStatus dtNavMeshQuery::findDistanceToWall(dtPolyRef startRef, const float* cen
 	dtAssert(m_openList);
 	
 	// Validate input
-	if (!startRef) return DT_FAILURE;
-	if (!m_nav->isValidPolyRef(startRef)) return DT_FAILURE;
+	if (!startRef || !m_nav->isValidPolyRef(startRef))
+		return DT_FAILURE | DT_INVALID_PARAM;
 	
 	m_nodePool->clear();
 	m_openList->clear();
@@ -2405,6 +3196,8 @@ dtStatus dtNavMeshQuery::findDistanceToWall(dtPolyRef startRef, const float* cen
 	
 	float radiusSqr = dtSqr(maxRadius);
 	
+	dtStatus status = DT_SUCCESS;
+	
 	while (!m_openList->empty())
 	{
 		dtNode* bestNode = m_openList->pop();
@@ -2512,7 +3305,10 @@ dtStatus dtNavMeshQuery::findDistanceToWall(dtPolyRef startRef, const float* cen
 
 			dtNode* neighbourNode = m_nodePool->getNode(neighbourRef);
 			if (!neighbourNode)
+			{
+				status |= DT_OUT_OF_NODES;
 				continue;
+			}
 			
 			if (neighbourNode->flags & DT_NODE_CLOSED)
 				continue;
@@ -2531,7 +3327,7 @@ dtStatus dtNavMeshQuery::findDistanceToWall(dtPolyRef startRef, const float* cen
 				continue;
 			
 			neighbourNode->id = neighbourRef;
-			neighbourNode->flags &= ~DT_NODE_CLOSED;
+			neighbourNode->flags = (neighbourNode->flags & ~DT_NODE_CLOSED);
 			neighbourNode->pidx = m_nodePool->getNodeIdx(bestNode);
 			neighbourNode->total = total;
 				
@@ -2553,9 +3349,28 @@ dtStatus dtNavMeshQuery::findDistanceToWall(dtPolyRef startRef, const float* cen
 	
 	*hitDist = sqrtf(radiusSqr);
 	
-	return DT_SUCCESS;
+	return status;
+}
+
+bool dtNavMeshQuery::isValidPolyRef(dtPolyRef ref, const dtQueryFilter* filter) const
+{
+	const dtMeshTile* tile = 0;
+	const dtPoly* poly = 0;
+	dtStatus status = m_nav->getTileAndPolyByRef(ref, &tile, &poly);
+	// If cannot get polygon, assume it does not exists and boundary is invalid.
+	if (dtStatusFailed(status))
+		return false;
+	// If cannot pass filter, assume flags has changed and boundary is invalid.
+	if (!filter->passFilter(ref, tile, poly))
+		return false;
+	return true;
 }
 
+/// @par
+///
+/// The closed list is the list of polygons that were fully evaluated during 
+/// the last navigation graph search. (A* or Dijkstra)
+/// 
 bool dtNavMeshQuery::isInClosedList(dtPolyRef ref) const
 {
 	if (!m_nodePool) return false;
diff --git a/dep/recastnavigation/Detour/Source/DetourNode.cpp b/dep/recastnavigation/Detour/Source/DetourNode.cpp
index 0d1af837865..ea6717dc78b 100644
--- a/dep/recastnavigation/Detour/Source/DetourNode.cpp
+++ b/dep/recastnavigation/Detour/Source/DetourNode.cpp
@@ -24,6 +24,15 @@
 
 inline unsigned int dtHashRef(dtPolyRef a)
 {
+	/*a += ~(a<<15);
+	a ^=  (a>>10);
+	a +=  (a<<3);
+	a ^=  (a>>6);
+	a += ~(a<<11);
+	a ^=  (a>>16);
+	return (unsigned int)a;*/
+
+    // modified for CMaNGOS
     a = (~a) + (a << 18);
     a = a ^ (a >> 31);
     a = a * 21;
@@ -46,15 +55,15 @@ dtNodePool::dtNodePool(int maxNodes, int hashSize) :
 	dtAssert(m_maxNodes > 0);
 
 	m_nodes = (dtNode*)dtAlloc(sizeof(dtNode)*m_maxNodes, DT_ALLOC_PERM);
-	m_next = (unsigned short*)dtAlloc(sizeof(unsigned short)*m_maxNodes, DT_ALLOC_PERM);
-	m_first = (unsigned short*)dtAlloc(sizeof(unsigned short)*hashSize, DT_ALLOC_PERM);
+	m_next = (dtNodeIndex*)dtAlloc(sizeof(dtNodeIndex)*m_maxNodes, DT_ALLOC_PERM);
+	m_first = (dtNodeIndex*)dtAlloc(sizeof(dtNodeIndex)*hashSize, DT_ALLOC_PERM);
 
 	dtAssert(m_nodes);
 	dtAssert(m_next);
 	dtAssert(m_first);
 
-	memset(m_first, 0xff, sizeof(unsigned short)*m_hashSize);
-	memset(m_next, 0xff, sizeof(unsigned short)*m_maxNodes);
+	memset(m_first, 0xff, sizeof(dtNodeIndex)*m_hashSize);
+	memset(m_next, 0xff, sizeof(dtNodeIndex)*m_maxNodes);
 }
 
 dtNodePool::~dtNodePool()
@@ -66,14 +75,14 @@ dtNodePool::~dtNodePool()
 
 void dtNodePool::clear()
 {
-	memset(m_first, 0xff, sizeof(unsigned short)*m_hashSize);
+	memset(m_first, 0xff, sizeof(dtNodeIndex)*m_hashSize);
 	m_nodeCount = 0;
 }
 
 dtNode* dtNodePool::findNode(dtPolyRef id)
 {
 	unsigned int bucket = dtHashRef(id) & (m_hashSize-1);
-	unsigned short i = m_first[bucket];
+	dtNodeIndex i = m_first[bucket];
 	while (i != DT_NULL_IDX)
 	{
 		if (m_nodes[i].id == id)
@@ -86,7 +95,7 @@ dtNode* dtNodePool::findNode(dtPolyRef id)
 dtNode* dtNodePool::getNode(dtPolyRef id)
 {
 	unsigned int bucket = dtHashRef(id) & (m_hashSize-1);
-	unsigned short i = m_first[bucket];
+	dtNodeIndex i = m_first[bucket];
 	dtNode* node = 0;
 	while (i != DT_NULL_IDX)
 	{
@@ -98,7 +107,7 @@ dtNode* dtNodePool::getNode(dtPolyRef id)
 	if (m_nodeCount >= m_maxNodes)
 		return 0;
 	
-	i = (unsigned short)m_nodeCount;
+	i = (dtNodeIndex)m_nodeCount;
 	m_nodeCount++;
 	
 	// Init node
diff --git a/dep/recastnavigation/Detour/Source/DetourObstacleAvoidance.cpp b/dep/recastnavigation/Detour/Source/DetourObstacleAvoidance.cpp
deleted file mode 100644
index a255c9b3fd1..00000000000
--- a/dep/recastnavigation/Detour/Source/DetourObstacleAvoidance.cpp
+++ /dev/null
@@ -1,532 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "DetourObstacleAvoidance.h"
-#include "DetourCommon.h"
-#include "DetourAlloc.h"
-#include "DetourAssert.h"
-#include <string.h>
-#include <math.h>
-#include <float.h>
-#include <new>
-
-
-static int sweepCircleCircle(const float* c0, const float r0, const float* v,
-							 const float* c1, const float r1,
-							 float& tmin, float& tmax)
-{
-	static const float EPS = 0.0001f;
-	float s[3];
-	dtVsub(s,c1,c0);
-	float r = r0+r1;
-	float c = dtVdot2D(s,s) - r*r;
-	float a = dtVdot2D(v,v);
-	if (a < EPS) return 0;	// not moving
-	
-	// Overlap, calc time to exit.
-	float b = dtVdot2D(v,s);
-	float d = b*b - a*c;
-	if (d < 0.0f) return 0; // no intersection.
-	a = 1.0f / a;
-	const float rd = dtSqrt(d);
-	tmin = (b - rd) * a;
-	tmax = (b + rd) * a;
-	return 1;
-}
-
-static int isectRaySeg(const float* ap, const float* u,
-					   const float* bp, const float* bq,
-					   float& t)
-{
-	float v[3], w[3];
-	dtVsub(v,bq,bp);
-	dtVsub(w,ap,bp);
-	float d = dtVperp2D(u,v);
-	if (fabsf(d) < 1e-6f) return 0;
-	d = 1.0f/d;
-	t = dtVperp2D(v,w) * d;
-	if (t < 0 || t > 1) return 0;
-	float s = dtVperp2D(u,w) * d;
-	if (s < 0 || s > 1) return 0;
-	return 1;
-}
-
-
-
-dtObstacleAvoidanceDebugData* dtAllocObstacleAvoidanceDebugData()
-{
-	void* mem = dtAlloc(sizeof(dtObstacleAvoidanceDebugData), DT_ALLOC_PERM);
-	if (!mem) return 0;
-	return new(mem) dtObstacleAvoidanceDebugData;
-}
-
-void dtFreeObstacleAvoidanceDebugData(dtObstacleAvoidanceDebugData* ptr)
-{
-	if (!ptr) return;
-	ptr->~dtObstacleAvoidanceDebugData();
-	dtFree(ptr);
-}
-
-
-dtObstacleAvoidanceDebugData::dtObstacleAvoidanceDebugData() :
-	m_nsamples(0),
-	m_maxSamples(0),
-	m_vel(0),
-	m_ssize(0),
-	m_pen(0),
-	m_vpen(0),
-	m_vcpen(0),
-	m_spen(0),
-	m_tpen(0)
-{
-}
-
-dtObstacleAvoidanceDebugData::~dtObstacleAvoidanceDebugData()
-{
-	dtFree(m_vel);
-	dtFree(m_ssize);
-	dtFree(m_pen);
-	dtFree(m_vpen);
-	dtFree(m_vcpen);
-	dtFree(m_spen);
-	dtFree(m_tpen);
-}
-		
-bool dtObstacleAvoidanceDebugData::init(const int maxSamples)
-{
-	dtAssert(maxSamples);
-	m_maxSamples = maxSamples;
-
-	m_vel = (float*)dtAlloc(sizeof(float)*3*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_vel)
-		return false;
-	m_pen = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_pen)
-		return false;
-	m_ssize = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_ssize)
-		return false;
-	m_vpen = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_vpen)
-		return false;
-	m_vcpen = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_vcpen)
-		return false;
-	m_spen = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_spen)
-		return false;
-	m_tpen = (float*)dtAlloc(sizeof(float)*m_maxSamples, DT_ALLOC_PERM);
-	if (!m_tpen)
-		return false;
-	
-	return true;
-}
-
-void dtObstacleAvoidanceDebugData::reset()
-{
-	m_nsamples = 0;
-}
-
-void dtObstacleAvoidanceDebugData::addSample(const float* vel, const float ssize, const float pen,
-											 const float vpen, const float vcpen, const float spen, const float tpen)
-{
-	if (m_nsamples >= m_maxSamples)
-		return;
-	dtAssert(m_vel);
-	dtAssert(m_ssize);
-	dtAssert(m_pen);
-	dtAssert(m_vpen);
-	dtAssert(m_vcpen);
-	dtAssert(m_spen);
-	dtAssert(m_tpen);
-	dtVcopy(&m_vel[m_nsamples*3], vel);
-	m_ssize[m_nsamples] = ssize;
-	m_pen[m_nsamples] = pen;
-	m_vpen[m_nsamples] = vpen;
-	m_vcpen[m_nsamples] = vcpen;
-	m_spen[m_nsamples] = spen;
-	m_tpen[m_nsamples] = tpen;
-	m_nsamples++;
-}
-
-static void normalizeArray(float* arr, const int n)
-{
-	// Normalize penaly range.
-	float minPen = FLT_MAX;
-	float maxPen = -FLT_MAX;
-	for (int i = 0; i < n; ++i)
-	{
-		minPen = dtMin(minPen, arr[i]);
-		maxPen = dtMax(maxPen, arr[i]);
-	}
-	const float penRange = maxPen-minPen;
-	const float s = penRange > 0.001f ? (1.0f / penRange) : 1;
-	for (int i = 0; i < n; ++i)
-		arr[i] = dtClamp((arr[i]-minPen)*s, 0.0f, 1.0f);
-}
-
-void dtObstacleAvoidanceDebugData::normalizeSamples()
-{
-	normalizeArray(m_pen, m_nsamples);
-	normalizeArray(m_vpen, m_nsamples);
-	normalizeArray(m_vcpen, m_nsamples);
-	normalizeArray(m_spen, m_nsamples);
-	normalizeArray(m_tpen, m_nsamples);
-}
-
-
-dtObstacleAvoidanceQuery* dtAllocObstacleAvoidanceQuery()
-{
-	void* mem = dtAlloc(sizeof(dtObstacleAvoidanceQuery), DT_ALLOC_PERM);
-	if (!mem) return 0;
-	return new(mem) dtObstacleAvoidanceQuery;
-}
-
-void dtFreeObstacleAvoidanceQuery(dtObstacleAvoidanceQuery* ptr)
-{
-	if (!ptr) return;
-	ptr->~dtObstacleAvoidanceQuery();
-	dtFree(ptr);
-}
-
-
-dtObstacleAvoidanceQuery::dtObstacleAvoidanceQuery() :
-	m_velBias(0.0f),
-	m_weightDesVel(0.0f),
-	m_weightCurVel(0.0f),
-	m_weightSide(0.0f),
-	m_weightToi(0.0f),
-	m_horizTime(0.0f),
-	m_maxCircles(0),
-	m_circles(0),
-	m_ncircles(0),
-	m_maxSegments(0),
-	m_segments(0),
-	m_nsegments(0)
-{
-}
-
-dtObstacleAvoidanceQuery::~dtObstacleAvoidanceQuery()
-{
-	dtFree(m_circles);
-	dtFree(m_segments);
-}
-
-bool dtObstacleAvoidanceQuery::init(const int maxCircles, const int maxSegments)
-{
-	m_maxCircles = maxCircles;
-	m_ncircles = 0;
-	m_circles = (dtObstacleCircle*)dtAlloc(sizeof(dtObstacleCircle)*m_maxCircles, DT_ALLOC_PERM);
-	if (!m_circles)
-		return false;
-	memset(m_circles, 0, sizeof(dtObstacleCircle)*m_maxCircles);
-
-	m_maxSegments = maxSegments;
-	m_nsegments = 0;
-	m_segments = (dtObstacleSegment*)dtAlloc(sizeof(dtObstacleSegment)*m_maxSegments, DT_ALLOC_PERM);
-	if (!m_segments)
-		return false;
-	memset(m_segments, 0, sizeof(dtObstacleSegment)*m_maxSegments);
-	
-	return true;
-}
-
-void dtObstacleAvoidanceQuery::reset()
-{
-	m_ncircles = 0;
-	m_nsegments = 0;
-}
-
-void dtObstacleAvoidanceQuery::addCircle(const float* pos, const float rad,
-										 const float* vel, const float* dvel)
-{
-	if (m_ncircles >= m_maxCircles)
-		return;
-		
-	dtObstacleCircle* cir = &m_circles[m_ncircles++];
-	dtVcopy(cir->p, pos);
-	cir->rad = rad;
-	dtVcopy(cir->vel, vel);
-	dtVcopy(cir->dvel, dvel);
-}
-
-void dtObstacleAvoidanceQuery::addSegment(const float* p, const float* q)
-{
-	if (m_nsegments > m_maxSegments)
-		return;
-	
-	dtObstacleSegment* seg = &m_segments[m_nsegments++];
-	dtVcopy(seg->p, p);
-	dtVcopy(seg->q, q);
-}
-
-void dtObstacleAvoidanceQuery::prepare(const float* pos, const float* dvel)
-{
-	// Prepare obstacles
-	for (int i = 0; i < m_ncircles; ++i)
-	{
-		dtObstacleCircle* cir = &m_circles[i];
-		
-		// Side
-		const float* pa = pos;
-		const float* pb = cir->p;
-		
-		const float orig[3] = {0,0};
-		float dv[3];
-		dtVsub(cir->dp,pb,pa);
-		dtVnormalize(cir->dp);
-		dtVsub(dv, cir->dvel, dvel);
-		
-		const float a = dtTriArea2D(orig, cir->dp,dv);
-		if (a < 0.01f)
-		{
-			cir->np[0] = -cir->dp[2];
-			cir->np[2] = cir->dp[0];
-		}
-		else
-		{
-			cir->np[0] = cir->dp[2];
-			cir->np[2] = -cir->dp[0];
-		}
-	}	
-
-	for (int i = 0; i < m_nsegments; ++i)
-	{
-		dtObstacleSegment* seg = &m_segments[i];
-		
-		// Precalc if the agent is really close to the segment.
-		const float r = 0.01f;
-		float t;
-		seg->touch = dtDistancePtSegSqr2D(pos, seg->p, seg->q, t) < dtSqr(r);
-	}	
-}
-
-float dtObstacleAvoidanceQuery::processSample(const float* vcand, const float cs,
-											  const float* pos, const float rad,
-											  const float vmax, const float* vel, const float* dvel,
-											  dtObstacleAvoidanceDebugData* debug)
-{
-	// Find min time of impact and exit amongst all obstacles.
-	float tmin = m_horizTime;
-	float side = 0;
-	int nside = 0;
-	
-	for (int i = 0; i < m_ncircles; ++i)
-	{
-		const dtObstacleCircle* cir = &m_circles[i];
-			
-		// RVO
-		float vab[3];
-		dtVscale(vab, vcand, 2);
-		dtVsub(vab, vab, vel);
-		dtVsub(vab, vab, cir->vel);
-		
-		// Side
-		side += dtClamp(dtMin(dtVdot2D(cir->dp,vab)*0.5f+0.5f, dtVdot2D(cir->np,vab)*2), 0.0f, 1.0f);
-		nside++;
-		
-		float htmin = 0, htmax = 0;
-		if (!sweepCircleCircle(pos,rad, vab, cir->p,cir->rad, htmin, htmax))
-			continue;
-		
-		// Handle overlapping obstacles.
-		if (htmin < 0.0f && htmax > 0.0f)
-		{
-			// Avoid more when overlapped.
-			htmin = -htmin * 0.5f;
-		}
-		
-		if (htmin >= 0.0f)
-		{
-			// The closest obstacle is somewhere ahead of us, keep track of nearest obstacle.
-			if (htmin < tmin)
-				tmin = htmin;
-		}
-	}
-
-	for (int i = 0; i < m_nsegments; ++i)
-	{
-		const dtObstacleSegment* seg = &m_segments[i];
-		float htmin = 0;
-		
-		if (seg->touch)
-		{
-			// Special case when the agent is very close to the segment.
-			float sdir[3], snorm[3];
-			dtVsub(sdir, seg->q, seg->p);
-			snorm[0] = -sdir[2];
-			snorm[2] = sdir[0];
-			// If the velocity is pointing towards the segment, no collision.
-			if (dtVdot2D(snorm, vcand) < 0.0f)
-				continue;
-			// Else immediate collision.
-			htmin = 0.0f;
-		}
-		else
-		{
-			if (!isectRaySeg(pos, vcand, seg->p, seg->q, htmin))
-				continue;
-		}
-		
-		// Avoid less when facing walls.
-		htmin *= 2.0f;
-		
-		// The closest obstacle is somewhere ahead of us, keep track of nearest obstacle.
-		if (htmin < tmin)
-			tmin = htmin;
-	}
-	
-	// Normalize side bias, to prevent it dominating too much.
-	if (nside)
-		side /= nside;
-	
-	const float ivmax = 1.0f / vmax;
-	const float vpen = m_weightDesVel * (dtVdist2D(vcand, dvel) * ivmax);
-	const float vcpen = m_weightCurVel * (dtVdist2D(vcand, vel) * ivmax);
-	const float spen = m_weightSide * side;
-	const float tpen = m_weightToi * (1.0f/(0.1f+tmin / m_horizTime));
-	
-	const float penalty = vpen + vcpen + spen + tpen;
-	
-	// Store different penalties for debug viewing
-	if (debug)
-		debug->addSample(vcand, cs, penalty, vpen, vcpen, spen, tpen);
-	
-	return penalty;
-}
-
-void dtObstacleAvoidanceQuery::sampleVelocityGrid(const float* pos, const float rad, const float vmax,
-												  const float* vel, const float* dvel,
-												  float* nvel, const int gsize,
-												  dtObstacleAvoidanceDebugData* debug)
-{
-	prepare(pos, dvel);
-	
-	dtVset(nvel, 0,0,0);
-	
-	if (debug)
-		debug->reset();
-
-	const float cvx = dvel[0] * m_velBias;
-	const float cvz = dvel[2] * m_velBias;
-	const float cs = vmax * 2 * (1 - m_velBias) / (float)(gsize-1);
-	const float half = (gsize-1)*cs*0.5f;
-		
-	float minPenalty = FLT_MAX;
-		
-	for (int y = 0; y < gsize; ++y)
-	{
-		for (int x = 0; x < gsize; ++x)
-		{
-			float vcand[3];
-			vcand[0] = cvx + x*cs - half;
-			vcand[1] = 0;
-			vcand[2] = cvz + y*cs - half;
-			
-			if (dtSqr(vcand[0])+dtSqr(vcand[2]) > dtSqr(vmax+cs/2)) continue;
-			
-			const float penalty = processSample(vcand, cs, pos,rad,vmax,vel,dvel, debug);
-			if (penalty < minPenalty)
-			{
-				minPenalty = penalty;
-				dtVcopy(nvel, vcand);
-			}
-		}
-	}
-}
-
-
-static const float DT_PI = 3.14159265f;
-
-void dtObstacleAvoidanceQuery::sampleVelocityAdaptive(const float* pos, const float rad, const float vmax,
-													  const float* vel, const float* dvel, float* nvel,
-													  const int ndivs, const int nrings, const int depth,
-													  dtObstacleAvoidanceDebugData* debug)
-{
-	prepare(pos, dvel);
-	
-	dtVset(nvel, 0,0,0);
-	
-	if (debug)
-		debug->reset();
-	
-	// Build sampling pattern aligned to desired velocity.
-	static const int MAX_PATTERN_DIVS = 32;
-	static const int MAX_PATTERN_RINGS = 4;
-	float pat[(MAX_PATTERN_DIVS*MAX_PATTERN_RINGS+1)*2];
-	int npat = 0;
-
-	const int nd = dtClamp(ndivs, 1, MAX_PATTERN_DIVS);
-	const int nr = dtClamp(nrings, 1, MAX_PATTERN_RINGS);
-	const float da = (1.0f/nd) * DT_PI*2;
-	const float dang = atan2f(dvel[2], dvel[0]);
-	
-	// Always add sample at zero
-	pat[npat*2+0] = 0;
-	pat[npat*2+1] = 0;
-	npat++;
-	
-	for (int j = 0; j < nr; ++j)
-	{
-		const float rad = (float)(nr-j)/(float)nr;
-		float a = dang + (j&1)*0.5f*da;
-		for (int i = 0; i < nd; ++i)
-		{
-			pat[npat*2+0] = cosf(a)*rad;
-			pat[npat*2+1] = sinf(a)*rad;
-			npat++;
-			a += da;
-		}
-	}
-
-	// Start sampling.
-	float cr = vmax * (1.0f-m_velBias);
-	float res[3];
-	dtVset(res, dvel[0] * m_velBias, 0, dvel[2] * m_velBias);
-
-	for (int k = 0; k < depth; ++k)
-	{
-		float minPenalty = FLT_MAX;
-		float bvel[3];
-		dtVset(bvel, 0,0,0);
-		
-		for (int i = 0; i < npat; ++i)
-		{
-			float vcand[3];
-			vcand[0] = res[0] + pat[i*2+0]*cr;
-			vcand[1] = 0;
-			vcand[2] = res[2] + pat[i*2+1]*cr;
-			
-			if (dtSqr(vcand[0])+dtSqr(vcand[2]) > dtSqr(vmax+0.001f)) continue;
-			
-			const float penalty = processSample(vcand,cr/10, pos,rad,vmax,vel,dvel, debug);
-			if (penalty < minPenalty)
-			{
-				minPenalty = penalty;
-				dtVcopy(bvel, vcand);
-			}
-		}
-
-		dtVcopy(res, bvel);
-
-		cr *= 0.5f;
-	}	
-	
-	dtVcopy(nvel, res);
-}
-
diff --git a/dep/recastnavigation/Detour/win/Detour_VC90.sln b/dep/recastnavigation/Detour/win/Detour_VC90.sln
deleted file mode 100644
index 644e7079fde..00000000000
--- a/dep/recastnavigation/Detour/win/Detour_VC90.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "VC90\Detour.vcproj", "{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug|Win32.Build.0 = Debug|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Release|Win32.ActiveCfg = Release|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/dep/recastnavigation/Detour/win/VC100/Detour.vcxproj b/dep/recastnavigation/Detour/win/VC100/Detour.vcxproj
index cb12cebb3f9..3439516064e 100644
--- a/dep/recastnavigation/Detour/win/VC100/Detour.vcxproj
+++ b/dep/recastnavigation/Detour/win/VC100/Detour.vcxproj
@@ -147,6 +147,7 @@
     <ClInclude Include="..\..\Include\DetourNavMeshBuilder.h" />
     <ClInclude Include="..\..\Include\DetourNavMeshQuery.h" />
     <ClInclude Include="..\..\Include\DetourNode.h" />
+    <ClInclude Include="..\..\Include\DetourStatus.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\DetourAlloc.cpp" />
diff --git a/dep/recastnavigation/Detour/win/VC100/Detour.vcxproj.filters b/dep/recastnavigation/Detour/win/VC100/Detour.vcxproj.filters
index 663af065b7c..059d4ef3cbd 100644
--- a/dep/recastnavigation/Detour/win/VC100/Detour.vcxproj.filters
+++ b/dep/recastnavigation/Detour/win/VC100/Detour.vcxproj.filters
@@ -30,6 +30,9 @@
     <ClInclude Include="..\..\Include\DetourNavMeshQuery.h">
       <Filter>include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Include\DetourStatus.h">
+      <Filter>include</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\DetourAlloc.cpp">
diff --git a/dep/recastnavigation/Detour/win/VC90/.gitignore b/dep/recastnavigation/Detour/win/VC90/.gitignore
deleted file mode 100644
index d82e4915b6d..00000000000
--- a/dep/recastnavigation/Detour/win/VC90/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-
-*__Win32_Release
-*__Win32_Debug
-*__x64_Release
-*__x64_Debug
-*.user
\ No newline at end of file
diff --git a/dep/recastnavigation/Detour/win/VC90/Detour.vcproj b/dep/recastnavigation/Detour/win/VC90/Detour.vcproj
deleted file mode 100644
index 12d7f440b92..00000000000
--- a/dep/recastnavigation/Detour/win/VC90/Detour.vcproj
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="Detour"
-	ProjectGUID="{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}"
-	RootNamespace="Detour_VC90"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ProjectDir)\..\..\..\..\lib\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32;DEBUG;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectDir)\..\..\..\..\lib\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(ProjectDir)\..\..\..\..\lib\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32;DEBUG;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(ProjectDir)\..\..\..\..\lib\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="include"
-			>
-			<File
-				RelativePath="..\..\Include\DetourAlloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Include\DetourAssert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Include\DetourCommon.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Include\DetourNavMesh.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Include\DetourNavMeshBuilder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Include\DetourNavMeshQuery.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Include\DetourNode.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="src"
-			>
-			<File
-				RelativePath="..\..\Source\DetourAlloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\DetourCommon.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\DetourNavMesh.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\DetourNavMeshBuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\DetourNavMeshQuery.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\DetourNode.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dep/recastnavigation/Recast/Include/Recast.h b/dep/recastnavigation/Recast/Include/Recast.h
index 0e5f0742486..238c273bbd9 100644
--- a/dep/recastnavigation/Recast/Include/Recast.h
+++ b/dep/recastnavigation/Recast/Include/Recast.h
@@ -19,327 +19,583 @@
 #ifndef RECAST_H
 #define RECAST_H
 
-// Some math headers don't have PI defined.
+/// The value of PI used by Recast.
 static const float RC_PI = 3.14159265f;
 
+/// Recast log categories.
+/// @see rcContext
 enum rcLogCategory
 {
-	RC_LOG_PROGRESS = 1,
-	RC_LOG_WARNING,
-	RC_LOG_ERROR,
+	RC_LOG_PROGRESS = 1,	///< A progress log entry.
+	RC_LOG_WARNING,			///< A warning log entry.
+	RC_LOG_ERROR,			///< An error log entry.
 };
 
+/// Recast performance timer categories.
+/// @see rcContext
 enum rcTimerLabel
 {
+	/// The user defined total time of the build.
 	RC_TIMER_TOTAL,
+	/// A user defined build time.
 	RC_TIMER_TEMP,
+	/// The time to rasterize the triangles. (See: #rcRasterizeTriangle)
 	RC_TIMER_RASTERIZE_TRIANGLES,
+	/// The time to build the compact heightfield. (See: #rcBuildCompactHeightfield)
 	RC_TIMER_BUILD_COMPACTHEIGHTFIELD,
+	/// The total time to build the contours. (See: #rcBuildContours)
 	RC_TIMER_BUILD_CONTOURS,
+	/// The time to trace the boundaries of the contours. (See: #rcBuildContours)
 	RC_TIMER_BUILD_CONTOURS_TRACE,
+	/// The time to simplify the contours. (See: #rcBuildContours)
 	RC_TIMER_BUILD_CONTOURS_SIMPLIFY,
+	/// The time to filter ledge spans. (See: #rcFilterLedgeSpans)
 	RC_TIMER_FILTER_BORDER,
+	/// The time to filter low height spans. (See: #rcFilterWalkableLowHeightSpans)
 	RC_TIMER_FILTER_WALKABLE,
+	/// The time to apply the median filter. (See: #rcMedianFilterWalkableArea)
 	RC_TIMER_MEDIAN_AREA,
+	/// The time to filter low obstacles. (See: #rcFilterLowHangingWalkableObstacles)
 	RC_TIMER_FILTER_LOW_OBSTACLES,
+	/// The time to build the polygon mesh. (See: #rcBuildPolyMesh)
 	RC_TIMER_BUILD_POLYMESH,
+	/// The time to merge polygon meshes. (See: #rcMergePolyMeshes)
 	RC_TIMER_MERGE_POLYMESH,
+	/// The time to erode the walkable area. (See: #rcErodeWalkableArea)
 	RC_TIMER_ERODE_AREA,
+	/// The time to mark a box area. (See: #rcMarkBoxArea)
 	RC_TIMER_MARK_BOX_AREA,
+	/// The time to mark a cylinder area. (See: #rcMarkCylinderArea)
+	RC_TIMER_MARK_CYLINDER_AREA,
+	/// The time to mark a convex polygon area. (See: #rcMarkConvexPolyArea)
 	RC_TIMER_MARK_CONVEXPOLY_AREA,
+	/// The total time to build the distance field. (See: #rcBuildDistanceField)
 	RC_TIMER_BUILD_DISTANCEFIELD,
+	/// The time to build the distances of the distance field. (See: #rcBuildDistanceField)
 	RC_TIMER_BUILD_DISTANCEFIELD_DIST,
+	/// The time to blur the distance field. (See: #rcBuildDistanceField)
 	RC_TIMER_BUILD_DISTANCEFIELD_BLUR,
+	/// The total time to build the regions. (See: #rcBuildRegions, #rcBuildRegionsMonotone)
 	RC_TIMER_BUILD_REGIONS,
+	/// The total time to apply the watershed algorithm. (See: #rcBuildRegions)
 	RC_TIMER_BUILD_REGIONS_WATERSHED,
+	/// The time to expand regions while applying the watershed algorithm. (See: #rcBuildRegions)
 	RC_TIMER_BUILD_REGIONS_EXPAND,
+	/// The time to flood regions while applying the watershed algorithm. (See: #rcBuildRegions)
 	RC_TIMER_BUILD_REGIONS_FLOOD,
+	/// The time to filter out small regions. (See: #rcBuildRegions, #rcBuildRegionsMonotone)
 	RC_TIMER_BUILD_REGIONS_FILTER,
+	/// The time to build heightfield layers. (See: #rcBuildHeightfieldLayers)
+	RC_TIMER_BUILD_LAYERS, 
+	/// The time to build the polygon mesh detail. (See: #rcBuildPolyMeshDetail)
 	RC_TIMER_BUILD_POLYMESHDETAIL,
+	/// The time to merge polygon mesh details. (See: #rcMergePolyMeshDetails)
 	RC_TIMER_MERGE_POLYMESHDETAIL,
+	/// The maximum number of timers.  (Used for iterating timers.)
 	RC_MAX_TIMERS
 };
 
-// Build context provides several optional utilities needed for the build process,
-// such as timing, logging, and build time collecting. 
+/// Provides an interface for optional logging and performance tracking of the Recast 
+/// build process.
+/// @ingroup recast
 class rcContext
 {
 public:
+
+	/// Contructor.
+	///  @param[in]		state	TRUE if the logging and performance timers should be enabled.  [Default: true]
 	inline rcContext(bool state = true) : m_logEnabled(state), m_timerEnabled(state) {}
 	virtual ~rcContext() {}
 
-	// Enables or disables logging.
+	/// Enables or disables logging.
+	///  @param[in]		state	TRUE if logging should be enabled.
 	inline void enableLog(bool state) { m_logEnabled = state; }
-	// Resets log.
+
+	/// Clears all log entries.
 	inline void resetLog() { if (m_logEnabled) doResetLog(); }
-	// Logs a message.
+
+	/// Logs a message.
+	///  @param[in]		category	The category of the message.
+	///  @param[in]		format		The message.
 	void log(const rcLogCategory category, const char* format, ...);
 
-	// Enables or disables timer.
+	/// Enables or disables the performance timers.
+	///  @param[in]		state	TRUE if timers should be enabled.
 	inline void enableTimer(bool state) { m_timerEnabled = state; }
-	// Resets all timers.
+
+	/// Clears all peformance timers. (Resets all to unused.)
 	inline void resetTimers() { if (m_timerEnabled) doResetTimers(); }
-	// Starts timer, used for performance timing.
+
+	/// Starts the specified performance timer.
+	///  @param	label	The category of timer.
 	inline void startTimer(const rcTimerLabel label) { if (m_timerEnabled) doStartTimer(label); }
-	// Stops timer, used for performance timing.
+
+	/// Stops the specified performance timer.
+	///  @param	label	The category of the timer.
 	inline void stopTimer(const rcTimerLabel label) { if (m_timerEnabled) doStopTimer(label); }
-	// Returns time accumulated between timer start/stop.
+
+	/// Returns the total accumulated time of the specified performance timer.
+	///  @param	label	The category of the timer.
+	///  @return The accumulated time of the timer, or -1 if timers are disabled or the timer has never been started.
 	inline int getAccumulatedTime(const rcTimerLabel label) const { return m_timerEnabled ? doGetAccumulatedTime(label) : -1; }
 
 protected:
-	// Virtual functions to override for custom implementations.
+
+	/// Clears all log entries.
 	virtual void doResetLog() {}
+
+	/// Logs a message.
+	///  @param[in]		category	The category of the message.
+	///  @param[in]		msg			The formatted message.
+	///  @param[in]		len			The length of the formatted message.
 	virtual void doLog(const rcLogCategory /*category*/, const char* /*msg*/, const int /*len*/) {}
+
+	/// Clears all timers. (Resets all to unused.)
 	virtual void doResetTimers() {}
+
+	/// Starts the specified performance timer.
+	///  @param[in]		label	The category of timer.
 	virtual void doStartTimer(const rcTimerLabel /*label*/) {}
+
+	/// Stops the specified performance timer.
+	///  @param[in]		label	The category of the timer.
 	virtual void doStopTimer(const rcTimerLabel /*label*/) {}
+
+	/// Returns the total accumulated time of the specified performance timer.
+	///  @param[in]		label	The category of the timer.
+	///  @return The accumulated time of the timer, or -1 if timers are disabled or the timer has never been started.
 	virtual int doGetAccumulatedTime(const rcTimerLabel /*label*/) const { return -1; }
 	
+	/// True if logging is enabled.
 	bool m_logEnabled;
+
+	/// True if the performance timers are enabled.
 	bool m_timerEnabled;
 };
 
-
-// The units of the parameters are specified in parenthesis as follows:
-// (vx) voxels, (wu) world units
+/// Specifies a configuration to use when performing Recast builds.
+/// @ingroup recast
 struct rcConfig
 {
-	int width, height;				// Dimensions of the rasterized heightfield (vx)
-	int tileSize;					// Width and Height of a tile (vx)
-	int borderSize;					// Non-navigable Border around the heightfield (vx)
-	float cs, ch;					// Grid cell size and height (wu)
-	float bmin[3], bmax[3];			// Grid bounds (wu)
-	float walkableSlopeAngle;		// Maximum walkable slope angle in degrees.
-	int walkableHeight;				// Minimum height where the agent can still walk (vx)
-	int walkableClimb;				// Maximum height between grid cells the agent can climb (vx)
-	int walkableRadius;				// Radius of the agent in cells (vx)
-	int maxEdgeLen;					// Maximum contour edge length (vx)
-	float maxSimplificationError;	// Maximum distance error from contour to cells (vx)
-	int minRegionArea;				// Regions whose area is smaller than this threshold will be removed. (vx)
-	int mergeRegionArea;			// Regions whose area is smaller than this threshold will be merged (vx)
-	int maxVertsPerPoly;			// Max number of vertices per polygon
-	float detailSampleDist;			// Detail mesh sample spacing.
-	float detailSampleMaxError;		// Detail mesh simplification max sample error.
+	/// The width of the field along the x-axis. [Limit: >= 0] [Units: vx]
+	int width;
+
+	/// The height of the field along the z-axis. [Limit: >= 0] [Units: vx]
+	int height;
+	
+	/// The width/height size of tile's on the xz-plane. [Limit: >= 0] [Units: vx]
+	int tileSize;
+	
+	/// The size of the non-navigable border around the heightfield. [Limit: >=0] [Units: vx]
+	int borderSize;
+
+	/// The xz-plane cell size to use for fields. [Limit: > 0] [Units: wu] 
+	float cs;
+
+	/// The y-axis cell size to use for fields. [Limit: > 0] [Units: wu]
+	float ch;
+
+	/// The minimum bounds of the field's AABB. [(x, y, z)] [Units: wu]
+	float bmin[3]; 
+
+	/// The maximum bounds of the field's AABB. [(x, y, z)] [Units: wu]
+	float bmax[3];
+
+	/// The maximum slope that is considered walkable. [Limits: 0 <= value < 90] [Units: Degrees] 
+	float walkableSlopeAngle;
+
+	/// Minimum floor to 'ceiling' height that will still allow the floor area to 
+	/// be considered walkable. [Limit: >= 3] [Units: vx] 
+	int walkableHeight;
+	
+	/// Maximum ledge height that is considered to still be traversable. [Limit: >=0] [Units: vx] 
+	int walkableClimb;
+	
+	/// The distance to erode/shrink the walkable area of the heightfield away from 
+	/// obstructions.  [Limit: >=0] [Units: vx] 
+	int walkableRadius;
+	
+	/// The maximum allowed length for contour edges along the border of the mesh. [Limit: >=0] [Units: vx] 
+	int maxEdgeLen;
+	
+	/// The maximum distance a simplfied contour's border edges should deviate 
+	/// the original raw contour. [Limit: >=0] [Units: wu]
+	float maxSimplificationError;
+	
+	/// The minimum number of cells allowed to form isolated island areas. [Limit: >=0] [Units: vx] 
+	int minRegionArea;
+	
+	/// Any regions with a span count smaller than this value will, if possible, 
+	/// be merged with larger regions. [Limit: >=0] [Units: vx] 
+	int mergeRegionArea;
+	
+	/// The maximum number of vertices allowed for polygons generated during the 
+	/// contour to polygon conversion process. [Limit: >= 3] 
+	int maxVertsPerPoly;
+	
+	/// Sets the sampling distance to use when generating the detail mesh.
+	/// (For height detail only.) [Limits: 0 or >= 0.9] [Units: wu] 
+	float detailSampleDist;
+	
+	/// The maximum distance the detail mesh surface should deviate from heightfield
+	/// data. (For height detail only.) [Limit: >=0] [Units: wu] 
+	float detailSampleMaxError;
 };
 
-// Define number of bits in the above structure for smin/smax.
-// The max height is used for clamping rasterized values.
-static const int RC_SPAN_HEIGHT_BITS = 16;
+/// Defines the number of bits allocated to rcSpan::smin and rcSpan::smax.
+static const int RC_SPAN_HEIGHT_BITS = 16; // EDITED BY TC
+/// Defines the maximum value for rcSpan::smin and rcSpan::smax.
 static const int RC_SPAN_MAX_HEIGHT = (1<<RC_SPAN_HEIGHT_BITS)-1;
 
-// Heightfield span.
+/// The number of spans allocated per span spool.
+/// @see rcSpanPool
+static const int RC_SPANS_PER_POOL = 2048;
+
+/// Represents a span in a heightfield.
+/// @see rcHeightfield
 struct rcSpan
 {
-	unsigned int smin : 16;			// Span min height.
-	unsigned int smax : 16;			// Span max height.
-    unsigned char area;				// Span area type.
-	rcSpan* next;					// Next span in column.
+	unsigned int smin : 16;			///< The lower limit of the span. [Limit: < #smax] // EDITED BY TC
+	unsigned int smax : 16;			///< The upper limit of the span. [Limit: <= #RC_SPAN_MAX_HEIGHT] // EDITED BY TC
+	unsigned char area;			    ///< The area id assigned to the span. // EDITED BY TC
+	rcSpan* next;					///< The next span higher up in column.
 };
 
-// Number of spans allocated per pool.
-static const int RC_SPANS_PER_POOL = 2048;
-
-// Memory pool used for quick span allocation.
+/// A memory pool used for quick allocation of spans within a heightfield.
+/// @see rcHeightfield
 struct rcSpanPool
 {
-	rcSpanPool* next;					// Pointer to next pool.
-	rcSpan items[RC_SPANS_PER_POOL];	// Array of spans.
+	rcSpanPool* next;					///< The next span pool.
+	rcSpan items[RC_SPANS_PER_POOL];	///< Array of spans in the pool.
 };
 
-// Dynamic span-heightfield.
+/// A dynamic heightfield representing obstructed space.
+/// @ingroup recast
 struct rcHeightfield
 {
-	int width, height;			// Dimension of the heightfield.
-	float bmin[3], bmax[3];		// Bounding box of the heightfield
-	float cs, ch;				// Cell size and height.
-	rcSpan** spans;				// Heightfield of spans (width*height).
-	rcSpanPool* pools;			// Linked list of span pools.
-	rcSpan* freelist;			// Pointer to next free span.
+	int width;			///< The width of the heightfield. (Along the x-axis in cell units.)
+	int height;			///< The height of the heightfield. (Along the z-axis in cell units.)
+	float bmin[3];  	///< The minimum bounds in world space. [(x, y, z)]
+	float bmax[3];		///< The maximum bounds in world space. [(x, y, z)]
+	float cs;			///< The size of each cell. (On the xz-plane.)
+	float ch;			///< The height of each cell. (The minimum increment along the y-axis.)
+	rcSpan** spans;		///< Heightfield of spans (width*height).
+	rcSpanPool* pools;	///< Linked list of span pools.
+	rcSpan* freelist;	///< The next free span.
 };
 
-rcHeightfield* rcAllocHeightfield();
-void rcFreeHeightField(rcHeightfield* hf);
-
-
+/// Provides information on the content of a cell column in a compact heightfield. 
 struct rcCompactCell
 {
-	unsigned int index : 24;	// Index to first span in column.
-	unsigned int count : 8;		// Number of spans in this column.
+	unsigned int index : 24;	///< Index to the first span in the column.
+	unsigned int count : 8;		///< Number of spans in the column.
 };
 
+/// Represents a span of unobstructed space within a compact heightfield.
 struct rcCompactSpan
 {
-	unsigned short y;			// Bottom coordinate of the span.
-	unsigned short reg;
-	unsigned int con : 24;		// Connections to neighbour cells.
-	unsigned int h : 8;			// Height of the span.
+	unsigned short y;			///< The lower extent of the span. (Measured from the heightfield's base.)
+	unsigned short reg;			///< The id of the region the span belongs to. (Or zero if not in a region.)
+	unsigned int con : 24;		///< Packed neighbor connection data.
+	unsigned int h : 8;			///< The height of the span.  (Measured from #y.)
 };
 
-// Compact static heightfield. 
+/// A compact, static heightfield representing unobstructed space.
+/// @ingroup recast
 struct rcCompactHeightfield
 {
-	int width, height;					// Width and height of the heightfield.
-	int spanCount;						// Number of spans in the heightfield.
-	int walkableHeight, walkableClimb;	// Agent properties.
-	unsigned short maxDistance;			// Maximum distance value stored in heightfield.
-	unsigned short maxRegions;			// Maximum Region Id stored in heightfield.
-	float bmin[3], bmax[3];				// Bounding box of the heightfield.
-	float cs, ch;						// Cell size and height.
-	rcCompactCell* cells;				// Pointer to width*height cells.
-	rcCompactSpan* spans;				// Pointer to spans.
-	unsigned short* dist;				// Pointer to per span distance to border.
-	unsigned char* areas;				// Pointer to per span area ID.
+	int width;					///< The width of the heightfield. (Along the x-axis in cell units.)
+	int height;					///< The height of the heightfield. (Along the z-axis in cell units.)
+	int spanCount;				///< The number of spans in the heightfield.
+	int walkableHeight;			///< The walkable height used during the build of the field.  (See: rcConfig::walkableHeight)
+	int walkableClimb;			///< The walkable climb used during the build of the field. (See: rcConfig::walkableClimb)
+	int borderSize;				///< The AABB border size used during the build of the field. (See: rcConfig::borderSize)
+	unsigned short maxDistance;	///< The maximum distance value of any span within the field. 
+	unsigned short maxRegions;	///< The maximum region id of any span within the field. 
+	float bmin[3];				///< The minimum bounds in world space. [(x, y, z)]
+	float bmax[3];				///< The maximum bounds in world space. [(x, y, z)]
+	float cs;					///< The size of each cell. (On the xz-plane.)
+	float ch;					///< The height of each cell. (The minimum increment along the y-axis.)
+	rcCompactCell* cells;		///< Array of cells. [Size: #width*#height]
+	rcCompactSpan* spans;		///< Array of spans. [Size: #spanCount]
+	unsigned short* dist;		///< Array containing border distance data. [Size: #spanCount]
+	unsigned char* areas;		///< Array containing area id data. [Size: #spanCount]
 };
 
-rcCompactHeightfield* rcAllocCompactHeightfield();
-void rcFreeCompactHeightfield(rcCompactHeightfield* chf);
+/// Represents a heightfield layer within a layer set.
+/// @see rcHeightfieldLayerSet
+struct rcHeightfieldLayer
+{
+	float bmin[3];				///< The minimum bounds in world space. [(x, y, z)]
+	float bmax[3];				///< The maximum bounds in world space. [(x, y, z)]
+	float cs;					///< The size of each cell. (On the xz-plane.)
+	float ch;					///< The height of each cell. (The minimum increment along the y-axis.)
+	int width;					///< The width of the heightfield. (Along the x-axis in cell units.)
+	int height;					///< The height of the heightfield. (Along the z-axis in cell units.)
+	int minx;					///< The minimum x-bounds of usable data.
+	int maxx;					///< The maximum x-bounds of usable data.
+	int miny;					///< The minimum y-bounds of usable data. (Along the z-axis.)
+	int maxy;					///< The maximum y-bounds of usable data. (Along the z-axis.)
+	int hmin;					///< The minimum height bounds of usable data. (Along the y-axis.)
+	int hmax;					///< The maximum height bounds of usable data. (Along the y-axis.)
+	unsigned char* heights;		///< The heightfield. [Size: (width - borderSize*2) * (h - borderSize*2)]
+	unsigned char* areas;		///< Area ids. [Size: Same as #heights]
+	unsigned char* cons;		///< Packed neighbor connection information. [Size: Same as #heights]
+};
 
+/// Represents a set of heightfield layers.
+/// @ingroup recast
+/// @see rcAllocHeightfieldLayerSet, rcFreeHeightfieldLayerSet 
+struct rcHeightfieldLayerSet
+{
+	rcHeightfieldLayer* layers;			///< The layers in the set. [Size: #nlayers]
+	int nlayers;						///< The number of layers in the set.
+};
 
+/// Represents a simple, non-overlapping contour in field space.
 struct rcContour
 {
-	int* verts;			// Vertex coordinates, each vertex contains 4 components.
-	int nverts;			// Number of vertices.
-	int* rverts;		// Raw vertex coordinates, each vertex contains 4 components.
-	int nrverts;		// Number of raw vertices.
-	unsigned short reg;	// Region ID of the contour.
-	unsigned char area;	// Area ID of the contour.
+	int* verts;			///< Simplified contour vertex and connection data. [Size: 4 * #nverts]
+	int nverts;			///< The number of vertices in the simplified contour. 
+	int* rverts;		///< Raw contour vertex and connection data. [Size: 4 * #nrverts]
+	int nrverts;		///< The number of vertices in the raw contour. 
+	unsigned short reg;	///< The region id of the contour.
+	unsigned char area;	///< The area id of the contour.
 };
 
+/// Represents a group of related contours.
+/// @ingroup recast
 struct rcContourSet
 {
-	rcContour* conts;		// Pointer to all contours.
-	int nconts;				// Number of contours.
-	float bmin[3], bmax[3];	// Bounding box of the heightfield.
-	float cs, ch;			// Cell size and height.
+	rcContour* conts;	///< An array of the contours in the set. [Size: #nconts]
+	int nconts;			///< The number of contours in the set.
+	float bmin[3];  	///< The minimum bounds in world space. [(x, y, z)]
+	float bmax[3];		///< The maximum bounds in world space. [(x, y, z)]
+	float cs;			///< The size of each cell. (On the xz-plane.)
+	float ch;			///< The height of each cell. (The minimum increment along the y-axis.)
+	int width;			///< The width of the set. (Along the x-axis in cell units.) 
+	int height;			///< The height of the set. (Along the z-axis in cell units.) 
+	int borderSize;		///< The AABB border size used to generate the source data from which the contours were derived.
 };
 
-rcContourSet* rcAllocContourSet();
-void rcFreeContourSet(rcContourSet* cset);
-
-
-// Polymesh store a connected mesh of polygons.
-// The polygons are store in an array where each polygons takes
-// 'nvp*2' elements. The first 'nvp' elements are indices to vertices
-// and the second 'nvp' elements are indices to neighbour polygons.
-// If a polygon has less than 'bvp' vertices, the remaining indices
-// are set to RC_MESH_NULL_IDX. If an polygon edge does not have a neighbour
-// the neighbour index is set to RC_MESH_NULL_IDX.
-// Vertices can be transformed into world space as follows:
-//   x = bmin[0] + verts[i*3+0]*cs;
-//   y = bmin[1] + verts[i*3+1]*ch;
-//   z = bmin[2] + verts[i*3+2]*cs;
+/// Represents a polygon mesh suitable for use in building a navigation mesh. 
+/// @ingroup recast
 struct rcPolyMesh
-{	
-	unsigned short* verts;	// Vertices of the mesh, 3 elements per vertex.
-	unsigned short* polys;	// Polygons of the mesh, nvp*2 elements per polygon.
-	unsigned short* regs;	// Region ID of the polygons.
-	unsigned short* flags;	// Per polygon flags.
-	unsigned char* areas;	// Area ID of polygons.
-	int nverts;				// Number of vertices.
-	int npolys;				// Number of polygons.
-	int maxpolys;			// Number of allocated polygons.
-	int nvp;				// Max number of vertices per polygon.
-	float bmin[3], bmax[3];	// Bounding box of the mesh.
-	float cs, ch;			// Cell size and height.
+{
+	unsigned short* verts;	///< The mesh vertices. [Form: (x, y, z) * #nverts]
+	unsigned short* polys;	///< Polygon and neighbor data. [Length: #maxpolys * 2 * #nvp]
+	unsigned short* regs;	///< The region id assigned to each polygon. [Length: #maxpolys]
+	unsigned short* flags;	///< The user defined flags for each polygon. [Length: #maxpolys]
+	unsigned char* areas;	///< The area id assigned to each polygon. [Length: #maxpolys]
+	int nverts;				///< The number of vertices.
+	int npolys;				///< The number of polygons.
+	int maxpolys;			///< The number of allocated polygons.
+	int nvp;				///< The maximum number of vertices per polygon.
+	float bmin[3];			///< The minimum bounds in world space. [(x, y, z)]
+	float bmax[3];			///< The maximum bounds in world space. [(x, y, z)]
+	float cs;				///< The size of each cell. (On the xz-plane.)
+	float ch;				///< The height of each cell. (The minimum increment along the y-axis.)
+	int borderSize;			///< The AABB border size used to generate the source data from which the mesh was derived.
 };
 
-rcPolyMesh* rcAllocPolyMesh();
-void rcFreePolyMesh(rcPolyMesh* pmesh);
-
-
-// Detail mesh generated from a rcPolyMesh.
-// Each submesh represents a polygon in the polymesh and they are stored in
-// exactly same order. Each submesh is described as 4 values:
-// base vertex, vertex count, base triangle, triangle count. That is,
-//   const unsigned char* t = &dmesh.tris[(tbase+i)*3]; and
-//   const float* v = &dmesh.verts[(vbase+t[j])*3];
-// If the input polygon has 'n' vertices, those vertices are first in the
-// submesh vertex list. This allows to compres the mesh by not storing the
-// first vertices and using the polymesh vertices instead.
-// Max number of vertices per submesh is 127 and
-// max number of triangles per submesh is 255.
-
+/// Contains triangle meshes that represent detailed height data associated 
+/// with the polygons in its associated polygon mesh object.
+/// @ingroup recast
 struct rcPolyMeshDetail
 {
-	unsigned int* meshes;	// Pointer to all mesh data.
-	float* verts;			// Pointer to all vertex data.
-	unsigned char* tris;	// Pointer to all triangle data.
-	int nmeshes;			// Number of meshes.
-	int nverts;				// Number of total vertices.
-	int ntris;				// Number of triangles.
+	unsigned int* meshes;	///< The sub-mesh data. [Size: 4*#nmeshes] 
+	float* verts;			///< The mesh vertices. [Size: 3*#nverts] 
+	unsigned char* tris;	///< The mesh triangles. [Size: 4*#ntris] 
+	int nmeshes;			///< The number of sub-meshes defined by #meshes.
+	int nverts;				///< The number of vertices in #verts.
+	int ntris;				///< The number of triangles in #tris.
 };
 
+/// @name Allocation Functions
+/// Functions used to allocate and de-allocate Recast objects.
+/// @see rcAllocSetCustom
+/// @{
+
+/// Allocates a heightfield object using the Recast allocator.
+///  @return A heightfield that is ready for initialization, or null on failure.
+///  @ingroup recast
+///  @see rcCreateHeightfield, rcFreeHeightField
+rcHeightfield* rcAllocHeightfield();
+
+/// Frees the specified heightfield object using the Recast allocator.
+///  @param[in]		hf	A heightfield allocated using #rcAllocHeightfield
+///  @ingroup recast
+///  @see rcAllocHeightfield
+void rcFreeHeightField(rcHeightfield* hf);
+
+/// Allocates a compact heightfield object using the Recast allocator.
+///  @return A compact heightfield that is ready for initialization, or null on failure.
+///  @ingroup recast
+///  @see rcBuildCompactHeightfield, rcFreeCompactHeightfield
+rcCompactHeightfield* rcAllocCompactHeightfield();
+
+/// Frees the specified compact heightfield object using the Recast allocator.
+///  @param[in]		chf		A compact heightfield allocated using #rcAllocCompactHeightfield
+///  @ingroup recast
+///  @see rcAllocCompactHeightfield
+void rcFreeCompactHeightfield(rcCompactHeightfield* chf);
+
+/// Allocates a heightfield layer set using the Recast allocator.
+///  @return A heightfield layer set that is ready for initialization, or null on failure.
+///  @ingroup recast
+///  @see rcBuildHeightfieldLayers, rcFreeHeightfieldLayerSet
+rcHeightfieldLayerSet* rcAllocHeightfieldLayerSet();
+
+/// Frees the specified heightfield layer set using the Recast allocator.
+///  @param[in]		lset	A heightfield layer set allocated using #rcAllocHeightfieldLayerSet
+///  @ingroup recast
+///  @see rcAllocHeightfieldLayerSet
+void rcFreeHeightfieldLayerSet(rcHeightfieldLayerSet* lset);
+
+/// Allocates a contour set object using the Recast allocator.
+///  @return A contour set that is ready for initialization, or null on failure.
+///  @ingroup recast
+///  @see rcBuildContours, rcFreeContourSet
+rcContourSet* rcAllocContourSet();
+
+/// Frees the specified contour set using the Recast allocator.
+///  @param[in]		cset	A contour set allocated using #rcAllocContourSet
+///  @ingroup recast
+///  @see rcAllocContourSet
+void rcFreeContourSet(rcContourSet* cset);
+
+/// Allocates a polygon mesh object using the Recast allocator.
+///  @return A polygon mesh that is ready for initialization, or null on failure.
+///  @ingroup recast
+///  @see rcBuildPolyMesh, rcFreePolyMesh
+rcPolyMesh* rcAllocPolyMesh();
+
+/// Frees the specified polygon mesh using the Recast allocator.
+///  @param[in]		pmesh	A polygon mesh allocated using #rcAllocPolyMesh
+///  @ingroup recast
+///  @see rcAllocPolyMesh
+void rcFreePolyMesh(rcPolyMesh* pmesh);
+
+/// Allocates a detail mesh object using the Recast allocator.
+///  @return A detail mesh that is ready for initialization, or null on failure.
+///  @ingroup recast
+///  @see rcBuildPolyMeshDetail, rcFreePolyMeshDetail
 rcPolyMeshDetail* rcAllocPolyMeshDetail();
+
+/// Frees the specified detail mesh using the Recast allocator.
+///  @param[in]		dmesh	A detail mesh allocated using #rcAllocPolyMeshDetail
+///  @ingroup recast
+///  @see rcAllocPolyMeshDetail
 void rcFreePolyMeshDetail(rcPolyMeshDetail* dmesh);
 
+/// @}
 
-// If heightfield region ID has the following bit set, the region is on border area
-// and excluded from many calculations.
+/// Heighfield border flag.
+/// If a heightfield region ID has this bit set, then the region is a border 
+/// region and its spans are considered unwalkable.
+/// (Used during the region and contour build process.)
+/// @see rcCompactSpan::reg
 static const unsigned short RC_BORDER_REG = 0x8000;
 
-// If contour region ID has the following bit set, the vertex will be later
-// removed in order to match the segments and vertices at tile boundaries.
+/// Border vertex flag.
+/// If a region ID has this bit set, then the associated element lies on
+/// a tile border. If a contour vertex's region ID has this bit set, the 
+/// vertex will later be removed in order to match the segments and vertices 
+/// at tile boundaries.
+/// (Used during the build process.)
+/// @see rcCompactSpan::reg, #rcContour::verts, #rcContour::rverts
 static const int RC_BORDER_VERTEX = 0x10000;
 
+/// Area border flag.
+/// If a region ID has this bit set, then the associated element lies on
+/// the border of an area.
+/// (Used during the region and contour build process.)
+/// @see rcCompactSpan::reg, #rcContour::verts, #rcContour::rverts
 static const int RC_AREA_BORDER = 0x20000;
 
+/// Contour build flags.
+/// @see rcBuildContours
 enum rcBuildContoursFlags
 {
-	RC_CONTOUR_TESS_WALL_EDGES = 0x01,	// Tessellate wall edges
-	RC_CONTOUR_TESS_AREA_EDGES = 0x02,	// Tessellate edges between areas.
+	RC_CONTOUR_TESS_WALL_EDGES = 0x01,	///< Tessellate solid (impassable) edges during contour simplification.
+	RC_CONTOUR_TESS_AREA_EDGES = 0x02,	///< Tessellate edges between areas during contour simplification.
 };
 
-// Mask used with contours to extract region id.
+/// Applied to the region id field of contour vertices in order to extract the region id.
+/// The region id field of a vertex may have several flags applied to it.  So the
+/// fields value can't be used directly.
+/// @see rcContour::verts, rcContour::rverts
 static const int RC_CONTOUR_REG_MASK = 0xffff;
 
-// Null index which is used with meshes to mark unset or invalid indices.
+/// An value which indicates an invalid index within a mesh.
+/// @note This does not necessarily indicate an error.
+/// @see rcPolyMesh::polys
 static const unsigned short RC_MESH_NULL_IDX = 0xffff;
 
-// Area ID that is considered empty.
+/// Represents the null area.
+/// When a data element is given this value it is considered to no longer be 
+/// assigned to a usable area.  (E.g. It is unwalkable.)
 static const unsigned char RC_NULL_AREA = 0;
 
-// Area ID that is considered generally walkable.
+/// The default area id used to indicate a walkable polygon. 
+/// This is also the maximum allowed area id, and the only non-null area id 
+/// recognized by some steps in the build process. 
 static const unsigned char RC_WALKABLE_AREA = 63;
 
-// Value returned by rcGetCon() if the direction is not connected.
+/// The value returned by #rcGetCon if the specified direction is not connected
+/// to another span. (Has no neighbor.)
 static const int RC_NOT_CONNECTED = 0x3f;
 
-// Compact span neighbour helpers.
-inline void rcSetCon(rcCompactSpan& s, int dir, int i)
-{
-	const unsigned int shift = (unsigned int)dir*6;
-	unsigned int con = s.con;
-	s.con = (con & ~(0x3f << shift)) | (((unsigned int)i & 0x3f) << shift);
-}
-
-inline int rcGetCon(const rcCompactSpan& s, int dir)
-{
-	const unsigned int shift = (unsigned int)dir*6;
-	return (s.con >> shift) & 0x3f;
-}
+/// @name General helper functions
+/// @{
 
-inline int rcGetDirOffsetX(int dir)
-{
-	const int offset[4] = { -1, 0, 1, 0, };
-	return offset[dir&0x03];
-}
-
-inline int rcGetDirOffsetY(int dir)
-{
-	const int offset[4] = { 0, 1, 0, -1 };
-	return offset[dir&0x03];
-}
-
-// Common helper functions
+/// Swaps the values of the two parameters.
+///  @param[in,out]	a	Value A
+///  @param[in,out]	b	Value B
 template<class T> inline void rcSwap(T& a, T& b) { T t = a; a = b; b = t; }
+
+/// Returns the minimum of two values.
+///  @param[in]		a	Value A
+///  @param[in]		b	Value B
+///  @return The minimum of the two values.
 template<class T> inline T rcMin(T a, T b) { return a < b ? a : b; }
+
+/// Returns the maximum of two values.
+///  @param[in]		a	Value A
+///  @param[in]		b	Value B
+///  @return The maximum of the two values.
 template<class T> inline T rcMax(T a, T b) { return a > b ? a : b; }
+
+/// Returns the absolute value.
+///  @param[in]		a	The value.
+///  @return The absolute value of the specified value.
 template<class T> inline T rcAbs(T a) { return a < 0 ? -a : a; }
+
+/// Returns the square of the value.
+///  @param[in]		a	The value.
+///  @return The square of the value.
 template<class T> inline T rcSqr(T a) { return a*a; }
+
+/// Clamps the value to the specified range.
+///  @param[in]		v	The value to clamp.
+///  @param[in]		mn	The minimum permitted return value.
+///  @param[in]		mx	The maximum permitted return value.
+///  @return The value, clamped to the specified range.
 template<class T> inline T rcClamp(T v, T mn, T mx) { return v < mn ? mn : (v > mx ? mx : v); }
+
+/// Returns the square root of the value.
+///  @param[in]		x	The value.
+///  @return The square root of the vlaue.
 float rcSqrt(float x);
 
-// Common vector helper functions.
+/// @}
+/// @name Vector helper functions.
+/// @{
+
+/// Derives the cross product of two vectors. (@p v1 x @p v2)
+///  @param[out]	dest	The cross product. [(x, y, z)]
+///  @param[in]		v1		A Vector [(x, y, z)]
+///  @param[in]		v2		A vector [(x, y, z)]
 inline void rcVcross(float* dest, const float* v1, const float* v2)
 {
 	dest[0] = v1[1]*v2[2] - v1[2]*v2[1];
@@ -347,11 +603,20 @@ inline void rcVcross(float* dest, const float* v1, const float* v2)
 	dest[2] = v1[0]*v2[1] - v1[1]*v2[0];
 }
 
+/// Derives the dot product of two vectors. (@p v1 . @p v2)
+///  @param[in]		v1	A Vector [(x, y, z)]
+///  @param[in]		v2	A vector [(x, y, z)]
+/// @return The dot product.
 inline float rcVdot(const float* v1, const float* v2)
 {
 	return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2];
 }
 
+/// Performs a scaled vector addition. (@p v1 + (@p v2 * @p s))
+///  @param[out]	dest	The result vector. [(x, y, z)]
+///  @param[in]		v1		The base vector. [(x, y, z)]
+///  @param[in]		v2		The vector to scale and add to @p v1. [(x, y, z)]
+///  @param[in]		s		The amount to scale @p v2 by before adding to @p v1.
 inline void rcVmad(float* dest, const float* v1, const float* v2, const float s)
 {
 	dest[0] = v1[0]+v2[0]*s;
@@ -359,6 +624,10 @@ inline void rcVmad(float* dest, const float* v1, const float* v2, const float s)
 	dest[2] = v1[2]+v2[2]*s;
 }
 
+/// Performs a vector addition. (@p v1 + @p v2)
+///  @param[out]	dest	The result vector. [(x, y, z)]
+///  @param[in]		v1		The base vector. [(x, y, z)]
+///  @param[in]		v2		The vector to add to @p v1. [(x, y, z)]
 inline void rcVadd(float* dest, const float* v1, const float* v2)
 {
 	dest[0] = v1[0]+v2[0];
@@ -366,6 +635,10 @@ inline void rcVadd(float* dest, const float* v1, const float* v2)
 	dest[2] = v1[2]+v2[2];
 }
 
+/// Performs a vector subtraction. (@p v1 - @p v2)
+///  @param[out]	dest	The result vector. [(x, y, z)]
+///  @param[in]		v1		The base vector. [(x, y, z)]
+///  @param[in]		v2		The vector to subtract from @p v1. [(x, y, z)]
 inline void rcVsub(float* dest, const float* v1, const float* v2)
 {
 	dest[0] = v1[0]-v2[0];
@@ -373,6 +646,9 @@ inline void rcVsub(float* dest, const float* v1, const float* v2)
 	dest[2] = v1[2]-v2[2];
 }
 
+/// Selects the minimum value of each element from the specified vectors.
+///  @param[in,out]	mn	A vector.  (Will be updated with the result.) [(x, y, z)]
+///  @param[in]		v	A vector. [(x, y, z)]
 inline void rcVmin(float* mn, const float* v)
 {
 	mn[0] = rcMin(mn[0], v[0]);
@@ -380,6 +656,9 @@ inline void rcVmin(float* mn, const float* v)
 	mn[2] = rcMin(mn[2], v[2]);
 }
 
+/// Selects the maximum value of each element from the specified vectors.
+///  @param[in,out]	mx	A vector.  (Will be updated with the result.) [(x, y, z)]
+///  @param[in]		v	A vector. [(x, y, z)]
 inline void rcVmax(float* mx, const float* v)
 {
 	mx[0] = rcMax(mx[0], v[0]);
@@ -387,6 +666,9 @@ inline void rcVmax(float* mx, const float* v)
 	mx[2] = rcMax(mx[2], v[2]);
 }
 
+/// Performs a vector copy.
+///  @param[out]	dest	The result. [(x, y, z)]
+///  @param[in]		v		The vector to copy. [(x, y, z)]
 inline void rcVcopy(float* dest, const float* v)
 {
 	dest[0] = v[0];
@@ -394,6 +676,10 @@ inline void rcVcopy(float* dest, const float* v)
 	dest[2] = v[2];
 }
 
+/// Returns the distance between two points.
+///  @param[in]		v1	A point. [(x, y, z)]
+///  @param[in]		v2	A point. [(x, y, z)]
+/// @return The distance between the two points.
 inline float rcVdist(const float* v1, const float* v2)
 {
 	float dx = v2[0] - v1[0];
@@ -402,6 +688,10 @@ inline float rcVdist(const float* v1, const float* v2)
 	return rcSqrt(dx*dx + dy*dy + dz*dz);
 }
 
+/// Returns the square of the distance between two points.
+///  @param[in]		v1	A point. [(x, y, z)]
+///  @param[in]		v2	A point. [(x, y, z)]
+/// @return The square of the distance between the two points.
 inline float rcVdistSqr(const float* v1, const float* v2)
 {
 	float dx = v2[0] - v1[0];
@@ -410,6 +700,8 @@ inline float rcVdistSqr(const float* v1, const float* v2)
 	return dx*dx + dy*dy + dz*dz;
 }
 
+/// Normalizes the vector.
+///  @param[in,out]	v	The vector to normalize. [(x, y, z)]
 inline void rcVnormalize(float* v)
 {
 	float d = 1.0f / rcSqrt(rcSqr(v[0]) + rcSqr(v[1]) + rcSqr(v[2]));
@@ -418,271 +710,421 @@ inline void rcVnormalize(float* v)
 	v[2] *= d;
 }
 
-inline bool rcVequal(const float* p0, const float* p1)
-{
-	static const float thr = rcSqr(1.0f/16384.0f);
-	const float d = rcVdistSqr(p0, p1);
-	return d < thr;
-}
-
-// Calculated bounding box of array of vertices.
-// Params:
-//	verts - (in) array of vertices
-//	nv - (in) vertex count
-//	bmin, bmax - (out) bounding box
+/// @}
+/// @name Heightfield Functions
+/// @see rcHeightfield
+/// @{
+
+/// Calculates the bounding box of an array of vertices.
+///  @ingroup recast
+///  @param[in]		verts	An array of vertices. [(x, y, z) * @p nv]
+///  @param[in]		nv		The number of vertices in the @p verts array.
+///  @param[out]	bmin	The minimum bounds of the AABB. [(x, y, z)] [Units: wu]
+///  @param[out]	bmax	The maximum bounds of the AABB. [(x, y, z)] [Units: wu]
 void rcCalcBounds(const float* verts, int nv, float* bmin, float* bmax);
 
-// Calculates grid size based on bounding box and grid cell size.
-// Params:
-//	bmin, bmax - (in) bounding box
-//	cs - (in) grid cell size
-//	w - (out) grid width
-//	h - (out) grid height
+/// Calculates the grid size based on the bounding box and grid cell size.
+///  @ingroup recast
+///  @param[in]		bmin	The minimum bounds of the AABB. [(x, y, z)] [Units: wu]
+///  @param[in]		bmax	The maximum bounds of the AABB. [(x, y, z)] [Units: wu]
+///  @param[in]		cs		The xz-plane cell size. [Limit: > 0] [Units: wu]
+///  @param[out]	w		The width along the x-axis. [Limit: >= 0] [Units: vx]
+///  @param[out]	h		The height along the z-axis. [Limit: >= 0] [Units: vx]
 void rcCalcGridSize(const float* bmin, const float* bmax, float cs, int* w, int* h);
 
-// Creates and initializes new heightfield.
-// Params:
-//	hf - (in/out) heightfield to initialize.
-//	width - (in) width of the heightfield.
-//	height - (in) height of the heightfield.
-//	bmin, bmax - (in) bounding box of the heightfield
-//	cs - (in) grid cell size
-//	ch - (in) grid cell height
+/// Initializes a new heightfield.
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in,out]	hf		The allocated heightfield to initialize.
+///  @param[in]		width	The width of the field along the x-axis. [Limit: >= 0] [Units: vx]
+///  @param[in]		height	The height of the field along the z-axis. [Limit: >= 0] [Units: vx]
+///  @param[in]		bmin	The minimum bounds of the field's AABB. [(x, y, z)] [Units: wu]
+///  @param[in]		bmax	The maximum bounds of the field's AABB. [(x, y, z)] [Units: wu]
+///  @param[in]		cs		The xz-plane cell size to use for the field. [Limit: > 0] [Units: wu]
+///  @param[in]		ch		The y-axis cell size to use for field. [Limit: > 0] [Units: wu]
 bool rcCreateHeightfield(rcContext* ctx, rcHeightfield& hf, int width, int height,
 						 const float* bmin, const float* bmax,
 						 float cs, float ch);
 
-// Sets the RC_WALKABLE_AREA for every triangle whose slope is below
-// the maximum walkable slope angle.
-// Params:
-//	walkableSlopeAngle - (in) maximum slope angle in degrees.
-//	verts - (in) array of vertices
-//	nv - (in) vertex count
-//	tris - (in) array of triangle vertex indices
-//	nt - (in) triangle count
-//	areas - (out) array of triangle area types
+/// Sets the area id of all triangles with a slope below the specified value
+/// to #RC_WALKABLE_AREA.
+///  @ingroup recast
+///  @param[in,out]	ctx					The build context to use during the operation.
+///  @param[in]		walkableSlopeAngle	The maximum slope that is considered walkable.
+///  									[Limits: 0 <= value < 90] [Units: Degrees]
+///  @param[in]		verts				The vertices. [(x, y, z) * @p nv]
+///  @param[in]		nv					The number of vertices.
+///  @param[in]		tris				The triangle vertex indices. [(vertA, vertB, vertC) * @p nt]
+///  @param[in]		nt					The number of triangles.
+///  @param[out]	areas				The triangle area ids. [Length: >= @p nt]
 void rcMarkWalkableTriangles(rcContext* ctx, const float walkableSlopeAngle, const float* verts, int nv,
 							 const int* tris, int nt, unsigned char* areas); 
 
-// Sets the RC_NULL_AREA for every triangle whose slope is steeper than
-// the maximum walkable slope angle.
-// Params:
-//	walkableSlopeAngle - (in) maximum slope angle in degrees.
-//	verts - (in) array of vertices
-//	nv - (in) vertex count
-//	tris - (in) array of triangle vertex indices
-//	nt - (in) triangle count
-//	areas - (out) array of triangle are types
+/// Sets the area id of all triangles with a slope greater than or equal to the specified value to #RC_NULL_AREA.
+///  @ingroup recast
+///  @param[in,out]	ctx					The build context to use during the operation.
+///  @param[in]		walkableSlopeAngle	The maximum slope that is considered walkable.
+///  									[Limits: 0 <= value < 90] [Units: Degrees]
+///  @param[in]		verts				The vertices. [(x, y, z) * @p nv]
+///  @param[in]		nv					The number of vertices.
+///  @param[in]		tris				The triangle vertex indices. [(vertA, vertB, vertC) * @p nt]
+///  @param[in]		nt					The number of triangles.
+///  @param[out]	areas				The triangle area ids. [Length: >= @p nt]
 void rcClearUnwalkableTriangles(rcContext* ctx, const float walkableSlopeAngle, const float* verts, int nv,
 								const int* tris, int nt, unsigned char* areas); 
 
-// Adds span to heightfield.
-// The span addition can set to favor flags. If the span is merged to
-// another span and the new smax is within 'flagMergeThr' units away
-// from the existing span the span flags are merged and stored.
-// Params:
-//	solid - (in) heightfield where the spans is added to
-//  x,y - (in) location on the heightfield where the span is added
-//  smin,smax - (in) spans min/max height
-//  flags - (in) span flags (zero or WALKABLE)
-//  flagMergeThr - (in) merge threshold.
-void rcAddSpan(rcContext* ctx, rcHeightfield& solid, const int x, const int y,
+/// Adds a span to the specified heightfield.
+///  @ingroup recast
+///  @param[in,out]	ctx				The build context to use during the operation.
+///  @param[in,out]	hf				An initialized heightfield.
+///  @param[in]		x				The width index where the span is to be added.
+///  								[Limits: 0 <= value < rcHeightfield::width]
+///  @param[in]		y				The height index where the span is to be added.
+///  								[Limits: 0 <= value < rcHeightfield::height]
+///  @param[in]		smin			The minimum height of the span. [Limit: < @p smax] [Units: vx]
+///  @param[in]		smax			The maximum height of the span. [Limit: <= #RC_SPAN_MAX_HEIGHT] [Units: vx]
+///  @param[in]		area			The area id of the span. [Limit: <= #RC_WALKABLE_AREA)
+///  @param[in]		flagMergeThr	The merge theshold. [Limit: >= 0] [Units: vx]
+void rcAddSpan(rcContext* ctx, rcHeightfield& hf, const int x, const int y,
 			   const unsigned short smin, const unsigned short smax,
-			   const unsigned short area, const int flagMergeThr);
-
-// Rasterizes a triangle into heightfield spans.
-// Params:
-//	v0,v1,v2 - (in) the vertices of the triangle.
-//	area - (in) area type of the triangle.
-//	solid - (in) heightfield where the triangle is rasterized
-//  flagMergeThr - (in) distance in voxel where walkable flag is favored over non-walkable.
+			   const unsigned char area, const int flagMergeThr);
+
+/// Rasterizes a triangle into the specified heightfield.
+///  @ingroup recast
+///  @param[in,out]	ctx				The build context to use during the operation.
+///  @param[in]		v0				Triangle vertex 0 [(x, y, z)]
+///  @param[in]		v1				Triangle vertex 1 [(x, y, z)]
+///  @param[in]		v2				Triangle vertex 2 [(x, y, z)]
+///  @param[in]		area			The area id of the triangle. [Limit: <= #RC_WALKABLE_AREA]
+///  @param[in,out]	solid			An initialized heightfield.
+///  @param[in]		flagMergeThr	The distance where the walkable flag is favored over the non-walkable flag.
+///  								[Limit: >= 0] [Units: vx]
 void rcRasterizeTriangle(rcContext* ctx, const float* v0, const float* v1, const float* v2,
 						 const unsigned char area, rcHeightfield& solid,
 						 const int flagMergeThr = 1);
 
-// Rasterizes indexed triangle mesh into heightfield spans.
-// Params:
-//	verts - (in) array of vertices
-//	nv - (in) vertex count
-//	tris - (in) array of triangle vertex indices
-//	area - (in) array of triangle area types.
-//	nt - (in) triangle count
-//	solid - (in) heightfield where the triangles are rasterized
-//  flagMergeThr - (in) distance in voxel where walkable flag is favored over non-walkable.
+/// Rasterizes an indexed triangle mesh into the specified heightfield.
+///  @ingroup recast
+///  @param[in,out]	ctx				The build context to use during the operation.
+///  @param[in]		verts			The vertices. [(x, y, z) * @p nv]
+///  @param[in]		nv				The number of vertices.
+///  @param[in]		tris			The triangle indices. [(vertA, vertB, vertC) * @p nt]
+///  @param[in]		areas			The area id's of the triangles. [Limit: <= #RC_WALKABLE_AREA] [Size: @p nt]
+///  @param[in]		nt				The number of triangles.
+///  @param[in,out]	solid			An initialized heightfield.
+///  @param[in]		flagMergeThr	The distance where the walkable flag is favored over the non-walkable flag. 
+///  								[Limit: >= 0] [Units: vx]
 void rcRasterizeTriangles(rcContext* ctx, const float* verts, const int nv,
 						  const int* tris, const unsigned char* areas, const int nt,
 						  rcHeightfield& solid, const int flagMergeThr = 1);
 
-// Rasterizes indexed triangle mesh into heightfield spans.
-// Params:
-//	verts - (in) array of vertices
-//	nv - (in) vertex count
-//	tris - (in) array of triangle vertex indices
-//	area - (in) array of triangle area types.
-//	nt - (in) triangle count
-//	solid - (in) heightfield where the triangles are rasterized
-//  flagMergeThr - (in) distance in voxel where walkable flag is favored over non-walkable.
+/// Rasterizes an indexed triangle mesh into the specified heightfield.
+///  @ingroup recast
+///  @param[in,out]	ctx			The build context to use during the operation.
+///  @param[in]		verts		The vertices. [(x, y, z) * @p nv]
+///  @param[in]		nv			The number of vertices.
+///  @param[in]		tris		The triangle indices. [(vertA, vertB, vertC) * @p nt]
+///  @param[in]		areas		The area id's of the triangles. [Limit: <= #RC_WALKABLE_AREA] [Size: @p nt]
+///  @param[in]		nt			The number of triangles.
+///  @param[in,out]	solid		An initialized heightfield.
+///  @param[in]		flagMergeThr	The distance where the walkable flag is favored over the non-walkable flag. 
+///  							[Limit: >= 0] [Units: vx]
 void rcRasterizeTriangles(rcContext* ctx, const float* verts, const int nv,
 						  const unsigned short* tris, const unsigned char* areas, const int nt,
 						  rcHeightfield& solid, const int flagMergeThr = 1);
 
-// Rasterizes the triangles into heightfield spans.
-// Params:
-//	verts - (in) array of vertices
-//	area - (in) array of triangle area types.
-//	nt - (in) triangle count
-//	solid - (in) heightfield where the triangles are rasterized
+/// Rasterizes triangles into the specified heightfield.
+///  @ingroup recast
+///  @param[in,out]	ctx				The build context to use during the operation.
+///  @param[in]		verts			The triangle vertices. [(ax, ay, az, bx, by, bz, cx, by, cx) * @p nt]
+///  @param[in]		areas			The area id's of the triangles. [Limit: <= #RC_WALKABLE_AREA] [Size: @p nt]
+///  @param[in]		nt				The number of triangles.
+///  @param[in,out]	solid			An initialized heightfield.
+///  @param[in]		flagMergeThr	The distance where the walkable flag is favored over the non-walkable flag. 
+///  								[Limit: >= 0] [Units: vx]
 void rcRasterizeTriangles(rcContext* ctx, const float* verts, const unsigned char* areas, const int nt,
 						  rcHeightfield& solid, const int flagMergeThr = 1);
 
-// Marks non-walkable low obstacles as walkable if they are closer than walkableClimb
-// from a walkable surface. Applying this filter allows to step over low hanging
-// low obstacles.
-// Params:
-//	walkableHeight - (in) minimum height where the agent can still walk
-//	solid - (in/out) heightfield describing the solid space
-// TODO: Missuses ledge flag, must be called before rcFilterLedgeSpans!
+/// Marks non-walkable spans as walkable if their maximum is within @p walkableClimp of a walkable neihbor. 
+///  @ingroup recast
+///  @param[in,out]	ctx				The build context to use during the operation.
+///  @param[in]		walkableClimb	Maximum ledge height that is considered to still be traversable. 
+///  								[Limit: >=0] [Units: vx]
+///  @param[in,out]	solid			A fully built heightfield.  (All spans have been added.)
 void rcFilterLowHangingWalkableObstacles(rcContext* ctx, const int walkableClimb, rcHeightfield& solid);
 
-// Removes WALKABLE flag from all spans that are at ledges. This filtering
-// removes possible overestimation of the conservative voxelization so that
-// the resulting mesh will not have regions hanging in air over ledges.
-// Params:
-//	walkableHeight - (in) minimum height where the agent can still walk
-//	walkableClimb - (in) maximum height between grid cells the agent can climb
-//	solid - (in/out) heightfield describing the solid space
+/// Marks spans that are ledges as not-walkable. 
+///  @ingroup recast
+///  @param[in,out]	ctx				The build context to use during the operation.
+///  @param[in]		walkableHeight	Minimum floor to 'ceiling' height that will still allow the floor area to 
+///  								be considered walkable. [Limit: >= 3] [Units: vx]
+///  @param[in]		walkableClimb	Maximum ledge height that is considered to still be traversable. 
+///  								[Limit: >=0] [Units: vx]
+///  @param[in,out]	solid			A fully built heightfield.  (All spans have been added.)
 void rcFilterLedgeSpans(rcContext* ctx, const int walkableHeight,
 						const int walkableClimb, rcHeightfield& solid);
 
-// Removes WALKABLE flag from all spans which have smaller than
-// 'walkableHeight' clearance above them.
-// Params:
-//	walkableHeight - (in) minimum height where the agent can still walk
-//	solid - (in/out) heightfield describing the solid space
+/// Marks walkable spans as not walkable if the clearence above the span is less than the specified height. 
+///  @ingroup recast
+///  @param[in,out]	ctx				The build context to use during the operation.
+///  @param[in]		walkableHeight	Minimum floor to 'ceiling' height that will still allow the floor area to 
+///  								be considered walkable. [Limit: >= 3] [Units: vx]
+///  @param[in,out]	solid			A fully built heightfield.  (All spans have been added.)
 void rcFilterWalkableLowHeightSpans(rcContext* ctx, int walkableHeight, rcHeightfield& solid);
 
-// Returns number of spans contained in a heightfield.
-// Params:
-//	hf - (in) heightfield to be compacted
-// Returns number of spans.
+/// Returns the number of spans contained in the specified heightfield.
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in]		hf		An initialized heightfield.
+///  @returns The number of spans in the heightfield.
 int rcGetHeightFieldSpanCount(rcContext* ctx, rcHeightfield& hf);
 
-// Builds compact representation of the heightfield.
-// Params:
-//	walkableHeight - (in) minimum height where the agent can still walk
-//	walkableClimb - (in) maximum height between grid cells the agent can climb
-//  flags - (in) require flags for a cell to be included in the compact heightfield.
-//	hf - (in) heightfield to be compacted
-//	chf - (out) compact heightfield representing the open space.
-// Returns false if operation ran out of memory.
+/// @}
+/// @name Compact Heightfield Functions
+/// @see rcCompactHeightfield
+/// @{
+
+/// Builds a compact heightfield representing open space, from a heightfield representing solid space.
+///  @ingroup recast
+///  @param[in,out]	ctx				The build context to use during the operation.
+///  @param[in]		walkableHeight	Minimum floor to 'ceiling' height that will still allow the floor area 
+///  								to be considered walkable. [Limit: >= 3] [Units: vx]
+///  @param[in]		walkableClimb	Maximum ledge height that is considered to still be traversable. 
+///  								[Limit: >=0] [Units: vx]
+///  @param[in]		hf				The heightfield to be compacted.
+///  @param[out]	chf				The resulting compact heightfield. (Must be pre-allocated.)
+///  @returns True if the operation completed successfully.
 bool rcBuildCompactHeightfield(rcContext* ctx, const int walkableHeight, const int walkableClimb,
 							   rcHeightfield& hf, rcCompactHeightfield& chf);
 
-// Erodes walkable area.
-// Params:
-//  radius - (in) radius of erosion (max 255).
-//	chf - (in/out) compact heightfield to erode.
-// Returns false if operation ran out of memory.
+/// Erodes the walkable area within the heightfield by the specified radius. 
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in]		radius	The radius of erosion. [Limits: 0 < value < 255] [Units: vx]
+///  @param[in,out]	chf		The populated compact heightfield to erode.
+///  @returns True if the operation completed successfully.
 bool rcErodeWalkableArea(rcContext* ctx, int radius, rcCompactHeightfield& chf);
 
-// Applies median filter to walkable area types, removing noise.
-// Params:
-//	chf - (in/out) compact heightfield to erode.
-// Returns false if operation ran out of memory.
+/// Applies a median filter to walkable area types (based on area id), removing noise.
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in,out]	chf		A populated compact heightfield.
+///  @returns True if the operation completed successfully.
 bool rcMedianFilterWalkableArea(rcContext* ctx, rcCompactHeightfield& chf);
 
-// Marks the area of the convex polygon into the area type of the compact heightfield.
-// Params:
-//  bmin/bmax - (in) bounds of the axis aligned box.
-//  areaId - (in) area ID to mark.
-//	chf - (in/out) compact heightfield to mark.
+/// Applies an area id to all spans within the specified bounding box. (AABB) 
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in]		bmin	The minimum of the bounding box. [(x, y, z)]
+///  @param[in]		bmax	The maximum of the bounding box. [(x, y, z)]
+///  @param[in]		areaId	The area id to apply. [Limit: <= #RC_WALKABLE_AREA]
+///  @param[in,out]	chf		A populated compact heightfield.
 void rcMarkBoxArea(rcContext* ctx, const float* bmin, const float* bmax, unsigned char areaId,
 				   rcCompactHeightfield& chf);
 
-// Marks the area of the convex polygon into the area type of the compact heightfield.
-// Params:
-//  verts - (in) vertices of the convex polygon.
-//  nverts - (in) number of vertices in the polygon.
-//  hmin/hmax - (in) min and max height of the polygon.
-//  areaId - (in) area ID to mark.
-//	chf - (in/out) compact heightfield to mark.
+/// Applies the area id to the all spans within the specified convex polygon. 
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in]		verts	The vertices of the polygon [Fomr: (x, y, z) * @p nverts]
+///  @param[in]		nverts	The number of vertices in the polygon.
+///  @param[in]		hmin	The height of the base of the polygon.
+///  @param[in]		hmax	The height of the top of the polygon.
+///  @param[in]		areaId	The area id to apply. [Limit: <= #RC_WALKABLE_AREA]
+///  @param[in,out]	chf		A populated compact heightfield.
 void rcMarkConvexPolyArea(rcContext* ctx, const float* verts, const int nverts,
 						  const float hmin, const float hmax, unsigned char areaId,
 						  rcCompactHeightfield& chf);
 
-// Builds distance field and stores it into the combat heightfield.
-// Params:
-//	chf - (in/out) compact heightfield representing the open space.
-// Returns false if operation ran out of memory.
+/// Helper function to offset voncex polygons for rcMarkConvexPolyArea.
+///  @ingroup recast
+///  @param[in]		verts		The vertices of the polygon [Form: (x, y, z) * @p nverts]
+///  @param[in]		nverts		The number of vertices in the polygon.
+///  @param[out]	outVerts	The offset vertices (should hold up to 2 * @p nverts) [Form: (x, y, z) * return value]
+///  @param[in]		maxOutVerts	The max number of vertices that can be stored to @p outVerts.
+///  @returns Number of vertices in the offset polygon or 0 if too few vertices in @p outVerts.
+int rcOffsetPoly(const float* verts, const int nverts, const float offset,
+				 float* outVerts, const int maxOutVerts);
+
+/// Applies the area id to all spans within the specified cylinder.
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in]		pos		The center of the base of the cylinder. [Form: (x, y, z)] 
+///  @param[in]		r		The radius of the cylinder.
+///  @param[in]		h		The height of the cylinder.
+///  @param[in]		areaId	The area id to apply. [Limit: <= #RC_WALKABLE_AREA]
+///  @param[in,out]	chf	A populated compact heightfield.
+void rcMarkCylinderArea(rcContext* ctx, const float* pos,
+						const float r, const float h, unsigned char areaId,
+						rcCompactHeightfield& chf);
+
+/// Builds the distance field for the specified compact heightfield. 
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in,out]	chf		A populated compact heightfield.
+///  @returns True if the operation completed successfully.
 bool rcBuildDistanceField(rcContext* ctx, rcCompactHeightfield& chf);
 
-// Divides the walkable heighfied into simple regions using watershed partitioning.
-// Each region has only one contour and no overlaps.
-// The regions are stored in the compact heightfield 'reg' field.
-// The process sometimes creates small regions. If the area of a regions is
-// smaller than 'mergeRegionArea' then the region will be merged with a neighbour
-// region if possible. If multiple regions form an area which is smaller than
-// 'minRegionArea' all the regions belonging to that area will be removed.
-// Here area means the count of spans in an area.
-// Params:
-//	chf - (in/out) compact heightfield representing the open space.
-//	minRegionArea - (in) the smallest allowed region area.
-//	maxMergeRegionArea - (in) the largest allowed region area which can be merged.
-// Returns false if operation ran out of memory.
+/// Builds region data for the heightfield using watershed partitioning. 
+///  @ingroup recast
+///  @param[in,out]	ctx				The build context to use during the operation.
+///  @param[in,out]	chf				A populated compact heightfield.
+///  @param[in]		borderSize		The size of the non-navigable border around the heightfield.
+///  								[Limit: >=0] [Units: vx]
+///  @param[in]		minRegionArea	The minimum number of cells allowed to form isolated island areas.
+///  								[Limit: >=0] [Units: vx].
+///  @param[in]		mergeRegionArea		Any regions with a span count smaller than this value will, if possible,
+///  								be merged with larger regions. [Limit: >=0] [Units: vx] 
+///  @returns True if the operation completed successfully.
 bool rcBuildRegions(rcContext* ctx, rcCompactHeightfield& chf,
 					const int borderSize, const int minRegionArea, const int mergeRegionArea);
 
-// Divides the walkable heighfied into simple regions using simple monotone partitioning.
-// Each region has only one contour and no overlaps.
-// The regions are stored in the compact heightfield 'reg' field.
-// The process sometimes creates small regions. If the area of a regions is
-// smaller than 'mergeRegionArea' then the region will be merged with a neighbour
-// region if possible. If multiple regions form an area which is smaller than
-// 'minRegionArea' all the regions belonging to that area will be removed.
-// Here area means the count of spans in an area.
-// Params:
-//	chf - (in/out) compact heightfield representing the open space.
-//	minRegionArea - (in) the smallest allowed regions size.
-//	maxMergeRegionArea - (in) the largest allowed regions size which can be merged.
-// Returns false if operation ran out of memory.
+/// Builds region data for the heightfield using simple monotone partitioning.
+///  @ingroup recast 
+///  @param[in,out]	ctx				The build context to use during the operation.
+///  @param[in,out]	chf				A populated compact heightfield.
+///  @param[in]		borderSize		The size of the non-navigable border around the heightfield.
+///  								[Limit: >=0] [Units: vx]
+///  @param[in]		minRegionArea	The minimum number of cells allowed to form isolated island areas.
+///  								[Limit: >=0] [Units: vx].
+///  @param[in]		mergeRegionArea	Any regions with a span count smaller than this value will, if possible, 
+///  								be merged with larger regions. [Limit: >=0] [Units: vx] 
+///  @returns True if the operation completed successfully.
 bool rcBuildRegionsMonotone(rcContext* ctx, rcCompactHeightfield& chf,
 							const int borderSize, const int minRegionArea, const int mergeRegionArea);
 
-// Builds simplified contours from the regions outlines.
-// Params:
-//	chf - (in) compact heightfield which has regions set.
-//	maxError - (in) maximum allowed distance between simplified contour and cells.
-//	maxEdgeLen - (in) maximum allowed contour edge length in cells.
-//	cset - (out) Resulting contour set.
-//	flags - (in) build flags, see rcBuildContoursFlags.
-// Returns false if operation ran out of memory.
+
+/// Sets the neighbor connection data for the specified direction.
+///  @param[in]		s		The span to update.
+///  @param[in]		dir		The direction to set. [Limits: 0 <= value < 4]
+///  @param[in]		i		The index of the neighbor span.
+inline void rcSetCon(rcCompactSpan& s, int dir, int i)
+{
+	const unsigned int shift = (unsigned int)dir*6;
+	unsigned int con = s.con;
+	s.con = (con & ~(0x3f << shift)) | (((unsigned int)i & 0x3f) << shift);
+}
+
+/// Gets neighbor connection data for the specified direction.
+///  @param[in]		s		The span to check.
+///  @param[in]		dir		The direction to check. [Limits: 0 <= value < 4]
+///  @return The neighbor connection data for the specified direction,
+///  	or #RC_NOT_CONNECTED if there is no connection.
+inline int rcGetCon(const rcCompactSpan& s, int dir)
+{
+	const unsigned int shift = (unsigned int)dir*6;
+	return (s.con >> shift) & 0x3f;
+}
+
+/// Gets the standard width (x-axis) offset for the specified direction.
+///  @param[in]		dir		The direction. [Limits: 0 <= value < 4]
+///  @return The width offset to apply to the current cell position to move
+///  	in the direction.
+inline int rcGetDirOffsetX(int dir)
+{
+	const int offset[4] = { -1, 0, 1, 0, };
+	return offset[dir&0x03];
+}
+
+/// Gets the standard height (z-axis) offset for the specified direction.
+///  @param[in]		dir		The direction. [Limits: 0 <= value < 4]
+///  @return The height offset to apply to the current cell position to move
+///  	in the direction.
+inline int rcGetDirOffsetY(int dir)
+{
+	const int offset[4] = { 0, 1, 0, -1 };
+	return offset[dir&0x03];
+}
+
+/// @}
+/// @name Layer, Contour, Polymesh, and Detail Mesh Functions
+/// @see rcHeightfieldLayer, rcContourSet, rcPolyMesh, rcPolyMeshDetail
+/// @{
+
+/// Builds a layer set from the specified compact heightfield.
+///  @ingroup recast
+///  @param[in,out]	ctx			The build context to use during the operation.
+///  @param[in]		chf			A fully built compact heightfield.
+///  @param[in]		borderSize	The size of the non-navigable border around the heightfield. [Limit: >=0] 
+///  							[Units: vx]
+///  @param[in]		walkableHeight	Minimum floor to 'ceiling' height that will still allow the floor area 
+///  							to be considered walkable. [Limit: >= 3] [Units: vx]
+///  @param[out]	lset		The resulting layer set. (Must be pre-allocated.)
+///  @returns True if the operation completed successfully.
+bool rcBuildHeightfieldLayers(rcContext* ctx, rcCompactHeightfield& chf, 
+							  const int borderSize, const int walkableHeight,
+							  rcHeightfieldLayerSet& lset);
+
+/// Builds a contour set from the region outlines in the provided compact heightfield.
+///  @ingroup recast
+///  @param[in,out]	ctx			The build context to use during the operation.
+///  @param[in]		chf			A fully built compact heightfield.
+///  @param[in]		maxError	The maximum distance a simplfied contour's border edges should deviate 
+///  							the original raw contour. [Limit: >=0] [Units: wu]
+///  @param[in]		maxEdgeLen	The maximum allowed length for contour edges along the border of the mesh. 
+///  							[Limit: >=0] [Units: vx]
+///  @param[out]	cset		The resulting contour set. (Must be pre-allocated.)
+///  @param[in]		buildFlags	The build flags. (See: #rcBuildContoursFlags)
+///  @returns True if the operation completed successfully.
 bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf,
 					 const float maxError, const int maxEdgeLen,
 					 rcContourSet& cset, const int flags = RC_CONTOUR_TESS_WALL_EDGES);
 
-// Builds connected convex polygon mesh from contour polygons.
-// Params:
-//	cset - (in) contour set.
-//	nvp - (in) maximum number of vertices per polygon.
-//	mesh - (out) poly mesh.
-// Returns false if operation ran out of memory.
-bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, int nvp, rcPolyMesh& mesh);
-
+/// Builds a polygon mesh from the provided contours.
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in]		cset	A fully built contour set.
+///  @param[in]		nvp		The maximum number of vertices allowed for polygons generated during the 
+///  						contour to polygon conversion process. [Limit: >= 3] 
+///  @param[out]	mesh	The resulting polygon mesh. (Must be re-allocated.)
+///  @returns True if the operation completed successfully.
+bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, const int nvp, rcPolyMesh& mesh);
+
+/// Merges multiple polygon meshes into a single mesh.
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in]		meshes	An array of polygon meshes to merge. [Size: @p nmeshes]
+///  @param[in]		nmeshes	The number of polygon meshes in the meshes array.
+///  @param[in]		mesh	The resulting polygon mesh. (Must be pre-allocated.)
+///  @returns True if the operation completed successfully.
 bool rcMergePolyMeshes(rcContext* ctx, rcPolyMesh** meshes, const int nmeshes, rcPolyMesh& mesh);
 
-// Builds detail triangle mesh for each polygon in the poly mesh.
-// Params:
-//	mesh - (in) poly mesh to detail.
-//	chf - (in) compact height field, used to query height for new vertices.
-//  sampleDist - (in) spacing between height samples used to generate more detail into mesh.
-//  sampleMaxError - (in) maximum allowed distance between simplified detail mesh and height sample.
-//	pmdtl - (out) detail mesh.
-// Returns false if operation ran out of memory.
+/// Builds a detail mesh from the provided polygon mesh.
+///  @ingroup recast
+///  @param[in,out]	ctx				The build context to use during the operation.
+///  @param[in]		mesh			A fully built polygon mesh.
+///  @param[in]		chf				The compact heightfield used to build the polygon mesh.
+///  @param[in]		sampleDist		Sets the distance to use when samping the heightfield. [Limit: >=0] [Units: wu]
+///  @param[in]		sampleMaxError	The maximum distance the detail mesh surface should deviate from 
+///  								heightfield data. [Limit: >=0] [Units: wu]
+///  @param[out]	dmesh			The resulting detail mesh.  (Must be pre-allocated.)
+///  @returns True if the operation completed successfully.
 bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompactHeightfield& chf,
 						   const float sampleDist, const float sampleMaxError,
 						   rcPolyMeshDetail& dmesh);
 
+/// Copies the poly mesh data from src to dst.
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in]		src		The source mesh to copy from.
+///  @param[out]	dst		The resulting detail mesh. (Must be pre-allocated, must be empty mesh.)
+///  @returns True if the operation completed successfully.
+bool rcCopyPolyMesh(rcContext* ctx, const rcPolyMesh& src, rcPolyMesh& dst);
+
+/// Merges multiple detail meshes into a single detail mesh.
+///  @ingroup recast
+///  @param[in,out]	ctx		The build context to use during the operation.
+///  @param[in]		meshes	An array of detail meshes to merge. [Size: @p nmeshes]
+///  @param[in]		nmeshes	The number of detail meshes in the meshes array.
+///  @param[out]	mesh	The resulting detail mesh. (Must be pre-allocated.)
+///  @returns True if the operation completed successfully.
 bool rcMergePolyMeshDetails(rcContext* ctx, rcPolyMeshDetail** meshes, const int nmeshes, rcPolyMeshDetail& mesh);
 
+/// @}
 
 #endif // RECAST_H
+
+///////////////////////////////////////////////////////////////////////////
+
+// Due to the large amount of detail documentation for this file, 
+// the content normally located at the end of the header file has been separated
+// out to a file in /Docs/Extern.
diff --git a/dep/recastnavigation/Recast/Include/RecastAlloc.h b/dep/recastnavigation/Recast/Include/RecastAlloc.h
index 9a316374a73..438be9ea56b 100644
--- a/dep/recastnavigation/Recast/Include/RecastAlloc.h
+++ b/dep/recastnavigation/Recast/Include/RecastAlloc.h
@@ -19,23 +19,45 @@
 #ifndef RECASTALLOC_H
 #define RECASTALLOC_H
 
+/// Provides hint values to the memory allocator on how long the
+/// memory is expected to be used.
 enum rcAllocHint
 {
-	RC_ALLOC_PERM,		// Memory persist after a function call.
-	RC_ALLOC_TEMP		// Memory used temporarily within a function.
+	RC_ALLOC_PERM,		///< Memory will persist after a function call.
+	RC_ALLOC_TEMP		///< Memory used temporarily within a function.
 };
 
+/// A memory allocation function.
+//  @param[in]		size			The size, in bytes of memory, to allocate.
+//  @param[in]		rcAllocHint	A hint to the allocator on how long the memory is expected to be in use.
+//  @return A pointer to the beginning of the allocated memory block, or null if the allocation failed.
+///  @see rcAllocSetCustom
 typedef void* (rcAllocFunc)(int size, rcAllocHint hint);
+
+/// A memory deallocation function.
+///  @param[in]		ptr		A pointer to a memory block previously allocated using #rcAllocFunc.
+/// @see rcAllocSetCustom
 typedef void (rcFreeFunc)(void* ptr);
 
+/// Sets the base custom allocation functions to be used by Recast.
+///  @param[in]		allocFunc	The memory allocation function to be used by #rcAlloc
+///  @param[in]		freeFunc	The memory de-allocation function to be used by #rcFree
 void rcAllocSetCustom(rcAllocFunc *allocFunc, rcFreeFunc *freeFunc);
 
+/// Allocates a memory block.
+///  @param[in]		size	The size, in bytes of memory, to allocate.
+///  @param[in]		hint	A hint to the allocator on how long the memory is expected to be in use.
+///  @return A pointer to the beginning of the allocated memory block, or null if the allocation failed.
+/// @see rcFree
 void* rcAlloc(int size, rcAllocHint hint);
-void rcFree(void* ptr);
 
+/// Deallocates a memory block.
+///  @param[in]		ptr		A pointer to a memory block previously allocated using #rcAlloc.
+/// @see rcAlloc
+void rcFree(void* ptr);
 
 
-// Simple dynamic array ints.
+/// A simple dynamic array of integers.
 class rcIntArray
 {
 	int* m_data;
@@ -43,26 +65,59 @@ class rcIntArray
 	inline rcIntArray(const rcIntArray&);
 	inline rcIntArray& operator=(const rcIntArray&);
 public:
+
+	/// Constructs an instance with an initial array size of zero.
 	inline rcIntArray() : m_data(0), m_size(0), m_cap(0) {}
+
+	/// Constructs an instance initialized to the specified size.
+	///  @param[in]		n	The initial size of the integer array.
 	inline rcIntArray(int n) : m_data(0), m_size(0), m_cap(0) { resize(n); }
 	inline ~rcIntArray() { rcFree(m_data); }
+
+	/// Specifies the new size of the integer array.
+	///  @param[in]		n	The new size of the integer array.
 	void resize(int n);
+
+	/// Push the specified integer onto the end of the array and increases the size by one.
+	///  @param[in]		item	The new value.
 	inline void push(int item) { resize(m_size+1); m_data[m_size-1] = item; }
+
+	/// Returns the value at the end of the array and reduces the size by one.
+	///  @return The value at the end of the array.
 	inline int pop() { if (m_size > 0) m_size--; return m_data[m_size]; }
+
+	/// The value at the specified array index.
+	/// @warning Does not provide overflow protection.
+	///  @param[in]		i	The index of the value.
 	inline const int& operator[](int i) const { return m_data[i]; }
+
+	/// The value at the specified array index.
+	/// @warning Does not provide overflow protection.
+	///  @param[in]		i	The index of the value.
 	inline int& operator[](int i) { return m_data[i]; }
+
+	/// The current size of the integer array.
 	inline int size() const { return m_size; }
 };
 
-// Simple internal helper class to delete array in scope
+/// A simple helper class used to delete an array when it goes out of scope.
+/// @note This class is rarely if ever used by the end user.
 template<class T> class rcScopedDelete
 {
 	T* ptr;
 	inline T* operator=(T* p);
 public:
+
+	/// Constructs an instance with a null pointer.
 	inline rcScopedDelete() : ptr(0) {}
+
+	/// Constructs an instance with the specified pointer.
+	///  @param[in]		p	An pointer to an allocated array.
 	inline rcScopedDelete(T* p) : ptr(p) {}
 	inline ~rcScopedDelete() { rcFree(ptr); }
+
+	/// The root array pointer.
+	///  @return The root array pointer.
 	inline operator T*() { return ptr; }
 };
 
diff --git a/dep/recastnavigation/Recast/Include/RecastAssert.h b/dep/recastnavigation/Recast/Include/RecastAssert.h
index b58b8fcd286..2aca0d9a14f 100644
--- a/dep/recastnavigation/Recast/Include/RecastAssert.h
+++ b/dep/recastnavigation/Recast/Include/RecastAssert.h
@@ -24,7 +24,7 @@
 
 #ifdef NDEBUG
 // From http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/
-#	define rcAssert(x) do { (void)sizeof(x); } while(__LINE__==-1,false)  
+#	define rcAssert(x) do { (void)sizeof(x); } while((void)(__LINE__==-1),false)  
 #else
 #	include <assert.h> 
 #	define rcAssert assert
diff --git a/dep/recastnavigation/Recast/Source/Recast.cpp b/dep/recastnavigation/Recast/Source/Recast.cpp
index d051418e810..803daac3bcf 100644
--- a/dep/recastnavigation/Recast/Source/Recast.cpp
+++ b/dep/recastnavigation/Recast/Source/Recast.cpp
@@ -32,7 +32,26 @@ float rcSqrt(float x)
 	return sqrtf(x);
 }
 
+/// @class rcContext
+/// @par
+///
+/// This class does not provide logging or timer functionality on its 
+/// own.  Both must be provided by a concrete implementation 
+/// by overriding the protected member functions.  Also, this class does not 
+/// provide an interface for extracting log messages. (Only adding them.) 
+/// So concrete implementations must provide one.
+///
+/// If no logging or timers are required, just pass an instance of this 
+/// class through the Recast build process.
+///
 
+/// @par
+///
+/// Example:
+/// @code
+/// // Where ctx is an instance of rcContext and filepath is a char array.
+/// ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Could not load '%s'", filepath);
+/// @endcode
 void rcContext::log(const rcLogCategory category, const char* format, ...)
 {
 	if (!m_logEnabled)
@@ -90,6 +109,28 @@ void rcFreeCompactHeightfield(rcCompactHeightfield* chf)
 	rcFree(chf);
 }
 
+
+rcHeightfieldLayerSet* rcAllocHeightfieldLayerSet()
+{
+	rcHeightfieldLayerSet* lset = (rcHeightfieldLayerSet*)rcAlloc(sizeof(rcHeightfieldLayerSet), RC_ALLOC_PERM);
+	memset(lset, 0, sizeof(rcHeightfieldLayerSet));
+	return lset;
+}
+
+void rcFreeHeightfieldLayerSet(rcHeightfieldLayerSet* lset)
+{
+	if (!lset) return;
+	for (int i = 0; i < lset->nlayers; ++i)
+	{
+		rcFree(lset->layers[i].heights);
+		rcFree(lset->layers[i].areas);
+		rcFree(lset->layers[i].cons);
+	}
+	rcFree(lset->layers);
+	rcFree(lset);
+}
+
+
 rcContourSet* rcAllocContourSet()
 {
 	rcContourSet* cset = (rcContourSet*)rcAlloc(sizeof(rcContourSet), RC_ALLOC_PERM);
@@ -143,7 +184,6 @@ void rcFreePolyMeshDetail(rcPolyMeshDetail* dmesh)
 	rcFree(dmesh);
 }
 
-
 void rcCalcBounds(const float* verts, int nv, float* bmin, float* bmax)
 {
 	// Calculate bounding box.
@@ -163,6 +203,11 @@ void rcCalcGridSize(const float* bmin, const float* bmax, float cs, int* w, int*
 	*h = (int)((bmax[2] - bmin[2])/cs+0.5f);
 }
 
+/// @par
+///
+/// See the #rcConfig documentation for more information on the configuration parameters.
+/// 
+/// @see rcAllocHeightfield, rcHeightfield 
 bool rcCreateHeightfield(rcContext* /*ctx*/, rcHeightfield& hf, int width, int height,
 						 const float* bmin, const float* bmax,
 						 float cs, float ch)
@@ -192,6 +237,14 @@ static void calcTriNormal(const float* v0, const float* v1, const float* v2, flo
 	rcVnormalize(norm);
 }
 
+/// @par
+///
+/// Only sets the aread id's for the walkable triangles.  Does not alter the
+/// area id's for unwalkable triangles.
+/// 
+/// See the #rcConfig documentation for more information on the configuration parameters.
+/// 
+/// @see rcHeightfield, rcClearUnwalkableTriangles, rcRasterizeTriangles
 void rcMarkWalkableTriangles(rcContext* /*ctx*/, const float walkableSlopeAngle,
 							 const float* verts, int /*nv*/,
 							 const int* tris, int nt,
@@ -214,6 +267,14 @@ void rcMarkWalkableTriangles(rcContext* /*ctx*/, const float walkableSlopeAngle,
 	}
 }
 
+/// @par
+///
+/// Only sets the aread id's for the unwalkable triangles.  Does not alter the
+/// area id's for walkable triangles.
+/// 
+/// See the #rcConfig documentation for more information on the configuration parameters.
+/// 
+/// @see rcHeightfield, rcClearUnwalkableTriangles, rcRasterizeTriangles
 void rcClearUnwalkableTriangles(rcContext* /*ctx*/, const float walkableSlopeAngle,
 								const float* verts, int /*nv*/,
 								const int* tris, int nt,
@@ -258,6 +319,15 @@ int rcGetHeightFieldSpanCount(rcContext* /*ctx*/, rcHeightfield& hf)
 	return spanCount;
 }
 
+/// @par
+///
+/// This is just the beginning of the process of fully building a compact heightfield.
+/// Various filters may be applied applied, then the distance field and regions built.
+/// E.g: #rcBuildDistanceField and #rcBuildRegions
+///
+/// See the #rcConfig documentation for more information on the configuration parameters.
+///
+/// @see rcAllocCompactHeightfield, rcHeightfield, rcCompactHeightfield, rcConfig
 bool rcBuildCompactHeightfield(rcContext* ctx, const int walkableHeight, const int walkableClimb,
 							   rcHeightfield& hf, rcCompactHeightfield& chf)
 {
@@ -369,13 +439,13 @@ bool rcBuildCompactHeightfield(rcContext* ctx, const int walkableHeight, const i
 						if ((top - bot) >= walkableHeight && rcAbs((int)ns.y - (int)s.y) <= walkableClimb)
 						{
 							// Mark direction as walkable.
-							const int idx = k - (int)nc.index;
-							if (idx < 0 || idx > MAX_LAYERS)
+							const int lidx = k - (int)nc.index;
+							if (lidx < 0 || lidx > MAX_LAYERS)
 							{
-								tooHighNeighbour = rcMax(tooHighNeighbour, idx);
+								tooHighNeighbour = rcMax(tooHighNeighbour, lidx);
 								continue;
 							}
-							rcSetCon(s, dir, idx);
+							rcSetCon(s, dir, lidx);
 							break;
 						}
 					}
diff --git a/dep/recastnavigation/Recast/Source/RecastAlloc.cpp b/dep/recastnavigation/Recast/Source/RecastAlloc.cpp
index 2c7396a1bfa..b5ec1516146 100644
--- a/dep/recastnavigation/Recast/Source/RecastAlloc.cpp
+++ b/dep/recastnavigation/Recast/Source/RecastAlloc.cpp
@@ -33,24 +33,45 @@ static void rcFreeDefault(void *ptr)
 static rcAllocFunc* sRecastAllocFunc = rcAllocDefault;
 static rcFreeFunc* sRecastFreeFunc = rcFreeDefault;
 
+/// @see rcAlloc, rcFree
 void rcAllocSetCustom(rcAllocFunc *allocFunc, rcFreeFunc *freeFunc)
 {
 	sRecastAllocFunc = allocFunc ? allocFunc : rcAllocDefault;
 	sRecastFreeFunc = freeFunc ? freeFunc : rcFreeDefault;
 }
 
+/// @see rcAllocSetCustom
 void* rcAlloc(int size, rcAllocHint hint)
 {
 	return sRecastAllocFunc(size, hint);
 }
 
+/// @par
+///
+/// @warning This function leaves the value of @p ptr unchanged.  So it still
+/// points to the same (now invalid) location, and not to null.
+/// 
+/// @see rcAllocSetCustom
 void rcFree(void* ptr)
 {
 	if (ptr)
 		sRecastFreeFunc(ptr);
 }
 
+/// @class rcIntArray
+///
+/// While it is possible to pre-allocate a specific array size during 
+/// construction or by using the #resize method, certain methods will 
+/// automatically resize the array as needed.
+///
+/// @warning The array memory is not initialized to zero when the size is 
+/// manually set during construction or when using #resize.
 
+/// @par
+///
+/// Using this method ensures the array is at least large enough to hold
+/// the specified number of elements.  This can improve performance by
+/// avoiding auto-resizing during use.
 void rcIntArray::resize(int n)
 {
 	if (n > m_cap)
diff --git a/dep/recastnavigation/Recast/Source/RecastArea.cpp b/dep/recastnavigation/Recast/Source/RecastArea.cpp
index e89caee2a49..1a338cd9b8c 100644
--- a/dep/recastnavigation/Recast/Source/RecastArea.cpp
+++ b/dep/recastnavigation/Recast/Source/RecastArea.cpp
@@ -26,7 +26,14 @@
 #include "RecastAlloc.h"
 #include "RecastAssert.h"
 
-
+/// @par 
+/// 
+/// Basically, any spans that are closer to a boundary or obstruction than the specified radius 
+/// are marked as unwalkable.
+///
+/// This method is usually called immediately after the heightfield has been built.
+///
+/// @see rcCompactHeightfield, rcBuildCompactHeightfield, rcConfig::walkableRadius
 bool rcErodeWalkableArea(rcContext* ctx, int radius, rcCompactHeightfield& chf)
 {
 	rcAssert(ctx);
@@ -54,14 +61,26 @@ bool rcErodeWalkableArea(rcContext* ctx, int radius, rcCompactHeightfield& chf)
 			const rcCompactCell& c = chf.cells[x+y*w];
 			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
 			{
-				if (chf.areas[i] != RC_NULL_AREA)
+				if (chf.areas[i] == RC_NULL_AREA)
+				{
+					dist[i] = 0;
+				}
+				else
 				{
 					const rcCompactSpan& s = chf.spans[i];
 					int nc = 0;
 					for (int dir = 0; dir < 4; ++dir)
 					{
 						if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
-							nc++;
+						{
+							const int nx = x + rcGetDirOffsetX(dir);
+							const int ny = y + rcGetDirOffsetY(dir);
+							const int nidx = (int)chf.cells[nx+ny*w].index + rcGetCon(s, dir);
+							if (chf.areas[nidx] != RC_NULL_AREA)
+							{
+								nc++;
+							}
+						}
 					}
 					// At least one missing neighbour.
 					if (nc != 4)
@@ -213,7 +232,12 @@ static void insertSort(unsigned char* a, const int n)
 	}
 }
 
-
+/// @par
+///
+/// This filter is usually applied after applying area id's using functions
+/// such as #rcMarkBoxArea, #rcMarkConvexPolyArea, and #rcMarkCylinderArea.
+/// 
+/// @see rcCompactHeightfield
 bool rcMedianFilterWalkableArea(rcContext* ctx, rcCompactHeightfield& chf)
 {
 	rcAssert(ctx);
@@ -288,6 +312,11 @@ bool rcMedianFilterWalkableArea(rcContext* ctx, rcCompactHeightfield& chf)
 	return true;
 }
 
+/// @par
+///
+/// The value of spacial parameters are in world units.
+/// 
+/// @see rcCompactHeightfield, rcMedianFilterWalkableArea
 void rcMarkBoxArea(rcContext* ctx, const float* bmin, const float* bmax, unsigned char areaId,
 				   rcCompactHeightfield& chf)
 {
@@ -322,7 +351,8 @@ void rcMarkBoxArea(rcContext* ctx, const float* bmin, const float* bmax, unsigne
 				rcCompactSpan& s = chf.spans[i];
 				if ((int)s.y >= miny && (int)s.y <= maxy)
 				{
-					chf.areas[i] = areaId;
+					if (chf.areas[i] != RC_NULL_AREA)
+						chf.areas[i] = areaId;
 				}
 			}
 		}
@@ -347,6 +377,14 @@ static int pointInPoly(int nvert, const float* verts, const float* p)
 	return c;
 }
 
+/// @par
+///
+/// The value of spacial parameters are in world units.
+/// 
+/// The y-values of the polygon vertices are ignored. So the polygon is effectively 
+/// projected onto the xz-plane at @p hmin, then extruded to @p hmax.
+/// 
+/// @see rcCompactHeightfield, rcMedianFilterWalkableArea
 void rcMarkConvexPolyArea(rcContext* ctx, const float* verts, const int nverts,
 						  const float hmin, const float hmax, unsigned char areaId,
 						  rcCompactHeightfield& chf)
@@ -393,6 +431,8 @@ void rcMarkConvexPolyArea(rcContext* ctx, const float* verts, const int nverts,
 			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
 			{
 				rcCompactSpan& s = chf.spans[i];
+				if (chf.areas[i] == RC_NULL_AREA)
+					continue;
 				if ((int)s.y >= miny && (int)s.y <= maxy)
 				{
 					float p[3];
@@ -411,3 +451,152 @@ void rcMarkConvexPolyArea(rcContext* ctx, const float* verts, const int nverts,
 
 	ctx->stopTimer(RC_TIMER_MARK_CONVEXPOLY_AREA);
 }
+
+int rcOffsetPoly(const float* verts, const int nverts, const float offset,
+				 float* outVerts, const int maxOutVerts)
+{
+	const float	MITER_LIMIT = 1.20f;
+
+	int n = 0;
+
+	for (int i = 0; i < nverts; i++)
+	{
+		const int a = (i+nverts-1) % nverts;
+		const int b = i;
+		const int c = (i+1) % nverts;
+		const float* va = &verts[a*3];
+		const float* vb = &verts[b*3];
+		const float* vc = &verts[c*3];
+		float dx0 = vb[0] - va[0];
+		float dy0 = vb[2] - va[2];
+		float d0 = dx0*dx0 + dy0*dy0;
+		if (d0 > 1e-6f)
+		{
+			d0 = 1.0f/rcSqrt(d0);
+			dx0 *= d0;
+			dy0 *= d0;
+		}
+		float dx1 = vc[0] - vb[0];
+		float dy1 = vc[2] - vb[2];
+		float d1 = dx1*dx1 + dy1*dy1;
+		if (d1 > 1e-6f)
+		{
+			d1 = 1.0f/rcSqrt(d1);
+			dx1 *= d1;
+			dy1 *= d1;
+		}
+		const float dlx0 = -dy0;
+		const float dly0 = dx0;
+		const float dlx1 = -dy1;
+		const float dly1 = dx1;
+		float cross = dx1*dy0 - dx0*dy1;
+		float dmx = (dlx0 + dlx1) * 0.5f;
+		float dmy = (dly0 + dly1) * 0.5f;
+		float dmr2 = dmx*dmx + dmy*dmy;
+		bool bevel = dmr2 * MITER_LIMIT*MITER_LIMIT < 1.0f;
+		if (dmr2 > 1e-6f)
+		{
+			const float scale = 1.0f / dmr2;
+			dmx *= scale;
+			dmy *= scale;
+		}
+
+		if (bevel && cross < 0.0f)
+		{
+			if (n+2 >= maxOutVerts)
+				return 0;
+			float d = (1.0f - (dx0*dx1 + dy0*dy1))*0.5f;
+			outVerts[n*3+0] = vb[0] + (-dlx0+dx0*d)*offset;
+			outVerts[n*3+1] = vb[1];
+			outVerts[n*3+2] = vb[2] + (-dly0+dy0*d)*offset;
+			n++;
+			outVerts[n*3+0] = vb[0] + (-dlx1-dx1*d)*offset;
+			outVerts[n*3+1] = vb[1];
+			outVerts[n*3+2] = vb[2] + (-dly1-dy1*d)*offset;
+			n++;
+		}
+		else
+		{
+			if (n+1 >= maxOutVerts)
+				return 0;
+			outVerts[n*3+0] = vb[0] - dmx*offset;
+			outVerts[n*3+1] = vb[1];
+			outVerts[n*3+2] = vb[2] - dmy*offset;
+			n++;
+		}
+	}
+	
+	return n;
+}
+
+
+/// @par
+///
+/// The value of spacial parameters are in world units.
+/// 
+/// @see rcCompactHeightfield, rcMedianFilterWalkableArea
+void rcMarkCylinderArea(rcContext* ctx, const float* pos,
+						const float r, const float h, unsigned char areaId,
+						rcCompactHeightfield& chf)
+{
+	rcAssert(ctx);
+	
+	ctx->startTimer(RC_TIMER_MARK_CYLINDER_AREA);
+	
+	float bmin[3], bmax[3];
+	bmin[0] = pos[0] - r;
+	bmin[1] = pos[1];
+	bmin[2] = pos[2] - r;
+	bmax[0] = pos[0] + r;
+	bmax[1] = pos[1] + h;
+	bmax[2] = pos[2] + r;
+	const float r2 = r*r;
+	
+	int minx = (int)((bmin[0]-chf.bmin[0])/chf.cs);
+	int miny = (int)((bmin[1]-chf.bmin[1])/chf.ch);
+	int minz = (int)((bmin[2]-chf.bmin[2])/chf.cs);
+	int maxx = (int)((bmax[0]-chf.bmin[0])/chf.cs);
+	int maxy = (int)((bmax[1]-chf.bmin[1])/chf.ch);
+	int maxz = (int)((bmax[2]-chf.bmin[2])/chf.cs);
+	
+	if (maxx < 0) return;
+	if (minx >= chf.width) return;
+	if (maxz < 0) return;
+	if (minz >= chf.height) return;
+	
+	if (minx < 0) minx = 0;
+	if (maxx >= chf.width) maxx = chf.width-1;
+	if (minz < 0) minz = 0;
+	if (maxz >= chf.height) maxz = chf.height-1;	
+	
+	
+	for (int z = minz; z <= maxz; ++z)
+	{
+		for (int x = minx; x <= maxx; ++x)
+		{
+			const rcCompactCell& c = chf.cells[x+z*chf.width];
+			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
+			{
+				rcCompactSpan& s = chf.spans[i];
+				
+				if (chf.areas[i] == RC_NULL_AREA)
+					continue;
+				
+				if ((int)s.y >= miny && (int)s.y <= maxy)
+				{
+					const float sx = chf.bmin[0] + (x+0.5f)*chf.cs; 
+					const float sz = chf.bmin[2] + (z+0.5f)*chf.cs; 
+					const float dx = sx - pos[0];
+					const float dz = sz - pos[2];
+					
+					if (dx*dx + dz*dz < r2)
+					{
+						chf.areas[i] = areaId;
+					}
+				}
+			}
+		}
+	}
+	
+	ctx->stopTimer(RC_TIMER_MARK_CYLINDER_AREA);
+}
diff --git a/dep/recastnavigation/Recast/Source/RecastContour.cpp b/dep/recastnavigation/Recast/Source/RecastContour.cpp
index 1906b6e6f44..5c324bcedfe 100644
--- a/dep/recastnavigation/Recast/Source/RecastContour.cpp
+++ b/dep/recastnavigation/Recast/Source/RecastContour.cpp
@@ -340,7 +340,7 @@ static void simplifyContour(rcIntArray& points, rcIntArray& simplified,
 			endi = ai;
 		}
 		
-		// Tessellate only outer edges oredges between areas.
+		// Tessellate only outer edges or edges between areas.
 		if ((points[ci*4+3] & RC_CONTOUR_REG_MASK) == 0 ||
 			(points[ci*4+3] & RC_AREA_BORDER))
 		{
@@ -420,15 +420,13 @@ static void simplifyContour(rcIntArray& points, rcIntArray& simplified,
 					// Round based on the segments in lexilogical order so that the
 					// max tesselation is consistent regardles in which direction
 					// segments are traversed.
-					if (bx > ax || (bx == ax && bz > az))
+					const int n = bi < ai ? (bi+pn - ai) : (bi - ai);
+					if (n > 1)
 					{
-						const int n = bi < ai ? (bi+pn - ai) : (bi - ai);
-						maxi = (ai + n/2) % pn;
-					}
-					else
-					{
-						const int n = bi < ai ? (bi+pn - ai) : (bi - ai);
-						maxi = (ai + (n+1)/2) % pn;
+						if (bx > ax || (bx == ax && bz > az))
+							maxi = (ai + n/2) % pn;
+						else
+							maxi = (ai + (n+1)/2) % pn;
 					}
 				}
 			}
@@ -466,7 +464,7 @@ static void simplifyContour(rcIntArray& points, rcIntArray& simplified,
 		// and the neighbour region is take from the next raw point.
 		const int ai = (simplified[i*4+3]+1) % pn;
 		const int bi = simplified[i*4+3];
-		simplified[i*4+3] = (points[ai*4+3] & RC_CONTOUR_REG_MASK) | (points[bi*4+3] & RC_BORDER_VERTEX);
+		simplified[i*4+3] = (points[ai*4+3] & (RC_CONTOUR_REG_MASK|RC_AREA_BORDER)) | (points[bi*4+3] & RC_BORDER_VERTEX);
 	}
 	
 }
@@ -592,6 +590,19 @@ static bool mergeContours(rcContour& ca, rcContour& cb, int ia, int ib)
 	return true;
 }
 
+/// @par
+///
+/// The raw contours will match the region outlines exactly. The @p maxError and @p maxEdgeLen
+/// parameters control how closely the simplified contours will match the raw contours.
+///
+/// Simplified contours are generated such that the vertices for portals between areas match up. 
+/// (They are considered mandatory vertices.)
+///
+/// Setting @p maxEdgeLength to zero will disabled the edge length feature.
+/// 
+/// See the #rcConfig documentation for more information on the configuration parameters.
+/// 
+/// @see rcAllocContourSet, rcCompactHeightfield, rcContourSet, rcConfig
 bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf,
 					 const float maxError, const int maxEdgeLen,
 					 rcContourSet& cset, const int buildFlags)
@@ -600,13 +611,26 @@ bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf,
 	
 	const int w = chf.width;
 	const int h = chf.height;
+	const int borderSize = chf.borderSize;
 	
 	ctx->startTimer(RC_TIMER_BUILD_CONTOURS);
 	
 	rcVcopy(cset.bmin, chf.bmin);
 	rcVcopy(cset.bmax, chf.bmax);
+	if (borderSize > 0)
+	{
+		// If the heightfield was build with bordersize, remove the offset.
+		const float pad = borderSize*chf.cs;
+		cset.bmin[0] += pad;
+		cset.bmin[2] += pad;
+		cset.bmax[0] -= pad;
+		cset.bmax[2] -= pad;
+	}
 	cset.cs = chf.cs;
 	cset.ch = chf.ch;
+	cset.width = chf.width - chf.borderSize*2;
+	cset.height = chf.height - chf.borderSize*2;
+	cset.borderSize = chf.borderSize;
 	
 	int maxContours = rcMax((int)chf.maxRegions, 8);
 	cset.conts = (rcContour*)rcAlloc(sizeof(rcContour)*maxContours, RC_ALLOC_PERM);
@@ -658,8 +682,6 @@ bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf,
 	
 	ctx->stopTimer(RC_TIMER_BUILD_CONTOURS_TRACE);
 	
-	ctx->startTimer(RC_TIMER_BUILD_CONTOURS_SIMPLIFY);
-	
 	rcIntArray verts(256);
 	rcIntArray simplified(64);
 	
@@ -682,10 +704,17 @@ bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf,
 				
 				verts.resize(0);
 				simplified.resize(0);
+
+				ctx->startTimer(RC_TIMER_BUILD_CONTOURS_TRACE);
 				walkContour(x, y, i, chf, flags, verts);
+				ctx->stopTimer(RC_TIMER_BUILD_CONTOURS_TRACE);
+
+				ctx->startTimer(RC_TIMER_BUILD_CONTOURS_SIMPLIFY);
 				simplifyContour(verts, simplified, maxError, maxEdgeLen, buildFlags);
 				removeDegenerateSegments(simplified);
+				ctx->stopTimer(RC_TIMER_BUILD_CONTOURS_SIMPLIFY);
 				
+
 				// Store region->contour remap info.
 				// Create contour.
 				if (simplified.size()/4 >= 3)
@@ -720,6 +749,16 @@ bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf,
 						return false;
 					}
 					memcpy(cont->verts, &simplified[0], sizeof(int)*cont->nverts*4);
+					if (borderSize > 0)
+					{
+						// If the heightfield was build with bordersize, remove the offset.
+						for (int j = 0; j < cont->nverts; ++j)
+						{
+							int* v = &cont->verts[j*4];
+							v[0] -= borderSize;
+							v[2] -= borderSize;
+						}
+					}
 					
 					cont->nrverts = verts.size()/4;
 					cont->rverts = (int*)rcAlloc(sizeof(int)*cont->nrverts*4, RC_ALLOC_PERM);
@@ -729,6 +768,16 @@ bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf,
 						return false;
 					}
 					memcpy(cont->rverts, &verts[0], sizeof(int)*cont->nrverts*4);
+					if (borderSize > 0)
+					{
+						// If the heightfield was build with bordersize, remove the offset.
+						for (int j = 0; j < cont->nrverts; ++j)
+						{
+							int* v = &cont->rverts[j*4];
+							v[0] -= borderSize;
+							v[2] -= borderSize;
+						}
+					}
 					
 /*					cont->cx = cont->cy = cont->cz = 0;
 					for (int i = 0; i < cont->nverts; ++i)
@@ -796,8 +845,6 @@ bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf,
 		}
 	}
 	
-	ctx->stopTimer(RC_TIMER_BUILD_CONTOURS_SIMPLIFY);
-	
 	ctx->stopTimer(RC_TIMER_BUILD_CONTOURS);
 	
 	return true;
diff --git a/dep/recastnavigation/Recast/Source/RecastFilter.cpp b/dep/recastnavigation/Recast/Source/RecastFilter.cpp
index d01808a79a8..bf985c362c9 100644
--- a/dep/recastnavigation/Recast/Source/RecastFilter.cpp
+++ b/dep/recastnavigation/Recast/Source/RecastFilter.cpp
@@ -22,7 +22,17 @@
 #include "Recast.h"
 #include "RecastAssert.h"
 
-
+/// @par
+///
+/// Allows the formation of walkable regions that will flow over low lying 
+/// objects such as curbs, and up structures such as stairways. 
+/// 
+/// Two neighboring spans are walkable if: <tt>rcAbs(currentSpan.smax - neighborSpan.smax) < waklableClimb</tt>
+/// 
+/// @warning Will override the effect of #rcFilterLedgeSpans.  So if both filters are used, call
+/// #rcFilterLedgeSpans after calling this filter. 
+///
+/// @see rcHeightfield, rcConfig
 void rcFilterLowHangingWalkableObstacles(rcContext* ctx, const int walkableClimb, rcHeightfield& solid)
 {
 	rcAssert(ctx);
@@ -38,6 +48,7 @@ void rcFilterLowHangingWalkableObstacles(rcContext* ctx, const int walkableClimb
 		{
 			rcSpan* ps = 0;
 			bool previousWalkable = false;
+			unsigned char previousArea = RC_NULL_AREA;
 			
 			for (rcSpan* s = solid.spans[x + y*w]; s; ps = s, s = s->next)
 			{
@@ -47,18 +58,29 @@ void rcFilterLowHangingWalkableObstacles(rcContext* ctx, const int walkableClimb
 				if (!walkable && previousWalkable)
 				{
 					if (rcAbs((int)s->smax - (int)ps->smax) <= walkableClimb)
-						s->area = RC_NULL_AREA;
+						s->area = previousArea;
 				}
 				// Copy walkable flag so that it cannot propagate
 				// past multiple non-walkable objects.
 				previousWalkable = walkable;
+				previousArea = s->area;
 			}
 		}
 	}
 
 	ctx->stopTimer(RC_TIMER_FILTER_LOW_OBSTACLES);
 }
-	
+
+/// @par
+///
+/// A ledge is a span with one or more neighbors whose maximum is further away than @p walkableClimb
+/// from the current span's maximum.
+/// This method removes the impact of the overestimation of conservative voxelization 
+/// so the resulting mesh will not have regions hanging in the air over ledges.
+/// 
+/// A span is a ledge if: <tt>rcAbs(currentSpan.smax - neighborSpan.smax) > walkableClimb</tt>
+/// 
+/// @see rcHeightfield, rcConfig
 void rcFilterLedgeSpans(rcContext* ctx, const int walkableHeight, const int walkableClimb,
 						rcHeightfield& solid)
 {
@@ -149,6 +171,12 @@ void rcFilterLedgeSpans(rcContext* ctx, const int walkableHeight, const int walk
 	ctx->stopTimer(RC_TIMER_FILTER_BORDER);
 }	
 
+/// @par
+///
+/// For this filter, the clearance above the span is the distance from the span's 
+/// maximum to the next higher span's minimum. (Same grid column.)
+/// 
+/// @see rcHeightfield, rcConfig
 void rcFilterWalkableLowHeightSpans(rcContext* ctx, int walkableHeight, rcHeightfield& solid)
 {
 	rcAssert(ctx);
diff --git a/dep/recastnavigation/Recast/Source/RecastLayers.cpp b/dep/recastnavigation/Recast/Source/RecastLayers.cpp
new file mode 100644
index 00000000000..5ea6cb79d16
--- /dev/null
+++ b/dep/recastnavigation/Recast/Source/RecastLayers.cpp
@@ -0,0 +1,620 @@
+//
+// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
+//
+// This software is provided 'as-is', without any express or implied
+// warranty.  In no event will the authors be held liable for any damages
+// arising from the use of this software.
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+// 1. The origin of this software must not be misrepresented; you must not
+//    claim that you wrote the original software. If you use this software
+//    in a product, an acknowledgment in the product documentation would be
+//    appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//    misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+//
+
+#include <float.h>
+#define _USE_MATH_DEFINES
+#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include "Recast.h"
+#include "RecastAlloc.h"
+#include "RecastAssert.h"
+
+
+static const int RC_MAX_LAYERS = RC_NOT_CONNECTED;
+static const int RC_MAX_NEIS = 16;
+
+struct rcLayerRegion
+{
+	unsigned char layers[RC_MAX_LAYERS];
+	unsigned char neis[RC_MAX_NEIS];
+	unsigned short ymin, ymax;
+	unsigned char layerId;		// Layer ID
+	unsigned char nlayers;		// Layer count
+	unsigned char nneis;		// Neighbour count
+	unsigned char base;			// Flag indicating if the region is hte base of merged regions.
+};
+
+
+static void addUnique(unsigned char* a, unsigned char& an, unsigned char v)
+{
+	const int n = (int)an;
+	for (int i = 0; i < n; ++i)
+		if (a[i] == v)
+			return;
+	a[an] = v;
+	an++;
+}
+
+static bool contains(const unsigned char* a, const unsigned char an, const unsigned char v)
+{
+	const int n = (int)an;
+	for (int i = 0; i < n; ++i)
+		if (a[i] == v)
+			return true;
+	return false;
+}
+
+inline bool overlapRange(const unsigned short amin, const unsigned short amax,
+						 const unsigned short bmin, const unsigned short bmax)
+{
+	return (amin > bmax || amax < bmin) ? false : true;
+}
+
+
+
+struct rcLayerSweepSpan
+{
+	unsigned short ns;	// number samples
+	unsigned char id;	// region id
+	unsigned char nei;	// neighbour id
+};
+
+/// @par
+/// 
+/// See the #rcConfig documentation for more information on the configuration parameters.
+/// 
+/// @see rcAllocHeightfieldLayerSet, rcCompactHeightfield, rcHeightfieldLayerSet, rcConfig
+bool rcBuildHeightfieldLayers(rcContext* ctx, rcCompactHeightfield& chf,
+							  const int borderSize, const int walkableHeight,
+							  rcHeightfieldLayerSet& lset)
+{
+	rcAssert(ctx);
+	
+	ctx->startTimer(RC_TIMER_BUILD_LAYERS);
+	
+	const int w = chf.width;
+	const int h = chf.height;
+	
+	rcScopedDelete<unsigned char> srcReg = (unsigned char*)rcAlloc(sizeof(unsigned char)*chf.spanCount, RC_ALLOC_TEMP);
+	if (!srcReg)
+	{
+		ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'srcReg' (%d).", chf.spanCount);
+		return false;
+	}
+	memset(srcReg,0xff,sizeof(unsigned char)*chf.spanCount);
+	
+	const int nsweeps = chf.width;
+	rcScopedDelete<rcLayerSweepSpan> sweeps = (rcLayerSweepSpan*)rcAlloc(sizeof(rcLayerSweepSpan)*nsweeps, RC_ALLOC_TEMP);
+	if (!sweeps)
+	{
+		ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'sweeps' (%d).", nsweeps);
+		return false;
+	}
+	
+	
+	// Partition walkable area into monotone regions.
+	int prevCount[256];
+	unsigned char regId = 0;
+
+	for (int y = borderSize; y < h-borderSize; ++y)
+	{
+		memset(prevCount,0,sizeof(int)*regId);
+		unsigned char sweepId = 0;
+		
+		for (int x = borderSize; x < w-borderSize; ++x)
+		{
+			const rcCompactCell& c = chf.cells[x+y*w];
+			
+			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
+			{
+				const rcCompactSpan& s = chf.spans[i];
+				if (chf.areas[i] == RC_NULL_AREA) continue;
+
+				unsigned char sid = 0xff;
+
+				// -x
+				if (rcGetCon(s, 0) != RC_NOT_CONNECTED)
+				{
+					const int ax = x + rcGetDirOffsetX(0);
+					const int ay = y + rcGetDirOffsetY(0);
+					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 0);
+					if (chf.areas[ai] != RC_NULL_AREA && srcReg[ai] != 0xff)
+						sid = srcReg[ai];
+				}
+				
+				if (sid == 0xff)
+				{
+					sid = sweepId++;
+					sweeps[sid].nei = 0xff;
+					sweeps[sid].ns = 0;
+				}
+				
+				// -y
+				if (rcGetCon(s,3) != RC_NOT_CONNECTED)
+				{
+					const int ax = x + rcGetDirOffsetX(3);
+					const int ay = y + rcGetDirOffsetY(3);
+					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 3);
+					const unsigned char nr = srcReg[ai];
+					if (nr != 0xff)
+					{
+						// Set neighbour when first valid neighbour is encoutered.
+						if (sweeps[sid].ns == 0)
+							sweeps[sid].nei = nr;
+						
+						if (sweeps[sid].nei == nr)
+						{
+							// Update existing neighbour
+							sweeps[sid].ns++;
+							prevCount[nr]++;
+						}
+						else
+						{
+							// This is hit if there is nore than one neighbour.
+							// Invalidate the neighbour.
+							sweeps[sid].nei = 0xff;
+						}
+					}
+				}
+				
+				srcReg[i] = sid;
+			}
+		}
+		
+		// Create unique ID.
+		for (int i = 0; i < sweepId; ++i)
+		{
+			// If the neighbour is set and there is only one continuous connection to it,
+			// the sweep will be merged with the previous one, else new region is created.
+			if (sweeps[i].nei != 0xff && prevCount[sweeps[i].nei] == (int)sweeps[i].ns)
+			{
+				sweeps[i].id = sweeps[i].nei;
+			}
+			else
+			{
+				if (regId == 255)
+				{
+					ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Region ID overflow.");
+					return false;
+				}
+				sweeps[i].id = regId++;
+			}
+		}
+		
+		// Remap local sweep ids to region ids.
+		for (int x = borderSize; x < w-borderSize; ++x)
+		{
+			const rcCompactCell& c = chf.cells[x+y*w];
+			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
+			{
+				if (srcReg[i] != 0xff)
+					srcReg[i] = sweeps[srcReg[i]].id;
+			}
+		}
+	}
+
+	// Allocate and init layer regions.
+	const int nregs = (int)regId;
+	rcScopedDelete<rcLayerRegion> regs = (rcLayerRegion*)rcAlloc(sizeof(rcLayerRegion)*nregs, RC_ALLOC_TEMP);
+	if (!regs)
+	{
+		ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'regs' (%d).", nregs);
+		return false;
+	}
+	memset(regs, 0, sizeof(rcLayerRegion)*nregs);
+	for (int i = 0; i < nregs; ++i)
+	{
+		regs[i].layerId = 0xff;
+		regs[i].ymin = 0xffff;
+		regs[i].ymax = 0;
+	}
+	
+	// Find region neighbours and overlapping regions.
+	for (int y = 0; y < h; ++y)
+	{
+		for (int x = 0; x < w; ++x)
+		{
+			const rcCompactCell& c = chf.cells[x+y*w];
+			
+			unsigned char lregs[RC_MAX_LAYERS];
+			int nlregs = 0;
+			
+			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
+			{
+				const rcCompactSpan& s = chf.spans[i];
+				const unsigned char ri = srcReg[i];
+				if (ri == 0xff) continue;
+				
+				regs[ri].ymin = rcMin(regs[ri].ymin, s.y);
+				regs[ri].ymax = rcMax(regs[ri].ymax, s.y);
+				
+				// Collect all region layers.
+				if (nlregs < RC_MAX_LAYERS)
+					lregs[nlregs++] = ri;
+				
+				// Update neighbours
+				for (int dir = 0; dir < 4; ++dir)
+				{
+					if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
+					{
+						const int ax = x + rcGetDirOffsetX(dir);
+						const int ay = y + rcGetDirOffsetY(dir);
+						const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, dir);
+						const unsigned char rai = srcReg[ai];
+						if (rai != 0xff && rai != ri)
+							addUnique(regs[ri].neis, regs[ri].nneis, rai);
+					}
+				}
+				
+			}
+			
+			// Update overlapping regions.
+			for (int i = 0; i < nlregs-1; ++i)
+			{
+				for (int j = i+1; j < nlregs; ++j)
+				{
+					if (lregs[i] != lregs[j])
+					{
+						rcLayerRegion& ri = regs[lregs[i]];
+						rcLayerRegion& rj = regs[lregs[j]];
+						addUnique(ri.layers, ri.nlayers, lregs[j]);
+						addUnique(rj.layers, rj.nlayers, lregs[i]);
+					}
+				}
+			}
+			
+		}
+	}
+	
+	// Create 2D layers from regions.
+	unsigned char layerId = 0;
+	
+	static const int MAX_STACK = 64;
+	unsigned char stack[MAX_STACK];
+	int nstack = 0;
+	
+	for (int i = 0; i < nregs; ++i)
+	{
+		rcLayerRegion& root = regs[i];
+		// Skip alreadu visited.
+		if (root.layerId != 0xff)
+			continue;
+
+		// Start search.
+		root.layerId = layerId;
+		root.base = 1;
+		
+		nstack = 0;
+		stack[nstack++] = (unsigned char)i;
+		
+		while (nstack)
+		{
+			// Pop front
+			rcLayerRegion& reg = regs[stack[0]];
+			nstack--;
+			for (int j = 0; j < nstack; ++j)
+				stack[j] = stack[j+1];
+			
+			const int nneis = (int)reg.nneis;
+			for (int j = 0; j < nneis; ++j)
+			{
+				const unsigned char nei = reg.neis[j];
+				rcLayerRegion& regn = regs[nei];
+				// Skip already visited.
+				if (regn.layerId != 0xff)
+					continue;
+				// Skip if the neighbour is overlapping root region.
+				if (contains(root.layers, root.nlayers, nei))
+					continue;
+				// Skip if the height range would become too large.
+				const int ymin = rcMin(root.ymin, regn.ymin);
+				const int ymax = rcMax(root.ymax, regn.ymax); // Edited by TC
+				if ((ymax - ymin) >= 255)
+					 continue;
+
+				if (nstack < MAX_STACK)
+				{
+					// Deepen
+					stack[nstack++] = (unsigned char)nei;
+					
+					// Mark layer id
+					regn.layerId = layerId;
+					// Merge current layers to root.
+					for (int k = 0; k < regn.nlayers; ++k)
+						addUnique(root.layers, root.nlayers, regn.layers[k]);
+					root.ymin = rcMin(root.ymin, regn.ymin);
+					root.ymax = rcMax(root.ymax, regn.ymax);
+				}
+			}
+		}
+		
+		layerId++;
+	}
+	
+	// Merge non-overlapping regions that are close in height.
+	const unsigned short mergeHeight = (unsigned short)walkableHeight * 4;
+	
+	for (int i = 0; i < nregs; ++i)
+	{
+		rcLayerRegion& ri = regs[i];
+		if (!ri.base) continue;
+		
+		unsigned char newId = ri.layerId;
+		
+		for (;;)
+		{
+			unsigned char oldId = 0xff;
+			
+			for (int j = 0; j < nregs; ++j)
+			{
+				if (i == j) continue;
+				rcLayerRegion& rj = regs[j];
+				if (!rj.base) continue;
+				
+				// Skip if teh regions are not close to each other.
+				if (!overlapRange(ri.ymin,ri.ymax+mergeHeight, rj.ymin,rj.ymax+mergeHeight))
+					continue;
+				// Skip if the height range would become too large.
+				const int ymin = rcMin(ri.ymin, rj.ymin);
+				const int ymax = rcMax(ri.ymax, rj.ymax);  // Edited by TC
+				if ((ymax - ymin) >= 255)
+				  continue;
+						  
+				// Make sure that there is no overlap when mergin 'ri' and 'rj'.
+				bool overlap = false;
+				// Iterate over all regions which have the same layerId as 'rj'
+				for (int k = 0; k < nregs; ++k)
+				{
+					if (regs[k].layerId != rj.layerId)
+						continue;
+					// Check if region 'k' is overlapping region 'ri'
+					// Index to 'regs' is the same as region id.
+					if (contains(ri.layers,ri.nlayers, (unsigned char)k))
+					{
+						overlap = true;
+						break;
+					}
+				}
+				// Cannot merge of regions overlap.
+				if (overlap)
+					continue;
+				
+				// Can merge i and j.
+				oldId = rj.layerId;
+				break;
+			}
+			
+			// Could not find anything to merge with, stop.
+			if (oldId == 0xff)
+				break;
+			
+			// Merge
+			for (int j = 0; j < nregs; ++j)
+			{
+				rcLayerRegion& rj = regs[j];
+				if (rj.layerId == oldId)
+				{
+					rj.base = 0;
+					// Remap layerIds.
+					rj.layerId = newId;
+					// Add overlaid layers from 'rj' to 'ri'.
+					for (int k = 0; k < rj.nlayers; ++k)
+						addUnique(ri.layers, ri.nlayers, rj.layers[k]);
+					// Update heigh bounds.
+					ri.ymin = rcMin(ri.ymin, rj.ymin);
+					ri.ymax = rcMax(ri.ymax, rj.ymax);
+				}
+			}
+		}
+	}
+	
+	// Compact layerIds
+	unsigned char remap[256];
+	memset(remap, 0, 256);
+
+	// Find number of unique layers.
+	layerId = 0;
+	for (int i = 0; i < nregs; ++i)
+		remap[regs[i].layerId] = 1;
+	for (int i = 0; i < 256; ++i)
+	{
+		if (remap[i])
+			remap[i] = layerId++;
+		else
+			remap[i] = 0xff;
+	}
+	// Remap ids.
+	for (int i = 0; i < nregs; ++i)
+		regs[i].layerId = remap[regs[i].layerId];
+	
+	// No layers, return empty.
+	if (layerId == 0)
+	{
+		ctx->stopTimer(RC_TIMER_BUILD_LAYERS);
+		return true;
+	}
+	
+	// Create layers.
+	rcAssert(lset.layers == 0);
+	
+	const int lw = w - borderSize*2;
+	const int lh = h - borderSize*2;
+
+	// Build contracted bbox for layers.
+	float bmin[3], bmax[3];
+	rcVcopy(bmin, chf.bmin);
+	rcVcopy(bmax, chf.bmax);
+	bmin[0] += borderSize*chf.cs;
+	bmin[2] += borderSize*chf.cs;
+	bmax[0] -= borderSize*chf.cs;
+	bmax[2] -= borderSize*chf.cs;
+	
+	lset.nlayers = (int)layerId;
+	
+	lset.layers = (rcHeightfieldLayer*)rcAlloc(sizeof(rcHeightfieldLayer)*lset.nlayers, RC_ALLOC_PERM);
+	if (!lset.layers)
+	{
+		ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'layers' (%d).", lset.nlayers);
+		return false;
+	}
+	memset(lset.layers, 0, sizeof(rcHeightfieldLayer)*lset.nlayers);
+
+	
+	// Store layers.
+	for (int i = 0; i < lset.nlayers; ++i)
+	{
+		unsigned char curId = (unsigned char)i;
+		
+		// Allocate memory for the current layer.
+		rcHeightfieldLayer* layer = &lset.layers[i];
+		memset(layer, 0, sizeof(rcHeightfieldLayer));
+
+		const int gridSize = sizeof(unsigned char)*lw*lh;
+
+		layer->heights = (unsigned char*)rcAlloc(gridSize, RC_ALLOC_PERM);
+		if (!layer->heights)
+		{
+			ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'heights' (%d).", gridSize);
+			return false;
+		}
+		memset(layer->heights, 0xff, gridSize);
+
+		layer->areas = (unsigned char*)rcAlloc(gridSize, RC_ALLOC_PERM);
+		if (!layer->areas)
+		{
+			ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'areas' (%d).", gridSize);
+			return false;
+		}
+		memset(layer->areas, 0, gridSize);
+
+		layer->cons = (unsigned char*)rcAlloc(gridSize, RC_ALLOC_PERM);
+		if (!layer->cons)
+		{
+			ctx->log(RC_LOG_ERROR, "rcBuildHeightfieldLayers: Out of memory 'cons' (%d).", gridSize);
+			return false;
+		}
+		memset(layer->cons, 0, gridSize);
+		
+		// Find layer height bounds.
+		int hmin = 0, hmax = 0;
+		for (int j = 0; j < nregs; ++j)
+		{
+			if (regs[j].base && regs[j].layerId == curId)
+			{
+				hmin = (int)regs[j].ymin;
+				hmax = (int)regs[j].ymax;
+			}
+		}
+
+		layer->width = lw;
+		layer->height = lh;
+		layer->cs = chf.cs;
+		layer->ch = chf.ch;
+		
+		// Adjust the bbox to fit the heighfield.
+		rcVcopy(layer->bmin, bmin);
+		rcVcopy(layer->bmax, bmax);
+		layer->bmin[1] = bmin[1] + hmin*chf.ch;
+		layer->bmax[1] = bmin[1] + hmax*chf.ch;
+		layer->hmin = hmin;
+		layer->hmax = hmax;
+
+		// Update usable data region.
+		layer->minx = layer->width;
+		layer->maxx = 0;
+		layer->miny = layer->height;
+		layer->maxy = 0;
+		
+		// Copy height and area from compact heighfield. 
+		for (int y = 0; y < lh; ++y)
+		{
+			for (int x = 0; x < lw; ++x)
+			{
+				const int cx = borderSize+x;
+				const int cy = borderSize+y;
+				const rcCompactCell& c = chf.cells[cx+cy*w];
+				for (int j = (int)c.index, nj = (int)(c.index+c.count); j < nj; ++j)
+				{
+					const rcCompactSpan& s = chf.spans[j];
+					// Skip unassigned regions.
+					if (srcReg[j] == 0xff)
+						continue;
+					// Skip of does nto belong to current layer.
+					unsigned char lid = regs[srcReg[j]].layerId;
+					if (lid != curId)
+						continue;
+					
+					// Update data bounds.
+					layer->minx = rcMin(layer->minx, x);
+					layer->maxx = rcMax(layer->maxx, x);
+					layer->miny = rcMin(layer->miny, y);
+					layer->maxy = rcMax(layer->maxy, y);
+					
+					// Store height and area type.
+					const int idx = x+y*lw;
+					layer->heights[idx] = (unsigned char)(s.y - hmin);
+					layer->areas[idx] = chf.areas[j];
+					
+					// Check connection.
+					unsigned char portal = 0;
+					unsigned char con = 0;
+					for (int dir = 0; dir < 4; ++dir)
+					{
+						if (rcGetCon(s, dir) != RC_NOT_CONNECTED)
+						{
+							const int ax = cx + rcGetDirOffsetX(dir);
+							const int ay = cy + rcGetDirOffsetY(dir);
+							const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, dir);
+							unsigned char alid = srcReg[ai] != 0xff ? regs[srcReg[ai]].layerId : 0xff;
+							// Portal mask
+							if (chf.areas[ai] != RC_NULL_AREA && lid != alid)
+							{
+								portal |= (unsigned char)(1<<dir);
+								// Update height so that it matches on both sides of the portal.
+								const rcCompactSpan& as = chf.spans[ai];
+								if (as.y > hmin)
+									layer->heights[idx] = rcMax(layer->heights[idx], (unsigned char)(as.y - hmin));
+							}
+							// Valid connection mask
+							if (chf.areas[ai] != RC_NULL_AREA && lid == alid)
+							{
+								const int nx = ax - borderSize;
+								const int ny = ay - borderSize;
+								if (nx >= 0 && ny >= 0 && nx < lw && ny < lh)
+									con |= (unsigned char)(1<<dir);
+							}
+						}
+					}
+					
+					layer->cons[idx] = (portal << 4) | con;
+				}
+			}
+		}
+		
+		if (layer->minx > layer->maxx)
+			layer->minx = layer->maxx = 0;
+		if (layer->miny > layer->maxy)
+			layer->miny = layer->maxy = 0;
+	}
+	
+	ctx->stopTimer(RC_TIMER_BUILD_LAYERS);
+	
+	return true;
+}
diff --git a/dep/recastnavigation/Recast/Source/RecastMesh.cpp b/dep/recastnavigation/Recast/Source/RecastMesh.cpp
index 4b33c106d10..13aad2af01c 100644
--- a/dep/recastnavigation/Recast/Source/RecastMesh.cpp
+++ b/dep/recastnavigation/Recast/Source/RecastMesh.cpp
@@ -59,6 +59,7 @@ static bool buildMeshAdjacency(unsigned short* polys, const int npolys,
 		unsigned short* t = &polys[i*vertsPerPoly*2];
 		for (int j = 0; j < vertsPerPoly; ++j)
 		{
+			if (t[j] == RC_MESH_NULL_IDX) break;
 			unsigned short v0 = t[j];
 			unsigned short v1 = (j+1 >= vertsPerPoly || t[j+1] == RC_MESH_NULL_IDX) ? t[0] : t[j+1];
 			if (v0 < v1)
@@ -83,6 +84,7 @@ static bool buildMeshAdjacency(unsigned short* polys, const int npolys,
 		unsigned short* t = &polys[i*vertsPerPoly*2];
 		for (int j = 0; j < vertsPerPoly; ++j)
 		{
+			if (t[j] == RC_MESH_NULL_IDX) break;
 			unsigned short v0 = t[j];
 			unsigned short v1 = (j+1 >= vertsPerPoly || t[j+1] == RC_MESH_NULL_IDX) ? t[0] : t[j+1];
 			if (v0 > v1)
@@ -195,7 +197,7 @@ inline bool collinear(const int* a, const int* b, const int* c)
 //	Returns true iff ab properly intersects cd: they share
 //	a point interior to both segments.  The properness of the
 //	intersection is ensured by using strict leftness.
-bool intersectProp(const int* a, const int* b, const int* c, const int* d)
+static bool intersectProp(const int* a, const int* b, const int* c, const int* d)
 {
 	// Eliminate improper cases.
 	if (collinear(a,b,c) || collinear(a,b,d) ||
@@ -470,6 +472,7 @@ static void mergePolys(unsigned short* pa, unsigned short* pb, int ea, int eb,
 	memcpy(pa, tmp, sizeof(unsigned short)*nvp);
 }
 
+
 static void pushFront(int v, int* arr, int& an)
 {
 	an++;
@@ -547,9 +550,9 @@ static bool canRemoveVertex(rcContext* ctx, rcPolyMesh& mesh, const unsigned sho
 					
 				// Check if the edge exists
 				bool exists = false;
-				for (int k = 0; k < nedges; ++k)
+				for (int m = 0; m < nedges; ++m)
 				{
-					int* e = &edges[k*3];
+					int* e = &edges[m*3];
 					if (e[1] == b)
 					{
 						// Exists, increment vertex share count.
@@ -892,8 +895,13 @@ static bool removeVertex(rcContext* ctx, rcPolyMesh& mesh, const unsigned short
 	return true;
 }
 
-
-bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, int nvp, rcPolyMesh& mesh)
+/// @par
+///
+/// @note If the mesh data is to be used to construct a Detour navigation mesh, then the upper 
+/// limit must be retricted to <= #DT_VERTS_PER_POLYGON.
+///
+/// @see rcAllocPolyMesh, rcContourSet, rcPolyMesh, rcConfig
+bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, const int nvp, rcPolyMesh& mesh)
 {
 	rcAssert(ctx);
 	
@@ -903,6 +911,7 @@ bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, int nvp, rcPolyMesh& me
 	rcVcopy(mesh.bmax, cset.bmax);
 	mesh.cs = cset.cs;
 	mesh.ch = cset.ch;
+	mesh.borderSize = cset.borderSize;
 	
 	int maxVertices = 0;
 	int maxTris = 0;
@@ -925,7 +934,7 @@ bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, int nvp, rcPolyMesh& me
 	rcScopedDelete<unsigned char> vflags = (unsigned char*)rcAlloc(sizeof(unsigned char)*maxVertices, RC_ALLOC_TEMP);
 	if (!vflags)
 	{
-		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'mesh.verts' (%d).", maxVertices);
+		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'vflags' (%d).", maxVertices);
 		return false;
 	}
 	memset(vflags, 0, maxVertices);
@@ -936,7 +945,7 @@ bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, int nvp, rcPolyMesh& me
 		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'mesh.verts' (%d).", maxVertices);
 		return false;
 	}
-	mesh.polys = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxTris*nvp*2*2, RC_ALLOC_PERM);
+	mesh.polys = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxTris*nvp*2, RC_ALLOC_PERM);
 	if (!mesh.polys)
 	{
 		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Out of memory 'mesh.polys' (%d).", maxTris*nvp*2);
@@ -1044,7 +1053,7 @@ bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, int nvp, rcPolyMesh& me
 				vflags[indices[j]] = 1;
 			}
 		}
-		
+
 		// Build initial polygons.
 		int npolys = 0;
 		memset(polys, 0xff, maxVertsPerCont*nvp*sizeof(unsigned short));
@@ -1141,6 +1150,7 @@ bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, int nvp, rcPolyMesh& me
 			}
 			// Remove vertex
 			// Note: mesh.nverts is already decremented inside removeVertex()!
+			// Fixup vertex flags
 			for (int j = i; j < mesh.nverts; ++j)
 				vflags[j] = vflags[j+1];
 			--i;
@@ -1153,6 +1163,37 @@ bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, int nvp, rcPolyMesh& me
 		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: Adjacency failed.");
 		return false;
 	}
+	
+	// Find portal edges
+	if (mesh.borderSize > 0)
+	{
+		const int w = cset.width;
+		const int h = cset.height;
+		for (int i = 0; i < mesh.npolys; ++i)
+		{
+			unsigned short* p = &mesh.polys[i*2*nvp];
+			for (int j = 0; j < nvp; ++j)
+			{
+				if (p[j] == RC_MESH_NULL_IDX) break;
+				// Skip connected edges.
+				if (p[nvp+j] != RC_MESH_NULL_IDX)
+					continue;
+				int nj = j+1;
+				if (nj >= nvp || p[nj] == RC_MESH_NULL_IDX) nj = 0;
+				const unsigned short* va = &mesh.verts[p[j]*3];
+				const unsigned short* vb = &mesh.verts[p[nj]*3];
+
+				if ((int)va[0] == 0 && (int)vb[0] == 0)
+					p[nvp+j] = 0x8000 | 0;
+				else if ((int)va[2] == h && (int)vb[2] == h)
+					p[nvp+j] = 0x8000 | 1;
+				else if ((int)va[0] == w && (int)vb[0] == w)
+					p[nvp+j] = 0x8000 | 2;
+				else if ((int)va[2] == 0 && (int)vb[2] == 0)
+					p[nvp+j] = 0x8000 | 3;
+			}
+		}
+	}
 
 	// Just allocate the mesh flags array. The user is resposible to fill it.
 	mesh.flags = (unsigned short*)rcAlloc(sizeof(unsigned short)*mesh.npolys, RC_ALLOC_PERM);
@@ -1165,11 +1206,11 @@ bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, int nvp, rcPolyMesh& me
 	
 	if (mesh.nverts > 0xffff)
 	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: The resulting mesh has too many vertices %d (max %d). Data can be corrupted.", mesh.nverts, 0xffff);
+		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: The resulting mesh has too many vertices %d (max %d). Data can be corrupted.", mesh.nverts, 0xffff);
 	}
 	if (mesh.npolys > 0xffff)
 	{
-		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: The resulting mesh has too many polygons %d (max %d). Data can be corrupted.", mesh.npolys, 0xffff);
+		ctx->log(RC_LOG_ERROR, "rcBuildPolyMesh: The resulting mesh has too many polygons %d (max %d). Data can be corrupted.", mesh.npolys, 0xffff);
 	}
 	
 	ctx->stopTimer(RC_TIMER_BUILD_POLYMESH);
@@ -1177,6 +1218,7 @@ bool rcBuildPolyMesh(rcContext* ctx, rcContourSet& cset, int nvp, rcPolyMesh& me
 	return true;
 }
 
+/// @see rcAllocPolyMesh, rcPolyMesh
 bool rcMergePolyMeshes(rcContext* ctx, rcPolyMesh** meshes, const int nmeshes, rcPolyMesh& mesh)
 {
 	rcAssert(ctx);
@@ -1268,7 +1310,7 @@ bool rcMergePolyMeshes(rcContext* ctx, rcPolyMesh** meshes, const int nmeshes, r
 		ctx->log(RC_LOG_ERROR, "rcMergePolyMeshes: Out of memory 'vremap' (%d).", maxVertsPerMesh);
 		return false;
 	}
-	memset(nextVert, 0, sizeof(int)*maxVerts);
+	memset(vremap, 0, sizeof(unsigned short)*maxVertsPerMesh);
 	
 	for (int i = 0; i < nmeshes; ++i)
 	{
@@ -1320,3 +1362,67 @@ bool rcMergePolyMeshes(rcContext* ctx, rcPolyMesh** meshes, const int nmeshes, r
 	
 	return true;
 }
+
+bool rcCopyPolyMesh(rcContext* ctx, const rcPolyMesh& src, rcPolyMesh& dst)
+{
+	rcAssert(ctx);
+	
+	// Destination must be empty.
+	rcAssert(dst.verts == 0);
+	rcAssert(dst.polys == 0);
+	rcAssert(dst.regs == 0);
+	rcAssert(dst.areas == 0);
+	rcAssert(dst.flags == 0);
+	
+	dst.nverts = src.nverts;
+	dst.npolys = src.npolys;
+	dst.maxpolys = src.npolys;
+	dst.nvp = src.nvp;
+	rcVcopy(dst.bmin, src.bmin);
+	rcVcopy(dst.bmax, src.bmax);
+	dst.cs = src.cs;
+	dst.ch = src.ch;
+	dst.borderSize = src.borderSize;
+	
+	dst.verts = (unsigned short*)rcAlloc(sizeof(unsigned short)*src.nverts*3, RC_ALLOC_PERM);
+	if (!dst.verts)
+	{
+		ctx->log(RC_LOG_ERROR, "rcCopyPolyMesh: Out of memory 'dst.verts' (%d).", src.nverts*3);
+		return false;
+	}
+	memcpy(dst.verts, src.verts, sizeof(unsigned short)*src.nverts*3);
+	
+	dst.polys = (unsigned short*)rcAlloc(sizeof(unsigned short)*src.npolys*2*src.nvp, RC_ALLOC_PERM);
+	if (!dst.polys)
+	{
+		ctx->log(RC_LOG_ERROR, "rcCopyPolyMesh: Out of memory 'dst.polys' (%d).", src.npolys*2*src.nvp);
+		return false;
+	}
+	memcpy(dst.polys, src.polys, sizeof(unsigned short)*src.npolys*2*src.nvp);
+	
+	dst.regs = (unsigned short*)rcAlloc(sizeof(unsigned short)*src.npolys, RC_ALLOC_PERM);
+	if (!dst.regs)
+	{
+		ctx->log(RC_LOG_ERROR, "rcCopyPolyMesh: Out of memory 'dst.regs' (%d).", src.npolys);
+		return false;
+	}
+	memcpy(dst.regs, src.regs, sizeof(unsigned short)*src.npolys);
+	
+	dst.areas = (unsigned char*)rcAlloc(sizeof(unsigned char)*src.npolys, RC_ALLOC_PERM);
+	if (!dst.areas)
+	{
+		ctx->log(RC_LOG_ERROR, "rcCopyPolyMesh: Out of memory 'dst.areas' (%d).", src.npolys);
+		return false;
+	}
+	memcpy(dst.areas, src.areas, sizeof(unsigned char)*src.npolys);
+	
+	dst.flags = (unsigned short*)rcAlloc(sizeof(unsigned short)*src.npolys, RC_ALLOC_PERM);
+	if (!dst.flags)
+	{
+		ctx->log(RC_LOG_ERROR, "rcCopyPolyMesh: Out of memory 'dst.flags' (%d).", src.npolys);
+		return false;
+	}
+	memcpy(dst.flags, src.flags, sizeof(unsigned char)*src.npolys);
+	
+	return true;
+}
diff --git a/dep/recastnavigation/Recast/Source/RecastMeshDetail.cpp b/dep/recastnavigation/Recast/Source/RecastMeshDetail.cpp
index ffb4b58ee9c..b3872754656 100644
--- a/dep/recastnavigation/Recast/Source/RecastMeshDetail.cpp
+++ b/dep/recastnavigation/Recast/Source/RecastMeshDetail.cpp
@@ -267,11 +267,11 @@ static int addEdge(rcContext* ctx, int* edges, int& nedges, const int maxEdges,
 	int e = findEdge(edges, nedges, s, t);
 	if (e == UNDEF)
 	{
-		int* e = &edges[nedges*4];
-		e[0] = s;
-		e[1] = t;
-		e[2] = l;
-		e[3] = r;
+		int* edge = &edges[nedges*4];
+		edge[0] = s;
+		edge[1] = t;
+		edge[2] = l;
+		edge[3] = r;
 		return nedges++;
 	}
 	else
@@ -583,10 +583,10 @@ static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin,
 				int maxi = -1;
 				for (int m = a+1; m < b; ++m)
 				{
-					float d = distancePtSeg(&edge[m*3],va,vb);
-					if (d > maxd)
+					float dev = distancePtSeg(&edge[m*3],va,vb);
+					if (dev > maxd)
 					{
-						maxd = d;
+						maxd = dev;
 						maxi = m;
 					}
 				}
@@ -743,12 +743,15 @@ static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin,
 
 static void getHeightData(const rcCompactHeightfield& chf,
 						  const unsigned short* poly, const int npoly,
-						  const unsigned short* verts,
+						  const unsigned short* verts, const int bs,
 						  rcHeightPatch& hp, rcIntArray& stack)
 {
 	// Floodfill the heightfield to get 2D height data,
 	// starting at vertex locations as seeds.
 	
+	// Note: Reads to the compact heightfield are offset by border size (bs)
+	// since border size offset is already removed from the polymesh vertices.
+	
 	memset(hp.data, 0, sizeof(unsigned short)*hp.width*hp.height);
 	
 	stack.resize(0);
@@ -772,7 +775,7 @@ static void getHeightData(const rcCompactHeightfield& chf,
 				az < hp.ymin || az >= hp.ymin+hp.height)
 				continue;
 			
-			const rcCompactCell& c = chf.cells[ax+az*chf.width];
+			const rcCompactCell& c = chf.cells[(ax+bs)+(az+bs)*chf.width];
 			for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
 			{
 				const rcCompactSpan& s = chf.spans[i];
@@ -844,7 +847,7 @@ static void getHeightData(const rcCompactHeightfield& chf,
 			if (hp.data[ax-hp.xmin+(ay-hp.ymin)*hp.width] != 0)
 				continue;
 			
-			const int ai = (int)chf.cells[ax+ay*chf.width].index + rcGetCon(cs, dir);
+			const int ai = (int)chf.cells[(ax+bs)+(ay+bs)*chf.width].index + rcGetCon(cs, dir);
 
 			int idx = ax-hp.xmin+(ay-hp.ymin)*hp.width;
 			hp.data[idx] = 1;
@@ -900,7 +903,7 @@ static void getHeightData(const rcCompactHeightfield& chf,
 			if (hp.data[ax-hp.xmin+(ay-hp.ymin)*hp.width] != RC_UNSET_HEIGHT)
 				continue;
 			
-			const int ai = (int)chf.cells[ax+ay*chf.width].index + rcGetCon(cs, dir);
+			const int ai = (int)chf.cells[(ax+bs)+(ay+bs)*chf.width].index + rcGetCon(cs, dir);
 			
 			const rcCompactSpan& as = chf.spans[ai];
 			int idx = ax-hp.xmin+(ay-hp.ymin)*hp.width;
@@ -938,8 +941,11 @@ static unsigned char getTriFlags(const float* va, const float* vb, const float*
 	return flags;
 }
 
-
-
+/// @par
+///
+/// See the #rcConfig documentation for more information on the configuration parameters.
+///
+/// @see rcAllocPolyMeshDetail, rcPolyMesh, rcCompactHeightfield, rcPolyMeshDetail, rcConfig
 bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompactHeightfield& chf,
 						   const float sampleDist, const float sampleMaxError,
 						   rcPolyMeshDetail& dmesh)
@@ -955,6 +961,7 @@ bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompa
 	const float cs = mesh.cs;
 	const float ch = mesh.ch;
 	const float* orig = mesh.bmin;
+	const int borderSize = mesh.borderSize;
 	
 	rcIntArray edges(64);
 	rcIntArray tris(512);
@@ -1065,7 +1072,7 @@ bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompa
 		hp.ymin = bounds[i*4+2];
 		hp.width = bounds[i*4+1]-bounds[i*4+0];
 		hp.height = bounds[i*4+3]-bounds[i*4+2];
-		getHeightData(chf, p, npoly, mesh.verts, hp, stack);
+		getHeightData(chf, p, npoly, mesh.verts, borderSize, hp, stack);
 		
 		// Build detail mesh.
 		int nverts = 0;
@@ -1157,6 +1164,7 @@ bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompa
 	return true;
 }
 
+/// @see rcAllocPolyMeshDetail, rcPolyMeshDetail
 bool rcMergePolyMeshDetails(rcContext* ctx, rcPolyMeshDetail** meshes, const int nmeshes, rcPolyMeshDetail& mesh)
 {
 	rcAssert(ctx);
diff --git a/dep/recastnavigation/Recast/Source/RecastRasterization.cpp b/dep/recastnavigation/Recast/Source/RecastRasterization.cpp
index 71adfb67322..d2bb7c98f18 100644
--- a/dep/recastnavigation/Recast/Source/RecastRasterization.cpp
+++ b/dep/recastnavigation/Recast/Source/RecastRasterization.cpp
@@ -154,6 +154,13 @@ static void addSpan(rcHeightfield& hf, const int x, const int y,
 	}
 }
 
+/// @par
+///
+/// The span addition can be set to favor flags. If the span is merged to
+/// another span and the new @p smax is within @p flagMergeThr units
+/// from the existing span, the span flags are merged.
+///
+/// @see rcHeightfield, rcSpan.
 void rcAddSpan(rcContext* /*ctx*/, rcHeightfield& hf, const int x, const int y,
 			   const unsigned short smin, const unsigned short smax,
 			   const unsigned char area, const int flagMergeThr)
@@ -276,6 +283,11 @@ static void rasterizeTri(const float* v0, const float* v1, const float* v2,
 	}
 }
 
+/// @par
+///
+/// No spans will be added if the triangle does not overlap the heightfield grid.
+///
+/// @see rcHeightfield
 void rcRasterizeTriangle(rcContext* ctx, const float* v0, const float* v1, const float* v2,
 						 const unsigned char area, rcHeightfield& solid,
 						 const int flagMergeThr)
@@ -291,6 +303,11 @@ void rcRasterizeTriangle(rcContext* ctx, const float* v0, const float* v1, const
 	ctx->stopTimer(RC_TIMER_RASTERIZE_TRIANGLES);
 }
 
+/// @par
+///
+/// Spans will only be added for triangles that overlap the heightfield grid.
+///
+/// @see rcHeightfield
 void rcRasterizeTriangles(rcContext* ctx, const float* verts, const int /*nv*/,
 						  const int* tris, const unsigned char* areas, const int nt,
 						  rcHeightfield& solid, const int flagMergeThr)
@@ -314,6 +331,11 @@ void rcRasterizeTriangles(rcContext* ctx, const float* verts, const int /*nv*/,
 	ctx->stopTimer(RC_TIMER_RASTERIZE_TRIANGLES);
 }
 
+/// @par
+///
+/// Spans will only be added for triangles that overlap the heightfield grid.
+///
+/// @see rcHeightfield
 void rcRasterizeTriangles(rcContext* ctx, const float* verts, const int /*nv*/,
 						  const unsigned short* tris, const unsigned char* areas, const int nt,
 						  rcHeightfield& solid, const int flagMergeThr)
@@ -337,6 +359,11 @@ void rcRasterizeTriangles(rcContext* ctx, const float* verts, const int /*nv*/,
 	ctx->stopTimer(RC_TIMER_RASTERIZE_TRIANGLES);
 }
 
+/// @par
+///
+/// Spans will only be added for triangles that overlap the heightfield grid.
+///
+/// @see rcHeightfield
 void rcRasterizeTriangles(rcContext* ctx, const float* verts, const unsigned char* areas, const int nt,
 						  rcHeightfield& solid, const int flagMergeThr)
 {
diff --git a/dep/recastnavigation/Recast/Source/RecastRegion.cpp b/dep/recastnavigation/Recast/Source/RecastRegion.cpp
index 6ad9fa53186..76e631cc5fb 100644
--- a/dep/recastnavigation/Recast/Source/RecastRegion.cpp
+++ b/dep/recastnavigation/Recast/Source/RecastRegion.cpp
@@ -283,6 +283,8 @@ static bool floodRegion(int x, int y, int i,
 				if (chf.areas[ai] != area)
 					continue;
 				unsigned short nr = srcReg[ai];
+				if (nr & RC_BORDER_REG) // Do not take borders into account.
+					continue;
 				if (nr != 0 && nr != r)
 					ar = nr;
 				
@@ -296,9 +298,9 @@ static bool floodRegion(int x, int y, int i,
 					const int ai2 = (int)chf.cells[ax2+ay2*w].index + rcGetCon(as, dir2);
 					if (chf.areas[ai2] != area)
 						continue;
-					unsigned short nr = srcReg[ai2];
-					if (nr != 0 && nr != r)
-						ar = nr;
+					unsigned short nr2 = srcReg[ai2];
+					if (nr2 != 0 && nr2 != r)
+						ar = nr2;
 				}				
 			}
 		}
@@ -319,16 +321,13 @@ static bool floodRegion(int x, int y, int i,
 				const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(cs, dir);
 				if (chf.areas[ai] != area)
 					continue;
-				if (chf.dist[ai] >= lev)
+				if (chf.dist[ai] >= lev && srcReg[ai] == 0)
 				{
-					if (srcReg[ai] == 0)
-					{
-						srcReg[ai] = r;
-						srcDist[ai] = 0;
-						stack.push(ax);
-						stack.push(ay);
-						stack.push(ai);
-					}
+					srcReg[ai] = r;
+					srcDist[ai] = 0;
+					stack.push(ax);
+					stack.push(ay);
+					stack.push(ai);
 				}
 			}
 		}
@@ -679,17 +678,17 @@ static void walkContour(int x, int y, int i, int dir,
 	// Remove adjacent duplicates.
 	if (cont.size() > 1)
 	{
-		for (int i = 0; i < cont.size(); )
+		for (int j = 0; j < cont.size(); )
 		{
-			int ni = (i+1) % cont.size();
-			if (cont[i] == cont[ni])
+			int nj = (j+1) % cont.size();
+			if (cont[j] == cont[nj])
 			{
-				for (int j = i; j < cont.size()-1; ++j)
-					cont[j] = cont[j+1];
+				for (int k = j; k < cont.size()-1; ++k)
+					cont[k] = cont[k+1];
 				cont.pop();
 			}
 			else
-				++i;
+				++j;
 		}
 	}
 }
@@ -807,14 +806,14 @@ static bool filterSmallRegions(rcContext* ctx, int minRegionArea, int mergeRegio
 					connectsToBorder = true;
 					continue;
 				}
-				rcRegion& nreg = regions[creg.connections[j]];
-				if (nreg.visited)
+				rcRegion& neireg = regions[creg.connections[j]];
+				if (neireg.visited)
 					continue;
-				if (nreg.id == 0 || (nreg.id & RC_BORDER_REG))
+				if (neireg.id == 0 || (neireg.id & RC_BORDER_REG))
 					continue;
 				// Visit
-				stack.push(nreg.id);
-				nreg.visited = true;
+				stack.push(neireg.id);
+				neireg.visited = true;
 			}
 		}
 		
@@ -937,7 +936,16 @@ static bool filterSmallRegions(rcContext* ctx, int minRegionArea, int mergeRegio
 	return true;
 }
 
-
+/// @par
+/// 
+/// This is usually the second to the last step in creating a fully built
+/// compact heightfield.  This step is required before regions are built
+/// using #rcBuildRegions or #rcBuildRegionsMonotone.
+/// 
+/// After this step, the distance data is available via the rcCompactHeightfield::maxDistance
+/// and rcCompactHeightfield::dist fields.
+///
+/// @see rcCompactHeightfield, rcBuildRegions, rcBuildRegionsMonotone
 bool rcBuildDistanceField(rcContext* ctx, rcCompactHeightfield& chf)
 {
 	rcAssert(ctx);
@@ -1020,6 +1028,25 @@ struct rcSweepSpan
 	unsigned short nei;	// neighbour id
 };
 
+/// @par
+/// 
+/// Non-null regions will consist of connected, non-overlapping walkable spans that form a single contour.
+/// Contours will form simple polygons.
+/// 
+/// If multiple regions form an area that is smaller than @p minRegionArea, then all spans will be
+/// re-assigned to the zero (null) region.
+/// 
+/// Partitioning can result in smaller than necessary regions. @p mergeRegionArea helps 
+/// reduce unecessarily small regions.
+/// 
+/// See the #rcConfig documentation for more information on the configuration parameters.
+/// 
+/// The region data will be available via the rcCompactHeightfield::maxRegions
+/// and rcCompactSpan::reg fields.
+/// 
+/// @warning The distance field must be created using #rcBuildDistanceField before attempting to build regions.
+/// 
+/// @see rcCompactHeightfield, rcCompactSpan, rcBuildDistanceField, rcBuildRegionsMonotone, rcConfig
 bool rcBuildRegionsMonotone(rcContext* ctx, rcCompactHeightfield& chf,
 							const int borderSize, const int minRegionArea, const int mergeRegionArea)
 {
@@ -1059,6 +1086,8 @@ bool rcBuildRegionsMonotone(rcContext* ctx, rcCompactHeightfield& chf,
 		paintRectRegion(w-bw, w, 0, h, id|RC_BORDER_REG, chf, srcReg); id++;
 		paintRectRegion(0, w, 0, bh, id|RC_BORDER_REG, chf, srcReg); id++;
 		paintRectRegion(0, w, h-bh, h, id|RC_BORDER_REG, chf, srcReg); id++;
+		
+		chf.borderSize = borderSize;
 	}
 	
 	rcIntArray prev(256);
@@ -1170,6 +1199,25 @@ bool rcBuildRegionsMonotone(rcContext* ctx, rcCompactHeightfield& chf,
 	return true;
 }
 
+/// @par
+/// 
+/// Non-null regions will consist of connected, non-overlapping walkable spans that form a single contour.
+/// Contours will form simple polygons.
+/// 
+/// If multiple regions form an area that is smaller than @p minRegionArea, then all spans will be
+/// re-assigned to the zero (null) region.
+/// 
+/// Watershed partitioning can result in smaller than necessary regions, especially in diagonal corridors. 
+/// @p mergeRegionArea helps reduce unecessarily small regions.
+/// 
+/// See the #rcConfig documentation for more information on the configuration parameters.
+/// 
+/// The region data will be available via the rcCompactHeightfield::maxRegions
+/// and rcCompactSpan::reg fields.
+/// 
+/// @warning The distance field must be created using #rcBuildDistanceField before attempting to build regions.
+/// 
+/// @see rcCompactHeightfield, rcCompactSpan, rcBuildDistanceField, rcBuildRegionsMonotone, rcConfig
 bool rcBuildRegions(rcContext* ctx, rcCompactHeightfield& chf,
 					const int borderSize, const int minRegionArea, const int mergeRegionArea)
 {
@@ -1209,11 +1257,19 @@ bool rcBuildRegions(rcContext* ctx, rcCompactHeightfield& chf,
 //	const int expandIters = 4 + walkableRadius * 2;
 	const int expandIters = 8;
 
-	// Mark border regions.
-	paintRectRegion(0, borderSize, 0, h, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
-	paintRectRegion(w-borderSize, w, 0, h, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
-	paintRectRegion(0, w, 0, borderSize, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
-	paintRectRegion(0, w, h-borderSize, h, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
+	if (borderSize > 0)
+	{
+		// Make sure border will not overflow.
+		const int bw = rcMin(w, borderSize);
+		const int bh = rcMin(h, borderSize);
+		// Paint regions
+		paintRectRegion(0, bw, 0, h, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
+		paintRectRegion(w-bw, w, 0, h, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
+		paintRectRegion(0, w, 0, bh, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
+		paintRectRegion(0, w, h-bh, h, regionId|RC_BORDER_REG, chf, srcReg); regionId++;
+
+		chf.borderSize = borderSize;
+	}
 	
 	while (level > 0)
 	{
@@ -1242,7 +1298,6 @@ bool rcBuildRegions(rcContext* ctx, rcCompactHeightfield& chf,
 				{
 					if (chf.dist[i] < level || srcReg[i] != 0 || chf.areas[i] == RC_NULL_AREA)
 						continue;
-					
 					if (floodRegion(x, y, i, level, regionId, chf, srcReg, srcDist, stack))
 						regionId++;
 				}
@@ -1250,7 +1305,6 @@ bool rcBuildRegions(rcContext* ctx, rcCompactHeightfield& chf,
 		}
 		
 		ctx->stopTimer(RC_TIMER_BUILD_REGIONS_FLOOD);
-		
 	}
 	
 	// Expand current regions until no empty connected cells found.
diff --git a/dep/recastnavigation/Recast/win/Recast_VC90.sln b/dep/recastnavigation/Recast/win/Recast_VC90.sln
deleted file mode 100644
index 32065319910..00000000000
--- a/dep/recastnavigation/Recast/win/Recast_VC90.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Recast", "VC90\Recast.vcproj", "{B6137343-A2F6-4AE7-BA47-484EC0EF369C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Debug|Win32.Build.0 = Debug|Win32
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Release|Win32.ActiveCfg = Release|Win32
-		{B6137343-A2F6-4AE7-BA47-484EC0EF369C}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/dep/recastnavigation/Recast/win/VC90/.gitignore b/dep/recastnavigation/Recast/win/VC90/.gitignore
deleted file mode 100644
index d82e4915b6d..00000000000
--- a/dep/recastnavigation/Recast/win/VC90/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-
-*__Win32_Release
-*__Win32_Debug
-*__x64_Release
-*__x64_Debug
-*.user
\ No newline at end of file
diff --git a/dep/recastnavigation/Recast/win/VC90/Recast.vcproj b/dep/recastnavigation/Recast/win/VC90/Recast.vcproj
deleted file mode 100644
index 41a45e18119..00000000000
--- a/dep/recastnavigation/Recast/win/VC90/Recast.vcproj
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="Recast"
-	ProjectGUID="{B6137343-A2F6-4AE7-BA47-484EC0EF369C}"
-	RootNamespace="Recast_VC90"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ProjectDir)\..\..\..\..\lib\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32;DEBUG;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ProjectDir)\..\..\..\..\lib\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="include"
-			>
-			<File
-				RelativePath="..\..\Include\Recast.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Include\RecastAlloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Include\RecastAssert.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="src"
-			>
-			<File
-				RelativePath="..\..\Source\Recast.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\RecastAlloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\RecastArea.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\RecastContour.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\RecastFilter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\RecastMesh.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\RecastMeshDetail.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\RecastRasterization.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Source\RecastRegion.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dep/recastnavigation/RecastDemo/Bin/.gitignore b/dep/recastnavigation/RecastDemo/Bin/.gitignore
deleted file mode 100644
index 64ed58794df..00000000000
--- a/dep/recastnavigation/RecastDemo/Bin/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-
-!.gitignore
-*
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Bin/DroidSans.ttf b/dep/recastnavigation/RecastDemo/Bin/DroidSans.ttf
deleted file mode 100644
index 15c274d8245..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Bin/DroidSans.ttf and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Bin/Meshes/dungeon.obj b/dep/recastnavigation/RecastDemo/Bin/Meshes/dungeon.obj
deleted file mode 100644
index 49055427532..00000000000
--- a/dep/recastnavigation/RecastDemo/Bin/Meshes/dungeon.obj
+++ /dev/null
@@ -1,15234 +0,0 @@
-v 32.471557617 31.175949097 3.788104773
-v 31.950048447 31.175949097 2.338263273
-v 31.688222885 31.175949097 0.819886208
-v 34.222843170 31.175949097 6.309397697
-v 33.236907959 31.175949097 5.125359535
-v 45.539302826 31.175949097 7.342514992
-v 39.693061829 31.175949097 8.885383606
-v 36.730842590 31.175949097 8.079663277
-v 35.399402618 31.175949097 7.304241180
-v 38.176704407 31.175949097 8.612103462
-v 48.521808624 31.175949097 -3.622624636
-v 49.026046753 31.175949097 2.402715683
-v 47.718185425 31.175949097 5.180017471
-v 46.723342896 31.175949097 6.356580257
-v 48.493606567 31.175949097 3.848578453
-v 49.305145264 31.175949097 -0.654410124
-v 49.299327850 31.175949097 0.886361718
-v 42.752204895 31.175949097 8.629374504
-v 41.233833313 31.175949097 8.891200066
-v 44.202045441 31.175949097 8.107864380
-v 49.043319702 31.175949097 -2.172783852
-v 38.241161346 31.175949097 -8.463897705
-v 44.262527466 31.175949097 -7.914186001
-v 46.770526886 31.175949097 -6.143918514
-v 47.756462097 31.175949097 -4.959880829
-v 45.593963623 31.175949097 -7.138762951
-v 41.300308228 31.175949097 -8.719906807
-v 42.816661835 31.175949097 -8.446626663
-v 31.694038391 31.175949097 -0.720889091
-v 31.967319489 31.175949097 -2.237243176
-v 33.275184631 31.175949097 -5.014545441
-v 32.499759674 31.175949097 -3.683105707
-v 35.454067230 31.175949097 -7.177039623
-v 36.791320801 31.175949097 -7.942388058
-v 34.270027161 31.175949097 -6.191106319
-v 39.759536743 31.175949097 -8.725723267
-v 31.788227081 9.998181343 3.466857910
-v 31.788227081 13.729361534 3.467402458
-v 32.028339386 13.729361534 3.467821598
-v 32.028339386 9.998181343 3.467277050
-v 32.028583527 13.729488373 3.327821970
-v 32.028583527 9.998181343 3.327277660
-v 31.788471222 9.998181343 3.326858521
-v 31.788471222 13.729488373 3.327402830
-v 31.788461685 16.147314072 3.332412243
-v 32.028575897 16.147314072 3.332831383
-v 32.028331757 16.147188187 3.472831011
-v 31.788217545 16.147188187 3.472411871
-v 31.736412048 16.147670746 2.534013748
-v 31.496299744 16.147670746 2.533594608
-v 31.496307373 14.267010689 2.528585196
-v 31.345476151 14.589399338 1.754027605
-v 31.345466614 16.147884369 1.759037018
-v 31.585578918 16.147884369 1.759456158
-v 31.585588455 14.589399338 1.754446745
-v 31.736419678 14.267010689 2.529004335
-v 31.213439941 14.785192490 0.919718027
-v 31.213432312 16.148014069 0.924727559
-v 31.453556061 14.785192490 0.920137167
-v 31.453544617 16.148014069 0.925146699
-v 31.166309357 16.148063660 0.074689411
-v 31.406433105 14.858482361 0.070098996
-v 31.406423569 16.148063660 0.075108476
-v 31.166316986 14.858482361 0.069679931
-v 31.800228119 9.998181343 -3.409051180
-v 31.800226212 13.749429703 -3.408686399
-v 31.799911499 13.749273300 -3.228687048
-v 31.799911499 9.998181343 -3.229051828
-v 32.040023804 9.998181343 -3.228632689
-v 32.040023804 13.749273300 -3.228267908
-v 32.040340424 13.749429703 -3.408267260
-v 32.040340424 9.998181343 -3.408632040
-v 31.216400146 14.795266151 -0.776435494
-v 31.216392517 16.148019791 -0.771425962
-v 31.456514359 14.795266151 -0.776016355
-v 31.456504822 16.148019791 -0.771006942
-v 31.591457367 14.590011597 -1.608003974
-v 31.591447830 16.147884369 -1.602994561
-v 31.351343155 14.590011597 -1.608423114
-v 31.351333618 16.147884369 -1.603413701
-v 32.040016174 16.147327423 -3.223258734
-v 31.799903870 16.147327423 -3.223677874
-v 31.800216675 16.147483826 -3.403676987
-v 32.040328979 16.147483826 -3.403257847
-v 31.745027542 16.147678375 -2.403040648
-v 31.504913330 16.147678375 -2.403459787
-v 31.745037079 14.277850151 -2.408050060
-v 31.504922867 14.277850151 -2.408469200
-v 46.721595764 24.693101883 6.354872704
-v 45.537879944 24.693101883 7.340530396
-v 47.716171265 24.693101883 5.178639412
-v 48.491386414 24.693101883 3.847570896
-v 46.722469330 23.774042130 6.355726242
-v 45.538589478 23.774042130 7.341522694
-v 47.717178345 23.774042130 5.179327965
-v 48.492496490 23.774042130 3.848074436
-v 42.751548767 24.693101883 8.627023697
-v 41.233592987 24.693101883 8.888769150
-v 44.200992584 24.693101883 8.105663300
-v 39.693244934 24.693101883 8.882948875
-v 44.201519012 23.774042130 8.106764793
-v 41.233711243 23.774042130 8.889985085
-v 39.693153381 23.774042130 8.884165764
-v 42.751876831 23.774042130 8.628198624
-v 49.023681641 24.693101883 2.402109146
-v 49.296894073 24.693101883 0.886175275
-v 49.302715302 24.693101883 -0.654170871
-v 49.024864197 23.774042130 2.402412415
-v 49.298110962 23.774042130 0.886268497
-v 49.303928375 23.774042130 -0.654290438
-v 49.040969849 24.693101883 -2.172126293
-v 48.519607544 24.693101883 -3.621569395
-v 49.042144775 23.774042130 -2.172455311
-v 48.520709991 23.774042130 -3.622097015
-v 47.754474640 24.693101883 -4.958458900
-v 46.768821716 24.693101883 -6.142173767
-v 45.592586517 24.693101883 -7.136748314
-v 44.261516571 24.693101883 -7.911962032
-v 42.816055298 24.693101883 -8.444260597
-v 45.593276978 23.774042130 -7.137755394
-v 46.769672394 23.774042130 -6.143045902
-v 47.755466461 23.774042130 -4.959169388
-v 42.816360474 23.774042130 -8.445443153
-v 44.262020111 23.774042130 -7.913074017
-v 41.300121307 24.693101883 -8.717472076
-v 39.759777069 24.693101883 -8.723292351
-v 38.241821289 24.693101883 -8.461545944
-v 39.759654999 23.774042130 -8.724507332
-v 41.300216675 23.774042130 -8.718688965
-v 38.241493225 23.774042130 -8.462721825
-v 49.023681641 17.277132034 2.402109146
-v 48.491386414 17.277132034 3.847570896
-v 49.296894073 17.277132034 0.886175275
-v 49.302715302 17.277132034 -0.654170871
-v 46.721595764 17.277132034 6.354872704
-v 45.537879944 17.277132034 7.340530396
-v 47.716171265 17.277132034 5.178639412
-v 42.751548767 17.277132034 8.627023697
-v 41.233592987 17.277132034 8.888769150
-v 44.200992584 17.277132034 8.105663300
-v 39.693244934 17.277132034 8.882948875
-v 46.721595764 16.372127533 6.354872704
-v 45.537879944 16.372127533 7.340530396
-v 47.716171265 16.372127533 5.178639412
-v 48.491386414 16.372127533 3.847570896
-v 46.721595764 10.354028702 6.354872704
-v 45.537879944 10.354028702 7.340530396
-v 47.716171265 10.354028702 5.178639412
-v 48.491386414 10.354028702 3.847570896
-v 42.751548767 16.372127533 8.627023697
-v 44.200992584 16.372127533 8.105663300
-v 44.200992584 10.354028702 8.105663300
-v 42.751548767 10.354028702 8.627023697
-v 45.442817688 10.109920502 7.175106049
-v 46.599250793 10.109920502 6.208469391
-v 46.599605560 9.998180389 6.208224297
-v 45.443206787 9.998180389 7.174926758
-v 45.872833252 9.998180389 5.478765011
-v 47.570262909 10.109920502 5.055705547
-v 47.570568085 9.998180389 5.055403233
-v 44.854145050 9.998181343 6.330346107
-v 46.728168488 9.998180389 4.463228226
-v 44.136096954 10.109920502 7.926244736
-v 42.718795776 10.109920502 8.439061165
-v 42.454551697 9.998181343 7.443909645
-v 43.703060150 9.998181343 6.992096901
-v 44.136512756 9.998181343 7.926135540
-v 42.719226837 9.998181343 8.439026833
-v 49.023681641 16.372127533 2.402109146
-v 49.296894073 16.372127533 0.886175275
-v 49.302715302 16.372127533 -0.654170871
-v 49.023681641 10.354028702 2.402109146
-v 49.296894073 10.354028702 0.886175275
-v 49.302715302 10.354028702 -0.654170871
-v 48.326347351 10.109920502 3.751841307
-v 48.326595306 9.998180389 3.751490116
-v 47.394161224 9.998180389 3.314592838
-v 48.086002350 9.998180389 -0.567131877
-v 48.844528198 10.109920502 2.336492777
-v 47.850578308 9.998180389 2.067759991
-v 48.844711304 9.998180389 2.336104155
-v 49.109176636 9.998180389 0.852250695
-v 49.109066010 10.109920502 0.852665544
-v 48.083549500 9.998180389 0.760612607
-v 49.111961365 9.998180389 -0.654983759
-v 49.111923218 10.109920502 -0.654555559
-v 41.233592987 16.372127533 8.888769150
-v 39.693244934 16.372127533 8.882948875
-v 41.233592987 10.354028702 8.888769150
-v 39.693244934 10.354028702 8.882948875
-v 38.242927551 10.109920502 8.430583000
-v 39.726757050 10.109920502 8.695119858
-v 39.727172852 9.998181343 8.695234299
-v 38.243316650 9.998181343 8.430766106
-v 39.818809509 9.998181343 7.669605255
-v 37.264827728 9.998181343 6.980216503
-v 41.146553040 9.998181343 7.672055721
-v 41.234405518 9.998181343 8.698015213
-v 41.233978271 10.109920502 8.697976112
-v 41.300121307 17.277132034 -8.717472076
-v 42.816055298 17.277132034 -8.444260597
-v 39.759777069 17.277132034 -8.723292351
-v 38.241821289 17.277132034 -8.461545944
-v 49.040969849 17.277132034 -2.172126293
-v 48.519607544 17.277132034 -3.621569395
-v 47.754474640 17.277132034 -4.958458900
-v 46.768821716 17.277132034 -6.142173767
-v 45.592586517 17.277132034 -7.136748314
-v 44.261516571 17.277132034 -7.911962032
-v 49.040969849 16.372127533 -2.172126293
-v 48.519607544 16.372127533 -3.621569395
-v 45.592586517 16.372127533 -7.136748314
-v 46.768821716 16.372127533 -6.142173767
-v 47.754474640 16.372127533 -4.958458900
-v 44.261516571 16.372127533 -7.911962032
-v 42.816055298 16.372127533 -8.444260597
-v 43.728538513 9.998181343 -6.814738750
-v 44.877174377 9.998181343 -6.148745060
-v 45.469352722 9.998180389 -6.991144657
-v 41.174560547 9.998181343 -7.504128933
-v 45.892707825 9.998180389 -5.293409824
-v 49.040969849 10.354028702 -2.172126293
-v 48.519607544 10.354028702 -3.621569395
-v 48.852970123 9.998180389 -2.139802933
-v 47.857856750 9.998180389 -1.875129580
-v 48.853004456 10.109920502 -2.139374256
-v 48.340190887 10.109920502 -3.556675434
-v 47.406040192 9.998180389 -3.123638630
-v 48.340080261 9.998180389 -3.557091475
-v 47.754474640 10.354028702 -4.958458900
-v 46.768821716 10.354028702 -6.142173767
-v 45.592586517 10.354028702 -7.136748314
-v 44.261516571 10.354028702 -7.911962032
-v 42.816055298 10.354028702 -8.444260597
-v 47.588871002 9.998180389 -4.863785744
-v 46.744293213 9.998180389 -4.274724007
-v 47.589050293 10.109920502 -4.863395691
-v 46.622417450 10.109920502 -6.019829273
-v 46.622169495 9.998180389 -6.020182610
-v 45.469654083 10.109920502 -6.990839005
-v 44.165786743 10.109920502 -7.746923447
-v 44.165435791 9.998181343 -7.747171879
-v 41.300121307 16.372127533 -8.717472076
-v 39.759777069 16.372127533 -8.723292351
-v 38.241821289 16.372127533 -8.461545944
-v 41.300121307 10.354028702 -8.717472076
-v 39.759777069 10.354028702 -8.723292351
-v 38.241821289 10.354028702 -8.461545944
-v 42.750438690 10.109920502 -8.265105247
-v 42.750049591 9.998181343 -8.265288353
-v 42.481704712 9.998181343 -7.271155834
-v 41.266613007 10.109920502 -8.529643059
-v 41.266197205 9.998181343 -8.529757500
-v 39.759391785 10.109920502 -8.532499313
-v 39.758964539 9.998181343 -8.532538414
-v 39.846813202 9.998181343 -7.506579876
-v 38.538818359 9.998181343 -7.278433323
-v 38.274574280 10.109920502 -8.273585320
-v 38.274143219 9.998181343 -8.273550034
-v 36.731849670 24.693101883 8.077439308
-v 38.177310944 24.693101883 8.609737396
-v 35.400783539 24.693101883 7.302225113
-v 34.224548340 24.693101883 6.307652473
-v 33.238891602 24.693101883 5.123937607
-v 36.731346130 23.774042130 8.078551292
-v 38.177009583 23.774042130 8.610920906
-v 35.400093079 23.774042130 7.303232670
-v 34.223693848 23.774042130 6.308525085
-v 33.237899780 23.774042130 5.124648571
-v 31.952400208 24.693101883 2.337605953
-v 31.690650940 24.693101883 0.819646955
-v 32.473762512 24.693101883 3.787048340
-v 32.472660065 23.774042130 3.787576437
-v 31.951225281 23.774042130 2.337934732
-v 31.696472168 24.693101883 -0.720702767
-v 31.689437866 23.774042130 0.819766641
-v 32.501983643 24.693101883 -3.682098389
-v 33.277198792 24.693101883 -5.013166428
-v 31.969684601 24.693101883 -2.236636877
-v 32.500873566 23.774042130 -3.682601929
-v 33.276191711 23.774042130 -5.013856411
-v 31.968502045 23.774042130 -2.236939907
-v 31.695255280 23.774042130 -0.720795989
-v 35.455490112 24.693101883 -7.175054550
-v 36.792377472 24.693101883 -7.940186977
-v 34.271774292 24.693101883 -6.189398766
-v 36.791851044 23.774042130 -7.941287518
-v 35.454776764 23.774042130 -7.176047325
-v 34.270900726 23.774042130 -6.190252781
-v 32.473762512 17.277132034 3.787048340
-v 31.952400208 17.277132034 2.337605953
-v 33.238891602 17.277132034 5.123937607
-v 31.690650940 17.277132034 0.819646955
-v 31.693531036 17.277132034 0.057565335
-v 36.731849670 17.277132034 8.077439308
-v 38.177310944 17.277132034 8.609737396
-v 35.400783539 17.277132034 7.302225113
-v 34.224548340 17.277132034 6.307652473
-v 36.731849670 16.372127533 8.077439308
-v 38.177310944 16.372127533 8.609737396
-v 35.400783539 16.372127533 7.302225113
-v 34.224548340 16.372127533 6.307652473
-v 33.238891602 16.372127533 5.123937607
-v 32.473762512 16.372127533 3.787048340
-v 32.217067719 15.177541733 3.073410511
-v 31.952400208 16.372127533 2.337605953
-v 36.731849670 10.354028702 8.077439308
-v 35.400783539 10.354028702 7.302225113
-v 38.177310944 10.354028702 8.609737396
-v 38.511661530 9.998181343 7.436633110
-v 36.827930450 9.998181343 7.912648678
-v 33.586009979 9.998181343 3.286829948
-v 36.827579498 10.109920502 7.912400246
-v 35.523715973 10.109920502 7.156316757
-v 35.524017334 9.998181343 7.156622887
-v 36.116191864 9.998181343 6.314222813
-v 35.100658417 9.998181343 5.458888531
-v 32.473762512 10.354028702 3.787048340
-v 33.238891602 10.354028702 5.123937607
-v 34.224548340 10.354028702 6.307652473
-v 34.371196747 9.998181343 6.185661316
-v 33.404495239 9.998181343 5.029264927
-v 33.404315948 10.109920502 5.028873920
-v 34.370952606 10.109920502 6.185307503
-v 34.249076843 9.998181343 4.440203190
-v 32.653285980 9.998181343 3.722570896
-v 32.653179169 10.109920502 3.722154856
-v 32.390846252 9.998181343 3.008769512
-v 32.390743256 10.109920502 3.009335756
-v 32.215225220 10.354028702 3.068289518
-v 33.416843414 9.998181343 2.826718807
-v 32.210395813 9.998181343 3.071496487
-v 32.216464996 13.597610474 3.071733236
-v 30.841369629 9.998181343 3.065892220
-v 30.841371536 13.593065262 3.065892696
-v 29.847984314 9.998181343 3.064158440
-v 29.847984314 13.593065262 3.064158440
-v 32.101707458 13.597610474 3.071532965
-v 32.095634460 9.998181343 3.071296215
-v 31.952400208 14.024101257 2.337605953
-v 31.824810028 14.315032005 1.630335212
-v 31.710052490 14.315032005 1.630134821
-v 29.849193573 14.013492584 2.370918036
-v 30.842580795 14.013491631 2.372651577
-v 30.843887329 14.319043159 1.625072956
-v 29.850498199 14.319043159 1.623339295
-v 30.845237732 14.504489899 0.850766778
-v 30.846607208 14.566659927 0.065888450
-v 29.853219986 14.566660881 0.064154625
-v 29.851850510 14.504489899 0.849032998
-v 31.575893402 14.506861687 0.819446802
-v 31.690650940 14.506861687 0.819646955
-v 31.690650940 16.372127533 0.819646955
-v 31.693531036 16.372127533 0.057565335
-v 31.578773499 14.563559532 0.057368152
-v 31.693531036 14.563559532 0.057568435
-v 31.837966919 14.025511742 2.338305235
-v 32.397361755 9.998181343 -2.868865728
-v 32.501983643 17.277132034 -3.682098389
-v 33.277198792 17.277132034 -5.013166428
-v 31.969684601 17.277132034 -2.236636877
-v 31.696472168 17.277132034 -0.720702767
-v 36.792377472 17.277132034 -7.940186977
-v 35.455490112 17.277132034 -7.175054550
-v 34.271774292 17.277132034 -6.189398766
-v 33.422950745 9.998181343 -2.681992054
-v 31.696472168 14.500898361 -0.720702767
-v 31.696472168 16.372127533 -0.720702767
-v 31.581714630 14.500898361 -0.720903039
-v 32.221408844 9.998181343 -2.947216749
-v 32.106651306 9.998181343 -2.947417021
-v 29.858455658 9.998181343 -2.935833454
-v 33.597019196 9.998181343 -3.145344257
-v 32.666774750 9.998181343 -3.586017847
-v 32.397502899 10.109920502 -2.868808270
-v 32.667022705 10.109920502 -3.586368561
-v 32.501983643 10.354028702 -3.682098389
-v 32.230220795 10.354028702 -2.944126129
-v 32.501983643 16.372127533 -3.682098389
-v 30.851840973 9.998181343 -2.934099674
-v 31.969684601 16.372127533 -2.236636877
-v 30.850643158 14.013491631 -2.246689558
-v 30.849338531 14.319043159 -1.499111056
-v 29.857255936 14.013492584 -2.248423100
-v 29.858455658 13.593065262 -2.935833454
-v 30.851842880 13.593065262 -2.934099674
-v 29.855951309 14.319043159 -1.500844717
-v 31.832874298 14.318614006 -1.495679021
-v 31.718116760 14.318614006 -1.495879292
-v 30.847988129 14.504489899 -0.724804401
-v 29.854598999 14.504489899 -0.726538181
-v 33.277198792 16.372127533 -5.013166428
-v 32.223587036 15.128337860 -2.926110983
-v 31.969684601 14.016605377 -2.236636877
-v 32.227390289 13.587356567 -2.936434984
-v 36.792377472 16.372127533 -7.940186977
-v 35.455490112 16.372127533 -7.175054550
-v 34.271774292 16.372127533 -6.189398766
-v 34.265201569 9.998181343 -4.297754765
-v 36.139221191 9.998181343 -6.164871693
-v 36.792377472 10.354028702 -7.940186977
-v 35.455490112 10.354028702 -7.175054550
-v 36.857269287 10.109920502 -7.760769367
-v 36.856853485 9.998181343 -7.760660172
-v 37.290306091 9.998181343 -6.826621532
-v 35.550552368 10.109920502 -7.009631634
-v 35.550159454 9.998181343 -7.009452343
-v 34.271774292 10.354028702 -6.189398766
-v 33.277198792 10.354028702 -5.013166428
-v 33.422801971 9.998181343 -4.889929771
-v 34.394119263 10.109920502 -6.042995930
-v 33.423107147 10.109920502 -4.890232563
-v 35.120536804 9.998181343 -5.313291073
-v 34.393764496 9.998181343 -6.042750835
-v 31.854927063 14.016605377 -2.236837149
-v 32.112632751 13.587356567 -2.936635256
-v 10.356585503 15.374712944 5.018982410
-v 29.294418335 16.423784256 3.660708904
-v 29.291988373 15.376764297 5.051695347
-v 10.358929634 16.423786163 3.627655268
-v 29.296293259 16.884586334 2.586380243
-v 10.360805511 16.884588242 2.553326368
-v 29.298488617 17.185401917 1.329080343
-v 10.362999916 17.185403824 1.296026111
-v 29.300714493 17.272243500 0.053253978
-v 10.365226746 17.272245407 0.020199960
-v 29.302951813 17.185401917 -1.229294538
-v 10.367465019 17.185403824 -1.262348533
-v 29.305149078 16.884586334 -2.486595154
-v 10.369660378 16.884588242 -2.519649506
-v 29.307025909 16.422849655 -3.563069105
-v 10.371539116 16.422851563 -3.596122742
-v 29.309436798 15.374711037 -4.943069458
-v 10.373947144 15.381685257 -4.975730896
-v 29.304344177 15.435887337 -2.026943684
-v 28.841117859 14.941126823 -2.793433666
-v 28.839639664 15.304441452 -1.946416855
-v 29.305885315 15.072572708 -2.908475876
-v 28.638072968 14.662881851 -2.633832216
-v 28.636623383 14.979496956 -1.803709745
-v 29.309436798 15.026430130 -4.943069458
-v 29.138191223 15.381684303 -4.729002476
-v 29.138191223 15.242951393 -4.729002476
-v 28.639835358 13.952214241 -3.643826246
-v 28.843130112 14.116405487 -3.946170568
-v 29.308036804 14.219081879 -4.141609192
-v 28.840187073 14.013489723 -2.260160208
-v 28.841386795 13.593063354 -2.947570324
-v 28.636323929 14.589397430 -1.631963611
-v 28.637676239 14.267008781 -2.406255484
-v 28.639068604 13.729486465 -3.204560280
-v 28.837913513 15.541136742 -0.957117617
-v 29.302547455 15.672581673 -0.997330248
-v 28.635015488 15.184299469 -0.882141113
-v 28.836151123 15.609466553 0.052426800
-v 29.300714493 15.740912437 0.053353190
-v 28.633384705 15.245204926 0.052069638
-v 28.634868622 14.785190582 -0.797887027
-v 28.838882446 14.319040298 -1.512581468
-v 28.837530136 14.504487991 -0.738275290
-v 28.633384705 14.858480453 0.052066229
-v 28.836151123 14.566658020 0.052417602
-v 28.639068604 9.998180389 -3.204016447
-v 28.841384888 9.998180389 -2.947570324
-v 28.830911636 9.998180389 3.052421331
-v 29.116922379 10.109930038 -4.061254501
-v 29.118087769 10.109925270 -4.728369236
-v 29.118087769 9.998066902 -4.728369236
-v 28.843128204 9.998180389 -3.945131063
-v 29.308036804 10.354040146 -4.141703129
-v 29.116922379 9.998066902 -4.061254501
-v 29.309436798 10.354034424 -4.943069458
-v 28.639841080 9.998180389 -3.646778345
-v 29.298891068 15.672581673 1.097742677
-v 28.834398270 15.541136742 1.055923820
-v 28.631757736 15.202935219 0.984243691
-v 29.297094345 15.435887337 2.127355576
-v 28.832672119 15.304441452 2.045222759
-v 28.630126953 15.017164230 1.918454051
-v 28.631908417 14.795264244 0.898266375
-v 28.834779739 14.504487991 0.837295890
-v 28.630455017 14.590009689 1.730486751
-v 28.833427429 14.319040298 1.611602187
-v 28.629058838 14.277847290 2.530798197
-v 28.831195831 14.941862106 2.890551567
-v 28.628692627 14.678530693 2.739474773
-v 29.295558929 15.073307991 3.007130861
-v 28.832122803 14.013489723 2.359180450
-v 28.627624512 13.749271393 3.351529121
-v 28.626873016 13.975434303 3.781867743
-v 29.293388367 14.220697403 4.250654221
-v 28.829160690 14.118021011 4.056437016
-v 29.291988373 15.028306961 5.051695347
-v 29.121498108 15.383560181 4.835417271
-v 29.121498108 15.244828224 4.835417271
-v 28.627624512 9.998180389 3.351893425
-v 28.830913544 13.593063354 3.052421331
-v 28.626873016 9.998180389 3.781398773
-v 28.829162598 9.998180389 4.055243969
-v 29.291988373 10.354028702 5.051671505
-v 29.293388367 10.354027748 4.250892162
-v 29.101392746 9.998066902 4.835268974
-v 29.102554321 9.998066902 4.170360088
-v 29.101392746 10.109920502 4.835268974
-v 29.102554321 10.109919548 4.170360088
-v 10.544443130 15.381685257 -4.761458397
-v 10.544443130 15.242953300 -4.761458397
-v 10.373948097 15.026432037 -4.976121902
-v 10.373948097 10.354028702 -4.976121902
-v 11.038537025 9.998181343 -3.275253773
-v 10.836583138 9.998181343 -3.976563454
-v 10.564364433 10.109919548 -4.760755062
-v 11.039286613 9.998181343 -3.704759359
-v 10.834840775 9.998181343 -2.979003191
-v 10.564364433 9.998067856 -4.760755062
-v 10.824367523 9.998181343 3.020988703
-v 10.822616577 9.998181343 4.023811817
-v 10.356501579 10.354034424 5.018618584
-v 10.547670364 9.998067856 4.802883148
-v 11.026322365 9.998181343 3.723418236
-v 11.027094841 9.998181343 3.280656099
-v 10.547670364 10.109925270 4.802883148
-v 10.527830124 15.381774902 4.802964687
-v 10.356585503 15.026519775 5.018982410
-v 10.527830124 15.243041992 4.802964687
-v 10.372631073 14.220699310 -4.174578667
-v 10.370459557 15.073310852 -2.930491924
-v 10.834573746 14.941128731 -2.824866056
-v 10.836585999 14.116407394 -3.977602959
-v 11.037467957 14.678532600 -2.662835360
-v 11.039287567 13.975436211 -3.705228567
-v 11.037103653 14.277850151 -2.454159260
-v 11.038536072 13.749273300 -3.274889231
-v 11.036034584 15.017166138 -1.841814637
-v 10.833095551 15.304443359 -1.977849364
-v 10.368923187 15.435888290 -2.050716639
-v 9.840255737 14.013492584 -2.293326378
-v 10.833642960 14.013491631 -2.291592836
-v 10.832337379 14.319043159 -1.544014096
-v 11.035706520 14.590011597 -1.653847337
-v 11.034403801 15.202938080 -0.907604218
-v 10.831368446 15.541138649 -0.988549888
-v 10.367126465 15.672584534 -1.021103144
-v 11.032777786 15.245207787 0.024569876
-v 10.830013275 15.609468460 0.024212779
-v 10.365303040 15.740915298 0.023286272
-v 11.034254074 14.795266151 -0.821626842
-v 9.838950157 14.319043159 -1.545748115
-v 10.830985069 14.504489899 -0.769707739
-v 9.837597847 14.504489899 -0.771441817
-v 9.836218834 14.566660881 0.019251090
-v 10.829605103 14.566659927 0.020985158
-v 11.032777786 14.858482361 0.024573289
-v 10.834841728 13.593065262 -2.979002953
-v 9.841454506 9.998181343 -2.980736971
-v 9.841455460 13.593065262 -2.980736732
-v 10.372630119 10.354027748 -4.174252510
-v 10.563604355 9.998067856 -4.093901634
-v 10.563604355 10.109919548 -4.093901634
-v 11.031147003 15.184301376 0.958780825
-v 10.827854156 15.541138649 1.024491310
-v 10.363469124 15.672584534 1.073969722
-v 10.361672401 15.435888290 2.103582621
-v 11.029538155 14.979497910 1.880349159
-v 10.826127052 15.304443359 2.013790369
-v 10.828235626 14.504489899 0.805863440
-v 9.834848404 14.504489899 0.804129362
-v 11.031293869 14.785192490 0.874526620
-v 10.826883316 14.319043159 1.580169678
-v 9.833496094 14.319043159 1.578435779
-v 10.825578690 14.013491631 2.327747822
-v 11.029838562 14.589399338 1.708603024
-v 11.028089523 14.662883759 2.710471869
-v 10.824651718 14.941864014 2.859119177
-v 10.360135078 15.072574615 2.985115051
-v 11.028487206 14.267010689 2.482894659
-v 11.026327133 13.952216148 3.720466137
-v 9.832191467 14.013492584 2.326014042
-v 11.027093887 13.729488373 3.281200171
-v 10.824368477 13.593065262 3.020988941
-v 10.822615623 14.118022919 4.025004864
-v 10.357982635 14.219083786 4.218248844
-v 9.830981255 9.998181343 3.019254923
-v 10.357981682 10.354040146 4.217919350
-v 9.830982208 13.593065262 3.019254923
-v 10.549234390 9.998067856 4.138958454
-v 10.549234390 10.109930038 4.138958454
-v 5.309868813 16.884586334 -4.066629410
-v 5.965365887 16.423784256 -4.917809963
-v 7.409113407 16.423784256 -4.080895424
-v 4.787422657 16.423784256 -6.099878311
-v 5.892444134 15.376764297 -6.944730759
-v 6.814069748 15.376764297 -6.019875526
-v 3.933958769 16.884586334 -5.447355747
-v 3.955558538 16.423784256 -7.546542645
-v 5.241590500 15.376764297 -8.076605797
-v 9.319129944 16.422849655 -3.599782944
-v 9.020275116 16.423784256 -3.646166325
-v 9.321538925 15.374711037 -4.979783535
-v 7.943663597 15.376764297 -5.365069389
-v 6.996253967 16.884586334 -3.089062452
-v 8.878190041 16.884586334 -2.581273079
-v 9.317251205 16.884586334 -2.523308992
-v 2.935139656 17.185401917 -4.683700562
-v 1.799856663 17.185401917 -6.658026218
-v 1.921602488 17.272243500 -3.908794165
-v 4.542731285 17.185401917 -3.070481777
-v 2.962290764 16.884586334 -7.137146473
-v 3.472298384 16.423784256 -9.458216667
-v 3.526463032 16.423784256 -9.159214973
-v 2.461080551 16.884586334 -9.020846367
-v 4.863285065 15.376764297 -9.455788612
-v 2.397970200 16.884586334 -9.460092545
-v 1.214250684 17.185401917 -8.858910561
-v -0.135156274 17.272243500 -9.464513779
-v -0.050951496 17.272243500 -8.694589615
-v -1.322819948 17.185401917 -8.529404640
-v 1.140670061 17.185401917 -9.462286949
-v -1.417704940 17.185401917 -9.466752052
-v 0.620294213 17.272243500 -6.171846390
-v -1.727916718 16.884586334 -5.203984261
-v -0.565482378 17.185401917 -5.683104515
-v 0.902725697 17.185401917 -3.129805088
-v -2.569650412 16.884586334 -8.367468834
-v -2.675005198 16.884586334 -9.468947411
-v -3.751479387 16.422849655 -9.470826149
-v -5.005669594 15.374711037 -8.051085472
-v -5.131479740 15.374711037 -9.473235130
-v -3.637160063 16.422849655 -8.228823662
-v -2.723167658 16.422849655 -4.793770790
-v -0.096093923 16.884586334 -2.366149664
-v -3.999043703 15.374711037 -4.267893314
-v 3.764290810 17.272243500 -2.059657097
-v 2.981748581 17.185401917 -1.043506265
-v 6.513077736 17.185401917 -1.928307772
-v 6.022782326 17.272243500 -0.750450432
-v 5.529903412 17.185401917 0.433612496
-v 8.711903572 17.185401917 -1.335014701
-v 9.315055847 17.185401917 -1.266008496
-v 8.543165207 17.272243500 -0.070394248
-v 9.312817574 17.272243500 0.016540131
-v 0.715803146 15.374711037 1.898883700
-v 1.557805777 16.422849655 0.805522621
-v 4.633044720 16.422849655 2.588180780
-v 4.102715492 15.374711037 3.862213135
-v 5.046727657 16.884586334 1.594367266
-v 2.214611053 16.884586334 -0.047358394
-v 9.310590744 17.185401917 1.292366385
-v 9.308396339 16.884586334 2.549666405
-v 8.207252502 16.884586334 2.447146654
-v 8.373538017 17.185401917 1.200888276
-v 9.306520462 16.423784256 3.623995066
-v 8.064883232 16.422849655 3.514165878
-v 7.882367134 15.374711037 4.882045746
-v 9.304092407 15.376764297 5.014981270
-v -2.047555685 15.374711037 -0.874144256
-v -0.951261282 16.422849655 -1.712323785
-v 5.892444134 15.028306961 -6.944730759
-v 5.671233654 15.244828224 -6.775876999
-v 4.984215736 15.244828224 -7.970758915
-v 6.644100189 15.383560181 -5.799521923
-v 5.671233654 15.383560181 -6.775876999
-v 6.644100189 15.244828224 -5.799521923
-v 6.814069748 15.028306961 -6.019875526
-v 8.853220940 14.941126823 -2.830147266
-v 8.651939392 13.952214241 -3.680540323
-v 8.650176048 14.662881851 -2.670546055
-v 9.317987442 15.072572708 -2.945189476
-v 8.855233192 14.116405487 -3.982884407
-v 9.320139885 14.219081879 -4.178322792
-v 7.836515903 15.383560181 -5.108233452
-v 7.836515903 15.244828224 -5.108233452
-v 7.943663597 15.028306961 -5.365069389
-v 9.321538925 15.026430130 -4.979783535
-v 9.150295258 15.242951393 -4.765716553
-v 9.150295258 15.381684303 -4.765716553
-v 7.943655014 10.354028702 -5.365047932
-v 6.814056873 10.354028702 -6.019856930
-v 5.892426014 10.354028702 -6.944716454
-v 5.241590500 15.028306961 -8.076605797
-v 5.671510220 10.109920502 -6.777579784
-v 5.241569042 10.354028702 -8.076597214
-v 5.671510220 9.998180389 -6.777579784
-v 6.643928051 9.998180389 -5.801239014
-v 6.643928051 10.109920502 -5.801239014
-v 9.321538925 10.354034424 -4.979783535
-v 9.320139885 10.354040146 -4.178416729
-v 8.651944160 9.998180389 -3.683492422
-v 7.835906506 9.998180389 -5.109846592
-v 7.835906506 10.109920502 -5.109846592
-v 9.130189896 10.109925270 -4.765082836
-v 9.129025459 10.109930038 -4.097968102
-v 9.130189896 9.998180389 -4.765082836
-v 9.129025459 9.998180389 -4.097968102
-v 8.855231285 9.998180389 -3.981844902
-v 8.651171684 9.998180389 -3.240730286
-v 8.651172638 13.729486465 -3.241274357
-v 8.853487968 9.998180389 -2.984283924
-v 8.853489876 13.593063354 -2.984283924
-v 8.649779320 14.267008781 -2.442969084
-v 4.647006512 15.383560181 -9.285297394
-v 4.984215736 15.383560181 -7.970758915
-v 4.647006512 15.244828224 -9.285297394
-v 4.863285065 15.028306961 -9.455788612
-v 2.818720818 15.073307991 -9.459357262
-v 1.730043888 15.017164230 -8.793926239
-v 2.702141523 14.941862106 -8.994995117
-v 1.856812716 15.304441452 -8.996471405
-v 1.542076707 14.590009689 -8.794254303
-v 2.551064491 14.678530693 -8.792492867
-v 1.938945532 15.435887337 -9.460893631
-v 4.062243938 14.220697403 -9.457186699
-v 2.865756989 13.593063354 -9.994748116
-v 2.864011288 13.593063354 -8.994712830
-v 2.170770407 14.013489723 -8.995923042
-v 2.342388153 14.277847290 -8.792857170
-v 3.593457460 13.975434303 -8.790673256
-v 3.163118601 13.749271393 -8.791424751
-v 3.868026495 14.118021011 -8.992959976
-v 4.863260746 10.354028702 -9.455788612
-v 4.984924793 9.998180389 -7.972333431
-v 3.866833925 9.998180389 -8.992960930
-v 3.592988729 9.998180389 -8.790673256
-v 3.981950045 10.109919548 -9.266352654
-v 4.062481880 10.354027748 -9.457186699
-v 3.981950045 9.998180389 -9.266352654
-v 4.646858215 10.109920502 -9.265192032
-v 4.646858215 9.998180389 -9.265192032
-v 4.984924793 10.109920502 -7.972333431
-v 3.163483381 9.998180389 -8.791422844
-v 2.864011049 9.998180389 -8.994710922
-v 2.865756750 9.998180389 -9.994747162
-v 0.909332395 15.672581673 -9.462690353
-v 0.867513537 15.541136742 -8.998197556
-v 0.795833468 15.202935219 -8.795557022
-v 2.172516346 14.013488770 -9.995958328
-v 1.423191905 14.319040298 -8.997227669
-v 1.424937487 14.319040298 -9.997262955
-v 0.709856033 14.795264244 -8.795706749
-v 0.648885727 14.504487991 -8.998579025
-v 0.650631309 14.504487991 -9.998614311
-v -1.905951262 9.998180389 -0.982230663
-v -3.834289074 9.998181343 -4.335646629
-v -1.905951262 10.109925270 -0.982230663
-v -3.834289312 10.109925270 -4.335646629
-v -2.047555685 10.354034424 -0.874144256
-v -2.047555685 15.026430130 -0.874144256
-v -3.999043703 10.354034424 -4.267893314
-v -0.135983437 15.609466553 -8.999949455
-v -0.136340588 15.245204926 -8.797183990
-v -0.135057062 15.740912437 -9.464513779
-v -0.135992631 14.566658020 -8.999949455
-v -0.134247005 14.566658020 -9.999984741
-v -0.136344001 14.858480453 -8.797183990
-v -1.185740471 15.672581673 -9.466347694
-v -2.215353489 15.435887337 -9.468144417
-v -0.926685452 14.504487991 -9.001329422
-v -0.986297250 14.785190582 -8.798667908
-v -0.924939871 14.504487991 -10.001364708
-v -1.070551395 15.184299469 -8.798814774
-v -1.145527720 15.541136742 -9.001711845
-v -2.134827137 15.304441452 -9.003438950
-v -1.992120028 14.979496956 -8.800423622
-v -1.820373774 14.589397430 -8.800123215
-v -1.700991750 14.319040298 -9.002680779
-v -1.699246168 14.319040298 -10.002716064
-v -3.096885920 15.072572708 -9.469683647
-v -2.981843472 14.941126823 -9.004917145
-v -2.822242498 14.662881851 -8.801872253
-v -2.448570251 14.013489723 -9.003986359
-v -2.594665527 14.267008781 -8.801475525
-v -2.446824312 14.013488770 -10.004021645
-v -4.828895092 15.242951393 -8.073754311
-v -4.828895092 15.381684303 -8.073754311
-v -3.834159613 15.381684303 -4.335542679
-v -5.005669594 15.026430130 -8.051085472
-v -3.834159613 15.242951393 -4.335542679
-v -3.999043703 15.026430130 -4.267893314
-v -3.135980606 13.593063354 -9.005186081
-v -3.832236767 13.952214241 -8.803635597
-v -4.134581089 14.116405487 -9.006929398
-v -3.392970800 13.729486465 -8.802868843
-v -4.330019474 14.219081879 -9.471836090
-v -5.131479740 15.026430130 -9.473235130
-v -4.917412758 15.381684303 -9.301991463
-v -4.917412758 15.242951393 -9.301991463
-v -1.905799270 15.242951393 -0.982163668
-v -1.905799270 15.381684303 -0.982163668
-v -3.134235144 9.998181343 -10.005220413
-v -3.135980844 9.998181343 -9.005184174
-v -3.392427206 9.998181343 -8.802867889
-v -4.828992844 9.998181343 -8.073887825
-v -4.828992844 10.109925270 -8.073887825
-v -5.005669594 10.354034424 -8.051085472
-v -4.133541584 9.998181343 -9.006927490
-v -3.835189104 9.998181343 -8.803640366
-v -4.916779518 10.109925270 -9.281886101
-v -5.131479740 10.354034424 -9.473235130
-v -4.916779518 9.998181343 -9.281886101
-v -3.134234905 13.593063354 -10.005221367
-v -4.330113411 10.354040146 -9.471836090
-v -4.249664783 9.998181343 -9.280721664
-v -4.249664783 10.109930038 -9.280721664
-v 9.316448212 15.435887337 -2.063657284
-v 8.851742744 15.304441452 -1.983130693
-v 8.648727417 14.979496956 -1.840423584
-v 8.850015640 15.541136742 -0.993831396
-v 9.314651489 15.672581673 -1.034044147
-v 8.647118568 15.184299469 -0.918855011
-v 8.852290154 14.013489723 -2.296873808
-v 8.648427010 14.589397430 -1.668677330
-v 8.850984573 14.319040298 -1.549295425
-v 8.646971703 14.785190582 -0.834600866
-v 8.849633217 14.504487991 -0.774989128
-v 8.848253250 15.609466553 0.015712952
-v 8.645487785 15.245204926 0.015355791
-v 9.312817574 15.740912437 0.016639344
-v 9.310994148 15.672581673 1.061028719
-v 8.846501350 15.541136742 1.019209862
-v 8.643860817 15.202935219 0.947529793
-v 8.848253250 14.566658020 0.015703756
-v 8.645487785 14.858480453 0.015352380
-v 8.644010544 14.795264244 0.861552477
-v 8.846882820 14.504487991 0.800582051
-v 8.639726639 9.998180389 3.315179348
-v 8.843014717 9.998180389 3.015707970
-v 4.171304703 9.998180389 3.697805405
-v 8.638977051 9.998180389 3.744684696
-v 9.309197426 15.435887337 2.090641737
-v 8.844775200 15.304441452 2.008509159
-v 8.642230034 15.017164230 1.881740332
-v 9.307661057 15.073307991 2.970417023
-v 8.843298912 14.941862106 2.853837729
-v 8.640796661 14.678530693 2.702761173
-v 8.642558098 14.590009689 1.693773031
-v 8.845531464 14.319040298 1.574888349
-v 8.641160965 14.277847290 2.494084597
-v 8.844226837 14.013489723 2.322466850
-v 8.639728546 13.749271393 3.314815044
-v 8.843016624 13.593063354 3.015707731
-v 9.305490494 14.220697403 4.213940144
-v 8.841263771 14.118021011 4.019722939
-v 8.638977051 13.975434303 3.745153666
-v 9.304092407 15.028306961 5.014981270
-v 9.133601189 15.244828224 4.798703671
-v 9.133601189 15.383560181 4.798703671
-v 7.906223297 15.381684303 4.705427647
-v 7.906223297 15.242951393 4.705427647
-v 7.882367134 15.026430130 4.882045746
-v 7.882367134 10.354034424 4.882045746
-v 9.113495827 10.109920502 4.798554897
-v 9.114656448 10.109919548 4.133646488
-v 9.114656448 9.998180389 4.133646488
-v 9.113495827 9.998180389 4.798554897
-v 9.304092407 10.354028702 5.014957428
-v 9.305490494 10.354027748 4.214178562
-v 8.841264725 9.998180389 4.018530369
-v 7.906068802 9.998180389 4.705486774
-v 7.906068802 10.109925270 4.705486774
-v 4.102715492 15.026430130 3.862213135
-v 4.171470165 15.242951393 3.697786808
-v 4.171470165 15.381684303 3.697786808
-v 4.102715492 10.354034424 3.862213135
-v 4.171304703 10.109925270 3.697804928
-v 0.824607968 9.998180389 1.757830381
-v 0.824607849 10.109925270 1.757830381
-v 0.715803146 10.354034424 1.898883700
-v 0.824772000 15.381684303 1.757855892
-v 0.715803146 15.026430130 1.898883700
-v 0.824772000 15.242951393 1.757855892
-v -8.753063202 5.376532555 4.954570293
-v 0.230767518 6.425604343 3.563241482
-v 0.230767518 5.378584385 4.954230309
-v -8.753147125 6.425606728 3.563240767
-v 0.230766773 6.886405945 2.488911390
-v -8.753147125 6.886408329 2.488910437
-v 0.230766773 7.187221527 1.231609106
-v -8.753147125 7.187223434 1.231608272
-v 0.230766773 7.274062157 -0.044219129
-v -8.753147125 7.274064541 -0.044219974
-v 0.230766773 7.187221527 -1.326769710
-v -8.753147125 7.187223434 -1.326770663
-v 0.230766773 6.886405945 -2.584072113
-v -8.753147125 6.886408329 -2.584073305
-v 0.230766773 6.424669266 -3.660547972
-v -8.753147125 6.424670696 -3.660548687
-v 0.230766773 5.376530647 -5.040550232
-v -8.753147125 5.383505344 -5.040158749
-v -8.085589409 4.268830299 2.417313814
-v -8.299681664 3.594884872 3.000001907
-v -8.299681664 4.015311241 2.306759596
-v -8.292544365 4.320862770 1.559179902
-v -9.000000000 4.015311241 2.306759596
-v -8.085588455 3.731307507 3.215620279
-v -9.000000000 3.594884872 3.000001907
-v -8.085589409 4.664703846 2.644890785
-v -8.085588455 3.954035997 3.654886723
-v -8.753063202 5.028339386 4.954570293
-v -8.582195282 5.383594036 4.738254070
-v -8.598057747 5.244861126 4.782492161
-v -8.753063202 4.220902920 4.153835297
-v -9.000000000 7.255914688 2.405723095
-v -9.000000000 7.254602909 3.184659481
-v -9.500000000 7.254602909 3.184647322
-v -9.500000000 7.255914688 2.405723095
-v -9.500000000 3.594884872 3.000001907
-v -8.753063202 5.074394226 2.920700073
-v -9.500000000 7.256734848 1.625433087
-v -9.000000000 7.256734848 1.625224113
-v -9.000000000 4.320862770 1.559179902
-v -8.753064156 5.437708378 2.039165974
-v -9.500000000 4.015311241 2.306759596
-v -8.085589409 4.591218948 1.643020630
-v -8.085589409 4.981317997 1.814767003
-v -8.292540550 4.943684101 2.793893814
-v -8.292540550 5.306262970 1.948563099
-v -9.999998093 4.320862770 1.559180021
-v -9.500000000 4.320862770 1.559179902
-v -9.000000000 7.257231712 0.773615956
-v -9.500000000 7.257231712 0.773804307
-v -9.000000000 7.257397652 -0.044181678
-v -9.500000000 7.257397652 -0.044181675
-v -8.753064156 5.674404144 1.009551167
-v -9.000000000 4.568480015 -0.044245362
-v -8.753064156 5.742734909 -0.041133784
-v -8.292540550 5.542958260 0.959262550
-v -8.292540550 5.611288548 -0.041018460
-v -9.500000000 4.506309509 0.740634203
-v -8.085589409 5.186120987 0.893197119
-v -8.085589409 4.787011623 0.808942795
-v -8.292540550 4.506309509 0.740634203
-v -8.085589409 5.247027397 -0.041015293
-v -8.085589409 4.860301971 -0.041011877
-v -8.292540550 4.568480015 -0.044245362
-v -9.000000000 4.506309509 0.740634203
-v -9.500000000 4.568480015 -0.044245347
-v -9.999997139 4.568480492 -0.000007104
-v -9.999997139 4.506309986 0.784872413
-v 0.230767518 5.030126095 4.954230309
-v 0.044036582 5.246647835 4.782487869
-v 0.059897333 5.385379791 4.738249779
-v -8.753147125 0.355853915 4.954206467
-v -8.085588455 0.000001048 3.657839060
-v -8.292540550 0.000001429 3.958587885
-v 0.039793111 -0.000113393 4.738136292
-v -8.085588455 0.000001048 3.215075970
-v -8.299681664 0.000001429 3.003443718
-v -8.562355995 -0.000112630 4.738137245
-v -8.562355995 0.111745358 4.738137245
-v 0.039793111 0.111739635 4.738136292
-v -8.292540550 4.119843006 3.959781170
-v -8.753064156 0.355859280 4.153505802
-v -9.000000000 0.000001429 3.003443718
-v -9.500000000 -0.002705861 3.183461428
-v -9.000000000 -0.002705861 3.183461428
-v -9.500000000 0.000001429 3.003443718
-v -9.999998093 4.015311718 2.306759834
-v -9.999997139 3.594885111 3.000001431
-v -9.999998093 0.000001292 3.000001431
-v -8.561950684 -0.000112630 4.074211597
-v -8.561950684 0.111749932 4.074211597
-v -9.000000000 0.000001429 -3.000231981
-v -9.999998093 0.000001292 -2.999999762
-v -9.500000000 0.000001429 -3.000231981
-v -8.299681664 0.000001429 -3.000231981
-v -8.562355042 -0.000112630 -4.825516224
-v 0.039793123 -0.000113393 -4.825516224
-v 0.039793123 0.111745358 -4.825516224
-v 0.230766773 0.355853915 -5.040550232
-v 0.230766773 5.028249741 -5.040550232
-v 0.230767518 0.355848223 4.954206467
-v -8.562355042 0.111739255 -4.825516224
-v 0.059897345 5.383503914 -4.826185226
-v 0.059897345 5.244771004 -4.826185226
-v -8.582277298 5.383505344 -4.826184273
-v -8.582277298 5.244772911 -4.826184273
-v -8.753147125 5.028251648 -5.040549755
-v -8.292540550 0.000001429 -4.041800499
-v -8.085590363 0.000001048 -3.770350456
-v -8.085590363 0.000001048 -3.340844154
-v -8.753147125 0.355848223 -5.040549755
-v -9.000000000 7.255914688 -2.456159115
-v -9.000000000 7.256734371 -1.676682115
-v -9.500000000 7.256734371 -1.676682115
-v -9.500000000 7.255914688 -2.456159115
-v -9.500000000 7.254604816 -3.248138905
-v -9.000000000 7.254604816 -3.248138905
-v -8.753064156 5.674404144 -1.085524917
-v -8.292540550 5.542958260 -1.053782225
-v -8.753064156 5.437708378 -2.115139723
-v -9.000000000 7.257230759 -0.869287789
-v -9.500000000 7.257230759 -0.869287610
-v -9.000000000 4.506309509 -0.834939539
-v -9.000000000 4.320862770 -1.609247208
-v -9.500000000 4.506309509 -0.834939539
-v -9.500000000 4.320862770 -1.609247208
-v -8.299681664 4.506309509 -0.834939539
-v -8.085590363 4.591831207 -1.719435334
-v -8.085590363 4.797085762 -0.887213409
-v -8.292540550 4.320862770 -1.609247208
-v -8.292540550 5.306262970 -2.043083191
-v -8.085590363 5.018985748 -1.907402754
-v -8.085590363 5.204757690 -0.973190904
-v -9.999998093 4.506309986 -0.790701210
-v -9.999997139 4.320862770 -1.565008759
-v -9.500000000 4.015311241 -2.356827021
-v -9.500000000 3.594884872 -3.000231743
-v -9.999997139 4.015311718 -2.312588453
-v -9.000000000 3.594884872 -3.000231743
-v -9.000000000 4.015311241 -2.356827021
-v -8.753064156 5.075129986 -2.994916439
-v -8.292544365 4.942948341 -2.845862865
-v -8.085590363 4.680352211 -2.728424549
-v -8.085590363 4.279669762 -2.519748211
-v -8.292540550 4.015311241 -2.356827021
-v -8.753064156 4.222518921 -4.239005566
-v -8.299681664 3.594884872 -3.000231743
-v -8.085590363 3.751092434 -3.340479851
-v -8.085590363 3.977255583 -3.770819902
-v -9.500000000 0.000001429 -3.252239466
-v -9.999997139 3.594885111 -2.999999762
-v -9.000000000 0.000001429 -3.252239466
-v -8.292544365 4.118226528 -3.998601675
-v -8.753064156 0.355847448 -4.238679409
-v -8.561952591 0.111738876 -4.158661842
-v -8.561952591 -0.000113012 -4.158661842
-v 11.438048363 13.578246117 -18.801122665
-v 11.792361259 13.578246117 -19.005466461
-v 12.150432587 13.368027687 -18.578733444
-v 12.462369919 13.078775406 -18.214624405
-v 11.797165871 13.078775406 -17.828817368
-v 11.628574371 13.368027687 -18.277658463
-v 12.537845612 13.368027687 -19.040140152
-v 12.955503464 13.078775406 -18.804676056
-v 11.035212517 13.578246117 -18.730283737
-v 11.040124893 13.705832481 -19.307260513
-v 11.035212517 13.368027687 -18.173225403
-v 11.040124893 13.078775406 -17.693790436
-v 11.245326996 13.705832481 -19.344982147
-v 13.217087746 13.078775406 -19.527807236
-v 12.744085312 13.368027687 -19.606222153
-v 12.744275093 13.368027687 -20.208702087
-v 12.195487976 13.578246117 -19.702953339
-v 13.215572357 13.078775406 -20.296792984
-v 12.055417061 13.578246117 -19.318668365
-v 11.558197975 13.705832481 -19.611412048
-v 12.195678711 13.578246117 -20.111970901
-v 11.628130913 13.705832481 -19.807983398
-v 11.425251007 13.705832481 -19.450613022
-v 11.042902946 13.748605728 -19.906599045
-v 11.626614571 13.705832481 -20.016616821
-v 12.055965424 13.578246117 -20.496385574
-v 12.538393021 13.368027687 -20.774915695
-v 12.951137543 13.078775406 -21.018886566
-v 12.151271820 13.368027687 -21.236564636
-v 11.793200493 13.578246117 -20.809831619
-v 12.455681801 13.078775406 -21.606990814
-v 11.629601479 13.368027687 -21.537969589
-v 11.788961411 13.078775406 -21.990169525
-v 11.439075470 13.578246117 -21.014505386
-v 11.418563843 13.705832481 -20.371000290
-v 11.032533646 13.578246117 -21.085718155
-v 11.237122536 13.705832481 -20.474004745
-v 11.032533646 13.368027687 -21.642776489
-v 11.031394005 13.078775406 -22.122211456
-v 11.553833008 13.705832481 -20.212152481
-v 11.027621269 13.705832481 -20.508741379
-v 10.765499115 13.325869560 -17.371828079
-v 10.589583397 13.486545563 -17.125236511
-v 10.589580536 14.006744385 -17.938571930
-v 10.765499115 13.814806938 -18.067226410
-v 10.912987709 13.542448044 -18.201259613
-v 10.912987709 13.172634125 -17.547973633
-v 10.765499115 14.032635689 -18.638780594
-v 10.912987709 13.764249802 -18.741415024
-v 10.403736115 13.592807770 -16.911849976
-v 10.403735161 14.096672058 -17.795053482
-v 9.857499123 14.013492584 -17.601242065
-v 9.857499123 14.319044113 -18.348821640
-v 9.857499123 13.593065262 -16.907999039
-v 10.403735161 14.346630096 -18.426431656
-v 10.589580536 14.256196976 -18.528282166
-v 10.765499115 14.173540115 -19.273298264
-v 10.912987709 13.898954391 -19.323276520
-v 10.589580536 14.419042587 -19.218427658
-v 10.403735161 14.509475708 -19.163867950
-v 9.857499123 14.504489899 -19.123128891
-v 10.589580536 14.466053009 -19.916234970
-v 10.776260376 14.215442657 -19.916215897
-v 10.912987709 13.949377060 -19.916213989
-v 9.857499123 14.566660881 -19.908008575
-v 10.403735161 14.556488037 -19.916397095
-v 12.951138496 9.993399620 -21.018886566
-v 12.955503464 9.993399620 -18.804676056
-v 13.217088699 9.993399620 -19.527805328
-v 12.462368965 9.993399620 -18.214622498
-v 11.797164917 9.993399620 -17.828817368
-v 12.455682755 9.993399620 -21.606988907
-v 11.788962364 9.993399620 -21.990169525
-v 11.040123940 9.993399620 -17.693790436
-v 13.215572357 9.993399620 -20.296792984
-v 10.912989616 9.993399620 -17.548355103
-v 10.765501022 9.993399620 -17.369794846
-v 10.589581490 9.993399620 -17.126068115
-v 9.857499123 9.998181343 -16.907999039
-v 10.403736115 9.994852066 -16.912084579
-v 10.765499115 14.186361313 -20.558336258
-v 10.912986755 13.905885696 -20.506532669
-v 10.589581490 14.419042587 -20.622749329
-v 9.857499123 14.504489899 -20.698701859
-v 10.403736115 14.509475708 -20.664417267
-v 10.765499115 14.058550835 -21.201557159
-v 10.912986755 13.764671326 -21.087100983
-v 10.589581490 14.256196976 -21.312894821
-v 9.857499123 14.319044113 -21.473009109
-v 10.403736115 14.346630096 -21.401855469
-v 10.912986755 13.549904823 -21.645406723
-v 10.912986755 13.186244965 -22.217958450
-v 10.765499115 13.825572968 -21.766845703
-v 10.765499115 13.341844559 -22.484550476
-v 10.589578629 14.006237984 -21.872920990
-v 10.589580536 13.485433578 -22.677083969
-v 9.857499123 14.013492584 -22.220588684
-v 10.403736115 14.097177505 -22.031974792
-v 10.403737068 13.593919754 -22.905027390
-v 9.857499123 13.593065262 -22.908000946
-v 10.765499115 9.993399620 -22.484228134
-v 10.912987709 9.993399620 -22.218212128
-v 11.031394958 9.993399620 -22.122211456
-v 9.857499123 9.998181343 -22.908000946
-v 10.589583397 9.993399620 -22.707220078
-v 10.403737068 9.994852066 -22.904792786
-v 4.858413219 15.381685257 -14.934789658
-v 9.327021599 16.423784256 -16.325420380
-v 9.327021599 15.376764297 -14.934431076
-v 3.478802681 16.422851563 -16.327211380
-v 9.327021599 16.884586334 -17.399749756
-v 2.402328014 16.884588242 -17.392444611
-v 9.327021599 17.185401917 -18.657051086
-v 1.145025015 17.185403824 -18.650850296
-v 9.327021599 17.272243500 -19.932880402
-v 4.858804226 15.374711037 -10.468370438
-v -0.137525633 17.272245407 -19.933252335
-v 1.145023227 17.185401917 -10.468370438
-v -0.137527332 17.272243500 -10.468370438
-v 2.402325630 16.884586334 -10.468370438
-v 3.478801250 16.422849655 -10.468370438
-v -0.137525663 17.272245407 -29.403888702
-v 1.138338208 17.185403824 -21.214948654
-v 9.327021599 17.185401917 -21.215431213
-v 9.327021599 16.884586334 -22.472732544
-v 2.395640373 16.884588242 -22.473354340
-v 9.327021599 16.422849655 -23.549209595
-v 3.469970226 16.423786163 -23.538587570
-v 9.327021599 15.374711037 -24.929210663
-v 3.478802681 16.422851563 -29.403888702
-v 4.860601902 15.381685257 -24.928821564
-v 2.402328014 16.884588242 -29.403888702
-v 1.145024896 17.185403824 -29.403888702
-v 4.858413219 15.381685257 -29.403888702
-v -5.136315823 15.374712944 -14.934705734
-v -3.744987965 16.423784256 -10.468370438
-v -5.135976791 15.376764297 -10.468370438
-v -3.744986534 16.423786163 -16.327211380
-v -2.670657635 16.884586334 -10.468370438
-v -2.670656204 16.884588242 -17.392444611
-v -1.413355708 17.185401917 -10.468370438
-v -1.413353801 17.185403824 -18.650850296
-v -9.608413696 15.374712944 -14.934091568
-v -9.608496666 17.185403824 -18.657052994
-v -9.608496666 17.272245407 -19.932880402
-v -9.608496666 16.884588242 -17.399749756
-v -9.608496666 16.423786163 -16.325420380
-v -1.420040607 17.185403824 -21.214948654
-v -1.413353801 17.185403824 -29.403888702
-v -2.670656204 16.884588242 -29.403888702
-v -2.677342892 16.884588242 -22.473354340
-v -3.744986534 16.423786163 -29.403888702
-v -3.743196487 16.423786163 -23.540378571
-v -5.136315823 15.374712944 -29.403804779
-v -9.608496666 16.422851563 -23.549209595
-v -5.133429050 15.381685257 -24.931009293
-v -9.608496666 16.884588242 -22.472734451
-v -9.608496666 17.185403824 -21.215431213
-v -9.608496666 15.381685257 -24.928819656
-v 9.327021599 15.028306961 -14.934431076
-v 9.156151772 15.383560181 -15.150411606
-v 9.156151772 15.244828224 -15.150411606
-v 8.862455368 14.118021011 -15.928879738
-v 8.659689903 14.678530693 -17.245491028
-v 8.659689903 13.975434303 -16.203096390
-v 9.327021599 14.220697403 -15.735473633
-v 8.862455368 14.941862106 -17.094766617
-v 9.327021599 15.073307991 -16.978998184
-v 4.644438744 15.242953300 -15.150722504
-v 4.644438744 15.381685257 -15.150722504
-v 4.858804226 15.026432037 -14.934789658
-v 4.858804226 10.354028702 -14.934789658
-v 4.643770218 10.109919548 -15.154069901
-v 9.136047363 10.109920502 -15.150524139
-v 9.136047363 9.998181343 -15.150524139
-v 4.643770218 9.998181343 -15.154069901
-v 9.327021599 10.354028702 -14.934454918
-v 3.860055447 9.998181343 -15.931425095
-v 8.862454414 9.998181343 -15.930072784
-v 8.659689903 13.749271393 -16.633434296
-v 8.659689903 9.998181343 -16.203563690
-v 8.862455368 13.593063354 -16.932897568
-v 8.659689903 9.998181343 -16.633069992
-v 8.862454414 9.998181343 -16.932897568
-v 9.327021599 10.354027748 -15.735235214
-v 9.136047363 10.109919548 -15.815433502
-v 9.136047363 9.998181343 -15.815433502
-v 3.558393955 13.952214241 -11.135701180
-v 2.708353996 14.941126823 -10.932935715
-v 3.861092567 14.116405487 -10.932935715
-v 4.057342529 14.219081879 -10.468370438
-v 2.824207306 15.072572708 -10.468370438
-v 4.858804226 15.026430130 -10.468370438
-v 4.644438744 15.381684303 -10.639239311
-v 4.644438744 15.242951393 -10.639239311
-v 4.643770218 10.109925270 -10.659343719
-v 4.858804226 10.354034424 -10.468370438
-v 4.643770218 9.998181343 -10.659343719
-v 3.860053062 9.998181343 -10.932935715
-v 3.118583202 9.998181343 -11.135701180
-v 3.119127274 13.729486465 -11.135701180
-v 2.862490654 9.998181343 -9.932899475
-v 2.862490654 13.593063354 -9.932898521
-v 2.862490654 13.593063354 -10.932935715
-v 2.862490654 9.998181343 -10.932937622
-v 4.057436466 10.354040146 -10.468370438
-v 3.561346054 9.998181343 -11.135701180
-v 3.976654530 10.109930038 -10.659343719
-v 3.976654530 9.998181343 -10.659343719
-v 1.942673564 15.435887337 -10.468370438
-v 2.548398018 14.662881851 -11.135701180
-v 1.861335874 15.304441452 -10.932935715
-v 2.175079346 14.013488770 -9.932898521
-v 2.175079823 14.013489723 -10.932935715
-v 2.320821285 14.267008781 -11.135701180
-v 0.913058519 15.672581673 -10.468370438
-v 0.872035027 15.541136742 -10.932935715
-v 1.718274593 14.979496956 -11.135701180
-v 0.796704412 15.184299469 -11.135701180
-v -0.137626544 15.740912437 -10.468370438
-v -0.137511060 15.609466553 -10.932935715
-v -0.137507826 15.245204926 -11.135701180
-v 1.427499771 14.319040298 -9.932898521
-v 0.653192222 14.504487991 -9.932898521
-v 1.427499771 14.319040298 -10.932935715
-v 1.546528220 14.589397430 -11.135701180
-v 0.712450206 14.785190582 -11.135701180
-v 0.653192282 14.504487991 -10.932935715
-v -0.137504414 14.858480453 -11.135701180
-v -0.137501866 14.566658020 -10.932935715
-v -0.137501940 14.566658020 -9.932898521
-v -3.137510300 9.998181343 -10.932937622
-v 3.159098625 9.998181343 -16.652217865
-v 2.862492561 9.998181343 -16.934700012
-v 3.588604927 9.998181343 -16.220819473
-v 8.659689903 15.017164230 -18.066513062
-v 8.862455368 15.304441452 -17.940097809
-v 9.327021599 15.435887337 -17.858776093
-v 8.659689903 14.277847290 -17.454166412
-v 8.862455368 14.013489723 -17.626138687
-v 8.862455368 14.319040298 -18.373718262
-v 8.659689903 14.590009689 -18.254480362
-v 8.862455368 15.541136742 -18.929397583
-v 9.327021599 15.672581673 -18.888389587
-v 8.659689903 15.202935219 -19.000724792
-v 8.659689903 14.858480453 -19.932903290
-v 8.659689903 15.245204926 -19.932899475
-v 8.862455368 15.609466553 -19.932895660
-v 9.327021599 15.740912437 -19.932781219
-v 8.862455368 14.504487991 -19.148025513
-v 8.659689903 14.795264244 -19.086702347
-v 8.862455368 14.566658020 -19.932905197
-v -3.135706425 9.998181343 -16.932899475
-v 2.862493038 9.998181343 -22.931098938
-v 8.862454414 9.998181343 -22.932899475
-v 8.659689903 15.184299469 -20.867111206
-v 8.862455368 15.541136742 -20.942441940
-v 9.327021599 15.672581673 -20.983467102
-v 8.659689903 14.979496956 -21.788682938
-v 8.862456322 15.304441452 -21.931743622
-v 8.659689903 14.662881851 -22.618804932
-v 9.327021599 15.435887337 -22.013080597
-v 8.862456322 14.941126823 -22.778760910
-v 8.659689903 14.785190582 -20.782857895
-v 8.862455368 14.504487991 -20.723600388
-v 8.862455368 14.319040298 -21.497907639
-v 8.659689903 14.589397430 -21.616935730
-v 8.862455368 14.013489723 -22.245487213
-v 8.659689903 14.267008781 -22.391227722
-v 9.327021599 15.072572708 -22.894615173
-v 8.862455368 14.116405487 -23.931501389
-v 8.659689903 13.729486465 -23.189535141
-v 8.862455368 13.593063354 -22.932899475
-v 8.659689903 13.952214241 -23.628801346
-v 9.136047363 10.109930038 -24.047061920
-v 9.136047363 9.998181343 -24.047061920
-v 8.862455368 9.998181343 -23.930461884
-v 9.327021599 10.354040146 -24.127843857
-v 3.574571609 9.998181343 -23.659011841
-v 3.143173695 9.998181343 -23.229505539
-v 8.659689903 9.998181343 -23.631753922
-v 3.865317822 9.998181343 -23.934371948
-v 3.588604927 9.998181343 -28.736331940
-v 3.159098625 9.998181343 -28.736331940
-v 8.659689903 9.998181343 -23.188991547
-v 2.862492561 9.998181343 -28.939510345
-v 9.327021599 14.219081879 -24.127750397
-v 9.327021599 15.026430130 -24.929210663
-v 9.156151772 15.381684303 -24.714845657
-v 9.156151772 15.242951393 -24.714845657
-v 9.327021599 10.354034424 -24.929210663
-v 4.860936642 10.354034424 -24.931011200
-v 4.644866943 10.109925270 -24.711727142
-v 4.644866943 9.998181343 -24.711727142
-v 9.136047363 9.998181343 -24.714178085
-v 9.136047363 10.109925270 -24.714178085
-v 4.861299992 15.026519775 -24.931093216
-v 4.644983768 15.381774902 -24.715158463
-v 4.644983768 15.243041992 -24.715158463
-v 4.644979954 15.383560181 -29.226558685
-v 4.644438744 15.242953300 -29.233018875
-v 4.858804226 15.026432037 -29.403888702
-v 4.057260036 14.220699310 -29.403806686
-v 2.708355427 14.941128731 -28.939508438
-v 3.861094475 14.116407394 -28.939508438
-v 2.813170910 15.073310852 -29.403806686
-v 2.546679020 14.678532600 -28.736331940
-v 3.589074135 13.975436211 -28.736331940
-v 4.858804226 10.354028702 -29.403888702
-v 4.644866943 10.109920502 -29.206455231
-v 4.644866943 9.998181343 -29.206455231
-v 3.865318775 9.998181343 -28.932861328
-v 3.158733845 13.749273300 -28.736331940
-v 4.056933880 10.354027748 -29.403806686
-v 2.862492561 13.593065262 -29.932897568
-v 2.862492561 9.998182297 -29.932899475
-v 2.862492561 13.593065262 -28.939510345
-v 1.861337543 15.304443359 -28.939508438
-v 1.933394313 15.435888290 -29.403806686
-v 1.725657225 15.017166138 -28.736331940
-v 2.338002682 14.277850151 -28.736331940
-v 2.175081253 14.013491631 -28.939508438
-v 2.175081253 14.013492584 -29.932897568
-v 1.537689686 14.590011597 -28.736331940
-v 1.427501559 14.319043159 -28.939508438
-v 0.872036457 15.541138649 -28.939508438
-v 0.903779268 15.672584534 -29.403806686
-v 0.791445196 15.202938080 -28.736331940
-v -0.140611842 15.740915298 -29.403806686
-v -0.140727192 15.609468460 -28.939094543
-v -0.140733764 14.858482361 -28.736331940
-v -0.140730351 15.245207787 -28.736331940
-v 1.427501559 14.319043159 -29.932897568
-v 0.653193831 14.504489899 -28.939510345
-v 0.705467701 14.795266151 -28.736331940
-v 0.653193951 14.504489899 -29.932899475
-v -0.137500286 14.566659927 -28.939510345
-v -0.137500197 14.566660881 -29.932897568
-v -3.137508869 9.998181343 -28.939510345
-v 3.976916313 10.109919548 -29.212692261
-v 3.976916313 9.998181343 -29.212692261
-v -1.141009688 15.541136742 -10.932935715
-v -1.069683313 15.202935219 -11.135701180
-v -1.182017684 15.672581673 -10.468370438
-v -2.211632252 15.435887337 -10.468370438
-v -2.003895283 15.017164230 -11.135701180
-v -2.975640297 14.941862106 -10.932935715
-v -2.130310535 15.304441452 -10.932935715
-v -0.922381461 14.504487991 -9.932898521
-v -1.696689010 14.319040298 -9.932898521
-v -0.922381401 14.504487991 -10.932935715
-v -0.983705938 14.795264244 -11.135701180
-v -1.815927625 14.590009689 -11.135701180
-v -1.696688890 14.319040298 -10.932935715
-v -2.444268703 14.013488770 -9.932898521
-v -3.091409206 15.073307991 -10.468370438
-v -2.824917316 14.678530693 -11.135701180
-v -2.616240501 14.277847290 -11.135701180
-v -2.444268703 14.013489723 -10.932935715
-v -3.867311954 13.975434303 -11.135701180
-v -3.436972618 13.749271393 -11.135701180
-v -3.137510300 13.593063354 -9.932898521
-v -3.137510300 13.593063354 -10.932935715
-v -4.141528130 14.118021011 -10.932935715
-v -3.437336922 9.998181343 -11.135702133
-v -3.866843224 9.998181343 -11.135702133
-v -3.137510300 9.998181343 -9.932899475
-v -3.418189049 9.998181343 -16.636293411
-v -4.140335083 9.998181343 -10.932937622
-v -4.138982296 9.998181343 -15.935336113
-v -3.849586487 9.998181343 -16.206787109
-v -4.334934235 14.220697403 -10.468370438
-v -5.135976791 15.028306961 -10.468370438
-v -4.919996262 15.383560181 -10.639239311
-v -4.919996262 15.244828224 -10.639239311
-v -4.919999599 15.243041992 -15.150640488
-v -4.919999599 15.381774902 -15.150640488
-v -5.136315823 15.026519775 -14.934705734
-v -4.919883251 10.109925270 -15.154071808
-v -4.919883251 10.109920502 -10.659344673
-v -4.919883251 9.998181343 -10.659344673
-v -4.916337013 9.998181343 -15.151620865
-v -5.135952473 10.354034424 -14.934789658
-v -5.135952950 10.354028702 -10.468370438
-v -4.254973412 10.109919548 -10.659344673
-v -4.254973412 9.998181343 -10.659344673
-v -4.335172176 10.354027748 -10.468370438
-v -8.940937996 13.952216148 -16.233774185
-v -9.144116402 14.941864014 -17.094768524
-v -9.144117355 14.118022919 -15.928879738
-v -9.608413696 15.026519775 -14.934091568
-v -9.437545776 15.381774902 -15.150407791
-v -9.437545776 15.243041992 -15.150407791
-v -9.608413696 14.219083786 -15.734826088
-v -9.608413696 15.072574615 -16.967962265
-v -9.144118309 9.998181343 -16.932897568
-v -8.934705734 9.998181343 -16.676807404
-v -9.144119263 9.998181343 -15.930072784
-v -9.411063194 9.998181343 -15.151620865
-v -8.940937996 9.998181343 -16.230821609
-v -9.411063194 10.109925270 -15.151620865
-v -9.608496666 10.354034424 -14.934453964
-v -9.417300224 10.109930038 -15.814449310
-v -9.608414650 10.354040146 -15.735155106
-v -9.417300224 9.998181343 -15.814449310
-v -8.940937996 13.729488373 -16.673040390
-v -9.144117355 13.593065262 -16.932897568
-v -10.137507439 9.998181343 -16.932897568
-v -10.137506485 13.593065262 -16.932897568
-v -9.608414650 15.435888290 -17.849494934
-v -8.940939903 14.662883759 -17.243770599
-v -9.144117355 15.304443359 -17.940097809
-v -8.940939903 14.267010689 -17.471347809
-v -10.137507439 14.013492584 -17.626140594
-v -9.144117355 14.013491631 -17.626140594
-v -8.940939903 14.979497910 -18.073894501
-v -9.608414650 15.672584534 -18.879110336
-v -9.144116402 15.541138649 -18.929399490
-v -8.940939903 15.184301376 -18.995464325
-v -9.608414650 15.740915298 -19.929794312
-v -9.143704414 15.609468460 -19.929679871
-v -8.940939903 15.245207787 -19.929676056
-v -8.940939903 14.589399338 -18.245639801
-v -9.144117355 14.319043159 -18.373720169
-v -8.940939903 14.785192490 -19.079717636
-v -10.137507439 14.319043159 -18.373720169
-v -10.137506485 14.504489899 -19.148027420
-v -9.144116402 14.504489899 -19.148027420
-v -8.940939903 14.858482361 -19.929672241
-v -9.144117355 14.566659927 -19.932907104
-v -10.137506485 14.566660881 -19.932907104
-v -3.137508392 9.998181343 -22.931098938
-v -10.137507439 9.998181343 -22.932899475
-v -9.608414650 15.672584534 -20.974185944
-v -9.144116402 15.541138649 -20.942443848
-v -8.940939903 15.202938080 -20.861852646
-v -9.144116402 15.304443359 -21.931743622
-v -8.940939903 15.017166138 -21.796064377
-v -9.608414650 15.435888290 -22.003801346
-v -9.144116402 14.941128731 -22.778762817
-v -10.137507439 14.504489899 -20.723600388
-v -8.940939903 14.795266151 -20.775875092
-v -10.137506485 14.319043159 -21.497907639
-v -9.144117355 14.504489899 -20.723600388
-v -8.940939903 14.590011597 -21.608097076
-v -10.137506485 14.013492584 -22.245487213
-v -9.144116402 14.319043159 -21.497907639
-v -8.940939903 14.678532600 -22.617086411
-v -9.608414650 15.073310852 -22.883577347
-v -8.940939903 14.277850151 -22.408409119
-v -9.144116402 14.013491631 -22.245487213
-v -10.137506485 13.593065262 -22.932899475
-v -9.144117355 13.593065262 -22.932899475
-v -8.940939903 13.749273300 -23.229141235
-v -8.940939903 13.975436211 -23.659481049
-v -9.144116402 14.116407394 -23.931501389
-v -3.863620758 9.998181343 -23.644977570
-v -4.135071278 9.998181343 -23.934373856
-v -8.940939903 9.998181343 -23.659011841
-v -3.434114456 9.998181343 -23.213581085
-v -8.940939903 9.998181343 -23.229505539
-v -9.144118309 9.998181343 -22.932899475
-v -3.393599987 9.998181343 -28.730098724
-v -3.839584827 9.998181343 -28.736330032
-v -9.137470245 9.998181343 -23.935726166
-v -9.417302132 9.998181343 -24.047323227
-v -9.417302132 10.109919548 -24.047323227
-v -9.608496666 10.354028702 -24.929210663
-v -9.608414650 10.354027748 -24.127340317
-v -9.411063194 10.109920502 -24.715274811
-v -9.411063194 9.998181343 -24.715274811
-v -3.137508869 9.998182297 -29.932899475
-v -4.140333652 9.998181343 -28.939510345
-v -4.255957127 10.109930038 -29.212692261
-v -4.255957127 9.998181343 -29.212692261
-v -1.141008139 15.541138649 -28.939508438
-v -1.191296935 15.672584534 -29.403806686
-v -1.074942827 15.184301376 -28.736331940
-v -2.130308628 15.304443359 -28.939510345
-v -2.220911503 15.435888290 -29.403806686
-v -1.996512532 14.979497910 -28.736331940
-v -2.975638866 14.941864014 -28.939508438
-v -2.826636791 14.662883759 -28.736331940
-v -0.922379851 14.504489899 -28.939508438
-v -0.990688443 14.785192490 -28.736331940
-v -0.922379732 14.504489899 -29.932897568
-v -1.696687222 14.319043159 -28.939510345
-v -1.824766159 14.589399338 -28.736331940
-v -2.444266796 14.013491631 -28.939510345
-v -2.599059105 14.267010689 -28.736331940
-v -1.696687341 14.319043159 -29.932899475
-v -2.444266796 14.013492584 -29.932899475
-v -3.102445602 15.072574615 -29.403804779
-v -4.141526699 14.118022919 -28.939510345
-v -3.137508869 13.593065262 -28.939510345
-v -3.137508869 13.593065262 -29.932897568
-v -3.836632729 13.952216148 -28.736330032
-v -3.397366047 13.729488373 -28.736330032
-v -4.335580826 14.219083786 -29.403804779
-v -5.136315823 15.026519775 -29.403804779
-v -4.919999599 15.381774902 -29.232936859
-v -4.919455051 15.242951393 -29.226558685
-v -4.918786526 10.109925270 -29.206455231
-v -4.918786526 10.109919548 -24.711729050
-v -4.918786526 9.998181343 -24.711729050
-v -4.918786526 9.998181343 -29.206455231
-v -5.135952473 10.354034424 -29.403888702
-v -5.133820057 15.026432037 -24.931009293
-v -5.133820057 10.354028702 -24.931009293
-v -4.919454575 15.381685257 -24.715076447
-v -4.919454575 15.242953300 -24.715076447
-v -4.335251331 10.354040146 -29.403806686
-v -9.431168556 15.244828224 -24.715387344
-v -9.608496666 15.026432037 -24.929210663
-v -9.431168556 15.383560181 -24.715387344
-v -9.608414650 14.220699310 -24.127666473
-v -9.194107056 2.851734638 2.761604309
-v -9.184239388 4.903903484 2.737780094
-v -9.217930794 4.903903484 2.771472692
-v -9.260048866 2.851734638 2.737920523
-v -9.251623154 4.903903484 2.737780094
-v -9.194107056 2.851734638 2.999632597
-v -9.184238434 4.903903484 2.975809097
-v -9.217930794 4.903903484 3.009500980
-v -9.260048866 2.851734638 2.975808382
-v -9.251622200 4.903903484 2.975809097
-v -9.194107056 2.851734638 2.951984406
-v -9.217930794 4.903903484 2.942117214
-v -9.174771309 2.851734638 2.975808382
-v -9.241754532 2.851734638 2.951984406
-v -9.174771309 2.851734638 2.738004923
-v -9.241754532 2.851734638 2.999632597
-v -9.241754532 2.851734638 2.523857117
-v -9.194107056 2.851734638 2.523857117
-v -9.217930794 4.903903484 2.533725500
-v -9.260048866 2.851734638 2.500032902
-v -9.241754532 2.851734638 2.714097023
-v -9.241754532 2.851734638 2.476208925
-v -9.251622200 4.903903484 2.500033379
-v -9.194107056 2.851734638 2.476208925
-v -9.174771309 2.851734638 2.500032902
-v -9.184238434 4.903903484 2.500033379
-v -9.194107056 2.851734638 2.714097023
-v -9.217930794 4.903903484 2.704088449
-v -9.217930794 4.903903484 2.466341496
-v -9.241754532 2.851734638 2.047632456
-v -9.194107056 2.851734638 2.047632456
-v -9.217930794 4.903903484 2.057500839
-v -9.260048866 2.851734638 2.023808241
-v -9.241754532 2.851734638 1.999984503
-v -9.251622200 4.903903484 2.023808718
-v -9.194107056 2.851734638 1.999984503
-v -9.174771309 2.851734638 2.023808241
-v -9.184238434 4.903903484 2.023808718
-v -9.260048866 2.851734638 2.261920691
-v -9.241754532 2.851734638 2.285828829
-v -9.217930794 4.903903484 2.295696974
-v -9.174771309 2.851734638 2.262004614
-v -9.194107056 2.851734638 2.238096952
-v -9.217930794 4.903903484 2.228312969
-v -9.194107056 2.851734638 2.285828829
-v -9.184239388 4.903903484 2.262005091
-v -9.241754532 2.851734638 2.238096952
-v -9.251623154 4.903903484 2.262005091
-v -9.241754532 2.851734638 1.761872530
-v -9.251623154 4.903903484 1.785780668
-v -9.217930794 4.903903484 1.752088666
-v -9.174771309 2.851734638 1.785780668
-v -9.184239388 4.903903484 1.785780668
-v -9.194107056 2.851734638 1.809604406
-v -9.217930794 4.903903484 1.819472432
-v -9.260048866 2.851734638 1.785696149
-v -9.217930794 4.903903484 1.990117311
-v -9.194107056 2.851734638 1.761872530
-v -9.241754532 2.851734638 1.809604406
-v -9.241754532 2.851734638 1.571408272
-v -9.194107056 2.851734638 1.571408272
-v -9.217930794 4.903903484 1.581276536
-v -9.260048866 2.851734638 3.202257156
-v -9.174771309 2.851734638 3.202257156
-v -9.251623154 2.764342785 2.975809097
-v -9.174771309 2.764550686 3.202257156
-v -9.174771309 2.764550686 2.975808382
-v -9.194107056 2.764285803 2.999632597
-v -9.251623154 2.764400005 3.202257156
-v -9.217930794 2.764285803 2.975809097
-v -9.217930794 2.764400005 3.202223778
-v -9.217930794 2.851734638 3.202223778
-v -9.217930794 2.764285564 2.737780094
-v -9.217930794 2.764285564 2.771472692
-v -9.184239388 2.764371395 2.737920523
-v -9.260048866 2.764551163 2.737920523
-v -9.241754532 2.764342785 2.714097023
-v -9.194107056 2.764285803 2.951984882
-v -9.217930794 2.764285564 2.500033379
-v -9.194107056 2.764285564 2.523857117
-v -9.174771309 2.764551163 2.500032902
-v -9.251623154 2.764342785 2.500032902
-v -9.194107056 2.764285564 2.476209641
-v -9.217930794 2.764285564 2.295696497
-v -9.184239388 2.764370918 2.261920691
-v -9.260048866 2.764551163 2.261920691
-v -9.217930794 2.764285564 2.262004614
-v -9.241754532 2.764342785 2.238096952
-v -9.217930794 2.764285803 2.023808718
-v -9.251623154 2.764342785 2.023808718
-v -9.194107056 2.764285803 2.047632456
-v -9.194107056 2.764285803 1.999985099
-v -9.174771309 2.764550686 2.023808241
-v -9.260048866 2.764551163 1.785696149
-v -9.184239388 2.764371395 1.785696149
-v -9.217930794 2.764285564 1.819471836
-v -9.217930794 2.764285564 1.785780668
-v -9.251623154 2.764342785 1.547584295
-v -9.241754532 2.764342785 1.761872530
-v -9.194107056 2.764285564 1.571408272
-v -9.174771309 2.851734638 1.547583818
-v -9.174771309 2.764551163 1.547583818
-v -9.260048866 2.851734638 1.547583818
-v -9.194107056 2.851734638 1.523760080
-v -9.241754532 2.851734638 1.523760080
-v -9.217930794 4.903903484 1.513892889
-v -9.184238434 4.903903484 1.547584534
-v -9.251622200 4.903903484 1.547584534
-v -9.194107056 2.851734638 1.333379865
-v -9.184239388 4.903903484 1.309556246
-v -9.217930794 4.903903484 1.343248129
-v -9.260048866 2.851734638 1.309471726
-v -9.251623154 4.903903484 1.309556246
-v -9.241754532 2.851734638 1.285648108
-v -9.217930794 4.903903484 1.275864244
-v -9.174771309 2.851734638 1.309556246
-v -9.241754532 2.851734638 1.333379865
-v -9.194107056 2.851734638 1.285648108
-v -9.174771309 2.851734638 0.833331823
-v -9.194107056 2.851734638 0.809423327
-v -9.184239388 4.903903484 0.833331823
-v -9.194107056 2.851734638 0.857155442
-v -9.241754532 2.851734638 0.857155442
-v -9.217930794 4.903903484 0.867023766
-v -9.260048866 2.851734638 0.833247066
-v -9.241754532 2.851734638 0.809423327
-v -9.251623154 4.903903484 0.833331823
-v -9.194107056 2.851734638 1.095183849
-v -9.174771309 2.851734638 1.071359396
-v -9.184238434 4.903903484 1.071360111
-v -9.241754532 2.851734638 1.095183849
-v -9.217930794 4.903903484 1.105052114
-v -9.260048866 2.851734638 1.071359396
-v -9.241754532 2.851734638 1.047535658
-v -9.251622200 4.903903484 1.071360111
-v -9.194107056 2.851734638 1.047535658
-v -9.217930794 4.903903484 1.037668347
-v -9.217930794 4.903903484 0.799639761
-v -9.194107056 2.851734638 0.618959129
-v -9.184238434 4.903903484 0.595135331
-v -9.217930794 4.903903484 0.628827274
-v -9.260048866 2.851734638 0.595134735
-v -9.251622200 4.903903484 0.595135331
-v -9.194107056 2.851734638 0.571310997
-v -9.217930794 4.903903484 0.561443686
-v -9.174771309 2.851734638 0.595134735
-v -9.241754532 2.851734638 0.618959129
-v -9.241754532 2.851734638 0.571310997
-v -9.241754532 2.851734638 0.380930841
-v -9.194107056 2.851734638 0.380930841
-v -9.217930794 4.903903484 0.390799046
-v -9.174771309 2.851734638 0.357107073
-v -9.184239388 4.903903484 0.357107073
-v -9.260048866 2.851734638 0.357022703
-v -9.251623154 4.903903484 0.357107073
-v -9.241754532 2.851734638 0.333198935
-v -9.217930794 4.903903484 0.323415101
-v -9.194107056 2.851734638 0.333198935
-v -9.194107056 2.851734638 0.142734706
-v -9.184238434 4.903903484 0.118910953
-v -9.217930794 4.903903484 0.152602926
-v -9.260048866 2.851734638 0.118910357
-v -9.251622200 4.903903484 0.118910953
-v -9.194107056 2.851734638 0.095086604
-v -9.217930794 4.903903484 0.085219286
-v -9.174771309 2.851734638 0.118910357
-v -9.241754532 2.851734638 0.142734706
-v -9.241754532 2.851734638 0.095086604
-v -9.217930794 2.764285564 1.547584534
-v -9.194107056 2.764285564 1.523760676
-v -9.260048866 2.764551163 1.309471726
-v -9.184239388 2.764371395 1.309471726
-v -9.217930794 2.764285564 1.343247890
-v -9.217930794 2.764285564 1.309556246
-v -9.241754532 2.764342785 1.285648108
-v -9.194107056 2.764285803 1.095183849
-v -9.251623154 2.764342785 1.071359873
-v -9.174771309 2.764551163 1.071359396
-v -9.217930794 2.764285803 1.071360111
-v -9.194107056 2.764285803 1.047536373
-v -9.217930794 2.764285564 0.833331823
-v -9.241754532 2.764342785 0.809423327
-v -9.260048866 2.764550686 0.833247066
-v -9.217930794 2.764285564 0.867023468
-v -9.184239388 2.764371395 0.833247066
-v -9.251623154 2.764342785 0.595135033
-v -9.194107056 2.764285803 0.618959129
-v -9.217930794 2.764285803 0.595135331
-v -9.174771309 2.764551163 0.595134735
-v -9.194107056 2.764285803 0.571311593
-v -9.184239388 2.764371395 0.357022703
-v -9.217930794 2.764285564 0.390798748
-v -9.260048866 2.764551163 0.357022703
-v -9.217930794 2.764285564 0.357107073
-v -9.241754532 2.764342785 0.333198935
-v -9.217930794 2.764285803 0.118910953
-v -9.194107056 2.764285803 0.142734706
-v -9.174771309 2.764551163 0.118910357
-v -9.251623154 2.764342785 0.118910655
-v -9.194107056 2.764285803 0.095087208
-v -9.241754532 0.663206697 2.999632597
-v -9.194107056 0.663206935 2.951984406
-v -9.194107056 0.663206697 2.761604309
-v -9.260048866 0.663206697 2.737920523
-v -9.174771309 0.663206935 2.975808382
-v -9.194107056 0.663206697 2.999632597
-v -9.174771309 0.663206697 2.738004923
-v -9.260048866 0.663206935 2.975808382
-v -9.241754532 0.663206935 2.951984406
-v -9.194107056 0.663206697 2.714097023
-v -9.241754532 0.663206816 2.523857117
-v -9.194107056 0.663206816 2.476208925
-v -9.174771309 0.663206816 2.500032902
-v -9.194107056 0.663206816 2.523857117
-v -9.241754532 0.663206697 2.714097023
-v -9.260048866 0.663206816 2.500032902
-v -9.241754532 0.663206816 2.476208925
-v -9.174771309 0.663206816 2.023808241
-v -9.194107056 0.663206816 1.999984503
-v -9.194107056 0.663206816 2.047632217
-v -9.241754532 0.663206816 2.047632217
-v -9.260048866 0.663206816 2.023808241
-v -9.241754532 0.663206816 1.999984503
-v -9.194107056 0.663206816 2.285828829
-v -9.174771309 0.663206816 2.262005091
-v -9.241754532 0.663206816 2.285828829
-v -9.260048866 0.663206816 2.261920691
-v -9.241754532 0.663206816 2.238096952
-v -9.194107056 0.663206816 2.238096952
-v -9.194107056 0.663206816 1.761872530
-v -9.194107056 0.663206816 1.809604406
-v -9.260048866 0.663206816 1.785696149
-v -9.241754532 0.663206816 1.761872530
-v -9.241754532 0.663206816 1.571408272
-v -9.194107056 0.663206816 1.571408272
-v -9.174771309 0.663206816 1.785780311
-v -9.241754532 0.663206816 1.809604406
-v -9.174771309 0.663206697 3.202257156
-v -9.174771309 0.585616350 3.202257156
-v -9.251623154 0.585465491 2.975808382
-v -9.251623154 0.585465491 3.202257156
-v -9.260048866 0.663206697 3.202257156
-v -9.217930794 0.663206697 3.202223778
-v -9.174771309 0.585616350 2.975808382
-v -9.260048866 0.585616350 2.737920523
-v -9.184239388 0.585465550 2.737920523
-v -9.194107056 0.585465491 2.999632597
-v -9.217930794 0.585465491 3.202223778
-v -9.224709511 0.001949469 2.975809097
-v -9.217930794 0.585465550 2.771472692
-v -9.194107056 0.585465491 2.951984406
-v -9.224709511 0.001949608 2.737780094
-v -9.241754532 0.585465550 2.714097023
-v -9.251623154 0.585465550 2.500032902
-v -9.224709511 0.001949469 2.500033379
-v -9.194107056 0.585465550 2.523857117
-v -9.174771309 0.585616410 2.500032902
-v -9.194107056 0.585465550 2.476208925
-v -9.260048866 0.585616410 2.261920691
-v -9.184239388 0.585465550 2.261920691
-v -9.217930794 0.585465550 2.295696497
-v -9.251623154 0.585465550 2.023808241
-v -9.224709511 0.001949469 2.023808718
-v -9.194107056 0.585465550 2.047632217
-v -9.194107056 0.585465550 1.999984503
-v -9.174771309 0.585616410 2.023808241
-v -9.224709511 0.001949678 2.262005091
-v -9.241754532 0.585465550 2.238096952
-v -9.260048866 0.585616410 1.785696149
-v -9.184239388 0.585465372 1.785696149
-v -9.174771309 0.663206816 1.547583818
-v -9.251623154 0.585465431 1.547583818
-v -9.260048866 0.663206816 1.547583818
-v -9.174771309 0.585616469 1.547583818
-v -9.217930794 0.585465372 1.819472313
-v -9.224709511 0.001949678 1.785780668
-v -9.194107056 0.585465431 1.571408272
-v -9.241754532 0.585465372 1.761872530
-v -9.241754532 0.663206816 1.523760080
-v -9.194107056 0.663206816 1.523760080
-v -9.241754532 0.663206875 1.285648108
-v -9.194107056 0.663206875 1.285648108
-v -9.194107056 0.663206875 1.333379865
-v -9.260048866 0.663206875 1.309471726
-v -9.241754532 0.663206875 1.333379865
-v -9.174771309 0.663206875 1.309556246
-v -9.260048866 0.663206875 1.071359396
-v -9.241754532 0.663206875 1.095183849
-v -9.241754532 0.663206875 1.047535658
-v -9.194107056 0.663206875 1.047535658
-v -9.174771309 0.663206875 1.071359396
-v -9.194107056 0.663206875 1.095183849
-v -9.241754532 0.663206875 0.809423327
-v -9.194107056 0.663206875 0.809423327
-v -9.194107056 0.663206875 0.857155442
-v -9.260048866 0.663206875 0.833247066
-v -9.174771309 0.663206875 0.833331823
-v -9.241754532 0.663206875 0.857155442
-v -9.241754532 0.663206875 0.618959129
-v -9.194107056 0.663206875 0.618959129
-v -9.260048866 0.663206875 0.595134735
-v -9.241754532 0.663206875 0.571310997
-v -9.194107056 0.663206875 0.571310997
-v -9.174771309 0.663206875 0.595134735
-v -9.194107056 0.663206875 0.380930841
-v -9.260048866 0.663206875 0.357022703
-v -9.241754532 0.663206875 0.380930841
-v -9.174771309 0.663206875 0.357107073
-v -9.194107056 0.663206875 0.333198935
-v -9.241754532 0.663206875 0.333198935
-v -9.194107056 0.663206875 0.142734706
-v -9.241754532 0.663206875 0.142734706
-v -9.194107056 0.663206875 0.095086604
-v -9.174771309 0.663206875 0.118910357
-v -9.260048866 0.663206875 0.118910357
-v -9.241754532 0.663206875 0.095086604
-v -9.224709511 0.001949469 1.547584534
-v -9.194107056 0.585465431 1.523760080
-v -9.260048866 0.585616469 1.309471726
-v -9.224709511 0.001949678 1.309556246
-v -9.217930794 0.585465431 1.343247890
-v -9.241754532 0.585465431 1.285648108
-v -9.184239388 0.585465431 1.309471726
-v -9.194107056 0.585465431 1.095183849
-v -9.251623154 0.585465431 1.071359396
-v -9.224709511 0.001949330 1.071360111
-v -9.174771309 0.585616469 1.071359396
-v -9.194107056 0.585465431 1.047535658
-v -9.184239388 0.585465431 0.833247066
-v -9.224709511 0.001949748 0.833331823
-v -9.241754532 0.585465491 0.809423327
-v -9.260048866 0.585616469 0.833247066
-v -9.217930794 0.585465431 0.867023468
-v -9.251623154 0.585465491 0.595134735
-v -9.174771309 0.585616529 0.595134735
-v -9.260048866 0.585616529 0.357022703
-v -9.184239388 0.585465491 0.357022703
-v -9.224709511 0.001949330 0.595135331
-v -9.194107056 0.585465491 0.618959129
-v -9.194107056 0.585465491 0.571310997
-v -9.217930794 0.585465491 0.390798748
-v -9.224709511 0.001949748 0.357107073
-v -9.241754532 0.585465491 0.333198935
-v -9.194107056 0.585465491 0.142734706
-v -9.224709511 0.001949399 0.118910953
-v -9.174771309 0.585616529 0.118910357
-v -9.251623154 0.585465491 0.118910357
-v -9.194107056 0.585465491 0.095086604
-v -9.241754532 2.851734638 -0.095293581
-v -9.194107056 2.851734638 -0.095293581
-v -9.217930794 4.903903484 -0.085425362
-v -9.260048866 2.851734638 -0.119201690
-v -9.174771309 2.851734638 -0.119117334
-v -9.194107056 2.851734638 -0.143025458
-v -9.184239388 4.903903484 -0.119117334
-v -9.241754532 2.851734638 -0.143025458
-v -9.251623154 4.903903484 -0.119117334
-v -9.217930794 4.903903484 -0.152809307
-v -9.194107056 2.851734638 -0.333489835
-v -9.184238434 4.903903484 -0.357313603
-v -9.217930794 4.903903484 -0.323621780
-v -9.260048866 2.851734638 -0.357314199
-v -9.251622200 4.903903484 -0.357313603
-v -9.194107056 2.851734638 -0.381137967
-v -9.217930794 4.903903484 -0.391005576
-v -9.241754532 2.851734638 -0.333489835
-v -9.241754532 2.851734638 -0.381137967
-v -9.174771309 2.851734638 -0.357314199
-v -9.194107056 2.851734638 -0.571518302
-v -9.184239388 4.903903484 -0.595342040
-v -9.217930794 4.903903484 -0.561650217
-v -9.260048866 2.851734638 -0.595426559
-v -9.251623154 4.903903484 -0.595342040
-v -9.241754532 2.851734638 -0.619250298
-v -9.217930794 4.903903484 -0.629034042
-v -9.194107056 2.851734638 -0.619250298
-v -9.194107056 2.851734638 -0.809714198
-v -9.184238434 4.903903484 -0.833538115
-v -9.217930794 4.903903484 -0.799846351
-v -9.260048866 2.851734638 -0.833538711
-v -9.251622200 4.903903484 -0.833538115
-v -9.174771309 2.851734638 -0.595342159
-v -9.241754532 2.851734638 -0.571518302
-v -9.174771309 2.851734638 -0.833538711
-v -9.241754532 2.851734638 -0.809714198
-v -9.241754532 2.851734638 -1.095474720
-v -9.251623154 4.903903484 -1.071566582
-v -9.217930794 4.903903484 -1.105258584
-v -9.174771309 2.851734638 -1.071566582
-v -9.184239388 4.903903484 -1.071566582
-v -9.194107056 2.851734638 -1.047742844
-v -9.217930794 4.903903484 -1.037874579
-v -9.260048866 2.851734638 -1.071650743
-v -9.194107056 2.851734638 -0.857362509
-v -9.217930794 4.903903484 -0.867230058
-v -9.241754532 2.851734638 -1.047742844
-v -9.241754532 2.851734638 -0.857362509
-v -9.194107056 2.851734638 -1.095474720
-v -9.194107056 2.851734638 -1.285938621
-v -9.174771309 2.851734638 -1.309763074
-v -9.184238434 4.903903484 -1.309762597
-v -9.241754532 2.851734638 -1.285938621
-v -9.217930794 4.903903484 -1.276070833
-v -9.260048866 2.851734638 -1.309763074
-v -9.241754532 2.851734638 -1.333587050
-v -9.251622200 4.903903484 -1.309762597
-v -9.194107056 2.851734638 -1.333587050
-v -9.194107056 2.851734638 -1.523967266
-v -9.184239388 4.903903484 -1.547790885
-v -9.217930794 4.903903484 -1.514099121
-v -9.260048866 2.851734638 -1.547875404
-v -9.251623154 4.903903484 -1.547790885
-v -9.241754532 2.851734638 -1.571699142
-v -9.217930794 4.903903484 -1.581482887
-v -9.174771309 2.851734638 -1.547790885
-v -9.217930794 4.903903484 -1.343454361
-v -9.217930794 2.764285564 -0.119117334
-v -9.241754532 2.764342785 -0.143025458
-v -9.260048866 2.764550686 -0.119201690
-v -9.184239388 2.764370918 -0.119201690
-v -9.217930794 2.764285564 -0.085425660
-v -9.217930794 2.764285803 -0.357313752
-v -9.194107056 2.764285803 -0.333490014
-v -9.174771309 2.764550686 -0.357314199
-v -9.194107056 2.764285803 -0.381137490
-v -9.251623154 2.764342785 -0.357313901
-v -9.260048866 2.764551163 -0.595426559
-v -9.184239388 2.764371395 -0.595426559
-v -9.217930794 2.764285564 -0.561650217
-v -9.217930794 2.764285564 -0.595342159
-v -9.251623154 2.764342785 -0.833538413
-v -9.241754532 2.764342785 -0.619250298
-v -9.194107056 2.764285564 -0.809714556
-v -9.174771309 2.764551163 -0.833538711
-v -9.217930794 2.764285564 -0.833538294
-v -9.194107056 2.764285803 -0.857361853
-v -9.217930794 2.764285564 -1.071566582
-v -9.217930794 2.764285564 -1.037874579
-v -9.184239388 2.764370918 -1.071650743
-v -9.260048866 2.764551163 -1.071650743
-v -9.241754532 2.764342785 -1.095474720
-v -9.251623154 2.764342785 -1.309763074
-v -9.194107056 2.764285803 -1.285939097
-v -9.174771309 2.764550686 -1.309763074
-v -9.217930794 2.764285803 -1.309762716
-v -9.194107056 2.764285803 -1.333586216
-v -9.241754532 2.851734638 -1.523967266
-v -9.217930794 2.764285564 -1.514099121
-v -9.184239388 2.764371395 -1.547875404
-v -9.260048866 2.764551163 -1.547875404
-v -9.194107056 2.851734638 -1.571699262
-v -9.260048866 2.851734638 -1.785987616
-v -9.241754532 2.851734638 -1.762163401
-v -9.217930794 4.903903484 -1.752295256
-v -9.241754532 2.851734638 -1.809811354
-v -9.251622200 4.903903484 -1.785987139
-v -9.194107056 2.851734638 -1.809811354
-v -9.174771309 2.851734638 -1.785987616
-v -9.217930794 4.903903484 -1.819678783
-v -9.194107056 2.851734638 -1.762163401
-v -9.184238434 4.903903484 -1.785987139
-v -9.194107056 2.851734638 -2.000191689
-v -9.184239388 4.903903484 -2.024015427
-v -9.217930794 4.903903484 -1.990323782
-v -9.260048866 2.851734638 -2.024100065
-v -9.251623154 4.903903484 -2.024015427
-v -9.241754532 2.851734638 -2.000191689
-v -9.174771309 2.851734638 -2.024015665
-v -9.241754532 2.851734638 -2.238387823
-v -9.194107056 2.851734638 -2.238387823
-v -9.217930794 4.903903484 -2.228519678
-v -9.260048866 2.851734638 -2.262212276
-v -9.194107056 2.851734638 -2.047923565
-v -9.217930794 4.903903484 -2.057707310
-v -9.241754532 2.851734638 -2.286036015
-v -9.251622200 4.903903484 -2.262211800
-v -9.194107056 2.851734638 -2.286036015
-v -9.174771309 2.851734638 -2.262212276
-v -9.184238434 4.903903484 -2.262211800
-v -9.241754532 2.851734638 -2.047923565
-v -9.217930794 4.903903484 -2.295903683
-v -9.241754532 2.851734638 -2.524148226
-v -9.260048866 2.851734638 -2.500324249
-v -9.251623154 4.903903484 -2.500240326
-v -9.241754532 2.851734638 -2.476416349
-v -9.194107056 2.851734638 -2.476416349
-v -9.217930794 4.903903484 -2.466548204
-v -9.194107056 2.851734638 -2.524148226
-v -9.217930794 4.903903484 -2.533931971
-v -9.174771309 2.851734638 -2.500240326
-v -9.184239388 4.903903484 -2.500240326
-v -9.241754532 2.851734638 -2.714612246
-v -9.184238434 4.903903484 -2.738436222
-v -9.217930794 4.903903484 -2.704744339
-v -9.260048866 2.851734638 -2.738436699
-v -9.251622200 4.903903484 -2.738436222
-v -9.194107056 2.851734638 -2.714612246
-v -9.174770355 2.851734638 -2.738436699
-v -9.241754532 2.851734638 -2.762260437
-v -9.194107056 2.851734638 -2.762260437
-v -9.217930794 4.903903484 -2.772128105
-v -9.241754532 2.851734638 -3.000288248
-v -9.251622200 4.903903484 -2.976464748
-v -9.217930794 4.903903484 -3.010156393
-v -9.194107056 2.851734638 -3.000288248
-v -9.184238434 4.903903484 -2.976464748
-v -9.194107056 2.851734638 -2.952640533
-v -9.217930794 4.903903484 -2.942772388
-v -9.260048866 2.851734638 -2.976464748
-v -9.174771309 2.851734638 -2.976464272
-v -9.241754532 2.851734638 -2.952640533
-v -9.217930794 2.764285564 -1.547791004
-v -9.241754532 2.764342785 -1.571699262
-v -9.251623154 2.764342785 -1.785987496
-v -9.194107056 2.764285564 -1.762163520
-v -9.217930794 2.764285564 -1.785987139
-v -9.174771309 2.764551163 -1.785987616
-v -9.217930794 2.764285564 -2.024015665
-v -9.217930794 2.764285564 -1.990323663
-v -9.184239388 2.764371395 -2.024100065
-v -9.260048866 2.764551163 -2.024099827
-v -9.241754532 2.764342785 -2.047923803
-v -9.194107056 2.764285564 -1.809810996
-v -9.217930794 2.764285803 -2.262211800
-v -9.194107056 2.764285803 -2.238388062
-v -9.174771309 2.764550686 -2.262212276
-v -9.251623154 2.764342785 -2.262211800
-v -9.194107056 2.764285803 -2.286035538
-v -9.217930794 2.764285564 -2.500240326
-v -9.260048866 2.764550686 -2.500324249
-v -9.217930794 2.764285564 -2.466548204
-v -9.241754532 2.764342785 -2.524148226
-v -9.184239388 2.764371395 -2.500324249
-v -9.251622200 2.764342785 -2.738436460
-v -9.194107056 2.764285803 -2.714612246
-v -9.174770355 2.764551163 -2.738436699
-v -9.217930794 2.764285803 -2.738436222
-v -9.194107056 2.764285803 -2.762260199
-v -9.251623154 2.764342785 -2.976464748
-v -9.217930794 2.764285564 -2.976464748
-v -9.194107056 2.764285564 -2.952641010
-v -9.174771309 2.764551163 -2.976464272
-v -9.174771309 2.851734400 -3.202257156
-v -9.217930794 2.764285088 -3.201863527
-v -9.194107056 2.764399529 -2.999536991
-v -9.260048866 2.764550447 -3.202257156
-v -9.260048866 2.851734400 -3.202257156
-v -9.184239388 2.764342308 -3.202257156
-v -9.217930794 2.851734400 -3.201863527
-v -9.194107056 0.663206875 -0.333490014
-v -9.241754532 0.663206875 -0.333490014
-v -9.194107056 0.663206875 -0.095293581
-v -9.260048866 0.663206875 -0.119201690
-v -9.241754532 0.663206875 -0.143025458
-v -9.194107056 0.663206875 -0.143025458
-v -9.174771309 0.663206875 -0.119117633
-v -9.241754532 0.663206875 -0.095293581
-v -9.174771309 0.663206875 -0.357314348
-v -9.260048866 0.663206875 -0.357314348
-v -9.241754532 0.663206875 -0.619250298
-v -9.194107056 0.663206875 -0.619250298
-v -9.194107056 0.663206875 -0.381138086
-v -9.194107056 0.663206875 -0.571518421
-v -9.260048866 0.663206875 -0.595426559
-v -9.241754532 0.663206875 -0.571518421
-v -9.241754532 0.663206875 -0.381138086
-v -9.174771309 0.663206875 -0.595342159
-v -9.241754532 0.663206935 -0.809714556
-v -9.194107056 0.663206935 -0.809714556
-v -9.260048866 0.663206935 -0.833538890
-v -9.241754532 0.663206935 -0.857362628
-v -9.194107056 0.663206935 -0.857362628
-v -9.174771309 0.663206935 -0.833538890
-v -9.241754532 0.663206697 -1.095474839
-v -9.194107056 0.663206697 -1.095474839
-v -9.260048866 0.663206697 -1.071651101
-v -9.194107056 0.663206697 -1.047743082
-v -9.241754532 0.663206697 -1.047743082
-v -9.174771309 0.663206697 -1.071566582
-v -9.194107056 0.663206697 -1.285939097
-v -9.174771309 0.663206935 -1.309763074
-v -9.241754532 0.663206697 -1.285939097
-v -9.260048866 0.663206935 -1.309763074
-v -9.241754532 0.663206935 -1.333587050
-v -9.194107056 0.663206935 -1.333587050
-v -9.194107056 0.663206697 -1.523967385
-v -9.260048866 0.663206697 -1.547875524
-v -9.241754532 0.663206697 -1.571699262
-v -9.194107056 0.663206697 -1.571699262
-v -9.260048866 0.585616529 -0.119201690
-v -9.224709511 0.001949748 -0.119117334
-v -9.217930794 0.585465491 -0.085425660
-v -9.184239388 0.585465491 -0.119201690
-v -9.241754532 0.585465491 -0.143025458
-v -9.194107056 0.585465491 -0.333490014
-v -9.224709511 0.001949399 -0.357313752
-v -9.174771309 0.585616529 -0.357314348
-v -9.251623154 0.585465491 -0.357314348
-v -9.194107056 0.585465491 -0.381138086
-v -9.260048866 0.585616350 -0.595426559
-v -9.184239388 0.585465491 -0.595426559
-v -9.251623154 0.585465491 -0.833538711
-v -9.174771309 0.585616350 -0.833538711
-v -9.217930794 0.585465491 -0.561650217
-v -9.224709511 0.001949748 -0.595342159
-v -9.194107056 0.585465491 -0.809714556
-v -9.241754532 0.585465491 -0.619250298
-v -9.224709511 0.001949399 -0.833538294
-v -9.194107056 0.585465491 -0.857362628
-v -9.184239388 0.585465491 -1.071651101
-v -9.224709511 0.001949608 -1.071566701
-v -9.241754532 0.585465491 -1.095474839
-v -9.217930794 0.585465491 -1.037874579
-v -9.260048866 0.585616350 -1.071651101
-v -9.251623154 0.585465491 -1.309763074
-v -9.194107056 0.585465491 -1.285939097
-v -9.194107056 0.585465491 -1.333587050
-v -9.224709511 0.001949399 -1.309762716
-v -9.174771309 0.585616350 -1.309763074
-v -9.184239388 0.585465491 -1.547875524
-v -9.224709511 0.001949608 -1.547790885
-v -9.241754532 0.585465491 -1.571699262
-v -9.260048866 0.585616350 -1.547875524
-v -9.217930794 0.585465491 -1.514099121
-v -9.241754532 0.663206697 -1.523967385
-v -9.174771309 0.663206697 -1.547791004
-v -9.194107056 0.663206816 -1.762163520
-v -9.174771309 0.663206816 -1.785987616
-v -9.241754532 0.663206816 -1.762163520
-v -9.260048866 0.663206816 -1.785987616
-v -9.241754532 0.663206816 -1.809811592
-v -9.194107056 0.663206816 -1.809811592
-v -9.260048866 0.663206816 -2.024100065
-v -9.194107056 0.663206816 -2.000191927
-v -9.174771309 0.663206816 -2.024015903
-v -9.241754532 0.663206816 -2.000191927
-v -9.194107056 0.663206816 -2.047923803
-v -9.194107056 0.663206816 -2.238387823
-v -9.241754532 0.663206816 -2.238387823
-v -9.194107056 0.663206816 -2.286036253
-v -9.174771309 0.663206816 -2.262212276
-v -9.241754532 0.663206816 -2.047923803
-v -9.241754532 0.663206816 -2.286036253
-v -9.260048866 0.663206816 -2.262212276
-v -9.194107056 0.663206816 -2.476416588
-v -9.174771309 0.663206816 -2.500240326
-v -9.194107056 0.663206816 -2.524148226
-v -9.241754532 0.663206816 -2.476416588
-v -9.260048866 0.663206816 -2.500324488
-v -9.241754532 0.663206816 -2.524148226
-v -9.194107056 0.663206816 -2.714612484
-v -9.241754532 0.663206816 -2.714612484
-v -9.260048866 0.663206816 -2.738436699
-v -9.241754532 0.663206816 -2.762260437
-v -9.174770355 0.663206816 -2.738436699
-v -9.241754532 0.663206875 -3.000288486
-v -9.174771309 0.663206875 -2.976464748
-v -9.194107056 0.663206875 -2.952641010
-v -9.241754532 0.663206875 -2.952641010
-v -9.194107056 0.663206816 -2.762260437
-v -9.260048866 0.663206875 -2.976464748
-v -9.194107056 0.663206875 -3.000288486
-v -9.251623154 0.585465550 -1.785987616
-v -9.174771309 0.585616410 -1.785987616
-v -9.260048866 0.585616410 -2.024100065
-v -9.184239388 0.585465550 -2.024100065
-v -9.194107056 0.585465550 -1.762163520
-v -9.224709511 0.001949469 -1.785987139
-v -9.194107056 0.585465550 -1.809811711
-v -9.217930794 0.585465550 -1.990323782
-v -9.224709511 0.001949678 -2.024015665
-v -9.194107056 0.585465550 -2.238387823
-v -9.224709511 0.001949469 -2.262211800
-v -9.174771309 0.585616410 -2.262212276
-v -9.251623154 0.585465550 -2.262212276
-v -9.194107056 0.585465550 -2.286036253
-v -9.241754532 0.585465550 -2.047923803
-v -9.260048866 0.585616410 -2.500324488
-v -9.224709511 0.001949678 -2.500240326
-v -9.217930794 0.585465550 -2.466548204
-v -9.241754532 0.585465550 -2.524148226
-v -9.184239388 0.585465550 -2.500324488
-v -9.194107056 0.585465550 -2.714612484
-v -9.224708557 0.001949469 -2.738436222
-v -9.174770355 0.585616469 -2.738436699
-v -9.251622200 0.585465372 -2.738436699
-v -9.194107056 0.585465431 -2.762260437
-v -9.217930794 0.663206875 -3.201863527
-v -9.260048866 0.663206875 -3.202257156
-v -9.174771309 0.663206875 -3.202257156
-v -9.174771309 0.585616469 -2.975544691
-v -9.260048866 0.585616469 -3.202257156
-v -9.251623154 0.585465431 -2.976464748
-v -9.184239388 0.585465431 -3.202257156
-v -9.224709511 0.001949678 -2.976464748
-v -9.217930794 0.585465431 -2.942772865
-v -9.194107056 0.585465431 -3.000288486
-v -9.217930794 0.585465431 -3.201863527
-v -9.342898369 -0.000000013 -3.231861830
-v -9.342898369 -0.000000013 3.241882324
-v -9.342898369 4.903903484 3.241882324
-v -9.124868393 4.903903484 -3.231861830
-v -9.124868393 4.903903484 3.241882324
-v -9.124868393 -0.000000013 3.241882324
-v -9.124868393 -0.000000013 -3.231861830
-v -9.342898369 4.903903484 -3.231861830
-v -10.522571564 5.376530647 4.996312141
-v -11.944499016 5.376530647 4.868019581
-v -10.522571564 6.424669266 3.616309643
-v -11.764372826 6.424669266 3.499822855
-v -10.522571564 6.886405945 2.539833784
-v -13.171661377 6.430963993 3.262741804
-v -12.903519630 6.891765594 2.222413063
-v -11.623864174 6.886405945 2.432556391
-v -11.459753036 7.187221527 1.186010599
-v -10.522571564 7.187221527 1.282531500
-v -12.589709282 7.192582607 1.004901886
-v -14.142993927 5.574815273 4.435072899
-v -16.842653275 6.576874256 3.338032007
-v -13.740724564 6.623157978 3.103520393
-v -13.518838882 5.382621288 4.609709740
-v -16.202087402 7.625217438 2.103313446
-v -13.430030823 7.083959579 2.075096607
-v -13.066421509 7.384777069 0.871518970
-v -15.707345963 8.086019516 1.149680018
-v -18.450126648 8.610714912 0.656888247
-v -19.308334351 7.562372684 1.751571774
-v -17.787288666 9.071516991 -0.188589811
-v -17.011562347 9.372335434 -1.178062677
-v -15.128343582 8.386837006 0.033630669
-v -14.540811539 8.473677635 -1.098863363
-v -12.697456360 7.471618652 -0.349792302
-v -12.271274567 7.279423714 -0.230548218
-v -12.326546669 7.384777546 -1.577539444
-v -10.522571564 7.274062157 -0.000019173
-v -11.292346954 7.274062157 -0.085567750
-v -11.951164246 7.192582607 -1.472508669
-v -11.125818253 7.187221527 -1.350481272
-v -10.522571564 7.187221527 -1.275847554
-v -11.637353897 6.891765594 -2.690018654
-v -11.962936401 7.083960533 -2.781116486
-v -10.522571564 6.886405945 -2.533149719
-v -10.961707115 6.886405945 -2.597026825
-v -16.224405289 9.459175110 -2.182115555
-v -18.626115799 10.376508713 -2.704424858
-v -19.570501328 10.075691223 -1.874399185
-v -20.377454758 9.614888191 -1.165164828
-v -21.422256470 8.566545486 -0.246882081
-v -23.146909714 9.572109222 -2.623607874
-v -14.657373428 9.071517944 -4.180932045
-v -15.760075569 10.075691223 -5.223401070
-v -13.993212700 8.609780312 -5.028099060
-v -14.951511383 9.613953590 -5.934051991
-v -13.141783714 7.560319424 -6.114133835
-v -12.875452042 7.624282837 -4.308912277
-v -13.371181488 8.086019516 -3.353374243
-v -12.239946365 6.574821472 -5.533876419
-v -11.651623726 6.622223377 -3.811594248
-v -11.252530098 5.572762966 -5.132627487
-v -11.024242401 5.380568027 -5.068752766
-v -10.522571564 6.425604343 -3.607479572
-v -10.821478844 6.425604343 -3.662166119
-v -10.522571564 5.378584385 -4.998468876
-v -11.368676186 6.430028915 -3.732426405
-v -13.950182915 8.386837006 -2.237324953
-v -15.433100700 9.372335434 -3.191458941
-v -17.667814255 10.463348389 -3.546681166
-v -18.845424652 11.468912125 -5.169534683
-v -16.704462051 10.376508713 -4.393375397
-v -16.659719467 11.081255913 -6.463191032
-v -17.741708755 11.382072449 -5.822793007
-v -15.733344078 10.619517326 -7.011487007
-v -16.207056046 11.416520119 -7.968554020
-v -17.204814911 11.878255844 -7.564476013
-v -16.370790482 11.411161423 -9.472515106
-v -14.545764923 9.570056915 -7.714380741
-v -14.991180420 10.369996071 -9.472515106
-v -14.927967072 10.367058754 -8.486566544
-v -13.914962769 8.564492226 -6.845079422
-v -19.943355560 11.382072449 -4.519700527
-v -18.370176315 12.179073334 -7.092521667
-v -19.558938980 12.265913010 -6.611088753
-v -17.447265625 11.887731552 -9.463213921
-v -18.704566956 12.188549042 -9.463213921
-v -20.741472244 12.179073334 -6.132178783
-v -21.906833649 11.878255844 -5.660224438
-v -21.262947083 12.188549042 -9.463213921
-v -19.987119675 12.275389671 -9.463213921
-v -21.025344849 11.081254959 -3.879302502
-v -21.949874878 10.620451927 -3.332099915
-v -22.902603149 11.417453766 -5.256952286
-v -24.191875458 10.369110107 -4.734813690
-v -22.520248413 11.887731552 -9.463213921
-v -24.985912323 10.363021851 -9.472431183
-v -23.594579697 11.426930428 -9.463213921
-v -11.921522141 5.244771004 4.691285133
-v -13.464874268 5.250683784 4.400579453
-v -13.464874268 5.389416695 4.400579453
-v -11.921522141 5.383503914 4.691285133
-v -11.944499016 5.028249741 4.868019581
-v -13.518838882 5.034162521 4.609709740
-v -10.522571564 5.028249741 4.996312141
-v -10.693440437 5.244771004 4.781946659
-v -10.693440437 5.383503914 4.781946659
-v -10.522571564 4.220901012 4.194850445
-v -10.522571564 5.074391842 2.961715221
-v -10.987136841 5.306261063 1.998843908
-v -10.987136841 4.942946434 2.845861673
-v -10.522571564 5.437706947 2.080181360
-v -11.189902306 4.981316566 1.855782747
-v -11.189902306 4.664701939 2.685906410
-v -10.987136841 4.118224621 3.998601198
-v -10.987136841 3.594882727 2.999999046
-v -10.987136841 4.015309334 2.312587738
-v -11.189902306 3.954033852 3.695902348
-v -11.189902306 4.268828392 2.458329201
-v -11.189902306 3.731305599 3.256635666
-v -10.522571564 5.674401283 1.050566673
-v -11.189902306 5.186119080 0.934212565
-v -11.189902306 4.591217518 1.684036255
-v -10.987136841 5.542956352 1.009543061
-v -10.987136841 5.611286163 -0.000002925
-v -10.522571564 5.742732048 -0.000118388
-v -11.189902306 5.247025013 0.000000297
-v -10.987136841 4.320860386 1.565007925
-v -11.189902306 4.787009716 0.849958301
-v -10.987136841 4.506307602 0.790700376
-v -11.189902306 4.860300064 0.000003708
-v -10.987136841 4.568477631 0.000006273
-v -14.080591202 5.442877769 4.228303909
-v -14.080591202 5.581610680 4.228303909
-v -14.142993927 5.226356506 4.435072899
-v -16.743244171 6.583669662 3.146288157
-v -16.743244171 6.444936752 3.146288395
-v -16.842651367 6.228415489 3.338032246
-v -16.842641830 1.554137230 3.338010311
-v -11.944499016 0.355853915 4.868019581
-v -10.522571564 0.355859280 4.194944382
-v -13.518832207 0.359884471 4.609686375
-v -13.464838028 0.115775906 4.400473118
-v -11.921388626 0.111744970 4.691383362
-v -11.921388626 0.000000567 4.691383362
-v -13.462984085 0.004034261 4.393279076
-v -10.987136841 0.000000545 3.997561693
-v -10.713544846 0.000000571 4.781278133
-v -10.713544846 0.111745164 4.781278133
-v -10.713544846 0.111750051 4.114162445
-v -10.713544846 0.000000542 4.114162445
-v -10.522571564 0.355853915 4.996312141
-v -11.189902306 0.000000532 3.698854685
-v -11.189902306 0.000000513 3.256092072
-v -10.987138748 0.000000502 2.999999285
-v -10.987138748 0.000000239 -3.000002146
-v -11.189903259 0.000000226 -3.299829006
-v -11.189903259 0.000000207 -3.729335070
-v -14.073675156 -0.000450481 4.214264393
-v -17.247392654 1.200104237 2.855069160
-v -17.247392654 1.400104165 2.855069160
-v -16.737829208 1.200104237 3.131706238
-v -17.743127823 1.600104690 2.561540604
-v -16.743198395 1.310028553 3.146185875
-v -16.221801758 1.000105262 3.387467623
-v -16.737829208 1.000105023 3.131706238
-v -16.221801758 0.800105274 3.387467623
-v -15.696773529 0.800104618 3.623860836
-v -14.142986298 0.552077711 4.435049057
-v -14.073494911 0.200105667 4.214318752
-v -14.619277954 0.400105536 4.038478851
-v -14.080564499 0.307969123 4.228194237
-v -15.696773529 0.600105345 3.623860836
-v -15.159379005 0.600104690 3.842149973
-v -15.159379005 0.400105536 3.842149973
-v -14.619277954 0.200104803 4.038478851
-v -11.522525787 0.199350193 -4.998117447
-v -11.522524834 0.399350166 -4.998117447
-v -11.312547684 -0.000552034 -4.930464745
-v -11.313628197 0.197789952 -4.928623199
-v -11.077886581 0.004034458 -4.860519409
-v -11.730351448 0.599349976 -5.073661804
-v -11.730351448 0.399350077 -5.073661804
-v -10.522571564 5.674401283 -1.044509530
-v -11.189902306 5.204754829 -0.932175219
-v -10.987136841 5.542956352 -1.003501534
-v -11.189902306 5.018983364 -1.866387129
-v -11.189902306 4.797083855 -0.846197724
-v -11.189902306 4.591829300 -1.678419709
-v -10.522571564 5.437706947 -2.074124336
-v -10.987136841 5.306261063 -1.992802382
-v -10.987136841 4.506307602 -0.784873307
-v -10.987136841 4.015309334 -2.306760550
-v -10.987136841 4.320860386 -1.559180737
-v -11.189902306 4.279667377 -2.478732586
-v -11.189902306 4.680350304 -2.687409163
-v -12.338356018 1.198818803 -5.345024109
-v -12.533795357 1.199349403 -5.453479290
-v -12.139158249 0.999349713 -5.248617649
-v -12.337719917 0.999349594 -5.347032547
-v -12.724548340 1.399349451 -5.566424370
-v -12.724548340 1.599349260 -5.566424370
-v -12.533795357 1.399349451 -5.453479290
-v -17.743127823 1.400104165 2.561540604
-v -11.937133789 0.599349856 -5.157656670
-v -11.937134743 0.799349844 -5.157656193
-v -12.139158249 0.799349785 -5.248617649
-v -19.160146713 2.200103760 1.573689103
-v -19.160099030 2.000426531 1.573725939
-v -13.269801140 1.999348879 -5.946537971
-v -19.592878342 2.200426340 1.222027302
-v -13.269801140 2.199348927 -5.946537971
-v -18.688013077 2.000103712 1.929206133
-v -18.688011169 1.800426364 1.929207444
-v -13.088128090 1.799349070 -5.809739113
-v -19.592884064 2.400103569 1.222023010
-v -13.436311722 2.199348927 -6.081855297
-v -18.234491348 1.800103784 2.245227337
-v -18.234491348 1.600103617 2.245227337
-v -12.913619041 1.599349260 -5.688138008
-v -12.913618088 1.799349189 -5.688138008
-v -13.088128090 1.999348998 -5.809739113
-v -20.024847031 2.600103378 0.844038010
-v -23.146888733 4.549372673 -2.623620272
-v -24.191854477 5.346374035 -4.734823227
-v -23.146909714 9.223649979 -2.623607874
-v -21.422256470 8.218087196 -0.246882007
-v -21.260068893 8.573341370 -0.389510125
-v -19.175127029 7.569168091 1.581561685
-v -21.260068893 8.434608459 -0.389510125
-v -19.175127029 7.430434704 1.581561685
-v -19.308334351 7.213913918 1.751571774
-v -21.422237396 3.543808699 -0.246898398
-v -19.308319092 2.539635181 1.751552343
-v -19.175062180 2.295526981 1.581469178
-v -20.024841309 2.400426388 0.844043970
-v -21.259988785 3.299700022 -0.389589429
-v -20.442436218 2.800103426 0.450453132
-v -20.870805740 2.800103188 0.014673174
-v -20.870805740 3.000103235 0.014673110
-v -20.442432404 2.600426197 0.450456142
-v -21.249750137 3.200103283 -0.401151925
-v -21.631483078 3.400102854 -0.852646232
-v -21.631483078 3.200103283 -0.852646172
-v -21.249750137 3.000103235 -0.401151925
-v -21.983184814 3.600101948 -1.301658869
-v -22.960983276 4.305263996 -2.733731031
-v -22.318733215 3.805263281 -1.764104128
-v -22.639333725 3.805263281 -2.242145777
-v -22.639333725 4.005263329 -2.242145777
-v -22.318899155 3.600747585 -1.764345169
-v -21.983184814 3.400102139 -1.301658869
-v -14.730253220 9.577030182 -7.605214596
-v -15.126667023 10.235299110 -8.406121254
-v -14.730253220 9.438297272 -7.605214596
-v -15.126667023 10.374031067 -8.406121254
-v -14.545764923 9.171813011 -7.714380741
-v -14.075992584 8.571465492 -6.703580856
-v -14.075993538 8.432733536 -6.703579426
-v -13.914962769 8.166248322 -6.845079422
-v -17.301195145 9.664704323 -8.797198296
-v -16.291198730 8.954035759 -8.797198296
-v -17.141239166 9.942949295 -8.999963760
-v -15.988500595 9.118226051 -8.999963760
-v -17.025384903 10.074394226 -9.464529037
-v -15.792250633 9.220903397 -9.464529037
-v -14.927967072 9.968814850 -8.486566544
-v -15.205154419 10.369996071 -9.301646233
-v -15.205154419 10.231264114 -9.301646233
-v -14.990788460 9.978288651 -9.464529037
-v -12.338684082 6.581794739 -5.343604088
-v -13.274061203 7.567292213 -5.945445061
-v -12.338685989 6.443062305 -5.343603611
-v -13.141783714 7.162075520 -6.114133835
-v -12.239946365 6.176578522 -5.533876419
-v -13.274061203 7.428560257 -5.945445061
-v -11.314546585 5.579736233 -4.927428246
-v -14.545763016 4.500739098 -7.714381695
-v -14.990787506 5.307215691 -9.463213921
-v -15.792155266 5.357183456 -9.463213921
-v -13.914960861 3.495175600 -6.845081329
-v -14.927965164 5.297739983 -8.486567497
-v -16.730466843 8.731307983 -8.797198296
-v -16.987102509 8.594884872 -8.999963760
-v -16.987100601 4.999999523 -8.998647690
-v -15.989538193 4.999999523 -8.998647690
-v -16.731008530 4.999999523 -8.795883179
-v -16.288244247 4.999999523 -8.795883179
-v -10.522571564 5.075127602 -2.953901052
-v -10.987136841 4.943681717 -2.838132381
-v -10.522571564 4.222517490 -4.197426319
-v -11.189902306 3.977253675 -3.729803801
-v -10.987136841 4.119840622 -4.004019737
-v -10.522571564 5.030126095 -4.998468876
-v -11.077722549 5.387540817 -4.861165047
-v -10.693440437 5.385379791 -4.782487869
-v -11.077723503 5.248808861 -4.861164570
-v -10.693440437 5.246647835 -4.782487869
-v -11.024242401 5.032286644 -5.068752766
-v -11.252530098 5.174519539 -5.132627487
-v -11.314546585 5.441003799 -4.927427292
-v -12.239945412 1.505504131 -5.533878326
-v -13.141781807 2.491002083 -6.114135265
-v -15.032476425 4.604507923 -8.194774628
-v -14.938087463 4.604507923 -7.995305538
-v -15.032476425 4.804508209 -8.194774628
-v -14.730827332 4.306592941 -7.604877949
-v -15.120501518 4.804507256 -8.400219917
-v -15.120501518 5.004507065 -8.400219917
-v -15.127285004 5.103593826 -8.405874252
-v -15.205821991 5.113069534 -9.272240639
-v -15.205821991 4.999999523 -9.272240639
-v -15.872937202 5.113074780 -9.272240639
-v -11.189902306 3.751090527 -3.299464226
-v -10.987136841 3.594882727 -3.000002384
-v -11.252530098 0.503444910 -5.132629395
-v -13.274473190 2.296855927 -5.944923878
-v -12.338994026 1.311358094 -5.343014717
-v -14.076495171 3.301029444 -6.703143120
-v -14.485184669 3.804508448 -7.230883598
-v -14.608549118 3.804508448 -7.414827347
-v -14.608549118 4.004508495 -7.414827347
-v -14.485260963 3.599347115 -7.230987549
-v -14.356073380 3.599347115 -7.052937508
-v -14.356073380 3.399347782 -7.052937508
-v -14.220742226 3.399347782 -6.880163670
-v -14.725962639 4.204507828 -7.604827881
-v -14.835721016 4.404508591 -7.798212051
-v -14.938087463 4.404508591 -7.995305538
-v -14.835721970 4.204507828 -7.798211575
-v -14.725962639 4.004508495 -7.604827881
-v -10.987138748 0.000000195 -4.002827168
-v -11.024241447 0.361212969 -5.068754196
-v -10.522571564 0.355848223 -4.998444557
-v -10.522571564 0.355847448 -4.197664261
-v -10.713545799 0.000000153 -4.782374859
-v -10.713545799 0.111738972 -4.117465496
-v -10.713545799 0.000000182 -4.117465496
-v -10.713545799 0.111739635 -4.782374859
-v -11.077886581 0.117104389 -4.860519409
-v -11.314742088 0.309298813 -4.926791668
-v -13.436311722 2.399348736 -6.081855297
-v -13.602527618 2.599348783 -6.227298737
-v -13.763211250 2.599348783 -6.378746033
-v -13.763211250 2.799348593 -6.378746033
-v -13.602527618 2.399348736 -6.227298737
-v -14.220742226 3.199348211 -6.880163670
-v -14.073856354 3.199347496 -6.706433773
-v -14.073856354 2.999348164 -6.706433773
-v -13.928043365 2.999348402 -6.546429634
-v -13.928043365 2.799348593 -6.546429634
-v -15.872937202 4.999999523 -9.272240639
-v -18.131317139 9.981318474 -8.797198296
-v -17.988256454 10.306262970 -8.999963760
-v -17.906917572 10.437708855 -9.464529037
-v -19.052888870 10.186120033 -8.797198296
-v -18.977558136 10.542957306 -8.999963760
-v -18.303064346 9.591218948 -8.797198296
-v -19.137142181 9.787012100 -8.797198296
-v -18.936534882 10.674402237 -9.464529037
-v -17.528772354 9.268830299 -8.797198296
-v -17.674510956 9.016634941 -8.998647690
-v -17.674514771 9.015310287 -10.000000954
-v -16.987102509 8.594883919 -10.000000954
-v -18.422090530 9.322186470 -8.998647690
-v -19.196399689 9.506309509 -8.999963760
-v -19.196399689 9.506309509 -10.000000954
-v -18.422092438 9.320861816 -10.000000954
-v -19.987100601 10.247028351 -8.797198296
-v -19.987104416 10.611288071 -8.999963760
-v -19.987218857 10.742734909 -9.464529991
-v -20.919277191 10.204757690 -8.797198296
-v -20.990602493 10.542957306 -8.999963760
-v -21.031610489 10.674402237 -9.464529991
-v -19.987096786 9.860301971 -8.797198296
-v -19.987094879 9.568479538 -8.999963760
-v -19.987094879 9.568479538 -10.000000954
-v -20.833299637 9.797085762 -8.797198296
-v -20.771974564 9.506309509 -8.999963760
-v -20.771974564 9.506309509 -10.000000954
-v -22.961076736 9.440172195 -2.733668089
-v -22.961076736 9.578904152 -2.733668089
-v -23.991712570 10.375905991 -4.815942287
-v -23.991712570 10.237173080 -4.815942287
-v -24.191875458 10.020651817 -4.734813690
-v -22.061225891 10.437708855 -9.464529037
-v -22.825233459 9.943684578 -8.999963760
-v -21.979904175 10.306262970 -8.999963760
-v -22.941001892 10.075129509 -9.464529037
-v -24.184528351 9.222518921 -9.464529037
-v -23.716903687 8.977254868 -8.797198296
-v -22.674510956 9.680353165 -8.797198296
-v -23.991121292 9.119842529 -8.999963760
-v -22.465831757 9.279668808 -8.797198296
-v -23.286565781 8.751092911 -8.797198296
-v -22.293861389 9.015311241 -8.999963760
-v -22.987102509 8.594884872 -8.999963760
-v -22.987102509 8.594883919 -10.000000954
-v -21.665519714 9.591831207 -8.797198296
-v -21.546281815 9.320861816 -8.999963760
-v -21.546281815 9.320861816 -10.000000954
-v -21.853488922 10.018985748 -8.797198296
-v -22.293861389 9.015310287 -10.000000954
-v -24.985912323 10.014828682 -9.472431183
-v -24.769596100 10.370082855 -9.301564217
-v -24.769596100 10.231350899 -9.301564217
-v -24.985546112 5.355849743 -9.464529037
-v -22.944475174 4.205263615 -2.735925198
-v -22.944475174 4.005263329 -2.735925198
-v -23.230068207 4.204940796 -3.239145756
-v -23.229717255 4.405263901 -3.238497257
-v -23.969812393 5.005263329 -4.803016186
-v -23.741117477 4.604940891 -4.269253254
-v -23.969812393 4.805263042 -4.803016186
-v -23.741048813 4.805263042 -4.269100666
-v -23.495750427 4.605263710 -3.750710487
-v -23.496076584 4.404941082 -3.751371861
-v -23.991611481 5.102264881 -4.815990448
-v -23.286930084 4.999999523 -8.797198296
-v -23.716436386 4.999999523 -8.797197342
-v -23.989929199 4.999999523 -8.999961853
-v -24.769477844 4.986489296 -9.281723022
-v -22.987102509 4.999999523 -8.999961853
-v -16.987102509 4.999999523 -10.000000000
-v -22.987102509 4.999999523 -10.000000000
-v -24.184766769 5.355849266 -9.464529037
-v -24.769477844 5.111741543 -9.273554802
-v -24.104564667 5.111741066 -9.273554802
-v -24.104564667 4.999999523 -9.273554802
-v -25.015216827 10.370100975 -10.486470222
-v -24.881961823 10.370100975 -11.907939911
-v -23.635223389 11.418239594 -10.481653214
-v -23.514402390 11.418239594 -11.723038673
-v -22.558753967 11.879976273 -10.477895737
-v -23.272411346 11.424533844 -13.129491806
-v -22.233024597 11.885335922 -12.857720375
-v -22.447633743 11.879976273 -11.578805923
-v -21.201667786 12.180791855 -11.410345078
-v -21.301460266 12.180791855 -10.473506927
-v -21.016616821 12.186153412 -12.539662361
-v -24.441345215 10.568386078 -14.104910851
-v -23.334888458 11.570444107 -16.800724030
-v -23.111204147 11.616727829 -13.697996140
-v -24.618160248 10.376192093 -13.481369019
-v -22.102413177 12.618787766 -16.155851364
-v -22.083871841 12.077529907 -13.383714676
-v -20.881570816 12.378347397 -13.015907288
-v -21.150512695 13.079589844 -15.657785416
-v -20.648149490 13.604285240 -18.398828506
-v -21.739830017 12.555942535 -19.260852814
-v -19.804990768 14.065087318 -17.733043671
-v -18.818231583 14.365905762 -16.953866959
-v -20.036491394 13.380407333 -15.074891090
-v -18.906053543 13.467247963 -14.483409882
-v -19.661554337 12.465188980 -12.642681122
-v -19.782285690 12.272994041 -12.216917038
-v -18.435110092 12.378347397 -12.267487526
-v -20.018917084 12.267632484 -10.469030380
-v -19.930683136 12.267632484 -11.238502502
-v -18.541450500 12.186153412 -11.892474174
-v -18.666357040 12.180791855 -11.067559242
-v -18.743097305 12.180791855 -10.464576721
-v -17.325042725 11.885335922 -11.574416161
-v -17.232809067 12.077530861 -11.899678230
-v -17.485801697 11.879976273 -10.460188866
-v -17.420392990 11.879976273 -10.899098396
-v -17.816932678 14.452745438 -16.163211823
-v -17.286243439 15.370079041 -18.563083649
-v -18.112966537 15.069261551 -19.510362625
-v -18.819381714 14.608458519 -20.319784164
-v -19.734010696 13.560115814 -21.367786407
-v -17.351280212 14.565679550 -23.084133148
-v -15.823597908 14.065088272 -14.589212418
-v -14.777286530 15.069261551 -15.688269615
-v -14.978754044 13.603350639 -13.922099113
-v -14.069461823 14.607523918 -14.877229691
-v -13.895698547 12.553890228 -13.066884995
-v -15.701837540 12.617853165 -12.806856155
-v -16.655639648 13.079589844 -13.305916786
-v -14.479099274 11.568391800 -12.167078018
-v -16.203424454 11.615793228 -11.584771156
-v -14.883792877 10.566333771 -11.181069374
-v -14.948463440 10.374137878 -10.953004837
-v -16.411479950 11.419174194 -10.456439018
-v -16.355749130 11.419174194 -10.755152702
-v -15.020498276 10.372154236 -10.451583862
-v -16.283580780 11.423599243 -11.302101135
-v -17.769660950 13.380407333 -13.888811111
-v -16.810358047 14.365905762 -15.368389130
-v -16.447336197 15.456918716 -17.601848602
-v -14.820383072 16.462482452 -18.773788452
-v -15.604010582 15.370079041 -16.635547638
-v -13.534363747 16.074825287 -16.583580017
-v -14.170981407 16.375642776 -17.667797089
-v -12.989304543 15.613087654 -15.655296326
-v -12.030590057 16.410091400 -16.125663757
-v -12.431182861 16.871826172 -17.124828339
-v -10.526067734 16.404731750 -16.284149170
-v -12.290560722 14.563627243 -14.465271950
-v -10.530882835 15.363566399 -14.904547691
-v -11.517045021 15.360629082 -14.844776154
-v -13.162057877 13.558062553 -13.837507248
-v -15.466381073 16.375642776 -19.873981476
-v -12.899066925 17.172643661 -18.291830063
-v -13.376347542 17.259483337 -19.482267380
-v -10.531611443 16.881301880 -17.360651016
-v -10.527222633 17.182119370 -18.617944717
-v -13.851127625 17.172643661 -20.666463852
-v -14.319011688 16.871826172 -21.833465576
-v -10.518292427 17.182119370 -21.176307678
-v -10.522746086 17.268959045 -19.900487900
-v -16.102998734 16.074825287 -20.958198547
-v -16.646970749 15.614022255 -21.884632111
-v -14.718805313 16.411024094 -22.830635071
-v -15.236440659 15.362680435 -24.121723175
-v -10.513904572 16.881301880 -22.433601379
-v -10.496080399 15.356592178 -24.899217606
-v -10.510154724 16.420501709 -23.507926941
-v -24.705308914 10.238341331 -11.884346008
-v -24.409217834 10.244254112 -13.426673889
-v -24.409217834 10.382987022 -13.426673889
-v -24.705308914 10.377074242 -11.884346008
-v -24.881961823 10.021820068 -11.907939911
-v -24.618160248 10.027732849 -13.481369019
-v -25.015216827 10.021820068 -10.486470222
-v -24.800256729 10.238341331 -10.656588554
-v -24.800256729 10.377074242 -10.656588554
-v -24.213760376 9.214471817 -10.483672142
-v -22.980632782 10.067962646 -10.479368210
-v -22.016145706 10.299831390 -10.940568924
-v -22.863159180 9.936516762 -10.943525314
-v -22.099105835 10.431277275 -10.476290703
-v -21.872377396 9.974886894 -11.142833710
-v -22.702497482 9.658271790 -11.145730972
-v -24.015892029 9.111795425 -10.947548866
-v -23.017295837 8.588453293 -10.944063187
-v -22.329887390 9.008879662 -10.941663742
-v -22.333377838 9.008878708 -9.941633224
-v -23.712486267 8.947604179 -11.149256706
-v -23.020786285 8.588453293 -9.944032669
-v -22.474920273 9.262398720 -11.144936562
-v -23.273221970 8.724876404 -11.147723198
-v -21.069496155 10.667971611 -10.472697258
-v -20.950813293 10.179689407 -11.139616966
-v -21.700632095 9.584787369 -11.142234802
-v -21.026851654 10.536526680 -10.937115669
-v -20.017311096 10.604856491 -10.933591843
-v -20.018817902 10.736302376 -10.469030380
-v -20.016607285 10.240594864 -11.136356354
-v -21.582313538 9.314430237 -10.939054489
-v -21.585803986 9.314430237 -9.939023972
-v -20.866559982 9.780580521 -11.139323235
-v -20.811500549 9.499877930 -9.936321259
-v -20.808010101 9.499877930 -10.936351776
-v -20.016611099 9.853870392 -11.136356354
-v -20.017320633 9.562047958 -10.933591843
-v -20.020811081 9.562047958 -9.933561325
-v -24.234794617 10.436448097 -14.041786194
-v -24.234794617 10.575181007 -14.041786194
-v -24.441345215 10.219926834 -14.104910851
-v -23.143491745 11.577239990 -16.700647354
-v -23.143491745 11.438507080 -16.700645447
-v -23.334888458 11.221985817 -16.800722122
-v -23.334865570 6.547707558 -16.800710678
-v -24.881961823 5.349424362 -11.907939911
-v -24.213853836 5.349429607 -10.483672142
-v -24.618135452 5.353454590 -13.481361389
-v -24.409112930 5.109346390 -13.426637650
-v -24.705408096 5.105315208 -11.884212494
-v -24.705408096 4.993570805 -11.884212494
-v -24.401924133 4.997604370 -13.424758911
-v -24.014850616 4.993570805 -10.947545052
-v -24.799518585 4.993570805 -10.676690102
-v -24.799518585 5.105315685 -10.676690102
-v -24.132406235 5.105320454 -10.674362183
-v -24.132406235 4.993570805 -10.674362183
-v -25.015216827 5.349424362 -10.486470222
-v -23.715438843 4.993570805 -11.149267197
-v -23.272678375 4.993570805 -11.147721291
-v -23.017295837 4.993570805 -10.944065094
-v -23.020786285 4.993570805 -9.944033623
-v -17.017330170 4.993570805 -10.923122406
-v -16.716798782 4.993570328 -11.124839783
-v -17.020822525 4.993570805 -9.923090935
-v -16.287294388 4.993570328 -11.123340607
-v -24.220779419 4.993119717 -14.034821510
-v -22.850515366 6.193674564 -17.203773499
-v -22.850515366 6.393674374 -17.203773499
-v -23.128929138 6.193674564 -16.695180893
-v -22.555257797 6.593675137 -17.698482513
-v -23.143390656 6.303598881 -16.700599670
-v -23.386489868 5.993675709 -16.180047989
-v -23.128929138 5.993675232 -16.695180893
-v -23.386489868 5.793675423 -16.180047989
-v -23.624713898 5.793674946 -15.655849457
-v -24.441320419 5.545648098 -14.104903221
-v -24.220834732 5.193675995 -14.034641266
-v -24.043090820 5.393675804 -14.579807281
-v -24.234685898 5.301539421 -14.041759491
-v -23.624713898 5.593675613 -15.655849457
-v -23.844877243 5.593675137 -15.119219780
-v -23.844877243 5.393675804 -15.119219780
-v -24.043090820 5.193675041 -14.579807281
-v -15.017359734 5.192920685 -11.451532364
-v -15.017359734 5.392920494 -11.451531410
-v -15.085744858 4.993018150 -11.241790771
-v -15.087582588 5.191360474 -11.242877960
-v -15.156508446 4.997604847 -11.007375717
-v -14.941089630 5.592920303 -11.659092903
-v -14.941089630 5.392920494 -11.659092903
-v -18.974433899 10.667971611 -10.465384483
-v -19.084438324 10.198325157 -11.133102417
-v -19.013818741 10.536526680 -10.930088997
-v -18.150232315 10.012554169 -11.129841805
-v -19.170413971 9.790654182 -11.133402824
-v -18.338197708 9.585399628 -11.130497932
-v -17.944824219 10.431277275 -10.461791039
-v -18.024524689 10.299831390 -10.926635742
-v -19.235937119 9.499877930 -9.930821419
-v -19.232446671 9.499877930 -10.930851936
-v -18.461633682 9.314430237 -9.928118706
-v -17.710567474 9.008879662 -10.925539970
-v -18.458143234 9.314430237 -10.928149223
-v -17.537889481 9.273237228 -11.127704620
-v -17.329214096 9.673920631 -11.126976013
-v -17.714057922 9.008878708 -9.925509453
-v -14.667607307 6.192389011 -12.266146660
-v -14.558470726 6.192919731 -12.461206436
-v -14.764708519 5.992919922 -12.067286491
-v -14.665601730 5.992919922 -12.265502930
-v -14.444860458 6.392919540 -12.651563644
-v -14.444860458 6.592919350 -12.651563644
-v -14.558470726 6.392919540 -12.461206436
-v -22.555257797 6.393674374 -17.698482513
-v -14.856374741 5.592920303 -11.865580559
-v -14.856374741 5.792920113 -11.865581512
-v -14.764708519 5.792920113 -12.067286491
-v -21.562465668 7.193674088 -19.112043381
-v -21.562503815 6.993996620 -19.111997604
-v -14.062846184 6.992918968 -13.195486069
-v -21.209297180 7.193996429 -19.543546677
-v -14.062846184 7.192919254 -13.195486069
-v -21.919630051 6.993674278 -18.641155243
-v -21.919630051 6.793996811 -18.641153336
-v -14.200278282 6.792919159 -13.014291763
-v -21.209291458 7.393673897 -19.543550491
-v -13.926948547 7.192919254 -13.361523628
-v -22.237232208 6.793673992 -18.188739777
-v -22.237232208 6.593673706 -18.188739777
-v -14.322487831 6.592919350 -12.840208054
-v -14.322487831 6.792919636 -12.840208054
-v -14.200278282 6.992919445 -13.014291763
-v -20.829801559 7.593673706 -19.974193573
-v -17.351268768 9.542943001 -23.084110260
-v -15.236431122 10.339944839 -24.121700287
-v -17.351280212 14.217220306 -23.084133148
-v -19.734010696 13.211657524 -21.367786407
-v -19.591949463 13.566911697 -21.205101013
-v -21.570287704 12.562738419 -19.127052307
-v -19.591949463 13.428178787 -21.205101013
-v -21.570287704 12.424005508 -19.127052307
-v -21.739830017 12.207484245 -19.260852814
-v -19.733995438 8.537379265 -21.367767334
-v -21.739810944 7.533205509 -19.260837555
-v -21.570194244 7.289097309 -19.126987457
-v -20.829807281 7.393996716 -19.974185944
-v -19.591871262 8.293270111 -21.205020905
-v -20.434761047 7.793673515 -20.390405655
-v -19.997489929 7.793673515 -20.817251205
-v -19.997489929 7.993673325 -20.817251205
-v -20.434764862 7.593996525 -20.390401840
-v -19.580345154 8.193674088 -21.194742203
-v -19.127519608 8.393672943 -21.574895859
-v -19.127519608 8.193674088 -21.574895859
-v -19.580345154 7.993673325 -21.194742203
-v -18.677282333 8.593671799 -21.925027847
-v -17.241806030 9.298833847 -22.897821426
-v -18.213668823 8.798833847 -22.258960724
-v -17.734512329 8.798833847 -22.577890396
-v -17.734512329 8.998833656 -22.577890396
-v -18.213428497 8.594318390 -22.259124756
-v -18.677282333 8.393672943 -21.925027847
-v -12.399082184 14.570600510 -14.650138855
-v -11.596796989 15.228869438 -15.043756485
-v -12.399082184 14.431867599 -14.650139809
-v -11.596796989 15.367601395 -15.043754578
-v -12.290560722 14.165383339 -14.465271950
-v -13.302993774 13.565035820 -13.999031067
-v -13.302995682 13.426303864 -13.999031067
-v -13.162057877 13.159818649 -13.837507248
-v -11.198131561 14.658274651 -17.216905594
-v -11.201657295 13.947606087 -16.206914902
-v -10.995925903 14.936519623 -17.056241989
-v -10.999949455 14.111796379 -15.903511047
-v -10.531768799 15.067964554 -16.938766479
-v -10.536072731 14.214473724 -15.705640793
-v -11.517045021 14.962385178 -14.844776154
-v -10.701003075 15.363566399 -15.119117737
-v -10.701003075 15.224834442 -15.119117737
-v -10.538870811 14.971858978 -14.904184341
-v -14.669025421 11.575365067 -12.266479492
-v -14.063923836 12.560862541 -13.199748993
-v -14.669026375 11.436632156 -12.266481400
-v -13.895698547 12.155645370 -13.066884995
-v -14.479099274 11.170148849 -12.167078018
-v -14.063923836 12.422130585 -13.199749947
-v -15.088773727 10.573307037 -11.243801117
-v -12.290559769 9.494309425 -14.465270042
-v -10.540185928 10.300786018 -14.904186249
-v -10.537387848 10.350753784 -15.705550194
-v -13.162055969 8.488745689 -13.837506294
-v -11.517044067 10.291310310 -14.844774246
-v -11.200123787 13.724878311 -16.646181107
-v -10.996463776 13.588455200 -16.902107239
-v -10.997779846 9.993570328 -16.902109146
-v -11.001261711 9.993570328 -15.904552460
-v -11.201436996 9.993570328 -16.646726608
-v -11.202982903 9.993570328 -16.203966141
-v -17.065053940 10.068697929 -10.458720207
-v -17.179199219 9.937252045 -10.923685074
-v -15.821536064 9.216087341 -10.454379082
-v -16.286827087 8.970824242 -11.123337746
-v -16.013319016 9.113410950 -10.919615746
-v -15.020498276 10.023696899 -10.451583862
-v -15.155863762 10.381111145 -11.007209778
-v -15.235881805 10.378950119 -10.623204231
-v -15.155864716 10.242379189 -11.007210732
-v -15.235881805 10.240218163 -10.623204231
-v -14.948463440 10.025856972 -10.953004837
-v -14.883792877 10.168089867 -11.181069374
-v -15.088775635 10.434574127 -11.243801117
-v -14.479097366 6.499074459 -12.167078018
-v -13.895696640 7.484572411 -13.066883087
-v -11.808470726 9.598077774 -14.950302124
-v -12.008268356 9.598077774 -14.856611252
-v -11.808470726 9.798078537 -14.950302124
-v -12.399416924 9.300163269 -14.650714874
-v -11.602720261 9.798077583 -15.037611008
-v -11.602720261 9.998077393 -15.037611008
-v -11.597042084 10.097164154 -15.044374466
-v -10.730405807 10.106639862 -15.119886398
-v -10.730405807 9.993570328 -15.119886398
-v -10.728077888 10.106645584 -15.786997795
-v -16.717163086 8.744661331 -11.124839783
-v -17.017330170 8.588453293 -10.923120499
-v -17.020820618 8.588453293 -9.923089981
-v -14.883790970 5.497014999 -11.181069374
-v -14.064443588 7.290426254 -13.200163841
-v -14.669614792 6.304928303 -12.266791344
-v -13.303430557 8.294599533 -13.999534607
-v -12.774266243 8.798078537 -14.406379700
-v -12.589893341 8.798078537 -14.529100418
-v -12.589893341 8.998079300 -14.529100418
-v -12.774162292 8.592917442 -14.406455994
-v -12.952661514 8.592917442 -14.277889252
-v -12.952661514 8.392917633 -14.277889252
-v -13.125906944 8.392917633 -14.143162727
-v -12.399484634 9.198078156 -14.645851135
-v -12.205717087 9.398078918 -14.754933357
-v -12.008268356 9.398078918 -14.856611252
-v -12.205718040 9.198078156 -14.754934311
-v -12.399484634 8.998079300 -14.645851135
-v -16.014513016 4.993570328 -10.919622421
-v -14.948462486 5.354783058 -10.953003883
-v -15.020523071 5.349418640 -10.451583862
-v -15.821298599 5.349417686 -10.454379082
-v -15.235923767 4.993570328 -10.643310547
-v -15.900829315 5.105309486 -10.645630836
-v -15.900829315 4.993570328 -10.645630836
-v -15.235923767 5.105309963 -10.643310547
-v -15.156508446 5.110674858 -11.007375717
-v -15.089410782 5.302869320 -11.243998528
-v -13.926948547 7.392919064 -13.361523628
-v -13.780925751 7.592919350 -13.527230263
-v -13.628918648 7.592919350 -13.687385559
-v -13.628918648 7.792919159 -13.687385559
-v -13.780925751 7.392919064 -13.527230263
-v -13.125906944 8.192918777 -14.143162727
-v -13.300148010 8.192917824 -13.996884346
-v -13.300148010 7.992918491 -13.996884346
-v -13.460660934 7.992918968 -13.851630211
-v -13.460660934 7.792919159 -13.851630211
-v -10.728077888 9.993570328 -15.786997795
-v -11.195234299 14.974888802 -18.047021866
-v -10.992969513 15.299833298 -17.903255463
-v -10.528691292 15.431279182 -17.820295334
-v -11.192017555 15.179690361 -18.968587875
-v -10.989516258 15.536527634 -18.892549515
-v -11.194635391 14.584789276 -18.218769073
-v -11.191723824 14.780582428 -19.052841187
-v -10.525097847 15.667972565 -18.849905014
-v -11.197337151 14.262400627 -17.444480896
-v -10.995380402 14.010205269 -17.589515686
-v -9.994033813 14.008880615 -17.586023331
-v -9.996433258 13.588454247 -16.898616791
-v -10.992771149 14.315756798 -18.337091446
-v -10.988752365 14.499879837 -19.111391068
-v -9.988721848 14.499879837 -19.107900620
-v -9.991424561 14.314432144 -18.333597183
-v -11.188756943 15.240598679 -19.902793884
-v -10.985992432 15.604858398 -19.902090073
-v -10.521430016 15.736305237 -19.900583267
-v -11.185503006 15.198328018 -20.834964752
-v -10.982489586 15.536527634 -20.905582428
-v -10.517784119 15.667972565 -20.944969177
-v -11.188756943 14.853872299 -19.902790070
-v -10.985992432 14.562049866 -19.902080536
-v -9.985961914 14.562049866 -19.898590088
-v -11.185803413 14.790656090 -20.748987198
-v -10.983252525 14.499879837 -20.686954498
-v -9.983222008 14.499879837 -20.683464050
-v -17.241868973 14.433742523 -22.897914886
-v -17.241868973 14.572474480 -22.897914886
-v -15.156010628 15.369476318 -23.921278000
-v -15.156010628 15.230743408 -23.921278000
-v -15.236440659 15.014222145 -24.121723175
-v -10.514191628 15.431279182 -21.974576950
-v -10.976085663 14.937254906 -22.740201950
-v -10.979036331 15.299833298 -21.894876480
-v -10.511120796 15.068699837 -22.854347229
-v -10.506779671 14.216089249 -24.097867966
-v -11.175738335 13.970825195 -23.632574081
-v -11.179376602 14.673923492 -22.590187073
-v -10.972016335 14.113412857 -23.906082153
-v -11.180105209 14.273239136 -22.381509781
-v -11.177240372 13.744663239 -23.202238083
-v -10.977940559 14.008881569 -22.208833694
-v -10.975521088 13.588455200 -22.902070999
-v -9.975490570 13.588454247 -22.898580551
-v -11.182898521 14.585401535 -21.581203461
-v -10.980549812 14.314432144 -21.461257935
-v -9.980519295 14.314432144 -21.457767487
-v -11.182242393 15.012556076 -21.769170761
-v -9.977910042 14.008880615 -22.205343246
-v -10.496080399 15.008399010 -24.899217606
-v -10.667700768 15.363653183 -24.683498383
-v -10.667700768 15.224921227 -24.683498383
-v -10.503984451 10.349420547 -24.898880005
-v -17.239669800 9.198833466 -22.881307602
-v -17.239669800 8.998833656 -22.881307602
-v -16.735456467 9.198511124 -23.165142059
-v -16.736104965 9.398834229 -23.164793015
-v -15.169013023 9.998833656 -23.899423599
-v -15.703571320 9.598510742 -23.672592163
-v -15.169013023 9.798833847 -23.899423599
-v -15.703723907 9.798833847 -23.672523499
-v -16.222967148 9.598834038 -23.429035187
-v -16.222305298 9.398511887 -23.429361343
-v -15.155962944 10.095834732 -23.921176910
-v -11.177239418 9.993570328 -23.202602386
-v -11.175741196 9.993570328 -23.632106781
-v -10.972023010 9.993570328 -23.904890060
-v -10.687541962 9.980059624 -24.683450699
-v -10.975522995 9.993570328 -22.902070999
-v -9.996434212 9.993570328 -16.898616791
-v -9.975491524 9.993570328 -22.898578644
-v -10.506779671 10.349419594 -24.098104477
-v -10.695711136 10.105312347 -24.683479309
-v -10.698031425 10.105311394 -24.018569946
-v -10.698031425 9.993570328 -24.018569946
-v 18.151639938 16.422849655 -39.982330322
-v 20.731946945 15.374711037 -40.315002441
-v 18.820676804 15.374711037 -38.775352478
-v 19.747991562 16.422849655 -41.182910919
-v 17.629753113 16.884586334 -40.923835754
-v 18.982986450 16.884586334 -41.973312378
-v 17.020200729 17.185401917 -42.023498535
-v 18.176250458 17.185401917 -42.818588257
-v 22.158515930 16.422847748 -44.359470367
-v 19.015058517 17.272243500 -45.918804169
-v 20.193902969 17.185401917 -45.329006195
-v 21.180492401 16.884586334 -44.811431885
-v 23.330167770 15.374711037 -43.793838501
-v 22.288990021 16.884586334 -48.230606079
-v 23.356256485 16.422849655 -48.090103149
-v 24.724452972 15.374711037 -47.909973145
-v 21.132287979 17.185401917 -49.331924438
-v 22.389589310 16.884586334 -49.331924438
-v 23.463920593 16.423784256 -49.331924438
-v 24.854907990 15.376764297 -49.331924438
-v 21.042442322 17.185401917 -48.394718170
-v 18.505952835 17.185401917 -48.728652954
-v 19.770866394 17.272243500 -48.562126160
-v 19.856460571 17.272243500 -49.331924438
-v 18.573909760 17.185401917 -49.331924438
-v 17.286430359 17.272243500 -43.806549072
-v 16.426416397 17.185401917 -44.773418427
-v 17.777982712 17.185401917 -46.515922546
-v 16.398406982 17.272243500 -43.145240784
-v 16.772066116 16.884586334 -47.060039520
-v 17.259407043 16.884586334 -48.892765045
-v 15.817419052 16.423784256 -47.575325012
-v 15.601982117 16.884586334 -45.628391266
-v 16.194267273 16.423784256 -49.032993317
-v 16.240131378 16.422849655 -49.331924438
-v 17.316606522 16.884586334 -49.331924438
-v 14.912005424 16.423784256 -46.542243958
-v 13.975111961 15.376764297 -47.516983032
-v 14.464689255 15.376764297 -48.408912659
-v 14.649476051 16.423784256 -46.300395966
-v 15.170322418 16.884586334 -45.360763550
-v 14.860130310 15.374711037 -49.331924438
-v 6.673092842 15.374712944 -32.725341797
-v 17.220638275 16.422851563 -39.476814270
-v 17.890140533 15.381685257 -38.270545959
-v 5.997828484 16.423786163 -33.941822052
-v 16.689041138 16.884586334 -40.382247925
-v 5.476475239 16.884588242 -34.881168365
-v 16.078891754 17.185401917 -41.481575012
-v 4.866324902 17.185403824 -35.980499268
-v 15.465692520 17.272245407 -42.638774872
-v 4.247186661 17.272245407 -37.096027374
-v 14.837350845 17.185401917 -43.718509674
-v 15.779872894 17.185401917 -44.261104584
-v 3.624784470 17.185403824 -38.217433929
-v 14.227202415 16.884586334 -44.817840576
-v 3.014636040 16.884588242 -39.316761017
-v 13.715051651 16.423786163 -45.792980194
-v 3.933006287 17.185401917 -35.473697662
-v 3.317041874 17.185401917 -35.048015594
-v 2.558747768 17.272243500 -35.967140198
-v 4.542557240 16.884586334 -34.374034882
-v 4.134359837 16.884586334 -33.951190948
-v 3.314471245 17.272243500 -36.589561462
-v 2.492240429 16.422851563 -40.257987976
-v 13.039787292 15.374712944 -47.009456635
-v 1.822737694 15.381685257 -41.464256287
-v 1.726429939 17.185401917 -36.979194641
-v 0.669525146 17.272243500 -33.767730713
-v -0.472972870 17.185401917 -34.307502747
-v 0.819322586 16.884586334 -37.894798279
-v 2.692678452 17.185401917 -37.711303711
-v 1.841757774 17.185401917 -33.227012634
-v 3.769361496 16.423784256 -32.242866516
-v 5.248190880 15.376764297 -31.325889587
-v 4.852749825 15.374711037 -30.402873993
-v 3.518613338 16.423784256 -30.701808929
-v 2.890336990 16.884586334 -32.690055847
-v 3.472748280 16.422849655 -30.402873993
-v 2.453473568 16.884586334 -30.842037201
-v 4.828486443 16.423784256 -33.241661072
-v 5.737767696 15.376764297 -32.217819214
-v 5.063403130 16.423784256 -33.434406281
-v 2.396272659 16.884586334 -30.402873993
-v 1.206927299 17.185401917 -31.006147385
-v 1.138970375 17.185401917 -30.402873993
-v -0.057985306 17.272243500 -31.172676086
-v -0.143579483 17.272243500 -30.402873993
-v -1.329563141 17.185401917 -31.340084076
-v -1.419406891 17.185401917 -30.402873993
-v -2.576108932 16.884586334 -31.504192352
-v -1.386344910 16.884586334 -34.814693451
-v -2.676710129 16.884586334 -30.402873993
-v -3.751039505 16.423784256 -30.402873993
-v -3.643377304 16.422849655 -31.644699097
-v -5.011572838 15.374711037 -31.824825287
-v -5.142028809 15.376764297 -30.402873993
-v -2.529266357 16.422849655 -35.398258209
-v -3.617288589 15.374711037 -35.940959930
-v -1.115442276 15.374711037 -39.509117126
-v -0.062291145 16.422849655 -38.602146149
-v 1.561239243 16.422849655 -39.752471924
-v 0.892202377 15.374711037 -40.959449768
-v 2.083126068 16.884586334 -38.810966492
-v 18.820676804 15.026430130 -38.775352478
-v 18.866195679 15.242951393 -39.045677185
-v 20.609476089 15.242951393 -40.444480896
-v 18.866195679 15.381684303 -39.045677185
-v 20.609476089 15.381684303 -40.444480896
-v 18.432121277 14.219081879 -39.476325989
-v 18.284229279 14.662881851 -41.119606018
-v 18.560924530 13.729486465 -40.620433807
-v 18.173898697 14.267008781 -41.318649292
-v 17.834285736 15.072572708 -40.554851532
-v 18.743295670 14.116405487 -39.873195648
-v 18.184436798 14.941126823 -40.881404877
-v 18.773887634 13.952214241 -40.236244202
-v 18.259162903 13.593063354 -40.746593475
-v 17.406908035 15.435887337 -41.325855255
-v 17.773792267 15.304441452 -41.622222900
-v 16.470603943 15.435888290 -40.828010559
-v 15.970950127 15.672584534 -41.728263855
-v 15.549583435 15.541138649 -41.530700684
-v 16.083345413 14.277850151 -40.150325775
-v 16.690469742 13.975436211 -39.056442261
-v 16.184612274 14.678532600 -39.967868805
-v 15.694966316 14.590011597 -40.850086212
-v 15.786183357 15.017166138 -40.685733795
-v 17.000125885 14.116407394 -38.917198181
-v 16.440719604 14.941128731 -39.925106049
-v 17.890331268 15.026432037 -38.270202637
-v 17.636901855 15.381685257 -38.374713898
-v 17.636901855 15.242953300 -38.374713898
-v 17.501281738 14.220699310 -38.970996857
-v 16.897548676 15.073310852 -40.058773041
-v 17.384096146 13.593065262 -40.272407532
-v 16.515522003 13.593065262 -39.790332794
-v 16.181930542 14.013491631 -40.391376495
-v 17.881778717 14.979496956 -41.845649719
-v 17.050506592 14.013492584 -40.873451233
-v 17.925899506 14.013489723 -41.347816467
-v 16.688812256 14.319040298 -41.516834259
-v 16.481632233 13.749273300 -39.432716370
-v 15.819142342 14.319043159 -41.045024872
-v 16.029674530 15.304443359 -40.665699005
-v 15.332825661 15.202938080 -41.502567291
-v 15.443385124 14.504489899 -41.722049713
-v 15.291101456 14.795266151 -41.577743530
-v 20.731946945 15.026430130 -40.315002441
-v 20.731946945 10.354034424 -40.315002441
-v 18.775318146 9.998181343 -40.233661652
-v 18.742792130 9.998181343 -39.874103546
-v 18.820676804 10.354034424 -38.775352478
-v 16.999622345 9.998181343 -38.918109894
-v 16.690242767 9.998181343 -39.056854248
-v 18.432167053 10.354040146 -39.476242065
-v 17.501123428 10.354027748 -38.971282959
-v 17.890331268 10.354028702 -38.270202637
-v 20.609426498 9.998181343 -40.444320679
-v 18.883455276 9.998181343 -39.056011200
-v 18.560031891 9.998181343 -39.639484406
-v 18.883455276 10.109926224 -39.056011200
-v 20.609426498 10.109925270 -40.444320679
-v 18.560031891 10.109930038 -39.639484406
-v 18.259164810 9.998181343 -40.746593475
-v 18.560661316 9.998181343 -40.620910645
-v 16.515522003 9.998181343 -39.790332794
-v 17.384096146 9.998181343 -40.272407532
-v 17.295192719 10.109919548 -38.948501587
-v 17.295192719 9.998066902 -38.948501587
-v 17.619159698 10.109919548 -38.365627289
-v 17.619159698 9.998067856 -38.365627289
-v 16.481809616 9.998181343 -39.432395935
-v 13.603816986 9.998181343 -45.036472321
-v 6.109062672 9.998181343 -34.698329926
-v 6.673092842 15.026519775 -32.725341797
-v 6.717516899 15.243041992 -32.997402191
-v 6.717516899 15.381774902 -32.997402191
-v 6.672841549 10.354034424 -32.725624084
-v 6.734807014 10.109926224 -33.007129669
-v 6.627419472 9.998181343 -34.183063507
-v 6.595716476 9.998181343 -33.821502686
-v 6.734807014 9.998067856 -33.007129669
-v 6.412554264 9.998181343 -34.570194244
-v 23.172214508 15.242951393 -43.876388550
-v 23.330167770 15.026430130 -43.793838501
-v 23.172214508 15.381684303 -43.876388550
-v 23.330167770 10.354034424 -43.793838501
-v 23.172218323 10.109925270 -43.876220703
-v 23.172218323 9.998180389 -43.876220703
-v 15.382289886 9.998180389 -46.354846954
-v 24.547792435 15.242951393 -47.933521271
-v 24.724452972 15.026430130 -47.909973145
-v 24.547792435 15.381684303 -47.933521271
-v 23.586244583 13.975434303 -48.664596558
-v 22.335172653 14.277847290 -48.664596558
-v 23.155904770 13.749271393 -48.664596558
-v 24.053865433 14.220697403 -49.331924438
-v 22.694572449 14.941862106 -48.867359161
-v 23.860460281 14.118021011 -48.867359161
-v 22.543849945 14.678530693 -48.664596558
-v 22.810340881 15.073307991 -49.331924438
-v 24.638927460 15.383560181 -49.161056519
-v 24.638927460 15.244828224 -49.161056519
-v 24.854907990 15.028306961 -49.331924438
-v 21.930564880 15.435887337 -49.331924438
-v 20.900951385 15.672581673 -49.331924438
-v 22.856441498 13.593063354 -49.867401123
-v 22.856443405 13.593063354 -48.867359161
-v 22.163200378 14.013489723 -48.867359161
-v 22.163200378 14.013488770 -49.867397308
-v 21.415620804 14.319040298 -48.867359161
-v 21.415620804 14.319040298 -49.867397308
-v 21.534858704 14.590009689 -48.664596558
-v 21.722827911 15.017164230 -48.664596558
-v 20.788616180 15.202935219 -48.664596558
-v 21.849243164 15.304441452 -48.867359161
-v 20.859943390 15.541136742 -48.867359161
-v 19.856441498 15.245204926 -48.664596558
-v 19.856443405 15.609466553 -48.867359161
-v 19.856559753 15.740912437 -49.331924438
-v 20.641313553 14.504487991 -49.867401123
-v 20.641313553 14.504487991 -48.867359161
-v 20.702638626 14.795264244 -48.664596558
-v 19.856433868 14.566658020 -48.867359161
-v 19.856433868 14.566658020 -49.867397308
-v 19.856437683 14.858480453 -48.664596558
-v 19.065740585 14.504487991 -49.867397308
-v 19.065740585 14.504487991 -48.867359161
-v 19.006483078 14.785190582 -48.664596558
-v 18.922229767 15.184299469 -48.664596558
-v 23.156269073 9.998180389 -48.664596558
-v 22.856441498 9.998180389 -48.867359161
-v 16.856441498 9.998180389 -48.867359161
-v 16.600349426 9.998180389 -48.664596558
-v 16.856441498 9.998178482 -49.867397308
-v 22.856449127 9.998178482 -49.867393494
-v 24.547851563 10.109925270 -47.933364868
-v 24.547851563 9.998180389 -47.933364868
-v 24.724452972 10.354034424 -47.909973145
-v 23.585773468 9.998180389 -48.664596558
-v 23.859268188 9.998180389 -48.867359161
-v 24.854885101 10.354028702 -49.331924438
-v 24.054103851 10.354027748 -49.331924438
-v 24.638816833 10.109920502 -49.140953064
-v 24.638816833 9.998180389 -49.140953064
-v 23.973905563 10.109919548 -49.140953064
-v 23.973905563 9.998180389 -49.140953064
-v 15.350305557 9.998180389 -45.994308472
-v 15.059673309 14.566659927 -42.413398743
-v 16.311960220 14.504489899 -42.204124451
-v 15.930086136 14.566658020 -42.885616302
-v 15.549570084 14.504487991 -43.572086334
-v 14.678782463 14.504489899 -43.099658966
-v 16.804738998 14.566658020 -43.370445251
-v 17.188076019 14.504487991 -42.678886414
-v 16.907741547 15.672581673 -42.226379395
-v 17.294172287 15.541136742 -42.487483978
-v 17.434993744 15.184299469 -42.651672363
-v 16.398359299 15.740912437 -43.145328522
-v 16.804733276 15.609466553 -43.370452881
-v 16.982080460 14.858480453 -43.468750000
-v 17.394145966 14.785190582 -42.725360870
-v 16.982078552 15.245204926 -43.468750000
-v 17.798515320 14.589397430 -41.995861053
-v 17.563465118 14.319040298 -42.001663208
-v 16.571832657 14.795264244 -44.208854675
-v 16.318229675 15.541136742 -44.248130798
-v 16.530149460 15.202935219 -44.284049988
-v 15.892028809 15.672581673 -44.058773041
-v 15.392861366 15.435887337 -44.959293365
-v 16.077236176 15.017164230 -45.101131439
-v 15.838605881 15.304441452 -45.113391876
-v 15.057744980 15.609468460 -42.416015625
-v 15.464122772 15.740915298 -42.641433716
-v 14.572686195 15.541138649 -43.290817261
-v 14.954242706 15.672584534 -43.560108185
-v 14.092594147 15.304443359 -44.155822754
-v 14.454587936 15.435888290 -44.460357666
-v 14.880453110 14.858482361 -42.317623138
-v 14.880453110 15.245207787 -42.317619324
-v 14.427095413 15.184301376 -43.134456635
-v 14.467983246 14.785192490 -43.060787201
-v 14.303024292 14.319043159 -43.776679993
-v 14.063219070 14.589399338 -43.790069580
-v 15.171600342 14.319043159 -44.258758545
-v 16.424221039 14.504487991 -44.056915283
-v 14.808811188 14.013492584 -44.912406921
-v 16.048828125 14.319040298 -44.734138489
-v 16.168361664 14.590009689 -44.936729431
-v 13.682369232 14.941864014 -44.894939423
-v 13.979873657 14.979497910 -43.940235138
-v 13.577028275 14.662883759 -44.666057587
-v 13.687467575 14.267010689 -44.467075348
-v 13.940235138 14.013491631 -44.430332184
-v 13.603816032 13.593065262 -45.036472321
-v 14.966337204 15.073307991 -45.728763580
-v 15.173831940 13.975434303 -46.730911255
-v 15.780364990 14.277847290 -45.636699677
-v 15.382465363 13.749271393 -46.354526520
-v 15.686395645 14.013489723 -45.387985229
-v 15.350305557 13.593063354 -45.994308472
-v 14.863548279 14.118021011 -46.872444153
-v 15.679196358 14.678530693 -45.819213867
-v 14.363464355 14.220697403 -46.816375732
-v 15.428781509 14.941862106 -45.852733612
-v 14.475652695 13.593063354 -45.509483337
-v 17.776258469 15.435887337 -49.331924438
-v 16.894725800 15.072572708 -49.331924438
-v 18.846897125 15.541136742 -48.867359161
-v 18.805873871 15.672581673 -49.331924438
-v 17.857597351 15.304441452 -48.867359161
-v 18.000658035 14.979496956 -48.664596558
-v 18.172405243 14.589397430 -48.664596558
-v 18.291433334 14.319040298 -48.867359161
-v 18.291431427 14.319040298 -49.867397308
-v 17.398113251 14.267008781 -48.664596558
-v 16.856441498 13.593063354 -48.867359161
-v 17.543853760 14.013489723 -48.867359161
-v 17.170534134 14.662881851 -48.664596558
-v 17.543853760 14.013488770 -49.867397308
-v 15.661590576 14.219081879 -49.331924438
-v 17.010580063 14.941126823 -48.867359161
-v 15.857839584 14.116405487 -48.867359161
-v 16.160539627 13.952214241 -48.664596558
-v 16.599805832 13.729486465 -48.664596558
-v 16.856441498 13.593063354 -49.867397308
-v 13.975111961 15.028306961 -47.516983032
-v 14.229267120 15.383560181 -47.410919189
-v 14.229267120 15.244828224 -47.410919189
-v 14.711436272 15.244828224 -48.280220032
-v 14.711436272 15.383560181 -48.280220032
-v 14.464689255 15.028306961 -48.408912659
-v 14.860130310 15.026430130 -49.331924438
-v 15.074495316 15.242951393 -49.161056519
-v 15.074495316 15.381684303 -49.161056519
-v 15.661497116 10.354040146 -49.331924438
-v 14.464710236 10.354028702 -48.408901215
-v 14.860130310 10.354034424 -49.331924438
-v 13.975122452 10.354028702 -47.516960144
-v 14.472393036 9.998181343 -45.518547058
-v 14.864127159 9.998180389 -46.871398926
-v 15.174060822 9.998180389 -46.730503082
-v 14.363349915 10.354027748 -46.816581726
-v 14.569259644 10.109919548 -46.839023590
-v 14.246905327 10.109920502 -47.420566559
-v 14.569259644 9.998180389 -46.839023590
-v 14.246905327 9.998180389 -47.420566559
-v 15.858880043 9.998180389 -48.867359161
-v 16.157585144 9.998180389 -48.664596558
-v 14.709774971 10.109920502 -48.279747009
-v 14.709774971 9.998180389 -48.279747009
-v 15.742279053 10.109930038 -49.140953064
-v 15.742279053 9.998180389 -49.140953064
-v 15.075164795 10.109925270 -49.140953064
-v 15.075164795 9.998180389 -49.140953064
-v 13.039787292 15.026519775 -47.009456635
-v 12.995363235 15.381774902 -46.737400055
-v 12.995363235 15.243041992 -46.737400055
-v 13.428371429 14.219083786 -46.309329987
-v 14.026791573 15.072574615 -45.231132507
-v 13.116581917 14.118022919 -45.914340973
-v 13.086893082 13.952216148 -45.549156189
-v 13.300060272 13.729488373 -45.165081024
-v 13.300325394 9.998181343 -45.164604187
-v 3.197357178 9.998181343 -39.944465637
-v 13.085459709 9.998181343 -45.551734924
-v 3.231069088 9.998181343 -40.302406311
-v 13.428532600 10.354040146 -46.309043884
-v 13.117163658 9.998181343 -45.913299561
-v 13.040038109 10.354034424 -47.009178162
-v 13.299910545 10.109930038 -46.146965027
-v 13.299910545 9.998067856 -46.146965027
-v 12.978073120 9.998067856 -46.727668762
-v 12.978073120 10.109926224 -46.727668762
-v 4.746542931 15.073307991 -34.006038666
-v 6.284508705 14.219083786 -33.425472260
-v 5.686088085 15.072574615 -34.503669739
-v 6.030510902 14.941864014 -34.839862823
-v 5.258291245 15.435888290 -35.274444580
-v 6.596298218 14.118022919 -33.820461273
-v 5.237226486 13.593063354 -34.225318909
-v 4.904067993 14.013492584 -34.822391510
-v 6.109063148 13.593065262 -34.698329926
-v 6.625987053 13.952216148 -34.185646057
-v 6.135851860 14.662883759 -35.068740845
-v 6.025412083 14.267010689 -35.267723083
-v 6.412818909 13.729488373 -34.569721222
-v 5.772644043 14.013491631 -35.304470062
-v 2.328782558 9.998181343 -39.462390900
-v 1.152217865 9.998181343 -39.113891602
-v 4.330589294 9.998180389 -33.379955292
-v 4.362574100 9.998180389 -33.740489960
-v 5.237226486 9.998180389 -34.225318909
-v 6.284347057 10.354040146 -33.425758362
-v 5.349416256 14.220697403 -32.918426514
-v 6.412969112 9.998067856 -33.587833405
-v 6.412969112 10.109930038 -33.587833405
-v 5.001443863 15.244828224 -31.454582214
-v 5.001443863 15.383560181 -31.454582214
-v 5.483613491 15.383560181 -32.323879242
-v 5.483613491 15.244828224 -32.323879242
-v 5.737767696 15.028306961 -32.217819214
-v 5.248190880 15.028306961 -31.325889587
-v 4.852749825 15.026430130 -30.402873993
-v 4.638384819 15.242951393 -30.573743820
-v 4.638384819 15.381684303 -30.573743820
-v 4.051288605 14.219081879 -30.402873993
-v 2.818153858 15.072572708 -30.402875900
-v 2.702300072 14.941126823 -30.867439270
-v 1.936620712 15.435887337 -30.402873993
-v 1.855282784 15.304441452 -30.867439270
-v 2.542345047 14.662881851 -31.070205688
-v 1.712222099 14.979496956 -31.070205688
-v 3.855039597 14.116405487 -30.867441177
-v 3.552340508 13.952214241 -31.070205688
-v 2.856437206 13.593063354 -30.867441177
-v 2.314766884 14.267008781 -31.070205688
-v 3.113073349 13.729486465 -31.070205688
-v 2.856437206 13.593063354 -29.867403030
-v 2.169026375 14.013488770 -29.867403030
-v 0.907005310 15.672581673 -30.402873993
-v 0.865982056 15.541136742 -30.867441177
-v 0.790650368 15.184299469 -31.070205688
-v -0.143679619 15.740912437 -30.402873993
-v -0.143562317 15.609466553 -30.867441177
-v -0.143560410 15.245204926 -31.070205688
-v 1.540474892 14.589397430 -31.070205688
-v 2.169026375 14.013489723 -30.867439270
-v 1.421446800 14.319040298 -30.867441177
-v 1.421447754 14.319040298 -29.867403030
-v 0.706397057 14.785190582 -31.070205688
-v 0.647138596 14.504487991 -30.867441177
-v 0.647139549 14.504487991 -29.867403030
-v 4.320018768 15.435887337 -34.775508881
-v 3.820850372 15.672581673 -35.676029205
-v 3.874273777 15.304441452 -34.621406555
-v 3.394650459 15.541136742 -35.486671448
-v 4.284097672 14.941862106 -33.882064819
-v 4.849331856 14.118021011 -32.862358093
-v 4.033683300 14.678530693 -33.915588379
-v 4.026483536 14.013489723 -34.346813202
-v 4.330414295 13.749271393 -33.380271912
-v 3.932514668 14.277847290 -34.098102570
-v 4.362574577 13.593063354 -33.740489960
-v 4.539047241 13.975434303 -33.003890991
-v 3.182729244 15.202935219 -35.450752258
-v 3.635644913 15.017164230 -34.633670807
-v 3.141046047 14.795264244 -35.525947571
-v 3.544517040 14.590009689 -34.798072815
-v 3.664050102 14.319040298 -35.000663757
-v 4.051383018 10.354040146 -30.402873993
-v 4.852749825 10.354034424 -30.402873993
-v 5.248169422 10.354028702 -31.325901031
-v 5.737757683 10.354028702 -32.217842102
-v 3.112530708 9.998180389 -31.070205688
-v 2.856438637 9.998180389 -30.867443085
-v 2.856437206 9.998180389 -29.867403030
-v 3.853999615 9.998180389 -30.867441177
-v 3.555293560 9.998180389 -31.070205688
-v 4.623218060 9.998180389 -30.557798386
-v 5.003104687 9.998180389 -31.455053329
-v 5.003104687 10.109920502 -31.455053329
-v 4.623218060 10.109920502 -30.557798386
-v 4.848752975 9.998180389 -32.863403320
-v 4.538818359 9.998180389 -33.004299164
-v 3.970601082 10.109930038 -30.593849182
-v 3.970601082 9.998180389 -30.593849182
-v 5.465974808 10.109920502 -32.314231873
-v 5.465974808 9.998180389 -32.314231873
-v 5.143620014 10.109919548 -32.895774841
-v 5.349530697 10.354027748 -32.918220520
-v 5.143620014 9.998180389 -32.895774841
-v 1.152847290 10.109930038 -40.095317841
-v 1.152847290 9.998181343 -40.095317841
-v 0.970087051 9.998181343 -39.860694885
-v 1.280713081 10.354040146 -40.258556366
-v 2.328783035 13.593065262 -39.462390900
-v 1.453714371 9.998181343 -38.988208771
-v 1.453716278 13.593063354 -38.988208771
-v 4.248755932 15.740915298 -37.093368530
-v 4.655133724 15.609468460 -37.318782806
-v 3.741929054 15.672584534 -38.006538391
-v 5.140193939 15.541138649 -36.443981171
-v 4.758635998 15.672584534 -36.174694061
-v 2.805136681 15.672581673 -37.508422852
-v 3.314519405 15.740912437 -36.589473724
-v 4.163295269 15.541138649 -38.204101563
-v 5.620284557 15.304443359 -35.578979492
-v 2.908140182 14.566658020 -36.364356995
-v 3.288658142 14.504487991 -35.677886963
-v 4.541278839 14.319043159 -35.476043701
-v 4.165520668 14.504489899 -36.153064728
-v 5.733006477 14.979497910 -35.794563293
-v 5.285783291 15.184301376 -36.600345612
-v 5.649660110 14.589399338 -35.944732666
-v 5.244895458 14.785192490 -36.674011230
-v 5.409854889 14.319043159 -35.958118439
-v 4.380053520 15.202938080 -38.232234955
-v 4.832426071 14.858482361 -37.417175293
-v 4.421778202 14.795266151 -38.157058716
-v 4.653206348 14.566659927 -37.321403503
-v 4.832426071 15.245207787 -37.417179108
-v 5.034096718 14.504489899 -36.635139465
-v 3.788245678 14.566660881 -36.817073822
-v 2.908144951 15.609466553 -36.364349365
-v 2.730801582 15.245204926 -36.266048431
-v 2.730799198 14.858480453 -36.266052246
-v 2.524804115 14.504487991 -37.055912018
-v 3.399456501 14.504487991 -37.540740967
-v 4.269494057 14.504489899 -38.012752533
-v 3.025161266 14.319043159 -38.207698822
-v 2.305970669 15.435887337 -38.408943176
-v 1.939085960 15.304441452 -38.112579346
-v 2.418706894 15.541136742 -37.247318268
-v 1.831100464 14.979496956 -37.889152527
-v 2.277885914 15.184299469 -37.083129883
-v 1.428648949 14.662881851 -38.615196228
-v 2.318733692 14.785190582 -37.009437561
-v 2.149413109 14.319040298 -37.733139038
-v 1.786979675 14.013489723 -38.386985779
-v 1.914364815 14.589397430 -37.738937378
-v 1.538980484 14.267008781 -38.416152954
-v -0.143557549 14.858480453 -31.070205688
-v -0.143554688 14.566658020 -30.867439270
-v -0.143553734 14.566658020 -29.867403030
-v -0.928434372 14.504487991 -29.867401123
-v -0.928434372 14.504487991 -30.867439270
-v -1.075737000 15.202935219 -31.070205688
-v -0.989757538 14.795264244 -31.070205688
-v -1.147062302 15.541136742 -30.867441177
-v -1.188070297 15.672581673 -30.402873993
-v -2.217683792 15.435887337 -30.402873993
-v -2.136363029 15.304441452 -30.867439270
-v -2.009947777 15.017164230 -31.070205688
-v -1.821979523 14.590009689 -31.070205688
-v -1.702740669 14.319040298 -29.867401123
-v -1.702741623 14.319040298 -30.867439270
-v -2.981693268 14.941862106 -30.867439270
-v -2.830970764 14.678530693 -31.070205688
-v -3.097460747 15.073307991 -30.402873993
-v -3.459335327 15.242951393 -35.858413696
-v -3.459335327 15.381684303 -35.858413696
-v -4.834913254 15.381684303 -31.801279068
-v -4.834913254 15.242951393 -31.801279068
-v -5.011572838 15.026430130 -31.824825287
-v -3.617288589 15.026430130 -35.940959930
-v -2.622293472 14.277847290 -31.070205688
-v -2.450321198 14.013489723 -30.867439270
-v -2.450321198 14.013488770 -29.867401123
-v -3.443025589 13.749271393 -31.070205688
-v -3.143564224 13.593063354 -30.867439270
-v -3.143561363 13.593063354 -29.867401123
-v -3.873365402 13.975434303 -31.070205688
-v -4.340984344 14.220697403 -30.402873993
-v -4.147581100 14.118021011 -30.867439270
-v -4.926047325 15.244828224 -30.573741913
-v -4.926047325 15.383560181 -30.573741913
-v -5.142028809 15.028306961 -30.402873993
-v -3.143563271 9.998180389 -30.867441177
-v -3.459339142 9.998180389 -35.858577728
-v -3.443388939 9.998180389 -31.070205688
-v -3.143561363 9.998180389 -29.867403030
-v -3.459339142 10.109925270 -35.858577728
-v -4.834972382 10.109925270 -31.801433563
-v -5.011572838 10.354034424 -31.824825287
-v -3.617288589 10.354034424 -35.940959930
-v -4.834972382 9.998180389 -31.801433563
-v -3.872895241 9.998180389 -31.070205688
-v -4.146388054 9.998180389 -30.867439270
-v -5.142004013 10.354028702 -30.402873993
-v -4.341223717 10.354027748 -30.402873993
-v -4.925933838 10.109920502 -30.593847275
-v -4.261025429 10.109919548 -30.593847275
-v -4.261025429 9.998180389 -30.593847275
-v -4.925933838 9.998180389 -30.593847275
-v 0.937560081 9.998181343 -39.501136780
-v -0.992921829 9.998181343 -39.379798889
-v -0.992971420 15.242951393 -39.379638672
-v -0.992971420 15.381684303 -39.379638672
-v -1.115442276 15.026430130 -39.509117126
-v -1.115442276 10.354034424 -39.509117126
-v -0.992921829 10.109925270 -39.379798889
-v 3.231245995 13.749273300 -40.302085876
-v 3.022637367 9.998181343 -40.677947998
-v 3.022408962 13.975436211 -40.678356171
-v 3.197357178 13.593065262 -39.944465637
-v 1.822546959 15.026432037 -41.464599609
-v 2.075977325 15.242953300 -41.360088348
-v 2.075977325 15.381685257 -41.360088348
-v 2.713257313 9.998181343 -40.816692352
-v 2.093720436 9.998067856 -41.369171143
-v 2.093720436 10.109919548 -41.369171143
-v 1.822546959 10.354028702 -41.464599609
-v 3.242274284 15.435888290 -38.906787872
-v 1.528442383 14.941126823 -38.853397369
-v 1.878594398 15.072572708 -39.179950714
-v 2.662373066 14.013492584 -38.861351013
-v 3.530948639 14.013491631 -39.343425751
-v 3.893736839 14.319043159 -38.689773560
-v 3.629533768 14.277850151 -39.584476471
-v 2.712753773 14.116407394 -40.817600250
-v 3.528266907 14.678532600 -39.766933441
-v 3.683204651 15.304443359 -39.069103241
-v 2.815331459 15.073310852 -39.676025391
-v 3.926695824 15.017166138 -39.049068451
-v 3.272159576 14.941128731 -39.809696198
-v 4.017912865 14.590011597 -38.884716034
-v 1.280758858 14.219081879 -40.258476257
-v 2.211596489 14.220699310 -40.763801575
-v 0.938992500 13.952214241 -39.498558044
-v 0.969583511 14.116405487 -39.861606598
-v 1.151953697 13.729486465 -39.114364624
-v 0.846682549 15.381684303 -40.689121246
-v 0.846682549 15.242951393 -40.689121246
-v 0.892202377 15.026430130 -40.959449768
-v 0.892202377 10.354034424 -40.959449768
-v 2.211755276 10.354027748 -40.763519287
-v 0.829423904 9.998181343 -40.678791046
-v 0.829423904 10.109926224 -40.678791046
-v 2.417686462 10.109919548 -40.786300659
-v 2.417686462 9.998066902 -40.786300659
-v 19.847118378 22.273571014 -69.295516968
-v 19.847118378 22.264093399 -64.533531189
-v 18.564567566 22.177253723 -64.533531189
-v 18.564567566 22.186729431 -69.295516968
-v 17.307264328 21.876436234 -64.533531189
-v 17.307264328 21.885911942 -69.295516968
-v 16.230789185 21.414699554 -64.533531189
-v 16.230791092 21.409341812 -69.304817200
-v 14.850788116 20.365238190 -64.533531189
-v 14.851180077 20.368175507 -69.304817200
-v 18.564567566 21.380252838 -62.923557281
-v 19.847118378 21.467092514 -62.923557281
-v 17.307264328 21.079437256 -62.923561096
-v 16.230789185 20.617698669 -62.923561096
-v 14.850788116 19.568237305 -62.923557281
-v 17.307264328 20.073871613 -60.915550232
-v 16.230789185 18.607959747 -58.926403046
-v 16.230789185 19.612133026 -60.915550232
-v 17.307264328 19.069698334 -58.926403046
-v 14.850787163 17.558500290 -58.926403046
-v 14.850787163 18.562671661 -60.915550232
-v 18.564567566 20.374689102 -60.915550232
-v 19.847118378 20.461528778 -60.915550232
-v 18.564565659 19.370515823 -58.926403046
-v 19.847118378 19.457355499 -58.926403046
-v 24.845911026 20.361202240 -69.304733276
-v 24.845569611 20.367290497 -64.533531189
-v 23.454578400 21.415634155 -64.533531189
-v 23.454578400 21.425109863 -69.295516968
-v 22.380249023 21.876436234 -64.533531189
-v 22.380249023 21.885911942 -69.295516968
-v 21.122945786 22.177253723 -64.533531189
-v 21.122945786 22.186729431 -69.295516968
-v 23.454578400 20.618633270 -62.923557281
-v 24.845569611 19.570289612 -62.923557281
-v 22.380249023 21.079435349 -62.923557281
-v 21.122945786 21.380252838 -62.923557281
-v 21.122945786 20.374689102 -60.915550232
-v 22.380249023 20.073871613 -60.915550232
-v 21.122945786 19.370515823 -58.926403046
-v 22.380249023 19.069698334 -58.926403046
-v 24.845569611 18.564725876 -60.915550232
-v 23.454578400 18.608894348 -58.926403046
-v 23.454578400 19.613067627 -60.915550232
-v 24.845569611 17.560552597 -58.926403046
-v 17.307264328 18.084199905 -56.921527863
-v 16.230787277 16.620403290 -54.928943634
-v 16.230789185 17.622463226 -56.921527863
-v 17.307264328 17.082141876 -54.928943634
-v 14.850786209 15.570942879 -54.928943634
-v 14.850786209 16.573001862 -56.921527863
-v 18.564565659 18.385017395 -56.921527863
-v 19.847116470 18.471858978 -56.921527863
-v 18.564565659 17.382957458 -54.928943634
-v 19.847116470 17.469799042 -54.928943634
-v 16.230787277 16.428209305 -54.486366272
-v 17.307262421 16.889945984 -54.486366272
-v 14.850786209 15.378747940 -54.486366272
-v 17.307262421 16.884588242 -50.361312866
-v 16.230787277 16.422851563 -50.361312866
-v 14.851177216 15.381685257 -50.361312866
-v 19.847116470 17.272245407 -50.361312866
-v 18.564565659 17.190763474 -54.486366272
-v 19.847116470 17.277603149 -54.486366272
-v 18.564565659 17.185403824 -50.361312866
-v 22.380247116 18.084199905 -56.921527863
-v 21.122945786 17.382957458 -54.928943634
-v 21.122945786 18.385017395 -56.921527863
-v 22.380247116 17.082139969 -54.928943634
-v 23.454578400 17.623397827 -56.921527863
-v 24.845567703 16.575054169 -56.921527863
-v 23.454578400 16.621337891 -54.928943634
-v 24.845569611 15.572996140 -54.928943634
-v 22.380247116 16.884588242 -50.361312866
-v 21.122943878 17.190763474 -54.486366272
-v 22.380247116 16.889945984 -54.486366272
-v 21.122943878 17.185403824 -50.361312866
-v 23.454576492 16.429143906 -54.486366272
-v 24.845567703 15.380802155 -54.486366272
-v 24.845907211 15.374712944 -50.361396790
-v 23.454576492 16.423786163 -50.361312866
-v 15.065155029 20.229444504 -69.133949280
-v 15.065154076 20.372211456 -64.533569336
-v 15.065155029 20.233478546 -64.533569336
-v 15.065155029 20.368175507 -69.133949280
-v 14.850788116 20.026432037 -69.296829224
-v 14.850788116 20.016956329 -64.533531189
-v 17.388771057 19.267009735 -68.629501343
-v 17.991315842 19.979499817 -68.629501343
-v 17.161193848 19.662883759 -68.629501343
-v 16.885383606 20.072574615 -69.296829224
-v 17.001237869 19.941129684 -68.832267761
-v 17.766918182 20.435890198 -69.296829224
-v 15.848499298 19.116405487 -68.832267761
-v 17.848257065 20.304443359 -68.832267761
-v 16.151197433 18.952217102 -68.629501343
-v 15.652250290 19.219083786 -69.296829224
-v 17.534513474 19.013490677 -69.832305908
-v 17.534511566 19.014816284 -68.830947876
-v 16.847101212 18.593065262 -68.832267761
-v 16.847101212 18.593063354 -69.832305908
-v 16.590465546 18.729488373 -68.629501343
-v 18.837556839 20.541137695 -68.832267761
-v 18.912887573 20.184299469 -68.629501343
-v 18.796533585 20.672582626 -69.296829224
-v 19.847219467 20.740915298 -69.296829224
-v 19.847103119 20.609468460 -68.832267761
-v 19.847099304 20.245208740 -68.629501343
-v 18.997142792 19.785192490 -68.629501343
-v 19.056400299 19.504489899 -69.832305908
-v 19.056400299 19.504489899 -68.832267761
-v 18.282091141 19.320365906 -68.830947876
-v 18.163064957 19.589399338 -68.629501343
-v 19.847097397 19.858482361 -68.629501343
-v 19.847093582 19.566659927 -69.832305908
-v 19.847093582 19.566659927 -68.832267761
-v 18.282093048 19.319042206 -69.832305908
-v 23.146928787 14.998180389 -68.629501343
-v 24.614154816 15.003443718 -64.519569397
-v 23.576435089 14.998180389 -68.629501343
-v 22.847103119 14.998180389 -68.832260132
-v 15.061660767 15.002688408 -64.519554138
-v 15.652154922 15.355363846 -69.295516968
-v 16.847101212 14.998180389 -69.832305908
-v 16.847099304 14.998180389 -68.830947876
-v 15.849536896 14.998180389 -68.830947876
-v 16.591007233 14.998180389 -68.628189087
-v 16.148244858 14.998180389 -68.628189087
-v 14.850786209 15.355358124 -69.295516968
-v 14.850786209 15.345883369 -64.533531189
-v 15.065820694 14.998180389 -69.104545593
-v 15.065818787 15.101775169 -64.533576965
-v 15.065820694 15.111249924 -69.104545593
-v 15.732936859 14.998180389 -69.104545593
-v 15.732936859 15.111255646 -69.104545593
-v 15.065154076 19.575210571 -62.923599243
-v 15.065155029 19.436477661 -62.923599243
-v 14.850788116 19.219955444 -62.923557281
-v 15.065153122 18.569644928 -60.915592194
-v 15.065154076 18.430913925 -60.915592194
-v 14.850787163 18.214391708 -60.915550232
-v 14.850784302 13.543317795 -60.915550232
-v 14.850785255 14.548881531 -62.923561096
-v 15.061659813 14.802688599 -64.116996765
-v 15.065818787 14.304773331 -62.923606873
-v 15.061660767 14.602687836 -63.719551086
-v 15.061660767 14.802688599 -64.519554138
-v 15.061659813 14.602687836 -64.116996765
-v 15.061660767 14.402688980 -63.319549561
-v 15.061660767 14.402688980 -63.719551086
-v 15.061659813 14.202688217 -62.919067383
-v 15.061660767 14.202688217 -63.319549561
-v 15.061660767 14.002689362 -62.516796112
-v 15.061660767 14.002689362 -62.919067383
-v 15.061660767 13.802688599 -62.117893219
-v 15.061660767 13.802688599 -62.516796112
-v 15.065818787 13.299209595 -60.915596008
-v 15.061663628 13.597527504 -61.721931458
-v 15.061662674 13.597527504 -62.118125916
-v 15.061663628 13.397527695 -61.326660156
-v 15.061663628 13.397527695 -61.721931458
-v 15.061664581 13.197527885 -60.916912079
-v 15.061663628 13.197528839 -61.326660156
-v 14.850784302 12.539145470 -58.926403046
-v 14.850787163 17.210218430 -58.926403046
-v 15.065153122 17.565471649 -58.926445007
-v 15.065154076 17.426740646 -58.926445007
-v 15.061664581 12.997529030 -60.527023315
-v 15.065818787 12.295036316 -58.926448822
-v 15.061664581 12.597529411 -59.705848694
-v 15.061664581 12.797529221 -60.103534698
-v 15.061664581 12.997528076 -60.916912079
-v 15.061664581 12.797529221 -60.527023315
-v 15.061664581 12.597529411 -60.103534698
-v 24.614154816 14.203443527 -62.919086456
-v 24.614154816 14.203121185 -63.320079803
-v 24.614154816 13.803443909 -62.117912292
-v 24.614154816 13.803443909 -62.516815186
-v 24.614154816 14.003443718 -62.919086456
-v 24.614154816 14.003443718 -62.516815186
-v 24.614152908 13.598928452 -62.118114471
-v 24.614154816 14.803442955 -64.117019653
-v 24.614154816 14.603444099 -63.719570160
-v 24.614154816 14.403120995 -63.720081329
-v 24.614154816 14.603120804 -64.117134094
-v 24.614154816 14.803443909 -64.519569397
-v 24.614154816 14.403444290 -63.319568634
-v 24.614152908 12.998283386 -60.916931152
-v 24.614152908 13.198284149 -60.916931152
-v 24.614152908 13.198284149 -61.326679230
-v 24.614152908 13.398283005 -61.326679230
-v 24.614152908 13.398283005 -61.721950531
-v 24.614152908 13.598281860 -61.721950531
-v 24.614151001 12.798283577 -60.103549957
-v 24.614151001 12.598283768 -59.705867767
-v 15.061664581 12.397529602 -59.705848694
-v 24.614151001 12.598606110 -60.103549957
-v 24.614151001 12.798283577 -60.527042389
-v 15.061666489 12.197528839 -58.921619415
-v 24.614151001 12.998283386 -60.527042389
-v 24.614151001 12.198284149 -58.921638489
-v 24.614151001 12.398607254 -59.705860138
-v 20.779275894 20.202938080 -68.629501343
-v 20.891609192 20.672582626 -69.296829224
-v 20.850601196 20.541137695 -68.832267761
-v 21.839902878 20.304443359 -68.832267761
-v 21.921224594 20.435890198 -69.296829224
-v 21.713487625 20.017166138 -68.629501343
-v 22.685232162 19.941864014 -68.832267761
-v 20.693298340 19.795265198 -68.629501343
-v 20.631973267 19.504489899 -69.832305908
-v 21.406280518 19.319042206 -69.832305908
-v 20.631973267 19.504489899 -68.832267761
-v 21.525520325 19.590011597 -68.629501343
-v 22.153862000 19.013490677 -69.832305908
-v 21.406280518 19.319042206 -68.832267761
-v 22.534509659 19.678533554 -68.629501343
-v 22.325832367 19.277849197 -68.629501343
-v 22.153862000 19.013492584 -68.832267761
-v 24.629589081 20.235353470 -64.533569336
-v 24.629594803 20.368263245 -69.133865356
-v 24.629594803 20.229530334 -69.133865356
-v 24.629589081 20.374086380 -64.533569336
-v 24.845569611 20.018833160 -64.533531189
-v 24.845909119 20.013008118 -69.304733276
-v 22.801000595 20.073310852 -69.296829224
-v 23.851119995 19.118022919 -68.832267761
-v 23.576902390 18.975435257 -68.629501343
-v 24.044528961 19.220699310 -69.296829224
-v 23.146564484 18.749273300 -68.629501343
-v 22.847103119 18.593063354 -69.832305908
-v 22.847103119 18.593065262 -68.832267761
-v 23.849927902 14.998180389 -68.832260132
-v 24.629476547 14.984669685 -69.114028931
-v 23.964565277 14.998180389 -69.105857849
-v 22.847103119 14.998180389 -69.832305908
-v 23.964565277 15.109921455 -69.105857849
-v 24.044765472 15.354029655 -69.296829224
-v 24.629476547 15.109922409 -69.105857849
-v 24.845544815 15.354030609 -69.296829224
-v 24.845544815 15.344554901 -64.533531189
-v 24.629476547 15.100444794 -64.533576965
-v 24.845569611 19.221830368 -62.923557281
-v 24.845544815 14.547553062 -62.923557281
-v 24.845569611 18.216266632 -60.915550232
-v 24.629589081 18.432788849 -60.915592194
-v 24.629589081 19.438352585 -62.923599243
-v 24.629589081 19.577083588 -62.923599243
-v 24.629589081 18.571521759 -60.915592194
-v 24.629589081 17.428615570 -58.926445007
-v 24.629589081 17.567348480 -58.926445007
-v 24.629476547 14.303443909 -62.923603058
-v 24.845544815 13.541989326 -60.915550232
-v 24.629476547 13.297880173 -60.915596008
-v 24.845569611 17.212093353 -58.926403046
-v 24.845544815 12.537815094 -58.926403046
-v 24.629476547 12.293706894 -58.926448822
-v 15.065153122 16.441242218 -56.921569824
-v 14.850786209 15.222661972 -54.928943634
-v 14.850786209 16.224720001 -56.921527863
-v 15.065153122 15.439184189 -54.928985596
-v 15.065153122 15.577916145 -54.928985596
-v 15.065152168 16.579975128 -56.921569824
-v 15.061664581 12.397529602 -59.308055878
-v 14.850784302 11.553647041 -56.921527863
-v 15.061666489 10.997529984 -56.523735046
-v 15.063741684 11.196999550 -56.922222137
-v 15.065818787 11.309538841 -56.921573639
-v 15.061666489 11.397529602 -57.324699402
-v 15.061666489 11.597529411 -57.723960876
-v 15.061666489 11.397529602 -57.723960876
-v 15.061666489 11.197529793 -57.324699402
-v 15.061665535 10.997529984 -56.922870636
-v 15.061666489 11.997529030 -58.512027740
-v 15.061664581 12.197528839 -59.308055878
-v 15.061666489 11.997529030 -58.921619415
-v 15.061666489 11.797529221 -58.128948212
-v 15.061666489 11.797529221 -58.512027740
-v 15.061666489 11.597529411 -58.128948212
-v 14.850784302 10.551588058 -54.928943634
-v 15.065153122 15.246988297 -54.486324310
-v 14.850786209 15.030466080 -54.486366272
-v 14.850784302 10.359393120 -54.486366272
-v 15.065818787 10.307478905 -54.928993225
-v 15.061666489 10.797530174 -56.124694824
-v 15.061666489 10.597530365 -55.722717285
-v 15.061666489 10.797530174 -56.523735046
-v 15.061666489 10.597530365 -56.124694824
-v 15.061666489 10.397530556 -55.324447632
-v 15.061666489 10.397530556 -55.722717285
-v 15.063743591 10.195970535 -54.928028107
-v 15.061666489 10.197530746 -55.324447632
-v 15.061666489 9.997628212 -54.927124023
-v 15.065818787 10.002214432 -54.486320496
-v 15.065818787 10.115284920 -54.486320496
-v 24.614151001 11.798606873 -58.512046814
-v 24.614151001 11.998606682 -58.921596527
-v 24.614151001 12.398283958 -59.308078766
-v 24.614151001 12.198606491 -59.308071136
-v 24.614151001 11.998284340 -58.512046814
-v 24.614151001 11.798284531 -58.128967285
-v 24.614151001 11.398284912 -57.723983765
-v 24.614151001 11.598284721 -58.128967285
-v 24.614151001 11.598285675 -57.723983765
-v 24.614151001 11.398284912 -57.324714661
-v 24.614151001 11.198284149 -57.324714661
-v 24.614149094 11.198285103 -56.922889709
-v 24.614149094 10.798285484 -56.523754120
-v 24.614149094 10.998285294 -56.523754120
-v 24.614149094 10.798284531 -56.124717712
-v 24.614151001 10.998285294 -56.922889709
-v 24.614149094 10.598284721 -55.722736359
-v 24.614149094 10.598285675 -56.124717712
-v 24.614149094 9.997730255 -54.927211761
-v 24.614149094 10.398285866 -55.324470520
-v 24.614149094 10.198285103 -55.324470520
-v 24.622045517 10.002214432 -54.486320496
-v 24.614149094 10.398285866 -55.722736359
-v 24.614149094 10.198286057 -54.927082062
-v 15.065152168 15.385721207 -54.486324310
-v 15.065151215 15.242953300 -50.532180786
-v 15.065151215 15.381685257 -50.532180786
-v 14.850786209 15.026432037 -50.361312866
-v 16.120515823 13.975436211 -51.028869629
-v 17.371587753 14.277850151 -51.028869629
-v 16.550857544 13.749273300 -51.028869629
-v 15.848496437 14.116407394 -50.825691223
-v 17.162912369 14.678532600 -51.028869629
-v 17.001235962 14.941128731 -50.825691223
-v 17.534509659 14.013491631 -50.825691223
-v 16.847099304 13.593065262 -50.825691223
-v 16.847099304 13.593065262 -49.832305908
-v 17.534509659 14.013492584 -49.832305908
-v 15.652330399 14.220699310 -50.361396790
-v 16.896419525 15.073310852 -50.361396790
-v 17.983934402 15.017166138 -51.028869629
-v 17.848253250 15.304443359 -50.825691223
-v 17.776197433 15.435888290 -50.361396790
-v 18.837554932 15.541138649 -50.825691223
-v 18.805810928 15.672584534 -50.361396790
-v 18.918146133 15.202938080 -51.028869629
-v 19.850324631 14.858482361 -51.028869629
-v 19.850320816 15.245207787 -51.028869629
-v 19.850202560 15.740915298 -50.361396790
-v 19.850318909 15.609468460 -50.826107025
-v 19.004123688 14.795266151 -51.028869629
-v 19.847091675 14.566659927 -50.825691223
-v 19.056396484 14.504489899 -50.825691223
-v 18.171901703 14.590011597 -51.028869629
-v 19.056396484 14.504489899 -49.832302094
-v 18.282089233 14.319043159 -49.832305908
-v 19.847091675 14.566660881 -49.832305908
-v 18.282089233 14.319043159 -50.825691223
-v 23.106412888 9.998181343 -51.028869629
-v 23.549175262 9.998181343 -51.028869629
-v 22.847099304 9.998181343 -50.825691223
-v 16.847097397 9.998181343 -50.825691223
-v 16.847097397 9.998181343 -49.832302094
-v 16.550491333 9.998181343 -51.028869629
-v 16.120986938 9.998181343 -51.028869629
-v 15.849535942 9.998181343 -50.825691223
-v 15.065820694 9.998181343 -50.552104950
-v 14.850786209 10.354028702 -50.361312866
-v 15.065820694 10.109919548 -50.552104950
-v 15.652656555 10.354027748 -50.361396790
-v 15.732674599 10.109919548 -50.552509308
-v 15.732674599 9.998181343 -50.552509308
-v 24.845567703 16.226596832 -56.921527863
-v 24.845542908 11.552317619 -56.921527863
-v 24.629587173 16.581850052 -56.921569824
-v 24.629587173 16.443117142 -56.921569824
-v 24.629589081 15.441058159 -54.928985596
-v 24.845569611 15.224536896 -54.928943634
-v 24.629589081 15.579791069 -54.928985596
-v 24.629474640 11.308209419 -56.921573639
-v 24.845542908 10.358064651 -54.486366272
-v 24.845567703 15.032342911 -54.486366272
-v 24.845542908 10.550258636 -54.928943634
-v 24.629474640 10.306149483 -54.928989410
-v 24.629474640 10.113956451 -54.486320496
-v 20.850599289 15.541138649 -50.825691223
-v 20.900888443 15.672584534 -50.361396790
-v 20.700279236 14.785192490 -51.028869629
-v 20.784534454 15.184301376 -51.028869629
-v 21.930501938 15.435888290 -50.361396790
-v 21.839899063 15.304443359 -50.825691223
-v 22.685230255 14.941864014 -50.825691223
-v 21.706104279 14.979497910 -51.028869629
-v 21.406278610 14.319043159 -50.825691223
-v 20.631971359 14.504489899 -50.825691223
-v 21.534357071 14.589399338 -51.028869629
-v 20.631971359 14.504489899 -49.832305908
-v 22.153858185 14.013491631 -50.825691223
-v 22.308650970 14.267010689 -51.028869629
-v 22.536228180 14.662883759 -51.028869629
-v 21.406278610 14.319043159 -49.832302094
-v 22.153858185 14.013492584 -49.832302094
-v 24.629587173 15.248864174 -54.486324310
-v 24.629587173 15.387597084 -54.486324310
-v 24.845907211 15.026519775 -50.361396790
-v 24.629589081 15.243041992 -50.532264709
-v 24.629589081 15.381774902 -50.532264709
-v 23.546222687 13.952216148 -51.028869629
-v 23.851118088 14.118022919 -50.825691223
-v 23.106956482 13.729488373 -51.028869629
-v 22.847099304 13.593065262 -50.825691223
-v 22.847099304 13.593065262 -49.832305908
-v 22.812036514 15.072574615 -50.361396790
-v 24.045171738 14.219083786 -50.361396790
-v 24.629474640 9.998181343 -50.552104950
-v 24.629474640 10.109925270 -50.552104950
-v 24.845542908 10.354034424 -50.361312866
-v 23.849924088 9.998181343 -50.825691223
-v 23.965547562 10.109930038 -50.552509308
-v 23.965547562 9.998181343 -50.552509308
-v 24.044841766 10.354040146 -50.361396790
-v 22.847099304 9.998181343 -49.832302094
-v 29.770776749 14.983057976 -79.765068054
-v 29.990617752 14.983057976 -79.764480591
-v 29.770776749 14.983057976 -76.728233337
-v 29.990617752 19.614944458 -79.764816284
-v 29.990617752 14.983057976 -76.724792480
-v 29.770776749 19.614944458 -79.764595032
-v 29.990617752 18.641347885 -76.728233337
-v 29.990617752 19.552772522 -78.981636047
-v 29.770776749 19.552772522 -78.978973389
-v 29.990617752 19.367326736 -78.206016541
-v 29.770776749 19.367326736 -78.206016541
-v 29.770776749 18.641349792 -76.728233337
-v 29.990617752 19.061775208 -77.458442688
-v 29.770776749 19.061775208 -77.458442688
-v 29.990617752 19.367326736 -81.333724976
-v 29.770776749 19.367326736 -81.331604004
-v 29.990617752 19.552772522 -80.557205200
-v 29.770776749 19.552772522 -80.555305481
-v 29.990617752 14.983057976 -82.789794922
-v 29.770776749 14.983057976 -82.789558411
-v 29.990617752 19.061775208 -82.081695557
-v 29.770776749 19.061775208 -82.079597473
-v 29.990617752 18.641347885 -82.789794922
-v 29.770776749 18.641349792 -82.789558411
-v 25.150344849 36.803638458 -78.226249695
-v 23.507511139 36.803638458 -76.151039124
-v 22.379907608 37.816291809 -77.288597107
-v 25.149658203 37.588485718 -78.859718323
-v 23.760309219 38.146606445 -79.075546265
-v 26.582733154 37.451553345 -80.917556763
-v 26.741977692 36.803638458 -80.926628113
-v 23.620162964 40.143218994 -80.539779663
-v 23.214408875 38.849967957 -80.607490540
-v 22.805299759 38.849967957 -79.122245789
-v 23.983345032 38.146606445 -80.741073608
-v 22.286933899 40.141529083 -79.104644775
-v 21.626663208 38.849967957 -77.977058411
-v 21.465209961 40.042587280 -77.248382568
-v 21.989391327 38.146606445 -77.923149109
-v 18.922386169 38.849967957 -77.383468628
-v 18.781166077 39.983886719 -75.779251099
-v 19.296573639 37.549797058 -77.759208679
-v 19.071321487 38.146606445 -77.910560608
-v 26.055217743 35.033866882 -80.746879578
-v 24.823348999 35.031005859 -76.757247925
-v 25.464570999 32.528594971 -77.825080872
-v 21.454284668 32.629238129 -76.140113831
-v 24.596004486 35.184875488 -75.502090454
-v 25.541439056 32.444717407 -80.763412476
-v 18.820507050 35.188179016 -77.004943848
-v 19.020227432 36.803642273 -77.550704956
-v 18.437503815 32.598598480 -74.781242371
-v 15.987350464 38.849967957 -75.045997620
-v 15.820146561 40.176586151 -73.660858154
-v 16.128425598 38.146606445 -75.713554382
-v 16.336780548 37.600803375 -75.754692078
-v 16.051029205 36.803642273 -74.879219055
-v 15.816267014 35.004508972 -73.347824097
-v 15.454005241 32.571670532 -72.626029968
-v 12.481450081 32.488109589 -72.487487793
-v 12.481454849 36.824386597 -71.998634338
-v 12.481455803 34.988109589 -72.289489746
-v 9.841464043 32.488113403 -72.487487793
-v 9.841464043 36.824386597 -71.998641968
-v 9.841464043 37.488113403 -72.269149780
-v 12.481452942 37.488109589 -72.269142151
-v 9.841464043 34.988113403 -72.289505005
-v 9.841464043 38.150741577 -73.263992310
-v 12.481452942 38.150741577 -73.263984680
-v 9.841464043 38.831653595 -73.557495117
-v 9.841464043 39.987960815 -72.482528687
-v 12.481452942 39.987960815 -72.482521057
-v 12.481452942 38.831653595 -73.557495117
-v 24.103481293 34.949363708 -83.712203979
-v 25.275901794 32.545532227 -84.405128479
-v 23.822326660 36.803642273 -83.586334229
-v 21.669319153 36.803638458 -86.960464478
-v 20.021114349 32.419254303 -86.266639709
-v 24.059520721 37.374099731 -83.686401367
-v 23.201112747 39.767883301 -83.417564392
-v 23.296180725 38.849967957 -82.913650513
-v 23.527416229 38.146606445 -82.990409851
-v 21.588678360 37.490589142 -86.695175171
-v 21.198863983 38.146606445 -86.152320862
-v 21.211910248 38.849967957 -86.241333008
-v 20.951198578 34.872016907 -86.784126282
-v 18.210243225 34.756584167 -89.659729004
-v 18.384002686 32.098144531 -89.750251770
-v 18.141355515 36.803638458 -88.407386780
-v 21.635330200 40.005462646 -87.013442993
-v 18.081920624 37.317695618 -88.053428650
-v 17.714733124 38.146606445 -87.833557129
-v 17.707719803 38.849967957 -88.143836975
-v 18.099239349 39.993171692 -89.274894714
-v 15.259215355 39.788761139 -87.509864807
-v 14.867755890 38.849967957 -86.730918884
-v 14.875638962 38.146606445 -86.616233826
-v 15.287878036 37.231719971 -87.092933655
-v 15.288704872 36.803642273 -87.207962036
-v 15.292680740 34.746036530 -87.760856628
-v 15.425393105 32.172321320 -87.813186646
-v 12.481456757 34.988113403 -87.337501526
-v 12.481456757 32.488113403 -87.139503479
-v 9.841465950 34.988113403 -87.337501526
-v 9.841465950 32.488113403 -87.139511108
-v 12.481451988 36.803638458 -87.625076294
-v 9.841465950 36.824386597 -87.628364563
-v 12.481458664 37.488113403 -87.354400635
-v 12.481458664 38.831653595 -86.051231384
-v 9.841455460 38.831653595 -86.069503784
-v 9.841456413 38.150741577 -86.363006592
-v 12.452425003 39.987964630 -87.164901733
-v 9.841456413 39.987960815 -87.144470215
-v 9.841456413 37.488113403 -87.357849121
-v 12.481458664 38.150741577 -86.348823547
-v 29.305988312 21.413707733 -76.206016541
-v 29.305988312 20.366687775 -74.815032959
-v 24.837379456 20.371608734 -74.815391541
-v 23.466409683 21.406253815 -76.199089050
-v 25.255584717 14.946889877 -76.231483459
-v 26.604797363 14.982656479 -76.265853882
-v 27.231506348 14.950581551 -76.265853882
-v 23.980312347 21.871791840 -77.274734497
-v 24.203563690 21.958866119 -77.837463379
-v 24.520853043 21.999008179 -78.534027100
-v 23.593200684 21.483489990 -76.369125366
-v 29.305988312 21.874507904 -77.280349731
-v 29.305988312 22.175323486 -78.537651062
-v 24.800132751 22.060703278 -79.218650818
-v 29.305988312 22.262165070 -79.813476563
-v 24.956825256 22.130088806 -79.813652039
-v 23.457771301 21.412771225 -70.348968506
-v 23.082004547 21.573951721 -75.407218933
-v 22.381294250 21.874509811 -74.702331543
-v 22.381294250 21.874507904 -70.348968506
-v 24.837772369 20.364633560 -70.348968506
-v 18.565612793 22.107646942 -72.990287781
-v 19.841440201 22.250955582 -73.242851257
-v 19.841440201 22.262165070 -70.348968506
-v 21.123991013 22.175323486 -70.348968506
-v 21.123991013 22.175325394 -74.250564575
-v 25.056758881 22.139398575 -80.535820007
-v 24.705877304 22.122812271 -81.095756531
-v 29.305988312 22.175323486 -81.096031189
-v 29.305988312 21.874507904 -82.353332520
-v 23.299259186 21.874511719 -82.353866577
-v 23.448938370 21.413709641 -83.419189453
-v 29.305988312 21.412771225 -83.429809570
-v 29.305988312 20.364633560 -84.809814453
-v 24.839569092 20.371608734 -84.809417725
-v 23.457771301 21.412773132 -89.284484863
-v 24.837379456 20.371608734 -89.284484863
-v 22.797550201 21.693103790 -82.773315430
-v 22.375690460 21.873327255 -83.476203918
-v 22.381294250 21.874511719 -89.284484863
-v 21.123992920 22.175325394 -89.284484863
-v 22.168815613 21.903715134 -83.783325195
-v 21.120126724 22.067075729 -84.549667358
-v 19.841442108 22.176996231 -84.137710571
-v 19.841442108 22.262166977 -89.284484863
-v 18.565612793 22.175325394 -89.284484863
-v 18.565612793 22.175323486 -70.348968506
-v 18.272354126 21.979415894 -73.085937500
-v 17.308311462 21.518264771 -73.613197327
-v 17.308309555 21.874507904 -70.348968506
-v 16.233982086 20.961898804 -74.645462036
-v 16.233980179 21.413707733 -70.348968506
-v 14.842990875 20.366687775 -70.348968506
-v 16.933029175 21.336425781 -73.846252441
-v 14.842651367 20.219360352 -74.815307617
-v 15.540415764 20.409646988 -75.513656616
-v 15.635255814 20.520387650 -75.291046143
-v 15.281488419 20.586505890 -75.753463745
-v 14.728040695 20.909824371 -76.207351685
-v 15.799945831 20.644830704 -75.183647156
-v 10.370471001 21.413709641 -76.206024170
-v 13.212484360 21.168054581 -77.276458740
-v 14.610939026 20.942386627 -76.341934204
-v 10.370471001 21.874511719 -77.280349731
-v 10.370553970 20.364635468 -74.814689636
-v 13.357571602 21.493791580 -79.813629150
-v 12.988756180 21.191238403 -78.535026550
-v 10.370471001 22.175325394 -78.537651062
-v 13.057863235 21.173599243 -77.588134766
-v 10.370471001 22.262166977 -79.813484192
-v 13.967662811 21.837032318 -81.095771790
-v 10.370471001 22.175325394 -81.096031189
-v 13.763244629 21.696022034 -80.502403259
-v 14.216711998 21.863300323 -81.803222656
-v 14.747447968 21.848104477 -82.353805542
-v 10.370471001 21.874511719 -82.353332520
-v 14.845539093 20.371608734 -84.811607361
-v 10.370471001 21.412773132 -83.429809570
-v 10.982007980 20.373481750 -84.595985413
-v 10.370471001 20.371608734 -84.809417725
-v 15.094427109 21.729990005 -82.688247681
-v 16.235771179 21.413709641 -83.420799255
-v 16.762920380 21.712316513 -82.950569153
-v 18.560976028 22.168703079 -83.647201538
-v 17.301679611 21.976741791 -83.235755920
-v 17.308311462 21.874511719 -89.284484863
-v 14.842651367 20.364635468 -89.284408569
-v 16.233982086 21.413709641 -89.284484863
-v 24.488052368 30.094154358 -75.618225098
-v 25.518449783 28.812402725 -75.841156006
-v 24.347496033 28.985239029 -75.019706726
-v 23.141761780 30.100467682 -74.650505066
-v 24.634094238 26.688255310 -75.590003967
-v 23.490127563 27.013437271 -73.939460754
-v 23.440853119 28.999212265 -74.159996033
-v 22.817611694 27.110204697 -72.569808960
-v 21.266868591 26.662124634 -71.392883301
-v 19.449996948 28.567934036 -72.402175903
-v 19.529581070 29.983152390 -73.100250244
-v 19.787189484 26.169006348 -71.135566711
-v 22.061599731 24.255449295 -74.742469788
-v 20.893354416 24.193212509 -74.051712036
-v 21.115722656 24.546749115 -72.695671082
-v 22.511524200 24.635454178 -73.533271790
-v 22.808015823 25.561082840 -72.700889587
-v 23.368392944 25.587879181 -74.153945923
-v 21.280704498 25.101297379 -71.769996643
-v 19.866724014 24.839723587 -71.833221436
-v 19.801246643 24.161594391 -72.210723877
-v 23.329086304 24.272464752 -74.836639404
-v 23.955390930 25.325462341 -75.683670044
-v 23.781864166 23.778326035 -75.961318970
-v 22.722534180 23.988742828 -75.623329163
-v 23.200160980 23.616571426 -76.630523682
-v 23.091220856 23.616294861 -76.484764099
-v 22.626701355 22.961791992 -76.785835266
-v 22.330196381 23.193660736 -76.181762695
-v 26.550949097 29.874471664 -77.890174866
-v 26.447105408 28.526062012 -76.735382080
-v 26.842082977 28.425216675 -77.812469482
-v 26.544471741 28.660789490 -80.678894043
-v 26.738830566 28.452816010 -79.091911316
-v 25.884006500 26.118581772 -77.365158081
-v 25.705062866 26.361009598 -76.578338623
-v 25.819625854 26.084964752 -78.917701721
-v 25.796188354 26.212837219 -79.443344116
-v 25.092411041 24.798793793 -77.526428223
-v 25.752429962 26.067216873 -78.103294373
-v 24.865108490 24.997421265 -76.733055115
-v 24.665222168 23.828989029 -77.714935303
-v 25.286739349 24.730936050 -78.227584839
-v 25.378070831 24.778564453 -79.131469727
-v 23.948272705 23.776203156 -76.147186279
-v 24.426811218 23.831975937 -77.107467651
-v 23.688209534 23.579959869 -77.967208862
-v 23.549936295 23.637470245 -77.448776245
-v 25.604660034 24.897699356 -79.702133179
-v 25.027832031 24.062568665 -78.296684265
-v 25.358690262 24.106132507 -79.120513916
-v 25.383094788 24.321857452 -79.871215820
-v 24.432258606 23.809860229 -79.742805481
-v 24.290679932 23.616666794 -79.205200195
-v 29.305988312 20.063230515 -76.859596252
-v 29.135120392 20.373481750 -75.031013489
-v 24.623407364 20.371608734 -75.031326294
-v 29.135120392 20.234748840 -75.031013489
-v 24.623407364 20.232875824 -75.031326294
-v 29.305988312 20.018226624 -74.815032959
-v 19.794349670 23.879894257 -73.666061401
-v 19.805347443 22.543739319 -73.894897461
-v 20.892026901 20.662504196 -70.348968506
-v 19.841341019 20.730834961 -70.348968506
-v 20.851001740 20.531059265 -70.813537598
-v 21.840303421 20.294363022 -70.813537598
-v 19.841457367 20.599388123 -70.813537598
-v 21.921642303 20.425807953 -70.348968506
-v 22.803176880 20.062494278 -70.348968506
-v 23.537363052 18.942136765 -71.016304016
-v 22.527366638 19.652805328 -71.016304016
-v 22.687320709 19.931049347 -70.813537598
-v 23.840061188 19.106327057 -70.813537598
-v 24.036310196 19.209003448 -70.348968506
-v 21.767883301 23.401014328 -75.542915344
-v 20.757532120 23.470703125 -75.025962830
-v 19.773284912 23.212747574 -74.474105835
-v 20.944026947 22.566518784 -74.784950256
-v 22.061439514 22.344963074 -75.191322327
-v 22.683864594 22.077983856 -75.817459106
-v 23.025321960 21.929023743 -76.520858765
-v 24.623407364 20.371606827 -70.519836426
-v 24.623407364 20.232873917 -70.519836426
-v 24.837772369 20.016351700 -70.348968506
-v 24.036403656 15.343961716 -70.348968506
-v 24.837772369 20.016353607 -74.815391541
-v 24.837772369 15.343955994 -70.348968506
-v 23.098094940 18.719408035 -71.016304016
-v 23.097551346 14.950710297 -71.016304016
-v 22.841457367 14.950710297 -70.813537598
-v 23.839019775 14.950710297 -70.813537598
-v 23.540313721 14.950710297 -71.016304016
-v 22.841457367 18.582984924 -70.813537598
-v 24.622737885 14.950710297 -70.539947510
-v 23.955623627 14.950710297 -70.539947510
-v 23.955623627 15.099852562 -70.539947510
-v 24.622737885 15.099847794 -70.539947510
-v 24.837770462 15.343947411 -74.815391541
-v 24.606698990 14.947907448 -75.034667969
-v 21.894195557 14.901648521 -72.612403870
-v 24.612802505 15.079806328 -75.034667969
-v 23.336404800 14.936596870 -74.047241211
-v 23.298706055 15.231988907 -75.839904785
-v 23.259780884 14.938171387 -75.032234192
-v 25.088092804 15.331356049 -76.757781982
-v 22.979141235 15.738905907 -77.437652588
-v 29.305988312 19.210618973 -75.616073608
-v 29.305988312 15.343950272 -74.815055847
-v 28.841423035 19.931785583 -76.975364685
-v 28.841423035 19.107944489 -75.809478760
-v 29.305988312 15.343950272 -75.615837097
-v 28.638660431 14.950710297 -76.084167480
-v 28.638660431 18.965354919 -76.083694458
-v 28.638660431 18.739192963 -76.514038086
-v 28.638660431 14.950710297 -76.513671875
-v 28.841423035 14.950710297 -75.810668945
-v 29.115013123 14.950710297 -75.031127930
-v 24.735479355 15.422969818 -77.767738342
-v 26.498107910 14.949935913 -76.926391602
-v 29.115013123 15.099842072 -75.031127930
-v 29.115013123 15.099841118 -75.696037292
-v 29.115013123 14.950710297 -75.696037292
-v 22.299789429 19.256931305 -71.016304016
-v 22.154045105 19.003412247 -70.813537598
-v 21.406467438 19.308963776 -70.813537598
-v 21.525495529 19.579319000 -71.016304016
-v 20.775671005 20.174221039 -71.016304016
-v 21.697242737 19.969417572 -71.016304016
-v 20.691417694 19.775112152 -71.016304016
-v 20.632160187 19.494409561 -70.813537598
-v 19.841459274 20.235126495 -71.016304016
-v 19.841461182 19.848402023 -71.016304016
-v 19.841464996 19.556579590 -70.813537598
-v 16.841457367 14.950710297 -70.813537598
-v 20.586040497 14.937191010 -71.819656372
-v 18.894596100 14.938294411 -72.220695496
-v 20.435432434 15.061697960 -72.449722290
-v 18.696746826 15.379846573 -73.383460999
-v 18.772079468 15.265413284 -72.659072876
-v 17.032363892 15.983451843 -73.813018799
-v 21.754692078 14.977915764 -73.410140991
-v 20.325994492 15.450225830 -73.102951050
-v 21.950759888 15.306118011 -73.966735840
-v 21.694307327 15.916619301 -75.330863953
-v 20.282855988 16.405143738 -74.777481079
-v 21.458448410 16.824398041 -78.550865173
-v 21.431514740 16.321739197 -76.831939697
-v 18.578311920 15.797663689 -74.144912720
-v 20.631263733 15.616428375 -73.627922058
-v 18.694887161 16.794986725 -75.507049561
-v 23.809509277 23.007034302 -79.658699036
-v 23.685874939 22.939796448 -79.189224243
-v 24.038337708 23.547147751 -78.586608887
-v 23.465511322 22.890916824 -78.649032593
-v 29.305988312 20.425807953 -77.739372253
-v 29.305988312 20.662504196 -78.768989563
-v 28.841423035 20.531059265 -78.809997559
-v 28.638660431 20.007085800 -77.947113037
-v 28.638660431 19.668453217 -77.126091003
-v 28.841423035 20.294363022 -77.820693970
-v 28.638660431 19.267768860 -77.334770203
-v 28.638660431 20.192857742 -78.881324768
-v 28.638660431 19.579931259 -78.135078430
-v 28.638660431 19.785186768 -78.967300415
-v 28.841423035 20.599388123 -79.813499451
-v 29.305988312 20.730834961 -79.813377380
-v 28.638660431 20.235126495 -79.813499451
-v 28.841423035 19.494409561 -79.028625488
-v 29.841461182 19.308961868 -78.254318237
-v 28.841423035 19.308963776 -78.254318237
-v 29.841461182 19.494409561 -79.028625488
-v 28.841423035 19.556579590 -79.813507080
-v 29.841461182 19.556579590 -79.813507080
-v 28.638660431 19.848402023 -79.813499451
-v 28.841423035 19.003412247 -77.506736755
-v 28.841423035 18.582984924 -76.813499451
-v 29.841461182 18.582984924 -76.813499451
-v 29.841461182 19.003410339 -77.506736755
-v 28.841423035 14.950710297 -76.813499451
-v 29.841461182 14.988102913 -76.813499451
-v 26.069618225 14.947598457 -77.688873291
-v 27.280761719 14.949302673 -81.662971497
-v 26.861991882 14.947669029 -81.228546143
-v 28.196334839 14.950796127 -82.088394165
-v 28.841423035 14.950710297 -82.813499451
-v 28.196334839 14.950674057 -82.655242920
-v 26.867954254 15.440361977 -82.661079407
-v 26.867954254 15.730962753 -82.088844299
-v 29.841461182 14.988102913 -82.813499451
-v 26.535839081 14.949819565 -80.187927246
-v 26.665481567 14.947300911 -80.670341492
-v 25.893093109 14.945127487 -78.708297729
-v 25.875171661 14.947607040 -79.065750122
-v 26.184097290 14.950408936 -79.661888123
-v 24.564708710 15.443685532 -78.836112976
-v 22.942348480 16.209550858 -78.833389282
-v 24.546791077 15.496338844 -79.185707092
-v 24.855716705 15.576368332 -79.749267578
-v 22.946269989 16.330913544 -79.273895264
-v 23.259548187 16.457134247 -79.899765015
-v 22.733558655 22.972330093 -76.940849304
-v 23.201393127 22.975053787 -78.108131409
-v 23.039005280 23.035600662 -77.655403137
-v 23.137948990 21.997629166 -76.671897888
-v 23.481811523 22.259363174 -77.476325989
-v 23.680122375 22.266258240 -77.976188660
-v 23.961961746 22.227539063 -78.594932556
-v 24.210037231 22.282510757 -79.203063965
-v 24.349227905 22.352766037 -79.731590271
-v 21.507698059 17.028732300 -79.056488037
-v 21.912975311 17.337978363 -79.802665710
-v 20.085742950 17.311626434 -76.427032471
-v 20.119037628 17.919717789 -78.256080627
-v 18.678516388 17.549781799 -76.917640686
-v 20.157531738 18.068082809 -78.809753418
-v 20.502685547 18.281394958 -79.627601624
-v 18.786527634 19.179737091 -79.585365295
-v 26.305461884 29.938735962 -80.742683411
-v 25.685838699 30.050054550 -84.391563416
-v 25.666475296 28.903474808 -84.421432495
-v 25.907665253 26.450117111 -80.232681274
-v 26.151550293 26.630941391 -80.783760071
-v 25.638500214 27.246767044 -84.464599609
-v 25.065311432 26.102489471 -84.893760681
-v 25.663249969 24.491418839 -80.759208679
-v 25.920974731 25.083208084 -80.329757690
-v 26.520496368 25.468971252 -81.519325256
-v 26.707901001 24.878492355 -81.515037537
-v 25.468273163 24.755270004 -81.602767944
-v 24.205516815 24.160057068 -80.901245117
-v 24.522552490 23.985321045 -80.395317078
-v 25.201683044 24.895957947 -82.327247620
-v 25.152015686 24.942050934 -84.862052917
-v 24.254001617 24.662267685 -83.632957458
-v 22.481258392 23.758296967 -82.416992188
-v 22.934574127 24.070884705 -82.038009644
-v 23.021926880 24.178052902 -84.502494812
-v 22.100090027 23.673082352 -83.052085876
-v 22.501628876 23.353986740 -81.663024902
-v 21.430339813 29.881513596 -87.753814697
-v 23.237037659 27.381513596 -89.024147034
-v 23.450878143 26.034505844 -87.742164612
-v 22.340473175 28.903474808 -88.446884155
-v 18.217596054 29.553066254 -89.729858398
-v 18.321304321 27.053068161 -90.041275024
-v 18.924333572 25.752410889 -88.468887329
-v 18.244543076 28.903474808 -89.810775757
-v 18.851167679 24.901309967 -88.307090759
-v 21.652906418 23.939552307 -84.968963623
-v 19.944507599 24.132301331 -84.900215149
-v 23.233039856 25.185806274 -87.248916626
-v 21.900707245 23.957534790 -84.885879517
-v 21.899944305 23.594797134 -83.399215698
-v 19.810281754 23.811729431 -83.664077759
-v 20.965631485 23.643945694 -84.022010803
-v 28.841423035 20.531059265 -80.823043823
-v 29.305988312 20.662504196 -80.864067078
-v 29.305988312 20.425807953 -81.893684387
-v 28.638660431 20.174221039 -80.747711182
-v 28.638660431 19.969417572 -81.669281006
-v 28.638660431 19.579319000 -81.497535706
-v 28.638660431 19.775112152 -80.663459778
-v 28.841423035 20.294363022 -81.812339783
-v 28.841423035 19.931049347 -82.659362793
-v 28.638660431 19.652805328 -82.499404907
-v 29.305988312 19.209003448 -84.008346558
-v 29.305988312 20.062494278 -82.775215149
-v 29.305988312 20.016351700 -84.809814453
-v 29.135120392 20.371606827 -84.595443726
-v 29.135120392 20.232873917 -84.595443726
-v 24.623950958 20.371696472 -84.595756531
-v 24.623950958 20.232963562 -84.595756531
-v 24.840267181 20.016441345 -84.811691284
-v 24.126316071 22.467172623 -80.870460510
-v 22.876848221 22.344964981 -81.988014221
-v 23.611503601 23.333345413 -80.670333862
-v 22.431190491 22.181167603 -82.360595703
-v 23.953485489 23.180593491 -80.251121521
-v 24.437995911 22.389266968 -80.373077393
-v 28.841423035 19.308963776 -81.378509521
-v 28.841423035 19.494409561 -80.604202271
-v 29.841461182 19.494409561 -80.604202271
-v 28.841423035 19.003412247 -82.126083374
-v 29.841461182 19.308961868 -81.378509521
-v 29.841461182 19.003410339 -82.126083374
-v 28.638660431 19.256931305 -82.271827698
-v 28.841423035 18.582984924 -82.813499451
-v 29.841461182 18.582984924 -82.813499451
-v 28.638660431 18.719408035 -83.070137024
-v 28.638660431 18.942136765 -83.509399414
-v 28.841423035 19.106327057 -83.812103271
-v 28.638660431 14.950710297 -83.069587708
-v 28.841423035 14.950710297 -83.811058044
-v 29.305988312 15.343961716 -84.008445740
-v 28.638660431 14.950710297 -83.512351990
-v 28.196334839 14.950065613 -83.009132385
-v 26.867954254 14.944667816 -83.010108948
-v 29.115013123 14.950710297 -83.927658081
-v 29.115013123 14.950710297 -84.594779968
-v 29.115013123 15.099852562 -83.927658081
-v 29.115013123 15.099847794 -84.594779968
-v 25.952377319 15.555994034 -81.667083740
-v 25.533611298 15.441658974 -81.235389709
-v 25.271785736 16.370138168 -82.129051208
-v 24.623832703 15.084804535 -84.639930725
-v 29.305988312 15.343955994 -84.809814453
-v 24.623832703 14.946317673 -84.659896851
-v 25.271785736 14.928886414 -83.643524170
-v 25.207458496 15.607461929 -80.229797363
-v 25.337100983 15.596984863 -80.685585022
-v 23.611289978 16.304542542 -80.392143250
-v 23.740932465 16.228935242 -80.838890076
-v 24.356212616 15.971117020 -81.711555481
-v 23.937442780 16.058343887 -81.356719971
-v 22.438049316 17.129186630 -80.770584106
-v 22.308406830 17.217609406 -80.322029114
-v 23.053329468 16.767339706 -81.716812134
-v 22.634559631 16.920852661 -81.308265686
-v 23.968902588 16.563045502 -82.157836914
-v 25.271785736 15.919914246 -82.709167480
-v 25.271785736 15.354865074 -83.046897888
-v 23.967103958 15.168118477 -83.748222351
-v 23.968902588 15.525764465 -83.178428650
-v 23.968902588 14.925689697 -84.537361145
-v 23.968902588 16.310291290 -82.731681824
-v 24.623405457 20.232875824 -89.113616943
-v 24.623947144 20.373481750 -89.107162476
-v 24.837772369 20.016353607 -89.284484863
-v 24.036228180 19.210620880 -89.284408569
-v 22.792137146 20.063232422 -89.284408569
-v 24.839904785 15.343955994 -84.818161011
-v 24.623832703 14.950710297 -89.087051392
-v 24.623832703 15.099842072 -89.087051392
-v 23.567571640 14.950710297 -88.617889404
-v 23.568038940 18.965358734 -88.616928101
-v 23.137702942 18.739194870 -88.616928101
-v 24.035900116 15.343950272 -89.284408569
-v 24.837772369 15.343950272 -89.284484863
-v 23.844284058 14.950710297 -88.813461304
-v 23.138065338 14.950710297 -88.648902893
-v 23.955883026 14.950710297 -89.093292236
-v 23.955883026 15.099841118 -89.093292236
-v 23.840061188 19.106328964 -88.820106506
-v 22.687324524 19.931051254 -88.820106506
-v 22.525646210 19.668455124 -88.616928101
-v 20.873836517 19.212495804 -83.716064453
-v 19.406978607 19.888927460 -84.077728271
-v 19.414176941 21.462732315 -82.990173340
-v 19.958477020 19.926210403 -82.459869385
-v 20.875013351 19.308794022 -82.895057678
-v 21.772899628 23.068262100 -82.548583984
-v 21.598121643 22.997964859 -82.851722717
-v 21.872701645 22.243719101 -83.257759094
-v 22.105762482 23.112348557 -81.993980408
-v 22.056463242 22.266183853 -82.984947205
-v 20.782215118 22.993917465 -83.395591736
-v 19.773288727 23.212579727 -83.083015442
-v 19.805349350 22.443315506 -83.586601257
-v 20.941175461 22.310987473 -83.938491821
-v 20.991313934 18.459091187 -80.719329834
-v 20.861671448 18.407154083 -80.239631653
-v 21.606594086 17.911363602 -81.903717041
-v 21.187824249 18.329421997 -81.446632385
-v 19.342899323 19.541238785 -80.956283569
-v 19.187976837 19.356319427 -80.242729187
-v 19.540824890 19.720926285 -81.783370972
-v 22.522163391 17.274503708 -82.934059143
-v 22.522163391 17.592578888 -82.239845276
-v 22.484359741 16.313440323 -84.120674133
-v 22.518768311 16.689754486 -83.503875732
-v 20.859477997 18.254144669 -84.122451782
-v 20.770414352 20.192859650 -88.616928101
-v 19.838237762 20.235130310 -88.616928101
-v 19.838233948 19.848403931 -88.616928101
-v 21.704624176 20.007087708 -88.616928101
-v 20.684436798 19.785186768 -88.616928101
-v 21.840305328 20.294364929 -88.820106506
-v 20.851005554 20.531061172 -88.820106506
-v 21.912361145 20.425811768 -89.284408569
-v 20.882747650 20.662506104 -89.284408569
-v 22.316970825 19.267770767 -88.616928101
-v 22.154048920 19.003414154 -88.820106506
-v 22.841461182 18.582986832 -88.820106506
-v 22.841461182 18.582986832 -89.813499451
-v 21.406469345 19.308963776 -88.820106506
-v 21.516656876 19.579933167 -88.616928101
-v 22.137996674 19.003410339 -89.813499451
-v 19.838356018 20.730836868 -89.284408569
-v 19.838241577 20.599390030 -88.819694519
-v 20.632162094 19.494411469 -88.820106506
-v 21.390419006 19.308961868 -89.813499451
-v 20.632162094 19.494411469 -89.813499451
-v 19.841468811 19.556581497 -88.820106506
-v 19.841468811 19.556581497 -89.813499451
-v 20.751476288 17.103826523 -84.706436157
-v 19.339275360 18.912166595 -84.394371033
-v 21.049032211 15.863847733 -85.412651062
-v 19.170335770 17.632045746 -84.910621643
-v 20.875701904 14.949906349 -86.055358887
-v 22.390251160 15.629423141 -84.830459595
-v 18.301856995 14.937114716 -86.137916565
-v 22.807044983 14.988101959 -89.813499451
-v 22.841461182 14.950710297 -88.823219299
-v 16.841459274 14.950710297 -88.820114136
-v 16.831239700 14.988101959 -89.813499451
-v 15.818071365 27.487817764 -72.805198669
-v 15.743446350 28.903474808 -73.059967041
-v 16.720575333 28.934715271 -73.143966675
-v 18.047039032 28.909187317 -73.017089844
-v 15.684791565 30.003684998 -73.260215759
-v 18.525236130 26.654150009 -71.953231812
-v 18.162685394 26.808786392 -72.181945801
-v 17.223571777 27.178163528 -72.633407593
-v 17.245525360 25.270286560 -72.983283997
-v 16.740139008 25.390344620 -73.098541260
-v 16.748601913 27.326850891 -72.748352051
-v 18.209056854 25.080087662 -72.513275146
-v 18.169246674 24.404680252 -72.365806580
-v 18.578323364 24.984479904 -72.266166687
-v 18.462497711 24.405164719 -72.263618469
-v 18.657451630 23.969886780 -73.577072144
-v 17.135082245 24.324024200 -73.184768677
-v 18.401916504 23.923854828 -73.576492310
-v 15.684789658 25.591835022 -73.260215759
-v 16.730388641 24.162227631 -73.436096191
-v 15.793661118 24.871000290 -74.105880737
-v 17.519702911 23.677232742 -74.143333435
-v 17.169528961 23.476366043 -74.372077942
-v 15.101604462 24.741426468 -74.480918884
-v 16.451955795 22.982490540 -75.175552368
-v 12.481462479 29.988111496 -72.297737122
-v 12.481460571 28.858713150 -72.394294739
-v 12.481462479 26.238111496 -73.774490356
-v 12.481455803 27.488111496 -72.685501099
-v 9.841464043 28.858713150 -72.394302368
-v 9.841464043 29.988111496 -72.297760010
-v 9.841464043 27.488111496 -72.685501099
-v 9.841464043 26.238111496 -73.774505615
-v 12.481455803 25.478315353 -73.873489380
-v 14.326726913 24.516502380 -75.883964539
-v 9.841368675 24.988111496 -77.254035950
-v 9.841463089 25.488111496 -73.873512268
-v 13.640657425 23.942804337 -77.135154724
-v 12.481455803 24.591220856 -77.239486694
-v 13.473918915 23.923679352 -77.471260071
-v 12.481456757 23.876964569 -79.813499451
-v 13.399394989 23.645229340 -78.492370605
-v 9.841464996 24.988111496 -79.813499451
-v 17.767335892 20.425807953 -70.348968506
-v 18.796949387 20.662504196 -70.348968506
-v 18.837957382 20.531059265 -70.813537598
-v 17.848655701 20.294363022 -70.813537598
-v 18.909282684 20.192857742 -71.016304016
-v 17.003326416 19.931785583 -70.813537598
-v 17.975070953 20.007085800 -71.016304016
-v 17.154048920 19.668453217 -71.016304016
-v 18.163040161 19.579931259 -71.016304016
-v 18.995262146 19.785186768 -71.016304016
-v 16.887557983 20.063230515 -70.348968506
-v 19.056587219 19.494409561 -70.813537598
-v 15.837439537 19.107944489 -70.813537598
-v 16.111656189 18.965354919 -71.016304016
-v 17.362728119 19.267768860 -71.016304016
-v 15.644033432 19.210618973 -70.348968506
-v 18.765943527 23.200260162 -74.275917053
-v 18.538703918 23.132932663 -74.281570435
-v 18.655975342 22.460165024 -73.696899414
-v 18.379405975 22.330810547 -73.808197021
-v 17.710544586 22.778474808 -74.852195740
-v 17.357477188 22.535253525 -75.078155518
-v 17.420154572 21.845836639 -74.421234131
-v 18.282279968 19.308963776 -70.813537598
-v 17.534698486 19.003412247 -70.813537598
-v 16.541996002 18.739192963 -71.016304016
-v 16.841457367 18.582984924 -70.813537598
-v 15.058970451 20.373481750 -70.519836426
-v 14.842990875 20.018226624 -70.348968506
-v 15.058971405 20.234748840 -70.519836426
-v 14.843014717 15.343950272 -70.348968506
-v 15.838632584 14.950710297 -70.813537598
-v 15.643795013 15.343950272 -70.348968506
-v 14.843015671 15.343955994 -74.815391541
-v 16.541629791 14.950710297 -71.016304016
-v 16.112125397 14.950710297 -71.016304016
-v 17.295028687 14.950681686 -73.240432739
-v 16.225315094 14.950619698 -74.404861450
-v 15.059083939 14.950710297 -70.539947510
-v 15.723994255 14.950710297 -70.539947510
-v 15.723994255 15.099841118 -70.539947510
-v 15.059083939 15.099842072 -70.539947510
-v 15.059083939 15.099847794 -75.034667969
-v 15.062631607 14.950710297 -75.032218933
-v 15.993486404 16.043682098 -74.891418457
-v 17.580718994 18.601600647 -76.582916260
-v 17.608123779 18.033020020 -75.992507935
-v 18.956254959 16.238872528 -74.623527527
-v 16.658613205 17.280139923 -75.766830444
-v 16.858667374 16.648092270 -75.071937561
-v 14.842651367 19.999349594 -74.815307617
-v 15.058968544 20.170953751 -75.031242371
-v 15.689005852 16.945304871 -75.395370483
-v 14.469780922 17.697820663 -75.849273682
-v 14.633446693 16.660942078 -75.592468262
-v 15.504920006 18.060466766 -76.458518982
-v 15.058967590 20.286876678 -75.031242371
-v 15.580442429 22.254665375 -76.067657471
-v 16.570756912 21.943433762 -75.816146851
-v 16.149850845 21.184806824 -75.519653320
-v 15.663236618 21.165817261 -76.608116150
-v 15.639649391 20.889797211 -76.033630371
-v 15.230363846 20.653139114 -76.445938110
-v 17.006267548 21.571250916 -74.693077087
-v 16.605232239 21.943433762 -75.816146851
-v 14.933979988 22.035934448 -78.985809326
-v 14.907885551 21.989849091 -78.614784241
-v 15.965945244 20.967689514 -78.567970276
-v 15.890275955 21.048503876 -78.917999268
-v 15.283826828 22.158493042 -79.612579346
-v 17.397212982 19.778511047 -78.448715210
-v 16.154167175 21.231525421 -79.520309448
-v 17.266906738 19.912086487 -78.838211060
-v 14.990085602 21.806129456 -77.740325928
-v 15.364355087 21.519338608 -77.042915344
-v 16.191160202 20.680904388 -77.723434448
-v 14.957674980 22.561777115 -76.607536316
-v 15.367637634 22.353986740 -76.263748169
-v 14.490463257 22.840423584 -77.478836060
-v 16.308990479 19.685749054 -76.490653992
-v 16.175315857 20.300151825 -76.929840088
-v 18.414966583 18.401939392 -78.381942749
-v 17.587017059 19.222574234 -77.421653748
-v 18.426315308 18.667060852 -78.873901367
-v 17.356460571 20.098489761 -79.467292786
-v 15.592473984 19.060592651 -76.803924561
-v 14.817337990 18.983997345 -76.982727051
-v 10.541421890 20.371696472 -75.031005859
-v 10.541421890 20.232963562 -75.031005859
-v 10.370553970 20.016441345 -74.814689636
-v 13.694046021 19.710155487 -76.971282959
-v 13.428596497 20.853733063 -79.356292725
-v 13.365878105 20.853733063 -78.175544739
-v 13.549103737 20.215240479 -77.503173828
-v 14.390188217 22.835433960 -77.743637085
-v 14.358359337 22.587871552 -79.014625549
-v 14.372740746 22.729833603 -78.576995850
-v 14.723241806 22.743982315 -79.741401672
-v 13.407335281 23.436180115 -79.013099670
-v 13.797117233 23.424091339 -79.871200562
-v 10.370553970 20.062496185 -76.848564148
-v 10.370553970 19.209005356 -75.615425110
-v 10.834850311 19.107944489 -75.809478760
-v 11.038029671 18.942138672 -76.114372253
-v 11.038028717 19.652805328 -77.124366760
-v 10.834851265 19.931785583 -76.975364685
-v 10.370553017 20.662506104 -78.759712219
-v 10.370553017 20.425811768 -77.730094910
-v 10.370553017 20.730836868 -79.810394287
-v 10.834851265 20.531061172 -78.809997559
-v 10.834850311 20.294364929 -77.820701599
-v 11.038028717 19.969421387 -77.954490662
-v 11.038028717 19.256933212 -77.351943970
-v 11.038028717 19.579320908 -78.126243591
-v 10.834850311 19.308963776 -78.254318237
-v 9.841461182 19.308965683 -78.254318237
-v 9.841462135 19.494411469 -79.028625488
-v 11.038028717 19.775114059 -78.960319519
-v 11.038028717 20.174222946 -78.876060486
-v 10.834851265 19.494411469 -79.028625488
-v 10.835263252 20.599390030 -79.810279846
-v 11.038028717 19.848403931 -79.810272217
-v 9.841462135 19.556581497 -79.813507080
-v 11.038028717 20.235130310 -79.810279846
-v 10.834850311 19.556581497 -79.813507080
-v 12.184720993 16.376655579 -78.849044800
-v 12.877394676 19.252302170 -79.155899048
-v 13.270064354 19.252302170 -79.928024292
-v 13.095947266 18.804010391 -77.196586609
-v 12.300619125 17.382823944 -77.248023987
-v 12.916456223 19.252302170 -77.798713684
-v 12.728396416 17.382823944 -76.634635925
-v 13.275438309 18.355716705 -76.594451904
-v 13.140472412 17.382823944 -76.043762207
-v 10.370553017 15.343961716 -75.615753174
-v 10.370471001 15.343955994 -74.815055847
-v 10.834850311 18.582986832 -76.813499451
-v 9.841462135 18.582986832 -76.813499451
-v 9.841461182 19.003414154 -77.506736755
-v 11.038029671 18.719409943 -76.553642273
-v 10.834850311 19.003414154 -77.506736755
-v 10.834848404 14.951487541 -75.810676575
-v 11.038029671 14.951487541 -76.111419678
-v 11.044261932 14.951487541 -76.557403564
-v 12.175566673 14.938457489 -75.595718384
-v 10.567905426 14.951487541 -75.032218933
-v 10.567905426 15.099847794 -75.032218933
-v 10.561667442 15.099852562 -75.695053101
-v 10.561667442 14.951487541 -75.695053101
-v 11.428196907 14.924728394 -78.595741272
-v 12.577390671 16.376655579 -79.621170044
-v 11.820867538 14.924728394 -79.367866516
-v 10.834849358 14.937757492 -76.813499451
-v 9.841461182 14.988102913 -76.813499451
-v 9.797045708 18.615947723 -76.733764648
-v 9.841461182 14.988102913 -82.813499451
-v 9.841462135 19.003414154 -82.126091003
-v 9.841462135 18.582986832 -82.813499451
-v 9.841462135 19.308965683 -81.378509521
-v 9.841461182 19.494411469 -80.604202271
-v 12.481460571 28.903474808 -86.941497803
-v 15.313100815 28.903474808 -87.490287781
-v 15.296688080 29.545209885 -87.612686157
-v 12.481462479 29.988113403 -86.941497803
-v 12.481456757 27.488113403 -86.941490173
-v 9.841465950 29.988111496 -87.329231262
-v 9.841465950 28.858713150 -87.232696533
-v 9.841465950 27.488111496 -86.941505432
-v 14.277844429 23.393224716 -80.594512939
-v 14.455027580 23.561286926 -81.253829956
-v 12.481463432 24.737924576 -82.387504578
-v 14.723598480 23.582912445 -82.016731262
-v 15.364147186 23.638420105 -83.156723022
-v 9.841465950 26.238111496 -85.852500916
-v 12.481462479 26.238113403 -85.852493286
-v 15.360628128 27.045209885 -87.135848999
-v 15.797599792 25.972791672 -86.195816040
-v 12.481456757 25.488113403 -85.753501892
-v 9.841465950 25.488111496 -85.753494263
-v 15.738739014 25.267404556 -86.186729431
-v 17.516098022 23.335683823 -82.759796143
-v 18.653358459 23.667816162 -83.212455750
-v 18.540206909 24.219396591 -84.522186279
-v 17.128713608 23.555570602 -83.480865479
-v 18.667587280 22.528354645 -83.149971008
-v 18.762870789 23.123046875 -82.676109314
-v 17.769180298 22.723236084 -82.368392944
-v 17.548355103 22.285589218 -82.930236816
-v 18.299018860 21.698566437 -83.135536194
-v 18.299633026 22.112844467 -82.534400940
-v 17.343858719 22.503286362 -82.168144226
-v 17.795085907 20.623046875 -80.934585571
-v 18.047508240 20.899999619 -81.670639038
-v 16.956222534 21.655448914 -81.338508606
-v 18.500097275 21.186233521 -82.271835327
-v 16.428874969 22.516170502 -81.662994385
-v 17.385707855 21.768718719 -81.907676697
-v 18.294757843 20.863731384 -83.381980896
-v 18.220481873 19.797840118 -83.738861084
-v 17.601169586 20.357986450 -80.238296509
-v 15.655702591 22.447345734 -80.161003113
-v 16.550643921 21.352880478 -80.101470947
-v 16.722076416 21.495004654 -80.637100220
-v 15.806715012 22.605678558 -80.663780212
-v 17.070299149 22.044887543 -82.607398987
-v 16.659742355 20.853733063 -82.871192932
-v 15.355899811 20.853733063 -82.468498230
-v 17.451713562 20.503826141 -83.742225647
-v 15.295934677 23.441549301 -82.610466003
-v 15.500967979 23.194305420 -81.540473938
-v 15.980512619 22.986270905 -82.037948608
-v 15.275939941 23.389579773 -80.901260376
-v 15.670108795 23.259626389 -82.971130371
-v 16.010105133 22.582714081 -81.228546143
-v 16.294021606 22.860517502 -82.340133667
-v 17.028942108 23.000946045 -82.523216248
-v 16.547252655 23.328453064 -83.191894531
-v 15.091239929 23.186864853 -80.365119934
-v 13.821267128 20.853733063 -80.128417969
-v 14.063079834 20.853733063 -80.807723999
-v 14.746932030 20.853733063 -82.280418396
-v 14.285540581 20.853733063 -81.432670593
-v 13.734337807 19.252302170 -81.232284546
-v 9.841464996 24.988111496 -82.387512207
-v 10.834851265 20.531061172 -80.823043823
-v 10.370553017 20.662506104 -80.854789734
-v 10.834850311 19.494411469 -80.604202271
-v 11.038027763 19.785186768 -80.656471252
-v 11.038027763 20.192859650 -80.742454529
-v 10.370553017 20.425811768 -81.884399414
-v 10.370553017 20.063232422 -82.764175415
-v 10.834851265 20.294364929 -81.812347412
-v 11.038027763 19.579933167 -81.488693237
-v 11.038027763 20.007087708 -81.676666260
-v 11.038027763 19.668455124 -82.497688293
-v 10.547799110 20.234748840 -84.595985413
-v 15.059513092 20.232875824 -84.595672607
-v 15.059513092 20.371608734 -84.595672607
-v 10.370471001 20.016353607 -84.809814453
-v 14.845148087 20.016353607 -84.811607361
-v 14.552314758 19.252302170 -82.628776550
-v 14.338544846 16.376655579 -82.885971069
-v 16.162754059 19.252302170 -83.525245667
-v 10.834851265 19.003414154 -82.126091003
-v 10.834851265 19.308963776 -81.378509521
-v 11.038027763 19.267770767 -82.289009094
-v 10.834851265 19.106328964 -83.812103271
-v 10.834851265 19.931051254 -82.659362793
-v 10.370553017 19.210620880 -84.008270264
-v 11.038027763 18.965358734 -83.540084839
-v 11.038027763 18.739194870 -83.109741211
-v 10.834850311 18.582986832 -82.813499451
-v 13.707309723 19.186428070 -81.221466064
-v 13.041664124 16.376655579 -80.925430298
-v 13.527381897 14.924728394 -83.489402771
-v 11.570766449 14.924728394 -80.672126770
-v 10.834849358 14.937757492 -82.813499451
-v 17.518198013 19.252302170 -84.293426514
-v 18.020149231 18.335988998 -84.308212280
-v 18.102117538 15.832498550 -85.543647766
-v 18.853557587 15.782326698 -85.912292480
-v 16.129116058 16.376655579 -83.949760437
-v 15.060180664 14.937757492 -84.592330933
-v 17.285715103 16.376655579 -85.060470581
-v 18.787670135 20.662506104 -89.284408569
-v 17.758056641 20.425811768 -89.284408569
-v 16.876522064 20.062496185 -89.284408569
-v 17.848659515 20.294364929 -88.820106506
-v 18.837959290 20.531061172 -88.820106506
-v 18.904026031 20.174222946 -88.616928101
-v 16.581602097 18.719409943 -88.616928101
-v 17.379907608 19.256933212 -88.616928101
-v 17.152332306 19.652805328 -88.616928101
-v 17.003330231 19.931785583 -88.820106506
-v 15.837440491 19.107944489 -88.820106506
-v 16.142333984 18.942138672 -88.616928101
-v 16.841457367 18.582986832 -88.820106506
-v 16.831239700 18.582984924 -89.813499451
-v 17.534702301 19.003414154 -89.813499451
-v 19.056587219 19.494411469 -88.820106506
-v 17.982456207 19.969421387 -88.616928101
-v 18.988279343 19.775114059 -88.616928101
-v 18.154201508 19.579320908 -88.616928101
-v 17.769893646 14.937680244 -86.186363220
-v 16.585369110 14.950710297 -88.610694885
-v 17.534702301 19.003414154 -88.820106506
-v 18.282279968 19.308965683 -89.813499451
-v 19.056587219 19.494411469 -89.813499451
-v 18.282279968 19.308963776 -88.820106506
-v 16.139383316 14.950710297 -88.616928101
-v 10.370471001 15.343950272 -84.809814453
-v 11.038027763 14.937757492 -83.539611816
-v 10.567904472 15.099842072 -84.595870972
-v 15.060180664 15.099842072 -84.592330933
-v 14.845148087 15.343950272 -84.811607361
-v 10.567904472 14.937757492 -84.595870972
-v 10.841497421 14.937757492 -83.816322327
-v 11.038027763 14.937757492 -83.110107422
-v 10.370553017 15.343950272 -84.007942200
-v 10.561665535 15.099841118 -83.927925110
-v 10.561665535 14.937757492 -83.927925110
-v 15.643386841 19.209005356 -89.284408569
-v 14.842651367 20.016441345 -89.284408569
-v 15.058968544 20.371696472 -89.113540649
-v 15.059513092 20.232873917 -89.107162476
-v 15.643715858 15.343961716 -89.284408569
-v 15.838634491 14.950710297 -88.820114136
-v 14.843015671 15.343955994 -89.284484863
-v 15.060181618 14.950710297 -89.087051392
-v 15.060180664 15.099847794 -89.087051392
-v 15.723011017 14.950710297 -89.093292236
-v 15.723011017 15.099852562 -89.093292236
-f 1 2 3
-f 4 5 1
-f 6 7 4
-f 7 8 4
-f 8 9 4
-f 7 10 8
-f 4 1 3
-f 11 12 6
-f 12 13 6
-f 13 14 6
-f 12 15 13
-f 16 17 12
-f 6 18 7
-f 18 19 7
-f 6 20 18
-f 11 6 4
-f 11 16 12
-f 11 21 16
-f 22 23 11
-f 23 24 11
-f 24 25 11
-f 23 26 24
-f 22 27 23
-f 27 28 23
-f 29 30 3
-f 30 31 3
-f 31 22 3
-f 22 4 3
-f 22 11 4
-f 30 32 31
-f 31 33 22
-f 33 34 22
-f 31 35 33
-f 22 36 27
-f 37 38 39
-f 40 39 41
-f 41 42 40
-f 39 40 37
-f 43 44 38
-f 38 37 43
-f 45 46 47
-f 47 48 45
-f 49 46 45
-f 45 50 49
-f 51 52 53
-f 53 50 51
-f 49 54 55
-f 55 56 49
-f 54 49 50
-f 50 53 54
-f 48 47 39
-f 46 49 56
-f 50 45 44
-f 39 47 46
-f 44 45 48
-f 39 38 48
-f 44 51 50
-f 56 41 46
-f 46 41 39
-f 48 38 44
-f 52 57 58
-f 58 53 52
-f 59 55 54
-f 54 60 59
-f 60 54 53
-f 53 58 60
-f 61 58 57
-f 62 59 60
-f 60 63 62
-f 57 64 61
-f 63 60 58
-f 58 61 63
-f 65 66 67
-f 67 68 65
-f 69 70 71
-f 71 72 69
-f 72 71 66
-f 66 65 72
-f 64 73 74
-f 74 61 64
-f 75 62 63
-f 63 76 75
-f 76 63 61
-f 61 74 76
-f 77 75 76
-f 76 78 77
-f 73 79 80
-f 80 74 73
-f 78 76 74
-f 74 80 78
-f 81 82 83
-f 83 84 81
-f 81 85 86
-f 86 82 81
-f 87 77 78
-f 78 85 87
-f 79 88 86
-f 86 80 79
-f 85 78 80
-f 80 86 85
-f 82 86 88
-f 85 81 70
-f 84 83 66
-f 70 81 84
-f 66 83 82
-f 82 67 66
-f 66 71 84
-f 88 67 82
-f 84 71 70
-f 70 87 85
-f 6 14 89
-f 89 90 6
-f 14 13 91
-f 91 89 14
-f 13 15 92
-f 92 91 13
-f 90 89 93
-f 93 94 90
-f 89 91 95
-f 95 93 89
-f 91 92 96
-f 96 95 91
-f 97 98 19
-f 18 20 99
-f 99 97 18
-f 20 6 90
-f 90 99 20
-f 7 19 98
-f 98 100 7
-f 19 18 97
-f 99 90 94
-f 94 101 99
-f 100 98 102
-f 102 103 100
-f 98 97 104
-f 104 102 98
-f 97 99 101
-f 101 104 97
-f 15 12 105
-f 105 92 15
-f 12 17 106
-f 106 105 12
-f 107 106 17
-f 108 96 92
-f 105 106 109
-f 109 108 105
-f 110 109 106
-f 92 105 108
-f 17 16 107
-f 16 21 111
-f 111 107 16
-f 21 11 112
-f 112 111 21
-f 106 107 110
-f 107 111 113
-f 113 110 107
-f 111 112 114
-f 114 113 111
-f 11 25 115
-f 115 112 11
-f 25 24 116
-f 116 115 25
-f 24 26 117
-f 117 116 24
-f 26 23 118
-f 118 117 26
-f 23 28 119
-f 119 118 23
-f 120 121 116
-f 112 115 122
-f 122 114 112
-f 115 116 121
-f 121 122 115
-f 116 117 120
-f 123 124 118
-f 117 118 124
-f 124 120 117
-f 118 119 123
-f 28 27 125
-f 125 119 28
-f 27 36 126
-f 126 125 27
-f 127 126 36
-f 125 126 128
-f 119 125 129
-f 129 123 119
-f 130 128 126
-f 128 129 125
-f 96 108 131
-f 131 132 96
-f 108 109 133
-f 133 131 108
-f 134 133 109
-f 94 93 135
-f 135 136 94
-f 93 95 137
-f 137 135 93
-f 95 96 132
-f 132 137 95
-f 138 139 102
-f 104 101 140
-f 140 138 104
-f 101 94 136
-f 136 140 101
-f 103 102 139
-f 139 141 103
-f 102 104 138
-f 136 135 142
-f 142 143 136
-f 135 137 144
-f 144 142 135
-f 137 132 145
-f 145 144 137
-f 143 142 146
-f 146 147 143
-f 142 144 148
-f 148 146 142
-f 144 145 149
-f 149 148 144
-f 150 151 152
-f 152 153 150
-f 151 143 147
-f 147 152 151
-f 154 155 156
-f 156 157 154
-f 147 146 155
-f 155 154 147
-f 157 156 158
-f 155 159 160
-f 160 156 155
-f 146 148 159
-f 159 155 146
-f 161 158 162
-f 162 158 156
-f 163 164 153
-f 165 166 161
-f 164 163 167
-f 167 168 164
-f 153 152 163
-f 166 165 168
-f 168 167 166
-f 161 166 167
-f 167 157 161
-f 158 161 157
-f 165 161 162
-f 163 154 157
-f 157 167 163
-f 152 147 154
-f 154 163 152
-f 169 145 132
-f 131 133 170
-f 170 169 131
-f 171 170 133
-f 132 131 169
-f 145 169 172
-f 172 149 145
-f 169 170 173
-f 173 172 169
-f 174 173 170
-f 148 149 175
-f 175 159 148
-f 159 175 176
-f 176 160 159
-f 156 160 162
-f 177 162 160
-f 160 176 177
-f 165 162 178
-f 179 175 149
-f 162 180 178
-f 162 177 180
-f 176 181 180
-f 180 177 176
-f 175 179 181
-f 181 176 175
-f 149 172 179
-f 182 181 179
-f 172 173 183
-f 184 180 181
-f 181 182 184
-f 183 179 172
-f 179 183 182
-f 180 184 178
-f 185 182 183
-f 186 183 173
-f 178 184 182
-f 182 185 178
-f 183 186 185
-f 173 174 186
-f 140 136 143
-f 143 151 140
-f 141 139 187
-f 187 188 141
-f 139 138 150
-f 150 187 139
-f 138 140 151
-f 151 150 138
-f 188 187 189
-f 189 190 188
-f 187 150 153
-f 153 189 187
-f 191 192 193
-f 194 193 195
-f 196 195 165
-f 189 153 164
-f 165 197 198
-f 198 168 165
-f 164 199 189
-f 195 197 165
-f 199 164 168
-f 168 198 199
-f 193 198 197
-f 192 199 198
-f 198 193 192
-f 190 189 199
-f 199 192 190
-f 197 195 193
-f 123 129 200
-f 200 201 123
-f 129 128 202
-f 202 200 129
-f 203 202 128
-f 109 110 134
-f 110 113 204
-f 204 134 110
-f 113 114 205
-f 205 204 113
-f 114 122 206
-f 206 205 114
-f 122 121 207
-f 207 206 122
-f 121 120 208
-f 208 207 121
-f 120 124 209
-f 209 208 120
-f 124 123 201
-f 201 209 124
-f 133 134 171
-f 134 204 210
-f 210 171 134
-f 204 205 211
-f 211 210 204
-f 212 213 207
-f 205 206 214
-f 214 211 205
-f 206 207 213
-f 213 214 206
-f 207 208 212
-f 208 209 215
-f 215 212 208
-f 209 201 216
-f 216 215 209
-f 217 218 219
-f 165 178 220
-f 178 221 220
-f 221 217 220
-f 221 218 217
-f 170 171 174
-f 171 210 222
-f 222 174 171
-f 210 211 223
-f 223 222 210
-f 185 224 225
-f 226 186 174
-f 225 178 185
-f 186 226 224
-f 224 185 186
-f 174 222 226
-f 222 223 227
-f 228 225 224
-f 224 229 228
-f 227 226 222
-f 178 228 221
-f 178 225 228
-f 226 227 229
-f 229 224 226
-f 211 214 230
-f 230 223 211
-f 214 213 231
-f 231 230 214
-f 213 212 232
-f 232 231 213
-f 212 215 233
-f 233 232 212
-f 215 216 234
-f 234 233 215
-f 229 235 236
-f 227 237 235
-f 235 229 227
-f 236 228 229
-f 228 236 221
-f 221 236 235
-f 223 230 237
-f 237 227 223
-f 238 237 230
-f 235 239 221
-f 237 238 239
-f 239 235 237
-f 230 231 238
-f 219 239 238
-f 240 238 231
-f 238 240 219
-f 218 221 239
-f 239 219 218
-f 231 232 240
-f 240 241 242
-f 242 219 240
-f 219 242 217
-f 232 233 241
-f 241 240 232
-f 201 200 243
-f 243 216 201
-f 244 243 200
-f 200 202 244
-f 245 244 202
-f 216 243 246
-f 246 234 216
-f 243 244 247
-f 247 246 243
-f 248 247 244
-f 249 241 233
-f 242 250 251
-f 251 217 242
-f 217 251 220
-f 241 249 250
-f 250 242 241
-f 233 234 249
-f 234 246 252
-f 252 249 234
-f 220 251 250
-f 250 253 220
-f 249 252 253
-f 253 250 249
-f 252 254 255
-f 255 253 252
-f 246 247 254
-f 254 252 246
-f 256 220 253
-f 253 255 256
-f 220 256 257
-f 258 254 247
-f 259 255 254
-f 257 256 255
-f 9 8 260
-f 8 10 261
-f 261 260 8
-f 10 7 100
-f 100 261 10
-f 260 262 9
-f 263 264 5
-f 4 9 262
-f 262 263 4
-f 5 4 263
-f 262 260 265
-f 260 261 266
-f 266 265 260
-f 261 100 103
-f 103 266 261
-f 263 262 267
-f 267 268 263
-f 268 269 264
-f 265 267 262
-f 264 263 268
-f 3 2 270
-f 270 271 3
-f 2 1 272
-f 272 270 2
-f 5 264 1
-f 264 272 1
-f 3 271 29
-f 270 272 273
-f 273 274 270
-f 272 264 269
-f 269 273 272
-f 271 270 274
-f 275 271 276
-f 274 276 271
-f 31 32 277
-f 277 278 31
-f 32 30 279
-f 279 277 32
-f 30 29 275
-f 275 279 30
-f 271 275 29
-f 278 277 280
-f 280 281 278
-f 277 279 282
-f 282 280 277
-f 279 275 283
-f 283 282 279
-f 276 283 275
-f 284 285 34
-f 36 22 127
-f 22 34 285
-f 285 127 22
-f 33 35 286
-f 35 31 278
-f 278 286 35
-f 286 284 33
-f 34 33 284
-f 287 130 127
-f 288 287 285
-f 126 127 130
-f 127 285 287
-f 289 288 284
-f 286 278 281
-f 285 284 288
-f 281 289 286
-f 284 286 289
-f 290 291 274
-f 269 292 273
-f 292 290 273
-f 276 274 291
-f 291 293 276
-f 274 273 290
-f 293 294 276
-f 267 265 295
-f 265 266 296
-f 296 295 265
-f 266 103 141
-f 141 296 266
-f 295 297 267
-f 298 292 269
-f 268 267 297
-f 297 298 268
-f 269 268 298
-f 297 295 299
-f 295 296 300
-f 300 299 295
-f 296 141 188
-f 188 300 296
-f 299 301 297
-f 292 298 302
-f 302 303 292
-f 298 297 301
-f 301 302 298
-f 303 304 290
-f 305 306 304
-f 291 290 304
-f 304 306 291
-f 290 292 303
-f 301 299 307
-f 307 308 301
-f 299 300 309
-f 309 307 299
-f 300 188 190
-f 190 309 300
-f 310 196 311
-f 195 310 194
-f 312 196 165
-f 196 310 195
-f 313 191 194
-f 307 309 191
-f 193 194 191
-f 309 190 192
-f 192 191 309
-f 311 194 310
-f 308 307 313
-f 191 313 307
-f 313 314 308
-f 314 313 311
-f 194 311 313
-f 315 311 196
-f 311 315 314
-f 196 316 315
-f 317 316 196
-f 318 304 319
-f 304 303 319
-f 303 302 320
-f 320 319 303
-f 302 301 308
-f 308 320 302
-f 321 322 323
-f 312 317 196
-f 324 323 319
-f 312 325 317
-f 317 325 322
-f 320 308 314
-f 324 314 315
-f 315 321 324
-f 316 317 321
-f 321 315 316
-f 319 320 324
-f 322 321 317
-f 314 324 320
-f 323 324 321
-f 326 322 325
-f 322 326 327
-f 318 319 323
-f 323 327 318
-f 327 323 322
-f 326 328 329
-f 330 318 327
-f 312 331 328
-f 328 326 312
-f 329 328 332
-f 327 329 330
-f 318 330 333
-f 329 327 326
-f 334 335 44
-f 335 334 336
-f 336 337 335
-f 44 43 334
-f 42 41 338
-f 339 338 333
-f 333 330 339
-f 338 339 42
-f 42 339 334
-f 330 332 339
-f 332 330 329
-f 42 43 37
-f 37 40 42
-f 334 43 42
-f 340 305 333
-f 340 306 305
-f 341 306 340
-f 56 55 342
-f 333 305 304
-f 343 344 335
-f 335 344 51
-f 51 44 335
-f 344 345 52
-f 52 51 344
-f 346 345 344
-f 344 343 346
-f 335 337 343
-f 347 348 64
-f 64 57 347
-f 349 348 347
-f 345 346 350
-f 347 350 349
-f 350 347 345
-f 345 347 57
-f 57 52 345
-f 342 351 352
-f 352 341 342
-f 353 306 341
-f 341 352 353
-f 342 55 59
-f 59 351 342
-f 306 353 293
-f 294 293 353
-f 353 354 294
-f 293 291 306
-f 354 353 352
-f 62 355 351
-f 351 355 356
-f 356 352 351
-f 351 59 62
-f 352 356 354
-f 342 357 56
-f 41 56 357
-f 357 338 41
-f 338 357 340
-f 340 333 338
-f 357 342 341
-f 341 340 357
-f 333 304 318
-f 358 328 331
-f 332 328 358
-f 281 280 359
-f 359 360 281
-f 280 282 361
-f 361 359 280
-f 282 283 362
-f 362 361 282
-f 276 294 283
-f 294 362 283
-f 363 203 130
-f 364 363 287
-f 128 130 203
-f 130 287 363
-f 365 364 288
-f 289 281 360
-f 360 365 289
-f 287 288 364
-f 288 289 365
-f 325 312 326
-f 312 165 220
-f 366 331 312
-f 356 367 368
-f 355 62 75
-f 75 369 355
-f 355 369 367
-f 367 356 355
-f 339 332 370
-f 334 339 371
-f 372 336 334
-f 331 366 358
-f 366 373 374
-f 374 358 366
-f 375 376 377
-f 377 378 375
-f 376 375 358
-f 378 377 379
-f 358 374 376
-f 334 380 372
-f 370 371 339
-f 371 380 334
-f 358 370 332
-f 361 362 368
-f 368 381 361
-f 381 368 367
-f 362 294 354
-f 368 354 356
-f 354 368 362
-f 67 88 382
-f 383 382 88
-f 382 384 385
-f 385 386 382
-f 88 79 383
-f 383 387 384
-f 384 382 383
-f 382 386 67
-f 388 367 369
-f 369 389 388
-f 367 388 381
-f 369 75 77
-f 77 389 369
-f 79 73 390
-f 390 391 387
-f 387 383 390
-f 348 390 73
-f 348 349 391
-f 73 64 348
-f 390 383 79
-f 391 390 348
-f 359 361 381
-f 381 379 359
-f 360 359 379
-f 379 392 360
-f 381 393 379
-f 389 77 87
-f 394 381 388
-f 393 395 379
-f 394 395 393
-f 381 394 393
-f 203 363 396
-f 202 203 245
-f 396 245 203
-f 397 396 363
-f 398 397 364
-f 392 398 365
-f 365 360 392
-f 363 364 397
-f 364 365 398
-f 373 366 399
-f 366 312 399
-f 312 400 399
-f 312 220 400
-f 244 245 248
-f 245 396 401
-f 401 248 245
-f 396 397 402
-f 402 401 396
-f 403 258 248
-f 247 248 258
-f 404 259 258
-f 220 257 400
-f 255 259 257
-f 405 257 259
-f 259 404 405
-f 254 258 259
-f 248 401 403
-f 257 405 400
-f 258 403 404
-f 400 405 404
-f 406 403 401
-f 403 406 407
-f 404 407 400
-f 401 402 406
-f 407 404 403
-f 397 398 408
-f 408 402 397
-f 398 392 409
-f 409 408 398
-f 392 379 377
-f 377 409 392
-f 373 399 410
-f 411 412 410
-f 399 413 414
-f 414 410 399
-f 400 413 399
-f 411 406 402
-f 406 411 414
-f 414 407 406
-f 407 414 413
-f 402 408 411
-f 413 400 407
-f 376 412 409
-f 374 410 412
-f 409 377 376
-f 410 374 373
-f 412 376 374
-f 408 409 412
-f 412 411 408
-f 410 414 411
-f 389 415 394
-f 394 388 389
-f 415 416 395
-f 379 395 378
-f 87 415 389
-f 395 394 415
-f 415 87 70
-f 70 416 415
-f 68 67 386
-f 385 372 380
-f 380 386 385
-f 416 371 378
-f 416 70 69
-f 69 371 416
-f 378 395 416
-f 386 380 68
-f 378 370 358
-f 68 69 72
-f 72 65 68
-f 370 378 371
-f 358 375 378
-f 69 68 380
-f 380 371 69
-f 417 418 419
-f 420 421 418
-f 422 423 421
-f 424 425 423
-f 426 427 425
-f 428 429 427
-f 430 431 429
-f 432 433 431
-f 418 417 420
-f 427 426 428
-f 423 422 424
-f 429 428 430
-f 421 420 422
-f 431 430 432
-f 425 424 426
-f 433 432 434
-f 435 436 437
-f 438 436 435
-f 439 437 436
-f 437 439 440
-f 429 438 435
-f 438 429 431
-f 441 442 443
-f 441 433 442
-f 444 436 445
-f 438 445 436
-f 446 445 438
-f 446 433 441
-f 431 446 438
-f 446 431 433
-f 384 447 448
-f 436 444 439
-f 385 384 448
-f 447 449 450
-f 384 387 447
-f 448 450 451
-f 450 448 447
-f 440 452 437
-f 453 437 452
-f 435 437 453
-f 452 440 454
-f 427 435 453
-f 435 427 429
-f 454 455 452
-f 456 452 455
-f 425 453 456
-f 453 425 427
-f 453 452 456
-f 455 454 457
-f 458 459 460
-f 387 391 459
-f 387 459 447
-f 449 447 459
-f 459 458 449
-f 391 460 459
-f 461 460 462
-f 349 462 460
-f 391 349 460
-f 460 461 458
-f 457 458 461
-f 449 454 440
-f 454 449 458
-f 450 440 439
-f 440 450 449
-f 451 439 444
-f 439 451 450
-f 458 457 454
-f 463 464 451
-f 465 372 464
-f 448 464 372
-f 466 467 468
-f 469 470 466
-f 468 471 466
-f 470 472 467
-f 467 466 470
-f 466 471 469
-f 469 471 468
-f 451 464 448
-f 444 445 469
-f 444 463 451
-f 372 385 448
-f 470 445 446
-f 441 470 446
-f 445 470 469
-f 473 444 469
-f 473 463 444
-f 470 441 472
-f 474 455 475
-f 456 455 474
-f 475 457 476
-f 457 475 455
-f 423 456 474
-f 456 423 425
-f 477 475 478
-f 474 475 477
-f 421 474 477
-f 474 421 423
-f 478 476 479
-f 476 478 475
-f 480 462 481
-f 476 461 480
-f 461 476 457
-f 462 480 461
-f 350 481 462
-f 349 350 462
-f 479 480 482
-f 482 481 483
-f 483 484 482
-f 346 343 483
-f 346 483 481
-f 350 346 481
-f 481 482 480
-f 480 479 476
-f 485 479 486
-f 479 485 478
-f 487 478 485
-f 418 477 487
-f 477 418 421
-f 477 478 487
-f 484 483 488
-f 488 489 484
-f 482 486 479
-f 486 482 484
-f 343 488 483
-f 484 490 486
-f 491 485 492
-f 487 419 418
-f 487 485 491
-f 490 484 489
-f 492 486 490
-f 486 492 485
-f 493 419 491
-f 493 494 419
-f 419 487 491
-f 493 495 494
-f 372 465 336
-f 337 336 465
-f 496 497 465
-f 498 489 496
-f 499 491 492
-f 489 498 490
-f 490 499 492
-f 500 491 501
-f 491 500 493
-f 491 499 501
-f 499 490 498
-f 337 497 488
-f 343 337 488
-f 489 488 497
-f 497 496 489
-f 465 497 337
-f 499 502 503
-f 503 502 504
-f 505 504 500
-f 504 505 503
-f 503 505 499
-f 499 505 501
-f 500 501 505
-f 506 442 433
-f 507 443 442
-f 508 441 443
-f 433 434 506
-f 442 506 507
-f 443 507 508
-f 472 508 509
-f 463 473 510
-f 469 468 511
-f 512 467 472
-f 508 472 441
-f 473 469 513
-f 464 463 514
-f 515 468 467
-f 511 513 469
-f 510 514 463
-f 513 510 473
-f 515 511 468
-f 514 516 464
-f 467 512 515
-f 472 509 512
-f 499 498 517
-f 518 500 504
-f 502 499 519
-f 498 496 520
-f 465 464 516
-f 496 465 521
-f 522 504 502
-f 516 521 465
-f 520 517 498
-f 502 519 522
-f 517 519 499
-f 521 520 496
-f 504 522 518
-f 494 523 417
-f 493 524 525
-f 495 525 523
-f 493 518 524
-f 518 493 500
-f 525 495 493
-f 417 419 494
-f 523 494 495
-f 508 506 434
-f 508 507 506
-f 508 434 526
-f 434 527 526
-f 526 528 529
-f 527 528 526
-f 530 529 528
-f 531 532 533
-f 527 434 432
-f 529 530 531
-f 534 528 535
-f 527 535 528
-f 536 535 527
-f 528 534 530
-f 432 536 527
-f 536 432 430
-f 532 531 530
-f 537 538 539
-f 540 530 534
-f 532 539 538
-f 538 533 532
-f 530 540 532
-f 535 541 534
-f 541 535 542
-f 536 542 535
-f 430 543 536
-f 543 430 428
-f 543 542 536
-f 544 542 545
-f 428 546 543
-f 546 428 426
-f 542 544 541
-f 543 545 542
-f 546 545 543
-f 534 547 540
-f 548 539 549
-f 550 548 549
-f 540 549 539
-f 539 532 540
-f 549 540 547
-f 547 534 541
-f 548 537 539
-f 551 550 552
-f 547 552 549
-f 553 541 544
-f 541 553 547
-f 550 549 552
-f 552 547 553
-f 510 554 514
-f 514 555 516
-f 556 555 514
-f 513 533 510
-f 533 513 531
-f 511 526 529
-f 509 526 557
-f 526 509 508
-f 531 511 529
-f 526 511 557
-f 511 531 513
-f 514 554 556
-f 556 554 538
-f 533 538 554
-f 537 556 538
-f 554 510 533
-f 558 515 512
-f 512 559 558
-f 509 557 559
-f 559 512 509
-f 515 558 511
-f 559 557 511
-f 511 558 559
-f 545 560 544
-f 560 545 561
-f 426 562 546
-f 562 426 424
-f 546 561 545
-f 562 561 546
-f 424 563 562
-f 563 424 422
-f 561 564 560
-f 564 561 565
-f 562 565 561
-f 563 565 562
-f 551 552 566
-f 567 551 566
-f 566 553 568
-f 553 566 552
-f 544 568 553
-f 568 544 560
-f 567 566 569
-f 570 567 569
-f 570 569 571
-f 568 569 566
-f 572 560 564
-f 560 572 568
-f 572 571 569
-f 569 568 572
-f 573 565 574
-f 422 575 563
-f 575 422 420
-f 565 573 564
-f 563 574 565
-f 575 574 563
-f 576 564 573
-f 574 577 573
-f 578 570 571
-f 564 576 572
-f 573 579 576
-f 576 580 571
-f 571 572 576
-f 577 574 581
-f 575 581 574
-f 582 581 575
-f 579 573 577
-f 420 582 575
-f 582 420 417
-f 524 417 523
-f 524 523 525
-f 582 417 524
-f 521 516 579
-f 580 516 583
-f 583 516 555
-f 520 521 577
-f 584 581 582
-f 577 581 517
-f 524 584 582
-f 584 524 518
-f 583 585 580
-f 578 571 580
-f 585 578 580
-f 579 516 580
-f 577 521 579
-f 580 576 579
-f 520 577 517
-f 581 584 517
-f 519 586 587
-f 517 586 519
-f 517 587 586
-f 584 518 522
-f 517 584 587
-f 522 587 584
-f 587 522 519
-f 588 589 590
-f 591 592 593
-f 593 589 591
-f 594 591 589
-f 589 588 594
-f 595 596 592
-f 592 591 595
-f 597 598 599
-f 590 600 599
-f 599 598 590
-f 589 593 600
-f 600 590 589
-f 590 601 588
-f 602 597 603
-f 602 598 597
-f 601 590 598
-f 598 602 601
-f 594 604 605
-f 606 604 607
-f 604 594 588
-f 588 607 604
-f 608 595 591
-f 591 594 608
-f 605 608 594
-f 609 610 611
-f 612 610 609
-f 610 612 596
-f 596 595 610
-f 611 610 595
-f 609 611 613
-f 613 611 614
-f 595 608 611
-f 614 611 608
-f 608 605 614
-f 615 616 617
-f 618 616 615
-f 618 614 616
-f 613 614 618
-f 615 617 619
-f 616 614 605
-f 605 620 616
-f 617 616 620
-f 621 622 623
-f 620 605 604
-f 604 606 620
-f 622 620 606
-f 606 623 622
-f 620 622 617
-f 619 624 625
-f 619 617 624
-f 626 627 628
-f 626 629 627
-f 625 629 626
-f 625 624 629
-f 624 617 622
-f 630 621 631
-f 622 621 624
-f 629 624 621
-f 621 630 629
-f 627 629 630
-f 630 632 627
-f 607 633 606
-f 623 606 633
-f 633 634 623
-f 633 607 635
-f 634 633 636
-f 636 637 634
-f 638 603 639
-f 602 638 635
-f 638 602 603
-f 640 639 641
-f 640 638 639
-f 637 636 640
-f 635 601 602
-f 636 635 638
-f 638 640 636
-f 607 588 601
-f 601 635 607
-f 635 636 633
-f 642 643 644
-f 644 645 642
-f 637 646 647
-f 643 647 646
-f 646 644 643
-f 647 634 637
-f 648 649 650
-f 640 651 637
-f 646 637 651
-f 651 650 646
-f 644 646 650
-f 651 641 648
-f 651 640 641
-f 648 650 651
-f 652 650 649
-f 652 653 650
-f 654 652 655
-f 650 653 644
-f 654 653 652
-f 645 644 653
-f 653 654 645
-f 643 642 656
-f 631 623 634
-f 657 631 647
-f 634 647 631
-f 647 643 657
-f 656 657 643
-f 632 630 657
-f 623 631 621
-f 657 656 632
-f 631 657 630
-f 658 659 660
-f 661 593 592
-f 662 659 663
-f 663 661 662
-f 659 658 664
-f 664 663 659
-f 662 592 596
-f 592 662 661
-f 665 666 667
-f 668 669 665
-f 670 669 668
-f 668 603 597
-f 597 670 668
-f 593 661 671
-f 671 600 593
-f 661 663 672
-f 672 671 661
-f 663 664 673
-f 673 672 663
-f 672 673 674
-f 674 675 672
-f 600 671 676
-f 676 599 600
-f 671 672 675
-f 675 676 671
-f 674 676 675
-f 674 599 676
-f 670 599 674
-f 670 597 599
-f 677 673 664
-f 678 664 658
-f 679 658 680
-f 681 679 682
-f 681 683 684
-f 684 685 681
-f 679 681 685
-f 685 678 679
-f 658 679 678
-f 673 677 686
-f 687 674 686
-f 687 669 670
-f 686 674 673
-f 674 687 670
-f 688 689 684
-f 678 685 690
-f 664 678 677
-f 685 684 689
-f 689 690 685
-f 690 677 678
-f 691 686 677
-f 692 691 693
-f 693 694 692
-f 687 686 691
-f 691 692 687
-f 695 694 693
-f 695 687 692
-f 695 689 688
-f 695 693 689
-f 690 689 693
-f 688 684 696
-f 693 691 690
-f 677 690 691
-f 692 694 695
-f 666 696 697
-f 688 666 695
-f 688 696 666
-f 696 698 697
-f 697 698 699
-f 669 687 695
-f 667 697 700
-f 666 665 669
-f 556 537 699
-f 666 669 695
-f 699 700 697
-f 697 667 666
-f 612 701 702
-f 701 703 660
-f 703 704 680
-f 704 701 612
-f 704 703 701
-f 705 612 609
-f 706 707 708
-f 709 710 706
-f 705 708 707
-f 711 708 705
-f 707 706 710
-f 705 707 712
-f 713 714 715
-f 716 717 710
-f 717 716 718
-f 710 719 707
-f 719 710 717
-f 715 718 716
-f 718 715 714
-f 680 660 703
-f 702 660 659
-f 659 662 702
-f 682 680 704
-f 702 596 612
-f 660 680 658
-f 660 702 701
-f 596 702 662
-f 704 612 712
-f 612 705 712
-f 712 707 719
-f 712 720 704
-f 721 722 723
-f 722 724 725
-f 726 724 722
-f 727 724 726
-f 722 728 726
-f 720 725 724
-f 683 681 729
-f 682 729 681
-f 680 682 679
-f 721 729 727
-f 729 682 720
-f 723 683 721
-f 729 721 683
-f 722 712 719
-f 712 722 725
-f 722 717 723
-f 704 720 682
-f 717 722 719
-f 720 712 725
-f 714 730 718
-f 730 714 731
-f 731 714 713
-f 713 732 731
-f 718 723 717
-f 723 718 730
-f 727 728 721
-f 720 727 729
-f 728 722 721
-f 724 727 720
-f 726 728 727
-f 609 711 705
-f 711 609 613
-f 613 733 711
-f 711 734 708
-f 733 734 711
-f 735 708 734
-f 733 613 618
-f 710 709 716
-f 736 713 715
-f 737 716 709
-f 716 737 715
-f 736 715 737
-f 738 736 737
-f 708 735 706
-f 739 706 735
-f 706 739 709
-f 740 709 739
-f 709 740 737
-f 738 737 740
-f 741 738 740
-f 723 730 683
-f 684 683 742
-f 683 730 743
-f 744 742 743
-f 743 745 744
-f 746 744 745
-f 747 746 748
-f 743 742 683
-f 745 748 746
-f 733 749 734
-f 734 750 735
-f 750 734 749
-f 751 749 733
-f 618 751 733
-f 751 618 615
-f 739 752 740
-f 753 741 752
-f 741 740 752
-f 735 754 739
-f 754 735 750
-f 752 739 754
-f 615 755 751
-f 755 615 619
-f 619 756 755
-f 757 754 758
-f 754 757 752
-f 753 752 757
-f 759 753 757
-f 758 750 760
-f 750 758 754
-f 751 761 749
-f 755 761 751
-f 755 762 761
-f 749 760 750
-f 760 749 761
-f 761 763 760
-f 760 764 758
-f 759 757 765
-f 766 759 765
-f 764 760 763
-f 765 758 764
-f 758 765 757
-f 756 619 625
-f 625 767 756
-f 767 625 626
-f 756 762 755
-f 756 768 762
-f 767 768 756
-f 763 761 762
-f 762 769 763
-f 769 762 768
-f 770 764 771
-f 764 770 765
-f 766 765 770
-f 772 766 770
-f 763 771 764
-f 771 763 769
-f 773 774 775
-f 776 773 777
-f 774 627 632
-f 632 775 774
-f 775 777 773
-f 777 778 776
-f 771 779 770
-f 768 780 769
-f 767 781 768
-f 772 770 779
-f 779 771 782
-f 782 769 780
-f 769 782 771
-f 783 628 784
-f 784 785 786
-f 784 628 785
-f 784 773 776
-f 784 786 773
-f 786 774 773
-f 786 785 774
-f 628 774 785
-f 628 627 774
-f 780 768 781
-f 783 781 767
-f 626 783 767
-f 783 626 628
-f 748 778 747
-f 778 777 787
-f 787 747 778
-f 777 775 788
-f 788 787 777
-f 775 632 656
-f 656 788 775
-f 731 789 790
-f 789 731 732
-f 730 791 743
-f 791 731 790
-f 791 730 731
-f 792 793 745
-f 745 743 792
-f 793 794 748
-f 748 745 793
-f 778 748 794
-f 795 743 796
-f 795 792 743
-f 794 776 778
-f 793 797 798
-f 792 795 799
-f 793 798 794
-f 792 797 793
-f 792 799 797
-f 789 800 779
-f 780 791 782
-f 782 790 779
-f 800 772 779
-f 796 743 791
-f 779 790 789
-f 796 791 780
-f 791 790 782
-f 780 781 795
-f 794 784 776
-f 794 798 784
-f 801 781 783
-f 781 801 795
-f 796 780 795
-f 784 801 783
-f 801 784 798
-f 799 802 803
-f 801 798 797
-f 797 803 801
-f 803 802 795
-f 803 797 799
-f 795 801 803
-f 795 802 799
-f 668 665 804
-f 667 805 665
-f 805 667 806
-f 603 668 804
-f 700 806 667
-f 804 665 805
-f 806 807 805
-f 808 805 807
-f 804 805 808
-f 807 806 809
-f 639 804 808
-f 804 639 603
-f 537 548 810
-f 537 810 699
-f 810 811 700
-f 811 810 812
-f 700 699 810
-f 548 812 810
-f 813 812 814
-f 550 814 812
-f 806 700 811
-f 812 813 811
-f 548 550 812
-f 811 809 806
-f 809 811 813
-f 815 809 816
-f 817 807 815
-f 808 807 817
-f 641 808 817
-f 808 641 639
-f 809 815 807
-f 648 817 818
-f 817 648 641
-f 817 815 818
-f 816 819 815
-f 818 815 819
-f 819 816 820
-f 551 821 814
-f 550 551 814
-f 814 822 813
-f 822 814 821
-f 816 813 822
-f 813 816 809
-f 821 823 822
-f 823 821 824
-f 567 824 821
-f 822 820 816
-f 820 822 823
-f 551 567 821
-f 825 698 696
-f 555 556 699
-f 699 698 555
-f 826 555 698
-f 825 826 698
-f 827 828 825
-f 555 826 583
-f 827 825 696
-f 829 819 830
-f 818 819 829
-f 649 818 829
-f 818 649 648
-f 823 831 820
-f 830 820 831
-f 820 830 819
-f 829 830 832
-f 833 831 834
-f 832 830 833
-f 831 833 830
-f 829 652 649
-f 835 824 836
-f 570 578 836
-f 570 836 824
-f 567 570 824
-f 831 823 835
-f 824 835 823
-f 837 836 838
-f 835 834 831
-f 834 835 837
-f 838 839 837
-f 578 838 836
-f 578 585 838
-f 836 837 835
-f 585 840 838
-f 841 833 842
-f 839 838 840
-f 837 843 834
-f 843 837 839
-f 842 834 843
-f 834 842 833
-f 655 832 841
-f 832 655 652
-f 652 829 832
-f 832 833 841
-f 844 845 846
-f 847 655 846
-f 847 654 655
-f 848 846 845
-f 848 847 846
-f 849 845 844
-f 849 848 845
-f 844 846 655
-f 844 655 841
-f 850 849 844
-f 851 852 853
-f 853 854 851
-f 855 856 852
-f 852 851 855
-f 853 852 857
-f 857 854 853
-f 857 852 856
-f 857 858 854
-f 851 850 855
-f 858 857 828
-f 858 851 854
-f 851 859 850
-f 858 859 851
-f 826 840 585
-f 585 583 826
-f 840 825 839
-f 825 840 826
-f 839 828 843
-f 828 839 825
-f 850 844 855
-f 857 841 842
-f 841 857 856
-f 843 857 842
-f 857 843 828
-f 855 841 856
-f 841 855 844
-f 860 861 848
-f 848 849 860
-f 861 862 847
-f 847 848 861
-f 862 645 654
-f 654 847 862
-f 863 860 849
-f 827 864 859
-f 859 858 827
-f 864 863 850
-f 858 828 827
-f 849 850 863
-f 850 859 864
-f 696 684 865
-f 742 865 684
-f 865 827 696
-f 865 866 864
-f 866 867 863
-f 868 642 645
-f 645 862 868
-f 869 870 861
-f 861 860 869
-f 870 868 862
-f 862 861 870
-f 867 869 860
-f 863 864 866
-f 864 827 865
-f 860 863 867
-f 747 787 870
-f 787 788 868
-f 868 870 787
-f 870 869 747
-f 788 656 642
-f 642 868 788
-f 746 747 869
-f 744 746 867
-f 867 866 744
-f 866 865 742
-f 869 867 746
-f 742 744 866
-f 871 872 873
-f 872 871 874
-f 874 875 872
-f 875 874 876
-f 876 877 875
-f 877 876 878
-f 878 879 877
-f 879 878 880
-f 880 881 879
-f 881 880 882
-f 882 883 881
-f 883 882 884
-f 884 885 883
-f 885 884 886
-f 886 887 885
-f 887 886 888
-f 889 890 891
-f 892 891 893
-f 890 889 894
-f 895 893 891
-f 891 890 895
-f 894 896 897
-f 898 899 900
-f 901 871 898
-f 898 871 899
-f 902 903 904
-f 904 905 902
-f 905 904 906
-f 903 902 893
-f 907 876 874
-f 901 874 871
-f 905 908 909
-f 902 909 910
-f 911 878 876
-f 876 907 911
-f 909 902 905
-f 908 905 912
-f 896 894 889
-f 891 913 889
-f 913 891 892
-f 914 889 913
-f 889 914 896
-f 907 915 911
-f 911 915 916
-f 916 896 914
-f 896 916 915
-f 893 910 892
-f 910 893 902
-f 906 912 905
-f 917 918 912
-f 912 918 908
-f 919 909 908
-f 908 920 919
-f 921 919 920
-f 920 922 921
-f 923 880 878
-f 919 921 924
-f 925 926 927
-f 923 926 925
-f 880 923 925
-f 922 920 928
-f 913 929 914
-f 929 913 930
-f 926 914 929
-f 914 926 916
-f 892 930 913
-f 930 892 931
-f 931 892 910
-f 930 932 929
-f 932 930 933
-f 927 929 932
-f 929 927 926
-f 934 931 935
-f 931 933 930
-f 933 931 934
-f 935 910 909
-f 924 935 919
-f 928 936 922
-f 918 928 920
-f 937 936 928
-f 938 937 928
-f 917 938 918
-f 938 928 918
-f 910 935 931
-f 935 924 934
-f 909 919 935
-f 920 908 918
-f 878 911 923
-f 923 916 926
-f 911 916 923
-f 939 898 900
-f 900 940 939
-f 941 899 871
-f 871 873 941
-f 940 900 899
-f 899 941 940
-f 939 942 898
-f 943 944 945
-f 946 943 945
-f 947 946 945
-f 945 948 949
-f 944 948 945
-f 950 949 942
-f 897 951 944
-f 897 946 894
-f 894 947 890
-f 952 951 901
-f 898 952 901
-f 953 895 890
-f 893 895 903
-f 897 915 951
-f 954 904 903
-f 907 951 915
-f 901 951 907
-f 874 901 907
-f 915 897 896
-f 955 903 895
-f 956 906 904
-f 957 912 906
-f 958 957 906
-f 957 917 912
-f 959 958 906
-f 904 954 956
-f 903 955 954
-f 943 897 944
-f 943 946 897
-f 952 898 942
-f 951 952 944
-f 944 960 948
-f 948 960 961
-f 952 942 949
-f 944 952 961
-f 949 961 952
-f 961 949 948
-f 944 961 960
-f 890 947 953
-f 895 953 955
-f 906 956 959
-f 946 947 894
-f 954 955 953
-f 953 956 954
-f 962 953 947
-f 959 956 963
-f 964 956 953
-f 953 962 964
-f 947 965 962
-f 964 963 956
-f 966 967 968
-f 968 967 945
-f 969 968 950
-f 970 969 971
-f 972 968 969
-f 887 970 939
-f 970 973 974
-f 970 887 973
-f 877 879 881
-f 881 883 875
-f 883 885 872
-f 885 887 873
-f 939 873 887
-f 939 941 873
-f 939 940 941
-f 875 877 881
-f 872 875 883
-f 873 872 885
-f 971 939 970
-f 887 888 975
-f 975 973 887
-f 976 974 973
-f 973 975 976
-f 977 970 974
-f 974 976 977
-f 977 969 970
-f 968 972 966
-f 978 979 967
-f 980 965 967
-f 966 978 967
-f 969 981 972
-f 965 947 967
-f 979 980 967
-f 969 977 981
-f 945 967 947
-f 945 950 968
-f 950 971 969
-f 949 950 945
-f 942 939 971
-f 942 971 950
-f 982 983 984
-f 985 986 987
-f 984 985 982
-f 987 982 985
-f 988 927 989
-f 925 927 988
-f 932 989 927
-f 882 925 988
-f 988 989 990
-f 991 921 922
-f 922 992 991
-f 983 991 992
-f 992 984 983
-f 988 884 882
-f 925 882 880
-f 993 924 921
-f 994 993 991
-f 936 995 992
-f 995 996 984
-f 991 983 994
-f 992 922 936
-f 984 992 995
-f 921 991 993
-f 997 998 999
-f 998 997 1000
-f 990 989 1001
-f 1000 997 993
-f 999 1002 1003
-f 1002 999 998
-f 1001 1003 1002
-f 1003 1001 989
-f 989 932 1003
-f 997 934 924
-f 934 999 933
-f 999 934 997
-f 933 1003 932
-f 1003 933 999
-f 1004 995 936
-f 937 1004 936
-f 1005 996 995
-f 1004 1005 995
-f 924 993 997
-f 993 994 1000
-f 996 1006 985
-f 1006 1007 986
-f 1005 1008 996
-f 1009 1010 982
-f 1010 994 983
-f 1011 1001 1012
-f 1012 1002 1013
-f 1002 1012 1001
-f 998 1013 1002
-f 990 1001 1011
-f 1014 1000 1015
-f 1013 998 1014
-f 1015 1000 994
-f 1000 1014 998
-f 977 975 888
-f 977 976 975
-f 888 1011 1016
-f 977 888 1016
-f 1010 1009 1017
-f 1017 1015 1010
-f 1015 1018 1014
-f 1018 1015 1017
-f 1019 1014 1018
-f 994 1010 1015
-f 886 990 1011
-f 990 886 884
-f 884 988 990
-f 985 984 996
-f 986 985 1006
-f 982 987 1009
-f 983 982 1010
-f 1011 888 886
-f 962 1009 987
-f 1008 1006 996
-f 1020 986 1007
-f 1021 1007 1006
-f 1008 1021 1006
-f 1022 987 986
-f 1011 1012 1016
-f 1023 1013 1019
-f 1013 1023 1012
-f 1014 1019 1013
-f 1016 1012 1023
-f 964 1007 1021
-f 986 1020 1022
-f 1017 980 1018
-f 965 1017 1009
-f 987 1022 962
-f 1018 979 1019
-f 1019 978 1023
-f 978 1016 1023
-f 1016 981 977
-f 1016 978 1024
-f 979 1018 980
-f 978 1019 979
-f 981 1016 1024
-f 1021 963 964
-f 1009 962 965
-f 1022 1020 964
-f 1007 964 1020
-f 980 1017 965
-f 964 962 1022
-f 1025 972 981
-f 981 1024 1025
-f 1025 1024 978
-f 978 1026 1025
-f 1026 966 972
-f 966 1026 978
-f 972 1025 1026
-f 1027 1028 1029
-f 1030 1031 1032
-f 1032 1029 1030
-f 1033 1029 1028
-f 1034 1030 1029
-f 1029 1033 1034
-f 1029 1032 1027
-f 1027 1035 1036
-f 1032 1037 1035
-f 1035 1027 1032
-f 1031 1038 1037
-f 1037 1032 1031
-f 1028 1027 1039
-f 1040 1034 1033
-f 1033 1041 1040
-f 1042 1041 1043
-f 1044 1040 1041
-f 1028 1045 1033
-f 1043 1045 1046
-f 1047 1043 1048
-f 1041 1033 1045
-f 1045 1043 1041
-f 1045 1028 1049
-f 1049 1046 1045
-f 1036 1039 1027
-f 1039 1049 1028
-f 1039 1036 1050
-f 1046 1048 1043
-f 1051 1048 1050
-f 1049 1039 1050
-f 1046 1049 1050
-f 1048 1046 1050
-f 1043 1047 1042
-f 1041 1042 1044
-f 1052 1047 1051
-f 1053 1042 1047
-f 1047 1052 1053
-f 1054 1044 1042
-f 1042 1053 1054
-f 1055 1053 1052
-f 1052 1056 1055
-f 1057 1054 1053
-f 1053 1055 1057
-f 1058 1055 1056
-f 1059 1057 1055
-f 1055 1058 1059
-f 1060 1056 1061
-f 1062 1060 1063
-f 1056 1060 1058
-f 1064 1058 1060
-f 1060 1062 1064
-f 1065 1059 1058
-f 1058 1064 1065
-f 1051 1066 1052
-f 1056 1052 1066
-f 1066 1061 1056
-f 1048 1051 1047
-f 1061 1063 1060
-f 1066 1051 1050
-f 1061 1066 1050
-f 1063 1061 1050
-f 1067 1063 1050
-f 1063 1067 1062
-f 1068 1069 1070
-f 1070 1071 1068
-f 1071 1072 1073
-f 1073 1068 1071
-f 1038 1073 1072
-f 1072 1037 1038
-f 1072 1071 1074
-f 1074 1075 1072
-f 1075 1035 1037
-f 1037 1072 1075
-f 1069 1076 1077
-f 1077 1070 1069
-f 1077 1078 1079
-f 1076 1080 1078
-f 1078 1077 1076
-f 1070 1077 1081
-f 1081 1082 1070
-f 1082 1074 1071
-f 1071 1070 1082
-f 1079 1081 1077
-f 1083 1084 1075
-f 1075 1074 1083
-f 1074 1082 1085
-f 1085 1083 1074
-f 1084 1036 1035
-f 1035 1075 1084
-f 1082 1081 1086
-f 1086 1085 1082
-f 1081 1079 1087
-f 1087 1086 1081
-f 1083 1085 1088
-f 1088 1089 1083
-f 1090 1050 1036
-f 1036 1084 1090
-f 1089 1090 1084
-f 1084 1083 1089
-f 1086 1087 1091
-f 1091 1092 1086
-f 1085 1086 1092
-f 1092 1088 1085
-f 1093 1094 1095
-f 1096 1097 1031
-f 1098 1096 1094
-f 1094 1096 1030
-f 1099 1097 1096
-f 1095 1094 1034
-f 1100 1097 1099
-f 1101 1095 1040
-f 1038 1031 1097
-f 1031 1030 1096
-f 1030 1034 1094
-f 1034 1040 1095
-f 1097 1100 1038
-f 1100 1102 1073
-f 1068 1103 1104
-f 1102 1103 1068
-f 1105 1080 1076
-f 1073 1038 1100
-f 1104 1069 1068
-f 1068 1073 1102
-f 1069 1104 1106
-f 1106 1076 1069
-f 1076 1106 1105
-f 1107 1108 1090
-f 1090 1089 1107
-f 1089 1088 1109
-f 1109 1107 1089
-f 1108 1067 1050
-f 1050 1090 1108
-f 1092 1091 1110
-f 1110 1111 1092
-f 1088 1092 1111
-f 1111 1109 1088
-f 1112 1113 1108
-f 1108 1107 1112
-f 1113 1062 1067
-f 1067 1108 1113
-f 1107 1109 1114
-f 1114 1112 1107
-f 1111 1110 1115
-f 1115 1116 1111
-f 1109 1111 1116
-f 1116 1114 1109
-f 1062 1113 1117
-f 1064 1117 1118
-f 1119 1117 1113
-f 1117 1064 1062
-f 1120 1118 1117
-f 1118 1065 1064
-f 1119 1121 1122
-f 1122 1120 1119
-f 1117 1119 1120
-f 1113 1112 1119
-f 1116 1115 1123
-f 1112 1114 1121
-f 1121 1119 1112
-f 1114 1116 1124
-f 1124 1121 1114
-f 1123 1124 1116
-f 1121 1124 1125
-f 1125 1122 1121
-f 1126 1125 1124
-f 1124 1123 1126
-f 1104 1103 1127
-f 1103 1102 1128
-f 1102 1100 1129
-f 1130 1105 1106
-f 1106 1104 1131
-f 1040 1044 1101
-f 1044 1054 1093
-f 1054 1057 1098
-f 1057 1059 1099
-f 1093 1101 1044
-f 1098 1094 1093
-f 1098 1093 1054
-f 1099 1096 1098
-f 1099 1098 1057
-f 1093 1095 1101
-f 1129 1099 1059
-f 1125 1132 1131
-f 1131 1122 1125
-f 1126 1130 1132
-f 1132 1125 1126
-f 1118 1120 1127
-f 1065 1118 1128
-f 1120 1122 1131
-f 1059 1065 1129
-f 1128 1127 1103
-f 1129 1128 1102
-f 1100 1099 1129
-f 1131 1132 1106
-f 1127 1131 1104
-f 1106 1132 1130
-f 1128 1129 1065
-f 1127 1128 1118
-f 1131 1127 1120
-f 1133 1134 1135
-f 1134 1133 1136
-f 1136 1137 1134
-f 1137 1136 1138
-f 1138 1139 1137
-f 1139 1138 1140
-f 1140 1141 1139
-f 1142 1136 1133
-f 1143 1144 1145
-f 1144 1143 1140
-f 1140 1146 1144
-f 1146 1140 1138
-f 1138 1147 1146
-f 1147 1138 1136
-f 1136 1142 1147
-f 1141 1140 1143
-f 1148 1149 1143
-f 1143 1150 1141
-f 1150 1143 1149
-f 1149 1151 1150
-f 1151 1149 1152
-f 1152 1153 1151
-f 1153 1152 1154
-f 1154 1155 1153
-f 1156 1157 1154
-f 1154 1158 1156
-f 1158 1154 1152
-f 1152 1159 1158
-f 1159 1152 1149
-f 1149 1148 1159
-f 1157 1156 1160
-f 1155 1154 1157
-f 1161 1162 1163
-f 1162 1161 1164
-f 1164 1165 1162
-f 1165 1164 1166
-f 1166 1167 1165
-f 1167 1166 1168
-f 1168 1145 1167
-f 1169 1164 1161
-f 1143 1170 1171
-f 1170 1143 1168
-f 1168 1172 1170
-f 1172 1168 1166
-f 1166 1173 1172
-f 1173 1166 1164
-f 1164 1169 1173
-f 1145 1168 1143
-f 1171 1174 1143
-f 1143 1175 1148
-f 1175 1143 1174
-f 1174 1176 1175
-f 1176 1174 1177
-f 1177 1178 1176
-f 1178 1177 1179
-f 1179 1180 1178
-f 1181 1182 1179
-f 1179 1183 1181
-f 1183 1179 1177
-f 1177 1184 1183
-f 1184 1177 1174
-f 1174 1171 1184
-f 1182 1181 1185
-f 1180 1179 1182
-f 1186 1187 1135
-f 1186 1188 1187
-f 1189 1190 1191
-f 1192 1193 1189
-f 1194 1193 1192
-f 1186 1135 1192
-f 1135 1194 1192
-f 1194 1135 1134
-f 1188 1195 1196
-f 1196 1187 1188
-f 1186 1197 1195
-f 1195 1188 1186
-f 1187 1196 1133
-f 1133 1135 1187
-f 1186 1198 1197
-f 1199 1200 1201
-f 1201 1202 1199
-f 1198 1203 1200
-f 1200 1199 1198
-f 1204 1202 1205
-f 1201 1205 1202
-f 1198 1186 1203
-f 1205 1192 1189
-f 1191 1205 1189
-f 1206 1207 1191
-f 1208 1209 1206
-f 1210 1208 1080
-f 1192 1203 1186
-f 1205 1191 1207
-f 1203 1192 1211
-f 1192 1205 1211
-f 1205 1212 1211
-f 1205 1201 1213
-f 1213 1212 1205
-f 1200 1212 1213
-f 1213 1201 1200
-f 1203 1211 1212
-f 1212 1200 1203
-f 1214 1215 1216
-f 1217 1216 1218
-f 1219 1220 1221
-f 1219 1142 1220
-f 1217 1142 1219
-f 1147 1217 1218
-f 1217 1147 1142
-f 1222 1199 1202
-f 1223 1197 1198
-f 1223 1198 1199
-f 1202 1204 1224
-f 1225 1224 1204
-f 1214 1216 1225
-f 1214 1226 1227
-f 1228 1229 1230
-f 1227 1231 1230
-f 1232 1216 1217
-f 1219 1232 1217
-f 1226 1231 1227
-f 1233 1226 1214
-f 1233 1214 1225
-f 1216 1232 1225
-f 1230 1231 1228
-f 1232 1219 1223
-f 1142 1133 1196
-f 1197 1223 1219
-f 1195 1221 1220
-f 1220 1196 1195
-f 1197 1219 1221
-f 1221 1195 1197
-f 1196 1220 1142
-f 1222 1234 1232
-f 1225 1235 1224
-f 1202 1224 1222
-f 1199 1222 1223
-f 1234 1222 1224
-f 1224 1235 1234
-f 1232 1223 1222
-f 1218 1215 1236
-f 1218 1216 1215
-f 1237 1238 1215
-f 1146 1218 1236
-f 1218 1146 1147
-f 1239 1240 1230
-f 1230 1241 1227
-f 1227 1237 1214
-f 1229 1239 1230
-f 1215 1214 1237
-f 1237 1227 1241
-f 1241 1230 1240
-f 1242 1238 1243
-f 1236 1238 1242
-f 1236 1215 1238
-f 1243 1244 1245
-f 1238 1237 1244
-f 1144 1236 1242
-f 1236 1144 1146
-f 1244 1243 1238
-f 1246 1243 1247
-f 1247 1245 1248
-f 1245 1247 1243
-f 1242 1243 1246
-f 1145 1242 1246
-f 1242 1145 1144
-f 1249 1250 1251
-f 1249 1251 1240
-f 1239 1249 1240
-f 1244 1241 1252
-f 1241 1244 1237
-f 1240 1252 1241
-f 1252 1240 1251
-f 1251 1253 1252
-f 1252 1245 1244
-f 1245 1252 1253
-f 1253 1251 1254
-f 1250 1254 1251
-f 1255 1254 1256
-f 1257 1256 1254
-f 1250 1257 1254
-f 1253 1248 1245
-f 1248 1253 1255
-f 1254 1255 1253
-f 1225 1232 1234
-f 1258 1228 1231
-f 1234 1235 1225
-f 1226 1233 1259
-f 1231 1226 1260
-f 1204 1261 1225
-f 1233 1225 1261
-f 1193 1262 1190
-f 1194 1263 1193
-f 1264 1263 1194
-f 1134 1264 1194
-f 1264 1134 1137
-f 1265 1191 1190
-f 1191 1265 1206
-f 1266 1206 1265
-f 1206 1266 1208
-f 1080 1208 1266
-f 1190 1189 1193
-f 1078 1080 1266
-f 1267 1265 1268
-f 1265 1267 1266
-f 1078 1266 1267
-f 1268 1190 1262
-f 1190 1268 1265
-f 1264 1269 1263
-f 1270 1269 1264
-f 1262 1193 1263
-f 1263 1271 1262
-f 1271 1263 1269
-f 1137 1270 1264
-f 1270 1137 1139
-f 1272 1271 1273
-f 1270 1274 1269
-f 1269 1273 1271
-f 1275 1274 1270
-f 1273 1269 1274
-f 1139 1275 1270
-f 1275 1139 1141
-f 1268 1276 1267
-f 1079 1267 1276
-f 1262 1277 1268
-f 1079 1078 1267
-f 1277 1278 1276
-f 1278 1277 1272
-f 1087 1079 1276
-f 1087 1276 1278
-f 1277 1262 1271
-f 1091 1087 1278
-f 1276 1268 1277
-f 1271 1272 1277
-f 1259 1260 1226
-f 1260 1259 1210
-f 1279 1260 1280
-f 1261 1204 1207
-f 1260 1279 1231
-f 1261 1259 1233
-f 1259 1261 1209
-f 1209 1208 1210
-f 1130 1210 1105
-f 1207 1206 1209
-f 1080 1105 1210
-f 1209 1210 1259
-f 1210 1281 1260
-f 1205 1207 1204
-f 1207 1209 1261
-f 1274 1282 1273
-f 1282 1274 1283
-f 1275 1283 1274
-f 1284 1283 1275
-f 1141 1284 1275
-f 1284 1141 1150
-f 1283 1285 1282
-f 1285 1283 1286
-f 1286 1287 1285
-f 1284 1286 1283
-f 1288 1286 1284
-f 1288 1289 1286
-f 1150 1288 1284
-f 1288 1150 1151
-f 1273 1290 1272
-f 1291 1272 1290
-f 1272 1291 1278
-f 1091 1278 1291
-f 1110 1091 1291
-f 1290 1273 1282
-f 1290 1292 1291
-f 1110 1291 1292
-f 1282 1293 1290
-f 1115 1110 1292
-f 1115 1292 1294
-f 1123 1115 1294
-f 1292 1290 1293
-f 1295 1285 1287
-f 1293 1282 1285
-f 1293 1294 1292
-f 1285 1295 1293
-f 1294 1293 1295
-f 1287 1286 1289
-f 1296 1289 1288
-f 1296 1297 1289
-f 1151 1296 1288
-f 1296 1151 1153
-f 1287 1298 1295
-f 1295 1299 1294
-f 1123 1294 1299
-f 1289 1300 1287
-f 1126 1123 1299
-f 1299 1295 1298
-f 1298 1287 1300
-f 1210 1130 1281
-f 1301 1302 1303
-f 1303 1304 1301
-f 1305 1306 1307
-f 1305 1308 1309
-f 1280 1260 1281
-f 1308 1305 1303
-f 1306 1305 1310
-f 1306 1280 1311
-f 1280 1306 1312
-f 1313 1297 1296
-f 1314 1315 1316
-f 1314 1155 1315
-f 1313 1155 1314
-f 1300 1289 1297
-f 1153 1313 1296
-f 1313 1153 1155
-f 1317 1318 1319
-f 1307 1303 1305
-f 1281 1311 1280
-f 1311 1307 1306
-f 1320 1308 1321
-f 1322 1319 1320
-f 1317 1323 1318
-f 1303 1321 1308
-f 1299 1281 1130
-f 1307 1300 1303
-f 1307 1311 1300
-f 1297 1304 1303
-f 1311 1281 1298
-f 1304 1314 1317
-f 1298 1281 1299
-f 1130 1126 1299
-f 1300 1297 1303
-f 1300 1311 1298
-f 1304 1297 1313
-f 1314 1304 1313
-f 1324 1315 1155
-f 1155 1157 1324
-f 1323 1317 1314
-f 1323 1314 1316
-f 1325 1316 1315
-f 1315 1324 1325
-f 1316 1325 1323
-f 1319 1322 1317
-f 1303 1302 1321
-f 1301 1322 1321
-f 1322 1301 1304
-f 1321 1302 1301
-f 1320 1321 1322
-f 1304 1317 1322
-f 1326 1324 1157
-f 1157 1160 1326
-f 1327 1325 1324
-f 1324 1326 1327
-f 1328 1323 1325
-f 1325 1327 1328
-f 1329 1330 1331
-f 1332 1330 1329
-f 1328 1326 1160
-f 1328 1327 1326
-f 1331 1333 1334
-f 1328 1160 1329
-f 1160 1332 1329
-f 1332 1160 1156
-f 1318 1335 1336
-f 1336 1319 1318
-f 1337 1320 1319
-f 1308 1320 1338
-f 1337 1338 1320
-f 1319 1336 1337
-f 1318 1328 1335
-f 1328 1318 1323
-f 1339 1309 1334
-f 1309 1339 1310
-f 1335 1329 1340
-f 1338 1334 1309
-f 1329 1338 1340
-f 1341 1342 1312
-f 1310 1343 1312
-f 1338 1329 1331
-f 1343 1310 1339
-f 1329 1335 1328
-f 1312 1343 1341
-f 1334 1338 1331
-f 1332 1344 1330
-f 1345 1344 1332
-f 1156 1345 1332
-f 1345 1156 1158
-f 1330 1346 1333
-f 1334 1347 1339
-f 1348 1339 1347
-f 1339 1348 1343
-f 1341 1343 1348
-f 1349 1341 1348
-f 1333 1331 1330
-f 1347 1334 1333
-f 1350 1333 1346
-f 1333 1350 1347
-f 1349 1348 1351
-f 1351 1347 1350
-f 1347 1351 1348
-f 1345 1352 1344
-f 1353 1352 1345
-f 1158 1353 1345
-f 1353 1158 1159
-f 1346 1330 1344
-f 1344 1354 1346
-f 1354 1344 1352
-f 1159 1355 1353
-f 1355 1159 1148
-f 1355 1356 1353
-f 1357 1354 1358
-f 1353 1356 1352
-f 1352 1358 1354
-f 1358 1352 1356
-f 1359 1351 1360
-f 1350 1360 1351
-f 1359 1349 1351
-f 1346 1361 1350
-f 1362 1359 1360
-f 1362 1360 1363
-f 1361 1346 1354
-f 1364 1362 1363
-f 1354 1357 1361
-f 1363 1361 1357
-f 1361 1363 1360
-f 1360 1350 1361
-f 1310 1312 1306
-f 1312 1365 1280
-f 1309 1310 1305
-f 1338 1309 1308
-f 1335 1340 1366
-f 1366 1336 1335
-f 1336 1366 1367
-f 1367 1337 1336
-f 1312 1342 1365
-f 1337 1367 1338
-f 1366 1340 1338
-f 1338 1367 1366
-f 1368 1248 1369
-f 1248 1368 1247
-f 1255 1369 1248
-f 1370 1247 1368
-f 1246 1247 1370
-f 1167 1246 1370
-f 1246 1167 1145
-f 1370 1368 1371
-f 1372 1373 1374
-f 1374 1369 1372
-f 1165 1370 1371
-f 1370 1165 1167
-f 1369 1374 1368
-f 1371 1368 1374
-f 1375 1376 1377
-f 1375 1377 1256
-f 1257 1375 1256
-f 1378 1372 1369
-f 1256 1378 1255
-f 1369 1255 1378
-f 1378 1256 1377
-f 1377 1379 1378
-f 1372 1378 1379
-f 1379 1377 1380
-f 1376 1381 1380
-f 1376 1380 1377
-f 1382 1374 1373
-f 1371 1374 1382
-f 1162 1371 1382
-f 1371 1162 1165
-f 1373 1372 1383
-f 1380 1384 1379
-f 1384 1380 1385
-f 1381 1385 1380
-f 1383 1379 1384
-f 1379 1383 1372
-f 1386 1384 1387
-f 1381 1388 1385
-f 1387 1385 1389
-f 1388 1389 1385
-f 1384 1386 1383
-f 1383 1390 1373
-f 1385 1387 1384
-f 1391 1389 1258
-f 1392 1387 1391
-f 1228 1258 1393
-f 1388 1393 1258
-f 1391 1258 1394
-f 1395 1392 1396
-f 1392 1391 1397
-f 1258 1231 1279
-f 1163 1382 1398
-f 1382 1163 1162
-f 1398 1373 1390
-f 1382 1373 1398
-f 1399 1400 1163
-f 1390 1383 1386
-f 1399 1401 1400
-f 1399 1163 1398
-f 1402 1401 1399
-f 1400 1403 1161
-f 1161 1163 1400
-f 1401 1402 1403
-f 1403 1400 1401
-f 1399 1404 1402
-f 1405 1406 1407
-f 1407 1408 1405
-f 1409 1410 1406
-f 1406 1405 1409
-f 1396 1408 1395
-f 1407 1395 1408
-f 1399 1409 1404
-f 1409 1399 1410
-f 1389 1391 1387
-f 1258 1389 1388
-f 1386 1395 1390
-f 1387 1392 1386
-f 1395 1398 1390
-f 1398 1410 1399
-f 1406 1411 1412
-f 1412 1407 1406
-f 1410 1413 1411
-f 1411 1406 1410
-f 1395 1411 1413
-f 1395 1407 1412
-f 1412 1411 1395
-f 1398 1395 1413
-f 1410 1398 1413
-f 1395 1386 1392
-f 1414 1415 1416
-f 1417 1418 1419
-f 1420 1169 1417
-f 1173 1420 1421
-f 1420 1173 1169
-f 1420 1416 1421
-f 1417 1169 1418
-f 1422 1423 1279
-f 1424 1425 1396
-f 1423 1426 1394
-f 1427 1405 1408
-f 1428 1409 1405
-f 1428 1404 1409
-f 1408 1396 1425
-f 1426 1424 1397
-f 1403 1418 1169
-f 1169 1161 1403
-f 1404 1428 1417
-f 1404 1417 1419
-f 1419 1402 1404
-f 1402 1419 1418
-f 1418 1403 1402
-f 1427 1429 1430
-f 1408 1425 1427
-f 1430 1428 1427
-f 1425 1431 1429
-f 1424 1431 1425
-f 1405 1427 1428
-f 1424 1430 1429
-f 1429 1427 1425
-f 1423 1422 1432
-f 1430 1417 1428
-f 1416 1430 1424
-f 1433 1422 1434
-f 1426 1414 1424
-f 1426 1423 1414
-f 1414 1416 1424
-f 1434 1435 1433
-f 1432 1422 1433
-f 1414 1423 1432
-f 1417 1430 1420
-f 1430 1416 1420
-f 1421 1172 1173
-f 1421 1415 1436
-f 1421 1416 1415
-f 1172 1421 1436
-f 1437 1438 1415
-f 1432 1437 1414
-f 1415 1414 1437
-f 1433 1439 1432
-f 1437 1432 1439
-f 1440 1441 1433
-f 1435 1440 1433
-f 1439 1433 1441
-f 1436 1170 1172
-f 1438 1437 1442
-f 1443 1438 1444
-f 1436 1438 1443
-f 1436 1415 1438
-f 1170 1436 1443
-f 1444 1442 1445
-f 1442 1444 1438
-f 1446 1444 1447
-f 1171 1443 1446
-f 1443 1171 1170
-f 1447 1445 1448
-f 1445 1447 1444
-f 1443 1444 1446
-f 1449 1445 1442
-f 1439 1442 1437
-f 1441 1449 1439
-f 1449 1441 1450
-f 1442 1439 1449
-f 1450 1451 1449
-f 1452 1450 1441
-f 1452 1453 1450
-f 1440 1452 1441
-f 1445 1449 1451
-f 1451 1450 1454
-f 1453 1454 1450
-f 1448 1451 1455
-f 1455 1454 1456
-f 1457 1456 1454
-f 1453 1457 1454
-f 1451 1448 1445
-f 1454 1455 1451
-f 1394 1279 1423
-f 1397 1394 1426
-f 1397 1396 1392
-f 1394 1397 1391
-f 1279 1394 1258
-f 1279 1458 1422
-f 1396 1397 1424
-f 1434 1422 1459
-f 1424 1429 1431
-f 1184 1446 1460
-f 1446 1184 1171
-f 1460 1447 1461
-f 1446 1447 1460
-f 1461 1448 1462
-f 1448 1461 1447
-f 1455 1462 1448
-f 1463 1462 1464
-f 1462 1463 1461
-f 1183 1460 1465
-f 1460 1183 1184
-f 1464 1466 1463
-f 1465 1461 1463
-f 1460 1461 1465
-f 1457 1467 1456
-f 1468 1464 1462
-f 1456 1468 1455
-f 1467 1469 1470
-f 1468 1456 1470
-f 1462 1455 1468
-f 1470 1471 1468
-f 1467 1470 1456
-f 1469 1472 1473
-f 1469 1473 1470
-f 1471 1470 1473
-f 1464 1468 1471
-f 1466 1464 1474
-f 1465 1181 1183
-f 1475 1463 1466
-f 1465 1463 1475
-f 1181 1465 1475
-f 1473 1476 1471
-f 1471 1474 1464
-f 1476 1473 1477
-f 1474 1471 1476
-f 1472 1477 1473
-f 1478 1479 1477
-f 1472 1478 1477
-f 1480 1477 1479
-f 1477 1480 1476
-f 1481 1476 1480
-f 1474 1482 1466
-f 1476 1481 1474
-f 1483 1484 1485
-f 1486 1483 1487
-f 1458 1486 1488
-f 1486 1458 1489
-f 1483 1486 1490
-f 1458 1280 1365
-f 1279 1280 1458
-f 1491 1485 1484
-f 1487 1488 1486
-f 1485 1487 1483
-f 1488 1422 1458
-f 1491 1492 1493
-f 1494 1495 1493
-f 1493 1496 1494
-f 1488 1459 1422
-f 1493 1495 1491
-f 1497 1492 1491
-f 1496 1493 1492
-f 1492 1497 1496
-f 1498 1365 1342
-f 1499 1500 1501
-f 1355 1502 1356
-f 1503 1502 1355
-f 1356 1504 1358
-f 1504 1356 1502
-f 1148 1503 1355
-f 1503 1148 1175
-f 1503 1505 1502
-f 1506 1505 1503
-f 1502 1507 1504
-f 1506 1508 1505
-f 1175 1506 1503
-f 1506 1175 1176
-f 1507 1502 1505
-f 1505 1509 1507
-f 1510 1357 1511
-f 1357 1510 1363
-f 1364 1363 1510
-f 1512 1364 1510
-f 1511 1358 1504
-f 1358 1511 1357
-f 1512 1510 1513
-f 1504 1514 1511
-f 1511 1513 1510
-f 1515 1514 1516
-f 1514 1515 1513
-f 1513 1511 1514
-f 1514 1504 1507
-f 1507 1516 1514
-f 1516 1507 1509
-f 1517 1512 1513
-f 1517 1513 1515
-f 1518 1517 1515
-f 1519 1508 1506
-f 1519 1520 1508
-f 1176 1519 1506
-f 1519 1176 1178
-f 1509 1505 1508
-f 1518 1515 1521
-f 1522 1518 1521
-f 1516 1521 1515
-f 1508 1523 1509
-f 1521 1516 1524
-f 1524 1509 1523
-f 1509 1524 1516
-f 1525 1180 1526
-f 1178 1525 1519
-f 1525 1178 1180
-f 1523 1508 1520
-f 1525 1520 1519
-f 1526 1527 1528
-f 1526 1180 1527
-f 1365 1489 1458
-f 1484 1483 1499
-f 1489 1490 1486
-f 1490 1499 1483
-f 1529 1530 1531
-f 1499 1532 1484
-f 1531 1484 1532
-f 1533 1534 1535
-f 1533 1535 1530
-f 1527 1536 1537
-f 1534 1526 1528
-f 1528 1537 1534
-f 1536 1527 1180
-f 1180 1182 1536
-f 1534 1533 1526
-f 1537 1528 1527
-f 1531 1532 1529
-f 1500 1529 1532
-f 1532 1501 1500
-f 1499 1501 1532
-f 1538 1533 1529
-f 1530 1529 1533
-f 1529 1500 1538
-f 1499 1538 1500
-f 1526 1538 1525
-f 1523 1520 1499
-f 1523 1489 1524
-f 1498 1522 1521
-f 1524 1365 1521
-f 1538 1520 1525
-f 1490 1523 1499
-f 1490 1489 1523
-f 1489 1365 1524
-f 1538 1526 1533
-f 1520 1538 1499
-f 1521 1365 1498
-f 1537 1539 1540
-f 1541 1536 1182
-f 1539 1537 1536
-f 1182 1185 1541
-f 1540 1534 1537
-f 1536 1541 1539
-f 1540 1539 1541
-f 1475 1466 1542
-f 1482 1474 1481
-f 1540 1185 1542
-f 1542 1466 1482
-f 1185 1475 1542
-f 1475 1185 1181
-f 1540 1541 1185
-f 1530 1496 1497
-f 1497 1531 1530
-f 1535 1494 1496
-f 1496 1530 1535
-f 1497 1491 1531
-f 1484 1531 1491
-f 1485 1480 1487
-f 1535 1540 1494
-f 1540 1535 1534
-f 1480 1485 1481
-f 1487 1479 1488
-f 1542 1491 1495
-f 1494 1542 1495
-f 1478 1459 1488
-f 1491 1481 1485
-f 1479 1487 1480
-f 1481 1491 1482
-f 1488 1479 1478
-f 1491 1542 1482
-f 1542 1494 1540
-f 1543 1544 1545
-f 1546 1545 1547
-f 1548 1549 1550
-f 1551 1550 1552
-f 1553 1552 1554
-f 1555 1554 1549
-f 1546 1543 1545
-f 1556 1551 1552
-f 1553 1556 1552
-f 1543 1557 1544
-f 1555 1553 1554
-f 1548 1555 1549
-f 1558 1548 1550
-f 1551 1558 1550
-f 1559 1560 1561
-f 1562 1559 1561
-f 1563 1546 1547
-f 1564 1562 1565
-f 1566 1564 1565
-f 1560 1567 1568
-f 1557 1569 1544
-f 1567 1566 1568
-f 1563 1547 1570
-f 1569 1570 1544
-f 1560 1568 1561
-f 1562 1561 1565
-f 1566 1565 1571
-f 1566 1571 1568
-f 1572 1573 1574
-f 1575 1572 1574
-f 1576 1575 1577
-f 1578 1576 1577
-f 1573 1579 1580
-f 1579 1578 1580
-f 1581 1582 1583
-f 1584 1585 1586
-f 1582 1587 1583
-f 1587 1584 1588
-f 1589 1581 1590
-f 1587 1588 1583
-f 1581 1583 1590
-f 1589 1590 1586
-f 1584 1586 1588
-f 1573 1580 1574
-f 1575 1574 1577
-f 1591 1592 1593
-f 1594 1593 1595
-f 1596 1595 1597
-f 1598 1597 1592
-f 1578 1577 1599
-f 1578 1599 1580
-f 1594 1600 1593
-f 1591 1598 1592
-f 1598 1601 1597
-f 1601 1596 1597
-f 1596 1594 1595
-f 1602 1603 1604
-f 1548 1558 1605
-f 1558 1551 1605
-f 1555 1548 1606
-f 1605 1551 1607
-f 1608 1609 1555
-f 1609 1608 1610
-f 1610 1611 1607
-f 1612 1610 1609
-f 1612 1607 1610
-f 1613 1610 1608
-f 1611 1610 1613
-f 1614 1606 1548
-f 1605 1614 1548
-f 1555 1606 1608
-f 1607 1611 1605
-f 1615 1616 1617
-f 1615 1618 1616
-f 1615 1619 1618
-f 1615 1617 1619
-f 1556 1553 1543
-f 1557 1555 1609
-f 1551 1556 1546
-f 1553 1555 1557
-f 1620 1617 1609
-f 1607 1616 1620
-f 1618 1607 1551
-f 1612 1620 1607
-f 1612 1609 1620
-f 1557 1543 1553
-f 1609 1617 1557
-f 1616 1607 1618
-f 1543 1546 1556
-f 1617 1620 1616
-f 1551 1546 1618
-f 1621 1622 1623
-f 1621 1624 1622
-f 1621 1625 1624
-f 1621 1623 1625
-f 1569 1557 1567
-f 1624 1618 1546
-f 1619 1622 1617
-f 1618 1624 1619
-f 1567 1557 1617
-f 1563 1569 1560
-f 1546 1563 1559
-f 1617 1623 1567
-f 1623 1617 1622
-f 1567 1560 1569
-f 1560 1559 1563
-f 1546 1562 1624
-f 1559 1562 1546
-f 1622 1619 1624
-f 1566 1567 1584
-f 1564 1566 1587
-f 1624 1626 1625
-f 1562 1564 1582
-f 1625 1627 1623
-f 1584 1567 1623
-f 1628 1624 1562
-f 1623 1627 1584
-f 1582 1581 1562
-f 1562 1581 1628
-f 1626 1624 1628
-f 1584 1587 1566
-f 1627 1625 1626
-f 1587 1582 1564
-f 1629 1630 1628
-f 1629 1627 1630
-f 1629 1628 1626
-f 1629 1626 1627
-f 1631 1632 1633
-f 1631 1634 1632
-f 1631 1635 1634
-f 1631 1633 1635
-f 1585 1584 1579
-f 1589 1585 1573
-f 1581 1589 1572
-f 1632 1628 1581
-f 1630 1633 1627
-f 1628 1632 1630
-f 1579 1584 1627
-f 1581 1575 1632
-f 1573 1572 1589
-f 1579 1573 1585
-f 1633 1630 1632
-f 1572 1575 1581
-f 1627 1635 1579
-f 1635 1627 1633
-f 1575 1598 1636
-f 1596 1601 1576
-f 1601 1598 1575
-f 1594 1596 1578
-f 1636 1632 1575
-f 1578 1579 1594
-f 1634 1637 1635
-f 1632 1638 1634
-f 1576 1578 1596
-f 1575 1576 1601
-f 1594 1579 1635
-f 1638 1632 1636
-f 1639 1638 1637
-f 1639 1636 1638
-f 1637 1634 1638
-f 1635 1637 1594
-f 1640 1636 1598
-f 1641 1642 1637
-f 1636 1640 1641
-f 1639 1637 1641
-f 1639 1641 1636
-f 1643 1594 1637
-f 1600 1594 1643
-f 1591 1600 1603
-f 1598 1591 1602
-f 1643 1603 1600
-f 1642 1641 1640
-f 1603 1602 1591
-f 1637 1644 1643
-f 1602 1645 1598
-f 1598 1645 1640
-f 1644 1637 1642
-f 1646 1647 1648
-f 1643 1646 1648
-f 1603 1643 1649
-f 1645 1602 1604
-f 1647 1645 1650
-f 1651 1652 1653
-f 1654 1653 1655
-f 1656 1655 1657
-f 1658 1657 1652
-f 1603 1649 1604
-f 1645 1604 1650
-f 1647 1650 1648
-f 1643 1648 1649
-f 1659 1651 1653
-f 1651 1658 1652
-f 1658 1660 1657
-f 1656 1654 1655
-f 1654 1659 1653
-f 1661 1662 1663
-f 1664 1661 1663
-f 1665 1664 1666
-f 1667 1665 1666
-f 1668 1667 1669
-f 1670 1671 1672
-f 1673 1670 1674
-f 1675 1673 1674
-f 1676 1675 1677
-f 1678 1676 1679
-f 1671 1678 1679
-f 1664 1663 1666
-f 1667 1666 1669
-f 1670 1672 1674
-f 1675 1674 1677
-f 1676 1677 1679
-f 1671 1679 1672
-f 1662 1680 1663
-f 1668 1669 1680
-f 1681 1682 1683
-f 1684 1683 1685
-f 1686 1685 1687
-f 1688 1687 1682
-f 1684 1689 1683
-f 1690 1684 1685
-f 1686 1690 1685
-f 1688 1686 1687
-f 1681 1688 1682
-f 1689 1681 1683
-f 1691 1692 1693
-f 1692 1694 1695
-f 1696 1691 1693
-f 1692 1695 1693
-f 1696 1693 1697
-f 1698 1697 1699
-f 1700 1699 1695
-f 1701 1702 1703
-f 1704 1703 1705
-f 1706 1705 1707
-f 1708 1707 1702
-f 1709 1701 1703
-f 1704 1709 1703
-f 1698 1696 1697
-f 1710 1704 1705
-f 1706 1710 1705
-f 1701 1708 1702
-f 1708 1706 1707
-f 1694 1700 1695
-f 1711 1642 1644
-f 1711 1640 1642
-f 1711 1712 1640
-f 1711 1644 1712
-f 1646 1643 1658
-f 1658 1643 1644
-f 1713 1640 1645
-f 1712 1714 1644
-f 1640 1715 1712
-f 1645 1647 1659
-f 1714 1712 1715
-f 1644 1714 1658
-f 1645 1654 1713
-f 1651 1659 1647
-f 1715 1640 1713
-f 1658 1651 1646
-f 1659 1654 1645
-f 1716 1713 1715
-f 1716 1717 1713
-f 1716 1714 1717
-f 1716 1715 1714
-f 1654 1656 1673
-f 1660 1658 1671
-f 1656 1660 1670
-f 1717 1718 1714
-f 1713 1719 1717
-f 1671 1658 1714
-f 1719 1713 1654
-f 1673 1675 1654
-f 1671 1670 1660
-f 1670 1673 1656
-f 1720 1714 1718
-f 1718 1717 1719
-f 1714 1720 1671
-f 1654 1675 1719
-f 1721 1720 1722
-f 1721 1718 1720
-f 1721 1719 1718
-f 1721 1722 1719
-f 1723 1724 1725
-f 1723 1725 1726
-f 1723 1726 1727
-f 1723 1727 1724
-f 1719 1726 1722
-f 1726 1719 1725
-f 1675 1676 1665
-f 1661 1671 1720
-f 1725 1719 1675
-f 1722 1727 1720
-f 1678 1671 1661
-f 1720 1727 1661
-f 1675 1667 1725
-f 1727 1722 1726
-f 1661 1664 1678
-f 1665 1667 1675
-f 1664 1665 1676
-f 1725 1728 1724
-f 1662 1661 1688
-f 1668 1662 1681
-f 1667 1668 1689
-f 1688 1661 1727
-f 1728 1725 1667
-f 1724 1729 1727
-f 1730 1729 1731
-f 1730 1728 1729
-f 1731 1727 1729
-f 1727 1731 1688
-f 1729 1724 1728
-f 1688 1681 1662
-f 1667 1684 1728
-f 1689 1684 1667
-f 1681 1689 1668
-f 1686 1688 1694
-f 1694 1688 1731
-f 1690 1686 1692
-f 1684 1690 1691
-f 1730 1732 1728
-f 1730 1731 1732
-f 1732 1733 1731
-f 1728 1734 1732
-f 1735 1728 1684
-f 1692 1691 1690
-f 1733 1732 1734
-f 1691 1696 1684
-f 1734 1728 1735
-f 1684 1696 1735
-f 1731 1733 1694
-f 1694 1692 1686
-f 1736 1734 1733
-f 1736 1735 1734
-f 1736 1737 1735
-f 1736 1733 1737
-f 1738 1739 1740
-f 1738 1741 1739
-f 1738 1742 1741
-f 1738 1740 1742
-f 1696 1698 1709
-f 1708 1694 1733
-f 1741 1735 1696
-f 1700 1694 1708
-f 1698 1700 1701
-f 1737 1739 1733
-f 1735 1741 1737
-f 1701 1709 1698
-f 1733 1740 1708
-f 1709 1704 1696
-f 1740 1733 1739
-f 1708 1701 1700
-f 1739 1737 1741
-f 1696 1704 1741
-f 1743 1610 1607
-f 1744 1607 1620
-f 1745 1617 1616
-f 1746 1616 1618
-f 1747 1620 1609
-f 1748 1609 1610
-f 1745 1749 1617
-f 1746 1745 1616
-f 1748 1747 1609
-f 1743 1748 1610
-f 1750 1743 1607
-f 1751 1750 1607
-f 1744 1751 1607
-f 1747 1744 1620
-f 1752 1619 1617
-f 1753 1622 1624
-f 1754 1624 1625
-f 1755 1625 1623
-f 1756 1623 1622
-f 1757 1618 1619
-f 1757 1746 1618
-f 1749 1752 1617
-f 1758 1753 1624
-f 1759 1758 1624
-f 1754 1759 1624
-f 1756 1755 1623
-f 1755 1754 1625
-f 1753 1756 1622
-f 1760 1761 1634
-f 1762 1760 1635
-f 1763 1762 1633
-f 1764 1763 1632
-f 1765 1764 1632
-f 1761 1765 1632
-f 1766 1767 1627
-f 1768 1766 1626
-f 1769 1768 1626
-f 1770 1769 1628
-f 1767 1771 1627
-f 1770 1628 1630
-f 1771 1630 1627
-f 1766 1627 1626
-f 1769 1626 1628
-f 1762 1635 1633
-f 1763 1633 1632
-f 1772 1641 1637
-f 1761 1632 1634
-f 1760 1634 1635
-f 1773 1637 1638
-f 1774 1638 1636
-f 1775 1636 1641
-f 1776 1777 1642
-f 1773 1778 1637
-f 1779 1773 1638
-f 1774 1779 1638
-f 1775 1774 1636
-f 1778 1772 1637
-f 1747 1780 1781
-f 1782 1783 1784
-f 1785 1780 1748
-f 1784 1785 1748
-f 1747 1748 1780
-f 1784 1750 1782
-f 1748 1743 1784
-f 1781 1786 1747
-f 1743 1750 1784
-f 1787 1782 1750
-f 1744 1747 1749
-f 1751 1744 1745
-f 1750 1751 1746
-f 1749 1747 1786
-f 1745 1746 1751
-f 1786 1788 1749
-f 1750 1746 1787
-f 1749 1745 1744
-f 1786 1781 1789
-f 1790 1789 1781
-f 1789 1783 1782
-f 1783 1789 1790
-f 1789 1791 1786
-f 1782 1791 1789
-f 1792 1782 1787
-f 1782 1792 1793
-f 1793 1788 1786
-f 1793 1791 1782
-f 1786 1791 1793
-f 1788 1793 1792
-f 1788 1794 1795
-f 1796 1797 1798
-f 1792 1794 1788
-f 1787 1794 1792
-f 1798 1797 1799
-f 1800 1797 1796
-f 1795 1794 1787
-f 1799 1797 1800
-f 1795 1798 1788
-f 1787 1796 1795
-f 1757 1752 1756
-f 1746 1757 1753
-f 1796 1787 1746
-f 1752 1749 1755
-f 1755 1749 1788
-f 1753 1758 1746
-f 1755 1756 1752
-f 1798 1795 1796
-f 1756 1753 1757
-f 1746 1758 1796
-f 1788 1799 1755
-f 1799 1788 1798
-f 1767 1755 1799
-f 1801 1796 1758
-f 1759 1754 1766
-f 1800 1802 1799
-f 1758 1759 1768
-f 1796 1803 1800
-f 1754 1755 1767
-f 1799 1802 1767
-f 1758 1769 1801
-f 1768 1769 1758
-f 1767 1766 1754
-f 1802 1800 1803
-f 1766 1768 1759
-f 1803 1796 1801
-f 1804 1805 1806
-f 1807 1805 1804
-f 1808 1805 1807
-f 1803 1809 1802
-f 1801 1809 1803
-f 1810 1809 1801
-f 1802 1809 1810
-f 1806 1805 1808
-f 1801 1804 1810
-f 1760 1767 1802
-f 1804 1801 1769
-f 1769 1770 1763
-f 1810 1806 1802
-f 1771 1767 1760
-f 1770 1771 1762
-f 1808 1802 1806
-f 1802 1808 1760
-f 1806 1810 1804
-f 1760 1762 1771
-f 1763 1764 1769
-f 1762 1763 1770
-f 1769 1764 1804
-f 1761 1760 1778
-f 1765 1761 1773
-f 1764 1765 1779
-f 1778 1760 1808
-f 1811 1804 1764
-f 1773 1779 1765
-f 1778 1773 1761
-f 1808 1812 1778
-f 1764 1774 1811
-f 1779 1774 1764
-f 1813 1778 1812
-f 1814 1811 1774
-f 1774 1775 1776
-f 1772 1778 1813
-f 1775 1772 1777
-f 1774 1815 1814
-f 1777 1776 1775
-f 1813 1777 1772
-f 1812 1816 1813
-f 1776 1815 1774
-f 1817 1818 1812
-f 1811 1818 1817
-f 1807 1812 1808
-f 1812 1807 1817
-f 1804 1817 1807
-f 1817 1804 1811
-f 1819 1820 1814
-f 1811 1814 1820
-f 1816 1812 1819
-f 1820 1818 1811
-f 1812 1818 1820
-f 1820 1819 1812
-f 1821 1815 1640
-f 1822 1821 1640
-f 1777 1813 1644
-f 1813 1822 1712
-f 1815 1776 1640
-f 1823 1713 1717
-f 1824 1717 1714
-f 1825 1714 1715
-f 1826 1715 1713
-f 1777 1644 1642
-f 1776 1642 1640
-f 1822 1640 1712
-f 1813 1712 1644
-f 1826 1827 1715
-f 1825 1828 1714
-f 1823 1826 1713
-f 1828 1824 1714
-f 1827 1825 1715
-f 1829 1830 1719
-f 1831 1829 1719
-f 1832 1831 1719
-f 1833 1832 1722
-f 1834 1833 1720
-f 1830 1834 1718
-f 1830 1718 1719
-f 1832 1719 1722
-f 1835 1725 1724
-f 1836 1724 1727
-f 1833 1722 1720
-f 1837 1727 1726
-f 1838 1726 1725
-f 1834 1720 1718
-f 1837 1839 1727
-f 1835 1838 1725
-f 1839 1836 1727
-f 1840 1837 1726
-f 1838 1840 1726
-f 1841 1842 1729
-f 1843 1841 1728
-f 1844 1843 1728
-f 1845 1844 1728
-f 1846 1845 1732
-f 1842 1846 1731
-f 1842 1731 1729
-f 1841 1729 1728
-f 1845 1728 1732
-f 1846 1732 1731
-f 1847 1733 1734
-f 1848 1734 1735
-f 1849 1847 1734
-f 1848 1849 1734
-f 1847 1850 1733
-f 1851 1737 1733
-f 1852 1735 1737
-f 1853 1740 1739
-f 1854 1739 1741
-f 1855 1741 1742
-f 1856 1742 1740
-f 1850 1851 1733
-f 1853 1856 1740
-f 1854 1853 1739
-f 1857 1854 1741
-f 1858 1857 1741
-f 1855 1858 1741
-f 1852 1848 1735
-f 1856 1855 1742
-f 1819 1859 1816
-f 1814 1859 1819
-f 1860 1859 1814
-f 1816 1859 1860
-f 1861 1862 1863
-f 1864 1862 1861
-f 1865 1862 1864
-f 1863 1862 1865
-f 1833 1828 1865
-f 1824 1828 1833
-f 1823 1824 1834
-f 1864 1866 1865
-f 1861 1867 1864
-f 1867 1861 1826
-f 1826 1823 1830
-f 1860 1865 1816
-f 1814 1863 1860
-f 1828 1813 1816
-f 1861 1814 1815
-f 1822 1813 1828
-f 1821 1822 1825
-f 1815 1821 1827
-f 1863 1814 1861
-f 1828 1825 1822
-f 1865 1860 1863
-f 1825 1827 1821
-f 1816 1865 1828
-f 1827 1826 1815
-f 1815 1826 1861
-f 1867 1868 1866
-f 1866 1868 1869
-f 1870 1868 1867
-f 1871 1872 1873
-f 1873 1872 1874
-f 1875 1872 1871
-f 1874 1872 1875
-f 1869 1868 1870
-f 1834 1830 1823
-f 1869 1865 1866
-f 1865 1869 1833
-f 1826 1829 1867
-f 1866 1864 1867
-f 1833 1834 1824
-f 1830 1829 1826
-f 1870 1871 1869
-f 1874 1867 1829
-f 1832 1833 1839
-f 1831 1832 1837
-f 1839 1833 1869
-f 1829 1831 1840
-f 1867 1875 1870
-f 1829 1838 1874
-f 1840 1838 1829
-f 1839 1837 1832
-f 1869 1871 1839
-f 1837 1840 1831
-f 1875 1867 1874
-f 1871 1870 1875
-f 1836 1839 1846
-f 1835 1836 1842
-f 1838 1835 1841
-f 1846 1839 1871
-f 1876 1874 1838
-f 1842 1841 1835
-f 1846 1842 1836
-f 1871 1877 1846
-f 1838 1843 1876
-f 1841 1843 1838
-f 1843 1844 1849
-f 1878 1876 1843
-f 1845 1846 1850
-f 1850 1846 1877
-f 1844 1845 1847
-f 1849 1848 1843
-f 1877 1879 1850
-f 1847 1849 1844
-f 1850 1847 1845
-f 1843 1848 1878
-f 1874 1876 1873
-f 1876 1880 1881
-f 1877 1871 1881
-f 1873 1881 1871
-f 1881 1873 1876
-f 1881 1880 1877
-f 1877 1880 1882
-f 1883 1876 1878
-f 1882 1879 1877
-f 1882 1880 1876
-f 1879 1882 1883
-f 1876 1883 1882
-f 1879 1884 1885
-f 1878 1884 1883
-f 1883 1884 1879
-f 1885 1884 1878
-f 1886 1887 1888
-f 1889 1887 1886
-f 1890 1887 1889
-f 1888 1887 1890
-f 1856 1850 1879
-f 1889 1878 1848
-f 1851 1850 1856
-f 1852 1851 1853
-f 1848 1852 1854
-f 1885 1886 1879
-f 1878 1889 1885
-f 1879 1888 1856
-f 1854 1857 1848
-f 1856 1853 1851
-f 1888 1879 1886
-f 1848 1857 1889
-f 1886 1885 1889
-f 1853 1854 1852
-f 1891 1892 1893
-f 1894 1891 1893
-f 1895 1896 1897
-f 1892 1895 1897
-f 1898 1894 1899
-f 1892 1897 1893
-f 1894 1893 1899
-f 1898 1899 1900
-f 1896 1900 1897
-f 1901 1902 1903
-f 1904 1903 1905
-f 1906 1905 1907
-f 1906 1907 1902
-f 1904 1908 1903
-f 1909 1904 1905
-f 1906 1909 1905
-f 1901 1910 1902
-f 1910 1906 1902
-f 1908 1901 1903
-f 1911 1912 1913
-f 1914 1913 1915
-f 1916 1915 1917
-f 1918 1917 1912
-f 1919 1920 1921
-f 1922 1921 1923
-f 1911 1924 1912
-f 1925 1911 1913
-f 1916 1914 1915
-f 1919 1926 1920
-f 1914 1925 1913
-f 1927 1919 1921
-f 1922 1927 1921
-f 1924 1918 1912
-f 1928 1929 1930
-f 1931 1930 1932
-f 1933 1932 1934
-f 1935 1934 1929
-f 1936 1923 1937
-f 1936 1937 1920
-f 1938 1933 1934
-f 1935 1938 1934
-f 1928 1935 1929
-f 1939 1922 1923
-f 1936 1939 1923
-f 1933 1931 1932
-f 1931 1940 1930
-f 1926 1936 1920
-f 1941 1942 1943
-f 1944 1941 1945
-f 1946 1944 1945
-f 1947 1946 1948
-f 1949 1947 1948
-f 1942 1949 1943
-f 1950 1951 1952
-f 1953 1952 1954
-f 1955 1954 1956
-f 1957 1956 1951
-f 1941 1943 1945
-f 1946 1945 1948
-f 1949 1948 1958
-f 1949 1958 1943
-f 1959 1960 1961
-f 1959 1962 1960
-f 1959 1963 1962
-f 1959 1961 1963
-f 1961 1741 1704
-f 1706 1708 1895
-f 1710 1706 1892
-f 1704 1710 1891
-f 1742 1962 1740
-f 1741 1963 1742
-f 1895 1708 1740
-f 1963 1741 1961
-f 1891 1894 1704
-f 1740 1962 1895
-f 1704 1894 1961
-f 1895 1892 1706
-f 1892 1891 1710
-f 1962 1742 1963
-f 1964 1965 1966
-f 1964 1966 1967
-f 1964 1968 1965
-f 1964 1967 1968
-f 1968 1961 1894
-f 1896 1895 1910
-f 1898 1896 1901
-f 1894 1898 1908
-f 1960 1965 1962
-f 1961 1968 1960
-f 1910 1895 1962
-f 1910 1901 1896
-f 1894 1904 1968
-f 1901 1908 1898
-f 1908 1904 1894
-f 1965 1960 1968
-f 1966 1962 1965
-f 1962 1966 1910
-f 1925 1914 1904
-f 1924 1911 1906
-f 1904 1914 1969
-f 1911 1925 1909
-f 1967 1970 1966
-f 1968 1971 1967
-f 1906 1910 1924
-f 1909 1906 1911
-f 1904 1909 1925
-f 1924 1910 1966
-f 1969 1968 1904
-f 1972 1969 1971
-f 1970 1967 1971
-f 1966 1970 1924
-f 1971 1968 1969
-f 1972 1971 1970
-f 1926 1924 1970
-f 1916 1918 1919
-f 1914 1916 1927
-f 1918 1924 1926
-f 1969 1973 1974
-f 1972 1974 1969
-f 1972 1970 1974
-f 1974 1975 1970
-f 1973 1969 1914
-f 1927 1922 1914
-f 1970 1976 1926
-f 1914 1922 1973
-f 1976 1970 1975
-f 1926 1919 1918
-f 1975 1974 1973
-f 1919 1927 1916
-f 1977 1975 1976
-f 1977 1973 1975
-f 1977 1978 1973
-f 1977 1976 1978
-f 1979 1980 1981
-f 1979 1982 1980
-f 1979 1983 1982
-f 1979 1981 1983
-f 1939 1936 1933
-f 1922 1939 1938
-f 1931 1926 1976
-f 1982 1973 1922
-f 1978 1981 1976
-f 1973 1980 1978
-f 1936 1926 1931
-f 1976 1981 1931
-f 1981 1978 1980
-f 1922 1935 1982
-f 1980 1973 1982
-f 1931 1933 1936
-f 1938 1935 1922
-f 1933 1938 1939
-f 1984 1982 1935
-f 1983 1985 1981
-f 1940 1931 1942
-f 1928 1940 1941
-f 1935 1928 1944
-f 1982 1984 1983
-f 1942 1931 1981
-f 1942 1941 1940
-f 1981 1986 1942
-f 1941 1944 1928
-f 1935 1946 1984
-f 1944 1946 1935
-f 1986 1981 1985
-f 1985 1983 1984
-f 1987 1985 1986
-f 1987 1984 1985
-f 1987 1988 1984
-f 1987 1986 1988
-f 1949 1942 1957
-f 1947 1949 1950
-f 1946 1947 1989
-f 1984 1990 1988
-f 1988 1991 1986
-f 1957 1942 1986
-f 1992 1984 1946
-f 1950 1989 1947
-f 1957 1950 1949
-f 1991 1988 1990
-f 1989 1953 1946
-f 1986 1991 1957
-f 1946 1953 1992
-f 1990 1984 1992
-f 1953 1989 1952
-f 1950 1957 1951
-f 1989 1950 1952
-f 1957 1993 1956
-f 1955 1953 1954
-f 1994 1995 1996
-f 1997 1994 1998
-f 1999 1997 1998
-f 2000 1999 2001
-f 2002 2000 2003
-f 1995 2002 1996
-f 2004 2005 2006
-f 2007 2006 2008
-f 2002 2003 1996
-f 1994 1996 1998
-f 1999 1998 2001
-f 2000 2001 2003
-f 2009 2004 2006
-f 2004 2010 2005
-f 2007 2009 2006
-f 2011 2012 2013
-f 2014 2011 2013
-f 2010 2015 2016
-f 2017 2014 2018
-f 2019 2017 2018
-f 2012 2020 2021
-f 2022 2007 2008
-f 2020 2019 2021
-f 2022 2008 2016
-f 2010 2016 2005
-f 2012 2021 2013
-f 2014 2013 2018
-f 2019 2018 2023
-f 2019 2023 2021
-f 2024 2025 2026
-f 2027 2028 2029
-f 2030 2024 2031
-f 2025 2027 2029
-f 2032 2030 2033
-f 2028 2032 2033
-f 2028 2033 2029
-f 2025 2029 2026
-f 2024 2026 2031
-f 2030 2031 2033
-f 2034 2035 2036
-f 2037 2036 2038
-f 2037 2034 2036
-f 2034 2039 2035
-f 2039 2040 2035
-f 2041 2037 2038
-f 2042 2041 2043
-f 2040 2042 2043
-f 2044 2045 2046
-f 2047 2046 2048
-f 2049 2048 2050
-f 2051 2050 2045
-f 2041 2038 2043
-f 2040 2043 2035
-f 2052 2047 2048
-f 2051 2053 2050
-f 2049 2052 2048
-f 2047 2044 2046
-f 2053 2049 2050
-f 2044 2051 2045
-f 2054 1990 1991
-f 2054 1992 1990
-f 2054 2055 1992
-f 2054 1991 2055
-f 1992 2056 2055
-f 2000 1957 1991
-f 2056 1992 1953
-f 1993 1957 2000
-f 1955 1993 2002
-f 1953 1955 1995
-f 2055 2057 1991
-f 2058 2056 2057
-f 1991 2059 2000
-f 2059 1991 2057
-f 2058 2057 2059
-f 2057 2055 2056
-f 2000 2002 1993
-f 2002 1995 1955
-f 1995 1994 1953
-f 1953 1994 2056
-f 2060 2061 2062
-f 2060 2063 2061
-f 2060 2064 2063
-f 2060 2062 2064
-f 1997 1999 2004
-f 1994 1997 2009
-f 2010 2000 2059
-f 1999 2000 2010
-f 2058 2065 2056
-f 2063 2056 1994
-f 2065 2062 2059
-f 2056 2061 2065
-f 2058 2059 2065
-f 2009 2007 1994
-f 2062 2065 2061
-f 1994 2007 2063
-f 2061 2056 2063
-f 2010 2004 1999
-f 2059 2062 2010
-f 2004 2009 1997
-f 2066 2067 2068
-f 2066 2069 2067
-f 2066 2070 2069
-f 2066 2068 2070
-f 2020 2010 2062
-f 2069 2063 2007
-f 2063 2069 2064
-f 2015 2010 2020
-f 2022 2015 2012
-f 2007 2022 2011
-f 2064 2067 2062
-f 2012 2011 2022
-f 2020 2012 2015
-f 2062 2068 2020
-f 2007 2014 2069
-f 2068 2062 2067
-f 2011 2014 2007
-f 2067 2064 2069
-f 2071 2072 2073
-f 2071 2074 2072
-f 2071 2075 2074
-f 2071 2073 2075
-f 2014 2017 2027
-f 2032 2020 2068
-f 2070 2075 2068
-f 2069 2073 2070
-f 2017 2019 2028
-f 2072 2069 2014
-f 2019 2020 2032
-f 2032 2028 2019
-f 2075 2070 2073
-f 2028 2027 2017
-f 2068 2075 2032
-f 2027 2025 2014
-f 2014 2025 2072
-f 2073 2069 2072
-f 2076 2072 2025
-f 2074 2077 2075
-f 2030 2032 2040
-f 2024 2030 2039
-f 2025 2024 2034
-f 2072 2076 2074
-f 2040 2032 2075
-f 2078 2075 2077
-f 2039 2034 2024
-f 2034 2037 2025
-f 2025 2037 2076
-f 2077 2074 2076
-f 2040 2039 2030
-f 2075 2078 2040
-f 2079 2077 2078
-f 2079 2076 2077
-f 2079 2080 2076
-f 2079 2078 2080
-f 2037 2051 2081
-f 2052 2049 2042
-f 2049 2053 2041
-f 2053 2051 2037
-f 2082 2083 2084
-f 2082 2081 2083
-f 2084 2080 2083
-f 2083 2076 2081
-f 2078 2084 2052
-f 2052 2040 2078
-f 2081 2076 2037
-f 2076 2083 2080
-f 2080 2084 2078
-f 2042 2040 2052
-f 2037 2041 2053
-f 2085 2052 2084
-f 2081 2086 2087
-f 2088 2081 2051
-f 2082 2087 2081
-f 2082 2084 2087
-f 2047 2052 2085
-f 2051 2044 2089
-f 2087 2090 2084
-f 2090 2087 2086
-f 2086 2081 2088
-f 2085 2091 2047
-f 2091 2089 2044
-f 2051 2089 2088
-f 2084 2090 2085
-f 2092 1966 1965
-f 2093 1965 1968
-f 2094 1962 1963
-f 2095 1963 1961
-f 2096 1961 1960
-f 2097 1960 1962
-f 2094 2098 1962
-f 2099 2094 1963
-f 2095 2099 1963
-f 2092 2100 1966
-f 2093 2092 1965
-f 2096 2095 1961
-f 2101 2093 1968
-f 2098 2097 1962
-f 2102 1969 1974
-f 2103 1974 1970
-f 2104 1968 1967
-f 2100 1967 1966
-f 2105 1970 1971
-f 2106 1971 1969
-f 2107 2105 1971
-f 2106 2107 1971
-f 2102 2106 1969
-f 2108 2101 1968
-f 2104 2108 1968
-f 2100 2104 1967
-f 2109 2103 1970
-f 2105 2109 1970
-f 2110 2111 1975
-f 2112 2110 1973
-f 2113 2112 1973
-f 2114 2113 1973
-f 2115 2114 1978
-f 2111 2115 1976
-f 2110 1975 1973
-f 2114 1973 1978
-f 2115 1978 1976
-f 2116 1982 1983
-f 2117 1983 1981
-f 2118 1980 1982
-f 2111 1976 1975
-f 2119 1981 1980
-f 2120 2119 1980
-f 2118 2120 1980
-f 2116 2118 1982
-f 2121 2117 1981
-f 2119 2121 1981
-f 2122 2123 1986
-f 2124 2122 1985
-f 2125 2124 1984
-f 2126 2125 1984
-f 2127 2126 1984
-f 2123 2127 1988
-f 2128 1991 1990
-f 2129 1990 1992
-f 2130 1992 2055
-f 2131 2055 1991
-f 2122 1986 1985
-f 2124 1985 1984
-f 2127 1984 1988
-f 2123 1988 1986
-f 2132 2133 2134
-f 2135 2133 2136
-f 2136 2133 2132
-f 2137 2138 2139
-f 2140 2138 2137
-f 2134 2133 2135
-f 2141 2138 2140
-f 2139 2138 2141
-f 2098 1856 1888
-f 1890 2135 1888
-f 1889 2134 1890
-f 2132 1889 1857
-f 1855 1856 2098
-f 1858 1855 2094
-f 1857 1858 2099
-f 1888 2135 2098
-f 1857 2095 2132
-f 2135 1890 2134
-f 2098 2094 1855
-f 2134 1889 2132
-f 2094 2099 1858
-f 2099 2095 1857
-f 2100 2092 2097
-f 2135 2139 2100
-f 2095 2101 2140
-f 2137 2136 2140
-f 2092 2093 2096
-f 2139 2135 2137
-f 2093 2101 2095
-f 2097 2098 2100
-f 2095 2096 2093
-f 2136 2137 2135
-f 2132 2140 2136
-f 2100 2098 2135
-f 2140 2132 2095
-f 2096 2097 2092
-f 2109 2100 2139
-f 2142 2140 2101
-f 2104 2100 2109
-f 2108 2104 2105
-f 2101 2108 2107
-f 2101 2106 2142
-f 2105 2107 2108
-f 2139 2143 2109
-f 2107 2106 2101
-f 2109 2105 2104
-f 2103 2109 2115
-f 2102 2103 2111
-f 2106 2102 2110
-f 2115 2109 2143
-f 2144 2142 2106
-f 2115 2111 2103
-f 2111 2110 2102
-f 2143 2145 2115
-f 2106 2112 2144
-f 2110 2112 2106
-f 2141 2143 2139
-f 2143 2141 2146
-f 2140 2146 2141
-f 2146 2140 2142
-f 2146 2147 2143
-f 2142 2147 2146
-f 2148 2149 2144
-f 2142 2144 2149
-f 2149 2147 2142
-f 2143 2147 2149
-f 2145 2143 2148
-f 2149 2148 2143
-f 2144 2150 2148
-f 2151 2150 2144
-f 2145 2150 2151
-f 2152 2153 2154
-f 2155 2153 2152
-f 2156 2153 2155
-f 2154 2153 2156
-f 2148 2150 2145
-f 2156 2157 2154
-f 2157 2156 2118
-f 2117 2121 2123
-f 2123 2121 2152
-f 2116 2117 2122
-f 2118 2116 2124
-f 2154 2158 2152
-f 2114 2115 2121
-f 2113 2114 2119
-f 2151 2152 2145
-f 2144 2155 2151
-f 2112 2113 2120
-f 2121 2115 2145
-f 2156 2144 2112
-f 2120 2118 2112
-f 2152 2151 2155
-f 2119 2120 2113
-f 2145 2152 2121
-f 2112 2118 2156
-f 2155 2144 2156
-f 2121 2119 2114
-f 2159 2160 2157
-f 2161 2160 2159
-f 2158 2160 2161
-f 2162 2163 2164
-f 2157 2160 2158
-f 2165 2163 2166
-f 2164 2163 2165
-f 2166 2163 2162
-f 2152 2161 2123
-f 2161 2152 2158
-f 2158 2154 2157
-f 2118 2125 2157
-f 2123 2122 2117
-f 2122 2124 2116
-f 2124 2125 2118
-f 2125 2126 2167
-f 2126 2127 2128
-f 2127 2123 2168
-f 2165 2157 2125
-f 2168 2123 2161
-f 2159 2162 2161
-f 2157 2166 2159
-f 2166 2157 2165
-f 2128 2167 2126
-f 2161 2162 2168
-f 2168 2128 2127
-f 2125 2129 2165
-f 2162 2159 2166
-f 2167 2129 2125
-f 2128 2168 1991
-f 2130 2129 1992
-f 2167 2128 1990
-f 2129 2167 1990
-f 2168 2131 1991
-f 2169 2170 2059
-f 2171 2169 2057
-f 2172 2171 2056
-f 2173 2172 2056
-f 2174 2173 2056
-f 2170 2174 2065
-f 2175 2061 2063
-f 2169 2059 2057
-f 2171 2057 2056
-f 2174 2056 2065
-f 2170 2065 2059
-f 2176 2062 2061
-f 2176 2177 2062
-f 2178 2176 2061
-f 2175 2178 2061
-f 2179 2064 2062
-f 2180 2068 2067
-f 2181 2067 2069
-f 2182 2069 2070
-f 2183 2070 2068
-f 2184 2063 2064
-f 2185 2186 2069
-f 2182 2185 2069
-f 2183 2182 2070
-f 2180 2183 2068
-f 2181 2180 2067
-f 2186 2181 2069
-f 2184 2175 2063
-f 2177 2179 2062
-f 2187 2188 2075
-f 2188 2189 2075
-f 2190 2187 2073
-f 2191 2190 2073
-f 2192 2191 2072
-f 2191 2073 2072
-f 2192 2072 2074
-f 2189 2074 2075
-f 2187 2075 2073
-f 2193 2078 2077
-f 2194 2077 2076
-f 2194 2193 2077
-f 2195 2194 2076
-f 2196 2195 2076
-f 2193 2197 2078
-f 2198 2081 2087
-f 2199 2087 2084
-f 2200 2084 2083
-f 2201 2083 2081
-f 2202 2076 2080
-f 2197 2080 2078
-f 2200 2199 2084
-f 2201 2200 2083
-f 2203 2201 2081
-f 2198 2203 2081
-f 2204 2198 2087
-f 2202 2196 2076
-f 2197 2202 2080
-f 2199 2204 2087
-f 2170 2168 2162
-f 2205 2165 2129
-f 2131 2168 2170
-f 2130 2131 2169
-f 2129 2130 2171
-f 2129 2172 2205
-f 2169 2171 2130
-f 2162 2206 2170
-f 2171 2172 2129
-f 2170 2169 2131
-f 2174 2170 2177
-f 2173 2174 2176
-f 2172 2173 2178
-f 2207 2205 2172
-f 2177 2170 2206
-f 2172 2175 2207
-f 2178 2175 2172
-f 2176 2178 2173
-f 2206 2208 2177
-f 2177 2176 2174
-f 2164 2209 2162
-f 2165 2205 2164
-f 2209 2210 2206
-f 2205 2210 2209
-f 2206 2162 2209
-f 2209 2164 2205
-f 2208 2211 2212
-f 2211 2210 2205
-f 2206 2210 2211
-f 2211 2208 2206
-f 2205 2212 2211
-f 2212 2205 2207
-f 2212 2213 2208
-f 2207 2213 2212
-f 2214 2215 2216
-f 2217 2215 2214
-f 2218 2215 2217
-f 2216 2215 2218
-f 2219 2213 2207
-f 2208 2213 2219
-f 2184 2179 2180
-f 2179 2177 2183
-f 2175 2184 2181
-f 2183 2177 2208
-f 2217 2207 2175
-f 2219 2214 2208
-f 2207 2217 2219
-f 2183 2180 2179
-f 2180 2181 2184
-f 2175 2186 2217
-f 2216 2208 2214
-f 2208 2216 2183
-f 2214 2219 2217
-f 2181 2186 2175
-f 2220 2221 2222
-f 2223 2221 2220
-f 2224 2221 2223
-f 2225 2226 2227
-f 2228 2226 2225
-f 2229 2226 2228
-f 2227 2226 2229
-f 2222 2221 2224
-f 2217 2222 2218
-f 2185 2182 2187
-f 2182 2183 2188
-f 2186 2185 2190
-f 2218 2224 2216
-f 2188 2183 2216
-f 2220 2217 2186
-f 2188 2187 2182
-f 2224 2218 2222
-f 2190 2191 2186
-f 2187 2190 2185
-f 2222 2217 2220
-f 2216 2224 2188
-f 2186 2191 2220
-f 2228 2220 2191
-f 2189 2188 2197
-f 2192 2189 2193
-f 2191 2192 2194
-f 2223 2225 2224
-f 2220 2228 2223
-f 2197 2188 2224
-f 2227 2224 2225
-f 2193 2194 2192
-f 2225 2223 2228
-f 2197 2193 2189
-f 2194 2195 2191
-f 2224 2227 2197
-f 2191 2195 2228
-f 2230 2231 2198
-f 2203 2198 2231
-f 2204 2199 2232
-f 2232 2199 2233
-f 2203 2231 2234
-f 2232 2230 2204
-f 2234 2235 2203
-f 2233 2236 2232
-f 2199 2197 2227
-f 2202 2197 2199
-f 2196 2202 2200
-f 2195 2196 2201
-f 2235 2228 2195
-f 2201 2203 2195
-f 2200 2201 2196
-f 2227 2233 2199
-f 2195 2203 2235
-f 2199 2200 2202
-f 2235 2237 2238
-f 2229 2233 2227
-f 2233 2229 2238
-f 2238 2228 2235
-f 2228 2238 2229
-f 2238 2237 2233
-f 2236 2239 2240
-f 2240 2235 2234
-f 2239 2236 2233
-f 2233 2237 2239
-f 2235 2240 2239
-f 2239 2237 2235
-f 2241 2242 2243
-f 2244 2245 2246
-f 2245 2243 2242
-f 2242 2246 2245
-f 2243 2245 2244
-f 2247 2246 2242
-f 2248 2244 2247
-f 2247 2241 2248
-f 2244 2248 2243
-f 2243 2248 2241
-f 2246 2247 2244
-f 2242 2241 2247
-f 2249 2250 2251
-f 2250 2252 2251
-f 2251 2252 2253
-f 2252 2254 2255
-f 2254 2252 2250
-f 2256 2257 2258
-f 2259 2257 2256
-f 2256 2255 2259
-f 2255 2256 2252
-f 2252 2256 2253
-f 2253 2256 2258
-f 2260 2261 2262
-f 2262 2254 2260
-f 2254 2263 2260
-f 2250 2263 2254
-f 2262 2264 2265
-f 2255 2265 2266
-f 2255 2254 2262
-f 2265 2255 2262
-f 2267 2265 2264
-f 2268 2264 2269
-f 2261 2269 2264
-f 2270 2267 2268
-f 2264 2268 2267
-f 2271 2272 2270
-f 2267 2270 2272
-f 2272 2271 2273
-f 2264 2262 2261
-f 2266 2274 2275
-f 2272 2266 2267
-f 2265 2267 2266
-f 2273 2274 2272
-f 2266 2272 2274
-f 2274 2273 2276
-f 2259 2255 2266
-f 2259 2266 2275
-f 2258 2257 2277
-f 2257 2278 2277
-f 2275 2278 2257
-f 2257 2259 2275
-f 2279 2280 2278
-f 2278 2275 2279
-f 2277 2278 2281
-f 2278 2280 2281
-f 2275 2274 2279
-f 2274 2276 2279
-f 2282 2279 2283
-f 2279 2276 2283
-f 2281 2280 2284
-f 2280 2285 2284
-f 2282 2285 2280
-f 2280 2279 2282
-f 2286 2273 2271
-f 2287 2271 2288
-f 2270 2288 2271
-f 2271 2287 2286
-f 2289 2268 2290
-f 2269 2290 2268
-f 2288 2270 2289
-f 2268 2289 2270
-f 2290 2291 2289
-f 2292 2293 2294
-f 2294 2295 2296
-f 2295 2294 2293
-f 2294 2297 2292
-f 2298 2292 2297
-f 2296 2299 2294
-f 2300 2301 2302
-f 2303 2304 2305
-f 2302 2305 2304
-f 2304 2306 2302
-f 2299 2301 2297
-f 2300 2297 2301
-f 2297 2294 2299
-f 2306 2300 2302
-f 2284 2285 2303
-f 2285 2304 2303
-f 2306 2304 2285
-f 2285 2282 2306
-f 2282 2283 2306
-f 2283 2300 2306
-f 2307 2276 2273
-f 2298 2283 2307
-f 2276 2307 2283
-f 2297 2300 2298
-f 2283 2298 2300
-f 2308 2307 2286
-f 2273 2286 2307
-f 2292 2298 2308
-f 2307 2308 2298
-f 2309 2286 2287
-f 2309 2310 2311
-f 2311 2308 2309
-f 2286 2309 2308
-f 2308 2311 2292
-f 2312 2293 2313
-f 2311 2313 2293
-f 2314 2295 2312
-f 2293 2312 2295
-f 2293 2292 2311
-f 2315 2316 2317
-f 2314 2315 2318
-f 2317 2319 2320
-f 2315 2317 2320
-f 2315 2314 2316
-f 2312 2316 2314
-f 2318 2321 2314
-f 2320 2318 2315
-f 2295 2314 2321
-f 2321 2296 2295
-f 2313 2311 2310
-f 2310 2309 2322
-f 2323 2313 2324
-f 2310 2324 2313
-f 2313 2323 2312
-f 2316 2323 2325
-f 2316 2325 2317
-f 2323 2324 2326
-f 2323 2326 2325
-f 2316 2312 2323
-f 2327 2328 2329
-f 2324 2330 2326
-f 2327 2329 2330
-f 2327 2322 2328
-f 2331 2328 2322
-f 2324 2310 2327
-f 2322 2327 2310
-f 2324 2327 2330
-f 2332 2333 2331
-f 2291 2334 2332
-f 2331 2288 2332
-f 2289 2332 2288
-f 2322 2287 2331
-f 2288 2331 2287
-f 2287 2322 2309
-f 2332 2289 2291
-f 2333 2332 2334
-f 2328 2335 2329
-f 2336 2337 2334
-f 2337 2333 2334
-f 2328 2333 2335
-f 2333 2337 2335
-f 2328 2331 2333
-f 2338 2339 2340
-f 2263 2250 2341
-f 2341 2340 2263
-f 2339 2338 2342
-f 2342 2343 2339
-f 2340 2341 2338
-f 2341 2250 2249
-f 2342 2338 2344
-f 2338 2345 2344
-f 2338 2341 2345
-f 2341 2346 2345
-f 2346 2341 2249
-f 2345 2346 2344
-f 2346 2249 2344
-f 2344 2249 2347
-f 2348 2347 2251
-f 2249 2251 2347
-f 2349 2350 2351
-f 2351 2350 2348
-f 2352 2353 2349
-f 2350 2349 2353
-f 2351 2348 2253
-f 2251 2253 2348
-f 2350 2354 2348
-f 2355 2356 957
-f 2353 2357 2350
-f 2355 957 958
-f 2356 2355 2358
-f 2359 2358 2355
-f 2357 2353 2359
-f 2358 2359 2353
-f 2360 2349 2351
-f 2352 2361 2362
-f 2361 2352 2363
-f 2360 2351 2258
-f 2253 2258 2351
-f 2363 2349 2360
-f 2349 2363 2352
-f 2364 2363 2365
-f 2365 2363 2360
-f 2366 2361 2364
-f 2365 2360 2277
-f 2258 2277 2360
-f 2363 2364 2361
-f 2367 2356 2362
-f 2356 2367 917
-f 2353 2352 2358
-f 2362 2358 2352
-f 2358 2362 2356
-f 2356 917 957
-f 2362 2368 2367
-f 2367 938 917
-f 2368 2362 2361
-f 2369 2367 2368
-f 2367 2369 938
-f 2368 2370 2369
-f 2371 2369 2370
-f 2369 2371 937
-f 2369 937 938
-f 2370 2368 2366
-f 2361 2366 2368
-f 2339 2372 2373
-f 2373 2260 2340
-f 2260 2263 2340
-f 2374 2372 2343
-f 2372 2339 2343
-f 2340 2339 2373
-f 2261 2260 2375
-f 2373 2375 2260
-f 2375 2373 2376
-f 2372 2376 2373
-f 2376 2372 2377
-f 2374 2377 2372
-f 2377 2374 2378
-f 2354 2350 2357
-f 2348 2354 2347
-f 2342 2344 2379
-f 2347 2380 2344
-f 2374 2343 2381
-f 2343 2342 2379
-f 2379 2381 2343
-f 2382 2383 2384
-f 2384 2385 2382
-f 2381 2379 2383
-f 2383 2382 2381
-f 2385 2384 2386
-f 2387 2388 2389
-f 2387 2390 2386
-f 2388 2391 2380
-f 2380 2389 2388
-f 2389 2390 2387
-f 2389 2380 2386
-f 2386 2390 2389
-f 2391 2388 2383
-f 2379 2391 2383
-f 2387 2386 2384
-f 2383 2388 2384
-f 2388 2387 2384
-f 2386 2354 2357
-f 2347 2354 2380
-f 2386 2380 2354
-f 2386 2357 2392
-f 2344 2391 2379
-f 2391 2344 2380
-f 2357 2393 2392
-f 2359 2394 2393
-f 2359 2393 2357
-f 2355 2394 2359
-f 2355 958 959
-f 959 2394 2355
-f 2394 2395 2393
-f 2395 2396 2393
-f 2394 959 2395
-f 963 2395 959
-f 2385 2396 2397
-f 2398 2385 2397
-f 2393 2385 2392
-f 2392 2385 2386
-f 2385 2393 2396
-f 2399 2400 2401
-f 2400 2402 2403
-f 2400 2403 2401
-f 2401 2403 2404
-f 2405 2401 2404
-f 2406 2404 2407
-f 2378 2408 2403
-f 2408 2378 2374
-f 2404 2403 2407
-f 2409 2410 2411
-f 2411 2382 2409
-f 2398 2409 2385
-f 2408 2374 2381
-f 2382 2411 2408
-f 2381 2382 2408
-f 2382 2385 2409
-f 2412 2407 2413
-f 2411 2403 2408
-f 2414 2413 2410
-f 2410 2409 2415
-f 2413 2407 2411
-f 2407 2403 2411
-f 2410 2413 2411
-f 2416 2417 2410
-f 2397 2418 2398
-f 2398 2418 2419
-f 2419 2416 2415
-f 2420 2417 2410
-f 2414 2410 2417
-f 2412 2413 2421
-f 2419 2409 2398
-f 2413 2414 2422
-f 2410 2415 2416
-f 2415 2409 2419
-f 2385 2420 2410
-f 2410 2417 2404
-f 2423 2364 2365
-f 2423 2365 2281
-f 2277 2281 2365
-f 2424 2366 2425
-f 2425 2364 2423
-f 2364 2425 2366
-f 2424 2426 2427
-f 2428 2427 2426
-f 2429 2423 2284
-f 2281 2284 2423
-f 2430 2425 2429
-f 2429 2425 2423
-f 2426 2424 2430
-f 2425 2430 2424
-f 2366 2424 2370
-f 2370 2427 2371
-f 2427 2370 2424
-f 2371 1004 937
-f 2431 2371 2427
-f 2431 1005 1004
-f 2371 2431 1004
-f 2427 2428 2431
-f 2432 2433 2434
-f 2434 2428 2435
-f 2433 2431 2428
-f 2433 2432 1008
-f 2433 1008 1005
-f 2431 2433 1005
-f 2426 2435 2428
-f 2428 2434 2433
-f 2436 2437 2399
-f 2438 2439 2405
-f 2440 2441 2402
-f 2442 2440 2443
-f 2437 2442 2400
-f 2439 2436 2401
-f 2421 2444 2412
-f 2444 2445 2407
-f 2446 2438 2404
-f 2445 2446 2406
-f 2417 2422 2414
-f 2422 2421 2413
-f 2417 2438 2404
-f 2401 2405 2439
-f 2407 2412 2444
-f 2404 2406 2446
-f 2406 2407 2445
-f 2405 2404 2438
-f 2447 2448 2449
-f 2450 2447 2451
-f 2452 2453 2454
-f 2455 2450 2456
-f 2457 2458 2459
-f 2453 2457 2460
-f 2448 2452 2461
-f 2457 2460 2462
-f 2400 2399 2437
-f 2443 2400 2442
-f 2458 2402 2441
-f 2402 2443 2440
-f 2399 2401 2436
-f 2404 2438 2457
-f 2449 2451 2447
-f 2459 2460 2457
-f 2461 2449 2448
-f 2454 2461 2452
-f 2460 2454 2453
-f 2441 2459 2458
-f 2438 2460 2457
-f 2463 2464 2465
-f 2465 2466 2463
-f 2290 2269 2467
-f 2468 2467 2269
-f 2467 2468 2469
-f 2470 2469 2468
-f 2469 2470 2466
-f 2471 2466 2470
-f 2466 2465 2469
-f 2472 2463 2466
-f 2466 2471 2472
-f 2375 2468 2261
-f 2468 2375 2470
-f 2376 2470 2375
-f 2470 2376 2471
-f 2377 2471 2376
-f 2269 2261 2468
-f 2471 2377 2473
-f 2378 2473 2377
-f 2443 2402 2400
-f 2403 2474 2378
-f 2402 2457 2403
-f 2457 2474 2403
-f 2473 2378 2474
-f 2453 2452 2457
-f 2458 2457 2402
-f 2448 2447 2452
-f 2475 2462 2455
-f 2462 2474 2455
-f 2455 2474 2447
-f 2447 2474 2452
-f 2452 2474 2457
-f 2450 2455 2447
-f 2474 2476 2473
-f 2473 2472 2471
-f 2462 2477 2474
-f 2478 2479 2477
-f 2472 2473 2476
-f 2480 2477 2462
-f 2479 2476 2477
-f 2477 2476 2474
-f 2479 2481 2476
-f 2476 2481 2482
-f 2483 2482 2481
-f 2484 2481 2479
-f 2482 2485 2476
-f 2463 2472 2486
-f 2476 2486 2472
-f 2485 2487 2476
-f 2487 2486 2476
-f 2488 2489 2487
-f 2490 2487 2485
-f 2491 2485 2482
-f 2318 2320 2492
-f 2493 2494 2495
-f 2492 2495 2494
-f 2494 2493 2496
-f 2492 2497 2318
-f 2321 2318 2497
-f 2494 2498 2492
-f 2497 2492 2498
-f 2496 2499 2494
-f 2498 2494 2499
-f 2500 2501 2502
-f 2502 2503 2504
-f 2317 2325 2504
-f 2504 2505 2317
-f 2319 2317 2505
-f 2506 2496 2493
-f 2495 2492 2320
-f 2320 2319 2495
-f 2495 2507 2493
-f 2493 2508 2506
-f 2509 2319 2505
-f 2507 2508 2493
-f 2319 2507 2495
-f 2508 2509 2506
-f 2508 2507 2509
-f 2507 2319 2509
-f 2510 2511 2512
-f 2513 2514 2515
-f 2512 2515 2514
-f 2299 2296 2510
-f 2510 2516 2299
-f 2511 2497 2515
-f 2515 2498 2513
-f 2511 2510 2296
-f 2515 2512 2511
-f 2296 2321 2511
-f 2496 2506 2517
-f 2497 2511 2321
-f 2499 2513 2498
-f 2498 2515 2497
-f 2518 2509 2519
-f 2517 2520 2496
-f 2499 2496 2520
-f 2521 2517 2506
-f 2509 2518 2521
-f 2504 2503 2505
-f 2503 2502 2501
-f 2506 2509 2521
-f 2501 2500 2522
-f 2523 2524 2522
-f 2525 2503 2501
-f 2522 2526 2501
-f 2505 2503 2519
-f 2505 2519 2509
-f 2525 2501 2527
-f 2525 2519 2503
-f 2501 2526 2527
-f 2522 2524 2526
-f 2528 2430 2429
-f 2284 2303 2429
-f 2430 2529 2426
-f 2528 2429 2303
-f 2529 2430 2528
-f 2435 2426 2529
-f 2530 2529 2528
-f 2435 2531 2434
-f 2531 2435 2532
-f 2529 2532 2435
-f 2530 2305 2533
-f 2530 2528 2305
-f 2303 2305 2528
-f 2534 2535 2305
-f 2305 2302 2534
-f 2536 2537 2535
-f 2535 2534 2536
-f 2538 2533 2537
-f 2537 2536 2538
-f 2305 2535 2533
-f 2535 2537 2533
-f 2538 2536 2539
-f 2301 2516 2534
-f 2534 2516 2536
-f 2516 2540 2536
-f 2536 2540 2539
-f 2302 2301 2534
-f 2540 2512 2539
-f 2514 2539 2512
-f 2514 2513 2541
-f 2513 2499 2542
-f 2301 2299 2516
-f 2512 2540 2510
-f 2516 2510 2540
-f 2543 2544 2545
-f 2517 2521 2546
-f 2544 2546 2545
-f 2547 2545 2548
-f 2545 2549 2548
-f 2520 2542 2499
-f 2549 2546 2521
-f 2546 2549 2545
-f 2549 2550 2548
-f 2550 2551 2548
-f 2548 2551 2525
-f 2521 2518 2549
-f 2551 2550 2552
-f 2550 2518 2519
-f 2518 2550 2549
-f 2553 2434 2531
-f 2432 2554 1021
-f 2434 2553 2432
-f 2554 2432 2553
-f 2432 1021 1008
-f 2541 2555 2514
-f 2542 2541 2513
-f 2556 2557 2542
-f 2520 2517 2558
-f 2558 2546 2559
-f 2560 2559 2561
-f 2562 2563 2559
-f 2564 2565 2563
-f 2565 2558 2563
-f 2563 2558 2559
-f 2561 2546 2566
-f 2566 2546 2567
-f 2544 2567 2546
-f 2559 2546 2561
-f 2546 2558 2517
-f 2568 2567 2544
-f 2569 2566 2567
-f 2570 2561 2566
-f 2532 2571 2531
-f 2532 2530 2571
-f 2538 2539 2572
-f 2539 2514 2555
-f 2532 2529 2530
-f 2533 2538 2572
-f 2533 2573 2530
-f 2397 2531 2571
-f 2574 2571 2530
-f 2572 2573 2533
-f 2531 2397 2553
-f 2574 2530 2573
-f 2539 2555 2572
-f 2553 2396 2554
-f 2395 2554 2396
-f 1021 2554 2395
-f 2395 963 1021
-f 2396 2553 2397
-f 2397 2571 2420
-f 2420 2571 2575
-f 2420 2418 2397
-f 2574 2576 2571
-f 2571 2576 2577
-f 2577 2575 2571
-f 2577 2576 2578
-f 2578 2575 2577
-f 2576 2574 2573
-f 2579 2578 2573
-f 2573 2578 2576
-f 2573 2572 2579
-f 2420 2575 2578
-f 2578 2579 2420
-f 2580 2419 2420
-f 2420 2419 2418
-f 2572 2555 2579
-f 2555 2580 2579
-f 2579 2580 2420
-f 2555 2541 2580
-f 2421 2422 2417
-f 2417 2416 2419
-f 2580 2445 2421
-f 2421 2417 2580
-f 2580 2417 2419
-f 2438 2445 2557
-f 2557 2445 2580
-f 2438 2446 2445
-f 2439 2438 2436
-f 2557 2436 2438
-f 2557 2580 2541
-f 2445 2444 2421
-f 2451 2556 2581
-f 2456 2451 2581
-f 2556 2558 2582
-f 2583 2582 2584
-f 2542 2520 2556
-f 2585 2581 2582
-f 2582 2581 2556
-f 2586 2587 2565
-f 2558 2556 2520
-f 2582 2558 2584
-f 2588 2589 2587
-f 2589 2558 2587
-f 2584 2558 2589
-f 2587 2558 2565
-f 2590 2584 2589
-f 2454 2460 2461
-f 2459 2441 2460
-f 2541 2542 2557
-f 2557 2556 2441
-f 2441 2556 2460
-f 2440 2442 2441
-f 2441 2442 2557
-f 2436 2557 2442
-f 2437 2436 2442
-f 2525 2527 2548
-f 2548 2527 2526
-f 2551 2591 2525
-f 2552 2591 2551
-f 2525 2591 2552
-f 2519 2552 2550
-f 2552 2519 2525
-f 2460 2556 2461
-f 2461 2556 2451
-f 2449 2461 2451
-f 2585 2582 2462
-f 2456 2581 2455
-f 2451 2456 2450
-f 2581 2585 2475
-f 2460 2582 2462
-f 2480 2462 2582
-f 2478 2477 2584
-f 2479 2478 2590
-f 2462 2475 2585
-f 2477 2480 2583
-f 2475 2455 2581
-f 2481 2462 2587
-f 2583 2584 2477
-f 2588 2587 2481
-f 2582 2583 2480
-f 2584 2590 2478
-f 2589 2588 2484
-f 2590 2589 2479
-f 2462 2582 2587
-f 2592 2500 2593
-f 2502 2593 2500
-f 2593 2502 2594
-f 2594 2502 2504
-f 2325 2326 2594
-f 2594 2504 2325
-f 2595 2592 2596
-f 2593 2596 2592
-f 2592 2595 2597
-f 2598 2597 2595
-f 2599 2594 2326
-f 2596 2593 2599
-f 2599 2593 2594
-f 2522 2600 2523
-f 2600 2522 2500
-f 2523 2601 2602
-f 2523 2602 2603
-f 2601 2523 2600
-f 2600 2597 2601
-f 2500 2592 2600
-f 2597 2598 2604
-f 2605 2604 2598
-f 2604 2606 2607
-f 2601 2604 2607
-f 2604 2601 2597
-f 2601 2607 2602
-f 2597 2600 2592
-f 2608 2595 2609
-f 2609 2596 2610
-f 2610 2596 2599
-f 2610 2599 2330
-f 2326 2330 2599
-f 2596 2609 2595
-f 2611 2608 2612
-f 2613 2610 2329
-f 2330 2329 2610
-f 2612 2609 2613
-f 2613 2609 2610
-f 2609 2612 2608
-f 2598 2614 2605
-f 2615 2605 2614
-f 2605 2616 2606
-f 2595 2608 2598
-f 2614 2598 2608
-f 2604 2605 2606
-f 2605 2615 2616
-f 2608 2611 2614
-f 2617 2614 2611
-f 2614 2617 2615
-f 2618 2615 2617
-f 2615 2619 2616
-f 2615 2618 2619
-f 2469 2620 2467
-f 2291 2290 2621
-f 2467 2621 2290
-f 2620 2469 2465
-f 2621 2467 2620
-f 2621 2622 2291
-f 2620 2623 2621
-f 2465 2624 2620
-f 2622 2621 2623
-f 2334 2291 2622
-f 2624 2465 2464
-f 2623 2620 2624
-f 2625 2613 2335
-f 2329 2335 2613
-f 2625 2612 2613
-f 2626 2627 2628
-f 2628 2625 2337
-f 2629 2626 2628
-f 2335 2337 2625
-f 2630 2631 2632
-f 2626 2632 2631
-f 2631 2630 2633
-f 2633 2634 2635
-f 2634 2633 2630
-f 2636 2635 2634
-f 2635 2636 2637
-f 2617 2638 2618
-f 2639 2618 2638
-f 2618 2639 2640
-f 2618 2640 2619
-f 2638 2617 2641
-f 2631 2641 2626
-f 2627 2626 2641
-f 2641 2611 2627
-f 2612 2627 2611
-f 2628 2627 2625
-f 2611 2641 2617
-f 2627 2612 2625
-f 2635 2639 2633
-f 2635 2637 2642
-f 2639 2635 2642
-f 2639 2642 2640
-f 2633 2638 2631
-f 2641 2631 2638
-f 2638 2633 2639
-f 2623 2624 2643
-f 2644 2622 2645
-f 2643 2624 2464
-f 2622 2623 2645
-f 2336 2334 2644
-f 2334 2622 2644
-f 2645 2623 2643
-f 2629 2336 2643
-f 2643 2646 2629
-f 2629 2628 2336
-f 2644 2645 2643
-f 2632 2626 2629
-f 2337 2336 2628
-f 2336 2644 2643
-f 2586 2565 2482
-f 2485 2563 2562
-f 2565 2564 2491
-f 2587 2586 2483
-f 2564 2563 2485
-f 2587 2559 2481
-f 2483 2481 2587
-f 2485 2491 2564
-f 2482 2483 2586
-f 2481 2484 2588
-f 2562 2490 2485
-f 2491 2482 2565
-f 2484 2479 2589
-f 2559 2487 2481
-f 2570 2566 2647
-f 2560 2561 2489
-f 2561 2570 2648
-f 2562 2559 2487
-f 2559 2560 2488
-f 2487 2559 2567
-f 2489 2488 2560
-f 2648 2489 2561
-f 2649 2647 2566
-f 2487 2490 2562
-f 2650 2649 2569
-f 2488 2487 2559
-f 2647 2648 2570
-f 2650 2487 2567
-f 2651 2548 2526
-f 2544 2543 2652
-f 2547 2548 2651
-f 2545 2547 2653
-f 2543 2545 2654
-f 2568 2544 2655
-f 2569 2567 2650
-f 2566 2569 2649
-f 2567 2548 2650
-f 2567 2568 2656
-f 2655 2656 2568
-f 2654 2652 2543
-f 2656 2650 2567
-f 2652 2655 2544
-f 2653 2654 2545
-f 2651 2653 2547
-f 2548 2651 2650
-f 2649 2650 2647
-f 2655 2486 2650
-f 2648 2647 2489
-f 2650 2486 2647
-f 2647 2486 2489
-f 2489 2486 2487
-f 2486 2657 2463
-f 2464 2463 2657
-f 2653 2651 2654
-f 2656 2655 2650
-f 2651 2657 2654
-f 2654 2657 2655
-f 2657 2486 2655
-f 2652 2654 2655
-f 2526 2658 2651
-f 2658 2659 2651
-f 2651 2659 2660
-f 2464 2657 2646
-f 2651 2661 2657
-f 2662 2658 2526
-f 2523 2603 2663
-f 2663 2524 2523
-f 2664 2662 2663
-f 2524 2662 2526
-f 2524 2663 2662
-f 2662 2636 2658
-f 2662 2664 2637
-f 2665 2660 2629
-f 2658 2634 2659
-f 2646 2643 2464
-f 2659 2630 2660
-f 2665 2629 2646
-f 2661 2666 2657
-f 2657 2666 2646
-f 2660 2661 2651
-f 2632 2660 2630
-f 2637 2636 2662
-f 2634 2658 2636
-f 2630 2659 2634
-f 2632 2629 2660
-f 2660 2667 2668
-f 2667 2665 2646
-f 2646 2666 2667
-f 2666 2661 2668
-f 2668 2661 2660
-f 2665 2667 2660
-f 2668 2667 2666
-f 2669 2670 2671
-f 2670 2672 2671
-f 2671 2672 2673
-f 2672 2674 2675
-f 2674 2672 2670
-f 2676 2677 2678
-f 2679 2677 2676
-f 2676 2675 2679
-f 2675 2676 2672
-f 2672 2676 2673
-f 2673 2676 2678
-f 2680 2681 2682
-f 2682 2674 2680
-f 2674 2683 2680
-f 2670 2683 2674
-f 2682 2684 2685
-f 2675 2685 2686
-f 2675 2674 2682
-f 2685 2675 2682
-f 2687 2685 2684
-f 2688 2684 2689
-f 2681 2689 2684
-f 2690 2687 2688
-f 2684 2688 2687
-f 2691 2692 2690
-f 2687 2690 2692
-f 2692 2691 2693
-f 2684 2682 2681
-f 2686 2694 2695
-f 2692 2686 2687
-f 2685 2687 2686
-f 2693 2694 2692
-f 2686 2692 2694
-f 2694 2693 2696
-f 2679 2675 2686
-f 2679 2686 2695
-f 2678 2677 2697
-f 2677 2698 2697
-f 2695 2698 2677
-f 2677 2679 2695
-f 2699 2700 2698
-f 2698 2695 2699
-f 2697 2698 2701
-f 2698 2700 2701
-f 2695 2694 2699
-f 2694 2696 2699
-f 2702 2699 2703
-f 2699 2696 2703
-f 2701 2700 2704
-f 2700 2705 2704
-f 2702 2705 2700
-f 2700 2699 2702
-f 2706 2693 2691
-f 2707 2691 2708
-f 2690 2708 2691
-f 2691 2707 2706
-f 2709 2688 2710
-f 2689 2710 2688
-f 2708 2690 2709
-f 2688 2709 2690
-f 2710 2711 2709
-f 2712 2713 2714
-f 2714 2715 2716
-f 2715 2714 2713
-f 2714 2717 2712
-f 2718 2712 2717
-f 2716 2719 2714
-f 2720 2721 2722
-f 2723 2724 2725
-f 2722 2725 2724
-f 2724 2726 2722
-f 2719 2721 2717
-f 2720 2717 2721
-f 2717 2714 2719
-f 2726 2720 2722
-f 2704 2705 2723
-f 2705 2724 2723
-f 2726 2724 2705
-f 2705 2702 2726
-f 2702 2703 2726
-f 2703 2720 2726
-f 2727 2696 2693
-f 2718 2703 2727
-f 2696 2727 2703
-f 2717 2720 2718
-f 2703 2718 2720
-f 2728 2727 2706
-f 2693 2706 2727
-f 2712 2718 2728
-f 2727 2728 2718
-f 2729 2706 2707
-f 2729 2730 2731
-f 2731 2728 2729
-f 2706 2729 2728
-f 2728 2731 2712
-f 2732 2713 2733
-f 2731 2733 2713
-f 2734 2715 2732
-f 2713 2732 2715
-f 2713 2712 2731
-f 2735 2736 2737
-f 2734 2735 2738
-f 2737 2739 2740
-f 2735 2737 2740
-f 2735 2734 2736
-f 2732 2736 2734
-f 2738 2741 2734
-f 2740 2738 2735
-f 2715 2734 2741
-f 2741 2716 2715
-f 2733 2731 2730
-f 2730 2729 2742
-f 2743 2733 2744
-f 2730 2744 2733
-f 2733 2743 2732
-f 2736 2743 2745
-f 2736 2745 2737
-f 2743 2744 2746
-f 2743 2746 2745
-f 2736 2732 2743
-f 2747 2748 2749
-f 2744 2750 2746
-f 2747 2749 2750
-f 2747 2742 2748
-f 2751 2748 2742
-f 2744 2730 2747
-f 2742 2747 2730
-f 2744 2747 2750
-f 2752 2753 2751
-f 2711 2754 2752
-f 2751 2708 2752
-f 2709 2752 2708
-f 2742 2707 2751
-f 2708 2751 2707
-f 2707 2742 2729
-f 2752 2709 2711
-f 2753 2752 2754
-f 2748 2755 2749
-f 2756 2757 2754
-f 2757 2753 2754
-f 2748 2753 2755
-f 2753 2757 2755
-f 2748 2751 2753
-f 2758 2759 2760
-f 2683 2670 2761
-f 2761 2760 2683
-f 2759 2758 2762
-f 2762 2763 2759
-f 2760 2761 2758
-f 2761 2670 2669
-f 2762 2758 2764
-f 2758 2765 2764
-f 2758 2761 2765
-f 2761 2766 2765
-f 2766 2761 2669
-f 2765 2766 2764
-f 2766 2669 2764
-f 2764 2669 2767
-f 2768 2767 2671
-f 2669 2671 2767
-f 2769 2770 2771
-f 2771 2770 2768
-f 2772 2773 2769
-f 2770 2769 2773
-f 2771 2768 2673
-f 2671 2673 2768
-f 2770 2774 2768
-f 2775 2776 2777
-f 2773 2778 2770
-f 2775 2777 2779
-f 2776 2775 2780
-f 2781 2780 2775
-f 2778 2773 2781
-f 2780 2781 2773
-f 2782 2769 2771
-f 2772 2783 2784
-f 2783 2772 2785
-f 2782 2771 2678
-f 2673 2678 2771
-f 2785 2769 2782
-f 2769 2785 2772
-f 2786 2785 2787
-f 2787 2785 2782
-f 2788 2783 2786
-f 2787 2782 2697
-f 2678 2697 2782
-f 2785 2786 2783
-f 2789 2776 2784
-f 2776 2789 2790
-f 2773 2772 2780
-f 2784 2780 2772
-f 2780 2784 2776
-f 2776 2790 2777
-f 2784 2791 2789
-f 2789 2792 2790
-f 2791 2784 2783
-f 2793 2789 2791
-f 2789 2793 2792
-f 2791 2794 2793
-f 2795 2793 2794
-f 2793 2795 2796
-f 2793 2796 2792
-f 2794 2791 2788
-f 2783 2788 2791
-f 2759 2797 2798
-f 2798 2680 2760
-f 2680 2683 2760
-f 2799 2797 2763
-f 2797 2759 2763
-f 2760 2759 2798
-f 2681 2680 2800
-f 2798 2800 2680
-f 2800 2798 2801
-f 2797 2801 2798
-f 2801 2797 2802
-f 2799 2802 2797
-f 2802 2799 2803
-f 2774 2770 2778
-f 2768 2774 2767
-f 2762 2764 2804
-f 2767 2805 2764
-f 2799 2763 2806
-f 2763 2762 2804
-f 2804 2806 2763
-f 2807 2808 2809
-f 2809 2810 2807
-f 2806 2804 2808
-f 2808 2807 2806
-f 2810 2809 2811
-f 2812 2813 2814
-f 2812 2815 2811
-f 2813 2816 2805
-f 2805 2814 2813
-f 2814 2815 2812
-f 2814 2805 2811
-f 2811 2815 2814
-f 2816 2813 2808
-f 2804 2816 2808
-f 2812 2811 2809
-f 2808 2813 2809
-f 2813 2812 2809
-f 2811 2774 2778
-f 2767 2774 2805
-f 2811 2805 2774
-f 2811 2778 2817
-f 2764 2816 2804
-f 2816 2764 2805
-f 2778 2818 2817
-f 2781 2819 2818
-f 2781 2818 2778
-f 2775 2819 2781
-f 2775 2779 2820
-f 2820 2819 2775
-f 2819 2821 2818
-f 2821 2822 2818
-f 2819 2820 2821
-f 2823 2821 2820
-f 2810 2822 2824
-f 2825 2810 2824
-f 2818 2810 2817
-f 2817 2810 2811
-f 2810 2818 2822
-f 2826 2827 2828
-f 2827 2829 2830
-f 2827 2830 2828
-f 2828 2830 2831
-f 2832 2828 2831
-f 2833 2831 2834
-f 2803 2835 2830
-f 2835 2803 2799
-f 2831 2830 2834
-f 2836 2837 2838
-f 2838 2807 2836
-f 2825 2836 2810
-f 2835 2799 2806
-f 2807 2838 2835
-f 2806 2807 2835
-f 2807 2810 2836
-f 2839 2834 2840
-f 2838 2830 2835
-f 2841 2840 2837
-f 2837 2836 2842
-f 2840 2834 2838
-f 2834 2830 2838
-f 2837 2840 2838
-f 2843 2844 2837
-f 2824 2845 2825
-f 2825 2845 2846
-f 2846 2843 2842
-f 2847 2844 2837
-f 2841 2837 2844
-f 2839 2840 2848
-f 2846 2836 2825
-f 2840 2841 2849
-f 2837 2842 2843
-f 2842 2836 2846
-f 2810 2847 2837
-f 2837 2844 2831
-f 2850 2786 2787
-f 2850 2787 2701
-f 2697 2701 2787
-f 2851 2788 2852
-f 2852 2786 2850
-f 2786 2852 2788
-f 2851 2853 2854
-f 2855 2854 2853
-f 2856 2850 2704
-f 2701 2704 2850
-f 2857 2852 2856
-f 2856 2852 2850
-f 2853 2851 2857
-f 2852 2857 2851
-f 2788 2851 2794
-f 2794 2854 2795
-f 2854 2794 2851
-f 2795 2858 2796
-f 2859 2795 2854
-f 2859 2860 2858
-f 2795 2859 2858
-f 2854 2855 2859
-f 2861 2862 2863
-f 2863 2855 2864
-f 2862 2859 2855
-f 2862 2861 2865
-f 2862 2865 2860
-f 2859 2862 2860
-f 2853 2864 2855
-f 2855 2863 2862
-f 2866 2867 2826
-f 2868 2869 2832
-f 2870 2871 2829
-f 2872 2870 2873
-f 2867 2872 2827
-f 2869 2866 2828
-f 2848 2874 2839
-f 2874 2875 2834
-f 2876 2868 2831
-f 2875 2876 2833
-f 2844 2849 2841
-f 2849 2848 2840
-f 2844 2868 2831
-f 2828 2832 2869
-f 2834 2839 2874
-f 2831 2833 2876
-f 2833 2834 2875
-f 2832 2831 2868
-f 2877 2878 2879
-f 2880 2877 2881
-f 2882 2883 2884
-f 2885 2880 2886
-f 2887 2888 2889
-f 2883 2887 2890
-f 2878 2882 2891
-f 2887 2890 2892
-f 2827 2826 2867
-f 2873 2827 2872
-f 2888 2829 2871
-f 2829 2873 2870
-f 2826 2828 2866
-f 2831 2868 2887
-f 2879 2881 2877
-f 2889 2890 2887
-f 2891 2879 2878
-f 2884 2891 2882
-f 2890 2884 2883
-f 2871 2889 2888
-f 2868 2890 2887
-f 2893 2894 2895
-f 2895 2896 2893
-f 2710 2689 2897
-f 2898 2897 2689
-f 2897 2898 2899
-f 2900 2899 2898
-f 2899 2900 2896
-f 2901 2896 2900
-f 2896 2895 2899
-f 2902 2893 2896
-f 2896 2901 2902
-f 2800 2898 2681
-f 2898 2800 2900
-f 2801 2900 2800
-f 2900 2801 2901
-f 2802 2901 2801
-f 2689 2681 2898
-f 2901 2802 2903
-f 2803 2903 2802
-f 2873 2829 2827
-f 2830 2904 2803
-f 2829 2887 2830
-f 2887 2904 2830
-f 2903 2803 2904
-f 2883 2882 2887
-f 2888 2887 2829
-f 2878 2877 2882
-f 2905 2892 2885
-f 2892 2904 2885
-f 2885 2904 2877
-f 2877 2904 2882
-f 2882 2904 2887
-f 2880 2885 2877
-f 2904 2906 2903
-f 2903 2902 2901
-f 2892 2907 2904
-f 2908 2909 2907
-f 2902 2903 2906
-f 2910 2907 2892
-f 2909 2906 2907
-f 2907 2906 2904
-f 2909 2911 2906
-f 2906 2911 2912
-f 2913 2912 2911
-f 2914 2911 2909
-f 2912 2915 2906
-f 2893 2902 2916
-f 2906 2916 2902
-f 2915 2917 2906
-f 2917 2916 2906
-f 2918 2919 2917
-f 2920 2917 2915
-f 2921 2915 2912
-f 2738 2740 2922
-f 2923 2924 2925
-f 2922 2925 2924
-f 2924 2923 2926
-f 2922 2927 2738
-f 2741 2738 2927
-f 2924 2928 2922
-f 2927 2922 2928
-f 2926 2929 2924
-f 2928 2924 2929
-f 2930 2931 2932
-f 2932 2933 2934
-f 2737 2745 2934
-f 2934 2935 2737
-f 2739 2737 2935
-f 2936 2926 2923
-f 2925 2922 2740
-f 2740 2739 2925
-f 2925 2937 2923
-f 2923 2938 2936
-f 2939 2739 2935
-f 2937 2938 2923
-f 2739 2937 2925
-f 2938 2939 2936
-f 2938 2937 2939
-f 2937 2739 2939
-f 2940 2941 2942
-f 2943 2944 2945
-f 2942 2945 2944
-f 2719 2716 2940
-f 2940 2946 2719
-f 2941 2927 2945
-f 2945 2928 2943
-f 2941 2940 2716
-f 2945 2942 2941
-f 2716 2741 2941
-f 2926 2936 2947
-f 2927 2941 2741
-f 2929 2943 2928
-f 2928 2945 2927
-f 2948 2939 2949
-f 2947 2950 2926
-f 2929 2926 2950
-f 2951 2947 2936
-f 2939 2948 2951
-f 2934 2933 2935
-f 2933 2932 2931
-f 2936 2939 2951
-f 2931 2930 2952
-f 2953 2954 2952
-f 2955 2933 2931
-f 2952 2956 2931
-f 2935 2933 2949
-f 2935 2949 2939
-f 2955 2931 2957
-f 2955 2949 2933
-f 2931 2956 2957
-f 2952 2954 2956
-f 2958 2857 2856
-f 2704 2723 2856
-f 2857 2959 2853
-f 2958 2856 2723
-f 2959 2857 2958
-f 2864 2853 2959
-f 2960 2959 2958
-f 2864 2961 2863
-f 2961 2864 2962
-f 2959 2962 2864
-f 2960 2725 2963
-f 2960 2958 2725
-f 2723 2725 2958
-f 2964 2965 2725
-f 2725 2722 2964
-f 2966 2967 2965
-f 2965 2964 2966
-f 2968 2963 2967
-f 2967 2966 2968
-f 2725 2965 2963
-f 2965 2967 2963
-f 2968 2966 2969
-f 2721 2946 2964
-f 2964 2946 2966
-f 2946 2970 2966
-f 2966 2970 2969
-f 2722 2721 2964
-f 2970 2942 2969
-f 2944 2969 2942
-f 2944 2943 2971
-f 2943 2929 2972
-f 2721 2719 2946
-f 2942 2970 2940
-f 2946 2940 2970
-f 2973 2974 2975
-f 2947 2951 2976
-f 2974 2976 2975
-f 2977 2975 2978
-f 2975 2979 2978
-f 2950 2972 2929
-f 2979 2976 2951
-f 2976 2979 2975
-f 2979 2980 2978
-f 2980 2981 2978
-f 2978 2981 2955
-f 2951 2948 2979
-f 2981 2980 2982
-f 2980 2948 2949
-f 2948 2980 2979
-f 2983 2863 2961
-f 2861 2984 2985
-f 2863 2983 2861
-f 2984 2861 2983
-f 2861 2985 2865
-f 2971 2986 2944
-f 2972 2971 2943
-f 2987 2988 2972
-f 2950 2947 2989
-f 2989 2976 2990
-f 2991 2990 2992
-f 2993 2994 2990
-f 2995 2996 2994
-f 2996 2989 2994
-f 2994 2989 2990
-f 2992 2976 2997
-f 2997 2976 2998
-f 2974 2998 2976
-f 2990 2976 2992
-f 2976 2989 2947
-f 2999 2998 2974
-f 3000 2997 2998
-f 3001 2992 2997
-f 2962 3002 2961
-f 2962 2960 3002
-f 2968 2969 3003
-f 2969 2944 2986
-f 2962 2959 2960
-f 2963 2968 3003
-f 2963 3004 2960
-f 2824 2961 3002
-f 3005 3002 2960
-f 3003 3004 2963
-f 2961 2824 2983
-f 3005 2960 3004
-f 2969 2986 3003
-f 2983 2822 2984
-f 2821 2984 2822
-f 2985 2984 2821
-f 2821 2823 2985
-f 2822 2983 2824
-f 2824 3002 2847
-f 2847 3002 3006
-f 2847 2845 2824
-f 3005 3007 3002
-f 3002 3007 3008
-f 3008 3006 3002
-f 3008 3007 3009
-f 3009 3006 3008
-f 3007 3005 3004
-f 3010 3009 3004
-f 3004 3009 3007
-f 3004 3003 3010
-f 2847 3006 3009
-f 3009 3010 2847
-f 3011 2846 2847
-f 2847 2846 2845
-f 3003 2986 3010
-f 2986 3011 3010
-f 3010 3011 2847
-f 2986 2971 3011
-f 2848 2849 2844
-f 2844 2843 2846
-f 3011 2875 2848
-f 2848 2844 3011
-f 3011 2844 2846
-f 2868 2875 2988
-f 2988 2875 3011
-f 2868 2876 2875
-f 2869 2868 2866
-f 2988 2866 2868
-f 2988 3011 2971
-f 2875 2874 2848
-f 2881 2987 3012
-f 2886 2881 3012
-f 2987 2989 3013
-f 3014 3013 3015
-f 2972 2950 2987
-f 3016 3012 3013
-f 3013 3012 2987
-f 3017 3018 2996
-f 2989 2987 2950
-f 3013 2989 3015
-f 3019 3020 3018
-f 3020 2989 3018
-f 3015 2989 3020
-f 3018 2989 2996
-f 3021 3015 3020
-f 2884 2890 2891
-f 2889 2871 2890
-f 2971 2972 2988
-f 2988 2987 2871
-f 2871 2987 2890
-f 2870 2872 2871
-f 2871 2872 2988
-f 2866 2988 2872
-f 2867 2866 2872
-f 2955 2957 2978
-f 2978 2957 2956
-f 2981 3022 2955
-f 2982 3022 2981
-f 2955 3022 2982
-f 2949 2982 2980
-f 2982 2949 2955
-f 2890 2987 2891
-f 2891 2987 2881
-f 2879 2891 2881
-f 3016 3013 2892
-f 2886 3012 2885
-f 2881 2886 2880
-f 3012 3016 2905
-f 2890 3013 2892
-f 2910 2892 3013
-f 2908 2907 3015
-f 2909 2908 3021
-f 2892 2905 3016
-f 2907 2910 3014
-f 2905 2885 3012
-f 2911 2892 3018
-f 3014 3015 2907
-f 3019 3018 2911
-f 3013 3014 2910
-f 3015 3021 2908
-f 3020 3019 2914
-f 3021 3020 2909
-f 2892 3013 3018
-f 3023 2930 3024
-f 2932 3024 2930
-f 3024 2932 3025
-f 3025 2932 2934
-f 2745 2746 3025
-f 3025 2934 2745
-f 3026 3023 3027
-f 3024 3027 3023
-f 3023 3026 3028
-f 3029 3028 3026
-f 3030 3025 2746
-f 3027 3024 3030
-f 3030 3024 3025
-f 2952 3031 2953
-f 3031 2952 2930
-f 2953 3032 3033
-f 2953 3033 3034
-f 3032 2953 3031
-f 3031 3028 3032
-f 2930 3023 3031
-f 3028 3029 3035
-f 3036 3035 3029
-f 3035 3037 3038
-f 3032 3035 3038
-f 3035 3032 3028
-f 3032 3038 3033
-f 3028 3031 3023
-f 3039 3026 3040
-f 3040 3027 3041
-f 3041 3027 3030
-f 3041 3030 2750
-f 2746 2750 3030
-f 3027 3040 3026
-f 3042 3039 3043
-f 3044 3041 2749
-f 2750 2749 3041
-f 3043 3040 3044
-f 3044 3040 3041
-f 3040 3043 3039
-f 3029 3045 3036
-f 3046 3036 3045
-f 3036 3047 3037
-f 3026 3039 3029
-f 3045 3029 3039
-f 3035 3036 3037
-f 3036 3046 3047
-f 3039 3042 3045
-f 3048 3045 3042
-f 3045 3048 3046
-f 3049 3046 3048
-f 3046 3050 3047
-f 3046 3049 3050
-f 2899 3051 2897
-f 2711 2710 3052
-f 2897 3052 2710
-f 3051 2899 2895
-f 3052 2897 3051
-f 3052 3053 2711
-f 3051 3054 3052
-f 2895 3055 3051
-f 3053 3052 3054
-f 2754 2711 3053
-f 3055 2895 2894
-f 3054 3051 3055
-f 3056 3044 2755
-f 2749 2755 3044
-f 3056 3043 3044
-f 3057 3058 3059
-f 3059 3056 2757
-f 3060 3057 3059
-f 2755 2757 3056
-f 3061 3062 3063
-f 3057 3063 3062
-f 3062 3061 3064
-f 3064 3065 3066
-f 3065 3064 3061
-f 3067 3066 3065
-f 3066 3067 3068
-f 3048 3069 3049
-f 3070 3049 3069
-f 3049 3070 3071
-f 3049 3071 3050
-f 3069 3048 3072
-f 3062 3072 3057
-f 3058 3057 3072
-f 3072 3042 3058
-f 3043 3058 3042
-f 3059 3058 3056
-f 3042 3072 3048
-f 3058 3043 3056
-f 3066 3070 3064
-f 3066 3068 3073
-f 3070 3066 3073
-f 3070 3073 3071
-f 3064 3069 3062
-f 3072 3062 3069
-f 3069 3064 3070
-f 3054 3055 3074
-f 3075 3053 3076
-f 3074 3055 2894
-f 3053 3054 3076
-f 2756 2754 3075
-f 2754 3053 3075
-f 3076 3054 3074
-f 3060 2756 3074
-f 3074 3077 3060
-f 3060 3059 2756
-f 3075 3076 3074
-f 3063 3057 3060
-f 2757 2756 3059
-f 2756 3075 3074
-f 3017 2996 2912
-f 2915 2994 2993
-f 2996 2995 2921
-f 3018 3017 2913
-f 2995 2994 2915
-f 3018 2990 2911
-f 2913 2911 3018
-f 2915 2921 2995
-f 2912 2913 3017
-f 2911 2914 3019
-f 2993 2920 2915
-f 2921 2912 2996
-f 2914 2909 3020
-f 2990 2917 2911
-f 3001 2997 3078
-f 2991 2992 2919
-f 2992 3001 3079
-f 2993 2990 2917
-f 2990 2991 2918
-f 2917 2990 2998
-f 2919 2918 2991
-f 3079 2919 2992
-f 3080 3078 2997
-f 2917 2920 2993
-f 3081 3080 3000
-f 2918 2917 2990
-f 3078 3079 3001
-f 3081 2917 2998
-f 3082 2978 2956
-f 2974 2973 3083
-f 2977 2978 3082
-f 2975 2977 3084
-f 2973 2975 3085
-f 2999 2974 3086
-f 3000 2998 3081
-f 2997 3000 3080
-f 2998 2978 3081
-f 2998 2999 3087
-f 3086 3087 2999
-f 3085 3083 2973
-f 3087 3081 2998
-f 3083 3086 2974
-f 3084 3085 2975
-f 3082 3084 2977
-f 2978 3082 3081
-f 3080 3081 3078
-f 3086 2916 3081
-f 3079 3078 2919
-f 3081 2916 3078
-f 3078 2916 2919
-f 2919 2916 2917
-f 2916 3088 2893
-f 2894 2893 3088
-f 3084 3082 3085
-f 3087 3086 3081
-f 3082 3088 3085
-f 3085 3088 3086
-f 3088 2916 3086
-f 3083 3085 3086
-f 2956 3089 3082
-f 3089 3090 3082
-f 3082 3090 3091
-f 2894 3088 3077
-f 3082 3092 3088
-f 3093 3089 2956
-f 2953 3034 3094
-f 3094 2954 2953
-f 3095 3093 3094
-f 2954 3093 2956
-f 2954 3094 3093
-f 3093 3067 3089
-f 3093 3095 3068
-f 3096 3091 3060
-f 3089 3065 3090
-f 3077 3074 2894
-f 3090 3061 3091
-f 3096 3060 3077
-f 3092 3097 3088
-f 3088 3097 3077
-f 3091 3092 3082
-f 3063 3091 3061
-f 3068 3067 3093
-f 3065 3089 3067
-f 3061 3090 3065
-f 3063 3060 3091
-f 3091 3098 3099
-f 3098 3096 3077
-f 3077 3097 3098
-f 3097 3092 3099
-f 3099 3092 3091
-f 3096 3098 3091
-f 3099 3098 3097
-f 3100 3101 3102
-f 3100 3103 3101
-f 3104 3103 3100
-f 3104 3105 3103
-f 3106 3105 3104
-f 3106 3107 3105
-f 3101 3103 3108
-f 3109 3110 3107
-f 3110 3111 3105
-f 3103 3105 3111
-f 3111 3108 3103
-f 3108 3112 3101
-f 3108 3111 3113
-f 3113 3114 3108
-f 3112 3108 3114
-f 3114 3115 3112
-f 3116 3117 3113
-f 3118 3113 3117
-f 3118 3114 3113
-f 3115 3118 3119
-f 3115 3114 3118
-f 3111 3110 3120
-f 3120 3113 3111
-f 3121 3122 3109
-f 3110 3109 3122
-f 3122 3120 3110
-f 3120 3123 3116
-f 3120 3122 3123
-f 3116 3113 3120
-f 3122 3121 3124
-f 3122 3124 3123
-f 3125 3126 3127
-f 3107 3125 3109
-f 3128 3125 3107
-f 3128 3107 3106
-f 3105 3107 3110
-f 3127 3129 3130
-f 3131 3129 3132
-f 3126 3132 3129
-f 3129 3127 3126
-f 3109 3127 3121
-f 3127 3109 3125
-f 3133 3130 3129
-f 3130 3121 3127
-f 3130 3134 3135
-f 3121 3135 3124
-f 3121 3130 3135
-f 3132 3136 3131
-f 3136 3137 3138
-f 3138 3131 3136
-f 3139 3132 3140
-f 3139 3136 3132
-f 3137 3136 3139
-f 3131 3138 3141
-f 3130 3133 3134
-f 3129 3131 3133
-f 3134 3133 3141
-f 3141 3133 3131
-f 3142 3143 3144
-f 3143 3142 3145
-f 3145 3146 3143
-f 3147 3148 3146
-f 3149 3150 3148
-f 3151 3152 3150
-f 3153 3126 3125
-f 3140 3126 3153
-f 3140 3132 3126
-f 3154 3155 3152
-f 3156 3157 3155
-f 3153 3125 3128
-f 3158 3159 3160
-f 3161 3159 3158
-f 3161 3162 3159
-f 3146 3145 3147
-f 3148 3147 3149
-f 3158 3160 3163
-f 3150 3149 3151
-f 3152 3151 3154
-f 3157 3156 3164
-f 3164 3165 3157
-f 3165 3164 3166
-f 3155 3154 3156
-f 3167 3160 3168
-f 3168 3169 3167
-f 3170 3167 3169
-f 3163 3167 3171
-f 3163 3160 3167
-f 3160 3159 3172
-f 3173 3174 3175
-f 3175 3176 3173
-f 3177 3173 3176
-f 3178 3176 3175
-f 3179 3176 3178
-f 3180 3181 3174
-f 3174 3173 3180
-f 3162 3180 3173
-f 3181 3180 3182
-f 3182 3162 3161
-f 3182 3180 3162
-f 3176 3179 3177
-f 3179 3178 3183
-f 3179 3184 3172
-f 3184 3183 3185
-f 3184 3179 3183
-f 3172 3168 3160
-f 3173 3177 3162
-f 3159 3162 3177
-f 3172 3177 3179
-f 3177 3172 3159
-f 3168 3172 3184
-f 3186 3185 3187
-f 3186 3184 3185
-f 3188 3187 3189
-f 3188 3186 3187
-f 3189 3190 3188
-f 3188 3190 3191
-f 3186 3188 3169
-f 3191 3169 3188
-f 3184 3186 3168
-f 3169 3168 3186
-f 3189 3192 3190
-f 3193 3190 3192
-f 3193 3194 3190
-f 3195 3193 3196
-f 3195 3194 3193
-f 3197 3191 3190
-f 3194 3195 3198
-f 3190 3194 3197
-f 3198 3197 3194
-f 3171 3167 3170
-f 3199 3200 3197
-f 3201 3199 3202
-f 3203 3170 3200
-f 3201 3200 3199
-f 3203 3200 3201
-f 3171 3170 3203
-f 3197 3198 3199
-f 3169 3191 3170
-f 3200 3170 3191
-f 3191 3197 3200
-f 3204 3205 3206
-f 3204 3207 3205
-f 3204 3102 3207
-f 3205 3207 3208
-f 3102 3208 3207
-f 3209 3102 3204
-f 3209 3100 3102
-f 3210 3211 3212
-f 3213 3214 3215
-f 3209 3214 3213
-f 3215 3216 3210
-f 3216 3215 3214
-f 3217 3212 3211
-f 3211 3210 3216
-f 3218 3106 3104
-f 3104 3213 3218
-f 3213 3104 3100
-f 3218 3215 3219
-f 3213 3215 3218
-f 3210 3219 3215
-f 3220 3143 3146
-f 3221 3222 3220
-f 3146 3221 3220
-f 3221 3146 3148
-f 3223 3224 3225
-f 3226 3225 3227
-f 3225 3228 3229
-f 3229 3227 3225
-f 3225 3226 3223
-f 3230 3231 3144
-f 3230 3232 3231
-f 3233 3229 3228
-f 3230 3144 3233
-f 3144 3234 3233
-f 3234 3144 3143
-f 3235 3236 3237
-f 3234 3229 3233
-f 3100 3209 3213
-f 3143 3220 3234
-f 3212 3238 3210
-f 3239 3240 3217
-f 3239 3235 3237
-f 3212 3217 3240
-f 3239 3241 3240
-f 3235 3239 3217
-f 3224 3223 3242
-f 3228 3225 3224
-f 3223 3243 3237
-f 3237 3242 3223
-f 3239 3237 3243
-f 3241 3239 3243
-f 3242 3237 3236
-f 3234 3244 3229
-f 3227 3229 3244
-f 3244 3245 3227
-f 3245 3244 3222
-f 3220 3244 3234
-f 3220 3222 3244
-f 3241 3243 3246
-f 3247 3227 3245
-f 3227 3247 3226
-f 3226 3246 3243
-f 3243 3223 3226
-f 3246 3226 3247
-f 3204 3206 3248
-f 3205 3208 3206
-f 3102 3101 3208
-f 3249 3204 3248
-f 3250 3216 3251
-f 3216 3214 3251
-f 3249 3252 3204
-f 3253 3224 3254
-f 3224 3253 3228
-f 3204 3255 3209
-f 3255 3204 3252
-f 3253 3233 3228
-f 3233 3253 3256
-f 3257 3233 3256
-f 3233 3257 3230
-f 3258 3251 3259
-f 3251 3260 3259
-f 3258 3261 3262
-f 3258 3259 3261
-f 3263 3261 3259
-f 3262 3252 3249
-f 3262 3261 3252
-f 3259 3260 3263
-f 3255 3252 3261
-f 3261 3263 3255
-f 3211 3264 3217
-f 3250 3265 3216
-f 3265 3264 3211
-f 3266 3236 3235
-f 3255 3214 3209
-f 3267 3235 3217
-f 3214 3255 3251
-f 3216 3265 3211
-f 3268 3256 3253
-f 3253 3269 3268
-f 3270 3268 3269
-f 3269 3271 3270
-f 3271 3269 3253
-f 3257 3256 3268
-f 3268 3270 3257
-f 3272 3236 3266
-f 3236 3272 3242
-f 3266 3273 3274
-f 3254 3242 3272
-f 3242 3254 3224
-f 3230 3275 3276
-f 3276 3232 3230
-f 3231 3277 3142
-f 3230 3278 3275
-f 3142 3144 3231
-f 3232 3276 3277
-f 3277 3231 3232
-f 3270 3279 3278
-f 3280 3281 3254
-f 3271 3282 3279
-f 3281 3282 3253
-f 3271 3253 3282
-f 3279 3270 3271
-f 3278 3257 3270
-f 3278 3230 3257
-f 3253 3254 3281
-f 3254 3272 3280
-f 3272 3266 3283
-f 3284 3285 3248
-f 3206 3208 3286
-f 3286 3284 3206
-f 3208 3101 3112
-f 3112 3286 3208
-f 3248 3206 3284
-f 3249 3248 3285
-f 3285 3287 3249
-f 3258 3262 3288
-f 3288 3289 3258
-f 3262 3249 3287
-f 3287 3288 3262
-f 3251 3258 3289
-f 3290 3265 3289
-f 3250 3289 3265
-f 3251 3289 3250
-f 3285 3284 3291
-f 3291 3292 3285
-f 3284 3286 3293
-f 3293 3291 3284
-f 3286 3112 3115
-f 3115 3293 3286
-f 3294 3295 3296
-f 3297 3298 3299
-f 3299 3300 3294
-f 3300 3299 3298
-f 3301 3298 3297
-f 3119 3301 3297
-f 3301 3119 3118
-f 3293 3115 3119
-f 3291 3293 3302
-f 3292 3291 3303
-f 3293 3119 3302
-f 3291 3302 3303
-f 3292 3303 3304
-f 3304 3302 3119
-f 3304 3303 3302
-f 3304 3119 3297
-f 3118 3305 3301
-f 3305 3118 3117
-f 3117 3306 3305
-f 3306 3117 3116
-f 3307 3308 3309
-f 3310 3307 3309
-f 3295 3294 3300
-f 3309 3296 3295
-f 3296 3309 3308
-f 3295 3311 3309
-f 3312 3310 3311
-f 3311 3295 3313
-f 3310 3309 3311
-f 3300 3313 3295
-f 3313 3300 3314
-f 3315 3316 3317
-f 3317 3318 3315
-f 3318 3317 3319
-f 3306 3317 3305
-f 3306 3319 3317
-f 3320 3319 3306
-f 3116 3320 3306
-f 3320 3116 3123
-f 3316 3315 3314
-f 3301 3316 3298
-f 3305 3316 3301
-f 3305 3317 3316
-f 3298 3314 3300
-f 3314 3298 3316
-f 3321 3312 3322
-f 3313 3322 3311
-f 3322 3313 3323
-f 3312 3311 3322
-f 3323 3314 3315
-f 3314 3323 3313
-f 3321 3322 3324
-f 3323 3324 3322
-f 3325 3321 3324
-f 3326 3315 3318
-f 3315 3326 3323
-f 3324 3323 3326
-f 3327 3325 3328
-f 3329 3318 3330
-f 3325 3324 3328
-f 3328 3326 3329
-f 3326 3328 3324
-f 3318 3329 3326
-f 3331 3332 3333
-f 3331 3333 3334
-f 3334 3289 3331
-f 3334 3290 3289
-f 3335 3332 3336
-f 3332 3335 3333
-f 3289 3288 3337
-f 3337 3338 3289
-f 3288 3287 3339
-f 3339 3337 3288
-f 3287 3285 3292
-f 3292 3339 3287
-f 3289 3338 3340
-f 3341 3294 3340
-f 3339 3304 3342
-f 3342 3297 3343
-f 3297 3341 3343
-f 3296 3340 3294
-f 3341 3297 3299
-f 3339 3292 3304
-f 3294 3341 3299
-f 3297 3342 3304
-f 3338 3337 3344
-f 3341 3338 3345
-f 3344 3339 3342
-f 3344 3337 3339
-f 3338 3344 3345
-f 3338 3341 3340
-f 3341 3346 3343
-f 3342 3343 3346
-f 3347 3346 3341
-f 3344 3346 3347
-f 3346 3344 3342
-f 3347 3345 3344
-f 3341 3345 3347
-f 3307 3336 3332
-f 3308 3331 3296
-f 3331 3308 3332
-f 3340 3296 3331
-f 3340 3331 3289
-f 3332 3308 3307
-f 3235 3267 3266
-f 3251 3255 3263
-f 3263 3260 3251
-f 3265 3348 3264
-f 3348 3267 3264
-f 3217 3264 3267
-f 3247 3349 3246
-f 3350 3241 3246
-f 3350 3246 3349
-f 3351 3350 3349
-f 3352 3351 3353
-f 3351 3352 3354
-f 3351 3354 3355
-f 3350 3351 3355
-f 3356 3219 3357
-f 3218 3219 3356
-f 3219 3210 3238
-f 3238 3357 3219
-f 3356 3128 3106
-f 3106 3218 3356
-f 3357 3238 3358
-f 3359 3357 3360
-f 3355 3361 3362
-f 3356 3357 3359
-f 3362 3363 3358
-f 3361 3355 3354
-f 3363 3362 3361
-f 3360 3358 3363
-f 3358 3360 3357
-f 3240 3364 3212
-f 3364 3240 3365
-f 3364 3358 3238
-f 3358 3364 3362
-f 3365 3362 3364
-f 3238 3212 3364
-f 3350 3355 3365
-f 3241 3350 3365
-f 3362 3365 3355
-f 3241 3365 3240
-f 3354 3366 3361
-f 3363 3367 3360
-f 3368 3361 3366
-f 3361 3368 3363
-f 3369 3367 3370
-f 3366 3371 3368
-f 3368 3372 3367
-f 3369 3360 3367
-f 3367 3363 3368
-f 3359 3360 3369
-f 3221 3373 3222
-f 3374 3373 3221
-f 3374 3375 3373
-f 3376 3375 3374
-f 3128 3356 3359
-f 3148 3374 3221
-f 3374 3148 3150
-f 3150 3376 3374
-f 3369 3140 3153
-f 3153 3359 3369
-f 3359 3153 3128
-f 3376 3377 3375
-f 3376 3150 3152
-f 3152 3378 3376
-f 3378 3152 3155
-f 3245 3379 3247
-f 3222 3380 3245
-f 3380 3222 3373
-f 3349 3247 3379
-f 3379 3245 3380
-f 3373 3381 3380
-f 3381 3373 3375
-f 3353 3379 3382
-f 3382 3380 3381
-f 3380 3382 3379
-f 3351 3349 3353
-f 3379 3353 3349
-f 3352 3353 3383
-f 3382 3383 3353
-f 3383 3382 3384
-f 3352 3385 3386
-f 3385 3387 3388
-f 3352 3386 3354
-f 3366 3354 3386
-f 3386 3389 3366
-f 3389 3386 3388
-f 3385 3388 3386
-f 3378 3390 3377
-f 3384 3381 3391
-f 3392 3377 3390
-f 3377 3392 3391
-f 3378 3377 3376
-f 3381 3384 3382
-f 3375 3391 3381
-f 3391 3375 3377
-f 3393 3391 3392
-f 3391 3393 3384
-f 3385 3352 3383
-f 3385 3383 3394
-f 3387 3385 3394
-f 3393 3395 3394
-f 3394 3384 3393
-f 3384 3394 3383
-f 3370 3372 3396
-f 3370 3367 3372
-f 3139 3370 3396
-f 3370 3139 3140
-f 3140 3369 3370
-f 3397 3398 3399
-f 3400 3399 3398
-f 3399 3400 3401
-f 3402 3403 3397
-f 3398 3397 3403
-f 3404 3405 3402
-f 3403 3402 3405
-f 3389 3403 3371
-f 3371 3366 3389
-f 3396 3405 3404
-f 3405 3371 3403
-f 3371 3405 3372
-f 3372 3368 3371
-f 3396 3372 3405
-f 3403 3389 3398
-f 3388 3398 3389
-f 3398 3388 3400
-f 3406 3401 3400
-f 3387 3406 3400
-f 3387 3400 3388
-f 3407 3124 3135
-f 3135 3408 3407
-f 3408 3135 3134
-f 3319 3330 3318
-f 3320 3409 3319
-f 3410 3409 3320
-f 3123 3410 3320
-f 3410 3123 3124
-f 3330 3319 3409
-f 3407 3411 3410
-f 3124 3407 3410
-f 3410 3411 3409
-f 3409 3412 3330
-f 3412 3409 3411
-f 3330 3413 3329
-f 3414 3329 3413
-f 3329 3414 3328
-f 3413 3330 3412
-f 3327 3328 3414
-f 3415 3327 3414
-f 3416 3417 3418
-f 3418 3413 3416
-f 3413 3418 3414
-f 3416 3412 3419
-f 3412 3416 3413
-f 3420 3415 3418
-f 3415 3414 3418
-f 3420 3418 3417
-f 3134 3421 3408
-f 3411 3419 3412
-f 3419 3411 3422
-f 3407 3422 3411
-f 3408 3422 3407
-f 3408 3423 3422
-f 3424 3422 3423
-f 3417 3416 3425
-f 3425 3419 3424
-f 3419 3425 3416
-f 3426 3420 3417
-f 3422 3424 3419
-f 3421 3423 3408
-f 3427 3428 3137
-f 3427 3429 3428
-f 3428 3429 3430
-f 3430 3431 3428
-f 3431 3138 3137
-f 3429 3427 3432
-f 3432 3430 3429
-f 3137 3428 3431
-f 3430 3432 3433
-f 3433 3434 3430
-f 3138 3431 3435
-f 3431 3430 3434
-f 3434 3435 3431
-f 3433 3141 3435
-f 3435 3141 3138
-f 3433 3435 3434
-f 3421 3134 3141
-f 3433 3436 3421
-f 3421 3141 3433
-f 3437 3432 3427
-f 3438 3433 3432
-f 3427 3137 3404
-f 3404 3439 3427
-f 3440 3406 3395
-f 3397 3441 3402
-f 3401 3290 3399
-f 3348 3401 3406
-f 3399 3442 3397
-f 3441 3404 3402
-f 3439 3404 3443
-f 3406 3440 3348
-f 3441 3397 3442
-f 3442 3399 3290
-f 3290 3401 3348
-f 3404 3441 3443
-f 3439 3443 3444
-f 3444 3445 3439
-f 3446 3447 3445
-f 3441 3447 3446
-f 3445 3444 3446
-f 3441 3444 3443
-f 3446 3444 3441
-f 3423 3436 3448
-f 3432 3437 3438
-f 3436 3423 3421
-f 3427 3439 3437
-f 3436 3433 3438
-f 3334 3333 3425
-f 3425 3333 3417
-f 3335 3426 3417
-f 3417 3333 3335
-f 3424 3423 3448
-f 3424 3334 3425
-f 3449 3424 3448
-f 3449 3334 3424
-f 3449 3442 3290
-f 3441 3442 3449
-f 3439 3445 3450
-f 3450 3437 3439
-f 3449 3290 3334
-f 3441 3448 3451
-f 3441 3449 3448
-f 3451 3447 3441
-f 3445 3447 3451
-f 3451 3450 3445
-f 3452 3453 3448
-f 3454 3452 3436
-f 3448 3436 3452
-f 3448 3453 3455
-f 3452 3454 3455
-f 3455 3453 3452
-f 3455 3454 3450
-f 3437 3450 3454
-f 3448 3455 3451
-f 3450 3451 3455
-f 3454 3438 3437
-f 3436 3438 3454
-f 3456 3457 3458
-f 3456 3165 3457
-f 3396 3137 3139
-f 3157 3459 3460
-f 3459 3157 3165
-f 3155 3460 3378
-f 3460 3155 3157
-f 3460 3390 3378
-f 3460 3461 3390
-f 3390 3462 3392
-f 3462 3390 3461
-f 3406 3387 3395
-f 3395 3393 3463
-f 3463 3392 3462
-f 3392 3463 3393
-f 3387 3394 3395
-f 3267 3348 3440
-f 3273 3464 3465
-f 3464 3466 3467
-f 3266 3267 3273
-f 3265 3290 3348
-f 3440 3273 3267
-f 3137 3396 3404
-f 3456 3468 3459
-f 3459 3461 3460
-f 3459 3165 3456
-f 3462 3464 3463
-f 3462 3461 3469
-f 3463 3273 3395
-f 3468 3456 3470
-f 3468 3461 3459
-f 3466 3462 3469
-f 3461 3468 3469
-f 3466 3464 3462
-f 3464 3273 3463
-f 3395 3273 3440
-f 3469 3471 3472
-f 3469 3468 3471
-f 3469 3472 3473
-f 3468 3470 3474
-f 3473 3472 3471
-f 3474 3471 3468
-f 3471 3474 3473
-f 3475 3181 3182
-f 3145 3476 3477
-f 3476 3145 3142
-f 3275 3277 3276
-f 3275 3142 3277
-f 3477 3478 3479
-f 3477 3480 3478
-f 3147 3477 3479
-f 3477 3147 3145
-f 3481 3482 3483
-f 3478 3484 3485
-f 3484 3478 3480
-f 3483 3486 3487
-f 3487 3485 3484
-f 3485 3487 3486
-f 3482 3488 3483
-f 3465 3489 3274
-f 3490 3491 3492
-f 3283 3280 3272
-f 3489 3492 3493
-f 3274 3283 3266
-f 3493 3274 3489
-f 3476 3480 3477
-f 3275 3494 3476
-f 3476 3142 3275
-f 3181 3475 3495
-f 3487 3274 3483
-f 3494 3275 3278
-f 3484 3480 3281
-f 3484 3283 3487
-f 3494 3480 3476
-f 3483 3274 3493
-f 3283 3274 3487
-f 3280 3484 3281
-f 3280 3283 3484
-f 3480 3494 3281
-f 3494 3278 3279
-f 3281 3496 3282
-f 3279 3497 3494
-f 3281 3494 3497
-f 3497 3279 3282
-f 3282 3496 3497
-f 3281 3497 3496
-f 3498 3499 3500
-f 3501 3502 3503
-f 3503 3498 3501
-f 3502 3500 3181
-f 3502 3501 3500
-f 3181 3500 3499
-f 3499 3174 3181
-f 3500 3501 3498
-f 3498 3503 3504
-f 3504 3505 3498
-f 3174 3499 3506
-f 3499 3498 3505
-f 3505 3506 3499
-f 3506 3175 3174
-f 3504 3506 3505
-f 3504 3175 3506
-f 3507 3178 3175
-f 3178 3507 3508
-f 3508 3509 3510
-f 3511 3512 3513
-f 3512 3511 3509
-f 3508 3514 3509
-f 3510 3509 3511
-f 3507 3514 3508
-f 3515 3509 3514
-f 3516 3517 3518
-f 3518 3512 3515
-f 3512 3518 3517
-f 3519 3520 3516
-f 3509 3515 3512
-f 3510 3185 3183
-f 3183 3508 3510
-f 3508 3183 3178
-f 3185 3510 3521
-f 3522 3513 3523
-f 3513 3522 3511
-f 3521 3511 3522
-f 3510 3511 3521
-f 3521 3187 3185
-f 3187 3521 3524
-f 3524 3522 3525
-f 3521 3522 3524
-f 3525 3523 3526
-f 3523 3525 3522
-f 3527 3528 3529
-f 3530 3529 3528
-f 3520 3530 3528
-f 3520 3528 3516
-f 3517 3516 3528
-f 3517 3513 3512
-f 3513 3517 3527
-f 3528 3527 3517
-f 3527 3523 3513
-f 3523 3527 3531
-f 3529 3531 3527
-f 3531 3529 3532
-f 3533 3532 3529
-f 3530 3533 3529
-f 3182 3534 3475
-f 3534 3182 3161
-f 3161 3535 3534
-f 3534 3536 3475
-f 3534 3537 3536
-f 3495 3538 3539
-f 3540 3539 3538
-f 3541 3542 3543
-f 3542 3541 3544
-f 3543 3545 3540
-f 3545 3543 3542
-f 3539 3540 3545
-f 3536 3546 3547
-f 3547 3548 3549
-f 3475 3538 3495
-f 3475 3536 3538
-f 3538 3547 3540
-f 3547 3538 3536
-f 3549 3540 3547
-f 3482 3481 3541
-f 3482 3541 3550
-f 3550 3543 3549
-f 3543 3550 3541
-f 3540 3549 3543
-f 3481 3544 3541
-f 3507 3175 3504
-f 3504 3551 3507
-f 3552 3504 3503
-f 3553 3503 3502
-f 3502 3181 3495
-f 3495 3554 3502
-f 3555 3556 3518
-f 3518 3556 3516
-f 3557 3519 3516
-f 3516 3556 3557
-f 3515 3514 3558
-f 3515 3555 3518
-f 3559 3515 3558
-f 3559 3555 3515
-f 3558 3560 3561
-f 3553 3562 3563
-f 3563 3552 3553
-f 3551 3552 3563
-f 3562 3561 3560
-f 3560 3563 3562
-f 3564 3565 3559
-f 3559 3565 3491
-f 3566 3563 3560
-f 3560 3567 3566
-f 3566 3567 3558
-f 3563 3566 3551
-f 3558 3551 3566
-f 3558 3567 3560
-f 3554 3568 3562
-f 3559 3491 3555
-f 3562 3553 3554
-f 3561 3569 3564
-f 3558 3561 3564
-f 3568 3569 3561
-f 3561 3562 3568
-f 3564 3559 3558
-f 3551 3504 3552
-f 3503 3553 3552
-f 3502 3554 3553
-f 3551 3514 3507
-f 3514 3551 3558
-f 3564 3570 3571
-f 3572 3569 3568
-f 3554 3571 3570
-f 3572 3570 3564
-f 3568 3570 3572
-f 3570 3568 3554
-f 3564 3569 3572
-f 3565 3542 3491
-f 3554 3495 3571
-f 3495 3564 3571
-f 3481 3493 3492
-f 3564 3545 3565
-f 3491 3544 3492
-f 3542 3565 3545
-f 3493 3481 3483
-f 3544 3491 3542
-f 3492 3544 3481
-f 3564 3495 3539
-f 3545 3564 3539
-f 3573 3574 3575
-f 3575 3576 3573
-f 3577 3489 3465
-f 3490 3492 3578
-f 3492 3489 3578
-f 3579 3578 3489
-f 3580 3581 3582
-f 3580 3583 3581
-f 3584 3583 3580
-f 3163 3585 3586
-f 3154 3580 3582
-f 3580 3154 3151
-f 3151 3584 3580
-f 3582 3581 3587
-f 3584 3588 3583
-f 3584 3151 3149
-f 3149 3479 3584
-f 3479 3149 3147
-f 3535 3161 3158
-f 3158 3586 3535
-f 3586 3158 3163
-f 3548 3589 3590
-f 3590 3549 3548
-f 3549 3590 3550
-f 3591 3482 3550
-f 3591 3550 3590
-f 3592 3591 3590
-f 3592 3590 3589
-f 3479 3478 3588
-f 3479 3588 3584
-f 3583 3593 3594
-f 3593 3583 3588
-f 3588 3485 3593
-f 3485 3588 3478
-f 3595 3594 3593
-f 3594 3595 3596
-f 3486 3483 3488
-f 3488 3595 3486
-f 3595 3488 3597
-f 3591 3592 3597
-f 3591 3597 3488
-f 3482 3591 3488
-f 3486 3593 3485
-f 3593 3486 3595
-f 3598 3599 3600
-f 3601 3600 3599
-f 3599 3598 3602
-f 3587 3602 3598
-f 3602 3587 3581
-f 3581 3594 3602
-f 3594 3581 3583
-f 3603 3599 3596
-f 3596 3602 3594
-f 3602 3596 3599
-f 3597 3596 3595
-f 3596 3597 3603
-f 3599 3603 3601
-f 3604 3601 3603
-f 3592 3603 3597
-f 3586 3605 3535
-f 3546 3536 3537
-f 3537 3606 3546
-f 3548 3547 3546
-f 3535 3537 3534
-f 3535 3605 3537
-f 3607 3546 3606
-f 3546 3607 3548
-f 3589 3548 3607
-f 3606 3537 3605
-f 3592 3604 3603
-f 3604 3589 3608
-f 3609 3604 3608
-f 3600 3601 3610
-f 3609 3611 3610
-f 3604 3592 3589
-f 3609 3610 3601
-f 3604 3609 3601
-f 3585 3163 3171
-f 3171 3612 3585
-f 3585 3613 3614
-f 3612 3613 3585
-f 3614 3615 3616
-f 3615 3614 3613
-f 3613 3617 3615
-f 3608 3607 3618
-f 3586 3614 3605
-f 3585 3614 3586
-f 3607 3608 3589
-f 3618 3606 3616
-f 3606 3618 3607
-f 3605 3616 3606
-f 3616 3605 3614
-f 3611 3609 3619
-f 3611 3619 3620
-f 3618 3619 3608
-f 3609 3608 3619
-f 3620 3621 3622
-f 3621 3620 3619
-f 3619 3618 3621
-f 3615 3622 3621
-f 3621 3616 3615
-f 3616 3621 3618
-f 3532 3623 3531
-f 3623 3532 3624
-f 3625 3624 3532
-f 3533 3625 3532
-f 3531 3526 3523
-f 3526 3531 3623
-f 3626 3627 3624
-f 3625 3626 3624
-f 3623 3628 3526
-f 3628 3623 3629
-f 3624 3629 3623
-f 3629 3624 3627
-f 3526 3630 3525
-f 3524 3189 3187
-f 3189 3524 3631
-f 3631 3630 3632
-f 3631 3525 3630
-f 3524 3525 3631
-f 3628 3633 3630
-f 3630 3526 3628
-f 3629 3634 3628
-f 3627 3635 3629
-f 3634 3629 3635
-f 3626 3636 3627
-f 3635 3627 3637
-f 3636 3637 3627
-f 3634 3638 3633
-f 3633 3628 3634
-f 3638 3634 3639
-f 3640 3633 3638
-f 3632 3633 3640
-f 3632 3630 3633
-f 3641 3642 3643
-f 3642 3198 3195
-f 3644 3645 3646
-f 3643 3644 3641
-f 3195 3643 3642
-f 3646 3641 3644
-f 3192 3631 3632
-f 3631 3192 3189
-f 3193 3632 3640
-f 3632 3193 3192
-f 3639 3635 3647
-f 3637 3647 3635
-f 3647 3637 3648
-f 3636 3649 3637
-f 3635 3639 3634
-f 3649 3648 3637
-f 3648 3650 3647
-f 3650 3648 3651
-f 3652 3651 3648
-f 3649 3652 3648
-f 3647 3653 3639
-f 3654 3638 3655
-f 3640 3638 3654
-f 3196 3640 3654
-f 3640 3196 3193
-f 3655 3639 3653
-f 3639 3655 3638
-f 3653 3647 3650
-f 3643 3195 3196
-f 3645 3644 3656
-f 3644 3643 3657
-f 3644 3657 3656
-f 3658 3657 3196
-f 3658 3196 3654
-f 3645 3656 3658
-f 3658 3656 3657
-f 3643 3196 3657
-f 3659 3557 3556
-f 3660 3555 3491
-f 3660 3661 3555
-f 3661 3556 3555
-f 3661 3659 3556
-f 3557 3659 3662
-f 3660 3663 3664
-f 3665 3664 3663
-f 3663 3666 3665
-f 3664 3667 3660
-f 3666 3646 3645
-f 3668 3660 3667
-f 3645 3665 3666
-f 3650 3668 3653
-f 3669 3654 3655
-f 3653 3669 3655
-f 3665 3645 3658
-f 3654 3670 3658
-f 3661 3651 3659
-f 3659 3651 3652
-f 3652 3662 3659
-f 3668 3650 3661
-f 3660 3668 3661
-f 3651 3661 3650
-f 3665 3658 3670
-f 3669 3653 3668
-f 3670 3654 3671
-f 3654 3669 3671
-f 3672 3673 3674
-f 3670 3671 3673
-f 3674 3675 3672
-f 3669 3673 3671
-f 3669 3675 3674
-f 3674 3673 3669
-f 3673 3672 3670
-f 3669 3667 3675
-f 3667 3672 3675
-f 3667 3664 3672
-f 3672 3664 3665
-f 3667 3669 3668
-f 3672 3665 3670
-f 3491 3490 3660
-f 3676 3660 3490
-f 3575 3660 3676
-f 3575 3677 3660
-f 3678 3679 3642
-f 3642 3641 3678
-f 3679 3199 3198
-f 3198 3642 3679
-f 3680 3678 3641
-f 3681 3680 3646
-f 3641 3646 3680
-f 3677 3682 3663
-f 3663 3660 3677
-f 3646 3666 3681
-f 3682 3681 3666
-f 3666 3663 3682
-f 3683 3684 3685
-f 3684 3683 3467
-f 3465 3274 3273
-f 3686 3467 3683
-f 3467 3686 3465
-f 3687 3456 3458
-f 3458 3688 3687
-f 3688 3458 3457
-f 3457 3689 3688
-f 3165 3166 3689
-f 3687 3470 3456
-f 3689 3457 3165
-f 3466 3469 3684
-f 3469 3473 3690
-f 3691 3473 3474
-f 3692 3474 3470
-f 3691 3690 3473
-f 3470 3687 3693
-f 3474 3692 3691
-f 3684 3467 3466
-f 3470 3693 3692
-f 3690 3684 3469
-f 3467 3465 3464
-f 3156 3582 3694
-f 3582 3156 3154
-f 3582 3587 3694
-f 3612 3695 3613
-f 3696 3695 3612
-f 3694 3164 3156
-f 3612 3171 3203
-f 3203 3696 3612
-f 3696 3203 3201
-f 3617 3613 3695
-f 3697 3577 3698
-f 3697 3620 3579
-f 3577 3697 3579
-f 3622 3615 3617
-f 3622 3579 3620
-f 3697 3611 3620
-f 3697 3698 3699
-f 3611 3697 3699
-f 3685 3700 3683
-f 3700 3699 3698
-f 3698 3683 3700
-f 3683 3698 3686
-f 3701 3702 3685
-f 3694 3703 3704
-f 3694 3587 3703
-f 3705 3706 3703
-f 3703 3598 3705
-f 3598 3703 3587
-f 3704 3703 3706
-f 3699 3700 3707
-f 3600 3705 3598
-f 3705 3600 3707
-f 3611 3699 3610
-f 3610 3707 3600
-f 3707 3610 3699
-f 3706 3705 3702
-f 3702 3701 3706
-f 3700 3685 3702
-f 3707 3702 3705
-f 3702 3707 3700
-f 3164 3694 3704
-f 3201 3708 3696
-f 3704 3706 3709
-f 3577 3686 3698
-f 3166 3704 3709
-f 3704 3166 3164
-f 3687 3689 3166
-f 3687 3166 3709
-f 3687 3688 3689
-f 3709 3706 3701
-f 3710 3695 3711
-f 3696 3711 3695
-f 3708 3711 3696
-f 3579 3622 3712
-f 3712 3617 3710
-f 3617 3712 3622
-f 3695 3710 3617
-f 3202 3679 3713
-f 3714 3713 3679
-f 3715 3713 3714
-f 3715 3202 3713
-f 3715 3714 3678
-f 3708 3202 3715
-f 3708 3201 3202
-f 3681 3715 3680
-f 3715 3678 3680
-f 3714 3679 3678
-f 3202 3199 3679
-f 3715 3576 3708
-f 3576 3715 3716
-f 3693 3709 3717
-f 3690 3685 3684
-f 3685 3690 3701
-f 3690 3709 3701
-f 3709 3690 3717
-f 3709 3693 3687
-f 3710 3711 3575
-f 3676 3710 3575
-f 3681 3716 3715
-f 3677 3718 3719
-f 3682 3716 3681
-f 3677 3575 3718
-f 3575 3574 3718
-f 3677 3719 3682
-f 3573 3719 3718
-f 3682 3719 3716
-f 3489 3577 3579
-f 3710 3490 3712
-f 3465 3686 3577
-f 3490 3578 3712
-f 3576 3711 3708
-f 3711 3576 3575
-f 3712 3578 3579
-f 3676 3490 3710
-f 3720 3692 3693
-f 3721 3691 3692
-f 3691 3721 3690
-f 3693 3717 3720
-f 3720 3717 3690
-f 3690 3721 3720
-f 3692 3720 3721
-f 3719 3573 3576
-f 3718 3574 3573
-f 3576 3716 3719
-f 3722 3723 3724
-f 3724 3725 3722
-f 3725 3724 3726
-f 3726 3727 3725
-f 3727 3726 3728
-f 3728 3729 3727
-f 3729 3728 3730
-f 3730 3731 3729
-f 3723 3732 3724
-f 3732 3723 3733
-f 3724 3734 3726
-f 3734 3724 3732
-f 3726 3735 3728
-f 3735 3726 3734
-f 3728 3736 3730
-f 3736 3728 3735
-f 3737 3738 3739
-f 3738 3737 3740
-f 3739 3741 3742
-f 3741 3739 3738
-f 3734 3739 3735
-f 3739 3734 3737
-f 3735 3742 3736
-f 3742 3735 3739
-f 3733 3743 3732
-f 3743 3733 3744
-f 3732 3737 3734
-f 3737 3732 3743
-f 3744 3745 3743
-f 3745 3744 3746
-f 3743 3740 3737
-f 3740 3743 3745
-f 3747 3748 3749
-f 3749 3750 3747
-f 3750 3749 3751
-f 3751 3752 3750
-f 3752 3751 3753
-f 3753 3754 3752
-f 3754 3753 3723
-f 3723 3722 3754
-f 3748 3755 3749
-f 3755 3748 3756
-f 3749 3757 3751
-f 3757 3749 3755
-f 3751 3758 3753
-f 3758 3751 3757
-f 3753 3733 3723
-f 3733 3753 3758
-f 3757 3759 3758
-f 3759 3757 3760
-f 3758 3744 3733
-f 3744 3758 3759
-f 3760 3761 3759
-f 3761 3760 3762
-f 3759 3746 3744
-f 3746 3759 3761
-f 3763 3764 3765
-f 3764 3763 3766
-f 3765 3762 3760
-f 3762 3765 3764
-f 3756 3765 3755
-f 3765 3756 3763
-f 3755 3760 3757
-f 3760 3755 3765
-f 3767 3768 3769
-f 3768 3767 3770
-f 3769 3771 3772
-f 3771 3769 3768
-f 3740 3769 3738
-f 3769 3740 3767
-f 3738 3772 3741
-f 3772 3738 3769
-f 3746 3773 3745
-f 3773 3746 3774
-f 3745 3767 3740
-f 3767 3745 3773
-f 3774 3775 3773
-f 3775 3774 3776
-f 3773 3770 3767
-f 3770 3773 3775
-f 3777 3770 3778
-f 3777 3768 3770
-f 3779 3768 3777
-f 3779 3771 3768
-f 3780 3777 3778
-f 3777 3780 3781
-f 3781 3779 3777
-f 3779 3781 3782
-f 3783 3784 3785
-f 3784 3783 3786
-f 3786 3778 3784
-f 3778 3786 3780
-f 3784 3776 3785
-f 3784 3775 3776
-f 3770 3784 3778
-f 3770 3775 3784
-f 3787 3788 3789
-f 3788 3787 3790
-f 3789 3776 3774
-f 3776 3789 3788
-f 3762 3789 3761
-f 3789 3762 3787
-f 3761 3774 3746
-f 3774 3761 3789
-f 3766 3791 3764
-f 3791 3766 3792
-f 3764 3787 3762
-f 3787 3764 3791
-f 3792 3793 3791
-f 3793 3792 3794
-f 3791 3790 3787
-f 3790 3791 3793
-f 3795 3796 3797
-f 3796 3795 3798
-f 3798 3785 3796
-f 3785 3798 3783
-f 3788 3797 3796
-f 3788 3790 3797
-f 3785 3788 3796
-f 3785 3776 3788
-f 3794 3799 3793
-f 3794 3800 3799
-f 3793 3797 3790
-f 3793 3799 3797
-f 3801 3799 3800
-f 3799 3801 3802
-f 3802 3797 3799
-f 3797 3802 3795
-f 3803 3804 3805
-f 3804 3803 3806
-f 3807 3805 3808
-f 3805 3807 3803
-f 3806 3730 3804
-f 3730 3806 3731
-f 3809 3810 3811
-f 3812 3813 3814
-f 3812 3815 3813
-f 3811 3816 3813
-f 3727 3812 3814
-f 3812 3727 3729
-f 3807 3806 3803
-f 3807 3731 3806
-f 3817 3813 3815
-f 3818 3815 3812
-f 3818 3731 3807
-f 3729 3818 3812
-f 3818 3729 3731
-f 3819 3820 3821
-f 3813 3817 3811
-f 3822 3819 3821
-f 3811 3823 3809
-f 3809 3821 3820
-f 3821 3809 3823
-f 3823 3811 3817
-f 3824 3810 3825
-f 3810 3824 3816
-f 3826 3816 3824
-f 3814 3816 3826
-f 3814 3813 3816
-f 3725 3814 3826
-f 3814 3725 3727
-f 3826 3824 3827
-f 3828 3825 3829
-f 3825 3828 3824
-f 3722 3826 3827
-f 3826 3722 3725
-f 3830 3829 3825
-f 3827 3824 3828
-f 3831 3832 3833
-f 3825 3834 3830
-f 3829 3830 3835
-f 3836 3837 3832
-f 3831 3836 3832
-f 3830 3833 3832
-f 3832 3835 3830
-f 3835 3832 3837
-f 3838 3831 3833
-f 3838 3833 3820
-f 3819 3838 3820
-f 3820 3834 3809
-f 3834 3820 3833
-f 3834 3825 3810
-f 3816 3811 3810
-f 3810 3809 3834
-f 3833 3830 3834
-f 3839 3840 3841
-f 3842 3840 3839
-f 3840 3842 3843
-f 3844 3815 3818
-f 3845 3822 3821
-f 3823 3846 3821
-f 3817 3815 3847
-f 3807 3844 3818
-f 3848 3846 3823
-f 3815 3844 3847
-f 3821 3846 3845
-f 3849 3817 3847
-f 3844 3807 3850
-f 3849 3848 3817
-f 3817 3848 3823
-f 3807 3808 3851
-f 3851 3850 3807
-f 3852 3843 3847
-f 3853 3852 3854
-f 3851 3854 3850
-f 3854 3851 3853
-f 3852 3853 3843
-f 3847 3843 3849
-f 3847 3855 3852
-f 3852 3855 3856
-f 3844 3850 3854
-f 3854 3856 3844
-f 3842 3845 3846
-f 3856 3855 3847
-f 3847 3844 3856
-f 3856 3854 3852
-f 3846 3843 3842
-f 3849 3843 3848
-f 3848 3843 3846
-f 3730 3857 3804
-f 3857 3730 3736
-f 3804 3858 3805
-f 3858 3804 3857
-f 3805 3859 3808
-f 3859 3805 3858
-f 3736 3860 3857
-f 3857 3861 3858
-f 3858 3862 3859
-f 3861 3857 3860
-f 3863 3859 3862
-f 3860 3736 3742
-f 3862 3858 3861
-f 3859 3863 3864
-f 3808 3864 3851
-f 3864 3808 3859
-f 3865 3853 3866
-f 3865 3866 3867
-f 3843 3853 3865
-f 3843 3865 3868
-f 3865 3867 3869
-f 3867 3870 3871
-f 3851 3866 3853
-f 3866 3851 3864
-f 3866 3870 3867
-f 3870 3872 3873
-f 3872 3874 3875
-f 3874 3876 3877
-f 3872 3866 3874
-f 3870 3866 3872
-f 3874 3866 3876
-f 3864 3878 3866
-f 3876 3879 3880
-f 3879 3881 3882
-f 3881 3878 3883
-f 3879 3878 3881
-f 3876 3878 3879
-f 3876 3866 3878
-f 3881 3883 3884
-f 3878 3864 3863
-f 3885 3862 3886
-f 3742 3887 3860
-f 3887 3742 3741
-f 3860 3888 3861
-f 3888 3860 3887
-f 3861 3886 3862
-f 3886 3861 3888
-f 3883 3878 3889
-f 3862 3885 3863
-f 3863 3890 3878
-f 3891 3878 3890
-f 3892 3878 3891
-f 3889 3878 3892
-f 3883 3889 3893
-f 3889 3892 3894
-f 3890 3863 3885
-f 3892 3891 3895
-f 3872 3896 3897
-f 3876 3898 3899
-f 3875 3900 3896
-f 3877 3899 3901
-f 3880 3902 3898
-f 3874 3901 3900
-f 3903 3865 3869
-f 3904 3867 3871
-f 3905 3871 3870
-f 3906 3869 3867
-f 3907 3868 3865
-f 3840 3843 3868
-f 3843 3872 3840
-f 3868 3907 3840
-f 3869 3906 3903
-f 3871 3905 3904
-f 3873 3897 3908
-f 3870 3908 3905
-f 3867 3904 3906
-f 3865 3903 3907
-f 3896 3840 3872
-f 3908 3870 3873
-f 3896 3872 3875
-f 3901 3874 3877
-f 3899 3877 3876
-f 3900 3875 3874
-f 3872 3883 3896
-f 3897 3873 3872
-f 3893 3909 3910
-f 3883 3910 3911
-f 3881 3912 3913
-f 3884 3911 3912
-f 3882 3913 3914
-f 3910 3896 3883
-f 3914 3902 3880
-f 3911 3884 3883
-f 3913 3882 3881
-f 3880 3879 3914
-f 3898 3876 3880
-f 3914 3879 3882
-f 3912 3881 3884
-f 3910 3883 3893
-f 3915 3892 3895
-f 3916 3891 3917
-f 3918 3895 3891
-f 3919 3894 3892
-f 3883 3920 3910
-f 3909 3893 3889
-f 3921 3889 3894
-f 3891 3916 3918
-f 3895 3918 3915
-f 3922 3910 3920
-f 3917 3923 3916
-f 3894 3919 3921
-f 3892 3915 3919
-f 3889 3921 3909
-f 3835 3924 3829
-f 3925 3828 3926
-f 3827 3828 3925
-f 3926 3829 3924
-f 3829 3926 3828
-f 3754 3827 3925
-f 3827 3754 3722
-f 3924 3927 3926
-f 3928 3926 3927
-f 3925 3926 3928
-f 3752 3925 3928
-f 3925 3752 3754
-f 3929 3930 3927
-f 3927 3924 3929
-f 3924 3835 3931
-f 3932 3933 3934
-f 3932 3934 3837
-f 3836 3932 3837
-f 3931 3929 3924
-f 3837 3931 3835
-f 3931 3837 3934
-f 3934 3935 3931
-f 3933 3936 3937
-f 3929 3931 3935
-f 3935 3934 3937
-f 3933 3937 3934
-f 3935 3938 3929
-f 3938 3935 3939
-f 3936 3940 3937
-f 3937 3939 3935
-f 3939 3937 3940
-f 3941 3942 3943
-f 3942 3941 3944
-f 3945 3943 3946
-f 3943 3945 3941
-f 3944 3747 3942
-f 3747 3944 3748
-f 3930 3929 3938
-f 3947 3927 3930
-f 3750 3928 3947
-f 3928 3750 3752
-f 3928 3927 3947
-f 3947 3747 3750
-f 3948 3938 3949
-f 3946 3942 3747
-f 3950 3930 3948
-f 3947 3930 3950
-f 3946 3943 3942
-f 3946 3747 3950
-f 3747 3947 3950
-f 3939 3949 3938
-f 3949 3939 3951
-f 3938 3948 3930
-f 3952 3953 3940
-f 3936 3952 3940
-f 3940 3951 3939
-f 3951 3940 3953
-f 3954 3955 3956
-f 3845 3842 3957
-f 3954 3958 3959
-f 3956 3958 3954
-f 3960 3958 3956
-f 3956 3955 3960
-f 3961 3959 3958
-f 3958 3960 3961
-f 3952 3957 3842
-f 3961 3950 3959
-f 3950 3954 3959
-f 3954 3949 3841
-f 3839 3953 3842
-f 3953 3839 3951
-f 3954 3950 3948
-f 3842 3953 3952
-f 3950 3961 3946
-f 3949 3954 3948
-f 3961 3962 3945
-f 3945 3946 3961
-f 3951 3841 3949
-f 3841 3951 3839
-f 3841 3840 3954
-f 3840 3960 3955
-f 3963 3961 3960
-f 3961 3963 3962
-f 3954 3840 3955
-f 3960 3840 3963
-f 3964 3962 3965
-f 3965 3966 3964
-f 3962 3964 3945
-f 3964 3967 3968
-f 3969 3941 3968
-f 3945 3968 3941
-f 3944 3756 3748
-f 3968 3945 3964
-f 3756 3944 3969
-f 3969 3763 3756
-f 3968 3970 3969
-f 3941 3969 3944
-f 3970 3766 3763
-f 3763 3969 3970
-f 3966 3971 3967
-f 3972 3967 3971
-f 3766 3970 3972
-f 3970 3968 3967
-f 3967 3964 3966
-f 3967 3972 3970
-f 3903 3963 3840
-f 3904 3963 3903
-f 3903 3840 3907
-f 3904 3903 3906
-f 3908 3904 3905
-f 3963 3965 3962
-f 3965 3963 3973
-f 3904 3973 3963
-f 3896 3973 3908
-f 3898 3901 3899
-f 3898 3973 3901
-f 3901 3896 3900
-f 3973 3974 3965
-f 3896 3908 3897
-f 3901 3973 3896
-f 3908 3973 3904
-f 3974 3973 3975
-f 3914 3898 3902
-f 3975 3898 3914
-f 3975 3973 3898
-f 3912 3914 3913
-f 3966 3965 3974
-f 3974 3976 3966
-f 3971 3966 3976
-f 3921 3910 3909
-f 3912 3910 3975
-f 3975 3914 3912
-f 3975 3910 3921
-f 3910 3912 3911
-f 3976 3974 3977
-f 3978 3915 3916
-f 3975 3977 3974
-f 3977 3975 3978
-f 3915 3921 3919
-f 3915 3975 3921
-f 3916 3915 3918
-f 3978 3975 3915
-f 3979 3980 3981
-f 3980 3979 3982
-f 3772 3983 3984
-f 3983 3772 3771
-f 3984 3982 3979
-f 3982 3984 3983
-f 3741 3984 3887
-f 3984 3741 3772
-f 3887 3979 3888
-f 3979 3887 3984
-f 3888 3981 3886
-f 3981 3888 3979
-f 3890 3985 3891
-f 3891 3985 3917
-f 3886 3986 3885
-f 3986 3886 3981
-f 3987 3988 3989
-f 3990 3989 3988
-f 3989 3990 3991
-f 3991 3990 3992
-f 3990 3988 3993
-f 3988 3987 3994
-f 3991 3890 3989
-f 3989 3885 3986
-f 3985 3890 3920
-f 3920 3890 3995
-f 3985 3920 3996
-f 3920 3995 3997
-f 3995 3890 3998
-f 3998 3890 3991
-f 3995 3998 3999
-f 3998 3991 4000
-f 3885 3989 3890
-f 3981 4001 3986
-f 4001 3981 3980
-f 3980 4002 4003
-f 4004 3980 4003
-f 3986 4005 3989
-f 3989 4006 3987
-f 4005 4006 3989
-f 4007 4006 4005
-f 4006 4008 3987
-f 4007 4009 4006
-f 4010 4011 4007
-f 4005 3986 4001
-f 4005 4010 4007
-f 4012 4013 4010
-f 4012 4010 4005
-f 4014 4012 4015
-f 4015 4012 4005
-f 4016 4001 4004
-f 4016 4005 4001
-f 4015 4005 4016
-f 4017 3999 3998
-f 4018 3997 3995
-f 4019 3985 3996
-f 4020 3996 3920
-f 3923 3917 3985
-f 3922 3920 3997
-f 4021 3995 3999
-f 3997 4018 3922
-f 3999 4017 4021
-f 3920 3922 4020
-f 3998 4022 4017
-f 3995 4021 4018
-f 3996 4020 4019
-f 4023 3992 3990
-f 4024 4000 3991
-f 4022 3998 4000
-f 4025 3991 3992
-f 4026 3990 3993
-f 4027 3993 3988
-f 3920 3988 3922
-f 3992 4023 4025
-f 4000 4024 4022
-f 3988 4028 4027
-f 3993 4027 4026
-f 3990 4026 4023
-f 3991 4025 4024
-f 4028 3922 3988
-f 4008 4029 4030
-f 4006 4031 4029
-f 3987 4030 4032
-f 4007 4033 4034
-f 3994 4032 4028
-f 4009 4034 4031
-f 4034 4009 4007
-f 4031 4006 4009
-f 4028 3988 3994
-f 4030 3987 4008
-f 4029 4008 4006
-f 4032 3994 3987
-f 3988 4012 4028
-f 4012 4014 4035
-f 4036 4010 4013
-f 4037 4013 4012
-f 4033 4007 4011
-f 4012 4015 4038
-f 4039 4011 4010
-f 4012 4040 4037
-f 4011 4039 4033
-f 4013 4037 4036
-f 4010 4036 4039
-f 4035 4040 4012
-f 4038 4040 4012
-f 4040 4028 4012
-f 3980 3982 4002
-f 4041 3771 3779
-f 4041 3983 3771
-f 4002 3983 4041
-f 4002 3982 3983
-f 4042 4002 4041
-f 4041 4043 4042
-f 4044 4003 4002
-f 4002 4042 4044
-f 4043 4041 3779
-f 3779 3782 4043
-f 4045 4046 4047
-f 4048 4049 4045
-f 4049 4048 4050
-f 4051 4047 4046
-f 4047 4051 4052
-f 4053 4052 4051
-f 4054 4053 4051
-f 4046 4045 4049
-f 4044 4042 4043
-f 4055 4050 4048
-f 4044 3782 4055
-f 3782 4056 4055
-f 4056 3782 3781
-f 4044 4043 3782
-f 4050 4057 4049
-f 4056 4050 4055
-f 4056 4058 4050
-f 4059 4058 4056
-f 3781 4059 4056
-f 4059 3781 3780
-f 4059 4060 4058
-f 4061 4060 4059
-f 4057 4050 4058
-f 4058 4062 4057
-f 4062 4058 4060
-f 3780 4061 4059
-f 4061 3780 3786
-f 4063 4062 4064
-f 4065 4066 4061
-f 4061 4066 4060
-f 3786 4065 4061
-f 4065 3786 3783
-f 4060 4064 4062
-f 4064 4060 4066
-f 4067 4068 4069
-f 4069 4070 4067
-f 4068 4067 4063
-f 4067 4057 4062
-f 4071 4072 4069
-f 4071 4069 4068
-f 4073 4071 4068
-f 4062 4063 4067
-f 4070 4049 4057
-f 4074 4046 4070
-f 4046 4074 4051
-f 4049 4070 4046
-f 4054 4051 4074
-f 4057 4067 4070
-f 4070 4069 4074
-f 4072 4054 4074
-f 4072 4074 4069
-f 4075 4076 4035
-f 4077 4075 4035
-f 4035 4014 4077
-f 4078 4077 4014
-f 4078 4079 4077
-f 4080 4078 4014
-f 4081 4080 4014
-f 4004 4001 3980
-f 4082 4081 4014
-f 4083 4082 4015
-f 4014 4015 4082
-f 4004 4084 4085
-f 4085 4016 4004
-f 4016 4085 4083
-f 4083 4015 4016
-f 4044 4004 4003
-f 4055 4084 4044
-f 4052 4080 4047
-f 4078 4052 4053
-f 4045 4082 4048
-f 4082 4055 4048
-f 4047 4081 4045
-f 4053 4079 4078
-f 4004 4044 4084
-f 4084 4055 4086
-f 4080 4052 4078
-f 4055 4082 4086
-f 4082 4045 4081
-f 4081 4047 4080
-f 4087 4086 4082
-f 4085 4087 4088
-f 4087 4085 4084
-f 4083 4088 4082
-f 4082 4088 4087
-f 4088 4083 4085
-f 4084 4086 4087
-f 4019 3978 3916
-f 3985 4019 3923
-f 4089 3977 4090
-f 4019 3916 3923
-f 3972 3792 3766
-f 3792 3972 4091
-f 3971 4091 3972
-f 4091 3971 4092
-f 3976 4092 3971
-f 4092 3976 4089
-f 3977 4089 3976
-f 4093 4089 4094
-f 4091 3794 3792
-f 3794 4091 4095
-f 4092 4095 4091
-f 4095 4092 4093
-f 4089 4093 4092
-f 4028 4096 4026
-f 4030 4096 4028
-f 4026 4025 4023
-f 4028 4026 4027
-f 4030 4028 4032
-f 4090 3978 4096
-f 4096 4022 4025
-f 4096 4025 4026
-f 4021 3978 3922
-f 3922 4019 4020
-f 4021 3922 4018
-f 3922 3978 4019
-f 3978 4090 3977
-f 4022 4021 4017
-f 4025 4022 4024
-f 4022 3978 4021
-f 4096 3978 4022
-f 4097 4098 4094
-f 4090 4094 4089
-f 4094 4090 4099
-f 4096 4099 4090
-f 4031 4096 4030
-f 4100 4031 4033
-f 4100 4096 4031
-f 4031 4030 4029
-f 4033 4031 4034
-f 4036 4033 4039
-f 4099 4096 4100
-f 4099 4100 4101
-f 4099 4101 4097
-f 4037 4040 4036
-f 4100 4033 4036
-f 4100 4036 4040
-f 4040 4101 4100
-f 4038 4040 4035
-f 4040 4038 4101
-f 4065 4102 4066
-f 4103 4102 4065
-f 4104 4064 4105
-f 3783 4103 4065
-f 4103 3783 3798
-f 4066 4105 4064
-f 4105 4066 4102
-f 4106 4107 4103
-f 3798 4106 4103
-f 4106 3798 3795
-f 4106 4108 4107
-f 4103 4107 4102
-f 4102 4109 4105
-f 4109 4102 4107
-f 4104 4110 4111
-f 4111 4063 4104
-f 4063 4111 4068
-f 4064 4104 4063
-f 4105 4112 4104
-f 4073 4068 4111
-f 4113 4073 4111
-f 4113 4111 4110
-f 4112 4114 4110
-f 4114 4112 4115
-f 4107 4116 4109
-f 4110 4104 4112
-f 4109 4115 4112
-f 4112 4105 4109
-f 4117 4113 4110
-f 4117 4110 4114
-f 4118 4117 4114
-f 4098 4119 4093
-f 4095 4119 4120
-f 4095 4093 4119
-f 4098 4093 4094
-f 4120 3794 4095
-f 4120 3800 3794
-f 4098 4121 4122
-f 4122 4119 4098
-f 4120 4123 3801
-f 3801 3800 4120
-f 4119 4122 4123
-f 4123 4120 4119
-f 4108 4124 4116
-f 4124 4108 4125
-f 4116 4126 4115
-f 4115 4127 4114
-f 4127 4115 4126
-f 4118 4114 4127
-f 4128 4118 4127
-f 4126 4116 4124
-f 3795 4129 4106
-f 4129 3795 3802
-f 3802 4130 4129
-f 4116 4107 4108
-f 4129 4108 4106
-f 4129 4125 4108
-f 4115 4109 4116
-f 4121 4123 4122
-f 4130 4125 4129
-f 4130 3802 3801
-f 4121 3801 4123
-f 4130 3801 4121
-f 4097 4094 4099
-f 4038 4035 4131
-f 4038 4131 4132
-f 4101 4132 4133
-f 4076 4134 4035
-f 4132 4101 4038
-f 4133 4097 4101
-f 4134 4131 4035
-f 4135 4132 4131
-f 4134 4135 4136
-f 4131 4136 4135
-f 4137 4133 4132
-f 4134 4137 4135
-f 4132 4135 4137
-f 4138 4077 4079
-f 4134 4136 4131
-f 4133 4098 4097
-f 4075 4077 4126
-f 4125 4137 4134
-f 4137 4121 4133
-f 4076 4124 4134
-f 4076 4075 4124
-f 4127 4077 4138
-f 4098 4133 4121
-f 4138 4128 4127
-f 4137 4125 4130
-f 4121 4137 4130
-f 4124 4125 4134
-f 4124 4075 4126
-f 4126 4077 4127
-f 4139 4140 4141
-f 4140 4142 4143
-f 4141 4144 4139
-f 4143 4145 4141
-f 4143 4141 4140
-f 4146 4147 4148
-f 4147 4149 4148
-f 4147 4144 4141
-f 4142 4146 4143
-f 4142 4144 4146
-f 4144 4147 4146
-f 4150 4141 4145
-f 4148 4151 4143
-f 4145 4143 4151
-f 4152 4149 4141
-f 4141 4150 4152
-f 4148 4143 4146
-f 4141 4149 4147
-f 4148 4149 4151
-f 4149 4152 4151
-f 4151 4152 4145
-f 4152 4150 4145
-f 4153 4154 4155
-f 4154 4156 4155
-f 4155 4156 4142
-f 4156 4144 4142
-f 4155 4142 4157
-f 4144 4156 4158
-f 4159 4160 4153
-f 4160 4154 4153
-f 4155 4157 4153
-f 4161 4162 4159
-f 4158 4156 4154
-f 4162 4160 4159
-f 4159 4157 4161
-f 4159 4153 4157
-f 4161 4157 4162
-f 4158 4160 4162
-f 4154 4160 4158
-f 4158 4162 4157
-f 4139 4157 4140
-f 4139 4158 4157
-f 4139 4144 4158
-f 4157 4142 4140
-f 4163 4164 4165
-f 4165 4166 4163
-f 4167 4166 4165
-f 4166 4168 4169
-f 4170 4171 4172
-f 4171 4173 4167
-f 4167 4172 4171
-f 4169 4163 4166
-f 4173 4168 4166
-f 4166 4167 4173
-f 4174 4172 4175
-f 4175 4176 4174
-f 4172 4174 4170
-f 4172 4167 4177
-f 4177 4175 4172
-f 4165 4177 4167
-f 4178 4175 4177
-f 4179 4176 4175
-f 4175 4178 4179
-f 4165 4180 4181
-f 4181 4177 4165
-f 4177 4181 4178
-f 4182 4183 4163
-f 4163 4169 4182
-f 4183 4184 4185
-f 4185 4186 4183
-f 4182 4187 4184
-f 4184 4183 4182
-f 4183 4186 4164
-f 4164 4163 4183
-f 4164 4186 4188
-f 4188 4189 4164
-f 4190 4188 4186
-f 4186 4185 4190
-f 4165 4164 4189
-f 4189 4180 4165
-f 4179 4178 4191
-f 4191 4192 4179
-f 4178 4181 4193
-f 4193 4191 4178
-f 4181 4180 4194
-f 4194 4193 4181
-f 4194 4180 4189
-f 4195 4189 4188
-f 4196 4197 4198
-f 4188 4190 4197
-f 4197 4196 4188
-f 4199 4195 4196
-f 4189 4195 4194
-f 4188 4196 4195
-f 4196 4200 4199
-f 4200 4198 4201
-f 4199 4202 4203
-f 4198 4200 4196
-f 4195 4199 4204
-f 4200 4205 4202
-f 4201 4205 4200
-f 4202 4199 4200
-f 4206 4207 4204
-f 4207 4206 4208
-f 4209 4210 4211
-f 4208 4211 4207
-f 4203 4204 4199
-f 4211 4208 4209
-f 4204 4203 4206
-f 4204 4207 4193
-f 4207 4211 4191
-f 4211 4210 4192
-f 4192 4191 4211
-f 4191 4193 4207
-f 4204 4194 4195
-f 4193 4194 4204
-f 4182 4212 4213
-f 4212 4214 4215
-f 4216 4213 4212
-f 4212 4182 4169
-f 4169 4214 4212
-f 4214 4169 4168
-f 4213 4187 4182
-f 4168 4217 4214
-f 4218 4219 4171
-f 4171 4170 4218
-f 4219 4220 4173
-f 4173 4171 4219
-f 4220 4217 4168
-f 4168 4173 4220
-f 4214 4217 4221
-f 4221 4217 4220
-f 4222 4220 4219
-f 4223 4219 4218
-f 4224 4225 4226
-f 4221 4215 4214
-f 4226 4216 4224
-f 4227 4225 4224
-f 4224 4215 4227
-f 4227 4215 4221
-f 4215 4224 4212
-f 4212 4224 4216
-f 4219 4223 4222
-f 4218 4228 4223
-f 4229 4221 4222
-f 4220 4222 4221
-f 4222 4230 4229
-f 4231 4223 4228
-f 4221 4229 4227
-f 4228 4232 4231
-f 4230 4222 4223
-f 4223 4231 4230
-f 4233 4234 4231
-f 4231 4232 4233
-f 4235 4236 4229
-f 4229 4230 4235
-f 4237 4227 4229
-f 4229 4236 4237
-f 4234 4235 4230
-f 4230 4231 4234
-f 4227 4237 4238
-f 4225 4238 4239
-f 4240 4238 4237
-f 4241 4239 4238
-f 4239 4226 4225
-f 4238 4225 4227
-f 4240 4242 4243
-f 4243 4241 4240
-f 4242 4240 4244
-f 4245 4244 4246
-f 4244 4245 4242
-f 4237 4244 4240
-f 4238 4240 4241
-f 4247 4248 4249
-f 4250 4251 4248
-f 4252 4246 4253
-f 4253 4249 4252
-f 4249 4253 4247
-f 4246 4252 4245
-f 4248 4247 4250
-f 4247 4234 4233
-f 4253 4235 4234
-f 4244 4237 4236
-f 4246 4236 4235
-f 4235 4253 4246
-f 4233 4250 4247
-f 4236 4246 4244
-f 4234 4247 4253
-f 4254 4255 4256
-f 4256 4257 4254
-f 4258 4259 4260
-f 4261 4262 4263
-f 4254 4257 4264
-f 4261 4263 4265
-f 4266 4263 4267
-f 4254 4264 4261
-f 4263 4266 4265
-f 4266 4267 4268
-f 4267 4269 4268
-f 4254 4261 4265
-f 4270 4271 4257
-f 4270 4272 4271
-f 4270 4273 4272
-f 4270 4257 4256
-f 4256 4274 4270
-f 4275 4276 4277
-f 4273 4278 4279
-f 4279 4272 4273
-f 4278 4277 4276
-f 4276 4279 4278
-f 4280 4281 4282
-f 4268 4269 4280
-f 4283 4282 4281
-f 4281 4284 4283
-f 4268 4280 4282
-f 4285 4286 4283
-f 4287 4286 4285
-f 4285 4288 4287
-f 4289 4290 4288
-f 4285 4283 4284
-f 4285 4284 4291
-f 4288 4285 4289
-f 4285 4292 4293
-f 4285 4291 4292
-f 4294 4292 4295
-f 4294 4295 4296
-f 4296 4297 4298
-f 4299 4298 4297
-f 4285 4293 4289
-f 4294 4293 4292
-f 4298 4294 4296
-f 4277 4300 4275
-f 4300 4301 4275
-f 4300 4302 4301
-f 4300 4303 4302
-f 4304 4305 4306
-f 4305 4307 4303
-f 4307 4302 4303
-f 4305 4304 4307
-f 4308 4309 4310
-f 4304 4306 4308
-f 4308 4311 4309
-f 4308 4312 4311
-f 4304 4308 4313
-f 4308 4310 4313
-f 4314 4315 4316
-f 4314 4317 4315
-f 4308 4314 4312
-f 4308 4318 4314
-f 4314 4316 4312
-f 4319 4320 4321
-f 4322 4321 4320
-f 4322 4317 4321
-f 4322 4315 4317
-f 4323 4319 4321
-f 4324 4319 4325
-f 4319 4323 4325
-f 4324 4326 4319
-f 4325 4327 4324
-f 4325 4328 4327
-f 4325 4329 4328
-f 4330 4331 4332
-f 4331 4333 4332
-f 4334 4328 4329
-f 4334 4329 4331
-f 4330 4335 4331
-f 4335 4334 4331
-f 4335 4336 4334
-f 4337 4338 4339
-f 4335 4339 4338
-f 4335 4338 4336
-f 4339 4299 4337
-f 4340 4341 4335
-f 4335 4330 4340
-f 4297 4337 4299
-f 4335 4341 4339
-f 4342 4343 4344
-f 4344 4345 4342
-f 4344 4343 4346
-f 4346 4347 4344
-f 4344 4348 4345
-f 4348 4344 4347
-f 4347 4349 4348
-f 4342 4345 4185
-f 4349 4350 4351
-f 4351 4348 4349
-f 4348 4351 4352
-f 4352 4345 4348
-f 4350 4353 4351
-f 4185 4345 4352
-f 4352 4190 4185
-f 4354 4355 4356
-f 4356 4357 4354
-f 4357 4358 4359
-f 4358 4349 4347
-f 4356 4360 4358
-f 4358 4357 4356
-f 4358 4360 4350
-f 4350 4349 4358
-f 4360 4361 4353
-f 4362 4361 4360
-f 4356 4357 4362
-f 4353 4350 4360
-f 4356 4362 4360
-f 4359 4363 4357
-f 4364 4365 4363
-f 4363 4359 4364
-f 4346 4364 4359
-f 4359 4347 4346
-f 4347 4359 4358
-f 4357 4363 4366
-f 4366 4354 4357
-f 4367 4368 4365
-f 4363 4365 4368
-f 4368 4366 4363
-f 4366 4368 4369
-f 4369 4370 4366
-f 4371 4372 4343
-f 4343 4342 4371
-f 4373 4372 4371
-f 4374 4375 4371
-f 4184 4342 4185
-f 4184 4371 4342
-f 4371 4184 4187
-f 4372 4373 4376
-f 4376 4377 4372
-f 4378 4373 4375
-f 4379 4375 4374
-f 4375 4373 4371
-f 4343 4372 4377
-f 4377 4346 4343
-f 4377 4376 4380
-f 4381 4376 4373
-f 4382 4380 4383
-f 4376 4381 4384
-f 4384 4380 4376
-f 4375 4379 4378
-f 4378 4381 4373
-f 4384 4381 4378
-f 4385 4378 4379
-f 4346 4377 4382
-f 4382 4364 4346
-f 4386 4364 4382
-f 4380 4382 4377
-f 4387 4383 4388
-f 4382 4387 4386
-f 4388 4389 4387
-f 4386 4387 4389
-f 4383 4387 4382
-f 4379 4390 4385
-f 4391 4384 4385
-f 4392 4385 4390
-f 4378 4385 4384
-f 4380 4384 4391
-f 4390 4393 4392
-f 4385 4392 4391
-f 4391 4383 4380
-f 4392 4393 4394
-f 4391 4392 4395
-f 4386 4365 4364
-f 4255 4254 4396
-f 4365 4386 4367
-f 4256 4255 4397
-f 4398 4397 4399
-f 4400 4399 4401
-f 4355 4402 4362
-f 4279 4276 4403
-f 4362 4356 4355
-f 4277 4278 4404
-f 4405 4404 4406
-f 4407 4406 4404
-f 4406 4408 4405
-f 4404 4405 4277
-f 4404 4409 4407
-f 4409 4404 4278
-f 4278 4273 4409
-f 4410 4409 4273
-f 4273 4270 4410
-f 4411 4412 4413
-f 4409 4410 4413
-f 4414 4413 4410
-f 4415 4410 4270
-f 4416 4417 4355
-f 4418 4417 4419
-f 4419 4403 4418
-f 4403 4419 4279
-f 4420 4419 4417
-f 4402 4355 4417
-f 4417 4418 4402
-f 4421 4422 4257
-f 4271 4272 4420
-f 4257 4271 4421
-f 4420 4421 4271
-f 4264 4257 4422
-f 4422 4421 4370
-f 4354 4366 4370
-f 4355 4354 4416
-f 4272 4279 4419
-f 4370 4416 4354
-f 4416 4370 4421
-f 4419 4420 4272
-f 4421 4420 4416
-f 4417 4416 4420
-f 4423 4424 4425
-f 4425 4274 4423
-f 4414 4415 4426
-f 4410 4415 4414
-f 4415 4274 4425
-f 4270 4274 4415
-f 4426 4415 4425
-f 4427 4425 4424
-f 4424 4400 4427
-f 4428 4425 4427
-f 4398 4423 4274
-f 4274 4256 4398
-f 4400 4424 4423
-f 4423 4398 4400
-f 4429 4430 4431
-f 4426 4432 4414
-f 4411 4433 4430
-f 4434 4431 3957
-f 4432 4433 4411
-f 4435 4436 4437
-f 4426 4428 4438
-f 4438 4437 4426
-f 4432 4436 4435
-f 4432 4426 4437
-f 4437 4438 4435
-f 4437 4436 4432
-f 4411 4414 4432
-f 4430 4429 4411
-f 4431 4434 4429
-f 3957 3952 4434
-f 4425 4428 4426
-f 4427 4439 4428
-f 4440 4441 4430
-f 4428 4439 4442
-f 4438 4442 4440
-f 4441 4440 4443
-f 4440 4433 4432
-f 4432 4435 4440
-f 4440 4435 4438
-f 4442 4438 4428
-f 4430 4433 4440
-f 4440 4258 4443
-f 4444 4445 4258
-f 4258 4445 4443
-f 4258 4446 4444
-f 4447 4444 4446
-f 4397 4255 4401
-f 4401 4399 4397
-f 4401 4255 4448
-f 4396 4448 4255
-f 4449 4401 4448
-f 4450 4451 4448
-f 4399 4400 4398
-f 4401 4427 4400
-f 4439 4427 4401
-f 4397 4398 4256
-f 4401 4449 4439
-f 4448 4452 4449
-f 4453 4454 4455
-f 4455 4456 4453
-f 4454 4453 4457
-f 4448 4451 4457
-f 4457 4452 4448
-f 4457 4451 4454
-f 4258 4440 4458
-f 4459 4446 4460
-f 4260 4460 4446
-f 4458 4440 4442
-f 4461 4442 4439
-f 4446 4258 4260
-f 4457 4462 4452
-f 4463 4462 4457
-f 4461 4462 4463
-f 4463 4458 4461
-f 4449 4452 4462
-f 4462 4461 4449
-f 4457 4458 4463
-f 4260 4458 4457
-f 4260 4457 4453
-f 4260 4453 4456
-f 4258 4458 4260
-f 4442 4461 4458
-f 4439 4449 4461
-f 4413 4414 4411
-f 4412 4411 4429
-f 4434 3952 3936
-f 4429 4464 4412
-f 4464 4429 4434
-f 4465 3936 3933
-f 3936 4465 4434
-f 3933 4466 4465
-f 4434 4465 4464
-f 4467 4464 4465
-f 4465 4466 4467
-f 4407 4413 4412
-f 4468 4469 4467
-f 4469 4412 4464
-f 4464 4467 4469
-f 4413 4407 4409
-f 4406 4407 4469
-f 4412 4469 4407
-f 4467 4470 4468
-f 3932 4471 4466
-f 4466 3933 3932
-f 4466 4471 4470
-f 4469 4468 4406
-f 4470 4467 4466
-f 4408 4406 4468
-f 4468 4472 4408
-f 4473 4470 4471
-f 4471 4474 4473
-f 3836 4474 4471
-f 4472 4468 4470
-f 4470 4473 4472
-f 4471 3932 3836
-f 3957 4431 4475
-f 4431 4476 4477
-f 4430 4476 4431
-f 4441 4476 4430
-f 4475 3845 3957
-f 4477 4475 4431
-f 4478 4479 4480
-f 4476 4480 4477
-f 4481 4477 4480
-f 4443 4482 4441
-f 4483 4482 4484
-f 4484 4485 4486
-f 4482 4443 4445
-f 4445 4484 4482
-f 4480 4476 4478
-f 4482 4483 4478
-f 4478 4441 4482
-f 4479 4478 4483
-f 4441 4478 4476
-f 4485 4484 4445
-f 4445 4444 4485
-f 4487 4488 4447
-f 4444 4447 4488
-f 4488 4485 4444
-f 4489 4483 4490
-f 4484 4490 4483
-f 4490 4486 4491
-f 4486 4490 4484
-f 4395 4394 4492
-f 4394 4395 4392
-f 4492 4493 4395
-f 4494 4395 4493
-f 4493 4495 4494
-f 4496 4497 4498
-f 4496 4396 4254
-f 4254 4265 4496
-f 4497 4496 4265
-f 4265 4266 4497
-f 4499 4500 4450
-f 4501 4450 4396
-f 4448 4396 4450
-f 4454 4500 4502
-f 4451 4450 4500
-f 4396 4496 4501
-f 4498 4501 4496
-f 4450 4501 4499
-f 4503 4499 4501
-f 4500 4499 4504
-f 4505 4504 4499
-f 4506 4498 4497
-f 4497 4507 4506
-f 4498 4506 4508
-f 4507 4497 4266
-f 4266 4268 4507
-f 4504 4505 4509
-f 4510 4511 4509
-f 4509 4512 4510
-f 4499 4503 4505
-f 4501 4498 4503
-f 4513 4514 4512
-f 4505 4515 4513
-f 4513 4509 4505
-f 4512 4509 4513
-f 4503 4508 4515
-f 4515 4505 4503
-f 4508 4503 4498
-f 4455 4502 4516
-f 4516 4517 4455
-f 4500 4454 4451
-f 4518 4517 4516
-f 4502 4455 4454
-f 4516 4519 4518
-f 4519 4516 4511
-f 4511 4510 4519
-f 4502 4504 4511
-f 4504 4502 4500
-f 4511 4516 4502
-f 4509 4511 4504
-f 4456 4455 4517
-f 4517 4520 4456
-f 4520 4517 4518
-f 4518 4521 4520
-f 4260 4456 4520
-f 4520 4460 4260
-f 4522 4460 4520
-f 4523 4524 4520
-f 4520 4525 4523
-f 4526 4525 4520
-f 4527 4528 4529
-f 4529 4525 4527
-f 4523 4525 4529
-f 4530 4526 4520
-f 4531 4520 4532
-f 4520 4524 4532
-f 4520 4521 4530
-f 4520 4533 4522
-f 4534 4533 4520
-f 4520 4535 4534
-f 4531 4535 4520
-f 4459 4536 4537
-f 4446 4459 4447
-f 4536 4459 4522
-f 4460 4522 4459
-f 4522 4533 4536
-f 4538 4536 4533
-f 4539 4538 4534
-f 4534 4535 4539
-f 4536 4538 4540
-f 4538 4539 4541
-f 4533 4534 4538
-f 4542 4369 4368
-f 4389 4388 4543
-f 4543 4544 4389
-f 4389 4367 4386
-f 4367 4389 4544
-f 4544 4542 4367
-f 4368 4367 4542
-f 4422 4545 4264
-f 4261 4264 4545
-f 4370 4369 4422
-f 4546 4545 4542
-f 4369 4542 4545
-f 4545 4422 4369
-f 4547 4546 4544
-f 4546 4547 4262
-f 4262 4261 4546
-f 4545 4546 4261
-f 4544 4543 4547
-f 4542 4544 4546
-f 4495 4543 4388
-f 4494 4388 4383
-f 4388 4494 4495
-f 4383 4391 4494
-f 4395 4494 4391
-f 4548 4547 4543
-f 4263 4262 4547
-f 4267 4263 4548
-f 4549 4548 4495
-f 4543 4495 4548
-f 4547 4548 4263
-f 4493 4492 4550
-f 4495 4493 4549
-f 4549 4550 4269
-f 4550 4549 4493
-f 4269 4267 4549
-f 4548 4549 4267
-f 4447 4537 4487
-f 4551 4487 4537
-f 4537 4540 4551
-f 4552 4551 4540
-f 4540 4541 4552
-f 4537 4447 4459
-f 4541 4540 4538
-f 4540 4537 4536
-f 4485 4488 4553
-f 4554 4553 4488
-f 4553 4486 4485
-f 4486 4553 4555
-f 4556 4554 4487
-f 4551 4552 4557
-f 4487 4551 4556
-f 4556 4557 4558
-f 4488 4487 4554
-f 4557 4556 4551
-f 4187 4559 4371
-f 4560 4559 4187
-f 4187 4213 4560
-f 4371 4559 4374
-f 4561 4374 4559
-f 4559 4560 4561
-f 4374 4562 4379
-f 4563 4562 4374
-f 4374 4561 4564
-f 4564 4563 4374
-f 4563 4564 4565
-f 4566 4567 4568
-f 4563 4568 4567
-f 4567 4562 4563
-f 4562 4567 4390
-f 4390 4379 4562
-f 4568 4569 4566
-f 4567 4566 4393
-f 4393 4390 4567
-f 4566 4570 4571
-f 4566 4569 4570
-f 4571 4572 4566
-f 4393 4566 4572
-f 4565 4568 4563
-f 4570 4569 4573
-f 4573 4569 4574
-f 4574 4575 4573
-f 4571 4570 4573
-f 4574 4569 4568
-f 4568 4565 4574
-f 4573 4575 4576
-f 4576 4577 4573
-f 4571 4573 4577
-f 4575 4578 4579
-f 4579 4576 4575
-f 4571 4577 4580
-f 4581 4560 4213
-f 4582 4564 4561
-f 4564 4582 4583
-f 4561 4584 4582
-f 4584 4561 4560
-f 4560 4581 4584
-f 4585 4581 4216
-f 4584 4581 4585
-f 4213 4216 4581
-f 4582 4586 4587
-f 4588 4586 4582
-f 4582 4584 4588
-f 4583 4587 4589
-f 4587 4583 4582
-f 4590 4589 4591
-f 4574 4589 4590
-f 4589 4592 4583
-f 4578 4593 4594
-f 4595 4596 4590
-f 4596 4594 4593
-f 4593 4590 4596
-f 4590 4591 4595
-f 4583 4565 4564
-f 4574 4590 4593
-f 4574 4592 4589
-f 4578 4575 4574
-f 4578 4574 4593
-f 4592 4574 4565
-f 4565 4583 4592
-f 4597 4506 4507
-f 4507 4598 4597
-f 4598 4507 4268
-f 4268 4282 4598
-f 4599 4598 4282
-f 4506 4597 4600
-f 4601 4600 4597
-f 4602 4603 4600
-f 4604 4597 4598
-f 4600 4508 4506
-f 4508 4600 4603
-f 4603 4515 4508
-f 4600 4601 4602
-f 4605 4604 4599
-f 4282 4283 4599
-f 4597 4604 4601
-f 4606 4601 4604
-f 4598 4599 4604
-f 4607 4608 4286
-f 4604 4605 4606
-f 4599 4608 4605
-f 4608 4599 4283
-f 4283 4286 4608
-f 4607 4287 4609
-f 4610 4611 4609
-f 4609 4287 4610
-f 4286 4287 4607
-f 4612 4610 4287
-f 4613 4611 4610
-f 4614 4609 4611
-f 4615 4616 4284
-f 4284 4281 4615
-f 4617 4580 4616
-f 4618 4616 4580
-f 4616 4618 4291
-f 4291 4284 4616
-f 4572 4394 4393
-f 4580 4617 4571
-f 4572 4571 4617
-f 4617 4619 4572
-f 4394 4572 4619
-f 4619 4492 4394
-f 4619 4617 4615
-f 4281 4280 4620
-f 4550 4620 4280
-f 4280 4269 4550
-f 4620 4550 4492
-f 4492 4619 4620
-f 4616 4615 4617
-f 4620 4615 4281
-f 4615 4620 4619
-f 4621 4622 4603
-f 4515 4603 4622
-f 4622 4513 4515
-f 4514 4513 4622
-f 4622 4623 4514
-f 4623 4622 4621
-f 4624 4621 4602
-f 4603 4602 4621
-f 4621 4625 4623
-f 4625 4621 4624
-f 4624 4626 4625
-f 4627 4602 4601
-f 4602 4627 4624
-f 4628 4629 4626
-f 4601 4606 4627
-f 4630 4627 4606
-f 4627 4630 4628
-f 4628 4624 4627
-f 4626 4624 4628
-f 4606 4631 4630
-f 4632 4605 4608
-f 4608 4607 4632
-f 4631 4606 4605
-f 4605 4632 4631
-f 4633 4630 4631
-f 4631 4632 4634
-f 4530 4629 4628
-f 4632 4607 4635
-f 4526 4628 4630
-f 4628 4526 4530
-f 4634 4636 4631
-f 4631 4636 4633
-f 4630 4633 4526
-f 4635 4634 4632
-f 4637 4526 4633
-f 4633 4636 4637
-f 4527 4525 4526
-f 4526 4637 4527
-f 4638 4636 4634
-f 4634 4639 4640
-f 4640 4639 4641
-f 4641 4639 4634
-f 4634 4635 4641
-f 4642 4641 4635
-f 4643 4644 4524
-f 4524 4523 4643
-f 4529 4643 4523
-f 4645 4529 4528
-f 4643 4529 4645
-f 4641 4642 4640
-f 4646 4642 4647
-f 4647 4609 4614
-f 4648 4640 4642
-f 4635 4647 4642
-f 4635 4607 4609
-f 4609 4647 4635
-f 4649 4634 4640
-f 4638 4634 4649
-f 4528 4527 4637
-f 4637 4638 4528
-f 4636 4638 4637
-f 4535 4531 4650
-f 4531 4532 4651
-f 4644 4651 4532
-f 4532 4524 4644
-f 4651 4650 4531
-f 4539 4650 4652
-f 4650 4651 4653
-f 4650 4539 4535
-f 4654 4655 4644
-f 4645 4654 4643
-f 4644 4643 4654
-f 4655 4653 4651
-f 4651 4644 4655
-f 4652 4541 4539
-f 4652 4653 4656
-f 4653 4652 4650
-f 4541 4652 4657
-f 4658 4659 4655
-f 4659 4656 4653
-f 4653 4655 4659
-f 4660 4658 4654
-f 4655 4654 4658
-f 4528 4661 4645
-f 4638 4649 4662
-f 4661 4528 4638
-f 4638 4662 4661
-f 4649 4663 4664
-f 4649 4665 4663
-f 4662 4664 4666
-f 4660 4645 4661
-f 4661 4666 4660
-f 4654 4645 4660
-f 4666 4661 4662
-f 4664 4662 4649
-f 4667 4613 4612
-f 4668 4612 4288
-f 4287 4288 4612
-f 4669 4614 4613
-f 4610 4612 4613
-f 4611 4613 4614
-f 4613 4667 4669
-f 4612 4668 4667
-f 4669 4290 4670
-f 4671 4670 4290
-f 4290 4289 4671
-f 4288 4290 4668
-f 4668 4290 4669
-f 4669 4667 4668
-f 4614 4672 4647
-f 4672 4614 4669
-f 4673 4648 4646
-f 4642 4646 4648
-f 4674 4646 4672
-f 4665 4648 4673
-f 4649 4640 4648
-f 4647 4672 4646
-f 4665 4649 4648
-f 4675 4676 4677
-f 4670 4678 4679
-f 4669 4679 4672
-f 4676 4675 4680
-f 4680 4678 4670
-f 4675 4681 4665
-f 4665 4680 4675
-f 4665 4673 4680
-f 4672 4679 4674
-f 4646 4674 4673
-f 4673 4682 4680
-f 4677 4681 4675
-f 4683 4674 4679
-f 4682 4673 4674
-f 4679 4678 4683
-f 4683 4678 4680
-f 4680 4682 4683
-f 4674 4683 4682
-f 4670 4684 4680
-f 4685 4684 4670
-f 4686 4676 4684
-f 4679 4669 4670
-f 4680 4684 4676
-f 4687 4688 4689
-f 4690 4691 4689
-f 4689 4691 4687
-f 4576 4579 4692
-f 4594 4579 4578
-f 4579 4594 4693
-f 4692 4693 4694
-f 4693 4692 4579
-f 4695 4692 4696
-f 4577 4576 4695
-f 4695 4580 4577
-f 4692 4695 4576
-f 4580 4695 4618
-f 4696 4694 4295
-f 4696 4618 4695
-f 4292 4291 4618
-f 4295 4292 4696
-f 4694 4696 4692
-f 4618 4696 4292
-f 4697 4698 4699
-f 4699 4700 4697
-f 4594 4596 4697
-f 4596 4595 4698
-f 4693 4697 4700
-f 4698 4697 4596
-f 4697 4693 4594
-f 4700 4699 4297
-f 4700 4694 4693
-f 4296 4295 4694
-f 4694 4700 4296
-f 4657 4656 4701
-f 4656 4657 4652
-f 4552 4657 4702
-f 4703 4704 4659
-f 4704 4701 4656
-f 4656 4659 4704
-f 4657 4552 4541
-f 4701 4702 4657
-f 4705 4706 4702
-f 4707 4705 4701
-f 4702 4701 4705
-f 4702 4557 4552
-f 4701 4704 4707
-f 4557 4702 4706
-f 4666 4708 4709
-f 4708 4666 4664
-f 4663 4710 4711
-f 4709 4660 4666
-f 4711 4664 4663
-f 4658 4660 4709
-f 4664 4711 4708
-f 4710 4663 4665
-f 4704 4703 4690
-f 4691 4709 4708
-f 4659 4658 4703
-f 4709 4703 4658
-f 4703 4709 4691
-f 4691 4690 4703
-f 4690 4707 4704
-f 4708 4687 4691
-f 4712 4711 4710
-f 4711 4712 4687
-f 4687 4708 4711
-f 4688 4687 4712
-f 4297 4296 4700
-f 4713 4714 4715
-f 4716 4713 4717
-f 4715 4717 4713
-f 4716 4686 4685
-f 4713 4716 4718
-f 4714 4713 4719
-f 4720 4671 4289
-f 4289 4293 4720
-f 4721 4720 4293
-f 4293 4294 4721
-f 4718 4685 4671
-f 4685 4718 4716
-f 4671 4720 4718
-f 4719 4718 4720
-f 4677 4722 4723
-f 4722 4677 4676
-f 4670 4671 4685
-f 4723 4724 4677
-f 4676 4686 4722
-f 4725 4724 4723
-f 4684 4685 4686
-f 4726 4723 4722
-f 4686 4716 4727
-f 4728 4723 4726
-f 4722 4727 4726
-f 4723 4728 4725
-f 4727 4722 4686
-f 4720 4721 4719
-f 4729 4721 4294
-f 4730 4719 4721
-f 4294 4298 4729
-f 4719 4730 4714
-f 4718 4719 4713
-f 4721 4729 4730
-f 4727 4717 4731
-f 4731 4726 4727
-f 4732 4726 4731
-f 4717 4727 4716
-f 4726 4732 4728
-f 4731 4733 4732
-f 4734 4735 4733
-f 4733 4731 4734
-f 4734 4731 4717
-f 4717 4715 4734
-f 4710 4736 4712
-f 4688 4712 4736
-f 4736 4737 4688
-f 4737 4736 4738
-f 4738 4739 4737
-f 4665 4740 4738
-f 4738 4741 4665
-f 4665 4741 4710
-f 4681 4740 4665
-f 4739 4738 4740
-f 4736 4710 4741
-f 4741 4738 4736
-f 4681 4742 4740
-f 4733 4735 4743
-f 4728 4743 4725
-f 4744 4724 4725
-f 4728 4732 4743
-f 4681 4677 4724
-f 4733 4743 4732
-f 4745 4744 4743
-f 4743 4735 4746
-f 4681 4744 4745
-f 4724 4744 4681
-f 4725 4743 4744
-f 4747 4748 4749
-f 4351 4750 4352
-f 4190 4352 4751
-f 4751 4197 4190
-f 4750 4751 4352
-f 4750 4749 4751
-f 4749 4748 4751
-f 4351 4752 4753
-f 4753 4750 4351
-f 4353 4752 4351
-f 4750 4753 4754
-f 4755 4754 4753
-f 4756 4757 4754
-f 4747 4757 4756
-f 4754 4749 4750
-f 4754 4757 4749
-f 4749 4757 4747
-f 4753 4758 4755
-f 4755 4758 4759
-f 4353 4361 4760
-f 4760 4752 4353
-f 4752 4760 4758
-f 4758 4753 4752
-f 4362 4761 4760
-f 4761 4362 4402
-f 4402 4762 4761
-f 4760 4361 4362
-f 4763 4759 4764
-f 4761 4759 4758
-f 4759 4761 4762
-f 4762 4764 4759
-f 4758 4760 4761
-f 4756 4755 4763
-f 4756 4765 4747
-f 4765 4756 4766
-f 4766 4767 4765
-f 4754 4755 4756
-f 4759 4763 4755
-f 4766 4763 4768
-f 4767 4766 4769
-f 4770 4767 4771
-f 4763 4766 4756
-f 4764 4768 4763
-f 4197 4751 4772
-f 4772 4198 4197
-f 4751 4748 4773
-f 4773 4772 4751
-f 4774 4775 4747
-f 4748 4747 4775
-f 4775 4773 4748
-f 4773 4776 4777
-f 4776 4773 4775
-f 4775 4778 4776
-f 4779 4778 4775
-f 4777 4772 4773
-f 4198 4772 4777
-f 4777 4201 4198
-f 4765 4767 4780
-f 4780 4774 4765
-f 4747 4765 4774
-f 4770 4781 4780
-f 4770 4780 4767
-f 4775 4774 4779
-f 4782 4783 4780
-f 4774 4780 4783
-f 4783 4779 4774
-f 4784 4785 4780
-f 4785 4784 4786
-f 4780 4781 4784
-f 4787 4785 4788
-f 4788 4785 4786
-f 4780 4785 4782
-f 4785 4787 4789
-f 4789 4782 4785
-f 4790 4791 4792
-f 4408 4792 4791
-f 4791 4405 4408
-f 4303 4300 4791
-f 4405 4791 4300
-f 4300 4277 4405
-f 4793 4792 4794
-f 4795 4793 4796
-f 4794 4796 4793
-f 4797 4796 4798
-f 4799 4798 4796
-f 4800 4790 4793
-f 4792 4793 4790
-f 4792 4408 4472
-f 4799 4473 4474
-f 4474 4801 4799
-f 3831 4801 4474
-f 4474 3836 3831
-f 4794 4472 4473
-f 4473 4799 4794
-f 4798 4799 4801
-f 4796 4794 4799
-f 4801 3831 3838
-f 4472 4794 4792
-f 4791 4790 4303
-f 4306 4305 4800
-f 4790 4800 4305
-f 4305 4303 4790
-f 4802 4795 4797
-f 4796 4797 4795
-f 4803 4797 4804
-f 4805 4800 4795
-f 4793 4795 4800
-f 4762 4402 4418
-f 4418 4806 4762
-f 4764 4762 4806
-f 4806 4807 4764
-f 4806 4418 4403
-f 4403 4808 4806
-f 4807 4806 4808
-f 4808 4809 4807
-f 4809 4808 4275
-f 4275 4301 4809
-f 4808 4403 4276
-f 4276 4275 4808
-f 4810 4811 4769
-f 4768 4764 4807
-f 4807 4810 4768
-f 4810 4807 4809
-f 4769 4768 4810
-f 4811 4810 4812
-f 4809 4812 4810
-f 4301 4302 4812
-f 4812 4809 4301
-f 4798 4804 4797
-f 4801 4813 4798
-f 4813 3838 3819
-f 4804 4798 4813
-f 4813 4814 4804
-f 3838 4813 4801
-f 3819 4814 4813
-f 4815 4804 4814
-f 4814 4816 4815
-f 3822 4816 4814
-f 4814 3819 3822
-f 4797 4803 4802
-f 4804 4815 4803
-f 4795 4802 4805
-f 4817 4306 4818
-f 4818 4819 4817
-f 4818 4306 4805
-f 4800 4805 4306
-f 4820 4818 4805
-f 4805 4802 4821
-f 4821 4822 4805
-f 4818 4820 4823
-f 4815 4824 4825
-f 4803 4825 4821
-f 4821 4802 4803
-f 4805 4822 4820
-f 4825 4803 4815
-f 4477 4826 4475
-f 3822 3845 4475
-f 4477 4481 4826
-f 4475 4816 3822
-f 4824 4826 4827
-f 4824 4815 4816
-f 4826 4824 4475
-f 4816 4475 4824
-f 4821 4828 4829
-f 4830 4831 4820
-f 4821 4830 4822
-f 4831 4830 4829
-f 4829 4828 4831
-f 4820 4822 4830
-f 4829 4830 4821
-f 4827 4825 4824
-f 4832 4831 4828
-f 4823 4820 4831
-f 4833 4828 4821
-f 4821 4825 4833
-f 4827 4833 4825
-f 4826 4834 4827
-f 4828 4833 4832
-f 4831 4832 4823
-f 4835 4836 4837
-f 4837 4836 4838
-f 4838 4489 4837
-f 4479 4839 4481
-f 4481 4480 4479
-f 4834 4826 4481
-f 4489 4838 4839
-f 4839 4479 4489
-f 4818 4840 4841
-f 4842 4843 4844
-f 4843 4842 4845
-f 4839 4845 4842
-f 4823 4840 4818
-f 4845 4839 4838
-f 4817 4846 4308
-f 4819 4841 4846
-f 4834 4844 4833
-f 4833 4827 4834
-f 4844 4834 4842
-f 4481 4842 4834
-f 4842 4481 4839
-f 4781 4770 4847
-f 4768 4769 4766
-f 4771 4847 4770
-f 4769 4771 4767
-f 4771 4769 4811
-f 4811 4848 4771
-f 4847 4771 4848
-f 4848 4849 4850
-f 4849 4851 4850
-f 4851 4852 4850
-f 4852 4851 4309
-f 4309 4311 4852
-f 4311 4312 4852
-f 4312 4316 4852
-f 4853 4812 4302
-f 4853 4849 4848
-f 4853 4854 4848
-f 4302 4307 4853
-f 4849 4853 4307
-f 4812 4853 4811
-f 4848 4811 4853
-f 4307 4313 4849
-f 4313 4310 4849
-f 4851 4849 4310
-f 4310 4309 4851
-f 4855 4856 4857
-f 4857 4858 4855
-f 4859 4855 4858
-f 4858 4857 4860
-f 4861 4858 4862
-f 4863 4864 4865
-f 4856 4863 4865
-f 4865 4857 4856
-f 4866 4867 4850
-f 4848 4850 4847
-f 4868 4866 4864
-f 4850 4864 4866
-f 4867 4847 4850
-f 4850 4848 4854
-f 4869 4870 4864
-f 4869 4850 4852
-f 4870 4865 4864
-f 4864 4850 4869
-f 4491 4837 4490
-f 4837 4491 4835
-f 4555 4491 4486
-f 4490 4837 4489
-f 4483 4489 4479
-f 4871 4555 4553
-f 4860 4872 4555
-f 4553 4554 4871
-f 4872 4835 4491
-f 4555 4871 4860
-f 4491 4555 4872
-f 4554 4556 4873
-f 4558 4873 4556
-f 4862 4860 4871
-f 4873 4871 4554
-f 4871 4873 4862
-f 4874 4862 4873
-f 4873 4558 4874
-f 4865 4870 4835
-f 4857 4865 4872
-f 4860 4862 4858
-f 4862 4874 4861
-f 4835 4872 4865
-f 4872 4860 4857
-f 4869 4852 4316
-f 4875 4316 4876
-f 4870 4869 4836
-f 4316 4875 4869
-f 4875 4838 4836
-f 4836 4835 4870
-f 4838 4875 4845
-f 4836 4869 4875
-f 4845 4876 4843
-f 4876 4845 4875
-f 4846 4817 4819
-f 4841 4819 4818
-f 4308 4306 4817
-f 4846 4877 4318
-f 4318 4308 4846
-f 4841 4878 4877
-f 4877 4846 4841
-f 4840 4879 4878
-f 4878 4841 4840
-f 4880 4315 4322
-f 4319 4881 4882
-f 4882 4320 4319
-f 4320 4882 4883
-f 4883 4322 4320
-f 4866 4868 4784
-f 4867 4866 4781
-f 4847 4867 4781
-f 4784 4781 4866
-f 4788 4786 4884
-f 4786 4784 4868
-f 4868 4884 4786
-f 4884 4868 4863
-f 4885 4886 4856
-f 4856 4855 4885
-f 4887 4885 4855
-f 4864 4863 4868
-f 4886 4884 4863
-f 4863 4856 4886
-f 4888 4788 4886
-f 4886 4885 4888
-f 4889 4888 4885
-f 4884 4886 4788
-f 4788 4888 4787
-f 4890 4891 4892
-f 4893 4894 4895
-f 4892 4895 4890
-f 4891 4890 4314
-f 4323 4321 4896
-f 4897 4896 4321
-f 4321 4317 4897
-f 4890 4897 4317
-f 4317 4314 4890
-f 4898 4896 4899
-f 4900 4899 4896
-f 4894 4901 4900
-f 4900 4895 4894
-f 4896 4897 4900
-f 4895 4900 4897
-f 4897 4890 4895
-f 4902 4903 4901
-f 4901 4894 4902
-f 4904 4905 4906
-f 4899 4900 4901
-f 4907 4903 4904
-f 4901 4908 4899
-f 4908 4901 4903
-f 4903 4907 4908
-f 4904 4909 4907
-f 4910 4899 4908
-f 4911 4907 4909
-f 4906 4909 4904
-f 4909 4906 4912
-f 4913 4908 4907
-f 4908 4913 4910
-f 4912 4914 4909
-f 4907 4911 4913
-f 4909 4914 4911
-f 4915 4916 4917
-f 4918 4883 4882
-f 4919 4920 4916
-f 4880 4322 4883
-f 4881 4916 4920
-f 4882 4920 4918
-f 4921 4918 4920
-f 4920 4882 4881
-f 4880 4922 4843
-f 4922 4883 4918
-f 4922 4880 4883
-f 4843 4876 4880
-f 4315 4880 4876
-f 4876 4316 4315
-f 4923 4922 4918
-f 4891 4318 4879
-f 4314 4318 4891
-f 4924 4891 4879
-f 4925 4879 4840
-f 4877 4878 4879
-f 4879 4318 4877
-f 4895 4892 4893
-f 4926 4927 4928
-f 4894 4893 4929
-f 4929 4902 4894
-f 4902 4929 4926
-f 4928 4930 4926
-f 4905 4904 4930
-f 4930 4928 4905
-f 4926 4930 4902
-f 4903 4902 4930
-f 4930 4904 4903
-f 4924 4931 4892
-f 4879 4925 4924
-f 4931 4932 4893
-f 4893 4892 4931
-f 4893 4932 4933
-f 4933 4929 4893
-f 4892 4891 4924
-f 4934 4921 4933
-f 4833 4935 4936
-f 4923 4934 4833
-f 4936 4832 4833
-f 4935 4833 4934
-f 4925 4823 4832
-f 4832 4936 4925
-f 4932 4931 4934
-f 4934 4931 4935
-f 4934 4933 4932
-f 4931 4937 4938
-f 4931 4924 4937
-f 4937 4936 4935
-f 4935 4938 4937
-f 4924 4925 4936
-f 4936 4937 4924
-f 4931 4938 4935
-f 4922 4923 4844
-f 4844 4843 4922
-f 4934 4923 4921
-f 4840 4823 4925
-f 4833 4844 4923
-f 4923 4918 4921
-f 4939 4915 4940
-f 4920 4919 4921
-f 4933 4921 4919
-f 4940 4941 4939
-f 4942 4919 4915
-f 4916 4915 4919
-f 4912 4906 4943
-f 4905 4943 4906
-f 4942 4926 4929
-f 4944 4943 4928
-f 4905 4928 4943
-f 4943 4927 4926
-f 4915 4939 4942
-f 4929 4933 4942
-f 4945 4943 4942
-f 4919 4942 4933
-f 4926 4942 4943
-f 4945 4912 4943
-f 4946 4945 4947
-f 4946 4948 4945
-f 4949 4945 4948
-f 4949 4912 4945
-f 4950 4951 4952
-f 4952 4585 4226
-f 4226 4239 4952
-f 4953 4952 4239
-f 4951 4588 4585
-f 4585 4588 4584
-f 4585 4952 4951
-f 4216 4226 4585
-f 4951 4950 4954
-f 4952 4953 4950
-f 4955 4953 4241
-f 4241 4243 4955
-f 4950 4956 4957
-f 4956 4950 4953
-f 4953 4955 4956
-f 4239 4241 4953
-f 4958 4959 4960
-f 4961 4962 4960
-f 4960 4959 4961
-f 4957 4954 4950
-f 4963 4964 4954
-f 4965 4954 4964
-f 4954 4957 4963
-f 4966 4964 4967
-f 4968 4967 4964
-f 4964 4963 4968
-f 4588 4951 4965
-f 4965 4586 4588
-f 4966 4587 4586
-f 4586 4965 4966
-f 4964 4966 4965
-f 4587 4966 4969
-f 4954 4965 4951
-f 4970 4971 4972
-f 4591 4972 4971
-f 4971 4595 4591
-f 4972 4973 4970
-f 4589 4972 4591
-f 4962 4972 4589
-f 4699 4974 4337
-f 4698 4975 4974
-f 4974 4699 4698
-f 4595 4971 4975
-f 4975 4698 4595
-f 4975 4976 4977
-f 4977 4974 4975
-f 4971 4970 4976
-f 4976 4975 4971
-f 4978 4977 4976
-f 4979 4976 4980
-f 4974 4977 4338
-f 4981 4982 4983
-f 4984 4982 4707
-f 4980 4985 4986
-f 4986 4983 4982
-f 4982 4984 4986
-f 4979 4986 4984
-f 4986 4979 4980
-f 4976 4979 4978
-f 4338 4337 4974
-f 4338 4987 4988
-f 4977 4978 4987
-f 4987 4338 4977
-f 4707 4690 4984
-f 4982 4981 4705
-f 4705 4707 4982
-f 4981 4989 4706
-f 4706 4705 4981
-f 4706 4558 4557
-f 4989 4874 4558
-f 4558 4706 4989
-f 4689 4688 4978
-f 4978 4979 4689
-f 4984 4689 4979
-f 4689 4984 4690
-f 4858 4861 4859
-f 4990 4859 4861
-f 4861 4991 4990
-f 4992 4983 4993
-f 4993 4990 4992
-f 4991 4992 4990
-f 4991 4861 4874
-f 4874 4989 4991
-f 4983 4992 4981
-f 4992 4991 4989
-f 4989 4981 4992
-f 4976 4980 4994
-f 4336 4995 4996
-f 4338 4997 4995
-f 4336 4338 4977
-f 4995 4336 4338
-f 4994 4977 4976
-f 4977 4994 4336
-f 4996 4334 4336
-f 4998 4962 4961
-f 4998 4961 4999
-f 4999 5000 4998
-f 4961 4959 5001
-f 5001 4999 4961
-f 4962 4998 5002
-f 5000 4999 5003
-f 5003 4985 5000
-f 4985 5003 4986
-f 4983 4986 5003
-f 5003 4993 4983
-f 5004 5000 4985
-f 4985 4980 5004
-f 4993 5003 4999
-f 5005 4970 4973
-f 5004 5005 5006
-f 4970 5005 4980
-f 4980 4976 4970
-f 5005 5004 4980
-f 4973 5006 5005
-f 4973 4962 5006
-f 5002 4998 5000
-f 5002 5006 4962
-f 5000 5004 5002
-f 5006 5002 5004
-f 4855 4859 4887
-f 4859 4990 5007
-f 4319 5008 4881
-f 5008 4324 5009
-f 5008 4319 4324
-f 5007 4887 4859
-f 5001 5007 4990
-f 4990 4993 5001
-f 4999 5001 4993
-f 5007 5001 4959
-f 4887 5007 4958
-f 4959 4958 5007
-f 4958 4960 4889
-f 4885 4887 4889
-f 4958 4889 4887
-f 4328 5010 5011
-f 5011 4327 4328
-f 5009 4324 4327
-f 5010 4334 4996
-f 4327 5011 5009
-f 5010 4328 4334
-f 5012 5009 5011
-f 4917 5009 5012
-f 5008 4917 4916
-f 4916 4881 5008
-f 5012 5011 5010
-f 4917 5008 5009
-f 4787 4888 4889
-f 4889 4960 4787
-f 4325 4323 4898
-f 4789 4787 4960
-f 4960 5013 4789
-f 4896 4898 4323
-f 4910 5014 5015
-f 5015 4898 4910
-f 4899 4910 4898
-f 4898 5015 4325
-f 5014 4910 4913
-f 4949 5016 4914
-f 4914 4912 4949
-f 4911 5017 5018
-f 4913 5018 5014
-f 5018 4913 4911
-f 5017 4911 4914
-f 4914 5016 5017
-f 5019 5020 4331
-f 4331 4329 5019
-f 5015 5019 4329
-f 5014 5021 5019
-f 4329 4325 5015
-f 5019 5015 5014
-f 5017 5022 5023
-f 5023 5018 5017
-f 5022 5017 5016
-f 5018 5023 5021
-f 5021 5014 5018
-f 5024 5023 5022
-f 5025 5026 5027
-f 5028 5029 5026
-f 5010 5030 5012
-f 5030 5010 4996
-f 5030 4996 4995
-f 5031 5030 5032
-f 4332 5027 4330
-f 4946 5033 5034
-f 5034 5033 5035
-f 5034 4948 4946
-f 4948 5034 5016
-f 5016 4949 4948
-f 5016 5034 5022
-f 5035 5022 5034
-f 5036 5037 5024
-f 5023 5024 5037
-f 5037 5021 5023
-f 5038 5020 5037
-f 5021 5037 5020
-f 5020 5019 5021
-f 5022 5035 5024
-f 5039 5024 5035
-f 5035 5040 5039
-f 5040 5035 5033
-f 5033 4946 4947
-f 5033 5041 5040
-f 4947 5041 5033
-f 5042 5012 5030
-f 4940 4917 5012
-f 5043 5042 5030
-f 4940 5012 5042
-f 5031 5044 5045
-f 5045 5043 5031
-f 5042 5043 4940
-f 4917 4940 4915
-f 5030 5031 5043
-f 5046 5045 5044
-f 5045 5046 4939
-f 5043 5045 4941
-f 4941 4940 5043
-f 4942 5046 4945
-f 4942 4939 5046
-f 4939 4941 5045
-f 4988 4997 4338
-f 4688 4987 4978
-f 4337 4297 4699
-f 4997 5047 5032
-f 5032 4995 4997
-f 4997 4988 5048
-f 5048 5047 4997
-f 4995 5032 5030
-f 4987 4688 4737
-f 4737 4988 4987
-f 4740 4742 5049
-f 5049 5050 4740
-f 4740 5050 4739
-f 5048 4739 5050
-f 5050 5049 5048
-f 4988 4737 4739
-f 4739 5048 4988
-f 5047 5048 5049
-f 5051 5032 5047
-f 5052 5051 5053
-f 5047 5053 5051
-f 4298 4299 5054
-f 4299 4339 5055
-f 4969 4589 4587
-f 5054 4729 4298
-f 5056 5055 4339
-f 5055 5054 4299
-f 5057 5058 5054
-f 5058 4730 4729
-f 4729 5054 5058
-f 5054 5055 5057
-f 4730 5058 5059
-f 5060 5061 5062
-f 5063 5064 5065
-f 5061 5060 5066
-f 5066 5067 5068
-f 5062 5065 5060
-f 5069 4734 4715
-f 5070 5059 5058
-f 4714 5059 5071
-f 5071 4715 4714
-f 5072 5071 5059
-f 4715 5071 5069
-f 5059 4714 4730
-f 5059 5070 5072
-f 5070 5062 5061
-f 5061 5072 5070
-f 5063 5057 5055
-f 5055 5056 5063
-f 5058 5057 5070
-f 5062 5070 5057
-f 5057 5063 5062
-f 5053 5049 4742
-f 4742 5073 5053
-f 5049 5053 5047
-f 5053 5073 5052
-f 5074 5073 4742
-f 5066 5075 5061
-f 5072 5061 5075
-f 5075 5068 5076
-f 5068 5075 5066
-f 5076 4746 5077
-f 5076 5078 5075
-f 5075 5078 5072
-f 4735 5077 4746
-f 4735 4734 5069
-f 5069 5077 4735
-f 5077 5069 5078
-f 5078 5069 5071
-f 5078 5076 5077
-f 5071 5072 5078
-f 5076 5068 4746
-f 4745 5066 5060
-f 4746 5067 5066
-f 5067 4746 5068
-f 5060 5074 4745
-f 5066 4745 4746
-f 4743 4746 4745
-f 5074 4742 4681
-f 5079 5073 5074
-f 4681 4745 5074
-f 4973 4972 4962
-f 4960 4962 4969
-f 4589 4969 4962
-f 4339 4341 5056
-f 4967 4969 4966
-f 5013 4960 4967
-f 4333 4331 5020
-f 4967 4968 5013
-f 4969 4967 4960
-f 5080 5028 5038
-f 5037 5036 5038
-f 5020 5038 4333
-f 5028 5025 4332
-f 4332 4333 5028
-f 5028 4333 5038
-f 5026 5025 5028
-f 5027 4332 5025
-f 5024 5039 5036
-f 5052 5081 5044
-f 5051 5052 5044
-f 5032 5051 5031
-f 5082 5083 5084
-f 5085 5052 5083
-f 5044 5031 5051
-f 5081 5039 5040
-f 5038 5036 5086
-f 5086 5036 5039
-f 5087 5040 5041
-f 5046 5041 4947
-f 5039 5081 5086
-f 5038 5088 5080
-f 5041 5046 5087
-f 5040 5087 5081
-f 4947 4945 5046
-f 5086 5088 5038
-f 5052 5085 5086
-f 5083 5082 5085
-f 5052 5086 5081
-f 5084 5080 5082
-f 5044 5087 5046
-f 5044 5081 5087
-f 5089 5088 5086
-f 5080 5088 5089
-f 5090 5085 5082
-f 5082 5089 5090
-f 5089 5082 5080
-f 5086 5090 5089
-f 5085 5090 5086
-f 5091 5056 4341
-f 5064 5063 5056
-f 5065 5062 5063
-f 5056 5091 5064
-f 5091 4340 5092
-f 4341 4340 5091
-f 5092 4340 5093
-f 5093 5094 5092
-f 5095 5091 5092
-f 5065 5079 5074
-f 5074 5060 5065
-f 5065 5064 5096
-f 5092 5097 5095
-f 5064 5091 5095
-f 5095 5096 5064
-f 5096 5079 5065
-f 5052 5098 5099
-f 5097 5084 5083
-f 5083 5099 5097
-f 5099 5083 5052
-f 5096 5098 5052
-f 5079 5052 5073
-f 5052 5079 5096
-f 5095 5097 5099
-f 5096 5100 5098
-f 5099 5101 5095
-f 5101 5099 5098
-f 5096 5095 5101
-f 5098 5100 5101
-f 5096 5101 5100
-f 5093 5027 5026
-f 5027 5093 4340
-f 5029 5092 5094
-f 5097 5092 5029
-f 5094 5026 5029
-f 4340 4330 5027
-f 5084 5029 5028
-f 5026 5094 5093
-f 5028 5080 5084
-f 5029 5084 5097
diff --git a/dep/recastnavigation/RecastDemo/Bin/Meshes/nav_test.obj b/dep/recastnavigation/RecastDemo/Bin/Meshes/nav_test.obj
deleted file mode 100644
index 1d4c595cd82..00000000000
--- a/dep/recastnavigation/RecastDemo/Bin/Meshes/nav_test.obj
+++ /dev/null
@@ -1,3506 +0,0 @@
-mtllib nav_test.mtl
-o nav_test.obj
-v -21.847065 -2.492895 19.569759
-v -15.847676 -2.492895 18.838863
-v -21.847065 -0.895197 19.569759
-v -15.847676 -0.895197 18.838863
-v -21.585381 -2.492895 21.717730
-v -15.585992 -2.492895 20.986834
-v -21.585381 -0.895197 21.717730
-v -15.585992 -0.895197 20.986834
-v -22.078766 -1.169756 17.667891
-v -16.079414 -1.169756 16.936998
-v -22.078766 0.427928 17.667891
-v -16.079414 0.427928 16.936998
-v -21.817081 -1.169756 19.815861
-v -15.817731 -1.169756 19.084969
-v -21.817081 0.427928 19.815861
-v -15.817731 0.427928 19.084969
-v -22.310509 0.142680 15.765698
-v -16.311157 0.142680 15.034807
-v -22.310509 1.740365 15.765698
-v -16.311157 1.740365 15.034807
-v -22.048828 0.142680 17.913649
-v -16.049477 0.142680 17.182758
-v -22.048828 1.740365 17.913649
-v -16.049477 1.740365 17.182758
-v -22.541557 1.588395 13.869190
-v -16.542206 1.588395 13.138299
-v -22.541557 3.186100 13.869190
-v -16.542206 3.186100 13.138299
-v -22.279873 1.588395 16.017160
-v -16.280521 1.588395 15.286268
-v -22.279873 3.186100 16.017160
-v -16.280521 3.186100 15.286268
-v -22.775589 2.892463 11.948195
-v -16.776237 2.892463 11.217304
-v -22.775589 4.490149 11.948195
-v -16.776237 4.490149 11.217304
-v -22.513905 2.892463 14.096166
-v -16.514553 2.892463 13.365274
-v -22.513905 4.490149 14.096166
-v -16.514553 4.490149 13.365274
-v -23.008904 4.280072 10.033092
-v -17.009552 4.280072 9.302201
-v -23.008904 5.877757 10.033092
-v -17.009552 5.877757 9.302201
-v -22.747219 4.280072 12.181063
-v -16.747868 4.280072 11.450171
-v -22.747219 5.877757 12.181063
-v -16.747868 5.877757 11.450171
-v -23.234169 5.535265 8.184037
-v -17.234818 5.535265 7.453146
-v -23.234169 7.132950 8.184037
-v -17.234818 7.132950 7.453146
-v -22.972485 5.535265 10.332007
-v -16.973133 5.535265 9.601116
-v -22.972485 7.132950 10.332007
-v -16.973133 7.132950 9.601116
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vn -0.642934 -0.577350 -0.503292
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503292
-vn 0.503291 0.577350 -0.642934
-vn -0.503292 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503292
-vn -0.503292 0.577350 0.642934
-vn 0.642934 0.577350 0.503292
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 4/1/4 2/2/2 1/3/1 3/4/3 
-f 6/5/6 8/6/8 7/7/7 5/8/5 
-f 6/5/6 5/8/5 1/3/1 2/2/2 
-f 8/6/8 6/5/6 2/2/2 4/1/4 
-f 7/7/7 8/6/8 4/1/4 3/4/3 
-f 5/8/5 7/7/7 3/4/3 1/3/1 
-f 12/9/12 10/10/10 9/11/9 11/12/11 
-f 14/13/14 16/14/16 15/15/15 13/16/13 
-f 14/13/14 13/16/13 9/11/9 10/10/10 
-f 16/14/16 14/13/14 10/10/10 12/9/12 
-f 15/15/15 16/14/16 12/9/12 11/12/11 
-f 13/16/13 15/15/15 11/12/11 9/11/9 
-f 20/17/20 18/18/18 17/19/17 19/20/19 
-f 22/21/22 24/22/24 23/23/23 21/24/21 
-f 22/21/22 21/24/21 17/19/17 18/18/18 
-f 24/22/24 22/21/22 18/18/18 20/17/20 
-f 23/23/23 24/22/24 20/17/20 19/20/19 
-f 21/24/21 23/23/23 19/20/19 17/19/17 
-f 28/25/28 26/26/26 25/27/25 27/28/27 
-f 30/29/30 32/30/32 31/31/31 29/32/29 
-f 30/29/30 29/32/29 25/27/25 26/26/26 
-f 32/30/32 30/29/30 26/26/26 28/25/28 
-f 31/31/31 32/30/32 28/25/28 27/28/27 
-f 29/32/29 31/31/31 27/28/27 25/27/25 
-f 36/33/36 34/34/34 33/35/33 35/36/35 
-f 38/37/38 40/38/40 39/39/39 37/40/37 
-f 38/37/38 37/40/37 33/35/33 34/34/34 
-f 40/38/40 38/37/38 34/34/34 36/33/36 
-f 39/39/39 40/38/40 36/33/36 35/36/35 
-f 37/40/37 39/39/39 35/36/35 33/35/33 
-f 44/41/44 42/42/42 41/43/41 43/44/43 
-f 46/45/46 48/46/48 47/47/47 45/48/45 
-f 46/45/46 45/48/45 41/43/41 42/42/42 
-f 48/46/48 46/45/46 42/42/42 44/41/44 
-f 47/47/47 48/46/48 44/41/44 43/44/43 
-f 45/48/45 47/47/47 43/44/43 41/43/41 
-f 52/49/52 50/50/50 49/51/49 51/52/51 
-f 54/53/54 56/54/56 55/55/55 53/56/53 
-f 54/53/54 53/56/53 49/51/49 50/50/50 
-f 56/54/56 54/53/54 50/50/50 52/49/52 
-f 55/55/55 56/54/56 52/49/52 51/52/51 
-f 53/56/53 55/55/55 51/52/51 49/51/49 
-v -28.889317 -3.557970 -20.236633
-v 21.065487 -3.557970 -26.322546
-v -28.889317 -2.370904 -20.236633
-v 21.065487 -2.370904 -26.322546
-v -22.640766 -3.557970 31.053141
-v 27.314037 -3.557970 24.967228
-v -22.640766 -2.370904 31.053141
-v 27.314037 -2.370904 24.967228
-v -11.345862 -3.554139 -0.603272
-v -1.840215 -3.554139 -1.761330
-v -2.998272 -3.554139 -11.266972
-v -12.503919 -3.554139 -10.108913
-v -11.345862 -2.367074 -0.603272
-v -1.840215 -2.367074 -1.761330
-v -2.998272 -2.367074 -11.266972
-v -12.503919 -2.367074 -10.108913
-v 14.880527 -2.365568 6.393913
-v 16.038584 -2.365752 15.899554
-v 6.532944 -2.365750 17.057611
-v 5.374887 -2.364530 7.551970
-v 6.532944 -3.552818 17.057611
-v 16.038584 -3.552819 15.899554
-v 14.880527 -3.552633 6.393913
-v 5.374887 -3.551598 7.551970
-v 1.032586 -2.363936 21.819389
-v -8.473061 -2.364388 22.977446
-v -9.631113 -2.364505 13.471843
-v -9.631113 -3.550801 13.471843
-v -8.473061 -3.551456 22.977446
-v 1.032586 -3.551004 21.819389
-v -0.125466 -2.361971 12.313786
-v -0.125466 -3.549039 12.313786
-vn -0.262337 -0.942870 -0.205369
-vn 0.205367 -0.942875 -0.262320
-vn -0.262635 0.942746 -0.205554
-vn 0.205639 0.942742 -0.262583
-vn -0.355815 -0.816687 0.454332
-vn 0.335634 -0.904611 0.262733
-vn -0.355909 0.816255 0.455034
-vn 0.335918 0.904340 0.263302
-vn 0.262962 -0.904544 -0.335637
-vn -0.335745 -0.904605 -0.262612
-vn -0.355807 -0.816428 0.454804
-vn 0.454699 -0.816419 0.355963
-vn 0.262672 0.904546 -0.335856
-vn -0.335747 0.904495 -0.262988
-vn -0.355864 0.816560 0.454522
-vn 0.454548 0.816575 0.355798
-vn -0.355652 0.816607 0.454604
-vn -0.454443 0.816647 -0.355766
-vn 0.356082 0.816529 -0.454407
-vn 0.262653 0.942785 0.205353
-vn 0.355755 -0.816589 -0.454555
-vn -0.454803 -0.816488 -0.355671
-vn -0.356080 -0.816394 0.454651
-vn 0.262333 -0.942818 0.205610
-vn -0.335659 0.904720 -0.262326
-vn 0.355853 0.816737 -0.454212
-vn 0.335572 0.904622 0.262774
-vn 0.335908 -0.904451 0.262933
-vn 0.355947 -0.816306 -0.454914
-vn -0.335871 -0.904446 -0.262999
-vn -0.262777 0.904593 0.335648
-vn -0.262932 -0.904466 0.335869
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 60/57/60 58/58/58 57/59/57 59/60/59 
-f 62/61/62 64/62/64 63/63/63 61/64/61 
-f 64/62/64 62/61/62 58/58/58 60/57/60 
-f 61/64/61 63/63/63 59/60/59 57/59/57 
-f 67/65/67 71/66/71 72/67/72 68/68/68 
-f 70/69/70 66/70/66 65/71/65 69/72/69 
-f 66/70/66 70/69/70 71/66/71 67/65/67 
-f 69/72/69 65/71/65 68/68/68 72/67/72 
-f 79/73/79 73/74/73 76/75/76 80/76/80 
-f 74/77/74 78/78/78 77/79/77 75/80/75 
-f 78/78/78 74/77/74 73/74/73 79/73/79 
-f 75/80/75 77/79/77 80/76/80 76/75/76 
-f 88/81/88 87/82/87 83/83/83 84/84/84 
-f 81/85/81 86/86/86 85/87/85 82/88/82 
-f 86/86/86 81/85/81 87/82/87 88/81/88 
-f 82/88/82 85/87/85 84/84/84 83/83/83 
-f 60/57/60 73/74/73 74/77/74 64/62/64 
-f 64/62/64 74/77/74 75/80/75 81/85/81 
-f 64/62/64 81/85/81 82/88/82 63/63/63 
-f 81/85/81 75/80/75 76/75/76 87/82/87 
-f 63/63/63 82/88/82 83/83/83 59/60/59 
-f 83/83/83 69/72/69 59/60/59 
-f 72/67/72 59/60/59 69/72/69 
-f 59/60/59 72/67/72 71/66/71 60/57/60 
-f 69/72/69 83/83/83 87/82/87 70/69/70 
-f 87/82/87 76/75/76 70/69/70 
-f 73/74/73 60/57/60 76/75/76 
-f 60/57/60 71/66/71 70/69/70 76/75/76 
-f 58/58/58 67/65/67 68/68/68 57/59/57 
-f 58/58/58 80/76/80 66/70/66 67/65/67 
-f 79/73/79 80/76/80 58/58/58 
-f 58/58/58 62/61/62 78/78/78 79/73/79 
-f 86/86/86 77/79/77 78/78/78 62/61/62 
-f 61/64/61 85/87/85 86/86/86 62/61/62 
-f 77/79/77 86/86/86 88/81/88 80/76/80 
-f 88/81/88 84/84/84 65/71/65 66/70/66 
-f 88/81/88 66/70/66 80/76/80 
-f 65/71/65 57/59/57 68/68/68 
-f 85/87/85 61/64/61 57/59/57 84/84/84 
-f 84/84/84 57/59/57 65/71/65 
-v -14.690150 -2.438636 -3.546326
-v -10.279407 -2.438636 0.585510
-v -14.690150 -0.840940 -3.546326
-v -10.279407 -0.840940 0.585510
-v -16.169479 -2.438636 -1.967133
-v -11.758737 -2.438636 2.164704
-v -16.169479 -0.840940 -1.967133
-v -11.758737 -0.840940 2.164704
-v -13.380321 -1.115499 -4.944578
-v -8.969601 -1.115499 -0.812760
-v -13.380321 0.482185 -4.944578
-v -8.969601 0.482185 -0.812760
-v -14.859653 -1.115499 -3.365405
-v -10.448930 -1.115499 0.766433
-v -14.859653 0.482185 -3.365405
-v -10.448930 0.482185 0.766433
-v -12.070254 0.196937 -6.343090
-v -7.659532 0.196937 -2.211254
-v -12.070254 1.794623 -6.343090
-v -7.659532 1.794623 -2.211254
-v -13.549586 0.196937 -4.763898
-v -9.138861 0.196937 -0.632061
-v -13.549586 1.794623 -4.763898
-v -9.138861 1.794623 -0.632061
-v -10.764113 1.642653 -7.737381
-v -6.353393 1.642653 -3.605563
-v -10.764113 3.240357 -7.737381
-v -6.353393 3.240357 -3.605563
-v -12.243443 1.642653 -6.158208
-v -7.832721 1.642653 -2.026372
-v -12.243443 3.240357 -6.158208
-v -7.832721 3.240357 -2.026372
-v -9.441105 2.946721 -9.149704
-v -5.030383 2.946721 -5.017866
-v -9.441105 4.544406 -9.149704
-v -5.030383 4.544406 -5.017866
-v -10.920434 2.946721 -7.570510
-v -6.509713 2.946721 -3.438693
-v -10.920434 4.544406 -7.570510
-v -6.509713 4.544406 -3.438693
-v -8.122141 4.334330 -10.557693
-v -3.711419 4.334330 -6.425856
-v -8.122141 5.932015 -10.557693
-v -3.711419 5.932015 -6.425856
-v -9.601472 4.334330 -8.978500
-v -5.190750 4.334330 -4.846683
-v -9.601472 5.932015 -8.978500
-v -5.190750 5.932015 -4.846683
-v -6.848679 5.589522 -11.917114
-v -2.437950 5.589522 -7.785277
-v -6.848679 7.187207 -11.917114
-v -2.437950 7.187207 -7.785277
-v -8.328009 5.589522 -10.337922
-v -3.917289 5.589522 -6.206105
-v -8.328009 7.187207 -10.337922
-v -3.917289 7.187207 -6.206105
-vn -0.026644 -0.577351 -0.816061
-vn 0.816062 -0.577350 -0.026645
-vn -0.026644 0.577351 -0.816061
-vn 0.816062 0.577350 -0.026645
-vn -0.816062 -0.577350 0.026644
-vn 0.026644 -0.577351 0.816061
-vn -0.816062 0.577350 0.026644
-vn 0.026644 0.577351 0.816061
-vn -0.026641 -0.577349 -0.816063
-vn 0.816062 -0.577350 -0.026644
-vn -0.026641 0.577349 -0.816063
-vn 0.816062 0.577350 -0.026644
-vn -0.816061 -0.577351 0.026640
-vn 0.026643 -0.577351 0.816061
-vn -0.816061 0.577351 0.026640
-vn 0.026643 0.577351 0.816061
-vn -0.026643 -0.577351 -0.816061
-vn 0.816062 -0.577349 -0.026644
-vn -0.026643 0.577351 -0.816061
-vn 0.816062 0.577349 -0.026644
-vn -0.816062 -0.577350 0.026643
-vn 0.026644 -0.577351 0.816061
-vn -0.816062 0.577350 0.026643
-vn 0.026644 0.577351 0.816061
-vn -0.026642 -0.577349 -0.816062
-vn 0.816062 -0.577350 -0.026644
-vn -0.026642 0.577349 -0.816062
-vn 0.816062 0.577350 -0.026644
-vn -0.816062 -0.577351 0.026641
-vn 0.026643 -0.577351 0.816061
-vn -0.816062 0.577351 0.026641
-vn 0.026643 0.577351 0.816061
-vn -0.026643 -0.577351 -0.816061
-vn 0.816062 -0.577351 -0.026641
-vn -0.026643 0.577351 -0.816061
-vn 0.816062 0.577351 -0.026641
-vn -0.816062 -0.577350 0.026645
-vn 0.026642 -0.577349 0.816062
-vn -0.816062 0.577350 0.026645
-vn 0.026642 0.577349 0.816062
-vn -0.026643 -0.577351 -0.816061
-vn 0.816062 -0.577351 -0.026641
-vn -0.026643 0.577351 -0.816061
-vn 0.816062 0.577351 -0.026641
-vn -0.816062 -0.577350 0.026644
-vn 0.026642 -0.577349 0.816063
-vn -0.816062 0.577350 0.026644
-vn 0.026642 0.577349 0.816063
-vn -0.026644 -0.577351 -0.816061
-vn 0.816061 -0.577352 -0.026640
-vn -0.026644 0.577351 -0.816061
-vn 0.816061 0.577352 -0.026640
-vn -0.816062 -0.577350 0.026644
-vn 0.026640 -0.577349 0.816063
-vn -0.816062 0.577350 0.026644
-vn 0.026640 0.577349 0.816063
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 92/89/92 90/90/90 89/91/89 91/92/91 
-f 94/93/94 96/94/96 95/95/95 93/96/93 
-f 94/93/94 93/96/93 89/91/89 90/90/90 
-f 96/94/96 94/93/94 90/90/90 92/89/92 
-f 95/95/95 96/94/96 92/89/92 91/92/91 
-f 93/96/93 95/95/95 91/92/91 89/91/89 
-f 100/97/100 98/98/98 97/99/97 99/100/99 
-f 102/101/102 104/102/104 103/103/103 101/104/101 
-f 102/101/102 101/104/101 97/99/97 98/98/98 
-f 104/102/104 102/101/102 98/98/98 100/97/100 
-f 103/103/103 104/102/104 100/97/100 99/100/99 
-f 101/104/101 103/103/103 99/100/99 97/99/97 
-f 108/105/108 106/106/106 105/107/105 107/108/107 
-f 110/109/110 112/110/112 111/111/111 109/112/109 
-f 110/109/110 109/112/109 105/107/105 106/106/106 
-f 112/110/112 110/109/110 106/106/106 108/105/108 
-f 111/111/111 112/110/112 108/105/108 107/108/107 
-f 109/112/109 111/111/111 107/108/107 105/107/105 
-f 116/113/116 114/114/114 113/115/113 115/116/115 
-f 118/117/118 120/118/120 119/119/119 117/120/117 
-f 118/117/118 117/120/117 113/115/113 114/114/114 
-f 120/118/120 118/117/118 114/114/114 116/113/116 
-f 119/119/119 120/118/120 116/113/116 115/116/115 
-f 117/120/117 119/119/119 115/116/115 113/115/113 
-f 124/121/124 122/122/122 121/123/121 123/124/123 
-f 126/125/126 128/126/128 127/127/127 125/128/125 
-f 126/125/126 125/128/125 121/123/121 122/122/122 
-f 128/126/128 126/125/126 122/122/122 124/121/124 
-f 127/127/127 128/126/128 124/121/124 123/124/123 
-f 125/128/125 127/127/127 123/124/123 121/123/121 
-f 132/129/132 130/130/130 129/131/129 131/132/131 
-f 134/133/134 136/134/136 135/135/135 133/136/133 
-f 134/133/134 133/136/133 129/131/129 130/130/130 
-f 136/134/136 134/133/134 130/130/130 132/129/132 
-f 135/135/135 136/134/136 132/129/132 131/132/131 
-f 133/136/133 135/135/135 131/132/131 129/131/129 
-f 140/137/140 138/138/138 137/139/137 139/140/139 
-f 142/141/142 144/142/144 143/143/143 141/144/141 
-f 142/141/142 141/144/141 137/139/137 138/138/138 
-f 144/142/144 142/141/142 138/138/138 140/137/140 
-f 143/143/143 144/142/144 140/137/140 139/140/139 
-f 141/144/141 143/143/143 139/140/139 137/139/137 
-v -3.133902 -2.799647 -1.494773
-v 1.464393 -2.799647 -2.054976
-v -3.133902 10.274025 -1.494773
-v 1.464393 10.274025 -2.054976
-v -2.673638 -2.799647 2.283187
-v 1.924656 -2.799647 1.722984
-v -2.673638 10.274025 2.283187
-v 1.924656 10.274025 1.722984
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 148/145/148 146/146/146 145/147/145 147/148/147 
-f 150/149/150 152/150/152 151/151/151 149/152/149 
-f 150/149/150 149/152/149 145/147/145 146/146/146 
-f 152/150/152 150/149/150 146/146/146 148/145/148 
-f 151/151/151 152/150/152 148/145/148 147/148/147 
-f 149/152/149 151/151/151 147/148/147 145/147/145 
-v 7.996987 -2.799647 3.106367
-v 10.805010 -2.799647 2.764270
-v 7.996987 10.274025 3.106367
-v 10.805010 10.274025 2.764270
-v 8.308006 -2.799647 5.659298
-v 11.116030 -2.799647 5.317201
-v 8.308006 10.274025 5.659298
-v 11.116030 10.274025 5.317201
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 156/153/156 154/154/154 153/155/153 155/156/155 
-f 158/157/158 160/158/160 159/159/159 157/160/157 
-f 158/157/158 157/160/157 153/155/153 154/154/154 
-f 160/158/160 158/157/158 154/154/154 156/153/156 
-f 159/159/159 160/158/160 156/153/156 155/156/155 
-f 157/160/157 159/159/159 155/156/155 153/155/153 
-v -10.347970 -2.799647 6.769098
-v -7.539968 -2.799647 6.427003
-v -10.347970 10.274025 6.769098
-v -7.539968 10.274025 6.427003
-v -10.036951 -2.799647 9.322028
-v -7.228948 -2.799647 8.979934
-v -10.036951 10.274025 9.322028
-v -7.228948 10.274025 8.979934
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 164/161/164 162/162/162 161/163/161 163/164/163 
-f 166/165/166 168/166/168 167/167/167 165/168/165 
-f 166/165/166 165/168/165 161/163/161 162/162/162 
-f 168/166/168 166/165/166 162/162/162 164/161/164 
-f 167/167/167 168/166/168 164/161/164 163/164/163 
-f 165/168/165 167/167/167 163/164/163 161/163/161 
-v 7.004179 -2.799647 -5.042874
-v 9.812201 -2.799647 -5.384971
-v 7.004179 10.274025 -5.042874
-v 9.812201 10.274025 -5.384971
-v 7.315200 -2.799647 -2.489926
-v 10.123222 -2.799647 -2.832022
-v 7.315200 10.274025 -2.489926
-v 10.123222 10.274025 -2.832022
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503292 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503292 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 172/169/172 170/170/170 169/171/169 171/172/171 
-f 174/173/174 176/174/176 175/175/175 173/176/173 
-f 174/173/174 173/176/173 169/171/169 170/170/170 
-f 176/174/176 174/173/174 170/170/170 172/169/172 
-f 175/175/175 176/174/176 172/169/172 171/172/171 
-f 173/176/173 175/175/175 171/172/171 169/171/169 
-v 5.762568 -2.799647 -15.234345
-v 8.570591 -2.799647 -15.576443
-v 5.762568 10.274025 -15.234345
-v 8.570591 10.274025 -15.576443
-v 6.073587 -2.799647 -12.681417
-v 8.881610 -2.799647 -13.023514
-v 6.073587 10.274025 -12.681417
-v 8.881610 10.274025 -13.023514
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503292
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503292
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 180/177/180 178/178/178 177/179/177 179/180/179 
-f 182/181/182 184/182/184 183/183/183 181/184/181 
-f 182/181/182 181/184/181 177/179/177 178/178/178 
-f 184/182/184 182/181/182 178/178/178 180/177/180 
-f 183/183/183 184/182/184 180/177/180 179/180/179 
-f 181/184/181 183/183/183 179/180/179 177/179/177 
-v 14.876493 -2.799647 -3.645519
-v 17.684513 -2.799647 -3.987616
-v 14.876493 10.274025 -3.645519
-v 17.684513 10.274025 -3.987616
-v 15.187513 -2.799647 -1.092582
-v 17.995535 -2.799647 -1.434679
-v 15.187513 10.274025 -1.092582
-v 17.995535 10.274025 -1.434679
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642935
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642935
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 188/185/188 186/186/186 185/187/185 187/188/187 
-f 190/189/190 192/190/192 191/191/191 189/192/189 
-f 190/189/190 189/192/189 185/187/185 186/186/186 
-f 192/190/192 190/189/190 186/186/186 188/185/188 
-f 191/191/191 192/190/192 188/185/188 187/188/187 
-f 189/192/189 191/191/191 187/188/187 185/187/185 
-v 12.915435 -2.799647 -13.547013
-v 15.723457 -2.799647 -13.889110
-v 12.915435 10.274025 -13.547013
-v 15.723457 10.274025 -13.889110
-v 13.226457 -2.799647 -10.994064
-v 16.034479 -2.799647 -11.336161
-v 13.226457 10.274025 -10.994064
-v 16.034479 10.274025 -11.336161
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 196/193/196 194/194/194 193/195/193 195/196/195 
-f 198/197/198 200/198/200 199/199/199 197/200/197 
-f 198/197/198 197/200/197 193/195/193 194/194/194 
-f 200/198/200 198/197/198 194/194/194 196/193/196 
-f 199/199/199 200/198/200 196/193/196 195/196/195 
-f 197/200/197 199/199/199 195/196/195 193/195/193 
-v -22.922894 -2.556200 -16.330383
-v -18.324535 -2.556200 -16.890593
-v -22.922894 0.984404 -16.330383
-v -18.324535 0.984404 -16.890593
-v -22.462635 -2.556200 -12.552464
-v -17.864281 -2.556200 -13.112674
-v -22.462635 0.984404 -12.552464
-v -17.864281 0.984404 -13.112674
-vn -0.642934 -0.577350 -0.503291
-vn 0.503292 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503292 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503292
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503292
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 204/201/204 202/202/202 201/203/201 203/204/203 
-f 206/205/206 208/206/208 207/207/207 205/208/205 
-f 206/205/206 205/208/205 201/203/201 202/202/202 
-f 208/206/208 206/205/206 202/202/202 204/201/204 
-f 207/207/207 208/206/208 204/201/204 203/204/203 
-f 205/208/205 207/207/207 203/204/203 201/203/201 
-v -19.387363 -2.556200 -12.904255
-v -15.430549 -2.556200 -10.495531
-v -19.387363 0.984404 -12.904255
-v -15.430549 0.984404 -10.495531
-v -21.366352 -2.556200 -9.653341
-v -17.409561 -2.556200 -7.244633
-v -21.366352 0.984404 -9.653341
-v -17.409561 0.984404 -7.244633
-vn -0.192948 -0.577351 -0.793371
-vn 0.793371 -0.577351 -0.192945
-vn -0.192948 0.577351 -0.793371
-vn 0.793371 0.577351 -0.192945
-vn -0.793371 -0.577350 0.192949
-vn 0.192946 -0.577349 0.793372
-vn -0.793371 0.577350 0.192949
-vn 0.192946 0.577349 0.793372
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 212/209/212 210/210/210 209/211/209 211/212/211 
-f 214/213/214 216/214/216 215/215/215 213/216/213 
-f 214/213/214 213/216/213 209/211/209 210/210/210 
-f 216/214/216 214/213/214 210/210/210 212/209/212 
-f 215/215/215 216/214/216 212/209/212 211/212/211 
-f 213/216/213 215/215/215 211/212/211 209/211/209 
-v -21.119835 0.947249 -14.128448
-v -16.834282 0.947249 -15.886953
-v -21.119835 4.487851 -14.128448
-v -16.834282 4.487851 -15.886953
-v -19.675140 0.947249 -10.607425
-v -15.389552 0.947249 -12.365835
-v -19.675140 4.487851 -10.607425
-v -15.389552 4.487851 -12.365835
-vn -0.753303 -0.577346 -0.314970
-vn 0.314968 -0.577355 -0.753297
-vn -0.753303 0.577346 -0.314970
-vn 0.314968 0.577355 -0.753297
-vn -0.314977 -0.577351 0.753297
-vn 0.753297 -0.577350 0.314978
-vn -0.314977 0.577351 0.753297
-vn 0.753297 0.577350 0.314978
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 220/217/220 218/218/218 217/219/217 219/220/219 
-f 222/221/222 224/222/224 223/223/223 221/224/221 
-f 222/221/222 221/224/221 217/219/217 218/218/218 
-f 224/222/224 222/221/222 218/218/218 220/217/220 
-f 223/223/223 224/222/224 220/217/220 219/220/219 
-f 221/224/221 223/223/223 219/220/219 217/219/217 
-v 2.391826 -2.556200 -19.414434
-v 6.990122 -2.556200 -19.974638
-v 2.391826 0.984404 -19.414434
-v 6.990122 0.984404 -19.974638
-v 2.852083 -2.556200 -15.636515
-v 7.450379 -2.556200 -16.196718
-v 2.852083 0.984404 -15.636515
-v 7.450379 0.984404 -16.196718
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 228/225/228 226/226/226 225/227/225 227/228/227 
-f 230/229/230 232/230/232 231/231/231 229/232/229 
-f 230/229/230 229/232/229 225/227/225 226/226/226 
-f 232/230/232 230/229/230 226/226/226 228/225/228 
-f 231/231/231 232/230/232 228/225/228 227/228/227 
-f 229/232/229 231/231/231 227/228/227 225/227/225 
-v 13.906441 -2.556200 -15.886549
-v 18.504681 -2.556200 -16.446747
-v 13.906441 0.984404 -15.886549
-v 18.504681 0.984404 -16.446747
-v 14.366704 -2.556200 -12.108590
-v 18.964945 -2.556200 -12.668786
-v 14.366704 0.984404 -12.108590
-v 18.964945 0.984404 -12.668786
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 236/233/236 234/234/234 233/235/233 235/236/235 
-f 238/237/238 240/238/240 239/239/239 237/240/237 
-f 238/237/238 237/240/237 233/235/233 234/234/234 
-f 240/238/240 238/237/238 234/234/234 236/233/236 
-f 239/239/239 240/238/240 236/233/236 235/236/235 
-f 237/240/237 239/239/239 235/236/235 233/235/233 
-v -5.576640 7.173705 -12.009265
-v 13.232948 7.173705 -14.300806
-v -5.576640 8.236020 -12.009265
-v 13.232948 8.236020 -14.300806
-v -4.784395 7.173705 -5.506305
-v 14.025193 7.173705 -7.797847
-v -4.784395 8.236020 -5.506305
-v 14.025193 8.236020 -7.797847
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 244/241/244 242/242/242 241/243/241 243/244/243 
-f 246/245/246 248/246/248 247/247/247 245/248/245 
-f 246/245/246 245/248/245 241/243/241 242/242/242 
-f 248/246/248 246/245/246 242/242/242 244/241/244 
-f 247/247/247 248/246/248 244/241/244 243/244/243 
-f 245/248/245 247/247/247 243/244/243 241/243/241 
-v -24.029739 6.868023 2.073466
-v -5.220205 6.868023 -0.218069
-v -24.029739 7.930318 2.073466
-v -5.220205 7.930318 -0.218069
-v -23.237495 6.868023 8.576427
-v -4.427960 6.868023 6.284892
-v -23.237495 7.930318 8.576427
-v -4.427960 7.930318 6.284892
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 252/249/252 250/250/250 249/251/249 251/252/251 
-f 254/253/254 256/254/256 255/255/255 253/256/253 
-f 254/253/254 253/256/253 249/251/249 250/250/250 
-f 256/254/256 254/253/254 250/250/250 252/249/252 
-f 255/255/255 256/254/256 252/249/252 251/252/251 
-f 253/256/253 255/255/255 251/252/251 249/251/249 
-v -3.066964 14.079152 8.374180
-v 1.850904 7.163459 -8.568049
-v -2.958884 15.068172 8.001846
-v 1.959003 8.152479 -8.940387
-v 3.224372 14.079152 10.200409
-v 8.142260 7.163459 -6.741843
-v 3.332469 15.068172 9.828053
-v 8.250336 8.152479 -7.114196
-vn -0.763055 -0.326793 0.557632
-vn -0.463362 -0.748238 -0.474802
-vn -0.645557 0.748250 0.152899
-vn -0.345879 0.326811 -0.879524
-vn 0.345884 -0.326798 0.879527
-vn 0.645565 -0.748241 -0.152908
-vn 0.463358 0.748247 0.474790
-vn 0.763048 0.326807 -0.557634
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 260/257/260 258/258/258 257/259/257 259/260/259 
-f 262/261/262 264/262/264 263/263/263 261/264/261 
-f 262/261/262 261/264/261 257/259/257 258/258/258 
-f 264/262/264 262/261/262 258/258/258 260/257/260 
-f 263/263/263 264/262/264 260/257/260 259/260/259 
-f 261/264/261 263/263/263 259/260/259 257/259/257 
-v -6.644157 5.489818 -0.528142
-v -2.045856 5.489818 -1.088346
-v -6.644157 9.030419 -0.528142
-v -2.045856 9.030419 -1.088346
-v -6.183894 5.489818 3.249823
-v -1.585592 5.489818 2.689619
-v -6.183894 9.030419 3.249823
-v -1.585592 9.030419 2.689619
-vn -0.642934 -0.577350 -0.503291
-vn 0.503291 -0.577350 -0.642934
-vn -0.642934 0.577350 -0.503291
-vn 0.503291 0.577350 -0.642934
-vn -0.503291 -0.577350 0.642934
-vn 0.642934 -0.577350 0.503291
-vn -0.503291 0.577350 0.642934
-vn 0.642934 0.577350 0.503291
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 268/265/268 266/266/266 265/267/265 267/268/267 
-f 270/269/270 272/270/272 271/271/271 269/272/269 
-f 270/269/270 269/272/269 265/267/265 266/266/266 
-f 272/270/272 270/269/270 266/266/266 268/265/268 
-f 271/271/271 272/270/272 268/265/268 267/268/267 
-f 269/272/269 271/271/271 267/268/267 265/267/265 
-v -6.385265 -2.556200 11.803425
-v -3.546856 -2.556200 8.142606
-v -6.385265 0.984404 11.803425
-v -3.546856 0.984404 8.142606
-v -3.377541 -2.556200 14.135456
-v -0.539135 -2.556200 10.474639
-v -3.377541 0.984404 14.135456
-v -0.539135 0.984404 10.474639
-vn -0.810037 -0.577350 0.102502
-vn -0.102502 -0.577350 -0.810037
-vn -0.810037 0.577350 0.102502
-vn -0.102502 0.577350 -0.810037
-vn 0.102502 -0.577350 0.810037
-vn 0.810037 -0.577350 -0.102502
-vn 0.102502 0.577350 0.810037
-vn 0.810037 0.577350 -0.102502
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 276/273/276 274/274/274 273/275/273 275/276/275 
-f 278/277/278 280/278/280 279/279/279 277/280/277 
-f 278/277/278 277/280/277 273/275/273 274/274/274 
-f 280/278/280 278/277/278 274/274/274 276/273/276 
-f 279/279/279 280/278/280 276/273/276 275/276/275 
-f 277/280/277 279/279/279 275/276/275 273/275/273 
-v 13.473137 2.100612 23.352911
-v 13.473137 4.463260 23.352911
-v 13.949500 2.100612 25.847401
-v 13.949500 4.463260 25.847401
-v 16.029657 2.104442 22.870707
-v 16.032919 4.467090 22.869925
-v 16.441402 4.467090 25.377504
-v 16.438084 2.104442 25.378296
-v 15.876395 -1.229438 21.959049
-v 20.448454 -1.235113 21.214510
-v 15.828266 11.838176 21.563995
-v 20.400303 11.832507 20.819263
-v 16.488071 -1.113641 25.713701
-v 21.060127 -1.119316 24.969160
-v 16.439941 11.953967 25.318645
-v 21.011976 11.948298 24.573915
-v 15.842556 8.721443 21.663544
-v 15.838550 9.811758 21.630657
-v 16.452887 9.204490 25.407169
-v 16.456894 8.114195 25.440060
-v 20.010408 9.286901 20.967091
-v 19.868492 10.358484 20.957176
-v 20.482813 9.751219 24.733696
-v 20.624725 8.679634 24.743608
-v 4.861748 -1.215768 23.753183
-v 9.433783 -1.221443 23.008457
-v 4.813596 11.851851 23.357937
-v 9.385630 11.846182 22.613211
-v 5.473380 -1.099970 27.507647
-v 10.045456 -1.105645 26.763109
-v 5.425251 11.967642 27.112595
-v 9.997305 11.961973 26.367865
-v 9.399155 8.938145 22.706486
-v 9.403185 7.847831 22.739567
-v 10.017523 7.240564 26.516081
-v 10.013493 8.330879 26.483002
-v 5.075011 8.351486 23.429117
-v 5.216946 7.279902 23.439030
-v 5.831264 6.672635 27.215549
-v 5.689349 7.744239 27.205633
-v 3.801822 8.678734 14.739783
-v 18.655296 10.626419 12.636736
-v 3.691645 9.718966 14.924976
-v 18.545118 11.666653 12.821929
-v 6.285872 6.223238 30.010189
-v 21.139345 8.170923 27.907164
-v 6.175710 7.263470 30.195515
-v 21.029186 9.211155 28.092489
-vn -0.674105 -0.578078 -0.459792
-vn -0.675137 0.577488 -0.459019
-vn -0.459175 -0.577157 0.675313
-vn -0.460414 0.576637 0.674915
-vn -0.874537 -0.404130 -0.268073
-vn -0.874058 0.405652 -0.267335
-vn -0.736228 0.412457 0.536514
-vn -0.736489 -0.410874 0.537370
-vn -0.869849 -0.419786 -0.259117
-vn 0.479020 -0.595811 -0.644631
-vn -0.665152 0.559481 -0.494525
-vn 0.475166 0.558302 -0.680086
-vn -0.738901 -0.394194 0.546477
-vn 0.664916 -0.559911 0.494354
-vn -0.479184 0.595394 0.644895
-vn 0.660295 0.594271 0.459187
-vn -0.653723 -0.674107 -0.343839
-vn -0.446641 0.889899 -0.092693
-vn -0.383476 0.738255 0.554911
-vn -0.598376 -0.717022 0.357528
-vn 0.507392 -0.483889 -0.713025
-vn 0.446897 0.670317 -0.592417
-vn 0.561639 0.615923 0.552450
-vn 0.761640 -0.500653 0.411401
-vn -0.660367 -0.594167 -0.459217
-vn 0.479057 -0.595661 -0.644742
-vn -0.664879 0.559997 -0.494307
-vn 0.474968 0.558803 -0.679812
-vn -0.474997 -0.558661 0.679909
-vn 0.664777 -0.560175 0.494242
-vn -0.479133 0.595490 0.644844
-vn 0.660283 0.594268 0.459208
-vn 0.284472 0.885635 -0.367052
-vn 0.383391 -0.738379 -0.554805
-vn 0.563394 -0.802022 0.198364
-vn 0.248563 0.881811 0.400782
-vn -0.761595 0.500754 -0.411362
-vn -0.561702 -0.615829 -0.552491
-vn -0.446695 -0.670632 0.592213
-vn -0.507480 0.483523 0.713210
-vn -0.598564 -0.549179 -0.583201
-vn 0.535219 -0.400513 -0.743727
-vn -0.550276 0.810953 -0.198876
-vn 0.415456 0.730181 -0.542431
-vn -0.415433 -0.730223 0.542392
-vn 0.718303 -0.581562 0.381871
-vn -0.535235 0.400459 0.743745
-vn 0.380927 0.788075 0.483563
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 283/281/283 284/282/284 282/283/282 281/284/281 
-f 285/285/285 281/284/281 282/283/282 286/286/286 
-f 288/287/288 283/281/283 281/284/281 285/285/285 
-f 284/282/284 287/288/287 286/286/286 282/283/282 
-f 294/289/294 293/290/293 289/291/289 290/292/290 
-f 296/293/296 294/289/294 290/292/290 292/294/292 
-f 295/295/295 296/293/296 292/294/292 291/296/291 
-f 292/294/292 290/292/290 289/291/289 297/297/297 301/298/301 302/299/302 298/300/298 291/296/291 
-f 294/289/294 296/293/296 295/295/295 299/301/299 303/302/303 304/303/304 300/304/300 293/290/293 
-f 299/301/299 295/295/295 291/296/291 298/300/298 
-f 310/305/310 309/306/309 305/307/305 306/308/306 
-f 311/309/311 312/310/312 308/311/308 307/312/307 
-f 309/306/309 311/309/311 307/312/307 305/307/305 
-f 306/308/306 305/307/305 307/312/307 308/311/308 313/313/313 317/314/317 318/315/318 314/316/314 
-f 319/317/319 320/318/320 316/319/316 312/310/312 311/309/311 309/306/309 310/305/310 315/320/315 
-f 312/310/312 316/319/316 313/313/313 308/311/308 
-f 315/320/315 310/305/310 306/308/306 314/316/314 
-f 324/321/324 322/322/322 321/323/321 323/324/323 
-f 326/325/326 328/326/328 327/327/327 325/328/325 
-f 325/328/325 327/327/327 320/318/320 319/317/319 
-f 317/314/317 323/324/323 321/323/321 318/315/318 
-f 328/326/328 326/325/326 304/303/304 303/302/303 
-f 301/298/301 322/322/322 324/321/324 302/299/302 
-f 320/318/320 327/327/327 328/326/328 316/319/316 
-f 316/319/316 328/326/328 303/302/303 299/301/299 
-f 298/300/298 313/313/313 316/319/316 299/301/299 
-f 324/321/324 323/324/323 298/300/298 302/299/302 
-f 298/300/298 323/324/323 317/314/317 313/313/313 
-f 297/297/297 314/316/314 318/315/318 321/323/321 322/322/322 301/298/301 
-f 314/316/314 297/297/297 300/304/300 315/320/315 
-f 319/317/319 315/320/315 300/304/300 304/303/304 326/325/326 325/328/325 
-f 288/287/288 293/290/293 300/304/300 287/288/287 
-f 293/290/293 288/287/288 285/285/285 289/291/289 
-f 289/291/289 285/285/285 286/286/286 297/297/297 
-f 297/297/297 286/286/286 287/288/287 300/304/300 
-f 283/281/283 288/287/288 287/288/287 284/282/284 
-v 4.061719 12.278974 11.206284
-v 4.061719 15.240368 11.206284
-v 3.714470 12.278974 13.660270
-v 3.714470 15.240368 13.660270
-v 2.186756 12.278974 15.611854
-v 2.186756 15.240368 15.611854
-v -0.112078 12.278974 16.538113
-v -0.112078 15.240368 16.538113
-v -2.566060 12.278974 16.190882
-v -2.566060 15.240368 16.190882
-v -4.517662 12.278974 14.663177
-v -4.517662 15.240368 14.663177
-v -5.443921 12.278974 12.364341
-v -5.443921 15.240368 12.364341
-v -5.096690 12.278974 9.910357
-v -5.096690 15.240368 9.910357
-v -3.568967 12.278974 7.958751
-v -3.568967 15.240368 7.958751
-v -1.270133 12.278974 7.032493
-v -1.270133 15.240368 7.032493
-v 1.183848 12.278974 7.379724
-v 1.183848 15.240368 7.379724
-v 3.135441 12.278974 8.907449
-v 3.135441 15.240368 8.907449
-vn 0.881556 -0.459701 -0.107399
-vn 0.881556 0.459701 -0.107399
-vn 0.817148 -0.459701 0.347770
-vn 0.817148 0.459701 0.347770
-vn 0.533785 -0.459701 0.709752
-vn 0.533785 0.459701 0.709752
-vn 0.107399 -0.459700 0.881556
-vn 0.107399 0.459700 0.881556
-vn -0.347764 -0.459701 0.817151
-vn -0.347764 0.459701 0.817151
-vn -0.709750 -0.459701 0.533788
-vn -0.709750 0.459701 0.533788
-vn -0.881556 -0.459700 0.107399
-vn -0.881556 0.459700 0.107399
-vn -0.817150 -0.459701 -0.347766
-vn -0.817150 0.459701 -0.347766
-vn -0.533786 -0.459701 -0.709751
-vn -0.533786 0.459701 -0.709751
-vn -0.107398 -0.459700 -0.881556
-vn -0.107398 0.459700 -0.881556
-vn 0.347767 -0.459701 -0.817149
-vn 0.347767 0.459701 -0.817149
-vn 0.709751 -0.459701 -0.533788
-vn 0.709751 0.459701 -0.533788
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 331/329/331 329/330/329 330/331/330 332/332/332 
-f 333/333/333 331/329/331 332/332/332 334/334/334 
-f 335/335/335 333/333/333 334/334/334 336/336/336 
-f 337/337/337 335/335/335 336/336/336 338/338/338 
-f 339/339/339 337/337/337 338/338/338 340/340/340 
-f 341/341/341 339/339/339 340/340/340 342/342/342 
-f 343/343/343 341/341/341 342/342/342 344/344/344 
-f 345/345/345 343/343/343 344/344/344 346/346/346 
-f 347/347/347 345/345/345 346/346/346 348/348/348 
-f 349/349/349 347/347/347 348/348/348 350/350/350 
-f 351/351/351 349/349/349 350/350/350 352/352/352 
-f 329/330/329 351/351/351 352/352/352 330/331/330 
-f 352/352/352 350/350/350 348/348/348 346/346/346 344/344/344 342/342/342 340/340/340 338/338/338 336/336/336 334/334/334 332/332/332 330/331/330 
-f 329/330/329 331/329/331 333/333/333 335/335/335 337/337/337 339/339/339 341/341/341 343/343/343 345/345/345 347/347/347 349/349/349 351/351/351 
-v 28.405697 -3.409447 -5.443012
-v 31.444405 -3.297550 -5.813213
-v 34.483120 -2.968940 -6.183414
-v 37.521828 -2.565424 -6.553616
-v 40.560539 -2.398096 -6.923816
-v 43.599251 -2.565424 -7.294018
-v 46.637955 -3.060902 -7.664218
-v 49.676670 -3.737523 -8.034420
-v 52.715378 -4.412263 -8.404621
-v 55.754086 -4.771656 -8.774822
-v 58.792797 -4.869517 -9.145023
-v 28.405697 -2.438035 -5.443012
-v 31.444405 -2.320616 -5.813213
-v 34.483120 -1.985266 -6.183414
-v 37.521828 -1.576197 -6.553616
-v 40.560539 -1.407172 -6.923816
-v 43.599251 -1.576197 -7.294018
-v 46.637955 -2.077228 -7.664218
-v 49.676670 -2.769071 -8.034420
-v 52.715378 -3.449503 -8.404621
-v 55.754086 -3.811076 -8.774822
-v 58.792797 -3.906463 -9.145023
-v 28.775898 -3.356195 -2.404303
-v 31.814606 -2.968940 -2.774504
-v 34.853321 -2.195561 -3.144706
-v 37.892029 -1.397891 -3.514907
-v 40.930740 -1.104276 -3.885108
-v 43.969452 -1.397891 -4.255310
-v 47.008156 -2.265358 -4.625510
-v 50.046871 -3.336131 -4.995712
-v 53.085579 -4.231285 -5.365912
-v 56.124287 -4.658715 -5.736114
-v 59.162998 -4.771657 -6.106315
-v 59.162998 -3.811076 -6.106315
-v 56.124287 -3.698599 -5.736114
-v 53.085579 -3.269352 -5.365912
-v 50.046871 -2.352459 -4.995712
-v 47.008156 -1.248837 -4.625510
-v 43.969452 -0.404662 -4.255310
-v 40.930740 -0.112976 -3.885108
-v 37.892029 -0.404662 -3.514907
-v 34.853321 -1.181921 -3.144706
-v 31.814606 -1.985266 -2.774504
-v 28.775898 -2.384776 -2.404303
-v 29.146099 -3.255616 0.634407
-v 32.184807 -2.565424 0.264205
-v 35.223522 -1.397891 -0.105996
-v 38.262230 -0.537756 -0.476197
-v 41.300941 -0.278140 -0.846398
-v 44.339653 -0.537756 -1.216600
-v 47.378357 -1.421056 -1.586800
-v 50.417072 -2.762392 -1.957002
-v 53.455780 -3.792841 -2.327203
-v 56.494488 -4.284532 -2.697404
-v 59.533199 -4.412263 -3.067605
-v 59.533199 -3.449503 -3.067605
-v 56.494488 -3.322612 -2.697404
-v 53.455780 -2.824036 -2.327203
-v 50.417072 -1.767833 -1.957002
-v 47.378357 -0.423386 -1.586800
-v 44.339653 0.459619 -1.216600
-v 41.300941 0.718170 -0.846398
-v 38.262230 0.459619 -0.476197
-v 35.223522 -0.404662 -0.105996
-v 32.184807 -1.576197 0.264205
-v 29.146099 -2.277591 0.634407
-v 29.516300 -3.198068 3.673115
-v 32.555008 -2.398096 3.302914
-v 35.593723 -1.104276 2.932712
-v 38.632431 -0.278140 2.562511
-v 41.671143 -0.053185 2.192311
-v 44.709854 -0.278140 1.822109
-v 47.748558 -1.104276 1.451908
-v 50.787273 -2.449177 1.081707
-v 53.825981 -3.395026 0.711506
-v 56.864689 -3.776620 0.341305
-v 59.903400 -3.849413 -0.028896
-v 59.903400 -2.886490 -0.028896
-v 56.864689 -2.812960 0.341305
-v 53.825981 -2.415678 0.711506
-v 50.787273 -1.455851 1.081707
-v 47.748558 -0.112976 1.451908
-v 44.709854 0.718170 1.822109
-v 41.671143 0.937435 2.192311
-v 38.632431 0.718170 2.562511
-v 35.593723 -0.112976 2.932712
-v 32.555008 -1.407172 3.302914
-v 29.516300 -2.218710 3.673115
-v 29.886501 -3.255616 6.711825
-v 32.925209 -2.565424 6.341624
-v 35.963924 -1.397891 5.971423
-v 39.002632 -0.537756 5.601222
-v 42.041344 -0.278140 5.231021
-v 45.080055 -0.537756 4.860819
-v 48.118759 -1.397891 4.490619
-v 51.157475 -2.565424 4.120417
-v 54.196182 -3.278783 3.750216
-v 57.234890 -3.476367 3.380015
-v 60.273602 -3.501402 3.009814
-v 60.273602 -2.533448 3.009814
-v 57.234890 -2.507833 3.380015
-v 54.196182 -2.300760 3.750216
-v 51.157475 -1.576197 4.120417
-v 48.118759 -0.404662 4.490619
-v 45.080055 0.459619 4.860819
-v 42.041344 0.718170 5.231021
-v 39.002632 0.459619 5.601222
-v 35.963924 -0.404662 5.971423
-v 32.925209 -1.576197 6.341624
-v 29.886501 -2.277591 6.711825
-v 30.256702 -3.356195 9.750534
-v 33.295410 -2.968940 9.380333
-v 36.334126 -2.195561 9.010131
-v 39.372833 -1.397891 8.639931
-v 42.411545 -1.104277 8.269730
-v 45.450256 -1.397891 7.899528
-v 48.488960 -2.195561 7.529327
-v 51.527676 -2.968940 7.159126
-v 54.566383 -3.356195 6.788925
-v 57.605091 -3.409447 6.418724
-v 60.643803 -3.409447 6.048523
-v 60.643803 -2.438035 6.048523
-v 57.605091 -2.438035 6.418724
-v 54.566383 -2.384776 6.788925
-v 51.527676 -1.985266 7.159126
-v 48.488960 -1.181921 7.529327
-v 45.450256 -0.404662 7.899528
-v 42.411545 -0.112976 8.269730
-v 39.372833 -0.404662 8.639931
-v 36.334126 -1.181921 9.010131
-v 33.295410 -1.985266 9.380333
-v 30.256702 -2.384776 9.750534
-v 30.626904 -3.409447 12.789245
-v 33.665611 -3.293368 12.419044
-v 36.704327 -2.968940 12.048842
-v 39.743034 -2.565424 11.678641
-v 42.781746 -2.398096 11.308440
-v 45.820457 -2.565424 10.938239
-v 48.859161 -2.968940 10.568038
-v 51.897877 -3.297550 10.197837
-v 54.936584 -3.350677 9.827636
-v 57.975292 -3.239676 9.457435
-v 61.014004 -3.176165 9.087234
-v 61.014004 -2.195984 9.087234
-v 57.975292 -2.260967 9.457435
-v 54.936584 -2.379257 9.827636
-v 51.897877 -2.320616 10.197837
-v 48.859161 -1.985266 10.568038
-v 45.820457 -1.576197 10.938239
-v 42.781746 -1.407172 11.308440
-v 39.743034 -1.576197 11.678641
-v 36.704327 -1.985266 12.048842
-v 33.665611 -2.314560 12.419044
-v 30.626904 -2.438035 12.789245
-v 30.997105 -3.044981 15.827954
-v 34.035812 -2.785754 15.457753
-v 37.074528 -2.991724 15.087551
-v 40.113235 -3.219331 14.717350
-v 43.151947 -3.198068 14.347149
-v 46.190659 -3.255616 13.976948
-v 49.229362 -3.356195 13.606747
-v 52.268078 -3.285955 13.236546
-v 55.306786 -2.923296 12.866344
-v 58.345493 -2.477970 12.496143
-v 61.384205 -2.293303 12.125942
-v 61.384205 -1.300357 12.125942
-v 58.345493 -1.486896 12.496143
-v 55.306786 -1.938351 12.866344
-v 52.268078 -2.308449 13.236546
-v 49.229362 -2.384776 13.606747
-v 46.190659 -2.277591 13.976948
-v 43.151947 -2.218710 14.347149
-v 40.113235 -2.242946 14.717350
-v 37.074528 -2.000064 15.087551
-v 34.035812 -1.786767 15.457753
-v 30.997105 -2.053322 15.827954
-v 31.367306 -1.861028 18.866663
-v 34.406013 -1.262635 18.496462
-v 37.444729 -1.861028 18.126261
-v 40.483437 -3.044981 17.756060
-v 43.522148 -3.409447 17.385859
-v 46.560860 -3.409447 17.015657
-v 49.599564 -3.350677 16.645456
-v 52.638279 -2.923296 16.275255
-v 55.676987 -2.069782 15.905054
-v 58.715694 -1.189459 15.534853
-v 61.754406 -0.865421 15.164652
-v 61.754406 0.127940 15.164652
-v 58.715694 -0.193970 15.534853
-v 55.676987 -1.051766 15.905054
-v 52.638279 -1.938351 16.275255
-v 49.599564 -2.379257 16.645456
-v 46.560860 -2.438035 17.015657
-v 43.522148 -2.438035 17.385859
-v 40.483437 -2.053322 17.756060
-v 37.444729 -0.836300 18.126261
-v 34.406013 -0.228566 18.496462
-v 31.367306 -0.836300 18.866663
-v 31.737507 -1.262635 21.905371
-v 34.776215 -0.734991 21.535170
-v 37.814930 -1.262635 21.164968
-v 40.853638 -2.785754 20.794767
-v 43.892349 -3.405265 20.424566
-v 46.931061 -3.409447 20.054365
-v 49.969765 -3.239676 19.684164
-v 53.008480 -2.477970 19.313963
-v 56.047188 -1.189459 18.943762
-v 59.085896 -0.240200 18.573561
-v 62.124607 0.046317 18.203360
-v 62.124607 1.045207 18.203360
-v 59.085896 0.759866 18.573561
-v 56.047188 -0.193970 18.943762
-v 53.008480 -1.486896 19.313963
-v 49.969765 -2.260967 19.684164
-v 46.931061 -2.438035 20.054365
-v 43.892349 -2.431980 20.424566
-v 40.853638 -1.786767 20.794767
-v 37.814930 -0.228566 21.164968
-v 34.776215 0.279237 21.535170
-v 31.737507 -0.228566 21.905371
-v 32.107708 -1.861028 24.944080
-v 35.146416 -1.262635 24.573879
-v 38.185131 -1.861028 24.203678
-v 41.223839 -3.044981 23.833477
-v 44.262550 -3.409447 23.463276
-v 47.301262 -3.409447 23.093075
-v 50.339966 -3.176165 22.722874
-v 53.378681 -2.293303 22.352673
-v 56.417389 -0.865421 21.982471
-v 59.456097 0.046317 21.612270
-v 62.494808 0.294580 21.242069
-v 32.107708 -0.836300 24.944080
-v 35.146416 -0.228566 24.573879
-v 38.185131 -0.836300 24.203678
-v 41.223839 -2.053322 23.833477
-v 44.262550 -2.438035 23.463276
-v 47.301262 -2.438035 23.093075
-v 50.339966 -2.195984 22.722874
-v 53.378681 -1.300357 22.352673
-v 56.417389 0.127940 21.982471
-v 59.456097 1.045207 21.612270
-v 62.494808 1.287191 21.242069
-vn -0.599026 -0.602062 -0.527910
-vn 0.050826 -0.714581 -0.697704
-vn 0.110539 -0.740282 -0.663147
-vn 0.068305 -0.791033 -0.607948
-vn -0.067464 -0.826818 -0.558408
-vn -0.220364 -0.810985 -0.541980
-vn -0.312818 -0.765434 -0.562366
-vn -0.310167 -0.731317 -0.607431
-vn -0.235293 -0.721301 -0.651431
-vn -0.146453 -0.720505 -0.677808
-vn 0.497112 -0.591272 -0.635041
-vn -0.673059 0.528950 -0.516918
-vn -0.214383 0.627951 -0.748143
-vn -0.244448 0.573497 -0.781886
-vn -0.195686 0.552643 -0.810119
-vn -0.099946 0.558569 -0.823415
-vn 0.008650 0.577861 -0.816090
-vn 0.097853 0.605520 -0.789792
-vn 0.119938 0.639695 -0.759213
-vn 0.058512 0.673582 -0.736793
-vn -0.026391 0.691911 -0.721500
-vn 0.510733 0.564070 -0.648828
-vn -0.636587 -0.765097 0.096869
-vn 0.243364 -0.969112 0.039942
-vn 0.296439 -0.944376 0.142401
-vn 0.202625 -0.945466 0.255022
-vn 0.038919 -0.947516 0.317330
-vn -0.134932 -0.932967 0.333716
-vn -0.273840 -0.911088 0.308108
-vn -0.300219 -0.924670 0.234209
-vn -0.206048 -0.966808 0.151086
-vn -0.082062 -0.991596 0.100012
-vn 0.695273 -0.718229 -0.027242
-vn 0.709541 0.690960 -0.138295
-vn 0.084344 0.992606 -0.087289
-vn 0.215679 0.969716 -0.114603
-vn 0.318789 0.933719 -0.162917
-vn 0.288834 0.927346 -0.237916
-vn 0.139049 0.942800 -0.302974
-vn -0.038532 0.947194 -0.318338
-vn -0.203287 0.933954 -0.293945
-vn -0.303199 0.922896 -0.237346
-vn -0.257204 0.954734 -0.149428
-vn -0.770621 0.637095 0.015922
-vn -0.611009 -0.785914 0.094909
-vn 0.309377 -0.950758 0.018605
-vn 0.330547 -0.939656 0.088237
-vn 0.190193 -0.969929 0.151870
-vn 0.020844 -0.984928 0.171703
-vn -0.150180 -0.970266 0.189817
-vn -0.308041 -0.927864 0.210190
-vn -0.329400 -0.923913 0.194626
-vn -0.204784 -0.965387 0.161530
-vn -0.068907 -0.986607 0.147847
-vn 0.702926 -0.711047 0.017523
-vn 0.700835 0.687586 -0.189883
-vn 0.069750 0.985420 -0.155188
-vn 0.209274 0.964095 -0.163481
-vn 0.335981 0.925650 -0.174037
-vn 0.311741 0.930325 -0.193166
-vn 0.149069 0.969065 -0.196701
-vn -0.021008 0.984904 -0.171823
-vn -0.189856 0.970498 -0.148620
-vn -0.334154 0.933955 -0.126767
-vn -0.317712 0.944096 -0.087989
-vn -0.788491 0.613893 0.037649
-vn -0.613516 -0.786143 0.074682
-vn 0.303138 -0.952222 -0.037151
-vn 0.317442 -0.947484 -0.038790
-vn 0.171703 -0.984929 -0.020833
-vn -0.000031 -1.000000 0.000039
-vn -0.171685 -0.984928 0.020991
-vn -0.320490 -0.946391 0.040385
-vn -0.316495 -0.946991 0.055123
-vn -0.169818 -0.982385 0.077982
-vn -0.041434 -0.992752 0.112813
-vn 0.707821 -0.706351 0.007588
-vn 0.695169 0.693527 -0.189104
-vn 0.039320 0.988596 -0.145367
-vn 0.166981 0.977636 -0.127844
-vn 0.313375 0.945008 -0.093569
-vn 0.319572 0.945981 -0.054709
-vn 0.171636 0.984904 -0.022475
-vn -0.000043 1.000000 -0.000034
-vn -0.171841 0.984904 0.020860
-vn -0.318278 0.947194 0.039025
-vn -0.305022 0.951604 0.037580
-vn -0.781929 0.616023 0.095404
-vn -0.641295 -0.765086 0.058177
-vn 0.228429 -0.969783 -0.085684
-vn 0.261573 -0.951515 -0.161862
-vn 0.151503 -0.969324 -0.193539
-vn -0.021001 -0.984929 -0.171682
-vn -0.193092 -0.969929 -0.148167
-vn -0.296212 -0.945466 -0.135469
-vn -0.250966 -0.963185 -0.096388
-vn -0.112666 -0.993312 -0.025260
-vn -0.018339 -0.999200 0.035536
-vn 0.705864 -0.707020 -0.043341
-vn 0.697463 0.703445 -0.136786
-vn 0.014976 0.997486 -0.069265
-vn 0.106696 0.993220 -0.046145
-vn 0.246332 0.969140 0.009378
-vn 0.293675 0.951714 0.089414
-vn 0.192035 0.969807 0.150325
-vn 0.020851 0.984903 0.171847
-vn -0.150426 0.970143 0.190246
-vn -0.256521 0.945340 0.201317
-vn -0.222547 0.962215 0.156895
-vn -0.754377 0.638420 0.152757
-vn -0.675241 -0.734843 0.063685
-vn 0.118792 -0.989218 -0.085657
-vn 0.157385 -0.966855 -0.201053
-vn 0.094325 -0.951515 -0.292784
-vn -0.038560 -0.947484 -0.317470
-vn -0.165018 -0.939656 -0.299694
-vn -0.209409 -0.944376 -0.253579
-vn -0.142467 -0.975746 -0.166202
-vn -0.038468 -0.997398 -0.060972
-vn 0.011450 -0.999861 0.012149
-vn 0.708895 -0.702842 -0.059000
-vn 0.693587 0.709641 -0.123879
-vn -0.016267 0.998809 -0.046007
-vn 0.030011 0.999395 -0.017564
-vn 0.134792 0.989619 0.049859
-vn 0.203306 0.966094 0.159148
-vn 0.160941 0.951269 0.263029
-vn 0.038904 0.947163 0.318386
-vn -0.086977 0.939483 0.331370
-vn -0.143412 0.943787 0.297824
-vn -0.107136 0.974403 0.197637
-vn -0.721435 0.671438 0.169419
-vn -0.676722 -0.726492 0.119404
-vn 0.044928 -0.998382 0.034851
-vn 0.017094 -0.998543 -0.051192
-vn 0.002788 -0.978146 -0.207902
-vn -0.039266 -0.953079 -0.300165
-vn -0.092341 -0.950757 -0.295861
-vn -0.087286 -0.969736 -0.228021
-vn -0.009467 -0.992899 -0.118585
-vn 0.070787 -0.997491 0.000420
-vn 0.077588 -0.991887 0.100702
-vn 0.729717 -0.683588 0.014874
-vn 0.674057 0.707296 -0.213024
-vn -0.084884 0.983981 -0.156769
-vn -0.083368 0.991253 -0.102311
-vn -0.005273 0.999943 -0.009270
-vn 0.076243 0.990585 0.113699
-vn 0.087305 0.968659 0.232545
-vn 0.040110 0.951586 0.304755
-vn 0.010646 0.952089 0.305636
-vn 0.004997 0.977760 0.209667
-vn -0.034190 0.997958 0.053954
-vn -0.729579 0.680585 0.067219
-vn -0.635657 -0.727218 0.259024
-vn 0.039333 -0.961732 0.271154
-vn -0.137465 -0.957450 0.253757
-vn -0.129258 -0.989870 0.058725
-vn -0.046866 -0.992288 -0.114753
-vn -0.025705 -0.988873 -0.146527
-vn 0.025003 -0.994393 -0.102744
-vn 0.136203 -0.990513 -0.018254
-vn 0.214018 -0.971281 0.103967
-vn 0.172436 -0.955708 0.238511
-vn 0.755635 -0.643259 0.123425
-vn 0.644344 0.685570 -0.338843
-vn -0.176109 0.933268 -0.313044
-vn -0.225667 0.945862 -0.233280
-vn -0.154735 0.981077 -0.116383
-vn -0.037547 0.999278 0.005775
-vn 0.020768 0.994831 0.099400
-vn 0.052134 0.987864 0.146311
-vn 0.157049 0.982054 0.104429
-vn 0.172396 0.982522 -0.070214
-vn -0.031789 0.969133 -0.244480
-vn -0.774993 0.621770 -0.113085
-vn -0.614110 -0.734644 0.288386
-vn 0.037162 -0.955783 0.291717
-vn -0.247938 -0.917069 0.312269
-vn -0.256380 -0.946881 0.194126
-vn -0.076923 -0.996657 0.027514
-vn 0.014613 -0.999399 -0.031445
-vn 0.112773 -0.993474 -0.017085
-vn 0.265926 -0.963190 0.039342
-vn 0.323267 -0.933484 0.155265
-vn 0.220989 -0.934749 0.278224
-vn 0.762125 -0.632263 0.139315
-vn 0.638094 0.689687 -0.342297
-vn -0.221099 0.921316 -0.319831
-vn -0.329283 0.908367 -0.257764
-vn -0.280638 0.945862 -0.163057
-vn -0.124206 0.990379 -0.061016
-vn -0.018246 0.999820 0.005245
-vn 0.086584 0.996041 0.020138
-vn 0.286958 0.956545 -0.051730
-vn 0.272502 0.939816 -0.206126
-vn -0.033691 0.955810 -0.292048
-vn -0.786435 0.608575 -0.105618
-vn -0.643540 -0.761356 0.078699
-vn -0.000319 -1.000000 0.000408
-vn -0.292106 -0.955783 0.033964
-vn -0.280714 -0.959253 0.032134
-vn -0.079081 -0.996824 0.009362
-vn 0.032279 -0.999471 -0.003932
-vn 0.163733 -0.986486 -0.006001
-vn 0.337538 -0.941095 0.020224
-vn 0.360082 -0.927949 0.096185
-vn 0.208215 -0.963843 0.166293
-vn 0.748825 -0.661451 0.041746
-vn 0.657610 0.721687 -0.216142
-vn -0.207816 0.964545 -0.162679
-vn -0.363560 0.921316 -0.137843
-vn -0.346170 0.933268 -0.095798
-vn -0.172563 0.983981 -0.044762
-vn -0.035218 0.999322 -0.010758
-vn 0.082937 0.996504 -0.010097
-vn 0.288978 0.956719 -0.034363
-vn 0.296553 0.954354 -0.035559
-vn -0.000565 1.000000 -0.000442
-vn -0.765765 0.636361 0.092994
-vn -0.472038 -0.643086 0.603009
-vn 0.078113 -0.761356 0.643611
-vn -0.132507 -0.734644 0.665387
-vn -0.098830 -0.727218 0.679254
-vn 0.041474 -0.719840 0.692900
-vn 0.112202 -0.706581 0.698680
-vn 0.209777 -0.690552 0.692194
-vn 0.328519 -0.648610 0.686572
-vn 0.327924 -0.633767 0.700575
-vn 0.212216 -0.658508 0.722033
-vn 0.658530 -0.542480 0.521588
-vn -0.541870 0.502924 0.673383
-vn 0.093119 0.634566 0.767239
-vn 0.276022 0.628194 0.727451
-vn 0.257877 0.667479 0.698549
-vn 0.129422 0.704689 0.697613
-vn 0.057278 0.709991 0.701878
-vn -0.044956 0.707296 0.705487
-vn -0.174229 0.685570 0.706851
-vn -0.179082 0.689687 0.701613
-vn -0.051932 0.721687 0.690268
-vn 0.626124 0.606414 0.490133
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Cube
-usemtl Default
-f 365/353/365 354/354/354 353/355/353 364/356/364 
-f 366/357/366 355/358/355 354/354/354 365/353/365 
-f 367/359/367 356/360/356 355/358/355 366/357/366 
-f 368/361/368 357/362/357 356/360/356 367/359/367 
-f 369/363/369 358/364/358 357/362/357 368/361/368 
-f 370/365/370 359/366/359 358/364/358 369/363/369 
-f 371/367/371 360/368/360 359/366/359 370/365/370 
-f 372/369/372 361/370/361 360/368/360 371/367/371 
-f 373/371/373 362/372/362 361/370/361 372/369/372 
-f 374/373/374 363/374/363 362/372/362 373/371/373 
-f 376/375/376 375/376/375 353/355/353 354/354/354 
-f 377/377/377 376/375/376 354/354/354 355/358/355 
-f 378/378/378 377/377/377 355/358/355 356/360/356 
-f 379/379/379 378/378/378 356/360/356 357/362/357 
-f 380/380/380 379/379/379 357/362/357 358/364/358 
-f 381/381/381 380/380/380 358/364/358 359/366/359 
-f 382/382/382 381/381/381 359/366/359 360/368/360 
-f 383/383/383 382/382/382 360/368/360 361/370/361 
-f 384/384/384 383/383/383 361/370/361 362/372/362 
-f 385/385/385 384/384/384 362/372/362 363/374/363 
-f 386/386/386 385/385/385 363/374/363 374/373/374 
-f 387/387/387 386/386/386 374/373/374 373/371/373 
-f 388/388/388 387/387/387 373/371/373 372/369/372 
-f 389/389/389 388/388/388 372/369/372 371/367/371 
-f 390/390/390 389/389/389 371/367/371 370/365/370 
-f 391/391/391 390/390/390 370/365/370 369/363/369 
-f 392/392/392 391/391/391 369/363/369 368/361/368 
-f 393/393/393 392/392/392 368/361/368 367/359/367 
-f 394/394/394 393/393/393 367/359/367 366/357/366 
-f 395/395/395 394/394/394 366/357/366 365/353/365 
-f 396/396/396 395/395/395 365/353/365 364/356/364 
-f 375/376/375 396/396/396 364/356/364 353/355/353 
-f 398/397/398 397/398/397 375/376/375 376/375/376 
-f 399/399/399 398/397/398 376/375/376 377/377/377 
-f 400/400/400 399/399/399 377/377/377 378/378/378 
-f 401/401/401 400/400/400 378/378/378 379/379/379 
-f 402/402/402 401/401/401 379/379/379 380/380/380 
-f 403/403/403 402/402/402 380/380/380 381/381/381 
-f 404/404/404 403/403/403 381/381/381 382/382/382 
-f 405/405/405 404/404/404 382/382/382 383/383/383 
-f 406/406/406 405/405/405 383/383/383 384/384/384 
-f 407/407/407 406/406/406 384/384/384 385/385/385 
-f 408/408/408 407/407/407 385/385/385 386/386/386 
-f 409/409/409 408/408/408 386/386/386 387/387/387 
-f 410/410/410 409/409/409 387/387/387 388/388/388 
-f 411/411/411 410/410/410 388/388/388 389/389/389 
-f 412/412/412 411/411/411 389/389/389 390/390/390 
-f 413/413/413 412/412/412 390/390/390 391/391/391 
-f 414/414/414 413/413/413 391/391/391 392/392/392 
-f 415/415/415 414/414/414 392/392/392 393/393/393 
-f 416/416/416 415/415/415 393/393/393 394/394/394 
-f 417/417/417 416/416/416 394/394/394 395/395/395 
-f 418/418/418 417/417/417 395/395/395 396/396/396 
-f 397/398/397 418/418/418 396/396/396 375/376/375 
-f 420/419/420 419/420/419 397/398/397 398/397/398 
-f 421/421/421 420/419/420 398/397/398 399/399/399 
-f 422/422/422 421/421/421 399/399/399 400/400/400 
-f 423/423/423 422/422/422 400/400/400 401/401/401 
-f 424/424/424 423/423/423 401/401/401 402/402/402 
-f 425/425/425 424/424/424 402/402/402 403/403/403 
-f 426/426/426 425/425/425 403/403/403 404/404/404 
-f 427/427/427 426/426/426 404/404/404 405/405/405 
-f 428/428/428 427/427/427 405/405/405 406/406/406 
-f 429/429/429 428/428/428 406/406/406 407/407/407 
-f 430/430/430 429/429/429 407/407/407 408/408/408 
-f 431/431/431 430/430/430 408/408/408 409/409/409 
-f 432/432/432 431/431/431 409/409/409 410/410/410 
-f 433/433/433 432/432/432 410/410/410 411/411/411 
-f 434/434/434 433/433/433 411/411/411 412/412/412 
-f 435/435/435 434/434/434 412/412/412 413/413/413 
-f 436/436/436 435/435/435 413/413/413 414/414/414 
-f 437/437/437 436/436/436 414/414/414 415/415/415 
-f 438/438/438 437/437/437 415/415/415 416/416/416 
-f 439/439/439 438/438/438 416/416/416 417/417/417 
-f 440/440/440 439/439/439 417/417/417 418/418/418 
-f 419/420/419 440/440/440 418/418/418 397/398/397 
-f 442/441/442 441/442/441 419/420/419 420/419/420 
-f 443/443/443 442/441/442 420/419/420 421/421/421 
-f 444/444/444 443/443/443 421/421/421 422/422/422 
-f 445/445/445 444/444/444 422/422/422 423/423/423 
-f 446/446/446 445/445/445 423/423/423 424/424/424 
-f 447/447/447 446/446/446 424/424/424 425/425/425 
-f 448/448/448 447/447/447 425/425/425 426/426/426 
-f 449/449/449 448/448/448 426/426/426 427/427/427 
-f 450/450/450 449/449/449 427/427/427 428/428/428 
-f 451/451/451 450/450/450 428/428/428 429/429/429 
-f 452/452/452 451/451/451 429/429/429 430/430/430 
-f 453/453/453 452/452/452 430/430/430 431/431/431 
-f 454/454/454 453/453/453 431/431/431 432/432/432 
-f 455/455/455 454/454/454 432/432/432 433/433/433 
-f 456/456/456 455/455/455 433/433/433 434/434/434 
-f 457/457/457 456/456/456 434/434/434 435/435/435 
-f 458/458/458 457/457/457 435/435/435 436/436/436 
-f 459/459/459 458/458/458 436/436/436 437/437/437 
-f 460/460/460 459/459/459 437/437/437 438/438/438 
-f 461/461/461 460/460/460 438/438/438 439/439/439 
-f 462/462/462 461/461/461 439/439/439 440/440/440 
-f 441/442/441 462/462/462 440/440/440 419/420/419 
-f 464/463/464 463/464/463 441/442/441 442/441/442 
-f 465/465/465 464/463/464 442/441/442 443/443/443 
-f 466/466/466 465/465/465 443/443/443 444/444/444 
-f 467/467/467 466/466/466 444/444/444 445/445/445 
-f 468/468/468 467/467/467 445/445/445 446/446/446 
-f 469/469/469 468/468/468 446/446/446 447/447/447 
-f 470/470/470 469/469/469 447/447/447 448/448/448 
-f 471/471/471 470/470/470 448/448/448 449/449/449 
-f 472/472/472 471/471/471 449/449/449 450/450/450 
-f 473/473/473 472/472/472 450/450/450 451/451/451 
-f 474/474/474 473/473/473 451/451/451 452/452/452 
-f 475/475/475 474/474/474 452/452/452 453/453/453 
-f 476/476/476 475/475/475 453/453/453 454/454/454 
-f 477/477/477 476/476/476 454/454/454 455/455/455 
-f 478/478/478 477/477/477 455/455/455 456/456/456 
-f 479/479/479 478/478/478 456/456/456 457/457/457 
-f 480/480/480 479/479/479 457/457/457 458/458/458 
-f 481/481/481 480/480/480 458/458/458 459/459/459 
-f 482/482/482 481/481/481 459/459/459 460/460/460 
-f 483/483/483 482/482/482 460/460/460 461/461/461 
-f 484/484/484 483/483/483 461/461/461 462/462/462 
-f 463/464/463 484/484/484 462/462/462 441/442/441 
-f 486/485/486 485/486/485 463/464/463 464/463/464 
-f 487/487/487 486/485/486 464/463/464 465/465/465 
-f 488/488/488 487/487/487 465/465/465 466/466/466 
-f 489/489/489 488/488/488 466/466/466 467/467/467 
-f 490/490/490 489/489/489 467/467/467 468/468/468 
-f 491/491/491 490/490/490 468/468/468 469/469/469 
-f 492/492/492 491/491/491 469/469/469 470/470/470 
-f 493/493/493 492/492/492 470/470/470 471/471/471 
-f 494/494/494 493/493/493 471/471/471 472/472/472 
-f 495/495/495 494/494/494 472/472/472 473/473/473 
-f 496/496/496 495/495/495 473/473/473 474/474/474 
-f 497/497/497 496/496/496 474/474/474 475/475/475 
-f 498/498/498 497/497/497 475/475/475 476/476/476 
-f 499/499/499 498/498/498 476/476/476 477/477/477 
-f 500/500/500 499/499/499 477/477/477 478/478/478 
-f 501/501/501 500/500/500 478/478/478 479/479/479 
-f 502/502/502 501/501/501 479/479/479 480/480/480 
-f 503/503/503 502/502/502 480/480/480 481/481/481 
-f 504/504/504 503/503/503 481/481/481 482/482/482 
-f 505/505/505 504/504/504 482/482/482 483/483/483 
-f 506/506/506 505/505/505 483/483/483 484/484/484 
-f 485/486/485 506/506/506 484/484/484 463/464/463 
-f 508/507/508 507/508/507 485/486/485 486/485/486 
-f 509/509/509 508/507/508 486/485/486 487/487/487 
-f 510/510/510 509/509/509 487/487/487 488/488/488 
-f 511/511/511 510/510/510 488/488/488 489/489/489 
-f 512/512/512 511/511/511 489/489/489 490/490/490 
-f 513/513/513 512/512/512 490/490/490 491/491/491 
-f 514/514/514 513/513/513 491/491/491 492/492/492 
-f 515/515/515 514/514/514 492/492/492 493/493/493 
-f 516/516/516 515/515/515 493/493/493 494/494/494 
-f 517/517/517 516/516/516 494/494/494 495/495/495 
-f 518/518/518 517/517/517 495/495/495 496/496/496 
-f 519/519/519 518/518/518 496/496/496 497/497/497 
-f 520/520/520 519/519/519 497/497/497 498/498/498 
-f 521/521/521 520/520/520 498/498/498 499/499/499 
-f 522/522/522 521/521/521 499/499/499 500/500/500 
-f 523/523/523 522/522/522 500/500/500 501/501/501 
-f 524/524/524 523/523/523 501/501/501 502/502/502 
-f 525/525/525 524/524/524 502/502/502 503/503/503 
-f 526/526/526 525/525/525 503/503/503 504/504/504 
-f 527/527/527 526/526/526 504/504/504 505/505/505 
-f 528/528/528 527/527/527 505/505/505 506/506/506 
-f 507/508/507 528/528/528 506/506/506 485/486/485 
-f 530/529/530 529/530/529 507/508/507 508/507/508 
-f 531/531/531 530/529/530 508/507/508 509/509/509 
-f 532/532/532 531/531/531 509/509/509 510/510/510 
-f 533/533/533 532/532/532 510/510/510 511/511/511 
-f 534/534/534 533/533/533 511/511/511 512/512/512 
-f 535/535/535 534/534/534 512/512/512 513/513/513 
-f 536/536/536 535/535/535 513/513/513 514/514/514 
-f 537/537/537 536/536/536 514/514/514 515/515/515 
-f 538/538/538 537/537/537 515/515/515 516/516/516 
-f 539/539/539 538/538/538 516/516/516 517/517/517 
-f 540/540/540 539/539/539 517/517/517 518/518/518 
-f 541/541/541 540/540/540 518/518/518 519/519/519 
-f 542/542/542 541/541/541 519/519/519 520/520/520 
-f 543/543/543 542/542/542 520/520/520 521/521/521 
-f 544/544/544 543/543/543 521/521/521 522/522/522 
-f 545/545/545 544/544/544 522/522/522 523/523/523 
-f 546/546/546 545/545/545 523/523/523 524/524/524 
-f 547/547/547 546/546/546 524/524/524 525/525/525 
-f 548/548/548 547/547/547 525/525/525 526/526/526 
-f 549/549/549 548/548/548 526/526/526 527/527/527 
-f 550/550/550 549/549/549 527/527/527 528/528/528 
-f 529/530/529 550/550/550 528/528/528 507/508/507 
-f 552/551/552 551/552/551 529/530/529 530/529/530 
-f 553/553/553 552/551/552 530/529/530 531/531/531 
-f 554/554/554 553/553/553 531/531/531 532/532/532 
-f 555/555/555 554/554/554 532/532/532 533/533/533 
-f 556/556/556 555/555/555 533/533/533 534/534/534 
-f 557/557/557 556/556/556 534/534/534 535/535/535 
-f 558/558/558 557/557/557 535/535/535 536/536/536 
-f 559/559/559 558/558/558 536/536/536 537/537/537 
-f 560/560/560 559/559/559 537/537/537 538/538/538 
-f 561/561/561 560/560/560 538/538/538 539/539/539 
-f 562/562/562 561/561/561 539/539/539 540/540/540 
-f 563/563/563 562/562/562 540/540/540 541/541/541 
-f 564/564/564 563/563/563 541/541/541 542/542/542 
-f 565/565/565 564/564/564 542/542/542 543/543/543 
-f 566/566/566 565/565/565 543/543/543 544/544/544 
-f 567/567/567 566/566/566 544/544/544 545/545/545 
-f 568/568/568 567/567/567 545/545/545 546/546/546 
-f 569/569/569 568/568/568 546/546/546 547/547/547 
-f 570/570/570 569/569/569 547/547/547 548/548/548 
-f 571/571/571 570/570/570 548/548/548 549/549/549 
-f 572/572/572 571/571/571 549/549/549 550/550/550 
-f 551/552/551 572/572/572 550/550/550 529/530/529 
-f 574/573/574 585/574/585 584/575/584 573/576/573 
-f 575/577/575 586/578/586 585/574/585 574/573/574 
-f 576/579/576 587/580/587 586/578/586 575/577/575 
-f 577/581/577 588/582/588 587/580/587 576/579/576 
-f 578/583/578 589/584/589 588/582/588 577/581/577 
-f 579/585/579 590/586/590 589/584/589 578/583/578 
-f 580/587/580 591/588/591 590/586/590 579/585/579 
-f 581/589/581 592/590/592 591/588/591 580/587/580 
-f 582/591/582 593/592/593 592/590/592 581/589/581 
-f 583/593/583 594/594/594 593/592/593 582/591/582 
-f 574/573/574 573/576/573 551/552/551 552/551/552 
-f 575/577/575 574/573/574 552/551/552 553/553/553 
-f 576/579/576 575/577/575 553/553/553 554/554/554 
-f 577/581/577 576/579/576 554/554/554 555/555/555 
-f 578/583/578 577/581/577 555/555/555 556/556/556 
-f 579/585/579 578/583/578 556/556/556 557/557/557 
-f 580/587/580 579/585/579 557/557/557 558/558/558 
-f 581/589/581 580/587/580 558/558/558 559/559/559 
-f 582/591/582 581/589/581 559/559/559 560/560/560 
-f 583/593/583 582/591/582 560/560/560 561/561/561 
-f 594/594/594 583/593/583 561/561/561 562/562/562 
-f 593/592/593 594/594/594 562/562/562 563/563/563 
-f 592/590/592 593/592/593 563/563/563 564/564/564 
-f 591/588/591 592/590/592 564/564/564 565/565/565 
-f 590/586/590 591/588/591 565/565/565 566/566/566 
-f 589/584/589 590/586/590 566/566/566 567/567/567 
-f 588/582/588 589/584/589 567/567/567 568/568/568 
-f 587/580/587 588/582/588 568/568/568 569/569/569 
-f 586/578/586 587/580/587 569/569/569 570/570/570 
-f 585/574/585 586/578/586 570/570/570 571/571/571 
-f 584/575/584 585/574/585 571/571/571 572/572/572 
-f 573/576/573 584/575/584 572/572/572 551/552/551 
-v 37.072704 6.798801 14.612655
-v 35.399620 -1.684892 -2.247932
-v 37.025742 7.748693 14.139361
-v 35.352657 -0.734998 -2.721227
-v 49.019722 6.798801 13.427149
-v 47.346642 -1.684892 -3.433439
-v 48.972759 7.748693 12.953856
-v 47.299675 -0.734998 -3.906734
-vn -0.498026 -0.257760 0.827967
-vn -0.599982 -0.774742 -0.199491
-vn -0.549076 0.774743 0.313511
-vn -0.651030 0.257761 -0.713946
-vn 0.651031 -0.257760 0.713946
-vn 0.549076 -0.774742 -0.313512
-vn 0.599981 0.774743 0.199490
-vn 0.498026 0.257761 -0.827967
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 598/595/598 596/596/596 595/597/595 597/598/597 
-f 600/599/600 602/600/602 601/601/601 599/602/599 
-f 600/599/600 599/602/599 595/597/595 596/596/596 
-f 602/600/602 600/599/600 596/596/596 598/595/598 
-f 601/601/601 602/600/602 598/595/598 597/598/597 
-f 599/602/599 601/601/601 597/598/597 595/597/595 
-v 41.590405 7.735011 14.423697
-v 40.583054 2.824299 4.272040
-v 41.588688 13.509675 14.406421
-v 40.583054 13.509675 4.272040
-v 44.149647 7.735011 14.169743
-v 43.142300 2.824299 4.018085
-v 44.147934 13.509675 14.152468
-v 43.142300 13.509675 4.018085
-vn -0.434325 -0.456966 0.776237
-vn -0.719726 -0.617016 -0.318254
-vn -0.517001 0.578506 0.630905
-vn -0.631539 0.577350 -0.517518
-vn 0.578405 -0.456966 0.675744
-vn 0.643145 -0.617016 -0.453492
-vn 0.630907 0.578506 0.516998
-vn 0.517518 0.577350 -0.631539
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 606/603/606 604/604/604 603/605/603 605/606/605 
-f 608/607/608 610/608/610 609/609/609 607/610/607 
-f 608/607/608 607/610/607 603/605/603 604/604/604 
-f 610/608/610 608/607/608 604/604/604 606/603/606 
-f 609/609/609 610/608/610 606/603/606 605/606/605 
-f 607/610/607 609/609/609 605/606/605 603/605/603 
-v 38.265141 6.735311 26.120773
-v 37.069580 6.735311 14.072419
-v 38.265141 7.797606 26.120773
-v 37.069580 7.797606 14.072419
-v 49.417778 6.735311 25.014093
-v 48.222221 6.735311 12.965740
-v 49.417778 7.797606 25.014093
-v 48.222221 7.797606 12.965740
-vn -0.517518 -0.577350 0.631539
-vn -0.631539 -0.577350 -0.517518
-vn -0.517518 0.577350 0.631539
-vn -0.631539 0.577350 -0.517518
-vn 0.631539 -0.577350 0.517518
-vn 0.517518 -0.577350 -0.631539
-vn 0.631539 0.577350 0.517518
-vn 0.517518 0.577350 -0.631539
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Generic
-usemtl Default
-f 614/611/614 612/612/612 611/613/611 613/614/613 
-f 616/615/616 618/616/618 617/617/617 615/618/615 
-f 616/615/616 615/618/615 611/613/611 612/612/612 
-f 618/616/618 616/615/616 612/612/612 614/611/614 
-f 617/617/617 618/616/618 614/611/614 613/614/613 
-f 615/618/615 617/617/617 613/614/613 611/613/611 
-v -4.999391 -2.723562 -20.058920
-v -4.799391 -2.723562 -20.058920
-v -4.999391 7.276438 -20.058920
-v -4.799391 7.276438 -20.058920
-v -4.999391 -2.723562 -19.858919
-v -4.799391 -2.723562 -19.858919
-v -4.999391 7.276438 -19.858919
-v -4.799391 7.276438 -19.858919
-vn -0.577350 -0.577350 -0.577350
-vn 0.577350 -0.577350 -0.577350
-vn -0.577350 0.577350 -0.577350
-vn 0.577350 0.577350 -0.577350
-vn -0.577350 -0.577350 0.577350
-vn 0.577350 -0.577350 0.577350
-vn -0.577350 0.577350 0.577350
-vn 0.577350 0.577350 0.577350
-vt 0.995049 0.995049
-vt 0.995049 0.995049
-vt 0.004950 0.995049
-vt 0.004950 0.995049
-vt 0.995049 0.004950
-vt 0.995049 0.004950
-vt 0.004950 0.004950
-vt 0.004950 0.004950
-g Cube
-usemtl Default
-f 622/619/622 620/620/620 619/621/619 621/622/621 
-f 624/623/624 626/624/626 625/625/625 623/626/623 
-f 624/623/624 623/626/623 619/621/619 620/620/620 
-f 626/624/626 624/623/624 620/620/620 622/619/622 
-f 625/625/625 626/624/626 622/619/622 621/622/621 
-f 623/626/623 625/625/625 621/622/621 619/621/619 
-v -1.781751 7.010753 -9.378036
-v -1.581751 7.010753 -9.378036
-v -1.781751 17.010754 -9.378036
-v -1.581751 17.010754 -9.378036
-v -1.781751 7.010753 -9.178036
-v -1.581751 7.010753 -9.178036
-v -1.781751 17.010754 -9.178036
-v -1.581751 17.010754 -9.178036
-vn -0.577350 -0.577350 -0.577350
-vn 0.577350 -0.577350 -0.577350
-vn -0.577350 0.577350 -0.577350
-vn 0.577350 0.577350 -0.577350
-vn -0.577350 -0.577350 0.577350
-vn 0.577350 -0.577350 0.577350
-vn -0.577350 0.577350 0.577350
-vn 0.577350 0.577350 0.577350
-vt 0.995049 0.995049
-vt 0.995049 0.995049
-vt 0.004950 0.995049
-vt 0.004950 0.995049
-vt 0.995049 0.004950
-vt 0.995049 0.004950
-vt 0.004950 0.004950
-vt 0.004950 0.004950
-g Cube
-usemtl Default
-f 630/627/630 628/628/628 627/629/627 629/630/629 
-f 632/631/632 634/632/634 633/633/633 631/634/631 
-f 632/631/632 631/634/631 627/629/627 628/628/628 
-f 634/632/634 632/631/632 628/628/628 630/627/630 
-f 633/633/633 634/632/634 630/627/630 629/630/629 
-f 631/634/631 633/633/633 629/630/629 627/629/627 
-v 23.601257 -3.409447 -42.598141
-v 26.639965 -3.297550 -42.968342
-v 29.678680 -2.968940 -43.338543
-v 32.717388 -2.565424 -43.708744
-v 35.756100 -2.398096 -44.078945
-v 38.794811 -2.565424 -44.449146
-v 41.833515 -3.060902 -44.819347
-v 44.872231 -3.737523 -45.189548
-v 47.910938 -4.412263 -45.559750
-v 50.949646 -4.771656 -45.929951
-v 53.988358 -4.869517 -46.300152
-v 23.601257 -2.438035 -42.598141
-v 26.639965 -2.320616 -42.968342
-v 29.678680 -1.985266 -43.338543
-v 32.717388 -1.576197 -43.708744
-v 35.756100 -1.407172 -44.078945
-v 38.794811 -1.576197 -44.449146
-v 41.833515 -2.077228 -44.819347
-v 44.872231 -2.769071 -45.189548
-v 47.910938 -3.449503 -45.559750
-v 50.949646 -3.811076 -45.929951
-v 53.988358 -3.906463 -46.300152
-v 23.971458 -3.356195 -39.559433
-v 27.010166 -2.968940 -39.929634
-v 30.048882 -2.195561 -40.299835
-v 33.087589 -1.397891 -40.670036
-v 36.126301 -1.104276 -41.040237
-v 39.165012 -1.397891 -41.410439
-v 42.203716 -2.265358 -41.780640
-v 45.242432 -3.336131 -42.150841
-v 48.281139 -4.231285 -42.521042
-v 51.319847 -4.658715 -42.891243
-v 54.358559 -4.771657 -43.261444
-v 54.358559 -3.811076 -43.261444
-v 51.319847 -3.698599 -42.891243
-v 48.281139 -3.269352 -42.521042
-v 45.242432 -2.352459 -42.150841
-v 42.203716 -1.248837 -41.780640
-v 39.165012 -0.404662 -41.410439
-v 36.126301 -0.112976 -41.040237
-v 33.087589 -0.404662 -40.670036
-v 30.048882 -1.181921 -40.299835
-v 27.010166 -1.985266 -39.929634
-v 23.971458 -2.384776 -39.559433
-v 24.341660 -3.255616 -36.520721
-v 27.380367 -2.565424 -36.890923
-v 30.419083 -1.397891 -37.261124
-v 33.457790 -0.537756 -37.631325
-v 36.496502 -0.278140 -38.001526
-v 39.535213 -0.537756 -38.371727
-v 42.573917 -1.421056 -38.741928
-v 45.612633 -2.762392 -39.112129
-v 48.651340 -3.792841 -39.482330
-v 51.690048 -4.284532 -39.852531
-v 54.728760 -4.412263 -40.222733
-v 54.728760 -3.449503 -40.222733
-v 51.690048 -3.322612 -39.852531
-v 48.651340 -2.824036 -39.482330
-v 45.612633 -1.767833 -39.112129
-v 42.573917 -0.423386 -38.741928
-v 39.535213 0.459619 -38.371727
-v 36.496502 0.718170 -38.001526
-v 33.457790 0.459619 -37.631325
-v 30.419083 -0.404662 -37.261124
-v 27.380367 -1.576197 -36.890923
-v 24.341660 -2.277591 -36.520721
-v 24.711861 -3.198068 -33.482014
-v 27.750568 -2.398096 -33.852215
-v 30.789284 -1.104276 -34.222416
-v 33.827991 -0.278140 -34.592617
-v 36.866703 -0.053185 -34.962818
-v 39.905415 -0.278140 -35.333019
-v 42.944118 -1.104276 -35.703220
-v 45.982834 -2.449177 -36.073421
-v 49.021542 -3.395026 -36.443623
-v 52.060249 -3.776620 -36.813824
-v 55.098961 -3.849413 -37.184025
-v 55.098961 -2.886490 -37.184025
-v 52.060249 -2.812960 -36.813824
-v 49.021542 -2.415678 -36.443623
-v 45.982834 -1.455851 -36.073421
-v 42.944118 -0.112976 -35.703220
-v 39.905415 0.718170 -35.333019
-v 36.866703 0.937435 -34.962818
-v 33.827991 0.718170 -34.592617
-v 30.789284 -0.112976 -34.222416
-v 27.750568 -1.407172 -33.852215
-v 24.711861 -2.218710 -33.482014
-v 25.082062 -3.255616 -30.443304
-v 28.120770 -2.565424 -30.813505
-v 31.159485 -1.397891 -31.183704
-v 34.198193 -0.537756 -31.553905
-v 37.236904 -0.278140 -31.924107
-v 40.275616 -0.537756 -32.294312
-v 43.314320 -1.397891 -32.664509
-v 46.353035 -2.565424 -33.034710
-v 49.391743 -3.278783 -33.404911
-v 52.430450 -3.476367 -33.775112
-v 55.469162 -3.501402 -34.145313
-v 55.469162 -2.533448 -34.145313
-v 52.430450 -2.507833 -33.775112
-v 49.391743 -2.300760 -33.404911
-v 46.353035 -1.576197 -33.034710
-v 43.314320 -0.404662 -32.664509
-v 40.275616 0.459619 -32.294312
-v 37.236904 0.718170 -31.924107
-v 34.198193 0.459619 -31.553905
-v 31.159485 -0.404662 -31.183704
-v 28.120770 -1.576197 -30.813505
-v 25.082062 -2.277591 -30.443304
-v 25.452263 -3.356195 -27.404594
-v 28.490971 -2.968940 -27.774796
-v 31.529686 -2.195561 -28.144997
-v 34.568394 -1.397891 -28.515198
-v 37.607105 -1.104277 -28.885399
-v 40.645817 -1.397891 -29.255600
-v 43.684521 -2.195561 -29.625801
-v 46.723236 -2.968940 -29.996002
-v 49.761944 -3.356195 -30.366203
-v 52.800652 -3.409447 -30.736404
-v 55.839363 -3.409447 -31.106606
-v 55.839363 -2.438035 -31.106606
-v 52.800652 -2.438035 -30.736404
-v 49.761944 -2.384776 -30.366203
-v 46.723236 -1.985266 -29.996002
-v 43.684521 -1.181921 -29.625801
-v 40.645817 -0.404662 -29.255600
-v 37.607105 -0.112976 -28.885399
-v 34.568394 -0.404662 -28.515198
-v 31.529686 -1.181921 -28.144997
-v 28.490971 -1.985266 -27.774796
-v 25.452263 -2.384776 -27.404594
-v 25.822464 -3.409447 -24.365883
-v 28.861172 -3.293368 -24.736084
-v 31.899887 -2.968940 -25.106285
-v 34.938595 -2.565424 -25.476486
-v 37.977306 -2.398096 -25.846687
-v 41.016018 -2.565424 -26.216888
-v 44.054722 -2.968940 -26.587090
-v 47.093437 -3.297550 -26.957291
-v 50.132145 -3.350677 -27.327492
-v 53.170853 -3.239676 -27.697693
-v 56.209564 -3.176165 -28.067894
-v 56.209564 -2.195984 -28.067894
-v 53.170853 -2.260967 -27.697693
-v 50.132145 -2.379257 -27.327492
-v 47.093437 -2.320616 -26.957291
-v 44.054722 -1.985266 -26.587090
-v 41.016018 -1.576197 -26.216888
-v 37.977306 -1.407172 -25.846687
-v 34.938595 -1.576197 -25.476486
-v 31.899887 -1.985266 -25.106285
-v 28.861172 -2.314560 -24.736084
-v 25.822464 -2.438035 -24.365883
-v 26.192665 -3.044981 -21.327175
-v 29.231373 -2.785754 -21.697376
-v 32.270088 -2.991724 -22.067577
-v 35.308796 -3.219331 -22.437778
-v 38.347507 -3.198068 -22.807980
-v 41.386219 -3.255616 -23.178181
-v 44.424923 -3.356195 -23.548382
-v 47.463638 -3.285955 -23.918583
-v 50.502346 -2.923296 -24.288784
-v 53.541054 -2.477970 -24.658985
-v 56.579765 -2.293303 -25.029186
-v 56.579765 -1.300357 -25.029186
-v 53.541054 -1.486896 -24.658985
-v 50.502346 -1.938351 -24.288784
-v 47.463638 -2.308449 -23.918583
-v 44.424923 -2.384776 -23.548382
-v 41.386219 -2.277591 -23.178181
-v 38.347507 -2.218710 -22.807980
-v 35.308796 -2.242946 -22.437778
-v 32.270088 -2.000064 -22.067577
-v 29.231373 -1.786767 -21.697376
-v 26.192665 -2.053322 -21.327175
-v 26.562866 -1.861028 -18.288465
-v 29.601574 -1.262635 -18.658667
-v 32.640289 -1.861028 -19.028868
-v 35.678997 -3.044981 -19.399069
-v 38.717709 -3.409447 -19.769270
-v 41.756420 -3.409447 -20.139471
-v 44.795124 -3.350677 -20.509672
-v 47.833839 -2.923296 -20.879873
-v 50.872547 -2.069782 -21.250074
-v 53.911255 -1.189459 -21.620275
-v 56.949966 -0.865421 -21.990477
-v 56.949966 0.127940 -21.990477
-v 53.911255 -0.193970 -21.620275
-v 50.872547 -1.051766 -21.250074
-v 47.833839 -1.938351 -20.879873
-v 44.795124 -2.379257 -20.509672
-v 41.756420 -2.438035 -20.139471
-v 38.717709 -2.438035 -19.769270
-v 35.678997 -2.053322 -19.399069
-v 32.640289 -0.836300 -19.028868
-v 29.601574 -0.228566 -18.658667
-v 26.562866 -0.836300 -18.288465
-v 26.933067 -1.262635 -15.249758
-v 29.971775 -0.734991 -15.619959
-v 33.010490 -1.262635 -15.990160
-v 36.049198 -2.785754 -16.360361
-v 39.087910 -3.405265 -16.730562
-v 42.126621 -3.409447 -17.100763
-v 45.165325 -3.239676 -17.470964
-v 48.204041 -2.477970 -17.841166
-v 51.242748 -1.189459 -18.211367
-v 54.281456 -0.240200 -18.581568
-v 57.320168 0.046317 -18.951769
-v 57.320168 1.045207 -18.951769
-v 54.281456 0.759866 -18.581568
-v 51.242748 -0.193970 -18.211367
-v 48.204041 -1.486896 -17.841166
-v 45.165325 -2.260967 -17.470964
-v 42.126621 -2.438035 -17.100763
-v 39.087910 -2.431980 -16.730562
-v 36.049198 -1.786767 -16.360361
-v 33.010490 -0.228566 -15.990160
-v 29.971775 0.279237 -15.619959
-v 26.933067 -0.228566 -15.249758
-v 27.303268 -1.861028 -12.211048
-v 30.341976 -1.262635 -12.581249
-v 33.380692 -1.861028 -12.951450
-v 36.419399 -3.044981 -13.321651
-v 39.458111 -3.409447 -13.691853
-v 42.496822 -3.409447 -14.062054
-v 45.535526 -3.176165 -14.432255
-v 48.574242 -2.293303 -14.802456
-v 51.612949 -0.865421 -15.172657
-v 54.651657 0.046317 -15.542858
-v 57.690369 0.294580 -15.913059
-v 27.303268 -0.836300 -12.211048
-v 30.341976 -0.228566 -12.581249
-v 33.380692 -0.836300 -12.951450
-v 36.419399 -2.053322 -13.321651
-v 39.458111 -2.438035 -13.691853
-v 42.496822 -2.438035 -14.062054
-v 45.535526 -2.195984 -14.432255
-v 48.574242 -1.300357 -14.802456
-v 51.612949 0.127940 -15.172657
-v 54.651657 1.045207 -15.542858
-v 57.690369 1.287191 -15.913059
-vn -0.599026 -0.602062 -0.527910
-vn 0.050826 -0.714581 -0.697704
-vn 0.110539 -0.740282 -0.663147
-vn 0.068305 -0.791033 -0.607948
-vn -0.067464 -0.826818 -0.558408
-vn -0.220365 -0.810985 -0.541980
-vn -0.312818 -0.765434 -0.562366
-vn -0.310167 -0.731317 -0.607431
-vn -0.235293 -0.721301 -0.651431
-vn -0.146453 -0.720505 -0.677808
-vn 0.497112 -0.591272 -0.635041
-vn -0.673059 0.528950 -0.516918
-vn -0.214383 0.627951 -0.748143
-vn -0.244448 0.573498 -0.781886
-vn -0.195686 0.552643 -0.810119
-vn -0.099946 0.558569 -0.823415
-vn 0.008650 0.577861 -0.816090
-vn 0.097853 0.605520 -0.789792
-vn 0.119938 0.639695 -0.759213
-vn 0.058512 0.673582 -0.736793
-vn -0.026391 0.691911 -0.721500
-vn 0.510733 0.564070 -0.648828
-vn -0.636587 -0.765097 0.096869
-vn 0.243364 -0.969112 0.039942
-vn 0.296439 -0.944376 0.142401
-vn 0.202625 -0.945466 0.255022
-vn 0.038919 -0.947516 0.317330
-vn -0.134932 -0.932967 0.333716
-vn -0.273840 -0.911088 0.308108
-vn -0.300219 -0.924670 0.234208
-vn -0.206048 -0.966808 0.151086
-vn -0.082062 -0.991596 0.100012
-vn 0.695273 -0.718229 -0.027242
-vn 0.709541 0.690960 -0.138295
-vn 0.084344 0.992606 -0.087289
-vn 0.215679 0.969716 -0.114603
-vn 0.318789 0.933719 -0.162917
-vn 0.288834 0.927346 -0.237915
-vn 0.139049 0.942800 -0.302974
-vn -0.038532 0.947194 -0.318338
-vn -0.203287 0.933954 -0.293945
-vn -0.303199 0.922896 -0.237346
-vn -0.257204 0.954734 -0.149428
-vn -0.770621 0.637095 0.015922
-vn -0.611009 -0.785914 0.094909
-vn 0.309377 -0.950758 0.018605
-vn 0.330547 -0.939656 0.088237
-vn 0.190193 -0.969929 0.151870
-vn 0.020843 -0.984928 0.171703
-vn -0.150180 -0.970266 0.189817
-vn -0.308041 -0.927864 0.210190
-vn -0.329400 -0.923914 0.194626
-vn -0.204784 -0.965387 0.161530
-vn -0.068907 -0.986607 0.147847
-vn 0.702926 -0.711047 0.017523
-vn 0.700835 0.687586 -0.189883
-vn 0.069750 0.985420 -0.155188
-vn 0.209274 0.964095 -0.163481
-vn 0.335981 0.925650 -0.174037
-vn 0.311741 0.930325 -0.193166
-vn 0.149069 0.969065 -0.196701
-vn -0.021008 0.984904 -0.171823
-vn -0.189856 0.970498 -0.148620
-vn -0.334154 0.933955 -0.126767
-vn -0.317712 0.944096 -0.087989
-vn -0.788491 0.613893 0.037649
-vn -0.613516 -0.786143 0.074682
-vn 0.303138 -0.952222 -0.037151
-vn 0.317442 -0.947484 -0.038790
-vn 0.171703 -0.984929 -0.020833
-vn -0.000031 -1.000000 0.000039
-vn -0.171685 -0.984928 0.020991
-vn -0.320490 -0.946391 0.040385
-vn -0.316495 -0.946991 0.055123
-vn -0.169818 -0.982385 0.077982
-vn -0.041434 -0.992752 0.112813
-vn 0.707821 -0.706351 0.007588
-vn 0.695169 0.693527 -0.189104
-vn 0.039320 0.988596 -0.145367
-vn 0.166981 0.977636 -0.127844
-vn 0.313375 0.945008 -0.093569
-vn 0.319572 0.945981 -0.054709
-vn 0.171636 0.984904 -0.022475
-vn -0.000043 1.000000 -0.000034
-vn -0.171841 0.984904 0.020860
-vn -0.318278 0.947194 0.039025
-vn -0.305022 0.951604 0.037580
-vn -0.781929 0.616023 0.095404
-vn -0.641295 -0.765086 0.058177
-vn 0.228429 -0.969783 -0.085684
-vn 0.261573 -0.951515 -0.161862
-vn 0.151503 -0.969324 -0.193538
-vn -0.021001 -0.984929 -0.171682
-vn -0.193092 -0.969929 -0.148167
-vn -0.296212 -0.945466 -0.135469
-vn -0.250966 -0.963185 -0.096388
-vn -0.112666 -0.993312 -0.025260
-vn -0.018339 -0.999200 0.035536
-vn 0.705864 -0.707020 -0.043341
-vn 0.697463 0.703445 -0.136786
-vn 0.014976 0.997486 -0.069265
-vn 0.106696 0.993220 -0.046144
-vn 0.246332 0.969140 0.009378
-vn 0.293675 0.951714 0.089414
-vn 0.192035 0.969807 0.150325
-vn 0.020851 0.984903 0.171847
-vn -0.150426 0.970143 0.190246
-vn -0.256521 0.945340 0.201317
-vn -0.222547 0.962215 0.156895
-vn -0.754377 0.638420 0.152757
-vn -0.675241 -0.734843 0.063685
-vn 0.118792 -0.989218 -0.085657
-vn 0.157385 -0.966855 -0.201053
-vn 0.094325 -0.951515 -0.292784
-vn -0.038560 -0.947484 -0.317470
-vn -0.165018 -0.939656 -0.299693
-vn -0.209409 -0.944376 -0.253579
-vn -0.142467 -0.975746 -0.166202
-vn -0.038468 -0.997398 -0.060972
-vn 0.011450 -0.999861 0.012149
-vn 0.708895 -0.702842 -0.059000
-vn 0.693587 0.709641 -0.123879
-vn -0.016267 0.998809 -0.046007
-vn 0.030011 0.999395 -0.017564
-vn 0.134792 0.989619 0.049859
-vn 0.203306 0.966094 0.159148
-vn 0.160941 0.951269 0.263029
-vn 0.038904 0.947163 0.318386
-vn -0.086977 0.939483 0.331370
-vn -0.143412 0.943787 0.297824
-vn -0.107136 0.974403 0.197637
-vn -0.721435 0.671438 0.169419
-vn -0.676722 -0.726492 0.119404
-vn 0.044928 -0.998382 0.034851
-vn 0.017094 -0.998543 -0.051192
-vn 0.002788 -0.978146 -0.207902
-vn -0.039266 -0.953079 -0.300165
-vn -0.092341 -0.950757 -0.295861
-vn -0.087286 -0.969736 -0.228021
-vn -0.009467 -0.992899 -0.118585
-vn 0.070787 -0.997491 0.000420
-vn 0.077588 -0.991887 0.100702
-vn 0.729717 -0.683588 0.014874
-vn 0.674057 0.707296 -0.213024
-vn -0.084884 0.983981 -0.156769
-vn -0.083368 0.991253 -0.102311
-vn -0.005273 0.999943 -0.009270
-vn 0.076243 0.990585 0.113699
-vn 0.087305 0.968659 0.232545
-vn 0.040110 0.951586 0.304755
-vn 0.010646 0.952089 0.305636
-vn 0.004997 0.977760 0.209667
-vn -0.034190 0.997958 0.053954
-vn -0.729579 0.680585 0.067219
-vn -0.635657 -0.727218 0.259024
-vn 0.039333 -0.961732 0.271154
-vn -0.137465 -0.957450 0.253757
-vn -0.129258 -0.989870 0.058725
-vn -0.046866 -0.992288 -0.114753
-vn -0.025705 -0.988873 -0.146527
-vn 0.025003 -0.994393 -0.102745
-vn 0.136203 -0.990513 -0.018254
-vn 0.214018 -0.971281 0.103967
-vn 0.172436 -0.955708 0.238511
-vn 0.755635 -0.643259 0.123425
-vn 0.644344 0.685570 -0.338843
-vn -0.176109 0.933268 -0.313044
-vn -0.225667 0.945862 -0.233280
-vn -0.154735 0.981077 -0.116383
-vn -0.037547 0.999278 0.005775
-vn 0.020768 0.994831 0.099400
-vn 0.052134 0.987864 0.146311
-vn 0.157049 0.982054 0.104429
-vn 0.172396 0.982522 -0.070214
-vn -0.031789 0.969133 -0.244480
-vn -0.774993 0.621770 -0.113085
-vn -0.614110 -0.734644 0.288386
-vn 0.037162 -0.955783 0.291717
-vn -0.247938 -0.917069 0.312268
-vn -0.256380 -0.946881 0.194126
-vn -0.076923 -0.996657 0.027514
-vn 0.014613 -0.999399 -0.031445
-vn 0.112773 -0.993474 -0.017085
-vn 0.265926 -0.963190 0.039342
-vn 0.323267 -0.933484 0.155265
-vn 0.220989 -0.934749 0.278224
-vn 0.762125 -0.632263 0.139315
-vn 0.638094 0.689687 -0.342297
-vn -0.221099 0.921316 -0.319831
-vn -0.329283 0.908367 -0.257764
-vn -0.280638 0.945862 -0.163057
-vn -0.124206 0.990379 -0.061016
-vn -0.018246 0.999820 0.005245
-vn 0.086584 0.996041 0.020138
-vn 0.286958 0.956545 -0.051730
-vn 0.272502 0.939816 -0.206126
-vn -0.033691 0.955810 -0.292048
-vn -0.786435 0.608576 -0.105618
-vn -0.643540 -0.761356 0.078699
-vn -0.000319 -1.000000 0.000408
-vn -0.292106 -0.955783 0.033964
-vn -0.280714 -0.959253 0.032134
-vn -0.079081 -0.996824 0.009362
-vn 0.032279 -0.999471 -0.003932
-vn 0.163733 -0.986486 -0.006001
-vn 0.337538 -0.941095 0.020224
-vn 0.360082 -0.927949 0.096185
-vn 0.208215 -0.963843 0.166293
-vn 0.748825 -0.661451 0.041746
-vn 0.657610 0.721687 -0.216142
-vn -0.207816 0.964545 -0.162679
-vn -0.363560 0.921316 -0.137843
-vn -0.346170 0.933268 -0.095798
-vn -0.172563 0.983981 -0.044762
-vn -0.035218 0.999322 -0.010758
-vn 0.082937 0.996504 -0.010097
-vn 0.288978 0.956719 -0.034363
-vn 0.296553 0.954354 -0.035559
-vn -0.000565 1.000000 -0.000442
-vn -0.765765 0.636361 0.092994
-vn -0.472038 -0.643086 0.603009
-vn 0.078113 -0.761356 0.643611
-vn -0.132507 -0.734644 0.665387
-vn -0.098830 -0.727218 0.679254
-vn 0.041474 -0.719840 0.692900
-vn 0.112202 -0.706581 0.698680
-vn 0.209777 -0.690552 0.692194
-vn 0.328519 -0.648610 0.686572
-vn 0.327924 -0.633767 0.700575
-vn 0.212216 -0.658508 0.722033
-vn 0.658530 -0.542480 0.521588
-vn -0.541870 0.502924 0.673383
-vn 0.093119 0.634566 0.767239
-vn 0.276022 0.628194 0.727451
-vn 0.257877 0.667479 0.698549
-vn 0.129422 0.704689 0.697613
-vn 0.057278 0.709991 0.701878
-vn -0.044956 0.707296 0.705487
-vn -0.174229 0.685570 0.706851
-vn -0.179082 0.689687 0.701613
-vn -0.051932 0.721687 0.690268
-vn 0.626124 0.606414 0.490133
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 0.000000
-g Cube
-usemtl Default
-f 647/635/647 636/636/636 635/637/635 646/638/646 
-f 648/639/648 637/640/637 636/636/636 647/635/647 
-f 649/641/649 638/642/638 637/640/637 648/639/648 
-f 650/643/650 639/644/639 638/642/638 649/641/649 
-f 651/645/651 640/646/640 639/644/639 650/643/650 
-f 652/647/652 641/648/641 640/646/640 651/645/651 
-f 653/649/653 642/650/642 641/648/641 652/647/652 
-f 654/651/654 643/652/643 642/650/642 653/649/653 
-f 655/653/655 644/654/644 643/652/643 654/651/654 
-f 656/655/656 645/656/645 644/654/644 655/653/655 
-f 658/657/658 657/658/657 635/637/635 636/636/636 
-f 659/659/659 658/657/658 636/636/636 637/640/637 
-f 660/660/660 659/659/659 637/640/637 638/642/638 
-f 661/661/661 660/660/660 638/642/638 639/644/639 
-f 662/662/662 661/661/661 639/644/639 640/646/640 
-f 663/663/663 662/662/662 640/646/640 641/648/641 
-f 664/664/664 663/663/663 641/648/641 642/650/642 
-f 665/665/665 664/664/664 642/650/642 643/652/643 
-f 666/666/666 665/665/665 643/652/643 644/654/644 
-f 667/667/667 666/666/666 644/654/644 645/656/645 
-f 668/668/668 667/667/667 645/656/645 656/655/656 
-f 669/669/669 668/668/668 656/655/656 655/653/655 
-f 670/670/670 669/669/669 655/653/655 654/651/654 
-f 671/671/671 670/670/670 654/651/654 653/649/653 
-f 672/672/672 671/671/671 653/649/653 652/647/652 
-f 673/673/673 672/672/672 652/647/652 651/645/651 
-f 674/674/674 673/673/673 651/645/651 650/643/650 
-f 675/675/675 674/674/674 650/643/650 649/641/649 
-f 676/676/676 675/675/675 649/641/649 648/639/648 
-f 677/677/677 676/676/676 648/639/648 647/635/647 
-f 678/678/678 677/677/677 647/635/647 646/638/646 
-f 657/658/657 678/678/678 646/638/646 635/637/635 
-f 680/679/680 679/680/679 657/658/657 658/657/658 
-f 681/681/681 680/679/680 658/657/658 659/659/659 
-f 682/682/682 681/681/681 659/659/659 660/660/660 
-f 683/683/683 682/682/682 660/660/660 661/661/661 
-f 684/684/684 683/683/683 661/661/661 662/662/662 
-f 685/685/685 684/684/684 662/662/662 663/663/663 
-f 686/686/686 685/685/685 663/663/663 664/664/664 
-f 687/687/687 686/686/686 664/664/664 665/665/665 
-f 688/688/688 687/687/687 665/665/665 666/666/666 
-f 689/689/689 688/688/688 666/666/666 667/667/667 
-f 690/690/690 689/689/689 667/667/667 668/668/668 
-f 691/691/691 690/690/690 668/668/668 669/669/669 
-f 692/692/692 691/691/691 669/669/669 670/670/670 
-f 693/693/693 692/692/692 670/670/670 671/671/671 
-f 694/694/694 693/693/693 671/671/671 672/672/672 
-f 695/695/695 694/694/694 672/672/672 673/673/673 
-f 696/696/696 695/695/695 673/673/673 674/674/674 
-f 697/697/697 696/696/696 674/674/674 675/675/675 
-f 698/698/698 697/697/697 675/675/675 676/676/676 
-f 699/699/699 698/698/698 676/676/676 677/677/677 
-f 700/700/700 699/699/699 677/677/677 678/678/678 
-f 679/680/679 700/700/700 678/678/678 657/658/657 
-f 702/701/702 701/702/701 679/680/679 680/679/680 
-f 703/703/703 702/701/702 680/679/680 681/681/681 
-f 704/704/704 703/703/703 681/681/681 682/682/682 
-f 705/705/705 704/704/704 682/682/682 683/683/683 
-f 706/706/706 705/705/705 683/683/683 684/684/684 
-f 707/707/707 706/706/706 684/684/684 685/685/685 
-f 708/708/708 707/707/707 685/685/685 686/686/686 
-f 709/709/709 708/708/708 686/686/686 687/687/687 
-f 710/710/710 709/709/709 687/687/687 688/688/688 
-f 711/711/711 710/710/710 688/688/688 689/689/689 
-f 712/712/712 711/711/711 689/689/689 690/690/690 
-f 713/713/713 712/712/712 690/690/690 691/691/691 
-f 714/714/714 713/713/713 691/691/691 692/692/692 
-f 715/715/715 714/714/714 692/692/692 693/693/693 
-f 716/716/716 715/715/715 693/693/693 694/694/694 
-f 717/717/717 716/716/716 694/694/694 695/695/695 
-f 718/718/718 717/717/717 695/695/695 696/696/696 
-f 719/719/719 718/718/718 696/696/696 697/697/697 
-f 720/720/720 719/719/719 697/697/697 698/698/698 
-f 721/721/721 720/720/720 698/698/698 699/699/699 
-f 722/722/722 721/721/721 699/699/699 700/700/700 
-f 701/702/701 722/722/722 700/700/700 679/680/679 
-f 724/723/724 723/724/723 701/702/701 702/701/702 
-f 725/725/725 724/723/724 702/701/702 703/703/703 
-f 726/726/726 725/725/725 703/703/703 704/704/704 
-f 727/727/727 726/726/726 704/704/704 705/705/705 
-f 728/728/728 727/727/727 705/705/705 706/706/706 
-f 729/729/729 728/728/728 706/706/706 707/707/707 
-f 730/730/730 729/729/729 707/707/707 708/708/708 
-f 731/731/731 730/730/730 708/708/708 709/709/709 
-f 732/732/732 731/731/731 709/709/709 710/710/710 
-f 733/733/733 732/732/732 710/710/710 711/711/711 
-f 734/734/734 733/733/733 711/711/711 712/712/712 
-f 735/735/735 734/734/734 712/712/712 713/713/713 
-f 736/736/736 735/735/735 713/713/713 714/714/714 
-f 737/737/737 736/736/736 714/714/714 715/715/715 
-f 738/738/738 737/737/737 715/715/715 716/716/716 
-f 739/739/739 738/738/738 716/716/716 717/717/717 
-f 740/740/740 739/739/739 717/717/717 718/718/718 
-f 741/741/741 740/740/740 718/718/718 719/719/719 
-f 742/742/742 741/741/741 719/719/719 720/720/720 
-f 743/743/743 742/742/742 720/720/720 721/721/721 
-f 744/744/744 743/743/743 721/721/721 722/722/722 
-f 723/724/723 744/744/744 722/722/722 701/702/701 
-f 746/745/746 745/746/745 723/724/723 724/723/724 
-f 747/747/747 746/745/746 724/723/724 725/725/725 
-f 748/748/748 747/747/747 725/725/725 726/726/726 
-f 749/749/749 748/748/748 726/726/726 727/727/727 
-f 750/750/750 749/749/749 727/727/727 728/728/728 
-f 751/751/751 750/750/750 728/728/728 729/729/729 
-f 752/752/752 751/751/751 729/729/729 730/730/730 
-f 753/753/753 752/752/752 730/730/730 731/731/731 
-f 754/754/754 753/753/753 731/731/731 732/732/732 
-f 755/755/755 754/754/754 732/732/732 733/733/733 
-f 756/756/756 755/755/755 733/733/733 734/734/734 
-f 757/757/757 756/756/756 734/734/734 735/735/735 
-f 758/758/758 757/757/757 735/735/735 736/736/736 
-f 759/759/759 758/758/758 736/736/736 737/737/737 
-f 760/760/760 759/759/759 737/737/737 738/738/738 
-f 761/761/761 760/760/760 738/738/738 739/739/739 
-f 762/762/762 761/761/761 739/739/739 740/740/740 
-f 763/763/763 762/762/762 740/740/740 741/741/741 
-f 764/764/764 763/763/763 741/741/741 742/742/742 
-f 765/765/765 764/764/764 742/742/742 743/743/743 
-f 766/766/766 765/765/765 743/743/743 744/744/744 
-f 745/746/745 766/766/766 744/744/744 723/724/723 
-f 768/767/768 767/768/767 745/746/745 746/745/746 
-f 769/769/769 768/767/768 746/745/746 747/747/747 
-f 770/770/770 769/769/769 747/747/747 748/748/748 
-f 771/771/771 770/770/770 748/748/748 749/749/749 
-f 772/772/772 771/771/771 749/749/749 750/750/750 
-f 773/773/773 772/772/772 750/750/750 751/751/751 
-f 774/774/774 773/773/773 751/751/751 752/752/752 
-f 775/775/775 774/774/774 752/752/752 753/753/753 
-f 776/776/776 775/775/775 753/753/753 754/754/754 
-f 777/777/777 776/776/776 754/754/754 755/755/755 
-f 778/778/778 777/777/777 755/755/755 756/756/756 
-f 779/779/779 778/778/778 756/756/756 757/757/757 
-f 780/780/780 779/779/779 757/757/757 758/758/758 
-f 781/781/781 780/780/780 758/758/758 759/759/759 
-f 782/782/782 781/781/781 759/759/759 760/760/760 
-f 783/783/783 782/782/782 760/760/760 761/761/761 
-f 784/784/784 783/783/783 761/761/761 762/762/762 
-f 785/785/785 784/784/784 762/762/762 763/763/763 
-f 786/786/786 785/785/785 763/763/763 764/764/764 
-f 787/787/787 786/786/786 764/764/764 765/765/765 
-f 788/788/788 787/787/787 765/765/765 766/766/766 
-f 767/768/767 788/788/788 766/766/766 745/746/745 
-f 790/789/790 789/790/789 767/768/767 768/767/768 
-f 791/791/791 790/789/790 768/767/768 769/769/769 
-f 792/792/792 791/791/791 769/769/769 770/770/770 
-f 793/793/793 792/792/792 770/770/770 771/771/771 
-f 794/794/794 793/793/793 771/771/771 772/772/772 
-f 795/795/795 794/794/794 772/772/772 773/773/773 
-f 796/796/796 795/795/795 773/773/773 774/774/774 
-f 797/797/797 796/796/796 774/774/774 775/775/775 
-f 798/798/798 797/797/797 775/775/775 776/776/776 
-f 799/799/799 798/798/798 776/776/776 777/777/777 
-f 800/800/800 799/799/799 777/777/777 778/778/778 
-f 801/801/801 800/800/800 778/778/778 779/779/779 
-f 802/802/802 801/801/801 779/779/779 780/780/780 
-f 803/803/803 802/802/802 780/780/780 781/781/781 
-f 804/804/804 803/803/803 781/781/781 782/782/782 
-f 805/805/805 804/804/804 782/782/782 783/783/783 
-f 806/806/806 805/805/805 783/783/783 784/784/784 
-f 807/807/807 806/806/806 784/784/784 785/785/785 
-f 808/808/808 807/807/807 785/785/785 786/786/786 
-f 809/809/809 808/808/808 786/786/786 787/787/787 
-f 810/810/810 809/809/809 787/787/787 788/788/788 
-f 789/790/789 810/810/810 788/788/788 767/768/767 
-f 812/811/812 811/812/811 789/790/789 790/789/790 
-f 813/813/813 812/811/812 790/789/790 791/791/791 
-f 814/814/814 813/813/813 791/791/791 792/792/792 
-f 815/815/815 814/814/814 792/792/792 793/793/793 
-f 816/816/816 815/815/815 793/793/793 794/794/794 
-f 817/817/817 816/816/816 794/794/794 795/795/795 
-f 818/818/818 817/817/817 795/795/795 796/796/796 
-f 819/819/819 818/818/818 796/796/796 797/797/797 
-f 820/820/820 819/819/819 797/797/797 798/798/798 
-f 821/821/821 820/820/820 798/798/798 799/799/799 
-f 822/822/822 821/821/821 799/799/799 800/800/800 
-f 823/823/823 822/822/822 800/800/800 801/801/801 
-f 824/824/824 823/823/823 801/801/801 802/802/802 
-f 825/825/825 824/824/824 802/802/802 803/803/803 
-f 826/826/826 825/825/825 803/803/803 804/804/804 
-f 827/827/827 826/826/826 804/804/804 805/805/805 
-f 828/828/828 827/827/827 805/805/805 806/806/806 
-f 829/829/829 828/828/828 806/806/806 807/807/807 
-f 830/830/830 829/829/829 807/807/807 808/808/808 
-f 831/831/831 830/830/830 808/808/808 809/809/809 
-f 832/832/832 831/831/831 809/809/809 810/810/810 
-f 811/812/811 832/832/832 810/810/810 789/790/789 
-f 834/833/834 833/834/833 811/812/811 812/811/812 
-f 835/835/835 834/833/834 812/811/812 813/813/813 
-f 836/836/836 835/835/835 813/813/813 814/814/814 
-f 837/837/837 836/836/836 814/814/814 815/815/815 
-f 838/838/838 837/837/837 815/815/815 816/816/816 
-f 839/839/839 838/838/838 816/816/816 817/817/817 
-f 840/840/840 839/839/839 817/817/817 818/818/818 
-f 841/841/841 840/840/840 818/818/818 819/819/819 
-f 842/842/842 841/841/841 819/819/819 820/820/820 
-f 843/843/843 842/842/842 820/820/820 821/821/821 
-f 844/844/844 843/843/843 821/821/821 822/822/822 
-f 845/845/845 844/844/844 822/822/822 823/823/823 
-f 846/846/846 845/845/845 823/823/823 824/824/824 
-f 847/847/847 846/846/846 824/824/824 825/825/825 
-f 848/848/848 847/847/847 825/825/825 826/826/826 
-f 849/849/849 848/848/848 826/826/826 827/827/827 
-f 850/850/850 849/849/849 827/827/827 828/828/828 
-f 851/851/851 850/850/850 828/828/828 829/829/829 
-f 852/852/852 851/851/851 829/829/829 830/830/830 
-f 853/853/853 852/852/852 830/830/830 831/831/831 
-f 854/854/854 853/853/853 831/831/831 832/832/832 
-f 833/834/833 854/854/854 832/832/832 811/812/811 
-f 856/855/856 867/856/867 866/857/866 855/858/855 
-f 857/859/857 868/860/868 867/856/867 856/855/856 
-f 858/861/858 869/862/869 868/860/868 857/859/857 
-f 859/863/859 870/864/870 869/862/869 858/861/858 
-f 860/865/860 871/866/871 870/864/870 859/863/859 
-f 861/867/861 872/868/872 871/866/871 860/865/860 
-f 862/869/862 873/870/873 872/868/872 861/867/861 
-f 863/871/863 874/872/874 873/870/873 862/869/862 
-f 864/873/864 875/874/875 874/872/874 863/871/863 
-f 865/875/865 876/876/876 875/874/875 864/873/864 
-f 856/855/856 855/858/855 833/834/833 834/833/834 
-f 857/859/857 856/855/856 834/833/834 835/835/835 
-f 858/861/858 857/859/857 835/835/835 836/836/836 
-f 859/863/859 858/861/858 836/836/836 837/837/837 
-f 860/865/860 859/863/859 837/837/837 838/838/838 
-f 861/867/861 860/865/860 838/838/838 839/839/839 
-f 862/869/862 861/867/861 839/839/839 840/840/840 
-f 863/871/863 862/869/862 840/840/840 841/841/841 
-f 864/873/864 863/871/863 841/841/841 842/842/842 
-f 865/875/865 864/873/864 842/842/842 843/843/843 
-f 876/876/876 865/875/865 843/843/843 844/844/844 
-f 875/874/875 876/876/876 844/844/844 845/845/845 
-f 874/872/874 875/874/875 845/845/845 846/846/846 
-f 873/870/873 874/872/874 846/846/846 847/847/847 
-f 872/868/872 873/870/873 847/847/847 848/848/848 
-f 871/866/871 872/868/872 848/848/848 849/849/849 
-f 870/864/870 871/866/871 849/849/849 850/850/850 
-f 869/862/869 870/864/870 850/850/850 851/851/851 
-f 868/860/868 869/862/869 851/851/851 852/852/852 
-f 867/856/867 868/860/868 852/852/852 853/853/853 
-f 866/857/866 867/856/867 853/853/853 854/854/854 
-f 855/858/855 866/857/866 854/854/854 833/834/833 
-v 38.838924 -2.723562 -29.694302
-v 39.038925 -2.723562 -29.694302
-v 38.838924 7.276438 -29.694302
-v 39.038925 7.276438 -29.694302
-v 38.838924 -2.723562 -29.494301
-v 39.038925 -2.723562 -29.494301
-v 38.838924 7.276438 -29.494301
-v 39.038925 7.276438 -29.494301
-vn -0.577350 -0.577350 -0.577350
-vn 0.577350 -0.577350 -0.577350
-vn -0.577350 0.577350 -0.577350
-vn 0.577350 0.577350 -0.577350
-vn -0.577350 -0.577350 0.577350
-vn 0.577350 -0.577350 0.577350
-vn -0.577350 0.577350 0.577350
-vn 0.577350 0.577350 0.577350
-vt 0.995049 0.995049
-vt 0.995049 0.995049
-vt 0.004950 0.995049
-vt 0.004950 0.995049
-vt 0.995049 0.004950
-vt 0.995049 0.004950
-vt 0.004950 0.004950
-vt 0.004950 0.004950
-g Cube
-usemtl Default
-f 880/877/880 878/878/878 877/879/877 879/880/879 
-f 882/881/882 884/882/884 883/883/883 881/884/881 
-f 882/881/882 881/884/881 877/879/877 878/878/878 
-f 884/882/884 882/881/882 878/878/878 880/877/880 
-f 883/883/883 884/882/884 880/877/880 879/880/879 
-f 881/884/881 883/883/883 879/880/879 877/879/877 
diff --git a/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/Info.plist b/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/Info.plist
deleted file mode 100644
index a29bbdcae36..00000000000
--- a/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/Info.plist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>Recast</string>
-	<key>CFBundleIconFile</key>
-	<string>Icon.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.Recast</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Recast</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>
diff --git a/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast b/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast
deleted file mode 100644
index 69914d30818..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/PkgInfo b/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/PkgInfo
deleted file mode 100644
index bd04210fb49..00000000000
--- a/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/Resources/English.lproj/InfoPlist.strings b/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/Resources/English.lproj/InfoPlist.strings
deleted file mode 100644
index dea12de4cad..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/Resources/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/Resources/English.lproj/MainMenu.nib b/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/Resources/English.lproj/MainMenu.nib
deleted file mode 100644
index 7518524c9fd..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Bin/Recast.app/Contents/Resources/English.lproj/MainMenu.nib and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Bin/SDL.dll b/dep/recastnavigation/RecastDemo/Bin/SDL.dll
deleted file mode 100644
index 3ce97a59deb..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Bin/SDL.dll and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Bin/Tests/movement_test.txt b/dep/recastnavigation/RecastDemo/Bin/Tests/movement_test.txt
deleted file mode 100644
index b80a401da7b..00000000000
--- a/dep/recastnavigation/RecastDemo/Bin/Tests/movement_test.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-s Solo Mesh Simple
-f movement.obj
-pf  -100.539185 -1.000000 54.028996  62.582016 15.757828 52.842243  0x3 0x0
-pf  -100.539185 -1.000000 54.028996  -1.259964 -1.000000 50.116970  0x3 0x0
-pf  -100.539185 -1.000000 54.028996  1.598934 -1.000000 23.528656  0x3 0x0
-pf  -100.539185 -1.000000 54.028996  3.652847 -1.000000 -5.022881  0x3 0x0
-pf  -100.539185 -1.000000 54.028996  -39.182816 8.999985 -24.697731  0x3 0x0
-pf  -100.539185 -1.000000 54.028996  -66.847992 -1.000000 -28.908646  0x3 0x0
-pf  -100.539185 -1.000000 54.028996  -90.966019 -1.000000 -3.219864  0x3 0x0
-pf  -43.394421 -1.000000 13.312424  -90.966019 -1.000000 -3.219864  0x3 0x0
-pf  -43.394421 -1.000000 13.312424  -36.447182 3.999992 -25.008087  0x3 0x0
-pf  -43.394421 -1.000000 13.312424  26.394167 15.757812 -13.491264  0x3 0x0
-pf  -43.394421 -1.000000 13.312424  -4.140746 6.944923 4.888435  0x3 0x0
-pf  -43.394421 -1.000000 13.312424  -73.532791 -1.062469 23.137051  0x3 0x0
-pf  -43.394421 -1.000000 13.312424  -72.902054 7.996834 15.076473  0x3 0x0
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Bin/Tests/nav_mesh_test.txt b/dep/recastnavigation/RecastDemo/Bin/Tests/nav_mesh_test.txt
deleted file mode 100644
index aca6e128586..00000000000
--- a/dep/recastnavigation/RecastDemo/Bin/Tests/nav_mesh_test.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-s Solo Mesh Simple
-f nav_test.obj
-pf  18.138550 -2.370003 -21.319118  -19.206181 -2.369133 24.802742  0x3 0x0
-pf  18.252758 -2.368240 -7.000238  -19.206181 -2.369133 24.802742  0x3 0x0
-pf  18.252758 -2.368240 -7.000238  -22.759071 -2.369453 2.003946  0x3 0x0
-pf  18.252758 -2.368240 -7.000238  -24.483898 -2.369728 -6.778278  0x3 0x0
-pf  18.252758 -2.368240 -7.000238  -24.068850 -2.370285 -18.879251  0x3 0x0
-pf  18.252758 -2.368240 -7.000238  12.124170 -2.369637 -21.222471  0x3 0x0
-pf  10.830146 -2.366791 19.002508  12.124170 -2.369637 -21.222471  0x3 0x0
-pf  10.830146 -2.366791 19.002508  -7.146484 -2.368736 -16.031403  0x3 0x0
-pf  10.830146 -2.366791 19.002508  -21.615391 -2.368706 -3.264029  0x3 0x0
-pf  10.830146 -2.366791 19.002508  -22.651268 -2.369354 1.053217  0x3 0x0
-pf  10.830146 -2.366791 19.002508  19.181122 -2.368134 3.011776  0x3 0x0
-pf  10.830146 -2.366791 19.002508  19.041592 -2.368713 -7.404587  0x3 0x0
-pf  6.054083 -2.365402 3.330421  19.041592 -2.368713 -7.404587  0x3 0x0
-pf  6.054083 -2.365402 3.330421  21.846087 -2.368568 17.918859  0x3 0x0
-pf  6.054083 -2.365402 3.330421  0.967449 -2.368439 25.767756  0x3 0x0
-pf  6.054083 -2.365402 3.330421  -17.518076 -2.368477 26.569633  0x3 0x0
-pf  6.054083 -2.365402 3.330421  -22.141787 -2.369209 2.440046  0x3 0x0
-pf  6.054083 -2.365402 3.330421  -23.296972 -2.369797 -17.411043  0x3 0x0
-pf  6.054083 -2.365402 3.330421  -1.564062 -2.369926 -20.452827  0x3 0x0
-pf  6.054083 -2.365402 3.330421  16.905643 -2.370193 -21.811655  0x3 0x0
-pf  6.054083 -2.365402 3.330421  19.289761 -2.368813 -6.954918  0x3 0x0
diff --git a/dep/recastnavigation/RecastDemo/Bin/test.chf b/dep/recastnavigation/RecastDemo/Bin/test.chf
deleted file mode 100644
index 393d1b29dad..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Bin/test.chf and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Build/GNUMake/Common.mk b/dep/recastnavigation/RecastDemo/Build/GNUMake/Common.mk
deleted file mode 100644
index 85f7772b067..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/GNUMake/Common.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-OBJECTS = $(patsubst $(NAME)/Source/%.cpp,$(OBJ)/%.o,$(wildcard $(NAME)/Source/*.cpp))
-CPPFLAGS += -I$(NAME)/Include
-
-$(OBJ)/%.o: $(NAME)/Source/%.cpp
-	c++ $(CPPFLAGS) -c -o $@ $<
-
-.PHONY: clean
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/GNUMake/DebugUtils.mk b/dep/recastnavigation/RecastDemo/Build/GNUMake/DebugUtils.mk
deleted file mode 100644
index 0a5d66036bb..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/GNUMake/DebugUtils.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-NAME = DebugUtils
-
-SOURCES = \
-	DebugDraw.cpp \
-	DetourDebugDraw.cpp \
-	RecastDebugDraw.cpp \
-	RecastDump.cpp
-
-HEADERS = \
-	DebugDraw.h \
-	DetourDebugDraw.h \
-	RecastDebugDraw.h \
-	RecastDump.h
-
-CPPFLAGS = \
-	-I Detour/Include \
-	-I Recast/Include
-
-include $(BUILD)/HelperLibrary.mk
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/GNUMake/Detour.mk b/dep/recastnavigation/RecastDemo/Build/GNUMake/Detour.mk
deleted file mode 100644
index aefd3ce721b..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/GNUMake/Detour.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-NAME = Detour
-
-SOURCES = \
-	DetourAlloc.cpp \
-	DetourCommon.cpp \
-	DetourNavMesh.cpp \
-	DetourNavMeshBuilder.cpp \
-	DetourNavMeshQuery.cpp \
-	DetourNode.cpp \
-	DetourObstacleAvoidance.cpp
-
-HEADERS = \
-	DetourAlloc.h \
-	DetourAssert.h \
-	DetourCommon.h \
-	DetourNavMesh.h \
-	DetourNavMeshBuilder.h \
-	DetourNavMeshQuery.h \
-	DetourNode.h \
-	DetourObstacleAvoidance.h
-
-include $(BUILD)/Library.mk
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/GNUMake/HelperLibrary.mk b/dep/recastnavigation/RecastDemo/Build/GNUMake/HelperLibrary.mk
deleted file mode 100644
index 15042cef3ef..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/GNUMake/HelperLibrary.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(BUILD)/Common.mk
-
-$(BIN)/$(NAME).a: $(OBJECTS)
-	ar -q $@ $(OBJECTS)
-
-clean:
-	rm -f $(BIN)/$(NAME).a $(OBJECTS)
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/GNUMake/Library.mk b/dep/recastnavigation/RecastDemo/Build/GNUMake/Library.mk
deleted file mode 100644
index 10745fb5e68..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/GNUMake/Library.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-include $(BUILD)/Common.mk
-
-CPPFLAGS += -fPIC
-LDFLAGS += -shared
-
-$(BIN)/lib$(NAME).so: $(OBJECTS)
-	c++ $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
-
-clean:
-	rm -f $(BIN)/lib$(NAME).so $(OBJECTS)
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/GNUMake/Program.mk b/dep/recastnavigation/RecastDemo/Build/GNUMake/Program.mk
deleted file mode 100644
index 62f600d968b..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/GNUMake/Program.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(BUILD)/Common.mk
-
-$(BIN)/$(NAME): $(OBJECTS)
-	c++ $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
-
-clean:
-	rm -f $(BIN)/$(NAME).a $(OBJECTS)
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/GNUMake/Recast.mk b/dep/recastnavigation/RecastDemo/Build/GNUMake/Recast.mk
deleted file mode 100644
index c25ee3460df..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/GNUMake/Recast.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-NAME = Recast
-
-OBJECTS = \
-	Recast.cpp \
-	RecastAlloc.cpp \
-	RecastArea.cpp \
-	RecastFilter.cpp \
-	RecastMesh.cpp \
-	RecastMeshDetail.cpp \
-	RecastRasterization.cpp \
-	RecastRegion.cpp
-
-HEADERS = \
-	Recast.h \
-	RecastAlloc.h \
-	RecastAssert.h
-
-include $(BUILD)/Library.mk
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/GNUMake/RecastDemo.mk b/dep/recastnavigation/RecastDemo/Build/GNUMake/RecastDemo.mk
deleted file mode 100644
index 42f6b5e9234..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/GNUMake/RecastDemo.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-NAME = RecastDemo
-
-SOURCES = \
-	ChunkyTriMesh.cpp \
-	ConvexVolumeTool.cpp \
-	CrowdManager.cpp \
-	CrowdTool.cpp \
-	Filelist.cpp \
-	foo \
-	imgui.cpp \
-	imguiRenderGL.cpp \
-	InputGeom.cpp \
-	main.cpp \
-	MeshLoaderObj.cpp \
-	NavMeshTesterTool.cpp \
-	OffMeshConnectionTool.cpp \
-	PerfTimer.cpp \
-	Sample.cpp \
-	Sample_Debug.cpp \
-	SampleInterfaces.cpp \
-	Sample_SoloMeshSimple.cpp \
-	Sample_SoloMeshTiled.cpp \
-	Sample_TileMesh.cpp \
-	SDLMain.m \
-	SlideShow.cpp \
-	TestCase.cpp \
-	ValueHistory.cpp
-
-HEADERS = \
-	ChunkyTriMesh.h \
-	ConvexVolumeTool.h \
-	CrowdManager.h \
-	CrowdTool.h \
-	Filelist.h \
-	foo \
-	imgui.h \
-	imguiRenderGL.h \
-	InputGeom.h \
-	MeshLoaderObj.h \
-	NavMeshTesterTool.h \
-	OffMeshConnectionTool.h \
-	PerfTimer.h \
-	Sample_Debug.h \
-	Sample.h \
-	SampleInterfaces.h \
-	Sample_SoloMeshSimple.h \
-	Sample_SoloMeshTiled.h \
-	Sample_TileMesh.h \
-	SDLMain.h \
-	SlideShow.h \
-	TestCase.h \
-	ValueHistory.h
-
-CPPFLAGS = \
-	-I $(NAME)/Contrib \
-	-I DebugUtils/Include \
-	-I Detour/Include \
-	-I Recast/Include \
-	`pkg-config --cflags sdl`
-  
-LDFLAGS = \
-	-L $(BIN) \
-	-lDetour \
-	-lRecast \
-	-lGL -lGLU \
-	`pkg-config --libs sdl`
-
-LIBS = $(BIN)/DebugUtils.a
-
-include $(BUILD)/Program.mk
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/Icon.png b/dep/recastnavigation/RecastDemo/Build/Icon.png
deleted file mode 100644
index d9765026448..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Build/Icon.png and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Build/VC10/.gitignore b/dep/recastnavigation/RecastDemo/Build/VC10/.gitignore
deleted file mode 100644
index 3d47d8f18bb..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/VC10/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Debug
-Release
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/VC10/Recast.sln b/dep/recastnavigation/RecastDemo/Build/VC10/Recast.sln
deleted file mode 100644
index fc82053c672..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/VC10/Recast.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Recast", "Recast.vcxproj", "{CEF242C5-E9A3-403B-BAFF-99397BDA5730}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CEF242C5-E9A3-403B-BAFF-99397BDA5730}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CEF242C5-E9A3-403B-BAFF-99397BDA5730}.Debug|Win32.Build.0 = Debug|Win32
-		{CEF242C5-E9A3-403B-BAFF-99397BDA5730}.Release|Win32.ActiveCfg = Release|Win32
-		{CEF242C5-E9A3-403B-BAFF-99397BDA5730}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/dep/recastnavigation/RecastDemo/Build/VC10/Recast.vcxproj b/dep/recastnavigation/RecastDemo/Build/VC10/Recast.vcxproj
deleted file mode 100644
index 2ed44c3cd5e..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/VC10/Recast.vcxproj
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CEF242C5-E9A3-403B-BAFF-99397BDA5730}</ProjectGuid>
-    <RootNamespace>Recast</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\Bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\Bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\DebugUtils\Include;..\..\..\Recast\Include;..\..\Contrib</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>opengl32.lib;glu32.lib;sdlmain.lib;sdl.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\Contrib\SDL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\DebugUtils\Include;..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\Recast\Include;..\..\Contrib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>opengl32.lib;glu32.lib;sdlmain.lib;sdl.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\Contrib\SDL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Recast\Include\Recast.h" />
-    <ClInclude Include="..\..\..\Recast\Include\RecastAlloc.h" />
-    <ClInclude Include="..\..\..\Recast\Include\RecastAssert.h" />
-    <ClInclude Include="..\..\..\Detour\Include\DetourAlloc.h" />
-    <ClInclude Include="..\..\..\Detour\Include\DetourAssert.h" />
-    <ClInclude Include="..\..\..\Detour\Include\DetourCommon.h" />
-    <ClInclude Include="..\..\..\Detour\Include\DetourNavMesh.h" />
-    <ClInclude Include="..\..\..\Detour\Include\DetourNavMeshBuilder.h" />
-    <ClInclude Include="..\..\..\Detour\Include\DetourNavMeshQuery.h" />
-    <ClInclude Include="..\..\..\Detour\Include\DetourNode.h" />
-    <ClInclude Include="..\..\..\Detour\Include\DetourObstacleAvoidance.h" />
-    <ClInclude Include="..\..\Include\ChunkyTriMesh.h" />
-    <ClInclude Include="..\..\Include\ConvexVolumeTool.h" />
-    <ClInclude Include="..\..\Include\CrowdManager.h" />
-    <ClInclude Include="..\..\Include\CrowdTool.h" />
-    <ClInclude Include="..\..\Include\Debug.h" />
-    <ClInclude Include="..\..\Include\Filelist.h" />
-    <ClInclude Include="..\..\Include\imgui.h" />
-    <ClInclude Include="..\..\Include\imguiRenderGL.h" />
-    <ClInclude Include="..\..\Include\InputGeom.h" />
-    <ClInclude Include="..\..\Include\MeshLoaderObj.h" />
-    <ClInclude Include="..\..\Include\NavMeshTesterTool.h" />
-    <ClInclude Include="..\..\Include\OffMeshConnectionTool.h" />
-    <ClInclude Include="..\..\Include\PerfTimer.h" />
-    <ClInclude Include="..\..\Include\Sample.h" />
-    <ClInclude Include="..\..\Include\Sample_Debug.h" />
-    <ClInclude Include="..\..\Include\Sample_SoloMeshSimple.h" />
-    <ClInclude Include="..\..\Include\Sample_SoloMeshTiled.h" />
-    <ClInclude Include="..\..\Include\Sample_TileMesh.h" />
-    <ClInclude Include="..\..\Include\SampleInterfaces.h" />
-    <ClInclude Include="..\..\Include\SlideShow.h" />
-    <ClInclude Include="..\..\Contrib\stb_image.h" />
-    <ClInclude Include="..\..\Contrib\stb_truetype.h" />
-    <ClInclude Include="..\..\Include\TestCase.h" />
-    <ClInclude Include="..\..\Include\ValueHistory.h" />
-    <ClInclude Include="..\..\..\DebugUtils\Include\DebugDraw.h" />
-    <ClInclude Include="..\..\..\DebugUtils\Include\DetourDebugDraw.h" />
-    <ClInclude Include="..\..\..\DebugUtils\Include\RecastDebugDraw.h" />
-    <ClInclude Include="..\..\..\DebugUtils\Include\RecastDump.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Recast\Source\Recast.cpp" />
-    <ClCompile Include="..\..\..\Recast\Source\RecastAlloc.cpp" />
-    <ClCompile Include="..\..\..\Recast\Source\RecastArea.cpp" />
-    <ClCompile Include="..\..\..\Recast\Source\RecastContour.cpp" />
-    <ClCompile Include="..\..\..\Recast\Source\RecastFilter.cpp" />
-    <ClCompile Include="..\..\..\Recast\Source\RecastMesh.cpp" />
-    <ClCompile Include="..\..\..\Recast\Source\RecastMeshDetail.cpp" />
-    <ClCompile Include="..\..\..\Recast\Source\RecastRasterization.cpp" />
-    <ClCompile Include="..\..\..\Recast\Source\RecastRegion.cpp" />
-    <ClCompile Include="..\..\..\Detour\Source\DetourAlloc.cpp" />
-    <ClCompile Include="..\..\..\Detour\Source\DetourCommon.cpp" />
-    <ClCompile Include="..\..\..\Detour\Source\DetourNavMesh.cpp" />
-    <ClCompile Include="..\..\..\Detour\Source\DetourNavMeshBuilder.cpp" />
-    <ClCompile Include="..\..\..\Detour\Source\DetourNavMeshQuery.cpp" />
-    <ClCompile Include="..\..\..\Detour\Source\DetourNode.cpp" />
-    <ClCompile Include="..\..\..\Detour\Source\DetourObstacleAvoidance.cpp" />
-    <ClCompile Include="..\..\Source\ChunkyTriMesh.cpp" />
-    <ClCompile Include="..\..\Source\ConvexVolumeTool.cpp" />
-    <ClCompile Include="..\..\Source\CrowdManager.cpp" />
-    <ClCompile Include="..\..\Source\CrowdTool.cpp" />
-    <ClCompile Include="..\..\Source\Debug.cpp" />
-    <ClCompile Include="..\..\Source\Filelist.cpp" />
-    <ClCompile Include="..\..\Source\imgui.cpp" />
-    <ClCompile Include="..\..\Source\imguiRenderGL.cpp" />
-    <ClCompile Include="..\..\Source\InputGeom.cpp" />
-    <ClCompile Include="..\..\Source\main.cpp" />
-    <ClCompile Include="..\..\Source\MeshLoaderObj.cpp" />
-    <ClCompile Include="..\..\Source\NavMeshTesterTool.cpp" />
-    <ClCompile Include="..\..\Source\OffMeshConnectionTool.cpp" />
-    <ClCompile Include="..\..\Source\PerfTimer.cpp" />
-    <ClCompile Include="..\..\Source\Sample.cpp" />
-    <ClCompile Include="..\..\Source\Sample_Debug.cpp" />
-    <ClCompile Include="..\..\Source\Sample_SoloMeshSimple.cpp" />
-    <ClCompile Include="..\..\Source\Sample_SoloMeshTiled.cpp" />
-    <ClCompile Include="..\..\Source\Sample_TileMesh.cpp" />
-    <ClCompile Include="..\..\Source\SampleInterfaces.cpp" />
-    <ClCompile Include="..\..\Source\SlideShow.cpp" />
-    <ClCompile Include="..\..\Source\TestCase.cpp" />
-    <ClCompile Include="..\..\Source\ValueHistory.cpp" />
-    <ClCompile Include="..\..\..\DebugUtils\Source\DebugDraw.cpp" />
-    <ClCompile Include="..\..\..\DebugUtils\Source\DetourDebugDraw.cpp" />
-    <ClCompile Include="..\..\..\DebugUtils\Source\RecastDebugDraw.cpp" />
-    <ClCompile Include="..\..\..\DebugUtils\Source\RecastDump.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/VC10/Recast.vcxproj.filters b/dep/recastnavigation/RecastDemo/Build/VC10/Recast.vcxproj.filters
deleted file mode 100644
index 5e369839e36..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/VC10/Recast.vcxproj.filters
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="Recast">
-      <UniqueIdentifier>{84bf8ba9-f9d0-4ed2-8f08-b34832ccfa4c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Recast\Include">
-      <UniqueIdentifier>{5e4b8ced-36a6-4e52-b2be-c85846cfa532}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Recast\Source">
-      <UniqueIdentifier>{d6907ba5-317a-4288-a1cf-0987bdce1203}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Detour">
-      <UniqueIdentifier>{82977c1d-c20c-41d6-a10c-0a8d4267ac92}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Detour\Include">
-      <UniqueIdentifier>{61aeb09b-9567-453b-bb3f-71081e070e14}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Detour\Source">
-      <UniqueIdentifier>{daaf8ba1-489c-4311-b413-09a59326ac7a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Demo">
-      <UniqueIdentifier>{d0925230-3864-4117-8a75-6effa47637ee}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Demo\Include">
-      <UniqueIdentifier>{acdba4c2-12d6-4152-a648-316ce4352942}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Demo\Source">
-      <UniqueIdentifier>{611fd29f-d10e-4838-84de-7a3cfbb50938}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DebugUtils">
-      <UniqueIdentifier>{fe143be5-42bb-448c-89ac-64ce6b8085a7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DebugUtils\Include">
-      <UniqueIdentifier>{33d54d81-b560-489c-9e6f-98eea5e392eb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DebugUtils\Source">
-      <UniqueIdentifier>{397247ef-dd89-4c1f-9aa6-3530fd912461}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Recast\Include\Recast.h">
-      <Filter>Recast\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Recast\Include\RecastAlloc.h">
-      <Filter>Recast\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Recast\Include\RecastAssert.h">
-      <Filter>Recast\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Detour\Include\DetourAlloc.h">
-      <Filter>Detour\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Detour\Include\DetourAssert.h">
-      <Filter>Detour\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Detour\Include\DetourCommon.h">
-      <Filter>Detour\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Detour\Include\DetourNavMesh.h">
-      <Filter>Detour\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Detour\Include\DetourNavMeshBuilder.h">
-      <Filter>Detour\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Detour\Include\DetourNavMeshQuery.h">
-      <Filter>Detour\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Detour\Include\DetourNode.h">
-      <Filter>Detour\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Detour\Include\DetourObstacleAvoidance.h">
-      <Filter>Detour\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\ChunkyTriMesh.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\ConvexVolumeTool.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\CrowdManager.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\CrowdTool.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\Debug.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\Filelist.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\imgui.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\imguiRenderGL.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\InputGeom.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\MeshLoaderObj.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\NavMeshTesterTool.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\OffMeshConnectionTool.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\PerfTimer.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\Sample.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\Sample_Debug.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\Sample_SoloMeshSimple.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\Sample_SoloMeshTiled.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\Sample_TileMesh.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\SampleInterfaces.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\SlideShow.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Contrib\stb_image.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Contrib\stb_truetype.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\TestCase.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Include\ValueHistory.h">
-      <Filter>Demo\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\DebugUtils\Include\DebugDraw.h">
-      <Filter>DebugUtils\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\DebugUtils\Include\DetourDebugDraw.h">
-      <Filter>DebugUtils\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\DebugUtils\Include\RecastDebugDraw.h">
-      <Filter>DebugUtils\Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\DebugUtils\Include\RecastDump.h">
-      <Filter>DebugUtils\Include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Recast\Source\Recast.cpp">
-      <Filter>Recast\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Recast\Source\RecastAlloc.cpp">
-      <Filter>Recast\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Recast\Source\RecastArea.cpp">
-      <Filter>Recast\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Recast\Source\RecastContour.cpp">
-      <Filter>Recast\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Recast\Source\RecastFilter.cpp">
-      <Filter>Recast\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Recast\Source\RecastMesh.cpp">
-      <Filter>Recast\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Recast\Source\RecastMeshDetail.cpp">
-      <Filter>Recast\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Recast\Source\RecastRasterization.cpp">
-      <Filter>Recast\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Recast\Source\RecastRegion.cpp">
-      <Filter>Recast\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Detour\Source\DetourAlloc.cpp">
-      <Filter>Detour\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Detour\Source\DetourCommon.cpp">
-      <Filter>Detour\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Detour\Source\DetourNavMesh.cpp">
-      <Filter>Detour\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Detour\Source\DetourNavMeshBuilder.cpp">
-      <Filter>Detour\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Detour\Source\DetourNavMeshQuery.cpp">
-      <Filter>Detour\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Detour\Source\DetourNode.cpp">
-      <Filter>Detour\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Detour\Source\DetourObstacleAvoidance.cpp">
-      <Filter>Detour\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\ChunkyTriMesh.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\ConvexVolumeTool.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CrowdManager.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\CrowdTool.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Debug.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Filelist.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\imgui.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\imguiRenderGL.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\InputGeom.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\main.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\MeshLoaderObj.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\NavMeshTesterTool.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\OffMeshConnectionTool.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\PerfTimer.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Sample.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Sample_Debug.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Sample_SoloMeshSimple.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Sample_SoloMeshTiled.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Sample_TileMesh.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\SampleInterfaces.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\SlideShow.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\TestCase.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\ValueHistory.cpp">
-      <Filter>Demo\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\DebugUtils\Source\DebugDraw.cpp">
-      <Filter>DebugUtils\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\DebugUtils\Source\DetourDebugDraw.cpp">
-      <Filter>DebugUtils\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\DebugUtils\Source\RecastDebugDraw.cpp">
-      <Filter>DebugUtils\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\DebugUtils\Source\RecastDump.cpp">
-      <Filter>DebugUtils\Source</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/VC9/.gitignore b/dep/recastnavigation/RecastDemo/Build/VC9/.gitignore
deleted file mode 100644
index 3d47d8f18bb..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/VC9/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Debug
-Release
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Build/VC9/Recast.sln b/dep/recastnavigation/RecastDemo/Build/VC9/Recast.sln
deleted file mode 100644
index c38dcd50778..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/VC9/Recast.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Recast", "Recast.vcproj", "{CEF242C5-E9A3-403B-BAFF-99397BDA5730}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CEF242C5-E9A3-403B-BAFF-99397BDA5730}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CEF242C5-E9A3-403B-BAFF-99397BDA5730}.Debug|Win32.Build.0 = Debug|Win32
-		{CEF242C5-E9A3-403B-BAFF-99397BDA5730}.Release|Win32.ActiveCfg = Release|Win32
-		{CEF242C5-E9A3-403B-BAFF-99397BDA5730}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/dep/recastnavigation/RecastDemo/Build/VC9/Recast.vcproj b/dep/recastnavigation/RecastDemo/Build/VC9/Recast.vcproj
deleted file mode 100644
index c22a2262a69..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/VC9/Recast.vcproj
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="Recast"
-	ProjectGUID="{CEF242C5-E9A3-403B-BAFF-99397BDA5730}"
-	RootNamespace="Recast"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\Bin"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\DebugUtils\Include;..\..\..\Recast\Include;..\..\Contrib;$(NOINHERIT)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib glu32.lib sdlmain.lib sdl.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\Contrib\SDL\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\Bin"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\DebugUtils\Include;..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\Recast\Include;..\..\Contrib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib glu32.lib sdlmain.lib sdl.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\Contrib\SDL\lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="Recast"
-			>
-			<Filter
-				Name="Include"
-				>
-				<File
-					RelativePath="..\..\..\Recast\Include\Recast.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Recast\Include\RecastAlloc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Recast\Include\RecastAssert.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source"
-				>
-				<File
-					RelativePath="..\..\..\Recast\Source\Recast.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Recast\Source\RecastAlloc.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Recast\Source\RecastArea.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Recast\Source\RecastContour.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Recast\Source\RecastFilter.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Recast\Source\RecastMesh.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Recast\Source\RecastMeshDetail.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Recast\Source\RecastRasterization.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Recast\Source\RecastRegion.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Detour"
-			>
-			<Filter
-				Name="Include"
-				>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourAlloc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourAssert.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourCommon.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourNavMesh.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourNavMeshBuilder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourNavMeshQuery.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourNode.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourObstacleAvoidance.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source"
-				>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourAlloc.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourCommon.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourNavMesh.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourNavMeshBuilder.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourNavMeshQuery.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourNode.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourObstacleAvoidance.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Demo"
-			>
-			<Filter
-				Name="Include"
-				>
-				<File
-					RelativePath="..\..\Include\ChunkyTriMesh.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\ConvexVolumeTool.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\CrowdManager.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\CrowdTool.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\Debug.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\Filelist.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\imgui.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\imguiRenderGL.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\InputGeom.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\MeshLoaderObj.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\NavMeshTesterTool.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\OffMeshConnectionTool.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\PerfTimer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\Sample.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\Sample_Debug.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\Sample_SoloMeshSimple.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\Sample_SoloMeshTiled.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\Sample_TileMesh.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\SampleInterfaces.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\SlideShow.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Contrib\stb_image.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Contrib\stb_truetype.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\TestCase.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Include\ValueHistory.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source"
-				>
-				<File
-					RelativePath="..\..\Source\ChunkyTriMesh.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\ConvexVolumeTool.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\CrowdManager.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\CrowdTool.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\Debug.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\Filelist.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\imgui.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\imguiRenderGL.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\InputGeom.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\main.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\MeshLoaderObj.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\NavMeshTesterTool.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\OffMeshConnectionTool.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\PerfTimer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\Sample.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\Sample_Debug.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\Sample_SoloMeshSimple.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\Sample_SoloMeshTiled.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\Sample_TileMesh.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\SampleInterfaces.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\SlideShow.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\TestCase.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Source\ValueHistory.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="DebugUtils"
-			>
-			<Filter
-				Name="Include"
-				>
-				<File
-					RelativePath="..\..\..\DebugUtils\Include\DebugDraw.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\DebugUtils\Include\DetourDebugDraw.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\DebugUtils\Include\RecastDebugDraw.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\DebugUtils\Include\RecastDump.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source"
-				>
-				<File
-					RelativePath="..\..\..\DebugUtils\Source\DebugDraw.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\DebugUtils\Source\DetourDebugDraw.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\DebugUtils\Source\RecastDebugDraw.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\DebugUtils\Source\RecastDump.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dep/recastnavigation/RecastDemo/Build/Xcode/English.lproj/InfoPlist.strings b/dep/recastnavigation/RecastDemo/Build/Xcode/English.lproj/InfoPlist.strings
deleted file mode 100644
index 5e45963c382..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Build/Xcode/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Build/Xcode/English.lproj/MainMenu.xib b/dep/recastnavigation/RecastDemo/Build/Xcode/English.lproj/MainMenu.xib
deleted file mode 100644
index 3a7530a73ce..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/Xcode/English.lproj/MainMenu.xib
+++ /dev/null
@@ -1,3034 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9D29</string>
-		<string key="IBDocument.InterfaceBuilderVersion">664</string>
-		<string key="IBDocument.AppKitVersion">949.33</string>
-		<string key="IBDocument.HIToolboxVersion">352.00</string>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="57"/>
-			<integer value="371"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilderKit</string>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSMenu" id="649796088">
-				<string key="NSTitle">AMainMenu</string>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="694149608">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">NewApplication</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="35465992">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">NewApplication</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="238522557">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">About NewApplication</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="304266470">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="609285721">
-									<reference key="NSMenu" ref="110575045"/>
-									<string type="base64-UTF8" key="NSTitle">UHJlZmVyZW5jZXPigKY</string>
-									<string key="NSKeyEquiv">,</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="481834944">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1046388886">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Services</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="752062318">
-										<string key="NSTitle">Services</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-										</object>
-										<string key="NSName">_NSServicesMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="646227648">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="755159360">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide NewApplication</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="342932134">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="908899353">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1056857174">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="632727374">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Quit NewApplication</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="379814623">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">File</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="720053764">
-							<string key="NSTitle">File</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="705341025">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">New</string>
-									<string key="NSKeyEquiv">n</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="722745758">
-									<reference key="NSMenu" ref="720053764"/>
-									<string type="base64-UTF8" key="NSTitle">T3BlbuKApg</string>
-									<string key="NSKeyEquiv">o</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1025936716">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Open Recent</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="1065607017">
-										<string key="NSTitle">Open Recent</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="759406840">
-												<reference key="NSMenu" ref="1065607017"/>
-												<string key="NSTitle">Clear Menu</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</object>
-										<string key="NSName">_NSRecentDocumentsMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="425164168">
-									<reference key="NSMenu" ref="720053764"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="776162233">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Close</string>
-									<string key="NSKeyEquiv">w</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1023925487">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Save</string>
-									<string key="NSKeyEquiv">s</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="117038363">
-									<reference key="NSMenu" ref="720053764"/>
-									<string type="base64-UTF8" key="NSTitle">U2F2ZSBBc+KApg</string>
-									<string key="NSKeyEquiv">S</string>
-									<int key="NSKeyEquivModMask">1179648</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="579971712">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Revert to Saved</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1010469920">
-									<reference key="NSMenu" ref="720053764"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="294629803">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Page Setup...</string>
-									<string key="NSKeyEquiv">P</string>
-									<int key="NSKeyEquivModMask">1179648</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSToolTip"/>
-								</object>
-								<object class="NSMenuItem" id="49223823">
-									<reference key="NSMenu" ref="720053764"/>
-									<string type="base64-UTF8" key="NSTitle">UHJpbnTigKY</string>
-									<string key="NSKeyEquiv">p</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="952259628">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Edit</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="789758025">
-							<string key="NSTitle">Edit</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="1058277027">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Undo</string>
-									<string key="NSKeyEquiv">z</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="790794224">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Redo</string>
-									<string key="NSKeyEquiv">Z</string>
-									<int key="NSKeyEquivModMask">1179648</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1040322652">
-									<reference key="NSMenu" ref="789758025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="296257095">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Cut</string>
-									<string key="NSKeyEquiv">x</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="860595796">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Copy</string>
-									<string key="NSKeyEquiv">c</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="29853731">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Paste</string>
-									<string key="NSKeyEquiv">v</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="437104165">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Delete</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="583158037">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Select All</string>
-									<string key="NSKeyEquiv">a</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="212016141">
-									<reference key="NSMenu" ref="789758025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="892235320">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Find</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="963351320">
-										<string key="NSTitle">Find</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="447796847">
-												<reference key="NSMenu" ref="963351320"/>
-												<string type="base64-UTF8" key="NSTitle">RmluZOKApg</string>
-												<string key="NSKeyEquiv">f</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">1</int>
-											</object>
-											<object class="NSMenuItem" id="326711663">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Find Next</string>
-												<string key="NSKeyEquiv">g</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">2</int>
-											</object>
-											<object class="NSMenuItem" id="270902937">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Find Previous</string>
-												<string key="NSKeyEquiv">G</string>
-												<int key="NSKeyEquivModMask">1179648</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">3</int>
-											</object>
-											<object class="NSMenuItem" id="159080638">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Use Selection for Find</string>
-												<string key="NSKeyEquiv">e</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">7</int>
-											</object>
-											<object class="NSMenuItem" id="88285865">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Jump to Selection</string>
-												<string key="NSKeyEquiv">j</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</object>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="972420730">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Spelling and Grammar</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="769623530">
-										<string key="NSTitle">Spelling and Grammar</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="679648819">
-												<reference key="NSMenu" ref="769623530"/>
-												<string type="base64-UTF8" key="NSTitle">U2hvdyBTcGVsbGluZ+KApg</string>
-												<string key="NSKeyEquiv">:</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="96193923">
-												<reference key="NSMenu" ref="769623530"/>
-												<string key="NSTitle">Check Spelling</string>
-												<string key="NSKeyEquiv">;</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="948374510">
-												<reference key="NSMenu" ref="769623530"/>
-												<string key="NSTitle">Check Spelling While Typing</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="967646866">
-												<reference key="NSMenu" ref="769623530"/>
-												<string key="NSTitle">Check Grammar With Spelling</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</object>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="507821607">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Substitutions</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="698887838">
-										<string key="NSTitle">Substitutions</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="605118523">
-												<reference key="NSMenu" ref="698887838"/>
-												<string key="NSTitle">Smart Copy/Paste</string>
-												<string key="NSKeyEquiv">f</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">1</int>
-											</object>
-											<object class="NSMenuItem" id="197661976">
-												<reference key="NSMenu" ref="698887838"/>
-												<string key="NSTitle">Smart Quotes</string>
-												<string key="NSKeyEquiv">g</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">2</int>
-											</object>
-											<object class="NSMenuItem" id="708854459">
-												<reference key="NSMenu" ref="698887838"/>
-												<string key="NSTitle">Smart Links</string>
-												<string key="NSKeyEquiv">G</string>
-												<int key="NSKeyEquivModMask">1179648</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">3</int>
-											</object>
-										</object>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="676164635">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Speech</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="785027613">
-										<string key="NSTitle">Speech</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="731782645">
-												<reference key="NSMenu" ref="785027613"/>
-												<string key="NSTitle">Start Speaking</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="680220178">
-												<reference key="NSMenu" ref="785027613"/>
-												<string key="NSTitle">Stop Speaking</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</object>
-									</object>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="302598603">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Format</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="941447902">
-							<string key="NSTitle">Format</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="792887677">
-									<reference key="NSMenu" ref="941447902"/>
-									<string key="NSTitle">Font</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="786677654">
-										<string key="NSTitle">Font</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="159677712">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Show Fonts</string>
-												<string key="NSKeyEquiv">t</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="305399458">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Bold</string>
-												<string key="NSKeyEquiv">b</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">2</int>
-											</object>
-											<object class="NSMenuItem" id="814362025">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Italic</string>
-												<string key="NSKeyEquiv">i</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">1</int>
-											</object>
-											<object class="NSMenuItem" id="330926929">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Underline</string>
-												<string key="NSKeyEquiv">u</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="533507878">
-												<reference key="NSMenu" ref="786677654"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="158063935">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Bigger</string>
-												<string key="NSKeyEquiv">+</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">3</int>
-											</object>
-											<object class="NSMenuItem" id="885547335">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Smaller</string>
-												<string key="NSKeyEquiv">-</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">4</int>
-											</object>
-											<object class="NSMenuItem" id="901062459">
-												<reference key="NSMenu" ref="786677654"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="767671776">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Kern</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<string key="NSAction">submenuAction:</string>
-												<object class="NSMenu" key="NSSubmenu" id="175441468">
-													<string key="NSTitle">Kern</string>
-													<object class="NSMutableArray" key="NSMenuItems">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSMenuItem" id="252969304">
-															<reference key="NSMenu" ref="175441468"/>
-															<string key="NSTitle">Use Default</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="766922938">
-															<reference key="NSMenu" ref="175441468"/>
-															<string key="NSTitle">Use None</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="677519740">
-															<reference key="NSMenu" ref="175441468"/>
-															<string key="NSTitle">Tighten</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="238351151">
-															<reference key="NSMenu" ref="175441468"/>
-															<string key="NSTitle">Loosen</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-													</object>
-												</object>
-											</object>
-											<object class="NSMenuItem" id="691570813">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Ligature</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<string key="NSAction">submenuAction:</string>
-												<object class="NSMenu" key="NSSubmenu" id="1058217995">
-													<string key="NSTitle">Ligature</string>
-													<object class="NSMutableArray" key="NSMenuItems">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSMenuItem" id="706297211">
-															<reference key="NSMenu" ref="1058217995"/>
-															<string key="NSTitle">Use Default</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="568384683">
-															<reference key="NSMenu" ref="1058217995"/>
-															<string key="NSTitle">Use None</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="663508465">
-															<reference key="NSMenu" ref="1058217995"/>
-															<string key="NSTitle">Use All</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-													</object>
-												</object>
-											</object>
-											<object class="NSMenuItem" id="769124883">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Baseline</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<string key="NSAction">submenuAction:</string>
-												<object class="NSMenu" key="NSSubmenu" id="18263474">
-													<string key="NSTitle">Baseline</string>
-													<object class="NSMutableArray" key="NSMenuItems">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSMenuItem" id="257962622">
-															<reference key="NSMenu" ref="18263474"/>
-															<string key="NSTitle">Use Default</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="644725453">
-															<reference key="NSMenu" ref="18263474"/>
-															<string key="NSTitle">Superscript</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="1037576581">
-															<reference key="NSMenu" ref="18263474"/>
-															<string key="NSTitle">Subscript</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="941806246">
-															<reference key="NSMenu" ref="18263474"/>
-															<string key="NSTitle">Raise</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="1045724900">
-															<reference key="NSMenu" ref="18263474"/>
-															<string key="NSTitle">Lower</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-													</object>
-												</object>
-											</object>
-											<object class="NSMenuItem" id="739652853">
-												<reference key="NSMenu" ref="786677654"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="1012600125">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Show Colors</string>
-												<string key="NSKeyEquiv">C</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="214559597">
-												<reference key="NSMenu" ref="786677654"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="596732606">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Copy Style</string>
-												<string key="NSKeyEquiv">c</string>
-												<int key="NSKeyEquivModMask">1572864</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="393423671">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Paste Style</string>
-												<string key="NSKeyEquiv">v</string>
-												<int key="NSKeyEquivModMask">1572864</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</object>
-										<string key="NSName">_NSFontMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="15516124">
-									<reference key="NSMenu" ref="941447902"/>
-									<string key="NSTitle">Text</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="23081656">
-										<string key="NSTitle">Text</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="135107054">
-												<reference key="NSMenu" ref="23081656"/>
-												<string key="NSTitle">Align Left</string>
-												<string key="NSKeyEquiv">{</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="310547522">
-												<reference key="NSMenu" ref="23081656"/>
-												<string key="NSTitle">Center</string>
-												<string key="NSKeyEquiv">|</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="436088763">
-												<reference key="NSMenu" ref="23081656"/>
-												<string key="NSTitle">Justify</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="498119243">
-												<reference key="NSMenu" ref="23081656"/>
-												<string key="NSTitle">Align Right</string>
-												<string key="NSKeyEquiv">}</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="607995063">
-												<reference key="NSMenu" ref="23081656"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="420564933">
-												<reference key="NSMenu" ref="23081656"/>
-												<string key="NSTitle">Show Ruler</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="479856769">
-												<reference key="NSMenu" ref="23081656"/>
-												<string key="NSTitle">Copy Ruler</string>
-												<string key="NSKeyEquiv">c</string>
-												<int key="NSKeyEquivModMask">1310720</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="333628178">
-												<reference key="NSMenu" ref="23081656"/>
-												<string key="NSTitle">Paste Ruler</string>
-												<string key="NSKeyEquiv">v</string>
-												<int key="NSKeyEquivModMask">1310720</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</object>
-									</object>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="586577488">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">View</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="466310130">
-							<string key="NSTitle">View</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="102151532">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Show Toolbar</string>
-									<string key="NSKeyEquiv">t</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="237841660">
-									<reference key="NSMenu" ref="466310130"/>
-									<string type="base64-UTF8" key="NSTitle">Q3VzdG9taXplIFRvb2xiYXLigKY</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="713487014">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Window</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="835318025">
-							<string key="NSTitle">Window</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="1011231497">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Minimize</string>
-									<string key="NSKeyEquiv">m</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="575023229">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Zoom</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="299356726">
-									<reference key="NSMenu" ref="835318025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="625202149">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Bring All to Front</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSWindowsMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="391199113">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="374024848">
-							<string key="NSTitle">Help</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="238773614">
-									<reference key="NSMenu" ref="374024848"/>
-									<string key="NSTitle">NewApplication Help</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-				</object>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSWindowTemplate" id="972006081">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{335, 390}, {480, 360}}</string>
-				<int key="NSWTFlags">1946157056</int>
-				<string key="NSWindowTitle">Window</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-				<object class="NSView" key="NSWindowView" id="439893737">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<string key="NSFrameSize">{480, 360}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
-			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1011231497"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="625202149"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">print:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="49223823"/>
-					</object>
-					<int key="connectionID">86</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">runPageLayout:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="294629803"/>
-					</object>
-					<int key="connectionID">87</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">clearRecentDocuments:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="759406840"/>
-					</object>
-					<int key="connectionID">127</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performClose:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="776162233"/>
-					</object>
-					<int key="connectionID">193</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleContinuousSpellChecking:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="948374510"/>
-					</object>
-					<int key="connectionID">222</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">undo:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1058277027"/>
-					</object>
-					<int key="connectionID">223</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">copy:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="860595796"/>
-					</object>
-					<int key="connectionID">224</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">checkSpelling:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="96193923"/>
-					</object>
-					<int key="connectionID">225</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">paste:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="29853731"/>
-					</object>
-					<int key="connectionID">226</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">stopSpeaking:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="680220178"/>
-					</object>
-					<int key="connectionID">227</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">cut:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="296257095"/>
-					</object>
-					<int key="connectionID">228</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showGuessPanel:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="679648819"/>
-					</object>
-					<int key="connectionID">230</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">redo:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="790794224"/>
-					</object>
-					<int key="connectionID">231</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectAll:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="583158037"/>
-					</object>
-					<int key="connectionID">232</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">startSpeaking:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="731782645"/>
-					</object>
-					<int key="connectionID">233</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">delete:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="437104165"/>
-					</object>
-					<int key="connectionID">235</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performZoom:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="575023229"/>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performFindPanelAction:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="447796847"/>
-					</object>
-					<int key="connectionID">241</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">centerSelectionInVisibleArea:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="88285865"/>
-					</object>
-					<int key="connectionID">245</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleGrammarChecking:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="967646866"/>
-					</object>
-					<int key="connectionID">347</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleSmartInsertDelete:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="605118523"/>
-					</object>
-					<int key="connectionID">355</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleAutomaticQuoteSubstitution:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="197661976"/>
-					</object>
-					<int key="connectionID">356</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleAutomaticLinkDetection:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="708854459"/>
-					</object>
-					<int key="connectionID">357</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showHelp:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="238773614"/>
-					</object>
-					<int key="connectionID">360</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">saveDocument:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1023925487"/>
-					</object>
-					<int key="connectionID">362</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">saveDocumentAs:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="117038363"/>
-					</object>
-					<int key="connectionID">363</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">revertDocumentToSaved:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="579971712"/>
-					</object>
-					<int key="connectionID">364</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">runToolbarCustomizationPalette:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="237841660"/>
-					</object>
-					<int key="connectionID">365</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleToolbarShown:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="102151532"/>
-					</object>
-					<int key="connectionID">366</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="755159360"/>
-					</object>
-					<int key="connectionID">367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="342932134"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="908899353"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">newDocument:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="705341025"/>
-					</object>
-					<int key="connectionID">373</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openDocument:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="722745758"/>
-					</object>
-					<int key="connectionID">374</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addFontTrait:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="305399458"/>
-					</object>
-					<int key="connectionID">421</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addFontTrait:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="814362025"/>
-					</object>
-					<int key="connectionID">422</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">modifyFont:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="885547335"/>
-					</object>
-					<int key="connectionID">423</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontFontPanel:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="159677712"/>
-					</object>
-					<int key="connectionID">424</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">modifyFont:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="158063935"/>
-					</object>
-					<int key="connectionID">425</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">raiseBaseline:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="941806246"/>
-					</object>
-					<int key="connectionID">426</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">lowerBaseline:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1045724900"/>
-					</object>
-					<int key="connectionID">427</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">copyFont:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="596732606"/>
-					</object>
-					<int key="connectionID">428</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">subscript:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1037576581"/>
-					</object>
-					<int key="connectionID">429</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">superscript:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="644725453"/>
-					</object>
-					<int key="connectionID">430</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">tightenKerning:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="677519740"/>
-					</object>
-					<int key="connectionID">431</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">underline:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="330926929"/>
-					</object>
-					<int key="connectionID">432</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontColorPanel:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1012600125"/>
-					</object>
-					<int key="connectionID">433</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">useAllLigatures:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="663508465"/>
-					</object>
-					<int key="connectionID">434</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">loosenKerning:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="238351151"/>
-					</object>
-					<int key="connectionID">435</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">pasteFont:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="393423671"/>
-					</object>
-					<int key="connectionID">436</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unscript:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="257962622"/>
-					</object>
-					<int key="connectionID">437</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">useStandardKerning:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="252969304"/>
-					</object>
-					<int key="connectionID">438</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">useStandardLigatures:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="706297211"/>
-					</object>
-					<int key="connectionID">439</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">turnOffLigatures:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="568384683"/>
-					</object>
-					<int key="connectionID">440</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">turnOffKerning:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="766922938"/>
-					</object>
-					<int key="connectionID">441</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">alignLeft:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="135107054"/>
-					</object>
-					<int key="connectionID">442</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">alignJustified:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="436088763"/>
-					</object>
-					<int key="connectionID">443</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">copyRuler:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="479856769"/>
-					</object>
-					<int key="connectionID">444</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">alignCenter:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="310547522"/>
-					</object>
-					<int key="connectionID">445</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleRuler:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="420564933"/>
-					</object>
-					<int key="connectionID">446</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">alignRight:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="498119243"/>
-					</object>
-					<int key="connectionID">447</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">pasteRuler:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="333628178"/>
-					</object>
-					<int key="connectionID">448</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
-					</object>
-					<int key="connectionID">449</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="1049">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="1049"/>
-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="1049"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="1049"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="713487014"/>
-							<reference ref="694149608"/>
-							<reference ref="391199113"/>
-							<reference ref="952259628"/>
-							<reference ref="379814623"/>
-							<reference ref="586577488"/>
-							<reference ref="302598603"/>
-						</object>
-						<reference key="parent" ref="1049"/>
-						<string key="objectName">MainMenu</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="713487014"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="835318025"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="694149608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="110575045"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">103</int>
-						<reference key="object" ref="391199113"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="374024848"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-						<string key="objectName">1</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">217</int>
-						<reference key="object" ref="952259628"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="789758025"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">83</int>
-						<reference key="object" ref="379814623"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="720053764"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">81</int>
-						<reference key="object" ref="720053764"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1023925487"/>
-							<reference ref="117038363"/>
-							<reference ref="49223823"/>
-							<reference ref="722745758"/>
-							<reference ref="705341025"/>
-							<reference ref="1025936716"/>
-							<reference ref="294629803"/>
-							<reference ref="776162233"/>
-							<reference ref="425164168"/>
-							<reference ref="579971712"/>
-							<reference ref="1010469920"/>
-						</object>
-						<reference key="parent" ref="379814623"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">75</int>
-						<reference key="object" ref="1023925487"/>
-						<reference key="parent" ref="720053764"/>
-						<string key="objectName">3</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">80</int>
-						<reference key="object" ref="117038363"/>
-						<reference key="parent" ref="720053764"/>
-						<string key="objectName">8</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">78</int>
-						<reference key="object" ref="49223823"/>
-						<reference key="parent" ref="720053764"/>
-						<string key="objectName">6</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">72</int>
-						<reference key="object" ref="722745758"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">82</int>
-						<reference key="object" ref="705341025"/>
-						<reference key="parent" ref="720053764"/>
-						<string key="objectName">9</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">124</int>
-						<reference key="object" ref="1025936716"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1065607017"/>
-						</object>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">77</int>
-						<reference key="object" ref="294629803"/>
-						<reference key="parent" ref="720053764"/>
-						<string key="objectName">5</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">73</int>
-						<reference key="object" ref="776162233"/>
-						<reference key="parent" ref="720053764"/>
-						<string key="objectName">1</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">79</int>
-						<reference key="object" ref="425164168"/>
-						<reference key="parent" ref="720053764"/>
-						<string key="objectName">7</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">112</int>
-						<reference key="object" ref="579971712"/>
-						<reference key="parent" ref="720053764"/>
-						<string key="objectName">10</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">74</int>
-						<reference key="object" ref="1010469920"/>
-						<reference key="parent" ref="720053764"/>
-						<string key="objectName">2</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">125</int>
-						<reference key="object" ref="1065607017"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="759406840"/>
-						</object>
-						<reference key="parent" ref="1025936716"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">126</int>
-						<reference key="object" ref="759406840"/>
-						<reference key="parent" ref="1065607017"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">205</int>
-						<reference key="object" ref="789758025"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="437104165"/>
-							<reference ref="583158037"/>
-							<reference ref="1058277027"/>
-							<reference ref="212016141"/>
-							<reference ref="296257095"/>
-							<reference ref="29853731"/>
-							<reference ref="860595796"/>
-							<reference ref="1040322652"/>
-							<reference ref="790794224"/>
-							<reference ref="892235320"/>
-							<reference ref="972420730"/>
-							<reference ref="676164635"/>
-							<reference ref="507821607"/>
-						</object>
-						<reference key="parent" ref="952259628"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">202</int>
-						<reference key="object" ref="437104165"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">198</int>
-						<reference key="object" ref="583158037"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">207</int>
-						<reference key="object" ref="1058277027"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">214</int>
-						<reference key="object" ref="212016141"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">199</int>
-						<reference key="object" ref="296257095"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">203</int>
-						<reference key="object" ref="29853731"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">197</int>
-						<reference key="object" ref="860595796"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">206</int>
-						<reference key="object" ref="1040322652"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">215</int>
-						<reference key="object" ref="790794224"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">218</int>
-						<reference key="object" ref="892235320"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="963351320"/>
-						</object>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">216</int>
-						<reference key="object" ref="972420730"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="769623530"/>
-						</object>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">200</int>
-						<reference key="object" ref="769623530"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="948374510"/>
-							<reference ref="96193923"/>
-							<reference ref="679648819"/>
-							<reference ref="967646866"/>
-						</object>
-						<reference key="parent" ref="972420730"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">219</int>
-						<reference key="object" ref="948374510"/>
-						<reference key="parent" ref="769623530"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">201</int>
-						<reference key="object" ref="96193923"/>
-						<reference key="parent" ref="769623530"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">204</int>
-						<reference key="object" ref="679648819"/>
-						<reference key="parent" ref="769623530"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">220</int>
-						<reference key="object" ref="963351320"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="270902937"/>
-							<reference ref="88285865"/>
-							<reference ref="159080638"/>
-							<reference ref="326711663"/>
-							<reference ref="447796847"/>
-						</object>
-						<reference key="parent" ref="892235320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">213</int>
-						<reference key="object" ref="270902937"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">210</int>
-						<reference key="object" ref="88285865"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">221</int>
-						<reference key="object" ref="159080638"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">208</int>
-						<reference key="object" ref="326711663"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">209</int>
-						<reference key="object" ref="447796847"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">106</int>
-						<reference key="object" ref="374024848"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="238773614"/>
-						</object>
-						<reference key="parent" ref="391199113"/>
-						<string key="objectName">2</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">111</int>
-						<reference key="object" ref="238773614"/>
-						<reference key="parent" ref="374024848"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="110575045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="238522557"/>
-							<reference ref="755159360"/>
-							<reference ref="908899353"/>
-							<reference ref="632727374"/>
-							<reference ref="646227648"/>
-							<reference ref="609285721"/>
-							<reference ref="481834944"/>
-							<reference ref="304266470"/>
-							<reference ref="1046388886"/>
-							<reference ref="1056857174"/>
-							<reference ref="342932134"/>
-						</object>
-						<reference key="parent" ref="694149608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="238522557"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
-						<reference key="object" ref="755159360"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="908899353"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="632727374"/>
-						<reference key="parent" ref="110575045"/>
-						<string key="objectName">1111</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="646227648"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">129</int>
-						<reference key="object" ref="609285721"/>
-						<reference key="parent" ref="110575045"/>
-						<string key="objectName">121</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">143</int>
-						<reference key="object" ref="481834944"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="304266470"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">131</int>
-						<reference key="object" ref="1046388886"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="752062318"/>
-						</object>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1056857174"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">145</int>
-						<reference key="object" ref="342932134"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="752062318"/>
-						<reference key="parent" ref="1046388886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="835318025"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="299356726"/>
-							<reference ref="625202149"/>
-							<reference ref="575023229"/>
-							<reference ref="1011231497"/>
-						</object>
-						<reference key="parent" ref="713487014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">92</int>
-						<reference key="object" ref="299356726"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="625202149"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="575023229"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="1011231497"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="586577488"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="466310130"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="466310130"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="102151532"/>
-							<reference ref="237841660"/>
-						</object>
-						<reference key="parent" ref="586577488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">297</int>
-						<reference key="object" ref="102151532"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">298</int>
-						<reference key="object" ref="237841660"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">211</int>
-						<reference key="object" ref="676164635"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="785027613"/>
-						</object>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">212</int>
-						<reference key="object" ref="785027613"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="680220178"/>
-							<reference ref="731782645"/>
-						</object>
-						<reference key="parent" ref="676164635"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">195</int>
-						<reference key="object" ref="680220178"/>
-						<reference key="parent" ref="785027613"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">196</int>
-						<reference key="object" ref="731782645"/>
-						<reference key="parent" ref="785027613"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">346</int>
-						<reference key="object" ref="967646866"/>
-						<reference key="parent" ref="769623530"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">348</int>
-						<reference key="object" ref="507821607"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="698887838"/>
-						</object>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">349</int>
-						<reference key="object" ref="698887838"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="605118523"/>
-							<reference ref="197661976"/>
-							<reference ref="708854459"/>
-						</object>
-						<reference key="parent" ref="507821607"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">350</int>
-						<reference key="object" ref="605118523"/>
-						<reference key="parent" ref="698887838"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">351</int>
-						<reference key="object" ref="197661976"/>
-						<reference key="parent" ref="698887838"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">354</int>
-						<reference key="object" ref="708854459"/>
-						<reference key="parent" ref="698887838"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">371</int>
-						<reference key="object" ref="972006081"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="439893737"/>
-						</object>
-						<reference key="parent" ref="1049"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">372</int>
-						<reference key="object" ref="439893737"/>
-						<reference key="parent" ref="972006081"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">375</int>
-						<reference key="object" ref="302598603"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="941447902"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">376</int>
-						<reference key="object" ref="941447902"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="792887677"/>
-							<reference ref="15516124"/>
-						</object>
-						<reference key="parent" ref="302598603"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">377</int>
-						<reference key="object" ref="792887677"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="786677654"/>
-						</object>
-						<reference key="parent" ref="941447902"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">378</int>
-						<reference key="object" ref="15516124"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="23081656"/>
-						</object>
-						<reference key="parent" ref="941447902"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">379</int>
-						<reference key="object" ref="23081656"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="135107054"/>
-							<reference ref="310547522"/>
-							<reference ref="436088763"/>
-							<reference ref="498119243"/>
-							<reference ref="607995063"/>
-							<reference ref="420564933"/>
-							<reference ref="479856769"/>
-							<reference ref="333628178"/>
-						</object>
-						<reference key="parent" ref="15516124"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">380</int>
-						<reference key="object" ref="135107054"/>
-						<reference key="parent" ref="23081656"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">381</int>
-						<reference key="object" ref="310547522"/>
-						<reference key="parent" ref="23081656"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">382</int>
-						<reference key="object" ref="436088763"/>
-						<reference key="parent" ref="23081656"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">383</int>
-						<reference key="object" ref="498119243"/>
-						<reference key="parent" ref="23081656"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">384</int>
-						<reference key="object" ref="607995063"/>
-						<reference key="parent" ref="23081656"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">385</int>
-						<reference key="object" ref="420564933"/>
-						<reference key="parent" ref="23081656"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">386</int>
-						<reference key="object" ref="479856769"/>
-						<reference key="parent" ref="23081656"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">387</int>
-						<reference key="object" ref="333628178"/>
-						<reference key="parent" ref="23081656"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">388</int>
-						<reference key="object" ref="786677654"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="159677712"/>
-							<reference ref="305399458"/>
-							<reference ref="814362025"/>
-							<reference ref="330926929"/>
-							<reference ref="533507878"/>
-							<reference ref="158063935"/>
-							<reference ref="885547335"/>
-							<reference ref="901062459"/>
-							<reference ref="767671776"/>
-							<reference ref="691570813"/>
-							<reference ref="769124883"/>
-							<reference ref="739652853"/>
-							<reference ref="1012600125"/>
-							<reference ref="214559597"/>
-							<reference ref="596732606"/>
-							<reference ref="393423671"/>
-						</object>
-						<reference key="parent" ref="792887677"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">389</int>
-						<reference key="object" ref="159677712"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">390</int>
-						<reference key="object" ref="305399458"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">391</int>
-						<reference key="object" ref="814362025"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">392</int>
-						<reference key="object" ref="330926929"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">393</int>
-						<reference key="object" ref="533507878"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">394</int>
-						<reference key="object" ref="158063935"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">395</int>
-						<reference key="object" ref="885547335"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">396</int>
-						<reference key="object" ref="901062459"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">397</int>
-						<reference key="object" ref="767671776"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="175441468"/>
-						</object>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">398</int>
-						<reference key="object" ref="691570813"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1058217995"/>
-						</object>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">399</int>
-						<reference key="object" ref="769124883"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="18263474"/>
-						</object>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">400</int>
-						<reference key="object" ref="739652853"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">401</int>
-						<reference key="object" ref="1012600125"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">402</int>
-						<reference key="object" ref="214559597"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">403</int>
-						<reference key="object" ref="596732606"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">404</int>
-						<reference key="object" ref="393423671"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">405</int>
-						<reference key="object" ref="18263474"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="257962622"/>
-							<reference ref="644725453"/>
-							<reference ref="1037576581"/>
-							<reference ref="941806246"/>
-							<reference ref="1045724900"/>
-						</object>
-						<reference key="parent" ref="769124883"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">406</int>
-						<reference key="object" ref="257962622"/>
-						<reference key="parent" ref="18263474"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">407</int>
-						<reference key="object" ref="644725453"/>
-						<reference key="parent" ref="18263474"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">408</int>
-						<reference key="object" ref="1037576581"/>
-						<reference key="parent" ref="18263474"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">409</int>
-						<reference key="object" ref="941806246"/>
-						<reference key="parent" ref="18263474"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">410</int>
-						<reference key="object" ref="1045724900"/>
-						<reference key="parent" ref="18263474"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">411</int>
-						<reference key="object" ref="1058217995"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="706297211"/>
-							<reference ref="568384683"/>
-							<reference ref="663508465"/>
-						</object>
-						<reference key="parent" ref="691570813"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">412</int>
-						<reference key="object" ref="706297211"/>
-						<reference key="parent" ref="1058217995"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">413</int>
-						<reference key="object" ref="568384683"/>
-						<reference key="parent" ref="1058217995"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">414</int>
-						<reference key="object" ref="663508465"/>
-						<reference key="parent" ref="1058217995"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">415</int>
-						<reference key="object" ref="175441468"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="252969304"/>
-							<reference ref="766922938"/>
-							<reference ref="677519740"/>
-							<reference ref="238351151"/>
-						</object>
-						<reference key="parent" ref="767671776"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">416</int>
-						<reference key="object" ref="252969304"/>
-						<reference key="parent" ref="175441468"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">417</int>
-						<reference key="object" ref="766922938"/>
-						<reference key="parent" ref="175441468"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">418</int>
-						<reference key="object" ref="677519740"/>
-						<reference key="parent" ref="175441468"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">419</int>
-						<reference key="object" ref="238351151"/>
-						<reference key="parent" ref="175441468"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="755631768"/>
-						<reference key="parent" ref="1049"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSMutableArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>103.IBPluginDependency</string>
-					<string>103.ImportedFromIB2</string>
-					<string>106.IBPluginDependency</string>
-					<string>106.ImportedFromIB2</string>
-					<string>106.editorWindowContentRectSynchronizationRect</string>
-					<string>111.IBPluginDependency</string>
-					<string>111.ImportedFromIB2</string>
-					<string>112.IBPluginDependency</string>
-					<string>112.ImportedFromIB2</string>
-					<string>124.IBPluginDependency</string>
-					<string>124.ImportedFromIB2</string>
-					<string>125.IBPluginDependency</string>
-					<string>125.ImportedFromIB2</string>
-					<string>125.editorWindowContentRectSynchronizationRect</string>
-					<string>126.IBPluginDependency</string>
-					<string>126.ImportedFromIB2</string>
-					<string>129.IBPluginDependency</string>
-					<string>129.ImportedFromIB2</string>
-					<string>130.IBPluginDependency</string>
-					<string>130.ImportedFromIB2</string>
-					<string>130.editorWindowContentRectSynchronizationRect</string>
-					<string>131.IBPluginDependency</string>
-					<string>131.ImportedFromIB2</string>
-					<string>134.IBPluginDependency</string>
-					<string>134.ImportedFromIB2</string>
-					<string>136.IBPluginDependency</string>
-					<string>136.ImportedFromIB2</string>
-					<string>143.IBPluginDependency</string>
-					<string>143.ImportedFromIB2</string>
-					<string>144.IBPluginDependency</string>
-					<string>144.ImportedFromIB2</string>
-					<string>145.IBPluginDependency</string>
-					<string>145.ImportedFromIB2</string>
-					<string>149.IBPluginDependency</string>
-					<string>149.ImportedFromIB2</string>
-					<string>150.IBPluginDependency</string>
-					<string>150.ImportedFromIB2</string>
-					<string>19.IBPluginDependency</string>
-					<string>19.ImportedFromIB2</string>
-					<string>195.IBPluginDependency</string>
-					<string>195.ImportedFromIB2</string>
-					<string>196.IBPluginDependency</string>
-					<string>196.ImportedFromIB2</string>
-					<string>197.IBPluginDependency</string>
-					<string>197.ImportedFromIB2</string>
-					<string>198.IBPluginDependency</string>
-					<string>198.ImportedFromIB2</string>
-					<string>199.IBPluginDependency</string>
-					<string>199.ImportedFromIB2</string>
-					<string>200.IBPluginDependency</string>
-					<string>200.ImportedFromIB2</string>
-					<string>200.editorWindowContentRectSynchronizationRect</string>
-					<string>201.IBPluginDependency</string>
-					<string>201.ImportedFromIB2</string>
-					<string>202.IBPluginDependency</string>
-					<string>202.ImportedFromIB2</string>
-					<string>203.IBPluginDependency</string>
-					<string>203.ImportedFromIB2</string>
-					<string>204.IBPluginDependency</string>
-					<string>204.ImportedFromIB2</string>
-					<string>205.IBPluginDependency</string>
-					<string>205.ImportedFromIB2</string>
-					<string>205.editorWindowContentRectSynchronizationRect</string>
-					<string>206.IBPluginDependency</string>
-					<string>206.ImportedFromIB2</string>
-					<string>207.IBPluginDependency</string>
-					<string>207.ImportedFromIB2</string>
-					<string>208.IBPluginDependency</string>
-					<string>208.ImportedFromIB2</string>
-					<string>209.IBPluginDependency</string>
-					<string>209.ImportedFromIB2</string>
-					<string>210.IBPluginDependency</string>
-					<string>210.ImportedFromIB2</string>
-					<string>211.IBPluginDependency</string>
-					<string>211.ImportedFromIB2</string>
-					<string>212.IBPluginDependency</string>
-					<string>212.ImportedFromIB2</string>
-					<string>212.editorWindowContentRectSynchronizationRect</string>
-					<string>213.IBPluginDependency</string>
-					<string>213.ImportedFromIB2</string>
-					<string>214.IBPluginDependency</string>
-					<string>214.ImportedFromIB2</string>
-					<string>215.IBPluginDependency</string>
-					<string>215.ImportedFromIB2</string>
-					<string>216.IBPluginDependency</string>
-					<string>216.ImportedFromIB2</string>
-					<string>217.IBPluginDependency</string>
-					<string>217.ImportedFromIB2</string>
-					<string>218.IBPluginDependency</string>
-					<string>218.ImportedFromIB2</string>
-					<string>219.IBPluginDependency</string>
-					<string>219.ImportedFromIB2</string>
-					<string>220.IBPluginDependency</string>
-					<string>220.ImportedFromIB2</string>
-					<string>220.editorWindowContentRectSynchronizationRect</string>
-					<string>221.IBPluginDependency</string>
-					<string>221.ImportedFromIB2</string>
-					<string>23.IBPluginDependency</string>
-					<string>23.ImportedFromIB2</string>
-					<string>236.IBPluginDependency</string>
-					<string>236.ImportedFromIB2</string>
-					<string>239.IBPluginDependency</string>
-					<string>239.ImportedFromIB2</string>
-					<string>24.IBPluginDependency</string>
-					<string>24.ImportedFromIB2</string>
-					<string>24.editorWindowContentRectSynchronizationRect</string>
-					<string>29.IBEditorWindowLastContentRect</string>
-					<string>29.IBPluginDependency</string>
-					<string>29.ImportedFromIB2</string>
-					<string>29.WindowOrigin</string>
-					<string>29.editorWindowContentRectSynchronizationRect</string>
-					<string>295.IBPluginDependency</string>
-					<string>296.IBPluginDependency</string>
-					<string>296.editorWindowContentRectSynchronizationRect</string>
-					<string>297.IBPluginDependency</string>
-					<string>298.IBPluginDependency</string>
-					<string>346.IBPluginDependency</string>
-					<string>346.ImportedFromIB2</string>
-					<string>348.IBPluginDependency</string>
-					<string>348.ImportedFromIB2</string>
-					<string>349.IBPluginDependency</string>
-					<string>349.ImportedFromIB2</string>
-					<string>349.editorWindowContentRectSynchronizationRect</string>
-					<string>350.IBPluginDependency</string>
-					<string>350.ImportedFromIB2</string>
-					<string>351.IBPluginDependency</string>
-					<string>351.ImportedFromIB2</string>
-					<string>354.IBPluginDependency</string>
-					<string>354.ImportedFromIB2</string>
-					<string>371.IBEditorWindowLastContentRect</string>
-					<string>371.IBPluginDependency</string>
-					<string>371.IBWindowTemplateEditedContentRect</string>
-					<string>371.NSWindowTemplate.visibleAtLaunch</string>
-					<string>371.editorWindowContentRectSynchronizationRect</string>
-					<string>371.windowTemplate.maxSize</string>
-					<string>372.IBPluginDependency</string>
-					<string>375.IBPluginDependency</string>
-					<string>376.IBEditorWindowLastContentRect</string>
-					<string>376.IBPluginDependency</string>
-					<string>377.IBPluginDependency</string>
-					<string>378.IBPluginDependency</string>
-					<string>379.IBPluginDependency</string>
-					<string>380.IBPluginDependency</string>
-					<string>381.IBPluginDependency</string>
-					<string>382.IBPluginDependency</string>
-					<string>383.IBPluginDependency</string>
-					<string>384.IBPluginDependency</string>
-					<string>385.IBPluginDependency</string>
-					<string>386.IBPluginDependency</string>
-					<string>387.IBPluginDependency</string>
-					<string>388.IBEditorWindowLastContentRect</string>
-					<string>388.IBPluginDependency</string>
-					<string>389.IBPluginDependency</string>
-					<string>390.IBPluginDependency</string>
-					<string>391.IBPluginDependency</string>
-					<string>392.IBPluginDependency</string>
-					<string>393.IBPluginDependency</string>
-					<string>394.IBPluginDependency</string>
-					<string>395.IBPluginDependency</string>
-					<string>396.IBPluginDependency</string>
-					<string>397.IBPluginDependency</string>
-					<string>398.IBPluginDependency</string>
-					<string>399.IBPluginDependency</string>
-					<string>400.IBPluginDependency</string>
-					<string>401.IBPluginDependency</string>
-					<string>402.IBPluginDependency</string>
-					<string>403.IBPluginDependency</string>
-					<string>404.IBPluginDependency</string>
-					<string>405.IBPluginDependency</string>
-					<string>406.IBPluginDependency</string>
-					<string>407.IBPluginDependency</string>
-					<string>408.IBPluginDependency</string>
-					<string>409.IBPluginDependency</string>
-					<string>410.IBPluginDependency</string>
-					<string>411.IBPluginDependency</string>
-					<string>412.IBPluginDependency</string>
-					<string>413.IBPluginDependency</string>
-					<string>414.IBPluginDependency</string>
-					<string>415.IBPluginDependency</string>
-					<string>416.IBPluginDependency</string>
-					<string>417.IBPluginDependency</string>
-					<string>418.IBPluginDependency</string>
-					<string>419.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>5.ImportedFromIB2</string>
-					<string>56.IBPluginDependency</string>
-					<string>56.ImportedFromIB2</string>
-					<string>57.IBEditorWindowLastContentRect</string>
-					<string>57.IBPluginDependency</string>
-					<string>57.ImportedFromIB2</string>
-					<string>57.editorWindowContentRectSynchronizationRect</string>
-					<string>58.IBPluginDependency</string>
-					<string>58.ImportedFromIB2</string>
-					<string>72.IBPluginDependency</string>
-					<string>72.ImportedFromIB2</string>
-					<string>73.IBPluginDependency</string>
-					<string>73.ImportedFromIB2</string>
-					<string>74.IBPluginDependency</string>
-					<string>74.ImportedFromIB2</string>
-					<string>75.IBPluginDependency</string>
-					<string>75.ImportedFromIB2</string>
-					<string>77.IBPluginDependency</string>
-					<string>77.ImportedFromIB2</string>
-					<string>78.IBPluginDependency</string>
-					<string>78.ImportedFromIB2</string>
-					<string>79.IBPluginDependency</string>
-					<string>79.ImportedFromIB2</string>
-					<string>80.IBPluginDependency</string>
-					<string>80.ImportedFromIB2</string>
-					<string>81.IBPluginDependency</string>
-					<string>81.ImportedFromIB2</string>
-					<string>81.editorWindowContentRectSynchronizationRect</string>
-					<string>82.IBPluginDependency</string>
-					<string>82.ImportedFromIB2</string>
-					<string>83.IBPluginDependency</string>
-					<string>83.ImportedFromIB2</string>
-					<string>92.IBPluginDependency</string>
-					<string>92.ImportedFromIB2</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilderKit</string>
-					<string>com.apple.InterfaceBuilderKit</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1" id="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{596, 852}, {216, 23}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{522, 812}, {146, 23}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{436, 809}, {64, 6}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{608, 612}, {275, 83}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{187, 434}, {243, 243}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{608, 612}, {167, 43}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{608, 612}, {241, 103}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{525, 802}, {197, 73}}</string>
-					<string>{{207, 285}, {478, 20}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{74, 862}</string>
-					<string>{{6, 978}, {478, 20}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{475, 832}, {234, 43}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{608, 612}, {215, 63}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{335, 390}, {480, 360}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{335, 390}, {480, 360}}</string>
-					<reference ref="9"/>
-					<string>{{33, 99}, {480, 360}}</string>
-					<string>{3.40282e+38, 3.40282e+38}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{437, 242}, {86, 43}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{523, 2}, {178, 283}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{219, 102}, {245, 183}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{23, 794}, {245, 183}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{145, 474}, {199, 203}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">449</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>
diff --git a/dep/recastnavigation/RecastDemo/Build/Xcode/Icon.icns b/dep/recastnavigation/RecastDemo/Build/Xcode/Icon.icns
deleted file mode 100644
index 8b482fd920c..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Build/Xcode/Icon.icns and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Build/Xcode/Info.plist b/dep/recastnavigation/RecastDemo/Build/Xcode/Info.plist
deleted file mode 100644
index 4c6f91915cb..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/Xcode/Info.plist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>Icon.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>
diff --git a/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/TemplateIcon.icns b/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/TemplateIcon.icns
deleted file mode 100644
index 62cb7015e09..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/TemplateIcon.icns and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser b/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser
deleted file mode 100644
index b71b5249361..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser
+++ /dev/null
@@ -1,3758 +0,0 @@
-// !$*UTF8*$!
-{
-	089C165DFE840E0CC02AAC07 /* English */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {915, 520}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 45}";
-			sepNavWindowFrame = "{{15, 78}, {1011, 695}}";
-		};
-	};
-	29B97313FDCFA39411CA2CEA /* Project object */ = {
-		activeBuildConfigurationName = Release;
-		activeExecutable = 6B8632970F78114600E2684A /* Recast */;
-		activeTarget = 8D1107260486CEB800E47090 /* Recast */;
-		addToTargets = (
-			8D1107260486CEB800E47090 /* Recast */,
-		);
-		breakpoints = (
-			6BBB4C4C115B7BAD00CF791D /* Sample_TileMesh.cpp:281 */,
-			6B42164711806B2F006C347B /* DetourDebugDraw.cpp:362 */,
-			6B10014C11AD1C1E0098A59A /* RecastMesh.cpp:1324 */,
-			6BA687AC1222F7AC00730711 /* Sample_Debug.cpp:137 */,
-			6BD403421224642500995864 /* NavMeshTesterTool.cpp:547 */,
-			6B920A121225B1C900D5B5AD /* DetourHashLookup.cpp:78 */,
-			6B920A141225B1CF00D5B5AD /* DetourHashLookup.cpp:131 */,
-			6BD66851124350F50021A7A4 /* NavMeshTesterTool.cpp:486 */,
-			6B8D55CD127AAA360077C699 /* CrowdManager.cpp:1197 */,
-			6B74B5EA128312A900262888 /* main.cpp:211 */,
-			6B74B60C128312E600262888 /* CrowdTool.cpp:296 */,
-			6B74B72E1286B1B000262888 /* CrowdManager.cpp:1313 */,
-		);
-		codeSenseManager = 6B8632AA0F78115100E2684A /* Code sense */;
-		executables = (
-			6B8632970F78114600E2684A /* Recast */,
-		);
-		perUserDictionary = {
-			"PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXBreakpointsDataSource_BreakpointID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					20,
-					198,
-					20,
-					99,
-					99,
-					29,
-					20,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXBreakpointsDataSource_ActionID,
-					PBXBreakpointsDataSource_TypeID,
-					PBXBreakpointsDataSource_BreakpointID,
-					PBXBreakpointsDataSource_UseID,
-					PBXBreakpointsDataSource_LocationID,
-					PBXBreakpointsDataSource_ConditionID,
-					PBXBreakpointsDataSource_IgnoreCountID,
-					PBXBreakpointsDataSource_ContinueID,
-				);
-			};
-			"PBXConfiguration.PBXBreakpointsDataSource.v1:1CA23EDF0692099D00951B8B" = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXBreakpointsDataSource_BreakpointID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					20,
-					280,
-					20,
-					179,
-					179,
-					109,
-					20,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXBreakpointsDataSource_ActionID,
-					PBXBreakpointsDataSource_TypeID,
-					PBXBreakpointsDataSource_BreakpointID,
-					PBXBreakpointsDataSource_UseID,
-					PBXBreakpointsDataSource_LocationID,
-					PBXBreakpointsDataSource_ConditionID,
-					PBXBreakpointsDataSource_IgnoreCountID,
-					PBXBreakpointsDataSource_ContinueID,
-				);
-			};
-			PBXConfiguration.PBXFileTableDataSource3.PBXBookmarksDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXBookmarksDataSource_NameID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					200,
-					200,
-					435,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXBookmarksDataSource_LocationID,
-					PBXBookmarksDataSource_NameID,
-					PBXBookmarksDataSource_CommentsID,
-				);
-			};
-			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					753,
-					20,
-					48,
-					43,
-					43,
-					20,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-					PBXFileDataSource_Target_ColumnID,
-				);
-			};
-			PBXConfiguration.PBXFileTableDataSource3.PBXFindDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFindDataSource_LocationID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					200,
-					751,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFindDataSource_MessageID,
-					PBXFindDataSource_LocationID,
-				);
-			};
-			PBXPerProjectTemplateStateSaveDate = 310579257;
-			PBXWorkspaceStateSaveDate = 310579257;
-		};
-		perUserProjectItems = {
-			6B4DE616127F2407001CFDF4 = 6B4DE616127F2407001CFDF4 /* PBXTextBookmark */;
-			6B4DE62E12807542001CFDF4 = 6B4DE62E12807542001CFDF4 /* PBXTextBookmark */;
-			6B4DE62F12807542001CFDF4 = 6B4DE62F12807542001CFDF4 /* PBXTextBookmark */;
-			6B4DE63012807542001CFDF4 = 6B4DE63012807542001CFDF4 /* PBXTextBookmark */;
-			6B4DE63112807542001CFDF4 = 6B4DE63112807542001CFDF4 /* PBXTextBookmark */;
-			6B4DE63212807542001CFDF4 = 6B4DE63212807542001CFDF4 /* PBXTextBookmark */;
-			6B4DE63312807542001CFDF4 = 6B4DE63312807542001CFDF4 /* PBXTextBookmark */;
-			6B4DE63412807542001CFDF4 = 6B4DE63412807542001CFDF4 /* PBXTextBookmark */;
-			6B4DE63512807542001CFDF4 = 6B4DE63512807542001CFDF4 /* PBXTextBookmark */;
-			6B4DE63612807542001CFDF4 = 6B4DE63612807542001CFDF4 /* PBXTextBookmark */;
-			6B4DE64412807587001CFDF4 = 6B4DE64412807587001CFDF4 /* PBXTextBookmark */;
-			6B4DE646128079E0001CFDF4 = 6B4DE646128079E0001CFDF4 /* PBXTextBookmark */;
-			6B4DE647128079E0001CFDF4 = 6B4DE647128079E0001CFDF4 /* PBXTextBookmark */;
-			6B4DE648128079E0001CFDF4 = 6B4DE648128079E0001CFDF4 /* PBXTextBookmark */;
-			6B4DE649128079E0001CFDF4 = 6B4DE649128079E0001CFDF4 /* PBXTextBookmark */;
-			6B4DE64A128079E0001CFDF4 = 6B4DE64A128079E0001CFDF4 /* PBXTextBookmark */;
-			6B4DE64B128079E0001CFDF4 = 6B4DE64B128079E0001CFDF4 /* PBXTextBookmark */;
-			6B4DE64C128079E0001CFDF4 = 6B4DE64C128079E0001CFDF4 /* PBXTextBookmark */;
-			6B4DE651128079F3001CFDF4 = 6B4DE651128079F3001CFDF4 /* PBXTextBookmark */;
-			6B4DE65D12807AB6001CFDF4 = 6B4DE65D12807AB6001CFDF4 /* PBXTextBookmark */;
-			6B4DE65E12807AB6001CFDF4 = 6B4DE65E12807AB6001CFDF4 /* PBXTextBookmark */;
-			6B4DE65F12807AB6001CFDF4 = 6B4DE65F12807AB6001CFDF4 /* PBXTextBookmark */;
-			6B4DE66212807AD9001CFDF4 = 6B4DE66212807AD9001CFDF4 /* PBXTextBookmark */;
-			6B4DE66512807B09001CFDF4 = 6B4DE66512807B09001CFDF4 /* PBXTextBookmark */;
-			6B4DE66612807B39001CFDF4 = 6B4DE66612807B39001CFDF4 /* PBXTextBookmark */;
-			6B4DE66712807B39001CFDF4 = 6B4DE66712807B39001CFDF4 /* PBXTextBookmark */;
-			6B4DE66812807B39001CFDF4 = 6B4DE66812807B39001CFDF4 /* PBXTextBookmark */;
-			6B4DE66912807B41001CFDF4 = 6B4DE66912807B41001CFDF4 /* PBXTextBookmark */;
-			6B4DE66A12807B41001CFDF4 = 6B4DE66A12807B41001CFDF4 /* PBXTextBookmark */;
-			6B4DE66B12807B41001CFDF4 = 6B4DE66B12807B41001CFDF4 /* PBXTextBookmark */;
-			6B4DE66C12807B41001CFDF4 = 6B4DE66C12807B41001CFDF4 /* PBXTextBookmark */;
-			6B4DE67112807C71001CFDF4 = 6B4DE67112807C71001CFDF4 /* PBXTextBookmark */;
-			6B4DE67312807D05001CFDF4 = 6B4DE67312807D05001CFDF4 /* PBXTextBookmark */;
-			6B4DE67412807D05001CFDF4 = 6B4DE67412807D05001CFDF4 /* PBXTextBookmark */;
-			6B4DE67512807D05001CFDF4 = 6B4DE67512807D05001CFDF4 /* PBXTextBookmark */;
-			6B74B5DC1283104100262888 /* PBXTextBookmark */ = 6B74B5DC1283104100262888 /* PBXTextBookmark */;
-			6B74B5EC128312AC00262888 /* PBXTextBookmark */ = 6B74B5EC128312AC00262888 /* PBXTextBookmark */;
-			6B74B5ED128312AC00262888 /* PBXTextBookmark */ = 6B74B5ED128312AC00262888 /* PBXTextBookmark */;
-			6B74B5EE128312AC00262888 /* PBXTextBookmark */ = 6B74B5EE128312AC00262888 /* PBXTextBookmark */;
-			6B74B5EF128312AC00262888 /* PBXTextBookmark */ = 6B74B5EF128312AC00262888 /* PBXTextBookmark */;
-			6B74B5F0128312AC00262888 /* PBXTextBookmark */ = 6B74B5F0128312AC00262888 /* PBXTextBookmark */;
-			6B74B5F1128312AC00262888 /* PBXTextBookmark */ = 6B74B5F1128312AC00262888 /* PBXTextBookmark */;
-			6B74B5F2128312AC00262888 /* PBXTextBookmark */ = 6B74B5F2128312AC00262888 /* PBXTextBookmark */;
-			6B74B5F3128312AC00262888 /* PBXTextBookmark */ = 6B74B5F3128312AC00262888 /* PBXTextBookmark */;
-			6B74B5F4128312AC00262888 /* PBXTextBookmark */ = 6B74B5F4128312AC00262888 /* PBXTextBookmark */;
-			6B74B5F5128312AC00262888 /* PBXTextBookmark */ = 6B74B5F5128312AC00262888 /* PBXTextBookmark */;
-			6B74B5F6128312AC00262888 /* PBXTextBookmark */ = 6B74B5F6128312AC00262888 /* PBXTextBookmark */;
-			6B74B5F7128312AC00262888 /* PBXTextBookmark */ = 6B74B5F7128312AC00262888 /* PBXTextBookmark */;
-			6B74B5F8128312AC00262888 /* PBXTextBookmark */ = 6B74B5F8128312AC00262888 /* PBXTextBookmark */;
-			6B74B5F9128312AC00262888 /* PBXTextBookmark */ = 6B74B5F9128312AC00262888 /* PBXTextBookmark */;
-			6B74B5FA128312AC00262888 /* PBXTextBookmark */ = 6B74B5FA128312AC00262888 /* PBXTextBookmark */;
-			6B74B5FB128312AC00262888 /* PBXTextBookmark */ = 6B74B5FB128312AC00262888 /* PBXTextBookmark */;
-			6B74B5FC128312AC00262888 /* PBXTextBookmark */ = 6B74B5FC128312AC00262888 /* PBXTextBookmark */;
-			6B74B60E128312E900262888 /* PBXTextBookmark */ = 6B74B60E128312E900262888 /* PBXTextBookmark */;
-			6B74B60F128312E900262888 /* PBXTextBookmark */ = 6B74B60F128312E900262888 /* PBXTextBookmark */;
-			6B74B610128312E900262888 /* PBXTextBookmark */ = 6B74B610128312E900262888 /* PBXTextBookmark */;
-			6B74B611128312E900262888 /* PBXTextBookmark */ = 6B74B611128312E900262888 /* PBXTextBookmark */;
-			6B74B612128312E900262888 /* PBXTextBookmark */ = 6B74B612128312E900262888 /* PBXTextBookmark */;
-			6B74B613128312E900262888 /* PBXTextBookmark */ = 6B74B613128312E900262888 /* PBXTextBookmark */;
-			6B74B618128313D600262888 /* PBXTextBookmark */ = 6B74B618128313D600262888 /* PBXTextBookmark */;
-			6B74B622128314A500262888 /* PBXTextBookmark */ = 6B74B622128314A500262888 /* PBXTextBookmark */;
-			6B74B623128314A500262888 /* PBXTextBookmark */ = 6B74B623128314A500262888 /* PBXTextBookmark */;
-			6B74B624128314A500262888 /* PBXTextBookmark */ = 6B74B624128314A500262888 /* PBXTextBookmark */;
-			6B74B625128314A500262888 /* PBXTextBookmark */ = 6B74B625128314A500262888 /* PBXTextBookmark */;
-			6B74B626128314A500262888 /* PBXTextBookmark */ = 6B74B626128314A500262888 /* PBXTextBookmark */;
-			6B74B627128314A500262888 /* PBXTextBookmark */ = 6B74B627128314A500262888 /* PBXTextBookmark */;
-			6B74B628128314A500262888 /* PBXTextBookmark */ = 6B74B628128314A500262888 /* PBXTextBookmark */;
-			6B74B629128314A500262888 /* PBXTextBookmark */ = 6B74B629128314A500262888 /* PBXTextBookmark */;
-			6B74B62A128314A500262888 /* PBXTextBookmark */ = 6B74B62A128314A500262888 /* PBXTextBookmark */;
-			6B74B62B128314A500262888 /* PBXTextBookmark */ = 6B74B62B128314A500262888 /* PBXTextBookmark */;
-			6B74B62C128314A500262888 /* PBXTextBookmark */ = 6B74B62C128314A500262888 /* PBXTextBookmark */;
-			6B74B62D128314A500262888 /* XCBuildMessageTextBookmark */ = 6B74B62D128314A500262888 /* XCBuildMessageTextBookmark */;
-			6B74B62E128314A500262888 /* PBXTextBookmark */ = 6B74B62E128314A500262888 /* PBXTextBookmark */;
-			6B74B66412869CE100262888 /* PBXTextBookmark */ = 6B74B66412869CE100262888 /* PBXTextBookmark */;
-			6B74B66512869CE100262888 /* PBXTextBookmark */ = 6B74B66512869CE100262888 /* PBXTextBookmark */;
-			6B74B66612869CE100262888 /* PBXTextBookmark */ = 6B74B66612869CE100262888 /* PBXTextBookmark */;
-			6B74B66712869CE100262888 /* PBXTextBookmark */ = 6B74B66712869CE100262888 /* PBXTextBookmark */;
-			6B74B66812869CE100262888 /* PBXTextBookmark */ = 6B74B66812869CE100262888 /* PBXTextBookmark */;
-			6B74B66F12869E3000262888 /* PBXTextBookmark */ = 6B74B66F12869E3000262888 /* PBXTextBookmark */;
-			6B74B67012869E3000262888 /* XCBuildMessageTextBookmark */ = 6B74B67012869E3000262888 /* XCBuildMessageTextBookmark */;
-			6B74B67112869E3000262888 /* PBXTextBookmark */ = 6B74B67112869E3000262888 /* PBXTextBookmark */;
-			6B74B6831286A39000262888 /* PBXTextBookmark */ = 6B74B6831286A39000262888 /* PBXTextBookmark */;
-			6B74B6841286A39000262888 /* PBXTextBookmark */ = 6B74B6841286A39000262888 /* PBXTextBookmark */;
-			6B74B6851286A39000262888 /* XCBuildMessageTextBookmark */ = 6B74B6851286A39000262888 /* XCBuildMessageTextBookmark */;
-			6B74B6861286A39000262888 /* PBXTextBookmark */ = 6B74B6861286A39000262888 /* PBXTextBookmark */;
-			6B74B68A1286A47800262888 /* PBXTextBookmark */ = 6B74B68A1286A47800262888 /* PBXTextBookmark */;
-			6B74B68B1286A47800262888 /* PBXTextBookmark */ = 6B74B68B1286A47800262888 /* PBXTextBookmark */;
-			6B74B68C1286A47800262888 /* PBXTextBookmark */ = 6B74B68C1286A47800262888 /* PBXTextBookmark */;
-			6B74B68F1286A4DD00262888 /* PBXTextBookmark */ = 6B74B68F1286A4DD00262888 /* PBXTextBookmark */;
-			6B74B69C1286A52A00262888 /* PBXTextBookmark */ = 6B74B69C1286A52A00262888 /* PBXTextBookmark */;
-			6B74B69D1286A52A00262888 /* PBXTextBookmark */ = 6B74B69D1286A52A00262888 /* PBXTextBookmark */;
-			6B74B69E1286A52A00262888 /* PBXTextBookmark */ = 6B74B69E1286A52A00262888 /* PBXTextBookmark */;
-			6B74B6A01286A67500262888 /* PBXTextBookmark */ = 6B74B6A01286A67500262888 /* PBXTextBookmark */;
-			6B74B6A11286A6AE00262888 /* PBXTextBookmark */ = 6B74B6A11286A6AE00262888 /* PBXTextBookmark */;
-			6B74B6A61286A6C300262888 /* PBXTextBookmark */ = 6B74B6A61286A6C300262888 /* PBXTextBookmark */;
-			6B74B6AA1286A85800262888 /* PBXTextBookmark */ = 6B74B6AA1286A85800262888 /* PBXTextBookmark */;
-			6B74B6AB1286A85800262888 /* PBXTextBookmark */ = 6B74B6AB1286A85800262888 /* PBXTextBookmark */;
-			6B74B6AC1286A85800262888 /* PBXTextBookmark */ = 6B74B6AC1286A85800262888 /* PBXTextBookmark */;
-			6B74B6B51286A9BD00262888 /* PBXTextBookmark */ = 6B74B6B51286A9BD00262888 /* PBXTextBookmark */;
-			6B74B6B61286A9BD00262888 /* PBXTextBookmark */ = 6B74B6B61286A9BD00262888 /* PBXTextBookmark */;
-			6B74B6B71286A9BD00262888 /* XCBuildMessageTextBookmark */ = 6B74B6B71286A9BD00262888 /* XCBuildMessageTextBookmark */;
-			6B74B6B81286A9BD00262888 /* PBXTextBookmark */ = 6B74B6B81286A9BD00262888 /* PBXTextBookmark */;
-			6B74B6BE1286AA0C00262888 /* PBXTextBookmark */ = 6B74B6BE1286AA0C00262888 /* PBXTextBookmark */;
-			6B74B6BF1286AA0C00262888 /* PBXTextBookmark */ = 6B74B6BF1286AA0C00262888 /* PBXTextBookmark */;
-			6B74B6C01286AA0C00262888 /* PBXTextBookmark */ = 6B74B6C01286AA0C00262888 /* PBXTextBookmark */;
-			6B74B6C11286AA0C00262888 /* PBXTextBookmark */ = 6B74B6C11286AA0C00262888 /* PBXTextBookmark */;
-			6B74B6C51286AA5900262888 /* PBXTextBookmark */ = 6B74B6C51286AA5900262888 /* PBXTextBookmark */;
-			6B74B6C91286AAA200262888 /* PBXTextBookmark */ = 6B74B6C91286AAA200262888 /* PBXTextBookmark */;
-			6B74B6CA1286AAA200262888 /* PBXTextBookmark */ = 6B74B6CA1286AAA200262888 /* PBXTextBookmark */;
-			6B74B6CB1286AAA200262888 /* PBXTextBookmark */ = 6B74B6CB1286AAA200262888 /* PBXTextBookmark */;
-			6B74B6CF1286AAF000262888 /* PBXTextBookmark */ = 6B74B6CF1286AAF000262888 /* PBXTextBookmark */;
-			6B74B6D31286AB3B00262888 /* PBXTextBookmark */ = 6B74B6D31286AB3B00262888 /* PBXTextBookmark */;
-			6B74B6D71286ABC000262888 /* PBXTextBookmark */ = 6B74B6D71286ABC000262888 /* PBXTextBookmark */;
-			6B74B6D81286ABC000262888 /* PBXTextBookmark */ = 6B74B6D81286ABC000262888 /* PBXTextBookmark */;
-			6B74B6D91286ABC000262888 /* PBXTextBookmark */ = 6B74B6D91286ABC000262888 /* PBXTextBookmark */;
-			6B74B6DA1286ABC000262888 /* PBXTextBookmark */ = 6B74B6DA1286ABC000262888 /* PBXTextBookmark */;
-			6B74B6DB1286ABC000262888 /* PBXTextBookmark */ = 6B74B6DB1286ABC000262888 /* PBXTextBookmark */;
-			6B74B6DF1286AC2A00262888 /* PBXTextBookmark */ = 6B74B6DF1286AC2A00262888 /* PBXTextBookmark */;
-			6B74B6E01286AC2A00262888 /* PBXTextBookmark */ = 6B74B6E01286AC2A00262888 /* PBXTextBookmark */;
-			6B74B6E11286AC2A00262888 /* PBXTextBookmark */ = 6B74B6E11286AC2A00262888 /* PBXTextBookmark */;
-			6B74B6E51286AC8200262888 /* PBXTextBookmark */ = 6B74B6E51286AC8200262888 /* PBXTextBookmark */;
-			6B74B6E91286ACC200262888 /* PBXTextBookmark */ = 6B74B6E91286ACC200262888 /* PBXTextBookmark */;
-			6B74B6ED1286AD3800262888 /* PBXTextBookmark */ = 6B74B6ED1286AD3800262888 /* PBXTextBookmark */;
-			6B74B6EE1286AD3800262888 /* PBXTextBookmark */ = 6B74B6EE1286AD3800262888 /* PBXTextBookmark */;
-			6B74B6EF1286AD3800262888 /* PBXTextBookmark */ = 6B74B6EF1286AD3800262888 /* PBXTextBookmark */;
-			6B74B6F11286AD5400262888 /* PBXTextBookmark */ = 6B74B6F11286AD5400262888 /* PBXTextBookmark */;
-			6B74B6F41286AD6A00262888 /* PBXTextBookmark */ = 6B74B6F41286AD6A00262888 /* PBXTextBookmark */;
-			6B74B6FC1286AE0B00262888 /* PBXTextBookmark */ = 6B74B6FC1286AE0B00262888 /* PBXTextBookmark */;
-			6B74B6FD1286AE0B00262888 /* PBXTextBookmark */ = 6B74B6FD1286AE0B00262888 /* PBXTextBookmark */;
-			6B74B6FE1286AE0B00262888 /* PBXTextBookmark */ = 6B74B6FE1286AE0B00262888 /* PBXTextBookmark */;
-			6B74B7061286AEBD00262888 /* PBXTextBookmark */ = 6B74B7061286AEBD00262888 /* PBXTextBookmark */;
-			6B74B7071286AEBD00262888 /* PBXTextBookmark */ = 6B74B7071286AEBD00262888 /* PBXTextBookmark */;
-			6B74B7081286AEBD00262888 /* XCBuildMessageTextBookmark */ = 6B74B7081286AEBD00262888 /* XCBuildMessageTextBookmark */;
-			6B74B7091286AEBD00262888 /* PBXTextBookmark */ = 6B74B7091286AEBD00262888 /* PBXTextBookmark */;
-			6B74B70D1286AEE900262888 /* PBXTextBookmark */ = 6B74B70D1286AEE900262888 /* PBXTextBookmark */;
-			6B74B7111286AF1000262888 /* PBXTextBookmark */ = 6B74B7111286AF1000262888 /* PBXTextBookmark */;
-			6B74B7151286AF9000262888 /* PBXTextBookmark */ = 6B74B7151286AF9000262888 /* PBXTextBookmark */;
-			6B74B7191286AFD100262888 /* PBXTextBookmark */ = 6B74B7191286AFD100262888 /* PBXTextBookmark */;
-			6B74B71F1286B09D00262888 /* XCBuildMessageTextBookmark */ = 6B74B71F1286B09D00262888 /* XCBuildMessageTextBookmark */;
-			6B74B7201286B09D00262888 /* PBXTextBookmark */ = 6B74B7201286B09D00262888 /* PBXTextBookmark */;
-			6B74B7241286B0D900262888 /* PBXTextBookmark */ = 6B74B7241286B0D900262888 /* PBXTextBookmark */;
-			6B74B7281286B14600262888 /* PBXTextBookmark */ = 6B74B7281286B14600262888 /* PBXTextBookmark */;
-			6B74B72C1286B16F00262888 /* PBXTextBookmark */ = 6B74B72C1286B16F00262888 /* PBXTextBookmark */;
-			6B74B7301286B1B300262888 /* PBXTextBookmark */ = 6B74B7301286B1B300262888 /* PBXTextBookmark */;
-			6B74B7311286B1B300262888 /* PBXTextBookmark */ = 6B74B7311286B1B300262888 /* PBXTextBookmark */;
-			6B74B7321286B1B300262888 /* PBXTextBookmark */ = 6B74B7321286B1B300262888 /* PBXTextBookmark */;
-			6B74B7351286B1F900262888 /* PBXTextBookmark */ = 6B74B7351286B1F900262888 /* PBXTextBookmark */;
-			6B74B7361286B1F900262888 /* PBXTextBookmark */ = 6B74B7361286B1F900262888 /* PBXTextBookmark */;
-			6B74B7371286B1F900262888 /* PBXTextBookmark */ = 6B74B7371286B1F900262888 /* PBXTextBookmark */;
-			6B74B7381286B1F900262888 /* PBXTextBookmark */ = 6B74B7381286B1F900262888 /* PBXTextBookmark */;
-			6B74B73C1286B22000262888 /* PBXTextBookmark */ = 6B74B73C1286B22000262888 /* PBXTextBookmark */;
-			6B74B7401286B7C400262888 /* PBXTextBookmark */ = 6B74B7401286B7C400262888 /* PBXTextBookmark */;
-			6B74B7411286B7C400262888 /* PBXTextBookmark */ = 6B74B7411286B7C400262888 /* PBXTextBookmark */;
-			6B74B7421286B7C400262888 /* PBXTextBookmark */ = 6B74B7421286B7C400262888 /* PBXTextBookmark */;
-			6B74B7441286B8E600262888 /* PBXTextBookmark */ = 6B74B7441286B8E600262888 /* PBXTextBookmark */;
-			6B74B7451286B8E600262888 /* PBXTextBookmark */ = 6B74B7451286B8E600262888 /* PBXTextBookmark */;
-			6B74B7461286B8E600262888 /* PBXTextBookmark */ = 6B74B7461286B8E600262888 /* PBXTextBookmark */;
-			6B74B7471286B8E600262888 /* PBXTextBookmark */ = 6B74B7471286B8E600262888 /* PBXTextBookmark */;
-			6B74B74A1286B90100262888 /* PBXTextBookmark */ = 6B74B74A1286B90100262888 /* PBXTextBookmark */;
-			6B74B74B1286B90100262888 /* PBXTextBookmark */ = 6B74B74B1286B90100262888 /* PBXTextBookmark */;
-			6B74B74C1286B90100262888 /* PBXTextBookmark */ = 6B74B74C1286B90100262888 /* PBXTextBookmark */;
-			6B74B74D1286B90100262888 /* PBXTextBookmark */ = 6B74B74D1286B90100262888 /* PBXTextBookmark */;
-			6B74B7561286B92300262888 /* PBXTextBookmark */ = 6B74B7561286B92300262888 /* PBXTextBookmark */;
-			6B74B7571286B92300262888 /* XCBuildMessageTextBookmark */ = 6B74B7571286B92300262888 /* XCBuildMessageTextBookmark */;
-			6B74B7581286B92300262888 /* PBXTextBookmark */ = 6B74B7581286B92300262888 /* PBXTextBookmark */;
-			6B74B75F1286BB6900262888 /* PBXTextBookmark */ = 6B74B75F1286BB6900262888 /* PBXTextBookmark */;
-			6B74B7601286BB6900262888 /* PBXTextBookmark */ = 6B74B7601286BB6900262888 /* PBXTextBookmark */;
-			6B74B7611286BB6900262888 /* PBXTextBookmark */ = 6B74B7611286BB6900262888 /* PBXTextBookmark */;
-			6B74B7621286BB6900262888 /* PBXTextBookmark */ = 6B74B7621286BB6900262888 /* PBXTextBookmark */;
-			6B74B7631286BB6900262888 /* PBXTextBookmark */ = 6B74B7631286BB6900262888 /* PBXTextBookmark */;
-			6B74B76A1286F56B00262888 /* PBXTextBookmark */ = 6B74B76A1286F56B00262888 /* PBXTextBookmark */;
-			6B74B76B1286F56B00262888 /* PBXTextBookmark */ = 6B74B76B1286F56B00262888 /* PBXTextBookmark */;
-			6B74B76C1286F56B00262888 /* PBXTextBookmark */ = 6B74B76C1286F56B00262888 /* PBXTextBookmark */;
-			6B74B76D1286F56B00262888 /* PBXTextBookmark */ = 6B74B76D1286F56B00262888 /* PBXTextBookmark */;
-			6B74B76E1286F56B00262888 /* PBXTextBookmark */ = 6B74B76E1286F56B00262888 /* PBXTextBookmark */;
-			6B74B76F1286F56B00262888 /* PBXTextBookmark */ = 6B74B76F1286F56B00262888 /* PBXTextBookmark */;
-			6B74B7701286F56B00262888 /* PBXTextBookmark */ = 6B74B7701286F56B00262888 /* PBXTextBookmark */;
-			6B74B7711286F56B00262888 /* PBXTextBookmark */ = 6B74B7711286F56B00262888 /* PBXTextBookmark */;
-			6B74B7761286F61200262888 /* PBXTextBookmark */ = 6B74B7761286F61200262888 /* PBXTextBookmark */;
-			6B74B7771286F61200262888 /* PBXTextBookmark */ = 6B74B7771286F61200262888 /* PBXTextBookmark */;
-			6B74B7781286F61200262888 /* PBXTextBookmark */ = 6B74B7781286F61200262888 /* PBXTextBookmark */;
-			6B74B7791286F61200262888 /* PBXTextBookmark */ = 6B74B7791286F61200262888 /* PBXTextBookmark */;
-			6B74B7801286F72D00262888 /* PBXTextBookmark */ = 6B74B7801286F72D00262888 /* PBXTextBookmark */;
-			6B74B7811286F72D00262888 /* PBXTextBookmark */ = 6B74B7811286F72D00262888 /* PBXTextBookmark */;
-			6B74B7821286F72D00262888 /* PBXTextBookmark */ = 6B74B7821286F72D00262888 /* PBXTextBookmark */;
-			6B74B7831286F72D00262888 /* PBXTextBookmark */ = 6B74B7831286F72D00262888 /* PBXTextBookmark */;
-			6B74B7841286F72D00262888 /* PBXTextBookmark */ = 6B74B7841286F72D00262888 /* PBXTextBookmark */;
-			6B74B7851286F72D00262888 /* PBXTextBookmark */ = 6B74B7851286F72D00262888 /* PBXTextBookmark */;
-			6B74B7861286F72D00262888 /* PBXTextBookmark */ = 6B74B7861286F72D00262888 /* PBXTextBookmark */;
-			6B74B7871286F72D00262888 /* PBXTextBookmark */ = 6B74B7871286F72D00262888 /* PBXTextBookmark */;
-			6B74B78B1286F76300262888 /* PBXTextBookmark */ = 6B74B78B1286F76300262888 /* PBXTextBookmark */;
-			6B74B78C1286F76300262888 /* PBXTextBookmark */ = 6B74B78C1286F76300262888 /* PBXTextBookmark */;
-			6B74B78D1286F76300262888 /* PBXTextBookmark */ = 6B74B78D1286F76300262888 /* PBXTextBookmark */;
-			6B74B7901286F77500262888 /* PBXTextBookmark */ = 6B74B7901286F77500262888 /* PBXTextBookmark */;
-			6B74B7911286F77500262888 /* PBXTextBookmark */ = 6B74B7911286F77500262888 /* PBXTextBookmark */;
-			6B74B7921286F77500262888 /* PBXTextBookmark */ = 6B74B7921286F77500262888 /* PBXTextBookmark */;
-			6B74B7931286F78400262888 /* PBXTextBookmark */ = 6B74B7931286F78400262888 /* PBXTextBookmark */;
-			6B74B7941286F78400262888 /* PBXTextBookmark */ = 6B74B7941286F78400262888 /* PBXTextBookmark */;
-			6B74B7951286F78400262888 /* PBXTextBookmark */ = 6B74B7951286F78400262888 /* PBXTextBookmark */;
-			6B74B7981286F7CD00262888 /* PBXTextBookmark */ = 6B74B7981286F7CD00262888 /* PBXTextBookmark */;
-			6B74B7991286F7CD00262888 /* PBXTextBookmark */ = 6B74B7991286F7CD00262888 /* PBXTextBookmark */;
-			6B74B79A1286F7CD00262888 /* PBXTextBookmark */ = 6B74B79A1286F7CD00262888 /* PBXTextBookmark */;
-			6B74B79B1286F7CD00262888 /* PBXTextBookmark */ = 6B74B79B1286F7CD00262888 /* PBXTextBookmark */;
-			6B74B79C1286F7CD00262888 /* PBXTextBookmark */ = 6B74B79C1286F7CD00262888 /* PBXTextBookmark */;
-			6B74B79D1286F7CD00262888 /* PBXTextBookmark */ = 6B74B79D1286F7CD00262888 /* PBXTextBookmark */;
-			6B74B79E1286F7CD00262888 /* PBXTextBookmark */ = 6B74B79E1286F7CD00262888 /* PBXTextBookmark */;
-			6B74B79F1286F7D700262888 /* PBXTextBookmark */ = 6B74B79F1286F7D700262888 /* PBXTextBookmark */;
-			6B74B7A01286F7D700262888 /* PBXTextBookmark */ = 6B74B7A01286F7D700262888 /* PBXTextBookmark */;
-			6B74B7A11286F7D700262888 /* PBXTextBookmark */ = 6B74B7A11286F7D700262888 /* PBXTextBookmark */;
-			6B74B7A61286F8E700262888 /* PBXTextBookmark */ = 6B74B7A61286F8E700262888 /* PBXTextBookmark */;
-			6B74B7A71286F8E700262888 /* PBXTextBookmark */ = 6B74B7A71286F8E700262888 /* PBXTextBookmark */;
-			6B74B7A81286F8E700262888 /* PBXTextBookmark */ = 6B74B7A81286F8E700262888 /* PBXTextBookmark */;
-			6B74B7AC1286F93000262888 /* PBXTextBookmark */ = 6B74B7AC1286F93000262888 /* PBXTextBookmark */;
-			6B74B7AD1286F93000262888 /* PBXTextBookmark */ = 6B74B7AD1286F93000262888 /* PBXTextBookmark */;
-			6B74B7AE1286F93000262888 /* PBXTextBookmark */ = 6B74B7AE1286F93000262888 /* PBXTextBookmark */;
-			6B74B7AF1286F93000262888 /* PBXTextBookmark */ = 6B74B7AF1286F93000262888 /* PBXTextBookmark */;
-			6B74B7B01286F93000262888 /* PBXTextBookmark */ = 6B74B7B01286F93000262888 /* PBXTextBookmark */;
-			6B74B7B21286F99100262888 /* PBXTextBookmark */ = 6B74B7B21286F99100262888 /* PBXTextBookmark */;
-			6B74B7B31286F99100262888 /* PBXTextBookmark */ = 6B74B7B31286F99100262888 /* PBXTextBookmark */;
-			6B74B7B41286F99100262888 /* PBXTextBookmark */ = 6B74B7B41286F99100262888 /* PBXTextBookmark */;
-			6B74B7B51286F9D900262888 /* PBXTextBookmark */ = 6B74B7B51286F9D900262888 /* PBXTextBookmark */;
-			6B74B7B61286F9D900262888 /* PBXTextBookmark */ = 6B74B7B61286F9D900262888 /* PBXTextBookmark */;
-			6B74B7B71286F9D900262888 /* PBXTextBookmark */ = 6B74B7B71286F9D900262888 /* PBXTextBookmark */;
-			6B74B7BA1286F9F400262888 /* PBXTextBookmark */ = 6B74B7BA1286F9F400262888 /* PBXTextBookmark */;
-			6B74B7BB1286F9F400262888 /* PBXTextBookmark */ = 6B74B7BB1286F9F400262888 /* PBXTextBookmark */;
-			6B74B7BC1286F9F400262888 /* PBXTextBookmark */ = 6B74B7BC1286F9F400262888 /* PBXTextBookmark */;
-			6B74B7C01286FA5200262888 /* PBXTextBookmark */ = 6B74B7C01286FA5200262888 /* PBXTextBookmark */;
-			6B74B7C11286FA5200262888 /* PBXTextBookmark */ = 6B74B7C11286FA5200262888 /* PBXTextBookmark */;
-			6B74B7C21286FA5200262888 /* PBXTextBookmark */ = 6B74B7C21286FA5200262888 /* PBXTextBookmark */;
-			6B74B7C51286FAB500262888 /* PBXTextBookmark */ = 6B74B7C51286FAB500262888 /* PBXTextBookmark */;
-			6B74B7C61286FAB500262888 /* PBXTextBookmark */ = 6B74B7C61286FAB500262888 /* PBXTextBookmark */;
-			6B74B7C71286FAB500262888 /* PBXTextBookmark */ = 6B74B7C71286FAB500262888 /* PBXTextBookmark */;
-			6B74B7CB1286FAD800262888 /* PBXTextBookmark */ = 6B74B7CB1286FAD800262888 /* PBXTextBookmark */;
-			6B74B7CC1286FAD800262888 /* PBXTextBookmark */ = 6B74B7CC1286FAD800262888 /* PBXTextBookmark */;
-			6B8D565F127ADB0D0077C699 = 6B8D565F127ADB0D0077C699 /* PBXTextBookmark */;
-			6B8D566D127ADB7D0077C699 = 6B8D566D127ADB7D0077C699 /* PBXTextBookmark */;
-			6B8D566F127ADB7D0077C699 = 6B8D566F127ADB7D0077C699 /* PBXTextBookmark */;
-			6B8D56C7127AEC100077C699 = 6B8D56C7127AEC100077C699 /* PBXTextBookmark */;
-			6B8D56C8127AEC100077C699 = 6B8D56C8127AEC100077C699 /* PBXTextBookmark */;
-			6B8D56C9127AEC100077C699 = 6B8D56C9127AEC100077C699 /* PBXTextBookmark */;
-			6B8D56CA127AEC100077C699 = 6B8D56CA127AEC100077C699 /* PBXTextBookmark */;
-			6B8D56CB127AEC100077C699 = 6B8D56CB127AEC100077C699 /* PBXTextBookmark */;
-			6B8D56CC127AEC100077C699 = 6B8D56CC127AEC100077C699 /* PBXTextBookmark */;
-			6B8D56CD127AEC100077C699 = 6B8D56CD127AEC100077C699 /* PBXTextBookmark */;
-			6B8D56CE127AEC100077C699 = 6B8D56CE127AEC100077C699 /* PBXTextBookmark */;
-			6B8D56CF127AEC100077C699 = 6B8D56CF127AEC100077C699 /* PBXTextBookmark */;
-			6B8D56D0127AEC100077C699 = 6B8D56D0127AEC100077C699 /* PBXTextBookmark */;
-			6B8D56D2127AEC100077C699 = 6B8D56D2127AEC100077C699 /* PBXTextBookmark */;
-			6B8D56D8127AEC580077C699 = 6B8D56D8127AEC580077C699 /* PBXTextBookmark */;
-			6B8D56DB127DF2620077C699 = 6B8D56DB127DF2620077C699 /* PBXTextBookmark */;
-			6B8D56DC127DF2620077C699 = 6B8D56DC127DF2620077C699 /* PBXTextBookmark */;
-		};
-		sourceControlManager = 6B8632A90F78115100E2684A /* Source Control */;
-		userBookmarkGroup = 6B8DE6F010A88F0500DF20FB /* PBXBookmarkGroup */;
-		userBuildSettings = {
-		};
-	};
-	32CA4F630368D1EE00C91783 /* Recast_Prefix.pch */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 641}}";
-			sepNavSelRange = "{143, 0}";
-			sepNavVisRange = "{0, 143}";
-			sepNavWindowFrame = "{{38, 57}, {1011, 695}}";
-		};
-	};
-	6B10014C11AD1C1E0098A59A /* RecastMesh.cpp:1324 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6B137C870F7FCC1100459200 /* RecastMesh.cpp */;
-		functionName = "rcMergeInternalVertices(rcPolyMesh& mesh, const int mergeThreshold)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 1324;
-		location = Recast;
-		modificationTime = 310835892.37664;
-		originalNumberOfMultipleMatches = 1;
-		state = 0;
-	};
-	6B1185F41006895B0018F96F /* DetourNode.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 2210}}";
-			sepNavSelRange = "{2206, 0}";
-			sepNavVisRange = "{2084, 586}";
-		};
-	};
-	6B1185F61006896B0018F96F /* DetourNode.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 1807}}";
-			sepNavSelRange = "{1621, 0}";
-			sepNavVisRange = "{1443, 559}";
-		};
-	};
-	6B1185FC10068B040018F96F /* DetourCommon.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 3406}}";
-			sepNavSelRange = "{4673, 0}";
-			sepNavVisRange = "{4016, 1105}";
-		};
-	};
-	6B1185FD10068B150018F96F /* DetourCommon.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 4095}}";
-			sepNavSelRange = "{7172, 0}";
-			sepNavVisRange = "{6461, 1315}";
-		};
-	};
-	6B137C6C0F7FCBBB00459200 /* imgui.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 8567}}";
-			sepNavSelRange = "{3831, 0}";
-			sepNavVisRange = "{2893, 1467}";
-		};
-	};
-	6B137C6D0F7FCBBB00459200 /* MeshLoaderObj.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 2912}}";
-			sepNavSelRange = "{4217, 0}";
-			sepNavVisRange = "{3666, 1197}";
-		};
-	};
-	6B137C6E0F7FCBBB00459200 /* SDLMain.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1112, 6464}}";
-			sepNavSelRange = "{11212, 0}";
-			sepNavVisRange = "{11026, 190}";
-		};
-	};
-	6B137C7A0F7FCBE400459200 /* imgui.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 1417}}";
-			sepNavSelRange = "{2208, 20}";
-			sepNavVisRange = "{1506, 1270}";
-		};
-	};
-	6B137C7B0F7FCBE400459200 /* MeshLoaderObj.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 676}}";
-			sepNavSelRange = "{1045, 0}";
-			sepNavVisRange = "{0, 1662}";
-		};
-	};
-	6B137C7C0F7FCBE400459200 /* SDLMain.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {915, 561}}";
-			sepNavSelRange = "{307, 0}";
-			sepNavVisRange = "{0, 307}";
-		};
-	};
-	6B137C7E0F7FCBFE00459200 /* Recast.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 9659}}";
-			sepNavSelRange = "{12869, 0}";
-			sepNavVisRange = "{12166, 1292}";
-			sepNavWindowFrame = "{{15, 51}, {1214, 722}}";
-		};
-	};
-	6B137C820F7FCC1100459200 /* Recast.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 5447}}";
-			sepNavSelRange = "{5691, 0}";
-			sepNavVisRange = "{4981, 1352}";
-		};
-	};
-	6B137C830F7FCC1100459200 /* RecastContour.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 9932}}";
-			sepNavSelRange = "{20095, 0}";
-			sepNavVisRange = "{19310, 1476}";
-			sepNavWindowFrame = "{{38, 30}, {1214, 722}}";
-		};
-	};
-	6B137C850F7FCC1100459200 /* RecastFilter.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 2340}}";
-			sepNavSelRange = "{4691, 1}";
-			sepNavVisRange = "{3983, 1178}";
-			sepNavWindowFrame = "{{15, 78}, {1011, 695}}";
-		};
-	};
-	6B137C870F7FCC1100459200 /* RecastMesh.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1069, 17121}}";
-			sepNavSelRange = "{30602, 0}";
-			sepNavVisRange = "{29923, 1482}";
-		};
-	};
-	6B137C880F7FCC1100459200 /* RecastRasterization.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 4290}}";
-			sepNavSelRange = "{9517, 0}";
-			sepNavVisRange = "{8432, 1409}";
-			sepNavWindowFrame = "{{15, 51}, {1214, 722}}";
-		};
-	};
-	6B137C890F7FCC1100459200 /* RecastRegion.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 16081}}";
-			sepNavSelRange = "{25263, 0}";
-			sepNavVisRange = "{24581, 1610}";
-		};
-	};
-	6B25B6100FFA62AD004F1BC4 /* Sample.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 1768}}";
-			sepNavSelRange = "{4017, 0}";
-			sepNavVisRange = "{3169, 938}";
-		};
-	};
-	6B25B6140FFA62BE004F1BC4 /* Sample.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 2665}}";
-			sepNavSelRange = "{1359, 15}";
-			sepNavVisRange = "{1462, 315}";
-		};
-	};
-	6B25B6180FFA62BE004F1BC4 /* main.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 11999}}";
-			sepNavSelRange = "{4517, 0}";
-			sepNavVisRange = "{4260, 637}";
-			sepNavWindowFrame = "{{15, 51}, {1214, 722}}";
-		};
-	};
-	6B2AEC510FFB8946005BE9CC /* Sample_TileMesh.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 1404}}";
-			sepNavSelRange = "{2493, 0}";
-			sepNavVisRange = "{1971, 893}";
-			sepNavWindowFrame = "{{15, 78}, {1011, 695}}";
-		};
-	};
-	6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 15587}}";
-			sepNavSelRange = "{32666, 62}";
-			sepNavVisRange = "{31865, 1382}";
-			sepNavWindowFrame = "{{38, 30}, {1214, 722}}";
-		};
-	};
-	6B324C64111C5D9A00EBD2FD /* ConvexVolumeTool.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 728}}";
-			sepNavSelRange = "{1597, 0}";
-			sepNavVisRange = "{979, 804}";
-		};
-	};
-	6B324C65111C5D9A00EBD2FD /* ConvexVolumeTool.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 3913}}";
-			sepNavSelRange = "{5654, 0}";
-			sepNavVisRange = "{5394, 529}";
-		};
-	};
-	6B42164711806B2F006C347B /* DetourDebugDraw.cpp:362 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		functionName = "drawMeshTilePortal(duDebugDraw* dd, const dtMeshTile* tile)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 362;
-		location = Recast;
-		modificationTime = 310835896.114027;
-		originalNumberOfMultipleMatches = 1;
-		state = 1;
-	};
-	6B4DE616127F2407001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */;
-		name = "NavMeshTesterTool.cpp: 543";
-		rLen = 8;
-		rLoc = 14441;
-		rType = 0;
-		vrLen = 1012;
-		vrLoc = 13908;
-	};
-	6B4DE62E12807542001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */;
-		name = "NavMeshTesterTool.cpp: 537";
-		rLen = 0;
-		rLoc = 14234;
-		rType = 0;
-		vrLen = 1338;
-		vrLoc = 13908;
-	};
-	6B4DE62F12807542001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B98470511E733B600FA177B /* RecastAlloc.h */;
-		name = "RecastAlloc.h: 51";
-		rLen = 71;
-		rLoc = 1797;
-		rType = 0;
-		vrLen = 1235;
-		vrLoc = 1112;
-	};
-	6B4DE63012807542001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 805";
-		rLen = 0;
-		rLoc = 21598;
-		rType = 0;
-		vrLen = 935;
-		vrLoc = 21001;
-	};
-	6B4DE63112807542001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */;
-		name = "DetourNavMeshQuery.h: 166";
-		rLen = 679;
-		rLoc = 7509;
-		rType = 0;
-		vrLen = 1926;
-		vrLoc = 6655;
-	};
-	6B4DE63212807542001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D8123D27EC0021A7A4 /* CrowdManager.h */;
-		name = "CrowdManager.h: 313";
-		rLen = 0;
-		rLoc = 7714;
-		rType = 0;
-		vrLen = 1485;
-		vrLoc = 6661;
-	};
-	6B4DE63312807542001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7810CFE1D500F74F2B /* DetourDebugDraw.h */;
-		name = "DetourDebugDraw.h: 33";
-		rLen = 83;
-		rLoc = 1365;
-		rType = 0;
-		vrLen = 1748;
-		vrLoc = 0;
-	};
-	6B4DE63412807542001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 324";
-		rLen = 0;
-		rLoc = 8773;
-		rType = 0;
-		vrLen = 1076;
-		vrLoc = 7627;
-	};
-	6B4DE63512807542001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 571";
-		rLen = 0;
-		rLoc = 12978;
-		rType = 0;
-		vrLen = 892;
-		vrLoc = 12474;
-	};
-	6B4DE63612807542001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 556";
-		rLen = 0;
-		rLoc = 12709;
-		rType = 0;
-		vrLen = 889;
-		vrLoc = 12477;
-	};
-	6B4DE64412807587001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 550";
-		rLen = 0;
-		rLoc = 12708;
-		rType = 0;
-		vrLen = 906;
-		vrLoc = 12567;
-	};
-	6B4DE646128079E0001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 558";
-		rLen = 29;
-		rLoc = 12908;
-		rType = 0;
-		vrLen = 936;
-		vrLoc = 12471;
-	};
-	6B4DE647128079E0001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */;
-		name = "DetourNavMesh.h: 384";
-		rLen = 0;
-		rLoc = 15329;
-		rType = 0;
-		vrLen = 1790;
-		vrLoc = 14074;
-	};
-	6B4DE648128079E0001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */;
-		name = "DetourNavMeshQuery.h: 182";
-		rLen = 50;
-		rLoc = 8694;
-		rType = 0;
-		vrLen = 2063;
-		vrLoc = 7576;
-	};
-	6B4DE649128079E0001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B1185F41006895B0018F96F /* DetourNode.cpp */;
-		name = "DetourNode.cpp: 73";
-		rLen = 0;
-		rLoc = 2206;
-		rType = 0;
-		vrLen = 586;
-		vrLoc = 2084;
-	};
-	6B4DE64A128079E0001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B1185F61006896B0018F96F /* DetourNode.h */;
-		name = "DetourNode.h: 50";
-		rLen = 0;
-		rLoc = 1621;
-		rType = 0;
-		vrLen = 559;
-		vrLoc = 1443;
-	};
-	6B4DE64B128079E0001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 2558";
-		rLen = 8;
-		rLoc = 68383;
-		rType = 0;
-		vrLen = 552;
-		vrLoc = 67890;
-	};
-	6B4DE64C128079E0001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 1054";
-		rLen = 0;
-		rLoc = 28267;
-		rType = 0;
-		vrLen = 495;
-		vrLoc = 28027;
-	};
-	6B4DE651128079F3001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 1050";
-		rLen = 0;
-		rLoc = 28236;
-		rType = 0;
-		vrLen = 677;
-		vrLoc = 28024;
-	};
-	6B4DE65D12807AB6001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 557";
-		rLen = 0;
-		rLoc = 12879;
-		rType = 0;
-		vrLen = 1002;
-		vrLoc = 12405;
-	};
-	6B4DE65E12807AB6001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		rLen = 0;
-		rLoc = 1020;
-		rType = 1;
-	};
-	6B4DE65F12807AB6001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 1036";
-		rLen = 0;
-		rLoc = 27891;
-		rType = 0;
-		vrLen = 812;
-		vrLoc = 27359;
-	};
-	6B4DE66212807AD9001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 1027";
-		rLen = 0;
-		rLoc = 27715;
-		rType = 0;
-		vrLen = 812;
-		vrLoc = 27359;
-	};
-	6B4DE66512807B09001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 1027";
-		rLen = 0;
-		rLoc = 27715;
-		rType = 0;
-		vrLen = 861;
-		vrLoc = 27359;
-	};
-	6B4DE66612807B39001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 1031";
-		rLen = 0;
-		rLoc = 27843;
-		rType = 0;
-		vrLen = 461;
-		vrLoc = 27468;
-	};
-	6B4DE66712807B39001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		rLen = 0;
-		rLoc = 460;
-		rType = 1;
-	};
-	6B4DE66812807B39001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 927";
-		rLen = 0;
-		rLoc = 20986;
-		rType = 0;
-		vrLen = 384;
-		vrLoc = 21176;
-	};
-	6B4DE66912807B41001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 914";
-		rLen = 0;
-		rLoc = 20986;
-		rType = 0;
-		vrLen = 927;
-		vrLoc = 20847;
-	};
-	6B4DE66A12807B41001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */;
-		name = "DetourNavMeshQuery.h: 182";
-		rLen = 0;
-		rLoc = 8696;
-		rType = 0;
-		vrLen = 2234;
-		vrLoc = 7469;
-	};
-	6B4DE66B12807B41001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 1027";
-		rLen = 0;
-		rLoc = 27715;
-		rType = 0;
-		vrLen = 861;
-		vrLoc = 27359;
-	};
-	6B4DE66C12807B41001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 1027";
-		rLen = 0;
-		rLoc = 27715;
-		rType = 0;
-		vrLen = 861;
-		vrLoc = 27359;
-	};
-	6B4DE67112807C71001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 415";
-		rLen = 0;
-		rLoc = 11165;
-		rType = 0;
-		vrLen = 1074;
-		vrLoc = 10401;
-	};
-	6B4DE67312807D05001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 546";
-		rLen = 0;
-		rLoc = 12608;
-		rType = 0;
-		vrLen = 1014;
-		vrLoc = 12198;
-	};
-	6B4DE67412807D05001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		rLen = 0;
-		rLoc = 831;
-		rType = 1;
-	};
-	6B4DE67512807D05001CFDF4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 832";
-		rLen = 0;
-		rLoc = 22260;
-		rType = 0;
-		vrLen = 911;
-		vrLoc = 25853;
-	};
-	6B555DAE100B211D00247EA3 /* imguiRenderGL.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 641}}";
-			sepNavSelRange = "{923, 0}";
-			sepNavVisRange = "{0, 1106}";
-		};
-	};
-	6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 5967}}";
-			sepNavSelRange = "{10776, 0}";
-			sepNavVisRange = "{9660, 1512}";
-		};
-	};
-	6B555DF6100B273500247EA3 /* stb_truetype.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 23270}}";
-			sepNavSelRange = "{27273, 0}";
-			sepNavVisRange = "{26315, 1706}";
-		};
-	};
-	6B624169103434880002E346 /* RecastMeshDetail.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 15808}}";
-			sepNavSelRange = "{29028, 0}";
-			sepNavVisRange = "{28456, 1353}";
-			sepNavWindowFrame = "{{61, 36}, {1011, 695}}";
-		};
-	};
-	6B74B5DC1283104100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 832";
-		rLen = 0;
-		rLoc = 22260;
-		rType = 0;
-		vrLen = 996;
-		vrLoc = 25772;
-	};
-	6B74B5EA128312A900262888 /* main.cpp:211 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		functionName = "main(int /*argc*/, char** /*argv*/)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 211;
-		location = Recast;
-		modificationTime = 310835896.194667;
-		originalNumberOfMultipleMatches = 1;
-		state = 1;
-	};
-	6B74B5EC128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 946";
-		rLen = 0;
-		rLoc = 26084;
-		rType = 0;
-		vrLen = 996;
-		vrLoc = 25772;
-	};
-	6B74B5ED128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FC0910EBB6AA006DA0A6 /* NavMeshTesterTool.h */;
-		name = "NavMeshTesterTool.h: 31";
-		rLen = 0;
-		rLoc = 1158;
-		rType = 0;
-		vrLen = 474;
-		vrLoc = 980;
-	};
-	6B74B5EE128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */;
-		name = "NavMeshTesterTool.cpp: 536";
-		rLen = 0;
-		rLoc = 14217;
-		rType = 0;
-		vrLen = 734;
-		vrLoc = 13910;
-	};
-	6B74B5EF128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 61";
-		rLen = 0;
-		rLoc = 1752;
-		rType = 0;
-		vrLen = 513;
-		vrLoc = 1527;
-	};
-	6B74B5F0128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32341104CD05009445BF /* OffMeshConnectionTool.h */;
-		name = "OffMeshConnectionTool.h: 27";
-		rLen = 0;
-		rLoc = 1112;
-		rType = 0;
-		vrLen = 610;
-		vrLoc = 956;
-	};
-	6B74B5F1128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B324C65111C5D9A00EBD2FD /* ConvexVolumeTool.cpp */;
-		name = "ConvexVolumeTool.cpp: 232";
-		rLen = 0;
-		rLoc = 5577;
-		rType = 0;
-		vrLen = 400;
-		vrLoc = 5482;
-	};
-	6B74B5F2128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B324C64111C5D9A00EBD2FD /* ConvexVolumeTool.h */;
-		name = "ConvexVolumeTool.h: 32";
-		rLen = 0;
-		rLoc = 1172;
-		rType = 0;
-		vrLen = 598;
-		vrLoc = 1049;
-	};
-	6B74B5F3128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8036AD113BAABE005ED67B /* Sample_Debug.cpp */;
-		name = "Sample_Debug.cpp: 131";
-		rLen = 0;
-		rLoc = 3338;
-		rType = 0;
-		vrLen = 598;
-		vrLoc = 3021;
-	};
-	6B74B5F4128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8036AC113BAABE005ED67B /* Sample_Debug.h */;
-		name = "Sample_Debug.h: 7";
-		rLen = 0;
-		rLoc = 269;
-		rType = 0;
-		vrLen = 1049;
-		vrLoc = 0;
-	};
-	6B74B5F5128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
-		name = "Sample_TileMesh.cpp: 709";
-		rLen = 0;
-		rLoc = 19162;
-		rType = 0;
-		vrLen = 633;
-		vrLoc = 19049;
-	};
-	6B74B5F6128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */;
-		name = "Sample_SoloMeshTiled.cpp: 1081";
-		rLen = 0;
-		rLoc = 32914;
-		rType = 0;
-		vrLen = 681;
-		vrLoc = 32693;
-	};
-	6B74B5F7128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6100FFA62AD004F1BC4 /* Sample.h */;
-		name = "Sample.h: 111";
-		rLen = 12;
-		rLoc = 3125;
-		rType = 0;
-		vrLen = 994;
-		vrLoc = 2824;
-	};
-	6B74B5F8128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6140FFA62BE004F1BC4 /* Sample.cpp */;
-		name = "Sample.cpp: 187";
-		rLen = 0;
-		rLoc = 4732;
-		rType = 0;
-		vrLen = 276;
-		vrLoc = 4556;
-	};
-	6B74B5F9128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 285";
-		rLen = 0;
-		rLoc = 7745;
-		rType = 0;
-		vrLen = 612;
-		vrLoc = 6937;
-	};
-	6B74B5FA128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C571211663A008CFCDF /* CrowdTool.h */;
-		name = "CrowdTool.h: 58";
-		rLen = 0;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 684;
-		vrLoc = 1550;
-	};
-	6B74B5FB128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 212";
-		rLen = 0;
-		rLoc = 5203;
-		rType = 0;
-		vrLen = 733;
-		vrLoc = 4772;
-	};
-	6B74B5FC128312AC00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 212";
-		rLen = 0;
-		rLoc = 5203;
-		rType = 0;
-		vrLen = 733;
-		vrLoc = 4772;
-	};
-	6B74B60C128312E600262888 /* CrowdTool.cpp:296 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		functionName = "CrowdTool::handleStep()";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 296;
-		location = Recast;
-		modificationTime = 310835896.208616;
-		originalNumberOfMultipleMatches = 1;
-		state = 1;
-	};
-	6B74B60E128312E900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6140FFA62BE004F1BC4 /* Sample.cpp */;
-		name = "Sample.cpp: 187";
-		rLen = 0;
-		rLoc = 4732;
-		rType = 0;
-		vrLen = 382;
-		vrLoc = 4450;
-	};
-	6B74B60F128312E900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 183";
-		rLen = 0;
-		rLoc = 4517;
-		rType = 0;
-		vrLen = 637;
-		vrLoc = 4260;
-	};
-	6B74B610128312E900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C571211663A008CFCDF /* CrowdTool.h */;
-		name = "CrowdTool.h: 77";
-		rLen = 0;
-		rLoc = 2115;
-		rType = 0;
-		vrLen = 684;
-		vrLoc = 1550;
-	};
-	6B74B611128312E900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6100FFA62AD004F1BC4 /* Sample.h */;
-		name = "Sample.h: 112";
-		rLen = 0;
-		rLoc = 3168;
-		rType = 0;
-		vrLen = 1232;
-		vrLoc = 2783;
-	};
-	6B74B612128312E900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 273";
-		rLen = 0;
-		rLoc = 7564;
-		rType = 0;
-		vrLen = 612;
-		vrLoc = 6937;
-	};
-	6B74B613128312E900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 283";
-		rLen = 0;
-		rLoc = 7744;
-		rType = 0;
-		vrLen = 612;
-		vrLoc = 6937;
-	};
-	6B74B618128313D600262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 283";
-		rLen = 0;
-		rLoc = 7744;
-		rType = 0;
-		vrLen = 570;
-		vrLoc = 7005;
-	};
-	6B74B622128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 283";
-		rLen = 0;
-		rLoc = 7744;
-		rType = 0;
-		vrLen = 609;
-		vrLoc = 7005;
-	};
-	6B74B623128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6140FFA62BE004F1BC4 /* Sample.cpp */;
-		name = "Sample.cpp: 188";
-		rLen = 0;
-		rLoc = 4728;
-		rType = 0;
-		vrLen = 569;
-		vrLoc = 4269;
-	};
-	6B74B624128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6100FFA62AD004F1BC4 /* Sample.h */;
-		name = "Sample.h: 69";
-		rLen = 1;
-		rLoc = 2249;
-		rType = 0;
-		vrLen = 965;
-		vrLoc = 1493;
-	};
-	6B74B625128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C571211663A008CFCDF /* CrowdTool.h */;
-		name = "CrowdTool.h: 78";
-		rLen = 0;
-		rLoc = 2143;
-		rType = 0;
-		vrLen = 697;
-		vrLoc = 1537;
-	};
-	6B74B626128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B324C64111C5D9A00EBD2FD /* ConvexVolumeTool.h */;
-		name = "ConvexVolumeTool.h: 49";
-		rLen = 0;
-		rLoc = 1597;
-		rType = 0;
-		vrLen = 804;
-		vrLoc = 979;
-	};
-	6B74B627128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B324C65111C5D9A00EBD2FD /* ConvexVolumeTool.cpp */;
-		name = "ConvexVolumeTool.cpp: 237";
-		rLen = 0;
-		rLoc = 5654;
-		rType = 0;
-		vrLen = 529;
-		vrLoc = 5394;
-	};
-	6B74B628128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32341104CD05009445BF /* OffMeshConnectionTool.h */;
-		name = "OffMeshConnectionTool.h: 44";
-		rLen = 0;
-		rLoc = 1546;
-		rType = 0;
-		vrLen = 910;
-		vrLoc = 789;
-	};
-	6B74B629128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 139";
-		rLen = 0;
-		rLoc = 3345;
-		rType = 0;
-		vrLen = 569;
-		vrLoc = 2831;
-	};
-	6B74B62A128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FC0910EBB6AA006DA0A6 /* NavMeshTesterTool.h */;
-		name = "NavMeshTesterTool.h: 97";
-		rLen = 0;
-		rLoc = 2745;
-		rType = 0;
-		vrLen = 953;
-		vrLoc = 2051;
-	};
-	6B74B62B128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */;
-		name = "NavMeshTesterTool.cpp: 323";
-		rLen = 0;
-		rLoc = 8413;
-		rType = 0;
-		vrLen = 624;
-		vrLoc = 8249;
-	};
-	6B74B62C128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
-		name = "Sample_TileMesh.cpp: 130";
-		rLen = 0;
-		rLoc = 2988;
-		rType = 0;
-		vrLen = 757;
-		vrLoc = 2639;
-	};
-	6B74B62D128314A500262888 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Cannot allocate an object of abstract type 'TileHighlightTool'";
-		fRef = 6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 227;
-		rType = 1;
-	};
-	6B74B62E128314A500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */;
-		name = "Sample_SoloMeshTiled.cpp: 95";
-		rLen = 0;
-		rLoc = 2414;
-		rType = 0;
-		vrLen = 739;
-		vrLoc = 1996;
-	};
-	6B74B66412869CE100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */;
-		name = "Sample_SoloMeshTiled.cpp: 79";
-		rLen = 0;
-		rLoc = 2078;
-		rType = 0;
-		vrLen = 852;
-		vrLoc = 1883;
-	};
-	6B74B66512869CE100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D8123D27EC0021A7A4 /* CrowdManager.h */;
-		name = "CrowdManager.h: 144";
-		rLen = 0;
-		rLoc = 3497;
-		rType = 0;
-		vrLen = 1121;
-		vrLoc = 2907;
-	};
-	6B74B66612869CE100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 542";
-		rLen = 0;
-		rLoc = 12512;
-		rType = 0;
-		vrLen = 985;
-		vrLoc = 12246;
-	};
-	6B74B66712869CE100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */;
-		name = "DetourNavMeshQuery.h: 189";
-		rLen = 29;
-		rLoc = 8664;
-		rType = 0;
-		vrLen = 2073;
-		vrLoc = 7667;
-	};
-	6B74B66812869CE100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 1029";
-		rLen = 0;
-		rLoc = 27789;
-		rType = 0;
-		vrLen = 755;
-		vrLoc = 27424;
-	};
-	6B74B66F12869E3000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 1029";
-		rLen = 0;
-		rLoc = 27789;
-		rType = 0;
-		vrLen = 755;
-		vrLoc = 27424;
-	};
-	6B74B67012869E3000262888 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "'class PathCorridor' has no member named 'optimizePath2'";
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 0;
-		rLoc = 1299;
-		rType = 1;
-	};
-	6B74B67112869E3000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1268";
-		rLen = 0;
-		rLoc = 20986;
-		rType = 0;
-		vrLen = 659;
-		vrLoc = 29463;
-	};
-	6B74B6831286A39000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D8123D27EC0021A7A4 /* CrowdManager.h */;
-		name = "CrowdManager.h: 221";
-		rLen = 15;
-		rLoc = 5373;
-		rType = 0;
-		vrLen = 645;
-		vrLoc = 5191;
-	};
-	6B74B6841286A39000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1287";
-		rLen = 0;
-		rLoc = 20986;
-		rType = 0;
-		vrLen = 730;
-		vrLoc = 29522;
-	};
-	6B74B6851286A39000262888 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "'class CrowdManager' has no member named 'optimizePaths'";
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 295;
-		rType = 1;
-	};
-	6B74B6861286A39000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 288";
-		rLen = 0;
-		rLoc = 7797;
-		rType = 0;
-		vrLen = 564;
-		vrLoc = 7012;
-	};
-	6B74B68A1286A47800262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 288";
-		rLen = 0;
-		rLoc = 7797;
-		rType = 0;
-		vrLen = 560;
-		vrLoc = 7016;
-	};
-	6B74B68B1286A47800262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1287";
-		rLen = 0;
-		rLoc = 20986;
-		rType = 0;
-		vrLen = 643;
-		vrLoc = 30497;
-	};
-	6B74B68C1286A47800262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1287";
-		rLen = 0;
-		rLoc = 20986;
-		rType = 0;
-		vrLen = 643;
-		vrLoc = 30497;
-	};
-	6B74B68F1286A4DD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1307";
-		rLen = 0;
-		rLoc = 20986;
-		rType = 0;
-		vrLen = 646;
-		vrLoc = 30512;
-	};
-	6B74B69C1286A52A00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D8123D27EC0021A7A4 /* CrowdManager.h */;
-		name = "CrowdManager.h: 221";
-		rLen = 15;
-		rLoc = 5373;
-		rType = 0;
-		vrLen = 577;
-		vrLoc = 5191;
-	};
-	6B74B69D1286A52A00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1319";
-		rLen = 0;
-		rLoc = 20986;
-		rType = 0;
-		vrLen = 664;
-		vrLoc = 30512;
-	};
-	6B74B69E1286A52A00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1266";
-		rLen = 0;
-		rLoc = 29651;
-		rType = 0;
-		vrLen = 645;
-		vrLoc = 29509;
-	};
-	6B74B6A01286A67500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1311";
-		rLen = 0;
-		rLoc = 30586;
-		rType = 0;
-		vrLen = 712;
-		vrLoc = 30235;
-	};
-	6B74B6A11286A6AE00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1320";
-		rLen = 0;
-		rLoc = 30793;
-		rType = 0;
-		vrLen = 823;
-		vrLoc = 30235;
-	};
-	6B74B6A61286A6C300262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1303";
-		rLen = 0;
-		rLoc = 30432;
-		rType = 0;
-		vrLen = 901;
-		vrLoc = 30193;
-	};
-	6B74B6AA1286A85800262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1308";
-		rLen = 0;
-		rLoc = 30536;
-		rType = 0;
-		vrLen = 917;
-		vrLoc = 30193;
-	};
-	6B74B6AB1286A85800262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 288";
-		rLen = 0;
-		rLoc = 7797;
-		rType = 0;
-		vrLen = 864;
-		vrLoc = 6760;
-	};
-	6B74B6AC1286A85800262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 499";
-		rLen = 0;
-		rLoc = 13836;
-		rType = 0;
-		vrLen = 1470;
-		vrLoc = 12774;
-	};
-	6B74B6B51286A9BD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 329";
-		rLen = 0;
-		rLoc = 9151;
-		rType = 0;
-		vrLen = 887;
-		vrLoc = 8781;
-	};
-	6B74B6B61286A9BD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7710CFE1D500F74F2B /* DebugDraw.h */;
-		name = "DebugDraw.h: 144";
-		rLen = 0;
-		rLoc = 5161;
-		rType = 0;
-		vrLen = 1546;
-		vrLoc = 4603;
-	};
-	6B74B6B71286A9BD00262888 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Unused variable 'radius'";
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 536;
-		rType = 1;
-	};
-	6B74B6B81286A9BD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 510";
-		rLen = 0;
-		rLoc = 14064;
-		rType = 0;
-		vrLen = 769;
-		vrLoc = 12965;
-	};
-	6B74B6BE1286AA0C00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 510";
-		rLen = 0;
-		rLoc = 14064;
-		rType = 0;
-		vrLen = 769;
-		vrLoc = 12965;
-	};
-	6B74B6BF1286AA0C00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88710B69E3E00DF20FB /* DetourNavMesh.cpp */;
-		name = "DetourNavMesh.cpp: 902";
-		rLen = 0;
-		rLoc = 24360;
-		rType = 0;
-		vrLen = 634;
-		vrLoc = 24147;
-	};
-	6B74B6C01286AA0C00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 329";
-		rLen = 0;
-		rLoc = 9151;
-		rType = 0;
-		vrLen = 837;
-		vrLoc = 8781;
-	};
-	6B74B6C11286AA0C00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 326";
-		rLen = 0;
-		rLoc = 9079;
-		rType = 0;
-		vrLen = 831;
-		vrLoc = 8785;
-	};
-	6B74B6C51286AA5900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 344";
-		rLen = 0;
-		rLoc = 9815;
-		rType = 0;
-		vrLen = 1029;
-		vrLoc = 9070;
-	};
-	6B74B6C91286AAA200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 348";
-		rLen = 0;
-		rLoc = 10015;
-		rType = 0;
-		vrLen = 1043;
-		vrLoc = 9070;
-	};
-	6B74B6CA1286AAA200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 510";
-		rLen = 0;
-		rLoc = 14064;
-		rType = 0;
-		vrLen = 769;
-		vrLoc = 12965;
-	};
-	6B74B6CB1286AAA200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 500";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 851;
-		vrLoc = 12704;
-	};
-	6B74B6CF1286AAF000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 496";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 840;
-		vrLoc = 12774;
-	};
-	6B74B6D31286AB3B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 500";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 846;
-		vrLoc = 12739;
-	};
-	6B74B6D71286ABC000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 503";
-		rLen = 0;
-		rLoc = 13836;
-		rType = 0;
-		vrLen = 881;
-		vrLoc = 12739;
-	};
-	6B74B6D81286ABC000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7810CFE1D500F74F2B /* DetourDebugDraw.h */;
-		name = "DetourDebugDraw.h: 33";
-		rLen = 83;
-		rLoc = 1365;
-		rType = 0;
-		vrLen = 1352;
-		vrLoc = 396;
-	};
-	6B74B6D91286ABC000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7710CFE1D500F74F2B /* DebugDraw.h */;
-		name = "DebugDraw.h: 80";
-		rLen = 9;
-		rLoc = 2578;
-		rType = 0;
-		vrLen = 1110;
-		vrLoc = 2479;
-	};
-	6B74B6DA1286ABC000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 321";
-		rLen = 0;
-		rLoc = 8935;
-		rType = 0;
-		vrLen = 902;
-		vrLoc = 8458;
-	};
-	6B74B6DB1286ABC000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 351";
-		rLen = 0;
-		rLoc = 10027;
-		rType = 0;
-		vrLen = 1217;
-		vrLoc = 9152;
-	};
-	6B74B6DF1286AC2A00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 351";
-		rLen = 0;
-		rLoc = 10027;
-		rType = 0;
-		vrLen = 1219;
-		vrLoc = 9152;
-	};
-	6B74B6E01286AC2A00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 503";
-		rLen = 0;
-		rLoc = 13836;
-		rType = 0;
-		vrLen = 1049;
-		vrLoc = 12631;
-	};
-	6B74B6E11286AC2A00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 500";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 927;
-		vrLoc = 12551;
-	};
-	6B74B6E51286AC8200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 496";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 985;
-		vrLoc = 12631;
-	};
-	6B74B6E91286ACC200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 500";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 976;
-		vrLoc = 12672;
-	};
-	6B74B6ED1286AD3800262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 321";
-		rLen = 0;
-		rLoc = 8933;
-		rType = 0;
-		vrLen = 993;
-		vrLoc = 8604;
-	};
-	6B74B6EE1286AD3800262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 496";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 1005;
-		vrLoc = 12672;
-	};
-	6B74B6EF1286AD3800262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 500";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 989;
-		vrLoc = 12701;
-	};
-	6B74B6F11286AD5400262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 500";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 989;
-		vrLoc = 12701;
-	};
-	6B74B6F41286AD6A00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 496";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 1009;
-		vrLoc = 12739;
-	};
-	6B74B6FC1286AE0B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7710CFE1D500F74F2B /* DebugDraw.h */;
-		name = "DebugDraw.h: 134";
-		rLen = 157;
-		rLoc = 4603;
-		rType = 0;
-		vrLen = 1887;
-		vrLoc = 3693;
-	};
-	6B74B6FD1286AE0B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 498";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 987;
-		vrLoc = 12701;
-	};
-	6B74B6FE1286AE0B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 498";
-		rLen = 0;
-		rLoc = 13817;
-		rType = 0;
-		vrLen = 1054;
-		vrLoc = 12704;
-	};
-	6B74B7061286AEBD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7C10CFE1D500F74F2B /* RecastDebugDraw.cpp */;
-		name = "RecastDebugDraw.cpp: 60";
-		rLen = 0;
-		rLoc = 2030;
-		rType = 0;
-		vrLen = 956;
-		vrLoc = 1526;
-	};
-	6B74B7071286AEBD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 321";
-		rLen = 0;
-		rLoc = 8933;
-		rType = 0;
-		vrLen = 932;
-		vrLoc = 8604;
-	};
-	6B74B7081286AEBD00262888 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "'radius' was not declared in this scope";
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 540;
-		rType = 1;
-	};
-	6B74B7091286AEBD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 517";
-		rLen = 0;
-		rLoc = 14126;
-		rType = 0;
-		vrLen = 1144;
-		vrLoc = 12631;
-	};
-	6B74B70D1286AEE900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 557";
-		rLen = 0;
-		rLoc = 15454;
-		rType = 0;
-		vrLen = 985;
-		vrLoc = 14447;
-	};
-	6B74B7111286AF1000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 548";
-		rLen = 0;
-		rLoc = 15454;
-		rType = 0;
-		vrLen = 1067;
-		vrLoc = 14345;
-	};
-	6B74B7151286AF9000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 536";
-		rLen = 0;
-		rLoc = 14174;
-		rType = 0;
-		vrLen = 1225;
-		vrLoc = 13877;
-	};
-	6B74B7191286AFD100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 494";
-		rLen = 0;
-		rLoc = 13370;
-		rType = 0;
-		vrLen = 1218;
-		vrLoc = 12577;
-	};
-	6B74B71F1286B09D00262888 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Unused variable 'height'";
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 507;
-		rType = 1;
-	};
-	6B74B7201286B09D00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 343";
-		rLen = 0;
-		rLoc = 9183;
-		rType = 0;
-		vrLen = 871;
-		vrLoc = 8171;
-	};
-	6B74B7241286B0D900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 345";
-		rLen = 0;
-		rLoc = 9315;
-		rType = 0;
-		vrLen = 887;
-		vrLoc = 8007;
-	};
-	6B74B7281286B14600262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 323";
-		rLen = 0;
-		rLoc = 8644;
-		rType = 0;
-		vrLen = 880;
-		vrLoc = 7714;
-	};
-	6B74B72C1286B16F00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 329";
-		rLen = 0;
-		rLoc = 8813;
-		rType = 0;
-		vrLen = 820;
-		vrLoc = 7780;
-	};
-	6B74B72E1286B1B000262888 /* CrowdManager.cpp:1313 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		functionName = "CrowdManager::updateTopologyOptimization(const float dt, dtNavMeshQuery* navquery, const dtQueryFilter* filter)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 1313;
-		location = Recast;
-		modificationTime = 310835896.216764;
-		originalNumberOfMultipleMatches = 1;
-		state = 1;
-	};
-	6B74B7301286B1B300262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 319";
-		rLen = 0;
-		rLoc = 8603;
-		rType = 0;
-		vrLen = 820;
-		vrLoc = 7780;
-	};
-	6B74B7311286B1B300262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1312";
-		rLen = 0;
-		rLoc = 30588;
-		rType = 0;
-		vrLen = 752;
-		vrLoc = 30193;
-	};
-	6B74B7321286B1B300262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1312";
-		rLen = 0;
-		rLoc = 30588;
-		rType = 0;
-		vrLen = 752;
-		vrLoc = 30193;
-	};
-	6B74B7351286B1F900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D8123D27EC0021A7A4 /* CrowdManager.h */;
-		name = "CrowdManager.h: 226";
-		rLen = 0;
-		rLoc = 5467;
-		rType = 0;
-		vrLen = 586;
-		vrLoc = 5189;
-	};
-	6B74B7361286B1F900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1314";
-		rLen = 0;
-		rLoc = 30626;
-		rType = 0;
-		vrLen = 755;
-		vrLoc = 30193;
-	};
-	6B74B7371286B1F900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 411";
-		rLen = 0;
-		rLoc = 11541;
-		rType = 0;
-		vrLen = 853;
-		vrLoc = 11381;
-	};
-	6B74B7381286B1F900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 77";
-		rLen = 0;
-		rLoc = 2328;
-		rType = 0;
-		vrLen = 813;
-		vrLoc = 2036;
-	};
-	6B74B73C1286B22000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 77";
-		rLen = 0;
-		rLoc = 2326;
-		rType = 0;
-		vrLen = 846;
-		vrLoc = 2059;
-	};
-	6B74B7401286B7C400262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 84";
-		rLen = 0;
-		rLoc = 2425;
-		rType = 0;
-		vrLen = 912;
-		vrLoc = 2195;
-	};
-	6B74B7411286B7C400262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 319";
-		rLen = 0;
-		rLoc = 8603;
-		rType = 0;
-		vrLen = 903;
-		vrLoc = 7715;
-	};
-	6B74B7421286B7C400262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 521";
-		rLen = 0;
-		rLoc = 14202;
-		rType = 0;
-		vrLen = 934;
-		vrLoc = 12915;
-	};
-	6B74B7441286B8E600262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 317";
-		rLen = 0;
-		rLoc = 8185;
-		rType = 0;
-		vrLen = 766;
-		vrLoc = 7584;
-	};
-	6B74B7451286B8E600262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C571211663A008CFCDF /* CrowdTool.h */;
-		name = "CrowdTool.h: 47";
-		rLen = 11;
-		rLoc = 1457;
-		rType = 0;
-		vrLen = 1262;
-		vrLoc = 0;
-	};
-	6B74B7461286B8E600262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D8123D27EC0021A7A4 /* CrowdManager.h */;
-		name = "CrowdManager.h: 251";
-		rLen = 0;
-		rLoc = 5925;
-		rType = 0;
-		vrLen = 610;
-		vrLoc = 5680;
-	};
-	6B74B7471286B8E600262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1388";
-		rLen = 0;
-		rLoc = 32778;
-		rType = 0;
-		vrLen = 1296;
-		vrLoc = 31907;
-	};
-	6B74B74A1286B90100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1386";
-		rLen = 0;
-		rLoc = 32640;
-		rType = 0;
-		vrLen = 1296;
-		vrLoc = 31907;
-	};
-	6B74B74B1286B90100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C571211663A008CFCDF /* CrowdTool.h */;
-		name = "CrowdTool.h: 52";
-		rLen = 0;
-		rLoc = 1585;
-		rType = 0;
-		vrLen = 641;
-		vrLoc = 1351;
-	};
-	6B74B74C1286B90100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 311";
-		rLen = 0;
-		rLoc = 8059;
-		rType = 0;
-		vrLen = 765;
-		vrLoc = 7584;
-	};
-	6B74B74D1286B90100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 342";
-		rLen = 0;
-		rLoc = 8786;
-		rType = 0;
-		vrLen = 806;
-		vrLoc = 8096;
-	};
-	6B74B7561286B92300262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 342";
-		rLen = 0;
-		rLoc = 8786;
-		rType = 0;
-		vrLen = 806;
-		vrLoc = 8096;
-	};
-	6B74B7571286B92300262888 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Expected `;' before '->' token";
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 1387;
-		rType = 1;
-	};
-	6B74B7581286B92300262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1377";
-		rLen = 0;
-		rLoc = 32369;
-		rType = 0;
-		vrLen = 1155;
-		vrLoc = 31987;
-	};
-	6B74B75F1286BB6900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1390";
-		rLen = 0;
-		rLoc = 32809;
-		rType = 0;
-		vrLen = 873;
-		vrLoc = 32331;
-	};
-	6B74B7601286BB6900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D8123D27EC0021A7A4 /* CrowdManager.h */;
-		name = "CrowdManager.h: 251";
-		rLen = 0;
-		rLoc = 5925;
-		rType = 0;
-		vrLen = 1233;
-		vrLoc = 7098;
-	};
-	6B74B7611286BB6900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C571211663A008CFCDF /* CrowdTool.h */;
-		name = "CrowdTool.h: 48";
-		rLen = 15;
-		rLoc = 1476;
-		rType = 0;
-		vrLen = 517;
-		vrLoc = 1351;
-	};
-	6B74B7621286BB6900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 342";
-		rLen = 0;
-		rLoc = 8786;
-		rType = 0;
-		vrLen = 682;
-		vrLoc = 8220;
-	};
-	6B74B7631286BB6900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 627";
-		rLen = 0;
-		rLoc = 16737;
-		rType = 0;
-		vrLen = 917;
-		vrLoc = 16277;
-	};
-	6B74B76A1286F56B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 625";
-		rLen = 0;
-		rLoc = 16732;
-		rType = 0;
-		vrLen = 917;
-		vrLoc = 16277;
-	};
-	6B74B76B1286F56B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 1327";
-		rLen = 0;
-		rLoc = 30930;
-		rType = 0;
-		vrLen = 621;
-		vrLoc = 30539;
-	};
-	6B74B76C1286F56B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 181";
-		rLen = 87;
-		rLoc = 5037;
-		rType = 0;
-		vrLen = 947;
-		vrLoc = 4878;
-	};
-	6B74B76D1286F56B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88C10B69E4C00DF20FB /* DetourNavMeshBuilder.h */;
-		name = "DetourNavMeshBuilder.h: 50";
-		rLen = 16;
-		rLoc = 2475;
-		rType = 0;
-		vrLen = 1606;
-		vrLoc = 1474;
-	};
-	6B74B76E1286F56B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */;
-		name = "DetourNavMeshBuilder.cpp: 533";
-		rLen = 0;
-		rLoc = 15947;
-		rType = 0;
-		vrLen = 894;
-		vrLoc = 15304;
-	};
-	6B74B76F1286F56B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88710B69E3E00DF20FB /* DetourNavMesh.cpp */;
-		name = "DetourNavMesh.cpp: 1169";
-		rLen = 0;
-		rLoc = 31834;
-		rType = 0;
-		vrLen = 625;
-		vrLoc = 23739;
-	};
-	6B74B7701286F56B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */;
-		name = "DetourNavMesh.h: 131";
-		rLen = 0;
-		rLoc = 4740;
-		rType = 0;
-		vrLen = 1435;
-		vrLoc = 4429;
-	};
-	6B74B7711286F56B00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */;
-		name = "DetourNavMesh.h: 37";
-		rLen = 0;
-		rLoc = 1521;
-		rType = 0;
-		vrLen = 1186;
-		vrLoc = 999;
-	};
-	6B74B7761286F61200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */;
-		name = "DetourNavMesh.h: 288";
-		rLen = 0;
-		rLoc = 11642;
-		rType = 0;
-		vrLen = 1372;
-		vrLoc = 4398;
-	};
-	6B74B7771286F61200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88C10B69E4C00DF20FB /* DetourNavMeshBuilder.h */;
-		name = "DetourNavMeshBuilder.h: 52";
-		rLen = 0;
-		rLoc = 2613;
-		rType = 0;
-		vrLen = 1829;
-		vrLoc = 1300;
-	};
-	6B74B7781286F61200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */;
-		name = "DetourNavMeshBuilder.cpp: 533";
-		rLen = 0;
-		rLoc = 15947;
-		rType = 0;
-		vrLen = 892;
-		vrLoc = 15306;
-	};
-	6B74B7791286F61200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */;
-		name = "DetourNavMeshBuilder.cpp: 537";
-		rLen = 0;
-		rLoc = 16009;
-		rType = 0;
-		vrLen = 892;
-		vrLoc = 15306;
-	};
-	6B74B7801286F72D00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FDA310F36EFC006DA0A6 /* InputGeom.h */;
-		name = "InputGeom.h: 79";
-		rLen = 20;
-		rLoc = 2996;
-		rType = 0;
-		vrLen = 1563;
-		vrLoc = 1774;
-	};
-	6B74B7811286F72D00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FDA410F36F0E006DA0A6 /* InputGeom.cpp */;
-		name = "InputGeom.cpp: 379";
-		rLen = 0;
-		rLoc = 9369;
-		rType = 0;
-		vrLen = 913;
-		vrLoc = 8553;
-	};
-	6B74B7821286F72D00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B2AEC510FFB8946005BE9CC /* Sample_TileMesh.h */;
-		name = "Sample_TileMesh.h: 92";
-		rLen = 0;
-		rLoc = 2493;
-		rType = 0;
-		vrLen = 893;
-		vrLoc = 1971;
-	};
-	6B74B7831286F72D00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
-		name = "Sample_TileMesh.cpp: 1156";
-		rLen = 62;
-		rLoc = 32666;
-		rType = 0;
-		vrLen = 1382;
-		vrLoc = 31865;
-	};
-	6B74B7841286F72D00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */;
-		name = "Sample_SoloMeshTiled.cpp: 1062";
-		rLen = 0;
-		rLoc = 32283;
-		rType = 0;
-		vrLen = 1365;
-		vrLoc = 31388;
-	};
-	6B74B7851286F72D00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */;
-		name = "Sample_SoloMeshSimple.cpp: 620";
-		rLen = 0;
-		rLoc = 19411;
-		rType = 0;
-		vrLen = 1347;
-		vrLoc = 18510;
-	};
-	6B74B7861286F72D00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */;
-		name = "DetourNavMeshBuilder.cpp: 539";
-		rLen = 0;
-		rLoc = 16038;
-		rType = 0;
-		vrLen = 1044;
-		vrLoc = 15059;
-	};
-	6B74B7871286F72D00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */;
-		name = "DetourNavMeshBuilder.cpp: 535";
-		rLen = 0;
-		rLoc = 16002;
-		rType = 0;
-		vrLen = 948;
-		vrLoc = 15155;
-	};
-	6B74B78B1286F76300262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */;
-		name = "DetourNavMeshBuilder.cpp: 536";
-		rLen = 0;
-		rLoc = 16006;
-		rType = 0;
-		vrLen = 859;
-		vrLoc = 15304;
-	};
-	6B74B78C1286F76300262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 181";
-		rLen = 87;
-		rLoc = 5037;
-		rType = 0;
-		vrLen = 1017;
-		vrLoc = 4853;
-	};
-	6B74B78D1286F76300262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 181";
-		rLen = 87;
-		rLoc = 5037;
-		rType = 0;
-		vrLen = 1017;
-		vrLoc = 4853;
-	};
-	6B74B7901286F77500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */;
-		name = "DetourNavMeshBuilder.cpp: 533";
-		rLen = 0;
-		rLoc = 15915;
-		rType = 0;
-		vrLen = 857;
-		vrLoc = 15306;
-	};
-	6B74B7911286F77500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		rLen = 0;
-		rLoc = 165;
-		rType = 1;
-	};
-	6B74B7921286F77500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 166";
-		rLen = 0;
-		rLoc = 4589;
-		rType = 0;
-		vrLen = 1038;
-		vrLoc = 4379;
-	};
-	6B74B7931286F78400262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 166";
-		rLen = 0;
-		rLoc = 4589;
-		rType = 0;
-		vrLen = 558;
-		vrLoc = 7092;
-	};
-	6B74B7941286F78400262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */;
-		rLen = 0;
-		rLoc = 249;
-		rType = 1;
-	};
-	6B74B7951286F78400262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */;
-		name = "Sample_SoloMeshSimple.cpp: 250";
-		rLen = 18;
-		rLoc = 8071;
-		rType = 0;
-		vrLen = 681;
-		vrLoc = 7720;
-	};
-	6B74B7981286F7CD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 166";
-		rLen = 0;
-		rLoc = 4589;
-		rType = 0;
-		vrLen = 1038;
-		vrLoc = 4379;
-	};
-	6B74B7991286F7CD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */;
-		name = "Sample_SoloMeshSimple.cpp: 250";
-		rLen = 18;
-		rLoc = 8071;
-		rType = 0;
-		vrLen = 889;
-		vrLoc = 7513;
-	};
-	6B74B79A1286F7CD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6140FFA62BE004F1BC4 /* Sample.cpp */;
-		name = "Sample.cpp: 35";
-		rLen = 0;
-		rLoc = 1275;
-		rType = 0;
-		vrLen = 470;
-		vrLoc = 1050;
-	};
-	6B74B79B1286F7CD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6100FFA62AD004F1BC4 /* Sample.h */;
-		name = "Sample.h: 130";
-		rLen = 19;
-		rLoc = 3944;
-		rType = 0;
-		vrLen = 908;
-		vrLoc = 3199;
-	};
-	6B74B79C1286F7CD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 133";
-		rLen = 0;
-		rLoc = 3537;
-		rType = 0;
-		vrLen = 414;
-		vrLoc = 3255;
-	};
-	6B74B79D1286F7CD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 57";
-		rLen = 0;
-		rLoc = 1579;
-		rType = 0;
-		vrLen = 404;
-		vrLoc = 1403;
-	};
-	6B74B79E1286F7CD00262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 49";
-		rLen = 0;
-		rLoc = 1475;
-		rType = 0;
-		vrLen = 404;
-		vrLoc = 1403;
-	};
-	6B74B79F1286F7D700262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 49";
-		rLen = 0;
-		rLoc = 1475;
-		rType = 0;
-		vrLen = 404;
-		vrLoc = 1403;
-	};
-	6B74B7A01286F7D700262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		rLen = 0;
-		rLoc = 165;
-		rType = 1;
-	};
-	6B74B7A11286F7D700262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 166";
-		rLen = 0;
-		rLoc = 4589;
-		rType = 0;
-		vrLen = 658;
-		vrLoc = 4379;
-	};
-	6B74B7A61286F8E700262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 166";
-		rLen = 0;
-		rLoc = 4589;
-		rType = 0;
-		vrLen = 658;
-		vrLoc = 4379;
-	};
-	6B74B7A71286F8E700262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 50";
-		rLen = 0;
-		rLoc = 1476;
-		rType = 0;
-		vrLen = 402;
-		vrLoc = 1403;
-	};
-	6B74B7A81286F8E700262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 55";
-		rLen = 0;
-		rLoc = 1579;
-		rType = 0;
-		vrLen = 440;
-		vrLoc = 1341;
-	};
-	6B74B7AC1286F93000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 252";
-		rLen = 15;
-		rLoc = 7284;
-		rType = 0;
-		vrLen = 683;
-		vrLoc = 6920;
-	};
-	6B74B7AD1286F93000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6140FFA62BE004F1BC4 /* Sample.cpp */;
-		name = "Sample.cpp: 41";
-		rLen = 15;
-		rLoc = 1359;
-		rType = 0;
-		vrLen = 315;
-		vrLoc = 1462;
-	};
-	6B74B7AE1286F93000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 133";
-		rLen = 0;
-		rLoc = 3537;
-		rType = 0;
-		vrLen = 442;
-		vrLoc = 3255;
-	};
-	6B74B7AF1286F93000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		rLen = 15;
-		rLoc = 1721;
-		rType = 0;
-	};
-	6B74B7B01286F93000262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 50";
-		rLen = 0;
-		rLoc = 1520;
-		rType = 0;
-		vrLen = 441;
-		vrLoc = 1408;
-	};
-	6B74B7B21286F99100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6100FFA62AD004F1BC4 /* Sample.h */;
-		name = "Sample.h: 131";
-		rLen = 0;
-		rLoc = 4017;
-		rType = 0;
-		vrLen = 938;
-		vrLoc = 3169;
-	};
-	6B74B7B31286F99100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		rLen = 0;
-		rLoc = 51;
-		rType = 1;
-	};
-	6B74B7B41286F99100262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 51";
-		rLen = 0;
-		rLoc = 1523;
-		rType = 0;
-		vrLen = 441;
-		vrLoc = 1408;
-	};
-	6B74B7B51286F9D900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */;
-		name = "Sample_SoloMeshSimple.cpp: 665";
-		rLen = 0;
-		rLoc = 20711;
-		rType = 0;
-		vrLen = 461;
-		vrLoc = 20290;
-	};
-	6B74B7B61286F9D900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		rLen = 0;
-		rLoc = 55;
-		rType = 1;
-	};
-	6B74B7B71286F9D900262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 57";
-		rLen = 0;
-		rLoc = 1579;
-		rType = 0;
-		vrLen = 367;
-		vrLoc = 1407;
-	};
-	6B74B7BA1286F9F400262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 57";
-		rLen = 0;
-		rLoc = 1579;
-		rType = 0;
-		vrLen = 424;
-		vrLoc = 1388;
-	};
-	6B74B7BB1286F9F400262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		rLen = 0;
-		rLoc = 3537;
-		rType = 0;
-	};
-	6B74B7BC1286F9F400262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 127";
-		rLen = 0;
-		rLoc = 3360;
-		rType = 0;
-		vrLen = 408;
-		vrLoc = 3226;
-	};
-	6B74B7C01286FA5200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 135";
-		rLen = 0;
-		rLoc = 3537;
-		rType = 0;
-		vrLen = 390;
-		vrLoc = 3228;
-	};
-	6B74B7C11286FA5200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		rLen = 0;
-		rLoc = 1471;
-		rType = 0;
-	};
-	6B74B7C21286FA5200262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 53";
-		rLen = 0;
-		rLoc = 1526;
-		rType = 0;
-		vrLen = 444;
-		vrLoc = 1372;
-	};
-	6B74B7C51286FAB500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
-		name = "OffMeshConnectionTool.cpp: 48";
-		rLen = 0;
-		rLoc = 1472;
-		rType = 0;
-		vrLen = 413;
-		vrLoc = 1403;
-	};
-	6B74B7C61286FAB500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 252";
-		rLen = 15;
-		rLoc = 7284;
-		rType = 0;
-		vrLen = 637;
-		vrLoc = 6966;
-	};
-	6B74B7C71286FAB500262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 247";
-		rLen = 0;
-		rLoc = 7091;
-		rType = 0;
-		vrLen = 1185;
-		vrLoc = 4523;
-	};
-	6B74B7CB1286FAD800262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 184";
-		rLen = 0;
-		rLoc = 5224;
-		rType = 0;
-		vrLen = 1185;
-		vrLoc = 4523;
-	};
-	6B74B7CC1286FAD800262888 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 185";
-		rLen = 0;
-		rLoc = 5241;
-		rType = 0;
-		vrLen = 1185;
-		vrLoc = 4523;
-	};
-	6B8036AC113BAABE005ED67B /* Sample_Debug.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 689}}";
-			sepNavSelRange = "{269, 0}";
-			sepNavVisRange = "{0, 1049}";
-		};
-	};
-	6B8036AD113BAABE005ED67B /* Sample_Debug.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 5070}}";
-			sepNavSelRange = "{3338, 0}";
-			sepNavVisRange = "{3021, 598}";
-		};
-	};
-	6B847774122D220D00ADF63D /* ValueHistory.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 663}}";
-			sepNavSelRange = "{587, 0}";
-			sepNavVisRange = "{23, 994}";
-		};
-	};
-	6B847776122D221C00ADF63D /* ValueHistory.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {957, 1560}}";
-			sepNavSelRange = "{2028, 0}";
-			sepNavVisRange = "{1337, 1555}";
-		};
-	};
-	6B8632970F78114600E2684A /* Recast */ = {
-		isa = PBXExecutable;
-		activeArgIndices = (
-		);
-		argumentStrings = (
-		);
-		autoAttachOnCrash = 1;
-		breakpointsEnabled = 1;
-		configStateDict = {
-		};
-		customDataFormattersEnabled = 1;
-		dataTipCustomDataFormattersEnabled = 1;
-		dataTipShowTypeColumn = 1;
-		dataTipSortType = 0;
-		debuggerPlugin = GDBDebugging;
-		disassemblyDisplayState = 0;
-		dylibVariantSuffix = "";
-		enableDebugStr = 1;
-		environmentEntries = (
-		);
-		executableSystemSymbolLevel = 0;
-		executableUserSymbolLevel = 0;
-		libgmallocEnabled = 0;
-		name = Recast;
-		savedGlobals = {
-		};
-		showTypeColumn = 0;
-		sourceDirectories = (
-		);
-		variableFormatDictionary = {
-		};
-	};
-	6B8632A90F78115100E2684A /* Source Control */ = {
-		isa = PBXSourceControlManager;
-		fallbackIsa = XCSourceControlManager;
-		isSCMEnabled = 0;
-		scmConfiguration = {
-			repositoryNamesForRoots = {
-				"" = "";
-			};
-		};
-	};
-	6B8632AA0F78115100E2684A /* Code sense */ = {
-		isa = PBXCodeSenseManager;
-		indexTemplatePath = "";
-	};
-	6B8D55CD127AAA360077C699 /* CrowdManager.cpp:1197 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		functionName = "CrowdManager::updateMoveRequest(const float dt, dtNavMeshQuery* navquery, const dtQueryFilter* filter)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 1197;
-		location = Recast;
-		modificationTime = 310835896.177066;
-		originalNumberOfMultipleMatches = 1;
-		state = 1;
-	};
-	6B8D565F127ADB0D0077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BA1E88E10C7BFD3008007F6 /* Sample_SoloMeshSimple.h */;
-		name = "Sample_SoloMeshSimple.h: 34";
-		rLen = 20;
-		rLoc = 1232;
-		rType = 0;
-		vrLen = 715;
-		vrLoc = 923;
-	};
-	6B8D566D127ADB7D0077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */;
-		name = "DetourDebugDraw.cpp: 411";
-		rLen = 0;
-		rLoc = 11541;
-		rType = 0;
-		vrLen = 814;
-		vrLoc = 11386;
-	};
-	6B8D566F127ADB7D0077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B9846EE11E718F800FA177B /* DetourAlloc.cpp */;
-		name = "DetourAlloc.cpp: 49";
-		rLen = 0;
-		rLoc = 1491;
-		rType = 0;
-		vrLen = 488;
-		vrLoc = 1021;
-	};
-	6B8D56C7127AEC100077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */;
-		name = "Sample_SoloMeshSimple.cpp: 649";
-		rLen = 0;
-		rLoc = 20284;
-		rType = 0;
-		vrLen = 737;
-		vrLoc = 19576;
-	};
-	6B8D56C8127AEC100077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */;
-		name = "Sample_SoloMeshTiled.cpp: 1089";
-		rLen = 0;
-		rLoc = 33107;
-		rType = 0;
-		vrLen = 769;
-		vrLoc = 32691;
-	};
-	6B8D56C9127AEC100077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
-		name = "Sample_TileMesh.cpp: 719";
-		rLen = 0;
-		rLoc = 19463;
-		rType = 0;
-		vrLen = 640;
-		vrLoc = 19043;
-	};
-	6B8D56CA127AEC100077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */;
-		name = "CrowdTool.cpp: 257";
-		rLen = 0;
-		rLoc = 7194;
-		rType = 0;
-		vrLen = 868;
-		vrLoc = 6285;
-	};
-	6B8D56CB127AEC100077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8036AD113BAABE005ED67B /* Sample_Debug.cpp */;
-		name = "Sample_Debug.cpp: 130";
-		rLen = 15;
-		rLoc = 3296;
-		rType = 0;
-		vrLen = 716;
-		vrLoc = 2962;
-	};
-	6B8D56CC127AEC100077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */;
-		name = "DetourNavMesh.h: 384";
-		rLen = 0;
-		rLoc = 15329;
-		rType = 0;
-		vrLen = 1370;
-		vrLoc = 14287;
-	};
-	6B8D56CD127AEC100077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88710B69E3E00DF20FB /* DetourNavMesh.cpp */;
-		name = "DetourNavMesh.cpp: 587";
-		rLen = 0;
-		rLoc = 15922;
-		rType = 0;
-		vrLen = 783;
-		vrLoc = 15121;
-	};
-	6B8D56CE127AEC100077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 1084";
-		rLen = 18;
-		rLoc = 30464;
-		rType = 0;
-		vrLen = 736;
-		vrLoc = 28778;
-	};
-	6B8D56CF127AEC100077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */;
-		name = "DetourNavMeshQuery.h: 337";
-		rLen = 0;
-		rLoc = 17195;
-		rType = 0;
-		vrLen = 1215;
-		vrLoc = 15770;
-	};
-	6B8D56D0127AEC100077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FC0910EBB6AA006DA0A6 /* NavMeshTesterTool.h */;
-		name = "NavMeshTesterTool.h: 35";
-		rLen = 0;
-		rLoc = 1207;
-		rType = 0;
-		vrLen = 539;
-		vrLoc = 980;
-	};
-	6B8D56D2127AEC100077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BF7C13F1111953A002B3F46 /* TestCase.cpp */;
-		name = "TestCase.cpp: 206";
-		rLen = 0;
-		rLoc = 4694;
-		rType = 0;
-		vrLen = 905;
-		vrLoc = 4411;
-	};
-	6B8D56D8127AEC580077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 529";
-		rLen = 0;
-		rLoc = 12206;
-		rType = 0;
-		vrLen = 710;
-		vrLoc = 12070;
-	};
-	6B8D56DB127DF2620077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */;
-		name = "NavMeshTesterTool.cpp: 543";
-		rLen = 8;
-		rLoc = 14441;
-		rType = 0;
-		vrLen = 853;
-		vrLoc = 13987;
-	};
-	6B8D56DC127DF2620077C699 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */;
-		name = "NavMeshTesterTool.cpp: 543";
-		rLen = 8;
-		rLoc = 14441;
-		rType = 0;
-		vrLen = 853;
-		vrLoc = 13987;
-	};
-	6B8DE6F010A88F0500DF20FB /* PBXBookmarkGroup */ = {
-		isa = PBXBookmarkGroup;
-		children = (
-			6B8DE89210B6A4B900DF20FB /* PBXTextBookmark */,
-		);
-		name = Root;
-	};
-	6B8DE88710B69E3E00DF20FB /* DetourNavMesh.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {915, 16172}}";
-			sepNavSelRange = "{31834, 0}";
-			sepNavVisRange = "{23739, 625}";
-			sepNavWindowFrame = "{{15, 51}, {1214, 722}}";
-		};
-	};
-	6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 9230}}";
-			sepNavSelRange = "{15915, 0}";
-			sepNavVisRange = "{15306, 857}";
-		};
-	};
-	6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {873, 5330}}";
-			sepNavSelRange = "{11642, 0}";
-			sepNavVisRange = "{4398, 1372}";
-		};
-	};
-	6B8DE88C10B69E4C00DF20FB /* DetourNavMeshBuilder.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 1014}}";
-			sepNavSelRange = "{2613, 0}";
-			sepNavVisRange = "{1300, 1829}";
-		};
-	};
-	6B8DE89210B6A4B900DF20FB /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */;
-		name = detail;
-		rLen = 0;
-		rLoc = 13611;
-		rType = 0;
-		vrLen = 1182;
-		vrLoc = 9676;
-	};
-	6B920A121225B1C900D5B5AD /* DetourHashLookup.cpp:78 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6BD403B31224815A00995864 /* DetourHashLookup.cpp */;
-		functionName = "dtHashLookup::add(const unsigned int key, const unsigned short value)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 78;
-		location = Recast;
-		modificationTime = 310835892.37785;
-		originalNumberOfMultipleMatches = 0;
-		state = 2;
-	};
-	6B920A141225B1CF00D5B5AD /* DetourHashLookup.cpp:131 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6BD403B31224815A00995864 /* DetourHashLookup.cpp */;
-		functionName = "dtHashLookup::query(const unsigned int* keys, const int nkeys, unsigned short* values, const int maxValues)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 131;
-		modificationTime = 310835892.378217;
-		originalNumberOfMultipleMatches = 1;
-		state = 0;
-	};
-	6B98463111E6144400FA177B /* Sample_SoloMeshTiled.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 1664}}";
-			sepNavSelRange = "{2060, 25}";
-			sepNavVisRange = "{1459, 1116}";
-		};
-	};
-	6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 14820}}";
-			sepNavSelRange = "{32283, 0}";
-			sepNavVisRange = "{31388, 1365}";
-			sepNavWindowFrame = "{{38, 30}, {1214, 722}}";
-		};
-	};
-	6B9846ED11E718F800FA177B /* DetourAlloc.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 641}}";
-			sepNavSelRange = "{1286, 0}";
-			sepNavVisRange = "{0, 1361}";
-		};
-	};
-	6B9846EE11E718F800FA177B /* DetourAlloc.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 663}}";
-			sepNavSelRange = "{1491, 0}";
-			sepNavVisRange = "{1021, 488}";
-		};
-	};
-	6B98470511E733B600FA177B /* RecastAlloc.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 910}}";
-			sepNavSelRange = "{1797, 71}";
-			sepNavVisRange = "{1112, 1235}";
-		};
-	};
-	6B9847B711E7519A00FA177B /* RecastAlloc.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 884}}";
-			sepNavSelRange = "{1524, 0}";
-			sepNavVisRange = "{920, 948}";
-		};
-	};
-	6B9EFF02122819E200535FF1 /* DetourObstacleAvoidance.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 1872}}";
-			sepNavSelRange = "{3711, 22}";
-			sepNavVisRange = "{2866, 1894}";
-		};
-	};
-	6B9EFF0812281C3E00535FF1 /* DetourObstacleAvoidance.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 6695}}";
-			sepNavSelRange = "{11554, 0}";
-			sepNavVisRange = "{10955, 1306}";
-		};
-	};
-	6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1139, 8593}}";
-			sepNavSelRange = "{20711, 0}";
-			sepNavVisRange = "{20290, 461}";
-		};
-	};
-	6BA1E88E10C7BFD3008007F6 /* Sample_SoloMeshSimple.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 1053}}";
-			sepNavSelRange = "{1232, 20}";
-			sepNavVisRange = "{923, 715}";
-		};
-	};
-	6BA687AC1222F7AC00730711 /* Sample_Debug.cpp:137 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6B8036AD113BAABE005ED67B /* Sample_Debug.cpp */;
-		functionName = "Sample_Debug::Sample_Debug()";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 137;
-		location = Recast;
-		modificationTime = 310835896.133154;
-		originalNumberOfMultipleMatches = 1;
-		state = 1;
-	};
-	6BAF3C571211663A008CFCDF /* CrowdTool.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 1170}}";
-			sepNavSelRange = "{1476, 15}";
-			sepNavVisRange = "{1351, 517}";
-		};
-	};
-	6BAF3C581211663A008CFCDF /* CrowdTool.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 8619}}";
-			sepNavSelRange = "{3537, 0}";
-			sepNavVisRange = "{3228, 390}";
-			sepNavWindowFrame = "{{15, 51}, {1214, 722}}";
-		};
-	};
-	6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 5265}}";
-			sepNavSelRange = "{8664, 29}";
-			sepNavVisRange = "{7667, 2073}";
-		};
-	};
-	6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 33280}}";
-			sepNavSelRange = "{27789, 0}";
-			sepNavVisRange = "{27424, 755}";
-		};
-	};
-	6BAF427A121ADCC2008CFCDF /* DetourAssert.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 641}}";
-			sepNavSelRange = "{1209, 56}";
-			sepNavVisRange = "{0, 1368}";
-		};
-	};
-	6BAF4440121C3D0A008CFCDF /* SampleInterfaces.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 1196}}";
-			sepNavSelRange = "{2197, 11}";
-			sepNavVisRange = "{1496, 1431}";
-		};
-	};
-	6BAF4441121C3D26008CFCDF /* SampleInterfaces.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 2977}}";
-			sepNavSelRange = "{1116, 0}";
-			sepNavVisRange = "{637, 1139}";
-		};
-	};
-	6BAF4561121D173A008CFCDF /* RecastAssert.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 641}}";
-			sepNavSelRange = "{1133, 149}";
-			sepNavVisRange = "{0, 1368}";
-		};
-	};
-	6BB788160FC0472B003C24DB /* ChunkyTriMesh.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 4056}}";
-			sepNavSelRange = "{6788, 0}";
-			sepNavVisRange = "{5982, 1027}";
-		};
-	};
-	6BB788180FC04753003C24DB /* ChunkyTriMesh.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 689}}";
-			sepNavSelRange = "{1575, 26}";
-			sepNavVisRange = "{0, 1866}";
-		};
-	};
-	6BB7FC0910EBB6AA006DA0A6 /* NavMeshTesterTool.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 1521}}";
-			sepNavSelRange = "{2745, 0}";
-			sepNavVisRange = "{2051, 953}";
-		};
-	};
-	6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 15951}}";
-			sepNavSelRange = "{8413, 0}";
-			sepNavVisRange = "{8249, 624}";
-			sepNavWindowFrame = "{{38, 30}, {1214, 722}}";
-		};
-	};
-	6BB7FDA310F36EFC006DA0A6 /* InputGeom.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 1222}}";
-			sepNavSelRange = "{2996, 20}";
-			sepNavVisRange = "{1774, 1563}";
-		};
-	};
-	6BB7FDA410F36F0E006DA0A6 /* InputGeom.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 6669}}";
-			sepNavSelRange = "{9369, 0}";
-			sepNavVisRange = "{8553, 913}";
-		};
-	};
-	6BB93C7710CFE1D500F74F2B /* DebugDraw.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 2652}}";
-			sepNavSelRange = "{4603, 157}";
-			sepNavVisRange = "{3693, 1887}";
-		};
-	};
-	6BB93C7810CFE1D500F74F2B /* DetourDebugDraw.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {957, 494}}";
-			sepNavSelRange = "{1365, 83}";
-			sepNavVisRange = "{396, 1352}";
-		};
-	};
-	6BB93C7910CFE1D500F74F2B /* RecastDebugDraw.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1181, 641}}";
-			sepNavSelRange = "{1402, 30}";
-			sepNavVisRange = "{0, 2356}";
-		};
-	};
-	6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 7917}}";
-			sepNavSelRange = "{8933, 0}";
-			sepNavVisRange = "{8604, 932}";
-		};
-	};
-	6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {950, 5876}}";
-			sepNavSelRange = "{5241, 0}";
-			sepNavVisRange = "{4523, 1185}";
-			sepNavWindowFrame = "{{61, 9}, {1214, 722}}";
-		};
-	};
-	6BB93C7C10CFE1D500F74F2B /* RecastDebugDraw.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 8619}}";
-			sepNavSelRange = "{2030, 0}";
-			sepNavVisRange = "{1526, 956}";
-		};
-	};
-	6BB93CF410CFEC4500F74F2B /* RecastDump.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 641}}";
-			sepNavSelRange = "{1619, 0}";
-			sepNavVisRange = "{0, 1728}";
-			sepNavWindowFrame = "{{38, 15}, {1174, 737}}";
-		};
-	};
-	6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 5902}}";
-			sepNavSelRange = "{3140, 0}";
-			sepNavVisRange = "{2368, 1168}";
-		};
-	};
-	6BBB4C4C115B7BAD00CF791D /* Sample_TileMesh.cpp:281 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
-		functionName = "Sample_TileMesh::loadAll(const char* path)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 281;
-		location = Recast;
-		modificationTime = 310835896.105515;
-		originalNumberOfMultipleMatches = 1;
-		state = 1;
-	};
-	6BCF32341104CD05009445BF /* OffMeshConnectionTool.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 663}}";
-			sepNavSelRange = "{1546, 0}";
-			sepNavVisRange = "{789, 910}";
-		};
-	};
-	6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 2145}}";
-			sepNavSelRange = "{1472, 0}";
-			sepNavVisRange = "{1403, 413}";
-		};
-	};
-	6BD401FF1224278800995864 /* PerfTimer.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 641}}";
-			sepNavSelRange = "{0, 923}";
-			sepNavVisRange = "{0, 1176}";
-		};
-	};
-	6BD402001224279400995864 /* PerfTimer.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 741}}";
-			sepNavSelRange = "{967, 0}";
-			sepNavVisRange = "{0, 1430}";
-		};
-	};
-	6BD403421224642500995864 /* NavMeshTesterTool.cpp:547 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */;
-		functionName = "NavMeshTesterTool::recalc()";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 547;
-		location = Recast;
-		modificationTime = 310835896.141632;
-		originalNumberOfMultipleMatches = 1;
-		state = 1;
-	};
-	6BD403B31224815A00995864 /* DetourHashLookup.cpp */ = {
-		isa = PBXFileReference;
-		fileEncoding = 4;
-		lastKnownFileType = sourcecode.cpp.cpp;
-		name = DetourHashLookup.cpp;
-		path = /Users/memon/Code/recastnavigation/Detour/Source/DetourHashLookup.cpp;
-		sourceTree = "<absolute>";
-	};
-	6BD667D8123D27EC0021A7A4 /* CrowdManager.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 4264}}";
-			sepNavSelRange = "{5925, 0}";
-			sepNavVisRange = "{7098, 1233}";
-		};
-	};
-	6BD667D9123D28100021A7A4 /* CrowdManager.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {853, 19929}}";
-			sepNavSelRange = "{30930, 0}";
-			sepNavVisRange = "{30539, 621}";
-			sepNavWindowFrame = "{{15, 134}, {1120, 639}}";
-		};
-	};
-	6BD66851124350F50021A7A4 /* NavMeshTesterTool.cpp:486 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */;
-		functionName = "NavMeshTesterTool::handleUpdate(const float /*dt*/)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 486;
-		location = Recast;
-		modificationTime = 310835896.158779;
-		originalNumberOfMultipleMatches = 1;
-		state = 1;
-	};
-	6BF5F23911747606000502A6 /* Filelist.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 1222}}";
-			sepNavSelRange = "{1296, 0}";
-			sepNavVisRange = "{920, 888}";
-		};
-	};
-	6BF5F23C11747614000502A6 /* Filelist.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 641}}";
-			sepNavSelRange = "{922, 0}";
-			sepNavVisRange = "{0, 1180}";
-		};
-	};
-	6BF5F23E1174763B000502A6 /* SlideShow.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 702}}";
-			sepNavSelRange = "{1292, 0}";
-			sepNavVisRange = "{64, 1406}";
-		};
-	};
-	6BF5F23F1174763B000502A6 /* SlideShow.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 2054}}";
-			sepNavSelRange = "{1126, 0}";
-			sepNavVisRange = "{3, 1396}";
-		};
-	};
-	6BF5F2C511747E9F000502A6 /* stb_image.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 50882}}";
-			sepNavSelRange = "{108151, 0}";
-			sepNavVisRange = "{107349, 1210}";
-		};
-	};
-	6BF7C13E11119520002B3F46 /* TestCase.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 1027}}";
-			sepNavSelRange = "{1776, 0}";
-			sepNavVisRange = "{1047, 917}";
-		};
-	};
-	6BF7C13F1111953A002B3F46 /* TestCase.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 4485}}";
-			sepNavSelRange = "{4694, 0}";
-			sepNavVisRange = "{4411, 905}";
-		};
-	};
-	6BF7C4531115C277002B3F46 /* RecastArea.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 5174}}";
-			sepNavSelRange = "{986, 0}";
-			sepNavVisRange = "{0, 1674}";
-		};
-	};
-	8D1107260486CEB800E47090 /* Recast */ = {
-		activeExec = 0;
-		executables = (
-			6B8632970F78114600E2684A /* Recast */,
-		);
-	};
-	8D1107310486CEB800E47090 /* Info.plist */ = {
-		uiCtxt = {
-			sepNavWindowFrame = "{{38, 57}, {1011, 695}}";
-		};
-	};
-}
diff --git a/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 b/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3
deleted file mode 100644
index b3885cdb995..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3
+++ /dev/null
@@ -1,1559 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>ActivePerspectiveName</key>
-	<string>Project</string>
-	<key>AllowedModules</key>
-	<array>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXSmartGroupTreeModule</string>
-			<key>Name</key>
-			<string>Groups and Files Outline View</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXNavigatorGroup</string>
-			<key>Name</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCTaskListModule</string>
-			<key>Name</key>
-			<string>Task List</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCDetailModule</string>
-			<key>Name</key>
-			<string>File and Smart Group Detail Viewer</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXBuildResultsModule</string>
-			<key>Name</key>
-			<string>Detailed Build Results Viewer</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXProjectFindModule</string>
-			<key>Name</key>
-			<string>Project Batch Find Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCProjectFormatConflictsModule</string>
-			<key>Name</key>
-			<string>Project Format Conflicts List</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXBookmarksModule</string>
-			<key>Name</key>
-			<string>Bookmarks Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXClassBrowserModule</string>
-			<key>Name</key>
-			<string>Class Browser</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXCVSModule</string>
-			<key>Name</key>
-			<string>Source Code Control Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXDebugBreakpointsModule</string>
-			<key>Name</key>
-			<string>Debug Breakpoints Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCDockableInspector</string>
-			<key>Name</key>
-			<string>Inspector</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXOpenQuicklyModule</string>
-			<key>Name</key>
-			<string>Open Quickly Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXDebugSessionModule</string>
-			<key>Name</key>
-			<string>Debugger</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXDebugCLIModule</string>
-			<key>Name</key>
-			<string>Debug Console</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCSnapshotModule</string>
-			<key>Name</key>
-			<string>Snapshots Tool</string>
-		</dict>
-	</array>
-	<key>BundlePath</key>
-	<string>/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources</string>
-	<key>Description</key>
-	<string>AIODescriptionKey</string>
-	<key>DockingSystemVisible</key>
-	<false/>
-	<key>Extension</key>
-	<string>perspectivev3</string>
-	<key>FavBarConfig</key>
-	<dict>
-		<key>PBXProjectModuleGUID</key>
-		<string>6B8632A80F78115100E2684A</string>
-		<key>XCBarModuleItemNames</key>
-		<dict/>
-		<key>XCBarModuleItems</key>
-		<array/>
-	</dict>
-	<key>FirstTimeWindowDisplayed</key>
-	<false/>
-	<key>Identifier</key>
-	<string>com.apple.perspectives.project.defaultV3</string>
-	<key>MajorVersion</key>
-	<integer>34</integer>
-	<key>MinorVersion</key>
-	<integer>0</integer>
-	<key>Name</key>
-	<string>All-In-One</string>
-	<key>Notifications</key>
-	<array/>
-	<key>OpenEditors</key>
-	<array/>
-	<key>PerspectiveWidths</key>
-	<array>
-		<integer>1200</integer>
-		<integer>1200</integer>
-	</array>
-	<key>Perspectives</key>
-	<array>
-		<dict>
-			<key>ChosenToolbarItems</key>
-			<array>
-				<string>XCToolbarPerspectiveControl</string>
-				<string>NSToolbarSeparatorItem</string>
-				<string>active-combo-popup</string>
-				<string>action</string>
-				<string>NSToolbarFlexibleSpaceItem</string>
-				<string>debugger-enable-breakpoints</string>
-				<string>build-and-go</string>
-				<string>com.apple.ide.PBXToolbarStopButton</string>
-				<string>get-info</string>
-				<string>NSToolbarFlexibleSpaceItem</string>
-				<string>com.apple.pbx.toolbar.searchfield</string>
-			</array>
-			<key>ControllerClassBaseName</key>
-			<string></string>
-			<key>IconName</key>
-			<string>WindowOfProject</string>
-			<key>Identifier</key>
-			<string>perspective.project</string>
-			<key>IsVertical</key>
-			<false/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>ContentConfiguration</key>
-					<dict>
-						<key>PBXBottomSmartGroupGIDs</key>
-						<array>
-							<string>1C37FBAC04509CD000000102</string>
-							<string>1C37FAAC04509CD000000102</string>
-							<string>1C37FABC05509CD000000102</string>
-							<string>1C37FABC05539CD112110102</string>
-							<string>E2644B35053B69B200211256</string>
-							<string>1C37FABC04509CD000100104</string>
-							<string>1CC0EA4004350EF90044410B</string>
-							<string>1CC0EA4004350EF90041110B</string>
-							<string>1C77FABC04509CD000000102</string>
-						</array>
-						<key>PBXProjectModuleGUID</key>
-						<string>1CA23ED40692098700951B8B</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>Files</string>
-						<key>PBXProjectStructureProvided</key>
-						<string>yes</string>
-						<key>PBXSmartGroupTreeModuleColumnData</key>
-						<dict>
-							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
-							<array>
-								<real>264</real>
-							</array>
-							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
-							<array>
-								<string>MainColumn</string>
-							</array>
-						</dict>
-						<key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
-						<dict>
-							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
-							<array>
-								<string>29B97314FDCFA39411CA2CEA</string>
-								<string>080E96DDFE201D6D7F000001</string>
-								<string>6BB93C7610CFE1BD00F74F2B</string>
-								<string>6BDD9E030F91110C00904EEF</string>
-								<string>6B137C7D0F7FCBE800459200</string>
-								<string>6B555DF5100B25FC00247EA3</string>
-								<string>6BB7FE8E10F4A175006DA0A6</string>
-								<string>29B97315FDCFA39411CA2CEA</string>
-								<string>29B97317FDCFA39411CA2CEA</string>
-								<string>29B97323FDCFA39411CA2CEA</string>
-								<string>19C28FACFE9D520D11CA2CBB</string>
-								<string>1C37FBAC04509CD000000102</string>
-								<string>1C37FABC05509CD000000102</string>
-								<string>1C77FABC04509CD000000102</string>
-							</array>
-							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
-							<array>
-								<array>
-									<integer>10</integer>
-									<integer>2</integer>
-									<integer>1</integer>
-									<integer>0</integer>
-								</array>
-							</array>
-							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {264, 622}}</string>
-						</dict>
-						<key>PBXTopSmartGroupGIDs</key>
-						<array/>
-						<key>XCIncludePerspectivesSwitch</key>
-						<false/>
-					</dict>
-					<key>GeometryConfiguration</key>
-					<dict>
-						<key>Frame</key>
-						<string>{{0, 0}, {281, 640}}</string>
-						<key>GroupTreeTableConfiguration</key>
-						<array>
-							<string>MainColumn</string>
-							<real>264</real>
-						</array>
-						<key>RubberWindowFrame</key>
-						<string>47 97 1200 681 0 0 1280 778 </string>
-					</dict>
-					<key>Module</key>
-					<string>PBXSmartGroupTreeModule</string>
-					<key>Proportion</key>
-					<string>281pt</string>
-				</dict>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>BecomeActive</key>
-							<true/>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>6B8632A30F78115100E2684A</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>DetourDebugDraw.cpp</string>
-								<key>PBXSplitModuleInNavigatorKey</key>
-								<dict>
-									<key>Split0</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>6B8632A40F78115100E2684A</string>
-										<key>PBXProjectModuleLabel</key>
-										<string>DetourDebugDraw.cpp</string>
-										<key>_historyCapacity</key>
-										<integer>0</integer>
-										<key>bookmark</key>
-										<string>6B74B7CC1286FAD800262888</string>
-										<key>history</key>
-										<array>
-											<string>6B8D565F127ADB0D0077C699</string>
-											<string>6B8D566F127ADB7D0077C699</string>
-											<string>6B8D56D2127AEC100077C699</string>
-											<string>6B4DE62F12807542001CFDF4</string>
-											<string>6B4DE649128079E0001CFDF4</string>
-											<string>6B4DE64A128079E0001CFDF4</string>
-											<string>6B74B5F3128312AC00262888</string>
-											<string>6B74B5F4128312AC00262888</string>
-											<string>6B74B60F128312E900262888</string>
-											<string>6B74B626128314A500262888</string>
-											<string>6B74B627128314A500262888</string>
-											<string>6B74B628128314A500262888</string>
-											<string>6B74B62A128314A500262888</string>
-											<string>6B74B62B128314A500262888</string>
-											<string>6B74B66712869CE100262888</string>
-											<string>6B74B66F12869E3000262888</string>
-											<string>6B74B6D81286ABC000262888</string>
-											<string>6B74B6FC1286AE0B00262888</string>
-											<string>6B74B7061286AEBD00262888</string>
-											<string>6B74B7071286AEBD00262888</string>
-											<string>6B74B7601286BB6900262888</string>
-											<string>6B74B7611286BB6900262888</string>
-											<string>6B74B76B1286F56B00262888</string>
-											<string>6B74B76F1286F56B00262888</string>
-											<string>6B74B7761286F61200262888</string>
-											<string>6B74B7771286F61200262888</string>
-											<string>6B74B7801286F72D00262888</string>
-											<string>6B74B7811286F72D00262888</string>
-											<string>6B74B7821286F72D00262888</string>
-											<string>6B74B7831286F72D00262888</string>
-											<string>6B74B7841286F72D00262888</string>
-											<string>6B74B7901286F77500262888</string>
-											<string>6B74B7991286F7CD00262888</string>
-											<string>6B74B7AD1286F93000262888</string>
-											<string>6B74B7B21286F99100262888</string>
-											<string>6B74B7C01286FA5200262888</string>
-											<string>6B74B7C51286FAB500262888</string>
-											<string>6B74B7CB1286FAD800262888</string>
-										</array>
-									</dict>
-									<key>SplitCount</key>
-									<string>1</string>
-								</dict>
-								<key>StatusBarVisibility</key>
-								<true/>
-								<key>XCSharingToken</key>
-								<string>com.apple.Xcode.CommonNavigatorGroupSharingToken</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {914, 543}}</string>
-								<key>RubberWindowFrame</key>
-								<string>47 97 1200 681 0 0 1280 778 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXNavigatorGroup</string>
-							<key>Proportion</key>
-							<string>543pt</string>
-						</dict>
-						<dict>
-							<key>Proportion</key>
-							<string>93pt</string>
-							<key>Tabs</key>
-							<array>
-								<dict>
-									<key>ContentConfiguration</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>1CA23EDF0692099D00951B8B</string>
-										<key>PBXProjectModuleLabel</key>
-										<string>Detail</string>
-									</dict>
-									<key>GeometryConfiguration</key>
-									<dict>
-										<key>Frame</key>
-										<string>{{10, 27}, {992, 49}}</string>
-									</dict>
-									<key>Module</key>
-									<string>XCDetailModule</string>
-								</dict>
-								<dict>
-									<key>ContentConfiguration</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>1CA23EE00692099D00951B8B</string>
-										<key>PBXProjectModuleLabel</key>
-										<string>Project Find</string>
-									</dict>
-									<key>GeometryConfiguration</key>
-									<dict>
-										<key>Frame</key>
-										<string>{{10, 27}, {914, 66}}</string>
-										<key>RubberWindowFrame</key>
-										<string>47 97 1200 681 0 0 1280 778 </string>
-									</dict>
-									<key>Module</key>
-									<string>PBXProjectFindModule</string>
-								</dict>
-								<dict>
-									<key>ContentConfiguration</key>
-									<dict>
-										<key>PBXCVSModuleFilterTypeKey</key>
-										<integer>1032</integer>
-										<key>PBXProjectModuleGUID</key>
-										<string>1CA23EE10692099D00951B8B</string>
-										<key>PBXProjectModuleLabel</key>
-										<string>SCM Results</string>
-									</dict>
-									<key>GeometryConfiguration</key>
-									<dict>
-										<key>Frame</key>
-										<string>{{10, 31}, {603, 297}}</string>
-									</dict>
-									<key>Module</key>
-									<string>PBXCVSModule</string>
-								</dict>
-								<dict>
-									<key>ContentConfiguration</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>XCMainBuildResultsModuleGUID</string>
-										<key>PBXProjectModuleLabel</key>
-										<string>Build Results</string>
-										<key>XCBuildResultsTrigger_Collapse</key>
-										<integer>1021</integer>
-										<key>XCBuildResultsTrigger_Open</key>
-										<integer>1011</integer>
-									</dict>
-									<key>GeometryConfiguration</key>
-									<dict>
-										<key>Frame</key>
-										<string>{{10, 27}, {914, 87}}</string>
-									</dict>
-									<key>Module</key>
-									<string>PBXBuildResultsModule</string>
-								</dict>
-							</array>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>914pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Project</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCModuleDock</string>
-				<string>PBXSmartGroupTreeModule</string>
-				<string>XCModuleDock</string>
-				<string>PBXNavigatorGroup</string>
-				<string>XCDockableTabModule</string>
-				<string>XCDetailModule</string>
-				<string>PBXProjectFindModule</string>
-				<string>PBXCVSModule</string>
-				<string>PBXBuildResultsModule</string>
-			</array>
-			<key>TableOfContents</key>
-			<array>
-				<string>6B74B5DD1283104100262888</string>
-				<string>1CA23ED40692098700951B8B</string>
-				<string>6B74B5DE1283104100262888</string>
-				<string>6B8632A30F78115100E2684A</string>
-				<string>6B74B5DF1283104100262888</string>
-				<string>1CA23EDF0692099D00951B8B</string>
-				<string>1CA23EE00692099D00951B8B</string>
-				<string>1CA23EE10692099D00951B8B</string>
-				<string>XCMainBuildResultsModuleGUID</string>
-			</array>
-			<key>ToolbarConfigUserDefaultsMinorVersion</key>
-			<string>2</string>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.defaultV3</string>
-		</dict>
-		<dict>
-			<key>ChosenToolbarItems</key>
-			<array>
-				<string>XCToolbarPerspectiveControl</string>
-				<string>NSToolbarSeparatorItem</string>
-				<string>active-combo-popup</string>
-				<string>NSToolbarFlexibleSpaceItem</string>
-				<string>build-and-go</string>
-				<string>com.apple.ide.PBXToolbarStopButton</string>
-				<string>debugger-restart-executable</string>
-				<string>debugger-pause</string>
-				<string>debugger-step-over</string>
-				<string>debugger-step-into</string>
-				<string>debugger-step-out</string>
-				<string>debugger-enable-breakpoints</string>
-				<string>NSToolbarFlexibleSpaceItem</string>
-				<string>clear-log</string>
-			</array>
-			<key>ControllerClassBaseName</key>
-			<string>PBXDebugSessionModule</string>
-			<key>IconName</key>
-			<string>DebugTabIcon</string>
-			<key>Identifier</key>
-			<string>perspective.debug</string>
-			<key>IsVertical</key>
-			<true/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>ContentConfiguration</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>1CCC7628064C1048000F2A68</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>Debugger Console</string>
-					</dict>
-					<key>GeometryConfiguration</key>
-					<dict>
-						<key>Frame</key>
-						<string>{{0, 0}, {1200, 260}}</string>
-					</dict>
-					<key>Module</key>
-					<string>PBXDebugCLIModule</string>
-					<key>Proportion</key>
-					<string>260pt</string>
-				</dict>
-				<dict>
-					<key>ContentConfiguration</key>
-					<dict>
-						<key>Debugger</key>
-						<dict>
-							<key>HorizontalSplitView</key>
-							<dict>
-								<key>_collapsingFrameDimension</key>
-								<real>0.0</real>
-								<key>_indexOfCollapsedView</key>
-								<integer>0</integer>
-								<key>_percentageOfCollapsedView</key>
-								<real>0.0</real>
-								<key>isCollapsed</key>
-								<string>yes</string>
-								<key>sizes</key>
-								<array>
-									<string>{{0, 0}, {545, 112}}</string>
-									<string>{{545, 0}, {655, 112}}</string>
-								</array>
-							</dict>
-							<key>VerticalSplitView</key>
-							<dict>
-								<key>_collapsingFrameDimension</key>
-								<real>0.0</real>
-								<key>_indexOfCollapsedView</key>
-								<integer>0</integer>
-								<key>_percentageOfCollapsedView</key>
-								<real>0.0</real>
-								<key>isCollapsed</key>
-								<string>yes</string>
-								<key>sizes</key>
-								<array>
-									<string>{{0, 0}, {1200, 112}}</string>
-									<string>{{0, 112}, {1200, 263}}</string>
-								</array>
-							</dict>
-						</dict>
-						<key>LauncherConfigVersion</key>
-						<string>8</string>
-						<key>PBXProjectModuleGUID</key>
-						<string>1CCC7629064C1048000F2A68</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>Debug</string>
-					</dict>
-					<key>GeometryConfiguration</key>
-					<dict>
-						<key>DebugConsoleVisible</key>
-						<string>None</string>
-						<key>DebugConsoleWindowFrame</key>
-						<string>{{200, 200}, {500, 300}}</string>
-						<key>DebugSTDIOWindowFrame</key>
-						<string>{{200, 200}, {500, 300}}</string>
-						<key>Frame</key>
-						<string>{{0, 265}, {1200, 375}}</string>
-						<key>PBXDebugSessionStackFrameViewKey</key>
-						<dict>
-							<key>DebugVariablesTableConfiguration</key>
-							<array>
-								<string>Name</string>
-								<real>183</real>
-								<string>Value</string>
-								<real>168</real>
-								<string>Summary</string>
-								<real>279</real>
-							</array>
-							<key>Frame</key>
-							<string>{{545, 0}, {655, 112}}</string>
-						</dict>
-					</dict>
-					<key>Module</key>
-					<string>PBXDebugSessionModule</string>
-					<key>Proportion</key>
-					<string>375pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Debug</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCModuleDock</string>
-				<string>PBXDebugCLIModule</string>
-				<string>PBXDebugSessionModule</string>
-				<string>PBXDebugProcessAndThreadModule</string>
-				<string>PBXDebugProcessViewModule</string>
-				<string>PBXDebugThreadViewModule</string>
-				<string>PBXDebugStackFrameViewModule</string>
-				<string>PBXNavigatorGroup</string>
-			</array>
-			<key>TableOfContents</key>
-			<array>
-				<string>6B74B5FD128312AC00262888</string>
-				<string>1CCC7628064C1048000F2A68</string>
-				<string>1CCC7629064C1048000F2A68</string>
-				<string>6B74B5FE128312AC00262888</string>
-				<string>6B74B5FF128312AC00262888</string>
-				<string>6B74B600128312AC00262888</string>
-				<string>6B74B601128312AC00262888</string>
-				<string>6B74B602128312AC00262888</string>
-			</array>
-			<key>ToolbarConfigUserDefaultsMinorVersion</key>
-			<string>2</string>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.debugV3</string>
-		</dict>
-	</array>
-	<key>PerspectivesBarVisible</key>
-	<true/>
-	<key>ShelfIsVisible</key>
-	<false/>
-	<key>SourceDescription</key>
-	<string>file at '/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources/XCPerspectivesSpecification.xcperspec'</string>
-	<key>StatusbarIsVisible</key>
-	<true/>
-	<key>TimeStamp</key>
-	<real>0.0</real>
-	<key>ToolbarDisplayMode</key>
-	<integer>1</integer>
-	<key>ToolbarIsVisible</key>
-	<true/>
-	<key>ToolbarSizeMode</key>
-	<integer>1</integer>
-	<key>Type</key>
-	<string>Perspectives</string>
-	<key>UpdateMessage</key>
-	<string></string>
-	<key>WindowJustification</key>
-	<integer>5</integer>
-	<key>WindowOrderList</key>
-	<array>
-		<string>6B74B7C81286FAB500262888</string>
-		<string>6B74B604128312AC00262888</string>
-		<string>6B74B605128312AC00262888</string>
-		<string>/Users/memon/Code/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj</string>
-	</array>
-	<key>WindowString</key>
-	<string>47 97 1200 681 0 0 1280 778 </string>
-	<key>WindowToolsV3</key>
-	<array>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.debugger</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>Debugger</key>
-								<dict>
-									<key>HorizontalSplitView</key>
-									<dict>
-										<key>_collapsingFrameDimension</key>
-										<real>0.0</real>
-										<key>_indexOfCollapsedView</key>
-										<integer>0</integer>
-										<key>_percentageOfCollapsedView</key>
-										<real>0.0</real>
-										<key>isCollapsed</key>
-										<string>yes</string>
-										<key>sizes</key>
-										<array>
-											<string>{{0, 0}, {317, 164}}</string>
-											<string>{{317, 0}, {377, 164}}</string>
-										</array>
-									</dict>
-									<key>VerticalSplitView</key>
-									<dict>
-										<key>_collapsingFrameDimension</key>
-										<real>0.0</real>
-										<key>_indexOfCollapsedView</key>
-										<integer>0</integer>
-										<key>_percentageOfCollapsedView</key>
-										<real>0.0</real>
-										<key>isCollapsed</key>
-										<string>yes</string>
-										<key>sizes</key>
-										<array>
-											<string>{{0, 0}, {694, 164}}</string>
-											<string>{{0, 164}, {694, 216}}</string>
-										</array>
-									</dict>
-								</dict>
-								<key>LauncherConfigVersion</key>
-								<string>8</string>
-								<key>PBXProjectModuleGUID</key>
-								<string>1C162984064C10D400B95A72</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Debug - GLUTExamples (Underwater)</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>DebugConsoleDrawerSize</key>
-								<string>{100, 120}</string>
-								<key>DebugConsoleVisible</key>
-								<string>None</string>
-								<key>DebugConsoleWindowFrame</key>
-								<string>{{200, 200}, {500, 300}}</string>
-								<key>DebugSTDIOWindowFrame</key>
-								<string>{{200, 200}, {500, 300}}</string>
-								<key>Frame</key>
-								<string>{{0, 0}, {694, 380}}</string>
-								<key>RubberWindowFrame</key>
-								<string>321 238 694 422 0 0 1440 878 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXDebugSessionModule</string>
-							<key>Proportion</key>
-							<string>100%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Debugger</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXDebugSessionModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1CD10A99069EF8BA00B06720</string>
-				<string>1C0AD2AB069F1E9B00FABCE6</string>
-				<string>1C162984064C10D400B95A72</string>
-				<string>1C0AD2AC069F1E9B00FABCE6</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.debugV3</string>
-			<key>WindowString</key>
-			<string>321 238 694 422 0 0 1440 878 </string>
-			<key>WindowToolGUID</key>
-			<string>1CD10A99069EF8BA00B06720</string>
-			<key>WindowToolIsVisible</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.build</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CD0528F0623707200166675</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>&lt;No Editor&gt;</string>
-								<key>PBXSplitModuleInNavigatorKey</key>
-								<dict>
-									<key>Split0</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>1CD052900623707200166675</string>
-									</dict>
-									<key>SplitCount</key>
-									<string>1</string>
-								</dict>
-								<key>StatusBarVisibility</key>
-								<integer>1</integer>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {500, 215}}</string>
-								<key>RubberWindowFrame</key>
-								<string>192 257 500 500 0 0 1280 1002 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXNavigatorGroup</string>
-							<key>Proportion</key>
-							<string>218pt</string>
-						</dict>
-						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>XCMainBuildResultsModuleGUID</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Build</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 222}, {500, 236}}</string>
-								<key>RubberWindowFrame</key>
-								<string>192 257 500 500 0 0 1280 1002 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXBuildResultsModule</string>
-							<key>Proportion</key>
-							<string>236pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>458pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Build Results</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXBuildResultsModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C78EAA5065D492600B07095</string>
-				<string>1C78EAA6065D492600B07095</string>
-				<string>1CD0528F0623707200166675</string>
-				<string>XCMainBuildResultsModuleGUID</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.buildV3</string>
-			<key>WindowString</key>
-			<string>192 257 500 500 0 0 1280 1002 </string>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.find</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>Dock</key>
-							<array>
-								<dict>
-									<key>ContentConfiguration</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>1CDD528C0622207200134675</string>
-										<key>PBXProjectModuleLabel</key>
-										<string>&lt;No Editor&gt;</string>
-										<key>PBXSplitModuleInNavigatorKey</key>
-										<dict>
-											<key>Split0</key>
-											<dict>
-												<key>PBXProjectModuleGUID</key>
-												<string>1CD0528D0623707200166675</string>
-											</dict>
-											<key>SplitCount</key>
-											<string>1</string>
-										</dict>
-										<key>StatusBarVisibility</key>
-										<integer>1</integer>
-									</dict>
-									<key>GeometryConfiguration</key>
-									<dict>
-										<key>Frame</key>
-										<string>{{0, 0}, {781, 167}}</string>
-										<key>RubberWindowFrame</key>
-										<string>62 385 781 470 0 0 1440 878 </string>
-									</dict>
-									<key>Module</key>
-									<string>PBXNavigatorGroup</string>
-									<key>Proportion</key>
-									<string>781pt</string>
-								</dict>
-							</array>
-							<key>Proportion</key>
-							<string>50%</string>
-						</dict>
-						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CD0528E0623707200166675</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Project Find</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{8, 0}, {773, 254}}</string>
-								<key>RubberWindowFrame</key>
-								<string>62 385 781 470 0 0 1440 878 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXProjectFindModule</string>
-							<key>Proportion</key>
-							<string>50%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>428pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Project Find</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXProjectFindModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C530D57069F1CE1000CFCEE</string>
-				<string>1C530D58069F1CE1000CFCEE</string>
-				<string>1C530D59069F1CE1000CFCEE</string>
-				<string>1CDD528C0622207200134675</string>
-				<string>1C530D5A069F1CE1000CFCEE</string>
-				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>1CD0528E0623707200166675</string>
-			</array>
-			<key>WindowString</key>
-			<string>62 385 781 470 0 0 1440 878 </string>
-			<key>WindowToolGUID</key>
-			<string>1C530D57069F1CE1000CFCEE</string>
-			<key>WindowToolIsVisible</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.snapshots</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>Module</key>
-							<string>XCSnapshotModule</string>
-							<key>Proportion</key>
-							<string>100%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Snapshots</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCSnapshotModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<string>Yes</string>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.snapshots</string>
-			<key>WindowString</key>
-			<string>315 824 300 550 0 0 1440 878 </string>
-			<key>WindowToolIsVisible</key>
-			<string>Yes</string>
-		</dict>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.debuggerConsole</string>
-			<key>IsVertical</key>
-			<true/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1C78EAAC065D492600B07095</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Debugger Console</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {440, 359}}</string>
-								<key>RubberWindowFrame</key>
-								<string>21 355 440 400 0 0 1280 778 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXDebugCLIModule</string>
-							<key>Proportion</key>
-							<string>359pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>359pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Debugger Console</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXDebugCLIModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<true/>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C530D5B069F1CE1000CFCEE</string>
-				<string>6BB9C382127A0FB400B97C1C</string>
-				<string>1C78EAAC065D492600B07095</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.consoleV3</string>
-			<key>WindowString</key>
-			<string>21 355 440 400 0 0 1280 778 </string>
-			<key>WindowToolGUID</key>
-			<string>1C530D5B069F1CE1000CFCEE</string>
-			<key>WindowToolIsVisible</key>
-			<false/>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.scm</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1C78EAB2065D492600B07095</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>&lt;No Editor&gt;</string>
-								<key>PBXSplitModuleInNavigatorKey</key>
-								<dict>
-									<key>Split0</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>1C78EAB3065D492600B07095</string>
-									</dict>
-									<key>SplitCount</key>
-									<string>1</string>
-								</dict>
-								<key>StatusBarVisibility</key>
-								<integer>1</integer>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {452, 0}}</string>
-								<key>RubberWindowFrame</key>
-								<string>743 379 452 308 0 0 1280 1002 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXNavigatorGroup</string>
-							<key>Proportion</key>
-							<string>0pt</string>
-						</dict>
-						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CD052920623707200166675</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>SCM</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>ConsoleFrame</key>
-								<string>{{0, 259}, {452, 0}}</string>
-								<key>Frame</key>
-								<string>{{0, 7}, {452, 259}}</string>
-								<key>RubberWindowFrame</key>
-								<string>743 379 452 308 0 0 1280 1002 </string>
-								<key>TableConfiguration</key>
-								<array>
-									<string>Status</string>
-									<real>30</real>
-									<string>FileName</string>
-									<real>199</real>
-									<string>Path</string>
-									<real>197.09500122070312</real>
-								</array>
-								<key>TableFrame</key>
-								<string>{{0, 0}, {452, 250}}</string>
-							</dict>
-							<key>Module</key>
-							<string>PBXCVSModule</string>
-							<key>Proportion</key>
-							<string>262pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>266pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>SCM</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXCVSModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C78EAB4065D492600B07095</string>
-				<string>1C78EAB5065D492600B07095</string>
-				<string>1C78EAB2065D492600B07095</string>
-				<string>1CD052920623707200166675</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.scmV3</string>
-			<key>WindowString</key>
-			<string>743 379 452 308 0 0 1280 1002 </string>
-		</dict>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.breakpoints</string>
-			<key>IsVertical</key>
-			<false/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>BecomeActive</key>
-							<true/>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXBottomSmartGroupGIDs</key>
-								<array>
-									<string>1C77FABC04509CD000000102</string>
-								</array>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CE0B1FE06471DED0097A5F4</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Files</string>
-								<key>PBXProjectStructureProvided</key>
-								<string>no</string>
-								<key>PBXSmartGroupTreeModuleColumnData</key>
-								<dict>
-									<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
-									<array>
-										<real>168</real>
-									</array>
-									<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
-									<array>
-										<string>MainColumn</string>
-									</array>
-								</dict>
-								<key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
-								<dict>
-									<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
-									<array>
-										<string>1C77FABC04509CD000000102</string>
-										<string>1C3E0DCC080725EA11A45113</string>
-									</array>
-									<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
-									<array>
-										<array>
-											<integer>0</integer>
-										</array>
-									</array>
-									<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-									<string>{{0, 0}, {168, 350}}</string>
-								</dict>
-								<key>PBXTopSmartGroupGIDs</key>
-								<array/>
-								<key>XCIncludePerspectivesSwitch</key>
-								<false/>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {185, 368}}</string>
-								<key>GroupTreeTableConfiguration</key>
-								<array>
-									<string>MainColumn</string>
-									<real>168</real>
-								</array>
-								<key>RubberWindowFrame</key>
-								<string>21 346 744 409 0 0 1280 778 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXSmartGroupTreeModule</string>
-							<key>Proportion</key>
-							<string>185pt</string>
-						</dict>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CA1AED706398EBD00589147</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Detail</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{190, 0}, {554, 368}}</string>
-								<key>RubberWindowFrame</key>
-								<string>21 346 744 409 0 0 1280 778 </string>
-							</dict>
-							<key>Module</key>
-							<string>XCDetailModule</string>
-							<key>Proportion</key>
-							<string>554pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>368pt</string>
-				</dict>
-			</array>
-			<key>MajorVersion</key>
-			<integer>3</integer>
-			<key>MinorVersion</key>
-			<integer>0</integer>
-			<key>Name</key>
-			<string>Breakpoints</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXSmartGroupTreeModule</string>
-				<string>XCDetailModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<true/>
-			<key>TableOfContents</key>
-			<array>
-				<string>6B57D33F108C659D00DDD053</string>
-				<string>6B57D340108C659D00DDD053</string>
-				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>1CA1AED706398EBD00589147</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.breakpointsV3</string>
-			<key>WindowString</key>
-			<string>21 346 744 409 0 0 1280 778 </string>
-			<key>WindowToolGUID</key>
-			<string>6B57D33F108C659D00DDD053</string>
-			<key>WindowToolIsVisible</key>
-			<false/>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.debugAnimator</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>Module</key>
-							<string>PBXNavigatorGroup</string>
-							<key>Proportion</key>
-							<string>100%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Debug Visualizer</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXNavigatorGroup</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.debugAnimatorV3</string>
-			<key>WindowString</key>
-			<string>100 100 700 500 0 0 1280 1002 </string>
-		</dict>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.bookmarks</string>
-			<key>IsVertical</key>
-			<true/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>6B8DE8DA10B6B3F800DF20FB</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Bookmarks</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {401, 202}}</string>
-								<key>RubberWindowFrame</key>
-								<string>21 533 401 222 0 0 1280 778 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXBookmarksModule</string>
-							<key>Proportion</key>
-							<string>202pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>202pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Bookmarks</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXBookmarksModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<false/>
-			<key>TableOfContents</key>
-			<array>
-				<string>6B8DE8DB10B6B3F800DF20FB</string>
-				<string>6B8DE8DC10B6B3F800DF20FB</string>
-				<string>6B8DE8DA10B6B3F800DF20FB</string>
-			</array>
-			<key>WindowString</key>
-			<string>21 533 401 222 0 0 1280 778 </string>
-			<key>WindowToolGUID</key>
-			<string>6B8DE8DB10B6B3F800DF20FB</string>
-			<key>WindowToolIsVisible</key>
-			<false/>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.projectFormatConflicts</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>Module</key>
-							<string>XCProjectFormatConflictsModule</string>
-							<key>Proportion</key>
-							<string>100%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Project Format Conflicts</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCProjectFormatConflictsModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>0</integer>
-			<key>WindowContentMinSize</key>
-			<string>450 300</string>
-			<key>WindowString</key>
-			<string>50 850 472 307 0 0 1440 877</string>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.classBrowser</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>OptionsSetName</key>
-								<string>Hierarchy, all classes</string>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CA6456E063B45B4001379D8</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Class Browser - NSObject</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>ClassesFrame</key>
-								<string>{{0, 0}, {369, 96}}</string>
-								<key>ClassesTreeTableConfiguration</key>
-								<array>
-									<string>PBXClassNameColumnIdentifier</string>
-									<real>208</real>
-									<string>PBXClassBookColumnIdentifier</string>
-									<real>22</real>
-								</array>
-								<key>Frame</key>
-								<string>{{0, 0}, {616, 353}}</string>
-								<key>MembersFrame</key>
-								<string>{{0, 105}, {369, 395}}</string>
-								<key>MembersTreeTableConfiguration</key>
-								<array>
-									<string>PBXMemberTypeIconColumnIdentifier</string>
-									<real>22</real>
-									<string>PBXMemberNameColumnIdentifier</string>
-									<real>216</real>
-									<string>PBXMemberTypeColumnIdentifier</string>
-									<real>94</real>
-									<string>PBXMemberBookColumnIdentifier</string>
-									<real>22</real>
-								</array>
-								<key>PBXModuleWindowStatusBarHidden2</key>
-								<integer>1</integer>
-								<key>RubberWindowFrame</key>
-								<string>597 125 616 374 0 0 1280 1002 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXClassBrowserModule</string>
-							<key>Proportion</key>
-							<string>354pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>354pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Class Browser</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXClassBrowserModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>0</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C78EABA065D492600B07095</string>
-				<string>1C78EABB065D492600B07095</string>
-				<string>1CA6456E063B45B4001379D8</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.classbrowser</string>
-			<key>WindowString</key>
-			<string>597 125 616 374 0 0 1280 1002 </string>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.refactoring</string>
-			<key>IncludeInToolsMenu</key>
-			<integer>0</integer>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{0, 0}, {500, 335}</string>
-								<key>RubberWindowFrame</key>
-								<string>{0, 0}, {500, 335}</string>
-							</dict>
-							<key>Module</key>
-							<string>XCRefactoringModule</string>
-							<key>Proportion</key>
-							<string>100%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Refactoring</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCRefactoringModule</string>
-			</array>
-			<key>WindowString</key>
-			<string>200 200 500 356 0 0 1920 1200 </string>
-		</dict>
-	</array>
-</dict>
-</plist>
diff --git a/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/project.pbxproj b/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/project.pbxproj
deleted file mode 100644
index 8335b10de78..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,596 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 45;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
-		6B024C0D10060AC600CF7107 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 6B024C0C10060AC600CF7107 /* Icon.icns */; };
-		6B1185F51006895B0018F96F /* DetourNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B1185F41006895B0018F96F /* DetourNode.cpp */; };
-		6B1185FE10068B150018F96F /* DetourCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B1185FD10068B150018F96F /* DetourCommon.cpp */; };
-		6B137C710F7FCBBB00459200 /* imgui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B137C6C0F7FCBBB00459200 /* imgui.cpp */; };
-		6B137C720F7FCBBB00459200 /* MeshLoaderObj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B137C6D0F7FCBBB00459200 /* MeshLoaderObj.cpp */; };
-		6B137C730F7FCBBB00459200 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B137C6E0F7FCBBB00459200 /* SDLMain.m */; };
-		6B137C8B0F7FCC1100459200 /* Recast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B137C820F7FCC1100459200 /* Recast.cpp */; };
-		6B137C8C0F7FCC1100459200 /* RecastContour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; };
-		6B137C8E0F7FCC1100459200 /* RecastFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B137C850F7FCC1100459200 /* RecastFilter.cpp */; };
-		6B137C900F7FCC1100459200 /* RecastMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B137C870F7FCC1100459200 /* RecastMesh.cpp */; };
-		6B137C910F7FCC1100459200 /* RecastRasterization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B137C880F7FCC1100459200 /* RecastRasterization.cpp */; };
-		6B137C920F7FCC1100459200 /* RecastRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B137C890F7FCC1100459200 /* RecastRegion.cpp */; };
-		6B25B6190FFA62BE004F1BC4 /* Sample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B25B6140FFA62BE004F1BC4 /* Sample.cpp */; };
-		6B25B61D0FFA62BE004F1BC4 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; };
-		6B2AEC530FFB8958005BE9CC /* Sample_TileMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; };
-		6B324C66111C5D9A00EBD2FD /* ConvexVolumeTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B324C65111C5D9A00EBD2FD /* ConvexVolumeTool.cpp */; };
-		6B555DB1100B212E00247EA3 /* imguiRenderGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */; };
-		6B62416A103434880002E346 /* RecastMeshDetail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */; };
-		6B8036AE113BAABE005ED67B /* Sample_Debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B8036AD113BAABE005ED67B /* Sample_Debug.cpp */; };
-		6B847777122D221D00ADF63D /* ValueHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B847776122D221C00ADF63D /* ValueHistory.cpp */; };
-		6B8632DA0F78122C00E2684A /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B8632D90F78122C00E2684A /* SDL.framework */; };
-		6B8632DC0F78123E00E2684A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B8632DB0F78123E00E2684A /* OpenGL.framework */; };
-		6B8DE88910B69E3E00DF20FB /* DetourNavMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B8DE88710B69E3E00DF20FB /* DetourNavMesh.cpp */; };
-		6B8DE88A10B69E3E00DF20FB /* DetourNavMeshBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */; };
-		6B98463311E6144400FA177B /* Sample_SoloMeshTiled.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */; };
-		6B9846EF11E718F800FA177B /* DetourAlloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B9846EE11E718F800FA177B /* DetourAlloc.cpp */; };
-		6B9847B811E7519A00FA177B /* RecastAlloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B9847B711E7519A00FA177B /* RecastAlloc.cpp */; };
-		6B9EFF0912281C3E00535FF1 /* DetourObstacleAvoidance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B9EFF0812281C3E00535FF1 /* DetourObstacleAvoidance.cpp */; };
-		6BA1E88B10C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */; };
-		6BAF3C591211663A008CFCDF /* CrowdTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */; };
-		6BAF40DB12196A3D008CFCDF /* DetourNavMeshQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */; };
-		6BAF4442121C3D26008CFCDF /* SampleInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BAF4441121C3D26008CFCDF /* SampleInterfaces.cpp */; };
-		6BB788170FC0472B003C24DB /* ChunkyTriMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB788160FC0472B003C24DB /* ChunkyTriMesh.cpp */; };
-		6BB7FC0B10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */; };
-		6BB7FDA510F36F0E006DA0A6 /* InputGeom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB7FDA410F36F0E006DA0A6 /* InputGeom.cpp */; };
-		6BB93C7D10CFE1D500F74F2B /* DebugDraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */; };
-		6BB93C7E10CFE1D500F74F2B /* DetourDebugDraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */; };
-		6BB93C7F10CFE1D500F74F2B /* RecastDebugDraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB93C7C10CFE1D500F74F2B /* RecastDebugDraw.cpp */; };
-		6BB93CF610CFEC4500F74F2B /* RecastDump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */; };
-		6BCF32361104CD05009445BF /* OffMeshConnectionTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */; };
-		6BD402011224279400995864 /* PerfTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD402001224279400995864 /* PerfTimer.cpp */; };
-		6BD667DA123D28100021A7A4 /* CrowdManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */; };
-		6BF5F23A11747606000502A6 /* Filelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BF5F23911747606000502A6 /* Filelist.cpp */; };
-		6BF5F2401174763B000502A6 /* SlideShow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BF5F23F1174763B000502A6 /* SlideShow.cpp */; };
-		6BF7C1401111953A002B3F46 /* TestCase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BF7C13F1111953A002B3F46 /* TestCase.cpp */; };
-		6BF7C4541115C277002B3F46 /* RecastArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BF7C4531115C277002B3F46 /* RecastArea.cpp */; };
-		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
-		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
-		1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
-		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		32CA4F630368D1EE00C91783 /* Recast_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Recast_Prefix.pch; sourceTree = "<group>"; };
-		6B024C0C10060AC600CF7107 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = "<group>"; };
-		6B1185F41006895B0018F96F /* DetourNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourNode.cpp; path = ../../../Detour/Source/DetourNode.cpp; sourceTree = SOURCE_ROOT; };
-		6B1185F61006896B0018F96F /* DetourNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourNode.h; path = ../../../Detour/Include/DetourNode.h; sourceTree = SOURCE_ROOT; };
-		6B1185FC10068B040018F96F /* DetourCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourCommon.h; path = ../../../Detour/Include/DetourCommon.h; sourceTree = SOURCE_ROOT; };
-		6B1185FD10068B150018F96F /* DetourCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourCommon.cpp; path = ../../../Detour/Source/DetourCommon.cpp; sourceTree = SOURCE_ROOT; };
-		6B137C6C0F7FCBBB00459200 /* imgui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imgui.cpp; path = ../../Source/imgui.cpp; sourceTree = SOURCE_ROOT; };
-		6B137C6D0F7FCBBB00459200 /* MeshLoaderObj.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MeshLoaderObj.cpp; path = ../../Source/MeshLoaderObj.cpp; sourceTree = SOURCE_ROOT; };
-		6B137C6E0F7FCBBB00459200 /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLMain.m; path = ../../Source/SDLMain.m; sourceTree = SOURCE_ROOT; };
-		6B137C7A0F7FCBE400459200 /* imgui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imgui.h; path = ../../Include/imgui.h; sourceTree = SOURCE_ROOT; };
-		6B137C7B0F7FCBE400459200 /* MeshLoaderObj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MeshLoaderObj.h; path = ../../Include/MeshLoaderObj.h; sourceTree = SOURCE_ROOT; };
-		6B137C7C0F7FCBE400459200 /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDLMain.h; path = ../../Include/SDLMain.h; sourceTree = SOURCE_ROOT; };
-		6B137C7E0F7FCBFE00459200 /* Recast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Recast.h; path = ../../../Recast/Include/Recast.h; sourceTree = SOURCE_ROOT; };
-		6B137C820F7FCC1100459200 /* Recast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Recast.cpp; path = ../../../Recast/Source/Recast.cpp; sourceTree = SOURCE_ROOT; };
-		6B137C830F7FCC1100459200 /* RecastContour.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastContour.cpp; path = ../../../Recast/Source/RecastContour.cpp; sourceTree = SOURCE_ROOT; };
-		6B137C850F7FCC1100459200 /* RecastFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastFilter.cpp; path = ../../../Recast/Source/RecastFilter.cpp; sourceTree = SOURCE_ROOT; };
-		6B137C870F7FCC1100459200 /* RecastMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastMesh.cpp; path = ../../../Recast/Source/RecastMesh.cpp; sourceTree = SOURCE_ROOT; };
-		6B137C880F7FCC1100459200 /* RecastRasterization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastRasterization.cpp; path = ../../../Recast/Source/RecastRasterization.cpp; sourceTree = SOURCE_ROOT; };
-		6B137C890F7FCC1100459200 /* RecastRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastRegion.cpp; path = ../../../Recast/Source/RecastRegion.cpp; sourceTree = SOURCE_ROOT; };
-		6B25B6100FFA62AD004F1BC4 /* Sample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sample.h; path = ../../Include/Sample.h; sourceTree = SOURCE_ROOT; };
-		6B25B6140FFA62BE004F1BC4 /* Sample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sample.cpp; path = ../../Source/Sample.cpp; sourceTree = SOURCE_ROOT; };
-		6B25B6180FFA62BE004F1BC4 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../../Source/main.cpp; sourceTree = SOURCE_ROOT; };
-		6B2AEC510FFB8946005BE9CC /* Sample_TileMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sample_TileMesh.h; path = ../../Include/Sample_TileMesh.h; sourceTree = SOURCE_ROOT; };
-		6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sample_TileMesh.cpp; path = ../../Source/Sample_TileMesh.cpp; sourceTree = SOURCE_ROOT; };
-		6B324C64111C5D9A00EBD2FD /* ConvexVolumeTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConvexVolumeTool.h; path = ../../Include/ConvexVolumeTool.h; sourceTree = SOURCE_ROOT; };
-		6B324C65111C5D9A00EBD2FD /* ConvexVolumeTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConvexVolumeTool.cpp; path = ../../Source/ConvexVolumeTool.cpp; sourceTree = SOURCE_ROOT; };
-		6B555DAE100B211D00247EA3 /* imguiRenderGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imguiRenderGL.h; path = ../../Include/imguiRenderGL.h; sourceTree = SOURCE_ROOT; };
-		6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imguiRenderGL.cpp; path = ../../Source/imguiRenderGL.cpp; sourceTree = SOURCE_ROOT; };
-		6B555DF6100B273500247EA3 /* stb_truetype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stb_truetype.h; path = ../../Contrib/stb_truetype.h; sourceTree = SOURCE_ROOT; };
-		6B624169103434880002E346 /* RecastMeshDetail.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastMeshDetail.cpp; path = ../../../Recast/Source/RecastMeshDetail.cpp; sourceTree = SOURCE_ROOT; };
-		6B8036AC113BAABE005ED67B /* Sample_Debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sample_Debug.h; path = ../../Include/Sample_Debug.h; sourceTree = SOURCE_ROOT; };
-		6B8036AD113BAABE005ED67B /* Sample_Debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sample_Debug.cpp; path = ../../Source/Sample_Debug.cpp; sourceTree = SOURCE_ROOT; };
-		6B847774122D220D00ADF63D /* ValueHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueHistory.h; path = ../../Include/ValueHistory.h; sourceTree = SOURCE_ROOT; };
-		6B847776122D221C00ADF63D /* ValueHistory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ValueHistory.cpp; path = ../../Source/ValueHistory.cpp; sourceTree = SOURCE_ROOT; };
-		6B8632D90F78122C00E2684A /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = Library/Frameworks/SDL.framework; sourceTree = SDKROOT; };
-		6B8632DB0F78123E00E2684A /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		6B8DE88710B69E3E00DF20FB /* DetourNavMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourNavMesh.cpp; path = ../../../Detour/Source/DetourNavMesh.cpp; sourceTree = SOURCE_ROOT; };
-		6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourNavMeshBuilder.cpp; path = ../../../Detour/Source/DetourNavMeshBuilder.cpp; sourceTree = SOURCE_ROOT; };
-		6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourNavMesh.h; path = ../../../Detour/Include/DetourNavMesh.h; sourceTree = SOURCE_ROOT; };
-		6B8DE88C10B69E4C00DF20FB /* DetourNavMeshBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourNavMeshBuilder.h; path = ../../../Detour/Include/DetourNavMeshBuilder.h; sourceTree = SOURCE_ROOT; };
-		6B98463111E6144400FA177B /* Sample_SoloMeshTiled.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sample_SoloMeshTiled.h; path = ../../Include/Sample_SoloMeshTiled.h; sourceTree = SOURCE_ROOT; };
-		6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sample_SoloMeshTiled.cpp; path = ../../Source/Sample_SoloMeshTiled.cpp; sourceTree = SOURCE_ROOT; };
-		6B9846ED11E718F800FA177B /* DetourAlloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourAlloc.h; path = ../../../Detour/Include/DetourAlloc.h; sourceTree = SOURCE_ROOT; };
-		6B9846EE11E718F800FA177B /* DetourAlloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourAlloc.cpp; path = ../../../Detour/Source/DetourAlloc.cpp; sourceTree = SOURCE_ROOT; };
-		6B98470511E733B600FA177B /* RecastAlloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecastAlloc.h; path = ../../../Recast/Include/RecastAlloc.h; sourceTree = SOURCE_ROOT; };
-		6B9847B711E7519A00FA177B /* RecastAlloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastAlloc.cpp; path = ../../../Recast/Source/RecastAlloc.cpp; sourceTree = SOURCE_ROOT; };
-		6B9EFF02122819E200535FF1 /* DetourObstacleAvoidance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourObstacleAvoidance.h; path = ../../../Detour/Include/DetourObstacleAvoidance.h; sourceTree = SOURCE_ROOT; };
-		6B9EFF0812281C3E00535FF1 /* DetourObstacleAvoidance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourObstacleAvoidance.cpp; path = ../../../Detour/Source/DetourObstacleAvoidance.cpp; sourceTree = SOURCE_ROOT; };
-		6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sample_SoloMeshSimple.cpp; path = ../../Source/Sample_SoloMeshSimple.cpp; sourceTree = SOURCE_ROOT; };
-		6BA1E88E10C7BFD3008007F6 /* Sample_SoloMeshSimple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sample_SoloMeshSimple.h; path = ../../Include/Sample_SoloMeshSimple.h; sourceTree = SOURCE_ROOT; };
-		6BAF3C571211663A008CFCDF /* CrowdTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CrowdTool.h; path = ../../Include/CrowdTool.h; sourceTree = SOURCE_ROOT; };
-		6BAF3C581211663A008CFCDF /* CrowdTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CrowdTool.cpp; path = ../../Source/CrowdTool.cpp; sourceTree = SOURCE_ROOT; };
-		6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourNavMeshQuery.h; path = ../../../Detour/Include/DetourNavMeshQuery.h; sourceTree = SOURCE_ROOT; };
-		6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourNavMeshQuery.cpp; path = ../../../Detour/Source/DetourNavMeshQuery.cpp; sourceTree = SOURCE_ROOT; };
-		6BAF427A121ADCC2008CFCDF /* DetourAssert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourAssert.h; path = ../../../Detour/Include/DetourAssert.h; sourceTree = SOURCE_ROOT; };
-		6BAF4440121C3D0A008CFCDF /* SampleInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SampleInterfaces.h; path = ../../Include/SampleInterfaces.h; sourceTree = SOURCE_ROOT; };
-		6BAF4441121C3D26008CFCDF /* SampleInterfaces.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleInterfaces.cpp; path = ../../Source/SampleInterfaces.cpp; sourceTree = SOURCE_ROOT; };
-		6BAF4561121D173A008CFCDF /* RecastAssert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecastAssert.h; path = ../../../Recast/Include/RecastAssert.h; sourceTree = SOURCE_ROOT; };
-		6BB788160FC0472B003C24DB /* ChunkyTriMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChunkyTriMesh.cpp; path = ../../Source/ChunkyTriMesh.cpp; sourceTree = SOURCE_ROOT; };
-		6BB788180FC04753003C24DB /* ChunkyTriMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChunkyTriMesh.h; path = ../../Include/ChunkyTriMesh.h; sourceTree = SOURCE_ROOT; };
-		6BB7FC0910EBB6AA006DA0A6 /* NavMeshTesterTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NavMeshTesterTool.h; path = ../../Include/NavMeshTesterTool.h; sourceTree = SOURCE_ROOT; };
-		6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NavMeshTesterTool.cpp; path = ../../Source/NavMeshTesterTool.cpp; sourceTree = SOURCE_ROOT; };
-		6BB7FDA310F36EFC006DA0A6 /* InputGeom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InputGeom.h; path = ../../Include/InputGeom.h; sourceTree = SOURCE_ROOT; };
-		6BB7FDA410F36F0E006DA0A6 /* InputGeom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InputGeom.cpp; path = ../../Source/InputGeom.cpp; sourceTree = SOURCE_ROOT; };
-		6BB93C7710CFE1D500F74F2B /* DebugDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebugDraw.h; path = ../../../DebugUtils/Include/DebugDraw.h; sourceTree = SOURCE_ROOT; };
-		6BB93C7810CFE1D500F74F2B /* DetourDebugDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourDebugDraw.h; path = ../../../DebugUtils/Include/DetourDebugDraw.h; sourceTree = SOURCE_ROOT; };
-		6BB93C7910CFE1D500F74F2B /* RecastDebugDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecastDebugDraw.h; path = ../../../DebugUtils/Include/RecastDebugDraw.h; sourceTree = SOURCE_ROOT; };
-		6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DebugDraw.cpp; path = ../../../DebugUtils/Source/DebugDraw.cpp; sourceTree = SOURCE_ROOT; };
-		6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourDebugDraw.cpp; path = ../../../DebugUtils/Source/DetourDebugDraw.cpp; sourceTree = SOURCE_ROOT; };
-		6BB93C7C10CFE1D500F74F2B /* RecastDebugDraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastDebugDraw.cpp; path = ../../../DebugUtils/Source/RecastDebugDraw.cpp; sourceTree = SOURCE_ROOT; };
-		6BB93CF410CFEC4500F74F2B /* RecastDump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecastDump.h; path = ../../../DebugUtils/Include/RecastDump.h; sourceTree = SOURCE_ROOT; };
-		6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastDump.cpp; path = ../../../DebugUtils/Source/RecastDump.cpp; sourceTree = SOURCE_ROOT; };
-		6BCF32341104CD05009445BF /* OffMeshConnectionTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OffMeshConnectionTool.h; path = ../../Include/OffMeshConnectionTool.h; sourceTree = SOURCE_ROOT; };
-		6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OffMeshConnectionTool.cpp; path = ../../Source/OffMeshConnectionTool.cpp; sourceTree = SOURCE_ROOT; };
-		6BD401FF1224278800995864 /* PerfTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerfTimer.h; path = ../../Include/PerfTimer.h; sourceTree = SOURCE_ROOT; };
-		6BD402001224279400995864 /* PerfTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerfTimer.cpp; path = ../../Source/PerfTimer.cpp; sourceTree = SOURCE_ROOT; };
-		6BD667D8123D27EC0021A7A4 /* CrowdManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CrowdManager.h; path = ../../Include/CrowdManager.h; sourceTree = SOURCE_ROOT; };
-		6BD667D9123D28100021A7A4 /* CrowdManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CrowdManager.cpp; path = ../../Source/CrowdManager.cpp; sourceTree = SOURCE_ROOT; };
-		6BF5F23911747606000502A6 /* Filelist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Filelist.cpp; path = ../../Source/Filelist.cpp; sourceTree = SOURCE_ROOT; };
-		6BF5F23C11747614000502A6 /* Filelist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Filelist.h; path = ../../Include/Filelist.h; sourceTree = SOURCE_ROOT; };
-		6BF5F23E1174763B000502A6 /* SlideShow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SlideShow.h; path = ../../Include/SlideShow.h; sourceTree = SOURCE_ROOT; };
-		6BF5F23F1174763B000502A6 /* SlideShow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SlideShow.cpp; path = ../../Source/SlideShow.cpp; sourceTree = SOURCE_ROOT; };
-		6BF5F2C511747E9F000502A6 /* stb_image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stb_image.h; path = ../../Contrib/stb_image.h; sourceTree = SOURCE_ROOT; };
-		6BF7C13E11119520002B3F46 /* TestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestCase.h; path = ../../Include/TestCase.h; sourceTree = SOURCE_ROOT; };
-		6BF7C13F1111953A002B3F46 /* TestCase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TestCase.cpp; path = ../../Source/TestCase.cpp; sourceTree = SOURCE_ROOT; };
-		6BF7C4531115C277002B3F46 /* RecastArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastArea.cpp; path = ../../../Recast/Source/RecastArea.cpp; sourceTree = SOURCE_ROOT; };
-		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		8D1107320486CEB800E47090 /* Recast.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Recast.app; sourceTree = BUILT_PRODUCTS_DIR; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		8D11072E0486CEB800E47090 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
-				6B8632DA0F78122C00E2684A /* SDL.framework in Frameworks */,
-				6B8632DC0F78123E00E2684A /* OpenGL.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Classes */ = {
-			isa = PBXGroup;
-			children = (
-				6BB93C7610CFE1BD00F74F2B /* DebugUtils */,
-				6BDD9E030F91110C00904EEF /* Detour */,
-				6B137C7D0F7FCBE800459200 /* Recast */,
-				6B555DF5100B25FC00247EA3 /* Samples */,
-				6BB7FE8E10F4A175006DA0A6 /* Tools */,
-				6B25B6180FFA62BE004F1BC4 /* main.cpp */,
-				6BD667D8123D27EC0021A7A4 /* CrowdManager.h */,
-				6BD667D9123D28100021A7A4 /* CrowdManager.cpp */,
-				6BAF4440121C3D0A008CFCDF /* SampleInterfaces.h */,
-				6BAF4441121C3D26008CFCDF /* SampleInterfaces.cpp */,
-				6BF5F2C511747E9F000502A6 /* stb_image.h */,
-				6BF5F23E1174763B000502A6 /* SlideShow.h */,
-				6BF5F23F1174763B000502A6 /* SlideShow.cpp */,
-				6BF5F23C11747614000502A6 /* Filelist.h */,
-				6BF5F23911747606000502A6 /* Filelist.cpp */,
-				6B555DF6100B273500247EA3 /* stb_truetype.h */,
-				6B137C7A0F7FCBE400459200 /* imgui.h */,
-				6B137C6C0F7FCBBB00459200 /* imgui.cpp */,
-				6B555DAE100B211D00247EA3 /* imguiRenderGL.h */,
-				6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */,
-				6B137C7B0F7FCBE400459200 /* MeshLoaderObj.h */,
-				6B137C6D0F7FCBBB00459200 /* MeshLoaderObj.cpp */,
-				6BB788180FC04753003C24DB /* ChunkyTriMesh.h */,
-				6BB788160FC0472B003C24DB /* ChunkyTriMesh.cpp */,
-				6B137C7C0F7FCBE400459200 /* SDLMain.h */,
-				6B137C6E0F7FCBBB00459200 /* SDLMain.m */,
-				6BB7FDA310F36EFC006DA0A6 /* InputGeom.h */,
-				6BB7FDA410F36F0E006DA0A6 /* InputGeom.cpp */,
-				6BF7C13E11119520002B3F46 /* TestCase.h */,
-				6BF7C13F1111953A002B3F46 /* TestCase.cpp */,
-				6BD401FF1224278800995864 /* PerfTimer.h */,
-				6BD402001224279400995864 /* PerfTimer.cpp */,
-				6B847774122D220D00ADF63D /* ValueHistory.h */,
-				6B847776122D221C00ADF63D /* ValueHistory.cpp */,
-			);
-			name = Classes;
-			sourceTree = "<group>";
-		};
-		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				6B8632D90F78122C00E2684A /* SDL.framework */,
-				6B8632DB0F78123E00E2684A /* OpenGL.framework */,
-				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
-			);
-			name = "Linked Frameworks";
-			sourceTree = "<group>";
-		};
-		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
-				13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
-				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
-			);
-			name = "Other Frameworks";
-			sourceTree = "<group>";
-		};
-		19C28FACFE9D520D11CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				8D1107320486CEB800E47090 /* Recast.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		29B97314FDCFA39411CA2CEA /* Recast */ = {
-			isa = PBXGroup;
-			children = (
-				080E96DDFE201D6D7F000001 /* Classes */,
-				29B97315FDCFA39411CA2CEA /* Other Sources */,
-				29B97317FDCFA39411CA2CEA /* Resources */,
-				29B97323FDCFA39411CA2CEA /* Frameworks */,
-				19C28FACFE9D520D11CA2CBB /* Products */,
-			);
-			name = Recast;
-			sourceTree = "<group>";
-		};
-		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
-			isa = PBXGroup;
-			children = (
-				32CA4F630368D1EE00C91783 /* Recast_Prefix.pch */,
-			);
-			name = "Other Sources";
-			sourceTree = "<group>";
-		};
-		29B97317FDCFA39411CA2CEA /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				6B024C0C10060AC600CF7107 /* Icon.icns */,
-				8D1107310486CEB800E47090 /* Info.plist */,
-				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
-				1DDD58140DA1D0A300B32029 /* MainMenu.xib */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
-				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		6B137C7D0F7FCBE800459200 /* Recast */ = {
-			isa = PBXGroup;
-			children = (
-				6BAF4561121D173A008CFCDF /* RecastAssert.h */,
-				6B137C7E0F7FCBFE00459200 /* Recast.h */,
-				6B137C820F7FCC1100459200 /* Recast.cpp */,
-				6B137C880F7FCC1100459200 /* RecastRasterization.cpp */,
-				6B137C850F7FCC1100459200 /* RecastFilter.cpp */,
-				6BF7C4531115C277002B3F46 /* RecastArea.cpp */,
-				6B137C890F7FCC1100459200 /* RecastRegion.cpp */,
-				6B137C830F7FCC1100459200 /* RecastContour.cpp */,
-				6B137C870F7FCC1100459200 /* RecastMesh.cpp */,
-				6B624169103434880002E346 /* RecastMeshDetail.cpp */,
-				6B98470511E733B600FA177B /* RecastAlloc.h */,
-				6B9847B711E7519A00FA177B /* RecastAlloc.cpp */,
-			);
-			name = Recast;
-			sourceTree = "<group>";
-		};
-		6B555DF5100B25FC00247EA3 /* Samples */ = {
-			isa = PBXGroup;
-			children = (
-				6B25B6100FFA62AD004F1BC4 /* Sample.h */,
-				6B25B6140FFA62BE004F1BC4 /* Sample.cpp */,
-				6BA1E88E10C7BFD3008007F6 /* Sample_SoloMeshSimple.h */,
-				6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */,
-				6B98463111E6144400FA177B /* Sample_SoloMeshTiled.h */,
-				6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */,
-				6B2AEC510FFB8946005BE9CC /* Sample_TileMesh.h */,
-				6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */,
-				6B8036AC113BAABE005ED67B /* Sample_Debug.h */,
-				6B8036AD113BAABE005ED67B /* Sample_Debug.cpp */,
-			);
-			name = Samples;
-			sourceTree = "<group>";
-		};
-		6BB7FE8E10F4A175006DA0A6 /* Tools */ = {
-			isa = PBXGroup;
-			children = (
-				6BAF3C571211663A008CFCDF /* CrowdTool.h */,
-				6BAF3C581211663A008CFCDF /* CrowdTool.cpp */,
-				6B324C64111C5D9A00EBD2FD /* ConvexVolumeTool.h */,
-				6B324C65111C5D9A00EBD2FD /* ConvexVolumeTool.cpp */,
-				6BCF32341104CD05009445BF /* OffMeshConnectionTool.h */,
-				6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */,
-				6BB7FC0910EBB6AA006DA0A6 /* NavMeshTesterTool.h */,
-				6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */,
-			);
-			name = Tools;
-			sourceTree = "<group>";
-		};
-		6BB93C7610CFE1BD00F74F2B /* DebugUtils */ = {
-			isa = PBXGroup;
-			children = (
-				6BB93CF410CFEC4500F74F2B /* RecastDump.h */,
-				6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */,
-				6BB93C7710CFE1D500F74F2B /* DebugDraw.h */,
-				6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */,
-				6BB93C7910CFE1D500F74F2B /* RecastDebugDraw.h */,
-				6BB93C7C10CFE1D500F74F2B /* RecastDebugDraw.cpp */,
-				6BB93C7810CFE1D500F74F2B /* DetourDebugDraw.h */,
-				6BB93C7B10CFE1D500F74F2B /* DetourDebugDraw.cpp */,
-			);
-			name = DebugUtils;
-			sourceTree = "<group>";
-		};
-		6BDD9E030F91110C00904EEF /* Detour */ = {
-			isa = PBXGroup;
-			children = (
-				6BAF427A121ADCC2008CFCDF /* DetourAssert.h */,
-				6B9846ED11E718F800FA177B /* DetourAlloc.h */,
-				6B9846EE11E718F800FA177B /* DetourAlloc.cpp */,
-				6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */,
-				6B8DE88710B69E3E00DF20FB /* DetourNavMesh.cpp */,
-				6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */,
-				6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */,
-				6B8DE88C10B69E4C00DF20FB /* DetourNavMeshBuilder.h */,
-				6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */,
-				6B1185F61006896B0018F96F /* DetourNode.h */,
-				6B1185F41006895B0018F96F /* DetourNode.cpp */,
-				6B1185FC10068B040018F96F /* DetourCommon.h */,
-				6B1185FD10068B150018F96F /* DetourCommon.cpp */,
-				6B9EFF02122819E200535FF1 /* DetourObstacleAvoidance.h */,
-				6B9EFF0812281C3E00535FF1 /* DetourObstacleAvoidance.cpp */,
-			);
-			name = Detour;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		8D1107260486CEB800E47090 /* Recast */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Recast" */;
-			buildPhases = (
-				8D1107290486CEB800E47090 /* Resources */,
-				8D11072C0486CEB800E47090 /* Sources */,
-				8D11072E0486CEB800E47090 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Recast;
-			productInstallPath = "$(HOME)/Applications";
-			productName = Recast;
-			productReference = 8D1107320486CEB800E47090 /* Recast.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		29B97313FDCFA39411CA2CEA /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Recast" */;
-			compatibilityVersion = "Xcode 3.1";
-			hasScannedForEncodings = 1;
-			mainGroup = 29B97314FDCFA39411CA2CEA /* Recast */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				8D1107260486CEB800E47090 /* Recast */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		8D1107290486CEB800E47090 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
-				1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
-				6B024C0D10060AC600CF7107 /* Icon.icns in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		8D11072C0486CEB800E47090 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				6B137C710F7FCBBB00459200 /* imgui.cpp in Sources */,
-				6B137C720F7FCBBB00459200 /* MeshLoaderObj.cpp in Sources */,
-				6B137C730F7FCBBB00459200 /* SDLMain.m in Sources */,
-				6B137C8B0F7FCC1100459200 /* Recast.cpp in Sources */,
-				6B137C8C0F7FCC1100459200 /* RecastContour.cpp in Sources */,
-				6B137C8E0F7FCC1100459200 /* RecastFilter.cpp in Sources */,
-				6B137C900F7FCC1100459200 /* RecastMesh.cpp in Sources */,
-				6B137C910F7FCC1100459200 /* RecastRasterization.cpp in Sources */,
-				6B137C920F7FCC1100459200 /* RecastRegion.cpp in Sources */,
-				6BB788170FC0472B003C24DB /* ChunkyTriMesh.cpp in Sources */,
-				6B25B6190FFA62BE004F1BC4 /* Sample.cpp in Sources */,
-				6B25B61D0FFA62BE004F1BC4 /* main.cpp in Sources */,
-				6B2AEC530FFB8958005BE9CC /* Sample_TileMesh.cpp in Sources */,
-				6B1185F51006895B0018F96F /* DetourNode.cpp in Sources */,
-				6B1185FE10068B150018F96F /* DetourCommon.cpp in Sources */,
-				6B555DB1100B212E00247EA3 /* imguiRenderGL.cpp in Sources */,
-				6B62416A103434880002E346 /* RecastMeshDetail.cpp in Sources */,
-				6B8DE88910B69E3E00DF20FB /* DetourNavMesh.cpp in Sources */,
-				6B8DE88A10B69E3E00DF20FB /* DetourNavMeshBuilder.cpp in Sources */,
-				6BA1E88B10C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp in Sources */,
-				6BB93C7D10CFE1D500F74F2B /* DebugDraw.cpp in Sources */,
-				6BB93C7E10CFE1D500F74F2B /* DetourDebugDraw.cpp in Sources */,
-				6BB93C7F10CFE1D500F74F2B /* RecastDebugDraw.cpp in Sources */,
-				6BB93CF610CFEC4500F74F2B /* RecastDump.cpp in Sources */,
-				6BB7FC0B10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp in Sources */,
-				6BB7FDA510F36F0E006DA0A6 /* InputGeom.cpp in Sources */,
-				6BCF32361104CD05009445BF /* OffMeshConnectionTool.cpp in Sources */,
-				6BF7C1401111953A002B3F46 /* TestCase.cpp in Sources */,
-				6BF7C4541115C277002B3F46 /* RecastArea.cpp in Sources */,
-				6B324C66111C5D9A00EBD2FD /* ConvexVolumeTool.cpp in Sources */,
-				6B8036AE113BAABE005ED67B /* Sample_Debug.cpp in Sources */,
-				6BF5F23A11747606000502A6 /* Filelist.cpp in Sources */,
-				6BF5F2401174763B000502A6 /* SlideShow.cpp in Sources */,
-				6B98463311E6144400FA177B /* Sample_SoloMeshTiled.cpp in Sources */,
-				6B9846EF11E718F800FA177B /* DetourAlloc.cpp in Sources */,
-				6B9847B811E7519A00FA177B /* RecastAlloc.cpp in Sources */,
-				6BAF3C591211663A008CFCDF /* CrowdTool.cpp in Sources */,
-				6BAF40DB12196A3D008CFCDF /* DetourNavMeshQuery.cpp in Sources */,
-				6BAF4442121C3D26008CFCDF /* SampleInterfaces.cpp in Sources */,
-				6BD402011224279400995864 /* PerfTimer.cpp in Sources */,
-				6B9EFF0912281C3E00535FF1 /* DetourObstacleAvoidance.cpp in Sources */,
-				6B847777122D221D00ADF63D /* ValueHistory.cpp in Sources */,
-				6BD667DA123D28100021A7A4 /* CrowdManager.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				089C165DFE840E0CC02AAC07 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		1DDD58140DA1D0A300B32029 /* MainMenu.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				1DDD58150DA1D0A300B32029 /* English */,
-			);
-			name = MainMenu.xib;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		C01FCF4B08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CONFIGURATION_BUILD_DIR = ../../Bin;
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = Recast_Prefix.pch;
-				GCC_VERSION = 4.2;
-				HEADER_SEARCH_PATHS = "/Library/Frameworks/SDL.framework/Headers/**";
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-Wreorder",
-					"-Wsign-compare",
-					"-Wall",
-				);
-				PRODUCT_NAME = Recast;
-				USER_HEADER_SEARCH_PATHS = "";
-			};
-			name = Debug;
-		};
-		C01FCF4C08A954540054247B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CONFIGURATION_BUILD_DIR = ../../Bin;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = Recast_Prefix.pch;
-				GCC_VERSION = 4.2;
-				HEADER_SEARCH_PATHS = "/Library/Frameworks/SDL.framework/Headers/**";
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				OTHER_CFLAGS = "";
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-Wreorder",
-					"-Wsign-compare",
-					"-Wall",
-				);
-				PRODUCT_NAME = Recast;
-				USER_HEADER_SEARCH_PATHS = "";
-			};
-			name = Release;
-		};
-		C01FCF4F08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.5;
-			};
-			name = Debug;
-		};
-		C01FCF5008A954540054247B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.5;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Recast" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C01FCF4B08A954540054247B /* Debug */,
-				C01FCF4C08A954540054247B /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Recast" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C01FCF4F08A954540054247B /* Debug */,
-				C01FCF5008A954540054247B /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/dep/recastnavigation/RecastDemo/Build/Xcode/Recast_Prefix.pch b/dep/recastnavigation/RecastDemo/Build/Xcode/Recast_Prefix.pch
deleted file mode 100644
index 3b101c2383e..00000000000
--- a/dep/recastnavigation/RecastDemo/Build/Xcode/Recast_Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'Recast' target in the 'Recast' project
-//
-
-#ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
-#endif
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/BUGS b/dep/recastnavigation/RecastDemo/Contrib/SDL/BUGS
deleted file mode 100644
index 218bf3d15ba..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/BUGS
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Bugs are now managed in the SDL bug tracker, here:
-
-    http://bugzilla.libsdl.org/
-
-You may report bugs there, and search to see if a given issue has already
- been reported, discussed, and maybe even fixed.
-
-
-
-You may also find help at the SDL mailing list. Subscription information:
-
-    http://lists.libsdl.org/listinfo.cgi/sdl-libsdl.org
-
-Bug reports are welcome here, but we really appreciate if you use Bugzilla, as
- bugs discussed on the mailing list may be forgotten or missed.
-
-
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/COPYING b/dep/recastnavigation/RecastDemo/Contrib/SDL/COPYING
deleted file mode 100644
index 2cba2ac74cf..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/COPYING
+++ /dev/null
@@ -1,458 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/README b/dep/recastnavigation/RecastDemo/Contrib/SDL/README
deleted file mode 100644
index 7c0dd5890ca..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/README
+++ /dev/null
@@ -1,49 +0,0 @@
-
-                         Simple DirectMedia Layer
-
-                                  (SDL)
-
-                                Version 1.2
-
----
-http://www.libsdl.org/
-
-This is the Simple DirectMedia Layer, a general API that provides low
-level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL,
-and 2D framebuffer across multiple platforms.
-
-The current version supports Linux, Windows CE/95/98/ME/XP/Vista, BeOS,
-MacOS Classic, Mac OS X, FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, IRIX,
-and QNX.  The code contains support for Dreamcast, Atari, AIX, OSF/Tru64,
-RISC OS, SymbianOS, Nintendo DS, and OS/2, but these are not officially
-supported.
-
-SDL is written in C, but works with C++ natively, and has bindings to
-several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
-Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP,
-Pike, Pliant, Python, Ruby, and Smalltalk.
-
-This library is distributed under GNU LGPL version 2, which can be
-found in the file  "COPYING".  This license allows you to use SDL
-freely in commercial programs as long as you link with the dynamic
-library.
-
-The best way to learn how to use SDL is to check out the header files in
-the "include" subdirectory and the programs in the "test" subdirectory.
-The header files and test programs are well commented and always up to date.
-More documentation is available in HTML format in "docs/index.html", and
-a documentation wiki is available online at:
-	http://www.libsdl.org/cgi/docwiki.cgi
-
-The test programs in the "test" subdirectory are in the public domain.
-
-Frequently asked questions are answered online:
-	http://www.libsdl.org/faq.php
-
-If you need help with the library, or just want to discuss SDL related
-issues, you can join the developers mailing list:
-	http://www.libsdl.org/mailing-list.php
-
-Enjoy!
-	Sam Lantinga				(slouken@libsdl.org)
-
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/README-SDL.txt b/dep/recastnavigation/RecastDemo/Contrib/SDL/README-SDL.txt
deleted file mode 100644
index 4d36ca9dce4..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/README-SDL.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Please distribute this file with the SDL runtime environment:
-
-The Simple DirectMedia Layer (SDL for short) is a cross-platfrom library
-designed to make it easy to write multi-media software, such as games and
-emulators.
-
-The Simple DirectMedia Layer library source code is available from:
-http://www.libsdl.org/
-
-This library is distributed under the terms of the GNU LGPL license:
-http://www.gnu.org/copyleft/lesser.html
-
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/VisualC.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/VisualC.html
deleted file mode 100644
index ad2ed97a603..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/VisualC.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<HTML>
-	<HEAD>
-		<TITLE>Using SDL with Microsoft Visual C++</TITLE>
-	</HEAD>
-	<BODY>
-		<H1>
-			Using SDL with Microsoft Visual C++ 5,6&nbsp;and 7
-		</H1>
-		<H3>
-			by <A HREF="mailto:snowlion@sprynet.com">Lion Kimbro </A>and additions by <A HREF="mailto:james@conceptofzero.net">
-				James Turk</A>
-		</H3>
-		<p>
-			You can either use the precompiled libraries from <A HREF="http://www.libsdl.org/download.php">
-				the SDL Download web site </A>, or you can build SDL yourself.
-		</p>
-		<H3>
-			Building SDL
-		</H3>
-		<P>
-			Unzip the <CODE>VisualC.zip</CODE> file into the directory that contains this 
-			file (<CODE>VisualC.html</CODE>).
-		</P>
-		<P>
-			Be certain that you unzip the zip file for your compiler into <strong>this</strong>
-			directory and not any other directory. If you are using WinZip, be careful to 
-			make sure that it extracts to <strong>this</strong> folder, because it's 
-			convenient feature of unzipping to a folder with the name of the file currently 
-			being unzipped will get you in trouble if you use it right now. And that's all 
-			I have to say about that.
-		</P>
-		<P>
-			Now that it's unzipped, go into the VisualC 
-			directory that is created, and double-click on the VC++ file "<CODE>SDL.dsw</CODE>"<STRONG><FONT color="#009900">
-					("<CODE>SDL.sln</CODE>").</FONT></STRONG> This should open up the IDE.
-		</P>
-		<P>
-			You may be prompted at this point to upgrade the workspace, should you be using 
-			a more recent version of Visual C++. If so, allow the workspace to be upgraded.
-		</P>
-		<P>
-			Build the <CODE>.dll</CODE> and <CODE>.lib</CODE> files.
-		</P>
-		<P>
-			This is done by right clicking on each project in turn (Projects are listed in 
-			the Workspace panel in the FileView tab), and selecting "Build".
-		</P>
-		<P>
-			If you get an error about SDL_config.h being missing, you should
-			copy include/SDL_config.h.default to include/SDL_config.h and try again.
-		</P>
-		<P>
-			You may get a few warnings, but you should not get any errors. You do have to 
-			have at least the DirectX 5 SDK installed, however. The latest 
-			version of DirectX can be downloaded or purchased on a cheap CD (my 
-			recommendation) from <A HREF="http://www.microsoft.com">Microsoft </A>.
-		</P>
-		<P>
-			Later, we will refer to the following .lib and .dll files that have just been 
-			generated:
-		</P>
-		<ul>
-    <li> SDL.dll</li>
-    <li> SDL.lib</li>
-    <li> SDLmain.lib</li>
-    </ul>
-		<P>
-			Search for these using the Windows Find (Windows-F) utility, if you don't 
-			already know where they should be. For those of you with a clue, look inside 
-			the Debug or Release directories of the subdirectories of the Project folder. 
-			(It might be easier to just use Windows Find if this sounds confusing. And 
-			don't worry about needing a clue; we all need visits from the clue fairy 
-			frequently.)
-		</P>
-		<H3>
-			Creating a Project with SDL
-		</H3>
-		<P>
-			Create a project as a Win32 Application.
-		</P>
-		<P>
-			Create a C++ file for your project.
-		</P>
-		<P>
-			Set the C runtime to "Multi-threaded DLL" in the menu: <CODE>Project|Settings|C/C++ 
-				tab|Code Generation|Runtime Library </CODE>.
-		</P>
-		<P>
-			Add the SDL <CODE>include</CODE> directory to your list of includes in the 
-			menu: <CODE>Project|Settings|C/C++ tab|Preprocessor|Additional include directories </CODE>
-			.
-			<br>
-			<STRONG><FONT color="#009900">VC7 Specific: Instead of doing this I find it easier to 
-					add the include and library directories to the list that VC7 keeps. Do this by 
-					selecting Tools|Options|Projects|VC++ Directories and under the "Show 
-					Directories For:" dropbox select "Include Files", and click the "New Directory 
-					Icon" and add the [SDLROOT]\include directory (ex. If you installed to 
-					c:\SDL-1.2.5\ add c:\SDL-1.2.5\include).&nbsp;Proceed to&nbsp;change the 
-					dropbox selection to "Library Files" and add [SDLROOT]\lib.</FONT></STRONG>
-		</P>
-			<P>
-				The "include directory" I am referring to is the <CODE>include</CODE> folder 
-				within the main SDL directory (the one that this HTML file located within).
-			</P>
-			<P>
-				Now we're going to use the files that we had created earlier in the Build SDL 
-				step.
-			</P>
-			<P>
-				Copy the following files into your Project directory:
-			</P>
-			<ul>
-     <li> SDL.dll</li>
-     </ul>
-			<P>
-				Add the following files to your project (It is not necessary to copy them to 
-				your project directory):
-			</P>
-			<ul>
-     <li> SDL.lib </li>
-     <li> SDLmain.lib</li>
-     </ul>
-			<P>
-				(To add them to your project, right click on your project, and select "Add 
-				files to project")
-			</P>
-		<P><STRONG><FONT color="#009900">Instead of adding the files to your project it is more 
-					desireable to add them to the linker options: Project|Properties|Linker|Command 
-					Line and type the names of the libraries to link with in the "Additional 
-					Options:" box.&nbsp; Note: This must be done&nbsp;for&nbsp;each&nbsp;build 
-					configuration (eg. Release,Debug).</FONT></STRONG></P>
-		<H3>
-			SDL 101, First Day of Class
-		</H3>
-		<P>
-			Now create the basic body of your project. The body of your program should take 
-			the following form: <CODE>
-				<PRE>
-#include "SDL.h"
-
-int main( int argc, char* argv[] )
-{
-  // Body of the program goes here.
-  return 0;
-}
-</PRE>
-			</CODE>
-		<P></P>
-		<H3>
-			That's it!
-		</H3>
-		<P>
-			I hope that this document has helped you get through the most difficult part of 
-			using the SDL: installing it. Suggestions for improvements to this document 
-			should be sent to the writers of this document.
-		</P>
-		<P>
-			Thanks to Paulus Esterhazy (pesterhazy@gmx.net), for the work on VC++ port.
-		</P>
-		<P>
-			This document was originally called "VisualC.txt", and was written by <A HREF="mailto:slouken@libsdl.org">
-				Sam Lantinga</A>.
-		</P>
-		<P>
-			Later, it was converted to HTML and expanded into the document that you see 
-			today by <A HREF="mailto:snowlion@sprynet.com">Lion Kimbro</A>.
-		</P>
-		<P>Minor Fixes and Visual C++ 7 Information (In Green) was added by <A HREF="mailto:james@conceptofzero.net">James Turk</A>
-		</P>
-	</BODY>
-</HTML>
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/WhatsNew b/dep/recastnavigation/RecastDemo/Contrib/SDL/WhatsNew
deleted file mode 100644
index 927fdd264f9..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/WhatsNew
+++ /dev/null
@@ -1,727 +0,0 @@
-
-This is a list of API changes in SDL's version history.
-
-Version 1.0:
-
-1.2.14:
-	Added cast macros for correct usage with C++:
-		SDL_reinterpret_cast(type, expression)
-		SDL_static_cast(type, expression)
-
-	Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for 
-	SDL_VIDEO_FULLSCREEN_HEAD on X11.
-
-	Added SDL_DISABLE_LOCK_KEYS environment variable to enable normal
-	up/down events for Caps-Lock and Num-Lock keys.
-
-1.2.13:
-	Added SDL_BUTTON_X1 and SDL_BUTTON_X2 constants.
-
-1.2.12:
-	Added SDL_VIDEO_ALLOW_SCREENSAVER to override SDL's disabling
-	of the screensaver on Mac OS X and X11.
-
-1.2.10:
-	If SDL_OpenAudio() is passed zero for the desired format
-	fields, the following environment variables will be used
-	to fill them in:
-		SDL_AUDIO_FREQUENCY
-		SDL_AUDIO_FORMAT
-		SDL_AUDIO_CHANNELS
-		SDL_AUDIO_SAMPLES
-	If an environment variable is not specified, it will be set
-	to a reasonable default value.
-
-	Added support for the SDL_VIDEO_FULLSCREEN_HEAD environment
-	variable, currently supported on X11 Xinerama configurations.
-
-	Added SDL_GL_SWAP_CONTROL to wait for vsync in OpenGL applications.
-
-	Added SDL_GL_ACCELERATED_VISUAL to guarantee hardware acceleration.
-
-	Added current_w and current_h to the SDL_VideoInfo structure,
-	which is set to the desktop resolution during video intialization,
-	and then set to the current resolution when a video mode is set.
-
-	SDL_SetVideoMode() now accepts 0 for width or height and will use
-	the current video mode (or the desktop mode if no mode has been set.)
-
-	Added SDL_GetKeyRepeat()
-
-	Added SDL_config.h, with defaults for various build environments.
-
-1.2.7:
-	Added CPU feature detection functions to SDL_cpuinfo.h:
-		SDL_HasRDTSC(), SDL_HasMMX(), SDL_Has3DNow(), SDL_HasSSE(),
-		SDL_HasAltiVec()
-	Added function to create RWops from const memory: SDL_RWFromConstMem()
-
-1.2.6:
-	Added SDL_LoadObject(), SDL_LoadFunction(), and SDL_UnloadObject()
-
-	Added SDL_GL_MULTISAMPLEBUFFERS and SDL_GL_MULTISAMPLESAMPLES for FSAA
-
-1.2.5:
-	Added SDL_BUTTON_WHEELUP (4) and SDL_BUTTON_WHEELDOWN (5)
-
-	Added SDL_GL_STEREO for stereoscopic OpenGL contexts
-
-1.2.0:
-	Added SDL_VIDEOEXPOSE event to signal that the screen needs to
-	be redrawn.  This is currently only delivered to OpenGL windows
-	on X11, though it may be delivered in the future when the video
-	memory is lost under DirectX.
-
-1.1.8:
-	You can pass SDL_NOFRAME to SDL_VideoMode() to create a window
-	that has no title bar or frame decoration.  Fullscreen video
-	modes automatically have this flag set.
-
-	Added a function to query the clipping rectangle for a surface:
-		void SDL_GetClipRect(SDL_Surface *surface, SDL_Rect *rect)
-
-	Added a function to query the current event filter:
-		SDL_EventFilter SDL_GetEventFilter(void)
-
-	If you pass -1 to SDL_ShowCursor(), it won't change the current
-	cursor visibility state, but will still return it.
-
-	SDL_LockSurface() and SDL_UnlockSurface() are recursive, meaning
-	you can nest them as deep as you want, as long as each lock call
-	has a matching unlock call.  The surface remains locked until the
-	last matching unlock call.
-
-	Note that you may not blit to or from a locked surface.
-
-1.1.7:
-	The SDL_SetGammaRamp() and SDL_GetGammaRamp() functions now take
-	arrays of Uint16 values instead of Uint8 values.  For the most part,
-	you can just take your old values and shift them up 8 bits to get
-	new correct values for your gamma ramps.
-
-	You can pass SDL_RLEACCEL in flags passed to SDL_ConvertSurface()
-        and SDL will try to RLE accelerate colorkey and alpha blits in the
-	resulting surface.
-
-1.1.6:
-	Added a function to return the thread ID of a specific thread:
-		Uint32 SDL_GetThreadID(SDL_Thread *thread)
-	If 'thread' is NULL, this function returns the id for this thread.
-
-1.1.5:
-	The YUV overlay structure has been changed to use an array of
-	pitches and pixels representing the planes of a YUV image, to
-	better enable hardware acceleration.  The YV12 and IYUV formats
-	each have three planes, corresponding to the Y, U, and V portions
-	of the image, while packed pixel YUV formats just have one plane.
-
-	For palettized mode (8bpp), the screen colormap is now split in
-	a physical and a logical palette. The physical palette determines
-	what colours the screen pixels will get when displayed, and the
-	logical palette controls the mapping from blits to/from the screen.
-	A new function, SDL_SetPalette() has been added to change
-	logical and physical palettes separately. SDL_SetColors() works
-	just as before, and is equivalent to calling SDL_SetPalette() with
-	a flag argument of (SDL_LOGPAL|SDL_PHYSPAL).
-
-	SDL_BlitSurface() no longer modifies the source rectangle, only the
-	destination rectangle. The width/height members of the destination
-	rectangle are ignored, only the position is used.
-
-	The old source clipping function SDL_SetClipping() has been replaced
-	with a more useful function to set the destination clipping rectangle:
-		SDL_bool SDL_SetClipRect(SDL_Surface *surface, SDL_Rect *rect)
-		
-	Added a function to see what subsystems have been initialized:
-		Uint32 SDL_WasInit(Uint32 flags)
-
-	The Big Alpha Flip: SDL now treats alpha as opacity like everybody
-	else, and not as transparency:
-
-	A new cpp symbol: SDL_ALPHA_OPAQUE is defined as 255
-	A new cpp symbol: SDL_ALPHA_TRANSPARENT is defined as 0
-	Values between 0 and 255 vary from fully transparent to fully opaque.
-
-	New functions:
-	SDL_DisplayFormatAlpha()
-	    Returns a surface converted to a format with alpha-channel
-	    that can be blit efficiently to the screen. (In other words,
-	    like SDL_DisplayFormat() but the resulting surface has
-	    an alpha channel.)  This is useful for surfaces with alpha.
-	SDL_MapRGBA()
-	    Works as SDL_MapRGB() but takes an additional alpha parameter.
-	SDL_GetRGBA()
-	    Works as SDL_GetRGB() but also returns the alpha value
-	    (SDL_ALPHA_OPAQUE for formats without an alpha channel)
-
-	Both SDL_GetRGB() and SDL_GetRGBA() now always return values in
-	the [0..255] interval. Previously, SDL_GetRGB() would return
-	(0xf8, 0xfc, 0xf8) for a completely white pixel in RGB565 format.
-	(N.B.: This is broken for bit fields < 3 bits.)
-
-	SDL_MapRGB() returns pixels in which the alpha channel is set opaque.
-
-	SDL_SetAlpha() can now be used for both setting the per-surface
-	alpha, using the new way of thinking of alpha, and also to enable
-	and disable per-pixel alpha blending for surfaces with an alpha
-	channel:
-		To disable alpha blending:
-			SDL_SetAlpha(surface, 0, 0);
-		To re-enable alpha blending:
-			SDL_SetAlpha(surface, SDL_SRCALPHA, 0);
-	Surfaces with an alpha channel have blending enabled by default.
-
-	SDL_SetAlpha() now accepts SDL_RLEACCEL as a flag, which requests
-	RLE acceleration of blits, just as like with SDL_SetColorKey().
-	This flag can be set for both surfaces with an alpha channel
-	and surfaces with an alpha value set by SDL_SetAlpha().
-	As always, RLE surfaces must be locked before pixel access is
-	allowed, and unlocked before any other SDL operations are done
-	on it.
-
-	The blit semantics for surfaces with and without alpha and colorkey
-	have now been defined:
-
-	RGBA->RGB:
-	    SDL_SRCALPHA set:
-		alpha-blend (using alpha-channel).
-		SDL_SRCCOLORKEY ignored.
-	    SDL_SRCALPHA not set:
-		copy RGB.
-		if SDL_SRCCOLORKEY set, only copy the pixels matching the
-		RGB values of the source colour key, ignoring alpha in the
-		comparison.
-
-	RGB->RGBA:
-	    SDL_SRCALPHA set:
-		alpha-blend (using the source per-surface alpha value);
-		set destination alpha to opaque.
-	    SDL_SRCALPHA not set:
-		copy RGB, set destination alpha to opaque.
-	    both:
-		if SDL_SRCCOLORKEY set, only copy the pixels matching the
-		source colour key.
-
-	RGBA->RGBA:
-	    SDL_SRCALPHA set:
-		alpha-blend (using the source alpha channel) the RGB values;
-		leave destination alpha untouched. [Note: is this correct?]
-		SDL_SRCCOLORKEY ignored.
-	    SDL_SRCALPHA not set:
-		copy all of RGBA to the destination.
-		if SDL_SRCCOLORKEY set, only copy the pixels matching the
-		RGB values of the source colour key, ignoring alpha in the
-		comparison.
-
-	RGB->RGB: 
-	    SDL_SRCALPHA set:
-		alpha-blend (using the source per-surface alpha value).
-	    SDL_SRCALPHA not set:
-		copy RGB.
-	    both:
-		if SDL_SRCCOLORKEY set, only copy the pixels matching the
-		source colour key.
-
-	As a special case, blits from surfaces with per-surface alpha
-	value of 128 (50% transparency) are optimised and much faster
-	than other alpha values. This does not apply to surfaces with
-	alpha channels (per-pixel alpha).
-
-	New functions for manipulating the gamma of the display have
-	been added:
-		int SDL_SetGamma(float red, float green, float blue);
-		int SDL_SetGammaRamp(Uint8 *red, Uint8 *green, Uint8 *blue);
-		int SDL_GetGammaRamp(Uint8 *red, Uint8 *green, Uint8 *blue);
-	Gamma ramps are tables with 256 entries which map the screen color
-	components into actually displayed colors.  For an example of
-	implementing gamma correction and gamma fades, see test/testgamma.c
-	Gamma control is not supported on all hardware.
-
-1.1.4:
-	The size of the SDL_CDtrack structure changed from 8 to 12 bytes
-	as the size of the length member was extended to 32 bits.
-
-        You can now use SDL for 2D blitting with a GL mode by passing the
-	SDL_OPENGLBLIT flag to SDL_SetVideoMode().  You can specify 16 or
-	32 bpp, and the data in the framebuffer is put into the GL scene
-	when you call SDL_UpdateRects(), and the scene will be visible
-	when you call SDL_GL_SwapBuffers().
-
-	Run the "testgl" test program with the -logo command line option
-	to see an example of this blending of 2D and 3D in SDL.
-
-1.1.3:
-	Added SDL_FreeRW() to the API, to complement SDL_AllocRW()
-
-	Added resizable window support - just add SDL_RESIZABLE to the
-	SDL_SetVideoMode() flags, and then wait for SDL_VIDEORESIZE events.
-	See SDL_events.h for details on the new SDL_ResizeEvent structure.
-
-	Added condition variable support, based on mutexes and semaphores.
-		SDL_CreateCond()
-		SDL_DestroyCond()
-		SDL_CondSignal()
-		SDL_CondBroadcast()
-		SDL_CondWait()
-		SDL_CondTimedWait()
-	The new function prototypes are in SDL_mutex.h
-
-	Added counting semaphore support, based on the mutex primitive.
-		SDL_CreateSemaphore()
-		SDL_DestroySemaphore()
-		SDL_SemWait()
-		SDL_SemTryWait()
-		SDL_SemWaitTimeout()
-		SDL_SemPost()
-		SDL_SemValue()
-	The new function prototypes are in SDL_mutex.h
-
-	Added support for asynchronous blitting.  To take advantage of this,
-	you must set the SDL_ASYNCBLIT flag when setting the video mode and
-	creating surfaces that you want accelerated in this way.  You must
-	lock surfaces that have this flag set, and the lock will block until
-	any queued blits have completed.
-
-	Added YUV video overlay support.
-	The supported YUV formats are: YV12, IYUV, YUY2, UYVY, and YVYU.
-	This function creates an overlay surface:
-		SDL_CreateYUVOverlay()
-	You must lock and unlock the overlay to get access to the data:
-		SDL_LockYUVOverlay() SDL_UnlockYUVOverlay()
-	You can then display the overlay:
-		SDL_DisplayYUVOverlay()
-	You must free the overlay when you are done using it:
-		SDL_FreeYUVOverlay()
-	See SDL_video.h for the full function prototypes.
-
-	The joystick hat position constants have been changed:
-	Old constant            New constant
-	------------            ------------
-	     0                  SDL_HAT_CENTERED
-	     1                  SDL_HAT_UP
-	     2                  SDL_HAT_RIGHTUP
-	     3                  SDL_HAT_RIGHT
-	     4                  SDL_HAT_RIGHTDOWN
-	     5                  SDL_HAT_DOWN
-	     6                  SDL_HAT_LEFTDOWN
-	     7                  SDL_HAT_LEFT
-	     8                  SDL_HAT_LEFTUP
-	The new constants are bitmasks, so you can check for the
-	individual axes like this:
-		if ( hat_position & SDL_HAT_UP ) {
-		}
-	and you'll catch left-up, up, and right-up.
-
-1.1.2:
-	Added multiple timer support:
-		SDL_AddTimer() and SDL_RemoveTimer()
-
-	SDL_WM_SetIcon() now respects the icon colorkey if mask is NULL.
-
-1.1.0:
-	Added initial OpenGL support.
-	First set GL attributes (such as RGB depth, alpha depth, etc.)
-		SDL_GL_SetAttribute()
-	Then call SDL_SetVideoMode() with the SDL_OPENGL flag.
-	Perform all of your normal GL drawing.
-	Finally swap the buffers with the new SDL function:
-		SDL_GL_SwapBuffers()
-	See the new 'testgl' test program for an example of using GL with SDL.
-
-	You can load GL extension functions by using the function:
-		SDL_GL_LoadProcAddress()
-
-	Added functions to initialize and cleanup specific SDL subsystems:
-		SDL_InitSubSystem() and SDL_QuitSubSystem()
-
-	Added user-defined event type:
-		typedef struct {
-        		Uint8 type;
-        		int code;
-        		void *data1;
-        		void *data2;
-		} SDL_UserEvent;
-	This structure is in the "user" member of an SDL_Event.
-
-	Added a function to push events into the event queue:
-		SDL_PushEvent()
-
-	Example of using the new SDL user-defined events:
-	{
-		SDL_Event event;
-
-		event.type = SDL_USEREVENT;
-		event.user.code = my_event_code;
-		event.user.data1 = significant_data;
-		event.user.data2 = 0;
-		SDL_PushEvent(&event);
-	}
-
-	Added a function to get mouse deltas since last query:
-		SDL_GetRelativeMouseState()
-
-	Added a boolean datatype to SDL_types.h:
-		SDL_bool = { SDL_TRUE, SDL_FALSE }
-
-	Added a function to get the current audio status:
-		SDL_GetAudioState();
-	It returns one of:
-		SDL_AUDIO_STOPPED,
-		SDL_AUDIO_PLAYING,
-		SDL_AUDIO_PAUSED
-
-	Added an AAlib driver (ASCII Art) - by Stephane Peter.
-
-1.0.6:
-	The input grab state is reset after each call to SDL_SetVideoMode().
-	The input is grabbed by default in fullscreen mode, and ungrabbed in
-	windowed mode.  If you want to set input grab to a particular value,
-	you should set it after each call to SDL_SetVideoMode().
-
-1.0.5:
-	Exposed SDL_AudioInit(), SDL_VideoInit()
-	Added SDL_AudioDriverName() and SDL_VideoDriverName()
-
-	Added new window manager function:
-		SDL_WM_ToggleFullScreen()
-	This is currently implemented only on Linux
-
-	The ALT-ENTER code has been removed - it's not appropriate for a
-	lib to bind keys when they aren't even emergency escape sequences.
-
-	ALT-ENTER functionality can be implemented with the following code:
-
-	int Handle_AltEnter(const SDL_Event *event)
-	{
-	    if ( event->type == SDL_KEYDOWN ) {
-	        if ( (event->key.keysym.sym == SDLK_RETURN) &&
-	             (event->key.keysym.mod & KMOD_ALT) ) {   
-	                SDL_WM_ToggleFullScreen(SDL_GetVideoSurface());
-	                return(0);
-	        }
-	    }
-	    return(1);
-	}
-	SDL_SetEventFilter(Handle_AltEnter);
-
-1.0.3:
-	Under X11, if you grab the input and hide the mouse cursor,
-	the mouse will go into a "relative motion" mode where you
-	will always get relative motion events no matter how far in
-	each direction you move the mouse - relative motion is not
-	bounded by the edges of the window (though the absolute values
-	of the mouse positions are clamped by the size of the window).
-	The SVGAlib, framebuffer console, and DirectInput drivers all
-	have this behavior naturally, and the GDI and BWindow drivers
-	never go into "relative motion" mode.
-
-1.0.2:
-	Added a function to enable keyboard repeat:
-		SDL_EnableKeyRepeat()
-
-	Added a function to grab the mouse and keyboard input
-		SDL_WM_GrabInput()
-
-	Added a function to iconify the window.
-		SDL_WM_IconifyWindow()
-	If this function succeeds, the application will receive an event
-	signaling SDL_APPACTIVE event 
-
-1.0.1:
-	Added constants to SDL_audio.h for 16-bit native byte ordering:
-		AUDIO_U16SYS, AUDIO_S16SYS
-
-1.0.0:
-	New public release
-
-Version 0.11:
-
-0.11.5:
-	A new function SDL_GetVideoSurface() has been added, and returns
-	a pointer to the current display surface.
-
-	SDL_AllocSurface() has been renamed SDL_CreateRGBSurface(), and
-	a new function SDL_CreateRGBSurfaceFrom() has been added to allow
-	creating an SDL surface from an existing pixel data buffer.
-
-	Added SDL_GetRGB() to the headers and documentation.
-
-0.11.4:
-	SDL_SetLibraryPath() is no longer meaningful, and has been removed.
-
-0.11.3:
-	A new flag for SDL_Init(), SDL_INIT_NOPARACHUTE, prevents SDL from
-	installing fatal signal handlers on operating systems that support
-	them.
-
-Version 0.9:
-
-0.9.15:
-	SDL_CreateColorCursor() has been removed.  Color cursors should
-	be implemented as sprites, blitted by the application when the
-	cursor moves.  To get smooth color cursor updates when the app
-	is busy, pass the SDL_INIT_EVENTTHREAD flag to SDL_Init().  This
-	allows you to handle the mouse motion in another thread from an
-	event filter function, but is currently only supported by Linux
-	and BeOS.  Note that you'll have to protect the display surface
-	from multi-threaded access by using mutexes if you do this.
-
-	Thread-safe surface support has been removed from SDL.
-	This makes blitting somewhat faster, by removing SDL_MiddleBlit().
-	Code that used SDL_MiddleBlit() should use SDL_LowerBlit() instead.
-	You can make your surfaces thread-safe by allocating your own
-	mutex and making lock/unlock calls around accesses to your surface.
-
-0.9.14:
-	SDL_GetMouseState() now takes pointers to int rather than Uint16.
-
-	If you set the SDL_WINDOWID environment variable under UNIX X11,
-	SDL will use that as the main window instead of creating it's own.
-	This is an unsupported extension to SDL, and not portable at all.
-
-0.9.13:
-	Added a function SDL_SetLibraryPath() which can be used to specify
-	the directory containing the SDL dynamic libraries.  This is useful
-	for commercial applications which ship with particular versions
-	of the libraries, and for security on multi-user systems.
-	If this function is not used, the default system directories are 
-	searched using the native dynamic object loading mechanism.
-
-	In order to support C linkage under Visual C++, you must declare
-	main() without any return type:
-		main(int argc, char *argv[]) {
-			/* Do the program... */
-			return(0);
-		}
-	C++ programs should also return a value if compiled under VC++.
-
-	The blit_endian member of the SDL_VideoInfo struct has been removed.
-
-	SDL_SymToASCII() has been replaced with SDL_GetKeyName(), so there
-	is now no longer any function to translate a keysym to a character.
-
-	The SDL_keysym structure has been extended with a 'scancode' and
-	'unicode' member.  The 'scancode' is a hardware specific scancode
-	for the key that was pressed, and may be 0.  The 'unicode' member
-	is a 16-bit UNICODE translation of the key that was pressed along
-	with any modifiers or compose keys that have been pressed.
-	If no UNICODE translation exists for the key, 'unicode' will be 0.
-
-	Added a function SDL_EnableUNICODE() to enable/disable UNICODE
-	translation of character keypresses.  Translation defaults off.
-
-	To convert existing code to use the new API, change code which
-	uses SDL_SymToASCII() to get the keyname to use SDL_GetKeyName(),
-	and change code which uses it to get the ASCII value of a sym to
-	use the 'unicode' member of the event keysym.
-
-0.9.12:
-	There is partial support for 64-bit datatypes.  I don't recommend 
-	you use this if you have a choice, because 64-bit datatypes are not
-	supported on many platforms.  On platforms for which it is supported,
-	the SDL_HAS_64BIT_TYPE C preprocessor define will be enabled, and
-	you can use the Uint64 and Sint64 datatypes.
-
-	Added functions to SDL_endian.h to support 64-bit datatypes:
-	    SDL_SwapLE64(), SDL_SwapBE64(),
-	    SDL_ReadLE64(), SDL_ReadBE64(), SDL_WriteLE64(), SDL_WriteBE64()
-
-	A new member "len_ratio" has been added to the SDL_AudioCVT structure,
-	and allows you to determine either the original buffer length or the
-	converted buffer length, given the other.
-
-	A new function SDL_FreeWAV() has been added to the API to free data
-	allocated by SDL_LoadWAV_RW().  This is necessary under Win32 since
-	the gcc compiled DLL uses a different heap than VC++ compiled apps.
-
-	SDL now has initial support for international keyboards using the
-	Latin character set.
-	If a particular mapping is desired, you can set the DEFAULT_KEYBOARD
-	compile-time variable, or you can set the environment variable 
-	"SDL_KEYBOARD" to a string identifying the keyboard mapping you desire.
-	The valid values for these variables can be found in SDL_keyboard.c
-
-	Full support for German and French keyboards under X11 is implemented.
-
-0.9.11:
-	The THREADED_EVENTS compile-time define has been replaced with the
-	SDL_INIT_EVENTTHREAD flag.  If this flag is passed to SDL_Init(),
-	SDL will create a separate thread to perform input event handling.
-	If this flag is passed to SDL_Init(), and the OS doesn't support 
-	event handling in a separate thread, SDL_Init() will fail.
-	Be sure to add calls to SDL_Delay() in your main thread to allow
-	the OS to schedule your event thread, or it may starve, leading
-	to slow event delivery and/or dropped events.
-	Currently MacOS and Win32 do not support this flag, while BeOS 
-	and Linux do support it.  I recommend that your application only
-	use this flag if absolutely necessary.
-
-	The SDL thread function passed to SDL_CreateThread() now returns a
-	status.  This status can be retrieved by passing a non-NULL pointer
-	as the 'status' argument to SDL_WaitThread().
-
-	The volume parameter to SDL_MixAudio() has been increased in range
-	from (0-8) to (0-128)
-
-	SDL now has a data source abstraction which can encompass a file,
-	an area of memory, or any custom object you can envision.  It uses
-	these abstractions, SDL_RWops, in the endian read/write functions,
-	and the built-in WAV and BMP file loaders.  This means you can load
-	WAV chunks from memory mapped files, compressed archives, network
-	pipes, or anything else that has a data read abstraction.
-
-	There are three built-in data source abstractions:
-	    SDL_RWFromFile(), SDL_RWFromFP(), SDL_RWFromMem()
-	along with a generic data source allocation function:
-	    SDL_AllocRW()
-	These data sources can be used like stdio file pointers with the
-	following convenience functions:
-	    SDL_RWseek(), SDL_RWread(), SDL_RWwrite(), SDL_RWclose()
-	These functions are defined in the new header file "SDL_rwops.h"
-
-	The endian swapping functions have been turned into macros for speed
-	and SDL_CalculateEndian() has been removed.  SDL_endian.h now defines
-	SDL_BYTEORDER as either SDL_BIG_ENDIAN or SDL_LIL_ENDIAN depending on
-	the endianness of the host system.
-
-	The endian read/write functions now take an SDL_RWops pointer
-	instead of a stdio FILE pointer, to support the new data source
-	abstraction.
-
-	The SDL_*LoadWAV() functions have been replaced with a single
-	SDL_LoadWAV_RW() function that takes a SDL_RWops pointer as it's
-	first parameter, and a flag whether or not to automatically 
-	free it as the second parameter.  SDL_LoadWAV() is a macro for
-	backward compatibility and convenience:
-	    SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...);
-
-	The SDL_*LoadBMP()/SDL_*SaveBMP() functions have each been replaced
-	with a single function that takes a SDL_RWops pointer as it's
-	first parameter, and a flag whether or not to automatically 
-	free it as the second parameter.  SDL_LoadBMP() and SDL_SaveBMP()
-	are macros for backward compatibility and convenience:
-	    SDL_LoadBMP_RW(SDL_RWFromFile("sample.bmp", "rb"), 1, ...);
-	    SDL_SaveBMP_RW(SDL_RWFromFile("sample.bmp", "wb"), 1, ...);
-	Note that these functions use SDL_RWseek() extensively, and should
-	not be used on pipes or other non-seekable data sources.
-
-0.9.10:
-	The Linux SDL_SysWMInfo and SDL_SysWMMsg structures have been 
-	extended to support multiple types of display drivers, as well as
-        safe access to the X11 display when THREADED_EVENTS is enabled.
-        The new structures are documented in the SDL_syswm.h header file.
-
-	Thanks to John Elliott <jce@seasip.demon.co.uk>, the UK keyboard
-	should now work properly, as well as the "Windows" keys on US
-	keyboards.
-
-	The Linux CD-ROM code now reads the CD-ROM devices from /etc/fstab
-	instead of trying to open each block device on the system.
-	The CD must be listed in /etc/fstab as using the iso9660 filesystem.
-
-	On Linux, if you define THREADED_EVENTS at compile time, a separate
-	thread will be spawned to gather X events asynchronously from the
-	graphics updates.  This hasn't been extensively tested, but it does
-	provide a means of handling keyboard and mouse input in a separate
-	thread from the graphics thread.  (This is now enabled by default.)
-
-	A special access function SDL_PeepEvents() allows you to manipulate
-	the event queue in a thread-safe manner, including peeking at events,
-	removing events of a specified type, and adding new events of arbitrary
-	type to the queue (use the new 'user' member of the SDL_Event type).
-
-	If you use SDL_PeepEvents() to gather events, then the main graphics
-	thread needs to call SDL_PumpEvents() periodically to drive the event
-	loop and generate input events.  This is not necessary if SDL has been 
-	compiled with THREADED_EVENTS defined, but doesn't hurt.
-
-	A new function SDL_ThreadID() returns the identifier associated with
-	the current thread.
-
-0.9.9:
-	The AUDIO_STEREO format flag has been replaced with a new 'channels'
-	member of the SDL_AudioSpec structure.  The channels are 1 for mono
-	audio, and 2 for stereo audio.  In the future more channels may be
-	supported for 3D surround sound.
-
-	The SDL_MixAudio() function now takes an additional volume parameter,
-	which should be set to SDL_MIX_MAXVOLUME for compatibility with the
-	original function.
-
-	The CD-ROM functions which take a 'cdrom' parameter can now be
-	passed NULL, and will act on the last successfully opened CD-ROM.
-
-0.9.8:
-	No changes, bugfixes only.
-	
-0.9.7:
-	No changes, bugfixes only.
-	
-0.9.6:
-	Added a fast rectangle fill function: SDL_FillRect()
-
-	Addition of a useful function for getting info on the video hardware:
-	    const SDL_VideoInfo *SDL_GetVideoInfo(void)
-        This function replaces SDL_GetDisplayFormat().
-
-	Initial support for double-buffering:
-	  Use the SDL_DOUBLEBUF flag in SDL_SetVideoMode()
-	  Update the screen with a new function: SDL_Flip()
-
-	SDL_AllocSurface() takes two new flags:
-	SDL_SRCCOLORKEY means that the surface will be used for colorkey blits
-	  and if the hardware supports hardware acceleration of colorkey blits
-	  between two surfaces in video memory, to place the surface in video
-	  memory if possible, otherwise it will be placed in system memory.
-	SDL_SRCALPHA means that the surface will be used for alpha blits and
-	  if the hardware supports hardware acceleration of alpha blits between
-	  two surfaces in video memory, to place the surface in video memory
-	  if possible, otherwise it will be placed in system memory.
-	SDL_HWSURFACE now means that the surface will be created with the 
-	  same format as the display surface, since having surfaces in video
-	  memory is only useful for fast blitting to the screen, and you can't
-	  blit surfaces with different surface formats in video memory.
-
-0.9.5:
-	You can now pass a NULL mask to SDL_WM_SetIcon(), and it will assume
-	that the icon consists of the entire image.
-
-	SDL_LowerBlit() is back -- but don't use it on the display surface.
-	It is exactly the same as SDL_MiddleBlit(), but doesn't check for
-	thread safety.
-
-	Added SDL_FPLoadBMP(), SDL_FPSaveBMP(), SDL_FPLoadWAV(), which take
-	a FILE pointer instead of a file name.
-
-	Added CD-ROM audio control API:
-	    SDL_CDNumDrives()
-	    SDL_CDName()
-	    SDL_CDOpen()
-	    SDL_CDStatus()
-	    SDL_CDPlayTracks()
-	    SDL_CDPlay()
-	    SDL_CDPause()
-	    SDL_CDResume()
-	    SDL_CDStop()
-	    SDL_CDEject()
-	    SDL_CDClose()
-
-0.9.4:
-	No changes, bugfixes only.
-
-0.9.3:
-	Mouse motion event now includes relative motion information:
-	    Sint16 event->motion.xrel, Sint16 event->motion.yrel
-
-	X11 keyrepeat handling can be disabled by defining IGNORE_X_KEYREPEAT
-	    (Add -DIGNORE_X_KEYREPEAT to CFLAGS line in obj/x11Makefile)
-
-0.9.2:
-	No changes, bugfixes only.
-
-0.9.1:
-	Removed SDL_MapSurface() and SDL_UnmapSurface() -- surfaces are now
-	automatically mapped on blit.
-
-0.8.0:
-	SDL stable release
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs.html
deleted file mode 100644
index 66ca9235ab9..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs.html
+++ /dev/null
@@ -1,629 +0,0 @@
-<HTML>
-<HEAD><TITLE>SDL Stable Release</TITLE></HEAD>
-<BODY BGCOLOR="#FFEBCD" TEXT="#000000">
-
-<IMG SRC="docs/images/rainbow.gif" ALT="[separator]" WIDTH="100%">
-<P>
-This source is stable, and is fully tested on all supported platforms.<br>
-Please send bug reports or questions to the SDL mailing list:<br>
-<a href="http://www.libsdl.org/mailing-list.php"
-        >http://www.libsdl.org/mailing-list.php</a><br>
-The latest stable release may be found on the
-	<a href="http://www.libsdl.org/">SDL website</A>.
-</P>
-
-<H2> <A HREF="docs/index.html">API Documentation</A> </H2>
-
-<IMG SRC="docs/images/rainbow.gif" ALT="[separator]" WIDTH="100%">
-
-<H2> SDL 1.2.14 Release Notes </H2>
-<P>
-SDL 1.2.14 is a significant bug fix release and a recommended update.
-</P>
-
-<H3> General Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Fixed flicker when resizing the SDL window
-</P>
-<P>
-	Fixed crash in SDL_SetGammaRamp()
-</P>
-<P>
-	Fixed freeze in SDL_memset() with 0 length when assembly code is disabled.
-</P>
-<P>
-	Added SDL_DISABLE_LOCK_KEYS environment variable to enable normal up/down events for Caps-Lock and Num-Lock keys.
-</P>
-<P>
-	Fixed audio quality problem when converting between 22050 Hz and 44100 Hz.
-</P>
-<P>
-	Fixed a threading crash when a few threads are rapidly created and complete.
-</P>
-<P>
-	Increased accuracy of alpha blending routines.
-</P>
-<P>
-	Fixed crash loading BMP files saved with the scanlines inverted.
-</P>
-<P>
-	Fixed mouse coordinate clamping if SDL_SetVideoMode() isn't called in response to SDL_VIDEORESIZE event.
-</P>
-<P>
-	Added doxygen documentation for the SDL API headers.
-</P>
-</BLOCKQUOTE>
-
-<H3> Unix Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Fixed potential memory corruption due to assembly bug with SDL_revcpy()
-</P>
-<P>
-	Fixed crashes trying to detect SSE features on x86_64 architecture.
-</P>
-<P>
-	Fixed assembly for GCC optimized 50% alpha blending blits.
-</P>
-<P>
-	Added configure option --enable-screensaver, to allow enabling the screensaver by default.
-</P>
-<P>
-	Use XResetScreenSaver() instead of disabling screensaver entirely.
-</P>
-<P>
-	Removed the maximum window size limitation on X11.
-</P>
-<P>
-	Fixed SDL_GL_SWAP_CONTROL on X11.
-</P>
-<P>
-	Fixed setting the X11 window input hint.
-</P>
-<P>
-	Fixed distorted X11 window icon for some visuals.
-</P>
-<P>
-	Fixed detecting X11 libraries for dynamic loading on 64-bit Linux.
-</P>
-<P>
-	SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) returns the correct value with GLX_SGI_swap_control.
-</P>
-<P>
-	Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for SDL_VIDEO_FULLSCREEN_HEAD on X11.
-</P>
-<P>
-	The SDL_VIDEO_FULLSCREEN_DISPLAY environment variable can be set to 0 to place fullscreen SDL windows on the first Xinerama screen.
-</P>
-<P>
-	Added the SDL_VIDEO_FBCON_ROTATION environment variable to control output orientation on the framebuffer console.
-	<BR>
-	Valid values are:
-	<UL>
-	<LI>not set   - Not rotating, no shadow.
-	<LI>"NONE"    - Not rotating, but still using shadow.
-	<LI>"CW"      - Rotating screen clockwise.
-	<LI>"UD"      - Rotating screen upside down.
-	<LI>"CCW"     - Rotating screen counter clockwise.
-	</UL>
-</P>
-<P>
-	Fixed DirectFB detection on some Linux distributions.
-</P>
-<P>
-	Added code to use the PS3 SPE processors for YUV conversion on Linux.
-</P>
-<P>
-	Updated ALSA support to the latest stable API
-</P>
-<P>
-	ALSA is now preferred over OSS audio.  (SDL_AUDIODRIVER=dsp will restore the previous behavior.)
-</P>
-<P>
-	Improved support for PulseAudio
-</P>
-<P>
-	The Network Audio System support is now dynamically loaded at runtime.
-</P>
-<P>
-	Fixed crash with the MP-8866 Dual USB Joypad on newer Linux kernels.
-</P>
-<P>
-	Fixed crash in SDL_Quit() when a joystick has been unplugged.
-</P>
-</BLOCKQUOTE>
-
-<H3> Windows Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Verified 100% compatibility with Windows 7.
-</P>
-<P>
-	Prevent loss of OpenGL context when setting the video mode in response to a window resize event.
-</P>
-<P>
-	Fixed video initialization with SDL_WINDOWID on Windows XP.
-</P>
-<P>
-	Improved mouse input responsiveness for first-person-shooter games.
-</P>
-<P>
-	IME messages are now generated for localized input.
-</P>
-<P>
-	SDL_RWFromFile() takes a UTF-8 filename when opening a file.
-</P>
-<P>
-	The SDL_STDIO_REDIRECT environment variable can be used to override whether SDL redirects stdio to stdout.txt and stderr.txt.
-</P>
-<P>
-	Fixed dynamic object loading on Windows CE.
-</P>
-</BLOCKQUOTE>
-
-<H3> Mac OS X Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	SDL now builds on Mac OS X 10.6 (Snow Leopard).
-	<BR>
-	Eric Wing posted a good rundown on the numerous changes here: <A HREF="http://playcontrol.net/ewing/jibberjabber/big_behind-the-scenes_chang.html">http://playcontrol.net/ewing/jibberjabber/big_behind-the-scenes_chang.html</A>
-</P>
-<P>
-	The X11 video driver is built by default.
-</P>
-<P>
-	Fixed SDL_VIDEO_WINDOW_POS environment variable for Quartz target.
-</P>
-<P>
-	Fixed setting the starting working directory in release builds.
-</P>
-</BLOCKQUOTE>
-
-<IMG SRC="docs/images/rainbow.gif" ALT="[separator]" WIDTH="100%">
-
-<H2> SDL 1.2.13 Release Notes </H2>
-<P>
-SDL 1.2.13 is a minor bug fix release.
-</P>
-
-<H3> General Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Fixed link error when building with Intel Compiler 10.
-</P>
-<P>
-	Removed stray C++ comment from public headers.
-</P>
-</BLOCKQUOTE>
-
-<H3> Unix Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Fixed crash in SDL_SoftStretch() on secure operating systems.
-</P>
-<P>
-	Fixed undefined symbol on X11 implementations without UTF-8 support.
-</P>
-<P>
-	Worked around BadAlloc error when using XVideo on the XFree86 Intel Integrated Graphics driver.
-</P>
-<P>
-	Scan for all joysticks on Linux instead of stopping at one that was removed.
-</P>
-<P>
-	Fixed use of sdl-config arguments in sdl.m4
-</P>
-</BLOCKQUOTE>
-
-<H3> Windows Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Fixed crash when a video driver reports higher than 32 bpp video modes.
-</P>
-<P>
-	Fixed restoring the desktop after setting a 24-bit OpenGL video mode.
-</P>
-<P>
-	Fixed window titles on Windows 95/98/ME.
-</P>
-<P>
-	Added SDL_BUTTON_X1 and SDL_BUTTON_X2 constants for extended mouse buttons.
-</P>
-<P>
-	Added support for quoted command line arguments.
-</P>
-</BLOCKQUOTE>
-
-<H3> Mac OS X Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	SDL now builds on Mac OS X 10.5 (Leopard).
-</P>
-<P>
-	Fixed high frequency crash involving text input.
-</P>
-<P>
-	Fixed beeping when the escape key is pressed and UNICODE translation is enabled.
-</P>
-<P>
-	Improved trackpad scrolling support.
-</P>
-<P>
-	Fixed joystick hat reporting for certain joysticks.
-</P>
-</BLOCKQUOTE>
-
-<IMG SRC="docs/images/rainbow.gif" ALT="[separator]" WIDTH="100%">
-
-<H2> SDL 1.2.12 Release Notes </H2>
-<P>
-SDL 1.2.12 is a minor bug fix release.
-</P>
-
-<H3> General Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Added support for the PulseAudio sound server: http://www.pulseaudio.org/
-</P>
-<P>
-	Added SDL_VIDEO_ALLOW_SCREENSAVER to override SDL's disabling of the screensaver on Mac OS X, Windows, and X11.
-</P>
-<P>
-	Fixed buffer overrun crash when resampling audio rates.
-</P>
-<P>
-	Fixed audio bug where converting to mono was doubling the volume.
-</P>
-<P>
-	Fixed off-by-one error in the C implementation of SDL_revcpy()
-</P>
-<P>
-	Fixed compiling with Sun Studio.
-</P>
-<P>
-	Support for AmigaOS has been removed from the main SDL code.
-</P>
-<P>
-	Support for Nokia 9210 "EPOC" driver has been removed from the main SDL code.
-</P>
-<P>
-	Unofficial support for the S60/SymbianOS platform has been added.
-</P>
-<P>
-	Unofficial support for the Nintendo DS platform has been added.
-</P>
-<P>
-	Reenabled MMX assembly for YUV overlay processing (GNU C Compiler only).
-</P>
-</BLOCKQUOTE>
-
-<H3> Unix Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Fixed detection of X11 DGA mouse support.
-</P>
-<P>
-	Improved XIM support for asian character sets.
-</P>
-<P>
-	The GFX_Display has been added to the X11 window information in SDL_syswm.h.
-</P>
-<P>
-	Fixed PAGE_SIZE compile error in the fbcon video driver on newer Linux kernels.
-</P>
-<P>
-	Fixed hang or crash at startup if aRts can't access the hardware.
-</P>
-<P>
-	Fixed relative mouse mode when the cursor starts outside the X11 window.
-</P>
-<P>
-	Fixed accidental free of stack memory in X11 mouse acceleration code.
-</P>
-<P>
-	Closed minor memory leak in XME code.
-</P>
-<P>
-	Fixed TEXTRELs in the library to resolve some PIC issues.
-</P>
-</BLOCKQUOTE>
-
-<H3> Windows Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	The GDI video driver makes better use of the palette in 8-bit modes.
-</P>
-<P>
-	The windib driver now supports more mouse buttons with WM_XBUTTON events.
-</P>
-<P>
-	On Windows, SDL_SetVideoMode() will re-create the window instead of failing if the multisample settings are changed.
-</P>
-<P>
-	Added support for UTF-8 window titles on Windows.
-</P>
-<P>
-	Fixed joystick detection on Windows.
-</P>
-<P>
-	Improved performance with Win32 file I/O.
-</P>
-<P>
-	Fixed HBITMAP leak in GAPI driver.
-</P>
-</BLOCKQUOTE>
-
-<H3> Mac OS X Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Added support for multi-axis controllers like 3Dconnxion's SpaceNavigator on Mac OS X.
-</P>
-<P>
-	Fixed YUV overlay crash inside Quicktime on Intel Mac OS X.
-</P>
-<P>
-	Fixed blitting alignment in Altivec alpha blit functions.
-</P>
-<P>
-	Keys F13, F14, and F15 are now usable on Apple keyboards under Mac OS X.
-</P>
-<P>
-	Fixed joystick calibration code on Mac OS X.
-</P>
-<P>
-	Fixed mouse jitter when multiple motion events are queued up in Mac OS X.
-</P>
-<P>
-	Fixed changing the cursor in fullscreen mode on Mac OS X.
-</P>
-</BLOCKQUOTE>
-
-<H3> Mac OS Classic Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Added support for gamma ramps to both toolbox and DrawSprocket video drivers.
-</P>
-</BLOCKQUOTE>
-
-<H3> BeOS Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Implemented mouse grabbing and mouse relative mode on BeOS.
-</P>
-</BLOCKQUOTE>
-
-<IMG SRC="docs/images/rainbow.gif" ALT="[separator]" WIDTH="100%">
-
-<H2> SDL 1.2.11 Release Notes </H2>
-<P>
-SDL 1.2.11 is a minor bug fix release.
-</P>
-
-<H3> Unix Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Dynamic X11 loading is only enabled with gcc 4 supporting -fvisibility=hidden.  This fixes crashes related to symbol collisions, and allows building on Solaris and IRIX.
-</P>
-<P>
-	Fixed building SDL with Xinerama disabled.
-</P>
-<P>
-	Fixed DRI OpenGL library loading, using RTLD_GLOBAL in dlopen().
-</P>
-<P>
-	Added pkgconfig configuration support.
-</P>
-</BLOCKQUOTE>
-
-<H3> Windows Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Setting SDL_GL_SWAP_CONTROL now works with Windows OpenGL.
-</P>
-<P>
-	The Win32 window positioning code works properly for windows with menus.
-</P>
-<P>
-	DirectSound audio quality has been improved on certain sound cards.
-</P>
-<P>
-	Fixed 5.1 audio channel ordering on Windows and Mac OS X.
-</P>
-<P>
-	Plugged a couple of minor memory leaks in the windib video driver.
-</P>
-<P>
-	Fixed type collision with stdint.h when building with gcc on Win32.
-</P>
-<P>
-	Fixed building with the Digital Mars Compiler on Win32.
-</P>
-</BLOCKQUOTE>
-
-<H3> Mac OS X Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	The Quartz video driver supports 32x32 cursors on Mac OS X 10.3 and above.
-</P>
-</BLOCKQUOTE>
-
-<IMG SRC="docs/images/rainbow.gif" ALT="[separator]" WIDTH="100%">
-
-<H2> SDL 1.2.10 Release Notes </H2>
-<P>
-SDL 1.2.10 is a major release, featuring a revamp of the build system and many API improvements and bug fixes.
-</P>
-<H3> API enhancements </H3>
-<UL>
-<LI>
-	If SDL_OpenAudio() is passed zero for the desired format
-	fields, the following environment variables will be used
-	to fill them in:
-<pre><code>
-		SDL_AUDIO_FREQUENCY
-		SDL_AUDIO_FORMAT
-		SDL_AUDIO_CHANNELS
-		SDL_AUDIO_SAMPLES
-</code></pre>
-	If an environment variable is not specified, it will be set
-	to a reasonable default value.
-<LI>
-	SDL_SetVideoMode() now accepts 0 for width or height and will use
-	the current video mode (or the desktop mode if no mode has been set.)
-<LI>
-	Added current_w and current_h to the SDL_VideoInfo structure,
-	which is set to the desktop resolution during video intialization,
-	and then set to the current resolution when a video mode is set.
-<LI>
-	SDL_GL_LoadLibrary() will load the system default OpenGL library
-	if it is passed NULL as a parameter.
-<LI>
-	Added SDL_GL_SWAP_CONTROL to wait for vsync in OpenGL applications.
-<LI>
-	Added SDL_GL_ACCELERATED_VISUAL to guarantee hardware acceleration.
-<LI>
-	SDL_WM_SetCaption() now officially takes UTF-8 title and icon strings, and displays international characters on supported platforms.
-<LI>
-	Added SDL_GetKeyRepeat() to query the key repeat settings.
-<LI>
-	Added the "dummy" audio driver, which can be used to emulate audio
-	output without a sound card.
-<LI>
-	Added SDL_config.h, with defaults for various build environments.
-</UL>
-
-<H3> General Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	The SDL website now has an <A HREF="http://www.libsdl.org/rss/rss.xml">RSS feed</A>!
-<P>
-	The SDL development source code is now managed with <A HREF="http://www.libsdl.org/svn.php">Subversion</A>.
-<P>
-	SDL now uses the Bugzilla <A HREF="http://bugzilla.libsdl.org/">bug tracking system</A>, hosted by icculus.org.
-<P>
-	SDL is licensed under version 2.1 of the GNU Lesser General Public License.
-<P>
-	The entire build system has been revamped to make it much more portable, including versions of C library functions to make it possible to run SDL on a minimal embedded environment.  See README.Porting in the SDL source distribution for information on how to port SDL to a new platform.
-<P>
-	SDL_opengl.h has been updated with the latest glext.h from <A HREF="http://oss.sgi.com/projects/ogl-sample/registry/">http://oss.sgi.com/projects/ogl-sample/registry/</A>
-<P>
-	Alex Volkov contributed highly optimized RGB <-> RGBA blitters.
-</BLOCKQUOTE>
-
-<H3> Unix Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	The X11 libraries are dynamically loaded at runtime by default.  This allows the distributed version of SDL to run on systems without X11 libraries installed.
-<P>
-	The XiG XME extension code is now included in the X11 video driver by default.
-<P>
-	XRandR support for video mode switching has been added to the X11 driver, but is disabled because of undesired interactions with window managers.  You can enable this by setting the environment variable SDL_VIDEO_X11_XRANDR to 1.
-<P>
-	Xinerama multi-head displays are properly handled now, and the SDL_VIDEO_FULLSCREEN_HEAD environment variable can be used to select the screen used for fullscreen video modes.  Note that changing the video modes only works on screen 0.
-<P>
-	XVidMode video modes are now sorted so they maintain the refresh rates specified in the X11 configuration file.
-<P>
-	SDL windows are no longer transparent in X11 compositing systems like XGL.
-<P>
-	The mouse is properly released by the X11 video driver if the fullscreen window loses focus.
-<P>
-	The X11 input driver now uses XIM to handle international input.
-<P>
-	The screensaver and DPMS monitor blanking are disabled while SDL games are running under the X11 and DGA video drivers.  This behavior will be formalized and selectable in SDL 1.3.
-<P>
-	Fixed a bug preventing stereo OpenGL contexts from being selected on the X11 driver.
-<P>
-	The DGA video driver now waits for pending blits involving surfaces before they are freed.  This prevents display oddities when using SDL_DisplayFormat() to convert many images.
-<P>
-	The framebuffer console video driver now has a parser for /etc/fb.modes for improved video mode handling.
-<P>
-	The framebuffer console video driver now allows asynchronous VT switching, and restores the full contents of the screen when switched back.
-<P>
-	The framebuffer console now uses CTRL-ALT-FN to switch virtual terminals, to avoid collisions with application key bindings.
-<P>
-	The framebuffer console input driver correctly sets IMPS/2 mode for wheel mice.  It also properly detects when gpm is in IMPS/2 protocol mode, or passing raw protocol from an IMPS/2 mouse.
-<P>
-	The SVGAlib video driver now has support for banked (non-linear) video modes.
-<P>
-	A video driver for OpenBSD on the Sharp Zaurus has been contributed by Staffan Ulfberg.  See the file README.wscons in the SDL source distribution for details.
-<P>
-	Many patches have been incorporated from *BSD ports.
-</BLOCKQUOTE>
-
-<H3> Windows Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	The "windib" video driver is the default now, to prevent problems with certain laptops, 64-bit Windows, and Windows Vista.  The DirectX driver is still available, and can be selected by setting the environment variable SDL_VIDEODRIVER to "directx".
-<P>
-	SDL has been ported to 64-bit Windows.
-<P>
-	Dmitry Yakimov contributed a GAPI video driver for Windows CE.
-<P>
-	The default fullscreen refresh rate has been increased to match the desktop refresh rate, when using equivalent resolutions.  A full API for querying and selecting refresh rates is planned for SDL 1.3.
-<P>
-	Dialog boxes are now shown when SDL is in windowed OpenGL mode.
-<P>
-	The SDL window is recreated when necessary to maintain OpenGL context attributes, when switching between windowed and fullscreen modes.
-<P>
-	An SDL_VIDEORESIZE event is properly sent when the SDL window is maximized and restored.
-<P>
-	Window positions are retained when switching between fullscreen and windowed modes.
-<P>
-	ToUnicode() is used, when available, for improved handling of international keyboard input.
-<P>
-	The PrtScrn is now treated normally with both key down and key up events.
-<P>
-	Pressing ALT-F4 now delivers an SDL_QUIT event to SDL applications.
-<P>
-	Joystick names are now correct for joysticks which have been unplugged and then plugged back in since booting.
-<P>
-	An MCI error when playing the last track on a CD-ROM has been fixed.
-<P>
-	OpenWatcom projects for building SDL have been provided by Marc Peter.
-</BLOCKQUOTE>
-
-<H3> Mac OS X Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	SDL now supports building Universal binaries, both through Xcode projects and when using configure/make.  See README.MacOSX in the SDL source archive for details.
-<P>
-	The X11 video driver with GLX support can be built on Mac OS X, if the X11 development SDK is installed.
-<P>
-	Transitions between fullscreen resolutions and windowed mode now use a much faster asynchronous fade to hide desktop flicker.
-<P>
-	Icons set with SDL_WM_SetIcon() now have the proper colors on Intel Macs.
-</BLOCKQUOTE>
-
-<H3> OS/2 Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Projects for building SDL on OS/2 with OpenWatcom have been contributed by Doodle.  See the file README.OS2 in the SDL source distribution for details.
-</BLOCKQUOTE>
-
-<IMG SRC="docs/images/rainbow.gif" ALT="[separator]" WIDTH="100%">
-
-</BODY>
-</HTML>
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/audio.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/audio.html
deleted file mode 100644
index 94075e2cb83..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/audio.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Audio</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Reference"
-HREF="reference.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickClose"
-HREF="sdljoystickclose.html"><LINK
-REL="NEXT"
-TITLE="SDL_AudioSpec"
-HREF="sdlaudiospec.html"><META
-NAME="KEYWORD"
-CONTENT="audio"><META
-NAME="KEYWORD"
-CONTENT="function"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoystickclose.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlaudiospec.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="AUDIO"
-></A
->Chapter 10. Audio</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="sdlaudiospec.html"
->SDL_AudioSpec</A
->&nbsp;--&nbsp;Audio Specification Structure</DT
-><DT
-><A
-HREF="sdlopenaudio.html"
->SDL_OpenAudio</A
->&nbsp;--&nbsp;Opens the audio device with the desired parameters.</DT
-><DT
-><A
-HREF="sdlpauseaudio.html"
->SDL_PauseAudio</A
->&nbsp;--&nbsp;Pauses and unpauses the audio callback processing</DT
-><DT
-><A
-HREF="sdlgetaudiostatus.html"
->SDL_GetAudioStatus</A
->&nbsp;--&nbsp;Get the current audio state</DT
-><DT
-><A
-HREF="sdlloadwav.html"
->SDL_LoadWAV</A
->&nbsp;--&nbsp;Load a WAVE file</DT
-><DT
-><A
-HREF="sdlfreewav.html"
->SDL_FreeWAV</A
->&nbsp;--&nbsp;Frees previously opened WAV data</DT
-><DT
-><A
-HREF="sdlaudiocvt.html"
->SDL_AudioCVT</A
->&nbsp;--&nbsp;Audio Conversion Structure</DT
-><DT
-><A
-HREF="sdlbuildaudiocvt.html"
->SDL_BuildAudioCVT</A
->&nbsp;--&nbsp;Initializes a SDL_AudioCVT structure for conversion</DT
-><DT
-><A
-HREF="sdlconvertaudio.html"
->SDL_ConvertAudio</A
->&nbsp;--&nbsp;Convert audio data to a desired audio format.</DT
-><DT
-><A
-HREF="sdlmixaudio.html"
->SDL_MixAudio</A
->&nbsp;--&nbsp;Mix audio data</DT
-><DT
-><A
-HREF="sdllockaudio.html"
->SDL_LockAudio</A
->&nbsp;--&nbsp;Lock out the callback function</DT
-><DT
-><A
-HREF="sdlunlockaudio.html"
->SDL_UnlockAudio</A
->&nbsp;--&nbsp;Unlock the callback function</DT
-><DT
-><A
-HREF="sdlcloseaudio.html"
->SDL_CloseAudio</A
->&nbsp;--&nbsp;Shuts down audio processing and closes the audio device.</DT
-></DL
-></DIV
-><P
->Sound on the computer is translated from waves that you hear into a series of 
-values, or samples, each representing the amplitude of the wave.  When these
-samples are sent in a stream to a sound card, an approximation of the original
-wave can be recreated.  The more bits used to represent the amplitude, and the
-greater frequency these samples are gathered, the closer the approximated
-sound is to the original, and the better the quality of sound.</P
-><P
->This library supports both 8 and 16 bit signed and unsigned sound samples,
-at frequencies ranging from 11025 Hz to 44100 Hz, depending on the 
-underlying hardware.  If the hardware doesn't support the desired audio
-format or frequency, it can be emulated if desired (See 
-<A
-HREF="sdlopenaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio()</TT
-></A
->)</P
-><P
->A commonly supported audio format is 16 bits per sample at 22050 Hz.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoystickclose.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlaudiospec.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickClose</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="reference.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_AudioSpec</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/cdrom.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/cdrom.html
deleted file mode 100644
index bdd6bfd8272..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/cdrom.html
+++ /dev/null
@@ -1,260 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->CD-ROM</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Reference"
-HREF="reference.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CloseAudio"
-HREF="sdlcloseaudio.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDNumDrives"
-HREF="sdlcdnumdrives.html"><META
-NAME="KEYWORD"
-CONTENT="cdrom"><META
-NAME="KEYWORD"
-CONTENT="function"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcloseaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdnumdrives.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="CDROM"
-></A
->Chapter 11. CD-ROM</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="sdlcdnumdrives.html"
->SDL_CDNumDrives</A
->&nbsp;--&nbsp;Returns the number of CD-ROM drives on the system.</DT
-><DT
-><A
-HREF="sdlcdname.html"
->SDL_CDName</A
->&nbsp;--&nbsp;Returns a human-readable, system-dependent identifier for the CD-ROM.</DT
-><DT
-><A
-HREF="sdlcdopen.html"
->SDL_CDOpen</A
->&nbsp;--&nbsp;Opens a CD-ROM drive for access.</DT
-><DT
-><A
-HREF="sdlcdstatus.html"
->SDL_CDStatus</A
->&nbsp;--&nbsp;Returns the current status of the given drive.</DT
-><DT
-><A
-HREF="sdlcdplay.html"
->SDL_CDPlay</A
->&nbsp;--&nbsp;Play a CD</DT
-><DT
-><A
-HREF="sdlcdplaytracks.html"
->SDL_CDPlayTracks</A
->&nbsp;--&nbsp;Play the given CD track(s)</DT
-><DT
-><A
-HREF="sdlcdpause.html"
->SDL_CDPause</A
->&nbsp;--&nbsp;Pauses a CDROM</DT
-><DT
-><A
-HREF="sdlcdresume.html"
->SDL_CDResume</A
->&nbsp;--&nbsp;Resumes a CDROM</DT
-><DT
-><A
-HREF="sdlcdstop.html"
->SDL_CDStop</A
->&nbsp;--&nbsp;Stops a CDROM</DT
-><DT
-><A
-HREF="sdlcdeject.html"
->SDL_CDEject</A
->&nbsp;--&nbsp;Ejects a CDROM</DT
-><DT
-><A
-HREF="sdlcdclose.html"
->SDL_CDClose</A
->&nbsp;--&nbsp;Closes a SDL_CD handle</DT
-><DT
-><A
-HREF="sdlcd.html"
->SDL_CD</A
->&nbsp;--&nbsp;CDROM Drive Information</DT
-><DT
-><A
-HREF="sdlcdtrack.html"
->SDL_CDtrack</A
->&nbsp;--&nbsp;CD Track Information Structure</DT
-></DL
-></DIV
-><P
->SDL supports audio control of up to 32 local CD-ROM drives at once.</P
-><P
->You use this API to perform all the basic functions of a CD player,
-including listing the tracks, playing, stopping, and ejecting the CD-ROM.
-(Currently, multi-changer CD drives are not supported.)</P
-><P
->Before you call any of the SDL CD-ROM functions, you must first call
-"<TT
-CLASS="FUNCTION"
->SDL_Init(SDL_INIT_CDROM)</TT
->", which scans the system for
-CD-ROM drives, and sets the program up for audio control.  Check the 
-return code, which should be <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->, to see if there 
-were any errors in starting up.</P
-><P
->After you have initialized the library, you can find out how many drives
-are available using the <TT
-CLASS="FUNCTION"
->SDL_CDNumDrives()</TT
-> function.  
-The first drive listed is the system default CD-ROM drive.  After you have 
-chosen a drive, and have opened it with <TT
-CLASS="FUNCTION"
->SDL_CDOpen()</TT
->, 
-you can check the status and start playing if there's a CD in the drive.</P
-><P
->A CD-ROM is organized into one or more tracks, each consisting of a certain
-number of "frames".  Each frame is ~2K in size, and at normal playing speed,
-a CD plays 75 frames per second.  SDL works with the number of frames on a
-CD, but this can easily be converted to the more familiar minutes/seconds
-format by using the <TT
-CLASS="FUNCTION"
->FRAMES_TO_MSF()</TT
-> macro.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcloseaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdnumdrives.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CloseAudio</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="reference.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDNumDrives</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/event.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/event.html
deleted file mode 100644
index f2bddb2c0ab..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/event.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Events</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Reference"
-HREF="reference.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_WM_GrabInput"
-HREF="sdlwmgrabinput.html"><LINK
-REL="NEXT"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><META
-NAME="KEYWORD"
-CONTENT="events"><META
-NAME="KEYWORD"
-CONTENT="function"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlwmgrabinput.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="EVENT"
-></A
->Chapter 8. Events</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="event.html#AEN3691"
->Introduction</A
-></DT
-><DT
-><A
-HREF="eventstructures.html"
->SDL Event Structures.</A
-></DT
-><DT
-><A
-HREF="eventfunctions.html"
->Event Functions.</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN3691"
-></A
->Introduction</H1
-><P
->Event handling allows your application to receive input from the user. Event handling is initalised (along with video) with a call to:
-<PRE
-CLASS="PROGRAMLISTING"
->SDL_Init(SDL_INIT_VIDEO);</PRE
->
-Internally, SDL stores all the events waiting to be handled in an event queue. Using functions like <A
-HREF="sdlpollevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-></A
-> and <A
-HREF="sdlpeepevents.html"
-><TT
-CLASS="FUNCTION"
->SDL_PeepEvents</TT
-></A
-> you can observe and handle waiting input events.</P
-><P
->The key to event handling in SDL is the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union. The event queue itself is composed of a series of <SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-> unions, one for each waiting event. <SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-> unions are read from the queue with the <TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-> function and it is then up to the application to process the information stored with them.</P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlwmgrabinput.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_WM_GrabInput</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="reference.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL Event Structures.</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/eventfunctions.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/eventfunctions.html
deleted file mode 100644
index f68a29a3bf1..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/eventfunctions.html
+++ /dev/null
@@ -1,481 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Event Functions.</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Events"
-HREF="event.html"><LINK
-REL="PREVIOUS"
-TITLE="SDLKey"
-HREF="sdlkey.html"><LINK
-REL="NEXT"
-TITLE="SDL_PumpEvents"
-HREF="sdlpumpevents.html"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlkey.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 8. Events</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlpumpevents.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="EVENTFUNCTIONS"
-></A
->Event Functions.</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="sdlpumpevents.html"
->SDL_PumpEvents</A
->&nbsp;--&nbsp;Pumps the event loop, gathering events from the input devices.</DT
-><DT
-><A
-HREF="sdlpeepevents.html"
->SDL_PeepEvents</A
->&nbsp;--&nbsp;Checks the event queue for messages and optionally returns them.</DT
-><DT
-><A
-HREF="sdlpollevent.html"
->SDL_PollEvent</A
->&nbsp;--&nbsp;Polls for currently pending events.</DT
-><DT
-><A
-HREF="sdlwaitevent.html"
->SDL_WaitEvent</A
->&nbsp;--&nbsp;Waits indefinitely for the next available event.</DT
-><DT
-><A
-HREF="sdlpushevent.html"
->SDL_PushEvent</A
->&nbsp;--&nbsp;Pushes an event onto the event queue</DT
-><DT
-><A
-HREF="sdlseteventfilter.html"
->SDL_SetEventFilter</A
->&nbsp;--&nbsp;Sets up a filter to process all events before they are posted 
-to the event queue.</DT
-><DT
-><A
-HREF="sdlgeteventfilter.html"
->SDL_GetEventFilter</A
->&nbsp;--&nbsp;Retrieves a pointer to he event filter</DT
-><DT
-><A
-HREF="sdleventstate.html"
->SDL_EventState</A
->&nbsp;--&nbsp;This function allows you to set the state of processing certain events.</DT
-><DT
-><A
-HREF="sdlgetkeystate.html"
->SDL_GetKeyState</A
->&nbsp;--&nbsp;Get a snapshot of the current keyboard state</DT
-><DT
-><A
-HREF="sdlgetmodstate.html"
->SDL_GetModState</A
->&nbsp;--&nbsp;Get the state of modifier keys.</DT
-><DT
-><A
-HREF="sdlsetmodstate.html"
->SDL_SetModState</A
->&nbsp;--&nbsp;Set the current key modifier state</DT
-><DT
-><A
-HREF="sdlgetkeyname.html"
->SDL_GetKeyName</A
->&nbsp;--&nbsp;Get the name of an SDL virtual keysym</DT
-><DT
-><A
-HREF="sdlenableunicode.html"
->SDL_EnableUNICODE</A
->&nbsp;--&nbsp;Enable UNICODE translation</DT
-><DT
-><A
-HREF="sdlenablekeyrepeat.html"
->SDL_EnableKeyRepeat</A
->&nbsp;--&nbsp;Set keyboard repeat rate.</DT
-><DT
-><A
-HREF="sdlgetmousestate.html"
->SDL_GetMouseState</A
->&nbsp;--&nbsp;Retrieve the current state of the mouse</DT
-><DT
-><A
-HREF="sdlgetrelativemousestate.html"
->SDL_GetRelativeMouseState</A
->&nbsp;--&nbsp;Retrieve the current state of the mouse</DT
-><DT
-><A
-HREF="sdlgetappstate.html"
->SDL_GetAppState</A
->&nbsp;--&nbsp;Get the state of the application</DT
-><DT
-><A
-HREF="sdljoystickeventstate.html"
->SDL_JoystickEventState</A
->&nbsp;--&nbsp;Enable/disable joystick event polling</DT
-></DL
-></DIV
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN5312"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlpumpevents.html"
->SDL_PumpEvents</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Pumps the event loop, gathering events from the input devices</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlpeepevents.html"
->SDL_PeepEvents</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Checks the event queue for messages and optionally returns them</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlpollevent.html"
->SDL_PollEvent</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Polls for currently pending events</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlwaitevent.html"
->SDL_WaitEvent</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Waits indefinitely for the next available event</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlpushevent.html"
->SDL_PushEvent</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Pushes an event onto the event queue</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlseteventfilter.html"
->SDL_SetEventFilter</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Sets up a filter to process all events</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdleventstate.html"
->SDL_EventState</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Allows you to set the state of processing certain events</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlgetkeystate.html"
->SDL_GetKeyState</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Get a snapshot of the current keyboard state</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlgetmodstate.html"
->SDL_GetModState</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Get the state of modifier keys</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlsetmodstate.html"
->SDL_SetModState</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Set the state of modifier keys</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlgetkeyname.html"
->SDL_GetKeyName</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Get the name of an SDL virtual keysym</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlenableunicode.html"
->SDL_EnableUNICODE</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Enable UNICODE translation</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlenablekeyrepeat.html"
->SDL_EnableKeyRepeat</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Set keyboard repeat rate</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlgetmousestate.html"
->SDL_GetMouseState</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Retrieve the current state of the mouse</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlgetrelativemousestate.html"
->SDL_GetRelativeMouseState</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Retrieve the current state of the mouse</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlgetappstate.html"
->SDL_GetAppState</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Get the state of the application</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdljoystickeventstate.html"
->SDL_JoystickEventState</A
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Enable/disable joystick event polling</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlkey.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlpumpevents.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDLKey</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="event.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_PumpEvents</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/eventstructures.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/eventstructures.html
deleted file mode 100644
index c9592962203..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/eventstructures.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL Event Structures.</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Events"
-HREF="event.html"><LINK
-REL="PREVIOUS"
-TITLE="Events"
-HREF="event.html"><LINK
-REL="NEXT"
-TITLE="SDL_Event"
-HREF="sdlevent.html"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="event.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 8. Events</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="EVENTSTRUCTURES"
-></A
->SDL Event Structures.</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="sdlevent.html"
->SDL_Event</A
->&nbsp;--&nbsp;General event structure</DT
-><DT
-><A
-HREF="sdlactiveevent.html"
->SDL_ActiveEvent</A
->&nbsp;--&nbsp;Application visibility event structure</DT
-><DT
-><A
-HREF="sdlkeyboardevent.html"
->SDL_KeyboardEvent</A
->&nbsp;--&nbsp;Keyboard event structure</DT
-><DT
-><A
-HREF="sdlmousemotionevent.html"
->SDL_MouseMotionEvent</A
->&nbsp;--&nbsp;Mouse motion event structure</DT
-><DT
-><A
-HREF="sdlmousebuttonevent.html"
->SDL_MouseButtonEvent</A
->&nbsp;--&nbsp;Mouse button event structure</DT
-><DT
-><A
-HREF="sdljoyaxisevent.html"
->SDL_JoyAxisEvent</A
->&nbsp;--&nbsp;Joystick axis motion event structure</DT
-><DT
-><A
-HREF="sdljoybuttonevent.html"
->SDL_JoyButtonEvent</A
->&nbsp;--&nbsp;Joystick button event structure</DT
-><DT
-><A
-HREF="sdljoyhatevent.html"
->SDL_JoyHatEvent</A
->&nbsp;--&nbsp;Joystick hat position change event structure</DT
-><DT
-><A
-HREF="sdljoyballevent.html"
->SDL_JoyBallEvent</A
->&nbsp;--&nbsp;Joystick trackball motion event structure</DT
-><DT
-><A
-HREF="sdlresizeevent.html"
->SDL_ResizeEvent</A
->&nbsp;--&nbsp;Window resize event structure</DT
-><DT
-><A
-HREF="sdlexposeevent.html"
->SDL_ExposeEvent</A
->&nbsp;--&nbsp;Quit requested event</DT
-><DT
-><A
-HREF="sdlsyswmevent.html"
->SDL_SysWMEvent</A
->&nbsp;--&nbsp;Platform-dependent window manager event.</DT
-><DT
-><A
-HREF="sdluserevent.html"
->SDL_UserEvent</A
->&nbsp;--&nbsp;A user-defined event type</DT
-><DT
-><A
-HREF="sdlquitevent.html"
->SDL_QuitEvent</A
->&nbsp;--&nbsp;Quit requested event</DT
-><DT
-><A
-HREF="sdlkeysym.html"
->SDL_keysym</A
->&nbsp;--&nbsp;Keysym structure</DT
-><DT
-><A
-HREF="sdlkey.html"
->SDLKey</A
->&nbsp;--&nbsp;Keysym definitions.</DT
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="event.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Events</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="event.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_Event</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/general.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/general.html
deleted file mode 100644
index 0beb5919f8b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/general.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->General</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Reference"
-HREF="reference.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL Reference"
-HREF="reference.html"><LINK
-REL="NEXT"
-TITLE="SDL_Init"
-HREF="sdlinit.html"><META
-NAME="KEYWORD"
-CONTENT="general"><META
-NAME="KEYWORD"
-CONTENT="function"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="reference.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlinit.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="GENERAL"
-></A
->Chapter 5. General</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="sdlinit.html"
->SDL_Init</A
->&nbsp;--&nbsp;Initializes SDL</DT
-><DT
-><A
-HREF="sdlinitsubsystem.html"
->SDL_InitSubSystem</A
->&nbsp;--&nbsp;Initialize subsystems</DT
-><DT
-><A
-HREF="sdlquitsubsystem.html"
->SDL_QuitSubSystem</A
->&nbsp;--&nbsp;Shut down a subsystem</DT
-><DT
-><A
-HREF="sdlquit.html"
->SDL_Quit</A
->&nbsp;--&nbsp;Shut down SDL</DT
-><DT
-><A
-HREF="sdlwasinit.html"
->SDL_WasInit</A
->&nbsp;--&nbsp;Check which subsystems are initialized</DT
-><DT
-><A
-HREF="sdlgeterror.html"
->SDL_GetError</A
->&nbsp;--&nbsp;Get SDL error string</DT
-><DT
-><A
-HREF="sdlenvvars.html"
->SDL_envvars</A
->&nbsp;--&nbsp;SDL environment variables</DT
-></DL
-></DIV
-><P
->Before SDL can be used in a program it must be initialized with <A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
->. <TT
-CLASS="FUNCTION"
->SDL_Init</TT
-> initializes all the subsystems that the user requests (video, audio, joystick, timers and/or cdrom). Once SDL is initialized with <TT
-CLASS="FUNCTION"
->SDL_Init</TT
-> subsystems can be shut down and initialized as needed using <A
-HREF="sdlinitsubsystem.html"
-><TT
-CLASS="FUNCTION"
->SDL_InitSubSystem</TT
-></A
-> and <A
-HREF="sdlquitsubsystem.html"
-><TT
-CLASS="FUNCTION"
->SDL_QuitSubSystem</TT
-></A
->.</P
-><P
->SDL must also be shut down before the program exits to make sure it cleans up correctly. Calling <A
-HREF="sdlquit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Quit</TT
-></A
-> shuts down all subsystems and frees any resources allocated to SDL.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="reference.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlinit.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL Reference</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="reference.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_Init</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guide.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guide.html
deleted file mode 100644
index 2c1297ee2bd..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guide.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL Guide</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="NEXT"
-TITLE="Preface"
-HREF="guidepreface.html"></HEAD
-><BODY
-CLASS="PART"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="index.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guidepreface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="PART"
-><A
-NAME="GUIDE"
-></A
-><DIV
-CLASS="TITLEPAGE"
-><H1
-CLASS="TITLE"
->I. SDL Guide</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="guidepreface.html"
->Preface</A
-></DT
-><DT
->1. <A
-HREF="guidethebasics.html"
->The Basics</A
-></DT
-><DT
->2. <A
-HREF="guidevideo.html"
->Graphics and Video</A
-></DT
-><DT
->3. <A
-HREF="guideinput.html"
->Input handling</A
-></DT
-><DT
->4. <A
-HREF="guideexamples.html"
->Examples</A
-></DT
-></DL
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guidepreface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL Library Documentation</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Preface</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideaboutsdldoc.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideaboutsdldoc.html
deleted file mode 100644
index cdb0d783c2b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideaboutsdldoc.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->About SDLdoc</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Preface"
-HREF="guidepreface.html"><LINK
-REL="PREVIOUS"
-TITLE="Preface"
-HREF="guidepreface.html"><LINK
-REL="NEXT"
-TITLE="Credits"
-HREF="guidecredits.html"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guidepreface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Preface</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guidecredits.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDEABOUTSDLDOC"
-></A
->About SDLdoc</H1
-><P
->SDLdoc (The SDL Documentation Project) was formed to completely rewrite the SDL documentation and to keep it continually up to date. The team consists completely of volunteers ranging from people working with SDL in their spare time to people who use SDL in their everyday working lives.</P
-><P
->The latest version of this documentation can always be found here: http://sdldoc.csn.ul.ie  Downloadable PS, man pages and html tarballs are available at http://sdldoc.csn.ul.ie/pub/</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guidepreface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guidecredits.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Preface</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guidepreface.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Credits</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideaudioexamples.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideaudioexamples.html
deleted file mode 100644
index afb7522be7d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideaudioexamples.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Audio Examples</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Examples"
-HREF="guideexamples.html"><LINK
-REL="PREVIOUS"
-TITLE="Event Examples"
-HREF="guideeventexamples.html"><LINK
-REL="NEXT"
-TITLE="CDROM Examples"
-HREF="guidecdromexamples.html"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guideeventexamples.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 4. Examples</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guidecdromexamples.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDEAUDIOEXAMPLES"
-></A
->Audio Examples</H1
-><P
-></P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN382"
-></A
->Opening the audio device</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->    SDL_AudioSpec wanted;
-    extern void fill_audio(void *udata, Uint8 *stream, int len);
-
-    /* Set the audio format */
-    wanted.freq = 22050;
-    wanted.format = AUDIO_S16;
-    wanted.channels = 2;    /* 1 = mono, 2 = stereo */
-    wanted.samples = 1024;  /* Good low-latency value for callback */
-    wanted.callback = fill_audio;
-    wanted.userdata = NULL;
-
-    /* Open the audio device, forcing the desired format */
-    if ( SDL_OpenAudio(&#38;wanted, NULL) &#60; 0 ) {
-        fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
-        return(-1);
-    }
-    return(0);</PRE
-></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN386"
-></A
->Playing audio</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->    static Uint8 *audio_chunk;
-    static Uint32 audio_len;
-    static Uint8 *audio_pos;
-
-    /* The audio function callback takes the following parameters:
-       stream:  A pointer to the audio buffer to be filled
-       len:     The length (in bytes) of the audio buffer
-    */
-    void fill_audio(void *udata, Uint8 *stream, int len)
-    {
-        /* Only play if we have data left */
-        if ( audio_len == 0 )
-            return;
-
-        /* Mix as much data as possible */
-        len = ( len &#62; audio_len ? audio_len : len );
-        SDL_MixAudio(stream, audio_pos, len, SDL_MIX_MAXVOLUME);
-        audio_pos += len;
-        audio_len -= len;
-    }
-
-    /* Load the audio data ... */
-
-    ;;;;;
-
-    audio_pos = audio_chunk;
-
-    /* Let the callback function play the audio chunk */
-    SDL_PauseAudio(0);
-
-    /* Do some processing */
-
-    ;;;;;
-
-    /* Wait for sound to complete */
-    while ( audio_len &#62; 0 ) {
-        SDL_Delay(100);         /* Sleep 1/10 second */
-    }
-    SDL_CloseAudio();</PRE
-></P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guideeventexamples.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guidecdromexamples.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Event Examples</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guideexamples.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->CDROM Examples</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidebasicsinit.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidebasicsinit.html
deleted file mode 100644
index faafdbd9204..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidebasicsinit.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Initializing SDL</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="The Basics"
-HREF="guidethebasics.html"><LINK
-REL="PREVIOUS"
-TITLE="The Basics"
-HREF="guidethebasics.html"><LINK
-REL="NEXT"
-TITLE="Graphics and Video"
-HREF="guidevideo.html"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guidethebasics.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 1. The Basics</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guidevideo.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDEBASICSINIT"
-></A
->Initializing SDL</H1
-><P
->SDL is composed of eight subsystems - Audio, CDROM, Event Handling, File I/O, Joystick Handling, Threading, Timers and Video. Before you can use any of these subsystems they must be initialized by calling <A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
-> (or <A
-HREF="sdlinitsubsystem.html"
-><TT
-CLASS="FUNCTION"
->SDL_InitSubSystem</TT
-></A
->). <TT
-CLASS="FUNCTION"
->SDL_Init</TT
-> must be called before any other SDL function. It automatically initializes the Event Handling, File I/O and Threading subsystems and it takes a parameter specifying which other subsystems to initialize. So, to initialize the default subsystems and the Video subsystems you would call:
-<PRE
-CLASS="PROGRAMLISTING"
->    SDL_Init ( SDL_INIT_VIDEO );</PRE
->
-To initialize the default subsystems, the Video subsystem and the Timers subsystem you would call:
-<PRE
-CLASS="PROGRAMLISTING"
->    SDL_Init ( SDL_INIT_VIDEO | SDL_INIT_TIMER );</PRE
-></P
-><P
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-> is complemented by <A
-HREF="sdlquit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Quit</TT
-></A
-> (and <A
-HREF="sdlquitsubsystem.html"
-><TT
-CLASS="FUNCTION"
->SDL_QuitSubSystem</TT
-></A
->). <TT
-CLASS="FUNCTION"
->SDL_Quit</TT
-> shuts down all subsystems, including the default ones. It should always be called before a SDL application exits.</P
-><P
->With <TT
-CLASS="FUNCTION"
->SDL_Init</TT
-> and <TT
-CLASS="FUNCTION"
->SDL_Quit</TT
-> firmly embedded in your programmers toolkit you can write your first and most basic SDL application. However, we must be prepare to handle errors. Many SDL functions return a value and indicates whether the function has succeeded or failed, <TT
-CLASS="FUNCTION"
->SDL_Init</TT
->, for instance, returns -1 if it could not initialize a subsystem. SDL provides a useful facility that allows you to determine exactly what the problem was, every time an error occurs within SDL an error message is stored which can be retrieved using <TT
-CLASS="FUNCTION"
->SDL_GetError</TT
->. Use this often, you can never know too much about an error.</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN60"
-></A
-><P
-><B
->Example 1-1. Initializing SDL</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->#include "SDL.h"   /* All SDL App's need this */
-#include &#60;stdio.h&#62;
-
-int main(int argc, char *argv[]) {
-    
-    printf("Initializing SDL.\n");
-    
-    /* Initialize defaults, Video and Audio */
-    if((SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO)==-1)) { 
-        printf("Could not initialize SDL: %s.\n", SDL_GetError());
-        exit(-1);
-    }
-
-    printf("SDL initialized.\n");
-
-    printf("Quiting SDL.\n");
-    
-    /* Shutdown all subsystems */
-    SDL_Quit();
-    
-    printf("Quiting....\n");
-
-    exit(0);
-}&#13;</PRE
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guidethebasics.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guidevideo.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->The Basics</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guidethebasics.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Graphics and Video</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidecdromexamples.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidecdromexamples.html
deleted file mode 100644
index 2bc5a16cb53..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidecdromexamples.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->CDROM Examples</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Examples"
-HREF="guideexamples.html"><LINK
-REL="PREVIOUS"
-TITLE="Audio Examples"
-HREF="guideaudioexamples.html"><LINK
-REL="NEXT"
-TITLE="Time Examples"
-HREF="guidetimeexamples.html"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guideaudioexamples.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 4. Examples</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guidetimeexamples.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDECDROMEXAMPLES"
-></A
->CDROM Examples</H1
-><P
-></P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN393"
-></A
->Listing CD-ROM drives</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->    #include "SDL.h"
-
-    /* Initialize SDL first */
-    if ( SDL_Init(SDL_INIT_CDROM) &#60; 0 ) {
-        fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError());
-        exit(1);
-    }
-    atexit(SDL_Quit);
-
-    /* Find out how many CD-ROM drives are connected to the system */
-    printf("Drives available: %d\n", SDL_CDNumDrives());
-    for ( i=0; i&#60;SDL_CDNumDrives(); ++i ) {
-        printf("Drive %d:  \"%s\"\n", i, SDL_CDName(i));
-    }</PRE
-></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN397"
-></A
->Opening the default drive</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->    SDL_CD *cdrom;
-    CDstatus status;
-    char *status_str;
-
-    cdrom = SDL_CDOpen(0);
-    if ( cdrom == NULL ) {
-        fprintf(stderr, "Couldn't open default CD-ROM drive: %s\n",
-                        SDL_GetError());
-        exit(2);
-    }
-
-    status = SDL_CDStatus(cdrom);
-    switch (status) {
-        case CD_TRAYEMPTY:
-            status_str = "tray empty";
-            break;
-        case CD_STOPPED:
-            status_str = "stopped";
-            break;
-        case CD_PLAYING:
-            status_str = "playing";
-            break;
-        case CD_PAUSED:
-            status_str = "paused";
-            break;
-        case CD_ERROR:
-            status_str = "error state";
-            break;
-    }
-    printf("Drive status: %s\n", status_str);
-    if ( status &#62;= CD_PLAYING ) {
-        int m, s, f;
-        FRAMES_TO_MSF(cdrom-&#62;cur_frame, &#38;m, &#38;s, &#38;f);
-        printf("Currently playing track %d, %d:%2.2d\n",
-        cdrom-&#62;track[cdrom-&#62;cur_track].id, m, s);
-    }</PRE
-></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN401"
-></A
->Listing the tracks on a CD</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->    SDL_CD *cdrom;          /* Assuming this has already been set.. */
-    int i;
-    int m, s, f;
-
-    SDL_CDStatus(cdrom);
-    printf("Drive tracks: %d\n", cdrom-&#62;numtracks);
-    for ( i=0; i&#60;cdrom-&#62;numtracks; ++i ) {
-        FRAMES_TO_MSF(cdrom-&#62;track[i].length, &#38;m, &#38;s, &#38;f);
-        if ( f &#62; 0 )
-            ++s;
-        printf("\tTrack (index %d) %d: %d:%2.2d\n", i,
-        cdrom-&#62;track[i].id, m, s);
-    }</PRE
-></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN405"
-></A
->Play an entire CD</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->    SDL_CD *cdrom;          /* Assuming this has already been set.. */
-
-    // Play entire CD:
-    if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
-        SDL_CDPlayTracks(cdrom, 0, 0, 0, 0);
-
-        // Play last track:
-        if ( CD_INDRIVE(SDL_CDStatus(cdrom)) ) {
-            SDL_CDPlayTracks(cdrom, cdrom-&#62;numtracks-1, 0, 0, 0);
-        }
-
-        // Play first and second track and 10 seconds of third track:
-        if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
-            SDL_CDPlayTracks(cdrom, 0, 0, 2, CD_FPS * 10);</PRE
-></P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guideaudioexamples.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guidetimeexamples.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Audio Examples</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guideexamples.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Time Examples</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidecredits.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidecredits.html
deleted file mode 100644
index b66b28f54db..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidecredits.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Credits</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Preface"
-HREF="guidepreface.html"><LINK
-REL="PREVIOUS"
-TITLE="About SDLdoc"
-HREF="guideaboutsdldoc.html"><LINK
-REL="NEXT"
-TITLE="The Basics"
-HREF="guidethebasics.html"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guideaboutsdldoc.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Preface</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guidethebasics.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDECREDITS"
-></A
->Credits</H1
-><P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->Sam Lantinga, slouken@libsdl.org</TD
-></TR
-><TR
-><TD
->Martin Donlon, akawaka@skynet.ie</TD
-></TR
-><TR
-><TD
->Mattias Engdeg�rd</TD
-></TR
-><TR
-><TD
->Julian Peterson</TD
-></TR
-><TR
-><TD
->Ken Jordan</TD
-></TR
-><TR
-><TD
->Maxim Sobolev</TD
-></TR
-><TR
-><TD
->Wesley Poole</TD
-></TR
-><TR
-><TD
->Michael Vance</TD
-></TR
-><TR
-><TD
->Andreas Umbach</TD
-></TR
-><TR
-><TD
->Andreas Hofmeister</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guideaboutsdldoc.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guidethebasics.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->About SDLdoc</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guidepreface.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->The Basics</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideeventexamples.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideeventexamples.html
deleted file mode 100644
index 300136947cb..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideeventexamples.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Event Examples</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Examples"
-HREF="guideexamples.html"><LINK
-REL="PREVIOUS"
-TITLE="Examples"
-HREF="guideexamples.html"><LINK
-REL="NEXT"
-TITLE="Audio Examples"
-HREF="guideaudioexamples.html"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guideexamples.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 4. Examples</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guideaudioexamples.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDEEVENTEXAMPLES"
-></A
->Event Examples</H1
-><P
-></P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN375"
-></A
->Filtering and Handling Events</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->#include &#60;stdio.h&#62;
-#include &#60;stdlib.h&#62;
-
-#include "SDL.h"
-
-/* This function may run in a separate event thread */
-int FilterEvents(const SDL_Event *event) {
-    static int boycott = 1;
-
-    /* This quit event signals the closing of the window */
-    if ( (event-&#62;type == SDL_QUIT) &#38;&#38; boycott ) {
-        printf("Quit event filtered out -- try again.\n");
-        boycott = 0;
-        return(0);
-    }
-    if ( event-&#62;type == SDL_MOUSEMOTION ) {
-        printf("Mouse moved to (%d,%d)\n",
-                event-&#62;motion.x, event-&#62;motion.y);
-        return(0);    /* Drop it, we've handled it */
-    }
-    return(1);
-}
-
-int main(int argc, char *argv[])
-{
-    SDL_Event event;
-
-    /* Initialize the SDL library (starts the event loop) */
-    if ( SDL_Init(SDL_INIT_VIDEO) &#60; 0 ) {
-        fprintf(stderr,
-                "Couldn't initialize SDL: %s\n", SDL_GetError());
-        exit(1);
-    }
-
-    /* Clean up on exit, exit on window close and interrupt */
-    atexit(SDL_Quit);
-
-    /* Ignore key events */
-    SDL_EventState(SDL_KEYDOWN, SDL_IGNORE);
-    SDL_EventState(SDL_KEYUP, SDL_IGNORE);
-
-    /* Filter quit and mouse motion events */
-    SDL_SetEventFilter(FilterEvents);
-
-    /* The mouse isn't much use unless we have a display for reference */
-    if ( SDL_SetVideoMode(640, 480, 8, 0) == NULL ) {
-        fprintf(stderr, "Couldn't set 640x480x8 video mode: %s\n",
-                        SDL_GetError());
-        exit(1);
-    }
-
-    /* Loop waiting for ESC+Mouse_Button */
-    while ( SDL_WaitEvent(&#38;event) &#62;= 0 ) {
-        switch (event.type) {
-            case SDL_ACTIVEEVENT: {
-                if ( event.active.state &#38; SDL_APPACTIVE ) {
-                    if ( event.active.gain ) {
-                        printf("App activated\n");
-                    } else {
-                        printf("App iconified\n");
-                    }
-                }
-            }
-            break;
-                    
-            case SDL_MOUSEBUTTONDOWN: {
-                Uint8 *keys;
-
-                keys = SDL_GetKeyState(NULL);
-                if ( keys[SDLK_ESCAPE] == SDL_PRESSED ) {
-                    printf("Bye bye...\n");
-                    exit(0);
-                }
-                printf("Mouse button pressed\n");
-            }
-            break;
-
-            case SDL_QUIT: {
-                printf("Quit requested, quitting.\n");
-                exit(0);
-            }
-            break;
-        }
-    }
-    /* This should never happen */
-    printf("SDL_WaitEvent error: %s\n", SDL_GetError());
-    exit(1);
-}</PRE
-></P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guideexamples.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guideaudioexamples.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Examples</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guideexamples.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Audio Examples</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideexamples.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideexamples.html
deleted file mode 100644
index 5b9a8471df8..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideexamples.html
+++ /dev/null
@@ -1,188 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Examples</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Guide"
-HREF="guide.html"><LINK
-REL="PREVIOUS"
-TITLE="Handling the Keyboard"
-HREF="guideinputkeyboard.html"><LINK
-REL="NEXT"
-TITLE="Event Examples"
-HREF="guideeventexamples.html"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guideinputkeyboard.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guideeventexamples.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="GUIDEEXAMPLES"
-></A
->Chapter 4. Examples</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="guideexamples.html#AEN369"
->Introduction</A
-></DT
-><DT
-><A
-HREF="guideeventexamples.html"
->Event Examples</A
-></DT
-><DT
-><A
-HREF="guideaudioexamples.html"
->Audio Examples</A
-></DT
-><DT
-><A
-HREF="guidecdromexamples.html"
->CDROM Examples</A
-></DT
-><DT
-><A
-HREF="guidetimeexamples.html"
->Time Examples</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN369"
-></A
->Introduction</H1
-><P
->For the moment these examples are taken directly from the old SDL documentation. By the 1.2 release these examples should hopefully deal with most common SDL programming problems.</P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guideinputkeyboard.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guideeventexamples.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Handling the Keyboard</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guide.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Event Examples</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideinput.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideinput.html
deleted file mode 100644
index 4a82b6761ab..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideinput.html
+++ /dev/null
@@ -1,739 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Input handling</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Guide"
-HREF="guide.html"><LINK
-REL="PREVIOUS"
-TITLE="Using OpenGL With SDL"
-HREF="guidevideoopengl.html"><LINK
-REL="NEXT"
-TITLE="Handling the Keyboard"
-HREF="guideinputkeyboard.html"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guidevideoopengl.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guideinputkeyboard.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="GUIDEINPUT"
-></A
->Chapter 3. Input handling</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="guideinput.html#GUIDEINPUTJOYSTICK"
->Handling Joysticks</A
-></DT
-><DT
-><A
-HREF="guideinputkeyboard.html"
->Handling the Keyboard</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDEINPUTJOYSTICK"
-></A
->Handling Joysticks</H1
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN135"
-></A
->Initialization</H2
-><P
->The first step in using a joystick in a SDL program is to initialize the Joystick subsystems of SDL. This done by passing the <TT
-CLASS="LITERAL"
->SDL_INIT_JOYSTICK</TT
-> flag to <A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
->.  The joystick flag will usually be used in conjunction with other flags (like the video flag) because the joystick is usually used to control something.</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN141"
-></A
-><P
-><B
->Example 3-1. Initializing SDL with Joystick Support</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    if (SDL_Init( SDL_INIT_VIDEO | SDL_INIT_JOYSTICK ) &#60; 0)
-    {
-        fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
-        exit(1);
-    }</PRE
-></DIV
-><P
->This will attempt to start SDL with both the video and the joystick subsystems activated.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN145"
-></A
->Querying</H2
-><P
->If we have reached this point then we can safely assume that the SDL library has been initialized and that the Joystick subsystem is active. We can now call some video and/or sound functions to get things going before we need the joystick. Eventually we have to make sure that there is actually a joystick to work with. It's wise to always check even if you know a joystick will be present on the system because it can also help detect when the joystick is unplugged. The function used to check for joysticks is <A
-HREF="sdlnumjoysticks.html"
-><TT
-CLASS="FUNCTION"
->SDL_NumJoysticks</TT
-></A
->.</P
-><P
->This function simply returns the number of joysticks available on the system. If it is at least one then we are in good shape. The next step is to determine which joystick the user wants to use. If the number of joysticks available is only one then it is safe to assume that one joystick is the one the user wants to use. SDL has a function to get the name of the joysticks as assigned by the operations system and that function is <A
-HREF="sdljoystickname.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickName</TT
-></A
->.  The joystick is specified by an index where 0 is the first joystick and the last joystick is the number returned by <TT
-CLASS="FUNCTION"
->SDL_NumJoysticks</TT
-> - 1.  In the demonstration a list of all available joysticks is printed to stdout.</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN154"
-></A
-><P
-><B
->Example 3-2. Querying the Number of Available Joysticks</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    printf("%i joysticks were found.\n\n", SDL_NumJoysticks() );
-    printf("The names of the joysticks are:\n");
-		
-    for( i=0; i &#60; SDL_NumJoysticks(); i++ ) 
-    {
-        printf("    %s\n", SDL_JoystickName(i));
-    }</PRE
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN157"
-></A
->Opening a Joystick and Receiving Joystick Events</H2
-><P
->SDL's event driven architecture makes working with joysticks a snap.  Joysticks can trigger 4 different types of events:
-<P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
-><A
-HREF="sdljoyaxisevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyAxisEvent</SPAN
-></A
-></TD
-><TD
->Occurs when an axis changes</TD
-></TR
-><TR
-><TD
-><A
-HREF="sdljoyballevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyBallEvent</SPAN
-></A
-></TD
-><TD
->Occurs when a joystick trackball's position changes</TD
-></TR
-><TR
-><TD
-><A
-HREF="sdljoyhatevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyHatEvent</SPAN
-></A
-></TD
-><TD
->Occurs when a hat's position changes</TD
-></TR
-><TR
-><TD
-><A
-HREF="sdljoybuttonevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyButtonEvent</SPAN
-></A
-></TD
-><TD
->Occurs when a button is pressed or released</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></P
-><P
->Events are received from all joysticks opened. The first thing that needs to be done in order to receive joystick events is to call <A
-HREF="sdljoystickeventstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickEventState</TT
-></A
-> with the <TT
-CLASS="LITERAL"
->SDL_ENABLE</TT
-> flag. Next you must open the joysticks that you want to receive envents from. This is done with the <A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
-> function. For the example we are only interested in events from the first joystick on the system, regardless of what it may be. To receive events from it we would do this:</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN183"
-></A
-><P
-><B
->Example 3-3. Opening a Joystick</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    SDL_Joystick *joystick;
-
-    SDL_JoystickEventState(SDL_ENABLE);
-    joystick = SDL_JoystickOpen(0);</PRE
-></DIV
-><P
->If we wanted to receive events for other joysticks we would open them with calls to <TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-> just like we opened joystick 0, except we would store the <SPAN
-CLASS="STRUCTNAME"
->SDL_Joystick</SPAN
-> structure they return in a different pointer.  We only need the joystick pointer when we are querying the joysticks or when we are closing the joystick.</P
-><P
->Up to this point all the code we have is used just to initialize the joysticks in order to read values at run time. All we need now is an event loop, which is something that all SDL programs should have anyway to receive the systems quit events. We must now add code to check the event loop for at least some of the above mentioned events. Let's assume our event loop looks like this:
-<PRE
-CLASS="PROGRAMLISTING"
->    SDL_Event event;
-    /* Other initializtion code goes here */   
-
-    /* Start main game loop here */
-
-    while(SDL_PollEvent(&#38;event))
-    {  
-        switch(event.type)
-        {  
-            case SDL_KEYDOWN:
-            /* handle keyboard stuff here */				
-            break;
-
-            case SDL_QUIT:
-            /* Set whatever flags are necessary to */
-            /* end the main game loop here */
-            break;
-        }
-    }
-
-    /* End loop here */</PRE
->
-To handle Joystick events we merely add cases for them, first we'll add axis handling code. Axis checks can get kinda of tricky because alot of the joystick events received are junk. Joystick axis have a tendency to vary just a little between polling due to the way they are designed. To compensate for this you have to set a threshold for changes and ignore the events that have'nt exceeded the threshold. 10% is usually a good threshold value.  This sounds a lot more complicated than it is. Here is the Axis event handler:</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN191"
-></A
-><P
-><B
->Example 3-4. Joystick Axis Events</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    case SDL_JOYAXISMOTION:  /* Handle Joystick Motion */
-    if ( ( event.jaxis.value &#60; -3200 ) || (event.jaxis.value &#62; 3200 ) ) 
-    {
-      /* code goes here */
-    }
-    break;</PRE
-></DIV
-><P
->Another trick with axis events is that up-down and left-right movement are two different sets of axes. The most important axis is axis 0 (left-right) and axis 1 (up-down).  To handle them seperatly in the code we do the following:</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN195"
-></A
-><P
-><B
->Example 3-5. More Joystick Axis Events</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    case SDL_JOYAXISMOTION:  /* Handle Joystick Motion */
-    if ( ( event.jaxis.value &#60; -3200 ) || (event.jaxis.value &#62; 3200 ) ) 
-    {
-        if( event.jaxis.axis == 0) 
-        {
-            /* Left-right movement code goes here */
-        }
-
-        if( event.jaxis.axis == 1) 
-        {
-            /* Up-Down movement code goes here */
-        }
-    }
-    break;</PRE
-></DIV
-><P
->Ideally the code here should use <TT
-CLASS="STRUCTFIELD"
-><I
->event.jaxis.value</I
-></TT
-> to scale something. For example lets assume you are using the joystick to control the movement of a spaceship. If the user is using an analog joystick and they push the stick a little bit they expect to move less than if they pushed it a lot. Designing your code for this situation is preferred because it makes the experience for users of analog controls better and remains the same for users of digital controls.</P
-><P
->If your joystick has any additional axis then they may be used for other sticks or throttle controls and those axis return values too just with different <TT
-CLASS="STRUCTFIELD"
-><I
->event.jaxis.axis</I
-></TT
-> values.</P
-><P
->Button handling is simple compared to the axis checking.</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN203"
-></A
-><P
-><B
->Example 3-6. Joystick Button Events</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    case SDL_JOYBUTTONDOWN:  /* Handle Joystick Button Presses */
-    if ( event.jbutton.button == 0 ) 
-    {
-        /* code goes here */
-    }
-    break;</PRE
-></DIV
-><P
->Button checks are simpler than axis checks because a button can only be pressed or not pressed.  The <TT
-CLASS="LITERAL"
->SDL_JOYBUTTONDOWN</TT
-> event is triggered when a button is pressed and the <TT
-CLASS="LITERAL"
->SDL_JOYBUTTONUP</TT
-> event is fired when a button is released. We do have to know what button was pressed though, that is done by reading the <TT
-CLASS="STRUCTFIELD"
-><I
->event.jbutton.button</I
-></TT
-> field.</P
-><P
->Lastly when we are through using our joysticks we should close them with a call to <A
-HREF="sdljoystickclose.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickClose</TT
-></A
->. To close our opened joystick 0 we would do this at the end of our program:
-<PRE
-CLASS="PROGRAMLISTING"
->    SDL_JoystickClose(joystick);</PRE
-></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN214"
-></A
->Advanced Joystick Functions</H2
-><P
->That takes care of the controls that you can count on being on every joystick under the sun, but there are a few extra things that SDL can support.  Joyballs are next on our list, they are alot like axis with a few minor differences.  Joyballs store relative changes unlike the the absolute postion stored in a axis event. Also one trackball event contains both the change in x and they change in y.  Our case for it is as follows:</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN217"
-></A
-><P
-><B
->Example 3-7. Joystick Ball Events</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    case SDL_JOYBALLMOTION:  /* Handle Joyball Motion */
-    if( event.jball.ball == 0 )
-    {
-      /* ball handling */
-    }
-    break;</PRE
-></DIV
-><P
->The above checks the first joyball on the joystick. The change in position will be stored in <TT
-CLASS="STRUCTFIELD"
-><I
->event.jball.xrel</I
-></TT
-> and <TT
-CLASS="STRUCTFIELD"
-><I
->event.jball.yrel</I
-></TT
->.</P
-><P
->Finally we have the hat event. Hats report only the direction they are pushed in. We check hat's position with the bitmasks:
-
-<P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_CENTERED</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_UP</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_RIGHT</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_DOWN</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_LEFT</TT
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
->
-
-Also there are some predefined combinations of the above:
-<P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_RIGHTUP</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_RIGHTDOWN</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_LEFTUP</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_LEFTDOWN</TT
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
->
-
-Our case for the hat may resemble the following:</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN244"
-></A
-><P
-><B
->Example 3-8. Joystick Hat Events</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    case SDL_JOYHATMOTION:  /* Handle Hat Motion */
-    if ( event.jhat.value &#38; SDL_HAT_UP )
-    {
-        /* Do up stuff here */
-    }
-
-    if ( event.jhat.value &#38; SDL_HAT_LEFT )
-    {
-        /* Do left stuff here */
-    }
-
-    if ( event.jhat.value &#38; SDL_HAT_RIGHTDOWN )
-    {
-        /* Do right and down together stuff here */
-    }
-    break;</PRE
-></DIV
-><P
->In addition to the queries for number of joysticks on the system and their names there are additional functions to query the capabilities of attached joysticks:
-<P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
-><A
-HREF="sdljoysticknumaxes.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickNumAxes</TT
-></A
-></TD
-><TD
->Returns the number of joysitck axes</TD
-></TR
-><TR
-><TD
-><A
-HREF="sdljoysticknumbuttons.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickNumButtons</TT
-></A
-></TD
-><TD
->Returns the number of joysitck buttons</TD
-></TR
-><TR
-><TD
-><A
-HREF="sdljoysticknumballs.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickNumBalls</TT
-></A
-></TD
-><TD
->Returns the number of joysitck balls</TD
-></TR
-><TR
-><TD
-><A
-HREF="sdljoysticknumhats.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickNumHats</TT
-></A
-></TD
-><TD
->Returns the number of joysitck hats</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
->
-
-To use these functions we just have to pass in the joystick structure we got when we opened the joystick. For Example:</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN265"
-></A
-><P
-><B
->Example 3-9. Querying Joystick Characteristics</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    int number_of_buttons;
-    SDL_Joystick *joystick;
-
-    joystick = SDL_JoystickOpen(0);
-    number_of_buttons = SDL_JoystickNumButtons(joystick);</PRE
-></DIV
-><P
->This block of code would get the number of buttons on the first joystick in the system.	</P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guidevideoopengl.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guideinputkeyboard.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Using OpenGL With SDL</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guide.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Handling the Keyboard</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideinputkeyboard.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideinputkeyboard.html
deleted file mode 100644
index 787036c7f2a..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guideinputkeyboard.html
+++ /dev/null
@@ -1,746 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Handling the Keyboard</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Input handling"
-HREF="guideinput.html"><LINK
-REL="PREVIOUS"
-TITLE="Input handling"
-HREF="guideinput.html"><LINK
-REL="NEXT"
-TITLE="Examples"
-HREF="guideexamples.html"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guideinput.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 3. Input handling</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guideexamples.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDEINPUTKEYBOARD"
-></A
->Handling the Keyboard</H1
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN271"
-></A
->Keyboard Related Structures</H2
-><P
->It should make it a lot easier to understand this tutorial is you are familiar with the data types involved in keyboard access, so I'll explain them first.</P
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN274"
-></A
->SDLKey</H3
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDLKey</SPAN
-> is an enumerated type defined in SDL/include/SDL_keysym.h and detailed <A
-HREF="sdlkey.html"
->here</A
->. Each <SPAN
-CLASS="STRUCTNAME"
->SDLKey</SPAN
-> symbol represents a key, <TT
-CLASS="LITERAL"
->SDLK_a</TT
-> corresponds to the 'a' key on a keyboard, <TT
-CLASS="LITERAL"
->SDLK_SPACE</TT
-> corresponds to the space bar, and so on.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN282"
-></A
->SDLMod</H3
-><P
->SDLMod is an enumerated type, similar to <SPAN
-CLASS="STRUCTNAME"
->SDLKey</SPAN
->, however it enumerates keyboard modifiers (Control, Alt, Shift). The full list of modifier symbols is <A
-HREF="sdlkey.html#SDLMOD"
->here</A
->. <SPAN
-CLASS="STRUCTNAME"
->SDLMod</SPAN
-> values can be AND'd together to represent several modifiers.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN288"
-></A
->SDL_keysym</H3
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 scancode;
-  SDLKey sym;
-  SDLMod mod;
-  Uint16 unicode;
-} SDL_keysym;</PRE
-><P
->The <SPAN
-CLASS="STRUCTNAME"
->SDL_keysym</SPAN
-> structure describes a key press or a key release. The <TT
-CLASS="STRUCTFIELD"
-><I
->scancode</I
-></TT
-> field is hardware specific and should be ignored unless you know what your doing. The <TT
-CLASS="STRUCTFIELD"
-><I
->sym</I
-></TT
-> field is the <SPAN
-CLASS="STRUCTNAME"
->SDLKey</SPAN
-> value of the key being pressed or released. The <TT
-CLASS="STRUCTFIELD"
-><I
->mod</I
-></TT
-> field describes the state of the keyboard modifiers at the time the key press or release occurred. So a value of <TT
-CLASS="LITERAL"
->KMOD_NUM | KMOD_CAPS | KMOD_LSHIFT</TT
-> would mean that Numlock, Capslock and the left shift key were all press (or enabled in the case of the lock keys). Finally, the <TT
-CLASS="STRUCTFIELD"
-><I
->unicode</I
-></TT
-> field stores the 16-bit unicode value of the key.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->It should be noted and understood that this field is only valid when the <SPAN
-CLASS="STRUCTNAME"
->SDL_keysym</SPAN
-> is describing a key press, not a key release. Unicode values only make sense on a key press because the unicode value describes an international character and only key presses produce characters. More information on Unicode can be found at <A
-HREF="http://www.unicode.org"
-TARGET="_top"
->www.unicode.org</A
-></P
-></BLOCKQUOTE
-></DIV
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Unicode translation must be enabled using the <A
-HREF="sdlenableunicode.html"
-><TT
-CLASS="FUNCTION"
->SDL_EnableUNICODE</TT
-></A
-> function.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN307"
-></A
->SDL_KeyboardEvent</H3
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type;
-  Uint8 state;
-  SDL_keysym keysym;
-} SDL_KeyboardEvent;</PRE
-><P
->The <SPAN
-CLASS="STRUCTNAME"
->SDL_KeyboardEvent</SPAN
-> describes a keyboard event (obviously). The <TT
-CLASS="STRUCTFIELD"
-><I
->key</I
-></TT
-> member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union is a <SPAN
-CLASS="STRUCTNAME"
->SDL_KeyboardEvent</SPAN
-> structure. The <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-> field specifies whether the event is a key release (<TT
-CLASS="LITERAL"
->SDL_KEYUP</TT
->) or a key press (<TT
-CLASS="LITERAL"
->SDL_KEYDOWN</TT
->) event. The <TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
-> is largely redundant, it reports the same information as the <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-> field but uses different values (<TT
-CLASS="LITERAL"
->SDL_RELEASED</TT
-> and <TT
-CLASS="LITERAL"
->SDL_PRESSED</TT
->). The <TT
-CLASS="STRUCTFIELD"
-><I
->keysym</I
-></TT
-> contains information of the key press or release that this event represents (see above).</P
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN324"
-></A
->Reading Keyboard Events</H2
-><P
->Reading keybaord events from the event queue is quite simple (the event queue and using it is described <A
-HREF="sdlevent.html"
->here</A
->). We read events using <A
-HREF="sdlpollevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-></A
-> in a <TT
-CLASS="LITERAL"
->while()</TT
-> loop and check for <TT
-CLASS="LITERAL"
->SDL_KEYUP</TT
-> and <TT
-CLASS="LITERAL"
->SDL_KEYDOWN</TT
-> events using a <TT
-CLASS="LITERAL"
->switch</TT
-> statement, like so:</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN334"
-></A
-><P
-><B
->Example 3-10. Reading Keyboard Events</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->  SDL_Event event;
-  .
-  .
-  /* Poll for events. SDL_PollEvent() returns 0 when there are no  */
-  /* more events on the event queue, our while loop will exit when */
-  /* that occurs.                                                  */
-  while( SDL_PollEvent( &#38;event ) ){
-    /* We are only worried about SDL_KEYDOWN and SDL_KEYUP events */
-    switch( event.type ){
-      case SDL_KEYDOWN:
-        printf( "Key press detected\n" );
-        break;
-
-      case SDL_KEYUP:
-        printf( "Key release detected\n" );
-        break;
-
-      default:
-        break;
-    }
-  }
-  .
-  .</PRE
-></DIV
-><P
->This is a very basic example. No information about the key press or release is interpreted. We will explore the other extreme out our first full example below - reporting all available information about a keyboard event.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN338"
-></A
->A More Detailed Look</H2
-><P
->Before we can read events SDL must be initialised with <A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
-> and a video mode must be set using <A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->. There are, however, two other functions we must use to obtain all the information required. We must enable unicode translation by calling <TT
-CLASS="FUNCTION"
->SDL_EnableUNICODE(1)</TT
-> and we must convert <SPAN
-CLASS="STRUCTNAME"
->SDLKey</SPAN
-> values into something printable, using <A
-HREF="sdlgetkeyname.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetKeyName</TT
-></A
-></P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->It is useful to note that unicode values &#60; 0x80 translate directly a characters ASCII value. THis is used in the example below</P
-></BLOCKQUOTE
-></DIV
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN351"
-></A
-><P
-><B
->Example 3-11. Interpreting Key Event Information</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->&#13;    #include "SDL.h"
-
-    /* Function Prototypes */
-    void PrintKeyInfo( SDL_KeyboardEvent *key );
-    void PrintModifiers( SDLMod mod );
-
-    /* main */
-    int main( int argc, char *argv[] ){
-        
-        SDL_Event event;
-        int quit = 0;
-        
-        /* Initialise SDL */
-        if( SDL_Init( SDL_INIT_VIDEO ) &#60; 0){
-            fprintf( stderr, "Could not initialise SDL: %s\n", SDL_GetError() );
-            exit( -1 );
-        }
-
-        /* Set a video mode */
-        if( !SDL_SetVideoMode( 320, 200, 0, 0 ) ){
-            fprintf( stderr, "Could not set video mode: %s\n", SDL_GetError() );
-            SDL_Quit();
-            exit( -1 );
-        }
-
-        /* Enable Unicode translation */
-        SDL_EnableUNICODE( 1 );
-
-        /* Loop until an SDL_QUIT event is found */
-        while( !quit ){
-
-            /* Poll for events */
-            while( SDL_PollEvent( &#38;event ) ){
-                
-                switch( event.type ){
-                    /* Keyboard event */
-                    /* Pass the event data onto PrintKeyInfo() */
-                    case SDL_KEYDOWN:
-                    case SDL_KEYUP:
-                        PrintKeyInfo( &#38;event.key );
-                        break;
-
-                    /* SDL_QUIT event (window close) */
-                    case SDL_QUIT:
-                        quit = 1;
-                        break;
-
-                    default:
-                        break;
-                }
-
-            }
-
-        }
-
-        /* Clean up */
-        SDL_Quit();
-        exit( 0 );
-    }
-
-    /* Print all information about a key event */
-    void PrintKeyInfo( SDL_KeyboardEvent *key ){
-        /* Is it a release or a press? */
-        if( key-&#62;type == SDL_KEYUP )
-            printf( "Release:- " );
-        else
-            printf( "Press:- " );
-
-        /* Print the hardware scancode first */
-        printf( "Scancode: 0x%02X", key-&#62;keysym.scancode );
-        /* Print the name of the key */
-        printf( ", Name: %s", SDL_GetKeyName( key-&#62;keysym.sym ) );
-        /* We want to print the unicode info, but we need to make */
-        /* sure its a press event first (remember, release events */
-        /* don't have unicode info                                */
-        if( key-&#62;type == SDL_KEYDOWN ){
-            /* If the Unicode value is less than 0x80 then the    */
-            /* unicode value can be used to get a printable       */
-            /* representation of the key, using (char)unicode.    */
-            printf(", Unicode: " );
-            if( key-&#62;keysym.unicode &#60; 0x80 &#38;&#38; key-&#62;keysym.unicode &#62; 0 ){
-                printf( "%c (0x%04X)", (char)key-&#62;keysym.unicode,
-                        key-&#62;keysym.unicode );
-            }
-            else{
-                printf( "? (0x%04X)", key-&#62;keysym.unicode );
-            }
-        }
-        printf( "\n" );
-        /* Print modifier info */
-        PrintModifiers( key-&#62;keysym.mod );
-    }
-
-    /* Print modifier info */
-    void PrintModifiers( SDLMod mod ){
-        printf( "Modifers: " );
-
-        /* If there are none then say so and return */
-        if( mod == KMOD_NONE ){
-            printf( "None\n" );
-            return;
-        }
-
-        /* Check for the presence of each SDLMod value */
-        /* This looks messy, but there really isn't    */
-        /* a clearer way.                              */
-        if( mod &#38; KMOD_NUM ) printf( "NUMLOCK " );
-        if( mod &#38; KMOD_CAPS ) printf( "CAPSLOCK " );
-        if( mod &#38; KMOD_LCTRL ) printf( "LCTRL " );
-        if( mod &#38; KMOD_RCTRL ) printf( "RCTRL " );
-        if( mod &#38; KMOD_RSHIFT ) printf( "RSHIFT " );
-        if( mod &#38; KMOD_LSHIFT ) printf( "LSHIFT " );
-        if( mod &#38; KMOD_RALT ) printf( "RALT " );
-        if( mod &#38; KMOD_LALT ) printf( "LALT " );
-        if( mod &#38; KMOD_CTRL ) printf( "CTRL " );
-        if( mod &#38; KMOD_SHIFT ) printf( "SHIFT " );
-        if( mod &#38; KMOD_ALT ) printf( "ALT " );
-        printf( "\n" );
-    }</PRE
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN354"
-></A
->Game-type Input</H2
-><P
->I have found that people using keyboard events for games and other interactive applications don't always understand one fundemental point.</P
-><A
-NAME="AEN357"
-></A
-><BLOCKQUOTE
-CLASS="BLOCKQUOTE"
-><P
->Keyboard events <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->only</I
-></SPAN
-> take place when a keys state changes from being unpressed to pressed, and vice versa.</P
-></BLOCKQUOTE
-><P
->Imagine you have an image of an alien that you wish to move around using the cursor keys: when you pressed the left arrow key you want him to slide over to the left, and when you press the down key you want him to slide down the screen. Examine the following code; it highlights an error that many people have made.
-<PRE
-CLASS="PROGRAMLISTING"
->    /* Alien screen coordinates */
-    int alien_x=0, alien_y=0;
-    .
-    .
-    /* Initialise SDL and video modes and all that */
-    .
-    /* Main game loop */
-    /* Check for events */
-    while( SDL_PollEvent( &#38;event ) ){
-        switch( event.type ){
-            /* Look for a keypress */
-            case SDL_KEYDOWN:
-                /* Check the SDLKey values and move change the coords */
-                switch( event.key.keysym.sym ){
-                    case SDLK_LEFT:
-                        alien_x -= 1;
-                        break;
-                    case SDLK_RIGHT:
-                        alien_x += 1;
-                        break;
-                    case SDLK_UP:
-                        alien_y -= 1;
-                        break;
-                    case SDLK_DOWN:
-                        alien_y += 1;
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-    }
-    .
-    .</PRE
->
-At first glance you may think this is a perfectly reasonable piece of code for the task, but it isn't. Like I said keyboard events only occur when a key changes state, so the user would have to press and release the left cursor key 100 times to move the alien 100 pixels to the left.</P
-><P
->To get around this problem we must not use the events to change the position of the alien, we use the events to set flags which are then used in a seperate section of code to move the alien. Something like this:</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN363"
-></A
-><P
-><B
->Example 3-12. Proper Game Movement</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    /* Alien screen coordinates */
-    int alien_x=0, alien_y=0;
-    int alien_xvel=0, alien_yvel=0;
-    .
-    .
-    /* Initialise SDL and video modes and all that */
-    .
-    /* Main game loop */
-    /* Check for events */
-    while( SDL_PollEvent( &#38;event ) ){
-        switch( event.type ){
-            /* Look for a keypress */
-            case SDL_KEYDOWN:
-                /* Check the SDLKey values and move change the coords */
-                switch( event.key.keysym.sym ){
-                    case SDLK_LEFT:
-                        alien_xvel = -1;
-                        break;
-                    case SDLK_RIGHT:
-                        alien_xvel =  1;
-                        break;
-                    case SDLK_UP:
-                        alien_yvel = -1;
-                        break;
-                    case SDLK_DOWN:
-                        alien_yvel =  1;
-                        break;
-                    default:
-                        break;
-                }
-                break;
-            /* We must also use the SDL_KEYUP events to zero the x */
-            /* and y velocity variables. But we must also be       */
-            /* careful not to zero the velocities when we shouldn't*/
-            case SDL_KEYUP:
-                switch( event.key.keysym.sym ){
-                    case SDLK_LEFT:
-                        /* We check to make sure the alien is moving */
-                        /* to the left. If it is then we zero the    */
-                        /* velocity. If the alien is moving to the   */
-                        /* right then the right key is still press   */
-                        /* so we don't tocuh the velocity            */
-                        if( alien_xvel &#60; 0 )
-                            alien_xvel = 0;
-                        break;
-                    case SDLK_RIGHT:
-                        if( alien_xvel &#62; 0 )
-                            alien_xvel = 0;
-                        break;
-                    case SDLK_UP:
-                        if( alien_yvel &#60; 0 )
-                            alien_yvel = 0;
-                        break;
-                    case SDLK_DOWN:
-                        if( alien_yvel &#62; 0 )
-                            alien_yvel = 0;
-                        break;
-                    default:
-                        break;
-                }
-                break;
-            
-            default:
-                break;
-        }
-    }
-    .
-    .
-    /* Update the alien position */
-    alien_x += alien_xvel;
-    alien_y += alien_yvel;</PRE
-></DIV
-><P
->As can be seen, we use two extra variables, alien_xvel and alien_yvel, which represent the motion of the ship, it is these variables that we update when we detect keypresses and releases.</P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guideinput.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guideexamples.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Input handling</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guideinput.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Examples</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidepreface.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidepreface.html
deleted file mode 100644
index 9986fc6b753..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidepreface.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Preface</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Guide"
-HREF="guide.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL Guide"
-HREF="guide.html"><LINK
-REL="NEXT"
-TITLE="About SDLdoc"
-HREF="guideaboutsdldoc.html"></HEAD
-><BODY
-CLASS="PREFACE"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guide.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guideaboutsdldoc.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="PREFACE"
-><H1
-><A
-NAME="GUIDEPREFACE"
-></A
->Preface</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="guidepreface.html#GUIDEABOUTSDL"
->About SDL</A
-></DT
-><DT
-><A
-HREF="guideaboutsdldoc.html"
->About SDLdoc</A
-></DT
-><DT
-><A
-HREF="guidecredits.html"
->Credits</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDEABOUTSDL"
-></A
->About SDL</H1
-><P
->The SDL library is designed to make it easy to write games that run on Linux, *BSD, MacOS, Win32 and BeOS using the various native high-performance media interfaces, (for video, audio, etc) and presenting a single source-code level API to your application. SDL is a fairly low level API, but using it, completely portable applications can be written with a great deal of flexibility.</P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guide.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guideaboutsdldoc.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL Guide</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guide.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->About SDLdoc</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidethebasics.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidethebasics.html
deleted file mode 100644
index 4f32363f38a..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidethebasics.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->The Basics</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Guide"
-HREF="guide.html"><LINK
-REL="PREVIOUS"
-TITLE="Credits"
-HREF="guidecredits.html"><LINK
-REL="NEXT"
-TITLE="Initializing SDL"
-HREF="guidebasicsinit.html"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guidecredits.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guidebasicsinit.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="GUIDETHEBASICS"
-></A
->Chapter 1. The Basics</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="guidethebasics.html#GUIDEINTRODUCTION"
->Introduction</A
-></DT
-><DT
-><A
-HREF="guidebasicsinit.html"
->Initializing SDL</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDEINTRODUCTION"
-></A
->Introduction</H1
-><P
->The SDL Guide section is pretty incomplete. If you feel you have anything to add mail akawaka@skynet.ie or visit http://akawaka.csn.ul.ie/tne/.</P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guidecredits.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guidebasicsinit.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Credits</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guide.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Initializing SDL</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidetimeexamples.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidetimeexamples.html
deleted file mode 100644
index 42b5019ebf0..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidetimeexamples.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Time Examples</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Examples"
-HREF="guideexamples.html"><LINK
-REL="PREVIOUS"
-TITLE="CDROM Examples"
-HREF="guidecdromexamples.html"><LINK
-REL="NEXT"
-TITLE="SDL Reference"
-HREF="reference.html"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guidecdromexamples.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 4. Examples</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="reference.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDETIMEEXAMPLES"
-></A
->Time Examples</H1
-><P
-></P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN412"
-></A
->Time based game loop</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->#define TICK_INTERVAL    30
-
-static Uint32 next_time;
-
-Uint32 time_left(void)
-{
-    Uint32 now;
-
-    now = SDL_GetTicks();
-    if(next_time &#60;= now)
-        return 0;
-    else
-        return next_time - now;
-}
-
-
-/* main game loop */
-
-    next_time = SDL_GetTicks() + TICK_INTERVAL;
-    while ( game_running ) {
-        update_game_state();
-        SDL_Delay(time_left());
-        next_time += TICK_INTERVAL;
-    }&#13;</PRE
-></P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guidecdromexamples.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="reference.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->CDROM Examples</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guideexamples.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL Reference</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidevideo.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidevideo.html
deleted file mode 100644
index 85da77d1fd1..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidevideo.html
+++ /dev/null
@@ -1,463 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Graphics and Video</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Guide"
-HREF="guide.html"><LINK
-REL="PREVIOUS"
-TITLE="Initializing SDL"
-HREF="guidebasicsinit.html"><LINK
-REL="NEXT"
-TITLE="Using OpenGL With SDL"
-HREF="guidevideoopengl.html"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guidebasicsinit.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guidevideoopengl.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="GUIDEVIDEO"
-></A
->Chapter 2. Graphics and Video</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="guidevideo.html#GUIDEVIDEOINTRO"
->Introduction to SDL Video</A
-></DT
-><DT
-><A
-HREF="guidevideoopengl.html"
->Using OpenGL With SDL</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDEVIDEOINTRO"
-></A
->Introduction to SDL Video</H1
-><P
->Video is probably the most common thing that SDL is used for, and
-so it has the most complete subsystem. Here are a few
-examples to demonstrate the basics.</P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN68"
-></A
->Initializing the Video Display</H2
-><P
->This is what almost all SDL programs have to do in one way or
-another.</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN71"
-></A
-><P
-><B
->Example 2-1. Initializing the Video Display</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    SDL_Surface *screen;
-
-    /* Initialize the SDL library */
-    if( SDL_Init(SDL_INIT_VIDEO) &#60; 0 ) {
-        fprintf(stderr,
-                "Couldn't initialize SDL: %s\n", SDL_GetError());
-        exit(1);
-    }
-
-    /* Clean up on exit */
-    atexit(SDL_Quit);
-    
-    /*
-     * Initialize the display in a 640x480 8-bit palettized mode,
-     * requesting a software surface
-     */
-    screen = SDL_SetVideoMode(640, 480, 8, SDL_SWSURFACE);
-    if ( screen == NULL ) {
-        fprintf(stderr, "Couldn't set 640x480x8 video mode: %s\n",
-                        SDL_GetError());
-        exit(1);
-    }</PRE
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN74"
-></A
->Initializing the Best Video Mode</H2
-><P
->If you have a preference for a certain pixel depth but will accept any
-other, use SDL_SetVideoMode with SDL_ANYFORMAT as below. You can also
-use SDL_VideoModeOK() to find the native video mode that is closest to
-the mode you request.</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN77"
-></A
-><P
-><B
->Example 2-2. Initializing the Best Video Mode</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    /* Have a preference for 8-bit, but accept any depth */
-    screen = SDL_SetVideoMode(640, 480, 8, SDL_SWSURFACE|SDL_ANYFORMAT);
-    if ( screen == NULL ) {
-        fprintf(stderr, "Couldn't set 640x480x8 video mode: %s\n",
-                        SDL_GetError());
-        exit(1);
-    }
-    printf("Set 640x480 at %d bits-per-pixel mode\n",
-           screen-&#62;format-&#62;BitsPerPixel);</PRE
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN80"
-></A
->Loading and Displaying a BMP File</H2
-><P
->The following function loads and displays a BMP file given as
-argument, once SDL is initialised and a video mode has been set.</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN83"
-></A
-><P
-><B
->Example 2-3. Loading and Displaying a BMP File</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->void display_bmp(char *file_name)
-{
-    SDL_Surface *image;
-
-    /* Load the BMP file into a surface */
-    image = SDL_LoadBMP(file_name);
-    if (image == NULL) {
-        fprintf(stderr, "Couldn't load %s: %s\n", file_name, SDL_GetError());
-        return;
-    }
-
-    /*
-     * Palettized screen modes will have a default palette (a standard
-     * 8*8*4 colour cube), but if the image is palettized as well we can
-     * use that palette for a nicer colour matching
-     */
-    if (image-&#62;format-&#62;palette &#38;&#38; screen-&#62;format-&#62;palette) {
-    SDL_SetColors(screen, image-&#62;format-&#62;palette-&#62;colors, 0,
-                  image-&#62;format-&#62;palette-&#62;ncolors);
-    }
-
-    /* Blit onto the screen surface */
-    if(SDL_BlitSurface(image, NULL, screen, NULL) &#60; 0)
-        fprintf(stderr, "BlitSurface error: %s\n", SDL_GetError());
-
-    SDL_UpdateRect(screen, 0, 0, image-&#62;w, image-&#62;h);
-
-    /* Free the allocated BMP surface */
-    SDL_FreeSurface(image);
-}</PRE
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN86"
-></A
->Drawing Directly to the Display</H2
-><P
->The following two functions can be used to get and set single
-pixels of a surface. They are carefully written to work with any depth
-currently supported by SDL. Remember to lock the surface before
-calling them, and to unlock it before calling any other SDL
-functions.</P
-><P
->To convert between pixel values and their red, green, blue
-components, use SDL_GetRGB() and SDL_MapRGB().</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN90"
-></A
-><P
-><B
->Example 2-4. getpixel()</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->/*
- * Return the pixel value at (x, y)
- * NOTE: The surface must be locked before calling this!
- */
-Uint32 getpixel(SDL_Surface *surface, int x, int y)
-{
-    int bpp = surface-&#62;format-&#62;BytesPerPixel;
-    /* Here p is the address to the pixel we want to retrieve */
-    Uint8 *p = (Uint8 *)surface-&#62;pixels + y * surface-&#62;pitch + x * bpp;
-
-    switch(bpp) {
-    case 1:
-        return *p;
-
-    case 2:
-        return *(Uint16 *)p;
-
-    case 3:
-        if(SDL_BYTEORDER == SDL_BIG_ENDIAN)
-            return p[0] &#60;&#60; 16 | p[1] &#60;&#60; 8 | p[2];
-        else
-            return p[0] | p[1] &#60;&#60; 8 | p[2] &#60;&#60; 16;
-
-    case 4:
-        return *(Uint32 *)p;
-
-    default:
-        return 0;       /* shouldn't happen, but avoids warnings */
-    }
-}</PRE
-></DIV
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN93"
-></A
-><P
-><B
->Example 2-5. putpixel()</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->/*
- * Set the pixel at (x, y) to the given value
- * NOTE: The surface must be locked before calling this!
- */
-void putpixel(SDL_Surface *surface, int x, int y, Uint32 pixel)
-{
-    int bpp = surface-&#62;format-&#62;BytesPerPixel;
-    /* Here p is the address to the pixel we want to set */
-    Uint8 *p = (Uint8 *)surface-&#62;pixels + y * surface-&#62;pitch + x * bpp;
-
-    switch(bpp) {
-    case 1:
-        *p = pixel;
-        break;
-
-    case 2:
-        *(Uint16 *)p = pixel;
-        break;
-
-    case 3:
-        if(SDL_BYTEORDER == SDL_BIG_ENDIAN) {
-            p[0] = (pixel &#62;&#62; 16) &#38; 0xff;
-            p[1] = (pixel &#62;&#62; 8) &#38; 0xff;
-            p[2] = pixel &#38; 0xff;
-        } else {
-            p[0] = pixel &#38; 0xff;
-            p[1] = (pixel &#62;&#62; 8) &#38; 0xff;
-            p[2] = (pixel &#62;&#62; 16) &#38; 0xff;
-        }
-        break;
-
-    case 4:
-        *(Uint32 *)p = pixel;
-        break;
-    }
-}</PRE
-></DIV
-><P
->The following code uses the putpixel() function above to set a
-yellow pixel in the middle of the screen.</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN97"
-></A
-><P
-><B
->Example 2-6. Using putpixel()</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->&#13;    /* Code to set a yellow pixel at the center of the screen */
-
-    int x, y;
-    Uint32 yellow;
-
-    /* Map the color yellow to this display (R=0xff, G=0xFF, B=0x00)
-       Note:  If the display is palettized, you must set the palette first.
-    */
-    yellow = SDL_MapRGB(screen-&#62;format, 0xff, 0xff, 0x00);
-
-    x = screen-&#62;w / 2;
-    y = screen-&#62;h / 2;
-
-    /* Lock the screen for direct access to the pixels */
-    if ( SDL_MUSTLOCK(screen) ) {
-        if ( SDL_LockSurface(screen) &#60; 0 ) {
-            fprintf(stderr, "Can't lock screen: %s\n", SDL_GetError());
-            return;
-        }
-    }
-
-    putpixel(screen, x, y, yellow);
-
-    if ( SDL_MUSTLOCK(screen) ) {
-        SDL_UnlockSurface(screen);
-    }
-    /* Update just the part of the display that we've changed */
-    SDL_UpdateRect(screen, x, y, 1, 1);
-
-    return;&#13;</PRE
-></DIV
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guidebasicsinit.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guidevideoopengl.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Initializing SDL</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guide.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Using OpenGL With SDL</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidevideoopengl.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidevideoopengl.html
deleted file mode 100644
index 0abd5671861..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/guidevideoopengl.html
+++ /dev/null
@@ -1,730 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Using OpenGL With SDL</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Graphics and Video"
-HREF="guidevideo.html"><LINK
-REL="PREVIOUS"
-TITLE="Graphics and Video"
-HREF="guidevideo.html"><LINK
-REL="NEXT"
-TITLE="Input handling"
-HREF="guideinput.html"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guidevideo.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 2. Graphics and Video</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="guideinput.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="GUIDEVIDEOOPENGL"
-></A
->Using OpenGL With SDL</H1
-><P
->SDL has the ability to create and use OpenGL contexts on several platforms(Linux/X11, Win32, BeOS, MacOS Classic/Toolbox, Mac OS X, FreeBSD/X11 and Solaris/X11). This allows you to use SDL's audio, event handling, threads and times in your OpenGL applications (a function often performed by GLUT).</P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN103"
-></A
->Initialisation</H2
-><P
->Initialising SDL to use OpenGL is not very different to initialising SDL normally. There are three differences; you must pass <TT
-CLASS="LITERAL"
->SDL_OPENGL</TT
-> to <A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->, you must specify several GL attributes (depth buffer size, framebuffer sizes) using <A
-HREF="sdlglsetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_SetAttribute</TT
-></A
-> and finally, if you wish to use double buffering you must specify it as a GL attribute, <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->not</I
-></SPAN
-> by passing the <TT
-CLASS="LITERAL"
->SDL_DOUBLEBUF</TT
-> flag to <TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
->.</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN114"
-></A
-><P
-><B
->Example 2-7. Initializing SDL with OpenGL</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->    /* Information about the current video settings. */
-    const SDL_VideoInfo* info = NULL;
-    /* Dimensions of our window. */
-    int width = 0;
-    int height = 0;
-    /* Color depth in bits of our window. */
-    int bpp = 0;
-    /* Flags we will pass into SDL_SetVideoMode. */
-    int flags = 0;
-
-    /* First, initialize SDL's video subsystem. */
-    if( SDL_Init( SDL_INIT_VIDEO ) &#60; 0 ) {
-        /* Failed, exit. */
-        fprintf( stderr, "Video initialization failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
-    }
-
-    /* Let's get some video information. */
-    info = SDL_GetVideoInfo( );
-
-    if( !info ) {
-        /* This should probably never happen. */
-        fprintf( stderr, "Video query failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
-    }
-
-    /*
-     * Set our width/height to 640/480 (you would
-     * of course let the user decide this in a normal
-     * app). We get the bpp we will request from
-     * the display. On X11, VidMode can't change
-     * resolution, so this is probably being overly
-     * safe. Under Win32, ChangeDisplaySettings
-     * can change the bpp.
-     */
-    width = 640;
-    height = 480;
-    bpp = info-&#62;vfmt-&#62;BitsPerPixel;
-
-    /*
-     * Now, we want to setup our requested
-     * window attributes for our OpenGL window.
-     * We want *at least* 5 bits of red, green
-     * and blue. We also want at least a 16-bit
-     * depth buffer.
-     *
-     * The last thing we do is request a double
-     * buffered window. '1' turns on double
-     * buffering, '0' turns it off.
-     *
-     * Note that we do not use SDL_DOUBLEBUF in
-     * the flags to SDL_SetVideoMode. That does
-     * not affect the GL attribute state, only
-     * the standard 2D blitting setup.
-     */
-    SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
-    SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
-
-    /*
-     * We want to request that SDL provide us
-     * with an OpenGL window, in a fullscreen
-     * video mode.
-     *
-     * EXERCISE:
-     * Make starting windowed an option, and
-     * handle the resize events properly with
-     * glViewport.
-     */
-    flags = SDL_OPENGL | SDL_FULLSCREEN;
-
-    /*
-     * Set the video mode
-     */
-    if( SDL_SetVideoMode( width, height, bpp, flags ) == 0 ) {
-        /* 
-         * This could happen for a variety of reasons,
-         * including DISPLAY not being set, the specified
-         * resolution not being available, etc.
-         */
-        fprintf( stderr, "Video mode set failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
-    }</PRE
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN117"
-></A
->Drawing</H2
-><P
->Apart from initialisation, using OpenGL within SDL is the same as using OpenGL
-with any other API, e.g. GLUT. You still use all the same function calls and
-data types. However if you are using a double-buffered display, then you must
-use
-<A
-HREF="sdlglswapbuffers.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_SwapBuffers()</TT
-></A
->
-to swap the buffers and update the display. To request double-buffering
-with OpenGL, use
-<A
-HREF="sdlglsetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_SetAttribute</TT
-></A
->
-with <TT
-CLASS="LITERAL"
->SDL_GL_DOUBLEBUFFER</TT
->, and use
-<A
-HREF="sdlglgetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_GetAttribute</TT
-></A
->
-to see if you actually got it.</P
-><P
->A full example code listing is now presented below.</P
-><DIV
-CLASS="EXAMPLE"
-><A
-NAME="AEN128"
-></A
-><P
-><B
->Example 2-8. SDL and OpenGL</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->/*
- * SDL OpenGL Tutorial.
- * (c) Michael Vance, 2000
- * briareos@lokigames.com
- *
- * Distributed under terms of the LGPL. 
- */
-
-#include &#60;SDL/SDL.h&#62;
-#include &#60;GL/gl.h&#62;
-#include &#60;GL/glu.h&#62;
-
-#include &#60;stdio.h&#62;
-#include &#60;stdlib.h&#62;
-
-static GLboolean should_rotate = GL_TRUE;
-
-static void quit_tutorial( int code )
-{
-    /*
-     * Quit SDL so we can release the fullscreen
-     * mode and restore the previous video settings,
-     * etc.
-     */
-    SDL_Quit( );
-
-    /* Exit program. */
-    exit( code );
-}
-
-static void handle_key_down( SDL_keysym* keysym )
-{
-
-    /* 
-     * We're only interested if 'Esc' has
-     * been presssed.
-     *
-     * EXERCISE: 
-     * Handle the arrow keys and have that change the
-     * viewing position/angle.
-     */
-    switch( keysym-&#62;sym ) {
-    case SDLK_ESCAPE:
-        quit_tutorial( 0 );
-        break;
-    case SDLK_SPACE:
-        should_rotate = !should_rotate;
-        break;
-    default:
-        break;
-    }
-
-}
-
-static void process_events( void )
-{
-    /* Our SDL event placeholder. */
-    SDL_Event event;
-
-    /* Grab all the events off the queue. */
-    while( SDL_PollEvent( &#38;event ) ) {
-
-        switch( event.type ) {
-        case SDL_KEYDOWN:
-            /* Handle key presses. */
-            handle_key_down( &#38;event.key.keysym );
-            break;
-        case SDL_QUIT:
-            /* Handle quit requests (like Ctrl-c). */
-            quit_tutorial( 0 );
-            break;
-        }
-
-    }
-
-}
-
-static void draw_screen( void )
-{
-    /* Our angle of rotation. */
-    static float angle = 0.0f;
-
-    /*
-     * EXERCISE:
-     * Replace this awful mess with vertex
-     * arrays and a call to glDrawElements.
-     *
-     * EXERCISE:
-     * After completing the above, change
-     * it to use compiled vertex arrays.
-     *
-     * EXERCISE:
-     * Verify my windings are correct here ;).
-     */
-    static GLfloat v0[] = { -1.0f, -1.0f,  1.0f };
-    static GLfloat v1[] = {  1.0f, -1.0f,  1.0f };
-    static GLfloat v2[] = {  1.0f,  1.0f,  1.0f };
-    static GLfloat v3[] = { -1.0f,  1.0f,  1.0f };
-    static GLfloat v4[] = { -1.0f, -1.0f, -1.0f };
-    static GLfloat v5[] = {  1.0f, -1.0f, -1.0f };
-    static GLfloat v6[] = {  1.0f,  1.0f, -1.0f };
-    static GLfloat v7[] = { -1.0f,  1.0f, -1.0f };
-    static GLubyte red[]    = { 255,   0,   0, 255 };
-    static GLubyte green[]  = {   0, 255,   0, 255 };
-    static GLubyte blue[]   = {   0,   0, 255, 255 };
-    static GLubyte white[]  = { 255, 255, 255, 255 };
-    static GLubyte yellow[] = {   0, 255, 255, 255 };
-    static GLubyte black[]  = {   0,   0,   0, 255 };
-    static GLubyte orange[] = { 255, 255,   0, 255 };
-    static GLubyte purple[] = { 255,   0, 255,   0 };
-
-    /* Clear the color and depth buffers. */
-    glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-
-    /* We don't want to modify the projection matrix. */
-    glMatrixMode( GL_MODELVIEW );
-    glLoadIdentity( );
-
-    /* Move down the z-axis. */
-    glTranslatef( 0.0, 0.0, -5.0 );
-
-    /* Rotate. */
-    glRotatef( angle, 0.0, 1.0, 0.0 );
-
-    if( should_rotate ) {
-
-        if( ++angle &#62; 360.0f ) {
-            angle = 0.0f;
-        }
-
-    }
-
-    /* Send our triangle data to the pipeline. */
-    glBegin( GL_TRIANGLES );
-
-    glColor4ubv( red );
-    glVertex3fv( v0 );
-    glColor4ubv( green );
-    glVertex3fv( v1 );
-    glColor4ubv( blue );
-    glVertex3fv( v2 );
-
-    glColor4ubv( red );
-    glVertex3fv( v0 );
-    glColor4ubv( blue );
-    glVertex3fv( v2 );
-    glColor4ubv( white );
-    glVertex3fv( v3 );
-
-    glColor4ubv( green );
-    glVertex3fv( v1 );
-    glColor4ubv( black );
-    glVertex3fv( v5 );
-    glColor4ubv( orange );
-    glVertex3fv( v6 );
-
-    glColor4ubv( green );
-    glVertex3fv( v1 );
-    glColor4ubv( orange );
-    glVertex3fv( v6 );
-    glColor4ubv( blue );
-    glVertex3fv( v2 );
-
-    glColor4ubv( black );
-    glVertex3fv( v5 );
-    glColor4ubv( yellow );
-    glVertex3fv( v4 );
-    glColor4ubv( purple );
-    glVertex3fv( v7 );
-
-    glColor4ubv( black );
-    glVertex3fv( v5 );
-    glColor4ubv( purple );
-    glVertex3fv( v7 );
-    glColor4ubv( orange );
-    glVertex3fv( v6 );
-
-    glColor4ubv( yellow );
-    glVertex3fv( v4 );
-    glColor4ubv( red );
-    glVertex3fv( v0 );
-    glColor4ubv( white );
-    glVertex3fv( v3 );
-
-    glColor4ubv( yellow );
-    glVertex3fv( v4 );
-    glColor4ubv( white );
-    glVertex3fv( v3 );
-    glColor4ubv( purple );
-    glVertex3fv( v7 );
-
-    glColor4ubv( white );
-    glVertex3fv( v3 );
-    glColor4ubv( blue );
-    glVertex3fv( v2 );
-    glColor4ubv( orange );
-    glVertex3fv( v6 );
-
-    glColor4ubv( white );
-    glVertex3fv( v3 );
-    glColor4ubv( orange );
-    glVertex3fv( v6 );
-    glColor4ubv( purple );
-    glVertex3fv( v7 );
-
-    glColor4ubv( green );
-    glVertex3fv( v1 );
-    glColor4ubv( red );
-    glVertex3fv( v0 );
-    glColor4ubv( yellow );
-    glVertex3fv( v4 );
-
-    glColor4ubv( green );
-    glVertex3fv( v1 );
-    glColor4ubv( yellow );
-    glVertex3fv( v4 );
-    glColor4ubv( black );
-    glVertex3fv( v5 );
-
-    glEnd( );
-
-    /*
-     * EXERCISE:
-     * Draw text telling the user that 'Spc'
-     * pauses the rotation and 'Esc' quits.
-     * Do it using vetors and textured quads.
-     */
-
-    /*
-     * Swap the buffers. This this tells the driver to
-     * render the next frame from the contents of the
-     * back-buffer, and to set all rendering operations
-     * to occur on what was the front-buffer.
-     *
-     * Double buffering prevents nasty visual tearing
-     * from the application drawing on areas of the
-     * screen that are being updated at the same time.
-     */
-    SDL_GL_SwapBuffers( );
-}
-
-static void setup_opengl( int width, int height )
-{
-    float ratio = (float) width / (float) height;
-
-    /* Our shading model--Gouraud (smooth). */
-    glShadeModel( GL_SMOOTH );
-
-    /* Culling. */
-    glCullFace( GL_BACK );
-    glFrontFace( GL_CCW );
-    glEnable( GL_CULL_FACE );
-
-    /* Set the clear color. */
-    glClearColor( 0, 0, 0, 0 );
-
-    /* Setup our viewport. */
-    glViewport( 0, 0, width, height );
-
-    /*
-     * Change to the projection matrix and set
-     * our viewing volume.
-     */
-    glMatrixMode( GL_PROJECTION );
-    glLoadIdentity( );
-    /*
-     * EXERCISE:
-     * Replace this with a call to glFrustum.
-     */
-    gluPerspective( 60.0, ratio, 1.0, 1024.0 );
-}
-
-int main( int argc, char* argv[] )
-{
-    /* Information about the current video settings. */
-    const SDL_VideoInfo* info = NULL;
-    /* Dimensions of our window. */
-    int width = 0;
-    int height = 0;
-    /* Color depth in bits of our window. */
-    int bpp = 0;
-    /* Flags we will pass into SDL_SetVideoMode. */
-    int flags = 0;
-
-    /* First, initialize SDL's video subsystem. */
-    if( SDL_Init( SDL_INIT_VIDEO ) &#60; 0 ) {
-        /* Failed, exit. */
-        fprintf( stderr, "Video initialization failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
-    }
-
-    /* Let's get some video information. */
-    info = SDL_GetVideoInfo( );
-
-    if( !info ) {
-        /* This should probably never happen. */
-        fprintf( stderr, "Video query failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
-    }
-
-    /*
-     * Set our width/height to 640/480 (you would
-     * of course let the user decide this in a normal
-     * app). We get the bpp we will request from
-     * the display. On X11, VidMode can't change
-     * resolution, so this is probably being overly
-     * safe. Under Win32, ChangeDisplaySettings
-     * can change the bpp.
-     */
-    width = 640;
-    height = 480;
-    bpp = info-&#62;vfmt-&#62;BitsPerPixel;
-
-    /*
-     * Now, we want to setup our requested
-     * window attributes for our OpenGL window.
-     * We want *at least* 5 bits of red, green
-     * and blue. We also want at least a 16-bit
-     * depth buffer.
-     *
-     * The last thing we do is request a double
-     * buffered window. '1' turns on double
-     * buffering, '0' turns it off.
-     *
-     * Note that we do not use SDL_DOUBLEBUF in
-     * the flags to SDL_SetVideoMode. That does
-     * not affect the GL attribute state, only
-     * the standard 2D blitting setup.
-     */
-    SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 5 );
-    SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
-    SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
-
-    /*
-     * We want to request that SDL provide us
-     * with an OpenGL window, in a fullscreen
-     * video mode.
-     *
-     * EXERCISE:
-     * Make starting windowed an option, and
-     * handle the resize events properly with
-     * glViewport.
-     */
-    flags = SDL_OPENGL | SDL_FULLSCREEN;
-
-    /*
-     * Set the video mode
-     */
-    if( SDL_SetVideoMode( width, height, bpp, flags ) == 0 ) {
-        /* 
-         * This could happen for a variety of reasons,
-         * including DISPLAY not being set, the specified
-         * resolution not being available, etc.
-         */
-        fprintf( stderr, "Video mode set failed: %s\n",
-             SDL_GetError( ) );
-        quit_tutorial( 1 );
-    }
-
-    /*
-     * At this point, we should have a properly setup
-     * double-buffered window for use with OpenGL.
-     */
-    setup_opengl( width, height );
-
-    /*
-     * Now we want to begin our normal app process--
-     * an event loop with a lot of redrawing.
-     */
-    while( 1 ) {
-        /* Process incoming events. */
-        process_events( );
-        /* Draw the screen. */
-        draw_screen( );
-    }
-
-    /*
-     * EXERCISE:
-     * Record timings using SDL_GetTicks() and
-     * and print out frames per second at program
-     * end.
-     */
-
-    /* Never reached. */
-    return 0;
-}</PRE
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guidevideo.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guideinput.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Graphics and Video</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="guidevideo.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Input handling</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/index.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/index.html
deleted file mode 100644
index f86ff191d32..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/index.html
+++ /dev/null
@@ -1,1156 +0,0 @@
-<HTML
-><HEAD
-><TITLE
-></TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="NEXT"
-TITLE="SDL Guide"
-HREF="guide.html"></HEAD
-><BODY
-CLASS="BOOK"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="BOOK"
-><A
-NAME="AEN1"
-></A
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
->I. <A
-HREF="guide.html"
->SDL Guide</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="guidepreface.html"
->Preface</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="guidepreface.html#GUIDEABOUTSDL"
->About SDL</A
-></DT
-><DT
-><A
-HREF="guideaboutsdldoc.html"
->About SDLdoc</A
-></DT
-><DT
-><A
-HREF="guidecredits.html"
->Credits</A
-></DT
-></DL
-></DD
-><DT
->1. <A
-HREF="guidethebasics.html"
->The Basics</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="guidethebasics.html#GUIDEINTRODUCTION"
->Introduction</A
-></DT
-><DT
-><A
-HREF="guidebasicsinit.html"
->Initializing SDL</A
-></DT
-></DL
-></DD
-><DT
->2. <A
-HREF="guidevideo.html"
->Graphics and Video</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="guidevideo.html#GUIDEVIDEOINTRO"
->Introduction to SDL Video</A
-></DT
-><DT
-><A
-HREF="guidevideoopengl.html"
->Using OpenGL With SDL</A
-></DT
-></DL
-></DD
-><DT
->3. <A
-HREF="guideinput.html"
->Input handling</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="guideinput.html#GUIDEINPUTJOYSTICK"
->Handling Joysticks</A
-></DT
-><DT
-><A
-HREF="guideinputkeyboard.html"
->Handling the Keyboard</A
-></DT
-></DL
-></DD
-><DT
->4. <A
-HREF="guideexamples.html"
->Examples</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="guideexamples.html#AEN369"
->Introduction</A
-></DT
-><DT
-><A
-HREF="guideeventexamples.html"
->Event Examples</A
-></DT
-><DT
-><A
-HREF="guideaudioexamples.html"
->Audio Examples</A
-></DT
-><DT
-><A
-HREF="guidecdromexamples.html"
->CDROM Examples</A
-></DT
-><DT
-><A
-HREF="guidetimeexamples.html"
->Time Examples</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->II. <A
-HREF="reference.html"
->SDL Reference</A
-></DT
-><DD
-><DL
-><DT
->5. <A
-HREF="general.html"
->General</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="sdlinit.html"
->SDL_Init</A
->&nbsp;--&nbsp;Initializes SDL</DT
-><DT
-><A
-HREF="sdlinitsubsystem.html"
->SDL_InitSubSystem</A
->&nbsp;--&nbsp;Initialize subsystems</DT
-><DT
-><A
-HREF="sdlquitsubsystem.html"
->SDL_QuitSubSystem</A
->&nbsp;--&nbsp;Shut down a subsystem</DT
-><DT
-><A
-HREF="sdlquit.html"
->SDL_Quit</A
->&nbsp;--&nbsp;Shut down SDL</DT
-><DT
-><A
-HREF="sdlwasinit.html"
->SDL_WasInit</A
->&nbsp;--&nbsp;Check which subsystems are initialized</DT
-><DT
-><A
-HREF="sdlgeterror.html"
->SDL_GetError</A
->&nbsp;--&nbsp;Get SDL error string</DT
-><DT
-><A
-HREF="sdlenvvars.html"
->SDL_envvars</A
->&nbsp;--&nbsp;SDL environment variables</DT
-></DL
-></DD
-><DT
->6. <A
-HREF="video.html"
->Video</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="sdlgetvideosurface.html"
->SDL_GetVideoSurface</A
->&nbsp;--&nbsp;returns a pointer to the current display surface</DT
-><DT
-><A
-HREF="sdlgetvideoinfo.html"
->SDL_GetVideoInfo</A
->&nbsp;--&nbsp;returns a pointer to information about the video hardware</DT
-><DT
-><A
-HREF="sdlvideodrivername.html"
->SDL_VideoDriverName</A
->&nbsp;--&nbsp;Obtain the name of the video driver</DT
-><DT
-><A
-HREF="sdllistmodes.html"
->SDL_ListModes</A
->&nbsp;--&nbsp;Returns a pointer to an array of available screen dimensions for 
-the given format and video flags</DT
-><DT
-><A
-HREF="sdlvideomodeok.html"
->SDL_VideoModeOK</A
->&nbsp;--&nbsp;Check to see if a particular video mode is supported.</DT
-><DT
-><A
-HREF="sdlsetvideomode.html"
->SDL_SetVideoMode</A
->&nbsp;--&nbsp;Set up a video mode with the specified width, height and bits-per-pixel.</DT
-><DT
-><A
-HREF="sdlupdaterect.html"
->SDL_UpdateRect</A
->&nbsp;--&nbsp;Makes sure the given area is updated on the given screen.</DT
-><DT
-><A
-HREF="sdlupdaterects.html"
->SDL_UpdateRects</A
->&nbsp;--&nbsp;Makes sure the given list of rectangles is updated on the given screen.</DT
-><DT
-><A
-HREF="sdlflip.html"
->SDL_Flip</A
->&nbsp;--&nbsp;Swaps screen buffers</DT
-><DT
-><A
-HREF="sdlsetcolors.html"
->SDL_SetColors</A
->&nbsp;--&nbsp;Sets a portion of the colormap for the given 8-bit surface.</DT
-><DT
-><A
-HREF="sdlsetpalette.html"
->SDL_SetPalette</A
->&nbsp;--&nbsp;Sets the colors in the palette of an 8-bit surface.</DT
-><DT
-><A
-HREF="sdlsetgamma.html"
->SDL_SetGamma</A
->&nbsp;--&nbsp;Sets the color gamma function for the display</DT
-><DT
-><A
-HREF="sdlgetgammaramp.html"
->SDL_GetGammaRamp</A
->&nbsp;--&nbsp;Gets the color gamma lookup tables for the display</DT
-><DT
-><A
-HREF="sdlsetgammaramp.html"
->SDL_SetGammaRamp</A
->&nbsp;--&nbsp;Sets the color gamma lookup tables for the display</DT
-><DT
-><A
-HREF="sdlmaprgb.html"
->SDL_MapRGB</A
->&nbsp;--&nbsp;Map a RGB color value to a pixel format.</DT
-><DT
-><A
-HREF="sdlmaprgba.html"
->SDL_MapRGBA</A
->&nbsp;--&nbsp;Map a RGBA color value to a pixel format.</DT
-><DT
-><A
-HREF="sdlgetrgb.html"
->SDL_GetRGB</A
->&nbsp;--&nbsp;Get RGB values from a pixel in the specified pixel format.</DT
-><DT
-><A
-HREF="sdlgetrgba.html"
->SDL_GetRGBA</A
->&nbsp;--&nbsp;Get RGBA values from a pixel in the specified pixel format.</DT
-><DT
-><A
-HREF="sdlcreatergbsurface.html"
->SDL_CreateRGBSurface</A
->&nbsp;--&nbsp;Create an empty SDL_Surface</DT
-><DT
-><A
-HREF="sdlcreatergbsurfacefrom.html"
->SDL_CreateRGBSurfaceFrom</A
->&nbsp;--&nbsp;Create an SDL_Surface from pixel data</DT
-><DT
-><A
-HREF="sdlfreesurface.html"
->SDL_FreeSurface</A
->&nbsp;--&nbsp;Frees (deletes) a SDL_Surface</DT
-><DT
-><A
-HREF="sdllocksurface.html"
->SDL_LockSurface</A
->&nbsp;--&nbsp;Lock a surface for directly access.</DT
-><DT
-><A
-HREF="sdlunlocksurface.html"
->SDL_UnlockSurface</A
->&nbsp;--&nbsp;Unlocks a previously locked surface.</DT
-><DT
-><A
-HREF="sdlloadbmp.html"
->SDL_LoadBMP</A
->&nbsp;--&nbsp;Load a Windows BMP file into an SDL_Surface.</DT
-><DT
-><A
-HREF="sdlsavebmp.html"
->SDL_SaveBMP</A
->&nbsp;--&nbsp;Save an SDL_Surface as a Windows BMP file.</DT
-><DT
-><A
-HREF="sdlsetcolorkey.html"
->SDL_SetColorKey</A
->&nbsp;--&nbsp;Sets the color key (transparent pixel) in a blittable surface and
-RLE acceleration.</DT
-><DT
-><A
-HREF="sdlsetalpha.html"
->SDL_SetAlpha</A
->&nbsp;--&nbsp;Adjust the alpha properties of a surface</DT
-><DT
-><A
-HREF="sdlsetcliprect.html"
->SDL_SetClipRect</A
->&nbsp;--&nbsp;Sets the clipping rectangle for a surface.</DT
-><DT
-><A
-HREF="sdlgetcliprect.html"
->SDL_GetClipRect</A
->&nbsp;--&nbsp;Gets the clipping rectangle for a surface.</DT
-><DT
-><A
-HREF="sdlconvertsurface.html"
->SDL_ConvertSurface</A
->&nbsp;--&nbsp;Converts a surface to the same format as another surface.</DT
-><DT
-><A
-HREF="sdlblitsurface.html"
->SDL_BlitSurface</A
->&nbsp;--&nbsp;This performs a fast blit from the source surface to the destination surface.</DT
-><DT
-><A
-HREF="sdlfillrect.html"
->SDL_FillRect</A
->&nbsp;--&nbsp;This function performs a fast fill of the given rectangle with some color</DT
-><DT
-><A
-HREF="sdldisplayformat.html"
->SDL_DisplayFormat</A
->&nbsp;--&nbsp;Convert a surface to the display format</DT
-><DT
-><A
-HREF="sdldisplayformatalpha.html"
->SDL_DisplayFormatAlpha</A
->&nbsp;--&nbsp;Convert a surface to the display format</DT
-><DT
-><A
-HREF="sdlwarpmouse.html"
->SDL_WarpMouse</A
->&nbsp;--&nbsp;Set the position of the mouse cursor.</DT
-><DT
-><A
-HREF="sdlcreatecursor.html"
->SDL_CreateCursor</A
->&nbsp;--&nbsp;Creates a new mouse cursor.</DT
-><DT
-><A
-HREF="sdlfreecursor.html"
->SDL_FreeCursor</A
->&nbsp;--&nbsp;Frees a cursor created with SDL_CreateCursor.</DT
-><DT
-><A
-HREF="sdlsetcursor.html"
->SDL_SetCursor</A
->&nbsp;--&nbsp;Set the currently active mouse cursor.</DT
-><DT
-><A
-HREF="sdlgetcursor.html"
->SDL_GetCursor</A
->&nbsp;--&nbsp;Get the currently active mouse cursor.</DT
-><DT
-><A
-HREF="sdlshowcursor.html"
->SDL_ShowCursor</A
->&nbsp;--&nbsp;Toggle whether or not the cursor is shown on the screen.</DT
-><DT
-><A
-HREF="sdlglloadlibrary.html"
->SDL_GL_LoadLibrary</A
->&nbsp;--&nbsp;Specify an OpenGL library</DT
-><DT
-><A
-HREF="sdlglgetprocaddress.html"
->SDL_GL_GetProcAddress</A
->&nbsp;--&nbsp;Get the address of a GL function</DT
-><DT
-><A
-HREF="sdlglgetattribute.html"
->SDL_GL_GetAttribute</A
->&nbsp;--&nbsp;Get the value of a special SDL/OpenGL attribute</DT
-><DT
-><A
-HREF="sdlglsetattribute.html"
->SDL_GL_SetAttribute</A
->&nbsp;--&nbsp;Set a special SDL/OpenGL attribute</DT
-><DT
-><A
-HREF="sdlglswapbuffers.html"
->SDL_GL_SwapBuffers</A
->&nbsp;--&nbsp;Swap OpenGL framebuffers/Update Display</DT
-><DT
-><A
-HREF="sdlcreateyuvoverlay.html"
->SDL_CreateYUVOverlay</A
->&nbsp;--&nbsp;Create a YUV video overlay</DT
-><DT
-><A
-HREF="sdllockyuvoverlay.html"
->SDL_LockYUVOverlay</A
->&nbsp;--&nbsp;Lock an overlay</DT
-><DT
-><A
-HREF="sdlunlockyuvoverlay.html"
->SDL_UnlockYUVOverlay</A
->&nbsp;--&nbsp;Unlock an overlay</DT
-><DT
-><A
-HREF="sdldisplayyuvoverlay.html"
->SDL_DisplayYUVOverlay</A
->&nbsp;--&nbsp;Blit the overlay to the display</DT
-><DT
-><A
-HREF="sdlfreeyuvoverlay.html"
->SDL_FreeYUVOverlay</A
->&nbsp;--&nbsp;Free a YUV video overlay</DT
-><DT
-><A
-HREF="sdlglattr.html"
->SDL_GLattr</A
->&nbsp;--&nbsp;SDL GL Attributes</DT
-><DT
-><A
-HREF="sdlrect.html"
->SDL_Rect</A
->&nbsp;--&nbsp;Defines a rectangular area</DT
-><DT
-><A
-HREF="sdlcolor.html"
->SDL_Color</A
->&nbsp;--&nbsp;Format independent color description</DT
-><DT
-><A
-HREF="sdlpalette.html"
->SDL_Palette</A
->&nbsp;--&nbsp;Color palette for 8-bit pixel formats</DT
-><DT
-><A
-HREF="sdlpixelformat.html"
->SDL_PixelFormat</A
->&nbsp;--&nbsp;Stores surface format information</DT
-><DT
-><A
-HREF="sdlsurface.html"
->SDL_Surface</A
->&nbsp;--&nbsp;Graphical Surface Structure</DT
-><DT
-><A
-HREF="sdlvideoinfo.html"
->SDL_VideoInfo</A
->&nbsp;--&nbsp;Video Target information</DT
-><DT
-><A
-HREF="sdloverlay.html"
->SDL_Overlay</A
->&nbsp;--&nbsp;YUV video overlay</DT
-></DL
-></DD
-><DT
->7. <A
-HREF="wm.html"
->Window Management</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="sdlwmsetcaption.html"
->SDL_WM_SetCaption</A
->&nbsp;--&nbsp;Sets the window tile and icon name.</DT
-><DT
-><A
-HREF="sdlwmgetcaption.html"
->SDL_WM_GetCaption</A
->&nbsp;--&nbsp;Gets the window title and icon name.</DT
-><DT
-><A
-HREF="sdlwmseticon.html"
->SDL_WM_SetIcon</A
->&nbsp;--&nbsp;Sets the icon for the display window.</DT
-><DT
-><A
-HREF="sdlwmiconifywindow.html"
->SDL_WM_IconifyWindow</A
->&nbsp;--&nbsp;Iconify/Minimise the window</DT
-><DT
-><A
-HREF="sdlwmtogglefullscreen.html"
->SDL_WM_ToggleFullScreen</A
->&nbsp;--&nbsp;Toggles fullscreen mode</DT
-><DT
-><A
-HREF="sdlwmgrabinput.html"
->SDL_WM_GrabInput</A
->&nbsp;--&nbsp;Grabs mouse and keyboard input.</DT
-></DL
-></DD
-><DT
->8. <A
-HREF="event.html"
->Events</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="event.html#AEN3691"
->Introduction</A
-></DT
-><DT
-><A
-HREF="eventstructures.html"
->SDL Event Structures.</A
-></DT
-><DT
-><A
-HREF="eventfunctions.html"
->Event Functions.</A
-></DT
-></DL
-></DD
-><DT
->9. <A
-HREF="joystick.html"
->Joystick</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="sdlnumjoysticks.html"
->SDL_NumJoysticks</A
->&nbsp;--&nbsp;Count available joysticks.</DT
-><DT
-><A
-HREF="sdljoystickname.html"
->SDL_JoystickName</A
->&nbsp;--&nbsp;Get joystick name.</DT
-><DT
-><A
-HREF="sdljoystickopen.html"
->SDL_JoystickOpen</A
->&nbsp;--&nbsp;Opens a joystick for use.</DT
-><DT
-><A
-HREF="sdljoystickopened.html"
->SDL_JoystickOpened</A
->&nbsp;--&nbsp;Determine if a joystick has been opened</DT
-><DT
-><A
-HREF="sdljoystickindex.html"
->SDL_JoystickIndex</A
->&nbsp;--&nbsp;Get the index of an SDL_Joystick.</DT
-><DT
-><A
-HREF="sdljoysticknumaxes.html"
->SDL_JoystickNumAxes</A
->&nbsp;--&nbsp;Get the number of joystick axes</DT
-><DT
-><A
-HREF="sdljoysticknumballs.html"
->SDL_JoystickNumBalls</A
->&nbsp;--&nbsp;Get the number of joystick trackballs</DT
-><DT
-><A
-HREF="sdljoysticknumhats.html"
->SDL_JoystickNumHats</A
->&nbsp;--&nbsp;Get the number of joystick hats</DT
-><DT
-><A
-HREF="sdljoysticknumbuttons.html"
->SDL_JoystickNumButtons</A
->&nbsp;--&nbsp;Get the number of joysitck buttons</DT
-><DT
-><A
-HREF="sdljoystickupdate.html"
->SDL_JoystickUpdate</A
->&nbsp;--&nbsp;Updates the state of all joysticks</DT
-><DT
-><A
-HREF="sdljoystickgetaxis.html"
->SDL_JoystickGetAxis</A
->&nbsp;--&nbsp;Get the current state of an axis</DT
-><DT
-><A
-HREF="sdljoystickgethat.html"
->SDL_JoystickGetHat</A
->&nbsp;--&nbsp;Get the current state of a joystick hat</DT
-><DT
-><A
-HREF="sdljoystickgetbutton.html"
->SDL_JoystickGetButton</A
->&nbsp;--&nbsp;Get the current state of a given button on a given joystick</DT
-><DT
-><A
-HREF="sdljoystickgetball.html"
->SDL_JoystickGetBall</A
->&nbsp;--&nbsp;Get relative trackball motion</DT
-><DT
-><A
-HREF="sdljoystickclose.html"
->SDL_JoystickClose</A
->&nbsp;--&nbsp;Closes a previously opened joystick</DT
-></DL
-></DD
-><DT
->10. <A
-HREF="audio.html"
->Audio</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="sdlaudiospec.html"
->SDL_AudioSpec</A
->&nbsp;--&nbsp;Audio Specification Structure</DT
-><DT
-><A
-HREF="sdlopenaudio.html"
->SDL_OpenAudio</A
->&nbsp;--&nbsp;Opens the audio device with the desired parameters.</DT
-><DT
-><A
-HREF="sdlpauseaudio.html"
->SDL_PauseAudio</A
->&nbsp;--&nbsp;Pauses and unpauses the audio callback processing</DT
-><DT
-><A
-HREF="sdlgetaudiostatus.html"
->SDL_GetAudioStatus</A
->&nbsp;--&nbsp;Get the current audio state</DT
-><DT
-><A
-HREF="sdlloadwav.html"
->SDL_LoadWAV</A
->&nbsp;--&nbsp;Load a WAVE file</DT
-><DT
-><A
-HREF="sdlfreewav.html"
->SDL_FreeWAV</A
->&nbsp;--&nbsp;Frees previously opened WAV data</DT
-><DT
-><A
-HREF="sdlaudiocvt.html"
->SDL_AudioCVT</A
->&nbsp;--&nbsp;Audio Conversion Structure</DT
-><DT
-><A
-HREF="sdlbuildaudiocvt.html"
->SDL_BuildAudioCVT</A
->&nbsp;--&nbsp;Initializes a SDL_AudioCVT structure for conversion</DT
-><DT
-><A
-HREF="sdlconvertaudio.html"
->SDL_ConvertAudio</A
->&nbsp;--&nbsp;Convert audio data to a desired audio format.</DT
-><DT
-><A
-HREF="sdlmixaudio.html"
->SDL_MixAudio</A
->&nbsp;--&nbsp;Mix audio data</DT
-><DT
-><A
-HREF="sdllockaudio.html"
->SDL_LockAudio</A
->&nbsp;--&nbsp;Lock out the callback function</DT
-><DT
-><A
-HREF="sdlunlockaudio.html"
->SDL_UnlockAudio</A
->&nbsp;--&nbsp;Unlock the callback function</DT
-><DT
-><A
-HREF="sdlcloseaudio.html"
->SDL_CloseAudio</A
->&nbsp;--&nbsp;Shuts down audio processing and closes the audio device.</DT
-></DL
-></DD
-><DT
->11. <A
-HREF="cdrom.html"
->CD-ROM</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="sdlcdnumdrives.html"
->SDL_CDNumDrives</A
->&nbsp;--&nbsp;Returns the number of CD-ROM drives on the system.</DT
-><DT
-><A
-HREF="sdlcdname.html"
->SDL_CDName</A
->&nbsp;--&nbsp;Returns a human-readable, system-dependent identifier for the CD-ROM.</DT
-><DT
-><A
-HREF="sdlcdopen.html"
->SDL_CDOpen</A
->&nbsp;--&nbsp;Opens a CD-ROM drive for access.</DT
-><DT
-><A
-HREF="sdlcdstatus.html"
->SDL_CDStatus</A
->&nbsp;--&nbsp;Returns the current status of the given drive.</DT
-><DT
-><A
-HREF="sdlcdplay.html"
->SDL_CDPlay</A
->&nbsp;--&nbsp;Play a CD</DT
-><DT
-><A
-HREF="sdlcdplaytracks.html"
->SDL_CDPlayTracks</A
->&nbsp;--&nbsp;Play the given CD track(s)</DT
-><DT
-><A
-HREF="sdlcdpause.html"
->SDL_CDPause</A
->&nbsp;--&nbsp;Pauses a CDROM</DT
-><DT
-><A
-HREF="sdlcdresume.html"
->SDL_CDResume</A
->&nbsp;--&nbsp;Resumes a CDROM</DT
-><DT
-><A
-HREF="sdlcdstop.html"
->SDL_CDStop</A
->&nbsp;--&nbsp;Stops a CDROM</DT
-><DT
-><A
-HREF="sdlcdeject.html"
->SDL_CDEject</A
->&nbsp;--&nbsp;Ejects a CDROM</DT
-><DT
-><A
-HREF="sdlcdclose.html"
->SDL_CDClose</A
->&nbsp;--&nbsp;Closes a SDL_CD handle</DT
-><DT
-><A
-HREF="sdlcd.html"
->SDL_CD</A
->&nbsp;--&nbsp;CDROM Drive Information</DT
-><DT
-><A
-HREF="sdlcdtrack.html"
->SDL_CDtrack</A
->&nbsp;--&nbsp;CD Track Information Structure</DT
-></DL
-></DD
-><DT
->12. <A
-HREF="thread.html"
->Multi-threaded Programming</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="sdlcreatethread.html"
->SDL_CreateThread</A
->&nbsp;--&nbsp;Creates a new thread of execution that shares its parent's properties.</DT
-><DT
-><A
-HREF="sdlthreadid.html"
->SDL_ThreadID</A
->&nbsp;--&nbsp;Get the 32-bit thread identifier for the current thread.</DT
-><DT
-><A
-HREF="sdlgetthreadid.html"
->SDL_GetThreadID</A
->&nbsp;--&nbsp;Get the SDL thread ID of a SDL_Thread</DT
-><DT
-><A
-HREF="sdlwaitthread.html"
->SDL_WaitThread</A
->&nbsp;--&nbsp;Wait for a thread to finish.</DT
-><DT
-><A
-HREF="sdlkillthread.html"
->SDL_KillThread</A
->&nbsp;--&nbsp;Gracelessly terminates the thread.</DT
-><DT
-><A
-HREF="sdlcreatemutex.html"
->SDL_CreateMutex</A
->&nbsp;--&nbsp;Create a mutex</DT
-><DT
-><A
-HREF="sdldestroymutex.html"
->SDL_DestroyMutex</A
->&nbsp;--&nbsp;Destroy a mutex</DT
-><DT
-><A
-HREF="sdlmutexp.html"
->SDL_mutexP</A
->&nbsp;--&nbsp;Lock a mutex</DT
-><DT
-><A
-HREF="sdlmutexv.html"
->SDL_mutexV</A
->&nbsp;--&nbsp;Unlock a mutex</DT
-><DT
-><A
-HREF="sdlcreatesemaphore.html"
->SDL_CreateSemaphore</A
->&nbsp;--&nbsp;Creates a new semaphore and assigns an initial value to it.</DT
-><DT
-><A
-HREF="sdldestroysemaphore.html"
->SDL_DestroySemaphore</A
->&nbsp;--&nbsp;Destroys a semaphore that was created by <A
-HREF="sdlcreatesemaphore.html"
->SDL_CreateSemaphore</A
->.</DT
-><DT
-><A
-HREF="sdlsemwait.html"
->SDL_SemWait</A
->&nbsp;--&nbsp;Lock a semaphore and suspend the thread if the semaphore value is zero.</DT
-><DT
-><A
-HREF="sdlsemtrywait.html"
->SDL_SemTryWait</A
->&nbsp;--&nbsp;Attempt to lock a semaphore but don't suspend the thread.</DT
-><DT
-><A
-HREF="sdlsemwaittimeout.html"
->SDL_SemWaitTimeout</A
->&nbsp;--&nbsp;Lock a semaphore, but only wait up to a specified maximum time.</DT
-><DT
-><A
-HREF="sdlsempost.html"
->SDL_SemPost</A
->&nbsp;--&nbsp;Unlock a semaphore.</DT
-><DT
-><A
-HREF="sdlsemvalue.html"
->SDL_SemValue</A
->&nbsp;--&nbsp;Return the current value of a semaphore.</DT
-><DT
-><A
-HREF="sdlcreatecond.html"
->SDL_CreateCond</A
->&nbsp;--&nbsp;Create a condition variable</DT
-><DT
-><A
-HREF="sdldestroycond.html"
->SDL_DestroyCond</A
->&nbsp;--&nbsp;Destroy a condition variable</DT
-><DT
-><A
-HREF="sdlcondsignal.html"
->SDL_CondSignal</A
->&nbsp;--&nbsp;Restart a thread wait on a condition variable</DT
-><DT
-><A
-HREF="sdlcondbroadcast.html"
->SDL_CondBroadcast</A
->&nbsp;--&nbsp;Restart all threads waiting on a condition variable</DT
-><DT
-><A
-HREF="sdlcondwait.html"
->SDL_CondWait</A
->&nbsp;--&nbsp;Wait on a condition variable</DT
-><DT
-><A
-HREF="sdlcondwaittimeout.html"
->SDL_CondWaitTimeout</A
->&nbsp;--&nbsp;Wait on a condition variable, with timeout</DT
-></DL
-></DD
-><DT
->13. <A
-HREF="time.html"
->Time</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="sdlgetticks.html"
->SDL_GetTicks</A
->&nbsp;--&nbsp;Get the number of milliseconds since the SDL library initialization.</DT
-><DT
-><A
-HREF="sdldelay.html"
->SDL_Delay</A
->&nbsp;--&nbsp;Wait a specified number of milliseconds before returning.</DT
-><DT
-><A
-HREF="sdladdtimer.html"
->SDL_AddTimer</A
->&nbsp;--&nbsp;Add a timer which will call a callback after the specified number of milliseconds has
-elapsed.</DT
-><DT
-><A
-HREF="sdlremovetimer.html"
->SDL_RemoveTimer</A
->&nbsp;--&nbsp;Remove a timer which was added with
-<A
-HREF="sdladdtimer.html"
->SDL_AddTimer</A
->.</DT
-><DT
-><A
-HREF="sdlsettimer.html"
->SDL_SetTimer</A
->&nbsp;--&nbsp;Set a callback to run after the specified number of milliseconds has
-elapsed.</DT
-></DL
-></DD
-></DL
-></DD
-></DL
-></DIV
-><DIV
-CLASS="LOT"
-><DL
-CLASS="LOT"
-><DT
-><B
->List of Tables</B
-></DT
-><DT
->8-1. <A
-HREF="sdlkey.html#AEN4720"
->SDL Keysym definitions</A
-></DT
-><DT
->8-2. <A
-HREF="sdlkey.html#SDLMOD"
->SDL modifier definitions</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="LOT"
-><DL
-CLASS="LOT"
-><DT
-><B
->List of Examples</B
-></DT
-><DT
->1-1. <A
-HREF="guidebasicsinit.html#AEN60"
->Initializing SDL</A
-></DT
-><DT
->2-1. <A
-HREF="guidevideo.html#AEN71"
->Initializing the Video Display</A
-></DT
-><DT
->2-2. <A
-HREF="guidevideo.html#AEN77"
->Initializing the Best Video Mode</A
-></DT
-><DT
->2-3. <A
-HREF="guidevideo.html#AEN83"
->Loading and Displaying a BMP File</A
-></DT
-><DT
->2-4. <A
-HREF="guidevideo.html#AEN90"
->getpixel()</A
-></DT
-><DT
->2-5. <A
-HREF="guidevideo.html#AEN93"
->putpixel()</A
-></DT
-><DT
->2-6. <A
-HREF="guidevideo.html#AEN97"
->Using putpixel()</A
-></DT
-><DT
->2-7. <A
-HREF="guidevideoopengl.html#AEN114"
->Initializing SDL with OpenGL</A
-></DT
-><DT
->2-8. <A
-HREF="guidevideoopengl.html#AEN128"
->SDL and OpenGL</A
-></DT
-><DT
->3-1. <A
-HREF="guideinput.html#AEN141"
->Initializing SDL with Joystick Support</A
-></DT
-><DT
->3-2. <A
-HREF="guideinput.html#AEN154"
->Querying the Number of Available Joysticks</A
-></DT
-><DT
->3-3. <A
-HREF="guideinput.html#AEN183"
->Opening a Joystick</A
-></DT
-><DT
->3-4. <A
-HREF="guideinput.html#AEN191"
->Joystick Axis Events</A
-></DT
-><DT
->3-5. <A
-HREF="guideinput.html#AEN195"
->More Joystick Axis Events</A
-></DT
-><DT
->3-6. <A
-HREF="guideinput.html#AEN203"
->Joystick Button Events</A
-></DT
-><DT
->3-7. <A
-HREF="guideinput.html#AEN217"
->Joystick Ball Events</A
-></DT
-><DT
->3-8. <A
-HREF="guideinput.html#AEN244"
->Joystick Hat Events</A
-></DT
-><DT
->3-9. <A
-HREF="guideinput.html#AEN265"
->Querying Joystick Characteristics</A
-></DT
-><DT
->3-10. <A
-HREF="guideinputkeyboard.html#AEN334"
->Reading Keyboard Events</A
-></DT
-><DT
->3-11. <A
-HREF="guideinputkeyboard.html#AEN351"
->Interpreting Key Event Information</A
-></DT
-><DT
->3-12. <A
-HREF="guideinputkeyboard.html#AEN363"
->Proper Game Movement</A
-></DT
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="guide.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL Guide</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/joystick.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/joystick.html
deleted file mode 100644
index abdb28c1979..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/joystick.html
+++ /dev/null
@@ -1,296 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Joystick</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Reference"
-HREF="reference.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickEventState"
-HREF="sdljoystickeventstate.html"><LINK
-REL="NEXT"
-TITLE="SDL_NumJoysticks"
-HREF="sdlnumjoysticks.html"><META
-NAME="KEYWORD"
-CONTENT="joystick"><META
-NAME="KEYWORD"
-CONTENT="function"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoystickeventstate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlnumjoysticks.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="JOYSTICK"
-></A
->Chapter 9. Joystick</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="sdlnumjoysticks.html"
->SDL_NumJoysticks</A
->&nbsp;--&nbsp;Count available joysticks.</DT
-><DT
-><A
-HREF="sdljoystickname.html"
->SDL_JoystickName</A
->&nbsp;--&nbsp;Get joystick name.</DT
-><DT
-><A
-HREF="sdljoystickopen.html"
->SDL_JoystickOpen</A
->&nbsp;--&nbsp;Opens a joystick for use.</DT
-><DT
-><A
-HREF="sdljoystickopened.html"
->SDL_JoystickOpened</A
->&nbsp;--&nbsp;Determine if a joystick has been opened</DT
-><DT
-><A
-HREF="sdljoystickindex.html"
->SDL_JoystickIndex</A
->&nbsp;--&nbsp;Get the index of an SDL_Joystick.</DT
-><DT
-><A
-HREF="sdljoysticknumaxes.html"
->SDL_JoystickNumAxes</A
->&nbsp;--&nbsp;Get the number of joystick axes</DT
-><DT
-><A
-HREF="sdljoysticknumballs.html"
->SDL_JoystickNumBalls</A
->&nbsp;--&nbsp;Get the number of joystick trackballs</DT
-><DT
-><A
-HREF="sdljoysticknumhats.html"
->SDL_JoystickNumHats</A
->&nbsp;--&nbsp;Get the number of joystick hats</DT
-><DT
-><A
-HREF="sdljoysticknumbuttons.html"
->SDL_JoystickNumButtons</A
->&nbsp;--&nbsp;Get the number of joysitck buttons</DT
-><DT
-><A
-HREF="sdljoystickupdate.html"
->SDL_JoystickUpdate</A
->&nbsp;--&nbsp;Updates the state of all joysticks</DT
-><DT
-><A
-HREF="sdljoystickgetaxis.html"
->SDL_JoystickGetAxis</A
->&nbsp;--&nbsp;Get the current state of an axis</DT
-><DT
-><A
-HREF="sdljoystickgethat.html"
->SDL_JoystickGetHat</A
->&nbsp;--&nbsp;Get the current state of a joystick hat</DT
-><DT
-><A
-HREF="sdljoystickgetbutton.html"
->SDL_JoystickGetButton</A
->&nbsp;--&nbsp;Get the current state of a given button on a given joystick</DT
-><DT
-><A
-HREF="sdljoystickgetball.html"
->SDL_JoystickGetBall</A
->&nbsp;--&nbsp;Get relative trackball motion</DT
-><DT
-><A
-HREF="sdljoystickclose.html"
->SDL_JoystickClose</A
->&nbsp;--&nbsp;Closes a previously opened joystick</DT
-></DL
-></DIV
-><P
->Joysticks, and other similar input devices, have a very strong role in game playing and SDL provides comprehensive support for them. Axes, Buttons, POV Hats and trackballs are all supported.</P
-><P
->Joystick support is initialized by passed the <TT
-CLASS="LITERAL"
->SDL_INIT_JOYSTICK</TT
-> flag to <A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
->. Once initilized joysticks must be opened using <A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
->.</P
-><P
->While using the functions describe in this secton may seem like the best way to access and read from joysticks, in most cases they aren't. Ideally joysticks should be read using the <A
-HREF="event.html"
->event</A
-> system. To enable this, you must set the joystick event processing state with <A
-HREF="sdljoystickeventstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickEventState</TT
-></A
->. Joysticks must be <A
-HREF="sdljoystickopen.html"
->opened</A
-> before they can be used of course.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->If you are <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->not</I
-></SPAN
-> handling the joystick via the event queue then you must explicitly request a joystick update by calling <A
-HREF="sdljoystickupdate.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickUpdate</TT
-></A
->.</P
-></BLOCKQUOTE
-></DIV
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Force Feedback is not yet support. Sam (slouken@libsdl.org) is soliciting suggestions from people with force-feedback experience on the best wat to desgin the API.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoystickeventstate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlnumjoysticks.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickEventState</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="reference.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_NumJoysticks</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/reference.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/reference.html
deleted file mode 100644
index e7707a7504f..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/reference.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL Reference</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="PREVIOUS"
-TITLE="Time Examples"
-HREF="guidetimeexamples.html"><LINK
-REL="NEXT"
-TITLE="General"
-HREF="general.html"></HEAD
-><BODY
-CLASS="PART"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="guidetimeexamples.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="general.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="PART"
-><A
-NAME="REFERENCE"
-></A
-><DIV
-CLASS="TITLEPAGE"
-><H1
-CLASS="TITLE"
->II. SDL Reference</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
->5. <A
-HREF="general.html"
->General</A
-></DT
-><DT
->6. <A
-HREF="video.html"
->Video</A
-></DT
-><DT
->7. <A
-HREF="wm.html"
->Window Management</A
-></DT
-><DT
->8. <A
-HREF="event.html"
->Events</A
-></DT
-><DT
->9. <A
-HREF="joystick.html"
->Joystick</A
-></DT
-><DT
->10. <A
-HREF="audio.html"
->Audio</A
-></DT
-><DT
->11. <A
-HREF="cdrom.html"
->CD-ROM</A
-></DT
-><DT
->12. <A
-HREF="thread.html"
->Multi-threaded Programming</A
-></DT
-><DT
->13. <A
-HREF="time.html"
->Time</A
-></DT
-></DL
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="guidetimeexamples.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="general.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Time Examples</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->General</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlactiveevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlactiveevent.html
deleted file mode 100644
index d3f2821e728..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlactiveevent.html
+++ /dev/null
@@ -1,335 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_ActiveEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_Event"
-HREF="sdlevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_KeyboardEvent"
-HREF="sdlkeyboardevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlkeyboardevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLACTIVEEVENT"
-></A
->SDL_ActiveEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3955"
-></A
-><H2
->Name</H2
->SDL_ActiveEvent&nbsp;--&nbsp;Application visibility event structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3958"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type;
-  Uint8 gain;
-  Uint8 state;
-} SDL_ActiveEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3961"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN3963"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_ACTIVEEVENT.</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->gain</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->0 if the event is a loss or 1 if it is a gain.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_APPMOUSEFOCUS</TT
-> if mouse focus was gained or lost, <TT
-CLASS="LITERAL"
->SDL_APPINPUTFOCUS</TT
-> if input focus was gained or lost, or <TT
-CLASS="LITERAL"
->SDL_APPACTIVE</TT
-> if the application was iconified (<TT
-CLASS="STRUCTFIELD"
-><I
->gain</I
-></TT
->=0) or restored(<TT
-CLASS="STRUCTFIELD"
-><I
->gain</I
-></TT
->=1).</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3984"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_ActiveEvent</SPAN
-> is a member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union and is used when an event of type <TT
-CLASS="LITERAL"
->SDL_ACTIVEEVENT</TT
-> is reported.</P
-><P
->When the mouse leaves or enters the window area a <TT
-CLASS="LITERAL"
->SDL_APPMOUSEFOCUS</TT
-> type activation event occurs, if the mouse entered the window then <TT
-CLASS="STRUCTFIELD"
-><I
->gain</I
-></TT
-> will be 1, otherwise <TT
-CLASS="STRUCTFIELD"
-><I
->gain</I
-></TT
-> will be 0. A <TT
-CLASS="LITERAL"
->SDL_APPINPUTFOCUS</TT
-> type activation event occurs when the application loses or gains keyboard focus. This usually occurs when another application is made active. Finally, a <TT
-CLASS="LITERAL"
->SDL_APPACTIVE</TT
-> type event occurs when the application is either minimised/iconified (<TT
-CLASS="STRUCTFIELD"
-><I
->gain</I
-></TT
->=0) or restored.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->This event does not occur when an application window is first created.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4000"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlgetappstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetAppState</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlkeyboardevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_Event</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_KeyboardEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdladdtimer.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdladdtimer.html
deleted file mode 100644
index 81c49e56d65..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdladdtimer.html
+++ /dev/null
@@ -1,296 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_AddTimer</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Time"
-HREF="time.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_Delay"
-HREF="sdldelay.html"><LINK
-REL="NEXT"
-TITLE="SDL_RemoveTimer"
-HREF="sdlremovetimer.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdldelay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlremovetimer.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLADDTIMER"
-></A
->SDL_AddTimer</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8482"
-></A
-><H2
->Name</H2
->SDL_AddTimer&nbsp;--&nbsp;Add a timer which will call a callback after the specified number of milliseconds has
-elapsed.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8485"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8486"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_TimerID <B
-CLASS="FSFUNC"
->SDL_AddTimer</B
-></CODE
->(Uint32 interval, SDL_NewTimerCallback callback, void *param);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="SDLNEWTIMERCALLBACK"
-></A
-><H2
->Callback</H2
-><PRE
-CLASS="PROGRAMLISTING"
->/* type definition for the "new" timer callback function */
-typedef Uint32 (*SDL_NewTimerCallback)(Uint32 interval, void *param);</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8495"
-></A
-><H2
->Description</H2
-><P
->Adds a callback function to be run after the specified number of
-milliseconds has elapsed. The callback function is passed the current
-timer interval and the user supplied parameter from the
-<TT
-CLASS="FUNCTION"
->SDL_AddTimer</TT
-> call and returns the next timer
-interval. If the returned value from the callback is the same as the one
-passed in, the periodic alarm continues, otherwise a new alarm is
-scheduled.</P
-><P
->To cancel a currently running timer call
-<A
-HREF="sdlremovetimer.html"
->SDL_RemoveTimer</A
-> with the
-timer ID returned from
-<TT
-CLASS="FUNCTION"
->SDL_AddTimer</TT
->.</P
-><P
->The timer callback function may run in a different thread than your
-main program, and so shouldn't call any functions from within itself.
-You may always call <A
-HREF="sdlpushevent.html"
->SDL_PushEvent</A
->, however.</P
-><P
->The granularity of the timer is platform-dependent, but you should count
-on it being at least 10 ms as this is the most common number.
-This means that if
-you request a 16 ms timer, your callback will run approximately 20 ms
-later on an unloaded system.  If you wanted to set a flag signaling
-a frame update at 30 frames per second (every 33 ms), you might set a
-timer for 30 ms (see example below).
-
-If you use this function, you need to pass <TT
-CLASS="LITERAL"
->SDL_INIT_TIMER</TT
->
-to <A
-HREF="sdlinit.html"
->SDL_Init</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8507"
-></A
-><H2
->Return Value</H2
-><P
->Returns an ID value for the added timer or
-<SPAN
-CLASS="RETURNVALUE"
->NULL</SPAN
-> if there was an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8511"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->my_timer_id = SDL_AddTimer((33/10)*10, my_callbackfunc, my_callback_param);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8515"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlremovetimer.html"
-><TT
-CLASS="FUNCTION"
->SDL_RemoveTimer</TT
-></A
->,
-<A
-HREF="sdlpushevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PushEvent</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdldelay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlremovetimer.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_Delay</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="time.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_RemoveTimer</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlaudiocvt.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlaudiocvt.html
deleted file mode 100644
index ff39209080e..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlaudiocvt.html
+++ /dev/null
@@ -1,556 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_AudioCVT</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_FreeWAV"
-HREF="sdlfreewav.html"><LINK
-REL="NEXT"
-TITLE="SDL_BuildAudioCVT"
-HREF="sdlbuildaudiocvt.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlfreewav.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlbuildaudiocvt.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLAUDIOCVT"
-></A
->SDL_AudioCVT</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6884"
-></A
-><H2
->Name</H2
->SDL_AudioCVT&nbsp;--&nbsp;Audio Conversion Structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6887"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  int needed;
-  Uint16 src_format;
-  Uint16 dest_format;
-  double rate_incr;
-  Uint8 *buf;
-  int len;
-  int len_cvt;
-  int len_mult;
-  double len_ratio;
-  void (*filters[10])(struct SDL_AudioCVT *cvt, Uint16 format);
-  int filter_index;
-} SDL_AudioCVT;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6890"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN6892"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->needed</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Set to one if the conversion is possible</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->src_format</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Audio format of the source</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->dest_format</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Audio format of the destination</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->rate_incr</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Rate conversion increment</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->buf</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Audio buffer</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->len</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Length of the original audio buffer in bytes</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->len_cvt</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Length of converted audio buffer in bytes (calculated)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->len_mult</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->buf</I
-></TT
-> must be <TT
-CLASS="STRUCTFIELD"
-><I
->len</I
-></TT
->*<TT
-CLASS="STRUCTFIELD"
-><I
->len_mult</I
-></TT
-> bytes in size(calculated)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->len_ratio</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Final audio size is <TT
-CLASS="STRUCTFIELD"
-><I
->len</I
-></TT
->*<TT
-CLASS="STRUCTFIELD"
-><I
->len_ratio</I
-></TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->filters[10](..)</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Pointers to functions needed for this conversion</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->filter_index</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Current conversion function</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6944"
-></A
-><H2
->Description</H2
-><P
->The <SPAN
-CLASS="STRUCTNAME"
->SDL_AudioCVT</SPAN
-> is used to convert audio data between different formats. A <SPAN
-CLASS="STRUCTNAME"
->SDL_AudioCVT</SPAN
-> structure is created with the <A
-HREF="sdlbuildaudiocvt.html"
-><TT
-CLASS="FUNCTION"
->SDL_BuildAudioCVT</TT
-></A
-> function, while the actual conversion is done by the <A
-HREF="sdlconvertaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_ConvertAudio</TT
-></A
-> function.</P
-><P
->Many of the fields in the <SPAN
-CLASS="STRUCTNAME"
->SDL_AudioCVT</SPAN
-> structure should be considered private and their function will not be discussed here.</P
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
-><SPAN
-CLASS="TYPE"
->Uint8 *</SPAN
-><TT
-CLASS="STRUCTFIELD"
-><I
->buf</I
-></TT
-></DT
-><DD
-><P
->This points to the audio data that will be used in the conversion. It is both the source and the destination, which means the converted audio data overwrites the original data. It also means that the converted data may be larger than the original data (if you were converting from 8-bit to 16-bit, for instance), so you must ensure <TT
-CLASS="STRUCTFIELD"
-><I
->buf</I
-></TT
-> is large enough. See below.</P
-></DD
-><DT
-><SPAN
-CLASS="TYPE"
->int</SPAN
-> <TT
-CLASS="STRUCTFIELD"
-><I
->len</I
-></TT
-></DT
-><DD
-><P
->This is the length of the original audio data in bytes.</P
-></DD
-><DT
-><SPAN
-CLASS="TYPE"
->int</SPAN
-> <TT
-CLASS="STRUCTFIELD"
-><I
->len_mult</I
-></TT
-></DT
-><DD
-><P
->As explained above, the audio buffer needs to be big enough to store the converted data, which may be bigger than the original audio data. The length of <TT
-CLASS="STRUCTFIELD"
-><I
->buf</I
-></TT
-> should be <TT
-CLASS="STRUCTFIELD"
-><I
->len</I
-></TT
->*<TT
-CLASS="STRUCTFIELD"
-><I
->len_mult</I
-></TT
->.</P
-></DD
-><DT
-><SPAN
-CLASS="TYPE"
->double</SPAN
-> <TT
-CLASS="STRUCTFIELD"
-><I
->len_ratio</I
-></TT
-></DT
-><DD
-><P
->When you have finished converting your audio data, you need to know how much of your audio buffer is valid. <TT
-CLASS="STRUCTFIELD"
-><I
->len</I
-></TT
->*<TT
-CLASS="STRUCTFIELD"
-><I
->len_ratio</I
-></TT
-> is the size of the converted audio data in bytes. This is very similar to <TT
-CLASS="STRUCTFIELD"
-><I
->len_mult</I
-></TT
->, however when the convert audio data is shorter than the original <TT
-CLASS="STRUCTFIELD"
-><I
->len_mult</I
-></TT
-> would be 1. <TT
-CLASS="STRUCTFIELD"
-><I
->len_ratio</I
-></TT
->, on the other hand, would be a fractional number between 0 and 1.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6989"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlbuildaudiocvt.html"
-><TT
-CLASS="FUNCTION"
->SDL_BuildAudioCVT</TT
-></A
->,
-<A
-HREF="sdlconvertaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_ConvertAudio</TT
-></A
->,
-<A
-HREF="sdlaudiospec.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_AudioSpec</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlfreewav.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlbuildaudiocvt.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_FreeWAV</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_BuildAudioCVT</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlaudiospec.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlaudiospec.html
deleted file mode 100644
index fc6fa75035d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlaudiospec.html
+++ /dev/null
@@ -1,589 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_AudioSpec</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="NEXT"
-TITLE="SDL_OpenAudio"
-HREF="sdlopenaudio.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="audio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlopenaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLAUDIOSPEC"
-></A
->SDL_AudioSpec</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6507"
-></A
-><H2
->Name</H2
->SDL_AudioSpec&nbsp;--&nbsp;Audio Specification Structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6510"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  int freq;
-  Uint16 format;
-  Uint8 channels;
-  Uint8 silence;
-  Uint16 samples;
-  Uint32 size;
-  void (*callback)(void *userdata, Uint8 *stream, int len);
-  void *userdata;
-} SDL_AudioSpec;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6513"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN6515"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->freq</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Audio frequency in samples per second</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->format</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Audio data format</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->channels</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Number of channels: 1 mono, 2 stereo</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->silence</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Audio buffer silence value (calculated)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->samples</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Audio buffer size in samples</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->size</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Audio buffer size in bytes (calculated)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->callback(..)</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Callback function for filling the audio buffer</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->userdata</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Pointer the user data which is passed to the callback function</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6550"
-></A
-><H2
->Description</H2
-><P
->The <SPAN
-CLASS="STRUCTNAME"
->SDL_AudioSpec</SPAN
-> structure is used to describe the format of some audio data. This structure is used by <A
-HREF="sdlopenaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-></A
-> and <A
-HREF="sdlloadwav.html"
-><TT
-CLASS="FUNCTION"
->SDL_LoadWAV</TT
-></A
->. While all fields are used by <TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-> only <TT
-CLASS="STRUCTFIELD"
-><I
->freq</I
-></TT
->, <TT
-CLASS="STRUCTFIELD"
-><I
->format</I
-></TT
->, <TT
-CLASS="STRUCTFIELD"
-><I
->samples</I
-></TT
-> and <TT
-CLASS="STRUCTFIELD"
-><I
->channels</I
-></TT
-> are used by <TT
-CLASS="FUNCTION"
->SDL_LoadWAV</TT
->. We will detail these common members here.</P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN6564"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->freq</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->The number of samples sent to the sound device every second. Common values are 11025, 22050 and 44100. The higher the better.</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->format</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->Specifies the size and type of each sample element
-<P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
-><TT
-CLASS="LITERAL"
->AUDIO_U8</TT
-></DT
-><DD
-><P
->Unsigned 8-bit samples</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->AUDIO_S8</TT
-></DT
-><DD
-><P
->Signed 8-bit samples</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->AUDIO_U16</TT
-> or <TT
-CLASS="LITERAL"
->AUDIO_U16LSB</TT
-></DT
-><DD
-><P
->Unsigned 16-bit little-endian samples</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->AUDIO_S16</TT
-> or <TT
-CLASS="LITERAL"
->AUDIO_S16LSB</TT
-></DT
-><DD
-><P
->Signed 16-bit little-endian samples</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->AUDIO_U16MSB</TT
-></DT
-><DD
-><P
->Unsigned 16-bit big-endian samples</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->AUDIO_S16MSB</TT
-></DT
-><DD
-><P
->Signed 16-bit big-endian samples</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->AUDIO_U16SYS</TT
-></DT
-><DD
-><P
->Either <TT
-CLASS="LITERAL"
->AUDIO_U16LSB</TT
-> or <TT
-CLASS="LITERAL"
->AUDIO_U16MSB</TT
-> depending on you systems endianness</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->AUDIO_S16SYS</TT
-></DT
-><DD
-><P
->Either <TT
-CLASS="LITERAL"
->AUDIO_S16LSB</TT
-> or <TT
-CLASS="LITERAL"
->AUDIO_S16MSB</TT
-> depending on you systems endianness</P
-></DD
-></DL
-></DIV
-></P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->channels</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The number of seperate sound channels. 1 is mono (single channel), 2 is stereo (dual channel).</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->samples</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->When used with <A
-HREF="sdlopenaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-></A
-> this refers to the size of the audio buffer in samples. A sample a chunk of audio data of the size specified in <TT
-CLASS="PARAMETER"
-><I
->format</I
-></TT
-> mulitplied by the number of channels. When the <SPAN
-CLASS="STRUCTNAME"
->SDL_AudioSpec</SPAN
-> is used with <A
-HREF="sdlloadwav.html"
-><TT
-CLASS="FUNCTION"
->SDL_LoadWAV</TT
-></A
-> <TT
-CLASS="STRUCTFIELD"
-><I
->samples</I
-></TT
-> is set to 4096.</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6639"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlopenaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-></A
->,
-<A
-HREF="sdlloadwav.html"
-><TT
-CLASS="FUNCTION"
->SDL_LoadWAV</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlopenaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Audio</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_OpenAudio</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlblitsurface.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlblitsurface.html
deleted file mode 100644
index 3123ff5dde1..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlblitsurface.html
+++ /dev/null
@@ -1,339 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_BlitSurface</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_ConvertSurface"
-HREF="sdlconvertsurface.html"><LINK
-REL="NEXT"
-TITLE="SDL_FillRect"
-HREF="sdlfillrect.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlconvertsurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlfillrect.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLBLITSURFACE"
-></A
->SDL_BlitSurface</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2299"
-></A
-><H2
->Name</H2
->SDL_BlitSurface&nbsp;--&nbsp;This performs a fast blit from the source surface to the destination surface.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2302"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2303"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_BlitSurface</B
-></CODE
->(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2309"
-></A
-><H2
->Description</H2
-><P
->This performs a fast blit from the source surface to the destination surface.</P
-><P
->The width and height in <TT
-CLASS="PARAMETER"
-><I
->srcrect</I
-></TT
-> determine the
-size of the copied rectangle. Only the position is used in the
-<TT
-CLASS="PARAMETER"
-><I
->dstrect</I
-></TT
-> (the width and height are ignored).</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->srcrect</I
-></TT
-> is <TT
-CLASS="LITERAL"
->NULL</TT
->, the
-entire surface is copied. If <TT
-CLASS="PARAMETER"
-><I
->dstrect</I
-></TT
-> is
-<TT
-CLASS="LITERAL"
->NULL</TT
->, then the destination position (upper left
-corner) is (0, 0).</P
-><P
->The final blit rectangle is saved in
-<TT
-CLASS="PARAMETER"
-><I
->dstrect</I
-></TT
-> after all clipping is performed
-(<TT
-CLASS="PARAMETER"
-><I
->srcrect</I
-></TT
-> is not modified).</P
-><P
->The blit function should not be called on a locked surface.</P
-><P
->The results of blitting operations vary greatly depending on whether <TT
-CLASS="LITERAL"
->SDL_SRCAPLHA</TT
-> is set or not. See <A
-HREF="sdlsetalpha.html"
->SDL_SetAlpha</A
-> for an explaination of how this affects your results. Colorkeying and alpha attributes also interact with surface blitting, as the following pseudo-code should hopefully explain.
-<PRE
-CLASS="PROGRAMLISTING"
->if (source surface has SDL_SRCALPHA set) {
-    if (source surface has alpha channel (that is, format-&#62;Amask != 0))
-        blit using per-pixel alpha, ignoring any colour key
-    else {
-        if (source surface has SDL_SRCCOLORKEY set)
-            blit using the colour key AND the per-surface alpha value
-        else
-            blit using the per-surface alpha value
-    }
-} else {
-    if (source surface has SDL_SRCCOLORKEY set)
-        blit using the colour key
-    else
-        ordinary opaque rectangular blit
-}</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2328"
-></A
-><H2
->Return Value</H2
-><P
->If the blit is successful, it returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->,
-otherwise it returns <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
->.</P
-><P
->If either of the surfaces were in video memory, and the blit returns
-<SPAN
-CLASS="RETURNVALUE"
->-2</SPAN
->, the video memory was lost, so it should be
-reloaded with artwork and re-blitted:
-<PRE
-CLASS="PROGRAMLISTING"
->        while ( SDL_BlitSurface(image, imgrect, screen, dstrect) == -2 ) {
-                while ( SDL_LockSurface(image)) &#60; 0 )
-                        SDL_Delay(10);
-                -- Write image pixels to image-&#62;pixels --
-                SDL_UnlockSurface(image);
-        }</PRE
->
-This happens under DirectX 5.0 when the system switches away from your
-fullscreen application.  Locking the surface will also fail until you
-have access to the video memory again.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2336"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdllocksurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
-></A
->,
-<A
-HREF="sdlfillrect.html"
-><TT
-CLASS="FUNCTION"
->SDL_FillRect</TT
-></A
->,
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
->,
-<A
-HREF="sdlrect.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Rect</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlconvertsurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlfillrect.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_ConvertSurface</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_FillRect</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlbuildaudiocvt.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlbuildaudiocvt.html
deleted file mode 100644
index 2e8420e8a9c..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlbuildaudiocvt.html
+++ /dev/null
@@ -1,291 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_BuildAudioCVT</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_AudioCVT"
-HREF="sdlaudiocvt.html"><LINK
-REL="NEXT"
-TITLE="SDL_ConvertAudio"
-HREF="sdlconvertaudio.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlaudiocvt.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlconvertaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLBUILDAUDIOCVT"
-></A
->SDL_BuildAudioCVT</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7002"
-></A
-><H2
->Name</H2
->SDL_BuildAudioCVT&nbsp;--&nbsp;Initializes a SDL_AudioCVT structure for conversion</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7005"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7006"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_BuildAudioCVT</B
-></CODE
->(SDL_AudioCVT *cvt, Uint16 src_format, Uint8 src_channels, int src_rate, Uint16 dst_format, Uint8 dst_channels, int dst_rate);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7012"
-></A
-><H2
->Description</H2
-><P
->Before an <A
-HREF="sdlaudiocvt.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_AudioCVT</SPAN
-></A
-> structure can be used to convert audio data it must be initialized with source and destination information. </P
-><P
-><TT
-CLASS="PARAMETER"
-><I
->src_format</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->dst_format</I
-></TT
-> are the source and destination format of the conversion. (For information on audio formats see <A
-HREF="sdlaudiospec.html"
-><SPAN
-CLASS="STRUCTNAME"
-> SDL_AudioSpec</SPAN
-></A
->). <TT
-CLASS="PARAMETER"
-><I
->src_channels</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->dst_channels</I
-></TT
-> are the number of channels in the source and destination formats. Finally, <TT
-CLASS="PARAMETER"
-><I
->src_rate</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->dst_rate</I
-></TT
-> are the frequency or samples-per-second of the source and destination formats. Once again, see <A
-HREF="sdlaudiospec.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_AudioSpec</SPAN
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7028"
-></A
-><H2
->Return Values</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> if the filter could not be built or 1 if it could.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7032"
-></A
-><H2
->Examples</H2
-><P
->See <A
-HREF="sdlconvertaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_ConvertAudio</TT
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7037"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlconvertaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_ConvertAudio</TT
-></A
->,
-<A
-HREF="sdlaudiocvt.html"
-><TT
-CLASS="FUNCTION"
->SDL_AudioCVT</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlaudiocvt.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlconvertaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_AudioCVT</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_ConvertAudio</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcd.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcd.html
deleted file mode 100644
index 6f8a7cdf60d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcd.html
+++ /dev/null
@@ -1,359 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CD</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDClose"
-HREF="sdlcdclose.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDtrack"
-HREF="sdlcdtrack.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdclose.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdtrack.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCD"
-></A
->SDL_CD</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7566"
-></A
-><H2
->Name</H2
->SDL_CD&nbsp;--&nbsp;CDROM Drive Information</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7569"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  int id;
-  CDstatus status;
-  int numtracks;
-  int cur_track;
-  int cur_frame;
-  SDL_CDtrack track[SDL_MAX_TRACKS+1];
-} SDL_CD;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7572"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN7574"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->id</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Private drive identifier</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->status</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Drive <A
-HREF="sdlcdstatus.html"
->status</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->numtracks</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Number of tracks on the CD</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->cur_track</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Current track</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->cur_frame</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Current frame offset within the track</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->track</I
-></TT
->[SDL_MAX_TRACKS+1]</TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Array of track descriptions. (see <A
-HREF="sdlcdtrack.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_CDtrack</SPAN
-></A
->)</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7604"
-></A
-><H2
->Description</H2
-><P
->An <SPAN
-CLASS="STRUCTNAME"
->SDL_CD</SPAN
-> structure is returned by <A
-HREF="sdlcdopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDOpen</TT
-></A
->. It represents an opened CDROM device and stores information on the layout of the tracks on the disc.</P
-><P
->A frame is the base data unit of a CD. <TT
-CLASS="LITERAL"
->CD_FPS</TT
-> frames is equal to 1 second of music. SDL provides two macros for converting between time and frames: <TT
-CLASS="LITERAL"
->FRAMES_TO_MSF(f, M,S,F)</TT
-> and <TT
-CLASS="LITERAL"
->MSF_TO_FRAMES</TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7614"
-></A
-><H2
->Examples</H2
-><PRE
-CLASS="PROGRAMLISTING"
->int min, sec, frame;
-int frame_offset;
-
-FRAMES_TO_MSF(cdrom-&#62;cur_frame, &#38;min, &#38;sec, &#38;frame);
-printf("Current Position: %d minutes, %d seconds, %d frames\n", min, sec, frame);
-
-frame_offset=MSF_TO_FRAMES(min, sec, frame);</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7617"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcdopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDOpen</TT
-></A
->,
-<A
-HREF="sdlcdtrack.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_CDtrack</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdclose.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdtrack.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDClose</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDtrack</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdclose.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdclose.html
deleted file mode 100644
index 2a984a8b474..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdclose.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDClose</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDEject"
-HREF="sdlcdeject.html"><LINK
-REL="NEXT"
-TITLE="SDL_CD"
-HREF="sdlcd.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdeject.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcd.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDCLOSE"
-></A
->SDL_CDClose</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7541"
-></A
-><H2
->Name</H2
->SDL_CDClose&nbsp;--&nbsp;Closes a SDL_CD handle</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7544"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7545"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_CDClose</B
-></CODE
->(SDL_CD *cdrom);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7551"
-></A
-><H2
->Description</H2
-><P
->Closes the given <TT
-CLASS="PARAMETER"
-><I
->cdrom</I
-></TT
-> handle.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7555"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcdopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDOpen</TT
-></A
->,
-<A
-HREF="sdlcd.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_CD</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdeject.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcd.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDEject</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CD</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdeject.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdeject.html
deleted file mode 100644
index 03a3b780b5b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdeject.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDEject</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDStop"
-HREF="sdlcdstop.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDClose"
-HREF="sdlcdclose.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdstop.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdclose.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDEJECT"
-></A
->SDL_CDEject</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7513"
-></A
-><H2
->Name</H2
->SDL_CDEject&nbsp;--&nbsp;Ejects a CDROM</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7516"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7517"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_CDEject</B
-></CODE
->(SDL_CD *cdrom);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7523"
-></A
-><H2
->Description</H2
-><P
->Ejects the given <TT
-CLASS="PARAMETER"
-><I
->cdrom</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7527"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7532"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcd.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_CD</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdstop.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdclose.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDStop</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDClose</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdname.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdname.html
deleted file mode 100644
index 55a18e26e3a..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdname.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDName</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDNumDrives"
-HREF="sdlcdnumdrives.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDOpen"
-HREF="sdlcdopen.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdnumdrives.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdopen.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDNAME"
-></A
->SDL_CDName</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7240"
-></A
-><H2
->Name</H2
->SDL_CDName&nbsp;--&nbsp;Returns a human-readable, system-dependent identifier for the CD-ROM.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7243"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7244"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->const char *<B
-CLASS="FSFUNC"
->SDL_CDName</B
-></CODE
->(int drive);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7250"
-></A
-><H2
->Description</H2
-><P
->Returns a human-readable, system-dependent identifier for the CD-ROM. <TT
-CLASS="PARAMETER"
-><I
->drive</I
-></TT
-> is the index of the drive. Drive indices start to 0 and end at <TT
-CLASS="FUNCTION"
->SDL_CDNumDrives()</TT
->-1.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7255"
-></A
-><H2
->Examples</H2
-><P
-><P
-></P
-><UL
-><LI
-><P
->"/dev/cdrom"</P
-></LI
-><LI
-><P
->"E:"</P
-></LI
-><LI
-><P
->"/dev/disk/ide/1/master"</P
-></LI
-></UL
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7265"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcdnumdrives.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDNumDrives</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdnumdrives.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdopen.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDNumDrives</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDOpen</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdnumdrives.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdnumdrives.html
deleted file mode 100644
index 9816a739bbc..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdnumdrives.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDNumDrives</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDName"
-HREF="sdlcdname.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="cdrom.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdname.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDNUMDRIVES"
-></A
->SDL_CDNumDrives</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7218"
-></A
-><H2
->Name</H2
->SDL_CDNumDrives&nbsp;--&nbsp;Returns the number of CD-ROM drives on the system.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7221"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7222"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_CDNumDrives</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7228"
-></A
-><H2
->Description</H2
-><P
->Returns the number of CD-ROM drives on the system.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7231"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcdopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDOpen</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdname.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->CD-ROM</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDName</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdopen.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdopen.html
deleted file mode 100644
index 09a6bd9f784..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdopen.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDOpen</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDName"
-HREF="sdlcdname.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDStatus"
-HREF="sdlcdstatus.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdname.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdstatus.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDOPEN"
-></A
->SDL_CDOpen</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7274"
-></A
-><H2
->Name</H2
->SDL_CDOpen&nbsp;--&nbsp;Opens a CD-ROM drive for access.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7277"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7278"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_CD *<B
-CLASS="FSFUNC"
->SDL_CDOpen</B
-></CODE
->(int drive);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7284"
-></A
-><H2
->Description</H2
-><P
->Opens a CD-ROM drive for access.  It returns a <A
-HREF="sdlcd.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_CD</SPAN
-></A
-> structure on success, or <TT
-CLASS="LITERAL"
->NULL</TT
-> if the drive was invalid or busy.  This newly opened CD-ROM becomes the default CD used when other CD functions are passed a <TT
-CLASS="LITERAL"
->NULL</TT
-> CD-ROM handle. </P
-><P
->Drives are numbered starting with 0.  
-Drive 0 is the system default CD-ROM.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7292"
-></A
-><H2
->Examples</H2
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_CD *cdrom;
-int cur_track;
-int min, sec, frame;
-SDL_Init(SDL_INIT_CDROM);
-atexit(SDL_Quit);
-
-/* Check for CD drives */
-if(!SDL_CDNumDrives()){
-  /* None found */
-  fprintf(stderr, "No CDROM devices available\n");
-  exit(-1);
-}
-
-/* Open the default drive */
-cdrom=SDL_CDOpen(0);
-
-/* Did if open? Check if cdrom is NULL */
-if(!cdrom){
-  fprintf(stderr, "Couldn't open drive: %s\n", SDL_GetError());
-  exit(-1);
-}
-
-/* Print Volume info */
-printf("Name: %s\n", SDL_CDName(0));
-printf("Tracks: %d\n", cdrom-&#62;numtracks);
-for(cur_track=0;cur_track &#60; cdrom-&#62;numtracks; cur_track++){
-  FRAMES_TO_MSF(cdrom-&#62;track[cur_track].length, &#38;min, &#38;sec, &#38;frame);
-  printf("\tTrack %d: Length %d:%d\n", cur_track, min, sec);
-}
-
-SDL_CDClose(cdrom);</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7295"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcd.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_CD</SPAN
-></A
->,
-<A
-HREF="sdlcdtrack.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_CDtrack</SPAN
-></A
->,
-<A
-HREF="sdlcdclose.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDClose</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdname.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdstatus.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDName</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDStatus</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdpause.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdpause.html
deleted file mode 100644
index 4def8e362e8..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdpause.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDPause</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDPlayTracks"
-HREF="sdlcdplaytracks.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDResume"
-HREF="sdlcdresume.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdplaytracks.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdresume.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDPAUSE"
-></A
->SDL_CDPause</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7425"
-></A
-><H2
->Name</H2
->SDL_CDPause&nbsp;--&nbsp;Pauses a CDROM</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7428"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7429"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_CDPause</B
-></CODE
->(SDL_CD *cdrom);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7435"
-></A
-><H2
->Description</H2
-><P
->Pauses play on the given <TT
-CLASS="PARAMETER"
-><I
->cdrom</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7439"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7444"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcdplay.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDPlay</TT
-></A
->,
-<A
-HREF="sdlcdresume.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDResume</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdplaytracks.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdresume.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDPlayTracks</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDResume</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdplay.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdplay.html
deleted file mode 100644
index dc6489cc8dc..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdplay.html
+++ /dev/null
@@ -1,243 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDPlay</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDStatus"
-HREF="sdlcdstatus.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDPlayTracks"
-HREF="sdlcdplaytracks.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdstatus.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdplaytracks.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDPLAY"
-></A
->SDL_CDPlay</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7343"
-></A
-><H2
->Name</H2
->SDL_CDPlay&nbsp;--&nbsp;Play a CD</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7346"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7347"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_CDPlay</B
-></CODE
->(SDL_CD *cdrom, int start, int length);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7353"
-></A
-><H2
->Description</H2
-><P
->Plays the given <TT
-CLASS="PARAMETER"
-><I
->cdrom</I
-></TT
->, starting a frame <TT
-CLASS="PARAMETER"
-><I
->start</I
-></TT
-> for <TT
-CLASS="PARAMETER"
-><I
->length</I
-></TT
-> frames.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7359"
-></A
-><H2
->Return Values</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7364"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcdplaytracks.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDPlayTracks</TT
-></A
->,
-<A
-HREF="sdlcdstop.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDStop</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdstatus.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdplaytracks.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDStatus</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDPlayTracks</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdplaytracks.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdplaytracks.html
deleted file mode 100644
index 75461819045..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdplaytracks.html
+++ /dev/null
@@ -1,325 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDPlayTracks</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDPlay"
-HREF="sdlcdplay.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDPause"
-HREF="sdlcdpause.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdplay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdpause.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDPLAYTRACKS"
-></A
->SDL_CDPlayTracks</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7375"
-></A
-><H2
->Name</H2
->SDL_CDPlayTracks&nbsp;--&nbsp;Play the given CD track(s)</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7378"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7379"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_CDPlayTracks</B
-></CODE
->(SDL_CD *cdrom, int start_track, int start_frame, int ntracks, int nframes));</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7385"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_CDPlayTracks</TT
-> plays the given CD starting at track
-<TT
-CLASS="PARAMETER"
-><I
->start_track</I
-></TT
->, for <TT
-CLASS="PARAMETER"
-><I
->ntracks</I
-></TT
-> tracks.  </P
-><P
-><TT
-CLASS="PARAMETER"
-><I
->start_frame</I
-></TT
-> is the frame offset, from the beginning of the <TT
-CLASS="PARAMETER"
-><I
->start_track</I
-></TT
->, at which to start. <TT
-CLASS="PARAMETER"
-><I
->nframes</I
-></TT
-> is the frame offset, from the beginning of the last track (<TT
-CLASS="PARAMETER"
-><I
->start_track</I
-></TT
->+<TT
-CLASS="PARAMETER"
-><I
->ntracks</I
-></TT
->), at which to end playing.</P
-><P
-><TT
-CLASS="FUNCTION"
->SDL_CDPlayTracks</TT
-> should only be called after calling 
-<A
-HREF="sdlcdstatus.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDStatus</TT
-></A
-> 
-to get track information about the CD.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Data tracks are ignored.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7403"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> 
-if there was an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7408"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->/* assuming cdrom is a previously opened device */
-/* Play the entire CD */
-if(CD_INDRIVE(SDL_CDStatus(cdrom)))
-  SDL_CDPlayTracks(cdrom, 0, 0, 0, 0);
-
-/* Play the first track */
-if(CD_INDRIVE(SDL_CDStatus(cdrom)))
-  SDL_CDPlayTracks(cdrom, 0, 0, 1, 0);
-
-/* Play first 15 seconds of the 2nd track */
-if(CD_INDRIVE(SDL_CDStatus(cdrom)))
-  SDL_CDPlayTracks(cdrom, 1, 0, 0, CD_FPS*15);</PRE
->
-&#13;</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7412"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcdplay.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDPlay</TT
-></A
->,
-<A
-HREF="sdlcdstatus.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDStatus</TT
-></A
->,
-<A
-HREF="sdlcd.html"
-><TT
-CLASS="FUNCTION"
->SDL_CD</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdplay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdpause.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDPlay</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDPause</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdresume.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdresume.html
deleted file mode 100644
index 4a25ab69b6e..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdresume.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDResume</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDPause"
-HREF="sdlcdpause.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDStop"
-HREF="sdlcdstop.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdpause.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdstop.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDRESUME"
-></A
->SDL_CDResume</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7455"
-></A
-><H2
->Name</H2
->SDL_CDResume&nbsp;--&nbsp;Resumes a CDROM</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7458"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7459"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_CDResume</B
-></CODE
->(SDL_CD *cdrom);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7465"
-></A
-><H2
->Description</H2
-><P
->Resumes play on the given <TT
-CLASS="PARAMETER"
-><I
->cdrom</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7469"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7474"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcdplay.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDPlay</TT
-></A
->,
-<A
-HREF="sdlcdpause.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDPause</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdpause.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdstop.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDPause</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDStop</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdstatus.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdstatus.html
deleted file mode 100644
index 3ebf9657e65..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdstatus.html
+++ /dev/null
@@ -1,273 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDStatus</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDOpen"
-HREF="sdlcdopen.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDPlay"
-HREF="sdlcdplay.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdopen.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdplay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDSTATUS"
-></A
->SDL_CDStatus</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7308"
-></A
-><H2
->Name</H2
->SDL_CDStatus&nbsp;--&nbsp;Returns the current status of the given drive.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7311"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7312"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->CDstatus <B
-CLASS="FSFUNC"
->SDL_CDStatus</B
-></CODE
->(SDL_CD *cdrom);</CODE
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->/* Given a status, returns true if there's a disk in the drive */
-#define CD_INDRIVE(status)      ((int)status &#62; 0)</PRE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7319"
-></A
-><H2
->Description</H2
-><P
->This function returns the current status of the given drive. Status is described like so:
-<PRE
-CLASS="PROGRAMLISTING"
->typedef enum {
-  CD_TRAYEMPTY,
-  CD_STOPPED,
-  CD_PLAYING,
-  CD_PAUSED,
-  CD_ERROR = -1
-} CDstatus;</PRE
-></P
-><P
->If the drive has a CD in it, the table of contents of the CD and current
-play position of the CD will be stored in the SDL_CD structure.</P
-><P
->The macro <TT
-CLASS="LITERAL"
->CD_INDRIVE</TT
-> is provided for convenience, 
-and given a status returns true if there's a disk in the drive.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
-><TT
-CLASS="FUNCTION"
->SDL_CDStatus</TT
-> also updates the <A
-HREF="sdlcd.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_CD</SPAN
-></A
-> structure passed to it.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7331"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->int playTrack(int track)
-{
-  int playing = 0;
-
-  if ( CD_INDRIVE(SDL_CDStatus(cdrom)) ) {
-  /* clamp to the actual number of tracks on the CD */
-    if (track &#62;= cdrom-&#62;numtracks) {
-      track = cdrom-&#62;numtracks-1;
-    }
-
-    if ( SDL_CDPlayTracks(cdrom, track, 0, 1, 0) == 0 ) {
-      playing = 1;
-    }
-  }
-  return playing;
-}</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7334"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcd.html"
-><TT
-CLASS="FUNCTION"
->SDL_CD</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdopen.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdplay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDOpen</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDPlay</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdstop.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdstop.html
deleted file mode 100644
index 68f8d81bed5..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdstop.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDStop</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDResume"
-HREF="sdlcdresume.html"><LINK
-REL="NEXT"
-TITLE="SDL_CDEject"
-HREF="sdlcdeject.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdresume.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcdeject.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDSTOP"
-></A
->SDL_CDStop</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7485"
-></A
-><H2
->Name</H2
->SDL_CDStop&nbsp;--&nbsp;Stops a CDROM</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7488"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7489"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_CDStop</B
-></CODE
->(SDL_CD *cdrom);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7495"
-></A
-><H2
->Description</H2
-><P
->Stops play on the given <TT
-CLASS="PARAMETER"
-><I
->cdrom</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7499"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7504"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcdplay.html"
-><TT
-CLASS="FUNCTION"
->SDL_CDPlay</TT
-></A
->,</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdresume.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcdeject.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDResume</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CDEject</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdtrack.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdtrack.html
deleted file mode 100644
index bbb04bbd252..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcdtrack.html
+++ /dev/null
@@ -1,313 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CDtrack</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="CD-ROM"
-HREF="cdrom.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CD"
-HREF="sdlcd.html"><LINK
-REL="NEXT"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcd.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="thread.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCDTRACK"
-></A
->SDL_CDtrack</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7628"
-></A
-><H2
->Name</H2
->SDL_CDtrack&nbsp;--&nbsp;CD Track Information Structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7631"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 id;
-  Uint8 type;
-  Uint32 length;
-  Uint32 offset;
-} SDL_CDtrack;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7634"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN7636"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->id</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Track number (0-99)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_AUDIO_TRACK</TT
-> or <TT
-CLASS="LITERAL"
->SDL_DATA_TRACK</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->length</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Length, in frames, of this track</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->offset</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Frame offset to the beginning of this track</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7657"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_CDtrack</SPAN
-> stores data on each track on a CD, its fields should be pretty self explainatory. It is a member a the <A
-HREF="sdlcd.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_CD</SPAN
-></A
-> structure.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Frames can be converted to standard timings. There are <TT
-CLASS="LITERAL"
->CD_FPS</TT
-> frames per second, so <SPAN
-CLASS="STRUCTNAME"
->SDL_CDtrack</SPAN
->.<TT
-CLASS="STRUCTFIELD"
-><I
->length</I
-></TT
->/<TT
-CLASS="LITERAL"
->CD_FPS</TT
->=length_in_seconds.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7669"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcd.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_CD</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcd.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CD</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Multi-threaded Programming</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcloseaudio.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcloseaudio.html
deleted file mode 100644
index 599f058e443..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcloseaudio.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CloseAudio</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_UnlockAudio"
-HREF="sdlunlockaudio.html"><LINK
-REL="NEXT"
-TITLE="CD-ROM"
-HREF="cdrom.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlunlockaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="cdrom.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCLOSEAUDIO"
-></A
->SDL_CloseAudio</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7180"
-></A
-><H2
->Name</H2
->SDL_CloseAudio&nbsp;--&nbsp;Shuts down audio processing and closes the audio device.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7183"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7184"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_CloseAudio</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7190"
-></A
-><H2
->Description</H2
-><P
->This function shuts down audio processing and closes the audio device.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7193"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlopenaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-></A
-> </P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlunlockaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="cdrom.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_UnlockAudio</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->CD-ROM</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcolor.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcolor.html
deleted file mode 100644
index c8b7d44fc99..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcolor.html
+++ /dev/null
@@ -1,300 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_Color</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_Rect"
-HREF="sdlrect.html"><LINK
-REL="NEXT"
-TITLE="SDL_Palette"
-HREF="sdlpalette.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlrect.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlpalette.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCOLOR"
-></A
->SDL_Color</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3082"
-></A
-><H2
->Name</H2
->SDL_Color&nbsp;--&nbsp;Format independent color description</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3085"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 r;
-  Uint8 g;
-  Uint8 b;
-  Uint8 unused;
-} SDL_Color;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3088"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN3090"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->r</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Red intensity</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->g</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Green intensity</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->b</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Blue intensity</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->unused</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Unused</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3109"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Color</SPAN
-> describes a color in a format independent way. You can convert a <SPAN
-CLASS="STRUCTNAME"
->SDL_Color</SPAN
-> to a pixel value for a certain pixel format using <A
-HREF="sdlmaprgb.html"
-><TT
-CLASS="FUNCTION"
->SDL_MapRGB</TT
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3116"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlpixelformat.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-></A
->,
-<A
-HREF="sdlsetcolors.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetColors</TT
-></A
->,
-<A
-HREF="sdlpalette.html"
-><TT
-CLASS="FUNCTION"
->SDL_Palette</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlrect.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlpalette.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_Rect</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_Palette</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondbroadcast.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondbroadcast.html
deleted file mode 100644
index 9b0fc83e0f1..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondbroadcast.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CondBroadcast</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CondSignal"
-HREF="sdlcondsignal.html"><LINK
-REL="NEXT"
-TITLE="SDL_CondWait"
-HREF="sdlcondwait.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcondsignal.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcondwait.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCONDBROADCAST"
-></A
->SDL_CondBroadcast</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8337"
-></A
-><H2
->Name</H2
->SDL_CondBroadcast&nbsp;--&nbsp;Restart all threads waiting on a condition variable</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8340"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8341"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_CondBroadcast</B
-></CODE
->(SDL_cond *cond);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8347"
-></A
-><H2
->Description</H2
-><P
->Restarts all threads that are waiting on the condition variable, <TT
-CLASS="PARAMETER"
-><I
->cond</I
-></TT
->. Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8353"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcondsignal.html"
-><TT
-CLASS="FUNCTION"
->SDL_CondSignal</TT
-></A
->,
-<A
-HREF="sdlcondwait.html"
-><TT
-CLASS="FUNCTION"
->SDL_CondWait</TT
-></A
->&#13;</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcondsignal.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcondwait.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CondSignal</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CondWait</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondsignal.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondsignal.html
deleted file mode 100644
index 24e9175994e..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondsignal.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CondSignal</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_DestroyCond"
-HREF="sdldestroycond.html"><LINK
-REL="NEXT"
-TITLE="SDL_CondBroadcast"
-HREF="sdlcondbroadcast.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdldestroycond.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcondbroadcast.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCONDSIGNAL"
-></A
->SDL_CondSignal</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8310"
-></A
-><H2
->Name</H2
->SDL_CondSignal&nbsp;--&nbsp;Restart a thread wait on a condition variable</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8313"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8314"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_CondSignal</B
-></CODE
->(SDL_cond *cond);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8320"
-></A
-><H2
->Description</H2
-><P
->Restart one of the threads that are waiting on the condition variable, <TT
-CLASS="PARAMETER"
-><I
->cond</I
-></TT
->. Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success of <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8326"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcondwait.html"
-><TT
-CLASS="FUNCTION"
->SDL_CondWait</TT
-></A
->,
-<A
-HREF="sdlcondbroadcast.html"
-><TT
-CLASS="FUNCTION"
->SDL_CondBroadcast</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdldestroycond.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcondbroadcast.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_DestroyCond</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CondBroadcast</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondwait.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondwait.html
deleted file mode 100644
index 8f15452589e..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondwait.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CondWait</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CondBroadcast"
-HREF="sdlcondbroadcast.html"><LINK
-REL="NEXT"
-TITLE="SDL_CondWaitTimeout"
-HREF="sdlcondwaittimeout.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcondbroadcast.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcondwaittimeout.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCONDWAIT"
-></A
->SDL_CondWait</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8364"
-></A
-><H2
->Name</H2
->SDL_CondWait&nbsp;--&nbsp;Wait on a condition variable</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8367"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8368"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_CondWait</B
-></CODE
->(SDL_cond *cond, SDL_mutex *mut);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8374"
-></A
-><H2
->Description</H2
-><P
->Wait on the condition variable <TT
-CLASS="PARAMETER"
-><I
->cond</I
-></TT
-> and unlock the provided mutex. The mutex must the locked before entering this function. Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> when it is signalled, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8380"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcondwaittimeout.html"
-><TT
-CLASS="FUNCTION"
->SDL_CondWaitTimeout</TT
-></A
->,
-<A
-HREF="sdlcondsignal.html"
-><TT
-CLASS="FUNCTION"
->SDL_CondSignal</TT
-></A
->,
-<A
-HREF="sdlmutexp.html"
-><TT
-CLASS="FUNCTION"
->SDL_mutexP</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcondbroadcast.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcondwaittimeout.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CondBroadcast</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CondWaitTimeout</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondwaittimeout.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondwaittimeout.html
deleted file mode 100644
index deed50bfe21..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcondwaittimeout.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CondWaitTimeout</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CondWait"
-HREF="sdlcondwait.html"><LINK
-REL="NEXT"
-TITLE="Time"
-HREF="time.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcondwait.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="time.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCONDWAITTIMEOUT"
-></A
->SDL_CondWaitTimeout</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8393"
-></A
-><H2
->Name</H2
->SDL_CondWaitTimeout&nbsp;--&nbsp;Wait on a condition variable, with timeout</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8396"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8397"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_CondWaitTimeout</B
-></CODE
->(SDL_cond *cond, SDL_mutex *mutex, Uint32 ms);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8403"
-></A
-><H2
->Description</H2
-><P
->Wait on the condition variable <TT
-CLASS="PARAMETER"
-><I
->cond</I
-></TT
-> for, at most, <TT
-CLASS="PARAMETER"
-><I
->ms</I
-></TT
-> milliseconds. <TT
-CLASS="PARAMETER"
-><I
->mut</I
-></TT
-> is unlocked so it must be locked when the function is called. Returns <TT
-CLASS="LITERAL"
->SDL_MUTEX_TIMEDOUT</TT
-> if the condition is not signalled in the allotted time, <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> if it was signalled or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8412"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcondwait.html"
-><TT
-CLASS="FUNCTION"
->SDL_CondWait</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcondwait.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="time.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CondWait</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Time</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlconvertaudio.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlconvertaudio.html
deleted file mode 100644
index 52f122968a0..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlconvertaudio.html
+++ /dev/null
@@ -1,407 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_ConvertAudio</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_BuildAudioCVT"
-HREF="sdlbuildaudiocvt.html"><LINK
-REL="NEXT"
-TITLE="SDL_MixAudio"
-HREF="sdlmixaudio.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlbuildaudiocvt.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlmixaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCONVERTAUDIO"
-></A
->SDL_ConvertAudio</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7048"
-></A
-><H2
->Name</H2
->SDL_ConvertAudio&nbsp;--&nbsp;Convert audio data to a desired audio format.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7051"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7052"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_ConvertAudio</B
-></CODE
->(SDL_AudioCVT *cvt);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7058"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_ConvertAudio</TT
-> takes one parameter, <TT
-CLASS="PARAMETER"
-><I
->cvt</I
-></TT
->, which was previously initilized. Initilizing a <A
-HREF="sdlaudiocvt.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_AudioCVT</SPAN
-></A
-> is a two step process. First of all, the structure must be passed to <A
-HREF="sdlbuildaudiocvt.html"
-><TT
-CLASS="FUNCTION"
->SDL_BuildAudioCVT</TT
-></A
-> along with source and destination format parameters. Secondly, the <SPAN
-CLASS="STRUCTNAME"
->cvt</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->buf</I
-></TT
-> and <SPAN
-CLASS="STRUCTNAME"
->cvt</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->len</I
-></TT
-> fields must be setup. <SPAN
-CLASS="STRUCTNAME"
->cvt</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->buf</I
-></TT
-> should point to the audio data and <SPAN
-CLASS="STRUCTNAME"
->cvt</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->len</I
-></TT
-> should be set to the length of the audio data in bytes. Remember, the length of the buffer pointed to by <TT
-CLASS="STRUCTFIELD"
-><I
->buf</I
-></TT
-> show be <TT
-CLASS="STRUCTFIELD"
-><I
->len</I
-></TT
->*<TT
-CLASS="STRUCTFIELD"
-><I
->len_mult</I
-></TT
-> bytes in length.</P
-><P
->Once the <SPAN
-CLASS="STRUCTNAME"
->SDL_AudioCVT</SPAN
->structure is initilized then we can pass it to <TT
-CLASS="FUNCTION"
->SDL_ConvertAudio</TT
->, which will convert the audio data pointer to by <SPAN
-CLASS="STRUCTNAME"
->cvt</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->buf</I
-></TT
->. If <TT
-CLASS="FUNCTION"
->SDL_ConvertAudio</TT
-> returned <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> then the conversion was completed successfully, otherwise <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> is returned.</P
-><P
->If the conversion completed successfully then the converted audio data can be read from <SPAN
-CLASS="STRUCTNAME"
->cvt</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->buf</I
-></TT
->. The amount of valid, converted, audio data in the buffer is equal to <SPAN
-CLASS="STRUCTNAME"
->cvt</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->len</I
-></TT
->*<TT
-CLASS="STRUCTFIELD"
-><I
->cvt</I
-></TT
->-&#62;<SPAN
-CLASS="STRUCTNAME"
->len_ratio</SPAN
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7093"
-></A
-><H2
->Examples</H2
-><PRE
-CLASS="PROGRAMLISTING"
->/* Converting some WAV data to hardware format */
-void my_audio_callback(void *userdata, Uint8 *stream, int len);
-
-SDL_AudioSpec *desired, *obtained;
-SDL_AudioSpec wav_spec;
-SDL_AudioCVT  wav_cvt;
-Uint32 wav_len;
-Uint8 *wav_buf;
-int ret;
-
-/* Allocated audio specs */
-desired = malloc(sizeof(SDL_AudioSpec));
-obtained = malloc(sizeof(SDL_AudioSpec));
-
-/* Set desired format */
-desired-&#62;freq=22050;
-desired-&#62;format=AUDIO_S16LSB;
-desired-&#62;samples=8192;
-desired-&#62;callback=my_audio_callback;
-desired-&#62;userdata=NULL;
-
-/* Open the audio device */
-if ( SDL_OpenAudio(desired, obtained) &#60; 0 ){
-  fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
-  exit(-1);
-}
-        
-free(desired);
-
-/* Load the test.wav */
-if( SDL_LoadWAV("test.wav", &#38;wav_spec, &#38;wav_buf, &#38;wav_len) == NULL ){
-  fprintf(stderr, "Could not open test.wav: %s\n", SDL_GetError());
-  SDL_CloseAudio();
-  free(obtained);
-  exit(-1);
-}
-                                            
-/* Build AudioCVT */
-ret = SDL_BuildAudioCVT(&#38;wav_cvt,
-                        wav_spec.format, wav_spec.channels, wav_spec.freq,
-                        obtained-&#62;format, obtained-&#62;channels, obtained-&#62;freq);
-
-/* Check that the convert was built */
-if(ret==-1){
-  fprintf(stderr, "Couldn't build converter!\n");
-  SDL_CloseAudio();
-  free(obtained);
-  SDL_FreeWAV(wav_buf);
-}
-
-/* Setup for conversion */
-wav_cvt.buf = malloc(wav_len * wav_cvt.len_mult);
-wav_cvt.len = wav_len;
-memcpy(wav_cvt.buf, wav_buf, wav_len);
-
-/* We can delete to original WAV data now */
-SDL_FreeWAV(wav_buf);
-
-/* And now we're ready to convert */
-SDL_ConvertAudio(&#38;wav_cvt);
-
-/* do whatever */
-.
-.
-.
-.
-&#13;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7096"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlbuildaudiocvt.html"
-><TT
-CLASS="FUNCTION"
->SDL_BuildAudioCVT</TT
-></A
->,
-<A
-HREF="sdlaudiocvt.html"
-><TT
-CLASS="FUNCTION"
->SDL_AudioCVT</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlbuildaudiocvt.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlmixaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_BuildAudioCVT</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_MixAudio</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlconvertsurface.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlconvertsurface.html
deleted file mode 100644
index cc21f7833eb..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlconvertsurface.html
+++ /dev/null
@@ -1,271 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_ConvertSurface</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetClipRect"
-HREF="sdlgetcliprect.html"><LINK
-REL="NEXT"
-TITLE="SDL_BlitSurface"
-HREF="sdlblitsurface.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetcliprect.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlblitsurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCONVERTSURFACE"
-></A
->SDL_ConvertSurface</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2258"
-></A
-><H2
->Name</H2
->SDL_ConvertSurface&nbsp;--&nbsp;Converts a surface to the same format as another surface.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2261"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2262"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL/SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Surface *<B
-CLASS="FSFUNC"
->SDL_ConvertSurface</B
-></CODE
->(SDL_Surface *src, SDL_PixelFormat *fmt, Uint32 flags);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2268"
-></A
-><H2
->Description</H2
-><P
->Creates a new surface of the specified format, and then copies and maps
-the given surface to it.  If this function fails, it returns
-<TT
-CLASS="LITERAL"
->NULL</TT
->.</P
-><P
->The <TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
-> parameter is passed to 
-<A
-HREF="sdlcreatergbsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateRGBSurface</TT
-></A
->
-and has those semantics.</P
-><P
->This function is used internally by 
-<A
-HREF="sdldisplayformat.html"
-><TT
-CLASS="FUNCTION"
->SDL_DisplayFormat</TT
-></A
->.</P
-><P
->This function can only be called after SDL_Init.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2280"
-></A
-><H2
->Return Value</H2
-><P
->Returns either a pointer to the new surface, or
-<TT
-CLASS="LITERAL"
->NULL</TT
-> on error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2284"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatergbsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateRGBSurface</TT
-></A
->,
-<A
-HREF="sdldisplayformat.html"
-><TT
-CLASS="FUNCTION"
->SDL_DisplayFormat</TT
-></A
->,
-<A
-HREF="sdlpixelformat.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-></A
->,
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetcliprect.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlblitsurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetClipRect</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_BlitSurface</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatecond.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatecond.html
deleted file mode 100644
index 02fcdb2b3e5..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatecond.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CreateCond</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SemValue"
-HREF="sdlsemvalue.html"><LINK
-REL="NEXT"
-TITLE="SDL_DestroyCond"
-HREF="sdldestroycond.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsemvalue.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdldestroycond.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCREATECOND"
-></A
->SDL_CreateCond</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8259"
-></A
-><H2
->Name</H2
->SDL_CreateCond&nbsp;--&nbsp;Create a condition variable</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8262"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8263"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_cond *<B
-CLASS="FSFUNC"
->SDL_CreateCond</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8269"
-></A
-><H2
->Description</H2
-><P
->Creates a condition variable.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8272"
-></A
-><H2
->Examples</H2
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_cond *cond;
-
-cond=SDL_CreateCond();
-.
-.
-/* Do stuff */
-
-.
-.
-SDL_DestroyCond(cond);</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8275"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdldestroycond.html"
-><TT
-CLASS="FUNCTION"
->SDL_DestroyCond</TT
-></A
->,
-<A
-HREF="sdlcondwait.html"
-><TT
-CLASS="FUNCTION"
->SDL_CondWait</TT
-></A
->,
-<A
-HREF="sdlcondsignal.html"
-><TT
-CLASS="FUNCTION"
->SDL_CondSignal</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsemvalue.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdldestroycond.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SemValue</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_DestroyCond</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatecursor.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatecursor.html
deleted file mode 100644
index a444165ff09..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatecursor.html
+++ /dev/null
@@ -1,398 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CreateCursor</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_WarpMouse"
-HREF="sdlwarpmouse.html"><LINK
-REL="NEXT"
-TITLE="SDL_FreeCursor"
-HREF="sdlfreecursor.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlwarpmouse.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlfreecursor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCREATECURSOR"
-></A
->SDL_CreateCursor</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2487"
-></A
-><H2
->Name</H2
->SDL_CreateCursor&nbsp;--&nbsp;Creates a new mouse cursor.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2490"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2491"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Cursor *<B
-CLASS="FSFUNC"
->SDL_CreateCursor</B
-></CODE
->(Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2497"
-></A
-><H2
->Description</H2
-><P
->Create a cursor using the specified <TT
-CLASS="PARAMETER"
-><I
->data</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->mask</I
-></TT
-> (in MSB format).
-The cursor width must be a multiple of 8 bits.</P
-><P
->The cursor is created in black and white according to the following:
-<DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN2503"
-></A
-><P
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><THEAD
-><TR
-><TH
-ALIGN="LEFT"
-VALIGN="TOP"
->Data / Mask</TH
-><TH
-ALIGN="LEFT"
-VALIGN="TOP"
->Resulting pixel on screen</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->0 / 1</TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->White</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->1 / 1</TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Black</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->0 / 0</TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Transparent</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->1 / 0</TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Inverted color if possible, black if not.</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></P
-><P
->Cursors created with this function must be freed with
-<A
-HREF="sdlfreecursor.html"
->SDL_FreeCursor</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2524"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->/* Stolen from the mailing list */
-/* Creates a new mouse cursor from an XPM */
-
-
-/* XPM */
-static const char *arrow[] = {
-  /* width height num_colors chars_per_pixel */
-  "    32    32        3            1",
-  /* colors */
-  "X c #000000",
-  ". c #ffffff",
-  "  c None",
-  /* pixels */
-  "X                               ",
-  "XX                              ",
-  "X.X                             ",
-  "X..X                            ",
-  "X...X                           ",
-  "X....X                          ",
-  "X.....X                         ",
-  "X......X                        ",
-  "X.......X                       ",
-  "X........X                      ",
-  "X.....XXXXX                     ",
-  "X..X..X                         ",
-  "X.X X..X                        ",
-  "XX  X..X                        ",
-  "X    X..X                       ",
-  "     X..X                       ",
-  "      X..X                      ",
-  "      X..X                      ",
-  "       XX                       ",
-  "                                ",
-  "                                ",
-  "                                ",
-  "                                ",
-  "                                ",
-  "                                ",
-  "                                ",
-  "                                ",
-  "                                ",
-  "                                ",
-  "                                ",
-  "                                ",
-  "                                ",
-  "0,0"
-};
-
-static SDL_Cursor *init_system_cursor(const char *image[])
-{
-  int i, row, col;
-  Uint8 data[4*32];
-  Uint8 mask[4*32];
-  int hot_x, hot_y;
-
-  i = -1;
-  for ( row=0; row&#60;32; ++row ) {
-    for ( col=0; col&#60;32; ++col ) {
-      if ( col % 8 ) {
-        data[i] &#60;&#60;= 1;
-        mask[i] &#60;&#60;= 1;
-      } else {
-        ++i;
-        data[i] = mask[i] = 0;
-      }
-      switch (image[4+row][col]) {
-        case 'X':
-          data[i] |= 0x01;
-          mask[i] |= 0x01;
-          break;
-        case '.':
-          mask[i] |= 0x01;
-          break;
-        case ' ':
-          break;
-      }
-    }
-  }
-  sscanf(image[4+row], "%d,%d", &#38;hot_x, &#38;hot_y);
-  return SDL_CreateCursor(data, mask, 32, 32, hot_x, hot_y);
-}</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2527"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlfreecursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_FreeCursor</TT
-></A
->,
-<A
-HREF="sdlsetcursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetCursor</TT
-></A
->,
-<A
-HREF="sdlshowcursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_ShowCursor</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlwarpmouse.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlfreecursor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_WarpMouse</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_FreeCursor</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatemutex.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatemutex.html
deleted file mode 100644
index 53ed48bb20e..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatemutex.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CreateMutex</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_KillThread"
-HREF="sdlkillthread.html"><LINK
-REL="NEXT"
-TITLE="SDL_DestroyMutex"
-HREF="sdldestroymutex.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlkillthread.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdldestroymutex.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCREATEMUTEX"
-></A
->SDL_CreateMutex</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7820"
-></A
-><H2
->Name</H2
->SDL_CreateMutex&nbsp;--&nbsp;Create a mutex</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7823"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7824"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_mutex *<B
-CLASS="FSFUNC"
->SDL_CreateMutex</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7830"
-></A
-><H2
->Description</H2
-><P
->Create a new, unlocked mutex.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7833"
-></A
-><H2
->Examples</H2
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_mutex *mut;
-
-mut=SDL_CreateMutex();
-.
-.
-if(SDL_mutexP(mut)==-1){
-  fprintf(stderr, "Couldn't lock mutex\n");
-  exit(-1);
-}
-.
-/* Do stuff while mutex is locked */
-.
-.
-if(SDL_mutexV(mut)==-1){
-  fprintf(stderr, "Couldn't unlock mutex\n");
-  exit(-1);
-}
-
-SDL_DestroyMutex(mut);&#13;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7836"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlmutexp.html"
-><TT
-CLASS="FUNCTION"
->SDL_mutexP</TT
-></A
->,
-<A
-HREF="sdlmutexv.html"
-><TT
-CLASS="FUNCTION"
->SDL_mutexV</TT
-></A
->,
-<A
-HREF="sdldestroymutex.html"
-><TT
-CLASS="FUNCTION"
->SDL_DestroyMutex</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlkillthread.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdldestroymutex.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_KillThread</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_DestroyMutex</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatergbsurface.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatergbsurface.html
deleted file mode 100644
index 736ec8f96ff..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatergbsurface.html
+++ /dev/null
@@ -1,458 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CreateRGBSurface</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetRGBA"
-HREF="sdlgetrgba.html"><LINK
-REL="NEXT"
-TITLE="SDL_CreateRGBSurfaceFrom"
-HREF="sdlcreatergbsurfacefrom.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetrgba.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcreatergbsurfacefrom.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCREATERGBSURFACE"
-></A
->SDL_CreateRGBSurface</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1773"
-></A
-><H2
->Name</H2
->SDL_CreateRGBSurface&nbsp;--&nbsp;Create an empty SDL_Surface</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1776"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1777"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Surface *<B
-CLASS="FSFUNC"
->SDL_CreateRGBSurface</B
-></CODE
->(Uint32 flags, int width, int height, int depth, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1783"
-></A
-><H2
->Description</H2
-><P
->Allocate an empty surface (must be called after <A
-HREF="sdlsetvideomode.html"
->SDL_SetVideoMode</A
->)</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->depth</I
-></TT
-> is 8 bits an empty palette is allocated for the surface, otherwise a 'packed-pixel' <A
-HREF="sdlpixelformat.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-></A
-> is created using the <TT
-CLASS="PARAMETER"
-><I
->[RGBA]mask</I
-></TT
->'s provided (see <A
-HREF="sdlpixelformat.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-></A
->). The <TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
-> specifies the type of surface that should be created, it is an OR'd combination of the following possible values.</P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN1795"
-></A
-><P
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_SWSURFACE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->SDL will create the surface in system memory. This improves the performance of pixel level access, however you may not be able to take advantage of some types of hardware blitting.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_HWSURFACE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->SDL will attempt to create the surface in video memory. This will allow SDL to take advantage of Video-&#62;Video blits (which are often accelerated).</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_SRCCOLORKEY</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->This flag turns on colourkeying for blits from this surface. If
-<TT
-CLASS="LITERAL"
->SDL_HWSURFACE</TT
-> is also specified and colourkeyed blits
-are hardware-accelerated, then SDL will attempt to place the surface in
-video memory.
-Use <A
-HREF="sdlsetcolorkey.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetColorKey</TT
-></A
->
-to set or clear this flag after surface creation.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->This flag turns on alpha-blending for blits from this surface. If
-<TT
-CLASS="LITERAL"
->SDL_HWSURFACE</TT
-> is also specified and alpha-blending blits
-are hardware-accelerated, then the surface will be placed in video memory if
-possible.
-Use <A
-HREF="sdlsetalpha.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetAlpha</TT
-></A
-> to
-set or clear this flag after surface creation.</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->If an alpha-channel is specified (that is, if <TT
-CLASS="PARAMETER"
-><I
->Amask</I
-></TT
-> is
-nonzero), then the <TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-> flag is automatically
-set. You may remove this flag by calling 
-<A
-HREF="sdlsetalpha.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetAlpha</TT
-></A
->
-after surface creation.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1826"
-></A
-><H2
->Return Value</H2
-><P
->Returns the created surface, or <SPAN
-CLASS="RETURNVALUE"
->NULL</SPAN
-> upon error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1830"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->    /* Create a 32-bit surface with the bytes of each pixel in R,G,B,A order,
-       as expected by OpenGL for textures */
-    SDL_Surface *surface;
-    Uint32 rmask, gmask, bmask, amask;
-
-    /* SDL interprets each pixel as a 32-bit number, so our masks must depend
-       on the endianness (byte order) of the machine */
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    rmask = 0xff000000;
-    gmask = 0x00ff0000;
-    bmask = 0x0000ff00;
-    amask = 0x000000ff;
-#else
-    rmask = 0x000000ff;
-    gmask = 0x0000ff00;
-    bmask = 0x00ff0000;
-    amask = 0xff000000;
-#endif
-
-    surface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32,
-                                   rmask, gmask, bmask, amask);
-    if(surface == NULL) {
-        fprintf(stderr, "CreateRGBSurface failed: %s\n", SDL_GetError());
-        exit(1);
-    }</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1833"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatergbsurfacefrom.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateRGBSurfaceFrom</TT
-></A
->,
-<A
-HREF="sdlfreesurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_FreeSurface</TT
-></A
->,
-<A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->,
-<A
-HREF="sdllocksurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
-></A
->,
-<A
-HREF="sdlpixelformat.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-></A
->,
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
->
-<A
-HREF="sdlsetalpha.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetAlpha</TT
-></A
->
-<A
-HREF="sdlsetcolorkey.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetColorKey</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetrgba.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcreatergbsurfacefrom.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetRGBA</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CreateRGBSurfaceFrom</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatergbsurfacefrom.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatergbsurfacefrom.html
deleted file mode 100644
index 6acfdccae8b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatergbsurfacefrom.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CreateRGBSurfaceFrom</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CreateRGBSurface"
-HREF="sdlcreatergbsurface.html"><LINK
-REL="NEXT"
-TITLE="SDL_FreeSurface"
-HREF="sdlfreesurface.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcreatergbsurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlfreesurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCREATERGBSURFACEFROM"
-></A
->SDL_CreateRGBSurfaceFrom</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1856"
-></A
-><H2
->Name</H2
->SDL_CreateRGBSurfaceFrom&nbsp;--&nbsp;Create an SDL_Surface from pixel data</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1859"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1860"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Surface *<B
-CLASS="FSFUNC"
->SDL_CreateRGBSurfaceFrom</B
-></CODE
->(void *pixels, int width, int height, int depth, int pitch, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1866"
-></A
-><H2
->Description</H2
-><P
->Creates an SDL_Surface from the provided pixel data.</P
-><P
->The data stored in <TT
-CLASS="PARAMETER"
-><I
->pixels</I
-></TT
-> is assumed to be of the <TT
-CLASS="PARAMETER"
-><I
->depth</I
-></TT
-> specified in the parameter list. The pixel data is not copied into the <SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-> structure so it should not be freed until the surface has been freed with a called to <A
-HREF="sdlfreesurface.html"
->SDL_FreeSurface</A
->. <TT
-CLASS="PARAMETER"
-><I
->pitch</I
-></TT
-> is the length of each scanline in bytes.  </P
-><P
->See <A
-HREF="sdlcreatergbsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateRGBSurface</TT
-></A
-> for a more detailed description of the other parameters.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1878"
-></A
-><H2
->Return Value</H2
-><P
->Returns the created surface, or <SPAN
-CLASS="RETURNVALUE"
->NULL</SPAN
-> upon error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1882"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatergbsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateRGBSurface</TT
-></A
->,
-<A
-HREF="sdlfreesurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_FreeSurface</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcreatergbsurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlfreesurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CreateRGBSurface</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_FreeSurface</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatesemaphore.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatesemaphore.html
deleted file mode 100644
index 43dcbf5bff2..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatesemaphore.html
+++ /dev/null
@@ -1,303 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CreateSemaphore</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_mutexV"
-HREF="sdlmutexv.html"><LINK
-REL="NEXT"
-TITLE="SDL_DestroySemaphore"
-HREF="sdldestroysemaphore.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlmutexv.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdldestroysemaphore.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCREATESEMAPHORE"
-></A
->SDL_CreateSemaphore</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7936"
-></A
-><H2
->Name</H2
->SDL_CreateSemaphore&nbsp;--&nbsp;Creates a new semaphore and assigns an initial value to it.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7939"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7940"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_sem *<B
-CLASS="FSFUNC"
->SDL_CreateSemaphore</B
-></CODE
->(Uint32 initial_value);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7946"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_CreateSemaphore()</TT
-> creates a new semaphore and
-initializes it with the value <TT
-CLASS="PARAMETER"
-><I
->initial_value</I
-></TT
->.
-Each locking operation on the semaphore by
-<A
-HREF="sdlsemwait.html"
->SDL_SemWait</A
->,
-<A
-HREF="sdlsemtrywait.html"
->SDL_SemTryWait</A
-> or
-<A
-HREF="sdlsemwaittimeout.html"
->SDL_SemWaitTimeout</A
->
-will atomically decrement the semaphore value. The locking operation will be blocked
-if the semaphore value is not positive (greater than zero). Each unlock operation by
-<A
-HREF="sdlsempost.html"
->SDL_SemPost</A
->
-will atomically increment the semaphore value.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7955"
-></A
-><H2
->Return Value</H2
-><P
->Returns a pointer to an initialized semaphore or
-<SPAN
-CLASS="RETURNVALUE"
->NULL</SPAN
-> if there was an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7959"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_sem *my_sem;
-
-my_sem = SDL_CreateSemaphore(INITIAL_SEM_VALUE);
-
-if (my_sem == NULL) {
-        return CREATE_SEM_FAILED;
-}</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7963"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdldestroysemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_DestroySemaphore</TT
-></A
->,
-<A
-HREF="sdlsemwait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWait</TT
-></A
->,
-<A
-HREF="sdlsemtrywait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemTryWait</TT
-></A
->,
-<A
-HREF="sdlsemwaittimeout.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWaitTimeout</TT
-></A
->,
-<A
-HREF="sdlsempost.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemPost</TT
-></A
->,
-<A
-HREF="sdlsemvalue.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemValue</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlmutexv.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdldestroysemaphore.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_mutexV</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_DestroySemaphore</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatethread.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatethread.html
deleted file mode 100644
index ca3c2d9201c..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreatethread.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CreateThread</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="NEXT"
-TITLE="SDL_ThreadID"
-HREF="sdlthreadid.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="thread.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlthreadid.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCREATETHREAD"
-></A
->SDL_CreateThread</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7701"
-></A
-><H2
->Name</H2
->SDL_CreateThread&nbsp;--&nbsp;Creates a new thread of execution that shares its parent's properties.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7704"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7705"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Thread *<B
-CLASS="FSFUNC"
->SDL_CreateThread</B
-></CODE
->(int (*fn)(void *), void *data);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7711"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_CreateThread</TT
-> creates a new thread of execution 
-that shares all of its parent's global memory, signal handlers, 
-file descriptors, etc, and runs the function <TT
-CLASS="PARAMETER"
-><I
->fn</I
-></TT
->
-passed the void pointer <TT
-CLASS="PARAMETER"
-><I
->data</I
-></TT
->
-The thread quits when this function returns.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7717"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlkillthread.html"
-><TT
-CLASS="FUNCTION"
->SDL_KillThread</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlthreadid.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Multi-threaded Programming</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_ThreadID</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreateyuvoverlay.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreateyuvoverlay.html
deleted file mode 100644
index c24ef6ee2e0..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlcreateyuvoverlay.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_CreateYUVOverlay</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GL_SwapBuffers"
-HREF="sdlglswapbuffers.html"><LINK
-REL="NEXT"
-TITLE="SDL_LockYUVOverlay"
-HREF="sdllockyuvoverlay.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlglswapbuffers.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdllockyuvoverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLCREATEYUVOVERLAY"
-></A
->SDL_CreateYUVOverlay</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2808"
-></A
-><H2
->Name</H2
->SDL_CreateYUVOverlay&nbsp;--&nbsp;Create a YUV video overlay</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2811"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2812"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Overlay *<B
-CLASS="FSFUNC"
->SDL_CreateYUVOverlay</B
-></CODE
->(int width, int height, Uint32 format, SDL_Surface *display);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2818"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_CreateYUVOverlay</TT
-> creates a YUV overlay of the specified <TT
-CLASS="PARAMETER"
-><I
->width</I
-></TT
->, <TT
-CLASS="PARAMETER"
-><I
->height</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->format</I
-></TT
-> (see <A
-HREF="sdloverlay.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Overlay</SPAN
-></A
-> for a list of available formats), for the provided <TT
-CLASS="PARAMETER"
-><I
->display</I
-></TT
->. A <A
-HREF="sdloverlay.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Overlay</SPAN
-></A
-> structure is returned.</P
-><P
->The term 'overlay' is a misnomer since, unless the overlay is created in hardware, the contents for the display surface underneath the area where the overlay is shown will be overwritten when the overlay is displayed.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2831"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdloverlay.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Overlay</SPAN
-></A
->,
-<A
-HREF="sdldisplayyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_DisplayYUVOverlay</TT
-></A
->,
-<A
-HREF="sdlfreeyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_FreeYUVOverlay</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlglswapbuffers.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdllockyuvoverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GL_SwapBuffers</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_LockYUVOverlay</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldelay.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldelay.html
deleted file mode 100644
index a5417fa66f3..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldelay.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_Delay</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Time"
-HREF="time.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetTicks"
-HREF="sdlgetticks.html"><LINK
-REL="NEXT"
-TITLE="SDL_AddTimer"
-HREF="sdladdtimer.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetticks.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdladdtimer.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLDELAY"
-></A
->SDL_Delay</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8455"
-></A
-><H2
->Name</H2
->SDL_Delay&nbsp;--&nbsp;Wait a specified number of milliseconds before returning.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8458"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8459"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_Delay</B
-></CODE
->(Uint32 ms);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8465"
-></A
-><H2
->Description</H2
-><P
->Wait a specified number of milliseconds before returning. <TT
-CLASS="FUNCTION"
->SDL_Delay</TT
-> will wait at <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->least</I
-></SPAN
-> the specified time, but possible longer due to OS scheduling.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Count on a delay granularity of <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->at least</I
-></SPAN
-> 10 ms.
-Some platforms have shorter clock ticks but this is the most common.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8473"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdladdtimer.html"
-><TT
-CLASS="FUNCTION"
->SDL_AddTimer</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetticks.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdladdtimer.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetTicks</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="time.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_AddTimer</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldestroycond.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldestroycond.html
deleted file mode 100644
index ac0804286a9..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldestroycond.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_DestroyCond</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CreateCond"
-HREF="sdlcreatecond.html"><LINK
-REL="NEXT"
-TITLE="SDL_CondSignal"
-HREF="sdlcondsignal.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcreatecond.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcondsignal.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLDESTROYCOND"
-></A
->SDL_DestroyCond</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8288"
-></A
-><H2
->Name</H2
->SDL_DestroyCond&nbsp;--&nbsp;Destroy a condition variable</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8291"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8292"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_DestroyCond</B
-></CODE
->(SDL_cond *cond);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8298"
-></A
-><H2
->Description</H2
-><P
->Destroys a condition variable.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8301"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatecond.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateCond</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcreatecond.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcondsignal.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CreateCond</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CondSignal</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldestroymutex.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldestroymutex.html
deleted file mode 100644
index 949bfc5d540..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldestroymutex.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_DestroyMutex</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CreateMutex"
-HREF="sdlcreatemutex.html"><LINK
-REL="NEXT"
-TITLE="SDL_mutexP"
-HREF="sdlmutexp.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcreatemutex.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlmutexp.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLDESTROYMUTEX"
-></A
->SDL_DestroyMutex</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7849"
-></A
-><H2
->Name</H2
->SDL_DestroyMutex&nbsp;--&nbsp;Destroy a mutex</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7852"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7853"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_DestroyMutex</B
-></CODE
->(SDL_mutex *mutex);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7859"
-></A
-><H2
->Description</H2
-><P
->Destroy a previously <A
-HREF="sdlcreatemutex.html"
->created</A
-> mutex.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7863"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatemutex.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateMutex</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcreatemutex.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlmutexp.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CreateMutex</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_mutexP</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldestroysemaphore.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldestroysemaphore.html
deleted file mode 100644
index d32bdfaf578..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldestroysemaphore.html
+++ /dev/null
@@ -1,278 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_DestroySemaphore</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CreateSemaphore"
-HREF="sdlcreatesemaphore.html"><LINK
-REL="NEXT"
-TITLE="SDL_SemWait"
-HREF="sdlsemwait.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcreatesemaphore.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsemwait.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLDESTROYSEMAPHORE"
-></A
->SDL_DestroySemaphore</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7982"
-></A
-><H2
->Name</H2
->SDL_DestroySemaphore&nbsp;--&nbsp;Destroys a semaphore that was created by <A
-HREF="sdlcreatesemaphore.html"
->SDL_CreateSemaphore</A
->.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7986"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7987"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_DestroySemaphore</B
-></CODE
->(SDL_sem *sem);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7993"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_DestroySemaphore</TT
-> destroys the semaphore pointed to
-by <TT
-CLASS="PARAMETER"
-><I
->sem</I
-></TT
-> that was created by
-<A
-HREF="sdlcreatesemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateSemaphore</TT
-></A
->.
-It is not safe to destroy a semaphore if there are threads currently blocked
-waiting on it.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8000"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->if (my_sem != NULL) {
-        SDL_DestroySemaphore(my_sem);
-        my_sem = NULL;
-}</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8004"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatesemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateSemaphore</TT
-></A
->,
-<A
-HREF="sdlsemwait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWait</TT
-></A
->,
-<A
-HREF="sdlsemtrywait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemTryWait</TT
-></A
->,
-<A
-HREF="sdlsemwaittimeout.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWaitTimeout</TT
-></A
->,
-<A
-HREF="sdlsempost.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemPost</TT
-></A
->,
-<A
-HREF="sdlsemvalue.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemValue</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcreatesemaphore.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsemwait.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CreateSemaphore</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SemWait</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldisplayformat.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldisplayformat.html
deleted file mode 100644
index c91adfe50aa..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldisplayformat.html
+++ /dev/null
@@ -1,262 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_DisplayFormat</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_FillRect"
-HREF="sdlfillrect.html"><LINK
-REL="NEXT"
-TITLE="SDL_DisplayFormatAlpha"
-HREF="sdldisplayformatalpha.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlfillrect.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdldisplayformatalpha.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLDISPLAYFORMAT"
-></A
->SDL_DisplayFormat</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2394"
-></A
-><H2
->Name</H2
->SDL_DisplayFormat&nbsp;--&nbsp;Convert a surface to the display format</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2397"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2398"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Surface *<B
-CLASS="FSFUNC"
->SDL_DisplayFormat</B
-></CODE
->(SDL_Surface *surface);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2404"
-></A
-><H2
->Description</H2
-><P
->This function takes a surface and copies it to a new surface of the
-pixel format and colors of the video framebuffer, suitable for fast
-blitting onto the display surface.  It calls
-<A
-HREF="sdlconvertsurface.html"
->SDL_ConvertSurface</A
-></P
-><P
->If you want to take advantage of hardware colorkey or alpha blit
-acceleration, you should set the colorkey and alpha value before
-calling this function.</P
-><P
->If you want an alpha channel, see <A
-HREF="sdldisplayformatalpha.html"
->SDL_DisplayFormatAlpha</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2411"
-></A
-><H2
->Return Value</H2
-><P
->If the conversion fails or runs out of memory, it returns
-<SPAN
-CLASS="RETURNVALUE"
->NULL</SPAN
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2415"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlconvertsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_ConvertSurface</TT
-></A
->,
-<A
-HREF="sdldisplayformatalpha.html"
-><TT
-CLASS="FUNCTION"
->SDL_DisplayFormatAlpha</TT
-></A
->
-<A
-HREF="sdlsetalpha.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetAlpha</TT
-></A
->,
-<A
-HREF="sdlsetcolorkey.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetColorKey</TT
-></A
->,
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlfillrect.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdldisplayformatalpha.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_FillRect</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_DisplayFormatAlpha</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldisplayformatalpha.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldisplayformatalpha.html
deleted file mode 100644
index 6e88604d021..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldisplayformatalpha.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_DisplayFormatAlpha</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_DisplayFormat"
-HREF="sdldisplayformat.html"><LINK
-REL="NEXT"
-TITLE="SDL_WarpMouse"
-HREF="sdlwarpmouse.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdldisplayformat.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlwarpmouse.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLDISPLAYFORMATALPHA"
-></A
->SDL_DisplayFormatAlpha</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2432"
-></A
-><H2
->Name</H2
->SDL_DisplayFormatAlpha&nbsp;--&nbsp;Convert a surface to the display format</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2435"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2436"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Surface *<B
-CLASS="FSFUNC"
->SDL_DisplayFormatAlpha</B
-></CODE
->(SDL_Surface *surface);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2442"
-></A
-><H2
->Description</H2
-><P
->This function takes a surface and copies it to a new surface of the
-pixel format and colors of the video framebuffer plus an alpha channel,
-suitable for fast blitting onto the display surface.  It calls
-<A
-HREF="sdlconvertsurface.html"
->SDL_ConvertSurface</A
-></P
-><P
->If you want to take advantage of hardware colorkey or alpha blit
-acceleration, you should set the colorkey and alpha value before
-calling this function.</P
-><P
->This function can be used to convert a colourkey to an alpha channel,
-if the <TT
-CLASS="LITERAL"
->SDL_SRCCOLORKEY</TT
-> flag is set on the surface.
-The generated surface will then be transparent (alpha=0) where the
-pixels match the colourkey, and opaque (alpha=255) elsewhere.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2449"
-></A
-><H2
->Return Value</H2
-><P
->If the conversion fails or runs out of memory, it returns
-<SPAN
-CLASS="RETURNVALUE"
->NULL</SPAN
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2453"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlconvertsurface.html"
->SDL_ConvertSurface</A
->,
-<A
-HREF="sdlsetalpha.html"
->SDL_SetAlpha</A
->,
-<A
-HREF="sdlsetcolorkey.html"
->SDL_SetColorKey</A
->,
-<A
-HREF="sdldisplayformat.html"
->SDL_DisplayFormat</A
->,
-<A
-HREF="sdlsurface.html"
->SDL_Surface</A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdldisplayformat.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlwarpmouse.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_DisplayFormat</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_WarpMouse</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldisplayyuvoverlay.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldisplayyuvoverlay.html
deleted file mode 100644
index 456c9985dfb..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdldisplayyuvoverlay.html
+++ /dev/null
@@ -1,246 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_DisplayYUVOverlay</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_UnlockYUVOverlay"
-HREF="sdlunlockyuvoverlay.html"><LINK
-REL="NEXT"
-TITLE="SDL_FreeYUVOverlay"
-HREF="sdlfreeyuvoverlay.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlunlockyuvoverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlfreeyuvoverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLDISPLAYYUVOVERLAY"
-></A
->SDL_DisplayYUVOverlay</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2908"
-></A
-><H2
->Name</H2
->SDL_DisplayYUVOverlay&nbsp;--&nbsp;Blit the overlay to the display</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2911"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2912"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_DisplayYUVOverlay</B
-></CODE
->(SDL_Overlay *overlay, SDL_Rect *dstrect);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2918"
-></A
-><H2
->Description</H2
-><P
->Blit the <TT
-CLASS="PARAMETER"
-><I
->overlay</I
-></TT
-> to the surface specified when it was <A
-HREF="sdlcreateyuvoverlay.html"
->created</A
->. The <A
-HREF="sdlrect.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Rect</SPAN
-></A
-> structure, <TT
-CLASS="PARAMETER"
-><I
->dstrect</I
-></TT
->, specifies the position and size of the destination. If the <TT
-CLASS="PARAMETER"
-><I
->dstrect</I
-></TT
-> is a larger or smaller than the overlay then the overlay will be scaled, this is optimized for 2x scaling.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2927"
-></A
-><H2
->Return Values</H2
-><P
->Returns 0 on success</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2930"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdloverlay.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Overlay</SPAN
-></A
->,
-<A
-HREF="sdlcreateyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateYUVOverlay</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlunlockyuvoverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlfreeyuvoverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_UnlockYUVOverlay</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_FreeYUVOverlay</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlenablekeyrepeat.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlenablekeyrepeat.html
deleted file mode 100644
index 878feb14f33..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlenablekeyrepeat.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_EnableKeyRepeat</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_EnableUNICODE"
-HREF="sdlenableunicode.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetMouseState"
-HREF="sdlgetmousestate.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlenableunicode.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetmousestate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLENABLEKEYREPEAT"
-></A
->SDL_EnableKeyRepeat</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5839"
-></A
-><H2
->Name</H2
->SDL_EnableKeyRepeat&nbsp;--&nbsp;Set keyboard repeat rate.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5842"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5843"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_EnableKeyRepeat</B
-></CODE
->(int delay, int interval);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5849"
-></A
-><H2
->Description</H2
-><P
->Enables or disables the keyboard repeat rate. <TT
-CLASS="PARAMETER"
-><I
->delay</I
-></TT
-> specifies how long the key must be pressed before it begins repeating, it then repeats at the speed specified by <TT
-CLASS="PARAMETER"
-><I
->interval</I
-></TT
->. Both <TT
-CLASS="PARAMETER"
-><I
->delay</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->interval</I
-></TT
-> are expressed in milliseconds.</P
-><P
->Setting <TT
-CLASS="PARAMETER"
-><I
->delay</I
-></TT
-> to 0 disables key repeating completely. Good default values are <TT
-CLASS="LITERAL"
->SDL_DEFAULT_REPEAT_DELAY</TT
-> and <SPAN
-CLASS="SYMBOL"
->SDL_DEFAULT_REPEAT_INTERVAL</SPAN
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5860"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success and <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on failure.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlenableunicode.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetmousestate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_EnableUNICODE</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetMouseState</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlenableunicode.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlenableunicode.html
deleted file mode 100644
index 855debbc996..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlenableunicode.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_EnableUNICODE</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetKeyName"
-HREF="sdlgetkeyname.html"><LINK
-REL="NEXT"
-TITLE="SDL_EnableKeyRepeat"
-HREF="sdlenablekeyrepeat.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetkeyname.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlenablekeyrepeat.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLENABLEUNICODE"
-></A
->SDL_EnableUNICODE</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5805"
-></A
-><H2
->Name</H2
->SDL_EnableUNICODE&nbsp;--&nbsp;Enable UNICODE translation</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5808"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5809"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_EnableUNICODE</B
-></CODE
->(int enable);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5815"
-></A
-><H2
->Description</H2
-><P
->Enables/Disables Unicode keyboard translation.</P
-><P
->To obtain the character codes corresponding to received keyboard events,
-Unicode translation must first be turned on using this function. The
-translation incurs a slight overhead for each keyboard event and is therefore
-disabled by default. For each subsequently received key down event, the
-<TT
-CLASS="STRUCTFIELD"
-><I
->unicode</I
-></TT
-> member of the
-<A
-HREF="sdlkeysym.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_keysym</SPAN
-></A
-> structure
-will then contain the corresponding character code, or zero for keysyms that do
-not correspond to any character code.</P
-><P
->A value of 1 for <TT
-CLASS="PARAMETER"
-><I
->enable</I
-></TT
-> enables Unicode translation;
-0 disables it, and -1 leaves it unchanged (useful for querying the current
-translation mode).</P
-><P
->Note that only key press events will be translated, not release events.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5825"
-></A
-><H2
->Return Value</H2
-><P
->Returns the previous translation mode (<SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> or <SPAN
-CLASS="RETURNVALUE"
->1</SPAN
->).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5830"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlkeysym.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_keysym</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetkeyname.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlenablekeyrepeat.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetKeyName</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_EnableKeyRepeat</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlenvvars.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlenvvars.html
deleted file mode 100644
index 8999ed1f1f9..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlenvvars.html
+++ /dev/null
@@ -1,1227 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_envvars</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="General"
-HREF="general.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetError"
-HREF="sdlgeterror.html"><LINK
-REL="NEXT"
-TITLE="Video"
-HREF="video.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgeterror.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="video.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLENVVARS"
-></A
->SDL_envvars</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN675"
-></A
-><H2
->Name</H2
->SDL_envvars&nbsp;--&nbsp;SDL environment variables</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN678"
-></A
-><H2
->Description</H2
-><P
->Not a function, set using setenv()</P
-><P
->Several environment variables are available to modify the
-behaviour of SDL. Using these variables isn't recommened and the names
-and presence of these variables aren't guaranteed from one release to
-the next. However, they can be very useful for debugging
-purposes.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN682"
-></A
-><H2
->Video</H2
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
-><TT
-CLASS="LITERAL"
->SDL_FBACCEL</TT
-></DT
-><DD
-><P
->If set to 0, disable hardware acceleration in the linux fbcon driver.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_FBDEV</TT
-></DT
-><DD
-><P
->Frame buffer device to use in the linux fbcon driver, instead of /dev/fb0</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_FULLSCREEN_UPDATE</TT
-></DT
-><DD
-><P
->In the ps2gs driver, sets the <TT
-CLASS="LITERAL"
->SDL_ASYNCBLIT</TT
-> flag on the
-display surface.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_VIDEODRIVER</TT
-></DT
-><DD
-><P
->Selectes the video driver for SDL to use. Possible values, in the
-order they are tried if this variable is not set:</P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN706"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->x11</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
-></P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->dga</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(the XFree86 DGA2)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->nanox</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Linux)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->fbcon</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Linux)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->directfb</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Linux)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->ps2gs</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Playstation 2)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->ggi</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
-></P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->vgl</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(BSD)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->svgalib</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Linux)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->aalib</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
-></P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->directx</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Win32)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->windib</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Win32)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->bwindow</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(BeOS)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->toolbox</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(MacOS Classic)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->DSp</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(MacOS Classic)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->Quartz</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Mac OS X)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->CGX</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Amiga)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->photon</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(QNX)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->dummy</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
-></P
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_VIDEO_CENTERED</TT
-></DT
-><DD
-><P
->If set, tries to center the SDL window when running in X11 windowed
-mode, or using the CyberGrafix driver.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_VIDEO_GL_DRIVER</TT
-></DT
-><DD
-><P
->The openGL driver (shared library) to use for X11. Default is libGL.so.1</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_VIDEO_X11_DGAMOUSE</TT
-></DT
-><DD
-><P
->With XFree86, enables use of DGA mouse if set.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_VIDEO_X11_MOUSEACCEL</TT
-></DT
-><DD
-><P
->For X11, sets the mouse acceleration. The value should be a string
-on the form:</P
-><P
->"<TT
-CLASS="PARAMETER"
-><I
->n</I
-></TT
->/<TT
-CLASS="PARAMETER"
-><I
->d</I
-></TT
->/<TT
-CLASS="PARAMETER"
-><I
->t</I
-></TT
->"</P
-><P
->where <TT
-CLASS="PARAMETER"
-><I
->n</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->d</I
-></TT
-> are the
-acceleration numerator/denumerators (so	mouse movement is accelerated by
-<TT
-CLASS="PARAMETER"
-><I
->n</I
-></TT
->/<TT
-CLASS="PARAMETER"
-><I
->d</I
-></TT
->), and
-<TT
-CLASS="PARAMETER"
-><I
->t</I
-></TT
-> is the threshold above which acceleration applies
-(counted as number of pixels the mouse moves at once).</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_VIDEO_X11_NODIRECTCOLOR</TT
-></DT
-><DD
-><P
->If set, don't attempt to use DirectColor visuals even if they are
-present. (SDL will use them otherwise for gamma correction).
-This is needed with older X servers when using the XVideo extension.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_VIDEO_X11_VISUALID</TT
-></DT
-><DD
-><P
->ID of an X11 visual to use, overriding SDL's default visual selection
-algorithm. It can be in decimal or in hex (prefixed by 0x).</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_VIDEO_YUV_DIRECT</TT
-></DT
-><DD
-><P
->If set, display YUV overlay directly on the video surface if possible,
-instead of on the surface passed to
-<A
-HREF="sdlcreateyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateYUVOverlay</TT
-></A
->.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_VIDEO_YUV_HWACCEL</TT
-></DT
-><DD
-><P
->If not set or set to a nonzero value, SDL will attempt to use
-hardware YUV acceleration for video playback.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_WINDOWID</TT
-></DT
-><DD
-><P
->For X11 or Win32, contains the ID number of the window to be used by
-SDL instead of creating its own window. Either in decimal or
-in hex (prefixed by 0x).</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN866"
-></A
-><H2
->Events/Input</H2
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
-><TT
-CLASS="LITERAL"
->SDL_MOUSE_RELATIVE</TT
-></DT
-><DD
-><P
->If set to 0, do not use mouse relative mode in X11. The default is
-to use it if the mouse is hidden and input is grabbed.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_MOUSEDEV</TT
-></DT
-><DD
-><P
->The mouse device to use for the linux fbcon driver. If not set,
-SDL first tries to use GPM in repeater mode, then various other
-devices (/dev/pcaux, /dev/adbmouse, /dev/mouse etc).</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_MOUSEDEV_IMPS2</TT
-></DT
-><DD
-><P
->If set, SDL will not try to auto-detect	the IMPS/2 protocol of
-a PS/2 mouse but use it right away. For the fbcon and ps2gs drivers.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_MOUSEDRV</TT
-></DT
-><DD
-><P
->For the linux fbcon driver: if set to ELO, use the ELO touchscreen
-controller as a pointer device</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_NO_RAWKBD</TT
-></DT
-><DD
-><P
->For the libvga driver: If set, do not attempt to put the keyboard in raw mode.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_NOMOUSE</TT
-></DT
-><DD
-><P
->If set, the linux fbcon driver will not use a mouse at all.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_NO_LOCK_KEYS</TT
-></DT
-><DD
-><P
->Disable CAPS-LOCK and NUM-LOCK suppression of down+up key events,
-suitable for games where the player needs these keys to do more than just toggle.
-A value of 1 will effect both CAPS-LOCK and NUM-LOCK.
-A value of 2 will effect only CAPS-LOCK.
-A value of 3 will effect only NUM-LOCK.
-All other values have no effect.
-</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN899"
-></A
-><H2
->Audio</H2
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
-><TT
-CLASS="LITERAL"
->AUDIODEV</TT
-></DT
-><DD
-><P
->The audio device to use, if <TT
-CLASS="LITERAL"
->SDL_PATH_DSP</TT
-> isn't set.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_AUDIODRIVER</TT
-></DT
-><DD
-><P
->Selects the audio driver for SDL to use. Possible values, in the
-order they are tried if this variable is not set:</P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN913"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->openbsd</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(OpenBSD)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->dsp</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(OSS /dev/dsp: Linux, Solaris, BSD etc)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->alsa</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Linux)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->pulse</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(PulseAudio daemon)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->audio</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Unix style /dev/audio: SunOS, Solaris etc)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->AL</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Irix)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->artsc</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(ARTS audio daemon)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->esd</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(esound audio daemon)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->nas</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(NAS audio daemon)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->dma</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(OSS /dev/dsp, using DMA)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->dsound</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Win32 DirectX)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->waveout</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Win32 WaveOut)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->baudio</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(BeOS)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->sndmgr</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(MacOS SoundManager)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->paud</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(AIX)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->AHI</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Amiga)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->disk</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(all; output to file)</P
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_DISKAUDIOFILE</TT
-></DT
-><DD
-><P
->The name of the output file for the "disk" audio driver. If not
-set, the name <TT
-CLASS="LITERAL"
->sdlaudio.raw</TT
-> is used.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_DISKAUDIODELAY</TT
-></DT
-><DD
-><P
->For the "disk" audio driver, how long to wait (in ms) before writing
-a full sound buffer. The default is 150 ms.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_DSP_NOSELECT</TT
-></DT
-><DD
-><P
->For some audio drivers (alsa, paud, dma and dsp), don't use select()
-but a timed method instead. May cure some audio problems, or cause
-others.</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_PATH_DSP</TT
-></DT
-><DD
-><P
->The audio device to use. If not set, SDL tries AUDIODEV and then
-a platform-dependent default value (/dev/audio on Solaris,
-/dev/dsp on Linux etc).</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1017"
-></A
-><H2
->CD-ROM</H2
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
-><TT
-CLASS="LITERAL"
->SDL_CDROM</TT
-></DT
-><DD
-><P
->A colon-separated list of CD-ROM devices to use, in addition to
-the standard devices (typically /dev/cdrom, platform-dependent).</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1025"
-></A
-><H2
->Debugging</H2
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
-><TT
-CLASS="LITERAL"
->SDL_DEBUG</TT
-></DT
-><DD
-><P
->If set, causes every call to <TT
-CLASS="FUNCTION"
->SDL_SetError</TT
-> (that
-is, every time SDL signals an error) to also print an error message on
-stderr.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1034"
-></A
-><H2
->Joystick</H2
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
-><TT
-CLASS="LITERAL"
->SDL_JOYSTICK_DEVICE</TT
-></DT
-><DD
-><P
->Joystick device to use in the linux joystick driver, in addition
-to the usual: /dev/js*, /dev/input/event*, /dev/input/js*</P
-></DD
-><DT
-><TT
-CLASS="LITERAL"
->SDL_LINUX_JOYSTICK</TT
-></DT
-><DD
-><P
->Special joystick configuration string for linux. The format is</P
-><P
->"<TT
-CLASS="PARAMETER"
-><I
->name</I
-></TT
-> <TT
-CLASS="PARAMETER"
-><I
->numaxes</I
-></TT
-> <TT
-CLASS="PARAMETER"
-><I
->numhats</I
-></TT
-> <TT
-CLASS="PARAMETER"
-><I
->numballs</I
-></TT
->"</P
-><P
->where <TT
-CLASS="PARAMETER"
-><I
->name</I
-></TT
-> is the name string of the joystick
-(possibly in single quotes), and the rest are the number of axes, hats
-and balls respectively.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgeterror.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetError</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="general.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Video</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlevent.html
deleted file mode 100644
index dfd21b7fe66..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlevent.html
+++ /dev/null
@@ -1,994 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_Event</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="NEXT"
-TITLE="SDL_ActiveEvent"
-HREF="sdlactiveevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlactiveevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLEVENT"
-></A
->SDL_Event</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3711"
-></A
-><H2
->Name</H2
->SDL_Event&nbsp;--&nbsp;General event structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3714"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef union{
-  Uint8 type;
-  SDL_ActiveEvent active;
-  SDL_KeyboardEvent key;
-  SDL_MouseMotionEvent motion;
-  SDL_MouseButtonEvent button;
-  SDL_JoyAxisEvent jaxis;
-  SDL_JoyBallEvent jball;
-  SDL_JoyHatEvent jhat;
-  SDL_JoyButtonEvent jbutton;
-  SDL_ResizeEvent resize;
-  SDL_ExposeEvent expose;
-  SDL_QuitEvent quit;
-  SDL_UserEvent user;
-  SDL_SysWMEvent syswm;
-} SDL_Event;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3717"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN3719"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The type of event</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->active</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlactiveevent.html"
->Activation event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->key</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlkeyboardevent.html"
->Keyboard event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->motion</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlmousemotionevent.html"
->Mouse motion event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->button</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlmousebuttonevent.html"
->Mouse button event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->jaxis</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdljoyaxisevent.html"
->Joystick axis motion event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->jball</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdljoyballevent.html"
->Joystick trackball motion event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->jhat</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdljoyhatevent.html"
->Joystick hat motion event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->jbutton</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdljoybuttonevent.html"
->Joystick button event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->resize</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlresizeevent.html"
->Application window resize event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->expose</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlexposeevent.html"
->Application window expose event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->quit</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlquitevent.html"
->Application quit request event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->user</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdluserevent.html"
->User defined event</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->syswm</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlsyswmevent.html"
->Undefined window manager event</A
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3791"
-></A
-><H2
->Description</H2
-><P
->The <SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-> union is the core to all event handling is SDL, its probably the most important structure after <SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
->. <SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-> is a union of all event structures used in SDL, using it is a simple matter of knowing which union member relates to which event <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
->.</P
-><P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN3799"
-></A
-><P
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><THEAD
-><TR
-><TH
-ALIGN="LEFT"
-VALIGN="TOP"
->Event <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TH
-><TH
-ALIGN="LEFT"
-VALIGN="TOP"
->Event Structure</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="MIDDLE"
-><TT
-CLASS="LITERAL"
->SDL_ACTIVEEVENT</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="MIDDLE"
-><A
-HREF="sdlactiveevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_ActiveEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_KEYDOWN/UP</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlkeyboardevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_KeyboardEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_MOUSEMOTION</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlmousemotionevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_MouseMotionEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_MOUSEBUTTONDOWN/UP</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlmousebuttonevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_MouseButtonEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_JOYAXISMOTION</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdljoyaxisevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyAxisEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_JOYBALLMOTION</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdljoyballevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyBallEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_JOYHATMOTION</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdljoyhatevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyHatEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_JOYBUTTONDOWN/UP</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdljoybuttonevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyButtonEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_QUIT</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlquitevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_QuitEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_SYSWMEVENT</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlsyswmevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_SysWMEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_VIDEORESIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlresizeevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_ResizeEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_VIDEOEXPOSE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlexposeevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_ExposeEvent</SPAN
-></A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_USEREVENT</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdluserevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_UserEvent</SPAN
-></A
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3885"
-></A
-><H2
->Use</H2
-><P
->The <SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-> structure has two uses</P
-><P
-></P
-><UL
-COMPACT="COMPACT"
-><LI
-><P
->Reading events on the event queue</P
-></LI
-><LI
-><P
->Placing events on the event queue</P
-></LI
-></UL
-><P
->Reading events from the event queue is done with either <A
-HREF="sdlpollevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-></A
-> or <A
-HREF="sdlpeepevents.html"
-><TT
-CLASS="FUNCTION"
->SDL_PeepEvents</TT
-></A
->. We'll use <TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-> and step through an example.</P
-><P
->First off, we create an empty <SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-> structure.
-<PRE
-CLASS="PROGRAMLISTING"
->SDL_Event test_event;</PRE
->
-<TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-> removes the next event from the event queue, if there are no events on the queue it returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> otherwise it returns <SPAN
-CLASS="RETURNVALUE"
->1</SPAN
->. We use a <TT
-CLASS="FUNCTION"
->while</TT
-> loop to process each event in turn.
-<PRE
-CLASS="PROGRAMLISTING"
->while(SDL_PollEvent(&#38;test_event)) {</PRE
->
-The <TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-> function take a pointer to an <SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-> structure that is to be filled with event information. We know that if <TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-> removes an event from the queue then the event information will be placed in our <SPAN
-CLASS="STRUCTNAME"
->test_event</SPAN
-> structure, but we also know that the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->type</I
-></SPAN
-> of event will be placed in the <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-> member of <SPAN
-CLASS="STRUCTNAME"
->test_event</SPAN
->. So to handle each event <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-> seperately we use a <TT
-CLASS="FUNCTION"
->switch</TT
-> statement.
-<PRE
-CLASS="PROGRAMLISTING"
->  switch(test_event.type) {</PRE
->
-We need to know what kind of events we're looking for <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->and</I
-></SPAN
-> the event <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
->'s of those events. So lets assume we want to detect where the user is moving the mouse pointer within our application. We look through our event types and notice that <TT
-CLASS="LITERAL"
->SDL_MOUSEMOTION</TT
-> is, more than likely, the event we're looking for. A little <A
-HREF="sdlmousemotionevent.html"
->more</A
-> research tells use that <TT
-CLASS="LITERAL"
->SDL_MOUSEMOTION</TT
-> events are handled within the <A
-HREF="sdlmousemotionevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_MouseMotionEvent</SPAN
-></A
-> structure which is the <TT
-CLASS="STRUCTFIELD"
-><I
->motion</I
-></TT
-> member of <SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
->. We can check for the <TT
-CLASS="LITERAL"
->SDL_MOUSEMOTION</TT
-> event <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-> within our <TT
-CLASS="FUNCTION"
->switch</TT
-> statement like so:
-<PRE
-CLASS="PROGRAMLISTING"
->    case SDL_MOUSEMOTION:</PRE
->
-All we need do now is read the information out of the <TT
-CLASS="STRUCTFIELD"
-><I
->motion</I
-></TT
-> member of <SPAN
-CLASS="STRUCTNAME"
->test_event</SPAN
->.
-<PRE
-CLASS="PROGRAMLISTING"
->      printf("We got a motion event.\n");
-      printf("Current mouse position is: (%d, %d)\n", test_event.motion.x, test_event.motion.y);
-      break;
-    default:
-      printf("Unhandled Event!\n");
-      break;
-  }
-}
-printf("Event queue empty.\n");</PRE
-></P
-><P
->It is also possible to push events onto the event queue and so use it as a two-way communication path. Both <A
-HREF="sdlpushevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PushEvent</TT
-></A
-> and <A
-HREF="sdlpeepevents.html"
-><TT
-CLASS="FUNCTION"
->SDL_PeepEvents</TT
-></A
-> allow you to place events onto the event queue. This is usually used to place a <TT
-CLASS="LITERAL"
->SDL_USEREVENT</TT
-> on the event queue, however you could use it to post fake input events if you wished. Creating your own events is a simple matter of choosing the event type you want, setting the <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-> member and filling the appropriate member structure with information.
-<PRE
-CLASS="PROGRAMLISTING"
->SDL_Event user_event;
-
-user_event.type=SDL_USEREVENT;
-user_event.user.code=2;
-user_event.user.data1=NULL;
-user_event.user.data2=NULL;
-SDL_PushEvent(&#38;user_event);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3942"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlpollevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-></A
->,
-<A
-HREF="sdlpushevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PushEvent</TT
-></A
->,
-<A
-HREF="sdlpeepevents.html"
-><TT
-CLASS="FUNCTION"
->SDL_PeepEvents</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlactiveevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL Event Structures.</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_ActiveEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdleventstate.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdleventstate.html
deleted file mode 100644
index b9a24486cbb..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdleventstate.html
+++ /dev/null
@@ -1,276 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_EventState</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetEventFilter"
-HREF="sdlgeteventfilter.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetKeyState"
-HREF="sdlgetkeystate.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgeteventfilter.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetkeystate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLEVENTSTATE"
-></A
->SDL_EventState</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5646"
-></A
-><H2
->Name</H2
->SDL_EventState&nbsp;--&nbsp;This function allows you to set the state of processing certain events.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5649"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5650"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint8 <B
-CLASS="FSFUNC"
->SDL_EventState</B
-></CODE
->(Uint8 type, int state);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5656"
-></A
-><H2
->Description</H2
-><P
->This function allows you to set the state of processing certain event <TT
-CLASS="PARAMETER"
-><I
->type</I
-></TT
->'s.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->state</I
-></TT
-> is set to <TT
-CLASS="LITERAL"
->SDL_IGNORE</TT
->, 
-that event <TT
-CLASS="PARAMETER"
-><I
->type</I
-></TT
-> will be automatically dropped from the event queue and will 
-not be filtered.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->state</I
-></TT
-> is set to <TT
-CLASS="LITERAL"
->SDL_ENABLE</TT
->, 
-that event <TT
-CLASS="PARAMETER"
-><I
->type</I
-></TT
-> will be processed normally.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->state</I
-></TT
-> is set to <TT
-CLASS="LITERAL"
->SDL_QUERY</TT
->,
-<TT
-CLASS="FUNCTION"
->SDL_EventState</TT
-> will return the current processing 
-state of the specified event <TT
-CLASS="PARAMETER"
-><I
->type</I
-></TT
->.</P
-><P
->A list of event <TT
-CLASS="PARAMETER"
-><I
->type</I
-></TT
->'s can be found in the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> section.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5677"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgeteventfilter.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetkeystate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetEventFilter</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetKeyState</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlexposeevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlexposeevent.html
deleted file mode 100644
index 82c2a3e7e29..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlexposeevent.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_ExposeEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_ResizeEvent"
-HREF="sdlresizeevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_SysWMEvent"
-HREF="sdlsyswmevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlresizeevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsyswmevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLEXPOSEEVENT"
-></A
->SDL_ExposeEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4503"
-></A
-><H2
->Name</H2
->SDL_ExposeEvent&nbsp;--&nbsp;Quit requested event</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4506"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type
-} SDL_ExposeEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4509"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4511"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_VIDEOEXPOSE</TT
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4519"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_ExposeEvent</SPAN
-> is a member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union and is used whan an event of type <TT
-CLASS="LITERAL"
->SDL_VIDEOEXPOSE</TT
-> is reported.</P
-><P
->A VIDEOEXPOSE event is triggered when the screen has been modified
-outside of the application, usually by the window manager and needs to
-be redrawn.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4527"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlseteventfilter.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetEventFilter</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlresizeevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsyswmevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_ResizeEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SysWMEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfillrect.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfillrect.html
deleted file mode 100644
index 4ace062e2df..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfillrect.html
+++ /dev/null
@@ -1,291 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_FillRect</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_BlitSurface"
-HREF="sdlblitsurface.html"><LINK
-REL="NEXT"
-TITLE="SDL_DisplayFormat"
-HREF="sdldisplayformat.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlblitsurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdldisplayformat.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLFILLRECT"
-></A
->SDL_FillRect</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2351"
-></A
-><H2
->Name</H2
->SDL_FillRect&nbsp;--&nbsp;This function performs a fast fill of the given rectangle with some color</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2354"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2355"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_FillRect</B
-></CODE
->(SDL_Surface *dst, SDL_Rect *dstrect, Uint32 color);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2361"
-></A
-><H2
->Description</H2
-><P
->This function performs a fast fill of the given rectangle with
-<TT
-CLASS="PARAMETER"
-><I
->color</I
-></TT
->.  If <TT
-CLASS="PARAMETER"
-><I
->dstrect</I
-></TT
->
-is <TT
-CLASS="LITERAL"
->NULL</TT
->, the whole surface will be filled with
-<TT
-CLASS="PARAMETER"
-><I
->color</I
-></TT
->.</P
-><P
->The color should be a pixel of the format used by the surface, and
-can be generated by the
-<A
-HREF="sdlmaprgb.html"
->SDL_MapRGB</A
-> or <A
-HREF="sdlmaprgba.html"
->SDL_MapRGBA</A
->
-functions. If the color value contains an alpha value then the
-destination is simply "filled" with that alpha information, no blending
-takes place.</P
-><P
->If there is a clip rectangle set on the destination (set via
-<A
-HREF="sdlsetcliprect.html"
->SDL_SetClipRect</A
->) then this
-function will clip based on the intersection of the clip rectangle and
-the <TT
-CLASS="PARAMETER"
-><I
->dstrect</I
-></TT
-> rectangle and the dstrect rectangle
-will be modified to represent the area actually filled.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2374"
-></A
-><H2
->Return Value</H2
-><P
->This function returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or
-<SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2379"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlmaprgb.html"
-><TT
-CLASS="FUNCTION"
->SDL_MapRGB</TT
-></A
->,
-<A
-HREF="sdlmaprgb.html"
-><TT
-CLASS="FUNCTION"
->SDL_MapRGBA</TT
-></A
->,
-<A
-HREF="sdlblitsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_BlitSurface</TT
-></A
->,
-<A
-HREF="sdlrect.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Rect</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlblitsurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdldisplayformat.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_BlitSurface</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_DisplayFormat</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlflip.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlflip.html
deleted file mode 100644
index b480f99aa8c..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlflip.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_Flip</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_UpdateRects"
-HREF="sdlupdaterects.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetColors"
-HREF="sdlsetcolors.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlupdaterects.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsetcolors.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLFLIP"
-></A
->SDL_Flip</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1426"
-></A
-><H2
->Name</H2
->SDL_Flip&nbsp;--&nbsp;Swaps screen buffers</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1429"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1430"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_Flip</B
-></CODE
->(SDL_Surface *screen);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1436"
-></A
-><H2
->Description</H2
-><P
->On hardware that supports double-buffering, this function sets up a flip
-and returns.  The hardware will wait for vertical retrace, and then swap
-video buffers before the next video surface blit or lock will return.
-On hardware that doesn't support double-buffering, this is equivalent
-to calling <A
-HREF="sdlupdaterect.html"
->SDL_UpdateRect</A
-><TT
-CLASS="PARAMETER"
-><I
->(screen, 0, 0, 0, 0)</I
-></TT
-></P
-><P
->The <TT
-CLASS="LITERAL"
->SDL_DOUBLEBUF</TT
-> flag must have been passed to 
-<A
-HREF="sdlsetvideomode.html"
->SDL_SetVideoMode</A
->,
- when
-setting the video mode for this function to perform hardware flipping.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1444"
-></A
-><H2
->Return Value</H2
-><P
->This function returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> if successful, or 
-<SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> if there was an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1449"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->,
-<A
-HREF="sdlupdaterect.html"
-><TT
-CLASS="FUNCTION"
->SDL_UpdateRect</TT
-></A
->,
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlupdaterects.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsetcolors.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_UpdateRects</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetColors</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreecursor.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreecursor.html
deleted file mode 100644
index 01a4f7c2572..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreecursor.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_FreeCursor</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CreateCursor"
-HREF="sdlcreatecursor.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetCursor"
-HREF="sdlsetcursor.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcreatecursor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsetcursor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLFREECURSOR"
-></A
->SDL_FreeCursor</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2540"
-></A
-><H2
->Name</H2
->SDL_FreeCursor&nbsp;--&nbsp;Frees a cursor created with SDL_CreateCursor.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2543"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2544"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_FreeCursor</B
-></CODE
->(SDL_Cursor *cursor);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2550"
-></A
-><H2
->Description</H2
-><P
->Frees a <SPAN
-CLASS="STRUCTNAME"
->SDL_Cursor</SPAN
-> that was created using
-<A
-HREF="sdlcreatecursor.html"
->SDL_CreateCursor</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2555"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatecursor.html"
->SDL_CreateCursor</A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcreatecursor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsetcursor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CreateCursor</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetCursor</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreesurface.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreesurface.html
deleted file mode 100644
index 84b60481095..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreesurface.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_FreeSurface</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CreateRGBSurfaceFrom"
-HREF="sdlcreatergbsurfacefrom.html"><LINK
-REL="NEXT"
-TITLE="SDL_LockSurface"
-HREF="sdllocksurface.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcreatergbsurfacefrom.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdllocksurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLFREESURFACE"
-></A
->SDL_FreeSurface</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1893"
-></A
-><H2
->Name</H2
->SDL_FreeSurface&nbsp;--&nbsp;Frees (deletes) a SDL_Surface</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1896"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1897"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_FreeSurface</B
-></CODE
->(SDL_Surface *surface);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1903"
-></A
-><H2
->Description</H2
-><P
->Frees the resources used by a previously created <SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
->. If the surface was created using 
-<A
-HREF="sdlcreatergbsurfacefrom.html"
->SDL_CreateRGBSurfaceFrom</A
-> then the pixel data is not freed.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1908"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatergbsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateRGBSurface</TT
-></A
->
-<A
-HREF="sdlcreatergbsurfacefrom.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateRGBSurfaceFrom</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcreatergbsurfacefrom.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdllocksurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CreateRGBSurfaceFrom</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_LockSurface</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreewav.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreewav.html
deleted file mode 100644
index 24242c4b0fe..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreewav.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_FreeWAV</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_LoadWAV"
-HREF="sdlloadwav.html"><LINK
-REL="NEXT"
-TITLE="SDL_AudioCVT"
-HREF="sdlaudiocvt.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlloadwav.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlaudiocvt.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLFREEWAV"
-></A
->SDL_FreeWAV</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6857"
-></A
-><H2
->Name</H2
->SDL_FreeWAV&nbsp;--&nbsp;Frees previously opened WAV data</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6860"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6861"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_FreeWAV</B
-></CODE
->(Uint8 *audio_buf);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6867"
-></A
-><H2
->Description</H2
-><P
->After a WAVE file has been opened with <A
-HREF="sdlloadwav.html"
-><TT
-CLASS="FUNCTION"
->SDL_LoadWAV</TT
-></A
-> its data can eventually be freed with <TT
-CLASS="FUNCTION"
->SDL_FreeWAV</TT
->. <TT
-CLASS="PARAMETER"
-><I
->audio_buf</I
-></TT
-> is a pointer to the buffer created by <TT
-CLASS="FUNCTION"
->SDL_LoadWAV</TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6875"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlloadwav.html"
-><TT
-CLASS="FUNCTION"
->SDL_LoadWAV</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlloadwav.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlaudiocvt.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_LoadWAV</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_AudioCVT</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreeyuvoverlay.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreeyuvoverlay.html
deleted file mode 100644
index e82340d9e2e..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlfreeyuvoverlay.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_FreeYUVOverlay</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_DisplayYUVOverlay"
-HREF="sdldisplayyuvoverlay.html"><LINK
-REL="NEXT"
-TITLE="SDL_GLattr"
-HREF="sdlglattr.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdldisplayyuvoverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlglattr.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLFREEYUVOVERLAY"
-></A
->SDL_FreeYUVOverlay</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2941"
-></A
-><H2
->Name</H2
->SDL_FreeYUVOverlay&nbsp;--&nbsp;Free a YUV video overlay</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2944"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2945"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_FreeYUVOverlay</B
-></CODE
->(SDL_Overlay *overlay);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2951"
-></A
-><H2
->Description</H2
-><P
->Frees and <A
-HREF="sdloverlay.html"
-><TT
-CLASS="PARAMETER"
-><I
->overlay</I
-></TT
-></A
-> created by <A
-HREF="sdlcreateyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateYUVOverlay</TT
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2958"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdloverlay.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Overlay</SPAN
-></A
->,
-<A
-HREF="sdldisplayyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_DisplayYUVOverlay</TT
-></A
->,
-<A
-HREF="sdlcreateyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_FreeYUVOverlay</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdldisplayyuvoverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlglattr.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_DisplayYUVOverlay</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GLattr</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetappstate.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetappstate.html
deleted file mode 100644
index d09e2e0f08b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetappstate.html
+++ /dev/null
@@ -1,263 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetAppState</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetRelativeMouseState"
-HREF="sdlgetrelativemousestate.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickEventState"
-HREF="sdljoystickeventstate.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetrelativemousestate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoystickeventstate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETAPPSTATE"
-></A
->SDL_GetAppState</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5931"
-></A
-><H2
->Name</H2
-><TT
-CLASS="FUNCTION"
->SDL_GetAppState</TT
->&nbsp;--&nbsp;Get the state of the application</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5935"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5936"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint8 <B
-CLASS="FSFUNC"
->SDL_GetAppState</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5942"
-></A
-><H2
->Description</H2
-><P
->This function returns the current state of the application. The value returned is a bitwise combination of:</P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN5945"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_APPMOUSEFOCUS</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The application has mouse focus.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_APPINPUTFOCUS</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The application has keyboard focus</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_APPACTIVE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The application is visible</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5960"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlactiveevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_ActiveEvent</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetrelativemousestate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoystickeventstate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetRelativeMouseState</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickEventState</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetaudiostatus.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetaudiostatus.html
deleted file mode 100644
index 3fc3a09119c..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetaudiostatus.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetAudioStatus</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_PauseAudio"
-HREF="sdlpauseaudio.html"><LINK
-REL="NEXT"
-TITLE="SDL_LoadWAV"
-HREF="sdlloadwav.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlpauseaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlloadwav.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETAUDIOSTATUS"
-></A
->SDL_GetAudioStatus</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6790"
-></A
-><H2
->Name</H2
->SDL_GetAudioStatus&nbsp;--&nbsp;Get the current audio state</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6793"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6794"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_audiostatus<B
-CLASS="FSFUNC"
->SDL_GetAudioStatus</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6800"
-></A
-><H2
->Description</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef enum{
-  SDL_AUDIO_STOPPED,
-  SDL_AUDIO_PAUSED,
-  SDL_AUDIO_PLAYING
-} SDL_audiostatus;</PRE
-><P
->Returns either <TT
-CLASS="LITERAL"
->SDL_AUDIO_STOPPED</TT
->, <TT
-CLASS="LITERAL"
->SDL_AUDIO_PAUSED</TT
-> or <TT
-CLASS="LITERAL"
->SDL_AUDIO_PLAYING</TT
-> depending on the current audio state.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6807"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlpauseaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_PauseAudio</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlpauseaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlloadwav.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_PauseAudio</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_LoadWAV</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetcliprect.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetcliprect.html
deleted file mode 100644
index f00ac77f8f6..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetcliprect.html
+++ /dev/null
@@ -1,229 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetClipRect</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SetClipRect"
-HREF="sdlsetcliprect.html"><LINK
-REL="NEXT"
-TITLE="SDL_ConvertSurface"
-HREF="sdlconvertsurface.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsetcliprect.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlconvertsurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETCLIPRECT"
-></A
->SDL_GetClipRect</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2230"
-></A
-><H2
->Name</H2
->SDL_GetClipRect&nbsp;--&nbsp;Gets the clipping rectangle for a surface.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2233"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2234"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_GetClipRect</B
-></CODE
->(SDL_Surface *surface, SDL_Rect *rect);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2240"
-></A
-><H2
->Description</H2
-><P
->Gets the clipping rectangle for a surface.  When this surface is the
-destination of a blit, only the area within the clip rectangle is
-drawn into.</P
-><P
->The rectangle pointed to by <TT
-CLASS="PARAMETER"
-><I
->rect</I
-></TT
-> will be
-filled with the clipping rectangle of the surface.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2245"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsetcliprect.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetClipRect</TT
-></A
->,
-<A
-HREF="sdlblitsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_BlitSurface</TT
-></A
->,
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsetcliprect.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlconvertsurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SetClipRect</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_ConvertSurface</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetcursor.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetcursor.html
deleted file mode 100644
index 72ecbc7c097..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetcursor.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetCursor</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SetCursor"
-HREF="sdlsetcursor.html"><LINK
-REL="NEXT"
-TITLE="SDL_ShowCursor"
-HREF="sdlshowcursor.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsetcursor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlshowcursor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETCURSOR"
-></A
->SDL_GetCursor</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2589"
-></A
-><H2
->Name</H2
->SDL_GetCursor&nbsp;--&nbsp;Get the currently active mouse cursor.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2592"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2593"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Cursor *<B
-CLASS="FSFUNC"
->SDL_GetCursor</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2599"
-></A
-><H2
->Description</H2
-><P
->Returns the currently active mouse cursor.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2602"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsetcursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetCursor</TT
-></A
->,
-<A
-HREF="sdlcreatecursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateCursor</TT
-></A
->,
-<A
-HREF="sdlshowcursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_ShowCursor</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsetcursor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlshowcursor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SetCursor</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_ShowCursor</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgeterror.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgeterror.html
deleted file mode 100644
index cdf57924a9f..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgeterror.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetError</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="General"
-HREF="general.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_WasInit"
-HREF="sdlwasinit.html"><LINK
-REL="NEXT"
-TITLE="SDL_envvars"
-HREF="sdlenvvars.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlwasinit.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlenvvars.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETERROR"
-></A
->SDL_GetError</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN653"
-></A
-><H2
->Name</H2
->SDL_GetError&nbsp;--&nbsp;Get SDL error string</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN656"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN657"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL/SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->char *<B
-CLASS="FSFUNC"
->SDL_GetError</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN663"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_GetError</TT
-> returns a NULL terminated string containing information about the last internal SDL error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN667"
-></A
-><H2
->Return Value</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_GetError</TT
-> returns a string containing the last error.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlwasinit.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlenvvars.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_WasInit</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="general.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_envvars</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgeteventfilter.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgeteventfilter.html
deleted file mode 100644
index d254d34a52d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgeteventfilter.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetEventFilter</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SetEventFilter"
-HREF="sdlseteventfilter.html"><LINK
-REL="NEXT"
-TITLE="SDL_EventState"
-HREF="sdleventstate.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlseteventfilter.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdleventstate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETEVENTFILTER"
-></A
->SDL_GetEventFilter</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5615"
-></A
-><H2
->Name</H2
->SDL_GetEventFilter&nbsp;--&nbsp;Retrieves a pointer to he event filter</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5618"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5619"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_EventFilter <B
-CLASS="FSFUNC"
->SDL_GetEventFilter</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5625"
-></A
-><H2
->Description</H2
-><P
->This function retrieces a pointer to the event filter that was previously set using <A
-HREF="sdlseteventfilter.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetEventFilter</TT
-></A
->. An SDL_EventFilter function is defined as:
-<PRE
-CLASS="PROGRAMLISTING"
->typedef int (*SDL_EventFilter)(const SDL_Event *event);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5631"
-></A
-><H2
->Return Value</H2
-><P
->Returns a pointer to the event filter or <TT
-CLASS="LITERAL"
->NULL</TT
-> if no filter has been set.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5635"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlseteventfilter.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetEventFilter</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlseteventfilter.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdleventstate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SetEventFilter</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_EventState</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetgammaramp.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetgammaramp.html
deleted file mode 100644
index bfcc03c4d33..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetgammaramp.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetGammaRamp</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SetGamma"
-HREF="sdlsetgamma.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetGammaRamp"
-HREF="sdlsetgammaramp.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsetgamma.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsetgammaramp.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETGAMMARAMP"
-></A
->SDL_GetGammaRamp</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1598"
-></A
-><H2
->Name</H2
->SDL_GetGammaRamp&nbsp;--&nbsp;Gets the color gamma lookup tables for the display</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1601"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1602"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_GetGammaRamp</B
-></CODE
->(Uint16 *redtable, Uint16 *greentable, Uint16 *bluetable);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1608"
-></A
-><H2
->Description</H2
-><P
->Gets the gamma translation lookup tables currently used by the display.
-Each table is an array of 256 Uint16 values.</P
-><P
->Not all display hardware is able to change gamma.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1612"
-></A
-><H2
->Return Value</H2
-><P
->Returns -1 on error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1615"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsetgamma.html"
->SDL_SetGamma</A
->
-<A
-HREF="sdlsetgammaramp.html"
->SDL_SetGammaRamp</A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsetgamma.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsetgammaramp.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SetGamma</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetGammaRamp</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetkeyname.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetkeyname.html
deleted file mode 100644
index 6c51c9497a0..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetkeyname.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetKeyName</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SetModState"
-HREF="sdlsetmodstate.html"><LINK
-REL="NEXT"
-TITLE="SDL_EnableUNICODE"
-HREF="sdlenableunicode.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsetmodstate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlenableunicode.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETKEYNAME"
-></A
->SDL_GetKeyName</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5780"
-></A
-><H2
->Name</H2
->SDL_GetKeyName&nbsp;--&nbsp;Get the name of an SDL virtual keysym</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5783"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5784"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->char *<B
-CLASS="FSFUNC"
->SDL_GetKeyName</B
-></CODE
->(SDLKey key);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5790"
-></A
-><H2
->Description</H2
-><P
->Returns the SDL-defined name of the <A
-HREF="sdlkey.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDLKey</SPAN
-></A
-> <TT
-CLASS="PARAMETER"
-><I
->key</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5796"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlkey.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDLKey</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsetmodstate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlenableunicode.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SetModState</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_EnableUNICODE</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetkeystate.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetkeystate.html
deleted file mode 100644
index 1c16f2e50c2..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetkeystate.html
+++ /dev/null
@@ -1,253 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetKeyState</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_EventState"
-HREF="sdleventstate.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetModState"
-HREF="sdlgetmodstate.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdleventstate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetmodstate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETKEYSTATE"
-></A
->SDL_GetKeyState</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5686"
-></A
-><H2
->Name</H2
->SDL_GetKeyState&nbsp;--&nbsp;Get a snapshot of the current keyboard state</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5689"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5690"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint8 *<B
-CLASS="FSFUNC"
->SDL_GetKeyState</B
-></CODE
->(int *numkeys);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5696"
-></A
-><H2
->Description</H2
-><P
->Gets a snapshot of the current keyboard state. The current state is return as a pointer to an array, the size of this array is stored in <TT
-CLASS="PARAMETER"
-><I
->numkeys</I
-></TT
->. The array is indexed by the <A
-HREF="sdlkey.html"
-><TT
-CLASS="LITERAL"
->SDLK_*</TT
-></A
-> symbols. A value of 1 means the key is pressed and a value of 0 means its not. The pointer returned is a pointer to an internal SDL array and should not be freed by the caller.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Use <A
-HREF="sdlpumpevents.html"
-><TT
-CLASS="FUNCTION"
->SDL_PumpEvents</TT
-></A
-> to update the state array.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5706"
-></A
-><H2
->Example</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->Uint8 *keystate = SDL_GetKeyState(NULL);
-if ( keystate[SDLK_RETURN] ) printf("Return Key Pressed.\n");</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5710"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlkey.html"
-><TT
-CLASS="LITERAL"
->SDL Key Symbols</TT
-></A
->,
-<A
-HREF="sdlpumpevents.html"
-><TT
-CLASS="FUNCTION"
->SDL_PumpEvents</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdleventstate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetmodstate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_EventState</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetModState</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetmodstate.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetmodstate.html
deleted file mode 100644
index 64d2f35621f..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetmodstate.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetModState</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetKeyState"
-HREF="sdlgetkeystate.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetModState"
-HREF="sdlsetmodstate.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetkeystate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsetmodstate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETMODSTATE"
-></A
->SDL_GetModState</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5721"
-></A
-><H2
->Name</H2
->SDL_GetModState&nbsp;--&nbsp;Get the state of modifier keys.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5724"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5725"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDLMod <B
-CLASS="FSFUNC"
->SDL_GetModState</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5731"
-></A
-><H2
->Description</H2
-><P
->Returns the current state of the modifier keys (CTRL, ALT, etc.).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5734"
-></A
-><H2
->Return Value</H2
-><P
->The return value can be an OR'd combination of the SDLMod enum.</P
-><P
-><A
-NAME="AEN5738"
-></A
-><BLOCKQUOTE
-CLASS="BLOCKQUOTE"
-><P
-><B
->SDLMod</B
-></P
-><PRE
-CLASS="PROGRAMLISTING"
->typedef enum {
-  KMOD_NONE  = 0x0000,
-  KMOD_LSHIFT= 0x0001,
-  KMOD_RSHIFT= 0x0002,
-  KMOD_LCTRL = 0x0040,
-  KMOD_RCTRL = 0x0080,
-  KMOD_LALT  = 0x0100,
-  KMOD_RALT  = 0x0200,
-  KMOD_LMETA = 0x0400,
-  KMOD_RMETA = 0x0800,
-  KMOD_NUM   = 0x1000,
-  KMOD_CAPS  = 0x2000,
-  KMOD_MODE  = 0x4000,
-} SDLMod;</PRE
-></BLOCKQUOTE
->
-SDL also defines the following symbols for convenience:
-<A
-NAME="AEN5741"
-></A
-><BLOCKQUOTE
-CLASS="BLOCKQUOTE"
-><PRE
-CLASS="PROGRAMLISTING"
->#define KMOD_CTRL (KMOD_LCTRL|KMOD_RCTRL)
-#define KMOD_SHIFT  (KMOD_LSHIFT|KMOD_RSHIFT)
-#define KMOD_ALT  (KMOD_LALT|KMOD_RALT)
-#define KMOD_META (KMOD_LMETA|KMOD_RMETA)</PRE
-></BLOCKQUOTE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5743"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetkeystate.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetKeyState</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetkeystate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsetmodstate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetKeyState</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetModState</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetmousestate.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetmousestate.html
deleted file mode 100644
index d96a55b8d1b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetmousestate.html
+++ /dev/null
@@ -1,253 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetMouseState</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_EnableKeyRepeat"
-HREF="sdlenablekeyrepeat.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetRelativeMouseState"
-HREF="sdlgetrelativemousestate.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlenablekeyrepeat.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetrelativemousestate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETMOUSESTATE"
-></A
->SDL_GetMouseState</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5869"
-></A
-><H2
->Name</H2
->SDL_GetMouseState&nbsp;--&nbsp;Retrieve the current state of the mouse</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5872"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5873"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint8 <B
-CLASS="FSFUNC"
->SDL_GetMouseState</B
-></CODE
->(int *x, int *y);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5879"
-></A
-><H2
->Description</H2
-><P
->The current button state is returned as a button bitmask, which can
-be tested using the <TT
-CLASS="LITERAL"
->SDL_BUTTON(X)</TT
-> macros, and <TT
-CLASS="PARAMETER"
-><I
->x</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->y</I
-></TT
-> are set to the
-current mouse cursor position.  You can pass <TT
-CLASS="LITERAL"
->NULL</TT
-> for either <TT
-CLASS="PARAMETER"
-><I
->x</I
-></TT
-> or <TT
-CLASS="PARAMETER"
-><I
->y</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5888"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_PumpEvents();
-if(SDL_GetMouseState(NULL, NULL)&#38;SDL_BUTTON(1))
-  printf("Mouse Button 1(left) is pressed.\n");</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5891"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetrelativemousestate.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetRelativeMouseState</TT
-></A
->,
-<A
-HREF="sdlpumpevents.html"
-><TT
-CLASS="FUNCTION"
->SDL_PumpEvents</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlenablekeyrepeat.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetrelativemousestate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_EnableKeyRepeat</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetRelativeMouseState</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetrelativemousestate.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetrelativemousestate.html
deleted file mode 100644
index 52a51066b58..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetrelativemousestate.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetRelativeMouseState</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetMouseState"
-HREF="sdlgetmousestate.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetAppState"
-HREF="sdlgetappstate.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetmousestate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetappstate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETRELATIVEMOUSESTATE"
-></A
->SDL_GetRelativeMouseState</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5902"
-></A
-><H2
->Name</H2
->SDL_GetRelativeMouseState&nbsp;--&nbsp;Retrieve the current state of the mouse</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5905"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5906"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint8 <B
-CLASS="FSFUNC"
->SDL_GetRelativeMouseState</B
-></CODE
->(int *x, int *y);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5912"
-></A
-><H2
->Description</H2
-><P
->The current button state is returned as a button bitmask, which can
-be tested using the <TT
-CLASS="LITERAL"
->SDL_BUTTON(X)</TT
-> macros, and <TT
-CLASS="PARAMETER"
-><I
->x</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->y</I
-></TT
-> are set to the change in the mouse position since the last call to <TT
-CLASS="FUNCTION"
->SDL_GetRelativeMouseState</TT
-> or since event initialization.  You can pass <TT
-CLASS="LITERAL"
->NULL</TT
-> for either <TT
-CLASS="PARAMETER"
-><I
->x</I
-></TT
-> or <TT
-CLASS="PARAMETER"
-><I
->y</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5922"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetmousestate.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetMouseState</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetmousestate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetappstate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetMouseState</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetAppState</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetrgb.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetrgb.html
deleted file mode 100644
index 47774dc2ed8..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetrgb.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetRGB</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_MapRGBA"
-HREF="sdlmaprgba.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetRGBA"
-HREF="sdlgetrgba.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlmaprgba.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetrgba.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETRGB"
-></A
->SDL_GetRGB</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1718"
-></A
-><H2
->Name</H2
->SDL_GetRGB&nbsp;--&nbsp;Get RGB values from a pixel in the specified pixel format.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1721"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1722"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_GetRGB</B
-></CODE
->(Uint32 pixel, SDL_PixelFormat *fmt, Uint8 *r, Uint8 *g, Uint8 *b);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1728"
-></A
-><H2
->Description</H2
-><P
->Get RGB component values from a pixel stored in the specified pixel format.</P
-><P
->This function uses the entire 8-bit [0..255] range when converting color
-components from pixel formats with less than 8-bits per RGB component
-(e.g., a completely white pixel in 16-bit RGB565 format would return
-[0xff, 0xff, 0xff] not [0xf8, 0xfc, 0xf8]).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1732"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetrgba.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetRGBA</TT
-></A
->,
-<A
-HREF="sdlmaprgb.html"
-><TT
-CLASS="FUNCTION"
->SDL_MapRGB</TT
-></A
->,
-<A
-HREF="sdlmaprgba.html"
-><TT
-CLASS="FUNCTION"
->SDL_MapRGBA</TT
-></A
->,
-<A
-HREF="sdlpixelformat.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlmaprgba.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetrgba.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_MapRGBA</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetRGBA</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetrgba.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetrgba.html
deleted file mode 100644
index a9e1093ad5a..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetrgba.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetRGBA</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetRGB"
-HREF="sdlgetrgb.html"><LINK
-REL="NEXT"
-TITLE="SDL_CreateRGBSurface"
-HREF="sdlcreatergbsurface.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetrgb.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcreatergbsurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETRGBA"
-></A
->SDL_GetRGBA</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1747"
-></A
-><H2
->Name</H2
->SDL_GetRGBA&nbsp;--&nbsp;Get RGBA values from a pixel in the specified pixel format.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1750"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1751"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_GetRGBA</B
-></CODE
->(Uint32 pixel, SDL_PixelFormat *fmt, Uint8 *r, Uint8 *g, Uint8 *b, Uint8 *a);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1757"
-></A
-><H2
->Description</H2
-><P
->Get RGBA component values from a pixel stored in the specified pixel format.</P
-><P
->This function uses the entire 8-bit [0..255] range when converting color
-components from pixel formats with less than 8-bits per RGB component
-(e.g., a completely white pixel in 16-bit RGB565 format would return
-[0xff, 0xff, 0xff] not [0xf8, 0xfc, 0xf8]).</P
-><P
->If the surface has no alpha component, the alpha will be returned as 0xff
-(100% opaque).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1762"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetrgb.html"
->SDL_GetRGB</A
->,
-<A
-HREF="sdlmaprgb.html"
->SDL_MapRGB</A
->,
-<A
-HREF="sdlmaprgba.html"
->SDL_MapRGBA</A
->,
-<A
-HREF="sdlpixelformat.html"
->SDL_PixelFormat</A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetrgb.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcreatergbsurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetRGB</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CreateRGBSurface</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetthreadid.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetthreadid.html
deleted file mode 100644
index 4bc59cb69c1..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetthreadid.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetThreadID</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_ThreadID"
-HREF="sdlthreadid.html"><LINK
-REL="NEXT"
-TITLE="SDL_WaitThread"
-HREF="sdlwaitthread.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlthreadid.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlwaitthread.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETTHREADID"
-></A
->SDL_GetThreadID</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7743"
-></A
-><H2
->Name</H2
->SDL_GetThreadID&nbsp;--&nbsp;Get the SDL thread ID of a SDL_Thread</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7746"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7747"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint32 <B
-CLASS="FSFUNC"
->SDL_GetThreadID</B
-></CODE
->(SDL_Thread *thread);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7753"
-></A
-><H2
->Description</H2
-><P
->Returns the ID of a <SPAN
-CLASS="STRUCTNAME"
->SDL_Thread</SPAN
-> created by <A
-HREF="sdlcreatethread.html"
->SDL_CreateThread</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7758"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatethread.html"
->SDL_CreateThread</A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlthreadid.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlwaitthread.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_ThreadID</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_WaitThread</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetticks.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetticks.html
deleted file mode 100644
index 0911aae1a55..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetticks.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetTicks</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Time"
-HREF="time.html"><LINK
-REL="PREVIOUS"
-TITLE="Time"
-HREF="time.html"><LINK
-REL="NEXT"
-TITLE="SDL_Delay"
-HREF="sdldelay.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="time.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdldelay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETTICKS"
-></A
->SDL_GetTicks</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8433"
-></A
-><H2
->Name</H2
->SDL_GetTicks&nbsp;--&nbsp;Get the number of milliseconds since the SDL library initialization.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8436"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8437"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint32 <B
-CLASS="FSFUNC"
->SDL_GetTicks</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8443"
-></A
-><H2
->Description</H2
-><P
->Get the number of milliseconds since the SDL library initialization.
-Note that this value wraps if the program runs for more than ~49 days.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8446"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdldelay.html"
-><TT
-CLASS="FUNCTION"
->SDL_Delay</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="time.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdldelay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Time</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="time.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_Delay</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetvideoinfo.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetvideoinfo.html
deleted file mode 100644
index 25c4b458aa0..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetvideoinfo.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetVideoInfo</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetVideoSurface"
-HREF="sdlgetvideosurface.html"><LINK
-REL="NEXT"
-TITLE="SDL_VideoDriverName"
-HREF="sdlvideodrivername.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetvideosurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlvideodrivername.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETVIDEOINFO"
-></A
->SDL_GetVideoInfo</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1100"
-></A
-><H2
->Name</H2
->SDL_GetVideoInfo&nbsp;--&nbsp;returns a pointer to information about the video hardware</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1103"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1104"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_VideoInfo *<B
-CLASS="FSFUNC"
->SDL_GetVideoInfo</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1110"
-></A
-><H2
->Description</H2
-><P
->This function returns a read-only pointer to <A
-HREF="sdlvideoinfo.html"
->information</A
-> about the video
-hardware.  If this is called before <A
-HREF="sdlsetvideomode.html"
->SDL_SetVideoMode</A
->, the
-<TT
-CLASS="STRUCTFIELD"
-><I
->vfmt</I
-></TT
-> member of the returned structure will contain the
-pixel format of the "best" video mode.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1116"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->,
-<A
-HREF="sdlvideoinfo.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_VideoInfo</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetvideosurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlvideodrivername.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetVideoSurface</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_VideoDriverName</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetvideosurface.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetvideosurface.html
deleted file mode 100644
index 905b1f6ac4b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlgetvideosurface.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GetVideoSurface</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetVideoInfo"
-HREF="sdlgetvideoinfo.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="video.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetvideoinfo.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGETVIDEOSURFACE"
-></A
->SDL_GetVideoSurface</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1078"
-></A
-><H2
->Name</H2
->SDL_GetVideoSurface&nbsp;--&nbsp;returns a pointer to the current display surface</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1081"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1082"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Surface *<B
-CLASS="FSFUNC"
->SDL_GetVideoSurface</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1088"
-></A
-><H2
->Description</H2
-><P
->This function returns a pointer to the current display surface.
-If SDL is doing format conversion on the display surface, this
-function returns the publicly visible surface, not the real video
-surface.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1091"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetvideoinfo.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Video</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetVideoInfo</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglattr.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglattr.html
deleted file mode 100644
index 0ae01272a45..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglattr.html
+++ /dev/null
@@ -1,379 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GLattr</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_FreeYUVOverlay"
-HREF="sdlfreeyuvoverlay.html"><LINK
-REL="NEXT"
-TITLE="SDL_Rect"
-HREF="sdlrect.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlfreeyuvoverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlrect.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGLATTR"
-></A
->SDL_GLattr</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2971"
-></A
-><H2
->Name</H2
->SDL_GLattr&nbsp;--&nbsp;SDL GL Attributes</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2974"
-></A
-><H2
->Attributes</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN2976"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_RED_SIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Size of the framebuffer red component, in bits</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_GREEN_SIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Size of the framebuffer green component, in bits</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_BLUE_SIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Size of the framebuffer blue component, in bits</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_ALPHA_SIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Size of the framebuffer alpha component, in bits</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_DOUBLEBUFFER</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->0 or 1, enable or disable double buffering</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_BUFFER_SIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Size of the framebuffer, in bits</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_DEPTH_SIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Size of the depth buffer, in bits</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_STENCIL_SIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Size of the stencil buffer, in bits</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_ACCUM_RED_SIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Size of the accumulation buffer red component, in bits</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_ACCUM_GREEN_SIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Size of the accumulation buffer green component, in bits</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_ACCUM_BLUE_SIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Size of the accumulation buffer blue component, in bits</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_GL_ACCUM_ALPHA_SIZE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Size of the accumulation buffer alpha component, in bits</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3027"
-></A
-><H2
->Description</H2
-><P
->While you can set most OpenGL attributes normally, the attributes list above must be known <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->before</I
-></SPAN
-> SDL sets the video mode. These attributes a set and read with <A
-HREF="sdlglsetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_SetAttribute</TT
-></A
-> and <A
-HREF="sdlglgetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_GetAttribute</TT
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3035"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlglsetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_SetAttribute</TT
-></A
->,
-<A
-HREF="sdlglgetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_GetAttribute</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlfreeyuvoverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlrect.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_FreeYUVOverlay</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_Rect</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglgetattribute.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglgetattribute.html
deleted file mode 100644
index 26c8913bd24..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglgetattribute.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GL_GetAttribute</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GL_GetProcAddress"
-HREF="sdlglgetprocaddress.html"><LINK
-REL="NEXT"
-TITLE="SDL_GL_SetAttribute"
-HREF="sdlglsetattribute.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlglgetprocaddress.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlglsetattribute.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGLGETATTRIBUTE"
-></A
->SDL_GL_GetAttribute</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2708"
-></A
-><H2
->Name</H2
->SDL_GL_GetAttribute&nbsp;--&nbsp;Get the value of a special SDL/OpenGL attribute</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2711"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2712"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_GL_GetAttribute</B
-></CODE
->(SDLGLattr attr, int *value);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2718"
-></A
-><H2
->Description</H2
-><P
->Places the value of the SDL/OpenGL <A
-HREF="sdlglattr.html"
->attribute</A
-> <TT
-CLASS="PARAMETER"
-><I
->attr</I
-></TT
-> into <TT
-CLASS="PARAMETER"
-><I
->value</I
-></TT
->. This is useful after a call to <A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
-> to check whether your attributes have been <A
-HREF="sdlglsetattribute.html"
->set</A
-> as you expected.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2727"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2732"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlglsetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_SetAttribute</TT
-></A
->,
-<A
-HREF="sdlglattr.html"
->GL Attributes</A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlglgetprocaddress.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlglsetattribute.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GL_GetProcAddress</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GL_SetAttribute</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglgetprocaddress.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglgetprocaddress.html
deleted file mode 100644
index a6cf6e4c119..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglgetprocaddress.html
+++ /dev/null
@@ -1,262 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GL_GetProcAddress</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GL_LoadLibrary"
-HREF="sdlglloadlibrary.html"><LINK
-REL="NEXT"
-TITLE="SDL_GL_GetAttribute"
-HREF="sdlglgetattribute.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlglloadlibrary.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlglgetattribute.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGLGETPROCADDRESS"
-></A
->SDL_GL_GetProcAddress</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2678"
-></A
-><H2
->Name</H2
->SDL_GL_GetProcAddress&nbsp;--&nbsp;Get the address of a GL function</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2681"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2682"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void *<B
-CLASS="FSFUNC"
->SDL_GL_GetProcAddress</B
-></CODE
->(const char* proc);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2688"
-></A
-><H2
->Description</H2
-><P
->Returns the address of the GL function <TT
-CLASS="PARAMETER"
-><I
->proc</I
-></TT
->, or <SPAN
-CLASS="RETURNVALUE"
->NULL</SPAN
-> if the function is not found. If the GL library is loaded at runtime, with <A
-HREF="sdlglloadlibrary.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_LoadLibrary</TT
-></A
->, then <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->all</I
-></SPAN
-> GL functions must be retrieved this way. Usually this is used to retrieve function pointers to OpenGL extensions.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2696"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef void (*GL_ActiveTextureARB_Func)(unsigned int);
-GL_ActiveTextureARB_Func glActiveTextureARB_ptr = 0;
-int has_multitexture=1;
-.
-.
-.
-/* Get function pointer */
-glActiveTextureARB_ptr=(GL_ActiveTextureARB_Func) SDL_GL_GetProcAddress("glActiveTextureARB");
-
-/* Check for a valid function ptr */
-if(!glActiveTextureARB_ptr){
-  fprintf(stderr, "Multitexture Extensions not present.\n");
-  has_multitexture=0;
-}
-.
-.
-.
-.
-if(has_multitexture){
-  glActiveTextureARB_ptr(GL_TEXTURE0_ARB);
-  .
-  .
-}
-else{
-  .
-  .
-}</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2699"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlglloadlibrary.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_LoadLibrary</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlglloadlibrary.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlglgetattribute.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GL_LoadLibrary</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GL_GetAttribute</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglloadlibrary.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglloadlibrary.html
deleted file mode 100644
index d3c4c6d79dd..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglloadlibrary.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GL_LoadLibrary</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_ShowCursor"
-HREF="sdlshowcursor.html"><LINK
-REL="NEXT"
-TITLE="SDL_GL_GetProcAddress"
-HREF="sdlglgetprocaddress.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlshowcursor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlglgetprocaddress.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGLLOADLIBRARY"
-></A
->SDL_GL_LoadLibrary</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2648"
-></A
-><H2
->Name</H2
->SDL_GL_LoadLibrary&nbsp;--&nbsp;Specify an OpenGL library</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2651"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2652"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_GL_LoadLibrary</B
-></CODE
->(const char *path);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2658"
-></A
-><H2
->Description</H2
-><P
->If you wish, you may load the OpenGL library at runtime, this must be done before <A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
-> is called. The <TT
-CLASS="PARAMETER"
-><I
->path</I
-></TT
-> of the GL library is passed to <TT
-CLASS="FUNCTION"
->SDL_GL_LoadLibrary</TT
-> and it returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error. You must then use <A
-HREF="sdlglgetprocaddress.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_GetProcAddress</TT
-></A
-> to retrieve function pointers to GL functions.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2669"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlglgetprocaddress.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_GetProcAddress</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlshowcursor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlglgetprocaddress.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_ShowCursor</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GL_GetProcAddress</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglsetattribute.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglsetattribute.html
deleted file mode 100644
index ffb1204b0e0..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglsetattribute.html
+++ /dev/null
@@ -1,286 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GL_SetAttribute</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GL_GetAttribute"
-HREF="sdlglgetattribute.html"><LINK
-REL="NEXT"
-TITLE="SDL_GL_SwapBuffers"
-HREF="sdlglswapbuffers.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlglgetattribute.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlglswapbuffers.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGLSETATTRIBUTE"
-></A
->SDL_GL_SetAttribute</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2742"
-></A
-><H2
->Name</H2
->SDL_GL_SetAttribute&nbsp;--&nbsp;Set a special SDL/OpenGL attribute</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2745"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2746"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_GL_SetAttribute</B
-></CODE
->(SDL_GLattr attr, int value);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2752"
-></A
-><H2
->Description</H2
-><P
->Sets the OpenGL <A
-HREF="sdlglattr.html"
->attribute</A
-> <TT
-CLASS="PARAMETER"
-><I
->attr</I
-></TT
-> to <TT
-CLASS="PARAMETER"
-><I
->value</I
-></TT
->. The attributes you set don't take effect until after a call to <A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->. You should use <A
-HREF="sdlglgetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_GetAttribute</TT
-></A
-> to check the values after a <TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-> call.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2763"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2768"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 5 );
-SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 5 );
-SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 5 );
-SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
-SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
-if ( (screen=SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL )) == NULL ) {
-  fprintf(stderr, "Couldn't set GL mode: %s\n", SDL_GetError());
-  SDL_Quit();
-  return;
-}</PRE
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->The <TT
-CLASS="LITERAL"
->SDL_DOUBLEBUF</TT
-> flag is not required to enable double buffering when setting an OpenGL video mode. Double buffering is enabled or disabled using the SDL_GL_DOUBLEBUFFER attribute.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2774"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlglgetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_GetAttribute</TT
-></A
->,
-<A
-HREF="sdlglattr.html"
->GL Attributes</A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlglgetattribute.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlglswapbuffers.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GL_GetAttribute</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GL_SwapBuffers</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglswapbuffers.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglswapbuffers.html
deleted file mode 100644
index fa383414d4d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlglswapbuffers.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_GL_SwapBuffers</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GL_SetAttribute"
-HREF="sdlglsetattribute.html"><LINK
-REL="NEXT"
-TITLE="SDL_CreateYUVOverlay"
-HREF="sdlcreateyuvoverlay.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlglsetattribute.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcreateyuvoverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLGLSWAPBUFFERS"
-></A
->SDL_GL_SwapBuffers</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2784"
-></A
-><H2
->Name</H2
->SDL_GL_SwapBuffers&nbsp;--&nbsp;Swap OpenGL framebuffers/Update Display</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2787"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2788"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_GL_SwapBuffers</B
-></CODE
->(void );</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2794"
-></A
-><H2
->Description</H2
-><P
->Swap the OpenGL buffers, if double-buffering is supported.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2797"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->,
-<A
-HREF="sdlglsetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_SetAttribute</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlglsetattribute.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcreateyuvoverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GL_SetAttribute</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CreateYUVOverlay</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlinit.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlinit.html
deleted file mode 100644
index 11f27b81d16..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlinit.html
+++ /dev/null
@@ -1,368 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_Init</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="General"
-HREF="general.html"><LINK
-REL="PREVIOUS"
-TITLE="General"
-HREF="general.html"><LINK
-REL="NEXT"
-TITLE="SDL_InitSubSystem"
-HREF="sdlinitsubsystem.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="general.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlinitsubsystem.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLINIT"
-></A
->SDL_Init</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN440"
-></A
-><H2
->Name</H2
->SDL_Init&nbsp;--&nbsp;Initializes SDL</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN443"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN444"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_Init</B
-></CODE
->(Uint32 flags);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN450"
-></A
-><H2
->Description</H2
-><P
->Initializes SDL. This should be called before all other SDL functions. The <TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
-> parameter specifies what part(s) of SDL to initialize.</P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN454"
-></A
-><P
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_INIT_TIMER</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Initializes the <A
-HREF="time.html"
->timer</A
-> subsystem.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_INIT_AUDIO</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Initializes the <A
-HREF="audio.html"
->audio</A
-> subsystem.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_INIT_VIDEO</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Initializes the <A
-HREF="video.html"
->video</A
-> subsystem.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_INIT_CDROM</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Initializes the <A
-HREF="cdrom.html"
->cdrom</A
-> subsystem.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_INIT_JOYSTICK</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Initializes the <A
-HREF="joystick.html"
->joystick</A
-> subsystem.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_INIT_EVERYTHING</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Initialize all of the above.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_INIT_NOPARACHUTE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Prevents SDL from catching fatal signals.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_INIT_EVENTTHREAD</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN494"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error or <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN499"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlquit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Quit</TT
-></A
->,
-<A
-HREF="sdlinitsubsystem.html"
-><TT
-CLASS="FUNCTION"
->SDL_InitSubSystem</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="general.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlinitsubsystem.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->General</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="general.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_InitSubSystem</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlinitsubsystem.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlinitsubsystem.html
deleted file mode 100644
index 917fd1068e0..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlinitsubsystem.html
+++ /dev/null
@@ -1,283 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_InitSubSystem</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="General"
-HREF="general.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_Init"
-HREF="sdlinit.html"><LINK
-REL="NEXT"
-TITLE="SDL_QuitSubSystem"
-HREF="sdlquitsubsystem.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlinit.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlquitsubsystem.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLINITSUBSYSTEM"
-></A
->SDL_InitSubSystem</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN510"
-></A
-><H2
->Name</H2
->SDL_InitSubSystem&nbsp;--&nbsp;Initialize subsystems</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN513"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN514"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_InitSubSystem</B
-></CODE
->(Uint32 flags);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN520"
-></A
-><H2
->Description</H2
-><P
->After SDL has been initialized with <A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
-> you may initialize uninitialized subsystems with <TT
-CLASS="FUNCTION"
->SDL_InitSubSystem</TT
->. The <TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
-> parameter is the same as that used in <A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN529"
-></A
-><H2
->Examples</H2
-><PRE
-CLASS="PROGRAMLISTING"
->/* Seperating Joystick and Video initialization. */
-SDL_Init(SDL_INIT_VIDEO);
-.
-.
-SDL_SetVideoMode(640, 480, 16, SDL_DOUBLEBUF|SDL_FULLSCREEN);
-.
-/* Do Some Video stuff */
-.
-.
-/* Initialize the joystick subsystem */
-SDL_InitSubSystem(SDL_INIT_JOYSTICK);
-
-/* Do some stuff with video and joystick */
-.
-.
-.
-/* Shut them both down */
-SDL_Quit();</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN532"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error or <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN537"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
->,
-<A
-HREF="sdlquit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Quit</TT
-></A
->,
-<A
-HREF="sdlquitsubsystem.html"
-><TT
-CLASS="FUNCTION"
->SDL_QuitSubSystem</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlinit.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlquitsubsystem.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_Init</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="general.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_QuitSubSystem</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoyaxisevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoyaxisevent.html
deleted file mode 100644
index 9f0166959f0..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoyaxisevent.html
+++ /dev/null
@@ -1,330 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoyAxisEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_MouseButtonEvent"
-HREF="sdlmousebuttonevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoyButtonEvent"
-HREF="sdljoybuttonevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlmousebuttonevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoybuttonevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYAXISEVENT"
-></A
->SDL_JoyAxisEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4203"
-></A
-><H2
->Name</H2
->SDL_JoyAxisEvent&nbsp;--&nbsp;Joystick axis motion event structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4206"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type;
-  Uint8 which;
-  Uint8 axis;
-  Sint16 value;
-} SDL_JoyAxisEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4209"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4211"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_JOYAXISMOTION</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->which</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Joystick device index</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->axis</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Joystick axis index</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->value</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Axis value (range: -32768 to 32767)</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4231"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyAxisEvent</SPAN
-> is a member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union and is used when an event of type <TT
-CLASS="LITERAL"
->SDL_JOYAXISMOTION</TT
-> is reported.</P
-><P
->A <TT
-CLASS="LITERAL"
->SDL_JOYAXISMOTION</TT
-> event occurs when ever a user moves an axis on the joystick. The field <TT
-CLASS="STRUCTFIELD"
-><I
->which</I
-></TT
-> is the index of the joystick that reported the event and <TT
-CLASS="STRUCTFIELD"
-><I
->axis</I
-></TT
-> is the index of the axis (for a more detailed explaination see the <A
-HREF="joystick.html"
->Joystick section</A
->). <TT
-CLASS="STRUCTFIELD"
-><I
->value</I
-></TT
-> is the current position of the axis.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4244"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="joystick.html"
->Joystick Functions</A
->,
-<A
-HREF="sdljoystickeventstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickEventState</TT
-></A
->,
-<A
-HREF="sdljoystickgetaxis.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickGetAxis</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlmousebuttonevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoybuttonevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_MouseButtonEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoyButtonEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoyballevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoyballevent.html
deleted file mode 100644
index 4ab96fe0e83..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoyballevent.html
+++ /dev/null
@@ -1,340 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoyBallEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoyHatEvent"
-HREF="sdljoyhatevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_ResizeEvent"
-HREF="sdlresizeevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoyhatevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlresizeevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYBALLEVENT"
-></A
->SDL_JoyBallEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4396"
-></A
-><H2
->Name</H2
->SDL_JoyBallEvent&nbsp;--&nbsp;Joystick trackball motion event structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4399"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type;
-  Uint8 which;
-  Uint8 ball;
-  Sint16 xrel, yrel;
-} SDL_JoyBallEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4402"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4404"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_JOYBALLMOTION</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->which</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Joystick device index</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->ball</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Joystick trackball index</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->xrel</I
-></TT
->, <TT
-CLASS="STRUCTFIELD"
-><I
->yrel</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The relative motion in the X/Y direction</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4425"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyBallEvent</SPAN
-> is a member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union and is used when an event of type <TT
-CLASS="LITERAL"
->SDL_JOYBALLMOTION</TT
-> is reported.</P
-><P
->A <TT
-CLASS="LITERAL"
->SDL_JOYBALLMOTION</TT
-> event occurs when a user moves a trackball on the joystick. The field <TT
-CLASS="STRUCTFIELD"
-><I
->which</I
-></TT
-> is the index of the joystick that reported the event and <TT
-CLASS="STRUCTFIELD"
-><I
->ball</I
-></TT
-> is the index of the trackball (for a more detailed explaination see the <A
-HREF="joystick.html"
->Joystick section</A
->). Trackballs only return relative motion, this is the change in position on the ball since it was last polled (last cycle of the event loop) and it is stored in <TT
-CLASS="STRUCTFIELD"
-><I
->xrel</I
-></TT
-> and <TT
-CLASS="STRUCTFIELD"
-><I
->yrel</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4439"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="joystick.html"
->Joystick Functions</A
->,
-<A
-HREF="sdljoystickeventstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickEventState</TT
-></A
->,
-<A
-HREF="sdljoystickgetball.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickGetBall</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoyhatevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlresizeevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoyHatEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_ResizeEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoybuttonevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoybuttonevent.html
deleted file mode 100644
index d1d9c1ef638..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoybuttonevent.html
+++ /dev/null
@@ -1,351 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoyButtonEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoyAxisEvent"
-HREF="sdljoyaxisevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoyHatEvent"
-HREF="sdljoyhatevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoyaxisevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoyhatevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYBUTTONEVENT"
-></A
->SDL_JoyButtonEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4258"
-></A
-><H2
->Name</H2
->SDL_JoyButtonEvent&nbsp;--&nbsp;Joystick button event structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4261"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type;
-  Uint8 which;
-  Uint8 button;
-  Uint8 state;
-} SDL_JoyButtonEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4264"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4266"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_JOYBUTTONDOWN</TT
-> or <TT
-CLASS="LITERAL"
->SDL_JOYBUTTONUP</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->which</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Joystick device index</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->button</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Joystick button index</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_PRESSED</TT
-> or <TT
-CLASS="LITERAL"
->SDL_RELEASED</TT
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4289"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyButtonEvent</SPAN
-> is a member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union and is used when an event of type <TT
-CLASS="LITERAL"
->SDL_JOYBUTTONDOWN</TT
-> or <TT
-CLASS="LITERAL"
->SDL_JOYBUTTONUP</TT
-> is reported.</P
-><P
->A <TT
-CLASS="LITERAL"
->SDL_JOYBUTTONDOWN</TT
-> or <TT
-CLASS="LITERAL"
->SDL_JOYBUTTONUP</TT
-> event occurs when ever a user presses or releases a button on a joystick. The field <TT
-CLASS="STRUCTFIELD"
-><I
->which</I
-></TT
-> is the index of the joystick that reported the event and <TT
-CLASS="STRUCTFIELD"
-><I
->button</I
-></TT
-> is the index of the button (for a more detailed explaination see the <A
-HREF="joystick.html"
->Joystick section</A
->). <TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
-> is the current state or the button which is either <TT
-CLASS="LITERAL"
->SDL_PRESSED</TT
-> or <TT
-CLASS="LITERAL"
->SDL_RELEASED</TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4306"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="joystick.html"
->Joystick Functions</A
->,
-<A
-HREF="sdljoystickeventstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickEventState</TT
-></A
->,
-<A
-HREF="sdljoystickgetbutton.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickGetButton</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoyaxisevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoyhatevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoyAxisEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoyHatEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoyhatevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoyhatevent.html
deleted file mode 100644
index 5e115be2316..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoyhatevent.html
+++ /dev/null
@@ -1,413 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoyHatEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoyButtonEvent"
-HREF="sdljoybuttonevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoyBallEvent"
-HREF="sdljoyballevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoybuttonevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoyballevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYHATEVENT"
-></A
->SDL_JoyHatEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4320"
-></A
-><H2
->Name</H2
->SDL_JoyHatEvent&nbsp;--&nbsp;Joystick hat position change event structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4323"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type;
-  Uint8 which;
-  Uint8 hat;
-  Uint8 value;
-} SDL_JoyHatEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4326"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4328"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_JOY</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->which</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Joystick device index</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->hat</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Joystick hat index</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->value</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Hat position</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4348"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyHatEvent</SPAN
-> is a member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union and is used when an event of type <TT
-CLASS="LITERAL"
->SDL_JOYHATMOTION</TT
-> is reported.</P
-><P
->A <TT
-CLASS="LITERAL"
->SDL_JOYHATMOTION</TT
-> event occurs when ever a user moves a hat on the joystick. The field <TT
-CLASS="STRUCTFIELD"
-><I
->which</I
-></TT
-> is the index of the joystick that reported the event and <TT
-CLASS="STRUCTFIELD"
-><I
->hat</I
-></TT
-> is the index of the hat (for a more detailed exlaination see the <A
-HREF="joystick.html"
->Joystick section</A
->). <TT
-CLASS="STRUCTFIELD"
-><I
->value</I
-></TT
-> is the current position of the hat. It is a logically OR'd combination of the following values (whose meanings should be pretty obvious:) :</P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_CENTERED</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_UP</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_RIGHT</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_DOWN</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_LEFT</TT
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-><P
->The following defines are also provided:</P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_RIGHTUP</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_RIGHTDOWN</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_LEFTUP</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_LEFTDOWN</TT
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4382"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="joystick.html"
->Joystick Functions</A
->,
-<A
-HREF="sdljoystickeventstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickEventState</TT
-></A
->,
-<A
-HREF="sdljoystickgetball.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickGetHat</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoybuttonevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoyballevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoyButtonEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoyBallEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickclose.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickclose.html
deleted file mode 100644
index efb44e0fe6c..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickclose.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickClose</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickGetBall"
-HREF="sdljoystickgetball.html"><LINK
-REL="NEXT"
-TITLE="Audio"
-HREF="audio.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoystickgetball.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="audio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKCLOSE"
-></A
->SDL_JoystickClose</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6469"
-></A
-><H2
->Name</H2
->SDL_JoystickClose&nbsp;--&nbsp;Closes a previously opened joystick</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6472"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6473"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_JoystickClose</B
-></CODE
->(SDL_Joystick *joystick);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6479"
-></A
-><H2
->Description</H2
-><P
->Close a <TT
-CLASS="PARAMETER"
-><I
->joystick</I
-></TT
-> that was previously opened with <A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6485"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
->,
-<A
-HREF="sdljoystickopened.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpened</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoystickgetball.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickGetBall</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Audio</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickeventstate.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickeventstate.html
deleted file mode 100644
index 11b148a1260..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickeventstate.html
+++ /dev/null
@@ -1,290 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickEventState</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetAppState"
-HREF="sdlgetappstate.html"><LINK
-REL="NEXT"
-TITLE="Joystick"
-HREF="joystick.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetappstate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="joystick.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKEVENTSTATE"
-></A
->SDL_JoystickEventState</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5969"
-></A
-><H2
->Name</H2
->SDL_JoystickEventState&nbsp;--&nbsp;Enable/disable joystick event polling</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5972"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5973"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_JoystickEventState</B
-></CODE
->(int state);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5979"
-></A
-><H2
->Description</H2
-><P
->This function is used to enable or disable joystick event processing. With joystick event processing disabled you will have to update joystick states with <A
-HREF="sdljoystickupdate.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickUpdate</TT
-></A
-> and read the joystick information manually. <TT
-CLASS="PARAMETER"
-><I
->state</I
-></TT
-> is either <TT
-CLASS="LITERAL"
->SDL_QUERY</TT
->, <TT
-CLASS="LITERAL"
->SDL_ENABLE</TT
-> or <TT
-CLASS="LITERAL"
->SDL_IGNORE</TT
->.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Joystick event handling is prefered</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5990"
-></A
-><H2
->Return Value</H2
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->state</I
-></TT
-> is <TT
-CLASS="LITERAL"
->SDL_QUERY</TT
-> then the current state is returned, otherwise the new processing <TT
-CLASS="PARAMETER"
-><I
->state</I
-></TT
-> is returned.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5996"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="joystick.html"
->SDL Joystick Functions</A
->,
-<A
-HREF="sdljoystickupdate.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickUpdate</TT
-></A
->,
-<A
-HREF="sdljoyaxisevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyAxisEvent</SPAN
-></A
->,
-<A
-HREF="sdljoyballevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyBallEvent</SPAN
-></A
->,
-<A
-HREF="sdljoybuttonevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyButtonEvent</SPAN
-></A
->,
-<A
-HREF="sdljoyhatevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_JoyHatEvent</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetappstate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetAppState</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Joystick</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgetaxis.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgetaxis.html
deleted file mode 100644
index 40a17b4cc2d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgetaxis.html
+++ /dev/null
@@ -1,271 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickGetAxis</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickUpdate"
-HREF="sdljoystickupdate.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickGetHat"
-HREF="sdljoystickgethat.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoystickupdate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoystickgethat.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKGETAXIS"
-></A
->SDL_JoystickGetAxis</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6320"
-></A
-><H2
->Name</H2
->SDL_JoystickGetAxis&nbsp;--&nbsp;Get the current state of an axis</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6323"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6324"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Sint16 <B
-CLASS="FSFUNC"
->SDL_JoystickGetAxis</B
-></CODE
->(SDL_Joystick *joystick, int axis);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6330"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_JoystickGetAxis</TT
-> returns the current state of the given <TT
-CLASS="PARAMETER"
-><I
->axis</I
-></TT
-> on the given <TT
-CLASS="PARAMETER"
-><I
->joystick</I
-></TT
->.</P
-><P
->On most modern joysticks the X axis is usually represented by <TT
-CLASS="PARAMETER"
-><I
->axis</I
-></TT
-> 0 and the Y axis by <TT
-CLASS="PARAMETER"
-><I
->axis</I
-></TT
-> 1. The value returned by <TT
-CLASS="FUNCTION"
->SDL_JoystickGetAxis</TT
-> is a signed integer (-32768 to 32768) representing the current position of the <TT
-CLASS="PARAMETER"
-><I
->axis</I
-></TT
->, it maybe necessary to impose certain tolerances on these values to account for jitter. It is worth noting that some joysticks use axes 2 and 3 for extra buttons.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6341"
-></A
-><H2
->Return Value</H2
-><P
->Returns a 16-bit signed integer representing the current position of the <TT
-CLASS="PARAMETER"
-><I
->axis</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6345"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->Sint16 x_move, y_move;
-SDL_Joystick *joy1;
-.
-.
-x_move=SDL_JoystickGetAxis(joy1, 0);
-y_move=SDL_JoystickGetAxis(joy1, 1);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6349"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoysticknumaxes.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickNumAxes</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoystickupdate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoystickgethat.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickUpdate</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickGetHat</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgetball.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgetball.html
deleted file mode 100644
index 0da252ab1a5..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgetball.html
+++ /dev/null
@@ -1,262 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickGetBall</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickGetButton"
-HREF="sdljoystickgetbutton.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickClose"
-HREF="sdljoystickclose.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoystickgetbutton.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoystickclose.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKGETBALL"
-></A
->SDL_JoystickGetBall</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6433"
-></A
-><H2
->Name</H2
->SDL_JoystickGetBall&nbsp;--&nbsp;Get relative trackball motion</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6436"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6437"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_JoystickGetBall</B
-></CODE
->(SDL_Joystick *joystick, int ball, int *dx, int *dy);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6443"
-></A
-><H2
->Description</H2
-><P
->Get the <TT
-CLASS="PARAMETER"
-><I
->ball</I
-></TT
-> axis change.</P
-><P
->Trackballs can only return relative motion since the last call to <TT
-CLASS="FUNCTION"
->SDL_JoystickGetBall</TT
->, these motion deltas a placed into <TT
-CLASS="PARAMETER"
-><I
->dx</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->dy</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6451"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on failure</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6456"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->int delta_x, delta_y;
-SDL_Joystick *joy;
-.
-.
-.
-SDL_JoystickUpdate();
-if(SDL_JoystickGetBall(joy, 0, &#38;delta_x, &#38;delta_y)==-1)
-  printf("TrackBall Read Error!\n");
-printf("Trackball Delta- X:%d, Y:%d\n", delta_x, delta_y);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6460"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoysticknumballs.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickNumBalls</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoystickgetbutton.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoystickclose.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickGetButton</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickClose</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgetbutton.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgetbutton.html
deleted file mode 100644
index 680e3569d05..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgetbutton.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickGetButton</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickGetHat"
-HREF="sdljoystickgethat.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickGetBall"
-HREF="sdljoystickgetball.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoystickgethat.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoystickgetball.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKGETBUTTON"
-></A
->SDL_JoystickGetButton</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6404"
-></A
-><H2
->Name</H2
->SDL_JoystickGetButton&nbsp;--&nbsp;Get the current state of a given button on a given joystick</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6407"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6408"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint8 <B
-CLASS="FSFUNC"
->SDL_JoystickGetButton</B
-></CODE
->(SDL_Joystick *joystick, int button);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6414"
-></A
-><H2
->Description</H2
-><P
->SDL_JoystickGetButton returns the current state of the given <TT
-CLASS="PARAMETER"
-><I
->button</I
-></TT
-> on the given <TT
-CLASS="PARAMETER"
-><I
->joystick</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6419"
-></A
-><H2
->Return Value</H2
-><P
-><SPAN
-CLASS="RETURNVALUE"
->1</SPAN
-> if the button is pressed. Otherwise, <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6424"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoysticknumbuttons.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickNumButtons</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoystickgethat.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoystickgetball.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickGetHat</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickGetBall</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgethat.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgethat.html
deleted file mode 100644
index c638abb7c23..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickgethat.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickGetHat</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickGetAxis"
-HREF="sdljoystickgetaxis.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickGetButton"
-HREF="sdljoystickgetbutton.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoystickgetaxis.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoystickgetbutton.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKGETHAT"
-></A
->SDL_JoystickGetHat</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6358"
-></A
-><H2
->Name</H2
->SDL_JoystickGetHat&nbsp;--&nbsp;Get the current state of a joystick hat</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6361"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6362"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint8 <B
-CLASS="FSFUNC"
->SDL_JoystickGetHat</B
-></CODE
->(SDL_Joystick *joystick, int hat);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6368"
-></A
-><H2
->Description</H2
-><P
->SDL_JoystickGetHat returns the current state of the given <TT
-CLASS="PARAMETER"
-><I
->hat</I
-></TT
-> on the given <TT
-CLASS="PARAMETER"
-><I
->joystick</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6373"
-></A
-><H2
->Return Value</H2
-><P
->The current state is returned as a Uint8 which is defined as an OR'd combination of one or more of the following</P
-><P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_CENTERED</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_UP</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_RIGHT</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_DOWN</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_LEFT</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_RIGHTUP</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_RIGHTDOWN</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_LEFTUP</TT
-></TD
-></TR
-><TR
-><TD
-><TT
-CLASS="LITERAL"
->SDL_HAT_LEFTDOWN</TT
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6395"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoysticknumhats.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickNumHats</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoystickgetaxis.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoystickgetbutton.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickGetAxis</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickGetButton</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickindex.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickindex.html
deleted file mode 100644
index 868a75addb6..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickindex.html
+++ /dev/null
@@ -1,218 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickIndex</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickOpened"
-HREF="sdljoystickopened.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickNumAxes"
-HREF="sdljoysticknumaxes.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoystickopened.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoysticknumaxes.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKINDEX"
-></A
->SDL_JoystickIndex</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6158"
-></A
-><H2
->Name</H2
->SDL_JoystickIndex&nbsp;--&nbsp;Get the index of an SDL_Joystick.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6161"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6162"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_JoystickIndex</B
-></CODE
->(SDL_Joystick *joystick);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6168"
-></A
-><H2
->Description</H2
-><P
->Returns the index of a given <SPAN
-CLASS="STRUCTNAME"
->SDL_Joystick</SPAN
-> structure.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6172"
-></A
-><H2
->Return Value</H2
-><P
->Index number of the joystick.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6175"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoystickopened.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoysticknumaxes.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickOpened</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickNumAxes</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickname.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickname.html
deleted file mode 100644
index 0add817dc5e..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickname.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickName</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_NumJoysticks"
-HREF="sdlnumjoysticks.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickOpen"
-HREF="sdljoystickopen.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlnumjoysticks.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoystickopen.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKNAME"
-></A
->SDL_JoystickName</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6066"
-></A
-><H2
->Name</H2
->SDL_JoystickName&nbsp;--&nbsp;Get joystick name.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6069"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6070"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->const char *<B
-CLASS="FSFUNC"
->SDL_JoystickName</B
-></CODE
->(int index);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6076"
-></A
-><H2
->Description</H2
-><P
->Get the implementation dependent name of joystick. The <TT
-CLASS="PARAMETER"
-><I
->index</I
-></TT
-> parameter refers to the N'th joystick on the system.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6080"
-></A
-><H2
->Return Value</H2
-><P
->Returns a char pointer to the joystick name.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6083"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->/* Print the names of all attached joysticks */
-int num_joy, i;
-num_joy=SDL_NumJoysticks();
-printf("%d joysticks found\n", num_joy);
-for(i=0;i&#60;num_joy;i++)
-  printf("%s\n", SDL_JoystickName(i));</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6087"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlnumjoysticks.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoystickopen.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_NumJoysticks</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickOpen</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumaxes.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumaxes.html
deleted file mode 100644
index 53b67f52394..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumaxes.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickNumAxes</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickIndex"
-HREF="sdljoystickindex.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickNumBalls"
-HREF="sdljoysticknumballs.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoystickindex.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoysticknumballs.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKNUMAXES"
-></A
->SDL_JoystickNumAxes</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6184"
-></A
-><H2
->Name</H2
->SDL_JoystickNumAxes&nbsp;--&nbsp;Get the number of joystick axes</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6187"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6188"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_JoystickNumAxes</B
-></CODE
->(SDL_Joystick *joystick);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6194"
-></A
-><H2
->Description</H2
-><P
->Return the number of axes available from a previously opened <SPAN
-CLASS="STRUCTNAME"
->SDL_Joystick</SPAN
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6198"
-></A
-><H2
->Return Value</H2
-><P
->Number of axes.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6201"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoystickgetaxis.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickGetAxis</TT
-></A
->,
-<A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoystickindex.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoysticknumballs.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickIndex</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickNumBalls</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumballs.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumballs.html
deleted file mode 100644
index 0a8405dc930..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumballs.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickNumBalls</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickNumAxes"
-HREF="sdljoysticknumaxes.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickNumHats"
-HREF="sdljoysticknumhats.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoysticknumaxes.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoysticknumhats.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKNUMBALLS"
-></A
->SDL_JoystickNumBalls</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6212"
-></A
-><H2
->Name</H2
->SDL_JoystickNumBalls&nbsp;--&nbsp;Get the number of joystick trackballs</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6215"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6216"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_JoystickNumBalls</B
-></CODE
->(SDL_Joystick *joystick);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6222"
-></A
-><H2
->Description</H2
-><P
->Return the number of trackballs available from a previously opened <SPAN
-CLASS="STRUCTNAME"
->SDL_Joystick</SPAN
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6226"
-></A
-><H2
->Return Value</H2
-><P
->Number of trackballs.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6229"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoystickgetball.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickGetBall</TT
-></A
->,
-<A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoysticknumaxes.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoysticknumhats.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickNumAxes</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickNumHats</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumbuttons.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumbuttons.html
deleted file mode 100644
index 625b893a6a2..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumbuttons.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickNumButtons</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickNumHats"
-HREF="sdljoysticknumhats.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickUpdate"
-HREF="sdljoystickupdate.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoysticknumhats.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoystickupdate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKNUMBUTTONS"
-></A
->SDL_JoystickNumButtons</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6268"
-></A
-><H2
->Name</H2
->SDL_JoystickNumButtons&nbsp;--&nbsp;Get the number of joysitck buttons</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6271"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6272"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_JoystickNumButtons</B
-></CODE
->(SDL_Joystick *joystick);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6278"
-></A
-><H2
->Description</H2
-><P
->Return the number of buttons available from a previously opened <SPAN
-CLASS="STRUCTNAME"
->SDL_Joystick</SPAN
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6282"
-></A
-><H2
->Return Value</H2
-><P
->Number of buttons.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6285"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoystickgetbutton.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickGetButton</TT
-></A
->,
-<A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoysticknumhats.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoystickupdate.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickNumHats</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickUpdate</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumhats.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumhats.html
deleted file mode 100644
index ed532358547..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoysticknumhats.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickNumHats</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickNumBalls"
-HREF="sdljoysticknumballs.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickNumButtons"
-HREF="sdljoysticknumbuttons.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoysticknumballs.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoysticknumbuttons.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKNUMHATS"
-></A
->SDL_JoystickNumHats</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6240"
-></A
-><H2
->Name</H2
->SDL_JoystickNumHats&nbsp;--&nbsp;Get the number of joystick hats</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6243"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6244"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_JoystickNumHats</B
-></CODE
->(SDL_Joystick *joystick);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6250"
-></A
-><H2
->Description</H2
-><P
->Return the number of hats available from a previously opened <SPAN
-CLASS="STRUCTNAME"
->SDL_Joystick</SPAN
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6254"
-></A
-><H2
->Return Value</H2
-><P
->Number of hats.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6257"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoystickgethat.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickGetHat</TT
-></A
->,
-<A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoysticknumballs.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoysticknumbuttons.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickNumBalls</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickNumButtons</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickopen.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickopen.html
deleted file mode 100644
index e608c4370f7..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickopen.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickOpen</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickName"
-HREF="sdljoystickname.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickOpened"
-HREF="sdljoystickopened.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoystickname.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoystickopened.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKOPEN"
-></A
->SDL_JoystickOpen</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6096"
-></A
-><H2
->Name</H2
->SDL_JoystickOpen&nbsp;--&nbsp;Opens a joystick for use.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6099"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6100"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Joystick *<B
-CLASS="FSFUNC"
->SDL_JoystickOpen</B
-></CODE
->(int index);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6106"
-></A
-><H2
->Description</H2
-><P
->Opens a joystick for use within SDL. The <TT
-CLASS="PARAMETER"
-><I
->index</I
-></TT
-> refers to the N'th joystick in the system. A joystick must be opened before it game be used.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6110"
-></A
-><H2
->Return Value</H2
-><P
->Returns a <SPAN
-CLASS="STRUCTNAME"
->SDL_Joystick</SPAN
-> structure on success. <SPAN
-CLASS="RETURNVALUE"
->NULL</SPAN
-> on failure.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6115"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_Joystick *joy;
-// Check for joystick
-if(SDL_NumJoysticks()&#62;0){
-  // Open joystick
-  joy=SDL_JoystickOpen(0);
-  
-  if(joy)
-  {
-    printf("Opened Joystick 0\n");
-    printf("Name: %s\n", SDL_JoystickName(0));
-    printf("Number of Axes: %d\n", SDL_JoystickNumAxes(joy));
-    printf("Number of Buttons: %d\n", SDL_JoystickNumButtons(joy));
-    printf("Number of Balls: %d\n", SDL_JoystickNumBalls(joy));
-  }
-  else
-    printf("Couldn't open Joystick 0\n");
-  
-  // Close if opened
-  if(SDL_JoystickOpened(0))
-    SDL_JoystickClose(joy);
-}</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6119"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoystickclose.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickClose</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoystickname.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoystickopened.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickName</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickOpened</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickopened.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickopened.html
deleted file mode 100644
index 5275a099de8..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickopened.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickOpened</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickOpen"
-HREF="sdljoystickopen.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickIndex"
-HREF="sdljoystickindex.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoystickopen.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoystickindex.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKOPENED"
-></A
->SDL_JoystickOpened</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6128"
-></A
-><H2
->Name</H2
->SDL_JoystickOpened&nbsp;--&nbsp;Determine if a joystick has been opened</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6131"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6132"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_JoystickOpened</B
-></CODE
->(int index);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6138"
-></A
-><H2
->Description</H2
-><P
->Determines whether a joystick has already been opened within the application. <TT
-CLASS="PARAMETER"
-><I
->index</I
-></TT
-> refers to the N'th joystick on the system.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6142"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->1</SPAN
-> if the joystick has been opened, or <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> if it has not.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6147"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
->,
-<A
-HREF="sdljoystickclose.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickClose</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoystickopen.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoystickindex.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickOpen</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickIndex</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickupdate.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickupdate.html
deleted file mode 100644
index 0cb37dc2261..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdljoystickupdate.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_JoystickUpdate</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoystickNumButtons"
-HREF="sdljoysticknumbuttons.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickGetAxis"
-HREF="sdljoystickgetaxis.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoysticknumbuttons.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoystickgetaxis.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLJOYSTICKUPDATE"
-></A
->SDL_JoystickUpdate</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6296"
-></A
-><H2
->Name</H2
->SDL_JoystickUpdate&nbsp;--&nbsp;Updates the state of all joysticks</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6299"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6300"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_JoystickUpdate</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6306"
-></A
-><H2
->Description</H2
-><P
->Updates the state(position, buttons, etc.) of all open joysticks. If joystick events have been enabled with <A
-HREF="sdljoystickeventstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickEventState</TT
-></A
-> then this is called automatically in the event loop.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6311"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoystickeventstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickEventState</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoysticknumbuttons.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoystickgetaxis.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoystickNumButtons</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickGetAxis</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkey.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkey.html
deleted file mode 100644
index 6591884d1e3..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkey.html
+++ /dev/null
@@ -1,2630 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDLKey</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_keysym"
-HREF="sdlkeysym.html"><LINK
-REL="NEXT"
-TITLE="Event Functions."
-HREF="eventfunctions.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlkeysym.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLKEY"
-></A
->SDLKey</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4714"
-></A
-><H2
->Name</H2
->SDLKey&nbsp;--&nbsp;Keysym definitions.</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4717"
-></A
-><H2
->Description</H2
-><P
->&#13;<DIV
-CLASS="TABLE"
-><A
-NAME="AEN4720"
-></A
-><P
-><B
->Table 8-1. SDL Keysym definitions</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><THEAD
-><TR
-><TH
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLKey</TH
-><TH
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->ASCII value</TH
-><TH
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->Common name</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_BACKSPACE</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'\b'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->backspace</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_TAB</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'\t'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->tab</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_CLEAR</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->clear</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_RETURN</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'\r'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->return</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_PAUSE</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->pause</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_ESCAPE</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'^['</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->escape</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_SPACE</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->' '</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->space</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_EXCLAIM</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'!'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->exclaim</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_QUOTEDBL</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'"'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->quotedbl</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_HASH</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'#'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->hash</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_DOLLAR</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'$'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->dollar</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_AMPERSAND</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'&#38;'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->ampersand</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_QUOTE</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'''</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->quote</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_LEFTPAREN</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'('</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->left parenthesis</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_RIGHTPAREN</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->')'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->right parenthesis</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_ASTERISK</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'*'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->asterisk</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_PLUS</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'+'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->plus sign</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_COMMA</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->','</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->comma</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_MINUS</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'-'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->minus sign</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_PERIOD</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'.'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->period</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_SLASH</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'/'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->forward slash</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_0</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'0'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->0</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_1</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'1'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->1</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_2</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'2'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->2</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_3</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'3'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->3</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_4</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'4'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->4</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_5</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'5'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->5</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_6</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'6'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->6</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_7</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'7'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->7</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_8</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'8'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->8</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_9</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'9'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->9</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_COLON</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->':'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->colon</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_SEMICOLON</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->';'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->semicolon</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_LESS</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'&lt;'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->less-than sign</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_EQUALS</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'='</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->equals sign</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_GREATER</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'&gt;'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->greater-than sign</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_QUESTION</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'?'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->question mark</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_AT</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'@'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->at</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_LEFTBRACKET</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'['</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->left bracket</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_BACKSLASH</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'\'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->backslash</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_RIGHTBRACKET</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->']'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->right bracket</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_CARET</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'^'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->caret</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_UNDERSCORE</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'_'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->underscore</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_BACKQUOTE</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'`'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->grave</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_a</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'a'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->a</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_b</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'b'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->b</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_c</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'c'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->c</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_d</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'d'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->d</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_e</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'e'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->e</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_f</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'f'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->f</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_g</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'g'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->g</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_h</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'h'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->h</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_i</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'i'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->i</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_j</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'j'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->j</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_k</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'k'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->k</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_l</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'l'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->l</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_m</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'m'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->m</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_n</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'n'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->n</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_o</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'o'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->o</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_p</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'p'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->p</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_q</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'q'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->q</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_r</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'r'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->r</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_s</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'s'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->s</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_t</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'t'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->t</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_u</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'u'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->u</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_v</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'v'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->v</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_w</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'w'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->w</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_x</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'x'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_y</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'y'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->y</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_z</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'z'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->z</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_DELETE</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'^?'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->delete</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP0</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad 0</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP1</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad 1</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP2</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad 2</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP3</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad 3</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP4</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad 4</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP5</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad 5</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP6</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad 6</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP7</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad 7</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP8</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad 8</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP9</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad 9</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP_PERIOD</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'.'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad period</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP_DIVIDE</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'/'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad divide</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP_MULTIPLY</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'*'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad multiply</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP_MINUS</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'-'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad minus</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP_PLUS</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'+'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad plus</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP_ENTER</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'\r'</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad enter</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_KP_EQUALS</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->'='</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->keypad equals</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_UP</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->up arrow</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_DOWN</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->down arrow</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_RIGHT</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->right arrow</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_LEFT</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->left arrow</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_INSERT</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->insert</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_HOME</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->home</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_END</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->end</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_PAGEUP</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->page up</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_PAGEDOWN</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->page down</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F1</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F1</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F2</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F2</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F3</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F3</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F4</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F4</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F5</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F5</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F6</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F6</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F7</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F7</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F8</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F8</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F9</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F9</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F10</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F10</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F11</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F11</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F12</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F12</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F13</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F13</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F14</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F14</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_F15</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->F15</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_NUMLOCK</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->numlock</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_CAPSLOCK</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->capslock</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_SCROLLOCK</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->scrollock</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_RSHIFT</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->right shift</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_LSHIFT</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->left shift</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_RCTRL</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->right ctrl</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_LCTRL</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->left ctrl</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_RALT</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->right alt</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_LALT</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->left alt</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_RMETA</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->right meta</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_LMETA</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->left meta</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_LSUPER</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->left windows key</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_RSUPER</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->right windows key</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_MODE</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->mode shift</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_HELP</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->help</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_PRINT</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->print-screen</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_SYSREQ</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SysRq</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_BREAK</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->break</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_MENU</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->menu</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_POWER</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->power</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDLK_EURO</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="LEFT"
-VALIGN="TOP"
->euro</TD
-></TR
-></TBODY
-></TABLE
-></DIV
->
-
-<DIV
-CLASS="TABLE"
-><A
-NAME="SDLMOD"
-></A
-><P
-><B
->Table 8-2. SDL modifier definitions</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><THEAD
-><TR
-><TH
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->SDL Modifier</TH
-><TH
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->Meaning</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_NONE</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->No modifiers applicable</TD
-></TR
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_NUM</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->Numlock is down</TD
-></TR
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_CAPS</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->Capslock is down</TD
-></TR
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_LCTRL</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->Left Control is down</TD
-></TR
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_RCTRL</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->Right Control is down</TD
-></TR
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_RSHIFT</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->Right Shift is down</TD
-></TR
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_LSHIFT</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->Left Shift is down</TD
-></TR
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_RALT</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->Right Alt is down</TD
-></TR
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_LALT</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->Left Alt is down</TD
-></TR
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_CTRL</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->A Control key is down</TD
-></TR
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_SHIFT</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->A Shift key is down</TD
-></TR
-><TR
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->KMOD_ALT</TD
-><TD
-WIDTH="50%"
-ALIGN="LEFT"
-VALIGN="TOP"
->An Alt key is down</TD
-></TR
-></TBODY
-></TABLE
-></DIV
->&#13;</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlkeysym.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_keysym</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Event Functions.</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkeyboardevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkeyboardevent.html
deleted file mode 100644
index 1a6962c74a5..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkeyboardevent.html
+++ /dev/null
@@ -1,375 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_KeyboardEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_ActiveEvent"
-HREF="sdlactiveevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_MouseMotionEvent"
-HREF="sdlmousemotionevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlactiveevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlmousemotionevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLKEYBOARDEVENT"
-></A
->SDL_KeyboardEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4011"
-></A
-><H2
->Name</H2
->SDL_KeyboardEvent&nbsp;--&nbsp;Keyboard event structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4014"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type;
-  Uint8 state;
-  SDL_keysym keysym;
-} SDL_KeyboardEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4017"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4019"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_KEYDOWN</TT
-> or <TT
-CLASS="LITERAL"
->SDL_KEYUP</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_PRESSED</TT
-> or <TT
-CLASS="LITERAL"
->SDL_RELEASED</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->keysym</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Contains key press information</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4038"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_KeyboardEvent</SPAN
-> is a member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union and is used when an event of type <TT
-CLASS="LITERAL"
->SDL_KEYDOWN</TT
-> or <TT
-CLASS="LITERAL"
->SDL_KEYUP</TT
-> is reported.</P
-><P
->The <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-> and <TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
-> actually report the same information, they just use different values to do it! A keyboard event occurs when a key is released (<TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
->=<TT
-CLASS="LITERAL"
->SDK_KEYUP</TT
-> or <TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
->=<TT
-CLASS="LITERAL"
->SDL_RELEASED</TT
->) and when a key is pressed (<TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
->=<TT
-CLASS="LITERAL"
->SDL_KEYDOWN</TT
-> or <TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
->=<TT
-CLASS="LITERAL"
->SDL_PRESSED</TT
->). The information on what key was pressed or released is in the <A
-HREF="sdlkeysym.html"
-><SPAN
-CLASS="STRUCTNAME"
->keysym</SPAN
-></A
-> structure.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Repeating <TT
-CLASS="LITERAL"
->SDL_KEYDOWN</TT
-> events will occur if key repeat is enabled (see <A
-HREF="sdlenablekeyrepeat.html"
-><TT
-CLASS="FUNCTION"
->SDL_EnableKeyRepeat</TT
-></A
->).</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4064"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlkeysym.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_keysym</SPAN
-></A
->,
-<A
-HREF="sdlenablekeyrepeat.html"
-><TT
-CLASS="FUNCTION"
->SDL_EnableKeyRepeat</TT
-></A
->,
-<A
-HREF="sdlenableunicode.html"
-><TT
-CLASS="FUNCTION"
->SDL_EnableUNICODE</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlactiveevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlmousemotionevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_ActiveEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_MouseMotionEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkeysym.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkeysym.html
deleted file mode 100644
index 7a22f795136..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkeysym.html
+++ /dev/null
@@ -1,355 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_keysym</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_QuitEvent"
-HREF="sdlquitevent.html"><LINK
-REL="NEXT"
-TITLE="SDLKey"
-HREF="sdlkey.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlquitevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlkey.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLKEYSYM"
-></A
->SDL_keysym</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4659"
-></A
-><H2
->Name</H2
->SDL_keysym&nbsp;--&nbsp;Keysym structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4662"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 scancode;
-  SDLKey sym;
-  SDLMod mod;
-  Uint16 unicode;
-} SDL_keysym;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4665"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4667"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->scancode</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Hardware specific scancode</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->sym</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->SDL virtual keysym</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->mod</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Current key modifiers</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->unicode</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Translated character</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4686"
-></A
-><H2
->Description</H2
-><P
->The <SPAN
-CLASS="STRUCTNAME"
->SDL_keysym</SPAN
-> structure is used by reporting key presses and releases since it is a part of the <A
-HREF="sdlkeyboardevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_KeyboardEvent</SPAN
-></A
->.</P
-><P
->The <TT
-CLASS="STRUCTFIELD"
-><I
->scancode</I
-></TT
-> field should generally be left alone, it is the hardware dependent scancode returned by the keyboard. The <TT
-CLASS="STRUCTFIELD"
-><I
->sym</I
-></TT
-> field is extremely useful. It is the SDL-defined value of the key (see <A
-HREF="sdlkey.html"
->SDL Key Syms</A
->. This field is very useful when you are checking for certain key presses, like so:
-<PRE
-CLASS="PROGRAMLISTING"
->.
-.
-while(SDL_PollEvent(&#38;event)){
-  switch(event.type){
-    case SDL_KEYDOWN:
-      if(event.key.keysym.sym==SDLK_LEFT)
-        move_left();
-      break;
-    .
-    .
-    .
-  }
-}
-.
-.</PRE
->
-<TT
-CLASS="STRUCTFIELD"
-><I
->mod</I
-></TT
-> stores the current state of the keyboard modifiers as explained in <A
-HREF="sdlgetmodstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetModState</TT
-></A
->. The <TT
-CLASS="STRUCTFIELD"
-><I
->unicode</I
-></TT
-> is only used when UNICODE translation is enabled with <A
-HREF="sdlenableunicode.html"
-><TT
-CLASS="FUNCTION"
->SDL_EnableUNICODE</TT
-></A
->. If <TT
-CLASS="STRUCTFIELD"
-><I
->unicode</I
-></TT
-> is non-zero then this a the UNICODE character corresponding to the keypress. If the high 9 bits of the character are 0, then this maps to the equivalent ASCII character:
-<PRE
-CLASS="PROGRAMLISTING"
->char ch;
-if ( (keysym.unicode &#38; 0xFF80) == 0 ) {
-  ch = keysym.unicode &#38; 0x7F;
-}
-else {
-  printf("An International Character.\n");
-}</PRE
->
-UNICODE translation does have a slight overhead so don't enable it unless its needed.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4705"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlkey.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDLKey</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlquitevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlkey.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_QuitEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDLKey</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkillthread.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkillthread.html
deleted file mode 100644
index 2ce7b9b58f8..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlkillthread.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_KillThread</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_WaitThread"
-HREF="sdlwaitthread.html"><LINK
-REL="NEXT"
-TITLE="SDL_CreateMutex"
-HREF="sdlcreatemutex.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlwaitthread.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcreatemutex.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLKILLTHREAD"
-></A
->SDL_KillThread</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7794"
-></A
-><H2
->Name</H2
->SDL_KillThread&nbsp;--&nbsp;Gracelessly terminates the thread.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7797"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7798"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_KillThread</B
-></CODE
->(SDL_Thread *thread);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7804"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_KillThread</TT
-> gracelessly terminates the thread 
-associated with <TT
-CLASS="PARAMETER"
-><I
->thread</I
-></TT
->.  If possible, you should 
-use some other form of IPC to signal the thread to quit.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7809"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatethread.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateThread</TT
-></A
->,
-<A
-HREF="sdlwaitthread.html"
-><TT
-CLASS="FUNCTION"
->SDL_WaitThread</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlwaitthread.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcreatemutex.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_WaitThread</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CreateMutex</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllistmodes.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllistmodes.html
deleted file mode 100644
index ee7bc0eeecf..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllistmodes.html
+++ /dev/null
@@ -1,310 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_ListModes</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_VideoDriverName"
-HREF="sdlvideodrivername.html"><LINK
-REL="NEXT"
-TITLE="SDL_VideoModeOK"
-HREF="sdlvideomodeok.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlvideodrivername.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlvideomodeok.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLLISTMODES"
-></A
->SDL_ListModes</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1159"
-></A
-><H2
->Name</H2
->SDL_ListModes&nbsp;--&nbsp;Returns a pointer to an array of available screen dimensions for 
-the given format and video flags</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1162"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1163"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Rect **<B
-CLASS="FSFUNC"
->SDL_ListModes</B
-></CODE
->(SDL_PixelFormat *format, Uint32 flags);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1169"
-></A
-><H2
->Description</H2
-><P
->Return a pointer to an array of available screen dimensions for the given
-format and video flags, sorted largest to smallest.  Returns
-<TT
-CLASS="LITERAL"
->NULL</TT
-> if there are no dimensions available for a particular
-format, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> if any dimension is okay for
-the given format.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->format</I
-></TT
-> is <TT
-CLASS="LITERAL"
->NULL</TT
->, the mode list
-will be for the format returned by <A
-HREF="sdlgetvideoinfo.html"
->SDL_GetVideoInfo()</A
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->vfmt</I
-></TT
->. The <TT
-CLASS="PARAMETER"
-><I
->flag</I
-></TT
-> parameter is an OR'd combination of <A
-HREF="sdlsurface.html"
->surface</A
-> flags. The flags are the same as those used <A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
-> and they play a strong role in deciding what modes are valid. For instance, if you pass <TT
-CLASS="LITERAL"
->SDL_HWSURFACE</TT
-> as a flag only modes that support hardware video surfaces will be returned.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1184"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_Rect **modes;
-int i;
-.
-.
-.
-
-/* Get available fullscreen/hardware modes */
-modes=SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE);
-
-/* Check is there are any modes available */
-if(modes == (SDL_Rect **)0){
-  printf("No modes available!\n");
-  exit(-1);
-}
-
-/* Check if our resolution is restricted */
-if(modes == (SDL_Rect **)-1){
-  printf("All resolutions available.\n");
-}
-else{
-  /* Print valid modes */
-  printf("Available Modes\n");
-  for(i=0;modes[i];++i)
-    printf("  %d x %d\n", modes[i]-&#62;w, modes[i]-&#62;h);
-}
-.
-.</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1187"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->,
-<A
-HREF="sdlgetvideoinfo.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetVideoInfo</TT
-></A
->,
-<A
-HREF="sdlrect.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Rect</SPAN
-></A
->,
-<A
-HREF="sdlpixelformat.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlvideodrivername.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlvideomodeok.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_VideoDriverName</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_VideoModeOK</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlloadbmp.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlloadbmp.html
deleted file mode 100644
index 41556e34ae8..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlloadbmp.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_LoadBMP</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_UnlockSurface"
-HREF="sdlunlocksurface.html"><LINK
-REL="NEXT"
-TITLE="SDL_SaveBMP"
-HREF="sdlsavebmp.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlunlocksurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsavebmp.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLLOADBMP"
-></A
->SDL_LoadBMP</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1989"
-></A
-><H2
->Name</H2
->SDL_LoadBMP&nbsp;--&nbsp;Load a Windows BMP file into an SDL_Surface.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1992"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1993"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Surface *<B
-CLASS="FSFUNC"
->SDL_LoadBMP</B
-></CODE
->(const char *file);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1999"
-></A
-><H2
->Description</H2
-><P
->Loads a surface from a named Windows BMP file.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2002"
-></A
-><H2
->Return Value</H2
-><P
->Returns the new surface, or <TT
-CLASS="LITERAL"
->NULL</TT
-> 
-if there was an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2006"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsavebmp.html"
-><TT
-CLASS="FUNCTION"
->SDL_SaveBMP</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlunlocksurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsavebmp.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_UnlockSurface</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SaveBMP</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlloadwav.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlloadwav.html
deleted file mode 100644
index 8abb73ec366..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlloadwav.html
+++ /dev/null
@@ -1,296 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_LoadWAV</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetAudioStatus"
-HREF="sdlgetaudiostatus.html"><LINK
-REL="NEXT"
-TITLE="SDL_FreeWAV"
-HREF="sdlfreewav.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetaudiostatus.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlfreewav.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLLOADWAV"
-></A
->SDL_LoadWAV</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6816"
-></A
-><H2
->Name</H2
->SDL_LoadWAV&nbsp;--&nbsp;Load a WAVE file</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6819"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6820"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_AudioSpec *<B
-CLASS="FSFUNC"
->SDL_LoadWAV</B
-></CODE
->(const char *file, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6826"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_LoadWAV</TT
->
-This function loads a WAVE <TT
-CLASS="PARAMETER"
-><I
->file</I
-></TT
-> into memory.</P
-><P
->If this function succeeds, it returns the given 
-<A
-HREF="sdlaudiospec.html"
-><TT
-CLASS="FUNCTION"
->SDL_AudioSpec</TT
-></A
->, 
-filled with the audio data format of the wave data, and sets 
-<TT
-CLASS="PARAMETER"
-><I
->audio_buf</I
-></TT
-> to a <TT
-CLASS="FUNCTION"
->malloc</TT
->'d 
-buffer containing the audio data, and sets <TT
-CLASS="PARAMETER"
-><I
->audio_len</I
-></TT
-> 
-to the length of that audio buffer, in bytes.  You need to free the audio 
-buffer with <A
-HREF="sdlfreewav.html"
-><TT
-CLASS="FUNCTION"
->SDL_FreeWAV</TT
-></A
-> when you are
-done with it.</P
-><P
->This function returns <TT
-CLASS="LITERAL"
->NULL</TT
-> and sets the SDL 
-error message if the wave file cannot be opened, uses an unknown data format, 
-or is corrupt.  Currently raw, MS-ADPCM and IMA-ADPCM WAVE files are supported.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6841"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_AudioSpec wav_spec;
-Uint32 wav_length;
-Uint8 *wav_buffer;
-
-/* Load the WAV */
-if( SDL_LoadWAV("test.wav", &#38;wav_spec, &#38;wav_buffer, &#38;wav_length) == NULL ){
-  fprintf(stderr, "Could not open test.wav: %s\n", SDL_GetError());
-  exit(-1);
-}
-.
-.
-.
-/* Do stuff with the WAV */
-.
-.
-/* Free It */
-SDL_FreeWAV(wav_buffer);</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6844"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlaudiospec.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_AudioSpec</SPAN
-></A
->,
-<A
-HREF="sdlopenaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-></A
->,
-<A
-HREF="sdlfreewav.html"
-><TT
-CLASS="FUNCTION"
->SDL_FreeWAV</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetaudiostatus.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlfreewav.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetAudioStatus</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_FreeWAV</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllockaudio.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllockaudio.html
deleted file mode 100644
index 0e6fc292b4d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllockaudio.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_LockAudio</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_MixAudio"
-HREF="sdlmixaudio.html"><LINK
-REL="NEXT"
-TITLE="SDL_UnlockAudio"
-HREF="sdlunlockaudio.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlmixaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlunlockaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLLOCKAUDIO"
-></A
->SDL_LockAudio</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7134"
-></A
-><H2
->Name</H2
->SDL_LockAudio&nbsp;--&nbsp;Lock out the callback function</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7137"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7138"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_LockAudio</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7144"
-></A
-><H2
->Description</H2
-><P
->The lock manipulated by these functions protects the callback function.
-During a LockAudio period, you can be guaranteed that the
-callback function is not running.  Do not call these from the callback
-function or you will cause deadlock.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7147"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlopenaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlmixaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlunlockaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_MixAudio</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_UnlockAudio</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllocksurface.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllocksurface.html
deleted file mode 100644
index 40c8959ea02..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllocksurface.html
+++ /dev/null
@@ -1,306 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_LockSurface</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_FreeSurface"
-HREF="sdlfreesurface.html"><LINK
-REL="NEXT"
-TITLE="SDL_UnlockSurface"
-HREF="sdlunlocksurface.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlfreesurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlunlocksurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLLOCKSURFACE"
-></A
->SDL_LockSurface</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1919"
-></A
-><H2
->Name</H2
->SDL_LockSurface&nbsp;--&nbsp;Lock a surface for directly access.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1922"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1923"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_LockSurface</B
-></CODE
->(SDL_Surface *surface);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1929"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
-> sets up a surface for directly 
-accessing the pixels.  Between calls to <TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
->
-and <TT
-CLASS="FUNCTION"
->SDL_UnlockSurface</TT
->, you can write to and read from 
-<TT
-CLASS="PARAMETER"
-><I
->surface-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->pixels</I
-></TT
-></I
-></TT
->, using the pixel format stored in
-<TT
-CLASS="PARAMETER"
-><I
->surface-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->format</I
-></TT
-></I
-></TT
->.  Once you are done accessing the
-surface, you should use <TT
-CLASS="FUNCTION"
->SDL_UnlockSurface</TT
-> to release it.</P
-><P
->Not all surfaces require locking.  
-If <TT
-CLASS="LITERAL"
->SDL_MUSTLOCK</TT
->(<TT
-CLASS="PARAMETER"
-><I
->surface</I
-></TT
->)
-evaluates to <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->, then you can read and write to the 
-surface at any time, and the pixel format of the surface will not change. </P
-><P
->No operating system or library calls should be made between lock/unlock
-pairs, as critical system locks may be held during this time.</P
-><P
->It should be noted, that since SDL 1.1.8 surface locks are recursive. This means that you can lock a surface multiple times, but each lock must have a match unlock.
-<PRE
-CLASS="PROGRAMLISTING"
->    .
-    .
-    SDL_LockSurface( surface );
-    .
-    /* Surface is locked */
-    /* Direct pixel access on surface here */
-    .
-    SDL_LockSurface( surface );
-    .
-    /* More direct pixel access on surface */
-    .
-    SDL_UnlockSurface( surface );
-    /* Surface is still locked */
-    /* Note: Is versions &#60; 1.1.8, the surface would have been */
-    /* no longer locked at this stage                         */
-    .
-    SDL_UnlockSurface( surface );
-    /* Surface is now unlocked */
-    .
-    .</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1947"
-></A
-><H2
->Return Value</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
-> returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->, 
-or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> if the surface couldn't be locked.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1953"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlunlocksurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_UnlockSurface</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlfreesurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlunlocksurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_FreeSurface</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_UnlockSurface</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllockyuvoverlay.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllockyuvoverlay.html
deleted file mode 100644
index 74e6ce673db..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdllockyuvoverlay.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_LockYUVOverlay</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CreateYUVOverlay"
-HREF="sdlcreateyuvoverlay.html"><LINK
-REL="NEXT"
-TITLE="SDL_UnlockYUVOverlay"
-HREF="sdlunlockyuvoverlay.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcreateyuvoverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlunlockyuvoverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLLOCKYUVOVERLAY"
-></A
->SDL_LockYUVOverlay</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2844"
-></A
-><H2
->Name</H2
->SDL_LockYUVOverlay&nbsp;--&nbsp;Lock an overlay</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2847"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2848"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_LockYUVOverlay</B
-></CODE
->(SDL_Overlay *overlay);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2854"
-></A
-><H2
->Description</H2
-><P
->Much the same as <A
-HREF="sdllocksurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
-></A
->, <TT
-CLASS="FUNCTION"
->SDL_LockYUVOverlay</TT
-> locks the <A
-HREF="sdloverlay.html"
-><TT
-CLASS="PARAMETER"
-><I
->overlay</I
-></TT
-></A
-> for direct access to pixel data.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2862"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2867"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlunlockyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_UnlockYUVOverlay</TT
-></A
->,
-<A
-HREF="sdlcreateyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateYUVOverlay</TT
-></A
->,
-<A
-HREF="sdloverlay.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Overlay</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcreateyuvoverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlunlockyuvoverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CreateYUVOverlay</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_UnlockYUVOverlay</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmaprgb.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmaprgb.html
deleted file mode 100644
index 5086d0c7dca..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmaprgb.html
+++ /dev/null
@@ -1,254 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_MapRGB</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SetGammaRamp"
-HREF="sdlsetgammaramp.html"><LINK
-REL="NEXT"
-TITLE="SDL_MapRGBA"
-HREF="sdlmaprgba.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsetgammaramp.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlmaprgba.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLMAPRGB"
-></A
->SDL_MapRGB</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1652"
-></A
-><H2
->Name</H2
->SDL_MapRGB&nbsp;--&nbsp;Map a RGB color value to a pixel format.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1655"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1656"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint32 <B
-CLASS="FSFUNC"
->SDL_MapRGB</B
-></CODE
->(SDL_PixelFormat *fmt, Uint8 r, Uint8 g, Uint8 b);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1662"
-></A
-><H2
->Description</H2
-><P
->Maps the RGB color value to the specified pixel format and returns the
-pixel value as a 32-bit int.</P
-><P
->If the format has a palette (8-bit) the index of the closest matching
-color in the palette will be returned.</P
-><P
->If the specified pixel format has an alpha component it will be returned
-as all 1 bits (fully opaque).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1667"
-></A
-><H2
->Return Value</H2
-><P
->A pixel value best approximating the given RGB color value for a given
-pixel format. If the pixel format bpp (color depth) is less than 32-bpp
-then the unused upper bits of the return value can safely be ignored
-(e.g., with a 16-bpp format the return value can be assigned to a
-<SPAN
-CLASS="TYPE"
->Uint16</SPAN
->, and similarly a <SPAN
-CLASS="TYPE"
->Uint8</SPAN
-> for an 8-bpp
-format).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1672"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetrgb.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetRGB</TT
-></A
->,
-<A
-HREF="sdlgetrgba.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetRGBA</TT
-></A
->,
-<A
-HREF="sdlmaprgba.html"
-><TT
-CLASS="FUNCTION"
->SDL_MapRGBA</TT
-></A
->,
-<A
-HREF="sdlpixelformat.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsetgammaramp.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlmaprgba.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SetGammaRamp</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_MapRGBA</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmaprgba.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmaprgba.html
deleted file mode 100644
index e6bff276f77..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmaprgba.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_MapRGBA</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_MapRGB"
-HREF="sdlmaprgb.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetRGB"
-HREF="sdlgetrgb.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlmaprgb.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetrgb.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLMAPRGBA"
-></A
->SDL_MapRGBA</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1687"
-></A
-><H2
->Name</H2
->SDL_MapRGBA&nbsp;--&nbsp;Map a RGBA color value to a pixel format.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1690"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1691"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint32 <B
-CLASS="FSFUNC"
->SDL_MapRGBA</B
-></CODE
->(SDL_PixelFormat *fmt, Uint8 r, Uint8 g, Uint8 b, Uint8 a);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1697"
-></A
-><H2
->Description</H2
-><P
->Maps the RGBA color value to the specified pixel format and returns the
-pixel value as a 32-bit int.</P
-><P
->If the format has a palette (8-bit) the index of the closest matching
-color in the palette will be returned.</P
-><P
->If the specified pixel format has no alpha component the alpha value
-will be ignored (as it will be in formats with a palette).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1702"
-></A
-><H2
->Return Value</H2
-><P
->A pixel value best approximating the given RGBA color value for a given
-pixel format. If the pixel format bpp (color depth) is less than 32-bpp
-then the unused upper bits of the return value can safely be ignored
-(e.g., with a 16-bpp format the return value can be assigned to a
-<SPAN
-CLASS="TYPE"
->Uint16</SPAN
->, and similarly a <SPAN
-CLASS="TYPE"
->Uint8</SPAN
-> for an 8-bpp
-format).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1707"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetrgb.html"
->SDL_GetRGB</A
->,
-<A
-HREF="sdlgetrgba.html"
->SDL_GetRGBA</A
->,
-<A
-HREF="sdlmaprgb.html"
->SDL_MapRGB</A
->,
-<A
-HREF="sdlpixelformat.html"
->SDL_PixelFormat</A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlmaprgb.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetrgb.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_MapRGB</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetRGB</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmixaudio.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmixaudio.html
deleted file mode 100644
index 6cbf0f0dbd4..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmixaudio.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_MixAudio</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_ConvertAudio"
-HREF="sdlconvertaudio.html"><LINK
-REL="NEXT"
-TITLE="SDL_LockAudio"
-HREF="sdllockaudio.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlconvertaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdllockaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLMIXAUDIO"
-></A
->SDL_MixAudio</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7107"
-></A
-><H2
->Name</H2
->SDL_MixAudio&nbsp;--&nbsp;Mix audio data</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7110"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7111"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_MixAudio</B
-></CODE
->(Uint8 *dst, Uint8 *src, Uint32 len, int volume);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7117"
-></A
-><H2
->Description</H2
-><P
->This function takes two audio buffers of <TT
-CLASS="PARAMETER"
-><I
->len</I
-></TT
-> bytes each
-of the playing audio format and mixes them, performing addition, volume
-adjustment, and overflow clipping. The <TT
-CLASS="PARAMETER"
-><I
->volume</I
-></TT
-> ranges
-from 0 to <TT
-CLASS="LITERAL"
->SDL_MIX_MAXVOLUME</TT
-> and should be set to the maximum
-value for full audio volume. Note this does not change hardware volume. This is
-provided for convenience -- you can mix your own audio data.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Do not use this function for mixing together more than two streams of sample
-data. The output from repeated application of this function may be distorted
-by clipping, because there is no accumulator with greater range than the
-input (not to mention this being an inefficient way of doing it).
-Use mixing functions from SDL_mixer, OpenAL, or write your own mixer instead.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7125"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlopenaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlconvertaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdllockaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_ConvertAudio</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_LockAudio</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmousebuttonevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmousebuttonevent.html
deleted file mode 100644
index b0b40df97a7..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmousebuttonevent.html
+++ /dev/null
@@ -1,346 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_MouseButtonEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_MouseMotionEvent"
-HREF="sdlmousemotionevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoyAxisEvent"
-HREF="sdljoyaxisevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlmousemotionevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoyaxisevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLMOUSEBUTTONEVENT"
-></A
->SDL_MouseButtonEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4144"
-></A
-><H2
->Name</H2
->SDL_MouseButtonEvent&nbsp;--&nbsp;Mouse button event structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4147"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type;
-  Uint8 button;
-  Uint8 state;
-  Uint16 x, y;
-} SDL_MouseButtonEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4150"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4152"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_MOUSEBUTTONDOWN</TT
-> or <TT
-CLASS="LITERAL"
->SDL_MOUSEBUTTONUP</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->button</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The mouse button index (SDL_BUTTON_LEFT, SDL_BUTTON_MIDDLE, SDL_BUTTON_RIGHT)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_PRESSED</TT
-> or <TT
-CLASS="LITERAL"
->SDL_RELEASED</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->x</I
-></TT
->, <TT
-CLASS="STRUCTFIELD"
-><I
->y</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The X/Y coordinates of the mouse at press/release time</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4176"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_MouseButtonEvent</SPAN
-> is a member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union and is used when an event of type <TT
-CLASS="LITERAL"
->SDL_MOUSEBUTTONDOWN</TT
-> or <TT
-CLASS="LITERAL"
->SDL_MOUSEBUTTONUP</TT
-> is reported.</P
-><P
->When a mouse button press or release is detected then number of the button pressed (from 1 to 255, with 1 usually being the left button and 2 the right) is placed into <TT
-CLASS="STRUCTFIELD"
-><I
->button</I
-></TT
->, the position of the mouse when this event occured is stored in the <TT
-CLASS="STRUCTFIELD"
-><I
->x</I
-></TT
-> and the <TT
-CLASS="STRUCTFIELD"
-><I
->y</I
-></TT
-> fields. Like <A
-HREF="sdlkeyboardevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_KeyboardEvent</SPAN
-></A
->, information on whether the event was a press or a release event is stored in both the <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-> and <TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
-> fields, but this should be obvious.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4192"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlmousemotionevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_MouseMotionEvent</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlmousemotionevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoyaxisevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_MouseMotionEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoyAxisEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmousemotionevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmousemotionevent.html
deleted file mode 100644
index 3cc7cb5c6ad..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmousemotionevent.html
+++ /dev/null
@@ -1,365 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_MouseMotionEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_KeyboardEvent"
-HREF="sdlkeyboardevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_MouseButtonEvent"
-HREF="sdlmousebuttonevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlkeyboardevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlmousebuttonevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLMOUSEMOTIONEVENT"
-></A
->SDL_MouseMotionEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4079"
-></A
-><H2
->Name</H2
->SDL_MouseMotionEvent&nbsp;--&nbsp;Mouse motion event structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4082"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type;
-  Uint8 state;
-  Uint16 x, y;
-  Sint16 xrel, yrel;
-} SDL_MouseMotionEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4085"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4087"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_MOUSEMOTION</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The current button state</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->x</I
-></TT
->, <TT
-CLASS="STRUCTFIELD"
-><I
->y</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The X/Y coordinates of the mouse</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->xrel</I
-></TT
->, <TT
-CLASS="STRUCTFIELD"
-><I
->yrel</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Relative motion in the X/Y direction</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4109"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_MouseMotionEvent</SPAN
-> is a member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union and is used when an event of type <TT
-CLASS="LITERAL"
->SDL_MOUSEMOTION</TT
-> is reported.</P
-><P
->Simply put, a <TT
-CLASS="LITERAL"
->SDL_MOUSEMOTION</TT
-> type event occurs when a user moves the mouse within the application window or when <A
-HREF="sdlwarpmouse.html"
-><TT
-CLASS="FUNCTION"
->SDL_WarpMouse</TT
-></A
-> is called. Both the absolute (<TT
-CLASS="STRUCTFIELD"
-><I
->x</I
-></TT
-> and <TT
-CLASS="STRUCTFIELD"
-><I
->y</I
-></TT
->) and relative (<TT
-CLASS="STRUCTFIELD"
-><I
->xrel</I
-></TT
-> and <TT
-CLASS="STRUCTFIELD"
-><I
->yrel</I
-></TT
->) coordinates are reported along with the current button states (<TT
-CLASS="STRUCTFIELD"
-><I
->state</I
-></TT
->). The button state can be interpreted using the <TT
-CLASS="LITERAL"
->SDL_BUTTON</TT
-> macro (see <A
-HREF="sdlgetmousestate.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetMouseState</TT
-></A
->).</P
-><P
->If the cursor is hidden (<A
-HREF="sdlshowcursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_ShowCursor</TT
->(0)</A
->) and the input is grabbed (<A
-HREF="sdlwmgrabinput.html"
-><TT
-CLASS="FUNCTION"
->SDL_WM_GrabInput</TT
->(SDL_GRAB_ON)</A
->), then the mouse will give relative motion events even when the cursor reaches the edge fo the screen. This is currently only implemented on Windows and Linux/Unix-a-likes.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4133"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlmousebuttonevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_MouseButtonEvent</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlkeyboardevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlmousebuttonevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_KeyboardEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_MouseButtonEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmutexp.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmutexp.html
deleted file mode 100644
index fc32ca59961..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmutexp.html
+++ /dev/null
@@ -1,241 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_mutexP</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_DestroyMutex"
-HREF="sdldestroymutex.html"><LINK
-REL="NEXT"
-TITLE="SDL_mutexV"
-HREF="sdlmutexv.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdldestroymutex.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlmutexv.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLMUTEXP"
-></A
->SDL_mutexP</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7872"
-></A
-><H2
->Name</H2
->SDL_mutexP&nbsp;--&nbsp;Lock a mutex</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7875"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7876"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_mutexP</B
-></CODE
->(SDL_mutex *mutex);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7882"
-></A
-><H2
->Description</H2
-><P
->Locks the <TT
-CLASS="PARAMETER"
-><I
->mutex</I
-></TT
->, which was previously created with <A
-HREF="sdlcreatemutex.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateMutex</TT
-></A
->. If the mutex is already locked then <TT
-CLASS="FUNCTION"
->SDL_mutexP</TT
-> will not return until it is <A
-HREF="sdlmutexv.html"
->unlocked</A
->. Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-><P
->SDL also defines a macro <TT
-CLASS="LITERAL"
->#define SDL_LockMutex(m) SDL_mutexP(m)</TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7894"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatemutex.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateMutex</TT
-></A
->,
-<A
-HREF="sdlmutexv.html"
-><TT
-CLASS="FUNCTION"
->SDL_mutexV</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdldestroymutex.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlmutexv.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_DestroyMutex</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_mutexV</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmutexv.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmutexv.html
deleted file mode 100644
index 06a68bdc5eb..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlmutexv.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_mutexV</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_mutexP"
-HREF="sdlmutexp.html"><LINK
-REL="NEXT"
-TITLE="SDL_CreateSemaphore"
-HREF="sdlcreatesemaphore.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlmutexp.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcreatesemaphore.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLMUTEXV"
-></A
->SDL_mutexV</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7905"
-></A
-><H2
->Name</H2
->SDL_mutexV&nbsp;--&nbsp;Unlock a mutex</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7908"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7909"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_mutexV</B
-></CODE
->(SDL_mutex *mutex);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7915"
-></A
-><H2
->Description</H2
-><P
->Unlocks the <TT
-CLASS="PARAMETER"
-><I
->mutex</I
-></TT
->, which was previously created with <A
-HREF="sdlcreatemutex.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateMutex</TT
-></A
->. Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success, or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> on an error.</P
-><P
->SDL also defines a macro <TT
-CLASS="LITERAL"
->#define SDL_UnlockMutex(m) SDL_mutexV(m)</TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7925"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatemutex.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateMutex</TT
-></A
->,
-<A
-HREF="sdlmutexp.html"
-><TT
-CLASS="FUNCTION"
->SDL_mutexP</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlmutexp.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcreatesemaphore.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_mutexP</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CreateSemaphore</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlnumjoysticks.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlnumjoysticks.html
deleted file mode 100644
index 68e3e3a72ee..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlnumjoysticks.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_NumJoysticks</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="PREVIOUS"
-TITLE="Joystick"
-HREF="joystick.html"><LINK
-REL="NEXT"
-TITLE="SDL_JoystickName"
-HREF="sdljoystickname.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="joystick.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdljoystickname.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLNUMJOYSTICKS"
-></A
->SDL_NumJoysticks</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6039"
-></A
-><H2
->Name</H2
->SDL_NumJoysticks&nbsp;--&nbsp;Count available joysticks.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6042"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6043"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_NumJoysticks</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6049"
-></A
-><H2
->Description</H2
-><P
->Counts the number of joysticks attached to the system.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6052"
-></A
-><H2
->Return Value</H2
-><P
->Returns the number of attached joysticks</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6055"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdljoystickname.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickName</TT
-></A
->,
-<A
-HREF="sdljoystickopen.html"
-><TT
-CLASS="FUNCTION"
->SDL_JoystickOpen</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdljoystickname.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Joystick</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="joystick.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_JoystickName</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlopenaudio.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlopenaudio.html
deleted file mode 100644
index bcfed54a7f4..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlopenaudio.html
+++ /dev/null
@@ -1,578 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_OpenAudio</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_AudioSpec"
-HREF="sdlaudiospec.html"><LINK
-REL="NEXT"
-TITLE="SDL_PauseAudio"
-HREF="sdlpauseaudio.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlaudiospec.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlpauseaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLOPENAUDIO"
-></A
->SDL_OpenAudio</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6650"
-></A
-><H2
->Name</H2
->SDL_OpenAudio&nbsp;--&nbsp;Opens the audio device with the desired parameters.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6653"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6654"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_OpenAudio</B
-></CODE
->(SDL_AudioSpec *desired, SDL_AudioSpec *obtained);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6660"
-></A
-><H2
->Description</H2
-><P
->This function opens the audio device with the <TT
-CLASS="PARAMETER"
-><I
->desired</I
-></TT
-> parameters, and
-returns 0 if successful, placing the actual hardware parameters in the
-structure pointed to by <TT
-CLASS="PARAMETER"
-><I
->obtained</I
-></TT
->.  If <TT
-CLASS="PARAMETER"
-><I
->obtained</I
-></TT
-> is NULL, the audio
-data passed to the callback function will be guaranteed to be in the
-requested format, and will be automatically converted to the hardware
-audio format if necessary.  This function returns -1 if it failed 
-to open the audio device, or couldn't set up the audio thread.</P
-><P
->To open the audio device a <TT
-CLASS="PARAMETER"
-><I
->desired</I
-></TT
-> <A
-HREF="sdlaudiospec.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_AudioSpec</SPAN
-></A
-> must be created.
-<PRE
-CLASS="PROGRAMLISTING"
->SDL_AudioSpec *desired;
-.
-.
-desired = malloc(sizeof(SDL_AudioSpec));</PRE
->
-You must then fill this structure with your desired audio specifications.</P
-><P
-></P
-><DIV
-CLASS="VARIABLELIST"
-><DL
-><DT
-><SPAN
-CLASS="STRUCTNAME"
->desired</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->freq</I
-></TT
-></DT
-><DD
-><P
->The desired audio frequency in samples-per-second.</P
-></DD
-><DT
-><SPAN
-CLASS="STRUCTNAME"
->desired</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->format</I
-></TT
-></DT
-><DD
-><P
->The desired audio format (see <A
-HREF="sdlaudiospec.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_AudioSpec</SPAN
-></A
->)</P
-></DD
-><DT
-><SPAN
-CLASS="STRUCTNAME"
->desired</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->samples</I
-></TT
-></DT
-><DD
-><P
->The desired size of the audio buffer in samples. This number should be a power of two, and may be adjusted by the audio driver to a value more suitable for the hardware.  Good values seem to range between 512 and 8192 inclusive, depending on the application and CPU speed.  Smaller values yield faster response time, but can lead to underflow if the application is doing heavy processing and cannot fill the audio buffer in time.  A stereo sample consists of both right and left channels in LR ordering.  Note that the number of samples is directly related to time by the following formula:  ms = (samples*1000)/freq</P
-></DD
-><DT
-><SPAN
-CLASS="STRUCTNAME"
->desired</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->callback</I
-></TT
-></DT
-><DD
-><P
->This should be set to a function that will be called when the audio device is ready for more data.  It is passed a pointer to the audio buffer, and the length in bytes of the audio buffer. This function usually runs in a separate thread, and so you should protect data structures that it accesses by calling <A
-HREF="sdllockaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockAudio</TT
-></A
-> and <A
-HREF="sdlunlockaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_UnlockAudio</TT
-></A
-> in your code. The callback prototype is:
-<PRE
-CLASS="PROGRAMLISTING"
->void callback(void *userdata, Uint8 *stream, int len);</PRE
->
-<TT
-CLASS="PARAMETER"
-><I
->userdata</I
-></TT
-> is the pointer stored in <TT
-CLASS="STRUCTFIELD"
-><I
->userdata</I
-></TT
-> field of the <SPAN
-CLASS="STRUCTNAME"
->SDL_AudioSpec</SPAN
->. <TT
-CLASS="PARAMETER"
-><I
->stream</I
-></TT
-> is a pointer to the audio buffer you want to fill with information and <TT
-CLASS="PARAMETER"
-><I
->len</I
-></TT
-> is the length of the audio buffer in bytes.</P
-></DD
-><DT
-><SPAN
-CLASS="STRUCTNAME"
->desired</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->userdata</I
-></TT
-></DT
-><DD
-><P
->This pointer is passed as the first parameter to the <TT
-CLASS="FUNCTION"
->callback</TT
-> function.</P
-></DD
-></DL
-></DIV
-><P
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-> reads these fields from the <TT
-CLASS="PARAMETER"
-><I
->desired</I
-></TT
-> <SPAN
-CLASS="STRUCTNAME"
->SDL_AudioSpec</SPAN
-> structure pass to the function and attempts to find an audio configuration matching your <TT
-CLASS="PARAMETER"
-><I
->desired</I
-></TT
->. As mentioned above, if the <TT
-CLASS="PARAMETER"
-><I
->obtained</I
-></TT
-> parameter is <TT
-CLASS="LITERAL"
->NULL</TT
-> then SDL with convert from your <TT
-CLASS="PARAMETER"
-><I
->desired</I
-></TT
-> audio settings to the hardware settings as it plays.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->obtained</I
-></TT
-> is <TT
-CLASS="LITERAL"
->NULL</TT
-> then the <TT
-CLASS="PARAMETER"
-><I
->desired</I
-></TT
-> <SPAN
-CLASS="STRUCTNAME"
->SDL_AudioSpec</SPAN
-> is your working specification, otherwise the <TT
-CLASS="PARAMETER"
-><I
->obtained</I
-></TT
-> <SPAN
-CLASS="STRUCTNAME"
->SDL_AudioSpec</SPAN
-> becomes the working specification and the <TT
-CLASS="PARAMETER"
-><I
->desirec</I
-></TT
-> specification can be deleted. The data in the working specification is used when building <SPAN
-CLASS="STRUCTNAME"
->SDL_AudioCVT</SPAN
->'s for converting loaded data to the hardware format.</P
-><P
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-> calculates the <TT
-CLASS="STRUCTFIELD"
-><I
->size</I
-></TT
-> and <TT
-CLASS="STRUCTFIELD"
-><I
->silence</I
-></TT
-> fields for both the <TT
-CLASS="PARAMETER"
-><I
->desired</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->obtained</I
-></TT
-> specifications. The <TT
-CLASS="STRUCTFIELD"
-><I
->size</I
-></TT
-> field stores the total size of the audio buffer in bytes, while the <TT
-CLASS="STRUCTFIELD"
-><I
->silence</I
-></TT
-> stores the value used to represent silence in the audio buffer</P
-><P
->The audio device starts out playing <TT
-CLASS="STRUCTFIELD"
-><I
->silence</I
-></TT
-> when it's opened, and should be enabled for playing by calling <A
-HREF="sdlpauseaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_PauseAudio</TT
->(<TT
-CLASS="PARAMETER"
-><I
->0</I
-></TT
->)</A
-> when you are ready for your audio <TT
-CLASS="STRUCTFIELD"
-><I
->callback</I
-></TT
-> function to be called.  Since the audio driver may modify the requested <TT
-CLASS="STRUCTFIELD"
-><I
->size</I
-></TT
-> of the audio buffer, you should allocate any local mixing buffers after you open the audio device.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6747"
-></A
-><H2
->Examples</H2
-><PRE
-CLASS="PROGRAMLISTING"
->/* Prototype of our callback function */
-void my_audio_callback(void *userdata, Uint8 *stream, int len);
-
-/* Open the audio device */
-SDL_AudioSpec *desired, *obtained;
-SDL_AudioSpec *hardware_spec;
-
-/* Allocate a desired SDL_AudioSpec */
-desired = malloc(sizeof(SDL_AudioSpec));
-
-/* Allocate space for the obtained SDL_AudioSpec */
-obtained = malloc(sizeof(SDL_AudioSpec));
-
-/* 22050Hz - FM Radio quality */
-desired-&#62;freq=22050;
-
-/* 16-bit signed audio */
-desired-&#62;format=AUDIO_S16LSB;
-
-/* Mono */
-desired-&#62;channels=0;
-
-/* Large audio buffer reduces risk of dropouts but increases response time */
-desired-&#62;samples=8192;
-
-/* Our callback function */
-desired-&#62;callback=my_audio_callback;
-
-desired-&#62;userdata=NULL;
-
-/* Open the audio device */
-if ( SDL_OpenAudio(desired, obtained) &#60; 0 ){
-  fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
-  exit(-1);
-}
-/* desired spec is no longer needed */
-free(desired);
-hardware_spec=obtained;
-.
-.
-/* Prepare callback for playing */
-.
-.
-.
-/* Start playing */
-SDL_PauseAudio(0);</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6750"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlaudiospec.html"
-><TT
-CLASS="FUNCTION"
->SDL_AudioSpec</TT
-></A
->,
-<A
-HREF="sdllockaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockAudio</TT
-></A
->,
-<A
-HREF="sdlunlockaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_UnlockAudio</TT
-></A
->,
-<A
-HREF="sdlpauseaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_PauseAudio</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlaudiospec.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlpauseaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_AudioSpec</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_PauseAudio</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdloverlay.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdloverlay.html
deleted file mode 100644
index 422919edc90..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdloverlay.html
+++ /dev/null
@@ -1,362 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_Overlay</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_VideoInfo"
-HREF="sdlvideoinfo.html"><LINK
-REL="NEXT"
-TITLE="Window Management"
-HREF="wm.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlvideoinfo.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="wm.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLOVERLAY"
-></A
->SDL_Overlay</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3464"
-></A
-><H2
->Name</H2
->SDL_Overlay&nbsp;--&nbsp;YUV video overlay</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3467"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint32 format;
-  int w, h;
-  int planes;
-  Uint16 *pitches;
-  Uint8 **pixels;
-  Uint32 hw_overlay:1;
-} SDL_Overlay;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3470"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN3472"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->format</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Overlay format (see below)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->w, h</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Width and height of overlay</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->planes</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Number of planes in the overlay. Usually either 1 or 3</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->pitches</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->An array of pitches, one for each plane. Pitch is the length of a row in bytes.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->pixels</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->An array of pointers to teh data of each plane. The overlay should be locked before these pointers are used.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->hw_overlay</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->This will be set to 1 if the overlay is hardware accelerated.</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3499"
-></A
-><H2
->Description</H2
-><P
->A <SPAN
-CLASS="STRUCTNAME"
->SDL_Overlay</SPAN
-> is similar to a <A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
-> except it stores a YUV overlay. All the fields are read only, except for <TT
-CLASS="STRUCTFIELD"
-><I
->pixels</I
-></TT
-> which should be <A
-HREF="sdllockyuvoverlay.html"
->locked</A
-> before use. The <TT
-CLASS="STRUCTFIELD"
-><I
->format</I
-></TT
-> field stores the format of the overlay which is one of the following:
-<PRE
-CLASS="PROGRAMLISTING"
->#define SDL_YV12_OVERLAY  0x32315659  /* Planar mode: Y + V + U */
-#define SDL_IYUV_OVERLAY  0x56555949  /* Planar mode: Y + U + V */
-#define SDL_YUY2_OVERLAY  0x32595559  /* Packed mode: Y0+U0+Y1+V0 */
-#define SDL_UYVY_OVERLAY  0x59565955  /* Packed mode: U0+Y0+V0+Y1 */
-#define SDL_YVYU_OVERLAY  0x55595659  /* Packed mode: Y0+V0+Y1+U0 */</PRE
->
-More information on YUV formats can be found at <A
-HREF="http://www.webartz.com/fourcc/indexyuv.htm"
-TARGET="_top"
->http://www.webartz.com/fourcc/indexyuv.htm</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3510"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreateyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateYUVOverlay</TT
-></A
->,
-<A
-HREF="sdllockyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockYUVOverlay</TT
-></A
->,
-<A
-HREF="sdlunlockyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_UnlockYUVOverlay</TT
-></A
->,
-<A
-HREF="sdlfreeyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_FreeYUVOverlay</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlvideoinfo.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="wm.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_VideoInfo</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Window Management</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpalette.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpalette.html
deleted file mode 100644
index 6498ac40ba2..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpalette.html
+++ /dev/null
@@ -1,301 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_Palette</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_Color"
-HREF="sdlcolor.html"><LINK
-REL="NEXT"
-TITLE="SDL_PixelFormat"
-HREF="sdlpixelformat.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcolor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlpixelformat.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLPALETTE"
-></A
->SDL_Palette</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3129"
-></A
-><H2
->Name</H2
->SDL_Palette&nbsp;--&nbsp;Color palette for 8-bit pixel formats</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3132"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  int ncolors;
-  SDL_Color *colors;
-} SDL_Palette;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3135"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN3137"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->ncolors</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Number of colors used in this palette</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->colors</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Pointer to <A
-HREF="sdlcolor.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Color</SPAN
-></A
-> structures that make up the palette.</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3150"
-></A
-><H2
->Description</H2
-><P
->Each pixel in an 8-bit surface is an index into the <TT
-CLASS="STRUCTFIELD"
-><I
->colors</I
-></TT
-> field of the <SPAN
-CLASS="STRUCTNAME"
->SDL_Palette</SPAN
-> structure store in <A
-HREF="sdlpixelformat.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-></A
->. A <SPAN
-CLASS="STRUCTNAME"
->SDL_Palette</SPAN
-> should never need to be created manually. It is automatically created when SDL allocates a <SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-> for a surface. The colors values of a <A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
->s palette can be set with the <A
-HREF="sdlsetcolors.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetColors</TT
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3163"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcolor.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Color</SPAN
-></A
->,
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
->,
-<A
-HREF="sdlsetcolors.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetColors</TT
-></A
->
-<A
-HREF="sdlsetpalette.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetPalette</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcolor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlpixelformat.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_Color</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_PixelFormat</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpauseaudio.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpauseaudio.html
deleted file mode 100644
index 39d5a0f0f91..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpauseaudio.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_PauseAudio</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_OpenAudio"
-HREF="sdlopenaudio.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetAudioStatus"
-HREF="sdlgetaudiostatus.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlopenaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetaudiostatus.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLPAUSEAUDIO"
-></A
->SDL_PauseAudio</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN6765"
-></A
-><H2
->Name</H2
->SDL_PauseAudio&nbsp;--&nbsp;Pauses and unpauses the audio callback processing</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN6768"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN6769"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_PauseAudio</B
-></CODE
->(int pause_on);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6775"
-></A
-><H2
->Description</H2
-><P
->This function pauses and unpauses the audio callback processing.
-It should be called with <TT
-CLASS="PARAMETER"
-><I
->pause_on</I
-></TT
->=0 after opening the audio
-device to start playing sound.  This is so you can safely initialize
-data for your callback function after opening the audio device.
-Silence will be written to the audio device during the pause.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN6779"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetaudiostatus.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetAudioStatus</TT
-></A
->,
-<A
-HREF="sdlopenaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlopenaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetaudiostatus.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_OpenAudio</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetAudioStatus</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpeepevents.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpeepevents.html
deleted file mode 100644
index d5a0ff6f9fe..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpeepevents.html
+++ /dev/null
@@ -1,321 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_PeepEvents</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_PumpEvents"
-HREF="sdlpumpevents.html"><LINK
-REL="NEXT"
-TITLE="SDL_PollEvent"
-HREF="sdlpollevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlpumpevents.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlpollevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLPEEPEVENTS"
-></A
->SDL_PeepEvents</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5421"
-></A
-><H2
->Name</H2
->SDL_PeepEvents&nbsp;--&nbsp;Checks the event queue for messages and optionally returns them.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5424"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5425"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_PeepEvents</B
-></CODE
->(SDL_Event *events, int numevents, SDL_eventaction action, Uint32 mask);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5431"
-></A
-><H2
->Description</H2
-><P
->Checks the event queue for messages and optionally returns them.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->action</I
-></TT
-> is <TT
-CLASS="LITERAL"
->SDL_ADDEVENT</TT
->, up to 
-<TT
-CLASS="PARAMETER"
-><I
->numevents</I
-></TT
-> events will be added to the back of the event
- queue.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->action</I
-></TT
-> is <TT
-CLASS="LITERAL"
->SDL_PEEKEVENT</TT
->, up to
-<TT
-CLASS="PARAMETER"
-><I
->numevents</I
-></TT
-> events at the front of the event queue, 
-matching <A
-HREF="sdlevent.html"
-><TT
-CLASS="PARAMETER"
-><I
->mask</I
-></TT
-></A
->, 
-will be returned and will not be removed from the queue.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->action</I
-></TT
-> is <TT
-CLASS="LITERAL"
->SDL_GETEVENT</TT
->, up to 
-<TT
-CLASS="PARAMETER"
-><I
->numevents</I
-></TT
-> events at the front of the event queue, 
-matching <A
-HREF="sdlevent.html"
-><TT
-CLASS="PARAMETER"
-><I
->mask</I
-></TT
-></A
->, 
-will be returned and will be removed from the queue.</P
-><P
->The <TT
-CLASS="PARAMETER"
-><I
->mask</I
-></TT
-> parameter is an bitwise OR of
-<TT
-CLASS="LITERAL"
->SDL_EVENTMASK</TT
->(<TT
-CLASS="PARAMETER"
-><I
->event_type</I
-></TT
->), for all
-event types you are interested in.</P
-><P
->This function is thread-safe.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5455"
-></A
-><H2
->Return Value</H2
-><P
->This function returns the number of events actually stored, or 
-<SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> if there was an error.  </P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5459"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlpollevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-></A
->,
-<A
-HREF="sdlpushevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PushEvent</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlpumpevents.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlpollevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_PumpEvents</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_PollEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpixelformat.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpixelformat.html
deleted file mode 100644
index 000ddc08b16..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpixelformat.html
+++ /dev/null
@@ -1,528 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_PixelFormat</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_Palette"
-HREF="sdlpalette.html"><LINK
-REL="NEXT"
-TITLE="SDL_Surface"
-HREF="sdlsurface.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlpalette.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLPIXELFORMAT"
-></A
->SDL_PixelFormat</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3178"
-></A
-><H2
->Name</H2
->SDL_PixelFormat&nbsp;--&nbsp;Stores surface format information</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3181"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct SDL_PixelFormat {
-  SDL_Palette *palette;
-  Uint8  BitsPerPixel;
-  Uint8  BytesPerPixel;
-  Uint8  Rloss, Gloss, Bloss, Aloss;
-  Uint8  Rshift, Gshift, Bshift, Ashift;
-  Uint32 Rmask, Gmask, Bmask, Amask;
-  Uint32 colorkey;
-  Uint8  alpha;
-} SDL_PixelFormat;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3184"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN3186"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->palette</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Pointer to the <A
-HREF="sdlpalette.html"
->palette</A
->, or <TT
-CLASS="LITERAL"
->NULL</TT
-> if the <TT
-CLASS="STRUCTFIELD"
-><I
->BitsPerPixel</I
-></TT
->&#62;8</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->BitsPerPixel</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The number of bits used to represent each pixel in a surface. Usually 8, 16, 24 or 32.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->BytesPerPixel</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The number of bytes used to represent each pixel in a surface. Usually one to four.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->[RGBA]mask</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Binary mask used to retrieve individual color values</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->[RGBA]loss</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Precision loss of each color component (2<SUP
->[RGBA]loss</SUP
->)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->[RGBA]shift</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Binary left shift of each color component in the pixel value</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->colorkey</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Pixel value of transparent pixels</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->alpha</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Overall surface alpha value</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3225"
-></A
-><H2
->Description</H2
-><P
->A <SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-> describes the format of the pixel data stored at the <TT
-CLASS="STRUCTFIELD"
-><I
->pixels</I
-></TT
-> field of a <A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
->. Every surface stores a <SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-> in the <TT
-CLASS="STRUCTFIELD"
-><I
->format</I
-></TT
-> field.</P
-><P
->If you wish to do pixel level modifications on a surface, then understanding how SDL stores its color information is essential.</P
-><P
->8-bit pixel formats are the easiest to understand. Since its an 8-bit format, we have 8 <TT
-CLASS="STRUCTFIELD"
-><I
->BitsPerPixel</I
-></TT
-> and 1 <TT
-CLASS="STRUCTFIELD"
-><I
->BytesPerPixel</I
-></TT
->. Since <TT
-CLASS="STRUCTFIELD"
-><I
->BytesPerPixel</I
-></TT
-> is 1, all pixels are represented by a Uint8 which contains an index into <TT
-CLASS="STRUCTFIELD"
-><I
->palette</I
-></TT
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->colors</I
-></TT
->. So, to determine the color of a pixel in a 8-bit surface: we read the color index from <SPAN
-CLASS="STRUCTNAME"
->surface</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->pixels</I
-></TT
-> and we use that index to read the <A
-HREF="sdlcolor.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Color</SPAN
-></A
-> structure from <SPAN
-CLASS="STRUCTNAME"
->surface</SPAN
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->format</I
-></TT
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->palette</I
-></TT
->-&#62;<TT
-CLASS="STRUCTFIELD"
-><I
->colors</I
-></TT
->. Like so:
-<PRE
-CLASS="PROGRAMLISTING"
->SDL_Surface *surface;
-SDL_PixelFormat *fmt;
-SDL_Color *color;
-Uint8 index;
-
-.
-.
-
-/* Create surface */
-.
-.
-fmt=surface-&#62;format;
-
-/* Check the bitdepth of the surface */
-if(fmt-&#62;BitsPerPixel!=8){
-  fprintf(stderr, "Not an 8-bit surface.\n");
-  return(-1);
-}
-
-/* Lock the surface */
-SDL_LockSurface(surface);
-
-/* Get the topleft pixel */
-index=*(Uint8 *)surface-&#62;pixels;
-color=fmt-&#62;palette-&#62;colors[index];
-
-/* Unlock the surface */
-SDL_UnlockSurface(surface);
-printf("Pixel Color-&#62; Red: %d, Green: %d, Blue: %d. Index: %d\n",
-          color-&#62;r, color-&#62;g, color-&#62;b, index);
-.
-.</PRE
-></P
-><P
->Pixel formats above 8-bit are an entirely different experience. They are
-considered to be "TrueColor" formats and the color information is stored in the
-pixels themselves, not in a palette. The mask, shift and loss fields tell us
-how the color information is encoded. The mask fields allow us to isolate each
-color component, the shift fields tell us the number of bits to the right of
-each component in the pixel value and the loss fields tell us the number of
-bits lost from each component when packing 8-bit color component in a pixel.
-<PRE
-CLASS="PROGRAMLISTING"
->/* Extracting color components from a 32-bit color value */
-SDL_PixelFormat *fmt;
-SDL_Surface *surface;
-Uint32 temp, pixel;
-Uint8 red, green, blue, alpha;
-.
-.
-.
-fmt=surface-&#62;format;
-SDL_LockSurface(surface);
-pixel=*((Uint32*)surface-&#62;pixels);
-SDL_UnlockSurface(surface);
-
-/* Get Red component */
-temp=pixel&#38;fmt-&#62;Rmask; /* Isolate red component */
-temp=temp&#62;&#62;fmt-&#62;Rshift;/* Shift it down to 8-bit */
-temp=temp&#60;&#60;fmt-&#62;Rloss; /* Expand to a full 8-bit number */
-red=(Uint8)temp;
-
-/* Get Green component */
-temp=pixel&#38;fmt-&#62;Gmask; /* Isolate green component */
-temp=temp&#62;&#62;fmt-&#62;Gshift;/* Shift it down to 8-bit */
-temp=temp&#60;&#60;fmt-&#62;Gloss; /* Expand to a full 8-bit number */
-green=(Uint8)temp;
-
-/* Get Blue component */
-temp=pixel&#38;fmt-&#62;Bmask; /* Isolate blue component */
-temp=temp&#62;&#62;fmt-&#62;Bshift;/* Shift it down to 8-bit */
-temp=temp&#60;&#60;fmt-&#62;Bloss; /* Expand to a full 8-bit number */
-blue=(Uint8)temp;
-
-/* Get Alpha component */
-temp=pixel&#38;fmt-&#62;Amask; /* Isolate alpha component */
-temp=temp&#62;&#62;fmt-&#62;Ashift;/* Shift it down to 8-bit */
-temp=temp&#60;&#60;fmt-&#62;Aloss; /* Expand to a full 8-bit number */
-alpha=(Uint8)temp;
-
-printf("Pixel Color -&#62; R: %d,  G: %d,  B: %d,  A: %d\n", red, green, blue, alpha);
-.
-.
-.</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3252"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
->,
-<A
-HREF="sdlmaprgb.html"
-><TT
-CLASS="FUNCTION"
->SDL_MapRGB</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlpalette.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_Palette</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_Surface</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpollevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpollevent.html
deleted file mode 100644
index f97c22d9634..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpollevent.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_PollEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_PeepEvents"
-HREF="sdlpeepevents.html"><LINK
-REL="NEXT"
-TITLE="SDL_WaitEvent"
-HREF="sdlwaitevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlpeepevents.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlwaitevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLPOLLEVENT"
-></A
->SDL_PollEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5472"
-></A
-><H2
->Name</H2
->SDL_PollEvent&nbsp;--&nbsp;Polls for currently pending events.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5475"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5476"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_PollEvent</B
-></CODE
->(SDL_Event *event);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5482"
-></A
-><H2
->Description</H2
-><P
->Polls for currently pending events, and returns <SPAN
-CLASS="RETURNVALUE"
->1</SPAN
-> 
-if there are any pending events, or <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> if there 
-are none available.  </P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->event</I
-></TT
-> is not <TT
-CLASS="LITERAL"
->NULL</TT
->, the next 
-event is removed from the queue and stored in that area.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5490"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_Event event; /* Event structure */
-
-.
-.
-.
-/* Check for events */
-while(SDL_PollEvent(&#38;event)){  /* Loop until there are no events left on the queue */
-  switch(event.type){  /* Process the appropiate event type */
-    case SDL_KEYDOWN:  /* Handle a KEYDOWN event */         
-      printf("Oh! Key press\n");
-      break;
-    case SDL_MOUSEMOTION:
-      .
-      .
-      .
-    default: /* Report an unhandled event */
-      printf("I don't know what this event is!\n");
-  }
-}</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5494"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlwaitevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_WaitEvent</TT
-></A
->,
-<A
-HREF="sdlpeepevents.html"
-><TT
-CLASS="FUNCTION"
->SDL_PeepEvents</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlpeepevents.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlwaitevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_PeepEvents</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_WaitEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpumpevents.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpumpevents.html
deleted file mode 100644
index a7e528f19ac..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpumpevents.html
+++ /dev/null
@@ -1,244 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_PumpEvents</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="NEXT"
-TITLE="SDL_PeepEvents"
-HREF="sdlpeepevents.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlpeepevents.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLPUMPEVENTS"
-></A
->SDL_PumpEvents</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5387"
-></A
-><H2
->Name</H2
->SDL_PumpEvents&nbsp;--&nbsp;Pumps the event loop, gathering events from the input devices.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5390"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5391"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_PumpEvents</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5397"
-></A
-><H2
->Description</H2
-><P
->Pumps the event loop, gathering events from the input devices.</P
-><P
-><TT
-CLASS="FUNCTION"
->SDL_PumpEvents</TT
-> gathers all the pending input information from devices and places it on the event queue. Without calls to <TT
-CLASS="FUNCTION"
->SDL_PumpEvents</TT
-> no events would ever be placed on the queue. Often calls the need for <TT
-CLASS="FUNCTION"
->SDL_PumpEvents</TT
-> is hidden from the user since <A
-HREF="sdlpollevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-></A
-> and <A
-HREF="sdlwaitevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_WaitEvent</TT
-></A
-> implicitly call <TT
-CLASS="FUNCTION"
->SDL_PumpEvents</TT
->. However, if you are not polling or waiting for events (e.g. you are filtering them), then you must call <TT
-CLASS="FUNCTION"
->SDL_PumpEvents</TT
-> to force an event queue update.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->You can only call this function in the thread that set the video mode.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5412"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlpollevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlpeepevents.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Event Functions.</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_PeepEvents</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpushevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpushevent.html
deleted file mode 100644
index 6905385c32d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlpushevent.html
+++ /dev/null
@@ -1,266 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_PushEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_WaitEvent"
-HREF="sdlwaitevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetEventFilter"
-HREF="sdlseteventfilter.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlwaitevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlseteventfilter.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLPUSHEVENT"
-></A
->SDL_PushEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5536"
-></A
-><H2
->Name</H2
->SDL_PushEvent&nbsp;--&nbsp;Pushes an event onto the event queue</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5539"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5540"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_PushEvent</B
-></CODE
->(SDL_Event *event);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5546"
-></A
-><H2
->Description</H2
-><P
->The event queue can actually be used as a two way communication channel. Not only can events be read from the queue, but the user can also push their own events onto it. <TT
-CLASS="PARAMETER"
-><I
->event</I
-></TT
-> is a pointer to the event structure you wish to push onto the queue.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Pushing device input events onto the queue doesn't modify the state of the device within SDL.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5552"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on success or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> if the event couldn't be pushed.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5557"
-></A
-><H2
->Examples</H2
-><P
->See <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5562"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlpollevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-></A
->,
-<A
-HREF="sdlpeepevents.html"
-><TT
-CLASS="FUNCTION"
->SDL_PeepEvents</TT
-></A
->,
-<A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlwaitevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlseteventfilter.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_WaitEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetEventFilter</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlquit.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlquit.html
deleted file mode 100644
index 1f31c82558a..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlquit.html
+++ /dev/null
@@ -1,244 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_Quit</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="General"
-HREF="general.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_QuitSubSystem"
-HREF="sdlquitsubsystem.html"><LINK
-REL="NEXT"
-TITLE="SDL_WasInit"
-HREF="sdlwasinit.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlquitsubsystem.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlwasinit.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLQUIT"
-></A
->SDL_Quit</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN585"
-></A
-><H2
->Name</H2
->SDL_Quit&nbsp;--&nbsp;Shut down SDL</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN588"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN589"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_Quit</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN595"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_Quit</TT
-> shuts down all SDL subsystems and frees the resources allocated to them. This should always be called before you exit. For the sake of simplicity you can set <TT
-CLASS="FUNCTION"
->SDL_Quit</TT
-> as your <TT
-CLASS="FUNCTION"
->atexit</TT
-> call, like:
-<PRE
-CLASS="PROGRAMLISTING"
->SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO);
-atexit(SDL_Quit);
-.
-.</PRE
-></P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->While using <TT
-CLASS="FUNCTION"
->atexit</TT
-> maybe be fine for small programs, more advanced users should shut down SDL in their own cleanup code. Plus, using <TT
-CLASS="FUNCTION"
->atexit</TT
-> in a library is a sure way to crash dynamically loaded code</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN606"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlquitsubsystem.html"
-><TT
-CLASS="FUNCTION"
->SDL_QuitSubsystem</TT
-></A
->,
-<A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlquitsubsystem.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlwasinit.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_QuitSubSystem</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="general.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_WasInit</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlquitevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlquitevent.html
deleted file mode 100644
index d575f38b7b7..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlquitevent.html
+++ /dev/null
@@ -1,263 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_QuitEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_UserEvent"
-HREF="sdluserevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_keysym"
-HREF="sdlkeysym.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdluserevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlkeysym.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLQUITEVENT"
-></A
->SDL_QuitEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4621"
-></A
-><H2
->Name</H2
->SDL_QuitEvent&nbsp;--&nbsp;Quit requested event</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4624"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type
-} SDL_QuitEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4627"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4629"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_QUIT</TT
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4637"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_QuitEvent</SPAN
-> is a member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union and is used whan an event of type <TT
-CLASS="LITERAL"
->SDL_QUIT</TT
-> is reported.</P
-><P
->As can be seen, the SDL_QuitEvent structure serves no useful purpose. The event itself, on the other hand, is very important. If you filter out or ignore a quit event then it is impossible for the user to close the window. On the other hand, if you do accept a quit event then the application window will be closed, and screen updates will still report success event though the application will no longer be visible.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->The macro <TT
-CLASS="FUNCTION"
->SDL_QuitRequested</TT
-> will return non-zero if a quit event is pending</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4648"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlseteventfilter.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetEventFilter</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdluserevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlkeysym.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_UserEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_keysym</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlquitsubsystem.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlquitsubsystem.html
deleted file mode 100644
index 877e3ce1181..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlquitsubsystem.html
+++ /dev/null
@@ -1,248 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_QuitSubSystem</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="General"
-HREF="general.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_InitSubSystem"
-HREF="sdlinitsubsystem.html"><LINK
-REL="NEXT"
-TITLE="SDL_Quit"
-HREF="sdlquit.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlinitsubsystem.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlquit.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLQUITSUBSYSTEM"
-></A
->SDL_QuitSubSystem</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN550"
-></A
-><H2
->Name</H2
->SDL_QuitSubSystem&nbsp;--&nbsp;Shut down a subsystem</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN553"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN554"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_QuitSubSystem</B
-></CODE
->(Uint32 flags);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN560"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_QuitSubSystem</TT
-> allows you to shut down a subsystem that has been previously initialized by <A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
-> or <A
-HREF="sdlinitsubsystem.html"
-><TT
-CLASS="FUNCTION"
->SDL_InitSubSystem</TT
-></A
->. The <TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
-> tells <TT
-CLASS="FUNCTION"
->SDL_QuitSubSystem</TT
-> which subsystems to shut down, it uses the same values that are passed to <A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN572"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlquit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Quit</TT
-></A
->,
-<A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
->,
-<A
-HREF="sdlinitsubsystem.html"
-><TT
-CLASS="FUNCTION"
->SDL_InitSubSystem</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlinitsubsystem.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlquit.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_InitSubSystem</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="general.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_Quit</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlrect.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlrect.html
deleted file mode 100644
index ba4a80be69c..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlrect.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_Rect</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GLattr"
-HREF="sdlglattr.html"><LINK
-REL="NEXT"
-TITLE="SDL_Color"
-HREF="sdlcolor.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlglattr.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcolor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLRECT"
-></A
->SDL_Rect</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3046"
-></A
-><H2
->Name</H2
->SDL_Rect&nbsp;--&nbsp;Defines a rectangular area</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3049"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Sint16 x, y;
-  Uint16 w, h;
-} SDL_Rect;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3052"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN3054"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->x, y</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Position of the upper-left corner of the rectangle</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->w, h</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->The width and height of the rectangle</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3065"
-></A
-><H2
->Description</H2
-><P
->A <SPAN
-CLASS="STRUCTNAME"
->SDL_Rect</SPAN
-> defines a rectangular area of pixels. It is used by <A
-HREF="sdlblitsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_BlitSurface</TT
-></A
-> to define blitting regions and by several other video functions.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3071"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlblitsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_BlitSurface</TT
-></A
->,
-<A
-HREF="sdlupdaterect.html"
-><TT
-CLASS="FUNCTION"
->SDL_UpdateRect</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlglattr.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcolor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GLattr</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_Color</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlremovetimer.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlremovetimer.html
deleted file mode 100644
index 26a3d11f7b8..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlremovetimer.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_RemoveTimer</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Time"
-HREF="time.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_AddTimer"
-HREF="sdladdtimer.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetTimer"
-HREF="sdlsettimer.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdladdtimer.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsettimer.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLREMOVETIMER"
-></A
->SDL_RemoveTimer</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8526"
-></A
-><H2
->Name</H2
->SDL_RemoveTimer&nbsp;--&nbsp;Remove a timer which was added with
-<A
-HREF="sdladdtimer.html"
->SDL_AddTimer</A
->.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8530"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8531"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_bool <B
-CLASS="FSFUNC"
->SDL_RemoveTimer</B
-></CODE
->(SDL_TimerID id);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8537"
-></A
-><H2
->Description</H2
-><P
->Removes a timer callback previously added with
-<A
-HREF="sdladdtimer.html"
->SDL_AddTimer</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8541"
-></A
-><H2
->Return Value</H2
-><P
->Returns a boolean value indicating success.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8544"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_RemoveTimer(my_timer_id);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8548"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdladdtimer.html"
-><TT
-CLASS="FUNCTION"
->SDL_AddTimer</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdladdtimer.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsettimer.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_AddTimer</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="time.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetTimer</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlresizeevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlresizeevent.html
deleted file mode 100644
index 1d446a54cd1..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlresizeevent.html
+++ /dev/null
@@ -1,307 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_ResizeEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_JoyBallEvent"
-HREF="sdljoyballevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_ExposeEvent"
-HREF="sdlexposeevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdljoyballevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlexposeevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLRESIZEEVENT"
-></A
->SDL_ResizeEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4453"
-></A
-><H2
->Name</H2
->SDL_ResizeEvent&nbsp;--&nbsp;Window resize event structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4456"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type;
-  int w, h;
-} SDL_ResizeEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4459"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4461"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_VIDEORESIZE</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->w</I
-></TT
->, <TT
-CLASS="STRUCTFIELD"
-><I
->h</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->New width and height of the window</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4474"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_ResizeEvent</SPAN
-> is a member of the <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
-> union and is used when an event of type <TT
-CLASS="LITERAL"
->SDL_VIDEORESIZE</TT
-> is reported.</P
-><P
->When <TT
-CLASS="LITERAL"
->SDL_RESIZABLE</TT
-> is passed as a <TT
-CLASS="PARAMETER"
-><I
->flag</I
-></TT
-> to <A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
-> the user is allowed to resize the applications window. When the window is resized an <TT
-CLASS="LITERAL"
->SDL_VIDEORESIZE</TT
-> is report, with the new window width and height values stored in <TT
-CLASS="STRUCTFIELD"
-><I
->w</I
-></TT
-> and <TT
-CLASS="STRUCTFIELD"
-><I
->h</I
-></TT
->, respectively. When an <TT
-CLASS="LITERAL"
->SDL_VIDEORESIZE</TT
-> is recieved the window should be resized to the new dimensions using <A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4492"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdljoyballevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlexposeevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_JoyBallEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_ExposeEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsavebmp.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsavebmp.html
deleted file mode 100644
index 4c318ed756e..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsavebmp.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SaveBMP</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_LoadBMP"
-HREF="sdlloadbmp.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetColorKey"
-HREF="sdlsetcolorkey.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlloadbmp.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsetcolorkey.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSAVEBMP"
-></A
->SDL_SaveBMP</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2015"
-></A
-><H2
->Name</H2
->SDL_SaveBMP&nbsp;--&nbsp;Save an SDL_Surface as a Windows BMP file.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2018"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2019"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SaveBMP</B
-></CODE
->(SDL_Surface *surface, const char *file);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2025"
-></A
-><H2
->Description</H2
-><P
->Saves the <SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-> <TT
-CLASS="PARAMETER"
-><I
->surface</I
-></TT
-> as a Windows BMP file named <TT
-CLASS="PARAMETER"
-><I
->file</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2031"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> if successful or
-<SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
->
-if there was an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2036"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlloadbmp.html"
-><TT
-CLASS="FUNCTION"
->SDL_LoadBMP</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlloadbmp.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsetcolorkey.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_LoadBMP</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetColorKey</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsempost.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsempost.html
deleted file mode 100644
index 18fb01ab2f7..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsempost.html
+++ /dev/null
@@ -1,299 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SemPost</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SemWaitTimeout"
-HREF="sdlsemwaittimeout.html"><LINK
-REL="NEXT"
-TITLE="SDL_SemValue"
-HREF="sdlsemvalue.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsemwaittimeout.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsemvalue.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSEMPOST"
-></A
->SDL_SemPost</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8170"
-></A
-><H2
->Name</H2
->SDL_SemPost&nbsp;--&nbsp;Unlock a semaphore.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8173"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8174"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SemPost</B
-></CODE
->(SDL_sem *sem);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8180"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_SemPost</TT
-> unlocks the semaphore pointed to by
-<TT
-CLASS="PARAMETER"
-><I
->sem</I
-></TT
-> and atomically increments the semaphores value.
-Threads that were blocking on the semaphore may be scheduled after this call
-succeeds.</P
-><P
-><TT
-CLASS="FUNCTION"
->SDL_SemPost</TT
-> should be called after a semaphore is locked by a successful call to
-<A
-HREF="sdlsemwait.html"
->SDL_SemWait</A
->,
-<A
-HREF="sdlsemtrywait.html"
->SDL_SemTryWait</A
-> or
-<A
-HREF="sdlsemwaittimeout.html"
->SDL_SemWaitTimeout</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8190"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> if successful or
-<SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> if there was an error (leaving the semaphore unchanged).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8195"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_SemPost(my_sem);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8199"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatesemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateSemaphore</TT
-></A
->,
-<A
-HREF="sdldestroysemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_DestroySemaphore</TT
-></A
->,
-<A
-HREF="sdlsemwait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWait</TT
-></A
->,
-<A
-HREF="sdlsemtrywait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemTryWait</TT
-></A
->,
-<A
-HREF="sdlsemwaittimeout.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWaitTimeout</TT
-></A
->,
-<A
-HREF="sdlsemvalue.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemValue</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsemwaittimeout.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsemvalue.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SemWaitTimeout</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SemValue</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemtrywait.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemtrywait.html
deleted file mode 100644
index 86f47a1c83a..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemtrywait.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SemTryWait</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SemWait"
-HREF="sdlsemwait.html"><LINK
-REL="NEXT"
-TITLE="SDL_SemWaitTimeout"
-HREF="sdlsemwaittimeout.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsemwait.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsemwaittimeout.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSEMTRYWAIT"
-></A
->SDL_SemTryWait</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8069"
-></A
-><H2
->Name</H2
->SDL_SemTryWait&nbsp;--&nbsp;Attempt to lock a semaphore but don't suspend the thread.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8072"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8073"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SemTryWait</B
-></CODE
->(SDL_sem *sem);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8079"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_SemTryWait</TT
-> is a non-blocking varient of
-<A
-HREF="sdlsemwait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWait</TT
-></A
->. If the value of the semaphore
-pointed to by <TT
-CLASS="PARAMETER"
-><I
->sem</I
-></TT
-> is positive it will atomically
-decrement the semaphore value and return 0, otherwise it will return
-<SPAN
-CLASS="RETURNVALUE"
->SDL_MUTEX_TIMEDOUT</SPAN
-> instead of suspending the thread.</P
-><P
->After <TT
-CLASS="FUNCTION"
->SDL_SemTryWait</TT
-> is successful, the semaphore
-can be released and its count atomically incremented by a successful call to
-<A
-HREF="sdlsempost.html"
->SDL_SemPost</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8090"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> if the semaphore was successfully locked or
-either <SPAN
-CLASS="RETURNVALUE"
->SDL_MUTEX_TIMEDOUT</SPAN
-> or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
->
-if the thread would have suspended or there was an error, respectivly.</P
-><P
->If the semaphore was not successfully locked, the semaphore will be unchanged.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8097"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->res = SDL_SemTryWait(my_sem);
-
-if (res == SDL_MUTEX_TIMEDOUT) {
-        return TRY_AGAIN;
-}
-if (res == -1) {
-        return WAIT_ERROR;
-}
-
-...
-
-SDL_SemPost(my_sem);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8101"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatesemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateSemaphore</TT
-></A
->,
-<A
-HREF="sdldestroysemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_DestroySemaphore</TT
-></A
->,
-<A
-HREF="sdlsemwait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWait</TT
-></A
->,
-<A
-HREF="sdlsemwaittimeout.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWaitTimeout</TT
-></A
->,
-<A
-HREF="sdlsempost.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemPost</TT
-></A
->,
-<A
-HREF="sdlsemvalue.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemValue</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsemwait.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsemwaittimeout.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SemWait</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SemWaitTimeout</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemvalue.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemvalue.html
deleted file mode 100644
index 7867369b1b4..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemvalue.html
+++ /dev/null
@@ -1,273 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SemValue</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SemPost"
-HREF="sdlsempost.html"><LINK
-REL="NEXT"
-TITLE="SDL_CreateCond"
-HREF="sdlcreatecond.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsempost.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcreatecond.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSEMVALUE"
-></A
->SDL_SemValue</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8218"
-></A
-><H2
->Name</H2
->SDL_SemValue&nbsp;--&nbsp;Return the current value of a semaphore.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8221"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8222"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL/SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint32 <B
-CLASS="FSFUNC"
->SDL_SemValue</B
-></CODE
->(SDL_sem *sem);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8228"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_SemValue()</TT
-> returns the current semaphore value from
-the semaphore pointed to by <TT
-CLASS="PARAMETER"
-><I
->sem</I
-></TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8233"
-></A
-><H2
->Return Value</H2
-><P
->Returns current value of the semaphore.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8236"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->  sem_value = SDL_SemValue(my_sem);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8240"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatesemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateSemaphore</TT
-></A
->,
-<A
-HREF="sdldestroysemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_DestroySemaphore</TT
-></A
->,
-<A
-HREF="sdlsemwait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWait</TT
-></A
->,
-<A
-HREF="sdlsemtrywait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemTryWait</TT
-></A
->,
-<A
-HREF="sdlsemwaittimeout.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWaitTimeout</TT
-></A
->,
-<A
-HREF="sdlsempost.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemPost</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsempost.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcreatecond.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SemPost</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CreateCond</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemwait.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemwait.html
deleted file mode 100644
index 5e98d552ee6..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemwait.html
+++ /dev/null
@@ -1,298 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SemWait</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_DestroySemaphore"
-HREF="sdldestroysemaphore.html"><LINK
-REL="NEXT"
-TITLE="SDL_SemTryWait"
-HREF="sdlsemtrywait.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdldestroysemaphore.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsemtrywait.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSEMWAIT"
-></A
->SDL_SemWait</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8023"
-></A
-><H2
->Name</H2
->SDL_SemWait&nbsp;--&nbsp;Lock a semaphore and suspend the thread if the semaphore value is zero.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8026"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8027"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SemWait</B
-></CODE
->(SDL_sem *sem);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8033"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_SemWait()</TT
-> suspends the calling thread until either
-the semaphore pointed to by <TT
-CLASS="PARAMETER"
-><I
->sem</I
-></TT
-> has a positive value,
-the call is interrupted by a signal or error. If the call is successful it
-will atomically decrement the semaphore value.</P
-><P
->After <TT
-CLASS="FUNCTION"
->SDL_SemWait()</TT
-> is successful, the semaphore
-can be released and its count atomically incremented by a successful call to
-<A
-HREF="sdlsempost.html"
->SDL_SemPost</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8041"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> if successful or
-<SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> if there was an error (leaving the semaphore unchanged).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8046"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->if (SDL_SemWait(my_sem) == -1) {
-        return WAIT_FAILED;
-}
-
-...
-
-SDL_SemPost(my_sem);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8050"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatesemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateSemaphore</TT
-></A
->,
-<A
-HREF="sdldestroysemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_DestroySemaphore</TT
-></A
->,
-<A
-HREF="sdlsemtrywait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemTryWait</TT
-></A
->,
-<A
-HREF="sdlsemwaittimeout.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWaitTimeout</TT
-></A
->,
-<A
-HREF="sdlsempost.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemPost</TT
-></A
->,
-<A
-HREF="sdlsemvalue.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemValue</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdldestroysemaphore.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsemtrywait.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_DestroySemaphore</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SemTryWait</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemwaittimeout.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemwaittimeout.html
deleted file mode 100644
index 788f5b72506..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsemwaittimeout.html
+++ /dev/null
@@ -1,322 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SemWaitTimeout</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SemTryWait"
-HREF="sdlsemtrywait.html"><LINK
-REL="NEXT"
-TITLE="SDL_SemPost"
-HREF="sdlsempost.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsemtrywait.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsempost.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSEMWAITTIMEOUT"
-></A
->SDL_SemWaitTimeout</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8120"
-></A
-><H2
->Name</H2
->SDL_SemWaitTimeout&nbsp;--&nbsp;Lock a semaphore, but only wait up to a specified maximum time.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8123"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8124"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SemWaitTimeout</B
-></CODE
->(SDL_sem *sem, Uint32 timeout);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8130"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_SemWaitTimeout()</TT
-> is a varient of
-<A
-HREF="sdlsemwait.html"
->SDL_SemWait</A
->
-with a maximum timeout value.
-If the value of the semaphore pointed to by <TT
-CLASS="PARAMETER"
-><I
->sem</I
-></TT
-> is
-positive (greater than zero) it will atomically decrement the semaphore value
-and return 0, otherwise it will wait up to <TT
-CLASS="PARAMETER"
-><I
->timeout</I
-></TT
->
-milliseconds trying to lock the semaphore. This function is to be avoided if
-possible since on some platforms it is implemented by polling the semaphore
-every millisecond in a busy loop.</P
-><P
->After <TT
-CLASS="FUNCTION"
->SDL_SemWaitTimeout()</TT
-> is successful, the semaphore
-can be released and its count atomically incremented by a successful call to
-<A
-HREF="sdlsempost.html"
->SDL_SemPost</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8140"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> if the semaphore was successfully locked or
-either <SPAN
-CLASS="RETURNVALUE"
->SDL_MUTEX_TIMEDOUT</SPAN
-> or <SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
->
-if the timeout period was exceeded or there was an error, respectivly.</P
-><P
->If the semaphore was not successfully locked, the semaphore will be unchanged.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8147"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->res = SDL_SemWaitTimeout(my_sem, WAIT_TIMEOUT_MILLISEC);
-
-if (res == SDL_MUTEX_TIMEDOUT) {
-        return TRY_AGAIN;
-}
-if (res == -1) {
-        return WAIT_ERROR;
-}
-
-...
-
-SDL_SemPost(my_sem);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8151"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatesemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateSemaphore</TT
-></A
->,
-<A
-HREF="sdldestroysemaphore.html"
-><TT
-CLASS="FUNCTION"
->SDL_DestroySemaphore</TT
-></A
->,
-<A
-HREF="sdlsemwait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemWait</TT
-></A
->,
-<A
-HREF="sdlsemtrywait.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemTryWait</TT
-></A
->,
-<A
-HREF="sdlsempost.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemPost</TT
-></A
->,
-<A
-HREF="sdlsemvalue.html"
-><TT
-CLASS="FUNCTION"
->SDL_SemValue</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsemtrywait.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsempost.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SemTryWait</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SemPost</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetalpha.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetalpha.html
deleted file mode 100644
index fc844981f14..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetalpha.html
+++ /dev/null
@@ -1,500 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetAlpha</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SetColorKey"
-HREF="sdlsetcolorkey.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetClipRect"
-HREF="sdlsetcliprect.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsetcolorkey.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsetcliprect.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETALPHA"
-></A
->SDL_SetAlpha</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2096"
-></A
-><H2
->Name</H2
->SDL_SetAlpha&nbsp;--&nbsp;Adjust the alpha properties of a surface</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2099"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2100"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SetAlpha</B
-></CODE
->(SDL_Surface *surface, Uint32 flag, Uint8 alpha);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2106"
-></A
-><H2
->Description</H2
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->This function and the semantics of SDL alpha blending have changed since version 1.1.4. Up until version 1.1.5, an alpha value of 0 was considered opaque and a value of 255 was considered transparent. This has now been inverted: 0 (<TT
-CLASS="LITERAL"
->SDL_ALPHA_TRANSPARENT</TT
->) is now considered transparent and 255 (<TT
-CLASS="LITERAL"
->SDL_ALPHA_OPAQUE</TT
->) is now considered opaque.</P
-></BLOCKQUOTE
-></DIV
-><P
-><TT
-CLASS="FUNCTION"
->SDL_SetAlpha</TT
-> is used for setting the per-surface alpha
-value and/or enabling and disabling alpha blending.</P
-><P
->The<TT
-CLASS="PARAMETER"
-><I
->surface</I
-></TT
-> parameter specifies which surface whose alpha
-attributes you wish to adjust. <TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
-> is used to specify
-whether alpha blending should be used (<TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
->) and
-whether the surface should use RLE acceleration for blitting
-(<TT
-CLASS="LITERAL"
->SDL_RLEACCEL</TT
->). <TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
-> can be an OR'd
-combination of these two options, one of these options or 0. If
-<TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-> is not passed as a flag then all alpha
-information is ignored when blitting the surface. The
-<TT
-CLASS="PARAMETER"
-><I
->alpha</I
-></TT
-> parameter is the per-surface alpha value; a
-surface need not have an alpha channel to use per-surface alpha and blitting
-can still be accelerated with <TT
-CLASS="LITERAL"
->SDL_RLEACCEL</TT
->.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->The per-surface alpha value of 128 is considered a special case and
-is optimised, so it's much faster than other per-surface values.</P
-></BLOCKQUOTE
-></DIV
-><P
->Alpha effects surface blitting in the following ways:</P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN2126"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->RGBA-&#62;RGB with <TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->The source is alpha-blended with the destination, using the alpha channel. <TT
-CLASS="LITERAL"
->SDL_SRCCOLORKEY</TT
-> and the per-surface alpha are ignored.</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->RGBA-&#62;RGB without <TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->The RGB data is copied from the source. The source alpha channel and the per-surface alpha value are ignored.</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->RGB-&#62;RGBA with <TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->The source is alpha-blended with the destination using the per-surface alpha
-value. If <TT
-CLASS="LITERAL"
->SDL_SRCCOLORKEY</TT
-> is set, only the pixels not
-matching the colorkey value are copied. The alpha channel of the copied pixels
-is set to opaque.</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->RGB-&#62;RGBA without <TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->The RGB data is copied from the source and the alpha value of the copied pixels
-is set to opaque. If <TT
-CLASS="LITERAL"
->SDL_SRCCOLORKEY</TT
-> is set, only the pixels
-not matching the colorkey value are copied. </P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->RGBA-&#62;RGBA with <TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->The source is alpha-blended with the destination using the source alpha
-channel. The alpha channel in the destination surface is left untouched.
-<TT
-CLASS="LITERAL"
->SDL_SRCCOLORKEY</TT
-> is ignored.</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->RGBA-&#62;RGBA without <TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->The RGBA data is copied to the destination surface. If <TT
-CLASS="LITERAL"
->SDL_SRCCOLORKEY</TT
-> is set, only the pixels not matching the colorkey value are copied.</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->RGB-&#62;RGB with <TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->The source is alpha-blended with the destination using the per-surface alpha value. If <TT
-CLASS="LITERAL"
->SDL_SRCCOLORKEY</TT
-> is set, only the pixels not matching the colorkey value are copied.</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->RGB-&#62;RGB without <TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->The RGB data is copied from the source. If <TT
-CLASS="LITERAL"
->SDL_SRCCOLORKEY</TT
-> is set, only the pixels not matching the colorkey value are copied.</P
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
-> Note that RGBA-&#62;RGBA blits (with SDL_SRCALPHA set) keep the alpha
-of the destination surface. This means that you cannot compose two arbitrary
-RGBA surfaces this way and get the result you would expect from "overlaying"
-them; the destination alpha will work as a mask.</P
-><P
->Also note that per-pixel and per-surface alpha cannot be combined;
-the per-pixel alpha is always used if available</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2179"
-></A
-><H2
->Return Value</H2
-><P
->This function returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->, or
-<SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> if there was an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2184"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlmaprgba.html"
-><TT
-CLASS="FUNCTION"
->SDL_MapRGBA</TT
-></A
->,
-<A
-HREF="sdlgetrgba.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetRGBA</TT
-></A
->,
-<A
-HREF="sdldisplayformatalpha.html"
-><TT
-CLASS="FUNCTION"
->SDL_DisplayFormatAlpha</TT
-></A
->,
-<A
-HREF="sdlblitsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_BlitSurface</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsetcolorkey.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsetcliprect.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SetColorKey</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetClipRect</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcliprect.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcliprect.html
deleted file mode 100644
index 03898d55ace..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcliprect.html
+++ /dev/null
@@ -1,241 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetClipRect</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SetAlpha"
-HREF="sdlsetalpha.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetClipRect"
-HREF="sdlgetcliprect.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsetalpha.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetcliprect.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETCLIPRECT"
-></A
->SDL_SetClipRect</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2199"
-></A
-><H2
->Name</H2
->SDL_SetClipRect&nbsp;--&nbsp;Sets the clipping rectangle for a surface.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2202"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2203"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_SetClipRect</B
-></CODE
->(SDL_Surface *surface, SDL_Rect *rect);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2209"
-></A
-><H2
->Description</H2
-><P
->Sets the clipping rectangle for a surface.  When this surface is the
-destination of a blit, only the area within the clip rectangle will be
-drawn into.</P
-><P
->The rectangle pointed to by <TT
-CLASS="PARAMETER"
-><I
->rect</I
-></TT
-> will be
-clipped to the edges of the surface so that the clip rectangle for a
-surface can never fall outside the edges of the surface.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->rect</I
-></TT
-> is <TT
-CLASS="LITERAL"
->NULL</TT
-> the clipping
-rectangle will be set to the full size of the surface.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2217"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetcliprect.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetClipRect</TT
-></A
->,
-<A
-HREF="sdlblitsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_BlitSurface</TT
-></A
->,
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsetalpha.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetcliprect.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SetAlpha</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetClipRect</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcolorkey.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcolorkey.html
deleted file mode 100644
index 0cb66957915..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcolorkey.html
+++ /dev/null
@@ -1,321 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetColorKey</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SaveBMP"
-HREF="sdlsavebmp.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetAlpha"
-HREF="sdlsetalpha.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsavebmp.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsetalpha.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETCOLORKEY"
-></A
->SDL_SetColorKey</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2045"
-></A
-><H2
->Name</H2
->SDL_SetColorKey&nbsp;--&nbsp;Sets the color key (transparent pixel) in a blittable surface and
-RLE acceleration.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2048"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2049"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SetColorKey</B
-></CODE
->(SDL_Surface *surface, Uint32 flag, Uint32 key);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2055"
-></A
-><H2
->Description</H2
-><P
-> Sets the color key (transparent pixel) in a blittable surface and enables or
- disables RLE blit acceleration.</P
-><P
->RLE acceleration can substantially speed up blitting of images with large
-horizontal runs of transparent pixels (i.e., pixels that match the
-<TT
-CLASS="PARAMETER"
-><I
->key</I
-></TT
-> value). The <TT
-CLASS="PARAMETER"
-><I
->key</I
-></TT
-> must be of the same pixel format as the <TT
-CLASS="PARAMETER"
-><I
->surface</I
-></TT
->, <A
-HREF="sdlmaprgb.html"
-><TT
-CLASS="FUNCTION"
->SDL_MapRGB</TT
-></A
-> is often useful for obtaining an acceptable value.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->flag</I
-></TT
-> is <TT
-CLASS="LITERAL"
->SDL_SRCCOLORKEY</TT
-> then
-<TT
-CLASS="PARAMETER"
-><I
->key</I
-></TT
-> is the transparent pixel value in the source image of a
-blit.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->flag</I
-></TT
-> is OR'd with
-<TT
-CLASS="LITERAL"
->SDL_RLEACCEL</TT
-> then the surface will be draw using RLE
-acceleration when drawn with
-<A
-HREF="sdlblitsurface.html"
->SDL_BlitSurface</A
->.  The surface will
-actually be encoded for RLE acceleration the first time
-<A
-HREF="sdlblitsurface.html"
->SDL_BlitSurface</A
-> or
-<A
-HREF="sdldisplayformat.html"
->SDL_DisplayFormat</A
-> is called on the
-surface.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->flag</I
-></TT
-> is 0, this function clears
-any current color key.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2076"
-></A
-><H2
->Return Value</H2
-><P
->This function returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->, or
-<SPAN
-CLASS="RETURNVALUE"
->-1</SPAN
-> if there was an error.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2081"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlblitsurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_BlitSurface</TT
-></A
->,
-<A
-HREF="sdldisplayformat.html"
-><TT
-CLASS="FUNCTION"
->SDL_DisplayFormat</TT
-></A
->,
-<A
-HREF="sdlmaprgb.html"
-><TT
-CLASS="FUNCTION"
->SDL_MapRGB</TT
-></A
->,
-<A
-HREF="sdlsetalpha.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetAlpha</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsavebmp.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsetalpha.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SaveBMP</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetAlpha</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcolors.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcolors.html
deleted file mode 100644
index 569564598ba..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcolors.html
+++ /dev/null
@@ -1,358 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetColors</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_Flip"
-HREF="sdlflip.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetPalette"
-HREF="sdlsetpalette.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlflip.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsetpalette.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETCOLORS"
-></A
->SDL_SetColors</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1462"
-></A
-><H2
->Name</H2
->SDL_SetColors&nbsp;--&nbsp;Sets a portion of the colormap for the given 8-bit surface.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1465"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1466"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SetColors</B
-></CODE
->(SDL_Surface *surface, SDL_Color *colors, int firstcolor, int ncolors);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1472"
-></A
-><H2
->Description</H2
-><P
->Sets a portion of the colormap for the given 8-bit surface.</P
-><P
->When <TT
-CLASS="PARAMETER"
-><I
->surface</I
-></TT
-> is the surface associated with the current
-display, the display colormap will be updated with the requested colors.  If
-<TT
-CLASS="LITERAL"
->SDL_HWPALETTE</TT
-> was set in <A
-HREF="sdlsetvideomode.html"
->SDL_SetVideoMode</A
-> flags,
-<TT
-CLASS="FUNCTION"
->SDL_SetColors</TT
-> will always return <SPAN
-CLASS="RETURNVALUE"
->1</SPAN
->,
-and the palette is guaranteed to be set the way you desire, even if the window
-colormap has to be warped or run under emulation.</P
-><P
->The color components of a
-<A
-HREF="sdlcolor.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Color</SPAN
-></A
->
-structure are 8-bits in size, giving you a total of 256<SUP
->3</SUP
->
-=16777216 colors.</P
-><P
->Palettized (8-bit) screen surfaces with the <TT
-CLASS="LITERAL"
->SDL_HWPALETTE</TT
->
-flag have two palettes, a logical palette that is used for mapping blits
-to/from the surface and a physical palette (that determines how the
-hardware will map the colors to the display). <TT
-CLASS="FUNCTION"
->SDL_SetColors</TT
->
-modifies both palettes (if present), and is equivalent to calling
-<A
-HREF="sdlsetpalette.html"
->SDL_SetPalette</A
-> with the
-<TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
-> set to
-<TT
-CLASS="LITERAL"
->(SDL_LOGPAL | SDL_PHYSPAL)</TT
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1491"
-></A
-><H2
->Return Value</H2
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->surface</I
-></TT
-> is not a palettized surface, this function
-does nothing, returning <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->.  If all of the colors were set
-as passed to <TT
-CLASS="FUNCTION"
->SDL_SetColors</TT
->, it will return
-<SPAN
-CLASS="RETURNVALUE"
->1</SPAN
->.  If not all the color entries were set exactly as
-given, it will return <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->, and you should look at the
-surface palette to determine the actual color palette.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1499"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->/* Create a display surface with a grayscale palette */
-SDL_Surface *screen;
-SDL_Color colors[256];
-int i;
-.
-.
-.
-/* Fill colors with color information */
-for(i=0;i&#60;256;i++){
-  colors[i].r=i;
-  colors[i].g=i;
-  colors[i].b=i;
-}
-
-/* Create display */
-screen=SDL_SetVideoMode(640, 480, 8, SDL_HWPALETTE);
-if(!screen){
-  printf("Couldn't set video mode: %s\n", SDL_GetError());
-  exit(-1);
-}
-
-/* Set palette */
-SDL_SetColors(screen, colors, 0, 256);
-.
-.
-.
-.</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1502"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcolor.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Color</SPAN
-></A
->
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
->,
-<A
-HREF="sdlsetpalette.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetPalette</TT
-></A
->,
-<A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlflip.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsetpalette.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_Flip</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetPalette</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcursor.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcursor.html
deleted file mode 100644
index 9c5443e53e7..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetcursor.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetCursor</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_FreeCursor"
-HREF="sdlfreecursor.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetCursor"
-HREF="sdlgetcursor.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlfreecursor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetcursor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETCURSOR"
-></A
->SDL_SetCursor</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2563"
-></A
-><H2
->Name</H2
->SDL_SetCursor&nbsp;--&nbsp;Set the currently active mouse cursor.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2566"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2567"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_SetCursor</B
-></CODE
->(SDL_Cursor *cursor);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2573"
-></A
-><H2
->Description</H2
-><P
->Sets the currently active cursor to 
-the specified one.
-If the cursor is currently visible, the change will be immediately 
-represented on the display.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2576"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetcursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetCursor</TT
-></A
->,
-<A
-HREF="sdlcreatecursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateCursor</TT
-></A
->,
-<A
-HREF="sdlshowcursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_ShowCursor</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlfreecursor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetcursor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_FreeCursor</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetCursor</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlseteventfilter.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlseteventfilter.html
deleted file mode 100644
index 0808bab3c66..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlseteventfilter.html
+++ /dev/null
@@ -1,284 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetEventFilter</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_PushEvent"
-HREF="sdlpushevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetEventFilter"
-HREF="sdlgeteventfilter.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlpushevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgeteventfilter.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETEVENTFILTER"
-></A
->SDL_SetEventFilter</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5575"
-></A
-><H2
->Name</H2
->SDL_SetEventFilter&nbsp;--&nbsp;Sets up a filter to process all events before they are posted 
-to the event queue.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5578"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5579"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_SetEventFilter</B
-></CODE
->(SDL_EventFilter filter);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5585"
-></A
-><H2
->Description</H2
-><P
->This function sets up a filter to process all events before they are posted 
-to the event queue.  This is a very powerful and flexible feature.  The filter 
-is prototyped as:
-<PRE
-CLASS="PROGRAMLISTING"
->typedef int (*SDL_EventFilter)(const SDL_Event *event);</PRE
->
-If the filter returns <SPAN
-CLASS="RETURNVALUE"
->1</SPAN
->, then the event will be 
-added to the internal queue.  If it returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->, 
-then the event will be dropped from the queue.  This allows selective
-filtering of dynamically.</P
-><P
->There is one caveat when dealing with the <TT
-CLASS="LITERAL"
->SDL_QUITEVENT</TT
-> event type.  The
-event filter is only called when the window manager desires to close the
-application window.  If the event filter returns 1, then the window will
-be closed, otherwise the window will remain open if possible.
-If the quit event is generated by an interrupt signal, it will bypass the
-internal queue and be delivered to the application at the next event poll.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Events pushed onto the queue with <A
-HREF="sdlpushevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PushEvent</TT
-></A
-> or <A
-HREF="sdlpeepevents.html"
-><TT
-CLASS="FUNCTION"
->SDL_PeepEvents</TT
-></A
-> do not get passed through the event filter.</P
-></BLOCKQUOTE
-></DIV
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Be Careful!</I
-></SPAN
-> The event filter function may run in a different thread so be careful what you do within it.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5602"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlgeteventfilter.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetEventFilter</TT
-></A
->,
-<A
-HREF="sdlpushevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PushEvent</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlpushevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgeteventfilter.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_PushEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetEventFilter</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetgamma.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetgamma.html
deleted file mode 100644
index 6443a966a2b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetgamma.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetGamma</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SetPalette"
-HREF="sdlsetpalette.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetGammaRamp"
-HREF="sdlgetgammaramp.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsetpalette.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetgammaramp.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETGAMMA"
-></A
->SDL_SetGamma</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1569"
-></A
-><H2
->Name</H2
->SDL_SetGamma&nbsp;--&nbsp;Sets the color gamma function for the display</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1572"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1573"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SetGamma</B
-></CODE
->(float redgamma, float greengamma, float bluegamma);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1579"
-></A
-><H2
->Description</H2
-><P
->Sets the "gamma function" for the display of each color component.  Gamma
-controls the brightness/contrast of colors displayed on the screen.
-A gamma value of <TT
-CLASS="CONSTANT"
->1.0</TT
-> is identity (i.e., no adjustment
-is made).</P
-><P
->This function adjusts the gamma based on the "gamma function" parameter,
-you can directly specify lookup tables for gamma adjustment with
-<A
-HREF="sdlsetgammaramp.html"
->SDL_SetGammaRamp</A
->.</P
-><P
->Not all display hardware is able to change gamma.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1586"
-></A
-><H2
->Return Value</H2
-><P
->Returns -1 on error (or if gamma adjustment is not supported).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1589"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetgammaramp.html"
->SDL_GetGammaRamp</A
->
-<A
-HREF="sdlsetgammaramp.html"
->SDL_SetGammaRamp</A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsetpalette.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetgammaramp.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SetPalette</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetGammaRamp</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetgammaramp.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetgammaramp.html
deleted file mode 100644
index 79599c8d516..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetgammaramp.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetGammaRamp</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetGammaRamp"
-HREF="sdlgetgammaramp.html"><LINK
-REL="NEXT"
-TITLE="SDL_MapRGB"
-HREF="sdlmaprgb.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetgammaramp.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlmaprgb.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETGAMMARAMP"
-></A
->SDL_SetGammaRamp</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1624"
-></A
-><H2
->Name</H2
->SDL_SetGammaRamp&nbsp;--&nbsp;Sets the color gamma lookup tables for the display</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1627"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1628"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SetGammaRamp</B
-></CODE
->(Uint16 *redtable, Uint16 *greentable, Uint16 *bluetable);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1634"
-></A
-><H2
->Description</H2
-><P
->Sets the gamma lookup tables for the display for each color component.
-Each table is an array of 256 Uint16 values, representing a mapping
-between the input and output for that channel. The input is the index
-into the array, and the output is the 16-bit gamma value at that index,
-scaled to the output color precision. You may pass NULL to any of the
-channels to leave them unchanged.</P
-><P
->This function adjusts the gamma based on lookup tables, you can also
-have the gamma calculated based on a "gamma function" parameter with
-<A
-HREF="sdlsetgamma.html"
->SDL_SetGamma</A
->.</P
-><P
->Not all display hardware is able to change gamma.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1640"
-></A
-><H2
->Return Value</H2
-><P
->Returns -1 on error (or if gamma adjustment is not supported).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1643"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsetgamma.html"
->SDL_SetGamma</A
->
-<A
-HREF="sdlgetgammaramp.html"
->SDL_GetGammaRamp</A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetgammaramp.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlmaprgb.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetGammaRamp</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_MapRGB</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetmodstate.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetmodstate.html
deleted file mode 100644
index ee69a3f5dfe..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetmodstate.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetModState</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetModState"
-HREF="sdlgetmodstate.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetKeyName"
-HREF="sdlgetkeyname.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetmodstate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetkeyname.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETMODSTATE"
-></A
->SDL_SetModState</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5752"
-></A
-><H2
->Name</H2
->SDL_SetModState&nbsp;--&nbsp;Set the current key modifier state</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5755"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5756"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_SetModState</B
-></CODE
->(SDLMod modstate);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5762"
-></A
-><H2
->Description</H2
-><P
->The inverse of <A
-HREF="sdlgetmodstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetModState</TT
-></A
->, <TT
-CLASS="FUNCTION"
->SDL_SetModState</TT
-> allows you to impose modifier key states on your application.</P
-><P
->Simply pass your desired modifier states into <TT
-CLASS="PARAMETER"
-><I
->modstate</I
-></TT
->. This value my be a logical OR'd combination of the following:</P
-><PRE
-CLASS="PROGRAMLISTING"
->typedef enum {
-  KMOD_NONE  = 0x0000,
-  KMOD_LSHIFT= 0x0001,
-  KMOD_RSHIFT= 0x0002,
-  KMOD_LCTRL = 0x0040,
-  KMOD_RCTRL = 0x0080,
-  KMOD_LALT  = 0x0100,
-  KMOD_RALT  = 0x0200,
-  KMOD_LMETA = 0x0400,
-  KMOD_RMETA = 0x0800,
-  KMOD_NUM   = 0x1000,
-  KMOD_CAPS  = 0x2000,
-  KMOD_MODE  = 0x4000,
-} SDLMod;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5771"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlgetmodstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetModState</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetmodstate.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetkeyname.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetModState</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetKeyName</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetpalette.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetpalette.html
deleted file mode 100644
index 1622f1590fb..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetpalette.html
+++ /dev/null
@@ -1,352 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetPalette</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SetColors"
-HREF="sdlsetcolors.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetGamma"
-HREF="sdlsetgamma.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsetcolors.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsetgamma.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETPALETTE"
-></A
->SDL_SetPalette</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1517"
-></A
-><H2
->Name</H2
->SDL_SetPalette&nbsp;--&nbsp;Sets the colors in the palette of an 8-bit surface.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1520"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1521"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SetPalette</B
-></CODE
->(SDL_Surface *surface, int flags, SDL_Color *colors, int firstcolor, int ncolors);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1527"
-></A
-><H2
->Description</H2
-><P
->Sets a portion of the palette for the given 8-bit surface.</P
-><P
->Palettized (8-bit) screen surfaces with the
-<TT
-CLASS="LITERAL"
->SDL_HWPALETTE</TT
-> flag have two palettes, a logical
-palette that is used for mapping blits to/from the surface and a
-physical palette (that determines how the hardware will map the colors
-to the display). <A
-HREF="sdlblitsurface.html"
->SDL_BlitSurface</A
->
-always uses the logical palette when blitting surfaces (if it has to
-convert between surface pixel formats). Because of this, it is often
-useful to modify only one or the other palette to achieve various
-special color effects (e.g., screen fading, color flashes, screen dimming).</P
-><P
->This function can modify either the logical or physical palette by
-specifing <TT
-CLASS="LITERAL"
->SDL_LOGPAL</TT
-> or
-<TT
-CLASS="LITERAL"
->SDL_PHYSPAL</TT
->the in the <TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
->
-parameter.</P
-><P
->When <TT
-CLASS="PARAMETER"
-><I
->surface</I
-></TT
-> is the surface associated with the current
-display, the display colormap will be updated with the requested colors.  If
-<TT
-CLASS="LITERAL"
->SDL_HWPALETTE</TT
-> was set in <A
-HREF="sdlsetvideomode.html"
->SDL_SetVideoMode</A
-> flags,
-<TT
-CLASS="FUNCTION"
->SDL_SetPalette</TT
-> will always return <SPAN
-CLASS="RETURNVALUE"
->1</SPAN
->,
-and the palette is guaranteed to be set the way you desire, even if the window
-colormap has to be warped or run under emulation.</P
-><P
->The color components of a
-<A
-HREF="sdlcolor.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Color</SPAN
-></A
-> structure
-are 8-bits in size, giving you a total of
-256<SUP
->3</SUP
->=16777216 colors.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1547"
-></A
-><H2
->Return Value</H2
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->surface</I
-></TT
-> is not a palettized surface, this function
-does nothing, returning <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->.  If all of the colors were set
-as passed to <TT
-CLASS="FUNCTION"
->SDL_SetPalette</TT
->, it will return
-<SPAN
-CLASS="RETURNVALUE"
->1</SPAN
->.  If not all the color entries were set exactly as
-given, it will return <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->, and you should look at the
-surface palette to determine the actual color palette.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1555"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->        /* Create a display surface with a grayscale palette */
-        SDL_Surface *screen;
-        SDL_Color colors[256];
-        int i;
-        .
-        .
-        .
-        /* Fill colors with color information */
-        for(i=0;i&#60;256;i++){
-          colors[i].r=i;
-          colors[i].g=i;
-          colors[i].b=i;
-        }
-
-        /* Create display */
-        screen=SDL_SetVideoMode(640, 480, 8, SDL_HWPALETTE);
-        if(!screen){
-          printf("Couldn't set video mode: %s\n", SDL_GetError());
-          exit(-1);
-        }
-
-        /* Set palette */
-        SDL_SetPalette(screen, SDL_LOGPAL|SDL_PHYSPAL, colors, 0, 256);
-        .
-        .
-        .
-        .</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1558"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsetcolors.html"
->SDL_SetColors</A
->,
-<A
-HREF="sdlsetvideomode.html"
->SDL_SetVideoMode</A
->,
-<A
-HREF="sdlsurface.html"
->SDL_Surface</A
->,
-<A
-HREF="sdlcolor.html"
->SDL_Color</A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsetcolors.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsetgamma.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SetColors</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetGamma</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsettimer.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsettimer.html
deleted file mode 100644
index 40b737ce853..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsettimer.html
+++ /dev/null
@@ -1,267 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetTimer</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Time"
-HREF="time.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_RemoveTimer"
-HREF="sdlremovetimer.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlremovetimer.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
->&nbsp;</TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETTIMER"
-></A
->SDL_SetTimer</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN8557"
-></A
-><H2
->Name</H2
->SDL_SetTimer&nbsp;--&nbsp;Set a callback to run after the specified number of milliseconds has
-elapsed.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN8560"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN8561"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_SetTimer</B
-></CODE
->(Uint32 interval, SDL_TimerCallback callback);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="SDLTIMERCALLBACK"
-></A
-><H2
->Callback</H2
-><P
->/* Function prototype for the timer callback function */
-typedef Uint32 (*SDL_TimerCallback)(Uint32 interval);</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8570"
-></A
-><H2
->Description</H2
-><P
->Set a callback to run after the specified number of milliseconds has
-elapsed. The callback function is passed the current timer interval
-and returns the next timer interval.  If the returned value is the
-same as the one passed in, the periodic alarm continues, otherwise a
-new alarm is scheduled.</P
-><P
->To cancel a currently running timer, call
-<TT
-CLASS="FUNCTION"
->SDL_SetTimer(0, NULL);</TT
-></P
-><P
->The timer callback function may run in a different thread than your
-main constant, and so shouldn't call any functions from within itself.</P
-><P
->The maximum resolution of this timer is 10 ms, which means that if
-you request a 16 ms timer, your callback will run approximately 20 ms
-later on an unloaded system.  If you wanted to set a flag signaling
-a frame update at 30 frames per second (every 33 ms), you might set a
-timer for 30 ms (see example below).</P
-><P
->If you use this function, you need to pass <TT
-CLASS="LITERAL"
->SDL_INIT_TIMER</TT
->
-to <TT
-CLASS="FUNCTION"
->SDL_Init()</TT
->.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->This function is kept for compatibility but has been superseded
-by the new timer functions
-<A
-HREF="sdladdtimer.html"
->SDL_AddTimer</A
-> and
-<A
-HREF="sdlremovetimer.html"
->SDL_RemoveTimer</A
-> which support
-multiple timers.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8584"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_SetTimer((33/10)*10, my_callback);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN8588"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdladdtimer.html"
-><TT
-CLASS="FUNCTION"
->SDL_AddTimer</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlremovetimer.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_RemoveTimer</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="time.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->&nbsp;</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetvideomode.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetvideomode.html
deleted file mode 100644
index 8b309b048f7..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsetvideomode.html
+++ /dev/null
@@ -1,558 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SetVideoMode</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_VideoModeOK"
-HREF="sdlvideomodeok.html"><LINK
-REL="NEXT"
-TITLE="SDL_UpdateRect"
-HREF="sdlupdaterect.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlvideomodeok.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlupdaterect.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSETVIDEOMODE"
-></A
->SDL_SetVideoMode</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1239"
-></A
-><H2
->Name</H2
->SDL_SetVideoMode&nbsp;--&nbsp;Set up a video mode with the specified width, height and bits-per-pixel.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1242"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1243"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_Surface *<B
-CLASS="FSFUNC"
->SDL_SetVideoMode</B
-></CODE
->(int width, int height, int bpp, Uint32 flags);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1249"
-></A
-><H2
->Description</H2
-><P
->Set up a video mode with the specified width, height and bits-per-pixel.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->bpp</I
-></TT
-> is 0, it is treated as the 
-current display bits per pixel.</P
-><P
->The <TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
-> parameter is the same as the <TT
-CLASS="STRUCTFIELD"
-><I
->flags</I
-></TT
-> field of the <A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
-> structure. OR'd combinations of the following values are valid.</P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN1259"
-></A
-><P
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_SWSURFACE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Create the video surface in system memory</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_HWSURFACE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Create the video surface in video memory</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_ASYNCBLIT</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Enables the use of asynchronous updates of the display surface. This will
-usually slow down blitting on single CPU machines, but may provide a speed
-increase on SMP systems.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_ANYFORMAT</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Normally, if a video surface of the requested bits-per-pixel (<TT
-CLASS="PARAMETER"
-><I
->bpp</I
-></TT
->) is not available, SDL will emulate one with a shadow surface. Passing <TT
-CLASS="LITERAL"
->SDL_ANYFORMAT</TT
-> prevents this and causes SDL to use the video surface, regardless of its pixel depth.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_HWPALETTE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Give SDL exclusive palette access. Without this flag you may not always get the the colors you request with <A
-HREF="sdlsetcolors.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetColors</TT
-></A
-> or <A
-HREF="sdlsetpalette.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetPalette</TT
-></A
->.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_DOUBLEBUF</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Enable hardware double buffering; only valid with SDL_HWSURFACE. Calling
-<A
-HREF="sdlflip.html"
-><TT
-CLASS="FUNCTION"
->SDL_Flip</TT
-></A
-> will flip the
-buffers and update the screen. All drawing will take place on the surface
-that is not displayed at the moment. If double buffering could not be enabled
-then <TT
-CLASS="FUNCTION"
->SDL_Flip</TT
-> will just perform a
-<A
-HREF="sdlupdaterect.html"
-><TT
-CLASS="FUNCTION"
->SDL_UpdateRect</TT
-></A
->
-on the entire screen.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_FULLSCREEN</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->SDL will attempt to use a fullscreen mode. If a hardware resolution change is
-not possible (for whatever reason), the next higher resolution will be used and
-the display window centered on a black background.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_OPENGL</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Create an OpenGL rendering context. You should have previously set OpenGL video attributes with <A
-HREF="sdlglsetattribute.html"
-><TT
-CLASS="FUNCTION"
->SDL_GL_SetAttribute</TT
-></A
->.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_OPENGLBLIT</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Create an OpenGL rendering context, like above, but allow normal blitting
-operations. The screen (2D) surface may have an alpha channel, and
-<A
-HREF="sdlupdaterects.html"
-><TT
-CLASS="FUNCTION"
->SDL_UpdateRects</TT
-></A
->
-must be used for updating changes to the screen surface. NOTE: This option
-is kept for compatibility only, and is <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->not</I
-></SPAN
-> recommended for
-new code.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_RESIZABLE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Create a resizable window. When the window is resized by the user a <A
-HREF="sdlresizeevent.html"
-><TT
-CLASS="LITERAL"
->SDL_VIDEORESIZE</TT
-></A
-> event is generated and <TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-> can be called again with the new size.</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_NOFRAME</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->If possible, <TT
-CLASS="LITERAL"
->SDL_NOFRAME</TT
-> causes SDL to create a window with no title bar or frame decoration. Fullscreen modes automatically have this flag set.</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->Whatever <TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
-> <TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-> could satisfy are set in the <TT
-CLASS="STRUCTFIELD"
-><I
->flags</I
-></TT
-> member of the returned surface.</P
-></BLOCKQUOTE
-></DIV
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->The <TT
-CLASS="PARAMETER"
-><I
->bpp</I
-></TT
-> parameter is the number of bits per pixel,
-so a <TT
-CLASS="PARAMETER"
-><I
->bpp</I
-></TT
-> of 24 uses the packed representation of
-3 bytes/pixel. For the more common 4 bytes/pixel mode, use a
-<TT
-CLASS="PARAMETER"
-><I
->bpp</I
-></TT
-> of 32. Somewhat oddly, both 15 and 16 will
-request a 2 bytes/pixel mode, but different pixel formats.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1336"
-></A
-><H2
->Return Value</H2
-><P
->The framebuffer surface, or <SPAN
-CLASS="RETURNVALUE"
->NULL</SPAN
-> if it fails.
-The surface returned is freed by SDL_Quit() and should nt be freed by
-the caller.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1340"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdllocksurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
-></A
->,
-<A
-HREF="sdlsetcolors.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetColors</TT
-></A
->,
-<A
-HREF="sdlflip.html"
-><TT
-CLASS="FUNCTION"
->SDL_Flip</TT
-></A
->,
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlvideomodeok.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlupdaterect.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_VideoModeOK</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_UpdateRect</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlshowcursor.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlshowcursor.html
deleted file mode 100644
index 5a8f19da228..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlshowcursor.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_ShowCursor</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetCursor"
-HREF="sdlgetcursor.html"><LINK
-REL="NEXT"
-TITLE="SDL_GL_LoadLibrary"
-HREF="sdlglloadlibrary.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetcursor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlglloadlibrary.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSHOWCURSOR"
-></A
->SDL_ShowCursor</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2615"
-></A
-><H2
->Name</H2
->SDL_ShowCursor&nbsp;--&nbsp;Toggle whether or not the cursor is shown on the screen.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2618"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2619"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_ShowCursor</B
-></CODE
->(int toggle);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2625"
-></A
-><H2
->Description</H2
-><P
->Toggle whether or not the cursor is shown on the screen. Passing <TT
-CLASS="LITERAL"
->SDL_ENABLE</TT
-> displays the cursor and passing <TT
-CLASS="LITERAL"
->SDL_DISABLE</TT
-> hides it. The current state of the mouse cursor can be queried by passing <TT
-CLASS="LITERAL"
->SDL_QUERY</TT
->, either <TT
-CLASS="LITERAL"
->SDL_DISABLE</TT
-> or <TT
-CLASS="LITERAL"
->SDL_ENABLE</TT
-> will be returned.</P
-><P
->The cursor starts off displayed, but can be turned off.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2634"
-></A
-><H2
->Return Value</H2
-><P
->Returns the current state of the cursor.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2637"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatecursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateCursor</TT
-></A
->,
-<A
-HREF="sdlsetcursor.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetCursor</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetcursor.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlglloadlibrary.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetCursor</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GL_LoadLibrary</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsurface.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsurface.html
deleted file mode 100644
index fda55f173fd..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsurface.html
+++ /dev/null
@@ -1,597 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_Surface</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_PixelFormat"
-HREF="sdlpixelformat.html"><LINK
-REL="NEXT"
-TITLE="SDL_VideoInfo"
-HREF="sdlvideoinfo.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlpixelformat.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlvideoinfo.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSURFACE"
-></A
->SDL_Surface</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3263"
-></A
-><H2
->Name</H2
->SDL_Surface&nbsp;--&nbsp;Graphical Surface Structure</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3266"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct SDL_Surface {
-        Uint32 flags;                           /* Read-only */
-        SDL_PixelFormat *format;                /* Read-only */
-        int w, h;                               /* Read-only */
-        Uint16 pitch;                           /* Read-only */
-        void *pixels;                           /* Read-write */
-
-        /* clipping information */
-        SDL_Rect clip_rect;                     /* Read-only */
-
-        /* Reference count -- used when freeing surface */
-        int refcount;                           /* Read-mostly */
-
-	/* This structure also contains private fields not shown here */
-} SDL_Surface;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3269"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN3271"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->flags</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface flags</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->format</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Pixel <A
-HREF="sdlpixelformat.html"
->format</A
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->w, h</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Width and height of the surface</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->pitch</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Length of a surface scanline in bytes</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->pixels</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Pointer to the actual pixel data</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->clip_rect</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->surface clip <A
-HREF="sdlrect.html"
->rectangle</A
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3300"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
->'s represent areas of "graphical"
-memory, memory that can be drawn to. The video framebuffer is returned
-as a <SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-> by
-<A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->
-and <A
-HREF="sdlgetvideosurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetVideoSurface</TT
-></A
->.
-Most of the fields should be pretty obvious.
-<TT
-CLASS="STRUCTFIELD"
-><I
->w</I
-></TT
-> and <TT
-CLASS="STRUCTFIELD"
-><I
->h</I
-></TT
-> are the
-width and height of the surface in pixels.
-<TT
-CLASS="STRUCTFIELD"
-><I
->pixels</I
-></TT
-> is a pointer to the actual pixel data,
-the surface should be <A
-HREF="sdllocksurface.html"
->locked</A
->
-before accessing this field. The <TT
-CLASS="STRUCTFIELD"
-><I
->clip_rect</I
-></TT
-> field
-is the clipping rectangle as set by
-<A
-HREF="sdlsetcliprect.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetClipRect</TT
-></A
->.</P
-><P
->The following are supported in the
-<TT
-CLASS="STRUCTFIELD"
-><I
->flags</I
-></TT
-> field.</P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN3318"
-></A
-><P
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_SWSURFACE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface is stored in system memory</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_HWSURFACE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface is stored in video memory</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_ASYNCBLIT</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface uses asynchronous blits if possible</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_ANYFORMAT</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Allows any pixel-format (Display surface)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_HWPALETTE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface has exclusive palette</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_DOUBLEBUF</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface is double buffered (Display surface)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_FULLSCREEN</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface is full screen (Display Surface)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_OPENGL</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface has an OpenGL context (Display Surface)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_OPENGLBLIT</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface supports OpenGL blitting (Display Surface)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_RESIZABLE</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface is resizable (Display Surface)</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_HWACCEL</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface blit uses hardware acceleration</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_SRCCOLORKEY</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface use colorkey blitting</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_RLEACCEL</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Colorkey blitting is accelerated with RLE</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_SRCALPHA</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface blit uses alpha blending</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_PREALLOC</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Surface uses preallocated memory</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3381"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlpixelformat.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlpixelformat.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlvideoinfo.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_PixelFormat</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_VideoInfo</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsyswmevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsyswmevent.html
deleted file mode 100644
index fd7180ee218..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlsyswmevent.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_SysWMEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_ExposeEvent"
-HREF="sdlexposeevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_UserEvent"
-HREF="sdluserevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlexposeevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdluserevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLSYSWMEVENT"
-></A
->SDL_SysWMEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4538"
-></A
-><H2
->Name</H2
->SDL_SysWMEvent&nbsp;--&nbsp;Platform-dependent window manager event.</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4541"
-></A
-><H2
->Description</H2
-><P
->The system window manager event contains a pointer to system-specific 
-information about unknown window manager events.  If you enable this event
-using 
-<A
-HREF="sdleventstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_EventState()</TT
-></A
->, 
-it will be generated whenever unhandled events are received from the window 
-manager.  This can be used, for example, to implement cut-and-paste in your 
-application.
-
-<PRE
-CLASS="PROGRAMLISTING"
->typedef struct {
-         Uint8 type;   /* Always SDL_SYSWMEVENT */
-         SDL_SysWMmsg *msg;
- } SDL_SysWMEvent;</PRE
->
-
-If you want to obtain system-specific information about the window manager,
-you can fill the version member of a <SPAN
-CLASS="STRUCTNAME"
->SDL_SysWMinfo</SPAN
-> 
-structure (details can be found in <TT
-CLASS="FILENAME"
->SDL_syswm.h</TT
->, which must be included) using the <TT
-CLASS="FUNCTION"
->SDL_VERSION()</TT
-> macro found in 
-<TT
-CLASS="FILENAME"
->SDL_version.h</TT
->, and pass it to the 
-function:
-<DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN4551"
-></A
-><P
-></P
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_GetWMInfo</B
-></CODE
->(SDL_SysWMinfo *info);</CODE
-></P
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4556"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdleventstate.html"
-><TT
-CLASS="FUNCTION"
->SDL_EventState</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlexposeevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdluserevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_ExposeEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_UserEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlthreadid.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlthreadid.html
deleted file mode 100644
index e0bde2e2a35..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlthreadid.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_ThreadID</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CreateThread"
-HREF="sdlcreatethread.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetThreadID"
-HREF="sdlgetthreadid.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcreatethread.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetthreadid.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLTHREADID"
-></A
->SDL_ThreadID</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7726"
-></A
-><H2
->Name</H2
->SDL_ThreadID&nbsp;--&nbsp;Get the 32-bit thread identifier for the current thread.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7729"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7730"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint32 <B
-CLASS="FSFUNC"
->SDL_ThreadID</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7736"
-></A
-><H2
->Description</H2
-><P
->Get the 32-bit thread identifier for the current thread.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcreatethread.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetthreadid.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CreateThread</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetThreadID</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlunlockaudio.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlunlockaudio.html
deleted file mode 100644
index 0019bd692a0..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlunlockaudio.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_UnlockAudio</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Audio"
-HREF="audio.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_LockAudio"
-HREF="sdllockaudio.html"><LINK
-REL="NEXT"
-TITLE="SDL_CloseAudio"
-HREF="sdlcloseaudio.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdllockaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcloseaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLUNLOCKAUDIO"
-></A
->SDL_UnlockAudio</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7156"
-></A
-><H2
->Name</H2
->SDL_UnlockAudio&nbsp;--&nbsp;Unlock the callback function</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7159"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7160"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_UnlockAudio</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7166"
-></A
-><H2
->Description</H2
-><P
->Unlocks a previous <A
-HREF="sdllockaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockAudio</TT
-></A
-> call.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7171"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlopenaudio.html"
-><TT
-CLASS="FUNCTION"
->SDL_OpenAudio</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdllockaudio.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcloseaudio.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_LockAudio</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="audio.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CloseAudio</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlunlocksurface.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlunlocksurface.html
deleted file mode 100644
index 13ba5fc8e2b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlunlocksurface.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_UnlockSurface</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_LockSurface"
-HREF="sdllocksurface.html"><LINK
-REL="NEXT"
-TITLE="SDL_LoadBMP"
-HREF="sdlloadbmp.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdllocksurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlloadbmp.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLUNLOCKSURFACE"
-></A
->SDL_UnlockSurface</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1962"
-></A
-><H2
->Name</H2
->SDL_UnlockSurface&nbsp;--&nbsp;Unlocks a previously locked surface.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1965"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1966"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_UnlockSurface</B
-></CODE
->(SDL_Surface *surface);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1972"
-></A
-><H2
->Description</H2
-><P
->Surfaces that were previously locked using <TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
-> must be unlocked with <TT
-CLASS="FUNCTION"
->SDL_UnlockSurface</TT
->. Surfaces should be unlocked as soon as possible.</P
-><P
->It should be noted that since 1.1.8, surface locks are recursive. See <A
-HREF="sdllocksurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
-></A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1980"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdllocksurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdllocksurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlloadbmp.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_LockSurface</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_LoadBMP</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlunlockyuvoverlay.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlunlockyuvoverlay.html
deleted file mode 100644
index 936ed9eaf7e..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlunlockyuvoverlay.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_UnlockYUVOverlay</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_LockYUVOverlay"
-HREF="sdllockyuvoverlay.html"><LINK
-REL="NEXT"
-TITLE="SDL_DisplayYUVOverlay"
-HREF="sdldisplayyuvoverlay.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdllockyuvoverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdldisplayyuvoverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLUNLOCKYUVOVERLAY"
-></A
->SDL_UnlockYUVOverlay</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2880"
-></A
-><H2
->Name</H2
->SDL_UnlockYUVOverlay&nbsp;--&nbsp;Unlock an overlay</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2883"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2884"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_UnlockYUVOverlay</B
-></CODE
->(SDL_Overlay *overlay);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2890"
-></A
-><H2
->Description</H2
-><P
->The opposite to <A
-HREF="sdllockyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockYUVOverlay</TT
-></A
->. Unlocks a previously locked overlay. An overlay must be unlocked before it can be displayed.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2895"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdllockyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_UnlockYUVOverlay</TT
-></A
->,
-<A
-HREF="sdlcreateyuvoverlay.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateYUVOverlay</TT
-></A
->,
-<A
-HREF="sdloverlay.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Overlay</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdllockyuvoverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdldisplayyuvoverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_LockYUVOverlay</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_DisplayYUVOverlay</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlupdaterect.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlupdaterect.html
deleted file mode 100644
index f54d9f5e243..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlupdaterect.html
+++ /dev/null
@@ -1,266 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_UpdateRect</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SetVideoMode"
-HREF="sdlsetvideomode.html"><LINK
-REL="NEXT"
-TITLE="SDL_UpdateRects"
-HREF="sdlupdaterects.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsetvideomode.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlupdaterects.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLUPDATERECT"
-></A
->SDL_UpdateRect</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1355"
-></A
-><H2
->Name</H2
->SDL_UpdateRect&nbsp;--&nbsp;Makes sure the given area is updated on the given screen.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1358"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1359"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_UpdateRect</B
-></CODE
->(SDL_Surface *screen, Sint32 x, Sint32 y, Sint32 w, Sint32 h);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1365"
-></A
-><H2
->Description</H2
-><P
->Makes sure the given area is updated on the given screen. The rectangle must
-be confined within the screen boundaries (no clipping is done).</P
-><P
->If '<TT
-CLASS="PARAMETER"
-><I
->x</I
-></TT
->', '<TT
-CLASS="PARAMETER"
-><I
->y</I
-></TT
->', '<TT
-CLASS="PARAMETER"
-><I
->w</I
-></TT
->'
-and '<TT
-CLASS="PARAMETER"
-><I
->h</I
-></TT
->' are all 0,
-<TT
-CLASS="FUNCTION"
->SDL_UpdateRect</TT
-> will update the
-entire screen.</P
-><P
->This function should not be called while '<TT
-CLASS="PARAMETER"
-><I
->screen</I
-></TT
->' is
-<A
-HREF="sdllocksurface.html"
->locked</A
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1377"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlupdaterects.html"
-><TT
-CLASS="FUNCTION"
->SDL_UpdateRects</TT
-></A
->,
-<A
-HREF="sdlrect.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Rect</SPAN
-></A
->,
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
->,
-<A
-HREF="sdllocksurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsetvideomode.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlupdaterects.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SetVideoMode</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_UpdateRects</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlupdaterects.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlupdaterects.html
deleted file mode 100644
index 0553a7a9d06..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlupdaterects.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_UpdateRects</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_UpdateRect"
-HREF="sdlupdaterect.html"><LINK
-REL="NEXT"
-TITLE="SDL_Flip"
-HREF="sdlflip.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlupdaterect.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlflip.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLUPDATERECTS"
-></A
->SDL_UpdateRects</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1392"
-></A
-><H2
->Name</H2
->SDL_UpdateRects&nbsp;--&nbsp;Makes sure the given list of rectangles is updated on the given screen.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1395"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1396"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_UpdateRects</B
-></CODE
->(SDL_Surface *screen, int numrects, SDL_Rect *rects);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1402"
-></A
-><H2
->Description</H2
-><P
->Makes sure the given list of rectangles is updated on the given screen.
-The rectangles must all be confined within the screen boundaries (no
-clipping is done).</P
-><P
->This function should not be called while <TT
-CLASS="PARAMETER"
-><I
->screen</I
-></TT
-> is
-<A
-HREF="sdllocksurface.html"
->locked</A
->.</P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->It is adviced to call this function only once per frame, since each
-call has some processing overhead. This is no restriction since you
-can pass any number of rectangles each time.</P
-><P
->The rectangles are not automatically merged or checked for overlap. In
-general, the programmer can use his knowledge about his particular
-rectangles to merge them in an efficient way, to avoid overdraw.</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1411"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlupdaterect.html"
-><TT
-CLASS="FUNCTION"
->SDL_UpdateRect</TT
-></A
->,
-<A
-HREF="sdlrect.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Rect</SPAN
-></A
->,
-<A
-HREF="sdlsurface.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Surface</SPAN
-></A
->,
-<A
-HREF="sdllocksurface.html"
-><TT
-CLASS="FUNCTION"
->SDL_LockSurface</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlupdaterect.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlflip.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_UpdateRect</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_Flip</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdluserevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdluserevent.html
deleted file mode 100644
index 178769c51db..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdluserevent.html
+++ /dev/null
@@ -1,337 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_UserEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Event Structures."
-HREF="eventstructures.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_SysWMEvent"
-HREF="sdlsyswmevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_QuitEvent"
-HREF="sdlquitevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsyswmevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlquitevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLUSEREVENT"
-></A
->SDL_UserEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN4565"
-></A
-><H2
->Name</H2
->SDL_UserEvent&nbsp;--&nbsp;A user-defined event type</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4568"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint8 type;
-  int code;
-  void *data1;
-  void *data2;
-} SDL_UserEvent;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4571"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4573"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
->SDL_USEREVENT</TT
-> through to <TT
-CLASS="LITERAL"
->SDL_NUMEVENTS-1</TT
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->code</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->User defined event code</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->data1</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->User defined data pointer</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->data2</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->User defined data pointer</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4594"
-></A
-><H2
->Description</H2
-><P
-><SPAN
-CLASS="STRUCTNAME"
->SDL_UserEvent</SPAN
-> is in the <TT
-CLASS="STRUCTFIELD"
-><I
->user</I
-></TT
-> member of the structure <A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->. This event is unique, it is never created by SDL but only by the user. The event can be pushed onto the event queue using <A
-HREF="sdlpushevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PushEvent</TT
-></A
->. The contents of the structure members or completely up to the programmer, the only requirement is that <TT
-CLASS="STRUCTFIELD"
-><I
->type</I
-></TT
-> is a value from <TT
-CLASS="LITERAL"
->SDL_USEREVENT</TT
-> to <TT
-CLASS="LITERAL"
->SDL_NUMEVENTS-1</TT
-> (inclusive).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4606"
-></A
-><H2
->Examples</H2
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_Event event;
-
-event.type = SDL_USEREVENT;
-event.user.code = my_event_code;
-event.user.data1 = significant_data;
-event.user.data2 = 0;
-SDL_PushEvent(&#38;event);</PRE
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN4610"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlpushevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PushEvent</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsyswmevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlquitevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_SysWMEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventstructures.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_QuitEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlvideodrivername.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlvideodrivername.html
deleted file mode 100644
index 141965623f1..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlvideodrivername.html
+++ /dev/null
@@ -1,243 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_VideoDriverName</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetVideoInfo"
-HREF="sdlgetvideoinfo.html"><LINK
-REL="NEXT"
-TITLE="SDL_ListModes"
-HREF="sdllistmodes.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetvideoinfo.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdllistmodes.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLVIDEODRIVERNAME"
-></A
->SDL_VideoDriverName</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1127"
-></A
-><H2
->Name</H2
->SDL_VideoDriverName&nbsp;--&nbsp;Obtain the name of the video driver</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1130"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1131"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->char *<B
-CLASS="FSFUNC"
->SDL_VideoDriverName</B
-></CODE
->(char *namebuf, int maxlen);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1137"
-></A
-><H2
->Description</H2
-><P
->The buffer pointed to by <TT
-CLASS="PARAMETER"
-><I
->namebuf</I
-></TT
-> is filled up to a maximum of <TT
-CLASS="PARAMETER"
-><I
->maxlen</I
-></TT
-> characters (include the NULL terminator) with the name of the initialised video driver. The driver name is a simple one word identifier like "x11" or "windib".</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1142"
-></A
-><H2
->Return Value</H2
-><P
->Returns <TT
-CLASS="LITERAL"
->NULL</TT
-> if video has not been initialised with <TT
-CLASS="FUNCTION"
->SDL_Init</TT
-> or a pointer to <TT
-CLASS="PARAMETER"
-><I
->namebuf</I
-></TT
-> otherwise.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1148"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
->
-<A
-HREF="sdlinitsubsystem.html"
-><TT
-CLASS="FUNCTION"
->SDL_InitSubSystem</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetvideoinfo.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdllistmodes.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetVideoInfo</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_ListModes</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlvideoinfo.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlvideoinfo.html
deleted file mode 100644
index 3a0da31dadb..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlvideoinfo.html
+++ /dev/null
@@ -1,408 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_VideoInfo</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_Surface"
-HREF="sdlsurface.html"><LINK
-REL="NEXT"
-TITLE="SDL_Overlay"
-HREF="sdloverlay.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlsurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdloverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLVIDEOINFO"
-></A
->SDL_VideoInfo</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3390"
-></A
-><H2
->Name</H2
->SDL_VideoInfo&nbsp;--&nbsp;Video Target information</DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3393"
-></A
-><H2
->Structure Definition</H2
-><PRE
-CLASS="PROGRAMLISTING"
->typedef struct{
-  Uint32 hw_available:1;
-  Uint32 wm_available:1;
-  Uint32 blit_hw:1;
-  Uint32 blit_hw_CC:1;
-  Uint32 blit_hw_A:1;
-  Uint32 blit_sw:1;
-  Uint32 blit_sw_CC:1;
-  Uint32 blit_sw_A:1;
-  Uint32 blit_fill;
-  Uint32 video_mem;
-  SDL_PixelFormat *vfmt;
-} SDL_VideoInfo;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3396"
-></A
-><H2
->Structure Data</H2
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN3398"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->hw_available</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Is it possible to create hardware surfaces?</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->wm_available</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Is there a window manager available</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->blit_hw</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Are hardware to hardware blits accelerated?</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->blit_hw_CC</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Are hardware to hardware colorkey blits accelerated?</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->blit_hw_A</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Are hardware to hardware alpha blits accelerated?</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->blit_sw</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Are software to hardware blits accelerated?</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->blit_sw_CC</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Are software to hardware colorkey blits accelerated?</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->blit_sw_A</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Are software to hardware alpha blits accelerated?</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->blit_fill</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Are color fills accelerated?</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->video_mem</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
->Total amount of video memory in Kilobytes</TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="STRUCTFIELD"
-><I
->vfmt</I
-></TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><A
-HREF="sdlpixelformat.html"
->Pixel format</A
-> of the video device</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3446"
-></A
-><H2
->Description</H2
-><P
->This (read-only) structure is returned by <A
-HREF="sdlgetvideoinfo.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetVideoInfo</TT
-></A
->. It contains information on either the 'best' available mode  (if called before <A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->) or the current video mode.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3453"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlpixelformat.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_PixelFormat</SPAN
-></A
->,
-<A
-HREF="sdlgetvideoinfo.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetVideoInfo</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlsurface.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdloverlay.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_Surface</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_Overlay</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlvideomodeok.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlvideomodeok.html
deleted file mode 100644
index 5d2d6c4eb95..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlvideomodeok.html
+++ /dev/null
@@ -1,270 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_VideoModeOK</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_ListModes"
-HREF="sdllistmodes.html"><LINK
-REL="NEXT"
-TITLE="SDL_SetVideoMode"
-HREF="sdlsetvideomode.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdllistmodes.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlsetvideomode.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLVIDEOMODEOK"
-></A
->SDL_VideoModeOK</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN1202"
-></A
-><H2
->Name</H2
->SDL_VideoModeOK&nbsp;--&nbsp;Check to see if a particular video mode is supported.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN1205"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN1206"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_VideoModeOK</B
-></CODE
->(int width, int height, int bpp, Uint32 flags);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1212"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_VideoModeOK</TT
-> returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> 
-if the requested mode is not supported under any bit depth, or returns the 
-bits-per-pixel of the closest available mode with the given width, height and requested <A
-HREF="sdlsurface.html"
->surface</A
-> flags (see <A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->).</P
-><P
->The bits-per-pixel value returned is only a suggested mode. You can usually request and bpp you want when <A
-HREF="sdlsetvideomode.html"
->setting</A
->  the video mode and SDL will emulate that color depth with a shadow video surface.</P
-><P
->The arguments to <TT
-CLASS="FUNCTION"
->SDL_VideoModeOK</TT
-> are the same ones you 
-would pass to <A
-HREF="sdlsetvideomode.html"
->SDL_SetVideoMode</A
-></P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1225"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_Surface *screen;
-Uint32 bpp;
-.
-.
-.
-printf("Checking mode 640x480@16bpp.\n");
-bpp=SDL_VideoModeOK(640, 480, 16, SDL_HWSURFACE);
-
-if(!bpp){
-  printf("Mode not available.\n");
-  exit(-1);
-}
-
-printf("SDL Recommends 640x480@%dbpp.\n", bpp);
-screen=SDL_SetVideoMode(640, 480, bpp, SDL_HWSURFACE);
-.
-.</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN1228"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->,
-<A
-HREF="sdlgetvideoinfo.html"
-><TT
-CLASS="FUNCTION"
->SDL_GetVideoInfo</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdllistmodes.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlsetvideomode.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_ListModes</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_SetVideoMode</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwaitevent.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwaitevent.html
deleted file mode 100644
index b473d3b06e3..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwaitevent.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_WaitEvent</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Event Functions."
-HREF="eventfunctions.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_PollEvent"
-HREF="sdlpollevent.html"><LINK
-REL="NEXT"
-TITLE="SDL_PushEvent"
-HREF="sdlpushevent.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlpollevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlpushevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLWAITEVENT"
-></A
->SDL_WaitEvent</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN5507"
-></A
-><H2
->Name</H2
->SDL_WaitEvent&nbsp;--&nbsp;Waits indefinitely for the next available event.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN5510"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN5511"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_WaitEvent</B
-></CODE
->(SDL_Event *event);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5517"
-></A
-><H2
->Description</H2
-><P
->Waits indefinitely for the next available event, returning 
-<SPAN
-CLASS="RETURNVALUE"
->1</SPAN
->, or <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> if there was 
-an error while waiting for events.  </P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->event</I
-></TT
-> is not <TT
-CLASS="LITERAL"
->NULL</TT
->, the next 
-event is removed from the queue and stored in that area.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN5525"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_Event</SPAN
-></A
->,
-<A
-HREF="sdlpollevent.html"
-><TT
-CLASS="FUNCTION"
->SDL_PollEvent</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlpollevent.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlpushevent.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_PollEvent</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="eventfunctions.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_PushEvent</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwaitthread.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwaitthread.html
deleted file mode 100644
index 2becfbc47f1..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwaitthread.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_WaitThread</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Multi-threaded Programming"
-HREF="thread.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_GetThreadID"
-HREF="sdlgetthreadid.html"><LINK
-REL="NEXT"
-TITLE="SDL_KillThread"
-HREF="sdlkillthread.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlgetthreadid.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlkillthread.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLWAITTHREAD"
-></A
->SDL_WaitThread</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN7766"
-></A
-><H2
->Name</H2
->SDL_WaitThread&nbsp;--&nbsp;Wait for a thread to finish.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN7769"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN7770"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"
-#include "SDL_thread.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_WaitThread</B
-></CODE
->(SDL_Thread *thread, int *status);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7776"
-></A
-><H2
->Description</H2
-><P
->Wait for a thread to finish (timeouts are not supported).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7779"
-></A
-><H2
->Return Value</H2
-><P
->The return code for the thread function is placed in the area pointed to by
-<TT
-CLASS="PARAMETER"
-><I
->status</I
-></TT
->, if <TT
-CLASS="PARAMETER"
-><I
->status</I
-></TT
-> is not
-<SPAN
-CLASS="RETURNVALUE"
->NULL</SPAN
->.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN7785"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlcreatethread.html"
-><TT
-CLASS="FUNCTION"
->SDL_CreateThread</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlgetthreadid.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlkillthread.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_GetThreadID</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="thread.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_KillThread</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwarpmouse.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwarpmouse.html
deleted file mode 100644
index e7b2d8d79f6..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwarpmouse.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_WarpMouse</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Video"
-HREF="video.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_DisplayFormatAlpha"
-HREF="sdldisplayformatalpha.html"><LINK
-REL="NEXT"
-TITLE="SDL_CreateCursor"
-HREF="sdlcreatecursor.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdldisplayformatalpha.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcreatecursor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLWARPMOUSE"
-></A
->SDL_WarpMouse</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN2465"
-></A
-><H2
->Name</H2
->SDL_WarpMouse&nbsp;--&nbsp;Set the position of the mouse cursor.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN2468"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN2469"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_WarpMouse</B
-></CODE
->(Uint16 x, Uint16 y);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2475"
-></A
-><H2
->Description</H2
-><P
->Set the position of the mouse cursor (generates a mouse motion event).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN2478"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlmousemotionevent.html"
-><SPAN
-CLASS="STRUCTNAME"
->SDL_MouseMotionEvent</SPAN
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdldisplayformatalpha.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcreatecursor.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_DisplayFormatAlpha</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="video.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CreateCursor</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwasinit.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwasinit.html
deleted file mode 100644
index b4effeb6800..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwasinit.html
+++ /dev/null
@@ -1,284 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_WasInit</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="General"
-HREF="general.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_Quit"
-HREF="sdlquit.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetError"
-HREF="sdlgeterror.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlquit.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgeterror.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLWASINIT"
-></A
->SDL_WasInit</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN617"
-></A
-><H2
->Name</H2
->SDL_WasInit&nbsp;--&nbsp;Check which subsystems are initialized</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN620"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN621"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->Uint32 <B
-CLASS="FSFUNC"
->SDL_WasInit</B
-></CODE
->(Uint32 flags);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN627"
-></A
-><H2
->Description</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_WasInit</TT
-> allows you to see which SDL subsytems have been <A
-HREF="sdlinit.html"
->initialized</A
->. <TT
-CLASS="PARAMETER"
-><I
->flags</I
-></TT
-> is a bitwise OR'd combination of the subsystems you wish to check (see <A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
-> for a list of subsystem flags).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN635"
-></A
-><H2
->Return Value</H2
-><P
-><TT
-CLASS="FUNCTION"
->SDL_WasInit</TT
-> returns a bitwised OR'd combination of the initialized subsystems.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN639"
-></A
-><H2
->Examples</H2
-><PRE
-CLASS="PROGRAMLISTING"
->&#13;/* Here are several ways you can use SDL_WasInit() */
-
-/* Get init data on all the subsystems */
-Uint32 subsystem_init;
-
-subsystem_init=SDL_WasInit(SDL_INIT_EVERYTHING);
-
-if(subsystem_init&#38;SDL_INIT_VIDEO)
-  printf("Video is initialized.\n");
-else
-  printf("Video is not initialized.\n");
-
-
-
-/* Just check for one specfic subsystem */
-
-if(SDL_WasInit(SDL_INIT_VIDEO)!=0)
-  printf("Video is initialized.\n");
-else
-  printf("Video is not initialized.\n");
-
-
-
-
-/* Check for two subsystems */
-
-Uint32 subsystem_mask=SDL_INIT_VIDEO|SDL_INIT_AUDIO;
-
-if(SDL_WasInit(subsystem_mask)==subsystem_mask)
-  printf("Video and Audio initialized.\n");
-else
-  printf("Video and Audio not initialized.\n");&#13;</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN642"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlinit.html"
-><TT
-CLASS="FUNCTION"
->SDL_Init</TT
-></A
->,
-<A
-HREF="sdlinitsubsystem.html"
-><TT
-CLASS="FUNCTION"
->SDL_Subsystem</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlquit.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgeterror.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_Quit</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="general.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetError</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmgetcaption.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmgetcaption.html
deleted file mode 100644
index 829c68aaa16..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmgetcaption.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_WM_GetCaption</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Window Management"
-HREF="wm.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_WM_SetCaption"
-HREF="sdlwmsetcaption.html"><LINK
-REL="NEXT"
-TITLE="SDL_WM_SetIcon"
-HREF="sdlwmseticon.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlwmsetcaption.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlwmseticon.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLWMGETCAPTION"
-></A
->SDL_WM_GetCaption</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3556"
-></A
-><H2
->Name</H2
->SDL_WM_GetCaption&nbsp;--&nbsp;Gets the window title and icon name.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN3559"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN3560"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_WM_GetCaption</B
-></CODE
->(char **title, char **icon);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3566"
-></A
-><H2
->Description</H2
-><P
->Set pointers to the window <TT
-CLASS="PARAMETER"
-><I
->title</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->icon</I
-></TT
-> name.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3571"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlwmsetcaption.html"
-><TT
-CLASS="FUNCTION"
->SDL_WM_SetCaption</TT
-></A
->,
-<A
-HREF="sdlwmseticon.html"
-><TT
-CLASS="FUNCTION"
->SDL_WM_SetIcon</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlwmsetcaption.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlwmseticon.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_WM_SetCaption</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="wm.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_WM_SetIcon</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmgrabinput.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmgrabinput.html
deleted file mode 100644
index 740dcd6b29a..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmgrabinput.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_WM_GrabInput</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Window Management"
-HREF="wm.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_WM_ToggleFullScreen"
-HREF="sdlwmtogglefullscreen.html"><LINK
-REL="NEXT"
-TITLE="Events"
-HREF="event.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlwmtogglefullscreen.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="event.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLWMGRABINPUT"
-></A
->SDL_WM_GrabInput</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3663"
-></A
-><H2
->Name</H2
->SDL_WM_GrabInput&nbsp;--&nbsp;Grabs mouse and keyboard input.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN3666"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN3667"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->SDL_GrabMode <B
-CLASS="FSFUNC"
->SDL_WM_GrabInput</B
-></CODE
->(SDL_GrabMode mode);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3673"
-></A
-><H2
->Description</H2
-><P
->Grabbing means that the mouse is confined to the application window,
-and nearly all keyboard input is passed directly to the application,
-and not interpreted by a window manager, if any.</P
-><P
->When <TT
-CLASS="PARAMETER"
-><I
->mode</I
-></TT
-> is <TT
-CLASS="LITERAL"
->SDL_GRAB_QUERY</TT
-> the grab mode is not changed, but the current grab mode is returned.</P
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->typedef enum {
-  SDL_GRAB_QUERY,
-  SDL_GRAB_OFF,
-  SDL_GRAB_ON
-} SDL_GrabMode;</PRE
->
-                    </P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3681"
-></A
-><H2
->Return Value</H2
-><P
->The current/new <SPAN
-CLASS="STRUCTNAME"
->SDL_GrabMode</SPAN
->.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlwmtogglefullscreen.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="event.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_WM_ToggleFullScreen</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="wm.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Events</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmiconifywindow.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmiconifywindow.html
deleted file mode 100644
index 11136568628..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmiconifywindow.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_WM_IconifyWindow</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Window Management"
-HREF="wm.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_WM_SetIcon"
-HREF="sdlwmseticon.html"><LINK
-REL="NEXT"
-TITLE="SDL_WM_ToggleFullScreen"
-HREF="sdlwmtogglefullscreen.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlwmseticon.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlwmtogglefullscreen.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLWMICONIFYWINDOW"
-></A
->SDL_WM_IconifyWindow</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3617"
-></A
-><H2
->Name</H2
->SDL_WM_IconifyWindow&nbsp;--&nbsp;Iconify/Minimise the window</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN3620"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN3621"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_WM_IconifyWindow</B
-></CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3627"
-></A
-><H2
->Description</H2
-><P
->If the application is running in a window managed environment SDL attempts to iconify/minimise it. If <TT
-CLASS="FUNCTION"
->SDL_WM_IconifyWindow</TT
-> is successful, the application will receive a <A
-HREF="sdlactiveevent.html"
-><TT
-CLASS="LITERAL"
->SDL_APPACTIVE</TT
-></A
-> loss event.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3633"
-></A
-><H2
->Return Value</H2
-><P
->Returns non-zero on success or <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> if iconification is not support or was refused by the window manager.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlwmseticon.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlwmtogglefullscreen.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_WM_SetIcon</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="wm.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_WM_ToggleFullScreen</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmsetcaption.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmsetcaption.html
deleted file mode 100644
index bc47c278bdb..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmsetcaption.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_WM_SetCaption</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Window Management"
-HREF="wm.html"><LINK
-REL="PREVIOUS"
-TITLE="Window Management"
-HREF="wm.html"><LINK
-REL="NEXT"
-TITLE="SDL_WM_GetCaption"
-HREF="sdlwmgetcaption.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="wm.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlwmgetcaption.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLWMSETCAPTION"
-></A
->SDL_WM_SetCaption</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3532"
-></A
-><H2
->Name</H2
->SDL_WM_SetCaption&nbsp;--&nbsp;Sets the window tile and icon name.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN3535"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN3536"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_WM_SetCaption</B
-></CODE
->(const char *title, const char *icon);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3542"
-></A
-><H2
->Description</H2
-><P
->Sets the title-bar and icon name of the display window.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3545"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlwmgetcaption.html"
-><TT
-CLASS="FUNCTION"
->SDL_WM_GetCaption</TT
-></A
->,
-<A
-HREF="sdlwmseticon.html"
-><TT
-CLASS="FUNCTION"
->SDL_WM_SetIcon</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="wm.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlwmgetcaption.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Window Management</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="wm.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_WM_GetCaption</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmseticon.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmseticon.html
deleted file mode 100644
index 12eb207c69b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmseticon.html
+++ /dev/null
@@ -1,260 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_WM_SetIcon</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Window Management"
-HREF="wm.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_WM_GetCaption"
-HREF="sdlwmgetcaption.html"><LINK
-REL="NEXT"
-TITLE="SDL_WM_IconifyWindow"
-HREF="sdlwmiconifywindow.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlwmgetcaption.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlwmiconifywindow.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLWMSETICON"
-></A
->SDL_WM_SetIcon</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3582"
-></A
-><H2
->Name</H2
->SDL_WM_SetIcon&nbsp;--&nbsp;Sets the icon for the display window.</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN3585"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN3586"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->void <B
-CLASS="FSFUNC"
->SDL_WM_SetIcon</B
-></CODE
->(SDL_Surface *icon, Uint8 *mask);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3592"
-></A
-><H2
->Description</H2
-><P
->Sets the icon for the display window. Win32 icons must be 32x32.</P
-><P
->This function must be called before the first call to 
-<A
-HREF="sdlsetvideomode.html"
->SDL_SetVideoMode</A
->.</P
-><P
->The <TT
-CLASS="PARAMETER"
-><I
->mask</I
-></TT
-> is a bitmask that describes the shape of the
-icon. If <TT
-CLASS="PARAMETER"
-><I
->mask</I
-></TT
-> is NULL, then the shape is determined by
-the colorkey of <TT
-CLASS="PARAMETER"
-><I
->icon</I
-></TT
->, if any, or makes the icon
-rectangular (no transparency) otherwise.</P
-><P
->If <TT
-CLASS="PARAMETER"
-><I
->mask</I
-></TT
-> is non-NULL, it points to a bitmap with bits set
-where the corresponding pixel should be visible. The format of the bitmap is as
-follows: Scanlines come in the usual top-down order. Each scanline consists of
-(width / 8) bytes, rounded up. The most significant bit of each byte represents
-the leftmost pixel.</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3603"
-></A
-><H2
->Example</H2
-><PRE
-CLASS="PROGRAMLISTING"
->SDL_WM_SetIcon(SDL_LoadBMP("icon.bmp"), NULL);</PRE
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3606"
-></A
-><H2
->See Also</H2
-><P
-><A
-HREF="sdlsetvideomode.html"
-><TT
-CLASS="FUNCTION"
->SDL_SetVideoMode</TT
-></A
->,
-<A
-HREF="sdlwmsetcaption.html"
-><TT
-CLASS="FUNCTION"
->SDL_WM_SetCaption</TT
-></A
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlwmgetcaption.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlwmiconifywindow.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_WM_GetCaption</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="wm.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_WM_IconifyWindow</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmtogglefullscreen.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmtogglefullscreen.html
deleted file mode 100644
index b7973de551d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/sdlwmtogglefullscreen.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->SDL_WM_ToggleFullScreen</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Window Management"
-HREF="wm.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_WM_IconifyWindow"
-HREF="sdlwmiconifywindow.html"><LINK
-REL="NEXT"
-TITLE="SDL_WM_GrabInput"
-HREF="sdlwmgrabinput.html"></HEAD
-><BODY
-CLASS="REFENTRY"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlwmiconifywindow.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlwmgrabinput.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><H1
-><A
-NAME="SDLWMTOGGLEFULLSCREEN"
-></A
->SDL_WM_ToggleFullScreen</H1
-><DIV
-CLASS="REFNAMEDIV"
-><A
-NAME="AEN3641"
-></A
-><H2
->Name</H2
->SDL_WM_ToggleFullScreen&nbsp;--&nbsp;Toggles fullscreen mode</DIV
-><DIV
-CLASS="REFSYNOPSISDIV"
-><A
-NAME="AEN3644"
-></A
-><H2
->Synopsis</H2
-><DIV
-CLASS="FUNCSYNOPSIS"
-><A
-NAME="AEN3645"
-></A
-><P
-></P
-><PRE
-CLASS="FUNCSYNOPSISINFO"
->#include "SDL.h"</PRE
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->int <B
-CLASS="FSFUNC"
->SDL_WM_ToggleFullScreen</B
-></CODE
->(SDL_Surface *surface);</CODE
-></P
-><P
-></P
-></DIV
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3651"
-></A
-><H2
->Description</H2
-><P
->Toggles the application between windowed and fullscreen mode, if supported. (X11 is the only target currently supported, BeOS support is experimental).</P
-></DIV
-><DIV
-CLASS="REFSECT1"
-><A
-NAME="AEN3654"
-></A
-><H2
->Return Value</H2
-><P
->Returns <SPAN
-CLASS="RETURNVALUE"
->0</SPAN
-> on failure or <SPAN
-CLASS="RETURNVALUE"
->1</SPAN
-> on success.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlwmiconifywindow.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlwmgrabinput.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_WM_IconifyWindow</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="wm.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_WM_GrabInput</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/thread.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/thread.html
deleted file mode 100644
index c66018eff23..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/thread.html
+++ /dev/null
@@ -1,313 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Multi-threaded Programming</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Reference"
-HREF="reference.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CDtrack"
-HREF="sdlcdtrack.html"><LINK
-REL="NEXT"
-TITLE="SDL_CreateThread"
-HREF="sdlcreatethread.html"><META
-NAME="KEYWORD"
-CONTENT="threads"><META
-NAME="KEYWORD"
-CONTENT="function"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcdtrack.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlcreatethread.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="THREAD"
-></A
->Chapter 12. Multi-threaded Programming</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="sdlcreatethread.html"
->SDL_CreateThread</A
->&nbsp;--&nbsp;Creates a new thread of execution that shares its parent's properties.</DT
-><DT
-><A
-HREF="sdlthreadid.html"
->SDL_ThreadID</A
->&nbsp;--&nbsp;Get the 32-bit thread identifier for the current thread.</DT
-><DT
-><A
-HREF="sdlgetthreadid.html"
->SDL_GetThreadID</A
->&nbsp;--&nbsp;Get the SDL thread ID of a SDL_Thread</DT
-><DT
-><A
-HREF="sdlwaitthread.html"
->SDL_WaitThread</A
->&nbsp;--&nbsp;Wait for a thread to finish.</DT
-><DT
-><A
-HREF="sdlkillthread.html"
->SDL_KillThread</A
->&nbsp;--&nbsp;Gracelessly terminates the thread.</DT
-><DT
-><A
-HREF="sdlcreatemutex.html"
->SDL_CreateMutex</A
->&nbsp;--&nbsp;Create a mutex</DT
-><DT
-><A
-HREF="sdldestroymutex.html"
->SDL_DestroyMutex</A
->&nbsp;--&nbsp;Destroy a mutex</DT
-><DT
-><A
-HREF="sdlmutexp.html"
->SDL_mutexP</A
->&nbsp;--&nbsp;Lock a mutex</DT
-><DT
-><A
-HREF="sdlmutexv.html"
->SDL_mutexV</A
->&nbsp;--&nbsp;Unlock a mutex</DT
-><DT
-><A
-HREF="sdlcreatesemaphore.html"
->SDL_CreateSemaphore</A
->&nbsp;--&nbsp;Creates a new semaphore and assigns an initial value to it.</DT
-><DT
-><A
-HREF="sdldestroysemaphore.html"
->SDL_DestroySemaphore</A
->&nbsp;--&nbsp;Destroys a semaphore that was created by <A
-HREF="sdlcreatesemaphore.html"
->SDL_CreateSemaphore</A
->.</DT
-><DT
-><A
-HREF="sdlsemwait.html"
->SDL_SemWait</A
->&nbsp;--&nbsp;Lock a semaphore and suspend the thread if the semaphore value is zero.</DT
-><DT
-><A
-HREF="sdlsemtrywait.html"
->SDL_SemTryWait</A
->&nbsp;--&nbsp;Attempt to lock a semaphore but don't suspend the thread.</DT
-><DT
-><A
-HREF="sdlsemwaittimeout.html"
->SDL_SemWaitTimeout</A
->&nbsp;--&nbsp;Lock a semaphore, but only wait up to a specified maximum time.</DT
-><DT
-><A
-HREF="sdlsempost.html"
->SDL_SemPost</A
->&nbsp;--&nbsp;Unlock a semaphore.</DT
-><DT
-><A
-HREF="sdlsemvalue.html"
->SDL_SemValue</A
->&nbsp;--&nbsp;Return the current value of a semaphore.</DT
-><DT
-><A
-HREF="sdlcreatecond.html"
->SDL_CreateCond</A
->&nbsp;--&nbsp;Create a condition variable</DT
-><DT
-><A
-HREF="sdldestroycond.html"
->SDL_DestroyCond</A
->&nbsp;--&nbsp;Destroy a condition variable</DT
-><DT
-><A
-HREF="sdlcondsignal.html"
->SDL_CondSignal</A
->&nbsp;--&nbsp;Restart a thread wait on a condition variable</DT
-><DT
-><A
-HREF="sdlcondbroadcast.html"
->SDL_CondBroadcast</A
->&nbsp;--&nbsp;Restart all threads waiting on a condition variable</DT
-><DT
-><A
-HREF="sdlcondwait.html"
->SDL_CondWait</A
->&nbsp;--&nbsp;Wait on a condition variable</DT
-><DT
-><A
-HREF="sdlcondwaittimeout.html"
->SDL_CondWaitTimeout</A
->&nbsp;--&nbsp;Wait on a condition variable, with timeout</DT
-></DL
-></DIV
-><P
->SDL provides functions for creating threads, mutexes, semphores and condition variables.</P
-><P
->In general, you must be very aware of concurrency and data integrity issues
-when writing multi-threaded programs.  Some good guidelines include:
-<P
-></P
-><UL
-><LI
-><P
->Don't call SDL video/event functions from separate threads</P
-></LI
-><LI
-><P
->Don't use any library functions in separate threads</P
-></LI
-><LI
-><P
->Don't perform any memory management in separate threads</P
-></LI
-><LI
-><P
->Lock global variables which may be accessed by multiple threads</P
-></LI
-><LI
-><P
->Never terminate threads, always set a flag and wait for them to quit</P
-></LI
-><LI
-><P
->Think very carefully about all possible ways your code may interact</P
-></LI
-></UL
-></P
-><DIV
-CLASS="NOTE"
-><BLOCKQUOTE
-CLASS="NOTE"
-><P
-><B
->Note: </B
->SDL's threading is not implemented on MacOS, due to that lack of preemptive thread support (Mac OS X dos nt suffer from this problem)</P
-></BLOCKQUOTE
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcdtrack.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlcreatethread.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CDtrack</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="reference.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_CreateThread</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/time.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/time.html
deleted file mode 100644
index 854b7cb57e9..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/time.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Time</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Reference"
-HREF="reference.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_CondWaitTimeout"
-HREF="sdlcondwaittimeout.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetTicks"
-HREF="sdlgetticks.html"><META
-NAME="KEYWORD"
-CONTENT="time"><META
-NAME="KEYWORD"
-CONTENT="function"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlcondwaittimeout.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetticks.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="TIME"
-></A
->Chapter 13. Time</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="sdlgetticks.html"
->SDL_GetTicks</A
->&nbsp;--&nbsp;Get the number of milliseconds since the SDL library initialization.</DT
-><DT
-><A
-HREF="sdldelay.html"
->SDL_Delay</A
->&nbsp;--&nbsp;Wait a specified number of milliseconds before returning.</DT
-><DT
-><A
-HREF="sdladdtimer.html"
->SDL_AddTimer</A
->&nbsp;--&nbsp;Add a timer which will call a callback after the specified number of milliseconds has
-elapsed.</DT
-><DT
-><A
-HREF="sdlremovetimer.html"
->SDL_RemoveTimer</A
->&nbsp;--&nbsp;Remove a timer which was added with
-<A
-HREF="sdladdtimer.html"
->SDL_AddTimer</A
->.</DT
-><DT
-><A
-HREF="sdlsettimer.html"
->SDL_SetTimer</A
->&nbsp;--&nbsp;Set a callback to run after the specified number of milliseconds has
-elapsed.</DT
-></DL
-></DIV
-><P
->SDL provides several cross-platform functions for dealing with time.
-It provides a way to get the current time, a way to wait a little while,
-and a simple timer mechanism.  These functions give you two ways of moving an
-object every x milliseconds:
-
-<P
-></P
-><UL
-><LI
-><P
->Use a timer callback function.  This may have the bad effect that it runs in a seperate thread or uses alarm signals, but it's easier to implement.</P
-></LI
-><LI
-><P
->Or you can get the number of milliseconds passed, and move the object if, for example, 30 ms passed.</P
-></LI
-></UL
->&#13;</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlcondwaittimeout.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetticks.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_CondWaitTimeout</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="reference.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetTicks</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/video.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/video.html
deleted file mode 100644
index 9b1434e62da..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/video.html
+++ /dev/null
@@ -1,507 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Video</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Reference"
-HREF="reference.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_envvars"
-HREF="sdlenvvars.html"><LINK
-REL="NEXT"
-TITLE="SDL_GetVideoSurface"
-HREF="sdlgetvideosurface.html"><META
-NAME="KEYWORD"
-CONTENT="video"><META
-NAME="KEYWORD"
-CONTENT="function"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdlenvvars.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlgetvideosurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="VIDEO"
-></A
->Chapter 6. Video</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="sdlgetvideosurface.html"
->SDL_GetVideoSurface</A
->&nbsp;--&nbsp;returns a pointer to the current display surface</DT
-><DT
-><A
-HREF="sdlgetvideoinfo.html"
->SDL_GetVideoInfo</A
->&nbsp;--&nbsp;returns a pointer to information about the video hardware</DT
-><DT
-><A
-HREF="sdlvideodrivername.html"
->SDL_VideoDriverName</A
->&nbsp;--&nbsp;Obtain the name of the video driver</DT
-><DT
-><A
-HREF="sdllistmodes.html"
->SDL_ListModes</A
->&nbsp;--&nbsp;Returns a pointer to an array of available screen dimensions for 
-the given format and video flags</DT
-><DT
-><A
-HREF="sdlvideomodeok.html"
->SDL_VideoModeOK</A
->&nbsp;--&nbsp;Check to see if a particular video mode is supported.</DT
-><DT
-><A
-HREF="sdlsetvideomode.html"
->SDL_SetVideoMode</A
->&nbsp;--&nbsp;Set up a video mode with the specified width, height and bits-per-pixel.</DT
-><DT
-><A
-HREF="sdlupdaterect.html"
->SDL_UpdateRect</A
->&nbsp;--&nbsp;Makes sure the given area is updated on the given screen.</DT
-><DT
-><A
-HREF="sdlupdaterects.html"
->SDL_UpdateRects</A
->&nbsp;--&nbsp;Makes sure the given list of rectangles is updated on the given screen.</DT
-><DT
-><A
-HREF="sdlflip.html"
->SDL_Flip</A
->&nbsp;--&nbsp;Swaps screen buffers</DT
-><DT
-><A
-HREF="sdlsetcolors.html"
->SDL_SetColors</A
->&nbsp;--&nbsp;Sets a portion of the colormap for the given 8-bit surface.</DT
-><DT
-><A
-HREF="sdlsetpalette.html"
->SDL_SetPalette</A
->&nbsp;--&nbsp;Sets the colors in the palette of an 8-bit surface.</DT
-><DT
-><A
-HREF="sdlsetgamma.html"
->SDL_SetGamma</A
->&nbsp;--&nbsp;Sets the color gamma function for the display</DT
-><DT
-><A
-HREF="sdlgetgammaramp.html"
->SDL_GetGammaRamp</A
->&nbsp;--&nbsp;Gets the color gamma lookup tables for the display</DT
-><DT
-><A
-HREF="sdlsetgammaramp.html"
->SDL_SetGammaRamp</A
->&nbsp;--&nbsp;Sets the color gamma lookup tables for the display</DT
-><DT
-><A
-HREF="sdlmaprgb.html"
->SDL_MapRGB</A
->&nbsp;--&nbsp;Map a RGB color value to a pixel format.</DT
-><DT
-><A
-HREF="sdlmaprgba.html"
->SDL_MapRGBA</A
->&nbsp;--&nbsp;Map a RGBA color value to a pixel format.</DT
-><DT
-><A
-HREF="sdlgetrgb.html"
->SDL_GetRGB</A
->&nbsp;--&nbsp;Get RGB values from a pixel in the specified pixel format.</DT
-><DT
-><A
-HREF="sdlgetrgba.html"
->SDL_GetRGBA</A
->&nbsp;--&nbsp;Get RGBA values from a pixel in the specified pixel format.</DT
-><DT
-><A
-HREF="sdlcreatergbsurface.html"
->SDL_CreateRGBSurface</A
->&nbsp;--&nbsp;Create an empty SDL_Surface</DT
-><DT
-><A
-HREF="sdlcreatergbsurfacefrom.html"
->SDL_CreateRGBSurfaceFrom</A
->&nbsp;--&nbsp;Create an SDL_Surface from pixel data</DT
-><DT
-><A
-HREF="sdlfreesurface.html"
->SDL_FreeSurface</A
->&nbsp;--&nbsp;Frees (deletes) a SDL_Surface</DT
-><DT
-><A
-HREF="sdllocksurface.html"
->SDL_LockSurface</A
->&nbsp;--&nbsp;Lock a surface for directly access.</DT
-><DT
-><A
-HREF="sdlunlocksurface.html"
->SDL_UnlockSurface</A
->&nbsp;--&nbsp;Unlocks a previously locked surface.</DT
-><DT
-><A
-HREF="sdlloadbmp.html"
->SDL_LoadBMP</A
->&nbsp;--&nbsp;Load a Windows BMP file into an SDL_Surface.</DT
-><DT
-><A
-HREF="sdlsavebmp.html"
->SDL_SaveBMP</A
->&nbsp;--&nbsp;Save an SDL_Surface as a Windows BMP file.</DT
-><DT
-><A
-HREF="sdlsetcolorkey.html"
->SDL_SetColorKey</A
->&nbsp;--&nbsp;Sets the color key (transparent pixel) in a blittable surface and
-RLE acceleration.</DT
-><DT
-><A
-HREF="sdlsetalpha.html"
->SDL_SetAlpha</A
->&nbsp;--&nbsp;Adjust the alpha properties of a surface</DT
-><DT
-><A
-HREF="sdlsetcliprect.html"
->SDL_SetClipRect</A
->&nbsp;--&nbsp;Sets the clipping rectangle for a surface.</DT
-><DT
-><A
-HREF="sdlgetcliprect.html"
->SDL_GetClipRect</A
->&nbsp;--&nbsp;Gets the clipping rectangle for a surface.</DT
-><DT
-><A
-HREF="sdlconvertsurface.html"
->SDL_ConvertSurface</A
->&nbsp;--&nbsp;Converts a surface to the same format as another surface.</DT
-><DT
-><A
-HREF="sdlblitsurface.html"
->SDL_BlitSurface</A
->&nbsp;--&nbsp;This performs a fast blit from the source surface to the destination surface.</DT
-><DT
-><A
-HREF="sdlfillrect.html"
->SDL_FillRect</A
->&nbsp;--&nbsp;This function performs a fast fill of the given rectangle with some color</DT
-><DT
-><A
-HREF="sdldisplayformat.html"
->SDL_DisplayFormat</A
->&nbsp;--&nbsp;Convert a surface to the display format</DT
-><DT
-><A
-HREF="sdldisplayformatalpha.html"
->SDL_DisplayFormatAlpha</A
->&nbsp;--&nbsp;Convert a surface to the display format</DT
-><DT
-><A
-HREF="sdlwarpmouse.html"
->SDL_WarpMouse</A
->&nbsp;--&nbsp;Set the position of the mouse cursor.</DT
-><DT
-><A
-HREF="sdlcreatecursor.html"
->SDL_CreateCursor</A
->&nbsp;--&nbsp;Creates a new mouse cursor.</DT
-><DT
-><A
-HREF="sdlfreecursor.html"
->SDL_FreeCursor</A
->&nbsp;--&nbsp;Frees a cursor created with SDL_CreateCursor.</DT
-><DT
-><A
-HREF="sdlsetcursor.html"
->SDL_SetCursor</A
->&nbsp;--&nbsp;Set the currently active mouse cursor.</DT
-><DT
-><A
-HREF="sdlgetcursor.html"
->SDL_GetCursor</A
->&nbsp;--&nbsp;Get the currently active mouse cursor.</DT
-><DT
-><A
-HREF="sdlshowcursor.html"
->SDL_ShowCursor</A
->&nbsp;--&nbsp;Toggle whether or not the cursor is shown on the screen.</DT
-><DT
-><A
-HREF="sdlglloadlibrary.html"
->SDL_GL_LoadLibrary</A
->&nbsp;--&nbsp;Specify an OpenGL library</DT
-><DT
-><A
-HREF="sdlglgetprocaddress.html"
->SDL_GL_GetProcAddress</A
->&nbsp;--&nbsp;Get the address of a GL function</DT
-><DT
-><A
-HREF="sdlglgetattribute.html"
->SDL_GL_GetAttribute</A
->&nbsp;--&nbsp;Get the value of a special SDL/OpenGL attribute</DT
-><DT
-><A
-HREF="sdlglsetattribute.html"
->SDL_GL_SetAttribute</A
->&nbsp;--&nbsp;Set a special SDL/OpenGL attribute</DT
-><DT
-><A
-HREF="sdlglswapbuffers.html"
->SDL_GL_SwapBuffers</A
->&nbsp;--&nbsp;Swap OpenGL framebuffers/Update Display</DT
-><DT
-><A
-HREF="sdlcreateyuvoverlay.html"
->SDL_CreateYUVOverlay</A
->&nbsp;--&nbsp;Create a YUV video overlay</DT
-><DT
-><A
-HREF="sdllockyuvoverlay.html"
->SDL_LockYUVOverlay</A
->&nbsp;--&nbsp;Lock an overlay</DT
-><DT
-><A
-HREF="sdlunlockyuvoverlay.html"
->SDL_UnlockYUVOverlay</A
->&nbsp;--&nbsp;Unlock an overlay</DT
-><DT
-><A
-HREF="sdldisplayyuvoverlay.html"
->SDL_DisplayYUVOverlay</A
->&nbsp;--&nbsp;Blit the overlay to the display</DT
-><DT
-><A
-HREF="sdlfreeyuvoverlay.html"
->SDL_FreeYUVOverlay</A
->&nbsp;--&nbsp;Free a YUV video overlay</DT
-><DT
-><A
-HREF="sdlglattr.html"
->SDL_GLattr</A
->&nbsp;--&nbsp;SDL GL Attributes</DT
-><DT
-><A
-HREF="sdlrect.html"
->SDL_Rect</A
->&nbsp;--&nbsp;Defines a rectangular area</DT
-><DT
-><A
-HREF="sdlcolor.html"
->SDL_Color</A
->&nbsp;--&nbsp;Format independent color description</DT
-><DT
-><A
-HREF="sdlpalette.html"
->SDL_Palette</A
->&nbsp;--&nbsp;Color palette for 8-bit pixel formats</DT
-><DT
-><A
-HREF="sdlpixelformat.html"
->SDL_PixelFormat</A
->&nbsp;--&nbsp;Stores surface format information</DT
-><DT
-><A
-HREF="sdlsurface.html"
->SDL_Surface</A
->&nbsp;--&nbsp;Graphical Surface Structure</DT
-><DT
-><A
-HREF="sdlvideoinfo.html"
->SDL_VideoInfo</A
->&nbsp;--&nbsp;Video Target information</DT
-><DT
-><A
-HREF="sdloverlay.html"
->SDL_Overlay</A
->&nbsp;--&nbsp;YUV video overlay</DT
-></DL
-></DIV
-><P
->SDL presents a very simple interface to the display framebuffer.  The
-framebuffer is represented as an offscreen surface to which you can write
-directly.  If you want the screen to show what you have written, call the <A
-HREF="sdlupdaterects.html"
->update</A
-> function which will
-guarantee that the desired portion of the screen is updated.</P
-><P
->Before you call any of the SDL video functions, you must first call
-<SPAN
-CLASS="TOKEN"
->SDL_Init(SDL_INIT_VIDEO)</SPAN
->, which initializes the video
-and events in the SDL library.  Check the return code, which should be
-<SPAN
-CLASS="RETURNVALUE"
->0</SPAN
->, to see if there were any errors in starting up.</P
-><P
->If you use both sound and video in your application, you need to call
-<SPAN
-CLASS="TOKEN"
->SDL_Init(SDL_INIT_AUDIO | SDL_INIT_VIDEO)</SPAN
-> before opening the
-sound device, otherwise under Win32 DirectX, you won't be able to set
-full-screen display modes.</P
-><P
->After you have initialized the library, you can start up the video display in a
-number of ways.  The easiest way is to pick a common screen resolution and
-depth and just initialize the video, checking for errors.  You will probably
-get what you want, but SDL may be emulating your requested mode and converting
-the display on update.  The best way is to
-<A
-HREF="sdlgetvideoinfo.html"
->query</A
->, for the best
-video mode closest to the desired one, and then
-<A
-HREF="sdldisplayformat.html"
->convert</A
->
-your images to that pixel format.</P
-><P
->SDL currently supports any bit depth &gt;= 8 bits per pixel.  8 bpp formats are
-considered 8-bit palettized modes, while 12, 15, 16, 24, and 32 bits per pixel
-are considered "packed pixel" modes, meaning each pixel contains the RGB color
-components packed in the bits of the pixel.</P
-><P
->After you have initialized your video mode, you can take the surface that was
-returned, and write to it like any other framebuffer, calling the update
-routine as you go.</P
-><P
->When you have finished your video access and are ready to quit your
-application, you should call "<SPAN
-CLASS="TOKEN"
->SDL_Quit()</SPAN
->" to shutdown the
-video and events.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdlenvvars.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlgetvideosurface.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_envvars</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="reference.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_GetVideoSurface</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/wm.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/wm.html
deleted file mode 100644
index f53a349c165..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/html/wm.html
+++ /dev/null
@@ -1,188 +0,0 @@
-<HTML
-><HEAD
-><TITLE
->Window Management</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
-"><LINK
-REL="HOME"
-TITLE="SDL Library Documentation"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="SDL Reference"
-HREF="reference.html"><LINK
-REL="PREVIOUS"
-TITLE="SDL_Overlay"
-HREF="sdloverlay.html"><LINK
-REL="NEXT"
-TITLE="SDL_WM_SetCaption"
-HREF="sdlwmsetcaption.html"><META
-NAME="KEYWORD"
-CONTENT="wm"><META
-NAME="KEYWORD"
-CONTENT="function"></HEAD
-><BODY
-CLASS="CHAPTER"
-BGCOLOR="#FFF8DC"
-TEXT="#000000"
-LINK="#0000ee"
-VLINK="#551a8b"
-ALINK="#ff0000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->SDL Library Documentation</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="sdloverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="sdlwmsetcaption.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="WM"
-></A
->Chapter 7. Window Management</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="sdlwmsetcaption.html"
->SDL_WM_SetCaption</A
->&nbsp;--&nbsp;Sets the window tile and icon name.</DT
-><DT
-><A
-HREF="sdlwmgetcaption.html"
->SDL_WM_GetCaption</A
->&nbsp;--&nbsp;Gets the window title and icon name.</DT
-><DT
-><A
-HREF="sdlwmseticon.html"
->SDL_WM_SetIcon</A
->&nbsp;--&nbsp;Sets the icon for the display window.</DT
-><DT
-><A
-HREF="sdlwmiconifywindow.html"
->SDL_WM_IconifyWindow</A
->&nbsp;--&nbsp;Iconify/Minimise the window</DT
-><DT
-><A
-HREF="sdlwmtogglefullscreen.html"
->SDL_WM_ToggleFullScreen</A
->&nbsp;--&nbsp;Toggles fullscreen mode</DT
-><DT
-><A
-HREF="sdlwmgrabinput.html"
->SDL_WM_GrabInput</A
->&nbsp;--&nbsp;Grabs mouse and keyboard input.</DT
-></DL
-></DIV
-><P
->SDL provides a small set of window management functions which allow applications to change their title and toggle from windowed mode to fullscreen (if available)</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="sdloverlay.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="sdlwmsetcaption.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->SDL_Overlay</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="reference.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->SDL_WM_SetCaption</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/images/rainbow.gif b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/images/rainbow.gif
deleted file mode 100644
index 07eb184f7e0..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/images/rainbow.gif and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/index.html b/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/index.html
deleted file mode 100644
index 7d572533e21..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/docs/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//Norman Walsh//DTD DocBook HTML 1.0//EN">
-<HTML>
-<HEAD><TITLE>Simple DirectMedia Layer Introduction</TITLE></HEAD>
-<BODY BGCOLOR="#FFF8DC" TEXT="#000000" LINK="#0000ee" VLINK="#551a8b" ALINK="#ff0000">
-<DIV CLASS="NAVHEADER">
-<HR ALIGN="LEFT" WIDTH="100%">
-</DIV>
-<DIV CLASS="PREFACE">
-<H2><A NAME="AEN8">Simple DirectMedia Layer Introduction</A></H2>
-<P>
-This library is designed to make it easy to write games that run on many
-different platforms using the various native high-performance media interfaces,
-(for video, audio, etc) and presenting a single source-code level API to
-your application.  This is a fairly low level API, but using this, completely
-portable applications can be written with a great deal of flexibility.
-</P><P>
-An introduction to SDL can be found online at:
-<A HREF="http://www.libsdl.org/intro.php" TARGET="_top">
-         http://www.libsdl.org/intro.php</A>
-</P><P>
-Tutorials on a variety of topics can be found online at:
-<A HREF="http://www.libsdl.org/tutorials.php" TARGET="_top">
-         http://www.libsdl.org/tutorials.php</A>
-</P><P>
-Documentation in Wiki form can be found online at:
-<A HREF="http://www.libsdl.org/cgi/docwiki.cgi/" TARGET="_top">
-         http://www.libsdl.org/cgi/docwiki.cgi/</A>
-</P><P>
-Enjoy!
-</P><P>
-&nbsp;&nbsp;&nbsp; Sam Lantinga
-<TT CLASS="EMAIL">&#60;<A HREF="mailto:slouken@libsdl.org"><A HREF="mailto:slouken@libsdl.org" TARGET="_top" >slouken@libsdl.org</A></A>&#62;</TT>
-</P> <P>
-<br><br><HR>
-<H1>Table of Contents</H1>
-<UL>
-<LI><A HREF="html/index.html">Full Table of Contents</A></LI>
-<LI><A HREF="html/guide.html">The SDL Guide</A></LI>
-<LI><A HREF="html/reference.html">The SDL Reference</A></LI>
-<UL>
-<LI><A HREF="html/general.html">Initialization</A></LI>
-<LI><A HREF="html/video.html">Video</A></LI>
-<LI><A HREF="html/wm.html">Window Manager</A></LI>
-<LI><A HREF="html/event.html">Event Handling</A></LI>
-<LI><A HREF="html/joystick.html">Joystick</A></LI>
-<LI><A HREF="html/audio.html">Audio</A></LI>
-<LI><A HREF="html/cdrom.html">CDROM</A></LI>
-<LI><A HREF="html/thread.html">Threads</A></LI>
-<LI><A HREF="html/time.html">Timers</A></LI>
-</UL>
-</UL>
-</DIV
-></BODY
-></HTML
->
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL.h
deleted file mode 100644
index 119ed7ff146..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL.h
- *  Main include header for the SDL library
- */
-
-#ifndef _SDL_H
-#define _SDL_H
-
-#include "SDL_main.h"
-#include "SDL_stdinc.h"
-#include "SDL_audio.h"
-#include "SDL_cdrom.h"
-#include "SDL_cpuinfo.h"
-#include "SDL_endian.h"
-#include "SDL_error.h"
-#include "SDL_events.h"
-#include "SDL_loadso.h"
-#include "SDL_mutex.h"
-#include "SDL_rwops.h"
-#include "SDL_thread.h"
-#include "SDL_timer.h"
-#include "SDL_video.h"
-#include "SDL_version.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @file SDL.h
- *  @note As of version 0.5, SDL is loaded dynamically into the application
- */
-
-/** @name SDL_INIT Flags
- *  These are the flags which may be passed to SDL_Init() -- you should
- *  specify the subsystems which you will be using in your application.
- */
-/*@{*/
-#define	SDL_INIT_TIMER		0x00000001
-#define SDL_INIT_AUDIO		0x00000010
-#define SDL_INIT_VIDEO		0x00000020
-#define SDL_INIT_CDROM		0x00000100
-#define SDL_INIT_JOYSTICK	0x00000200
-#define SDL_INIT_NOPARACHUTE	0x00100000	/**< Don't catch fatal signals */
-#define SDL_INIT_EVENTTHREAD	0x01000000	/**< Not supported on all OS's */
-#define SDL_INIT_EVERYTHING	0x0000FFFF
-/*@}*/
-
-/** This function loads the SDL dynamically linked library and initializes 
- *  the subsystems specified by 'flags' (and those satisfying dependencies)
- *  Unless the SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
- *  signal handlers for some commonly ignored fatal signals (like SIGSEGV)
- */
-extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
-
-/** This function initializes specific SDL subsystems */
-extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
-
-/** This function cleans up specific SDL subsystems */
-extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
-
-/** This function returns mask of the specified subsystems which have
- *  been initialized.
- *  If 'flags' is 0, it returns a mask of all initialized subsystems.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
-
-/** This function cleans up all initialized subsystems and unloads the
- *  dynamically linked library.  You should call it upon all exit conditions.
- */
-extern DECLSPEC void SDLCALL SDL_Quit(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_H */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_active.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_active.h
deleted file mode 100644
index 0ae92f2d568..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_active.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_active.h
- *  Include file for SDL application focus event handling 
- */
-
-#ifndef _SDL_active_h
-#define _SDL_active_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @name The available application states */
-/*@{*/
-#define SDL_APPMOUSEFOCUS	0x01		/**< The app has mouse coverage */
-#define SDL_APPINPUTFOCUS	0x02		/**< The app has input focus */
-#define SDL_APPACTIVE		0x04		/**< The application is active */
-/*@}*/
-
-/* Function prototypes */
-/** 
- * This function returns the current state of the application, which is a
- * bitwise combination of SDL_APPMOUSEFOCUS, SDL_APPINPUTFOCUS, and
- * SDL_APPACTIVE.  If SDL_APPACTIVE is set, then the user is able to
- * see your application, otherwise it has been iconified or disabled.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_active_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_audio.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_audio.h
deleted file mode 100644
index 3a8e7fa8b85..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_audio.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_audio.h
- *  Access to the raw audio mixing buffer for the SDL library
- */
-
-#ifndef _SDL_audio_h
-#define _SDL_audio_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_endian.h"
-#include "SDL_mutex.h"
-#include "SDL_thread.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * When filling in the desired audio spec structure,
- * - 'desired->freq' should be the desired audio frequency in samples-per-second.
- * - 'desired->format' should be the desired audio format.
- * - 'desired->samples' is the desired size of the audio buffer, in samples.
- *     This number should be a power of two, and may be adjusted by the audio
- *     driver to a value more suitable for the hardware.  Good values seem to
- *     range between 512 and 8096 inclusive, depending on the application and
- *     CPU speed.  Smaller values yield faster response time, but can lead
- *     to underflow if the application is doing heavy processing and cannot
- *     fill the audio buffer in time.  A stereo sample consists of both right
- *     and left channels in LR ordering.
- *     Note that the number of samples is directly related to time by the
- *     following formula:  ms = (samples*1000)/freq
- * - 'desired->size' is the size in bytes of the audio buffer, and is
- *     calculated by SDL_OpenAudio().
- * - 'desired->silence' is the value used to set the buffer to silence,
- *     and is calculated by SDL_OpenAudio().
- * - 'desired->callback' should be set to a function that will be called
- *     when the audio device is ready for more data.  It is passed a pointer
- *     to the audio buffer, and the length in bytes of the audio buffer.
- *     This function usually runs in a separate thread, and so you should
- *     protect data structures that it accesses by calling SDL_LockAudio()
- *     and SDL_UnlockAudio() in your code.
- * - 'desired->userdata' is passed as the first parameter to your callback
- *     function.
- *
- * @note The calculated values in this structure are calculated by SDL_OpenAudio()
- *
- */
-typedef struct SDL_AudioSpec {
-	int freq;		/**< DSP frequency -- samples per second */
-	Uint16 format;		/**< Audio data format */
-	Uint8  channels;	/**< Number of channels: 1 mono, 2 stereo */
-	Uint8  silence;		/**< Audio buffer silence value (calculated) */
-	Uint16 samples;		/**< Audio buffer size in samples (power of 2) */
-	Uint16 padding;		/**< Necessary for some compile environments */
-	Uint32 size;		/**< Audio buffer size in bytes (calculated) */
-	/**
-	 *  This function is called when the audio device needs more data.
-	 *
-	 *  @param[out] stream	A pointer to the audio data buffer
-	 *  @param[in]  len	The length of the audio buffer in bytes.
-	 *
-	 *  Once the callback returns, the buffer will no longer be valid.
-	 *  Stereo samples are stored in a LRLRLR ordering.
-	 */
-	void (SDLCALL *callback)(void *userdata, Uint8 *stream, int len);
-	void  *userdata;
-} SDL_AudioSpec;
-
-/**
- *  @name Audio format flags
- *  defaults to LSB byte order
- */
-/*@{*/
-#define AUDIO_U8	0x0008	/**< Unsigned 8-bit samples */
-#define AUDIO_S8	0x8008	/**< Signed 8-bit samples */
-#define AUDIO_U16LSB	0x0010	/**< Unsigned 16-bit samples */
-#define AUDIO_S16LSB	0x8010	/**< Signed 16-bit samples */
-#define AUDIO_U16MSB	0x1010	/**< As above, but big-endian byte order */
-#define AUDIO_S16MSB	0x9010	/**< As above, but big-endian byte order */
-#define AUDIO_U16	AUDIO_U16LSB
-#define AUDIO_S16	AUDIO_S16LSB
-
-/**
- *  @name Native audio byte ordering
- */
-/*@{*/
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define AUDIO_U16SYS	AUDIO_U16LSB
-#define AUDIO_S16SYS	AUDIO_S16LSB
-#else
-#define AUDIO_U16SYS	AUDIO_U16MSB
-#define AUDIO_S16SYS	AUDIO_S16MSB
-#endif
-/*@}*/
-
-/*@}*/
-
-
-/** A structure to hold a set of audio conversion filters and buffers */
-typedef struct SDL_AudioCVT {
-	int needed;			/**< Set to 1 if conversion possible */
-	Uint16 src_format;		/**< Source audio format */
-	Uint16 dst_format;		/**< Target audio format */
-	double rate_incr;		/**< Rate conversion increment */
-	Uint8 *buf;			/**< Buffer to hold entire audio data */
-	int    len;			/**< Length of original audio buffer */
-	int    len_cvt;			/**< Length of converted audio buffer */
-	int    len_mult;		/**< buffer must be len*len_mult big */
-	double len_ratio; 	/**< Given len, final size is len*len_ratio */
-	void (SDLCALL *filters[10])(struct SDL_AudioCVT *cvt, Uint16 format);
-	int filter_index;		/**< Current audio conversion function */
-} SDL_AudioCVT;
-
-
-/* Function prototypes */
-
-/**
- * @name Audio Init and Quit
- * These functions are used internally, and should not be used unless you
- * have a specific need to specify the audio driver you want to use.
- * You should normally use SDL_Init() or SDL_InitSubSystem().
- */
-/*@{*/
-extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
-extern DECLSPEC void SDLCALL SDL_AudioQuit(void);
-/*@}*/
-
-/**
- * This function fills the given character buffer with the name of the
- * current audio driver, and returns a pointer to it if the audio driver has
- * been initialized.  It returns NULL if no driver has been initialized.
- */
-extern DECLSPEC char * SDLCALL SDL_AudioDriverName(char *namebuf, int maxlen);
-
-/**
- * This function opens the audio device with the desired parameters, and
- * returns 0 if successful, placing the actual hardware parameters in the
- * structure pointed to by 'obtained'.  If 'obtained' is NULL, the audio
- * data passed to the callback function will be guaranteed to be in the
- * requested format, and will be automatically converted to the hardware
- * audio format if necessary.  This function returns -1 if it failed 
- * to open the audio device, or couldn't set up the audio thread.
- *
- * The audio device starts out playing silence when it's opened, and should
- * be enabled for playing by calling SDL_PauseAudio(0) when you are ready
- * for your audio callback function to be called.  Since the audio driver
- * may modify the requested size of the audio buffer, you should allocate
- * any local mixing buffers after you open the audio device.
- *
- * @sa SDL_AudioSpec
- */
-extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained);
-
-typedef enum {
-	SDL_AUDIO_STOPPED = 0,
-	SDL_AUDIO_PLAYING,
-	SDL_AUDIO_PAUSED
-} SDL_audiostatus;
-
-/** Get the current audio state */
-extern DECLSPEC SDL_audiostatus SDLCALL SDL_GetAudioStatus(void);
-
-/**
- * This function pauses and unpauses the audio callback processing.
- * It should be called with a parameter of 0 after opening the audio
- * device to start playing sound.  This is so you can safely initialize
- * data for your callback function after opening the audio device.
- * Silence will be written to the audio device during the pause.
- */
-extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);
-
-/**
- * This function loads a WAVE from the data source, automatically freeing
- * that source if 'freesrc' is non-zero.  For example, to load a WAVE file,
- * you could do:
- *	@code SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...); @endcode
- *
- * If this function succeeds, it returns the given SDL_AudioSpec,
- * filled with the audio data format of the wave data, and sets
- * 'audio_buf' to a malloc()'d buffer containing the audio data,
- * and sets 'audio_len' to the length of that audio buffer, in bytes.
- * You need to free the audio buffer with SDL_FreeWAV() when you are 
- * done with it.
- *
- * This function returns NULL and sets the SDL error message if the 
- * wave file cannot be opened, uses an unknown data format, or is 
- * corrupt.  Currently raw and MS-ADPCM WAVE files are supported.
- */
-extern DECLSPEC SDL_AudioSpec * SDLCALL SDL_LoadWAV_RW(SDL_RWops *src, int freesrc, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len);
-
-/** Compatibility convenience function -- loads a WAV from a file */
-#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \
-	SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len)
-
-/**
- * This function frees data previously allocated with SDL_LoadWAV_RW()
- */
-extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 *audio_buf);
-
-/**
- * This function takes a source format and rate and a destination format
- * and rate, and initializes the 'cvt' structure with information needed
- * by SDL_ConvertAudio() to convert a buffer of audio data from one format
- * to the other.
- *
- * @return This function returns 0, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT *cvt,
-		Uint16 src_format, Uint8 src_channels, int src_rate,
-		Uint16 dst_format, Uint8 dst_channels, int dst_rate);
-
-/**
- * Once you have initialized the 'cvt' structure using SDL_BuildAudioCVT(),
- * created an audio buffer cvt->buf, and filled it with cvt->len bytes of
- * audio data in the source format, this function will convert it in-place
- * to the desired format.
- * The data conversion may expand the size of the audio data, so the buffer
- * cvt->buf should be allocated after the cvt structure is initialized by
- * SDL_BuildAudioCVT(), and should be cvt->len*cvt->len_mult bytes long.
- */
-extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT *cvt);
-
-
-#define SDL_MIX_MAXVOLUME 128
-/**
- * This takes two audio buffers of the playing audio format and mixes
- * them, performing addition, volume adjustment, and overflow clipping.
- * The volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME
- * for full audio volume.  Note this does not change hardware volume.
- * This is provided for convenience -- you can mix your own audio data.
- */
-extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 *dst, const Uint8 *src, Uint32 len, int volume);
-
-/**
- * @name Audio Locks
- * The lock manipulated by these functions protects the callback function.
- * During a LockAudio/UnlockAudio pair, you can be guaranteed that the
- * callback function is not running.  Do not call these from the callback
- * function or you will cause deadlock.
- */
-/*@{*/
-extern DECLSPEC void SDLCALL SDL_LockAudio(void);
-extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);
-/*@}*/
-
-/**
- * This function shuts down audio processing and closes the audio device.
- */
-extern DECLSPEC void SDLCALL SDL_CloseAudio(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_audio_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_byteorder.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_byteorder.h
deleted file mode 100644
index 9b93cd69a30..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_byteorder.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_byteorder.h
- *  @deprecated Use SDL_endian.h instead
- */
-
-/* DEPRECATED */
-#include "SDL_endian.h"
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_cdrom.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_cdrom.h
deleted file mode 100644
index fff5cfa1584..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_cdrom.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_cdrom.h
- *  This is the CD-audio control API for Simple DirectMedia Layer
- */
-
-#ifndef _SDL_cdrom_h
-#define _SDL_cdrom_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  @file SDL_cdrom.h
- *  In order to use these functions, SDL_Init() must have been called
- *  with the SDL_INIT_CDROM flag.  This causes SDL to scan the system
- *  for CD-ROM drives, and load appropriate drivers.
- */
-
-/** The maximum number of CD-ROM tracks on a disk */
-#define SDL_MAX_TRACKS	99
-
-/** @name Track Types
- *  The types of CD-ROM track possible
- */
-/*@{*/
-#define SDL_AUDIO_TRACK	0x00
-#define SDL_DATA_TRACK	0x04
-/*@}*/
-
-/** The possible states which a CD-ROM drive can be in. */
-typedef enum {
-	CD_TRAYEMPTY,
-	CD_STOPPED,
-	CD_PLAYING,
-	CD_PAUSED,
-	CD_ERROR = -1
-} CDstatus;
-
-/** Given a status, returns true if there's a disk in the drive */
-#define CD_INDRIVE(status)	((int)(status) > 0)
-
-typedef struct SDL_CDtrack {
-	Uint8 id;		/**< Track number */
-	Uint8 type;		/**< Data or audio track */
-	Uint16 unused;
-	Uint32 length;		/**< Length, in frames, of this track */
-	Uint32 offset;		/**< Offset, in frames, from start of disk */
-} SDL_CDtrack;
-
-/** This structure is only current as of the last call to SDL_CDStatus() */
-typedef struct SDL_CD {
-	int id;			/**< Private drive identifier */
-	CDstatus status;	/**< Current drive status */
-
-	/** The rest of this structure is only valid if there's a CD in drive */
-        /*@{*/
-	int numtracks;		/**< Number of tracks on disk */
-	int cur_track;		/**< Current track position */
-	int cur_frame;		/**< Current frame offset within current track */
-	SDL_CDtrack track[SDL_MAX_TRACKS+1];
-        /*@}*/
-} SDL_CD;
-
-/** @name Frames / MSF Conversion Functions
- *  Conversion functions from frames to Minute/Second/Frames and vice versa
- */
-/*@{*/
-#define CD_FPS	75
-#define FRAMES_TO_MSF(f, M,S,F)	{					\
-	int value = f;							\
-	*(F) = value%CD_FPS;						\
-	value /= CD_FPS;						\
-	*(S) = value%60;						\
-	value /= 60;							\
-	*(M) = value;							\
-}
-#define MSF_TO_FRAMES(M, S, F)	((M)*60*CD_FPS+(S)*CD_FPS+(F))
-/*@}*/
-
-/* CD-audio API functions: */
-
-/**
- *  Returns the number of CD-ROM drives on the system, or -1 if
- *  SDL_Init() has not been called with the SDL_INIT_CDROM flag.
- */
-extern DECLSPEC int SDLCALL SDL_CDNumDrives(void);
-
-/**
- *  Returns a human-readable, system-dependent identifier for the CD-ROM.
- *  Example:
- *   - "/dev/cdrom"
- *   - "E:"
- *   - "/dev/disk/ide/1/master"
- */
-extern DECLSPEC const char * SDLCALL SDL_CDName(int drive);
-
-/**
- *  Opens a CD-ROM drive for access.  It returns a drive handle on success,
- *  or NULL if the drive was invalid or busy.  This newly opened CD-ROM
- *  becomes the default CD used when other CD functions are passed a NULL
- *  CD-ROM handle.
- *  Drives are numbered starting with 0.  Drive 0 is the system default CD-ROM.
- */
-extern DECLSPEC SDL_CD * SDLCALL SDL_CDOpen(int drive);
-
-/**
- *  This function returns the current status of the given drive.
- *  If the drive has a CD in it, the table of contents of the CD and current
- *  play position of the CD will be stored in the SDL_CD structure.
- */
-extern DECLSPEC CDstatus SDLCALL SDL_CDStatus(SDL_CD *cdrom);
-
-/**
- *  Play the given CD starting at 'start_track' and 'start_frame' for 'ntracks'
- *  tracks and 'nframes' frames.  If both 'ntrack' and 'nframe' are 0, play 
- *  until the end of the CD.  This function will skip data tracks.
- *  This function should only be called after calling SDL_CDStatus() to 
- *  get track information about the CD.
- *  For example:
- *      @code
- *	// Play entire CD:
- *	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
- *		SDL_CDPlayTracks(cdrom, 0, 0, 0, 0);
- *	// Play last track:
- *	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) ) {
- *		SDL_CDPlayTracks(cdrom, cdrom->numtracks-1, 0, 0, 0);
- *	}
- *	// Play first and second track and 10 seconds of third track:
- *	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
- *		SDL_CDPlayTracks(cdrom, 0, 0, 2, 10);
- *      @endcode
- *
- *  @return This function returns 0, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_CDPlayTracks(SDL_CD *cdrom,
-		int start_track, int start_frame, int ntracks, int nframes);
-
-/**
- *  Play the given CD starting at 'start' frame for 'length' frames.
- *  @return It returns 0, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_CDPlay(SDL_CD *cdrom, int start, int length);
-
-/** Pause play
- *  @return returns 0, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_CDPause(SDL_CD *cdrom);
-
-/** Resume play
- *  @return returns 0, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_CDResume(SDL_CD *cdrom);
-
-/** Stop play
- *  @return returns 0, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_CDStop(SDL_CD *cdrom);
-
-/** Eject CD-ROM
- *  @return returns 0, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_CDEject(SDL_CD *cdrom);
-
-/** Closes the handle for the CD-ROM drive */
-extern DECLSPEC void SDLCALL SDL_CDClose(SDL_CD *cdrom);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_video_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config.h
deleted file mode 100644
index a50810169ce..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-#include "SDL_platform.h"
-
-/* Add any platform that doesn't build using the configure system */
-#if defined(__DREAMCAST__)
-#include "SDL_config_dreamcast.h"
-#elif defined(__MACOS__)
-#include "SDL_config_macos.h"
-#elif defined(__MACOSX__)
-#include "SDL_config_macosx.h"
-#elif defined(__SYMBIAN32__)
-#include "SDL_config_symbian.h"  /* must be before win32! */
-#elif defined(__WIN32__)
-#include "SDL_config_win32.h"
-#elif defined(__OS2__)
-#include "SDL_config_os2.h"
-#else
-#include "SDL_config_minimal.h"
-#endif /* platform config */
-
-#endif /* _SDL_config_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_amiga.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_amiga.h
deleted file mode 100644
index 23e0861928b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_amiga.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_amiga_h
-#define _SDL_config_amiga_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_INTTYPES_H	1
-#define HAVE_SIGNAL_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_AHI	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_DUMMY	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_AMIGA	1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_DUMMY	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_AMIGA	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_AMIGA	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_CYBERGRAPHICS	1
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL	1
-
-#endif /* _SDL_config_amiga_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_dreamcast.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_dreamcast.h
deleted file mode 100644
index 07c2f081550..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_dreamcast.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_dreamcast_h
-#define _SDL_config_dreamcast_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-typedef unsigned long uintptr_t;
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_CTYPE_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_QSORT	1
-#define HAVE_ABS	1
-#define HAVE_BCOPY	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRDUP	1
-#define HAVE_INDEX	1
-#define HAVE_RINDEX	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_STRICMP	1
-#define HAVE_STRCASECMP	1
-#define HAVE_SSCANF	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_DC	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_DC	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_DC	1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_DUMMY	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_DC	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_DC	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DC	1
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-#endif /* _SDL_config_dreamcast_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_macos.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_macos.h
deleted file mode 100644
index 4ba5c22c347..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_macos.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_macos_h
-#define _SDL_config_macos_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#include <MacTypes.h>
-
-typedef SInt8	int8_t;
-typedef UInt8	uint8_t;
-typedef SInt16	int16_t;
-typedef UInt16	uint16_t;
-typedef SInt32	int32_t;
-typedef UInt32	uint32_t;
-typedef SInt64	int64_t;
-typedef UInt64	uint64_t;
-typedef unsigned long	uintptr_t;
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_CTYPE_H	1
-#define HAVE_MATH_H	1
-#define HAVE_SIGNAL_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_ABS	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_ITOA	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_SSCANF	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_SNDMGR	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#if TARGET_API_MAC_CARBON
-#define SDL_CDROM_DUMMY		1
-#else
-#define SDL_CDROM_MACOS		1
-#endif
-
-/* Enable various input drivers */
-#if TARGET_API_MAC_CARBON
-#define SDL_JOYSTICK_DUMMY	1
-#else
-#define SDL_JOYSTICK_MACOS	1
-#endif
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_MACOS	1
-
-/* Enable various threading systems */
-#define SDL_THREADS_DISABLED	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_MACOS	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_DRAWSPROCKET	1
-#define SDL_VIDEO_DRIVER_TOOLBOX	1
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL	1
-
-#endif /* _SDL_config_macos_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_macosx.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_macosx.h
deleted file mode 100644
index 295b87245ee..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_macosx.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_macosx_h
-#define _SDL_config_macosx_h
-
-#include "SDL_platform.h"
-
-/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
-#include <AvailabilityMacros.h>
-
-/* This is a set of defines to configure the SDL features */
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-/* If we specified an SDK or have a post-PowerPC chip, then alloca.h exists. */
-#if ( (MAC_OS_X_VERSION_MIN_REQUIRED >= 1030) || (!defined(__POWERPC__)) )
-#define HAVE_ALLOCA_H		1
-#endif
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_INTTYPES_H	1
-#define HAVE_STDINT_H	1
-#define HAVE_CTYPE_H	1
-#define HAVE_MATH_H	1
-#define HAVE_SIGNAL_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_UNSETENV	1
-#define HAVE_QSORT	1
-#define HAVE_ABS	1
-#define HAVE_BCOPY	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRLCPY	1
-#define HAVE_STRLCAT	1
-#define HAVE_STRDUP	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOUL	1
-#define HAVE_STRTOLL	1
-#define HAVE_STRTOULL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_STRCASECMP	1
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-#define HAVE_SIGACTION	1
-#define HAVE_SETJMP	1
-#define HAVE_NANOSLEEP	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_COREAUDIO	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_MACOSX	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_IOKIT	1
-
-/* Enable various shared object loading systems */
-#ifdef __ppc__
-/* For Mac OS X 10.2 compatibility */
-#define SDL_LOADSO_DLCOMPAT	1
-#else
-#define SDL_LOADSO_DLOPEN	1
-#endif
-
-/* Enable various threading systems */
-#define SDL_THREAD_PTHREAD	1
-#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_UNIX	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#if ((defined TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON))
-#define SDL_VIDEO_DRIVER_TOOLBOX	1
-#else
-#define SDL_VIDEO_DRIVER_QUARTZ	1
-#endif
-#define SDL_VIDEO_DRIVER_DGA 1
-#define SDL_VIDEO_DRIVER_X11 1
-#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib"
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib"
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib"
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER "/usr/X11R6/lib/libXrender.1.dylib"
-#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
-#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
-#define SDL_VIDEO_DRIVER_X11_XME 1
-#define SDL_VIDEO_DRIVER_X11_XRANDR 1
-#define SDL_VIDEO_DRIVER_X11_XV 1
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL	1
-#define SDL_VIDEO_OPENGL_GLX 1
-
-/* Disable screensaver */
-#define SDL_VIDEO_DISABLE_SCREENSAVER	1
-
-/* Enable assembly routines */
-#define SDL_ASSEMBLY_ROUTINES	1
-#ifdef __ppc__
-#define SDL_ALTIVEC_BLITTERS	1
-#endif
-
-#endif /* _SDL_config_macosx_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_minimal.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_minimal.h
deleted file mode 100644
index 002c56eadb3..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_minimal.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_minimal_h
-#define _SDL_config_minimal_h
-
-#include "SDL_platform.h"
-
-/* This is the minimal configuration that can be used to build SDL */
-
-#include <stdarg.h>
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef unsigned int size_t;
-typedef unsigned long uintptr_t;
-
-/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
-#define SDL_CDROM_DISABLED	1
-
-/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
-#define SDL_JOYSTICK_DISABLED	1
-
-/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
-#define SDL_LOADSO_DISABLED	1
-
-/* Enable the stub thread support (src/thread/generic/\*.c) */
-#define SDL_THREADS_DISABLED	1
-
-/* Enable the stub timer support (src/timer/dummy/\*.c) */
-#define SDL_TIMERS_DISABLED	1
-
-/* Enable the dummy video driver (src/video/dummy/\*.c) */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-#endif /* _SDL_config_minimal_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_nds.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_nds.h
deleted file mode 100644
index 4ac60a50452..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_nds.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_nds_h
-#define _SDL_config_nds_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-/* General platform specific identifiers */
-#include "SDL_platform.h"
-
-/* C datatypes */
-#define SDL_HAS_64BIT_TYPE 1
-
-/* Endianness */
-#define SDL_BYTEORDER 1234
-
-/* Useful headers */
-#define HAVE_ALLOCA_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_STRING_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_ICONV_H 1
-#define HAVE_SIGNAL_H 1
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRDUP 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOULL 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE_STRCASECMP 1
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_SETJMP 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_NDS	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
-#define SDL_CDROM_DISABLED	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_NDS	1
-
-/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
-#define SDL_LOADSO_DISABLED	1
-
-/* Enable the stub thread support (src/thread/generic/\*.c) */
-#define SDL_THREADS_DISABLED	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_NDS	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_NDS	1
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-#endif /* _SDL_config_nds_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_os2.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_os2.h
deleted file mode 100644
index bb40df00185..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_os2.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_os2_h
-#define _SDL_config_os2_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-typedef signed char         int8_t;
-typedef unsigned char       uint8_t;
-typedef signed short        int16_t;
-typedef unsigned short      uint16_t;
-typedef signed int          int32_t;
-typedef unsigned int        uint32_t;
-typedef unsigned int        size_t;
-typedef unsigned long       uintptr_t;
-typedef signed long long    int64_t;
-typedef unsigned long long  uint64_t;
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Use Watcom's LIBC */
-#define HAVE_LIBC 1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_SIGNAL_H 1
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRDUP 1
-#define HAVE__STRREV 1
-#define HAVE__STRUPR 1
-#define HAVE__STRLWR 1
-#define HAVE_INDEX 1
-#define HAVE_RINDEX 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
-#define HAVE__LTOA 1
-#define HAVE__UITOA 1
-#define HAVE__ULTOA 1
-#define HAVE_STRTOL 1
-#define HAVE__I64TOA 1
-#define HAVE__UI64TOA 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE_STRICMP 1
-#define HAVE_STRCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_SETJMP 1
-#define HAVE_CLOCK_GETTIME 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_DART	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_OS2	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_OS2	1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_OS2	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_OS2	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_OS2	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_OS2FS	1
-
-/* Enable OpenGL support */
-/* Nothing here yet for OS/2... :( */
-
-/* Enable assembly routines where available */
-#define SDL_ASSEMBLY_ROUTINES	1
-
-#endif /* _SDL_config_os2_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_symbian.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_symbian.h
deleted file mode 100644
index 53527b23249..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_symbian.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/*
-
-Symbian version Markus Mertama
-
-*/
-
-
-#ifndef _SDL_CONFIG_SYMBIAN_H
-#define _SDL_CONFIG_SYMBIAN_H
-
-#include "SDL_platform.h"
-
-/* This is the minimal configuration that can be used to build SDL */
-
-
-#include <stdarg.h>
-#include <stddef.h>
-
-
-#ifdef __GCCE__
-#define SYMBIAN32_GCCE
-#endif
-
-#ifndef _SIZE_T_DEFINED
-typedef unsigned int size_t;
-#endif
-
-#ifndef _INTPTR_T_DECLARED
-typedef unsigned int uintptr_t;
-#endif 
-
-#ifndef _INT8_T_DECLARED
-typedef signed char int8_t;
-#endif 
-
-#ifndef _UINT8_T_DECLARED
-typedef unsigned char uint8_t;
-#endif
-
-#ifndef _INT16_T_DECLARED
-typedef signed short int16_t;
-#endif
-
-#ifndef _UINT16_T_DECLARED
-typedef unsigned short uint16_t;
-#endif
-
-#ifndef _INT32_T_DECLARED
-typedef signed int int32_t;
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef unsigned int uint32_t;
-#endif
-
-#ifndef _INT64_T_DECLARED
-typedef signed long long int64_t;
-#endif
-
-#ifndef _UINT64_T_DECLARED
-typedef unsigned long long uint64_t;
-#endif
-
-#define SDL_AUDIO_DRIVER_EPOCAUDIO	1
-
-
-/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
-#define SDL_CDROM_DISABLED	1
-
-/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
-#define SDL_JOYSTICK_DISABLED	1
-
-/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
-#define SDL_LOADSO_DISABLED	1
-
-#define SDL_THREAD_SYMBIAN 1
-
-#define SDL_VIDEO_DRIVER_EPOC    1
-
-#define SDL_VIDEO_OPENGL 0
-
-#define SDL_HAS_64BIT_TYPE	1
-
-#define HAVE_LIBC	1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STRING_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-/*#define HAVE_ALLOCA 1*/
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE__STRUPR 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-/*#define HAVE__STRICMP 1*/
-#define HAVE__STRNICMP 1
-#define HAVE_SSCANF 1
-#define HAVE_STDARG_H	1
-#define HAVE_STDDEF_H	1
-
-
-
-#endif /* _SDL_CONFIG_SYMBIAN_H */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_win32.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_win32.h
deleted file mode 100644
index 6d019a8d9c9..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_config_win32.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_win32_h
-#define _SDL_config_win32_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#if defined(__GNUC__) || defined(__DMC__)
-#define HAVE_STDINT_H	1
-#elif defined(_MSC_VER)
-typedef signed __int8		int8_t;
-typedef unsigned __int8		uint8_t;
-typedef signed __int16		int16_t;
-typedef unsigned __int16	uint16_t;
-typedef signed __int32		int32_t;
-typedef unsigned __int32	uint32_t;
-typedef signed __int64		int64_t;
-typedef unsigned __int64	uint64_t;
-#ifndef _UINTPTR_T_DEFINED
-#ifdef  _WIN64
-typedef unsigned __int64    uintptr_t;
-#else
-typedef unsigned int   uintptr_t;
-#endif
-#define _UINTPTR_T_DEFINED
-#endif
-/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
-#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
-#define DWORD_PTR DWORD
-#endif
-#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
-#define LONG_PTR LONG
-#endif
-#else	/* !__GNUC__ && !_MSC_VER */
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-#ifndef _SIZE_T_DEFINED_
-#define _SIZE_T_DEFINED_
-typedef unsigned int size_t;
-#endif
-typedef unsigned int uintptr_t;
-#endif /* __GNUC__ || _MSC_VER */
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Enabled for SDL 1.2 (binary compatibility) */
-#define HAVE_LIBC	1
-#ifdef HAVE_LIBC
-/* Useful headers */
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STRING_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#ifndef _WIN32_WCE
-#define HAVE_SIGNAL_H 1
-#endif
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE__STRREV 1
-#define HAVE__STRUPR 1
-#define HAVE__STRLWR 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
-#define HAVE__LTOA 1
-#define HAVE__ULTOA 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE__STRICMP 1
-#define HAVE__STRNICMP 1
-#define HAVE_SSCANF 1
-#else
-#define HAVE_STDARG_H	1
-#define HAVE_STDDEF_H	1
-#endif
-
-/* Enable various audio drivers */
-#ifndef _WIN32_WCE
-#define SDL_AUDIO_DRIVER_DSOUND	1
-#endif
-#define SDL_AUDIO_DRIVER_WAVEOUT	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#ifdef _WIN32_WCE
-#define SDL_CDROM_DISABLED      1
-#else
-#define SDL_CDROM_WIN32		1
-#endif
-
-/* Enable various input drivers */
-#ifdef _WIN32_WCE
-#define SDL_JOYSTICK_DISABLED   1
-#else
-#define SDL_JOYSTICK_WINMM	1
-#endif
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_WIN32	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_WIN32	1
-
-/* Enable various timer systems */
-#ifdef _WIN32_WCE
-#define SDL_TIMER_WINCE	1
-#else
-#define SDL_TIMER_WIN32	1
-#endif
-
-/* Enable various video drivers */
-#ifdef _WIN32_WCE
-#define SDL_VIDEO_DRIVER_GAPI	1
-#endif
-#ifndef _WIN32_WCE
-#define SDL_VIDEO_DRIVER_DDRAW	1
-#endif
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_WINDIB	1
-
-/* Enable OpenGL support */
-#ifndef _WIN32_WCE
-#define SDL_VIDEO_OPENGL	1
-#define SDL_VIDEO_OPENGL_WGL	1
-#endif
-
-/* Disable screensaver */
-#define SDL_VIDEO_DISABLE_SCREENSAVER	1
-
-/* Enable assembly routines (Win64 doesn't have inline asm) */
-#ifndef _WIN64
-#define SDL_ASSEMBLY_ROUTINES	1
-#endif
-
-#endif /* _SDL_config_win32_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_copying.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_copying.h
deleted file mode 100644
index 1bd6b84cd84..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_copying.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_cpuinfo.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_cpuinfo.h
deleted file mode 100644
index f4be8e03233..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_cpuinfo.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_cpuinfo.h
- *  CPU feature detection for SDL
- */
-
-#ifndef _SDL_cpuinfo_h
-#define _SDL_cpuinfo_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This function returns true if the CPU has the RDTSC instruction */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void);
-
-/** This function returns true if the CPU has MMX features */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void);
-
-/** This function returns true if the CPU has MMX Ext. features */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMXExt(void);
-
-/** This function returns true if the CPU has 3DNow features */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void);
-
-/** This function returns true if the CPU has 3DNow! Ext. features */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNowExt(void);
-
-/** This function returns true if the CPU has SSE features */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void);
-
-/** This function returns true if the CPU has SSE2 features */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void);
-
-/** This function returns true if the CPU has AltiVec features */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_cpuinfo_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_endian.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_endian.h
deleted file mode 100644
index f7a2e2f8c01..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_endian.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_endian.h
- *  Functions for reading and writing endian-specific values
- */
-
-#ifndef _SDL_endian_h
-#define _SDL_endian_h
-
-#include "SDL_stdinc.h"
-
-/** @name SDL_ENDIANs
- *  The two types of endianness 
- */
-/*@{*/
-#define SDL_LIL_ENDIAN	1234
-#define SDL_BIG_ENDIAN	4321
-/*@}*/
-
-#ifndef SDL_BYTEORDER	/* Not defined in SDL_config.h? */
-#if defined(__hppa__) || \
-    defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
-    (defined(__MIPS__) && defined(__MISPEB__)) || \
-    defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
-    defined(__sparc__)
-#define SDL_BYTEORDER	SDL_BIG_ENDIAN
-#else
-#define SDL_BYTEORDER	SDL_LIL_ENDIAN
-#endif
-#endif /* !SDL_BYTEORDER */
-
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  @name SDL_Swap Functions
- *  Use inline functions for compilers that support them, and static
- *  functions for those that do not.  Because these functions become
- *  static for compilers that do not support inline functions, this
- *  header should only be included in files that actually use them.
- */
-/*@{*/
-#if defined(__GNUC__) && defined(__i386__) && \
-   !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	__asm__("xchgb %b0,%h0" : "=q" (x) :  "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	__asm__("xchgb %b0,%h0" : "=Q" (x) :  "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	Uint16 result;
-
-	__asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
-	return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	__asm__("rorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
-	return x;
-}
-#else
-static __inline__ Uint16 SDL_Swap16(Uint16 x) {
-	return((x<<8)|(x>>8));
-}
-#endif
-
-#if defined(__GNUC__) && defined(__i386__) && \
-   !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	__asm__("bswap %0" : "=r" (x) : "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	__asm__("bswapl %0" : "=r" (x) : "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	Uint32 result;
-
-	__asm__("rlwimi %0,%2,24,16,23" : "=&r" (result) : "0" (x>>24), "r" (x));
-	__asm__("rlwimi %0,%2,8,8,15"   : "=&r" (result) : "0" (result),    "r" (x));
-	__asm__("rlwimi %0,%2,24,0,7"   : "=&r" (result) : "0" (result),    "r" (x));
-	return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	__asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
-	return x;
-}
-#else
-static __inline__ Uint32 SDL_Swap32(Uint32 x) {
-	return((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24));
-}
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-#if defined(__GNUC__) && defined(__i386__) && \
-   !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
-{
-	union { 
-		struct { Uint32 a,b; } s;
-		Uint64 u;
-	} v;
-	v.u = x;
-	__asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" 
-	        : "=r" (v.s.a), "=r" (v.s.b) 
-	        : "0" (v.s.a), "1" (v.s.b)); 
-	return v.u;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
-{
-	__asm__("bswapq %0" : "=r" (x) : "0" (x));
-	return x;
-}
-#else
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
-{
-	Uint32 hi, lo;
-
-	/* Separate into high and low 32-bit values and swap them */
-	lo = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
-	x >>= 32;
-	hi = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
-	x = SDL_Swap32(lo);
-	x <<= 32;
-	x |= SDL_Swap32(hi);
-	return(x);
-}
-#endif
-#else
-/* This is mainly to keep compilers from complaining in SDL code.
- * If there is no real 64-bit datatype, then compilers will complain about
- * the fake 64-bit datatype that SDL provides when it compiles user code.
- */
-#define SDL_Swap64(X)	(X)
-#endif /* SDL_HAS_64BIT_TYPE */
-/*@}*/
-
-/**
- *  @name SDL_SwapLE and SDL_SwapBE Functions
- *  Byteswap item from the specified endianness to the native endianness
- */
-/*@{*/
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define SDL_SwapLE16(X)	(X)
-#define SDL_SwapLE32(X)	(X)
-#define SDL_SwapLE64(X)	(X)
-#define SDL_SwapBE16(X)	SDL_Swap16(X)
-#define SDL_SwapBE32(X)	SDL_Swap32(X)
-#define SDL_SwapBE64(X)	SDL_Swap64(X)
-#else
-#define SDL_SwapLE16(X)	SDL_Swap16(X)
-#define SDL_SwapLE32(X)	SDL_Swap32(X)
-#define SDL_SwapLE64(X)	SDL_Swap64(X)
-#define SDL_SwapBE16(X)	(X)
-#define SDL_SwapBE32(X)	(X)
-#define SDL_SwapBE64(X)	(X)
-#endif
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_endian_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_error.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_error.h
deleted file mode 100644
index b103703a5b3..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_error.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_error.h
- *  Simple error message routines for SDL
- */
-
-#ifndef _SDL_error_h
-#define _SDL_error_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** 
- *  @name Public functions
- */
-/*@{*/
-extern DECLSPEC void SDLCALL SDL_SetError(const char *fmt, ...);
-extern DECLSPEC char * SDLCALL SDL_GetError(void);
-extern DECLSPEC void SDLCALL SDL_ClearError(void);
-/*@}*/
-
-/**
- *  @name Private functions
- *  @internal Private error message function - used internally
- */
-/*@{*/
-#define SDL_OutOfMemory()	SDL_Error(SDL_ENOMEM)
-#define SDL_Unsupported()	SDL_Error(SDL_UNSUPPORTED)
-typedef enum {
-	SDL_ENOMEM,
-	SDL_EFREAD,
-	SDL_EFWRITE,
-	SDL_EFSEEK,
-	SDL_UNSUPPORTED,
-	SDL_LASTERROR
-} SDL_errorcode;
-extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_error_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_events.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_events.h
deleted file mode 100644
index c94a30c9c9a..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_events.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_events.h
- *  Include file for SDL event handling
- */
-
-#ifndef _SDL_events_h
-#define _SDL_events_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_active.h"
-#include "SDL_keyboard.h"
-#include "SDL_mouse.h"
-#include "SDL_joystick.h"
-#include "SDL_quit.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @name General keyboard/mouse state definitions */
-/*@{*/
-#define SDL_RELEASED	0
-#define SDL_PRESSED	1
-/*@}*/
-
-/** Event enumerations */
-typedef enum {
-       SDL_NOEVENT = 0,			/**< Unused (do not remove) */
-       SDL_ACTIVEEVENT,			/**< Application loses/gains visibility */
-       SDL_KEYDOWN,			/**< Keys pressed */
-       SDL_KEYUP,			/**< Keys released */
-       SDL_MOUSEMOTION,			/**< Mouse moved */
-       SDL_MOUSEBUTTONDOWN,		/**< Mouse button pressed */
-       SDL_MOUSEBUTTONUP,		/**< Mouse button released */
-       SDL_JOYAXISMOTION,		/**< Joystick axis motion */
-       SDL_JOYBALLMOTION,		/**< Joystick trackball motion */
-       SDL_JOYHATMOTION,		/**< Joystick hat position change */
-       SDL_JOYBUTTONDOWN,		/**< Joystick button pressed */
-       SDL_JOYBUTTONUP,			/**< Joystick button released */
-       SDL_QUIT,			/**< User-requested quit */
-       SDL_SYSWMEVENT,			/**< System specific event */
-       SDL_EVENT_RESERVEDA,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVEDB,		/**< Reserved for future use.. */
-       SDL_VIDEORESIZE,			/**< User resized video mode */
-       SDL_VIDEOEXPOSE,			/**< Screen needs to be redrawn */
-       SDL_EVENT_RESERVED2,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVED3,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVED4,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVED5,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVED6,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVED7,		/**< Reserved for future use.. */
-       /** Events SDL_USEREVENT through SDL_MAXEVENTS-1 are for your use */
-       SDL_USEREVENT = 24,
-       /** This last event is only for bounding internal arrays
-	*  It is the number of bits in the event mask datatype -- Uint32
-        */
-       SDL_NUMEVENTS = 32
-} SDL_EventType;
-
-/** @name Predefined event masks */
-/*@{*/
-#define SDL_EVENTMASK(X)	(1<<(X))
-typedef enum {
-	SDL_ACTIVEEVENTMASK	= SDL_EVENTMASK(SDL_ACTIVEEVENT),
-	SDL_KEYDOWNMASK		= SDL_EVENTMASK(SDL_KEYDOWN),
-	SDL_KEYUPMASK		= SDL_EVENTMASK(SDL_KEYUP),
-	SDL_KEYEVENTMASK	= SDL_EVENTMASK(SDL_KEYDOWN)|
-	                          SDL_EVENTMASK(SDL_KEYUP),
-	SDL_MOUSEMOTIONMASK	= SDL_EVENTMASK(SDL_MOUSEMOTION),
-	SDL_MOUSEBUTTONDOWNMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN),
-	SDL_MOUSEBUTTONUPMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
-	SDL_MOUSEEVENTMASK	= SDL_EVENTMASK(SDL_MOUSEMOTION)|
-	                          SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN)|
-	                          SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
-	SDL_JOYAXISMOTIONMASK	= SDL_EVENTMASK(SDL_JOYAXISMOTION),
-	SDL_JOYBALLMOTIONMASK	= SDL_EVENTMASK(SDL_JOYBALLMOTION),
-	SDL_JOYHATMOTIONMASK	= SDL_EVENTMASK(SDL_JOYHATMOTION),
-	SDL_JOYBUTTONDOWNMASK	= SDL_EVENTMASK(SDL_JOYBUTTONDOWN),
-	SDL_JOYBUTTONUPMASK	= SDL_EVENTMASK(SDL_JOYBUTTONUP),
-	SDL_JOYEVENTMASK	= SDL_EVENTMASK(SDL_JOYAXISMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYBALLMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYHATMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYBUTTONDOWN)|
-	                          SDL_EVENTMASK(SDL_JOYBUTTONUP),
-	SDL_VIDEORESIZEMASK	= SDL_EVENTMASK(SDL_VIDEORESIZE),
-	SDL_VIDEOEXPOSEMASK	= SDL_EVENTMASK(SDL_VIDEOEXPOSE),
-	SDL_QUITMASK		= SDL_EVENTMASK(SDL_QUIT),
-	SDL_SYSWMEVENTMASK	= SDL_EVENTMASK(SDL_SYSWMEVENT)
-} SDL_EventMask ;
-#define SDL_ALLEVENTS		0xFFFFFFFF
-/*@}*/
-
-/** Application visibility event structure */
-typedef struct SDL_ActiveEvent {
-	Uint8 type;	/**< SDL_ACTIVEEVENT */
-	Uint8 gain;	/**< Whether given states were gained or lost (1/0) */
-	Uint8 state;	/**< A mask of the focus states */
-} SDL_ActiveEvent;
-
-/** Keyboard event structure */
-typedef struct SDL_KeyboardEvent {
-	Uint8 type;	/**< SDL_KEYDOWN or SDL_KEYUP */
-	Uint8 which;	/**< The keyboard device index */
-	Uint8 state;	/**< SDL_PRESSED or SDL_RELEASED */
-	SDL_keysym keysym;
-} SDL_KeyboardEvent;
-
-/** Mouse motion event structure */
-typedef struct SDL_MouseMotionEvent {
-	Uint8 type;	/**< SDL_MOUSEMOTION */
-	Uint8 which;	/**< The mouse device index */
-	Uint8 state;	/**< The current button state */
-	Uint16 x, y;	/**< The X/Y coordinates of the mouse */
-	Sint16 xrel;	/**< The relative motion in the X direction */
-	Sint16 yrel;	/**< The relative motion in the Y direction */
-} SDL_MouseMotionEvent;
-
-/** Mouse button event structure */
-typedef struct SDL_MouseButtonEvent {
-	Uint8 type;	/**< SDL_MOUSEBUTTONDOWN or SDL_MOUSEBUTTONUP */
-	Uint8 which;	/**< The mouse device index */
-	Uint8 button;	/**< The mouse button index */
-	Uint8 state;	/**< SDL_PRESSED or SDL_RELEASED */
-	Uint16 x, y;	/**< The X/Y coordinates of the mouse at press time */
-} SDL_MouseButtonEvent;
-
-/** Joystick axis motion event structure */
-typedef struct SDL_JoyAxisEvent {
-	Uint8 type;	/**< SDL_JOYAXISMOTION */
-	Uint8 which;	/**< The joystick device index */
-	Uint8 axis;	/**< The joystick axis index */
-	Sint16 value;	/**< The axis value (range: -32768 to 32767) */
-} SDL_JoyAxisEvent;
-
-/** Joystick trackball motion event structure */
-typedef struct SDL_JoyBallEvent {
-	Uint8 type;	/**< SDL_JOYBALLMOTION */
-	Uint8 which;	/**< The joystick device index */
-	Uint8 ball;	/**< The joystick trackball index */
-	Sint16 xrel;	/**< The relative motion in the X direction */
-	Sint16 yrel;	/**< The relative motion in the Y direction */
-} SDL_JoyBallEvent;
-
-/** Joystick hat position change event structure */
-typedef struct SDL_JoyHatEvent {
-	Uint8 type;	/**< SDL_JOYHATMOTION */
-	Uint8 which;	/**< The joystick device index */
-	Uint8 hat;	/**< The joystick hat index */
-	Uint8 value;	/**< The hat position value:
-			 *   SDL_HAT_LEFTUP   SDL_HAT_UP       SDL_HAT_RIGHTUP
-			 *   SDL_HAT_LEFT     SDL_HAT_CENTERED SDL_HAT_RIGHT
-			 *   SDL_HAT_LEFTDOWN SDL_HAT_DOWN     SDL_HAT_RIGHTDOWN
-			 *  Note that zero means the POV is centered.
-			 */
-} SDL_JoyHatEvent;
-
-/** Joystick button event structure */
-typedef struct SDL_JoyButtonEvent {
-	Uint8 type;	/**< SDL_JOYBUTTONDOWN or SDL_JOYBUTTONUP */
-	Uint8 which;	/**< The joystick device index */
-	Uint8 button;	/**< The joystick button index */
-	Uint8 state;	/**< SDL_PRESSED or SDL_RELEASED */
-} SDL_JoyButtonEvent;
-
-/** The "window resized" event
- *  When you get this event, you are responsible for setting a new video
- *  mode with the new width and height.
- */
-typedef struct SDL_ResizeEvent {
-	Uint8 type;	/**< SDL_VIDEORESIZE */
-	int w;		/**< New width */
-	int h;		/**< New height */
-} SDL_ResizeEvent;
-
-/** The "screen redraw" event */
-typedef struct SDL_ExposeEvent {
-	Uint8 type;	/**< SDL_VIDEOEXPOSE */
-} SDL_ExposeEvent;
-
-/** The "quit requested" event */
-typedef struct SDL_QuitEvent {
-	Uint8 type;	/**< SDL_QUIT */
-} SDL_QuitEvent;
-
-/** A user-defined event type */
-typedef struct SDL_UserEvent {
-	Uint8 type;	/**< SDL_USEREVENT through SDL_NUMEVENTS-1 */
-	int code;	/**< User defined event code */
-	void *data1;	/**< User defined data pointer */
-	void *data2;	/**< User defined data pointer */
-} SDL_UserEvent;
-
-/** If you want to use this event, you should include SDL_syswm.h */
-struct SDL_SysWMmsg;
-typedef struct SDL_SysWMmsg SDL_SysWMmsg;
-typedef struct SDL_SysWMEvent {
-	Uint8 type;
-	SDL_SysWMmsg *msg;
-} SDL_SysWMEvent;
-
-/** General event structure */
-typedef union SDL_Event {
-	Uint8 type;
-	SDL_ActiveEvent active;
-	SDL_KeyboardEvent key;
-	SDL_MouseMotionEvent motion;
-	SDL_MouseButtonEvent button;
-	SDL_JoyAxisEvent jaxis;
-	SDL_JoyBallEvent jball;
-	SDL_JoyHatEvent jhat;
-	SDL_JoyButtonEvent jbutton;
-	SDL_ResizeEvent resize;
-	SDL_ExposeEvent expose;
-	SDL_QuitEvent quit;
-	SDL_UserEvent user;
-	SDL_SysWMEvent syswm;
-} SDL_Event;
-
-
-/* Function prototypes */
-
-/** Pumps the event loop, gathering events from the input devices.
- *  This function updates the event queue and internal input device state.
- *  This should only be run in the thread that sets the video mode.
- */
-extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
-
-typedef enum {
-	SDL_ADDEVENT,
-	SDL_PEEKEVENT,
-	SDL_GETEVENT
-} SDL_eventaction;
-
-/**
- *  Checks the event queue for messages and optionally returns them.
- *
- *  If 'action' is SDL_ADDEVENT, up to 'numevents' events will be added to
- *  the back of the event queue.
- *  If 'action' is SDL_PEEKEVENT, up to 'numevents' events at the front
- *  of the event queue, matching 'mask', will be returned and will not
- *  be removed from the queue.
- *  If 'action' is SDL_GETEVENT, up to 'numevents' events at the front 
- *  of the event queue, matching 'mask', will be returned and will be
- *  removed from the queue.
- *
- *  @return
- *  This function returns the number of events actually stored, or -1
- *  if there was an error.
- *
- *  This function is thread-safe.
- */
-extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event *events, int numevents,
-				SDL_eventaction action, Uint32 mask);
-
-/** Polls for currently pending events, and returns 1 if there are any pending
- *  events, or 0 if there are none available.  If 'event' is not NULL, the next
- *  event is removed from the queue and stored in that area.
- */
-extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event *event);
-
-/** Waits indefinitely for the next available event, returning 1, or 0 if there
- *  was an error while waiting for events.  If 'event' is not NULL, the next
- *  event is removed from the queue and stored in that area.
- */
-extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event *event);
-
-/** Add an event to the event queue.
- *  This function returns 0 on success, or -1 if the event queue was full
- *  or there was some other error.
- */
-extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event *event);
-
-/** @name Event Filtering */
-/*@{*/
-typedef int (SDLCALL *SDL_EventFilter)(const SDL_Event *event);
-/**
- *  This function sets up a filter to process all events before they
- *  change internal state and are posted to the internal event queue.
- *
- *  The filter is protypted as:
- *      @code typedef int (SDLCALL *SDL_EventFilter)(const SDL_Event *event); @endcode
- *
- * If the filter returns 1, then the event will be added to the internal queue.
- * If it returns 0, then the event will be dropped from the queue, but the 
- * internal state will still be updated.  This allows selective filtering of
- * dynamically arriving events.
- *
- * @warning  Be very careful of what you do in the event filter function, as 
- *           it may run in a different thread!
- *
- * There is one caveat when dealing with the SDL_QUITEVENT event type.  The
- * event filter is only called when the window manager desires to close the
- * application window.  If the event filter returns 1, then the window will
- * be closed, otherwise the window will remain open if possible.
- * If the quit event is generated by an interrupt signal, it will bypass the
- * internal queue and be delivered to the application at the next event poll.
- */
-extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter);
-
-/**
- *  Return the current event filter - can be used to "chain" filters.
- *  If there is no event filter set, this function returns NULL.
- */
-extern DECLSPEC SDL_EventFilter SDLCALL SDL_GetEventFilter(void);
-/*@}*/
-
-/** @name Event State */
-/*@{*/
-#define SDL_QUERY	-1
-#define SDL_IGNORE	 0
-#define SDL_DISABLE	 0
-#define SDL_ENABLE	 1
-/*@}*/
-
-/**
-* This function allows you to set the state of processing certain events.
-* If 'state' is set to SDL_IGNORE, that event will be automatically dropped
-* from the event queue and will not event be filtered.
-* If 'state' is set to SDL_ENABLE, that event will be processed normally.
-* If 'state' is set to SDL_QUERY, SDL_EventState() will return the 
-* current processing state of the specified event.
-*/
-extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint8 type, int state);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_events_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_getenv.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_getenv.h
deleted file mode 100644
index 253ad88cc5d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_getenv.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_getenv.h
- *  @deprecated Use SDL_stdinc.h instead
- */
-
-/* DEPRECATED */
-#include "SDL_stdinc.h"
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_joystick.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_joystick.h
deleted file mode 100644
index d5135c3d538..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_joystick.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_joystick.h
- *  Include file for SDL joystick event handling
- */
-
-#ifndef _SDL_joystick_h
-#define _SDL_joystick_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @file SDL_joystick.h
- *  @note In order to use these functions, SDL_Init() must have been called
- *        with the SDL_INIT_JOYSTICK flag.  This causes SDL to scan the system
- *        for joysticks, and load appropriate drivers.
- */
-
-/** The joystick structure used to identify an SDL joystick */
-struct _SDL_Joystick;
-typedef struct _SDL_Joystick SDL_Joystick;
-
-/* Function prototypes */
-/**
- * Count the number of joysticks attached to the system
- */
-extern DECLSPEC int SDLCALL SDL_NumJoysticks(void);
-
-/**
- * Get the implementation dependent name of a joystick.
- *
- * This can be called before any joysticks are opened.
- * If no name can be found, this function returns NULL.
- */
-extern DECLSPEC const char * SDLCALL SDL_JoystickName(int device_index);
-
-/**
- * Open a joystick for use.
- *
- * @param[in] device_index
- * The index passed as an argument refers to
- * the N'th joystick on the system.  This index is the value which will
- * identify this joystick in future joystick events.
- *
- * @return This function returns a joystick identifier, or NULL if an error occurred.
- */
-extern DECLSPEC SDL_Joystick * SDLCALL SDL_JoystickOpen(int device_index);
-
-/**
- * Returns 1 if the joystick has been opened, or 0 if it has not.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickOpened(int device_index);
-
-/**
- * Get the device index of an opened joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickIndex(SDL_Joystick *joystick);
-
-/**
- * Get the number of general axis controls on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick *joystick);
-
-/**
- * Get the number of trackballs on a joystick
- *
- * Joystick trackballs have only relative motion events associated
- * with them and their state cannot be polled.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick *joystick);
-
-/**
- * Get the number of POV hats on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick *joystick);
-
-/**
- * Get the number of buttons on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick *joystick);
-
-/**
- * Update the current state of the open joysticks.
- *
- * This is called automatically by the event loop if any joystick
- * events are enabled.
- */
-extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
-
-/**
- * Enable/disable joystick event polling.
- *
- * If joystick events are disabled, you must call SDL_JoystickUpdate()
- * yourself and check the state of the joystick when you want joystick
- * information.
- *
- * @param[in] state The state can be one of SDL_QUERY, SDL_ENABLE or SDL_IGNORE.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
-
-/**
- * Get the current state of an axis control on a joystick
- *
- * @param[in] axis The axis indices start at index 0.
- *
- * @return The state is a value ranging from -32768 to 32767.
- */
-extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick *joystick, int axis);
-
-/**
- *  @name Hat Positions
- *  The return value of SDL_JoystickGetHat() is one of the following positions:
- */
-/*@{*/
-#define SDL_HAT_CENTERED	0x00
-#define SDL_HAT_UP		0x01
-#define SDL_HAT_RIGHT		0x02
-#define SDL_HAT_DOWN		0x04
-#define SDL_HAT_LEFT		0x08
-#define SDL_HAT_RIGHTUP		(SDL_HAT_RIGHT|SDL_HAT_UP)
-#define SDL_HAT_RIGHTDOWN	(SDL_HAT_RIGHT|SDL_HAT_DOWN)
-#define SDL_HAT_LEFTUP		(SDL_HAT_LEFT|SDL_HAT_UP)
-#define SDL_HAT_LEFTDOWN	(SDL_HAT_LEFT|SDL_HAT_DOWN)
-/*@}*/
-
-/** 
- *  Get the current state of a POV hat on a joystick
- *
- *  @param[in] hat The hat indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick *joystick, int hat);
-
-/**
- * Get the ball axis change since the last poll
- *
- * @param[in] ball The ball indices start at index 0.
- *
- * @return This returns 0, or -1 if you passed it invalid parameters.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick *joystick, int ball, int *dx, int *dy);
-
-/**
- * Get the current state of a button on a joystick
- *
- * @param[in] button The button indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick *joystick, int button);
-
-/**
- * Close a joystick previously opened with SDL_JoystickOpen()
- */
-extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick *joystick);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_joystick_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_keyboard.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_keyboard.h
deleted file mode 100644
index 7b59d24e556..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_keyboard.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_keyboard.h
- *  Include file for SDL keyboard event handling
- */
-
-#ifndef _SDL_keyboard_h
-#define _SDL_keyboard_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_keysym.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Keysym structure
- *
- *  - The scancode is hardware dependent, and should not be used by general
- *    applications.  If no hardware scancode is available, it will be 0.
- *
- *  - The 'unicode' translated character is only available when character
- *    translation is enabled by the SDL_EnableUNICODE() API.  If non-zero,
- *    this is a UNICODE character corresponding to the keypress.  If the
- *    high 9 bits of the character are 0, then this maps to the equivalent
- *    ASCII character:
- *      @code
- *	char ch;
- *	if ( (keysym.unicode & 0xFF80) == 0 ) {
- *		ch = keysym.unicode & 0x7F;
- *	} else {
- *		An international character..
- *	}
- *      @endcode
- */
-typedef struct SDL_keysym {
-	Uint8 scancode;			/**< hardware specific scancode */
-	SDLKey sym;			/**< SDL virtual keysym */
-	SDLMod mod;			/**< current key modifiers */
-	Uint16 unicode;			/**< translated character */
-} SDL_keysym;
-
-/** This is the mask which refers to all hotkey bindings */
-#define SDL_ALL_HOTKEYS		0xFFFFFFFF
-
-/* Function prototypes */
-/**
- * Enable/Disable UNICODE translation of keyboard input.
- *
- * This translation has some overhead, so translation defaults off.
- *
- * @param[in] enable
- * If 'enable' is 1, translation is enabled.
- * If 'enable' is 0, translation is disabled.
- * If 'enable' is -1, the translation state is not changed.
- *
- * @return It returns the previous state of keyboard translation.
- */
-extern DECLSPEC int SDLCALL SDL_EnableUNICODE(int enable);
-
-#define SDL_DEFAULT_REPEAT_DELAY	500
-#define SDL_DEFAULT_REPEAT_INTERVAL	30
-/**
- * Enable/Disable keyboard repeat.  Keyboard repeat defaults to off.
- *
- *  @param[in] delay
- *  'delay' is the initial delay in ms between the time when a key is
- *  pressed, and keyboard repeat begins.
- *
- *  @param[in] interval
- *  'interval' is the time in ms between keyboard repeat events.
- *
- *  If 'delay' is set to 0, keyboard repeat is disabled.
- */
-extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay, int interval);
-extern DECLSPEC void SDLCALL SDL_GetKeyRepeat(int *delay, int *interval);
-
-/**
- * Get a snapshot of the current state of the keyboard.
- * Returns an array of keystates, indexed by the SDLK_* syms.
- * Usage:
- *	@code
- * 	Uint8 *keystate = SDL_GetKeyState(NULL);
- *	if ( keystate[SDLK_RETURN] ) //... \<RETURN> is pressed.
- *	@endcode
- */
-extern DECLSPEC Uint8 * SDLCALL SDL_GetKeyState(int *numkeys);
-
-/**
- * Get the current key modifier state
- */
-extern DECLSPEC SDLMod SDLCALL SDL_GetModState(void);
-
-/**
- * Set the current key modifier state.
- * This does not change the keyboard state, only the key modifier flags.
- */
-extern DECLSPEC void SDLCALL SDL_SetModState(SDLMod modstate);
-
-/**
- * Get the name of an SDL virtual keysym
- */
-extern DECLSPEC char * SDLCALL SDL_GetKeyName(SDLKey key);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_keyboard_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_keysym.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_keysym.h
deleted file mode 100644
index 90101286e3d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_keysym.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_keysym_h
-#define _SDL_keysym_h
-
-/** What we really want is a mapping of every raw key on the keyboard.
- *  To support international keyboards, we use the range 0xA1 - 0xFF
- *  as international virtual keycodes.  We'll follow in the footsteps of X11...
- *  @brief The names of the keys
- */
-typedef enum {
-        /** @name ASCII mapped keysyms
-         *  The keyboard syms have been cleverly chosen to map to ASCII
-         */
-        /*@{*/
-	SDLK_UNKNOWN		= 0,
-	SDLK_FIRST		= 0,
-	SDLK_BACKSPACE		= 8,
-	SDLK_TAB		= 9,
-	SDLK_CLEAR		= 12,
-	SDLK_RETURN		= 13,
-	SDLK_PAUSE		= 19,
-	SDLK_ESCAPE		= 27,
-	SDLK_SPACE		= 32,
-	SDLK_EXCLAIM		= 33,
-	SDLK_QUOTEDBL		= 34,
-	SDLK_HASH		= 35,
-	SDLK_DOLLAR		= 36,
-	SDLK_AMPERSAND		= 38,
-	SDLK_QUOTE		= 39,
-	SDLK_LEFTPAREN		= 40,
-	SDLK_RIGHTPAREN		= 41,
-	SDLK_ASTERISK		= 42,
-	SDLK_PLUS		= 43,
-	SDLK_COMMA		= 44,
-	SDLK_MINUS		= 45,
-	SDLK_PERIOD		= 46,
-	SDLK_SLASH		= 47,
-	SDLK_0			= 48,
-	SDLK_1			= 49,
-	SDLK_2			= 50,
-	SDLK_3			= 51,
-	SDLK_4			= 52,
-	SDLK_5			= 53,
-	SDLK_6			= 54,
-	SDLK_7			= 55,
-	SDLK_8			= 56,
-	SDLK_9			= 57,
-	SDLK_COLON		= 58,
-	SDLK_SEMICOLON		= 59,
-	SDLK_LESS		= 60,
-	SDLK_EQUALS		= 61,
-	SDLK_GREATER		= 62,
-	SDLK_QUESTION		= 63,
-	SDLK_AT			= 64,
-	/* 
-	   Skip uppercase letters
-	 */
-	SDLK_LEFTBRACKET	= 91,
-	SDLK_BACKSLASH		= 92,
-	SDLK_RIGHTBRACKET	= 93,
-	SDLK_CARET		= 94,
-	SDLK_UNDERSCORE		= 95,
-	SDLK_BACKQUOTE		= 96,
-	SDLK_a			= 97,
-	SDLK_b			= 98,
-	SDLK_c			= 99,
-	SDLK_d			= 100,
-	SDLK_e			= 101,
-	SDLK_f			= 102,
-	SDLK_g			= 103,
-	SDLK_h			= 104,
-	SDLK_i			= 105,
-	SDLK_j			= 106,
-	SDLK_k			= 107,
-	SDLK_l			= 108,
-	SDLK_m			= 109,
-	SDLK_n			= 110,
-	SDLK_o			= 111,
-	SDLK_p			= 112,
-	SDLK_q			= 113,
-	SDLK_r			= 114,
-	SDLK_s			= 115,
-	SDLK_t			= 116,
-	SDLK_u			= 117,
-	SDLK_v			= 118,
-	SDLK_w			= 119,
-	SDLK_x			= 120,
-	SDLK_y			= 121,
-	SDLK_z			= 122,
-	SDLK_DELETE		= 127,
-	/* End of ASCII mapped keysyms */
-        /*@}*/
-
-	/** @name International keyboard syms */
-        /*@{*/
-	SDLK_WORLD_0		= 160,		/* 0xA0 */
-	SDLK_WORLD_1		= 161,
-	SDLK_WORLD_2		= 162,
-	SDLK_WORLD_3		= 163,
-	SDLK_WORLD_4		= 164,
-	SDLK_WORLD_5		= 165,
-	SDLK_WORLD_6		= 166,
-	SDLK_WORLD_7		= 167,
-	SDLK_WORLD_8		= 168,
-	SDLK_WORLD_9		= 169,
-	SDLK_WORLD_10		= 170,
-	SDLK_WORLD_11		= 171,
-	SDLK_WORLD_12		= 172,
-	SDLK_WORLD_13		= 173,
-	SDLK_WORLD_14		= 174,
-	SDLK_WORLD_15		= 175,
-	SDLK_WORLD_16		= 176,
-	SDLK_WORLD_17		= 177,
-	SDLK_WORLD_18		= 178,
-	SDLK_WORLD_19		= 179,
-	SDLK_WORLD_20		= 180,
-	SDLK_WORLD_21		= 181,
-	SDLK_WORLD_22		= 182,
-	SDLK_WORLD_23		= 183,
-	SDLK_WORLD_24		= 184,
-	SDLK_WORLD_25		= 185,
-	SDLK_WORLD_26		= 186,
-	SDLK_WORLD_27		= 187,
-	SDLK_WORLD_28		= 188,
-	SDLK_WORLD_29		= 189,
-	SDLK_WORLD_30		= 190,
-	SDLK_WORLD_31		= 191,
-	SDLK_WORLD_32		= 192,
-	SDLK_WORLD_33		= 193,
-	SDLK_WORLD_34		= 194,
-	SDLK_WORLD_35		= 195,
-	SDLK_WORLD_36		= 196,
-	SDLK_WORLD_37		= 197,
-	SDLK_WORLD_38		= 198,
-	SDLK_WORLD_39		= 199,
-	SDLK_WORLD_40		= 200,
-	SDLK_WORLD_41		= 201,
-	SDLK_WORLD_42		= 202,
-	SDLK_WORLD_43		= 203,
-	SDLK_WORLD_44		= 204,
-	SDLK_WORLD_45		= 205,
-	SDLK_WORLD_46		= 206,
-	SDLK_WORLD_47		= 207,
-	SDLK_WORLD_48		= 208,
-	SDLK_WORLD_49		= 209,
-	SDLK_WORLD_50		= 210,
-	SDLK_WORLD_51		= 211,
-	SDLK_WORLD_52		= 212,
-	SDLK_WORLD_53		= 213,
-	SDLK_WORLD_54		= 214,
-	SDLK_WORLD_55		= 215,
-	SDLK_WORLD_56		= 216,
-	SDLK_WORLD_57		= 217,
-	SDLK_WORLD_58		= 218,
-	SDLK_WORLD_59		= 219,
-	SDLK_WORLD_60		= 220,
-	SDLK_WORLD_61		= 221,
-	SDLK_WORLD_62		= 222,
-	SDLK_WORLD_63		= 223,
-	SDLK_WORLD_64		= 224,
-	SDLK_WORLD_65		= 225,
-	SDLK_WORLD_66		= 226,
-	SDLK_WORLD_67		= 227,
-	SDLK_WORLD_68		= 228,
-	SDLK_WORLD_69		= 229,
-	SDLK_WORLD_70		= 230,
-	SDLK_WORLD_71		= 231,
-	SDLK_WORLD_72		= 232,
-	SDLK_WORLD_73		= 233,
-	SDLK_WORLD_74		= 234,
-	SDLK_WORLD_75		= 235,
-	SDLK_WORLD_76		= 236,
-	SDLK_WORLD_77		= 237,
-	SDLK_WORLD_78		= 238,
-	SDLK_WORLD_79		= 239,
-	SDLK_WORLD_80		= 240,
-	SDLK_WORLD_81		= 241,
-	SDLK_WORLD_82		= 242,
-	SDLK_WORLD_83		= 243,
-	SDLK_WORLD_84		= 244,
-	SDLK_WORLD_85		= 245,
-	SDLK_WORLD_86		= 246,
-	SDLK_WORLD_87		= 247,
-	SDLK_WORLD_88		= 248,
-	SDLK_WORLD_89		= 249,
-	SDLK_WORLD_90		= 250,
-	SDLK_WORLD_91		= 251,
-	SDLK_WORLD_92		= 252,
-	SDLK_WORLD_93		= 253,
-	SDLK_WORLD_94		= 254,
-	SDLK_WORLD_95		= 255,		/* 0xFF */
-        /*@}*/
-
-	/** @name Numeric keypad */
-        /*@{*/
-	SDLK_KP0		= 256,
-	SDLK_KP1		= 257,
-	SDLK_KP2		= 258,
-	SDLK_KP3		= 259,
-	SDLK_KP4		= 260,
-	SDLK_KP5		= 261,
-	SDLK_KP6		= 262,
-	SDLK_KP7		= 263,
-	SDLK_KP8		= 264,
-	SDLK_KP9		= 265,
-	SDLK_KP_PERIOD		= 266,
-	SDLK_KP_DIVIDE		= 267,
-	SDLK_KP_MULTIPLY	= 268,
-	SDLK_KP_MINUS		= 269,
-	SDLK_KP_PLUS		= 270,
-	SDLK_KP_ENTER		= 271,
-	SDLK_KP_EQUALS		= 272,
-        /*@}*/
-
-	/** @name Arrows + Home/End pad */
-        /*@{*/
-	SDLK_UP			= 273,
-	SDLK_DOWN		= 274,
-	SDLK_RIGHT		= 275,
-	SDLK_LEFT		= 276,
-	SDLK_INSERT		= 277,
-	SDLK_HOME		= 278,
-	SDLK_END		= 279,
-	SDLK_PAGEUP		= 280,
-	SDLK_PAGEDOWN		= 281,
-        /*@}*/
-
-	/** @name Function keys */
-        /*@{*/
-	SDLK_F1			= 282,
-	SDLK_F2			= 283,
-	SDLK_F3			= 284,
-	SDLK_F4			= 285,
-	SDLK_F5			= 286,
-	SDLK_F6			= 287,
-	SDLK_F7			= 288,
-	SDLK_F8			= 289,
-	SDLK_F9			= 290,
-	SDLK_F10		= 291,
-	SDLK_F11		= 292,
-	SDLK_F12		= 293,
-	SDLK_F13		= 294,
-	SDLK_F14		= 295,
-	SDLK_F15		= 296,
-        /*@}*/
-
-	/** @name Key state modifier keys */
-        /*@{*/
-	SDLK_NUMLOCK		= 300,
-	SDLK_CAPSLOCK		= 301,
-	SDLK_SCROLLOCK		= 302,
-	SDLK_RSHIFT		= 303,
-	SDLK_LSHIFT		= 304,
-	SDLK_RCTRL		= 305,
-	SDLK_LCTRL		= 306,
-	SDLK_RALT		= 307,
-	SDLK_LALT		= 308,
-	SDLK_RMETA		= 309,
-	SDLK_LMETA		= 310,
-	SDLK_LSUPER		= 311,		/**< Left "Windows" key */
-	SDLK_RSUPER		= 312,		/**< Right "Windows" key */
-	SDLK_MODE		= 313,		/**< "Alt Gr" key */
-	SDLK_COMPOSE		= 314,		/**< Multi-key compose key */
-        /*@}*/
-
-	/** @name Miscellaneous function keys */
-        /*@{*/
-	SDLK_HELP		= 315,
-	SDLK_PRINT		= 316,
-	SDLK_SYSREQ		= 317,
-	SDLK_BREAK		= 318,
-	SDLK_MENU		= 319,
-	SDLK_POWER		= 320,		/**< Power Macintosh power key */
-	SDLK_EURO		= 321,		/**< Some european keyboards */
-	SDLK_UNDO		= 322,		/**< Atari keyboard has Undo */
-        /*@}*/
-
-	/* Add any other keys here */
-
-	SDLK_LAST
-} SDLKey;
-
-/** Enumeration of valid key mods (possibly OR'd together) */
-typedef enum {
-	KMOD_NONE  = 0x0000,
-	KMOD_LSHIFT= 0x0001,
-	KMOD_RSHIFT= 0x0002,
-	KMOD_LCTRL = 0x0040,
-	KMOD_RCTRL = 0x0080,
-	KMOD_LALT  = 0x0100,
-	KMOD_RALT  = 0x0200,
-	KMOD_LMETA = 0x0400,
-	KMOD_RMETA = 0x0800,
-	KMOD_NUM   = 0x1000,
-	KMOD_CAPS  = 0x2000,
-	KMOD_MODE  = 0x4000,
-	KMOD_RESERVED = 0x8000
-} SDLMod;
-
-#define KMOD_CTRL	(KMOD_LCTRL|KMOD_RCTRL)
-#define KMOD_SHIFT	(KMOD_LSHIFT|KMOD_RSHIFT)
-#define KMOD_ALT	(KMOD_LALT|KMOD_RALT)
-#define KMOD_META	(KMOD_LMETA|KMOD_RMETA)
-
-#endif /* _SDL_keysym_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_loadso.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_loadso.h
deleted file mode 100644
index 45a17f9f41b..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_loadso.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_loadso.h
- *  System dependent library loading routines
- */
-
-/** @file SDL_loadso.h
- *  Some things to keep in mind:                                        
- *  - These functions only work on C function names.  Other languages may
- *    have name mangling and intrinsic language support that varies from
- *    compiler to compiler.
- *  - Make sure you declare your function pointers with the same calling
- *    convention as the actual library function.  Your code will crash
- *    mysteriously if you do not do this.
- *  - Avoid namespace collisions.  If you load a symbol from the library,
- *    it is not defined whether or not it goes into the global symbol
- *    namespace for the application.  If it does and it conflicts with
- *    symbols in your code or other shared libraries, you will not get
- *    the results you expect. :)
- */
-
-
-#ifndef _SDL_loadso_h
-#define _SDL_loadso_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * This function dynamically loads a shared object and returns a pointer
- * to the object handle (or NULL if there was an error).
- * The 'sofile' parameter is a system dependent name of the object file.
- */
-extern DECLSPEC void * SDLCALL SDL_LoadObject(const char *sofile);
-
-/**
- * Given an object handle, this function looks up the address of the
- * named function in the shared object and returns it.  This address
- * is no longer valid after calling SDL_UnloadObject().
- */
-extern DECLSPEC void * SDLCALL SDL_LoadFunction(void *handle, const char *name);
-
-/** Unload a shared object from memory */
-extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_loadso_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_main.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_main.h
deleted file mode 100644
index b7f6b2c8235..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_main.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_main_h
-#define _SDL_main_h
-
-#include "SDL_stdinc.h"
-
-/** @file SDL_main.h
- *  Redefine main() on Win32 and MacOS so that it is called by winmain.c
- */
-
-#if defined(__WIN32__) || \
-    (defined(__MWERKS__) && !defined(__BEOS__)) || \
-    defined(__MACOS__) || defined(__MACOSX__) || \
-    defined(__SYMBIAN32__) || defined(QWS)
-
-#ifdef __cplusplus
-#define C_LINKAGE	"C"
-#else
-#define C_LINKAGE
-#endif /* __cplusplus */
-
-/** The application's main() function must be called with C linkage,
- *  and should be declared like this:
- *      @code
- *      #ifdef __cplusplus
- *      extern "C"
- *      #endif
- *	int main(int argc, char *argv[])
- *	{
- *	}
- *      @endcode
- */
-#define main	SDL_main
-
-/** The prototype for the application's main() function */
-extern C_LINKAGE int SDL_main(int argc, char *argv[]);
-
-
-/** @name From the SDL library code -- needed for registering the app on Win32 */
-/*@{*/
-#ifdef __WIN32__
-
-#include "begin_code.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This should be called from your WinMain() function, if any */
-extern DECLSPEC void SDLCALL SDL_SetModuleHandle(void *hInst);
-/** This can also be called, but is no longer necessary */
-extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst);
-/** This can also be called, but is no longer necessary (SDL_Quit calls it) */
-extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-#endif
-/*@}*/
-
-/** @name From the SDL library code -- needed for registering QuickDraw on MacOS */
-/*@{*/
-#if defined(__MACOS__)
-
-#include "begin_code.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Forward declaration so we don't need to include QuickDraw.h */
-struct QDGlobals;
-
-/** This should be called from your main() function, if any */
-extern DECLSPEC void SDLCALL SDL_InitQuickDraw(struct QDGlobals *the_qd);
-
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-#endif
-/*@}*/
-
-#endif /* Need to redefine main()? */
-
-#endif /* _SDL_main_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_mouse.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_mouse.h
deleted file mode 100644
index a573f04ee05..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_mouse.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_mouse.h
- *  Include file for SDL mouse event handling
- */
-
-#ifndef _SDL_mouse_h
-#define _SDL_mouse_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct WMcursor WMcursor;	/**< Implementation dependent */
-typedef struct SDL_Cursor {
-	SDL_Rect area;			/**< The area of the mouse cursor */
-	Sint16 hot_x, hot_y;		/**< The "tip" of the cursor */
-	Uint8 *data;			/**< B/W cursor data */
-	Uint8 *mask;			/**< B/W cursor mask */
-	Uint8 *save[2];			/**< Place to save cursor area */
-	WMcursor *wm_cursor;		/**< Window-manager cursor */
-} SDL_Cursor;
-
-/* Function prototypes */
-/**
- * Retrieve the current state of the mouse.
- * The current button state is returned as a button bitmask, which can
- * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
- * current mouse cursor position.  You can pass NULL for either x or y.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetMouseState(int *x, int *y);
-
-/**
- * Retrieve the current state of the mouse.
- * The current button state is returned as a button bitmask, which can
- * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
- * mouse deltas since the last call to SDL_GetRelativeMouseState().
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetRelativeMouseState(int *x, int *y);
-
-/**
- * Set the position of the mouse cursor (generates a mouse motion event)
- */
-extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x, Uint16 y);
-
-/**
- * Create a cursor using the specified data and mask (in MSB format).
- * The cursor width must be a multiple of 8 bits.
- *
- * The cursor is created in black and white according to the following:
- * data  mask    resulting pixel on screen
- *  0     1       White
- *  1     1       Black
- *  0     0       Transparent
- *  1     0       Inverted color if possible, black if not.
- *
- * Cursors created with this function must be freed with SDL_FreeCursor().
- */
-extern DECLSPEC SDL_Cursor * SDLCALL SDL_CreateCursor
-		(Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y);
-
-/**
- * Set the currently active cursor to the specified one.
- * If the cursor is currently visible, the change will be immediately 
- * represented on the display.
- */
-extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor *cursor);
-
-/**
- * Returns the currently active cursor.
- */
-extern DECLSPEC SDL_Cursor * SDLCALL SDL_GetCursor(void);
-
-/**
- * Deallocates a cursor created with SDL_CreateCursor().
- */
-extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor *cursor);
-
-/**
- * Toggle whether or not the cursor is shown on the screen.
- * The cursor start off displayed, but can be turned off.
- * SDL_ShowCursor() returns 1 if the cursor was being displayed
- * before the call, or 0 if it was not.  You can query the current
- * state by passing a 'toggle' value of -1.
- */
-extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
-
-/*@{*/
-/** Used as a mask when testing buttons in buttonstate
- *  Button 1:	Left mouse button
- *  Button 2:	Middle mouse button
- *  Button 3:	Right mouse button
- *  Button 4:	Mouse wheel up	 (may also be a real button)
- *  Button 5:	Mouse wheel down (may also be a real button)
- */
-#define SDL_BUTTON(X)		(1 << ((X)-1))
-#define SDL_BUTTON_LEFT		1
-#define SDL_BUTTON_MIDDLE	2
-#define SDL_BUTTON_RIGHT	3
-#define SDL_BUTTON_WHEELUP	4
-#define SDL_BUTTON_WHEELDOWN	5
-#define SDL_BUTTON_X1		6
-#define SDL_BUTTON_X2		7
-#define SDL_BUTTON_LMASK	SDL_BUTTON(SDL_BUTTON_LEFT)
-#define SDL_BUTTON_MMASK	SDL_BUTTON(SDL_BUTTON_MIDDLE)
-#define SDL_BUTTON_RMASK	SDL_BUTTON(SDL_BUTTON_RIGHT)
-#define SDL_BUTTON_X1MASK	SDL_BUTTON(SDL_BUTTON_X1)
-#define SDL_BUTTON_X2MASK	SDL_BUTTON(SDL_BUTTON_X2)
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_mouse_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_mutex.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_mutex.h
deleted file mode 100644
index 920971dfa7c..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_mutex.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_mutex_h
-#define _SDL_mutex_h
-
-/** @file SDL_mutex.h
- *  Functions to provide thread synchronization primitives
- *
- *  @note These are independent of the other SDL routines.
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Synchronization functions which can time out return this value
- *  if they time out.
- */
-#define SDL_MUTEX_TIMEDOUT	1
-
-/** This is the timeout value which corresponds to never time out */
-#define SDL_MUTEX_MAXWAIT	(~(Uint32)0)
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name Mutex functions                                        */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/** The SDL mutex structure, defined in SDL_mutex.c */
-struct SDL_mutex;
-typedef struct SDL_mutex SDL_mutex;
-
-/** Create a mutex, initialized unlocked */
-extern DECLSPEC SDL_mutex * SDLCALL SDL_CreateMutex(void);
-
-#define SDL_LockMutex(m)	SDL_mutexP(m)
-/** Lock the mutex
- *  @return 0, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_mutexP(SDL_mutex *mutex);
-
-#define SDL_UnlockMutex(m)	SDL_mutexV(m)
-/** Unlock the mutex
- *  @return 0, or -1 on error
- *
- *  It is an error to unlock a mutex that has not been locked by
- *  the current thread, and doing so results in undefined behavior.
- */
-extern DECLSPEC int SDLCALL SDL_mutexV(SDL_mutex *mutex);
-
-/** Destroy a mutex */
-extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex *mutex);
-
-/*@}*/
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name Semaphore functions                                    */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/** The SDL semaphore structure, defined in SDL_sem.c */
-struct SDL_semaphore;
-typedef struct SDL_semaphore SDL_sem;
-
-/** Create a semaphore, initialized with value, returns NULL on failure. */
-extern DECLSPEC SDL_sem * SDLCALL SDL_CreateSemaphore(Uint32 initial_value);
-
-/** Destroy a semaphore */
-extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem *sem);
-
-/**
- * This function suspends the calling thread until the semaphore pointed 
- * to by sem has a positive count. It then atomically decreases the semaphore
- * count.
- */
-extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem *sem);
-
-/** Non-blocking variant of SDL_SemWait().
- *  @return 0 if the wait succeeds,
- *  SDL_MUTEX_TIMEDOUT if the wait would block, and -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem *sem);
-
-/** Variant of SDL_SemWait() with a timeout in milliseconds, returns 0 if
- *  the wait succeeds, SDL_MUTEX_TIMEDOUT if the wait does not succeed in
- *  the allotted time, and -1 on error.
- *
- *  On some platforms this function is implemented by looping with a delay
- *  of 1 ms, and so should be avoided if possible.
- */
-extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem *sem, Uint32 ms);
-
-/** Atomically increases the semaphore's count (not blocking).
- *  @return 0, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem *sem);
-
-/** Returns the current count of the semaphore */
-extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem *sem);
-
-/*@}*/
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name Condition_variable_functions                           */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*@{*/
-/** The SDL condition variable structure, defined in SDL_cond.c */
-struct SDL_cond;
-typedef struct SDL_cond SDL_cond;
-/*@}*/
-
-/** Create a condition variable */
-extern DECLSPEC SDL_cond * SDLCALL SDL_CreateCond(void);
-
-/** Destroy a condition variable */
-extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond *cond);
-
-/** Restart one of the threads that are waiting on the condition variable,
- *  @return 0 or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond *cond);
-
-/** Restart all threads that are waiting on the condition variable,
- *  @return 0 or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond *cond);
-
-/** Wait on the condition variable, unlocking the provided mutex.
- *  The mutex must be locked before entering this function!
- *  The mutex is re-locked once the condition variable is signaled.
- *  @return 0 when it is signaled, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond *cond, SDL_mutex *mut);
-
-/** Waits for at most 'ms' milliseconds, and returns 0 if the condition
- *  variable is signaled, SDL_MUTEX_TIMEDOUT if the condition is not
- *  signaled in the allotted time, and -1 on error.
- *  On some platforms this function is implemented by looping with a delay
- *  of 1 ms, and so should be avoided if possible.
- */
-extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond *cond, SDL_mutex *mutex, Uint32 ms);
-
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_mutex_h */
-
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_name.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_name.h
deleted file mode 100644
index 511619af561..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_name.h
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#ifndef _SDLname_h_
-#define _SDLname_h_
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define NeedFunctionPrototypes 1
-#endif
-
-#define SDL_NAME(X)	SDL_##X
-
-#endif /* _SDLname_h_ */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_opengl.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_opengl.h
deleted file mode 100644
index c479a3a4e46..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_opengl.h
+++ /dev/null
@@ -1,6556 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_opengl.h
- *  This is a simple file to encapsulate the OpenGL API headers
- */
-
-#include "SDL_config.h"
-
-#ifdef __WIN32__
-#define WIN32_LEAN_AND_MEAN
-#ifndef NOMINMAX
-#define NOMINMAX	/* Don't defined min() and max() */
-#endif
-#include <windows.h>
-#endif
-#ifndef NO_SDL_GLEXT
-#define __glext_h_  /* Don't let gl.h include glext.h */
-#endif
-#if defined(__MACOSX__)
-#include <OpenGL/gl.h>	/* Header File For The OpenGL Library */
-#include <OpenGL/glu.h>	/* Header File For The GLU Library */
-#elif defined(__MACOS__)
-#include <gl.h>		/* Header File For The OpenGL Library */
-#include <glu.h>	/* Header File For The GLU Library */
-#else
-#include <GL/gl.h>	/* Header File For The OpenGL Library */
-#include <GL/glu.h>	/* Header File For The GLU Library */
-#endif
-#ifndef NO_SDL_GLEXT
-#undef __glext_h_
-#endif
-
-/** @name GLext.h
- *  This file taken from "GLext.h" from the Jeff Molofee OpenGL tutorials.
- *  It is included here because glext.h is not available on some systems.
- *  If you don't want this version included, simply define "NO_SDL_GLEXT"
- */
-/*@{*/
-#ifndef NO_SDL_GLEXT
-#if !defined(__glext_h_) && !defined(GL_GLEXT_LEGACY)
-#define __glext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
-** http://oss.sgi.com/projects/FreeB
-** 
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-** 
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2005/06/20 */
-/* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */
-#define GL_GLEXT_VERSION 29
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_TEXTURE_BINDING_3D             0x806A
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_ARB_imaging
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#define GL_CONVOLUTION_1D                 0x8010
-#define GL_CONVOLUTION_2D                 0x8011
-#define GL_SEPARABLE_2D                   0x8012
-#define GL_CONVOLUTION_BORDER_MODE        0x8013
-#define GL_CONVOLUTION_FILTER_SCALE       0x8014
-#define GL_CONVOLUTION_FILTER_BIAS        0x8015
-#define GL_REDUCE                         0x8016
-#define GL_CONVOLUTION_FORMAT             0x8017
-#define GL_CONVOLUTION_WIDTH              0x8018
-#define GL_CONVOLUTION_HEIGHT             0x8019
-#define GL_MAX_CONVOLUTION_WIDTH          0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
-#define GL_HISTOGRAM                      0x8024
-#define GL_PROXY_HISTOGRAM                0x8025
-#define GL_HISTOGRAM_WIDTH                0x8026
-#define GL_HISTOGRAM_FORMAT               0x8027
-#define GL_HISTOGRAM_RED_SIZE             0x8028
-#define GL_HISTOGRAM_GREEN_SIZE           0x8029
-#define GL_HISTOGRAM_BLUE_SIZE            0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
-#define GL_HISTOGRAM_SINK                 0x802D
-#define GL_MINMAX                         0x802E
-#define GL_MINMAX_FORMAT                  0x802F
-#define GL_MINMAX_SINK                    0x8030
-#define GL_TABLE_TOO_LARGE                0x8031
-#define GL_COLOR_MATRIX                   0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
-#define GL_COLOR_TABLE                    0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
-#define GL_PROXY_COLOR_TABLE              0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE              0x80D6
-#define GL_COLOR_TABLE_BIAS               0x80D7
-#define GL_COLOR_TABLE_FORMAT             0x80D8
-#define GL_COLOR_TABLE_WIDTH              0x80D9
-#define GL_COLOR_TABLE_RED_SIZE           0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
-#define GL_CONSTANT_BORDER                0x8151
-#define GL_REPLICATE_BORDER               0x8153
-#define GL_CONVOLUTION_BORDER_COLOR       0x8154
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_MULTISAMPLE_BIT                0x20000000
-#define GL_NORMAL_MAP                     0x8511
-#define GL_REFLECTION_MAP                 0x8512
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_ALPHA               0x84E9
-#define GL_COMPRESSED_LUMINANCE           0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
-#define GL_COMPRESSED_INTENSITY           0x84EC
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_SOURCE0_RGB                    0x8580
-#define GL_SOURCE1_RGB                    0x8581
-#define GL_SOURCE2_RGB                    0x8582
-#define GL_SOURCE0_ALPHA                  0x8588
-#define GL_SOURCE1_ALPHA                  0x8589
-#define GL_SOURCE2_ALPHA                  0x858A
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_SUBTRACT                       0x84E7
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_GENERATE_MIPMAP                0x8191
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_FOG_COORDINATE_SOURCE          0x8450
-#define GL_FOG_COORDINATE                 0x8451
-#define GL_FRAGMENT_DEPTH                 0x8452
-#define GL_CURRENT_FOG_COORDINATE         0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
-#define GL_FOG_COORDINATE_ARRAY           0x8457
-#define GL_COLOR_SUM                      0x8458
-#define GL_CURRENT_SECONDARY_COLOR        0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
-#define GL_SECONDARY_COLOR_ARRAY          0x845E
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_FILTER_CONTROL         0x8500
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_DEPTH_TEXTURE_MODE             0x884B
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#define GL_COMPARE_R_TO_TEXTURE           0x884E
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#define GL_FOG_COORD_SRC                  GL_FOG_COORDINATE_SOURCE
-#define GL_FOG_COORD                      GL_FOG_COORDINATE
-#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
-#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
-#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
-#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
-#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
-#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
-#define GL_SRC0_RGB                       GL_SOURCE0_RGB
-#define GL_SRC1_RGB                       GL_SOURCE1_RGB
-#define GL_SRC2_RGB                       GL_SOURCE2_RGB
-#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
-#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
-#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_POINT_SPRITE                   0x8861
-#define GL_COORD_REPLACE                  0x8862
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_COORDS             0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_TEXTURE0_ARB                   0x84C0
-#define GL_TEXTURE1_ARB                   0x84C1
-#define GL_TEXTURE2_ARB                   0x84C2
-#define GL_TEXTURE3_ARB                   0x84C3
-#define GL_TEXTURE4_ARB                   0x84C4
-#define GL_TEXTURE5_ARB                   0x84C5
-#define GL_TEXTURE6_ARB                   0x84C6
-#define GL_TEXTURE7_ARB                   0x84C7
-#define GL_TEXTURE8_ARB                   0x84C8
-#define GL_TEXTURE9_ARB                   0x84C9
-#define GL_TEXTURE10_ARB                  0x84CA
-#define GL_TEXTURE11_ARB                  0x84CB
-#define GL_TEXTURE12_ARB                  0x84CC
-#define GL_TEXTURE13_ARB                  0x84CD
-#define GL_TEXTURE14_ARB                  0x84CE
-#define GL_TEXTURE15_ARB                  0x84CF
-#define GL_TEXTURE16_ARB                  0x84D0
-#define GL_TEXTURE17_ARB                  0x84D1
-#define GL_TEXTURE18_ARB                  0x84D2
-#define GL_TEXTURE19_ARB                  0x84D3
-#define GL_TEXTURE20_ARB                  0x84D4
-#define GL_TEXTURE21_ARB                  0x84D5
-#define GL_TEXTURE22_ARB                  0x84D6
-#define GL_TEXTURE23_ARB                  0x84D7
-#define GL_TEXTURE24_ARB                  0x84D8
-#define GL_TEXTURE25_ARB                  0x84D9
-#define GL_TEXTURE26_ARB                  0x84DA
-#define GL_TEXTURE27_ARB                  0x84DB
-#define GL_TEXTURE28_ARB                  0x84DC
-#define GL_TEXTURE29_ARB                  0x84DD
-#define GL_TEXTURE30_ARB                  0x84DE
-#define GL_TEXTURE31_ARB                  0x84DF
-#define GL_ACTIVE_TEXTURE_ARB             0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_MULTISAMPLE_ARB                0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
-#define GL_SAMPLE_COVERAGE_ARB            0x80A0
-#define GL_SAMPLE_BUFFERS_ARB             0x80A8
-#define GL_SAMPLES_ARB                    0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
-#define GL_MULTISAMPLE_BIT_ARB            0x20000000
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_NORMAL_MAP_ARB                 0x8511
-#define GL_REFLECTION_MAP_ARB             0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_COMPRESSED_ALPHA_ARB           0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
-#define GL_COMPRESSED_RGB_ARB             0x84ED
-#define GL_COMPRESSED_RGBA_ARB            0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_ARB            0x812D
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_POINT_SIZE_MIN_ARB             0x8126
-#define GL_POINT_SIZE_MAX_ARB             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
-#define GL_VERTEX_BLEND_ARB               0x86A7
-#define GL_CURRENT_WEIGHT_ARB             0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
-#define GL_WEIGHT_ARRAY_ARB               0x86AD
-#define GL_MODELVIEW0_ARB                 0x1700
-#define GL_MODELVIEW1_ARB                 0x850A
-#define GL_MODELVIEW2_ARB                 0x8722
-#define GL_MODELVIEW3_ARB                 0x8723
-#define GL_MODELVIEW4_ARB                 0x8724
-#define GL_MODELVIEW5_ARB                 0x8725
-#define GL_MODELVIEW6_ARB                 0x8726
-#define GL_MODELVIEW7_ARB                 0x8727
-#define GL_MODELVIEW8_ARB                 0x8728
-#define GL_MODELVIEW9_ARB                 0x8729
-#define GL_MODELVIEW10_ARB                0x872A
-#define GL_MODELVIEW11_ARB                0x872B
-#define GL_MODELVIEW12_ARB                0x872C
-#define GL_MODELVIEW13_ARB                0x872D
-#define GL_MODELVIEW14_ARB                0x872E
-#define GL_MODELVIEW15_ARB                0x872F
-#define GL_MODELVIEW16_ARB                0x8730
-#define GL_MODELVIEW17_ARB                0x8731
-#define GL_MODELVIEW18_ARB                0x8732
-#define GL_MODELVIEW19_ARB                0x8733
-#define GL_MODELVIEW20_ARB                0x8734
-#define GL_MODELVIEW21_ARB                0x8735
-#define GL_MODELVIEW22_ARB                0x8736
-#define GL_MODELVIEW23_ARB                0x8737
-#define GL_MODELVIEW24_ARB                0x8738
-#define GL_MODELVIEW25_ARB                0x8739
-#define GL_MODELVIEW26_ARB                0x873A
-#define GL_MODELVIEW27_ARB                0x873B
-#define GL_MODELVIEW28_ARB                0x873C
-#define GL_MODELVIEW29_ARB                0x873D
-#define GL_MODELVIEW30_ARB                0x873E
-#define GL_MODELVIEW31_ARB                0x873F
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_MATRIX_PALETTE_ARB             0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_COMBINE_ARB                    0x8570
-#define GL_COMBINE_RGB_ARB                0x8571
-#define GL_COMBINE_ALPHA_ARB              0x8572
-#define GL_SOURCE0_RGB_ARB                0x8580
-#define GL_SOURCE1_RGB_ARB                0x8581
-#define GL_SOURCE2_RGB_ARB                0x8582
-#define GL_SOURCE0_ALPHA_ARB              0x8588
-#define GL_SOURCE1_ALPHA_ARB              0x8589
-#define GL_SOURCE2_ALPHA_ARB              0x858A
-#define GL_OPERAND0_RGB_ARB               0x8590
-#define GL_OPERAND1_RGB_ARB               0x8591
-#define GL_OPERAND2_RGB_ARB               0x8592
-#define GL_OPERAND0_ALPHA_ARB             0x8598
-#define GL_OPERAND1_ALPHA_ARB             0x8599
-#define GL_OPERAND2_ALPHA_ARB             0x859A
-#define GL_RGB_SCALE_ARB                  0x8573
-#define GL_ADD_SIGNED_ARB                 0x8574
-#define GL_INTERPOLATE_ARB                0x8575
-#define GL_SUBTRACT_ARB                   0x84E7
-#define GL_CONSTANT_ARB                   0x8576
-#define GL_PRIMARY_COLOR_ARB              0x8577
-#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_DOT3_RGB_ARB                   0x86AE
-#define GL_DOT3_RGBA_ARB                  0x86AF
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_ARB            0x8370
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-#endif
-
-#ifndef GL_ARB_window_pos
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_COLOR_SUM_ARB                  0x8458
-#define GL_VERTEX_PROGRAM_ARB             0x8620
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
-#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
-#define GL_PROGRAM_LENGTH_ARB             0x8627
-#define GL_PROGRAM_STRING_ARB             0x8628
-#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
-#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
-#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
-#define GL_CURRENT_MATRIX_ARB             0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
-#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
-#define GL_PROGRAM_BINDING_ARB            0x8677
-#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
-#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
-#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
-#define GL_PROGRAM_FORMAT_ARB             0x8876
-#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
-#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
-#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
-#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
-#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
-#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
-#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
-#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
-#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
-#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
-#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
-#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
-#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
-#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
-#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
-#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
-#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
-#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
-#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
-#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
-#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
-#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
-#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
-#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
-#define GL_MATRIX0_ARB                    0x88C0
-#define GL_MATRIX1_ARB                    0x88C1
-#define GL_MATRIX2_ARB                    0x88C2
-#define GL_MATRIX3_ARB                    0x88C3
-#define GL_MATRIX4_ARB                    0x88C4
-#define GL_MATRIX5_ARB                    0x88C5
-#define GL_MATRIX6_ARB                    0x88C6
-#define GL_MATRIX7_ARB                    0x88C7
-#define GL_MATRIX8_ARB                    0x88C8
-#define GL_MATRIX9_ARB                    0x88C9
-#define GL_MATRIX10_ARB                   0x88CA
-#define GL_MATRIX11_ARB                   0x88CB
-#define GL_MATRIX12_ARB                   0x88CC
-#define GL_MATRIX13_ARB                   0x88CD
-#define GL_MATRIX14_ARB                   0x88CE
-#define GL_MATRIX15_ARB                   0x88CF
-#define GL_MATRIX16_ARB                   0x88D0
-#define GL_MATRIX17_ARB                   0x88D1
-#define GL_MATRIX18_ARB                   0x88D2
-#define GL_MATRIX19_ARB                   0x88D3
-#define GL_MATRIX20_ARB                   0x88D4
-#define GL_MATRIX21_ARB                   0x88D5
-#define GL_MATRIX22_ARB                   0x88D6
-#define GL_MATRIX23_ARB                   0x88D7
-#define GL_MATRIX24_ARB                   0x88D8
-#define GL_MATRIX25_ARB                   0x88D9
-#define GL_MATRIX26_ARB                   0x88DA
-#define GL_MATRIX27_ARB                   0x88DB
-#define GL_MATRIX28_ARB                   0x88DC
-#define GL_MATRIX29_ARB                   0x88DD
-#define GL_MATRIX30_ARB                   0x88DE
-#define GL_MATRIX31_ARB                   0x88DF
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_FRAGMENT_PROGRAM_ARB           0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_BUFFER_SIZE_ARB                0x8764
-#define GL_BUFFER_USAGE_ARB               0x8765
-#define GL_ARRAY_BUFFER_ARB               0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB                  0x88B8
-#define GL_WRITE_ONLY_ARB                 0x88B9
-#define GL_READ_WRITE_ARB                 0x88BA
-#define GL_BUFFER_ACCESS_ARB              0x88BB
-#define GL_BUFFER_MAPPED_ARB              0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
-#define GL_STREAM_DRAW_ARB                0x88E0
-#define GL_STREAM_READ_ARB                0x88E1
-#define GL_STREAM_COPY_ARB                0x88E2
-#define GL_STATIC_DRAW_ARB                0x88E4
-#define GL_STATIC_READ_ARB                0x88E5
-#define GL_STATIC_COPY_ARB                0x88E6
-#define GL_DYNAMIC_DRAW_ARB               0x88E8
-#define GL_DYNAMIC_READ_ARB               0x88E9
-#define GL_DYNAMIC_COPY_ARB               0x88EA
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_QUERY_COUNTER_BITS_ARB         0x8864
-#define GL_CURRENT_QUERY_ARB              0x8865
-#define GL_QUERY_RESULT_ARB               0x8866
-#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
-#define GL_SAMPLES_PASSED_ARB             0x8914
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_PROGRAM_OBJECT_ARB             0x8B40
-#define GL_SHADER_OBJECT_ARB              0x8B48
-#define GL_OBJECT_TYPE_ARB                0x8B4E
-#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
-#define GL_FLOAT_VEC2_ARB                 0x8B50
-#define GL_FLOAT_VEC3_ARB                 0x8B51
-#define GL_FLOAT_VEC4_ARB                 0x8B52
-#define GL_INT_VEC2_ARB                   0x8B53
-#define GL_INT_VEC3_ARB                   0x8B54
-#define GL_INT_VEC4_ARB                   0x8B55
-#define GL_BOOL_ARB                       0x8B56
-#define GL_BOOL_VEC2_ARB                  0x8B57
-#define GL_BOOL_VEC3_ARB                  0x8B58
-#define GL_BOOL_VEC4_ARB                  0x8B59
-#define GL_FLOAT_MAT2_ARB                 0x8B5A
-#define GL_FLOAT_MAT3_ARB                 0x8B5B
-#define GL_FLOAT_MAT4_ARB                 0x8B5C
-#define GL_SAMPLER_1D_ARB                 0x8B5D
-#define GL_SAMPLER_2D_ARB                 0x8B5E
-#define GL_SAMPLER_3D_ARB                 0x8B5F
-#define GL_SAMPLER_CUBE_ARB               0x8B60
-#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
-#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
-#define GL_SAMPLER_2D_RECT_ARB            0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
-#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
-#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
-#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
-#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
-#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_POINT_SPRITE_ARB               0x8861
-#define GL_COORD_REPLACE_ARB              0x8862
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
-#define GL_DRAW_BUFFER0_ARB               0x8825
-#define GL_DRAW_BUFFER1_ARB               0x8826
-#define GL_DRAW_BUFFER2_ARB               0x8827
-#define GL_DRAW_BUFFER3_ARB               0x8828
-#define GL_DRAW_BUFFER4_ARB               0x8829
-#define GL_DRAW_BUFFER5_ARB               0x882A
-#define GL_DRAW_BUFFER6_ARB               0x882B
-#define GL_DRAW_BUFFER7_ARB               0x882C
-#define GL_DRAW_BUFFER8_ARB               0x882D
-#define GL_DRAW_BUFFER9_ARB               0x882E
-#define GL_DRAW_BUFFER10_ARB              0x882F
-#define GL_DRAW_BUFFER11_ARB              0x8830
-#define GL_DRAW_BUFFER12_ARB              0x8831
-#define GL_DRAW_BUFFER13_ARB              0x8832
-#define GL_DRAW_BUFFER14_ARB              0x8833
-#define GL_DRAW_BUFFER15_ARB              0x8834
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_RGBA_FLOAT_MODE_ARB            0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
-#define GL_CLAMP_READ_COLOR_ARB           0x891C
-#define GL_FIXED_ONLY_ARB                 0x891D
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
-#define GL_RGBA32F_ARB                    0x8814
-#define GL_RGB32F_ARB                     0x8815
-#define GL_ALPHA32F_ARB                   0x8816
-#define GL_INTENSITY32F_ARB               0x8817
-#define GL_LUMINANCE32F_ARB               0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
-#define GL_RGBA16F_ARB                    0x881A
-#define GL_RGB16F_ARB                     0x881B
-#define GL_ALPHA16F_ARB                   0x881C
-#define GL_INTENSITY16F_ARB               0x881D
-#define GL_LUMINANCE16F_ARB               0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_ABGR_EXT                       0x8000
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_CONSTANT_COLOR_EXT             0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
-#define GL_CONSTANT_ALPHA_EXT             0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
-#define GL_BLEND_COLOR_EXT                0x8005
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_POLYGON_OFFSET_EXT             0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_ALPHA4_EXT                     0x803B
-#define GL_ALPHA8_EXT                     0x803C
-#define GL_ALPHA12_EXT                    0x803D
-#define GL_ALPHA16_EXT                    0x803E
-#define GL_LUMINANCE4_EXT                 0x803F
-#define GL_LUMINANCE8_EXT                 0x8040
-#define GL_LUMINANCE12_EXT                0x8041
-#define GL_LUMINANCE16_EXT                0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
-#define GL_INTENSITY_EXT                  0x8049
-#define GL_INTENSITY4_EXT                 0x804A
-#define GL_INTENSITY8_EXT                 0x804B
-#define GL_INTENSITY12_EXT                0x804C
-#define GL_INTENSITY16_EXT                0x804D
-#define GL_RGB2_EXT                       0x804E
-#define GL_RGB4_EXT                       0x804F
-#define GL_RGB5_EXT                       0x8050
-#define GL_RGB8_EXT                       0x8051
-#define GL_RGB10_EXT                      0x8052
-#define GL_RGB12_EXT                      0x8053
-#define GL_RGB16_EXT                      0x8054
-#define GL_RGBA2_EXT                      0x8055
-#define GL_RGBA4_EXT                      0x8056
-#define GL_RGB5_A1_EXT                    0x8057
-#define GL_RGBA8_EXT                      0x8058
-#define GL_RGB10_A2_EXT                   0x8059
-#define GL_RGBA12_EXT                     0x805A
-#define GL_RGBA16_EXT                     0x805B
-#define GL_TEXTURE_RED_SIZE_EXT           0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
-#define GL_REPLACE_EXT                    0x8062
-#define GL_PROXY_TEXTURE_1D_EXT           0x8063
-#define GL_PROXY_TEXTURE_2D_EXT           0x8064
-#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_PACK_SKIP_IMAGES_EXT           0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
-#define GL_TEXTURE_3D_EXT                 0x806F
-#define GL_PROXY_TEXTURE_3D_EXT           0x8070
-#define GL_TEXTURE_DEPTH_EXT              0x8071
-#define GL_TEXTURE_WRAP_R_EXT             0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_FILTER4_SGIS                   0x8146
-#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
-#endif
-
-#ifndef GL_EXT_subtexture
-#endif
-
-#ifndef GL_EXT_copy_texture
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_HISTOGRAM_EXT                  0x8024
-#define GL_PROXY_HISTOGRAM_EXT            0x8025
-#define GL_HISTOGRAM_WIDTH_EXT            0x8026
-#define GL_HISTOGRAM_FORMAT_EXT           0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
-#define GL_HISTOGRAM_SINK_EXT             0x802D
-#define GL_MINMAX_EXT                     0x802E
-#define GL_MINMAX_FORMAT_EXT              0x802F
-#define GL_MINMAX_SINK_EXT                0x8030
-#define GL_TABLE_TOO_LARGE_EXT            0x8031
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_CONVOLUTION_1D_EXT             0x8010
-#define GL_CONVOLUTION_2D_EXT             0x8011
-#define GL_SEPARABLE_2D_EXT               0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
-#define GL_REDUCE_EXT                     0x8016
-#define GL_CONVOLUTION_FORMAT_EXT         0x8017
-#define GL_CONVOLUTION_WIDTH_EXT          0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_COLOR_MATRIX_SGI               0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_COLOR_TABLE_SGI                0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_PIXEL_TEXTURE_SGIS             0x8353
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
-#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_PIXEL_TEX_GEN_SGIX             0x8139
-#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
-#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
-#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
-#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
-#define GL_TEXTURE_4D_SGIS                0x8134
-#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
-#define GL_TEXTURE_4DSIZE_SGIS            0x8136
-#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
-#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_CMYK_EXT                       0x800C
-#define GL_CMYKA_EXT                      0x800D
-#define GL_PACK_CMYK_HINT_EXT             0x800E
-#define GL_UNPACK_CMYK_HINT_EXT           0x800F
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_TEXTURE_PRIORITY_EXT           0x8066
-#define GL_TEXTURE_RESIDENT_EXT           0x8067
-#define GL_TEXTURE_1D_BINDING_EXT         0x8068
-#define GL_TEXTURE_2D_BINDING_EXT         0x8069
-#define GL_TEXTURE_3D_BINDING_EXT         0x806A
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
-#define GL_LINEAR_DETAIL_SGIS             0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
-#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_LINEAR_SHARPEN_SGIS            0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_MULTISAMPLE_SGIS               0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
-#define GL_SAMPLE_MASK_SGIS               0x80A0
-#define GL_1PASS_SGIS                     0x80A1
-#define GL_2PASS_0_SGIS                   0x80A2
-#define GL_2PASS_1_SGIS                   0x80A3
-#define GL_4PASS_0_SGIS                   0x80A4
-#define GL_4PASS_1_SGIS                   0x80A5
-#define GL_4PASS_2_SGIS                   0x80A6
-#define GL_4PASS_3_SGIS                   0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
-#define GL_SAMPLES_SGIS                   0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
-#define GL_SAMPLE_PATTERN_SGIS            0x80AC
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_RESCALE_NORMAL_EXT             0x803A
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS           0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
-#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
-#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
-#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
-#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
-#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
-#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
-#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
-#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
-#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
-#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
-#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_TEXTURE_COMPARE_SGIX           0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_CLAMP_TO_EDGE_SGIS             0x812F
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_FUNC_ADD_EXT                   0x8006
-#define GL_MIN_EXT                        0x8007
-#define GL_MAX_EXT                        0x8008
-#define GL_BLEND_EQUATION_EXT             0x8009
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_FUNC_SUBTRACT_EXT              0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_INTERLACE_SGIX                 0x8094
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
-#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
-#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
-#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
-#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
-#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
-#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
-#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
-#endif
-
-#ifndef GL_SGIS_texture_select
-#define GL_DUAL_ALPHA4_SGIS               0x8110
-#define GL_DUAL_ALPHA8_SGIS               0x8111
-#define GL_DUAL_ALPHA12_SGIS              0x8112
-#define GL_DUAL_ALPHA16_SGIS              0x8113
-#define GL_DUAL_LUMINANCE4_SGIS           0x8114
-#define GL_DUAL_LUMINANCE8_SGIS           0x8115
-#define GL_DUAL_LUMINANCE12_SGIS          0x8116
-#define GL_DUAL_LUMINANCE16_SGIS          0x8117
-#define GL_DUAL_INTENSITY4_SGIS           0x8118
-#define GL_DUAL_INTENSITY8_SGIS           0x8119
-#define GL_DUAL_INTENSITY12_SGIS          0x811A
-#define GL_DUAL_INTENSITY16_SGIS          0x811B
-#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
-#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
-#define GL_QUAD_ALPHA4_SGIS               0x811E
-#define GL_QUAD_ALPHA8_SGIS               0x811F
-#define GL_QUAD_LUMINANCE4_SGIS           0x8120
-#define GL_QUAD_LUMINANCE8_SGIS           0x8121
-#define GL_QUAD_INTENSITY4_SGIS           0x8122
-#define GL_QUAD_INTENSITY8_SGIS           0x8123
-#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
-#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SPRITE_SGIX                    0x8148
-#define GL_SPRITE_MODE_SGIX               0x8149
-#define GL_SPRITE_AXIS_SGIX               0x814A
-#define GL_SPRITE_TRANSLATION_SGIX        0x814B
-#define GL_SPRITE_AXIAL_SGIX              0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_POINT_SIZE_MIN_EXT             0x8126
-#define GL_POINT_SIZE_MAX_EXT             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
-#define GL_DISTANCE_ATTENUATION_EXT       0x8129
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_POINT_SIZE_MIN_SGIS            0x8126
-#define GL_POINT_SIZE_MAX_SGIS            0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
-#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_FRAMEZOOM_SGIX                 0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#endif
-
-#ifndef GL_FfdMaskSGIX
-#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
-#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
-#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
-#define GL_DEFORMATIONS_MASK_SGIX         0x8196
-#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_REFERENCE_PLANE_SGIX           0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_FOG_FUNC_SGIS                  0x812A
-#define GL_FOG_FUNC_POINTS_SGIS           0x812B
-#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_FOG_OFFSET_SGIX                0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_IMAGE_SCALE_X_HP               0x8155
-#define GL_IMAGE_SCALE_Y_HP               0x8156
-#define GL_IMAGE_TRANSLATE_X_HP           0x8157
-#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
-#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
-#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
-#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
-#define GL_IMAGE_MAG_FILTER_HP            0x815C
-#define GL_IMAGE_MIN_FILTER_HP            0x815D
-#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
-#define GL_CUBIC_HP                       0x815F
-#define GL_AVERAGE_HP                     0x8160
-#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
-#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
-#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_IGNORE_BORDER_HP               0x8150
-#define GL_CONSTANT_BORDER_HP             0x8151
-#define GL_REPLICATE_BORDER_HP            0x8153
-#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
-#endif
-
-#ifndef GL_INGR_palette_buffer
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
-#endif
-
-#ifndef GL_EXT_color_subtable
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
-#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
-#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
-#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
-#define GL_COLOR3_BIT_PGI                 0x00010000
-#define GL_COLOR4_BIT_PGI                 0x00020000
-#define GL_EDGEFLAG_BIT_PGI               0x00040000
-#define GL_INDEX_BIT_PGI                  0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
-#define GL_MAT_EMISSION_BIT_PGI           0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
-#define GL_MAT_SHININESS_BIT_PGI          0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
-#define GL_NORMAL_BIT_PGI                 0x08000000
-#define GL_TEXCOORD1_BIT_PGI              0x10000000
-#define GL_TEXCOORD2_BIT_PGI              0x20000000
-#define GL_TEXCOORD3_BIT_PGI              0x40000000
-#define GL_TEXCOORD4_BIT_PGI              0x80000000
-#define GL_VERTEX23_BIT_PGI               0x00000004
-#define GL_VERTEX4_BIT_PGI                0x00000008
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
-#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
-#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
-#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
-#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
-#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
-#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
-#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
-#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
-#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
-#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
-#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
-#define GL_CLIP_NEAR_HINT_PGI             0x1A220
-#define GL_CLIP_FAR_HINT_PGI              0x1A221
-#define GL_WIDE_LINE_HINT_PGI             0x1A222
-#define GL_BACK_NORMALS_HINT_PGI          0x1A223
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_LIST_PRIORITY_SGIX             0x8182
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_IR_INSTRUMENT1_SGIX            0x817F
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
-#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
-#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SHADOW_AMBIENT_SGIX            0x80BF
-#endif
-
-#ifndef GL_EXT_index_texture
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_INDEX_MATERIAL_EXT             0x81B8
-#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
-#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_INDEX_TEST_EXT                 0x81B5
-#define GL_INDEX_TEST_FUNC_EXT            0x81B6
-#define GL_INDEX_TEST_REF_EXT             0x81B7
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_IUI_V2F_EXT                    0x81AD
-#define GL_IUI_V3F_EXT                    0x81AE
-#define GL_IUI_N3F_V2F_EXT                0x81AF
-#define GL_IUI_N3F_V3F_EXT                0x81B0
-#define GL_T2F_IUI_V2F_EXT                0x81B1
-#define GL_T2F_IUI_V3F_EXT                0x81B2
-#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
-#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_CULL_VERTEX_EXT                0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_YCRCB_422_SGIX                 0x81BB
-#define GL_YCRCB_444_SGIX                 0x81BC
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
-#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
-#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
-#define GL_LIGHT_ENV_MODE_SGIX            0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
-#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
-#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
-#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
-#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
-#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
-#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
-#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
-#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
-#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
-#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_FRAGMENT_MATERIAL_EXT          0x8349
-#define GL_FRAGMENT_NORMAL_EXT            0x834A
-#define GL_FRAGMENT_COLOR_EXT             0x834C
-#define GL_ATTENUATION_EXT                0x834D
-#define GL_SHADOW_ATTENUATION_EXT         0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
-#define GL_TEXTURE_LIGHT_EXT              0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-/* reuse GL_FRAGMENT_DEPTH_EXT */
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_ALPHA_MIN_SGIX                 0x8320
-#define GL_ALPHA_MAX_SGIX                 0x8321
-#endif
-
-#ifndef GL_SGIX_impact_pixel_texture
-#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
-#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
-#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
-#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
-#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
-#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
-#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_ASYNC_MARKER_SGIX              0x8329
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
-#endif
-
-#ifndef GL_INTEL_texture_scissor
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_OCCLUSION_TEST_HP              0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
-#define GL_PIXEL_MAG_FILTER_EXT           0x8331
-#define GL_PIXEL_MIN_FILTER_EXT           0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
-#define GL_CUBIC_EXT                      0x8334
-#define GL_AVERAGE_EXT                    0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_COLOR_SUM_EXT                  0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_PERTURB_EXT                    0x85AE
-#define GL_TEXTURE_NORMAL_EXT             0x85AF
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
-#define GL_FOG_COORDINATE_EXT             0x8451
-#define GL_FRAGMENT_DEPTH_EXT             0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_SCREEN_COORDINATES_REND        0x8490
-#define GL_INVERTED_SCREEN_W_REND         0x8491
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_TANGENT_ARRAY_EXT              0x8439
-#define GL_BINORMAL_ARRAY_EXT             0x843A
-#define GL_CURRENT_TANGENT_EXT            0x843B
-#define GL_CURRENT_BINORMAL_EXT           0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
-#define GL_MAP1_TANGENT_EXT               0x8444
-#define GL_MAP2_TANGENT_EXT               0x8445
-#define GL_MAP1_BINORMAL_EXT              0x8446
-#define GL_MAP2_BINORMAL_EXT              0x8447
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_COMBINE_EXT                    0x8570
-#define GL_COMBINE_RGB_EXT                0x8571
-#define GL_COMBINE_ALPHA_EXT              0x8572
-#define GL_RGB_SCALE_EXT                  0x8573
-#define GL_ADD_SIGNED_EXT                 0x8574
-#define GL_INTERPOLATE_EXT                0x8575
-#define GL_CONSTANT_EXT                   0x8576
-#define GL_PRIMARY_COLOR_EXT              0x8577
-#define GL_PREVIOUS_EXT                   0x8578
-#define GL_SOURCE0_RGB_EXT                0x8580
-#define GL_SOURCE1_RGB_EXT                0x8581
-#define GL_SOURCE2_RGB_EXT                0x8582
-#define GL_SOURCE0_ALPHA_EXT              0x8588
-#define GL_SOURCE1_ALPHA_EXT              0x8589
-#define GL_SOURCE2_ALPHA_EXT              0x858A
-#define GL_OPERAND0_RGB_EXT               0x8590
-#define GL_OPERAND1_RGB_EXT               0x8591
-#define GL_OPERAND2_RGB_EXT               0x8592
-#define GL_OPERAND0_ALPHA_EXT             0x8598
-#define GL_OPERAND1_ALPHA_EXT             0x8599
-#define GL_OPERAND2_ALPHA_EXT             0x859A
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_TRANSFORM_HINT_APPLE           0x85B1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_FOG_SCALE_SGIX                 0x81FC
-#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_GLOBAL_ALPHA_SUN               0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_RESTART_SUN                    0x0001
-#define GL_REPLACE_MIDDLE_SUN             0x0002
-#define GL_REPLACE_OLDEST_SUN             0x0003
-#define GL_TRIANGLE_LIST_SUN              0x81D7
-#define GL_REPLACEMENT_CODE_SUN           0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN                   0x85C4
-#define GL_R1UI_C4UB_V3F_SUN              0x85C5
-#define GL_R1UI_C3F_V3F_SUN               0x85C6
-#define GL_R1UI_N3F_V3F_SUN               0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
-#define GL_R1UI_T2F_V3F_SUN               0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
-#endif
-
-#ifndef GL_SUN_vertex
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_BLEND_DST_RGB_EXT              0x80C8
-#define GL_BLEND_SRC_RGB_EXT              0x80C9
-#define GL_BLEND_DST_ALPHA_EXT            0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_RED_MIN_CLAMP_INGR             0x8560
-#define GL_GREEN_MIN_CLAMP_INGR           0x8561
-#define GL_BLUE_MIN_CLAMP_INGR            0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
-#define GL_RED_MAX_CLAMP_INGR             0x8564
-#define GL_GREEN_MAX_CLAMP_INGR           0x8565
-#define GL_BLUE_MAX_CLAMP_INGR            0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INTERLACE_READ_INGR            0x8568
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_INCR_WRAP_EXT                  0x8507
-#define GL_DECR_WRAP_EXT                  0x8508
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_422_EXT                        0x80CC
-#define GL_422_REV_EXT                    0x80CD
-#define GL_422_AVERAGE_EXT                0x80CE
-#define GL_422_REV_AVERAGE_EXT            0x80CF
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NORMAL_MAP_NV                  0x8511
-#define GL_REFLECTION_MAP_NV              0x8512
-#endif
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_NORMAL_MAP_EXT                 0x8511
-#define GL_REFLECTION_MAP_EXT             0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_WRAP_BORDER_SUN                0x81D4
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506
-#define GL_VERTEX_WEIGHTING_EXT           0x8509
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
-#define GL_MODELVIEW1_EXT                 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_MAX_SHININESS_NV               0x8504
-#define GL_MAX_SPOT_EXPONENT_NV           0x8505
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_REGISTER_COMBINERS_NV          0x8522
-#define GL_VARIABLE_A_NV                  0x8523
-#define GL_VARIABLE_B_NV                  0x8524
-#define GL_VARIABLE_C_NV                  0x8525
-#define GL_VARIABLE_D_NV                  0x8526
-#define GL_VARIABLE_E_NV                  0x8527
-#define GL_VARIABLE_F_NV                  0x8528
-#define GL_VARIABLE_G_NV                  0x8529
-#define GL_CONSTANT_COLOR0_NV             0x852A
-#define GL_CONSTANT_COLOR1_NV             0x852B
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
-#define GL_SPARE0_NV                      0x852E
-#define GL_SPARE1_NV                      0x852F
-#define GL_DISCARD_NV                     0x8530
-#define GL_E_TIMES_F_NV                   0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV           0x8536
-#define GL_UNSIGNED_INVERT_NV             0x8537
-#define GL_EXPAND_NORMAL_NV               0x8538
-#define GL_EXPAND_NEGATE_NV               0x8539
-#define GL_HALF_BIAS_NORMAL_NV            0x853A
-#define GL_HALF_BIAS_NEGATE_NV            0x853B
-#define GL_SIGNED_IDENTITY_NV             0x853C
-#define GL_SIGNED_NEGATE_NV               0x853D
-#define GL_SCALE_BY_TWO_NV                0x853E
-#define GL_SCALE_BY_FOUR_NV               0x853F
-#define GL_SCALE_BY_ONE_HALF_NV           0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
-#define GL_COMBINER_INPUT_NV              0x8542
-#define GL_COMBINER_MAPPING_NV            0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
-#define GL_COMBINER_MUX_SUM_NV            0x8547
-#define GL_COMBINER_SCALE_NV              0x8548
-#define GL_COMBINER_BIAS_NV               0x8549
-#define GL_COMBINER_AB_OUTPUT_NV          0x854A
-#define GL_COMBINER_CD_OUTPUT_NV          0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
-#define GL_COLOR_SUM_CLAMP_NV             0x854F
-#define GL_COMBINER0_NV                   0x8550
-#define GL_COMBINER1_NV                   0x8551
-#define GL_COMBINER2_NV                   0x8552
-#define GL_COMBINER3_NV                   0x8553
-#define GL_COMBINER4_NV                   0x8554
-#define GL_COMBINER5_NV                   0x8555
-#define GL_COMBINER6_NV                   0x8556
-#define GL_COMBINER7_NV                   0x8557
-/* reuse GL_TEXTURE0_ARB */
-/* reuse GL_TEXTURE1_ARB */
-/* reuse GL_ZERO */
-/* reuse GL_NONE */
-/* reuse GL_FOG */
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_FOG_DISTANCE_MODE_NV           0x855A
-#define GL_EYE_RADIAL_NV                  0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
-/* reuse GL_EYE_PLANE */
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_EMBOSS_LIGHT_NV                0x855D
-#define GL_EMBOSS_CONSTANT_NV             0x855E
-#define GL_EMBOSS_MAP_NV                  0x855F
-#endif
-
-#ifndef GL_NV_blend_square
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_COMBINE4_NV                    0x8503
-#define GL_SOURCE3_RGB_NV                 0x8583
-#define GL_SOURCE3_ALPHA_NV               0x858B
-#define GL_OPERAND3_RGB_NV                0x8593
-#define GL_OPERAND3_ALPHA_NV              0x859B
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#endif
-
-#ifndef GL_MESA_window_pos
-#endif
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_CULL_VERTEX_IBM                103050
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_VERTEX_ARRAY_LIST_IBM          103070
-#define GL_NORMAL_ARRAY_LIST_IBM          103071
-#define GL_COLOR_ARRAY_LIST_IBM           103072
-#define GL_INDEX_ARRAY_LIST_IBM           103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
-#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
-#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
-#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
-#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_YCRCB_SGIX                     0x8318
-#define GL_YCRCBA_SGIX                    0x8319
-#endif
-
-#ifndef GL_SGI_depth_pass_instrument
-#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
-#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
-#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_MULTISAMPLE_3DFX               0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
-#define GL_SAMPLES_3DFX                   0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_MULTISAMPLE_EXT                0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
-#define GL_SAMPLE_MASK_EXT                0x80A0
-#define GL_1PASS_EXT                      0x80A1
-#define GL_2PASS_0_EXT                    0x80A2
-#define GL_2PASS_1_EXT                    0x80A3
-#define GL_4PASS_0_EXT                    0x80A4
-#define GL_4PASS_1_EXT                    0x80A5
-#define GL_4PASS_2_EXT                    0x80A6
-#define GL_4PASS_3_EXT                    0x80A7
-#define GL_SAMPLE_BUFFERS_EXT             0x80A8
-#define GL_SAMPLES_EXT                    0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
-#define GL_SAMPLE_PATTERN_EXT             0x80AC
-#define GL_MULTISAMPLE_BIT_EXT            0x20000000
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_VERTEX_PRECLIP_SGIX            0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_CONVOLUTION_HINT_SGIX          0x8316
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
-#define GL_EYE_POINT_SGIS                 0x81F4
-#define GL_OBJECT_POINT_SGIS              0x81F5
-#define GL_EYE_LINE_SGIS                  0x81F6
-#define GL_OBJECT_LINE_SGIS               0x81F7
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_DOT3_RGB_EXT                   0x8740
-#define GL_DOT3_RGBA_EXT                  0x8741
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_MIRROR_CLAMP_ATI               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
-#endif
-
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV               0x84F2
-#define GL_FENCE_STATUS_NV                0x84F3
-#define GL_FENCE_CONDITION_NV             0x84F4
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM            0x8370
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_EVAL_2D_NV                     0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
-#define GL_MAP_TESSELLATION_NV            0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_DEPTH_STENCIL_NV               0x84F9
-#define GL_UNSIGNED_INT_24_8_NV           0x84FA
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_PER_STAGE_CONSTANTS_NV         0x8535
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV           0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
-#define GL_SHADER_CONSISTENT_NV           0x86DD
-#define GL_TEXTURE_SHADER_NV              0x86DE
-#define GL_SHADER_OPERATION_NV            0x86DF
-#define GL_CULL_MODES_NV                  0x86E0
-#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
-#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
-#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
-#define GL_CONST_EYE_NV                   0x86E5
-#define GL_PASS_THROUGH_NV                0x86E6
-#define GL_CULL_FRAGMENT_NV               0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
-#define GL_DOT_PRODUCT_NV                 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV                        0x86F4
-#define GL_DSDT_NV                        0x86F5
-#define GL_DSDT_MAG_NV                    0x86F6
-#define GL_DSDT_MAG_VIB_NV                0x86F7
-#define GL_HILO16_NV                      0x86F8
-#define GL_SIGNED_HILO_NV                 0x86F9
-#define GL_SIGNED_HILO16_NV               0x86FA
-#define GL_SIGNED_RGBA_NV                 0x86FB
-#define GL_SIGNED_RGBA8_NV                0x86FC
-#define GL_SIGNED_RGB_NV                  0x86FE
-#define GL_SIGNED_RGB8_NV                 0x86FF
-#define GL_SIGNED_LUMINANCE_NV            0x8701
-#define GL_SIGNED_LUMINANCE8_NV           0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
-#define GL_SIGNED_ALPHA_NV                0x8705
-#define GL_SIGNED_ALPHA8_NV               0x8706
-#define GL_SIGNED_INTENSITY_NV            0x8707
-#define GL_SIGNED_INTENSITY8_NV           0x8708
-#define GL_DSDT8_NV                       0x8709
-#define GL_DSDT8_MAG8_NV                  0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV                    0x870E
-#define GL_LO_SCALE_NV                    0x870F
-#define GL_DS_SCALE_NV                    0x8710
-#define GL_DT_SCALE_NV                    0x8711
-#define GL_MAGNITUDE_SCALE_NV             0x8712
-#define GL_VIBRANCE_SCALE_NV              0x8713
-#define GL_HI_BIAS_NV                     0x8714
-#define GL_LO_BIAS_NV                     0x8715
-#define GL_DS_BIAS_NV                     0x8716
-#define GL_DT_BIAS_NV                     0x8717
-#define GL_MAGNITUDE_BIAS_NV              0x8718
-#define GL_VIBRANCE_BIAS_NV               0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
-#define GL_TEXTURE_HI_SIZE_NV             0x871B
-#define GL_TEXTURE_LO_SIZE_NV             0x871C
-#define GL_TEXTURE_DS_SIZE_NV             0x871D
-#define GL_TEXTURE_DT_SIZE_NV             0x871E
-#define GL_TEXTURE_MAG_SIZE_NV            0x871F
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_VERTEX_PROGRAM_NV              0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
-#define GL_CURRENT_ATTRIB_NV              0x8626
-#define GL_PROGRAM_LENGTH_NV              0x8627
-#define GL_PROGRAM_STRING_NV              0x8628
-#define GL_MODELVIEW_PROJECTION_NV        0x8629
-#define GL_IDENTITY_NV                    0x862A
-#define GL_INVERSE_NV                     0x862B
-#define GL_TRANSPOSE_NV                   0x862C
-#define GL_INVERSE_TRANSPOSE_NV           0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV          0x862F
-#define GL_MATRIX0_NV                     0x8630
-#define GL_MATRIX1_NV                     0x8631
-#define GL_MATRIX2_NV                     0x8632
-#define GL_MATRIX3_NV                     0x8633
-#define GL_MATRIX4_NV                     0x8634
-#define GL_MATRIX5_NV                     0x8635
-#define GL_MATRIX6_NV                     0x8636
-#define GL_MATRIX7_NV                     0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
-#define GL_CURRENT_MATRIX_NV              0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
-#define GL_PROGRAM_PARAMETER_NV           0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
-#define GL_PROGRAM_TARGET_NV              0x8646
-#define GL_PROGRAM_RESIDENT_NV            0x8647
-#define GL_TRACK_MATRIX_NV                0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SCALEBIAS_HINT_SGIX            0x8322
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_INTERLACE_OML                  0x8980
-#define GL_INTERLACE_READ_OML             0x8981
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
-#endif
-
-#ifndef GL_OML_resample
-#define GL_PACK_RESAMPLE_OML              0x8984
-#define GL_UNPACK_RESAMPLE_OML            0x8985
-#define GL_RESAMPLE_REPLICATE_OML         0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
-#define GL_RESAMPLE_AVERAGE_OML           0x8988
-#define GL_RESAMPLE_DECIMATE_OML          0x8989
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_BUMP_ROT_MATRIX_ATI            0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
-#define GL_BUMP_TEX_UNITS_ATI             0x8778
-#define GL_DUDV_ATI                       0x8779
-#define GL_DU8DV8_ATI                     0x877A
-#define GL_BUMP_ENVMAP_ATI                0x877B
-#define GL_BUMP_TARGET_ATI                0x877C
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_FRAGMENT_SHADER_ATI            0x8920
-#define GL_REG_0_ATI                      0x8921
-#define GL_REG_1_ATI                      0x8922
-#define GL_REG_2_ATI                      0x8923
-#define GL_REG_3_ATI                      0x8924
-#define GL_REG_4_ATI                      0x8925
-#define GL_REG_5_ATI                      0x8926
-#define GL_REG_6_ATI                      0x8927
-#define GL_REG_7_ATI                      0x8928
-#define GL_REG_8_ATI                      0x8929
-#define GL_REG_9_ATI                      0x892A
-#define GL_REG_10_ATI                     0x892B
-#define GL_REG_11_ATI                     0x892C
-#define GL_REG_12_ATI                     0x892D
-#define GL_REG_13_ATI                     0x892E
-#define GL_REG_14_ATI                     0x892F
-#define GL_REG_15_ATI                     0x8930
-#define GL_REG_16_ATI                     0x8931
-#define GL_REG_17_ATI                     0x8932
-#define GL_REG_18_ATI                     0x8933
-#define GL_REG_19_ATI                     0x8934
-#define GL_REG_20_ATI                     0x8935
-#define GL_REG_21_ATI                     0x8936
-#define GL_REG_22_ATI                     0x8937
-#define GL_REG_23_ATI                     0x8938
-#define GL_REG_24_ATI                     0x8939
-#define GL_REG_25_ATI                     0x893A
-#define GL_REG_26_ATI                     0x893B
-#define GL_REG_27_ATI                     0x893C
-#define GL_REG_28_ATI                     0x893D
-#define GL_REG_29_ATI                     0x893E
-#define GL_REG_30_ATI                     0x893F
-#define GL_REG_31_ATI                     0x8940
-#define GL_CON_0_ATI                      0x8941
-#define GL_CON_1_ATI                      0x8942
-#define GL_CON_2_ATI                      0x8943
-#define GL_CON_3_ATI                      0x8944
-#define GL_CON_4_ATI                      0x8945
-#define GL_CON_5_ATI                      0x8946
-#define GL_CON_6_ATI                      0x8947
-#define GL_CON_7_ATI                      0x8948
-#define GL_CON_8_ATI                      0x8949
-#define GL_CON_9_ATI                      0x894A
-#define GL_CON_10_ATI                     0x894B
-#define GL_CON_11_ATI                     0x894C
-#define GL_CON_12_ATI                     0x894D
-#define GL_CON_13_ATI                     0x894E
-#define GL_CON_14_ATI                     0x894F
-#define GL_CON_15_ATI                     0x8950
-#define GL_CON_16_ATI                     0x8951
-#define GL_CON_17_ATI                     0x8952
-#define GL_CON_18_ATI                     0x8953
-#define GL_CON_19_ATI                     0x8954
-#define GL_CON_20_ATI                     0x8955
-#define GL_CON_21_ATI                     0x8956
-#define GL_CON_22_ATI                     0x8957
-#define GL_CON_23_ATI                     0x8958
-#define GL_CON_24_ATI                     0x8959
-#define GL_CON_25_ATI                     0x895A
-#define GL_CON_26_ATI                     0x895B
-#define GL_CON_27_ATI                     0x895C
-#define GL_CON_28_ATI                     0x895D
-#define GL_CON_29_ATI                     0x895E
-#define GL_CON_30_ATI                     0x895F
-#define GL_CON_31_ATI                     0x8960
-#define GL_MOV_ATI                        0x8961
-#define GL_ADD_ATI                        0x8963
-#define GL_MUL_ATI                        0x8964
-#define GL_SUB_ATI                        0x8965
-#define GL_DOT3_ATI                       0x8966
-#define GL_DOT4_ATI                       0x8967
-#define GL_MAD_ATI                        0x8968
-#define GL_LERP_ATI                       0x8969
-#define GL_CND_ATI                        0x896A
-#define GL_CND0_ATI                       0x896B
-#define GL_DOT2_ADD_ATI                   0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
-#define GL_NUM_PASSES_ATI                 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
-#define GL_SWIZZLE_STR_ATI                0x8976
-#define GL_SWIZZLE_STQ_ATI                0x8977
-#define GL_SWIZZLE_STR_DR_ATI             0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
-#define GL_SWIZZLE_STRQ_ATI               0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
-#define GL_RED_BIT_ATI                    0x00000001
-#define GL_GREEN_BIT_ATI                  0x00000002
-#define GL_BLUE_BIT_ATI                   0x00000004
-#define GL_2X_BIT_ATI                     0x00000001
-#define GL_4X_BIT_ATI                     0x00000002
-#define GL_8X_BIT_ATI                     0x00000004
-#define GL_HALF_BIT_ATI                   0x00000008
-#define GL_QUARTER_BIT_ATI                0x00000010
-#define GL_EIGHTH_BIT_ATI                 0x00000020
-#define GL_SATURATE_BIT_ATI               0x00000040
-#define GL_COMP_BIT_ATI                   0x00000002
-#define GL_NEGATE_BIT_ATI                 0x00000004
-#define GL_BIAS_BIT_ATI                   0x00000008
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_PN_TRIANGLES_ATI               0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_STATIC_ATI                     0x8760
-#define GL_DYNAMIC_ATI                    0x8761
-#define GL_PRESERVE_ATI                   0x8762
-#define GL_DISCARD_ATI                    0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_VERTEX_SHADER_EXT              0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
-#define GL_OP_INDEX_EXT                   0x8782
-#define GL_OP_NEGATE_EXT                  0x8783
-#define GL_OP_DOT3_EXT                    0x8784
-#define GL_OP_DOT4_EXT                    0x8785
-#define GL_OP_MUL_EXT                     0x8786
-#define GL_OP_ADD_EXT                     0x8787
-#define GL_OP_MADD_EXT                    0x8788
-#define GL_OP_FRAC_EXT                    0x8789
-#define GL_OP_MAX_EXT                     0x878A
-#define GL_OP_MIN_EXT                     0x878B
-#define GL_OP_SET_GE_EXT                  0x878C
-#define GL_OP_SET_LT_EXT                  0x878D
-#define GL_OP_CLAMP_EXT                   0x878E
-#define GL_OP_FLOOR_EXT                   0x878F
-#define GL_OP_ROUND_EXT                   0x8790
-#define GL_OP_EXP_BASE_2_EXT              0x8791
-#define GL_OP_LOG_BASE_2_EXT              0x8792
-#define GL_OP_POWER_EXT                   0x8793
-#define GL_OP_RECIP_EXT                   0x8794
-#define GL_OP_RECIP_SQRT_EXT              0x8795
-#define GL_OP_SUB_EXT                     0x8796
-#define GL_OP_CROSS_PRODUCT_EXT           0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
-#define GL_OP_MOV_EXT                     0x8799
-#define GL_OUTPUT_VERTEX_EXT              0x879A
-#define GL_OUTPUT_COLOR0_EXT              0x879B
-#define GL_OUTPUT_COLOR1_EXT              0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
-#define GL_OUTPUT_FOG_EXT                 0x87BD
-#define GL_SCALAR_EXT                     0x87BE
-#define GL_VECTOR_EXT                     0x87BF
-#define GL_MATRIX_EXT                     0x87C0
-#define GL_VARIANT_EXT                    0x87C1
-#define GL_INVARIANT_EXT                  0x87C2
-#define GL_LOCAL_CONSTANT_EXT             0x87C3
-#define GL_LOCAL_EXT                      0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
-#define GL_X_EXT                          0x87D5
-#define GL_Y_EXT                          0x87D6
-#define GL_Z_EXT                          0x87D7
-#define GL_W_EXT                          0x87D8
-#define GL_NEGATIVE_X_EXT                 0x87D9
-#define GL_NEGATIVE_Y_EXT                 0x87DA
-#define GL_NEGATIVE_Z_EXT                 0x87DB
-#define GL_NEGATIVE_W_EXT                 0x87DC
-#define GL_ZERO_EXT                       0x87DD
-#define GL_ONE_EXT                        0x87DE
-#define GL_NEGATIVE_ONE_EXT               0x87DF
-#define GL_NORMALIZED_RANGE_EXT           0x87E0
-#define GL_FULL_RANGE_EXT                 0x87E1
-#define GL_CURRENT_VERTEX_EXT             0x87E2
-#define GL_MVP_MATRIX_EXT                 0x87E3
-#define GL_VARIANT_VALUE_EXT              0x87E4
-#define GL_VARIANT_DATATYPE_EXT           0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
-#define GL_VARIANT_ARRAY_EXT              0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
-#define GL_INVARIANT_VALUE_EXT            0x87EA
-#define GL_INVARIANT_DATATYPE_EXT         0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
-#define GL_VERTEX_STREAM0_ATI             0x876C
-#define GL_VERTEX_STREAM1_ATI             0x876D
-#define GL_VERTEX_STREAM2_ATI             0x876E
-#define GL_VERTEX_STREAM3_ATI             0x876F
-#define GL_VERTEX_STREAM4_ATI             0x8770
-#define GL_VERTEX_STREAM5_ATI             0x8771
-#define GL_VERTEX_STREAM6_ATI             0x8772
-#define GL_VERTEX_STREAM7_ATI             0x8773
-#define GL_VERTEX_SOURCE_ATI              0x8774
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ELEMENT_ARRAY_ATI              0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_QUAD_MESH_SUN                  0x8614
-#define GL_TRIANGLE_MESH_SUN              0x8615
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SLICE_ACCUM_SUN                0x85CC
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_DEPTH_CLAMP_NV                 0x864F
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_PIXEL_COUNTER_BITS_NV          0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
-#define GL_PIXEL_COUNT_NV                 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_POINT_SPRITE_NV                0x8861
-#define GL_COORD_REPLACE_NV               0x8862
-#define GL_POINT_SPRITE_R_MODE_NV         0x8863
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV                       0x885E
-#define GL_SIGNED_HILO8_NV                0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_ELEMENT_ARRAY_APPLE            0x8768
-#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
-#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_DRAW_PIXELS_APPLE              0x8A0A
-#define GL_FENCE_APPLE                    0x8A0B
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
-#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
-#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
-#define GL_STORAGE_CACHED_APPLE           0x85BE
-#define GL_STORAGE_SHARED_APPLE           0x85BF
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_YCBCR_422_APPLE                0x85B9
-#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_RGB_S3TC                       0x83A0
-#define GL_RGB4_S3TC                      0x83A1
-#define GL_RGBA_S3TC                      0x83A2
-#define GL_RGBA4_S3TC                     0x83A3
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
-#define GL_DRAW_BUFFER0_ATI               0x8825
-#define GL_DRAW_BUFFER1_ATI               0x8826
-#define GL_DRAW_BUFFER2_ATI               0x8827
-#define GL_DRAW_BUFFER3_ATI               0x8828
-#define GL_DRAW_BUFFER4_ATI               0x8829
-#define GL_DRAW_BUFFER5_ATI               0x882A
-#define GL_DRAW_BUFFER6_ATI               0x882B
-#define GL_DRAW_BUFFER7_ATI               0x882C
-#define GL_DRAW_BUFFER8_ATI               0x882D
-#define GL_DRAW_BUFFER9_ATI               0x882E
-#define GL_DRAW_BUFFER10_ATI              0x882F
-#define GL_DRAW_BUFFER11_ATI              0x8830
-#define GL_DRAW_BUFFER12_ATI              0x8831
-#define GL_DRAW_BUFFER13_ATI              0x8832
-#define GL_DRAW_BUFFER14_ATI              0x8833
-#define GL_DRAW_BUFFER15_ATI              0x8834
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
-#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_MODULATE_ADD_ATI               0x8744
-#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
-#define GL_MODULATE_SUBTRACT_ATI          0x8746
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_RGBA_FLOAT32_ATI               0x8814
-#define GL_RGB_FLOAT32_ATI                0x8815
-#define GL_ALPHA_FLOAT32_ATI              0x8816
-#define GL_INTENSITY_FLOAT32_ATI          0x8817
-#define GL_LUMINANCE_FLOAT32_ATI          0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
-#define GL_RGBA_FLOAT16_ATI               0x881A
-#define GL_RGB_FLOAT16_ATI                0x881B
-#define GL_ALPHA_FLOAT16_ATI              0x881C
-#define GL_INTENSITY_FLOAT16_ATI          0x881D
-#define GL_LUMINANCE_FLOAT16_ATI          0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_FLOAT_R_NV                     0x8880
-#define GL_FLOAT_RG_NV                    0x8881
-#define GL_FLOAT_RGB_NV                   0x8882
-#define GL_FLOAT_RGBA_NV                  0x8883
-#define GL_FLOAT_R16_NV                   0x8884
-#define GL_FLOAT_R32_NV                   0x8885
-#define GL_FLOAT_RG16_NV                  0x8886
-#define GL_FLOAT_RG32_NV                  0x8887
-#define GL_FLOAT_RGB16_NV                 0x8888
-#define GL_FLOAT_RGB32_NV                 0x8889
-#define GL_FLOAT_RGBA16_NV                0x888A
-#define GL_FLOAT_RGBA32_NV                0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
-#define GL_FLOAT_RGBA_MODE_NV             0x888E
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-#define GL_FRAGMENT_PROGRAM_NV            0x8870
-#define GL_MAX_TEXTURE_COORDS_NV          0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
-#define GL_PROGRAM_ERROR_STRING_NV        0x8874
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_HALF_FLOAT_NV                  0x140B
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
-#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
-#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
-#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
-#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
-#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_PRIMITIVE_RESTART_NV           0x8558
-#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
-#endif
-
-#ifndef GL_NV_vertex_program2
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_STENCIL_BACK_FUNC_ATI          0x8800
-#define GL_STENCIL_BACK_FAIL_ATI          0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
-#define GL_DEPTH_BOUNDS_EXT               0x8891
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_MIRROR_CLAMP_EXT               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
-#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
-#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_PACK_INVERT_MESA               0x8758
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
-#define GL_YCBCR_MESA                     0x8757
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
-#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
-#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
-#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
-#endif
-
-#ifndef GL_NV_vertex_program3
-/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT 0x8CD8
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
-#define GL_FRAMEBUFFER_EXT                0x8D40
-#define GL_RENDERBUFFER_EXT               0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX1_EXT             0x8D46
-#define GL_STENCIL_INDEX4_EXT             0x8D47
-#define GL_STENCIL_INDEX8_EXT             0x8D48
-#define GL_STENCIL_INDEX16_EXT            0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;			/* native character */
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_ARB_shader_objects
-/* GL types for handling shader object handles and program/shader text */
-typedef char GLcharARB;		/* native character */
-typedef unsigned int GLhandleARB;	/* shader object handle */
-#endif
-
-/* GL types for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glBlendEquation (GLenum);
-GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogram (GLenum);
-GLAPI void APIENTRY glResetMinmax (GLenum);
-GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum);
-GLAPI void APIENTRY glClientActiveTexture (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glFogCoordf (GLfloat);
-GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
-GLAPI void APIENTRY glFogCoordd (GLdouble);
-GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
-GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
-GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2iv (const GLint *);
-GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
-GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3iv (const GLint *);
-GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint);
-GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
-GLAPI void APIENTRY glEndQuery (GLenum);
-GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
-GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
-GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
-GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
-GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
-GLAPI void APIENTRY glCompileShader (GLuint);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum);
-GLAPI void APIENTRY glDeleteProgram (GLuint);
-GLAPI void APIENTRY glDeleteShader (GLuint);
-GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint);
-GLAPI GLboolean APIENTRY glIsShader (GLuint);
-GLAPI void APIENTRY glLinkProgram (GLuint);
-GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
-GLAPI void APIENTRY glUseProgram (GLuint);
-GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1i (GLint, GLint);
-GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glValidateProgram (GLuint);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
-GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
-GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
-GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
-GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
-GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexBlendARB (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_ARB_texture_mirrored_repeat 1
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-#endif
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_ARB_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
-GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
-GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_ARB_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
-GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
-GLAPI void APIENTRY glEndQueryARB (GLenum);
-GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_ARB_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
-GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
-GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
-GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
-GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
-GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
-GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
-GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
-GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
-GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_ARB_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_ARB_fragment_shader 1
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100 1
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#define GL_ARB_texture_non_power_of_two 1
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_ARB_point_sprite 1
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#define GL_ARB_fragment_program_shadow 1
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_ARB_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
-typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogramEXT (GLenum);
-GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif
-
-#ifndef GL_EXT_color_matrix
-#define GL_EXT_color_matrix 1
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
-GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glArrayElementEXT (GLint);
-GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
-GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
-GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
-typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_SGIX_pixel_tiles 1
-#endif
-
-#ifndef GL_SGIX_texture_select
-#define GL_SGIX_texture_select 1
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
-GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_SGIS_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_SGIX_instruments 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
-GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
-GLAPI void APIENTRY glStartInstrumentsSGIX (void);
-GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
-typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
-typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
-typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameZoomSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTagSampleBufferSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_SGIX_polynomial_ffd 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
-GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
-GLAPI void APIENTRY glDeformSGIX (GLbitfield);
-GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushRasterSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-#endif
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glHintPGI (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
-GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
-GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
-GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_SGIX_calligraphic_fragment 1
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-#endif
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
-GLAPI void APIENTRY glUnlockArraysEXT (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
-GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_SGIX_fragment_lighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
-GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyTextureEXT (GLenum);
-GLAPI void APIENTRY glTextureLightEXT (GLenum);
-GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
-GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
-GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
-GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
-GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
-GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
-typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
-typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
-GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureNormalEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
-GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
-GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
-GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
-GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
-GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
-GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
-GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
-typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
-typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
-typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
-typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
-typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
-typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
-typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
-typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
-typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
-typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_SGIX_fog_scale 1
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFinishTextureSUNX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
-GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
-GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
-GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
-GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
-GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
-GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
-GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
-GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
-GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
-GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
-GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
-GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
-GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_blend_func_separate
-#define GL_INGR_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
-GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
-GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
-GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
-GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
-GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
-GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-#endif
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glResizeBuffersMESA (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
-#endif
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
-GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
-GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_SGIX_subsample 1
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_SGIX_ycrcba 1
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#define GL_SGIX_ycrcb_subsample 1
-#endif
-
-#ifndef GL_SGIX_depth_pass_instrument
-#define GL_SGIX_depth_pass_instrument 1
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_SGIS_texture_color_mask 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif
-
-#ifndef GL_SGIX_igloo_interface
-#define GL_SGIX_igloo_interface 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_EXT_texture_env_dot3 1
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_ATI_texture_mirror_once 1
-#endif
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
-GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFinishFenceNV (GLuint);
-GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
-GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
-GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
-GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
-GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
-GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
-GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
-GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
-typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SGIX_scalebias_hint 1
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-#endif
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
-GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
-GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glBeginFragmentShaderATI (void);
-GLAPI void APIENTRY glEndFragmentShaderATI (void);
-GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
-GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
-GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
-GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
-GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
-typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVertexShaderEXT (void);
-GLAPI void APIENTRY glEndVertexShaderEXT (void);
-GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
-GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
-GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
-GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
-GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
-GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
-GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
-GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
-GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
-GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
-GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
-typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
-typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
-typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
-typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
-typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
-typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
-GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
-GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
-GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
-GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
-GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
-GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glEndOcclusionQueryNV (void);
-GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#define GL_EXT_shadow_funcs 1
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_ATI_text_fragment_shader 1
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_APPLE_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_APPLE_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
-GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
-GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
-typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
-typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_APPLE_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
-GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_APPLE_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_S3_s3tc 1
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_ATI_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_ATI_pixel_format_float 1
-/* This is really a WGL extension, but defines some associated GL enums.
- * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
- */
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_ATI_texture_env_combine3 1
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
-GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
-GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_NV_half_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
-GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
-typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_NV_pixel_data_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_NV_primitive_restart 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPrimitiveRestartNV (void);
-GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_NV_texture_expand_normal 1
-#endif
-
-#ifndef GL_NV_vertex_program2
-#define GL_NV_vertex_program2 1
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#define GL_ATI_map_object_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_ATI_separate_stencil 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#define GL_ATI_vertex_attrib_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_EXT_texture_mirror_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_MESA_pack_invert 1
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_MESA_ycbcr_texture 1
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_EXT_pixel_buffer_object 1
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#define GL_NV_fragment_program_option 1
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_NV_fragment_program2 1
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-#define GL_NV_vertex_program2_option 1
-#endif
-
-#ifndef GL_NV_vertex_program3
-#define GL_NV_vertex_program3 1
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
-GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
-GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
-GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
-GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
-GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#define GL_GREMEDY_string_marker 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-#endif /* NO_SDL_GLEXT */
-/*@}*/
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_platform.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_platform.h
deleted file mode 100644
index 11d8673667a..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_platform.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_platform.h
- *  Try to get a standard set of platform defines
- */
-
-#ifndef _SDL_platform_h
-#define _SDL_platform_h
-
-#if defined(_AIX)
-#undef __AIX__
-#define __AIX__		1
-#endif
-#if defined(__BEOS__)
-#undef __BEOS__
-#define __BEOS__	1
-#endif
-#if defined(__HAIKU__)
-#undef __HAIKU__
-#define __HAIKU__ 1
-#endif
-#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
-#undef __BSDI__
-#define __BSDI__	1
-#endif
-#if defined(_arch_dreamcast)
-#undef __DREAMCAST__
-#define __DREAMCAST__	1
-#endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#undef __FREEBSD__
-#define __FREEBSD__	1
-#endif
-#if defined(__HAIKU__)
-#undef __HAIKU__
-#define __HAIKU__	1
-#endif
-#if defined(hpux) || defined(__hpux) || defined(__hpux__)
-#undef __HPUX__
-#define __HPUX__	1
-#endif
-#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
-#undef __IRIX__
-#define __IRIX__	1
-#endif
-#if defined(linux) || defined(__linux) || defined(__linux__)
-#undef __LINUX__
-#define __LINUX__	1
-#endif
-#if defined(__APPLE__)
-#undef __MACOSX__
-#define __MACOSX__	1
-#elif defined(macintosh)
-#undef __MACOS__
-#define __MACOS__	1
-#endif
-#if defined(__NetBSD__)
-#undef __NETBSD__
-#define __NETBSD__	1
-#endif
-#if defined(__OpenBSD__)
-#undef __OPENBSD__
-#define __OPENBSD__	1
-#endif
-#if defined(__OS2__)
-#undef __OS2__
-#define __OS2__		1
-#endif
-#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
-#undef __OSF__
-#define __OSF__		1
-#endif
-#if defined(__QNXNTO__)
-#undef __QNXNTO__
-#define __QNXNTO__	1
-#endif
-#if defined(riscos) || defined(__riscos) || defined(__riscos__)
-#undef __RISCOS__
-#define __RISCOS__	1
-#endif
-#if defined(__SVR4)
-#undef __SOLARIS__
-#define __SOLARIS__	1
-#endif
-#if defined(WIN32) || defined(_WIN32)
-#undef __WIN32__
-#define __WIN32__	1
-#endif
-
-#endif /* _SDL_platform_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_quit.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_quit.h
deleted file mode 100644
index 6d82e7e0610..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_quit.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_quit.h
- *  Include file for SDL quit event handling
- */
-
-#ifndef _SDL_quit_h
-#define _SDL_quit_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-/** @file SDL_quit.h
- *  An SDL_QUITEVENT is generated when the user tries to close the application
- *  window.  If it is ignored or filtered out, the window will remain open.
- *  If it is not ignored or filtered, it is queued normally and the window
- *  is allowed to close.  When the window is closed, screen updates will 
- *  complete, but have no effect.
- *
- *  SDL_Init() installs signal handlers for SIGINT (keyboard interrupt)
- *  and SIGTERM (system termination request), if handlers do not already
- *  exist, that generate SDL_QUITEVENT events as well.  There is no way
- *  to determine the cause of an SDL_QUITEVENT, but setting a signal
- *  handler in your application will override the default generation of
- *  quit events for that signal.
- */
-
-/** @file SDL_quit.h
- *  There are no functions directly affecting the quit event 
- */
-
-#define SDL_QuitRequested() \
-        (SDL_PumpEvents(), SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUITMASK))
-
-#endif /* _SDL_quit_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_rwops.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_rwops.h
deleted file mode 100644
index a450119f1cc..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_rwops.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_rwops.h
- *  This file provides a general interface for SDL to read and write
- *  data sources.  It can easily be extended to files, memory, etc.
- */
-
-#ifndef _SDL_rwops_h
-#define _SDL_rwops_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This is the read/write operation structure -- very basic */
-
-typedef struct SDL_RWops {
-	/** Seek to 'offset' relative to whence, one of stdio's whence values:
-	 *	SEEK_SET, SEEK_CUR, SEEK_END
-	 *  Returns the final offset in the data source.
-	 */
-	int (SDLCALL *seek)(struct SDL_RWops *context, int offset, int whence);
-
-	/** Read up to 'maxnum' objects each of size 'size' from the data
-	 *  source to the area pointed at by 'ptr'.
-	 *  Returns the number of objects read, or -1 if the read failed.
-	 */
-	int (SDLCALL *read)(struct SDL_RWops *context, void *ptr, int size, int maxnum);
-
-	/** Write exactly 'num' objects each of size 'objsize' from the area
-	 *  pointed at by 'ptr' to data source.
-	 *  Returns 'num', or -1 if the write failed.
-	 */
-	int (SDLCALL *write)(struct SDL_RWops *context, const void *ptr, int size, int num);
-
-	/** Close and free an allocated SDL_FSops structure */
-	int (SDLCALL *close)(struct SDL_RWops *context);
-
-	Uint32 type;
-	union {
-#if defined(__WIN32__) && !defined(__SYMBIAN32__)
-	    struct {
-		int   append;
-		void *h;
-		struct {
-		    void *data;
-		    int size;
-		    int left;
-		} buffer;
-	    } win32io;
-#endif
-#ifdef HAVE_STDIO_H 
-	    struct {
-		int autoclose;
-	 	FILE *fp;
-	    } stdio;
-#endif
-	    struct {
-		Uint8 *base;
-	 	Uint8 *here;
-		Uint8 *stop;
-	    } mem;
-	    struct {
-		void *data1;
-	    } unknown;
-	} hidden;
-
-} SDL_RWops;
-
-
-/** @name Functions to create SDL_RWops structures from various data sources */
-/*@{*/
-
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromFile(const char *file, const char *mode);
-
-#ifdef HAVE_STDIO_H
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromFP(FILE *fp, int autoclose);
-#endif
-
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromMem(void *mem, int size);
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromConstMem(const void *mem, int size);
-
-extern DECLSPEC SDL_RWops * SDLCALL SDL_AllocRW(void);
-extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops *area);
-
-/*@}*/
-
-/** @name Seek Reference Points */
-/*@{*/
-#define RW_SEEK_SET	0	/**< Seek from the beginning of data */
-#define RW_SEEK_CUR	1	/**< Seek relative to current read point */
-#define RW_SEEK_END	2	/**< Seek relative to the end of data */
-/*@}*/
-
-/** @name Macros to easily read and write from an SDL_RWops structure */
-/*@{*/
-#define SDL_RWseek(ctx, offset, whence)	(ctx)->seek(ctx, offset, whence)
-#define SDL_RWtell(ctx)			(ctx)->seek(ctx, 0, RW_SEEK_CUR)
-#define SDL_RWread(ctx, ptr, size, n)	(ctx)->read(ctx, ptr, size, n)
-#define SDL_RWwrite(ctx, ptr, size, n)	(ctx)->write(ctx, ptr, size, n)
-#define SDL_RWclose(ctx)		(ctx)->close(ctx)
-/*@}*/
-
-/** @name Read an item of the specified endianness and return in native format */
-/*@{*/
-extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops *src);
-extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops *src);
-extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops *src);
-extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops *src);
-extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops *src);
-extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops *src);
-/*@}*/
-
-/** @name Write an item of native format to the specified endianness */
-/*@{*/
-extern DECLSPEC int SDLCALL SDL_WriteLE16(SDL_RWops *dst, Uint16 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE16(SDL_RWops *dst, Uint16 value);
-extern DECLSPEC int SDLCALL SDL_WriteLE32(SDL_RWops *dst, Uint32 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE32(SDL_RWops *dst, Uint32 value);
-extern DECLSPEC int SDLCALL SDL_WriteLE64(SDL_RWops *dst, Uint64 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE64(SDL_RWops *dst, Uint64 value);
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_rwops_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_stdinc.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_stdinc.h
deleted file mode 100644
index e1f85fb75ab..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_stdinc.h
+++ /dev/null
@@ -1,620 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_stdinc.h
- *  This is a general header that includes C language support
- */
-
-#ifndef _SDL_stdinc_h
-#define _SDL_stdinc_h
-
-#include "SDL_config.h"
-
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if defined(STDC_HEADERS)
-# include <stdlib.h>
-# include <stddef.h>
-# include <stdarg.h>
-#else
-# if defined(HAVE_STDLIB_H)
-#  include <stdlib.h>
-# elif defined(HAVE_MALLOC_H)
-#  include <malloc.h>
-# endif
-# if defined(HAVE_STDDEF_H)
-#  include <stddef.h>
-# endif
-# if defined(HAVE_STDARG_H)
-#  include <stdarg.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif defined(HAVE_STDINT_H)
-# include <stdint.h>
-#endif
-#ifdef HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
-# include <iconv.h>
-#endif
-
-/** The number of elements in an array */
-#define SDL_arraysize(array)	(sizeof(array)/sizeof(array[0]))
-#define SDL_TABLESIZE(table)	SDL_arraysize(table)
-
-/* Use proper C++ casts when compiled as C++ to be compatible with the option
- -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above. */
-#ifdef __cplusplus
-#define SDL_reinterpret_cast(type, expression) reinterpret_cast<type>(expression)
-#define SDL_static_cast(type, expression) static_cast<type>(expression)
-#else
-#define SDL_reinterpret_cast(type, expression) ((type)(expression))
-#define SDL_static_cast(type, expression) ((type)(expression))
-#endif
-
-/** @name Basic data types */
-/*@{*/
-typedef enum {
-	SDL_FALSE = 0,
-	SDL_TRUE  = 1
-} SDL_bool;
-
-typedef int8_t		Sint8;
-typedef uint8_t		Uint8;
-typedef int16_t		Sint16;
-typedef uint16_t	Uint16;
-typedef int32_t		Sint32;
-typedef uint32_t	Uint32;
-
-#ifdef SDL_HAS_64BIT_TYPE
-typedef int64_t		Sint64;
-#ifndef SYMBIAN32_GCCE
-typedef uint64_t	Uint64;
-#endif
-#else
-/* This is really just a hack to prevent the compiler from complaining */
-typedef struct {
-	Uint32 hi;
-	Uint32 lo;
-} Uint64, Sint64;
-#endif
-
-/*@}*/
-
-/** @name Make sure the types really have the right sizes */
-/*@{*/
-#define SDL_COMPILE_TIME_ASSERT(name, x)               \
-       typedef int SDL_dummy_ ## name[(x) * 2 - 1]
-
-SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1);
-SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1);
-SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
-SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
-SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
-SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
-SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
-SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
-/*@}*/
-
-/** @name Enum Size Check
- *  Check to make sure enums are the size of ints, for structure packing.
- *  For both Watcom C/C++ and Borland C/C++ the compiler option that makes
- *  enums having the size of an int must be enabled.
- *  This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11).
- */
-/* Enable enums always int in CodeWarrior (for MPW use "-enum int") */
-#ifdef __MWERKS__
-#pragma enumsalwaysint on
-#endif
-
-typedef enum {
-	DUMMY_ENUM_VALUE
-} SDL_DUMMY_ENUM;
-
-#ifndef __NDS__
-SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
-#endif
-/*@}*/
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef HAVE_MALLOC
-#define SDL_malloc	malloc
-#else
-extern DECLSPEC void * SDLCALL SDL_malloc(size_t size);
-#endif
-
-#ifdef HAVE_CALLOC
-#define SDL_calloc	calloc
-#else
-extern DECLSPEC void * SDLCALL SDL_calloc(size_t nmemb, size_t size);
-#endif
-
-#ifdef HAVE_REALLOC
-#define SDL_realloc	realloc
-#else
-extern DECLSPEC void * SDLCALL SDL_realloc(void *mem, size_t size);
-#endif
-
-#ifdef HAVE_FREE
-#define SDL_free	free
-#else
-extern DECLSPEC void SDLCALL SDL_free(void *mem);
-#endif
-
-#if defined(HAVE_ALLOCA) && !defined(alloca)
-# if defined(HAVE_ALLOCA_H)
-#  include <alloca.h>
-# elif defined(__GNUC__)
-#  define alloca __builtin_alloca
-# elif defined(_MSC_VER)
-#  include <malloc.h>
-#  define alloca _alloca
-# elif defined(__WATCOMC__)
-#  include <malloc.h>
-# elif defined(__BORLANDC__)
-#  include <malloc.h>
-# elif defined(__DMC__)
-#  include <stdlib.h>
-# elif defined(__AIX__)
-  #pragma alloca
-# elif defined(__MRC__)
-   void *alloca (unsigned);
-# else
-   char *alloca ();
-# endif
-#endif
-#ifdef HAVE_ALLOCA
-#define SDL_stack_alloc(type, count)    (type*)alloca(sizeof(type)*(count))
-#define SDL_stack_free(data)
-#else
-#define SDL_stack_alloc(type, count)    (type*)SDL_malloc(sizeof(type)*(count))
-#define SDL_stack_free(data)            SDL_free(data)
-#endif
-
-#ifdef HAVE_GETENV
-#define SDL_getenv	getenv
-#else
-extern DECLSPEC char * SDLCALL SDL_getenv(const char *name);
-#endif
-
-#ifdef HAVE_PUTENV
-#define SDL_putenv	putenv
-#else
-extern DECLSPEC int SDLCALL SDL_putenv(const char *variable);
-#endif
-
-#ifdef HAVE_QSORT
-#define SDL_qsort	qsort
-#else
-extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size,
-           int (*compare)(const void *, const void *));
-#endif
-
-#ifdef HAVE_ABS
-#define SDL_abs		abs
-#else
-#define SDL_abs(X)	((X) < 0 ? -(X) : (X))
-#endif
-
-#define SDL_min(x, y)	(((x) < (y)) ? (x) : (y))
-#define SDL_max(x, y)	(((x) > (y)) ? (x) : (y))
-
-#ifdef HAVE_CTYPE_H
-#define SDL_isdigit(X)  isdigit(X)
-#define SDL_isspace(X)  isspace(X)
-#define SDL_toupper(X)  toupper(X)
-#define SDL_tolower(X)  tolower(X)
-#else
-#define SDL_isdigit(X)  (((X) >= '0') && ((X) <= '9'))
-#define SDL_isspace(X)  (((X) == ' ') || ((X) == '\t') || ((X) == '\r') || ((X) == '\n'))
-#define SDL_toupper(X)  (((X) >= 'a') && ((X) <= 'z') ? ('A'+((X)-'a')) : (X))
-#define SDL_tolower(X)  (((X) >= 'A') && ((X) <= 'Z') ? ('a'+((X)-'A')) : (X))
-#endif
-
-#ifdef HAVE_MEMSET
-#define SDL_memset      memset
-#else
-extern DECLSPEC void * SDLCALL SDL_memset(void *dst, int c, size_t len);
-#endif
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_memset4(dst, val, len)				\
-do {								\
-	int u0, u1, u2;						\
-	__asm__ __volatile__ (					\
-		"cld\n\t"					\
-		"rep ; stosl\n\t"				\
-		: "=&D" (u0), "=&a" (u1), "=&c" (u2)		\
-		: "0" (dst), "1" (val), "2" (SDL_static_cast(Uint32, len))	\
-		: "memory" );					\
-} while(0)
-#endif
-#ifndef SDL_memset4
-#define SDL_memset4(dst, val, len)		\
-do {						\
-	unsigned _count = (len);		\
-	unsigned _n = (_count + 3) / 4;		\
-	Uint32 *_p = SDL_static_cast(Uint32 *, dst);	\
-	Uint32 _val = (val);			\
-	if (len == 0) break;			\
-        switch (_count % 4) {			\
-        case 0: do {    *_p++ = _val;		\
-        case 3:         *_p++ = _val;		\
-        case 2:         *_p++ = _val;		\
-        case 1:         *_p++ = _val;		\
-		} while ( --_n );		\
-	}					\
-} while(0)
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy(dst, src, len) memcpy(dst, src, len)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy(dst, src, len)					  \
-do {									  \
-	int u0, u1, u2;						  	  \
-	__asm__ __volatile__ (						  \
-		"cld\n\t"						  \
-		"rep ; movsl\n\t"					  \
-		"testb $2,%b4\n\t"					  \
-		"je 1f\n\t"						  \
-		"movsw\n"						  \
-		"1:\ttestb $1,%b4\n\t"					  \
-		"je 2f\n\t"						  \
-		"movsb\n"						  \
-		"2:"							  \
-		: "=&c" (u0), "=&D" (u1), "=&S" (u2)			  \
-		: "0" (SDL_static_cast(unsigned, len)/4), "q" (len), "1" (dst),"2" (src) \
-		: "memory" );						  \
-} while(0)
-#endif
-#ifndef SDL_memcpy
-#ifdef HAVE_MEMCPY
-#define SDL_memcpy      memcpy
-#elif defined(HAVE_BCOPY)
-#define SDL_memcpy(d, s, n)	bcopy((s), (d), (n))
-#else
-extern DECLSPEC void * SDLCALL SDL_memcpy(void *dst, const void *src, size_t len);
-#endif
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy4(dst, src, len) memcpy(dst, src, (len)*4)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy4(dst, src, len)				\
-do {								\
-	int ecx, edi, esi;					\
-	__asm__ __volatile__ (					\
-		"cld\n\t"					\
-		"rep ; movsl"					\
-		: "=&c" (ecx), "=&D" (edi), "=&S" (esi)		\
-		: "0" (SDL_static_cast(unsigned, len)), "1" (dst), "2" (src)	\
-		: "memory" );					\
-} while(0)
-#endif
-#ifndef SDL_memcpy4
-#define SDL_memcpy4(dst, src, len)	SDL_memcpy(dst, src, (len) << 2)
-#endif
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_revcpy(dst, src, len)			\
-do {							\
-	int u0, u1, u2;					\
-	char *dstp = SDL_static_cast(char *, dst);	\
-	char *srcp = SDL_static_cast(char *, src);	\
-	int n = (len);					\
-	if ( n >= 4 ) {					\
-	__asm__ __volatile__ (				\
-		"std\n\t"				\
-		"rep ; movsl\n\t"			\
-		"cld\n\t"				\
-		: "=&c" (u0), "=&D" (u1), "=&S" (u2)	\
-		: "0" (n >> 2),				\
-		  "1" (dstp+(n-4)), "2" (srcp+(n-4))	\
-		: "memory" );				\
-	}						\
-	switch (n & 3) {				\
-		case 3: dstp[2] = srcp[2];		\
-		case 2: dstp[1] = srcp[1];		\
-		case 1: dstp[0] = srcp[0];		\
-			break;				\
-		default:				\
-			break;				\
-	}						\
-} while(0)
-#endif
-#ifndef SDL_revcpy
-extern DECLSPEC void * SDLCALL SDL_revcpy(void *dst, const void *src, size_t len);
-#endif
-
-#ifdef HAVE_MEMMOVE
-#define SDL_memmove     memmove
-#elif defined(HAVE_BCOPY)
-#define SDL_memmove(d, s, n)	bcopy((s), (d), (n))
-#else
-#define SDL_memmove(dst, src, len)			\
-do {							\
-	if ( dst < src ) {				\
-		SDL_memcpy(dst, src, len);		\
-	} else {					\
-		SDL_revcpy(dst, src, len);		\
-	}						\
-} while(0)
-#endif
-
-#ifdef HAVE_MEMCMP
-#define SDL_memcmp      memcmp
-#else
-extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len);
-#endif
-
-#ifdef HAVE_STRLEN
-#define SDL_strlen      strlen
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlen(const char *string);
-#endif
-
-#ifdef HAVE_STRLCPY
-#define SDL_strlcpy     strlcpy
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t maxlen);
-#endif
-
-#ifdef HAVE_STRLCAT
-#define SDL_strlcat    strlcat
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, size_t maxlen);
-#endif
-
-#ifdef HAVE_STRDUP
-#define SDL_strdup     strdup
-#else
-extern DECLSPEC char * SDLCALL SDL_strdup(const char *string);
-#endif
-
-#ifdef HAVE__STRREV
-#define SDL_strrev      _strrev
-#else
-extern DECLSPEC char * SDLCALL SDL_strrev(char *string);
-#endif
-
-#ifdef HAVE__STRUPR
-#define SDL_strupr      _strupr
-#else
-extern DECLSPEC char * SDLCALL SDL_strupr(char *string);
-#endif
-
-#ifdef HAVE__STRLWR
-#define SDL_strlwr      _strlwr
-#else
-extern DECLSPEC char * SDLCALL SDL_strlwr(char *string);
-#endif
-
-#ifdef HAVE_STRCHR
-#define SDL_strchr      strchr
-#elif defined(HAVE_INDEX)
-#define SDL_strchr      index
-#else
-extern DECLSPEC char * SDLCALL SDL_strchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRRCHR
-#define SDL_strrchr     strrchr
-#elif defined(HAVE_RINDEX)
-#define SDL_strrchr     rindex
-#else
-extern DECLSPEC char * SDLCALL SDL_strrchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRSTR
-#define SDL_strstr      strstr
-#else
-extern DECLSPEC char * SDLCALL SDL_strstr(const char *haystack, const char *needle);
-#endif
-
-#ifdef HAVE_ITOA
-#define SDL_itoa        itoa
-#else
-#define SDL_itoa(value, string, radix)	SDL_ltoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__LTOA
-#define SDL_ltoa        _ltoa
-#else
-extern DECLSPEC char * SDLCALL SDL_ltoa(long value, char *string, int radix);
-#endif
-
-#ifdef HAVE__UITOA
-#define SDL_uitoa       _uitoa
-#else
-#define SDL_uitoa(value, string, radix)	SDL_ultoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__ULTOA
-#define SDL_ultoa       _ultoa
-#else
-extern DECLSPEC char * SDLCALL SDL_ultoa(unsigned long value, char *string, int radix);
-#endif
-
-#ifdef HAVE_STRTOL
-#define SDL_strtol      strtol
-#else
-extern DECLSPEC long SDLCALL SDL_strtol(const char *string, char **endp, int base);
-#endif
-
-#ifdef HAVE_STRTOUL
-#define SDL_strtoul      strtoul
-#else
-extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *string, char **endp, int base);
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-
-#ifdef HAVE__I64TOA
-#define SDL_lltoa       _i64toa
-#else
-extern DECLSPEC char* SDLCALL SDL_lltoa(Sint64 value, char *string, int radix);
-#endif
-
-#ifdef HAVE__UI64TOA
-#define SDL_ulltoa      _ui64toa
-#else
-extern DECLSPEC char* SDLCALL SDL_ulltoa(Uint64 value, char *string, int radix);
-#endif
-
-#ifdef HAVE_STRTOLL
-#define SDL_strtoll     strtoll
-#else
-extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *string, char **endp, int base);
-#endif
-
-#ifdef HAVE_STRTOULL
-#define SDL_strtoull     strtoull
-#else
-extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *string, char **endp, int base);
-#endif
-
-#endif /* SDL_HAS_64BIT_TYPE */
-
-#ifdef HAVE_STRTOD
-#define SDL_strtod      strtod
-#else
-extern DECLSPEC double SDLCALL SDL_strtod(const char *string, char **endp);
-#endif
-
-#ifdef HAVE_ATOI
-#define SDL_atoi        atoi
-#else
-#define SDL_atoi(X)     SDL_strtol(X, NULL, 0)
-#endif
-
-#ifdef HAVE_ATOF
-#define SDL_atof        atof
-#else
-#define SDL_atof(X)     SDL_strtod(X, NULL)
-#endif
-
-#ifdef HAVE_STRCMP
-#define SDL_strcmp      strcmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
-#endif
-
-#ifdef HAVE_STRNCMP
-#define SDL_strncmp     strncmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen);
-#endif
-
-#ifdef HAVE_STRCASECMP
-#define SDL_strcasecmp  strcasecmp
-#elif defined(HAVE__STRICMP)
-#define SDL_strcasecmp  _stricmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2);
-#endif
-
-#ifdef HAVE_STRNCASECMP
-#define SDL_strncasecmp strncasecmp
-#elif defined(HAVE__STRNICMP)
-#define SDL_strncasecmp _strnicmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen);
-#endif
-
-#ifdef HAVE_SSCANF
-#define SDL_sscanf      sscanf
-#else
-extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...);
-#endif
-
-#ifdef HAVE_SNPRINTF
-#define SDL_snprintf    snprintf
-#else
-extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...);
-#endif
-
-#ifdef HAVE_VSNPRINTF
-#define SDL_vsnprintf   vsnprintf
-#else
-extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap);
-#endif
-
-/** @name SDL_ICONV Error Codes
- *  The SDL implementation of iconv() returns these error codes 
- */
-/*@{*/
-#define SDL_ICONV_ERROR		(size_t)-1
-#define SDL_ICONV_E2BIG		(size_t)-2
-#define SDL_ICONV_EILSEQ	(size_t)-3
-#define SDL_ICONV_EINVAL	(size_t)-4
-/*@}*/
-
-#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
-#define SDL_iconv_t     iconv_t
-#define SDL_iconv_open  iconv_open
-#define SDL_iconv_close iconv_close
-#else
-typedef struct _SDL_iconv_t *SDL_iconv_t;
-extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode, const char *fromcode);
-extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd);
-#endif
-extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-/** This function converts a string between encodings in one pass, returning a
- *  string that must be freed with SDL_free() or NULL on error.
- */
-extern DECLSPEC char * SDLCALL SDL_iconv_string(const char *tocode, const char *fromcode, const char *inbuf, size_t inbytesleft);
-#define SDL_iconv_utf8_locale(S)	SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs2(S)		(Uint16 *)SDL_iconv_string("UCS-2", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs4(S)		(Uint32 *)SDL_iconv_string("UCS-4", "UTF-8", S, SDL_strlen(S)+1)
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_stdinc_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_syswm.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_syswm.h
deleted file mode 100644
index 716dddcb73c..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_syswm.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_syswm.h
- *  Include file for SDL custom system window manager hooks
- */
-
-#ifndef _SDL_syswm_h
-#define _SDL_syswm_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_version.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @file SDL_syswm.h
- *  Your application has access to a special type of event 'SDL_SYSWMEVENT',
- *  which contains window-manager specific information and arrives whenever
- *  an unhandled window event occurs.  This event is ignored by default, but
- *  you can enable it with SDL_EventState()
- */
-#ifdef SDL_PROTOTYPES_ONLY
-struct SDL_SysWMinfo;
-typedef struct SDL_SysWMinfo SDL_SysWMinfo;
-#else
-
-/* This is the structure for custom window manager events */
-#if defined(SDL_VIDEO_DRIVER_X11)
-#if defined(__APPLE__) && defined(__MACH__)
-/* conflicts with Quickdraw.h */
-#define Cursor X11Cursor
-#endif
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
-#if defined(__APPLE__) && defined(__MACH__)
-/* matches the re-define above */
-#undef Cursor
-#endif
-
-/** These are the various supported subsystems under UNIX */
-typedef enum {
-	SDL_SYSWM_X11
-} SDL_SYSWM_TYPE;
-
-/** The UNIX custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	SDL_SYSWM_TYPE subsystem;
-	union {
-	    XEvent xevent;
-	} event;
-};
-
-/** The UNIX custom window manager information structure.
- *  When this structure is returned, it holds information about which
- *  low level system it is using, and will be one of SDL_SYSWM_TYPE.
- */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	SDL_SYSWM_TYPE subsystem;
-	union {
-	    struct {
-	    	Display *display;	/**< The X11 display */
-	    	Window window;		/**< The X11 display window */
-		/** These locking functions should be called around
-                 *  any X11 functions using the display variable, 
-                 *  but not the gfxdisplay variable.
-                 *  They lock the event thread, so should not be
-		 *  called around event functions or from event filters.
-		 */
-                /*@{*/
-		void (*lock_func)(void);
-		void (*unlock_func)(void);
-                /*@}*/
-
-		/** @name Introduced in SDL 1.0.2 */
-                /*@{*/
-	    	Window fswindow;	/**< The X11 fullscreen window */
-	    	Window wmwindow;	/**< The X11 managed input window */
-                /*@}*/
-
-		/** @name Introduced in SDL 1.2.12 */
-                /*@{*/
-		Display *gfxdisplay;	/**< The X11 display to which rendering is done */
-                /*@}*/
-	    } x11;
-	} info;
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_NANOX)
-#include <microwin/nano-X.h>
-
-/** The generic custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int data;
-};
-
-/** The windows custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version ;
-	GR_WINDOW_ID window ;	/* The display window */
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW) || defined(SDL_VIDEO_DRIVER_GAPI)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-/** The windows custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	HWND hwnd;			/**< The window for the message */
-	UINT msg;			/**< The type of message */
-	WPARAM wParam;			/**< WORD message parameter */
-	LPARAM lParam;			/**< LONG message parameter */
-};
-
-/** The windows custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	HWND window;			/**< The Win32 display window */
-	HGLRC hglrc;			/**< The OpenGL context, if any */
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_RISCOS)
-
-/** RISC OS custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int eventCode;		/**< The window for the message */
-	int pollBlock[64];
-};
-
-/** The RISC OS custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	int wimpVersion;    /**< Wimp version running under */
-	int taskHandle;     /**< The RISC OS task handle */
-	int window;		/**< The RISC OS display window */
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_PHOTON)
-#include <sys/neutrino.h>
-#include <Ph.h>
-
-/** The QNX custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int data;
-};
-
-/** The QNX custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	int data;
-} SDL_SysWMinfo;
-
-#else
-
-/** The generic custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int data;
-};
-
-/** The generic custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	int data;
-} SDL_SysWMinfo;
-
-#endif /* video driver type */
-
-#endif /* SDL_PROTOTYPES_ONLY */
-
-/* Function prototypes */
-/**
- * This function gives you custom hooks into the window manager information.
- * It fills the structure pointed to by 'info' with custom information and
- * returns 1 if the function is implemented.  If it's not implemented, or
- * the version member of the 'info' structure is invalid, it returns 0. 
- *
- * You typically use this function like this:
- * @code
- * SDL_SysWMInfo info;
- * SDL_VERSION(&info.version);
- * if ( SDL_GetWMInfo(&info) ) { ... }
- * @endcode
- */
-extern DECLSPEC int SDLCALL SDL_GetWMInfo(SDL_SysWMinfo *info);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_syswm_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_thread.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_thread.h
deleted file mode 100644
index 1ca9a1bc42a..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_thread.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_thread_h
-#define _SDL_thread_h
-
-/** @file SDL_thread.h
- *  Header for the SDL thread management routines 
- *
- *  @note These are independent of the other SDL routines.
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-/* Thread synchronization primitives */
-#include "SDL_mutex.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** The SDL thread structure, defined in SDL_thread.c */
-struct SDL_Thread;
-typedef struct SDL_Thread SDL_Thread;
-
-/** Create a thread */
-#if ((defined(__WIN32__) && !defined(HAVE_LIBC)) || defined(__OS2__)) &&  !defined(__SYMBIAN32__)
-/**
- *  We compile SDL into a DLL on OS/2. This means, that it's the DLL which
- *  creates a new thread for the calling process with the SDL_CreateThread()
- *  API. There is a problem with this, that only the RTL of the SDL.DLL will
- *  be initialized for those threads, and not the RTL of the calling application!
- *  To solve this, we make a little hack here.
- *  We'll always use the caller's _beginthread() and _endthread() APIs to
- *  start a new thread. This way, if it's the SDL.DLL which uses this API,
- *  then the RTL of SDL.DLL will be used to create the new thread, and if it's
- *  the application, then the RTL of the application will be used.
- *  So, in short:
- *  Always use the _beginthread() and _endthread() of the calling runtime library!
- */
-#define SDL_PASSED_BEGINTHREAD_ENDTHREAD
-#ifndef _WIN32_WCE
-#include <process.h> /* This has _beginthread() and _endthread() defined! */
-#endif
-
-#ifdef __OS2__
-typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void *arg); 
-typedef void (*pfnSDL_CurrentEndThread)(void);
-#elif __GNUC__
-typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
-        unsigned (__stdcall *func)(void *), void *arg, 
-        unsigned, unsigned *threadID);
-typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
-#else
-typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
-        unsigned (__stdcall *func)(void *), void *arg, 
-        unsigned, unsigned *threadID);
-typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
-#endif
-
-extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (SDLCALL *fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread);
-
-#ifdef __OS2__
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthread, _endthread)
-#elif defined(_WIN32_WCE)
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, NULL, NULL)
-#else
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthreadex, _endthreadex)
-#endif
-#else
-extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (SDLCALL *fn)(void *), void *data);
-#endif
-
-/** Get the 32-bit thread identifier for the current thread */
-extern DECLSPEC Uint32 SDLCALL SDL_ThreadID(void);
-
-/** Get the 32-bit thread identifier for the specified thread,
- *  equivalent to SDL_ThreadID() if the specified thread is NULL.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetThreadID(SDL_Thread *thread);
-
-/** Wait for a thread to finish.
- *  The return code for the thread function is placed in the area
- *  pointed to by 'status', if 'status' is not NULL.
- */
-extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread *thread, int *status);
-
-/** Forcefully kill a thread without worrying about its state */
-extern DECLSPEC void SDLCALL SDL_KillThread(SDL_Thread *thread);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_thread_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_timer.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_timer.h
deleted file mode 100644
index d7cd0246012..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_timer.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_timer_h
-#define _SDL_timer_h
-
-/** @file SDL_timer.h
- *  Header for the SDL time management routines
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This is the OS scheduler timeslice, in milliseconds */
-#define SDL_TIMESLICE		10
-
-/** This is the maximum resolution of the SDL timer on all platforms */
-#define TIMER_RESOLUTION	10	/**< Experimentally determined */
-
-/**
- * Get the number of milliseconds since the SDL library initialization.
- * Note that this value wraps if the program runs for more than ~49 days.
- */ 
-extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void);
-
-/** Wait a specified number of milliseconds before returning */
-extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms);
-
-/** Function prototype for the timer callback function */
-typedef Uint32 (SDLCALL *SDL_TimerCallback)(Uint32 interval);
-
-/**
- * Set a callback to run after the specified number of milliseconds has
- * elapsed. The callback function is passed the current timer interval
- * and returns the next timer interval.  If the returned value is the 
- * same as the one passed in, the periodic alarm continues, otherwise a
- * new alarm is scheduled.  If the callback returns 0, the periodic alarm
- * is cancelled.
- *
- * To cancel a currently running timer, call SDL_SetTimer(0, NULL);
- *
- * The timer callback function may run in a different thread than your
- * main code, and so shouldn't call any functions from within itself.
- *
- * The maximum resolution of this timer is 10 ms, which means that if
- * you request a 16 ms timer, your callback will run approximately 20 ms
- * later on an unloaded system.  If you wanted to set a flag signaling
- * a frame update at 30 frames per second (every 33 ms), you might set a 
- * timer for 30 ms:
- *   @code SDL_SetTimer((33/10)*10, flag_update); @endcode
- *
- * If you use this function, you need to pass SDL_INIT_TIMER to SDL_Init().
- *
- * Under UNIX, you should not use raise or use SIGALRM and this function
- * in the same program, as it is implemented using setitimer().  You also
- * should not use this function in multi-threaded applications as signals
- * to multi-threaded apps have undefined behavior in some implementations.
- *
- * This function returns 0 if successful, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SetTimer(Uint32 interval, SDL_TimerCallback callback);
-
-/** @name New timer API
- * New timer API, supports multiple timers
- * Written by Stephane Peter <megastep@lokigames.com>
- */
-/*@{*/
-
-/**
- * Function prototype for the new timer callback function.
- * The callback function is passed the current timer interval and returns
- * the next timer interval.  If the returned value is the same as the one
- * passed in, the periodic alarm continues, otherwise a new alarm is
- * scheduled.  If the callback returns 0, the periodic alarm is cancelled.
- */
-typedef Uint32 (SDLCALL *SDL_NewTimerCallback)(Uint32 interval, void *param);
-
-/** Definition of the timer ID type */
-typedef struct _SDL_TimerID *SDL_TimerID;
-
-/** Add a new timer to the pool of timers already running.
- *  Returns a timer ID, or NULL when an error occurs.
- */
-extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, SDL_NewTimerCallback callback, void *param);
-
-/**
- * Remove one of the multiple timers knowing its ID.
- * Returns a boolean value indicating success.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID t);
-
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_timer_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_types.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_types.h
deleted file mode 100644
index cfa35236a45..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_types.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_types.h
- *  @deprecated Use SDL_stdinc.h instead.
- */
-
-/* DEPRECATED */
-#include "SDL_stdinc.h"
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_version.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_version.h
deleted file mode 100644
index fa02c3f6da1..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_version.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_version.h
- *  This header defines the current SDL version
- */
-
-#ifndef _SDL_version_h
-#define _SDL_version_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @name Version Number
- *  Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
- */
-/*@{*/
-#define SDL_MAJOR_VERSION	1
-#define SDL_MINOR_VERSION	2
-#define SDL_PATCHLEVEL		14
-/*@}*/
-
-typedef struct SDL_version {
-	Uint8 major;
-	Uint8 minor;
-	Uint8 patch;
-} SDL_version;
-
-/**
- * This macro can be used to fill a version structure with the compile-time
- * version of the SDL library.
- */
-#define SDL_VERSION(X)							\
-{									\
-	(X)->major = SDL_MAJOR_VERSION;					\
-	(X)->minor = SDL_MINOR_VERSION;					\
-	(X)->patch = SDL_PATCHLEVEL;					\
-}
-
-/** This macro turns the version numbers into a numeric value:
- *  (1,2,3) -> (1203)
- *  This assumes that there will never be more than 100 patchlevels
- */
-#define SDL_VERSIONNUM(X, Y, Z)						\
-	((X)*1000 + (Y)*100 + (Z))
-
-/** This is the version number macro for the current SDL version */
-#define SDL_COMPILEDVERSION \
-	SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL)
-
-/** This macro will evaluate to true if compiled with SDL at least X.Y.Z */
-#define SDL_VERSION_ATLEAST(X, Y, Z) \
-	(SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z))
-
-/** This function gets the version of the dynamically linked SDL library.
- *  it should NOT be used to fill a version structure, instead you should
- *  use the SDL_Version() macro.
- */
-extern DECLSPEC const SDL_version * SDLCALL SDL_Linked_Version(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_version_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_video.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_video.h
deleted file mode 100644
index 8f7f305203d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/SDL_video.h
+++ /dev/null
@@ -1,951 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_video.h
- *  Header file for access to the SDL raw framebuffer window
- */
-
-#ifndef _SDL_video_h
-#define _SDL_video_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @name Transparency definitions
- *  These define alpha as the opacity of a surface
- */
-/*@{*/
-#define SDL_ALPHA_OPAQUE 255
-#define SDL_ALPHA_TRANSPARENT 0
-/*@}*/
-
-/** @name Useful data types */
-/*@{*/
-typedef struct SDL_Rect {
-	Sint16 x, y;
-	Uint16 w, h;
-} SDL_Rect;
-
-typedef struct SDL_Color {
-	Uint8 r;
-	Uint8 g;
-	Uint8 b;
-	Uint8 unused;
-} SDL_Color;
-#define SDL_Colour SDL_Color
-
-typedef struct SDL_Palette {
-	int       ncolors;
-	SDL_Color *colors;
-} SDL_Palette;
-/*@}*/
-
-/** Everything in the pixel format structure is read-only */
-typedef struct SDL_PixelFormat {
-	SDL_Palette *palette;
-	Uint8  BitsPerPixel;
-	Uint8  BytesPerPixel;
-	Uint8  Rloss;
-	Uint8  Gloss;
-	Uint8  Bloss;
-	Uint8  Aloss;
-	Uint8  Rshift;
-	Uint8  Gshift;
-	Uint8  Bshift;
-	Uint8  Ashift;
-	Uint32 Rmask;
-	Uint32 Gmask;
-	Uint32 Bmask;
-	Uint32 Amask;
-
-	/** RGB color key information */
-	Uint32 colorkey;
-	/** Alpha value information (per-surface alpha) */
-	Uint8  alpha;
-} SDL_PixelFormat;
-
-/** This structure should be treated as read-only, except for 'pixels',
- *  which, if not NULL, contains the raw pixel data for the surface.
- */
-typedef struct SDL_Surface {
-	Uint32 flags;				/**< Read-only */
-	SDL_PixelFormat *format;		/**< Read-only */
-	int w, h;				/**< Read-only */
-	Uint16 pitch;				/**< Read-only */
-	void *pixels;				/**< Read-write */
-	int offset;				/**< Private */
-
-	/** Hardware-specific surface info */
-	struct private_hwdata *hwdata;
-
-	/** clipping information */
-	SDL_Rect clip_rect;			/**< Read-only */
-	Uint32 unused1;				/**< for binary compatibility */
-
-	/** Allow recursive locks */
-	Uint32 locked;				/**< Private */
-
-	/** info for fast blit mapping to other surfaces */
-	struct SDL_BlitMap *map;		/**< Private */
-
-	/** format version, bumped at every change to invalidate blit maps */
-	unsigned int format_version;		/**< Private */
-
-	/** Reference count -- used when freeing surface */
-	int refcount;				/**< Read-mostly */
-} SDL_Surface;
-
-/** @name SDL_Surface Flags
- *  These are the currently supported flags for the SDL_surface
- */
-/*@{*/
-
-/** Available for SDL_CreateRGBSurface() or SDL_SetVideoMode() */
-/*@{*/
-#define SDL_SWSURFACE	0x00000000	/**< Surface is in system memory */
-#define SDL_HWSURFACE	0x00000001	/**< Surface is in video memory */
-#define SDL_ASYNCBLIT	0x00000004	/**< Use asynchronous blits if possible */
-/*@}*/
-
-/** Available for SDL_SetVideoMode() */
-/*@{*/
-#define SDL_ANYFORMAT	0x10000000	/**< Allow any video depth/pixel-format */
-#define SDL_HWPALETTE	0x20000000	/**< Surface has exclusive palette */
-#define SDL_DOUBLEBUF	0x40000000	/**< Set up double-buffered video mode */
-#define SDL_FULLSCREEN	0x80000000	/**< Surface is a full screen display */
-#define SDL_OPENGL      0x00000002      /**< Create an OpenGL rendering context */
-#define SDL_OPENGLBLIT	0x0000000A	/**< Create an OpenGL rendering context and use it for blitting */
-#define SDL_RESIZABLE	0x00000010	/**< This video mode may be resized */
-#define SDL_NOFRAME	0x00000020	/**< No window caption or edge frame */
-/*@}*/
-
-/** Used internally (read-only) */
-/*@{*/
-#define SDL_HWACCEL	0x00000100	/**< Blit uses hardware acceleration */
-#define SDL_SRCCOLORKEY	0x00001000	/**< Blit uses a source color key */
-#define SDL_RLEACCELOK	0x00002000	/**< Private flag */
-#define SDL_RLEACCEL	0x00004000	/**< Surface is RLE encoded */
-#define SDL_SRCALPHA	0x00010000	/**< Blit uses source alpha blending */
-#define SDL_PREALLOC	0x01000000	/**< Surface uses preallocated memory */
-/*@}*/
-
-/*@}*/
-
-/** Evaluates to true if the surface needs to be locked before access */
-#define SDL_MUSTLOCK(surface)	\
-  (surface->offset ||		\
-  ((surface->flags & (SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_RLEACCEL)) != 0))
-
-/** typedef for private surface blitting functions */
-typedef int (*SDL_blit)(struct SDL_Surface *src, SDL_Rect *srcrect,
-			struct SDL_Surface *dst, SDL_Rect *dstrect);
-
-
-/** Useful for determining the video hardware capabilities */
-typedef struct SDL_VideoInfo {
-	Uint32 hw_available :1;	/**< Flag: Can you create hardware surfaces? */
-	Uint32 wm_available :1;	/**< Flag: Can you talk to a window manager? */
-	Uint32 UnusedBits1  :6;
-	Uint32 UnusedBits2  :1;
-	Uint32 blit_hw      :1;	/**< Flag: Accelerated blits HW --> HW */
-	Uint32 blit_hw_CC   :1;	/**< Flag: Accelerated blits with Colorkey */
-	Uint32 blit_hw_A    :1;	/**< Flag: Accelerated blits with Alpha */
-	Uint32 blit_sw      :1;	/**< Flag: Accelerated blits SW --> HW */
-	Uint32 blit_sw_CC   :1;	/**< Flag: Accelerated blits with Colorkey */
-	Uint32 blit_sw_A    :1;	/**< Flag: Accelerated blits with Alpha */
-	Uint32 blit_fill    :1;	/**< Flag: Accelerated color fill */
-	Uint32 UnusedBits3  :16;
-	Uint32 video_mem;	/**< The total amount of video memory (in K) */
-	SDL_PixelFormat *vfmt;	/**< Value: The format of the video surface */
-	int    current_w;	/**< Value: The current video mode width */
-	int    current_h;	/**< Value: The current video mode height */
-} SDL_VideoInfo;
-
-
-/** @name Overlay Formats
- *  The most common video overlay formats.
- *  For an explanation of these pixel formats, see:
- *	http://www.webartz.com/fourcc/indexyuv.htm
- *
- *  For information on the relationship between color spaces, see:
- *  http://www.neuro.sfc.keio.ac.jp/~aly/polygon/info/color-space-faq.html
- */
-/*@{*/
-#define SDL_YV12_OVERLAY  0x32315659	/**< Planar mode: Y + V + U  (3 planes) */
-#define SDL_IYUV_OVERLAY  0x56555949	/**< Planar mode: Y + U + V  (3 planes) */
-#define SDL_YUY2_OVERLAY  0x32595559	/**< Packed mode: Y0+U0+Y1+V0 (1 plane) */
-#define SDL_UYVY_OVERLAY  0x59565955	/**< Packed mode: U0+Y0+V0+Y1 (1 plane) */
-#define SDL_YVYU_OVERLAY  0x55595659	/**< Packed mode: Y0+V0+Y1+U0 (1 plane) */
-/*@}*/
-
-/** The YUV hardware video overlay */
-typedef struct SDL_Overlay {
-	Uint32 format;				/**< Read-only */
-	int w, h;				/**< Read-only */
-	int planes;				/**< Read-only */
-	Uint16 *pitches;			/**< Read-only */
-	Uint8 **pixels;				/**< Read-write */
-
-	/** @name Hardware-specific surface info */
-        /*@{*/
-	struct private_yuvhwfuncs *hwfuncs;
-	struct private_yuvhwdata *hwdata;
-        /*@{*/
-
-	/** @name Special flags */
-        /*@{*/
-	Uint32 hw_overlay :1;	/**< Flag: This overlay hardware accelerated? */
-	Uint32 UnusedBits :31;
-        /*@}*/
-} SDL_Overlay;
-
-
-/** Public enumeration for setting the OpenGL window attributes. */
-typedef enum {
-    SDL_GL_RED_SIZE,
-    SDL_GL_GREEN_SIZE,
-    SDL_GL_BLUE_SIZE,
-    SDL_GL_ALPHA_SIZE,
-    SDL_GL_BUFFER_SIZE,
-    SDL_GL_DOUBLEBUFFER,
-    SDL_GL_DEPTH_SIZE,
-    SDL_GL_STENCIL_SIZE,
-    SDL_GL_ACCUM_RED_SIZE,
-    SDL_GL_ACCUM_GREEN_SIZE,
-    SDL_GL_ACCUM_BLUE_SIZE,
-    SDL_GL_ACCUM_ALPHA_SIZE,
-    SDL_GL_STEREO,
-    SDL_GL_MULTISAMPLEBUFFERS,
-    SDL_GL_MULTISAMPLESAMPLES,
-    SDL_GL_ACCELERATED_VISUAL,
-    SDL_GL_SWAP_CONTROL
-} SDL_GLattr;
-
-/** @name flags for SDL_SetPalette() */
-/*@{*/
-#define SDL_LOGPAL 0x01
-#define SDL_PHYSPAL 0x02
-/*@}*/
-
-/* Function prototypes */
-
-/**
- * @name Video Init and Quit
- * These functions are used internally, and should not be used unless you
- * have a specific need to specify the video driver you want to use.
- * You should normally use SDL_Init() or SDL_InitSubSystem().
- */
-/*@{*/
-/**
- * Initializes the video subsystem. Sets up a connection
- * to the window manager, etc, and determines the current video mode and
- * pixel format, but does not initialize a window or graphics mode.
- * Note that event handling is activated by this routine.
- *
- * If you use both sound and video in your application, you need to call
- * SDL_Init() before opening the sound device, otherwise under Win32 DirectX,
- * you won't be able to set full-screen display modes.
- */
-extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name, Uint32 flags);
-extern DECLSPEC void SDLCALL SDL_VideoQuit(void);
-/*@}*/
-
-/**
- * This function fills the given character buffer with the name of the
- * video driver, and returns a pointer to it if the video driver has
- * been initialized.  It returns NULL if no driver has been initialized.
- */
-extern DECLSPEC char * SDLCALL SDL_VideoDriverName(char *namebuf, int maxlen);
-
-/**
- * This function returns a pointer to the current display surface.
- * If SDL is doing format conversion on the display surface, this
- * function returns the publicly visible surface, not the real video
- * surface.
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_GetVideoSurface(void);
-
-/**
- * This function returns a read-only pointer to information about the
- * video hardware.  If this is called before SDL_SetVideoMode(), the 'vfmt'
- * member of the returned structure will contain the pixel format of the
- * "best" video mode.
- */
-extern DECLSPEC const SDL_VideoInfo * SDLCALL SDL_GetVideoInfo(void);
-
-/**
- * Check to see if a particular video mode is supported.
- * It returns 0 if the requested mode is not supported under any bit depth,
- * or returns the bits-per-pixel of the closest available mode with the
- * given width and height.  If this bits-per-pixel is different from the
- * one used when setting the video mode, SDL_SetVideoMode() will succeed,
- * but will emulate the requested bits-per-pixel with a shadow surface.
- *
- * The arguments to SDL_VideoModeOK() are the same ones you would pass to
- * SDL_SetVideoMode()
- */
-extern DECLSPEC int SDLCALL SDL_VideoModeOK(int width, int height, int bpp, Uint32 flags);
-
-/**
- * Return a pointer to an array of available screen dimensions for the
- * given format and video flags, sorted largest to smallest.  Returns 
- * NULL if there are no dimensions available for a particular format, 
- * or (SDL_Rect **)-1 if any dimension is okay for the given format.
- *
- * If 'format' is NULL, the mode list will be for the format given 
- * by SDL_GetVideoInfo()->vfmt
- */
-extern DECLSPEC SDL_Rect ** SDLCALL SDL_ListModes(SDL_PixelFormat *format, Uint32 flags);
-
-/**
- * Set up a video mode with the specified width, height and bits-per-pixel.
- *
- * If 'bpp' is 0, it is treated as the current display bits per pixel.
- *
- * If SDL_ANYFORMAT is set in 'flags', the SDL library will try to set the
- * requested bits-per-pixel, but will return whatever video pixel format is
- * available.  The default is to emulate the requested pixel format if it
- * is not natively available.
- *
- * If SDL_HWSURFACE is set in 'flags', the video surface will be placed in
- * video memory, if possible, and you may have to call SDL_LockSurface()
- * in order to access the raw framebuffer.  Otherwise, the video surface
- * will be created in system memory.
- *
- * If SDL_ASYNCBLIT is set in 'flags', SDL will try to perform rectangle
- * updates asynchronously, but you must always lock before accessing pixels.
- * SDL will wait for updates to complete before returning from the lock.
- *
- * If SDL_HWPALETTE is set in 'flags', the SDL library will guarantee
- * that the colors set by SDL_SetColors() will be the colors you get.
- * Otherwise, in 8-bit mode, SDL_SetColors() may not be able to set all
- * of the colors exactly the way they are requested, and you should look
- * at the video surface structure to determine the actual palette.
- * If SDL cannot guarantee that the colors you request can be set, 
- * i.e. if the colormap is shared, then the video surface may be created
- * under emulation in system memory, overriding the SDL_HWSURFACE flag.
- *
- * If SDL_FULLSCREEN is set in 'flags', the SDL library will try to set
- * a fullscreen video mode.  The default is to create a windowed mode
- * if the current graphics system has a window manager.
- * If the SDL library is able to set a fullscreen video mode, this flag 
- * will be set in the surface that is returned.
- *
- * If SDL_DOUBLEBUF is set in 'flags', the SDL library will try to set up
- * two surfaces in video memory and swap between them when you call 
- * SDL_Flip().  This is usually slower than the normal single-buffering
- * scheme, but prevents "tearing" artifacts caused by modifying video 
- * memory while the monitor is refreshing.  It should only be used by 
- * applications that redraw the entire screen on every update.
- *
- * If SDL_RESIZABLE is set in 'flags', the SDL library will allow the
- * window manager, if any, to resize the window at runtime.  When this
- * occurs, SDL will send a SDL_VIDEORESIZE event to you application,
- * and you must respond to the event by re-calling SDL_SetVideoMode()
- * with the requested size (or another size that suits the application).
- *
- * If SDL_NOFRAME is set in 'flags', the SDL library will create a window
- * without any title bar or frame decoration.  Fullscreen video modes have
- * this flag set automatically.
- *
- * This function returns the video framebuffer surface, or NULL if it fails.
- *
- * If you rely on functionality provided by certain video flags, check the
- * flags of the returned surface to make sure that functionality is available.
- * SDL will fall back to reduced functionality if the exact flags you wanted
- * are not available.
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_SetVideoMode
-			(int width, int height, int bpp, Uint32 flags);
-
-/** @name SDL_Update Functions
- * These functions should not be called while 'screen' is locked.
- */
-/*@{*/
-/**
- * Makes sure the given list of rectangles is updated on the given screen.
- */
-extern DECLSPEC void SDLCALL SDL_UpdateRects
-		(SDL_Surface *screen, int numrects, SDL_Rect *rects);
-/**
- * If 'x', 'y', 'w' and 'h' are all 0, SDL_UpdateRect will update the entire
- * screen.
- */
-extern DECLSPEC void SDLCALL SDL_UpdateRect
-		(SDL_Surface *screen, Sint32 x, Sint32 y, Uint32 w, Uint32 h);
-/*@}*/
-
-/**
- * On hardware that supports double-buffering, this function sets up a flip
- * and returns.  The hardware will wait for vertical retrace, and then swap
- * video buffers before the next video surface blit or lock will return.
- * On hardware that doesn not support double-buffering, this is equivalent
- * to calling SDL_UpdateRect(screen, 0, 0, 0, 0);
- * The SDL_DOUBLEBUF flag must have been passed to SDL_SetVideoMode() when
- * setting the video mode for this function to perform hardware flipping.
- * This function returns 0 if successful, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_Flip(SDL_Surface *screen);
-
-/**
- * Set the gamma correction for each of the color channels.
- * The gamma values range (approximately) between 0.1 and 10.0
- * 
- * If this function isn't supported directly by the hardware, it will
- * be emulated using gamma ramps, if available.  If successful, this
- * function returns 0, otherwise it returns -1.
- */
-extern DECLSPEC int SDLCALL SDL_SetGamma(float red, float green, float blue);
-
-/**
- * Set the gamma translation table for the red, green, and blue channels
- * of the video hardware.  Each table is an array of 256 16-bit quantities,
- * representing a mapping between the input and output for that channel.
- * The input is the index into the array, and the output is the 16-bit
- * gamma value at that index, scaled to the output color precision.
- * 
- * You may pass NULL for any of the channels to leave it unchanged.
- * If the call succeeds, it will return 0.  If the display driver or
- * hardware does not support gamma translation, or otherwise fails,
- * this function will return -1.
- */
-extern DECLSPEC int SDLCALL SDL_SetGammaRamp(const Uint16 *red, const Uint16 *green, const Uint16 *blue);
-
-/**
- * Retrieve the current values of the gamma translation tables.
- * 
- * You must pass in valid pointers to arrays of 256 16-bit quantities.
- * Any of the pointers may be NULL to ignore that channel.
- * If the call succeeds, it will return 0.  If the display driver or
- * hardware does not support gamma translation, or otherwise fails,
- * this function will return -1.
- */
-extern DECLSPEC int SDLCALL SDL_GetGammaRamp(Uint16 *red, Uint16 *green, Uint16 *blue);
-
-/**
- * Sets a portion of the colormap for the given 8-bit surface.  If 'surface'
- * is not a palettized surface, this function does nothing, returning 0.
- * If all of the colors were set as passed to SDL_SetColors(), it will
- * return 1.  If not all the color entries were set exactly as given,
- * it will return 0, and you should look at the surface palette to
- * determine the actual color palette.
- *
- * When 'surface' is the surface associated with the current display, the
- * display colormap will be updated with the requested colors.  If 
- * SDL_HWPALETTE was set in SDL_SetVideoMode() flags, SDL_SetColors()
- * will always return 1, and the palette is guaranteed to be set the way
- * you desire, even if the window colormap has to be warped or run under
- * emulation.
- */
-extern DECLSPEC int SDLCALL SDL_SetColors(SDL_Surface *surface, 
-			SDL_Color *colors, int firstcolor, int ncolors);
-
-/**
- * Sets a portion of the colormap for a given 8-bit surface.
- * 'flags' is one or both of:
- * SDL_LOGPAL  -- set logical palette, which controls how blits are mapped
- *                to/from the surface,
- * SDL_PHYSPAL -- set physical palette, which controls how pixels look on
- *                the screen
- * Only screens have physical palettes. Separate change of physical/logical
- * palettes is only possible if the screen has SDL_HWPALETTE set.
- *
- * The return value is 1 if all colours could be set as requested, and 0
- * otherwise.
- *
- * SDL_SetColors() is equivalent to calling this function with
- *     flags = (SDL_LOGPAL|SDL_PHYSPAL).
- */
-extern DECLSPEC int SDLCALL SDL_SetPalette(SDL_Surface *surface, int flags,
-				   SDL_Color *colors, int firstcolor,
-				   int ncolors);
-
-/**
- * Maps an RGB triple to an opaque pixel value for a given pixel format
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGB
-(const SDL_PixelFormat * const format,
- const Uint8 r, const Uint8 g, const Uint8 b);
-
-/**
- * Maps an RGBA quadruple to a pixel value for a given pixel format
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA
-(const SDL_PixelFormat * const format,
- const Uint8 r, const Uint8 g, const Uint8 b, const Uint8 a);
-
-/**
- * Maps a pixel value into the RGB components for a given pixel format
- */
-extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel,
-				const SDL_PixelFormat * const fmt,
-				Uint8 *r, Uint8 *g, Uint8 *b);
-
-/**
- * Maps a pixel value into the RGBA components for a given pixel format
- */
-extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel,
-				const SDL_PixelFormat * const fmt,
-				Uint8 *r, Uint8 *g, Uint8 *b, Uint8 *a);
-
-/** @sa SDL_CreateRGBSurface */
-#define SDL_AllocSurface    SDL_CreateRGBSurface
-/**
- * Allocate and free an RGB surface (must be called after SDL_SetVideoMode)
- * If the depth is 4 or 8 bits, an empty palette is allocated for the surface.
- * If the depth is greater than 8 bits, the pixel format is set using the
- * flags '[RGB]mask'.
- * If the function runs out of memory, it will return NULL.
- *
- * The 'flags' tell what kind of surface to create.
- * SDL_SWSURFACE means that the surface should be created in system memory.
- * SDL_HWSURFACE means that the surface should be created in video memory,
- * with the same format as the display surface.  This is useful for surfaces
- * that will not change much, to take advantage of hardware acceleration
- * when being blitted to the display surface.
- * SDL_ASYNCBLIT means that SDL will try to perform asynchronous blits with
- * this surface, but you must always lock it before accessing the pixels.
- * SDL will wait for current blits to finish before returning from the lock.
- * SDL_SRCCOLORKEY indicates that the surface will be used for colorkey blits.
- * If the hardware supports acceleration of colorkey blits between
- * two surfaces in video memory, SDL will try to place the surface in
- * video memory. If this isn't possible or if there is no hardware
- * acceleration available, the surface will be placed in system memory.
- * SDL_SRCALPHA means that the surface will be used for alpha blits and 
- * if the hardware supports hardware acceleration of alpha blits between
- * two surfaces in video memory, to place the surface in video memory
- * if possible, otherwise it will be placed in system memory.
- * If the surface is created in video memory, blits will be _much_ faster,
- * but the surface format must be identical to the video surface format,
- * and the only way to access the pixels member of the surface is to use
- * the SDL_LockSurface() and SDL_UnlockSurface() calls.
- * If the requested surface actually resides in video memory, SDL_HWSURFACE
- * will be set in the flags member of the returned surface.  If for some
- * reason the surface could not be placed in video memory, it will not have
- * the SDL_HWSURFACE flag set, and will be created in system memory instead.
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_CreateRGBSurface
-			(Uint32 flags, int width, int height, int depth, 
-			Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-/** @sa SDL_CreateRGBSurface */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels,
-			int width, int height, int depth, int pitch,
-			Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface *surface);
-
-/**
- * SDL_LockSurface() sets up a surface for directly accessing the pixels.
- * Between calls to SDL_LockSurface()/SDL_UnlockSurface(), you can write
- * to and read from 'surface->pixels', using the pixel format stored in 
- * 'surface->format'.  Once you are done accessing the surface, you should 
- * use SDL_UnlockSurface() to release it.
- *
- * Not all surfaces require locking.  If SDL_MUSTLOCK(surface) evaluates
- * to 0, then you can read and write to the surface at any time, and the
- * pixel format of the surface will not change.  In particular, if the
- * SDL_HWSURFACE flag is not given when calling SDL_SetVideoMode(), you
- * will not need to lock the display surface before accessing it.
- * 
- * No operating system or library calls should be made between lock/unlock
- * pairs, as critical system locks may be held during this time.
- *
- * SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked.
- */
-extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface *surface);
-extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface *surface);
-
-/**
- * Load a surface from a seekable SDL data source (memory or file.)
- * If 'freesrc' is non-zero, the source will be closed after being read.
- * Returns the new surface, or NULL if there was an error.
- * The new surface should be freed with SDL_FreeSurface().
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_LoadBMP_RW(SDL_RWops *src, int freesrc);
-
-/** Convenience macro -- load a surface from a file */
-#define SDL_LoadBMP(file)	SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1)
-
-/**
- * Save a surface to a seekable SDL data source (memory or file.)
- * If 'freedst' is non-zero, the source will be closed after being written.
- * Returns 0 if successful or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SaveBMP_RW
-		(SDL_Surface *surface, SDL_RWops *dst, int freedst);
-
-/** Convenience macro -- save a surface to a file */
-#define SDL_SaveBMP(surface, file) \
-		SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1)
-
-/**
- * Sets the color key (transparent pixel) in a blittable surface.
- * If 'flag' is SDL_SRCCOLORKEY (optionally OR'd with SDL_RLEACCEL), 
- * 'key' will be the transparent pixel in the source image of a blit.
- * SDL_RLEACCEL requests RLE acceleration for the surface if present,
- * and removes RLE acceleration if absent.
- * If 'flag' is 0, this function clears any current color key.
- * This function returns 0, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SetColorKey
-			(SDL_Surface *surface, Uint32 flag, Uint32 key);
-
-/**
- * This function sets the alpha value for the entire surface, as opposed to
- * using the alpha component of each pixel. This value measures the range
- * of transparency of the surface, 0 being completely transparent to 255
- * being completely opaque. An 'alpha' value of 255 causes blits to be
- * opaque, the source pixels copied to the destination (the default). Note
- * that per-surface alpha can be combined with colorkey transparency.
- *
- * If 'flag' is 0, alpha blending is disabled for the surface.
- * If 'flag' is SDL_SRCALPHA, alpha blending is enabled for the surface.
- * OR:ing the flag with SDL_RLEACCEL requests RLE acceleration for the
- * surface; if SDL_RLEACCEL is not specified, the RLE accel will be removed.
- *
- * The 'alpha' parameter is ignored for surfaces that have an alpha channel.
- */
-extern DECLSPEC int SDLCALL SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha);
-
-/**
- * Sets the clipping rectangle for the destination surface in a blit.
- *
- * If the clip rectangle is NULL, clipping will be disabled.
- * If the clip rectangle doesn't intersect the surface, the function will
- * return SDL_FALSE and blits will be completely clipped.  Otherwise the
- * function returns SDL_TRUE and blits to the surface will be clipped to
- * the intersection of the surface area and the clipping rectangle.
- *
- * Note that blits are automatically clipped to the edges of the source
- * and destination surfaces.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface *surface, const SDL_Rect *rect);
-
-/**
- * Gets the clipping rectangle for the destination surface in a blit.
- * 'rect' must be a pointer to a valid rectangle which will be filled
- * with the correct values.
- */
-extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface *surface, SDL_Rect *rect);
-
-/**
- * Creates a new surface of the specified format, and then copies and maps 
- * the given surface to it so the blit of the converted surface will be as 
- * fast as possible.  If this function fails, it returns NULL.
- *
- * The 'flags' parameter is passed to SDL_CreateRGBSurface() and has those 
- * semantics.  You can also pass SDL_RLEACCEL in the flags parameter and
- * SDL will try to RLE accelerate colorkey and alpha blits in the resulting
- * surface.
- *
- * This function is used internally by SDL_DisplayFormat().
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_ConvertSurface
-			(SDL_Surface *src, SDL_PixelFormat *fmt, Uint32 flags);
-
-/**
- * This performs a fast blit from the source surface to the destination
- * surface.  It assumes that the source and destination rectangles are
- * the same size.  If either 'srcrect' or 'dstrect' are NULL, the entire
- * surface (src or dst) is copied.  The final blit rectangles are saved
- * in 'srcrect' and 'dstrect' after all clipping is performed.
- * If the blit is successful, it returns 0, otherwise it returns -1.
- *
- * The blit function should not be called on a locked surface.
- *
- * The blit semantics for surfaces with and without alpha and colorkey
- * are defined as follows:
- *
- * RGBA->RGB:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using alpha-channel).
- * 	SDL_SRCCOLORKEY ignored.
- *     SDL_SRCALPHA not set:
- * 	copy RGB.
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	RGB values of the source colour key, ignoring alpha in the
- * 	comparison.
- * 
- * RGB->RGBA:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source per-surface alpha value);
- * 	set destination alpha to opaque.
- *     SDL_SRCALPHA not set:
- * 	copy RGB, set destination alpha to source per-surface alpha value.
- *     both:
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	source colour key.
- * 
- * RGBA->RGBA:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source alpha channel) the RGB values;
- * 	leave destination alpha untouched. [Note: is this correct?]
- * 	SDL_SRCCOLORKEY ignored.
- *     SDL_SRCALPHA not set:
- * 	copy all of RGBA to the destination.
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	RGB values of the source colour key, ignoring alpha in the
- * 	comparison.
- * 
- * RGB->RGB: 
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source per-surface alpha value).
- *     SDL_SRCALPHA not set:
- * 	copy RGB.
- *     both:
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	source colour key.
- *
- * If either of the surfaces were in video memory, and the blit returns -2,
- * the video memory was lost, so it should be reloaded with artwork and 
- * re-blitted:
- * @code
- *	while ( SDL_BlitSurface(image, imgrect, screen, dstrect) == -2 ) {
- *		while ( SDL_LockSurface(image) < 0 )
- *			Sleep(10);
- *		-- Write image pixels to image->pixels --
- *		SDL_UnlockSurface(image);
- *	}
- * @endcode
- *
- * This happens under DirectX 5.0 when the system switches away from your
- * fullscreen application.  The lock will also fail until you have access
- * to the video memory again.
- *
- * You should call SDL_BlitSurface() unless you know exactly how SDL
- * blitting works internally and how to use the other blit functions.
- */
-#define SDL_BlitSurface SDL_UpperBlit
-
-/** This is the public blit function, SDL_BlitSurface(), and it performs
- *  rectangle validation and clipping before passing it to SDL_LowerBlit()
- */
-extern DECLSPEC int SDLCALL SDL_UpperBlit
-			(SDL_Surface *src, SDL_Rect *srcrect,
-			 SDL_Surface *dst, SDL_Rect *dstrect);
-/** This is a semi-private blit function and it performs low-level surface
- *  blitting only.
- */
-extern DECLSPEC int SDLCALL SDL_LowerBlit
-			(SDL_Surface *src, SDL_Rect *srcrect,
-			 SDL_Surface *dst, SDL_Rect *dstrect);
-
-/**
- * This function performs a fast fill of the given rectangle with 'color'
- * The given rectangle is clipped to the destination surface clip area
- * and the final fill rectangle is saved in the passed in pointer.
- * If 'dstrect' is NULL, the whole surface will be filled with 'color'
- * The color should be a pixel of the format used by the surface, and 
- * can be generated by the SDL_MapRGB() function.
- * This function returns 0 on success, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_FillRect
-		(SDL_Surface *dst, SDL_Rect *dstrect, Uint32 color);
-
-/**
- * This function takes a surface and copies it to a new surface of the
- * pixel format and colors of the video framebuffer, suitable for fast
- * blitting onto the display surface.  It calls SDL_ConvertSurface()
- *
- * If you want to take advantage of hardware colorkey or alpha blit
- * acceleration, you should set the colorkey and alpha value before
- * calling this function.
- *
- * If the conversion fails or runs out of memory, it returns NULL
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_DisplayFormat(SDL_Surface *surface);
-
-/**
- * This function takes a surface and copies it to a new surface of the
- * pixel format and colors of the video framebuffer (if possible),
- * suitable for fast alpha blitting onto the display surface.
- * The new surface will always have an alpha channel.
- *
- * If you want to take advantage of hardware colorkey or alpha blit
- * acceleration, you should set the colorkey and alpha value before
- * calling this function.
- *
- * If the conversion fails or runs out of memory, it returns NULL
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_DisplayFormatAlpha(SDL_Surface *surface);
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name YUV video surface overlay functions                                */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/** This function creates a video output overlay
- *  Calling the returned surface an overlay is something of a misnomer because
- *  the contents of the display surface underneath the area where the overlay
- *  is shown is undefined - it may be overwritten with the converted YUV data.
- */
-extern DECLSPEC SDL_Overlay * SDLCALL SDL_CreateYUVOverlay(int width, int height,
-				Uint32 format, SDL_Surface *display);
-
-/** Lock an overlay for direct access, and unlock it when you are done */
-extern DECLSPEC int SDLCALL SDL_LockYUVOverlay(SDL_Overlay *overlay);
-extern DECLSPEC void SDLCALL SDL_UnlockYUVOverlay(SDL_Overlay *overlay);
-
-/** Blit a video overlay to the display surface.
- *  The contents of the video surface underneath the blit destination are
- *  not defined.  
- *  The width and height of the destination rectangle may be different from
- *  that of the overlay, but currently only 2x scaling is supported.
- */
-extern DECLSPEC int SDLCALL SDL_DisplayYUVOverlay(SDL_Overlay *overlay, SDL_Rect *dstrect);
-
-/** Free a video overlay */
-extern DECLSPEC void SDLCALL SDL_FreeYUVOverlay(SDL_Overlay *overlay);
-
-/*@}*/
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name OpenGL support functions.                                          */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/**
- * Dynamically load an OpenGL library, or the default one if path is NULL
- *
- * If you do this, you need to retrieve all of the GL functions used in
- * your program from the dynamic library using SDL_GL_GetProcAddress().
- */
-extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path);
-
-/**
- * Get the address of a GL function
- */
-extern DECLSPEC void * SDLCALL SDL_GL_GetProcAddress(const char* proc);
-
-/**
- * Set an attribute of the OpenGL subsystem before intialization.
- */
-extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value);
-
-/**
- * Get an attribute of the OpenGL subsystem from the windowing
- * interface, such as glX. This is of course different from getting
- * the values from SDL's internal OpenGL subsystem, which only
- * stores the values you request before initialization.
- *
- * Developers should track the values they pass into SDL_GL_SetAttribute
- * themselves if they want to retrieve these values.
- */
-extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int* value);
-
-/**
- * Swap the OpenGL buffers, if double-buffering is supported.
- */
-extern DECLSPEC void SDLCALL SDL_GL_SwapBuffers(void);
-
-/** @name OpenGL Internal Functions
- * Internal functions that should not be called unless you have read
- * and understood the source code for these functions.
- */
-/*@{*/
-extern DECLSPEC void SDLCALL SDL_GL_UpdateRects(int numrects, SDL_Rect* rects);
-extern DECLSPEC void SDLCALL SDL_GL_Lock(void);
-extern DECLSPEC void SDLCALL SDL_GL_Unlock(void);
-/*@}*/
-
-/*@}*/
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name Window Manager Functions                                           */
-/** These functions allow interaction with the window manager, if any.       */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/**
- * Sets the title and icon text of the display window (UTF-8 encoded)
- */
-extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title, const char *icon);
-/**
- * Gets the title and icon text of the display window (UTF-8 encoded)
- */
-extern DECLSPEC void SDLCALL SDL_WM_GetCaption(char **title, char **icon);
-
-/**
- * Sets the icon for the display window.
- * This function must be called before the first call to SDL_SetVideoMode().
- * It takes an icon surface, and a mask in MSB format.
- * If 'mask' is NULL, the entire icon surface will be used as the icon.
- */
-extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);
-
-/**
- * This function iconifies the window, and returns 1 if it succeeded.
- * If the function succeeds, it generates an SDL_APPACTIVE loss event.
- * This function is a noop and returns 0 in non-windowed environments.
- */
-extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void);
-
-/**
- * Toggle fullscreen mode without changing the contents of the screen.
- * If the display surface does not require locking before accessing
- * the pixel information, then the memory pointers will not change.
- *
- * If this function was able to toggle fullscreen mode (change from 
- * running in a window to fullscreen, or vice-versa), it will return 1.
- * If it is not implemented, or fails, it returns 0.
- *
- * The next call to SDL_SetVideoMode() will set the mode fullscreen
- * attribute based on the flags parameter - if SDL_FULLSCREEN is not
- * set, then the display will be windowed by default where supported.
- *
- * This is currently only implemented in the X11 video driver.
- */
-extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface *surface);
-
-typedef enum {
-	SDL_GRAB_QUERY = -1,
-	SDL_GRAB_OFF = 0,
-	SDL_GRAB_ON = 1,
-	SDL_GRAB_FULLSCREEN	/**< Used internally */
-} SDL_GrabMode;
-/**
- * This function allows you to set and query the input grab state of
- * the application.  It returns the new input grab state.
- *
- * Grabbing means that the mouse is confined to the application window,
- * and nearly all keyboard input is passed directly to the application,
- * and not interpreted by a window manager, if any.
- */
-extern DECLSPEC SDL_GrabMode SDLCALL SDL_WM_GrabInput(SDL_GrabMode mode);
-
-/*@}*/
-
-/** @internal Not in public API at the moment - do not use! */
-extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface *src, SDL_Rect *srcrect,
-                                    SDL_Surface *dst, SDL_Rect *dstrect);
-                    
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_video_h */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/begin_code.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/begin_code.h
deleted file mode 100644
index 22748090c5d..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/begin_code.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** 
- *  @file begin_code.h
- *  This file sets things up for C dynamic library function definitions,
- *  static inlined functions, and structures aligned at 4-byte alignment.
- *  If you don't like ugly C preprocessor code, don't look at this file. :)
- */
-
-/** 
- *  @file begin_code.h
- *  This shouldn't be nested -- included it around code only.
- */
-#ifdef _begin_code_h
-#error Nested inclusion of begin_code.h
-#endif
-#define _begin_code_h
-
-/** 
- *  @def DECLSPEC
- *  Some compilers use a special export keyword
- */
-#ifndef DECLSPEC
-# if defined(__BEOS__) || defined(__HAIKU__)
-#  if defined(__GNUC__)
-#   define DECLSPEC	__declspec(dllexport)
-#  else
-#   define DECLSPEC	__declspec(export)
-#  endif
-# elif defined(__WIN32__)
-#  ifdef __BORLANDC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC 
-#   else
-#    define DECLSPEC	__declspec(dllimport)
-#   endif
-#  else
-#   define DECLSPEC	__declspec(dllexport)
-#  endif
-# elif defined(__OS2__)
-#  ifdef __WATCOMC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC	__declspec(dllexport)
-#   else
-#    define DECLSPEC
-#   endif
-#  elif defined (__GNUC__) && __GNUC__ < 4
-#   /* Added support for GCC-EMX <v4.x */
-#   /* this is needed for XFree86/OS2 developement */
-#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
-#   ifdef BUILD_SDL
-#    define DECLSPEC    __declspec(dllexport)
-#   else
-#    define DECLSPEC
-#   endif
-#  else
-#   define DECLSPEC
-#  endif
-# else
-#  if defined(__GNUC__) && __GNUC__ >= 4
-#   define DECLSPEC	__attribute__ ((visibility("default")))
-#  else
-#   define DECLSPEC
-#  endif
-# endif
-#endif
-
-/** 
- *  @def SDLCALL
- *  By default SDL uses the C calling convention
- */
-#ifndef SDLCALL
-# if defined(__WIN32__) && !defined(__GNUC__)
-#  define SDLCALL __cdecl
-# elif defined(__OS2__)
-#  if defined (__GNUC__) && __GNUC__ < 4
-#   /* Added support for GCC-EMX <v4.x */
-#   /* this is needed for XFree86/OS2 developement */
-#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
-#   define SDLCALL _cdecl
-#  else
-#   /* On other compilers on OS/2, we use the _System calling convention */
-#   /* to be compatible with every compiler */
-#   define SDLCALL _System
-#  endif
-# else
-#  define SDLCALL
-# endif
-#endif /* SDLCALL */
-
-#ifdef __SYMBIAN32__ 
-#ifndef EKA2 
-#undef DECLSPEC
-#define DECLSPEC
-#elif !defined(__WINS__)
-#undef DECLSPEC
-#define DECLSPEC __declspec(dllexport)
-#endif /* !EKA2 */
-#endif /* __SYMBIAN32__ */
-
-/**
- *  @file begin_code.h
- *  Force structure packing at 4 byte alignment.
- *  This is necessary if the header is included in code which has structure
- *  packing set to an alternate value, say for loading structures from disk.
- *  The packing is reset to the previous value in close_code.h 
- */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
-#ifdef _MSC_VER
-#pragma warning(disable: 4103)
-#endif
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#pragma pack(push,4)
-#elif (defined(__MWERKS__) && defined(__MACOS__))
-#pragma options align=mac68k4byte
-#pragma enumsalwaysint on
-#endif /* Compiler needs structure packing set */
-
-/**
- *  @def SDL_INLINE_OKAY
- *  Set up compiler-specific options for inlining functions
- */
-#ifndef SDL_INLINE_OKAY
-#ifdef __GNUC__
-#define SDL_INLINE_OKAY
-#else
-/* Add any special compiler-specific cases here */
-#if defined(_MSC_VER) || defined(__BORLANDC__) || \
-    defined(__DMC__) || defined(__SC__) || \
-    defined(__WATCOMC__) || defined(__LCC__) || \
-    defined(__DECC) || defined(__EABI__)
-#ifndef __inline__
-#define __inline__	__inline
-#endif
-#define SDL_INLINE_OKAY
-#else
-#if !defined(__MRC__) && !defined(_SGI_SOURCE)
-#ifndef __inline__
-#define __inline__ inline
-#endif
-#define SDL_INLINE_OKAY
-#endif /* Not a funky compiler */
-#endif /* Visual C++ */
-#endif /* GNU C */
-#endif /* SDL_INLINE_OKAY */
-
-/**
- *  @def __inline__
- *  If inlining isn't supported, remove "__inline__", turning static
- *  inlined functions into static functions (resulting in code bloat
- *  in all files which include the offending header files)
- */
-#ifndef SDL_INLINE_OKAY
-#define __inline__
-#endif
-
-/**
- *  @def NULL
- *  Apparently this is needed by several Windows compilers
- */
-#if !defined(__MACH__)
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif /* NULL */
-#endif /* ! Mac OS X - breaks precompiled headers */
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/close_code.h b/dep/recastnavigation/RecastDemo/Contrib/SDL/include/close_code.h
deleted file mode 100644
index 46a07208a74..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/include/close_code.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file close_code.h
- *  This file reverses the effects of begin_code.h and should be included
- *  after you finish any function and structure declarations in your headers
- */
-
-#undef _begin_code_h
-
-/**
- *  @file close_code.h
- *  Reset structure packing at previous byte alignment
- */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__)  || defined(__BORLANDC__)
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#if (defined(__MWERKS__) && defined(__MACOS__))
-#pragma options align=reset
-#pragma enumsalwaysint reset
-#else
-#pragma pack(pop)
-#endif
-#endif /* Compiler needs structure packing set */
-
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/lib/SDL.dll b/dep/recastnavigation/RecastDemo/Contrib/SDL/lib/SDL.dll
deleted file mode 100644
index 628cdfcf018..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Contrib/SDL/lib/SDL.dll and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/lib/SDL.lib b/dep/recastnavigation/RecastDemo/Contrib/SDL/lib/SDL.lib
deleted file mode 100644
index 5b3f17c58c6..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Contrib/SDL/lib/SDL.lib and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/lib/SDLmain.lib b/dep/recastnavigation/RecastDemo/Contrib/SDL/lib/SDLmain.lib
deleted file mode 100644
index 945b9ad8e49..00000000000
Binary files a/dep/recastnavigation/RecastDemo/Contrib/SDL/lib/SDLmain.lib and /dev/null differ
diff --git a/dep/recastnavigation/RecastDemo/Contrib/SDL/readme.txt b/dep/recastnavigation/RecastDemo/Contrib/SDL/readme.txt
deleted file mode 100644
index 732aca3dd3e..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/SDL/readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Windows
-Download SDL Developer Libraries from http://www.libsdl.org and unzip them here.
-
-OSX
-Download and install OSX SDL Developer Libraries from http://www.libsdl.org
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Contrib/stb_image.h b/dep/recastnavigation/RecastDemo/Contrib/stb_image.h
deleted file mode 100644
index aedc64e1977..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/stb_image.h
+++ /dev/null
@@ -1,3893 +0,0 @@
-/* stbi-1.18 - public domain JPEG/PNG reader - http://nothings.org/stb_image.c
-                      when you control the images you're loading
-
-   QUICK NOTES:
-      Primarily of interest to game developers and other people who can
-          avoid problematic images and only need the trivial interface
-
-      JPEG baseline (no JPEG progressive, no oddball channel decimations)
-      PNG 8-bit only
-      BMP non-1bpp, non-RLE
-      TGA (not sure what subset, if a subset)
-      PSD (composited view only, no extra channels)
-      HDR (radiance rgbE format)
-      writes BMP,TGA (define STBI_NO_WRITE to remove code)
-      decoded from memory or through stdio FILE (define STBI_NO_STDIO to remove code)
-      supports installable dequantizing-IDCT, YCbCr-to-RGB conversion (define STBI_SIMD)
-        
-   TODO:
-      stbi_info_*
-  
-   history:
-      1.18   fix a threading bug (local mutable static)
-      1.17   support interlaced PNG
-      1.16   major bugfix - convert_format converted one too many pixels
-      1.15   initialize some fields for thread safety
-      1.14   fix threadsafe conversion bug; header-file-only version (#define STBI_HEADER_FILE_ONLY before including)
-      1.13   threadsafe
-      1.12   const qualifiers in the API
-      1.11   Support installable IDCT, colorspace conversion routines
-      1.10   Fixes for 64-bit (don't use "unsigned long")
-             optimized upsampling by Fabian "ryg" Giesen
-      1.09   Fix format-conversion for PSD code (bad global variables!)
-      1.08   Thatcher Ulrich's PSD code integrated by Nicolas Schulz
-      1.07   attempt to fix C++ warning/errors again
-      1.06   attempt to fix C++ warning/errors again
-      1.05   fix TGA loading to return correct *comp and use good luminance calc
-      1.04   default float alpha is 1, not 255; use 'void *' for stbi_image_free
-      1.03   bugfixes to STBI_NO_STDIO, STBI_NO_HDR
-      1.02   support for (subset of) HDR files, float interface for preferred access to them
-      1.01   fix bug: possible bug in handling right-side up bmps... not sure
-             fix bug: the stbi_bmp_load() and stbi_tga_load() functions didn't work at all
-      1.00   interface to zlib that skips zlib header
-      0.99   correct handling of alpha in palette
-      0.98   TGA loader by lonesock; dynamically add loaders (untested)
-      0.97   jpeg errors on too large a file; also catch another malloc failure
-      0.96   fix detection of invalid v value - particleman@mollyrocket forum
-      0.95   during header scan, seek to markers in case of padding
-      0.94   STBI_NO_STDIO to disable stdio usage; rename all #defines the same
-      0.93   handle jpegtran output; verbose errors
-      0.92   read 4,8,16,24,32-bit BMP files of several formats
-      0.91   output 24-bit Windows 3.0 BMP files
-      0.90   fix a few more warnings; bump version number to approach 1.0
-      0.61   bugfixes due to Marc LeBlanc, Christopher Lloyd
-      0.60   fix compiling as c++
-      0.59   fix warnings: merge Dave Moore's -Wall fixes
-      0.58   fix bug: zlib uncompressed mode len/nlen was wrong endian
-      0.57   fix bug: jpg last huffman symbol before marker was >9 bits but less
-                      than 16 available
-      0.56   fix bug: zlib uncompressed mode len vs. nlen
-      0.55   fix bug: restart_interval not initialized to 0
-      0.54   allow NULL for 'int *comp'
-      0.53   fix bug in png 3->4; speedup png decoding
-      0.52   png handles req_comp=3,4 directly; minor cleanup; jpeg comments
-      0.51   obey req_comp requests, 1-component jpegs return as 1-component,
-             on 'test' only check type, not whether we support this variant
-*/
-
-
-#ifndef STBI_INCLUDE_STB_IMAGE_H
-#define STBI_INCLUDE_STB_IMAGE_H
-
-////   begin header file  ////////////////////////////////////////////////////
-//
-// Limitations:
-//    - no progressive/interlaced support (jpeg, png)
-//    - 8-bit samples only (jpeg, png)
-//    - not threadsafe
-//    - channel subsampling of at most 2 in each dimension (jpeg)
-//    - no delayed line count (jpeg) -- IJG doesn't support either
-//
-// Basic usage (see HDR discussion below):
-//    int x,y,n;
-//    unsigned char *data = stbi_load(filename, &x, &y, &n, 0);
-//    // ... process data if not NULL ... 
-//    // ... x = width, y = height, n = # 8-bit components per pixel ...
-//    // ... replace '0' with '1'..'4' to force that many components per pixel
-//    stbi_image_free(data)
-//
-// Standard parameters:
-//    int *x       -- outputs image width in pixels
-//    int *y       -- outputs image height in pixels
-//    int *comp    -- outputs # of image components in image file
-//    int req_comp -- if non-zero, # of image components requested in result
-//
-// The return value from an image loader is an 'unsigned char *' which points
-// to the pixel data. The pixel data consists of *y scanlines of *x pixels,
-// with each pixel consisting of N interleaved 8-bit components; the first
-// pixel pointed to is top-left-most in the image. There is no padding between
-// image scanlines or between pixels, regardless of format. The number of
-// components N is 'req_comp' if req_comp is non-zero, or *comp otherwise.
-// If req_comp is non-zero, *comp has the number of components that _would_
-// have been output otherwise. E.g. if you set req_comp to 4, you will always
-// get RGBA output, but you can check *comp to easily see if it's opaque.
-//
-// An output image with N components has the following components interleaved
-// in this order in each pixel:
-//
-//     N=#comp     components
-//       1           grey
-//       2           grey, alpha
-//       3           red, green, blue
-//       4           red, green, blue, alpha
-//
-// If image loading fails for any reason, the return value will be NULL,
-// and *x, *y, *comp will be unchanged. The function stbi_failure_reason()
-// can be queried for an extremely brief, end-user unfriendly explanation
-// of why the load failed. Define STBI_NO_FAILURE_STRINGS to avoid
-// compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly
-// more user-friendly ones.
-//
-// Paletted PNG and BMP images are automatically depalettized.
-//
-//
-// ===========================================================================
-//
-// HDR image support   (disable by defining STBI_NO_HDR)
-//
-// stb_image now supports loading HDR images in general, and currently
-// the Radiance .HDR file format, although the support is provided
-// generically. You can still load any file through the existing interface;
-// if you attempt to load an HDR file, it will be automatically remapped to
-// LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1;
-// both of these constants can be reconfigured through this interface:
-//
-//     stbi_hdr_to_ldr_gamma(2.2f);
-//     stbi_hdr_to_ldr_scale(1.0f);
-//
-// (note, do not use _inverse_ constants; stbi_image will invert them
-// appropriately).
-//
-// Additionally, there is a new, parallel interface for loading files as
-// (linear) floats to preserve the full dynamic range:
-//
-//    float *data = stbi_loadf(filename, &x, &y, &n, 0);
-// 
-// If you load LDR images through this interface, those images will
-// be promoted to floating point values, run through the inverse of
-// constants corresponding to the above:
-//
-//     stbi_ldr_to_hdr_scale(1.0f);
-//     stbi_ldr_to_hdr_gamma(2.2f);
-//
-// Finally, given a filename (or an open file or memory block--see header
-// file for details) containing image data, you can query for the "most
-// appropriate" interface to use (that is, whether the image is HDR or
-// not), using:
-//
-//     stbi_is_hdr(char *filename);
-
-#ifndef STBI_NO_STDIO
-#include <stdio.h>
-#endif
-
-#define STBI_VERSION 1
-
-enum
-{
-   STBI_default = 0, // only used for req_comp
-
-   STBI_grey       = 1,
-   STBI_grey_alpha = 2,
-   STBI_rgb        = 3,
-   STBI_rgb_alpha  = 4,
-};
-
-typedef unsigned char stbi_uc;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// WRITING API
-
-#if !defined(STBI_NO_WRITE) && !defined(STBI_NO_STDIO)
-// write a BMP/TGA file given tightly packed 'comp' channels (no padding, nor bmp-stride-padding)
-// (you must include the appropriate extension in the filename).
-// returns TRUE on success, FALSE if couldn't open file, error writing file
-extern int      stbi_write_bmp       (char const *filename,     int x, int y, int comp, void *data);
-extern int      stbi_write_tga       (char const *filename,     int x, int y, int comp, void *data);
-#endif
-
-// PRIMARY API - works on images of any type
-
-// load image by filename, open file, or memory buffer
-#ifndef STBI_NO_STDIO
-extern stbi_uc *stbi_load            (char const *filename,     int *x, int *y, int *comp, int req_comp);
-extern stbi_uc *stbi_load_from_file  (FILE *f,                  int *x, int *y, int *comp, int req_comp);
-extern int      stbi_info_from_file  (FILE *f,                  int *x, int *y, int *comp);
-#endif
-extern stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp);
-// for stbi_load_from_file, file pointer is left pointing immediately after image
-
-#ifndef STBI_NO_HDR
-#ifndef STBI_NO_STDIO
-extern float *stbi_loadf            (char const *filename,     int *x, int *y, int *comp, int req_comp);
-extern float *stbi_loadf_from_file  (FILE *f,                  int *x, int *y, int *comp, int req_comp);
-#endif
-extern float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp);
-
-extern void   stbi_hdr_to_ldr_gamma(float gamma);
-extern void   stbi_hdr_to_ldr_scale(float scale);
-
-extern void   stbi_ldr_to_hdr_gamma(float gamma);
-extern void   stbi_ldr_to_hdr_scale(float scale);
-
-#endif // STBI_NO_HDR
-
-// get a VERY brief reason for failure
-// NOT THREADSAFE
-extern const char    *stbi_failure_reason  (void); 
-
-// free the loaded image -- this is just free()
-extern void     stbi_image_free      (void *retval_from_stbi_load);
-
-// get image dimensions & components without fully decoding
-extern int      stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp);
-extern int      stbi_is_hdr_from_memory(stbi_uc const *buffer, int len);
-#ifndef STBI_NO_STDIO
-extern int      stbi_info            (char const *filename,     int *x, int *y, int *comp);
-extern int      stbi_is_hdr          (char const *filename);
-extern int      stbi_is_hdr_from_file(FILE *f);
-#endif
-
-// ZLIB client - used by PNG, available for other purposes
-
-extern char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen);
-extern char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen);
-extern int   stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
-
-extern char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen);
-extern int   stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
-
-// TYPE-SPECIFIC ACCESS
-
-// is it a jpeg?
-extern int      stbi_jpeg_test_memory     (stbi_uc const *buffer, int len);
-extern stbi_uc *stbi_jpeg_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp);
-extern int      stbi_jpeg_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp);
-
-#ifndef STBI_NO_STDIO
-extern stbi_uc *stbi_jpeg_load            (char const *filename,     int *x, int *y, int *comp, int req_comp);
-extern int      stbi_jpeg_test_file       (FILE *f);
-extern stbi_uc *stbi_jpeg_load_from_file  (FILE *f,                  int *x, int *y, int *comp, int req_comp);
-
-extern int      stbi_jpeg_info            (char const *filename,     int *x, int *y, int *comp);
-extern int      stbi_jpeg_info_from_file  (FILE *f,                  int *x, int *y, int *comp);
-#endif
-
-// is it a png?
-extern int      stbi_png_test_memory      (stbi_uc const *buffer, int len);
-extern stbi_uc *stbi_png_load_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp);
-extern int      stbi_png_info_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp);
-
-#ifndef STBI_NO_STDIO
-extern stbi_uc *stbi_png_load             (char const *filename,     int *x, int *y, int *comp, int req_comp);
-extern int      stbi_png_info             (char const *filename,     int *x, int *y, int *comp);
-extern int      stbi_png_test_file        (FILE *f);
-extern stbi_uc *stbi_png_load_from_file   (FILE *f,                  int *x, int *y, int *comp, int req_comp);
-extern int      stbi_png_info_from_file   (FILE *f,                  int *x, int *y, int *comp);
-#endif
-
-// is it a bmp?
-extern int      stbi_bmp_test_memory      (stbi_uc const *buffer, int len);
-
-extern stbi_uc *stbi_bmp_load             (char const *filename,     int *x, int *y, int *comp, int req_comp);
-extern stbi_uc *stbi_bmp_load_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp);
-#ifndef STBI_NO_STDIO
-extern int      stbi_bmp_test_file        (FILE *f);
-extern stbi_uc *stbi_bmp_load_from_file   (FILE *f,                  int *x, int *y, int *comp, int req_comp);
-#endif
-
-// is it a tga?
-extern int      stbi_tga_test_memory      (stbi_uc const *buffer, int len);
-
-extern stbi_uc *stbi_tga_load             (char const *filename,     int *x, int *y, int *comp, int req_comp);
-extern stbi_uc *stbi_tga_load_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp);
-#ifndef STBI_NO_STDIO
-extern int      stbi_tga_test_file        (FILE *f);
-extern stbi_uc *stbi_tga_load_from_file   (FILE *f,                  int *x, int *y, int *comp, int req_comp);
-#endif
-
-// is it a psd?
-extern int      stbi_psd_test_memory      (stbi_uc const *buffer, int len);
-
-extern stbi_uc *stbi_psd_load             (char const *filename,     int *x, int *y, int *comp, int req_comp);
-extern stbi_uc *stbi_psd_load_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp);
-#ifndef STBI_NO_STDIO
-extern int      stbi_psd_test_file        (FILE *f);
-extern stbi_uc *stbi_psd_load_from_file   (FILE *f,                  int *x, int *y, int *comp, int req_comp);
-#endif
-
-// is it an hdr?
-extern int      stbi_hdr_test_memory      (stbi_uc const *buffer, int len);
-
-extern float *  stbi_hdr_load             (char const *filename,     int *x, int *y, int *comp, int req_comp);
-extern float *  stbi_hdr_load_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp);
-#ifndef STBI_NO_STDIO
-extern int      stbi_hdr_test_file        (FILE *f);
-extern float *  stbi_hdr_load_from_file   (FILE *f,                  int *x, int *y, int *comp, int req_comp);
-#endif
-
-// define new loaders
-typedef struct
-{
-   int       (*test_memory)(stbi_uc const *buffer, int len);
-   stbi_uc * (*load_from_memory)(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp);
-   #ifndef STBI_NO_STDIO
-   int       (*test_file)(FILE *f);
-   stbi_uc * (*load_from_file)(FILE *f, int *x, int *y, int *comp, int req_comp);
-   #endif
-} stbi_loader;
-
-// register a loader by filling out the above structure (you must defined ALL functions)
-// returns 1 if added or already added, 0 if not added (too many loaders)
-// NOT THREADSAFE
-extern int stbi_register_loader(stbi_loader *loader);
-
-// define faster low-level operations (typically SIMD support)
-#if STBI_SIMD
-typedef void (*stbi_idct_8x8)(uint8 *out, int out_stride, short data[64], unsigned short *dequantize);
-// compute an integer IDCT on "input"
-//     input[x] = data[x] * dequantize[x]
-//     write results to 'out': 64 samples, each run of 8 spaced by 'out_stride'
-//                             CLAMP results to 0..255
-typedef void (*stbi_YCbCr_to_RGB_run)(uint8 *output, uint8 const *y, uint8 const *cb, uint8 const *cr, int count, int step);
-// compute a conversion from YCbCr to RGB
-//     'count' pixels
-//     write pixels to 'output'; each pixel is 'step' bytes (either 3 or 4; if 4, write '255' as 4th), order R,G,B
-//     y: Y input channel
-//     cb: Cb input channel; scale/biased to be 0..255
-//     cr: Cr input channel; scale/biased to be 0..255
-
-extern void stbi_install_idct(stbi_idct_8x8 func);
-extern void stbi_install_YCbCr_to_RGB(stbi_YCbCr_to_RGB_run func);
-#endif // STBI_SIMD
-
-#ifdef __cplusplus
-}
-#endif
-
-//
-//
-////   end header file   /////////////////////////////////////////////////////
-#endif // STBI_INCLUDE_STB_IMAGE_H
-
-#ifndef STBI_HEADER_FILE_ONLY
-
-#ifndef STBI_NO_HDR
-#include <math.h>  // ldexp
-#include <string.h> // strcmp
-#endif
-
-#ifndef STBI_NO_STDIO
-#include <stdio.h>
-#endif
-#include <stdlib.h>
-#include <memory.h>
-#include <assert.h>
-#include <stdarg.h>
-
-#ifndef _MSC_VER
-  #ifdef __cplusplus
-  #define __forceinline inline
-  #else
-  #define __forceinline
-  #endif
-#endif
-
-
-// implementation:
-typedef unsigned char uint8;
-typedef unsigned short uint16;
-typedef   signed short  int16;
-typedef unsigned int   uint32;
-typedef   signed int    int32;
-typedef unsigned int   uint;
-
-// should produce compiler error if size is wrong
-typedef unsigned char validate_uint32[sizeof(uint32)==4];
-
-#if defined(STBI_NO_STDIO) && !defined(STBI_NO_WRITE)
-#define STBI_NO_WRITE
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Generic API that works on all image types
-//
-
-// this is not threadsafe
-static const char *failure_reason;
-
-const char *stbi_failure_reason(void)
-{
-   return failure_reason;
-}
-
-static int e(const char *str)
-{
-   failure_reason = str;
-   return 0;
-}
-
-#ifdef STBI_NO_FAILURE_STRINGS
-   #define e(x,y)  0
-#elif defined(STBI_FAILURE_USERMSG)
-   #define e(x,y)  e(y)
-#else
-   #define e(x,y)  e(x)
-#endif
-
-#define epf(x,y)   ((float *) (e(x,y)?NULL:NULL))
-#define epuc(x,y)  ((unsigned char *) (e(x,y)?NULL:NULL))
-
-void stbi_image_free(void *retval_from_stbi_load)
-{
-   free(retval_from_stbi_load);
-}
-
-#define MAX_LOADERS  32
-stbi_loader *loaders[MAX_LOADERS];
-static int max_loaders = 0;
-
-int stbi_register_loader(stbi_loader *loader)
-{
-   int i;
-   for (i=0; i < MAX_LOADERS; ++i) {
-      // already present?
-      if (loaders[i] == loader)
-         return 1;
-      // end of the list?
-      if (loaders[i] == NULL) {
-         loaders[i] = loader;
-         max_loaders = i+1;
-         return 1;
-      }
-   }
-   // no room for it
-   return 0;
-}
-
-#ifndef STBI_NO_HDR
-static float   *ldr_to_hdr(stbi_uc *data, int x, int y, int comp);
-static stbi_uc *hdr_to_ldr(float   *data, int x, int y, int comp);
-#endif
-
-#ifndef STBI_NO_STDIO
-unsigned char *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp)
-{
-   FILE *f = fopen(filename, "rb");
-   unsigned char *result;
-   if (!f) return epuc("can't fopen", "Unable to open file");
-   result = stbi_load_from_file(f,x,y,comp,req_comp);
-   fclose(f);
-   return result;
-}
-
-unsigned char *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   int i;
-   if (stbi_jpeg_test_file(f))
-      return stbi_jpeg_load_from_file(f,x,y,comp,req_comp);
-   if (stbi_png_test_file(f))
-      return stbi_png_load_from_file(f,x,y,comp,req_comp);
-   if (stbi_bmp_test_file(f))
-      return stbi_bmp_load_from_file(f,x,y,comp,req_comp);
-   if (stbi_psd_test_file(f))
-      return stbi_psd_load_from_file(f,x,y,comp,req_comp);
-   #ifndef STBI_NO_HDR
-   if (stbi_hdr_test_file(f)) {
-      float *hdr = stbi_hdr_load_from_file(f, x,y,comp,req_comp);
-      return hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp);
-   }
-   #endif
-   for (i=0; i < max_loaders; ++i)
-      if (loaders[i]->test_file(f))
-         return loaders[i]->load_from_file(f,x,y,comp,req_comp);
-   // test tga last because it's a crappy test!
-   if (stbi_tga_test_file(f))
-      return stbi_tga_load_from_file(f,x,y,comp,req_comp);
-   return epuc("unknown image type", "Image not of any known type, or corrupt");
-}
-#endif
-
-unsigned char *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   int i;
-   if (stbi_jpeg_test_memory(buffer,len))
-      return stbi_jpeg_load_from_memory(buffer,len,x,y,comp,req_comp);
-   if (stbi_png_test_memory(buffer,len))
-      return stbi_png_load_from_memory(buffer,len,x,y,comp,req_comp);
-   if (stbi_bmp_test_memory(buffer,len))
-      return stbi_bmp_load_from_memory(buffer,len,x,y,comp,req_comp);
-   if (stbi_psd_test_memory(buffer,len))
-      return stbi_psd_load_from_memory(buffer,len,x,y,comp,req_comp);
-   #ifndef STBI_NO_HDR
-   if (stbi_hdr_test_memory(buffer, len)) {
-      float *hdr = stbi_hdr_load_from_memory(buffer, len,x,y,comp,req_comp);
-      return hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp);
-   }
-   #endif
-   for (i=0; i < max_loaders; ++i)
-      if (loaders[i]->test_memory(buffer,len))
-         return loaders[i]->load_from_memory(buffer,len,x,y,comp,req_comp);
-   // test tga last because it's a crappy test!
-   if (stbi_tga_test_memory(buffer,len))
-      return stbi_tga_load_from_memory(buffer,len,x,y,comp,req_comp);
-   return epuc("unknown image type", "Image not of any known type, or corrupt");
-}
-
-#ifndef STBI_NO_HDR
-
-#ifndef STBI_NO_STDIO
-float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp)
-{
-   FILE *f = fopen(filename, "rb");
-   float *result;
-   if (!f) return epf("can't fopen", "Unable to open file");
-   result = stbi_loadf_from_file(f,x,y,comp,req_comp);
-   fclose(f);
-   return result;
-}
-
-float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   unsigned char *data;
-   #ifndef STBI_NO_HDR
-   if (stbi_hdr_test_file(f))
-      return stbi_hdr_load_from_file(f,x,y,comp,req_comp);
-   #endif
-   data = stbi_load_from_file(f, x, y, comp, req_comp);
-   if (data)
-      return ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp);
-   return epf("unknown image type", "Image not of any known type, or corrupt");
-}
-#endif
-
-float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   stbi_uc *data;
-   #ifndef STBI_NO_HDR
-   if (stbi_hdr_test_memory(buffer, len))
-      return stbi_hdr_load_from_memory(buffer, len,x,y,comp,req_comp);
-   #endif
-   data = stbi_load_from_memory(buffer, len, x, y, comp, req_comp);
-   if (data)
-      return ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp);
-   return epf("unknown image type", "Image not of any known type, or corrupt");
-}
-#endif
-
-// these is-hdr-or-not is defined independent of whether STBI_NO_HDR is
-// defined, for API simplicity; if STBI_NO_HDR is defined, it always
-// reports false!
-
-int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len)
-{
-   #ifndef STBI_NO_HDR
-   return stbi_hdr_test_memory(buffer, len);
-   #else
-   return 0;
-   #endif
-}
-
-#ifndef STBI_NO_STDIO
-extern int      stbi_is_hdr          (char const *filename)
-{
-   FILE *f = fopen(filename, "rb");
-   int result=0;
-   if (f) {
-      result = stbi_is_hdr_from_file(f);
-      fclose(f);
-   }
-   return result;
-}
-
-extern int      stbi_is_hdr_from_file(FILE *f)
-{
-   #ifndef STBI_NO_HDR
-   return stbi_hdr_test_file(f);
-   #else
-   return 0;
-   #endif
-}
-
-#endif
-
-// @TODO: get image dimensions & components without fully decoding
-#ifndef STBI_NO_STDIO
-extern int      stbi_info            (char const *filename,           int *x, int *y, int *comp);
-extern int      stbi_info_from_file  (FILE *f,                  int *x, int *y, int *comp);
-#endif
-extern int      stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp);
-
-#ifndef STBI_NO_HDR
-static float h2l_gamma_i=1.0f/2.2f, h2l_scale_i=1.0f;
-static float l2h_gamma=2.2f, l2h_scale=1.0f;
-
-void   stbi_hdr_to_ldr_gamma(float gamma) { h2l_gamma_i = 1/gamma; }
-void   stbi_hdr_to_ldr_scale(float scale) { h2l_scale_i = 1/scale; }
-
-void   stbi_ldr_to_hdr_gamma(float gamma) { l2h_gamma = gamma; }
-void   stbi_ldr_to_hdr_scale(float scale) { l2h_scale = scale; }
-#endif
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Common code used by all image loaders
-//
-
-enum
-{
-   SCAN_load=0,
-   SCAN_type,
-   SCAN_header,
-};
-
-typedef struct
-{
-   uint32 img_x, img_y;
-   int img_n, img_out_n;
-
-   #ifndef STBI_NO_STDIO
-   FILE  *img_file;
-   #endif
-   uint8 *img_buffer, *img_buffer_end;
-} stbi;
-
-#ifndef STBI_NO_STDIO
-static void start_file(stbi *s, FILE *f)
-{
-   s->img_file = f;
-	s->img_buffer = NULL;
-	s->img_buffer_end = NULL;
-}
-#endif
-
-static void start_mem(stbi *s, uint8 const *buffer, int len)
-{
-#ifndef STBI_NO_STDIO
-   s->img_file = NULL;
-#endif
-   s->img_buffer = (uint8 *) buffer;
-   s->img_buffer_end = (uint8 *) buffer+len;
-}
-
-__forceinline static int get8(stbi *s)
-{
-#ifndef STBI_NO_STDIO
-   if (s->img_file) {
-      int c = fgetc(s->img_file);
-      return c == EOF ? 0 : c;
-   }
-#endif
-   if (s->img_buffer < s->img_buffer_end)
-      return *s->img_buffer++;
-   return 0;
-}
-
-__forceinline static int at_eof(stbi *s)
-{
-#ifndef STBI_NO_STDIO
-   if (s->img_file)
-      return feof(s->img_file);
-#endif
-   return s->img_buffer >= s->img_buffer_end;   
-}
-
-__forceinline static uint8 get8u(stbi *s)
-{
-   return (uint8) get8(s);
-}
-
-static void skip(stbi *s, int n)
-{
-#ifndef STBI_NO_STDIO
-   if (s->img_file)
-      fseek(s->img_file, n, SEEK_CUR);
-   else
-#endif
-      s->img_buffer += n;
-}
-
-static int get16(stbi *s)
-{
-   int z = get8(s);
-   return (z << 8) + get8(s);
-}
-
-static uint32 get32(stbi *s)
-{
-   uint32 z = get16(s);
-   return (z << 16) + get16(s);
-}
-
-static int get16le(stbi *s)
-{
-   int z = get8(s);
-   return z + (get8(s) << 8);
-}
-
-static uint32 get32le(stbi *s)
-{
-   uint32 z = get16le(s);
-   return z + (get16le(s) << 16);
-}
-
-static void getn(stbi *s, stbi_uc *buffer, int n)
-{
-#ifndef STBI_NO_STDIO
-   if (s->img_file) {
-      fread(buffer, 1, n, s->img_file);
-      return;
-   }
-#endif
-   memcpy(buffer, s->img_buffer, n);
-   s->img_buffer += n;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//  generic converter from built-in img_n to req_comp
-//    individual types do this automatically as much as possible (e.g. jpeg
-//    does all cases internally since it needs to colorspace convert anyway,
-//    and it never has alpha, so very few cases ). png can automatically
-//    interleave an alpha=255 channel, but falls back to this for other cases
-//
-//  assume data buffer is malloced, so malloc a new one and free that one
-//  only failure mode is malloc failing
-
-static uint8 compute_y(int r, int g, int b)
-{
-   return (uint8) (((r*77) + (g*150) +  (29*b)) >> 8);
-}
-
-static unsigned char *convert_format(unsigned char *data, int img_n, int req_comp, uint x, uint y)
-{
-   int i,j;
-   unsigned char *good;
-
-   if (req_comp == img_n) return data;
-   assert(req_comp >= 1 && req_comp <= 4);
-
-   good = (unsigned char *) malloc(req_comp * x * y);
-   if (good == NULL) {
-      free(data);
-      return epuc("outofmem", "Out of memory");
-   }
-
-   for (j=0; j < (int) y; ++j) {
-      unsigned char *src  = data + j * x * img_n   ;
-      unsigned char *dest = good + j * x * req_comp;
-
-      #define COMBO(a,b)  ((a)*8+(b))
-      #define CASE(a,b)   case COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
-      // convert source image with img_n components to one with req_comp components;
-      // avoid switch per pixel, so use switch per scanline and massive macros
-      switch(COMBO(img_n, req_comp)) {
-         CASE(1,2) dest[0]=src[0], dest[1]=255; break;
-         CASE(1,3) dest[0]=dest[1]=dest[2]=src[0]; break;
-         CASE(1,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=255; break;
-         CASE(2,1) dest[0]=src[0]; break;
-         CASE(2,3) dest[0]=dest[1]=dest[2]=src[0]; break;
-         CASE(2,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1]; break;
-         CASE(3,4) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255; break;
-         CASE(3,1) dest[0]=compute_y(src[0],src[1],src[2]); break;
-         CASE(3,2) dest[0]=compute_y(src[0],src[1],src[2]), dest[1] = 255; break;
-         CASE(4,1) dest[0]=compute_y(src[0],src[1],src[2]); break;
-         CASE(4,2) dest[0]=compute_y(src[0],src[1],src[2]), dest[1] = src[3]; break;
-         CASE(4,3) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2]; break;
-         default: assert(0);
-      }
-      #undef CASE
-   }
-
-   free(data);
-   return good;
-}
-
-#ifndef STBI_NO_HDR
-static float   *ldr_to_hdr(stbi_uc *data, int x, int y, int comp)
-{
-   int i,k,n;
-   float *output = (float *) malloc(x * y * comp * sizeof(float));
-   if (output == NULL) { free(data); return epf("outofmem", "Out of memory"); }
-   // compute number of non-alpha components
-   if (comp & 1) n = comp; else n = comp-1;
-   for (i=0; i < x*y; ++i) {
-      for (k=0; k < n; ++k) {
-         output[i*comp + k] = (float) pow(data[i*comp+k]/255.0f, l2h_gamma) * l2h_scale;
-      }
-      if (k < comp) output[i*comp + k] = data[i*comp+k]/255.0f;
-   }
-   free(data);
-   return output;
-}
-
-#define float2int(x)   ((int) (x))
-static stbi_uc *hdr_to_ldr(float   *data, int x, int y, int comp)
-{
-   int i,k,n;
-   stbi_uc *output = (stbi_uc *) malloc(x * y * comp);
-   if (output == NULL) { free(data); return epuc("outofmem", "Out of memory"); }
-   // compute number of non-alpha components
-   if (comp & 1) n = comp; else n = comp-1;
-   for (i=0; i < x*y; ++i) {
-      for (k=0; k < n; ++k) {
-         float z = (float) pow(data[i*comp+k]*h2l_scale_i, h2l_gamma_i) * 255 + 0.5f;
-         if (z < 0) z = 0;
-         if (z > 255) z = 255;
-         output[i*comp + k] = (stbi_uc)float2int(z);
-      }
-      if (k < comp) {
-         float z = data[i*comp+k] * 255 + 0.5f;
-         if (z < 0) z = 0;
-         if (z > 255) z = 255;
-         output[i*comp + k] = (stbi_uc)float2int(z);
-      }
-   }
-   free(data);
-   return output;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//  "baseline" JPEG/JFIF decoder (not actually fully baseline implementation)
-//
-//    simple implementation
-//      - channel subsampling of at most 2 in each dimension
-//      - doesn't support delayed output of y-dimension
-//      - simple interface (only one output format: 8-bit interleaved RGB)
-//      - doesn't try to recover corrupt jpegs
-//      - doesn't allow partial loading, loading multiple at once
-//      - still fast on x86 (copying globals into locals doesn't help x86)
-//      - allocates lots of intermediate memory (full size of all components)
-//        - non-interleaved case requires this anyway
-//        - allows good upsampling (see next)
-//    high-quality
-//      - upsampled channels are bilinearly interpolated, even across blocks
-//      - quality integer IDCT derived from IJG's 'slow'
-//    performance
-//      - fast huffman; reasonable integer IDCT
-//      - uses a lot of intermediate memory, could cache poorly
-//      - load http://nothings.org/remote/anemones.jpg 3 times on 2.8Ghz P4
-//          stb_jpeg:   1.34 seconds (MSVC6, default release build)
-//          stb_jpeg:   1.06 seconds (MSVC6, processor = Pentium Pro)
-//          IJL11.dll:  1.08 seconds (compiled by intel)
-//          IJG 1998:   0.98 seconds (MSVC6, makefile provided by IJG)
-//          IJG 1998:   0.95 seconds (MSVC6, makefile + proc=PPro)
-
-// huffman decoding acceleration
-#define FAST_BITS   9  // larger handles more cases; smaller stomps less cache
-
-typedef struct
-{
-   uint8  fast[1 << FAST_BITS];
-   // weirdly, repacking this into AoS is a 10% speed loss, instead of a win
-   uint16 code[256];
-   uint8  values[256];
-   uint8  size[257];
-   unsigned int maxcode[18];
-   int    delta[17];   // old 'firstsymbol' - old 'firstcode'
-} huffman;
-
-typedef struct
-{
-   #if STBI_SIMD
-   unsigned short dequant2[4][64];
-   #endif
-   stbi s;
-   huffman huff_dc[4];
-   huffman huff_ac[4];
-   uint8 dequant[4][64];
-
-// sizes for components, interleaved MCUs
-   int img_h_max, img_v_max;
-   int img_mcu_x, img_mcu_y;
-   int img_mcu_w, img_mcu_h;
-
-// definition of jpeg image component
-   struct
-   {
-      int id;
-      int h,v;
-      int tq;
-      int hd,ha;
-      int dc_pred;
-
-      int x,y,w2,h2;
-      uint8 *data;
-      void *raw_data;
-      uint8 *linebuf;
-   } img_comp[4];
-
-   uint32         code_buffer; // jpeg entropy-coded buffer
-   int            code_bits;   // number of valid bits
-   unsigned char  marker;      // marker seen while filling entropy buffer
-   int            nomore;      // flag if we saw a marker so must stop
-
-   int scan_n, order[4];
-   int restart_interval, todo;
-} jpeg;
-
-static int build_huffman(huffman *h, int *count)
-{
-   int i,j,k=0,code;
-   // build size list for each symbol (from JPEG spec)
-   for (i=0; i < 16; ++i)
-      for (j=0; j < count[i]; ++j)
-         h->size[k++] = (uint8) (i+1);
-   h->size[k] = 0;
-
-   // compute actual symbols (from jpeg spec)
-   code = 0;
-   k = 0;
-   for(j=1; j <= 16; ++j) {
-      // compute delta to add to code to compute symbol id
-      h->delta[j] = k - code;
-      if (h->size[k] == j) {
-         while (h->size[k] == j)
-            h->code[k++] = (uint16) (code++);
-         if (code-1 >= (1 << j)) return e("bad code lengths","Corrupt JPEG");
-      }
-      // compute largest code + 1 for this size, preshifted as needed later
-      h->maxcode[j] = code << (16-j);
-      code <<= 1;
-   }
-   h->maxcode[j] = 0xffffffff;
-
-   // build non-spec acceleration table; 255 is flag for not-accelerated
-   memset(h->fast, 255, 1 << FAST_BITS);
-   for (i=0; i < k; ++i) {
-      int s = h->size[i];
-      if (s <= FAST_BITS) {
-         int c = h->code[i] << (FAST_BITS-s);
-         int m = 1 << (FAST_BITS-s);
-         for (j=0; j < m; ++j) {
-            h->fast[c+j] = (uint8) i;
-         }
-      }
-   }
-   return 1;
-}
-
-static void grow_buffer_unsafe(jpeg *j)
-{
-   do {
-      int b = j->nomore ? 0 : get8(&j->s);
-      if (b == 0xff) {
-         int c = get8(&j->s);
-         if (c != 0) {
-            j->marker = (unsigned char) c;
-            j->nomore = 1;
-            return;
-         }
-      }
-      j->code_buffer = (j->code_buffer << 8) | b;
-      j->code_bits += 8;
-   } while (j->code_bits <= 24);
-}
-
-// (1 << n) - 1
-static uint32 bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535};
-
-// decode a jpeg huffman value from the bitstream
-__forceinline static int decode(jpeg *j, huffman *h)
-{
-   unsigned int temp;
-   int c,k;
-
-   if (j->code_bits < 16) grow_buffer_unsafe(j);
-
-   // look at the top FAST_BITS and determine what symbol ID it is,
-   // if the code is <= FAST_BITS
-   c = (j->code_buffer >> (j->code_bits - FAST_BITS)) & ((1 << FAST_BITS)-1);
-   k = h->fast[c];
-   if (k < 255) {
-      if (h->size[k] > j->code_bits)
-         return -1;
-      j->code_bits -= h->size[k];
-      return h->values[k];
-   }
-
-   // naive test is to shift the code_buffer down so k bits are
-   // valid, then test against maxcode. To speed this up, we've
-   // preshifted maxcode left so that it has (16-k) 0s at the
-   // end; in other words, regardless of the number of bits, it
-   // wants to be compared against something shifted to have 16;
-   // that way we don't need to shift inside the loop.
-   if (j->code_bits < 16)
-      temp = (j->code_buffer << (16 - j->code_bits)) & 0xffff;
-   else
-      temp = (j->code_buffer >> (j->code_bits - 16)) & 0xffff;
-   for (k=FAST_BITS+1 ; ; ++k)
-      if (temp < h->maxcode[k])
-         break;
-   if (k == 17) {
-      // error! code not found
-      j->code_bits -= 16;
-      return -1;
-   }
-
-   if (k > j->code_bits)
-      return -1;
-
-   // convert the huffman code to the symbol id
-   c = ((j->code_buffer >> (j->code_bits - k)) & bmask[k]) + h->delta[k];
-   assert((((j->code_buffer) >> (j->code_bits - h->size[c])) & bmask[h->size[c]]) == h->code[c]);
-
-   // convert the id to a symbol
-   j->code_bits -= k;
-   return h->values[c];
-}
-
-// combined JPEG 'receive' and JPEG 'extend', since baseline
-// always extends everything it receives.
-__forceinline static int extend_receive(jpeg *j, int n)
-{
-   unsigned int m = 1 << (n-1);
-   unsigned int k;
-   if (j->code_bits < n) grow_buffer_unsafe(j);
-   k = (j->code_buffer >> (j->code_bits - n)) & bmask[n];
-   j->code_bits -= n;
-   // the following test is probably a random branch that won't
-   // predict well. I tried to table accelerate it but failed.
-   // maybe it's compiling as a conditional move?
-   if (k < m)
-      return (-1 << n) + k + 1;
-   else
-      return k;
-}
-
-// given a value that's at position X in the zigzag stream,
-// where does it appear in the 8x8 matrix coded as row-major?
-static uint8 dezigzag[64+15] =
-{
-    0,  1,  8, 16,  9,  2,  3, 10,
-   17, 24, 32, 25, 18, 11,  4,  5,
-   12, 19, 26, 33, 40, 48, 41, 34,
-   27, 20, 13,  6,  7, 14, 21, 28,
-   35, 42, 49, 56, 57, 50, 43, 36,
-   29, 22, 15, 23, 30, 37, 44, 51,
-   58, 59, 52, 45, 38, 31, 39, 46,
-   53, 60, 61, 54, 47, 55, 62, 63,
-   // let corrupt input sample past end
-   63, 63, 63, 63, 63, 63, 63, 63,
-   63, 63, 63, 63, 63, 63, 63
-};
-
-// decode one 64-entry block--
-static int decode_block(jpeg *j, short data[64], huffman *hdc, huffman *hac, int b)
-{
-   int diff,dc,k;
-   int t = decode(j, hdc);
-   if (t < 0) return e("bad huffman code","Corrupt JPEG");
-
-   // 0 all the ac values now so we can do it 32-bits at a time
-   memset(data,0,64*sizeof(data[0]));
-
-   diff = t ? extend_receive(j, t) : 0;
-   dc = j->img_comp[b].dc_pred + diff;
-   j->img_comp[b].dc_pred = dc;
-   data[0] = (short) dc;
-
-   // decode AC components, see JPEG spec
-   k = 1;
-   do {
-      int r,s;
-      int rs = decode(j, hac);
-      if (rs < 0) return e("bad huffman code","Corrupt JPEG");
-      s = rs & 15;
-      r = rs >> 4;
-      if (s == 0) {
-         if (rs != 0xf0) break; // end block
-         k += 16;
-      } else {
-         k += r;
-         // decode into unzigzag'd location
-         data[dezigzag[k++]] = (short) extend_receive(j,s);
-      }
-   } while (k < 64);
-   return 1;
-}
-
-// take a -128..127 value and clamp it and convert to 0..255
-__forceinline static uint8 clamp(int x)
-{
-   x += 128;
-   // trick to use a single test to catch both cases
-   if ((unsigned int) x > 255) {
-      if (x < 0) return 0;
-      if (x > 255) return 255;
-   }
-   return (uint8) x;
-}
-
-#define f2f(x)  (int) (((x) * 4096 + 0.5))
-#define fsh(x)  ((x) << 12)
-
-// derived from jidctint -- DCT_ISLOW
-#define IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7)       \
-   int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \
-   p2 = s2;                                    \
-   p3 = s6;                                    \
-   p1 = (p2+p3) * f2f(0.5411961f);             \
-   t2 = p1 + p3*f2f(-1.847759065f);            \
-   t3 = p1 + p2*f2f( 0.765366865f);            \
-   p2 = s0;                                    \
-   p3 = s4;                                    \
-   t0 = fsh(p2+p3);                            \
-   t1 = fsh(p2-p3);                            \
-   x0 = t0+t3;                                 \
-   x3 = t0-t3;                                 \
-   x1 = t1+t2;                                 \
-   x2 = t1-t2;                                 \
-   t0 = s7;                                    \
-   t1 = s5;                                    \
-   t2 = s3;                                    \
-   t3 = s1;                                    \
-   p3 = t0+t2;                                 \
-   p4 = t1+t3;                                 \
-   p1 = t0+t3;                                 \
-   p2 = t1+t2;                                 \
-   p5 = (p3+p4)*f2f( 1.175875602f);            \
-   t0 = t0*f2f( 0.298631336f);                 \
-   t1 = t1*f2f( 2.053119869f);                 \
-   t2 = t2*f2f( 3.072711026f);                 \
-   t3 = t3*f2f( 1.501321110f);                 \
-   p1 = p5 + p1*f2f(-0.899976223f);            \
-   p2 = p5 + p2*f2f(-2.562915447f);            \
-   p3 = p3*f2f(-1.961570560f);                 \
-   p4 = p4*f2f(-0.390180644f);                 \
-   t3 += p1+p4;                                \
-   t2 += p2+p3;                                \
-   t1 += p2+p4;                                \
-   t0 += p1+p3;
-
-#if !STBI_SIMD
-// .344 seconds on 3*anemones.jpg
-static void idct_block(uint8 *out, int out_stride, short data[64], uint8 *dequantize)
-{
-   int i,val[64],*v=val;
-   uint8 *o,*dq = dequantize;
-   short *d = data;
-
-   // columns
-   for (i=0; i < 8; ++i,++d,++dq, ++v) {
-      // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing
-      if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0
-           && d[40]==0 && d[48]==0 && d[56]==0) {
-         //    no shortcut                 0     seconds
-         //    (1|2|3|4|5|6|7)==0          0     seconds
-         //    all separate               -0.047 seconds
-         //    1 && 2|3 && 4|5 && 6|7:    -0.047 seconds
-         int dcterm = d[0] * dq[0] << 2;
-         v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm;
-      } else {
-         IDCT_1D(d[ 0]*dq[ 0],d[ 8]*dq[ 8],d[16]*dq[16],d[24]*dq[24],
-                 d[32]*dq[32],d[40]*dq[40],d[48]*dq[48],d[56]*dq[56])
-         // constants scaled things up by 1<<12; let's bring them back
-         // down, but keep 2 extra bits of precision
-         x0 += 512; x1 += 512; x2 += 512; x3 += 512;
-         v[ 0] = (x0+t3) >> 10;
-         v[56] = (x0-t3) >> 10;
-         v[ 8] = (x1+t2) >> 10;
-         v[48] = (x1-t2) >> 10;
-         v[16] = (x2+t1) >> 10;
-         v[40] = (x2-t1) >> 10;
-         v[24] = (x3+t0) >> 10;
-         v[32] = (x3-t0) >> 10;
-      }
-   }
-
-   for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) {
-      // no fast case since the first 1D IDCT spread components out
-      IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7])
-      // constants scaled things up by 1<<12, plus we had 1<<2 from first
-      // loop, plus horizontal and vertical each scale by sqrt(8) so together
-      // we've got an extra 1<<3, so 1<<17 total we need to remove.
-      x0 += 65536; x1 += 65536; x2 += 65536; x3 += 65536;
-      o[0] = clamp((x0+t3) >> 17);
-      o[7] = clamp((x0-t3) >> 17);
-      o[1] = clamp((x1+t2) >> 17);
-      o[6] = clamp((x1-t2) >> 17);
-      o[2] = clamp((x2+t1) >> 17);
-      o[5] = clamp((x2-t1) >> 17);
-      o[3] = clamp((x3+t0) >> 17);
-      o[4] = clamp((x3-t0) >> 17);
-   }
-}
-#else
-static void idct_block(uint8 *out, int out_stride, short data[64], unsigned short *dequantize)
-{
-   int i,val[64],*v=val;
-   uint8 *o;
-   unsigned short *dq = dequantize;
-   short *d = data;
-
-   // columns
-   for (i=0; i < 8; ++i,++d,++dq, ++v) {
-      // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing
-      if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0
-           && d[40]==0 && d[48]==0 && d[56]==0) {
-         //    no shortcut                 0     seconds
-         //    (1|2|3|4|5|6|7)==0          0     seconds
-         //    all separate               -0.047 seconds
-         //    1 && 2|3 && 4|5 && 6|7:    -0.047 seconds
-         int dcterm = d[0] * dq[0] << 2;
-         v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm;
-      } else {
-         IDCT_1D(d[ 0]*dq[ 0],d[ 8]*dq[ 8],d[16]*dq[16],d[24]*dq[24],
-                 d[32]*dq[32],d[40]*dq[40],d[48]*dq[48],d[56]*dq[56])
-         // constants scaled things up by 1<<12; let's bring them back
-         // down, but keep 2 extra bits of precision
-         x0 += 512; x1 += 512; x2 += 512; x3 += 512;
-         v[ 0] = (x0+t3) >> 10;
-         v[56] = (x0-t3) >> 10;
-         v[ 8] = (x1+t2) >> 10;
-         v[48] = (x1-t2) >> 10;
-         v[16] = (x2+t1) >> 10;
-         v[40] = (x2-t1) >> 10;
-         v[24] = (x3+t0) >> 10;
-         v[32] = (x3-t0) >> 10;
-      }
-   }
-
-   for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) {
-      // no fast case since the first 1D IDCT spread components out
-      IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7])
-      // constants scaled things up by 1<<12, plus we had 1<<2 from first
-      // loop, plus horizontal and vertical each scale by sqrt(8) so together
-      // we've got an extra 1<<3, so 1<<17 total we need to remove.
-      x0 += 65536; x1 += 65536; x2 += 65536; x3 += 65536;
-      o[0] = clamp((x0+t3) >> 17);
-      o[7] = clamp((x0-t3) >> 17);
-      o[1] = clamp((x1+t2) >> 17);
-      o[6] = clamp((x1-t2) >> 17);
-      o[2] = clamp((x2+t1) >> 17);
-      o[5] = clamp((x2-t1) >> 17);
-      o[3] = clamp((x3+t0) >> 17);
-      o[4] = clamp((x3-t0) >> 17);
-   }
-}
-static stbi_idct_8x8 stbi_idct_installed = idct_block;
-
-extern void stbi_install_idct(stbi_idct_8x8 func)
-{
-   stbi_idct_installed = func;
-}
-#endif
-
-#define MARKER_none  0xff
-// if there's a pending marker from the entropy stream, return that
-// otherwise, fetch from the stream and get a marker. if there's no
-// marker, return 0xff, which is never a valid marker value
-static uint8 get_marker(jpeg *j)
-{
-   uint8 x;
-   if (j->marker != MARKER_none) { x = j->marker; j->marker = MARKER_none; return x; }
-   x = get8u(&j->s);
-   if (x != 0xff) return MARKER_none;
-   while (x == 0xff)
-      x = get8u(&j->s);
-   return x;
-}
-
-// in each scan, we'll have scan_n components, and the order
-// of the components is specified by order[]
-#define RESTART(x)     ((x) >= 0xd0 && (x) <= 0xd7)
-
-// after a restart interval, reset the entropy decoder and
-// the dc prediction
-static void reset(jpeg *j)
-{
-   j->code_bits = 0;
-   j->code_buffer = 0;
-   j->nomore = 0;
-   j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = 0;
-   j->marker = MARKER_none;
-   j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff;
-   // no more than 1<<31 MCUs if no restart_interal? that's plenty safe,
-   // since we don't even allow 1<<30 pixels
-}
-
-static int parse_entropy_coded_data(jpeg *z)
-{
-   reset(z);
-   if (z->scan_n == 1) {
-      int i,j;
-      #if STBI_SIMD
-      __declspec(align(16))
-      #endif
-      short data[64];
-      int n = z->order[0];
-      // non-interleaved data, we just need to process one block at a time,
-      // in trivial scanline order
-      // number of blocks to do just depends on how many actual "pixels" this
-      // component has, independent of interleaved MCU blocking and such
-      int w = (z->img_comp[n].x+7) >> 3;
-      int h = (z->img_comp[n].y+7) >> 3;
-      for (j=0; j < h; ++j) {
-         for (i=0; i < w; ++i) {
-            if (!decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+z->img_comp[n].ha, n)) return 0;
-            #if STBI_SIMD
-            stbi_idct_installed(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data, z->dequant2[z->img_comp[n].tq]);
-            #else
-            idct_block(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data, z->dequant[z->img_comp[n].tq]);
-            #endif
-            // every data block is an MCU, so countdown the restart interval
-            if (--z->todo <= 0) {
-               if (z->code_bits < 24) grow_buffer_unsafe(z);
-               // if it's NOT a restart, then just bail, so we get corrupt data
-               // rather than no data
-               if (!RESTART(z->marker)) return 1;
-               reset(z);
-            }
-         }
-      }
-   } else { // interleaved!
-      int i,j,k,x,y;
-      short data[64];
-      for (j=0; j < z->img_mcu_y; ++j) {
-         for (i=0; i < z->img_mcu_x; ++i) {
-            // scan an interleaved mcu... process scan_n components in order
-            for (k=0; k < z->scan_n; ++k) {
-               int n = z->order[k];
-               // scan out an mcu's worth of this component; that's just determined
-               // by the basic H and V specified for the component
-               for (y=0; y < z->img_comp[n].v; ++y) {
-                  for (x=0; x < z->img_comp[n].h; ++x) {
-                     int x2 = (i*z->img_comp[n].h + x)*8;
-                     int y2 = (j*z->img_comp[n].v + y)*8;
-                     if (!decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+z->img_comp[n].ha, n)) return 0;
-                     #if STBI_SIMD
-                     stbi_idct_installed(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data, z->dequant2[z->img_comp[n].tq]);
-                     #else
-                     idct_block(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data, z->dequant[z->img_comp[n].tq]);
-                     #endif
-                  }
-               }
-            }
-            // after all interleaved components, that's an interleaved MCU,
-            // so now count down the restart interval
-            if (--z->todo <= 0) {
-               if (z->code_bits < 24) grow_buffer_unsafe(z);
-               // if it's NOT a restart, then just bail, so we get corrupt data
-               // rather than no data
-               if (!RESTART(z->marker)) return 1;
-               reset(z);
-            }
-         }
-      }
-   }
-   return 1;
-}
-
-static int process_marker(jpeg *z, int m)
-{
-   int L;
-   switch (m) {
-      case MARKER_none: // no marker found
-         return e("expected marker","Corrupt JPEG");
-
-      case 0xC2: // SOF - progressive
-         return e("progressive jpeg","JPEG format not supported (progressive)");
-
-      case 0xDD: // DRI - specify restart interval
-         if (get16(&z->s) != 4) return e("bad DRI len","Corrupt JPEG");
-         z->restart_interval = get16(&z->s);
-         return 1;
-
-      case 0xDB: // DQT - define quantization table
-         L = get16(&z->s)-2;
-         while (L > 0) {
-            int q = get8(&z->s);
-            int p = q >> 4;
-            int t = q & 15,i;
-            if (p != 0) return e("bad DQT type","Corrupt JPEG");
-            if (t > 3) return e("bad DQT table","Corrupt JPEG");
-            for (i=0; i < 64; ++i)
-               z->dequant[t][dezigzag[i]] = get8u(&z->s);
-            #if STBI_SIMD
-            for (i=0; i < 64; ++i)
-               z->dequant2[t][i] = z->dequant[t][i];
-            #endif
-            L -= 65;
-         }
-         return L==0;
-
-      case 0xC4: // DHT - define huffman table
-         L = get16(&z->s)-2;
-         while (L > 0) {
-            uint8 *v;
-            int sizes[16],i,m=0;
-            int q = get8(&z->s);
-            int tc = q >> 4;
-            int th = q & 15;
-            if (tc > 1 || th > 3) return e("bad DHT header","Corrupt JPEG");
-            for (i=0; i < 16; ++i) {
-               sizes[i] = get8(&z->s);
-               m += sizes[i];
-            }
-            L -= 17;
-            if (tc == 0) {
-               if (!build_huffman(z->huff_dc+th, sizes)) return 0;
-               v = z->huff_dc[th].values;
-            } else {
-               if (!build_huffman(z->huff_ac+th, sizes)) return 0;
-               v = z->huff_ac[th].values;
-            }
-            for (i=0; i < m; ++i)
-               v[i] = get8u(&z->s);
-            L -= m;
-         }
-         return L==0;
-   }
-   // check for comment block or APP blocks
-   if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) {
-      skip(&z->s, get16(&z->s)-2);
-      return 1;
-   }
-   return 0;
-}
-
-// after we see SOS
-static int process_scan_header(jpeg *z)
-{
-   int i;
-   int Ls = get16(&z->s);
-   z->scan_n = get8(&z->s);
-   if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s.img_n) return e("bad SOS component count","Corrupt JPEG");
-   if (Ls != 6+2*z->scan_n) return e("bad SOS len","Corrupt JPEG");
-   for (i=0; i < z->scan_n; ++i) {
-      int id = get8(&z->s), which;
-      int q = get8(&z->s);
-      for (which = 0; which < z->s.img_n; ++which)
-         if (z->img_comp[which].id == id)
-            break;
-      if (which == z->s.img_n) return 0;
-      z->img_comp[which].hd = q >> 4;   if (z->img_comp[which].hd > 3) return e("bad DC huff","Corrupt JPEG");
-      z->img_comp[which].ha = q & 15;   if (z->img_comp[which].ha > 3) return e("bad AC huff","Corrupt JPEG");
-      z->order[i] = which;
-   }
-   if (get8(&z->s) != 0) return e("bad SOS","Corrupt JPEG");
-   get8(&z->s); // should be 63, but might be 0
-   if (get8(&z->s) != 0) return e("bad SOS","Corrupt JPEG");
-
-   return 1;
-}
-
-static int process_frame_header(jpeg *z, int scan)
-{
-   stbi *s = &z->s;
-   int Lf,p,i,q, h_max=1,v_max=1,c;
-   Lf = get16(s);         if (Lf < 11) return e("bad SOF len","Corrupt JPEG"); // JPEG
-   p  = get8(s);          if (p != 8) return e("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline
-   s->img_y = get16(s);   if (s->img_y == 0) return e("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG
-   s->img_x = get16(s);   if (s->img_x == 0) return e("0 width","Corrupt JPEG"); // JPEG requires
-   c = get8(s);
-   if (c != 3 && c != 1) return e("bad component count","Corrupt JPEG");    // JFIF requires
-   s->img_n = c;
-   for (i=0; i < c; ++i) {
-      z->img_comp[i].data = NULL;
-      z->img_comp[i].linebuf = NULL;
-   }
-
-   if (Lf != 8+3*s->img_n) return e("bad SOF len","Corrupt JPEG");
-
-   for (i=0; i < s->img_n; ++i) {
-      z->img_comp[i].id = get8(s);
-      if (z->img_comp[i].id != i+1)   // JFIF requires
-         if (z->img_comp[i].id != i)  // some version of jpegtran outputs non-JFIF-compliant files!
-            return e("bad component ID","Corrupt JPEG");
-      q = get8(s);
-      z->img_comp[i].h = (q >> 4);  if (!z->img_comp[i].h || z->img_comp[i].h > 4) return e("bad H","Corrupt JPEG");
-      z->img_comp[i].v = q & 15;    if (!z->img_comp[i].v || z->img_comp[i].v > 4) return e("bad V","Corrupt JPEG");
-      z->img_comp[i].tq = get8(s);  if (z->img_comp[i].tq > 3) return e("bad TQ","Corrupt JPEG");
-   }
-
-   if (scan != SCAN_load) return 1;
-
-   if ((1 << 30) / s->img_x / s->img_n < s->img_y) return e("too large", "Image too large to decode");
-
-   for (i=0; i < s->img_n; ++i) {
-      if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h;
-      if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v;
-   }
-
-   // compute interleaved mcu info
-   z->img_h_max = h_max;
-   z->img_v_max = v_max;
-   z->img_mcu_w = h_max * 8;
-   z->img_mcu_h = v_max * 8;
-   z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w;
-   z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h;
-
-   for (i=0; i < s->img_n; ++i) {
-      // number of effective pixels (e.g. for non-interleaved MCU)
-      z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max;
-      z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max;
-      // to simplify generation, we'll allocate enough memory to decode
-      // the bogus oversized data from using interleaved MCUs and their
-      // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't
-      // discard the extra data until colorspace conversion
-      z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8;
-      z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8;
-      z->img_comp[i].raw_data = malloc(z->img_comp[i].w2 * z->img_comp[i].h2+15);
-      if (z->img_comp[i].raw_data == NULL) {
-         for(--i; i >= 0; --i) {
-            free(z->img_comp[i].raw_data);
-            z->img_comp[i].data = NULL;
-         }
-         return e("outofmem", "Out of memory");
-      }
-      // align blocks for installable-idct using mmx/sse
-      z->img_comp[i].data = (uint8*) (((size_t) z->img_comp[i].raw_data + 15) & ~15);
-      z->img_comp[i].linebuf = NULL;
-   }
-
-   return 1;
-}
-
-// use comparisons since in some cases we handle more than one case (e.g. SOF)
-#define DNL(x)         ((x) == 0xdc)
-#define SOI(x)         ((x) == 0xd8)
-#define EOI(x)         ((x) == 0xd9)
-#define SOF(x)         ((x) == 0xc0 || (x) == 0xc1)
-#define SOS(x)         ((x) == 0xda)
-
-static int decode_jpeg_header(jpeg *z, int scan)
-{
-   int m;
-   z->marker = MARKER_none; // initialize cached marker to empty
-   m = get_marker(z);
-   if (!SOI(m)) return e("no SOI","Corrupt JPEG");
-   if (scan == SCAN_type) return 1;
-   m = get_marker(z);
-   while (!SOF(m)) {
-      if (!process_marker(z,m)) return 0;
-      m = get_marker(z);
-      while (m == MARKER_none) {
-         // some files have extra padding after their blocks, so ok, we'll scan
-         if (at_eof(&z->s)) return e("no SOF", "Corrupt JPEG");
-         m = get_marker(z);
-      }
-   }
-   if (!process_frame_header(z, scan)) return 0;
-   return 1;
-}
-
-static int decode_jpeg_image(jpeg *j)
-{
-   int m;
-   j->restart_interval = 0;
-   if (!decode_jpeg_header(j, SCAN_load)) return 0;
-   m = get_marker(j);
-   while (!EOI(m)) {
-      if (SOS(m)) {
-         if (!process_scan_header(j)) return 0;
-         if (!parse_entropy_coded_data(j)) return 0;
-      } else {
-         if (!process_marker(j, m)) return 0;
-      }
-      m = get_marker(j);
-   }
-   return 1;
-}
-
-// static jfif-centered resampling (across block boundaries)
-
-typedef uint8 *(*resample_row_func)(uint8 *out, uint8 *in0, uint8 *in1,
-                                    int w, int hs);
-
-#define div4(x) ((uint8) ((x) >> 2))
-
-static uint8 *resample_row_1(uint8 * /*out*/, uint8 *in_near, uint8 * /*in_far*/, int /*w*/, int /*hs*/)
-{
-   return in_near;
-}
-
-static uint8* resample_row_v_2(uint8 *out, uint8 *in_near, uint8 * in_far, int w, int /*hs*/)
-{
-   // need to generate two samples vertically for every one in input
-   int i;
-   for (i=0; i < w; ++i)
-      out[i] = div4(3*in_near[i] + in_far[i] + 2);
-   return out;
-}
-
-static uint8*  resample_row_h_2(uint8 *out, uint8 *in_near, uint8 * /*in_far*/, int w, int /*hs*/)
-{
-   // need to generate two samples horizontally for every one in input
-   int i;
-   uint8 *input = in_near;
-   if (w == 1) {
-      // if only one sample, can't do any interpolation
-      out[0] = out[1] = input[0];
-      return out;
-   }
-
-   out[0] = input[0];
-   out[1] = div4(input[0]*3 + input[1] + 2);
-   for (i=1; i < w-1; ++i) {
-      int n = 3*input[i]+2;
-      out[i*2+0] = div4(n+input[i-1]);
-      out[i*2+1] = div4(n+input[i+1]);
-   }
-   out[i*2+0] = div4(input[w-2]*3 + input[w-1] + 2);
-   out[i*2+1] = input[w-1];
-   return out;
-}
-
-#define div16(x) ((uint8) ((x) >> 4))
-
-static uint8 *resample_row_hv_2(uint8 *out, uint8 *in_near, uint8 *in_far, int w, int /*hs*/)
-{
-   // need to generate 2x2 samples for every one in input
-   int i,t0,t1;
-   if (w == 1) {
-      out[0] = out[1] = div4(3*in_near[0] + in_far[0] + 2);
-      return out;
-   }
-
-   t1 = 3*in_near[0] + in_far[0];
-   out[0] = div4(t1+2);
-   for (i=1; i < w; ++i) {
-      t0 = t1;
-      t1 = 3*in_near[i]+in_far[i];
-      out[i*2-1] = div16(3*t0 + t1 + 8);
-      out[i*2  ] = div16(3*t1 + t0 + 8);
-   }
-   out[w*2-1] = div4(t1+2);
-   return out;
-}
-
-static uint8 *resample_row_generic(uint8 *out, uint8 *in_near, uint8 * /*in_far*/, int w, int hs)
-{
-   // resample with nearest-neighbor
-   int i,j;
-   for (i=0; i < w; ++i)
-      for (j=0; j < hs; ++j)
-         out[i*hs+j] = in_near[i];
-   return out;
-}
-
-#define float2fixed(x)  ((int) ((x) * 65536 + 0.5))
-
-// 0.38 seconds on 3*anemones.jpg   (0.25 with processor = Pro)
-// VC6 without processor=Pro is generating multiple LEAs per multiply!
-static void YCbCr_to_RGB_row(uint8 *out, const uint8 *y, const uint8 *pcb, const uint8 *pcr, int count, int step)
-{
-   int i;
-   for (i=0; i < count; ++i) {
-      int y_fixed = (y[i] << 16) + 32768; // rounding
-      int r,g,b;
-      int cr = pcr[i] - 128;
-      int cb = pcb[i] - 128;
-      r = y_fixed + cr*float2fixed(1.40200f);
-      g = y_fixed - cr*float2fixed(0.71414f) - cb*float2fixed(0.34414f);
-      b = y_fixed                            + cb*float2fixed(1.77200f);
-      r >>= 16;
-      g >>= 16;
-      b >>= 16;
-      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
-      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
-      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
-      out[0] = (uint8)r;
-      out[1] = (uint8)g;
-      out[2] = (uint8)b;
-      out[3] = 255;
-      out += step;
-   }
-}
-
-#if STBI_SIMD
-static stbi_YCbCr_to_RGB_run stbi_YCbCr_installed = YCbCr_to_RGB_row;
-
-void stbi_install_YCbCr_to_RGB(stbi_YCbCr_to_RGB_run func)
-{
-   stbi_YCbCr_installed = func;
-}
-#endif
-
-
-// clean up the temporary component buffers
-static void cleanup_jpeg(jpeg *j)
-{
-   int i;
-   for (i=0; i < j->s.img_n; ++i) {
-      if (j->img_comp[i].data) {
-         free(j->img_comp[i].raw_data);
-         j->img_comp[i].data = NULL;
-      }
-      if (j->img_comp[i].linebuf) {
-         free(j->img_comp[i].linebuf);
-         j->img_comp[i].linebuf = NULL;
-      }
-   }
-}
-
-typedef struct
-{
-   resample_row_func resample;
-   uint8 *line0,*line1;
-   int hs,vs;   // expansion factor in each axis
-   int w_lores; // horizontal pixels pre-expansion 
-   int ystep;   // how far through vertical expansion we are
-   int ypos;    // which pre-expansion row we're on
-} stbi_resample;
-
-static uint8 *load_jpeg_image(jpeg *z, int *out_x, int *out_y, int *comp, int req_comp)
-{
-   int n, decode_n;
-   // validate req_comp
-   if (req_comp < 0 || req_comp > 4) return epuc("bad req_comp", "Internal error");
-   z->s.img_n = 0;
-
-   // load a jpeg image from whichever source
-   if (!decode_jpeg_image(z)) { cleanup_jpeg(z); return NULL; }
-
-   // determine actual number of components to generate
-   n = req_comp ? req_comp : z->s.img_n;
-
-   if (z->s.img_n == 3 && n < 3)
-      decode_n = 1;
-   else
-      decode_n = z->s.img_n;
-
-   // resample and color-convert
-   {
-      int k;
-      uint i,j;
-      uint8 *output;
-      uint8 *coutput[4];
-
-      stbi_resample res_comp[4];
-
-      for (k=0; k < decode_n; ++k) {
-         stbi_resample *r = &res_comp[k];
-
-         // allocate line buffer big enough for upsampling off the edges
-         // with upsample factor of 4
-         z->img_comp[k].linebuf = (uint8 *) malloc(z->s.img_x + 3);
-         if (!z->img_comp[k].linebuf) { cleanup_jpeg(z); return epuc("outofmem", "Out of memory"); }
-
-         r->hs      = z->img_h_max / z->img_comp[k].h;
-         r->vs      = z->img_v_max / z->img_comp[k].v;
-         r->ystep   = r->vs >> 1;
-         r->w_lores = (z->s.img_x + r->hs-1) / r->hs;
-         r->ypos    = 0;
-         r->line0   = r->line1 = z->img_comp[k].data;
-
-         if      (r->hs == 1 && r->vs == 1) r->resample = resample_row_1;
-         else if (r->hs == 1 && r->vs == 2) r->resample = resample_row_v_2;
-         else if (r->hs == 2 && r->vs == 1) r->resample = resample_row_h_2;
-         else if (r->hs == 2 && r->vs == 2) r->resample = resample_row_hv_2;
-         else                               r->resample = resample_row_generic;
-      }
-
-      // can't error after this so, this is safe
-      output = (uint8 *) malloc(n * z->s.img_x * z->s.img_y + 1);
-      if (!output) { cleanup_jpeg(z); return epuc("outofmem", "Out of memory"); }
-
-      // now go ahead and resample
-      for (j=0; j < z->s.img_y; ++j) {
-         uint8 *out = output + n * z->s.img_x * j;
-         for (k=0; k < decode_n; ++k) {
-            stbi_resample *r = &res_comp[k];
-            int y_bot = r->ystep >= (r->vs >> 1);
-            coutput[k] = r->resample(z->img_comp[k].linebuf,
-                                     y_bot ? r->line1 : r->line0,
-                                     y_bot ? r->line0 : r->line1,
-                                     r->w_lores, r->hs);
-            if (++r->ystep >= r->vs) {
-               r->ystep = 0;
-               r->line0 = r->line1;
-               if (++r->ypos < z->img_comp[k].y)
-                  r->line1 += z->img_comp[k].w2;
-            }
-         }
-         if (n >= 3) {
-            uint8 *y = coutput[0];
-            if (z->s.img_n == 3) {
-               #if STBI_SIMD
-               stbi_YCbCr_installed(out, y, coutput[1], coutput[2], z->s.img_x, n);
-               #else
-               YCbCr_to_RGB_row(out, y, coutput[1], coutput[2], z->s.img_x, n);
-               #endif
-            } else
-               for (i=0; i < z->s.img_x; ++i) {
-                  out[0] = out[1] = out[2] = y[i];
-                  out[3] = 255; // not used if n==3
-                  out += n;
-               }
-         } else {
-            uint8 *y = coutput[0];
-            if (n == 1)
-               for (i=0; i < z->s.img_x; ++i) out[i] = y[i];
-            else
-               for (i=0; i < z->s.img_x; ++i) *out++ = y[i], *out++ = 255;
-         }
-      }
-      cleanup_jpeg(z);
-      *out_x = z->s.img_x;
-      *out_y = z->s.img_y;
-      if (comp) *comp  = z->s.img_n; // report original components, not output
-      return output;
-   }
-}
-
-#ifndef STBI_NO_STDIO
-unsigned char *stbi_jpeg_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   jpeg j;
-   start_file(&j.s, f);
-   return load_jpeg_image(&j, x,y,comp,req_comp);
-}
-
-unsigned char *stbi_jpeg_load(char const *filename, int *x, int *y, int *comp, int req_comp)
-{
-   unsigned char *data;
-   FILE *f = fopen(filename, "rb");
-   if (!f) return NULL;
-   data = stbi_jpeg_load_from_file(f,x,y,comp,req_comp);
-   fclose(f);
-   return data;
-}
-#endif
-
-unsigned char *stbi_jpeg_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   jpeg j;
-   start_mem(&j.s, buffer,len);
-   return load_jpeg_image(&j, x,y,comp,req_comp);
-}
-
-#ifndef STBI_NO_STDIO
-int stbi_jpeg_test_file(FILE *f)
-{
-   int n,r;
-   jpeg j;
-   n = ftell(f);
-   start_file(&j.s, f);
-   r = decode_jpeg_header(&j, SCAN_type);
-   fseek(f,n,SEEK_SET);
-   return r;
-}
-#endif
-
-int stbi_jpeg_test_memory(stbi_uc const *buffer, int len)
-{
-   jpeg j;
-   start_mem(&j.s, buffer,len);
-   return decode_jpeg_header(&j, SCAN_type);
-}
-
-// @TODO:
-#ifndef STBI_NO_STDIO
-extern int      stbi_jpeg_info            (char const *filename,           int *x, int *y, int *comp);
-extern int      stbi_jpeg_info_from_file  (FILE *f,                  int *x, int *y, int *comp);
-#endif
-extern int      stbi_jpeg_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp);
-
-// public domain zlib decode    v0.2  Sean Barrett 2006-11-18
-//    simple implementation
-//      - all input must be provided in an upfront buffer
-//      - all output is written to a single output buffer (can malloc/realloc)
-//    performance
-//      - fast huffman
-
-// fast-way is faster to check than jpeg huffman, but slow way is slower
-#define ZFAST_BITS  9 // accelerate all cases in default tables
-#define ZFAST_MASK  ((1 << ZFAST_BITS) - 1)
-
-// zlib-style huffman encoding
-// (jpegs packs from left, zlib from right, so can't share code)
-typedef struct
-{
-   uint16 fast[1 << ZFAST_BITS];
-   uint16 firstcode[16];
-   int maxcode[17];
-   uint16 firstsymbol[16];
-   uint8  size[288];
-   uint16 value[288]; 
-} zhuffman;
-
-__forceinline static int bitreverse16(int n)
-{
-  n = ((n & 0xAAAA) >>  1) | ((n & 0x5555) << 1);
-  n = ((n & 0xCCCC) >>  2) | ((n & 0x3333) << 2);
-  n = ((n & 0xF0F0) >>  4) | ((n & 0x0F0F) << 4);
-  n = ((n & 0xFF00) >>  8) | ((n & 0x00FF) << 8);
-  return n;
-}
-
-__forceinline static int bit_reverse(int v, int bits)
-{
-   assert(bits <= 16);
-   // to bit reverse n bits, reverse 16 and shift
-   // e.g. 11 bits, bit reverse and shift away 5
-   return bitreverse16(v) >> (16-bits);
-}
-
-static int zbuild_huffman(zhuffman *z, uint8 *sizelist, int num)
-{
-   int i,k=0;
-   int code, next_code[16], sizes[17];
-
-   // DEFLATE spec for generating codes
-   memset(sizes, 0, sizeof(sizes));
-   memset(z->fast, 255, sizeof(z->fast));
-   for (i=0; i < num; ++i) 
-      ++sizes[sizelist[i]];
-   sizes[0] = 0;
-   for (i=1; i < 16; ++i)
-      assert(sizes[i] <= (1 << i));
-   code = 0;
-   for (i=1; i < 16; ++i) {
-      next_code[i] = code;
-      z->firstcode[i] = (uint16) code;
-      z->firstsymbol[i] = (uint16) k;
-      code = (code + sizes[i]);
-      if (sizes[i])
-         if (code-1 >= (1 << i)) return e("bad codelengths","Corrupt JPEG");
-      z->maxcode[i] = code << (16-i); // preshift for inner loop
-      code <<= 1;
-      k += sizes[i];
-   }
-   z->maxcode[16] = 0x10000; // sentinel
-   for (i=0; i < num; ++i) {
-      int s = sizelist[i];
-      if (s) {
-         int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s];
-         z->size[c] = (uint8)s;
-         z->value[c] = (uint16)i;
-         if (s <= ZFAST_BITS) {
-            int k = bit_reverse(next_code[s],s);
-            while (k < (1 << ZFAST_BITS)) {
-               z->fast[k] = (uint16) c;
-               k += (1 << s);
-            }
-         }
-         ++next_code[s];
-      }
-   }
-   return 1;
-}
-
-// zlib-from-memory implementation for PNG reading
-//    because PNG allows splitting the zlib stream arbitrarily,
-//    and it's annoying structurally to have PNG call ZLIB call PNG,
-//    we require PNG read all the IDATs and combine them into a single
-//    memory buffer
-
-typedef struct
-{
-   uint8 *zbuffer, *zbuffer_end;
-   int num_bits;
-   uint32 code_buffer;
-
-   char *zout;
-   char *zout_start;
-   char *zout_end;
-   int   z_expandable;
-
-   zhuffman z_length, z_distance;
-} zbuf;
-
-__forceinline static int zget8(zbuf *z)
-{
-   if (z->zbuffer >= z->zbuffer_end) return 0;
-   return *z->zbuffer++;
-}
-
-static void fill_bits(zbuf *z)
-{
-   do {
-      assert(z->code_buffer < (1U << z->num_bits));
-      z->code_buffer |= zget8(z) << z->num_bits;
-      z->num_bits += 8;
-   } while (z->num_bits <= 24);
-}
-
-__forceinline static unsigned int zreceive(zbuf *z, int n)
-{
-   unsigned int k;
-   if (z->num_bits < n) fill_bits(z);
-   k = z->code_buffer & ((1 << n) - 1);
-   z->code_buffer >>= n;
-   z->num_bits -= n;
-   return k;   
-}
-
-__forceinline static int zhuffman_decode(zbuf *a, zhuffman *z)
-{
-   int b,s,k;
-   if (a->num_bits < 16) fill_bits(a);
-   b = z->fast[a->code_buffer & ZFAST_MASK];
-   if (b < 0xffff) {
-      s = z->size[b];
-      a->code_buffer >>= s;
-      a->num_bits -= s;
-      return z->value[b];
-   }
-
-   // not resolved by fast table, so compute it the slow way
-   // use jpeg approach, which requires MSbits at top
-   k = bit_reverse(a->code_buffer, 16);
-   for (s=ZFAST_BITS+1; ; ++s)
-      if (k < z->maxcode[s])
-         break;
-   if (s == 16) return -1; // invalid code!
-   // code size is s, so:
-   b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s];
-   assert(z->size[b] == s);
-   a->code_buffer >>= s;
-   a->num_bits -= s;
-   return z->value[b];
-}
-
-static int expand(zbuf *z, int n)  // need to make room for n bytes
-{
-   char *q;
-   int cur, limit;
-   if (!z->z_expandable) return e("output buffer limit","Corrupt PNG");
-   cur   = (int) (z->zout     - z->zout_start);
-   limit = (int) (z->zout_end - z->zout_start);
-   while (cur + n > limit)
-      limit *= 2;
-   q = (char *) realloc(z->zout_start, limit);
-   if (q == NULL) return e("outofmem", "Out of memory");
-   z->zout_start = q;
-   z->zout       = q + cur;
-   z->zout_end   = q + limit;
-   return 1;
-}
-
-static int length_base[31] = {
-   3,4,5,6,7,8,9,10,11,13,
-   15,17,19,23,27,31,35,43,51,59,
-   67,83,99,115,131,163,195,227,258,0,0 };
-
-static int length_extra[31]= 
-{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 };
-
-static int dist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,
-257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0};
-
-static int dist_extra[32] =
-{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-static int parse_huffman_block(zbuf *a)
-{
-   for(;;) {
-      int z = zhuffman_decode(a, &a->z_length);
-      if (z < 256) {
-         if (z < 0) return e("bad huffman code","Corrupt PNG"); // error in huffman codes
-         if (a->zout >= a->zout_end) if (!expand(a, 1)) return 0;
-         *a->zout++ = (char) z;
-      } else {
-         uint8 *p;
-         int len,dist;
-         if (z == 256) return 1;
-         z -= 257;
-         len = length_base[z];
-         if (length_extra[z]) len += zreceive(a, length_extra[z]);
-         z = zhuffman_decode(a, &a->z_distance);
-         if (z < 0) return e("bad huffman code","Corrupt PNG");
-         dist = dist_base[z];
-         if (dist_extra[z]) dist += zreceive(a, dist_extra[z]);
-         if (a->zout - a->zout_start < dist) return e("bad dist","Corrupt PNG");
-         if (a->zout + len > a->zout_end) if (!expand(a, len)) return 0;
-         p = (uint8 *) (a->zout - dist);
-         while (len--)
-            *a->zout++ = *p++;
-      }
-   }
-}
-
-static int compute_huffman_codes(zbuf *a)
-{
-   static uint8 length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
-   zhuffman z_codelength;
-   uint8 lencodes[286+32+137];//padding for maximum single op
-   uint8 codelength_sizes[19];
-   int i,n;
-
-   int hlit  = zreceive(a,5) + 257;
-   int hdist = zreceive(a,5) + 1;
-   int hclen = zreceive(a,4) + 4;
-
-   memset(codelength_sizes, 0, sizeof(codelength_sizes));
-   for (i=0; i < hclen; ++i) {
-      int s = zreceive(a,3);
-      codelength_sizes[length_dezigzag[i]] = (uint8) s;
-   }
-   if (!zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0;
-
-   n = 0;
-   while (n < hlit + hdist) {
-      int c = zhuffman_decode(a, &z_codelength);
-      assert(c >= 0 && c < 19);
-      if (c < 16)
-         lencodes[n++] = (uint8) c;
-      else if (c == 16) {
-         c = zreceive(a,2)+3;
-         memset(lencodes+n, lencodes[n-1], c);
-         n += c;
-      } else if (c == 17) {
-         c = zreceive(a,3)+3;
-         memset(lencodes+n, 0, c);
-         n += c;
-      } else {
-         assert(c == 18);
-         c = zreceive(a,7)+11;
-         memset(lencodes+n, 0, c);
-         n += c;
-      }
-   }
-   if (n != hlit+hdist) return e("bad codelengths","Corrupt PNG");
-   if (!zbuild_huffman(&a->z_length, lencodes, hlit)) return 0;
-   if (!zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0;
-   return 1;
-}
-
-static int parse_uncompressed_block(zbuf *a)
-{
-   uint8 header[4];
-   int len,nlen,k;
-   if (a->num_bits & 7)
-      zreceive(a, a->num_bits & 7); // discard
-   // drain the bit-packed data into header
-   k = 0;
-   while (a->num_bits > 0) {
-      header[k++] = (uint8) (a->code_buffer & 255); // wtf this warns?
-      a->code_buffer >>= 8;
-      a->num_bits -= 8;
-   }
-   assert(a->num_bits == 0);
-   // now fill header the normal way
-   while (k < 4)
-      header[k++] = (uint8) zget8(a);
-   len  = header[1] * 256 + header[0];
-   nlen = header[3] * 256 + header[2];
-   if (nlen != (len ^ 0xffff)) return e("zlib corrupt","Corrupt PNG");
-   if (a->zbuffer + len > a->zbuffer_end) return e("read past buffer","Corrupt PNG");
-   if (a->zout + len > a->zout_end)
-      if (!expand(a, len)) return 0;
-   memcpy(a->zout, a->zbuffer, len);
-   a->zbuffer += len;
-   a->zout += len;
-   return 1;
-}
-
-static int parse_zlib_header(zbuf *a)
-{
-   int cmf   = zget8(a);
-   int cm    = cmf & 15;
-   /* int cinfo = cmf >> 4; */
-   int flg   = zget8(a);
-   if ((cmf*256+flg) % 31 != 0) return e("bad zlib header","Corrupt PNG"); // zlib spec
-   if (flg & 32) return e("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png
-   if (cm != 8) return e("bad compression","Corrupt PNG"); // DEFLATE required for png
-   // window = 1 << (8 + cinfo)... but who cares, we fully buffer output
-   return 1;
-}
-
-// @TODO: should statically initialize these for optimal thread safety
-static uint8 default_length[288], default_distance[32];
-static void init_defaults(void)
-{
-   int i;   // use <= to match clearly with spec
-   for (i=0; i <= 143; ++i)     default_length[i]   = 8;
-   for (   ; i <= 255; ++i)     default_length[i]   = 9;
-   for (   ; i <= 279; ++i)     default_length[i]   = 7;
-   for (   ; i <= 287; ++i)     default_length[i]   = 8;
-
-   for (i=0; i <=  31; ++i)     default_distance[i] = 5;
-}
-
-int stbi_png_partial; // a quick hack to only allow decoding some of a PNG... I should implement real streaming support instead
-static int parse_zlib(zbuf *a, int parse_header)
-{
-   int final, type;
-   if (parse_header)
-      if (!parse_zlib_header(a)) return 0;
-   a->num_bits = 0;
-   a->code_buffer = 0;
-   do {
-      final = zreceive(a,1);
-      type = zreceive(a,2);
-      if (type == 0) {
-         if (!parse_uncompressed_block(a)) return 0;
-      } else if (type == 3) {
-         return 0;
-      } else {
-         if (type == 1) {
-            // use fixed code lengths
-            if (!default_distance[31]) init_defaults();
-            if (!zbuild_huffman(&a->z_length  , default_length  , 288)) return 0;
-            if (!zbuild_huffman(&a->z_distance, default_distance,  32)) return 0;
-         } else {
-            if (!compute_huffman_codes(a)) return 0;
-         }
-         if (!parse_huffman_block(a)) return 0;
-      }
-      if (stbi_png_partial && a->zout - a->zout_start > 65536)
-         break;
-   } while (!final);
-   return 1;
-}
-
-static int do_zlib(zbuf *a, char *obuf, int olen, int exp, int parse_header)
-{
-   a->zout_start = obuf;
-   a->zout       = obuf;
-   a->zout_end   = obuf + olen;
-   a->z_expandable = exp;
-
-   return parse_zlib(a, parse_header);
-}
-
-char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen)
-{
-   zbuf a;
-   char *p = (char *) malloc(initial_size);
-   if (p == NULL) return NULL;
-   a.zbuffer = (uint8 *) buffer;
-   a.zbuffer_end = (uint8 *) buffer + len;
-   if (do_zlib(&a, p, initial_size, 1, 1)) {
-      if (outlen) *outlen = (int) (a.zout - a.zout_start);
-      return a.zout_start;
-   } else {
-      free(a.zout_start);
-      return NULL;
-   }
-}
-
-char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen)
-{
-   return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen);
-}
-
-int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen)
-{
-   zbuf a;
-   a.zbuffer = (uint8 *) ibuffer;
-   a.zbuffer_end = (uint8 *) ibuffer + ilen;
-   if (do_zlib(&a, obuffer, olen, 0, 1))
-      return (int) (a.zout - a.zout_start);
-   else
-      return -1;
-}
-
-char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen)
-{
-   zbuf a;
-   char *p = (char *) malloc(16384);
-   if (p == NULL) return NULL;
-   a.zbuffer = (uint8 *) buffer;
-   a.zbuffer_end = (uint8 *) buffer+len;
-   if (do_zlib(&a, p, 16384, 1, 0)) {
-      if (outlen) *outlen = (int) (a.zout - a.zout_start);
-      return a.zout_start;
-   } else {
-      free(a.zout_start);
-      return NULL;
-   }
-}
-
-int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen)
-{
-   zbuf a;
-   a.zbuffer = (uint8 *) ibuffer;
-   a.zbuffer_end = (uint8 *) ibuffer + ilen;
-   if (do_zlib(&a, obuffer, olen, 0, 0))
-      return (int) (a.zout - a.zout_start);
-   else
-      return -1;
-}
-
-// public domain "baseline" PNG decoder   v0.10  Sean Barrett 2006-11-18
-//    simple implementation
-//      - only 8-bit samples
-//      - no CRC checking
-//      - allocates lots of intermediate memory
-//        - avoids problem of streaming data between subsystems
-//        - avoids explicit window management
-//    performance
-//      - uses stb_zlib, a PD zlib implementation with fast huffman decoding
-
-
-typedef struct
-{
-   uint32 length;
-   uint32 type;
-} chunk;
-
-#define PNG_TYPE(a,b,c,d)  (((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
-
-static chunk get_chunk_header(stbi *s)
-{
-   chunk c;
-   c.length = get32(s);
-   c.type   = get32(s);
-   return c;
-}
-
-static int check_png_header(stbi *s)
-{
-   static uint8 png_sig[8] = { 137,80,78,71,13,10,26,10 };
-   int i;
-   for (i=0; i < 8; ++i)
-      if (get8(s) != png_sig[i]) return e("bad png sig","Not a PNG");
-   return 1;
-}
-
-typedef struct
-{
-   stbi s;
-   uint8 *idata, *expanded, *out;
-} png;
-
-
-enum {
-   F_none=0, F_sub=1, F_up=2, F_avg=3, F_paeth=4,
-   F_avg_first, F_paeth_first,
-};
-
-static uint8 first_row_filter[5] =
-{
-   F_none, F_sub, F_none, F_avg_first, F_paeth_first
-};
-
-static int paeth(int a, int b, int c)
-{
-   int p = a + b - c;
-   int pa = abs(p-a);
-   int pb = abs(p-b);
-   int pc = abs(p-c);
-   if (pa <= pb && pa <= pc) return a;
-   if (pb <= pc) return b;
-   return c;
-}
-
-// create the png data from post-deflated data
-static int create_png_image_raw(png *a, uint8 *raw, uint32 raw_len, int out_n, uint32 x, uint32 y)
-{
-   stbi *s = &a->s;
-   uint32 i,j,stride = x*out_n;
-   int k;
-   int img_n = s->img_n; // copy it into a local for later
-   assert(out_n == s->img_n || out_n == s->img_n+1);
-   if (stbi_png_partial) y = 1;
-   a->out = (uint8 *) malloc(x * y * out_n);
-   if (!a->out) return e("outofmem", "Out of memory");
-   if (!stbi_png_partial) {
-      if (s->img_x == x && s->img_y == y)
-         if (raw_len != (img_n * x + 1) * y) return e("not enough pixels","Corrupt PNG");
-      else // interlaced:
-         if (raw_len < (img_n * x + 1) * y) return e("not enough pixels","Corrupt PNG");
-   }
-   for (j=0; j < y; ++j) {
-      uint8 *cur = a->out + stride*j;
-      uint8 *prior = cur - stride;
-      int filter = *raw++;
-      if (filter > 4) return e("invalid filter","Corrupt PNG");
-      // if first row, use special filter that doesn't sample previous row
-      if (j == 0) filter = first_row_filter[filter];
-      // handle first pixel explicitly
-      for (k=0; k < img_n; ++k) {
-         switch(filter) {
-            case F_none       : cur[k] = raw[k]; break;
-            case F_sub        : cur[k] = raw[k]; break;
-            case F_up         : cur[k] = raw[k] + prior[k]; break;
-            case F_avg        : cur[k] = raw[k] + (prior[k]>>1); break;
-            case F_paeth      : cur[k] = (uint8) (raw[k] + paeth(0,prior[k],0)); break;
-            case F_avg_first  : cur[k] = raw[k]; break;
-            case F_paeth_first: cur[k] = raw[k]; break;
-         }
-      }
-      if (img_n != out_n) cur[img_n] = 255;
-      raw += img_n;
-      cur += out_n;
-      prior += out_n;
-      // this is a little gross, so that we don't switch per-pixel or per-component
-      if (img_n == out_n) {
-         #define CASE(f) \
-             case f:     \
-                for (i=x-1; i >= 1; --i, raw+=img_n,cur+=img_n,prior+=img_n) \
-                   for (k=0; k < img_n; ++k)
-         switch(filter) {
-            CASE(F_none)  cur[k] = raw[k]; break;
-            CASE(F_sub)   cur[k] = raw[k] + cur[k-img_n]; break;
-            CASE(F_up)    cur[k] = raw[k] + prior[k]; break;
-            CASE(F_avg)   cur[k] = raw[k] + ((prior[k] + cur[k-img_n])>>1); break;
-            CASE(F_paeth)  cur[k] = (uint8) (raw[k] + paeth(cur[k-img_n],prior[k],prior[k-img_n])); break;
-            CASE(F_avg_first)    cur[k] = raw[k] + (cur[k-img_n] >> 1); break;
-            CASE(F_paeth_first)  cur[k] = (uint8) (raw[k] + paeth(cur[k-img_n],0,0)); break;
-         }
-         #undef CASE
-      } else {
-         assert(img_n+1 == out_n);
-         #define CASE(f) \
-             case f:     \
-                for (i=x-1; i >= 1; --i, cur[img_n]=255,raw+=img_n,cur+=out_n,prior+=out_n) \
-                   for (k=0; k < img_n; ++k)
-         switch(filter) {
-            CASE(F_none)  cur[k] = raw[k]; break;
-            CASE(F_sub)   cur[k] = raw[k] + cur[k-out_n]; break;
-            CASE(F_up)    cur[k] = raw[k] + prior[k]; break;
-            CASE(F_avg)   cur[k] = raw[k] + ((prior[k] + cur[k-out_n])>>1); break;
-            CASE(F_paeth)  cur[k] = (uint8) (raw[k] + paeth(cur[k-out_n],prior[k],prior[k-out_n])); break;
-            CASE(F_avg_first)    cur[k] = raw[k] + (cur[k-out_n] >> 1); break;
-            CASE(F_paeth_first)  cur[k] = (uint8) (raw[k] + paeth(cur[k-out_n],0,0)); break;
-         }
-         #undef CASE
-      }
-   }
-   return 1;
-}
-
-static int create_png_image(png *a, uint8 *raw, uint32 raw_len, int out_n, int interlaced)
-{
-   uint8 *final;
-   int p;
-   int save;
-   if (!interlaced)
-      return create_png_image_raw(a, raw, raw_len, out_n, a->s.img_x, a->s.img_y);
-   save = stbi_png_partial;
-   stbi_png_partial = 0;
-
-   // de-interlacing
-   final = (uint8 *) malloc(a->s.img_x * a->s.img_y * out_n);
-   for (p=0; p < 7; ++p) {
-      int xorig[] = { 0,4,0,2,0,1,0 };
-      int yorig[] = { 0,0,4,0,2,0,1 };
-      int xspc[]  = { 8,8,4,4,2,2,1 };
-      int yspc[]  = { 8,8,8,4,4,2,2 };
-      int i,j,x,y;
-      // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1
-      x = (a->s.img_x - xorig[p] + xspc[p]-1) / xspc[p];
-      y = (a->s.img_y - yorig[p] + yspc[p]-1) / yspc[p];
-      if (x && y) {
-         if (!create_png_image_raw(a, raw, raw_len, out_n, x, y)) {
-            free(final);
-            return 0;
-         }
-         for (j=0; j < y; ++j)
-            for (i=0; i < x; ++i)
-               memcpy(final + (j*yspc[p]+yorig[p])*a->s.img_x*out_n + (i*xspc[p]+xorig[p])*out_n,
-                      a->out + (j*x+i)*out_n, out_n);
-         free(a->out);
-         raw += (x*out_n+1)*y;
-         raw_len -= (x*out_n+1)*y;
-      }
-   }
-   a->out = final;
-
-   stbi_png_partial = save;
-   return 1;
-}
-
-static int compute_transparency(png *z, uint8 tc[3], int out_n)
-{
-   stbi *s = &z->s;
-   uint32 i, pixel_count = s->img_x * s->img_y;
-   uint8 *p = z->out;
-
-   // compute color-based transparency, assuming we've
-   // already got 255 as the alpha value in the output
-   assert(out_n == 2 || out_n == 4);
-
-   if (out_n == 2) {
-      for (i=0; i < pixel_count; ++i) {
-         p[1] = (p[0] == tc[0] ? 0 : 255);
-         p += 2;
-      }
-   } else {
-      for (i=0; i < pixel_count; ++i) {
-         if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2])
-            p[3] = 0;
-         p += 4;
-      }
-   }
-   return 1;
-}
-
-static int expand_palette(png *a, uint8 *palette, int /*len*/, int pal_img_n)
-{
-   uint32 i, pixel_count = a->s.img_x * a->s.img_y;
-   uint8 *p, *temp_out, *orig = a->out;
-
-   p = (uint8 *) malloc(pixel_count * pal_img_n);
-   if (p == NULL) return e("outofmem", "Out of memory");
-
-   // between here and free(out) below, exitting would leak
-   temp_out = p;
-
-   if (pal_img_n == 3) {
-      for (i=0; i < pixel_count; ++i) {
-         int n = orig[i]*4;
-         p[0] = palette[n  ];
-         p[1] = palette[n+1];
-         p[2] = palette[n+2];
-         p += 3;
-      }
-   } else {
-      for (i=0; i < pixel_count; ++i) {
-         int n = orig[i]*4;
-         p[0] = palette[n  ];
-         p[1] = palette[n+1];
-         p[2] = palette[n+2];
-         p[3] = palette[n+3];
-         p += 4;
-      }
-   }
-   free(a->out);
-   a->out = temp_out;
-   return 1;
-}
-
-static int parse_png_file(png *z, int scan, int req_comp)
-{
-   uint8 palette[1024], pal_img_n=0;
-   uint8 has_trans=0, tc[3];
-   uint32 ioff=0, idata_limit=0, i, pal_len=0;
-   int first=1,k,interlace=0;
-   stbi *s = &z->s;
-
-   if (!check_png_header(s)) return 0;
-
-   if (scan == SCAN_type) return 1;
-
-   for(;;first=0) {
-      chunk c = get_chunk_header(s);
-      if (first && c.type != PNG_TYPE('I','H','D','R'))
-         return e("first not IHDR","Corrupt PNG");
-      switch (c.type) {
-         case PNG_TYPE('I','H','D','R'): {
-            int depth,color,comp,filter;
-            if (!first) return e("multiple IHDR","Corrupt PNG");
-            if (c.length != 13) return e("bad IHDR len","Corrupt PNG");
-            s->img_x = get32(s); if (s->img_x > (1 << 24)) return e("too large","Very large image (corrupt?)");
-            s->img_y = get32(s); if (s->img_y > (1 << 24)) return e("too large","Very large image (corrupt?)");
-            depth = get8(s);  if (depth != 8)        return e("8bit only","PNG not supported: 8-bit only");
-            color = get8(s);  if (color > 6)         return e("bad ctype","Corrupt PNG");
-            if (color == 3) pal_img_n = 3; else if (color & 1) return e("bad ctype","Corrupt PNG");
-            comp  = get8(s);  if (comp) return e("bad comp method","Corrupt PNG");
-            filter= get8(s);  if (filter) return e("bad filter method","Corrupt PNG");
-            interlace = get8(s); if (interlace>1) return e("bad interlace method","Corrupt PNG");
-            if (!s->img_x || !s->img_y) return e("0-pixel image","Corrupt PNG");
-            if (!pal_img_n) {
-               s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0);
-               if ((1 << 30) / s->img_x / s->img_n < s->img_y) return e("too large", "Image too large to decode");
-               if (scan == SCAN_header) return 1;
-            } else {
-               // if paletted, then pal_n is our final components, and
-               // img_n is # components to decompress/filter.
-               s->img_n = 1;
-               if ((1 << 30) / s->img_x / 4 < s->img_y) return e("too large","Corrupt PNG");
-               // if SCAN_header, have to scan to see if we have a tRNS
-            }
-            break;
-         }
-
-         case PNG_TYPE('P','L','T','E'):  {
-            if (c.length > 256*3) return e("invalid PLTE","Corrupt PNG");
-            pal_len = c.length / 3;
-            if (pal_len * 3 != c.length) return e("invalid PLTE","Corrupt PNG");
-            for (i=0; i < pal_len; ++i) {
-               palette[i*4+0] = get8u(s);
-               palette[i*4+1] = get8u(s);
-               palette[i*4+2] = get8u(s);
-               palette[i*4+3] = 255;
-            }
-            break;
-         }
-
-         case PNG_TYPE('t','R','N','S'): {
-            if (z->idata) return e("tRNS after IDAT","Corrupt PNG");
-            if (pal_img_n) {
-               if (scan == SCAN_header) { s->img_n = 4; return 1; }
-               if (pal_len == 0) return e("tRNS before PLTE","Corrupt PNG");
-               if (c.length > pal_len) return e("bad tRNS len","Corrupt PNG");
-               pal_img_n = 4;
-               for (i=0; i < c.length; ++i)
-                  palette[i*4+3] = get8u(s);
-            } else {
-               if (!(s->img_n & 1)) return e("tRNS with alpha","Corrupt PNG");
-               if (c.length != (uint32) s->img_n*2) return e("bad tRNS len","Corrupt PNG");
-               has_trans = 1;
-               for (k=0; k < s->img_n; ++k)
-                  tc[k] = (uint8) get16(s); // non 8-bit images will be larger
-            }
-            break;
-         }
-
-         case PNG_TYPE('I','D','A','T'): {
-            if (pal_img_n && !pal_len) return e("no PLTE","Corrupt PNG");
-            if (scan == SCAN_header) { s->img_n = pal_img_n; return 1; }
-            if (ioff + c.length > idata_limit) {
-               uint8 *p;
-               if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096;
-               while (ioff + c.length > idata_limit)
-                  idata_limit *= 2;
-               p = (uint8 *) realloc(z->idata, idata_limit); if (p == NULL) return e("outofmem", "Out of memory");
-               z->idata = p;
-            }
-            #ifndef STBI_NO_STDIO
-            if (s->img_file)
-            {
-               if (fread(z->idata+ioff,1,c.length,s->img_file) != c.length) return e("outofdata","Corrupt PNG");
-            }
-            else
-            #endif
-            {
-               memcpy(z->idata+ioff, s->img_buffer, c.length);
-               s->img_buffer += c.length;
-            }
-            ioff += c.length;
-            break;
-         }
-
-         case PNG_TYPE('I','E','N','D'): {
-            uint32 raw_len;
-            if (scan != SCAN_load) return 1;
-            if (z->idata == NULL) return e("no IDAT","Corrupt PNG");
-            z->expanded = (uint8 *) stbi_zlib_decode_malloc((char *) z->idata, ioff, (int *) &raw_len);
-            if (z->expanded == NULL) return 0; // zlib should set error
-            free(z->idata); z->idata = NULL;
-            if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans)
-               s->img_out_n = s->img_n+1;
-            else
-               s->img_out_n = s->img_n;
-            if (!create_png_image(z, z->expanded, raw_len, s->img_out_n, interlace)) return 0;
-            if (has_trans)
-               if (!compute_transparency(z, tc, s->img_out_n)) return 0;
-            if (pal_img_n) {
-               // pal_img_n == 3 or 4
-               s->img_n = pal_img_n; // record the actual colors we had
-               s->img_out_n = pal_img_n;
-               if (req_comp >= 3) s->img_out_n = req_comp;
-               if (!expand_palette(z, palette, pal_len, s->img_out_n))
-                  return 0;
-            }
-            free(z->expanded); z->expanded = NULL;
-            return 1;
-         }
-
-         default:
-            // if critical, fail
-            if ((c.type & (1 << 29)) == 0) {
-               #ifndef STBI_NO_FAILURE_STRINGS
-               // not threadsafe
-               static char invalid_chunk[] = "XXXX chunk not known";
-               invalid_chunk[0] = (uint8) (c.type >> 24);
-               invalid_chunk[1] = (uint8) (c.type >> 16);
-               invalid_chunk[2] = (uint8) (c.type >>  8);
-               invalid_chunk[3] = (uint8) (c.type >>  0);
-               #endif
-               return e(invalid_chunk, "PNG not supported: unknown chunk type");
-            }
-            skip(s, c.length);
-            break;
-      }
-      // end of chunk, read and skip CRC
-      get32(s);
-   }
-}
-
-static unsigned char *do_png(png *p, int *x, int *y, int *n, int req_comp)
-{
-   unsigned char *result=NULL;
-   p->expanded = NULL;
-   p->idata = NULL;
-   p->out = NULL;
-   if (req_comp < 0 || req_comp > 4) return epuc("bad req_comp", "Internal error");
-   if (parse_png_file(p, SCAN_load, req_comp)) {
-      result = p->out;
-      p->out = NULL;
-      if (req_comp && req_comp != p->s.img_out_n) {
-         result = convert_format(result, p->s.img_out_n, req_comp, p->s.img_x, p->s.img_y);
-         p->s.img_out_n = req_comp;
-         if (result == NULL) return result;
-      }
-      *x = p->s.img_x;
-      *y = p->s.img_y;
-      if (n) *n = p->s.img_n;
-   }
-   free(p->out);      p->out      = NULL;
-   free(p->expanded); p->expanded = NULL;
-   free(p->idata);    p->idata    = NULL;
-
-   return result;
-}
-
-#ifndef STBI_NO_STDIO
-unsigned char *stbi_png_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   png p;
-   start_file(&p.s, f);
-   return do_png(&p, x,y,comp,req_comp);
-}
-
-unsigned char *stbi_png_load(char const *filename, int *x, int *y, int *comp, int req_comp)
-{
-   unsigned char *data;
-   FILE *f = fopen(filename, "rb");
-   if (!f) return NULL;
-   data = stbi_png_load_from_file(f,x,y,comp,req_comp);
-   fclose(f);
-   return data;
-}
-#endif
-
-unsigned char *stbi_png_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   png p;
-   start_mem(&p.s, buffer,len);
-   return do_png(&p, x,y,comp,req_comp);
-}
-
-#ifndef STBI_NO_STDIO
-int stbi_png_test_file(FILE *f)
-{
-   png p;
-   int n,r;
-   n = ftell(f);
-   start_file(&p.s, f);
-   r = parse_png_file(&p, SCAN_type,STBI_default);
-   fseek(f,n,SEEK_SET);
-   return r;
-}
-#endif
-
-int stbi_png_test_memory(stbi_uc const *buffer, int len)
-{
-   png p;
-   start_mem(&p.s, buffer, len);
-   return parse_png_file(&p, SCAN_type,STBI_default);
-}
-
-// TODO: load header from png
-#ifndef STBI_NO_STDIO
-int      stbi_png_info             (char const *filename,           int *x, int *y, int *comp)
-{
-   png p;
-   FILE *f = fopen(filename, "rb");
-   if (!f) return 0;
-   start_file(&p.s, f);
-   if (parse_png_file(&p, SCAN_header, 0)) {
-      if(x) *x = p.s.img_x;
-      if(y) *y = p.s.img_y;
-      if (comp) *comp = p.s.img_n;
-      fclose(f);
-      return 1;
-   }
-   fclose(f);
-   return 0;
-}
-
-extern int      stbi_png_info_from_file   (FILE *f,                  int *x, int *y, int *comp);
-#endif
-extern int      stbi_png_info_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp);
-
-// Microsoft/Windows BMP image
-
-static int bmp_test(stbi *s)
-{
-   int sz;
-   if (get8(s) != 'B') return 0;
-   if (get8(s) != 'M') return 0;
-   get32le(s); // discard filesize
-   get16le(s); // discard reserved
-   get16le(s); // discard reserved
-   get32le(s); // discard data offset
-   sz = get32le(s);
-   if (sz == 12 || sz == 40 || sz == 56 || sz == 108) return 1;
-   return 0;
-}
-
-#ifndef STBI_NO_STDIO
-int      stbi_bmp_test_file        (FILE *f)
-{
-   stbi s;
-   int r,n = ftell(f);
-   start_file(&s,f);
-   r = bmp_test(&s);
-   fseek(f,n,SEEK_SET);
-   return r;
-}
-#endif
-
-int      stbi_bmp_test_memory      (stbi_uc const *buffer, int len)
-{
-   stbi s;
-   start_mem(&s, buffer, len);
-   return bmp_test(&s);
-}
-
-// returns 0..31 for the highest set bit
-static int high_bit(unsigned int z)
-{
-   int n=0;
-   if (z == 0) return -1;
-   if (z >= 0x10000) n += 16, z >>= 16;
-   if (z >= 0x00100) n +=  8, z >>=  8;
-   if (z >= 0x00010) n +=  4, z >>=  4;
-   if (z >= 0x00004) n +=  2, z >>=  2;
-   if (z >= 0x00002) n +=  1, z >>=  1;
-   return n;
-}
-
-static int bitcount(unsigned int a)
-{
-   a = (a & 0x55555555) + ((a >>  1) & 0x55555555); // max 2
-   a = (a & 0x33333333) + ((a >>  2) & 0x33333333); // max 4
-   a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits
-   a = (a + (a >> 8)); // max 16 per 8 bits
-   a = (a + (a >> 16)); // max 32 per 8 bits
-   return a & 0xff;
-}
-
-static int shiftsigned(int v, int shift, int bits)
-{
-   int result;
-   int z=0;
-
-   if (shift < 0) v <<= -shift;
-   else v >>= shift;
-   result = v;
-
-   z = bits;
-   while (z < 8) {
-      result += v >> z;
-      z += bits;
-   }
-   return result;
-}
-
-static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp)
-{
-   uint8 *out;
-   unsigned int mr=0,mg=0,mb=0,ma=0, fake_a=0;
-   stbi_uc pal[256][4];
-   int psize=0,i,j,compress=0,width;
-   int bpp, flip_vertically, pad, target, offset, hsz;
-   if (get8(s) != 'B' || get8(s) != 'M') return epuc("not BMP", "Corrupt BMP");
-   get32le(s); // discard filesize
-   get16le(s); // discard reserved
-   get16le(s); // discard reserved
-   offset = get32le(s);
-   hsz = get32le(s);
-   if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108) return epuc("unknown BMP", "BMP type not supported: unknown");
-   failure_reason = "bad BMP";
-   if (hsz == 12) {
-      s->img_x = get16le(s);
-      s->img_y = get16le(s);
-   } else {
-      s->img_x = get32le(s);
-      s->img_y = get32le(s);
-   }
-   if (get16le(s) != 1) return 0;
-   bpp = get16le(s);
-   if (bpp == 1) return epuc("monochrome", "BMP type not supported: 1-bit");
-   flip_vertically = ((int) s->img_y) > 0;
-   s->img_y = abs((int) s->img_y);
-   if (hsz == 12) {
-      if (bpp < 24)
-         psize = (offset - 14 - 24) / 3;
-   } else {
-      compress = get32le(s);
-      if (compress == 1 || compress == 2) return epuc("BMP RLE", "BMP type not supported: RLE");
-      get32le(s); // discard sizeof
-      get32le(s); // discard hres
-      get32le(s); // discard vres
-      get32le(s); // discard colorsused
-      get32le(s); // discard max important
-      if (hsz == 40 || hsz == 56) {
-         if (hsz == 56) {
-            get32le(s);
-            get32le(s);
-            get32le(s);
-            get32le(s);
-         }
-         if (bpp == 16 || bpp == 32) {
-            mr = mg = mb = 0;
-            if (compress == 0) {
-               if (bpp == 32) {
-                  mr = 0xff << 16;
-                  mg = 0xff <<  8;
-                  mb = 0xff <<  0;
-                  ma = (unsigned int)(0xff << 24);
-                  fake_a = 1; // @TODO: check for cases like alpha value is all 0 and switch it to 255
-               } else {
-                  mr = 31 << 10;
-                  mg = 31 <<  5;
-                  mb = 31 <<  0;
-               }
-            } else if (compress == 3) {
-               mr = get32le(s);
-               mg = get32le(s);
-               mb = get32le(s);
-               // not documented, but generated by photoshop and handled by mspaint
-               if (mr == mg && mg == mb) {
-                  // ?!?!?
-                  return NULL;
-               }
-            } else
-               return NULL;
-         }
-      } else {
-         assert(hsz == 108);
-         mr = get32le(s);
-         mg = get32le(s);
-         mb = get32le(s);
-         ma = get32le(s);
-         get32le(s); // discard color space
-         for (i=0; i < 12; ++i)
-            get32le(s); // discard color space parameters
-      }
-      if (bpp < 16)
-         psize = (offset - 14 - hsz) >> 2;
-   }
-   s->img_n = ma ? 4 : 3;
-   if (req_comp && req_comp >= 3) // we can directly decode 3 or 4
-      target = req_comp;
-   else
-      target = s->img_n; // if they want monochrome, we'll post-convert
-   out = (stbi_uc *) malloc(target * s->img_x * s->img_y);
-   if (!out) return epuc("outofmem", "Out of memory");
-   if (bpp < 16) {
-      int z=0;
-      if (psize == 0 || psize > 256) { free(out); return epuc("invalid", "Corrupt BMP"); }
-      for (i=0; i < psize; ++i) {
-         pal[i][2] = (stbi_uc)get8(s);
-         pal[i][1] = (stbi_uc)get8(s);
-         pal[i][0] = (stbi_uc)get8(s);
-         if (hsz != 12) get8(s);
-         pal[i][3] = 255;
-      }
-      skip(s, offset - 14 - hsz - psize * (hsz == 12 ? 3 : 4));
-      if (bpp == 4) width = (s->img_x + 1) >> 1;
-      else if (bpp == 8) width = s->img_x;
-      else { free(out); return epuc("bad bpp", "Corrupt BMP"); }
-      pad = (-width)&3;
-      for (j=0; j < (int) s->img_y; ++j) {
-         for (i=0; i < (int) s->img_x; i += 2) {
-            int v=get8(s),v2=0;
-            if (bpp == 4) {
-               v2 = v & 15;
-               v >>= 4;
-            }
-            out[z++] = pal[v][0];
-            out[z++] = pal[v][1];
-            out[z++] = pal[v][2];
-            if (target == 4) out[z++] = 255;
-            if (i+1 == (int) s->img_x) break;
-            v = (bpp == 8) ? get8(s) : v2;
-            out[z++] = pal[v][0];
-            out[z++] = pal[v][1];
-            out[z++] = pal[v][2];
-            if (target == 4) out[z++] = 255;
-         }
-         skip(s, pad);
-      }
-   } else {
-      int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0;
-      int z = 0;
-      int easy=0;
-      skip(s, offset - 14 - hsz);
-      if (bpp == 24) width = 3 * s->img_x;
-      else if (bpp == 16) width = 2*s->img_x;
-      else /* bpp = 32 and pad = 0 */ width=0;
-      pad = (-width) & 3;
-      if (bpp == 24) {
-         easy = 1;
-      } else if (bpp == 32) {
-         if (mb == 0xff && mg == 0xff00 && mr == 0xff000000 && ma == 0xff000000)
-            easy = 2;
-      }
-      if (!easy) {
-         if (!mr || !mg || !mb) return epuc("bad masks", "Corrupt BMP");
-         // right shift amt to put high bit in position #7
-         rshift = high_bit(mr)-7; rcount = bitcount(mr);
-         gshift = high_bit(mg)-7; gcount = bitcount(mr);
-         bshift = high_bit(mb)-7; bcount = bitcount(mr);
-         ashift = high_bit(ma)-7; acount = bitcount(mr);
-      }
-      for (j=0; j < (int) s->img_y; ++j) {
-         if (easy) {
-            for (i=0; i < (int) s->img_x; ++i) {
-               int a;
-               out[z+2] = (uint8)get8(s);
-               out[z+1] = (uint8)get8(s);
-               out[z+0] = (uint8)get8(s);
-               z += 3;
-               a = (easy == 2 ? get8(s) : 255);
-               if (target == 4) out[z++] = (uint8)a;
-            }
-         } else {
-            for (i=0; i < (int) s->img_x; ++i) {
-               uint32 v = (bpp == 16 ? get16le(s) : get32le(s));
-               int a;
-               out[z++] = (uint8)shiftsigned(v & mr, rshift, rcount);
-               out[z++] = (uint8)shiftsigned(v & mg, gshift, gcount);
-               out[z++] = (uint8)shiftsigned(v & mb, bshift, bcount);
-               a = (ma ? shiftsigned(v & ma, ashift, acount) : 255);
-               if (target == 4) out[z++] = (uint8)a; 
-            }
-         }
-         skip(s, pad);
-      }
-   }
-   if (flip_vertically) {
-      stbi_uc t;
-      for (j=0; j < (int) s->img_y>>1; ++j) {
-         stbi_uc *p1 = out +      j     *s->img_x*target;
-         stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target;
-         for (i=0; i < (int) s->img_x*target; ++i) {
-            t = p1[i], p1[i] = p2[i], p2[i] = t;
-         }
-      }
-   }
-
-   if (req_comp && req_comp != target) {
-      out = convert_format(out, target, req_comp, s->img_x, s->img_y);
-      if (out == NULL) return out; // convert_format frees input on failure
-   }
-
-   *x = s->img_x;
-   *y = s->img_y;
-   if (comp) *comp = target;
-   return out;
-}
-
-#ifndef STBI_NO_STDIO
-stbi_uc *stbi_bmp_load             (char const *filename,           int *x, int *y, int *comp, int req_comp)
-{
-   stbi_uc *data;
-   FILE *f = fopen(filename, "rb");
-   if (!f) return NULL;
-   data = stbi_bmp_load_from_file(f, x,y,comp,req_comp);
-   fclose(f);
-   return data;
-}
-
-stbi_uc *stbi_bmp_load_from_file   (FILE *f,                  int *x, int *y, int *comp, int req_comp)
-{
-   stbi s;
-   start_file(&s, f);
-   return bmp_load(&s, x,y,comp,req_comp);
-}
-#endif
-
-stbi_uc *stbi_bmp_load_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   stbi s;
-   start_mem(&s, buffer, len);
-   return bmp_load(&s, x,y,comp,req_comp);
-}
-
-// Targa Truevision - TGA
-// by Jonathan Dummer
-
-static int tga_test(stbi *s)
-{
-	int sz;
-	get8u(s);		//	discard Offset
-	sz = get8u(s);	//	color type
-	if( sz > 1 ) return 0;	//	only RGB or indexed allowed
-	sz = get8u(s);	//	image type
-	if( (sz != 1) && (sz != 2) && (sz != 3) && (sz != 9) && (sz != 10) && (sz != 11) ) return 0;	//	only RGB or grey allowed, +/- RLE
-	get16(s);		//	discard palette start
-	get16(s);		//	discard palette length
-	get8(s);			//	discard bits per palette color entry
-	get16(s);		//	discard x origin
-	get16(s);		//	discard y origin
-	if( get16(s) < 1 ) return 0;		//	test width
-	if( get16(s) < 1 ) return 0;		//	test height
-	sz = get8(s);	//	bits per pixel
-	if( (sz != 8) && (sz != 16) && (sz != 24) && (sz != 32) ) return 0;	//	only RGB or RGBA or grey allowed
-	return 1;		//	seems to have passed everything
-}
-
-#ifndef STBI_NO_STDIO
-int      stbi_tga_test_file        (FILE *f)
-{
-   stbi s;
-   int r,n = ftell(f);
-   start_file(&s, f);
-   r = tga_test(&s);
-   fseek(f,n,SEEK_SET);
-   return r;
-}
-#endif
-
-int      stbi_tga_test_memory      (stbi_uc const *buffer, int len)
-{
-   stbi s;
-   start_mem(&s, buffer, len);
-   return tga_test(&s);
-}
-
-static stbi_uc *tga_load(stbi *s, int *x, int *y, int *comp, int req_comp)
-{
-	//	read in the TGA header stuff
-	int tga_offset = get8u(s);
-	int tga_indexed = get8u(s);
-	int tga_image_type = get8u(s);
-	int tga_is_RLE = 0;
-	int tga_palette_start = get16le(s);
-	int tga_palette_len = get16le(s);
-	int tga_palette_bits = get8u(s);
-	int tga_x_origin = get16le(s);
-	int tga_y_origin = get16le(s);
-	int tga_width = get16le(s);
-	int tga_height = get16le(s);
-	int tga_bits_per_pixel = get8u(s);
-	int tga_inverted = get8u(s);
-	//	image data
-	unsigned char *tga_data;
-	unsigned char *tga_palette = NULL;
-	int i, j;
-	unsigned char raw_data[4] = {0,0,0,0};
-	unsigned char trans_data[4] = {0,0,0,0};
-	int RLE_count = 0;
-	int RLE_repeating = 0;
-	int read_next_pixel = 1;
-	//	do a tiny bit of precessing
-	if( tga_image_type >= 8 )
-	{
-		tga_image_type -= 8;
-		tga_is_RLE = 1;
-	}
-	/* int tga_alpha_bits = tga_inverted & 15; */
-	tga_inverted = 1 - ((tga_inverted >> 5) & 1);
-
-	//	error check
-	if( //(tga_indexed) ||
-		(tga_width < 1) || (tga_height < 1) ||
-		(tga_image_type < 1) || (tga_image_type > 3) ||
-		((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16) &&
-		(tga_bits_per_pixel != 24) && (tga_bits_per_pixel != 32))
-		)
-	{
-		return NULL;
-	}
-
-	//	If I'm paletted, then I'll use the number of bits from the palette
-	if( tga_indexed )
-	{
-		tga_bits_per_pixel = tga_palette_bits;
-	}
-
-	//	tga info
-	*x = tga_width;
-	*y = tga_height;
-	if( (req_comp < 1) || (req_comp > 4) )
-	{
-		//	just use whatever the file was
-		req_comp = tga_bits_per_pixel / 8;
-		*comp = req_comp;
-	} else
-	{
-		//	force a new number of components
-		*comp = tga_bits_per_pixel/8;
-	}
-	tga_data = (unsigned char*)malloc( tga_width * tga_height * req_comp );
-
-	//	skip to the data's starting position (offset usually = 0)
-	skip(s, tga_offset );
-	//	do I need to load a palette?
-	if( tga_indexed )
-	{
-		//	any data to skip? (offset usually = 0)
-		skip(s, tga_palette_start );
-		//	load the palette
-		tga_palette = (unsigned char*)malloc( tga_palette_len * tga_palette_bits / 8 );
-		getn(s, tga_palette, tga_palette_len * tga_palette_bits / 8 );
-	}
-	//	load the data
-	for( i = 0; i < tga_width * tga_height; ++i )
-	{
-		//	if I'm in RLE mode, do I need to get a RLE chunk?
-		if( tga_is_RLE )
-		{
-			if( RLE_count == 0 )
-			{
-				//	yep, get the next byte as a RLE command
-				int RLE_cmd = get8u(s);
-				RLE_count = 1 + (RLE_cmd & 127);
-				RLE_repeating = RLE_cmd >> 7;
-				read_next_pixel = 1;
-			} else if( !RLE_repeating )
-			{
-				read_next_pixel = 1;
-			}
-		} else
-		{
-			read_next_pixel = 1;
-		}
-		//	OK, if I need to read a pixel, do it now
-		if( read_next_pixel )
-		{
-			//	load however much data we did have
-			if( tga_indexed )
-			{
-				//	read in 1 byte, then perform the lookup
-				int pal_idx = get8u(s);
-				if( pal_idx >= tga_palette_len )
-				{
-					//	invalid index
-					pal_idx = 0;
-				}
-				pal_idx *= tga_bits_per_pixel / 8;
-				for( j = 0; j*8 < tga_bits_per_pixel; ++j )
-				{
-					raw_data[j] = tga_palette[pal_idx+j];
-				}
-			} else
-			{
-				//	read in the data raw
-				for( j = 0; j*8 < tga_bits_per_pixel; ++j )
-				{
-					raw_data[j] = get8u(s);
-				}
-			}
-			//	convert raw to the intermediate format
-			switch( tga_bits_per_pixel )
-			{
-			case 8:
-				//	Luminous => RGBA
-				trans_data[0] = raw_data[0];
-				trans_data[1] = raw_data[0];
-				trans_data[2] = raw_data[0];
-				trans_data[3] = 255;
-				break;
-			case 16:
-				//	Luminous,Alpha => RGBA
-				trans_data[0] = raw_data[0];
-				trans_data[1] = raw_data[0];
-				trans_data[2] = raw_data[0];
-				trans_data[3] = raw_data[1];
-				break;
-			case 24:
-				//	BGR => RGBA
-				trans_data[0] = raw_data[2];
-				trans_data[1] = raw_data[1];
-				trans_data[2] = raw_data[0];
-				trans_data[3] = 255;
-				break;
-			case 32:
-				//	BGRA => RGBA
-				trans_data[0] = raw_data[2];
-				trans_data[1] = raw_data[1];
-				trans_data[2] = raw_data[0];
-				trans_data[3] = raw_data[3];
-				break;
-			}
-			//	clear the reading flag for the next pixel
-			read_next_pixel = 0;
-		} // end of reading a pixel
-		//	convert to final format
-		switch( req_comp )
-		{
-		case 1:
-			//	RGBA => Luminance
-			tga_data[i*req_comp+0] = compute_y(trans_data[0],trans_data[1],trans_data[2]);
-			break;
-		case 2:
-			//	RGBA => Luminance,Alpha
-			tga_data[i*req_comp+0] = compute_y(trans_data[0],trans_data[1],trans_data[2]);
-			tga_data[i*req_comp+1] = trans_data[3];
-			break;
-		case 3:
-			//	RGBA => RGB
-			tga_data[i*req_comp+0] = trans_data[0];
-			tga_data[i*req_comp+1] = trans_data[1];
-			tga_data[i*req_comp+2] = trans_data[2];
-			break;
-		case 4:
-			//	RGBA => RGBA
-			tga_data[i*req_comp+0] = trans_data[0];
-			tga_data[i*req_comp+1] = trans_data[1];
-			tga_data[i*req_comp+2] = trans_data[2];
-			tga_data[i*req_comp+3] = trans_data[3];
-			break;
-		}
-		//	in case we're in RLE mode, keep counting down
-		--RLE_count;
-	}
-	//	do I need to invert the image?
-	if( tga_inverted )
-	{
-		for( j = 0; j*2 < tga_height; ++j )
-		{
-			int index1 = j * tga_width * req_comp;
-			int index2 = (tga_height - 1 - j) * tga_width * req_comp;
-			for( i = tga_width * req_comp; i > 0; --i )
-			{
-				unsigned char temp = tga_data[index1];
-				tga_data[index1] = tga_data[index2];
-				tga_data[index2] = temp;
-				++index1;
-				++index2;
-			}
-		}
-	}
-	//	clear my palette, if I had one
-	if( tga_palette != NULL )
-	{
-		free( tga_palette );
-	}
-	//	the things I do to get rid of an error message, and yet keep
-	//	Microsoft's C compilers happy... [8^(
-	tga_palette_start = tga_palette_len = tga_palette_bits =
-			tga_x_origin = tga_y_origin = 0;
-	//	OK, done
-	return tga_data;
-}
-
-#ifndef STBI_NO_STDIO
-stbi_uc *stbi_tga_load             (char const *filename,           int *x, int *y, int *comp, int req_comp)
-{
-   stbi_uc *data;
-   FILE *f = fopen(filename, "rb");
-   if (!f) return NULL;
-   data = stbi_tga_load_from_file(f, x,y,comp,req_comp);
-   fclose(f);
-   return data;
-}
-
-stbi_uc *stbi_tga_load_from_file   (FILE *f,                  int *x, int *y, int *comp, int req_comp)
-{
-   stbi s;
-   start_file(&s, f);
-   return tga_load(&s, x,y,comp,req_comp);
-}
-#endif
-
-stbi_uc *stbi_tga_load_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   stbi s;
-   start_mem(&s, buffer, len);
-   return tga_load(&s, x,y,comp,req_comp);
-}
-
-
-// *************************************************************************************************
-// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicholas Schulz, tweaked by STB
-
-static int psd_test(stbi *s)
-{
-	if (get32(s) != 0x38425053) return 0;	// "8BPS"
-	else return 1;
-}
-
-#ifndef STBI_NO_STDIO
-int stbi_psd_test_file(FILE *f)
-{
-   stbi s;
-   int r,n = ftell(f);
-   start_file(&s, f);
-   r = psd_test(&s);
-   fseek(f,n,SEEK_SET);
-   return r;
-}
-#endif
-
-int stbi_psd_test_memory(stbi_uc const *buffer, int len)
-{
-   stbi s;
-   start_mem(&s, buffer, len);
-   return psd_test(&s);
-}
-
-static stbi_uc *psd_load(stbi *s, int *x, int *y, int *comp, int req_comp)
-{
-	int	pixelCount;
-	int channelCount, compression;
-	int channel, i, count, len;
-   int w,h;
-   uint8 *out;
-
-	// Check identifier
-	if (get32(s) != 0x38425053)	// "8BPS"
-		return epuc("not PSD", "Corrupt PSD image");
-
-	// Check file type version.
-	if (get16(s) != 1)
-		return epuc("wrong version", "Unsupported version of PSD image");
-
-	// Skip 6 reserved bytes.
-	skip(s, 6 );
-
-	// Read the number of channels (R, G, B, A, etc).
-	channelCount = get16(s);
-	if (channelCount < 0 || channelCount > 16)
-		return epuc("wrong channel count", "Unsupported number of channels in PSD image");
-
-	// Read the rows and columns of the image.
-   h = get32(s);
-   w = get32(s);
-	
-	// Make sure the depth is 8 bits.
-	if (get16(s) != 8)
-		return epuc("unsupported bit depth", "PSD bit depth is not 8 bit");
-
-	// Make sure the color mode is RGB.
-	// Valid options are:
-	//   0: Bitmap
-	//   1: Grayscale
-	//   2: Indexed color
-	//   3: RGB color
-	//   4: CMYK color
-	//   7: Multichannel
-	//   8: Duotone
-	//   9: Lab color
-	if (get16(s) != 3)
-		return epuc("wrong color format", "PSD is not in RGB color format");
-
-	// Skip the Mode Data.  (It's the palette for indexed color; other info for other modes.)
-	skip(s,get32(s) );
-
-	// Skip the image resources.  (resolution, pen tool paths, etc)
-	skip(s, get32(s) );
-
-	// Skip the reserved data.
-	skip(s, get32(s) );
-
-	// Find out if the data is compressed.
-	// Known values:
-	//   0: no compression
-	//   1: RLE compressed
-	compression = get16(s);
-	if (compression > 1)
-		return epuc("bad compression", "PSD has an unknown compression format");
-
-	// Create the destination image.
-	out = (stbi_uc *) malloc(4 * w*h);
-	if (!out) return epuc("outofmem", "Out of memory");
-   pixelCount = w*h;
-
-	// Initialize the data to zero.
-	//memset( out, 0, pixelCount * 4 );
-	
-	// Finally, the image data.
-	if (compression) {
-		// RLE as used by .PSD and .TIFF
-		// Loop until you get the number of unpacked bytes you are expecting:
-		//     Read the next source byte into n.
-		//     If n is between 0 and 127 inclusive, copy the next n+1 bytes literally.
-		//     Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times.
-		//     Else if n is 128, noop.
-		// Endloop
-
-		// The RLE-compressed data is preceeded by a 2-byte data count for each row in the data,
-		// which we're going to just skip.
-		skip(s, h * channelCount * 2 );
-
-		// Read the RLE data by channel.
-		for (channel = 0; channel < 4; channel++) {
-			uint8 *p;
-			
-         p = out+channel;
-			if (channel >= channelCount) {
-				// Fill this channel with default data.
-				for (i = 0; i < pixelCount; i++) *p = (channel == 3 ? 255 : 0), p += 4;
-			} else {
-				// Read the RLE data.
-				count = 0;
-				while (count < pixelCount) {
-					len = get8(s);
-					if (len == 128) {
-						// No-op.
-					} else if (len < 128) {
-						// Copy next len+1 bytes literally.
-						len++;
-						count += len;
-						while (len) {
-							*p = (uint8)get8(s);
-                     p += 4;
-							len--;
-						}
-					} else if (len > 128) {
-						uint32	val;
-						// Next -len+1 bytes in the dest are replicated from next source byte.
-						// (Interpret len as a negative 8-bit int.)
-						len ^= 0x0FF;
-						len += 2;
-                  val = get8(s);
-						count += len;
-						while (len) {
-							*p = (uint8)val;
-                     p += 4;
-							len--;
-						}
-					}
-				}
-			}
-		}
-		
-	} else {
-		// We're at the raw image data.  It's each channel in order (Red, Green, Blue, Alpha, ...)
-		// where each channel consists of an 8-bit value for each pixel in the image.
-		
-		// Read the data by channel.
-		for (channel = 0; channel < 4; channel++) {
-			uint8 *p;
-			
-         p = out + channel;
-			if (channel > channelCount) {
-				// Fill this channel with default data.
-				for (i = 0; i < pixelCount; i++) *p = channel == 3 ? 255 : 0, p += 4;
-			} else {
-				// Read the data.
-				count = 0;
-				for (i = 0; i < pixelCount; i++)
-					*p = (uint8)get8(s), p += 4;
-			}
-		}
-	}
-
-	if (req_comp && req_comp != 4) {
-		out = convert_format(out, 4, req_comp, w, h);
-		if (out == NULL) return out; // convert_format frees input on failure
-	}
-
-	if (comp) *comp = channelCount;
-	*y = h;
-	*x = w;
-	
-	return out;
-}
-
-#ifndef STBI_NO_STDIO
-stbi_uc *stbi_psd_load(char const *filename, int *x, int *y, int *comp, int req_comp)
-{
-   stbi_uc *data;
-   FILE *f = fopen(filename, "rb");
-   if (!f) return NULL;
-   data = stbi_psd_load_from_file(f, x,y,comp,req_comp);
-   fclose(f);
-   return data;
-}
-
-stbi_uc *stbi_psd_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   stbi s;
-   start_file(&s, f);
-   return psd_load(&s, x,y,comp,req_comp);
-}
-#endif
-
-stbi_uc *stbi_psd_load_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   stbi s;
-   start_mem(&s, buffer, len);
-   return psd_load(&s, x,y,comp,req_comp);
-}
-
-
-// *************************************************************************************************
-// Radiance RGBE HDR loader
-// originally by Nicolas Schulz
-#ifndef STBI_NO_HDR
-static int hdr_test(stbi *s)
-{
-   const char *signature = "#?RADIANCE\n";
-   int i;
-   for (i=0; signature[i]; ++i)
-      if (get8(s) != signature[i])
-         return 0;
-	return 1;
-}
-
-int stbi_hdr_test_memory(stbi_uc const *buffer, int len)
-{
-   stbi s;
-	start_mem(&s, buffer, len);
-	return hdr_test(&s);
-}
-
-#ifndef STBI_NO_STDIO
-int stbi_hdr_test_file(FILE *f)
-{
-   stbi s;
-   int r,n = ftell(f);
-   start_file(&s, f);
-   r = hdr_test(&s);
-   fseek(f,n,SEEK_SET);
-   return r;
-}
-#endif
-
-#define HDR_BUFLEN  1024
-static char *hdr_gettoken(stbi *z, char *buffer)
-{
-   int len=0;
-   char c = '\0';
-
-   c = (char)get8(z);
-
-	while (!at_eof(z) && c != '\n') {
-		buffer[len++] = c;
-      if (len == HDR_BUFLEN-1) {
-         // flush to end of line
-         while (!at_eof(z) && get8(z) != '\n')
-            ;
-         break;
-      }
-      c = (char)get8(z);
-	}
-
-   buffer[len] = 0;
-	return buffer;
-}
-
-static void hdr_convert(float *output, stbi_uc *input, int req_comp)
-{
-	if( input[3] != 0 ) {
-      float f1;
-		// Exponent
-		f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8));
-      if (req_comp <= 2)
-         output[0] = (input[0] + input[1] + input[2]) * f1 / 3;
-      else {
-         output[0] = input[0] * f1;
-         output[1] = input[1] * f1;
-         output[2] = input[2] * f1;
-      }
-      if (req_comp == 2) output[1] = 1;
-      if (req_comp == 4) output[3] = 1;
-	} else {
-      switch (req_comp) {
-         case 4: output[3] = 1; /* fallthrough */
-         case 3: output[0] = output[1] = output[2] = 0;
-                 break;
-         case 2: output[1] = 1; /* fallthrough */
-         case 1: output[0] = 0;
-                 break;
-      }
-	}
-}
-
-
-static float *hdr_load(stbi *s, int *x, int *y, int *comp, int req_comp)
-{
-   char buffer[HDR_BUFLEN];
-	char *token;
-	int valid = 0;
-	int width, height;
-   stbi_uc *scanline;
-	float *hdr_data;
-	int len;
-	unsigned char count, value;
-	int i, j, k, c1,c2, z;
-
-
-	// Check identifier
-	if (strcmp(hdr_gettoken(s,buffer), "#?RADIANCE") != 0)
-		return epf("not HDR", "Corrupt HDR image");
-	
-	// Parse header
-	for(;;) {
-		token = hdr_gettoken(s,buffer);
-      if (token[0] == 0) break;
-		if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
-   }
-
-	if (!valid)    return epf("unsupported format", "Unsupported HDR format");
-
-   // Parse width and height
-   // can't use sscanf() if we're not using stdio!
-   token = hdr_gettoken(s,buffer);
-   if (strncmp(token, "-Y ", 3))  return epf("unsupported data layout", "Unsupported HDR format");
-   token += 3;
-   height = strtol(token, &token, 10);
-   while (*token == ' ') ++token;
-   if (strncmp(token, "+X ", 3))  return epf("unsupported data layout", "Unsupported HDR format");
-   token += 3;
-   width = strtol(token, NULL, 10);
-
-	*x = width;
-	*y = height;
-
-   *comp = 3;
-	if (req_comp == 0) req_comp = 3;
-
-	// Read data
-	hdr_data = (float *) malloc(height * width * req_comp * sizeof(float));
-
-	// Load image data
-   // image data is stored as some number of sca
-	if( width < 8 || width >= 32768) {
-		// Read flat data
-      for (j=0; j < height; ++j) {
-         for (i=0; i < width; ++i) {
-            stbi_uc rgbe[4];
-           main_decode_loop:
-            getn(s, rgbe, 4);
-            hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp);
-         }
-      }
-	} else {
-		// Read RLE-encoded data
-		scanline = NULL;
-
-		for (j = 0; j < height; ++j) {
-         c1 = get8(s);
-         c2 = get8(s);
-         len = get8(s);
-         if (c1 != 2 || c2 != 2 || (len & 0x80)) {
-            // not run-length encoded, so we have to actually use THIS data as a decoded
-            // pixel (note this can't be a valid pixel--one of RGB must be >= 128)
-            stbi_uc rgbe[4] = { (stbi_uc)c1,(stbi_uc)c2,(stbi_uc)len, (stbi_uc)get8(s) };
-            hdr_convert(hdr_data, rgbe, req_comp);
-            i = 1;
-            j = 0;
-            free(scanline);
-            goto main_decode_loop; // yes, this is fucking insane; blame the fucking insane format
-         }
-         len <<= 8;
-         len |= get8(s);
-         if (len != width) { free(hdr_data); free(scanline); return epf("invalid decoded scanline length", "corrupt HDR"); }
-         if (scanline == NULL) scanline = (stbi_uc *) malloc(width * 4);
-				
-			for (k = 0; k < 4; ++k) {
-				i = 0;
-				while (i < width) {
-					count = (unsigned char)get8(s);
-					if (count > 128) {
-						// Run
-						value = (unsigned char)get8(s);
-                  count -= 128;
-						for (z = 0; z < count; ++z)
-							scanline[i++ * 4 + k] = value;
-					} else {
-						// Dump
-						for (z = 0; z < count; ++z)
-							scanline[i++ * 4 + k] = (stbi_uc)get8(s);
-					}
-				}
-			}
-         for (i=0; i < width; ++i)
-            hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp);
-		}
-      free(scanline);
-	}
-
-   return hdr_data;
-}
-
-#ifndef STBI_NO_STDIO
-float *stbi_hdr_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   stbi s;
-   start_file(&s,f);
-   return hdr_load(&s,x,y,comp,req_comp);
-}
-#endif
-
-float *stbi_hdr_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   stbi s;
-   start_mem(&s,buffer, len);
-   return hdr_load(&s,x,y,comp,req_comp);
-}
-
-#endif // STBI_NO_HDR
-
-/////////////////////// write image ///////////////////////
-
-#ifndef STBI_NO_WRITE
-
-static void write8(FILE *f, int x) { uint8 z = (uint8) x; fwrite(&z,1,1,f); }
-
-static void writefv(FILE *f, const char *fmt, va_list v)
-{
-   while (*fmt) {
-      switch (*fmt++) {
-         case ' ': break;
-         case '1': { uint8 x = (uint8)va_arg(v, int); write8(f,x); break; }
-         case '2': { int16 x = (int16)va_arg(v, int); write8(f,x); write8(f,x>>8); break; }
-         case '4': { int32 x = va_arg(v, int); write8(f,x); write8(f,x>>8); write8(f,x>>16); write8(f,x>>24); break; }
-         default:
-            assert(0);
-            va_end(v);
-            return;
-      }
-   }
-}
-
-static void writef(FILE *f, const char *fmt, ...)
-{
-   va_list v;
-   va_start(v, fmt);
-   writefv(f,fmt,v);
-   va_end(v);
-}
-
-static void write_pixels(FILE *f, int rgb_dir, int vdir, int x, int y, int comp, void *data, int write_alpha, int scanline_pad)
-{
-   uint8 bg[3] = { 255, 0, 255}, px[3];
-   uint32 zero = 0;
-   int i,j,k, j_end;
-
-   if (vdir < 0) 
-      j_end = -1, j = y-1;
-   else
-      j_end =  y, j = 0;
-
-   for (; j != j_end; j += vdir) {
-      for (i=0; i < x; ++i) {
-         uint8 *d = (uint8 *) data + (j*x+i)*comp;
-         if (write_alpha < 0)
-            fwrite(&d[comp-1], 1, 1, f);
-         switch (comp) {
-            case 1:
-            case 2: writef(f, "111", d[0],d[0],d[0]);
-                    break;
-            case 4:
-               if (!write_alpha) {
-                  for (k=0; k < 3; ++k)
-                     px[k] = bg[k] + ((d[k] - bg[k]) * d[3])/255;
-                  writef(f, "111", px[1-rgb_dir],px[1],px[1+rgb_dir]);
-                  break;
-               }
-               /* FALLTHROUGH */
-            case 3:
-               writef(f, "111", d[1-rgb_dir],d[1],d[1+rgb_dir]);
-               break;
-         }
-         if (write_alpha > 0)
-            fwrite(&d[comp-1], 1, 1, f);
-      }
-      fwrite(&zero,scanline_pad,1,f);
-   }
-}
-
-static int outfile(char const *filename, int rgb_dir, int vdir, int x, int y, int comp, void *data, int alpha, int pad, const char *fmt, ...)
-{
-   FILE *f = fopen(filename, "wb");
-   if (f) {
-      va_list v;
-      va_start(v, fmt);
-      writefv(f, fmt, v);
-      va_end(v);
-      write_pixels(f,rgb_dir,vdir,x,y,comp,data,alpha,pad);
-      fclose(f);
-   }
-   return f != NULL;
-}
-
-int stbi_write_bmp(char const *filename, int x, int y, int comp, void *data)
-{
-   int pad = (-x*3) & 3;
-   return outfile(filename,-1,-1,x,y,comp,data,0,pad,
-           "11 4 22 4" "4 44 22 444444",
-           'B', 'M', 14+40+(x*3+pad)*y, 0,0, 14+40,  // file header
-            40, x,y, 1,24, 0,0,0,0,0,0);             // bitmap header
-}
-
-int stbi_write_tga(char const *filename, int x, int y, int comp, void *data)
-{
-   int has_alpha = !(comp & 1);
-   return outfile(filename, -1,-1, x, y, comp, data, has_alpha, 0,
-                  "111 221 2222 11", 0,0,2, 0,0,0, 0,0,x,y, 24+8*has_alpha, 8*has_alpha);
-}
-
-// any other image formats that do interleaved rgb data?
-//    PNG: requires adler32,crc32 -- significant amount of code
-//    PSD: no, channels output separately
-//    TIFF: no, stripwise-interleaved... i think
-
-#endif // STBI_NO_WRITE
-
-#endif // STBI_HEADER_FILE_ONLY
-
diff --git a/dep/recastnavigation/RecastDemo/Contrib/stb_truetype.h b/dep/recastnavigation/RecastDemo/Contrib/stb_truetype.h
deleted file mode 100644
index 92dc8c2445c..00000000000
--- a/dep/recastnavigation/RecastDemo/Contrib/stb_truetype.h
+++ /dev/null
@@ -1,1806 +0,0 @@
-// stb_truetype.h - v0.3 - public domain - 2009 Sean Barrett / RAD Game Tools
-//
-//   This library processes TrueType files:
-//        parse files
-//        extract glyph metrics
-//        extract glyph shapes
-//        render glyphs to one-channel bitmaps with antialiasing (box filter)
-//
-//   Todo:
-//        non-MS cmaps
-//        crashproof on bad data
-//        hinting
-//        subpixel positioning when rendering bitmap
-//        cleartype-style AA
-//
-// ADDITIONAL CONTRIBUTORS
-//
-//   Mikko Mononen: compound shape support, more cmap formats
-//
-// VERSIONS
-//
-//   0.3 (2009-06-24) cmap fmt=12, compound shapes (MM)
-//                    userdata, malloc-from-userdata, non-zero fill (STB)
-//   0.2 (2009-03-11) Fix unsigned/signed char warnings
-//   0.1 (2009-03-09) First public release
-//
-// USAGE
-//
-//   Include this file in whatever places neeed to refer to it. In ONE C/C++
-//   file, write:
-//      #define STB_TRUETYPE_IMPLEMENTATION
-//   before the #include of this file. This expands out the actual
-//   implementation into that C/C++ file.
-//
-//   Look at the header-file sections below for the API, but here's a quick skim:
-//
-//   Simple 3D API (don't ship this, but it's fine for tools and quick start,
-//                  and you can cut and paste from it to move to more advanced)
-//           stbtt_BakeFontBitmap()               -- bake a font to a bitmap for use as texture
-//           stbtt_GetBakedQuad()                 -- compute quad to draw for a given char
-//
-//   "Load" a font file from a memory buffer (you have to keep the buffer loaded)
-//           stbtt_InitFont()
-//           stbtt_GetFontOffsetForIndex()        -- use for TTC font collections
-//
-//   Render a unicode codepoint to a bitmap
-//           stbtt_GetCodepointBitmap()           -- allocates and returns a bitmap
-//           stbtt_MakeCodepointBitmap()          -- renders into bitmap you provide
-//           stbtt_GetCodepointBitmapBox()        -- how big the bitmap must be
-//
-//   Character advance/positioning
-//           stbtt_GetCodepointHMetrics()
-//           stbtt_GetFontVMetrics()
-//
-// NOTES
-//
-//   The system uses the raw data found in the .ttf file without changing it
-//   and without building auxiliary data structures. This is a bit inefficient
-//   on little-endian systems (the data is big-endian), but assuming you're
-//   caching the bitmaps or glyph shapes this shouldn't be a big deal.
-//
-//   It appears to be very hard to programmatically determine what font a
-//   given file is in a general way. I provide an API for this, but I don't
-//   recommend it.
-//
-//
-// SOURCE STATISTICS (based on v0.3, 1800 LOC)
-//
-//   Documentation & header file        350 LOC  \___ 500 LOC documentation
-//   Sample code                        140 LOC  /
-//   Truetype parsing                   580 LOC  ---- 600 LOC TrueType
-//   Software rasterization             240 LOC  \                           .
-//   Curve tesselation                  120 LOC   \__ 500 LOC Bitmap creation
-//   Bitmap management                   70 LOC   /
-//   Baked bitmap interface              70 LOC  /
-//   Font name matching & access        150 LOC  ---- 150 
-//   C runtime library abstraction       60 LOC  ----  60
-
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-////
-////  SAMPLE PROGRAMS
-////
-//
-//  Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless
-//
-#if 0
-#define STB_TRUETYPE_IMPLEMENTATION  // force following include to generate implementation
-#include "stb_truetype.h"
-
-char ttf_buffer[1<<20];
-unsigned char temp_bitmap[512*512];
-
-stbtt_chardata cdata[96]; // ASCII 32..126 is 95 glyphs
-GLstbtt_uint ftex;
-
-void my_stbtt_initfont(void)
-{
-   fread(ttf_buffer, 1, 1<<20, fopen("c:/windows/fonts/times.ttf", "rb"));
-   stbtt_BakeFontBitmap(data,0, 32.0, temp_bitmap,512,512, 32,96, cdata); // no guarantee this fits!
-   // can free ttf_buffer at this point
-   glGenTextures(1, &ftex);
-   glBindTexture(GL_TEXTURE_2D, ftex);
-   glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 512,512, 0, GL_ALPHA, GL_UNSIGNED_BYTE, temp_bitmap);
-   // can free temp_bitmap at this point
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-}
-
-void my_stbtt_print(float x, float y, char *text)
-{
-   // assume orthographic projection with units = screen pixels, origin at top left
-   glBindTexture(GL_TEXTURE_2D, ftex);
-   glBegin(GL_QUADS);
-   while (*text) {
-      if (*text >= 32 && *text < 128) {
-         stbtt_aligned_quad q;
-         stbtt_GetBakedQuad(cdata, 512,512, *text-32, &x,&y,&q,1);//1=opengl,0=old d3d
-         glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y0);
-         glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y0);
-         glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y1);
-         glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y1);
-      }
-      ++text;
-   }
-   glEnd();
-}
-#endif
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-// Complete program (this compiles): get a single bitmap, print as ASCII art
-//
-#if 0
-#include <stdio.h>
-#define STB_TRUETYPE_IMPLEMENTATION  // force following include to generate implementation
-#include "stb_truetype.h"
-
-char ttf_buffer[1<<25];
-
-int main(int argc, char **argv)
-{
-   stbtt_fontinfo font;
-   unsigned char *bitmap;
-   int w,h,i,j,c = (argc > 1 ? atoi(argv[1]) : 'a'), s = (argc > 2 ? atoi(argv[2]) : 20);
-
-   fread(ttf_buffer, 1, 1<<25, fopen(argc > 3 ? argv[3] : "c:/windows/fonts/arialbd.ttf", "rb"));
-
-   stbtt_InitFont(&font, ttf_buffer, stbtt_GetFontOffsetForIndex(ttf_buffer,0));
-   bitmap = stbtt_GetCodepointBitmap(&font, 0,stbtt_ScaleForPixelHeight(&font, s), c, &w, &h, 0,0);
-
-   for (j=0; j < h; ++j) {
-      for (i=0; i < w; ++i)
-         putchar(" .:ioVM@"[bitmap[j*w+i]>>5]);
-      putchar('\n');
-   }
-   return 0;
-}
-#endif 
-//
-// Output:
-//
-//     .ii.
-//    @@@@@@.
-//   V@Mio@@o
-//   :i.  V@V
-//     :oM@@M
-//   :@@@MM@M
-//   @@o  o@M
-//  :@@.  M@M
-//   @@@o@@@@
-//   :M@@V:@@.
-//  
-//////////////////////////////////////////////////////////////////////////////
-// 
-// Complete program: print "Hello World!" banner, with bugs
-//
-#if 0
-int main(int arg, char **argv)
-{
-   unsigned char screen[20][79];
-   int i,j, pos=0;
-   float scale;
-   char *text = "Heljo World!";
-
-   fread(buffer, 1, 1000000, fopen("c:/windows/fonts/arialbd.ttf", "rb"));
-   stbtt_InitFont(&font, buffer, 0);
-
-   scale = stbtt_ScaleForPixelHeight(&font, 16);
-   memset(screen, 0, sizeof(screen));
-
-   while (*text) {
-      int advance,lsb,x0,y0,x1,y1, newpos, baseline=13;
-      stbtt_GetCodepointHMetrics(&font, *text, &advance, &lsb);
-      stbtt_GetCodepointBitmapBox(&font, *text, scale,scale, &x0,&y0,&x1,&y1);
-      newpos = pos + (int) (lsb * scale) + x0;
-      stbtt_MakeCodepointBitmap(&font, &screen[baseline + y0][newpos], x1-x0,y1-y0, 79, scale,scale, *text);
-      // note that this stomps the old data, so where character boxes overlap (e.g. 'lj') it's wrong
-      // because this API is really for baking character bitmaps into textures
-      pos += (int) (advance * scale);
-      ++text;
-   }
-
-   for (j=0; j < 20; ++j) {
-      for (i=0; i < 79; ++i)
-         putchar(" .:ioVM@"[screen[j][i]>>5]);
-      putchar('\n');
-   }
-
-   return 0;
-}
-#endif
-
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-////
-////   INTEGRATION WITH RUNTIME LIBRARIES
-////
-
-#ifdef STB_TRUETYPE_IMPLEMENTATION
-   // #define your own (u)stbtt_int8/16/32 before including to override this
-   #ifndef stbtt_uint8
-   typedef unsigned char   stbtt_uint8;
-   typedef signed   char   stbtt_int8;
-   typedef unsigned short  stbtt_uint16;
-   typedef signed   short  stbtt_int16;
-   typedef unsigned int    stbtt_uint32;
-   typedef signed   int    stbtt_int32;
-   #endif
-
-   typedef char stbtt__check_size32[sizeof(stbtt_int32)==4 ? 1 : -1];
-   typedef char stbtt__check_size16[sizeof(stbtt_int16)==2 ? 1 : -1];
-
-   // #define your own STBTT_sort() to override this to avoid qsort
-   #ifndef STBTT_sort
-   #include <stdlib.h>
-   #define STBTT_sort(data,num_items,item_size,compare_func)   qsort(data,num_items,item_size,compare_func)
-   #endif
-
-   // #define your own STBTT_ifloor/STBTT_iceil() to avoid math.h
-   #ifndef STBTT_ifloor
-   #include <math.h>
-   #define STBTT_ifloor(x)   ((int) floor(x))
-   #define STBTT_iceil(x)    ((int) ceil(x))
-   #endif
-
-   // #define your own functions "STBTT_malloc" / "STBTT_free" to avoid malloc.h
-   #ifndef STBTT_malloc
-   #include <malloc.h>
-   #define STBTT_malloc(x,u)  malloc(x)
-   #define STBTT_free(x,u)    free(x)
-   #endif
-
-   #ifndef STBTT_assert
-   #include <assert.h>
-   #define STBTT_assert(x)    assert(x)
-   #endif
-
-   #ifndef STBTT_strlen
-   #include <string.h>
-   #define STBTT_strlen(x)    strlen(x)
-   #endif
-
-   #ifndef STBTT_memcpy
-   #include <memory.h>
-   #define STBTT_memcpy       memcpy
-   #define STBTT_memset       memset
-   #endif
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-////
-////   INTERFACE
-////
-////
-
-#ifndef __STB_INCLUDE_STB_TRUETYPE_H__
-#define __STB_INCLUDE_STB_TRUETYPE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// TEXTURE BAKING API
-//
-// If you use this API, you only have to call two functions ever.
-//
-
-typedef struct
-{
-   unsigned short x0,y0,x1,y1; // coordinates of bbox in bitmap
-   float xoff,yoff,xadvance;   
-} stbtt_bakedchar;
-
-extern int stbtt_BakeFontBitmap(const unsigned char *data, int offset,  // font location (use offset=0 for plain .ttf)
-                                float pixel_height,                     // height of font in pixels
-                                unsigned char *pixels, int pw, int ph,  // bitmap to be filled in
-                                int first_char, int num_chars,          // characters to bake
-                                stbtt_bakedchar *chardata);             // you allocate this, it's num_chars long
-// if return is positive, the first unused row of the bitmap
-// if return is negative, returns the negative of the number of characters that fit
-// if return is 0, no characters fit and no rows were used
-// This uses a very crappy packing.
-
-typedef struct
-{
-   float x0,y0,s0,t0; // top-left
-   float x1,y1,s1,t1; // bottom-right
-} stbtt_aligned_quad;
-
-extern void stbtt_GetBakedQuad(stbtt_bakedchar *chardata, int pw, int ph,  // same data as above
-                               int char_index,             // character to display
-                               float *xpos, float *ypos,   // pointers to current position in screen pixel space
-                               stbtt_aligned_quad *q,      // output: quad to draw
-                               int opengl_fillrule);       // true if opengl fill rule; false if DX9 or earlier
-// Call GetBakedQuad with char_index = 'character - first_char', and it
-// creates the quad you need to draw and advances the current position.
-// It's inefficient; you might want to c&p it and optimize it.
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// FONT LOADING
-//
-//
-
-extern int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index);
-// Each .ttf file may have more than one font. Each has a sequential index
-// number starting from 0. Call this function to get the font offset for a
-// given index; it returns -1 if the index is out of range. A regular .ttf
-// file will only define one font and it always be at offset 0, so it will
-// return '0' for index 0, and -1 for all other indices. You can just skip
-// this step if you know it's that kind of font.
-
-
-// The following structure is defined publically so you can declare one on
-// the stack or as a global or etc.
-typedef struct
-{
-   void           *userdata;
-   unsigned char  *data;         // pointer to .ttf file
-   int             fontstart;    // offset of start of font
-
-   int numGlyphs;                // number of glyphs, needed for range checking
-
-   int loca,head,glyf,hhea,hmtx; // table locations as offset from start of .ttf
-   int index_map;                // a cmap mapping for our chosen character encoding
-   int indexToLocFormat;         // format needed to map from glyph index to glyph
-} stbtt_fontinfo;
-
-extern int stbtt_InitFont(stbtt_fontinfo *info, const unsigned char *data, int offset);
-// Given an offset into the file that defines a font, this function builds
-// the necessary cached info for the rest of the system. You must allocate
-// the stbtt_fontinfo yourself, and stbtt_InitFont will fill it out. You don't
-// need to do anything special to free it, because the contents are a pure
-// cache with no additional data structures. Returns 0 on failure.
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// CHARACTER TO GLYPH-INDEX CONVERSIOn
-
-int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint);
-// If you're going to perform multiple operations on the same character
-// and you want a speed-up, call this function with the character you're
-// going to process, then use glyph-based functions instead of the
-// codepoint-based functions.
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// CHARACTER PROPERTIES
-//
-
-extern float stbtt_ScaleForPixelHeight(const stbtt_fontinfo *info, float pixels);
-// computes a scale factor to produce a font whose "height" is 'pixels' tall.
-// Height is measured as the distance from the highest ascender to the lowest
-// descender; in other words, it's equivalent to calling stbtt_GetFontVMetrics
-// and computing:
-//       scale = pixels / (ascent - descent)
-// so if you prefer to measure height by the ascent only, use a similar calculation.
-
-extern void stbtt_GetFontVMetrics(const stbtt_fontinfo *info, int *ascent, int *descent, int *lineGap);
-// ascent is the coordinate above the baseline the font extends; descent
-// is the coordinate below the baseline the font extends (i.e. it is typically negative)
-// lineGap is the spacing between one row's descent and the next row's ascent...
-// so you should advance the vertical position by "*ascent - *descent + *lineGap"
-//   these are expressed in unscaled coordinates
-
-extern void stbtt_GetCodepointHMetrics(const stbtt_fontinfo *info, int codepoint, int *advanceWidth, int *leftSideBearing);
-// leftSideBearing is the offset from the current horizontal position to the left edge of the character
-// advanceWidth is the offset from the current horizontal position to the next horizontal position
-//   these are expressed in unscaled coordinates
-
-extern int  stbtt_GetCodepointKernAdvance(const stbtt_fontinfo *info, int ch1, int ch2);
-// an additional amount to add to the 'advance' value between ch1 and ch2
-// @TODO; for now always returns 0!
-
-extern int stbtt_GetCodepointBox(const stbtt_fontinfo *info, int codepoint, int *x0, int *y0, int *x1, int *y1);
-// Gets the bounding box of the visible part of the glyph, in unscaled coordinates
-
-extern void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_index, int *advanceWidth, int *leftSideBearing);
-extern int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2);
-extern int  stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1);
-// as above, but takes one or more glyph indices for greater efficiency
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// GLYPH SHAPES (you probably don't need these, but they have to go before
-// the bitmaps for C declaration-order reasons)
-//
-
-#ifndef STBTT_vmove // you can predefine these to use different values (but why?)
-   enum {
-      STBTT_vmove=1,
-      STBTT_vline,
-      STBTT_vcurve
-   };
-#endif
-
-#ifndef stbtt_vertex // you can predefine this to use different values
-                   // (we share this with other code at RAD)
-   #define stbtt_vertex_type short // can't use stbtt_int16 because that's not visible in the header file
-   typedef struct
-   {
-      stbtt_vertex_type x,y,cx,cy;
-      unsigned char type,padding;
-   } stbtt_vertex;
-#endif
-
-extern int stbtt_GetCodepointShape(const stbtt_fontinfo *info, int unicode_codepoint, stbtt_vertex **vertices);
-extern int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **vertices);
-// returns # of vertices and fills *vertices with the pointer to them
-//   these are expressed in "unscaled" coordinates
-
-extern void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *vertices);
-// frees the data allocated above
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// BITMAP RENDERING
-//
-
-extern void stbtt_FreeBitmap(unsigned char *bitmap, void *userdata);
-// frees the bitmap allocated below
-
-extern unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff);
-// allocates a large-enough single-channel 8bpp bitmap and renders the
-// specified character/glyph at the specified scale into it, with
-// antialiasing. 0 is no coverage (transparent), 255 is fully covered (opaque).
-// *width & *height are filled out with the width & height of the bitmap,
-// which is stored left-to-right, top-to-bottom.
-//
-// xoff/yoff are the offset it pixel space from the glyph origin to the top-left of the bitmap
-
-extern void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint);
-// the same as above, but you pass in storage for the bitmap in the form
-// of 'output', with row spacing of 'out_stride' bytes. the bitmap is
-// clipped to out_w/out_h bytes. call the next function to get the
-// height and width and positioning info
-
-extern void stbtt_GetCodepointBitmapBox(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1);
-// get the bbox of the bitmap centered around the glyph origin; so the
-// bitmap width is ix1-ix0, height is iy1-iy0, and location to place
-// the bitmap top left is (leftSideBearing*scale,iy0).
-// (Note that the bitmap uses y-increases-down, but the shape uses
-// y-increases-up, so CodepointBitmapBox and CodepointBox are inverted.)
-
-extern unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff);
-extern void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1);
-extern void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int glyph);
-
-//extern void stbtt_get_true_bbox(stbtt_vertex *vertices, int num_verts, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1);
-
-// @TODO: don't expose this structure
-typedef struct
-{
-   int w,h,stride;
-   unsigned char *pixels;
-} stbtt__bitmap;
-
-extern void stbtt_Rasterize(stbtt__bitmap *result, float flatness_in_pixels, stbtt_vertex *vertices, int num_verts, float scale_x, float scale_y, int x_off, int y_off, int invert, void *userdata);
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Finding the right font...
-//
-// You should really just solve this offline, keep your own tables
-// of what font is what, and don't try to get it out of the .ttf file.
-// That's because getting it out of the .ttf file is really hard, because
-// the names in the file can appear in many possible encodings, in many
-// possible languages, and e.g. if you need a case-insensitive comparison,
-// the details of that depend on the encoding & language in a complex way
-// (actually underspecified in truetype, but also gigantic).
-//
-// But you can use the provided functions in two possible ways:
-//     stbtt_FindMatchingFont() will use *case-sensitive* comparisons on
-//             unicode-encoded names to try to find the font you want;
-//             you can run this before calling stbtt_InitFont()
-//
-//     stbtt_GetFontNameString() lets you get any of the various strings
-//             from the file yourself and do your own comparisons on them.
-//             You have to have called stbtt_InitFont() first.
-
-
-extern int stbtt_FindMatchingFont(const unsigned char *fontdata, const char *name, int flags);
-// returns the offset (not index) of the font that matches, or -1 if none
-//   if you use STBTT_MACSTYLE_DONTCARE, use a font name like "Arial Bold".
-//   if you use any other flag, use a font name like "Arial"; this checks
-//     the 'macStyle' header field; i don't know if fonts set this consistently
-#define STBTT_MACSTYLE_DONTCARE     0
-#define STBTT_MACSTYLE_BOLD         1
-#define STBTT_MACSTYLE_ITALIC       2
-#define STBTT_MACSTYLE_UNDERSCORE   4
-#define STBTT_MACSTYLE_NONE         8   // <= not same as 0, this makes us check the bitfield is 0
-
-extern int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2);
-// returns 1/0 whether the first string interpreted as utf8 is identical to
-// the second string interpreted as big-endian utf16... useful for strings from next func
-
-extern char *stbtt_GetFontNameString(const stbtt_fontinfo *font, int *length, int platformID, int encodingID, int languageID, int nameID);
-// returns the string (which may be big-endian double byte, e.g. for unicode)
-// and puts the length in bytes in *length.
-//
-// some of the values for the IDs are below; for more see the truetype spec:
-//     http://developer.apple.com/textfonts/TTRefMan/RM06/Chap6name.html
-//     http://www.microsoft.com/typography/otspec/name.htm
-
-enum { // platformID
-   STBTT_PLATFORM_ID_UNICODE   =0,
-   STBTT_PLATFORM_ID_MAC       =1,
-   STBTT_PLATFORM_ID_ISO       =2,
-   STBTT_PLATFORM_ID_MICROSOFT =3
-};
-
-enum { // encodingID for STBTT_PLATFORM_ID_UNICODE
-   STBTT_UNICODE_EID_UNICODE_1_0    =0,
-   STBTT_UNICODE_EID_UNICODE_1_1    =1,
-   STBTT_UNICODE_EID_ISO_10646      =2,
-   STBTT_UNICODE_EID_UNICODE_2_0_BMP=3,
-   STBTT_UNICODE_EID_UNICODE_2_0_FULL=4,
-};
-
-enum { // encodingID for STBTT_PLATFORM_ID_MICROSOFT
-   STBTT_MS_EID_SYMBOL        =0,
-   STBTT_MS_EID_UNICODE_BMP   =1,
-   STBTT_MS_EID_SHIFTJIS      =2,
-   STBTT_MS_EID_UNICODE_FULL  =10,
-};
-
-enum { // encodingID for STBTT_PLATFORM_ID_MAC; same as Script Manager codes
-   STBTT_MAC_EID_ROMAN        =0,   STBTT_MAC_EID_ARABIC       =4,
-   STBTT_MAC_EID_JAPANESE     =1,   STBTT_MAC_EID_HEBREW       =5,
-   STBTT_MAC_EID_CHINESE_TRAD =2,   STBTT_MAC_EID_GREEK        =6,
-   STBTT_MAC_EID_KOREAN       =3,   STBTT_MAC_EID_RUSSIAN      =7,
-};
-
-enum { // languageID for STBTT_PLATFORM_ID_MICROSOFT; same as LCID...
-       // problematic because there are e.g. 16 english LCIDs and 16 arabic LCIDs
-   STBTT_MS_LANG_ENGLISH     =0x0409,   STBTT_MS_LANG_ITALIAN     =0x0410,
-   STBTT_MS_LANG_CHINESE     =0x0804,   STBTT_MS_LANG_JAPANESE    =0x0411,
-   STBTT_MS_LANG_DUTCH       =0x0413,   STBTT_MS_LANG_KOREAN      =0x0412,
-   STBTT_MS_LANG_FRENCH      =0x040c,   STBTT_MS_LANG_RUSSIAN     =0x0419,
-   STBTT_MS_LANG_GERMAN      =0x0407,   STBTT_MS_LANG_SPANISH     =0x0409,
-   STBTT_MS_LANG_HEBREW      =0x040d,   STBTT_MS_LANG_SWEDISH     =0x041D,
-};
-
-enum { // languageID for STBTT_PLATFORM_ID_MAC
-   STBTT_MAC_LANG_ENGLISH      =0 ,   STBTT_MAC_LANG_JAPANESE     =11,
-   STBTT_MAC_LANG_ARABIC       =12,   STBTT_MAC_LANG_KOREAN       =23,
-   STBTT_MAC_LANG_DUTCH        =4 ,   STBTT_MAC_LANG_RUSSIAN      =32,
-   STBTT_MAC_LANG_FRENCH       =1 ,   STBTT_MAC_LANG_SPANISH      =6 ,
-   STBTT_MAC_LANG_GERMAN       =2 ,   STBTT_MAC_LANG_SWEDISH      =5 ,
-   STBTT_MAC_LANG_HEBREW       =10,   STBTT_MAC_LANG_CHINESE_SIMPLIFIED =33,
-   STBTT_MAC_LANG_ITALIAN      =3 ,   STBTT_MAC_LANG_CHINESE_TRAD =19,
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __STB_INCLUDE_STB_TRUETYPE_H__
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-////
-////   IMPLEMENTATION
-////
-////
-
-#ifdef STB_TRUETYPE_IMPLEMENTATION
-
-//////////////////////////////////////////////////////////////////////////
-//
-// accessors to parse data from file
-//
-
-// on platforms that don't allow misaligned reads, if we want to allow
-// truetype fonts that aren't padded to alignment, define ALLOW_UNALIGNED_TRUETYPE
-
-#define ttBYTE(p)     (* (stbtt_uint8 *) (p))
-#define ttCHAR(p)     (* (stbtt_int8 *) (p))
-#define ttFixed(p)    ttLONG(p)
-
-#if defined(STB_TRUETYPE_BIGENDIAN) && !defined(ALLOW_UNALIGNED_TRUETYPE)
-
-   #define ttUSHORT(p)   (* (stbtt_uint16 *) (p))
-   #define ttSHORT(p)    (* (stbtt_int16 *) (p))
-   #define ttULONG(p)    (* (stbtt_uint32 *) (p))
-   #define ttLONG(p)     (* (stbtt_int32 *) (p))
-
-#else
-
-   stbtt_uint16 ttUSHORT(const stbtt_uint8 *p) { return p[0]*256 + p[1]; }
-   stbtt_int16 ttSHORT(const stbtt_uint8 *p)   { return p[0]*256 + p[1]; }
-   stbtt_uint32 ttULONG(const stbtt_uint8 *p)  { return (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; }
-   stbtt_int32 ttLONG(const stbtt_uint8 *p)    { return (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; }
-
-#endif
-
-#define stbtt_tag4(p,c0,c1,c2,c3) ((p)[0] == (c0) && (p)[1] == (c1) && (p)[2] == (c2) && (p)[3] == (c3))
-#define stbtt_tag(p,str)           stbtt_tag4(p,str[0],str[1],str[2],str[3])
-
-static int stbtt__isfont(const stbtt_uint8 *font)
-{
-   // check the version number
-   if (stbtt_tag(font, "1"))   return 1; // TrueType 1
-   if (stbtt_tag(font, "typ1"))   return 1; // TrueType with type 1 font -- we don't support this!
-   if (stbtt_tag(font, "OTTO"))   return 1; // OpenType with CFF
-   if (stbtt_tag4(font, 0,1,0,0)) return 1; // OpenType 1.0
-   return 0;
-}
-
-// @OPTIMIZE: binary search
-static stbtt_uint32 stbtt__find_table(stbtt_uint8 *data, stbtt_uint32 fontstart, const char *tag)
-{
-   stbtt_int32 num_tables = ttUSHORT(data+fontstart+4);
-   stbtt_uint32 tabledir = fontstart + 12;
-   stbtt_int32 i;
-   for (i=0; i < num_tables; ++i) {
-      stbtt_uint32 loc = tabledir + 16*i;
-      if (stbtt_tag(data+loc+0, tag))
-         return ttULONG(data+loc+8);
-   }
-   return 0;
-}
-
-int stbtt_GetFontOffsetForIndex(const unsigned char *font_collection, int index)
-{
-   // if it's just a font, there's only one valid index
-   if (stbtt__isfont(font_collection))
-      return index == 0 ? 0 : -1;
-
-   // check if it's a TTC
-   if (stbtt_tag(font_collection, "ttcf")) {
-      // version 1?
-      if (ttULONG(font_collection+4) == 0x00010000 || ttULONG(font_collection+4) == 0x00020000) {
-         stbtt_int32 n = ttLONG(font_collection+8);
-         if (index >= n)
-            return -1;
-         return ttULONG(font_collection+12+index*14);
-      }
-   }
-   return -1;
-}
-
-int stbtt_InitFont(stbtt_fontinfo *info, const unsigned char *data2, int fontstart)
-{
-   stbtt_uint8 *data = (stbtt_uint8 *) data2;
-   stbtt_uint32 cmap, t;
-   stbtt_int32 i,numTables;
-
-   info->data = data;
-   info->fontstart = fontstart;
-
-   cmap = stbtt__find_table(data, fontstart, "cmap");
-   info->loca = stbtt__find_table(data, fontstart, "loca");
-   info->head = stbtt__find_table(data, fontstart, "head");
-   info->glyf = stbtt__find_table(data, fontstart, "glyf");
-   info->hhea = stbtt__find_table(data, fontstart, "hhea");
-   info->hmtx = stbtt__find_table(data, fontstart, "hmtx");
-   if (!cmap || !info->loca || !info->head || !info->glyf || !info->hhea || !info->hmtx)
-      return 0;
-
-   t = stbtt__find_table(data, fontstart, "maxp");
-   if (t)
-      info->numGlyphs = ttUSHORT(data+t+4);
-   else
-      info->numGlyphs = 0xffff;
-
-   // find a cmap encoding table we understand *now* to avoid searching
-   // later. (todo: could make this installable)
-   // the same regardless of glyph.
-   numTables = ttUSHORT(data + cmap + 2);
-   info->index_map = 0;
-   for (i=0; i < numTables; ++i) {
-      stbtt_uint32 encoding_record = cmap + 4 + 8 * i;
-      // find an encoding we understand:
-      switch(ttUSHORT(data+encoding_record)) {
-         case STBTT_PLATFORM_ID_MICROSOFT:
-            switch (ttUSHORT(data+encoding_record+2)) {
-               case STBTT_MS_EID_UNICODE_BMP:
-               case STBTT_MS_EID_UNICODE_FULL:
-                  // MS/Unicode
-                  info->index_map = cmap + ttULONG(data+encoding_record+4);
-                  break;
-            }
-            break;
-      }
-   }
-   if (info->index_map == 0)
-      return 0;
-
-   info->indexToLocFormat = ttUSHORT(data+info->head + 50);
-   return 1;
-}
-
-int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint)
-{
-   stbtt_uint8 *data = info->data;
-   stbtt_uint32 index_map = info->index_map;
-
-   stbtt_uint16 format = ttUSHORT(data + index_map + 0);
-   if (format == 0) { // apple byte encoding
-      stbtt_int32 bytes = ttUSHORT(data + index_map + 2);
-      if (unicode_codepoint < bytes-6)
-         return ttBYTE(data + index_map + 6 + unicode_codepoint);
-      return 0;
-   } else if (format == 6) {
-      stbtt_uint32 first = ttUSHORT(data + index_map + 6);
-      stbtt_uint32 count = ttUSHORT(data + index_map + 8);
-      if ((stbtt_uint32) unicode_codepoint >= first && (stbtt_uint32) unicode_codepoint < first+count)
-         return ttUSHORT(data + index_map + 10 + (unicode_codepoint - first)*2);
-      return 0;
-   } else if (format == 2) {
-      STBTT_assert(0); // @TODO: high-byte mapping for japanese/chinese/korean
-      return 0;
-   } else if (format == 4) { // standard mapping for windows fonts: binary search collection of ranges
-      stbtt_uint16 segcount = ttUSHORT(data+index_map+6) >> 1;
-      stbtt_uint16 searchRange = ttUSHORT(data+index_map+8) >> 1;
-      stbtt_uint16 entrySelector = ttUSHORT(data+index_map+10);
-      stbtt_uint16 rangeShift = ttUSHORT(data+index_map+12) >> 1;
-      stbtt_uint16 item, offset, start, end;
-
-      // do a binary search of the segments
-      stbtt_uint32 endCount = index_map + 14;
-      stbtt_uint32 search = endCount;
-
-      if (unicode_codepoint > 0xffff)
-         return 0;
-
-      // they lie from endCount .. endCount + segCount
-      // but searchRange is the nearest power of two, so...
-      if (unicode_codepoint >= ttUSHORT(data + search + rangeShift*2))
-         search += rangeShift*2;
-
-      // now decrement to bias correctly to find smallest
-      search -= 2;
-      while (entrySelector) {
-         stbtt_uint16 start, end;
-         searchRange >>= 1;
-         start = ttUSHORT(data + search + 2 + segcount*2 + 2);
-         end = ttUSHORT(data + search + 2);
-         start = ttUSHORT(data + search + searchRange*2 + segcount*2 + 2);
-         end = ttUSHORT(data + search + searchRange*2);
-         if (unicode_codepoint > end)
-            search += searchRange*2;
-         --entrySelector;
-      }
-      search += 2;
-
-      item = (stbtt_uint16) ((search - endCount) >> 1);
-
-      STBTT_assert(unicode_codepoint <= ttUSHORT(data + endCount + 2*item));
-      start = ttUSHORT(data + index_map + 14 + segcount*2 + 2 + 2*item);
-      end = ttUSHORT(data + index_map + 14 + 2 + 2*item);
-      if (unicode_codepoint < start)
-         return 0;
-
-      offset = ttUSHORT(data + index_map + 14 + segcount*6 + 2 + 2*item);
-      if (offset == 0)
-         return unicode_codepoint + ttSHORT(data + index_map + 14 + segcount*4 + 2 + 2*item);
-
-      return ttUSHORT(data + offset + (unicode_codepoint-start)*2 + index_map + 14 + segcount*6 + 2 + 2*item);
-   } else if (format == 12) {
-      stbtt_uint16 ngroups = ttUSHORT(data+index_map+6);
-      stbtt_int32 low,high;
-      low = 0; high = (stbtt_int32)ngroups;
-      // Binary search the right group.
-      while (low <= high) {
-         stbtt_int32 mid = low + ((high-low) >> 1); // rounds down, so low <= mid < high
-         stbtt_uint32 start_char = ttULONG(data+index_map+16+mid*12);
-         stbtt_uint32 end_char = ttULONG(data+index_map+16+mid*12+4);
-         if ((stbtt_uint32) unicode_codepoint < start_char)
-            high = mid-1;
-         else if ((stbtt_uint32) unicode_codepoint > end_char)
-            low = mid+1;
-         else {
-            stbtt_uint32 start_glyph = ttULONG(data+index_map+16+mid*12+8);
-            return start_glyph + unicode_codepoint-start_char;
-         }
-      }
-      return 0; // not found
-   }
-   // @TODO
-   STBTT_assert(0);
-   return 0;
-}
-
-int stbtt_GetCodepointShape(const stbtt_fontinfo *info, int unicode_codepoint, stbtt_vertex **vertices)
-{
-   return stbtt_GetGlyphShape(info, stbtt_FindGlyphIndex(info, unicode_codepoint), vertices);
-}
-
-static void stbtt_setvertex(stbtt_vertex *v, stbtt_uint8 type, stbtt_int16 x, stbtt_int16 y, stbtt_int16 cx, stbtt_int16 cy)
-{
-   v->type = type;
-   v->x = x;
-   v->y = y;
-   v->cx = cx;
-   v->cy = cy;
-}
-
-static int stbtt__GetGlyfOffset(const stbtt_fontinfo *info, int glyph_index)
-{
-   int g1,g2;
-
-   if (glyph_index >= info->numGlyphs) return -1; // glyph index out of range
-   if (info->indexToLocFormat >= 2)    return -1; // unknown index->glyph map format
-
-   if (info->indexToLocFormat == 0) {
-      g1 = info->glyf + ttUSHORT(info->data + info->loca + glyph_index * 2) * 2;
-      g2 = info->glyf + ttUSHORT(info->data + info->loca + glyph_index * 2 + 2) * 2;
-   } else {
-      g1 = info->glyf + ttULONG (info->data + info->loca + glyph_index * 4);
-      g2 = info->glyf + ttULONG (info->data + info->loca + glyph_index * 4 + 4);
-   }
-
-   return g1==g2 ? -1 : g1; // if length is 0, return -1
-}
-
-int stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1)
-{
-   int g = stbtt__GetGlyfOffset(info, glyph_index);
-   if (g < 0) return 0;
-
-   if (x0) *x0 = ttSHORT(info->data + g + 2);
-   if (y0) *y0 = ttSHORT(info->data + g + 4);
-   if (x1) *x1 = ttSHORT(info->data + g + 6);
-   if (y1) *y1 = ttSHORT(info->data + g + 8);
-   return 1;
-}
-
-int stbtt_GetCodepointBox(const stbtt_fontinfo *info, int codepoint, int *x0, int *y0, int *x1, int *y1)
-{
-   return stbtt_GetGlyphBox(info, stbtt_FindGlyphIndex(info,codepoint), x0,y0,x1,y1);
-}
-
-int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **pvertices)
-{
-   stbtt_int16 numberOfContours;
-   stbtt_uint8 *endPtsOfContours;
-   stbtt_uint8 *data = info->data;
-   stbtt_vertex *vertices=0;
-   int num_vertices=0;
-   int g = stbtt__GetGlyfOffset(info, glyph_index);
-
-   *pvertices = NULL;
-
-   if (g < 0) return 0;
-
-   numberOfContours = ttSHORT(data + g);
-
-   if (numberOfContours > 0) {
-      stbtt_uint8 flags=0,flagcount;
-      stbtt_int32 ins, i,j=0,m,n, next_move, was_off=0, off;
-      stbtt_int16 x,y,cx,cy,sx,sy;
-      stbtt_uint8 *points;
-      endPtsOfContours = (data + g + 10);
-      ins = ttUSHORT(data + g + 10 + numberOfContours * 2);
-      points = data + g + 10 + numberOfContours * 2 + 2 + ins;
-
-      n = 1+ttUSHORT(endPtsOfContours + numberOfContours*2-2);
-
-      m = n + numberOfContours;  // a loose bound on how many vertices we might need
-      vertices = (stbtt_vertex *) STBTT_malloc(m * sizeof(vertices[0]), info->userdata);
-      if (vertices == 0)
-         return 0;
-
-      next_move = 0;
-      flagcount=0;
-
-      // in first pass, we load uninterpreted data into the allocated array
-      // above, shifted to the end of the array so we won't overwrite it when
-      // we create our final data starting from the front
-
-      off = m - n; // starting offset for uninterpreted data, regardless of how m ends up being calculated
-
-      // first load flags
-
-      for (i=0; i < n; ++i) {
-         if (flagcount == 0) {
-            flags = *points++;
-            if (flags & 8)
-               flagcount = *points++;
-         } else
-            --flagcount;
-         vertices[off+i].type = flags;
-      }
-
-      // now load x coordinates
-      x=0;
-      for (i=0; i < n; ++i) {
-         flags = vertices[off+i].type;
-         if (flags & 2) {
-            stbtt_int16 dx = *points++;
-            x += (flags & 16) ? dx : -dx; // ???
-         } else {
-            if (!(flags & 16)) {
-               x = x + (stbtt_int16) (points[0]*256 + points[1]);
-               points += 2;
-            }
-         }
-         vertices[off+i].x = x;
-      }
-
-      // now load y coordinates
-      y=0;
-      for (i=0; i < n; ++i) {
-         flags = vertices[off+i].type;
-         if (flags & 4) {
-            stbtt_int16 dy = *points++;
-            y += (flags & 32) ? dy : -dy; // ???
-         } else {
-            if (!(flags & 32)) {
-               y = y + (stbtt_int16) (points[0]*256 + points[1]);
-               points += 2;
-            }
-         }
-         vertices[off+i].y = y;
-      }
-
-      // now convert them to our format
-      num_vertices=0;
-      sx = sy = cx = cy = 0;
-      for (i=0; i < n; ++i) {
-         flags = vertices[off+i].type;
-         x     = (stbtt_int16) vertices[off+i].x;
-         y     = (stbtt_int16) vertices[off+i].y;
-         if (next_move == i) {
-            // when we get to the end, we have to close the shape explicitly
-            if (i != 0) {
-               if (was_off)
-                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve,sx,sy,cx,cy);
-               else
-                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vline,sx,sy,0,0);
-            }
-
-            // now start the new one               
-            stbtt_setvertex(&vertices[num_vertices++], STBTT_vmove,x,y,0,0);
-            next_move = 1 + ttUSHORT(endPtsOfContours+j*2);
-            ++j;
-            was_off = 0;
-            sx = x;
-            sy = y;
-         } else {
-            if (!(flags & 1)) { // if it's a curve
-               if (was_off) // two off-curve control points in a row means interpolate an on-curve midpoint
-                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, (cx+x)>>1, (cy+y)>>1, cx, cy);
-               cx = x;
-               cy = y;
-               was_off = 1;
-            } else {
-               if (was_off)
-                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, x,y, cx, cy);
-               else
-                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vline, x,y,0,0);
-               was_off = 0;
-            }
-         }
-      }
-      if (i != 0) {
-         if (was_off)
-            stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve,sx,sy,cx,cy);
-         else
-            stbtt_setvertex(&vertices[num_vertices++], STBTT_vline,sx,sy,0,0);
-      }
-   } else if (numberOfContours == -1) {
-      // Compound shapes.
-      int more = 1;
-      stbtt_uint8 *comp = data + g + 10;
-      num_vertices = 0;
-      vertices = 0;
-      while (more) {
-         stbtt_uint16 flags, gidx;
-         int comp_num_verts = 0, i;
-         stbtt_vertex *comp_verts = 0, *tmp = 0;
-         float mtx[6] = {1,0,0,1,0,0}, m, n;
-         
-         flags = ttSHORT(comp); comp+=2;
-         gidx = ttSHORT(comp); comp+=2;
-
-         if (flags & 2) { // XY values
-            if (flags & 1) { // shorts
-               mtx[4] = ttSHORT(comp); comp+=2;
-               mtx[5] = ttSHORT(comp); comp+=2;
-            } else {
-               mtx[4] = ttCHAR(comp); comp+=1;
-               mtx[5] = ttCHAR(comp); comp+=1;
-            }
-         }
-         else {
-            // @TODO handle matching point
-            STBTT_assert(0);
-         }
-         if (flags & (1<<3)) { // WE_HAVE_A_SCALE
-            mtx[0] = mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[1] = mtx[2] = 0;
-         } else if (flags & (1<<6)) { // WE_HAVE_AN_X_AND_YSCALE
-            mtx[0] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[1] = mtx[2] = 0;
-            mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
-         } else if (flags & (1<<7)) { // WE_HAVE_A_TWO_BY_TWO
-            mtx[0] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[1] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[2] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
-         }
-         
-         // Find transformation scales.
-         m = (float) sqrt(mtx[0]*mtx[0] + mtx[1]*mtx[1]);
-         n = (float) sqrt(mtx[2]*mtx[2] + mtx[3]*mtx[3]);
-
-         // Get indexed glyph.
-         comp_num_verts = stbtt_GetGlyphShape(info, gidx, &comp_verts);
-         if (comp_num_verts > 0) {
-            // Transform vertices.
-            for (i = 0; i < comp_num_verts; ++i) {
-               stbtt_vertex* v = &comp_verts[i];
-               stbtt_vertex_type x,y;
-               x=v->x; y=v->y;
-               v->x = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4]));
-               v->y = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5]));
-               x=v->cx; y=v->cy;
-               v->cx = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4]));
-               v->cy = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5]));
-            }
-            // Append vertices.
-            tmp = (stbtt_vertex*)STBTT_malloc((num_vertices+comp_num_verts)*sizeof(stbtt_vertex), info->userdata);
-            if (!tmp) {
-               if (vertices) STBTT_free(vertices, info->userdata);
-               if (comp_verts) STBTT_free(comp_verts, info->userdata);
-               return 0;
-            }
-            if (num_vertices > 0) memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex));
-            memcpy(tmp+num_vertices, comp_verts, comp_num_verts*sizeof(stbtt_vertex));
-            if (vertices) STBTT_free(vertices, info->userdata);
-            vertices = tmp;
-            STBTT_free(comp_verts, info->userdata);
-            num_vertices += comp_num_verts;
-         }
-         // More components ?
-         more = flags & (1<<5);
-      }
-   } else if (numberOfContours < 0) {
-      // @TODO other compound variations?
-      STBTT_assert(0);
-   } else {
-      // numberOfCounters == 0, do nothing
-   }
-
-   *pvertices = vertices;
-   return num_vertices;
-}
-
-void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_index, int *advanceWidth, int *leftSideBearing)
-{
-   stbtt_uint16 numOfLongHorMetrics = ttUSHORT(info->data+info->hhea + 34);
-   if (glyph_index < numOfLongHorMetrics) {
-      if (advanceWidth)     *advanceWidth    = ttSHORT(info->data + info->hmtx + 4*glyph_index);
-      if (leftSideBearing)  *leftSideBearing = ttSHORT(info->data + info->hmtx + 4*glyph_index + 2);
-   } else {
-      if (advanceWidth)     *advanceWidth    = ttSHORT(info->data + info->hmtx + 4*(numOfLongHorMetrics-1));
-      if (leftSideBearing)  *leftSideBearing = ttSHORT(info->data + info->hmtx + 4*numOfLongHorMetrics + 2*(glyph_index - numOfLongHorMetrics));
-   }
-}
-
-int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo * /*info*/, int /*glyph1*/, int /*glyph2*/)
-{
-   return 0;
-}
-
-int  stbtt_GetCodepointKernAdvance(const stbtt_fontinfo * /*info*/, int /*ch1*/, int /*ch2*/)
-{
-   return 0;
-}
-
-void stbtt_GetCodepointHMetrics(const stbtt_fontinfo *info, int codepoint, int *advanceWidth, int *leftSideBearing)
-{
-   stbtt_GetGlyphHMetrics(info, stbtt_FindGlyphIndex(info,codepoint), advanceWidth, leftSideBearing);
-}
-
-void stbtt_GetFontVMetrics(const stbtt_fontinfo *info, int *ascent, int *descent, int *lineGap)
-{
-   if (ascent ) *ascent  = ttSHORT(info->data+info->hhea + 4);
-   if (descent) *descent = ttSHORT(info->data+info->hhea + 6);
-   if (lineGap) *lineGap = ttSHORT(info->data+info->hhea + 8);
-}
-
-float stbtt_ScaleForPixelHeight(const stbtt_fontinfo *info, float height)
-{
-   int fheight = ttSHORT(info->data + info->hhea + 4) - ttSHORT(info->data + info->hhea + 6);
-   return (float) height / fheight;
-}
-
-void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *v)
-{
-   STBTT_free(v, info->userdata);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// antialiasing software rasterizer
-//
-
-void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1)
-{
-   int x0,y0,x1,y1;
-   if (!stbtt_GetGlyphBox(font, glyph, &x0,&y0,&x1,&y1))
-      x0=y0=x1=y1=0; // e.g. space character
-   // now move to integral bboxes (treating pixels as little squares, what pixels get touched)?
-   if (ix0) *ix0 =  STBTT_ifloor(x0 * scale_x);
-   if (iy0) *iy0 = -STBTT_iceil (y1 * scale_y);
-   if (ix1) *ix1 =  STBTT_iceil (x1 * scale_x);
-   if (iy1) *iy1 = -STBTT_ifloor(y0 * scale_y);
-}
-
-void stbtt_GetCodepointBitmapBox(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1)
-{
-   stbtt_GetGlyphBitmapBox(font, stbtt_FindGlyphIndex(font,codepoint), scale_x, scale_y, ix0,iy0,ix1,iy1);
-}
-
-typedef struct stbtt__edge {
-   float x0,y0, x1,y1;
-   int invert;
-} stbtt__edge;
-
-typedef struct stbtt__active_edge
-{
-   int x,dx;
-   float ey;
-   struct stbtt__active_edge *next;
-   int valid;
-} stbtt__active_edge;
-
-#define FIXSHIFT   10
-#define FIX        (1 << FIXSHIFT)
-#define FIXMASK    (FIX-1)
-
-static stbtt__active_edge *new_active(stbtt__edge *e, int off_x, float start_point, void *userdata)
-{
-   stbtt__active_edge *z = (stbtt__active_edge *) STBTT_malloc(sizeof(*z), userdata); // @TODO: make a pool of these!!!
-   float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0);
-   STBTT_assert(e->y0 <= start_point);
-   if (!z) return z;
-   // round dx down to avoid going too far
-   if (dxdy < 0)
-      z->dx = -STBTT_ifloor(FIX * -dxdy);
-   else
-      z->dx = STBTT_ifloor(FIX * dxdy);
-   z->x = STBTT_ifloor(FIX * (e->x0 + dxdy * (start_point - e->y0)));
-   z->x -= off_x * FIX;
-   z->ey = e->y1;
-   z->next = 0;
-   z->valid = e->invert ? 1 : -1;
-   return z;
-}
-
-// note: this routine clips fills that extend off the edges... ideally this
-// wouldn't happen, but it could happen if the truetype glyph bounding boxes
-// are wrong, or if the user supplies a too-small bitmap
-static void stbtt__fill_active_edges(unsigned char *scanline, int len, stbtt__active_edge *e, int max_weight)
-{
-   // non-zero winding fill
-   int x0=0, w=0;
-
-   while (e) {
-      if (w == 0) {
-         // if we're currently at zero, we need to record the edge start point
-         x0 = e->x; w += e->valid;
-      } else {
-         int x1 = e->x; w += e->valid;
-         // if we went to zero, we need to draw
-         if (w == 0) {
-            int i = x0 >> FIXSHIFT;
-            int j = x1 >> FIXSHIFT;
-
-            if (i < len && j >= 0) {
-               if (i == j) {
-                  // x0,x1 are the same pixel, so compute combined coverage
-                  scanline[i] = scanline[i] + (stbtt_uint8) ((x1 - x0) * max_weight >> FIXSHIFT);
-               } else {
-                  if (i >= 0) // add antialiasing for x0
-                     scanline[i] = scanline[i] + (stbtt_uint8) (((FIX - (x0 & FIXMASK)) * max_weight) >> FIXSHIFT);
-                  else
-                     i = -1; // clip
-
-                  if (j < len) // add antialiasing for x1
-                     scanline[j] = scanline[j] + (stbtt_uint8) (((x1 & FIXMASK) * max_weight) >> FIXSHIFT);
-                  else
-                     j = len; // clip
-
-                  for (++i; i < j; ++i) // fill pixels between x0 and x1
-                     scanline[i] = scanline[i] + (stbtt_uint8) max_weight;
-               }
-            }
-         }
-      }
-      
-      e = e->next;
-   }
-}
-
-static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, int n, int vsubsample, int off_x, int off_y, void *userdata)
-{
-   stbtt__active_edge *active = NULL;
-   int y,j=0;
-   int max_weight = (255 / vsubsample);  // weight per vertical scanline
-   int s; // vertical subsample index
-   unsigned char scanline_data[512], *scanline;
-
-   if (result->w > 512)
-      scanline = (unsigned char *) STBTT_malloc(result->w, userdata);
-   else
-      scanline = scanline_data;
-
-   y = off_y * vsubsample;
-   e[n].y0 = (off_y + result->h) * (float) vsubsample + 1;
-
-   while (j < result->h) {
-      STBTT_memset(scanline, 0, result->w);
-      for (s=0; s < vsubsample; ++s) {
-         // find center of pixel for this scanline
-         float scan_y = y + 0.5f;
-         stbtt__active_edge **step = &active;
-
-         // update all active edges;
-         // remove all active edges that terminate before the center of this scanline
-         while (*step) {
-            stbtt__active_edge * z = *step;
-            if (z->ey <= scan_y) {
-               *step = z->next; // delete from list
-               STBTT_assert(z->valid);
-               z->valid = 0;
-               STBTT_free(z, userdata);
-            } else {
-               z->x += z->dx; // advance to position for current scanline
-               step = &((*step)->next); // advance through list
-            }
-         }
-
-         // resort the list if needed
-         for(;;) {
-            int changed=0;
-            step = &active;
-            while (*step && (*step)->next) {
-               if ((*step)->x > (*step)->next->x) {
-                  stbtt__active_edge *t = *step;
-                  stbtt__active_edge *q = t->next;
-
-                  t->next = q->next;
-                  q->next = t;
-                  *step = q;
-                  changed = 1;
-               }
-               step = &(*step)->next;
-            }
-            if (!changed) break;
-         }
-
-         // insert all edges that start before the center of this scanline -- omit ones that also end on this scanline
-         while (e->y0 <= scan_y) {
-            if (e->y1 > scan_y) {
-               stbtt__active_edge *z = new_active(e, off_x, scan_y, userdata);
-               // find insertion point
-               if (active == NULL)
-                  active = z;
-               else if (z->x < active->x) {
-                  // insert at front
-                  z->next = active;
-                  active = z;
-               } else {
-                  // find thing to insert AFTER
-                  stbtt__active_edge *p = active;
-                  while (p->next && p->next->x < z->x)
-                     p = p->next;
-                  // at this point, p->next->x is NOT < z->x
-                  z->next = p->next;
-                  p->next = z;
-               }
-            }
-            ++e;
-         }
-
-         // now process all active edges in XOR fashion
-         if (active)
-            stbtt__fill_active_edges(scanline, result->w, active, max_weight);
-
-         ++y;
-      }
-      STBTT_memcpy(result->pixels + j * result->stride, scanline, result->w);
-      ++j;
-   }
-
-   while (active) {
-      stbtt__active_edge *z = active;
-      active = active->next;
-      STBTT_free(z, userdata);
-   }
-
-   if (scanline != scanline_data)
-      STBTT_free(scanline, userdata);
-}
-
-static int stbtt__edge_compare(const void *p, const void *q)
-{
-   stbtt__edge *a = (stbtt__edge *) p;
-   stbtt__edge *b = (stbtt__edge *) q;
-
-   if (a->y0 < b->y0) return -1;
-   if (a->y0 > b->y0) return  1;
-   return 0;
-}
-
-typedef struct
-{
-   float x,y;
-} stbtt__point;
-
-static void stbtt__rasterize(stbtt__bitmap *result, stbtt__point *pts, int *wcount, int windings, float scale_x, float scale_y, int off_x, int off_y, int invert, void *userdata)
-{
-   float y_scale_inv = invert ? -scale_y : scale_y;
-   stbtt__edge *e;
-   int n,i,j,k,m;
-   int vsubsample = result->h < 8 ? 15 : 5;
-   // vsubsample should divide 255 evenly; otherwise we won't reach full opacity
-
-   // now we have to blow out the windings into explicit edge lists
-   n = 0;
-   for (i=0; i < windings; ++i)
-      n += wcount[i];
-
-   e = (stbtt__edge *) STBTT_malloc(sizeof(*e) * (n+1), userdata); // add an extra one as a sentinel
-   if (e == 0) return;
-   n = 0;
-
-   m=0;
-   for (i=0; i < windings; ++i) {
-      stbtt__point *p = pts + m;
-      m += wcount[i];
-      j = wcount[i]-1;
-      for (k=0; k < wcount[i]; j=k++) {
-         int a=k,b=j;
-         // skip the edge if horizontal
-         if (p[j].y == p[k].y)
-            continue;
-         // add edge from j to k to the list
-         e[n].invert = 0;
-         if (invert ? p[j].y > p[k].y : p[j].y < p[k].y) {
-            e[n].invert = 1;
-            a=j,b=k;
-         }
-         e[n].x0 = p[a].x * scale_x;
-         e[n].y0 = p[a].y * y_scale_inv * vsubsample;
-         e[n].x1 = p[b].x * scale_x;
-         e[n].y1 = p[b].y * y_scale_inv * vsubsample;
-         ++n;
-      }
-   }
-
-   // now sort the edges by their highest point (should snap to integer, and then by x)
-   STBTT_sort(e, n, sizeof(e[0]), stbtt__edge_compare);
-
-   // now, traverse the scanlines and find the intersections on each scanline, use xor winding rule
-   stbtt__rasterize_sorted_edges(result, e, n, vsubsample, off_x, off_y, userdata);
-
-   STBTT_free(e, userdata);
-}
-
-static void stbtt__add_point(stbtt__point *points, int n, float x, float y)
-{
-   if (!points) return; // during first pass, it's unallocated
-   points[n].x = x;
-   points[n].y = y;
-}
-
-// tesselate until threshhold p is happy... @TODO warped to compensate for non-linear stretching
-static int stbtt__tesselate_curve(stbtt__point *points, int *num_points, float x0, float y0, float x1, float y1, float x2, float y2, float objspace_flatness_squared, int n)
-{
-   // midpoint
-   float mx = (x0 + 2*x1 + x2)/4;
-   float my = (y0 + 2*y1 + y2)/4;
-   // versus directly drawn line
-   float dx = (x0+x2)/2 - mx;
-   float dy = (y0+y2)/2 - my;
-   if (n > 16) // 65536 segments on one curve better be enough!
-      return 1;
-   if (dx*dx+dy*dy > objspace_flatness_squared) { // half-pixel error allowed... need to be smaller if AA
-      stbtt__tesselate_curve(points, num_points, x0,y0, (x0+x1)/2.0f,(y0+y1)/2.0f, mx,my, objspace_flatness_squared,n+1);
-      stbtt__tesselate_curve(points, num_points, mx,my, (x1+x2)/2.0f,(y1+y2)/2.0f, x2,y2, objspace_flatness_squared,n+1);
-   } else {
-      stbtt__add_point(points, *num_points,x2,y2);
-      *num_points = *num_points+1;
-   }
-   return 1;
-}
-
-// returns number of contours
-stbtt__point *stbtt_FlattenCurves(stbtt_vertex *vertices, int num_verts, float objspace_flatness, int **contour_lengths, int *num_contours, void *userdata)
-{
-   stbtt__point *points=0;
-   int num_points=0;
-
-   float objspace_flatness_squared = objspace_flatness * objspace_flatness;
-   int i,n=0,start=0, pass;
-
-   // count how many "moves" there are to get the contour count
-   for (i=0; i < num_verts; ++i)
-      if (vertices[i].type == STBTT_vmove)
-         ++n;
-
-   *num_contours = n;
-   if (n == 0) return 0;
-
-   *contour_lengths = (int *) STBTT_malloc(sizeof(**contour_lengths) * n, userdata);
-
-   if (*contour_lengths == 0) {
-      *num_contours = 0;
-      return 0;
-   }
-
-   // make two passes through the points so we don't need to realloc
-   for (pass=0; pass < 2; ++pass) {
-      float x=0,y=0;
-      if (pass == 1) {
-         points = (stbtt__point *) STBTT_malloc(num_points * sizeof(points[0]), userdata);
-         if (points == NULL) goto error;
-      }
-      num_points = 0;
-      n= -1;
-      for (i=0; i < num_verts; ++i) {
-         switch (vertices[i].type) {
-            case STBTT_vmove:
-               // start the next contour
-               if (n >= 0)
-                  (*contour_lengths)[n] = num_points - start;
-               ++n;
-               start = num_points;
-
-               x = vertices[i].x, y = vertices[i].y;
-               stbtt__add_point(points, num_points++, x,y);
-               break;
-            case STBTT_vline:
-               x = vertices[i].x, y = vertices[i].y;
-               stbtt__add_point(points, num_points++, x, y);
-               break;
-            case STBTT_vcurve:
-               stbtt__tesselate_curve(points, &num_points, x,y,
-                                        vertices[i].cx, vertices[i].cy,
-                                        vertices[i].x,  vertices[i].y,
-                                        objspace_flatness_squared, 0);
-               x = vertices[i].x, y = vertices[i].y;
-               break;
-         }
-      }
-      (*contour_lengths)[n] = num_points - start;
-   }
-
-   return points;
-error:
-   STBTT_free(points, userdata);
-   STBTT_free(*contour_lengths, userdata);
-   *contour_lengths = 0;
-   *num_contours = 0;
-   return NULL;
-}
-
-void stbtt_Rasterize(stbtt__bitmap *result, float flatness_in_pixels, stbtt_vertex *vertices, int num_verts, float scale_x, float scale_y, int x_off, int y_off, int invert, void *userdata)
-{
-   float scale = scale_x > scale_y ? scale_y : scale_x;
-   int winding_count, *winding_lengths;
-   stbtt__point *windings = stbtt_FlattenCurves(vertices, num_verts, flatness_in_pixels / scale, &winding_lengths, &winding_count, userdata);
-   if (windings) {
-      stbtt__rasterize(result, windings, winding_lengths, winding_count, scale_x, scale_y, x_off, y_off, invert, userdata);
-      STBTT_free(winding_lengths, userdata);
-      STBTT_free(windings, userdata);
-   }
-}
-
-void stbtt_FreeBitmap(unsigned char *bitmap, void *userdata)
-{
-   STBTT_free(bitmap, userdata);
-}
-
-unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff)
-{
-   int ix0,iy0,ix1,iy1;
-   stbtt__bitmap gbm;
-   stbtt_vertex *vertices;   
-   int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices);
-
-   if (scale_x == 0) scale_x = scale_y;
-   if (scale_y == 0) {
-      if (scale_x == 0) return NULL;
-      scale_y = scale_x;
-   }
-
-   stbtt_GetGlyphBitmapBox(info, glyph, scale_x, scale_y, &ix0,&iy0,&ix1,&iy1);
-
-   // now we get the size
-   gbm.w = (ix1 - ix0);
-   gbm.h = (iy1 - iy0);
-   gbm.pixels = NULL; // in case we error
-
-   if (width ) *width  = gbm.w;
-   if (height) *height = gbm.h;
-   if (xoff  ) *xoff   = ix0;
-   if (yoff  ) *yoff   = iy0;
-   
-   if (gbm.w && gbm.h) {
-      gbm.pixels = (unsigned char *) STBTT_malloc(gbm.w * gbm.h, info->userdata);
-      if (gbm.pixels) {
-         gbm.stride = gbm.w;
-
-         stbtt_Rasterize(&gbm, 0.35f, vertices, num_verts, scale_x, scale_y, ix0, iy0, 1, info->userdata);
-      }
-   }
-   STBTT_free(vertices, info->userdata);
-   return gbm.pixels;
-}   
-
-void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int glyph)
-{
-   int ix0,iy0;
-   stbtt_vertex *vertices;   
-   int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices);
-   stbtt__bitmap gbm;   
-
-   stbtt_GetGlyphBitmapBox(info, glyph, scale_x, scale_y, &ix0,&iy0,0,0);
-   gbm.pixels = output;
-   gbm.w = out_w;
-   gbm.h = out_h;
-   gbm.stride = out_stride;
-
-   if (gbm.w && gbm.h)
-      stbtt_Rasterize(&gbm, 0.35f, vertices, num_verts, scale_x, scale_y, ix0,iy0, 1, info->userdata);
-
-   STBTT_free(vertices, info->userdata);
-}
-
-unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff)
-{
-   return stbtt_GetGlyphBitmap(info, scale_x, scale_y, stbtt_FindGlyphIndex(info,codepoint), width,height,xoff,yoff);
-}   
-
-void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint)
-{
-   stbtt_MakeGlyphBitmap(info, output, out_w, out_h, out_stride, scale_x, scale_y, stbtt_FindGlyphIndex(info,codepoint));
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// bitmap baking
-//
-// This is SUPER-SHITTY packing to keep source code small
-
-extern int stbtt_BakeFontBitmap(const unsigned char *data, int offset,  // font location (use offset=0 for plain .ttf)
-                                float pixel_height,                     // height of font in pixels
-                                unsigned char *pixels, int pw, int ph,  // bitmap to be filled in
-                                int first_char, int num_chars,          // characters to bake
-                                stbtt_bakedchar *chardata)
-{
-   float scale;
-   int x,y,bottom_y, i;
-   stbtt_fontinfo f;
-   stbtt_InitFont(&f, data, offset);
-   STBTT_memset(pixels, 0, pw*ph); // background of 0 around pixels
-   x=y=1;
-   bottom_y = 1;
-
-   scale = stbtt_ScaleForPixelHeight(&f, pixel_height);
-
-   for (i=0; i < num_chars; ++i) {
-      int advance, lsb, x0,y0,x1,y1,gw,gh;
-      int g = stbtt_FindGlyphIndex(&f, first_char + i);
-      stbtt_GetGlyphHMetrics(&f, g, &advance, &lsb);
-      stbtt_GetGlyphBitmapBox(&f, g, scale,scale, &x0,&y0,&x1,&y1);
-      gw = x1-x0;
-      gh = y1-y0;
-      if (x + gw + 1 >= pw)
-         y = bottom_y, x = 1; // advance to next row
-      if (y + gh + 1 >= ph) // check if it fits vertically AFTER potentially moving to next row
-         return -i;
-      STBTT_assert(x+gw < pw);
-      STBTT_assert(y+gh < ph);
-      stbtt_MakeGlyphBitmap(&f, pixels+x+y*pw, gw,gh,pw, scale,scale, g);
-      chardata[i].x0 = (stbtt_int16) x;
-      chardata[i].y0 = (stbtt_int16) y;
-      chardata[i].x1 = (stbtt_int16) (x + gw);
-      chardata[i].y1 = (stbtt_int16) (y + gh);
-      chardata[i].xadvance = scale * advance;
-      chardata[i].xoff     = (float) x0;
-      chardata[i].yoff     = (float) y0;
-      x = x + gw + 2;
-      if (y+gh+2 > bottom_y)
-         bottom_y = y+gh+2;
-   }
-   return bottom_y;
-}
-
-void stbtt_GetBakedQuad(stbtt_bakedchar *chardata, int pw, int ph, int char_index, float *xpos, float *ypos, stbtt_aligned_quad *q, int opengl_fillrule)
-{
-   float d3d_bias = opengl_fillrule ? 0 : -0.5f;
-   float ipw = 1.0f / pw, iph = 1.0f / ph;
-   stbtt_bakedchar *b = chardata + char_index;
-   int round_x = STBTT_ifloor((*xpos + b->xoff) + 0.5);
-   int round_y = STBTT_ifloor((*ypos + b->yoff) + 0.5);
-
-   q->x0 = round_x + d3d_bias;
-   q->y0 = round_y + d3d_bias;
-   q->x1 = round_x + b->x1 - b->x0 + d3d_bias;
-   q->y1 = round_y + b->y1 - b->y0 + d3d_bias;
-
-   q->s0 = b->x0 * ipw;
-   q->t0 = b->y0 * ipw;
-   q->s1 = b->x1 * iph;
-   q->t1 = b->y1 * iph;
-
-   *xpos += b->xadvance;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// font name matching -- recommended not to use this
-//
-
-// check if a utf8 string contains a prefix which is the utf16 string; if so return length of matching utf8 string
-static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(stbtt_uint8 *s1, stbtt_int32 len1, stbtt_uint8 *s2, stbtt_int32 len2) 
-{
-   stbtt_int32 i=0;
-
-   // convert utf16 to utf8 and compare the results while converting
-   while (len2) {
-      stbtt_uint16 ch = s2[0]*256 + s2[1];
-      if (ch < 0x80) {
-         if (i >= len1) return -1;
-         if (s1[i++] != ch) return -1;
-      } else if (ch < 0x800) {
-         if (i+1 >= len1) return -1;
-         if (s1[i++] != 0xc0 + (ch >> 6)) return -1;
-         if (s1[i++] != 0x80 + (ch & 0x3f)) return -1;
-      } else if (ch >= 0xd800 && ch < 0xdc00) {
-         stbtt_uint32 c;
-         stbtt_uint16 ch2 = s2[2]*256 + s2[3];
-         if (i+3 >= len1) return -1;
-         c = ((ch - 0xd800) << 10) + (ch2 - 0xdc00) + 0x10000;
-         if (s1[i++] != 0xf0 + (c >> 18)) return -1;
-         if (s1[i++] != 0x80 + ((c >> 12) & 0x3f)) return -1;
-         if (s1[i++] != 0x80 + ((c >>  6) & 0x3f)) return -1;
-         if (s1[i++] != 0x80 + ((c      ) & 0x3f)) return -1;
-         s2 += 2; // plus another 2 below
-         len2 -= 2;
-      } else if (ch >= 0xdc00 && ch < 0xe000) {
-         return -1;
-      } else {
-         if (i+2 >= len1) return -1;
-         if (s1[i++] != 0xe0 + (ch >> 12)) return -1;
-         if (s1[i++] != 0x80 + ((ch >> 6) & 0x3f)) return -1;
-         if (s1[i++] != 0x80 + ((ch     ) & 0x3f)) return -1;
-      }
-      s2 += 2;
-      len2 -= 2;
-   }
-   return i;
-}
-
-int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2) 
-{
-   return len1 == stbtt__CompareUTF8toUTF16_bigendian_prefix((stbtt_uint8*) s1, len1, (stbtt_uint8*) s2, len2);
-}
-
-// returns results in whatever encoding you request... but note that 2-byte encodings
-// will be BIG-ENDIAN... use stbtt_CompareUTF8toUTF16_bigendian() to compare
-char *stbtt_GetFontNameString(const stbtt_fontinfo *font, int *length, int platformID, int encodingID, int languageID, int nameID)
-{
-   stbtt_int32 i,count,stringOffset;
-   stbtt_uint8 *fc = font->data;
-   stbtt_uint32 offset = font->fontstart;
-   stbtt_uint32 nm = stbtt__find_table(fc, offset, "name");
-   if (!nm) return NULL;
-
-   count = ttUSHORT(fc+nm+2);
-   stringOffset = nm + ttUSHORT(fc+nm+4);
-   for (i=0; i < count; ++i) {
-      stbtt_uint32 loc = nm + 6 + 12 * i;
-      if (platformID == ttUSHORT(fc+loc+0) && encodingID == ttUSHORT(fc+loc+2)
-          && languageID == ttUSHORT(fc+loc+4) && nameID == ttUSHORT(fc+loc+6)) {
-         *length = ttUSHORT(fc+loc+8);
-         return (char *) (fc+stringOffset+ttUSHORT(fc+loc+10));
-      }
-   }
-   return NULL;
-}
-
-static int stbtt__matchpair(stbtt_uint8 *fc, stbtt_uint32 nm, stbtt_uint8 *name, stbtt_int32 nlen, stbtt_int32 target_id, stbtt_int32 next_id)
-{
-   stbtt_int32 i;
-   stbtt_int32 count = ttUSHORT(fc+nm+2);
-   stbtt_int32 stringOffset = nm + ttUSHORT(fc+nm+4);
-
-   for (i=0; i < count; ++i) {
-      stbtt_uint32 loc = nm + 6 + 12 * i;
-      stbtt_int32 id = ttUSHORT(fc+loc+6);
-      if (id == target_id) {
-         // find the encoding
-         stbtt_int32 platform = ttUSHORT(fc+loc+0), encoding = ttUSHORT(fc+loc+2), language = ttUSHORT(fc+loc+4);
-
-         // is this a Unicode encoding?
-         if (platform == 0 || (platform == 3 && encoding == 1) || (platform == 3 && encoding == 10)) {
-            stbtt_int32 slen = ttUSHORT(fc+loc+8), off = ttUSHORT(fc+loc+10);
-
-            // check if there's a prefix match
-            stbtt_int32 matchlen = stbtt__CompareUTF8toUTF16_bigendian_prefix(name, nlen, fc+stringOffset+off,slen);
-            if (matchlen >= 0) {
-               // check for target_id+1 immediately following, with same encoding & language
-               if (i+1 < count && ttUSHORT(fc+loc+12+6) == next_id && ttUSHORT(fc+loc+12) == platform && ttUSHORT(fc+loc+12+2) == encoding && ttUSHORT(fc+loc+12+4) == language) {
-                  stbtt_int32 slen = ttUSHORT(fc+loc+12+8), off = ttUSHORT(fc+loc+12+10);
-                  if (slen == 0) {
-                     if (matchlen == nlen)
-                        return 1;
-                  } else if (matchlen < nlen && name[matchlen] == ' ') {
-                     ++matchlen;
-                     if (stbtt_CompareUTF8toUTF16_bigendian((char*) (name+matchlen), nlen-matchlen, (char*)(fc+stringOffset+off),slen))
-                        return 1;
-                  }
-               } else {
-                  // if nothing immediately following
-                  if (matchlen == nlen)
-                     return 1;
-               }
-            }
-         }
-
-         // @TODO handle other encodings
-      }
-   }
-   return 0;
-}
-
-static int stbtt__matches(stbtt_uint8 *fc, stbtt_uint32 offset, stbtt_uint8 *name, stbtt_int32 flags)
-{
-   stbtt_int32 nlen = STBTT_strlen((char *) name);
-   stbtt_uint32 nm,hd;
-   if (!stbtt__isfont(fc+offset)) return 0;
-
-   // check italics/bold/underline flags in macStyle...
-   if (flags) {
-      hd = stbtt__find_table(fc, offset, "head");
-      if ((ttUSHORT(fc+hd+44) & 7) != (flags & 7)) return 0;
-   }
-
-   nm = stbtt__find_table(fc, offset, "name");
-   if (!nm) return 0;
-
-   if (flags) {
-      // if we checked the macStyle flags, then just check the family and ignore the subfamily
-      if (stbtt__matchpair(fc, nm, name, nlen, 16, -1))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  1, -1))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  3, -1))  return 1;
-   } else {
-      if (stbtt__matchpair(fc, nm, name, nlen, 16, 17))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  1,  2))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  3, -1))  return 1;
-   }
-
-   return 0;
-}
-
-int stbtt_FindMatchingFont(const unsigned char *font_collection, const char *name_utf8, stbtt_int32 flags)
-{
-   stbtt_int32 i;
-   for (i=0;;++i) {
-      stbtt_int32 off = stbtt_GetFontOffsetForIndex(font_collection, i);
-      if (off < 0) return off;
-      if (stbtt__matches((stbtt_uint8 *) font_collection, off, (stbtt_uint8*) name_utf8, flags))
-         return off;
-   }
-}
-
-#endif // STB_TRUETYPE_IMPLEMENTATION
diff --git a/dep/recastnavigation/RecastDemo/Include/ChunkyTriMesh.h b/dep/recastnavigation/RecastDemo/Include/ChunkyTriMesh.h
deleted file mode 100644
index 9be77880f12..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/ChunkyTriMesh.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef CHUNKYTRIMESH_H
-#define CHUNKYTRIMESH_H
-
-struct rcChunkyTriMeshNode
-{
-	float bmin[2], bmax[2];
-	int i, n;
-};
-
-struct rcChunkyTriMesh
-{
-	inline rcChunkyTriMesh() : nodes(0), tris(0) {};
-	inline ~rcChunkyTriMesh() { delete [] nodes; delete [] tris; }
-
-	rcChunkyTriMeshNode* nodes;
-	int nnodes;
-	int* tris;
-	int ntris;
-	int maxTrisPerChunk;
-};
-
-// Creates partitioned triangle mesh (AABB tree),
-// where each node contains at max trisPerChunk triangles.
-bool rcCreateChunkyTriMesh(const float* verts, const int* tris, int ntris,
-						   int trisPerChunk, rcChunkyTriMesh* cm);
-
-// Returns the chunk indices which overlap the input rectable.
-int rcGetChunksOverlappingRect(const rcChunkyTriMesh* cm, float bmin[2], float bmax[2], int* ids, const int maxIds);
-
-// Returns the chunk indices which overlap the input segment.
-int rcGetChunksOverlappingSegment(const rcChunkyTriMesh* cm, float p[2], float q[2], int* ids, const int maxIds);
-
-
-#endif // CHUNKYTRIMESH_H
diff --git a/dep/recastnavigation/RecastDemo/Include/ConvexVolumeTool.h b/dep/recastnavigation/RecastDemo/Include/ConvexVolumeTool.h
deleted file mode 100644
index e3382305d90..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/ConvexVolumeTool.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef CONVEXVOLUMETOOL_H
-#define CONVEXVOLUMETOOL_H
-
-#include "Sample.h"
-
-// Tool to create convex volumess for InputGeom
-
-class ConvexVolumeTool : public SampleTool
-{
-	Sample* m_sample;
-	int m_areaType;
-	float m_boxHeight;
-	float m_boxDescent;
-	
-	static const int MAX_PTS = 12;
-	float m_pts[MAX_PTS*3];
-	int m_npts;
-	int m_hull[MAX_PTS];
-	int m_nhull;
-	
-public:
-	ConvexVolumeTool();
-	~ConvexVolumeTool();
-	
-	virtual int type() { return TOOL_CONVEX_VOLUME; }
-	virtual void init(Sample* sample);
-	virtual void reset();
-	virtual void handleMenu();
-	virtual void handleClick(const float* s, const float* p, bool shift);
-	virtual void handleToggle();
-	virtual void handleStep();
-	virtual void handleUpdate(const float dt);
-	virtual void handleRender();
-	virtual void handleRenderOverlay(double* proj, double* model, int* view);
-};
-
-#endif // CONVEXVOLUMETOOL_H
diff --git a/dep/recastnavigation/RecastDemo/Include/CrowdManager.h b/dep/recastnavigation/RecastDemo/Include/CrowdManager.h
deleted file mode 100644
index faa642361de..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/CrowdManager.h
+++ /dev/null
@@ -1,335 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef CROWDMANAGER_H
-#define CROWDMANAGER_H
-
-#include "DetourNavMeshQuery.h"
-#include "DetourObstacleAvoidance.h"
-#include "ValueHistory.h"
-
-
-class ProximityGrid
-{
-	int m_maxItems;
-	float m_cellSize;
-	float m_invCellSize;
-
-	struct Item
-	{
-		unsigned short id;
-		short x,y;
-		unsigned short next;
-	};
-	Item* m_pool;
-	int m_poolHead;
-	int m_poolSize;
-	
-	unsigned short* m_buckets;
-	int m_bucketsSize;
-	
-	int m_bounds[4];
-	
-public:
-	ProximityGrid();
-	~ProximityGrid();
-	
-	bool init(const int maxItems, const float cellSize);
-	
-	void clear();
-	
-	void addItem(const unsigned short id,
-				 const float minx, const float miny,
-				 const float maxx, const float maxy);
-	
-	int queryItems(const float minx, const float miny,
-				   const float maxx, const float maxy,
-				   unsigned short* ids, const int maxIds) const;
-	
-	int getItemCountAt(const int x, const int y) const;
-	const int* getBounds() const { return m_bounds; }
-	const float getCellSize() const { return m_cellSize; }
-};
-
-
-
-
-static const unsigned int PATHQ_INVALID = 0;
-
-enum PathQueueRequestState
-{
-	PATHQ_STATE_INVALID,
-	PATHQ_STATE_WORKING,
-	PATHQ_STATE_READY,
-};
-
-typedef unsigned int PathQueueRef;
-
-class PathQueue
-{
-	static const int PQ_MAX_PATH = 256;
-	
-	struct PathQuery
-	{
-		// Path find start and end location.
-		float startPos[3], endPos[3];
-		dtPolyRef startRef, endRef;
-		// Result.
-		dtPolyRef path[PQ_MAX_PATH];
-		bool ready;
-		int npath;
-		PathQueueRef ref;
-		const dtQueryFilter* filter; // TODO: This is potentially dangerous!
-		int keepalive;
-	};
-	
-	static const int MAX_QUEUE = 8;
-	PathQuery m_queue[MAX_QUEUE];
-	PathQueueRef m_nextHandle;
-	
-	int m_delay;
-	
-public:
-	PathQueue();
-	~PathQueue();
-	
-	void update(dtNavMeshQuery* navquery);
-	PathQueueRef request(dtPolyRef startRef, dtPolyRef endRef,
-						 const float* startPos, const float* endPos, 
-						 const dtQueryFilter* filter);
-	int getRequestState(PathQueueRef ref);
-	int getPathResult(PathQueueRef ref, dtPolyRef* path, const int maxPath);
-};
-
-
-class PathCorridor
-{
-	float m_pos[3];
-	float m_target[3];
-
-	dtPolyRef* m_path;
-	int m_npath;
-	int m_maxPath;
-	
-public:
-	PathCorridor();
-	~PathCorridor();
-	
-	bool init(const int maxPath);
-	
-	void reset(dtPolyRef ref, const float* pos);
-	
-	int findCorners(float* cornerVerts, unsigned char* cornerFlags,
-					dtPolyRef* cornerPolys, const int maxCorners,
-					dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-
-	void optimizePathVisibility(const float* next, const float pathOptimizationRange,
-								dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-
-	bool optimizePathTopology(dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-
-	void movePosition(const float* npos, dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-	void moveTargetPosition(const float* npos, dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-	
-	void setCorridor(const float* target, const dtPolyRef* polys, const int npolys);
-
-	inline const float* getPos() const { return m_pos; }	
-	inline const float* getTarget() const { return m_target; }
-	
-	inline dtPolyRef getFirstPoly() const { return m_npath ? m_path[0] : 0; }
-	
-	inline const dtPolyRef* getPath() const { return m_path; }
-	inline int getPathCount() const { return m_npath; } 	
-};
-
-
-class LocalBoundary
-{
-	static const int MAX_SEGS = 8;
-	
-	struct Segment
-	{
-		float s[6];	// Segment start/end
-		float d;	// Distance for pruning.
-	};
-	
-	float m_center[3];
-	Segment m_segs[MAX_SEGS];
-	int m_nsegs;
-	
-	void addSegment(const float dist, const float* seg);
-
-public:
-	LocalBoundary();
-	~LocalBoundary();
-
-	void reset();
-	
-	void update(dtPolyRef ref, const float* pos, const float collisionQueryRange,
-				dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-
-	inline const float* getCenter() const { return m_center; }
-	inline int getSegmentCount() const { return m_nsegs; }
-	inline const float* getSegment(int i) const { return m_segs[i].s; }
-};
-
-
-static const int AGENT_MAX_NEIGHBOURS = 6;
-static const int AGENT_MAX_CORNERS = 4;
-static const int AGENT_MAX_TRAIL = 64;
-
-struct Neighbour
-{
-	int idx;
-	float dist;
-};
-
-struct Agent
-{
-	void integrate(const float maxAcc, const float dt);
-	void calcSmoothSteerDirection(float* dir);
-	void calcStraightSteerDirection(float* dir);
-	float getDistanceToGoal(const float range) const;
-	
-	unsigned char active;
-	
-	PathCorridor corridor;
-	LocalBoundary boundary;
-	
-	float maxspeed;
-	float t;
-	float var;
-
-	float collisionQueryRange;
-	float pathOptimizationRange;
-
-	float topologyOptTime;
-	
-	Neighbour neis[AGENT_MAX_NEIGHBOURS];
-	int nneis;
-	
-	float radius, height;
-	float npos[3];
-	float disp[3];
-	float dvel[3];
-	float nvel[3];
-	float vel[3];
-	
-	float cornerVerts[AGENT_MAX_CORNERS*3];
-	unsigned char cornerFlags[AGENT_MAX_CORNERS];
-	dtPolyRef cornerPolys[AGENT_MAX_CORNERS];
-	int ncorners;
-	
-	float opts[3], opte[3];
-	
-	float trail[AGENT_MAX_TRAIL*3];
-	int htrail;
-};
-
-
-enum UpdateFlags
-{
-	CROWDMAN_ANTICIPATE_TURNS = 1,
-	CROWDMAN_USE_VO = 2,
-	CROWDMAN_DRUNK = 4,
-	CROWDMAN_OPTIMIZE_VIS = 8,
-	CROWDMAN_OPTIMIZE_TOPO = 16,
-};
-
-
-class CrowdManager
-{
-	static const int MAX_AGENTS = 128;
-	Agent m_agents[MAX_AGENTS];
-	dtObstacleAvoidanceDebugData* m_vodebug[MAX_AGENTS];
-	
-	dtObstacleAvoidanceQuery* m_obstacleQuery;
-	PathQueue m_pathq;
-	ProximityGrid m_grid;
-	
-	dtPolyRef* m_pathResult;
-	int m_maxPathResult;
-	
-	float m_ext[3];
-	dtQueryFilter m_filter;
-
-	int m_totalTime;
-	int m_rvoTime;
-	int m_sampleCount;
-
-	enum MoveRequestState
-	{
-		MR_TARGET_FAILED,
-		MR_TARGET_VALID,
-		MR_TARGET_REQUESTING,
-		MR_TARGET_WAITING_FOR_PATH,
-		MR_TARGET_ADJUST,
-	};
-	
-	static const int MAX_TEMP_PATH = 32;
-
-	struct MoveRequest
-	{
-		unsigned char state;			// State of the request
-		int idx;						// Agent index
-		dtPolyRef ref;					// Goal ref
-		float pos[3];					// Goal position
-		PathQueueRef pathqRef;			// Path find query ref
-		dtPolyRef aref;					// Goal adjustment ref
-		float apos[3];					// Goal adjustment pos
-		dtPolyRef temp[MAX_TEMP_PATH];	// Adjusted path to the goal
-		int ntemp;
-	};
-	MoveRequest m_moveRequests[MAX_AGENTS];
-	int m_moveRequestCount;
-	
-	int getNeighbours(const float* pos, const float height, const float range,
-					  const Agent* skip, Neighbour* result, const int maxResult);
-
-	void updateTopologyOptimization(const float dt, dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-	void updateMoveRequest(const float dt, dtNavMeshQuery* navquery, const dtQueryFilter* filter);
-
-public:
-	CrowdManager();
-	~CrowdManager();
-	
-	void reset();
-	const Agent* getAgent(const int idx);
-	const int getAgentCount() const;
-	int addAgent(const float* pos, const float radius, const float height, dtNavMeshQuery* navquery);
-	void removeAgent(const int idx);
-	
-	bool requestMoveTarget(const int idx, dtPolyRef ref, const float* pos);
-	bool adjustMoveTarget(const int idx, dtPolyRef ref, const float* pos);
-
-	int getActiveAgents(Agent** agents, const int maxAgents);
-	void update(const float dt, unsigned int flags, dtNavMeshQuery* navquery);
-	
-	const dtQueryFilter* getFilter() const { return &m_filter; }
-	const float* getQueryExtents() const { return m_ext; }
-	
-	const dtObstacleAvoidanceDebugData* getVODebugData(const int idx) const { return m_vodebug[idx]; }	
-	inline int getTotalTime() const { return m_totalTime; }
-	inline int getRVOTime() const { return m_rvoTime; }
-	inline int getSampleCount() const { return m_sampleCount; }
-	const ProximityGrid* getGrid() const { return &m_grid; }
-
-};
-
-
-#endif // CROWDMANAGER_H
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Include/CrowdTool.h b/dep/recastnavigation/RecastDemo/Include/CrowdTool.h
deleted file mode 100644
index 1c69f6e7449..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/CrowdTool.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef CROWDTOOL_H
-#define CROWDTOOL_H
-
-#include "Sample.h"
-#include "DetourNavMesh.h"
-#include "DetourObstacleAvoidance.h"
-#include "ValueHistory.h"
-#include "CrowdManager.h"
-
-// Tool to create crowds.
-
-class CrowdTool : public SampleTool
-{
-	Sample* m_sample;
-	unsigned char m_oldFlags;
-	
-	float m_targetPos[3];
-	dtPolyRef m_targetRef;
-	
-	bool m_expandDebugDraw;
-	bool m_showLabels;
-	bool m_showCorners;
-	bool m_showTargets;
-	bool m_showCollisionSegments;
-	bool m_showPath;
-	bool m_showVO;
-	bool m_showOpt;
-	bool m_showGrid;
-	bool m_showNodes;
-	bool m_showPerfGraph;
-	
-	bool m_expandOptions;
-	bool m_anticipateTurns;
-	bool m_optimizeVis;
-	bool m_optimizeTopo;
-	bool m_useVO;
-	bool m_drunkMove;
-	
-	bool m_run;
-	
-	CrowdManager m_crowd;
-		
-	ValueHistory m_crowdTotalTime;
-	ValueHistory m_crowdRvoTime;
-	ValueHistory m_crowdSampleCount;
-	
-	enum ToolMode
-	{
-		TOOLMODE_CREATE,
-		TOOLMODE_MOVE_TARGET,
-	};
-	ToolMode m_mode;
-	
-public:
-	CrowdTool();
-	~CrowdTool();
-	
-	virtual int type() { return TOOL_CROWD; }
-	virtual void init(Sample* sample);
-	virtual void reset();
-	virtual void handleMenu();
-	virtual void handleClick(const float* s, const float* p, bool shift);
-	virtual void handleToggle();
-	virtual void handleStep();
-	virtual void handleUpdate(const float dt);
-	virtual void handleRender();
-	virtual void handleRenderOverlay(double* proj, double* model, int* view);
-};
-
-#endif // CROWDTOOL_H
diff --git a/dep/recastnavigation/RecastDemo/Include/Debug.h b/dep/recastnavigation/RecastDemo/Include/Debug.h
deleted file mode 100644
index 721fea1175f..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/Debug.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-#ifndef _MMAP_DEBUG_H
-#define _MMAP_DEBUG_H
-
-#include <math.h>
-#include "DetourNavMesh.h"
-#include "Recast.h"
-#include "ChunkyTriMesh.h"
-#include "MeshLoaderObj.h"
-
-//void duReadObjMesh(int mapID, rcInputGeom* geom);
-void duReadNavMesh(char* tile, dtNavMesh* &navMesh);
-int duReadHeightfield(char* tile, rcHeightfield* &hf);
-int duReadCompactHeightfield(char* tile, rcCompactHeightfield* &chf);
-int duReadContourSet(char* tile, rcContourSet* &cs);
-int duReadPolyMesh(char* tile, rcPolyMesh* &mesh);
-int duReadDetailMesh(char* tile, rcPolyMeshDetail* &mesh);
-
-class myMeshLoaderObj
-{
-private:
-	float* m_verts;
-	int* m_tris;
-	float* m_normals;
-	int m_vertCount;
-	int m_triCount;
-	char m_filename[260];
-
-public:
-	myMeshLoaderObj();
-	~myMeshLoaderObj();
-	
-	bool load(const char* fileName);
-
-	inline const float* getVerts() const { return m_verts; }
-	inline const float* getNormals() const { return m_normals; }
-	inline const int* getTris() const { return m_tris; }
-	inline int getVertCount() const { return m_vertCount; }
-	inline int getTriCount() const { return m_triCount; }
-	inline const char* getFileName() const { return m_filename; }
-};
-
-enum NavTerrain
-{
-    NAV_EMPTY   = 0x00,
-    NAV_GROUND  = 0x01,
-    NAV_MAGMA   = 0x02,
-    NAV_SLIME   = 0x04,
-    NAV_WATER   = 0x08,
-    NAV_UNUSED1 = 0x10,
-    NAV_UNUSED2 = 0x20,
-    NAV_UNUSED3 = 0x40,
-    NAV_UNUSED4 = 0x80
-    // we only have 8 bits
-};
-
-struct MmapTileHeader
-{
-    unsigned int mmapMagic;
-    unsigned int dtVersion;
-    unsigned int mmapVersion;
-    unsigned int size;
-    bool usesLiquid : 1;
-};
-
-#endif
diff --git a/dep/recastnavigation/RecastDemo/Include/Filelist.h b/dep/recastnavigation/RecastDemo/Include/Filelist.h
deleted file mode 100644
index 63c85b12206..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/Filelist.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef FILELIST_H
-#define FILELIST_H
-
-struct FileList
-{
-	static const int MAX_FILES = 256;
-	
-	FileList();
-	~FileList();
-	
-	char* files[MAX_FILES];
-	int size;
-};
-
-void scanDirectory(const char* path, const char* ext, FileList& list);
-
-#endif // FILELIST_H
diff --git a/dep/recastnavigation/RecastDemo/Include/InputGeom.h b/dep/recastnavigation/RecastDemo/Include/InputGeom.h
deleted file mode 100644
index 7b93f003651..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/InputGeom.h
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef INPUTGEOM_H
-#define INPUTGEOM_H
-
-#include "ChunkyTriMesh.h"
-#include "MeshLoaderObj.h"
-#include "Debug.h"
-
-static const int MAX_CONVEXVOL_PTS = 12;
-struct ConvexVolume
-{
-	float verts[MAX_CONVEXVOL_PTS*3];
-	float hmin, hmax;
-	int nverts;
-	int area;
-};
-
-class InputGeom
-{
-	rcChunkyTriMesh* m_chunkyMesh;
-	myMeshLoaderObj* m_mesh;
-	float m_meshBMin[3], m_meshBMax[3];
-	
-	// Off-Mesh connections.
-	static const int MAX_OFFMESH_CONNECTIONS = 256;
-	float m_offMeshConVerts[MAX_OFFMESH_CONNECTIONS*3*2];
-	float m_offMeshConRads[MAX_OFFMESH_CONNECTIONS];
-	unsigned char m_offMeshConDirs[MAX_OFFMESH_CONNECTIONS];
-	unsigned char m_offMeshConAreas[MAX_OFFMESH_CONNECTIONS];
-	unsigned short m_offMeshConFlags[MAX_OFFMESH_CONNECTIONS];
-	unsigned int m_offMeshConId[MAX_OFFMESH_CONNECTIONS];
-	int m_offMeshConCount;
-
-	// Convex Volumes.
-	static const int MAX_VOLUMES = 256;
-	ConvexVolume m_volumes[MAX_VOLUMES];
-	int m_volumeCount;
-	
-public:
-	InputGeom();
-	~InputGeom();
-	
-	bool loadMesh(class rcContext* ctx, const char* filepath);
-	
-	bool load(class rcContext* ctx, const char* filepath);
-	bool save(const char* filepath);
-	
-	// Method to return static mesh data.
-	inline const myMeshLoaderObj* getMesh() const { return m_mesh; }
-	inline const float* getMeshBoundsMin() const { return m_meshBMin; }
-	inline const float* getMeshBoundsMax() const { return m_meshBMax; }
-	inline const rcChunkyTriMesh* getChunkyMesh() const { return m_chunkyMesh; }
-	bool raycastMesh(float* src, float* dst, float& tmin);
-
-	// Off-Mesh connections.
-	int getOffMeshConnectionCount() const { return m_offMeshConCount; }
-	const float* getOffMeshConnectionVerts() const { return m_offMeshConVerts; }
-	const float* getOffMeshConnectionRads() const { return m_offMeshConRads; }
-	const unsigned char* getOffMeshConnectionDirs() const { return m_offMeshConDirs; }
-	const unsigned char* getOffMeshConnectionAreas() const { return m_offMeshConAreas; }
-	const unsigned short* getOffMeshConnectionFlags() const { return m_offMeshConFlags; }
-	const unsigned int* getOffMeshConnectionId() const { return m_offMeshConId; }
-	void addOffMeshConnection(const float* spos, const float* epos, const float rad,
-							  unsigned char bidir, unsigned char area, unsigned short flags);
-	void deleteOffMeshConnection(int i);
-	void drawOffMeshConnections(struct duDebugDraw* dd, bool hilight = false);
-
-	// Box Volumes.
-	int getConvexVolumeCount() const { return m_volumeCount; }
-	const ConvexVolume* getConvexVolumes() const { return m_volumes; }
-	void addConvexVolume(const float* verts, const int nverts,
-						 const float minh, const float maxh, unsigned char area);
-	void deleteConvexVolume(int i);
-	void drawConvexVolumes(struct duDebugDraw* dd, bool hilight = false);
-};
-
-#endif // INPUTGEOM_H
diff --git a/dep/recastnavigation/RecastDemo/Include/MeshLoaderObj.h b/dep/recastnavigation/RecastDemo/Include/MeshLoaderObj.h
deleted file mode 100644
index 8e13e495975..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/MeshLoaderObj.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef MESHLOADER_OBJ
-#define MESHLOADER_OBJ
-
-class rcMeshLoaderObj
-{
-public:
-	rcMeshLoaderObj();
-	~rcMeshLoaderObj();
-	
-	bool load(const char* fileName);
-
-	inline const float* getVerts() const { return m_verts; }
-	inline const float* getNormals() const { return m_normals; }
-	inline const int* getTris() const { return m_tris; }
-	inline int getVertCount() const { return m_vertCount; }
-	inline int getTriCount() const { return m_triCount; }
-	inline const char* getFileName() const { return m_filename; }
-
-private:
-	
-	void addVertex(float x, float y, float z, int& cap);
-	void addTriangle(int a, int b, int c, int& cap);
-	
-	char m_filename[260];
-	
-	float* m_verts;
-	int* m_tris;
-	float* m_normals;
-	int m_vertCount;
-	int m_triCount;
-};
-
-#endif // MESHLOADER_OBJ
diff --git a/dep/recastnavigation/RecastDemo/Include/NavMeshTesterTool.h b/dep/recastnavigation/RecastDemo/Include/NavMeshTesterTool.h
deleted file mode 100644
index 51f16f7dac4..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/NavMeshTesterTool.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef NAVMESHTESTERTOOL_H
-#define NAVMESHTESTERTOOL_H
-
-#include "Sample.h"
-#include "DetourNavMesh.h"
-#include "DetourNavMeshQuery.h"
-
-class NavMeshTesterTool : public SampleTool
-{
-	Sample* m_sample;
-	
-	dtNavMesh* m_navMesh;
-	dtNavMeshQuery* m_navQuery;
-
-	dtQueryFilter m_filter;
-
-	dtStatus m_pathFindStatus;
-
-	enum ToolMode
-	{
-		TOOLMODE_PATHFIND_FOLLOW,
-		TOOLMODE_PATHFIND_STRAIGHT,
-		TOOLMODE_PATHFIND_SLICED,
-		TOOLMODE_RAYCAST,
-		TOOLMODE_DISTANCE_TO_WALL,
-		TOOLMODE_FIND_POLYS_IN_CIRCLE,
-		TOOLMODE_FIND_POLYS_IN_SHAPE,
-		TOOLMODE_FIND_LOCAL_NEIGHBOURHOOD,
-	};
-	
-	ToolMode m_toolMode;
-	
-	static const int MAX_POLYS = 256;
-	static const int MAX_SMOOTH = 2048;
-	
-	dtPolyRef m_startRef;
-	dtPolyRef m_endRef;
-	dtPolyRef m_polys[MAX_POLYS];
-	dtPolyRef m_parent[MAX_POLYS];
-	int m_npolys;
-	float m_straightPath[MAX_POLYS*3];
-	unsigned char m_straightPathFlags[MAX_POLYS];
-	dtPolyRef m_straightPathPolys[MAX_POLYS];
-	int m_nstraightPath;
-	float m_polyPickExt[3];
-	float m_smoothPath[MAX_SMOOTH*3];
-	int m_nsmoothPath;
-	float m_queryPoly[4*3];
-	
-	float m_spos[3];
-	float m_epos[3];
-	float m_hitPos[3];
-	float m_hitNormal[3];
-	bool m_hitResult;
-	float m_distanceToWall;
-	float m_neighbourhoodRadius;
-	bool m_sposSet;
-	bool m_eposSet;
-
-	int m_pathIterNum;
-	dtPolyRef m_pathIterPolys[MAX_POLYS]; 
-	int m_pathIterPolyCount;
-	float m_prevIterPos[3], m_iterPos[3], m_steerPos[3], m_targetPos[3];
-	
-	static const int MAX_STEER_POINTS = 10;
-	float m_steerPoints[MAX_STEER_POINTS*3];
-	int m_steerPointCount;
-	
-public:
-	NavMeshTesterTool();
-	~NavMeshTesterTool();
-
-	virtual int type() { return TOOL_NAVMESH_TESTER; }
-	virtual void init(Sample* sample);
-	virtual void reset();
-	virtual void handleMenu();
-	virtual void handleClick(const float* s, const float* p, bool shift);
-	virtual void handleToggle();
-	virtual void handleStep();
-	virtual void handleUpdate(const float dt);
-	virtual void handleRender();
-	virtual void handleRenderOverlay(double* proj, double* model, int* view);
-
-	void recalc();
-	void drawAgent(const float* pos, float r, float h, float c, const unsigned int col);
-};
-
-#endif // NAVMESHTESTERTOOL_H
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Include/OffMeshConnectionTool.h b/dep/recastnavigation/RecastDemo/Include/OffMeshConnectionTool.h
deleted file mode 100644
index 1b5aefbf9a3..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/OffMeshConnectionTool.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef OFFMESHCONNECTIONTOOL_H
-#define OFFMESHCONNECTIONTOOL_H
-
-#include "Sample.h"
-
-// Tool to create off-mesh connection for InputGeom
-
-class OffMeshConnectionTool : public SampleTool
-{
-	Sample* m_sample;
-	float m_hitPos[3];
-	bool m_hitPosSet;
-	bool m_bidir;
-	unsigned char m_oldFlags;
-	
-public:
-	OffMeshConnectionTool();
-	~OffMeshConnectionTool();
-	
-	virtual int type() { return TOOL_OFFMESH_CONNECTION; }
-	virtual void init(Sample* sample);
-	virtual void reset();
-	virtual void handleMenu();
-	virtual void handleClick(const float* s, const float* p, bool shift);
-	virtual void handleToggle();
-	virtual void handleStep();
-	virtual void handleUpdate(const float dt);
-	virtual void handleRender();
-	virtual void handleRenderOverlay(double* proj, double* model, int* view);
-};
-
-#endif // OFFMESHCONNECTIONTOOL_H
diff --git a/dep/recastnavigation/RecastDemo/Include/PerfTimer.h b/dep/recastnavigation/RecastDemo/Include/PerfTimer.h
deleted file mode 100644
index a5de026f521..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/PerfTimer.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef PERFTIMER_H
-#define PERFTIMER_H
-
-#ifdef __GNUC__
-#include <stdint.h>
-typedef int64_t TimeVal;
-#else
-typedef __int64 TimeVal;
-#endif
-
-TimeVal getPerfTime();
-int getPerfDeltaTimeUsec(const TimeVal start, const TimeVal end);
-
-#endif // PERFTIMER_H
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Include/SDLMain.h b/dep/recastnavigation/RecastDemo/Include/SDLMain.h
deleted file mode 100644
index 4683df57a5e..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/SDLMain.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*   SDLMain.m - main entry point for our Cocoa-ized SDL app
-       Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
-       Non-NIB-Code & other changes: Max Horn <max@quendi.de>
-
-    Feel free to customize this file to suit your needs
-*/
-
-#import <Cocoa/Cocoa.h>
-
-@interface SDLMain : NSObject
-@end
diff --git a/dep/recastnavigation/RecastDemo/Include/Sample.h b/dep/recastnavigation/RecastDemo/Include/Sample.h
deleted file mode 100644
index 77fe0ba89cc..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/Sample.h
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef RECASTSAMPLE_H
-#define RECASTSAMPLE_H
-
-#include <string.h>
-
-#include "Recast.h"
-#include "SampleInterfaces.h"
-
-
-// Tool types.
-enum SampleToolType
-{
-	TOOL_NONE = 0,
-	TOOL_TILE_EDIT,
-	TOOL_TILE_HIGHLIGHT,
-	TOOL_NAVMESH_TESTER,
-	TOOL_OFFMESH_CONNECTION,
-	TOOL_CONVEX_VOLUME,
-	TOOL_CROWD,
-};
-
-// These are just sample areas to use consistent values across the samples.
-// The use should specify these base on his needs.
-enum SamplePolyAreas
-{
-	SAMPLE_POLYAREA_GROUND,
-	SAMPLE_POLYAREA_WATER,
-	SAMPLE_POLYAREA_ROAD,
-	SAMPLE_POLYAREA_DOOR,
-	SAMPLE_POLYAREA_GRASS,
-	SAMPLE_POLYAREA_JUMP,
-};
-enum SamplePolyFlags
-{
-	SAMPLE_POLYFLAGS_WALK = 0x01,		// Ability to walk (ground, grass, road)
-	SAMPLE_POLYFLAGS_SWIM = 0x02,		// Ability to swim (water).
-	SAMPLE_POLYFLAGS_DOOR = 0x04,		// Ability to move through doors.
-	SAMPLE_POLYFLAGS_JUMP = 0x08,		// Ability to jump.
-	SAMPLE_POLYFLAGS_ALL = 0xffff		// All abilities.
-};
-
-struct SampleTool
-{
-	virtual ~SampleTool() {}
-	virtual int type() = 0;
-	virtual void init(class Sample* sample) = 0;
-	virtual void reset() = 0;
-	virtual void handleMenu() = 0;
-	virtual void handleClick(const float* s, const float* p, bool shift) = 0;
-	virtual void handleRender() = 0;
-	virtual void handleRenderOverlay(double* proj, double* model, int* view) = 0;
-	virtual void handleToggle() = 0;
-	virtual void handleStep() = 0;
-	virtual void handleUpdate(const float dt) = 0;
-};
-
-
-class Sample
-{
-protected:
-	class InputGeom* m_geom;
-	class dtNavMesh* m_navMesh;
-	class dtNavMeshQuery* m_navQuery;
-	unsigned char m_navMeshDrawFlags;
-
-	float m_cellSize;
-	float m_cellHeight;
-	float m_agentHeight;
-	float m_agentRadius;
-	float m_agentMaxClimb;
-	float m_agentMaxSlope;
-	float m_regionMinSize;
-	float m_regionMergeSize;
-	float m_edgeMaxLen;
-	float m_edgeMaxError;
-	float m_vertsPerPoly;
-	float m_detailSampleDist;
-	float m_detailSampleMaxError;
-	
-	SampleTool* m_tool;
-	
-	BuildContext* m_ctx;
-    
-    char m_meshName[128];
-	
-public:
-	Sample();
-	virtual ~Sample();
-	
-	void setContext(BuildContext* ctx) { m_ctx = ctx; }
-	
-	void setTool(SampleTool* tool);
-	
-	virtual void handleSettings();
-	virtual void handleTools();
-	virtual void handleDebugMode();
-	virtual void handleClick(const float* s, const float* p, bool shift);
-	virtual void handleToggle();
-	virtual void handleStep();
-	virtual void handleRender();
-	virtual void handleRenderOverlay(double* proj, double* model, int* view);
-	virtual void handleMeshChanged(class InputGeom* geom);
-	virtual bool handleBuild();
-	virtual void handleUpdate(const float dt);
-
-	virtual class InputGeom* getInputGeom() { return m_geom; }
-	virtual class dtNavMesh* getNavMesh() { return m_navMesh; }
-	virtual class dtNavMeshQuery* getNavMeshQuery() { return m_navQuery; }
-	virtual float getAgentRadius() { return m_agentRadius; }
-	virtual float getAgentHeight() { return m_agentHeight; }
-	virtual float getAgentClimb() { return m_agentMaxClimb; }
-	virtual const float* getBoundsMin();
-	virtual const float* getBoundsMax();
-	
-	inline unsigned char getNavMeshDrawFlags() const { return m_navMeshDrawFlags; }
-	inline void setNavMeshDrawFlags(unsigned char flags) { m_navMeshDrawFlags = flags; }
-
-	void resetCommonSettings();
-	void handleCommonSettings();
-    
-    inline void setMeshName(char* meshName) { memcpy(m_meshName, meshName, 128*sizeof(char)); }
-    inline char* getMeshName() { return m_meshName; }
-};
-
-
-#endif // RECASTSAMPLE_H
diff --git a/dep/recastnavigation/RecastDemo/Include/SampleInterfaces.h b/dep/recastnavigation/RecastDemo/Include/SampleInterfaces.h
deleted file mode 100644
index bacbb20510a..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/SampleInterfaces.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef SAMPLEINTERFACES_H
-#define SAMPLEINTERFACES_H
-
-#include "DebugDraw.h"
-#include "Recast.h"
-#include "RecastDump.h"
-#include "PerfTimer.h"
-
-// These are example implementations of various interfaces used in Recast and Detour.
-
-// Recast build context.
-class BuildContext : public rcContext
-{
-	TimeVal m_startTime[RC_MAX_TIMERS];
-	int m_accTime[RC_MAX_TIMERS];
-
-	static const int MAX_MESSAGES = 1000;
-	const char* m_messages[MAX_MESSAGES];
-	int m_messageCount;
-	static const int TEXT_POOL_SIZE = 8000;
-	char m_textPool[TEXT_POOL_SIZE];
-	int m_textPoolSize;
-	
-public:
-	BuildContext();
-	virtual ~BuildContext();
-	
-	// Dumps the log to stdout.
-	void dumpLog(const char* format, ...);
-	// Returns number of log messages.
-	int getLogCount() const;
-	// Returns log message text.
-	const char* getLogText(const int i) const;
-	
-protected:	
-	// Virtual functions for custom implementations.
-	virtual void doResetLog();
-	virtual void doLog(const rcLogCategory /*category*/, const char* /*msg*/, const int /*len*/);
-	virtual void doResetTimers();
-	virtual void doStartTimer(const rcTimerLabel /*label*/);
-	virtual void doStopTimer(const rcTimerLabel /*label*/);
-	virtual int doGetAccumulatedTime(const rcTimerLabel /*label*/) const;
-};
-
-// OpenGL debug draw implementation.
-class DebugDrawGL : public duDebugDraw
-{
-public:
-	virtual void depthMask(bool state);
-	virtual void begin(duDebugDrawPrimitives prim, float size = 1.0f);
-	virtual void vertex(const float* pos, unsigned int color);
-	virtual void vertex(const float x, const float y, const float z, unsigned int color);
-	virtual void end();
-};
-
-// stdio file implementation.
-class FileIO : public duFileIO
-{
-	FILE* m_fp;
-	int m_mode;
-public:
-	FileIO();
-	virtual ~FileIO();
-	bool openForWrite(const char* path);
-	bool openForRead(const char* path);
-	virtual bool isWriting() const;
-	virtual bool isReading() const;
-	virtual bool write(const void* ptr, const size_t size);
-	virtual bool read(void* ptr, const size_t size);
-};
-
-#endif // SAMPLEINTERFACES_H
-
diff --git a/dep/recastnavigation/RecastDemo/Include/Sample_Debug.h b/dep/recastnavigation/RecastDemo/Include/Sample_Debug.h
deleted file mode 100644
index 8dfacc9b90a..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/Sample_Debug.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef RECASTSAMPLEDEBUG_H
-#define RECASTSAMPLEDEBUG_H
-
-#include "Sample_SoloMeshTiled.h"
-#include "DetourNavMesh.h"
-#include "Recast.h"
-
-// Sample used for random debugging.
-class Sample_Debug : public Sample_SoloMeshTiled
-{
-protected:
-    int m_hfCount;
-    rcHeightfield* m_hf;
-
-    int m_chfCount;
-	rcCompactHeightfield* m_chf;
-	rcContourSet* m_cset;
-	
-    int m_csetCount;
-
-    int m_pmeshCount;
-    rcPolyMesh* m_pmeshes;
-
-    int m_dmeshCount;
-    rcPolyMeshDetail* m_dmeshes;
-
-	float m_ext[3];
-	float m_center[3];
-	float m_bmin[3], m_bmax[3];
-	dtPolyRef m_ref;
-	
-public:
-    virtual void cleanup();
-	Sample_Debug();
-	virtual ~Sample_Debug();
-	
-	virtual void handleSettings();
-	virtual void handleTools();
-	virtual void handleDebugMode();
-	virtual void handleClick(const float* p, bool shift);
-	virtual void handleToggle();
-	virtual void handleRender();
-	virtual void handleRenderOverlay(double* proj, double* model, int* view);
-	virtual void handleMeshChanged(class InputGeom* geom);
-	virtual bool handleBuild();
-    virtual void setHighlightedTile(const float* pos);
-    
-	virtual const float* getBoundsMin();
-	virtual const float* getBoundsMax();
-};
-
-
-#endif // RECASTSAMPLE_H
diff --git a/dep/recastnavigation/RecastDemo/Include/Sample_SoloMeshSimple.h b/dep/recastnavigation/RecastDemo/Include/Sample_SoloMeshSimple.h
deleted file mode 100644
index f9ce5d3e8c8..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/Sample_SoloMeshSimple.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef RECASTSAMPLESOLOMESHSIMPLE_H
-#define RECASTSAMPLESOLOMESHSIMPLE_H
-
-#include "Sample.h"
-#include "DetourNavMesh.h"
-#include "Recast.h"
-
-class Sample_SoloMeshSimple : public Sample
-{
-protected:
-	bool m_keepInterResults;
-	float m_totalBuildTimeMs;
-
-	unsigned char* m_triareas;
-	rcHeightfield* m_solid;
-	rcCompactHeightfield* m_chf;
-	rcContourSet* m_cset;
-	rcPolyMesh* m_pmesh;
-	rcConfig m_cfg;	
-	rcPolyMeshDetail* m_dmesh;
-	
-	enum DrawMode
-	{
-		DRAWMODE_NAVMESH,
-		DRAWMODE_NAVMESH_TRANS,
-		DRAWMODE_NAVMESH_BVTREE,
-		DRAWMODE_NAVMESH_NODES,
-		DRAWMODE_NAVMESH_INVIS,
-		DRAWMODE_MESH,
-		DRAWMODE_VOXELS,
-		DRAWMODE_VOXELS_WALKABLE,
-		DRAWMODE_COMPACT,
-		DRAWMODE_COMPACT_DISTANCE,
-		DRAWMODE_COMPACT_REGIONS,
-		DRAWMODE_REGION_CONNECTIONS,
-		DRAWMODE_RAW_CONTOURS,
-		DRAWMODE_BOTH_CONTOURS,
-		DRAWMODE_CONTOURS,
-		DRAWMODE_POLYMESH,
-		DRAWMODE_POLYMESH_DETAIL,
-		MAX_DRAWMODE
-	};
-	
-	DrawMode m_drawMode;
-	
-	void cleanup();
-		
-public:
-	Sample_SoloMeshSimple();
-	virtual ~Sample_SoloMeshSimple();
-	
-	virtual void handleSettings();
-	virtual void handleTools();
-	virtual void handleDebugMode();
-	
-	virtual void handleRender();
-	virtual void handleRenderOverlay(double* proj, double* model, int* view);
-	virtual void handleMeshChanged(class InputGeom* geom);
-	virtual bool handleBuild();
-};
-
-
-#endif // RECASTSAMPLESOLOMESHSIMPLE_H
diff --git a/dep/recastnavigation/RecastDemo/Include/Sample_SoloMeshTiled.h b/dep/recastnavigation/RecastDemo/Include/Sample_SoloMeshTiled.h
deleted file mode 100644
index 95d4f0a38fb..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/Sample_SoloMeshTiled.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef RECASTSAMPLESOLOMESHTILED_H
-#define RECASTSAMPLESOLOMESHTILED_H
-
-#include "Sample.h"
-#include "DetourNavMesh.h"
-#include "Recast.h"
-#include "ChunkyTriMesh.h"
-
-class Sample_SoloMeshTiled : public Sample
-{
-protected:
-	struct Tile
-	{
-		inline Tile() : chf(0), solid(0), cset(0), pmesh(0), dmesh(0), buildTime(0) {}
-		inline ~Tile()
-		{
-			rcFreeCompactHeightfield(chf);
-			rcFreeContourSet(cset);
-			rcFreeHeightField(solid);
-			rcFreePolyMesh(pmesh);
-			rcFreePolyMeshDetail(dmesh);
-		}
-		int x, y;
-		rcCompactHeightfield* chf;
-		rcHeightfield* solid;
-		rcContourSet* cset;
-		rcPolyMesh* pmesh;
-		rcPolyMeshDetail* dmesh;
-		int buildTime;
-	};
-	
-	struct TileSet
-	{
-		inline TileSet() : width(0), height(0), tiles(0) {}
-		inline ~TileSet() { delete [] tiles; }
-		int width, height;
-		float bmin[3], bmax[3];
-		float cs, ch;
-		Tile* tiles;
-	};
-	
-	bool m_measurePerTileTimings;
-	bool m_keepInterResults;
-	float m_tileSize;
-	float m_totalBuildTimeMs;
-	
-	rcPolyMesh* m_pmesh;
-	rcPolyMeshDetail* m_dmesh;
-	rcConfig m_cfg;	
-	TileSet* m_tileSet;
-
-	static const int MAX_STAT_BUCKETS = 1000;
-	int m_statPolysPerTile[MAX_STAT_BUCKETS];
-	int m_statPolysPerTileSamples;
-	int m_statTimePerTile[MAX_STAT_BUCKETS];
-	int m_statTimePerTileSamples;
-	
-	int m_highLightedTileX, m_highLightedTileY;
-	
-	enum DrawMode
-	{
-		DRAWMODE_NAVMESH,
-		DRAWMODE_NAVMESH_TRANS,
-		DRAWMODE_NAVMESH_BVTREE,
-		DRAWMODE_NAVMESH_NODES,
-		DRAWMODE_NAVMESH_INVIS,
-		DRAWMODE_MESH,
-		DRAWMODE_VOXELS,
-		DRAWMODE_VOXELS_WALKABLE,
-		DRAWMODE_COMPACT,
-		DRAWMODE_COMPACT_DISTANCE,
-		DRAWMODE_COMPACT_REGIONS,
-		DRAWMODE_REGION_CONNECTIONS,
-		DRAWMODE_RAW_CONTOURS,
-		DRAWMODE_BOTH_CONTOURS,
-		DRAWMODE_CONTOURS,
-		DRAWMODE_POLYMESH,
-		DRAWMODE_POLYMESH_DETAIL,
-		MAX_DRAWMODE
-	};
-	
-	DrawMode m_drawMode;
-	
-	void cleanup();
-	bool canDrawTile(int x, int y);
-	
-public:
-	Sample_SoloMeshTiled();
-	virtual ~Sample_SoloMeshTiled();
-	
-	virtual void handleSettings();
-	virtual void handleTools();
-	virtual void handleDebugMode();
-	
-	virtual void handleRender();
-	virtual void handleRenderOverlay(double* proj, double* model, int* view);
-	virtual void handleMeshChanged(class InputGeom* geom);
-	virtual bool handleBuild();
-	
-	void setHighlightedTile(const float* pos);
-	inline int getHilightedTileX() const { return m_highLightedTileX; }
-	inline int getHilightedTileY() const { return m_highLightedTileY; }
-};
-
-
-#endif // RECASTSAMPLESOLOMESHTILED_H
diff --git a/dep/recastnavigation/RecastDemo/Include/Sample_TileMesh.h b/dep/recastnavigation/RecastDemo/Include/Sample_TileMesh.h
deleted file mode 100644
index c010d2a2713..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/Sample_TileMesh.h
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef RECASTSAMPLETILEMESH_H
-#define RECASTSAMPLETILEMESH_H
-
-#include "Sample.h"
-#include "DetourNavMesh.h"
-#include "Recast.h"
-#include "ChunkyTriMesh.h"
-
-class Sample_TileMesh : public Sample
-{
-protected:
-	bool m_keepInterResults;
-	bool m_buildAll;
-	float m_totalBuildTimeMs;
-	bool m_drawPortals;
-
-	unsigned char* m_triareas;
-	rcHeightfield* m_solid;
-	rcCompactHeightfield* m_chf;
-	rcContourSet* m_cset;
-	rcPolyMesh* m_pmesh;
-	rcPolyMeshDetail* m_dmesh;
-	rcConfig m_cfg;	
-	
-	enum DrawMode
-	{
-		DRAWMODE_NAVMESH,
-		DRAWMODE_NAVMESH_TRANS,
-		DRAWMODE_NAVMESH_BVTREE,
-		DRAWMODE_NAVMESH_NODES,
-		DRAWMODE_NAVMESH_PORTALS,
-		DRAWMODE_NAVMESH_INVIS,
-		DRAWMODE_MESH,
-		DRAWMODE_VOXELS,
-		DRAWMODE_VOXELS_WALKABLE,
-		DRAWMODE_COMPACT,
-		DRAWMODE_COMPACT_DISTANCE,
-		DRAWMODE_COMPACT_REGIONS,
-		DRAWMODE_REGION_CONNECTIONS,
-		DRAWMODE_RAW_CONTOURS,
-		DRAWMODE_BOTH_CONTOURS,
-		DRAWMODE_CONTOURS,
-		DRAWMODE_POLYMESH,
-		DRAWMODE_POLYMESH_DETAIL,
-		MAX_DRAWMODE
-	};
-	
-	DrawMode m_drawMode;
-	
-	int m_maxTiles;
-	int m_maxPolysPerTile;
-	float m_tileSize;
-	
-	unsigned int m_tileCol;
-	float m_tileBmin[3];
-	float m_tileBmax[3];
-	float m_tileBuildTime;
-	float m_tileMemUsage;
-	int m_tileTriCount;
-
-	unsigned char* buildTileMesh(const int tx, const int ty, const float* bmin, const float* bmax, int& dataSize);
-	
-	void cleanup();
-	
-	void saveAll(const char* path, const dtNavMesh* mesh);
-	dtNavMesh* loadAll(const char* path);
-	
-public:
-	Sample_TileMesh();
-	virtual ~Sample_TileMesh();
-	
-	virtual void handleSettings();
-	virtual void handleTools();
-	virtual void handleDebugMode();
-	virtual void handleRender();
-	virtual void handleRenderOverlay(double* proj, double* model, int* view);
-	virtual void handleMeshChanged(class InputGeom* geom);
-	virtual bool handleBuild();
-	
-	void getTilePos(const float* pos, int& tx, int& ty);
-	
-	void buildTile(const float* pos);
-	void removeTile(const float* pos);
-	void buildAllTiles();
-	void removeAllTiles();
-};
-
-
-#endif // RECASTSAMPLETILEMESH_H
diff --git a/dep/recastnavigation/RecastDemo/Include/SlideShow.h b/dep/recastnavigation/RecastDemo/Include/SlideShow.h
deleted file mode 100644
index c2f5d16d6c0..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/SlideShow.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef SLIDESHOW_H
-#define SLIDESHOW_H
-
-#include "Filelist.h"
-
-class SlideShow
-{
-	FileList m_files;
-	char m_path[256];
-
-	int m_width;
-	int m_height;
-	unsigned int m_texId;
-
-	void purgeImage();
-	bool loadImage(const char* path);
-
-	bool m_showSlides;
-	bool m_showCurSlide;
-	float m_slideAlpha;
-	int m_curSlide;
-	int m_nextSlide;
-	
-public:
-	SlideShow();
-	~SlideShow();
-
-	bool init(const char* path);
-	void nextSlide();
-	void prevSlide();
-	void setSlide(int n);
-	void updateAndDraw(float dt, const float w, const float h);
-};
-
-#endif // SLIDESHOW_H
diff --git a/dep/recastnavigation/RecastDemo/Include/TestCase.h b/dep/recastnavigation/RecastDemo/Include/TestCase.h
deleted file mode 100644
index 19d1b915e3b..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/TestCase.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef TESTCASE_H
-#define TESTCASE_H
-
-#include "DetourNavMesh.h"
-
-class TestCase
-{
-	enum TestType
-	{
-		TEST_PATHFIND,
-	};
-	
-	struct Test
-	{
-		Test() : straight(0), nstraight(0), polys(0), npolys(0) {};
-		~Test()
-		{
-			delete [] straight;
-			delete [] polys;
-		}
-		
-		TestType type;
-		float spos[3], epos[3];
-		float radius;
-		int includeFlags, excludeFlags;
-		bool expand;
-		
-		float* straight;
-		int nstraight;
-		dtPolyRef* polys;
-		int npolys;
-		
-		int findNearestPolyTime;
-		int findPathTime;
-		int findStraightPathTime;
-		
-		Test* next;
-	};
-
-	char m_sampleName[256];
-	char m_geomFileName[256];
-	Test* m_tests;
-	
-	void resetTimes();
-	
-public:
-	TestCase();
-	~TestCase();
-
-	bool load(const char* filePath);
-	
-	inline const char* getSampleName() const { return m_sampleName; }
-	inline const char* getGeomFileName() const { return m_geomFileName; }
-	
-	void doTests(class dtNavMesh* navmesh, class dtNavMeshQuery* navquery);
-	
-	void handleRender();
-	bool handleRenderOverlay(double* proj, double* model, int* view);
-};
-
-#endif // TESTCASE_H
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Include/ValueHistory.h b/dep/recastnavigation/RecastDemo/Include/ValueHistory.h
deleted file mode 100644
index 4a37ed9c243..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/ValueHistory.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef VALUEHISTORY_H
-#define VALUEHISTORY_H
-
-class ValueHistory
-{
-	static const int MAX_HISTORY = 256;
-	float m_samples[MAX_HISTORY];
-	int m_hsamples;
-public:
-	ValueHistory();
-	~ValueHistory();
-
-	inline void addSample(const float val)
-	{
-		m_hsamples = (m_hsamples+MAX_HISTORY-1) % MAX_HISTORY;
-		m_samples[m_hsamples] = val;
-	}
-	
-	inline int getSampleCount() const
-	{
-		return MAX_HISTORY;
-	}
-	
-	inline float getSample(const int i) const
-	{
-		return m_samples[(m_hsamples+i) % MAX_HISTORY];
-	}
-	
-	float getSampleMin() const;
-	float getSampleMax() const;
-	float getAverage() const;
-};
-
-struct GraphParams
-{
-	void setRect(int ix, int iy, int iw, int ih, int ipad);
-	void setValueRange(float ivmin, float ivmax, int indiv, const char* iunits);
-	
-	int x, y, w, h, pad;
-	float vmin, vmax;
-	int ndiv;
-	char units[16];
-};
-
-void drawGraphBackground(const GraphParams* p);
-
-void drawGraph(const GraphParams* p, const ValueHistory* graph,
-			   int idx, const char* label, const unsigned int col);
-
-
-#endif // VALUEHISTORY_H
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Include/imgui.h b/dep/recastnavigation/RecastDemo/Include/imgui.h
deleted file mode 100644
index 325829b3ddb..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/imgui.h
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef IMGUI_H
-#define IMGUI_H
-
-enum imguiMouseButton
-{
-	IMGUI_MBUT_LEFT = 0x01, 
-	IMGUI_MBUT_RIGHT = 0x02, 
-};
-
-enum imguiTextAlign
-{
-	IMGUI_ALIGN_LEFT,
-	IMGUI_ALIGN_CENTER,
-	IMGUI_ALIGN_RIGHT,
-};
-
-inline unsigned int imguiRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a=255)
-{
-	return (r) | (g << 8) | (b << 16) | (a << 24);
-}
-
-void imguiBeginFrame(int mx, int my, unsigned char mbut, int scroll);
-void imguiEndFrame();
-
-bool imguiBeginScrollArea(const char* name, int x, int y, int w, int h, int* scroll);
-void imguiEndScrollArea();
-
-void imguiIndent();
-void imguiUnindent();
-void imguiSeparator();
-void imguiSeparatorLine();
-
-bool imguiButton(const char* text, bool enabled = true);
-bool imguiItem(const char* text, bool enabled = true);
-bool imguiCheck(const char* text, bool checked, bool enabled = true);
-bool imguiCollapse(const char* text, const char* subtext, bool checked, bool enabled = true);
-void imguiLabel(const char* text);
-void imguiValue(const char* text);
-bool imguiSlider(const char* text, float* val, float vmin, float vmax, float vinc, bool enabled = true);
-
-void imguiDrawText(int x, int y, int align, const char* text, unsigned int color);
-void imguiDrawLine(float x0, float y0, float x1, float y1, float r, unsigned int color);
-void imguiDrawRoundedRect(float x, float y, float w, float h, float r, unsigned int color);
-void imguiDrawRect(float x, float y, float w, float h, unsigned int color);
-
-// Pull render interface.
-enum imguiGfxCmdType
-{
-	IMGUI_GFXCMD_RECT,
-	IMGUI_GFXCMD_TRIANGLE,
-	IMGUI_GFXCMD_LINE,
-	IMGUI_GFXCMD_TEXT,
-	IMGUI_GFXCMD_SCISSOR,
-};
-
-struct imguiGfxRect
-{
-	short x,y,w,h,r;
-};
-
-struct imguiGfxText
-{
-	short x,y,align;
-	const char* text;
-};
-
-struct imguiGfxLine
-{
-	short x0,y0,x1,y1,r;
-};
-
-struct imguiGfxCmd
-{
-	char type;
-	char flags;
-	char pad[2];
-	unsigned int col;
-	union
-	{
-		imguiGfxLine line;
-		imguiGfxRect rect;
-		imguiGfxText text;
-	};
-};
-
-const imguiGfxCmd* imguiGetRenderQueue();
-int imguiGetRenderQueueSize();
-
-
-#endif // IMGUI_H
diff --git a/dep/recastnavigation/RecastDemo/Include/imguiRenderGL.h b/dep/recastnavigation/RecastDemo/Include/imguiRenderGL.h
deleted file mode 100644
index b1483416935..00000000000
--- a/dep/recastnavigation/RecastDemo/Include/imguiRenderGL.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef IMGUI_RENDER_GL_H
-#define IMGUI_RENDER_GL_H
-
-bool imguiRenderGLInit(const char* fontpath);
-void imguiRenderGLDestroy();
-void imguiRenderGLDraw();
-
-#endif // IMGUI_RENDER_GL_H
\ No newline at end of file
diff --git a/dep/recastnavigation/RecastDemo/Source/ChunkyTriMesh.cpp b/dep/recastnavigation/RecastDemo/Source/ChunkyTriMesh.cpp
deleted file mode 100644
index 47e877875b1..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/ChunkyTriMesh.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "ChunkyTriMesh.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-struct BoundsItem
-{
-	float bmin[2];
-	float bmax[2];
-	int i;
-};
-
-static int compareItemX(const void* va, const void* vb)
-{
-	const BoundsItem* a = (const BoundsItem*)va;
-	const BoundsItem* b = (const BoundsItem*)vb;
-	if (a->bmin[0] < b->bmin[0])
-		return -1;
-	if (a->bmin[0] > b->bmin[0])
-		return 1;
-	return 0;
-}
-
-static int compareItemY(const void* va, const void* vb)
-{
-	const BoundsItem* a = (const BoundsItem*)va;
-	const BoundsItem* b = (const BoundsItem*)vb;
-	if (a->bmin[1] < b->bmin[1])
-		return -1;
-	if (a->bmin[1] > b->bmin[1])
-		return 1;
-	return 0;
-}
-
-static void calcExtends(const BoundsItem* items, const int /*nitems*/,
-						const int imin, const int imax,
-						float* bmin, float* bmax)
-{
-	bmin[0] = items[imin].bmin[0];
-	bmin[1] = items[imin].bmin[1];
-	
-	bmax[0] = items[imin].bmax[0];
-	bmax[1] = items[imin].bmax[1];
-	
-	for (int i = imin+1; i < imax; ++i)
-	{
-		const BoundsItem& it = items[i];
-		if (it.bmin[0] < bmin[0]) bmin[0] = it.bmin[0];
-		if (it.bmin[1] < bmin[1]) bmin[1] = it.bmin[1];
-		
-		if (it.bmax[0] > bmax[0]) bmax[0] = it.bmax[0];
-		if (it.bmax[1] > bmax[1]) bmax[1] = it.bmax[1];
-	}
-}
-
-inline int longestAxis(float x, float y)
-{
-	return y > x ? 1 : 0;
-}
-
-static void subdivide(BoundsItem* items, int nitems, int imin, int imax, int trisPerChunk,
-					  int& curNode, rcChunkyTriMeshNode* nodes, const int maxNodes,
-					  int& curTri, int* outTris, const int* inTris)
-{
-	int inum = imax - imin;
-	int icur = curNode;
-	
-	if (curNode > maxNodes)
-		return;
-
-	rcChunkyTriMeshNode& node = nodes[curNode++];
-	
-	if (inum <= trisPerChunk)
-	{
-		// Leaf
-		calcExtends(items, nitems, imin, imax, node.bmin, node.bmax);
-		
-		// Copy triangles.
-		node.i = curTri;
-		node.n = inum;
-		
-		for (int i = imin; i < imax; ++i)
-		{
-			const int* src = &inTris[items[i].i*3];
-			int* dst = &outTris[curTri*3];
-			curTri++;
-			dst[0] = src[0];
-			dst[1] = src[1];
-			dst[2] = src[2];
-		}
-	}
-	else
-	{
-		// Split
-		calcExtends(items, nitems, imin, imax, node.bmin, node.bmax);
-		
-		int	axis = longestAxis(node.bmax[0] - node.bmin[0],
-							   node.bmax[1] - node.bmin[1]);
-		
-		if (axis == 0)
-		{
-			// Sort along x-axis
-			qsort(items+imin, inum, sizeof(BoundsItem), compareItemX);
-		}
-		else if (axis == 1)
-		{
-			// Sort along y-axis
-			qsort(items+imin, inum, sizeof(BoundsItem), compareItemY);
-		}
-		
-		int isplit = imin+inum/2;
-		
-		// Left
-		subdivide(items, nitems, imin, isplit, trisPerChunk, curNode, nodes, maxNodes, curTri, outTris, inTris);
-		// Right
-		subdivide(items, nitems, isplit, imax, trisPerChunk, curNode, nodes, maxNodes, curTri, outTris, inTris);
-		
-		int iescape = curNode - icur;
-		// Negative index means escape.
-		node.i = -iescape;
-	}
-}
-
-bool rcCreateChunkyTriMesh(const float* verts, const int* tris, int ntris,
-						   int trisPerChunk, rcChunkyTriMesh* cm)
-{
-	int nchunks = (ntris + trisPerChunk-1) / trisPerChunk;
-
-	cm->nodes = new rcChunkyTriMeshNode[nchunks*4];
-	if (!cm->nodes)
-		return false;
-		
-	cm->tris = new int[ntris*3];
-	if (!cm->tris)
-		return false;
-		
-	cm->ntris = ntris;
-
-	// Build tree
-	BoundsItem* items = new BoundsItem[ntris];
-	if (!items)
-		return false;
-
-	for (int i = 0; i < ntris; i++)
-	{
-		const int* t = &tris[i*3];
-		BoundsItem& it = items[i];
-		it.i = i;
-		// Calc triangle XZ bounds.
-		it.bmin[0] = it.bmax[0] = verts[t[0]*3+0];
-		it.bmin[1] = it.bmax[1] = verts[t[0]*3+2];
-		for (int j = 1; j < 3; ++j)
-		{
-			const float* v = &verts[t[j]*3];
-			if (v[0] < it.bmin[0]) it.bmin[0] = v[0]; 
-			if (v[2] < it.bmin[1]) it.bmin[1] = v[2]; 
-
-			if (v[0] > it.bmax[0]) it.bmax[0] = v[0]; 
-			if (v[2] > it.bmax[1]) it.bmax[1] = v[2]; 
-		}
-	}
-
-	int curTri = 0;
-	int curNode = 0;
-	subdivide(items, ntris, 0, ntris, trisPerChunk, curNode, cm->nodes, nchunks*4, curTri, cm->tris, tris);
-	
-	delete [] items;
-	
-	cm->nnodes = curNode;
-	
-	// Calc max tris per node.
-	cm->maxTrisPerChunk = 0;
-	for (int i = 0; i < cm->nnodes; ++i)
-	{
-		rcChunkyTriMeshNode& node = cm->nodes[i];
-		const bool isLeaf = node.i >= 0;
-		if (!isLeaf) continue;
-		if (node.n > cm->maxTrisPerChunk)
-			cm->maxTrisPerChunk = node.n;
-	}
-	 
-	return true;
-}
-
-
-inline bool checkOverlapRect(const float amin[2], const float amax[2],
-							 const float bmin[2], const float bmax[2])
-{
-	bool overlap = true;
-	overlap = (amin[0] > bmax[0] || amax[0] < bmin[0]) ? false : overlap;
-	overlap = (amin[1] > bmax[1] || amax[1] < bmin[1]) ? false : overlap;
-	return overlap;
-}
-
-int rcGetChunksOverlappingRect(const rcChunkyTriMesh* cm,
-							   float bmin[2], float bmax[2],
-							   int* ids, const int maxIds)
-{
-	// Traverse tree
-	int i = 0;
-	int n = 0;
-	while (i < cm->nnodes)
-	{
-		const rcChunkyTriMeshNode* node = &cm->nodes[i];
-		const bool overlap = checkOverlapRect(bmin, bmax, node->bmin, node->bmax);
-		const bool isLeafNode = node->i >= 0;
-		
-		if (isLeafNode && overlap)
-		{
-			if (n < maxIds)
-			{
-				ids[n] = i;
-				n++;
-			}
-		}
-		
-		if (overlap || isLeafNode)
-			i++;
-		else
-		{
-			const int escapeIndex = -node->i;
-			i += escapeIndex;
-		}
-	}
-	
-	return n;
-}
-
-
-
-static bool checkOverlapSegment(const float p[2], const float q[2],
-								const float bmin[2], const float bmax[2])
-{
-	static const float EPSILON = 1e-6f;
-
-	float tmin = 0;
-	float tmax = 1;
-	float d[2];
-	d[0] = q[0] - p[0];
-	d[1] = q[1] - p[1];
-	
-	for (int i = 0; i < 2; i++)
-	{
-		if (fabsf(d[i]) < EPSILON)
-		{
-			// Ray is parallel to slab. No hit if origin not within slab
-			if (p[i] < bmin[i] || p[i] > bmax[i])
-				return false;
-		}
-		else
-		{
-			// Compute intersection t value of ray with near and far plane of slab
-			float ood = 1.0f / d[i];
-			float t1 = (bmin[i] - p[i]) * ood;
-			float t2 = (bmax[i] - p[i]) * ood;
-			if (t1 > t2) { float tmp = t1; t1 = t2; t2 = tmp; }
-			if (t1 > tmin) tmin = t1;
-			if (t2 < tmax) tmax = t2;
-			if (tmin > tmax) return false;
-		}
-	}
-	return true;
-}
-
-int rcGetChunksOverlappingSegment(const rcChunkyTriMesh* cm,
-								  float p[2], float q[2],
-								  int* ids, const int maxIds)
-{
-	// Traverse tree
-	int i = 0;
-	int n = 0;
-	while (i < cm->nnodes)
-	{
-		const rcChunkyTriMeshNode* node = &cm->nodes[i];
-		const bool overlap = checkOverlapSegment(p, q, node->bmin, node->bmax);
-		const bool isLeafNode = node->i >= 0;
-		
-		if (isLeafNode && overlap)
-		{
-			if (n < maxIds)
-			{
-				ids[n] = i;
-				n++;
-			}
-		}
-		
-		if (overlap || isLeafNode)
-			i++;
-		else
-		{
-			const int escapeIndex = -node->i;
-			i += escapeIndex;
-		}
-	}
-	
-	return n;
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/ConvexVolumeTool.cpp b/dep/recastnavigation/RecastDemo/Source/ConvexVolumeTool.cpp
deleted file mode 100644
index 00c9e0997c6..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/ConvexVolumeTool.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include <float.h>
-#include "SDL.h"
-#include "SDL_opengl.h"
-#include "imgui.h"
-#include "ConvexVolumeTool.h"
-#include "InputGeom.h"
-#include "Sample.h"
-#include "Recast.h"
-#include "RecastDebugDraw.h"
-#include "DetourDebugDraw.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-// Quick and dirty convex hull.
-
-// Returns true if 'c' is left of line 'a'-'b'.
-inline bool left(const float* a, const float* b, const float* c)
-{ 
-	const float u1 = b[0] - a[0];
-	const float v1 = b[2] - a[2];
-	const float u2 = c[0] - a[0];
-	const float v2 = c[2] - a[2];
-	return u1 * v2 - v1 * u2 < 0;
-}
-
-// Returns true if 'a' is more lower-left than 'b'.
-inline bool cmppt(const float* a, const float* b)
-{
-	if (a[0] < b[0]) return true;
-	if (a[0] > b[0]) return false;
-	if (a[2] < b[2]) return true;
-	if (a[2] > b[2]) return false;
-	return false;
-}
-// Calculates convex hull on xz-plane of points on 'pts',
-// stores the indices of the resulting hull in 'out' and
-// returns number of points on hull.
-static int convexhull(const float* pts, int npts, int* out)
-{
-	// Find lower-leftmost point.
-	int hull = 0;
-	for (int i = 1; i < npts; ++i)
-		if (cmppt(&pts[i*3], &pts[hull*3]))
-			hull = i;
-	// Gift wrap hull.
-	int endpt = 0;
-	int i = 0;
-	do
-	{
-		out[i++] = hull;
-		endpt = 0;
-		for (int j = 1; j < npts; ++j)
-			if (hull == endpt || left(&pts[hull*3], &pts[endpt*3], &pts[j*3]))
-				endpt = j;
-		hull = endpt;
-	}
-	while (endpt != out[0]);
-	
-	return i;
-}
-
-static int pointInPoly(int nvert, const float* verts, const float* p)
-{
-	int i, j, c = 0;
-	for (i = 0, j = nvert-1; i < nvert; j = i++)
-	{
-		const float* vi = &verts[i*3];
-		const float* vj = &verts[j*3];
-		if (((vi[2] > p[2]) != (vj[2] > p[2])) &&
-			(p[0] < (vj[0]-vi[0]) * (p[2]-vi[2]) / (vj[2]-vi[2]) + vi[0]) )
-			c = !c;
-	}
-	return c;
-}
-
-
-ConvexVolumeTool::ConvexVolumeTool() :
-	m_sample(0),
-	m_areaType(SAMPLE_POLYAREA_GRASS),
-	m_boxHeight(6.0f),
-	m_boxDescent(1.0f),
-	m_npts(0),
-	m_nhull(0)
-{
-}
-
-ConvexVolumeTool::~ConvexVolumeTool()
-{
-}
-
-void ConvexVolumeTool::init(Sample* sample)
-{
-	m_sample = sample;
-}
-
-void ConvexVolumeTool::reset()
-{
-	m_npts = 0;
-	m_nhull = 0;
-}
-
-void ConvexVolumeTool::handleMenu()
-{
-	imguiSlider("Shape Height", &m_boxHeight, 0.1f, 20.0f, 0.1f);
-	imguiSlider("Shape Descent", &m_boxDescent, 0.1f, 20.0f, 0.1f);
-
-	imguiSeparator();
-
-	imguiLabel("Area Type");
-	imguiIndent();
-	if (imguiCheck("Grass", m_areaType == SAMPLE_POLYAREA_GRASS))
-		m_areaType = SAMPLE_POLYAREA_GRASS;
-	if (imguiCheck("Road", m_areaType == SAMPLE_POLYAREA_ROAD))
-		m_areaType = SAMPLE_POLYAREA_ROAD;
-	if (imguiCheck("Water", m_areaType == SAMPLE_POLYAREA_WATER))
-		m_areaType = SAMPLE_POLYAREA_WATER;
-	if (imguiCheck("Door", m_areaType == SAMPLE_POLYAREA_DOOR))
-		m_areaType = SAMPLE_POLYAREA_DOOR;
-	imguiUnindent();
-
-	imguiSeparator();
-
-	if (imguiButton("Clear Shape"))
-	{
-		m_npts = 0;
-		m_nhull = 0;
-	}
-
-	imguiSeparator();
-	
-	imguiValue("Click to create points.");
-	imguiValue("The shape is convex hull");
-	imguiValue("of all the create points.");
-	imguiValue("Click on highlited point");
-	imguiValue("to finish the shape.");
-
-	imguiSeparator();
-}
-
-void ConvexVolumeTool::handleClick(const float* /*s*/, const float* p, bool shift)
-{
-	if (!m_sample) return;
-	InputGeom* geom = m_sample->getInputGeom();
-	if (!geom) return;
-	
-	if (shift)
-	{
-		// Delete
-		int nearestIndex = -1;
-		const ConvexVolume* vols = geom->getConvexVolumes();
-		for (int i = 0; i < geom->getConvexVolumeCount(); ++i)
-		{
-			if (pointInPoly(vols[i].nverts, vols[i].verts, p) &&
-							p[1] >= vols[i].hmin && p[1] <= vols[i].hmax)
-			{
-				nearestIndex = i;
-			}
-		}
-		// If end point close enough, delete it.
-		if (nearestIndex != -1)
-		{
-			geom->deleteConvexVolume(nearestIndex);
-		}
-	}
-	else
-	{
-		// Create
-
-		// If clicked on that last pt, create the shape.
-		if (m_npts && rcVdistSqr(p, &m_pts[(m_npts-1)*3]) < rcSqr(0.2f))
-		{
-			if (m_nhull > 2)
-			{
-				// Create shape.
-				float verts[MAX_PTS*3];
-				for (int i = 0; i < m_nhull; ++i)
-					rcVcopy(&verts[i*3], &m_pts[m_hull[i]*3]);
-					
-				float minh = FLT_MAX, maxh = 0;
-				for (int i = 0; i < m_nhull; ++i)
-					minh = rcMin(minh, verts[i*3+1]);
-				minh -= m_boxDescent;
-				maxh = minh + m_boxHeight;
-				
-				geom->addConvexVolume(verts, m_nhull, minh, maxh, (unsigned char)m_areaType);
-			}
-			
-			m_npts = 0;
-			m_nhull = 0;
-		}
-		else
-		{
-			// Add new point 
-			if (m_npts < MAX_PTS)
-			{
-				rcVcopy(&m_pts[m_npts*3], p);
-				m_npts++;
-				// Update hull.
-				if (m_npts > 1)
-					m_nhull = convexhull(m_pts, m_npts, m_hull);
-				else
-					m_nhull = 0;
-			}
-		}		
-	}
-	
-}
-
-void ConvexVolumeTool::handleToggle()
-{
-}
-
-void ConvexVolumeTool::handleStep()
-{
-}
-
-void ConvexVolumeTool::handleUpdate(const float /*dt*/)
-{
-}
-
-void ConvexVolumeTool::handleRender()
-{
-	DebugDrawGL dd;
-	
-	// Find height extents of the shape.
-	float minh = FLT_MAX, maxh = 0;
-	for (int i = 0; i < m_npts; ++i)
-		minh = rcMin(minh, m_pts[i*3+1]);
-	minh -= m_boxDescent;
-	maxh = minh + m_boxHeight;
-
-	dd.begin(DU_DRAW_POINTS, 4.0f);
-	for (int i = 0; i < m_npts; ++i)
-	{
-		unsigned int col = duRGBA(255,255,255,255);
-		if (i == m_npts-1)
-			col = duRGBA(240,32,16,255);
-		dd.vertex(m_pts[i*3+0],m_pts[i*3+1]+0.1f,m_pts[i*3+2], col);
-	}
-	dd.end();
-
-	dd.begin(DU_DRAW_LINES, 2.0f);
-	for (int i = 0, j = m_nhull-1; i < m_nhull; j = i++)
-	{
-		const float* vi = &m_pts[m_hull[j]*3];
-		const float* vj = &m_pts[m_hull[i]*3];
-		dd.vertex(vj[0],minh,vj[2], duRGBA(255,255,255,64));
-		dd.vertex(vi[0],minh,vi[2], duRGBA(255,255,255,64));
-		dd.vertex(vj[0],maxh,vj[2], duRGBA(255,255,255,64));
-		dd.vertex(vi[0],maxh,vi[2], duRGBA(255,255,255,64));
-		dd.vertex(vj[0],minh,vj[2], duRGBA(255,255,255,64));
-		dd.vertex(vj[0],maxh,vj[2], duRGBA(255,255,255,64));
-	}
-	dd.end();	
-}
-
-void ConvexVolumeTool::handleRenderOverlay(double* /*proj*/, double* /*model*/, int* /*view*/)
-{
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/CrowdManager.cpp b/dep/recastnavigation/RecastDemo/Source/CrowdManager.cpp
deleted file mode 100644
index 9211d675cee..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/CrowdManager.cpp
+++ /dev/null
@@ -1,1593 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <float.h>
-#include "DetourNavMesh.h"
-#include "DetourNavMeshQuery.h"
-#include "DetourObstacleAvoidance.h"
-#include "DetourCommon.h"
-#include "CrowdManager.h"
-#include "SampleInterfaces.h" // For timer
-#include "DetourAssert.h"
-#include "DetourAlloc.h"
-
-static const int VO_ADAPTIVE_DIVS = 7;
-static const int VO_ADAPTIVE_RINGS = 2;
-static const int VO_ADAPTIVE_DEPTH = 5;
-
-static const int VO_GRID_SIZE = 33;
-
-
-inline int hashPos2(int x, int y, int n)
-{
-	return ((x*73856093) ^ (y*19349663)) & (n-1);
-}
-
-ProximityGrid::ProximityGrid() :
-	m_maxItems(0),
-	m_cellSize(0),
-	m_pool(0),
-	m_poolHead(0),
-	m_poolSize(0),
-	m_buckets(0),
-	m_bucketsSize(0)
-{
-}
-	
-ProximityGrid::~ProximityGrid()
-{
-	dtFree(m_buckets);
-	dtFree(m_pool);
-}
-	
-bool ProximityGrid::init(const int maxItems, const float cellSize)
-{
-	dtAssert(maxItems > 0);
-	dtAssert(cellSize > 0.0f);
-	
-	m_cellSize = cellSize;
-	m_invCellSize = 1.0f / m_cellSize;
-	
-	// Allocate hashs buckets
-	m_bucketsSize = dtNextPow2(maxItems);
-	m_buckets = (unsigned short*)dtAlloc(sizeof(unsigned short)*m_bucketsSize, DT_ALLOC_PERM);
-	if (!m_buckets)
-		return false;
-
-	// Allocate pool of items.
-	m_poolSize = maxItems*4;
-	m_poolHead = 0;
-	m_pool = (Item*)dtAlloc(sizeof(Item)*m_poolSize, DT_ALLOC_PERM);
-	if (!m_pool)
-		return false;
-	
-	clear();
-	
-	return true;
-}
-
-void ProximityGrid::clear()
-{
-	memset(m_buckets, 0xff, sizeof(unsigned short)*m_bucketsSize);
-	m_poolHead = 0;
-	m_bounds[0] = 0xffff;
-	m_bounds[1] = 0xffff;
-	m_bounds[2] = -0xffff;
-	m_bounds[3] = -0xffff;
-}
-
-void ProximityGrid::addItem(const unsigned short id,
-							const float minx, const float miny,
-							const float maxx, const float maxy)
-{
-	const int iminx = (int)floorf(minx * m_invCellSize);
-	const int iminy = (int)floorf(miny * m_invCellSize);
-	const int imaxx = (int)floorf(maxx * m_invCellSize);
-	const int imaxy = (int)floorf(maxy * m_invCellSize);
-	
-	m_bounds[0] = dtMin(m_bounds[0], iminx);
-	m_bounds[1] = dtMin(m_bounds[1], iminy);
-	m_bounds[2] = dtMax(m_bounds[2], imaxx);
-	m_bounds[3] = dtMax(m_bounds[3], imaxy);
-	
-	for (int y = iminy; y <= imaxy; ++y)
-	{
-		for (int x = iminx; x <= imaxx; ++x)
-		{
-			if (m_poolHead < m_poolSize)
-			{
-				const int h = hashPos2(x, y, m_bucketsSize);
-				const unsigned short idx = (unsigned short)m_poolHead;
-				m_poolHead++;
-				Item& item = m_pool[idx];
-				item.x = (short)x;
-				item.y = (short)y;
-				item.id = id;
-				item.next = m_buckets[h];
-				m_buckets[h] = idx;
-			}
-		}
-	}
-}
-
-int ProximityGrid::queryItems(const float minx, const float miny,
-							  const float maxx, const float maxy,
-							  unsigned short* ids, const int maxIds) const
-{
-	const int iminx = (int)floorf(minx * m_invCellSize);
-	const int iminy = (int)floorf(miny * m_invCellSize);
-	const int imaxx = (int)floorf(maxx * m_invCellSize);
-	const int imaxy = (int)floorf(maxy * m_invCellSize);
-	
-	int n = 0;
-	
-	for (int y = iminy; y <= imaxy; ++y)
-	{
-		for (int x = iminx; x <= imaxx; ++x)
-		{
-			const int h = hashPos2(x, y, m_bucketsSize);
-			unsigned short idx = m_buckets[h];
-			while (idx != 0xffff)
-			{
-				Item& item = m_pool[idx];
-				if ((int)item.x == x && (int)item.y == y)
-				{
-					// Check if the id exists already.
-					const unsigned short* end = ids + n;
-					unsigned short* i = ids;
-					while (i != end && *i != item.id)
-						++i;
-					// Item not found, add it.
-					if (i == end)
-					{
-						if (n >= maxIds)
-							return n;
-						ids[n++] = item.id;
-					}
-				}
-				idx = item.next;
-			}
-		}
-	}
-	
-	return n;
-}
-
-int ProximityGrid::getItemCountAt(const int x, const int y) const
-{
-	int n = 0;
-	
-	const int h = hashPos2(x, y, m_bucketsSize);
-	unsigned short idx = m_buckets[h];
-	while (idx != 0xffff)
-	{
-		Item& item = m_pool[idx];
-		if ((int)item.x == x && (int)item.y == y)
-			n++;
-		idx = item.next;
-	}
-
-	return n;
-}
-
-PathQueue::PathQueue() :
-	m_nextHandle(1),
-	m_delay(0)
-{
-	for (int i = 0; i < MAX_QUEUE; ++i)
-		m_queue[i].ref = PATHQ_INVALID;
-}
-
-PathQueue::~PathQueue()
-{
-}
-
-void PathQueue::update(dtNavMeshQuery* navquery)
-{
-	// Artificial delay to test the code better,
-	// update only one request too.
-	
-	// TODO: Use sliced pathfinder.
-	m_delay++;
-	if ((m_delay % 4) == 0)
-	{
-		for (int i = 0; i < MAX_QUEUE; ++i)
-		{
-			PathQuery& q = m_queue[i];
-			if (q.ref == PATHQ_INVALID)
-				continue;
-			navquery->findPath(q.startRef, q.endRef, q.startPos, q.endPos,
-							   q.filter, q.path, &q.npath, PQ_MAX_PATH);
-			q.ready = true;
-			break;
-		}
-	}
-
-	// Kill forgotten request.
-	for (int i = 0; i < MAX_QUEUE; ++i)
-	{
-		PathQuery& q = m_queue[i];
-		if (q.ref != PATHQ_INVALID && q.ready)
-		{
-			q.keepalive++;
-			if (q.keepalive > 2)
-				q.ref = PATHQ_INVALID;
-		}
-	}
-}
-
-PathQueueRef PathQueue::request(dtPolyRef startRef, dtPolyRef endRef,
-								const float* startPos, const float* endPos,
-								const dtQueryFilter* filter)
-{
-	// Find empty slot
-	int slot = -1;
-	for (int i = 0; i < MAX_QUEUE; ++i)
-	{
-		if (m_queue[i].ref == PATHQ_INVALID)
-		{
-			slot = i;
-			break;
-		}
-	}
-	// Could not find slot.
-	if (slot == -1)
-		return PATHQ_INVALID;
-	
-	PathQueueRef ref = m_nextHandle++;
-	if (m_nextHandle == PATHQ_INVALID) m_nextHandle++;
-	
-	PathQuery& q = m_queue[slot];
-	q.ref = ref;
-	dtVcopy(q.startPos, startPos);
-	q.startRef = startRef;
-	dtVcopy(q.endPos, endPos);
-	q.endRef = endRef;
-	q.ready = false;
-	q.npath = 0;
-	q.filter = filter; // TODO: This is potentially dangerous!
-	q.keepalive = 0;
-	
-	return ref;
-}
-
-int PathQueue::getRequestState(PathQueueRef ref)
-{
-	for (int i = 0; i < MAX_QUEUE; ++i)
-	{
-		if (m_queue[i].ref == ref)
-			return m_queue[i].ready ? PATHQ_STATE_READY : PATHQ_STATE_WORKING;
-	}
-	
-	return PATHQ_STATE_INVALID;
-}
-
-int PathQueue::getPathResult(PathQueueRef ref, dtPolyRef* path, const int maxPath)
-{
-	for (int i = 0; i < MAX_QUEUE; ++i)
-	{
-		if (m_queue[i].ref == ref)
-		{
-			PathQuery& q = m_queue[i];
-			// Allow to reuse the request.
-			q.ref = PATHQ_INVALID;
-			int n = 0;
-			for (int j = 0; j < q.npath && j < maxPath; ++j)
-				path[n++] = q.path[j];
-			return n;
-		}
-	}
-	return 0;	
-}
-
-
-static int fixupCorridor(dtPolyRef* path, const int npath, const int maxPath,
-						 const dtPolyRef* visited, const int nvisited)
-{
-	int furthestPath = -1;
-	int furthestVisited = -1;
-	
-	// Find furthest common polygon.
-	for (int i = npath-1; i >= 0; --i)
-	{
-		bool found = false;
-		for (int j = nvisited-1; j >= 0; --j)
-		{
-			if (path[i] == visited[j])
-			{
-				furthestPath = i;
-				furthestVisited = j;
-				found = true;
-			}
-		}
-		if (found)
-			break;
-	}
-	
-	// If no intersection found just return current path. 
-	if (furthestPath == -1 || furthestVisited == -1)
-		return npath;
-	
-	// Concatenate paths.	
-	
-	// Adjust beginning of the buffer to include the visited.
-	const int req = nvisited - furthestVisited;
-	const int orig = dtMin(furthestPath+1, npath);
-	int size = dtMax(0, npath-orig);
-	if (req+size > maxPath)
-		size = maxPath-req;
-	if (size)
-		memmove(path+req, path+orig, size*sizeof(dtPolyRef));
-	
-	// Store visited
-	for (int i = 0; i < req; ++i)
-		path[i] = visited[(nvisited-1)-i];				
-	
-	return req+size;
-}
-
-static int fixupCorridorEnd(dtPolyRef* path, const int npath, const int maxPath,
-							const dtPolyRef* visited, const int nvisited)
-{
-	int furthestPath = -1;
-	int furthestVisited = -1;
-	
-	// Find furthest common polygon.
-	for (int i = 0; i < npath; ++i)
-	{
-		bool found = false;
-		for (int j = nvisited-1; j >= 0; --j)
-		{
-			if (path[i] == visited[j])
-			{
-				furthestPath = i;
-				furthestVisited = j;
-				found = true;
-			}
-		}
-		if (found)
-			break;
-	}
-	
-	// If no intersection found just return current path. 
-	if (furthestPath == -1 || furthestVisited == -1)
-		return npath;
-	
-	// Concatenate paths.
-	const int ppos = furthestPath+1;
-	const int vpos = furthestVisited+1;
-	const int count = dtMin(nvisited-vpos, maxPath-ppos);
-	dtAssert(ppos+count <= maxPath);
-	if (count)
-		memcpy(path+ppos, visited+vpos, sizeof(dtPolyRef)*count);
-
-	return ppos+count;
-}
-
-static int mergeCorridor(dtPolyRef* path, const int npath, const int maxPath,
-						 const dtPolyRef* visited, const int nvisited)
-{
-	int furthestPath = -1;
-	int furthestVisited = -1;
-	
-	// Find furthest common polygon.
-	for (int i = npath-1; i >= 0; --i)
-	{
-		bool found = false;
-		for (int j = nvisited-1; j >= 0; --j)
-		{
-			if (path[i] == visited[j])
-			{
-				furthestPath = i;
-				furthestVisited = j;
-				found = true;
-			}
-		}
-		if (found)
-			break;
-	}
-	
-	// If no intersection found just return current path. 
-	if (furthestPath == -1 || furthestVisited == -1)
-		return npath;
-	
-	// Concatenate paths.	
-	
-	// Adjust beginning of the buffer to include the visited.
-	const int req = furthestVisited;
-	if (req <= 0)
-		return npath;
-	
-	const int orig = furthestPath;
-	int size = dtMax(0, npath-orig);
-	if (req+size > maxPath)
-		size = maxPath-req;
-	if (size)
-		memmove(path+req, path+orig, size*sizeof(dtPolyRef));
-	
-	// Store visited
-	for (int i = 0; i < req; ++i)
-		path[i] = visited[i];
-	
-	return req+size;
-}
-
-PathCorridor::PathCorridor() :
-	m_path(0),
-	m_npath(0),
-	m_maxPath(0)
-{
-	
-}
-
-PathCorridor::~PathCorridor()
-{
-	dtFree(m_path);
-}
-
-bool PathCorridor::init(const int maxPath)
-{
-	dtAssert(!m_path);
-	m_path = (dtPolyRef*)dtAlloc(sizeof(dtPolyRef)*maxPath, DT_ALLOC_PERM);
-	if (!m_path)
-		return false;
-	m_npath = 0;
-	m_maxPath = maxPath;
-	return true;
-}
-
-void PathCorridor::reset(dtPolyRef ref, const float* pos)
-{
-	dtAssert(m_path);
-	dtVcopy(m_pos, pos);
-	dtVcopy(m_target, pos);
-	m_path[0] = ref;
-	m_npath = 1;
-}
-
-int PathCorridor::findCorners(float* cornerVerts, unsigned char* cornerFlags,
-							  dtPolyRef* cornerPolys, const int maxCorners,
-							  dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	dtAssert(m_path);
-	dtAssert(m_npath);
-	
-	static const float MIN_TARGET_DIST = 0.01f;
-	
-	int ncorners = 0;
-	navquery->findStraightPath(m_pos, m_target, m_path, m_npath,
-							   cornerVerts, cornerFlags, cornerPolys, &ncorners, maxCorners);
-	
-	// Prune points in the beginning of the path which are too close.
-	while (ncorners)
-	{
-		if ((cornerFlags[0] & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ||
-			dtVdist2DSqr(&cornerVerts[0], m_pos) > dtSqr(MIN_TARGET_DIST))
-			break;
-		ncorners--;
-		if (ncorners)
-		{
-			memmove(cornerFlags, cornerFlags+1, sizeof(unsigned char)*ncorners);
-			memmove(cornerPolys, cornerPolys+1, sizeof(dtPolyRef)*ncorners);
-			memmove(cornerVerts, cornerVerts+3, sizeof(float)*3*ncorners);
-		}
-	}
-	
-	// Prune points after an off-mesh connection.
-	for (int i = 0; i < ncorners; ++i)
-	{
-		if (cornerFlags[i] & DT_STRAIGHTPATH_OFFMESH_CONNECTION)
-		{
-			ncorners = i+1;
-			break;
-		}
-	}
-	
-	return ncorners;
-}
-
-void PathCorridor::optimizePathVisibility(const float* next, const float pathOptimizationRange,
-										  dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	dtAssert(m_path);
-	
-	// Clamp the ray to max distance.
-	float goal[3];
-	dtVcopy(goal, next);
-	float dist = dtVdist2D(m_pos, goal);
-	
-	// If too close to the goal, do not try to optimize.
-	if (dist < 0.01f)
-		return;
-
-	// Overshoot a little. This helps to optimize open fields in tiled meshes.
-	dist = dtMin(dist+0.01f, pathOptimizationRange);
-	
-	// Adjust ray length.
-	float delta[3];
-	dtVsub(delta, goal, m_pos);
-	dtVmad(goal, m_pos, delta, pathOptimizationRange/dist);
-	
-	static const int MAX_RES = 32;
-	dtPolyRef res[MAX_RES];
-	float t, norm[3];
-	int nres = 0;
-	navquery->raycast(m_path[0], m_pos, goal, filter, &t, norm, res, &nres, MAX_RES);
-	if (nres > 1 && t > 0.99f)
-	{
-		m_npath = mergeCorridor(m_path, m_npath, m_maxPath, res, nres);
-	}
-}
-
-bool PathCorridor::optimizePathTopology(dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	dtAssert(m_path);
-
-	if (m_npath < 3)
-		return false;
-	
-	static const int MAX_ITER = 32;
-	static const int MAX_RES = 32;
-
-	dtPolyRef res[MAX_RES];
-	int nres = 0;
-	navquery->initSlicedFindPath(m_path[0], m_path[m_npath-1], m_pos, m_target, filter);
-	navquery->updateSlicedFindPath(MAX_ITER);
-	dtStatus status = navquery->finalizeSlicedFindPathPartial(m_path, m_npath, res, &nres, MAX_RES);
-
-	if (status == DT_SUCCESS && nres > 0)
-	{
-		m_npath = mergeCorridor(m_path, m_npath, m_maxPath, res, nres);
-		return true;
-	}
-	
-	return false;
-}
-
-void PathCorridor::movePosition(const float* npos, dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	dtAssert(m_path);
-	dtAssert(m_npath);
-	
-	// Move along navmesh and update new position.
-	float result[3];
-	static const int MAX_VISITED = 16;
-	dtPolyRef visited[MAX_VISITED];
-	int nvisited = 0;
-	navquery->moveAlongSurface(m_path[0], m_pos, npos, filter,
-							   result, visited, &nvisited, MAX_VISITED);
-	m_npath = fixupCorridor(m_path, m_npath, m_maxPath, visited, nvisited);
-	
-	// Adjust the position to stay on top of the navmesh.
-	float h = m_pos[1];
-	navquery->getPolyHeight(m_path[0], result, &h);
-	result[1] = h;
-	dtVcopy(m_pos, result);
-}
-
-void PathCorridor::moveTargetPosition(const float* npos, dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	dtAssert(m_path);
-	dtAssert(m_npath);
-	
-	// Move along navmesh and update new position.
-	float result[3];
-	static const int MAX_VISITED = 16;
-	dtPolyRef visited[MAX_VISITED];
-	int nvisited = 0;
-	navquery->moveAlongSurface(m_path[m_npath-1], m_target, npos, filter,
-							   result, visited, &nvisited, MAX_VISITED);
-	m_npath = fixupCorridorEnd(m_path, m_npath, m_maxPath, visited, nvisited);
-	
-	// TODO: should we do that?
-	// Adjust the position to stay on top of the navmesh.
-/*	float h = m_target[1];
-	navquery->getPolyHeight(m_path[m_npath-1], result, &h);
-	result[1] = h;*/
-	
-	dtVcopy(m_target, result);
-}
-
-void PathCorridor::setCorridor(const float* target, const dtPolyRef* path, const int npath)
-{
-	dtAssert(m_path);
-	dtAssert(npath > 0);
-	dtAssert(npath < m_maxPath);
-	
-	dtVcopy(m_target, target);
-	memcpy(m_path, path, sizeof(dtPolyRef)*npath);
-	m_npath = npath;
-}
-
-
-
-
-void Agent::integrate(const float maxAcc, const float dt)
-{
-	// Fake dynamic constraint.
-	const float maxDelta = maxAcc * dt;
-	float dv[3];
-	dtVsub(dv, nvel, vel);
-	float ds = dtVlen(dv);
-	if (ds > maxDelta)
-		dtVscale(dv, dv, maxDelta/ds);
-	dtVadd(vel, vel, dv);
-	
-	// Integrate
-	if (dtVlen(vel) > 0.0001f)
-		dtVmad(npos, npos, vel, dt);
-	else
-		dtVset(vel,0,0,0);
-}
-
-float Agent::getDistanceToGoal(const float range) const
-{
-	if (!ncorners)
-		return range;
-	
-	const bool endOfPath = (cornerFlags[ncorners-1] & DT_STRAIGHTPATH_END) ? true : false;
-	const bool offMeshConnection = (cornerFlags[ncorners-1] & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ? true : false;
-	if (endOfPath || offMeshConnection)
-		return dtMin(dtVdist2D(npos, &cornerVerts[(ncorners-1)*3]), range);
-	
-	return range;
-}
-
-void Agent::calcSmoothSteerDirection(float* dir)
-{
-	if (!ncorners)
-	{
-		dtVset(dir, 0,0,0);
-		return;
-	}
-	
-	const int ip0 = 0;
-	const int ip1 = dtMin(1, ncorners-1);
-	const float* p0 = &cornerVerts[ip0*3];
-	const float* p1 = &cornerVerts[ip1*3];
-	
-	float dir0[3], dir1[3];
-	dtVsub(dir0, p0, npos);
-	dtVsub(dir1, p1, npos);
-	dir0[1] = 0;
-	dir1[1] = 0;
-	
-	float len0 = dtVlen(dir0);
-	float len1 = dtVlen(dir1);
-	if (len1 > 0.001f)
-		dtVscale(dir1,dir1,1.0f/len1);
-	
-	dir[0] = dir0[0] - dir1[0]*len0*0.5f;
-	dir[1] = 0;
-	dir[2] = dir0[2] - dir1[2]*len0*0.5f;
-	
-	dtVnormalize(dir);
-}
-
-void Agent::calcStraightSteerDirection(float* dir)
-{
-	if (!ncorners)
-	{
-		dtVset(dir, 0,0,0);
-		return;
-	}
-	dtVsub(dir, &cornerVerts[0], npos);
-	dir[1] = 0;
-	dtVnormalize(dir);
-}
-
-
-
-LocalBoundary::LocalBoundary() :
-	m_nsegs(0)
-{
-	dtVset(m_center, FLT_MAX,FLT_MAX,FLT_MAX);
-}
-
-LocalBoundary::~LocalBoundary()
-{
-}
-	
-void LocalBoundary::reset()
-{
-	dtVset(m_center, FLT_MAX,FLT_MAX,FLT_MAX);
-	m_nsegs = 0;
-}
-
-void LocalBoundary::addSegment(const float dist, const float* s)
-{
-	// Insert neighbour based on the distance.
-	Segment* seg = 0;
-	if (!m_nsegs)
-	{
-		// First, trivial accept.
-		seg = &m_segs[0];
-	}
-	else if (dist >= m_segs[m_nsegs-1].d)
-	{
-		// Further than the last segment, skip.
-		if (m_nsegs >= MAX_SEGS)
-			return;
-		// Last, trivial accept.
-		seg = &m_segs[m_nsegs];
-	}
-	else
-	{
-		// Insert inbetween.
-		int i;
-		for (i = 0; i < m_nsegs; ++i)
-			if (dist <= m_segs[i].d)
-				break;
-		const int tgt = i+1;
-		const int n = dtMin(m_nsegs-i, MAX_SEGS-tgt);
-		dtAssert(tgt+n <= MAX_SEGS);
-		if (n > 0)
-			memmove(&m_segs[tgt], &m_segs[i], sizeof(Segment)*n);
-		seg = &m_segs[i];
-	}
-	
-	seg->d = dist;
-	memcpy(seg->s, s, sizeof(float)*6);
-	
-	if (m_nsegs < MAX_SEGS)
-		m_nsegs++;
-}
-
-void LocalBoundary::update(dtPolyRef ref, const float* pos, const float collisionQueryRange,
-						   dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	static const int MAX_LOCAL_POLYS = 16;
-	static const int MAX_SEGS_PER_POLY = DT_VERTS_PER_POLYGON*2;
-	
-	if (!ref)
-	{
-		dtVset(m_center, FLT_MAX,FLT_MAX,FLT_MAX);
-		m_nsegs = 0;
-		return;
-	}
-	
-	dtVcopy(m_center, pos);
-	
-	// First query non-overlapping polygons.
-	dtPolyRef locals[MAX_LOCAL_POLYS];
-	int nlocals = 0;
-	navquery->findLocalNeighbourhood(ref, pos, collisionQueryRange,
-									 filter, locals, 0, &nlocals, MAX_LOCAL_POLYS);
-	
-	// Secondly, store all polygon edges.
-	m_nsegs = 0;
-	float segs[MAX_SEGS_PER_POLY*6];
-	int nsegs = 0;
-	for (int j = 0; j < nlocals; ++j)
-	{
-		navquery->getPolyWallSegments(locals[j], filter, segs, &nsegs, MAX_SEGS_PER_POLY);
-		for (int k = 0; k < nsegs; ++k)
-		{
-			const float* s = &segs[k*6];
-			// Skip too distant segments.
-			float tseg;
-			const float distSqr = dtDistancePtSegSqr2D(pos, s, s+3, tseg);
-			if (distSqr > dtSqr(collisionQueryRange))
-				continue;
-			addSegment(distSqr, s);
-		}
-	}
-}
-
-
-CrowdManager::CrowdManager() :
-	m_obstacleQuery(0),
-	m_pathResult(0),
-	m_maxPathResult(0),
-	m_totalTime(0),
-	m_rvoTime(0),
-	m_sampleCount(0),
-	m_moveRequestCount(0)
-{
-	dtVset(m_ext, 2,4,2);
-	
-	m_obstacleQuery = dtAllocObstacleAvoidanceQuery();
-	m_obstacleQuery->init(6, 8);
-	
-	m_obstacleQuery->setDesiredVelocityWeight(2.0f);
-	m_obstacleQuery->setCurrentVelocityWeight(0.75f);
-	m_obstacleQuery->setPreferredSideWeight(0.75f);
-	m_obstacleQuery->setCollisionTimeWeight(2.5f);
-	m_obstacleQuery->setTimeHorizon(2.5f);
-	m_obstacleQuery->setVelocitySelectionBias(0.4f);
-	
-	memset(m_vodebug, 0, sizeof(m_vodebug));
-	const int maxAdaptiveSamples = (VO_ADAPTIVE_DIVS*VO_ADAPTIVE_RINGS+1)*VO_ADAPTIVE_DEPTH;
-	const int maxGridSamples = VO_GRID_SIZE*VO_GRID_SIZE;
-	const int sampleCount = dtMax(maxAdaptiveSamples, maxGridSamples);
-	for (int i = 0; i < MAX_AGENTS; ++i)
-	{
-		m_vodebug[i] = dtAllocObstacleAvoidanceDebugData();
-		m_vodebug[i]->init(sampleCount);
-	}
-	
-	// Allocate temp buffer for merging paths.
-	m_maxPathResult = 256;
-	m_pathResult = (dtPolyRef*)dtAlloc(sizeof(dtPolyRef)*m_maxPathResult, DT_ALLOC_PERM);
-
-	// Alloca corridors.
-	for (int i = 0; i < MAX_AGENTS; ++i)
-	{
-		m_agents[i].corridor.init(m_maxPathResult);
-	}
-
-	// TODO: the radius should be related to the agent radius used to create the navmesh!
-	m_grid.init(100, 1.0f);
-	
-	reset();
-}
-
-CrowdManager::~CrowdManager()
-{
-	delete [] m_pathResult;
-	
-	for (int i = 0; i < MAX_AGENTS; ++i)
-		dtFreeObstacleAvoidanceDebugData(m_vodebug[i]);
-	dtFreeObstacleAvoidanceQuery(m_obstacleQuery);
-}
-
-void CrowdManager::reset()
-{
-	for (int i = 0; i < MAX_AGENTS; ++i)
-		m_agents[i].active = 0;
-}
-
-const int CrowdManager::getAgentCount() const
-{
-	return MAX_AGENTS;
-}
-
-const Agent* CrowdManager::getAgent(const int idx)
-{
-	return &m_agents[idx];
-}
-
-int CrowdManager::addAgent(const float* pos, const float radius, const float height, dtNavMeshQuery* navquery)
-{
-	// Find empty slot.
-	int idx = -1;
-	for (int i = 0; i < MAX_AGENTS; ++i)
-	{
-		if (!m_agents[i].active)
-		{
-			idx = i;
-			break;
-		}
-	}
-	if (idx == -1)
-		return -1;
-	
-	Agent* ag = &m_agents[idx];
-
-	// Find nearest position on navmesh and place the agent there.
-	float nearest[3];
-	dtPolyRef ref;
-	navquery->findNearestPoly(pos, m_ext, &m_filter, &ref, nearest);
-	if (!ref)
-	{
-		// Could not find a location on navmesh.
-		return -1;
-	}
-	
-	ag->corridor.reset(ref, nearest);
-	ag->boundary.reset();
-
-	ag->radius = radius;
-	ag->height = height;
-	ag->collisionQueryRange = radius * 8;
-	ag->pathOptimizationRange = radius * 30;
-	ag->topologyOptTime = 0;
-	ag->nneis = 0;
-	
-	dtVset(ag->dvel, 0,0,0);
-	dtVset(ag->nvel, 0,0,0);
-	dtVset(ag->vel, 0,0,0);
-	dtVcopy(ag->npos, nearest);
-	
-	ag->maxspeed = 0;
-	ag->t = 0;
-	dtVset(ag->opts, 0,0,0);
-	dtVset(ag->opte, 0,0,0);
-	ag->active = 1;
-	ag->var = (rand() % 10) / 9.0f;
-	
-	// Init trail
-	for (int i = 0; i < AGENT_MAX_TRAIL; ++i)
-		dtVcopy(&ag->trail[i*3], ag->corridor.getPos());
-	ag->htrail = 0;
-	
-	return idx;
-}
-
-void CrowdManager::removeAgent(const int idx)
-{
-	if (idx >= 0 && idx < MAX_AGENTS)
-	{
-		m_agents[idx].active = 0;
-	}
-}
-
-bool CrowdManager::requestMoveTarget(const int idx, dtPolyRef ref, const float* pos)
-{
-	if (idx < 0 || idx > MAX_AGENTS)
-		return false;
-	if (!ref)
-		return false;
-	
-	MoveRequest* req = 0;
-	// Check if there is existing request and update that instead.
-	for (int i = 0; i < m_moveRequestCount; ++i)
-	{
-		if (m_moveRequests[i].idx == idx)
-		{
-			req = &m_moveRequests[i];
-			break;
-		}
-	}
-	if (!req)
-	{
-		if (m_moveRequestCount >= MAX_AGENTS)
-			return false;
-		req = &m_moveRequests[m_moveRequestCount++];
-		memset(req, 0, sizeof(MoveRequest));
-	}
-	
-	// Initialize request.
-	req->idx = idx;
-	req->ref = ref;
-	dtVcopy(req->pos, pos);
-	req->pathqRef = PATHQ_INVALID;
-	req->state = MR_TARGET_REQUESTING;
-
-	req->temp[0] = ref;
-	req->ntemp = 1;
-
-	return true;
-}
-
-bool CrowdManager::adjustMoveTarget(const int idx, dtPolyRef ref, const float* pos)
-{
-	if (idx < 0 || idx > MAX_AGENTS)
-		return false;
-	if (!ref)
-		return false;
-	
-	MoveRequest* req = 0;
-	// Check if there is existing request and update that instead.
-	for (int i = 0; i < m_moveRequestCount; ++i)
-	{
-		if (m_moveRequests[i].idx == idx)
-		{
-			req = &m_moveRequests[i];
-			break;
-		}
-	}
-	if (!req)
-	{
-		if (m_moveRequestCount >= MAX_AGENTS)
-			return false;
-		req = &m_moveRequests[m_moveRequestCount++];
-		memset(req, 0, sizeof(MoveRequest));
-
-		// New adjust request
-		req->state = MR_TARGET_ADJUST;
-		req->idx = idx;
-	}
-
-	// Set adjustment request.
-	req->aref = ref;
-	dtVcopy(req->apos, pos);
-
-	return true;
-}
-
-int CrowdManager::getActiveAgents(Agent** agents, const int maxAgents)
-{
-	int n = 0;
-	for (int i = 0; i < MAX_AGENTS; ++i)
-	{
-		if (!m_agents[i].active) continue;
-		if (n < maxAgents)
-			agents[n++] = &m_agents[i];
-	}
-	return n;
-}
-
-
-static int addNeighbour(const int idx, const float dist,
-						Neighbour* neis, const int nneis, const int maxNeis)
-{
-	// Insert neighbour based on the distance.
-	Neighbour* nei = 0;
-	if (!nneis)
-	{
-		nei = &neis[nneis];
-	}
-	else if (dist >= neis[nneis-1].dist)
-	{
-		if (nneis >= maxNeis)
-			return nneis;
-		nei = &neis[nneis];
-	}
-	else
-	{
-		int i;
-		for (i = 0; i < nneis; ++i)
-			if (dist <= neis[i].dist)
-				break;
-		
-		const int tgt = i+1;
-		const int n = dtMin(nneis-i, maxNeis-tgt);
-		
-		dtAssert(tgt+n <= maxNeis);
-		
-		if (n > 0)
-			memmove(&neis[tgt], &neis[i], sizeof(Neighbour)*n);
-		nei = &neis[i];
-	}
-	
-	memset(nei, 0, sizeof(Neighbour));
-
-	nei->idx = idx;
-	nei->dist = dist;
-	
-	return dtMin(nneis+1, maxNeis);
-}
-
-int CrowdManager::getNeighbours(const float* pos, const float height, const float range,
-								const Agent* skip, Neighbour* result, const int maxResult)
-{
-	int n = 0;
-	
-	unsigned short ids[MAX_AGENTS];
-	int nids = m_grid.queryItems(pos[0]-range, pos[2]-range,
-								 pos[0]+range, pos[2]+range,
-								 ids, MAX_AGENTS);
-	
-	for (int i = 0; i < nids; ++i)
-	{
-		Agent* ag = &m_agents[ids[i]];
-
-		if (ag == skip) continue;
-
-		// Check for overlap.
-		float diff[3];
-		dtVsub(diff, pos, ag->npos);
-		if (fabsf(diff[1]) >= (height+ag->height)/2.0f)
-			continue;
-		diff[1] = 0;
-		const float distSqr = dtVlenSqr(diff);
-		if (distSqr > dtSqr(range))
-			continue;
-		
-		n = addNeighbour(ids[i], distSqr, result, n, maxResult);
-	}
-	return n;
-}
-
-void CrowdManager::updateMoveRequest(const float dt, dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	// Fire off new requests.
-	for (int i = 0; i < m_moveRequestCount; ++i)
-	{
-		MoveRequest* req = &m_moveRequests[i];
-		Agent* ag = &m_agents[req->idx];
-		
-		// Agent not active anymore, kill request.
-		if (!ag->active)
-			req->state = MR_TARGET_FAILED;
-		
-		// Adjust target
-		if (req->aref)
-		{
-			if (req->state == MR_TARGET_ADJUST)
-			{
-				// Adjust existing path.
-				ag->corridor.moveTargetPosition(req->apos, navquery, filter);
-				req->state = MR_TARGET_VALID;
-			}
-			else
-			{
-				// Adjust on the flight request.
-				float result[3];
-				static const int MAX_VISITED = 16;
-				dtPolyRef visited[MAX_VISITED];
-				int nvisited = 0;
-				navquery->moveAlongSurface(req->temp[req->ntemp-1], req->pos, req->apos, filter,
-										   result, visited, &nvisited, MAX_VISITED);
-				req->ntemp = fixupCorridorEnd(req->temp, req->ntemp, MAX_TEMP_PATH, visited, nvisited);
-				dtVcopy(req->pos, result);
-				
-				// Reset adjustment.
-				dtVset(req->apos, 0,0,0);
-				req->aref = 0;
-			}
-		}
-		
-		
-		if (req->state == MR_TARGET_REQUESTING)
-		{
-			// Calculate request position.
-			// If there is a lot of latency between requests, it is possible to
-			// project the current position ahead and use raycast to find the actual
-			// location and path.
-			const dtPolyRef* path = ag->corridor.getPath();
-			const int npath = ag->corridor.getPathCount();
-			dtAssert(npath);
-			
-			// Here we take the simple approach and set the path to be just the current location.
-			float reqPos[3];
-			dtVcopy(reqPos, ag->corridor.getPos());	// The location of the request
-			dtPolyRef reqPath[8];					// The path to the request location
-			reqPath[0] = path[0];
-			int reqPathCount = 1;
-			
-			req->pathqRef = m_pathq.request(reqPath[reqPathCount-1], req->ref, reqPos, req->pos, &m_filter);
-			if (req->pathqRef != PATHQ_INVALID)
-			{
-				ag->corridor.setCorridor(reqPos, reqPath, reqPathCount);
-				req->state = MR_TARGET_WAITING_FOR_PATH;
-			}
-		}
-	}
-	
-	// Update requests.
-	m_pathq.update(navquery);
-	
-
-	// Process path results.
-	for (int i = 0; i < m_moveRequestCount; ++i)
-	{
-		MoveRequest* req = &m_moveRequests[i];
-		Agent* ag = &m_agents[req->idx];
-		
-		if (req->state == MR_TARGET_WAITING_FOR_PATH)
-		{
-			// Poll path queue.
-			int state = m_pathq.getRequestState(req->pathqRef);
-			if (state == PATHQ_STATE_INVALID)
-			{
-				req->pathqRef = PATHQ_INVALID;
-				req->state = MR_TARGET_FAILED;
-			}
-			else if (state == PATHQ_STATE_READY)
-			{
-				const dtPolyRef* path = ag->corridor.getPath();
-				const int npath = ag->corridor.getPathCount();
-				dtAssert(npath);
-				
-				// Apply results.
-				float targetPos[3];
-				dtVcopy(targetPos, req->pos);
-				
-				dtPolyRef* res = m_pathResult;
-				bool valid = true;
-				int nres = m_pathq.getPathResult(req->pathqRef, res, m_maxPathResult);
-				if (!nres)
-					valid = false;
-				
-				// Merge with any target adjustment that happened during the search.
-				if (req->ntemp > 1)
-				{
-					nres = fixupCorridorEnd(res, nres, m_maxPathResult, req->temp, req->ntemp);
-				}
-				
-				// Merge result and existing path.
-				// The agent might have moved whilst the request is
-				// being processed, so the path may have changed.
-				// We assume that the end of the path is at the same location
-				// where the request was issued.
-				
-				// The last ref in the old path should be the same as
-				// the location where the request was issued..
-				if (valid && path[npath-1] != res[0])
-					valid = false;
-				
-				if (valid)
-				{
-					// Put the old path infront of the old path.
-					if (npath > 1)
-					{
-						// Make space for the old path.
-						if ((npath-1)+nres > m_maxPathResult)
-							nres = m_maxPathResult - (npath-1);
-						memmove(res+npath-1, res, sizeof(dtPolyRef)*nres);
-						// Copy old path in the beginning.
-						memcpy(res, path, sizeof(dtPolyRef)*(npath-1));
-						nres += npath-1;
-					}
-					
-					// Check for partial path.
-					if (res[nres-1] != req->ref)
-					{
-						// Partial path, constrain target position inside the last polygon.
-						float nearest[3];
-						if (navquery->closestPointOnPoly(res[nres-1], targetPos, nearest) == DT_SUCCESS)
-							dtVcopy(targetPos, nearest);
-						else
-							valid = false;
-					}
-				}
-				
-				if (valid)
-				{
-					ag->corridor.setCorridor(targetPos, res, nres);
-					req->state = MR_TARGET_VALID;
-				}
-				else
-				{
-					// Something went wrong.
-					req->state = MR_TARGET_FAILED;
-				}
-			}
-		}
-		
-		// Remove request when done with it.
-		if (req->state == MR_TARGET_VALID || req->state == MR_TARGET_FAILED)
-		{
-			m_moveRequestCount--;
-			if (i != m_moveRequestCount)
-				memcpy(&m_moveRequests[i], &m_moveRequests[m_moveRequestCount], sizeof(MoveRequest));
-			--i;
-		}
-	}
-	
-}
-
-
-
-static int addToOptQueue(Agent* newag, Agent** agents, const int nagents, const int maxAgents)
-{
-	// Insert neighbour based on greatest time.
-	int slot = 0;
-	if (!nagents)
-	{
-		slot = nagents;
-	}
-	else if (newag->topologyOptTime <= agents[nagents-1]->topologyOptTime)
-	{
-		if (nagents >= maxAgents)
-			return nagents;
-		slot = nagents;
-	}
-	else
-	{
-		int i;
-		for (i = 0; i < nagents; ++i)
-			if (newag->topologyOptTime >= agents[i]->topologyOptTime)
-				break;
-		
-		const int tgt = i+1;
-		const int n = dtMin(nagents-i, maxAgents-tgt);
-		
-		dtAssert(tgt+n <= maxAgents);
-		
-		if (n > 0)
-			memmove(&agents[tgt], &agents[i], sizeof(Agent*)*n);
-		slot = i;
-	}
-
-	agents[slot] = newag;
-	
-	return dtMin(nagents+1, maxAgents);
-}
-
-void CrowdManager::updateTopologyOptimization(const float dt, dtNavMeshQuery* navquery, const dtQueryFilter* filter)
-{
-	Agent* agents[MAX_AGENTS];
-	int nagents = getActiveAgents(agents, MAX_AGENTS);
-	if (!nagents)
-		return;
-	
-	const float OPT_TIME_THR = 0.5f; // seconds
-	const int OPT_MAX_AGENTS = 1;
-	
-	Agent* queue[OPT_MAX_AGENTS];
-	int nqueue = 0;
-	
-	for (int i = 0; i < nagents; ++i)
-	{
-		Agent* ag = agents[i];
-		ag->topologyOptTime += dt;
-		if (ag->topologyOptTime >= OPT_TIME_THR)
-		{
-			nqueue = addToOptQueue(ag, queue, nqueue, OPT_MAX_AGENTS);
-		}
-	}
-
-	for (int i = 0; i < nqueue; ++i)
-	{
-		Agent* ag = queue[i];
-		ag->corridor.optimizePathTopology(navquery, filter);
-		ag->topologyOptTime = 0;
-	}
-
-}
-
-void CrowdManager::update(const float dt, unsigned int flags, dtNavMeshQuery* navquery)
-{
-	m_sampleCount = 0;
-	m_totalTime = 0;
-	m_rvoTime = 0;
-	
-	if (!navquery)
-		return;
-	
-	TimeVal startTime = getPerfTime();
-	
-	Agent* agents[MAX_AGENTS];
-	int nagents = getActiveAgents(agents, MAX_AGENTS);
-	
-	static const float MAX_ACC = 8.0f;
-	static const float MAX_SPEED = 3.5f;
-
-	// Update async move request and path finder.
-	updateMoveRequest(dt, navquery, &m_filter);
-
-	// Optimize path topology.
-	if (flags & CROWDMAN_OPTIMIZE_TOPO)
-		updateTopologyOptimization(dt, navquery, &m_filter);
-	
-	// Register agents to proximity grid.
-	m_grid.clear();
-	for (int i = 0; i < nagents; ++i)
-	{
-		Agent* ag = agents[i];
-		const float* p = ag->npos;
-		const float r = ag->radius;
-		m_grid.addItem((unsigned short)i, p[0]-r, p[2]-r, p[0]+r, p[2]+r);
-	}
-	
-	// Get nearby navmesh segments and agents to collide with.
-	for (int i = 0; i < nagents; ++i)
-	{
-		Agent* ag = agents[i];
-		// Only update the collision boundary after certain distance has been passed.
-		if (dtVdist2DSqr(ag->npos, ag->boundary.getCenter()) > dtSqr(ag->collisionQueryRange*0.25f))
-			ag->boundary.update(ag->corridor.getFirstPoly(), ag->npos, ag->collisionQueryRange, navquery, &m_filter);
-		// Query neighbour agents
-		ag->nneis = getNeighbours(ag->npos, ag->height, ag->collisionQueryRange, ag, ag->neis, AGENT_MAX_NEIGHBOURS);
-	}
-	
-	// Find next corner to steer to.
-	for (int i = 0; i < nagents; ++i)
-	{
-		Agent* ag = agents[i];
-		
-		// Find corners for steering
-		ag->ncorners = ag->corridor.findCorners(ag->cornerVerts, ag->cornerFlags, ag->cornerPolys,
-												AGENT_MAX_CORNERS, navquery, &m_filter);
-		
-		// Check to see if the corner after the next corner is directly visible,
-		// and short cut to there.
-		if ((flags & CROWDMAN_OPTIMIZE_VIS) && ag->ncorners > 0)
-		{
-			const float* target = &ag->cornerVerts[dtMin(1,ag->ncorners-1)*3];
-			dtVcopy(ag->opts, ag->corridor.getPos());
-			dtVcopy(ag->opte, target);
-			ag->corridor.optimizePathVisibility(target, ag->pathOptimizationRange, navquery, &m_filter);
-		}
-		else
-		{
-			dtVset(ag->opts, 0,0,0);
-			dtVset(ag->opte, 0,0,0);
-		}
-		
-		// Copy data for debug purposes.
-	}
-	
-	// Calculate steering.
-	for (int i = 0; i < nagents; ++i)
-	{
-		Agent* ag = agents[i];
-		
-		float dvel[3] = {0,0,0};
-		
-		// Calculate steering direction.
-		if (flags & CROWDMAN_ANTICIPATE_TURNS)
-			ag->calcSmoothSteerDirection(dvel);
-		else
-			ag->calcStraightSteerDirection(dvel);
-		
-		// Calculate speed scale, which tells the agent to slowdown at the end of the path.
-		const float slowDownRadius = ag->radius*2;	// TODO: make less hacky.
-		const float speedScale = ag->getDistanceToGoal(slowDownRadius) / slowDownRadius;
-		
-		// Apply style.
-		if (flags & CROWDMAN_DRUNK)
-		{
-			// Drunken steering
-			
-			// Pulsating speed.
-			ag->t += dt * (1.0f - ag->var*0.25f);
-			ag->maxspeed = MAX_SPEED*(1 + dtSqr(cosf(ag->t*2.0f))*0.3f);
-			
-			dtVscale(dvel, dvel, ag->maxspeed * speedScale);
-			
-			// Slightly wandering steering.
-			const float amp = cosf(ag->var*13.69f+ag->t*3.123f) * 0.2f;
-			const float nx = -dvel[2];
-			const float nz = dvel[0];
-			dvel[0] += nx*amp;
-			dvel[2] += nz*amp;
-		}
-		else
-		{
-			// Normal steering.
-			ag->maxspeed = MAX_SPEED;
-			dtVscale(dvel, dvel, ag->maxspeed * speedScale);
-		}
-		
-		// Set the desired velocity.
-		dtVcopy(ag->dvel, dvel);
-	}
-	
-	// Velocity planning.
-	TimeVal rvoStartTime = getPerfTime();
-	
-	for (int i = 0; i < nagents; ++i)
-	{
-		Agent* ag = agents[i];
-		
-		if (flags & CROWDMAN_USE_VO)
-		{
-			m_obstacleQuery->reset();
-			
-			// Add neighbours as obstacles.
-			for (int j = 0; j < ag->nneis; ++j)
-			{
-				const Agent* nei = &m_agents[ag->neis[j].idx];
-				m_obstacleQuery->addCircle(nei->npos, nei->radius, nei->vel, nei->dvel);
-			}
-
-			// Append neighbour segments as obstacles.
-			for (int j = 0; j < ag->boundary.getSegmentCount(); ++j)
-			{
-				const float* s = ag->boundary.getSegment(j);
-				if (dtTriArea2D(ag->npos, s, s+3) < 0.0f)
-					continue;
-				m_obstacleQuery->addSegment(s, s+3);
-			}
-
-			// Sample new safe velocity.
-			bool adaptive = true;
-
-			if (adaptive)
-			{
-				m_obstacleQuery->sampleVelocityAdaptive(ag->npos, ag->radius, ag->maxspeed,
-														ag->vel, ag->dvel, ag->nvel,
-														VO_ADAPTIVE_DIVS, VO_ADAPTIVE_RINGS, VO_ADAPTIVE_DEPTH,
-														m_vodebug[i]);
-			}
-			else
-			{
-				m_obstacleQuery->sampleVelocityGrid(ag->npos, ag->radius, ag->maxspeed,
-													ag->vel, ag->dvel, ag->nvel,
-													VO_GRID_SIZE, m_vodebug[i]);
-			}
-		}
-		else
-		{
-			// If not using velocity planning, new velocity is directly the desired velocity.
-			dtVcopy(ag->nvel, ag->dvel);
-		}
-	}
-	TimeVal rvoEndTime = getPerfTime();
-	
-	// Integrate.
-	for (int i = 0; i < nagents; ++i)
-	{
-		Agent* ag = agents[i];
-		ag->integrate(MAX_ACC, dt);
-	}
-	
-	// Handle collisions.
-	for (int iter = 0; iter < 4; ++iter)
-	{
-		for (int i = 0; i < nagents; ++i)
-		{
-			Agent* ag = agents[i];
-			
-			dtVset(ag->disp, 0,0,0);
-			
-			float w = 0;
-
-			for (int j = 0; j < ag->nneis; ++j)
-			{
-				const Agent* nei = &m_agents[ag->neis[j].idx];
-				
-				float diff[3];
-				dtVsub(diff, ag->npos, nei->npos);
-				
-				if (fabsf(diff[1]) >= (ag->height+  nei->height)/2.0f)
-					continue;
-				
-				diff[1] = 0;
-				
-				float dist = dtVlenSqr(diff);
-				if (dist > dtSqr(ag->radius + nei->radius))
-					continue;
-				dist = sqrtf(dist);
-				float pen = (ag->radius + nei->radius) - dist;
-				if (dist > 0.0001f)
-					pen = (1.0f/dist) * (pen*0.5f) * 0.7f;
-				
-				dtVmad(ag->disp, ag->disp, diff, pen);			
-				
-				w += 1.0f;
-			}
-			
-			if (w > 0.0001f)
-			{
-				const float iw = 1.0f / w;
-				dtVscale(ag->disp, ag->disp, iw);
-			}
-		}
-		
-		for (int i = 0; i < nagents; ++i)
-		{
-			Agent* ag = agents[i];
-			dtVadd(ag->npos, ag->npos, ag->disp);
-		}
-	}
-	
-	for (int i = 0; i < nagents; ++i)
-	{
-		Agent* ag = agents[i];
-		// Move along navmesh.
-		ag->corridor.movePosition(ag->npos, navquery, &m_filter);
-		// Get valid constrained position back.
-		dtVcopy(ag->npos, ag->corridor.getPos());
-	}
-	
-	TimeVal endTime = getPerfTime();
-
-	// Debug/demo book keeping
-	int ns = 0;
-	for (int i = 0; i < nagents; ++i)
-	{
-		Agent* ag = agents[i];
-		
-		if (flags & CROWDMAN_USE_VO)
-		{
-			// Normalize samples for debug draw
-			m_vodebug[i]->normalizeSamples();
-			ns += m_vodebug[i]->getSampleCount();
-		}
-		
-		// Update agent movement trail.
-		ag->htrail = (ag->htrail + 1) % AGENT_MAX_TRAIL;
-		dtVcopy(&ag->trail[ag->htrail*3], ag->npos);
-	}
-
-	m_sampleCount = ns;
-	m_rvoTime = getPerfDeltaTimeUsec(rvoStartTime, rvoEndTime);
-	m_totalTime = getPerfDeltaTimeUsec(startTime, endTime);
-}
-
-
diff --git a/dep/recastnavigation/RecastDemo/Source/CrowdTool.cpp b/dep/recastnavigation/RecastDemo/Source/CrowdTool.cpp
deleted file mode 100644
index 9a739d655e1..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/CrowdTool.cpp
+++ /dev/null
@@ -1,642 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include <float.h>
-#include "SDL.h"
-#include "SDL_opengl.h"
-#include "imgui.h"
-#include "CrowdTool.h"
-#include "InputGeom.h"
-#include "Sample.h"
-#include "DetourDebugDraw.h"
-#include "DetourObstacleAvoidance.h"
-#include "DetourCommon.h"
-#include "SampleInterfaces.h"
-#include "CrowdManager.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-
-static bool isectSegAABB(const float* sp, const float* sq,
-						 const float* amin, const float* amax,
-						 float& tmin, float& tmax)
-{
-	static const float EPS = 1e-6f;
-	
-	float d[3];
-	dtVsub(d, sq, sp);
-	tmin = 0;  // set to -FLT_MAX to get first hit on line
-	tmax = FLT_MAX;		// set to max distance ray can travel (for segment)
-	
-	// For all three slabs
-	for (int i = 0; i < 3; i++)
-	{
-		if (fabsf(d[i]) < EPS)
-		{
-			// Ray is parallel to slab. No hit if origin not within slab
-			if (sp[i] < amin[i] || sp[i] > amax[i])
-				return false;
-		}
-		else
-		{
-			// Compute intersection t value of ray with near and far plane of slab
-			const float ood = 1.0f / d[i];
-			float t1 = (amin[i] - sp[i]) * ood;
-			float t2 = (amax[i] - sp[i]) * ood;
-			// Make t1 be intersection with near plane, t2 with far plane
-			if (t1 > t2) dtSwap(t1, t2);
-			// Compute the intersection of slab intersections intervals
-			if (t1 > tmin) tmin = t1;
-			if (t2 < tmax) tmax = t2;
-			// Exit with no collision as soon as slab intersection becomes empty
-			if (tmin > tmax) return false;
-		}
-	}
-	
-	return true;
-}
-
-static void getAgentBounds(const Agent* ag, float* bmin, float* bmax)
-{
-	const float* p = ag->npos;
-	const float r = ag->radius;
-	const float h = ag->height;
-	bmin[0] = p[0] - r;
-	bmin[1] = p[1];
-	bmin[2] = p[2] - r;
-	bmax[0] = p[0] + r;
-	bmax[1] = p[1] + h;
-	bmax[2] = p[2] + r;
-}
-
-CrowdTool::CrowdTool() :
-	m_sample(0),
-	m_oldFlags(0),
-	m_targetRef(0),
-	m_expandDebugDraw(false),
-	m_showLabels(false),
-	m_showCorners(false),
-	m_showTargets(false),
-	m_showCollisionSegments(false),
-	m_showPath(false),
-	m_showVO(false),
-	m_showOpt(false),
-	m_showGrid(false),
-	m_showNodes(false),
-	m_showPerfGraph(false),
-	m_expandOptions(true),
-	m_anticipateTurns(true),
-	m_optimizeVis(true),
-	m_optimizeTopo(true),
-	m_useVO(true),
-	m_drunkMove(false),
-	m_run(true),
-	m_mode(TOOLMODE_CREATE)
-{
-}
-
-CrowdTool::~CrowdTool()
-{
-	if (m_sample)
-	{
-		m_sample->setNavMeshDrawFlags(m_oldFlags);
-	}
-}
-
-void CrowdTool::init(Sample* sample)
-{
-	if (m_sample != sample)
-	{
-		m_sample = sample;
-		m_oldFlags = m_sample->getNavMeshDrawFlags();
-		m_sample->setNavMeshDrawFlags(m_oldFlags & ~DU_DRAWNAVMESH_CLOSEDLIST);
-	}
-}
-
-void CrowdTool::reset()
-{
-	m_targetRef = 0;
-}
-
-void CrowdTool::handleMenu()
-{
-
-	if (imguiCheck("Create Agents", m_mode == TOOLMODE_CREATE))
-		m_mode = TOOLMODE_CREATE;
-	if (imguiCheck("Move Target", m_mode == TOOLMODE_MOVE_TARGET))
-		m_mode = TOOLMODE_MOVE_TARGET;
-	
-	imguiSeparator();
-	
-	if (m_mode == TOOLMODE_CREATE)
-	{
-		imguiValue("Click to add agents.");
-		imguiValue("Shift+Click to remove.");
-	}
-	else if (m_mode == TOOLMODE_MOVE_TARGET)
-	{
-		imguiValue("Click to set move target.");
-		imguiValue("Shift+Click to adjust target.");
-		imguiValue("Adjusting uses special pathfinder");
-		imguiValue("which is really fast to change the");
-		imguiValue("target in small increments.");
-	}
-	
-	imguiSeparator();
-	imguiSeparator();
-	
-	if (imguiCollapse("Options", 0, m_expandOptions))
-		m_expandOptions = !m_expandOptions;
-	
-	if (m_expandOptions)
-	{
-		imguiIndent();
-		if (imguiCheck("Optimize Visibility", m_optimizeVis))
-			m_optimizeVis = !m_optimizeVis;
-		if (imguiCheck("Optimize Topology", m_optimizeTopo))
-			m_optimizeTopo = !m_optimizeTopo;
-		if (imguiCheck("Anticipate Turns", m_anticipateTurns))
-			m_anticipateTurns = !m_anticipateTurns;
-		if (imguiCheck("Use VO", m_useVO))
-			m_useVO = !m_useVO;
-		if (imguiCheck("Drunk Move", m_drunkMove))
-			m_drunkMove = !m_drunkMove;
-		imguiUnindent();
-	}
-
-	if (imguiCollapse("Debug Draw", 0, m_expandDebugDraw))
-		m_expandDebugDraw = !m_expandDebugDraw;
-		
-	if (m_expandDebugDraw)
-	{
-		imguiIndent();
-		if (imguiCheck("Show Labels", m_showLabels))
-			m_showLabels = !m_showLabels;
-		if (imguiCheck("Show Corners", m_showCorners))
-			m_showCorners = !m_showCorners;
-		if (imguiCheck("Show Targets", m_showTargets))
-			m_showTargets = !m_showTargets;
-		if (imguiCheck("Show Collision Segs", m_showCollisionSegments))
-			m_showCollisionSegments = !m_showCollisionSegments;
-		if (imguiCheck("Show Path", m_showPath))
-			m_showPath = !m_showPath;
-		if (imguiCheck("Show VO", m_showVO))
-			m_showVO = !m_showVO;
-		if (imguiCheck("Show Path Optimization", m_showOpt))
-			m_showOpt = !m_showOpt;
-		if (imguiCheck("Show Prox Grid", m_showGrid))
-			m_showGrid = !m_showGrid;
-		if (imguiCheck("Show Nodes", m_showNodes))
-			m_showNodes = !m_showNodes;
-		if (imguiCheck("Show Perf Graph", m_showPerfGraph))
-			m_showPerfGraph = !m_showPerfGraph;
-		imguiUnindent();
-	}
-}
-
-void CrowdTool::handleClick(const float* s, const float* p, bool shift)
-{
-	if (!m_sample) return;
-	InputGeom* geom = m_sample->getInputGeom();
-	if (!geom) return;
-
-	if (m_mode == TOOLMODE_CREATE)
-	{
-		if (shift)
-		{
-			// Delete
-			int isel = -1;
-			float tsel = FLT_MAX;
-			
-			for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-			{
-				const Agent* ag = m_crowd.getAgent(i);
-				if (!ag->active) continue;
-				float bmin[3], bmax[3];
-				getAgentBounds(ag, bmin, bmax);
-				float tmin, tmax;
-				if (isectSegAABB(s, p, bmin,bmax, tmin, tmax))
-				{
-					if (tmin > 0 && tmin < tsel)
-					{
-						isel = i;
-						tsel = tmin;
-					} 
-				}
-			}
-			if (isel != -1)
-			{
-				m_crowd.removeAgent(isel);
-			}
-		}
-		else
-		{
-			// Add
-			dtNavMeshQuery* navquery = m_sample->getNavMeshQuery();
-			int idx = m_crowd.addAgent(p, m_sample->getAgentRadius(), m_sample->getAgentHeight(), navquery);
-			if (idx != -1 && m_targetRef)
-				m_crowd.requestMoveTarget(idx, m_targetRef, m_targetPos);
-		}
-	}
-	else if (m_mode == TOOLMODE_MOVE_TARGET)
-	{
-		// Find nearest point on navmesh and set move request to that location.
-		dtNavMeshQuery* navquery = m_sample->getNavMeshQuery();
-		const dtQueryFilter* filter = m_crowd.getFilter();
-		const float* ext = m_crowd.getQueryExtents();
-		
-		navquery->findNearestPoly(p, ext, filter, &m_targetRef, m_targetPos);
-		
-		if (shift)
-		{
-			// Adjust target using tiny local search.
-			for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-			{
-				const Agent* ag = m_crowd.getAgent(i);
-				if (!ag->active) continue;
-				m_crowd.adjustMoveTarget(i, m_targetRef, m_targetPos);
-			}
-		}
-		else
-		{
-			// Move target using paht finder
-			for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-			{
-				const Agent* ag = m_crowd.getAgent(i);
-				if (!ag->active) continue;
-				m_crowd.requestMoveTarget(i, m_targetRef, m_targetPos);
-			}
-		}
-	}
-}
-
-void CrowdTool::handleStep()
-{
-}
-
-void CrowdTool::handleToggle()
-{
-	m_run = !m_run;
-}
-
-void CrowdTool::handleUpdate(const float dt)
-{
-	if (!m_sample) return;
-	if (!m_sample->getNavMesh()) return;
-	if (m_run)
-	{
-		unsigned int flags = 0;
-
-		if (m_anticipateTurns)
-			flags |= CROWDMAN_ANTICIPATE_TURNS;
-		if (m_useVO)
-			flags |= CROWDMAN_USE_VO;
-		if (m_drunkMove)
-			flags |= CROWDMAN_DRUNK;
-		if (m_optimizeVis)
-			flags |= CROWDMAN_OPTIMIZE_VIS;
-		if (m_optimizeTopo)
-			flags |= CROWDMAN_OPTIMIZE_TOPO;
-			
-		m_crowd.update(dt, flags, m_sample->getNavMeshQuery());
-
-		m_crowdSampleCount.addSample((float)m_crowd.getSampleCount());
-		m_crowdTotalTime.addSample(m_crowd.getTotalTime() / 1000.0f);
-		m_crowdRvoTime.addSample(m_crowd.getRVOTime() / 1000.0f);
-	}
-}
-
-void CrowdTool::handleRender()
-{
-	DebugDrawGL dd;
-	const float s = m_sample->getAgentRadius();
-	
-	dtNavMesh* nmesh = m_sample->getNavMesh();
-	if (!nmesh)
-		return;
-
-	dtNavMeshQuery* navquery = m_sample->getNavMeshQuery();
-	
-	if (m_showNodes)
-	{
-		if (navquery)
-			duDebugDrawNavMeshNodes(&dd, *navquery);
-	}
-	
-	dd.depthMask(false);
-	
-	// Draw paths
-	if (m_showPath)
-	{
-		for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-		{
-			const Agent* ag = m_crowd.getAgent(i);
-			if (!ag->active) continue;
-			
-			const dtPolyRef* path = ag->corridor.getPath();
-			const int npath = ag->corridor.getPathCount();			
-			for (int i = 0; i < npath; ++i)
-				duDebugDrawNavMeshPoly(&dd, *nmesh, path[i], duRGBA(0,0,0,32));
-		}
-	}
-		
-	if (m_targetRef)
-		duDebugDrawCross(&dd, m_targetPos[0],m_targetPos[1]+0.1f,m_targetPos[2], s, duRGBA(255,255,255,192), 2.0f);
-	
-	// Occupancy grid.
-	if (m_showGrid)
-	{
-		float gridy = -FLT_MAX;
-		for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-		{
-			const Agent* ag = m_crowd.getAgent(i);
-			if (!ag->active) continue;
-			const float* pos = ag->corridor.getPos();
-			gridy = dtMax(gridy, pos[1]);
-		}
-		gridy += 1.0f;
-		
-		dd.begin(DU_DRAW_QUADS);
-		const ProximityGrid* grid = m_crowd.getGrid();
-		const int* bounds = grid->getBounds();
-		const float cs = grid->getCellSize();
-		for (int y = bounds[1]; y <= bounds[3]; ++y)
-		{
-			for (int x = bounds[0]; x <= bounds[2]; ++x)
-			{
-				const int count = grid->getItemCountAt(x,y); 
-				if (!count) continue;
-				unsigned int col = duRGBA(128,0,0,dtMin(count*40,255));
-				dd.vertex(x*cs, gridy, y*cs, col);
-				dd.vertex(x*cs, gridy, y*cs+cs, col);
-				dd.vertex(x*cs+cs, gridy, y*cs+cs, col);
-				dd.vertex(x*cs+cs, gridy, y*cs, col);
-			}
-		}
-		dd.end();
-	}
-	
-	// Trail
-	for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-	{
-		const Agent* ag = m_crowd.getAgent(i);
-		if (!ag->active) continue;
-
-		const float* pos = ag->npos;
-
-		dd.begin(DU_DRAW_LINES,3.0f);
-		float prev[3], preva = 1;
-		dtVcopy(prev, pos);
-		for (int j = 0; j < AGENT_MAX_TRAIL-1; ++j)
-		{
-			const int idx = (ag->htrail + AGENT_MAX_TRAIL-j) % AGENT_MAX_TRAIL;
-			const float* v = &ag->trail[idx*3];
-			float a = 1 - j/(float)AGENT_MAX_TRAIL;
-			dd.vertex(prev[0],prev[1]+0.1f,prev[2], duRGBA(0,0,0,(int)(128*preva)));
-			dd.vertex(v[0],v[1]+0.1f,v[2], duRGBA(0,0,0,(int)(128*a)));
-			preva = a;
-			dtVcopy(prev, v);
-		}
-		dd.end();
-
-	}
-
-	// Corners & co
-	for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-	{
-		const Agent* ag = m_crowd.getAgent(i);
-		if (!ag->active) continue;
-		
-		const float radius = ag->radius;
-		const float* pos = ag->npos;
-		
-		if (m_showCorners)
-		{
-			if (ag->ncorners)
-			{
-				dd.begin(DU_DRAW_LINES, 2.0f);
-				for (int j = 0; j < ag->ncorners; ++j)
-				{
-					const float* va = j == 0 ? pos : &ag->cornerVerts[(j-1)*3];
-					const float* vb = &ag->cornerVerts[j*3];
-					dd.vertex(va[0],va[1]+radius,va[2], duRGBA(128,0,0,192));
-					dd.vertex(vb[0],vb[1]+radius,vb[2], duRGBA(128,0,0,192));
-				}
-				dd.end();
-				
-				if (m_anticipateTurns)
-				{
-					/*					float dvel[3], pos[3];
-					 calcSmoothSteerDirection(ag->pos, ag->cornerVerts, ag->ncorners, dvel);
-					 pos[0] = ag->pos[0] + dvel[0];
-					 pos[1] = ag->pos[1] + dvel[1];
-					 pos[2] = ag->pos[2] + dvel[2];
-					 
-					 const float off = ag->radius+0.1f;
-					 const float* tgt = &ag->cornerVerts[0];
-					 const float y = ag->pos[1]+off;
-					 
-					 dd.begin(DU_DRAW_LINES, 2.0f);
-					 
-					 dd.vertex(ag->pos[0],y,ag->pos[2], duRGBA(255,0,0,192));
-					 dd.vertex(pos[0],y,pos[2], duRGBA(255,0,0,192));
-					 
-					 dd.vertex(pos[0],y,pos[2], duRGBA(255,0,0,192));
-					 dd.vertex(tgt[0],y,tgt[2], duRGBA(255,0,0,192));
-					 
-					 dd.end();*/
-				}
-			}
-		}
-		
-		if (m_showCollisionSegments)
-		{
-			const float* center = ag->boundary.getCenter();
-			duDebugDrawCross(&dd, center[0],center[1]+radius,center[2], 0.2f, duRGBA(192,0,128,255), 2.0f);
-			duDebugDrawCircle(&dd, center[0],center[1]+radius,center[2], ag->collisionQueryRange,
-							  duRGBA(192,0,128,128), 2.0f);
-			
-			dd.begin(DU_DRAW_LINES, 3.0f);
-			for (int j = 0; j < ag->boundary.getSegmentCount(); ++j)
-			{
-				const float* s = ag->boundary.getSegment(j);
-				unsigned int col = duRGBA(192,0,128,192);
-				if (dtTriArea2D(pos, s, s+3) < 0.0f)
-					col = duDarkenCol(col);
-				
-				duAppendArrow(&dd, s[0],s[1]+0.2f,s[2], s[3],s[4]+0.2f,s[5], 0.0f, 0.3f, col);
-			}
-			dd.end();
-		}
-		
-		if (m_showOpt)
-		{
-			dd.begin(DU_DRAW_LINES, 2.0f);
-			dd.vertex(ag->opts[0],ag->opts[1]+0.3f,ag->opts[2], duRGBA(0,128,0,192));
-			dd.vertex(ag->opte[0],ag->opte[1]+0.3f,ag->opte[2], duRGBA(0,128,0,192));
-			dd.end();
-		}
-	}
-	
-	// Agent cylinders.
-	for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-	{
-		const Agent* ag = m_crowd.getAgent(i);
-		if (!ag->active) continue;
-		
-		const float radius = ag->radius;
-		const float* pos = ag->npos;
-		
-		duDebugDrawCircle(&dd, pos[0], pos[1], pos[2], radius, duRGBA(0,0,0,32), 2.0f);
-	}
-
-	for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-	{
-		const Agent* ag = m_crowd.getAgent(i);
-		if (!ag->active) continue;
-		
-		const float height = ag->height;
-		const float radius = ag->radius;
-		const float* pos = ag->npos;
-		
-		duDebugDrawCylinder(&dd, pos[0]-radius, pos[1]+radius*0.1f, pos[2]-radius,
-							pos[0]+radius, pos[1]+height, pos[2]+radius,
-							duRGBA(220,220,220,128));
-	}
-	
-	
-	// Velocity stuff.
-	for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-	{
-		const Agent* ag = m_crowd.getAgent(i);
-		if (!ag->active) continue;
-		
-		const float radius = ag->radius;
-		const float height = ag->height;
-		const float* pos = ag->npos;
-		const float* vel = ag->vel;
-		const float* dvel = ag->dvel;
-
-		duDebugDrawCircle(&dd, pos[0], pos[1]+height, pos[2], radius, duRGBA(220,220,220,192), 2.0f);
-
-		if (m_showVO)
-		{
-			// Draw detail about agent sela
-			const dtObstacleAvoidanceDebugData* debug = m_crowd.getVODebugData(i);
-
-			const float dx = pos[0];
-			const float dy = pos[1]+height;
-			const float dz = pos[2];
-			
-			dd.begin(DU_DRAW_QUADS);
-			for (int i = 0; i < debug->getSampleCount(); ++i)
-			{
-				const float* p = debug->getSampleVelocity(i);
-				const float sr = debug->getSampleSize(i);
-				const float pen = debug->getSamplePenalty(i);
-				const float pen2 = debug->getSamplePreferredSidePenalty(i);
-				unsigned int col = duLerpCol(duRGBA(255,255,255,220), duRGBA(128,96,0,220), (int)(pen*255));
-				col = duLerpCol(col, duRGBA(128,0,0,220), (int)(pen2*128));
-				dd.vertex(dx+p[0]-sr, dy, dz+p[2]-sr, col);
-				dd.vertex(dx+p[0]-sr, dy, dz+p[2]+sr, col);
-				dd.vertex(dx+p[0]+sr, dy, dz+p[2]+sr, col);
-				dd.vertex(dx+p[0]+sr, dy, dz+p[2]-sr, col);
-			}
-			dd.end();
-			
-		}
-
-		duDebugDrawArrow(&dd, pos[0],pos[1]+height,pos[2],
-						 pos[0]+dvel[0],pos[1]+height+dvel[1],pos[2]+dvel[2],
-						 0.0f, 0.4f, duRGBA(0,192,255,192), 1.0f);
-		
-		duDebugDrawArrow(&dd, pos[0],pos[1]+height,pos[2],
-							  pos[0]+vel[0],pos[1]+height+vel[1],pos[2]+vel[2],
-							  0.0f, 0.4f, duRGBA(0,0,0,192), 2.0f);
-	}
-
-	// Targets
-	for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-	{
-		const Agent* ag = m_crowd.getAgent(i);
-		if (!ag->active) continue;
-		
-		const float* pos = ag->npos;
-		const float* target = ag->corridor.getTarget();
-		
-		if (m_showTargets)
-		{
-			duDebugDrawArc(&dd, pos[0], pos[1], pos[2], target[0], target[1], target[2],
-						   0.25f, 0, 0.4f, duRGBA(0,0,0,128), 1.0f);
-		}
-	}
-	
-	dd.depthMask(true);
-}
-
-void CrowdTool::handleRenderOverlay(double* proj, double* model, int* view)
-{
-	GLdouble x, y, z;
-	
-	// Draw start and end point labels
-	if (m_targetRef && gluProject((GLdouble)m_targetPos[0], (GLdouble)m_targetPos[1], (GLdouble)m_targetPos[2],
-								model, proj, view, &x, &y, &z))
-	{
-		imguiDrawText((int)x, (int)(y+25), IMGUI_ALIGN_CENTER, "TARGET", imguiRGBA(0,0,0,220));
-	}
-	
-	if (m_showLabels)
-	{
-		char label[32];
-		for (int i = 0; i < m_crowd.getAgentCount(); ++i)
-		{
-			const Agent* ag = m_crowd.getAgent(i);
-			if (!ag->active) continue;
-			const float* pos = ag->npos;
-			const float h = ag->height;
-			if (gluProject((GLdouble)pos[0], (GLdouble)pos[1]+h, (GLdouble)pos[2],
-						   model, proj, view, &x, &y, &z))
-			{
-				snprintf(label, 32, "%d", i);
-				imguiDrawText((int)x, (int)y+15, IMGUI_ALIGN_CENTER, label, imguiRGBA(0,0,0,220));
-			}
-			
-		}
-	}
-	
-	if (m_showPerfGraph)
-	{
-		GraphParams gp;
-		gp.setRect(300, 10, 500, 200, 8);
-		gp.setValueRange(0.0f, 2.0f, 4, "ms");
-
-		drawGraphBackground(&gp);
-		drawGraph(&gp, &m_crowdRvoTime, 0, "RVO Sampling", duRGBA(255,0,128,255));
-		drawGraph(&gp, &m_crowdTotalTime, 1, "Total", duRGBA(128,255,0,255));
-		
-		gp.setRect(300, 10, 500, 50, 8);
-		gp.setValueRange(0.0f, 2000.0f, 1, "0");
-		drawGraph(&gp, &m_crowdSampleCount, 0, "Sample Count", duRGBA(255,255,255,255));
-	}
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/Debug.cpp b/dep/recastnavigation/RecastDemo/Source/Debug.cpp
deleted file mode 100644
index 744f188b13d..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/Debug.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-
-#include "Debug.h"
-
-#include <vector>
-#include "DetourNavMesh.h"
-#include "Recast.h"
-
-#include <string>
-using namespace std;
-
-void duReadNavMesh(char* tile, dtNavMesh* &navMesh)
-{
-    FILE* file;
-
-    string tileName(tile);
-    tileName = tileName.substr(0, tileName.find_first_of('.'));
-    string mapName = "mmaps/" + tileName.substr(0, 3) + ".mmap";
-    file = fopen(mapName.c_str(), "rb");
-
-    if(!file)
-        return;
-
-    dtNavMeshParams params;
-    fread(&params, sizeof(dtNavMeshParams), 1, file);
-    fclose(file);
-
-    if (!navMesh)
-    {
-        dtFreeNavMesh(navMesh);
-        navMesh = dtAllocNavMesh();
-        navMesh->init(&params);
-    }
-
-    int map = atoi(tileName.substr(0, 3).c_str());
-    int x = atoi(tileName.substr(5, 2).c_str());
-    int y = atoi(tileName.substr(3, 2).c_str());
-    bool loaded = false;
-
-    char fname[50];
-
-    int count = 0;
-    for (int i = x-1; i <= x+1; ++i)
-        for (int j = y-1; j <= y+1; ++j)
-    //int i = x;
-    //int j = y;
-        {
-            sprintf(fname, "mmaps/%03i%02i%02i.mmtile", map, j, i);
-            file = fopen(fname, "rb");
-            if(file)
-            {
-                MmapTileHeader header;
-                fread(&header, sizeof(MmapTileHeader), 1, file);
-
-                unsigned char* data = (unsigned char*)dtAlloc(header.size, DT_ALLOC_PERM);
-                fread(data, header.size, 1, file);
-
-                dtStatus status = navMesh->addTile(data, header.size, DT_TILE_FREE_DATA, 0 , NULL);
-
-                if (status != DT_SUCCESS)
-                    dtFree(data);
-                else
-                    count++;
-
-                fclose(file);
-            }
-        }
-
-    if (!count)
-    {
-        dtFreeNavMesh(navMesh);
-        navMesh = NULL;
-    }
-}
-
-int duReadHeightfield(char* tile, rcHeightfield* &hf)
-{
-    FILE* file;
-
-    string tileName(tile);
-    tileName = tileName.substr(0, tileName.find_first_of('.'));
-    file = fopen(("meshes/" + tileName + ".hf").c_str(), "rb");
-    
-    if(!file)
-        return false;
-
-    hf = rcAllocHeightfield();
-
-    fread(&(hf->cs), sizeof(float), 1, file);
-    fread(&(hf->ch), sizeof(float), 1, file);
-    fread(&(hf->width), sizeof(int), 1, file);
-    fread(&(hf->height), sizeof(int), 1, file);
-    fread(hf->bmin, sizeof(float), 3, file);
-    fread(hf->bmax, sizeof(float), 3, file);
-
-    hf->spans = new rcSpan*[hf->width*hf->height];
-    memset(hf->spans, 0, sizeof(rcSpan*)*hf->width*hf->height);
-
-    for(int y = 0; y < hf->height; ++y)
-        for(int x = 0; x < hf->width; ++x)
-        {
-            int spanCount;
-            fread(&spanCount, sizeof(int), 1, file);
-
-            if(spanCount)
-                hf->spans[x + y*hf->width] = new rcSpan;
-            else
-                hf->spans[x + y*hf->width] = NULL;
-
-            rcSpan* span = hf->spans[x + y*hf->width];
-
-            while(spanCount--)
-            {
-                fread(span, sizeof(rcSpan), 1, file);
-
-                if(spanCount)
-                {
-                    span->next = new rcSpan;
-                    span = span->next;
-                }
-                else
-                    span->next = NULL;
-            }
-        }
-
-    fclose(file);
-
-    return false;
-}
-
-int duReadCompactHeightfield(char* tile, rcCompactHeightfield* &chf)
-{
-    FILE* file;
-
-    string tileName(tile);
-    tileName = tileName.substr(0, tileName.find_first_of('.'));
-    file = fopen(("meshes/" + tileName + ".chf").c_str(), "rb");
-    
-    if(!file)
-        return false;
-
-    chf = rcAllocCompactHeightfield();
-
-    fread(&chf->width, sizeof(chf->width), 1, file);
-    fread(&chf->height, sizeof(chf->height), 1, file);
-    fread(&chf->spanCount, sizeof(chf->spanCount), 1, file);
-
-    fread(&chf->walkableHeight, sizeof(chf->walkableHeight), 1, file);
-    fread(&chf->walkableClimb, sizeof(chf->walkableClimb), 1, file);
-
-    fread(&chf->maxDistance, sizeof(chf->maxDistance), 1, file);
-    fread(&chf->maxRegions, sizeof(chf->maxRegions), 1, file);
-
-    fread(chf->bmin, sizeof(chf->bmin), 1, file);
-    fread(chf->bmax, sizeof(chf->bmax), 1, file);
-    
-    fread(&chf->cs, sizeof(chf->cs), 1, file);
-    fread(&chf->ch, sizeof(chf->ch), 1, file);
-
-    int tmp = 0;
-    fread(&tmp, sizeof(tmp), 1, file);
-
-    if (tmp & 1)
-    {
-        chf->cells = new rcCompactCell[chf->width*chf->height];
-        fread(chf->cells, sizeof(rcCompactCell), chf->width*chf->height, file);
-    }
-    if (tmp & 2)
-    {
-        chf->spans = new rcCompactSpan[chf->spanCount];
-        fread(chf->spans, sizeof(rcCompactSpan), chf->spanCount, file);
-    }
-    if (tmp & 4)
-    {
-        chf->dist = new unsigned short[chf->spanCount];
-        fread(chf->dist, sizeof(unsigned short), chf->spanCount, file);
-    }
-    if (tmp & 8)
-    {
-        chf->areas = new unsigned char[chf->spanCount];
-        fread(chf->areas, sizeof(unsigned char), chf->spanCount, file);
-    }
-
-    fclose(file);
-
-    return false;
-}
-
-int duReadContourSet(char* tile, rcContourSet* &cs)
-{
-    FILE* file;
-
-    string tileName(tile);
-    tileName = tileName.substr(0, tileName.find_first_of('.'));
-    file = fopen(("meshes/" + tileName + ".cs").c_str(), "rb");
-    
-    if(!file)
-        return false;
-
-    cs = rcAllocContourSet();
-
-    fread(&(cs->cs), sizeof(float), 1, file);
-    fread(&(cs->ch), sizeof(float), 1, file);
-    fread(cs->bmin, sizeof(float), 3, file);
-    fread(cs->bmax, sizeof(float), 3, file);
-    fread(&(cs->nconts), sizeof(int), 1, file);
-
-    if(cs->nconts)
-        cs->conts = new rcContour[cs->nconts];
-
-    for(int j = 0; j < cs->nconts; ++j)
-    {
-        cs->conts[j].verts = 0;
-        cs->conts[j].rverts = 0;
-
-        fread(&(cs->conts[j].area), sizeof(unsigned char), 1, file);
-        fread(&(cs->conts[j].reg), sizeof(unsigned short), 1, file);
-
-        fread(&(cs->conts[j].nverts), sizeof(int), 1, file);
-        cs->conts[j].verts = new int[cs->conts[j].nverts*4];
-        fread(cs->conts[j].verts, sizeof(int), cs->conts[j].nverts*4, file);
-
-        fread(&(cs->conts[j].nrverts), sizeof(int), 1, file);
-        cs->conts[j].rverts = new int[cs->conts[j].nrverts*4];
-        fread(cs->conts[j].rverts, sizeof(int), cs->conts[j].nrverts*4, file);
-    }
-
-    fclose(file);
-
-    return false;
-}
-
-int duReadPolyMesh(char* tile, rcPolyMesh* &mesh)
-{
-    FILE* file;
-
-    string tileName(tile);
-    tileName = tileName.substr(0, tileName.find_first_of('.'));
-    file = fopen(("meshes/" + tileName + ".pmesh").c_str(), "rb");
-    
-    if(!file)
-        return false;
-
-    mesh = rcAllocPolyMesh();
-
-    fread(&(mesh->cs), sizeof(float), 1, file);
-    fread(&(mesh->ch), sizeof(float), 1, file);
-    fread(&(mesh->nvp), sizeof(int), 1, file);
-    fread(mesh->bmin, sizeof(float), 3, file);
-    fread(mesh->bmax, sizeof(float), 3, file);
-    fread(&(mesh->nverts), sizeof(int), 1, file);
-    mesh->verts = new unsigned short[mesh->nverts*3];
-    fread(mesh->verts, sizeof(unsigned short), mesh->nverts*3, file);
-    fread(&(mesh->npolys), sizeof(int), 1, file);
-    mesh->polys = new unsigned short[mesh->npolys*mesh->nvp*2];
-    mesh->flags = new unsigned short[mesh->npolys];
-    mesh->areas = new unsigned char[mesh->npolys];
-    mesh->regs = new unsigned short[mesh->npolys];
-    fread(mesh->polys, sizeof(unsigned short), mesh->npolys*mesh->nvp*2, file);
-    fread(mesh->flags, sizeof(unsigned short), mesh->npolys, file);
-    fread(mesh->areas, sizeof(unsigned char), mesh->npolys, file);
-    fread(mesh->regs, sizeof(unsigned short), mesh->npolys, file);
-
-    fclose(file);
-
-    return true;
-}
-
-int duReadDetailMesh(char* tile, rcPolyMeshDetail* &mesh)
-{
-    FILE* file;
-
-    string tileName(tile);
-    tileName = tileName.substr(0, tileName.find_first_of('.'));
-    file = fopen(("meshes/" + tileName + ".dmesh").c_str(), "rb");
-    
-    if(!file)
-        return false;
-
-    mesh = rcAllocPolyMeshDetail();
-
-    fread(&(mesh->nverts), sizeof(int), 1, file);
-    mesh->verts = new float[mesh->nverts*3];
-    fread(mesh->verts, sizeof(float), mesh->nverts*3, file);
-
-    fread(&(mesh->ntris), sizeof(int), 1, file);
-    mesh->tris = new unsigned char[mesh->ntris*4];
-    fread(mesh->tris, sizeof(char), mesh->ntris*4, file);
-
-    fread(&(mesh->nmeshes), sizeof(int), 1, file);
-    mesh->meshes = new unsigned int[mesh->nmeshes*4];
-    fread(mesh->meshes, sizeof(int), mesh->nmeshes*4, file);
-
-    fclose(file);
-
-    return true;
-}
-
-myMeshLoaderObj::myMeshLoaderObj() :
-	m_verts(0),
-	m_tris(0),
-	m_normals(0),
-	m_vertCount(0),
-	m_triCount(0)
-{
-}
-
-myMeshLoaderObj::~myMeshLoaderObj()
-{
-	delete [] m_verts;
-	delete [] m_normals;
-	delete [] m_tris;
-}
-
-bool myMeshLoaderObj::load(const char* filename)
-{
-    FILE* file;
-
-    float* verts = 0;
-    int vertCount = 0;
-    int* tris = 0;
-    int triCount = 0;
-
-    if(!(file = fopen(filename, "rb")))
-        return false;
-
-    // read verts
-    fread(&vertCount, sizeof(int), 1, file);
-    verts = new float[vertCount*3];
-    fread(verts, sizeof(float), vertCount*3, file);
-
-    // read triangles
-    fread(&triCount, sizeof(int), 1, file);
-    tris = new int[triCount*3];
-    fread(tris, sizeof(int), triCount*3, file);
-
-    fclose(file);
-
-    m_verts = verts;
-    m_vertCount = vertCount;
-    m_tris = tris;
-    m_triCount = triCount;
-
-	m_normals = new float[m_triCount*3];
-	for (int i = 0; i < m_triCount*3; i += 3)
-	{
-		const float* v0 = &m_verts[m_tris[i]*3];
-		const float* v1 = &m_verts[m_tris[i+1]*3];
-		const float* v2 = &m_verts[m_tris[i+2]*3];
-		float e0[3], e1[3];
-		for (int j = 0; j < 3; ++j)
-		{
-			e0[j] = v1[j] - v0[j];
-			e1[j] = v2[j] - v0[j];
-		}
-		float* n = &m_normals[i];
-		n[0] = e0[1]*e1[2] - e0[2]*e1[1];
-		n[1] = e0[2]*e1[0] - e0[0]*e1[2];
-		n[2] = e0[0]*e1[1] - e0[1]*e1[0];
-		float d = sqrtf(n[0]*n[0] + n[1]*n[1] + n[2]*n[2]);
-		if (d > 0)
-		{
-			d = 1.0f/d;
-			n[0] *= d;
-			n[1] *= d;
-			n[2] *= d;
-		}
-	}
-	
-	strncpy(m_filename, filename, sizeof(m_filename));
-	m_filename[sizeof(m_filename)-1] = '\0';
-	
-	return true;
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/Filelist.cpp b/dep/recastnavigation/RecastDemo/Source/Filelist.cpp
deleted file mode 100644
index 9df30345ef6..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/Filelist.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "Filelist.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef WIN32
-#	include <io.h>
-#else
-#	include <dirent.h>
-#endif
-
-static void fileListAdd(FileList& list, const char* path)
-{
-	if (list.size >= FileList::MAX_FILES)
-		return;
-	int n = strlen(path);
-	list.files[list.size] = new char[n+1];
-	strcpy(list.files[list.size], path);
-	list.size++;
-}
-
-static void fileListClear(FileList& list)
-{
-	for (int i = 0; i < list.size; ++i)
-		delete [] list.files[i];
-	list.size = 0;
-}
-
-FileList::FileList() : size(0)
-{
-	memset(files, 0, sizeof(char*)*MAX_FILES);
-}
-
-FileList::~FileList()
-{
-	fileListClear(*this);
-}
-
-static int cmp(const void* a, const void* b)
-{
-	return strcmp(*(const char**)a, *(const char**)b);
-}
-	
-void scanDirectory(const char* path, const char* ext, FileList& list)
-{
-	fileListClear(list);
-	
-#ifdef WIN32
-	_finddata_t dir;
-	char pathWithExt[260];
-	long fh;
-	strcpy(pathWithExt, path);
-	strcat(pathWithExt, "/*");
-	strcat(pathWithExt, ext);
-	fh = _findfirst(pathWithExt, &dir);
-	if (fh == -1L)
-		return;
-	do
-	{
-		fileListAdd(list, dir.name);
-	}
-	while (_findnext(fh, &dir) == 0);
-	_findclose(fh);
-#else
-	dirent* current = 0;
-	DIR* dp = opendir(path);
-	if (!dp)
-		return;
-	
-	while ((current = readdir(dp)) != 0)
-	{
-		int len = strlen(current->d_name);
-		if (len > 4 && strncmp(current->d_name+len-4, ext, 4) == 0)
-		{
-			fileListAdd(list, current->d_name);
-		}
-	}
-	closedir(dp);
-#endif
-
-	if (list.size > 1)
-		qsort(list.files, list.size, sizeof(char*), cmp);
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/InputGeom.cpp b/dep/recastnavigation/RecastDemo/Source/InputGeom.cpp
deleted file mode 100644
index 46ff657b6ad..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/InputGeom.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include "Recast.h"
-#include "InputGeom.h"
-#include "ChunkyTriMesh.h"
-#include "MeshLoaderObj.h"
-#include "DebugDraw.h"
-#include "RecastDebugDraw.h"
-#include "DetourNavMesh.h"
-
-static bool intersectSegmentTriangle(const float* sp, const float* sq,
-									 const float* a, const float* b, const float* c,
-									 float &t)
-{
-	float v, w;
-	float ab[3], ac[3], qp[3], ap[3], norm[3], e[3];
-	rcVsub(ab, b, a);
-	rcVsub(ac, c, a);
-	rcVsub(qp, sp, sq);
-	
-	// Compute triangle normal. Can be precalculated or cached if
-	// intersecting multiple segments against the same triangle
-	rcVcross(norm, ab, ac);
-	
-	// Compute denominator d. If d <= 0, segment is parallel to or points
-	// away from triangle, so exit early
-	float d = rcVdot(qp, norm);
-	if (d <= 0.0f) return false;
-	
-	// Compute intersection t value of pq with plane of triangle. A ray
-	// intersects iff 0 <= t. Segment intersects iff 0 <= t <= 1. Delay
-	// dividing by d until intersection has been found to pierce triangle
-	rcVsub(ap, sp, a);
-	t = rcVdot(ap, norm);
-	if (t < 0.0f) return false;
-	if (t > d) return false; // For segment; exclude this code line for a ray test
-	
-	// Compute barycentric coordinate components and test if within bounds
-	rcVcross(e, qp, ap);
-	v = rcVdot(ac, e);
-	if (v < 0.0f || v > d) return false;
-	w = -rcVdot(ab, e);
-	if (w < 0.0f || v + w > d) return false;
-	
-	// Segment/ray intersects triangle. Perform delayed division
-	t /= d;
-	
-	return true;
-}
-
-static char* parseRow(char* buf, char* bufEnd, char* row, int len)
-{
-	bool start = true;
-	bool done = false;
-	int n = 0;
-	while (!done && buf < bufEnd)
-	{
-		char c = *buf;
-		buf++;
-		// multirow
-		switch (c)
-		{
-			case '\n':
-				if (start) break;
-				done = true;
-				break;
-			case '\r':
-				break;
-			case '\t':
-			case ' ':
-				if (start) break;
-			default:
-				start = false;
-				row[n++] = c;
-				if (n >= len-1)
-					done = true;
-				break;
-		}
-	}
-	row[n] = '\0';
-	return buf;
-}
-
-
-
-InputGeom::InputGeom() :
-	m_chunkyMesh(0),
-	m_mesh(0),
-	m_offMeshConCount(0),
-	m_volumeCount(0)
-{
-}
-
-InputGeom::~InputGeom()
-{
-	delete m_chunkyMesh;
-	delete m_mesh;
-}
-		
-bool InputGeom::loadMesh(rcContext* ctx, const char* filepath)
-{
-	if (m_mesh)
-	{
-		delete m_chunkyMesh;
-		m_chunkyMesh = 0;
-		delete m_mesh;
-		m_mesh = 0;
-	}
-	m_offMeshConCount = 0;
-	m_volumeCount = 0;
-	
-	m_mesh = new myMeshLoaderObj;
-	if (!m_mesh)
-	{
-		ctx->log(RC_LOG_ERROR, "loadMesh: Out of memory 'm_mesh'.");
-		return false;
-	}
-	if (!m_mesh->load(filepath))
-	{
-		ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Could not load '%s'", filepath);
-		return false;
-	}
-
-	rcCalcBounds(m_mesh->getVerts(), m_mesh->getVertCount(), m_meshBMin, m_meshBMax);
-
-	m_chunkyMesh = new rcChunkyTriMesh;
-	if (!m_chunkyMesh)
-	{
-		ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Out of memory 'm_chunkyMesh'.");
-		return false;
-	}
-	if (!rcCreateChunkyTriMesh(m_mesh->getVerts(), m_mesh->getTris(), m_mesh->getTriCount(), 256, m_chunkyMesh))
-	{
-		ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Failed to build chunky mesh.");
-		return false;
-	}		
-
-	return true;
-}
-
-bool InputGeom::load(rcContext* ctx, const char* filePath)
-{
-	char* buf = 0;
-	FILE* fp = fopen(filePath, "rb");
-	if (!fp)
-		return false;
-	fseek(fp, 0, SEEK_END);
-	int bufSize = ftell(fp);
-	fseek(fp, 0, SEEK_SET);
-	buf = new char[bufSize];
-	if (!buf)
-	{
-		fclose(fp);
-		return false;
-	}
-	fread(buf, bufSize, 1, fp);
-	fclose(fp);
-	
-	m_offMeshConCount = 0;
-	m_volumeCount = 0;
-	delete m_mesh;
-	m_mesh = 0;
-
-	char* src = buf;
-	char* srcEnd = buf + bufSize;
-	char row[512];
-	while (src < srcEnd)
-	{
-		// Parse one row
-		row[0] = '\0';
-		src = parseRow(src, srcEnd, row, sizeof(row)/sizeof(char));
-		if (row[0] == 'f')
-		{
-			// File name.
-			const char* name = row+1;
-			// Skip white spaces
-			while (*name && isspace(*name))
-				name++;
-			if (*name)
-			{
-				if (!loadMesh(ctx, name))
-				{
-					delete [] buf;
-					return false;
-				}
-			}
-		}
-		else if (row[0] == 'c')
-		{
-			// Off-mesh connection
-			if (m_offMeshConCount < MAX_OFFMESH_CONNECTIONS)
-			{
-				float* v = &m_offMeshConVerts[m_offMeshConCount*3*2];
-				int bidir, area = 0, flags = 0;
-				float rad;
-				sscanf(row+1, "%f %f %f  %f %f %f %f %d %d %d",
-					   &v[0], &v[1], &v[2], &v[3], &v[4], &v[5], &rad, &bidir, &area, &flags);
-				m_offMeshConRads[m_offMeshConCount] = rad;
-				m_offMeshConDirs[m_offMeshConCount] = (unsigned char)bidir;
-				m_offMeshConAreas[m_offMeshConCount] = (unsigned char)area;
-				m_offMeshConFlags[m_offMeshConCount] = (unsigned short)flags;
-				m_offMeshConCount++;
-			}
-		}
-		else if (row[0] == 'v')
-		{
-			// Convex volumes
-			if (m_volumeCount < MAX_VOLUMES)
-			{
-				ConvexVolume* vol = &m_volumes[m_volumeCount++];
-				sscanf(row+1, "%d %d %f %f", &vol->nverts, &vol->area, &vol->hmin, &vol->hmax);
-				for (int i = 0; i < vol->nverts; ++i)
-				{
-					row[0] = '\0';
-					src = parseRow(src, srcEnd, row, sizeof(row)/sizeof(char));
-					sscanf(row, "%f %f %f", &vol->verts[i*3+0], &vol->verts[i*3+1], &vol->verts[i*3+2]);
-				}
-			}
-		}
-	}
-	
-	delete [] buf;
-	
-	return true;
-}
-
-bool InputGeom::save(const char* filepath)
-{
-	if (!m_mesh) return false;
-	
-	FILE* fp = fopen(filepath, "w");
-	if (!fp) return false;
-	
-	// Store mesh filename.
-	fprintf(fp, "f %s\n", m_mesh->getFileName());
-	
-	// Store off-mesh links.
-	for (int i = 0; i < m_offMeshConCount; ++i)
-	{
-		const float* v = &m_offMeshConVerts[i*3*2];
-		const float rad = m_offMeshConRads[i];
-		const int bidir = m_offMeshConDirs[i];
-		const int area = m_offMeshConAreas[i];
-		const int flags = m_offMeshConFlags[i];
-		fprintf(fp, "c %f %f %f  %f %f %f  %f %d %d %d\n",
-				v[0], v[1], v[2], v[3], v[4], v[5], rad, bidir, area, flags);
-	}
-
-	// Convex volumes
-	for (int i = 0; i < m_volumeCount; ++i)
-	{
-		ConvexVolume* vol = &m_volumes[i];
-		fprintf(fp, "v %d %d %f %f\n", vol->nverts, vol->area, vol->hmin, vol->hmax);
-		for (int i = 0; i < vol->nverts; ++i)
-			fprintf(fp, "%f %f %f\n", vol->verts[i*3+0], vol->verts[i*3+1], vol->verts[i*3+2]);
-	}
-	
-	fclose(fp);
-	
-	return true;
-}
-
-static bool isectSegAABB(const float* sp, const float* sq,
-						 const float* amin, const float* amax,
-						 float& tmin, float& tmax)
-{
-	static const float EPS = 1e-6f;
-	
-	float d[3];
-	d[0] = sq[0] - sp[0];
-	d[1] = sq[1] - sp[1];
-	d[2] = sq[2] - sp[2];
-	tmin = 0.0;
-	tmax = 1.0f;
-	
-	for (int i = 0; i < 3; i++)
-	{
-		if (fabsf(d[i]) < EPS)
-		{
-			if (sp[i] < amin[i] || sp[i] > amax[i])
-				return false;
-		}
-		else
-		{
-			const float ood = 1.0f / d[i];
-			float t1 = (amin[i] - sp[i]) * ood;
-			float t2 = (amax[i] - sp[i]) * ood;
-			if (t1 > t2) { float tmp = t1; t1 = t2; t2 = tmp; }
-			if (t1 > tmin) tmin = t1;
-			if (t2 < tmax) tmax = t2;
-			if (tmin > tmax) return false;
-		}
-	}
-	
-	return true;
-}
-
-
-bool InputGeom::raycastMesh(float* src, float* dst, float& tmin)
-{
-	float dir[3];
-	rcVsub(dir, dst, src);
-
-	// Prune hit ray.
-	float btmin, btmax;
-	if (!isectSegAABB(src, dst, m_meshBMin, m_meshBMax, btmin, btmax))
-		return false;
-	float p[2], q[2];
-	p[0] = src[0] + (dst[0]-src[0])*btmin;
-	p[1] = src[2] + (dst[2]-src[2])*btmin;
-	q[0] = src[0] + (dst[0]-src[0])*btmax;
-	q[1] = src[2] + (dst[2]-src[2])*btmax;
-	
-	int cid[512];
-	const int ncid = rcGetChunksOverlappingSegment(m_chunkyMesh, p, q, cid, 512);
-	if (!ncid)
-		return false;
-	
-	tmin = 1.0f;
-	bool hit = false;
-	const float* verts = m_mesh->getVerts();
-	
-	for (int i = 0; i < ncid; ++i)
-	{
-		const rcChunkyTriMeshNode& node = m_chunkyMesh->nodes[cid[i]];
-		const int* tris = &m_chunkyMesh->tris[node.i*3];
-		const int ntris = node.n;
-
-		for (int j = 0; j < ntris*3; j += 3)
-		{
-			float t = 1;
-			if (intersectSegmentTriangle(src, dst,
-										 &verts[tris[j]*3],
-										 &verts[tris[j+1]*3],
-										 &verts[tris[j+2]*3], t))
-			{
-				if (t < tmin)
-					tmin = t;
-				hit = true;
-			}
-		}
-	}
-	
-	return hit;
-}
-
-void InputGeom::addOffMeshConnection(const float* spos, const float* epos, const float rad,
-									 unsigned char bidir, unsigned char area, unsigned short flags)
-{
-	if (m_offMeshConCount >= MAX_OFFMESH_CONNECTIONS) return;
-	float* v = &m_offMeshConVerts[m_offMeshConCount*3*2];
-	m_offMeshConRads[m_offMeshConCount] = rad;
-	m_offMeshConDirs[m_offMeshConCount] = bidir;
-	m_offMeshConAreas[m_offMeshConCount] = area;
-	m_offMeshConFlags[m_offMeshConCount] = flags;
-	m_offMeshConId[m_offMeshConCount] = 1000 + m_offMeshConCount;
-	rcVcopy(&v[0], spos);
-	rcVcopy(&v[3], epos);
-	m_offMeshConCount++;
-}
-
-void InputGeom::deleteOffMeshConnection(int i)
-{
-	m_offMeshConCount--;
-	float* src = &m_offMeshConVerts[m_offMeshConCount*3*2];
-	float* dst = &m_offMeshConVerts[i*3*2];
-	rcVcopy(&dst[0], &src[0]);
-	rcVcopy(&dst[3], &src[3]);
-	m_offMeshConRads[i] = m_offMeshConRads[m_offMeshConCount];
-	m_offMeshConDirs[i] = m_offMeshConDirs[m_offMeshConCount];
-	m_offMeshConAreas[i] = m_offMeshConAreas[m_offMeshConCount];
-	m_offMeshConFlags[i] = m_offMeshConFlags[m_offMeshConCount];
-}
-
-void InputGeom::drawOffMeshConnections(duDebugDraw* dd, bool hilight)
-{
-	unsigned int conColor = duRGBA(192,0,128,192);
-	unsigned int baseColor = duRGBA(0,0,0,64);
-	dd->depthMask(false);
-
-	dd->begin(DU_DRAW_LINES, 2.0f);
-	for (int i = 0; i < m_offMeshConCount; ++i)
-	{
-		float* v = &m_offMeshConVerts[i*3*2];
-
-		dd->vertex(v[0],v[1],v[2], baseColor);
-		dd->vertex(v[0],v[1]+0.2f,v[2], baseColor);
-		
-		dd->vertex(v[3],v[4],v[5], baseColor);
-		dd->vertex(v[3],v[4]+0.2f,v[5], baseColor);
-		
-		duAppendCircle(dd, v[0],v[1]+0.1f,v[2], m_offMeshConRads[i], baseColor);
-		duAppendCircle(dd, v[3],v[4]+0.1f,v[5], m_offMeshConRads[i], baseColor);
-
-		if (hilight)
-		{
-			duAppendArc(dd, v[0],v[1],v[2], v[3],v[4],v[5], 0.25f,
-						(m_offMeshConDirs[i]&1) ? 0.6f : 0.0f, 0.6f, conColor);
-		}
-	}	
-	dd->end();
-
-	dd->depthMask(true);
-}
-
-void InputGeom::addConvexVolume(const float* verts, const int nverts,
-								const float minh, const float maxh, unsigned char area)
-{
-	if (m_volumeCount >= MAX_VOLUMES) return;
-	ConvexVolume* vol = &m_volumes[m_volumeCount++];
-	memset(vol, 0, sizeof(ConvexVolume));
-	memcpy(vol->verts, verts, sizeof(float)*3*nverts);
-	vol->hmin = minh;
-	vol->hmax = maxh;
-	vol->nverts = nverts;
-	vol->area = area;
-}
-
-void InputGeom::deleteConvexVolume(int i)
-{
-	m_volumeCount--;
-	m_volumes[i] = m_volumes[m_volumeCount];
-}
-
-void InputGeom::drawConvexVolumes(struct duDebugDraw* dd, bool /*hilight*/)
-{
-	dd->depthMask(false);
-
-	dd->begin(DU_DRAW_TRIS);
-	
-	for (int i = 0; i < m_volumeCount; ++i)
-	{
-		const ConvexVolume* vol = &m_volumes[i];
-		unsigned int col = duIntToCol(vol->area, 32);
-		for (int j = 0, k = vol->nverts-1; j < vol->nverts; k = j++)
-		{
-			const float* va = &vol->verts[k*3];
-			const float* vb = &vol->verts[j*3];
-
-			dd->vertex(vol->verts[0],vol->hmax,vol->verts[2], col);
-			dd->vertex(vb[0],vol->hmax,vb[2], col);
-			dd->vertex(va[0],vol->hmax,va[2], col);
-			
-			dd->vertex(va[0],vol->hmin,va[2], duDarkenCol(col));
-			dd->vertex(va[0],vol->hmax,va[2], col);
-			dd->vertex(vb[0],vol->hmax,vb[2], col);
-
-			dd->vertex(va[0],vol->hmin,va[2], duDarkenCol(col));
-			dd->vertex(vb[0],vol->hmax,vb[2], col);
-			dd->vertex(vb[0],vol->hmin,vb[2], duDarkenCol(col));
-		}
-	}
-	
-	dd->end();
-
-	dd->begin(DU_DRAW_LINES, 2.0f);
-	for (int i = 0; i < m_volumeCount; ++i)
-	{
-		const ConvexVolume* vol = &m_volumes[i];
-		unsigned int col = duIntToCol(vol->area, 220);
-		for (int j = 0, k = vol->nverts-1; j < vol->nverts; k = j++)
-		{
-			const float* va = &vol->verts[k*3];
-			const float* vb = &vol->verts[j*3];
-			dd->vertex(va[0],vol->hmin,va[2], duDarkenCol(col));
-			dd->vertex(vb[0],vol->hmin,vb[2], duDarkenCol(col));
-			dd->vertex(va[0],vol->hmax,va[2], col);
-			dd->vertex(vb[0],vol->hmax,vb[2], col);
-			dd->vertex(va[0],vol->hmin,va[2], duDarkenCol(col));
-			dd->vertex(va[0],vol->hmax,va[2], col);
-		}
-	}
-	dd->end();
-
-	dd->begin(DU_DRAW_POINTS, 3.0f);
-	for (int i = 0; i < m_volumeCount; ++i)
-	{
-		const ConvexVolume* vol = &m_volumes[i];
-		unsigned int col = duDarkenCol(duIntToCol(vol->area, 255));
-		for (int j = 0; j < vol->nverts; ++j)
-		{
-			dd->vertex(vol->verts[j*3+0],vol->verts[j*3+1]+0.1f,vol->verts[j*3+2], col);
-			dd->vertex(vol->verts[j*3+0],vol->hmin,vol->verts[j*3+2], col);
-			dd->vertex(vol->verts[j*3+0],vol->hmax,vol->verts[j*3+2], col);
-		}
-	}
-	dd->end();
-	
-	
-	dd->depthMask(true);
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/MeshLoaderObj.cpp b/dep/recastnavigation/RecastDemo/Source/MeshLoaderObj.cpp
deleted file mode 100644
index 1828220837b..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/MeshLoaderObj.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "MeshLoaderObj.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-
-rcMeshLoaderObj::rcMeshLoaderObj() :
-	m_verts(0),
-	m_tris(0),
-	m_normals(0),
-	m_vertCount(0),
-	m_triCount(0)
-{
-}
-
-rcMeshLoaderObj::~rcMeshLoaderObj()
-{
-	delete [] m_verts;
-	delete [] m_normals;
-	delete [] m_tris;
-}
-		
-void rcMeshLoaderObj::addVertex(float x, float y, float z, int& cap)
-{
-	if (m_vertCount+1 > cap)
-	{
-		cap = !cap ? 8 : cap*2;
-		float* nv = new float[cap*3];
-		if (m_vertCount)
-			memcpy(nv, m_verts, m_vertCount*3*sizeof(float));
-		delete [] m_verts;
-		m_verts = nv;
-	}
-	float* dst = &m_verts[m_vertCount*3];
-	*dst++ = x;
-	*dst++ = y;
-	*dst++ = z;
-	m_vertCount++;
-}
-
-void rcMeshLoaderObj::addTriangle(int a, int b, int c, int& cap)
-{
-	if (m_triCount+1 > cap)
-	{
-		cap = !cap ? 8 : cap*2;
-		int* nv = new int[cap*3];
-		if (m_triCount)
-			memcpy(nv, m_tris, m_triCount*3*sizeof(int));
-		delete [] m_tris;
-		m_tris = nv;
-	}
-	int* dst = &m_tris[m_triCount*3];
-	*dst++ = a;
-	*dst++ = b;
-	*dst++ = c;
-	m_triCount++;
-}
-
-static char* parseRow(char* buf, char* bufEnd, char* row, int len)
-{
-	bool cont = false;
-	bool start = true;
-	bool done = false;
-	int n = 0;
-	while (!done && buf < bufEnd)
-	{
-		char c = *buf;
-		buf++;
-		// multirow
-		switch (c)
-		{
-			case '\\':
-				cont = true; // multirow
-				break;
-			case '\n':
-				if (start) break;
-				done = true;
-				break;
-			case '\r':
-				break;
-			case '\t':
-			case ' ':
-				if (start) break;
-			default:
-				start = false;
-				cont = false;
-				row[n++] = c;
-				if (n >= len-1)
-					done = true;
-				break;
-		}
-	}
-	row[n] = '\0';
-	return buf;
-}
-
-static int parseFace(char* row, int* data, int n, int vcnt)
-{
-	int j = 0;
-	while (*row != '\0')
-	{
-		// Skip initial white space
-		while (*row != '\0' && (*row == ' ' || *row == '\t'))
-			row++;
-		char* s = row;
-		// Find vertex delimiter and terminated the string there for conversion.
-		while (*row != '\0' && *row != ' ' && *row != '\t')
-		{
-			if (*row == '/') *row = '\0';
-			row++;
-		}
-		if (*s == '\0')
-			continue;
-		int vi = atoi(s);
-		data[j++] = vi < 0 ? vi+vcnt : vi-1;
-		if (j >= n) return j;
-	}
-	return j;
-}
-
-bool rcMeshLoaderObj::load(const char* filename)
-{
-	char* buf = 0;
-	FILE* fp = fopen(filename, "rb");
-	if (!fp)
-		return false;
-	fseek(fp, 0, SEEK_END);
-	int bufSize = ftell(fp);
-	fseek(fp, 0, SEEK_SET);
-	buf = new char[bufSize];
-	if (!buf)
-	{
-		fclose(fp);
-		return false;
-	}
-	fread(buf, bufSize, 1, fp);
-	fclose(fp);
-
-	char* src = buf;
-	char* srcEnd = buf + bufSize;
-	char row[512];
-	int face[32];
-	float x,y,z;
-	int nv;
-	int vcap = 0;
-	int tcap = 0;
-	
-	while (src < srcEnd)
-	{
-		// Parse one row
-		row[0] = '\0';
-		src = parseRow(src, srcEnd, row, sizeof(row)/sizeof(char));
-		// Skip comments
-		if (row[0] == '#') continue;
-		if (row[0] == 'v' && row[1] != 'n' && row[1] != 't')
-		{
-			// Vertex pos
-			sscanf(row+1, "%f %f %f", &x, &y, &z);
-			addVertex(x, y, z, vcap);
-		}
-		if (row[0] == 'f')
-		{
-			// Faces
-			nv = parseFace(row+1, face, 32, m_vertCount);
-			for (int i = 2; i < nv; ++i)
-			{
-				const int a = face[0];
-				const int b = face[i-1];
-				const int c = face[i];
-				if (a < 0 || a >= m_vertCount || b < 0 || b >= m_vertCount || c < 0 || c >= m_vertCount)
-					continue;
-				addTriangle(a, b, c, tcap);
-			}
-		}
-	}
-
-	delete [] buf;
-
-	// Calculate normals.
-	m_normals = new float[m_triCount*3];
-	for (int i = 0; i < m_triCount*3; i += 3)
-	{
-		const float* v0 = &m_verts[m_tris[i]*3];
-		const float* v1 = &m_verts[m_tris[i+1]*3];
-		const float* v2 = &m_verts[m_tris[i+2]*3];
-		float e0[3], e1[3];
-		for (int j = 0; j < 3; ++j)
-		{
-			e0[j] = v1[j] - v0[j];
-			e1[j] = v2[j] - v0[j];
-		}
-		float* n = &m_normals[i];
-		n[0] = e0[1]*e1[2] - e0[2]*e1[1];
-		n[1] = e0[2]*e1[0] - e0[0]*e1[2];
-		n[2] = e0[0]*e1[1] - e0[1]*e1[0];
-		float d = sqrtf(n[0]*n[0] + n[1]*n[1] + n[2]*n[2]);
-		if (d > 0)
-		{
-			d = 1.0f/d;
-			n[0] *= d;
-			n[1] *= d;
-			n[2] *= d;
-		}
-	}
-	
-	strncpy(m_filename, filename, sizeof(m_filename));
-	m_filename[sizeof(m_filename)-1] = '\0';
-	
-	return true;
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/NavMeshTesterTool.cpp b/dep/recastnavigation/RecastDemo/Source/NavMeshTesterTool.cpp
deleted file mode 100644
index 38b06e4a333..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/NavMeshTesterTool.cpp
+++ /dev/null
@@ -1,1216 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include "SDL.h"
-#include "SDL_opengl.h"
-#include "imgui.h"
-#include "NavMeshTesterTool.h"
-#include "Sample.h"
-#include "Recast.h"
-#include "RecastDebugDraw.h"
-#include "DetourNavMesh.h"
-#include "DetourNavMeshBuilder.h"
-#include "DetourDebugDraw.h"
-#include "DetourCommon.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-// Uncomment this to dump all the requests in stdout.
-#define DUMP_REQS
-
-inline bool inRange(const float* v1, const float* v2, const float r, const float h)
-{
-	const float dx = v2[0] - v1[0];
-	const float dy = v2[1] - v1[1];
-	const float dz = v2[2] - v1[2];
-	return (dx*dx + dz*dz) < r*r && fabsf(dy) < h;
-}
-
-
-static int fixupCorridor(dtPolyRef* path, const int npath, const int maxPath,
-						 const dtPolyRef* visited, const int nvisited)
-{
-	int furthestPath = -1;
-	int furthestVisited = -1;
-	
-	// Find furthest common polygon.
-	for (int i = npath-1; i >= 0; --i)
-	{
-		bool found = false;
-		for (int j = nvisited-1; j >= 0; --j)
-		{
-			if (path[i] == visited[j])
-			{
-				furthestPath = i;
-				furthestVisited = j;
-				found = true;
-			}
-		}
-		if (found)
-			break;
-	}
-
-	// If no intersection found just return current path. 
-	if (furthestPath == -1 || furthestVisited == -1)
-		return npath;
-	
-	// Concatenate paths.	
-
-	// Adjust beginning of the buffer to include the visited.
-	const int req = nvisited - furthestVisited;
-	const int orig = rcMin(furthestPath+1, npath);
-	int size = rcMax(0, npath-orig);
-	if (req+size > maxPath)
-		size = maxPath-req;
-	if (size)
-		memmove(path+req, path+orig, size*sizeof(dtPolyRef));
-	
-	// Store visited
-	for (int i = 0; i < req; ++i)
-		path[i] = visited[(nvisited-1)-i];				
-	
-	return req+size;
-}
-
-static bool getSteerTarget(dtNavMeshQuery* navQuery, const float* startPos, const float* endPos,
-						   const float minTargetDist,
-						   const dtPolyRef* path, const int pathSize,
-						   float* steerPos, unsigned char& steerPosFlag, dtPolyRef& steerPosRef,
-						   float* outPoints = 0, int* outPointCount = 0)							 
-{
-	// Find steer target.
-	static const int MAX_STEER_POINTS = 3;
-	float steerPath[MAX_STEER_POINTS*3];
-	unsigned char steerPathFlags[MAX_STEER_POINTS];
-	dtPolyRef steerPathPolys[MAX_STEER_POINTS];
-	int nsteerPath = 0;
-	navQuery->findStraightPath(startPos, endPos, path, pathSize,
-							   steerPath, steerPathFlags, steerPathPolys, &nsteerPath, MAX_STEER_POINTS);
-	if (!nsteerPath)
-		return false;
-		
-	if (outPoints && outPointCount)
-	{
-		*outPointCount = nsteerPath;
-		for (int i = 0; i < nsteerPath; ++i)
-			dtVcopy(&outPoints[i*3], &steerPath[i*3]);
-	}
-
-	
-	// Find vertex far enough to steer to.
-	int ns = 0;
-	while (ns < nsteerPath)
-	{
-		// Stop at Off-Mesh link or when point is further than slop away.
-		if ((steerPathFlags[ns] & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ||
-			!inRange(&steerPath[ns*3], startPos, minTargetDist, 1000.0f))
-			break;
-		ns++;
-	}
-	// Failed to find good point to steer to.
-	if (ns >= nsteerPath)
-		return false;
-	
-	dtVcopy(steerPos, &steerPath[ns*3]);
-	steerPos[1] = startPos[1];
-	steerPosFlag = steerPathFlags[ns];
-	steerPosRef = steerPathPolys[ns];
-	
-	return true;
-}
-
-
-NavMeshTesterTool::NavMeshTesterTool() :
-	m_sample(0),
-	m_navMesh(0),
-	m_navQuery(0),
-	m_pathFindStatus(DT_FAILURE),
-	m_toolMode(TOOLMODE_PATHFIND_FOLLOW),
-	m_startRef(0),
-	m_endRef(0),
-	m_npolys(0),
-	m_nstraightPath(0),
-	m_nsmoothPath(0),
-	m_hitResult(false),
-	m_distanceToWall(0),
-	m_sposSet(false),
-	m_eposSet(false),
-	m_pathIterNum(0),
-	m_steerPointCount(0)
-{
-	m_filter.setIncludeFlags(SAMPLE_POLYFLAGS_ALL);
-	m_filter.setExcludeFlags(0);
-
-	m_polyPickExt[0] = 2;
-	m_polyPickExt[1] = 4;
-	m_polyPickExt[2] = 2;
-	
-	m_neighbourhoodRadius = 2.5f;
-}
-
-NavMeshTesterTool::~NavMeshTesterTool()
-{
-}
-
-void NavMeshTesterTool::init(Sample* sample)
-{
-	m_sample = sample;
-	m_navMesh = sample->getNavMesh();
-	m_navQuery = sample->getNavMeshQuery();
-	recalc();
-
-	if (m_navQuery)
-	{
-		// Change costs.
-		m_filter.setAreaCost(SAMPLE_POLYAREA_GROUND, 1.0f);
-		m_filter.setAreaCost(SAMPLE_POLYAREA_WATER, 10.0f);
-		m_filter.setAreaCost(SAMPLE_POLYAREA_ROAD, 1.0f);
-		m_filter.setAreaCost(SAMPLE_POLYAREA_DOOR, 1.0f);
-		m_filter.setAreaCost(SAMPLE_POLYAREA_GRASS, 2.0f);
-		m_filter.setAreaCost(SAMPLE_POLYAREA_JUMP, 1.5f);
-	}
-	
-	m_neighbourhoodRadius = sample->getAgentRadius() * 20.0f;
-}
-
-void NavMeshTesterTool::handleMenu()
-{
-	if (imguiCheck("Pathfind Follow", m_toolMode == TOOLMODE_PATHFIND_FOLLOW))
-	{
-		m_toolMode = TOOLMODE_PATHFIND_FOLLOW;
-		recalc();
-	}
-	if (imguiCheck("Pathfind Straight", m_toolMode == TOOLMODE_PATHFIND_STRAIGHT))
-	{
-		m_toolMode = TOOLMODE_PATHFIND_STRAIGHT;
-		recalc();
-	}
-	if (imguiCheck("Pathfind Sliced", m_toolMode == TOOLMODE_PATHFIND_SLICED))
-	{
-		m_toolMode = TOOLMODE_PATHFIND_SLICED;
-		recalc();
-	}
-
-	imguiSeparator();
-
-	if (imguiCheck("Distance to Wall", m_toolMode == TOOLMODE_DISTANCE_TO_WALL))
-	{
-		m_toolMode = TOOLMODE_DISTANCE_TO_WALL;
-		recalc();
-	}
-
-	imguiSeparator();
-
-	if (imguiCheck("Raycast", m_toolMode == TOOLMODE_RAYCAST))
-	{
-		m_toolMode = TOOLMODE_RAYCAST;
-		recalc();
-	}
-
-	imguiSeparator();
-
-	if (imguiCheck("Find Polys in Circle", m_toolMode == TOOLMODE_FIND_POLYS_IN_CIRCLE))
-	{
-		m_toolMode = TOOLMODE_FIND_POLYS_IN_CIRCLE;
-		recalc();
-	}
-	if (imguiCheck("Find Polys in Shape", m_toolMode == TOOLMODE_FIND_POLYS_IN_SHAPE))
-	{
-		m_toolMode = TOOLMODE_FIND_POLYS_IN_SHAPE;
-		recalc();
-	}
-
-	imguiSeparator();
-
-	if (imguiCheck("Find Local Neighbourhood", m_toolMode == TOOLMODE_FIND_LOCAL_NEIGHBOURHOOD))
-	{
-		m_toolMode = TOOLMODE_FIND_LOCAL_NEIGHBOURHOOD;
-		recalc();
-	}
-	
-	imguiSeparator();
-
-	imguiLabel("Include Flags");
-
-	imguiIndent();
-	if (imguiCheck("Walk", (m_filter.getIncludeFlags() & SAMPLE_POLYFLAGS_WALK) != 0))
-	{
-		m_filter.setIncludeFlags(m_filter.getIncludeFlags() ^ SAMPLE_POLYFLAGS_WALK);
-		recalc();
-	}
-	if (imguiCheck("Swim", (m_filter.getIncludeFlags() & SAMPLE_POLYFLAGS_SWIM) != 0))
-	{
-		m_filter.setIncludeFlags(m_filter.getIncludeFlags() ^ SAMPLE_POLYFLAGS_SWIM);
-		recalc();
-	}
-	if (imguiCheck("Door", (m_filter.getIncludeFlags() & SAMPLE_POLYFLAGS_DOOR) != 0))
-	{
-		m_filter.setIncludeFlags(m_filter.getIncludeFlags() ^ SAMPLE_POLYFLAGS_DOOR);
-		recalc();
-	}
-	if (imguiCheck("Jump", (m_filter.getIncludeFlags() & SAMPLE_POLYFLAGS_JUMP) != 0))
-	{
-		m_filter.setIncludeFlags(m_filter.getIncludeFlags() ^ SAMPLE_POLYFLAGS_JUMP);
-		recalc();
-	}
-	imguiUnindent();
-
-	imguiSeparator();
-	imguiLabel("Exclude Flags");
-	
-	imguiIndent();
-	if (imguiCheck("Walk", (m_filter.getExcludeFlags() & SAMPLE_POLYFLAGS_WALK) != 0))
-	{
-		m_filter.setExcludeFlags(m_filter.getExcludeFlags() ^ SAMPLE_POLYFLAGS_WALK);
-		recalc();
-	}
-	if (imguiCheck("Swim", (m_filter.getExcludeFlags() & SAMPLE_POLYFLAGS_SWIM) != 0))
-	{
-		m_filter.setExcludeFlags(m_filter.getExcludeFlags() ^ SAMPLE_POLYFLAGS_SWIM);
-		recalc();
-	}
-	if (imguiCheck("Door", (m_filter.getExcludeFlags() & SAMPLE_POLYFLAGS_DOOR) != 0))
-	{
-		m_filter.setExcludeFlags(m_filter.getExcludeFlags() ^ SAMPLE_POLYFLAGS_DOOR);
-		recalc();
-	}
-	if (imguiCheck("Jump", (m_filter.getExcludeFlags() & SAMPLE_POLYFLAGS_JUMP) != 0))
-	{
-		m_filter.setExcludeFlags(m_filter.getExcludeFlags() ^ SAMPLE_POLYFLAGS_JUMP);
-		recalc();
-	}
-	imguiUnindent();
-
-	imguiSeparator();	
-}
-
-void NavMeshTesterTool::handleClick(const float* /*s*/, const float* p, bool shift)
-{
-	if (shift)
-	{
-		m_sposSet = true;
-		dtVcopy(m_spos, p);
-	}
-	else
-	{
-		m_eposSet = true;
-		dtVcopy(m_epos, p);
-	}
-	recalc();
-}
-
-void NavMeshTesterTool::handleStep()
-{
-}
-
-void NavMeshTesterTool::handleToggle()
-{
-	// TODO: merge separate to a path iterator. Use same code in recalc() too.
-	if (m_toolMode != TOOLMODE_PATHFIND_FOLLOW)
-		return;
-		
-	if (!m_sposSet || !m_eposSet || !m_startRef || !m_endRef)
-		return;
-		
-	static const float STEP_SIZE = 0.5f;
-	static const float SLOP = 0.01f;
-
-	if (m_pathIterNum == 0)
-	{
-		m_navQuery->findPath(m_startRef, m_endRef, m_spos, m_epos, &m_filter, m_polys, &m_npolys, MAX_POLYS);
-		m_nsmoothPath = 0;
-
-		m_pathIterPolyCount = m_npolys;
-		if (m_pathIterPolyCount)
-			memcpy(m_pathIterPolys, m_polys, sizeof(dtPolyRef)*m_pathIterPolyCount); 
-		
-		if (m_pathIterPolyCount)
-		{
-			// Iterate over the path to find smooth path on the detail mesh surface.
-			
-			m_navQuery->closestPointOnPolyBoundary(m_startRef, m_spos, m_iterPos);
-			m_navQuery->closestPointOnPolyBoundary(m_pathIterPolys[m_pathIterPolyCount-1], m_epos, m_targetPos);
-			
-			m_nsmoothPath = 0;
-			
-			dtVcopy(&m_smoothPath[m_nsmoothPath*3], m_iterPos);
-			m_nsmoothPath++;
-		}
-	}
-	
-	dtVcopy(m_prevIterPos, m_iterPos);
-
-	m_pathIterNum++;
-
-	if (!m_pathIterPolyCount)
-		return;
-
-	if (m_nsmoothPath >= MAX_SMOOTH)
-		return;
-
-	// Move towards target a small advancement at a time until target reached or
-	// when ran out of memory to store the path.
-
-	// Find location to steer towards.
-	float steerPos[3];
-	unsigned char steerPosFlag;
-	dtPolyRef steerPosRef;
-		
-	if (!getSteerTarget(m_navQuery, m_iterPos, m_targetPos, SLOP,
-						m_pathIterPolys, m_pathIterPolyCount, steerPos, steerPosFlag, steerPosRef,
-						m_steerPoints, &m_steerPointCount))
-		return;
-		
-	dtVcopy(m_steerPos, steerPos);
-	
-	bool endOfPath = (steerPosFlag & DT_STRAIGHTPATH_END) ? true : false;
-	bool offMeshConnection = (steerPosFlag & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ? true : false;
-		
-	// Find movement delta.
-	float delta[3], len;
-	dtVsub(delta, steerPos, m_iterPos);
-	len = sqrtf(dtVdot(delta,delta));
-	// If the steer target is end of path or off-mesh link, do not move past the location.
-	if ((endOfPath || offMeshConnection) && len < STEP_SIZE)
-		len = 1;
-	else
-		len = STEP_SIZE / len;
-	float moveTgt[3];
-	dtVmad(moveTgt, m_iterPos, delta, len);
-		
-	// Move
-	float result[3];
-	dtPolyRef visited[16];
-	int nvisited = 0;
-	m_navQuery->moveAlongSurface(m_pathIterPolys[0], m_iterPos, moveTgt, &m_filter,
-								 result, visited, &nvisited, 16);
-	m_pathIterPolyCount = fixupCorridor(m_pathIterPolys, m_pathIterPolyCount, MAX_POLYS, visited, nvisited);
-	float h = 0;
-	m_navQuery->getPolyHeight(m_pathIterPolys[0], result, &h);
-	result[1] = h;
-	dtVcopy(m_iterPos, result);
-	
-	// Handle end of path and off-mesh links when close enough.
-	if (endOfPath && inRange(m_iterPos, steerPos, SLOP, 1.0f))
-	{
-		// Reached end of path.
-		dtVcopy(m_iterPos, m_targetPos);
-		if (m_nsmoothPath < MAX_SMOOTH)
-		{
-			dtVcopy(&m_smoothPath[m_nsmoothPath*3], m_iterPos);
-			m_nsmoothPath++;
-		}
-		return;
-	}
-	else if (offMeshConnection && inRange(m_iterPos, steerPos, SLOP, 1.0f))
-	{
-		// Reached off-mesh connection.
-		float startPos[3], endPos[3];
-		
-		// Advance the path up to and over the off-mesh connection.
-		dtPolyRef prevRef = 0, polyRef = m_pathIterPolys[0];
-		int npos = 0;
-		while (npos < m_pathIterPolyCount && polyRef != steerPosRef)
-		{
-			prevRef = polyRef;
-			polyRef = m_pathIterPolys[npos];
-			npos++;
-		}
-		for (int i = npos; i < m_pathIterPolyCount; ++i)
-			m_pathIterPolys[i-npos] = m_pathIterPolys[i];
-		m_pathIterPolyCount -= npos;
-				
-		// Handle the connection.
-		if (m_navMesh->getOffMeshConnectionPolyEndPoints(prevRef, polyRef, startPos, endPos) == DT_SUCCESS)
-		{
-			if (m_nsmoothPath < MAX_SMOOTH)
-			{
-				dtVcopy(&m_smoothPath[m_nsmoothPath*3], startPos);
-				m_nsmoothPath++;
-				// Hack to make the dotted path not visible during off-mesh connection.
-				if (m_nsmoothPath & 1)
-				{
-					dtVcopy(&m_smoothPath[m_nsmoothPath*3], startPos);
-					m_nsmoothPath++;
-				}
-			}
-			// Move position at the other side of the off-mesh link.
-			dtVcopy(m_iterPos, endPos);
-			float h;
-			m_navQuery->getPolyHeight(m_pathIterPolys[0], m_iterPos, &h);
-			m_iterPos[1] = h;
-		}
-	}
-	
-	// Store results.
-	if (m_nsmoothPath < MAX_SMOOTH)
-	{
-		dtVcopy(&m_smoothPath[m_nsmoothPath*3], m_iterPos);
-		m_nsmoothPath++;
-	}
-
-}
-
-void NavMeshTesterTool::handleUpdate(const float /*dt*/)
-{
-	if (m_toolMode == TOOLMODE_PATHFIND_SLICED)
-	{
-		if (m_pathFindStatus == DT_IN_PROGRESS)
-		{
-			m_pathFindStatus = m_navQuery->updateSlicedFindPath(1);
-		}
-		
-		if (m_pathFindStatus == DT_SUCCESS)
-		{
-			m_navQuery->finalizeSlicedFindPath(m_polys, &m_npolys, MAX_POLYS);
-			m_nstraightPath = 0;
-			if (m_npolys)
-			{
-				// In case of partial path, make sure the end point is clamped to the last polygon.
-				float epos[3];
-				dtVcopy(epos, m_epos);
-				if (m_polys[m_npolys-1] != m_endRef)
-				m_navQuery->closestPointOnPoly(m_polys[m_npolys-1], m_epos, epos);
-
-				m_navQuery->findStraightPath(m_spos, epos, m_polys, m_npolys,
-											 m_straightPath, m_straightPathFlags,
-											 m_straightPathPolys, &m_nstraightPath, MAX_POLYS);
-			}
-			 
-			 m_pathFindStatus = DT_FAILURE;
-		}
-	}
-}
-
-void NavMeshTesterTool::reset()
-{
-	m_startRef = 0;
-	m_endRef = 0;
-	m_npolys = 0;
-	m_nstraightPath = 0;
-	m_nsmoothPath = 0;
-	memset(m_hitPos, 0, sizeof(m_hitPos));
-	memset(m_hitNormal, 0, sizeof(m_hitNormal));
-	m_distanceToWall = 0;
-}
-
-
-void NavMeshTesterTool::recalc()
-{
-	if (!m_navMesh)
-		return;
-	
-	if (m_sposSet)
-		m_navQuery->findNearestPoly(m_spos, m_polyPickExt, &m_filter, &m_startRef, 0);
-	else
-		m_startRef = 0;
-	
-	if (m_eposSet)
-		m_navQuery->findNearestPoly(m_epos, m_polyPickExt, &m_filter, &m_endRef, 0);
-	else
-		m_endRef = 0;
-	
-	m_pathFindStatus = DT_FAILURE;
-	
-	if (m_toolMode == TOOLMODE_PATHFIND_FOLLOW)
-	{
-		m_pathIterNum = 0;
-		if (m_sposSet && m_eposSet && m_startRef && m_endRef)
-		{
-#ifdef DUMP_REQS
-			printf("pi  %f %f %f  %f %f %f  0x%x 0x%x\n",
-				   m_spos[0],m_spos[1],m_spos[2], m_epos[0],m_epos[1],m_epos[2],
-				   m_filter.getIncludeFlags(), m_filter.getExcludeFlags()); 
-#endif
-
-			m_navQuery->findPath(m_startRef, m_endRef, m_spos, m_epos, &m_filter, m_polys, &m_npolys, MAX_POLYS);
-
-			m_nsmoothPath = 0;
-
-			if (m_npolys)
-			{
-				// Iterate over the path to find smooth path on the detail mesh surface.
-				dtPolyRef polys[MAX_POLYS];
-				memcpy(polys, m_polys, sizeof(dtPolyRef)*m_npolys); 
-				int npolys = m_npolys;
-				
-				float iterPos[3], targetPos[3];
-				m_navQuery->closestPointOnPolyBoundary(m_startRef, m_spos, iterPos);
-				m_navQuery->closestPointOnPolyBoundary(polys[npolys-1], m_epos, targetPos);
-				
-				static const float STEP_SIZE = 0.5f;
-				static const float SLOP = 0.01f;
-				
-				m_nsmoothPath = 0;
-				
-				dtVcopy(&m_smoothPath[m_nsmoothPath*3], iterPos);
-				m_nsmoothPath++;
-				
-				// Move towards target a small advancement at a time until target reached or
-				// when ran out of memory to store the path.
-				while (npolys && m_nsmoothPath < MAX_SMOOTH)
-				{
-					// Find location to steer towards.
-					float steerPos[3];
-					unsigned char steerPosFlag;
-					dtPolyRef steerPosRef;
-					
-					if (!getSteerTarget(m_navQuery, iterPos, targetPos, SLOP,
-										polys, npolys, steerPos, steerPosFlag, steerPosRef))
-						break;
-					
-					bool endOfPath = (steerPosFlag & DT_STRAIGHTPATH_END) ? true : false;
-					bool offMeshConnection = (steerPosFlag & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ? true : false;
-					
-					// Find movement delta.
-					float delta[3], len;
-					dtVsub(delta, steerPos, iterPos);
-					len = dtSqrt(dtVdot(delta,delta));
-					// If the steer target is end of path or off-mesh link, do not move past the location.
-					if ((endOfPath || offMeshConnection) && len < STEP_SIZE)
-						len = 1;
-					else
-						len = STEP_SIZE / len;
-					float moveTgt[3];
-					dtVmad(moveTgt, iterPos, delta, len);
-					
-					// Move
-					float result[3];
-					dtPolyRef visited[16];
-					int nvisited = 0;
-					m_navQuery->moveAlongSurface(polys[0], iterPos, moveTgt, &m_filter,
-												 result, visited, &nvisited, 16);
-															   
-					npolys = fixupCorridor(polys, npolys, MAX_POLYS, visited, nvisited);
-					float h = 0;
-					m_navQuery->getPolyHeight(polys[0], result, &h);
-					result[1] = h;
-					dtVcopy(iterPos, result);
-
-					// Handle end of path and off-mesh links when close enough.
-					if (endOfPath && inRange(iterPos, steerPos, SLOP, 1.0f))
-					{
-						// Reached end of path.
-						dtVcopy(iterPos, targetPos);
-						if (m_nsmoothPath < MAX_SMOOTH)
-						{
-							dtVcopy(&m_smoothPath[m_nsmoothPath*3], iterPos);
-							m_nsmoothPath++;
-						}
-						break;
-					}
-					else if (offMeshConnection && inRange(iterPos, steerPos, SLOP, 1.0f))
-					{
-						// Reached off-mesh connection.
-						float startPos[3], endPos[3];
-						
-						// Advance the path up to and over the off-mesh connection.
-						dtPolyRef prevRef = 0, polyRef = polys[0];
-						int npos = 0;
-						while (npos < npolys && polyRef != steerPosRef)
-						{
-							prevRef = polyRef;
-							polyRef = polys[npos];
-							npos++;
-						}
-						for (int i = npos; i < npolys; ++i)
-							polys[i-npos] = polys[i];
-						npolys -= npos;
-						
-						// Handle the connection.
-						if (m_navMesh->getOffMeshConnectionPolyEndPoints(prevRef, polyRef, startPos, endPos) == DT_SUCCESS)
-						{
-							if (m_nsmoothPath < MAX_SMOOTH)
-							{
-								dtVcopy(&m_smoothPath[m_nsmoothPath*3], startPos);
-								m_nsmoothPath++;
-								// Hack to make the dotted path not visible during off-mesh connection.
-								if (m_nsmoothPath & 1)
-								{
-									dtVcopy(&m_smoothPath[m_nsmoothPath*3], startPos);
-									m_nsmoothPath++;
-								}
-							}
-							// Move position at the other side of the off-mesh link.
-							dtVcopy(iterPos, endPos);
-							float h;
-							m_navQuery->getPolyHeight(polys[0], iterPos, &h);
-							iterPos[1] = h;
-						}
-					}
-					
-					// Store results.
-					if (m_nsmoothPath < MAX_SMOOTH)
-					{
-						dtVcopy(&m_smoothPath[m_nsmoothPath*3], iterPos);
-						m_nsmoothPath++;
-					}
-				}
-			}
-
-		}
-		else
-		{
-			m_npolys = 0;
-			m_nsmoothPath = 0;
-		}
-	}
-	else if (m_toolMode == TOOLMODE_PATHFIND_STRAIGHT)
-	{
-		if (m_sposSet && m_eposSet && m_startRef && m_endRef)
-		{
-#ifdef DUMP_REQS
-			printf("ps  %f %f %f  %f %f %f  0x%x 0x%x\n",
-				   m_spos[0],m_spos[1],m_spos[2], m_epos[0],m_epos[1],m_epos[2],
-				   m_filter.getIncludeFlags(), m_filter.getExcludeFlags()); 
-#endif
-			m_navQuery->findPath(m_startRef, m_endRef, m_spos, m_epos, &m_filter, m_polys, &m_npolys, MAX_POLYS);
-			m_nstraightPath = 0;
-			if (m_npolys)
-			{
-				// In case of partial path, make sure the end point is clamped to the last polygon.
-				float epos[3];
-				dtVcopy(epos, m_epos);
-				if (m_polys[m_npolys-1] != m_endRef)
-					m_navQuery->closestPointOnPoly(m_polys[m_npolys-1], m_epos, epos);
-				
-				m_navQuery->findStraightPath(m_spos, epos, m_polys, m_npolys,
-											 m_straightPath, m_straightPathFlags,
-											 m_straightPathPolys, &m_nstraightPath, MAX_POLYS);
-			}
-		}
-		else
-		{
-			m_npolys = 0;
-			m_nstraightPath = 0;
-		}
-	}
-	else if (m_toolMode == TOOLMODE_PATHFIND_SLICED)
-	{
-		if (m_sposSet && m_eposSet && m_startRef && m_endRef)
-		{
-#ifdef DUMP_REQS
-			printf("ps  %f %f %f  %f %f %f  0x%x 0x%x\n",
-				   m_spos[0],m_spos[1],m_spos[2], m_epos[0],m_epos[1],m_epos[2],
-				   m_filter.getIncludeFlags(), m_filter.getExcludeFlags()); 
-#endif
-			m_npolys = 0;
-			m_nstraightPath = 0;
-			
-			m_pathFindStatus = m_navQuery->initSlicedFindPath(m_startRef, m_endRef, m_spos, m_epos, &m_filter);
-		}
-		else
-		{
-			m_npolys = 0;
-			m_nstraightPath = 0;
-		}
-	}
-	else if (m_toolMode == TOOLMODE_RAYCAST)
-	{
-		m_nstraightPath = 0;
-		if (m_sposSet && m_eposSet && m_startRef)
-		{
-#ifdef DUMP_REQS
-			printf("rc  %f %f %f  %f %f %f  0x%x 0x%x\n",
-				   m_spos[0],m_spos[1],m_spos[2], m_epos[0],m_epos[1],m_epos[2],
-				   m_filter.getIncludeFlags(), m_filter.getExcludeFlags()); 
-#endif
-			float t = 0;
-			m_npolys = 0;
-			m_nstraightPath = 2;
-			m_straightPath[0] = m_spos[0];
-			m_straightPath[1] = m_spos[1];
-			m_straightPath[2] = m_spos[2];
-			m_navQuery->raycast(m_startRef, m_spos, m_epos, &m_filter, &t, m_hitNormal, m_polys, &m_npolys, MAX_POLYS);
-			if (t > 1)
-			{
-				// No hit
-				dtVcopy(m_hitPos, m_epos);
-				m_hitResult = false;
-			}
-			else
-			{
-				// Hit
-				m_hitPos[0] = m_spos[0] + (m_epos[0] - m_spos[0]) * t;
-				m_hitPos[1] = m_spos[1] + (m_epos[1] - m_spos[1]) * t;
-				m_hitPos[2] = m_spos[2] + (m_epos[2] - m_spos[2]) * t;
-				if (m_npolys)
-				{
-					float h = 0;
-					m_navQuery->getPolyHeight(m_polys[m_npolys-1], m_hitPos, &h);
-					m_hitPos[1] = h;
-				}
-				m_hitResult = true;
-			}
-			dtVcopy(&m_straightPath[3], m_hitPos);
-		}
-	}
-	else if (m_toolMode == TOOLMODE_DISTANCE_TO_WALL)
-	{
-		m_distanceToWall = 0;
-		if (m_sposSet && m_startRef)
-		{
-#ifdef DUMP_REQS
-			printf("dw  %f %f %f  %f  0x%x 0x%x\n",
-				   m_spos[0],m_spos[1],m_spos[2], 100.0f,
-				   m_filter.getIncludeFlags(), m_filter.getExcludeFlags()); 
-#endif
-			m_distanceToWall = 0.0f;
-			m_navQuery->findDistanceToWall(m_startRef, m_spos, 100.0f, &m_filter, &m_distanceToWall, m_hitPos, m_hitNormal);
-		}
-	}
-	else if (m_toolMode == TOOLMODE_FIND_POLYS_IN_CIRCLE)
-	{
-		if (m_sposSet && m_startRef && m_eposSet)
-		{
-			const float dx = m_epos[0] - m_spos[0];
-			const float dz = m_epos[2] - m_spos[2];
-			float dist = sqrtf(dx*dx + dz*dz);
-#ifdef DUMP_REQS
-			printf("fpc  %f %f %f  %f  0x%x 0x%x\n",
-				   m_spos[0],m_spos[1],m_spos[2], dist,
-				   m_filter.getIncludeFlags(), m_filter.getExcludeFlags());
-#endif
-			m_navQuery->findPolysAroundCircle(m_startRef, m_spos, dist, &m_filter,
-											  m_polys, m_parent, 0, &m_npolys, MAX_POLYS);
-
-		}
-	}
-	else if (m_toolMode == TOOLMODE_FIND_POLYS_IN_SHAPE)
-	{
-		if (m_sposSet && m_startRef && m_eposSet)
-		{
-			const float nx = (m_epos[2] - m_spos[2])*0.25f;
-			const float nz = -(m_epos[0] - m_spos[0])*0.25f;
-			const float agentHeight = m_sample ? m_sample->getAgentHeight() : 0;
-
-			m_queryPoly[0] = m_spos[0] + nx*1.2f;
-			m_queryPoly[1] = m_spos[1] + agentHeight/2;
-			m_queryPoly[2] = m_spos[2] + nz*1.2f;
-
-			m_queryPoly[3] = m_spos[0] - nx*1.3f;
-			m_queryPoly[4] = m_spos[1] + agentHeight/2;
-			m_queryPoly[5] = m_spos[2] - nz*1.3f;
-
-			m_queryPoly[6] = m_epos[0] - nx*0.8f;
-			m_queryPoly[7] = m_epos[1] + agentHeight/2;
-			m_queryPoly[8] = m_epos[2] - nz*0.8f;
-
-			m_queryPoly[9] = m_epos[0] + nx;
-			m_queryPoly[10] = m_epos[1] + agentHeight/2;
-			m_queryPoly[11] = m_epos[2] + nz;
-			
-#ifdef DUMP_REQS
-			printf("fpp  %f %f %f  %f %f %f  %f %f %f  %f %f %f  0x%x 0x%x\n",
-				   m_queryPoly[0],m_queryPoly[1],m_queryPoly[2],
-				   m_queryPoly[3],m_queryPoly[4],m_queryPoly[5],
-				   m_queryPoly[6],m_queryPoly[7],m_queryPoly[8],
-				   m_queryPoly[9],m_queryPoly[10],m_queryPoly[11],
-				   m_filter.getIncludeFlags(), m_filter.getExcludeFlags());
-#endif
-			m_navQuery->findPolysAroundShape(m_startRef, m_queryPoly, 4, &m_filter,
-											 m_polys, m_parent, 0, &m_npolys, MAX_POLYS);
-		}
-	}
-	else if (m_toolMode == TOOLMODE_FIND_LOCAL_NEIGHBOURHOOD)
-	{
-		if (m_sposSet && m_startRef)
-		{
-#ifdef DUMP_REQS
-			printf("fln  %f %f %f  %f  0x%x 0x%x\n",
-				   m_spos[0],m_spos[1],m_spos[2], m_neighbourhoodRadius,
-				   m_filter.getIncludeFlags(), m_filter.getExcludeFlags());
-#endif
-			m_navQuery->findLocalNeighbourhood(m_startRef, m_spos, m_neighbourhoodRadius, &m_filter,
-											   m_polys, m_parent, &m_npolys, MAX_POLYS);
-		}
-	}
-}
-
-static void getPolyCenter(dtNavMesh* navMesh, dtPolyRef ref, float* center)
-{
-	center[0] = 0;
-	center[1] = 0;
-	center[2] = 0;
-	
-	const dtMeshTile* tile = 0;
-	const dtPoly* poly = 0;
-	if (navMesh->getTileAndPolyByRef(ref, &tile, &poly) != DT_SUCCESS)
-		return;
-		
-	for (int i = 0; i < (int)poly->vertCount; ++i)
-	{
-		const float* v = &tile->verts[poly->verts[i]*3];
-		center[0] += v[0];
-		center[1] += v[1];
-		center[2] += v[2];
-	}
-	const float s = 1.0f / poly->vertCount;
-	center[0] *= s;
-	center[1] *= s;
-	center[2] *= s;
-}
-
-
-
-void NavMeshTesterTool::handleRender()
-{
-	DebugDrawGL dd;
-	
-	static const unsigned int startCol = duRGBA(128,25,0,192);
-	static const unsigned int endCol = duRGBA(51,102,0,129);
-	static const unsigned int pathCol = duRGBA(0,0,0,64);
-	
-	const float agentRadius = m_sample->getAgentRadius();
-	const float agentHeight = m_sample->getAgentHeight();
-	const float agentClimb = m_sample->getAgentClimb();
-	
-	dd.depthMask(false);
-	if (m_sposSet)
-		drawAgent(m_spos, agentRadius, agentHeight, agentClimb, startCol);
-	if (m_eposSet)
-		drawAgent(m_epos, agentRadius, agentHeight, agentClimb, endCol);
-	dd.depthMask(true);
-	
-	if (!m_navMesh)
-	{
-		return;
-	}
-
-	if (m_toolMode == TOOLMODE_PATHFIND_FOLLOW)
-	{
-		duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_startRef, startCol);
-		duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_endRef, endCol);
-		
-		if (m_npolys)
-		{
-			for (int i = 1; i < m_npolys-1; ++i)
-				duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_polys[i], pathCol);
-		}
-				
-		if (m_nsmoothPath)
-		{
-			dd.depthMask(false);
-			const unsigned int pathCol = duRGBA(0,0,0,220);
-			dd.begin(DU_DRAW_LINES, 3.0f);
-			for (int i = 0; i < m_nsmoothPath; ++i)
-				dd.vertex(m_smoothPath[i*3], m_smoothPath[i*3+1]+0.1f, m_smoothPath[i*3+2], pathCol);
-			dd.end();
-			dd.depthMask(true);
-		}
-		
-		if (m_pathIterNum)
-		{
-			duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_pathIterPolys[0], duRGBA(255,255,255,128));
-
-			dd.depthMask(false);
-			dd.begin(DU_DRAW_LINES, 1.0f);
-			
-			const unsigned int prevCol = duRGBA(255,192,0,220);
-			const unsigned int curCol = duRGBA(255,255,255,220);
-			const unsigned int steerCol = duRGBA(0,192,255,220);
-
-			dd.vertex(m_prevIterPos[0],m_prevIterPos[1]-0.3f,m_prevIterPos[2], prevCol);
-			dd.vertex(m_prevIterPos[0],m_prevIterPos[1]+0.3f,m_prevIterPos[2], prevCol);
-
-			dd.vertex(m_iterPos[0],m_iterPos[1]-0.3f,m_iterPos[2], curCol);
-			dd.vertex(m_iterPos[0],m_iterPos[1]+0.3f,m_iterPos[2], curCol);
-
-			dd.vertex(m_prevIterPos[0],m_prevIterPos[1]+0.3f,m_prevIterPos[2], prevCol);
-			dd.vertex(m_iterPos[0],m_iterPos[1]+0.3f,m_iterPos[2], prevCol);
-
-			dd.vertex(m_prevIterPos[0],m_prevIterPos[1]+0.3f,m_prevIterPos[2], steerCol);
-			dd.vertex(m_steerPos[0],m_steerPos[1]+0.3f,m_steerPos[2], steerCol);
-			
-			for (int i = 0; i < m_steerPointCount-1; ++i)
-			{
-				dd.vertex(m_steerPoints[i*3+0],m_steerPoints[i*3+1]+0.2f,m_steerPoints[i*3+2], duDarkenCol(steerCol));
-				dd.vertex(m_steerPoints[(i+1)*3+0],m_steerPoints[(i+1)*3+1]+0.2f,m_steerPoints[(i+1)*3+2], duDarkenCol(steerCol));
-			}
-			
-			dd.end();
-			dd.depthMask(true);
-		}
-	}
-	else if (m_toolMode == TOOLMODE_PATHFIND_STRAIGHT || m_toolMode == TOOLMODE_PATHFIND_SLICED)
-	{
-		duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_startRef, startCol);
-		duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_endRef, endCol);
-		
-		if (m_npolys)
-		{
-			for (int i = 1; i < m_npolys-1; ++i)
-				duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_polys[i], pathCol);
-		}
-		
-		if (m_nstraightPath)
-		{
-			dd.depthMask(false);
-			const unsigned int pathCol = duRGBA(64,16,0,220);
-			const unsigned int offMeshCol = duRGBA(128,96,0,220);
-			dd.begin(DU_DRAW_LINES, 2.0f);
-			for (int i = 0; i < m_nstraightPath-1; ++i)
-			{
-				unsigned int col = 0;
-				if (m_straightPathFlags[i] & DT_STRAIGHTPATH_OFFMESH_CONNECTION)
-					col = offMeshCol;
-				else
-					col = pathCol;
-				
-				dd.vertex(m_straightPath[i*3], m_straightPath[i*3+1]+0.4f, m_straightPath[i*3+2], col);
-				dd.vertex(m_straightPath[(i+1)*3], m_straightPath[(i+1)*3+1]+0.4f, m_straightPath[(i+1)*3+2], col);
-			}
-			dd.end();
-			dd.begin(DU_DRAW_POINTS, 6.0f);
-			for (int i = 0; i < m_nstraightPath; ++i)
-			{
-				unsigned int col = 0;
-				if (m_straightPathFlags[i] & DT_STRAIGHTPATH_START)
-					col = startCol;
-				else if (m_straightPathFlags[i] & DT_STRAIGHTPATH_START)
-					col = endCol;
-				else if (m_straightPathFlags[i] & DT_STRAIGHTPATH_OFFMESH_CONNECTION)
-					col = offMeshCol;
-				else
-					col = pathCol;
-				dd.vertex(m_straightPath[i*3], m_straightPath[i*3+1]+0.4f, m_straightPath[i*3+2], pathCol);
-			}
-			dd.end();
-			dd.depthMask(true);
-		}
-	}
-	else if (m_toolMode == TOOLMODE_RAYCAST)
-	{
-		duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_startRef, startCol);
-		
-		if (m_nstraightPath)
-		{
-			for (int i = 1; i < m_npolys; ++i)
-				duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_polys[i], pathCol);
-			
-			dd.depthMask(false);
-			const unsigned int pathCol = m_hitResult ? duRGBA(64,16,0,220) : duRGBA(240,240,240,220);
-			dd.begin(DU_DRAW_LINES, 2.0f);
-			for (int i = 0; i < m_nstraightPath-1; ++i)
-			{
-				dd.vertex(m_straightPath[i*3], m_straightPath[i*3+1]+0.4f, m_straightPath[i*3+2], pathCol);
-				dd.vertex(m_straightPath[(i+1)*3], m_straightPath[(i+1)*3+1]+0.4f, m_straightPath[(i+1)*3+2], pathCol);
-			}
-			dd.end();
-			dd.begin(DU_DRAW_POINTS, 4.0f);
-			for (int i = 0; i < m_nstraightPath; ++i)
-				dd.vertex(m_straightPath[i*3], m_straightPath[i*3+1]+0.4f, m_straightPath[i*3+2], pathCol);
-			dd.end();
-
-			if (m_hitResult)
-			{
-				const unsigned int hitCol = duRGBA(0,0,0,128);
-				dd.begin(DU_DRAW_LINES, 2.0f);
-				dd.vertex(m_hitPos[0], m_hitPos[1] + 0.4f, m_hitPos[2], hitCol);
-				dd.vertex(m_hitPos[0] + m_hitNormal[0]*agentRadius,
-						  m_hitPos[1] + 0.4f + m_hitNormal[1]*agentRadius,
-						  m_hitPos[2] + m_hitNormal[2]*agentRadius, hitCol);
-				dd.end();
-			}
-			dd.depthMask(true);
-		}
-	}
-	else if (m_toolMode == TOOLMODE_DISTANCE_TO_WALL)
-	{
-		duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_startRef, startCol);
-		dd.depthMask(false);
-		duDebugDrawCircle(&dd, m_spos[0], m_spos[1]+agentHeight/2, m_spos[2], m_distanceToWall, duRGBA(64,16,0,220), 2.0f);
-		dd.begin(DU_DRAW_LINES, 3.0f);
-		dd.vertex(m_hitPos[0], m_hitPos[1] + 0.02f, m_hitPos[2], duRGBA(0,0,0,192));
-		dd.vertex(m_hitPos[0], m_hitPos[1] + agentHeight, m_hitPos[2], duRGBA(0,0,0,192));
-		dd.end();
-		dd.depthMask(true);
-	}
-	else if (m_toolMode == TOOLMODE_FIND_POLYS_IN_CIRCLE)
-	{
-		for (int i = 0; i < m_npolys; ++i)
-		{
-			duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_polys[i], pathCol);
-			dd.depthMask(false);
-			if (m_parent[i])
-			{
-				float p0[3], p1[3];
-				dd.depthMask(false);
-				getPolyCenter(m_navMesh, m_parent[i], p0);
-				getPolyCenter(m_navMesh, m_polys[i], p1);
-				duDebugDrawArc(&dd, p0[0],p0[1],p0[2], p1[0],p1[1],p1[2], 0.25f, 0.0f, 0.4f, duRGBA(0,0,0,128), 2.0f);
-				dd.depthMask(true);
-			}
-			dd.depthMask(true);
-		}
-		
-		if (m_sposSet && m_eposSet)
-		{
-			dd.depthMask(false);
-			const float dx = m_epos[0] - m_spos[0];
-			const float dz = m_epos[2] - m_spos[2];
-			const float dist = sqrtf(dx*dx + dz*dz);
-			duDebugDrawCircle(&dd, m_spos[0], m_spos[1]+agentHeight/2, m_spos[2], dist, duRGBA(64,16,0,220), 2.0f);
-			dd.depthMask(true);
-		}
-	}	
-	else if (m_toolMode == TOOLMODE_FIND_POLYS_IN_SHAPE)
-	{
-		for (int i = 0; i < m_npolys; ++i)
-		{
-			duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_polys[i], pathCol);
-			dd.depthMask(false);
-			if (m_parent[i])
-			{
-				float p0[3], p1[3];
-				dd.depthMask(false);
-				getPolyCenter(m_navMesh, m_parent[i], p0);
-				getPolyCenter(m_navMesh, m_polys[i], p1);
-				duDebugDrawArc(&dd, p0[0],p0[1],p0[2], p1[0],p1[1],p1[2], 0.25f, 0.0f, 0.4f, duRGBA(0,0,0,128), 2.0f);
-				dd.depthMask(true);
-			}
-			dd.depthMask(true);
-		}
-		
-		if (m_sposSet && m_eposSet)
-		{
-			dd.depthMask(false);
-			const unsigned int col = duRGBA(64,16,0,220);
-			dd.begin(DU_DRAW_LINES, 2.0f);
-			for (int i = 0, j = 3; i < 4; j=i++)
-			{
-				const float* p0 = &m_queryPoly[j*3];
-				const float* p1 = &m_queryPoly[i*3];
-				dd.vertex(p0, col);
-				dd.vertex(p1, col);
-			}
-			dd.end();
-			dd.depthMask(true);
-		}
-	}
-	else if (m_toolMode == TOOLMODE_FIND_LOCAL_NEIGHBOURHOOD)
-	{
-		for (int i = 0; i < m_npolys; ++i)
-		{
-			duDebugDrawNavMeshPoly(&dd, *m_navMesh, m_polys[i], pathCol);
-			dd.depthMask(false);
-			if (m_parent[i])
-			{
-				float p0[3], p1[3];
-				dd.depthMask(false);
-				getPolyCenter(m_navMesh, m_parent[i], p0);
-				getPolyCenter(m_navMesh, m_polys[i], p1);
-				duDebugDrawArc(&dd, p0[0],p0[1],p0[2], p1[0],p1[1],p1[2], 0.25f, 0.0f, 0.4f, duRGBA(0,0,0,128), 2.0f);
-				dd.depthMask(true);
-			}
-
-			static const int MAX_SEGS = DT_VERTS_PER_POLYGON*2;
-			float segs[MAX_SEGS*6];
-			int nsegs = 0;
-			m_navQuery->getPolyWallSegments(m_polys[i], &m_filter, segs, &nsegs, MAX_SEGS);
-			dd.begin(DU_DRAW_LINES, 2.0f);
-			for (int j = 0; j < nsegs; ++j)
-			{
-				const float* s = &segs[j*6];
-				
-				// Skip too distant segments.
-				float tseg;
-				float distSqr = dtDistancePtSegSqr2D(m_spos, s, s+3, tseg);
-				if (distSqr > dtSqr(m_neighbourhoodRadius))
-					continue;
-				
-				float delta[3], norm[3], p0[3], p1[3];
-				dtVsub(delta, s+3,s);
-				dtVmad(p0, s, delta, 0.5f);
-				norm[0] = delta[2];
-				norm[1] = 0;
-				norm[2] = -delta[0];
-				dtVnormalize(norm);
-				dtVmad(p1, p0, norm, agentRadius*0.5f);
-
-				// Skip backfacing segments.
-				unsigned int col = duRGBA(255,255,255,192);
-				if (dtTriArea2D(m_spos, s, s+3) < 0.0f)
-					col = duRGBA(255,255,255,64);
-					
-				dd.vertex(p0[0],p0[1]+agentClimb,p0[2],duRGBA(0,0,0,128));
-				dd.vertex(p1[0],p1[1]+agentClimb,p1[2],duRGBA(0,0,0,128));
-
-				dd.vertex(s[0],s[1]+agentClimb,s[2],col);
-				dd.vertex(s[3],s[4]+agentClimb,s[5],col);
-			}
-			dd.end();
-			
-			dd.depthMask(true);
-		}
-		
-		if (m_sposSet)
-		{
-			dd.depthMask(false);
-			duDebugDrawCircle(&dd, m_spos[0], m_spos[1]+agentHeight/2, m_spos[2], m_neighbourhoodRadius, duRGBA(64,16,0,220), 2.0f);
-			dd.depthMask(true);
-		}
-	}	
-}
-
-void NavMeshTesterTool::handleRenderOverlay(double* proj, double* model, int* view)
-{
-	GLdouble x, y, z;
-	
-	// Draw start and end point labels
-	if (m_sposSet && gluProject((GLdouble)m_spos[0], (GLdouble)m_spos[1], (GLdouble)m_spos[2],
-								model, proj, view, &x, &y, &z))
-	{
-		imguiDrawText((int)x, (int)(y-25), IMGUI_ALIGN_CENTER, "Start", imguiRGBA(0,0,0,220));
-	}
-	if (m_eposSet && gluProject((GLdouble)m_epos[0], (GLdouble)m_epos[1], (GLdouble)m_epos[2],
-								model, proj, view, &x, &y, &z))
-	{
-		imguiDrawText((int)x, (int)(y-25), IMGUI_ALIGN_CENTER, "End", imguiRGBA(0,0,0,220));
-	}
-}
-
-void NavMeshTesterTool::drawAgent(const float* pos, float r, float h, float c, const unsigned int col)
-{
-	DebugDrawGL dd;
-	
-	dd.depthMask(false);
-	
-	// Agent dimensions.	
-	duDebugDrawCylinderWire(&dd, pos[0]-r, pos[1]+0.02f, pos[2]-r, pos[0]+r, pos[1]+h, pos[2]+r, col, 2.0f);
-
-	duDebugDrawCircle(&dd, pos[0],pos[1]+c,pos[2],r,duRGBA(0,0,0,64),1.0f);
-
-	unsigned int colb = duRGBA(0,0,0,196);
-	dd.begin(DU_DRAW_LINES);
-	dd.vertex(pos[0], pos[1]-c, pos[2], colb);
-	dd.vertex(pos[0], pos[1]+c, pos[2], colb);
-	dd.vertex(pos[0]-r/2, pos[1]+0.02f, pos[2], colb);
-	dd.vertex(pos[0]+r/2, pos[1]+0.02f, pos[2], colb);
-	dd.vertex(pos[0], pos[1]+0.02f, pos[2]-r/2, colb);
-	dd.vertex(pos[0], pos[1]+0.02f, pos[2]+r/2, colb);
-	dd.end();
-	
-	dd.depthMask(true);
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/OffMeshConnectionTool.cpp b/dep/recastnavigation/RecastDemo/Source/OffMeshConnectionTool.cpp
deleted file mode 100644
index ec192a6036e..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/OffMeshConnectionTool.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include <float.h>
-#include "SDL.h"
-#include "SDL_opengl.h"
-#include "imgui.h"
-#include "OffMeshConnectionTool.h"
-#include "InputGeom.h"
-#include "Sample.h"
-#include "Recast.h"
-#include "RecastDebugDraw.h"
-#include "DetourDebugDraw.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-OffMeshConnectionTool::OffMeshConnectionTool() :
-	m_sample(0),
-	m_hitPosSet(0),
-	m_bidir(true),
-	m_oldFlags(0)
-{
-}
-
-OffMeshConnectionTool::~OffMeshConnectionTool()
-{
-	if (m_sample)
-	{
-		m_sample->setNavMeshDrawFlags(m_oldFlags);
-	}
-}
-
-void OffMeshConnectionTool::init(Sample* sample)
-{
-	if (m_sample != sample)
-	{
-		m_sample = sample;
-		m_oldFlags = m_sample->getNavMeshDrawFlags();
-		m_sample->setNavMeshDrawFlags(m_oldFlags & ~DU_DRAWNAVMESH_OFFMESHCONS);
-	}
-}
-
-void OffMeshConnectionTool::reset()
-{
-	m_hitPosSet = false;
-}
-
-void OffMeshConnectionTool::handleMenu()
-{
-	if (imguiCheck("One Way", !m_bidir))
-		m_bidir = false;
-	if (imguiCheck("Bidirectional", m_bidir))
-		m_bidir = true;
-
-	if (!m_hitPosSet)
-	{
-		imguiValue("Click to set connection start.");
-	}
-	else
-	{
-		imguiValue("Click to set connection end.");
-	}
-}
-
-void OffMeshConnectionTool::handleClick(const float* /*s*/, const float* p, bool shift)
-{
-	if (!m_sample) return;
-	InputGeom* geom = m_sample->getInputGeom();
-	if (!geom) return;
-
-	if (shift)
-	{
-		// Delete
-		// Find nearest link end-point
-		float nearestDist = FLT_MAX;
-		int nearestIndex = -1;
-		const float* verts = geom->getOffMeshConnectionVerts();
-		for (int i = 0; i < geom->getOffMeshConnectionCount()*2; ++i)
-		{
-			const float* v = &verts[i*3];
-			float d = rcVdistSqr(p, v);
-			if (d < nearestDist)
-			{
-				nearestDist = d;
-				nearestIndex = i/2; // Each link has two vertices.
-			}
-		}
-		// If end point close enough, delete it.
-		if (nearestIndex != -1 &&
-			sqrtf(nearestDist) < m_sample->getAgentRadius())
-		{
-			geom->deleteOffMeshConnection(nearestIndex);
-		}
-	}
-	else
-	{
-		// Create	
-		if (!m_hitPosSet)
-		{
-			rcVcopy(m_hitPos, p);
-			m_hitPosSet = true;
-		}
-		else
-		{
-			const unsigned char area = SAMPLE_POLYAREA_JUMP;
-			const unsigned short flags = SAMPLE_POLYFLAGS_JUMP; 
-			geom->addOffMeshConnection(m_hitPos, p, m_sample->getAgentRadius(), m_bidir ? 1 : 0, area, flags);
-			m_hitPosSet = false;
-		}
-	}
-	
-}
-
-void OffMeshConnectionTool::handleToggle()
-{
-}
-
-void OffMeshConnectionTool::handleStep()
-{
-}
-
-void OffMeshConnectionTool::handleUpdate(const float /*dt*/)
-{
-}
-
-void OffMeshConnectionTool::handleRender()
-{
-	DebugDrawGL dd;
-	const float s = m_sample->getAgentRadius();
-	
-	if (m_hitPosSet)
-		duDebugDrawCross(&dd, m_hitPos[0],m_hitPos[1]+0.1f,m_hitPos[2], s, duRGBA(0,0,0,128), 2.0f);
-
-	InputGeom* geom = m_sample->getInputGeom();
-	if (geom)
-		geom->drawOffMeshConnections(&dd, true);
-}
-
-void OffMeshConnectionTool::handleRenderOverlay(double* proj, double* model, int* view)
-{
-	GLdouble x, y, z;
-	
-	// Draw start and end point labels
-	if (m_hitPosSet && gluProject((GLdouble)m_hitPos[0], (GLdouble)m_hitPos[1], (GLdouble)m_hitPos[2],
-								model, proj, view, &x, &y, &z))
-	{
-		imguiDrawText((int)x, (int)(y-25), IMGUI_ALIGN_CENTER, "Start", imguiRGBA(0,0,0,220));
-	}
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/PerfTimer.cpp b/dep/recastnavigation/RecastDemo/Source/PerfTimer.cpp
deleted file mode 100644
index 32c08968e75..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/PerfTimer.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "PerfTimer.h"
-
-#if defined(WIN32)
-
-// Win32
-#include <windows.h>
-
-TimeVal getPerfTime()
-{
-	__int64 count;
-	QueryPerformanceCounter((LARGE_INTEGER*)&count);
-	return count;
-}
-
-int getPerfDeltaTimeUsec(const TimeVal start, const TimeVal end)
-{
-	static __int64 freq = 0;
-	if (freq == 0)
-		QueryPerformanceFrequency((LARGE_INTEGER*)&freq);
-	__int64 elapsed = end - start;
-	return (int)(elapsed*1000000 / freq);
-}
-
-#else
-
-// Linux, BSD, OSX
-
-#include <sys/time.h>
-
-TimeVal getPerfTime()
-{
-	timeval now;
-	gettimeofday(&now, 0);
-	return (TimeVal)now.tv_sec*1000000L + (TimeVal)now.tv_usec;
-}
-
-int getPerfDeltaTimeUsec(const TimeVal start, const TimeVal end)
-{
-	return (int)(end - start);
-}
-
-#endif
diff --git a/dep/recastnavigation/RecastDemo/Source/SDLMain.m b/dep/recastnavigation/RecastDemo/Source/SDLMain.m
deleted file mode 100644
index 2eaa1c11ef7..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/SDLMain.m
+++ /dev/null
@@ -1,384 +0,0 @@
-/*   SDLMain.m - main entry point for our Cocoa-ized SDL app
-       Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
-       Non-NIB-Code & other changes: Max Horn <max@quendi.de>
-
-    Feel free to customize this file to suit your needs
-*/
-
-#import "SDL.h"
-#import "SDLMain.h"
-#import <sys/param.h> /* for MAXPATHLEN */
-#import <unistd.h>
-
-/* For some reaon, Apple removed setAppleMenu from the headers in 10.4,
- but the method still is there and works. To avoid warnings, we declare
- it ourselves here. */
-@interface NSApplication(SDL_Missing_Methods)
-- (void)setAppleMenu:(NSMenu *)menu;
-@end
-
-/* Use this flag to determine whether we use SDLMain.nib or not */
-#define		SDL_USE_NIB_FILE	0
-
-/* Use this flag to determine whether we use CPS (docking) or not */
-#define		SDL_USE_CPS		1
-#ifdef SDL_USE_CPS
-/* Portions of CPS.h */
-typedef struct CPSProcessSerNum
-{
-	UInt32		lo;
-	UInt32		hi;
-} CPSProcessSerNum;
-
-extern OSErr	CPSGetCurrentProcess( CPSProcessSerNum *psn);
-extern OSErr 	CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
-extern OSErr	CPSSetFrontProcess( CPSProcessSerNum *psn);
-
-#endif /* SDL_USE_CPS */
-
-static int    gArgc;
-static char  **gArgv;
-static BOOL   gFinderLaunch;
-static BOOL   gCalledAppMainline = FALSE;
-
-static NSString *getApplicationName(void)
-{
-    NSDictionary *dict;
-    NSString *appName = 0;
-
-    /* Determine the application name */
-    dict = (NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle());
-    if (dict)
-        appName = [dict objectForKey: @"CFBundleName"];
-    
-    if (![appName length])
-        appName = [[NSProcessInfo processInfo] processName];
-
-    return appName;
-}
-
-#if SDL_USE_NIB_FILE
-/* A helper category for NSString */
-@interface NSString (ReplaceSubString)
-- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString;
-@end
-#endif
-
-@interface SDLApplication : NSApplication
-@end
-
-@implementation SDLApplication
-/* Invoked from the Quit menu item */
-- (void)terminate:(id)sender
-{
-    /* Post a SDL_QUIT event */
-    SDL_Event event;
-    event.type = SDL_QUIT;
-    SDL_PushEvent(&event);
-}
-@end
-
-/* The main class of the application, the application's delegate */
-@implementation SDLMain
-
-/* Set the working directory to the .app's parent directory */
-- (void) setupWorkingDirectory:(BOOL)shouldChdir
-{
-    if (shouldChdir)
-    {
-        char parentdir[MAXPATHLEN];
-		CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
-		CFURLRef url2 = CFURLCreateCopyDeletingLastPathComponent(0, url);
-		if (CFURLGetFileSystemRepresentation(url2, true, (UInt8 *)parentdir, MAXPATHLEN)) {
-	        assert ( chdir (parentdir) == 0 );   /* chdir to the binary app's parent */
-		}
-		CFRelease(url);
-		CFRelease(url2);
-	}
-
-}
-
-#if SDL_USE_NIB_FILE
-
-/* Fix menu to contain the real app name instead of "SDL App" */
-- (void)fixMenu:(NSMenu *)aMenu withAppName:(NSString *)appName
-{
-    NSRange aRange;
-    NSEnumerator *enumerator;
-    NSMenuItem *menuItem;
-
-    aRange = [[aMenu title] rangeOfString:@"SDL App"];
-    if (aRange.length != 0)
-        [aMenu setTitle: [[aMenu title] stringByReplacingRange:aRange with:appName]];
-
-    enumerator = [[aMenu itemArray] objectEnumerator];
-    while ((menuItem = [enumerator nextObject]))
-    {
-        aRange = [[menuItem title] rangeOfString:@"SDL App"];
-        if (aRange.length != 0)
-            [menuItem setTitle: [[menuItem title] stringByReplacingRange:aRange with:appName]];
-        if ([menuItem hasSubmenu])
-            [self fixMenu:[menuItem submenu] withAppName:appName];
-    }
-    [ aMenu sizeToFit ];
-}
-
-#else
-
-static void setApplicationMenu(void)
-{
-    /* warning: this code is very odd */
-    NSMenu *appleMenu;
-    NSMenuItem *menuItem;
-    NSString *title;
-    NSString *appName;
-    
-    appName = getApplicationName();
-    appleMenu = [[NSMenu alloc] initWithTitle:@""];
-    
-    /* Add menu items */
-    title = [@"About " stringByAppendingString:appName];
-    [appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
-
-    [appleMenu addItem:[NSMenuItem separatorItem]];
-
-    title = [@"Hide " stringByAppendingString:appName];
-    [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"];
-
-    menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
-    [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
-
-    [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
-
-    [appleMenu addItem:[NSMenuItem separatorItem]];
-
-    title = [@"Quit " stringByAppendingString:appName];
-    [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
-
-    
-    /* Put menu into the menubar */
-    menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
-    [menuItem setSubmenu:appleMenu];
-    [[NSApp mainMenu] addItem:menuItem];
-
-    /* Tell the application object that this is now the application menu */
-    [NSApp setAppleMenu:appleMenu];
-
-    /* Finally give up our references to the objects */
-    [appleMenu release];
-    [menuItem release];
-}
-
-/* Create a window menu */
-static void setupWindowMenu(void)
-{
-    NSMenu      *windowMenu;
-    NSMenuItem  *windowMenuItem;
-    NSMenuItem  *menuItem;
-
-    windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
-    
-    /* "Minimize" item */
-    menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
-    [windowMenu addItem:menuItem];
-    [menuItem release];
-    
-    /* Put menu into the menubar */
-    windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
-    [windowMenuItem setSubmenu:windowMenu];
-    [[NSApp mainMenu] addItem:windowMenuItem];
-    
-    /* Tell the application object that this is now the window menu */
-    [NSApp setWindowsMenu:windowMenu];
-
-    /* Finally give up our references to the objects */
-    [windowMenu release];
-    [windowMenuItem release];
-}
-
-/* Replacement for NSApplicationMain */
-static void CustomApplicationMain (int argc, char **argv)
-{
-    NSAutoreleasePool	*pool = [[NSAutoreleasePool alloc] init];
-    SDLMain				*sdlMain;
-
-    /* Ensure the application object is initialised */
-    [SDLApplication sharedApplication];
-    
-#ifdef SDL_USE_CPS
-    {
-        CPSProcessSerNum PSN;
-        /* Tell the dock about us */
-        if (!CPSGetCurrentProcess(&PSN))
-            if (!CPSEnableForegroundOperation(&PSN,0x03,0x3C,0x2C,0x1103))
-                if (!CPSSetFrontProcess(&PSN))
-                    [SDLApplication sharedApplication];
-    }
-#endif /* SDL_USE_CPS */
-
-    /* Set up the menubar */
-    [NSApp setMainMenu:[[NSMenu alloc] init]];
-    setApplicationMenu();
-    setupWindowMenu();
-
-    /* Create SDLMain and make it the app delegate */
-    sdlMain = [[SDLMain alloc] init];
-    [NSApp setDelegate:sdlMain];
-    
-    /* Start the main event loop */
-    [NSApp run];
-    
-    [sdlMain release];
-    [pool release];
-}
-
-#endif
-
-
-/*
- * Catch document open requests...this lets us notice files when the app
- *  was launched by double-clicking a document, or when a document was
- *  dragged/dropped on the app's icon. You need to have a
- *  CFBundleDocumentsType section in your Info.plist to get this message,
- *  apparently.
- *
- * Files are added to gArgv, so to the app, they'll look like command line
- *  arguments. Previously, apps launched from the finder had nothing but
- *  an argv[0].
- *
- * This message may be received multiple times to open several docs on launch.
- *
- * This message is ignored once the app's mainline has been called.
- */
-- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
-{
-    const char *temparg;
-    size_t arglen;
-    char *arg;
-    char **newargv;
-
-    if (!gFinderLaunch)  /* MacOS is passing command line args. */
-        return FALSE;
-
-    if (gCalledAppMainline)  /* app has started, ignore this document. */
-        return FALSE;
-
-    temparg = [filename UTF8String];
-    arglen = SDL_strlen(temparg) + 1;
-    arg = (char *) SDL_malloc(arglen);
-    if (arg == NULL)
-        return FALSE;
-
-    newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2));
-    if (newargv == NULL)
-    {
-        SDL_free(arg);
-        return FALSE;
-    }
-    gArgv = newargv;
-
-    SDL_strlcpy(arg, temparg, arglen);
-    gArgv[gArgc++] = arg;
-    gArgv[gArgc] = NULL;
-    return TRUE;
-}
-
-
-/* Called when the internal event loop has just started running */
-- (void) applicationDidFinishLaunching: (NSNotification *) note
-{
-    int status;
-
-    /* Set the working directory to the .app's parent directory */
-    [self setupWorkingDirectory:gFinderLaunch];
-
-#if SDL_USE_NIB_FILE
-    /* Set the main menu to contain the real app name instead of "SDL App" */
-    [self fixMenu:[NSApp mainMenu] withAppName:getApplicationName()];
-#endif
-
-    /* Hand off to main application code */
-    gCalledAppMainline = TRUE;
-    status = SDL_main (gArgc, gArgv);
-
-    /* We're done, thank you for playing */
-    exit(status);
-}
-@end
-
-
-@implementation NSString (ReplaceSubString)
-
-- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString
-{
-    unsigned int bufferSize;
-    unsigned int selfLen = [self length];
-    unsigned int aStringLen = [aString length];
-    unichar *buffer;
-    NSRange localRange;
-    NSString *result;
-
-    bufferSize = selfLen + aStringLen - aRange.length;
-    buffer = NSAllocateMemoryPages(bufferSize*sizeof(unichar));
-    
-    /* Get first part into buffer */
-    localRange.location = 0;
-    localRange.length = aRange.location;
-    [self getCharacters:buffer range:localRange];
-    
-    /* Get middle part into buffer */
-    localRange.location = 0;
-    localRange.length = aStringLen;
-    [aString getCharacters:(buffer+aRange.location) range:localRange];
-     
-    /* Get last part into buffer */
-    localRange.location = aRange.location + aRange.length;
-    localRange.length = selfLen - localRange.location;
-    [self getCharacters:(buffer+aRange.location+aStringLen) range:localRange];
-    
-    /* Build output string */
-    result = [NSString stringWithCharacters:buffer length:bufferSize];
-    
-    NSDeallocateMemoryPages(buffer, bufferSize);
-    
-    return result;
-}
-
-@end
-
-
-
-#ifdef main
-#  undef main
-#endif
-
-
-/* Main entry point to executable - should *not* be SDL_main! */
-int main (int argc, char **argv)
-{
-    /* Copy the arguments into a global variable */
-    /* This is passed if we are launched by double-clicking */
-    if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
-        gArgv = (char **) SDL_malloc(sizeof (char *) * 2);
-        gArgv[0] = argv[0];
-        gArgv[1] = NULL;
-        gArgc = 1;
-        gFinderLaunch = YES;
-    } else {
-        int i;
-        gArgc = argc;
-        gArgv = (char **) SDL_malloc(sizeof (char *) * (argc+1));
-        for (i = 0; i <= argc; i++)
-            gArgv[i] = argv[i];
-        gFinderLaunch = NO;
-    }
-
-#if SDL_USE_NIB_FILE
-    [SDLApplication poseAsClass:[NSApplication class]];
-    NSApplicationMain (argc, argv);
-#else
-    CustomApplicationMain (argc, argv);
-#endif
-    return 0;
-}
-
diff --git a/dep/recastnavigation/RecastDemo/Source/Sample.cpp b/dep/recastnavigation/RecastDemo/Source/Sample.cpp
deleted file mode 100644
index c437bffa02a..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/Sample.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include "Sample.h"
-#include "InputGeom.h"
-#include "Recast.h"
-#include "RecastDebugDraw.h"
-#include "DetourDebugDraw.h"
-#include "DetourNavMesh.h"
-#include "DetourNavMeshQuery.h"
-#include "imgui.h"
-#include "SDL.h"
-#include "SDL_opengl.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-Sample::Sample() :
-	m_geom(0),
-	m_navMesh(0),
-	m_navQuery(0),
-	m_navMeshDrawFlags(DU_DRAWNAVMESH_OFFMESHCONS|DU_DRAWNAVMESH_CLOSEDLIST),
-	m_tool(0),
-	m_ctx(0)
-{
-	resetCommonSettings();
-	m_navQuery = dtAllocNavMeshQuery();
-}
-
-Sample::~Sample()
-{
-	dtFreeNavMeshQuery(m_navQuery);
-	dtFreeNavMesh(m_navMesh);
-	delete m_tool;
-}
-
-void Sample::setTool(SampleTool* tool)
-{
-	delete m_tool;
-	m_tool = tool;
-	if (tool)
-		m_tool->init(this);
-}
-
-void Sample::handleSettings()
-{
-}
-
-void Sample::handleTools()
-{
-}
-
-void Sample::handleDebugMode()
-{
-}
-
-void Sample::handleRender()
-{
-	if (!m_geom)
-		return;
-	
-	DebugDrawGL dd;
-		
-	// Draw mesh
-	duDebugDrawTriMesh(&dd, m_geom->getMesh()->getVerts(), m_geom->getMesh()->getVertCount(),
-					   m_geom->getMesh()->getTris(), m_geom->getMesh()->getNormals(), m_geom->getMesh()->getTriCount(), 0);
-	// Draw bounds
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float* bmax = m_geom->getMeshBoundsMax();
-	duDebugDrawBoxWire(&dd, bmin[0],bmin[1],bmin[2], bmax[0],bmax[1],bmax[2], duRGBA(255,255,255,128), 1.0f);
-}
-
-void Sample::handleRenderOverlay(double* /*proj*/, double* /*model*/, int* /*view*/)
-{
-}
-
-void Sample::handleMeshChanged(InputGeom* geom)
-{
-	m_geom = geom;
-}
-
-const float* Sample::getBoundsMin()
-{
-	if (!m_geom) return 0;
-	return m_geom->getMeshBoundsMin();
-}
-
-const float* Sample::getBoundsMax()
-{
-	if (!m_geom) return 0;
-	return m_geom->getMeshBoundsMax();
-}
-
-void Sample::resetCommonSettings()
-{
-	m_cellSize = 0.3f;
-	m_cellHeight = 0.2f;
-	m_agentHeight = 2.0f;
-	m_agentRadius = 0.6f;
-	m_agentMaxClimb = 0.9f;
-	m_agentMaxSlope = 45.0f;
-	m_regionMinSize = 8;
-	m_regionMergeSize = 20;
-	m_edgeMaxLen = 12.0f;
-	m_edgeMaxError = 1.3f;
-	m_vertsPerPoly = 6.0f;
-	m_detailSampleDist = 6.0f;
-	m_detailSampleMaxError = 1.0f;
-}
-
-void Sample::handleCommonSettings()
-{
-	imguiLabel("Rasterization");
-	imguiSlider("Cell Size", &m_cellSize, 0.1f, 1.0f, 0.01f);
-	imguiSlider("Cell Height", &m_cellHeight, 0.1f, 1.0f, 0.01f);
-	
-	if (m_geom)
-	{
-		const float* bmin = m_geom->getMeshBoundsMin();
-		const float* bmax = m_geom->getMeshBoundsMax();
-		int gw = 0, gh = 0;
-		rcCalcGridSize(bmin, bmax, m_cellSize, &gw, &gh);
-		char text[64];
-		snprintf(text, 64, "Voxels  %d x %d", gw, gh);
-		imguiValue(text);
-	}
-	
-	imguiSeparator();
-	imguiLabel("Agent");
-	imguiSlider("Height", &m_agentHeight, 0.1f, 5.0f, 0.1f);
-	imguiSlider("Radius", &m_agentRadius, 0.0f, 5.0f, 0.1f);
-	imguiSlider("Max Climb", &m_agentMaxClimb, 0.1f, 5.0f, 0.1f);
-	imguiSlider("Max Slope", &m_agentMaxSlope, 0.0f, 90.0f, 1.0f);
-	
-	imguiSeparator();
-	imguiLabel("Region");
-	imguiSlider("Min Region Size", &m_regionMinSize, 0.0f, 150.0f, 1.0f);
-	imguiSlider("Merged Region Size", &m_regionMergeSize, 0.0f, 150.0f, 1.0f);
-	
-	imguiSeparator();
-	imguiLabel("Polygonization");
-	imguiSlider("Max Edge Length", &m_edgeMaxLen, 0.0f, 50.0f, 1.0f);
-	imguiSlider("Max Edge Error", &m_edgeMaxError, 0.1f, 4.0f, 0.1f);
-	imguiSlider("Verts Per Poly", &m_vertsPerPoly, 3.0f, 12.0f, 1.0f);		
-
-	imguiSeparator();
-	imguiLabel("Detail Mesh");
-	imguiSlider("Sample Distance", &m_detailSampleDist, 0.0f, 32.0f, 1.0f);
-	imguiSlider("Max Sample Error", &m_detailSampleMaxError, 0.0f, 16.0f, 1.0f);
-	
-	imguiSeparator();
-}
-
-void Sample::handleClick(const float* s, const float* p, bool shift)
-{
-	if (m_tool)
-		m_tool->handleClick(s, p, shift);
-}
-
-void Sample::handleToggle()
-{
-	if (m_tool)
-		m_tool->handleToggle();
-}
-
-void Sample::handleStep()
-{
-	if (m_tool)
-		m_tool->handleStep();
-}
-
-bool Sample::handleBuild()
-{
-	return true;
-}
-
-void Sample::handleUpdate(const float dt)
-{
-	if (m_tool)
-		m_tool->handleUpdate(dt);
-}
-
diff --git a/dep/recastnavigation/RecastDemo/Source/SampleInterfaces.cpp b/dep/recastnavigation/RecastDemo/Source/SampleInterfaces.cpp
deleted file mode 100644
index d3d96d6b00d..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/SampleInterfaces.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include "SampleInterfaces.h"
-#include "Recast.h"
-#include "RecastDebugDraw.h"
-#include "DetourDebugDraw.h"
-#include "PerfTimer.h"
-#include "SDL.h"
-#include "SDL_opengl.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-BuildContext::BuildContext() :
-	m_messageCount(0),
-	m_textPoolSize(0)
-{
-	resetTimers();
-}
-
-BuildContext::~BuildContext()
-{
-}
-
-// Virtual functions for custom implementations.
-void BuildContext::doResetLog()
-{
-	m_messageCount = 0;
-	m_textPoolSize = 0;
-}
-
-void BuildContext::doLog(const rcLogCategory category, const char* msg, const int len)
-{
-	if (!len) return;
-	if (m_messageCount >= MAX_MESSAGES)
-		return;
-	char* dst = &m_textPool[m_textPoolSize];
-	int n = TEXT_POOL_SIZE - m_textPoolSize;
-	if (n < 2)
-		return;
-	char* cat = dst;
-	char* text = dst+1;
-	const int maxtext = n-1;
-	// Store category
-	*cat = (char)category;
-	// Store message
-	const int count = rcMin(len+1, maxtext);
-	memcpy(text, msg, count);
-	text[count-1] = '\0';
-	m_textPoolSize += 1 + count;
-	m_messages[m_messageCount++] = dst;
-}
-
-void BuildContext::doResetTimers()
-{
-	for (int i = 0; i < RC_MAX_TIMERS; ++i)
-		m_accTime[i] = -1;
-}
-
-void BuildContext::doStartTimer(const rcTimerLabel label)
-{
-	m_startTime[label] = getPerfTime();
-}
-
-void BuildContext::doStopTimer(const rcTimerLabel label)
-{
-	const TimeVal endTime = getPerfTime();
-	const int deltaTime = (int)(endTime - m_startTime[label]);
-	if (m_accTime[label] == -1)
-		m_accTime[label] = deltaTime;
-	else
-		m_accTime[label] += deltaTime;
-}
-
-int BuildContext::doGetAccumulatedTime(const rcTimerLabel label) const
-{
-	return m_accTime[label];
-}
-
-void BuildContext::dumpLog(const char* format, ...)
-{
-	// Print header.
-	va_list ap;
-	va_start(ap, format);
-	vprintf(format, ap);
-	va_end(ap);
-	printf("\n");
-	
-	// Print messages
-	const int TAB_STOPS[4] = { 28, 36, 44, 52 };
-	for (int i = 0; i < m_messageCount; ++i)
-	{
-		const char* msg = m_messages[i]+1;
-		int n = 0;
-		while (*msg)
-		{
-			if (*msg == '\t')
-			{
-				int count = 1;
-				for (int j = 0; j < 4; ++j)
-				{
-					if (n < TAB_STOPS[j])
-					{
-						count = TAB_STOPS[j] - n;
-						break;
-					}
-				}
-				while (--count)
-				{
-					putchar(' ');
-					n++;
-				}
-			}
-			else
-			{
-				putchar(*msg);
-				n++;
-			}
-			msg++;
-		}
-		putchar('\n');
-	}
-}
-
-int BuildContext::getLogCount() const
-{
-	return m_messageCount;
-}
-
-const char* BuildContext::getLogText(const int i) const
-{
-	return m_messages[i]+1;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void DebugDrawGL::depthMask(bool state)
-{
-	glDepthMask(state ? GL_TRUE : GL_FALSE);
-}
-
-void DebugDrawGL::begin(duDebugDrawPrimitives prim, float size)
-{
-	switch (prim)
-	{
-		case DU_DRAW_POINTS:
-			glPointSize(size);
-			glBegin(GL_POINTS);
-			break;
-		case DU_DRAW_LINES:
-			glLineWidth(size);
-			glBegin(GL_LINES);
-			break;
-		case DU_DRAW_TRIS:
-			glBegin(GL_TRIANGLES);
-			break;
-		case DU_DRAW_QUADS:
-			glBegin(GL_QUADS);
-			break;
-	};
-}
-
-void DebugDrawGL::vertex(const float* pos, unsigned int color)
-{
-	glColor4ubv((GLubyte*)&color);
-	glVertex3fv(pos);
-}
-
-void DebugDrawGL::vertex(const float x, const float y, const float z, unsigned int color)
-{
-	glColor4ubv((GLubyte*)&color);
-	glVertex3f(x,y,z);
-}
-
-void DebugDrawGL::end()
-{
-	glEnd();
-	glLineWidth(1.0f);
-	glPointSize(1.0f);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-FileIO::FileIO() :
-	m_fp(0),
-	m_mode(-1)
-{
-}
-
-FileIO::~FileIO()
-{
-	if (m_fp) fclose(m_fp);
-}
-
-bool FileIO::openForWrite(const char* path)
-{
-	if (m_fp) return false;
-	m_fp = fopen(path, "wb");
-	if (!m_fp) return false;
-	m_mode = 1;
-	return true;
-}
-
-bool FileIO::openForRead(const char* path)
-{
-	if (m_fp) return false;
-	m_fp = fopen(path, "rb");
-	if (!m_fp) return false;
-	m_mode = 2;
-	return true;
-}
-
-bool FileIO::isWriting() const
-{
-	return m_mode == 1;
-}
-
-bool FileIO::isReading() const
-{
-	return m_mode == 2;
-}
-
-bool FileIO::write(const void* ptr, const size_t size)
-{
-	if (!m_fp || m_mode != 1) return false;
-	fwrite(ptr, size, 1, m_fp);
-	return true;
-}
-
-bool FileIO::read(void* ptr, const size_t size)
-{
-	if (!m_fp || m_mode != 2) return false;
-	fread(ptr, size, 1, m_fp);
-	return true;
-}
-
-
diff --git a/dep/recastnavigation/RecastDemo/Source/Sample_Debug.cpp b/dep/recastnavigation/RecastDemo/Source/Sample_Debug.cpp
deleted file mode 100644
index 16c5ac250c2..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/Sample_Debug.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include "Sample_Debug.h"
-#include "InputGeom.h"
-#include "Recast.h"
-#include "DetourNavMesh.h"
-#include "RecastDebugDraw.h"
-#include "DetourDebugDraw.h"
-#include "RecastDump.h"
-#include "imgui.h"
-#include "SDL.h"
-#include "SDL_opengl.h"
-
-#include "NavMeshTesterTool.h"
-#include "Debug.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-Sample_Debug::Sample_Debug() : Sample_SoloMeshTiled(),
-    m_hf(0), m_hfCount(0),
-    m_chf(0), m_chfCount(0),
-    m_cset(0), m_csetCount(0),
-    m_pmeshes(0), m_pmeshCount(0),
-    m_dmeshes(0), m_dmeshCount(0)
-{
-	resetCommonSettings();
-
-    setTool(new NavMeshTesterTool);
-}
-
-Sample_Debug::~Sample_Debug()
-{
-    cleanup();
-}
-
-void Sample_Debug::cleanup()
-{
-    rcFreeHeightField(m_hf);
-    m_hf = 0;
-
-    rcFreeCompactHeightfield(m_chf);
-    m_chf = 0;
-
-    rcFreeContourSet(m_cset);
-    m_cset = 0;
-
-    rcFreePolyMesh(m_pmeshes);
-    m_pmeshes = 0;
-
-    rcFreePolyMeshDetail(m_dmeshes);
-    m_dmeshes = 0;
-
-    dtFreeNavMesh(m_navMesh);
-    m_navMesh = 0;
-}
-
-
-
-void Sample_Debug::handleSettings()
-{
-}
-
-void Sample_Debug::handleTools()
-{
-    Sample_SoloMeshTiled::handleTools();
-}
-
-void Sample_Debug::handleDebugMode()
-{
-    // Check which modes are valid.
-	bool valid[MAX_DRAWMODE];
-	for (int i = 0; i < MAX_DRAWMODE; ++i)
-		valid[i] = false;
-
-	bool hasChf = false;
-	bool hasSolid = false;
-	bool hasCset = false;
-	bool hasPmesh = false;
-	bool hasDmesh = false;
-
-	if (m_hf) hasSolid = true;
-	if (m_chf) hasChf = true;
-	if (m_cset) hasCset = true;
-	if (m_pmeshes) hasPmesh = true;
-	if (m_dmeshes) hasDmesh = true;
-	
-	if (m_geom)
-	{
-		valid[DRAWMODE_NAVMESH] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_TRANS] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_BVTREE] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_INVIS] = m_navMesh != 0;
-		valid[DRAWMODE_MESH] = true;
-		valid[DRAWMODE_VOXELS] = hasSolid;
-		valid[DRAWMODE_VOXELS_WALKABLE] = hasSolid;
-		valid[DRAWMODE_COMPACT] = hasChf;
-		valid[DRAWMODE_COMPACT_DISTANCE] = hasChf;
-		valid[DRAWMODE_COMPACT_REGIONS] = hasChf;
-		valid[DRAWMODE_REGION_CONNECTIONS] = hasCset;
-		valid[DRAWMODE_RAW_CONTOURS] = hasCset;
-		valid[DRAWMODE_BOTH_CONTOURS] = hasCset;
-		valid[DRAWMODE_CONTOURS] = hasCset;
-		valid[DRAWMODE_POLYMESH] = hasPmesh;
-		valid[DRAWMODE_POLYMESH_DETAIL] = hasDmesh;
-	}
-	
-	int unavail = 0;
-	for (int i = 0; i < MAX_DRAWMODE; ++i)
-		if (!valid[i]) unavail++;
-	
-	if (unavail == MAX_DRAWMODE)
-		return;
-	
-	imguiLabel("Draw");
-	if (imguiCheck("Input Mesh", m_drawMode == DRAWMODE_MESH, valid[DRAWMODE_MESH]))
-		m_drawMode = DRAWMODE_MESH;
-	if (imguiCheck("Navmesh", m_drawMode == DRAWMODE_NAVMESH, valid[DRAWMODE_NAVMESH]))
-		m_drawMode = DRAWMODE_NAVMESH;
-	if (imguiCheck("Navmesh Invis", m_drawMode == DRAWMODE_NAVMESH_INVIS, valid[DRAWMODE_NAVMESH_INVIS]))
-		m_drawMode = DRAWMODE_NAVMESH_INVIS;
-	if (imguiCheck("Navmesh Trans", m_drawMode == DRAWMODE_NAVMESH_TRANS, valid[DRAWMODE_NAVMESH_TRANS]))
-		m_drawMode = DRAWMODE_NAVMESH_TRANS;
-	if (imguiCheck("Navmesh BVTree", m_drawMode == DRAWMODE_NAVMESH_BVTREE, valid[DRAWMODE_NAVMESH_BVTREE]))
-		m_drawMode = DRAWMODE_NAVMESH_BVTREE;
-	if (imguiCheck("Voxels", m_drawMode == DRAWMODE_VOXELS, valid[DRAWMODE_VOXELS]))
-		m_drawMode = DRAWMODE_VOXELS;
-	if (imguiCheck("Walkable Voxels", m_drawMode == DRAWMODE_VOXELS_WALKABLE, valid[DRAWMODE_VOXELS_WALKABLE]))
-		m_drawMode = DRAWMODE_VOXELS_WALKABLE;
-	if (imguiCheck("Compact", m_drawMode == DRAWMODE_COMPACT, valid[DRAWMODE_COMPACT]))
-		m_drawMode = DRAWMODE_COMPACT;
-	if (imguiCheck("Compact Distance", m_drawMode == DRAWMODE_COMPACT_DISTANCE, valid[DRAWMODE_COMPACT_DISTANCE]))
-		m_drawMode = DRAWMODE_COMPACT_DISTANCE;
-	if (imguiCheck("Compact Regions", m_drawMode == DRAWMODE_COMPACT_REGIONS, valid[DRAWMODE_COMPACT_REGIONS]))
-		m_drawMode = DRAWMODE_COMPACT_REGIONS;
-	if (imguiCheck("Region Connections", m_drawMode == DRAWMODE_REGION_CONNECTIONS, valid[DRAWMODE_REGION_CONNECTIONS]))
-		m_drawMode = DRAWMODE_REGION_CONNECTIONS;
-	if (imguiCheck("Raw Contours", m_drawMode == DRAWMODE_RAW_CONTOURS, valid[DRAWMODE_RAW_CONTOURS]))
-		m_drawMode = DRAWMODE_RAW_CONTOURS;
-	if (imguiCheck("Both Contours", m_drawMode == DRAWMODE_BOTH_CONTOURS, valid[DRAWMODE_BOTH_CONTOURS]))
-		m_drawMode = DRAWMODE_BOTH_CONTOURS;
-	if (imguiCheck("Contours", m_drawMode == DRAWMODE_CONTOURS, valid[DRAWMODE_CONTOURS]))
-		m_drawMode = DRAWMODE_CONTOURS;
-	if (imguiCheck("Poly Mesh", m_drawMode == DRAWMODE_POLYMESH, valid[DRAWMODE_POLYMESH]))
-		m_drawMode = DRAWMODE_POLYMESH;
-	if (imguiCheck("Poly Mesh Detail", m_drawMode == DRAWMODE_POLYMESH_DETAIL, valid[DRAWMODE_POLYMESH_DETAIL]))
-		m_drawMode = DRAWMODE_POLYMESH_DETAIL;
-}
-
-void Sample_Debug::handleRender()
-{
-	if (!m_geom || !m_geom->getMesh())
-		return;
-
-	DebugDrawGL dd;
-	
-	glEnable(GL_FOG);
-	glDepthMask(GL_TRUE);
-	
-	if (m_drawMode == DRAWMODE_MESH)
-	{
-		// Draw mesh
-		duDebugDrawTriMeshSlope(&dd, m_geom->getMesh()->getVerts(), m_geom->getMesh()->getVertCount(),
-								m_geom->getMesh()->getTris(), m_geom->getMesh()->getNormals(), m_geom->getMesh()->getTriCount(),
-								m_agentMaxSlope);
-		m_geom->drawOffMeshConnections(&dd);
-	}
-    else if (m_drawMode != DRAWMODE_NAVMESH_TRANS)
-    {
-    		// Draw mesh
-		duDebugDrawTriMesh(&dd, m_geom->getMesh()->getVerts(), m_geom->getMesh()->getVertCount(),
-						   m_geom->getMesh()->getTris(), m_geom->getMesh()->getNormals(), m_geom->getMesh()->getTriCount(), 0);
-		m_geom->drawOffMeshConnections(&dd);
- 	}
-		
-    glDisable(GL_FOG);
-	glDepthMask(GL_FALSE);
-	
-	// Draw bounds
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float* bmax = m_geom->getMeshBoundsMax();
-	duDebugDrawBoxWire(&dd, bmin[0],bmin[1],bmin[2], bmax[0],bmax[1],bmax[2], duRGBA(255,255,255,128), 1.0f);
-	
-	// Tiling grid.
-	int gw = 0, gh = 0;
-	rcCalcGridSize(bmin, bmax, m_cellSize, &gw, &gh);
-	const int tw = (gw + (int)m_tileSize-1) / (int)m_tileSize;
-	const int th = (gh + (int)m_tileSize-1) / (int)m_tileSize;
-	duDebugDrawGridXZ(&dd, bmin[0],bmin[1],bmin[2], tw,th, m_tileSize, duRGBA(0,0,0,64), 1.0f);
-	
-	if (m_navMesh &&
-		(m_drawMode == DRAWMODE_NAVMESH ||
-		 m_drawMode == DRAWMODE_NAVMESH_TRANS ||
-		 m_drawMode == DRAWMODE_NAVMESH_BVTREE ||
-		 m_drawMode == DRAWMODE_NAVMESH_INVIS))
- 	{
-		if (m_drawMode != DRAWMODE_NAVMESH_INVIS)
-			duDebugDrawNavMesh(&dd, *m_navMesh, m_navMeshDrawFlags);
-		if (m_drawMode == DRAWMODE_NAVMESH_BVTREE)
-			duDebugDrawNavMeshBVTree(&dd, *m_navMesh);
- 	}
-    
-    glDepthMask(GL_TRUE);
-
-    if (m_drawMode == DRAWMODE_COMPACT)
-		duDebugDrawCompactHeightfieldSolid(&dd, *m_chf);
-
-	if (m_drawMode == DRAWMODE_COMPACT_DISTANCE)
-		duDebugDrawCompactHeightfieldDistance(&dd, *m_chf);
-
-	if (m_drawMode == DRAWMODE_COMPACT_REGIONS)
-		duDebugDrawCompactHeightfieldRegions(&dd, *m_chf);
-
-	if (m_drawMode == DRAWMODE_VOXELS)
- 	{
-    	glEnable(GL_FOG);
-		duDebugDrawHeightfieldSolid(&dd, *m_hf);
-		glDisable(GL_FOG);
-	}
-
-	if (m_drawMode == DRAWMODE_VOXELS_WALKABLE)
-	{
-		glEnable(GL_FOG);
-		duDebugDrawHeightfieldWalkable(&dd, *m_hf);
-		glDisable(GL_FOG);
-	}
-
-	if (m_drawMode == DRAWMODE_RAW_CONTOURS)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawRawContours(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
-	}
-
-	if (m_drawMode == DRAWMODE_BOTH_CONTOURS)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawRawContours(&dd, *m_cset, 0.5f);
-		duDebugDrawContours(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
-	}
-
-	if (m_drawMode == DRAWMODE_CONTOURS)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawContours(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
-	}
-
-	if (m_drawMode == DRAWMODE_REGION_CONNECTIONS)
-	{
-		duDebugDrawCompactHeightfieldRegions(&dd, *m_chf);
- 		
-		glDepthMask(GL_FALSE);
-		duDebugDrawRegionConnections(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
- 	}
-    
-    if (/*m_pmesh &&*/ m_drawMode == DRAWMODE_POLYMESH)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawPolyMesh(&dd, *m_pmeshes);
-		glDepthMask(GL_TRUE);
-	}
-    
-	if (/*m_dmesh &&*/ m_drawMode == DRAWMODE_POLYMESH_DETAIL)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawPolyMeshDetail(&dd, *m_dmeshes);
-		glDepthMask(GL_TRUE);
-	}
-	
-	m_geom->drawConvexVolumes(&dd);
-
-	if (m_tool)
-		m_tool->handleRender();
-
-	glDepthMask(GL_TRUE);
-}
-
-void Sample_Debug::handleRenderOverlay(double* proj, double* model, int* view)
-{
-    Sample_SoloMeshTiled::handleRenderOverlay(proj, model, view);
-}
-
-void Sample_Debug::handleMeshChanged(InputGeom* geom)
-{
-	Sample_SoloMeshTiled::handleMeshChanged(geom);
-}
-
-const float* Sample_Debug::getBoundsMin()
-{
-	return Sample_SoloMeshTiled::getBoundsMin();
-}
-
-const float* Sample_Debug::getBoundsMax()
-{
-	return Sample_SoloMeshTiled::getBoundsMax();
-}
-
-void Sample_Debug::handleClick(const float* p, bool shift)
-{
-	Sample_SoloMeshTiled::handleClick(NULL, p, shift);
-}
-
-void Sample_Debug::handleToggle()
-{
-    Sample_SoloMeshTiled::handleStep();
-}
-
-bool Sample_Debug::handleBuild()
-{
-    cleanup();
- 
-    duReadNavMesh(m_meshName, m_navMesh);
-    m_pmeshCount = duReadPolyMesh(m_meshName, m_pmeshes);
-    m_hfCount = duReadHeightfield(m_meshName, m_hf);
-    m_chfCount = duReadCompactHeightfield(m_meshName, m_chf);
-    m_dmeshCount = duReadDetailMesh(m_meshName, m_dmeshes);
-    m_csetCount = duReadContourSet(m_meshName, m_cset);
-
-    if(m_navMesh)
-    {
-        m_drawMode = DRAWMODE_NAVMESH_TRANS;
-        m_tileSize = m_navMesh->getParams()->tileHeight;
-
-        m_navQuery = dtAllocNavMeshQuery();
-        m_navQuery->init(m_navMesh, 2048);
-    }
-
-    if(m_tool)
-        m_tool->init(this);
-
-    return true;
-}
-
-void Sample_Debug::setHighlightedTile(const float* pos)
-{
-
-	if (!pos || !m_navMesh)
- 	{
-		m_highLightedTileX = -1;
-		m_highLightedTileY = -1;
-		return;
- 	}
-
-    dtNavMeshQuery* query = dtAllocNavMeshQuery();
-    query->init(m_navMesh, 2048);
-
-    float extents[3] = {2.f, 4.f, 2.f};
-    dtPolyRef polyRef = 0;
-    dtQueryFilter filter;
-    query->findNearestPoly(pos, extents, &filter, &polyRef, NULL);
-    unsigned char area = 0;
-    m_navMesh->getPolyArea(polyRef, &area);
-    unsigned short flags = 0;
-    m_navMesh->getPolyFlags(polyRef, &flags);
-
-    const dtMeshTile* tile;
-    const dtPoly* poly;
-    m_navMesh->getTileAndPolyByRef(polyRef, &tile, &poly);
-
-    if(!tile)
-    {
-		m_highLightedTileX = -1;
-		m_highLightedTileY = -1;
-		return;
-    }
-    m_highLightedTileX = tile->header->x;
-	m_highLightedTileY = tile->header->y;
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/Sample_SoloMeshSimple.cpp b/dep/recastnavigation/RecastDemo/Source/Sample_SoloMeshSimple.cpp
deleted file mode 100644
index f704351630d..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/Sample_SoloMeshSimple.cpp
+++ /dev/null
@@ -1,669 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include "SDL.h"
-#include "SDL_opengl.h"
-#include "imgui.h"
-#include "InputGeom.h"
-#include "Sample.h"
-#include "Sample_SoloMeshSimple.h"
-#include "Recast.h"
-#include "RecastDebugDraw.h"
-#include "RecastDump.h"
-#include "DetourNavMesh.h"
-#include "DetourNavMeshBuilder.h"
-#include "DetourDebugDraw.h"
-#include "NavMeshTesterTool.h"
-#include "OffMeshConnectionTool.h"
-#include "ConvexVolumeTool.h"
-#include "CrowdTool.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-
-Sample_SoloMeshSimple::Sample_SoloMeshSimple() :
-	m_keepInterResults(true),
-	m_totalBuildTimeMs(0),
-	m_triareas(0),
-	m_solid(0),
-	m_chf(0),
-	m_cset(0),
-	m_pmesh(0),
-	m_dmesh(0),
-	m_drawMode(DRAWMODE_NAVMESH)
-{
-	setTool(new NavMeshTesterTool);
-}
-		
-Sample_SoloMeshSimple::~Sample_SoloMeshSimple()
-{
-	cleanup();
-}
-	
-void Sample_SoloMeshSimple::cleanup()
-{
-	delete [] m_triareas;
-	m_triareas = 0;
-	rcFreeHeightField(m_solid);
-	m_solid = 0;
-	rcFreeCompactHeightfield(m_chf);
-	m_chf = 0;
-	rcFreeContourSet(m_cset);
-	m_cset = 0;
-	rcFreePolyMesh(m_pmesh);
-	m_pmesh = 0;
-	rcFreePolyMeshDetail(m_dmesh);
-	m_dmesh = 0;
-	dtFreeNavMesh(m_navMesh);
-	m_navMesh = 0;
-}
-			
-void Sample_SoloMeshSimple::handleSettings()
-{
-	Sample::handleCommonSettings();
-	
-	if (imguiCheck("Keep Itermediate Results", m_keepInterResults))
-		m_keepInterResults = !m_keepInterResults;
-
-	imguiSeparator();
-	
-	char msg[64];
-	snprintf(msg, 64, "Build Time: %.1fms", m_totalBuildTimeMs);
-	imguiLabel(msg);
-	
-	imguiSeparator();
-}
-
-void Sample_SoloMeshSimple::handleTools()
-{
-	int type = !m_tool ? TOOL_NONE : m_tool->type();
-	
-	if (imguiCheck("Test Navmesh", type == TOOL_NAVMESH_TESTER))
-	{
-		setTool(new NavMeshTesterTool);
-	}
-	if (imguiCheck("Create Off-Mesh Connections", type == TOOL_OFFMESH_CONNECTION))
-	{
-		setTool(new OffMeshConnectionTool);
-	}
-	if (imguiCheck("Create Convex Volumes", type == TOOL_CONVEX_VOLUME))
-	{
-		setTool(new ConvexVolumeTool);
-	}
-	if (imguiCheck("Create Crowds", type == TOOL_CROWD))
-	{
-		setTool(new CrowdTool);
-	}
-	
-	imguiSeparatorLine();
-
-	imguiIndent();
-
-	if (m_tool)
-		m_tool->handleMenu();
-
-	imguiUnindent();
-
-}
-
-void Sample_SoloMeshSimple::handleDebugMode()
-{
-	// Check which modes are valid.
-	bool valid[MAX_DRAWMODE];
-	for (int i = 0; i < MAX_DRAWMODE; ++i)
-		valid[i] = false;
-
-	if (m_geom)
-	{
-		valid[DRAWMODE_NAVMESH] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_TRANS] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_BVTREE] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_NODES] = m_navQuery != 0;
-		valid[DRAWMODE_NAVMESH_INVIS] = m_navMesh != 0;
-		valid[DRAWMODE_MESH] = true;
-		valid[DRAWMODE_VOXELS] = m_solid != 0;
-		valid[DRAWMODE_VOXELS_WALKABLE] = m_solid != 0;
-		valid[DRAWMODE_COMPACT] = m_chf != 0;
-		valid[DRAWMODE_COMPACT_DISTANCE] = m_chf != 0;
-		valid[DRAWMODE_COMPACT_REGIONS] = m_chf != 0;
-		valid[DRAWMODE_REGION_CONNECTIONS] = m_cset != 0;
-		valid[DRAWMODE_RAW_CONTOURS] = m_cset != 0;
-		valid[DRAWMODE_BOTH_CONTOURS] = m_cset != 0;
-		valid[DRAWMODE_CONTOURS] = m_cset != 0;
-		valid[DRAWMODE_POLYMESH] = m_pmesh != 0;
-		valid[DRAWMODE_POLYMESH_DETAIL] = m_dmesh != 0;
-	}
-	
-	int unavail = 0;
-	for (int i = 0; i < MAX_DRAWMODE; ++i)
-		if (!valid[i]) unavail++;
-
-	if (unavail == MAX_DRAWMODE)
-		return;
-
-	imguiLabel("Draw");
-	if (imguiCheck("Input Mesh", m_drawMode == DRAWMODE_MESH, valid[DRAWMODE_MESH]))
-		m_drawMode = DRAWMODE_MESH;
-	if (imguiCheck("Navmesh", m_drawMode == DRAWMODE_NAVMESH, valid[DRAWMODE_NAVMESH]))
-		m_drawMode = DRAWMODE_NAVMESH;
-	if (imguiCheck("Navmesh Invis", m_drawMode == DRAWMODE_NAVMESH_INVIS, valid[DRAWMODE_NAVMESH_INVIS]))
-		m_drawMode = DRAWMODE_NAVMESH_INVIS;
-	if (imguiCheck("Navmesh Trans", m_drawMode == DRAWMODE_NAVMESH_TRANS, valid[DRAWMODE_NAVMESH_TRANS]))
-		m_drawMode = DRAWMODE_NAVMESH_TRANS;
-	if (imguiCheck("Navmesh BVTree", m_drawMode == DRAWMODE_NAVMESH_BVTREE, valid[DRAWMODE_NAVMESH_BVTREE]))
-		m_drawMode = DRAWMODE_NAVMESH_BVTREE;
-	if (imguiCheck("Navmesh Nodes", m_drawMode == DRAWMODE_NAVMESH_NODES, valid[DRAWMODE_NAVMESH_NODES]))
-		m_drawMode = DRAWMODE_NAVMESH_NODES;
-	if (imguiCheck("Voxels", m_drawMode == DRAWMODE_VOXELS, valid[DRAWMODE_VOXELS]))
-		m_drawMode = DRAWMODE_VOXELS;
-	if (imguiCheck("Walkable Voxels", m_drawMode == DRAWMODE_VOXELS_WALKABLE, valid[DRAWMODE_VOXELS_WALKABLE]))
-		m_drawMode = DRAWMODE_VOXELS_WALKABLE;
-	if (imguiCheck("Compact", m_drawMode == DRAWMODE_COMPACT, valid[DRAWMODE_COMPACT]))
-		m_drawMode = DRAWMODE_COMPACT;
-	if (imguiCheck("Compact Distance", m_drawMode == DRAWMODE_COMPACT_DISTANCE, valid[DRAWMODE_COMPACT_DISTANCE]))
-		m_drawMode = DRAWMODE_COMPACT_DISTANCE;
-	if (imguiCheck("Compact Regions", m_drawMode == DRAWMODE_COMPACT_REGIONS, valid[DRAWMODE_COMPACT_REGIONS]))
-		m_drawMode = DRAWMODE_COMPACT_REGIONS;
-	if (imguiCheck("Region Connections", m_drawMode == DRAWMODE_REGION_CONNECTIONS, valid[DRAWMODE_REGION_CONNECTIONS]))
-		m_drawMode = DRAWMODE_REGION_CONNECTIONS;
-	if (imguiCheck("Raw Contours", m_drawMode == DRAWMODE_RAW_CONTOURS, valid[DRAWMODE_RAW_CONTOURS]))
-		m_drawMode = DRAWMODE_RAW_CONTOURS;
-	if (imguiCheck("Both Contours", m_drawMode == DRAWMODE_BOTH_CONTOURS, valid[DRAWMODE_BOTH_CONTOURS]))
-		m_drawMode = DRAWMODE_BOTH_CONTOURS;
-	if (imguiCheck("Contours", m_drawMode == DRAWMODE_CONTOURS, valid[DRAWMODE_CONTOURS]))
-		m_drawMode = DRAWMODE_CONTOURS;
-	if (imguiCheck("Poly Mesh", m_drawMode == DRAWMODE_POLYMESH, valid[DRAWMODE_POLYMESH]))
-		m_drawMode = DRAWMODE_POLYMESH;
-	if (imguiCheck("Poly Mesh Detail", m_drawMode == DRAWMODE_POLYMESH_DETAIL, valid[DRAWMODE_POLYMESH_DETAIL]))
-		m_drawMode = DRAWMODE_POLYMESH_DETAIL;
-		
-	if (unavail)
-	{
-		imguiValue("Tick 'Keep Itermediate Results'");
-		imguiValue("to see more debug mode options.");
-	}
-}
-
-void Sample_SoloMeshSimple::handleRender()
-{
-	if (!m_geom || !m_geom->getMesh())
-		return;
-	
-	DebugDrawGL dd;
-	
-	glEnable(GL_FOG);
-	glDepthMask(GL_TRUE);
-
-	if (m_drawMode == DRAWMODE_MESH)
-	{
-		// Draw mesh
-		duDebugDrawTriMeshSlope(&dd, m_geom->getMesh()->getVerts(), m_geom->getMesh()->getVertCount(),
-								m_geom->getMesh()->getTris(), m_geom->getMesh()->getNormals(), m_geom->getMesh()->getTriCount(),
-								m_agentMaxSlope);
-		m_geom->drawOffMeshConnections(&dd);
-	}
-	else if (m_drawMode != DRAWMODE_NAVMESH_TRANS)
-	{
-		// Draw mesh
-		duDebugDrawTriMesh(&dd, m_geom->getMesh()->getVerts(), m_geom->getMesh()->getVertCount(),
-						   m_geom->getMesh()->getTris(), m_geom->getMesh()->getNormals(), m_geom->getMesh()->getTriCount(), 0);
-		m_geom->drawOffMeshConnections(&dd);
-	}
-	
-	glDisable(GL_FOG);
-	glDepthMask(GL_FALSE);
-
-	// Draw bounds
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float* bmax = m_geom->getMeshBoundsMax();
-	duDebugDrawBoxWire(&dd, bmin[0],bmin[1],bmin[2], bmax[0],bmax[1],bmax[2], duRGBA(255,255,255,128), 1.0f);
-	
-	if (m_navMesh && m_navQuery &&
-		(m_drawMode == DRAWMODE_NAVMESH ||
-		m_drawMode == DRAWMODE_NAVMESH_TRANS ||
-		m_drawMode == DRAWMODE_NAVMESH_BVTREE ||
-		 m_drawMode == DRAWMODE_NAVMESH_NODES ||
-		m_drawMode == DRAWMODE_NAVMESH_INVIS))
-	{
-		if (m_drawMode != DRAWMODE_NAVMESH_INVIS)
-			duDebugDrawNavMeshWithClosedList(&dd, *m_navMesh, *m_navQuery, m_navMeshDrawFlags);
-		if (m_drawMode == DRAWMODE_NAVMESH_BVTREE)
-			duDebugDrawNavMeshBVTree(&dd, *m_navMesh);
-		if (m_drawMode == DRAWMODE_NAVMESH_NODES)
-			duDebugDrawNavMeshNodes(&dd, *m_navQuery);
-	}
-		
-	glDepthMask(GL_TRUE);
-	
-	if (m_chf && m_drawMode == DRAWMODE_COMPACT)
-		duDebugDrawCompactHeightfieldSolid(&dd, *m_chf);
-
-	if (m_chf && m_drawMode == DRAWMODE_COMPACT_DISTANCE)
-		duDebugDrawCompactHeightfieldDistance(&dd, *m_chf);
-	if (m_chf && m_drawMode == DRAWMODE_COMPACT_REGIONS)
-		duDebugDrawCompactHeightfieldRegions(&dd, *m_chf);
-	if (m_solid && m_drawMode == DRAWMODE_VOXELS)
-	{
-		glEnable(GL_FOG);
-		duDebugDrawHeightfieldSolid(&dd, *m_solid);
-		glDisable(GL_FOG);
-	}
-	if (m_solid && m_drawMode == DRAWMODE_VOXELS_WALKABLE)
-	{
-		glEnable(GL_FOG);
-		duDebugDrawHeightfieldWalkable(&dd, *m_solid);
-		glDisable(GL_FOG);
-	}
-	if (m_cset && m_drawMode == DRAWMODE_RAW_CONTOURS)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawRawContours(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
-	}
-	if (m_cset && m_drawMode == DRAWMODE_BOTH_CONTOURS)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawRawContours(&dd, *m_cset, 0.5f);
-		duDebugDrawContours(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
-	}
-	if (m_cset && m_drawMode == DRAWMODE_CONTOURS)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawContours(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
-	}
-	if (m_chf && m_cset && m_drawMode == DRAWMODE_REGION_CONNECTIONS)
-	{
-		duDebugDrawCompactHeightfieldRegions(&dd, *m_chf);
-			
-		glDepthMask(GL_FALSE);
-		duDebugDrawRegionConnections(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
-	}
-	if (m_pmesh && m_drawMode == DRAWMODE_POLYMESH)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawPolyMesh(&dd, *m_pmesh);
-		glDepthMask(GL_TRUE);
-	}
-	if (m_dmesh && m_drawMode == DRAWMODE_POLYMESH_DETAIL)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawPolyMeshDetail(&dd, *m_dmesh);
-		glDepthMask(GL_TRUE);
-	}
-	
-	m_geom->drawConvexVolumes(&dd);
-
-	if (m_tool)
-		m_tool->handleRender();
-
-	glDepthMask(GL_TRUE);
-}
-
-void Sample_SoloMeshSimple::handleRenderOverlay(double* proj, double* model, int* view)
-{
-	if (m_tool)
-		m_tool->handleRenderOverlay(proj, model, view);
-}
-
-void Sample_SoloMeshSimple::handleMeshChanged(class InputGeom* geom)
-{
-	Sample::handleMeshChanged(geom);
-
-	dtFreeNavMesh(m_navMesh);
-	m_navMesh = 0;
-
-	if (m_tool)
-	{
-		m_tool->reset();
-		m_tool->init(this);
-	}
-}
-
-
-bool Sample_SoloMeshSimple::handleBuild()
-{
-	if (!m_geom || !m_geom->getMesh())
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Input mesh is not specified.");
-		return false;
-	}
-	
-	cleanup();
-	
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float* bmax = m_geom->getMeshBoundsMax();
-	const float* verts = m_geom->getMesh()->getVerts();
-	const int nverts = m_geom->getMesh()->getVertCount();
-	const int* tris = m_geom->getMesh()->getTris();
-	const int ntris = m_geom->getMesh()->getTriCount();
-	
-	//
-	// Step 1. Initialize build config.
-	//
-	
-	// Init build configuration from GUI
-	memset(&m_cfg, 0, sizeof(m_cfg));
-	m_cfg.cs = m_cellSize;
-	m_cfg.ch = m_cellHeight;
-	m_cfg.walkableSlopeAngle = m_agentMaxSlope;
-	m_cfg.walkableHeight = (int)ceilf(m_agentHeight / m_cfg.ch);
-	m_cfg.walkableClimb = (int)floorf(m_agentMaxClimb / m_cfg.ch);
-	m_cfg.walkableRadius = (int)ceilf(m_agentRadius / m_cfg.cs);
-	m_cfg.maxEdgeLen = (int)(m_edgeMaxLen / m_cellSize);
-	m_cfg.maxSimplificationError = m_edgeMaxError;
-	m_cfg.minRegionArea = (int)rcSqr(m_regionMinSize);		// Note: area = size*size
-	m_cfg.mergeRegionArea = (int)rcSqr(m_regionMergeSize);	// Note: area = size*size
-	m_cfg.maxVertsPerPoly = (int)m_vertsPerPoly;
-	m_cfg.detailSampleDist = m_detailSampleDist < 0.9f ? 0 : m_cellSize * m_detailSampleDist;
-	m_cfg.detailSampleMaxError = m_cellHeight * m_detailSampleMaxError;
-	
-	// Set the area where the navigation will be build.
-	// Here the bounds of the input mesh are used, but the
-	// area could be specified by an user defined box, etc.
-	rcVcopy(m_cfg.bmin, bmin);
-	rcVcopy(m_cfg.bmax, bmax);
-	rcCalcGridSize(m_cfg.bmin, m_cfg.bmax, m_cfg.cs, &m_cfg.width, &m_cfg.height);
-
-	// Reset build times gathering.
-	m_ctx->resetTimers();
-
-	// Start the build process.	
-	m_ctx->startTimer(RC_TIMER_TOTAL);
-	
-	m_ctx->log(RC_LOG_PROGRESS, "Building navigation:");
-	m_ctx->log(RC_LOG_PROGRESS, " - %d x %d cells", m_cfg.width, m_cfg.height);
-	m_ctx->log(RC_LOG_PROGRESS, " - %.1fK verts, %.1fK tris", nverts/1000.0f, ntris/1000.0f);
-	
-	//
-	// Step 2. Rasterize input polygon soup.
-	//
-	
-	// Allocate voxel heightfield where we rasterize our input data to.
-	m_solid = rcAllocHeightfield();
-	if (!m_solid)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'solid'.");
-		return false;
-	}
-	if (!rcCreateHeightfield(m_ctx, *m_solid, m_cfg.width, m_cfg.height, m_cfg.bmin, m_cfg.bmax, m_cfg.cs, m_cfg.ch))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not create solid heightfield.");
-		return false;
-	}
-	
-	// Allocate array that can hold triangle area types.
-	// If you have multiple meshes you need to process, allocate
-	// and array which can hold the max number of triangles you need to process.
-	m_triareas = new unsigned char[ntris];
-	if (!m_triareas)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'm_triareas' (%d).", ntris);
-		return false;
-	}
-	
-	// Find triangles which are walkable based on their slope and rasterize them.
-	// If your input data is multiple meshes, you can transform them here, calculate
-	// the are type for each of the meshes and rasterize them.
-	memset(m_triareas, 0, ntris*sizeof(unsigned char));
-	rcMarkWalkableTriangles(m_ctx, m_cfg.walkableSlopeAngle, verts, nverts, tris, ntris, m_triareas);
-	rcRasterizeTriangles(m_ctx, verts, nverts, tris, m_triareas, ntris, *m_solid, m_cfg.walkableClimb);
-
-	if (!m_keepInterResults)
-	{
-		delete [] m_triareas;
-		m_triareas = 0;
-	}
-	
-	//
-	// Step 3. Filter walkables surfaces.
-	//
-	
-	// Once all geoemtry is rasterized, we do initial pass of filtering to
-	// remove unwanted overhangs caused by the conservative rasterization
-	// as well as filter spans where the character cannot possibly stand.
-	rcFilterLowHangingWalkableObstacles(m_ctx, m_cfg.walkableClimb, *m_solid);
-	rcFilterLedgeSpans(m_ctx, m_cfg.walkableHeight, m_cfg.walkableClimb, *m_solid);
-	rcFilterWalkableLowHeightSpans(m_ctx, m_cfg.walkableHeight, *m_solid);
-
-
-	//
-	// Step 4. Partition walkable surface to simple regions.
-	//
-
-	// Compact the heightfield so that it is faster to handle from now on.
-	// This will result more cache coherent data as well as the neighbours
-	// between walkable cells will be calculated.
-	m_chf = rcAllocCompactHeightfield();
-	if (!m_chf)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'chf'.");
-		return false;
-	}
-	if (!rcBuildCompactHeightfield(m_ctx, m_cfg.walkableHeight, m_cfg.walkableClimb, *m_solid, *m_chf))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not build compact data.");
-		return false;
-	}
-	
-	if (!m_keepInterResults)
-	{
-		rcFreeHeightField(m_solid);
-		m_solid = 0;
-	}
-		
-	// Erode the walkable area by agent radius.
-	if (!rcErodeWalkableArea(m_ctx, m_cfg.walkableRadius, *m_chf))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not erode.");
-		return false;
-	}
-
-	// (Optional) Mark areas.
-	const ConvexVolume* vols = m_geom->getConvexVolumes();
-	for (int i  = 0; i < m_geom->getConvexVolumeCount(); ++i)
-		rcMarkConvexPolyArea(m_ctx, vols[i].verts, vols[i].nverts, vols[i].hmin, vols[i].hmax, (unsigned char)vols[i].area, *m_chf);
-	
-	// Prepare for region partitioning, by calculating distance field along the walkable surface.
-	if (!rcBuildDistanceField(m_ctx, *m_chf))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not build distance field.");
-		return false;
-	}
-
-	// Partition the walkable surface into simple regions without holes.
-	if (!rcBuildRegions(m_ctx, *m_chf, m_cfg.borderSize, m_cfg.minRegionArea, m_cfg.mergeRegionArea))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not build regions.");
-		return false;
-	}
-
-	//
-	// Step 5. Trace and simplify region contours.
-	//
-	
-	// Create contours.
-	m_cset = rcAllocContourSet();
-	if (!m_cset)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'cset'.");
-		return false;
-	}
-	if (!rcBuildContours(m_ctx, *m_chf, m_cfg.maxSimplificationError, m_cfg.maxEdgeLen, *m_cset))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not create contours.");
-		return false;
-	}
-	
-	//
-	// Step 6. Build polygons mesh from contours.
-	//
-	
-	// Build polygon navmesh from the contours.
-	m_pmesh = rcAllocPolyMesh();
-	if (!m_pmesh)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'pmesh'.");
-		return false;
-	}
-	if (!rcBuildPolyMesh(m_ctx, *m_cset, m_cfg.maxVertsPerPoly, *m_pmesh))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not triangulate contours.");
-		return false;
-	}
-	
-	//
-	// Step 7. Create detail mesh which allows to access approximate height on each polygon.
-	//
-	
-	m_dmesh = rcAllocPolyMeshDetail();
-	if (!m_dmesh)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'pmdtl'.");
-		return false;
-	}
-
-	if (!rcBuildPolyMeshDetail(m_ctx, *m_pmesh, *m_chf, m_cfg.detailSampleDist, m_cfg.detailSampleMaxError, *m_dmesh))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not build detail mesh.");
-		return false;
-	}
-
-	if (!m_keepInterResults)
-	{
-		rcFreeCompactHeightfield(m_chf);
-		m_chf = 0;
-		rcFreeContourSet(m_cset);
-		m_cset = 0;
-	}
-
-	// At this point the navigation mesh data is ready, you can access it from m_pmesh.
-	// See duDebugDrawPolyMesh or dtCreateNavMeshData as examples how to access the data.
-	
-	//
-	// (Optional) Step 8. Create Detour data from Recast poly mesh.
-	//
-	
-	// The GUI may allow more max points per polygon than Detour can handle.
-	// Only build the detour navmesh if we do not exceed the limit.
-	if (m_cfg.maxVertsPerPoly <= DT_VERTS_PER_POLYGON)
-	{
-		unsigned char* navData = 0;
-		int navDataSize = 0;
-
-		// Update poly flags from areas.
-		for (int i = 0; i < m_pmesh->npolys; ++i)
-		{
-			if (m_pmesh->areas[i] == RC_WALKABLE_AREA)
-				m_pmesh->areas[i] = SAMPLE_POLYAREA_GROUND;
-				
-			if (m_pmesh->areas[i] == SAMPLE_POLYAREA_GROUND ||
-				m_pmesh->areas[i] == SAMPLE_POLYAREA_GRASS ||
-				m_pmesh->areas[i] == SAMPLE_POLYAREA_ROAD)
-			{
-				m_pmesh->flags[i] = SAMPLE_POLYFLAGS_WALK;
-			}
-			else if (m_pmesh->areas[i] == SAMPLE_POLYAREA_WATER)
-			{
-				m_pmesh->flags[i] = SAMPLE_POLYFLAGS_SWIM;
-			}
-			else if (m_pmesh->areas[i] == SAMPLE_POLYAREA_DOOR)
-			{
-				m_pmesh->flags[i] = SAMPLE_POLYFLAGS_WALK | SAMPLE_POLYFLAGS_DOOR;
-			}
-		}
-
-
-		dtNavMeshCreateParams params;
-		memset(&params, 0, sizeof(params));
-		params.verts = m_pmesh->verts;
-		params.vertCount = m_pmesh->nverts;
-		params.polys = m_pmesh->polys;
-		params.polyAreas = m_pmesh->areas;
-		params.polyFlags = m_pmesh->flags;
-		params.polyCount = m_pmesh->npolys;
-		params.nvp = m_pmesh->nvp;
-		params.detailMeshes = m_dmesh->meshes;
-		params.detailVerts = m_dmesh->verts;
-		params.detailVertsCount = m_dmesh->nverts;
-		params.detailTris = m_dmesh->tris;
-		params.detailTriCount = m_dmesh->ntris;
-		params.offMeshConVerts = m_geom->getOffMeshConnectionVerts();
-		params.offMeshConRad = m_geom->getOffMeshConnectionRads();
-		params.offMeshConDir = m_geom->getOffMeshConnectionDirs();
-		params.offMeshConAreas = m_geom->getOffMeshConnectionAreas();
-		params.offMeshConFlags = m_geom->getOffMeshConnectionFlags();
-		params.offMeshConUserID = m_geom->getOffMeshConnectionId();
-		params.offMeshConCount = m_geom->getOffMeshConnectionCount();
-		params.walkableHeight = m_agentHeight;
-		params.walkableRadius = m_agentRadius;
-		params.walkableClimb = m_agentMaxClimb;
-		rcVcopy(params.bmin, m_pmesh->bmin);
-		rcVcopy(params.bmax, m_pmesh->bmax);
-		params.cs = m_cfg.cs;
-		params.ch = m_cfg.ch;
-		
-		if (!dtCreateNavMeshData(&params, &navData, &navDataSize))
-		{
-			m_ctx->log(RC_LOG_ERROR, "Could not build Detour navmesh.");
-			return false;
-		}
-		
-		m_navMesh = dtAllocNavMesh();
-		if (!m_navMesh)
-		{
-			dtFree(navData);
-			m_ctx->log(RC_LOG_ERROR, "Could not create Detour navmesh");
-			return false;
-		}
-		
-		if (m_navMesh->init(navData, navDataSize, DT_TILE_FREE_DATA) != DT_SUCCESS)
-		{
-			dtFree(navData);
-			m_ctx->log(RC_LOG_ERROR, "Could not init Detour navmesh");
-			return false;
-		}
-		
-		if (m_navQuery->init(m_navMesh, 2048) != DT_SUCCESS)
-		{
-			m_ctx->log(RC_LOG_ERROR, "Could not init Detour navmesh query");
-			return false;
-		}
-	}
-	
-	m_ctx->stopTimer(RC_TIMER_TOTAL);
-
-	// Show performance stats.
-	duLogBuildTimes(*m_ctx, m_ctx->getAccumulatedTime(RC_TIMER_TOTAL));
-	m_ctx->log(RC_LOG_PROGRESS, ">> Polymesh: %d vertices  %d polygons", m_pmesh->nverts, m_pmesh->npolys);
-	
-	m_totalBuildTimeMs = m_ctx->getAccumulatedTime(RC_TIMER_TOTAL)/1000.0f;
-	
-	if (m_tool)
-		m_tool->init(this);
-
-	return true;
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/Sample_SoloMeshTiled.cpp b/dep/recastnavigation/RecastDemo/Source/Sample_SoloMeshTiled.cpp
deleted file mode 100644
index a6bf4235770..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/Sample_SoloMeshTiled.cpp
+++ /dev/null
@@ -1,1130 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include "SDL.h"
-#include "SDL_opengl.h"
-#include "imgui.h"
-#include "InputGeom.h"
-#include "Sample.h"
-#include "Sample_SoloMeshTiled.h"
-#include "Recast.h"
-#include "RecastDebugDraw.h"
-#include "DetourNavMesh.h"
-#include "DetourNavMeshBuilder.h"
-#include "DetourDebugDraw.h"
-#include "NavMeshTesterTool.h"
-#include "OffMeshConnectionTool.h"
-#include "ConvexVolumeTool.h"
-#include "CrowdTool.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-
-class TileHighlightTool : public SampleTool
-{
-	Sample_SoloMeshTiled* m_sample;
-	float m_hitPos[3];
-	bool m_hitPosSet;
-	float m_agentRadius;
-	
-public:
-	
-	TileHighlightTool() :
-		m_sample(0),
-		m_hitPosSet(false),
-		m_agentRadius(0)
-	{
-		m_hitPos[0] = m_hitPos[1] = m_hitPos[2] = 0;
-	}
-	
-	virtual ~TileHighlightTool()
-	{
-		if (m_sample)
-			m_sample->setHighlightedTile(0);
-	}
-	
-	virtual int type() { return TOOL_TILE_HIGHLIGHT; }
-	
-	virtual void init(Sample* sample)
-	{
-		m_sample = (Sample_SoloMeshTiled*)sample; 
-	}
-	
-	virtual void reset() {}
-	
-	virtual void handleMenu()
-	{
-		imguiValue("Click LMB to highlight a tile.");
-	}
-	
-	virtual void handleClick(const float* /*s*/, const float* p, bool /*shift*/)
-	{
-		m_hitPosSet = true;
-		rcVcopy(m_hitPos,p);
-		if (m_sample)
-			m_sample->setHighlightedTile(m_hitPos);
-	}
-	
-	virtual void handleToggle() {}
-
-	virtual void handleStep() {}
-
-	virtual void handleUpdate(const float /*dt*/) {}
-
-	virtual void handleRender()
-	{
-		if (m_hitPosSet)
-		{
-			const float s = m_sample->getAgentRadius();
-			glColor4ub(0,0,0,128);
-			glLineWidth(2.0f);
-			glBegin(GL_LINES);
-			glVertex3f(m_hitPos[0]-s,m_hitPos[1]+0.1f,m_hitPos[2]);
-			glVertex3f(m_hitPos[0]+s,m_hitPos[1]+0.1f,m_hitPos[2]);
-			glVertex3f(m_hitPos[0],m_hitPos[1]-s+0.1f,m_hitPos[2]);
-			glVertex3f(m_hitPos[0],m_hitPos[1]+s+0.1f,m_hitPos[2]);
-			glVertex3f(m_hitPos[0],m_hitPos[1]+0.1f,m_hitPos[2]-s);
-			glVertex3f(m_hitPos[0],m_hitPos[1]+0.1f,m_hitPos[2]+s);
-			glEnd();
-			glLineWidth(1.0f);
-		}
-	}
-	
-	virtual void handleRenderOverlay(double* proj, double* model, int* view)
-	{
-		GLdouble x, y, z;
-
-		
-		// Draw start and end point labels
-		if (m_hitPosSet && gluProject((GLdouble)m_hitPos[0], (GLdouble)m_hitPos[1], (GLdouble)m_hitPos[2],
-												 model, proj, view, &x, &y, &z))
-		{
-			const int tx = m_sample->getHilightedTileX();
-			const int ty = m_sample->getHilightedTileY();
-			char text[32];
-			snprintf(text,32,"Tile: (%d, %d)", tx, ty);
-			imguiDrawText((int)x, (int)y-25, IMGUI_ALIGN_CENTER, text, imguiRGBA(0,0,0,220));
-		}
-		
-	}
-};
-
-
-Sample_SoloMeshTiled::Sample_SoloMeshTiled() :
-	m_measurePerTileTimings(false),
-	m_keepInterResults(false),
-	m_tileSize(64),
-	m_totalBuildTimeMs(0),
-	m_pmesh(0),
-	m_dmesh(0),
-	m_tileSet(0),
-	m_statPolysPerTileSamples(0),
-	m_statTimePerTileSamples(0),
-	m_highLightedTileX(-1),
-	m_highLightedTileY(-1),
-	m_drawMode(DRAWMODE_NAVMESH)
-{
-	setTool(new NavMeshTesterTool);
-}
-
-Sample_SoloMeshTiled::~Sample_SoloMeshTiled()
-{
-	cleanup();
-}
-
-void Sample_SoloMeshTiled::cleanup()
-{
-	delete m_tileSet;
-	m_tileSet = 0;
-	rcFreePolyMesh(m_pmesh);
-	m_pmesh = 0;
-	rcFreePolyMeshDetail(m_dmesh);
-	m_dmesh = 0;
-	dtFreeNavMesh(m_navMesh);
-	m_navMesh = 0;
-	m_statTimePerTileSamples = 0;
-	m_statPolysPerTileSamples = 0;
-}
-
-void Sample_SoloMeshTiled::handleSettings()
-{
-	Sample::handleCommonSettings();
-	
-	imguiLabel("Tiling");
-	imguiSlider("TileSize", &m_tileSize, 16.0f, 1024.0f, 16.0f);
-
-	if (m_geom)
-	{
-		const float* bmin = m_geom->getMeshBoundsMin();
-		const float* bmax = m_geom->getMeshBoundsMax();
-		char text[64];
-		int gw = 0, gh = 0;
-		rcCalcGridSize(bmin, bmax, m_cellSize, &gw, &gh);
-		const int ts = (int)m_tileSize;
-		const int tw = (gw + ts-1) / ts;
-		const int th = (gh + ts-1) / ts;
-		snprintf(text, 64, "Tiles  %d x %d", tw, th);
-		imguiValue(text);
-	}
-	
-	imguiSeparator();
-	if (imguiCheck("Keep Itermediate Results", m_keepInterResults))
-		m_keepInterResults = !m_keepInterResults;
-	if (imguiCheck("Measure Per Tile Timings", m_measurePerTileTimings))
-		m_measurePerTileTimings = !m_measurePerTileTimings;
-	
-	imguiSeparator();
-
-	char msg[64];
-	snprintf(msg, 64, "Build Time: %.1fms", m_totalBuildTimeMs);
-	imguiLabel(msg);
-	
-	imguiSeparator();
-}
-
-void Sample_SoloMeshTiled::handleTools()
-{
-	int type = !m_tool ? TOOL_NONE : m_tool->type();
-	
-	if (imguiCheck("Test Navmesh", type == TOOL_NAVMESH_TESTER))
-	{
-		setTool(new NavMeshTesterTool);
-	}
-	if (imguiCheck("Create Off-Mesh Links", type == TOOL_OFFMESH_CONNECTION))
-	{
-		setTool(new OffMeshConnectionTool);
-	}
-	if (imguiCheck("Create Convex Volumes", type == TOOL_CONVEX_VOLUME))
-	{
-		setTool(new ConvexVolumeTool);
-	}
-	if (imguiCheck("Create Crowds", type == TOOL_CROWD))
-	{
-		setTool(new CrowdTool);
-	}
-	if (imguiCheck("Highlight Tile", type == TOOL_TILE_HIGHLIGHT))
-	{
-		setTool(new TileHighlightTool);
-	}
-	
-	imguiSeparatorLine();
-
-	imguiIndent();
-
-	if (m_tool)
-		m_tool->handleMenu();
-
-	imguiUnindent();
-}
-
-void Sample_SoloMeshTiled::handleDebugMode()
-{
-	// Check which modes are valid.
-	bool valid[MAX_DRAWMODE];
-	for (int i = 0; i < MAX_DRAWMODE; ++i)
-		valid[i] = false;
-
-	bool hasChf = false;
-	bool hasSolid = false;
-	bool hasCset = false;
-	bool hasPmesh = false;
-	bool hasDmesh = false;
-	if (m_tileSet)
-	{
-		for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-		{
-			if (m_tileSet->tiles[i].solid) hasSolid = true;
-			if (m_tileSet->tiles[i].chf) hasChf = true;
-			if (m_tileSet->tiles[i].cset) hasCset = true;
-			if (m_tileSet->tiles[i].pmesh) hasPmesh = true;
-			if (m_tileSet->tiles[i].dmesh) hasDmesh = true;
-		}
-	}
-	if (m_pmesh) hasPmesh = true;
-	if (m_dmesh) hasDmesh = true;
-	
-	if (m_geom)
-	{
-		valid[DRAWMODE_NAVMESH] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_TRANS] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_BVTREE] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_NODES] = m_navQuery != 0;
-		valid[DRAWMODE_NAVMESH_INVIS] = m_navMesh != 0;
-		valid[DRAWMODE_MESH] = true;
-		valid[DRAWMODE_VOXELS] = hasSolid;
-		valid[DRAWMODE_VOXELS_WALKABLE] = hasSolid;
-		valid[DRAWMODE_COMPACT] = hasChf;
-		valid[DRAWMODE_COMPACT_DISTANCE] = hasChf;
-		valid[DRAWMODE_COMPACT_REGIONS] = hasChf;
-		valid[DRAWMODE_REGION_CONNECTIONS] = hasCset;
-		valid[DRAWMODE_RAW_CONTOURS] = hasCset;
-		valid[DRAWMODE_BOTH_CONTOURS] = hasCset;
-		valid[DRAWMODE_CONTOURS] = hasCset;
-		valid[DRAWMODE_POLYMESH] = hasPmesh;
-		valid[DRAWMODE_POLYMESH_DETAIL] = hasDmesh;
-	}
-	
-	int unavail = 0;
-	for (int i = 0; i < MAX_DRAWMODE; ++i)
-		if (!valid[i]) unavail++;
-	
-	if (unavail == MAX_DRAWMODE)
-		return;
-	
-	imguiLabel("Draw");
-	if (imguiCheck("Input Mesh", m_drawMode == DRAWMODE_MESH, valid[DRAWMODE_MESH]))
-		m_drawMode = DRAWMODE_MESH;
-	if (imguiCheck("Navmesh", m_drawMode == DRAWMODE_NAVMESH, valid[DRAWMODE_NAVMESH]))
-		m_drawMode = DRAWMODE_NAVMESH;
-	if (imguiCheck("Navmesh Invis", m_drawMode == DRAWMODE_NAVMESH_INVIS, valid[DRAWMODE_NAVMESH_INVIS]))
-		m_drawMode = DRAWMODE_NAVMESH_INVIS;
-	if (imguiCheck("Navmesh Trans", m_drawMode == DRAWMODE_NAVMESH_TRANS, valid[DRAWMODE_NAVMESH_TRANS]))
-		m_drawMode = DRAWMODE_NAVMESH_TRANS;
-	if (imguiCheck("Navmesh BVTree", m_drawMode == DRAWMODE_NAVMESH_BVTREE, valid[DRAWMODE_NAVMESH_BVTREE]))
-		m_drawMode = DRAWMODE_NAVMESH_BVTREE;
-	if (imguiCheck("Navmesh Nodes", m_drawMode == DRAWMODE_NAVMESH_NODES, valid[DRAWMODE_NAVMESH_NODES]))
-		m_drawMode = DRAWMODE_NAVMESH_NODES;
-	if (imguiCheck("Voxels", m_drawMode == DRAWMODE_VOXELS, valid[DRAWMODE_VOXELS]))
-		m_drawMode = DRAWMODE_VOXELS;
-	if (imguiCheck("Walkable Voxels", m_drawMode == DRAWMODE_VOXELS_WALKABLE, valid[DRAWMODE_VOXELS_WALKABLE]))
-		m_drawMode = DRAWMODE_VOXELS_WALKABLE;
-	if (imguiCheck("Compact", m_drawMode == DRAWMODE_COMPACT, valid[DRAWMODE_COMPACT]))
-		m_drawMode = DRAWMODE_COMPACT;
-	if (imguiCheck("Compact Distance", m_drawMode == DRAWMODE_COMPACT_DISTANCE, valid[DRAWMODE_COMPACT_DISTANCE]))
-		m_drawMode = DRAWMODE_COMPACT_DISTANCE;
-	if (imguiCheck("Compact Regions", m_drawMode == DRAWMODE_COMPACT_REGIONS, valid[DRAWMODE_COMPACT_REGIONS]))
-		m_drawMode = DRAWMODE_COMPACT_REGIONS;
-	if (imguiCheck("Region Connections", m_drawMode == DRAWMODE_REGION_CONNECTIONS, valid[DRAWMODE_REGION_CONNECTIONS]))
-		m_drawMode = DRAWMODE_REGION_CONNECTIONS;
-	if (imguiCheck("Raw Contours", m_drawMode == DRAWMODE_RAW_CONTOURS, valid[DRAWMODE_RAW_CONTOURS]))
-		m_drawMode = DRAWMODE_RAW_CONTOURS;
-	if (imguiCheck("Both Contours", m_drawMode == DRAWMODE_BOTH_CONTOURS, valid[DRAWMODE_BOTH_CONTOURS]))
-		m_drawMode = DRAWMODE_BOTH_CONTOURS;
-	if (imguiCheck("Contours", m_drawMode == DRAWMODE_CONTOURS, valid[DRAWMODE_CONTOURS]))
-		m_drawMode = DRAWMODE_CONTOURS;
-	if (imguiCheck("Poly Mesh", m_drawMode == DRAWMODE_POLYMESH, valid[DRAWMODE_POLYMESH]))
-		m_drawMode = DRAWMODE_POLYMESH;
-	if (imguiCheck("Poly Mesh Detail", m_drawMode == DRAWMODE_POLYMESH_DETAIL, valid[DRAWMODE_POLYMESH_DETAIL]))
-		m_drawMode = DRAWMODE_POLYMESH_DETAIL;
-	
-	if (unavail)
-	{
-		imguiValue("Tick 'Keep Itermediate Results'");
-		imguiValue("to see more debug mode options.");
-	}
-}
-
-void Sample_SoloMeshTiled::handleRender()
-{
-	if (!m_geom || !m_geom->getMesh())
-		return;
-	
-	DebugDrawGL dd;
-	
-	glEnable(GL_FOG);
-	glDepthMask(GL_TRUE);
-	
-	if (m_drawMode == DRAWMODE_MESH)
-	{
-		// Draw mesh
-		duDebugDrawTriMeshSlope(&dd, m_geom->getMesh()->getVerts(), m_geom->getMesh()->getVertCount(),
-								m_geom->getMesh()->getTris(), m_geom->getMesh()->getNormals(), m_geom->getMesh()->getTriCount(),
-								m_agentMaxSlope);
-		m_geom->drawOffMeshConnections(&dd);
-	}
-	else if (m_drawMode != DRAWMODE_NAVMESH_TRANS)
-	{
-		// Draw mesh
-		duDebugDrawTriMesh(&dd, m_geom->getMesh()->getVerts(), m_geom->getMesh()->getVertCount(),
-						   m_geom->getMesh()->getTris(), m_geom->getMesh()->getNormals(), m_geom->getMesh()->getTriCount(), 0);
-		m_geom->drawOffMeshConnections(&dd);
-	}
-	
-	glDisable(GL_FOG);
-	glDepthMask(GL_FALSE);
-	
-	// Draw bounds
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float* bmax = m_geom->getMeshBoundsMax();
-	duDebugDrawBoxWire(&dd, bmin[0],bmin[1],bmin[2], bmax[0],bmax[1],bmax[2], duRGBA(255,255,255,128), 1.0f);
-	
-	// Tiling grid.
-	int gw = 0, gh = 0;
-	rcCalcGridSize(bmin, bmax, m_cellSize, &gw, &gh);
-	const int tw = (gw + (int)m_tileSize-1) / (int)m_tileSize;
-	const int th = (gh + (int)m_tileSize-1) / (int)m_tileSize;
-	const float s = m_tileSize*m_cellSize;
-	duDebugDrawGridXZ(&dd, bmin[0],bmin[1],bmin[2], tw,th, s, duRGBA(0,0,0,64), 1.0f);
-	
-	if (m_navMesh && m_navQuery &&
-		(m_drawMode == DRAWMODE_NAVMESH ||
-		 m_drawMode == DRAWMODE_NAVMESH_TRANS ||
-		 m_drawMode == DRAWMODE_NAVMESH_BVTREE ||
-		 m_drawMode == DRAWMODE_NAVMESH_NODES ||
-		 m_drawMode == DRAWMODE_NAVMESH_INVIS))
-	{
-		if (m_drawMode != DRAWMODE_NAVMESH_INVIS)
-			duDebugDrawNavMeshWithClosedList(&dd, *m_navMesh, *m_navQuery, m_navMeshDrawFlags);
-		if (m_drawMode == DRAWMODE_NAVMESH_BVTREE)
-			duDebugDrawNavMeshBVTree(&dd, *m_navMesh);
-		if (m_drawMode == DRAWMODE_NAVMESH_NODES)
-			duDebugDrawNavMeshNodes(&dd, *m_navQuery);
-	}
-	
-	glDepthMask(GL_TRUE);
-	
-	if (m_tileSet)
-	{
-		if (m_drawMode == DRAWMODE_COMPACT)
-		{
-			for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-			{
-				if (m_tileSet->tiles[i].chf && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-					duDebugDrawCompactHeightfieldSolid(&dd, *m_tileSet->tiles[i].chf);
-			}
-		}
-		
-		if (m_drawMode == DRAWMODE_COMPACT_DISTANCE)
-		{
-			for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-			{
-				if (m_tileSet->tiles[i].chf && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-					duDebugDrawCompactHeightfieldDistance(&dd, *m_tileSet->tiles[i].chf);
-			}
-		}
-		if (m_drawMode == DRAWMODE_COMPACT_REGIONS)
-		{
-			for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-			{
-				if (m_tileSet->tiles[i].chf && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-					duDebugDrawCompactHeightfieldRegions(&dd, *m_tileSet->tiles[i].chf);
-			}
-		}
-			
-		if (m_drawMode == DRAWMODE_VOXELS)
-		{
-			glEnable(GL_FOG);
-			for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-			{
-				if (m_tileSet->tiles[i].solid && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-					duDebugDrawHeightfieldSolid(&dd, *m_tileSet->tiles[i].solid);
-			}
-			glDisable(GL_FOG);
-		}
-		if (m_drawMode == DRAWMODE_VOXELS_WALKABLE)
-		{
-			glEnable(GL_FOG);
-			for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-			{
-				if (m_tileSet->tiles[i].solid && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-					duDebugDrawHeightfieldWalkable(&dd, *m_tileSet->tiles[i].solid);
-			}
-			glDisable(GL_FOG);
-		}
-		if (m_drawMode == DRAWMODE_RAW_CONTOURS)
-		{
-			glDepthMask(GL_FALSE);
-			for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-			{
-				if (m_tileSet->tiles[i].cset && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-					duDebugDrawRawContours(&dd, *m_tileSet->tiles[i].cset);
-			}
-			glDepthMask(GL_TRUE);
-		}
-		if (m_drawMode == DRAWMODE_BOTH_CONTOURS)
-		{
-			glDepthMask(GL_FALSE);
-			for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-			{
-				if (m_tileSet->tiles[i].cset && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-				{
-					duDebugDrawRawContours(&dd, *m_tileSet->tiles[i].cset, 0.5f);
-					duDebugDrawContours(&dd, *m_tileSet->tiles[i].cset);
-				}
-			}
-			glDepthMask(GL_TRUE);
-		}
-		if (m_drawMode == DRAWMODE_CONTOURS)
-		{
-			glDepthMask(GL_FALSE);
-			for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-			{
-				if (m_tileSet->tiles[i].cset && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-					duDebugDrawContours(&dd, *m_tileSet->tiles[i].cset);
-			}
-			glDepthMask(GL_TRUE);
-		}
-		if (m_drawMode == DRAWMODE_REGION_CONNECTIONS)
-		{
-			for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-			{
-				if (m_tileSet->tiles[i].chf && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-					duDebugDrawCompactHeightfieldRegions(&dd, *m_tileSet->tiles[i].chf);
-			}
-			
-			glDepthMask(GL_FALSE);
-			for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-			{
-				if (m_tileSet->tiles[i].cset && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-					duDebugDrawRegionConnections(&dd, *m_tileSet->tiles[i].cset);
-			}
-			glDepthMask(GL_TRUE);
-		}
-		if (/*m_pmesh &&*/ m_drawMode == DRAWMODE_POLYMESH)
-		{
-			glDepthMask(GL_FALSE);
-			if (m_pmesh)
-			{
-				duDebugDrawPolyMesh(&dd, *m_pmesh);
-			}
-			else
-			{
-				for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-				{
-					if (m_tileSet->tiles[i].pmesh && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-						duDebugDrawPolyMesh(&dd, *m_tileSet->tiles[i].pmesh);
-				}
-			}
-			
-			glDepthMask(GL_TRUE);
-		}
-		if (/*m_dmesh &&*/ m_drawMode == DRAWMODE_POLYMESH_DETAIL)
-		{
-			glDepthMask(GL_FALSE);
-			if (m_dmesh)
-			{
-				duDebugDrawPolyMeshDetail(&dd, *m_dmesh);
-			}
-			else
-			{
-				for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-				{
-					if (m_tileSet->tiles[i].dmesh && canDrawTile(m_tileSet->tiles[i].x,m_tileSet->tiles[i].y))
-						duDebugDrawPolyMeshDetail(&dd, *m_tileSet->tiles[i].dmesh);
-				}
-			}
-			glDepthMask(GL_TRUE);
-		}
-	}
-		
-	m_geom->drawConvexVolumes(&dd);
-
-	if (m_tool)
-		m_tool->handleRender();
-
-	glDepthMask(GL_TRUE);
-}
-
-static float nicenum(float x, int round)
-{
-	float expv = floorf(log10f(x));
-	float f = x / powf(10.0f, expv);
-	float nf;
-	if (round)
-	{
-		if (f < 1.5f) nf = 1.0f;
-		else if (f < 3.0f) nf = 2.0f;
-		else if (f < 7.0f) nf = 5.0f;
-		else nf = 10.0f;
-	}
-	else
-	{
-		if (f <= 1.0f) nf = 1.0f;
-		else if (f <= 2.0f) nf = 2.0f;
-		else if (f <= 5.0f) nf = 5.0f;
-		else nf = 10.0f;
-	}
-	return nf*powf(10.0f, expv);
-}
-
-static void drawLabels(int x, int y, int w, int h,
-					   int nticks, float vmin, float vmax, const char* unit)
-{
-	char str[8], temp[32];
-	
-	float range = nicenum(vmax-vmin, 0);
-	float d = nicenum(range/(float)(nticks-1), 1);
-	float graphmin = floorf(vmin/d)*d;
-	float graphmax = ceilf(vmax/d)*d;
-	int nfrac = (int)-floorf(log10f(d));
-	if (nfrac < 0) nfrac = 0;
-	snprintf(str, 6, "%%.%df %%s", nfrac);
-
-	for (float v = graphmin; v < graphmax+d/2; v += d)
-	{
-		float lx = x + (v-vmin)/(vmax-vmin)*w;
-		if (lx < 0 || lx > w) continue;
-		snprintf(temp, 20, str, v, unit);
-		imguiDrawText((int)lx+2, (int)y+2, IMGUI_ALIGN_LEFT, temp, imguiRGBA(255,255,255));
-		glColor4ub(0,0,0,64);
-		glBegin(GL_LINES);
-		glVertex2f(lx,(float)y);
-		glVertex2f(lx,(float)(y+h));
-		glEnd();
-	}
-}
-
-static void drawGraph(const char* name, int x, int y, int w, int h, float sd,
-					  const int* samples, int n, int /*nsamples*/, const char* unit)
-{
-	char text[64];
-	int first, last, maxval;
-	first = 0;
-	last = n-1;
-	while (first < n && samples[first] == 0)
-		first++;
-	while (last >= 0 && samples[last] == 0)
-		last--;
-	if (first == last)
-		return;
-	maxval = 1;
-	for (int i = first; i <= last; ++i)
-	{
-		if (samples[i] > maxval)
-			maxval = samples[i];
-	}
-	const float sx = (float)w / (float)(last-first);
-	const float sy = (float)h / (float)maxval;
-	
-	glBegin(GL_QUADS);
-	glColor4ub(32,32,32,64);
-	glVertex2i(x,y);
-	glVertex2i(x+w,y);
-	glVertex2i(x+w,y+h);
-	glVertex2i(x,y+h);
-	glEnd();
-	
-	glColor4ub(255,255,255,64);
-	glBegin(GL_LINES);
-	for (int i = 0; i <= 4; ++i)
-	{
-		int yy = y+i*h/4;
-		glVertex2i(x,yy);
-		glVertex2i(x+w,yy);
-	}
-	glEnd();
-
-	glColor4ub(0,196,255,255);
-	glBegin(GL_LINE_STRIP);
-	for (int i = first; i <= last; ++i)
-	{
-		float fx = x + (i-first)*sx;
-		float fy = y + samples[i]*sy;
-		glVertex2f(fx,fy);
-	}
-	glEnd();
-
-	snprintf(text,64,"%d", maxval);
-	imguiDrawText((int)x+w-2, (int)y+h-20, IMGUI_ALIGN_RIGHT, text, imguiRGBA(0,0,0));
-	imguiDrawText((int)x+2, (int)y+h-20, IMGUI_ALIGN_LEFT, name, imguiRGBA(255,255,255));
-	
-	drawLabels(x, y, w, h, 10, first*sd, last*sd, unit);
-}
-
-void Sample_SoloMeshTiled::handleRenderOverlay(double* proj, double* model, int* view)
-{
-	if (m_measurePerTileTimings)
-	{
-		if (m_statTimePerTileSamples)
-			drawGraph("Build Time/Tile", 10, 10, 500, 100, 1.0f, m_statTimePerTile, MAX_STAT_BUCKETS, m_statTimePerTileSamples, "ms");
-
-		if (m_statPolysPerTileSamples)
-			drawGraph("Polygons/Tile", 10, 120, 500, 100, 1.0f, m_statPolysPerTile, MAX_STAT_BUCKETS, m_statPolysPerTileSamples, "");
-
-		int validTiles = 0;
-		if (m_tileSet)
-		{
-			for (int i = 0; i < m_tileSet->width*m_tileSet->height; ++i)
-			{
-				if (m_tileSet->tiles[i].buildTime > 0)
-					validTiles++;
-			}
-		}
-		char text[64];
-		snprintf(text,64,"Tiles %d\n", validTiles);
-		imguiDrawText(10, 240, IMGUI_ALIGN_LEFT, text, imguiRGBA(255,255,255));
-	}
-
-	if (m_tool)
-		m_tool->handleRenderOverlay(proj, model, view);
-}
-
-void Sample_SoloMeshTiled::handleMeshChanged(class InputGeom* geom)
-{
-	Sample::handleMeshChanged(geom);
-
-	dtFreeNavMesh(m_navMesh);
-	m_navMesh = 0;
-	
-	m_statTimePerTileSamples = 0;
-	m_statPolysPerTileSamples = 0;
-
-	if (m_tool)
-	{
-		m_tool->reset();
-		m_tool->init(this);
-	}
-}
-
-bool Sample_SoloMeshTiled::handleBuild()
-{
-	if (!m_geom || !m_geom->getMesh() || !m_geom->getChunkyMesh())
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Input mesh is not specified.");
-		return false;
-	}
-
-	if (m_measurePerTileTimings)
-	{
-		memset(m_statPolysPerTile, 0, sizeof(m_statPolysPerTile));
-		memset(m_statTimePerTile, 0, sizeof(m_statTimePerTile));
-		m_statPolysPerTileSamples = 0;
-		m_statTimePerTileSamples = 0;
-	}
-	
-	cleanup();
-	
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float* bmax = m_geom->getMeshBoundsMax();
-	const float* verts = m_geom->getMesh()->getVerts();
-	const int nverts = m_geom->getMesh()->getVertCount();
-	const int ntris = m_geom->getMesh()->getTriCount();
-	const rcChunkyTriMesh* chunkyMesh = m_geom->getChunkyMesh();
-	
-	// Init build configuration from GUI
-	memset(&m_cfg, 0, sizeof(m_cfg));
-	m_cfg.cs = m_cellSize;
-	m_cfg.ch = m_cellHeight;
-	m_cfg.walkableSlopeAngle = m_agentMaxSlope;
-	m_cfg.walkableHeight = (int)ceilf(m_agentHeight / m_cfg.ch);
-	m_cfg.walkableClimb = (int)floorf(m_agentMaxClimb / m_cfg.ch);
-	m_cfg.walkableRadius = (int)ceilf(m_agentRadius / m_cfg.cs);
-	m_cfg.maxEdgeLen = (int)(m_edgeMaxLen / m_cellSize);
-	m_cfg.maxSimplificationError = m_edgeMaxError;
-	m_cfg.minRegionArea = (int)rcSqr(m_regionMinSize);		// Note: area = size*size
-	m_cfg.mergeRegionArea = (int)rcSqr(m_regionMergeSize);	// Note: area = size*size
-	m_cfg.maxVertsPerPoly = (int)m_vertsPerPoly;
-	m_cfg.tileSize = (int)m_tileSize;
-	m_cfg.borderSize = m_cfg.walkableRadius + 3; // Reserve enough padding.
-	m_cfg.detailSampleDist = m_detailSampleDist < 0.9f ? 0 : m_cellSize * m_detailSampleDist;
-	m_cfg.detailSampleMaxError = m_cellHeight * m_detailSampleMaxError;
-		
-	// Set the area where the navigation will be build.
-	// Here the bounds of the input mesh are used, but the
-	// area could be specified by an user defined box, etc.
-	rcVcopy(m_cfg.bmin, bmin);
-	rcVcopy(m_cfg.bmax, bmax);
-	rcCalcGridSize(m_cfg.bmin, m_cfg.bmax, m_cfg.cs, &m_cfg.width, &m_cfg.height);
-	
-	// Reset build times gathering.
-	m_ctx->resetTimers();
-	
-	// Start the build process.	
-	m_ctx->startTimer(RC_TIMER_TOTAL);
-
-	// Calculate the number of tiles in the output and initialize tiles.
-	m_tileSet = new TileSet;
-	if (!m_tileSet)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Out of memory 'tileSet'.");
-		return false;
-	}
-	rcVcopy(m_tileSet->bmin, m_cfg.bmin);
-	rcVcopy(m_tileSet->bmax, m_cfg.bmax);
-	m_tileSet->cs = m_cfg.cs;
-	m_tileSet->ch = m_cfg.ch;
-	m_tileSet->width = (m_cfg.width + m_cfg.tileSize-1) / m_cfg.tileSize;
-	m_tileSet->height = (m_cfg.height + m_cfg.tileSize-1) / m_cfg.tileSize;
-	m_tileSet->tiles = new Tile[m_tileSet->height * m_tileSet->width];
-	if (!m_tileSet->tiles)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Out of memory 'tileSet->tiles' (%d).", m_tileSet->height * m_tileSet->width);
-		return false;
-	}
-	
-	m_ctx->log(RC_LOG_PROGRESS, "Building navigation:");
-	m_ctx->log(RC_LOG_PROGRESS, " - %d x %d cells", m_cfg.width, m_cfg.height);
-	m_ctx->log(RC_LOG_PROGRESS, " - %d x %d tiles", m_tileSet->width, m_tileSet->height);
-	m_ctx->log(RC_LOG_PROGRESS, " - %.1f verts, %.1f tris", nverts/1000.0f, ntris/1000.0f);
-		
-	// Initialize per tile config.
-	rcConfig tileCfg;
-	memcpy(&tileCfg, &m_cfg, sizeof(rcConfig));
-	tileCfg.width = m_cfg.tileSize + m_cfg.borderSize*2;
-	tileCfg.height = m_cfg.tileSize + m_cfg.borderSize*2;
-		
-	// Allocate array that can hold triangle flags for all geom chunks.
-	unsigned char* triangleAreas = new unsigned char[chunkyMesh->maxTrisPerChunk];
-	if (!triangleAreas)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Out of memory 'triangleAreas' (%d).",
-				   chunkyMesh->maxTrisPerChunk);
-		return false;
-	}
-
-	for (int y = 0; y < m_tileSet->height; ++y)
-	{
-		for (int x = 0; x < m_tileSet->width; ++x)
-		{
-			m_ctx->startTimer(RC_TIMER_TEMP);
-			
-			Tile& tile = m_tileSet->tiles[x + y*m_tileSet->width];
-			tile.x = x;
-			tile.y = y;
-			
-			// Calculate the per tile bounding box.
-			tileCfg.bmin[0] = m_cfg.bmin[0] + (x*m_cfg.tileSize - m_cfg.borderSize)*m_cfg.cs;
-			tileCfg.bmin[2] = m_cfg.bmin[2] + (y*m_cfg.tileSize - m_cfg.borderSize)*m_cfg.cs;
-			tileCfg.bmax[0] = m_cfg.bmin[0] + ((x+1)*m_cfg.tileSize + m_cfg.borderSize)*m_cfg.cs;
-			tileCfg.bmax[2] = m_cfg.bmin[2] + ((y+1)*m_cfg.tileSize + m_cfg.borderSize)*m_cfg.cs;
-			
-			float tbmin[2], tbmax[2];
-			tbmin[0] = tileCfg.bmin[0];
-			tbmin[1] = tileCfg.bmin[2];
-			tbmax[0] = tileCfg.bmax[0];
-			tbmax[1] = tileCfg.bmax[2];
-			int cid[512];// TODO: Make grow when returning too many items.
-			const int ncid = rcGetChunksOverlappingRect(chunkyMesh, tbmin, tbmax, cid, 512);
-			if (!ncid)
-				continue;
-			
-			tile.solid = rcAllocHeightfield();
-			if (!tile.solid)
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Out of memory 'solid'.", x, y);
-				continue;
-			}
-			if (!rcCreateHeightfield(m_ctx, *tile.solid, tileCfg.width, tileCfg.height, tileCfg.bmin, tileCfg.bmax, tileCfg.cs, tileCfg.ch))
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Could not create solid heightfield.", x, y);
-				continue;
-			}
-			
-			for (int i = 0; i < ncid; ++i)
-			{
-				const rcChunkyTriMeshNode& node = chunkyMesh->nodes[cid[i]];
-				const int* tris = &chunkyMesh->tris[node.i*3];
-				const int ntris = node.n;
-				
-				memset(triangleAreas, 0, ntris*sizeof(unsigned char));
-				rcMarkWalkableTriangles(m_ctx, tileCfg.walkableSlopeAngle,
-										verts, nverts, tris, ntris, triangleAreas);
-				
-				rcRasterizeTriangles(m_ctx, verts, nverts, tris, triangleAreas, ntris, *tile.solid, m_cfg.walkableClimb);
-			}	
-			
-			rcFilterLowHangingWalkableObstacles(m_ctx, m_cfg.walkableClimb, *tile.solid);
-			rcFilterLedgeSpans(m_ctx, tileCfg.walkableHeight, tileCfg.walkableClimb, *tile.solid);
-			rcFilterWalkableLowHeightSpans(m_ctx, tileCfg.walkableHeight, *tile.solid);
-			
-			tile.chf = rcAllocCompactHeightfield();
-			if (!tile.chf)
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Out of memory 'chf'.", x, y);
-				continue;
-			}
-			if (!rcBuildCompactHeightfield(m_ctx, tileCfg.walkableHeight, tileCfg.walkableClimb,
-										   *tile.solid, *tile.chf))
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Could not build compact data.", x, y);
-				continue;
-			}
-			
-			// Erode the walkable area by agent radius.
-			if (!rcErodeWalkableArea(m_ctx, m_cfg.walkableRadius, *tile.chf))
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Could not erode.");
-				continue;
-			}
-			
-			// (Optional) Mark areas.
-			const ConvexVolume* vols = m_geom->getConvexVolumes();
-			for (int i  = 0; i < m_geom->getConvexVolumeCount(); ++i)
-				rcMarkConvexPolyArea(m_ctx, vols[i].verts, vols[i].nverts, vols[i].hmin, vols[i].hmax, (unsigned char)vols[i].area, *tile.chf);
-			
-			if (!rcBuildDistanceField(m_ctx, *tile.chf))
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Could not build distance fields.", x, y);
-				continue;
-			}
-			
-			if (!rcBuildRegions(m_ctx, *tile.chf, tileCfg.borderSize, tileCfg.minRegionArea, tileCfg.mergeRegionArea))
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Could not build regions.", x, y);
-				continue;
-			}
-			
-			tile.cset = rcAllocContourSet();
-			if (!tile.cset)
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Out of memory 'cset'.", x, y);
-				continue;
-			}
-			if (!rcBuildContours(m_ctx, *tile.chf, tileCfg.maxSimplificationError, tileCfg.maxEdgeLen, *tile.cset))
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Could not create contours.", x, y);
-				continue;
-			}
-			
-			tile.pmesh = rcAllocPolyMesh();
-			if (!tile.pmesh)
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Out of memory 'pmesh'.", x, y);
-				continue;
-			}
-			if (!rcBuildPolyMesh(m_ctx, *tile.cset, tileCfg.maxVertsPerPoly, *tile.pmesh))
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Could not create poly mesh.", x, y);
-				continue;
-			}
-
-			tile.dmesh = rcAllocPolyMeshDetail();
-			if (!tile.dmesh)
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Out of memory 'dmesh'.", x, y);
-				continue;
-			}
-			
-			if (!rcBuildPolyMeshDetail(m_ctx, *tile.pmesh, *tile.chf, tileCfg.detailSampleDist, tileCfg	.detailSampleMaxError, *tile.dmesh))
-			{
-				m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: [%d,%d] Could not build detail mesh.", x, y);
-				continue;
-			}
-
-			if (!m_keepInterResults)
-			{
-				rcFreeHeightField(tile.solid);
-				tile.solid = 0;
-				rcFreeCompactHeightfield(tile.chf);
-				tile.chf = 0;
-				rcFreeContourSet(tile.cset);
-				tile.cset = 0;
-			}
-			
-			m_ctx->stopTimer(RC_TIMER_TOTAL);
-
-			tile.buildTime += m_ctx->getAccumulatedTime(RC_TIMER_TOTAL);
-			
-			// Some extra code to measure some per tile statistics,
-			// such as build time and how many polygons there are per tile.
-			if (tile.pmesh)
-			{
-				int bucket = tile.pmesh->npolys;
-				if (bucket < 0) bucket = 0;
-				if (bucket >= MAX_STAT_BUCKETS) bucket = MAX_STAT_BUCKETS-1;
-				m_statPolysPerTile[bucket]++;
-				m_statPolysPerTileSamples++;
-			}
-			int bucket = (tile.buildTime+500)/1000;
-			if (bucket < 0) bucket = 0;
-			if (bucket >= MAX_STAT_BUCKETS) bucket = MAX_STAT_BUCKETS-1;
-			m_statTimePerTile[bucket]++;
-			m_statTimePerTileSamples++;
-		}
-	}
-	
-	delete [] triangleAreas;
-	
-	// Merge per tile poly and detail meshes.
-	rcPolyMesh** pmmerge = new rcPolyMesh*[m_tileSet->width*m_tileSet->height];
-	if (!pmmerge)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Out of memory 'pmmerge' (%d).", m_tileSet->width*m_tileSet->height);
-		return false;
-	}
-	
-	rcPolyMeshDetail** dmmerge = new rcPolyMeshDetail*[m_tileSet->width*m_tileSet->height];
-	if (!dmmerge)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Out of memory 'dmmerge' (%d).", m_tileSet->width*m_tileSet->height);
-		return false;
-	}
-	
-	int nmerge = 0;
-	for (int y = 0; y < m_tileSet->height; ++y)
-	{
-		for (int x = 0; x < m_tileSet->width; ++x)
-		{
-			Tile& tile = m_tileSet->tiles[x + y*m_tileSet->width]; 
-			if (tile.pmesh)
-			{
-				pmmerge[nmerge] = tile.pmesh;
-				dmmerge[nmerge] = tile.dmesh;
-				nmerge++;
-			}
-		}
-	}
-	
-	m_pmesh = rcAllocPolyMesh();
-	if (!m_pmesh)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'pmesh'.");
-		return false;
-	}
-	rcMergePolyMeshes(m_ctx, pmmerge, nmerge, *m_pmesh);
-
-	m_dmesh = rcAllocPolyMeshDetail();
-	if (!m_dmesh)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'dmesh'.");
-		return false;
-	}
-	rcMergePolyMeshDetails(m_ctx, dmmerge, nmerge, *m_dmesh);
-	
-	delete [] pmmerge;
-	delete [] dmmerge;
-	
-	if (!m_keepInterResults)
-	{
-		for (int y = 0; y < m_tileSet->height; ++y)
-		{
-			for (int x = 0; x < m_tileSet->width; ++x)
-			{
-				Tile& tile = m_tileSet->tiles[x + y*m_tileSet->width]; 
-				rcFreeContourSet(tile.cset);
-				tile.cset = 0;
-				rcFreePolyMesh(tile.pmesh);
-				tile.pmesh = 0;
-				rcFreePolyMeshDetail(tile.dmesh);
-				tile.dmesh = 0;
-			}
-		}
-	}
-	
-	if (m_pmesh && m_cfg.maxVertsPerPoly <= DT_VERTS_PER_POLYGON)
-	{
-		unsigned char* navData = 0;
-		int navDataSize = 0;
-
-		// Update poly flags from areas.
-		for (int i = 0; i < m_pmesh->npolys; ++i)
-		{
-			if (m_pmesh->areas[i] == RC_WALKABLE_AREA)
-				m_pmesh->areas[i] = SAMPLE_POLYAREA_GROUND;
-			
-			if (m_pmesh->areas[i] == SAMPLE_POLYAREA_GROUND ||
-				m_pmesh->areas[i] == SAMPLE_POLYAREA_GRASS ||
-				m_pmesh->areas[i] == SAMPLE_POLYAREA_ROAD)
-			{
-				m_pmesh->flags[i] = SAMPLE_POLYFLAGS_WALK;
-			}
-			else if (m_pmesh->areas[i] == SAMPLE_POLYAREA_WATER)
-			{
-				m_pmesh->flags[i] = SAMPLE_POLYFLAGS_SWIM;
-			}
-			else if (m_pmesh->areas[i] == SAMPLE_POLYAREA_DOOR)
-			{
-				m_pmesh->flags[i] = SAMPLE_POLYFLAGS_WALK | SAMPLE_POLYFLAGS_DOOR;
-			}
-		}
-		
-		dtNavMeshCreateParams params;
-		memset(&params, 0, sizeof(params));
-		params.verts = m_pmesh->verts;
-		params.vertCount = m_pmesh->nverts;
-		params.polys = m_pmesh->polys;
-		params.polyAreas = m_pmesh->areas;
-		params.polyFlags = m_pmesh->flags;
-		params.polyCount = m_pmesh->npolys;
-		params.nvp = m_pmesh->nvp;
-		params.detailMeshes = m_dmesh->meshes;
-		params.detailVerts = m_dmesh->verts;
-		params.detailVertsCount = m_dmesh->nverts;
-		params.detailTris = m_dmesh->tris;
-		params.detailTriCount = m_dmesh->ntris;
-		params.offMeshConVerts = m_geom->getOffMeshConnectionVerts();
-		params.offMeshConRad = m_geom->getOffMeshConnectionRads();
-		params.offMeshConDir = m_geom->getOffMeshConnectionDirs();
-		params.offMeshConAreas = m_geom->getOffMeshConnectionAreas();
-		params.offMeshConFlags = m_geom->getOffMeshConnectionFlags();
-		params.offMeshConUserID = m_geom->getOffMeshConnectionId();
-		params.offMeshConCount = m_geom->getOffMeshConnectionCount();
-		params.walkableHeight = m_agentHeight;
-		params.walkableRadius = m_agentRadius;
-		params.walkableClimb = m_agentMaxClimb;
-		rcVcopy(params.bmin, m_pmesh->bmin);
-		rcVcopy(params.bmax, m_pmesh->bmax);
-		params.cs = m_cfg.cs;
-		params.ch = m_cfg.ch;
-		
-		if (!dtCreateNavMeshData(&params, &navData, &navDataSize))
-		{
-			m_ctx->log(RC_LOG_ERROR, "Could not build Detour navmesh.");
-			return false;
-		}
-		
-		m_navMesh = dtAllocNavMesh();
-		if (!m_navMesh)
-		{
-			dtFree(navData);
-			m_ctx->log(RC_LOG_ERROR, "Could not create Detour navmesh");
-			return false;
-		}
-		
-		if (m_navMesh->init(navData, navDataSize, DT_TILE_FREE_DATA) != DT_SUCCESS)
-		{
-			dtFree(navData);
-			m_ctx->log(RC_LOG_ERROR, "Could not init Detour navmesh");
-			return false;
-		}
-
-		if (m_navQuery->init(m_navMesh, 2048) != DT_SUCCESS)
-		{
-			m_ctx->log(RC_LOG_ERROR, "Could not init Detour navmesh query");
-			return false;
-		}
-	}
-		
-	m_ctx->stopTimer(RC_TIMER_TOTAL);
-	
-	duLogBuildTimes(*m_ctx, m_ctx->getAccumulatedTime(RC_TIMER_TOTAL));
-	m_ctx->log(RC_LOG_PROGRESS, ">> Polymesh: %d vertices  %d polygons", m_pmesh->nverts, m_pmesh->npolys);
-
-	m_totalBuildTimeMs = m_ctx->getAccumulatedTime(RC_TIMER_TOTAL)/1000.0f;
-
-	if (m_tool)
-		m_tool->init(this);
-
-	return true;
-}
-
-bool Sample_SoloMeshTiled::canDrawTile(int x, int y)
-{
-	if (m_highLightedTileX == -1) return true;
-	return m_highLightedTileX == x && m_highLightedTileY == y;
-}
-
-void Sample_SoloMeshTiled::setHighlightedTile(const float* pos)
-{
-	if (!pos)
-	{
-		m_highLightedTileX = -1;
-		m_highLightedTileY = -1;
-		return;
-	}
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float ts = m_tileSize*m_cellSize;
-	m_highLightedTileX = (int)((pos[0] - bmin[0]) / ts);
-	m_highLightedTileY = (int)((pos[2] - bmin[2]) / ts);
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/Sample_TileMesh.cpp b/dep/recastnavigation/RecastDemo/Source/Sample_TileMesh.cpp
deleted file mode 100644
index e0fe3b25b5b..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/Sample_TileMesh.cpp
+++ /dev/null
@@ -1,1196 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include "SDL.h"
-#include "SDL_opengl.h"
-#include "imgui.h"
-#include "InputGeom.h"
-#include "Sample.h"
-#include "Sample_TileMesh.h"
-#include "Recast.h"
-#include "RecastDebugDraw.h"
-#include "DetourNavMesh.h"
-#include "DetourNavMeshBuilder.h"
-#include "DetourDebugDraw.h"
-#include "NavMeshTesterTool.h"
-#include "OffMeshConnectionTool.h"
-#include "ConvexVolumeTool.h"
-#include "CrowdTool.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-
-inline unsigned int nextPow2(unsigned int v)
-{
-	v--;
-	v |= v >> 1;
-	v |= v >> 2;
-	v |= v >> 4;
-	v |= v >> 8;
-	v |= v >> 16;
-	v++;
-	return v;
-}
-
-inline unsigned int ilog2(unsigned int v)
-{
-	unsigned int r;
-	unsigned int shift;
-	r = (v > 0xffff) << 4; v >>= r;
-	shift = (v > 0xff) << 3; v >>= shift; r |= shift;
-	shift = (v > 0xf) << 2; v >>= shift; r |= shift;
-	shift = (v > 0x3) << 1; v >>= shift; r |= shift;
-	r |= (v >> 1);
-	return r;
-}
-
-class NavMeshTileTool : public SampleTool
-{
-	Sample_TileMesh* m_sample;
-	float m_hitPos[3];
-	bool m_hitPosSet;
-	float m_agentRadius;
-	
-public:
-
-	NavMeshTileTool() :
-		m_sample(0),
-		m_hitPosSet(false),
-		m_agentRadius(0)
-	{
-		m_hitPos[0] = m_hitPos[1] = m_hitPos[2] = 0;
-	}
-
-	virtual ~NavMeshTileTool()
-	{
-	}
-
-	virtual int type() { return TOOL_TILE_EDIT; }
-
-	virtual void init(Sample* sample)
-	{
-		m_sample = (Sample_TileMesh*)sample; 
-	}
-	
-	virtual void reset() {}
-
-	virtual void handleMenu()
-	{
-		imguiLabel("Create Tiles");
-		if (imguiButton("Create All"))
-		{
-			if (m_sample)
-				m_sample->buildAllTiles();
-		}
-		if (imguiButton("Remove All"))
-		{
-			if (m_sample)
-				m_sample->removeAllTiles();
-		}
-		imguiValue("Click LMB to create a tile.");
-		imguiValue("Shift+LMB to remove a tile.");
-	}
-
-	virtual void handleClick(const float* /*s*/, const float* p, bool shift)
-	{
-		m_hitPosSet = true;
-		rcVcopy(m_hitPos,p);
-		if (m_sample)
-		{
-			if (shift)
-				m_sample->removeTile(m_hitPos);
-			else
-				m_sample->buildTile(m_hitPos);
-		}
-	}
-
-	virtual void handleToggle() {}
-
-	virtual void handleStep() {}
-
-	virtual void handleUpdate(const float /*dt*/) {}
-	
-	virtual void handleRender()
-	{
-		if (m_hitPosSet)
-		{
-			const float s = m_sample->getAgentRadius();
-			glColor4ub(0,0,0,128);
-			glLineWidth(2.0f);
-			glBegin(GL_LINES);
-			glVertex3f(m_hitPos[0]-s,m_hitPos[1]+0.1f,m_hitPos[2]);
-			glVertex3f(m_hitPos[0]+s,m_hitPos[1]+0.1f,m_hitPos[2]);
-			glVertex3f(m_hitPos[0],m_hitPos[1]-s+0.1f,m_hitPos[2]);
-			glVertex3f(m_hitPos[0],m_hitPos[1]+s+0.1f,m_hitPos[2]);
-			glVertex3f(m_hitPos[0],m_hitPos[1]+0.1f,m_hitPos[2]-s);
-			glVertex3f(m_hitPos[0],m_hitPos[1]+0.1f,m_hitPos[2]+s);
-			glEnd();
-			glLineWidth(1.0f);
-		}
-	}
-	
-	virtual void handleRenderOverlay(double* proj, double* model, int* view)
-	{
-		GLdouble x, y, z;
-		if (m_hitPosSet && gluProject((GLdouble)m_hitPos[0], (GLdouble)m_hitPos[1], (GLdouble)m_hitPos[2],
-									  model, proj, view, &x, &y, &z))
-		{
-			int tx=0, ty=0;
-			m_sample->getTilePos(m_hitPos, tx, ty);
-			char text[32];
-			snprintf(text,32,"(%d,%d)", tx,ty);
-			imguiDrawText((int)x, (int)y-25, IMGUI_ALIGN_CENTER, text, imguiRGBA(0,0,0,220));
-		}
-		
-	}
-};
-
-
-
-
-Sample_TileMesh::Sample_TileMesh() :
-	m_keepInterResults(false),
-	m_buildAll(true),
-	m_totalBuildTimeMs(0),
-	m_drawPortals(false),
-	m_triareas(0),
-	m_solid(0),
-	m_chf(0),
-	m_cset(0),
-	m_pmesh(0),
-	m_dmesh(0),
-	m_drawMode(DRAWMODE_NAVMESH),
-	m_maxTiles(0),
-	m_maxPolysPerTile(0),
-	m_tileSize(32),
-	m_tileCol(duRGBA(0,0,0,32)),
-	m_tileBuildTime(0),
-	m_tileMemUsage(0),
-	m_tileTriCount(0)
-{
-	resetCommonSettings();
-	memset(m_tileBmin, 0, sizeof(m_tileBmin));
-	memset(m_tileBmax, 0, sizeof(m_tileBmax));
-	
-	setTool(new NavMeshTileTool);
-}
-
-Sample_TileMesh::~Sample_TileMesh()
-{
-	cleanup();
-	dtFreeNavMesh(m_navMesh);
-	m_navMesh = 0;
-}
-
-void Sample_TileMesh::cleanup()
-{
-	delete [] m_triareas;
-	m_triareas = 0;
-	rcFreeHeightField(m_solid);
-	m_solid = 0;
-	rcFreeCompactHeightfield(m_chf);
-	m_chf = 0;
-	rcFreeContourSet(m_cset);
-	m_cset = 0;
-	rcFreePolyMesh(m_pmesh);
-	m_pmesh = 0;
-	rcFreePolyMeshDetail(m_dmesh);
-	m_dmesh = 0;
-}
-
-
-static const int NAVMESHSET_MAGIC = 'M'<<24 | 'S'<<16 | 'E'<<8 | 'T'; //'MSET';
-static const int NAVMESHSET_VERSION = 1;
-
-struct NavMeshSetHeader
-{
-	int magic;
-	int version;
-	int numTiles;
-	dtNavMeshParams params;
-};
-
-struct NavMeshTileHeader
-{
-	dtTileRef tileRef;
-	int dataSize;
-};
-
-void Sample_TileMesh::saveAll(const char* path, const dtNavMesh* mesh)
-{
-	if (!mesh) return;
-	
-	FILE* fp = fopen(path, "wb");
-	if (!fp)
-		return;
-	
-	// Store header.
-	NavMeshSetHeader header;
-	header.magic = NAVMESHSET_MAGIC;
-	header.version = NAVMESHSET_VERSION;
-	header.numTiles = 0;
-	for (int i = 0; i < mesh->getMaxTiles(); ++i)
-	{
-		const dtMeshTile* tile = mesh->getTile(i);
-		if (!tile || !tile->header || !tile->dataSize) continue;
-		header.numTiles++;
-	}
-	memcpy(&header.params, mesh->getParams(), sizeof(dtNavMeshParams));
-	fwrite(&header, sizeof(NavMeshSetHeader), 1, fp);
-
-	// Store tiles.
-	for (int i = 0; i < mesh->getMaxTiles(); ++i)
-	{
-		const dtMeshTile* tile = mesh->getTile(i);
-		if (!tile || !tile->header || !tile->dataSize) continue;
-
-		NavMeshTileHeader tileHeader;
-		tileHeader.tileRef = mesh->getTileRef(tile);
-		tileHeader.dataSize = tile->dataSize;
-		fwrite(&tileHeader, sizeof(tileHeader), 1, fp);
-
-		fwrite(tile->data, tile->dataSize, 1, fp);
-	}
-
-	fclose(fp);
-}
-
-dtNavMesh* Sample_TileMesh::loadAll(const char* path)
-{
-	FILE* fp = fopen(path, "rb");
-	if (!fp) return 0;
-	
-	// Read header.
-	NavMeshSetHeader header;
-	fread(&header, sizeof(NavMeshSetHeader), 1, fp);
-	if (header.magic != NAVMESHSET_MAGIC)
-	{
-		fclose(fp);
-		return 0;
-	}
-	if (header.version != NAVMESHSET_VERSION)
-	{
-		fclose(fp);
-		return 0;
-	}
-	
-	dtNavMesh* mesh = dtAllocNavMesh();
-
-	if (!mesh || mesh->init(&header.params) != DT_SUCCESS)
-	{
-		fclose(fp);
-		return 0;
-	}
-		
-	// Read tiles.
-	for (int i = 0; i < header.numTiles; ++i)
-	{
-		NavMeshTileHeader tileHeader;
-		fread(&tileHeader, sizeof(tileHeader), 1, fp);
-		if (!tileHeader.tileRef || !tileHeader.dataSize)
-			break;
-
-		unsigned char* data = (unsigned char*)dtAlloc(tileHeader.dataSize, DT_ALLOC_PERM);
-		if (!data) break;
-		memset(data, 0, tileHeader.dataSize);
-		fread(data, tileHeader.dataSize, 1, fp);
-		
-		mesh->addTile(data, tileHeader.dataSize, DT_TILE_FREE_DATA, tileHeader.tileRef, 0);
-	}
-	
-	fclose(fp);
-	
-	return mesh;
-}
-
-void Sample_TileMesh::handleSettings()
-{
-	Sample::handleCommonSettings();
-
-	if (imguiCheck("Keep Itermediate Results", m_keepInterResults))
-		m_keepInterResults = !m_keepInterResults;
-
-	if (imguiCheck("Build All Tiles", m_buildAll))
-		m_buildAll = !m_buildAll;
-	
-	imguiLabel("Tiling");
-	imguiSlider("TileSize", &m_tileSize, 16.0f, 1024.0f, 16.0f);
-	
-	if (m_geom)
-	{
-		const float* bmin = m_geom->getMeshBoundsMin();
-		const float* bmax = m_geom->getMeshBoundsMax();
-		char text[64];
-		int gw = 0, gh = 0;
-		rcCalcGridSize(bmin, bmax, m_cellSize, &gw, &gh);
-		const int ts = (int)m_tileSize;
-		const int tw = (gw + ts-1) / ts;
-		const int th = (gh + ts-1) / ts;
-		snprintf(text, 64, "Tiles  %d x %d", tw, th);
-		imguiValue(text);
-
-		// Max tiles and max polys affect how the tile IDs are caculated.
-		// There are 22 bits available for identifying a tile and a polygon.
-		int tileBits = rcMin((int)ilog2(nextPow2(tw*th)), 14);
-		if (tileBits > 14) tileBits = 14;
-		int polyBits = 22 - tileBits;
-		m_maxTiles = 1 << tileBits;
-		m_maxPolysPerTile = 1 << polyBits;
-		snprintf(text, 64, "Max Tiles  %d", m_maxTiles);
-		imguiValue(text);
-		snprintf(text, 64, "Max Polys  %d", m_maxPolysPerTile);
-		imguiValue(text);
-	}
-	else
-	{
-		m_maxTiles = 0;
-		m_maxPolysPerTile = 0;
-	}
-	
-	imguiSeparator();
-	
-	imguiIndent();
-	imguiIndent();
-	
-	if (imguiButton("Save"))
-	{
-		saveAll("all_tiles_navmesh.bin", m_navMesh);
-	}
-
-	if (imguiButton("Load"))
-	{
-		dtFreeNavMesh(m_navMesh);
-		m_navMesh = loadAll("all_tiles_navmesh.bin");
-		m_navQuery->init(m_navMesh, 2048);
-	}
-
-	imguiUnindent();
-	imguiUnindent();
-	
-	char msg[64];
-	snprintf(msg, 64, "Build Time: %.1fms", m_totalBuildTimeMs);
-	imguiLabel(msg);
-	
-	imguiSeparator();
-	
-	imguiSeparator();
-	
-}
-
-void Sample_TileMesh::handleTools()
-{
-	int type = !m_tool ? TOOL_NONE : m_tool->type();
-
-	if (imguiCheck("Test Navmesh", type == TOOL_NAVMESH_TESTER))
-	{
-		setTool(new NavMeshTesterTool);
-	}
-	if (imguiCheck("Create Tiles", type == TOOL_TILE_EDIT))
-	{
-		setTool(new NavMeshTileTool);
-	}
-	if (imguiCheck("Create Off-Mesh Links", type == TOOL_OFFMESH_CONNECTION))
-	{
-		setTool(new OffMeshConnectionTool);
-	}
-	if (imguiCheck("Create Convex Volumes", type == TOOL_CONVEX_VOLUME))
-	{
-		setTool(new ConvexVolumeTool);
-	}
-	if (imguiCheck("Create Crowds", type == TOOL_CROWD))
-	{
-		setTool(new CrowdTool);
-	}
-	
-	imguiSeparatorLine();
-
-	imguiIndent();
-
-	if (m_tool)
-		m_tool->handleMenu();
-
-	imguiUnindent();
-}
-
-void Sample_TileMesh::handleDebugMode()
-{
-	// Check which modes are valid.
-	bool valid[MAX_DRAWMODE];
-	for (int i = 0; i < MAX_DRAWMODE; ++i)
-		valid[i] = false;
-	
-	if (m_geom)
-	{
-		valid[DRAWMODE_NAVMESH] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_TRANS] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_BVTREE] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_NODES] = m_navQuery != 0;
-		valid[DRAWMODE_NAVMESH_PORTALS] = m_navMesh != 0;
-		valid[DRAWMODE_NAVMESH_INVIS] = m_navMesh != 0;
-		valid[DRAWMODE_MESH] = true;
-		valid[DRAWMODE_VOXELS] = m_solid != 0;
-		valid[DRAWMODE_VOXELS_WALKABLE] = m_solid != 0;
-		valid[DRAWMODE_COMPACT] = m_chf != 0;
-		valid[DRAWMODE_COMPACT_DISTANCE] = m_chf != 0;
-		valid[DRAWMODE_COMPACT_REGIONS] = m_chf != 0;
-		valid[DRAWMODE_REGION_CONNECTIONS] = m_cset != 0;
-		valid[DRAWMODE_RAW_CONTOURS] = m_cset != 0;
-		valid[DRAWMODE_BOTH_CONTOURS] = m_cset != 0;
-		valid[DRAWMODE_CONTOURS] = m_cset != 0;
-		valid[DRAWMODE_POLYMESH] = m_pmesh != 0;
-		valid[DRAWMODE_POLYMESH_DETAIL] = m_dmesh != 0;
-	}
-	
-	int unavail = 0;
-	for (int i = 0; i < MAX_DRAWMODE; ++i)
-		if (!valid[i]) unavail++;
-	
-	if (unavail == MAX_DRAWMODE)
-		return;
-	
-	imguiLabel("Draw");
-	if (imguiCheck("Input Mesh", m_drawMode == DRAWMODE_MESH, valid[DRAWMODE_MESH]))
-		m_drawMode = DRAWMODE_MESH;
-	if (imguiCheck("Navmesh", m_drawMode == DRAWMODE_NAVMESH, valid[DRAWMODE_NAVMESH]))
-		m_drawMode = DRAWMODE_NAVMESH;
-	if (imguiCheck("Navmesh Invis", m_drawMode == DRAWMODE_NAVMESH_INVIS, valid[DRAWMODE_NAVMESH_INVIS]))
-		m_drawMode = DRAWMODE_NAVMESH_INVIS;
-	if (imguiCheck("Navmesh Trans", m_drawMode == DRAWMODE_NAVMESH_TRANS, valid[DRAWMODE_NAVMESH_TRANS]))
-		m_drawMode = DRAWMODE_NAVMESH_TRANS;
-	if (imguiCheck("Navmesh BVTree", m_drawMode == DRAWMODE_NAVMESH_BVTREE, valid[DRAWMODE_NAVMESH_BVTREE]))
-		m_drawMode = DRAWMODE_NAVMESH_BVTREE;
-	if (imguiCheck("Navmesh Nodes", m_drawMode == DRAWMODE_NAVMESH_NODES, valid[DRAWMODE_NAVMESH_NODES]))
-		m_drawMode = DRAWMODE_NAVMESH_NODES;
-	if (imguiCheck("Navmesh Portals", m_drawMode == DRAWMODE_NAVMESH_PORTALS, valid[DRAWMODE_NAVMESH_PORTALS]))
-		m_drawMode = DRAWMODE_NAVMESH_PORTALS;
-	if (imguiCheck("Voxels", m_drawMode == DRAWMODE_VOXELS, valid[DRAWMODE_VOXELS]))
-		m_drawMode = DRAWMODE_VOXELS;
-	if (imguiCheck("Walkable Voxels", m_drawMode == DRAWMODE_VOXELS_WALKABLE, valid[DRAWMODE_VOXELS_WALKABLE]))
-		m_drawMode = DRAWMODE_VOXELS_WALKABLE;
-	if (imguiCheck("Compact", m_drawMode == DRAWMODE_COMPACT, valid[DRAWMODE_COMPACT]))
-		m_drawMode = DRAWMODE_COMPACT;
-	if (imguiCheck("Compact Distance", m_drawMode == DRAWMODE_COMPACT_DISTANCE, valid[DRAWMODE_COMPACT_DISTANCE]))
-		m_drawMode = DRAWMODE_COMPACT_DISTANCE;
-	if (imguiCheck("Compact Regions", m_drawMode == DRAWMODE_COMPACT_REGIONS, valid[DRAWMODE_COMPACT_REGIONS]))
-		m_drawMode = DRAWMODE_COMPACT_REGIONS;
-	if (imguiCheck("Region Connections", m_drawMode == DRAWMODE_REGION_CONNECTIONS, valid[DRAWMODE_REGION_CONNECTIONS]))
-		m_drawMode = DRAWMODE_REGION_CONNECTIONS;
-	if (imguiCheck("Raw Contours", m_drawMode == DRAWMODE_RAW_CONTOURS, valid[DRAWMODE_RAW_CONTOURS]))
-		m_drawMode = DRAWMODE_RAW_CONTOURS;
-	if (imguiCheck("Both Contours", m_drawMode == DRAWMODE_BOTH_CONTOURS, valid[DRAWMODE_BOTH_CONTOURS]))
-		m_drawMode = DRAWMODE_BOTH_CONTOURS;
-	if (imguiCheck("Contours", m_drawMode == DRAWMODE_CONTOURS, valid[DRAWMODE_CONTOURS]))
-		m_drawMode = DRAWMODE_CONTOURS;
-	if (imguiCheck("Poly Mesh", m_drawMode == DRAWMODE_POLYMESH, valid[DRAWMODE_POLYMESH]))
-		m_drawMode = DRAWMODE_POLYMESH;
-	if (imguiCheck("Poly Mesh Detail", m_drawMode == DRAWMODE_POLYMESH_DETAIL, valid[DRAWMODE_POLYMESH_DETAIL]))
-		m_drawMode = DRAWMODE_POLYMESH_DETAIL;
-	
-	if (unavail)
-	{
-		imguiValue("Tick 'Keep Itermediate Results'");
-		imguiValue("rebuild some tiles to see");
-		imguiValue("more debug mode options.");
-	}
-}
-
-void Sample_TileMesh::handleRender()
-{
-	if (!m_geom || !m_geom->getMesh())
-		return;
-	
-	DebugDrawGL dd;
-
-	// Draw mesh
-	if (m_drawMode == DRAWMODE_MESH)
-	{
-		// Draw mesh
-		duDebugDrawTriMeshSlope(&dd, m_geom->getMesh()->getVerts(), m_geom->getMesh()->getVertCount(),
-								m_geom->getMesh()->getTris(), m_geom->getMesh()->getNormals(), m_geom->getMesh()->getTriCount(),
-								m_agentMaxSlope);
-		m_geom->drawOffMeshConnections(&dd);
-	}
-	else if (m_drawMode != DRAWMODE_NAVMESH_TRANS)
-	{
-		// Draw mesh
-		duDebugDrawTriMesh(&dd, m_geom->getMesh()->getVerts(), m_geom->getMesh()->getVertCount(),
-						   m_geom->getMesh()->getTris(), m_geom->getMesh()->getNormals(), m_geom->getMesh()->getTriCount(), 0);
-		m_geom->drawOffMeshConnections(&dd);
-	}
-	
-/*	duDebugDrawTriMesh(&dd, m_geom->getMesh()->getVerts(), m_geom->getMesh()->getVertCount(),
-					   m_geom->getMesh()->getTris(), m_geom->getMesh()->getNormals(), m_geom->getMesh()->getTriCount(), 0);
-	m_geom->drawOffMeshConnections(&dd);*/
-	
-	glDepthMask(GL_FALSE);
-	
-	// Draw bounds
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float* bmax = m_geom->getMeshBoundsMax();
-	duDebugDrawBoxWire(&dd, bmin[0],bmin[1],bmin[2], bmax[0],bmax[1],bmax[2], duRGBA(255,255,255,128), 1.0f);
-	
-	// Tiling grid.
-	int gw = 0, gh = 0;
-	rcCalcGridSize(bmin, bmax, m_cellSize, &gw, &gh);
-	const int tw = (gw + (int)m_tileSize-1) / (int)m_tileSize;
-	const int th = (gh + (int)m_tileSize-1) / (int)m_tileSize;
-	const float s = m_tileSize*m_cellSize;
-	duDebugDrawGridXZ(&dd, bmin[0],bmin[1],bmin[2], tw,th, s, duRGBA(0,0,0,64), 1.0f);
-	
-	// Draw active tile
-	duDebugDrawBoxWire(&dd, m_tileBmin[0],m_tileBmin[1],m_tileBmin[2], m_tileBmax[0],m_tileBmax[1],m_tileBmax[2], m_tileCol, 2.0f);
-	
-/*	if (m_navMesh)
-	{
-		duDebugDrawNavMeshWithClosedList(&dd, *m_navMesh, *m_navQuery, m_navMeshDrawFlags);
-		if (m_drawPortals)
-			duDebugDrawNavMeshPortals(&dd, *m_navMesh);
-	}*/
-	
-	if (m_navMesh && m_navQuery &&
-		(m_drawMode == DRAWMODE_NAVMESH ||
-		 m_drawMode == DRAWMODE_NAVMESH_TRANS ||
-		 m_drawMode == DRAWMODE_NAVMESH_BVTREE ||
-		 m_drawMode == DRAWMODE_NAVMESH_NODES ||
-		 m_drawMode == DRAWMODE_NAVMESH_PORTALS ||
-		 m_drawMode == DRAWMODE_NAVMESH_INVIS))
-	{
-		if (m_drawMode != DRAWMODE_NAVMESH_INVIS)
-			duDebugDrawNavMeshWithClosedList(&dd, *m_navMesh, *m_navQuery, m_navMeshDrawFlags);
-		if (m_drawMode == DRAWMODE_NAVMESH_BVTREE)
-			duDebugDrawNavMeshBVTree(&dd, *m_navMesh);
-		if (m_drawMode == DRAWMODE_NAVMESH_PORTALS)
-			duDebugDrawNavMeshPortals(&dd, *m_navMesh);
-		if (m_drawMode == DRAWMODE_NAVMESH_NODES)
-			duDebugDrawNavMeshNodes(&dd, *m_navQuery);
-	}
-	
-	
-	glDepthMask(GL_TRUE);
-	
-	if (m_chf && m_drawMode == DRAWMODE_COMPACT)
-		duDebugDrawCompactHeightfieldSolid(&dd, *m_chf);
-	
-	if (m_chf && m_drawMode == DRAWMODE_COMPACT_DISTANCE)
-		duDebugDrawCompactHeightfieldDistance(&dd, *m_chf);
-	if (m_chf && m_drawMode == DRAWMODE_COMPACT_REGIONS)
-		duDebugDrawCompactHeightfieldRegions(&dd, *m_chf);
-	if (m_solid && m_drawMode == DRAWMODE_VOXELS)
-	{
-		glEnable(GL_FOG);
-		duDebugDrawHeightfieldSolid(&dd, *m_solid);
-		glDisable(GL_FOG);
-	}
-	if (m_solid && m_drawMode == DRAWMODE_VOXELS_WALKABLE)
-	{
-		glEnable(GL_FOG);
-		duDebugDrawHeightfieldWalkable(&dd, *m_solid);
-		glDisable(GL_FOG);
-	}
-	if (m_cset && m_drawMode == DRAWMODE_RAW_CONTOURS)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawRawContours(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
-	}
-	if (m_cset && m_drawMode == DRAWMODE_BOTH_CONTOURS)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawRawContours(&dd, *m_cset, 0.5f);
-		duDebugDrawContours(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
-	}
-	if (m_cset && m_drawMode == DRAWMODE_CONTOURS)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawContours(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
-	}
-	if (m_chf && m_cset && m_drawMode == DRAWMODE_REGION_CONNECTIONS)
-	{
-		duDebugDrawCompactHeightfieldRegions(&dd, *m_chf);
-		
-		glDepthMask(GL_FALSE);
-		duDebugDrawRegionConnections(&dd, *m_cset);
-		glDepthMask(GL_TRUE);
-	}
-	if (m_pmesh && m_drawMode == DRAWMODE_POLYMESH)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawPolyMesh(&dd, *m_pmesh);
-		glDepthMask(GL_TRUE);
-	}
-	if (m_dmesh && m_drawMode == DRAWMODE_POLYMESH_DETAIL)
-	{
-		glDepthMask(GL_FALSE);
-		duDebugDrawPolyMeshDetail(&dd, *m_dmesh);
-		glDepthMask(GL_TRUE);
-	}
-	
-	m_geom->drawConvexVolumes(&dd);
-	
-	if (m_tool)
-		m_tool->handleRender();
-	
-	glDepthMask(GL_TRUE);
-}
-
-void Sample_TileMesh::handleRenderOverlay(double* proj, double* model, int* view)
-{
-	GLdouble x, y, z;
-	
-	// Draw start and end point labels
-	if (m_tileBuildTime > 0.0f && gluProject((GLdouble)(m_tileBmin[0]+m_tileBmax[0])/2, (GLdouble)(m_tileBmin[1]+m_tileBmax[1])/2, (GLdouble)(m_tileBmin[2]+m_tileBmax[2])/2,
-											 model, proj, view, &x, &y, &z))
-	{
-		char text[32];
-		snprintf(text,32,"%.3fms / %dTris / %.1fkB", m_tileBuildTime, m_tileTriCount, m_tileMemUsage);
-		imguiDrawText((int)x, (int)y-25, IMGUI_ALIGN_CENTER, text, imguiRGBA(0,0,0,220));
-	}
-	
-	if (m_tool)
-		m_tool->handleRenderOverlay(proj, model, view);
-}
-
-void Sample_TileMesh::handleMeshChanged(class InputGeom* geom)
-{
-	Sample::handleMeshChanged(geom);
-
-	cleanup();
-
-	dtFreeNavMesh(m_navMesh);
-	m_navMesh = 0;
-
-	if (m_tool)
-	{
-		m_tool->reset();
-		m_tool->init(this);
-	}
-}
-
-bool Sample_TileMesh::handleBuild()
-{
-	if (!m_geom || !m_geom->getMesh())
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: No vertices and triangles.");
-		return false;
-	}
-	
-	dtFreeNavMesh(m_navMesh);
-	
-	m_navMesh = dtAllocNavMesh();
-	if (!m_navMesh)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Could not allocate navmesh.");
-		return false;
-	}
-
-	dtNavMeshParams params;
-	rcVcopy(params.orig, m_geom->getMeshBoundsMin());
-	params.tileWidth = m_tileSize*m_cellSize;
-	params.tileHeight = m_tileSize*m_cellSize;
-	params.maxTiles = m_maxTiles;
-	params.maxPolys = m_maxPolysPerTile;
-	if (m_navMesh->init(&params) != DT_SUCCESS)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Could not init navmesh.");
-		return false;
-	}
-	
-	if (m_navQuery->init(m_navMesh, 2048) != DT_SUCCESS)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildTiledNavigation: Could not init Detour navmesh query");
-		return false;
-	}
-	
-	if (m_buildAll)
-		buildAllTiles();
-	
-	if (m_tool)
-		m_tool->init(this);
-
-	return true;
-}
-
-void Sample_TileMesh::buildTile(const float* pos)
-{
-	if (!m_geom) return;
-	if (!m_navMesh) return;
-		
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float* bmax = m_geom->getMeshBoundsMax();
-	
-	const float ts = m_tileSize*m_cellSize;
-	const int tx = (int)((pos[0] - bmin[0]) / ts);
-	const int ty = (int)((pos[2] - bmin[2]) / ts);
-	
-	m_tileBmin[0] = bmin[0] + tx*ts;
-	m_tileBmin[1] = bmin[1];
-	m_tileBmin[2] = bmin[2] + ty*ts;
-	
-	m_tileBmax[0] = bmin[0] + (tx+1)*ts;
-	m_tileBmax[1] = bmax[1];
-	m_tileBmax[2] = bmin[2] + (ty+1)*ts;
-	
-	m_tileCol = duRGBA(77,204,0,255);
-	
-	m_ctx->resetLog();
-	
-	int dataSize = 0;
-	unsigned char* data = buildTileMesh(tx, ty, m_tileBmin, m_tileBmax, dataSize);
-	
-	if (data)
-	{
-		// Remove any previous data (navmesh owns and deletes the data).
-		m_navMesh->removeTile(m_navMesh->getTileRefAt(tx,ty),0,0);
-		
-		// Let the navmesh own the data.
-		if (m_navMesh->addTile(data,dataSize,DT_TILE_FREE_DATA,0,0) != DT_SUCCESS)
-			dtFree(data);
-	}
-	
-	m_ctx->dumpLog("Build Tile (%d,%d):", tx,ty);
-}
-
-void Sample_TileMesh::getTilePos(const float* pos, int& tx, int& ty)
-{
-	if (!m_geom) return;
-	
-	const float* bmin = m_geom->getMeshBoundsMin();
-	
-	const float ts = m_tileSize*m_cellSize;
-	tx = (int)((pos[0] - bmin[0]) / ts);
-	ty = (int)((pos[2] - bmin[2]) / ts);
-}
-
-void Sample_TileMesh::removeTile(const float* pos)
-{
-	if (!m_geom) return;
-	if (!m_navMesh) return;
-	
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float* bmax = m_geom->getMeshBoundsMax();
-
-	const float ts = m_tileSize*m_cellSize;
-	const int tx = (int)((pos[0] - bmin[0]) / ts);
-	const int ty = (int)((pos[2] - bmin[2]) / ts);
-	
-	m_tileBmin[0] = bmin[0] + tx*ts;
-	m_tileBmin[1] = bmin[1];
-	m_tileBmin[2] = bmin[2] + ty*ts;
-	
-	m_tileBmax[0] = bmin[0] + (tx+1)*ts;
-	m_tileBmax[1] = bmax[1];
-	m_tileBmax[2] = bmin[2] + (ty+1)*ts;
-	
-	m_tileCol = duRGBA(204,25,0,255);
-	
-	m_navMesh->removeTile(m_navMesh->getTileRefAt(tx,ty),0,0);
-}
-
-void Sample_TileMesh::buildAllTiles()
-{
-	if (!m_geom) return;
-	if (!m_navMesh) return;
-	
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float* bmax = m_geom->getMeshBoundsMax();
-	int gw = 0, gh = 0;
-	rcCalcGridSize(bmin, bmax, m_cellSize, &gw, &gh);
-	const int ts = (int)m_tileSize;
-	const int tw = (gw + ts-1) / ts;
-	const int th = (gh + ts-1) / ts;
-	const float tcs = m_tileSize*m_cellSize;
-
-
-	// Start the build process.
-	m_ctx->startTimer(RC_TIMER_TEMP);
-
-	for (int y = 0; y < th; ++y)
-	{
-		for (int x = 0; x < tw; ++x)
-		{
-			m_tileBmin[0] = bmin[0] + x*tcs;
-			m_tileBmin[1] = bmin[1];
-			m_tileBmin[2] = bmin[2] + y*tcs;
-			
-			m_tileBmax[0] = bmin[0] + (x+1)*tcs;
-			m_tileBmax[1] = bmax[1];
-			m_tileBmax[2] = bmin[2] + (y+1)*tcs;
-			
-			int dataSize = 0;
-			unsigned char* data = buildTileMesh(x, y, m_tileBmin, m_tileBmax, dataSize);
-			if (data)
-			{
-				// Remove any previous data (navmesh owns and deletes the data).
-				m_navMesh->removeTile(m_navMesh->getTileRefAt(x,y),0,0);
-				// Let the navmesh own the data.
-				if (m_navMesh->addTile(data,dataSize,DT_TILE_FREE_DATA,0,0) != DT_SUCCESS)
-					dtFree(data);
-			}
-		}
-	}
-	
-	// Start the build process.	
-	m_ctx->startTimer(RC_TIMER_TEMP);
-
-	m_totalBuildTimeMs = m_ctx->getAccumulatedTime(RC_TIMER_TEMP)/1000.0f;
-}
-
-void Sample_TileMesh::removeAllTiles()
-{
-	const float* bmin = m_geom->getMeshBoundsMin();
-	const float* bmax = m_geom->getMeshBoundsMax();
-	int gw = 0, gh = 0;
-	rcCalcGridSize(bmin, bmax, m_cellSize, &gw, &gh);
-	const int ts = (int)m_tileSize;
-	const int tw = (gw + ts-1) / ts;
-	const int th = (gh + ts-1) / ts;
-	
-	for (int y = 0; y < th; ++y)
-		for (int x = 0; x < tw; ++x)
-			m_navMesh->removeTile(m_navMesh->getTileRefAt(x,y),0,0);
-}
-
-unsigned char* Sample_TileMesh::buildTileMesh(const int tx, const int ty, const float* bmin, const float* bmax, int& dataSize)
-{
-	if (!m_geom || !m_geom->getMesh() || !m_geom->getChunkyMesh())
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Input mesh is not specified.");
-		return 0;
-	}
-	
-	m_tileMemUsage = 0;
-	m_tileBuildTime = 0;
-	
-	cleanup();
-	
-	const float* verts = m_geom->getMesh()->getVerts();
-	const int nverts = m_geom->getMesh()->getVertCount();
-	const int ntris = m_geom->getMesh()->getTriCount();
-	const rcChunkyTriMesh* chunkyMesh = m_geom->getChunkyMesh();
-		
-	// Init build configuration from GUI
-	memset(&m_cfg, 0, sizeof(m_cfg));
-	m_cfg.cs = m_cellSize;
-	m_cfg.ch = m_cellHeight;
-	m_cfg.walkableSlopeAngle = m_agentMaxSlope;
-	m_cfg.walkableHeight = (int)ceilf(m_agentHeight / m_cfg.ch);
-	m_cfg.walkableClimb = (int)floorf(m_agentMaxClimb / m_cfg.ch);
-	m_cfg.walkableRadius = (int)ceilf(m_agentRadius / m_cfg.cs);
-	m_cfg.maxEdgeLen = (int)(m_edgeMaxLen / m_cellSize);
-	m_cfg.maxSimplificationError = m_edgeMaxError;
-	m_cfg.minRegionArea = (int)rcSqr(m_regionMinSize);		// Note: area = size*size
-	m_cfg.mergeRegionArea = (int)rcSqr(m_regionMergeSize);	// Note: area = size*size
-	m_cfg.maxVertsPerPoly = (int)m_vertsPerPoly;
-	m_cfg.tileSize = (int)m_tileSize;
-	m_cfg.borderSize = m_cfg.walkableRadius + 3; // Reserve enough padding.
-	m_cfg.width = m_cfg.tileSize + m_cfg.borderSize*2;
-	m_cfg.height = m_cfg.tileSize + m_cfg.borderSize*2;
-	m_cfg.detailSampleDist = m_detailSampleDist < 0.9f ? 0 : m_cellSize * m_detailSampleDist;
-	m_cfg.detailSampleMaxError = m_cellHeight * m_detailSampleMaxError;
-	
-	rcVcopy(m_cfg.bmin, bmin);
-	rcVcopy(m_cfg.bmax, bmax);
-	m_cfg.bmin[0] -= m_cfg.borderSize*m_cfg.cs;
-	m_cfg.bmin[2] -= m_cfg.borderSize*m_cfg.cs;
-	m_cfg.bmax[0] += m_cfg.borderSize*m_cfg.cs;
-	m_cfg.bmax[2] += m_cfg.borderSize*m_cfg.cs;
-	
-	// Reset build times gathering.
-	m_ctx->resetTimers();
-	
-	// Start the build process.
-	m_ctx->startTimer(RC_TIMER_TOTAL);
-	
-	m_ctx->log(RC_LOG_PROGRESS, "Building navigation:");
-	m_ctx->log(RC_LOG_PROGRESS, " - %d x %d cells", m_cfg.width, m_cfg.height);
-	m_ctx->log(RC_LOG_PROGRESS, " - %.1fK verts, %.1fK tris", nverts/1000.0f, ntris/1000.0f);
-	
-	// Allocate voxel heightfield where we rasterize our input data to.
-	m_solid = rcAllocHeightfield();
-	if (!m_solid)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'solid'.");
-		return 0;
-	}
-	if (!rcCreateHeightfield(m_ctx, *m_solid, m_cfg.width, m_cfg.height, m_cfg.bmin, m_cfg.bmax, m_cfg.cs, m_cfg.ch))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not create solid heightfield.");
-		return 0;
-	}
-	
-	// Allocate array that can hold triangle flags.
-	// If you have multiple meshes you need to process, allocate
-	// and array which can hold the max number of triangles you need to process.
-	m_triareas = new unsigned char[chunkyMesh->maxTrisPerChunk];
-	if (!m_triareas)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'm_triareas' (%d).", chunkyMesh->maxTrisPerChunk);
-		return 0;
-	}
-	
-	float tbmin[2], tbmax[2];
-	tbmin[0] = m_cfg.bmin[0];
-	tbmin[1] = m_cfg.bmin[2];
-	tbmax[0] = m_cfg.bmax[0];
-	tbmax[1] = m_cfg.bmax[2];
-	int cid[512];// TODO: Make grow when returning too many items.
-	const int ncid = rcGetChunksOverlappingRect(chunkyMesh, tbmin, tbmax, cid, 512);
-	if (!ncid)
-		return 0;
-	
-	m_tileTriCount = 0;
-	
-	for (int i = 0; i < ncid; ++i)
-	{
-		const rcChunkyTriMeshNode& node = chunkyMesh->nodes[cid[i]];
-		const int* tris = &chunkyMesh->tris[node.i*3];
-		const int ntris = node.n;
-		
-		m_tileTriCount += ntris;
-		
-		memset(m_triareas, 0, ntris*sizeof(unsigned char));
-		rcMarkWalkableTriangles(m_ctx, m_cfg.walkableSlopeAngle,
-								verts, nverts, tris, ntris, m_triareas);
-		
-		rcRasterizeTriangles(m_ctx, verts, nverts, tris, m_triareas, ntris, *m_solid, m_cfg.walkableClimb);
-	}
-	
-	if (!m_keepInterResults)
-	{
-		delete [] m_triareas;
-		m_triareas = 0;
-	}
-	
-	// Once all geometry is rasterized, we do initial pass of filtering to
-	// remove unwanted overhangs caused by the conservative rasterization
-	// as well as filter spans where the character cannot possibly stand.
-	rcFilterLowHangingWalkableObstacles(m_ctx, m_cfg.walkableClimb, *m_solid);
-	rcFilterLedgeSpans(m_ctx, m_cfg.walkableHeight, m_cfg.walkableClimb, *m_solid);
-	rcFilterWalkableLowHeightSpans(m_ctx, m_cfg.walkableHeight, *m_solid);
-	
-	// Compact the heightfield so that it is faster to handle from now on.
-	// This will result more cache coherent data as well as the neighbours
-	// between walkable cells will be calculated.
-	m_chf = rcAllocCompactHeightfield();
-	if (!m_chf)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'chf'.");
-		return 0;
-	}
-	if (!rcBuildCompactHeightfield(m_ctx, m_cfg.walkableHeight, m_cfg.walkableClimb, *m_solid, *m_chf))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not build compact data.");
-		return 0;
-	}
-	
-	if (!m_keepInterResults)
-	{
-		rcFreeHeightField(m_solid);
-		m_solid = 0;
-	}
-
-	// Erode the walkable area by agent radius.
-	if (!rcErodeWalkableArea(m_ctx, m_cfg.walkableRadius, *m_chf))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not erode.");
-		return false;
-	}
-
-	// (Optional) Mark areas.
-	const ConvexVolume* vols = m_geom->getConvexVolumes();
-	for (int i  = 0; i < m_geom->getConvexVolumeCount(); ++i)
-		rcMarkConvexPolyArea(m_ctx, vols[i].verts, vols[i].nverts, vols[i].hmin, vols[i].hmax, (unsigned char)vols[i].area, *m_chf);
-	
-	// Prepare for region partitioning, by calculating distance field along the walkable surface.
-	if (!rcBuildDistanceField(m_ctx, *m_chf))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not build distance field.");
-		return 0;
-	}
-	
-	// Partition the walkable surface into simple regions without holes.
-	if (!rcBuildRegions(m_ctx, *m_chf, m_cfg.borderSize, m_cfg.minRegionArea, m_cfg.mergeRegionArea))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not build regions.");
-		return 0;
-	}
- 
-	// Create contours.
-	m_cset = rcAllocContourSet();
-	if (!m_cset)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'cset'.");
-		return 0;
-	}
-	if (!rcBuildContours(m_ctx, *m_chf, m_cfg.maxSimplificationError, m_cfg.maxEdgeLen, *m_cset))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not create contours.");
-		return 0;
-	}
-	
-	if (m_cset->nconts == 0)
-	{
-		return 0;
-	}
-	
-	// Build polygon navmesh from the contours.
-	m_pmesh = rcAllocPolyMesh();
-	if (!m_pmesh)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'pmesh'.");
-		return 0;
-	}
-	if (!rcBuildPolyMesh(m_ctx, *m_cset, m_cfg.maxVertsPerPoly, *m_pmesh))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could not triangulate contours.");
-		return 0;
-	}
-	
-	// Build detail mesh.
-	m_dmesh = rcAllocPolyMeshDetail();
-	if (!m_dmesh)
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Out of memory 'dmesh'.");
-		return 0;
-	}
-	
-	if (!rcBuildPolyMeshDetail(m_ctx, *m_pmesh, *m_chf,
-							   m_cfg.detailSampleDist, m_cfg.detailSampleMaxError,
-							   *m_dmesh))
-	{
-		m_ctx->log(RC_LOG_ERROR, "buildNavigation: Could build polymesh detail.");
-		return 0;
-	}
-	
-	if (!m_keepInterResults)
-	{
-		rcFreeCompactHeightfield(m_chf);
-		m_chf = 0;
-		rcFreeContourSet(m_cset);
-		m_cset = 0;
-	}
-	
-	unsigned char* navData = 0;
-	int navDataSize = 0;
-	if (m_cfg.maxVertsPerPoly <= DT_VERTS_PER_POLYGON)
-	{
-		// Remove padding from the polymesh data. TODO: Remove this odditity.
-		for (int i = 0; i < m_pmesh->nverts; ++i)
-		{
-			unsigned short* v = &m_pmesh->verts[i*3];
-			v[0] -= (unsigned short)m_cfg.borderSize;
-			v[2] -= (unsigned short)m_cfg.borderSize;
-		}
-		
-		if (m_pmesh->nverts >= 0xffff)
-		{
-			// The vertex indices are ushorts, and cannot point to more than 0xffff vertices.
-			m_ctx->log(RC_LOG_ERROR, "Too many vertices per tile %d (max: %d).", m_pmesh->nverts, 0xffff);
-			return false;
-		}
-		
-		// Update poly flags from areas.
-		for (int i = 0; i < m_pmesh->npolys; ++i)
-		{
-			if (m_pmesh->areas[i] == RC_WALKABLE_AREA)
-				m_pmesh->areas[i] = SAMPLE_POLYAREA_GROUND;
-			
-			if (m_pmesh->areas[i] == SAMPLE_POLYAREA_GROUND ||
-				m_pmesh->areas[i] == SAMPLE_POLYAREA_GRASS ||
-				m_pmesh->areas[i] == SAMPLE_POLYAREA_ROAD)
-			{
-				m_pmesh->flags[i] = SAMPLE_POLYFLAGS_WALK;
-			}
-			else if (m_pmesh->areas[i] == SAMPLE_POLYAREA_WATER)
-			{
-				m_pmesh->flags[i] = SAMPLE_POLYFLAGS_SWIM;
-			}
-			else if (m_pmesh->areas[i] == SAMPLE_POLYAREA_DOOR)
-			{
-				m_pmesh->flags[i] = SAMPLE_POLYFLAGS_WALK | SAMPLE_POLYFLAGS_DOOR;
-			}
-		}
-		
-		dtNavMeshCreateParams params;
-		memset(&params, 0, sizeof(params));
-		params.verts = m_pmesh->verts;
-		params.vertCount = m_pmesh->nverts;
-		params.polys = m_pmesh->polys;
-		params.polyAreas = m_pmesh->areas;
-		params.polyFlags = m_pmesh->flags;
-		params.polyCount = m_pmesh->npolys;
-		params.nvp = m_pmesh->nvp;
-		params.detailMeshes = m_dmesh->meshes;
-		params.detailVerts = m_dmesh->verts;
-		params.detailVertsCount = m_dmesh->nverts;
-		params.detailTris = m_dmesh->tris;
-		params.detailTriCount = m_dmesh->ntris;
-		params.offMeshConVerts = m_geom->getOffMeshConnectionVerts();
-		params.offMeshConRad = m_geom->getOffMeshConnectionRads();
-		params.offMeshConDir = m_geom->getOffMeshConnectionDirs();
-		params.offMeshConAreas = m_geom->getOffMeshConnectionAreas();
-		params.offMeshConFlags = m_geom->getOffMeshConnectionFlags();
-		params.offMeshConUserID = m_geom->getOffMeshConnectionId();
-		params.offMeshConCount = m_geom->getOffMeshConnectionCount();
-		params.walkableHeight = m_agentHeight;
-		params.walkableRadius = m_agentRadius;
-		params.walkableClimb = m_agentMaxClimb;
-		params.tileX = tx;
-		params.tileY = ty;
-		rcVcopy(params.bmin, bmin);
-		rcVcopy(params.bmax, bmax);
-		params.cs = m_cfg.cs;
-		params.ch = m_cfg.ch;
-		params.tileSize = m_cfg.tileSize;
-		
-		if (!dtCreateNavMeshData(&params, &navData, &navDataSize))
-		{
-			m_ctx->log(RC_LOG_ERROR, "Could not build Detour navmesh.");
-			return 0;
-		}
-		
-		// Restore padding so that the debug visualization is correct.
-		for (int i = 0; i < m_pmesh->nverts; ++i)
-		{
-			unsigned short* v = &m_pmesh->verts[i*3];
-			v[0] += (unsigned short)m_cfg.borderSize;
-			v[2] += (unsigned short)m_cfg.borderSize;
-		}
-		
-	}
-	m_tileMemUsage = navDataSize/1024.0f;
-	
-	m_ctx->stopTimer(RC_TIMER_TOTAL);
-	
-	// Show performance stats.
-	duLogBuildTimes(*m_ctx, m_ctx->getAccumulatedTime(RC_TIMER_TOTAL));
-	m_ctx->log(RC_LOG_PROGRESS, ">> Polymesh: %d vertices  %d polygons", m_pmesh->nverts, m_pmesh->npolys);
-	
-	m_tileBuildTime = m_ctx->getAccumulatedTime(RC_TIMER_TOTAL)/1000.0f;
-
-	dataSize = navDataSize;
-	return navData;
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/SlideShow.cpp b/dep/recastnavigation/RecastDemo/Source/SlideShow.cpp
deleted file mode 100644
index 65b2dcfe973..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/SlideShow.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include "SlideShow.h"
-#include <string.h>
-#include <stdio.h>
-#include <SDL_opengl.h>
-//#define STBI_HEADER_FILE_ONLY
-#include "stb_image.h"
-
-SlideShow::SlideShow() :
-	m_width(0),
-	m_height(0),
-	m_texId(0),
-	m_showCurSlide(true),
-	m_slideAlpha(1.0f),
-	m_curSlide(-1),
-	m_nextSlide(0)
-{
-}
-
-SlideShow::~SlideShow()
-{
-	purgeImage();
-}
-
-void SlideShow::purgeImage()
-{
-	if (m_texId)
-	{
-		glDeleteTextures(1, (GLuint*)&m_texId);
-		m_texId = 0;
-		m_width = 0;
-		m_height = 0;
-	}
-}
-
-bool SlideShow::loadImage(const char* path)
-{
-	purgeImage();
-	
-	int bpp;
-	unsigned char* data = stbi_load(path, &m_width, &m_height, &bpp, 4);
-	if (!data)
-	{
-		printf("Could not load file '%s': %s\n", path, stbi_failure_reason());
-		return false;
-	}
-	
-	glGenTextures(1, (GLuint*)&m_texId);
-	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, m_texId);
-	glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, m_width, m_height, 0,
-				 GL_RGBA, GL_UNSIGNED_BYTE, data);
-	
-	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	
-	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	
-	stbi_image_free(data);
-	
-	return true;
-}
-
-bool SlideShow::init(const char* path)
-{
-	strcpy(m_path, path);
-	scanDirectory(m_path, ".png", m_files);
-	
-	return true;
-}
-
-void SlideShow::nextSlide()
-{
-	setSlide(m_nextSlide+1);
-}
-
-void SlideShow::prevSlide()
-{
-	setSlide(m_nextSlide-1);
-}
-
-void SlideShow::setSlide(int n)
-{
-	const int maxIdx = m_files.size ? m_files.size-1 : 0;
-	m_nextSlide = n;
-	if (m_nextSlide < 0) m_nextSlide = 0;
-	if (m_nextSlide > maxIdx) m_nextSlide = maxIdx; 
-}
-
-void SlideShow::updateAndDraw(float dt, const float w, const float h)
-{
-	float slideAlphaTarget = (m_showCurSlide && m_texId) ? 1.0f : 0.0f;
-	if (m_curSlide != m_nextSlide)
-		slideAlphaTarget = 0;
-	
-	if (slideAlphaTarget > m_slideAlpha)
-		m_slideAlpha += dt*4;
-	else if (slideAlphaTarget < m_slideAlpha)
-		m_slideAlpha -= dt*4;
-	if (m_slideAlpha < 0) m_slideAlpha = 0;
-	if (m_slideAlpha > 1) m_slideAlpha = 1; 
-	
-	if (m_curSlide != m_nextSlide && m_slideAlpha < 0.01f)
-	{
-		m_curSlide = m_nextSlide;
-		if (m_curSlide >= 0 && m_curSlide < m_files.size)
-		{
-			char path[256];
-			strcpy(path, m_path);
-			strcat(path, m_files.files[m_curSlide]);
-			loadImage(path);
-		}
-	}
-	
-	if (m_slideAlpha > 0.01f && m_texId)
-	{
-		unsigned char alpha = (unsigned char)(m_slideAlpha*255.0f);
-		
-		glEnable(GL_TEXTURE_RECTANGLE_ARB);
-		glBindTexture(GL_TEXTURE_RECTANGLE_ARB, m_texId);
-		
-		const float tw = (float)m_width;
-		const float th = (float)m_height;
-		const float hw = w*0.5f;
-		const float hh = h*0.5f;
-		
-		glColor4ub(255,255,255,alpha);
-		glBegin(GL_QUADS);
-		glTexCoord2f(0,th);
-		glVertex2f(hw-tw/2,hh-th/2);
-		glTexCoord2f(tw,th);
-		glVertex2f(hw+tw/2,hh-th/2);
-		glTexCoord2f(tw,0);
-		glVertex2f(hw+tw/2,hh+th/2);
-		glTexCoord2f(0,0);
-		glVertex2f(hw-tw/2,hh+th/2);
-		glEnd();
-		
-		glDisable(GL_TEXTURE_RECTANGLE_ARB);
-	}
-	
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/TestCase.cpp b/dep/recastnavigation/RecastDemo/Source/TestCase.cpp
deleted file mode 100644
index 95293f506c3..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/TestCase.cpp
+++ /dev/null
@@ -1,353 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <math.h>
-#include "TestCase.h"
-#include "DetourNavMesh.h"
-#include "DetourNavMeshQuery.h"
-#include "DetourCommon.h"
-#include "SDL.h"
-#include "SDL_opengl.h"
-#include "imgui.h"
-#include "PerfTimer.h"
-
-#ifdef WIN32
-#define snprintf _snprintf
-#endif
-
-TestCase::TestCase() :
-	m_tests(0)
-{
-}
-
-TestCase::~TestCase()
-{
-	Test* iter = m_tests;
-	while (iter)
-	{
-		Test* next = iter->next;
-		delete iter;
-		iter = next;
-	}
-}
-
-
-static char* parseRow(char* buf, char* bufEnd, char* row, int len)
-{
-	bool start = true;
-	bool done = false;
-	int n = 0;
-	while (!done && buf < bufEnd)
-	{
-		char c = *buf;
-		buf++;
-		// multirow
-		switch (c)
-		{
-			case '\n':
-				if (start) break;
-				done = true;
-				break;
-			case '\r':
-				break;
-			case '\t':
-			case ' ':
-				if (start) break;
-			default:
-				start = false;
-				row[n++] = c;
-				if (n >= len-1)
-					done = true;
-				break;
-		}
-	}
-	row[n] = '\0';
-	return buf;
-}
-
-static void copyName(char* dst, const char* src)
-{
-	// Skip white spaces
-	while (*src && isspace(*src))
-		src++;
-	strcpy(dst, src);
-}
-
-bool TestCase::load(const char* filePath)
-{
-	char* buf = 0;
-	FILE* fp = fopen(filePath, "rb");
-	if (!fp)
-		return false;
-	fseek(fp, 0, SEEK_END);
-	int bufSize = ftell(fp);
-	fseek(fp, 0, SEEK_SET);
-	buf = new char[bufSize];
-	if (!buf)
-	{
-		fclose(fp);
-		return false;
-	}
-	fread(buf, bufSize, 1, fp);
-	fclose(fp);
-
-	char* src = buf;
-	char* srcEnd = buf + bufSize;
-	char row[512];
-	while (src < srcEnd)
-	{
-		// Parse one row
-		row[0] = '\0';
-		src = parseRow(src, srcEnd, row, sizeof(row)/sizeof(char));
-		if (row[0] == 's')
-		{
-			// Sample name.
-			copyName(m_sampleName, row+1);
-		}
-		else if (row[0] == 'f')
-		{
-			// File name.
-			copyName(m_geomFileName, row+1);
-		}
-		else if (row[0] == 'p' && row[1] == 'f')
-		{
-			// Pathfind test.
-			Test* test = new Test;
-			memset(test, 0, sizeof(Test));
-			test->type = TEST_PATHFIND;
-			test->expand = false;
-			test->next = m_tests;
-			m_tests = test;
-			sscanf(row+2, "%f %f %f %f %f %f %x %x",
-				   &test->spos[0], &test->spos[1], &test->spos[2],
-				   &test->epos[0], &test->epos[1], &test->epos[2],
-				   &test->includeFlags, &test->excludeFlags);
-		}
-	}
-	
-	delete [] buf;
-
-	return true;
-}
-		
-void TestCase::resetTimes()
-{
-	for (Test* iter = m_tests; iter; iter = iter->next)
-	{
-		iter->findNearestPolyTime = 0;
-		iter->findPathTime = 0;
-		iter->findStraightPathTime = 0;
-	}
-}
-
-void TestCase::doTests(dtNavMesh* navmesh, dtNavMeshQuery* navquery)
-{
-	if (!navmesh || !navquery)
-		return;
-	
-	resetTimes();
-	
-	static const int MAX_POLYS = 256;
-	dtPolyRef polys[MAX_POLYS];
-	float straight[MAX_POLYS*3];
-	const float polyPickExt[3] = {2,4,2};
-	
-	for (Test* iter = m_tests; iter; iter = iter->next)
-	{
-		delete [] iter->polys;
-		iter->polys = 0;
-		iter->npolys = 0;
-		delete [] iter->straight;
-		iter->straight = 0;
-		iter->nstraight = 0;
-		
-		dtQueryFilter filter;
-		filter.setIncludeFlags((unsigned short)iter->includeFlags);
-		filter.setExcludeFlags((unsigned short)iter->excludeFlags);
-	
-		// Find start points
-		TimeVal findNearestPolyStart = getPerfTime();
-		
-		dtPolyRef startRef, endRef;
-		navquery->findNearestPoly(iter->spos, polyPickExt, &filter, &startRef, 0);
-		navquery->findNearestPoly(iter->epos, polyPickExt, &filter, &endRef, 0);
-
-		TimeVal findNearestPolyEnd = getPerfTime();
-		iter->findNearestPolyTime += getPerfDeltaTimeUsec(findNearestPolyStart, findNearestPolyEnd);
-
-		if (!startRef || ! endRef)
-			continue;
-	
-		// Find path
-		TimeVal findPathStart = getPerfTime();
-
-		navquery->findPath(startRef, endRef, iter->spos, iter->epos, &filter, polys, &iter->npolys, MAX_POLYS);
-		
-		TimeVal findPathEnd = getPerfTime();
-		iter->findPathTime += getPerfDeltaTimeUsec(findPathStart, findPathEnd);
-		
-		// Find straight path
-		if (iter->npolys)
-		{
-			TimeVal findStraightPathStart = getPerfTime();
-			
-			navquery->findStraightPath(iter->spos, iter->epos, polys, iter->npolys,
-									   straight, 0, 0, &iter->nstraight, MAX_POLYS);
-			TimeVal findStraightPathEnd = getPerfTime();
-			iter->findStraightPathTime += getPerfDeltaTimeUsec(findStraightPathStart, findStraightPathEnd);
-		}
-		
-		// Copy results
-		if (iter->npolys)
-		{
-			iter->polys = new dtPolyRef[iter->npolys];
-			memcpy(iter->polys, polys, sizeof(dtPolyRef)*iter->npolys);
-		}
-		if (iter->nstraight)
-		{
-			iter->straight = new float[iter->nstraight*3];
-			memcpy(iter->straight, straight, sizeof(float)*3*iter->nstraight);
-		}
-	}
-
-
-	printf("Test Results:\n");
-	int n = 0;
-	for (Test* iter = m_tests; iter; iter = iter->next)
-	{
-		const int total = iter->findNearestPolyTime + iter->findPathTime + iter->findStraightPathTime;
-		printf(" - Path %02d:     %.4f ms\n", n, (float)total/1000.0f);
-		printf("    - poly:     %.4f ms\n", (float)iter->findNearestPolyTime/1000.0f);
-		printf("    - path:     %.4f ms\n", (float)iter->findPathTime/1000.0f);
-		printf("    - straight: %.4f ms\n", (float)iter->findStraightPathTime/1000.0f);
-		n++;
-	}
-}
-
-void TestCase::handleRender()
-{
-	glLineWidth(2.0f);
-	glBegin(GL_LINES);
-	for (Test* iter = m_tests; iter; iter = iter->next)
-	{
-		float dir[3];
-		dtVsub(dir, iter->epos, iter->spos);
-		dtVnormalize(dir);
-		glColor4ub(128,25,0,192);
-		glVertex3f(iter->spos[0],iter->spos[1]-0.3f,iter->spos[2]);
-		glVertex3f(iter->spos[0],iter->spos[1]+0.3f,iter->spos[2]);
-		glVertex3f(iter->spos[0],iter->spos[1]+0.3f,iter->spos[2]);
-		glVertex3f(iter->spos[0]+dir[0]*0.3f,iter->spos[1]+0.3f+dir[1]*0.3f,iter->spos[2]+dir[2]*0.3f);
-		glColor4ub(51,102,0,129);
-		glVertex3f(iter->epos[0],iter->epos[1]-0.3f,iter->epos[2]);
-		glVertex3f(iter->epos[0],iter->epos[1]+0.3f,iter->epos[2]);
-		
-		if (iter->expand)
-			glColor4ub(255,192,0,255);
-		else
-			glColor4ub(0,0,0,64);
-			
-		for (int i = 0; i < iter->nstraight-1; ++i)
-		{
-			glVertex3f(iter->straight[i*3+0],iter->straight[i*3+1]+0.3f,iter->straight[i*3+2]);
-			glVertex3f(iter->straight[(i+1)*3+0],iter->straight[(i+1)*3+1]+0.3f,iter->straight[(i+1)*3+2]);
-		}
-	}
-	glEnd();
-	glLineWidth(1.0f);
-}
-
-bool TestCase::handleRenderOverlay(double* proj, double* model, int* view)
-{
-	GLdouble x, y, z;
-	char text[64], subtext[64];
-	int n = 0;
-
-	static const float LABEL_DIST = 1.0f;
-
-	for (Test* iter = m_tests; iter; iter = iter->next)
-	{
-		float pt[3], dir[3];
-		if (iter->nstraight)
-		{
-			dtVcopy(pt, &iter->straight[3]);
-			if (dtVdist(pt, iter->spos) > LABEL_DIST)
-			{
-				dtVsub(dir, pt, iter->spos);
-				dtVnormalize(dir);
-				dtVmad(pt, iter->spos, dir, LABEL_DIST);
-			}
-			pt[1]+=0.5f;
-		}
-		else
-		{
-			dtVsub(dir, iter->epos, iter->spos);
-			dtVnormalize(dir);
-			dtVmad(pt, iter->spos, dir, LABEL_DIST);
-			pt[1]+=0.5f;
-		}
-		
-		if (gluProject((GLdouble)pt[0], (GLdouble)pt[1], (GLdouble)pt[2],
-					   model, proj, view, &x, &y, &z))
-		{
-			snprintf(text, 64, "Path %d\n", n);
-			unsigned int col = imguiRGBA(0,0,0,128);
-			if (iter->expand)
-				col = imguiRGBA(255,192,0,220);
-			imguiDrawText((int)x, (int)(y-25), IMGUI_ALIGN_CENTER, text, col);
-		}
-		n++;
-	}
-	
-	static int resScroll = 0;
-	bool mouseOverMenu = imguiBeginScrollArea("Test Results", 10, view[3] - 10 - 350, 200, 350, &resScroll);
-//		mouseOverMenu = true;
-		
-	n = 0;
-	for (Test* iter = m_tests; iter; iter = iter->next)
-	{
-		const int total = iter->findNearestPolyTime + iter->findPathTime + iter->findStraightPathTime;
-		snprintf(subtext, 64, "%.4f ms", (float)total/1000.0f);
-		snprintf(text, 64, "Path %d", n);
-		
-		if (imguiCollapse(text, subtext, iter->expand))
-			iter->expand = !iter->expand;
-		if (iter->expand)
-		{
-			snprintf(text, 64, "Poly: %.4f ms", (float)iter->findNearestPolyTime/1000.0f);
-			imguiValue(text);
-
-			snprintf(text, 64, "Path: %.4f ms", (float)iter->findPathTime/1000.0f);
-			imguiValue(text);
-
-			snprintf(text, 64, "Straight: %.4f ms", (float)iter->findStraightPathTime/1000.0f);
-			imguiValue(text);
-			
-			imguiSeparator();
-		}
-		
-		n++;
-	}
-
-	imguiEndScrollArea();
-	
-	return mouseOverMenu;
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/ValueHistory.cpp b/dep/recastnavigation/RecastDemo/Source/ValueHistory.cpp
deleted file mode 100644
index 30ae4b6fecd..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/ValueHistory.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "ValueHistory.h"
-#include "imgui.h"
-#include <string.h>
-#include <stdio.h>
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-ValueHistory::ValueHistory() :
-	m_hsamples(0)
-{
-	for (int i = 0; i < MAX_HISTORY; ++i)
-		m_samples[i] = 0;
-}
-
-ValueHistory::~ValueHistory()
-{
-}
-
-float ValueHistory::getSampleMin() const
-{
-	float val = m_samples[0];
-	for (int i = 1; i < MAX_HISTORY; ++i)
-		if (m_samples[i] < val)
-			val = m_samples[i];
-	return val;
-} 
-
-float ValueHistory::getSampleMax() const
-{
-	float val = m_samples[0];
-	for (int i = 1; i < MAX_HISTORY; ++i)
-		if (m_samples[i] > val)
-			val = m_samples[i];
-	return val;
-}
-
-float ValueHistory::getAverage() const
-{
-	float val = 0;
-	for (int i = 0; i < MAX_HISTORY; ++i)
-		val += m_samples[i];
-	return val/(float)MAX_HISTORY;
-}
-
-void GraphParams::setRect(int ix, int iy, int iw, int ih, int ipad)
-{
-	x = ix;
-	y = iy;
-	w = iw;
-	h = ih;
-	pad = ipad;
-}
-
-void GraphParams::setValueRange(float ivmin, float ivmax, int indiv, const char* iunits)
-{
-	vmin = ivmin;
-	vmax = ivmax;
-	ndiv = indiv;
-	strcpy(units, iunits);
-}
-
-void drawGraphBackground(const GraphParams* p)
-{
-	// BG
-	imguiDrawRoundedRect((float)p->x, (float)p->y, (float)p->w, (float)p->h, (float)p->pad, imguiRGBA(64,64,64,128));
-	
-	const float sy = (p->h-p->pad*2) / (p->vmax-p->vmin);
-	const float oy = p->y+p->pad-p->vmin*sy;
-	
-	char text[64];
-	
-	// Divider Lines
-	for (int i = 0; i <= p->ndiv; ++i)
-	{
-		const float u = (float)i/(float)p->ndiv;
-		const float v = p->vmin + (p->vmax-p->vmin)*u;
-		snprintf(text, 64, "%.2f %s", v, p->units);
-		const float fy = oy + v*sy;
-		imguiDrawText(p->x + p->w - p->pad, (int)fy-4, IMGUI_ALIGN_RIGHT, text, imguiRGBA(0,0,0,255));
-		imguiDrawLine((float)p->x + (float)p->pad, fy, (float)p->x + (float)p->w - (float)p->pad - 50, fy, 1.0f, imguiRGBA(0,0,0,64)); 
-	}
-}
-
-void drawGraph(const GraphParams* p, const ValueHistory* graph,
-			   int idx, const char* label, const unsigned int col)
-{
-	const float sx = (p->w - p->pad*2) / (float)graph->getSampleCount();
-	const float sy = (p->h - p->pad*2) / (p->vmax - p->vmin);
-	const float ox = (float)p->x + (float)p->pad;
-	const float oy = (float)p->y + (float)p->pad - p->vmin*sy;
-	
-	// Values
-	float px=0, py=0;
-	for (int i = 0; i < graph->getSampleCount()-1; ++i)
-	{
-		const float x = ox + i*sx;
-		const float y = oy + graph->getSample(i)*sy;
-		if (i > 0)
-			imguiDrawLine(px,py, x,y, 2.0f, col);
-		px = x;
-		py = y;
-	}
-	
-	// Label
-	const int size = 15;
-	const int spacing = 10;
-	int ix = p->x + p->w + 5;
-	int iy = p->y + p->h - (idx+1)*(size+spacing);
-	
-	imguiDrawRoundedRect((float)ix, (float)iy, (float)size, (float)size, 2.0f, col);
-	
-	char text[64];
-	snprintf(text, 64, "%.2f %s", graph->getAverage(), p->units);
-	imguiDrawText(ix+size+5, iy+3, IMGUI_ALIGN_LEFT, label, imguiRGBA(255,255,255,192));
-	imguiDrawText(ix+size+150, iy+3, IMGUI_ALIGN_RIGHT, text, imguiRGBA(255,255,255,128));
-}
-
diff --git a/dep/recastnavigation/RecastDemo/Source/imgui.cpp b/dep/recastnavigation/RecastDemo/Source/imgui.cpp
deleted file mode 100644
index 36bbffa46d8..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/imgui.cpp
+++ /dev/null
@@ -1,676 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <stdio.h>
-#include <string.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include "imgui.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-static const unsigned TEXT_POOL_SIZE = 8000;
-static char g_textPool[TEXT_POOL_SIZE];
-static unsigned g_textPoolSize = 0;
-static const char* allocText(const char* text)
-{
-	unsigned len = strlen(text)+1;
-	if (g_textPoolSize + len >= TEXT_POOL_SIZE)
-		return 0;
-	char* dst = &g_textPool[g_textPoolSize]; 
-	memcpy(dst, text, len);
-	g_textPoolSize += len;
-	return dst;
-}
-
-static const unsigned GFXCMD_QUEUE_SIZE = 5000;
-static imguiGfxCmd g_gfxCmdQueue[GFXCMD_QUEUE_SIZE];
-static unsigned g_gfxCmdQueueSize = 0;
-
-static void resetGfxCmdQueue()
-{
-	g_gfxCmdQueueSize = 0;
-	g_textPoolSize = 0;
-}
-
-static void addGfxCmdScissor(int x, int y, int w, int h)
-{
-	if (g_gfxCmdQueueSize >= GFXCMD_QUEUE_SIZE)
-		return;
-	imguiGfxCmd& cmd = g_gfxCmdQueue[g_gfxCmdQueueSize++];
-	cmd.type = IMGUI_GFXCMD_SCISSOR;
-	cmd.flags = x < 0 ? 0 : 1;	// on/off flag.
-	cmd.col = 0;
-	cmd.rect.x = (short)x;
-	cmd.rect.y = (short)y;
-	cmd.rect.w = (short)w;
-	cmd.rect.h = (short)h;
-}
-
-static void addGfxCmdRect(float x, float y, float w, float h, unsigned int color)
-{
-	if (g_gfxCmdQueueSize >= GFXCMD_QUEUE_SIZE)
-		return;
-	imguiGfxCmd& cmd = g_gfxCmdQueue[g_gfxCmdQueueSize++];
-	cmd.type = IMGUI_GFXCMD_RECT;
-	cmd.flags = 0;
-	cmd.col = color;
-	cmd.rect.x = (short)(x*8.0f);
-	cmd.rect.y = (short)(y*8.0f);
-	cmd.rect.w = (short)(w*8.0f);
-	cmd.rect.h = (short)(h*8.0f);
-	cmd.rect.r = 0;
-}
-
-static void addGfxCmdLine(float x0, float y0, float x1, float y1, float r, unsigned int color)
-{
-	if (g_gfxCmdQueueSize >= GFXCMD_QUEUE_SIZE)
-		return;
-	imguiGfxCmd& cmd = g_gfxCmdQueue[g_gfxCmdQueueSize++];
-	cmd.type = IMGUI_GFXCMD_LINE;
-	cmd.flags = 0;
-	cmd.col = color;
-	cmd.line.x0 = (short)(x0*8.0f);
-	cmd.line.y0 = (short)(y0*8.0f);
-	cmd.line.x1 = (short)(x1*8.0f);
-	cmd.line.y1 = (short)(y1*8.0f);
-	cmd.line.r = (short)(r*8.0f);
-}
-
-static void addGfxCmdRoundedRect(float x, float y, float w, float h, float r, unsigned int color)
-{
-	if (g_gfxCmdQueueSize >= GFXCMD_QUEUE_SIZE)
-		return;
-	imguiGfxCmd& cmd = g_gfxCmdQueue[g_gfxCmdQueueSize++];
-	cmd.type = IMGUI_GFXCMD_RECT;
-	cmd.flags = 0;
-	cmd.col = color;
-	cmd.rect.x = (short)(x*8.0f);
-	cmd.rect.y = (short)(y*8.0f);
-	cmd.rect.w = (short)(w*8.0f);
-	cmd.rect.h = (short)(h*8.0f);
-	cmd.rect.r = (short)(r*8.0f);
-}
-
-static void addGfxCmdTriangle(int x, int y, int w, int h, int flags, unsigned int color)
-{
-	if (g_gfxCmdQueueSize >= GFXCMD_QUEUE_SIZE)
-		return;
-	imguiGfxCmd& cmd = g_gfxCmdQueue[g_gfxCmdQueueSize++];
-	cmd.type = IMGUI_GFXCMD_TRIANGLE;
-	cmd.flags = (char)flags;
-	cmd.col = color;
-	cmd.rect.x = (short)(x*8.0f);
-	cmd.rect.y = (short)(y*8.0f);
-	cmd.rect.w = (short)(w*8.0f);
-	cmd.rect.h = (short)(h*8.0f);
-}
-
-static void addGfxCmdText(int x, int y, int align, const char* text, unsigned int color)
-{
-	if (g_gfxCmdQueueSize >= GFXCMD_QUEUE_SIZE)
-		return;
-	imguiGfxCmd& cmd = g_gfxCmdQueue[g_gfxCmdQueueSize++];
-	cmd.type = IMGUI_GFXCMD_TEXT;
-	cmd.flags = 0;
-	cmd.col = color;
-	cmd.text.x = (short)x;
-	cmd.text.y = (short)y;
-	cmd.text.align = (short)align;
-	cmd.text.text = allocText(text);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-struct GuiState
-{
-	GuiState() :
-		left(false), leftPressed(false), leftReleased(false),
-		mx(-1), my(-1), scroll(0),
-		active(0), hot(0), hotToBe(0), isHot(false), isActive(false), wentActive(false),
-		dragX(0), dragY(0), dragOrig(0), widgetX(0), widgetY(0), widgetW(100),
-		insideCurrentScroll(false),  areaId(0), widgetId(0)
-	{
-	}
-
-	bool left;
-	bool leftPressed, leftReleased;
-	int mx,my;
-	int scroll;
-	unsigned int active;
-	unsigned int hot;
-	unsigned int hotToBe;
-	bool isHot;
-	bool isActive;
-	bool wentActive;
-	int dragX, dragY;
-	float dragOrig;
-	int widgetX, widgetY, widgetW;
-	bool insideCurrentScroll;
-	
-	unsigned int areaId;
-	unsigned int widgetId;
-};
-
-static GuiState g_state;
-
-inline bool anyActive()
-{
-	return g_state.active != 0;
-}
-
-inline bool isActive(unsigned int id)
-{
-	return g_state.active == id;
-}
-
-inline bool isHot(unsigned int id)
-{
-	return g_state.hot == id;
-}
-
-inline bool inRect(int x, int y, int w, int h, bool checkScroll = true)
-{
-   return (!checkScroll || g_state.insideCurrentScroll) && g_state.mx >= x && g_state.mx <= x+w && g_state.my >= y && g_state.my <= y+h;
-}
-
-inline void clearInput()
-{
-	g_state.leftPressed = false;
-	g_state.leftReleased = false;
-	g_state.scroll = 0;
-}
-
-inline void clearActive()
-{
-	g_state.active = 0;
-	// mark all UI for this frame as processed
-	clearInput();
-}
-
-inline void setActive(unsigned int id)
-{
-	g_state.active = id;
-	g_state.wentActive = true;
-}
-
-inline void setHot(unsigned int id)
-{
-   g_state.hotToBe = id;
-}
-
-
-static bool buttonLogic(unsigned int id, bool over)
-{
-	bool res = false;
-	// process down
-	if (!anyActive())
-	{
-		if (over)
-			setHot(id);
-		if (isHot(id) && g_state.leftPressed)
-			setActive(id);
-	}
-
-	// if button is active, then react on left up
-	if (isActive(id))
-	{
-		g_state.isActive = true;
-		if (over)
-			setHot(id);
-		if (g_state.leftReleased)
-		{
-			if (isHot(id))
-				res = true;
-			clearActive();
-		}
-	}
-
-	if (isHot(id))
-		g_state.isHot = true;
-
-	return res;
-}
-
-static void updateInput(int mx, int my, unsigned char mbut, int scroll)
-{
-	bool left = (mbut & IMGUI_MBUT_LEFT) != 0;
-
-	g_state.mx = mx;
-	g_state.my = my;
-	g_state.leftPressed = !g_state.left && left;
-	g_state.leftReleased = g_state.left && !left;
-	g_state.left = left;
-
-	g_state.scroll = scroll;
-}
-
-void imguiBeginFrame(int mx, int my, unsigned char mbut, int scroll)
-{
-	updateInput(mx,my,mbut,scroll);
-
-	g_state.hot = g_state.hotToBe;
-	g_state.hotToBe = 0;
-
-	g_state.wentActive = false;
-	g_state.isActive = false;
-	g_state.isHot = false;
-
-	g_state.widgetX = 0;
-	g_state.widgetY = 0;
-	g_state.widgetW = 0;
-
-	g_state.areaId = 1;
-	g_state.widgetId = 1;
-
-	resetGfxCmdQueue();
-}
-
-void imguiEndFrame()
-{
-	clearInput();
-}
-
-const imguiGfxCmd* imguiGetRenderQueue()
-{
-	return g_gfxCmdQueue;
-}
-
-int imguiGetRenderQueueSize()
-{
-	return g_gfxCmdQueueSize;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-static const int BUTTON_HEIGHT = 20;
-static const int SLIDER_HEIGHT = 20;
-static const int SLIDER_MARKER_WIDTH = 10;
-static const int CHECK_SIZE = 8;
-static const int DEFAULT_SPACING = 4;
-static const int TEXT_HEIGHT = 8;
-static const int SCROLL_AREA_PADDING = 6;
-static const int INTEND_SIZE = 16;
-static const int AREA_HEADER = 28;
-
-static int g_scrollTop = 0;
-static int g_scrollBottom = 0;
-static int g_scrollRight = 0;
-static int g_scrollAreaTop = 0;
-static int* g_scrollVal = 0;
-static int g_focusTop = 0;
-static int g_focusBottom = 0;
-static unsigned int g_scrollId = 0;
-static bool g_insideScrollArea = false;
-
-bool imguiBeginScrollArea(const char* name, int x, int y, int w, int h, int* scroll)
-{
-	g_state.areaId++;
-	g_state.widgetId = 0;
-	g_scrollId = (g_state.areaId<<16) | g_state.widgetId;
-
-	g_state.widgetX = x + SCROLL_AREA_PADDING;
-	g_state.widgetY = y+h-AREA_HEADER + (*scroll);
-	g_state.widgetW = w - SCROLL_AREA_PADDING*4;
-	g_scrollTop = y-AREA_HEADER+h;
-	g_scrollBottom = y+SCROLL_AREA_PADDING;
-	g_scrollRight = x+w - SCROLL_AREA_PADDING*3;
-	g_scrollVal = scroll;
-
-	g_scrollAreaTop = g_state.widgetY;
-
-	g_focusTop = y-AREA_HEADER;
-	g_focusBottom = y-AREA_HEADER+h;
-
-	g_insideScrollArea = inRect(x, y, w, h, false);
-	g_state.insideCurrentScroll = g_insideScrollArea;
-
-	addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, 6, imguiRGBA(0,0,0,192));
-
-	addGfxCmdText(x+AREA_HEADER/2, y+h-AREA_HEADER/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, name, imguiRGBA(255,255,255,128));
-
-	addGfxCmdScissor(x+SCROLL_AREA_PADDING, y+SCROLL_AREA_PADDING, w-SCROLL_AREA_PADDING*4, h-AREA_HEADER-SCROLL_AREA_PADDING);
-
-	return g_insideScrollArea;
-}
-
-void imguiEndScrollArea()
-{
-	// Disable scissoring.
-	addGfxCmdScissor(-1,-1,-1,-1);
-
-	// Draw scroll bar
-	int x = g_scrollRight+SCROLL_AREA_PADDING/2;
-	int y = g_scrollBottom;
-	int w = SCROLL_AREA_PADDING*2;
-	int h = g_scrollTop - g_scrollBottom;
-
-	int stop = g_scrollAreaTop;
-	int sbot = g_state.widgetY;
-	int sh = stop - sbot; // The scrollable area height.
-
-	float barHeight = (float)h/(float)sh;
-	
-	if (barHeight < 1)
-	{
-		float barY = (float)(y - sbot)/(float)sh;
-		if (barY < 0) barY = 0;
-		if (barY > 1) barY = 1;
-		
-		// Handle scroll bar logic.
-		unsigned int hid = g_scrollId;
-		int hx = x;
-		int hy = y + (int)(barY*h);
-		int hw = w;
-		int hh = (int)(barHeight*h);
-		
-		const int range = h - (hh-1);
-		bool over = inRect(hx, hy, hw, hh);
-		buttonLogic(hid, over);
-		if (isActive(hid))
-		{
-			float u = (float)(hy-y) / (float)range;
-			if (g_state.wentActive)
-			{
-				g_state.dragY = g_state.my;
-				g_state.dragOrig = u;
-			}
-			if (g_state.dragY != g_state.my)
-			{
-				u = g_state.dragOrig + (g_state.my - g_state.dragY) / (float)range;
-				if (u < 0) u = 0;
-				if (u > 1) u = 1;
-				*g_scrollVal = (int)((1-u) * (sh - h));
-			}
-		}
-		
-		// BG
-		addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, (float)w/2-1, imguiRGBA(0,0,0,196));
-		// Bar
-		if (isActive(hid))
-			addGfxCmdRoundedRect((float)hx, (float)hy, (float)hw, (float)hh, (float)w/2-1, imguiRGBA(255,196,0,196));
-		else
-			addGfxCmdRoundedRect((float)hx, (float)hy, (float)hw, (float)hh, (float)w/2-1, isHot(hid) ? imguiRGBA(255,196,0,96) : imguiRGBA(255,255,255,64));
-
-		// Handle mouse scrolling.
-		if (g_insideScrollArea) // && !anyActive())
-		{
-			if (g_state.scroll)
-			{
-				*g_scrollVal += 20*g_state.scroll;
-				if (*g_scrollVal < 0) *g_scrollVal = 0;
-				if (*g_scrollVal > (sh - h)) *g_scrollVal = (sh - h);
-			}
-		}
-	}
-	g_state.insideCurrentScroll = false;
-}
-
-bool imguiButton(const char* text, bool enabled)
-{
-	g_state.widgetId++;
-	unsigned int id = (g_state.areaId<<16) | g_state.widgetId;
-	
-	int x = g_state.widgetX;
-	int y = g_state.widgetY - BUTTON_HEIGHT;
-	int w = g_state.widgetW;
-	int h = BUTTON_HEIGHT;
-	g_state.widgetY -= BUTTON_HEIGHT + DEFAULT_SPACING;
-
-	bool over = enabled && inRect(x, y, w, h);
-	bool res = buttonLogic(id, over);
-
-	addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, (float)BUTTON_HEIGHT/2-1, imguiRGBA(128,128,128, isActive(id)?196:96));
-	if (enabled)
-		addGfxCmdText(x+BUTTON_HEIGHT/2, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255,196,0,255) : imguiRGBA(255,255,255,200));
-	else
-		addGfxCmdText(x+BUTTON_HEIGHT/2, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128,128,128,200));
-
-	return res;
-}
-
-bool imguiItem(const char* text, bool enabled)
-{
-	g_state.widgetId++;
-	unsigned int id = (g_state.areaId<<16) | g_state.widgetId;
-	
-	int x = g_state.widgetX;
-	int y = g_state.widgetY - BUTTON_HEIGHT;
-	int w = g_state.widgetW;
-	int h = BUTTON_HEIGHT;
-	g_state.widgetY -= BUTTON_HEIGHT + DEFAULT_SPACING;
-	
-	bool over = enabled && inRect(x, y, w, h);
-	bool res = buttonLogic(id, over);
-	
-	if (isHot(id))
-		addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, 2.0f, imguiRGBA(255,196,0,isActive(id)?196:96));
-
-	if (enabled)
-		addGfxCmdText(x+BUTTON_HEIGHT/2, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(255,255,255,200));
-	else
-		addGfxCmdText(x+BUTTON_HEIGHT/2, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128,128,128,200));
-	
-	return res;
-}
-
-bool imguiCheck(const char* text, bool checked, bool enabled)
-{
-	g_state.widgetId++;
-	unsigned int id = (g_state.areaId<<16) | g_state.widgetId;
-	
-	int x = g_state.widgetX;
-	int y = g_state.widgetY - BUTTON_HEIGHT;
-	int w = g_state.widgetW;
-	int h = BUTTON_HEIGHT;
-	g_state.widgetY -= BUTTON_HEIGHT + DEFAULT_SPACING;
-
-	bool over = enabled && inRect(x, y, w, h);
-	bool res = buttonLogic(id, over);
-	
-	const int cx = x+BUTTON_HEIGHT/2-CHECK_SIZE/2;
-	const int cy = y+BUTTON_HEIGHT/2-CHECK_SIZE/2;
-	addGfxCmdRoundedRect((float)cx-3, (float)cy-3, (float)CHECK_SIZE+6, (float)CHECK_SIZE+6, 4, imguiRGBA(128,128,128, isActive(id)?196:96));
-	if (checked)
-	{
-		if (enabled)
-			addGfxCmdRoundedRect((float)cx, (float)cy, (float)CHECK_SIZE, (float)CHECK_SIZE, (float)CHECK_SIZE/2-1, imguiRGBA(255,255,255,isActive(id)?255:200));
-		else
-			addGfxCmdRoundedRect((float)cx, (float)cy, (float)CHECK_SIZE, (float)CHECK_SIZE, (float)CHECK_SIZE/2-1, imguiRGBA(128,128,128,200));
-	}
-
-	if (enabled)
-		addGfxCmdText(x+BUTTON_HEIGHT, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255,196,0,255) : imguiRGBA(255,255,255,200));
-	else
-		addGfxCmdText(x+BUTTON_HEIGHT, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128,128,128,200));
-
-	return res;
-}
-
-bool imguiCollapse(const char* text, const char* subtext, bool checked, bool enabled)
-{
-	g_state.widgetId++;
-	unsigned int id = (g_state.areaId<<16) | g_state.widgetId;
-	
-	int x = g_state.widgetX;
-	int y = g_state.widgetY - BUTTON_HEIGHT;
-	int w = g_state.widgetW;
-	int h = BUTTON_HEIGHT;
-	g_state.widgetY -= BUTTON_HEIGHT; // + DEFAULT_SPACING;
-
-	const int cx = x+BUTTON_HEIGHT/2-CHECK_SIZE/2;
-	const int cy = y+BUTTON_HEIGHT/2-CHECK_SIZE/2;
-
-	bool over = enabled && inRect(x, y, w, h);
-	bool res = buttonLogic(id, over);
-	
-	if (checked)
-		addGfxCmdTriangle(cx, cy, CHECK_SIZE, CHECK_SIZE, 2, imguiRGBA(255,255,255,isActive(id)?255:200));
-	else
-		addGfxCmdTriangle(cx, cy, CHECK_SIZE, CHECK_SIZE, 1, imguiRGBA(255,255,255,isActive(id)?255:200));
-
-	if (enabled)
-		addGfxCmdText(x+BUTTON_HEIGHT, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255,196,0,255) : imguiRGBA(255,255,255,200));
-	else
-		addGfxCmdText(x+BUTTON_HEIGHT, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128,128,128,200));
-
-	if (subtext)
-		addGfxCmdText(x+w-BUTTON_HEIGHT/2, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_RIGHT, subtext, imguiRGBA(255,255,255,128));
-	
-	return res;
-}
-
-void imguiLabel(const char* text)
-{
-	int x = g_state.widgetX;
-	int y = g_state.widgetY - BUTTON_HEIGHT;
-	g_state.widgetY -= BUTTON_HEIGHT;
-	addGfxCmdText(x, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(255,255,255,255));
-}
-
-void imguiValue(const char* text)
-{
-	const int x = g_state.widgetX;
-	const int y = g_state.widgetY - BUTTON_HEIGHT;
-	const int w = g_state.widgetW;
-	g_state.widgetY -= BUTTON_HEIGHT;
-	
-	addGfxCmdText(x+w-BUTTON_HEIGHT/2, y+BUTTON_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_RIGHT, text, imguiRGBA(255,255,255,200));
-}
-
-bool imguiSlider(const char* text, float* val, float vmin, float vmax, float vinc, bool enabled)
-{
-	g_state.widgetId++;
-	unsigned int id = (g_state.areaId<<16) | g_state.widgetId;
-	
-	int x = g_state.widgetX;
-	int y = g_state.widgetY - BUTTON_HEIGHT;
-	int w = g_state.widgetW;
-	int h = SLIDER_HEIGHT;
-	g_state.widgetY -= SLIDER_HEIGHT + DEFAULT_SPACING;
-
-	addGfxCmdRoundedRect((float)x, (float)y, (float)w, (float)h, 4.0f, imguiRGBA(0,0,0,128));
-
-	const int range = w - SLIDER_MARKER_WIDTH;
-
-	float u = (*val - vmin) / (vmax-vmin);
-	if (u < 0) u = 0;
-	if (u > 1) u = 1;
-	int m = (int)(u * range);
-
-	bool over = enabled && inRect(x+m, y, SLIDER_MARKER_WIDTH, SLIDER_HEIGHT);
-	bool res = buttonLogic(id, over);
-	bool valChanged = false;
-
-	if (isActive(id))
-	{
-		if (g_state.wentActive)
-		{
-			g_state.dragX = g_state.mx;
-			g_state.dragOrig = u;
-		}
-		if (g_state.dragX != g_state.mx)
-		{
-			u = g_state.dragOrig + (float)(g_state.mx - g_state.dragX) / (float)range;
-			if (u < 0) u = 0;
-			if (u > 1) u = 1;
-			*val = vmin + u*(vmax-vmin);
-			*val = floorf(*val / vinc)*vinc; // Snap to vinc
-			m = (int)(u * range);
-			valChanged = true;
-		}
-	}
-
-	if (isActive(id))
-		addGfxCmdRoundedRect((float)(x+m), (float)y, (float)SLIDER_MARKER_WIDTH, (float)SLIDER_HEIGHT, 4.0f, imguiRGBA(255,255,255,255));
-	else
-		addGfxCmdRoundedRect((float)(x+m), (float)y, (float)SLIDER_MARKER_WIDTH, (float)SLIDER_HEIGHT, 4.0f, isHot(id) ? imguiRGBA(255,196,0,128) : imguiRGBA(255,255,255,64));
-
-	// TODO: fix this, take a look at 'nicenum'.
-	int digits = (int)(ceilf(log10f(vinc)));
-	char fmt[16];
-	snprintf(fmt, 16, "%%.%df", digits >= 0 ? 0 : -digits);
-	char msg[128];
-	snprintf(msg, 128, fmt, *val);
-	
-	if (enabled)
-	{
-		addGfxCmdText(x+SLIDER_HEIGHT/2, y+SLIDER_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, isHot(id) ? imguiRGBA(255,196,0,255) : imguiRGBA(255,255,255,200));
-		addGfxCmdText(x+w-SLIDER_HEIGHT/2, y+SLIDER_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_RIGHT, msg, isHot(id) ? imguiRGBA(255,196,0,255) : imguiRGBA(255,255,255,200));
-	}
-	else
-	{
-		addGfxCmdText(x+SLIDER_HEIGHT/2, y+SLIDER_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_LEFT, text, imguiRGBA(128,128,128,200));
-		addGfxCmdText(x+w-SLIDER_HEIGHT/2, y+SLIDER_HEIGHT/2-TEXT_HEIGHT/2, IMGUI_ALIGN_RIGHT, msg, imguiRGBA(128,128,128,200));
-	}
-
-	return res || valChanged;
-}
-
-
-void imguiIndent()
-{
-	g_state.widgetX += INTEND_SIZE;
-	g_state.widgetW -= INTEND_SIZE;
-}
-
-void imguiUnindent()
-{
-	g_state.widgetX -= INTEND_SIZE;
-	g_state.widgetW += INTEND_SIZE;
-}
-
-void imguiSeparator()
-{
-	g_state.widgetY -= DEFAULT_SPACING*3;
-}
-
-void imguiSeparatorLine()
-{
-	int x = g_state.widgetX;
-	int y = g_state.widgetY - DEFAULT_SPACING*2;
-	int w = g_state.widgetW;
-	int h = 1;
-	g_state.widgetY -= DEFAULT_SPACING*4;
-
-	addGfxCmdRect((float)x, (float)y, (float)w, (float)h, imguiRGBA(255,255,255,32));
-}
-
-void imguiDrawText(int x, int y, int align, const char* text, unsigned int color)
-{
-	addGfxCmdText(x, y, align, text, color);
-}
-
-void imguiDrawLine(float x0, float y0, float x1, float y1, float r, unsigned int color)
-{
-	addGfxCmdLine(x0, y0, x1, y1, r, color);
-}
-
-void imguiDrawRect(float x, float y, float w, float h, unsigned int color)
-{
-	addGfxCmdRect(x, y, w, h, color);
-}
-
-void imguiDrawRoundedRect(float x, float y, float w, float h, float r, unsigned int color)
-{
-	addGfxCmdRoundedRect(x, y, w, h, r, color);
-}
-
diff --git a/dep/recastnavigation/RecastDemo/Source/imguiRenderGL.cpp b/dep/recastnavigation/RecastDemo/Source/imguiRenderGL.cpp
deleted file mode 100644
index 2dddffe07b4..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/imguiRenderGL.cpp
+++ /dev/null
@@ -1,480 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include "imgui.h"
-#include "SDL.h"
-#include "SDL_opengl.h"
-
-// Some math headers don't have PI defined.
-static const float PI = 3.14159265f;
-
-void imguifree(void* ptr, void* userptr);
-void* imguimalloc(size_t size, void* userptr);
-
-#define STBTT_malloc(x,y)    imguimalloc(x,y)
-#define STBTT_free(x,y)      imguifree(x,y)
-#define STB_TRUETYPE_IMPLEMENTATION
-#include "stb_truetype.h"
-
-void imguifree(void* ptr, void* /*userptr*/)
-{
-	free(ptr);
-}
-
-void* imguimalloc(size_t size, void* /*userptr*/)
-{
-	return malloc(size);
-}
-
-static const unsigned TEMP_COORD_COUNT = 100;
-static float g_tempCoords[TEMP_COORD_COUNT*2];
-static float g_tempNormals[TEMP_COORD_COUNT*2];
-
-static const int CIRCLE_VERTS = 8*4;
-static float g_circleVerts[CIRCLE_VERTS*2];
-
-static stbtt_bakedchar g_cdata[96]; // ASCII 32..126 is 95 glyphs
-static GLuint g_ftex = 0;
-
-inline unsigned int RGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-{
-	return (r) | (g << 8) | (b << 16) | (a << 24);
-}
-
-static void drawPolygon(const float* coords, unsigned numCoords, float r, unsigned int col)
-{
-	if (numCoords > TEMP_COORD_COUNT) numCoords = TEMP_COORD_COUNT;
-	
-	for (unsigned i = 0, j = numCoords-1; i < numCoords; j=i++)
-	{
-		const float* v0 = &coords[j*2];
-		const float* v1 = &coords[i*2];
-		float dx = v1[0] - v0[0];
-		float dy = v1[1] - v0[1];
-		float d = sqrtf(dx*dx+dy*dy);
-		if (d > 0)
-		{
-			d = 1.0f/d;
-			dx *= d;
-			dy *= d;
-		}
-		g_tempNormals[j*2+0] = dy;
-		g_tempNormals[j*2+1] = -dx;
-	}
-	
-	for (unsigned i = 0, j = numCoords-1; i < numCoords; j=i++)
-	{
-		float dlx0 = g_tempNormals[j*2+0];
-		float dly0 = g_tempNormals[j*2+1];
-		float dlx1 = g_tempNormals[i*2+0];
-		float dly1 = g_tempNormals[i*2+1];
-		float dmx = (dlx0 + dlx1) * 0.5f;
-		float dmy = (dly0 + dly1) * 0.5f;
-		float	dmr2 = dmx*dmx + dmy*dmy;
-		if (dmr2 > 0.000001f)
-		{
-			float	scale = 1.0f / dmr2;
-			if (scale > 10.0f) scale = 10.0f;
-			dmx *= scale;
-			dmy *= scale;
-		}
-		g_tempCoords[i*2+0] = coords[i*2+0]+dmx*r;
-		g_tempCoords[i*2+1] = coords[i*2+1]+dmy*r;
-	}
-	
-	unsigned int colTrans = RGBA(col&0xff, (col>>8)&0xff, (col>>16)&0xff, 0);
-	
-	glBegin(GL_TRIANGLES);
-	
-	glColor4ubv((GLubyte*)&col);
-	
-	for (unsigned i = 0, j = numCoords-1; i < numCoords; j=i++)
-	{
-		glVertex2fv(&coords[i*2]);
-		glVertex2fv(&coords[j*2]);
-		glColor4ubv((GLubyte*)&colTrans);
-		glVertex2fv(&g_tempCoords[j*2]);
-		
-		glVertex2fv(&g_tempCoords[j*2]);
-		glVertex2fv(&g_tempCoords[i*2]);
-		
-		glColor4ubv((GLubyte*)&col);
-		glVertex2fv(&coords[i*2]);
-	}
-	
-	glColor4ubv((GLubyte*)&col);
-	for (unsigned i = 2; i < numCoords; ++i)
-	{
-		glVertex2fv(&coords[0]);
-		glVertex2fv(&coords[(i-1)*2]);
-		glVertex2fv(&coords[i*2]);
-	}
-	
-	glEnd();
-}
-
-static void drawRect(float x, float y, float w, float h, float fth, unsigned int col)
-{
-	float verts[4*2] =
-	{
-		x+0.5f, y+0.5f,
-		x+w-0.5f, y+0.5f,
-		x+w-0.5f, y+h-0.5f,
-		x+0.5f, y+h-0.5f,
-	};
-	drawPolygon(verts, 4, fth, col);
-}
-
-/*
-static void drawEllipse(float x, float y, float w, float h, float fth, unsigned int col)
-{
-	float verts[CIRCLE_VERTS*2];
-	const float* cverts = g_circleVerts;
-	float* v = verts;
-	
-	for (int i = 0; i < CIRCLE_VERTS; ++i)
-	{
-		*v++ = x + cverts[i*2]*w;
-		*v++ = y + cverts[i*2+1]*h;
-	}
-	
-	drawPolygon(verts, CIRCLE_VERTS, fth, col);
-}
-*/
-
-static void drawRoundedRect(float x, float y, float w, float h, float r, float fth, unsigned int col)
-{
-	const unsigned n = CIRCLE_VERTS/4;
-	float verts[(n+1)*4*2];
-	const float* cverts = g_circleVerts;
-	float* v = verts;
-	
-	for (unsigned i = 0; i <= n; ++i)
-	{
-		*v++ = x+w-r + cverts[i*2]*r;
-		*v++ = y+h-r + cverts[i*2+1]*r;
-	}
-	
-	for (unsigned i = n; i <= n*2; ++i)
-	{
-		*v++ = x+r + cverts[i*2]*r;
-		*v++ = y+h-r + cverts[i*2+1]*r;
-	}
-	
-	for (unsigned i = n*2; i <= n*3; ++i)
-	{
-		*v++ = x+r + cverts[i*2]*r;
-		*v++ = y+r + cverts[i*2+1]*r;
-	}
-	
-	for (unsigned i = n*3; i < n*4; ++i)
-	{
-		*v++ = x+w-r + cverts[i*2]*r;
-		*v++ = y+r + cverts[i*2+1]*r;
-	}
-	*v++ = x+w-r + cverts[0]*r;
-	*v++ = y+r + cverts[1]*r;
-	
-	drawPolygon(verts, (n+1)*4, fth, col);
-}
-
-
-static void drawLine(float x0, float y0, float x1, float y1, float r, float fth, unsigned int col)
-{
-	float dx = x1-x0;
-	float dy = y1-y0;
-	float d = sqrtf(dx*dx+dy*dy);
-	if (d > 0.0001f)
-	{
-		d = 1.0f/d;
-		dx *= d;
-		dy *= d;
-	}
-	float nx = dy;
-	float ny = -dx;
-	float verts[4*2];
-	r -= fth;
-	r *= 0.5f;
-	if (r < 0.01f) r = 0.01f;
-	dx *= r;
-	dy *= r;
-	nx *= r;
-	ny *= r;
-	
-	verts[0] = x0-dx-nx;
-	verts[1] = y0-dy-ny;
-	
-	verts[2] = x0-dx+nx;
-	verts[3] = y0-dy+ny;
-	
-	verts[4] = x1+dx+nx;
-	verts[5] = y1+dy+ny;
-	
-	verts[6] = x1+dx-nx;
-	verts[7] = y1+dy-ny;
-	
-	drawPolygon(verts, 4, fth, col);
-}
-
-
-bool imguiRenderGLInit(const char* fontpath)
-{
-	for (int i = 0; i < CIRCLE_VERTS; ++i)
-	{
-		float a = (float)i/(float)CIRCLE_VERTS * PI*2;
-		g_circleVerts[i*2+0] = cosf(a);
-		g_circleVerts[i*2+1] = sinf(a);
-	}
-
-	// Load font.
-	FILE* fp = fopen(fontpath, "rb");
-	if (!fp) return false;
-	fseek(fp, 0, SEEK_END);
-	int size = ftell(fp);
-	fseek(fp, 0, SEEK_SET);
-	
-	unsigned char* ttfBuffer = (unsigned char*)malloc(size); 
-	if (!ttfBuffer)
-	{
-		fclose(fp);
-		return false;
-	}
-	
-	fread(ttfBuffer, 1, size, fp);
-	fclose(fp);
-	fp = 0;
-	
-	unsigned char* bmap = (unsigned char*)malloc(512*512);
-	if (!bmap)
-	{
-		free(ttfBuffer);
-		return false;
-	}
-	
-	stbtt_BakeFontBitmap(ttfBuffer,0, 15.0f, bmap,512,512, 32,96, g_cdata);
-	
-	// can free ttf_buffer at this point
-	glGenTextures(1, &g_ftex);
-	glBindTexture(GL_TEXTURE_2D, g_ftex);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 512,512, 0, GL_ALPHA, GL_UNSIGNED_BYTE, bmap);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-	free(ttfBuffer);
-	free(bmap);
-
-	return true;
-}
-
-void imguiRenderGLDestroy()
-{
-	if (g_ftex)
-	{
-		glDeleteTextures(1, &g_ftex);
-		g_ftex = 0;
-	}
-}
-
-static void getBakedQuad(stbtt_bakedchar *chardata, int pw, int ph, int char_index,
-						 float *xpos, float *ypos, stbtt_aligned_quad *q)
-{
-	stbtt_bakedchar *b = chardata + char_index;
-	int round_x = STBTT_ifloor(*xpos + b->xoff);
-	int round_y = STBTT_ifloor(*ypos - b->yoff);
-	
-	q->x0 = (float)round_x;
-	q->y0 = (float)round_y;
-	q->x1 = (float)round_x + b->x1 - b->x0;
-	q->y1 = (float)round_y - b->y1 + b->y0;
-	
-	q->s0 = b->x0 / (float)pw;
-	q->t0 = b->y0 / (float)pw;
-	q->s1 = b->x1 / (float)ph;
-	q->t1 = b->y1 / (float)ph;
-	
-	*xpos += b->xadvance;
-}
-
-static const float g_tabStops[4] = {150, 210, 270, 330};
-
-static float getTextLength(stbtt_bakedchar *chardata, const char* text)
-{
-	float xpos = 0;
-	float len = 0;
-	while (*text)
-	{
-		int c = (unsigned char)*text;
-		if (c == '\t')
-		{
-			for (int i = 0; i < 4; ++i)
-			{
-				if (xpos < g_tabStops[i])
-				{
-					xpos = g_tabStops[i];
-					break;
-				}
-			}
-		}
-		else if (c >= 32 && c < 128)
-		{
-			stbtt_bakedchar *b = chardata + c-32;
-			int round_x = STBTT_ifloor((xpos + b->xoff) + 0.5);
-			len = round_x + b->x1 - b->x0 + 0.5f;
-			xpos += b->xadvance;
-		}
-		++text;
-	}
-	return len;
-}
-
-static void drawText(float x, float y, const char *text, int align, unsigned int col)
-{
-	if (!g_ftex) return;
-	if (!text) return;
-	
-	if (align == IMGUI_ALIGN_CENTER)
-		x -= getTextLength(g_cdata, text)/2;
-	else if (align == IMGUI_ALIGN_RIGHT)
-		x -= getTextLength(g_cdata, text);
-	
-	glColor4ub(col&0xff, (col>>8)&0xff, (col>>16)&0xff, (col>>24)&0xff);
-	
-	glEnable(GL_TEXTURE_2D);
-	
-	// assume orthographic projection with units = screen pixels, origin at top left
-	glBindTexture(GL_TEXTURE_2D, g_ftex);
-	
-	glBegin(GL_TRIANGLES);
-	
-	const float ox = x;
-	
-	while (*text)
-	{
-		int c = (unsigned char)*text;
-		if (c == '\t')
-		{
-			for (int i = 0; i < 4; ++i)
-			{
-				if (x < g_tabStops[i]+ox)
-				{
-					x = g_tabStops[i]+ox;
-					break;
-				}
-			}
-		}
-		else if (c >= 32 && c < 128)
-		{			
-			stbtt_aligned_quad q;
-			getBakedQuad(g_cdata, 512,512, c-32, &x,&y,&q);
-			
-			glTexCoord2f(q.s0, q.t0);
-			glVertex2f(q.x0, q.y0);
-			glTexCoord2f(q.s1, q.t1);
-			glVertex2f(q.x1, q.y1);
-			glTexCoord2f(q.s1, q.t0);
-			glVertex2f(q.x1, q.y0);
-			
-			glTexCoord2f(q.s0, q.t0);
-			glVertex2f(q.x0, q.y0);
-			glTexCoord2f(q.s0, q.t1);
-			glVertex2f(q.x0, q.y1);
-			glTexCoord2f(q.s1, q.t1);
-			glVertex2f(q.x1, q.y1);
-		}
-		++text;
-	}
-	
-	glEnd();	
-	glDisable(GL_TEXTURE_2D);
-}
-
-
-void imguiRenderGLDraw()
-{
-	const imguiGfxCmd* q = imguiGetRenderQueue();
-	int nq = imguiGetRenderQueueSize();
-
-	const float s = 1.0f/8.0f;
-
-	glDisable(GL_SCISSOR_TEST);
-	for (int i = 0; i < nq; ++i)
-	{
-		const imguiGfxCmd& cmd = q[i];
-		if (cmd.type == IMGUI_GFXCMD_RECT)
-		{
-			if (cmd.rect.r == 0)
-			{
-				drawRect((float)cmd.rect.x*s+0.5f, (float)cmd.rect.y*s+0.5f,
-						 (float)cmd.rect.w*s-1, (float)cmd.rect.h*s-1,
-						 1.0f, cmd.col);
-			}
-			else
-			{
-				drawRoundedRect((float)cmd.rect.x*s+0.5f, (float)cmd.rect.y*s+0.5f,
-								(float)cmd.rect.w*s-1, (float)cmd.rect.h*s-1,
-								(float)cmd.rect.r*s, 1.0f, cmd.col);
-			}
-		}
-		else if (cmd.type == IMGUI_GFXCMD_LINE)
-		{
-			drawLine(cmd.line.x0*s, cmd.line.y0*s, cmd.line.x1*s, cmd.line.y1*s, cmd.line.r*s, 1.0f, cmd.col);
-		}
-		else if (cmd.type == IMGUI_GFXCMD_TRIANGLE)
-		{
-			if (cmd.flags == 1)
-			{
-				const float verts[3*2] =
-				{
-					(float)cmd.rect.x*s+0.5f, (float)cmd.rect.y*s+0.5f,
-					(float)cmd.rect.x*s+0.5f+(float)cmd.rect.w*s-1, (float)cmd.rect.y*s+0.5f+(float)cmd.rect.h*s/2-0.5f,
-					(float)cmd.rect.x*s+0.5f, (float)cmd.rect.y*s+0.5f+(float)cmd.rect.h*s-1,
-				};
-				drawPolygon(verts, 3, 1.0f, cmd.col);
-			}
-			if (cmd.flags == 2)
-			{
-				const float verts[3*2] =
-				{
-					(float)cmd.rect.x*s+0.5f, (float)cmd.rect.y*s+0.5f+(float)cmd.rect.h*s-1,
-					(float)cmd.rect.x*s+0.5f+(float)cmd.rect.w*s/2-0.5f, (float)cmd.rect.y*s+0.5f,
-					(float)cmd.rect.x*s+0.5f+(float)cmd.rect.w*s-1, (float)cmd.rect.y*s+0.5f+(float)cmd.rect.h*s-1,
-				};
-				drawPolygon(verts, 3, 1.0f, cmd.col);
-			}
-		}
-		else if (cmd.type == IMGUI_GFXCMD_TEXT)
-		{
-			drawText(cmd.text.x, cmd.text.y, cmd.text.text, cmd.text.align, cmd.col);
-		}
-		else if (cmd.type == IMGUI_GFXCMD_SCISSOR)
-		{
-			if (cmd.flags)
-			{
-				glEnable(GL_SCISSOR_TEST);
-				glScissor(cmd.rect.x, cmd.rect.y, cmd.rect.w, cmd.rect.h);
-			}
-			else
-			{
-				glDisable(GL_SCISSOR_TEST);
-			}
-		}
-	}
-	glDisable(GL_SCISSOR_TEST);
-}
diff --git a/dep/recastnavigation/RecastDemo/Source/main.cpp b/dep/recastnavigation/RecastDemo/Source/main.cpp
deleted file mode 100644
index ba12e9e51c7..00000000000
--- a/dep/recastnavigation/RecastDemo/Source/main.cpp
+++ /dev/null
@@ -1,987 +0,0 @@
-//
-// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <stdio.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include "SDL.h"
-#include "SDL_opengl.h"
-#include "imgui.h"
-#include "imguiRenderGL.h"
-#include "Recast.h"
-#include "RecastDebugDraw.h"
-#include "InputGeom.h"
-#include "TestCase.h"
-#include "Filelist.h"
-#include "SlideShow.h"
-
-#include "Sample_SoloMeshSimple.h"
-#include "Sample_SoloMeshTiled.h"
-#include "Sample_TileMesh.h"
-#include "Sample_Debug.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
-struct SampleItem
-{
-	Sample* (*create)();
-	const char* name;
-};
-
-Sample* createSoloSimple() { return new Sample_SoloMeshSimple(); }
-Sample* createSoloTiled() { return new Sample_SoloMeshTiled(); }
-Sample* createTile() { return new Sample_TileMesh(); }
-Sample* createDebug() { return new Sample_Debug(); }
-
-static SampleItem g_samples[] =
-{
-    { createSoloTiled, "Test Recast Params" },
-	//{ createSoloSimple, "Solo Mesh Simple" },
-	//{ createSoloTiled, "Solo Mesh Tiled" },
-	//{ createTile, "Tile Mesh" },
-	{ createDebug, "Debug Generator Navmesh" },
-};
-static const int g_nsamples = sizeof(g_samples)/sizeof(SampleItem); 
-
-
-int main(int /*argc*/, char** /*argv*/)
-{
-	// Init SDL
-	if (SDL_Init(SDL_INIT_EVERYTHING) != 0)
-	{
-		printf("Could not initialise SDL\n");
-		return -1;
-	}
-	
-	// Init OpenGL
-	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
-	SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
-	
-	const SDL_VideoInfo* vi = SDL_GetVideoInfo();
-
-	bool presentationMode = false;
-
-	int width, height;
-	SDL_Surface* screen = 0;
-	
-	if (presentationMode)
-	{
-		width = vi->current_w;
-		height = vi->current_h;
-		screen = SDL_SetVideoMode(width, height, 0, SDL_OPENGL|SDL_FULLSCREEN);
-	}
-	else
-	{	
-		width = vi->current_w - 20;
-		height = vi->current_h - 80;
-		screen = SDL_SetVideoMode(width, height, 0, SDL_OPENGL);
-	}
-	
-	if (!screen)
-	{
-		printf("Could not initialise SDL opengl\n");
-		return -1;
-	}
-	
-	SDL_WM_SetCaption("Recast Demo", 0);
-	
-	if (!imguiRenderGLInit("DroidSans.ttf"))
-	{
-		printf("Could not init GUI renderer.\n");
-		SDL_Quit();
-		return -1;
-	}
-	
-	float t = 0.0f;
-	float timeAcc = 0.0f;
-	Uint32 lastTime = SDL_GetTicks();
-	int mx = 0, my = 0;
-	float rx = 45;
-	float ry = -45;
-	float moveW = 0, moveS = 0, moveA = 0, moveD = 0;
-	float camx = 0, camy = 0, camz = 0, camr = 1000;
-	float origrx = 0, origry = 0;
-	int origx = 0, origy = 0;
-	float scrollZoom = 0;
-	bool rotate = false;
-	bool movedDuringRotate = false;
-	float rays[3], raye[3]; 
-	bool mouseOverMenu = false;
-	bool showMenu = !presentationMode;
-	bool showLog = false;
-	bool showDebugMode = true;
-	bool showTools = true;
-    bool showMaps = false;
-	bool showLevels = false;
-	bool showSample = false;
-	bool showTestCases = false;
-
-	int propScroll = 0;
-	int logScroll = 0;
-	int toolsScroll = 0;
-	int debugScroll = 0;
-	
-	char sampleName[64] = "Choose Sample..."; 
-	
-    FileList maps;
-    char mapName[128] = "Choose Map...";
-
-	FileList files;
-	char meshName[128] = "Choose Tile...";
-	
-	float mpos[3] = {0,0,0};
-	bool mposSet = false;
-	
-	SlideShow slideShow;
-	slideShow.init("slides/");
-	
-	InputGeom* geom = 0;
-	Sample* sample = 0;
-	TestCase* test = 0;
-
-	BuildContext ctx;
-	
-	glEnable(GL_CULL_FACE);
-	
-	float fogCol[4] = { 0.32f,0.25f,0.25f,1 };
-	glEnable(GL_FOG);
-	glFogi(GL_FOG_MODE, GL_LINEAR);
-	glFogf(GL_FOG_START, camr*0.2f);
-	glFogf(GL_FOG_END, camr*1.25f);
-	glFogfv(GL_FOG_COLOR, fogCol);
-	
-	glDepthFunc(GL_LEQUAL);
-	
-	glEnable(GL_POINT_SMOOTH);
-	glEnable(GL_LINE_SMOOTH);
-	
-	bool done = false;
-	while(!done)
-	{
-		// Handle input events.
-		int mscroll = 0;
-		bool processHitTest = false;
-		bool processHitTestShift = false;
-		SDL_Event event;
-		
-		while (SDL_PollEvent(&event))
-		{
-			switch (event.type)
-			{
-				case SDL_KEYDOWN:
-					// Handle any key presses here.
-					if (event.key.keysym.sym == SDLK_ESCAPE)
-					{
-						done = true;
-					}
-					else if (event.key.keysym.sym == SDLK_t)
-					{
-						showLevels = false;
-						showSample = false;
-						showTestCases = true;
-						scanDirectory("Tests", ".txt", files);
-					}
-					else if (event.key.keysym.sym == SDLK_TAB)
-					{
-						showMenu = !showMenu;
-					}
-					else if (event.key.keysym.sym == SDLK_SPACE)
-					{
-						if (sample)
-							sample->handleToggle();
-					}
-					else if (event.key.keysym.sym == SDLK_1)
-					{
-						if (sample)
-							sample->handleStep();
-					}
-					else if (event.key.keysym.sym == SDLK_9)
-					{
-						if (geom)
-							geom->save("geomset.txt");
-					}
-					else if (event.key.keysym.sym == SDLK_0)
-					{
-						delete geom;
-						geom = new InputGeom;
-						if (!geom || !geom->load(&ctx, "geomset.txt"))
-						{
-							delete geom;
-							geom = 0;
-							
-							showLog = true;
-							logScroll = 0;
-							ctx.dumpLog("Geom load log %s:", meshName);
-						}
-						if (sample && geom)
-						{
-							sample->handleMeshChanged(geom);
-						}
-							
-						if (geom || sample)
-						{
-							const float* bmin = 0;
-							const float* bmax = 0;
-							if (sample)
-							{
-								bmin = sample->getBoundsMin();
-								bmax = sample->getBoundsMax();
-							}
-							else if (geom)
-							{
-								bmin = geom->getMeshBoundsMin();
-								bmax = geom->getMeshBoundsMax();
-							}
-							// Reset camera and fog to match the mesh bounds.
-							if (bmin && bmax)
-							{
-								camr = sqrtf(rcSqr(bmax[0]-bmin[0]) +
-											 rcSqr(bmax[1]-bmin[1]) +
-											 rcSqr(bmax[2]-bmin[2])) / 2;
-								camx = (bmax[0] + bmin[0]) / 2 + camr;
-								camy = (bmax[1] + bmin[1]) / 2 + camr;
-								camz = (bmax[2] + bmin[2]) / 2 + camr;
-								camr *= 3;
-							}
-							rx = 45;
-							ry = -45;
-							glFogf(GL_FOG_START, camr*0.2f);
-							glFogf(GL_FOG_END, camr*1.25f);
-						}
-					}
-					else if (event.key.keysym.sym == SDLK_RIGHT)
-					{
-						slideShow.nextSlide();
-					}
-					else if (event.key.keysym.sym == SDLK_LEFT)
-					{
-						slideShow.prevSlide();
-					}
-					break;
-					
-				case SDL_MOUSEBUTTONDOWN:
-					if (event.button.button == SDL_BUTTON_RIGHT)
-					{
-						if (!mouseOverMenu)
-						{
-							// Rotate view
-							rotate = true;
-							movedDuringRotate = false;
-							origx = mx;
-							origy = my;
-							origrx = rx;
-							origry = ry;
-						}
-					}	
-					else if (event.button.button == SDL_BUTTON_WHEELUP)
-					{
-						if (mouseOverMenu)
-							mscroll--;
-						else
-							scrollZoom -= 1.0f;
-					}
-					else if (event.button.button == SDL_BUTTON_WHEELDOWN)
-					{
-						if (mouseOverMenu)
-							mscroll++;
-						else
-							scrollZoom += 1.0f;
-					}
-					break;
-					
-				case SDL_MOUSEBUTTONUP:
-					// Handle mouse clicks here.
-					if (event.button.button == SDL_BUTTON_RIGHT)
-					{
-						rotate = false;
-						if (!mouseOverMenu)
-						{
-							if (!movedDuringRotate)
-							{
-								processHitTest = true;
-								processHitTestShift = true;
-							}
-						}
-					}
-					else if (event.button.button == SDL_BUTTON_LEFT)
-					{
-						if (!mouseOverMenu)
-						{
-							processHitTest = true;
-							processHitTestShift = (SDL_GetModState() & KMOD_SHIFT) ? true : false;
-						}
-					}
-					
-					break;
-					
-				case SDL_MOUSEMOTION:
-					mx = event.motion.x;
-					my = height-1 - event.motion.y;
-					if (rotate)
-					{
-						int dx = mx - origx;
-						int dy = my - origy;
-						rx = origrx - dy*0.25f;
-						ry = origry + dx*0.25f;
-						if (dx*dx+dy*dy > 3*3)
-							movedDuringRotate = true;
-					}
-					break;
-					
-				case SDL_QUIT:
-					done = true;
-					break;
-					
-				default:
-					break;
-			}
-		}
-
-		unsigned char mbut = 0;
-		if (SDL_GetMouseState(0,0) & SDL_BUTTON_LMASK)
-			mbut |= IMGUI_MBUT_LEFT;
-		if (SDL_GetMouseState(0,0) & SDL_BUTTON_RMASK)
-			mbut |= IMGUI_MBUT_RIGHT;
-		
-		Uint32	time = SDL_GetTicks();
-		float	dt = (time - lastTime) / 1000.0f;
-		lastTime = time;
-		
-		t += dt;
-
-
-		// Hit test mesh.
-		if (processHitTest && geom && sample)
-		{
-			float t;
-			TimeVal t0 = getPerfTime();
-			bool hit = geom->raycastMesh(rays, raye, t);
-			TimeVal t1 = getPerfTime();
-			
-			printf("raycast() %.4fms\n", getPerfDeltaTimeUsec(t0,t1)/1000.0f);
-			
-			if (hit)
-			{
-				if (SDL_GetModState() & KMOD_CTRL)
-				{
-					// Marker
-					mposSet = true;
-					mpos[0] = rays[0] + (raye[0] - rays[0])*t;
-					mpos[1] = rays[1] + (raye[1] - rays[1])*t;
-					mpos[2] = rays[2] + (raye[2] - rays[2])*t;
-				}
-				else
-				{
-					float pos[3];
-					pos[0] = rays[0] + (raye[0] - rays[0])*t;
-					pos[1] = rays[1] + (raye[1] - rays[1])*t;
-					pos[2] = rays[2] + (raye[2] - rays[2])*t;
-					sample->handleClick(rays, pos, processHitTestShift);
-				}
-			}
-			else
-			{
-				if (SDL_GetModState() & KMOD_CTRL)
-				{
-					// Marker
-					mposSet = false;
-				}
-			}
-		}
-		
-		// Update sample simulation.
-		const float SIM_RATE = 20;
-		const float DELTA_TIME = 1.0f/SIM_RATE;
-		timeAcc = rcClamp(timeAcc+dt, -1.0f, 1.0f);
-		int simIter = 0;
-		while (timeAcc > DELTA_TIME)
-		{
-			timeAcc -= DELTA_TIME;
-			if (simIter < 5)
-			{
-				if (sample)
-					sample->handleUpdate(DELTA_TIME);
-			}
-			simIter++;
-		}
- 		
-		// Update and render
-		glViewport(0, 0, width, height);
-		glClearColor(0.3f, 0.3f, 0.32f, 1.0f);
-		glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		glDisable(GL_TEXTURE_2D);
-		
-		// Render 3d
-		glEnable(GL_DEPTH_TEST);
-		glMatrixMode(GL_PROJECTION);
-		glLoadIdentity();
-		gluPerspective(50.0f, (float)width/(float)height, 1.0f, camr);
-		glMatrixMode(GL_MODELVIEW);
-		glLoadIdentity();
-		glRotatef(rx,1,0,0);
-		glRotatef(ry,0,1,0);
-		glTranslatef(-camx, -camy, -camz);
-		
-		// Get hit ray position and direction.
-		GLdouble proj[16];
-		GLdouble model[16];
-		GLint view[4];
-		glGetDoublev(GL_PROJECTION_MATRIX, proj);
-		glGetDoublev(GL_MODELVIEW_MATRIX, model);
-		glGetIntegerv(GL_VIEWPORT, view);
-		GLdouble x, y, z;
-		gluUnProject(mx, my, 0.0f, model, proj, view, &x, &y, &z);
-		rays[0] = (float)x; rays[1] = (float)y; rays[2] = (float)z;
-		gluUnProject(mx, my, 1.0f, model, proj, view, &x, &y, &z);
-		raye[0] = (float)x; raye[1] = (float)y; raye[2] = (float)z;
-		
-		// Handle keyboard movement.
-		Uint8* keystate = SDL_GetKeyState(NULL);
-		moveW = rcClamp(moveW + dt * 4 * (keystate[SDLK_w] ? 1 : -1), 0.0f, 1.0f);
-		moveS = rcClamp(moveS + dt * 4 * (keystate[SDLK_s] ? 1 : -1), 0.0f, 1.0f);
-		moveA = rcClamp(moveA + dt * 4 * (keystate[SDLK_a] ? 1 : -1), 0.0f, 1.0f);
-		moveD = rcClamp(moveD + dt * 4 * (keystate[SDLK_d] ? 1 : -1), 0.0f, 1.0f);
-		
-		float keybSpeed = 22.0f;
-		if (SDL_GetModState() & KMOD_SHIFT)
-			keybSpeed *= 4.0f;
-		
-		float movex = (moveD - moveA) * keybSpeed * dt;
-		float movey = (moveS - moveW) * keybSpeed * dt;
-		
-		movey += scrollZoom * 2.0f;
-		scrollZoom = 0;
-		
-		camx += movex * (float)model[0];
-		camy += movex * (float)model[4];
-		camz += movex * (float)model[8];
-		
-		camx += movey * (float)model[2];
-		camy += movey * (float)model[6];
-		camz += movey * (float)model[10];
-
-		glEnable(GL_FOG);
-
-		if (sample)
-			sample->handleRender();
-		if (test)
-			test->handleRender();
-		
-		glDisable(GL_FOG);
-		
-		// Render GUI
-		glDisable(GL_DEPTH_TEST);
-		glMatrixMode(GL_PROJECTION);
-		glLoadIdentity();
-		gluOrtho2D(0, width, 0, height);
-		glMatrixMode(GL_MODELVIEW);
-		glLoadIdentity();
-		
-		mouseOverMenu = false;
-		
-		imguiBeginFrame(mx,my,mbut,mscroll);
-		
-		if (sample)
-		{
-			sample->handleRenderOverlay((double*)proj, (double*)model, (int*)view);
-		}
-		if (test)
-		{
-			if (test->handleRenderOverlay((double*)proj, (double*)model, (int*)view))
-				mouseOverMenu = true;
-		}
-
-		// Help text.
-		if (showMenu)
-		{
-			const char msg[] = "W/S/A/D: Move  RMB: Rotate   LMB+SHIFT: Place Start   LMB: Place End";
-			imguiDrawText(width/2, height-20, IMGUI_ALIGN_CENTER, msg, imguiRGBA(255,255,255,128));
-		}
-		
-		if (showMenu)
-		{
-			int propDiv = showDebugMode ? (int)(height*0.6f) : height;
-			
-			if (imguiBeginScrollArea("Properties",
-									 width-250-10, 10+height-propDiv, 250, propDiv-20, &propScroll))
-				mouseOverMenu = true;
-
-			if (imguiCheck("Show Log", showLog))
-				showLog = !showLog;
-			if (imguiCheck("Show Tools", showTools))
-				showTools = !showTools;
-			if (imguiCheck("Show Debug Mode", showDebugMode))
-				showDebugMode = !showDebugMode;
-
-			imguiSeparator();
-			imguiLabel("Sample");
-			if (imguiButton(sampleName))
-			{
-				if (showSample)
-				{
-					showSample = false;
-				}
-				else
-				{
-                	showMaps = false;
-					showSample = true;
-					showLevels = false;
-					showTestCases = false;
-				}
-			}
-			
-			imguiSeparator();
-			imguiLabel("Map");
-            if (imguiButton(mapName, strncmp(sampleName, "Choose Sample...", 16)))
-            {
-                if (showMaps)
-                {
-                    showMaps = false;
-                }
-                else
-                {
-                    showMaps = true;
-					showSample = false;
-					showTestCases = false;
-					showLevels = false;
-                    scanDirectory("Meshes", ".map", maps);
-                }
-            }
-
-            imguiSeparator();
-			imguiLabel("Tile");
-			if (imguiButton(meshName, strncmp(mapName, "Choose Map...", 13)))
-			{
-				if (showLevels)
-				{
-					showLevels = false;
-				}
-				else
-				{
-                    showMaps = false;
-					showSample = false;
-					showTestCases = false;
-					showLevels = true;
-					scanDirectory("Meshes", ".mesh", files);
-				}
-			}
-			if (geom)
-			{
-				char text[64];
-				snprintf(text, 64, "Verts: %.1fk  Tris: %.1fk",
-						 geom->getMesh()->getVertCount()/1000.0f,
-						 geom->getMesh()->getTriCount()/1000.0f);
-				imguiValue(text);
-			}
-			imguiSeparator();
-					
-			if (geom && sample)
-			{
-				sample->handleSettings();
-
-				if (imguiButton("Build"))
-				{
-					ctx.resetLog();
-					if (!sample->handleBuild())
-					{
-						showLog = true;
-						logScroll = 0;
-					}
-					ctx.dumpLog("Build log %s:", meshName);
-					
-					// Clear test.
-					delete test;
-					test = 0;
-				}
-
-				imguiSeparator();
-			}
-			
-			imguiEndScrollArea();
-			
-			if (showDebugMode)
-			{
-				if (imguiBeginScrollArea("Debug Mode",
-										 width-250-10, 10,
-										 250, height-propDiv-10, &debugScroll))
-					mouseOverMenu = true;
-
-				if (sample)
-					sample->handleDebugMode();
-
-				imguiEndScrollArea();
-			}
-		}
-		
-		// Sample selection dialog.
-		if (showSample)
-		{
-			static int levelScroll = 0;
-			if (imguiBeginScrollArea("Choose Sample", width-10-250-10-200, height-10-250, 200, 250, &levelScroll))
-				mouseOverMenu = true;
-
-			Sample* newSample = 0;
-			for (int i = 0; i < g_nsamples; ++i)
-			{
-				if (imguiItem(g_samples[i].name))
-				{
-					newSample = g_samples[i].create();
-					if (newSample)
-						strcpy(sampleName, g_samples[i].name);
-				}
-			}
-			if (newSample)
-			{
-				delete sample;
-				sample = newSample;
-				sample->setContext(&ctx);
-				if (geom && sample)
-				{
-					sample->handleMeshChanged(geom);
-				}
-				showSample = false;
-			}
-
-			if (geom || sample)
-			{
-				const float* bmin = 0;
-				const float* bmax = 0;
-				if (sample)
-				{
-					bmin = sample->getBoundsMin();
-					bmax = sample->getBoundsMax();
-				}
-				else if (geom)
-				{
-					bmin = geom->getMeshBoundsMin();
-					bmax = geom->getMeshBoundsMax();
-				}
-				// Reset camera and fog to match the mesh bounds.
-				if (bmin && bmax)
-				{
-					camr = sqrtf(rcSqr(bmax[0]-bmin[0]) +
-								 rcSqr(bmax[1]-bmin[1]) +
-								 rcSqr(bmax[2]-bmin[2])) / 2;
-					camx = (bmax[0] + bmin[0]) / 2 + camr;
-					camy = (bmax[1] + bmin[1]) / 2 + camr;
-					camz = (bmax[2] + bmin[2]) / 2 + camr;
-					camr *= 3;
-				}
-				rx = 45;
-				ry = -45;
-				glFogf(GL_FOG_START, camr*0.2f);
-				glFogf(GL_FOG_END, camr*1.25f);
-			}
-			
-			imguiEndScrollArea();
-		}
-		
-        // map selection dialog
-        if (showMaps)
-        {
-            static int scrolPos = 0;
-            if (imguiBeginScrollArea("Choose Map", width-10-250-10-200, height-10-450, 200, 450, &scrolPos))
-                mouseOverMenu = true;
-
-            int selectedMap = -1;
-            for (int i = 0; i < maps.size; ++i)
-                if (imguiItem(maps.files[i]))
-                    selectedMap = i;
-
-            if (selectedMap != -1)
-            {
-                strncpy(mapName, maps.files[selectedMap], sizeof(mapName));
-                mapName[sizeof(mapName)-1] = '\0';
-                showMaps = false;
-
-                delete geom;
-                geom = NULL;
-
-                if (sample)
-				    sample->setMeshName(meshName);
-            }
-        }
-
-		// Level selection dialog.
-		if (showLevels)
-		{
-			static int levelScroll = 0;
-			if (imguiBeginScrollArea("Choose Tile", width-10-250-10-200, height-10-450, 200, 450, &levelScroll))
-				mouseOverMenu = true;
-			
-			int levelToLoad = -1;
-			for (int i = 0; i < files.size; ++i)
-			{
-				if (!strncmp(mapName, files.files[i], 3))
-                {
-				    if (imguiItem(files.files[i]))
-					    levelToLoad = i;
-                }
-			}
-			
-			if (levelToLoad != -1)
-			{
-				strncpy(meshName, files.files[levelToLoad], sizeof(meshName));
-				meshName[sizeof(meshName)-1] = '\0';
-				showLevels = false;
-				
-				delete geom;
-				geom = 0;
-				
-				char path[256];
-				strcpy(path, "Meshes/");
-				strcat(path, meshName);
-				
-				geom = new InputGeom;
-				if (!geom || !geom->loadMesh(&ctx, path))
-				{
-					delete geom;
-					geom = 0;
-					
-					showLog = true;
-					logScroll = 0;
-					ctx.dumpLog("Geom load log %s:", meshName);
-				}
-				if (sample && geom)
-				{
-					sample->handleMeshChanged(geom);
-                    sample->setMeshName(meshName);
-				}
-
-				if (geom || sample)
-				{
-					const float* bmin = 0;
-					const float* bmax = 0;
-					if (sample)
-					{
-						bmin = sample->getBoundsMin();
-						bmax = sample->getBoundsMax();
-					}
-					else if (geom)
-					{
-						bmin = geom->getMeshBoundsMin();
-						bmax = geom->getMeshBoundsMax();
-					}
-					// Reset camera and fog to match the mesh bounds.
-					if (bmin && bmax)
-					{
-						camr = sqrtf(rcSqr(bmax[0]-bmin[0]) +
-									 rcSqr(bmax[1]-bmin[1]) +
-									 rcSqr(bmax[2]-bmin[2])) / 2;
-						camx = (bmax[0] + bmin[0]) / 2 + camr;
-						camy = (bmax[1] + bmin[1]) / 2 + camr;
-						camz = (bmax[2] + bmin[2]) / 2 + camr;
-						camr *= 3;
-					}
-					rx = 45;
-					ry = -45;
-					glFogf(GL_FOG_START, camr*0.2f);
-					glFogf(GL_FOG_END, camr*1.25f);
-				}
-			}
-			
-			imguiEndScrollArea();
-			
-		}
-		
-		// Test cases
-		if (showTestCases)
-		{
-			static int testScroll = 0;
-			if (imguiBeginScrollArea("Choose Test To Run", width-10-250-10-200, height-10-450, 200, 450, &testScroll))
-				mouseOverMenu = true;
-
-			int testToLoad = -1;
-			for (int i = 0; i < files.size; ++i)
-			{
-				if (imguiItem(files.files[i]))
-					testToLoad = i;
-			}
-			
-			if (testToLoad != -1)
-			{
-				char path[256];
-				strcpy(path, "Tests/");
-				strcat(path, files.files[testToLoad]);
-				test = new TestCase;
-				if (test)
-				{
-					// Load the test.
-					if (!test->load(path))
-					{
-						delete test;
-						test = 0;
-					}
-
-					// Create sample
-					Sample* newSample = 0;
-					for (int i = 0; i < g_nsamples; ++i)
-					{
-						if (strcmp(g_samples[i].name, test->getSampleName()) == 0)
-						{
-							newSample = g_samples[i].create();
-							if (newSample) strcpy(sampleName, g_samples[i].name);
-						}
-					}
-					if (newSample)
-					{
-						delete sample;
-						sample = newSample;
-						sample->setContext(&ctx);
-						showSample = false;
-					}
-
-					// Load geom.
-					strcpy(meshName, test->getGeomFileName());
-					meshName[sizeof(meshName)-1] = '\0';
-					
-					delete geom;
-					geom = 0;
-					
-					strcpy(path, "Meshes/");
-					strcat(path, meshName);
-					
-					geom = new InputGeom;
-					if (!geom || !geom->loadMesh(&ctx, path))
-					{
-						delete geom;
-						geom = 0;
-						
-						showLog = true;
-						logScroll = 0;
-						ctx.dumpLog("Geom load log %s:", meshName);
-					}
-					if (sample && geom)
-					{
-						sample->handleMeshChanged(geom);
-					}
-
-					ctx.resetLog();
-					if (sample && !sample->handleBuild())
-					{
-						ctx.dumpLog("Build log %s:", meshName);
-					}
-					
-					if (geom || sample)
-					{
-						const float* bmin = 0;
-						const float* bmax = 0;
-						if (sample)
-						{
-							bmin = sample->getBoundsMin();
-							bmax = sample->getBoundsMax();
-						}
-						else if (geom)
-						{
-							bmin = geom->getMeshBoundsMin();
-							bmax = geom->getMeshBoundsMax();
-						}
-						// Reset camera and fog to match the mesh bounds.
-						if (bmin && bmax)
-						{
-							camr = sqrtf(rcSqr(bmax[0]-bmin[0]) +
-										 rcSqr(bmax[1]-bmin[1]) +
-										 rcSqr(bmax[2]-bmin[2])) / 2;
-							camx = (bmax[0] + bmin[0]) / 2 + camr;
-							camy = (bmax[1] + bmin[1]) / 2 + camr;
-							camz = (bmax[2] + bmin[2]) / 2 + camr;
-							camr *= 3;
-						}
-						rx = 45;
-						ry = -45;
-						glFogf(GL_FOG_START, camr*0.2f);
-						glFogf(GL_FOG_END, camr*1.25f);
-					}
-					
-					// Do the tests.
-					if (sample)
-						test->doTests(sample->getNavMesh(), sample->getNavMeshQuery());
-				}
-			}				
-				
-			imguiEndScrollArea();
-		}
-
-		
-		// Log
-		if (showLog && showMenu)
-		{
-			if (imguiBeginScrollArea("Log", 10, 10, width - 300, 200, &logScroll))
-				mouseOverMenu = true;
-			for (int i = 0; i < ctx.getLogCount(); ++i)
-				imguiLabel(ctx.getLogText(i));
-			imguiEndScrollArea();
-		}
-		
-		// Tools
-		if (!showTestCases && showTools && showMenu && geom && sample)
-		{
-			if (imguiBeginScrollArea("Tools", 10, height - 10 - 350, 250, 350, &toolsScroll))
-				mouseOverMenu = true;
-
-			sample->handleTools();
-			
-			imguiEndScrollArea();
-		}
-		
-		slideShow.updateAndDraw(dt, (float)width, (float)height);
-		
-		// Marker
-		if (mposSet && gluProject((GLdouble)mpos[0], (GLdouble)mpos[1], (GLdouble)mpos[2],
-								  model, proj, view, &x, &y, &z))
-		{
-			// Draw marker circle
-			glLineWidth(5.0f);
-			glColor4ub(240,220,0,196);
-			glBegin(GL_LINE_LOOP);
-			const float r = 25.0f;
-			for (int i = 0; i < 20; ++i)
-			{
-				const float a = (float)i / 20.0f * RC_PI*2;
-				const float fx = (float)x + cosf(a)*r;
-				const float fy = (float)y + sinf(a)*r;
-				glVertex2f(fx,fy);
-			}
-			glEnd();
-			glLineWidth(1.0f);
-		}
-		
-		imguiEndFrame();
-		imguiRenderGLDraw();		
-		
-		glEnable(GL_DEPTH_TEST);
-		SDL_GL_SwapBuffers();
-	}
-	
-	imguiRenderGLDestroy();
-	
-	SDL_Quit();
-	
-	delete sample;
-	delete geom;
-	
-	return 0;
-}
diff --git a/dep/src/bzip2/blocksort.c b/dep/src/bzip2/blocksort.c
index bd2dec157fa..d0d662cd4e9 100644
--- a/dep/src/bzip2/blocksort.c
+++ b/dep/src/bzip2/blocksort.c
@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/dep/src/bzip2/bzlib.c b/dep/src/bzip2/bzlib.c
index ef86c91e695..bd358a793b8 100644
--- a/dep/src/bzip2/bzlib.c
+++ b/dep/src/bzip2/bzlib.c
@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/dep/src/bzip2/bzlib.h b/dep/src/bzip2/bzlib.h
index c5b75d6d8ff..8277123da8c 100644
--- a/dep/src/bzip2/bzlib.h
+++ b/dep/src/bzip2/bzlib.h
@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/dep/src/bzip2/bzlib_private.h b/dep/src/bzip2/bzlib_private.h
index 23427879b18..5d0217f4635 100644
--- a/dep/src/bzip2/bzlib_private.h
+++ b/dep/src/bzip2/bzlib_private.h
@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
@@ -36,7 +36,7 @@
 
 /*-- General stuff. --*/
 
-#define BZ_VERSION  "1.0.5, 10-Dec-2007"
+#define BZ_VERSION  "1.0.6, 6-Sept-2010"
 
 typedef char            Char;
 typedef unsigned char   Bool;
diff --git a/dep/src/bzip2/compress.c b/dep/src/bzip2/compress.c
index 8c80a079700..caf7696011b 100644
--- a/dep/src/bzip2/compress.c
+++ b/dep/src/bzip2/compress.c
@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/dep/src/bzip2/crctable.c b/dep/src/bzip2/crctable.c
index 215687b2c05..1fea7e946c5 100644
--- a/dep/src/bzip2/crctable.c
+++ b/dep/src/bzip2/crctable.c
@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/dep/src/bzip2/decompress.c b/dep/src/bzip2/decompress.c
index bba5e0fa36d..311f5668f9a 100644
--- a/dep/src/bzip2/decompress.c
+++ b/dep/src/bzip2/decompress.c
@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
@@ -381,6 +381,13 @@ Int32 BZ2_decompress ( DState* s )
             es = -1;
             N = 1;
             do {
+               /* Check that N doesn't get too big, so that es doesn't
+                  go negative.  The maximum value that can be
+                  RUNA/RUNB encoded is equal to the block size (post
+                  the initial RLE), viz, 900k, so bounding N at 2
+                  million should guard against overflow without
+                  rejecting any legitimate inputs. */
+               if (N >= 2*1024*1024) RETURN(BZ_DATA_ERROR);
                if (nextSym == BZ_RUNA) es = es + (0+1) * N; else
                if (nextSym == BZ_RUNB) es = es + (1+1) * N;
                N = N * 2;
@@ -485,15 +492,28 @@ Int32 BZ2_decompress ( DState* s )
          RETURN(BZ_DATA_ERROR);
 
       /*-- Set up cftab to facilitate generation of T^(-1) --*/
+      /* Check: unzftab entries in range. */
+      for (i = 0; i <= 255; i++) {
+         if (s->unzftab[i] < 0 || s->unzftab[i] > nblock)
+            RETURN(BZ_DATA_ERROR);
+      }
+      /* Actually generate cftab. */
       s->cftab[0] = 0;
       for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1];
       for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1];
+      /* Check: cftab entries in range. */
       for (i = 0; i <= 256; i++) {
          if (s->cftab[i] < 0 || s->cftab[i] > nblock) {
             /* s->cftab[i] can legitimately be == nblock */
             RETURN(BZ_DATA_ERROR);
          }
       }
+      /* Check: cftab entries non-descending. */
+      for (i = 1; i <= 256; i++) {
+         if (s->cftab[i-1] > s->cftab[i]) {
+            RETURN(BZ_DATA_ERROR);
+         }
+      }
 
       s->state_out_len = 0;
       s->state_out_ch  = 0;
diff --git a/dep/src/bzip2/huffman.c b/dep/src/bzip2/huffman.c
index 87e79e38af0..2283fdbc5a1 100644
--- a/dep/src/bzip2/huffman.c
+++ b/dep/src/bzip2/huffman.c
@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/dep/src/bzip2/randtable.c b/dep/src/bzip2/randtable.c
index 068b76367bc..6d624599061 100644
--- a/dep/src/bzip2/randtable.c
+++ b/dep/src/bzip2/randtable.c
@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/dep/src/g3dlite/AABox.cpp b/dep/src/g3dlite/AABox.cpp
index 035497aa3c4..8e66456c013 100644
--- a/dep/src/g3dlite/AABox.cpp
+++ b/dep/src/g3dlite/AABox.cpp
@@ -282,6 +282,10 @@ bool AABox::culledBy(
     return false;
 }
 
+void AABox::getBounds(Sphere& s) const {
+    s.center = center();
+    s.radius = extent().length() / 2;
+}
 
 bool AABox::intersects(const class Sphere& sphere) const {
     double d = 0; 
diff --git a/dep/src/g3dlite/Any.cpp b/dep/src/g3dlite/Any.cpp
index de4d32e83ea..ae44ca89dd4 100644
--- a/dep/src/g3dlite/Any.cpp
+++ b/dep/src/g3dlite/Any.cpp
@@ -5,9 +5,9 @@
  @author Shawn Yarbrough
   
  @created 2006-06-11
- @edited  2009-11-15
+ @edited  2010-07-24
 
- Copyright 2000-2009, Morgan McGuire.
+ Copyright 2000-2010, Morgan McGuire.
  All rights reserved.
  */
 
@@ -15,11 +15,73 @@
 #include "G3D/TextOutput.h"
 #include "G3D/TextInput.h"
 #include "G3D/stringutils.h"
+#include "G3D/fileutils.h"
+#include "G3D/FileSystem.h"
 #include <deque>
 #include <iostream>
 
 namespace G3D {
 
+std::string Any::resolveStringAsFilename() const {
+    verifyType(STRING);
+    std::string f = FileSystem::resolve(string(), sourceDirectory());
+    if (FileSystem::exists(f)) {
+        return f;
+    } else {
+        const std::string& s = System::findDataFile(string(), false);
+        if (s.empty()) {
+            return string();
+        } else {
+            return s;
+        }
+    }
+}
+
+
+bool Any::nameBeginsWith(const std::string& s) const {
+    return nameBeginsWith(s.c_str());
+}
+
+
+bool Any::nameEquals(const std::string& s) const {
+    // If std::string has a fast hash compare, use it first
+    return (name() == s) || nameEquals(s.c_str());
+}
+
+
+inline static char toLower(char c) {
+    return ((c >= 'A') && (c <= 'Z')) ? (c - 'A' + 'a') : c;
+}
+
+
+bool Any::nameBeginsWith(const char* s) const {
+    verifyType(Any::ARRAY, Any::TABLE);
+
+    const char* n = name().c_str();
+    // Walk through character-by-character
+    while ((*s != '\0') && (*n != '\0')) {
+        if (toLower(*s) != toLower(*n)) {
+            // Mismatch
+            return false;
+        }
+        ++s; ++n;
+    }
+    // Make sure s ran out no later than n
+    return (*s == '\0');
+}
+
+
+bool Any::nameEquals(const char* s) const {
+    verifyType(Any::ARRAY, Any::TABLE);
+#ifdef G3D_WIN32
+    return stricmp(name().c_str(), s) == 0;
+#else
+    return strcasecmp(name().c_str(), s) == 0;
+#endif
+
+}
+
+
 void Any::beforeRead() const {
     if (isPlaceholder()) {
         // Tried to read from a placeholder--throw an exception as if
@@ -675,11 +737,10 @@ bool Any::operator!=(const Any& x) const {
 static void getDeserializeSettings(TextInput::Settings& settings) {
     settings.cppBlockComments = true;
     settings.cppLineComments = true;
-    settings.otherLineComments = true;
-    settings.otherCommentCharacter = '#';
+    settings.otherLineComments = false;
     settings.generateCommentTokens = true;
     settings.singleQuotedStrings = false;
-    settings.msvcSpecials = false;
+    settings.msvcFloatSpecials = false;
     settings.caseSensitive = false;
 }
 
@@ -708,7 +769,7 @@ void Any::load(const std::string& filename) {
     TextInput::Settings settings;
     getDeserializeSettings(settings);
 
-    TextInput ti(filename, settings);
+    TextInput ti(FileSystem::resolve(filename), settings);
     deserialize(ti);
 }
 
@@ -870,12 +931,6 @@ static bool isClose(const char c) {
 }
 
 
-/** True if \a s is a C++ name operator */
-static bool isNameOperator(const std::string& s) {
-    return s == "." || s == "::" || s == "->";
-}
-
-
 void Any::deserializeName(TextInput& ti, Token& token, std::string& name) {
     debugAssert(token.type() == Token::SYMBOL);
     std::string s = token.string();
@@ -928,6 +983,9 @@ void Any::deserialize(TextInput& ti, Token& token) {
             "File ended without a properly formed Any");
     }
 
+    // Do we need to read one more token after the end? 
+    bool needRead = true;
+
     switch (token.type()) {
     case Token::STRING:
         m_type = STRING;
@@ -951,8 +1009,41 @@ void Any::deserialize(TextInput& ti, Token& token) {
         break;
 
     case Token::SYMBOL:
-        // Named Array, Named Table, Array, Table, or NONE
-        if (toUpper(token.string()) == "NONE") {
+        // Pragma, Named Array, Named Table, Array, Table, or NONE
+        if (token.string() == "#") {
+            // Pragma
+            
+            // Currently, "include" is the only pragma allowed
+            token = ti.read();
+            if (! ((token.type() == Token::SYMBOL) &&
+                   (token.string() == "include"))) {
+                throw ParseError(ti.filename(), token.line(), token.character(),
+                                 "Expected 'include' pragma after '#'");
+            }
+            
+            ti.readSymbol("(");
+            const std::string& includeName = ti.readString();
+
+            // Find the include file
+            const std::string& myPath = filenamePath(ti.filename());
+            std::string t = pathConcat(myPath, includeName);
+
+            if (! FileSystem::exists(t)) {
+                // Try and find it, starting with cwd
+                t = System::findDataFile(includeName);
+            }
+
+            // Read the included file
+            load(t);
+
+            // Update the source information
+            ensureData();
+            m_data->source.filename += 
+                format(" [included from %s:%d(%d)]", ti.filename().c_str(), token.line(), token.character());
+            
+            ti.readSymbol(")");
+
+        } else if (toUpper(token.string()) == "NONE") {
             // Nothing left to do; we initialized to NONE originally
             ensureData();
             m_data->source.set(ti, token);
@@ -982,6 +1073,7 @@ void Any::deserialize(TextInput& ti, Token& token) {
                 ensureData();
                 m_data->name = name;
             }
+            needRead = false;
         } // if NONE
         break;
 
@@ -996,7 +1088,7 @@ void Any::deserialize(TextInput& ti, Token& token) {
         m_data->comment = comment;
     }
 
-    if (m_type != ARRAY && m_type != TABLE) {
+    if (needRead) {
         // Array and table already consumed their last token
         token = ti.read();
     }
@@ -1016,9 +1108,9 @@ static bool isSeparator(char c) {
 
 
 void Any::readUntilCommaOrClose(TextInput& ti, Token& token) {
-    while (! ((token.type() == Token::SYMBOL) && 
-              (isClose(token.string()[0])) || 
-               isSeparator(token.string()[0]))) {
+    bool atClose = (token.type() == Token::SYMBOL) && isClose(token.string()[0]);
+    bool atComma = isSeparator(token.string()[0]);
+    while (! (atClose || atComma)) {
         switch (token.type()) {
         case Token::NEWLINE:
         case Token::COMMENT:
@@ -1030,6 +1122,10 @@ void Any::readUntilCommaOrClose(TextInput& ti, Token& token) {
             throw ParseError(ti.filename(), token.line(), token.character(), 
                 "Expected a comma or close paren");
         }
+
+	// Update checks
+        atComma = isSeparator(token.string()[0]);
+        atClose = (token.type() == Token::SYMBOL) && isClose(token.string()[0]);
     }
 }
 
@@ -1066,7 +1162,7 @@ void Any::deserializeBody(TextInput& ti, Token& token) {
         }
 
         // Pointer the value being read
-        Any a = NULL;
+        Any a = Any(int(NULL));
         std::string key;
         
         if (m_type == TABLE) {
@@ -1076,13 +1172,13 @@ void Any::deserializeBody(TextInput& ti, Token& token) {
             } 
             
             key = token.string();
-            // Consume everything up to the = sign
+            // Consume everything up to the = sign, returning the "=" sign.
             token = ti.readSignificant();
 
             if ((token.type() != Token::SYMBOL) || (token.string() != "=")) {
                 throw ParseError(ti.filename(), token.line(), token.character(), "Expected =");
             } else {
-                // Consume (don't consume comments--we want the value pointed to by a to get those).
+                // Read the next token, which is the value (don't consume comments--we want the value pointed to by a to get those).
                 token = ti.read();
             }
         }
@@ -1154,6 +1250,15 @@ const Any::Source& Any::source() const {
 }
 
 
+std::string Any::sourceDirectory() const {
+    if (m_data) {
+        return FilePath::parent(m_data->source.filename);
+    } else {
+        return "";
+    }
+}
+
+
 void Any::verify(bool value, const std::string& message) const {
     beforeRead();
     if (! value) {
@@ -1185,6 +1290,14 @@ void Any::verifyName(const std::string& n) const {
 }
 
 
+void Any::verifyName(const std::string& n, const std::string& m) const {
+    beforeRead();
+    const std::string& x = toUpper(name());
+    verify(beginsWith(x, toUpper(n)) ||
+           beginsWith(x, toUpper(m)), "Name must begin with " + n + " or " + m);
+}
+
+
 void Any::verifyType(Type t) const {
     beforeRead();
     if (type() != t) {
diff --git a/dep/src/g3dlite/BinaryInput.cpp b/dep/src/g3dlite/BinaryInput.cpp
index 65a9976fe04..9d363fcb28b 100644
--- a/dep/src/g3dlite/BinaryInput.cpp
+++ b/dep/src/g3dlite/BinaryInput.cpp
@@ -5,7 +5,7 @@
  Copyright 2001-2007, Morgan McGuire.  All rights reserved.
  
  @created 2001-08-09
- @edited  2005-02-24
+ @edited  2010-03-05
 
 
   <PRE>
@@ -37,8 +37,11 @@
 #include "G3D/Array.h"
 #include "G3D/fileutils.h"
 #include "G3D/Log.h"
+#include "G3D/FileSystem.h"
 #include <zlib.h>
-
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+#include "zip.h"
+#endif /* G3DFIX: Use ZIP-library only if defined */
 #include <cstring>
 
 namespace G3D {
@@ -272,28 +275,42 @@ BinaryInput::BinaryInput(
     _internal::currentFilesUsed.insert(m_filename);
     
 
-    if (! fileExists(m_filename, false)) {
-        std::string zipfile;
-        std::string internalfile;
-        if (zipfileExists(m_filename, zipfile, internalfile)) {
-            // Load from zipfile
-            void* v;
-            size_t s;
-            zipRead(filename, v, s);
-            m_buffer = reinterpret_cast<uint8*>(v);
-            m_bufferLength = m_length = s;
-            if (compressed) {
-                decompress();
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+    std::string zipfile;
+    if (FileSystem::inZipfile(m_filename, zipfile)) {
+        // Load from zipfile
+//        zipRead(filename, v, s);
+
+        std::string internalFile = m_filename.substr(zipfile.length() + 1);
+        struct zip* z = zip_open(zipfile.c_str(), ZIP_CHECKCONS, NULL);
+        {
+            struct zip_stat info;
+            zip_stat_init( &info );    // TODO: Docs unclear if zip_stat_init is required.
+            zip_stat(z, internalFile.c_str(), ZIP_FL_NOCASE, &info);
+            m_bufferLength = m_length = info.size;
+            // sets machines up to use MMX, if they want
+            m_buffer = reinterpret_cast<uint8*>(System::alignedMalloc(m_length, 16));
+            struct zip_file* zf = zip_fopen( z, internalFile.c_str(), ZIP_FL_NOCASE );
+            {
+                int64 test = zip_fread( zf, m_buffer, m_length );
+                debugAssertM(test == m_length,
+                             internalFile + " was corrupt because it unzipped to the wrong size.");
+                (void)test;
             }
-            m_freeBuffer = true;
-        } else {
-            Log::common()->printf("Warning: File not found: %s\n", m_filename.c_str());
+            zip_fclose( zf );
+        }
+        zip_close( z );
+
+        if (compressed) {
+            decompress();
         }
+        m_freeBuffer = true;
         return;
     }
+#endif /* G3DFIX: Use ZIP-library only if defined */
 
     // Figure out how big the file is and verify that it exists.
-    m_length = fileLength(m_filename);
+    m_length = FileSystem::size(m_filename);
 
     // Read the file into memory
     FILE* file = fopen(m_filename.c_str(), "rb");
@@ -460,6 +477,42 @@ std::string BinaryInput::readString() {
     return readString(n);
 }
 
+static bool isNewline(char c) {
+    return c == '\n' || c == '\r';
+}
+
+std::string BinaryInput::readStringNewline() {
+    int64 n = 0;
+
+    if ((m_pos + m_alreadyRead + n) < (m_length - 1)) {
+        prepareToRead(1);
+    }
+
+    if ( ((m_pos + m_alreadyRead + n) < (m_length - 1)) &&
+         ! isNewline(m_buffer[m_pos + n])) {
+
+        ++n;
+        while ( ((m_pos + m_alreadyRead + n) < (m_length - 1)) &&
+                ! isNewline(m_buffer[m_pos + n])) {
+
+            prepareToRead(1);
+            ++n;
+        }
+    }
+
+    const std::string s = readString(n);
+
+    // Consume the newline
+    char firstNLChar = readUInt8();
+
+    // Consume the 2nd newline
+    if (isNewline(m_buffer[m_pos + 1]) && (m_buffer[m_pos + 1] != firstNLChar)) {
+        readUInt8();
+    }
+
+    return s;
+}
+
 
 std::string BinaryInput::readStringEven() {
     std::string x = readString();
diff --git a/dep/src/g3dlite/BinaryOutput.cpp b/dep/src/g3dlite/BinaryOutput.cpp
index 2de46c6d4bb..054211d906c 100644
--- a/dep/src/g3dlite/BinaryOutput.cpp
+++ b/dep/src/g3dlite/BinaryOutput.cpp
@@ -1,22 +1,27 @@
 /**
  @file BinaryOutput.cpp
  
- @author Morgan McGuire, graphics3d.com
- Copyright 2002-2007, Morgan McGuire, All rights reserved.
+ @author Morgan McGuire, http://graphics.cs.williams.edu
+ Copyright 2002-2010, Morgan McGuire, All rights reserved.
  
  @created 2002-02-20
- @edited  2008-01-07
+ @edited  2010-03-17
  */
 
 #include "G3D/platform.h"
 #include "G3D/BinaryOutput.h"
 #include "G3D/fileutils.h"
+#include "G3D/FileSystem.h"
 #include "G3D/stringutils.h"
 #include "G3D/Array.h"
 #include <zlib.h>
-
+#include "G3D/Log.h"
 #include <cstring>
 
+#ifdef G3D_LINUX
+#    include <errno.h>
+#endif
+
 // Largest memory buffer that the system will use for writing to
 // disk.  After this (or if the system runs out of memory)
 // chunks of the file will be dumped to disk.
@@ -155,7 +160,7 @@ void BinaryOutput::reserveBytesWhenOutOfMemory(size_t bytes) {
         //debugPrintf("Writing %d bytes to disk\n", writeBytes);
 
         const char* mode = (m_alreadyWritten > 0) ? "ab" : "wb";
-        FILE* file = fopen(m_filename.c_str(), mode);
+        FILE* file = FileSystem::fopen(m_filename.c_str(), mode);
         debugAssert(file);
 
         size_t count = fwrite(m_buffer, 1, writeBytes, file);
@@ -317,14 +322,17 @@ void BinaryOutput::commit(bool flush) {
     parseFilename(m_filename, root, pathArray, base, ext); 
 
     path = root + stringJoin(pathArray, '/');
-    if (! fileExists(path, false)) {
-        createDirectory(path);
+    if (! FileSystem::exists(path, false)) {
+        FileSystem::createDirectory(path);
     }
 
     const char* mode = (m_alreadyWritten > 0) ? "ab" : "wb";
 
-    FILE* file = fopen(m_filename.c_str(), mode);
+    FILE* file = FileSystem::fopen(m_filename.c_str(), mode);
 
+    if (! file) {
+        logPrintf("Error %d while trying to open \"%s\"\n", errno, m_filename.c_str());
+    }
     m_ok = (file != NULL) && m_ok;
 
     if (m_ok) {
@@ -340,7 +348,7 @@ void BinaryOutput::commit(bool flush) {
         if (flush) {
             fflush(file);
         }
-        fclose(file);
+        FileSystem::fclose(file);
         file = NULL;
     }
 }
diff --git a/dep/src/g3dlite/CMakeLists.txt b/dep/src/g3dlite/CMakeLists.txt
index a35db2d9a5e..2f03bbbec77 100644
--- a/dep/src/g3dlite/CMakeLists.txt
+++ b/dep/src/g3dlite/CMakeLists.txt
@@ -16,48 +16,107 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# file(GLOB g3dlite_SRCS *.cpp) # don't need all of them
+set(LIBRARY_NAME g3dlite)
 
-set(g3dlite_SRCS
-  AABox.cpp
-	Box.cpp
-	Crypto.cpp
-	format.cpp
-	Matrix3.cpp
-	Plane.cpp
-	System.cpp
-	Triangle.cpp
-	Vector3.cpp
-	Vector4.cpp
-	debugAssert.cpp
-	fileutils.cpp
-	g3dmath.cpp
-	g3dfnmatch.cpp
-	prompt.cpp
-	stringutils.cpp
-	Any.cpp
-	BinaryFormat.cpp
-	BinaryInput.cpp
-	BinaryOutput.cpp
-	Capsule.cpp
-	CollisionDetection.cpp
-	CoordinateFrame.cpp
-	Cylinder.cpp
-	Line.cpp
-	LineSegment.cpp
-	Log.cpp
-	Matrix4.cpp
-	MemoryManager.cpp
-	Quat.cpp
-	Random.cpp
-	Ray.cpp
-	ReferenceCount.cpp
-	RegistryUtil.cpp
-	Sphere.cpp
-	TextInput.cpp
-	TextOutput.cpp
-	UprightFrame.cpp
-	Vector2.cpp
+set(LIBRARY_SRCS
+    AABox.cpp
+    Any.cpp
+    #AnyVal.cpp
+    #AreaMemoryManager.cpp
+    BinaryFormat.cpp
+    BinaryInput.cpp
+    BinaryOutput.cpp
+    Box.cpp
+    #Box2D.cpp
+    #BumpMapPreprocess.cpp
+    Capsule.cpp
+    CollisionDetection.cpp
+    #Color1.cpp
+    #Color1uint8.cpp
+    #Color3.cpp
+    #Color3uint8.cpp
+    #Color4.cpp
+    #Color4uint8.cpp
+    #Cone.cpp
+    #ConvexPolyhedron.cpp
+    CoordinateFrame.cpp
+    Crypto.cpp
+    #Crypto_md5.cpp
+    Cylinder.cpp
+    FileSystem.cpp
+    #GCamera.cpp
+    #GImage.cpp
+    #GImage_bayer.cpp
+    #GImage_bmp.cpp
+    #GImage_jpeg.cpp
+    #GImage_png.cpp
+    #GImage_ppm.cpp
+    #GImage_tga.cpp
+    #GLight.cpp
+    #GThread.cpp
+    #GUniqueID.cpp
+    #Image1.cpp
+    #Image1uint8.cpp
+    #Image3.cpp
+    #Image3uint8.cpp
+    #Image4.cpp
+    #Image4uint8.cpp
+    #ImageFormat.cpp
+    #ImageFormat_convert.cpp
+    #Intersect.cpp
+    Line.cpp
+    LineSegment.cpp
+    Log.cpp
+    #Matrix.cpp
+    Matrix3.cpp
+    Matrix4.cpp
+    MemoryManager.cpp
+    #MeshAlg.cpp
+    #MeshAlgAdjacency.cpp
+    #MeshAlgWeld.cpp
+    #MeshBuilder.cpp
+    #NetAddress.cpp
+    #NetworkDevice.cpp
+    PhysicsFrame.cpp
+    #PhysicsFrameSpline.cpp
+    Plane.cpp
+    #PrecomputedRandom.cpp
+    Quat.cpp
+    Random.cpp
+    Ray.cpp
+    #Rect2D.cpp
+    ReferenceCount.cpp
+    RegistryUtil.cpp
+    Sphere.cpp
+    #SplineBase.cpp
+    #Stopwatch.cpp
+    System.cpp
+    TextInput.cpp
+    TextOutput.cpp
+    #ThreadSet.cpp
+    Triangle.cpp
+    UprightFrame.cpp
+    Vector2.cpp
+    #Vector2int16.cpp
+    Vector3.cpp
+    #Vector3int16.cpp
+    #Vector3int32.cpp
+    Vector4.cpp
+    #Vector4int8.cpp
+    #Welder.cpp
+    #WinMain.cpp
+    #XML.cpp
+    #constants.cpp
+    debugAssert.cpp
+    fileutils.cpp
+    #filter.cpp
+    format.cpp
+    g3dfnmatch.cpp
+    g3dmath.cpp
+    #license.cpp
+    prompt.cpp
+    stringutils.cpp
+    uint128.cpp
 )
 
 include_directories(
@@ -67,12 +126,12 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dep/include/zlib
 )
 
-add_library(g3dlite STATIC
-  ${g3dlite_SRCS}
+add_library(${LIBRARY_NAME} STATIC
+  ${LIBRARY_SRCS}
 )
 
 if(WIN32)
-  target_link_libraries(g3dlite
+  target_link_libraries(${LIBRARY_NAME}
     zlib
   )
 endif()
diff --git a/dep/src/g3dlite/CollisionDetection.cpp b/dep/src/g3dlite/CollisionDetection.cpp
index 77eef0a5500..85cf815df72 100644
--- a/dep/src/g3dlite/CollisionDetection.cpp
+++ b/dep/src/g3dlite/CollisionDetection.cpp
@@ -2267,7 +2267,7 @@ bool CollisionDetection::fixedSolidSphereIntersectsFixedTriangle(
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// AABB-triangle overlap test code based on Tomas Akenine-M��ller's
+// AABB-triangle overlap test code based on Tomas Akenine-M�ller's
 // http://www.cs.lth.se/home/Tomas_Akenine_Moller/code/tribox3.txt
 // Ported 2008-12-28
 
diff --git a/dep/src/g3dlite/CoordinateFrame.cpp b/dep/src/g3dlite/CoordinateFrame.cpp
index 9b639b62082..7f9a4c098a5 100644
--- a/dep/src/g3dlite/CoordinateFrame.cpp
+++ b/dep/src/g3dlite/CoordinateFrame.cpp
@@ -6,7 +6,7 @@
  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
 
  @created 2001-06-02
- @edited  2009-11-13
+ @edited  2010-03-13
 
  Copyright 2000-2010, Morgan McGuire.
  All rights reserved.
@@ -26,23 +26,52 @@
 #include "G3D/UprightFrame.h"
 #include "G3D/Any.h"
 #include "G3D/stringutils.h"
+#include "G3D/PhysicsFrame.h"
+#include "G3D/UprightFrame.h"
 
 namespace G3D {
 
+
+std::string CoordinateFrame::toXYZYPRDegreesString() const {
+    UprightFrame uframe(*this);
+    
+    return format("CFrame::fromXYZYPRDegrees(% 5.1ff, % 5.1ff, % 5.1ff, % 5.1ff, % 5.1ff, % 5.1ff)", 
+                  uframe.translation.x, uframe.translation.y, uframe.translation.z, 
+                  toDegrees(uframe.yaw), toDegrees(uframe.pitch), 0.0f);
+}
+
+
 CoordinateFrame::CoordinateFrame(const Any& any) {
-    any.verifyName("CFrame");
-    if (toUpper(any.name()) == "CFRAME") {
+    *this = CFrame();
+
+    const std::string& n = toUpper(any.name());
+
+    if (beginsWith(n, "VECTOR3")) {
+        translation = any;
+    } else if (beginsWith(n, "MATRIX3")) {
+        rotation = any;
+    } else if ((n == "CFRAME") || (n == "COORDINATEFRAME")) {
         any.verifyType(Any::TABLE, Any::ARRAY);
-        if (any.type() == Any::TABLE) {
-            rotation    = any["rotation"];
-            translation = any["translation"];
-        } else {
+        if (any.type() == Any::ARRAY) {
             any.verifySize(2);
             rotation    = any[0];
             translation = any[1];
+        } else {
+            for (Any::AnyTable::Iterator it = any.table().begin(); it.hasMore(); ++it) {
+                const std::string& n = toLower(it->key);
+                if (n == "translation") {
+                    translation = Vector3(it->value);
+                } else if (n == "rotation") {
+                    rotation = Matrix3(it->value);
+                } else {
+                    any.verify(false, "Illegal table key: " + it->key);
+                }
+            }
         }
+    } else if (beginsWith(n, "PHYSICSFRAME") || beginsWith(n, "PFRAME")) {
+        *this = PhysicsFrame(any);
     } else {
-        any.verifyName("CFrame::fromXYZYPRDegrees");
+        any.verifyName("CFrame::fromXYZYPRDegrees", "CoordinateFrame::fromXYZYPRDegrees");
         any.verifyType(Any::ARRAY);
         any.verifySize(3, 6);
 
@@ -370,12 +399,12 @@ CoordinateFrame CoordinateFrame::lerp(
     } else if (alpha == 0.0f) {
         return *this;
     } else {
-        Quat q1 = Quat(this->rotation);
-        Quat q2 = Quat(other.rotation);
+        const Quat q1(this->rotation);
+        const Quat q2(other.rotation);
 
         return CoordinateFrame(
             q1.slerp(q2, alpha).toRotationMatrix(),
-            this->translation * (1 - alpha) + other.translation * alpha);
+            translation * (1 - alpha) + other.translation * alpha);
     }
 } 
 
@@ -383,7 +412,7 @@ CoordinateFrame CoordinateFrame::lerp(
 void CoordinateFrame::pointToWorldSpace(const Array<Vector3>& v, Array<Vector3>& vout) const {
     vout.resize(v.size());
 
-    for (int i = v.size() - 1; i >= 0; --i) {
+    for (int i = 0; i < v.size(); ++i) {
         vout[i] = pointToWorldSpace(v[i]);
     }
 }
@@ -392,7 +421,7 @@ void CoordinateFrame::pointToWorldSpace(const Array<Vector3>& v, Array<Vector3>&
 void CoordinateFrame::normalToWorldSpace(const Array<Vector3>& v, Array<Vector3>& vout) const  {
     vout.resize(v.size());
 
-    for (int i = v.size() - 1; i >= 0; --i) {
+    for (int i = 0; i < v.size(); ++i) {
         vout[i] = normalToWorldSpace(v[i]);
     }
 }
diff --git a/dep/src/g3dlite/FileSystem.cpp b/dep/src/g3dlite/FileSystem.cpp
new file mode 100644
index 00000000000..e51098a1de6
--- /dev/null
+++ b/dep/src/g3dlite/FileSystem.cpp
@@ -0,0 +1,867 @@
+/**
+ @file FileSystem.cpp
+ 
+ @author Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @author  2002-06-06
+ @edited  2010-04-10
+ */
+#include "G3D/FileSystem.h"
+#include "G3D/System.h"
+#include "G3D/stringutils.h"
+#include "G3D/fileutils.h"
+#include <sys/stat.h>
+#include <sys/types.h>
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+#include "zip.h"
+#endif /* G3DFIX: Use ZIP-library only if defined */
+#include "G3D/g3dfnmatch.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+
+#ifdef G3D_WIN32
+    // Needed for _getcwd
+#   include <direct.h>
+
+    // Needed for _findfirst
+#   include <io.h>
+
+#define stat64 _stat64
+#else
+#   include <dirent.h>
+#   include <fnmatch.h>
+#   include <unistd.h>
+#   define _getcwd getcwd
+#   define _stat stat
+#endif
+
+namespace G3D {
+
+static FileSystem* common = NULL;
+
+FileSystem& FileSystem::instance() {
+    init();
+    return *common;
+}
+
+
+void FileSystem::init() {
+    if (common == NULL) {
+        common = new FileSystem();
+    }
+}
+
+
+void FileSystem::cleanup() {
+    if (common != NULL) {
+        delete common;
+        common = NULL;
+    }
+}
+
+FileSystem::FileSystem() : m_cacheLifetime(10) {}
+
+/////////////////////////////////////////////////////////////
+
+bool FileSystem::Dir::contains(const std::string& f) const {
+    
+    for (int i = 0; i < nodeArray.size(); ++i) {
+#       ifdef G3D_WIN32
+            if (stricmp(f.c_str(), nodeArray[i].name.c_str()) == 0) {
+                return true;
+            }
+#       else
+            if (f == nodeArray[i].name) {
+                return true;
+            }
+#       endif
+    }
+    return false;
+}
+    
+void FileSystem::Dir::computeZipListing(const std::string& zipfile, const std::string& pathInsideZipfile) {
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+    struct zip* z = zip_open( FilePath::removeTrailingSlash(zipfile).c_str(), ZIP_CHECKCONS, NULL );
+    debugAssert(z);
+
+    int count = zip_get_num_files( z );
+    Set<std::string> alreadyAdded;
+    for (int i = 0; i < count; ++i) {
+        struct zip_stat info;
+        zip_stat_init( &info );    // TODO: Docs unclear if zip_stat_init is required.
+        zip_stat_index( z, i, ZIP_FL_NOCASE, &info );
+        
+        // Fully-qualified name of a file inside zipfile
+        std::string name = info.name;
+
+        if (beginsWith(name, pathInsideZipfile)) {
+            // We found something inside the directory we were looking for,
+            // so the directory itself must exist                        
+            exists = true;
+
+            // For building the cached directory listing, extract only elements that do not contain 
+            // additional subdirectories.
+
+            int start = pathInsideZipfile.size();
+            if ((int(name.length()) > start) && isSlash(name[start])) {
+                ++start;
+            }
+            int end = findSlash(name, start);
+            if (end == -1) {
+                // There are no more slashes; add this name
+                name = name.substr(start);
+                if (alreadyAdded.insert(name)) {
+                    Entry& e = nodeArray.next();
+                    e.name = name;
+                    e.type = FILE_TYPE;
+                }
+            } else {
+                // There are more slashes, indicating that this is a directory
+                name = name.substr(start, end);
+                if (alreadyAdded.insert(name)) {
+                    Entry& e = nodeArray.next();
+                    e.name = name;
+                    e.type = DIR_TYPE;
+                }
+            }
+        }
+    }
+    
+    zip_close(z);
+    z = NULL;
+#endif /* G3DFIX: Use ZIP-library only if defined */
+}
+
+
+FileSystem::Dir& FileSystem::getContents(const std::string& path, bool forceUpdate) {
+    const std::string& key = 
+#   if defined(G3D_WIN32)
+        FilePath::canonicalize(FilePath::removeTrailingSlash(toLower(FilePath::canonicalize(resolve(path)))));
+#   else
+        FilePath::canonicalize(FilePath::removeTrailingSlash(FilePath::canonicalize(resolve(path))));
+#   endif
+    
+    RealTime now = System::time();
+    Dir& dir = m_cache.getCreate(key);
+
+    if ((now > dir.lastChecked + cacheLifetime()) || forceUpdate) {
+        dir = Dir();
+
+        // Out of date: update
+        dir.lastChecked = now;
+
+        struct _stat st;
+        const bool exists = _stat(key.c_str(), &st) != -1;
+        const bool isDirectory = (st.st_mode & S_IFDIR) != 0;
+
+        // Does this path exist on the real filesystem?
+        if (exists && isDirectory) {
+
+            // Is this path actually a directory?
+            if (isDirectory) {
+                dir.exists = true;
+                // Update contents
+#               ifdef G3D_WIN32
+                    const std::string& filespec = FilePath::concat(key, "*");
+                    struct _finddata_t fileinfo;
+                    intptr_t handle = _findfirst(filespec.c_str(), &fileinfo);
+                    debugAssert(handle != -1);
+                    int result = 0;
+                    do {
+                        if ((strcmp(fileinfo.name, ".") != 0) && (strcmp(fileinfo.name, "..") != 0)) {
+                            Entry& e = dir.nodeArray.next();
+                            e.name = fileinfo.name;
+                            if ((fileinfo.attrib & _A_SUBDIR) != 0) {
+                                e.type = DIR_TYPE;
+                            } else {
+                                e.type = FILE_TYPE;
+                            }
+                        }
+
+                        result = _findnext(handle, &fileinfo);
+                    } while (result == 0);
+                    _findclose(handle);
+
+#               else
+                    DIR* listing = opendir(key.c_str());
+                    debugAssertM(listing, "opendir failed on '" + key + "'");
+                    struct dirent* entry = readdir(listing);
+                    while (entry != NULL) {
+                        if ((strcmp(entry->d_name, "..") != 0) && (strcmp(entry->d_name, ".") != 0)) {
+                            Entry& e = dir.nodeArray.next();
+                            e.name = entry->d_name;
+
+#                           ifdef _DIRENT_HAVE_D_TYPE
+                                // Not all POSIX systems support this field
+                                // http://www.delorie.com/gnu/docs/glibc/libc_270.html
+                                switch (entry->d_type) {
+                                case DT_DIR:
+                                    e.type = DIR_TYPE;
+                                    break;
+                                    
+                                case DT_REG:
+                                    e.type = FILE_TYPE;
+                                    break;
+                                    
+                                case DT_UNKNOWN:
+                                default:
+                                    e.type = UNKNOWN;
+                                    break;
+                                }
+#                           endif
+                        }
+                        entry = readdir(listing);
+                    }
+                    closedir(listing);
+                    listing = NULL;
+                    entry = NULL;
+#               endif
+            }
+
+        } else {
+            std::string zip;
+
+            if (exists && isZipfile(path)) {
+                // This is a zipfile; get its root
+                dir.isZipfile = true;                
+                dir.computeZipListing(path, "");
+
+            } else if (inZipfile(path, zip)) {
+
+                // There is a zipfile somewhere in the path.  Does
+                // the rest of the path exist inside the zipfile?
+                dir.inZipfile = true;
+
+                dir.computeZipListing(zip, path.substr(zip.length() + 1));
+            }
+        }        
+    }
+
+    return dir;
+}
+
+
+bool FileSystem::_inZipfile(const std::string& path, std::string& z) {
+    // Reject trivial cases before parsing
+    if (path.find('.') == std::string::npos) {
+        // There is no zipfile possible, since G3D requires
+        // an extension on zipfiles.
+        return false;
+    }
+
+    // Look at all sub-paths containing periods.
+    // For each, ask if it is a zipfile.
+    int current = 0;
+    current = path.find('.', current);
+
+    while (current != -1) {
+        // xxxxx/foo.zip/yyyyy
+        current = path.find('.', current);
+
+        // Look forward for the next slash
+        int s = findSlash(path, current);
+
+        if (s == -1) {
+            // No more slashes
+            return false;
+        }
+
+        z = path.substr(0, s); 
+        if (_isZipfile(z)) {
+            return true;
+        }
+        
+        current = s + 1;
+    }
+
+    z = "";
+    return false;
+}
+
+
+bool FileSystem::_isZipfile(const std::string& filename) {
+    if (FilePath::ext(filename).empty()) {
+        return false;
+    }
+    
+    FILE* f = fopen(FilePath::removeTrailingSlash(filename).c_str(), "r");
+    if (f == NULL) {
+        return false;
+    }
+    uint8 header[4];
+    fread(header, 4, 1, f);
+    
+    const uint8 zipHeader[4] = {0x50, 0x4b, 0x03, 0x04};
+    for (int i = 0; i < 4; ++i) {
+        if (header[i] != zipHeader[i]) {
+            fclose(f);
+            return false;
+        }
+    }
+    
+    fclose(f);
+    return true;
+}
+
+
+FILE* FileSystem::_fopen(const char* filename, const char* mode) {
+    for (const char* m = mode; *m != '\0'; ++m) {
+        if (*m == 'w') {
+            // Purge the cache entry for the parent of this directory
+            _clearCache(FilePath::parent(_resolve(filename)));
+            break;
+        }
+    }
+    return ::fopen(filename, mode);
+}
+
+
+void FileSystem::_clearCache(const std::string& path) {
+    if ((path == "") || FilePath::isRoot(path)) {
+        m_cache.clear();
+    } else {
+        Array<std::string> keys;
+        m_cache.getKeys(keys);
+
+        const std::string& prefix = 
+#           ifdef G3D_WIN32
+                toLower(FilePath::canonicalize(FilePath::removeTrailingSlash(_resolve(path))));
+#           else
+                FilePath::canonicalize(FilePath::removeTrailingSlash(_resolve(path)));
+#           endif
+        const std::string& prefixSlash = prefix + "/";
+
+        for (int k = 0; k < keys.size(); ++k) {
+            const std::string& key = keys[k];
+            if ((key == prefix) || beginsWith(key, prefixSlash)) {
+                m_cache.remove(keys[k]);
+            }
+        }
+    }
+}
+
+
+void FileSystem::_setCacheLifetime(float t) {
+    m_cacheLifetime = t;
+}
+
+
+void FileSystem::_createDirectory(const std::string& dir) {
+    
+    if (dir == "") {
+        return;
+    }
+    
+    std::string d = _resolve(dir);
+    
+    // Add a trailing / if there isn't one.
+    switch (d[d.size() - 1]) {
+    case '/':
+    case '\\':
+        break;
+
+    default:
+        d += "/";
+    }
+
+    // If it already exists, do nothing
+    if (_exists(FilePath::removeTrailingSlash(d))) {
+        return;
+    }
+
+    // Parse the name apart
+    std::string root, base, ext;
+    Array<std::string> path;
+
+    std::string lead;
+    FilePath::parse(d, root, path, base, ext);
+    debugAssert(base == "");
+    debugAssert(ext == "");
+
+    // Begin with an extra period so "c:\" becomes "c:\.\" after
+    // appending a path and "c:" becomes "c:.\", not root: "c:\"
+    std::string p = root + ".";
+
+    // Create any intermediate that doesn't exist
+    for (int i = 0; i < path.size(); ++i) {
+        p += "/" + path[i];
+        if (! _exists(p)) {
+            // Windows only requires one argument to mkdir,
+            // where as unix also requires the permissions.
+#           ifndef G3D_WIN32
+                mkdir(p.c_str(), 0777);
+#           else
+                _mkdir(p.c_str());
+#           endif
+        }
+    }
+
+    _clearCache(FilePath::parent(FilePath::removeTrailingSlash(d)));
+}
+
+
+void FileSystem::_copyFile(const std::string& source, const std::string& dest) {
+#   ifdef G3D_WIN32
+        // TODO: handle case where srcPath is in a zipfile
+        CopyFileA(source.c_str(), dest.c_str(), FALSE);
+        _clearCache(FilePath::parent(_resolve(dest)));
+#   else
+        // Read it all in, then dump it out
+        BinaryInput  in(source, G3D_LITTLE_ENDIAN);
+        BinaryOutput out(dest, G3D_LITTLE_ENDIAN);
+        out.writeBytes(in.getCArray(), in.size());
+        out.commit(false);
+#   endif        
+}
+
+
+bool FileSystem::_exists(const std::string& f, bool trustCache) {
+
+    if (FilePath::isRoot(f)) {
+#       ifdef G3D_WIN32
+            const std::string& winname = toLower(f.substr(0, 1)) + ":\\";
+            return _drives().contains(winname);
+#       else
+            return true;
+#       endif
+    }
+
+    std::string path = FilePath::removeTrailingSlash(f);
+    std::string parentPath = FilePath::parent(path);
+
+    const Dir& entry = getContents(parentPath, ! trustCache);
+
+    if (FilePath::containsWildcards(f)) {
+        if (! entry.exists) {
+            // The directory didn't exist, so neither do its contents
+            return false;
+        } 
+
+        const std::string& pattern = FilePath::baseExt(path);
+
+#       ifdef G3D_WIN32
+            static const int flags = FNM_CASEFOLD;
+#       else
+            static const int flags = 0;
+#       endif
+
+        // See if any element of entry matches the wild card
+        for (int i = 0; i < entry.nodeArray.size(); ++i) {
+            if (FilePath::matches(entry.nodeArray[i].name, pattern, flags)) {
+                return true;
+            }
+        }
+
+        // Could not find a match
+        return false;
+
+    } else {
+        return entry.exists && entry.contains(FilePath::baseExt(path));
+    }
+}
+
+
+bool FileSystem::_isDirectory(const std::string& filename) {
+    // TODO: work with zipfiles and cache
+    struct _stat st;
+    const bool exists = _stat(FilePath::removeTrailingSlash(filename).c_str(), &st) != -1;
+    return exists && ((st.st_mode & S_IFDIR) != 0);
+}
+
+
+std::string FileSystem::_resolve(const std::string& filename, const std::string& cwd) {
+    if (filename.size() >= 1) {
+        if (isSlash(filename[0])) {
+            // Already resolved
+            return filename;
+        } else {
+
+            #ifdef G3D_WIN32
+                if ((filename.size() >= 2) && (filename[1] == ':')) {
+                    // There is a drive spec on the front.
+                    if ((filename.size() >= 3) && isSlash(filename[2])) {
+                        // Already fully qualified
+                        return filename;
+                    } else {
+                        // The drive spec is relative to the
+                        // working directory on that drive.
+                        debugAssertM(false, "Files of the form d:path are"
+                                     " not supported (use a fully qualified"
+                                     " name).");
+                        return filename;
+                    }
+                }
+            #endif
+        }
+    }
+
+    // Prepend the working directory.
+    return FilePath::concat(cwd, filename);
+}
+
+
+std::string FileSystem::_currentDirectory() {
+    static const int N = 2048;
+    char buffer[N];
+
+    _getcwd(buffer, N);
+    return std::string(buffer);
+}
+
+
+bool FileSystem::_isNewer(const std::string& src, const std::string& dst) {
+    // TODO: work with cache and zipfiles
+    struct _stat sts;
+    bool sexists = _stat(src.c_str(), &sts) != -1;
+
+    struct _stat dts;
+    bool dexists = _stat(dst.c_str(), &dts) != -1;
+
+    return sexists && ((! dexists) || (sts.st_mtime > dts.st_mtime));
+}
+
+
+int64 FileSystem::_size(const std::string& filename) {
+    struct stat64 st;
+    int result = stat64(filename.c_str(), &st);
+    
+    if (result == -1) {
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+        std::string zip, contents;
+        if (zipfileExists(filename, zip, contents)) {
+            int64 requiredMem;
+            
+            struct zip *z = zip_open( zip.c_str(), ZIP_CHECKCONS, NULL );
+            debugAssertM(z != NULL, zip + ": zip open failed.");
+            {
+                struct zip_stat info;
+                zip_stat_init( &info );    // Docs unclear if zip_stat_init is required.
+                int success = zip_stat( z, contents.c_str(), ZIP_FL_NOCASE, &info );
+                debugAssertM(success == 0, zip + ": " + contents + ": zip stat failed.");
+                requiredMem = info.size;
+            }
+            zip_close(z);
+            return requiredMem;
+        } else {
+#endif /* G3DFIX: Use ZIP-library only if defined */
+            return -1;
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+        }
+#endif /* G3DFIX: Use ZIP-library only if defined */
+    }
+    
+    return st.st_size;
+}
+
+
+void FileSystem::listHelper(const std::string& shortSpec, const std::string& parentPath, Array<std::string>& result, const ListSettings& settings) {
+    Dir& dir = getContents(parentPath, false);
+
+    if (! dir.exists) {
+        return;
+    }
+
+    for (int i = 0; i < dir.nodeArray.size(); ++i) {
+        Entry& entry = dir.nodeArray[i];
+        // See if it matches the spec
+        if (FilePath::matches(entry.name, shortSpec, settings.caseSensitive)) {
+
+            if ((entry.type == UNKNOWN) && ! (settings.files && settings.directories)) {
+                // Update the type
+                entry.type = isDirectory(FilePath::concat(parentPath, entry.name)) ? DIR_TYPE : FILE_TYPE;
+            }
+            
+            if ((settings.files && settings.directories) ||
+                (settings.files && (entry.type == FILE_TYPE)) ||
+                (settings.directories && (entry.type == DIR_TYPE))) {
+                
+                if (settings.includeParentPath) {
+                    result.append(FilePath::concat(parentPath, entry.name));
+                } else {
+                    result.append(entry.name);
+                }
+            }
+        } // match
+
+        if (settings.recursive && (entry.type == DIR_TYPE)) {
+            listHelper(shortSpec, FilePath::concat(parentPath, entry.name), result, settings);
+        }
+    } // for
+}
+
+
+void FileSystem::_list(const std::string& spec, Array<std::string>& result, const ListSettings& settings) {
+    const std::string& shortSpec = FilePath::baseExt(spec);
+    const std::string& parentPath = FilePath::parent(spec);
+
+    listHelper(shortSpec, parentPath, result, settings);
+}
+
+
+
+#ifdef G3D_WIN32
+const Array<std::string>& FileSystem::_drives() {
+    if (m_winDrive.length() == 0) {
+        // See http://msdn.microsoft.com/en-us/library/aa364975(VS.85).aspx
+        static const size_t bufSize = 5000;
+        char bufData[bufSize];
+        GetLogicalDriveStringsA(bufSize, bufData);
+
+        // Drive list is a series of NULL-terminated strings, itself terminated with a NULL.
+        for (int i = 0; bufData[i] != '\0'; ++i) {
+            const char* thisString = bufData + i;
+            m_winDrive.append(toLower(thisString));
+            i += strlen(thisString) + 1;
+        }
+    }
+
+    return m_winDrive;
+}
+#endif
+
+/////////////////////////////////////////////////////////////////////
+
+bool FilePath::isRoot(const std::string& f) {
+#   ifdef G3D_WIN32
+        if (f.length() < 2) {
+            return false;
+        }
+
+        if (f[1] == ':') {
+            if (f.length() == 2) {
+                // e.g.,   "x:"
+                return true;
+            } else if ((f.length() == 3) && isSlash(f[2])) {
+                // e.g.,   "x:\"
+                return true;
+            }
+        }
+
+        if (isSlash(f[0]) && isSlash(f[1])) {        
+            // e.g., "\\foo\"
+            return true;
+        }
+#   else
+        if (f == "/") {
+            return true;
+        }
+#   endif
+
+    return false;
+}
+
+
+std::string FilePath::removeTrailingSlash(const std::string& f) {
+    bool removeSlash = ((endsWith(f, "/") || endsWith(f, "\\"))) && ! isRoot(f);
+
+    return removeSlash ? f.substr(0, f.length() - 1) : f;
+}
+
+
+std::string FilePath::concat(const std::string& dirname, const std::string& file) {
+    // Ensure that the directory ends in a slash
+    if (! dirname.empty() && 
+        ! isSlash(dirname[dirname.size() - 1]) &&
+        (dirname[dirname.size() - 1] != ':')) {
+        return dirname + '/' + file;
+    } else {
+        return dirname + file;
+    }
+}
+
+
+std::string FilePath::ext(const std::string& filename) {
+    int i = filename.rfind(".");
+    if (i >= 0) {
+        return filename.substr(i + 1, filename.length() - i);
+    } else {
+        return "";
+    }
+}
+
+
+std::string FilePath::baseExt(const std::string& filename) {
+    int i = findLastSlash(filename);
+
+#   ifdef G3D_WIN32
+        int j = filename.rfind(":");
+        if ((i == -1) && (j >= 0)) {
+            i = j;
+        }
+#   endif
+
+    if (i == -1) {
+        return filename;
+    } else {
+        return filename.substr(i + 1, filename.length() - i);
+    }
+}
+
+
+std::string FilePath::base(const std::string& path) {
+    std::string filename = baseExt(path);
+    int i = filename.rfind(".");
+    if (i == -1) {
+        // No extension
+        return filename;
+    } else {
+        return filename.substr(0, i);
+    }
+}
+
+
+std::string FilePath::parent(const std::string& path) {    
+    int i = findLastSlash(removeTrailingSlash(path));
+
+#   ifdef G3D_WIN32
+        int j = path.rfind(":");
+        if ((i == -1) && (j >= 0)) {
+            i = j;
+        }
+#   endif
+
+    if (i == -1) {
+        return "";
+    } else {
+        return path.substr(0, i + 1);
+    }
+}
+
+
+bool FilePath::containsWildcards(const std::string& filename) {
+    return (filename.find('*') != std::string::npos) || (filename.find('?') != std::string::npos);
+}
+
+
+bool FilePath::matches(const std::string& path, const std::string& pattern, bool caseSensitive) {
+    int flags = FNM_PERIOD | FNM_NOESCAPE | FNM_PATHNAME;
+    if (!  caseSensitive) {
+        flags |= FNM_CASEFOLD;
+    }
+    return g3dfnmatch(pattern.c_str(), path.c_str(), flags) == 0;
+}
+
+
+static int fixslash(int c) {
+    return (c == '\\') ? '/' : c;
+}
+
+
+std::string FilePath::canonicalize(std::string x) {
+    std::transform(x.begin(), x.end(), x.begin(), fixslash);
+    return x;
+}
+
+
+void FilePath::parse
+(const std::string&     filename,
+ std::string&           root,
+ Array<std::string>&    path,
+ std::string&           base,
+ std::string&           ext) {
+
+    std::string f = filename;
+
+    root = "";
+    path.clear();
+    base = "";
+    ext = "";
+
+    if (f == "") {
+        // Empty filename
+        return;
+    }
+
+    // See if there is a root/drive spec.
+    if ((f.size() >= 2) && (f[1] == ':')) {
+        
+        if ((f.size() > 2) && isSlash(f[2])) {
+        
+            // e.g.  c:\foo
+            root = f.substr(0, 3);
+            f = f.substr(3, f.size() - 3);
+        
+        } else {
+        
+            // e.g.  c:foo
+            root = f.substr(2);
+            f = f.substr(2, f.size() - 2);
+
+        }
+
+    } else if ((f.size() >= 2) & isSlash(f[0]) && isSlash(f[1])) {
+        
+        // e.g. //foo
+        root = f.substr(0, 2);
+        f = f.substr(2, f.size() - 2);
+
+    } else if (isSlash(f[0])) {
+        
+        root = f.substr(0, 1);
+        f = f.substr(1, f.size() - 1);
+
+    }
+
+    // Pull the extension off
+    {
+        // Find the period
+        size_t i = f.rfind('.');
+
+        if (i != std::string::npos) {
+            // Make sure it is after the last slash!
+            size_t j = iMax(f.rfind('/'), f.rfind('\\'));
+            if ((j == std::string::npos) || (i > j)) {
+                ext = f.substr(i + 1, f.size() - i - 1);
+                f = f.substr(0, i);
+            }
+        }
+    }
+
+    // Pull the basename off
+    {
+        // Find the last slash
+        size_t i = iMax(f.rfind('/'), f.rfind('\\'));
+        
+        if (i == std::string::npos) {
+            
+            // There is no slash; the basename is the whole thing
+            base = f;
+            f    = "";
+
+        } else if ((i != std::string::npos) && (i < f.size() - 1)) {
+            
+            base = f.substr(i + 1, f.size() - i - 1);
+            f    = f.substr(0, i);
+
+        }
+    }
+
+    // Parse what remains into path.
+    size_t prev, cur = 0;
+
+    while (cur < f.size()) {
+        prev = cur;
+        
+        // Allow either slash
+        size_t i = f.find('/', prev + 1);
+        size_t j = f.find('\\', prev + 1);
+        if (i == std::string::npos) {
+            i = f.size();
+        }
+
+        if (j == std::string::npos) {
+            j = f.size();
+        }
+
+        cur = iMin(i, j);
+
+        if (cur == std::string::npos) {
+            cur = f.size();
+        }
+
+        path.append(f.substr(prev, cur - prev));
+        ++cur;
+    }
+}
+
+}
diff --git a/dep/src/g3dlite/GCamera.cpp b/dep/src/g3dlite/GCamera.cpp
index 64b0c94543e..0ffc7eb7374 100644
--- a/dep/src/g3dlite/GCamera.cpp
+++ b/dep/src/g3dlite/GCamera.cpp
@@ -5,7 +5,7 @@
   @author Jeff Marsceill, 08jcm@williams.edu
  
   @created 2005-07-20
-  @edited  2009-11-24
+  @edited  2010-02-22
 */
 #include "G3D/GCamera.h"
 #include "G3D/platform.h"
@@ -45,6 +45,8 @@ GCamera::GCamera(const Any& any) {
             m_nearPlaneZ = it->value;
         } else if (k == "FARPLANEZ") {
             m_farPlaneZ = it->value;
+        } else if (k == "PIXELOFFSET") {
+            m_pixelOffset = it->value;
         } else {
             any.verify(false, std::string("Illegal key in table: ") + it->key);
         }
@@ -61,6 +63,7 @@ GCamera::operator Any() const {
     any.set("nearPlaneZ", nearPlaneZ());
     any.set("farPlaneZ", farPlaneZ());
     any.set("coordinateFrame", coordinateFrame());
+    any.set("pixelOffset", pixelOffset());
 
     return any;
 }
@@ -68,7 +71,7 @@ GCamera::operator Any() const {
 
 GCamera::GCamera() {
     setNearPlaneZ(-0.2f);
-    setFarPlaneZ(-100.0f);
+    setFarPlaneZ(-150.0f);
     setFieldOfView((float)toRadians(90.0f), HORIZONTAL);
 }
 
@@ -171,8 +174,8 @@ void GCamera::getProjectPixelMatrix(const Rect2D& viewport, Matrix4& P) const {
     float sx = screenWidth / 2.0;
     float sy = screenHeight / 2.0;
 
-    P = Matrix4(sx, 0, 0, sx + viewport.x0(),
-                0, -sy, 0, sy + viewport.y0(),
+    P = Matrix4(sx, 0, 0, sx + viewport.x0() - m_pixelOffset.x,
+                0, -sy, 0, sy + viewport.y0() + m_pixelOffset.y,
                 0, 0,  1, 0,
                 0, 0,  0, 1) * P;
 }
@@ -185,24 +188,28 @@ void GCamera::getProjectUnitMatrix(const Rect2D& viewport, Matrix4& P) const {
 
     float r, l, t, b, n, f, x, y;
 
+    float s = 1.0f;
     if (m_direction == VERTICAL) {
         y = -m_nearPlaneZ * tan(m_fieldOfView / 2);
         x = y * (screenWidth / screenHeight);
+        s = screenHeight;
     } else { //m_direction == HORIZONTAL
         x = -m_nearPlaneZ * tan(m_fieldOfView / 2);
         y = x * (screenHeight / screenWidth);
+        s = screenWidth;
     }
 
     n = -m_nearPlaneZ;
     f = -m_farPlaneZ;
-    r = x;
-    l = -x;
-    t = y;
-    b = -y;
+    r = x  - m_pixelOffset.x/s;
+    l = -x - m_pixelOffset.x/s;
+    t = y  + m_pixelOffset.y/s;
+    b = -y + m_pixelOffset.y/s;
 
     P = Matrix4::perspectiveProjection(l, r, b, t, n, f);
 }
 
+
 Vector3 GCamera::projectUnit(const Vector3& point, const Rect2D& viewport) const {
     Matrix4 M;
     getProjectUnitMatrix(viewport, M);
@@ -244,7 +251,7 @@ Vector3 GCamera::unproject(const Vector3& v, const Rect2D& viewport) const {
         z = 1.0f / ((((1.0f / f) - (1.0f / n)) * v.z) + 1.0f / n);
     }
 
-    const Ray& ray = worldRay(v.x, v.y, viewport);
+    const Ray& ray = worldRay(v.x - m_pixelOffset.x, v.y - m_pixelOffset.y, viewport);
 
     // Find out where the ray reaches the specified depth.
     const Vector3& out = ray.origin() + ray.direction() * -z / (ray.direction().dot(m_cframe.lookVector()));
@@ -481,6 +488,7 @@ void GCamera::serialize(BinaryOutput& bo) const {
     bo.writeFloat32(farPlaneZ());
     m_cframe.serialize(bo);
     bo.writeInt8(m_direction);
+    m_pixelOffset.serialize(bo);
 }
 
 
@@ -492,6 +500,7 @@ void GCamera::deserialize(BinaryInput& bi) {
     debugAssert(m_farPlaneZ < 0.0f);
     m_cframe.deserialize(bi);
     m_direction = (FOVDirection)bi.readInt8();
+    m_pixelOffset.deserialize(bi);
 }
 
 
diff --git a/dep/src/g3dlite/GImage.cpp b/dep/src/g3dlite/GImage.cpp
index 9527e96cf67..19a2b1e71f4 100644
--- a/dep/src/g3dlite/GImage.cpp
+++ b/dep/src/g3dlite/GImage.cpp
@@ -639,7 +639,7 @@ void GImage::rotate90CW(int numTimes) {
     for (int j = 0; j < numTimes; ++j) {
         {
             uint8* temp = old;
-            uint8* old = m_byte;
+            old = m_byte;
             m_byte = temp;
         }
         
diff --git a/dep/src/g3dlite/GImage_png.cpp b/dep/src/g3dlite/GImage_png.cpp
index 0a515bf7ed2..875c7015cd1 100644
--- a/dep/src/g3dlite/GImage_png.cpp
+++ b/dep/src/g3dlite/GImage_png.cpp
@@ -71,10 +71,20 @@ void png_warning(
 void GImage::encodePNG(
     BinaryOutput&           out) const {
 
-    debugAssert( m_channels == 1 || m_channels == 3 || m_channels == 4 );
+    if (! (m_channels == 1 || m_channels == 3 || m_channels == 4)) {
+        throw GImage::Error(format("Illegal channels for PNG: %d", m_channels), out.getFilename());
+    }
+    if (m_width <= 0) {
+        throw GImage::Error(format("Illegal width for PNG: %d", m_width), out.getFilename());
+    }
+    if (m_height <= 0) {
+        throw GImage::Error(format("Illegal height for PNG: %d", m_height), out.getFilename());
+    }
 
-    if (m_height > (int)(PNG_UINT_32_MAX / png_sizeof(png_bytep)))
+    // PNG library requires that the height * pointer size fit within an int
+    if (png_uint_32(m_height) * png_sizeof(png_bytep) > PNG_UINT_32_MAX) {
         throw GImage::Error("Unsupported PNG height.", out.getFilename());
+    }
 
     out.setEndian(G3D_LITTLE_ENDIAN);
 
@@ -184,7 +194,7 @@ void GImage::decodePNG(
     int bit_depth, color_type, interlace_type;
     // this will validate the data it extracts from info_ptr
     png_get_IHDR(png_ptr, info_ptr, &png_width, &png_height, &bit_depth, &color_type,
-       &interlace_type, int_p_NULL, int_p_NULL);
+       &interlace_type, NULL, NULL);
 
     if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
         png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
@@ -206,7 +216,7 @@ void GImage::decodePNG(
 
     //Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel
     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-        png_set_gray_1_2_4_to_8(png_ptr);
+        png_set_expand(png_ptr);
     }
 
     //Expand paletted or RGB images with transparency to full alpha channels
@@ -253,7 +263,7 @@ void GImage::decodePNG(
     for (uint32 pass = 0; pass < number_passes; ++pass) {
         for (uint32 y = 0; y < (uint32)m_height; ++y) {
             png_bytep rowPointer = &m_byte[m_width * m_channels * y]; 
-            png_read_rows(png_ptr, &rowPointer, png_bytepp_NULL, 1);
+            png_read_rows(png_ptr, &rowPointer, NULL, 1);
         }
     }
 
diff --git a/dep/src/g3dlite/GImage_ppm.cpp b/dep/src/g3dlite/GImage_ppm.cpp
index 28f8cdf9ab0..f3065c6038b 100644
--- a/dep/src/g3dlite/GImage_ppm.cpp
+++ b/dep/src/g3dlite/GImage_ppm.cpp
@@ -183,7 +183,7 @@ void GImage::decodePPM(
     int w, h;
 
     input.readBytes(head, 2);
-    if (head[0] != 'P' || (head[1] != '6') && (head[1] != '5')) {
+    if (head[0] != 'P' || ((head[1] != '6') && (head[1] != '5'))) {
         throw GImage::Error("Invalid PPM Header.", input.getFilename());
     }
 
diff --git a/dep/src/g3dlite/GImage_tga.cpp b/dep/src/g3dlite/GImage_tga.cpp
index 9785f879a1f..fdcd59af726 100644
--- a/dep/src/g3dlite/GImage_tga.cpp
+++ b/dep/src/g3dlite/GImage_tga.cpp
@@ -94,6 +94,20 @@ void GImage::encodeTGA(
     out.writeString("TRUEVISION-XFILE ");
 }
 
+inline static void readBGR(uint8* byte, BinaryInput& bi) {
+    int b = bi.readUInt8();
+    int g = bi.readUInt8();
+    int r = bi.readUInt8();
+
+    byte[0] = r;
+    byte[1] = g;
+    byte[2] = b;
+}
+
+inline static void readBGRA(uint8* byte, BinaryInput& bi) {
+    readBGR(byte, bi);
+    byte[3] = bi.readUInt8();
+}
 
 void GImage::decodeTGA(
     BinaryInput&        input) {
@@ -117,8 +131,8 @@ void GImage::decodeTGA(
     (void)colorMapType;
 	
     // 2 is the type supported by this routine.
-    if (imageType != 2) {
-        throw Error("TGA images must be type 2 (Uncompressed truecolor)", input.getFilename());
+    if (imageType != 2 && imageType != 10) {
+        throw Error("TGA images must be type 2 (Uncompressed truecolor) or 10 (Run-length truecolor)", input.getFilename());
     }
 	
     // Color map specification
@@ -159,34 +173,63 @@ void GImage::decodeTGA(
     int x;
     int y;
 
-    if (m_channels == 3) {
-        for (y = m_height - 1; y >= 0; --y) {
-          for (x = 0; x < m_width; ++x) {
-            int b = input.readUInt8();
-            int g = input.readUInt8();
-            int r = input.readUInt8();
-		    
-            int i = (x + y * m_width) * 3;
-            m_byte[i + 0] = r;
-            m_byte[i + 1] = g;
-            m_byte[i + 2] = b;
-          }
+    if (imageType == 2) {
+        // Uncompressed
+        if (m_channels == 3) {
+            for (y = m_height - 1; y >= 0; --y) {
+              for (x = 0; x < m_width; ++x) {
+                int i = (x + y * m_width) * 3;
+                readBGR(m_byte + i, input);
+              }
+            }
+        } else {
+            for (y = m_height - 1; y >= 0; --y) {
+              for (x = 0; x < m_width; ++x) {
+                 int i = (x + y * m_width) * 4;
+                 readBGRA(m_byte + i, input);
+              }
+            }
         }
-    } else {
+    } else if (imageType == 10) {
+
+        // Run-length encoded 
         for (y = m_height - 1; y >= 0; --y) {
-          for (x = 0; x < m_width; ++x) {
-            int b = input.readUInt8();
-            int g = input.readUInt8();
-            int r = input.readUInt8();
-            int a = input.readUInt8();
-		    
-            int i = (x + y * m_width) * 4;
-            m_byte[i + 0] = r;
-            m_byte[i + 1] = g;
-            m_byte[i + 2] = b;
-            m_byte[i + 3] = a;
-          }
+            for (int x = 0; x < m_width; /* intentionally no x increment */) {
+                // The specification guarantees that no packet will wrap past the end of a row
+                const uint8 repetitionCount = input.readUInt8();
+                const uint8 numValues = (repetitionCount & (~128)) + 1;
+                int byteOffset = (x + y * m_width) * 3;
+
+                if (repetitionCount & 128) {
+                    // When the high bit is 1, this is a run-length packet
+                    if (m_channels == 3) {
+                        Color3uint8 value;
+                        readBGR((uint8*)(&value), input);
+                        for (int i = 0; i < numValues; ++i, ++x) {
+                            for (int b = 0; b < 3; ++b, ++byteOffset) {
+                                m_byte[byteOffset] = value[b];
+                            }
+                        }
+                    } else {
+                        Color4uint8 value;
+                        readBGRA((uint8*)(&value), input);
+                        for (int i = 0; i < numValues; ++i, ++x) {
+                            for (int b = 0; b < 3; ++b, ++byteOffset) {
+                                m_byte[byteOffset] = value[b];
+                            }
+                        }
+                    }
+
+                } else {
+                    // When the high bit is 0, this is a raw packet
+                    for (int i = 0; i < numValues; ++i, ++x, byteOffset += m_channels) {
+                        readBGR(m_byte + byteOffset, input);
+                    }
+                }
+            }
         }
+    } else {
+        alwaysAssertM(false, "Unsupported type");
     }
 }
 
diff --git a/dep/src/g3dlite/GLight.cpp b/dep/src/g3dlite/GLight.cpp
index 37c8054ff3d..553b493c1a3 100644
--- a/dep/src/g3dlite/GLight.cpp
+++ b/dep/src/g3dlite/GLight.cpp
@@ -19,6 +19,8 @@ GLight::GLight(const Any& any) {
 
     if (any.type() == Any::TABLE) {
         *this = GLight();
+        Vector3 spotTarget;
+        bool hasSpotTarget = false;
         for (Any::AnyTable::Iterator it = any.table().begin(); it.hasMore(); ++it) {
             const std::string& key = toLower(it->key);
             if (key == "position") {
@@ -26,7 +28,10 @@ GLight::GLight(const Any& any) {
             } else if (key == "rightdirection") {
                 rightDirection = it->value;
             } else if (key == "spotdirection") {
-                spotDirection = it->value;
+                spotDirection = Vector3(it->value).directionOrZero();
+            } else if (key == "spottarget") {
+                spotTarget = it->value;
+                hasSpotTarget = true;
             } else if (key == "spotcutoff") {
                 spotCutoff = it->value.number();
             } else if (key == "spotsquare") {
@@ -47,6 +52,9 @@ GLight::GLight(const Any& any) {
                 any.verify(false, "Illegal key: " + it->key);
             }
         }
+        if (hasSpotTarget) {
+            spotDirection = (spotTarget - position.xyz()).direction();
+        }
     } else if (toLower(any.name()) == "glight::directional") {
 
         *this = directional(any[0], any[1], 
@@ -67,9 +75,9 @@ GLight::GLight(const Any& any) {
         *this = spot(any[0], any[1], any[2], any[3],
             (any.size() > 4) ? any[4] : Any(1), 
             (any.size() > 5) ? any[5] : Any(0), 
-            (any.size() > 6) ? any[6] : Any(0.5f), 
-            (any.size() > 7) ? any[5] : Any(true), 
-            (any.size() > 8) ? any[6] : Any(true));
+            (any.size() > 6) ? any[6] : Any(0), 
+            (any.size() > 7) ? any[7] : Any(true), 
+            (any.size() > 8) ? any[8] : Any(true));
     } else {
         any.verify(false, "Unrecognized name");
     }
diff --git a/dep/src/g3dlite/ImageFormat.cpp b/dep/src/g3dlite/ImageFormat.cpp
index 70de878c11e..46618c64480 100644
--- a/dep/src/g3dlite/ImageFormat.cpp
+++ b/dep/src/g3dlite/ImageFormat.cpp
@@ -4,7 +4,7 @@
  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
  
  @created 2003-05-23
- @edited  2009-12-10
+ @edited  2010-03-30
  */
 
 #include "GLG3D/glheaders.h"
@@ -130,13 +130,19 @@ const ImageFormat* ImageFormat::stencil(int bits) {
         "RGB8I",
         "RGB8UI",
 
+        "RGBA8UI",
+
         "ARGB8",
         "BGR8",
 
+        "R8",
+
         "RG8",
         "RG8I",
         "RG8UI",
 
+        "RG16F",
+
         "RGBA8",
         "RGBA16",
         "RGBA16F",
@@ -287,6 +293,9 @@ const ImageFormat* ImageFormat::fromCode(ImageFormat::Code code) {
     case ImageFormat::CODE_BGR8:
         return ImageFormat::BGR8();
 
+    case ImageFormat::CODE_R8:
+        return ImageFormat::R8();
+
     case ImageFormat::CODE_RG8:
         return ImageFormat::RG8();
 
@@ -296,6 +305,9 @@ const ImageFormat* ImageFormat::fromCode(ImageFormat::Code code) {
     case ImageFormat::CODE_RG8UI:
         return ImageFormat::RG8UI();
 
+    case ImageFormat::CODE_RG16F:
+        return ImageFormat::RG16F();
+
     case ImageFormat::CODE_RGBA8:
         return ImageFormat::RGBA8();
 
@@ -474,11 +486,16 @@ DEFINE_TEXTUREFORMAT_METHOD(LA32F,      2, UNCOMP_FORMAT,   GL_LUMINANCE_ALPHA32
 
 DEFINE_TEXTUREFORMAT_METHOD(BGR8,       3, UNCOMP_FORMAT,   GL_RGB8,            GL_BGR,     0,  0,  8,  8,  8,  0,  0, 32, 24,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_BGR8, ImageFormat::COLOR_SPACE_RGB);
 
+DEFINE_TEXTUREFORMAT_METHOD(R8,         1, UNCOMP_FORMAT,   GL_R8,              GL_RED,    0,  0,  8,  0,  0,  0,  0, 8, 8,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_R8, ImageFormat::COLOR_SPACE_RGB);
+
 DEFINE_TEXTUREFORMAT_METHOD(RG8,        2, UNCOMP_FORMAT,   GL_RG8,             GL_RG,     0,  0,  8,  8,  0,  0,  0, 16, 16,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RG8, ImageFormat::COLOR_SPACE_RGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(RG8I,       2, UNCOMP_FORMAT,   GL_RG8I,            GL_RG,     0,  0,  8,  8,  0,  0,  0, 16, 16,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RG8I, ImageFormat::COLOR_SPACE_RGB);
+// The base format for integer formats must be *_INTEGER even though the spec doesn't state this
+DEFINE_TEXTUREFORMAT_METHOD(RG8I,       2, UNCOMP_FORMAT,   GL_RG8I,            GL_RG_INTEGER,     0,  0,  8,  8,  0,  0,  0, 16, 16,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RG8I, ImageFormat::COLOR_SPACE_RGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(RG8UI,      2, UNCOMP_FORMAT,   GL_RG8UI,           GL_RG,     0,  0,  8,  8,  0,  0,  0, 16, 16,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RG8UI, ImageFormat::COLOR_SPACE_RGB);
+DEFINE_TEXTUREFORMAT_METHOD(RG8UI,      2, UNCOMP_FORMAT,   GL_RG8UI,           GL_RG_INTEGER,     0,  0,  8,  8,  0,  0,  0, 16, 16,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RG8UI, ImageFormat::COLOR_SPACE_RGB);
+
+DEFINE_TEXTUREFORMAT_METHOD(RG16F,      2, UNCOMP_FORMAT,   GL_RG16F,           GL_RG,     0,  0,  16, 16,  0,  0,  0, 32, 32,      GL_FLOAT, OPAQUE_FORMAT, FLOAT_FORMAT, ImageFormat::CODE_RG16F, ImageFormat::COLOR_SPACE_RGB);
 
 DEFINE_TEXTUREFORMAT_METHOD(RGB5,       3, UNCOMP_FORMAT,   GL_RGB5,            GL_RGBA,    0,  0,  5,  5,  5,  0,  0, 16, 16,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB5, ImageFormat::COLOR_SPACE_RGB);
 
@@ -504,7 +521,8 @@ DEFINE_TEXTUREFORMAT_METHOD(RGBA16F,    4, UNCOMP_FORMAT,   GL_RGBA16F_ARB,
 
 DEFINE_TEXTUREFORMAT_METHOD(RGBA32F,    4, UNCOMP_FORMAT,   GL_RGBA32F_ARB,                     GL_RGBA,    0, 32, 32, 32, 32, 0, 0, 32*4, 32*4,    GL_FLOAT, CLEAR_FORMAT, FLOAT_FORMAT, ImageFormat::CODE_RGBA32F, ImageFormat::COLOR_SPACE_RGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(RGBA32UI,   4, UNCOMP_FORMAT,   GL_RGBA32UI,                        GL_RGBA,    0, 32, 32, 32, 32, 0, 0, 32*4, 32*4,    GL_UNSIGNED_INT, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_RGBA32UI, ImageFormat::COLOR_SPACE_RGB);
+// The base format for integer formats must be *_INTEGER even though the spec doesn't state this
+DEFINE_TEXTUREFORMAT_METHOD(RGBA32UI,   4, UNCOMP_FORMAT,   GL_RGBA32UI,                        GL_RGBA_INTEGER,    0, 32, 32, 32, 32, 0, 0, 32*4, 32*4,    GL_UNSIGNED_INT, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_RGBA32UI, ImageFormat::COLOR_SPACE_RGB);
 
 // Unsigned
 DEFINE_TEXTUREFORMAT_METHOD(R11G11B10F, 3, UNCOMP_FORMAT,   GL_R11F_G11F_B10F_EXT,              GL_RGB,     0,  0, 11, 11, 10, 0, 0,   32,   32,    GL_FLOAT, OPAQUE_FORMAT, FLOAT_FORMAT, ImageFormat::CODE_R11G11B10F, ImageFormat::COLOR_SPACE_RGB);
@@ -512,9 +530,12 @@ DEFINE_TEXTUREFORMAT_METHOD(R11G11B10F, 3, UNCOMP_FORMAT,   GL_R11F_G11F_B10F_EX
 // Unsigned
 DEFINE_TEXTUREFORMAT_METHOD(RGB9E5F,    3, UNCOMP_FORMAT,   GL_RGB9_E5_EXT,                     GL_RGB,     0,  0, 14, 14, 14, 0, 0,   32,   32,    GL_FLOAT, OPAQUE_FORMAT, FLOAT_FORMAT, ImageFormat::CODE_RGB9E5F, ImageFormat::COLOR_SPACE_RGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(RGB8I,      3, UNCOMP_FORMAT,   GL_RGB8I_EXT,                       GL_RGB,     0,  0,  8,  8,  8,  0,  0, 32, 24,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB8I, ImageFormat::COLOR_SPACE_RGB);
+// The base format for integer formats must be *_INTEGER even though the spec doesn't state this
+DEFINE_TEXTUREFORMAT_METHOD(RGB8I,      3, UNCOMP_FORMAT,   GL_RGB8I_EXT,                       GL_RGB_INTEGER,     0,  0,  8,  8,  8,  0,  0, 32, 24,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB8I, ImageFormat::COLOR_SPACE_RGB);
+
+DEFINE_TEXTUREFORMAT_METHOD(RGB8UI,     3, UNCOMP_FORMAT,   GL_RGB8UI_EXT,                      GL_RGB_INTEGER,     0,  0,  8,  8,  8,  0,  0, 32, 24,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB8UI, ImageFormat::COLOR_SPACE_RGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(RGB8UI,     3, UNCOMP_FORMAT,   GL_RGB8UI_EXT,                      GL_RGB,     0,  0,  8,  8,  8,  0,  0, 32, 24,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB8UI, ImageFormat::COLOR_SPACE_RGB);
+DEFINE_TEXTUREFORMAT_METHOD(RGBA8UI,    4, UNCOMP_FORMAT,   GL_RGBA8UI_EXT,                     GL_RGBA_INTEGER,    0,  0,  8,  8,  8,  8,  0, 32, 32,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGBA8UI, ImageFormat::COLOR_SPACE_RGB);
 
 
 DEFINE_TEXTUREFORMAT_METHOD(RGB_DXT1,   3, COMP_FORMAT,     GL_COMPRESSED_RGB_S3TC_DXT1_EXT,    GL_RGB,     0, 0, 0, 0, 0, 0, 0, 64, 64,    GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB_DXT1, ImageFormat::COLOR_SPACE_RGB);
diff --git a/dep/src/g3dlite/Log.cpp b/dep/src/g3dlite/Log.cpp
index 07614fcf563..f437351cfbd 100644
--- a/dep/src/g3dlite/Log.cpp
+++ b/dep/src/g3dlite/Log.cpp
@@ -3,7 +3,7 @@
 
   @maintainer Morgan McGuire, http://graphics.cs.williams.edu
   @created 2001-08-04
-  @edited  2009-01-15
+  @edited  2010-01-15
  */
 
 #include "G3D/platform.h"
@@ -11,6 +11,7 @@
 #include "G3D/format.h"
 #include "G3D/Array.h"
 #include "G3D/fileutils.h"
+#include "G3D/FileSystem.h"
 #include <time.h>
 
 #ifdef G3D_WIN32
@@ -43,7 +44,7 @@ Log::Log(const std::string& filename, int stripFromStackBottom) :
 
     this->filename = filename;
 
-    logFile = fopen(filename.c_str(), "w");
+    logFile = FileSystem::fopen(filename.c_str(), "w");
 
     if (logFile == NULL) {
         std::string drive, base, ext;
@@ -58,7 +59,7 @@ Log::Log(const std::string& filename, int stripFromStackBottom) :
             logName = std::string("/tmp/") + logName;
         #endif
 
-        logFile = fopen(logName.c_str(), "w");
+        logFile = FileSystem::fopen(logName.c_str(), "w");
     }
 
     // Use a large buffer (although we flush in logPrintf)
diff --git a/dep/src/g3dlite/Matrix3.cpp b/dep/src/g3dlite/Matrix3.cpp
index b32d938f0f9..7e4de99621a 100644
--- a/dep/src/g3dlite/Matrix3.cpp
+++ b/dep/src/g3dlite/Matrix3.cpp
@@ -29,11 +29,17 @@ const float Matrix3::EPSILON = 1e-06f;
 Matrix3::Matrix3(const Any& any) {
     any.verifyName("Matrix3");
     any.verifyType(Any::ARRAY);
-    any.verifySize(9);
 
-    for (int r = 0; r < 3; ++r) {
-        for (int c = 0; c < 3; ++c) {
-            elt[r][c] = any[r * 3 + c];
+    if (any.nameEquals("Matrix3::fromAxisAngle")) {
+        any.verifySize(2);
+        *this = Matrix3::fromAxisAngle(any[0], any[1].number());
+    } else {
+        any.verifySize(9);
+
+        for (int r = 0; r < 3; ++r) {
+            for (int c = 0; c < 3; ++c) {
+                elt[r][c] = any[r * 3 + c];
+            }
         }
     }
 }
diff --git a/dep/src/g3dlite/Matrix4.cpp b/dep/src/g3dlite/Matrix4.cpp
index cd38a1a3602..fbc918f8f3e 100644
--- a/dep/src/g3dlite/Matrix4.cpp
+++ b/dep/src/g3dlite/Matrix4.cpp
@@ -44,7 +44,12 @@ Matrix4::Matrix4(const Any& any) {
         } else {
             any.verify(false, "Matrix4::scale() takes either 1 or 3 arguments");
         }
-    } else {
+    } else if (name == "matrix4::translation") {
+        if (any.size() == 3) {
+            *this = translation(any[0], any[1], any[2]);
+        } else {
+            any.verify(false, "Matrix4::translation() takes either 1 or 3 arguments");
+        }    } else {
         any.verify(false, "Expected Matrix4 constructor");
     }
 }
@@ -377,7 +382,7 @@ bool Matrix4::operator==(const Matrix4& other) const {
     // If the bit patterns are identical, they must be
     // the same matrix.  If not, they *might* still have
     // equal elements due to floating point weirdness.
-    if (memcmp(this, &other, sizeof(Matrix4) == 0)) {
+    if (memcmp(this, &other, sizeof(Matrix4)) == 0) {
         return true;
     } 
 
diff --git a/dep/src/g3dlite/MeshAlgAdjacency.cpp b/dep/src/g3dlite/MeshAlgAdjacency.cpp
index 24b5d207c88..f0bf3382131 100644
--- a/dep/src/g3dlite/MeshAlgAdjacency.cpp
+++ b/dep/src/g3dlite/MeshAlgAdjacency.cpp
@@ -3,9 +3,9 @@
 
   @maintainer Morgan McGuire, http://graphics.cs.williams.edu
   @created 2003-09-14
-  @edited  2009-04-26
+  @edited  2010-04-26
 
-  Copyright 2000-2009, Morgan McGuire.
+  Copyright 2000-2010, Morgan McGuire.
   All rights reserved.
 
  */
@@ -15,6 +15,7 @@
 #include "G3D/Set.h"
 #include "G3D/Stopwatch.h"
 #include "G3D/SmallArray.h"
+#include "G3D/AreaMemoryManager.h"
 
 namespace G3D {
 
@@ -43,6 +44,11 @@ class MeshEdgeTable {
 
 public:
 
+    MeshEdgeTable() {
+        AreaMemoryManager::Ref mm = AreaMemoryManager::create();
+        table.clearAndSetMemoryManager(mm);
+    }
+
     void clear() {
         table.clear();
     }
diff --git a/dep/src/g3dlite/NetworkDevice.cpp b/dep/src/g3dlite/NetworkDevice.cpp
index 246c97d4dbf..1fc794479f5 100644
--- a/dep/src/g3dlite/NetworkDevice.cpp
+++ b/dep/src/g3dlite/NetworkDevice.cpp
@@ -6,8 +6,6 @@
  @edited  2006-02-24
  */
 
-#include <stdlib.h>
-#include <time.h>
 #include "G3D/platform.h"
 #include "G3D/TextOutput.h"
 #include "G3D/NetworkDevice.h"
@@ -18,94 +16,8 @@
 #include "G3D/G3DGameUnits.h"
 #include "G3D/stringutils.h"
 #include "G3D/debug.h"
+#include "G3D/networkHelpers.h"
 
-#include <cstring>
-
-#if defined(G3D_LINUX) || defined(G3D_OSX) || defined(G3D_FREEBSD)
-#   include <sys/types.h>
-#   include <sys/socket.h>
-#   include <ifaddrs.h>
-#   include <netinet/in.h>
-#   include <net/if.h>
-#   ifdef __linux__
-#       include <sys/ioctl.h>
-#       include <netinet/in.h>
-#       include <unistd.h>
-#       include <string.h>
-//    Match Linux to FreeBSD
-#       define AF_LINK AF_PACKET
-#   else
-#       include <net/if_dl.h>
-#       include <sys/sockio.h>
-#   endif
-
-    #include <unistd.h>
-    #include <errno.h>
-    #include <sys/socket.h>
-    #include <netinet/in.h>
-    #include <arpa/inet.h>
-    #include <netdb.h>
-    #include <netinet/tcp.h>
-    #include <sys/ioctl.h>
-    #include <netinet/if_ether.h>
-    #include <net/ethernet.h>
-    #include <net/if.h>
-
-    #include <sys/types.h>
-
-    #define _alloca alloca
-
-    /** Define an error code for non-windows platforms. */
-    int WSAGetLastError() {
-        return -1;
-    }
-
-    #define SOCKET_ERROR -1
-
-    static std::string socketErrorCode(int code) {
-        return G3D::format("CODE %d: %s\n", code, strerror(code));
-    }
-
-    static std::string socketErrorCode() {
-        return socketErrorCode(errno);
-    }
-
-    static const int WSAEWOULDBLOCK = -100;
-
-    typedef int SOCKET;
-    typedef struct sockaddr_in SOCKADDR_IN;
-
-#else 
-
-    // Windows
-    static std::string socketErrorCode(int code) {
-        LPTSTR formatMsg = NULL;
-
-        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                      FORMAT_MESSAGE_IGNORE_INSERTS |
-                      FORMAT_MESSAGE_FROM_SYSTEM,
-                        NULL,
-                        code,
-                        0,
-                        (LPTSTR)&formatMsg,
-                        0,
-                        NULL);
-
-        return G3D::format("CODE %d: %s\n", code, formatMsg);
-    }
-
-    static std::string socketErrorCode() {
-        return socketErrorCode(GetLastError());
-    }
-
-#endif
-
-
-#ifndef _SOCKLEN_T
-#   if defined(G3D_WIN32) || defined(G3D_OSX)
-        typedef int socklen_t;
-#   endif
-#endif
 
 namespace G3D {
 
diff --git a/dep/src/g3dlite/PhysicsFrame.cpp b/dep/src/g3dlite/PhysicsFrame.cpp
index 28ba8f8d477..30fbdf8d619 100644
--- a/dep/src/g3dlite/PhysicsFrame.cpp
+++ b/dep/src/g3dlite/PhysicsFrame.cpp
@@ -4,10 +4,12 @@
  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
  
  @created 2002-07-09
- @edited  2006-01-25
+ @edited  2010-03-25
 */
 
 #include "G3D/platform.h"
+#include "G3D/Any.h"
+#include "G3D/stringutils.h"
 #include "G3D/PhysicsFrame.h"
 #include "G3D/BinaryInput.h"
 #include "G3D/BinaryOutput.h"
@@ -28,6 +30,37 @@ PhysicsFrame::PhysicsFrame(
 }
 
 
+PhysicsFrame::PhysicsFrame(const Any& a) {
+    const std::string& n = toLower(a.name());
+    *this = PhysicsFrame();
+
+    if (beginsWith(n, "vector3")) {
+        *this = PhysicsFrame(Vector3(a));
+    } else if (beginsWith(n, "matrix3")) {        
+        *this = PhysicsFrame(Matrix3(a));
+    } else if (beginsWith(n, "cframe") || beginsWith(n, "coordinateframe")) {        
+        *this = PhysicsFrame(CoordinateFrame(a));
+    } else if (beginsWith(n, "pframe") || beginsWith(n, "physicsframe")) {
+        if (a.type() == Any::ARRAY) {
+            a.verifySize(2);
+            rotation    = a[0];
+            translation = a[1];
+        } else {
+            for (Any::AnyTable::Iterator it = a.table().begin(); it.hasMore(); ++it) {
+                const std::string& n = toLower(it->key);
+                if (n == "translation") {
+                    translation = it->value;
+                } else if (n == "rotation") {
+                    rotation = it->value;
+                } else {
+                    a.verify(false, "Illegal table key: " + it->key);
+                }
+            }
+        }
+    }
+}
+
+
 PhysicsFrame PhysicsFrame::operator*(const PhysicsFrame& other) const {
     PhysicsFrame result;
 
@@ -38,7 +71,7 @@ PhysicsFrame PhysicsFrame::operator*(const PhysicsFrame& other) const {
 }
 
 
-CoordinateFrame PhysicsFrame::toCoordinateFrame() const {
+PhysicsFrame::operator CoordinateFrame() const {
     CoordinateFrame f;
     
     f.translation = translation;
diff --git a/dep/src/g3dlite/PhysicsFrameSpline.cpp b/dep/src/g3dlite/PhysicsFrameSpline.cpp
new file mode 100644
index 00000000000..2dfdb6f9139
--- /dev/null
+++ b/dep/src/g3dlite/PhysicsFrameSpline.cpp
@@ -0,0 +1,80 @@
+/**
+  \file PhysicsFrameSpline.cpp
+
+  \author Morgan McGuire, http://graphics.cs.williams.edu
+ */
+#include "G3D/PhysicsFrameSpline.h"
+#include "G3D/Any.h"
+#include "G3D/stringutils.h"
+
+namespace G3D {
+
+PhysicsFrameSpline::PhysicsFrameSpline() {}
+
+PhysicsFrameSpline::PhysicsFrameSpline(const Any& any) {
+    *this = any;
+}
+
+PhysicsFrameSpline& PhysicsFrameSpline::operator=(const Any& any) {
+    const std::string& n = toLower(any.name());
+    *this = PhysicsFrameSpline();
+
+    if (n == "physicsframespline" || n == "pframespline") {
+        any.verifyName("PhysicsFrameSpline", "PFrameSpline");
+        
+        for (Any::AnyTable::Iterator it = any.table().begin(); it.hasMore(); ++it) {
+            const std::string& k = toLower(it->key);
+            if (k == "cyclic") {
+                cyclic = it->value;
+            } else if (k == "control") {
+                const Any& v = it->value;
+                v.verifyType(Any::ARRAY);
+                control.resize(v.size());
+                for (int i = 0; i < control.size(); ++i) {
+                    control[i] = v[i];
+                }
+                if (! any.containsKey("time")) {
+                    time.resize(control.size());
+                    for (int i = 0; i < time.size(); ++i) {
+                        time[i] = i;
+                    }
+                }
+            } else if (k == "finalinterval") {
+                finalInterval = it->value;
+            } else if (k == "time") {
+                const Any& v = it->value;
+                v.verifyType(Any::ARRAY);
+                time.resize(v.size());
+                for (int i = 0; i < time.size(); ++i) {
+                    time[i] = v[i];
+                }
+            }
+        }
+    } else {
+        // Must be a PhysicsFrame constructor of some kind
+        append(any);
+    }
+    return *this;
+}
+
+
+void PhysicsFrameSpline::correct(PhysicsFrame& frame) const {
+    frame.rotation.unitize();
+}
+
+
+void PhysicsFrameSpline::ensureShortestPath(PhysicsFrame* A, int N) const {
+    for (int i = 1; i < N; ++i) {
+        const Quat& p = A[i - 1].rotation;
+        Quat& q = A[i].rotation;
+
+        float cosphi = p.dot(q);
+
+        if (cosphi < 0) {
+            // Going the long way, so change the order
+            q = -q;
+        }
+    }
+}
+
+}
diff --git a/dep/src/g3dlite/Quat.cpp b/dep/src/g3dlite/Quat.cpp
index 225c5b51acc..e06483b44cd 100644
--- a/dep/src/g3dlite/Quat.cpp
+++ b/dep/src/g3dlite/Quat.cpp
@@ -6,10 +6,12 @@
   @author Morgan McGuire, graphics3d.com
   
   @created 2002-01-23
-  @edited  2006-01-31
+  @edited  2010-03-31
  */
 
 #include "G3D/Quat.h"
+#include "G3D/Any.h"
+#include "G3D/stringutils.h"
 #include "G3D/BinaryInput.h"
 #include "G3D/BinaryOutput.h"
 
@@ -28,8 +30,22 @@ Quat Quat::fromAxisAngleRotation(
 }
 
 
-Quat::Quat(
-    const Matrix3& rot) {
+Quat::Quat(const class Any& a) {
+    *this = Quat();
+    if (beginsWith(toLower(a.name()), "matrix3")) {
+        *this = a;
+    } else {
+        a.verifyName("Quat");
+        a.verifyType(Any::ARRAY);
+        x = a[0];
+        y = a[1];
+        z = a[2];
+        w = a[3];
+    }
+}
+
+
+Quat::Quat(const Matrix3& rot) {
 
     static const int plus1mod3[] = {1, 2, 0};
 
diff --git a/dep/src/g3dlite/System.cpp b/dep/src/g3dlite/System.cpp
index e03c4e8c6fa..320b5493687 100644
--- a/dep/src/g3dlite/System.cpp
+++ b/dep/src/g3dlite/System.cpp
@@ -27,6 +27,7 @@
 #include "G3D/Table.h"
 #include "G3D/GMutex.h"
 #include "G3D/units.h"
+#include "G3D/FileSystem.h"
 #include <time.h>
 
 #include <cstring>
@@ -42,6 +43,10 @@
 
 #include <cstdlib>
 
+#ifdef _MSC_VER && defined(G3D_64BIT)
+#   include <intrin.h>
+#endif
+
 #ifdef G3D_WIN32
 
 #   include <conio.h>
@@ -80,9 +85,9 @@
 #endif
 
 // SIMM include
-#ifdef __SSE__
+#ifdef __SSE__ /* G3DFIX: Only Intel Vector Extension enabled */
 #include <xmmintrin.h>
-#endif
+#endif /* G3DFIX: Only Intel Vector Extension enabled */
 
 namespace G3D {
 
@@ -196,9 +201,12 @@ void System::init() {
     // Get the operating system name (also happens to read some other information)
 #    ifdef G3D_WIN32
         // Note that this overrides some of the values computed above
-        bool success = RegistryUtil::readInt32
+        bool success = true;
+        #ifndef __MINGW32__
+        success = RegistryUtil::readInt32
             ("HKEY_LOCAL_MACHINE\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0", 
              "~MHz", m_cpuSpeed);
+        #endif
 
         SYSTEM_INFO systemInfo;
         GetSystemInfo(&systemInfo);
@@ -225,7 +233,7 @@ void System::init() {
         }
 
         m_numCores = systemInfo.dwNumberOfProcessors;
-        uint32 maxAddr = (uint32)systemInfo.lpMaximumApplicationAddress;
+        uint64 maxAddr = (uint64)systemInfo.lpMaximumApplicationAddress;
         {
             char c[1024];
             sprintf(c, "%d x %d-bit %s processor",
@@ -340,40 +348,6 @@ void getG3DVersion(std::string& s) {
     s = cstr;
 }
 
-#if 0 // TODO: delete
-struct Directory {
-    std::string          path;
-    Array<std::string>   contents;
-};
-
-static bool maybeAddDirectory(const std::string& newPath, Array<Directory>& directoryArray, bool recurse = true) {
-    if (fileExists(newPath)) {
-        Directory& d = directoryArray.next();
-        d.path = newPath;
-        getFiles(pathConcat(newPath, "*"), d.contents);
-        Array<std::string> dirs;
-        getDirs(pathConcat(newPath, "*"), dirs);
-        d.contents.append(dirs);
-
-        if (recurse) {
-            // Look for subdirectories
-            static const std::string subdirs[] = 
-            {"font", "gui", "SuperShader", "cubemap", "icon", "material", "image", "md2", "md3", "ifs", "3ds", "sky", ""};
-
-            for (int j = 0; j < dirs.size(); ++j) {
-                for (int i = 0; ! subdirs[i].empty(); ++i) {
-                    if (dirs[j] == subdirs[i]) {
-                        maybeAddDirectory(pathConcat(newPath, dirs[j]), directoryArray, false);
-                    }
-                }
-            }
-        }
-        return true;
-    } else {
-        return false;
-    }
-}
-#endif
 
 std::string System::findDataFile
 (const std::string&  full,
@@ -385,14 +359,14 @@ std::string System::findDataFile
 
     // First check if the file exists as requested.  This will go
     // through the FileSystemCache, so most calls do not touch disk.
-    if (fileExists(full)) {
+    if (FileSystem::exists(full)) {
         return full;
     }
 
     // Now check where we previously found this file.
     std::string* last = lastFound.getPointer(full);
     if (last != NULL) {
-        if (fileExists(*last)) {
+        if (FileSystem::exists(*last)) {
             // Even if cwd has changed the file is still present.
             // We won't notice if it has been deleted, however.
             return *last;
@@ -405,20 +379,33 @@ std::string System::findDataFile
     // Places to look
     static Array<std::string> directoryArray;
 
+    std::string initialAppDataDir(instance().m_appDataDir);
+    const char* g3dPath = getenv("G3DDATA");
+
     if (directoryArray.size() == 0) {
         // Initialize the directory array
         RealTime t0 = System::time();
 
         Array<std::string> baseDirArray;
-
-        std::string initialAppDataDir(instance().m_appDataDir);
         
         baseDirArray.append("");
         if (! initialAppDataDir.empty()) {
             baseDirArray.append(initialAppDataDir);
         }
 
-        const char* g3dPath = getenv("G3DDATA");
+#       ifdef G3D_WIN32
+        if (g3dPath == NULL) {
+            // If running the demos under visual studio from the G3D.sln file,
+            // this will locate the data directory.
+            const char* paths[] = {"../data-files/", "../../data-files/", "../../../data-files/", NULL};
+            for (int i = 0; paths[i]; ++i) {
+                if (FileSystem::exists(pathConcat(paths[i], "G3D-DATA-README.TXT"))) {
+                    g3dPath = paths[i];
+                    break;
+                }
+            }
+        }
+#       endif
 
         if (g3dPath && (initialAppDataDir != g3dPath)) {
             baseDirArray.append(g3dPath);
@@ -428,11 +415,11 @@ std::string System::findDataFile
             {"font", "gui", "SuperShader", "cubemap", "icon", "material", "image", "md2", "md3", "ifs", "3ds", "sky", ""};
         for (int j = 0; j < baseDirArray.size(); ++j) {
             std::string d = baseDirArray[j];
-            if (fileExists(d)) {
+            if ((d == "") || FileSystem::exists(d)) {
                 directoryArray.append(d);
                 for (int i = 0; ! subdirs[i].empty(); ++i) {
                     const std::string& p = pathConcat(d, subdirs[i]);
-                    if (fileExists(p)) {
+                    if (FileSystem::exists(p)) {
                         directoryArray.append(p);
                     }
                 }
@@ -444,7 +431,7 @@ std::string System::findDataFile
 
     for (int i = 0; i < directoryArray.size(); ++i) {
         const std::string& p = pathConcat(directoryArray[i], full);
-        if (fileExists(p)) {
+        if (FileSystem::exists(p)) {
             lastFound.set(full, p);
             return p;
         }
@@ -454,9 +441,29 @@ std::string System::findDataFile
         // Generate an error message
         std::string locations;
         for (int i = 0; i < directoryArray.size(); ++i) {
-            locations += pathConcat(directoryArray[i], full) + "\n";
+            locations += "\'" + pathConcat(directoryArray[i], full) + "'\n";
+        }
+
+        std::string msg = "Could not find '" + full + "'.\n\n";
+        msg += "cwd = \'" + FileSystem::currentDirectory() + "\'\n";
+        if (g3dPath) {
+            msg += "G3DDATA = ";
+            if (! FileSystem::exists(g3dPath)) {
+                msg += "(illegal path!) ";
+            }
+            msg += std::string(g3dPath) + "\'\n";
+        } else {
+            msg += "(G3DDATA environment variable is undefined)\n";
         }
-        alwaysAssertM(false, "Could not find '" + full + "' in:\n" + locations);
+        msg += "GApp::Settings.dataDir = ";
+        if (! FileSystem::exists(initialAppDataDir)) {
+            msg += "(illegal path!) ";
+        }
+        msg += std::string(initialAppDataDir) + "\'\n";
+
+        msg += "\nLocations searched:\n" + locations;
+
+        alwaysAssertM(false, msg);
     }
 
     // Not found
@@ -474,19 +481,23 @@ std::string demoFindData(bool errorIfNotFound) {
     if (g3dPath) {
         return g3dPath;
 #   ifdef G3D_WIN32
-    } else if (fileExists("../data")) {
+    } else if (FileSystem::exists("../data")) {
         // G3D install on Windows
         return "../data";
-    } else if (fileExists("../data-files")) {
+    } else if (FileSystem::exists("../data-files")) {
         // G3D source on Windows
         return "../data-files";
+    } else if (FileSystem::exists("c:/libraries/G3D/data")) {
+        return "c:/libraries/G3D/data";
 #   else
-    } else if (fileExists("../../../../data")) {
+    } else if (FileSystem::exists("../../../../data")) {
         // G3D install on Unix
         return "../../../../data";
-    } else if (fileExists("../../../../data-files")) {
+    } else if (FileSystem::exists("../../../../data-files")) {
         // G3D source on Unix
         return "../../../../data-files";
+    } else if (FileSystem::exists("/usr/local/G3D/data")) {
+        return "/usr/local/G3D/data";
 #   endif
     } else {
         return "";
@@ -560,7 +571,7 @@ void System::getStandardProcessorExtensions() {
 #endif
 }
 
-#if defined(G3D_WIN32) && !defined(G3D_64BIT)
+#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__)
     #pragma message("Port System::memcpy SIMD to all platforms")
 /** Michael Herf's fast memcpy */
 void memcpyMMX(void* dst, const void* src, int nbytes) {
@@ -611,7 +622,7 @@ void memcpyMMX(void* dst, const void* src, int nbytes) {
 #endif
 
 void System::memcpy(void* dst, const void* src, size_t numBytes) {
-#if defined(G3D_WIN32) && !defined(G3D_64BIT)
+#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__)
     memcpyMMX(dst, src, numBytes);
 #else
     ::memcpy(dst, src, numBytes);
@@ -621,7 +632,7 @@ void System::memcpy(void* dst, const void* src, size_t numBytes) {
 
 /** Michael Herf's fastest memset. n32 must be filled with the same
     character repeated. */
-#if defined(G3D_WIN32) && !defined(G3D_64BIT)
+#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__)
     #pragma message("Port System::memfill SIMD to all platforms")
 
 // On x86 processors, use MMX
@@ -660,7 +671,7 @@ void memfill(void *dst, int n32, unsigned long i) {
 
 
 void System::memset(void* dst, uint8 value, size_t numBytes) {
-#if defined(G3D_WIN32) && !defined(G3D_64BIT)
+#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__)
     uint32 v = value;
     v = v + (v << 8) + (v << 16) + (v << 24); 
     G3D::memfill(dst, v, numBytes);
@@ -916,9 +927,12 @@ RealTime System::time() {
 
 ////////////////////////////////////////////////////////////////
 
-#define REALPTR_TO_USERPTR(x)   ((uint8*)(x) + sizeof (void *))
-#define USERPTR_TO_REALPTR(x)   ((uint8*)(x) - sizeof (void *))
-#define REALBLOCK_SIZE(x)       ((x) + sizeof (void *))
+
+#define REALPTR_TO_USERPTR(x)   ((uint8*)(x) + sizeof(uint32))
+#define USERPTR_TO_REALPTR(x)   ((uint8*)(x) - sizeof(uint32))
+#define USERSIZE_TO_REALSIZE(x)       ((x) + sizeof(uint32))
+#define REALSIZE_FROM_USERPTR(u) (*(uint32*)USERPTR_TO_REALPTR(ptr) + sizeof(uint32))
+#define USERSIZE_FROM_USERPTR(u) (*(uint32*)USERPTR_TO_REALPTR(ptr))
 
 class BufferPool {
 public:
@@ -943,13 +957,19 @@ class BufferPool {
 
 private:
 
+    /** Pointer given to the program.  Unless in the tiny heap, the user size of the block is stored right in front of the pointer as a uint32.*/
+    typedef void* UserPtr;
+
+    /** Actual block allocated on the heap */
+    typedef void* RealPtr;
+
     class MemBlock {
     public:
-        void*           ptr;
-        size_t          bytes;
+        UserPtr     ptr;
+        size_t      bytes;
 
         inline MemBlock() : ptr(NULL), bytes(0) {}
-        inline MemBlock(void* p, size_t b) : ptr(p), bytes(b) {}
+        inline MemBlock(UserPtr p, size_t b) : ptr(p), bytes(b) {}
     };
 
     MemBlock smallPool[maxSmallBuffers];
@@ -1006,13 +1026,13 @@ class BufferPool {
     /** 
      Malloc out of the tiny heap. Returns NULL if allocation failed.
      */
-    inline void* tinyMalloc(size_t bytes) {
+    inline UserPtr tinyMalloc(size_t bytes) {
         // Note that we ignore the actual byte size
         // and create a constant size block.
         (void)bytes;
         assert(tinyBufferSize >= bytes);
 
-        void* ptr = NULL;
+        UserPtr ptr = NULL;
 
         if (tinyPoolSize > 0) {
             --tinyPoolSize;
@@ -1036,20 +1056,20 @@ class BufferPool {
     }
 
     /** Returns true if this is a pointer into the tiny heap. */
-    bool inTinyHeap(void* ptr) {
+    bool inTinyHeap(UserPtr ptr) {
         return 
             (ptr >= tinyHeap) && 
             (ptr < (uint8*)tinyHeap + maxTinyBuffers * tinyBufferSize);
     }
 
-    void tinyFree(void* ptr) {
+    void tinyFree(UserPtr ptr) {
         assert(ptr);
         assert(tinyPoolSize < maxTinyBuffers);
  //           "Tried to free a tiny pool buffer when the tiny pool freelist is full.");
 
 #       ifdef G3D_DEBUG
             if (tinyPoolSize > 0) {
-                void* prevOnHeap = tinyPool[tinyPoolSize - 1];
+                UserPtr prevOnHeap = tinyPool[tinyPoolSize - 1];
                 assert(prevOnHeap != ptr); 
 //                    "System::malloc heap corruption detected: "
 //                    "the last two pointers on the freelist are identical (during tinyFree).");
@@ -1066,7 +1086,8 @@ class BufferPool {
 
     void flushPool(MemBlock* pool, int& poolSize) {
         for (int i = 0; i < poolSize; ++i) {
-            ::free(pool[i].ptr);
+            bytesAllocated -= USERSIZE_TO_REALSIZE(pool[i].bytes);
+            ::free(USERPTR_TO_REALPTR(pool[i].ptr));
             pool[i].ptr = NULL;
             pool[i].bytes = 0;
         }
@@ -1074,24 +1095,23 @@ class BufferPool {
     }
 
 
-    /**  Allocate out of a specific pool->  Return NULL if no suitable 
-         memory was found. 
-    
-         */
-    void* malloc(MemBlock* pool, int& poolSize, size_t bytes) {
+    /** Allocate out of a specific pool.  Return NULL if no suitable 
+        memory was found. */
+    UserPtr malloc(MemBlock* pool, int& poolSize, size_t bytes) {
 
         // OPT: find the smallest block that satisfies the request.
 
-        // See if there's something we can use in the buffer pool->
+        // See if there's something we can use in the buffer pool.
         // Search backwards since usually we'll re-use the last one.
         for (int i = (int)poolSize - 1; i >= 0; --i) {
             if (pool[i].bytes >= bytes) {
-                // We found a suitable entry in the pool->
+                // We found a suitable entry in the pool.
 
                 // No need to offset the pointer; it is already offset
-                void* ptr = pool[i].ptr;
+                UserPtr ptr = pool[i].ptr;
 
-                // Remove this element from the pool
+                // Remove this element from the pool, replacing it with
+                // the one from the end (same as Array::fastRemove)
                 --poolSize;
                 pool[i] = pool[poolSize];
 
@@ -1155,6 +1175,8 @@ class BufferPool {
 
     ~BufferPool() {
         ::free(tinyHeap);
+        flushPool(smallPool, smallPoolSize);
+        flushPool(medPool, medPoolSize);
 #if 0 //-------------------------------- old mutex
 #       ifdef G3D_WIN32
             DeleteCriticalSection(&mutex);
@@ -1165,7 +1187,7 @@ class BufferPool {
     }
 
     
-    void* realloc(void* ptr, size_t bytes) {
+    UserPtr realloc(UserPtr ptr, size_t bytes) {
         if (ptr == NULL) {
             return malloc(bytes);
         }
@@ -1177,7 +1199,7 @@ class BufferPool {
             } else {
                 // Free the old pointer and malloc
                 
-                void* newPtr = malloc(bytes);
+                UserPtr newPtr = malloc(bytes);
                 System::memcpy(newPtr, ptr, tinyBufferSize);
                 tinyFree(ptr);
                 return newPtr;
@@ -1187,28 +1209,28 @@ class BufferPool {
             // In one of our heaps.
 
             // See how big the block really was
-            size_t realSize = *(uint32*)USERPTR_TO_REALPTR(ptr);
-            if (bytes <= realSize) {
+            size_t userSize = USERSIZE_FROM_USERPTR(ptr);
+            if (bytes <= userSize) {
                 // The old block was big enough.
                 return ptr;
             }
 
-            // Need to reallocate
-            void* newPtr = malloc(bytes);
-            System::memcpy(newPtr, ptr, realSize);
+            // Need to reallocate and move
+            UserPtr newPtr = malloc(bytes);
+            System::memcpy(newPtr, ptr, userSize);
             free(ptr);
             return newPtr;
         }
     }
 
 
-    void* malloc(size_t bytes) {
+    UserPtr malloc(size_t bytes) {
         lock();
         ++totalMallocs;
 
         if (bytes <= tinyBufferSize) {
 
-            void* ptr = tinyMalloc(bytes);
+            UserPtr ptr = tinyMalloc(bytes);
 
             if (ptr) {
                 ++mallocsFromTinyPool;
@@ -1222,7 +1244,7 @@ class BufferPool {
         // through to a small buffer
         if (bytes <= smallBufferSize) {
             
-            void* ptr = malloc(smallPool, smallPoolSize, bytes);
+            UserPtr ptr = malloc(smallPool, smallPoolSize, bytes);
 
             if (ptr) {
                 ++mallocsFromSmallPool;
@@ -1235,7 +1257,7 @@ class BufferPool {
             // through into a medium allocation because that would
             // waste the medium buffer's resources.
 
-            void* ptr = malloc(medPool, medPoolSize, bytes);
+            UserPtr ptr = malloc(medPool, medPoolSize, bytes);
 
             if (ptr) {
                 ++mallocsFromMedPool;
@@ -1245,37 +1267,37 @@ class BufferPool {
             }
         }
 
-        bytesAllocated += REALBLOCK_SIZE(bytes);
+        bytesAllocated += USERSIZE_TO_REALSIZE(bytes);
         unlock();
 
         // Heap allocate
 
         // Allocate 4 extra bytes for our size header (unfortunate,
         // since malloc already added its own header).
-        void* ptr = ::malloc(REALBLOCK_SIZE(bytes));
+        RealPtr ptr = ::malloc(USERSIZE_TO_REALSIZE(bytes));
 
         if (ptr == NULL) {
             // Flush memory pools to try and recover space
             flushPool(smallPool, smallPoolSize);
             flushPool(medPool, medPoolSize);
-            ptr = ::malloc(REALBLOCK_SIZE(bytes));
+            ptr = ::malloc(USERSIZE_TO_REALSIZE(bytes));
         }
 
         if (ptr == NULL) {
             if ((System::outOfMemoryCallback() != NULL) &&
-                (System::outOfMemoryCallback()(REALBLOCK_SIZE(bytes), true) == true)) {
+                (System::outOfMemoryCallback()(USERSIZE_TO_REALSIZE(bytes), true) == true)) {
                 // Re-attempt the malloc
-                ptr = ::malloc(REALBLOCK_SIZE(bytes));
+                ptr = ::malloc(USERSIZE_TO_REALSIZE(bytes));
             }
         }
 
         if (ptr == NULL) {
             if (System::outOfMemoryCallback() != NULL) {
                 // Notify the application
-                System::outOfMemoryCallback()(REALBLOCK_SIZE(bytes), false);
+                System::outOfMemoryCallback()(USERSIZE_TO_REALSIZE(bytes), false);
             }
 #           ifdef G3D_DEBUG
-            debugPrintf("::malloc(%d) returned NULL\n", (int)REALBLOCK_SIZE(bytes));
+            debugPrintf("::malloc(%d) returned NULL\n", (int)USERSIZE_TO_REALSIZE(bytes));
 #           endif
             debugAssertM(ptr != NULL, 
                          "::malloc returned NULL. Either the "
@@ -1290,7 +1312,7 @@ class BufferPool {
     }
 
 
-    void free(void* ptr) {
+    void free(UserPtr ptr) {
         if (ptr == NULL) {
             // Free does nothing on null pointers
             return;
@@ -1305,7 +1327,7 @@ class BufferPool {
             return;
         }
 
-        uint32 bytes = *(uint32*)USERPTR_TO_REALPTR(ptr);
+        uint32 bytes = USERSIZE_FROM_USERPTR(ptr);
 
         lock();
         if (bytes <= smallBufferSize) {
@@ -1323,7 +1345,7 @@ class BufferPool {
                 return;
             }
         }
-        bytesAllocated -= REALBLOCK_SIZE(bytes);
+        bytesAllocated -= USERSIZE_TO_REALSIZE(bytes);
         unlock();
 
         // Free; the buffer pools are full or this is too big to store.
@@ -1677,7 +1699,7 @@ std::string System::currentDateString() {
 
 // VC on Intel
 void System::cpuid(CPUIDFunction func, uint32& areg, uint32& breg, uint32& creg, uint32& dreg) {
-#if !defined(G3D_64BIT)
+#if !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit platform */
     // Can't copy from assembler direct to a function argument (which is on the stack) in VC.
     uint32 a,b,c,d;
 
@@ -1695,14 +1717,14 @@ void System::cpuid(CPUIDFunction func, uint32& areg, uint32& breg, uint32& creg,
     breg = b; 
     creg = c;
     dreg = d;
-#else
-    int CPUInfo[4];
-    __cpuid(CPUInfo, func);
-    memcpy(&areg, &CPUInfo[0], 4);
-    memcpy(&breg, &CPUInfo[1], 4);
-    memcpy(&creg, &CPUInfo[2], 4);
-    memcpy(&dreg, &CPUInfo[3], 4);
-#endif
+#else /* G3DFIX: Don't check if on 64-bit platform */
+ int CPUInfo[4];
+ __cpuid(CPUInfo, func);
+ memcpy(&areg, &CPUInfo[0], 4);
+ memcpy(&breg, &CPUInfo[1], 4);
+ memcpy(&creg, &CPUInfo[2], 4);
+ memcpy(&dreg, &CPUInfo[3], 4);
+#endif /* G3DFIX: Don't check if on 64-bit platform */
 }
 
 #elif defined(G3D_OSX) && ! defined(G3D_OSX_INTEL)
diff --git a/dep/src/g3dlite/TextInput.cpp b/dep/src/g3dlite/TextInput.cpp
index 7276d8c66b2..354d0de13c0 100644
--- a/dep/src/g3dlite/TextInput.cpp
+++ b/dep/src/g3dlite/TextInput.cpp
@@ -6,7 +6,7 @@
  @cite Based on a lexer written by Aaron Orenstein. 
  
  @created 2001-11-27
- @edited  2008-07-14
+ @edited  2010-07-03
  */
 
 #include "G3D/fileutils.h"
@@ -33,36 +33,45 @@ Token TextInput::readSignificant() {
 
 double Token::number() const {
     if (_type == NUMBER) {
-        std::string s = toLower(_string);
-        if (s == "-1.#ind00") {
-            return nan();
-        }
+        return TextInput::parseNumber(_string);
+    } else {
+        return 0.0;
+    }
+}
 
-        if (s == "1.#inf00") {
-            return inf();
-        }
 
-        if (s == "-1.#inf00") {
-            return -inf();
-        }
+bool TextInput::parseBoolean(const std::string& _string) {
+     return toLower(_string) == "true";
+}
 
-        double n;
-        if ((_string.length() > 2) &&
-            (_string[0] == '0') &&
-            (_string[1] == 'x')) {
-            // Hex
-            uint32 i;
-            sscanf(_string.c_str(), "%x", &i);
-            n = i;
-        } else {
-            sscanf(_string.c_str(), "%lg", &n);
-        }
-        return n;
+double TextInput::parseNumber(const std::string& _string) {
+    std::string s = toLower(_string);
+    if (s == "-1.#ind00" || s == "nan") {
+        return nan();
+    }
+    
+    if (s == "1.#inf00" || s == "inf" || s == "+inf") {
+        return inf();
+    }
+    
+    if (s == "-1.#inf00" || s == "-inf") {
+        return -inf();
+    }
+    
+    double n;
+    if ((_string.length() > 2) &&
+        (_string[0] == '0') &&
+        (_string[1] == 'x')) {
+        // Hex
+        uint32 i;
+        sscanf(_string.c_str(), "%x", &i);
+        n = i;
     } else {
-        return 0.0;
+        sscanf(_string.c_str(), "%lg", &n);
     }
-}
 
+    return n;
+}
 
 TextInput::Settings::Settings () :
     cppBlockComments(true),
@@ -78,7 +87,8 @@ TextInput::Settings::Settings () :
     singleQuoteCharacter('\''),
     sourceFileName(),
     startingLineNumberOffset(0),
-    msvcSpecials(true),
+    msvcFloatSpecials(true),
+    simpleFloatSpecials(true),
     proofSymbols(false),
     caseSensitive(true)
 { 
@@ -117,6 +127,41 @@ Token TextInput::read() {
     }
 }
 
+
+
+std::string TextInput::readUntilNewlineAsString() {
+/*
+    // Reset the read position back to the start of that token
+    currentCharOffset = t.bytePosition();
+    lineNumber = t.line();
+    charNumber = t.character();
+    stack.clear();
+
+    if (currentCharOffset == buffer.size()) {
+        // End of file
+        return "";
+    }
+    */
+    std::string s;
+
+    // Read until newline or eof
+    char c = '\0';
+    do {
+        c = buffer[currentCharOffset];
+        if (c == '\r' || c == '\n') {
+            // Done
+            break;
+        } else {
+            s += c;
+            ++currentCharOffset;
+            ++charNumber;
+        }
+    } while (currentCharOffset < buffer.size());
+
+    return s;    
+}
+
+
 static void toUpper(Set<std::string>& set) {
     Array<std::string> symbols;
     set.getMembers(symbols);
@@ -198,6 +243,7 @@ int TextInput::peekInputChar(int distance) {
 Token TextInput::nextToken() {
     Token t;
 
+    t._bytePosition = currentCharOffset;
     t._line         = lineNumber;
     t._character    = charNumber;
     t._type         = Token::END;
@@ -215,21 +261,24 @@ Token TextInput::nextToken() {
         whitespaceDone = true;
 
         // generate newlines tokens for '\n' and '\r' and '\r\n'
-        if (options.generateNewlineTokens && isNewline(c)) {
-            t._type         = Token::NEWLINE;
-            t._extendedType = Token::NEWLINE_TYPE;
-            t._string       = c;
-
-            int c2 = peekInputChar(1);
-            if (c == '\r' && c2 == '\n') {
-                t._string  += c2;
-            }
+        while (isWhiteSpace(c)) {
+            if (options.generateNewlineTokens && isNewline(c)) {
+                t._type         = Token::NEWLINE;
+                t._extendedType = Token::NEWLINE_TYPE;
+                t._bytePosition = currentCharOffset;
+                t._line         = lineNumber;
+                t._character    = charNumber;
+                t._string       = c;
+
+                int c2 = peekInputChar(1);
+                if (c == '\r' && c2 == '\n') {
+                    t._string  += c2;
+                }
 
-            eatInputChar();
-            return t;
-        } else {
-            // Consume whitespace
-            while (isWhiteSpace(c)) {
+                eatInputChar();
+                return t;
+            } else {
+                // Consume the single whitespace
                 c = eatAndPeekInputChar();
             }
         }
@@ -237,6 +286,7 @@ Token TextInput::nextToken() {
         // update line and character number to include discarded whitespace
         t._line         = lineNumber;
         t._character    = charNumber;
+        t._bytePosition = currentCharOffset;
 
         int c2 = peekInputChar(1);
 
@@ -293,13 +343,16 @@ Token TextInput::nextToken() {
             eatInputChar();
             eatInputChar();
 
+            // c is the next character we'll read, c2 is the one after *that*
             c = peekInputChar();
             c2 = peekInputChar(1);
             while (! ((c == '*') && (c2 == '/')) && (c != EOF)) {
                 commentString += c;
 
+                // Eat input char may consume more than one character if there is a newline
                 eatInputChar();
-                c = c2;
+
+                c = peekInputChar();
                 c2 = peekInputChar(1);
             }
             eatInputChar();      // eat closing '*'
@@ -324,6 +377,7 @@ Token TextInput::nextToken() {
 
     t._line      = lineNumber;
     t._character = charNumber;
+    t._bytePosition = currentCharOffset;
 
     // handle EOF
     if (c == EOF) {
@@ -380,15 +434,29 @@ Token TextInput::nextToken() {
             return t;
         }
 
-        if (options.signedNumbers
-            && (isDigit(c) || (c == '.' && isDigit(peekInputChar(1))))) {
-
-            // Negative number.  'c' is still the first digit, and is
-            // the next input char.
+        if (options.signedNumbers) {
+            if (isDigit(c) || (c == '.' && isDigit(peekInputChar(1)))) {
+                // Negative number.  'c' is still the first digit, and is
+                // the next input char.
 
-            goto numLabel;
+                goto numLabel;
+            } else {
+                char terminal = peekInputChar(3);
+                if (options.simpleFloatSpecials && (c == 'i') && (peekInputChar(1) == 'n') && (peekInputChar(2) == 'f') && 
+                    ! isLetter(terminal) && (terminal != '_')) {
+                    // negative infinity
+                    t._type = Token::NUMBER;
+                    t._extendedType = Token::FLOATING_POINT_TYPE;
+                    t._string = "-inf";
+                    eatInputChar(); // i
+                    eatInputChar(); // n
+                    eatInputChar(); // f
+                    return t;
+                }
+            }
         }
 
+
         // plain -
         return t;
 
@@ -403,13 +471,26 @@ Token TextInput::nextToken() {
             return t;
         }
 
-        if (options.signedNumbers
-            && (isDigit(c) || (c == '.' && isDigit(peekInputChar(1))))) {
+        if (options.signedNumbers) {
+            if (isDigit(c) || (c == '.' && isDigit(peekInputChar(1)))) {
+                // Positive number.  'c' is still the first digit, and is
+                // the next input char.
 
-            // Positive number.  'c' is still the first digit, and is
-            // the next input char.
-
-            goto numLabel;
+                goto numLabel;
+            } else {
+                char terminal = peekInputChar(3);
+                if (options.simpleFloatSpecials && (c == 'i') && (peekInputChar(1) == 'n') && (peekInputChar(2) == 'f') && 
+                    ! isLetter(terminal) && (terminal != '_')) {
+                    // positive infinity
+                    t._type = Token::NUMBER;
+                    t._extendedType = Token::FLOATING_POINT_TYPE;
+                    t._string = "+inf";
+                    eatInputChar(); // i
+                    eatInputChar(); // n
+                    eatInputChar(); // f
+                    return t;
+                }
+            }
         }
 
         return t;
@@ -596,7 +677,7 @@ Token TextInput::nextToken() {
                 c = eatAndPeekInputChar();
 
                 // Floating point specials (msvc format only)
-                if (options.msvcSpecials && (c == '#')) {
+                if (options.msvcFloatSpecials && (c == '#')) {
                     isSpecial = true;
                     // We are reading a floating point special value
                     // of the form -1.#IND00, -1.#INF00, or 1.#INF00
@@ -607,8 +688,7 @@ Token TextInput::nextToken() {
                     }
                     if (test != 'I') {
                         throw BadMSVCSpecial
-                            (
-                             "Incorrect floating-point special (inf or nan) "
+                            ("Incorrect floating-point special (inf or nan) "
                              "format.",
                             t.line(), charNumber);
                     }
@@ -714,6 +794,10 @@ Token TextInput::nextToken() {
             }
         }
 
+        if (options.simpleFloatSpecials && ((t._string == "nan") || (t._string == "inf"))) {
+            t._type = Token::NUMBER;
+            t._extendedType = Token::FLOATING_POINT_TYPE;
+        }
         return t;
 
     } else if (c == '\"') {
@@ -1052,6 +1136,8 @@ static const char* tokenTypeToString(Token::Type t) {
         return "Token::NUMBER";
     case Token::END:
         return "Token::END";
+    case Token::NEWLINE:
+        return "Token::NEWLINE";
     default:
         debugAssertM(false, "Fell through switch");
         return "?";
diff --git a/dep/src/g3dlite/TextOutput.cpp b/dep/src/g3dlite/TextOutput.cpp
index 11347252eba..3257f6fb9ce 100644
--- a/dep/src/g3dlite/TextOutput.cpp
+++ b/dep/src/g3dlite/TextOutput.cpp
@@ -3,15 +3,16 @@
 
   @maintainer Morgan McGuire, http://graphics.cs.williams.edu
   @created 2004-06-21
-  @edited  2006-08-14
+  @edited  2010-03-14
 
-  Copyright 2000-2006, Morgan McGuire.
+  Copyright 2000-2010, Morgan McGuire.
   All rights reserved.
  */
 
 #include "G3D/TextOutput.h"
 #include "G3D/Log.h"
 #include "G3D/fileutils.h"
+#include "G3D/FileSystem.h"
 
 namespace G3D {
 
@@ -392,17 +393,17 @@ void TextOutput::vprintf(const char* formatString, va_list argPtr) {
 
 void TextOutput::commit(bool flush) {
     std::string p = filenamePath(filename);
-    if (! fileExists(p, false)) {
-        createDirectory(p);
+    if (! FileSystem::exists(p, false)) {
+        FileSystem::createDirectory(p);
     }
 
-    FILE* f = fopen(filename.c_str(), "wb");
+    FILE* f = FileSystem::fopen(filename.c_str(), "wb");
     debugAssertM(f, "Could not open \"" + filename + "\"");
     fwrite(data.getCArray(), 1, data.size(), f);
     if (flush) {
         fflush(f);
     }
-    fclose(f);
+    FileSystem::fclose(f);
 }
 
 
diff --git a/dep/src/g3dlite/Vector3.cpp b/dep/src/g3dlite/Vector3.cpp
index a53fa8269b7..55343e96ece 100644
--- a/dep/src/g3dlite/Vector3.cpp
+++ b/dep/src/g3dlite/Vector3.cpp
@@ -25,6 +25,7 @@
 #include "G3D/Vector2.h"
 #include "G3D/Color3.h"
 #include "G3D/Vector4int8.h"
+#include "G3D/Vector4.h"
 #include "G3D/Vector3int32.h"
 #include "G3D/Any.h"
  
@@ -104,11 +105,7 @@ Vector3::Axis Vector3::primaryAxis() const {
 
 
 size_t Vector3::hashCode() const {
-    unsigned int xhash = (*(int*)(void*)(&x));
-    unsigned int yhash = (*(int*)(void*)(&y));
-    unsigned int zhash = (*(int*)(void*)(&z));
-
-    return xhash + (yhash * 37) + (zhash * 101);
+    return Vector4(*this, 0.0f).hashCode();
 }
 
 std::ostream& operator<<(std::ostream& os, const Vector3& v) {
diff --git a/dep/src/g3dlite/Vector4.cpp b/dep/src/g3dlite/Vector4.cpp
index f6abc1a6e0c..b5f23d69950 100644
--- a/dep/src/g3dlite/Vector4.cpp
+++ b/dep/src/g3dlite/Vector4.cpp
@@ -4,7 +4,7 @@
  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
   
  @created 2001-07-09
- @edited  2009-11-29
+ @edited  2010-07-05
  */
 
 #include <stdlib.h>
@@ -69,12 +69,7 @@ const Vector4& Vector4::nan() {
 
 
 size_t Vector4::hashCode() const {
-    unsigned int xhash = (*(int*)(void*)(&x));
-    unsigned int yhash = (*(int*)(void*)(&y));
-    unsigned int zhash = (*(int*)(void*)(&z));
-    unsigned int whash = (*(int*)(void*)(&w));
-
-    return xhash + (yhash * 37) + (zhash * 101) + (whash * 241);
+    return HashTrait<uint128>::hashCode(*((uint128*)this));
 }
 
 
diff --git a/dep/src/g3dlite/Welder.cpp b/dep/src/g3dlite/Welder.cpp
index b4f752f38bd..2db47722e64 100644
--- a/dep/src/g3dlite/Welder.cpp
+++ b/dep/src/g3dlite/Welder.cpp
@@ -74,7 +74,7 @@ namespace G3D { namespace _internal {
 
 class WeldHelper {
 private:
-    /** Used by getIndex and updateTriLists */
+    /** Used by getIndex and updateTriLists. Deallocating this is slow. */
     PointHashGrid<VNTi>     weldGrid;
 
     Array<Vector3>*         outputVertexArray;
@@ -157,23 +157,25 @@ class WeldHelper {
         int numTriLists = indexArrayArray.size();
         int u = 0;
         for (int t = 0; t < numTriLists; ++t) {
-            Array<int>& triList = *(indexArrayArray[t]);
-
-            // For all vertices in this list
-            for (int v = 0; v < triList.size(); ++v) {
-                // This vertex mapped to u in the flatVertexArray
-                triList[v] = getIndex(vertexArray[u], normalArray[u], texCoordArray[u]);
-
-                /*
-#           ifdef G3D_DEBUG
-            {
-                int i = triList[v];
-                Vector3 N = normalArray[i];
-                debugAssertM(N.length() > 0.9f, "Produced non-unit normal");
-            }
-#           endif
-            */
-                ++u;
+            if (indexArrayArray[t] != NULL) {
+                Array<int>& triList = *(indexArrayArray[t]);
+
+                // For all vertices in this list
+                for (int v = 0; v < triList.size(); ++v) {
+                    // This vertex mapped to u in the flatVertexArray
+                    triList[v] = getIndex(vertexArray[u], normalArray[u], texCoordArray[u]);
+
+                    /*
+    #           ifdef G3D_DEBUG
+                {
+                    int i = triList[v];
+                    Vector3 N = normalArray[i];
+                    debugAssertM(N.length() > 0.9f, "Produced non-unit normal");
+                }
+    #           endif
+                */
+                    ++u;
+                }
             }
         }
     }
@@ -190,11 +192,13 @@ class WeldHelper {
 
         int numTriLists = indexArrayArray.size();
         for (int t = 0; t < numTriLists; ++t) {
-            const Array<int>& triList = *(indexArrayArray[t]);
-            for (int v = 0; v < triList.size(); ++v) {
-                int i = triList[v];
-                unrolledVertexArray.append(vertexArray[i]);
-                unrolledTexCoordArray.append(texCoordArray[i]);
+            if (indexArrayArray[t] != NULL) {
+                const Array<int>& triList = *(indexArrayArray[t]);
+                for (int v = 0; v < triList.size(); ++v) {
+                    int i = triList[v];
+                    unrolledVertexArray.append(vertexArray[i]);
+                    unrolledTexCoordArray.append(texCoordArray[i]);
+                }
             }
         }
     }
@@ -214,8 +218,9 @@ class WeldHelper {
             const Vector3& e1 = vertexArray[v + 2] - vertexArray[v];
 
             // Note that the length may be zero in the case of sliver polygons, e.g.,
-            // those correcting a T-junction.
-            const Vector3& n  = e0.cross(e1).directionOrZero(); 
+            // those correcting a T-junction.  Scale up by 256 to avoid underflow when
+            // multiplying very small edges
+            const Vector3& n  = (e0.cross(e1 * 256.0f)).directionOrZero();
 
             // Append the normal once per vertex.
             faceNormalArray.append(n, n, n);
@@ -230,15 +235,16 @@ class WeldHelper {
         const Array<Vector3>& vertexArray, 
         const Array<Vector3>& normalArray, 
         Array<Vector3>&       smoothNormalArray) {
-
-        // Create an area memory manager for fast deallocation
-        MemoryManager::Ref mm = AreaMemoryManager::create(iRound(sizeof(VN) * normalArray.size() * 1.5));
         
         if (normalSmoothingAngle <= 0) {
             smoothNormalArray = normalArray;
             return;
         }
 
+        
+        // Create an area memory manager for fast deallocation
+        MemoryManager::Ref mm = AreaMemoryManager::create(iRound(sizeof(VN) * normalArray.size() * 1.5));
+
         const float cosThresholdAngle = (float)cos(normalSmoothingAngle);
 
         debugAssert(vertexArray.size() == normalArray.size());
@@ -250,6 +256,7 @@ class WeldHelper {
             grid.insert(VN(vertexArray[v], normalArray[v]));
         }
 
+        // TODO: this step could be done on multiple threads
         for (int v = 0; v < normalArray.size(); ++v) {            
             // Compute the sum of all nearby normals within the cutoff angle.
             // Search within the vertexWeldRadius, since those are the vertices
@@ -265,8 +272,8 @@ class WeldHelper {
                 const float cosAngle = N.dot(original);
 
                 if (cosAngle > cosThresholdAngle) {
-                    // This normal is close enough to consider
-                    sum += N;
+                    // This normal is close enough to consider.  Avoid underflow by scaling up
+                    sum += (N * 256.0f);
                 }
                 ++it;
             }
@@ -366,8 +373,9 @@ class WeldHelper {
     }
 
     WeldHelper(float vertRadius) :
-        weldGrid(vertRadius),
-        vertexWeldRadius(vertRadius) {}
+        weldGrid(vertRadius, AreaMemoryManager::create()),
+        vertexWeldRadius(vertRadius) {
+    }
 
 };
 } // Internal
@@ -382,6 +390,7 @@ void Welder::weld(
     _internal::WeldHelper(settings.vertexWeldRadius).process(
         vertexArray, texCoordArray, normalArray, indexArrayArray, 
         settings.normalSmoothingAngle, settings.textureWeldRadius, settings.normalWeldRadius);
+        
 }
 
 
diff --git a/dep/src/g3dlite/XML.cpp b/dep/src/g3dlite/XML.cpp
new file mode 100644
index 00000000000..51f1a549ba0
--- /dev/null
+++ b/dep/src/g3dlite/XML.cpp
@@ -0,0 +1,216 @@
+/**
+ \file XML.h
+  
+ \author Morgan McGuire
+ \maintainer Morgan McGuire
+  
+ \created 2010-02-11
+ \edited  2010-02-24
+
+ Copyright 2000-2010, Morgan McGuire.
+ All rights reserved.
+ */
+
+#include "G3D/XML.h"
+#include "G3D/fileutils.h"
+#include "G3D/TextInput.h"
+#include "G3D/TextOutput.h"
+#include "G3D/stringutils.h"
+
+namespace G3D {
+
+XML::XML(TextInput& t) : m_type(VALUE) {
+    deserialize(t);
+}
+
+double XML::number() const {
+    return TextInput::parseNumber(m_value);
+}
+
+
+bool XML::boolean() const {
+    return TextInput::parseBoolean(m_value);
+}
+
+
+void XML::load(const std::string& filename) {
+    TextInput::Settings s;
+    s.cppBlockComments = false;
+    s.cppLineComments = false;
+    s.proofSymbols = false;
+
+    TextInput t(filename, s);
+    deserialize(t);
+}
+
+
+void XML::save(const std::string& filename) const {
+    std::string s;
+    unparse(s);
+    writeWholeFile(filename, s);
+}
+
+    
+void XML::unparse(std::string &s) const {
+    TextOutput::Settings set;
+    set.wordWrap = TextOutput::Settings::WRAP_WITHOUT_BREAKING;
+    TextOutput t(set);
+
+    serialize(t);
+
+    t.commitString(s);
+}
+
+
+void XML::serialize(TextOutput& t) const {
+    if (m_type == VALUE) {
+        // Raw string; no quotes
+        t.writeSymbol(m_value);
+    } else {
+        t.printf("<%s", m_name.c_str());
+        for (AttributeTable::Iterator it = m_attribute.begin(); it.hasMore(); ++it) {
+            t.printf(" %s=\"%s\"", it->key.c_str(), it->value.m_value.c_str());
+        }
+        t.printf(">");
+        t.writeNewline();
+        t.pushIndent();
+        for (int i = 0; i < m_child.size(); ++i) {
+            m_child[i].serialize(t);
+            if (m_child[i].m_type == VALUE) {
+                // Only tags know to append a newline
+                t.writeNewline();
+            }
+        }
+        t.popIndent();
+        t.printf("</%s>", m_name.c_str());
+        t.writeNewline();
+    }
+}
+
+
+void XML::parse(const std::string& s) {
+    TextInput t(TextInput::FROM_STRING, s);
+    deserialize(t);
+}
+
+
+/** True if the next token begins the close tag */
+static bool atClose(TextInput& t, const std::string name) {
+    if ((t.peek().type() == Token::SYMBOL) && (t.peek().string() == "<")) {
+        // Need to keep looking ahead
+        Token p0 = t.read();
+        if ((t.peek().type() == Token::SYMBOL) && (t.peek().string() == "/")) {
+            // Check the name on the close tag.  It *must* match if
+            // this is a well-formed document, but there might be a
+            // tag error.
+            Token p1 = t.read();
+            Token p2 = t.peek();
+            std::string s = p2.string();
+            debugAssertM(beginsWith(name, s), "Mismatched close tag");
+
+            // Put the tokens back
+            t.push(p1);
+            t.push(p0);
+            return true;
+        } else {
+            // Put the read token back
+            t.push(p0);
+            return false;
+        }
+    } else {
+        return false;
+    }
+}
+
+void XML::deserialize(TextInput& t) {
+ begin:
+    Token n = t.read();
+    m_attribute.clear();
+    m_child.clear();
+    m_name = "";
+    m_value = "";
+
+    if ((n.type() == Token::SYMBOL) && (n.string() == "<")) {
+        // Beginning a tag
+        
+        // Read name
+        n = t.read();
+        debugAssert(n.type() == Token::SYMBOL);
+        bool isComment = 
+            (n.string() == "!") && 
+            (t.peek().type() == Token::SYMBOL) &&
+            (t.peek().string() == "--");
+
+        // ignored tag:        <?xml> or <!xml>
+        // comment tag:        <!--   ... -->
+
+        if ((n.string() == "?") || ((n.string() == "!") && ! isComment)) {
+            // Ignore this tag
+            while (t.hasMore() && ! ((n.type() == Token::SYMBOL) && (n.string() == ">"))) {
+                n = t.read();
+            }
+            goto begin;
+        } else if (isComment) {
+            // Ignore until "-->"
+            bool prevWasDash = false;
+            while (t.hasMore() && ! ((n.type() == Token::SYMBOL) && (n.string() == ">") && prevWasDash)) {
+                prevWasDash = (n.type() == Token::SYMBOL) && (n.string() == "--");
+                n = t.read();
+            }
+            goto begin;
+        }
+
+        // Keep reading until no colon
+        m_name += n.string();
+        n = t.read();
+        while ((n.type() == Token::SYMBOL) && (n.string() == ":")) {
+            //  tag with namespace: <x:y>
+            m_name += ":" + t.readSymbol();
+            n = t.read();
+        }
+        
+        // Read end of tag/close
+        bool done = false;
+        while (! done) {
+            debugAssert(n.type() == Token::SYMBOL);
+            if (n.string() == "/") {
+                // empty-element tag:  <foo/>
+                // Consume the close tag
+                t.readSymbol(">");
+                done = true;
+
+            } else if (n.string() == ">") {
+                // End of open tag: read children until close tag
+                while (! atClose(t, m_name)) {
+                    m_child.next().deserialize(t);
+                }
+
+                // Read close tag (we wouldn't be here unless it parses correctly)
+                while (t.hasMore() && ! (t.readSymbol() == ">")) {}
+                
+                done = true;
+            } else {
+                // Attribute pair
+                std::string k = n.string();
+                t.readSymbol("=");
+                std::string v = t.read().string();
+                m_attribute.set(k, v);
+
+                // Advance to next
+                n = t.read();
+            }
+        }
+    } else {
+        // Beginning embedded content.  Read until the end of file or the next tag.
+        m_type = VALUE;
+        m_value += n.string();
+
+        n = t.peek();
+        while (t.hasMore() && ! ((n.type() == Token::SYMBOL) && (n.string() == "<"))) {
+            m_value += " " + t.read().string();
+            n = t.peek();
+        }
+    }
+}
+
+}
diff --git a/dep/src/g3dlite/constants.cpp b/dep/src/g3dlite/constants.cpp
index 52cad3cd90b..9ee3eb8736b 100644
--- a/dep/src/g3dlite/constants.cpp
+++ b/dep/src/g3dlite/constants.cpp
@@ -11,72 +11,6 @@
 
 namespace G3D {
 
-const std::string MirrorQuality::str[] = {"NONE", "STATIC_ENV", "DYNAMIC_PLANAR", "DYNAMIC_ENV", "BEST"};
-const MirrorQuality::Value MirrorQuality::enm[] = {MirrorQuality::NONE, MirrorQuality::STATIC_ENV, 
-    MirrorQuality::DYNAMIC_PLANAR, MirrorQuality::DYNAMIC_ENV, MirrorQuality::BEST};
 
-MirrorQuality::MirrorQuality(const class Any& any) {
-    *this = any;
-}
-
-
-MirrorQuality& MirrorQuality::operator=(const Any& any) {
-    const std::string& s = toUpper(any.string());
-
-    for (int i = 0; ! str[i].empty(); ++i) {
-        if (s == str[i]) {
-            value = enm[i];
-            return *this;
-        }
-    }
-
-    any.verify(false, "Unrecognized MirrorQuality constant");
-    return *this;
-}
-
-
-MirrorQuality::operator Any() const {
-    return toString();
-}
-
-
-const std::string& MirrorQuality::toString() const {
-    return str[value];
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const std::string RefractionQuality::str[] = {"NONE", "STATIC_ENV", "DYNAMIC_FLAT", "DYNAMIC_FLAT_MULTILAYER", "DYNAMIC_ENV", "BEST"};
-const RefractionQuality::Value RefractionQuality::enm[] = {RefractionQuality::NONE, RefractionQuality::STATIC_ENV, 
-    RefractionQuality::DYNAMIC_FLAT, RefractionQuality::DYNAMIC_FLAT_MULTILAYER, RefractionQuality::DYNAMIC_ENV, RefractionQuality::BEST};
-
-RefractionQuality::RefractionQuality(const class Any& any) {
-    *this = any;
-}
-
-
-RefractionQuality& RefractionQuality::operator=(const Any& any) {
-    const std::string& s = toUpper(any.string());
-
-    for (int i = 0; ! str[i].empty(); ++i) {
-        if (s == str[i]) {
-            value = enm[i];
-            return *this;
-        }
-    }
-
-    any.verify(false, "Unrecognized RefractionQuality constant");
-    return *this;
-}
-
-
-RefractionQuality::operator Any() const {
-    return toString();
-}
-
-
-const std::string& RefractionQuality::toString() const {
-    return str[value];
-}
 
 } // G3D
diff --git a/dep/src/g3dlite/debugAssert.cpp b/dep/src/g3dlite/debugAssert.cpp
index a87161b261f..3d1390e3276 100644
--- a/dep/src/g3dlite/debugAssert.cpp
+++ b/dep/src/g3dlite/debugAssert.cpp
@@ -37,10 +37,10 @@ AssertionHook _debugHook = _handleDebugAssert_;
 AssertionHook _failureHook = _handleErrorCheck_;
 
 #ifdef G3D_LINUX
-#if SOMEONE_MADE_THIS_USEFUL
+#if SOMEONE_MADE_THIS_USEFUL /* G3DFIX: Disabled to avoid requirement for X11 libraries */
     Display*      x11Display = NULL;
     Window        x11Window  = 0;
-#endif
+#endif /* G3DFIX: Disabled to avoid requirement for X11 libraries */
 #endif
 
 
@@ -252,7 +252,7 @@ void _releaseInputGrab_() {
         ClipCursor(NULL);
         
     #elif defined(G3D_LINUX)
-#if SOMEONE_MADE_THIS_USEFUL
+    #if SOMEONE_MADE_THIS_USEFUL /* G3DFIX: Disabled to avoid requirement for X11 libraries */
         if (x11Display != NULL) {
             XUngrabPointer(x11Display, CurrentTime);
             XUngrabKeyboard(x11Display, CurrentTime);
@@ -267,7 +267,7 @@ void _releaseInputGrab_() {
             XAllowEvents(x11Display, AsyncPointer, CurrentTime);
             XFlush(x11Display);
         }
-#endif
+    #endif /* G3DFIX: Disabled to avoid requirement for X11 libraries */
     #elif defined(G3D_OSX)
         // TODO: OS X
     #endif
diff --git a/dep/src/g3dlite/fileutils.cpp b/dep/src/g3dlite/fileutils.cpp
index 3f5eb579ba9..66fe0eacb0e 100644
--- a/dep/src/g3dlite/fileutils.cpp
+++ b/dep/src/g3dlite/fileutils.cpp
@@ -17,12 +17,13 @@
 #include "G3D/stringutils.h"
 #include "G3D/Set.h"
 #include "G3D/g3dfnmatch.h"
+#include "G3D/FileSystem.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
-#if _HAVE_ZIP
-    #include "zip.h"
-#endif
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+#include "zip.h"
+#endif /* G3DFIX: Use ZIP-library only if defined */
 
 #ifdef G3D_WIN32
    // Needed for _getcwd
@@ -104,17 +105,18 @@ std::string readWholeFile(
     std::string s;
 
     debugAssert(filename != "");
-    if (fileExists(filename, false)) {
+    debugAssertM(FileSystem::exists(filename), filename + " not found");
 
-        int64 length = fileLength(filename);
+    if (! FileSystem::inZipfile(filename)) {
+        int64 length = FileSystem::size(filename);
 
         char* buffer = (char*)System::alignedMalloc(length + 1, 16);
         debugAssert(buffer);
-        FILE* f = fopen(filename.c_str(), "rb");
+        FILE* f = FileSystem::fopen(filename.c_str(), "rb");
         debugAssert(f);
         int ret = fread(buffer, 1, length, f);
 	    debugAssert(ret == length);(void)ret;
-        fclose(f);
+        FileSystem::fclose(f);
 
         buffer[length] = '\0';    
         s = std::string(buffer);
@@ -134,8 +136,6 @@ std::string readWholeFile(
         buffer[length] = '\0';
         s = std::string(buffer);
         System::alignedFree(buffer);
-    } else {
-        debugAssertM(false, filename + " not found");
     }
 
     return s;
@@ -146,7 +146,8 @@ void zipRead(const std::string& file,
              void*& data,
              size_t& length) {
     std::string zip, desiredFile;
-#if _HAVE_ZIP    
+    
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
     if (zipfileExists(file, zip, desiredFile)) {
         struct zip *z = zip_open( zip.c_str(), ZIP_CHECKCONS, NULL );
         {
@@ -169,9 +170,9 @@ void zipRead(const std::string& file,
     } else {
         data = NULL;
     }
-#else
-    data = NULL;
-#endif
+#else /* G3DFIX: Use ZIP-library only if defined */
+ data = NULL;
+#endif /* G3DFIX: Use ZIP-library only if defined */
 }
 
 
@@ -185,7 +186,7 @@ int64 fileLength(const std::string& filename) {
     int result = _stat(filename.c_str(), &st);
     
     if (result == -1) {
-#if _HAVE_ZIP
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
 		std::string zip, contents;
 		if(zipfileExists(filename, zip, contents)){
 			int64 requiredMem;
@@ -196,6 +197,7 @@ int64 fileLength(const std::string& filename) {
                                 struct zip_stat info;
                                 zip_stat_init( &info );    // TODO: Docs unclear if zip_stat_init is required.
                                 int success = zip_stat( z, contents.c_str(), ZIP_FL_NOCASE, &info );
+				(void)success;
                                 debugAssertM(success == 0, zip + ": " + contents + ": zip stat failed.");
                                 requiredMem = info.size;
 			}
@@ -204,132 +206,14 @@ int64 fileLength(const std::string& filename) {
 		} else {
         return -1;
 		}
-#else
-        return -1;
-#endif
+#else /* G3DFIX: Use ZIP-library only if defined */
+ return -1;
+#endif /* G3DFIX: Use ZIP-library only if defined */
     }
 
     return st.st_size;
 }
 
-/** Used by robustTmpfile.  Returns nonzero if fread, fwrite, and fseek all
-succeed on the file.
-  @author Morgan McGuire, http://graphics.cs.williams.edu  */
-static int isFileGood(FILE* f) {
-
-	int x, n, result;
-
-	/* Must be a valid file handle */
-	if (f == NULL) {
-		return 0;
-	}
-
-	/* Try to write */
-	x = 1234;
-	n = fwrite(&x, sizeof(int), 1, f);
-
-	if (n != 1) {
-		return 0;
-	}
-
-	/* Seek back to the beginning */
-	result = fseek(f, 0, SEEK_SET);
-	if (result != 0) {
-		return 0;
-	}
-
-	/* Read */
-	n =	fread(&x, sizeof(int), 1, f);
-	if (n != 1) {
-		return 0;
-	}
-
-	/* Seek back to the beginning again */
-	fseek(f, 0, SEEK_SET);
-
-	return 1;
-}
-
-FILE* createTempFile() {
-    FILE* t = NULL;
-
-//#   ifdef G3D_WIN32
-        t = tmpfile();
-//#   else
-//        // On Unix, tmpfile generates a warning for any code that links against it.
-//        const char* tempfilename = "/tmp/g3dtemp.XXXXXXXX";
-//        mktemp(tempfilename);
-//        t = fopen(tempfilename, "w");    
-//#   endif
-
-#	ifdef _WIN32
-		char* n = NULL;
-#	endif
-	char name[256];
-
-    if (isFileGood(t)) {
-        return t;
-    }
-
-#   ifdef G3D_WIN32
-    /* tmpfile failed; try the tmpnam routine */
-    t = fopen(tmpnam(NULL), "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    n = _tempnam("c:/tmp/", "t");
-    /* Try to create something in C:\tmp */
-    t = fopen(n, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    /* Try c:\temp */
-    n = _tempnam("c:/temp/", "t");
-    t = fopen(n, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    /* try the current directory */
-    n = _tempnam("./", "t");
-    t = fopen(n, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    sprintf(name, "%s/tmp%d", "c:/temp", rand());
-    t = fopen(name, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    /* Try some hardcoded paths */
-    sprintf(name, "%s/tmp%d", "c:/tmp", rand());
-    t = fopen(name, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-#   else
-    sprintf(name, "%s/tmp%d", "/tmp", rand());
-    t = fopen(name, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-#endif
-
-    sprintf(name, "tmp%d", rand());
-    t = fopen(name, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    fprintf(stderr, "Unable to create a temporary file; robustTmpfile returning NULL\n");
-
-    return NULL;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 void writeWholeFile(
     const std::string&          filename,
@@ -342,11 +226,11 @@ void writeWholeFile(
     parseFilename(filename, root, pathArray, base, ext); 
 
     path = root + stringJoin(pathArray, '/');
-    if (! fileExists(path, false)) {
-        createDirectory(path);
+    if (! FileSystem::exists(path, false)) {
+        FileSystem::createDirectory(path);
     }
 
-    FILE* file = fopen(filename.c_str(), "wb");
+    FILE* file = FileSystem::fopen(filename.c_str(), "wb");
 
     debugAssert(file);
 
@@ -355,7 +239,8 @@ void writeWholeFile(
     if (flush) {
         fflush(file);
     }
-    fclose(file);
+
+    FileSystem::fclose(file);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -385,7 +270,7 @@ void createDirectory(
     }
 
     // If it already exists, do nothing
-    if (fileExists(d.substr(0, d.size() - 1)), false) {
+    if (FileSystem::exists(d.substr(0, d.size() - 1))) {
         return;
     }
 
@@ -405,129 +290,22 @@ void createDirectory(
     // Create any intermediate that doesn't exist
     for (int i = 0; i < path.size(); ++i) {
         p += "/" + path[i];
-        if (! fileExists(p, false)) {
+        if (! FileSystem::exists(p)) {
             // Windows only requires one argument to mkdir,
             // where as unix also requires the permissions.
 #           ifndef G3D_WIN32
                 mkdir(p.c_str(), 0777);
-#	    else
+#	        else
                 _mkdir(p.c_str());
-#	    endif
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-class FileSystemCache {
-private:
-
-    Table<std::string, Array<std::string> > m_files;
-
-public:
-
-    bool fileExists(const std::string& filename) {
-        const std::string& path = resolveFilename(filenamePath(filename));
-        const std::string& name = filenameBaseExt(filename);
-        
-        bool neverBeforeSeen = false;
-        Array<std::string>& fileList = m_files.getCreate(path, neverBeforeSeen);
-        if (neverBeforeSeen) {
-            if (! G3D::fileExists(path, true, false)) {
-                // The path itself doesn't exist... back out our insertion (which makes fileList& invalid) 
-                m_files.remove(path);
-                return false;
-            }
-
-            std::string spec = pathConcat(path, "*");
-
-            // Will automatically recurse into zipfiles
-            getFiles(spec, fileList);
-            getDirs(spec, fileList);
-
-#           ifdef G3D_WIN32 
-            {
-                // Case insensitive
-                for (int i = 0; i < fileList.size(); ++i) {
-                    fileList[i] = toLower(fileList[i]);
-                }
-            }
-#           endif
-        }
-
-        if (filenameContainsWildcards(name)) {
-            // See if anything matches
-            for (int i = 0; i < fileList.size(); ++i) {
-                if (g3dfnmatch(name.c_str(), fileList[i].c_str(), 0) == 0) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            // On windows, this is a lower-lower comparison, so it is case insensitive
-            return fileList.contains(name);
+#	        endif
         }
     }
-
-    void clear() {
-        m_files.clear();
-    }
-
-    static FileSystemCache& instance() {
-        static FileSystemCache i;
-        return i;
-    }
-};
-
-
-void clearFileSystemCache() {
-    FileSystemCache::instance().clear();
 }
 
-bool fileExists
-(const std::string&	_filename,
- bool                   lookInZipfiles,
- bool                   trustCache) {
-    
-    if (_filename.empty()) {
-        return false;
-    }
-
-    // Remove trailing slash from directories
-    const std::string& filename = (endsWith(_filename, "/") || endsWith(_filename, "\\")) ? _filename.substr(0, _filename.length() - 1) : _filename;
-
-    if (trustCache && lookInZipfiles) {
-#       ifdef G3D_WIN32
-            // Case insensitive
-            return FileSystemCache::instance().fileExists(toLower(filename));
-#       else
-            return FileSystemCache::instance().fileExists(filename);
-#       endif
-    }
-
-    // Useful for debugging
-    //char curdir[1024]; _getcwd(curdir, 1024); 
-
-    struct _stat st;
-    int ret = _stat(filename.c_str(), &st);
-
-    // _stat returns zero on success
-    bool exists = (ret == 0);
-
-    if (! exists && lookInZipfiles) {
-		// Does not exist standalone, but might exist in a zipfile
-
-		// These output arguments will be ignored
-		std::string zipDir, internalPath;
-		return zipfileExists(filename, zipDir, internalPath);
-    } else {
-    	return exists;
-    }
-}
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#if _HAVE_ZIP
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
 /* Helper methods for zipfileExists()*/
 // Given a string (the drive) and an array (the path), computes the directory
 static void _zip_resolveDirectory(std::string& completeDir, const std::string& drive, const Array<std::string>& path, const int length){
@@ -561,12 +339,13 @@ static bool _zip_zipContains(const std::string& zipDir, const std::string& desir
 	}
 	return true;
 }
-#endif
+#endif /* G3DFIX: Use ZIP-library only if defined */
 
 // If no zipfile exists, outZipfile and outInternalFile are unchanged
 bool zipfileExists(const std::string& filename, std::string& outZipfile,
                    std::string& outInternalFile){
-#if _HAVE_ZIP
+   
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
     Array<std::string> path;
     std::string drive, base, ext, zipfile, infile;
     parseFilename(filename, drive, path, base, ext);
@@ -607,12 +386,12 @@ bool zipfileExists(const std::string& filename, std::string& outZipfile,
             return false;
         }
         
-        if (fileExists(zipfile, false)) {
+        if (FileSystem::exists(zipfile)) {
             // test if it actually is a zipfile
             // if not, return false, a bad
             // directory structure has been given,
             // not a .zip
-            if (isZipfile(zipfile)){
+            if (FileSystem::isZipfile(zipfile)){
                 
                 if (_zip_zipContains(zipfile, infile)){
                     outZipfile = zipfile;
@@ -628,7 +407,7 @@ bool zipfileExists(const std::string& filename, std::string& outZipfile,
         }
         
     }
-#endif
+#endif /* G3DFIX: Use ZIP-library only if defined */    
     // not a valid directory structure ever, 
     // obviously no .zip was found within the path 
     return false;
@@ -641,7 +420,7 @@ std::string generateFilenameBase(const std::string& prefix, const std::string& s
 
     // Note "template" is a reserved word in C++
     std::string templat = prefix + System::currentDateString() + "_";
-    getFiles(templat + "*", exist);
+    FileSystem::getFiles(templat + "*", exist);
     
     // Remove extensions
     for (int i = 0; i < exist.size(); ++i) {
@@ -910,7 +689,8 @@ static void getFileOrDirListNormal
 #   endif
 }
 
-#if _HAVE_ZIP
+
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
 /**
  @param path   The zipfile name (no trailing slash)
  @param prefix Directory inside the zipfile. No leading slash, must have trailing slash if non-empty.
@@ -961,14 +741,14 @@ static void _zip_addEntry(const std::string& path,
         }
     }
 }
-#endif
+#endif /* G3DFIX: Use ZIP-library only if defined */
 
 static void getFileOrDirListZip(const std::string& path,
                                 const std::string& prefix,
                                 Array<std::string>& files,
                                 bool wantFiles,
                                 bool includePath){
-#if _HAVE_ZIP
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
     struct zip *z = zip_open( path.c_str(), ZIP_CHECKCONS, NULL );
 
     Set<std::string> fileSet;
@@ -984,7 +764,7 @@ static void getFileOrDirListZip(const std::string& path,
     zip_close( z );
     
     fileSet.getMembers(files);
-#endif
+#endif /* G3DFIX: Use ZIP-library only if defined */
 }
 
 
@@ -1004,8 +784,8 @@ static void determineFileOrDirList(
         path = path.substr(0, path.length() -1);
     }
     
-    if ((path == "") || fileExists(path, false)) {
-        if ((path != "") && isZipfile(path)) {
+    if ((path == "") || FileSystem::exists(path)) {
+        if ((path != "") && FileSystem::isZipfile(path)) {
             // .zip should only work if * is specified as the Base + Ext
             // Here, we have been asked for the root's contents
             debugAssertM(filenameBaseExt(filespec) == "*", "Can only call getFiles/getDirs on zipfiles using '*' wildcard");
diff --git a/dep/src/g3dlite/g3dfnmatch.cpp b/dep/src/g3dlite/g3dfnmatch.cpp
index 39ef7b31914..2d24c4126e6 100644
--- a/dep/src/g3dlite/g3dfnmatch.cpp
+++ b/dep/src/g3dlite/g3dfnmatch.cpp
@@ -1,40 +1,42 @@
-/*-
-* Copyright (c) 1992, 1993
-*The Regents of the University of California.  All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-* 3. All advertising materials mentioning features or use of this software
-*    must display the following acknowledgement:
-*This product includes software developed by the University of
-*California, Berkeley and its contributors.
-* 4. Neither the name of the University nor the names of its contributors
-*    may be used to endorse or promote products derived from this software
-*    without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-* SUCH DAMAGE.
-*
-*@(#)fnmatch.h8.1 (Berkeley) 6/2/93
-*
-* From FreeBSD fnmatch.h 1.7
-* $Id: g3dfnmatch.cpp,v 1.2 2010/02/06 10:03:24 corey_taylor Exp $
-*/
+/* $Id: g3dfnmatch.cpp,v 1.3 2010/03/15 05:01:23 morgan3d Exp $ */
+
+/*	$OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Guido van Rossum.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
 #include "G3D/g3dfnmatch.h"
 
 #ifdef G3D_WIN32
@@ -45,149 +47,166 @@
 
 namespace G3D {
 
-#define EOS '\0'
+#define	EOS	'\0'
 
-static const char *rangematch(const char *, char, int);
+#define	RANGE_MATCH	1
+#define	RANGE_NOMATCH	0
+#define	RANGE_ERROR	(-1)
 
-int g3dfnmatch(const char *pattern, const char *string, int flags)
+static int rangematch(const char *, char, int, char **);
+
+int
+g3dfnmatch(const char *pattern, const char *string, int flags)
 {
-    const char *stringstart;
-    char c, test;
-
-    for (stringstart = string;;)
-        switch (c = *pattern++) {
-        case EOS:
-            if ((flags & FNM_LEADING_DIR) && *string == '/')
-                return (0);
-            return (*string == EOS ? 0 : FNM_NOMATCH);
-        case '?':
-            if (*string == EOS)
-                return (FNM_NOMATCH);
-            if (*string == '/' && (flags & FNM_PATHNAME))
-                return (FNM_NOMATCH);
-            if (*string == '.' && (flags & FNM_PERIOD) &&
-                (string == stringstart ||
-                 ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-                return (FNM_NOMATCH);
-            ++string;
-            break;
-        case '*':
-            c = *pattern;
-            /* Collapse multiple stars. */
-            while (c == '*')
-                c = *++pattern;
-
-            if (*string == '.' && (flags & FNM_PERIOD) &&
-                (string == stringstart ||
-                 ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-                return (FNM_NOMATCH);
-
-            /* Optimize for pattern with * at end or before /. */
-            if (c == EOS)
-                if (flags & FNM_PATHNAME)
-                    return ((flags & FNM_LEADING_DIR) ||
-                            strchr(string, '/') == NULL ?
-                            0 : FNM_NOMATCH);
-                else
-                    return (0);
-            else if (c == '/' && flags & FNM_PATHNAME) {
-                if ((string = strchr(string, '/')) == NULL)
-                    return (FNM_NOMATCH);
-                break;
-            }
-
-            /* General case, use recursion. */
-            while ((test = *string) != EOS) {
-                if (!rangematch(pattern, *string, flags & ~FNM_PERIOD))
-                    return (0);
-                if (test == '/' && flags & FNM_PATHNAME)
-                    break;
-                ++string;
-            }
-            return (FNM_NOMATCH);
-        case '[':
-            if (*string == EOS)
-                return (FNM_NOMATCH);
-            if (*string == '/' && flags & FNM_PATHNAME)
-                return (FNM_NOMATCH);
-            if ((pattern =
-                 rangematch(pattern, *string, flags)) == NULL)
-                return (FNM_NOMATCH);
-            ++string;
-            break;
-        case '\\':
-            if (!(flags & FNM_NOESCAPE)) {
-                if ((c = *pattern++) == EOS) {
-                    c = '\\';
-                    --pattern;
-                }
-            }
-            /* FALLTHROUGH */
-        default:
-            if (c == *string)
-                ;
-            else if ((flags & FNM_CASEFOLD) &&
-                     (tolower((unsigned char)c) ==
-                      tolower((unsigned char)*string)))
-                ;
-            else if ((flags & FNM_PREFIX_DIRS) && *string == EOS &&
-                     ((c == '/' && string != stringstart) ||
-                      (string == stringstart+1 && *stringstart == '/')))
-                return (0);
-            else
-                return (FNM_NOMATCH);
-            string++;
-            break;
-        }
-    /* NOTREACHED */
+	const char *stringstart;
+	char *newp;
+	char c, test;
+
+	for (stringstart = string;;)
+		switch (c = *pattern++) {
+		case EOS:
+			if ((flags & FNM_LEADING_DIR) && *string == '/')
+				return (0);
+			return (*string == EOS ? 0 : FNM_NOMATCH);
+		case '?':
+			if (*string == EOS)
+				return (FNM_NOMATCH);
+			if (*string == '/' && (flags & FNM_PATHNAME))
+				return (FNM_NOMATCH);
+			if (*string == '.' && (flags & FNM_PERIOD) &&
+			    (string == stringstart ||
+			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+				return (FNM_NOMATCH);
+			++string;
+			break;
+		case '*':
+			c = *pattern;
+			/* Collapse multiple stars. */
+			while (c == '*')
+				c = *++pattern;
+
+			if (*string == '.' && (flags & FNM_PERIOD) &&
+			    (string == stringstart ||
+			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+				return (FNM_NOMATCH);
+
+			/* Optimize for pattern with * at end or before /. */
+			if (c == EOS) {
+				if (flags & FNM_PATHNAME)
+					return ((flags & FNM_LEADING_DIR) ||
+					    strchr(string, '/') == NULL ?
+					    0 : FNM_NOMATCH);
+				else
+					return (0);
+			} else if (c == '/' && (flags & FNM_PATHNAME)) {
+				if ((string = strchr(string, '/')) == NULL)
+					return (FNM_NOMATCH);
+				break;
+			}
+
+			/* General case, use recursion. */
+			while ((test = *string) != EOS) {
+				if (!g3dfnmatch(pattern, string, flags & ~FNM_PERIOD))
+					return (0);
+				if (test == '/' && (flags & FNM_PATHNAME))
+					break;
+				++string;
+			}
+			return (FNM_NOMATCH);
+		case '[':
+			if (*string == EOS)
+				return (FNM_NOMATCH);
+			if (*string == '/' && (flags & FNM_PATHNAME))
+				return (FNM_NOMATCH);
+			if (*string == '.' && (flags & FNM_PERIOD) &&
+			    (string == stringstart ||
+			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+				return (FNM_NOMATCH);
+
+			switch (rangematch(pattern, *string, flags, &newp)) {
+			case RANGE_ERROR:
+				/* not a good range, treat as normal text */
+				goto normal;
+			case RANGE_MATCH:
+				pattern = newp;
+				break;
+			case RANGE_NOMATCH:
+				return (FNM_NOMATCH);
+			}
+			++string;
+			break;
+		case '\\':
+			if (!(flags & FNM_NOESCAPE)) {
+				if ((c = *pattern++) == EOS) {
+					c = '\\';
+					--pattern;
+				}
+			}
+			/* FALLTHROUGH */
+		default:
+		normal:
+			if (c != *string && !((flags & FNM_CASEFOLD) &&
+				 (tolower((unsigned char)c) ==
+				 tolower((unsigned char)*string))))
+				return (FNM_NOMATCH);
+			++string;
+			break;
+		}
+	/* NOTREACHED */
 }
 
-static const char *
-rangematch(const char *pattern, char test, int flags)
+static int
+rangematch(const char *pattern, char test, int flags, char **newp)
 {
-    int negate, ok;
-    char c, c2;
-
-    /*
-     * A bracket expression starting with an unquoted circumflex
-     * character produces unspecified results (IEEE 1003.2-1992,
-     * 3.13.2).  This implementation treats it like '!', for
-     * consistency with the regular expression syntax.
-     * J.T. Conklin (conklin@ngai.kaleida.com)
-     */
-    if ( (negate = (*pattern == '!' || *pattern == '^')) )
-        ++pattern;
-
-    if (flags & FNM_CASEFOLD)
-        test = tolower((unsigned char)test);
-
-    for (ok = 0; (c = *pattern++) != ']';) {
-        if (c == '\\' && !(flags & FNM_NOESCAPE))
-            c = *pattern++;
-        if (c == EOS)
-            return (NULL);
-
-        if (flags & FNM_CASEFOLD)
-            c = tolower((unsigned char)c);
-
-        if (*pattern == '-'
-            && (c2 = *(pattern+1)) != EOS && c2 != ']') {
-            pattern += 2;
-            if (c2 == '\\' && !(flags & FNM_NOESCAPE))
-                c2 = *pattern++;
-            if (c2 == EOS)
-                return (NULL);
-
-            if (flags & FNM_CASEFOLD)
-                c2 = tolower((unsigned char)c2);
-
-            if ((unsigned char)c <= (unsigned char)test &&
-                (unsigned char)test <= (unsigned char)c2)
-                ok = 1;
-        } else if (c == test)
-            ok = 1;
-    }
-    return (ok == negate ? NULL : pattern);
+	int negate, ok;
+	char c, c2;
+
+	/*
+	 * A bracket expression starting with an unquoted circumflex
+	 * character produces unspecified results (IEEE 1003.2-1992,
+	 * 3.13.2).  This implementation treats it like '!', for
+	 * consistency with the regular expression syntax.
+	 * J.T. Conklin (conklin@ngai.kaleida.com)
+	 */
+	if ((negate = (*pattern == '!' || *pattern == '^')))
+		++pattern;
+
+	if (flags & FNM_CASEFOLD)
+		test = tolower((unsigned char)test);
+
+	/*
+	 * A right bracket shall lose its special meaning and represent
+	 * itself in a bracket expression if it occurs first in the list.
+	 * -- POSIX.2 2.8.3.2
+	 */
+	ok = 0;
+	c = *pattern++;
+	do {
+		if (c == '\\' && !(flags & FNM_NOESCAPE))
+			c = *pattern++;
+		if (c == EOS)
+			return (RANGE_ERROR);
+		if (c == '/' && (flags & FNM_PATHNAME))
+			return (RANGE_NOMATCH);
+		if ((flags & FNM_CASEFOLD))
+			c = tolower((unsigned char)c);
+		if (*pattern == '-'
+		    && (c2 = *(pattern+1)) != EOS && c2 != ']') {
+			pattern += 2;
+			if (c2 == '\\' && !(flags & FNM_NOESCAPE))
+				c2 = *pattern++;
+			if (c2 == EOS)
+				return (RANGE_ERROR);
+			if (flags & FNM_CASEFOLD)
+				c2 = tolower((unsigned char)c2);
+			if (c <= test && test <= c2)
+				ok = 1;
+		} else if (c == test)
+			ok = 1;
+	} while ((c = *pattern++) != ']');
+
+	*newp = (char *)pattern;
+	return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH);
 }
 
 }
diff --git a/dep/src/g3dlite/g3dmath.cpp b/dep/src/g3dlite/g3dmath.cpp
index ad85e9efb9b..866dd32df52 100644
--- a/dep/src/g3dlite/g3dmath.cpp
+++ b/dep/src/g3dlite/g3dmath.cpp
@@ -1,8 +1,8 @@
 /**
  @file g3dmath.cpp
- 
+
  @author Morgan McGuire, graphics3d.com
-  
+
  @created 2001-06-02
  @edited  2004-02-24
  */
@@ -11,6 +11,7 @@
 #include <cstdlib>
 #include <cstring>
 
+
 namespace G3D {
 
 float gaussRandom(float mean, float stdev) {
@@ -29,10 +30,10 @@ float gaussRandom(float mean, float stdev) {
 
     // Transform to gassian distribution
     // Multiply by sigma (stdev ^ 2) and add mean.
-    return x2 * (float)square(stdev) * sqrtf((-2.0f * logf(w) ) / w) + mean; 
+    return x2 * (float)square(stdev) * sqrtf((-2.0f * logf(w) ) / w) + mean;
 }
 
-/** 
+/**
     This value should not be tested against directly, instead
     G3D::isNan() and G3D::isFinite() will return reliable results. */
 double inf() {
@@ -40,7 +41,7 @@ double inf() {
 }
 
 bool isNaN(float x) {
-    static const float n = nan();
+    static const float n = fnan();
     return memcmp(&x, &n, sizeof(float)) == 0;
 }
 
@@ -50,7 +51,7 @@ bool isNaN(double x) {
 }
 
 
-/** 
+/**
     This value should not be tested against directly, instead
     G3D::isNan() and G3D::isFinite() will return reliable results. */
 float finf() {
@@ -74,7 +75,7 @@ int highestBit(uint32 x) {
     // Binary search.
     int base = 0;
 
-    if (x & 0xffff0000)	{
+    if (x & 0xffff0000) {
         base = 16;
         x >>= 16;
     }
@@ -86,7 +87,7 @@ int highestBit(uint32 x) {
         base += 4;
         x >>= 4;
     }
-    
+
     static const int lut[] = {-1,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3};
     return base + lut[x];
 }
@@ -94,7 +95,7 @@ int highestBit(uint32 x) {
 
 int iRandom(int low, int high) {
     int r = iFloor(low + (high - low + 1) * (double)rand() / RAND_MAX);
-    
+
     // There is a *very small* chance of generating
     // a number larger than high.
     if (r > high) {
diff --git a/dep/src/g3dlite/license.html b/dep/src/g3dlite/license.html
deleted file mode 100644
index 11c33882248..00000000000
--- a/dep/src/g3dlite/license.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-	<title>G3D Innovation Engine: License</title>
-	<link href="stylesheet.css" rel="stylesheet" type="text/css">
-</head>
-
-<body style="width: 100%; background: #aaaaaa">
-<table class="widthadjust" align=center><tr><td>
-<table style="height: 44px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #FFc161;" width=100% cellspacing=0 cellpadding=0>
-
-    <tr>
-        <td rowspan="2" valign="bottom" style="width: 51;">
-            <a href="index.html">
-                <img src="G3D-small-shadow.jpg" border="0" align="left">
-            </a>
-        </td>
-        <td style="width: 65%;" nowrap="true" valign="bottom">
-            <font size="2">
-            <center>
-               <a href="http://groups.google.com/group/g3d-users/topics">Support Forum</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-               <a href="http://g3d.cvs.sourceforge.net/g3d/G3D/">Library Source</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-               <a href="http://sourceforge.net/projects/g3d/">SourceForge Page</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-               <a href="http://g3d.sf.net/">Web Page</a>
-            </center>
-            </font>
-        </td>
-    </tr>
-<tr cellspacing=0 cellpadding=0>
-<td style="width: 65%;" nowrap=true valign=bottom>
-
-    <span class="menu_tab">
-        <a href="http://sourceforge.net/apps/mediawiki/g3d/index.php?title=Main_Page">Wiki Doc</a>
-    </span>
-    <span class="menu_tab">
-        <a href="dataindex.html">Data</a>
-    </span>
-    <span class="menu_tab">
-        <a href="annotated.html">API Index</a>
-    </span>
-    <span class="menu_tab">
-        <a href="apiindex.html">APIs by Level</a>
-    </span>
-    <span class="menu_tab">
-        <a href="topicindex.html">APIs by Task</a>
-    </span>
-</td>
-</tr>
-</table>
-<br>
-<br>
-<table cellspacing=0 cellpadding=0 width=100% >
-<tr><td>
-<!-- code goes here -->
-
-    
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h1><a class="anchor" id="license">License </a></h1><h2><a class="anchor" id="intent">
-Intent of License</a></h2>
-<p>(This section is informal and not legally binding.)</p>
-<p><br/>
- This library is free code-- you can use it without charge and it is minimally legally encumbered. Unlike some other free libraries, we <b>do not</b> require you to release your source code or make your own program open source.</p>
-<p>I intend the license (below) to protect me and the other contributors from liability and allow you to use the source however you want. You can make your own closed or open-source programs, sell them, give them away, whatever.</p>
-<p>The license for <a class="el" href="namespace_g3_d.html">G3D</a> itself and the libaries included in the <a class="el" href="namespace_g3_d.html">G3D</a> distribution create certain documentation obligations for you. For convenience, <a class="el" href="namespace_g3_d.html#a2d6bccd0c2fa5b44882b7d0c732e2712" title="G3D, SDL, and IJG libraries require license documentation to be distributed with...">G3D::license</a> is a function that returns the license string you must put in your documentation. <a class="el" href="class_g3_d_1_1_g_app.html" title="For each frame, the GApp has several tasks that can be implemented by overriding...">G3D::GApp</a> will automatically write a file (g3d-license.txt) to disk with the contents of this license unless you tell it not to, thus automatically satisfying your documentation requirement after the first time you run a <a class="el" href="namespace_g3_d.html">G3D</a> program.</p>
-<p>Most of the data resources have either entered the public domain and have been in several published papers or are data that I have explicitly received permission to distribute with <a class="el" href="namespace_g3_d.html">G3D</a>. The <a class="el" href="namespace_g3_d.html">G3D</a> fonts are actually font images, not TrueType font descriptions and may be freely distributed. As a rule of thumb, you can freely use and distribute anything you find in the data directory but may need permission to use it in a commercial product. Check the various copyright.txt files in the data directories for specific information.</p>
-<p>You are required by the BSD license to acknowledge <a class="el" href="namespace_g3_d.html">G3D</a> in your documentation. This can be as minimal as a note buried in the fine print at the end of a manual or a text file accompanying your program. I appreciate it if you acknowledged the library more publicly but you aren't required to.</p>
-<p>Likewise, you are encouraged but not required to submit patches to improve the library for the benefit of all. Post bugs, patches, and questions to the g3d-users forum linked at the top of this page. </p>
-<p>-Morgan McGuire &lt;<em><a href="mailto:morgan@cs.williams.edu">morgan@cs.williams.edu</a></em>&gt;</p>
-<hr/>
-<h2><a class="anchor" id="reallicense">
-License</a></h2>
-<p><em><a class="el" href="namespace_g3_d.html">G3D</a> is licensed under the <a href="http://www.opensource.org/licenses/bsd-license.php">BSD license</a>, with portions controlled by the <a href="IJG-README.TXT">IJG license</a>, <a href="libpng-LICENSE.txt">PNG Reference Library license</a>.</em></p>
-<p><code> </p>
-<div align="center">
-<img src="http://opensource.org/trademarks/osi-certified/web/osi-certified-120x100.gif" alt="osi-certified-120x100.gif"/>
-</div>
-<p> </code></p>
-<p><code>This product uses software from the <a class="el" href="namespace_g3_d.html">G3D</a> project (<a href="http://g3d.sf.net">http://g3d.sf.net</a>) </code></p>
-<p><code>Copyright &copy; 2000-2010, Morgan McGuire </code></p>
-<p><code>All rights reserved. </code></p>
-<p><code> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: </code></p>
-<p><code> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. </code></p>
-<p><code> Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. </code></p>
-<p><code> Neither the name of Morgan McGuire, Williams College, Brown University, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. </code></p>
-<p><code> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </code> </p>
-</div>
-</A>
-<hr><address style="align: right;"><small>
-G3D Innovation Engine documentation generated on Thu Mar 25 14:54:30 2010 using <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 width=55 height=26>
-</a> 1.6.1</small></address>
-    <!-- Removed to make page loading faster
-Hosted by <A href="http://sourceforge.net"> <IMG src="http://sourceforge.net/sflogo.php?group_id=76879&amp;type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></A>
--->
-    
-<!-- Piwik -->
-<script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://apps.sourceforge.net/piwik/g3d/" : "http://apps.sourceforge.net/piwik/g3d/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-piwik_action_name = '';
-piwik_idsite = 2;
-piwik_url = pkBaseURL + "piwik.php";
-piwik_log(piwik_action_name, piwik_idsite, piwik_url);
-</script>
-<object><noscript><p><img src="http://apps.sourceforge.net/piwik/g3d/piwik.php?idsite=2" alt="piwik"/></p></noscript></object>
-<!-- End Piwik Tag -->
-
-</body>
-</html>
diff --git a/dep/src/g3dlite/uint128.cpp b/dep/src/g3dlite/uint128.cpp
index 1f596fc3e51..2fd58a332cd 100644
--- a/dep/src/g3dlite/uint128.cpp
+++ b/dep/src/g3dlite/uint128.cpp
@@ -17,8 +17,8 @@ static void addAndCarry(const uint64& _a, const uint64& _b, uint64& carry, uint6
         
     // Break each number into 4 32-bit chunks. Since we are using uints, right-shifting will fill with zeros.
     // This eliminates the need to and with 0xFFFFFFFF.
-    uint32 a [2] = {_a & 0xFFFFFFFF, _a >> 32};
-    uint32 b [2] = {_b & 0xFFFFFFFF, _b >> 32};
+    uint32 a [2] = {static_cast<uint32>(_a & 0xFFFFFFFF), static_cast<uint32>(_a >> 32)};
+    uint32 b [2] = {static_cast<uint32>(_b & 0xFFFFFFFF), static_cast<uint32>(_b >> 32)};
 
     uint64 tmp = uint64(a[0]) + b[0];
 
@@ -35,8 +35,8 @@ void multiplyAndCarry(const uint64& _a, const uint64& _b, uint64& carry, uint64&
 
     // Break each number into 4 32-bit chunks. Since we are using uints, right-shifting will fill with zeros.
     // This eliminates the need to and with 0xFFFFFFFF.
-    uint32 a [2] = {_a & 0xFFFFFFFF, _a >> 32};
-    uint32 b [2] = {_b & 0xFFFFFFFF, _b >> 32};
+    uint32 a [2] = {static_cast<uint32>(_a & 0xFFFFFFFF), static_cast<uint32>(_a >> 32)};
+    uint32 b [2] = {static_cast<uint32>(_b & 0xFFFFFFFF), static_cast<uint32>(_b >> 32)};
 
     uint64 prod [2][2];
     for(int i = 0; i < 2; ++i) {
diff --git a/dep/src/gsoap/CMakeLists.txt b/dep/src/gsoap/CMakeLists.txt
index 91f5005fea7..24fdfd79850 100644
--- a/dep/src/gsoap/CMakeLists.txt
+++ b/dep/src/gsoap/CMakeLists.txt
@@ -16,13 +16,17 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-file(GLOB gsoap_SRCS *.cpp)
+set(LIBRARY_NAME gsoap)
+
+set(LIBRARY_SRCS
+    stdsoap2.cpp
+   )
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dep/include/gsoap
 )
 
-add_library(gsoap STATIC
-  ${gsoap_SRCS}
-)
\ No newline at end of file
+add_library(${LIBRARY_NAME} STATIC
+  ${LIBRARY_SRCS}
+)
diff --git a/dep/src/zlib/adler32.c b/dep/src/zlib/adler32.c
index 007ba26277c..a868f073d8a 100644
--- a/dep/src/zlib/adler32.c
+++ b/dep/src/zlib/adler32.c
@@ -1,14 +1,17 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2004 Mark Adler
+ * Copyright (C) 1995-2011 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
-#define ZLIB_INTERNAL
-#include "zlib.h"
+#include "zutil.h"
 
-#define BASE 65521UL    /* largest prime smaller than 65536 */
+#define local static
+
+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
+
+#define BASE 65521      /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 
@@ -18,39 +21,44 @@
 #define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
 #define DO16(buf)   DO8(buf,0); DO8(buf,8);
 
-/* use NO_DIVIDE if your processor does not do division in hardware */
+/* use NO_DIVIDE if your processor does not do division in hardware --
+   try it both ways to see which is faster */
 #ifdef NO_DIVIDE
-#  define MOD(a) \
+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
+   (thank you to John Reiser for pointing this out) */
+#  define CHOP(a) \
     do { \
-        if (a >= (BASE << 16)) a -= (BASE << 16); \
-        if (a >= (BASE << 15)) a -= (BASE << 15); \
-        if (a >= (BASE << 14)) a -= (BASE << 14); \
-        if (a >= (BASE << 13)) a -= (BASE << 13); \
-        if (a >= (BASE << 12)) a -= (BASE << 12); \
-        if (a >= (BASE << 11)) a -= (BASE << 11); \
-        if (a >= (BASE << 10)) a -= (BASE << 10); \
-        if (a >= (BASE << 9)) a -= (BASE << 9); \
-        if (a >= (BASE << 8)) a -= (BASE << 8); \
-        if (a >= (BASE << 7)) a -= (BASE << 7); \
-        if (a >= (BASE << 6)) a -= (BASE << 6); \
-        if (a >= (BASE << 5)) a -= (BASE << 5); \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        unsigned long tmp = a >> 16; \
+        a &= 0xffffUL; \
+        a += (tmp << 4) - tmp; \
+    } while (0)
+#  define MOD28(a) \
+    do { \
+        CHOP(a); \
         if (a >= BASE) a -= BASE; \
     } while (0)
-#  define MOD4(a) \
+#  define MOD(a) \
     do { \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        CHOP(a); \
+        MOD28(a); \
+    } while (0)
+#  define MOD63(a) \
+    do { /* this assumes a is not negative */ \
+        z_off64_t tmp = a >> 32; \
+        a &= 0xffffffffL; \
+        a += (tmp << 8) - (tmp << 5) + tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
         if (a >= BASE) a -= BASE; \
     } while (0)
 #else
 #  define MOD(a) a %= BASE
-#  define MOD4(a) a %= BASE
+#  define MOD28(a) a %= BASE
+#  define MOD63(a) a %= BASE
 #endif
 
 /* ========================================================================= */
@@ -89,7 +97,7 @@ uLong ZEXPORT adler32(adler, buf, len)
         }
         if (adler >= BASE)
             adler -= BASE;
-        MOD4(sum2);             /* only added so many BASE's */
+        MOD28(sum2);            /* only added so many BASE's */
         return adler | (sum2 << 16);
     }
 
@@ -125,25 +133,47 @@ uLong ZEXPORT adler32(adler, buf, len)
 }
 
 /* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
+local uLong adler32_combine_(adler1, adler2, len2)
     uLong adler1;
     uLong adler2;
-    z_off_t len2;
+    z_off64_t len2;
 {
     unsigned long sum1;
     unsigned long sum2;
     unsigned rem;
 
+    /* for negative len, return invalid adler32 as a clue for debugging */
+    if (len2 < 0)
+        return 0xffffffffUL;
+
     /* the derivation of this formula is left as an exercise for the reader */
-    rem = (unsigned)(len2 % BASE);
+    MOD63(len2);                /* assumes len2 >= 0 */
+    rem = (unsigned)len2;
     sum1 = adler1 & 0xffff;
     sum2 = rem * sum1;
     MOD(sum2);
     sum1 += (adler2 & 0xffff) + BASE - 1;
     sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-    if (sum1 > BASE) sum1 -= BASE;
-    if (sum1 > BASE) sum1 -= BASE;
-    if (sum2 > (BASE << 1)) sum2 -= (BASE << 1);
-    if (sum2 > BASE) sum2 -= BASE;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
+    if (sum2 >= BASE) sum2 -= BASE;
     return sum1 | (sum2 << 16);
 }
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
+
+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
diff --git a/dep/src/zlib/compress.c b/dep/src/zlib/compress.c
index df04f0148e6..6e9762676a0 100644
--- a/dep/src/zlib/compress.c
+++ b/dep/src/zlib/compress.c
@@ -1,5 +1,5 @@
 /* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -29,7 +29,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
     z_stream stream;
     int err;
 
-    stream.next_in = (Bytef*)source;
+    stream.next_in = (z_const Bytef *)source;
     stream.avail_in = (uInt)sourceLen;
 #ifdef MAXSEG_64K
     /* Check for source > 64K on 16-bit machine: */
@@ -75,5 +75,6 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
 uLong ZEXPORT compressBound (sourceLen)
     uLong sourceLen;
 {
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13;
 }
diff --git a/dep/src/zlib/crc32.c b/dep/src/zlib/crc32.c
index f658a9ef55e..979a7190a3c 100644
--- a/dep/src/zlib/crc32.c
+++ b/dep/src/zlib/crc32.c
@@ -1,5 +1,5 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2005 Mark Adler
+ * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
@@ -17,6 +17,8 @@
   of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
   first call get_crc_table() to initialize the tables before allowing more than
   one thread to use crc32().
+
+  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
  */
 
 #ifdef MAKECRCH
@@ -30,31 +32,11 @@
 
 #define local static
 
-/* Find a four-byte integer type for crc32_little() and crc32_big(). */
-#ifndef NOBYFOUR
-#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
-#    include <limits.h>
-#    define BYFOUR
-#    if (UINT_MAX == 0xffffffffUL)
-       typedef unsigned int u4;
-#    else
-#      if (ULONG_MAX == 0xffffffffUL)
-         typedef unsigned long u4;
-#      else
-#        if (USHRT_MAX == 0xffffffffUL)
-           typedef unsigned short u4;
-#        else
-#          undef BYFOUR     /* can't find a four-byte integer type! */
-#        endif
-#      endif
-#    endif
-#  endif /* STDC */
-#endif /* !NOBYFOUR */
-
 /* Definitions for doing the crc four data bytes at a time. */
+#if !defined(NOBYFOUR) && defined(Z_U4)
+#  define BYFOUR
+#endif
 #ifdef BYFOUR
-#  define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \
-                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
    local unsigned long crc32_little OF((unsigned long,
                         const unsigned char FAR *, unsigned));
    local unsigned long crc32_big OF((unsigned long,
@@ -68,14 +50,16 @@
 local unsigned long gf2_matrix_times OF((unsigned long *mat,
                                          unsigned long vec));
 local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
+local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
+
 
 #ifdef DYNAMIC_CRC_TABLE
 
 local volatile int crc_table_empty = 1;
-local unsigned long FAR crc_table[TBLS][256];
+local z_crc_t FAR crc_table[TBLS][256];
 local void make_crc_table OF((void));
 #ifdef MAKECRCH
-   local void write_table OF((FILE *, const unsigned long FAR *));
+   local void write_table OF((FILE *, const z_crc_t FAR *));
 #endif /* MAKECRCH */
 /*
   Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
@@ -105,9 +89,9 @@ local void make_crc_table OF((void));
 */
 local void make_crc_table()
 {
-    unsigned long c;
+    z_crc_t c;
     int n, k;
-    unsigned long poly;                 /* polynomial exclusive-or pattern */
+    z_crc_t poly;                       /* polynomial exclusive-or pattern */
     /* terms of polynomial defining this crc (except x^32): */
     static volatile int first = 1;      /* flag to limit concurrent making */
     static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
@@ -119,13 +103,13 @@ local void make_crc_table()
         first = 0;
 
         /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0UL;
-        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
-            poly |= 1UL << (31 - p[n]);
+        poly = 0;
+        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
+            poly |= (z_crc_t)1 << (31 - p[n]);
 
         /* generate a crc for every 8-bit value */
         for (n = 0; n < 256; n++) {
-            c = (unsigned long)n;
+            c = (z_crc_t)n;
             for (k = 0; k < 8; k++)
                 c = c & 1 ? poly ^ (c >> 1) : c >> 1;
             crc_table[0][n] = c;
@@ -136,11 +120,11 @@ local void make_crc_table()
            and then the byte reversal of those as well as the first table */
         for (n = 0; n < 256; n++) {
             c = crc_table[0][n];
-            crc_table[4][n] = REV(c);
+            crc_table[4][n] = ZSWAP32(c);
             for (k = 1; k < 4; k++) {
                 c = crc_table[0][c & 0xff] ^ (c >> 8);
                 crc_table[k][n] = c;
-                crc_table[k + 4][n] = REV(c);
+                crc_table[k + 4][n] = ZSWAP32(c);
             }
         }
 #endif /* BYFOUR */
@@ -162,7 +146,7 @@ local void make_crc_table()
         if (out == NULL) return;
         fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
         fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const unsigned long FAR ");
+        fprintf(out, "local const z_crc_t FAR ");
         fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
         write_table(out, crc_table[0]);
 #  ifdef BYFOUR
@@ -182,12 +166,13 @@ local void make_crc_table()
 #ifdef MAKECRCH
 local void write_table(out, table)
     FILE *out;
-    const unsigned long FAR *table;
+    const z_crc_t FAR *table;
 {
     int n;
 
     for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
+                (unsigned long)(table[n]),
                 n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
 }
 #endif /* MAKECRCH */
@@ -202,13 +187,13 @@ local void write_table(out, table)
 /* =========================================================================
  * This function can be used by asm versions of crc32()
  */
-const unsigned long FAR * ZEXPORT get_crc_table()
+const z_crc_t FAR * ZEXPORT get_crc_table()
 {
 #ifdef DYNAMIC_CRC_TABLE
     if (crc_table_empty)
         make_crc_table();
 #endif /* DYNAMIC_CRC_TABLE */
-    return (const unsigned long FAR *)crc_table;
+    return (const z_crc_t FAR *)crc_table;
 }
 
 /* ========================================================================= */
@@ -219,7 +204,7 @@ const unsigned long FAR * ZEXPORT get_crc_table()
 unsigned long ZEXPORT crc32(crc, buf, len)
     unsigned long crc;
     const unsigned char FAR *buf;
-    unsigned len;
+    uInt len;
 {
     if (buf == Z_NULL) return 0UL;
 
@@ -230,7 +215,7 @@ unsigned long ZEXPORT crc32(crc, buf, len)
 
 #ifdef BYFOUR
     if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        u4 endian;
+        z_crc_t endian;
 
         endian = 1;
         if (*((unsigned char *)(&endian)))
@@ -264,17 +249,17 @@ local unsigned long crc32_little(crc, buf, len)
     const unsigned char FAR *buf;
     unsigned len;
 {
-    register u4 c;
-    register const u4 FAR *buf4;
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
 
-    c = (u4)crc;
+    c = (z_crc_t)crc;
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
         len--;
     }
 
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
     while (len >= 32) {
         DOLIT32;
         len -= 32;
@@ -304,17 +289,17 @@ local unsigned long crc32_big(crc, buf, len)
     const unsigned char FAR *buf;
     unsigned len;
 {
-    register u4 c;
-    register const u4 FAR *buf4;
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
 
-    c = REV((u4)crc);
+    c = ZSWAP32((z_crc_t)crc);
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
         len--;
     }
 
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
     buf4--;
     while (len >= 32) {
         DOBIG32;
@@ -331,7 +316,7 @@ local unsigned long crc32_big(crc, buf, len)
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
     } while (--len);
     c = ~c;
-    return (unsigned long)(REV(c));
+    return (unsigned long)(ZSWAP32(c));
 }
 
 #endif /* BYFOUR */
@@ -367,22 +352,22 @@ local void gf2_matrix_square(square, mat)
 }
 
 /* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
+local uLong crc32_combine_(crc1, crc2, len2)
     uLong crc1;
     uLong crc2;
-    z_off_t len2;
+    z_off64_t len2;
 {
     int n;
     unsigned long row;
     unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
     unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
 
-    /* degenerate case */
-    if (len2 == 0)
+    /* degenerate case (also disallow negative lengths) */
+    if (len2 <= 0)
         return crc1;
 
     /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320L;           /* CRC-32 polynomial */
+    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
     row = 1;
     for (n = 1; n < GF2_DIM; n++) {
         odd[n] = row;
@@ -421,3 +406,20 @@ uLong ZEXPORT crc32_combine(crc1, crc2, len2)
     crc1 ^= crc2;
     return crc1;
 }
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off_t len2;
+{
+    return crc32_combine_(crc1, crc2, len2);
+}
+
+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+    return crc32_combine_(crc1, crc2, len2);
+}
diff --git a/dep/src/zlib/crc32.h b/dep/src/zlib/crc32.h
index 8053b6117c0..9e0c7781025 100644
--- a/dep/src/zlib/crc32.h
+++ b/dep/src/zlib/crc32.h
@@ -2,7 +2,7 @@
  * Generated automatically by crc32.c
  */
 
-local const unsigned long FAR crc_table[TBLS][256] =
+local const z_crc_t FAR crc_table[TBLS][256] =
 {
   {
     0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
diff --git a/dep/src/zlib/deflate.c b/dep/src/zlib/deflate.c
index 29ce1f64a57..696957705b7 100644
--- a/dep/src/zlib/deflate.c
+++ b/dep/src/zlib/deflate.c
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -37,7 +37,7 @@
  *  REFERENCES
  *
  *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://www.ietf.org/rfc/rfc1951.txt
+ *      Available in http://tools.ietf.org/html/rfc1951
  *
  *      A description of the Rabin and Karp algorithm is given in the book
  *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";
+   " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -79,19 +79,18 @@ local block_state deflate_fast   OF((deflate_state *s, int flush));
 #ifndef FASTEST
 local block_state deflate_slow   OF((deflate_state *s, int flush));
 #endif
+local block_state deflate_rle    OF((deflate_state *s, int flush));
+local block_state deflate_huff   OF((deflate_state *s, int flush));
 local void lm_init        OF((deflate_state *s));
 local void putShortMSB    OF((deflate_state *s, uInt b));
 local void flush_pending  OF((z_streamp strm));
 local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifndef FASTEST
 #ifdef ASMV
       void match_init OF((void)); /* asm code initialization */
       uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #else
 local uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #endif
-#endif
-local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));
 
 #ifdef DEBUG
 local  void check_match OF((deflate_state *s, IPos start, IPos match,
@@ -110,11 +109,6 @@ local  void check_match OF((deflate_state *s, IPos start, IPos match,
 #endif
 /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
 
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
 /* Values for max_lazy_match, good_match and max_chain_length, depending on
  * the desired pack level (0..9). The values given below have been tuned to
  * exclude worst case performance for pathological files. Better values may be
@@ -161,6 +155,9 @@ local const config configuration_table[10] = {
 struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
 #endif
 
+/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
+#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
+
 /* ===========================================================================
  * Update a hash value with the given input byte
  * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
@@ -241,10 +238,19 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 
     strm->msg = Z_NULL;
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
 
 #ifdef FASTEST
     if (level != 0) level = 1;
@@ -288,6 +294,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
     s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
 
+    s->high_water = 0;      /* nothing written to s->window yet */
+
     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
 
     overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
@@ -297,7 +305,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
         s->pending_buf == Z_NULL) {
         s->status = FINISH_STATE;
-        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+        strm->msg = ERR_MSG(Z_MEM_ERROR);
         deflateEnd (strm);
         return Z_MEM_ERROR;
     }
@@ -318,43 +326,70 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
     uInt  dictLength;
 {
     deflate_state *s;
-    uInt length = dictLength;
-    uInt n;
-    IPos hash_head = 0;
+    uInt str, n;
+    int wrap;
+    unsigned avail;
+    z_const unsigned char *next;
 
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
-        strm->state->wrap == 2 ||
-        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
         return Z_STREAM_ERROR;
-
     s = strm->state;
-    if (s->wrap)
-        strm->adler = adler32(strm->adler, dictionary, dictLength);
+    wrap = s->wrap;
+    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
+        return Z_STREAM_ERROR;
 
-    if (length < MIN_MATCH) return Z_OK;
-    if (length > MAX_DIST(s)) {
-        length = MAX_DIST(s);
-        dictionary += dictLength - length; /* use the tail of the dictionary */
+    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+    if (wrap == 1)
+        strm->adler = adler32(strm->adler, dictionary, dictLength);
+    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
+
+    /* if dictionary would fill window, just replace the history */
+    if (dictLength >= s->w_size) {
+        if (wrap == 0) {            /* already empty otherwise */
+            CLEAR_HASH(s);
+            s->strstart = 0;
+            s->block_start = 0L;
+            s->insert = 0;
+        }
+        dictionary += dictLength - s->w_size;  /* use the tail */
+        dictLength = s->w_size;
     }
-    zmemcpy(s->window, dictionary, length);
-    s->strstart = length;
-    s->block_start = (long)length;
 
-    /* Insert all strings in the hash table (except for the last two bytes).
-     * s->lookahead stays null, so s->ins_h will be recomputed at the next
-     * call of fill_window.
-     */
-    s->ins_h = s->window[0];
-    UPDATE_HASH(s, s->ins_h, s->window[1]);
-    for (n = 0; n <= length - MIN_MATCH; n++) {
-        INSERT_STRING(s, n, hash_head);
+    /* insert dictionary into window and hash */
+    avail = strm->avail_in;
+    next = strm->next_in;
+    strm->avail_in = dictLength;
+    strm->next_in = (z_const Bytef *)dictionary;
+    fill_window(s);
+    while (s->lookahead >= MIN_MATCH) {
+        str = s->strstart;
+        n = s->lookahead - (MIN_MATCH-1);
+        do {
+            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+            s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+            s->head[s->ins_h] = (Pos)str;
+            str++;
+        } while (--n);
+        s->strstart = str;
+        s->lookahead = MIN_MATCH-1;
+        fill_window(s);
     }
-    if (hash_head) hash_head = 0;  /* to make compiler happy */
+    s->strstart += s->lookahead;
+    s->block_start = (long)s->strstart;
+    s->insert = s->lookahead;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    strm->next_in = next;
+    strm->avail_in = avail;
+    s->wrap = wrap;
     return Z_OK;
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateReset (strm)
+int ZEXPORT deflateResetKeep (strm)
     z_streamp strm;
 {
     deflate_state *s;
@@ -384,11 +419,22 @@ int ZEXPORT deflateReset (strm)
     s->last_flush = Z_NO_FLUSH;
 
     _tr_init(s);
-    lm_init(s);
 
     return Z_OK;
 }
 
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+    z_streamp strm;
+{
+    int ret;
+
+    ret = deflateResetKeep(strm);
+    if (ret == Z_OK)
+        lm_init(strm->state);
+    return ret;
+}
+
 /* ========================================================================= */
 int ZEXPORT deflateSetHeader (strm, head)
     z_streamp strm;
@@ -400,15 +446,43 @@ int ZEXPORT deflateSetHeader (strm, head)
     return Z_OK;
 }
 
+/* ========================================================================= */
+int ZEXPORT deflatePending (strm, pending, bits)
+    unsigned *pending;
+    int *bits;
+    z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (pending != Z_NULL)
+        *pending = strm->state->pending;
+    if (bits != Z_NULL)
+        *bits = strm->state->bi_valid;
+    return Z_OK;
+}
+
 /* ========================================================================= */
 int ZEXPORT deflatePrime (strm, bits, value)
     z_streamp strm;
     int bits;
     int value;
 {
+    deflate_state *s;
+    int put;
+
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    strm->state->bi_valid = bits;
-    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
+    s = strm->state;
+    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+        return Z_BUF_ERROR;
+    do {
+        put = Buf_size - s->bi_valid;
+        if (put > bits)
+            put = bits;
+        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
+        s->bi_valid += put;
+        _tr_flush_bits(s);
+        value >>= put;
+        bits -= put;
+    } while (bits);
     return Z_OK;
 }
 
@@ -435,9 +509,12 @@ int ZEXPORT deflateParams(strm, level, strategy)
     }
     func = configuration_table[s->level].func;
 
-    if (func != configuration_table[level].func && strm->total_in != 0) {
+    if ((strategy != s->strategy || func != configuration_table[level].func) &&
+        strm->total_in != 0) {
         /* Flush the last buffer: */
-        err = deflate(strm, Z_PARTIAL_FLUSH);
+        err = deflate(strm, Z_BLOCK);
+        if (err == Z_BUF_ERROR && s->pending == 0)
+            err = Z_OK;
     }
     if (s->level != level) {
         s->level = level;
@@ -481,33 +558,66 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
  * resulting from using fixed blocks instead of stored blocks, which deflate
  * can emit on compressed data for some combinations of the parameters.
  *
- * This function could be more sophisticated to provide closer upper bounds
- * for every combination of windowBits and memLevel, as well as wrap.
- * But even the conservative upper bound of about 14% expansion does not
- * seem onerous for output buffer allocation.
+ * This function could be more sophisticated to provide closer upper bounds for
+ * every combination of windowBits and memLevel.  But even the conservative
+ * upper bound of about 14% expansion does not seem onerous for output buffer
+ * allocation.
  */
 uLong ZEXPORT deflateBound(strm, sourceLen)
     z_streamp strm;
     uLong sourceLen;
 {
     deflate_state *s;
-    uLong destLen;
+    uLong complen, wraplen;
+    Bytef *str;
 
-    /* conservative upper bound */
-    destLen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11;
+    /* conservative upper bound for compressed data */
+    complen = sourceLen +
+              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
 
-    /* if can't get parameters, return conservative bound */
+    /* if can't get parameters, return conservative bound plus zlib wrapper */
     if (strm == Z_NULL || strm->state == Z_NULL)
-        return destLen;
+        return complen + 6;
 
-    /* if not default parameters, return conservative bound */
+    /* compute wrapper length */
     s = strm->state;
+    switch (s->wrap) {
+    case 0:                                 /* raw deflate */
+        wraplen = 0;
+        break;
+    case 1:                                 /* zlib wrapper */
+        wraplen = 6 + (s->strstart ? 4 : 0);
+        break;
+    case 2:                                 /* gzip wrapper */
+        wraplen = 18;
+        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
+            if (s->gzhead->extra != Z_NULL)
+                wraplen += 2 + s->gzhead->extra_len;
+            str = s->gzhead->name;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            str = s->gzhead->comment;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            if (s->gzhead->hcrc)
+                wraplen += 2;
+        }
+        break;
+    default:                                /* for compiler happiness */
+        wraplen = 6;
+    }
+
+    /* if not default parameters, return conservative bound */
     if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return destLen;
+        return complen + wraplen;
 
     /* default settings: return tight bound for that case */
-    return compressBound(sourceLen);
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13 - 6 + wraplen;
 }
 
 /* =========================================================================
@@ -532,19 +642,22 @@ local void putShortMSB (s, b)
 local void flush_pending(strm)
     z_streamp strm;
 {
-    unsigned len = strm->state->pending;
+    unsigned len;
+    deflate_state *s = strm->state;
 
+    _tr_flush_bits(s);
+    len = s->pending;
     if (len > strm->avail_out) len = strm->avail_out;
     if (len == 0) return;
 
-    zmemcpy(strm->next_out, strm->state->pending_out, len);
+    zmemcpy(strm->next_out, s->pending_out, len);
     strm->next_out  += len;
-    strm->state->pending_out  += len;
+    s->pending_out  += len;
     strm->total_out += len;
     strm->avail_out  -= len;
-    strm->state->pending -= len;
-    if (strm->state->pending == 0) {
-        strm->state->pending_out = strm->state->pending_buf;
+    s->pending -= len;
+    if (s->pending == 0) {
+        s->pending_out = s->pending_buf;
     }
 }
 
@@ -557,7 +670,7 @@ int ZEXPORT deflate (strm, flush)
     deflate_state *s;
 
     if (strm == Z_NULL || strm->state == Z_NULL ||
-        flush > Z_FINISH || flush < 0) {
+        flush > Z_BLOCK || flush < 0) {
         return Z_STREAM_ERROR;
     }
     s = strm->state;
@@ -581,7 +694,7 @@ int ZEXPORT deflate (strm, flush)
             put_byte(s, 31);
             put_byte(s, 139);
             put_byte(s, 8);
-            if (s->gzhead == NULL) {
+            if (s->gzhead == Z_NULL) {
                 put_byte(s, 0);
                 put_byte(s, 0);
                 put_byte(s, 0);
@@ -608,7 +721,7 @@ int ZEXPORT deflate (strm, flush)
                             (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
                              4 : 0));
                 put_byte(s, s->gzhead->os & 0xff);
-                if (s->gzhead->extra != NULL) {
+                if (s->gzhead->extra != Z_NULL) {
                     put_byte(s, s->gzhead->extra_len & 0xff);
                     put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
                 }
@@ -650,7 +763,7 @@ int ZEXPORT deflate (strm, flush)
     }
 #ifdef GZIP
     if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != NULL) {
+        if (s->gzhead->extra != Z_NULL) {
             uInt beg = s->pending;  /* start of bytes to update crc */
 
             while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
@@ -678,7 +791,7 @@ int ZEXPORT deflate (strm, flush)
             s->status = NAME_STATE;
     }
     if (s->status == NAME_STATE) {
-        if (s->gzhead->name != NULL) {
+        if (s->gzhead->name != Z_NULL) {
             uInt beg = s->pending;  /* start of bytes to update crc */
             int val;
 
@@ -709,7 +822,7 @@ int ZEXPORT deflate (strm, flush)
             s->status = COMMENT_STATE;
     }
     if (s->status == COMMENT_STATE) {
-        if (s->gzhead->comment != NULL) {
+        if (s->gzhead->comment != Z_NULL) {
             uInt beg = s->pending;  /* start of bytes to update crc */
             int val;
 
@@ -771,7 +884,7 @@ int ZEXPORT deflate (strm, flush)
      * flushes. For repeated and useless calls with Z_FINISH, we keep
      * returning Z_STREAM_END instead of Z_BUF_ERROR.
      */
-    } else if (strm->avail_in == 0 && flush <= old_flush &&
+    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
                flush != Z_FINISH) {
         ERR_RETURN(strm, Z_BUF_ERROR);
     }
@@ -787,7 +900,9 @@ int ZEXPORT deflate (strm, flush)
         (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
         block_state bstate;
 
-        bstate = (*(configuration_table[s->level].func))(s, flush);
+        bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
+                    (s->strategy == Z_RLE ? deflate_rle(s, flush) :
+                        (*(configuration_table[s->level].func))(s, flush));
 
         if (bstate == finish_started || bstate == finish_done) {
             s->status = FINISH_STATE;
@@ -808,13 +923,18 @@ int ZEXPORT deflate (strm, flush)
         if (bstate == block_done) {
             if (flush == Z_PARTIAL_FLUSH) {
                 _tr_align(s);
-            } else { /* FULL_FLUSH or SYNC_FLUSH */
+            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
                 _tr_stored_block(s, (char*)0, 0L, 0);
                 /* For a full flush, this empty block will be recognized
                  * as a special marker by inflate_sync().
                  */
                 if (flush == Z_FULL_FLUSH) {
                     CLEAR_HASH(s);             /* forget history */
+                    if (s->lookahead == 0) {
+                        s->strstart = 0;
+                        s->block_start = 0L;
+                        s->insert = 0;
+                    }
                 }
             }
             flush_pending(strm);
@@ -909,12 +1029,12 @@ int ZEXPORT deflateCopy (dest, source)
 
     ss = source->state;
 
-    zmemcpy(dest, source, sizeof(z_stream));
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
 
     ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
     if (ds == Z_NULL) return Z_MEM_ERROR;
     dest->state = (struct internal_state FAR *) ds;
-    zmemcpy(ds, ss, sizeof(deflate_state));
+    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
     ds->strm = dest;
 
     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
@@ -930,8 +1050,8 @@ int ZEXPORT deflateCopy (dest, source)
     }
     /* following zmemcpy do not work for 16-bit MSDOS */
     zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
@@ -965,15 +1085,15 @@ local int read_buf(strm, buf, size)
 
     strm->avail_in  -= len;
 
+    zmemcpy(buf, strm->next_in, len);
     if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, strm->next_in, len);
+        strm->adler = adler32(strm->adler, buf, len);
     }
 #ifdef GZIP
     else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, strm->next_in, len);
+        strm->adler = crc32(strm->adler, buf, len);
     }
 #endif
-    zmemcpy(buf, strm->next_in, len);
     strm->next_in  += len;
     strm->total_in += len;
 
@@ -1000,6 +1120,7 @@ local void lm_init (s)
     s->strstart = 0;
     s->block_start = 0L;
     s->lookahead = 0;
+    s->insert = 0;
     s->match_length = s->prev_length = MIN_MATCH-1;
     s->match_available = 0;
     s->ins_h = 0;
@@ -1167,12 +1288,13 @@ local uInt longest_match(s, cur_match)
     return s->lookahead;
 }
 #endif /* ASMV */
-#endif /* FASTEST */
+
+#else /* FASTEST */
 
 /* ---------------------------------------------------------------------------
- * Optimized version for level == 1 or strategy == Z_RLE only
+ * Optimized version for FASTEST only
  */
-local uInt longest_match_fast(s, cur_match)
+local uInt longest_match(s, cur_match)
     deflate_state *s;
     IPos cur_match;                             /* current match */
 {
@@ -1225,6 +1347,8 @@ local uInt longest_match_fast(s, cur_match)
     return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
 }
 
+#endif /* FASTEST */
+
 #ifdef DEBUG
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
@@ -1271,6 +1395,8 @@ local void fill_window(s)
     unsigned more;    /* Amount of free space at the end of the window. */
     uInt wsize = s->w_size;
 
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
     do {
         more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
 
@@ -1303,7 +1429,6 @@ local void fill_window(s)
                later. (Using level 0 permanently is not an optimal usage of
                zlib, so we don't care about this pathological case.)
              */
-            /* %%% avoid this when Z_RLE */
             n = s->hash_size;
             p = &s->head[n];
             do {
@@ -1324,7 +1449,7 @@ local void fill_window(s)
 #endif
             more += wsize;
         }
-        if (s->strm->avail_in == 0) return;
+        if (s->strm->avail_in == 0) break;
 
         /* If there was no sliding:
          *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
@@ -1343,39 +1468,88 @@ local void fill_window(s)
         s->lookahead += n;
 
         /* Initialize the hash value now that we have some input: */
-        if (s->lookahead >= MIN_MATCH) {
-            s->ins_h = s->window[s->strstart];
-            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
 #if MIN_MATCH != 3
             Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
         }
         /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
          * but this is not important since only literal bytes will be emitted.
          */
 
     } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+
+    /* If the WIN_INIT bytes after the end of the current data have never been
+     * written, then zero those bytes in order to avoid memory check reports of
+     * the use of uninitialized (or uninitialised as Julian writes) bytes by
+     * the longest match routines.  Update the high water mark for the next
+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+     */
+    if (s->high_water < s->window_size) {
+        ulg curr = s->strstart + (ulg)(s->lookahead);
+        ulg init;
+
+        if (s->high_water < curr) {
+            /* Previous high water mark below current data -- zero WIN_INIT
+             * bytes or up to end of window, whichever is less.
+             */
+            init = s->window_size - curr;
+            if (init > WIN_INIT)
+                init = WIN_INIT;
+            zmemzero(s->window + curr, (unsigned)init);
+            s->high_water = curr + init;
+        }
+        else if (s->high_water < (ulg)curr + WIN_INIT) {
+            /* High water mark at or above current data, but below current data
+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+             * to end of window, whichever is less.
+             */
+            init = (ulg)curr + WIN_INIT - s->high_water;
+            if (init > s->window_size - s->high_water)
+                init = s->window_size - s->high_water;
+            zmemzero(s->window + s->high_water, (unsigned)init);
+            s->high_water += init;
+        }
+    }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
 }
 
 /* ===========================================================================
  * Flush the current block, with given end-of-file flag.
  * IN assertion: strstart is set to the end of the current match.
  */
-#define FLUSH_BLOCK_ONLY(s, eof) { \
+#define FLUSH_BLOCK_ONLY(s, last) { \
    _tr_flush_block(s, (s->block_start >= 0L ? \
                    (charf *)&s->window[(unsigned)s->block_start] : \
                    (charf *)Z_NULL), \
                 (ulg)((long)s->strstart - s->block_start), \
-                (eof)); \
+                (last)); \
    s->block_start = s->strstart; \
    flush_pending(s->strm); \
    Tracev((stderr,"[FLUSH]")); \
 }
 
 /* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, eof) { \
-   FLUSH_BLOCK_ONLY(s, eof); \
-   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
+#define FLUSH_BLOCK(s, last) { \
+   FLUSH_BLOCK_ONLY(s, last); \
+   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
 }
 
 /* ===========================================================================
@@ -1434,8 +1608,14 @@ local block_state deflate_stored(s, flush)
             FLUSH_BLOCK(s, 0);
         }
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if ((long)s->strstart > s->block_start)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 
 /* ===========================================================================
@@ -1449,7 +1629,7 @@ local block_state deflate_fast(s, flush)
     deflate_state *s;
     int flush;
 {
-    IPos hash_head = NIL; /* head of the hash chain */
+    IPos hash_head;       /* head of the hash chain */
     int bflush;           /* set if current block must be flushed */
 
     for (;;) {
@@ -1469,6 +1649,7 @@ local block_state deflate_fast(s, flush)
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
+        hash_head = NIL;
         if (s->lookahead >= MIN_MATCH) {
             INSERT_STRING(s, s->strstart, hash_head);
         }
@@ -1481,19 +1662,8 @@ local block_state deflate_fast(s, flush)
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
-#ifdef FASTEST
-            if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) ||
-                (s->strategy == Z_RLE && s->strstart - hash_head == 1)) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-#else
-            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
-                s->match_length = longest_match (s, hash_head);
-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-#endif
-            /* longest_match() or longest_match_fast() sets match_start */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
         }
         if (s->match_length >= MIN_MATCH) {
             check_match(s, s->strstart, s->match_start, s->match_length);
@@ -1541,8 +1711,14 @@ local block_state deflate_fast(s, flush)
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 
 #ifndef FASTEST
@@ -1555,7 +1731,7 @@ local block_state deflate_slow(s, flush)
     deflate_state *s;
     int flush;
 {
-    IPos hash_head = NIL;    /* head of hash chain */
+    IPos hash_head;          /* head of hash chain */
     int bflush;              /* set if current block must be flushed */
 
     /* Process the input block. */
@@ -1576,6 +1752,7 @@ local block_state deflate_slow(s, flush)
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
+        hash_head = NIL;
         if (s->lookahead >= MIN_MATCH) {
             INSERT_STRING(s, s->strstart, hash_head);
         }
@@ -1591,12 +1768,8 @@ local block_state deflate_slow(s, flush)
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
-            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
-                s->match_length = longest_match (s, hash_head);
-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-            /* longest_match() or longest_match_fast() sets match_start */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
 
             if (s->match_length <= 5 && (s->strategy == Z_FILTERED
 #if TOO_FAR <= 32767
@@ -1669,12 +1842,17 @@ local block_state deflate_slow(s, flush)
         _tr_tally_lit(s, s->window[s->strstart-1], bflush);
         s->match_available = 0;
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 #endif /* FASTEST */
 
-#if 0
 /* ===========================================================================
  * For Z_RLE, simply look for runs of bytes, generate matches only of distance
  * one.  Do not maintain a hash table.  (It will be regenerated if this run of
@@ -1684,43 +1862,52 @@ local block_state deflate_rle(s, flush)
     deflate_state *s;
     int flush;
 {
-    int bflush;         /* set if current block must be flushed */
-    uInt run;           /* length of run */
-    uInt max;           /* maximum length of run */
-    uInt prev;          /* byte at distance one to match */
-    Bytef *scan;        /* scan for end of run */
+    int bflush;             /* set if current block must be flushed */
+    uInt prev;              /* byte at distance one to match */
+    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
 
     for (;;) {
         /* Make sure that we always have enough lookahead, except
          * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest encodable run.
+         * for the longest run, plus one for the unrolled loop.
          */
-        if (s->lookahead < MAX_MATCH) {
+        if (s->lookahead <= MAX_MATCH) {
             fill_window(s);
-            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
+            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
                 return need_more;
             }
             if (s->lookahead == 0) break; /* flush the current block */
         }
 
         /* See how many times the previous byte repeats */
-        run = 0;
-        if (s->strstart > 0) {      /* if there is a previous byte, that is */
-            max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH;
+        s->match_length = 0;
+        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
             scan = s->window + s->strstart - 1;
-            prev = *scan++;
-            do {
-                if (*scan++ != prev)
-                    break;
-            } while (++run < max);
+            prev = *scan;
+            if (prev == *++scan && prev == *++scan && prev == *++scan) {
+                strend = s->window + s->strstart + MAX_MATCH;
+                do {
+                } while (prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         scan < strend);
+                s->match_length = MAX_MATCH - (int)(strend - scan);
+                if (s->match_length > s->lookahead)
+                    s->match_length = s->lookahead;
+            }
+            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
         }
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-        if (run >= MIN_MATCH) {
-            check_match(s, s->strstart, s->strstart - 1, run);
-            _tr_tally_dist(s, 1, run - MIN_MATCH, bflush);
-            s->lookahead -= run;
-            s->strstart += run;
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->strstart - 1, s->match_length);
+
+            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+            s->strstart += s->match_length;
+            s->match_length = 0;
         } else {
             /* No match, output a literal byte */
             Tracevv((stderr,"%c", s->window[s->strstart]));
@@ -1730,7 +1917,51 @@ local block_state deflate_rle(s, flush)
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+/* ===========================================================================
+ * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
+ * (It will be regenerated if this run of deflate switches away from Huffman.)
+ */
+local block_state deflate_huff(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we have a literal to write. */
+        if (s->lookahead == 0) {
+            fill_window(s);
+            if (s->lookahead == 0) {
+                if (flush == Z_NO_FLUSH)
+                    return need_more;
+                break;      /* flush the current block */
+            }
+        }
+
+        /* Output a literal byte */
+        s->match_length = 0;
+        Tracevv((stderr,"%c", s->window[s->strstart]));
+        _tr_tally_lit (s, s->window[s->strstart], bflush);
+        s->lookahead--;
+        s->strstart++;
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
-#endif
diff --git a/dep/src/zlib/deflate.h b/dep/src/zlib/deflate.h
index 05a5ab3a2c1..ce0299edd19 100644
--- a/dep/src/zlib/deflate.h
+++ b/dep/src/zlib/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2004 Jean-loup Gailly
+ * Copyright (C) 1995-2012 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -48,6 +48,9 @@
 #define MAX_BITS 15
 /* All codes must not exceed MAX_BITS bits */
 
+#define Buf_size 16
+/* size of bit buffer in bi_buf */
+
 #define INIT_STATE    42
 #define EXTRA_STATE   69
 #define NAME_STATE    73
@@ -101,7 +104,7 @@ typedef struct internal_state {
     int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
     gz_headerp  gzhead;  /* gzip header information to write */
     uInt   gzindex;      /* where in extra, name, or comment */
-    Byte  method;        /* STORED (for zip only) or DEFLATED */
+    Byte  method;        /* can only be DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */
 
                 /* used by deflate.c: */
@@ -188,7 +191,7 @@ typedef struct internal_state {
     int nice_match; /* Stop searching when current match exceeds this */
 
                 /* used by trees.c: */
-    /* Didn't use ct_data typedef below to supress compiler warning */
+    /* Didn't use ct_data typedef below to suppress compiler warning */
     struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
     struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
     struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
@@ -244,7 +247,7 @@ typedef struct internal_state {
     ulg opt_len;        /* bit length of current block with optimal trees */
     ulg static_len;     /* bit length of current block with static trees */
     uInt matches;       /* number of string matches in current block */
-    int last_eob_len;   /* bit length of EOB code for last block */
+    uInt insert;        /* bytes at end of window left to insert */
 
 #ifdef DEBUG
     ulg compressed_len; /* total bit length of compressed file mod 2^32 */
@@ -260,6 +263,13 @@ typedef struct internal_state {
      * are always zero.
      */
 
+    ulg high_water;
+    /* High water mark offset in window for initialized bytes -- bytes above
+     * this are set to zero in order to avoid memory check warnings when
+     * longest match routines access bytes past the input.  This is then
+     * updated to the new high water mark.
+     */
+
 } FAR deflate_state;
 
 /* Output a byte on the stream.
@@ -278,14 +288,19 @@ typedef struct internal_state {
  * distances are limited to MAX_DIST instead of WSIZE.
  */
 
+#define WIN_INIT MAX_MATCH
+/* Number of bytes after end of data in window to initialize in order to avoid
+   memory checker errors from longest match routines */
+
         /* in trees.c */
-void _tr_init         OF((deflate_state *s));
-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
-void _tr_align        OF((deflate_state *s));
-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
 
 #define d_code(dist) \
    ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
@@ -298,11 +313,11 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
 /* Inline versions of _tr_tally for speed: */
 
 #if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch _length_code[];
-  extern uch _dist_code[];
+  extern uch ZLIB_INTERNAL _length_code[];
+  extern uch ZLIB_INTERNAL _dist_code[];
 #else
-  extern const uch _length_code[];
-  extern const uch _dist_code[];
+  extern const uch ZLIB_INTERNAL _length_code[];
+  extern const uch ZLIB_INTERNAL _dist_code[];
 #endif
 
 # define _tr_tally_lit(s, c, flush) \
diff --git a/dep/src/zlib/example.c b/dep/src/zlib/example.c
index 6c8a0ee7633..604736f15f6 100644
--- a/dep/src/zlib/example.c
+++ b/dep/src/zlib/example.c
@@ -1,12 +1,12 @@
 /* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-2004 Jean-loup Gailly.
+ * Copyright (C) 1995-2006 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
-#include <stdio.h>
 #include "zlib.h"
+#include <stdio.h>
 
 #ifdef STDC
 #  include <string.h>
diff --git a/dep/src/zlib/gzguts.h b/dep/src/zlib/gzguts.h
new file mode 100644
index 00000000000..d87659d0319
--- /dev/null
+++ b/dep/src/zlib/gzguts.h
@@ -0,0 +1,209 @@
+/* gzguts.h -- zlib internal header definitions for gz* operations
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#ifdef _LARGEFILE64_SOURCE
+#  ifndef _LARGEFILE_SOURCE
+#    define _LARGEFILE_SOURCE 1
+#  endif
+#  ifdef _FILE_OFFSET_BITS
+#    undef _FILE_OFFSET_BITS
+#  endif
+#endif
+
+#ifdef HAVE_HIDDEN
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include <stdio.h>
+#include "zlib.h"
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#  include <limits.h>
+#endif
+#include <fcntl.h>
+
+#ifdef _WIN32
+#  include <stddef.h>
+#endif
+
+#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
+#  include <io.h>
+#endif
+
+#ifdef WINAPI_FAMILY
+#  define open _open
+#  define read _read
+#  define write _write
+#  define close _close
+#endif
+
+#ifdef NO_DEFLATE       /* for compatibility with old definition */
+#  define NO_GZCOMPRESS
+#endif
+
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+   but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
+#         define vsnprintf _vsnprintf
+#      endif
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  endif
+#  ifdef VMS
+#    define NO_vsnprintf
+#  endif
+#  ifdef __OS400__
+#    define NO_vsnprintf
+#  endif
+#  ifdef __MVS__
+#    define NO_vsnprintf
+#  endif
+#endif
+
+/* unlike snprintf (which is required in C99, yet still not supported by
+   Microsoft more than a decade later!), _snprintf does not guarantee null
+   termination of the result -- however this is only used in gzlib.c where
+   the result is assured to fit in the space provided */
+#ifdef _MSC_VER
+#  define snprintf _snprintf
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+/* gz* functions always use library allocation functions */
+#ifndef STDC
+  extern voidp  malloc OF((uInt size));
+  extern void   free   OF((voidpf ptr));
+#endif
+
+/* get errno and strerror definition */
+#if defined UNDER_CE
+#  include <windows.h>
+#  define zstrerror() gz_strwinerror((DWORD)GetLastError())
+#else
+#  ifndef NO_STRERROR
+#    include <errno.h>
+#    define zstrerror() strerror(errno)
+#  else
+#    define zstrerror() "stdio error (consult errno)"
+#  endif
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+#endif
+
+/* default memLevel */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
+/* default i/o buffer size -- double this for output when reading (this and
+   twice this must be able to fit in an unsigned type) */
+#define GZBUFSIZE 8192
+
+/* gzip modes, also provide a little integrity check on the passed structure */
+#define GZ_NONE 0
+#define GZ_READ 7247
+#define GZ_WRITE 31153
+#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */
+
+/* values for gz_state how */
+#define LOOK 0      /* look for a gzip header */
+#define COPY 1      /* copy input directly */
+#define GZIP 2      /* decompress a gzip stream */
+
+/* internal gzip file state data structure */
+typedef struct {
+        /* exposed contents for gzgetc() macro */
+    struct gzFile_s x;      /* "x" for exposed */
+                            /* x.have: number of bytes available at x.next */
+                            /* x.next: next output data to deliver or write */
+                            /* x.pos: current position in uncompressed data */
+        /* used for both reading and writing */
+    int mode;               /* see gzip modes above */
+    int fd;                 /* file descriptor */
+    char *path;             /* path or fd for error messages */
+    unsigned size;          /* buffer size, zero if not allocated yet */
+    unsigned want;          /* requested buffer size, default is GZBUFSIZE */
+    unsigned char *in;      /* input buffer */
+    unsigned char *out;     /* output buffer (double-sized when reading) */
+    int direct;             /* 0 if processing gzip, 1 if transparent */
+        /* just for reading */
+    int how;                /* 0: get header, 1: copy, 2: decompress */
+    z_off64_t start;        /* where the gzip data started, for rewinding */
+    int eof;                /* true if end of input file reached */
+    int past;               /* true if read requested past end */
+        /* just for writing */
+    int level;              /* compression level */
+    int strategy;           /* compression strategy */
+        /* seek request */
+    z_off64_t skip;         /* amount to skip (already rewound if backwards) */
+    int seek;               /* true if seek request pending */
+        /* error information */
+    int err;                /* error code */
+    char *msg;              /* error message */
+        /* zlib inflate or deflate stream */
+    z_stream strm;          /* stream structure in-place (not a pointer) */
+} gz_state;
+typedef gz_state FAR *gz_statep;
+
+/* shared functions */
+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
+#if defined UNDER_CE
+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
+#endif
+
+/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
+   value -- needed when comparing unsigned to z_off64_t, which is signed
+   (possible z_off64_t types off_t, off64_t, and long are all signed) */
+#ifdef INT_MAX
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
+#else
+unsigned ZLIB_INTERNAL gz_intmax OF((void));
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
+#endif
diff --git a/dep/src/zlib/gzio.c b/dep/src/zlib/gzio.c
deleted file mode 100644
index 7e90f4928fc..00000000000
--- a/dep/src/zlib/gzio.c
+++ /dev/null
@@ -1,1026 +0,0 @@
-/* gzio.c -- IO on .gz files
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.
- */
-
-/* @(#) $Id$ */
-
-#include <stdio.h>
-
-#include "zutil.h"
-
-#ifdef NO_DEFLATE       /* for compatibility with old definition */
-#  define NO_GZCOMPRESS
-#endif
-
-#ifndef NO_DUMMY_DECL
-struct internal_state {int dummy;}; /* for buggy compilers */
-#endif
-
-#ifndef Z_BUFSIZE
-#  ifdef MAXSEG_64K
-#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
-#  else
-#    define Z_BUFSIZE 16384
-#  endif
-#endif
-#ifndef Z_PRINTF_BUFSIZE
-#  define Z_PRINTF_BUFSIZE 4096
-#endif
-
-#ifdef __MVS__
-#  pragma map (fdopen , "\174\174FDOPEN")
-   FILE *fdopen(int, const char *);
-#endif
-
-#ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-#define ALLOC(size) malloc(size)
-#define TRYFREE(p) {if (p) free(p);}
-
-static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
-
-/* gzip flag byte */
-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
-#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
-#define COMMENT      0x10 /* bit 4 set: file comment present */
-#define RESERVED     0xE0 /* bits 5..7: reserved */
-
-typedef struct gz_stream {
-    z_stream stream;
-    int      z_err;   /* error code for last stream operation */
-    int      z_eof;   /* set if end of input file */
-    FILE     *file;   /* .gz file */
-    Byte     *inbuf;  /* input buffer */
-    Byte     *outbuf; /* output buffer */
-    uLong    crc;     /* crc32 of uncompressed data */
-    char     *msg;    /* error message */
-    char     *path;   /* path name for debugging only */
-    int      transparent; /* 1 if input file is not a .gz file */
-    char     mode;    /* 'w' or 'r' */
-    z_off_t  start;   /* start of compressed data in file (header skipped) */
-    z_off_t  in;      /* bytes into deflate or inflate */
-    z_off_t  out;     /* bytes out of deflate or inflate */
-    int      back;    /* one character push-back */
-    int      last;    /* true if push-back is last character */
-} gz_stream;
-
-
-local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
-local int do_flush        OF((gzFile file, int flush));
-local int    get_byte     OF((gz_stream *s));
-local void   check_header OF((gz_stream *s));
-local int    destroy      OF((gz_stream *s));
-local void   putLong      OF((FILE *file, uLong x));
-local uLong  getLong      OF((gz_stream *s));
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
-   or path name (if fd == -1).
-     gz_open returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).
-*/
-local gzFile gz_open (path, mode, fd)
-    const char *path;
-    const char *mode;
-    int  fd;
-{
-    int err;
-    int level = Z_DEFAULT_COMPRESSION; /* compression level */
-    int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
-    char *p = (char*)mode;
-    gz_stream *s;
-    char fmode[80]; /* copy of mode, without the compression level */
-    char *m = fmode;
-
-    if (!path || !mode) return Z_NULL;
-
-    s = (gz_stream *)ALLOC(sizeof(gz_stream));
-    if (!s) return Z_NULL;
-
-    s->stream.zalloc = (alloc_func)0;
-    s->stream.zfree = (free_func)0;
-    s->stream.opaque = (voidpf)0;
-    s->stream.next_in = s->inbuf = Z_NULL;
-    s->stream.next_out = s->outbuf = Z_NULL;
-    s->stream.avail_in = s->stream.avail_out = 0;
-    s->file = NULL;
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->in = 0;
-    s->out = 0;
-    s->back = EOF;
-    s->crc = crc32(0L, Z_NULL, 0);
-    s->msg = NULL;
-    s->transparent = 0;
-
-    s->path = (char*)ALLOC(strlen(path)+1);
-    if (s->path == NULL) {
-        return destroy(s), (gzFile)Z_NULL;
-    }
-    strcpy(s->path, path); /* do this early for debugging */
-
-    s->mode = '\0';
-    do {
-        if (*p == 'r') s->mode = 'r';
-        if (*p == 'w' || *p == 'a') s->mode = 'w';
-        if (*p >= '0' && *p <= '9') {
-            level = *p - '0';
-        } else if (*p == 'f') {
-          strategy = Z_FILTERED;
-        } else if (*p == 'h') {
-          strategy = Z_HUFFMAN_ONLY;
-        } else if (*p == 'R') {
-          strategy = Z_RLE;
-        } else {
-            *m++ = *p; /* copy the mode */
-        }
-    } while (*p++ && m != fmode + sizeof(fmode));
-    if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
-
-    if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-        err = Z_STREAM_ERROR;
-#else
-        err = deflateInit2(&(s->stream), level,
-                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
-        /* windowBits is passed < 0 to suppress zlib header */
-
-        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-#endif
-        if (err != Z_OK || s->outbuf == Z_NULL) {
-            return destroy(s), (gzFile)Z_NULL;
-        }
-    } else {
-        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
-
-        err = inflateInit2(&(s->stream), -MAX_WBITS);
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
-         * present after the compressed stream.
-         */
-        if (err != Z_OK || s->inbuf == Z_NULL) {
-            return destroy(s), (gzFile)Z_NULL;
-        }
-    }
-    s->stream.avail_out = Z_BUFSIZE;
-
-    errno = 0;
-    s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
-
-    if (s->file == NULL) {
-        return destroy(s), (gzFile)Z_NULL;
-    }
-    if (s->mode == 'w') {
-        /* Write a very simple .gz header:
-         */
-        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
-             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
-        s->start = 10L;
-        /* We use 10L instead of ftell(s->file) to because ftell causes an
-         * fflush on some systems. This version of the library doesn't use
-         * start anyway in write mode, so this initialization is not
-         * necessary.
-         */
-    } else {
-        check_header(s); /* skip the .gz header */
-        s->start = ftell(s->file) - s->stream.avail_in;
-    }
-
-    return (gzFile)s;
-}
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing.
-*/
-gzFile ZEXPORT gzopen (path, mode)
-    const char *path;
-    const char *mode;
-{
-    return gz_open (path, mode, -1);
-}
-
-/* ===========================================================================
-     Associate a gzFile with the file descriptor fd. fd is not dup'ed here
-   to mimic the behavio(u)r of fdopen.
-*/
-gzFile ZEXPORT gzdopen (fd, mode)
-    int fd;
-    const char *mode;
-{
-    char name[46];      /* allow for up to 128-bit integers */
-
-    if (fd < 0) return (gzFile)Z_NULL;
-    sprintf(name, "<fd:%d>", fd); /* for debugging */
-
-    return gz_open (name, mode, fd);
-}
-
-/* ===========================================================================
- * Update the compression level and strategy
- */
-int ZEXPORT gzsetparams (file, level, strategy)
-    gzFile file;
-    int level;
-    int strategy;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    /* Make room to allow flushing */
-    if (s->stream.avail_out == 0) {
-
-        s->stream.next_out = s->outbuf;
-        if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-            s->z_err = Z_ERRNO;
-        }
-        s->stream.avail_out = Z_BUFSIZE;
-    }
-
-    return deflateParams (&(s->stream), level, strategy);
-}
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
-*/
-local int get_byte(s)
-    gz_stream *s;
-{
-    if (s->z_eof) return EOF;
-    if (s->stream.avail_in == 0) {
-        errno = 0;
-        s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-        if (s->stream.avail_in == 0) {
-            s->z_eof = 1;
-            if (ferror(s->file)) s->z_err = Z_ERRNO;
-            return EOF;
-        }
-        s->stream.next_in = s->inbuf;
-    }
-    s->stream.avail_in--;
-    return *(s->stream.next_in)++;
-}
-
-/* ===========================================================================
-      Check the gzip header of a gz_stream opened for reading. Set the stream
-    mode to transparent if the gzip magic header is not present; set s->err
-    to Z_DATA_ERROR if the magic header is present but the rest of the header
-    is incorrect.
-    IN assertion: the stream s has already been created sucessfully;
-       s->stream.avail_in is zero for the first time, but may be non-zero
-       for concatenated .gz files.
-*/
-local void check_header(s)
-    gz_stream *s;
-{
-    int method; /* method byte */
-    int flags;  /* flags byte */
-    uInt len;
-    int c;
-
-    /* Assure two bytes in the buffer so we can peek ahead -- handle case
-       where first byte of header is at the end of the buffer after the last
-       gzip segment */
-    len = s->stream.avail_in;
-    if (len < 2) {
-        if (len) s->inbuf[0] = s->stream.next_in[0];
-        errno = 0;
-        len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);
-        if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;
-        s->stream.avail_in += len;
-        s->stream.next_in = s->inbuf;
-        if (s->stream.avail_in < 2) {
-            s->transparent = s->stream.avail_in;
-            return;
-        }
-    }
-
-    /* Peek ahead to check the gzip magic header */
-    if (s->stream.next_in[0] != gz_magic[0] ||
-        s->stream.next_in[1] != gz_magic[1]) {
-        s->transparent = 1;
-        return;
-    }
-    s->stream.avail_in -= 2;
-    s->stream.next_in += 2;
-
-    /* Check the rest of the gzip header */
-    method = get_byte(s);
-    flags = get_byte(s);
-    if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
-        s->z_err = Z_DATA_ERROR;
-        return;
-    }
-
-    /* Discard time, xflags and OS code: */
-    for (len = 0; len < 6; len++) (void)get_byte(s);
-
-    if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-        len  =  (uInt)get_byte(s);
-        len += ((uInt)get_byte(s))<<8;
-        /* len is garbage if EOF but the loop below will quit anyway */
-        while (len-- != 0 && get_byte(s) != EOF) ;
-    }
-    if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
-        while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
-        while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
-        for (len = 0; len < 2; len++) (void)get_byte(s);
-    }
-    s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
-}
-
- /* ===========================================================================
- * Cleanup then free the given gz_stream. Return a zlib error code.
-   Try freeing in the reverse order of allocations.
- */
-local int destroy (s)
-    gz_stream *s;
-{
-    int err = Z_OK;
-
-    if (!s) return Z_STREAM_ERROR;
-
-    TRYFREE(s->msg);
-
-    if (s->stream.state != NULL) {
-        if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-            err = Z_STREAM_ERROR;
-#else
-            err = deflateEnd(&(s->stream));
-#endif
-        } else if (s->mode == 'r') {
-            err = inflateEnd(&(s->stream));
-        }
-    }
-    if (s->file != NULL && fclose(s->file)) {
-#ifdef ESPIPE
-        if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
-#endif
-            err = Z_ERRNO;
-    }
-    if (s->z_err < 0) err = s->z_err;
-
-    TRYFREE(s->inbuf);
-    TRYFREE(s->outbuf);
-    TRYFREE(s->path);
-    TRYFREE(s);
-    return err;
-}
-
-/* ===========================================================================
-     Reads the given number of uncompressed bytes from the compressed file.
-   gzread returns the number of bytes actually read (0 for end of file).
-*/
-int ZEXPORT gzread (file, buf, len)
-    gzFile file;
-    voidp buf;
-    unsigned len;
-{
-    gz_stream *s = (gz_stream*)file;
-    Bytef *start = (Bytef*)buf; /* starting point for crc computation */
-    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
-
-    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
-
-    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
-    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
-
-    next_out = (Byte*)buf;
-    s->stream.next_out = (Bytef*)buf;
-    s->stream.avail_out = len;
-
-    if (s->stream.avail_out && s->back != EOF) {
-        *next_out++ = s->back;
-        s->stream.next_out++;
-        s->stream.avail_out--;
-        s->back = EOF;
-        s->out++;
-        start++;
-        if (s->last) {
-            s->z_err = Z_STREAM_END;
-            return 1;
-        }
-    }
-
-    while (s->stream.avail_out != 0) {
-
-        if (s->transparent) {
-            /* Copy first the lookahead bytes: */
-            uInt n = s->stream.avail_in;
-            if (n > s->stream.avail_out) n = s->stream.avail_out;
-            if (n > 0) {
-                zmemcpy(s->stream.next_out, s->stream.next_in, n);
-                next_out += n;
-                s->stream.next_out = next_out;
-                s->stream.next_in   += n;
-                s->stream.avail_out -= n;
-                s->stream.avail_in  -= n;
-            }
-            if (s->stream.avail_out > 0) {
-                s->stream.avail_out -=
-                    (uInt)fread(next_out, 1, s->stream.avail_out, s->file);
-            }
-            len -= s->stream.avail_out;
-            s->in  += len;
-            s->out += len;
-            if (len == 0) s->z_eof = 1;
-            return (int)len;
-        }
-        if (s->stream.avail_in == 0 && !s->z_eof) {
-
-            errno = 0;
-            s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-            if (s->stream.avail_in == 0) {
-                s->z_eof = 1;
-                if (ferror(s->file)) {
-                    s->z_err = Z_ERRNO;
-                    break;
-                }
-            }
-            s->stream.next_in = s->inbuf;
-        }
-        s->in += s->stream.avail_in;
-        s->out += s->stream.avail_out;
-        s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
-        s->in -= s->stream.avail_in;
-        s->out -= s->stream.avail_out;
-
-        if (s->z_err == Z_STREAM_END) {
-            /* Check CRC and original size */
-            s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-            start = s->stream.next_out;
-
-            if (getLong(s) != s->crc) {
-                s->z_err = Z_DATA_ERROR;
-            } else {
-                (void)getLong(s);
-                /* The uncompressed length returned by above getlong() may be
-                 * different from s->out in case of concatenated .gz files.
-                 * Check for such files:
-                 */
-                check_header(s);
-                if (s->z_err == Z_OK) {
-                    inflateReset(&(s->stream));
-                    s->crc = crc32(0L, Z_NULL, 0);
-                }
-            }
-        }
-        if (s->z_err != Z_OK || s->z_eof) break;
-    }
-    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-
-    if (len == s->stream.avail_out &&
-        (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO))
-        return -1;
-    return (int)(len - s->stream.avail_out);
-}
-
-
-/* ===========================================================================
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-int ZEXPORT gzgetc(file)
-    gzFile file;
-{
-    unsigned char c;
-
-    return gzread(file, &c, 1) == 1 ? c : -1;
-}
-
-
-/* ===========================================================================
-      Push one byte back onto the stream.
-*/
-int ZEXPORT gzungetc(c, file)
-    int c;
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF;
-    s->back = c;
-    s->out--;
-    s->last = (s->z_err == Z_STREAM_END);
-    if (s->last) s->z_err = Z_OK;
-    s->z_eof = 0;
-    return c;
-}
-
-
-/* ===========================================================================
-      Reads bytes from the compressed file until len-1 characters are
-   read, or a newline character is read and transferred to buf, or an
-   end-of-file condition is encountered.  The string is then terminated
-   with a null character.
-      gzgets returns buf, or Z_NULL in case of error.
-
-      The current implementation is not optimized at all.
-*/
-char * ZEXPORT gzgets(file, buf, len)
-    gzFile file;
-    char *buf;
-    int len;
-{
-    char *b = buf;
-    if (buf == Z_NULL || len <= 0) return Z_NULL;
-
-    while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
-    *buf = '\0';
-    return b == buf && len > 0 ? Z_NULL : b;
-}
-
-
-#ifndef NO_GZCOMPRESS
-/* ===========================================================================
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of bytes actually written (0 in case of error).
-*/
-int ZEXPORT gzwrite (file, buf, len)
-    gzFile file;
-    voidpc buf;
-    unsigned len;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.next_in = (Bytef*)buf;
-    s->stream.avail_in = len;
-
-    while (s->stream.avail_in != 0) {
-
-        if (s->stream.avail_out == 0) {
-
-            s->stream.next_out = s->outbuf;
-            if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-                s->z_err = Z_ERRNO;
-                break;
-            }
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        s->in += s->stream.avail_in;
-        s->out += s->stream.avail_out;
-        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
-        s->in -= s->stream.avail_in;
-        s->out -= s->stream.avail_out;
-        if (s->z_err != Z_OK) break;
-    }
-    s->crc = crc32(s->crc, (const Bytef *)buf, len);
-
-    return (int)(len - s->stream.avail_in);
-}
-
-
-/* ===========================================================================
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).
-*/
-#ifdef STDC
-#include <stdarg.h>
-
-int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
-{
-    char buf[Z_PRINTF_BUFSIZE];
-    va_list va;
-    int len;
-
-    buf[sizeof(buf) - 1] = 0;
-    va_start(va, format);
-#ifdef NO_vsnprintf
-#  ifdef HAS_vsprintf_void
-    (void)vsprintf(buf, format, va);
-    va_end(va);
-    for (len = 0; len < sizeof(buf); len++)
-        if (buf[len] == 0) break;
-#  else
-    len = vsprintf(buf, format, va);
-    va_end(va);
-#  endif
-#else
-#  ifdef HAS_vsnprintf_void
-    (void)vsnprintf(buf, sizeof(buf), format, va);
-    va_end(va);
-    len = strlen(buf);
-#  else
-    len = vsnprintf(buf, sizeof(buf), format, va);
-    va_end(va);
-#  endif
-#endif
-    if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0)
-        return 0;
-    return gzwrite(file, buf, (unsigned)len);
-}
-#else /* not ANSI C */
-
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-    gzFile file;
-    const char *format;
-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
-{
-    char buf[Z_PRINTF_BUFSIZE];
-    int len;
-
-    buf[sizeof(buf) - 1] = 0;
-#ifdef NO_snprintf
-#  ifdef HAS_sprintf_void
-    sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    for (len = 0; len < sizeof(buf); len++)
-        if (buf[len] == 0) break;
-#  else
-    len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#else
-#  ifdef HAS_snprintf_void
-    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    len = strlen(buf);
-#  else
-    len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#endif
-    if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0)
-        return 0;
-    return gzwrite(file, buf, len);
-}
-#endif
-
-/* ===========================================================================
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-int ZEXPORT gzputc(file, c)
-    gzFile file;
-    int c;
-{
-    unsigned char cc = (unsigned char) c; /* required for big endian systems */
-
-    return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
-}
-
-
-/* ===========================================================================
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-int ZEXPORT gzputs(file, s)
-    gzFile file;
-    const char *s;
-{
-    return gzwrite(file, (char*)s, (unsigned)strlen(s));
-}
-
-
-/* ===========================================================================
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function.
-*/
-local int do_flush (file, flush)
-    gzFile file;
-    int flush;
-{
-    uInt len;
-    int done = 0;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.avail_in = 0; /* should be zero already anyway */
-
-    for (;;) {
-        len = Z_BUFSIZE - s->stream.avail_out;
-
-        if (len != 0) {
-            if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
-                s->z_err = Z_ERRNO;
-                return Z_ERRNO;
-            }
-            s->stream.next_out = s->outbuf;
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        if (done) break;
-        s->out += s->stream.avail_out;
-        s->z_err = deflate(&(s->stream), flush);
-        s->out -= s->stream.avail_out;
-
-        /* Ignore the second of two consecutive flushes: */
-        if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
-
-        /* deflate has finished flushing only when it hasn't used up
-         * all the available space in the output buffer:
-         */
-        done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
-
-        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
-    }
-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-
-int ZEXPORT gzflush (file, flush)
-     gzFile file;
-     int flush;
-{
-    gz_stream *s = (gz_stream*)file;
-    int err = do_flush (file, flush);
-
-    if (err) return err;
-    fflush(s->file);
-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-#endif /* NO_GZCOMPRESS */
-
-/* ===========================================================================
-      Sets the starting position for the next gzread or gzwrite on the given
-   compressed file. The offset represents a number of bytes in the
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error.
-      SEEK_END is not implemented, returns error.
-      In this version of the library, gzseek can be extremely slow.
-*/
-z_off_t ZEXPORT gzseek (file, offset, whence)
-    gzFile file;
-    z_off_t offset;
-    int whence;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || whence == SEEK_END ||
-        s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
-        return -1L;
-    }
-
-    if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-        return -1L;
-#else
-        if (whence == SEEK_SET) {
-            offset -= s->in;
-        }
-        if (offset < 0) return -1L;
-
-        /* At this point, offset is the number of zero bytes to write. */
-        if (s->inbuf == Z_NULL) {
-            s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
-            if (s->inbuf == Z_NULL) return -1L;
-            zmemzero(s->inbuf, Z_BUFSIZE);
-        }
-        while (offset > 0)  {
-            uInt size = Z_BUFSIZE;
-            if (offset < Z_BUFSIZE) size = (uInt)offset;
-
-            size = gzwrite(file, s->inbuf, size);
-            if (size == 0) return -1L;
-
-            offset -= size;
-        }
-        return s->in;
-#endif
-    }
-    /* Rest of function is for reading only */
-
-    /* compute absolute position */
-    if (whence == SEEK_CUR) {
-        offset += s->out;
-    }
-    if (offset < 0) return -1L;
-
-    if (s->transparent) {
-        /* map to fseek */
-        s->back = EOF;
-        s->stream.avail_in = 0;
-        s->stream.next_in = s->inbuf;
-        if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
-
-        s->in = s->out = offset;
-        return offset;
-    }
-
-    /* For a negative seek, rewind and use positive seek */
-    if (offset >= s->out) {
-        offset -= s->out;
-    } else if (gzrewind(file) < 0) {
-        return -1L;
-    }
-    /* offset is now the number of bytes to skip. */
-
-    if (offset != 0 && s->outbuf == Z_NULL) {
-        s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-        if (s->outbuf == Z_NULL) return -1L;
-    }
-    if (offset && s->back != EOF) {
-        s->back = EOF;
-        s->out++;
-        offset--;
-        if (s->last) s->z_err = Z_STREAM_END;
-    }
-    while (offset > 0)  {
-        int size = Z_BUFSIZE;
-        if (offset < Z_BUFSIZE) size = (int)offset;
-
-        size = gzread(file, s->outbuf, (uInt)size);
-        if (size <= 0) return -1L;
-        offset -= size;
-    }
-    return s->out;
-}
-
-/* ===========================================================================
-     Rewinds input file.
-*/
-int ZEXPORT gzrewind (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'r') return -1;
-
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->back = EOF;
-    s->stream.avail_in = 0;
-    s->stream.next_in = s->inbuf;
-    s->crc = crc32(0L, Z_NULL, 0);
-    if (!s->transparent) (void)inflateReset(&s->stream);
-    s->in = 0;
-    s->out = 0;
-    return fseek(s->file, s->start, SEEK_SET);
-}
-
-/* ===========================================================================
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-*/
-z_off_t ZEXPORT gztell (file)
-    gzFile file;
-{
-    return gzseek(file, 0L, SEEK_CUR);
-}
-
-/* ===========================================================================
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-int ZEXPORT gzeof (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    /* With concatenated compressed files that can have embedded
-     * crc trailers, z_eof is no longer the only/best indicator of EOF
-     * on a gz_stream. Handle end-of-stream error explicitly here.
-     */
-    if (s == NULL || s->mode != 'r') return 0;
-    if (s->z_eof) return 1;
-    return s->z_err == Z_STREAM_END;
-}
-
-/* ===========================================================================
-     Returns 1 if reading and doing so transparently, otherwise zero.
-*/
-int ZEXPORT gzdirect (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'r') return 0;
-    return s->transparent;
-}
-
-/* ===========================================================================
-   Outputs a long in LSB order to the given file
-*/
-local void putLong (file, x)
-    FILE *file;
-    uLong x;
-{
-    int n;
-    for (n = 0; n < 4; n++) {
-        fputc((int)(x & 0xff), file);
-        x >>= 8;
-    }
-}
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets z_err in case
-   of error.
-*/
-local uLong getLong (s)
-    gz_stream *s;
-{
-    uLong x = (uLong)get_byte(s);
-    int c;
-
-    x += ((uLong)get_byte(s))<<8;
-    x += ((uLong)get_byte(s))<<16;
-    c = get_byte(s);
-    if (c == EOF) s->z_err = Z_DATA_ERROR;
-    x += ((uLong)c)<<24;
-    return x;
-}
-
-/* ===========================================================================
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state.
-*/
-int ZEXPORT gzclose (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) return Z_STREAM_ERROR;
-
-    if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-        return Z_STREAM_ERROR;
-#else
-        if (do_flush (file, Z_FINISH) != Z_OK)
-            return destroy((gz_stream*)file);
-
-        putLong (s->file, s->crc);
-        putLong (s->file, (uLong)(s->in & 0xffffffff));
-#endif
-    }
-    return destroy((gz_stream*)file);
-}
-
-#ifdef STDC
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
-#endif
-
-/* ===========================================================================
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-const char * ZEXPORT gzerror (file, errnum)
-    gzFile file;
-    int *errnum;
-{
-    char *m;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) {
-        *errnum = Z_STREAM_ERROR;
-        return (const char*)ERR_MSG(Z_STREAM_ERROR);
-    }
-    *errnum = s->z_err;
-    if (*errnum == Z_OK) return (const char*)"";
-
-    m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
-
-    if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
-
-    TRYFREE(s->msg);
-    s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
-    if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR);
-    strcpy(s->msg, s->path);
-    strcat(s->msg, ": ");
-    strcat(s->msg, m);
-    return (const char*)s->msg;
-}
-
-/* ===========================================================================
-     Clear the error and end-of-file flags, and do the same for the real file.
-*/
-void ZEXPORT gzclearerr (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) return;
-    if (s->z_err != Z_STREAM_END) s->z_err = Z_OK;
-    s->z_eof = 0;
-    clearerr(s->file);
-}
diff --git a/dep/src/zlib/infback.c b/dep/src/zlib/infback.c
index 455dbc9ee84..f3833c2e434 100644
--- a/dep/src/zlib/infback.c
+++ b/dep/src/zlib/infback.c
@@ -1,5 +1,5 @@
 /* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2005 Mark Adler
+ * Copyright (C) 1995-2011 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -42,10 +42,19 @@ int stream_size;
         return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+    strm->zfree = zcfree;
+#endif
     state = (struct inflate_state FAR *)ZALLOC(strm, 1,
                                                sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
@@ -55,7 +64,7 @@ int stream_size;
     state->wbits = windowBits;
     state->wsize = 1U << windowBits;
     state->window = window;
-    state->write = 0;
+    state->wnext = 0;
     state->whave = 0;
     return Z_OK;
 }
@@ -246,14 +255,14 @@ out_func out;
 void FAR *out_desc;
 {
     struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
+    z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
     unsigned have, left;        /* available input and output */
     unsigned long hold;         /* bit buffer */
     unsigned bits;              /* bits in bit buffer */
     unsigned copy;              /* number of stored or match bytes to copy */
     unsigned char FAR *from;    /* where to copy match bytes from */
-    code this;                  /* current decoding table entry */
+    code here;                  /* current decoding table entry */
     code last;                  /* parent table entry */
     unsigned len;               /* length to copy for repeats, bits to drop */
     int ret;                    /* return code */
@@ -389,19 +398,18 @@ void FAR *out_desc;
             state->have = 0;
             while (state->have < state->nlen + state->ndist) {
                 for (;;) {
-                    this = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(this.bits) <= bits) break;
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
                     PULLBYTE();
                 }
-                if (this.val < 16) {
-                    NEEDBITS(this.bits);
-                    DROPBITS(this.bits);
-                    state->lens[state->have++] = this.val;
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
                 }
                 else {
-                    if (this.val == 16) {
-                        NEEDBITS(this.bits + 2);
-                        DROPBITS(this.bits);
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
                         if (state->have == 0) {
                             strm->msg = (char *)"invalid bit length repeat";
                             state->mode = BAD;
@@ -411,16 +419,16 @@ void FAR *out_desc;
                         copy = 3 + BITS(2);
                         DROPBITS(2);
                     }
-                    else if (this.val == 17) {
-                        NEEDBITS(this.bits + 3);
-                        DROPBITS(this.bits);
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
                         len = 0;
                         copy = 3 + BITS(3);
                         DROPBITS(3);
                     }
                     else {
-                        NEEDBITS(this.bits + 7);
-                        DROPBITS(this.bits);
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
                         len = 0;
                         copy = 11 + BITS(7);
                         DROPBITS(7);
@@ -438,7 +446,16 @@ void FAR *out_desc;
             /* handle error breaks in while */
             if (state->mode == BAD) break;
 
-            /* build code tables */
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
             state->next = state->codes;
             state->lencode = (code const FAR *)(state->next);
             state->lenbits = 9;
@@ -474,28 +491,28 @@ void FAR *out_desc;
 
             /* get a literal, length, or end-of-block code */
             for (;;) {
-                this = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(this.bits) <= bits) break;
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
                 PULLBYTE();
             }
-            if (this.op && (this.op & 0xf0) == 0) {
-                last = this;
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
                 for (;;) {
-                    this = state->lencode[last.val +
+                    here = state->lencode[last.val +
                             (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
                     PULLBYTE();
                 }
                 DROPBITS(last.bits);
             }
-            DROPBITS(this.bits);
-            state->length = (unsigned)this.val;
+            DROPBITS(here.bits);
+            state->length = (unsigned)here.val;
 
             /* process literal */
-            if (this.op == 0) {
-                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+            if (here.op == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
                         "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", this.val));
+                        "inflate:         literal 0x%02x\n", here.val));
                 ROOM();
                 *put++ = (unsigned char)(state->length);
                 left--;
@@ -504,21 +521,21 @@ void FAR *out_desc;
             }
 
             /* process end of block */
-            if (this.op & 32) {
+            if (here.op & 32) {
                 Tracevv((stderr, "inflate:         end of block\n"));
                 state->mode = TYPE;
                 break;
             }
 
             /* invalid code */
-            if (this.op & 64) {
+            if (here.op & 64) {
                 strm->msg = (char *)"invalid literal/length code";
                 state->mode = BAD;
                 break;
             }
 
             /* length code -- get extra bits, if any */
-            state->extra = (unsigned)(this.op) & 15;
+            state->extra = (unsigned)(here.op) & 15;
             if (state->extra != 0) {
                 NEEDBITS(state->extra);
                 state->length += BITS(state->extra);
@@ -528,30 +545,30 @@ void FAR *out_desc;
 
             /* get distance code */
             for (;;) {
-                this = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(this.bits) <= bits) break;
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
                 PULLBYTE();
             }
-            if ((this.op & 0xf0) == 0) {
-                last = this;
+            if ((here.op & 0xf0) == 0) {
+                last = here;
                 for (;;) {
-                    this = state->distcode[last.val +
+                    here = state->distcode[last.val +
                             (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
                     PULLBYTE();
                 }
                 DROPBITS(last.bits);
             }
-            DROPBITS(this.bits);
-            if (this.op & 64) {
+            DROPBITS(here.bits);
+            if (here.op & 64) {
                 strm->msg = (char *)"invalid distance code";
                 state->mode = BAD;
                 break;
             }
-            state->offset = (unsigned)this.val;
+            state->offset = (unsigned)here.val;
 
             /* get distance extra bits, if any */
-            state->extra = (unsigned)(this.op) & 15;
+            state->extra = (unsigned)(here.op) & 15;
             if (state->extra != 0) {
                 NEEDBITS(state->extra);
                 state->offset += BITS(state->extra);
diff --git a/dep/src/zlib/inffast.c b/dep/src/zlib/inffast.c
index bbee92ed1e6..bda59ceb6a1 100644
--- a/dep/src/zlib/inffast.c
+++ b/dep/src/zlib/inffast.c
@@ -1,5 +1,5 @@
 /* inffast.c -- fast decoding
- * Copyright (C) 1995-2004 Mark Adler
+ * Copyright (C) 1995-2008, 2010, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -64,13 +64,13 @@
       requires strm->avail_out >= 258 for each loop to avoid checking for
       output space.
  */
-void inflate_fast(strm, start)
+void ZLIB_INTERNAL inflate_fast(strm, start)
 z_streamp strm;
 unsigned start;         /* inflate()'s starting value for strm->avail_out */
 {
     struct inflate_state FAR *state;
-    unsigned char FAR *in;      /* local strm->next_in */
-    unsigned char FAR *last;    /* while in < last, enough input available */
+    z_const unsigned char FAR *in;      /* local strm->next_in */
+    z_const unsigned char FAR *last;    /* have enough input while in < last */
     unsigned char FAR *out;     /* local strm->next_out */
     unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
     unsigned char FAR *end;     /* while out < end, enough space available */
@@ -79,7 +79,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
 #endif
     unsigned wsize;             /* window size or zero if not using window */
     unsigned whave;             /* valid bytes in the window */
-    unsigned write;             /* window write index */
+    unsigned wnext;             /* window write index */
     unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
     unsigned long hold;         /* local strm->hold */
     unsigned bits;              /* local strm->bits */
@@ -87,7 +87,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     code const FAR *dcode;      /* local strm->distcode */
     unsigned lmask;             /* mask for first level of length codes */
     unsigned dmask;             /* mask for first level of distance codes */
-    code this;                  /* retrieved table entry */
+    code here;                  /* retrieved table entry */
     unsigned op;                /* code bits, operation, extra bits, or */
                                 /*  window position, window bytes to copy */
     unsigned len;               /* match length, unused bytes */
@@ -106,7 +106,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
 #endif
     wsize = state->wsize;
     whave = state->whave;
-    write = state->write;
+    wnext = state->wnext;
     window = state->window;
     hold = state->hold;
     bits = state->bits;
@@ -124,20 +124,20 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             hold += (unsigned long)(PUP(in)) << bits;
             bits += 8;
         }
-        this = lcode[hold & lmask];
+        here = lcode[hold & lmask];
       dolen:
-        op = (unsigned)(this.bits);
+        op = (unsigned)(here.bits);
         hold >>= op;
         bits -= op;
-        op = (unsigned)(this.op);
+        op = (unsigned)(here.op);
         if (op == 0) {                          /* literal */
-            Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
                     "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", this.val));
-            PUP(out) = (unsigned char)(this.val);
+                    "inflate:         literal 0x%02x\n", here.val));
+            PUP(out) = (unsigned char)(here.val);
         }
         else if (op & 16) {                     /* length base */
-            len = (unsigned)(this.val);
+            len = (unsigned)(here.val);
             op &= 15;                           /* number of extra bits */
             if (op) {
                 if (bits < op) {
@@ -155,14 +155,14 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 hold += (unsigned long)(PUP(in)) << bits;
                 bits += 8;
             }
-            this = dcode[hold & dmask];
+            here = dcode[hold & dmask];
           dodist:
-            op = (unsigned)(this.bits);
+            op = (unsigned)(here.bits);
             hold >>= op;
             bits -= op;
-            op = (unsigned)(this.op);
+            op = (unsigned)(here.op);
             if (op & 16) {                      /* distance base */
-                dist = (unsigned)(this.val);
+                dist = (unsigned)(here.val);
                 op &= 15;                       /* number of extra bits */
                 if (bits < op) {
                     hold += (unsigned long)(PUP(in)) << bits;
@@ -187,12 +187,34 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 if (dist > op) {                /* see if copy from window */
                     op = dist - op;             /* distance back in window */
                     if (op > whave) {
-                        strm->msg = (char *)"invalid distance too far back";
-                        state->mode = BAD;
-                        break;
+                        if (state->sane) {
+                            strm->msg =
+                                (char *)"invalid distance too far back";
+                            state->mode = BAD;
+                            break;
+                        }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                        if (len <= op - whave) {
+                            do {
+                                PUP(out) = 0;
+                            } while (--len);
+                            continue;
+                        }
+                        len -= op - whave;
+                        do {
+                            PUP(out) = 0;
+                        } while (--op > whave);
+                        if (op == 0) {
+                            from = out - dist;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--len);
+                            continue;
+                        }
+#endif
                     }
                     from = window - OFF;
-                    if (write == 0) {           /* very common case */
+                    if (wnext == 0) {           /* very common case */
                         from += wsize - op;
                         if (op < len) {         /* some from window */
                             len -= op;
@@ -202,17 +224,17 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                             from = out - dist;  /* rest from output */
                         }
                     }
-                    else if (write < op) {      /* wrap around window */
-                        from += wsize + write - op;
-                        op -= write;
+                    else if (wnext < op) {      /* wrap around window */
+                        from += wsize + wnext - op;
+                        op -= wnext;
                         if (op < len) {         /* some from end of window */
                             len -= op;
                             do {
                                 PUP(out) = PUP(from);
                             } while (--op);
                             from = window - OFF;
-                            if (write < len) {  /* some from start of window */
-                                op = write;
+                            if (wnext < len) {  /* some from start of window */
+                                op = wnext;
                                 len -= op;
                                 do {
                                     PUP(out) = PUP(from);
@@ -222,7 +244,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                         }
                     }
                     else {                      /* contiguous in window */
-                        from += write - op;
+                        from += wnext - op;
                         if (op < len) {         /* some from window */
                             len -= op;
                             do {
@@ -259,7 +281,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 }
             }
             else if ((op & 64) == 0) {          /* 2nd level distance code */
-                this = dcode[this.val + (hold & ((1U << op) - 1))];
+                here = dcode[here.val + (hold & ((1U << op) - 1))];
                 goto dodist;
             }
             else {
@@ -269,7 +291,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             }
         }
         else if ((op & 64) == 0) {              /* 2nd level length code */
-            this = lcode[this.val + (hold & ((1U << op) - 1))];
+            here = lcode[here.val + (hold & ((1U << op) - 1))];
             goto dolen;
         }
         else if (op & 32) {                     /* end-of-block */
@@ -305,7 +327,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
    inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
    - Using bit fields for code structure
    - Different op definition to avoid & for extra bits (do & for table bits)
-   - Three separate decoding do-loops for direct, window, and write == 0
+   - Three separate decoding do-loops for direct, window, and wnext == 0
    - Special case for distance > 1 copies to do overlapped load and store copy
    - Explicit branch predictions (based on measured branch probabilities)
    - Deferring match copy and interspersed it with decoding subsequent codes
diff --git a/dep/src/zlib/inffast.h b/dep/src/zlib/inffast.h
index 1e88d2d97b5..e5c1aa4ca8c 100644
--- a/dep/src/zlib/inffast.h
+++ b/dep/src/zlib/inffast.h
@@ -1,5 +1,5 @@
 /* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003 Mark Adler
+ * Copyright (C) 1995-2003, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,4 +8,4 @@
    subject to change. Applications should only use zlib.h.
  */
 
-void inflate_fast OF((z_streamp strm, unsigned start));
+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/dep/src/zlib/inffixed.h b/dep/src/zlib/inffixed.h
index 75ed4b5978d..d6283277694 100644
--- a/dep/src/zlib/inffixed.h
+++ b/dep/src/zlib/inffixed.h
@@ -2,9 +2,9 @@
      * Generated automatically by makefixed().
      */
 
-    /* WARNING: this file should *not* be used by applications. It
-       is part of the implementation of the compression library and
-       is subject to change. Applications should only use zlib.h.
+    /* WARNING: this file should *not* be used by applications.
+       It is part of the implementation of this library and is
+       subject to change. Applications should only use zlib.h.
      */
 
     static const code lenfix[512] = {
diff --git a/dep/src/zlib/inflate.c b/dep/src/zlib/inflate.c
index 792fdee8e9c..870f89bb4d3 100644
--- a/dep/src/zlib/inflate.c
+++ b/dep/src/zlib/inflate.c
@@ -1,5 +1,5 @@
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2005 Mark Adler
+ * Copyright (C) 1995-2012 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -45,7 +45,7 @@
  * - Rearrange window copies in inflate_fast() for speed and simplification
  * - Unroll last copy for window match in inflate_fast()
  * - Use local copies of window variables in inflate_fast() for speed
- * - Pull out common write == 0 case for speed in inflate_fast()
+ * - Pull out common wnext == 0 case for speed in inflate_fast()
  * - Make op and len in inflate_fast() unsigned for consistency
  * - Add FAR to lcode and dcode declarations in inflate_fast()
  * - Simplified bad distance check in inflate_fast()
@@ -93,14 +93,15 @@
 
 /* function prototypes */
 local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, unsigned out));
+local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
+                           unsigned copy));
 #ifdef BUILDFIXED
    void makefixed OF((void));
 #endif
-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
+local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
                               unsigned len));
 
-int ZEXPORT inflateReset(strm)
+int ZEXPORT inflateResetKeep(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
@@ -109,36 +110,71 @@ z_streamp strm;
     state = (struct inflate_state FAR *)strm->state;
     strm->total_in = strm->total_out = state->total = 0;
     strm->msg = Z_NULL;
-    strm->adler = 1;        /* to support ill-conceived Java test suite */
+    if (state->wrap)        /* to support ill-conceived Java test suite */
+        strm->adler = state->wrap & 1;
     state->mode = HEAD;
     state->last = 0;
     state->havedict = 0;
     state->dmax = 32768U;
     state->head = Z_NULL;
-    state->wsize = 0;
-    state->whave = 0;
-    state->write = 0;
     state->hold = 0;
     state->bits = 0;
     state->lencode = state->distcode = state->next = state->codes;
+    state->sane = 1;
+    state->back = -1;
     Tracev((stderr, "inflate: reset\n"));
     return Z_OK;
 }
 
-int ZEXPORT inflatePrime(strm, bits, value)
+int ZEXPORT inflateReset(strm)
 z_streamp strm;
-int bits;
-int value;
 {
     struct inflate_state FAR *state;
 
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
-    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1;
-    state->hold += value << state->bits;
-    state->bits += bits;
-    return Z_OK;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
+    return inflateResetKeep(strm);
+}
+
+int ZEXPORT inflateReset2(strm, windowBits)
+z_streamp strm;
+int windowBits;
+{
+    int wrap;
+    struct inflate_state FAR *state;
+
+    /* get the state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* extract wrap request from windowBits parameter */
+    if (windowBits < 0) {
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
+        wrap = (windowBits >> 4) + 1;
+#ifdef GUNZIP
+        if (windowBits < 48)
+            windowBits &= 15;
+#endif
+    }
+
+    /* set number of window bits, free window if different */
+    if (windowBits && (windowBits < 8 || windowBits > 15))
+        return Z_STREAM_ERROR;
+    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
+        ZFREE(strm, state->window);
+        state->window = Z_NULL;
+    }
+
+    /* update state and reset the rest of it */
+    state->wrap = wrap;
+    state->wbits = (unsigned)windowBits;
+    return inflateReset(strm);
 }
 
 int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
@@ -147,6 +183,7 @@ int windowBits;
 const char *version;
 int stream_size;
 {
+    int ret;
     struct inflate_state FAR *state;
 
     if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
@@ -155,33 +192,31 @@ int stream_size;
     if (strm == Z_NULL) return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
     state = (struct inflate_state FAR *)
             ZALLOC(strm, 1, sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
     Tracev((stderr, "inflate: allocated\n"));
     strm->state = (struct internal_state FAR *)state;
-    if (windowBits < 0) {
-        state->wrap = 0;
-        windowBits = -windowBits;
-    }
-    else {
-        state->wrap = (windowBits >> 4) + 1;
-#ifdef GUNZIP
-        if (windowBits < 48) windowBits &= 15;
-#endif
-    }
-    if (windowBits < 8 || windowBits > 15) {
+    state->window = Z_NULL;
+    ret = inflateReset2(strm, windowBits);
+    if (ret != Z_OK) {
         ZFREE(strm, state);
         strm->state = Z_NULL;
-        return Z_STREAM_ERROR;
     }
-    state->wbits = (unsigned)windowBits;
-    state->window = Z_NULL;
-    return inflateReset(strm);
+    return ret;
 }
 
 int ZEXPORT inflateInit_(strm, version, stream_size)
@@ -192,6 +227,27 @@ int stream_size;
     return inflateInit2_(strm, DEF_WBITS, version, stream_size);
 }
 
+int ZEXPORT inflatePrime(strm, bits, value)
+z_streamp strm;
+int bits;
+int value;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (bits < 0) {
+        state->hold = 0;
+        state->bits = 0;
+        return Z_OK;
+    }
+    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
+    value &= (1L << bits) - 1;
+    state->hold += value << state->bits;
+    state->bits += bits;
+    return Z_OK;
+}
+
 /*
    Return state with length and distance decoding tables and index sizes set to
    fixed code decoding.  Normally this returns fixed tables from inffixed.h.
@@ -286,8 +342,8 @@ void makefixed()
     low = 0;
     for (;;) {
         if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
-               state.lencode[low].val);
+        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+               state.lencode[low].bits, state.lencode[low].val);
         if (++low == size) break;
         putchar(',');
     }
@@ -320,12 +376,13 @@ void makefixed()
    output will fall in the output data, making match copies simpler and faster.
    The advantage may be dependent on the size of the processor's data caches.
  */
-local int updatewindow(strm, out)
+local int updatewindow(strm, end, copy)
 z_streamp strm;
-unsigned out;
+const Bytef *end;
+unsigned copy;
 {
     struct inflate_state FAR *state;
-    unsigned copy, dist;
+    unsigned dist;
 
     state = (struct inflate_state FAR *)strm->state;
 
@@ -340,30 +397,29 @@ unsigned out;
     /* if window not in use yet, initialize */
     if (state->wsize == 0) {
         state->wsize = 1U << state->wbits;
-        state->write = 0;
+        state->wnext = 0;
         state->whave = 0;
     }
 
     /* copy state->wsize or less output bytes into the circular window */
-    copy = out - strm->avail_out;
     if (copy >= state->wsize) {
-        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
-        state->write = 0;
+        zmemcpy(state->window, end - state->wsize, state->wsize);
+        state->wnext = 0;
         state->whave = state->wsize;
     }
     else {
-        dist = state->wsize - state->write;
+        dist = state->wsize - state->wnext;
         if (dist > copy) dist = copy;
-        zmemcpy(state->window + state->write, strm->next_out - copy, dist);
+        zmemcpy(state->window + state->wnext, end - copy, dist);
         copy -= dist;
         if (copy) {
-            zmemcpy(state->window, strm->next_out - copy, copy);
-            state->write = copy;
+            zmemcpy(state->window, end - copy, copy);
+            state->wnext = copy;
             state->whave = state->wsize;
         }
         else {
-            state->write += dist;
-            if (state->write == state->wsize) state->write = 0;
+            state->wnext += dist;
+            if (state->wnext == state->wsize) state->wnext = 0;
             if (state->whave < state->wsize) state->whave += dist;
         }
     }
@@ -464,11 +520,6 @@ unsigned out;
         bits -= bits & 7; \
     } while (0)
 
-/* Reverse the bytes in a 32-bit value */
-#define REVERSE(q) \
-    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
 /*
    inflate() uses a state machine to process as much input data and generate as
    much output data as possible before returning.  The state machine is
@@ -556,7 +607,7 @@ z_streamp strm;
 int flush;
 {
     struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
+    z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
     unsigned have, left;        /* available input and output */
     unsigned long hold;         /* bit buffer */
@@ -564,7 +615,7 @@ int flush;
     unsigned in, out;           /* save starting available input and output */
     unsigned copy;              /* number of stored or match bytes to copy */
     unsigned char FAR *from;    /* where to copy match bytes from */
-    code this;                  /* current decoding table entry */
+    code here;                  /* current decoding table entry */
     code last;                  /* parent table entry */
     unsigned len;               /* length to copy for repeats, bits to drop */
     int ret;                    /* return code */
@@ -619,7 +670,9 @@ int flush;
             }
             DROPBITS(4);
             len = BITS(4) + 8;
-            if (len > state->wbits) {
+            if (state->wbits == 0)
+                state->wbits = len;
+            else if (len > state->wbits) {
                 strm->msg = (char *)"invalid window size";
                 state->mode = BAD;
                 break;
@@ -760,7 +813,7 @@ int flush;
 #endif
         case DICTID:
             NEEDBITS(32);
-            strm->adler = state->check = REVERSE(hold);
+            strm->adler = state->check = ZSWAP32(hold);
             INITBITS();
             state->mode = DICT;
         case DICT:
@@ -771,7 +824,7 @@ int flush;
             strm->adler = state->check = adler32(0L, Z_NULL, 0);
             state->mode = TYPE;
         case TYPE:
-            if (flush == Z_BLOCK) goto inf_leave;
+            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
         case TYPEDO:
             if (state->last) {
                 BYTEBITS();
@@ -791,7 +844,11 @@ int flush;
                 fixedtables(state);
                 Tracev((stderr, "inflate:     fixed codes block%s\n",
                         state->last ? " (last)" : ""));
-                state->mode = LEN;              /* decode codes */
+                state->mode = LEN_;             /* decode codes */
+                if (flush == Z_TREES) {
+                    DROPBITS(2);
+                    goto inf_leave;
+                }
                 break;
             case 2:                             /* dynamic block */
                 Tracev((stderr, "inflate:     dynamic codes block%s\n",
@@ -816,6 +873,9 @@ int flush;
             Tracev((stderr, "inflate:       stored length %u\n",
                     state->length));
             INITBITS();
+            state->mode = COPY_;
+            if (flush == Z_TREES) goto inf_leave;
+        case COPY_:
             state->mode = COPY;
         case COPY:
             copy = state->length;
@@ -861,7 +921,7 @@ int flush;
             while (state->have < 19)
                 state->lens[order[state->have++]] = 0;
             state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
+            state->lencode = (const code FAR *)(state->next);
             state->lenbits = 7;
             ret = inflate_table(CODES, state->lens, 19, &(state->next),
                                 &(state->lenbits), state->work);
@@ -876,19 +936,18 @@ int flush;
         case CODELENS:
             while (state->have < state->nlen + state->ndist) {
                 for (;;) {
-                    this = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(this.bits) <= bits) break;
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
                     PULLBYTE();
                 }
-                if (this.val < 16) {
-                    NEEDBITS(this.bits);
-                    DROPBITS(this.bits);
-                    state->lens[state->have++] = this.val;
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
                 }
                 else {
-                    if (this.val == 16) {
-                        NEEDBITS(this.bits + 2);
-                        DROPBITS(this.bits);
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
                         if (state->have == 0) {
                             strm->msg = (char *)"invalid bit length repeat";
                             state->mode = BAD;
@@ -898,16 +957,16 @@ int flush;
                         copy = 3 + BITS(2);
                         DROPBITS(2);
                     }
-                    else if (this.val == 17) {
-                        NEEDBITS(this.bits + 3);
-                        DROPBITS(this.bits);
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
                         len = 0;
                         copy = 3 + BITS(3);
                         DROPBITS(3);
                     }
                     else {
-                        NEEDBITS(this.bits + 7);
-                        DROPBITS(this.bits);
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
                         len = 0;
                         copy = 11 + BITS(7);
                         DROPBITS(7);
@@ -925,9 +984,18 @@ int flush;
             /* handle error breaks in while */
             if (state->mode == BAD) break;
 
-            /* build code tables */
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
             state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
+            state->lencode = (const code FAR *)(state->next);
             state->lenbits = 9;
             ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
                                 &(state->lenbits), state->work);
@@ -936,7 +1004,7 @@ int flush;
                 state->mode = BAD;
                 break;
             }
-            state->distcode = (code const FAR *)(state->next);
+            state->distcode = (const code FAR *)(state->next);
             state->distbits = 6;
             ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
                             &(state->next), &(state->distbits), state->work);
@@ -946,88 +1014,102 @@ int flush;
                 break;
             }
             Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN_;
+            if (flush == Z_TREES) goto inf_leave;
+        case LEN_:
             state->mode = LEN;
         case LEN:
             if (have >= 6 && left >= 258) {
                 RESTORE();
                 inflate_fast(strm, out);
                 LOAD();
+                if (state->mode == TYPE)
+                    state->back = -1;
                 break;
             }
+            state->back = 0;
             for (;;) {
-                this = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(this.bits) <= bits) break;
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
                 PULLBYTE();
             }
-            if (this.op && (this.op & 0xf0) == 0) {
-                last = this;
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
                 for (;;) {
-                    this = state->lencode[last.val +
+                    here = state->lencode[last.val +
                             (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
                     PULLBYTE();
                 }
                 DROPBITS(last.bits);
+                state->back += last.bits;
             }
-            DROPBITS(this.bits);
-            state->length = (unsigned)this.val;
-            if ((int)(this.op) == 0) {
-                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            state->length = (unsigned)here.val;
+            if ((int)(here.op) == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
                         "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", this.val));
+                        "inflate:         literal 0x%02x\n", here.val));
                 state->mode = LIT;
                 break;
             }
-            if (this.op & 32) {
+            if (here.op & 32) {
                 Tracevv((stderr, "inflate:         end of block\n"));
+                state->back = -1;
                 state->mode = TYPE;
                 break;
             }
-            if (this.op & 64) {
+            if (here.op & 64) {
                 strm->msg = (char *)"invalid literal/length code";
                 state->mode = BAD;
                 break;
             }
-            state->extra = (unsigned)(this.op) & 15;
+            state->extra = (unsigned)(here.op) & 15;
             state->mode = LENEXT;
         case LENEXT:
             if (state->extra) {
                 NEEDBITS(state->extra);
                 state->length += BITS(state->extra);
                 DROPBITS(state->extra);
+                state->back += state->extra;
             }
             Tracevv((stderr, "inflate:         length %u\n", state->length));
+            state->was = state->length;
             state->mode = DIST;
         case DIST:
             for (;;) {
-                this = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(this.bits) <= bits) break;
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
                 PULLBYTE();
             }
-            if ((this.op & 0xf0) == 0) {
-                last = this;
+            if ((here.op & 0xf0) == 0) {
+                last = here;
                 for (;;) {
-                    this = state->distcode[last.val +
+                    here = state->distcode[last.val +
                             (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
                     PULLBYTE();
                 }
                 DROPBITS(last.bits);
+                state->back += last.bits;
             }
-            DROPBITS(this.bits);
-            if (this.op & 64) {
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            if (here.op & 64) {
                 strm->msg = (char *)"invalid distance code";
                 state->mode = BAD;
                 break;
             }
-            state->offset = (unsigned)this.val;
-            state->extra = (unsigned)(this.op) & 15;
+            state->offset = (unsigned)here.val;
+            state->extra = (unsigned)(here.op) & 15;
             state->mode = DISTEXT;
         case DISTEXT:
             if (state->extra) {
                 NEEDBITS(state->extra);
                 state->offset += BITS(state->extra);
                 DROPBITS(state->extra);
+                state->back += state->extra;
             }
 #ifdef INFLATE_STRICT
             if (state->offset > state->dmax) {
@@ -1036,11 +1118,6 @@ int flush;
                 break;
             }
 #endif
-            if (state->offset > state->whave + out - left) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
             Tracevv((stderr, "inflate:         distance %u\n", state->offset));
             state->mode = MATCH;
         case MATCH:
@@ -1048,12 +1125,32 @@ int flush;
             copy = out - left;
             if (state->offset > copy) {         /* copy from window */
                 copy = state->offset - copy;
-                if (copy > state->write) {
-                    copy -= state->write;
+                if (copy > state->whave) {
+                    if (state->sane) {
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
+                    }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                    Trace((stderr, "inflate.c too far\n"));
+                    copy -= state->whave;
+                    if (copy > state->length) copy = state->length;
+                    if (copy > left) copy = left;
+                    left -= copy;
+                    state->length -= copy;
+                    do {
+                        *put++ = 0;
+                    } while (--copy);
+                    if (state->length == 0) state->mode = LEN;
+                    break;
+#endif
+                }
+                if (copy > state->wnext) {
+                    copy -= state->wnext;
                     from = state->window + (state->wsize - copy);
                 }
                 else
-                    from = state->window + (state->write - copy);
+                    from = state->window + (state->wnext - copy);
                 if (copy > state->length) copy = state->length;
             }
             else {                              /* copy from output */
@@ -1088,7 +1185,7 @@ int flush;
 #ifdef GUNZIP
                      state->flags ? hold :
 #endif
-                     REVERSE(hold)) != state->check) {
+                     ZSWAP32(hold)) != state->check) {
                     strm->msg = (char *)"incorrect data check";
                     state->mode = BAD;
                     break;
@@ -1132,8 +1229,9 @@ int flush;
      */
   inf_leave:
     RESTORE();
-    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
-        if (updatewindow(strm, out)) {
+    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+            (state->mode < CHECK || flush != Z_FINISH)))
+        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
             state->mode = MEM;
             return Z_MEM_ERROR;
         }
@@ -1146,7 +1244,8 @@ int flush;
         strm->adler = state->check =
             UPDATE(state->check, strm->next_out - out, out);
     strm->data_type = state->bits + (state->last ? 64 : 0) +
-                      (state->mode == TYPE ? 128 : 0);
+                      (state->mode == TYPE ? 128 : 0) +
+                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
     if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
         ret = Z_BUF_ERROR;
     return ret;
@@ -1166,13 +1265,37 @@ z_streamp strm;
     return Z_OK;
 }
 
+int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+Bytef *dictionary;
+uInt *dictLength;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* copy dictionary */
+    if (state->whave && dictionary != Z_NULL) {
+        zmemcpy(dictionary, state->window + state->wnext,
+                state->whave - state->wnext);
+        zmemcpy(dictionary + state->whave - state->wnext,
+                state->window, state->wnext);
+    }
+    if (dictLength != Z_NULL)
+        *dictLength = state->whave;
+    return Z_OK;
+}
+
 int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
 z_streamp strm;
 const Bytef *dictionary;
 uInt dictLength;
 {
     struct inflate_state FAR *state;
-    unsigned long id;
+    unsigned long dictid;
+    int ret;
 
     /* check state */
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
@@ -1180,29 +1303,21 @@ uInt dictLength;
     if (state->wrap != 0 && state->mode != DICT)
         return Z_STREAM_ERROR;
 
-    /* check for correct dictionary id */
+    /* check for correct dictionary identifier */
     if (state->mode == DICT) {
-        id = adler32(0L, Z_NULL, 0);
-        id = adler32(id, dictionary, dictLength);
-        if (id != state->check)
+        dictid = adler32(0L, Z_NULL, 0);
+        dictid = adler32(dictid, dictionary, dictLength);
+        if (dictid != state->check)
             return Z_DATA_ERROR;
     }
 
-    /* copy dictionary to window */
-    if (updatewindow(strm, strm->avail_out)) {
+    /* copy dictionary to window using updatewindow(), which will amend the
+       existing dictionary if appropriate */
+    ret = updatewindow(strm, dictionary + dictLength, dictLength);
+    if (ret) {
         state->mode = MEM;
         return Z_MEM_ERROR;
     }
-    if (dictLength > state->wsize) {
-        zmemcpy(state->window, dictionary + dictLength - state->wsize,
-                state->wsize);
-        state->whave = state->wsize;
-    }
-    else {
-        zmemcpy(state->window + state->wsize - dictLength, dictionary,
-                dictLength);
-        state->whave = dictLength;
-    }
     state->havedict = 1;
     Tracev((stderr, "inflate:   dictionary set\n"));
     return Z_OK;
@@ -1238,7 +1353,7 @@ gz_headerp head;
  */
 local unsigned syncsearch(have, buf, len)
 unsigned FAR *have;
-unsigned char FAR *buf;
+const unsigned char FAR *buf;
 unsigned len;
 {
     unsigned got;
@@ -1350,8 +1465,8 @@ z_streamp source;
     }
 
     /* copy state */
-    zmemcpy(dest, source, sizeof(z_stream));
-    zmemcpy(copy, state, sizeof(struct inflate_state));
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
     if (state->lencode >= state->codes &&
         state->lencode <= state->codes + ENOUGH - 1) {
         copy->lencode = copy->codes + (state->lencode - state->codes);
@@ -1366,3 +1481,32 @@ z_streamp source;
     dest->state = (struct internal_state FAR *)copy;
     return Z_OK;
 }
+
+int ZEXPORT inflateUndermine(strm, subvert)
+z_streamp strm;
+int subvert;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    state->sane = !subvert;
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+    return Z_OK;
+#else
+    state->sane = 1;
+    return Z_DATA_ERROR;
+#endif
+}
+
+long ZEXPORT inflateMark(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
+    state = (struct inflate_state FAR *)strm->state;
+    return ((long)(state->back) << 16) +
+        (state->mode == COPY ? state->length :
+            (state->mode == MATCH ? state->was - state->length : 0));
+}
diff --git a/dep/src/zlib/inflate.h b/dep/src/zlib/inflate.h
index 07bd3e78a7c..95f4986d400 100644
--- a/dep/src/zlib/inflate.h
+++ b/dep/src/zlib/inflate.h
@@ -1,5 +1,5 @@
 /* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2004 Mark Adler
+ * Copyright (C) 1995-2009 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -32,11 +32,13 @@ typedef enum {
         TYPE,       /* i: waiting for type bits, including last-flag bit */
         TYPEDO,     /* i: same, but skip check to exit inflate on new block */
         STORED,     /* i: waiting for stored size (length and complement) */
+        COPY_,      /* i/o: same as COPY below, but only first time in */
         COPY,       /* i/o: waiting for input or output to copy stored block */
         TABLE,      /* i: waiting for dynamic block table lengths */
         LENLENS,    /* i: waiting for code length code lengths */
         CODELENS,   /* i: waiting for length/lit and distance code lengths */
-            LEN,        /* i: waiting for length/lit code */
+            LEN_,       /* i: same as LEN below, but only first time in */
+            LEN,        /* i: waiting for length/lit/eob code */
             LENEXT,     /* i: waiting for length extra bits */
             DIST,       /* i: waiting for distance code */
             DISTEXT,    /* i: waiting for distance extra bits */
@@ -53,19 +55,21 @@ typedef enum {
 /*
     State transitions between above modes -
 
-    (most modes can go to the BAD or MEM mode -- not shown for clarity)
+    (most modes can go to BAD or MEM on error -- not shown for clarity)
 
     Process header:
-        HEAD -> (gzip) or (zlib)
-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
-        NAME -> COMMENT -> HCRC -> TYPE
+        HEAD -> (gzip) or (zlib) or (raw)
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
+                  HCRC -> TYPE
         (zlib) -> DICTID or TYPE
         DICTID -> DICT -> TYPE
+        (raw) -> TYPEDO
     Read deflate blocks:
-            TYPE -> STORED or TABLE or LEN or CHECK
-            STORED -> COPY -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN
-    Read deflate codes:
+            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
+            STORED -> COPY_ -> COPY -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN_
+            LEN_ -> LEN
+    Read deflate codes in fixed or dynamic block:
                 LEN -> LENEXT or LIT or TYPE
                 LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
                 LIT -> LEN
@@ -73,7 +77,7 @@ typedef enum {
         CHECK -> LENGTH -> DONE
  */
 
-/* state maintained between inflate() calls.  Approximately 7K bytes. */
+/* state maintained between inflate() calls.  Approximately 10K bytes. */
 struct inflate_state {
     inflate_mode mode;          /* current inflate mode */
     int last;                   /* true if processing last block */
@@ -88,7 +92,7 @@ struct inflate_state {
     unsigned wbits;             /* log base 2 of requested window size */
     unsigned wsize;             /* window size or zero if not using window */
     unsigned whave;             /* valid bytes in the window */
-    unsigned write;             /* window write index */
+    unsigned wnext;             /* window write index */
     unsigned char FAR *window;  /* allocated sliding window, if needed */
         /* bit accumulator */
     unsigned long hold;         /* input bit accumulator */
@@ -112,4 +116,7 @@ struct inflate_state {
     unsigned short lens[320];   /* temporary storage for code lengths */
     unsigned short work[288];   /* work area for code table building */
     code codes[ENOUGH];         /* space for code tables */
+    int sane;                   /* if false, allow invalid distance too far */
+    int back;                   /* bits back of last unprocessed length/lit */
+    unsigned was;               /* initial length of match */
 };
diff --git a/dep/src/zlib/inftrees.c b/dep/src/zlib/inftrees.c
index 8a9c13ff03d..44d89cf24e1 100644
--- a/dep/src/zlib/inftrees.c
+++ b/dep/src/zlib/inftrees.c
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2005 Mark Adler
+ * Copyright (C) 1995-2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
+   " inflate 1.2.8 Copyright 1995-2013 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -29,7 +29,7 @@ const char inflate_copyright[] =
    table index bits.  It will differ if the request is greater than the
    longest code or if it is less than the shortest code.
  */
-int inflate_table(type, lens, codes, table, bits, work)
+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
 codetype type;
 unsigned short FAR *lens;
 unsigned codes;
@@ -50,7 +50,7 @@ unsigned short FAR *work;
     unsigned fill;              /* index for replicating entries */
     unsigned low;               /* low bits for current root entry */
     unsigned mask;              /* mask for low root bits */
-    code this;                  /* table entry for duplication */
+    code here;                  /* table entry for duplication */
     code FAR *next;             /* next available space in table */
     const unsigned short FAR *base;     /* base value table to use */
     const unsigned short FAR *extra;    /* extra bits table to use */
@@ -62,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
@@ -115,15 +115,15 @@ unsigned short FAR *work;
         if (count[max] != 0) break;
     if (root > max) root = max;
     if (max == 0) {                     /* no symbols to code at all */
-        this.op = (unsigned char)64;    /* invalid code marker */
-        this.bits = (unsigned char)1;
-        this.val = (unsigned short)0;
-        *(*table)++ = this;             /* make a table to force an error */
-        *(*table)++ = this;
+        here.op = (unsigned char)64;    /* invalid code marker */
+        here.bits = (unsigned char)1;
+        here.val = (unsigned short)0;
+        *(*table)++ = here;             /* make a table to force an error */
+        *(*table)++ = here;
         *bits = 1;
         return 0;     /* no symbols, but wait for decoding to report error */
     }
-    for (min = 1; min <= MAXBITS; min++)
+    for (min = 1; min < max; min++)
         if (count[min] != 0) break;
     if (root < min) root = min;
 
@@ -166,11 +166,10 @@ unsigned short FAR *work;
        entered in the tables.
 
        used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked when a LENS table is being made
-       against the space in *table, ENOUGH, minus the maximum space needed by
-       the worst case distance code, MAXD.  This should never happen, but the
-       sufficiency of ENOUGH has not been proven exhaustively, hence the check.
-       This assumes that when type == LENS, bits == 9.
+       provided *table space.  It is checked for LENS and DIST tables against
+       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
+       the initial root table size constants.  See the comments in inftrees.h
+       for more information.
 
        sym increments through all symbols, and the loop terminates when
        all codes of length max, i.e. all codes, have been processed.  This
@@ -209,24 +208,25 @@ unsigned short FAR *work;
     mask = used - 1;            /* mask for comparing low */
 
     /* check available table space */
-    if (type == LENS && used >= ENOUGH - MAXD)
+    if ((type == LENS && used > ENOUGH_LENS) ||
+        (type == DISTS && used > ENOUGH_DISTS))
         return 1;
 
     /* process all codes and make table entries */
     for (;;) {
         /* create table entry */
-        this.bits = (unsigned char)(len - drop);
+        here.bits = (unsigned char)(len - drop);
         if ((int)(work[sym]) < end) {
-            this.op = (unsigned char)0;
-            this.val = work[sym];
+            here.op = (unsigned char)0;
+            here.val = work[sym];
         }
         else if ((int)(work[sym]) > end) {
-            this.op = (unsigned char)(extra[work[sym]]);
-            this.val = base[work[sym]];
+            here.op = (unsigned char)(extra[work[sym]]);
+            here.val = base[work[sym]];
         }
         else {
-            this.op = (unsigned char)(32 + 64);         /* end of block */
-            this.val = 0;
+            here.op = (unsigned char)(32 + 64);         /* end of block */
+            here.val = 0;
         }
 
         /* replicate for those indices with low len bits equal to huff */
@@ -235,7 +235,7 @@ unsigned short FAR *work;
         min = fill;                 /* save offset to next table */
         do {
             fill -= incr;
-            next[(huff >> drop) + fill] = this;
+            next[(huff >> drop) + fill] = here;
         } while (fill != 0);
 
         /* backwards increment the len-bit code huff */
@@ -277,7 +277,8 @@ unsigned short FAR *work;
 
             /* check for enough space */
             used += 1U << curr;
-            if (type == LENS && used >= ENOUGH - MAXD)
+            if ((type == LENS && used > ENOUGH_LENS) ||
+                (type == DISTS && used > ENOUGH_DISTS))
                 return 1;
 
             /* point entry in root table to sub-table */
@@ -288,38 +289,14 @@ unsigned short FAR *work;
         }
     }
 
-    /*
-       Fill in rest of table for incomplete codes.  This loop is similar to the
-       loop above in incrementing huff for table indices.  It is assumed that
-       len is equal to curr + drop, so there is no loop needed to increment
-       through high index bits.  When the current sub-table is filled, the loop
-       drops back to the root table to fill in any remaining entries there.
-     */
-    this.op = (unsigned char)64;                /* invalid code marker */
-    this.bits = (unsigned char)(len - drop);
-    this.val = (unsigned short)0;
-    while (huff != 0) {
-        /* when done with sub-table, drop back to root table */
-        if (drop != 0 && (huff & mask) != low) {
-            drop = 0;
-            len = root;
-            next = *table;
-            this.bits = (unsigned char)len;
-        }
-
-        /* put invalid code marker in table */
-        next[huff >> drop] = this;
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
+    /* fill in remaining table entry if code is incomplete (guaranteed to have
+       at most one remaining entry, since if the code is incomplete, the
+       maximum code length that was allowed to get this far is one bit) */
+    if (huff != 0) {
+        here.op = (unsigned char)64;            /* invalid code marker */
+        here.bits = (unsigned char)(len - drop);
+        here.val = (unsigned short)0;
+        next[huff] = here;
     }
 
     /* set return parameters */
diff --git a/dep/src/zlib/inftrees.h b/dep/src/zlib/inftrees.h
index b1104c87e76..baa53a0b1a1 100644
--- a/dep/src/zlib/inftrees.h
+++ b/dep/src/zlib/inftrees.h
@@ -1,5 +1,5 @@
 /* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005 Mark Adler
+ * Copyright (C) 1995-2005, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -35,21 +35,28 @@ typedef struct {
     01000000 - invalid code
  */
 
-/* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1444 code structures (852 for length/literals
-   and 592 for distances, the latter actually the result of an
-   exhaustive search).  The true maximum is not known, but the value
-   below is more than safe. */
-#define ENOUGH 2048
-#define MAXD 592
+/* Maximum size of the dynamic table.  The maximum number of code structures is
+   1444, which is the sum of 852 for literal/length codes and 592 for distance
+   codes.  These values were found by exhaustive searches using the program
+   examples/enough.c found in the zlib distribtution.  The arguments to that
+   program are the number of symbols, the initial root table size, and the
+   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
+   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
+   The initial root table size (9 or 6) is found in the fifth argument of the
+   inflate_table() calls in inflate.c and infback.c.  If the root table size is
+   changed, then these maximum sizes would be need to be recalculated and
+   updated. */
+#define ENOUGH_LENS 852
+#define ENOUGH_DISTS 592
+#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
 
-/* Type of code to build for inftable() */
+/* Type of code to build for inflate_table() */
 typedef enum {
     CODES,
     LENS,
     DISTS
 } codetype;
 
-extern int inflate_table OF((codetype type, unsigned short FAR *lens,
+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
                              unsigned codes, code FAR * FAR *table,
                              unsigned FAR *bits, unsigned short FAR *work));
diff --git a/dep/src/zlib/trees.c b/dep/src/zlib/trees.c
index 395e4e16814..1fd7759ef00 100644
--- a/dep/src/zlib/trees.c
+++ b/dep/src/zlib/trees.c
@@ -1,5 +1,6 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2005 Jean-loup Gailly
+ * Copyright (C) 1995-2012 Jean-loup Gailly
+ * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -73,11 +74,6 @@ local const uch bl_order[BL_CODES]
  * probability, to avoid transmitting the lengths for unused bit length codes.
  */
 
-#define Buf_size (8 * 2*sizeof(char))
-/* Number of bits used within bi_buf. (bi_buf might be implemented on
- * more than 16 bits on some systems.)
- */
-
 /* ===========================================================================
  * Local data. These are initialized only once.
  */
@@ -150,9 +146,9 @@ local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
 local int  build_bl_tree  OF((deflate_state *s));
 local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
                               int blcodes));
-local void compress_block OF((deflate_state *s, ct_data *ltree,
-                              ct_data *dtree));
-local void set_data_type  OF((deflate_state *s));
+local void compress_block OF((deflate_state *s, const ct_data *ltree,
+                              const ct_data *dtree));
+local int  detect_data_type OF((deflate_state *s));
 local unsigned bi_reverse OF((unsigned value, int length));
 local void bi_windup      OF((deflate_state *s));
 local void bi_flush       OF((deflate_state *s));
@@ -203,12 +199,12 @@ local void send_bits(s, value, length)
      * unused bits in value.
      */
     if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (value << s->bi_valid);
+        s->bi_buf |= (ush)value << s->bi_valid;
         put_short(s, s->bi_buf);
         s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
         s->bi_valid += length - Buf_size;
     } else {
-        s->bi_buf |= value << s->bi_valid;
+        s->bi_buf |= (ush)value << s->bi_valid;
         s->bi_valid += length;
     }
 }
@@ -218,12 +214,12 @@ local void send_bits(s, value, length)
 { int len = length;\
   if (s->bi_valid > (int)Buf_size - len) {\
     int val = value;\
-    s->bi_buf |= (val << s->bi_valid);\
+    s->bi_buf |= (ush)val << s->bi_valid;\
     put_short(s, s->bi_buf);\
     s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
     s->bi_valid += len - Buf_size;\
   } else {\
-    s->bi_buf |= (value) << s->bi_valid;\
+    s->bi_buf |= (ush)(value) << s->bi_valid;\
     s->bi_valid += len;\
   }\
 }
@@ -250,11 +246,13 @@ local void tr_static_init()
     if (static_init_done) return;
 
     /* For some embedded targets, global variables are not initialized: */
+#ifdef NO_INIT_GLOBAL_POINTERS
     static_l_desc.static_tree = static_ltree;
     static_l_desc.extra_bits = extra_lbits;
     static_d_desc.static_tree = static_dtree;
     static_d_desc.extra_bits = extra_dbits;
     static_bl_desc.extra_bits = extra_blbits;
+#endif
 
     /* Initialize the mapping length (0..255) -> length code (0..28) */
     length = 0;
@@ -348,13 +346,14 @@ void gen_trees_header()
                 static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
     }
 
-    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
+    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
     for (i = 0; i < DIST_CODE_LEN; i++) {
         fprintf(header, "%2u%s", _dist_code[i],
                 SEPARATOR(i, DIST_CODE_LEN-1, 20));
     }
 
-    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    fprintf(header,
+        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
     for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
         fprintf(header, "%2u%s", _length_code[i],
                 SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
@@ -379,7 +378,7 @@ void gen_trees_header()
 /* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */
-void _tr_init(s)
+void ZLIB_INTERNAL _tr_init(s)
     deflate_state *s;
 {
     tr_static_init();
@@ -395,7 +394,6 @@ void _tr_init(s)
 
     s->bi_buf = 0;
     s->bi_valid = 0;
-    s->last_eob_len = 8; /* enough lookahead for inflate */
 #ifdef DEBUG
     s->compressed_len = 0L;
     s->bits_sent = 0L;
@@ -864,13 +862,13 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
 /* ===========================================================================
  * Send a stored block
  */
-void _tr_stored_block(s, buf, stored_len, eof)
+void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
     deflate_state *s;
     charf *buf;       /* input block */
     ulg stored_len;   /* length of input block */
-    int eof;          /* true if this is the last block for a file */
+    int last;         /* one if this is the last block for a file */
 {
-    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
+    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
 #ifdef DEBUG
     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
@@ -878,18 +876,20 @@ void _tr_stored_block(s, buf, stored_len, eof)
     copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
 }
 
+/* ===========================================================================
+ * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
+ */
+void ZLIB_INTERNAL _tr_flush_bits(s)
+    deflate_state *s;
+{
+    bi_flush(s);
+}
+
 /* ===========================================================================
  * Send one empty static block to give enough lookahead for inflate.
  * This takes 10 bits, of which 7 may remain in the bit buffer.
- * The current inflate code requires 9 bits of lookahead. If the
- * last two codes for the previous block (real code plus EOB) were coded
- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
- * the last real code. In this case we send two empty static blocks instead
- * of one. (There are no problems if the previous block is stored or fixed.)
- * To simplify the code, we assume the worst case of last real code encoded
- * on one bit only.
  */
-void _tr_align(s)
+void ZLIB_INTERNAL _tr_align(s)
     deflate_state *s;
 {
     send_bits(s, STATIC_TREES<<1, 3);
@@ -898,31 +898,17 @@ void _tr_align(s)
     s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
 #endif
     bi_flush(s);
-    /* Of the 10 bits for the empty block, we have already sent
-     * (10 - bi_valid) bits. The lookahead for the last real code (before
-     * the EOB of the previous block) was thus at least one plus the length
-     * of the EOB plus what we have just sent of the empty static block.
-     */
-    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
-        send_bits(s, STATIC_TREES<<1, 3);
-        send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-        s->compressed_len += 10L;
-#endif
-        bi_flush(s);
-    }
-    s->last_eob_len = 7;
 }
 
 /* ===========================================================================
  * Determine the best encoding for the current block: dynamic trees, static
  * trees or store, and output the encoded block to the zip file.
  */
-void _tr_flush_block(s, buf, stored_len, eof)
+void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
     deflate_state *s;
     charf *buf;       /* input block, or NULL if too old */
     ulg stored_len;   /* length of input block */
-    int eof;          /* true if this is the last block for a file */
+    int last;         /* one if this is the last block for a file */
 {
     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
     int max_blindex = 0;  /* index of last bit length code of non zero freq */
@@ -931,8 +917,8 @@ void _tr_flush_block(s, buf, stored_len, eof)
     if (s->level > 0) {
 
         /* Check if the file is binary or text */
-        if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN)
-            set_data_type(s);
+        if (s->strm->data_type == Z_UNKNOWN)
+            s->strm->data_type = detect_data_type(s);
 
         /* Construct the literal and distance trees */
         build_tree(s, (tree_desc *)(&(s->l_desc)));
@@ -978,23 +964,25 @@ void _tr_flush_block(s, buf, stored_len, eof)
          * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
          * transform a block into a stored block.
          */
-        _tr_stored_block(s, buf, stored_len, eof);
+        _tr_stored_block(s, buf, stored_len, last);
 
 #ifdef FORCE_STATIC
     } else if (static_lenb >= 0) { /* force static trees */
 #else
     } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
 #endif
-        send_bits(s, (STATIC_TREES<<1)+eof, 3);
-        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
+        send_bits(s, (STATIC_TREES<<1)+last, 3);
+        compress_block(s, (const ct_data *)static_ltree,
+                       (const ct_data *)static_dtree);
 #ifdef DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
     } else {
-        send_bits(s, (DYN_TREES<<1)+eof, 3);
+        send_bits(s, (DYN_TREES<<1)+last, 3);
         send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
                        max_blindex+1);
-        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
+        compress_block(s, (const ct_data *)s->dyn_ltree,
+                       (const ct_data *)s->dyn_dtree);
 #ifdef DEBUG
         s->compressed_len += 3 + s->opt_len;
 #endif
@@ -1005,21 +993,21 @@ void _tr_flush_block(s, buf, stored_len, eof)
      */
     init_block(s);
 
-    if (eof) {
+    if (last) {
         bi_windup(s);
 #ifdef DEBUG
         s->compressed_len += 7;  /* align on byte boundary */
 #endif
     }
     Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*eof));
+           s->compressed_len-7*last));
 }
 
 /* ===========================================================================
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
-int _tr_tally (s, dist, lc)
+int ZLIB_INTERNAL _tr_tally (s, dist, lc)
     deflate_state *s;
     unsigned dist;  /* distance of matched string */
     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
@@ -1071,8 +1059,8 @@ int _tr_tally (s, dist, lc)
  */
 local void compress_block(s, ltree, dtree)
     deflate_state *s;
-    ct_data *ltree; /* literal tree */
-    ct_data *dtree; /* distance tree */
+    const ct_data *ltree; /* literal tree */
+    const ct_data *dtree; /* distance tree */
 {
     unsigned dist;      /* distance of matched string */
     int lc;             /* match length or unmatched char (if dist == 0) */
@@ -1114,28 +1102,48 @@ local void compress_block(s, ltree, dtree)
     } while (lx < s->last_lit);
 
     send_code(s, END_BLOCK, ltree);
-    s->last_eob_len = ltree[END_BLOCK].Len;
 }
 
 /* ===========================================================================
- * Set the data type to BINARY or TEXT, using a crude approximation:
- * set it to Z_TEXT if all symbols are either printable characters (33 to 255)
- * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise.
+ * Check if the data type is TEXT or BINARY, using the following algorithm:
+ * - TEXT if the two conditions below are satisfied:
+ *    a) There are no non-portable control characters belonging to the
+ *       "black list" (0..6, 14..25, 28..31).
+ *    b) There is at least one printable character belonging to the
+ *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
+ * - BINARY otherwise.
+ * - The following partially-portable control characters form a
+ *   "gray list" that is ignored in this detection algorithm:
+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
  * IN assertion: the fields Freq of dyn_ltree are set.
  */
-local void set_data_type(s)
+local int detect_data_type(s)
     deflate_state *s;
 {
+    /* black_mask is the bit mask of black-listed bytes
+     * set bits 0..6, 14..25, and 28..31
+     * 0xf3ffc07f = binary 11110011111111111100000001111111
+     */
+    unsigned long black_mask = 0xf3ffc07fUL;
     int n;
 
-    for (n = 0; n < 9; n++)
+    /* Check for non-textual ("black-listed") bytes. */
+    for (n = 0; n <= 31; n++, black_mask >>= 1)
+        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
+            return Z_BINARY;
+
+    /* Check for textual ("white-listed") bytes. */
+    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
+            || s->dyn_ltree[13].Freq != 0)
+        return Z_TEXT;
+    for (n = 32; n < LITERALS; n++)
         if (s->dyn_ltree[n].Freq != 0)
-            break;
-    if (n == 9)
-        for (n = 14; n < 32; n++)
-            if (s->dyn_ltree[n].Freq != 0)
-                break;
-    s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY;
+            return Z_TEXT;
+
+    /* There are no "black-listed" or "white-listed" bytes:
+     * this stream either is empty or has tolerated ("gray-listed") bytes only.
+     */
+    return Z_BINARY;
 }
 
 /* ===========================================================================
@@ -1201,7 +1209,6 @@ local void copy_block(s, buf, len, header)
     int      header;  /* true if block header must be written */
 {
     bi_windup(s);        /* align on byte boundary */
-    s->last_eob_len = 8; /* enough lookahead for inflate */
 
     if (header) {
         put_short(s, (ush)len);
diff --git a/dep/src/zlib/trees.h b/dep/src/zlib/trees.h
index 72facf900f7..d35639d82a2 100644
--- a/dep/src/zlib/trees.h
+++ b/dep/src/zlib/trees.h
@@ -70,7 +70,7 @@ local const ct_data static_dtree[D_CODES] = {
 {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
 };
 
-const uch _dist_code[DIST_CODE_LEN] = {
+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
  0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
@@ -99,7 +99,7 @@ const uch _dist_code[DIST_CODE_LEN] = {
 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
 };
 
-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
  0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
diff --git a/dep/src/zlib/uncompr.c b/dep/src/zlib/uncompr.c
index b59e3d0defb..242e9493dff 100644
--- a/dep/src/zlib/uncompr.c
+++ b/dep/src/zlib/uncompr.c
@@ -1,5 +1,5 @@
 /* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * Copyright (C) 1995-2003, 2010 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -16,8 +16,6 @@
    been saved previously by the compressor and transmitted to the decompressor
    by some mechanism outside the scope of this compression library.)
    Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -32,7 +30,7 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen)
     z_stream stream;
     int err;
 
-    stream.next_in = (Bytef*)source;
+    stream.next_in = (z_const Bytef *)source;
     stream.avail_in = (uInt)sourceLen;
     /* Check for source > 64K on 16-bit machine: */
     if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
diff --git a/dep/src/zlib/zconf.h b/dep/src/zlib/zconf.h
index 03a9431c8be..9987a775530 100644
--- a/dep/src/zlib/zconf.h
+++ b/dep/src/zlib/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -11,52 +11,145 @@
 /*
  * If you *really* need a unique prefix for all types and library functions,
  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
  */
-#ifdef Z_PREFIX
-#  define deflateInit_          z_deflateInit_
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
+
+/* all linked symbols */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
 #  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd
-#  define inflateInit_          z_inflateInit_
-#  define inflate               z_inflate
-#  define inflateEnd            z_inflateEnd
 #  define deflateInit2_         z_deflateInit2_
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateCopy           z_deflateCopy
-#  define deflateReset          z_deflateReset
+#  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
-#  define deflateBound          z_deflateBound
+#  define deflatePending        z_deflatePending
 #  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzvprintf             z_gzvprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzwrite               z_gzwrite
+#  endif
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetHeader      z_inflateGetHeader
 #  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
 #  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateCopy           z_inflateCopy
-#  define inflateReset          z_inflateReset
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  define uncompress            z_uncompress
-#  define adler32               z_adler32
-#  define crc32                 z_crc32
-#  define get_crc_table         z_get_crc_table
+#  define inflateUndermine      z_inflateUndermine
+#  define inflateResetKeep      z_inflateResetKeep
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#  endif
 #  define zError                z_zError
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
 
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
 #  define alloc_func            z_alloc_func
+#  define charf                 z_charf
 #  define free_func             z_free_func
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
 #  define in_func               z_in_func
+#  define intf                  z_intf
 #  define out_func              z_out_func
-#  define Byte                  z_Byte
 #  define uInt                  z_uInt
-#  define uLong                 z_uLong
-#  define Bytef                 z_Bytef
-#  define charf                 z_charf
-#  define intf                  z_intf
 #  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
 #  define uLongf                z_uLongf
-#  define voidpf                z_voidpf
 #  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
 #endif
 
 #if defined(__MSDOS__) && !defined(MSDOS)
@@ -125,6 +218,12 @@
 #  endif
 #endif
 
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
 /* Some Mac compilers merge all .h files incorrectly: */
 #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
 #  define NO_DUMMY_DECL
@@ -171,6 +270,14 @@
 #  endif
 #endif
 
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have
@@ -284,49 +391,121 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
 #  endif
-#  define z_off_t off_t
 #endif
-#ifndef SEEK_SET
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
+#  define Z_HAVE_UNISTD_H
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
+#  endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
 #endif
+
 #ifndef z_off_t
 #  define z_off_t long
 #endif
 
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#  ifdef FAR
-#    undef FAR
+#if !defined(_WIN32) && defined(Z_LARGE64)
+#  define z_off64_t off64_t
+#else
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
 #  endif
 #endif
 
 /* MVS linker does not support external names larger than 8 bytes */
 #if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(deflateBound,"DEBND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(compressBound,"CMBND")
-#   pragma map(inflate_table,"INTABL")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_copyright,"INCOPY")
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
 #endif
 
 #endif /* ZCONF_H */
diff --git a/dep/src/zlib/zlib.h b/dep/src/zlib/zlib.h
index 022817927ce..3e0c7672ac5 100644
--- a/dep/src/zlib/zlib.h
+++ b/dep/src/zlib/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.3, July 18th, 2005
+  version 1.2.8, April 28th, 2013
 
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -24,8 +24,8 @@
 
 
   The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
 #ifndef ZLIB_H
@@ -37,41 +37,44 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
+#define ZLIB_VERSION "1.2.8"
+#define ZLIB_VERNUM 0x1280
+#define ZLIB_VER_MAJOR 1
+#define ZLIB_VER_MINOR 2
+#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_SUBREVISION 0
 
 /*
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
+    The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed data.
+  This version of the library supports only one compression method (deflation)
+  but other algorithms will be added later and will have the same stream
+  interface.
+
+    Compression can be done in a single step if the buffers are large enough,
+  or can be done by repeated calls of the compression function.  In the latter
+  case, the application must provide more input and/or consume the output
   (providing more output space) before each call.
 
-     The compressed data format used by default by the in-memory functions is
+    The compressed data format used by default by the in-memory functions is
   the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
   around a deflate stream, which is itself documented in RFC 1951.
 
-     The library also supports reading and writing files in gzip (.gz) format
+    The library also supports reading and writing files in gzip (.gz) format
   with an interface similar to that of stdio using the functions that start
   with "gz".  The gzip format is different from the zlib format.  gzip is a
   gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
 
-     This library can optionally read and write gzip streams in memory as well.
+    This library can optionally read and write gzip streams in memory as well.
 
-     The zlib format was designed to be compact and fast for use in memory
+    The zlib format was designed to be compact and fast for use in memory
   and on communications channels.  The gzip format was designed for single-
   file compression on file systems, has a larger header than zlib to maintain
   directory information, and uses a different, slower check method than zlib.
 
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
+    The library does not install any signal handler.  The decoder checks
+  the consistency of the compressed data, so the library should never crash
+  even in case of corrupted input.
 */
 
 typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@@ -80,15 +83,15 @@ typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
 struct internal_state;
 
 typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
+    z_const Bytef *next_in;     /* next input byte */
     uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
+    uLong    total_in;  /* total number of input bytes read so far */
 
     Bytef    *next_out; /* next output byte should be put there */
     uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
+    uLong    total_out; /* total number of bytes output so far */
 
-    char     *msg;      /* last error message, NULL if no error */
+    z_const char *msg;  /* last error message, NULL if no error */
     struct internal_state FAR *state; /* not visible by applications */
 
     alloc_func zalloc;  /* used to allocate the internal state */
@@ -126,45 +129,45 @@ typedef struct gz_header_s {
 typedef gz_header FAR *gz_headerp;
 
 /*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
+     The application must update next_in and avail_in when avail_in has dropped
+   to zero.  It must update next_out and avail_out when avail_out has dropped
+   to zero.  The application must initialize zalloc, zfree and opaque before
+   calling the init function.  All other fields are set by the compression
+   library and must not be updated by the application.
+
+     The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree.  This can be useful for custom
+   memory management.  The compression library attaches no meaning to the
    opaque value.
 
-   zalloc must return Z_NULL if there is not enough memory for the object.
+     zalloc must return Z_NULL if there is not enough memory for the object.
    If zlib is used in a multi-threaded application, zalloc and zfree must be
    thread safe.
 
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
+     On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this if
+   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
+   returned by zalloc for objects of exactly 65536 bytes *must* have their
+   offset normalized to zero.  The default allocation function provided by this
+   library ensures this (see zutil.c).  To reduce memory requirements and avoid
+   any allocation of 64K objects, at the expense of compression ratio, compile
+   the library with -DMAX_WBITS=14 (see zconf.h).
+
+     The fields total_in and total_out can be used for statistics or progress
+   reports.  After compression, total_in holds the total size of the
+   uncompressed data and may be saved for use in the decompressor (particularly
+   if the decompressor wants to decompress everything in a single step).
 */
 
                         /* constants */
 
 #define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
+#define Z_PARTIAL_FLUSH 1
 #define Z_SYNC_FLUSH    2
 #define Z_FULL_FLUSH    3
 #define Z_FINISH        4
 #define Z_BLOCK         5
+#define Z_TREES         6
 /* Allowed flush values; see deflate() and inflate() below for details */
 
 #define Z_OK            0
@@ -176,8 +179,8 @@ typedef gz_header FAR *gz_headerp;
 #define Z_MEM_ERROR    (-4)
 #define Z_BUF_ERROR    (-5)
 #define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
  */
 
 #define Z_NO_COMPRESSION         0
@@ -207,119 +210,141 @@ typedef gz_header FAR *gz_headerp;
 #define zlib_version zlibVersion()
 /* for compatibility with versions < 1.0.2 */
 
+
                         /* basic functions */
 
 ZEXTERN const char * ZEXPORT zlibVersion OF((void));
 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
+   If the first character differs, the library code actually used is not
+   compatible with the zlib.h header file used by the application.  This check
+   is automatically made by deflateInit and inflateInit.
  */
 
 /*
 ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
 
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
+     Initializes the internal stream state for compression.  The fields
+   zalloc, zfree and opaque must be initialized before by the caller.  If
+   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
+   allocation functions.
 
      The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
+   1 gives best speed, 9 gives best compression, 0 gives no compression at all
+   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
+   requests a default compromise between speed and compression (currently
+   equivalent to level 6).
 
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if level is not a valid compression level, or
    Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
+   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
+   if there is no error message.  deflateInit does not perform any compression:
+   this will be done by deflate().
 */
 
 
 ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 /*
     deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
   forced to flush.
 
-    The detailed semantics are as follows. deflate performs one or both of the
+    The detailed semantics are as follows.  deflate performs one or both of the
   following actions:
 
   - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
+    accordingly.  If not all input can be processed (because there is not
     enough room in the output buffer), next_in and avail_in are updated and
     processing will resume at this point for the next call of deflate().
 
   - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
+    accordingly.  This action is forced if the parameter flush is non zero.
     Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
+    should be set only when necessary (in interactive applications).  Some
+    output may be provided even if flush is not set.
+
+    Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating avail_in or avail_out accordingly; avail_out should
+  never be zero before the call.  The application can consume the compressed
+  output when it wants, for example when the output buffer is full (avail_out
+  == 0), or after each call of deflate().  If deflate returns Z_OK and with
+  zero avail_out, it must be called again after making room in the output
+  buffer because there might be more output pending.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumualte before producing output, in order to
+  decide how much data to accumulate before producing output, in order to
   maximize compression.
 
     If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
   flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
+  that the decompressor can get all input data available so far.  (In
+  particular avail_in is zero after the call if enough output space has been
+  provided before the call.) Flushing may degrade compression for some
+  compression algorithms and so it should be used only when necessary.  This
+  completes the current deflate block and follows it with an empty stored block
+  that is three bits plus filler bits to the next byte, followed by four bytes
+  (00 00 ff ff).
+
+    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
+  output buffer, but the output is not aligned to a byte boundary.  All of the
+  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
+  This completes the current deflate block and follows it with an empty fixed
+  codes block that is 10 bits long.  This assures that enough bytes are output
+  in order for the decompressor to finish the block before the empty fixed code
+  block.
+
+    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
+  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
+  seven bits of the current block are held to be written as the next byte after
+  the next deflate block is completed.  In this case, the decompressor may not
+  be provided enough bits at this point in order to complete decompression of
+  the data provided so far to the compressor.  It may need to wait for the next
+  block to be emitted.  This is for advanced applications that need to control
+  the emission of deflate blocks.
 
     If flush is set to Z_FULL_FLUSH, all output is flushed as with
   Z_SYNC_FLUSH, and the compression state is reset so that decompression can
   restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
   compression.
 
     If deflate returns with avail_out == 0, this function must be called again
   with the same value of the flush parameter and more output space (updated
   avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
   avail_out is greater than six to avoid repeated flush markers due to
   avail_out == 0 on return.
 
     If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
+  pending output is flushed and deflate returns with Z_STREAM_END if there was
+  enough output space; if deflate returns with Z_OK, this function must be
   called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
+  more input data, until it returns with Z_STREAM_END or an error.  After
+  deflate has returned Z_STREAM_END, the only possible operations on the stream
+  are deflateReset or deflateEnd.
 
     Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  the value returned by deflateBound (see below). If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
+  is to be done in a single step.  In this case, avail_out must be at least the
+  value returned by deflateBound (see below).  Then deflate is guaranteed to
+  return Z_STREAM_END.  If not enough output space is provided, deflate will
+  not return Z_STREAM_END, and it must be called again as described above.
 
     deflate() sets strm->adler to the adler32 checksum of all input read
   so far (that is, total_in bytes).
 
     deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
+  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
+  binary.  This field is only for information purposes and does not affect the
+  compression algorithm in any manner.
 
     deflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if all input has been
   consumed and all output has been produced (only when flush is set to
   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
+  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
   fatal, and deflate() can be called again with more input and more output
   space to continue compressing.
 */
@@ -328,13 +353,13 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
 /*
      All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
+   This function discards any unprocessed input and does not flush any pending
+   output.
 
      deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
    stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
+   prematurely (some input or output was discarded).  In the error case, msg
+   may be set but then points to a static string (which must not be
    deallocated).
 */
 
@@ -342,10 +367,10 @@ ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
 /*
 ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 
-     Initializes the internal stream state for decompression. The fields
+     Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
+   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
+   exact value depends on the compression method), inflateInit determines the
    compression method from the zlib header and allocates all data structures
    accordingly; otherwise the allocation will be deferred to the first call of
    inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
@@ -353,95 +378,116 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit() does not process any header information -- that is deferred
+   until inflate() is called.
 */
 
 
 ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
 /*
     inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce
+  buffer becomes empty or the output buffer becomes full.  It may introduce
   some output latency (reading input without producing any output) except when
   forced to flush.
 
-  The detailed semantics are as follows. inflate performs one or both of the
+  The detailed semantics are as follows.  inflate performs one or both of the
   following actions:
 
   - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), next_in is updated and processing will
+    resume at this point for the next call of inflate().
 
   - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  if and when it gets to the next deflate block boundary. When decoding the
-  zlib or gzip format, this will cause inflate() to return immediately after
-  the header and before the first block. When doing a raw inflate, inflate()
-  will go ahead and process the first block, and will return when it gets to
-  the end of that block, or when it runs out of data.
+    accordingly.  inflate() provides as much output as possible, until there is
+    no more input data or no more space in the output buffer (see below about
+    the flush parameter).
+
+    Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating the next_* and avail_* values accordingly.  The
+  application can consume the uncompressed output when it wants, for example
+  when the output buffer is full (avail_out == 0), or after each call of
+  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
+  called again after making room in the output buffer because there might be
+  more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
+  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer.  Z_BLOCK requests that inflate()
+  stop if and when it gets to the next deflate block boundary.  When decoding
+  the zlib or gzip format, this will cause inflate() to return immediately
+  after the header and before the first block.  When doing a raw inflate,
+  inflate() will go ahead and process the first block, and will return when it
+  gets to the end of that block, or when it runs out of data.
 
     The Z_BLOCK option assists in appending to or combining deflate streams.
   Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64
-  if inflate() is currently decoding the last block in the deflate stream,
-  plus 128 if inflate() returned immediately after decoding an end-of-block
-  code or decoding the complete header up to just before the first byte of the
-  deflate stream. The end-of-block will not be indicated until all of the
-  uncompressed data from that block has been written to strm->next_out.  The
-  number of unused bits may in general be greater than seven, except when
-  bit 7 of data_type is set, in which case the number of unused bits will be
-  less than eight.
+  number of unused bits in the last byte taken from strm->next_in, plus 64 if
+  inflate() is currently decoding the last block in the deflate stream, plus
+  128 if inflate() returned immediately after decoding an end-of-block code or
+  decoding the complete header up to just before the first byte of the deflate
+  stream.  The end-of-block will not be indicated until all of the uncompressed
+  data from that block has been written to strm->next_out.  The number of
+  unused bits may in general be greater than seven, except when bit 7 of
+  data_type is set, in which case the number of unused bits will be less than
+  eight.  data_type is set as noted here every time inflate() returns for all
+  flush options, and so can be used to determine the amount of currently
+  consumed input in bits.
+
+    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
+  end of each deflate block header is reached, before any actual data in that
+  block is decoded.  This allows the caller to determine the length of the
+  deflate block header for later use in random access within a deflate block.
+  256 is added to the value of strm->data_type when inflate() returns
+  immediately after reaching the end of the deflate block header.
 
     inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster approach
-  may be used for the single inflate() call.
+  error.  However if all decompression is to be performed in a single step (a
+  single call of inflate), the parameter flush should be set to Z_FINISH.  In
+  this case all pending input is processed and all pending output is flushed;
+  avail_out must be large enough to hold all of the uncompressed data for the
+  operation to complete.  (The size of the uncompressed data may have been
+  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  required to perform an inflation in one step.  However it may be used to
+  inform inflate that a faster approach can be used for the single inflate()
+  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
+  stream completes, which reduces inflate's memory footprint.  If the stream
+  does not complete, either because not all of the stream is provided or not
+  enough output space is provided, then a sliding window will be allocated and
+  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
+  been used.
 
      In this implementation, inflate() always flushes as much output as
   possible to the output buffer, and always uses the faster approach on the
-  first call. So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK is used.
+  first call.  So the effects of the flush parameter in this implementation are
+  on the return value of inflate() as noted below, when inflate() returns early
+  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
+  memory for a sliding window when Z_FINISH is used.
 
      If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
+  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
+  strm->adler to the Adler-32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below. At the end of the stream, inflate() checks that its computed adler32
+  below.  At the end of the stream, inflate() checks that its computed adler32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
   only if the checksum is correct.
 
-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically.  Any information
-  contained in the gzip header is not retained, so applications that need that
-  information should instead use raw inflate, see inflateInit2() below, or
-  inflateBack() and perform their own processing of the gzip header and
-  trailer.
+    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically, if requested when
+  initializing with inflateInit2().  Any information contained in the gzip
+  header is not retained, so applications that need that information should
+  instead use raw inflate, see inflateInit2() below, or inflateBack() and
+  perform their own processing of the gzip header and trailer.  When processing
+  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
+  producted so far.  The CRC-32 is checked against the gzip trailer.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
@@ -449,27 +495,28 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
   corrupted (input stream not conforming to the zlib format or incorrect check
   value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
+  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
   Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
+  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
   inflate() can be called again with more input and more output space to
-  continue decompressing. If Z_DATA_ERROR is returned, the application may then
-  call inflateSync() to look for a good compression block if a partial recovery
-  of the data is desired.
+  continue decompressing.  If Z_DATA_ERROR is returned, the application may
+  then call inflateSync() to look for a good compression block if a partial
+  recovery of the data is desired.
 */
 
 
 ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
 /*
      All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
+   This function discards any unprocessed input and does not flush any pending
+   output.
 
      inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
+   was inconsistent.  In the error case, msg may be set but then points to a
    static string (which must not be deallocated).
 */
 
+
                         /* Advanced functions */
 
 /*
@@ -484,55 +531,57 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
                                      int  memLevel,
                                      int  strategy));
 
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
+     This is another version of deflateInit with more compression options.  The
+   fields next_in, zalloc, zfree and opaque must be initialized before by the
+   caller.
 
-     The method parameter is the compression method. It must be Z_DEFLATED in
+     The method parameter is the compression method.  It must be Z_DEFLATED in
    this version of the library.
 
      The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer). It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
+   (the size of the history buffer).  It should be in the range 8..15 for this
+   version of the library.  Larger values of this parameter result in better
+   compression at the expense of memory usage.  The default value is 15 if
    deflateInit is used instead.
 
-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-   determines the window size. deflate() will then generate raw deflate data
+     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
+   determines the window size.  deflate() will then generate raw deflate data
    with no zlib header or trailer, and will not compute an adler32 check value.
 
-     windowBits can also be greater than 15 for optional gzip encoding. Add
+     windowBits can also be greater than 15 for optional gzip encoding.  Add
    16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper. The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero),
-   no header crc, and the operating system will be set to 255 (unknown).  If a
+   compressed data instead of a zlib wrapper.  The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero), no
+   header crc, and the operating system will be set to 255 (unknown).  If a
    gzip stream is being written, strm->adler is a crc32 instead of an adler32.
 
      The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
+   for the internal compression state.  memLevel=1 uses minimum memory but is
+   slow and reduces compression ratio; memLevel=9 uses maximum memory for
+   optimal speed.  The default value is 8.  See zconf.h for total memory usage
+   as a function of windowBits and memLevel.
 
-     The strategy parameter is used to tune the compression algorithm. Use the
+     The strategy parameter is used to tune the compression algorithm.  Use the
    value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
    filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
    string match), or Z_RLE to limit match distances to one (run-length
-   encoding). Filtered data consists mostly of small values with a somewhat
-   random distribution. In this case, the compression algorithm is tuned to
-   compress them better. The effect of Z_FILTERED is to force more Huffman
+   encoding).  Filtered data consists mostly of small values with a somewhat
+   random distribution.  In this case, the compression algorithm is tuned to
+   compress them better.  The effect of Z_FILTERED is to force more Huffman
    coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
-   parameter only affects the compression ratio but not the correctness of the
-   compressed output even if it is not set appropriately.  Z_FIXED prevents the
-   use of dynamic Huffman codes, allowing for a simpler decoder for special
-   applications.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
+   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
+   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
+   strategy parameter only affects the compression ratio but not the
+   correctness of the compressed output even if it is not set appropriately.
+   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
+   decoder for special applications.
+
+     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
+   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
+   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
+   set to null if there is no error message.  deflateInit2 does not perform any
+   compression: this will be done by deflate().
 */
 
 ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
@@ -540,38 +589,43 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
                                              uInt  dictLength));
 /*
      Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
+   without producing any compressed output.  When using the zlib format, this
+   function must be called immediately after deflateInit, deflateInit2 or
+   deflateReset, and before any call of deflate.  When doing raw deflate, this
+   function must be called either before any call of deflate, or immediately
+   after the completion of a deflate block, i.e. after all input has been
+   consumed and all output has been delivered when using any of the flush
+   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
+   compressor and decompressor must use exactly the same dictionary (see
+   inflateSetDictionary).
 
      The dictionary should consist of strings (byte sequences) that are likely
    to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
+   used strings preferably put towards the end of the dictionary.  Using a
    dictionary is most useful when the data to be compressed is short and can be
    predicted with good accuracy; the data can then be compressed better than
    with the default empty dictionary.
 
      Depending on the size of the compression data structures selected by
    deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front. In addition, the
-   current implementation of deflate will use at most the window size minus
-   262 bytes of the provided dictionary.
+   discarded, for example if the dictionary is larger than the window size
+   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
+   useful should be put at the end of the dictionary, not at the front.  In
+   addition, the current implementation of deflate will use at most the window
+   size minus 262 bytes of the provided dictionary.
 
      Upon return of this function, strm->adler is set to the adler32 value
    of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The adler32 value
+   which dictionary has been used by the compressor.  (The adler32 value
    applies to the whole dictionary even if only a subset of the dictionary is
    actually used by the compressor.) If a raw deflate was requested, then the
    adler32 value is not computed and strm->adler is not set.
 
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
+   or if not at a block boundary for raw deflate).  deflateSetDictionary does
+   not perform any compression: this will be done by deflate().
 */
 
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
@@ -581,26 +635,26 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
 
      This function can be useful when several compression strategies will be
    tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
+   data with a filter.  The streams that will be discarded should then be freed
    by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
+   compression state which can be quite large, so this strategy is slow and can
+   consume lots of memory.
 
      deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
    destination.
 */
 
 ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
 /*
      This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
+   but does not free and reallocate all the internal compression state.  The
+   stream will keep the same compression level and any other attributes that
+   may have been set by deflateInit2.
 
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
+     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
 */
 
 ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
@@ -610,18 +664,18 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
      Dynamically update the compression level and compression strategy.  The
    interpretation of level and strategy is as in deflateInit2.  This can be
    used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
+   to switch to a different kind of input data requiring a different strategy.
+   If the compression level is changed, the input available so far is
+   compressed with the old level (and may be flushed); the new level will take
+   effect only at the next call of deflate().
 
      Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
+   a call of deflate(), since the currently available input may have to be
+   compressed and flushed.  In particular, strm->avail_out must be non-zero.
 
      deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
+   strm->avail_out was zero.
 */
 
 ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
@@ -645,31 +699,53 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
                                        uLong sourceLen));
 /*
      deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit()
-   or deflateInit2().  This would be used to allocate an output buffer
-   for deflation in a single pass, and so would be called before deflate().
+   deflation of sourceLen bytes.  It must be called after deflateInit() or
+   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
+   to allocate an output buffer for deflation in a single pass, and so would be
+   called before deflate().  If that first deflate() call is provided the
+   sourceLen input bytes, an output buffer allocated to the size returned by
+   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
+   to return Z_STREAM_END.  Note that it is possible for the compressed size to
+   be larger than the value returned by deflateBound() if flush options other
+   than Z_FINISH or Z_NO_FLUSH are used.
 */
 
+ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
+                                       unsigned *pending,
+                                       int *bits));
+/*
+     deflatePending() returns the number of bytes and bits of output that have
+   been generated, but not yet provided in the available output.  The bytes not
+   provided would be due to the available output space having being consumed.
+   The number of bits of output not provided are between 0 and 7, where they
+   await more bits to join them in order to fill out a full byte.  If pending
+   or bits are Z_NULL, then those values are not set.
+
+     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+ */
+
 ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
                                      int bits,
                                      int value));
 /*
      deflatePrime() inserts bits in the deflate output stream.  The intent
-  is that this function is used to start off the deflate output with the
-  bits leftover from a previous deflate stream when appending to it.  As such,
-  this function can only be used for raw deflate, and must be used before the
-  first deflate() call after a deflateInit2() or deflateReset().  bits must be
-  less than or equal to 16, and that many of the least significant bits of
-  value will be inserted in the output.
-
-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
+   is that this function is used to start off the deflate output with the bits
+   leftover from a previous deflate stream when appending to it.  As such, this
+   function can only be used for raw deflate, and must be used before the first
+   deflate() call after a deflateInit2() or deflateReset().  bits must be less
+   than or equal to 16, and that many of the least significant bits of value
+   will be inserted in the output.
+
+     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
+   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
+   source stream state was inconsistent.
 */
 
 ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
                                          gz_headerp head));
 /*
-      deflateSetHeader() provides gzip header information for when a gzip
+     deflateSetHeader() provides gzip header information for when a gzip
    stream is requested by deflateInit2().  deflateSetHeader() may be called
    after deflateInit2() or deflateReset() and before the first call of
    deflate().  The text, time, os, extra field, name, and comment information
@@ -682,11 +758,11 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
    1.3.x) do not support header crc's, and will report that it is a "multi-part
    gzip file" and give up.
 
-      If deflateSetHeader is not used, the default gzip header has text false,
+     If deflateSetHeader is not used, the default gzip header has text false,
    the time set to zero, and os set to 255, with no extra, name, or comment
    fields.  The gzip header is returned to the default state by deflateReset().
 
-      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
 */
 
@@ -694,43 +770,50 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
 ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
                                      int  windowBits));
 
-     This is another version of inflateInit with an extra parameter. The
+     This is another version of inflateInit with an extra parameter.  The
    fields next_in, avail_in, zalloc, zfree and opaque must be initialized
    before by the caller.
 
      The windowBits parameter is the base two logarithm of the maximum window
    size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. windowBits must be greater than or equal to the windowBits value
+   this version of the library.  The default value is 15 if inflateInit is used
+   instead.  windowBits must be greater than or equal to the windowBits value
    provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used. If a compressed stream with a larger window
+   deflateInit2() was not used.  If a compressed stream with a larger window
    size is given as input, inflate() will return with the error code
    Z_DATA_ERROR instead of trying to allocate a larger window.
 
-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-   determines the window size. inflate() will then process raw deflate data,
+     windowBits can also be zero to request that inflate use the window size in
+   the zlib header of the compressed stream.
+
+     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
+   determines the window size.  inflate() will then process raw deflate data,
    not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream. This
+   looking for any check values for comparison at the end of the stream.  This
    is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values. If a custom
+   such as zip.  Those formats provide their own check values.  If a custom
    format is developed using the raw deflate format for compressed data, it is
    recommended that a check value such as an adler32 or a crc32 be applied to
    the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is. Note that comments
+   most applications, the zlib format should be used as is.  Note that comments
    above on the use in deflateInit2() applies to the magnitude of windowBits.
 
-     windowBits can also be greater than 15 for optional gzip decoding. Add
+     windowBits can also be greater than 15 for optional gzip decoding.  Add
    32 to windowBits to enable zlib and gzip decoding with automatic header
    detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
-   a crc32 instead of an adler32.
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
+   crc32 instead of an adler32.
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
-   is set to null if there is no error message.  inflateInit2 does not perform
-   any decompression apart from reading the zlib header if present: this will
-   be done by inflate(). (So next_in and avail_in may be modified, but next_out
-   and avail_out are unchanged.)
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit2 does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit2() does not process any header information -- that is
+   deferred until inflate() is called.
 */
 
 ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
@@ -738,36 +821,56 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
                                              uInt  dictLength));
 /*
      Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
+   sequence.  This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
    can be determined from the adler32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  The application must insure that the
-   dictionary that was used for compression is provided.
+   deflateSetDictionary).  For raw inflate, this function can be called at any
+   time to set the dictionary.  If the provided dictionary is smaller than the
+   window and there is already data in the window, then the provided dictionary
+   will amend what's there.  The application must insure that the dictionary
+   that was used for compression is provided.
 
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value). inflateSetDictionary does not
+   expected one (incorrect adler32 value).  inflateSetDictionary does not
    perform any decompression: this will be done by subsequent calls of
    inflate().
 */
 
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
 /*
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
+     Returns the sliding dictionary being maintained by inflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If inflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
 
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+     Skips invalid compressed data until a possible full flush point (see above
+   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
+   available input is skipped.  No output is provided.
+
+     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+   All full flush points have this pattern, but not all occurrences of this
+   pattern are full flush points.
+
+     inflateSync returns Z_OK if a possible full flush point has been found,
+   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
+   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
+   In the success case, the application may save the current current value of
+   total_in which indicates where valid compressed data was found.  In the
+   error case, the application may repeatedly call inflateSync, providing more
+   input each time, until success or end of the input data.
 */
 
 ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
@@ -782,18 +885,30 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
 
      inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
    destination.
 */
 
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
+   but does not free and reallocate all the internal decompression state.  The
+   stream will keep attributes that may have been set by inflateInit2.
 
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
+     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
+                                      int windowBits));
+/*
+     This function is the same as inflateReset, but it also permits changing
+   the wrap and window size requests.  The windowBits parameter is interpreted
+   the same as it is for inflateInit2.
+
+     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
+   the windowBits parameter is invalid.
 */
 
 ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
@@ -801,54 +916,87 @@ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
                                      int value));
 /*
      This function inserts bits in the inflate input stream.  The intent is
-  that this function is used to start inflating at a bit position in the
-  middle of a byte.  The provided bits will be used before any bytes are used
-  from next_in.  This function should only be used with raw inflate, and
-  should be used before the first inflate() call after inflateInit2() or
-  inflateReset().  bits must be less than or equal to 16, and that many of the
-  least significant bits of value will be inserted in the input.
-
-      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   that this function is used to start inflating at a bit position in the
+   middle of a byte.  The provided bits will be used before any bytes are used
+   from next_in.  This function should only be used with raw inflate, and
+   should be used before the first inflate() call after inflateInit2() or
+   inflateReset().  bits must be less than or equal to 16, and that many of the
+   least significant bits of value will be inserted in the input.
+
+     If bits is negative, then the input stream bit buffer is emptied.  Then
+   inflatePrime() can be called again to put bits in the buffer.  This is used
+   to clear out bits leftover after feeding inflate a block description prior
+   to feeding inflate codes.
+
+     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
 */
 
+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+/*
+     This function returns two values, one in the lower 16 bits of the return
+   value, and the other in the remaining upper bits, obtained by shifting the
+   return value down 16 bits.  If the upper value is -1 and the lower value is
+   zero, then inflate() is currently decoding information outside of a block.
+   If the upper value is -1 and the lower value is non-zero, then inflate is in
+   the middle of a stored block, with the lower value equaling the number of
+   bytes from the input remaining to copy.  If the upper value is not -1, then
+   it is the number of bits back from the current bit position in the input of
+   the code (literal or length/distance pair) currently being processed.  In
+   that case the lower value is the number of bytes already emitted for that
+   code.
+
+     A code is being processed if inflate is waiting for more input to complete
+   decoding of the code, or if it has completed decoding but is waiting for
+   more output space to write the literal or match data.
+
+     inflateMark() is used to mark locations in the input data for random
+   access, which may be at bit positions, and to note those cases where the
+   output of a code may span boundaries of random access blocks.  The current
+   location in the input stream can be determined from avail_in and data_type
+   as noted in the description for the Z_BLOCK flush parameter for inflate.
+
+     inflateMark returns the value noted above or -1 << 16 if the provided
+   source stream state was inconsistent.
+*/
+
 ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
                                          gz_headerp head));
 /*
-      inflateGetHeader() requests that gzip header information be stored in the
+     inflateGetHeader() requests that gzip header information be stored in the
    provided gz_header structure.  inflateGetHeader() may be called after
    inflateInit2() or inflateReset(), and before the first call of inflate().
    As inflate() processes the gzip stream, head->done is zero until the header
    is completed, at which time head->done is set to one.  If a zlib stream is
    being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
-   force inflate() to return immediately after header processing is complete
-   and before any actual data is decompressed.
+   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
+   used to force inflate() to return immediately after header processing is
+   complete and before any actual data is decompressed.
 
-      The text, time, xflags, and os fields are filled in with the gzip header
+     The text, time, xflags, and os fields are filled in with the gzip header
    contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
+   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
    contains the maximum number of bytes to write to extra.  Once done is true,
    extra_len contains the actual extra field length, and extra contains the
    extra field, or that field truncated if extra_max is less than extra_len.
    If name is not Z_NULL, then up to name_max characters are written there,
    terminated with a zero unless the length is greater than name_max.  If
    comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When
-   any of extra, name, or comment are not Z_NULL and the respective field is
-   not present in the header, then that field is set to Z_NULL to signal its
+   terminated with a zero unless the length is greater than comm_max.  When any
+   of extra, name, or comment are not Z_NULL and the respective field is not
+   present in the header, then that field is set to Z_NULL to signal its
    absence.  This allows the use of deflateSetHeader() with the returned
    structure to duplicate the header.  However if those fields are set to
    allocated memory, then the application will need to save those pointers
    elsewhere so that they can be eventually freed.
 
-      If inflateGetHeader is not used, then the header information is simply
+     If inflateGetHeader is not used, then the header information is simply
    discarded.  The header is always checked for validity, including the header
    CRC if present.  inflateReset() will reset the process to discard the header
    information.  The application would need to call inflateGetHeader() again to
    retrieve the header from the next gzip stream.
 
-      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
 */
 
@@ -869,12 +1017,13 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
      See inflateBack() for the usage of these routines.
 
      inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-   be allocated, or Z_VERSION_ERROR if the version of the library does not
-   match the version of the header file.
+   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
+   allocated, or Z_VERSION_ERROR if the version of the library does not match
+   the version of the header file.
 */
 
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef unsigned (*in_func) OF((void FAR *,
+                                z_const unsigned char FAR * FAR *));
 typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
 
 ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
@@ -882,24 +1031,25 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
                                     out_func out, void FAR *out_desc));
 /*
      inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
+   interface for input and output.  This is potentially more efficient than
+   inflate() for file i/o applications, in that it avoids copying between the
+   output and the sliding window by simply making the window itself the output
+   buffer.  inflate() can be faster on modern CPUs when used with large
+   buffers.  inflateBack() trusts the application to not change the output
+   buffer passed by the output function, at least until inflateBack() returns.
 
      inflateBackInit() must be called first to allocate the internal state
    and to initialize the state with the user-provided window buffer.
    inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free
-   the allocated state.
+   deflate stream with each call.  inflateBackEnd() is then called to free the
+   allocated state.
 
      A raw deflate stream is one with no zlib or gzip header or trailer.
    This routine would normally be used in a utility that reads zip or gzip
    files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects
-   only the raw deflate stream to decompress.  This is different from the
-   normal behavior of inflate(), which expects either a zlib or gzip header and
+   header and process the trailer on its own, hence this routine expects only
+   the raw deflate stream to decompress.  This is different from the normal
+   behavior of inflate(), which expects either a zlib or gzip header and
    trailer around the deflate stream.
 
      inflateBack() uses two subroutines supplied by the caller that are then
@@ -925,7 +1075,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
    immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
    must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
+   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
 
      The in_desc and out_desc parameters of inflateBack() is passed as the
    first parameter of in() and out() respectively when they are called.  These
@@ -935,15 +1085,15 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
      On return, inflateBack() will set strm->next_in and strm->avail_in to
    pass back any unused input that was provided by the last in() call.  The
    return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format
-   error in the deflate stream (in which case strm->msg is set to indicate the
-   nature of the error), or Z_STREAM_ERROR if the stream was not properly
-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
-   distinguished using strm->next_in which will be Z_NULL only if in() returned
-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
-   out() returning non-zero.  (in() will always be called before out(), so
-   strm->next_in is assured to be defined if out() returns non-zero.)  Note
-   that inflateBack() cannot return Z_OK.
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
+   in the deflate stream (in which case strm->msg is set to indicate the nature
+   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
+   In the case of Z_BUF_ERROR, an input or output error can be distinguished
+   using strm->next_in which will be Z_NULL only if in() returned an error.  If
+   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
+   non-zero.  (in() will always be called before out(), so strm->next_in is
+   assured to be defined if out() returns non-zero.) Note that inflateBack()
+   cannot return Z_OK.
 */
 
 ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
@@ -995,27 +1145,27 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
      27-31: 0 (reserved)
  */
 
+#ifndef Z_SOLO
 
                         /* utility functions */
 
 /*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
+     The following utility functions are implemented on top of the basic
+   stream-oriented functions.  To simplify the interface, some default options
+   are assumed (compression level and memory usage, standard memory allocation
+   functions).  The source code of these utility functions can be modified if
+   you need special options.
 */
 
 ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
                                  const Bytef *source, uLong sourceLen));
 /*
      Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least the value returned
-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
    compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
+
      compress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
    buffer.
@@ -1025,11 +1175,11 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
                                   const Bytef *source, uLong sourceLen,
                                   int level));
 /*
-     Compresses the source buffer into the destination buffer. The level
+     Compresses the source buffer into the destination buffer.  The level
    parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
+   length of the source buffer.  Upon entry, destLen is the total size of the
    destination buffer, which must be at least the value returned by
-   compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
    compressed buffer.
 
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
@@ -1040,159 +1190,255 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
 ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
 /*
      compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before
-   a compress() or compress2() call to allocate the destination buffer.
+   compress() or compress2() on sourceLen bytes.  It would be used before a
+   compress() or compress2() call to allocate the destination buffer.
 */
 
 ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
                                    const Bytef *source, uLong sourceLen));
 /*
      Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data.  (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit, destLen
+   is the actual size of the uncompressed buffer.
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
+   the case where there is not enough room, uncompress() will fill the output
+   buffer with the uncompressed data up to that point.
 */
 
+                        /* gzip file access functions */
 
-typedef voidp gzFile;
+/*
+     This library supports reading and writing files in gzip (.gz) format with
+   an interface similar to that of stdio, using the functions that start with
+   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
+   wrapper, documented in RFC 1952, wrapped around a deflate stream.
+*/
+
+typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
 
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
 /*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h", or 'R' for run-length encoding
-   as in "wb1R". (See the description of deflateInit2 for more information
-   about the strategy parameter.)
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+
+     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
+   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
+   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
+   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
+   for fixed code compression as in "wb9F".  (See the description of
+   deflateInit2 for more information about the strategy parameter.)  'T' will
+   request transparent writing or appending with no compression and not using
+   the gzip format.
+
+     "a" can be used instead of "w" to request that the gzip stream that will
+   be written be appended to the file.  "+" will result in an error, since
+   reading and writing to the same gzip file is not supported.  The addition of
+   "x" when writing will create the file exclusively, which fails if the file
+   already exists.  On systems that support it, the addition of "e" when
+   reading or writing will set the flag to close the file on an execve() call.
+
+     These functions, as well as gzip, will read and decode a sequence of gzip
+   streams in a file.  The append function of gzopen() can be used to create
+   such a file.  (Also see gzflush() for another way to do this.)  When
+   appending, gzopen does not test whether the file begins with a gzip stream,
+   nor does it look for the end of the gzip streams to begin appending.  gzopen
+   will simply append a gzip stream to the existing file.
 
      gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
+   case gzread will directly read from the file without decompression.  When
+   reading, this will be detected automatically by looking for the magic two-
+   byte gzip header.
+
+     gzopen returns NULL if the file could not be opened, if there was
+   insufficient memory to allocate the gzFile state, or if an invalid mode was
+   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
+   errno can be checked to determine if the reason gzopen failed was that the
+   file could not be opened.
+*/
 
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
+   are obtained from calls like open, dup, creat, pipe or fileno (if the file
+   has been previously opened with fopen).  The mode parameter is as in gzopen.
+
+     The next call of gzclose on the returned gzFile will also close the file
+   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
+   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
+   mode);.  The duplicated descriptor should be saved to avoid a leak, since
+   gzdopen does not close fd if it fails.  If you are using fileno() to get the
+   file descriptor from a FILE *, then you will have to use dup() to avoid
+   double-close()ing the file descriptor.  Both gzclose() and fclose() will
+   close the associated file descriptor, so they need to have different file
+   descriptors.
+
+     gzdopen returns NULL if there was insufficient memory to allocate the
+   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
+   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
+   used until the next gz* read, write, seek, or close operation, so gzdopen
+   will not detect if fd is invalid (unless fd is -1).
+*/
 
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
 /*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
+     Set the internal buffer size used by this library's functions.  The
+   default buffer size is 8192 bytes.  This function must be called after
+   gzopen() or gzdopen(), and before any other calls that read or write the
+   file.  The buffer memory allocation is always deferred to the first read or
+   write.  Two buffers are allocated, either both of the specified size when
+   writing, or one of the specified size and the other twice that size when
+   reading.  A larger buffer size of, for example, 64K or 128K bytes will
+   noticeably increase the speed of decompression (reading).
+
+     The new buffer size also affects the maximum length for gzprintf().
+
+     gzbuffer() returns 0 on success, or -1 on failure, such as being called
+   too late.
 */
 
 ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 /*
-     Dynamically update the compression level or strategy. See the description
+     Dynamically update the compression level or strategy.  See the description
    of deflateInit2 for the meaning of these parameters.
+
      gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
    opened for writing.
 */
 
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
 /*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
+     Reads the given number of uncompressed bytes from the compressed file.  If
+   the input file is not in gzip format, gzread copies the given number of
+   bytes into the buffer directly from the file.
+
+     After reaching the end of a gzip stream in the input, gzread will continue
+   to read, looking for another gzip stream.  Any number of gzip streams may be
+   concatenated in the input file, and will all be decompressed by gzread().
+   If something other than a gzip stream is encountered after a gzip stream,
+   that remaining trailing garbage is ignored (and no error is returned).
+
+     gzread can be used to read a gzip file that is being concurrently written.
+   Upon reaching the end of the input, gzread will return with the available
+   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
+   gzclearerr can be used to clear the end of file indicator in order to permit
+   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
+   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
+   middle of a gzip stream.  Note that gzread does not return -1 in the event
+   of an incomplete gzip stream.  This error is deferred until gzclose(), which
+   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
+   stream.  Alternatively, gzerror can be used before gzclose to detect this
+   case.
+
+     gzread returns the number of uncompressed bytes actually read, less than
+   len for end of file, or -1 for error.
+*/
 
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-                                   voidpc buf, unsigned len));
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
+                                voidpc buf, unsigned len));
 /*
      Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
+   gzwrite returns the number of uncompressed bytes written or 0 in case of
+   error.
 */
 
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
 /*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).  The number of
-   uncompressed bytes written is limited to 4095. The caller should assure that
-   this limit is not exceeded. If it is exceeded, then gzprintf() will return
-   return an error (0) with nothing written. In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
+     Converts, formats, and writes the arguments to the compressed file under
+   control of the format string, as in fprintf.  gzprintf returns the number of
+   uncompressed bytes actually written, or 0 in case of error.  The number of
+   uncompressed bytes written is limited to 8191, or one less than the buffer
+   size given to gzbuffer().  The caller should assure that this limit is not
+   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
+   nothing written.  In this case, there may also be a buffer overflow with
+   unpredictable consequences, which is possible only if zlib was compiled with
+   the insecure functions sprintf() or vsprintf() because the secure snprintf()
+   or vsnprintf() functions were not available.  This can be determined using
+   zlibCompileFlags().
 */
 
 ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
 /*
-      Writes the given null-terminated string to the compressed file, excluding
+     Writes the given null-terminated string to the compressed file, excluding
    the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
+
+     gzputs returns the number of characters written, or -1 in case of error.
 */
 
 ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
 /*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
+     Reads bytes from the compressed file until len-1 characters are read, or a
+   newline character is read and transferred to buf, or an end-of-file
+   condition is encountered.  If any characters are read or if len == 1, the
+   string is terminated with a null character.  If no characters are read due
+   to an end-of-file or len < 1, then the buffer is left untouched.
+
+     gzgets returns buf which is a null-terminated string, or it returns NULL
+   for end-of-file or in case of error.  If there was an error, the contents at
+   buf are indeterminate.
 */
 
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
 /*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
+     Writes c, converted to an unsigned char, into the compressed file.  gzputc
+   returns the value that was written, or -1 in case of error.
 */
 
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
 /*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
+     Reads one byte from the compressed file.  gzgetc returns this byte or -1
+   in case of end of file or error.  This is implemented as a macro for speed.
+   As such, it does not do all of the checking the other functions do.  I.e.
+   it does not check to see if file is NULL, nor whether the structure file
+   points to has been clobbered or not.
 */
 
-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
 /*
-      Push one character back onto the stream to be read again later.
-   Only one character of push-back is allowed.  gzungetc() returns the
-   character pushed, or -1 on failure.  gzungetc() will fail if a
-   character has been pushed but not read yet, or if c is -1. The pushed
-   character will be discarded if the stream is repositioned with gzseek()
-   or gzrewind().
+     Push one character back onto the stream to be read as the first character
+   on the next read.  At least one character of push-back is allowed.
+   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
+   fail if c is -1, and may fail if a character has been pushed but not read
+   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
+   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
+   The pushed character will be discarded if the stream is repositioned with
+   gzseek() or gzrewind().
 */
 
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
 /*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
+     Flushes all pending output into the compressed file.  The parameter flush
+   is as in the deflate() function.  The return value is the zlib error number
+   (see function gzerror below).  gzflush is only permitted when writing.
+
+     If the flush parameter is Z_FINISH, the remaining data is written and the
+   gzip stream is completed in the output.  If gzwrite() is called again, a new
+   gzip stream will be started in the output.  gzread() is able to read such
+   concatented gzip streams.
+
+     gzflush should be called only when strictly necessary because it will
+   degrade compression if called too often.
 */
 
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-                                      z_off_t offset, int whence));
 /*
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+                                   z_off_t offset, int whence));
+
+     Sets the starting position for the next gzread or gzwrite on the given
+   compressed file.  The offset represents a number of bytes in the
+   uncompressed data stream.  The whence parameter is defined as in lseek(2);
    the value SEEK_END is not supported.
+
      If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
+   extremely slow.  If the file is opened for writing, only forward seeks are
    supported; gzseek then compresses a sequence of zeroes up to the new
    starting position.
 
-      gzseek returns the resulting offset location as measured in bytes from
+     gzseek returns the resulting offset location as measured in bytes from
    the beginning of the uncompressed stream, or -1 in case of error, in
    particular if the file is opened for writing and the new starting position
    would be before the current position.
@@ -1202,68 +1448,134 @@ ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
 /*
      Rewinds the given file. This function is supported only for reading.
 
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
 */
 
+/*
 ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+
+     Returns the starting position for the next gzread or gzwrite on the given
+   compressed file.  This position represents a number of bytes in the
+   uncompressed data stream, and is zero when starting, even if appending or
+   reading a gzip stream from the middle of a file using gzdopen().
+
+     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
 /*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
 
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+     Returns the current offset in the file being read or written.  This offset
+   includes the count of bytes that precede the gzip stream, for example when
+   appending or when using gzdopen() for reading.  When reading, the offset
+   does not include as yet unused buffered input.  This information can be used
+   for a progress indicator.  On error, gzoffset() returns -1.
 */
 
 ZEXTERN int ZEXPORT gzeof OF((gzFile file));
 /*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
+     Returns true (1) if the end-of-file indicator has been set while reading,
+   false (0) otherwise.  Note that the end-of-file indicator is set only if the
+   read tried to go past the end of the input, but came up short.  Therefore,
+   just like feof(), gzeof() may return false even if there is no more data to
+   read, in the event that the last read request was for the exact number of
+   bytes remaining in the input file.  This will happen if the input file size
+   is an exact multiple of the buffer size.
+
+     If gzeof() returns true, then the read functions will return no more data,
+   unless the end-of-file indicator is reset by gzclearerr() and the input file
+   has grown since the previous end of file was detected.
 */
 
 ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
 /*
-     Returns 1 if file is being read directly without decompression, otherwise
-   zero.
+     Returns true (1) if file is being copied directly while reading, or false
+   (0) if file is a gzip stream being decompressed.
+
+     If the input file is empty, gzdirect() will return true, since the input
+   does not contain a gzip stream.
+
+     If gzdirect() is used immediately after gzopen() or gzdopen() it will
+   cause buffers to be allocated to allow reading the file to determine if it
+   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
+   gzdirect().
+
+     When writing, gzdirect() returns true (1) if transparent writing was
+   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
+   gzdirect() is not needed when writing.  Transparent writing must be
+   explicitly requested, so the application already knows the answer.  When
+   linking statically, using gzdirect() will include all of the zlib code for
+   gzip file reading and decompression, which may not be desired.)
 */
 
 ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
 /*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
+     Flushes all pending output if necessary, closes the compressed file and
+   deallocates the (de)compression state.  Note that once file is closed, you
+   cannot call gzerror with file, since its structures have been deallocated.
+   gzclose must not be called more than once on the same file, just as free
+   must not be called more than once on the same allocation.
+
+     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
+   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
+   last read ended in the middle of a gzip stream, or Z_OK on success.
+*/
+
+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+/*
+     Same as gzclose(), but gzclose_r() is only for use when reading, and
+   gzclose_w() is only for use when writing or appending.  The advantage to
+   using these instead of gzclose() is that they avoid linking in zlib
+   compression or decompression code that is not used when only reading or only
+   writing respectively.  If gzclose() is used, then both compression and
+   decompression code will be included the application when linking to a static
+   zlib library.
 */
 
 ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
 /*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
+     Returns the error message for the last error which occurred on the given
+   compressed file.  errnum is set to zlib error number.  If an error occurred
+   in the file system and not in the compression library, errnum is set to
+   Z_ERRNO and the application may consult errno to get the exact error code.
+
+     The application must not modify the returned string.  Future calls to
+   this function may invalidate the previously returned string.  If file is
+   closed, then the string previously returned by gzerror will no longer be
+   available.
+
+     gzerror() should be used to distinguish errors from end-of-file for those
+   functions above that do not distinguish those cases in their return values.
 */
 
 ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
 /*
-     Clears the error and end-of-file flags for file. This is analogous to the
-   clearerr() function in stdio. This is useful for continuing to read a gzip
+     Clears the error and end-of-file flags for file.  This is analogous to the
+   clearerr() function in stdio.  This is useful for continuing to read a gzip
    file that is being written concurrently.
 */
 
+#endif /* !Z_SOLO */
+
                         /* checksum functions */
 
 /*
      These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
+   anyway because they might be useful in applications using the compression
+   library.
 */
 
 ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
 /*
      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
+   return the updated checksum.  If buf is Z_NULL, this function returns the
+   required initial value for the checksum.
+
+     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+   much faster.
+
+   Usage example:
 
      uLong adler = adler32(0L, Z_NULL, 0);
 
@@ -1273,21 +1585,25 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
      if (adler != original_adler) error();
 */
 
+/*
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
                                           z_off_t len2));
-/*
+
      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
    each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
+   that the z_off_t type (like off_t) is a signed integer.  If len2 is
+   negative, the result has no meaning or utility.
 */
 
 ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
 /*
      Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32. If buf is NULL, this function returns the required initial
-   value for the for the crc. Pre- and post-conditioning (one's complement) is
+   updated CRC-32.  If buf is Z_NULL, this function returns the required
+   initial value for the crc.  Pre- and post-conditioning (one's complement) is
    performed within this function so it shouldn't be done by the application.
+
    Usage example:
 
      uLong crc = crc32(0L, Z_NULL, 0);
@@ -1298,9 +1614,9 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
      if (crc != original_crc) error();
 */
 
+/*
 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
 
-/*
      Combine two CRC-32 check values into one.  For two sequences of bytes,
    seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
    calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
@@ -1329,26 +1645,121 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
                                          const char *version,
                                          int stream_size));
 #define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
 #define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
 #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
         deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
 #define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                      (int)sizeof(z_stream))
 #define inflateBackInit(strm, windowBits, window) \
         inflateBackInit_((strm), (windowBits), (window), \
-        ZLIB_VERSION, sizeof(z_stream))
+                      ZLIB_VERSION, (int)sizeof(z_stream))
+
+#ifndef Z_SOLO
+
+/* gzgetc() macro and its supporting function and exposed data structure.  Note
+ * that the real internal state is much larger than the exposed structure.
+ * This abbreviated structure exposes just enough for the gzgetc() macro.  The
+ * user should not mess with these exposed elements, since their names or
+ * behavior could change in the future, perhaps even capriciously.  They can
+ * only be used by the gzgetc() macro.  You have been warned.
+ */
+struct gzFile_s {
+    unsigned have;
+    unsigned char *next;
+    z_off64_t pos;
+};
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#  define z_gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#else
+#  define gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#endif
 
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
+ * both are true, the application gets the *64 functions, and the regular
+ * functions are changed to 64 bits) -- in case these are set on systems
+ * without large file support, _LFS64_LARGEFILE must also be true
+ */
+#ifdef Z_LARGE64
+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+#endif
+
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+#  ifdef Z_PREFIX_SET
+#    define z_gzopen z_gzopen64
+#    define z_gzseek z_gzseek64
+#    define z_gztell z_gztell64
+#    define z_gzoffset z_gzoffset64
+#    define z_adler32_combine z_adler32_combine64
+#    define z_crc32_combine z_crc32_combine64
+#  else
+#    define gzopen gzopen64
+#    define gzseek gzseek64
+#    define gztell gztell64
+#    define gzoffset gzoffset64
+#    define adler32_combine adler32_combine64
+#    define crc32_combine crc32_combine64
+#  endif
+#  ifndef Z_LARGE64
+     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#  endif
+#else
+   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+#endif
+
+#else /* Z_SOLO */
 
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+
+#endif /* !Z_SOLO */
+
+/* hack for buggy compilers */
 #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
+    struct internal_state {int dummy;};
 #endif
 
+/* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
+ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
+ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                            const char *mode));
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
+#  endif
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/dep/src/zlib/zutil.c b/dep/src/zlib/zutil.c
index d55f5948a37..23d2ebef008 100644
--- a/dep/src/zlib/zutil.c
+++ b/dep/src/zlib/zutil.c
@@ -1,17 +1,20 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
 #include "zutil.h"
+#ifndef Z_SOLO
+#  include "gzguts.h"
+#endif
 
 #ifndef NO_DUMMY_DECL
 struct internal_state      {int dummy;}; /* for buggy compilers */
 #endif
 
-const char * const z_errmsg[10] = {
+z_const char * const z_errmsg[10] = {
 "need dictionary",     /* Z_NEED_DICT       2  */
 "stream end",          /* Z_STREAM_END      1  */
 "",                    /* Z_OK              0  */
@@ -34,25 +37,25 @@ uLong ZEXPORT zlibCompileFlags()
     uLong flags;
 
     flags = 0;
-    switch (sizeof(uInt)) {
+    switch ((int)(sizeof(uInt))) {
     case 2:     break;
     case 4:     flags += 1;     break;
     case 8:     flags += 2;     break;
     default:    flags += 3;
     }
-    switch (sizeof(uLong)) {
+    switch ((int)(sizeof(uLong))) {
     case 2:     break;
     case 4:     flags += 1 << 2;        break;
     case 8:     flags += 2 << 2;        break;
     default:    flags += 3 << 2;
     }
-    switch (sizeof(voidpf)) {
+    switch ((int)(sizeof(voidpf))) {
     case 2:     break;
     case 4:     flags += 1 << 4;        break;
     case 8:     flags += 2 << 4;        break;
     default:    flags += 3 << 4;
     }
-    switch (sizeof(z_off_t)) {
+    switch ((int)(sizeof(z_off_t))) {
     case 2:     break;
     case 4:     flags += 1 << 6;        break;
     case 8:     flags += 2 << 6;        break;
@@ -85,27 +88,27 @@ uLong ZEXPORT zlibCompileFlags()
 #ifdef FASTEST
     flags += 1L << 21;
 #endif
-#ifdef STDC
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #  ifdef NO_vsnprintf
-        flags += 1L << 25;
+    flags += 1L << 25;
 #    ifdef HAS_vsprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  else
 #    ifdef HAS_vsnprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  endif
 #else
-        flags += 1L << 24;
+    flags += 1L << 24;
 #  ifdef NO_snprintf
-        flags += 1L << 25;
+    flags += 1L << 25;
 #    ifdef HAS_sprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  else
 #    ifdef HAS_snprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  endif
 #endif
@@ -117,9 +120,9 @@ uLong ZEXPORT zlibCompileFlags()
 #  ifndef verbose
 #    define verbose 0
 #  endif
-int z_verbose = verbose;
+int ZLIB_INTERNAL z_verbose = verbose;
 
-void z_error (m)
+void ZLIB_INTERNAL z_error (m)
     char *m;
 {
     fprintf(stderr, "%s\n", m);
@@ -146,7 +149,7 @@ const char * ZEXPORT zError(err)
 
 #ifndef HAVE_MEMCPY
 
-void zmemcpy(dest, source, len)
+void ZLIB_INTERNAL zmemcpy(dest, source, len)
     Bytef* dest;
     const Bytef* source;
     uInt  len;
@@ -157,7 +160,7 @@ void zmemcpy(dest, source, len)
     } while (--len != 0);
 }
 
-int zmemcmp(s1, s2, len)
+int ZLIB_INTERNAL zmemcmp(s1, s2, len)
     const Bytef* s1;
     const Bytef* s2;
     uInt  len;
@@ -170,7 +173,7 @@ int zmemcmp(s1, s2, len)
     return 0;
 }
 
-void zmemzero(dest, len)
+void ZLIB_INTERNAL zmemzero(dest, len)
     Bytef* dest;
     uInt  len;
 {
@@ -181,6 +184,7 @@ void zmemzero(dest, len)
 }
 #endif
 
+#ifndef Z_SOLO
 
 #ifdef SYS16BIT
 
@@ -213,7 +217,7 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
     voidpf buf = opaque; /* just to make some compilers happy */
     ulg bsize = (ulg)items*size;
@@ -237,7 +241,7 @@ voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
     return buf;
 }
 
-void  zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 {
     int n;
     if (*(ush*)&ptr != 0) { /* object < 64K */
@@ -272,13 +276,13 @@ void  zcfree (voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     return _halloc((long)items, size);
 }
 
-void  zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     _hfree(ptr);
@@ -297,7 +301,7 @@ extern voidp  calloc OF((uInt items, uInt size));
 extern void   free   OF((voidpf ptr));
 #endif
 
-voidpf zcalloc (opaque, items, size)
+voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
     voidpf opaque;
     unsigned items;
     unsigned size;
@@ -307,7 +311,7 @@ voidpf zcalloc (opaque, items, size)
                               (voidpf)calloc(items, size);
 }
 
-void  zcfree (opaque, ptr)
+void ZLIB_INTERNAL zcfree (opaque, ptr)
     voidpf opaque;
     voidpf ptr;
 {
@@ -316,3 +320,5 @@ void  zcfree (opaque, ptr)
 }
 
 #endif /* MY_ZCALLOC */
+
+#endif /* !Z_SOLO */
diff --git a/dep/src/zlib/zutil.h b/dep/src/zlib/zutil.h
index b7d5eff81b6..24ab06b1cf6 100644
--- a/dep/src/zlib/zutil.h
+++ b/dep/src/zlib/zutil.h
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -13,30 +13,24 @@
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#define ZLIB_INTERNAL
+#ifdef HAVE_HIDDEN
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
 #include "zlib.h"
 
-#ifdef STDC
-#  ifndef _WIN32_WCE
+#if defined(STDC) && !defined(Z_SOLO)
+#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
 #    include <stddef.h>
 #  endif
 #  include <string.h>
 #  include <stdlib.h>
 #endif
-#ifdef NO_ERRNO_H
-#   ifdef _WIN32_WCE
-      /* The Microsoft C Run-Time Library for Windows CE doesn't have
-       * errno.  We define it as a global variable to simplify porting.
-       * Its value is always 0 and should not be used.  We rename it to
-       * avoid conflict with other libraries that use the same workaround.
-       */
-#     define errno z_errno
-#   endif
-    extern int errno;
-#else
-#  ifndef _WIN32_WCE
-#    include <errno.h>
-#  endif
+
+#ifdef Z_SOLO
+   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
 #endif
 
 #ifndef local
@@ -50,13 +44,13 @@ typedef unsigned short ush;
 typedef ush FAR ushf;
 typedef unsigned long  ulg;
 
-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 
 #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
 
 #define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
+  return (strm->msg = ERR_MSG(err), (err))
 /* To be used only when the state is known to be valid */
 
         /* common constants */
@@ -88,16 +82,18 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
 #  define OS_CODE  0x00
-#  if defined(__TURBOC__) || defined(__BORLANDC__)
-#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-       /* Allow compilation with ANSI keywords only enabled */
-       void _Cdecl farfree( void *block );
-       void *_Cdecl farmalloc( unsigned long nbytes );
-#    else
-#      include <alloc.h>
+#  ifndef Z_SOLO
+#    if defined(__TURBOC__) || defined(__BORLANDC__)
+#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+         /* Allow compilation with ANSI keywords only enabled */
+         void _Cdecl farfree( void *block );
+         void *_Cdecl farmalloc( unsigned long nbytes );
+#      else
+#        include <alloc.h>
+#      endif
+#    else /* MSC or DJGPP */
+#      include <malloc.h>
 #    endif
-#  else /* MSC or DJGPP */
-#    include <malloc.h>
 #  endif
 #endif
 
@@ -117,18 +113,20 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #ifdef OS2
 #  define OS_CODE  0x06
-#  ifdef M_I86
-     #include <malloc.h>
+#  if defined(M_I86) && !defined(Z_SOLO)
+#    include <malloc.h>
 #  endif
 #endif
 
 #if defined(MACOS) || defined(TARGET_OS_MAC)
 #  define OS_CODE  0x07
-#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#    include <unix.h> /* for fdopen */
-#  else
-#    ifndef fdopen
-#      define fdopen(fd,mode) NULL /* No fdopen() */
+#  ifndef Z_SOLO
+#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#      include <unix.h> /* for fdopen */
+#    else
+#      ifndef fdopen
+#        define fdopen(fd,mode) NULL /* No fdopen() */
+#      endif
 #    endif
 #  endif
 #endif
@@ -151,7 +149,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define fdopen(fd,mode) NULL /* No fdopen() */
 #endif
 
-#if (defined(_MSC_VER) && (_MSC_VER > 600))
+#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
 #  if defined(_WIN32_WCE)
 #    define fdopen(fd,mode) NULL /* No fdopen() */
 #    ifndef _PTRDIFF_T_DEFINED
@@ -163,6 +161,19 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
+#if defined(__BORLANDC__) && !defined(MSDOS)
+  #pragma warn -8004
+  #pragma warn -8008
+  #pragma warn -8066
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_WIN32) && \
+    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#endif
+
         /* common defaults */
 
 #ifndef OS_CODE
@@ -175,40 +186,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
          /* functions */
 
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#if defined(__CYGWIN__)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#ifndef HAVE_VSNPRINTF
-#  ifdef MSDOS
-     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
-        but for now we just assume it doesn't. */
-#    define NO_vsnprintf
-#  endif
-#  ifdef __TURBOC__
-#    define NO_vsnprintf
-#  endif
-#  ifdef WIN32
-     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#      define vsnprintf _vsnprintf
-#    endif
-#  endif
-#  ifdef __SASC
-#    define NO_vsnprintf
-#  endif
-#endif
-#ifdef VMS
-#  define NO_vsnprintf
-#endif
-
-#if defined(pyr)
+#if defined(pyr) || defined(Z_SOLO)
 #  define NO_MEMCPY
 #endif
 #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
@@ -232,16 +210,16 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #    define zmemzero(dest, len) memset(dest, 0, len)
 #  endif
 #else
-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
-   extern void zmemzero OF((Bytef* dest, uInt len));
+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
 #endif
 
 /* Diagnostic functions */
 #ifdef DEBUG
 #  include <stdio.h>
-   extern int z_verbose;
-   extern void z_error    OF((char *m));
+   extern int ZLIB_INTERNAL z_verbose;
+   extern void ZLIB_INTERNAL z_error OF((char *m));
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}
@@ -257,13 +235,19 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define Tracecv(c,x)
 #endif
 
-
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void   zcfree  OF((voidpf opaque, voidpf ptr));
+#ifndef Z_SOLO
+   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                                    unsigned size));
+   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+#endif
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))
 #define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 
+/* Reverse the bytes in a 32-bit value */
+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
 #endif /* ZUTIL_H */
diff --git a/AUTHORS b/doc/AUTHORS
similarity index 100%
rename from AUTHORS
rename to doc/AUTHORS
diff --git a/doc/AuctionHouseBot.txt b/doc/AuctionHouseBot.txt
deleted file mode 100644
index 7818ed89d77..00000000000
--- a/doc/AuctionHouseBot.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Auction Houses Bot populates the auction houses with items.
-It makes the game feel a bit more active in auction usage part
-specially for low-populated servers. Items and prices are chosen
-randomly based on the parameters you define. If an auction expires, auctions
-are deleted quietly. AHBot will not buy it's own items, and will not receive
-mail from the AH or get returned mail.
-
-===============================================================================
-~~HOW TO CONFIGURE~~
-===============================================================================
-
-You must copy config file template as ahbot.conf from src/game/AuctionHouseBot/ahbot.conf.dist.in
-to directory wher use store mangosd.conf file, and modify values to appropriate for you state.
-Read ahbot.conf option descriptions for details.
-
-Note: But default AHBot disabled by provided config options values
diff --git a/ChangeLog b/doc/ChangeLog
similarity index 96%
rename from ChangeLog
rename to doc/ChangeLog
index c5bd2b38045..aa965c8b86a 100644
--- a/ChangeLog
+++ b/doc/ChangeLog
@@ -1,19 +1,54 @@
-MaNGOS 0.17   (??? ??? 2010)
+MaNGOS 0.18   (?? ??? 20??)
 
- MaNGOS 0.17 - adds further improvements to the
+ MaNGOS 0.18 - adds further improvements to the
  server core as well as to the majority of game classes and the game content
  database.
 
- ==== Game Features ====
+==== Game Features ====
+==== Server Features ====
+==== Statistics ====
+* Fixed Bugs: ??? tickets and many bugs reported at forum resolved
+* Total number of changes: ??? revisions (??? commits)
 
- ==== Server Features ====
 
- * Improved: Updated MySQL client libs to 5.1.49.
- * Improved: Updated ACE framework to 5.8.3.
+MaNGOS 0.17   (17 November 2012)
 
- ==== Statistics ====
- * Fixed Bugs: ??? tickets and many bugs reported at forum resolved
- * Total number of changes: ??? revisions (??? commits)
+ MaNGOS 0.17 - adds further improvements to the
+ server core as well as to the majority of game classes and the game content
+ database.
+
+==== Game Features ====
+* Add Auction House Bot
+* Add Creature linking
+* Add Pathfinding
+* Add Outdoor PvP for zones Eastern Plaguelands, Silithus, Hellfire Peninsula, Terorkkar Forest, Zangarmarsh, Halaa and Venture Bay
+* Add support for Gameobject group loot
+* Add support for Vehicles
+* Improve liquid handling
+* Add support for dynamic collision
+
+==== Server Features ====
+* Add Prepared SQL-Statements
+* Add a bunch of new commands for DB scripts and rewrite the engine
+* Map system re-engineered. Instance maps are updated normally like non instance maps, memory usage reduced
+* Optimize server performance by reducing frequency of visibility update calls
+* Multiple MySQL connections to database.
+* New system for parallelizing client packet processing
+* Move vmaps to vmap version 3.0 and then to 4.0
+* Add PersistantState system
+* Implement proper work pool/gameevent spawns in Map instances
+* Implement server side spells
+* Implement a new conditions system that is more flexible
+* Improve overall spell targeting and implement many spells
+* Generic code style fixes
+
+* Updated MySQL client libs to 5.1.49.
+* Updated ACE framework to 5.8.3.
+* Updated G3DLite library to 8.0.1
+
+==== Statistics ====
+* Total number of changes: 2132 revisions (2273 commits)
+* Lots of bugs from forum and issues from github fixed
 
 
 MaNGOS 0.16   (2 July 2010)
diff --git a/doc/EventAI.txt b/doc/EventAI.txt
index fd74436e11e..1afaef4e1d0 100644
--- a/doc/EventAI.txt
+++ b/doc/EventAI.txt
@@ -1,8 +1,6 @@
-======================================================
-EventAI Documentation: (Last Updated: January 8, 2010)
-======================================================
-
-Copyright (C) 2009-2012 MaNGOS <http://getmangos.com/>
+===========================================================================
+MaNGOS EventAI (Creature_AI) Documentation: (Last Updated: August 22, 2012)
+===========================================================================
 
 EventAI allows users to create new creature scripts entirely within the database.
 
@@ -19,13 +17,13 @@ Below is the list of current fields of the creature_ai_scripts table.
 
 Field_Name                      Description
 -------------------------------------------
-id                              This value is merely an incrementing counter of the current Event number. Required for sql queries.
-creature_id                     Creature ID which should trigger this event (This is from Creature_Template Table).
+id                              This value is merely an incrementing counter of the current Event number. Required for sql queries. (ACID Standards: CreatureID+Additional 2 digit Incriment Starting with 01)
+creature_id                     Creature ID which should trigger this event (This is entry value from `creature_template` table).
 
-event_type                      The type of event (see "Event types" below)
-event_inverse_phase_mask        Mask with phases this event should NOT trigger in*
+event_type                      The type of event you want to script. (see "Event Types" below for different values)
+event_inverse_phase_mask        Mask with phases this event should NOT trigger in* (See footnote for more details on using any other value then 0)
 event_chance                    Percentage chance of triggering the event (1 - 100)
-event_flags                     Event flags (repeatable, ... (see below))
+event_flags                     Event Flags (Used to select Repeatable or Dungeon/Raid Difficulty Level)... See "Event Flags" Below For Defined Values
 event_param1                    Variables for the event (depends on event_type)
 event_param2                    Variables for the event (depends on event_type)
 event_param3                    Variables for the event (depends on event_type)
@@ -50,72 +48,75 @@ All params are signed 32-bit values (+/- 2147483647). Time values are always in
 In case of a percentage value, use value/100 (ie. param = 500 then that means 500%, -50 = -50%)
 
 [*] Phase mask is a bitmask of phases which shouldn't trigger this event. (ie. Phase mask of value 12 (binary 1100) results in triggering this event in phases 0, 1 and all others with exception for phases 2 and 3 (counting from 0).
-
+[*] Phase 0 is default so this will occur in all phases unless specified. (1101 = Triggers in Phase 1 of 3, 1011 = Triggers in Phase 2 of 3, 0111 = Triggers in Phase 3 of 3, 0011 = Triggers in Both Phase 2 and 3).
+[*] Take Desired Binary Configuration and convert into Decimal and this is your event_inverse_phase_mask to use in your script.
 
 =========================================
 Event Types
 =========================================
 
-A list of event types EventAI is able to handle.
+This is the list of available Event Types EventAI is able to handle.
 Each event type has its own specific interpretation of the params that accompany it.
 Params are always read in the ascending order (from Param1 to Param3).
-Events will not repeat until the creature exits combat or unless EFLAG_REPEATABLE is set.
-Some events such as EVENT_T_AGGRO, EVENT_T_DEATH, EVENT_T_SPAWNED, and EVENT_T_EVADE cannot repeat.
 
-#   Internal name                Param usage                                             Description
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-0    EVENT_T_TIMER                  InitialMin, InitialMax, RepeatMin, RepeatMax            Expires at first between (Param1) and (Param2) and then will repeat between every (Param3) and (Param4),  EXPIRES ONLY IN COMBAT.
-1    EVENT_T_TIMER_OOC              InitialMin, InitialMax, RepeatMin, RepeatMax            Expires at first between (Param1) and (Param2) and then will repeat between every (Param3) and (Param4),  EXPIRES ONLY OUT OF COMBAT WHILE NOT EVADING.
-2    EVENT_T_HP                     HPMax%, HPMin%, RepeatMin, RepeatMax                    Expires when the Creature's HP is between (Param1) and (Param2). Will repeat between every (Param3) and (Param4).
-3    EVENT_T_MANA                   ManaMax%,ManaMin% RepeatMin, RepeatMax                  Expires once the Creature's Mana% is between (Param1) and (Param2). Will repeat between every (Param3) and (Param4).
-4    EVENT_T_AGGRO                  NONE                                                    Expires ONLY upon the Creature's INITIAL Aggro at the Start of Combat (Does NOT Repeat).
-5    EVENT_T_KILL                   RepeatMin, RepeatMax                                    Expires upon Killing a Player. Will repeat between (Param1) and (Param2).
-6    EVENT_T_DEATH                  NONE                                                    Expires upon the Creature's Death. (This Triggers At The Moment The Creature Dies)
-7    EVENT_T_EVADE                  NONE                                                    Expires at the moment the Creature EnterEvadeMode().
-8    EVENT_T_SPELLHIT               SpellID, Schoolmask, RepeatMin, RepeatMax               Expires upon a Spell Hit on the Creature. When (param1) is set, it is the specific Spell ID used as the trigger. With (param2) specified, the expiration is limited to specific spell schools (-1 for all). Will repeat every (Param3) and (Param4). Only A Spell ID or Spell School may be Specified but NOT both.
-9    EVENT_T_RANGE                  MinDist, MaxDist, RepeatMin, RepeatMax                  Expires when the Highest Threat Target Distance is Greater than (Param1) and Less than (Param2). Will repeat between every (Param3) and (Param4).
-10   EVENT_T_OOC_LOS                Hostile-or-Not, MaxAllowedRange, RepeatMin, RepeatMax   Expires when a unit moves within distance (MaxAllowedRange) of a creature. If (Param1) is zero it will expire only when unit is hostile, friendly otherwise (Param1 = 1), depends generally on faction. Will repeat every (Param3) and (Param4). Does not expire when the creature is in combat.
-11   EVENT_T_SPAWNED                NONE                                                    Expires on initial spawn and on creature respawn (useful for setting ranged movement type).
-12   EVENT_T_TARGET_HP              HPMax%, HPMin%, RepeatMin, RepeatMax                    Expires when current target's HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
-13   EVENT_T_TARGET_CASTING         RepeatMin, RepeatatMax                                  Expires when the current target is casting a spell. Will repeat every (Param1) and (Param2).
-14   EVENT_T_FRIENDLY_HP            HPDeficit, Radius, RepeatMin, RepeatMax                 Expires when a friendly unit in radius has at least (Param1) HP missing. Will repeat every (Param3) and (Param4).
-15   EVENT_T_FRIENDLY_IS_CC         DispelType, Radius, RepeatMin, RepeatMax                Expires when a friendly unit is crowd controlled within the given radius (Param2). Will repeat every (Param3) and (Param4).
-16   EVENT_T_FRIENDLY_MISSING_BUFF  SpellId, Radius, RepeatMin, RepeatMax                   Expires when a friendly unit is missing aura(s) given by a spell (Param1) within radius (Param2). Will repeat every (Param3) and (Param4).
-17   EVENT_T_SUMMONED_UNIT          CreatureId, RepeatMin, RepeatMax                        Expires after creature with entry = (Param1) is spawned (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3).
-18   EVENT_T_TARGET_MANA            ManaMax%, ManaMin%, RepeatMin, RepeatMax                Expires when current target's Mana is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
-21   EVENT_T_REACHED_HOME           NONE                                                    Expires when a creature reaches it's home (spawn) location after evade.
-22   EVENT_T_RECEIVE_EMOTE          EmoteId, Condition, CondValue1, CondValue2              Expires when a creature receives an emote with emote text id (enum TextEmotes) in (Param1). Conditions can be defined (Param2) with optional values (Param3,Param4), see enum ConditionType.
-23   EVENT_T_AURA                   SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when a creature has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
-24   EVENT_T_TARGET_AURA            SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when the current target unit has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
-25   EVENT_T_SUMMONED_JUST_DIED     CreatureId, RepeatMin, RepeatMax                        Expires after creature with entry = (Param1) is die (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3).
-26   EVENT_T_SUMMONED_JUST_DESPAWN  CreatureId, RepeatMin, RepeatMax                        Expires before creature with entry = (Param1) is despawn (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3).
-27   EVENT_T_MISSING_AURA           SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when a creature not has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
-28   EVENT_T_TARGET_MISSING_AURA    SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when when the current target unit not has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
+NOTE: Events will not repeat until the creature exits combat or unless EFLAG_REPEATABLE value is set in Event Flags.
+Some events such as EVENT_T_AGGRO, EVENT_T_DEATH, EVENT_T_SPAWNED, and EVENT_T_EVADE cannot repeat even if EFLAG_REPEATABLE value is set.
 
+#    Internal Name                 Event Param Usage (Param1, Param2, Param3, Param4)      Description
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+0    EVENT_T_TIMER_IN_COMBAT       InitialMin, InitialMax, RepeatMin, RepeatMax            Expires at first between (Param1) and (Param2) and then will repeat between every (Param3) and (Param4),  EXPIRES ONLY IN COMBAT.
+1    EVENT_T_TIMER_OOC             InitialMin, InitialMax, RepeatMin, RepeatMax            Expires at first between (Param1) and (Param2) and then will repeat between every (Param3) and (Param4),  EXPIRES ONLY OUT OF COMBAT BUT NOT DURING EVADE.
+2    EVENT_T_HP                    HPMax%, HPMin%, RepeatMin, RepeatMax                    Expires when the NPC's HP% is between (Param1) and (Param2). Will repeat between every (Param3) and (Param4) If Event Conditions Are Still Met.
+3    EVENT_T_MANA                  ManaMax%, ManaMin%, RepeatMin, RepeatMax                Expires when the NPC's Mana% is between (Param1) and (Param2). Will repeat between every (Param3) and (Param4) If Event Conditions Are Still Met.
+4    EVENT_T_AGGRO                 NONE                                                    Expires ONLY upon the NPC's INITIAL Aggro at the Start of Combat (Does NOT Repeat) and Only Resets on Spawn or Evade.
+5    EVENT_T_KILL                  RepeatMin, RepeatMax                                    Expires upon Killing a Player. Will Repeat Check between (Param1) and (Param2). This Event Will Not Trigger Again Until Repeat Timer Expires
+6    EVENT_T_DEATH                 NONE                                                    Expires on the NPC's Death. (This Triggers At The Moment The NPC Dies)
+7    EVENT_T_EVADE                 NONE                                                    Expires at the moment the Creature EnterEvadeMode() and Exits Combat.
+8    EVENT_T_SPELLHIT              SpellID, Schoolmask, RepeatMin, RepeatMax               Expires upon Spell Hit of the NPC. When (param1) is set, it is the specific Spell ID used as the trigger. With (param2) specified, the expiration is limited to specific spell schools (-1 for all) and Spell ID value is ignored. Will repeat Event Conditions Check between every (Param3) and (Param4). Only A Spell ID or Spell School may be Specified but NOT both.
+9    EVENT_T_RANGE                 MinDist, MaxDist, RepeatMin, RepeatMax                  Expires when the Highest Threat Target Distance is Greater than (Param1) and Less than (Param2). Will repeat between every (Param3) and (Param4) if Event Conditions Are Still Met.
+10   EVENT_T_OOC_LOS               Hostile-or-Not, MaxAllowedRange, RepeatMin, RepeatMax   Expires when a unit moves within distance (MaxAllowedRange) of the NPC. If (Param1) is 0 it will expire only when unit is hostile, If (Param1) is 1 it will expire only when unit is friendly. This depends generally on faction relations. Will repeat every (Param3) and (Param4). Does NOT expire when the NPC is in combat.
+11   EVENT_T_SPAWNED               NONE                                                    Expires on initial spawn and respawn of the NPC (Useful for setting Ranged Movement/Summoning Pets/Applying Buffs).
+12   EVENT_T_TARGET_HP             HPMax%, HPMin%, RepeatMin, RepeatMax                    Expires when current target's HP% is between (Param1) and (Param2). Will repeat every (Param3) and (Param4)If Event Conditions Are Still Met.
+13   EVENT_T_TARGET_CASTING        RepeatMin, RepeatatMax                                  Expires when the current target is casting a spell. Will repeat every (Param1) and (Param2) If Event Conditions Are Still Met.
+14   EVENT_T_FRIENDLY_HP           HPDeficit, Radius, RepeatMin, RepeatMax                 Expires when a friendly unit in (Radius) has at least (Param1) HP points missing. Will repeat every (Param3) and (Param4) If Event Conditions Are Still Met.
+15   EVENT_T_FRIENDLY_IS_CC        DispelType, Radius, RepeatMin, RepeatMax                Expires when a friendly unit is crowd controlled within the given Radius (Param2). Will repeat every (Param3) and (Param4).
+16   EVENT_T_FRIENDLY_MISSING_BUFF SpellId, Radius, RepeatMin, RepeatMax                   Expires when a friendly unit is missing aura(s) given by a spell (Param1) within Radius (Param2). Will repeat every (Param3) and (Param4) If Event Conditions Are Still Met.
+17   EVENT_T_SUMMONED_UNIT         CreatureId, RepeatMin, RepeatMax                        Expires after creature with entry = (Param1) is spawned (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3).
+18   EVENT_T_TARGET_MANA           ManaMax%, ManaMin%, RepeatMin, RepeatMax                Expires when current target's Mana% is between (Param1) and (Param2). Will repeat every (Param3) and (Param4) If Event Conditions Are Still Met.
+21   EVENT_T_REACHED_HOME          NONE                                                    Expires when a creature reaches it's home (spawn) location after evade. This is commonly used for NPC's who Stealth once reaching their Spawn Location
+22   EVENT_T_RECEIVE_EMOTE         EmoteId, Condition, CondValue1, CondValue2              Expires when a creature receives an emote with emote text id ("enum TextEmotes" from SharedDefines.h in Mangos Source) in (Param1). Conditions can be defined (Param2) with optional values (Param3,Param4), see (enum ConditionType) in ObjectMgr.h (Mangos Source).
+23   EVENT_T_AURA                  SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when a creature has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4) If Event Conditions Are Still Met.
+24   EVENT_T_TARGET_BUFFED         SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when a target unit has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4) If Event Conditions Are Still Met.
+25   EVENT_T_SUMMONED_JUST_DIED    CreatureId, RepeatMin, RepeatMax                        Expires after creature with entry = (Param1) is die (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3).
+26   EVENT_T_SUMMONED_JUST_DESPAWN CreatureId, RepeatMin, RepeatMax                        Expires before creature with entry = (Param1) is despawn (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3).
+27   EVENT_T_MISSING_AURA          SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when a creature not has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
+28   EVENT_T_TARGET_MISSING_AURA   SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when a target unit not has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
+29   EVENT_T_TIMER_GENERIC         InitialMin, InitialMax, RepeatMin, RepeatMax            Expires at first between (Param1) and (Param2) and then will repeat between every (Param3) and (Param4).
+30   EVENT_T_RECEIVE_AI_EVENT      AIEventType, Sender-Entry, unused, unused               Expires when the creature receives an AIEvent of type (Param1), sent by creature (Param2 != 0). If (Param2 = 0) then sent by any creature
 
 =========================================
 Action Types
 =========================================
 
-A list of action types that EventAI can handle.
-Each event type has its own specific interpretation of it's params, like every event type.
-For all ACTION_T_RANDOM, When a Particular Param is selected for the Event... The SAME Param # is selected for all 3 actions.
+This is a list of action types that EventAI is able to handle.
+Each event type has it's own specific interpretation of it's params, just like Events.
+For all ACTION_T_RANDOM Actions, When a Particular Param is selected for the Event... The SAME Param # is selected for all 3 actions when Event is triggered.
 
 #    Internal name                          Param usage                     Description
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 0    ACTION_T_NONE                          No Action                       Does nothing.
-1    ACTION_T_TEXT                          -TextId1, -TextId2, -TextId3    Simply displays the specified -TextId. When -TextId2 and -TextId3 are specified, the selection will be randomized. Text types are defined, along with other options for the text, in a table below. All values needs to be negative.
+1    ACTION_T_TEXT                          -TextId1, -TextId2, -TextId3    Displays the specified -TextId. When -TextId2 and -TextId3 are specified, the selection will be Randomized between 1,2 or 3. Text ID's are defined, along with other options for the text, in creature_ai_texts table. Below is detailed Text Information. All text ID values for EventAI MUST be negative.
 2    ACTION_T_SET_FACTION                   FactionId, Flags                Changes faction for a creature. When param1 is zero, creature will revert to it's default faction. Flags will determine when faction is restored to default (evade, respawn etc)
-3    ACTION_T_MORPH_TO_ENTRY_OR_MODEL       CreatureEntry, ModelId          Set either model from creature_template.entry (Param1) OR explicit modelId (Param2). If (Param1) AND (Param2) are both 0, demorph and revert to the default model.
-4    ACTION_T_SOUND                         SoundId                         Plays a sound
-5    ACTION_T_EMOTE                         EmoteId                         Does an emote
-6    ACTION_T_RANDOM_SAY                    UNUSED                          UNUSED
-7    ACTION_T_RANDOM_YELL                   UNUSED                          UNUSED
-8    ACTION_T_RANDOM_TEXTEMOTE              UNUSED                          UNUSED
-9    ACTION_T_RANDOM_SOUND                  SoundId1, SoundId2, SoundId3    Plays a random sound *
-10   ACTION_T_RANDOM_EMOTE                  EmoteId1, EmoteId2, EmoteId3    Emotes a random emote *
-11   ACTION_T_CAST                          SpellId, Target, CastFlags      Casts spell (Param1) on a target (Param2) using cast flags (specified below).
-12   ACTION_T_SUMMON                        CreatureID, Target, Duration    Summons a creature (Param1) for (Param3) duration and orders it to attach (Param2) target. Spawns on top of current creature.
+3    ACTION_T_MORPH_TO_ENTRY_OR_MODEL       CreatureEntry, ModelId          Sets either model from creature_template.entry (Param1) OR explicit modelId (Param2) for the NPC. If (Param1) AND (Param2) are both 0, NPC will demorph and revert to the default model (as specified in creature_template).
+4    ACTION_T_SOUND                         SoundId                         NPC Plays a specified Sound ID.
+5    ACTION_T_EMOTE                         EmoteId                         NPC Does a specified Emote ID.
+6    UNUSED                    				UNUSED                          UNUSED
+7    UNUSED                   				UNUSED                          UNUSED
+8    UNUSED              					UNUSED                          UNUSED
+9    ACTION_T_RANDOM_SOUND                  SoundId1, SoundId2, SoundId3    NPC Plays a Random Sound ID (Random Selects Param1, Param2 or Param3) *
+10   ACTION_T_RANDOM_EMOTE                  EmoteId1, EmoteId2, EmoteId3    NPC Emotes a Random Emote ID (Random Selects Param1, Param2 or Param3) *
+11   ACTION_T_CAST                          SpellId, Target, CastFlags      Casts spell (Param1) on a target (Param2) using cast flags (Param3) --> Specified Below
+12   ACTION_T_SUMMON                        CreatureID, Target, Duration    Summons a Creature ID (Param1) for (Param3) duration after Evade (In MS) and orders it to attack (Param2) target (specified below). Spawns on top of NPC who summons it.
 13   ACTION_T_THREAT_SINGLE_PCT             Threat%, Target                 Modifies a threat by (Param1) percent on a target (Param2).
 14   ACTION_T_THREAT_ALL_PCT                Threat%                         Modifies a threat by (Param1) on all targets in the threat list (using -100% here will result in full aggro dump).
 15   ACTION_T_QUEST_EVENT                   QuestID, Target                 Calls AreaExploredOrEventHappens with (Param1) for a target in (Param2).
@@ -147,13 +148,17 @@ For all ACTION_T_RANDOM, When a Particular Param is selected for the Event... Th
 41   ACTION_T_FORCE_DESPAWN                 Delay                           Despawns the creature, if delay = 0 immediate otherwise will despawn after delay time set in Param1 (in ms).
 42   ACTION_T_SET_INVINCIBILITY_HP_LEVEL    HP_Level, HP_Percent            Set min. health level for creature that can be set at damage as flat value or percent from max health
 43   ACTION_T_MOUNT_TO_ENTRY_OR_MODEL       CreatureEntry, ModelId          Set mount model from creature_template.entry (Param1) OR explicit modelId (Param2). If (Param1) AND (Param2) are both 0, unmount.
+44   ACTION_T_CHANCED_TEXT                  Chance, -TextId1, -TextId2      Displays by Chance (1..100) the specified -TextId. When -TextId2 is specified, the selection will be randomized. Text types are defined, along with other options for the text, in a table below. Param2 and Param3 needs to be negative.
+45   ACTION_T_THROW_AI_EVENT                EventType, Radius               Throws an AIEvent of type (Param1) to nearby friendly Npcs in range of (Param2)
+46   ACTION_T_SET_THROW_MASK                EventTypeMask                   Marks for which AIEvents the npc will throw AIEvents on its own.
+47   ACTION_T_SET_STAND_STATE               StandState                      Set the unit stand state (Param1) of the current creature.
 
 * = Use -1 where the param is expected to do nothing. Random constant is generated for each event, so if you have a random yell and a random sound, they will be linked up with each other (ie. param2 with param2).
 
 
-=========================================
-Event Types
-=========================================
+==============================================
+Event Types: Expanded and Detailed Information
+==============================================
 Note:
 COMBAT ONLY - Means that this event will only trigger durring combat.
 OUT OF COMBAT ONLY - Means that this event will only trigger while out of combat.
@@ -162,45 +167,46 @@ BOTH - This event can trigger both in and out of combat.
 Events that do not have lables on them are events that are directly involved with the in and out of combat state.
 
 ------------------
-0 = EVENT_T_TIMER:
+0 = EVENT_T_TIMER_IN_COMBAT:
 ------------------
 Parameter 1: InitialMin - Minumum Time used to calculate Random Initial Expire
 Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Expire
 Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
 Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
 
-COMBAT ONLY! - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
-This is commonly used for spells that repeat cast during combat (Simulate Spell Cooldown).
+COMBAT ONLY - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
+This is commonly used for spells that repeat cast during combat (Simulates Spell Cooldown).
 
 ----------------------
 1 = EVENT_T_TIMER_OOC:
 ----------------------
-Parameter 1: InitialMin - Minumum Time used to calculate Random Initial Expire
-Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Expire
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+Parameter 1: InitialMin - Minimum Time used to calculate Random Initial Event Expire
+Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Event Expire
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Event Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Event Expire
 
-OUT OF COMBAT ONLY! NOT WHILE EVADING. - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
-This is commonly used for events that occur and repeat outside of combat.
+OUT OF COMBAT ONLY (Not while evading) - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
+This is commonly used for events that occur and repeat outside of combat like random NPC Say or Random Emotes.
 
 ---------------
 2 = EVENT_T_HP:
 ---------------
-Parameter 1: HPMax% - Maximum HP% That this Event will Expire
-Parameter 2: HPMin% - Minimum HP% That this Event will Expire
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+Parameter 1: HPMax% - Maximum HP% That will trigger this Event to Expire
+Parameter 2: HPMin% - Minimum HP% That will trigger this Event to Expire
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Event Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Event Expire
 
 BOTH - Expires when HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
-This is commonly used for events that trigger at a specific HP% (Such as Heal/Enrage Spells or NPC's that Flee).
+This is commonly used for events that occur at a specific HP% Range (Such as Heal/Enrage Spells or NPC's that Flee).
+NOTE: For Repeat Events the Repeat Timer ONLY Re-Check's Event Conditions to see If HP% Is Between Max and Min. If it is then Event will Expire again.
 
 -----------------
 3 = EVENT_T_MANA:
 -----------------
-Parameter 1: ManaMax% - Maximum Mana% That this Event will Expire
-Parameter 2: ManaMin% - Minimum Mana% That this Event will Expire
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+Parameter 1: ManaMax% - Maximum Mana% That will trigger this Event to Expire
+Parameter 2: ManaMin% - Minimum Mana% That will trigger this Event to Expire
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Event Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Event Expire
 
 BOTH - Expires once Mana% is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
 This is commonly used for events where an NPC low on Mana will do something (Such as stop casting spells and switch to melee).
@@ -208,39 +214,41 @@ This is commonly used for events where an NPC low on Mana will do something (Suc
 ------------------
 4 = EVENT_T_AGGRO:
 ------------------
-This Event Expires upon initial aggro (does not repeat).
+COMBAT ONLY - This Event Expires upon Initial Aggro (This Event does not occur again until NPC either Evades/Respawns and then Enters Combat Again).
 
 -----------------
 5 = EVENT_T_KILL:
 -----------------
-Parameter 1: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 2: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+Parameter 1: RepeatMin - Minimum Time used to calculate Random Repeat Event Expire
+Parameter 2: RepeatMax - Maximum Time used to calculate Random Repeat Event Expire
 
-COMBAT ONLY! - Expires upon killing a player. Will repeat every (Param1) and (Param2).
-This Event Expires upon killing a player. It is commonly used for NPC's who yell or do something after killing a player.
+COMBAT ONLY - Expires upon killing a player. Will repeat every (Param1) and (Param2).
+This Event Expires upon killing a player. It is commonly used for NPC's who yell or do something after killing a player. Normally use a short repeating timer is advisable.
+NOTE: For Repeat Events the Repeat Timer ONLY Re-Check's Event Conditions to see If another Player Kill has occured. So After Repeat Min/Max Player Kill Event can occur again.
 
 ------------------
 6 = EVENT_T_DEATH:
 ------------------
-This Event Expires upon Death of the Scripted NPC.
-This is commonly used for NPC's who have a yell on death or cast some kind if summon spell when they die.
+BOTH - This Event Expires upon Death of the Scripted NPC. This is normally only used in combat though.
+This is commonly used for NPC's who have a Yell or Spell Cast when they Die.
 
 ------------------
 7 = EVENT_T_EVADE:
 ------------------
-This Event Expires upon the creature EnterEvadeMode().
-This is commonly used for NPC's who use phases, allows you to reset their phase to 0 upon evade to prevent possible strange behavior.
+COMBAT ONLY - This Event Expires when the Scripted NPC Evades Combat (EnterEvadeMode).
+This is commonly used for NPC's who use phases, allows you to reset their phase to 0 on evade to prevent possible strange behavior on Re-Aggro.
 
 ---------------------
 8 = EVENT_T_SPELLHIT:
 ---------------------
-Parameter 1: SpellID - The Spell ID that will trigger the event to occur (NOTE: If you use Spell School as the trigger set this value to 0)
-Parameter 2: School - Spell School to trigger the event (NOTE: If you use a SpellID then set this value to -1) - *See Below for Spell School Bitmask Values*
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+Parameter 1: SpellID - The Spell ID that will trigger the Event to occur (NOTE: If you use Spell School as the trigger ALWAYS set this value to 0)
+Parameter 2: School - Spell School to trigger the Event (NOTE: If you use a SpellID then ALWAYS set this value to -1) - *See Below for Spell School Bitmask Values*
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Event Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Event Expire
 
-BOTH - Expires upon Spell hit. If (param1) is set will only expire on that spell OR If (param2) is set it will only expire on spells of that school. Will repeat every (Param3) and (Param4).
+BOTH - Expires on Spellhit. If (param1) is set it will only expire on that SPECIFIC Spell OR If (param2) is set it will only expire on Spells of that School. Will repeat every (Param3) and (Param4).
 This Event is commonly used for NPC's who can do special things when you cast a spell (Or specific spell) on them.
+NOTE: For Repeat Events the Repeat Timer ONLY Re-Check's Event Conditions to see If another Spellhit has occured. So After Repeat Min/Max expires Spellhit Event can occur again.
 
 (Name ==> School ==> School Bitmask Values)
 -------------------------------------------
@@ -251,7 +259,7 @@ SPELL_SCHOOL_NATURE = 3 ==> 8
 SPELL_SCHOOL_FROST  = 4 ==> 16
 SPELL_SCHOOL_SHADOW = 5 ==> 32
 SPELL_SCHOOL_ARCANE = 6 ==> 64
-Use These Bitmask Values For Schoolmask (Param2) or Any Combinations Of These Schoolmasks for Multiple Schools.
+Use These Bitmask Values For Schoolmask (Param2) or Any Combinations Of These School Bitmasks for Multiple Schools.
 
 ------------------
 9 = EVENT_T_RANGE:
@@ -261,7 +269,7 @@ Parameter 2: MaxDist - This Distance is the Maximum Distance between the NPC and
 Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
 Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
 
-COMBAT ONLY! - Expires when the highest threat target distance is greater than (Param1) and less than (Param2). Will repeat every (Param3) and (Param4).
+COMBAT ONLY - Expires when the highest threat target distance is greater than (Param1) and less than (Param2). Will repeat every (Param3) and (Param4).
 This Event is commonly used for NPC's who have Ranged Combat and will Throw/Shoot between a certian distance.
 
 ---------------------
@@ -272,7 +280,7 @@ Parameter 2: MaxAllowedRange  - Expires when a Unit moves within this distance t
 Parameter 3: RepeatMin        - Minimum Time used to calculate Random Repeat Expire
 Parameter 4: RepeatMax        - Maximum Time used to calculate Random Repeat Expire
 
-OUT OF COMBAT!
+OUT OF COMBAT ONLY
 This Event is commonly used for NPC's who do something or say something to you when you walk past them Out of Combat.
 
 ---------------------
@@ -283,6 +291,9 @@ This Event is commonly used for setting ranged movement type or Summoning a Pet
 Parameter 1: 0: works always, 1: works on map in Parameter 2, 2: works on zone/subzone in Parameter 2
 Parameter 2: depends on Parameter 1: for 1 it is map ID, for 2 it is area ID to check
 
+BOTH - Expires in or out of combat when the NPC Spawns
+This Event is commonly used for NPC's who cast a spell or do something special when they spawn. This event is not repeatable so it is a one time event on Spawn.
+
 -----------------------
 12 = EVENT_T_TARGET_HP:
 -----------------------
@@ -291,7 +302,7 @@ Parameter 2: HPMin% - Minimum HP% That this Event will Expire
 Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
 Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
 
-COMBAT ONLY! - Expires when Current NPC's Target's HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
+COMBAT ONLY - Expires when Current NPC's Target's HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
 This Event is commonly used for NPC's who have a special ability (Like Execute) that only casts when a Player HP is low.
 
 ----------------------------
@@ -300,7 +311,7 @@ This Event is commonly used for NPC's who have a special ability (Like Execute)
 Parameter 1: RepeatMin - Minimum Time used to calculate Random Repeat Expire
 Parameter 2: RepeatMax - Maximum Time used to calculate Random Repeat Expire
 
-COMBAT ONLY! - Expires when the current target is casting a spell. Will repeat every (Param1) and (Param2).
+COMBAT ONLY - Expires when the current target is casting a spell. Will repeat every (Param1) and (Param2).
 This event is commonly used for NPC's who will cast a counter spell when their target starts to cast a spell.
 
 -------------------------
@@ -311,7 +322,7 @@ Parameter 2: Radius - This is the Range in Yards the NPC will scan for nearby Fr
 Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
 Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
 
-COMBAT ONLY! - Expires when a friendly unit in radius(param2) has at least (param1) hp missing. Will repeat every (Param3) and (Param4).
+COMBAT ONLY - Expires when a friendly unit in radius(param2) has at least (param1) hp missing. Will repeat every (Param3) and (Param4).
 This is commonly used when an NPC in Combat will heal a nearby Friendly NPC in Combat with a Heal/Renew Spell.
 
 ----------------------------
@@ -322,12 +333,12 @@ Parameter 2: Radius - This is the Range in Yards the NPC will scan for nearby Fr
 Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
 Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
 
-COMBAT ONLY! - Expires when a friendly unit is Crowd controlled within the given radius (param2). Will repeat every (Param3) and (Param4).
+COMBAT ONLY - Expires when a friendly unit is Crowd controlled within the given radius (param2). Will repeat every (Param3) and (Param4).
 This is commonly used for NPC's who can come to the resule of other Friendly NPC's if being Crowd Controlled
 
---------------------------
-16 = EVENT_T_MISSING_BUFF:
---------------------------
+-----------------------------------
+16 = EVENT_T_FRIENDLY_MISSING_BUFF:
+-----------------------------------
 Parameter 1: SpellId - This is the SpellID That the Aura Check will look for (If it is missing this Aura)
 Parameter 2: Radius - This is the Range in Yards the NPC will scan for nearby Friendlies (Faction is Friendly To) for the missing Aura.
 Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
@@ -355,11 +366,16 @@ Most commonly used to cast spells that can not be casted in EVENT_T_EVADE and ot
 ---------------------------
 22 = EVENT_T_RECEIVE_EMOTE:
 ---------------------------
-Expires only when creature receive emote from player. Valid text emote id's are in Mangos source (enum TextEmotes)
-Event does not require any conditions to process, however many are ecpected to have condition.
+Parameter 1: EmoteId - Valid text emote ID from Mangos source (SharedDefines.h - enum TextEmotes)
+Parameter 2: Condition - Conditions based on <MaNGOS>/src/game/ObjectMgr.h - enum ConditionType
+Parameter 3: CondValue1 -
+Parameter 4: CondValue2 -
+
+Expires only when creature receive emote from player. Valid text emote id's are in Mangos source (SharedDefines.h - enum TextEmotes)
+Event does not require any conditions to process, however many are expected to have condition.
 
 ---------------------------
-23 = EVENT_T_BUFFED       :
+23 = EVENT_T_AURA         :
 ---------------------------
 Parameter 1: SpellId - This is the SpellID That the Aura Check will look for
 Parameter 2: Amount -  This is the amount of SpellID's auras at creature required for event expire.
@@ -388,9 +404,9 @@ CONDITION_QUESTREWARDED (8)   quest_id     0, if quest are rewarded
 CONDITION_QUESTTAKEN (9)      quest_id     0, while quest active(incomplete)
 CONDITION_ACTIVE_EVENT (12)   event_id     0, note this is id from dbc, also defined in Mangos source(enum HolidayIds) NOT id of game_event in database
 
----------------------------
+--------------------------------
 25 = EVENT_T_SUMMONED_JUST_DIED:
----------------------------
+--------------------------------
 Parameter 1: CreatureId - The CreatureID that the NPC is watching die to trigger this event
 Parameter 2: RepeatMin - Minimum Time used to calculate Random Repeat Expire
 Parameter 3: RepeatMax - Maximum Time used to calculate Random Repeat Expire
@@ -398,17 +414,51 @@ Parameter 3: RepeatMax - Maximum Time used to calculate Random Repeat Expire
 BOTH - Expires after creature with entry(Param1) is die or for all spawns if param1 = 0. Will repeat every (Param2) and (Param3) .
 This is commonly used for NPC's who will do something special once another NPC is die. Usually used is Complex Scripts or Special Events.
 
----------------------------
+-----------------------------------
 26 = EVENT_T_SUMMONED_JUST_DESPAWN:
----------------------------
+-----------------------------------
 Parameter 1: CreatureId - The CreatureID that the NPC is watching despawn to trigger this event
 Parameter 2: RepeatMin - Minimum Time used to calculate Random Repeat Expire
 Parameter 3: RepeatMax - Maximum Time used to calculate Random Repeat Expire
 
-BOTH - Expires before creature with entry(Param1) is dwspawned or for all spawns if param1 = 0. Will repeat every (Param2) and (Param3) .
+BOTH - Expires before creature with entry(Param1) is despawned or for all spawns if param1 = 0. Will repeat every (Param2) and (Param3) .
 This is commonly used for NPC's who will do something special once another NPC is despawn. Usually used is Complex Scripts or Special Events.
 NOTE: called before despawn happens, so summoned creature still in world at expire moment.
 
+--------------------------
+27 = EVENT_T_MISSING_BUFF:
+--------------------------
+Parameter 1: SpellId - This is the SpellID That the Aura Check will look for to be missing
+Parameter 2: Amount -  This is the amount or less of SpellID's auras at creature required for event expire.
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+---------------------------------
+28 = EVENT_T_TARGET_MISSING_AURA:
+---------------------------------
+Parameter 1: SpellId - This is the SpellID That the Aura Check will look for to be missing
+Parameter 2: Amount -  This is the amount or less of SpellID's auras at creature required for event expire.
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+---------------------------
+29 = EVENT_T_TIMER_GENERIC:
+---------------------------
+Parameter 1: InitialMin - Minumum Time used to calculate Random Initial Expire
+Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Expire
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+IN COMBAT and OUT OF COMBAT - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
+
+------------------------------
+30 = EVENT_T_RECEIVE_AI_EVENT:
+------------------------------
+Parameter 1: AIEventType  - Only expire when an AIEvent of this type is received. Supported types see CreatureAI.h enum AIEventType
+Parameter 2: Sender-Entry - If != 0 then only expire when the AIEvent is received from a creature of this entry
+
+Note: This is the only EVENT where the target-type TARGET_T_EVENT_SENDER (10) is defined
+
 =========================================
 Action Types
 =========================================
@@ -426,9 +476,9 @@ Parameter 3: Optional, if Parameter 2 exist. In this case, eventAI will randomiz
 
 Read at bottom for documentation of creature_ai_texts-table.
 
-------------------
+-------------------------
 2 = ACTION_T_SET_FACTION:
-------------------
+-------------------------
 Parameter 1: FactionId from Faction.dbc OR 0. Changes faction for creature. If 0, creature will revert to it's default faction if previously changed.
 Parameter 2: When Parameter 1 is not 0, flags can be used to restore default faction at certain events. Current supported, from enum TemporaryFactionFlags:
                 TEMPFACTION_NONE                    = 0x00,  // A persistent faction change and will require manual change to default/another faction when changed once
@@ -436,9 +486,9 @@ Parameter 2: When Parameter 1 is not 0, flags can be used to restore default fac
                 TEMPFACTION_RESTORE_COMBAT_STOP     = 0x02,  // ... at CombatStop() (happens at creature death, at evade or custom scripte among others)
                 TEMPFACTION_RESTORE_REACH_HOME      = 0x04,  // ... at reaching home in home movement (evade), if not already done at CombatStop()
 
------------------------
+-------------------------------------
 3 = ACTION_T_MORPH_TO_ENTRY_OR_MODEL:
------------------------
+-------------------------------------
 Parameter 1: Creature entry from creature_template. Action will then change to the model this creature are using.
 Parameter 2: If parameter 1 is 0, then this modelId will be used (in case parameter 1 exist, parameter 2 will not be used)
 
@@ -501,6 +551,7 @@ Parameter 2: Target - The Target Type defining who the creature should cast the
 Parameter 3: CastFlags - See Table Below for Cast Flag Bitmask Values. If you are unsure what to set this value at leave it at 0.
 
 The creature will cast a spell specified by a spell ID on a target specified by the target type.
+If the spell is normal cast, random target types will select only targets within LOS and in spell range
 This is commonly used for NPC's who cast spells.
 
 ---------------------
@@ -510,11 +561,14 @@ Parameter 1: CreatureID - The Creature Template ID to be Summoned. The value her
 Parameter 2: Target - The Target Type defining who the Summoned creature will attack once spawned. The value in this field needs to be a valid Target Type as specified in the reference tables below.
 Parameter 3: Duration - The duration until the summoned creature should be unsummoned AFTER Combat ends. The value in this field is in milliseconds or 0.
 
-The NPC will Summon another creature at the same spot as itself that will attack the specified target.
+The NPC will Summon another cast flag 0 will work for you treature at the same spot as itself that will attack the specified target.
 NOTE: Almost all Creature Summons have proper Summon Spells that should be used when possible. This Action is a powerful last resort option only to be used if nothing else works.
 NOTE: Using Target Type 0 will cause the Summoned creature to not attack anyone.
 NOTE: If Duration is set at 0, then the summoned creature will not despawn until it has died.
 This is used as a manual way to force an NPC to Summon.
+
+NOTE: THIS ONLY WORKS IN COMBAT
+
 --------------------------------
 13 = ACTION_T_THREAT_SINGLE_PCT:
 --------------------------------
@@ -584,7 +638,7 @@ When activated, this action changes the target's flags by removing (turning off)
 Parameter 1: AllowAutoAttack - If zero, then the creature will stop its melee attacks. If non-zero, then the creature will either continue its melee attacks (the action would then have no effect) or it will start its melee attacks on the target with the top threat if its melee attacks were previously stopped.
 
 This action controls whether or not the creature should stop or start the auto melee attack.
-NOTE: Developers have recommended using either 0 or 1 for the Param values (0 = Stop Melee, 1 = Start Melee).
+NOTE: The ACID Dev Team has conformed to using either 0 or 1 for the Param values (0 = Stop Melee, 1 = Start Melee).
 This is commonly used in combination with EVENT_T_RANGE and ACTION_T_COMBAT_MOVEMENT for Ranged Combat for Mages and Spell Casters.
 
 ------------------------------
@@ -594,7 +648,7 @@ Parameter 1: If zero, then the creature will stop moving towards its victim (if
 Parameter 2: If non-zero, then stop melee combat state (if param1=0) or start melee combat state (if param1!=0) and creature in combat with selected target.
 
 This action controls whether or not the creature will always move towards its target.
-NOTE: Developers have recommended using either 0 or 1 for the Param values. (0 = Stop Movement, 1 = Start Movement)
+NOTE: The ACID Dev Team has conformed to using either 0 or 1 for the Param values. (0 = Stop Movement, 1 = Start Movement)
 This is commonly used with EVENT_T_RANGE and ACTION_T_AUTO_ATTACK for NPC's who engage in Ranged Comabt (Either Spells or Ranged Attacks)
 Parameter 2 specialy used for ranged combat proper client side visual show ranged weapon in proper state.
 
@@ -624,7 +678,7 @@ When activated, the creature will immediately exit out of combat, clear its thre
 NOTE: All Param Values Are 0 for this Action.
 
 -------------------
-25 = ACTION_T_FLEE_FOR_ASSIST:
+25 = ACTION_T_FLEE:
 -------------------
 When activated, the creature will flee from combat for assistance from nearby NPC's if possible.
 NOTE: All Param Values Are 0 for this Action.
@@ -791,6 +845,58 @@ Parameter 2: Sets Format of Paramater 1 Value
 0 = Sets Paramater 1 as an exact HP value
 1 = Sets Paramater 1 as a HP Percent (0..100) of the creature's max health
 
+NOTE: To Cancel Invincible You Need To Set Script For Either 0% HP or 0 HP So Then NPC Can Be Killed Again
+
+-----------------------------------------
+43 ACTION_T_MOUNT_TO_ENTRY_OR_MODEL:
+-----------------------------------------
+Parameter 1, Optional: Set mount model from creature_template.entry
+Parameter 2, Optional: Set mount model by explicit modelId
+
+If (Param1) AND (Param2) are both 0, unmount.
+
+---------------------------
+44 = ACTION_T_CHANCED_TEXT:
+---------------------------
+Parameter 1: Chance with which a text will be displayed (must be between 1 and 99)
+
+Parameter 2: The entry of the text that the NPC should use from eventai_texts table. Optionally a entry from other tables can be used (such as custom_texts).
+             Entry are required to be negative and exist in a *_texts-table. The type text to be displayed are defined in the texts-table itself (Say, Yell, Whisper, Emote Text, Boss Whisper, Boss Emote)
+             Other options are also to be defined in the texts-table, such as a sound to be heard with the text and the language used in output (common, dwarvish, etc).
+             In case this entry has a localized version of the text, the localized text will be displayed in client that support this locale.
+
+Parameter 3: Optional TextId can be defined in addition. The same apply to this as explained above, however eventAI will randomize between the two.
+
+Also remark that the chance also depends on the chance of the event. And remark that a chance of 100 is useless and in this case ACTION_T_TEXT should be used.
+
+Read at bottom for documentation of creature_ai_texts-table.
+
+-----------------------------
+45 = ACTION_T_THROW_AI_EVENT:
+-----------------------------
+Parameter 1: EventType - What AIEvent to throw, supported types see CreatureAI.h enum AIEventType
+Parameter 2: Radius    - Throw the AIEvent to nearby friendly creatures within this range
+
+-----------------------------
+46 = ACTION_T_SET_THROW_MASK:
+-----------------------------
+Parameter 1: EventTypeMask - Which AIEvents to throw, supported types see CreatureAI.h enum AIEventType (mask-value is 2^type)
+
+This action sets which AIEvents a npc will throw automatically.
+Currently supported are:
+    AI_EVENT_JUST_DIED         |  MaskValue: 0x01  |  Sender = Killed Npc, Invoker = Killer      |  Sent when npc dies
+    AI_EVENT_CRITICAL_HEALTH   |  MaskValue: 0x02  |  Sender = Hurt Npc, Invoker = DamageDealer  |  Sent when damaged below 10% health
+    AI_EVENT_LOST_HEALTH       |  MaskValue: 0x04  |  Sender = Hurt Npc, Invoker = DamageDealer  |  Sent when damaged below 50% health
+    AI_EVENT_LOST_SOME_HEALTH  |  MaskValue: 0x08  |  Sender = Hurt Npc, Invoker = DamageDealer  |  Sent when damaged below 90% health
+    AI_EVENT_GOT_FULL_HEALTH   |  MaskValue: 0x10  |  Sender = Healed Npc, Invoker = Healer      |  Sent when healed to full health
+
+So if you want an npc to throw AIEvents automatically on death and on critical health, you would set its EventTypeMask to 0x03
+
+-----------------------------
+47 = ACTION_T_SET_STAND_STATE:
+-----------------------------
+Parameter 1: StandState - Stand state id to be used by the creature as defined in Unit.h file in the core.
+
 =========================================
 Target Types
 =========================================
@@ -805,7 +911,11 @@ Target types are used by certain actions and may effect actions differently
 3    TARGET_T_HOSTILE_LAST_AGGRO        Dead Last on Aggro (no idea what this could be used for)
 4    TARGET_T_HOSTILE_RANDOM            Random Target on The Threat List
 5    TARGET_T_HOSTILE_RANDOM_NOT_TOP    Any Random Target Except Top Threat
-6    TARGET_T_ACTION_INVOKER            Unit Who Caused This Event to Occur (only works for EVENT_T_AGGRO, EVENT_T_KILL, EVENT_T_DEATH, EVENT_T_SPELLHIT, EVENT_T_OOC_LOS, EVENT_T_FRIENDLY_HP)
+6    TARGET_T_ACTION_INVOKER            Unit Who Caused This Event to Occur (only works for EVENT_T_AGGRO, EVENT_T_KILL, EVENT_T_DEATH, EVENT_T_SPELLHIT, EVENT_T_OOC_LOS, EVENT_T_FRIENDLY_HP, EVENT_T_FRIENDLY_IS_CC, EVENT_T_FRIENDLY_MISSING_BUFF, EVENT_T_RECEIVE_EMOTE, EVENT_T_RECEIVE_AI_EVENT)
+7    TARGET_T_ACTION_INVOKER_OWNER      Unit who is responsible for Event to occur (only works for EVENT_T_AGGRO, EVENT_T_KILL, EVENT_T_DEATH, EVENT_T_SPELLHIT, EVENT_T_OOC_LOS, EVENT_T_FRIENDLY_HP, EVENT_T_FRIENDLY_IS_CC, EVENT_T_FRIENDLY_MISSING_BUFF, EVENT_T_RECEIVE_EMOTE, EVENT_T_RECEIVE_AI_EVENT)
+8    TARGET_T_HOSTILE_RANDOM_PLAYER          Random Player on The Threat List
+9    TARGET_T_HOSTILE_RANDOM_NOT_TOP_PLAYER  Any Random Player Except Top Threat
+10   TARGET_T_EVENT_SENDER              Creature who sent a received AIEvent - only triggered by EVENT_T_RECEIVE_AI_EVENT
 
 =========================================
 Cast Flags
@@ -841,10 +951,28 @@ Below is the list of current Event Flags that EventAI can handle. Event flags ar
 4       16        EFLAG_DIFFICULTY_3             Event occurs in instance difficulty 3 (will not occur if not set)
 5       32        EFLAG_RANDOM_ACTION            At event occur execute one random action from event actions instead all actions.
 6       64
-7       128       EFLAG_DEBUG_ONLY               Prevents events from occuring on Release builds. Useful for testing new features.
+7       128       EFLAG_DEBUG_ONLY              Prevents events from occuring on Release builds. Useful for testing new features.
 
 NOTE: You can add the numbers in the decimal column to combine flags.
 
+ * PLEASE NOTE THE DIFFERENCES BETWEEN DUNGEON INSTANCE DIFFICULTY LEVELS AND RAID Instance SIZE/DIFFICULTY LEVELS - PLEASE CHECK "MapDifficulty.dbc" For Information *
+
+Dungeons:
+---------
+EFLAG_DIFFICULTY_0             Event occurs in DUNGEON_DIFFICULTY_NORMAL
+EFLAG_DIFFICULTY_1             Event occurs in DUNGEON_DIFFICULTY_HEROIC
+EFLAG_DIFFICULTY_2             None (Not Implimented)
+EFLAG_DIFFICULTY_3             None (Not Implimented)
+
+10/25 Man Raids:
+----------------
+EFLAG_DIFFICULTY_0             Event Occurs in RAID_DIFFICULTY_10MAN_NORMAL  <--- Use This Difficulty Setting For Raids Designed For Single Man Size (Whatever Size It Is)
+EFLAG_DIFFICULTY_1             Event Occurs in RAID_DIFFICULTY_25MAN_NORMAL
+EFLAG_DIFFICULTY_2             Event Occurs in RAID_DIFFICULTY_10MAN_HEROIC (ONLY IF SUPPORTED BY RAID INSTANCE)  <--- NOTE: Currently Only a Couple Raids Support This Mode
+EFLAG_DIFFICULTY_3             Event Occurs in RAID_DIFFICULTY_25MAN_HEROIC (ONLY IF SUPPORTED BY RAID INSTANCE)  <--- NOTE: Currently Only a Couple Raids Support This Mode
+
+
+* Currently Only: Trial of the Crusader and Icecrown Citadel and Ruby Sanctum Raids Support Heroic Modes *
 
 =========================================
 Basic Structure of creature_ai_texts
@@ -876,7 +1004,7 @@ Note: Fields `content_loc1` to `content_loc8` are NULL values by default and are
 =========================================
 Text Types (type)
 =========================================
-Below is the list of current Text types that texts tables can handle. These were previously seperate Actions before.
+Below is the list of current Text types that texts tables can handle. These were previously seperate Actions in ACID.
 
 #    Internal Name                 Description
 -----------------------------------------------------------
diff --git a/doc/Home.textile b/doc/Home.textile
new file mode 100644
index 00000000000..f41ba1207cc
--- /dev/null
+++ b/doc/Home.textile
@@ -0,0 +1,8 @@
+__mangosR2__ is not a separate project. This is a fork of the "MaNGOS project":http://github.com/mangos and "scriptdev2 project":http://github.com/scriptdev2 and is intended to test the new code, which for some reason was not accepted (or will never be accepted) to those projects. R2 tries to take the best from MaNGOS, TrinityCore and other projects, while trying to preserve consistency and simplicity of MaNGOS code.
+     
+Attention please! By opinion of the Mangos Team,
+
+**This "mangosR2" is not mangos! It's some custom fork with god knows what mods and hacks.
+So please everyone stop flooding ... with problems with it... could aswell ask for arcemu or trinity support**
+
+Don't even try to send bug reports to official mangos community resources, you will never get help on mangosR2, just waste your time...
diff --git a/NEWS b/doc/NEWS
similarity index 100%
rename from NEWS
rename to doc/NEWS
diff --git a/doc/README.AntiCheat b/doc/README.AntiCheat
new file mode 100644
index 00000000000..29cf6e89293
--- /dev/null
+++ b/doc/README.AntiCheat
@@ -0,0 +1,312 @@
+==============================================================================================
+English translations, big thx to Faq
+
+AntiCheat v4.1 for mangos, (c) 2010-2011 /dev/rsa for mangosR2 branch
+http://github.com/mangosR2
+
+I express gratitude to authors of previous anticheat versions, on what base is made this code
+- gimly
+- CWN
+also thnx to those who wrote code for extra checking, what used in this code
+- Insider42
+- zhenya
+- TOM_RUS
+
+Anticheat configs can be changed in characters/anticheat_config table.
+Config can be reloaded with ".reload anticheat"  command.
+In mangos configs left only these:
+
+Anticheat.Enable = 1 (Yes/No)
+Anticheat.DelayAfterAction = 30 (skip this time after any actions, applyed to player
+before other action be apply to his, but still all actions will be logged.)
+Anticheat.GmLevel = 0 (level, higher levels wont be checked. 0 - player lvl.)
+
+== Base
+
+1. Checks
+
+There are usual checks (from 0 to 99) and additional (sub-checks, numbers - 100* number of usual check + 1...99)
+1st INT parameter is checked for all checks by default - time after what, countdown of puncture will drop.
+If not set - time is taken from "Anticheat.DelayAfterAction".
+
+main checks:
+    // Check types
+    CHECK_NULL = 0,
+No parameters, empty check.
+
+    CHECK_MOVEMENT = 1,
+Pseudo-check. this function holds information about other movement checks.
+Parameters - period (should be 0), actions and messages(not used)
+
+    CHECK_SPELL = 2,
+Pseudo-check. For now, nothing happens.
+
+    CHECK_QUEST = 3,
+In progress.
+
+    CHECK_TRANSPORT = 4,
+Check ON_TRANSPORT condition by Insider42
+
+    CHECK_DAMAGE = 5,
+Check server bugs with damage.
+
+    CHECK_ITEM   = 6,
+Check ons WPE cheating with item duplicate.
+
+    CHECK_WARDEN   = 7,
+Warden checks from zhenya && TOM_RUS as part of anticheat
+
+2. Subchecks
+additional checks:
+    // Check subtypes
+    // Movement checks
+    CHECK_MOVEMENT_SPEED = 100 * CHECK_MOVEMENT + 1,
+Check for speed hack. Parameters - period (check default value in db), 1 float - speed (0,01 - max normal speed. In rare cases including lags can be 0,02).
+
+    CHECK_MOVEMENT_FLY = 100 * CHECK_MOVEMENT + 2,
+check for fly hack
+First parameter - height from what check is started (for avoiding (crashes, loops?? колодцев) and bug holes in vmaps).
+
+    CHECK_MOVEMENT_MOUNTAIN = 100 * CHECK_MOVEMENT + 3,
+Checking Wall climb hack. First float parameter - Z speed max, second - tangens of moving angle.
+
+    CHECK_MOVEMENT_WATERWALKING = 100 * CHECK_MOVEMENT + 4,
+Checking for water walk hack.
+
+    CHECK_MOVEMENT_TP2PLANE = 100 * CHECK_MOVEMENT + 5,
+Parameter - delta from 0 for plane and delta for check. With default parameters works fine.
+
+    CHECK_MOVEMENT_AIRJUMP = 100 * CHECK_MOVEMENT + 6,
+Jumping in air. First parameter - from what height check is triggered.
+
+    CHECK_MOVEMENT_TELEPORT = 100 * CHECK_MOVEMENT + 7,
+If distance is greater then 1 (opcode) from number in parameter - alarm is triggered.
+
+In future:
+    CHECK_MOVEMENT_FALL = 100 * CHECK_MOVEMENT + 8,
+
+    // Spell checks
+    CHECK_SPELL_VALID = 100 * CHECK_SPELL + 1,
+If client is sending spell cast, but its not in dbc file - alarm is triggered.
+Also could be result of damaged packets from clients.
+
+    CHECK_SPELL_ONDEATH = 100 * CHECK_SPELL + 2,
+Not done yet
+
+    CHECK_SPELL_FAMILY = 100 * CHECK_SPELL + 3,
+Check works only for skill 769 (only GM spells).
+
+    CHECK_SPELL_INBOOK = 100 * CHECK_SPELL + 4,
+Still in progress (will do simple check - if player has spell in spell-book)
+
+    // Damage checks
+    CHECK_DAMAGE_SPELL = 100 * CHECK_DAMAGE + 1,
+Spell damage limit. Parameter - limited meaning.
+ 
+
+    CHECK_DAMAGE_MELEE = 100 * CHECK_DAMAGE + 2,
+Melee damage limit. Parameter - limited meaning.
+
+    // Item checks
+    CHECK_ITEM_UPDATE           = 100 * CHECK_ITEM   + 1,
+mangos check on item duplicate with anicheat actions.
+
+    // Warden checks
+    CHECK_WARDEN_MEMORY         = 100 * CHECK_WARDEN + 1,
+Many warden-related memory checks 
+
+    CHECK_WARDEN_KEY            = 100 * CHECK_WARDEN + 2,
+check encryption key
+
+    CHECK_WARDEN_CHECKSUM       = 100 * CHECK_WARDEN + 3,
+check checksum
+
+    // End of list
+    CHECK_MAX
+
+3. Actions (what will happen if Anticheat will detect cheat)
+
+Can be set to any check.
+
+    ANTICHEAT_ACTION_NULL = 0,
+Empty action. Doesn't do nothing. If action1 = 0 then wont be logged.
+
+    ANTICHEAT_ACTION_LOG = 1,
+Will only registrate detected check fails.
+
+    ANTICHEAT_ACTION_ANNOUNCE_GM = 2,
+Announce to GMs about detected cheating action (GMs with lvl higher or equal to param1). If 0 - then message will be sent to all.
+
+    ANTICHEAT_ACTION_ANNOUNCE_ALL = 3,
+Announce into public chat about detected cheating action.
+
+    ANTICHEAT_ACTION_KICK = 4,
+Just kick.
+
+    ANTICHEAT_ACTION_BAN = 5,
+Just ban. Parameter - time in seconds.
+
+    ANTICHEAT_ACTION_SHEEP = 6,
+Transformation into random animal (if in fly - then with parachute).
+Parameter -  time in milliseconds.
+
+    ANTICHEAT_ACTION_STUN = 7,
+Simple stun. Parameter -  time in milliseconds.
+
+    ANTICHEAT_ACTION_SICKNESS = 8,
+Adding resurrection sickness spell. Parameter -  time in milliseconds.
+
+================================================================================================
+AntiCheat v3 for mangos, (c) 2010 /dev/rsa
+http://github.com/rsa
+
+Выражаю благодарность авторам предыдущих атичитов, на базе которых сделан этот -
+- gimly
+- CWN
+а также людям написавшим отдельные проверки, использованные здесь
+- Insider42
+
+Настройка античита производится в таблице characters/anticheat_config
+Конфиг перегружается онлайн командой .reload anticheat
+в конфиге мангоса остались только 
+
+Anticheat.Enable = 1 (да/нет)
+Anticheat.DelayAfterAction = 30 (время, которое после акции плеер не трогается (не применяются другие
+actions). лог все равно ведется.)
+Anticheat.GmLevel = 0 (уровень, выше которого не проверять. 0 - только игроков)
+
+== база
+
+1. Проверки
+Проверки бывают основные (номера с 0 до 99) и дополнительные (subchecks, номера - 100* номер основной 
+проверки + 1...99)
+у всех проверок 1й INT параметр по умолчанию - время через которого счетчик проколов сбрасывается.
+если не указано - берется время из Anticheat.DelayAfterAction
+
+основные проверки:
+    // Check types
+    CHECK_NULL              = 0,
+нет параметров. пустая проверка-заглушка.
+
+    CHECK_MOVEMENT          = 1,
+псевдопроверка. в ней проводится накопление информации для других проверок движения.
+параметры - период (должен быть 0), экшны и сообщения (не используются)
+
+    CHECK_SPELL             = 2,
+псевдопроверка. в ней пока ничего не проводится.
+
+    CHECK_QUEST             = 3,
+в процессе.
+
+    CHECK_TRANSPORT         = 4,
+проверка ON_TRANSPORT состояния by Insider42
+
+    CHECK_DAMAGE            = 5,
+проверка на баги сервера с дамагом.
+
+    CHECK_ITEM   = 6,
+проверки на баги предметов (в настоящее время только на дуп при помощи WPE).
+
+    CHECK_WARDEN   = 7,
+Проверки встроенного анитичита WOW Warden как часть античита
+
+2. Субпроверки
+дополнительные проверки:
+    // Check subtypes
+    // Movement checks
+    CHECK_MOVEMENT_SPEED        = 100 * CHECK_MOVEMENT + 1,
+Проверка на СХ. параметры - период (умолчания смотрите в базе), 1 float - скорость (0,01 - максимальная
+нормализованная скорость. с учетом лагов божет быть до 0,02 но редко)
+
+    CHECK_MOVEMENT_FLY          = 100 * CHECK_MOVEMENT + 2,
+первый параметр - высота с которой начинаем проверять (для обхода колодцев и дыр в вмапсах).
+
+    CHECK_MOVEMENT_MOUNTAIN     = 100 * CHECK_MOVEMENT + 3,
+проверка на чит Wall climb. Первый параметр float - скорость перемещения по Z, второй - тангенс угла.
+
+    CHECK_MOVEMENT_WATERWALKING = 100 * CHECK_MOVEMENT + 4,
+проверка на чит с хождением по воде.
+
+    CHECK_MOVEMENT_TP2PLANE     = 100 * CHECK_MOVEMENT + 5,
+параметры - дельта от 0 для plane и дельта для проверки. с дефолтными ловит нормально.
+
+    CHECK_MOVEMENT_AIRJUMP      = 100 * CHECK_MOVEMENT + 6,
+прыжок в воздухе. первый параметр - от какой высоты начинаем проверять.
+
+    CHECK_MOVEMENT_TELEPORT     = 100 * CHECK_MOVEMENT + 7,
+если расстояние за 1 тик (опкод) больше чем параметр - сразу аларм.
+
+в планах:
+    CHECK_MOVEMENT_FALL     = 100 * CHECK_MOVEMENT + 8,
+
+    // Spell checks
+    CHECK_SPELL_VALID           = 100 * CHECK_SPELL + 1,
+если клиент присылает каст спелла, а его в ДБЦ нету - сразу будет этот аларм.
+может быть результатом битых пакетов.
+
+    CHECK_SPELL_ONDEATH         = 100 * CHECK_SPELL + 2,
+в процессе
+
+    CHECK_SPELL_FAMILY          = 100 * CHECK_SPELL + 3,
+в настоящее время проверка идет только на скилл 769 (ГМ-онли спеллы)
+
+    CHECK_SPELL_INBOOK          = 100 * CHECK_SPELL + 4,
+в процессе (будет просто проверка есть ли спелл в книге у плеера)
+
+    // Damage checks
+    CHECK_DAMAGE_SPELL          = 100 * CHECK_DAMAGE + 1,
+ограничение по спеллдамаге. параметр - просто предельное значение.
+
+    CHECK_DAMAGE_MELEE          = 100 * CHECK_DAMAGE + 2,
+ограничение по мили-дамаге. параметр - просто предельное значение.
+
+    // Item checks
+    CHECK_ITEM_UPDATE           = 100 * CHECK_ITEM   + 1,
+просто экшн при непрохождении встроеной проверки мангоса на соответствие предмета.
+
+    // Warden checks
+    CHECK_WARDEN_MEMORY         = 100 * CHECK_WARDEN + 1,
+множество разных проверок памяти из Warden. Подробнее - в доку на Warden 
+
+    CHECK_WARDEN_KEY            = 100 * CHECK_WARDEN + 2,
+проверка валидности ключа Warden.
+
+    CHECK_WARDEN_CHECKSUM       = 100 * CHECK_WARDEN + 3,
+проверка контрольной суммы пакетов. основной метод борьбы с WPE.
+
+    // End of list
+    CHECK_MAX
+
+3. Экшны (действия которые производит античит по обнаружению чита)
+
+можно поставить на любую проверку.
+
+    ANTICHEAT_ACTION_NULL             = 0,
+пустой экшн. ничего не делать. если action1 = 0 то даже лог не ведется.
+
+    ANTICHEAT_ACTION_LOG              = 1,
+только регистрация срабатываний.
+
+    ANTICHEAT_ACTION_ANNOUNCE_GM      = 2,
+анонс найденного читера только ГМам с уровнем доступа выше или равным param1. если 0 -
+значит всем
+
+    ANTICHEAT_ACTION_ANNOUNCE_ALL     = 3,
+анонс найденного читера в общий чат.
+
+    ANTICHEAT_ACTION_KICK             = 4,
+просто кик.
+
+    ANTICHEAT_ACTION_BAN              = 5,
+просто бан. параметр - время в секундах.
+
+    ANTICHEAT_ACTION_SHEEP            = 6,
+превращение в случайное животное (если в полете - то с парашютом).
+параметр - время в миллисекундах.
+
+    ANTICHEAT_ACTION_STUN             = 7,
+просто стан. параметр - время в миллисекундах.
+
+    ANTICHEAT_ACTION_SICKNESS         = 8,
+наложение resurrection sickness. параметр - время в миллисекундах.
+================================================================================================
\ No newline at end of file
diff --git a/doc/README.Issues b/doc/README.Issues
new file mode 100644
index 00000000000..6efc5c3fa7f
--- /dev/null
+++ b/doc/README.Issues
@@ -0,0 +1 @@
+��� ����������� ���� �������� � ������ github "Issues" �����������.
\ No newline at end of file
diff --git a/README b/doc/README.MaNGOS
similarity index 100%
rename from README
rename to doc/README.MaNGOS
diff --git a/doc/README.PlayerBot b/doc/README.PlayerBot
new file mode 100644
index 00000000000..8a0ae12b553
--- /dev/null
+++ b/doc/README.PlayerBot
@@ -0,0 +1,284 @@
+## Last updated sept 10 2011
+
+What it is:
+===========
+
+Playerbot lets you add another character from your account as a bot that you can control and which will hopefully help you. Only characters from your account can be used, so you can have a maximum of 9 bots at one time.
+
+This was taken from the Trinity site, and modified slightly by me to get some of the kinks out. I reworked the priest class and also added a mage class and a warrior class, which are still in crude form. Any class can be used as a bot - just don't expect much in the way of spells or abilities until someone writes the code for them.
+
+Bots will only use abilities that they have - for example, a priest will only use the renew spell if it has been trained. Also, bot's equipment will lose durability like any other character. So every so often you'll need to log in and repair and train your bot.
+
+For MaNGOS 10816+
+
+Commands:
+=========
+
+Commands:
+=========
+
+/s .bot add BOTNAME (add character to world)
+/s .bot remove BOTNAME
+/s .bot co|combatorder BOTNAME COMBATORDER [TARGET]
+/invite BOTNAME (bot will auto accept invite)
+/t BOTNAME attack (bot will attack selected target, similar to the way a pet can attack)
+/t BOTNAME follow (orders bot to follow player; will also revive bot if dead or teleport bot if far away)
+/t BOTNAME stay
+/t BOTNAME assist (you'll need to be attacking something and the bot only does melee atm)
+/t BOTNAME spells (replies with all spells known to bot)
+/t BOTNAME cast <SPELLID | (part of) SPELLNAME | [SPELLLINK]>
+/t BOTNAME use [ITEM LINK]
+/t BOTNAME equip [ITEM LINK]
+/t BOTNAME reset (will reset states, orders and loot list)
+/t BOTNAME report (bot reports all items, creatures or gameobjects needed to finish quests)
+/t BOTNAME stats (bot shows available money, free inventory space and estimated item repair costs)
+/t BOTNAME survey (bot shows all available gameobjects, within a local perimeter around the bot)
+/t BOTNAME find [GAMEOBJECT LINK] (bot will travel to the gameobject location and then wait)
+/t BOTNAME get [GAMEOBJECT LINK] (bot will fetch the selected gameobject and then return to the player)
+/t BOTNAME quest (Shows bot's current quests)
+/t BOTNAME quest <(a)dd> [QUESTLINK] (Adds a quest)
+/t BOTNAME quest <(d)rop> [QUESTLINK] (Drop a quest)
+/t BOTNAME quest <(e)nd> (Turns in a completed quest)
+/t BOTNAME quest <(l)ist> (Shows new quests offered by questgiver)
+/t BOTNAME orders (Shows bot's combat orders)
+/t BOTNAME pet spells (Shows spells known to bot's pet. Autocast spells will be shown in green)
+/t BOTNAME pet cast <SPELLID | (part of) SPELLNAME | [SPELLLINK]>
+/t BOTNAME pet toggle <SPELLID | (part of) SPELLNAME | [SPELLLINK]> (Toggle autocast for a given spell)
+/t BOTNAME pet state (Shows current react mode of bot's pet)
+/t BOTNAME pet react <(a)ggressive | (d)efensive | (p)assive> (Set bot's pet reaction mode)
+/t BOTNAME collect (shows collect subcommand options and current collect status)
+/t BOTNAME collect <subcommand(s)> (subcommands can be alone or together [none combat loot objects profession quest])
+/t BOTNAME sell [ITEM LINK] (bot will add item to it's m_itemIds, for later sale)
+/t BOTNAME auction (bot will display all it's active owned auctions. Auction info will include an [AUCTION LINK] )
+/t BOTNAME auction add [ITEM LINK] (bot will add item to it's m_itemIds, for later auction)
+/t BOTNAME auction remove [AUCTION LINK] (bot will add auctionid to it's m_auctions, for later auction cancellation)
+/t BOTNAME repair [ITEM LINK] (bot will seek out armourer and repair selected items specified by [ITEM LINK] )
+/t BOTNAME repair all (bot(s) will seek out armourer and repair all damaged items equipped, or in bags )
+/t BOTNAME talent (Lists bot(s) active talents [TALENT LINK] & glyphs [GLYPH LINK], unspent talent points & cost to reset all talents)
+/t BOTNAME talent learn [TALENT LINK} .. (Learn selected talent from bot client 'inspect' dialog -> 'talent' tab or from talent command (shift click icon or link))
+/t BOTNAME talent reset (Resets all talents)
+/t BOTNAME bank  (Lists bot(s) bank balance)
+/t BOTNAME bank deposit [Item Link][Item Link] .. (Deposit item(s) in bank)
+/t BOTNAME bank withdraw [Item Link][Item Link] ..  (Withdraw item(s) from bank. ([Item Link] from bank))
+/t BOTNAME skill (lists all [PROFESSION LINK] bot Primary profession skills)
+/t BOTNAME skill train (lists [TRAINING LINK] available class, weapon & profession (Primary or Secondary) skills & spells, from selected trainer)
+/t BOTANME skill learn [TRAINING LINK] (learn selected skill or spell, from selected trainer)
+/t BOTNAME skill unlearn [PROFESSION LINK] (unlearn selected primary profession skill & all associated spells)
+
+Shortcuts:
+c = cast
+e = equip
+u = use
+
+Gameobject interaction with bots:
+=================================
+
+  The bot(s) can interact with gameobjects. This is particularly useful, in order to complete 'gather' type
+  quests (e.g Milly's harvest in Northshire). The bot(s) can also harvest 'ore deposits' and 'herbs'
+
+  Four commands have been introduced 'collect', 'survey, 'find' & 'get', to facilitate this feature.
+
+  The 'collect' command provides a way to have a bot automatically get loot or objects in the world.
+  The command by itself gives you a display of what settings the bots have. Defaults are stored in
+  the playerbot.conf. The subcommands do the actual work:
+    combat - bot will loot after combat for the options that are set
+    loot - bot will grab all loot available from corpse
+    quest - bot will grab all quest items on corpse
+    profession - bot will grab any profession related item that the bot has from corpse
+    skin - if you have skinning, and corpse has been looted, bot will skin corpse. Most of
+        the time you may want this option and the loot option enabled, but if you are grabbing
+        the stuff as you are going around, the bot will skin afterwards.
+    objects - bot will collect things that are specified by the survey and get <shift-click> commands
+    none - removes any collect options that have been set
+
+  The 'survey' command provides the means for bot(s) to detect gameobjects in the world. It can be used to detect
+  available gameobjects local to a single bot, or more effectively (wider area) those for a party of bots.
+
+  Suggestion: setup the 'survey' command as an assigned macro button, on the client (e.g /p survey). You can
+  then quickly refresh the gameobject list.
+
+  Gameobject list [GAMEOBJECT LINK] (Currently bots can only interact with ore, herb and needed quest items)
+  ---------------
+
+  [Copper Vein][Silverleaf][Earthroot][Milly's Harvest][Battered Chest][Food Crate]
+
+  Then, use the 'find' or 'get' commands to interect with the gameobject.
+
+  Using the gameobject list information, it is possible to locate and/or fetch each of the gameobjects. To select
+  a [GAMEOBJECT LINK], hold down the shift key and click on the relevant link with your mouse.
+
+Creature interaction with bots:
+===============================
+
+  The bot(s) can now interact directly with creatures. This will enable bot(s) to independently contact NPCs, without
+  the need for player's selection. This opens up new possiblities for bot/NPC commerce.
+
+  Each bot will maintain it's own item list (m_itemIds - This is a list of paired data). The first component (UNIT_NPC_FLAG)
+  dictates what is to done with the second component (itemid).
+
+  Each bot will also maintain it's own active auction list (m_auctions - This is a list of paired data). The first component
+  (ActionFlags) dictates the action to be performed on the second component (auctionid).
+
+  While(m_itemIds not empty)
+  {
+      bot will scan for surrounding creatures (findNearbyCreature()) who can service m_itemIds
+      if(found)
+          Search is carried out for all itemids that can be processed by this creature.
+          if(processed successfully)
+              This instance of the data pair (npcflag,itemid) will be removed from m_itemIds
+              While(m_auctions not empty)
+                  process contained auctionids according to ActionFlag & then update m_auctions
+  }
+
+  Please note that bot(s) m_itemIds & m_auctions will be emptied, when bot(s) are dismissed.
+
+Repair with bots:
+=================
+
+  bot(s) can now repair <all or selected> items, either equipped or in bags. If the bot(s) is a member of a guild, then they pay
+  else the bot(s) pays. If the bot(s) cannot pay for the repair, they remain damaged.
+
+  The new 'stats' command provides useful information to help in the repair decision.
+
+  First:  Money available to bot(s)
+  Second: Free inventory slots for bot(s)
+  Third:  Estimated (excludes NPC reputation discount) item damage cost for bot(s).
+
+Combat Orders explained:
+========================
+
+  There are primary and secondary commands which can be combined. In this way it is
+  possible to define a bot to assist the main tank and also protect the healer, making
+  combat management much easier.
+  The commands assist and protect require a target parameter or a friendly player
+  selected by bots master.
+  Available Combat Orders:
+    tank        pri     try to bind all targets involved in combat by gaining highest threat
+    assist      pri     do damage on selected targets attacker without getting highest threat
+    heal        pri     concentrate on healing - no offensive spells, try to keep threat low
+    protect     sec     if target of protect get's directly attacked gain higher threat on attacker
+    reset       -       clear out assist and protect targets and set combat order to nothing
+  Examples:
+    .bot co TheTank tank
+    .bot co MyHealer heal
+    .bot co TheBrutal assist TheTank
+    .bot co TheBrutal protect MyHealer
+
+Trading with bots:
+==================
+
+To trade items/money with your bot simply initiate a trade and the bot will tell you how much money and items are available. To request an item simple whisper the bot and shift click the link of the item you would like. You can link multiple items on the same line. You can also request money in the following manner when the trade window is open:
+/w BOTNAME 10g <-- request that the bot give you 10 gold
+/w BOTNAME 6g500s25c <-- request 6 gold, 500 silver, and 25 cooper
+
+A bot is also able to show an item in its 'Will not be traded' slot. The item can be either
+in its bags or be equipped and even be soulbound. By this you can cast spells/enchantments
+on soulbound items ('nt' stands for 'not trading').
+/w BOTNAME nt [Powerful Soulbound Item]
+
+Sharing bots across accounts:
+=============================
+
+  It is possible to a load a bot from another account. This must be done by a
+  player from a second account adding the master player to their friend's list
+  and set a note with the keyword 'shared' on that player. After it is setup
+  the bot can be added using either the botguy menu or the .bot add command if
+  enabled.
+
+  Example:
+    Frank and Bob are characters owned by different accounts. Bob would like to
+    use Frank as a playerbot. Frank must add Bob as a friend then right click
+    on Bob in the friend's list, click Set Note, then type 'shared'. Frank
+    would not be able to use Bob as a playerbot until Bob setup Frank as above.
+
+More Information:
+=================
+
+If specifying a spell substring, the spell chosen will be in priority of exact name match, highest spell rank, and spell using no reagents. Case does not matter. Here's some examples:
+/t BOTNAME c greater heal
+/t BOTNAME cast pain
+/w BOTNAME c poly
+/w BOTNAME cast fort
+/t BOTNAME cast <SPELLID>
+- OR -
+/w BOTNAME c <SPELLID>
+
+Also all commands can be broadcast to the party. For example:
+/p follow
+/p spells
+
+To use or equip items for your bot say:
+/w BOTNAME use [ITEMLINK1][ITEMLINK2]
+/w BOTNAME equip [ITEMLINK1][ITEMLINK2]
+- OR -
+/w BOTNAME u [ITEMLINK1][ITEMLINK2]
+/w BOTNAME e [ITEMLINK1] [ITEMLINK2]
+
+If you inspect your bot, your bot will tell you what items you have in your inventory that you can equip. To create a link in the chat window, hold the shift key and press the left mouse button when clicking the link.
+
+
+Changes from Trinity to Mangos:
+===============================
+
+I added the following in SharedDefines.h.
+
+enum SpellCategory
+{
+	SPELL_CATEGORY_FOOD             = 11,
+	SPELL_CATEGORY_DRINK            = 59
+};
+
+I also had to add the following to Player.h:
+
+enum PlayerStateType
+{
+	PLAYER_STATE_NONE              = 0,
+	PLAYER_STATE_SIT               = 1
+};
+
+
+Configuration variables:
+========================
+Also see src/mangosd/mangosd.conf.dist for configuration variables!
+
+    PlayerbotAI.DebugWhisper
+        Enable debug output by whispering master
+        Default: 0 - off
+                 1 - on
+
+    PlayerbotAI.FollowDistanceMin
+    PlayerbotAI.FollowDistanceMax
+        Min. and max. follow distance for bots
+        Default: 0.5 / 1.0
+
+
+-- ToDo
+[DONE] ///---Quest---///
+[DONE] Bot can accept quest.
+[DONE] Bot can join quest.
+
+[DONE] ///---Loot---///
+[DONE] Bot can loot.
+[DONE] Bot can loot --- maybe only needed q item.
+
+//---Instance teleport Problems---///
+[DONE] Needs some fix.
+
+///---Combat and Movement Orders---///
+[DONE] Movement orders (stay, follow)
+[DONE] Combat orders (protect, assist)
+Combat order TANK
+Combat order HEAL
+
+///---Temporary item enchantments---///
+[DONE] Rogue    : Poison
+Warrior    : Sharpening Stone, Rune of Warding, Rune of Shielding.
+
+//---After fear bot's lose target---///
+Needs some fix.
+
+///---Move behind target---///
+[DONE] Rogue    : some abilitys require Rogue to be stealthed and behind target.
+
+///---Implement locale independet way of getting spellIDs---///
+[DONE] Hardcode lowest rank spellID, use function to get highest rank
diff --git a/THANKS b/doc/THANKS
similarity index 100%
rename from THANKS
rename to doc/THANKS
diff --git a/doc/revision_aura_stacking.txt b/doc/revision_aura_stacking.txt
new file mode 100644
index 00000000000..83f5f83d461
--- /dev/null
+++ b/doc/revision_aura_stacking.txt
@@ -0,0 +1 @@
+as 44
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index a5a854cd5ba..e945e4841b5 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -8,14 +8,15 @@ Copyright (C) 2010-2012 MaNGOS <http://getmangos.com/>
 ## id
 -- --------------------------
 
-creature_movement_scripts       DB project self defined id
-event_scripts                   Event id. Several sources: spell effect 61, taxi/transport nodes, gameobject_template data
-gameobject_scripts              Gameobject guid
-gameobject_template_scripts     Gameobject entry
-gossip_scripts                  DB project self defined id
-quest_end_scripts               DB project self defined id (generally quest entry)
-quest_start_scripts             DB project self defined id (generally quest entry)
-spell_scripts                   Spell id
+dbscripts_on_creature_death         Creature entry
+dbscripts_on_creature_movement      DB project self defined id
+dbscripts_on_event                  Event id. Several sources: spell effect 61, taxi/transport nodes, gameobject_template data
+dbscripts_on_go_use                 Gameobject guid
+dbscripts_on_go_template_use        Gameobject entry
+dbscripts_on_gossip                 DB project self defined id
+dbscripts_on_quest_end              DB project self defined id (generally quest entry)
+dbscripts_on_quest_start            DB project self defined id (generally quest entry)
+dbscripts_on_spell                  Spell id
 
 -- --------------------------
 ## delay
@@ -47,6 +48,7 @@ The action to execute.
 -- --------------------------
 
 Range in which the buddy defined in buddy_entry will be searched
+In case of SCRIPT_FLAG_BUDDY_BY_GUID this field is the buddy's guid!
 
 -- --------------------------
 ## data_flags
@@ -57,7 +59,10 @@ Field which holds a combination of these flags:
     SCRIPT_FLAG_BUDDY_AS_TARGET             = 0x01
     SCRIPT_FLAG_REVERSE_DIRECTION           = 0x02
     SCRIPT_FLAG_SOURCE_TARGETS_SELF         = 0x04
+
     SCRIPT_FLAG_COMMAND_ADDITIONAL          = 0x08      (Only for some commands possible)
+    SCRIPT_FLAG_BUDDY_BY_GUID               = 0x10      (Interpret search_radius as buddy's guid)
+    SCRIPT_FLAG_BUDDY_IS_PET                = 0x20      (Do not search for an npc, but for a pet)
 
 Detailed meaning described below!
 
@@ -66,7 +71,8 @@ Detailed meaning described below!
 -- --------------------------
 
 4 multipurpose fields, store raw data as signed values
-Note: currently used only for text ids
+Note: currently used only for text ids SCRIPT_COMMAND_TALK (0),
+      and in relation with SCRIPT_COMMAND_TERMINATE_SCRIPT (31)
 
 -- --------------------------
 ## x y z o
@@ -78,10 +84,13 @@ Map coordinates for commands that need it.
 ## origin of script and source/target in scripts
 -- --------------------------
 
-creature_movement_scripts
+dbscripts_on_creature_death
+                            Creature death
+                                Source: creature. Target: Unit (player/creature)
+dbscripts_on_creature_movement
                             `creature_movement` `creature_movement_template`
                                 Source: creature. Target: creature
-event_scripts
+dbscripts_on_event
                             Flight path
                                 Source: player. Target: player
                             Transport path
@@ -90,21 +99,21 @@ event_scripts
                                 Source: User (player/creature). Target: GO
                             Spell (effect 61)
                                 Source: caster. Target: Target
-gameobject_scripts
-gameobject_template_scripts
+dbscripts_on_go_use
+dbscripts_on_go_template_use
                             Gameobject use
                                 Source: user: Target: GO
-gossip_scripts
-                            `gossip_menu_option`
+dbscripts_on_gossip
+                            `gossip_menu_option`, `gossip_menu`
                                 Source: creature. Target: player (in case of NPC-Gossip)
                                 Source: player. Target: GO (in case of GO-Gossip)
-quest_end_scripts
+dbscripts_on_quest_end
                             `quest_template`
                                 Source: quest taker (creature/GO). Target: player
-quest_start_scripts
+dbscripts_on_quest_start
                             `quest_template`
                                 Source: quest giver (creature/GO). Target: player
-spell_scripts
+dbscripts_on_spell
                             Spell (effect 77 - SCRIPT_EFFECT)
                             Spell (effect  3 - DUMMY)
                             Spell (effect 64 - TRIGGER_SPELL, with non-existing triggered spell)
@@ -141,12 +150,11 @@ Where "A  ->  B" means that the command is executed from A with B as target.
 -- --------------------------
 
  0 SCRIPT_COMMAND_TALK                      resultingSource = WorldObject, resultingTarget = Unit/none
-                                            * datalong (see enum ChatType for supported CHAT_TYPE_'s)
-                                            * datalong2 = language
                                             * dataint = text entry from db_script_string -table. dataint2-dataint4 optionally, for random selection of text
 
  1 SCRIPT_COMMAND_EMOTE                     resultingSource = Unit, resultingTarget = Unit/none
                                             * datalong = emote_id
+                                            * dataint1-dataint4 optionally, for random selection of emote
 
  2 SCRIPT_COMMAND_FIELD_SET                 source = any
                                             * datalong = field_id
@@ -206,7 +214,8 @@ Where "A  ->  B" means that the command is executed from A with B as target.
 
 16 SCRIPT_COMMAND_PLAY_SOUND                source = any object, target=any/player
                                             * datalong = sound_id
-                                            * datalong2 (bitmask: 0/1=anyone/target, 0/2=with distance dependent, so 1|2 = 3 is target with distance dependent)
+                                            * datalong2 (bitmask: 0/1=target-player, 0/2=with distance dependent, 0/4=map wide, 0/8=zone wide;
+                                                                  so 1|2 = 3 is target with distance dependent)
 
 17 SCRIPT_COMMAND_CREATE_ITEM               source or target must be player
                                             * datalong = item entry
@@ -220,6 +229,8 @@ Where "A  ->  B" means that the command is executed from A with B as target.
 
 20 SCRIPT_COMMAND_MOVEMENT                  resultingSource = Creature
                                             * datalong = MovementType (0:idle, 1:random or 2:waypoint)
+                                            * datalong2 = wanderDistance (for random movement)
+                                            * data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL: RandomMovement around current position
 
 21 SCRIPT_COMMAND_SET_ACTIVEOBJECT          resultingSource = Creature
                                             * datalong=bool 0=off, 1=on
@@ -231,14 +242,18 @@ Where "A  ->  B" means that the command is executed from A with B as target.
                                                     TEMPFACTION_RESTORE_RESPAWN         = 0x01,  // Default faction will be restored at respawn
                                                     TEMPFACTION_RESTORE_COMBAT_STOP     = 0x02,  // ... at CombatStop() (happens at creature death, at evade or custom scripte among others)
                                                     TEMPFACTION_RESTORE_REACH_HOME      = 0x04,  // ... at reaching home in home movement (evade), if not already done at CombatStop()
+                                                    // The next three allow to remove unit_flags combined with a faction change (also these flags will be reapplied when the faction is changed back)
+                                                    TEMPFACTION_TOGGLE_NON_ATTACKABLE   = 0x08,  // Remove UNIT_FLAG_NON_ATTACKABLE(0x02) when faction is changed (reapply when temp-faction is removed)
+                                                    TEMPFACTION_TOGGLE_OOC_NOT_ATTACK   = 0x10,  // Remove UNIT_FLAG_OOC_NOT_ATTACKABLE(0x100) when faction is changed (reapply when temp-faction is removed)
+                                                    TEMPFACTION_TOGGLE_PASSIVE          = 0x20,  // Remove UNIT_FLAG_PASSIVE(0x200)
 
 23 SCRIPT_COMMAND_MORPH_TO_ENTRY_OR_MODEL   resultingSource = Creature
                                             * datalong=creature entry/modelid (depend on data_flags) OR 0 to demorph
-                                            * data_flags= 0x01 to use datalong value as modelid explicit
+                                            * data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL: use datalong value as modelid explicit
 
 24 SCRIPT_COMMAND_MOUNT_TO_ENTRY_OR_MODEL   resultingSource = Creature
                                             * datalong=creature entry/modelid (depend on data_flags) OR 0 to dismount
-                                            * data_flags= 0x01 to use datalong value as modelid explicit
+                                            * data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL: use datalong value as modelid explicit
 
 25 SCRIPT_COMMAND_SET_RUN                   resultingSource = Creature
                                             * datalong= bool 0=off, 1=on
@@ -255,5 +270,22 @@ Where "A  ->  B" means that the command is executed from A with B as target.
 29 SCRIPT_COMMAND_MODIFY_NPC_FLAGS          resultingSource = Creature
                                             * datalong=NPCFlags
                                             * datalong2= 0x00=toggle, 0x01=add, 0x02=remove
+
 30 SCRIPT_COMMAND_SEND_TAXI_PATH            resultingTarget or Source must be Player
                                             * datalong = taxi path id
+
+31 SCRIPT_COMMAND_TERMINATE_SCRIPT          * datalong = search for npc entry if provided
+                                            * datalong2= search distance
+                                            * !(data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL): if npc not alive found, terminate script
+                                                data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL:  if npc alive found, terminate script
+                                            * dataint  = change of waittime (MILLIESECONDS) of a current waypoint movement type (negative values will decrease time)
+
+32 SCRIPT_COMMAND_PAUSE_WAYPOINTS           resultingSource must be Creature
+                                            * datalong: 0/1 unpause/pause waypoint movement
+
+33 SCRIPT_COMMAND_XP_USER                   source or target with Player
+                                            * datalong=bool 0=off, 1=on
+
+34 SCRIPT_COMMAND_TERMINATE_COND            * datalong = condition_id, datalong2 = fail-quest (if provided this quest will be failed for a player)
+                                            * !(data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL): terminate when condition is true
+                                                data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL:  terminate when condition is false
diff --git a/index.html b/index.html
new file mode 100644
index 00000000000..5408c612374
--- /dev/null
+++ b/index.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+	<title>ike3/mangos @ GitHub</title>
+	
+	<style type="text/css">
+		body {
+  		margin-top: 1.0em;
+  		background-color: white;
+		  font-family: "Helvetica,Arial,FreeSans";
+  		color: #000000;
+    }
+    #container {
+      margin: 0 auto;
+      width: 700px;
+    }
+		h1 { font-size: 3.8em; color: #8c6d2e; margin-bottom: 3px; }
+		h1 .small { font-size: 0.4em; }
+		h1 a { text-decoration: none }
+		h2 { font-size: 1.5em; color: #8c6d2e; }
+    h3 { text-align: center; color: #8c6d2e; }
+    a { color: #8c6d2e; }
+    .description { font-size: 1.2em; margin-bottom: 30px; margin-top: 30px; font-style: italic;}
+    .download { float: right; }
+		pre { background: #000; color: #fff; padding: 15px;}
+    hr { border: 0; width: 80%; border-bottom: 1px solid #aaa}
+    .footer { text-align:center; padding-top:30px; font-style: italic; }
+	</style>
+	
+</head>
+
+<body>
+  <a href="http://github.com/ike3/mangos"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+
+  <div id="container">
+
+    <div class="download">
+      <a href="http://github.com/ike3/mangos/zipball/ai">
+        <img border="0" width="90" src="http://github.com/images/modules/download/zip.png"></a>
+      <a href="http://github.com/ike3/mangos/tarball/ai">
+        <img border="0" width="90" src="http://github.com/images/modules/download/tar.png"></a>
+    </div>
+
+    <h1><a href="http://github.com/ike3/mangos">AI Playerbot</a>
+      <span class="small">by <a href="http://github.com/ike3">ike3</a></span></h1>
+
+    <div class="description">
+      This is a fork of playerbot with completely different AI based on strategies.
+    </div>
+
+<h2>Documentation</h2>
+<br/>
+Please refer to text files available in doc/playerbot folder
+
+
+    <h2>Download</h2>
+    <p>
+      You can download this project in either
+      <a href="http://github.com/ike3/mangos/zipball/ai">zip</a> or
+      <a href="http://github.com/ike3/mangos/tarball/ai">tar</a> formats.
+    </p>
+    <p>You can also clone the project with <a href="http://git-scm.com">Git</a>
+      by running:
+      <pre>$ git clone git://github.com/ike3/mangos</pre>
+    </p>
+
+    <div class="footer">
+      get the source code on GitHub : <a href="http://github.com/ike3/mangos">ike3/mangos</a>
+    </div>
+
+  </div>
+
+  
+</body>
+</html>
diff --git a/mangosR2.png b/mangosR2.png
new file mode 100644
index 00000000000..8a9c27df3a5
Binary files /dev/null and b/mangosR2.png differ
diff --git a/project_setup.bat b/project_setup.bat
new file mode 100755
index 00000000000..b9bebc4b8e0
--- /dev/null
+++ b/project_setup.bat
@@ -0,0 +1,168 @@
+@ECHO off
+COLOR 0B
+REM *****************************************************************************************
+REM Set your compiler and another features here. Possible VC1, VC11 
+REM currently possible VC10 (MS Visual studio 10 Pro) and VC11 (MS Visual studio 11 or 2012 Pro/Ultimate)
+REM Warning! VS Express edition not supported! Also need check path (below) to VC10/11 binary
+SET vs=Visual studio 11
+
+REM Install path for MaNGOS (in this be created ./bin and ./etc folders)
+SET INSTALL_PATH="C:\\MaNGOS"
+
+REM Platform for build. Possible Win32, Win64. Warning! Win64 build possible only on 64-bit main OS!
+SET BUILD_PLATFORM=Win32
+
+REM Count of cores on PC, where project compiled. for speedup only
+SET CORE_NUMBER=2
+
+REM Used mangos memory manager. Possible managers - STD, TBB (not recommended), FASTMM (default)
+SET MEMORY_MANAGER=FASTMM
+
+SET vs_path=%ProgramFiles(x86)%
+
+IF "%vs_path%"=="" (
+    SET "vs_path=%ProgramFiles%"
+)
+SET vs_path=%vs_path:\=/%
+
+:menu
+REM *****************************************************************************************
+if "%vs%"=="Visual studio 11" (
+    SET COMPILER="Visual Studio 11"
+    if %BUILD_PLATFORM%==x64 (SET COMPILER="Visual Studio 11 Win64")
+    SET COMPILER_PATH="%vs_path%/Microsoft Visual Studio 11.0/VC/bin/cl.exe"
+    SET LINKER_PATH="%vs_path%/Microsoft Visual Studio 11.0/VC/bin/link.exe"
+    SET VC_VARS="%vs_path%\\Microsoft Visual Studio 11.0\\VC\\"
+)
+if "%vs%"=="Visual studio 10" (
+    SET COMPILER="Visual Studio 10"
+    if %BUILD_PLATFORM%==x64 (SET COMPILER="Visual Studio 10 Win64")
+    SET COMPILER_PATH="%vs_path%/Microsoft Visual Studio 10.0/VC/bin/cl.exe"
+    SET LINKER_PATH="%vs_path%/Microsoft Visual Studio 10.0/VC/bin/link.exe"
+    SET VC_VARS="%vs_path%\\Microsoft Visual Studio 10.0\\VC\\"
+)
+
+SET RESULT_CONF=Release
+SET MEMMAN_STR1="0"
+SET MEMMAN_STR3="0"
+SET MEMMAN_STR2="0"
+if %MEMORY_MANAGER%==STD    (SET MEMMAN_STR2="1")
+if %MEMORY_MANAGER%==TBB    (SET MEMMAN_STR3="1")
+if %MEMORY_MANAGER%==FASTMM (SET MEMMAN_STR1="1")
+SET C_FLAGS="/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc /GR"
+SET CMakeConfiguration=-G %COMPILER% -DPCH=1 -DCMAKE_CXX_COMPILER=%COMPILER_PATH% -DCMAKE_CXX_FLAGS=%C_FLAGS% -DCMAKE_C_FLAGS=%C_FLAGS% -DCMAKE_CXX_COMPILER=%COMPILER_PATH% -DCMAKE_INSTALL_PREFIX=%INSTALL_PATH% -DUSE_FASTMM_MALLOC=%MEMMAN_STR1% -DUSE_STD_MALLOC=%MEMMAN_STR2% -DUSE_TBB_MALLOC=%MEMMAN_STR3% ..
+SET MSBuildConfiguration=INSTALL.vcxproj /m:%CORE_NUMBER% /p:Configuration=%RESULT_CONF%;Platform=%BUILD_PLATFORM%
+REM *****************************************************************************************
+
+cls
+echo ##########################
+echo # Welcome to R2 compiler #
+echo ##########################
+echo.
+REM *****************************************************************************************
+echo +++++++++++++++++++++ Current CMake configuration +++++++++++++++++++++
+echo cmake %CMakeConfiguration%
+echo.
+echo +++++++++++++++++++++ Current compiler configuration +++++++++++++++++++++
+echo MSBuild %MSBuildConfiguration%
+REM *****************************************************************************************
+echo.
+echo.
+echo 0 - Exit R2 compiler
+echo.
+echo 1 - Change compiler            [%vs%]
+echo 2 - Change build platform      [%BUILD_PLATFORM%]
+echo 3 - Change install path        [%INSTALL_PATH%]
+echo 4 - Change CPU core(s) number  [%CORE_NUMBER%]
+echo.
+echo 5 - Change VS Path             [%vs_path%]
+echo.
+echo 8 - Create Project
+echo 9 - Start compile
+echo.
+set /P menu=Select a number: 
+if "%menu%"=="0" goto end
+if "%menu%"=="1" goto compiler
+if "%menu%"=="2" goto platform
+if "%menu%"=="3" goto path
+if "%menu%"=="4" goto core
+if "%menu%"=="5" goto win_part
+if "%menu%"=="8" goto cmake
+if "%menu%"=="9" goto build
+if "%menu%"=="%menu%" echo. & echo Wrong number! & pause & goto menu
+
+:compiler
+cls
+echo 1 - Visual studio 10
+echo 2 - Visual studio 11
+
+set /P menu=Select a number: 
+if "%menu%"=="1" SET vs=Visual studio 10& goto menu
+if "%menu%"=="2" SET vs=Visual studio 11& goto menu
+if "%menu%"=="%menu%" echo. & echo Wrong number! & pause & goto compiler
+
+:path
+cls
+set /P install_drive=Enter the partition drive letter first: 
+set /P install_path=Enter the folder name: 
+set INSTALL_PATH="%install_drive%:\\%install_path%"
+goto menu
+
+:platform
+cls
+echo 1 - Win32
+echo 2 - x64
+
+set /P menu=Select a number: 
+if "%menu%"=="1" SET BUILD_PLATFORM=Win32& goto menu
+if "%menu%"=="2" SET BUILD_PLATFORM=x64& goto menu
+if "%menu%"=="%menu%" echo. & echo Wrong number! & pause & goto platform
+
+:core
+cls
+set /P CORE_NUMBER=Enter your CPU core number: 
+goto menu
+
+:win_part
+cls
+set /P vs_path=Enter the VS path:
+goto menu
+
+:cmake
+REM *****************************************************************************************
+
+if not exist build (
+    mkdir build
+)
+
+if not exist %INSTALL_PATH% (
+    mkdir %INSTALL_PATH%
+    if not exist %INSTALL_PATH% (
+        echo Please, make output directory %INSTALL_PATH%
+        pause
+        goto :menu
+    )
+)
+
+cd build
+cmake %CMakeConfiguration%
+cd ..
+pause
+goto :menu
+REM *****************************************************************************************
+
+:build
+call %VC_VARS%vcvarsall.bat
+cd build
+MSBuild %MSBuildConfiguration%
+cd ..
+pause
+goto :menu
+REM *****************************************************************************************
+
+:help
+echo "Set up parameters in this bat file!"
+goto :menu
+REM *****************************************************************************************
+
+:end
diff --git a/project_setup.sh b/project_setup.sh
new file mode 100755
index 00000000000..9e1eb2bf3d7
--- /dev/null
+++ b/project_setup.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+PREFIX=${PWD}/bin
+CONF_OPTS+="-DPCH=1 "
+CONF_OPTS+="-DDEBUG=1 "
+CONF_OPTS+="-DACE_USE_EXTERNAL=1 "
+CONF_OPTS+="-DUSE_STD_MALLOC=1 "
+#CONF_OPTS+="-DUSE_TBB_MALLOC=1"
+
+CFLAGS="-march=native -O2 -DNDEBUG"
+#CFLAGS="-O1 -fno-inline"
+CFLAGS+=" -pipe -ggdb -fno-strict-aliasing -fno-delete-null-pointer-checks -D_LARGEFILE_SOURCE"
+CXXFLAGS="${CFLAGS}"
+
+rm -Rf build &&
+mkdir build &&
+cd build &&
+
+cmake .. ${CONF_OPTS} \
+    -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+    -DCMAKE_C_FLAGS="${CFLAGS}" \
+    -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+    -DCMAKE_C_COMPILER="gcc" \
+    -DCMAKE_CXX_COMPILER="g++"
diff --git a/project_setup_clang.sh b/project_setup_clang.sh
new file mode 100755
index 00000000000..3275e0a458c
--- /dev/null
+++ b/project_setup_clang.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+PREFIX=${PWD}/bin
+CONF_OPTS+="-DPCH=0 "
+CONF_OPTS+="-DDEBUG=1 "
+CONF_OPTS+="-DACE_USE_EXTERNAL=1 "
+CONF_OPTS+="-DUSE_STD_MALLOC=1 "
+
+CFLAGS="-march=native -O2 -DNDEBUG -std=c++11 -ggdb"
+CXXFLAGS="${CFLAGS}"
+
+rm -Rf build &&
+mkdir build &&
+cd build &&
+
+cmake .. ${CONF_OPTS} \
+    -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+    -DCMAKE_C_FLAGS="${CFLAGS}" \
+    -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+    -DCMAKE_C_COMPILER="clang" \
+    -DCMAKE_CXX_COMPILER="clang++"
diff --git a/project_utils_cross-complile.sh b/project_utils_cross-complile.sh
new file mode 100755
index 00000000000..2719ddd9c55
--- /dev/null
+++ b/project_utils_cross-complile.sh
@@ -0,0 +1,157 @@
+#!/bin/bash
+################################################################################################
+# bash script for compilation mangosR2 utility in MINGW32/MINGW64 environment. by /dev/rsa
+################################################################################################
+#check path of running
+if [ ! -d ./.git ]; then
+    echo $"Please, run this script in mangos root folder!"
+    exit 2
+fi;
+
+case "$1" in
+    win32|32)
+    PLATFORM=i686
+    ;;
+    win64|64)
+    PLATFORM=x86_64
+    ;;
+    plain|none)
+    PLATFORM=build
+    ;;
+    *)
+    echo $"Usage: $0 {win32|win64|plain}"
+    exit 2
+esac
+################################################################################################
+#make binary storage
+BINARY_PATH=bin
+if [ ! -d ./$BINARY_PATH ]; then
+    mkdir $BINARY_PATH
+fi;
+
+if [ ! -d ./$BINARY_PATH/$PLATFORM ]; then
+    mkdir $BINARY_PATH/$PLATFORM
+fi;
+################################################################################################
+# Make extractor
+cd contrib/extractor
+make clean
+if [ ! -d ./$PLATFORM ]; then
+    mkdir $PLATFORM
+fi;
+cd $PLATFORM
+if [ "$PLATFORM" != "build" ]; then
+    cmake -DCMAKE_TOOLCHAIN_FILE=../../../cmake/mingw32-$PLATFORM.cmake ..
+else
+    cmake ..
+fi
+
+make
+
+if [ "$PLATFORM" != "build" ]; then
+    cp ./ad.exe ../../../$BINARY_PATH/$PLATFORM/
+    cp /usr/$PLATFORM-w64-mingw32/sys-root/mingw/bin/zlib1.dll ../../../$BINARY_PATH/$PLATFORM/
+    cp /usr/$PLATFORM-w64-mingw32/sys-root/mingw/bin/libgcc_s_sjlj-1.dll ../../../$BINARY_PATH/$PLATFORM/
+    cp /usr/$PLATFORM-w64-mingw32/sys-root/mingw/bin/libstdc++-6.dll ../../../$BINARY_PATH/$PLATFORM/
+else
+    cp ./ad ../../../$BINARY_PATH/$PLATFORM
+fi
+cd ../../..
+################################################################################################
+# Make libmpq
+cd dep/libmpq
+make clean
+. ./autogen.sh
+if [ "$PLATFORM" != "build" ]; then
+    if [ "$PLATFORM" == "i686" ]; then
+        mingw32-configure --host=$PLATFORM-w64-mingw32
+    else
+        mingw64-configure --host=$PLATFORM-w64-mingw32
+    fi
+else
+    ./configure
+fi
+make
+make install
+cd ../..
+################################################################################################
+# Make extractor
+cd contrib/vmap_extractor_v3
+make clean
+if [ ! -d ./$PLATFORM ]; then
+    mkdir $PLATFORM
+fi;
+cd $PLATFORM
+
+if [ "$PLATFORM" != "build" ]; then
+    cmake -DCMAKE_TOOLCHAIN_FILE=../../../cmake/mingw32-$PLATFORM.cmake ..
+else
+    cmake ..
+fi
+
+make
+
+if [ "$PLATFORM" != "build" ]; then
+    cp ./vmapextract/vmapExtractor3.exe ../../../$BINARY_PATH/$PLATFORM/
+    cp /usr/$PLATFORM-w64-mingw32/sys-root/mingw/bin/libbz2-1.dll ../../../$BINARY_PATH/$PLATFORM/
+else
+    cp ./vmapextract/vmapExtractor3 ../../../$BINARY_PATH/$PLATFORM/
+fi
+cd ../../..
+################################################################################################
+# Make external ACE (need run only after ACE version on build server change)
+#if [ "$PLATFORM" != "build" ]; then
+#    build_prefix="/usr/local/src"
+#    ACE_ROOT=$build_prefix/ACE_wrappers; export ACE_ROOT
+#    MINGW_BASE=/usr/$PLATFORM-w64-mingw32; export MINGW_BASE
+#    export PATH=$MINGW_BASE/bin:$PATH
+#    CROSS_COMPILE=$PLATFORM-; export CROSS_COMPILE
+#fi
+#cd $ACE_ROOT
+#echo '#include "ace/config-win32.h"' > $ACE_ROOT/ace/config.h
+#echo 'include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU' > $ACE_ROOT/include/makeinclude/platform_macros.GNU
+#mingw32-make ACE TP_Reactor
+#mingw32-make install ACE TP_Reactor
+################################################################################################
+# Make vmap assembler
+cd contrib/vmap_assembler
+if [ ! -d ./$PLATFORM ]; then
+    mkdir $PLATFORM
+fi;
+cd $PLATFORM
+if [ "$PLATFORM" != "build" ]; then
+    cmake -DCMAKE_TOOLCHAIN_FILE=../../../cmake/mingw32-$PLATFORM.cmake ..
+else
+    cmake ..
+fi
+
+make
+
+if [ "$PLATFORM" != "build" ]; then
+    cp ./vmap_assembler.exe ../../../$BINARY_PATH/$PLATFORM/
+    cp /usr/$PLATFORM-w64-mingw32/sys-root/mingw/lib/libACE.dll ../../../$BINARY_PATH/$PLATFORM/
+else
+    cp ./vmap_assembler ../../../$BINARY_PATH/$PLATFORM/
+fi
+cd ../../..
+################################################################################################
+# Make mmap extractor
+cd contrib/mmap
+if [ ! -d ./$PLATFORM ]; then
+    mkdir $PLATFORM
+fi;
+cd $PLATFORM
+if [ "$PLATFORM" != "build" ]; then
+    cmake -DCMAKE_TOOLCHAIN_FILE=../../../cmake/mingw32-$PLATFORM.cmake ..
+else
+    cmake ..
+fi
+
+make
+
+if [ "$PLATFORM" != "build" ]; then
+    cp ./MoveMapGen.exe ../../../$BINARY_PATH/$PLATFORM/
+else
+    cp ./MoveMapGen  ../../../$BINARY_PATH/$PLATFORM/
+fi
+################################################################################################
diff --git a/sql/characters.sql b/sql/characters.sql
index 1eb474198d7..970da8ee6e9 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -21,7 +21,7 @@
 
 DROP TABLE IF EXISTS `character_db_version`;
 CREATE TABLE `character_db_version` (
-  `required_11785_02_characters_instance` bit(1) default NULL
+  `required_12562_01_characters_various_tables` bit(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
 
 --
@@ -242,7 +242,7 @@ CREATE TABLE `characters` (
   `chosenTitle` int(10) UNSIGNED NOT NULL default '0',
   `knownCurrencies` bigint(20) UNSIGNED NOT NULL default '0',
   `watchedFaction` int(10) UNSIGNED NOT NULL default '0',
-  `drunk` smallint(5) UNSIGNED NOT NULL default '0',
+  `drunk` tinyint(3) UNSIGNED NOT NULL default '0',
   `health` int(10) UNSIGNED NOT NULL default '0',
   `power1` int(10) UNSIGNED NOT NULL default '0',
   `power2` int(10) UNSIGNED NOT NULL default '0',
@@ -714,10 +714,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `character_queststatus_daily`;
 CREATE TABLE `character_queststatus_daily` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `quest` int(11) unsigned NOT NULL default '0' COMMENT 'Quest Identifier',
-  PRIMARY KEY  (`guid`,`quest`),
-  KEY `idx_guid` (`guid`)
+  `guid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
+  `quest` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest Identifier',
+  PRIMARY KEY (`guid`,`quest`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
 
 --
@@ -735,10 +734,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `character_queststatus_monthly`;
 CREATE TABLE `character_queststatus_monthly` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `quest` int(11) unsigned NOT NULL default '0' COMMENT 'Quest Identifier',
-  PRIMARY KEY  (`guid`,`quest`),
-  KEY `idx_guid` (`guid`)
+  `guid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
+  `quest` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest Identifier',
+  PRIMARY KEY (`guid`,`quest`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
 
 --
@@ -756,10 +754,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `character_queststatus_weekly`;
 CREATE TABLE `character_queststatus_weekly` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `quest` int(11) unsigned NOT NULL default '0' COMMENT 'Quest Identifier',
-  PRIMARY KEY  (`guid`,`quest`),
-  KEY `idx_guid` (`guid`)
+  `guid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
+  `quest` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest Identifier',
+  PRIMARY KEY (`guid`,`quest`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
 
 --
@@ -825,9 +822,7 @@ CREATE TABLE `character_social` (
   `friend` int(11) unsigned NOT NULL default '0' COMMENT 'Friend Global Unique Identifier',
   `flags` tinyint(1) unsigned NOT NULL default '0' COMMENT 'Friend Flags',
   `note` varchar(48) NOT NULL DEFAULT '' COMMENT 'Friend Note',
-  PRIMARY KEY  (`guid`,`friend`,`flags`),
-  KEY `guid` (`guid`),
-  KEY `friend` (`friend`),
+  PRIMARY KEY (`guid`,`friend`,`flags`),
   KEY `guid_flags` (`guid`,`flags`),
   KEY `friend_flags` (`friend`,`flags`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
@@ -945,9 +940,8 @@ CREATE TABLE `character_talent` (
   `current_rank` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `spec` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`,`talent_id`,`spec`),
-  KEY guid_key (`guid`),
-  KEY talent_key (`talent_id`),
-  KEY spec_key (`spec`)
+  KEY `talent_key` (`talent_id`),
+  KEY `spec_key` (`spec`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -1222,19 +1216,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `guild_bank_eventlog`;
 CREATE TABLE `guild_bank_eventlog` (
-  `guildid` int(11) unsigned NOT NULL default '0' COMMENT 'Guild Identificator',
-  `LogGuid` int(11) unsigned NOT NULL default '0' COMMENT 'Log record identificator - auxiliary column',
-  `TabId` tinyint(3) unsigned NOT NULL default '0' COMMENT 'Guild bank TabId',
-  `EventType` tinyint(3) unsigned NOT NULL default '0' COMMENT 'Event type',
-  `PlayerGuid` int(11) unsigned NOT NULL default '0',
-  `ItemOrMoney` int(11) unsigned NOT NULL default '0',
-  `ItemStackCount` tinyint(3) unsigned NOT NULL default '0',
-  `DestTabId` tinyint(1) unsigned NOT NULL default '0' COMMENT 'Destination Tab Id',
-  `TimeStamp` bigint(20) unsigned NOT NULL default '0' COMMENT 'Event UNIX time',
-  PRIMARY KEY  (`guildid`,`LogGuid`,`TabId`),
-  KEY `guildid_key` (`guildid`),
-  INDEX `Idx_PlayerGuid`(`PlayerGuid`),
-  INDEX `Idx_LogGuid`(`LogGuid`)
+  `guildid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild Identificator',
+  `LogGuid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Log record identificator - auxiliary column',
+  `TabId` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild bank TabId',
+  `EventType` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Event type',
+  `PlayerGuid` int(11) unsigned NOT NULL DEFAULT '0',
+  `ItemOrMoney` int(11) unsigned NOT NULL DEFAULT '0',
+  `ItemStackCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DestTabId` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT 'Destination Tab Id',
+  `TimeStamp` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Event UNIX time',
+  PRIMARY KEY (`guildid`,`LogGuid`,`TabId`),
+  KEY `Idx_PlayerGuid` (`PlayerGuid`),
+  KEY `Idx_LogGuid` (`LogGuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -1252,14 +1245,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `guild_bank_item`;
 CREATE TABLE `guild_bank_item` (
-  `guildid` int(11) unsigned NOT NULL default '0',
-  `TabId` tinyint(1) unsigned NOT NULL default '0',
-  `SlotId` tinyint(3) unsigned NOT NULL default '0',
-  `item_guid` int(11) unsigned NOT NULL default '0',
-  `item_entry` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guildid`,`tabid`,`slotid`),
-  KEY `guildid_key` (`guildid`),
-  INDEX `Idx_item_guid`(`item_guid`)
+  `guildid` int(11) unsigned NOT NULL DEFAULT '0',
+  `TabId` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `SlotId` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `item_guid` int(11) unsigned NOT NULL DEFAULT '0',
+  `item_entry` int(11) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guildid`,`TabId`,`SlotId`),
+  KEY `Idx_item_guid` (`item_guid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -1277,13 +1269,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `guild_bank_right`;
 CREATE TABLE `guild_bank_right` (
-  `guildid` int(11) unsigned NOT NULL default '0',
-  `TabId` tinyint(1) unsigned NOT NULL default '0',
-  `rid` int(11) unsigned NOT NULL default '0',
-  `gbright` tinyint(3) unsigned NOT NULL default '0',
-  `SlotPerDay` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guildid`,`TabId`,`rid`),
-  KEY `guildid_key` (`guildid`)
+  `guildid` int(11) unsigned NOT NULL DEFAULT '0',
+  `TabId` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `rid` int(11) unsigned NOT NULL DEFAULT '0',
+  `gbright` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SlotPerDay` int(11) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guildid`,`TabId`,`rid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -1306,8 +1297,7 @@ CREATE TABLE `guild_bank_tab` (
   `TabName` varchar(100) NOT NULL default '',
   `TabIcon` varchar(100) NOT NULL default '',
   `TabText` text,
-  PRIMARY KEY  (`guildid`,`TabId`),
-  KEY `guildid_key` (`guildid`)
+  PRIMARY KEY (`guildid`,`TabId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -1353,28 +1343,27 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `guild_member`;
 CREATE TABLE `guild_member` (
-  `guildid` int(6) unsigned NOT NULL default '0',
-  `guid` int(11) unsigned NOT NULL default '0',
-  `rank` tinyint(2) unsigned NOT NULL default '0',
-  `pnote` varchar(255) NOT NULL default '',
-  `offnote` varchar(255) NOT NULL default '',
-  `BankResetTimeMoney` int(11) unsigned NOT NULL default '0',
-  `BankRemMoney` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab0` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab0` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab1` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab1` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab2` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab2` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab3` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab3` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab4` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab4` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab5` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab5` int(11) unsigned NOT NULL default '0',
-  KEY `guildid_key` (`guildid`),
-  KEY `guildid_rank_key` (`guildid`,`rank`),
-  UNIQUE KEY `guid_key` (`guid`)
+  `guildid` int(6) unsigned NOT NULL DEFAULT '0',
+  `guid` int(11) unsigned NOT NULL DEFAULT '0',
+  `rank` tinyint(2) unsigned NOT NULL DEFAULT '0',
+  `pnote` varchar(255) NOT NULL DEFAULT '',
+  `offnote` varchar(255) NOT NULL DEFAULT '',
+  `BankResetTimeMoney` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankRemMoney` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankResetTimeTab0` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankRemSlotsTab0` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankResetTimeTab1` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankRemSlotsTab1` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankResetTimeTab2` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankRemSlotsTab2` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankResetTimeTab3` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankRemSlotsTab3` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankResetTimeTab4` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankRemSlotsTab4` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankResetTimeTab5` int(11) unsigned NOT NULL DEFAULT '0',
+  `BankRemSlotsTab5` int(11) unsigned NOT NULL DEFAULT '0',
+  UNIQUE KEY `guid_key` (`guid`),
+  KEY `guildid_rank_key` (`guildid`,`rank`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Guild System';
 
 --
diff --git a/sql/characters_ai_playerbot.sql b/sql/characters_ai_playerbot.sql
new file mode 100644
index 00000000000..e29f627556b
--- /dev/null
+++ b/sql/characters_ai_playerbot.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS `ai_playerbot_random_bots`;
+
+CREATE TABLE `ai_playerbot_random_bots` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `owner` bigint(20) NOT NULL,
+  `bot` bigint(20) NOT NULL,
+  `time` bigint(20) NOT NULL,
+  `validIn` bigint(20) DEFAULT NULL,
+  `event` varchar(45) DEFAULT NULL,
+  `value` bigint(20) DEFAULT NULL,
+  `data` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `owner` (`owner`),
+  KEY `bot` (`bot`),
+  KEY `event` (`event`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/sql/characters_ai_playerbot_names.zip b/sql/characters_ai_playerbot_names.zip
new file mode 100644
index 00000000000..7474032a414
Binary files /dev/null and b/sql/characters_ai_playerbot_names.zip differ
diff --git a/sql/characters_armory.sql b/sql/characters_armory.sql
new file mode 100644
index 00000000000..25e8eaf67b8
--- /dev/null
+++ b/sql/characters_armory.sql
@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS `armory_character_stats`;
+CREATE TABLE `armory_character_stats` (
+  `guid` int(11) NOT NULL,
+  `data` longtext NOT NULL,
+  `save_date` int(11) default NULL,
+  PRIMARY KEY  (`guid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='World of Warcraft Armory table';
+
+DROP TABLE IF EXISTS `character_feed_log`;
+CREATE TABLE `character_feed_log` (
+  `guid` int(11) NOT NULL,
+  `type` smallint(1) NOT NULL,
+  `data` int(11) NOT NULL,
+  `date` int(11) default NULL,
+  `counter` int(11) NOT NULL,
+  `difficulty` smallint(6) default '-1',
+  `item_guid` int(11) default '-1',
+  `item_quality` smallint(6) NOT NULL default '-1'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
diff --git a/sql/characters_armory_2.sql b/sql/characters_armory_2.sql
new file mode 100644
index 00000000000..5118c486e04
--- /dev/null
+++ b/sql/characters_armory_2.sql
@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS `armory_game_chart`;
+CREATE TABLE `armory_game_chart` (
+  `gameid` int(11) NOT NULL,
+  `teamid` int(11) NOT NULL,
+  `guid` int(11) NOT NULL,
+  `changeType` int(11) NOT NULL,
+  `ratingChange` int(11) NOT NULL,
+  `teamRating` int(11) NOT NULL,
+  `damageDone` int(11) NOT NULL,
+  `deaths` int(11) NOT NULL,
+  `healingDone` int(11) NOT NULL,
+  `damageTaken` int(11) NOT NULL,
+  `healingTaken` int(11) NOT NULL,
+  `killingBlows` int(11) NOT NULL,
+  `mapId` int(11) NOT NULL,
+  `start` int(11) NOT NULL,
+  `end` int(11) NOT NULL,
+  PRIMARY KEY  (`gameid`,`teamid`,`guid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='WoWArmory Game Chart';
\ No newline at end of file
diff --git a/sql/characters_auctionhousebot.sql b/sql/characters_auctionhousebot.sql
new file mode 100644
index 00000000000..c2d8824bf7e
--- /dev/null
+++ b/sql/characters_auctionhousebot.sql
@@ -0,0 +1,37 @@
+DROP TABLE IF EXISTS `ahbot_history`;
+DROP TABLE IF EXISTS `ahbot_category`;
+DROP TABLE IF EXISTS `ahbot_price`;
+
+CREATE TABLE `ahbot_history` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `buytime` bigint(20) NOT NULL,
+  `item` bigint(20) NOT NULL,
+  `bid` bigint(20) NOT NULL,
+  `buyout` bigint(20) NOT NULL,
+  `won` bigint(20) NOT NULL,
+  `category` varchar(45) DEFAULT NULL,
+  `auction_house` bigint(20) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `won` (`won`),
+  KEY `category` (`category`),
+  KEY `auction_house` (`auction_house`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `ahbot_category` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `category` varchar(45) DEFAULT NULL,
+  `multiplier` decimal(20, 2) NOT NULL,
+  `max_auction_count` bigint(20) NOT NULL,
+  `expire_time` bigint(20) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `helper` (`category`, `multiplier`, `expire_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `ahbot_price` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `item` varchar(45) DEFAULT NULL,
+  `price` decimal(20, 2) NOT NULL,
+  `auction_house` bigint(20) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `ahbot_price_item` (`item`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/sql/characters_auctionhousebot_update.sql b/sql/characters_auctionhousebot_update.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/sql/mangos.sql b/sql/mangos.sql
index 14e7eab420f..bde05d66e53 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -21,10 +21,10 @@
 
 DROP TABLE IF EXISTS `db_version`;
 CREATE TABLE `db_version` (
-  `version` varchar(120) default NULL,
-  `creature_ai_version` varchar(120) default NULL,
-  `cache_id` int(10) default '0',
-  `required_12012_01_mangos_spell_template` bit(1) default NULL
+  `version` varchar(120) DEFAULT NULL,
+  `creature_ai_version` varchar(120) DEFAULT NULL,
+  `cache_id` int(10) DEFAULT '0',
+  `required_12654_01_mangos_creature_template_power` bit(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -141,7 +141,6 @@ CREATE TABLE `areatrigger_teleport` (
   `heroic_key2` mediumint(8) unsigned NOT NULL default '0',
   `required_quest_done` int(11) unsigned NOT NULL default '0',
   `required_quest_done_heroic` int(11) unsigned NOT NULL default '0',
-  `required_failed_text` text,
   `target_map` smallint(5) unsigned NOT NULL default '0',
   `target_position_x` float NOT NULL default '0',
   `target_position_y` float NOT NULL default '0',
@@ -489,7 +488,7 @@ LOCK TABLES `command` WRITE;
 INSERT INTO `command` VALUES
 ('account',0,'Syntax: .account\r\n\r\nDisplay the access level of your account.'),
 ('account characters',3,'Syntax: .account characters [#accountId|$accountName]\r\n\r\nShow list all characters for account selected by provided #accountId or $accountName, or for selected player in game.'),
-('account create',4,'Syntax: .account create $account $password\r\n\r\nCreate account and set password to it.'),
+('account create',4,'Syntax: .account create $account $password [$expansion]\r\n\r\nCreate account and set password to it. Optionally, you may also set another expansion for this account than the defined default value.'),
 ('account delete',4,'Syntax: .account delete $account\r\n\r\nDelete account with all characters.'),
 ('account lock',0,'Syntax: .account lock [on|off]\r\n\r\nAllow login from account only from current used IP or remove this requirement.'),
 ('account onlinelist',4,'Syntax: .account onlinelist\r\n\r\nShow list of online accounts.'),
@@ -516,7 +515,7 @@ INSERT INTO `command` VALUES
 ('ahbot items ratio alliance',3,'Syntax: .ahbot items ratio alliance $allianceratio\r\n\r\nSet ratio of items in alliance auction house.'),
 ('ahbot items ratio horde',3,'Syntax: .ahbot items ratio horde $horderatio\r\n\r\nSet ratio of items in horde auction house.'),
 ('ahbot items ratio neutral',3,'Syntax: .ahbot items ratio neutral $neutralratio\r\n\r\nSet ratio of items in $neutral auction house.'),
-('ahbot rebuild',3,'Syntax: .ahbot rebuild [all]\r\n\r\nExpire all actual auction of ahbot except bided by player. Binded auctions included to expire if "all" option used. Ahbot re-fill auctions base at current settings then.'),
+('ahbot rebuild',3,'Syntax: .ahbot rebuild [all]\r\n\r\nExpire all actual auction of ahbot except bided by player. Bided auctions could be forced to expire by using \"all\" option. AHBot will re-fill auctions using current settings.'),
 ('ahbot reload',3,'Syntax: .ahbot reload\r\n\r\nReload AHBot settings from configuration file.'),
 ('ahbot status',3,'Syntax: .ahbot status [all]\r\n\r\nShow current ahbot state data in short form, and with "all" with details.'),
 ('announce',1,'Syntax: .announce $MessageToBroadcast\r\n\r\nSend a global message to all players online in chat log.'),
@@ -524,7 +523,7 @@ INSERT INTO `command` VALUES
 ('auction alliance',3,'Syntax: .auction alliance\r\n\r\nShow alliance auction store independent from your team.'),
 ('auction goblin',3,'Syntax: .auction goblin\r\n\r\nShow goblin auction store common for all teams.'),
 ('auction horde',3,'Syntax: .auction horde\r\n\r\nShow horde auction store independent from your team.'),
-('auction item',3,'Syntax: .auction item (alliance|horde|goblin) #itemid[:#itemcount] [[[#minbid] #buyout] [short|long|verylong]\r\n\r\nAdd new item (in many stackes if amount grater stack size) to specific auction house at short|long|verylogn perios similar same settings in auction in game dialog. Created auction not have owner.'),
+('auction item',3,'Syntax: .auction item (alliance|horde|goblin) #itemid[:#itemcount] [[[#minbid] #buyout] [short|long|verylong]\r\n\r\nAdd new item to an specific auction house at short|long|verylong periods. Periods are the same as the ones in the in-game dialog. Created auction does not have an owner.'),
 ('aura',3,'Syntax: .aura #spellid\r\n\r\nAdd the aura from spell #spellid to the selected Unit.'),
 ('ban account',3,'Syntax: .ban account $Name $bantime $reason\r\nBan account kick player.\r\n$bantime: negative value leads to permban, otherwise use a timestring like \"4d20h3s\".'),
 ('ban character',3,'Syntax: .ban character $Name $bantime $reason\r\nBan account and kick player.\r\n$bantime: negative value leads to permban, otherwise use a timestring like \"4d20h3s\".'),
@@ -618,7 +617,7 @@ INSERT INTO `command` VALUES
 ('help',0,'Syntax: .help [$command]\r\n\r\nDisplay usage instructions for the given $command. If no $command provided show list available commands.'),
 ('hidearea',3,'Syntax: .hidearea #areaid\r\n\r\nHide the area of #areaid to the selected character. If no character is selected, hide this area to you.'),
 ('honor add',2,'Syntax: .honor add $amount\r\n\r\nAdd a certain amount of honor (gained today) to the selected player.'),
-('honor addkill',2,'Syntax: .honor addkikll\r\n\r\nAdd the targeted unit as one of your pvp kills today (you only get honor if it\'s a racial leader or a player)'),
+('honor addkill',2,'Syntax: .honor addkill\r\n\r\nAdd the targeted unit as one of your pvp kills today (you only get honor if it\'s a racial leader or a player)'),
 ('honor update',2,'Syntax: .honor update\r\n\r\nForce the yesterday\'s honor fields to be updated with today\'s data, which will get reset for the selected player.'),
 ('instance unbind',3,'Syntax: .instance unbind all\r\n  All of the selected player\'s binds will be cleared.\r\n.instance unbind #mapid\r\n Only the specified #mapid instance will be cleared.'),
 ('instance listbinds',3,'Syntax: .instance listbinds\r\n  Lists the binds of the selected player.'),
@@ -745,7 +744,7 @@ INSERT INTO `command` VALUES
 ('reload all_npc',3,'Syntax: .reload all_npc\r\n\r\nReload `points_of_interest` and `npc_*` tables if reload support added for these tables and these tables can be _safe_ reloaded.'),
 ('reload all_quest',3,'Syntax: .reload all_quest\r\n\r\nReload all quest related tables if reload support added for this table and this table can be _safe_ reloaded.'),
 ('reload all_spell',3,'Syntax: .reload all_spell\r\n\r\nReload all `spell_*` tables with reload support added and that can be _safe_ reloaded.'),
-('reload all_scripts',3,'Syntax: .reload all_scripts\r\n\r\nReload `*_scripts` tables.'),
+('reload all_scripts',3,'Syntax: .reload all_scripts\r\n\r\nReload `dbscripts_on_*` tables.'),
 ('reload config',3,'Syntax: .reload config\r\n\r\nReload config settings (by default stored in mangosd.conf). Not all settings can be change at reload: some new setting values will be ignored until restart, some values will applied with delay or only to new objects/maps, some values will explicitly rejected to change at reload.'),
 ('repairitems',2,'Syntax: .repairitems\r\n\r\nRepair all selected player''s items.'),
 ('reset achievements',3,'Syntax: .reset achievements [$playername]\r\n\r\nReset achievements data for selected or named (online or offline) character. Achievements for persistance progress data like completed quests/etc re-filled at reset. Achievements for events like kills/casts/etc will lost.'),
@@ -814,7 +813,7 @@ INSERT INTO `command` VALUES
 ('wp export',3,'Syntax: .wp export [#creature_guid or Select a Creature] $filename'),
 ('wp import',3,'Syntax: .wp import $filename'),
 ('wp modify',2,'Syntax: .wp modify [#creature_guid or Select a Creature]\r\nadd - Add a waypoint after the selected visual\r\nwaittime $time\r\nemote ID\r\nspell ID\r\ntext1| text2| text3| text4| text5 <text>\r\nmodel1 ID\r\nmodel2 ID\r\nmove(moves wp to player pos)\r\ndel (deletes the wp)\r\n\r\nOnly one parameter per time!'),
-('wp show',2,'Syntax: .wp show [#creature_guid or Select a Creature]\r\non\r\nfirst\r\nlast\r\noff\r\ninfo\r\n\r\nFor using info you have to do first show on and than select a Visual-Waypoint and do the show info!');
+('wp show',2,'Syntax: .wp show [#creature_guid or Select a Creature]\r\nwhere command can have one of the following values\r\non (to show all related wp)\r\nfirst (to see only first one)\r\nlast (to see only last one)\r\noff (to hide all related wp)\r\ninfo (to get more info about theses wp)\r\n\r\nFor using info you have to do first show on and than select a Visual-Waypoint and do the show info!');
 /*!40000 ALTER TABLE `command` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1024,9 +1023,6 @@ CREATE TABLE `creature_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -1144,39 +1140,6 @@ LOCK TABLES `creature_movement` WRITE;
 /*!40000 ALTER TABLE `creature_movement` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `creature_movement_scripts`
---
-
-DROP TABLE IF EXISTS `creature_movement_scripts`;
-CREATE TABLE `creature_movement_scripts` (
-  `id` mediumint(8) unsigned NOT NULL default '0',
-  `delay` int(10) unsigned NOT NULL default '0',
-  `command` mediumint(8) unsigned NOT NULL default '0',
-  `datalong` mediumint(8) unsigned NOT NULL default '0',
-  `datalong2` int(10) unsigned NOT NULL default '0',
-  `buddy_entry` int(10) unsigned NOT NULL default '0',
-  `search_radius` int(10) unsigned NOT NULL default '0',
-  `data_flags` tinyint(3) unsigned NOT NULL default '0',
-  `dataint` int(11) NOT NULL default '0',
-  `dataint2` int(11) NOT NULL default '0',
-  `dataint3` int(11) NOT NULL default '0',
-  `dataint4` int(11) NOT NULL default '0',
-  `x` float NOT NULL default '0',
-  `y` float NOT NULL default '0',
-  `z` float NOT NULL default '0',
-  `o` float NOT NULL default '0',
-  `comments` varchar(255) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `creature_movement_scripts`
---
-
-LOCK TABLES `creature_movement_scripts` WRITE;
-/*!40000 ALTER TABLE `creature_movement_scripts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `creature_movement_scripts` ENABLE KEYS */;
-UNLOCK TABLES;
 
 --
 -- Table structure for table `creature_movement_template`
@@ -1268,92 +1231,92 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `creature_template`;
 CREATE TABLE `creature_template` (
-  `entry` mediumint(8) unsigned NOT NULL default '0',
-  `difficulty_entry_1` mediumint(8) unsigned NOT NULL default '0',
-  `difficulty_entry_2` mediumint(8) unsigned NOT NULL default '0',
-  `difficulty_entry_3` mediumint(8) unsigned NOT NULL default '0',
-  `KillCredit1` int(11) unsigned NOT NULL default '0',
-  `KillCredit2` int(11) unsigned NOT NULL default '0',
-  `modelid_1` mediumint(8) unsigned NOT NULL default '0',
-  `modelid_2` mediumint(8) unsigned NOT NULL default '0',
-  `modelid_3` mediumint(8) unsigned NOT NULL default '0',
-  `modelid_4` mediumint(8) unsigned NOT NULL default '0',
-  `name` char(100) NOT NULL default '0',
-  `subname` char(100) default NULL,
-  `IconName` char(100) default NULL,
-  `gossip_menu_id` mediumint(8) unsigned NOT NULL default '0',
-  `minlevel` tinyint(3) unsigned NOT NULL default '1',
-  `maxlevel` tinyint(3) unsigned NOT NULL default '1',
-  `minhealth` int(10) unsigned NOT NULL default '0',
-  `maxhealth` int(10) unsigned NOT NULL default '0',
-  `minmana` int(10) unsigned NOT NULL default '0',
-  `maxmana` int(10) unsigned NOT NULL default '0',
-  `armor` mediumint(8) unsigned NOT NULL default '0',
-  `faction_A` smallint(5) unsigned NOT NULL default '0',
-  `faction_H` smallint(5) unsigned NOT NULL default '0',
-  `npcflag` int(10) unsigned NOT NULL default '0',
-  `speed_walk` float NOT NULL default '1' COMMENT 'Result of 2.5/2.5, most common value',
-  `speed_run` float NOT NULL default '1.14286' COMMENT 'Result of 8.0/7.0, most common value',
-  `scale` float NOT NULL default '1',
-  `rank` tinyint(3) unsigned NOT NULL default '0',
-  `mindmg` float NOT NULL default '0',
-  `maxdmg` float NOT NULL default '0',
-  `dmgschool` tinyint(4) NOT NULL default '0',
-  `attackpower` int(10) unsigned NOT NULL default '0',
-  `dmg_multiplier` float NOT NULL default '1',
-  `baseattacktime` int(10) unsigned NOT NULL default '0',
-  `rangeattacktime` int(10) unsigned NOT NULL default '0',
-  `unit_class` tinyint(3) unsigned NOT NULL default '0',
-  `unit_flags` int(10) unsigned NOT NULL default '0',
-  `dynamicflags` int(10) unsigned NOT NULL default '0',
-  `family` tinyint(4) NOT NULL default '0',
-  `trainer_type` tinyint(4) NOT NULL default '0',
-  `trainer_spell` mediumint(8) unsigned NOT NULL default '0',
-  `trainer_class` tinyint(3) unsigned NOT NULL default '0',
-  `trainer_race` tinyint(3) unsigned NOT NULL default '0',
-  `minrangedmg` float NOT NULL default '0',
-  `maxrangedmg` float NOT NULL default '0',
-  `rangedattackpower` smallint(5) unsigned NOT NULL default '0',
-  `type` tinyint(3) unsigned NOT NULL default '0',
-  `type_flags` int(10) unsigned NOT NULL default '0',
-  `lootid` mediumint(8) unsigned NOT NULL default '0',
-  `pickpocketloot` mediumint(8) unsigned NOT NULL default '0',
-  `skinloot` mediumint(8) unsigned NOT NULL default '0',
-  `resistance1` smallint(5) NOT NULL default '0',
-  `resistance2` smallint(5) NOT NULL default '0',
-  `resistance3` smallint(5) NOT NULL default '0',
-  `resistance4` smallint(5) NOT NULL default '0',
-  `resistance5` smallint(5) NOT NULL default '0',
-  `resistance6` smallint(5) NOT NULL default '0',
-  `spell1` mediumint(8) unsigned NOT NULL default '0',
-  `spell2` mediumint(8) unsigned NOT NULL default '0',
-  `spell3` mediumint(8) unsigned NOT NULL default '0',
-  `spell4` mediumint(8) unsigned NOT NULL default '0',
-  `PetSpellDataId` mediumint(8) unsigned NOT NULL default '0',
-  `mingold` mediumint(8) unsigned NOT NULL default '0',
-  `maxgold` mediumint(8) unsigned NOT NULL default '0',
-  `AIName` char(64) NOT NULL default '',
-  `MovementType` tinyint(3) unsigned NOT NULL default '0',
-  `InhabitType` tinyint(3) unsigned NOT NULL default '3',
-  `unk16` float NOT NULL default '1',
-  `unk17` float NOT NULL default '1',
-  `RacialLeader` tinyint(3) unsigned NOT NULL default '0',
-  `questItem1` int(11) UNSIGNED DEFAULT '0' NOT NULL,
-  `questItem2` int(11) UNSIGNED DEFAULT '0' NOT NULL,
-  `questItem3` int(11) UNSIGNED DEFAULT '0' NOT NULL,
-  `questItem4` int(11) UNSIGNED DEFAULT '0' NOT NULL,
-  `questItem5` int(11) UNSIGNED DEFAULT '0' NOT NULL,
-  `questItem6` int(11) UNSIGNED DEFAULT '0' NOT NULL,
-  `movementId` int(11) UNSIGNED DEFAULT '0' NOT NULL,
-  `RegenHealth` tinyint(3) unsigned NOT NULL default '1',
-  `vehicle_id` mediumint(8) unsigned NOT NULL default '0',
-  `equipment_id` mediumint(8) unsigned NOT NULL default '0',
-  `trainer_id` mediumint(8) unsigned NOT NULL default '0',
-  `vendor_id` mediumint(8) unsigned NOT NULL default '0',
-  `mechanic_immune_mask` int(10) unsigned NOT NULL default '0',
-  `flags_extra` int(10) unsigned NOT NULL default '0',
-  `ScriptName` char(64) NOT NULL default '',
-  PRIMARY KEY  (`entry`)
+  `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Name` char(100) NOT NULL DEFAULT '',
+  `SubName` char(100) DEFAULT NULL,
+  `IconName` char(100) DEFAULT NULL,
+  `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `DifficultyEntry1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `DifficultyEntry2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `DifficultyEntry3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ModelId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ModelId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ModelId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ModelId4` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `FactionAlliance` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `FactionHorde` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Scale` float NOT NULL DEFAULT '1',
+  `Family` tinyint(4) NOT NULL DEFAULT '0',
+  `CreatureType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `InhabitType` tinyint(3) unsigned NOT NULL DEFAULT '3',
+  `RegenerateStats` tinyint(3) unsigned NOT NULL DEFAULT '3',
+  `RacialLeader` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `NpcFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `UnitFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `DynamicFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExtraFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureTypeFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpeedWalk` float NOT NULL DEFAULT '1',
+  `SpeedRun` float NOT NULL DEFAULT '1.14286',
+  `UnitClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Rank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Expansion` tinyint(3) NOT NULL DEFAULT '-1',
+  `HealthMultiplier` float NOT NULL DEFAULT '1',
+  `PowerMultiplier` float NOT NULL DEFAULT '1',
+  `DamageMultiplier` float NOT NULL DEFAULT '1',
+  `DamageVariance` float NOT NULL DEFAULT '1',
+  `ArmorMultiplier` float NOT NULL DEFAULT '1',
+  `ExperienceMultiplier` float NOT NULL DEFAULT '1',
+  `MinLevelHealth` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxLevelHealth` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinLevelMana` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxLevelMana` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinMeleeDmg` float NOT NULL DEFAULT '0',
+  `MaxMeleeDmg` float NOT NULL DEFAULT '0',
+  `MinRangedDmg` float NOT NULL DEFAULT '0',
+  `MaxRangedDmg` float NOT NULL DEFAULT '0',
+  `Armor` int(10) unsigned NOT NULL DEFAULT '0',
+  `MeleeAttackPower` int(10) unsigned NOT NULL DEFAULT '0',
+  `RangedAttackPower` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MeleeBaseAttackTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `RangedBaseAttackTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `DamageSchool` tinyint(4) NOT NULL DEFAULT '0',
+  `MinLootGold` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `MaxLootGold` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `LootId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PickpocketLootId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `SkinningLootId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `KillCredit1` int(11) unsigned NOT NULL DEFAULT '0',
+  `KillCredit2` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem1` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem2` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem3` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem4` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem5` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem6` int(11) unsigned NOT NULL DEFAULT '0',
+  `MechanicImmuneMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `ResistanceHoly` smallint(5) NOT NULL DEFAULT '0',
+  `ResistanceFire` smallint(5) NOT NULL DEFAULT '0',
+  `ResistanceNature` smallint(5) NOT NULL DEFAULT '0',
+  `ResistanceFrost` smallint(5) NOT NULL DEFAULT '0',
+  `ResistanceShadow` smallint(5) NOT NULL DEFAULT '0',
+  `ResistanceArcane` smallint(5) NOT NULL DEFAULT '0',
+  `PetSpellDataId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `MovementType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MovementTemplateId` int(11) unsigned NOT NULL DEFAULT '0',
+  `TrainerType` tinyint(4) NOT NULL DEFAULT '0',
+  `TrainerSpell` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `TrainerClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TrainerRace` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TrainerTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `VendorTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `EquipmentTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `VehicleTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `GossipMenuId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AIName` char(64) NOT NULL DEFAULT '',
+  `ScriptName` char(64) NOT NULL DEFAULT '',
+  PRIMARY KEY (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Creature System';
 
 --
@@ -1363,7 +1326,7 @@ CREATE TABLE `creature_template` (
 LOCK TABLES `creature_template` WRITE;
 /*!40000 ALTER TABLE `creature_template` DISABLE KEYS */;
 INSERT INTO `creature_template` VALUES
-(1,0,0,0,0,0,10045,0,0,0,'Waypoint(Only GM can see it)','Visual',NULL,0,1,1,64,64,0,0,5,35,35,0,0.91,1.14286,1,0,2,3,0,10,1,2000,2200,8,4096,0,0,0,0,0,0,1,2,100,8,5242886,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,7,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,130,'');
+(1,'Waypoint (Only GM can see it)','Visual',NULL,1,1,0,0,0,10045,0,0,0,35,35,1,0,8,7,1,0,0,4096,0,130,5242886,0.91,1.14286,8,0,-1,1,1,1,1,1,1,64,64,0,0,2,3,1,2,5,10,100,2000,2200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'','');
 /*!40000 ALTER TABLE `creature_template` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1387,12 +1350,36 @@ CREATE TABLE `creature_template_addon` (
 --
 -- Dumping data for table `creature_template_addon`
 --
-
 LOCK TABLES `creature_template_addon` WRITE;
 /*!40000 ALTER TABLE `creature_template_addon` DISABLE KEYS */;
 /*!40000 ALTER TABLE `creature_template_addon` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `creature_template_spells`
+--
+DROP TABLE IF EXISTS `creature_template_spells`;
+CREATE TABLE `creature_template_spells` (
+  `entry` mediumint(8) unsigned NOT NULL,
+  `spell1` mediumint(8) unsigned NOT NULL,
+  `spell2` mediumint(8) unsigned NOT NULL default '0',
+  `spell3` mediumint(8) unsigned NOT NULL default '0',
+  `spell4` mediumint(8) unsigned NOT NULL default '0',
+  `spell5` mediumint(8) unsigned NOT NULL default '0',
+  `spell6` mediumint(8) unsigned NOT NULL default '0',
+  `spell7` mediumint(8) unsigned NOT NULL default '0',
+  `spell8` mediumint(8) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Creature System (Spells used by creature)';
+
+--
+-- Dumping data for table `creature_template_spells`
+--
+LOCK TABLES `creature_template_spells` WRITE;
+/*!40000 ALTER TABLE `creature_template_spells` DISABLE KEYS */;
+/*!40000 ALTER TABLE `creature_template_spells` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `db_script_string`
 --
@@ -1409,6 +1396,11 @@ CREATE TABLE `db_script_string` (
   `content_loc6` text,
   `content_loc7` text,
   `content_loc8` text,
+  `sound` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `language` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `emote` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `comment` text,
   PRIMARY KEY  (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
@@ -1421,6 +1413,54 @@ LOCK TABLES `db_script_string` WRITE;
 /*!40000 ALTER TABLE `db_script_string` ENABLE KEYS */;
 UNLOCK TABLES;
 
+
+--
+-- Table structure for table `dbscripts_on_creature_movement`
+--
+
+DROP TABLE IF EXISTS `dbscripts_on_creature_movement`;
+CREATE TABLE `dbscripts_on_creature_movement` (
+  `id` mediumint(8) unsigned NOT NULL default '0',
+  `delay` int(10) unsigned NOT NULL default '0',
+  `command` mediumint(8) unsigned NOT NULL default '0',
+  `datalong` mediumint(8) unsigned NOT NULL default '0',
+  `datalong2` int(10) unsigned NOT NULL default '0',
+  `buddy_entry` int(10) unsigned NOT NULL default '0',
+  `search_radius` int(10) unsigned NOT NULL default '0',
+  `data_flags` tinyint(3) unsigned NOT NULL default '0',
+  `dataint` int(11) NOT NULL default '0',
+  `dataint2` int(11) NOT NULL default '0',
+  `dataint3` int(11) NOT NULL default '0',
+  `dataint4` int(11) NOT NULL default '0',
+  `x` float NOT NULL default '0',
+  `y` float NOT NULL default '0',
+  `z` float NOT NULL default '0',
+  `o` float NOT NULL default '0',
+  `comments` varchar(255) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure of `dbscripts_on_event`, `dbscripts_on_go_use`, `dbscripts_on_go_template_use`,
+--                    `dbscripts_on_gossip`, `dbscripts_on_quest_end`, `dbscripts_on_quest_start`,
+--                    `dbscripts_on_spell`, `dbscripts_on_creature_death`
+DROP TABLE IF EXISTS dbscripts_on_event;
+CREATE TABLE dbscripts_on_event LIKE dbscripts_on_creature_movement;
+DROP TABLE IF EXISTS dbscripts_on_go_use;
+CREATE TABLE dbscripts_on_go_use LIKE dbscripts_on_creature_movement;
+DROP TABLE IF EXISTS dbscripts_on_go_template_use;
+CREATE TABLE dbscripts_on_go_template_use LIKE dbscripts_on_creature_movement;
+DROP TABLE IF EXISTS dbscripts_on_gossip;
+CREATE TABLE dbscripts_on_gossip LIKE dbscripts_on_creature_movement;
+DROP TABLE IF EXISTS dbscripts_on_quest_end;
+CREATE TABLE dbscripts_on_quest_end LIKE dbscripts_on_creature_movement;
+DROP TABLE IF EXISTS dbscripts_on_quest_start;
+CREATE TABLE dbscripts_on_quest_start LIKE dbscripts_on_creature_movement;
+DROP TABLE IF EXISTS dbscripts_on_spell;
+CREATE TABLE dbscripts_on_spell LIKE dbscripts_on_creature_movement;
+DROP TABLE IF EXISTS dbscripts_on_creature_death;
+CREATE TABLE dbscripts_on_creature_death LIKE dbscripts_on_creature_movement;
+
+
 --
 -- Table structure for table `disenchant_loot_template`
 --
@@ -1433,9 +1473,6 @@ CREATE TABLE `disenchant_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -1548,39 +1585,6 @@ LOCK TABLES `creature_ai_texts` WRITE;
 /*!40000 ALTER TABLE `creature_ai_texts` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `event_scripts`
---
-
-DROP TABLE IF EXISTS `event_scripts`;
-CREATE TABLE `event_scripts` (
-  `id` mediumint(8) unsigned NOT NULL default '0',
-  `delay` int(10) unsigned NOT NULL default '0',
-  `command` mediumint(8) unsigned NOT NULL default '0',
-  `datalong` mediumint(8) unsigned NOT NULL default '0',
-  `datalong2` int(10) unsigned NOT NULL default '0',
-  `datalong3` int(10) unsigned NOT NULL default '0',
-  `datalong4` int(10) unsigned NOT NULL default '0',
-  `data_flags` tinyint(3) unsigned NOT NULL default '0',
-  `dataint` int(11) NOT NULL default '0',
-  `dataint2` int(11) NOT NULL default '0',
-  `buddy_entry` int(11) NOT NULL default '0',
-  `search_radius` int(11) NOT NULL default '0',
-  `x` float NOT NULL default '0',
-  `y` float NOT NULL default '0',
-  `z` float NOT NULL default '0',
-  `o` float NOT NULL default '0',
-  `comments` varchar(255) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `event_scripts`
---
-
-LOCK TABLES `event_scripts` WRITE;
-/*!40000 ALTER TABLE `event_scripts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `event_scripts` ENABLE KEYS */;
-UNLOCK TABLES;
 
 --
 -- Table structure for table `exploration_basexp`
@@ -1686,9 +1690,6 @@ CREATE TABLE `fishing_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -2024,9 +2025,6 @@ CREATE TABLE `gameobject_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -2060,39 +2058,6 @@ LOCK TABLES `gameobject_questrelation` WRITE;
 /*!40000 ALTER TABLE `gameobject_questrelation` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `gameobject_scripts`
---
-
-DROP TABLE IF EXISTS `gameobject_scripts`;
-CREATE TABLE `gameobject_scripts` (
-  `id` mediumint(8) unsigned NOT NULL default '0',
-  `delay` int(10) unsigned NOT NULL default '0',
-  `command` mediumint(8) unsigned NOT NULL default '0',
-  `datalong` mediumint(8) unsigned NOT NULL default '0',
-  `datalong2` int(10) unsigned NOT NULL default '0',
-  `buddy_entry` int(10) unsigned NOT NULL default '0',
-  `search_radius` int(10) unsigned NOT NULL default '0',
-  `data_flags` tinyint(3) unsigned NOT NULL default '0',
-  `dataint` int(11) NOT NULL default '0',
-  `dataint2` int(11) NOT NULL default '0',
-  `dataint3` int(11) NOT NULL default '0',
-  `dataint4` int(11) NOT NULL default '0',
-  `x` float NOT NULL default '0',
-  `y` float NOT NULL default '0',
-  `z` float NOT NULL default '0',
-  `o` float NOT NULL default '0',
-  `comments` varchar(255) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `gameobject_scripts`
---
-
-LOCK TABLES `gameobject_scripts` WRITE;
-/*!40000 ALTER TABLE `gameobject_scripts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gameobject_scripts` ENABLE KEYS */;
-UNLOCK TABLES;
 
 --
 -- Table structure for table `gameobject_template`
@@ -2155,39 +2120,6 @@ LOCK TABLES `gameobject_template` WRITE;
 /*!40000 ALTER TABLE `gameobject_template` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `gameobject_template_scripts`
---
-
-DROP TABLE IF EXISTS `gameobject_template_scripts`;
-CREATE TABLE `gameobject_template_scripts` (
-  `id` mediumint(8) unsigned NOT NULL default '0',
-  `delay` int(10) unsigned NOT NULL default '0',
-  `command` mediumint(8) unsigned NOT NULL default '0',
-  `datalong` mediumint(8) unsigned NOT NULL default '0',
-  `datalong2` int(10) unsigned NOT NULL default '0',
-  `buddy_entry` int(10) unsigned NOT NULL default '0',
-  `search_radius` int(10) unsigned NOT NULL default '0',
-  `data_flags` tinyint(3) unsigned NOT NULL default '0',
-  `dataint` int(11) NOT NULL default '0',
-  `dataint2` int(11) NOT NULL default '0',
-  `dataint3` int(11) NOT NULL default '0',
-  `dataint4` int(11) NOT NULL default '0',
-  `x` float NOT NULL default '0',
-  `y` float NOT NULL default '0',
-  `z` float NOT NULL default '0',
-  `o` float NOT NULL default '0',
-  `comments` varchar(255) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `gameobject_template_scripts`
---
-
-LOCK TABLES `gameobject_template_scripts` WRITE;
-/*!40000 ALTER TABLE `gameobject_template_scripts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gameobject_template_scripts` ENABLE KEYS */;
-UNLOCK TABLES;
 
 --
 -- Table structure for table `gossip_menu`
@@ -2197,13 +2129,7 @@ DROP TABLE IF EXISTS gossip_menu;
 CREATE TABLE gossip_menu (
   entry smallint(6) unsigned NOT NULL default '0',
   text_id mediumint(8) unsigned NOT NULL default '0',
-  script_id mediumint(8) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'script in `gossip_scripts` - will be executed on GossipHello',
-  cond_1 tinyint(3) unsigned NOT NULL default '0',
-  cond_1_val_1 mediumint(8) unsigned NOT NULL default '0',
-  cond_1_val_2 mediumint(8) unsigned NOT NULL default '0',
-  cond_2 tinyint(3) unsigned NOT NULL default '0',
-  cond_2_val_1 mediumint(8) unsigned NOT NULL default '0',
-  cond_2_val_2 mediumint(8) unsigned NOT NULL default '0',
+  script_id mediumint(8) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'script in `dbscripts_on_gossip` - will be executed on GossipHello',
   condition_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY (entry, text_id, script_id)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2235,15 +2161,6 @@ CREATE TABLE gossip_menu_option (
   box_coded tinyint(3) unsigned NOT NULL default '0',
   box_money int(11) unsigned NOT NULL default '0',
   box_text text,
-  cond_1 tinyint(3) unsigned NOT NULL default '0',
-  cond_1_val_1 mediumint(8) unsigned NOT NULL default '0',
-  cond_1_val_2 mediumint(8) unsigned NOT NULL default '0',
-  cond_2 tinyint(3) unsigned NOT NULL default '0',
-  cond_2_val_1 mediumint(8) unsigned NOT NULL default '0',
-  cond_2_val_2 mediumint(8) unsigned NOT NULL default '0',
-  cond_3 tinyint(3) unsigned NOT NULL default '0',
-  cond_3_val_1 mediumint(8) unsigned NOT NULL default '0',
-  cond_3_val_2 mediumint(8) unsigned NOT NULL default '0',
   condition_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY (menu_id, id)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2255,58 +2172,25 @@ CREATE TABLE gossip_menu_option (
 LOCK TABLES `gossip_menu_option` WRITE;
 /*!40000 ALTER TABLE `gossip_menu_option` DISABLE KEYS */;
 INSERT INTO gossip_menu_option VALUES
-(0, 0,0,'GOSSIP_OPTION_QUESTGIVER',       2,0x000002,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0, 1,1,'GOSSIP_OPTION_VENDOR',           3,0x000080,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0, 2,2,'GOSSIP_OPTION_TAXIVENDOR',       4,0x002000,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0, 3,3,'GOSSIP_OPTION_TRAINER',          5,0x000010,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0, 4,4,'GOSSIP_OPTION_SPIRITHEALER',     6,0x004000,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0, 5,4,'GOSSIP_OPTION_SPIRITGUIDE',      7,0x008000,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0, 6,5,'GOSSIP_OPTION_INNKEEPER',        8,0x010000,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0, 7,6,'GOSSIP_OPTION_BANKER',           9,0x020000,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0, 8,7,'GOSSIP_OPTION_PETITIONER',      10,0x040000,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0, 9,8,'GOSSIP_OPTION_TABARDDESIGNER',  11,0x080000,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0,10,9,'GOSSIP_OPTION_BATTLEFIELD',     12,0x100000,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0,11,6,'GOSSIP_OPTION_AUCTIONEER',      13,0x200000,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0,12,0,'GOSSIP_OPTION_STABLEPET',       14,0x400000,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0,13,1,'GOSSIP_OPTION_ARMORER',         15,0x001000,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0,14,0,'GOSSIP_OPTION_UNLEARNTALENTS',  16,0x000010,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0),
-(0,15,2,'GOSSIP_OPTION_UNLEARNPETSKILLS',17,0x000010,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0,0);
+(0, 0,0,'GOSSIP_OPTION_QUESTGIVER',       2,0x000002,0,0,0,0,0,NULL,0),
+(0, 1,1,'GOSSIP_OPTION_VENDOR',           3,0x000080,0,0,0,0,0,NULL,0),
+(0, 2,2,'GOSSIP_OPTION_TAXIVENDOR',       4,0x002000,0,0,0,0,0,NULL,0),
+(0, 3,3,'GOSSIP_OPTION_TRAINER',          5,0x000010,0,0,0,0,0,NULL,0),
+(0, 4,4,'GOSSIP_OPTION_SPIRITHEALER',     6,0x004000,0,0,0,0,0,NULL,0),
+(0, 5,4,'GOSSIP_OPTION_SPIRITGUIDE',      7,0x008000,0,0,0,0,0,NULL,0),
+(0, 6,5,'GOSSIP_OPTION_INNKEEPER',        8,0x010000,0,0,0,0,0,NULL,0),
+(0, 7,6,'GOSSIP_OPTION_BANKER',           9,0x020000,0,0,0,0,0,NULL,0),
+(0, 8,7,'GOSSIP_OPTION_PETITIONER',      10,0x040000,0,0,0,0,0,NULL,0),
+(0, 9,8,'GOSSIP_OPTION_TABARDDESIGNER',  11,0x080000,0,0,0,0,0,NULL,0),
+(0,10,9,'GOSSIP_OPTION_BATTLEFIELD',     12,0x100000,0,0,0,0,0,NULL,0),
+(0,11,6,'GOSSIP_OPTION_AUCTIONEER',      13,0x200000,0,0,0,0,0,NULL,0),
+(0,12,0,'GOSSIP_OPTION_STABLEPET',       14,0x400000,0,0,0,0,0,NULL,0),
+(0,13,1,'GOSSIP_OPTION_ARMORER',         15,0x001000,0,0,0,0,0,NULL,0),
+(0,14,0,'GOSSIP_OPTION_UNLEARNTALENTS',  16,0x000010,0,0,0,0,0,NULL,0),
+(0,15,2,'GOSSIP_OPTION_UNLEARNPETSKILLS',17,0x000010,0,0,0,0,0,NULL,0);
 /*!40000 ALTER TABLE `gossip_menu_option` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `gossip_scripts`
---
-
-DROP TABLE IF EXISTS `gossip_scripts`;
-CREATE TABLE `gossip_scripts` (
-  `id` mediumint(8) unsigned NOT NULL default '0',
-  `delay` int(10) unsigned NOT NULL default '0',
-  `command` mediumint(8) unsigned NOT NULL default '0',
-  `datalong` mediumint(8) unsigned NOT NULL default '0',
-  `datalong2` int(10) unsigned NOT NULL default '0',
-  `datalong3` int(10) unsigned NOT NULL default '0',
-  `datalong4` int(10) unsigned NOT NULL default '0',
-  `data_flags` tinyint(3) unsigned NOT NULL default '0',
-  `dataint` int(11) NOT NULL default '0',
-  `dataint2` int(11) NOT NULL default '0',
-  `buddy_entry` int(11) NOT NULL default '0',
-  `search_radius` int(11) NOT NULL default '0',
-  `x` float NOT NULL default '0',
-  `y` float NOT NULL default '0',
-  `z` float NOT NULL default '0',
-  `o` float NOT NULL default '0',
-  `comments` varchar(255) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `gossip_scripts`
---
-
-LOCK TABLES `gossip_scripts` WRITE;
-/*!40000 ALTER TABLE `gossip_scripts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gossip_scripts` ENABLE KEYS */;
-UNLOCK TABLES;
 
 --
 -- Table structure for table `instance_template`
@@ -2404,9 +2288,6 @@ CREATE TABLE `item_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -3205,9 +3086,6 @@ CREATE TABLE `mail_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -3386,7 +3264,7 @@ INSERT INTO `mangos_string` VALUES
 (172,'server console command',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (173,'You changed runic power of %s to %i/%i.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (174,'%s changed your runic power to %i/%i.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(175,'Liquid level: %f, ground: %f, type: %d, status: %d',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(175,'Liquid level: %f, ground: %f, type flags %u, status: %d.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (200,'No selection.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (201,'Object GUID is: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (202,'The name was too long by %i characters.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -3842,7 +3720,7 @@ INSERT INTO `mangos_string` VALUES
 (703,'Fifteen seconds until the Arena battle begins!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (704,'The Arena battle has begun!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (705,'You must wait %s before speaking again.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(706,'This item(s) have problems with equipping/storing in inventory.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(706,'This item(s) has problems with equipping/storing to inventory.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (707,'%s does not wish to be disturbed: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (708,'%s is Away from Keyboard: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (709,'Do not Disturb',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -3870,7 +3748,7 @@ INSERT INTO `mangos_string` VALUES
 (734,'You cannot summon players to a battleground or arena map.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (735,'You must be in GM mode to teleport to a player in a battleground.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (736,'You cannot teleport to a battleground from another battleground. Please leave the current battleground first.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(737,'Arenas are set to 1v1 for debugging. So, don\'t join as group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(737,'Arenas are set to 1v1 for debugging. You cannot join as a group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (738,'Arenas are set to normal playercount.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (739,'Battlegrounds are set to 1v0 for debugging.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (740,'Battlegrounds are set to normal playercount.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -3932,12 +3810,13 @@ INSERT INTO `mangos_string` VALUES
 (815,'Initiate',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (816,'Your body is too exhausted to travel to the Spectral Realm.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (817,'Warning: You\'ve entered a no-fly zone and are about to be dismounted!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(818,'You can\'t enter Black Morass until you rescue Thrall from Durnholde Keep.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1000,'Exiting daemon...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1001,'Account deleted: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1002,'Account %s NOT deleted (probably sql file format was updated)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1003,'Account %s NOT deleted (unknown error)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1004,'Account created: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(1005,'Account name can\'t be longer than 16 characters (client limit), account not created!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1005,'Account name cannot be longer than 16 characters (client limit), account not created!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1006,'Account with this name already exist!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1007,'Account %s NOT created (probably sql file format was updated)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1008,'Account %s NOT created (unknown error)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -3946,22 +3825,22 @@ INSERT INTO `mangos_string` VALUES
 (1012,'========================================================================================',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1013,'| %10u |%15s| %20s | %15s |%4d| %9d |',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1014,'No online players.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(1015,'Used not fully typed quit command, need type it fully (quit), or command used not in RA command line.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1015,'Can only quit from a Remote Admin console or the quit command was not entered in full (quit).',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1016,'| GUID       | Name                 | Account                      | Delete Date         |',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1017,'| %10u | %20s | %15s (%10u) | %19s |',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1018,'==========================================================================================',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1019,'No characters found.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1020,'Restoring the following characters:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1021,'Deleting the following characters:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(1022,'ERROR: You can only assign a new name if you have only selected a single character!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(1023,'Character \'%s\' (GUID: %u Account %u) can\'t be restored: account not exist!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1022,'ERROR: You can only assign a new name for a single selected character!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1023,'Character \'%s\' (GUID: %u Account %u) can\'t be restored: account doesn\'t exist!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1024,'Character \'%s\' (GUID: %u Account %u) can\'t be restored: account character list full!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(1025,'Character \'%s\' (GUID: %u Account %u) can\'t be restored: new name already used!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1025,'Character \'%s\' (GUID: %u Account %u) can\'t be restored: name already in use!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1026,'GUID: %u Name: %s Account: %s (%u) Date: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1027,'Log filters state:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1028,'All log filters set to: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(1029, 'Command can be called only from RA-console.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(1100,'Account %s (Id: %u) have up to %u expansion allowed now.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1029,'Command can only be called from a Remote Admin console.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1100,'Account %s (Id: %u) has been granted %u expansion rights.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1101,'Message of the day changed to:\r\n%s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1102,'Message sent to %s: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1103,'%d - %s %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -4054,6 +3933,8 @@ INSERT INTO `mangos_string` VALUES
 (1190,'Amount of %s items is set to %u.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1191,'Items ratio for %s is set to %u.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1193,'Gear Score of Player %s is %u.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1194,'Current State Information: GOState %u, LootState %u. Collision %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1195,'Current State Information: GOState %u, LootState %u. Collision %s, (door %s by default)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1200,'You try to view cinemitic %u but it doesn\'t exist.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1201,'You try to view movie %u but it doesn\'t exist.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1202,'Spell %u %s = %f (*1.88 = %f) DB = %f AP = %f',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -4064,12 +3945,50 @@ INSERT INTO `mangos_string` VALUES
 (1500,'%u - [%s] AutoSpawn: %u MaxLimit: %u Creatures: %u GameObjecs: %u Pools %u Chance: %f %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1501,'%u - |cffffffff|Hpool:%u|h[%s]|h|r AutoSpawn: %u MaxLimit: %u Creatures: %u GameObjecs: %u Pools %u %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1502,'%u - [%s] AutoSpawn: %u MaxLimit: %u Creatures: %u GameObjecs: %u Pools %u %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(1503,'Can not add spawn because no free guids for static spawn in reserved guids range. Server restart is required before command can be used. Also look GuidReserveSize.* config options.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1503,'Cannot add spawn because no free guids for static spawn in reserved guids range. Server restart is required before command can be used. Also look GuidReserveSize.* config options.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1504,'AI-Information for Npc Entry %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1505,'AIName: %s (%s) ScriptName: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1506,'Current phase = %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1507,'Combat-Movement is %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(1508,'Melee attacking is %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+(1508,'Melee attacking is %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1509,'Pool %u not found (Maximal pool entry is %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1600,'|cffffff00Northpass Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1601,'|cffffff00Northpass Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1602,'|cffffff00Crown Guard Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1603,'|cffffff00Crown Guard Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1604,'|cffffff00Eastwall Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1605,'|cffffff00Eastwall Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1606,'|cffffff00The Plaguewood Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1607,'|cffffff00The Plaguewood Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1608,'|cffffff00The Overlook has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1609,'|cffffff00The Overlook has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1610,'|cffffff00The Stadium has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1611,'|cffffff00The Stadium has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1612,'|cffffff00Broken Hill has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1613,'|cffffff00Broken Hill has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1614,'|cffffff00The Horde has taken control of the East Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1615,'|cffffff00The Alliance has taken control of the East Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1616,'|cffffff00The Horde has taken control of the West Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1617,'|cffffff00The Alliance has taken control of the West Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1618,'|cffffff00The Horde has taken control of both beacons!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1619,'|cffffff00The Alliance has taken control of both beacons!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1620,'|cffffff00The Horde Field Scout is now issuing battle standards.|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1621,'|cffffff00The Alliance Field Scout is now issuing battle standards.|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1622,'|cffffff00The Horde has taken control of Twin Spire Ruins!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1623,'|cffffff00The Alliance has taken control of Twin Spire Ruins!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1624,'|cffffff00The Horde has taken control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1625,'|cffffff00The Alliance has taken control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1626,'|cffffff00The Horde has lost control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1627,'|cffffff00The Alliance has lost control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1628,'|cffffff00The Horde has taken control of The Bone Wastes!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1629,'|cffffff00The Alliance has taken control of The Bone Wastes!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1630,'|cffffff00The Horde is gaining control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1631,'|cffffff00The Alliance is gaining control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1632,'|cffffff00The Horde has taken control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1633,'|cffffff00The Alliance has taken control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1634,'|cffffff00Halaa is defenseless!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1635,'|cffffff00The Horde has collected 200 silithyst!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1636,'|cffffff00The Alliance has collected 200 silithyst!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 
 /*!40000 ALTER TABLE `mangos_string` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -4086,9 +4005,6 @@ CREATE TABLE `milling_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -4133,7 +4049,8 @@ CREATE TABLE `npc_spellclick_spells` (
     `quest_start`        mediumint(8) unsigned NOT NULL COMMENT 'reference to quest_template',
     `quest_start_active` tinyint(1) unsigned NOT NULL default '0',
     `quest_end`          mediumint(8) unsigned NOT NULL default '0',
-    `cast_flags`  tinyint unsigned NOT NULL COMMENT 'first bit defines caster: 1=player, 0=creature; second bit defines target, same mapping as caster bit'
+    `cast_flags`         tinyint unsigned NOT NULL COMMENT 'first bit defines caster: 1=player, 0=creature; second bit defines target, same mapping as caster bit',
+    `condition_id`       mediumint(8) unsigned NOT NULL default '0'
 ) ENGINE = MYISAM DEFAULT CHARSET=utf8;
 
 --
@@ -4303,6 +4220,7 @@ CREATE TABLE `npc_vendor` (
   `maxcount` tinyint(3) unsigned NOT NULL default '0',
   `incrtime` int(10) unsigned NOT NULL default '0',
   `ExtendedCost` mediumint(8) unsigned NOT NULL default '0',
+  `condition_id` mediumint(8) unsigned NOT NULL default '0',
   PRIMARY KEY  (`entry`,`item`,`ExtendedCost`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Npc System';
 
@@ -4326,6 +4244,7 @@ CREATE TABLE `npc_vendor_template` (
   `maxcount` tinyint(3) unsigned NOT NULL default '0',
   `incrtime` int(10) unsigned NOT NULL default '0',
   `ExtendedCost` mediumint(8) unsigned NOT NULL default '0',
+  `condition_id` mediumint(8) unsigned NOT NULL default '0',
   PRIMARY KEY  (`entry`,`item`,`ExtendedCost`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Npc System';
 
@@ -4683,9 +4602,6 @@ CREATE TABLE `pickpocketing_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -10703,12 +10619,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `playercreateinfo_action`;
 CREATE TABLE `playercreateinfo_action` (
-  `race` tinyint(3) unsigned NOT NULL default '0',
-  `class` tinyint(3) unsigned NOT NULL default '0',
-  `button` smallint(5) unsigned NOT NULL default '0',
-  `action` int(11) unsigned NOT NULL default '0',
-  `type` smallint(5) unsigned NOT NULL default '0',
-  KEY `playercreateinfo_race_class_index` (`race`,`class`),
+  `race` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `class` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `button` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `action` int(11) unsigned NOT NULL DEFAULT '0',
+  `type` smallint(5) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`race`,`class`,`button`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
@@ -13399,7 +13314,8 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (10,2,27762,'Libram'),
 (10,2,28730,'Arcane Torrent'),
 (10,2,28877,'Arcane Affinity'),
-(10,2,68398, 'Opening'),
+(10,2,61437,'Opening'),
+(10,2,68398,'Opening'),
 (10,3,75,'Auto Shot'),
 (10,3,81,'Dodge'),
 (10,3,197,'Two-Handed Axes'),
@@ -13438,6 +13354,7 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (10,3,28730,'Arcane Torrent'),
 (10,3,28877,'Arcane Affinity'),
 (10,3,34082,'Advantaged State (DND)'),
+(10,3,61437,'Opening'),
 (10,3,68398,'Opening'),
 (10,4,81,'Dodge'),
 (10,4,203,'Unarmed'),
@@ -13477,6 +13394,7 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (10,4,22810,'Opening - No Text'),
 (10,4,25046,'Arcane Torrent'),
 (10,4,28877,'Arcane Affinity'),
+(10,4,61437,'Opening'),
 (10,4,68398,'Opening'),
 (10,5,81,'Dodge'),
 (10,5,198,'One-Handed Maces'),
@@ -13513,7 +13431,8 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (10,5,22810,'Opening - No Text'),
 (10,5,28730,'Arcane Torrent'),
 (10,5,28877,'Arcane Affinity'),
-(10,5,68398, 'Opening'),
+(10,5,61437,'Opening'),
+(10,5,68398,'Opening'),
 (10,6,81,'Dodge'),
 (10,6,196,'One-Handed Axes'),
 (10,6,197,'Two-Handed Axes'),
@@ -13615,6 +13534,7 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (10,8,22810,'Opening - No Text'),
 (10,8,28730,'Arcane Torrent'),
 (10,8,28877,'Arcane Affinity'),
+(10,8,61437,'Opening'),
 (10,8,68398,'Opening'),
 (10,9,81,'Dodge'),
 (10,9,203,'Unarmed'),
@@ -13653,6 +13573,7 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (10,9,28730,'Arcane Torrent'),
 (10,9,28877,'Arcane Affinity'),
 (10,9,58284,'Chaos Bolt Passive'),
+(10,9,61437,'Opening'),
 (10,9,68398,'Opening'),
 (10,9,75445,'Demonic Immolate'),
 (11,1,78,'Heroic Strike'),
@@ -14148,9 +14069,6 @@ CREATE TABLE `prospecting_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -14164,39 +14082,6 @@ LOCK TABLES `prospecting_loot_template` WRITE;
 /*!40000 ALTER TABLE `prospecting_loot_template` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `quest_end_scripts`
---
-
-DROP TABLE IF EXISTS `quest_end_scripts`;
-CREATE TABLE `quest_end_scripts` (
-  `id` mediumint(8) unsigned NOT NULL default '0',
-  `delay` int(10) unsigned NOT NULL default '0',
-  `command` mediumint(8) unsigned NOT NULL default '0',
-  `datalong` mediumint(8) unsigned NOT NULL default '0',
-  `datalong2` int(10) unsigned NOT NULL default '0',
-  `buddy_entry` int(10) unsigned NOT NULL default '0',
-  `search_radius` int(10) unsigned NOT NULL default '0',
-  `data_flags` tinyint(3) unsigned NOT NULL default '0',
-  `dataint` int(11) NOT NULL default '0',
-  `dataint2` int(11) NOT NULL default '0',
-  `dataint3` int(11) NOT NULL default '0',
-  `dataint4` int(11) NOT NULL default '0',
-  `x` float NOT NULL default '0',
-  `y` float NOT NULL default '0',
-  `z` float NOT NULL default '0',
-  `o` float NOT NULL default '0',
-  `comments` varchar(255) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `quest_end_scripts`
---
-
-LOCK TABLES `quest_end_scripts` WRITE;
-/*!40000 ALTER TABLE `quest_end_scripts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `quest_end_scripts` ENABLE KEYS */;
-UNLOCK TABLES;
 
 --
 -- Table structure for table `quest_poi`
@@ -14246,39 +14131,6 @@ LOCK TABLES `quest_poi_points` WRITE;
 /*!40000 ALTER TABLE `quest_poi_points` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `quest_start_scripts`
---
-
-DROP TABLE IF EXISTS `quest_start_scripts`;
-CREATE TABLE `quest_start_scripts` (
-  `id` mediumint(8) unsigned NOT NULL default '0',
-  `delay` int(10) unsigned NOT NULL default '0',
-  `command` mediumint(8) unsigned NOT NULL default '0',
-  `datalong` mediumint(8) unsigned NOT NULL default '0',
-  `datalong2` int(10) unsigned NOT NULL default '0',
-  `datalong3` int(10) unsigned NOT NULL default '0',
-  `datalong4` int(10) unsigned NOT NULL default '0',
-  `data_flags` tinyint(3) unsigned NOT NULL default '0',
-  `dataint` int(11) NOT NULL default '0',
-  `dataint2` int(11) NOT NULL default '0',
-  `buddy_entry` int(11) NOT NULL default '0',
-  `search_radius` int(11) NOT NULL default '0',
-  `x` float NOT NULL default '0',
-  `y` float NOT NULL default '0',
-  `z` float NOT NULL default '0',
-  `o` float NOT NULL default '0',
-  `comments` varchar(255) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `quest_start_scripts`
---
-
-LOCK TABLES `quest_start_scripts` WRITE;
-/*!40000 ALTER TABLE `quest_start_scripts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `quest_start_scripts` ENABLE KEYS */;
-UNLOCK TABLES;
 
 --
 -- Table structure for table `quest_template`
@@ -14451,9 +14303,6 @@ CREATE TABLE `reference_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -14655,9 +14504,6 @@ CREATE TABLE `skinning_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -14682,6 +14528,7 @@ CREATE TABLE `spell_area` (
   `quest_start`        mediumint(8) unsigned NOT NULL default '0',
   `quest_start_active` tinyint(1) unsigned NOT NULL default '0',
   `quest_end`          mediumint(8) unsigned NOT NULL default '0',
+  `condition_id`       mediumint(8) unsigned NOT NULL default '0',
   `aura_spell`         mediumint(8) NOT NULL default '0',
   `racemask`           mediumint(8) unsigned NOT NULL default '0',
   `gender`             tinyint(1) unsigned NOT NULL default '2',
@@ -17091,9 +16938,6 @@ CREATE TABLE `spell_loot_template` (
   `groupid` tinyint(3) unsigned NOT NULL default '0',
   `mincountOrRef` mediumint(9) NOT NULL default '1',
   `maxcount` tinyint(3) unsigned NOT NULL default '1',
-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
   `condition_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -17818,6 +17662,8 @@ INSERT INTO `spell_proc_event` VALUES
 (67667, 0x7F,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
 (67672, 0x7F,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 50),
 (67702, 0x7F,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
+(67712, 0x7F,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  2),
+(67758, 0x7F,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  2),
 (67771, 0x7F,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
 (68160, 0x7F,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0.000000, 0.000000,  0),
 (69739, 0x7F,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
@@ -17918,6 +17764,7 @@ CREATE TABLE `spell_script_target` (
   `entry` mediumint(8) unsigned NOT NULL,
   `type` tinyint(3) unsigned NOT NULL default '0',
   `targetEntry` mediumint(8) unsigned NOT NULL default '0',
+  `inverseEffectMask` mediumint(8) unsigned NOT NULL default '0',
   UNIQUE KEY `entry_type_target` (`entry`,`type`,`targetEntry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Spell System';
 
@@ -17930,39 +17777,6 @@ LOCK TABLES `spell_script_target` WRITE;
 /*!40000 ALTER TABLE `spell_script_target` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `spell_scripts`
---
-
-DROP TABLE IF EXISTS `spell_scripts`;
-CREATE TABLE `spell_scripts` (
-  `id` mediumint(8) unsigned NOT NULL default '0',
-  `delay` int(10) unsigned NOT NULL default '0',
-  `command` mediumint(8) unsigned NOT NULL default '0',
-  `datalong` mediumint(8) unsigned NOT NULL default '0',
-  `datalong2` int(10) unsigned NOT NULL default '0',
-  `datalong3` int(10) unsigned NOT NULL default '0',
-  `datalong4` int(10) unsigned NOT NULL default '0',
-  `data_flags` tinyint(3) unsigned NOT NULL default '0',
-  `dataint` int(11) NOT NULL default '0',
-  `dataint2` int(11) NOT NULL default '0',
-  `buddy_entry` int(11) NOT NULL default '0',
-  `search_radius` int(11) NOT NULL default '0',
-  `x` float NOT NULL default '0',
-  `y` float NOT NULL default '0',
-  `z` float NOT NULL default '0',
-  `o` float NOT NULL default '0',
-  `comments` varchar(255) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `spell_scripts`
---
-
-LOCK TABLES `spell_scripts` WRITE;
-/*!40000 ALTER TABLE `spell_scripts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `spell_scripts` ENABLE KEYS */;
-UNLOCK TABLES;
 
 --
 -- Table structure for table `spell_target_position`
@@ -17995,14 +17809,20 @@ UNLOCK TABLES;
 DROP TABLE IF EXISTS `spell_template`;
 CREATE TABLE `spell_template` (
   `id` int(11) unsigned NOT NULL DEFAULT '0',
+  `attr` int(11) unsigned NOT NULL DEFAULT '0',
+  `attr_ex` int(11) unsigned NOT NULL DEFAULT '0',
+  `attr_ex2` int(11) unsigned NOT NULL DEFAULT '0',
+  `attr_ex3` int(11) unsigned NOT NULL DEFAULT '0',
   `proc_flags` int(11) unsigned NOT NULL DEFAULT '0',
   `proc_chance` int(11) unsigned NOT NULL DEFAULT '0',
   `duration_index` int(11) unsigned NOT NULL DEFAULT '0',
   `effect0` int(11) unsigned NOT NULL DEFAULT '0',
   `effect0_implicit_target_a` int(11) unsigned NOT NULL DEFAULT '0',
+  `effect0_implicit_target_b` int(11) unsigned NOT NULL DEFAULT '0',
   `effect0_radius_idx` int(11) unsigned NOT NULL DEFAULT '0',
   `effect0_apply_aura_name` int(11) unsigned NOT NULL DEFAULT '0',
   `effect0_misc_value` int(11) unsigned NOT NULL DEFAULT '0',
+  `effect0_misc_value_b` int(11) unsigned NOT NULL DEFAULT '0',
   `effect0_trigger_spell` int(11) unsigned NOT NULL DEFAULT '0',
   `comments` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
@@ -18014,11 +17834,42 @@ CREATE TABLE `spell_template` (
 LOCK TABLES `spell_template` WRITE;
 /*!40000 ALTER TABLE `spell_template` DISABLE KEYS */;
 INSERT INTO `spell_template` VALUES
--- ID   proc_flags chnce dur  ef0 tarA0 rad  aur  misc    trigger
-(21387, 0x00000028,  15,  21,   6,   1,   0,  42, 0,      21388, 'Melt-Weapon trigger aura related used by Ragnaros'),
-(23363, 0x00000000, 101,  21,  76,  18,   0,   0, 179804, 0,     'Summon Drakonid Corpse Trigger'),
-(25192, 0x00000000, 101,  21,  76,  18,   0,   0, 180619, 0,     'Summon Ossirian Crystal'),
-(62388, 0x00000000, 101,  21,   6,   1,   0,   4, 0,      0,     'Aura required for Demonic Circle 48020');
+-- id   attr        attr_ex     attr_ex2    attr_ex3    proc_flags chnce dur  ef0 tarA0 tarB0 rad  aur  misc    miscB, trigger
+(21387, 0x00000140, 0x10000000, 0x00000000, 0x00000000, 0x00000028,  15,  21,   6,   1,    0,   0,  42, 0,       0,    21388, 'Melt-Weapon trigger aura related used by Ragnaros'),
+(23363, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  76,  18,    0,   0,   0, 179804,  0,    0,     'Summon Drakonid Corpse Trigger'),
+(23770, 0x24800100, 0x10000088, 0x00000001, 0x00100000, 0x00000000, 101, 367,   6, 25,     0,   0,   4, 0,       0,    0,     'Sayge''s timer - Darkmoon Faire'),
+(25192, 0x00000100, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 101,  21,  76,  18,    0,   0,   0, 180619,  0,    0,     'Summon Ossirian Crystal'),
+(26133, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  76,  18,    0,   0,   0, 180795,  0,    0,     'Summon Sandworm Base'),
+(34810, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  42,    0,   8,   0, 20083,  64,    0,     'Summon Summoned Bloodwarder Mender behind of the caster'),
+(34817, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  44,    0,   8,   0, 20078,  64,    0,     'Summon Summoned Bloodwarder Reservist right of the caster'),
+(34818, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  43,    0,   8,   0, 20078,  64,    0,     'Summon Summoned Bloodwarder Reservist left of the caster'),
+(34819, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  41,    0,   8,   0, 20078,  64,    0,     'Summon Summoned Bloodwarder Reservist front of the caster'),
+(35153, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  42,    0,   8,   0, 20405,  64,    0,     'Summon Nether Charge behind of the caster'),
+(35904, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  44,    0,   8,   0, 20405,  64,    0,     'Summon Nether Charge right of the caster'),
+(35905, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  43,    0,   8,   0, 20405,  64,    0,     'Summon Nether Charge left of the caster'),
+(35906, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,  28,  41,    0,   8,   0, 20405,  64,    0,     'Summon Nether Charge front of the caster'),
+(37264, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 101,  21,  28,  18,    0,   7,   0, 21729,  64,    0,     'Power Converters: Summon Electromental (from cata)'),
+(37278, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 101,  21,  28,  18,    0,   1,   0, 21737,  64,    0,     'Power Converters: Summon Mini-Electromental (from cata)'),
+(37365, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 101,  21,  28,  18,    0,   1,   0, 21757,  64,    0,     'Power Converters: Summon Big Flavor Electromental (from cata)'),
+(44920, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 24941,   0,    0,     'Model - Shattered Sun Marksman - BE Male Tier 4'),
+(44924, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 24945,   0,    0,     'Model - Shattered Sun Marksman - BE Female Tier 4'),
+(44928, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 24949,   0,    0,     'Model - Shattered Sun Marksman - Draenei Male Tier 4'),
+(44932, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 24953,   0,    0,     'Model - Shattered Sun Marksman - Draenei Female Tier 4'),
+(45158, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 25119,   0,    0,     'Model - Shattered Sun Warrior - BE Female Tier 4'),
+(45162, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 25123,   0,    0,     'Model - Shattered Sun Warrior - BE Male Tier 4'),
+(45166, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 25127,   0,    0,     'Model - Shattered Sun Warrior - Draenei Female Tier 4'),
+(45170, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,  56, 25131,   0,    0,     'Model - Shattered Sun Warrior - Draenei Male Tier 4'),
+(50574, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,   0,  90,  25,    0,  11,   0, 28042,   0,    0,     'Captain Brandon Kill Credit'),
+(58630, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Mal\'Ganis'),
+(59046, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Tribunal of Ages'),
+(59450, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - The Four Horsemen'),
+(62388, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101,  21,   6,   1,    0,   0,   4, 0,       0,    0,     'Aura required for Demonic Circle 48020'),
+(64899, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Hodir'),
+(64985, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Thorim'),
+(65074, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Freya'),
+(65195, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Assembly of Iron'),
+(68184, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Faction Champions'),
+(72845, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Pit of Saron - Don\'t Look Up');
 /*!40000 ALTER TABLE `spell_template` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -18811,6 +18662,26 @@ LOCK TABLES `transports` WRITE;
 /*!40000 ALTER TABLE `transports` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `vehicle_accessory`
+--
+DROP TABLE IF EXISTS vehicle_accessory;
+CREATE TABLE `vehicle_accessory` (
+  `vehicle_entry` int(10) UNSIGNED NOT NULL COMMENT 'entry of the npc who has some accessory as vehicle',
+  `seat` mediumint(8) UNSIGNED NOT NULL COMMENT 'onto which seat shall the passenger be boarded',
+  `accessory_entry` int(10) UNSIGNED NOT NULL COMMENT 'entry of the passenger that is to be boarded',
+  `comment` varchar(255) NOT NULL,
+  PRIMARY KEY  (`vehicle_entry`, `seat`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Vehicle Accessory (passengers that are auto-boarded onto a vehicle)';
+
+--
+-- Dumping data for table `vehicle_accessory`
+--
+LOCK TABLES `vehicle_accessory` WRITE;
+/*!40000 ALTER TABLE `vehicle_accessory` DISABLE KEYS */;
+/*!40000 ALTER TABLE `vehicle_accessory` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `world_template`
 --
diff --git a/sql/mangos_indexes.sql b/sql/mangos_indexes.sql
new file mode 100644
index 00000000000..bb445c1cb01
--- /dev/null
+++ b/sql/mangos_indexes.sql
@@ -0,0 +1,62 @@
+-- Loot indexes
+CREATE INDEX `idx_item` ON `creature_loot_template`     (`item`);
+CREATE INDEX `idx_ref`  ON `creature_loot_template`     (`mincountOrRef`);
+CREATE INDEX `idx_item` ON `disenchant_loot_template`   (`item`);
+CREATE INDEX `idx_ref`  ON `disenchant_loot_template`   (`mincountOrRef`);
+CREATE INDEX `idx_item` ON `fishing_loot_template`      (`item`);
+CREATE INDEX `idx_ref`  ON `fishing_loot_template`      (`mincountOrRef`);
+CREATE INDEX `idx_item` ON `gameobject_loot_template`   (`item`);
+CREATE INDEX `idx_ref`  ON `gameobject_loot_template`   (`mincountOrRef`);
+CREATE INDEX `idx_item` ON `item_loot_template`         (`item`);
+CREATE INDEX `idx_ref`  ON `item_loot_template`         (`mincountOrRef`);
+CREATE INDEX `idx_item` ON `pickpocketing_loot_template`(`item`);
+CREATE INDEX `idx_ref`  ON `pickpocketing_loot_template`(`mincountOrRef`);
+CREATE INDEX `idx_item` ON `prospecting_loot_template`  (`item`);
+CREATE INDEX `idx_ref`  ON `prospecting_loot_template`  (`mincountOrRef`);
+CREATE INDEX `idx_item` ON `skinning_loot_template`     (`item`);
+CREATE INDEX `idx_ref`  ON `skinning_loot_template`     (`mincountOrRef`);
+CREATE INDEX `idx_item` ON `milling_loot_template`      (`item`);
+CREATE INDEX `idx_ref`  ON `milling_loot_template`      (`mincountOrRef`);
+CREATE INDEX `idx_item` ON `mail_loot_template`   		(`item`);
+CREATE INDEX `idx_ref`  ON `mail_loot_template`   		(`mincountOrRef`);
+CREATE INDEX `idx_item` ON `reference_loot_template`    (`item`);
+CREATE INDEX `idx_ref`  ON `reference_loot_template`    (`mincountOrRef`);
+
+-- Creature indexes
+CREATE INDEX `idx_loot`           ON `creature_template` (`lootid`);
+CREATE INDEX `idx_skinloot`       ON `creature_template` (`SkinningLootId`);
+CREATE INDEX `idx_pickpocketloot` ON `creature_template` (`PickpocketLootId`);
+CREATE INDEX `idx_factionA`       ON `creature_template` (`FactionAlliance`);
+CREATE INDEX `idx_factionH`       ON `creature_template` (`FactionHorde`);
+
+-- Trainer
+CREATE INDEX `idx_spell`          ON `npc_trainer`       (`spell`);
+
+-- Vendor
+CREATE INDEX `idx_sold`           ON `npc_vendor`        (`item`);
+
+-- Item indexes
+CREATE INDEX `idx_quest`           ON `item_template`            (`startquest`);
+CREATE INDEX `idx_reqFaction`      ON `item_template`            (`RequiredReputationFaction`);
+CREATE INDEX `idx_spell1`          ON `item_template`            (`spellid_1`);
+CREATE INDEX `idx_spell2`          ON `item_template`            (`spellid_2`);
+CREATE INDEX `idx_spell3`          ON `item_template`            (`spellid_3`);
+CREATE INDEX `idx_spell4`          ON `item_template`            (`spellid_4`);
+CREATE INDEX `idx_spell5`          ON `item_template`            (`spellid_5`);
+CREATE INDEX `idx_disenchant`      ON `item_template`            (`DisenchantID`);
+
+-- Quest indexes
+CREATE INDEX `idx_rewSpell`        ON `quest_template`           (`RewSpell`);
+CREATE INDEX `idx_castSpell`       ON `quest_template`           (`RewSpellCast`);
+
+CREATE INDEX `idx_quest`           ON `creature_questrelation`   (`quest`);
+CREATE INDEX `idx_quest`           ON `gameobject_questrelation` (`quest`);
+
+-- GO indexes
+CREATE INDEX `idx_type`           ON `gameobject_template` (`type`);
+CREATE INDEX `idx_faction`        ON `gameobject_template` (`faction`);
+CREATE INDEX `idx_data0`          ON `gameobject_template` (`data0`);
+CREATE INDEX `idx_data1`          ON `gameobject_template` (`data1`);
+CREATE INDEX `idx_data2`          ON `gameobject_template` (`data2`);
+CREATE INDEX `idx_data3`          ON `gameobject_template` (`data3`);
+CREATE INDEX `idx_data10`         ON `gameobject_template` (`data10`);
diff --git a/sql/realmd.sql b/sql/realmd.sql
index 0fe246f44ac..02cb5a0cc32 100644
--- a/sql/realmd.sql
+++ b/sql/realmd.sql
@@ -21,7 +21,7 @@
 
 DROP TABLE IF EXISTS `realmd_db_version`;
 CREATE TABLE `realmd_db_version` (
-  `required_10008_01_realmd_realmd_db_version` bit(1) default NULL
+  `required_10008_01_realmd_realmd_db_version` bit(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
 
 --
diff --git a/sql/updates/10008_01_realmd_realmd_db_version.sql b/sql/updates/0.17/10008_01_realmd_realmd_db_version.sql
similarity index 100%
rename from sql/updates/10008_01_realmd_realmd_db_version.sql
rename to sql/updates/0.17/10008_01_realmd_realmd_db_version.sql
diff --git a/sql/updates/10148_01_mangos_mangos_string.sql b/sql/updates/0.17/10148_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10148_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10148_01_mangos_mangos_string.sql
diff --git a/sql/updates/10156_01_characters_character_aura.sql b/sql/updates/0.17/10156_01_characters_character_aura.sql
similarity index 100%
rename from sql/updates/10156_01_characters_character_aura.sql
rename to sql/updates/0.17/10156_01_characters_character_aura.sql
diff --git a/sql/updates/10156_02_characters_pet_aura.sql b/sql/updates/0.17/10156_02_characters_pet_aura.sql
similarity index 100%
rename from sql/updates/10156_02_characters_pet_aura.sql
rename to sql/updates/0.17/10156_02_characters_pet_aura.sql
diff --git a/sql/updates/10156_03_mangos_spell_proc_event.sql b/sql/updates/0.17/10156_03_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10156_03_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10156_03_mangos_spell_proc_event.sql
diff --git a/sql/updates/10159_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10159_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10159_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10159_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10160_01_characters_character_aura.sql b/sql/updates/0.17/10160_01_characters_character_aura.sql
similarity index 100%
rename from sql/updates/10160_01_characters_character_aura.sql
rename to sql/updates/0.17/10160_01_characters_character_aura.sql
diff --git a/sql/updates/10160_02_characters_pet_aura.sql b/sql/updates/0.17/10160_02_characters_pet_aura.sql
similarity index 100%
rename from sql/updates/10160_02_characters_pet_aura.sql
rename to sql/updates/0.17/10160_02_characters_pet_aura.sql
diff --git a/sql/updates/10171_01_mangos_mangos_string.sql b/sql/updates/0.17/10171_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10171_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10171_01_mangos_mangos_string.sql
diff --git a/sql/updates/10197_01_mangos_playercreateinfo.sql b/sql/updates/0.17/10197_01_mangos_playercreateinfo.sql
similarity index 100%
rename from sql/updates/10197_01_mangos_playercreateinfo.sql
rename to sql/updates/0.17/10197_01_mangos_playercreateinfo.sql
diff --git a/sql/updates/10203_01_mangos_item_template.sql b/sql/updates/0.17/10203_01_mangos_item_template.sql
similarity index 100%
rename from sql/updates/10203_01_mangos_item_template.sql
rename to sql/updates/0.17/10203_01_mangos_item_template.sql
diff --git a/sql/updates/10205_01_mangos_spell_area.sql b/sql/updates/0.17/10205_01_mangos_spell_area.sql
similarity index 100%
rename from sql/updates/10205_01_mangos_spell_area.sql
rename to sql/updates/0.17/10205_01_mangos_spell_area.sql
diff --git a/sql/updates/10207_01_mangos_npc_vendor.sql b/sql/updates/0.17/10207_01_mangos_npc_vendor.sql
similarity index 100%
rename from sql/updates/10207_01_mangos_npc_vendor.sql
rename to sql/updates/0.17/10207_01_mangos_npc_vendor.sql
diff --git a/sql/updates/10208_01_mangos_playercreateinfo.sql b/sql/updates/0.17/10208_01_mangos_playercreateinfo.sql
similarity index 100%
rename from sql/updates/10208_01_mangos_playercreateinfo.sql
rename to sql/updates/0.17/10208_01_mangos_playercreateinfo.sql
diff --git a/sql/updates/10217_01_mangos_playercreateinfo_spell.sql b/sql/updates/0.17/10217_01_mangos_playercreateinfo_spell.sql
similarity index 100%
rename from sql/updates/10217_01_mangos_playercreateinfo_spell.sql
rename to sql/updates/0.17/10217_01_mangos_playercreateinfo_spell.sql
diff --git a/sql/updates/10217_02_mangos_playercreateinfo_action.sql b/sql/updates/0.17/10217_02_mangos_playercreateinfo_action.sql
similarity index 100%
rename from sql/updates/10217_02_mangos_playercreateinfo_action.sql
rename to sql/updates/0.17/10217_02_mangos_playercreateinfo_action.sql
diff --git a/sql/updates/10217_03_mangos_spell_learn_spell.sql b/sql/updates/0.17/10217_03_mangos_spell_learn_spell.sql
similarity index 100%
rename from sql/updates/10217_03_mangos_spell_learn_spell.sql
rename to sql/updates/0.17/10217_03_mangos_spell_learn_spell.sql
diff --git a/sql/updates/10217_04_mangos_spell_chain.sql b/sql/updates/0.17/10217_04_mangos_spell_chain.sql
similarity index 100%
rename from sql/updates/10217_04_mangos_spell_chain.sql
rename to sql/updates/0.17/10217_04_mangos_spell_chain.sql
diff --git a/sql/updates/10217_05_mangos_spell_proc_event.sql b/sql/updates/0.17/10217_05_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10217_05_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10217_05_mangos_spell_proc_event.sql
diff --git a/sql/updates/10219_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10219_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10219_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10219_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10223_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10223_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10223_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10223_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10237_01_mangos_spell_bonus_data.sql b/sql/updates/0.17/10237_01_mangos_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/10237_01_mangos_spell_bonus_data.sql
rename to sql/updates/0.17/10237_01_mangos_spell_bonus_data.sql
diff --git a/sql/updates/10244_01_mangos_command.sql b/sql/updates/0.17/10244_01_mangos_command.sql
similarity index 100%
rename from sql/updates/10244_01_mangos_command.sql
rename to sql/updates/0.17/10244_01_mangos_command.sql
diff --git a/sql/updates/10251_01_mangos_command.sql b/sql/updates/0.17/10251_01_mangos_command.sql
similarity index 100%
rename from sql/updates/10251_01_mangos_command.sql
rename to sql/updates/0.17/10251_01_mangos_command.sql
diff --git a/sql/updates/10252_01_mangos_reputation_reward_rate.sql b/sql/updates/0.17/10252_01_mangos_reputation_reward_rate.sql
similarity index 100%
rename from sql/updates/10252_01_mangos_reputation_reward_rate.sql
rename to sql/updates/0.17/10252_01_mangos_reputation_reward_rate.sql
diff --git a/sql/updates/10254_01_characters_auctionhouse.sql b/sql/updates/0.17/10254_01_characters_auctionhouse.sql
similarity index 94%
rename from sql/updates/10254_01_characters_auctionhouse.sql
rename to sql/updates/0.17/10254_01_characters_auctionhouse.sql
index ac3c7812051..72d123970d2 100644
--- a/sql/updates/10254_01_characters_auctionhouse.sql
+++ b/sql/updates/0.17/10254_01_characters_auctionhouse.sql
@@ -3,7 +3,7 @@ ALTER TABLE character_db_version CHANGE COLUMN required_10160_02_characters_pet_
 ALTER TABLE auctionhouse
   ADD COLUMN houseid int(11) unsigned NOT NULL default '0' AFTER id;
 
-UPDATE auctionhouse, mangos.creature AS c, mangos.creature_template AS ct
+UPDATE auctionhouse, ytdb_355a.creature AS c, ytdb_355a.creature_template AS ct
   SET houseid =
     CASE ct.faction_A
       WHEN   12 THEN 1 /* human                                  */
diff --git a/sql/updates/10256_01_mangos_command.sql b/sql/updates/0.17/10256_01_mangos_command.sql
similarity index 100%
rename from sql/updates/10256_01_mangos_command.sql
rename to sql/updates/0.17/10256_01_mangos_command.sql
diff --git a/sql/updates/10257_01_mangos_command.sql b/sql/updates/0.17/10257_01_mangos_command.sql
similarity index 100%
rename from sql/updates/10257_01_mangos_command.sql
rename to sql/updates/0.17/10257_01_mangos_command.sql
diff --git a/sql/updates/10263_01_mangos_pool_creature.sql b/sql/updates/0.17/10263_01_mangos_pool_creature.sql
similarity index 100%
rename from sql/updates/10263_01_mangos_pool_creature.sql
rename to sql/updates/0.17/10263_01_mangos_pool_creature.sql
diff --git a/sql/updates/10263_02_mangos_pool_gameobject.sql b/sql/updates/0.17/10263_02_mangos_pool_gameobject.sql
similarity index 100%
rename from sql/updates/10263_02_mangos_pool_gameobject.sql
rename to sql/updates/0.17/10263_02_mangos_pool_gameobject.sql
diff --git a/sql/updates/10263_03_mangos_pool_pool.sql b/sql/updates/0.17/10263_03_mangos_pool_pool.sql
similarity index 100%
rename from sql/updates/10263_03_mangos_pool_pool.sql
rename to sql/updates/0.17/10263_03_mangos_pool_pool.sql
diff --git a/sql/updates/10270_01_mangos_reputation_spillover_template.sql b/sql/updates/0.17/10270_01_mangos_reputation_spillover_template.sql
similarity index 100%
rename from sql/updates/10270_01_mangos_reputation_spillover_template.sql
rename to sql/updates/0.17/10270_01_mangos_reputation_spillover_template.sql
diff --git a/sql/updates/10286_01_mangos_creature_addon.sql b/sql/updates/0.17/10286_01_mangos_creature_addon.sql
similarity index 100%
rename from sql/updates/10286_01_mangos_creature_addon.sql
rename to sql/updates/0.17/10286_01_mangos_creature_addon.sql
diff --git a/sql/updates/10289_01_mangos_creature_template.sql b/sql/updates/0.17/10289_01_mangos_creature_template.sql
similarity index 100%
rename from sql/updates/10289_01_mangos_creature_template.sql
rename to sql/updates/0.17/10289_01_mangos_creature_template.sql
diff --git a/sql/updates/10289_02_mangos_creature_model_info.sql b/sql/updates/0.17/10289_02_mangos_creature_model_info.sql
similarity index 100%
rename from sql/updates/10289_02_mangos_creature_model_info.sql
rename to sql/updates/0.17/10289_02_mangos_creature_model_info.sql
diff --git a/sql/updates/10299_01_mangos_event_id_scripts.sql b/sql/updates/0.17/10299_01_mangos_event_id_scripts.sql
similarity index 100%
rename from sql/updates/10299_01_mangos_event_id_scripts.sql
rename to sql/updates/0.17/10299_01_mangos_event_id_scripts.sql
diff --git a/sql/updates/10307_01_mangos_instance_template.sql b/sql/updates/0.17/10307_01_mangos_instance_template.sql
similarity index 100%
rename from sql/updates/10307_01_mangos_instance_template.sql
rename to sql/updates/0.17/10307_01_mangos_instance_template.sql
diff --git a/sql/updates/10307_02_mangos_scripted_areatrigger.sql b/sql/updates/0.17/10307_02_mangos_scripted_areatrigger.sql
similarity index 100%
rename from sql/updates/10307_02_mangos_scripted_areatrigger.sql
rename to sql/updates/0.17/10307_02_mangos_scripted_areatrigger.sql
diff --git a/sql/updates/10307_03_mangos_scripted_event_id.sql b/sql/updates/0.17/10307_03_mangos_scripted_event_id.sql
similarity index 100%
rename from sql/updates/10307_03_mangos_scripted_event_id.sql
rename to sql/updates/0.17/10307_03_mangos_scripted_event_id.sql
diff --git a/sql/updates/10312_01_characters_character_aura.sql b/sql/updates/0.17/10312_01_characters_character_aura.sql
similarity index 100%
rename from sql/updates/10312_01_characters_character_aura.sql
rename to sql/updates/0.17/10312_01_characters_character_aura.sql
diff --git a/sql/updates/10312_02_characters_pet_aura.sql b/sql/updates/0.17/10312_02_characters_pet_aura.sql
similarity index 100%
rename from sql/updates/10312_02_characters_pet_aura.sql
rename to sql/updates/0.17/10312_02_characters_pet_aura.sql
diff --git a/sql/updates/10314_01_mangos_mangos_string.sql b/sql/updates/0.17/10314_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10314_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10314_01_mangos_mangos_string.sql
diff --git a/sql/updates/10314_02_mangos_command.sql b/sql/updates/0.17/10314_02_mangos_command.sql
similarity index 100%
rename from sql/updates/10314_02_mangos_command.sql
rename to sql/updates/0.17/10314_02_mangos_command.sql
diff --git a/sql/updates/10323_01_mangos_mangos_string.sql b/sql/updates/0.17/10323_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10323_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10323_01_mangos_mangos_string.sql
diff --git a/sql/updates/10323_02_mangos_command.sql b/sql/updates/0.17/10323_02_mangos_command.sql
similarity index 100%
rename from sql/updates/10323_02_mangos_command.sql
rename to sql/updates/0.17/10323_02_mangos_command.sql
diff --git a/sql/updates/10331_01_mangos_mangos_string.sql b/sql/updates/0.17/10331_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10331_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10331_01_mangos_mangos_string.sql
diff --git a/sql/updates/10331_02_mangos_command.sql b/sql/updates/0.17/10331_02_mangos_command.sql
similarity index 100%
rename from sql/updates/10331_02_mangos_command.sql
rename to sql/updates/0.17/10331_02_mangos_command.sql
diff --git a/sql/updates/10332_01_characters_character_aura.sql b/sql/updates/0.17/10332_01_characters_character_aura.sql
similarity index 100%
rename from sql/updates/10332_01_characters_character_aura.sql
rename to sql/updates/0.17/10332_01_characters_character_aura.sql
diff --git a/sql/updates/10332_02_characters_pet_aura.sql b/sql/updates/0.17/10332_02_characters_pet_aura.sql
similarity index 100%
rename from sql/updates/10332_02_characters_pet_aura.sql
rename to sql/updates/0.17/10332_02_characters_pet_aura.sql
diff --git a/sql/updates/10342_01_mangos_mangos_string.sql b/sql/updates/0.17/10342_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10342_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10342_01_mangos_mangos_string.sql
diff --git a/sql/updates/10342_02_mangos_command.sql b/sql/updates/0.17/10342_02_mangos_command.sql
similarity index 100%
rename from sql/updates/10342_02_mangos_command.sql
rename to sql/updates/0.17/10342_02_mangos_command.sql
diff --git a/sql/updates/10349_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10349_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10349_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10349_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10350_02_mangos_command.sql b/sql/updates/0.17/10350_02_mangos_command.sql
similarity index 100%
rename from sql/updates/10350_02_mangos_command.sql
rename to sql/updates/0.17/10350_02_mangos_command.sql
diff --git a/sql/updates/10353_01_mangos_mangos_string.sql b/sql/updates/0.17/10353_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10353_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10353_01_mangos_mangos_string.sql
diff --git a/sql/updates/10353_02_mangos_command.sql b/sql/updates/0.17/10353_02_mangos_command.sql
similarity index 100%
rename from sql/updates/10353_02_mangos_command.sql
rename to sql/updates/0.17/10353_02_mangos_command.sql
diff --git a/sql/updates/10362_01_mangos_creature_movement_template.sql b/sql/updates/0.17/10362_01_mangos_creature_movement_template.sql
similarity index 100%
rename from sql/updates/10362_01_mangos_creature_movement_template.sql
rename to sql/updates/0.17/10362_01_mangos_creature_movement_template.sql
diff --git a/sql/updates/10365_01_mangos_creature_ai_scripts.sql b/sql/updates/0.17/10365_01_mangos_creature_ai_scripts.sql
similarity index 100%
rename from sql/updates/10365_01_mangos_creature_ai_scripts.sql
rename to sql/updates/0.17/10365_01_mangos_creature_ai_scripts.sql
diff --git a/sql/updates/10381_01_mangos_creature_model_race.sql b/sql/updates/0.17/10381_01_mangos_creature_model_race.sql
similarity index 100%
rename from sql/updates/10381_01_mangos_creature_model_race.sql
rename to sql/updates/0.17/10381_01_mangos_creature_model_race.sql
diff --git a/sql/updates/10400_01_mangos_mangos_string.sql b/sql/updates/0.17/10400_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10400_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10400_01_mangos_mangos_string.sql
diff --git a/sql/updates/10409_01_mangos_spell_chain.sql b/sql/updates/0.17/10409_01_mangos_spell_chain.sql
similarity index 100%
rename from sql/updates/10409_01_mangos_spell_chain.sql
rename to sql/updates/0.17/10409_01_mangos_spell_chain.sql
diff --git a/sql/updates/10409_02_mangos_spell_proc_event.sql b/sql/updates/0.17/10409_02_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10409_02_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10409_02_mangos_spell_proc_event.sql
diff --git a/sql/updates/10410_01_mangos_spell_chain.sql b/sql/updates/0.17/10410_01_mangos_spell_chain.sql
similarity index 100%
rename from sql/updates/10410_01_mangos_spell_chain.sql
rename to sql/updates/0.17/10410_01_mangos_spell_chain.sql
diff --git a/sql/updates/10411_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10411_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10411_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10411_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10416_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10416_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10416_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10416_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10419_01_mangos_spell_chain.sql b/sql/updates/0.17/10419_01_mangos_spell_chain.sql
similarity index 100%
rename from sql/updates/10419_01_mangos_spell_chain.sql
rename to sql/updates/0.17/10419_01_mangos_spell_chain.sql
diff --git a/sql/updates/10422_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10422_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10422_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10422_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10423_01_mangos_spell_chain.sql b/sql/updates/0.17/10423_01_mangos_spell_chain.sql
similarity index 100%
rename from sql/updates/10423_01_mangos_spell_chain.sql
rename to sql/updates/0.17/10423_01_mangos_spell_chain.sql
diff --git a/sql/updates/10427_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10427_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10427_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10427_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10430_01_mangos_spell_chain.sql b/sql/updates/0.17/10430_01_mangos_spell_chain.sql
similarity index 100%
rename from sql/updates/10430_01_mangos_spell_chain.sql
rename to sql/updates/0.17/10430_01_mangos_spell_chain.sql
diff --git a/sql/updates/10454_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10454_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10454_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10454_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10457_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10457_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10457_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10457_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10500_01_mangos_scripts.sql b/sql/updates/0.17/10500_01_mangos_scripts.sql
similarity index 100%
rename from sql/updates/10500_01_mangos_scripts.sql
rename to sql/updates/0.17/10500_01_mangos_scripts.sql
diff --git a/sql/updates/10503_01_characters_creature_respawn.sql b/sql/updates/0.17/10503_01_characters_creature_respawn.sql
similarity index 100%
rename from sql/updates/10503_01_characters_creature_respawn.sql
rename to sql/updates/0.17/10503_01_characters_creature_respawn.sql
diff --git a/sql/updates/10503_02_characters_gameobject_respawn.sql b/sql/updates/0.17/10503_02_characters_gameobject_respawn.sql
similarity index 100%
rename from sql/updates/10503_02_characters_gameobject_respawn.sql
rename to sql/updates/0.17/10503_02_characters_gameobject_respawn.sql
diff --git a/sql/updates/10503_03_mangos_creature_respawn.sql b/sql/updates/0.17/10503_03_mangos_creature_respawn.sql
similarity index 100%
rename from sql/updates/10503_03_mangos_creature_respawn.sql
rename to sql/updates/0.17/10503_03_mangos_creature_respawn.sql
diff --git a/sql/updates/10503_04_mangos_gameobject_respawn.sql b/sql/updates/0.17/10503_04_mangos_gameobject_respawn.sql
similarity index 100%
rename from sql/updates/10503_04_mangos_gameobject_respawn.sql
rename to sql/updates/0.17/10503_04_mangos_gameobject_respawn.sql
diff --git a/sql/updates/10537_01_mangos_command.sql b/sql/updates/0.17/10537_01_mangos_command.sql
similarity index 100%
rename from sql/updates/10537_01_mangos_command.sql
rename to sql/updates/0.17/10537_01_mangos_command.sql
diff --git a/sql/updates/10551_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10551_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10551_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10551_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10568_01_characters_character_tutorial.sql b/sql/updates/0.17/10568_01_characters_character_tutorial.sql
similarity index 100%
rename from sql/updates/10568_01_characters_character_tutorial.sql
rename to sql/updates/0.17/10568_01_characters_character_tutorial.sql
diff --git a/sql/updates/10582_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10582_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10582_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10582_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10604_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10604_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10604_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10604_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10621_01_mangos_quest_template.sql b/sql/updates/0.17/10621_01_mangos_quest_template.sql
similarity index 100%
rename from sql/updates/10621_01_mangos_quest_template.sql
rename to sql/updates/0.17/10621_01_mangos_quest_template.sql
diff --git a/sql/updates/10628_01_mangos_mangos_string.sql b/sql/updates/0.17/10628_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10628_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10628_01_mangos_mangos_string.sql
diff --git a/sql/updates/10629_01_mangos_mangos_string.sql b/sql/updates/0.17/10629_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10629_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10629_01_mangos_mangos_string.sql
diff --git a/sql/updates/10654_01_mangos_game_event_creature_quest.sql b/sql/updates/0.17/10654_01_mangos_game_event_creature_quest.sql
similarity index 100%
rename from sql/updates/10654_01_mangos_game_event_creature_quest.sql
rename to sql/updates/0.17/10654_01_mangos_game_event_creature_quest.sql
diff --git a/sql/updates/10655_01_characters_character_queststatus_monthly.sql b/sql/updates/0.17/10655_01_characters_character_queststatus_monthly.sql
similarity index 100%
rename from sql/updates/10655_01_characters_character_queststatus_monthly.sql
rename to sql/updates/0.17/10655_01_characters_character_queststatus_monthly.sql
diff --git a/sql/updates/10660_01_mangos_game_event_quest.sql b/sql/updates/0.17/10660_01_mangos_game_event_quest.sql
similarity index 100%
rename from sql/updates/10660_01_mangos_game_event_quest.sql
rename to sql/updates/0.17/10660_01_mangos_game_event_quest.sql
diff --git a/sql/updates/10662_01_characters_item_loot.sql b/sql/updates/0.17/10662_01_characters_item_loot.sql
similarity index 100%
rename from sql/updates/10662_01_characters_item_loot.sql
rename to sql/updates/0.17/10662_01_characters_item_loot.sql
diff --git a/sql/updates/10664_01_characters_arena_team_stats.sql b/sql/updates/0.17/10664_01_characters_arena_team_stats.sql
similarity index 100%
rename from sql/updates/10664_01_characters_arena_team_stats.sql
rename to sql/updates/0.17/10664_01_characters_arena_team_stats.sql
diff --git a/sql/updates/10679_01_mangos_npc_vendor_template.sql b/sql/updates/0.17/10679_01_mangos_npc_vendor_template.sql
similarity index 100%
rename from sql/updates/10679_01_mangos_npc_vendor_template.sql
rename to sql/updates/0.17/10679_01_mangos_npc_vendor_template.sql
diff --git a/sql/updates/10679_02_mangos_creature_template.sql b/sql/updates/0.17/10679_02_mangos_creature_template.sql
similarity index 100%
rename from sql/updates/10679_02_mangos_creature_template.sql
rename to sql/updates/0.17/10679_02_mangos_creature_template.sql
diff --git a/sql/updates/10682_01_mangos_item_convert.sql b/sql/updates/0.17/10682_01_mangos_item_convert.sql
similarity index 100%
rename from sql/updates/10682_01_mangos_item_convert.sql
rename to sql/updates/0.17/10682_01_mangos_item_convert.sql
diff --git a/sql/updates/10704_01_mangos_gossip_menu_option.sql b/sql/updates/0.17/10704_01_mangos_gossip_menu_option.sql
similarity index 100%
rename from sql/updates/10704_01_mangos_gossip_menu_option.sql
rename to sql/updates/0.17/10704_01_mangos_gossip_menu_option.sql
diff --git a/sql/updates/10742_01_mangos_spell_bonus_data.sql b/sql/updates/0.17/10742_01_mangos_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/10742_01_mangos_spell_bonus_data.sql
rename to sql/updates/0.17/10742_01_mangos_spell_bonus_data.sql
diff --git a/sql/updates/10743_01_mangos_spell_chain.sql b/sql/updates/0.17/10743_01_mangos_spell_chain.sql
similarity index 100%
rename from sql/updates/10743_01_mangos_spell_chain.sql
rename to sql/updates/0.17/10743_01_mangos_spell_chain.sql
diff --git a/sql/updates/10743_02_mangos_spell_bonus_data.sql b/sql/updates/0.17/10743_02_mangos_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/10743_02_mangos_spell_bonus_data.sql
rename to sql/updates/0.17/10743_02_mangos_spell_bonus_data.sql
diff --git a/sql/updates/10746_01_mangos_mangos_string.sql b/sql/updates/0.17/10746_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10746_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10746_01_mangos_mangos_string.sql
diff --git a/sql/updates/10749_01_mangos_mangos_string.sql b/sql/updates/0.17/10749_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10749_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10749_01_mangos_mangos_string.sql
diff --git a/sql/updates/10762_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10762_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10762_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10762_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10764_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10764_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10764_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10764_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10786_01_mangos_spell_proc_item_enchant.sql b/sql/updates/0.17/10786_01_mangos_spell_proc_item_enchant.sql
similarity index 100%
rename from sql/updates/10786_01_mangos_spell_proc_item_enchant.sql
rename to sql/updates/0.17/10786_01_mangos_spell_proc_item_enchant.sql
diff --git a/sql/updates/10786_02_mangos_spell_proc_event.sql b/sql/updates/0.17/10786_02_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10786_02_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10786_02_mangos_spell_proc_event.sql
diff --git a/sql/updates/10788_01_mangos_creature_addon.sql b/sql/updates/0.17/10788_01_mangos_creature_addon.sql
similarity index 100%
rename from sql/updates/10788_01_mangos_creature_addon.sql
rename to sql/updates/0.17/10788_01_mangos_creature_addon.sql
diff --git a/sql/updates/10788_02_mangos_creature_template_addon.sql b/sql/updates/0.17/10788_02_mangos_creature_template_addon.sql
similarity index 100%
rename from sql/updates/10788_02_mangos_creature_template_addon.sql
rename to sql/updates/0.17/10788_02_mangos_creature_template_addon.sql
diff --git a/sql/updates/10835_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10835_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10835_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10835_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10862_01_characters_mail.sql b/sql/updates/0.17/10862_01_characters_mail.sql
similarity index 100%
rename from sql/updates/10862_01_characters_mail.sql
rename to sql/updates/0.17/10862_01_characters_mail.sql
diff --git a/sql/updates/10863_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10863_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10863_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10863_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10864_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10864_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10864_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10864_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10867_01_mangos_npc_trainer_template.sql b/sql/updates/0.17/10867_01_mangos_npc_trainer_template.sql
similarity index 100%
rename from sql/updates/10867_01_mangos_npc_trainer_template.sql
rename to sql/updates/0.17/10867_01_mangos_npc_trainer_template.sql
diff --git a/sql/updates/10867_02_mangos_creature_template.sql b/sql/updates/0.17/10867_02_mangos_creature_template.sql
similarity index 100%
rename from sql/updates/10867_02_mangos_creature_template.sql
rename to sql/updates/0.17/10867_02_mangos_creature_template.sql
diff --git a/sql/updates/10883_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10883_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10883_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10883_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10906_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10906_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10906_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10906_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10906_02_mangos_spell_bonus_data.sql b/sql/updates/0.17/10906_02_mangos_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/10906_02_mangos_spell_bonus_data.sql
rename to sql/updates/0.17/10906_02_mangos_spell_bonus_data.sql
diff --git a/sql/updates/10932_01_mangos_game_event_creature_data.sql b/sql/updates/0.17/10932_01_mangos_game_event_creature_data.sql
similarity index 100%
rename from sql/updates/10932_01_mangos_game_event_creature_data.sql
rename to sql/updates/0.17/10932_01_mangos_game_event_creature_data.sql
diff --git a/sql/updates/10945_01_mangos_mangos_string.sql b/sql/updates/0.17/10945_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10945_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10945_01_mangos_mangos_string.sql
diff --git a/sql/updates/10946_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10946_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10946_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10946_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10949_01_mangos_mangos_string.sql b/sql/updates/0.17/10949_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10949_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10949_01_mangos_mangos_string.sql
diff --git a/sql/updates/10950_01_mangos_mangos_string.sql b/sql/updates/0.17/10950_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10950_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10950_01_mangos_mangos_string.sql
diff --git a/sql/updates/10951_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10951_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10951_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10951_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/10972_01_mangos_command.sql b/sql/updates/0.17/10972_01_mangos_command.sql
similarity index 100%
rename from sql/updates/10972_01_mangos_command.sql
rename to sql/updates/0.17/10972_01_mangos_command.sql
diff --git a/sql/updates/10973_01_characters_game_event_status.sql b/sql/updates/0.17/10973_01_characters_game_event_status.sql
similarity index 100%
rename from sql/updates/10973_01_characters_game_event_status.sql
rename to sql/updates/0.17/10973_01_characters_game_event_status.sql
diff --git a/sql/updates/10973_01_mangos_game_event_mail.sql b/sql/updates/0.17/10973_01_mangos_game_event_mail.sql
similarity index 100%
rename from sql/updates/10973_01_mangos_game_event_mail.sql
rename to sql/updates/0.17/10973_01_mangos_game_event_mail.sql
diff --git a/sql/updates/10988_01_mangos_mangos_string.sql b/sql/updates/0.17/10988_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/10988_01_mangos_mangos_string.sql
rename to sql/updates/0.17/10988_01_mangos_mangos_string.sql
diff --git a/sql/updates/10989_01_mangos_loot_template.sql b/sql/updates/0.17/10989_01_mangos_loot_template.sql
similarity index 100%
rename from sql/updates/10989_01_mangos_loot_template.sql
rename to sql/updates/0.17/10989_01_mangos_loot_template.sql
diff --git a/sql/updates/10993_01_mangos_loot_template.sql b/sql/updates/0.17/10993_01_mangos_loot_template.sql
similarity index 100%
rename from sql/updates/10993_01_mangos_loot_template.sql
rename to sql/updates/0.17/10993_01_mangos_loot_template.sql
diff --git a/sql/updates/10998_01_mangos_spell_proc_event.sql b/sql/updates/0.17/10998_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/10998_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/10998_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11002_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11002_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11002_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11002_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11018_01_mangos_command.sql b/sql/updates/0.17/11018_01_mangos_command.sql
similarity index 100%
rename from sql/updates/11018_01_mangos_command.sql
rename to sql/updates/0.17/11018_01_mangos_command.sql
diff --git a/sql/updates/11023_01_mangos_spell_threat.sql b/sql/updates/0.17/11023_01_mangos_spell_threat.sql
similarity index 100%
rename from sql/updates/11023_01_mangos_spell_threat.sql
rename to sql/updates/0.17/11023_01_mangos_spell_threat.sql
diff --git a/sql/updates/11036_01_mangos_spell_threat.sql b/sql/updates/0.17/11036_01_mangos_spell_threat.sql
similarity index 100%
rename from sql/updates/11036_01_mangos_spell_threat.sql
rename to sql/updates/0.17/11036_01_mangos_spell_threat.sql
diff --git a/sql/updates/11040_01_mangos_spell_chain.sql b/sql/updates/0.17/11040_01_mangos_spell_chain.sql
similarity index 100%
rename from sql/updates/11040_01_mangos_spell_chain.sql
rename to sql/updates/0.17/11040_01_mangos_spell_chain.sql
diff --git a/sql/updates/11040_02_mangos_spell_bonus_data.sql b/sql/updates/0.17/11040_02_mangos_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/11040_02_mangos_spell_bonus_data.sql
rename to sql/updates/0.17/11040_02_mangos_spell_bonus_data.sql
diff --git a/sql/updates/11058_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11058_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11058_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11058_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11115_01_mangos_command.sql b/sql/updates/0.17/11115_01_mangos_command.sql
similarity index 100%
rename from sql/updates/11115_01_mangos_command.sql
rename to sql/updates/0.17/11115_01_mangos_command.sql
diff --git a/sql/updates/11117_01_mangos_world_template.sql b/sql/updates/0.17/11117_01_mangos_world_template.sql
similarity index 100%
rename from sql/updates/11117_01_mangos_world_template.sql
rename to sql/updates/0.17/11117_01_mangos_world_template.sql
diff --git a/sql/updates/11117_02_characters_world.sql b/sql/updates/0.17/11117_02_characters_world.sql
similarity index 100%
rename from sql/updates/11117_02_characters_world.sql
rename to sql/updates/0.17/11117_02_characters_world.sql
diff --git a/sql/updates/11169_01_mangos_mangos_string.sql b/sql/updates/0.17/11169_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11169_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11169_01_mangos_mangos_string.sql
diff --git a/sql/updates/11169_02_mangos_command.sql b/sql/updates/0.17/11169_02_mangos_command.sql
similarity index 100%
rename from sql/updates/11169_02_mangos_command.sql
rename to sql/updates/0.17/11169_02_mangos_command.sql
diff --git a/sql/updates/11190_01_mangos_pool_creature_template.sql b/sql/updates/0.17/11190_01_mangos_pool_creature_template.sql
similarity index 100%
rename from sql/updates/11190_01_mangos_pool_creature_template.sql
rename to sql/updates/0.17/11190_01_mangos_pool_creature_template.sql
diff --git a/sql/updates/11190_01_mangos_pool_gameobject_template.sql b/sql/updates/0.17/11190_01_mangos_pool_gameobject_template.sql
similarity index 100%
rename from sql/updates/11190_01_mangos_pool_gameobject_template.sql
rename to sql/updates/0.17/11190_01_mangos_pool_gameobject_template.sql
diff --git a/sql/updates/11200_01_mangos_spell_bonus_data.sql b/sql/updates/0.17/11200_01_mangos_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/11200_01_mangos_spell_bonus_data.sql
rename to sql/updates/0.17/11200_01_mangos_spell_bonus_data.sql
diff --git a/sql/updates/11205_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11205_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11205_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11205_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11214_01_mangos_mangos_string.sql b/sql/updates/0.17/11214_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11214_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11214_01_mangos_mangos_string.sql
diff --git a/sql/updates/11214_02_mangos_command.sql b/sql/updates/0.17/11214_02_mangos_command.sql
similarity index 100%
rename from sql/updates/11214_02_mangos_command.sql
rename to sql/updates/0.17/11214_02_mangos_command.sql
diff --git a/sql/updates/11217_01_mangos_creature_addon.sql b/sql/updates/0.17/11217_01_mangos_creature_addon.sql
similarity index 100%
rename from sql/updates/11217_01_mangos_creature_addon.sql
rename to sql/updates/0.17/11217_01_mangos_creature_addon.sql
diff --git a/sql/updates/11234_01_mangos_command.sql b/sql/updates/0.17/11234_01_mangos_command.sql
similarity index 100%
rename from sql/updates/11234_01_mangos_command.sql
rename to sql/updates/0.17/11234_01_mangos_command.sql
diff --git a/sql/updates/11299_01_characters_character_aura.sql b/sql/updates/0.17/11299_01_characters_character_aura.sql
similarity index 100%
rename from sql/updates/11299_01_characters_character_aura.sql
rename to sql/updates/0.17/11299_01_characters_character_aura.sql
diff --git a/sql/updates/11299_02_characters_pet_aura.sql b/sql/updates/0.17/11299_02_characters_pet_aura.sql
similarity index 100%
rename from sql/updates/11299_02_characters_pet_aura.sql
rename to sql/updates/0.17/11299_02_characters_pet_aura.sql
diff --git a/sql/updates/11310_01_mangos_mangos_string.sql b/sql/updates/0.17/11310_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11310_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11310_01_mangos_mangos_string.sql
diff --git a/sql/updates/11312_01_mangos_mangos_string.sql b/sql/updates/0.17/11312_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11312_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11312_01_mangos_mangos_string.sql
diff --git a/sql/updates/11335_01_mangos_mangos_string.sql b/sql/updates/0.17/11335_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11335_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11335_01_mangos_mangos_string.sql
diff --git a/sql/updates/11335_02_mangos_mangos_string.sql b/sql/updates/0.17/11335_02_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11335_02_mangos_mangos_string.sql
rename to sql/updates/0.17/11335_02_mangos_mangos_string.sql
diff --git a/sql/updates/11337_01_mangos_mangos_string.sql b/sql/updates/0.17/11337_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11337_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11337_01_mangos_mangos_string.sql
diff --git a/sql/updates/11348_01_mangos_spell_bonus_data.sql b/sql/updates/0.17/11348_01_mangos_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/11348_01_mangos_spell_bonus_data.sql
rename to sql/updates/0.17/11348_01_mangos_spell_bonus_data.sql
diff --git a/sql/updates/11385_01_mangos_creature_template.sql b/sql/updates/0.17/11385_01_mangos_creature_template.sql
similarity index 100%
rename from sql/updates/11385_01_mangos_creature_template.sql
rename to sql/updates/0.17/11385_01_mangos_creature_template.sql
diff --git a/sql/updates/11391_01_characters_auction.sql b/sql/updates/0.17/11391_01_characters_auction.sql
similarity index 100%
rename from sql/updates/11391_01_characters_auction.sql
rename to sql/updates/0.17/11391_01_characters_auction.sql
diff --git a/sql/updates/11433_01_mangos_item_template.sql b/sql/updates/0.17/11433_01_mangos_item_template.sql
similarity index 100%
rename from sql/updates/11433_01_mangos_item_template.sql
rename to sql/updates/0.17/11433_01_mangos_item_template.sql
diff --git a/sql/updates/11436_01_characters_character_queststatus.sql b/sql/updates/0.17/11436_01_characters_character_queststatus.sql
similarity index 100%
rename from sql/updates/11436_01_characters_character_queststatus.sql
rename to sql/updates/0.17/11436_01_characters_character_queststatus.sql
diff --git a/sql/updates/11452_01_mangos_spell_bonus_data.sql b/sql/updates/0.17/11452_01_mangos_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/11452_01_mangos_spell_bonus_data.sql
rename to sql/updates/0.17/11452_01_mangos_spell_bonus_data.sql
diff --git a/sql/updates/11452_02_mangos_spell_proc_event.sql b/sql/updates/0.17/11452_02_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11452_02_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11452_02_mangos_spell_proc_event.sql
diff --git a/sql/updates/11453_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11453_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11453_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11453_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11489_01_mangos_creature_template.sql b/sql/updates/0.17/11489_01_mangos_creature_template.sql
similarity index 100%
rename from sql/updates/11489_01_mangos_creature_template.sql
rename to sql/updates/0.17/11489_01_mangos_creature_template.sql
diff --git a/sql/updates/11501_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11501_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11501_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11501_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11501_02_mangos_spell_bonus_data.sql b/sql/updates/0.17/11501_02_mangos_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/11501_02_mangos_spell_bonus_data.sql
rename to sql/updates/0.17/11501_02_mangos_spell_bonus_data.sql
diff --git a/sql/updates/11503_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11503_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11503_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11503_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11513_09_mangos_mangos_string.sql b/sql/updates/0.17/11513_09_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11513_09_mangos_mangos_string.sql
rename to sql/updates/0.17/11513_09_mangos_mangos_string.sql
diff --git a/sql/updates/11516_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11516_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11516_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11516_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11517_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11517_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11517_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11517_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11521_01_mangos_command.sql b/sql/updates/0.17/11521_01_mangos_command.sql
similarity index 100%
rename from sql/updates/11521_01_mangos_command.sql
rename to sql/updates/0.17/11521_01_mangos_command.sql
diff --git a/sql/updates/11523_01_mangos_command.sql b/sql/updates/0.17/11523_01_mangos_command.sql
similarity index 100%
rename from sql/updates/11523_01_mangos_command.sql
rename to sql/updates/0.17/11523_01_mangos_command.sql
diff --git a/sql/updates/11523_02_mangos_mangos_string.sql b/sql/updates/0.17/11523_02_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11523_02_mangos_mangos_string.sql
rename to sql/updates/0.17/11523_02_mangos_mangos_string.sql
diff --git a/sql/updates/11529_01_mangos_command.sql b/sql/updates/0.17/11529_01_mangos_command.sql
similarity index 100%
rename from sql/updates/11529_01_mangos_command.sql
rename to sql/updates/0.17/11529_01_mangos_command.sql
diff --git a/sql/updates/11530_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11530_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11530_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11530_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11549_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11549_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11549_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11549_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11560_01_mangos_command.sql b/sql/updates/0.17/11560_01_mangos_command.sql
similarity index 100%
rename from sql/updates/11560_01_mangos_command.sql
rename to sql/updates/0.17/11560_01_mangos_command.sql
diff --git a/sql/updates/11565_01_mangos_mangos_string.sql b/sql/updates/0.17/11565_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11565_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11565_01_mangos_mangos_string.sql
diff --git a/sql/updates/11567_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11567_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11567_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11567_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11595_09_mangos_spell_elixir.sql b/sql/updates/0.17/11595_09_mangos_spell_elixir.sql
similarity index 100%
rename from sql/updates/11595_09_mangos_spell_elixir.sql
rename to sql/updates/0.17/11595_09_mangos_spell_elixir.sql
diff --git a/sql/updates/11597_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11597_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11597_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11597_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11598_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11598_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11598_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11598_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11599_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11599_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11599_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11599_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11602_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11602_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11602_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11602_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11606_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11606_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11606_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11606_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11613_01_mangos_spell_bonus_data.sql b/sql/updates/0.17/11613_01_mangos_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/11613_01_mangos_spell_bonus_data.sql
rename to sql/updates/0.17/11613_01_mangos_spell_bonus_data.sql
diff --git a/sql/updates/11620_01_characters_character_equipmentsets.sql b/sql/updates/0.17/11620_01_characters_character_equipmentsets.sql
similarity index 100%
rename from sql/updates/11620_01_characters_character_equipmentsets.sql
rename to sql/updates/0.17/11620_01_characters_character_equipmentsets.sql
diff --git a/sql/updates/11646_01_mangos_item_expire_convert.sql b/sql/updates/0.17/11646_01_mangos_item_expire_convert.sql
similarity index 100%
rename from sql/updates/11646_01_mangos_item_expire_convert.sql
rename to sql/updates/0.17/11646_01_mangos_item_expire_convert.sql
diff --git a/sql/updates/11661_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11661_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11661_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11661_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11664_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11664_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11664_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11664_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11673_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11673_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11673_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11673_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11678_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11678_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11678_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11678_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11679_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11679_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11679_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11679_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11680_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11680_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11680_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11680_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11681_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11681_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11681_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11681_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11682_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11682_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11682_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11682_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11685_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11685_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11685_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11685_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11686_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11686_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11686_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11686_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11687_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11687_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11687_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11687_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11688_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11688_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11688_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11688_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11689_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11689_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11689_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11689_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11690_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11690_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11690_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11690_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11701_01_mangos_command.sql b/sql/updates/0.17/11701_01_mangos_command.sql
similarity index 100%
rename from sql/updates/11701_01_mangos_command.sql
rename to sql/updates/0.17/11701_01_mangos_command.sql
diff --git a/sql/updates/11704_01_characters_auction.sql b/sql/updates/0.17/11704_01_characters_auction.sql
similarity index 100%
rename from sql/updates/11704_01_characters_auction.sql
rename to sql/updates/0.17/11704_01_characters_auction.sql
diff --git a/sql/updates/11716_01_characters_auction.sql b/sql/updates/0.17/11716_01_characters_auction.sql
similarity index 100%
rename from sql/updates/11716_01_characters_auction.sql
rename to sql/updates/0.17/11716_01_characters_auction.sql
diff --git a/sql/updates/11716_02_characters_characters.sql b/sql/updates/0.17/11716_02_characters_characters.sql
similarity index 100%
rename from sql/updates/11716_02_characters_characters.sql
rename to sql/updates/0.17/11716_02_characters_characters.sql
diff --git a/sql/updates/11716_03_characters_character_equipmentsets.sql b/sql/updates/0.17/11716_03_characters_character_equipmentsets.sql
similarity index 100%
rename from sql/updates/11716_03_characters_character_equipmentsets.sql
rename to sql/updates/0.17/11716_03_characters_character_equipmentsets.sql
diff --git a/sql/updates/11716_04_characters_creature_respawn.sql b/sql/updates/0.17/11716_04_characters_creature_respawn.sql
similarity index 100%
rename from sql/updates/11716_04_characters_creature_respawn.sql
rename to sql/updates/0.17/11716_04_characters_creature_respawn.sql
diff --git a/sql/updates/11716_05_characters_gameobject_respawn.sql b/sql/updates/0.17/11716_05_characters_gameobject_respawn.sql
similarity index 100%
rename from sql/updates/11716_05_characters_gameobject_respawn.sql
rename to sql/updates/0.17/11716_05_characters_gameobject_respawn.sql
diff --git a/sql/updates/11716_06_characters_guild.sql b/sql/updates/0.17/11716_06_characters_guild.sql
similarity index 100%
rename from sql/updates/11716_06_characters_guild.sql
rename to sql/updates/0.17/11716_06_characters_guild.sql
diff --git a/sql/updates/11716_07_characters_guild_eventlog.sql b/sql/updates/0.17/11716_07_characters_guild_eventlog.sql
similarity index 100%
rename from sql/updates/11716_07_characters_guild_eventlog.sql
rename to sql/updates/0.17/11716_07_characters_guild_eventlog.sql
diff --git a/sql/updates/11716_08_characters_instance.sql b/sql/updates/0.17/11716_08_characters_instance.sql
similarity index 100%
rename from sql/updates/11716_08_characters_instance.sql
rename to sql/updates/0.17/11716_08_characters_instance.sql
diff --git a/sql/updates/11716_09_characters_instance_reset.sql b/sql/updates/0.17/11716_09_characters_instance_reset.sql
similarity index 100%
rename from sql/updates/11716_09_characters_instance_reset.sql
rename to sql/updates/0.17/11716_09_characters_instance_reset.sql
diff --git a/sql/updates/11716_10_characters_mail.sql b/sql/updates/0.17/11716_10_characters_mail.sql
similarity index 100%
rename from sql/updates/11716_10_characters_mail.sql
rename to sql/updates/0.17/11716_10_characters_mail.sql
diff --git a/sql/updates/11717_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11717_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11717_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11717_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11731_01_mangos_command.sql b/sql/updates/0.17/11731_01_mangos_command.sql
similarity index 100%
rename from sql/updates/11731_01_mangos_command.sql
rename to sql/updates/0.17/11731_01_mangos_command.sql
diff --git a/sql/updates/11731_02_mangos_mangos_string.sql b/sql/updates/0.17/11731_02_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11731_02_mangos_mangos_string.sql
rename to sql/updates/0.17/11731_02_mangos_mangos_string.sql
diff --git a/sql/updates/11733_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11733_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11733_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11733_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11754_01_mangos_mangos_string.sql b/sql/updates/0.17/11754_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11754_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11754_01_mangos_mangos_string.sql
diff --git a/sql/updates/11755_01_mangos.sql b/sql/updates/0.17/11755_01_mangos.sql
similarity index 100%
rename from sql/updates/11755_01_mangos.sql
rename to sql/updates/0.17/11755_01_mangos.sql
diff --git a/sql/updates/11763_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11763_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11763_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11763_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11764_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11764_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11764_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11764_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11766_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11766_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11766_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11766_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11768_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11768_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11768_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11768_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11773_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11773_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11773_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11773_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11773_02_mangos_spell_chain.sql b/sql/updates/0.17/11773_02_mangos_spell_chain.sql
similarity index 100%
rename from sql/updates/11773_02_mangos_spell_chain.sql
rename to sql/updates/0.17/11773_02_mangos_spell_chain.sql
diff --git a/sql/updates/11774_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11774_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11774_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11774_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11785_01_mangos_instance_encounters.sql b/sql/updates/0.17/11785_01_mangos_instance_encounters.sql
similarity index 100%
rename from sql/updates/11785_01_mangos_instance_encounters.sql
rename to sql/updates/0.17/11785_01_mangos_instance_encounters.sql
diff --git a/sql/updates/11785_02_characters_instance.sql b/sql/updates/0.17/11785_02_characters_instance.sql
similarity index 100%
rename from sql/updates/11785_02_characters_instance.sql
rename to sql/updates/0.17/11785_02_characters_instance.sql
diff --git a/sql/updates/11807_01_mangos_gameobject_addon.sql b/sql/updates/0.17/11807_01_mangos_gameobject_addon.sql
similarity index 100%
rename from sql/updates/11807_01_mangos_gameobject_addon.sql
rename to sql/updates/0.17/11807_01_mangos_gameobject_addon.sql
diff --git a/sql/updates/11813_01_mangos_mangos_string.sql b/sql/updates/0.17/11813_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11813_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11813_01_mangos_mangos_string.sql
diff --git a/sql/updates/11827_01_mangos_creature_linking_template.sql b/sql/updates/0.17/11827_01_mangos_creature_linking_template.sql
similarity index 100%
rename from sql/updates/11827_01_mangos_creature_linking_template.sql
rename to sql/updates/0.17/11827_01_mangos_creature_linking_template.sql
diff --git a/sql/updates/11831_01_mangos_mangos_string.sql b/sql/updates/0.17/11831_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11831_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11831_01_mangos_mangos_string.sql
diff --git a/sql/updates/11831_02_mangos_command.sql b/sql/updates/0.17/11831_02_mangos_command.sql
similarity index 100%
rename from sql/updates/11831_02_mangos_command.sql
rename to sql/updates/0.17/11831_02_mangos_command.sql
diff --git a/sql/updates/11851_01_mangos_string.sql b/sql/updates/0.17/11851_01_mangos_string.sql
similarity index 100%
rename from sql/updates/11851_01_mangos_string.sql
rename to sql/updates/0.17/11851_01_mangos_string.sql
diff --git a/sql/updates/11852_01_mangos_gossip_menu.sql b/sql/updates/0.17/11852_01_mangos_gossip_menu.sql
similarity index 100%
rename from sql/updates/11852_01_mangos_gossip_menu.sql
rename to sql/updates/0.17/11852_01_mangos_gossip_menu.sql
diff --git a/sql/updates/11876_01_mangos_creature_linking_template.sql b/sql/updates/0.17/11876_01_mangos_creature_linking_template.sql
similarity index 100%
rename from sql/updates/11876_01_mangos_creature_linking_template.sql
rename to sql/updates/0.17/11876_01_mangos_creature_linking_template.sql
diff --git a/sql/updates/11885_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11885_01_mangos_spell_proc_event.sql
similarity index 100%
rename from sql/updates/11885_01_mangos_spell_proc_event.sql
rename to sql/updates/0.17/11885_01_mangos_spell_proc_event.sql
diff --git a/sql/updates/11926_01_mangos_creature_template.sql b/sql/updates/0.17/11926_01_mangos_creature_template.sql
similarity index 100%
rename from sql/updates/11926_01_mangos_creature_template.sql
rename to sql/updates/0.17/11926_01_mangos_creature_template.sql
diff --git a/sql/updates/11940_01_mangos_creature_movement_scripts.sql b/sql/updates/0.17/11940_01_mangos_creature_movement_scripts.sql
similarity index 100%
rename from sql/updates/11940_01_mangos_creature_movement_scripts.sql
rename to sql/updates/0.17/11940_01_mangos_creature_movement_scripts.sql
diff --git a/sql/updates/11940_02_mangos_event_scripts.sql b/sql/updates/0.17/11940_02_mangos_event_scripts.sql
similarity index 100%
rename from sql/updates/11940_02_mangos_event_scripts.sql
rename to sql/updates/0.17/11940_02_mangos_event_scripts.sql
diff --git a/sql/updates/11940_03_mangos_gameobject_scripts.sql b/sql/updates/0.17/11940_03_mangos_gameobject_scripts.sql
similarity index 100%
rename from sql/updates/11940_03_mangos_gameobject_scripts.sql
rename to sql/updates/0.17/11940_03_mangos_gameobject_scripts.sql
diff --git a/sql/updates/11940_04_mangos_gossip_scripts.sql b/sql/updates/0.17/11940_04_mangos_gossip_scripts.sql
similarity index 100%
rename from sql/updates/11940_04_mangos_gossip_scripts.sql
rename to sql/updates/0.17/11940_04_mangos_gossip_scripts.sql
diff --git a/sql/updates/11940_05_mangos_quest_end_scripts.sql b/sql/updates/0.17/11940_05_mangos_quest_end_scripts.sql
similarity index 100%
rename from sql/updates/11940_05_mangos_quest_end_scripts.sql
rename to sql/updates/0.17/11940_05_mangos_quest_end_scripts.sql
diff --git a/sql/updates/11940_06_mangos_quest_start_scripts.sql b/sql/updates/0.17/11940_06_mangos_quest_start_scripts.sql
similarity index 100%
rename from sql/updates/11940_06_mangos_quest_start_scripts.sql
rename to sql/updates/0.17/11940_06_mangos_quest_start_scripts.sql
diff --git a/sql/updates/11940_07_mangos_spell_scripts.sql b/sql/updates/0.17/11940_07_mangos_spell_scripts.sql
similarity index 100%
rename from sql/updates/11940_07_mangos_spell_scripts.sql
rename to sql/updates/0.17/11940_07_mangos_spell_scripts.sql
diff --git a/sql/updates/11947_01_mangos_dbscripts.sql b/sql/updates/0.17/11947_01_mangos_dbscripts.sql
similarity index 100%
rename from sql/updates/11947_01_mangos_dbscripts.sql
rename to sql/updates/0.17/11947_01_mangos_dbscripts.sql
diff --git a/sql/updates/11953_01_mangos_playercreateinfo_spell.sql b/sql/updates/0.17/11953_01_mangos_playercreateinfo_spell.sql
similarity index 100%
rename from sql/updates/11953_01_mangos_playercreateinfo_spell.sql
rename to sql/updates/0.17/11953_01_mangos_playercreateinfo_spell.sql
diff --git a/sql/updates/11955_01_mangos_mangos_string.sql b/sql/updates/0.17/11955_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11955_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11955_01_mangos_mangos_string.sql
diff --git a/sql/updates/11955_02_mangos_command.sql b/sql/updates/0.17/11955_02_mangos_command.sql
similarity index 100%
rename from sql/updates/11955_02_mangos_command.sql
rename to sql/updates/0.17/11955_02_mangos_command.sql
diff --git a/sql/updates/11958_01_mangos_mangos_string.sql b/sql/updates/0.17/11958_01_mangos_mangos_string.sql
similarity index 100%
rename from sql/updates/11958_01_mangos_mangos_string.sql
rename to sql/updates/0.17/11958_01_mangos_mangos_string.sql
diff --git a/sql/updates/11964_01_mangos_conditions.sql b/sql/updates/0.17/11964_01_mangos_conditions.sql
similarity index 100%
rename from sql/updates/11964_01_mangos_conditions.sql
rename to sql/updates/0.17/11964_01_mangos_conditions.sql
diff --git a/sql/updates/11968_01_mangos_creature_linking_template.sql b/sql/updates/0.17/11968_01_mangos_creature_linking_template.sql
similarity index 100%
rename from sql/updates/11968_01_mangos_creature_linking_template.sql
rename to sql/updates/0.17/11968_01_mangos_creature_linking_template.sql
diff --git a/sql/updates/11985_01_mangos_gameobject_template_scripts.sql b/sql/updates/0.17/11985_01_mangos_gameobject_template_scripts.sql
similarity index 100%
rename from sql/updates/11985_01_mangos_gameobject_template_scripts.sql
rename to sql/updates/0.17/11985_01_mangos_gameobject_template_scripts.sql
diff --git a/sql/updates/11994_01_mangos_creature_linking.sql b/sql/updates/0.17/11994_01_mangos_creature_linking.sql
similarity index 100%
rename from sql/updates/11994_01_mangos_creature_linking.sql
rename to sql/updates/0.17/11994_01_mangos_creature_linking.sql
diff --git a/sql/updates/12000_01_mangos_spell_template.sql b/sql/updates/0.17/12000_01_mangos_spell_template.sql
similarity index 100%
rename from sql/updates/12000_01_mangos_spell_template.sql
rename to sql/updates/0.17/12000_01_mangos_spell_template.sql
diff --git a/sql/updates/12012_01_mangos_spell_template.sql b/sql/updates/0.17/12012_01_mangos_spell_template.sql
similarity index 100%
rename from sql/updates/12012_01_mangos_spell_template.sql
rename to sql/updates/0.17/12012_01_mangos_spell_template.sql
diff --git a/sql/updates/0.17/12087_01_mangos_mangos_string.sql b/sql/updates/0.17/12087_01_mangos_mangos_string.sql
new file mode 100644
index 00000000000..410e27adfd7
--- /dev/null
+++ b/sql/updates/0.17/12087_01_mangos_mangos_string.sql
@@ -0,0 +1,12 @@
+ALTER TABLE db_version CHANGE COLUMN required_12012_01_mangos_spell_template required_12087_01_mangos_mangos_string bit;
+
+UPDATE mangos_string SET content_default='This item(s) has problems with equipping/storing to inventory.' WHERE entry=706;
+UPDATE mangos_string SET content_default='Arenas are set to 1v1 for debugging. You cannot join as a group.' WHERE entry=737;
+UPDATE mangos_string SET content_default='Account name cannot be longer than 16 characters (client limit), account not created!' WHERE entry=1005;
+UPDATE mangos_string SET content_default='Can only quit from a Remote Admin console or the quit command was not entered in full (quit).' WHERE entry=1015;
+UPDATE mangos_string SET content_default='ERROR: You can only assign a new name for a single selected character!' WHERE entry=1022;
+UPDATE mangos_string SET content_default='Character \'%s\' (GUID: %u Account %u) can\'t be restored: account doesn\'t exist!' WHERE entry=1023;
+UPDATE mangos_string SET content_default='Character \'%s\' (GUID: %u Account %u) can\'t be restored: name already in use!' WHERE entry=1025;
+UPDATE mangos_string SET content_default='Command can only be called from a Remote Admin console.' WHERE entry=1029;
+UPDATE mangos_string SET content_default='Account %s (Id: %u) has been granted %u expansion rights.' WHERE entry=1100;
+UPDATE mangos_string SET content_default='Cannot add spawn because no free guids for static spawn in reserved guids range. Server restart is required before command can be used. Also look GuidReserveSize.* config options.' WHERE entry=1503;
diff --git a/sql/updates/0.17/12087_02_mangos_command.sql b/sql/updates/0.17/12087_02_mangos_command.sql
new file mode 100644
index 00000000000..3b5e075cab2
--- /dev/null
+++ b/sql/updates/0.17/12087_02_mangos_command.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12087_01_mangos_mangos_string required_12087_02_mangos_command bit;
+
+UPDATE command SET help='Syntax: .honor addkill\r\n\r\nAdd the targeted unit as one of your pvp kills today (you only get honor if it\'s a racial leader or a player)' WHERE name LIKE 'honor addkill';
diff --git a/sql/updates/0.17/12091_01_mangos_spell_template.sql b/sql/updates/0.17/12091_01_mangos_spell_template.sql
new file mode 100644
index 00000000000..6570ce1f32c
--- /dev/null
+++ b/sql/updates/0.17/12091_01_mangos_spell_template.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_12087_02_mangos_command required_12091_01_mangos_spell_template bit;
+
+DELETE FROM spell_template WHERE id IN (26133);
+INSERT INTO spell_template VALUES
+(26133, 0x00000000, 101,  21,  76,  18,   0,   0, 180795, 0,     'Summon Sandworm Base');
diff --git a/sql/updates/0.17/12093_01_mangos_spell_template.sql b/sql/updates/0.17/12093_01_mangos_spell_template.sql
new file mode 100644
index 00000000000..efd32aeb239
--- /dev/null
+++ b/sql/updates/0.17/12093_01_mangos_spell_template.sql
@@ -0,0 +1,12 @@
+ALTER TABLE db_version CHANGE COLUMN required_12091_01_mangos_spell_template required_12093_01_mangos_spell_template bit;
+
+DELETE FROM spell_template WHERE id IN (44920, 44924, 44928, 44932, 45158, 45162, 45166, 45170);
+INSERT INTO spell_template VALUES
+(44920, 0x00000000, 101,  21,   6,   1,   0,  56, 24941,  0,     'Model - Shattered Sun Marksman - BE Male Tier 4'),
+(44924, 0x00000000, 101,  21,   6,   1,   0,  56, 24945,  0,     'Model - Shattered Sun Marksman - BE Female Tier 4'),
+(44928, 0x00000000, 101,  21,   6,   1,   0,  56, 24949,  0,     'Model - Shattered Sun Marksman - Draenei Male Tier 4'),
+(44932, 0x00000000, 101,  21,   6,   1,   0,  56, 24953,  0,     'Model - Shattered Sun Marksman - Draenei Female Tier 4'),
+(45158, 0x00000000, 101,  21,   6,   1,   0,  56, 25119,  0,     'Model - Shattered Sun Warrior - BE Female Tier 4'),
+(45162, 0x00000000, 101,  21,   6,   1,   0,  56, 25123,  0,     'Model - Shattered Sun Warrior - BE Male Tier 4'),
+(45166, 0x00000000, 101,  21,   6,   1,   0,  56, 25127,  0,     'Model - Shattered Sun Warrior - Draenei Female Tier 4'),
+(45170, 0x00000000, 101,  21,   6,   1,   0,  56, 25131,  0,     'Model - Shattered Sun Warrior - Draenei Male Tier 4');
diff --git a/sql/updates/0.17/12094_01_mangos_creature_template.sql b/sql/updates/0.17/12094_01_mangos_creature_template.sql
new file mode 100644
index 00000000000..542fe6e7c47
--- /dev/null
+++ b/sql/updates/0.17/12094_01_mangos_creature_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12093_01_mangos_spell_template required_12094_01_mangos_creature_template bit;
+
+UPDATE creature_template SET flags_extra=flags_extra|0x800;
diff --git a/sql/updates/0.17/12097_01_mangos_mangos_string.sql b/sql/updates/0.17/12097_01_mangos_mangos_string.sql
new file mode 100644
index 00000000000..31eed322717
--- /dev/null
+++ b/sql/updates/0.17/12097_01_mangos_mangos_string.sql
@@ -0,0 +1,42 @@
+ALTER TABLE db_version CHANGE COLUMN required_12094_01_mangos_creature_template required_12097_01_mangos_mangos_string bit;
+
+DELETE FROM mangos_string WHERE entry BETWEEN 1600 AND 1636;
+
+INSERT INTO mangos_string VALUES
+(1600,'|cffffff00Northpass Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1601,'|cffffff00Northpass Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1602,'|cffffff00Crown Guard Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1603,'|cffffff00Crown Guard Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1604,'|cffffff00Eastwall Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1605,'|cffffff00Eastwall Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1606,'|cffffff00The Plaguewood Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1607,'|cffffff00The Plaguewood Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1608,'|cffffff00The Overlook has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1609,'|cffffff00The Overlook has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1610,'|cffffff00The Stadium has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1611,'|cffffff00The Stadium has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1612,'|cffffff00Broken Hill has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1613,'|cffffff00Broken Hill has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1614,'|cffffff00The Horde has taken control of the East Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1615,'|cffffff00The Alliance has taken control of the East Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1616,'|cffffff00The Horde has taken control of the West Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1617,'|cffffff00The Alliance has taken control of the West Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1618,'|cffffff00The Horde has taken control of both beacons!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1619,'|cffffff00The Alliance has taken control of both beacons!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1620,'|cffffff00The Horde Field Scout is now issuing battle standards.|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1621,'|cffffff00The Alliance Field Scout is now issuing battle standards.|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1622,'|cffffff00The Horde has taken control of Twin Spire Ruins!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1623,'|cffffff00The Alliance has taken control of Twin Spire Ruins!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1624,'|cffffff00The Horde has taken control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1625,'|cffffff00The Alliance has taken control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1626,'|cffffff00The Horde has lost control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1627,'|cffffff00The Alliance has lost control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1628,'|cffffff00The Horde has taken control of The Bone Wastes!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1629,'|cffffff00The Alliance has taken control of The Bone Wastes!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1630,'|cffffff00The Horde is gaining control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1631,'|cffffff00The Alliance is gaining control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1632,'|cffffff00The Horde has taken control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1633,'|cffffff00The Alliance has taken control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1634,'|cffffff00Halaa is defenseless!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1635,'|cffffff00The Horde has collected 200 silithyst!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1636,'|cffffff00The Alliance has collected 200 silithyst!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/0.17/12112_01_mangos_spell_template.sql b/sql/updates/0.17/12112_01_mangos_spell_template.sql
new file mode 100644
index 00000000000..86aabf0478b
--- /dev/null
+++ b/sql/updates/0.17/12112_01_mangos_spell_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12097_01_mangos_mangos_string required_12112_01_mangos_spell_template bit;
+
+ALTER TABLE spell_template ADD COLUMN effect0_misc_value_b int(11) unsigned NOT NULL DEFAULT '0' AFTER effect0_misc_value;
diff --git a/sql/updates/0.17/12113_01_mangos_spell_template.sql b/sql/updates/0.17/12113_01_mangos_spell_template.sql
new file mode 100644
index 00000000000..6b9d622e8e6
--- /dev/null
+++ b/sql/updates/0.17/12113_01_mangos_spell_template.sql
@@ -0,0 +1,12 @@
+ALTER TABLE db_version CHANGE COLUMN required_12112_01_mangos_spell_template required_12113_01_mangos_spell_template bit;
+
+DELETE FROM spell_template WHERE id IN (34810, 34817, 34818, 34819, 35153, 35904, 35905, 35906);
+INSERT INTO spell_template VALUES
+(34810, 0x00000000, 101,  21,  28,  42,   8,   0, 20083,  64,    0,     'Summon Summoned Bloodwarder Mender behind of the caster'),
+(34817, 0x00000000, 101,  21,  28,  44,   8,   0, 20078,  64,    0,     'Summon Summoned Bloodwarder Reservist right of the caster'),
+(34818, 0x00000000, 101,  21,  28,  43,   8,   0, 20078,  64,    0,     'Summon Summoned Bloodwarder Reservist left of the caster'),
+(34819, 0x00000000, 101,  21,  28,  41,   8,   0, 20078,  64,    0,     'Summon Summoned Bloodwarder Reservist front of the caster'),
+(35153, 0x00000000, 101,  21,  28,  42,   8,   0, 20405,  64,    0,     'Summon Nether Charge behind of the caster'),
+(35904, 0x00000000, 101,  21,  28,  44,   8,   0, 20405,  64,    0,     'Summon Nether Charge right of the caster'),
+(35905, 0x00000000, 101,  21,  28,  43,   8,   0, 20405,  64,    0,     'Summon Nether Charge left of the caster'),
+(35906, 0x00000000, 101,  21,  28,  41,   8,   0, 20405,  64,    0,     'Summon Nether Charge front of the caster');
diff --git a/sql/updates/0.17/12148_01_mangos_areatrigger_teleport.sql b/sql/updates/0.17/12148_01_mangos_areatrigger_teleport.sql
new file mode 100644
index 00000000000..733cf2cd999
--- /dev/null
+++ b/sql/updates/0.17/12148_01_mangos_areatrigger_teleport.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12113_01_mangos_spell_template required_12148_01_mangos_areatrigger_teleport bit;
+
+ALTER TABLE areatrigger_teleport DROP COLUMN required_failed_text;
diff --git a/sql/updates/0.17/12148_02_mangos_mangos_string.sql b/sql/updates/0.17/12148_02_mangos_mangos_string.sql
new file mode 100644
index 00000000000..120e16ba24f
--- /dev/null
+++ b/sql/updates/0.17/12148_02_mangos_mangos_string.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_12148_01_mangos_areatrigger_teleport required_12148_02_mangos_mangos_string bit;
+
+DELETE FROM mangos_string WHERE entry=818;
+INSERT INTO mangos_string VALUES
+(818,'You can\'t enter Black Morass until you rescue Thrall from Durnholde Keep.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/0.17/12188_01_mangos_vehicle_accessory.sql b/sql/updates/0.17/12188_01_mangos_vehicle_accessory.sql
new file mode 100644
index 00000000000..2ac7b9a4b22
--- /dev/null
+++ b/sql/updates/0.17/12188_01_mangos_vehicle_accessory.sql
@@ -0,0 +1,13 @@
+ALTER TABLE db_version CHANGE COLUMN required_12148_02_mangos_mangos_string required_12188_01_mangos_vehicle_accessory bit;
+
+--
+-- Table structure for table `vehicle_accessory`
+--
+DROP TABLE IF EXISTS vehicle_accessory;
+CREATE TABLE `vehicle_accessory` (
+  `vehicle_entry` int(10) UNSIGNED NOT NULL COMMENT 'entry of the npc who has some accessory as vehicle',
+  `seat` mediumint(8) UNSIGNED NOT NULL COMMENT 'onto which seat shall the passenger be boarded',
+  `accessory_entry` int(10) UNSIGNED NOT NULL COMMENT 'entry of the passenger that is to be boarded',
+  `comment` varchar(255) NOT NULL,
+  PRIMARY KEY  (`vehicle_entry`, `seat`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Vehicle Accessory (passengers that are auto-boarded onto a vehicle)';
diff --git a/sql/updates/0.17/12189_01_mangos_creature_template_spells.sql b/sql/updates/0.17/12189_01_mangos_creature_template_spells.sql
new file mode 100644
index 00000000000..7b49081d2e6
--- /dev/null
+++ b/sql/updates/0.17/12189_01_mangos_creature_template_spells.sql
@@ -0,0 +1,23 @@
+ALTER TABLE db_version CHANGE COLUMN required_12188_01_mangos_vehicle_accessory required_12189_01_mangos_creature_template_spells bit;
+
+--
+-- Table structure for table `creature_template_spells`
+--
+DROP TABLE IF EXISTS `creature_template_spells`;
+CREATE TABLE `creature_template_spells` (
+  `entry` mediumint(8) unsigned NOT NULL,
+  `spell1` mediumint(8) unsigned NOT NULL,
+  `spell2` mediumint(8) unsigned NOT NULL default '0',
+  `spell3` mediumint(8) unsigned NOT NULL default '0',
+  `spell4` mediumint(8) unsigned NOT NULL default '0',
+  `spell5` mediumint(8) unsigned NOT NULL default '0',
+  `spell6` mediumint(8) unsigned NOT NULL default '0',
+  `spell7` mediumint(8) unsigned NOT NULL default '0',
+  `spell8` mediumint(8) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Creature System (Spells used by creature)';
+
+--
+-- Dumping data for table `creature_template_spells`
+--
+INSERT INTO creature_template_spells (entry, spell1, spell2, spell3, spell4) SELECT entry, spell1, spell2, spell3, spell4 FROM creature_template WHERE spell1!=0;
diff --git a/sql/updates/0.17/12233_01_mangos_mangos_string.sql b/sql/updates/0.17/12233_01_mangos_mangos_string.sql
new file mode 100644
index 00000000000..ea3ba44b3cb
--- /dev/null
+++ b/sql/updates/0.17/12233_01_mangos_mangos_string.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_12189_01_mangos_creature_template_spells required_12233_01_mangos_mangos_string bit;
+
+DELETE FROM `mangos_string` WHERE `entry`=175;
+INSERT INTO `mangos_string` (`entry`,`content_default`) VALUES
+(175, 'Liquid level: %f, ground: %f, type flags %u, status: %d.');
diff --git a/sql/updates/0.17/12235_01_mangos_mangos_string.sql b/sql/updates/0.17/12235_01_mangos_mangos_string.sql
new file mode 100644
index 00000000000..abc2f62d16e
--- /dev/null
+++ b/sql/updates/0.17/12235_01_mangos_mangos_string.sql
@@ -0,0 +1,9 @@
+ALTER TABLE db_version CHANGE COLUMN required_12233_01_mangos_mangos_string required_12235_01_mangos_mangos_string bit;
+
+DELETE FROM `mangos_string` WHERE `entry`=175;
+INSERT INTO `mangos_string` (`entry`,`content_default`) VALUES
+(175, 'Liquid level: %f, ground: %f, type flags: %u, status: %d.');
+
+INSERT INTO `mangos_string` VALUES
+(1194,'Current State Information: GOState %u, LootState %u. Collision %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1195,'Current State Information: GOState %u, LootState %u. Collision %s, (door %s by default)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/0.17/12258_01_mangos_mangos_string.sql b/sql/updates/0.17/12258_01_mangos_mangos_string.sql
new file mode 100644
index 00000000000..7696170f6e8
--- /dev/null
+++ b/sql/updates/0.17/12258_01_mangos_mangos_string.sql
@@ -0,0 +1,4 @@
+ALTER TABLE db_version CHANGE COLUMN required_12235_01_mangos_mangos_string required_12258_01_mangos_mangos_string bit;
+
+INSERT INTO mangos_string VALUES
+(1509,'Pool %u not found (Maximal pool entry is %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/0.17/12268_01_mangos_dbscripts.sql b/sql/updates/0.17/12268_01_mangos_dbscripts.sql
new file mode 100644
index 00000000000..3fcdbd63bbd
--- /dev/null
+++ b/sql/updates/0.17/12268_01_mangos_dbscripts.sql
@@ -0,0 +1,22 @@
+ALTER TABLE db_version CHANGE COLUMN required_12258_01_mangos_mangos_string required_12268_01_mangos_dbscripts bit;
+
+DROP TABLE IF EXISTS dbscripts_on_creature_movement;
+RENAME TABLE creature_movement_scripts TO dbscripts_on_creature_movement;
+DROP TABLE IF EXISTS dbscripts_on_event;
+RENAME TABLE event_scripts TO dbscripts_on_event;
+DROP TABLE IF EXISTS dbscripts_on_go_use;
+RENAME TABLE gameobject_scripts TO dbscripts_on_go_use;
+DROP TABLE IF EXISTS dbscripts_on_go_template_use;
+RENAME TABLE gameobject_template_scripts TO dbscripts_on_go_template_use;
+DROP TABLE IF EXISTS dbscripts_on_gossip;
+RENAME TABLE gossip_scripts TO dbscripts_on_gossip;
+DROP TABLE IF EXISTS dbscripts_on_quest_end;
+RENAME TABLE quest_end_scripts TO dbscripts_on_quest_end;
+DROP TABLE IF EXISTS dbscripts_on_quest_start;
+RENAME TABLE quest_start_scripts TO dbscripts_on_quest_start;
+DROP TABLE IF EXISTS dbscripts_on_spell;
+RENAME TABLE spell_scripts TO dbscripts_on_spell;
+
+DELETE FROM command WHERE name LIKE 'reload all_scripts';
+INSERT INTO command VALUES
+('reload all_scripts',3,'Syntax: .reload all_scripts\r\n\r\nReload `dbscripts_on_*` tables.');
diff --git a/sql/updates/0.17/12269_01_mangos_creature_loot_template.sql b/sql/updates/0.17/12269_01_mangos_creature_loot_template.sql
new file mode 100644
index 00000000000..ace55ac33e5
--- /dev/null
+++ b/sql/updates/0.17/12269_01_mangos_creature_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12268_01_mangos_dbscripts required_12269_01_mangos_creature_loot_template bit;
+
+ALTER TABLE creature_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_02_mangos_gameobject_loot_template.sql b/sql/updates/0.17/12269_02_mangos_gameobject_loot_template.sql
new file mode 100644
index 00000000000..c642d0e814d
--- /dev/null
+++ b/sql/updates/0.17/12269_02_mangos_gameobject_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_01_mangos_creature_loot_template required_12269_02_mangos_gameobject_loot_template bit;
+
+ALTER TABLE gameobject_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_03_mangos_fishing_loot_template.sql b/sql/updates/0.17/12269_03_mangos_fishing_loot_template.sql
new file mode 100644
index 00000000000..62d20472738
--- /dev/null
+++ b/sql/updates/0.17/12269_03_mangos_fishing_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_02_mangos_gameobject_loot_template required_12269_03_mangos_fishing_loot_template bit;
+
+ALTER TABLE fishing_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_04_mangos_reference_loot_template.sql b/sql/updates/0.17/12269_04_mangos_reference_loot_template.sql
new file mode 100644
index 00000000000..3dcf2cf3ec0
--- /dev/null
+++ b/sql/updates/0.17/12269_04_mangos_reference_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_03_mangos_fishing_loot_template required_12269_04_mangos_reference_loot_template bit;
+
+ALTER TABLE reference_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_05_mangos_skinning_loot_template.sql b/sql/updates/0.17/12269_05_mangos_skinning_loot_template.sql
new file mode 100644
index 00000000000..9603c0f1d1b
--- /dev/null
+++ b/sql/updates/0.17/12269_05_mangos_skinning_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_04_mangos_reference_loot_template required_12269_05_mangos_skinning_loot_template bit;
+
+ALTER TABLE skinning_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_06_mangos_item_loot_template.sql b/sql/updates/0.17/12269_06_mangos_item_loot_template.sql
new file mode 100644
index 00000000000..9e2cbc96c8f
--- /dev/null
+++ b/sql/updates/0.17/12269_06_mangos_item_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_05_mangos_skinning_loot_template required_12269_06_mangos_item_loot_template bit;
+
+ALTER TABLE item_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_07_mangos_disenchant_loot_template.sql b/sql/updates/0.17/12269_07_mangos_disenchant_loot_template.sql
new file mode 100644
index 00000000000..a66e9b734b5
--- /dev/null
+++ b/sql/updates/0.17/12269_07_mangos_disenchant_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_06_mangos_item_loot_template required_12269_07_mangos_disenchant_loot_template bit;
+
+ALTER TABLE disenchant_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_08_mangos_milling_loot_template.sql b/sql/updates/0.17/12269_08_mangos_milling_loot_template.sql
new file mode 100644
index 00000000000..7e7060909b4
--- /dev/null
+++ b/sql/updates/0.17/12269_08_mangos_milling_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_07_mangos_disenchant_loot_template required_12269_08_mangos_milling_loot_template bit;
+
+ALTER TABLE milling_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_09_mangos_spell_loot_template.sql b/sql/updates/0.17/12269_09_mangos_spell_loot_template.sql
new file mode 100644
index 00000000000..828bd058bf1
--- /dev/null
+++ b/sql/updates/0.17/12269_09_mangos_spell_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_08_mangos_milling_loot_template required_12269_09_mangos_spell_loot_template bit;
+
+ALTER TABLE spell_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_10_mangos_prospecting_loot_template.sql b/sql/updates/0.17/12269_10_mangos_prospecting_loot_template.sql
new file mode 100644
index 00000000000..f91675fff96
--- /dev/null
+++ b/sql/updates/0.17/12269_10_mangos_prospecting_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_09_mangos_spell_loot_template required_12269_10_mangos_prospecting_loot_template bit;
+
+ALTER TABLE prospecting_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_11_mangos_mail_loot_template.sql b/sql/updates/0.17/12269_11_mangos_mail_loot_template.sql
new file mode 100644
index 00000000000..cd80e2d0c05
--- /dev/null
+++ b/sql/updates/0.17/12269_11_mangos_mail_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_10_mangos_prospecting_loot_template required_12269_11_mangos_mail_loot_template bit;
+
+ALTER TABLE pickpocketing_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_12_mangos_pickpocketing_loot_template.sql b/sql/updates/0.17/12269_12_mangos_pickpocketing_loot_template.sql
new file mode 100644
index 00000000000..08f76029fa0
--- /dev/null
+++ b/sql/updates/0.17/12269_12_mangos_pickpocketing_loot_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_11_mangos_mail_loot_template required_12269_12_mangos_pickpocketing_loot_template bit;
+
+ALTER TABLE mail_loot_template DROP COLUMN lootcondition, DROP COLUMN condition_value1, DROP COLUMN condition_value2;
diff --git a/sql/updates/0.17/12269_13_mangos_gossip_menu.sql b/sql/updates/0.17/12269_13_mangos_gossip_menu.sql
new file mode 100644
index 00000000000..5508d0a75e7
--- /dev/null
+++ b/sql/updates/0.17/12269_13_mangos_gossip_menu.sql
@@ -0,0 +1,4 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_12_mangos_pickpocketing_loot_template required_12269_13_mangos_gossip_menu bit;
+
+ALTER TABLE gossip_menu DROP COLUMN cond_2_val_2, DROP COLUMN cond_2_val_1, DROP COLUMN cond_2,
+                        DROP COLUMN cond_1_val_2, DROP COLUMN cond_1_val_1, DROP COLUMN cond_1;
diff --git a/sql/updates/0.17/12269_14_mangos_gossip_menu_option.sql b/sql/updates/0.17/12269_14_mangos_gossip_menu_option.sql
new file mode 100644
index 00000000000..89e676dad61
--- /dev/null
+++ b/sql/updates/0.17/12269_14_mangos_gossip_menu_option.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_13_mangos_gossip_menu required_12269_14_mangos_gossip_menu_option bit;
+
+ALTER TABLE gossip_menu_option DROP COLUMN cond_3_val_2, DROP COLUMN cond_3_val_1, DROP COLUMN cond_3,
+                               DROP COLUMN cond_2_val_2, DROP COLUMN cond_2_val_1, DROP COLUMN cond_2,
+                               DROP COLUMN cond_1_val_2, DROP COLUMN cond_1_val_1, DROP COLUMN cond_1;
diff --git a/sql/updates/12278_01_mangos_creature_template.sql b/sql/updates/12278_01_mangos_creature_template.sql
new file mode 100644
index 00000000000..172c65cedb5
--- /dev/null
+++ b/sql/updates/12278_01_mangos_creature_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12269_14_mangos_gossip_menu_option required_12278_01_mangos_creature_template bit;
+
+ALTER TABLE creature_template DROP COLUMN spell1, DROP COLUMN spell2, DROP COLUMN spell3, DROP COLUMN spell4;
diff --git a/sql/updates/12279_01_mangos_creature_template.sql b/sql/updates/12279_01_mangos_creature_template.sql
new file mode 100644
index 00000000000..0cf776476d3
--- /dev/null
+++ b/sql/updates/12279_01_mangos_creature_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12278_01_mangos_creature_template required_12279_01_mangos_creature_template bit;
+
+UPDATE creature_template SET flags_extra=flags_extra & ~0x800;
diff --git a/sql/updates/12344_01_mangos_command.sql b/sql/updates/12344_01_mangos_command.sql
new file mode 100644
index 00000000000..47136c7877f
--- /dev/null
+++ b/sql/updates/12344_01_mangos_command.sql
@@ -0,0 +1,4 @@
+ALTER TABLE db_version CHANGE COLUMN required_12279_01_mangos_creature_template required_12344_01_mangos_command bit;
+
+INSERT INTO `command` VALUES ('wp show', '2', 'Syntax: .wp show [#creature_guid or Select a Creature]\r\nwhere command can have one of the following values\r\non (to show all related wp)\r\nfirst (to see only first one)\r\nlast (to see only last one)\r\noff (to hide all related wp)\r\ninfo (to get more info about theses wp)\r\n\r\nFor using info you have to do first show on and than select a Visual-Waypoint and do the show info!')
+ON DUPLICATE KEY UPDATE help=VALUES(help);
\ No newline at end of file
diff --git a/sql/updates/12349_01_mangos_dbscripts_on_creature_death.sql b/sql/updates/12349_01_mangos_dbscripts_on_creature_death.sql
new file mode 100644
index 00000000000..9fce8d9cb8e
--- /dev/null
+++ b/sql/updates/12349_01_mangos_dbscripts_on_creature_death.sql
@@ -0,0 +1,27 @@
+ALTER TABLE db_version CHANGE COLUMN required_12344_01_mangos_command required_12349_01_mangos_dbscripts_on_creature_death bit;
+
+
+--
+-- Table structure for table `dbscripts_on_creature_death`
+--
+
+DROP TABLE IF EXISTS `dbscripts_on_creature_death`;
+CREATE TABLE `dbscripts_on_creature_death` (
+  `id` mediumint(8) unsigned NOT NULL default '0',
+  `delay` int(10) unsigned NOT NULL default '0',
+  `command` mediumint(8) unsigned NOT NULL default '0',
+  `datalong` mediumint(8) unsigned NOT NULL default '0',
+  `datalong2` int(10) unsigned NOT NULL default '0',
+  `buddy_entry` int(10) unsigned NOT NULL default '0',
+  `search_radius` int(10) unsigned NOT NULL default '0',
+  `data_flags` tinyint(3) unsigned NOT NULL default '0',
+  `dataint` int(11) NOT NULL default '0',
+  `dataint2` int(11) NOT NULL default '0',
+  `dataint3` int(11) NOT NULL default '0',
+  `dataint4` int(11) NOT NULL default '0',
+  `x` float NOT NULL default '0',
+  `y` float NOT NULL default '0',
+  `z` float NOT NULL default '0',
+  `o` float NOT NULL default '0',
+  `comments` varchar(255) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/sql/updates/12357_01_mangos_spell_script_target.sql b/sql/updates/12357_01_mangos_spell_script_target.sql
new file mode 100644
index 00000000000..3ca54d598a9
--- /dev/null
+++ b/sql/updates/12357_01_mangos_spell_script_target.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12349_01_mangos_dbscripts_on_creature_death required_12357_01_mangos_spell_script_target bit;
+
+ALTER TABLE spell_script_target ADD COLUMN `inverseEffectMask` mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `targetEntry`;
diff --git a/sql/updates/12363_01_mangos_npc_vendor.sql b/sql/updates/12363_01_mangos_npc_vendor.sql
new file mode 100644
index 00000000000..d08975d0755
--- /dev/null
+++ b/sql/updates/12363_01_mangos_npc_vendor.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12357_01_mangos_spell_script_target required_12363_01_mangos_npc_vendor bit;
+
+ALTER TABLE npc_vendor ADD COLUMN `condition_id` mediumint(8) unsigned NOT NULL default '0' AFTER ExtendedCost;
diff --git a/sql/updates/12363_02_mangos_npc_vendor_template.sql b/sql/updates/12363_02_mangos_npc_vendor_template.sql
new file mode 100644
index 00000000000..816a6031f7e
--- /dev/null
+++ b/sql/updates/12363_02_mangos_npc_vendor_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12363_01_mangos_npc_vendor required_12363_02_mangos_npc_vendor_template bit;
+
+ALTER TABLE npc_vendor_template ADD COLUMN `condition_id` mediumint(8) unsigned NOT NULL default '0' AFTER ExtendedCost;
diff --git a/sql/updates/12401_01_mangos_spell_template.sql b/sql/updates/12401_01_mangos_spell_template.sql
new file mode 100644
index 00000000000..fd86f8d49e4
--- /dev/null
+++ b/sql/updates/12401_01_mangos_spell_template.sql
@@ -0,0 +1,7 @@
+ALTER TABLE db_version CHANGE COLUMN required_12363_02_mangos_npc_vendor_template required_12401_01_mangos_spell_template bit;
+
+DELETE FROM spell_template WHERE id IN (37264, 37278, 37365);
+INSERT INTO spell_template VALUES
+(37264, 0x00000000, 101,  21,  28,  18,   7,   0, 21729, 64,     0,     'Power Converters: Summon Electromental (from cata)'),
+(37278, 0x00000000, 101,  21,  28,  18,   1,   0, 21737, 64,     0,     'Power Converters: Summon Mini-Electromental (from cata)'),
+(37365, 0x00000000, 101,  21,  28,  18,   1,   0, 21757, 64,     0,     'Power Converters: Summon Big Flavor Electromental (from cata)');
diff --git a/sql/updates/12434_01_mangos_spell_template.sql b/sql/updates/12434_01_mangos_spell_template.sql
new file mode 100644
index 00000000000..0c26c7ce97e
--- /dev/null
+++ b/sql/updates/12434_01_mangos_spell_template.sql
@@ -0,0 +1,25 @@
+ALTER TABLE db_version CHANGE COLUMN required_12401_01_mangos_spell_template required_12434_01_mangos_spell_template bit;
+
+ALTER TABLE spell_template ADD COLUMN attr int(11) unsigned NOT NULL DEFAULT '0' AFTER id;
+ALTER TABLE spell_template ADD COLUMN attr_ex int(11) unsigned NOT NULL DEFAULT '0' AFTER attr;
+ALTER TABLE spell_template ADD COLUMN attr_ex2 int(11) unsigned NOT NULL DEFAULT '0' AFTER attr_ex;
+ALTER TABLE spell_template ADD COLUMN effect0_implicit_target_b int(11) unsigned NOT NULL DEFAULT '0' AFTER effect0_implicit_target_a;
+
+DELETE FROM spell_template WHERE id IN (21387, 23363, 25192, 26133, 37264, 37278, 37365, 58630, 59046, 59450, 64899, 64985, 65074, 65195, 68184, 72845);
+INSERT INTO spell_template VALUES
+(21387, 0x00000140, 0x10000000, 0x00000000, 0x00000028,  15,  21,   6,   1,    0,   0,  42, 0,       0,    21388, 'Melt-Weapon trigger aura related used by Ragnaros'),
+(23363, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 101,  21,  76,  18,    0,   0,   0, 179804,  0,    0,     'Summon Drakonid Corpse Trigger'),
+(25192, 0x00000100, 0x00000000, 0x00000004, 0x00000000, 101,  21,  76,  18,    0,   0,   0, 180619,  0,    0,     'Summon Ossirian Crystal'),
+(26133, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 101,  21,  76,  18,    0,   0,   0, 180795,  0,    0,     'Summon Sandworm Base'),
+(37264, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101,  21,  28,  18,    0,   7,   0, 21729,  64,    0,     'Power Converters: Summon Electromental (from cata)'),
+(37278, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101,  21,  28,  18,    0,   1,   0, 21737,  64,    0,     'Power Converters: Summon Mini-Electromental (from cata)'),
+(37365, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101,  21,  28,  18,    0,   1,   0, 21757,  64,    0,     'Power Converters: Summon Big Flavor Electromental (from cata)'),
+(58630, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Mal\'Ganis'),
+(59046, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Tribunal of Ages'),
+(59450, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - The Four Horsemen'),
+(64899, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Hodir'),
+(64985, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Thorim'),
+(65074, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Freya'),
+(65195, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Assembly of Iron'),
+(68184, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Faction Champions'),
+(72845, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101,  37,   6,  22,    7,  28,   4, 0,       0,    0,     'Achievement check - Pit of Saron - Don\'t Look Up');
diff --git a/sql/updates/12440_01_mangos_spell_area.sql b/sql/updates/12440_01_mangos_spell_area.sql
new file mode 100644
index 00000000000..4ce0eee154c
--- /dev/null
+++ b/sql/updates/12440_01_mangos_spell_area.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12434_01_mangos_spell_template required_12440_01_mangos_spell_area bit;
+
+ALTER TABLE spell_area ADD COLUMN `condition_id` mediumint(8) unsigned NOT NULL default '0' AFTER quest_end;
diff --git a/sql/updates/12441_01_mangos_npc_spellclick_spells.sql b/sql/updates/12441_01_mangos_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..7efffdcc300
--- /dev/null
+++ b/sql/updates/12441_01_mangos_npc_spellclick_spells.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12440_01_mangos_spell_area required_12441_01_mangos_npc_spellclick_spells bit;
+
+ALTER TABLE npc_spellclick_spells ADD COLUMN `condition_id` mediumint(8) unsigned NOT NULL default '0' AFTER cast_flags;
diff --git a/sql/updates/12465_01_mangos_spell_template.sql b/sql/updates/12465_01_mangos_spell_template.sql
new file mode 100644
index 00000000000..aa2aea01fd4
--- /dev/null
+++ b/sql/updates/12465_01_mangos_spell_template.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_12441_01_mangos_npc_spellclick_spells required_12465_01_mangos_spell_template bit;
+
+DELETE FROM spell_template WHERE id=50574;
+INSERT INTO spell_template (id, attr, attr_ex, attr_ex2, proc_flags, proc_chance, duration_index, effect0, effect0_implicit_target_a, effect0_implicit_target_b, effect0_radius_idx, effect0_apply_aura_name, effect0_misc_value, effect0_misc_value_b, effect0_trigger_spell, comments) VALUES
+(50574, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 101, 0, 90, 25, 0, 11, 0, 28042, 0, 0, 'Captain Brandon Kill Credit');
diff --git a/sql/updates/12487_01_characters_characters.sql b/sql/updates/12487_01_characters_characters.sql
new file mode 100644
index 00000000000..e4e51de3239
--- /dev/null
+++ b/sql/updates/12487_01_characters_characters.sql
@@ -0,0 +1,5 @@
+ALTER TABLE character_db_version CHANGE COLUMN required_11785_02_characters_instance required_12487_01_characters_characters bit;
+
+UPDATE characters SET drunk = (drunk / 256) & 0xFF;
+
+ALTER TABLE characters CHANGE drunk drunk tinyint(3) unsigned NOT NULL DEFAULT '0';
diff --git a/sql/updates/12505_01_mangos_spell_template.sql b/sql/updates/12505_01_mangos_spell_template.sql
new file mode 100644
index 00000000000..5bd7bd970ab
--- /dev/null
+++ b/sql/updates/12505_01_mangos_spell_template.sql
@@ -0,0 +1,7 @@
+ALTER TABLE db_version CHANGE COLUMN required_12465_01_mangos_spell_template required_12505_01_mangos_spell_template bit;
+
+ALTER TABLE spell_template ADD COLUMN attr_ex3 int(11) unsigned NOT NULL DEFAULT '0' AFTER attr_ex2;
+
+DELETE FROM spell_template WHERE id=23770;
+INSERT INTO spell_template VALUES
+(23770, 0x24800100, 0x10000088, 0x00000001, 0x00100000, 0x00000000, 101, 367,   6, 25,     0,   0,   4, 0,       0,    0,     'Sayge''s timer - Darkmoon Faire');
diff --git a/sql/updates/12507_01_mangos_spell_proc_event.sql b/sql/updates/12507_01_mangos_spell_proc_event.sql
new file mode 100644
index 00000000000..457b9445fea
--- /dev/null
+++ b/sql/updates/12507_01_mangos_spell_proc_event.sql
@@ -0,0 +1,6 @@
+ALTER TABLE db_version CHANGE COLUMN required_12505_01_mangos_spell_template required_12507_01_mangos_spell_proc_event bit;
+
+DELETE FROM spell_proc_event WHERE entry IN (67712, 67758);
+INSERT INTO spell_proc_event VALUES
+(67712, 0x7F,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 2),
+(67758, 0x7F,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 2);
diff --git a/sql/updates/12522_01_mangos_db_script_string.sql b/sql/updates/12522_01_mangos_db_script_string.sql
new file mode 100644
index 00000000000..94681830432
--- /dev/null
+++ b/sql/updates/12522_01_mangos_db_script_string.sql
@@ -0,0 +1,185 @@
+ALTER TABLE db_version CHANGE COLUMN required_12507_01_mangos_spell_proc_event required_12522_01_mangos_db_script_string bit;
+
+ALTER TABLE db_script_string ADD COLUMN sound mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER content_loc8;
+ALTER TABLE db_script_string ADD COLUMN type tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER sound;
+ALTER TABLE db_script_string ADD COLUMN language tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER type;
+ALTER TABLE db_script_string ADD COLUMN emote smallint(5) unsigned NOT NULL DEFAULT '0' AFTER language;
+ALTER TABLE db_script_string ADD COLUMN comment text AFTER emote;
+
+-- Update Dbscript_string with the type and language from Dbscripts_on_*
+CREATE TEMPORARY TABLE IF NOT EXISTS db_script_temp AS
+-- dbscripts_on_creature_death
+SELECT A.entry
+    ,A.content_default
+    ,A.content_loc1
+    ,A.content_loc2
+    ,A.content_loc3
+    ,A.content_loc4
+    ,A.content_loc5
+    ,A.content_loc6
+    ,A.content_loc7
+    ,A.content_loc8
+    ,0 AS sound
+    ,B.datalong AS type
+    ,B.datalong2 AS language
+    ,0 AS emote
+    ,NULL AS comment
+FROM db_script_string A
+INNER JOIN dbscripts_on_creature_death B ON (A.entry = B.dataint OR A.entry = B.dataint2 OR A.entry = B.dataint3 OR A.entry = B.dataint4)
+-- dbscripts_on_creature_movement
+UNION ALL
+SELECT A.entry
+    ,A.content_default
+    ,A.content_loc1
+    ,A.content_loc2
+    ,A.content_loc3
+    ,A.content_loc4
+    ,A.content_loc5
+    ,A.content_loc6
+    ,A.content_loc7
+    ,A.content_loc8
+    ,0 AS sound
+    ,B.datalong AS type
+    ,B.datalong2 AS language
+    ,0 AS emote
+    ,NULL AS comment
+FROM db_script_string A
+INNER JOIN dbscripts_on_creature_movement B ON (A.entry = B.dataint OR A.entry = B.dataint2 OR A.entry = B.dataint3 OR A.entry = B.dataint4)
+-- dbscripts_on_event
+UNION ALL
+SELECT A.entry
+    ,A.content_default
+    ,A.content_loc1
+    ,A.content_loc2
+    ,A.content_loc3
+    ,A.content_loc4
+    ,A.content_loc5
+    ,A.content_loc6
+    ,A.content_loc7
+    ,A.content_loc8
+    ,0 AS sound
+    ,B.datalong AS type
+    ,B.datalong2 AS language
+    ,0 AS emote
+    ,NULL AS comment
+FROM db_script_string A
+INNER JOIN dbscripts_on_event B ON (A.entry = B.dataint OR A.entry = B.dataint2 OR A.entry = B.dataint3 OR A.entry = B.dataint4)
+-- dbscripts_on_gossip
+UNION ALL
+SELECT A.entry
+    ,A.content_default
+    ,A.content_loc1
+    ,A.content_loc2
+    ,A.content_loc3
+    ,A.content_loc4
+    ,A.content_loc5
+    ,A.content_loc6
+    ,A.content_loc7
+    ,A.content_loc8
+    ,0 AS sound
+    ,B.datalong AS type
+    ,B.datalong2 AS language
+    ,0 AS emote
+    ,NULL AS comment
+FROM db_script_string A
+INNER JOIN dbscripts_on_gossip B ON (A.entry = B.dataint OR A.entry = B.dataint2 OR A.entry = B.dataint3 OR A.entry = B.dataint4)
+-- dbscripts_on_go_template_use
+UNION ALL
+SELECT A.entry
+    ,A.content_default
+    ,A.content_loc1
+    ,A.content_loc2
+    ,A.content_loc3
+    ,A.content_loc4
+    ,A.content_loc5
+    ,A.content_loc6
+    ,A.content_loc7
+    ,A.content_loc8
+    ,0 AS sound
+    ,B.datalong AS type
+    ,B.datalong2 AS language
+    ,0 AS emote
+    ,NULL AS comment
+FROM db_script_string A
+INNER JOIN dbscripts_on_go_template_use B ON (A.entry = B.dataint OR A.entry = B.dataint2 OR A.entry = B.dataint3 OR A.entry = B.dataint4)
+-- dbscripts_on_go_use
+UNION ALL
+SELECT A.entry
+    ,A.content_default
+    ,A.content_loc1
+    ,A.content_loc2
+    ,A.content_loc3
+    ,A.content_loc4
+    ,A.content_loc5
+    ,A.content_loc6
+    ,A.content_loc7
+    ,A.content_loc8
+    ,0 AS sound
+    ,B.datalong AS type
+    ,B.datalong2 AS language
+    ,0 AS emote
+    ,NULL AS comment
+FROM db_script_string A
+INNER JOIN dbscripts_on_go_use B ON (A.entry = B.dataint OR A.entry = B.dataint2 OR A.entry = B.dataint3 OR A.entry = B.dataint4)
+-- dbscripts_on_quest_end
+UNION ALL
+SELECT A.entry
+    ,A.content_default
+    ,A.content_loc1
+    ,A.content_loc2
+    ,A.content_loc3
+    ,A.content_loc4
+    ,A.content_loc5
+    ,A.content_loc6
+    ,A.content_loc7
+    ,A.content_loc8
+    ,0 AS sound
+    ,B.datalong AS type
+    ,B.datalong2 AS language
+    ,0 AS emote
+    ,NULL AS comment
+FROM db_script_string A
+INNER JOIN dbscripts_on_quest_end B ON (A.entry = B.dataint OR A.entry = B.dataint2 OR A.entry = B.dataint3 OR A.entry = B.dataint4)
+-- dbscripts_on_quest_start
+UNION ALL
+SELECT A.entry
+    ,A.content_default
+    ,A.content_loc1
+    ,A.content_loc2
+    ,A.content_loc3
+    ,A.content_loc4
+    ,A.content_loc5
+    ,A.content_loc6
+    ,A.content_loc7
+    ,A.content_loc8
+    ,0 AS sound
+    ,B.datalong AS type
+    ,B.datalong2 AS language
+    ,0 AS emote
+    ,NULL AS comment
+FROM db_script_string A
+INNER JOIN dbscripts_on_quest_start B ON (A.entry = B.dataint OR A.entry = B.dataint2 OR A.entry = B.dataint3 OR A.entry = B.dataint4)
+-- dbscripts_on_spell
+UNION ALL
+SELECT A.entry
+    ,A.content_default
+    ,A.content_loc1
+    ,A.content_loc2
+    ,A.content_loc3
+    ,A.content_loc4
+    ,A.content_loc5
+    ,A.content_loc6
+    ,A.content_loc7
+    ,A.content_loc8
+    ,0 AS sound
+    ,B.datalong AS type
+    ,B.datalong2 AS language
+    ,0 AS emote
+    ,NULL AS comment
+FROM db_script_string A
+INNER JOIN dbscripts_on_spell B ON (A.entry = B.dataint OR A.entry = B.dataint2 OR A.entry = B.dataint3 OR A.entry = B.dataint4);
+
+-- Clean dbscript_string and insert the new updated values
+DELETE FROM db_script_string WHERE entry IN (SELECT DISTINCT entry FROM db_script_temp);
+INSERT INTO db_script_string SELECT * FROM db_script_temp GROUP BY entry;
+DROP TABLE IF EXISTS db_script_temp;
diff --git a/sql/updates/12534_01_mangos_playercreateinfo_spell.sql b/sql/updates/12534_01_mangos_playercreateinfo_spell.sql
new file mode 100644
index 00000000000..231a29a6ced
--- /dev/null
+++ b/sql/updates/12534_01_mangos_playercreateinfo_spell.sql
@@ -0,0 +1,11 @@
+ALTER TABLE db_version CHANGE COLUMN required_12522_01_mangos_db_script_string required_12534_01_mangos_playercreateinfo_spell bit;
+
+DELETE FROM playercreateinfo_spell WHERE race=10 AND Spell=61437;
+INSERT INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
+(10,2,61437,'Opening'),
+(10,3,61437,'Opening'),
+(10,4,61437,'Opening'),
+(10,5,61437,'Opening'),
+(10,6,61437,'Opening'),
+(10,8,61437,'Opening'),
+(10,9,61437,'Opening');
diff --git a/sql/updates/12540_01_mangos_command.sql b/sql/updates/12540_01_mangos_command.sql
new file mode 100644
index 00000000000..a6e941934c0
--- /dev/null
+++ b/sql/updates/12540_01_mangos_command.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12534_01_mangos_playercreateinfo_spell required_12540_01_mangos_command bit;
+
+UPDATE `command` SET help = 'Syntax: .account create $account $password [$expansion]\r\n\r\nCreate account and set password to it. Optionally, you may also set another expansion for this account than the defined default value.' WHERE name = 'account create';
diff --git a/sql/updates/12562_01_characters_various_tables.sql b/sql/updates/12562_01_characters_various_tables.sql
new file mode 100644
index 00000000000..8e4b663f652
--- /dev/null
+++ b/sql/updates/12562_01_characters_various_tables.sql
@@ -0,0 +1,13 @@
+ALTER TABLE character_db_version CHANGE COLUMN required_12487_01_characters_characters required_12562_01_characters_various_tables bit;
+
+ALTER TABLE character_queststatus_daily DROP INDEX idx_guid;
+ALTER TABLE character_queststatus_monthly DROP INDEX idx_guid;
+ALTER TABLE character_queststatus_weekly DROP INDEX idx_guid;
+ALTER TABLE character_social DROP INDEX friend;
+ALTER TABLE character_social DROP INDEX guid;
+ALTER TABLE character_talent DROP INDEX guid_key;
+ALTER TABLE guild_bank_eventlog DROP INDEX guildid_key;
+ALTER TABLE guild_bank_item DROP INDEX guildid_key;
+ALTER TABLE guild_bank_right DROP INDEX guildid_key;
+ALTER TABLE guild_bank_tab DROP INDEX guildid_key;
+ALTER TABLE guild_member DROP INDEX guildid_key;
diff --git a/sql/updates/12562_01_mangos_playercreateinfo_action.sql b/sql/updates/12562_01_mangos_playercreateinfo_action.sql
new file mode 100644
index 00000000000..1352ae99797
--- /dev/null
+++ b/sql/updates/12562_01_mangos_playercreateinfo_action.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12540_01_mangos_command required_12562_01_mangos_playercreateinfo_action bit;
+
+ALTER TABLE playercreateinfo_action DROP INDEX playercreateinfo_race_class_index;
diff --git a/sql/updates/12606_01_mangos_creature_template.sql b/sql/updates/12606_01_mangos_creature_template.sql
new file mode 100644
index 00000000000..f7a87138445
--- /dev/null
+++ b/sql/updates/12606_01_mangos_creature_template.sql
@@ -0,0 +1,111 @@
+ALTER TABLE db_version CHANGE COLUMN required_12562_01_mangos_playercreateinfo_action required_12606_01_mangos_creature_template bit;
+
+-- Rename and add new field to prepare upcoming patch
+
+RENAME TABLE creature_template TO creature_template_old;
+CREATE TABLE `creature_template` (
+  `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Name` char(100) NOT NULL DEFAULT '',
+  `SubName` char(100) DEFAULT NULL,
+  `IconName` char(100) DEFAULT NULL,
+  `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `DifficultyEntry1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `DifficultyEntry2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `DifficultyEntry3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ModelId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ModelId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ModelId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ModelId4` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `FactionAlliance` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `FactionHorde` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Scale` float NOT NULL DEFAULT '1',
+  `Family` tinyint(4) NOT NULL DEFAULT '0',
+  `CreatureType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `InhabitType` tinyint(3) unsigned NOT NULL DEFAULT '3',
+  `RegenerateHealth` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `RacialLeader` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `NpcFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `UnitFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `DynamicFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExtraFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureTypeFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpeedWalk` float NOT NULL DEFAULT '1',
+  `SpeedRun` float NOT NULL DEFAULT '1.14286',
+  `UnitClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Rank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Expansion` tinyint(3) NOT NULL DEFAULT '-1', -- NEW FIELD ADDED
+  `HealthMultiplier` float NOT NULL DEFAULT '1',
+  `ManaMultiplier` float NOT NULL DEFAULT '1',
+  `DamageMultiplier` float NOT NULL DEFAULT '1',
+  `DamageVariance` float NOT NULL DEFAULT '1', -- NEW FIELD ADDED
+  `ArmorMultiplier` float NOT NULL DEFAULT '1', -- NEW FIELD ADDED
+  `ExperienceMultiplier` float NOT NULL DEFAULT '1', -- NEW FIELD ADDED
+  `MinLevelHealth` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxLevelHealth` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinLevelMana` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxLevelMana` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinMeleeDmg` float NOT NULL DEFAULT '0',
+  `MaxMeleeDmg` float NOT NULL DEFAULT '0',
+  `MinRangedDmg` float NOT NULL DEFAULT '0',
+  `MaxRangedDmg` float NOT NULL DEFAULT '0',
+  `Armor` int(10) unsigned NOT NULL DEFAULT '0',
+  `MeleeAttackPower` int(10) unsigned NOT NULL DEFAULT '0',
+  `RangedAttackPower` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MeleeBaseAttackTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `RangedBaseAttackTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `DamageSchool` tinyint(4) NOT NULL DEFAULT '0',
+  `MinLootGold` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `MaxLootGold` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `LootId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PickpocketLootId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `SkinningLootId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `KillCredit1` int(11) unsigned NOT NULL DEFAULT '0',
+  `KillCredit2` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem1` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem2` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem3` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem4` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem5` int(11) unsigned NOT NULL DEFAULT '0',
+  `QuestItem6` int(11) unsigned NOT NULL DEFAULT '0',
+  `MechanicImmuneMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `ResistanceHoly` smallint(5) NOT NULL DEFAULT '0',
+  `ResistanceFire` smallint(5) NOT NULL DEFAULT '0',
+  `ResistanceNature` smallint(5) NOT NULL DEFAULT '0',
+  `ResistanceFrost` smallint(5) NOT NULL DEFAULT '0',
+  `ResistanceShadow` smallint(5) NOT NULL DEFAULT '0',
+  `ResistanceArcane` smallint(5) NOT NULL DEFAULT '0',
+  `PetSpellDataId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `MovementType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MovementTemplateId` int(11) unsigned NOT NULL DEFAULT '0',
+  `TrainerType` tinyint(4) NOT NULL DEFAULT '0',
+  `TrainerSpell` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `TrainerClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TrainerRace` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TrainerTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `VendorTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `EquipmentTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `VehicleTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `GossipMenuId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AIName` char(64) NOT NULL DEFAULT '',
+  `ScriptName` char(64) NOT NULL DEFAULT '',
+  PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Creature System';
+
+INSERT INTO `creature_template` (`Entry`, `Name`, `SubName`, `IconName`, `MinLevel`, `MaxLevel`, `DifficultyEntry1`, `DifficultyEntry2`, `DifficultyEntry3`, `ModelId1`, `ModelId2`, `ModelId3`, `ModelId4`,
+  `FactionAlliance`, `FactionHorde`, `Scale`, `Family`, `CreatureType`, `InhabitType`, `RegenerateHealth`, `RacialLeader`, `NpcFlags`, `UnitFlags`, `DynamicFlags`, `ExtraFlags`, `CreatureTypeFlags`,
+  `SpeedWalk`, `SpeedRun`, `UnitClass`, `Rank`, `HealthMultiplier`, `ManaMultiplier`, `DamageMultiplier`, `MinLevelHealth`, `MaxLevelHealth`, `MinLevelMana`, `MaxLevelMana`, `MinMeleeDmg`, `MaxMeleeDmg`,
+  `MinRangedDmg`, `MaxRangedDmg`, `Armor`, `MeleeAttackPower`, `RangedAttackPower`, `MeleeBaseAttackTime`, `RangedBaseAttackTime`, `DamageSchool`, `MinLootGold`, `MaxLootGold`,
+  `LootId`, `PickpocketLootId`, `SkinningLootId`, `KillCredit1`, `KillCredit2`, `QuestItem1`, `QuestItem2`, `QuestItem3`, `QuestItem4`, `QuestItem5`, `QuestItem6`, `MechanicImmuneMask`,
+  `ResistanceHoly`, `ResistanceFire`, `ResistanceNature`, `ResistanceFrost`, `ResistanceShadow`, `ResistanceArcane`, `PetSpellDataId`, `MovementType`, `MovementTemplateId`, `TrainerType`, `TrainerSpell`,
+  `TrainerClass`, `TrainerRace`, `TrainerTemplateId`, `VendorTemplateId`, `EquipmentTemplateId`, `VehicleTemplateId`, `GossipMenuId`, `AIName`, `ScriptName`)
+SELECT `entry`, `name`, `subname`, `iconname`, `minlevel`, `maxlevel`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `modelid_1`, `modelid_2`, `modelid_3`, `modelid_4`,
+  `faction_A`, `faction_H`, `scale`, `family`, `type`, `InhabitType`, `RegenHealth`, `RacialLeader`, `npcflag`, `unit_flags`, `dynamicflags`, `flags_extra`, `type_flags`,
+  `speed_walk`, `speed_run`, `unit_class`, `rank`, `unk16`, `unk17`, `dmg_multiplier`, `minhealth`, `maxhealth`, `minmana`, `maxmana`, `minDmg`, `maxdmg`,
+  `minrangedmg`, `maxrangedmg`, `armor`, `attackpower`, `rangedattackpower`, `baseattacktime`, `rangeattacktime`, `dmgschool`, `mingold`, `maxgold`,
+  `lootid`, `pickpocketloot`, `skinloot`, `KillCredit1`, `KillCredit2`, `questItem1`, `questItem2`, `questItem3`, `questItem4`, `questItem5`, `questItem6`,
+  `mechanic_immune_mask`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `PetSpellDataId`, `MovementType`, `movementId`, `trainer_type`, `trainer_spell`,
+  `trainer_class`, `trainer_race`, `trainer_id`, `vendor_id`, `equipment_id`, `vehicle_id`, `gossip_menu_id`, `AIName`, `ScriptName`
+FROM `creature_template_old` ORDER BY `entry`;
+
+DROP TABLE `creature_template_old`;
diff --git a/sql/updates/12615_01_mangos_creature_template_classlevelstats.sql b/sql/updates/12615_01_mangos_creature_template_classlevelstats.sql
new file mode 100644
index 00000000000..3186071c05b
--- /dev/null
+++ b/sql/updates/12615_01_mangos_creature_template_classlevelstats.sql
@@ -0,0 +1,19 @@
+ALTER TABLE db_version CHANGE COLUMN required_12606_01_mangos_creature_template required_12615_01_mangos_creature_template_classlevelstats bit;
+
+DROP TABLE IF EXISTS `creature_template_classlevelstats`;
+
+CREATE TABLE `creature_template_classlevelstats` (
+  `Level` tinyint(4) NOT NULL,
+  `Class` tinyint(4) NOT NULL,
+  `BaseHealthExp0` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `BaseHealthExp1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `BaseHealthExp2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `BaseMana` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `BaseDamageExp0` float NOT NULL DEFAULT '0',
+  `BaseDamageExp1` float NOT NULL DEFAULT '0',
+  `BaseDamageExp2` float NOT NULL DEFAULT '0',
+  `BaseMeleeAttackPower` float NOT NULL DEFAULT '0',
+  `BaseRangedAttackPower` float NOT NULL DEFAULT '0',
+  `BaseArmor` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`Level`,`Class`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/sql/updates/12654_01_mangos_creature_template_power.sql b/sql/updates/12654_01_mangos_creature_template_power.sql
new file mode 100644
index 00000000000..cb0cba5085c
--- /dev/null
+++ b/sql/updates/12654_01_mangos_creature_template_power.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_12615_01_mangos_creature_template_classlevelstats required_12654_01_mangos_creature_template_power bit;
+
+ALTER TABLE creature_template CHANGE ManaMultiplier PowerMultiplier float NOT NULL DEFAULT '1';
+ALTER TABLE creature_template CHANGE RegenerateHealth RegenerateStats tinyint(3) unsigned NOT NULL DEFAULT '3';
+UPDATE creature_template SET RegenerateStats=RegenerateStats|2;
diff --git a/sql_mr/Opcodes/opcodes_mangos_12340.sql b/sql_mr/Opcodes/opcodes_mangos_12340.sql
new file mode 100644
index 00000000000..3a7116abe18
--- /dev/null
+++ b/sql_mr/Opcodes/opcodes_mangos_12340.sql
@@ -0,0 +1,1325 @@
+-- Opcode table for client build 12340
+
+CREATE TABLE IF NOT EXISTS `opcodes` (
+    `version` smallint(5) NOT NULL COMMENT "Client build",
+    `name` varchar(64) NOT NULL COMMENT "opcode name",
+    `value` int(10) NOT NULL COMMENT "opcode value",
+    `flags` int(10) unsigned NOT NULL DEFAULT "0" COMMENT "current opcode flags",
+    UNIQUE KEY `version` (`version`,`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT="Universal opcode storage";
+
+DELETE FROM `opcodes` WHERE `version` = 12340;
+
+INSERT INTO `opcodes` (`name`, `value`, `version`, `flags`) VALUES
+("MSG_NULL_ACTION",0x000,12340,0),
+("CMSG_BOOTME",0x001,12340,0),
+("CMSG_DBLOOKUP",0x002,12340,0),
+("SMSG_DBLOOKUP",0x003,12340,0),
+("CMSG_QUERY_OBJECT_POSITION",0x004,12340,0),
+("SMSG_QUERY_OBJECT_POSITION",0x005,12340,0),
+("CMSG_QUERY_OBJECT_ROTATION",0x006,12340,0),
+("SMSG_QUERY_OBJECT_ROTATION",0x007,12340,0),
+("CMSG_WORLD_TELEPORT",0x008,12340,0),
+("CMSG_TELEPORT_TO_UNIT",0x009,12340,0),
+("CMSG_ZONE_MAP",0x00A,12340,0),
+("SMSG_ZONE_MAP",0x00B,12340,0),
+("CMSG_DEBUG_CHANGECELLZONE",0x00C,12340,0),
+("CMSG_MOVE_CHARACTER_CHEAT",0x00D,12340,0),
+("SMSG_MOVE_CHARACTER_CHEAT",0x00E,12340,0),
+("CMSG_RECHARGE",0x00F,12340,0),
+("CMSG_LEARN_SPELL",0x010,12340,0),
+("CMSG_CREATEMONSTER",0x011,12340,0),
+("CMSG_DESTROYMONSTER",0x012,12340,0),
+("CMSG_CREATEITEM",0x013,12340,0),
+("CMSG_CREATEGAMEOBJECT",0x014,12340,0),
+("SMSG_CHECK_FOR_BOTS",0x015,12340,0),
+("CMSG_MAKEMONSTERATTACKGUID",0x016,12340,0),
+("CMSG_BOT_DETECTED2",0x017,12340,0),
+("CMSG_FORCEACTION",0x018,12340,0),
+("CMSG_FORCEACTIONONOTHER",0x019,12340,0),
+("CMSG_FORCEACTIONSHOW",0x01A,12340,0),
+("SMSG_FORCEACTIONSHOW",0x01B,12340,0),
+("CMSG_PETGODMODE",0x01C,12340,0),
+("SMSG_PETGODMODE",0x01D,12340,0),
+("SMSG_REFER_A_FRIEND_EXPIRED",0x01E,12340,0),
+("CMSG_WEATHER_SPEED_CHEAT",0x01F,12340,0),
+("CMSG_UNDRESSPLAYER",0x020,12340,0),
+("CMSG_BEASTMASTER",0x021,12340,0),
+("CMSG_GODMODE",0x022,12340,0),
+("SMSG_GODMODE",0x023,12340,0),
+("CMSG_CHEAT_SETMONEY",0x024,12340,0),
+("CMSG_LEVEL_CHEAT",0x025,12340,0),
+("CMSG_PET_LEVEL_CHEAT",0x026,12340,0),
+("CMSG_SET_WORLDSTATE",0x027,12340,0),
+("CMSG_COOLDOWN_CHEAT",0x028,12340,0),
+("CMSG_USE_SKILL_CHEAT",0x029,12340,0),
+("CMSG_FLAG_QUEST",0x02A,12340,0),
+("CMSG_FLAG_QUEST_FINISH",0x02B,12340,0),
+("CMSG_CLEAR_QUEST",0x02C,12340,0),
+("CMSG_SEND_EVENT",0x02D,12340,0),
+("CMSG_DEBUG_AISTATE",0x02E,12340,0),
+("SMSG_DEBUG_AISTATE",0x02F,12340,0),
+("CMSG_DISABLE_PVP_CHEAT",0x030,12340,0),
+("CMSG_ADVANCE_SPAWN_TIME",0x031,12340,0),
+("SMSG_DESTRUCTIBLE_BUILDING_DAMAGE",0x032,12340,0),
+("CMSG_AUTH_SRP6_BEGIN",0x033,12340,0),
+("CMSG_AUTH_SRP6_PROOF",0x034,12340,0),
+("CMSG_AUTH_SRP6_RECODE",0x035,12340,0),
+("CMSG_CHAR_CREATE",0x036,12340,0),
+("CMSG_CHAR_ENUM",0x037,12340,0),
+("CMSG_CHAR_DELETE",0x038,12340,0),
+("SMSG_AUTH_SRP6_RESPONSE",0x039,12340,0),
+("SMSG_CHAR_CREATE",0x03A,12340,0),
+("SMSG_CHAR_ENUM",0x03B,12340,0),
+("SMSG_CHAR_DELETE",0x03C,12340,0),
+("CMSG_PLAYER_LOGIN",0x03D,12340,0),
+("SMSG_NEW_WORLD",0x03E,12340,0),
+("SMSG_TRANSFER_PENDING",0x03F,12340,0),
+("SMSG_TRANSFER_ABORTED",0x040,12340,0),
+("SMSG_CHARACTER_LOGIN_FAILED",0x041,12340,0),
+("SMSG_LOGIN_SETTIMESPEED",0x042,12340,0),
+("SMSG_GAMETIME_UPDATE",0x043,12340,0),
+("CMSG_GAMETIME_SET",0x044,12340,0),
+("SMSG_GAMETIME_SET",0x045,12340,0),
+("CMSG_GAMESPEED_SET",0x046,12340,0),
+("SMSG_GAMESPEED_SET",0x047,12340,0),
+("CMSG_SERVERTIME",0x048,12340,0),
+("SMSG_SERVERTIME",0x049,12340,0),
+("CMSG_PLAYER_LOGOUT",0x04A,12340,0),
+("CMSG_LOGOUT_REQUEST",0x04B,12340,0),
+("SMSG_LOGOUT_RESPONSE",0x04C,12340,0),
+("SMSG_LOGOUT_COMPLETE",0x04D,12340,0),
+("CMSG_LOGOUT_CANCEL",0x04E,12340,0),
+("SMSG_LOGOUT_CANCEL_ACK",0x04F,12340,0),
+("CMSG_NAME_QUERY",0x050,12340,0),
+("SMSG_NAME_QUERY_RESPONSE",0x051,12340,0),
+("CMSG_PET_NAME_QUERY",0x052,12340,0),
+("SMSG_PET_NAME_QUERY_RESPONSE",0x053,12340,0),
+("CMSG_GUILD_QUERY",0x054,12340,0),
+("SMSG_GUILD_QUERY_RESPONSE",0x055,12340,0),
+("CMSG_ITEM_QUERY_SINGLE",0x056,12340,0),
+("CMSG_ITEM_QUERY_MULTIPLE",0x057,12340,0),
+("SMSG_ITEM_QUERY_SINGLE_RESPONSE",0x058,12340,0),
+("SMSG_ITEM_QUERY_MULTIPLE_RESPONSE",0x059,12340,0),
+("CMSG_PAGE_TEXT_QUERY",0x05A,12340,0),
+("SMSG_PAGE_TEXT_QUERY_RESPONSE",0x05B,12340,0),
+("CMSG_QUEST_QUERY",0x05C,12340,0),
+("SMSG_QUEST_QUERY_RESPONSE",0x05D,12340,0),
+("CMSG_GAMEOBJECT_QUERY",0x05E,12340,0),
+("SMSG_GAMEOBJECT_QUERY_RESPONSE",0x05F,12340,0),
+("CMSG_CREATURE_QUERY",0x060,12340,0),
+("SMSG_CREATURE_QUERY_RESPONSE",0x061,12340,0),
+("CMSG_WHO",0x062,12340,0),
+("SMSG_WHO",0x063,12340,0),
+("CMSG_WHOIS",0x064,12340,0),
+("SMSG_WHOIS",0x065,12340,0),
+("CMSG_CONTACT_LIST",0x066,12340,0),
+("SMSG_CONTACT_LIST",0x067,12340,0),
+("SMSG_FRIEND_STATUS",0x068,12340,0),
+("CMSG_ADD_FRIEND",0x069,12340,0),
+("CMSG_DEL_FRIEND",0x06A,12340,0),
+("CMSG_SET_CONTACT_NOTES",0x06B,12340,0),
+("CMSG_ADD_IGNORE",0x06C,12340,0),
+("CMSG_DEL_IGNORE",0x06D,12340,0),
+("CMSG_GROUP_INVITE",0x06E,12340,0),
+("SMSG_GROUP_INVITE",0x06F,12340,0),
+("CMSG_GROUP_CANCEL",0x070,12340,0),
+("SMSG_GROUP_CANCEL",0x071,12340,0),
+("CMSG_GROUP_ACCEPT",0x072,12340,0),
+("CMSG_GROUP_DECLINE",0x073,12340,0),
+("SMSG_GROUP_DECLINE",0x074,12340,0),
+("CMSG_GROUP_UNINVITE",0x075,12340,0),
+("CMSG_GROUP_UNINVITE_GUID",0x076,12340,0),
+("SMSG_GROUP_UNINVITE",0x077,12340,0),
+("CMSG_GROUP_SET_LEADER",0x078,12340,0),
+("SMSG_GROUP_SET_LEADER",0x079,12340,0),
+("CMSG_LOOT_METHOD",0x07A,12340,0),
+("CMSG_GROUP_DISBAND",0x07B,12340,0),
+("SMSG_GROUP_DESTROYED",0x07C,12340,0),
+("SMSG_GROUP_LIST",0x07D,12340,0),
+("SMSG_PARTY_MEMBER_STATS",0x07E,12340,0),
+("SMSG_PARTY_COMMAND_RESULT",0x07F,12340,0),
+("UMSG_UPDATE_GROUP_MEMBERS",0x080,12340,0),
+("CMSG_GUILD_CREATE",0x081,12340,0),
+("CMSG_GUILD_INVITE",0x082,12340,0),
+("SMSG_GUILD_INVITE",0x083,12340,0),
+("CMSG_GUILD_ACCEPT",0x084,12340,0),
+("CMSG_GUILD_DECLINE",0x085,12340,0),
+("SMSG_GUILD_DECLINE",0x086,12340,0),
+("CMSG_GUILD_INFO",0x087,12340,0),
+("SMSG_GUILD_INFO",0x088,12340,0),
+("CMSG_GUILD_ROSTER",0x089,12340,0),
+("SMSG_GUILD_ROSTER",0x08A,12340,0),
+("CMSG_GUILD_PROMOTE",0x08B,12340,0),
+("CMSG_GUILD_DEMOTE",0x08C,12340,0),
+("CMSG_GUILD_LEAVE",0x08D,12340,0),
+("CMSG_GUILD_REMOVE",0x08E,12340,0),
+("CMSG_GUILD_DISBAND",0x08F,12340,0),
+("CMSG_GUILD_LEADER",0x090,12340,0),
+("CMSG_GUILD_MOTD",0x091,12340,0),
+("SMSG_GUILD_EVENT",0x092,12340,0),
+("SMSG_GUILD_COMMAND_RESULT",0x093,12340,0),
+("UMSG_UPDATE_GUILD",0x094,12340,0),
+("CMSG_MESSAGECHAT",0x095,12340,0),
+("SMSG_MESSAGECHAT",0x096,12340,0),
+("CMSG_JOIN_CHANNEL",0x097,12340,0),
+("CMSG_LEAVE_CHANNEL",0x098,12340,0),
+("SMSG_CHANNEL_NOTIFY",0x099,12340,0),
+("CMSG_CHANNEL_LIST",0x09A,12340,0),
+("SMSG_CHANNEL_LIST",0x09B,12340,0),
+("CMSG_CHANNEL_PASSWORD",0x09C,12340,0),
+("CMSG_CHANNEL_SET_OWNER",0x09D,12340,0),
+("CMSG_CHANNEL_OWNER",0x09E,12340,0),
+("CMSG_CHANNEL_MODERATOR",0x09F,12340,0),
+("CMSG_CHANNEL_UNMODERATOR",0x0A0,12340,0),
+("CMSG_CHANNEL_MUTE",0x0A1,12340,0),
+("CMSG_CHANNEL_UNMUTE",0x0A2,12340,0),
+("CMSG_CHANNEL_INVITE",0x0A3,12340,0),
+("CMSG_CHANNEL_KICK",0x0A4,12340,0),
+("CMSG_CHANNEL_BAN",0x0A5,12340,0),
+("CMSG_CHANNEL_UNBAN",0x0A6,12340,0),
+("CMSG_CHANNEL_ANNOUNCEMENTS",0x0A7,12340,0),
+("CMSG_CHANNEL_MODERATE",0x0A8,12340,0),
+("SMSG_UPDATE_OBJECT",0x0A9,12340,0),
+("SMSG_DESTROY_OBJECT",0x0AA,12340,0),
+("CMSG_USE_ITEM",0x0AB,12340,0),
+("CMSG_OPEN_ITEM",0x0AC,12340,0),
+("CMSG_READ_ITEM",0x0AD,12340,0),
+("SMSG_READ_ITEM_OK",0x0AE,12340,0),
+("SMSG_READ_ITEM_FAILED",0x0AF,12340,0),
+("SMSG_ITEM_COOLDOWN",0x0B0,12340,0),
+("CMSG_GAMEOBJ_USE",0x0B1,12340,0),
+("CMSG_DESTROY_ITEMS",0x0B2,12340,0),
+("SMSG_GAMEOBJECT_CUSTOM_ANIM",0x0B3,12340,0),
+("CMSG_AREATRIGGER",0x0B4,12340,0),
+("MSG_MOVE_START_FORWARD",0x0B5,12340,0),
+("MSG_MOVE_START_BACKWARD",0x0B6,12340,0),
+("MSG_MOVE_STOP",0x0B7,12340,0),
+("MSG_MOVE_START_STRAFE_LEFT",0x0B8,12340,0),
+("MSG_MOVE_START_STRAFE_RIGHT",0x0B9,12340,0),
+("MSG_MOVE_STOP_STRAFE",0x0BA,12340,0),
+("MSG_MOVE_JUMP",0x0BB,12340,0),
+("MSG_MOVE_START_TURN_LEFT",0x0BC,12340,0),
+("MSG_MOVE_START_TURN_RIGHT",0x0BD,12340,0),
+("MSG_MOVE_STOP_TURN",0x0BE,12340,0),
+("MSG_MOVE_START_PITCH_UP",0x0BF,12340,0),
+("MSG_MOVE_START_PITCH_DOWN",0x0C0,12340,0),
+("MSG_MOVE_STOP_PITCH",0x0C1,12340,0),
+("MSG_MOVE_SET_RUN_MODE",0x0C2,12340,0),
+("MSG_MOVE_SET_WALK_MODE",0x0C3,12340,0),
+("MSG_MOVE_TOGGLE_LOGGING",0x0C4,12340,0),
+("MSG_MOVE_TELEPORT",0x0C5,12340,0),
+("MSG_MOVE_TELEPORT_CHEAT",0x0C6,12340,0),
+("MSG_MOVE_TELEPORT_ACK",0x0C7,12340,0),
+("MSG_MOVE_TOGGLE_FALL_LOGGING",0x0C8,12340,0),
+("MSG_MOVE_FALL_LAND",0x0C9,12340,0),
+("MSG_MOVE_START_SWIM",0x0CA,12340,0),
+("MSG_MOVE_STOP_SWIM",0x0CB,12340,0),
+("MSG_MOVE_SET_RUN_SPEED_CHEAT",0x0CC,12340,0),
+("MSG_MOVE_SET_RUN_SPEED",0x0CD,12340,0),
+("MSG_MOVE_SET_RUN_BACK_SPEED_CHEAT",0x0CE,12340,0),
+("MSG_MOVE_SET_RUN_BACK_SPEED",0x0CF,12340,0),
+("MSG_MOVE_SET_WALK_SPEED_CHEAT",0x0D0,12340,0),
+("MSG_MOVE_SET_WALK_SPEED",0x0D1,12340,0),
+("MSG_MOVE_SET_SWIM_SPEED_CHEAT",0x0D2,12340,0),
+("MSG_MOVE_SET_SWIM_SPEED",0x0D3,12340,0),
+("MSG_MOVE_SET_SWIM_BACK_SPEED_CHEAT",0x0D4,12340,0),
+("MSG_MOVE_SET_SWIM_BACK_SPEED",0x0D5,12340,0),
+("MSG_MOVE_SET_ALL_SPEED_CHEAT",0x0D6,12340,0),
+("MSG_MOVE_SET_TURN_RATE_CHEAT",0x0D7,12340,0),
+("MSG_MOVE_SET_TURN_RATE",0x0D8,12340,0),
+("MSG_MOVE_TOGGLE_COLLISION_CHEAT",0x0D9,12340,0),
+("MSG_MOVE_SET_FACING",0x0DA,12340,0),
+("MSG_MOVE_SET_PITCH",0x0DB,12340,0),
+("MSG_MOVE_WORLDPORT_ACK",0x0DC,12340,0),
+("SMSG_MONSTER_MOVE",0x0DD,12340,0),
+("SMSG_MOVE_WATER_WALK",0x0DE,12340,0),
+("SMSG_MOVE_LAND_WALK",0x0DF,12340,0),
+("CMSG_MOVE_CHARM_PORT_CHEAT",0x0E0,12340,0),
+("CMSG_MOVE_SET_RAW_POSITION",0x0E1,12340,0),
+("SMSG_FORCE_RUN_SPEED_CHANGE",0x0E2,12340,0),
+("CMSG_FORCE_RUN_SPEED_CHANGE_ACK",0x0E3,12340,0),
+("SMSG_FORCE_RUN_BACK_SPEED_CHANGE",0x0E4,12340,0),
+("CMSG_FORCE_RUN_BACK_SPEED_CHANGE_ACK",0x0E5,12340,0),
+("SMSG_FORCE_SWIM_SPEED_CHANGE",0x0E6,12340,0),
+("CMSG_FORCE_SWIM_SPEED_CHANGE_ACK",0x0E7,12340,0),
+("SMSG_FORCE_MOVE_ROOT",0x0E8,12340,0),
+("CMSG_FORCE_MOVE_ROOT_ACK",0x0E9,12340,0),
+("SMSG_FORCE_MOVE_UNROOT",0x0EA,12340,0),
+("CMSG_FORCE_MOVE_UNROOT_ACK",0x0EB,12340,0),
+("MSG_MOVE_ROOT",0x0EC,12340,0),
+("MSG_MOVE_UNROOT",0x0ED,12340,0),
+("MSG_MOVE_HEARTBEAT",0x0EE,12340,0),
+("SMSG_MOVE_KNOCK_BACK",0x0EF,12340,0),
+("CMSG_MOVE_KNOCK_BACK_ACK",0x0F0,12340,0),
+("MSG_MOVE_KNOCK_BACK",0x0F1,12340,0),
+("SMSG_MOVE_FEATHER_FALL",0x0F2,12340,0),
+("SMSG_MOVE_NORMAL_FALL",0x0F3,12340,0),
+("SMSG_MOVE_SET_HOVER",0x0F4,12340,0),
+("SMSG_MOVE_UNSET_HOVER",0x0F5,12340,0),
+("CMSG_MOVE_HOVER_ACK",0x0F6,12340,0),
+("MSG_MOVE_HOVER",0x0F7,12340,0),
+("CMSG_TRIGGER_CINEMATIC_CHEAT",0x0F8,12340,0),
+("CMSG_OPENING_CINEMATIC",0x0F9,12340,0),
+("SMSG_TRIGGER_CINEMATIC",0x0FA,12340,0),
+("CMSG_NEXT_CINEMATIC_CAMERA",0x0FB,12340,0),
+("CMSG_COMPLETE_CINEMATIC",0x0FC,12340,0),
+("SMSG_TUTORIAL_FLAGS",0x0FD,12340,0),
+("CMSG_TUTORIAL_FLAG",0x0FE,12340,0),
+("CMSG_TUTORIAL_CLEAR",0x0FF,12340,0),
+("CMSG_TUTORIAL_RESET",0x100,12340,0),
+("CMSG_STANDSTATECHANGE",0x101,12340,0),
+("CMSG_EMOTE",0x102,12340,0),
+("SMSG_EMOTE",0x103,12340,0),
+("CMSG_TEXT_EMOTE",0x104,12340,0),
+("SMSG_TEXT_EMOTE",0x105,12340,0),
+("CMSG_AUTOEQUIP_GROUND_ITEM",0x106,12340,0),
+("CMSG_AUTOSTORE_GROUND_ITEM",0x107,12340,0),
+("CMSG_AUTOSTORE_LOOT_ITEM",0x108,12340,0),
+("CMSG_STORE_LOOT_IN_SLOT",0x109,12340,0),
+("CMSG_AUTOEQUIP_ITEM",0x10A,12340,0),
+("CMSG_AUTOSTORE_BAG_ITEM",0x10B,12340,0),
+("CMSG_SWAP_ITEM",0x10C,12340,0),
+("CMSG_SWAP_INV_ITEM",0x10D,12340,0),
+("CMSG_SPLIT_ITEM",0x10E,12340,0),
+("CMSG_AUTOEQUIP_ITEM_SLOT",0x10F,12340,0),
+("CMSG_UNCLAIM_LICENSE",0x110,12340,0),
+("CMSG_DESTROYITEM",0x111,12340,0),
+("SMSG_INVENTORY_CHANGE_FAILURE",0x112,12340,0),
+("SMSG_OPEN_CONTAINER",0x113,12340,0),
+("CMSG_INSPECT",0x114,12340,0),
+("SMSG_INSPECT_RESULTS_UPDATE",0x115,12340,0),
+("CMSG_INITIATE_TRADE",0x116,12340,0),
+("CMSG_BEGIN_TRADE",0x117,12340,0),
+("CMSG_BUSY_TRADE",0x118,12340,0),
+("CMSG_IGNORE_TRADE",0x119,12340,0),
+("CMSG_ACCEPT_TRADE",0x11A,12340,0),
+("CMSG_UNACCEPT_TRADE",0x11B,12340,0),
+("CMSG_CANCEL_TRADE",0x11C,12340,0),
+("CMSG_SET_TRADE_ITEM",0x11D,12340,0),
+("CMSG_CLEAR_TRADE_ITEM",0x11E,12340,0),
+("CMSG_SET_TRADE_GOLD",0x11F,12340,0),
+("SMSG_TRADE_STATUS",0x120,12340,0),
+("SMSG_TRADE_STATUS_EXTENDED",0x121,12340,0),
+("SMSG_INITIALIZE_FACTIONS",0x122,12340,0),
+("SMSG_SET_FACTION_VISIBLE",0x123,12340,0),
+("SMSG_SET_FACTION_STANDING",0x124,12340,0),
+("CMSG_SET_FACTION_ATWAR",0x125,12340,0),
+("CMSG_SET_FACTION_CHEAT",0x126,12340,0),
+("SMSG_SET_PROFICIENCY",0x127,12340,0),
+("CMSG_SET_ACTION_BUTTON",0x128,12340,0),
+("SMSG_ACTION_BUTTONS",0x129,12340,0),
+("SMSG_INITIAL_SPELLS",0x12A,12340,0),
+("SMSG_LEARNED_SPELL",0x12B,12340,0),
+("SMSG_SUPERCEDED_SPELL",0x12C,12340,0),
+("CMSG_NEW_SPELL_SLOT",0x12D,12340,0),
+("CMSG_CAST_SPELL",0x12E,12340,0),
+("CMSG_CANCEL_CAST",0x12F,12340,0),
+("SMSG_CAST_FAILED",0x130,12340,0),
+("SMSG_SPELL_START",0x131,12340,0),
+("SMSG_SPELL_GO",0x132,12340,0),
+("SMSG_SPELL_FAILURE",0x133,12340,0),
+("SMSG_SPELL_COOLDOWN",0x134,12340,0),
+("SMSG_COOLDOWN_EVENT",0x135,12340,0),
+("CMSG_CANCEL_AURA",0x136,12340,0),
+("SMSG_EQUIPMENT_SET_ID",0x137,12340,0),
+("SMSG_PET_CAST_FAILED",0x138,12340,0),
+("MSG_CHANNEL_START",0x139,12340,0),
+("MSG_CHANNEL_UPDATE",0x13A,12340,0),
+("CMSG_CANCEL_CHANNELLING",0x13B,12340,0),
+("SMSG_AI_REACTION",0x13C,12340,0),
+("CMSG_SET_SELECTION",0x13D,12340,0),
+("CMSG_DELETEEQUIPMENT_SET",0x13E,12340,0),
+("CMSG_INSTANCE_LOCK_RESPONSE",0x13F,12340,0),
+("CMSG_DEBUG_PASSIVE_AURA",0x140,12340,0),
+("CMSG_ATTACKSWING",0x141,12340,0),
+("CMSG_ATTACKSTOP",0x142,12340,0),
+("SMSG_ATTACKSTART",0x143,12340,0),
+("SMSG_ATTACKSTOP",0x144,12340,0),
+("SMSG_ATTACKSWING_NOTINRANGE",0x145,12340,0),
+("SMSG_ATTACKSWING_BADFACING",0x146,12340,0),
+("SMSG_PENDING_RAID_LOCK",0x147,12340,0),
+("SMSG_ATTACKSWING_DEADTARGET",0x148,12340,0),
+("SMSG_ATTACKSWING_CANT_ATTACK",0x149,12340,0),
+("SMSG_ATTACKERSTATEUPDATE",0x14A,12340,0),
+("SMSG_BATTLEFIELD_PORT_DENIED",0x14B,12340,0),
+("CMSG_PERFORM_ACTION_SET",0x14C,12340,0),
+("SMSG_RESUME_CAST_BAR",0x14D,12340,0),
+("SMSG_CANCEL_COMBAT",0x14E,12340,0),
+("SMSG_SPELLBREAKLOG",0x14F,12340,0),
+("SMSG_SPELLHEALLOG",0x150,12340,0),
+("SMSG_SPELLENERGIZELOG",0x151,12340,0),
+("SMSG_BREAK_TARGET",0x152,12340,0),
+("CMSG_SAVE_PLAYER",0x153,12340,0),
+("CMSG_SETDEATHBINDPOINT",0x154,12340,0),
+("SMSG_BINDPOINTUPDATE",0x155,12340,0),
+("CMSG_GETDEATHBINDZONE",0x156,12340,0),
+("SMSG_BINDZONEREPLY",0x157,12340,0),
+("SMSG_PLAYERBOUND",0x158,12340,0),
+("SMSG_CLIENT_CONTROL_UPDATE",0x159,12340,0),
+("CMSG_REPOP_REQUEST",0x15A,12340,0),
+("SMSG_RESURRECT_REQUEST",0x15B,12340,0),
+("CMSG_RESURRECT_RESPONSE",0x15C,12340,0),
+("CMSG_LOOT",0x15D,12340,0),
+("CMSG_LOOT_MONEY",0x15E,12340,0),
+("CMSG_LOOT_RELEASE",0x15F,12340,0),
+("SMSG_LOOT_RESPONSE",0x160,12340,0),
+("SMSG_LOOT_RELEASE_RESPONSE",0x161,12340,0),
+("SMSG_LOOT_REMOVED",0x162,12340,0),
+("SMSG_LOOT_MONEY_NOTIFY",0x163,12340,0),
+("SMSG_LOOT_ITEM_NOTIFY",0x164,12340,0),
+("SMSG_LOOT_CLEAR_MONEY",0x165,12340,0),
+("SMSG_ITEM_PUSH_RESULT",0x166,12340,0),
+("SMSG_DUEL_REQUESTED",0x167,12340,0),
+("SMSG_DUEL_OUTOFBOUNDS",0x168,12340,0),
+("SMSG_DUEL_INBOUNDS",0x169,12340,0),
+("SMSG_DUEL_COMPLETE",0x16A,12340,0),
+("SMSG_DUEL_WINNER",0x16B,12340,0),
+("CMSG_DUEL_ACCEPTED",0x16C,12340,0),
+("CMSG_DUEL_CANCELLED",0x16D,12340,0),
+("SMSG_MOUNTRESULT",0x16E,12340,0),
+("SMSG_DISMOUNTRESULT",0x16F,12340,0),
+("SMSG_REMOVED_FROM_PVP_QUEUE",0x170,12340,0),
+("CMSG_MOUNTSPECIAL_ANIM",0x171,12340,0),
+("SMSG_MOUNTSPECIAL_ANIM",0x172,12340,0),
+("SMSG_PET_TAME_FAILURE",0x173,12340,0),
+("CMSG_PET_SET_ACTION",0x174,12340,0),
+("CMSG_PET_ACTION",0x175,12340,0),
+("CMSG_PET_ABANDON",0x176,12340,0),
+("CMSG_PET_RENAME",0x177,12340,0),
+("SMSG_PET_NAME_INVALID",0x178,12340,0),
+("SMSG_PET_SPELLS",0x179,12340,0),
+("SMSG_PET_MODE",0x17A,12340,0),
+("CMSG_GOSSIP_HELLO",0x17B,12340,0),
+("CMSG_GOSSIP_SELECT_OPTION",0x17C,12340,0),
+("SMSG_GOSSIP_MESSAGE",0x17D,12340,0),
+("SMSG_GOSSIP_COMPLETE",0x17E,12340,0),
+("CMSG_NPC_TEXT_QUERY",0x17F,12340,0),
+("SMSG_NPC_TEXT_UPDATE",0x180,12340,0),
+("SMSG_NPC_WONT_TALK",0x181,12340,0),
+("CMSG_QUESTGIVER_STATUS_QUERY",0x182,12340,0),
+("SMSG_QUESTGIVER_STATUS",0x183,12340,0),
+("CMSG_QUESTGIVER_HELLO",0x184,12340,0),
+("SMSG_QUESTGIVER_QUEST_LIST",0x185,12340,0),
+("CMSG_QUESTGIVER_QUERY_QUEST",0x186,12340,0),
+("CMSG_QUESTGIVER_QUEST_AUTOLAUNCH",0x187,12340,0),
+("SMSG_QUESTGIVER_QUEST_DETAILS",0x188,12340,0),
+("CMSG_QUESTGIVER_ACCEPT_QUEST",0x189,12340,0),
+("CMSG_QUESTGIVER_COMPLETE_QUEST",0x18A,12340,0),
+("SMSG_QUESTGIVER_REQUEST_ITEMS",0x18B,12340,0),
+("CMSG_QUESTGIVER_REQUEST_REWARD",0x18C,12340,0),
+("SMSG_QUESTGIVER_OFFER_REWARD",0x18D,12340,0),
+("CMSG_QUESTGIVER_CHOOSE_REWARD",0x18E,12340,0),
+("SMSG_QUESTGIVER_QUEST_INVALID",0x18F,12340,0),
+("CMSG_QUESTGIVER_CANCEL",0x190,12340,0),
+("SMSG_QUESTGIVER_QUEST_COMPLETE",0x191,12340,0),
+("SMSG_QUESTGIVER_QUEST_FAILED",0x192,12340,0),
+("CMSG_QUESTLOG_SWAP_QUEST",0x193,12340,0),
+("CMSG_QUESTLOG_REMOVE_QUEST",0x194,12340,0),
+("SMSG_QUESTLOG_FULL",0x195,12340,0),
+("SMSG_QUESTUPDATE_FAILED",0x196,12340,0),
+("SMSG_QUESTUPDATE_FAILEDTIMER",0x197,12340,0),
+("SMSG_QUESTUPDATE_COMPLETE",0x198,12340,0),
+("SMSG_QUESTUPDATE_ADD_KILL",0x199,12340,0),
+("SMSG_QUESTUPDATE_ADD_ITEM_OBSOLETE",0x19A,12340,0),
+("CMSG_QUEST_CONFIRM_ACCEPT",0x19B,12340,0),
+("SMSG_QUEST_CONFIRM_ACCEPT",0x19C,12340,0),
+("CMSG_PUSHQUESTTOPARTY",0x19D,12340,0),
+("CMSG_LIST_INVENTORY",0x19E,12340,0),
+("SMSG_LIST_INVENTORY",0x19F,12340,0),
+("CMSG_SELL_ITEM",0x1A0,12340,0),
+("SMSG_SELL_ITEM",0x1A1,12340,0),
+("CMSG_BUY_ITEM",0x1A2,12340,0),
+("CMSG_BUY_ITEM_IN_SLOT",0x1A3,12340,0),
+("SMSG_BUY_ITEM",0x1A4,12340,0),
+("SMSG_BUY_FAILED",0x1A5,12340,0),
+("CMSG_TAXICLEARALLNODES",0x1A6,12340,0),
+("CMSG_TAXIENABLEALLNODES",0x1A7,12340,0),
+("CMSG_TAXISHOWNODES",0x1A8,12340,0),
+("SMSG_SHOWTAXINODES",0x1A9,12340,0),
+("CMSG_TAXINODE_STATUS_QUERY",0x1AA,12340,0),
+("SMSG_TAXINODE_STATUS",0x1AB,12340,0),
+("CMSG_TAXIQUERYAVAILABLENODES",0x1AC,12340,0),
+("CMSG_ACTIVATETAXI",0x1AD,12340,0),
+("SMSG_ACTIVATETAXIREPLY",0x1AE,12340,0),
+("SMSG_NEW_TAXI_PATH",0x1AF,12340,0),
+("CMSG_TRAINER_LIST",0x1B0,12340,0),
+("SMSG_TRAINER_LIST",0x1B1,12340,0),
+("CMSG_TRAINER_BUY_SPELL",0x1B2,12340,0),
+("SMSG_TRAINER_BUY_SUCCEEDED",0x1B3,12340,0),
+("SMSG_TRAINER_BUY_FAILED",0x1B4,12340,0),
+("CMSG_BINDER_ACTIVATE",0x1B5,12340,0),
+("SMSG_PLAYERBINDERROR",0x1B6,12340,0),
+("CMSG_BANKER_ACTIVATE",0x1B7,12340,0),
+("SMSG_SHOW_BANK",0x1B8,12340,0),
+("CMSG_BUY_BANK_SLOT",0x1B9,12340,0),
+("SMSG_BUY_BANK_SLOT_RESULT",0x1BA,12340,0),
+("CMSG_PETITION_SHOWLIST",0x1BB,12340,0),
+("SMSG_PETITION_SHOWLIST",0x1BC,12340,0),
+("CMSG_PETITION_BUY",0x1BD,12340,0),
+("CMSG_PETITION_SHOW_SIGNATURES",0x1BE,12340,0),
+("SMSG_PETITION_SHOW_SIGNATURES",0x1BF,12340,0),
+("CMSG_PETITION_SIGN",0x1C0,12340,0),
+("SMSG_PETITION_SIGN_RESULTS",0x1C1,12340,0),
+("MSG_PETITION_DECLINE",0x1C2,12340,0),
+("CMSG_OFFER_PETITION",0x1C3,12340,0),
+("CMSG_TURN_IN_PETITION",0x1C4,12340,0),
+("SMSG_TURN_IN_PETITION_RESULTS",0x1C5,12340,0),
+("CMSG_PETITION_QUERY",0x1C6,12340,0),
+("SMSG_PETITION_QUERY_RESPONSE",0x1C7,12340,0),
+("SMSG_FISH_NOT_HOOKED",0x1C8,12340,0),
+("SMSG_FISH_ESCAPED",0x1C9,12340,0),
+("CMSG_BUG",0x1CA,12340,0),
+("SMSG_NOTIFICATION",0x1CB,12340,0),
+("CMSG_PLAYED_TIME",0x1CC,12340,0),
+("SMSG_PLAYED_TIME",0x1CD,12340,0),
+("CMSG_QUERY_TIME",0x1CE,12340,0),
+("SMSG_QUERY_TIME_RESPONSE",0x1CF,12340,0),
+("SMSG_LOG_XPGAIN",0x1D0,12340,0),
+("SMSG_AURACASTLOG",0x1D1,12340,0),
+("CMSG_RECLAIM_CORPSE",0x1D2,12340,0),
+("CMSG_WRAP_ITEM",0x1D3,12340,0),
+("SMSG_LEVELUP_INFO",0x1D4,12340,0),
+("MSG_MINIMAP_PING",0x1D5,12340,0),
+("SMSG_RESISTLOG",0x1D6,12340,0),
+("SMSG_ENCHANTMENTLOG",0x1D7,12340,0),
+("CMSG_SET_SKILL_CHEAT",0x1D8,12340,0),
+("SMSG_START_MIRROR_TIMER",0x1D9,12340,0),
+("SMSG_PAUSE_MIRROR_TIMER",0x1DA,12340,0),
+("SMSG_STOP_MIRROR_TIMER",0x1DB,12340,0),
+("CMSG_PING",0x1DC,12340,0),
+("SMSG_PONG",0x1DD,12340,0),
+("SMSG_CLEAR_COOLDOWN",0x1DE,12340,0),
+("SMSG_GAMEOBJECT_PAGETEXT",0x1DF,12340,0),
+("CMSG_SETSHEATHED",0x1E0,12340,0),
+("SMSG_COOLDOWN_CHEAT",0x1E1,12340,0),
+("SMSG_SPELL_DELAYED",0x1E2,12340,0),
+("CMSG_QUEST_POI_QUERY",0x1E3,12340,0),
+("SMSG_QUEST_POI_QUERY_RESPONSE",0x1E4,12340,0),
+("CMSG_GHOST",0x1E5,12340,0),
+("CMSG_GM_INVIS",0x1E6,12340,0),
+("SMSG_INVALID_PROMOTION_CODE",0x1E7,12340,0),
+("MSG_GM_BIND_OTHER",0x1E8,12340,0),
+("MSG_GM_SUMMON",0x1E9,12340,0),
+("SMSG_ITEM_TIME_UPDATE",0x1EA,12340,0),
+("SMSG_ITEM_ENCHANT_TIME_UPDATE",0x1EB,12340,0),
+("SMSG_AUTH_CHALLENGE",0x1EC,12340,0),
+("CMSG_AUTH_SESSION",0x1ED,12340,0),
+("SMSG_AUTH_RESPONSE",0x1EE,12340,0),
+("MSG_GM_SHOWLABEL",0x1EF,12340,0),
+("CMSG_PET_CAST_SPELL",0x1F0,12340,0),
+("MSG_SAVE_GUILD_EMBLEM",0x1F1,12340,0),
+("MSG_TABARDVENDOR_ACTIVATE",0x1F2,12340,0),
+("SMSG_PLAY_SPELL_VISUAL",0x1F3,12340,0),
+("CMSG_ZONEUPDATE",0x1F4,12340,0),
+("SMSG_PARTYKILLLOG",0x1F5,12340,0),
+("SMSG_COMPRESSED_UPDATE_OBJECT",0x1F6,12340,0),
+("SMSG_PLAY_SPELL_IMPACT",0x1F7,12340,0),
+("SMSG_EXPLORATION_EXPERIENCE",0x1F8,12340,0),
+("CMSG_GM_SET_SECURITY_GROUP",0x1F9,12340,0),
+("CMSG_GM_NUKE",0x1FA,12340,0),
+("MSG_RANDOM_ROLL",0x1FB,12340,0),
+("SMSG_ENVIRONMENTALDAMAGELOG",0x1FC,12340,0),
+("CMSG_CHANGEPLAYER_DIFFICULTY",0x1FD,12340,0),
+("SMSG_RWHOIS",0x1FE,12340,0),
+("SMSG_LFG_PLAYER_REWARD",0x1FF,12340,0),
+("SMSG_LFG_TELEPORT_DENIED",0x200,12340,0),
+("CMSG_UNLEARN_SPELL",0x201,12340,0),
+("CMSG_UNLEARN_SKILL",0x202,12340,0),
+("SMSG_REMOVED_SPELL",0x203,12340,0),
+("CMSG_DECHARGE",0x204,12340,0),
+("CMSG_GMTICKET_CREATE",0x205,12340,0),
+("SMSG_GMTICKET_CREATE",0x206,12340,0),
+("CMSG_GMTICKET_UPDATETEXT",0x207,12340,0),
+("SMSG_GMTICKET_UPDATETEXT",0x208,12340,0),
+("SMSG_ACCOUNT_DATA_TIMES",0x209,12340,0),
+("CMSG_REQUEST_ACCOUNT_DATA",0x20A,12340,0),
+("CMSG_UPDATE_ACCOUNT_DATA",0x20B,12340,0),
+("SMSG_UPDATE_ACCOUNT_DATA",0x20C,12340,0),
+("SMSG_CLEAR_FAR_SIGHT_IMMEDIATE",0x20D,12340,0),
+("SMSG_CHANGEPLAYER_DIFFICULTY_RESULT",0x20E,12340,0),
+("CMSG_GM_TEACH",0x20F,12340,0),
+("CMSG_GM_CREATE_ITEM_TARGET",0x210,12340,0),
+("CMSG_GMTICKET_GETTICKET",0x211,12340,0),
+("SMSG_GMTICKET_GETTICKET",0x212,12340,0),
+("CMSG_UNLEARN_TALENTS",0x213,12340,0),
+("SMSG_INSTANCE_ENCOUNTER",0x214,12340,0),
+("SMSG_GAMEOBJECT_DESPAWN_ANIM",0x215,12340,0),
+("MSG_CORPSE_QUERY",0x216,12340,0),
+("CMSG_GMTICKET_DELETETICKET",0x217,12340,0),
+("SMSG_GMTICKET_DELETETICKET",0x218,12340,0),
+("SMSG_CHAT_WRONG_FACTION",0x219,12340,0),
+("CMSG_GMTICKET_SYSTEMSTATUS",0x21A,12340,0),
+("SMSG_GMTICKET_SYSTEMSTATUS",0x21B,12340,0),
+("CMSG_SPIRIT_HEALER_ACTIVATE",0x21C,12340,0),
+("CMSG_SET_STAT_CHEAT",0x21D,12340,0),
+("SMSG_QUEST_FORCE_REMOVED",0x21E,12340,0),
+("CMSG_SKILL_BUY_STEP",0x21F,12340,0),
+("CMSG_SKILL_BUY_RANK",0x220,12340,0),
+("CMSG_XP_CHEAT",0x221,12340,0),
+("SMSG_SPIRIT_HEALER_CONFIRM",0x222,12340,0),
+("CMSG_CHARACTER_POINT_CHEAT",0x223,12340,0),
+("SMSG_GOSSIP_POI",0x224,12340,0),
+("CMSG_CHAT_IGNORED",0x225,12340,0),
+("CMSG_GM_VISION",0x226,12340,0),
+("CMSG_SERVER_COMMAND",0x227,12340,0),
+("CMSG_GM_SILENCE",0x228,12340,0),
+("CMSG_GM_REVEALTO",0x229,12340,0),
+("CMSG_GM_RESURRECT",0x22A,12340,0),
+("CMSG_GM_SUMMONMOB",0x22B,12340,0),
+("CMSG_GM_MOVECORPSE",0x22C,12340,0),
+("CMSG_GM_FREEZE",0x22D,12340,0),
+("CMSG_GM_UBERINVIS",0x22E,12340,0),
+("CMSG_GM_REQUEST_PLAYER_INFO",0x22F,12340,0),
+("SMSG_GM_PLAYER_INFO",0x230,12340,0),
+("CMSG_GUILD_RANK",0x231,12340,0),
+("CMSG_GUILD_ADD_RANK",0x232,12340,0),
+("CMSG_GUILD_DEL_RANK",0x233,12340,0),
+("CMSG_GUILD_SET_PUBLIC_NOTE",0x234,12340,0),
+("CMSG_GUILD_SET_OFFICER_NOTE",0x235,12340,0),
+("SMSG_LOGIN_VERIFY_WORLD",0x236,12340,0),
+("CMSG_CLEAR_EXPLORATION",0x237,12340,0),
+("CMSG_SEND_MAIL",0x238,12340,0),
+("SMSG_SEND_MAIL_RESULT",0x239,12340,0),
+("CMSG_GET_MAIL_LIST",0x23A,12340,0),
+("SMSG_MAIL_LIST_RESULT",0x23B,12340,0),
+("CMSG_BATTLEFIELD_LIST",0x23C,12340,0),
+("SMSG_BATTLEFIELD_LIST",0x23D,12340,0),
+("CMSG_BATTLEFIELD_JOIN",0x23E,12340,0),
+("SMSG_FORCE_SET_VEHICLE_REC_ID",0x23F,12340,0),
+("CMSG_SET_VEHICLE_REC_ID_ACK",0x240,12340,0),
+("CMSG_TAXICLEARNODE",0x241,12340,0),
+("CMSG_TAXIENABLENODE",0x242,12340,0),
+("CMSG_ITEM_TEXT_QUERY",0x243,12340,0),
+("SMSG_ITEM_TEXT_QUERY_RESPONSE",0x244,12340,0),
+("CMSG_MAIL_TAKE_MONEY",0x245,12340,0),
+("CMSG_MAIL_TAKE_ITEM",0x246,12340,0),
+("CMSG_MAIL_MARK_AS_READ",0x247,12340,0),
+("CMSG_MAIL_RETURN_TO_SENDER",0x248,12340,0),
+("CMSG_MAIL_DELETE",0x249,12340,0),
+("CMSG_MAIL_CREATE_TEXT_ITEM",0x24A,12340,0),
+("SMSG_SPELLLOGMISS",0x24B,12340,0),
+("SMSG_SPELLLOGEXECUTE",0x24C,12340,0),
+("SMSG_DEBUGAURAPROC",0x24D,12340,0),
+("SMSG_PERIODICAURALOG",0x24E,12340,0),
+("SMSG_SPELLDAMAGESHIELD",0x24F,12340,0),
+("SMSG_SPELLNONMELEEDAMAGELOG",0x250,12340,0),
+("CMSG_LEARN_TALENT",0x251,12340,0),
+("SMSG_RESURRECT_FAILED",0x252,12340,0),
+("CMSG_TOGGLE_PVP",0x253,12340,0),
+("SMSG_ZONE_UNDER_ATTACK",0x254,12340,0),
+("MSG_AUCTION_HELLO",0x255,12340,0),
+("CMSG_AUCTION_SELL_ITEM",0x256,12340,0),
+("CMSG_AUCTION_REMOVE_ITEM",0x257,12340,0),
+("CMSG_AUCTION_LIST_ITEMS",0x258,12340,0),
+("CMSG_AUCTION_LIST_OWNER_ITEMS",0x259,12340,0),
+("CMSG_AUCTION_PLACE_BID",0x25A,12340,0),
+("SMSG_AUCTION_COMMAND_RESULT",0x25B,12340,0),
+("SMSG_AUCTION_LIST_RESULT",0x25C,12340,0),
+("SMSG_AUCTION_OWNER_LIST_RESULT",0x25D,12340,0),
+("SMSG_AUCTION_BIDDER_NOTIFICATION",0x25E,12340,0),
+("SMSG_AUCTION_OWNER_NOTIFICATION",0x25F,12340,0),
+("SMSG_PROCRESIST",0x260,12340,0),
+("SMSG_COMBAT_EVENT_FAILED",0x261,12340,0),
+("SMSG_DISPEL_FAILED",0x262,12340,0),
+("SMSG_SPELLORDAMAGE_IMMUNE",0x263,12340,0),
+("CMSG_AUCTION_LIST_BIDDER_ITEMS",0x264,12340,0),
+("SMSG_AUCTION_BIDDER_LIST_RESULT",0x265,12340,0),
+("SMSG_SET_FLAT_SPELL_MODIFIER",0x266,12340,0),
+("SMSG_SET_PCT_SPELL_MODIFIER",0x267,12340,0),
+("CMSG_SET_AMMO",0x268,12340,0),
+("SMSG_CORPSE_RECLAIM_DELAY",0x269,12340,0),
+("CMSG_SET_ACTIVE_MOVER",0x26A,12340,0),
+("CMSG_PET_CANCEL_AURA",0x26B,12340,0),
+("CMSG_PLAYER_AI_CHEAT",0x26C,12340,0),
+("CMSG_CANCEL_AUTO_REPEAT_SPELL",0x26D,12340,0),
+("MSG_GM_ACCOUNT_ONLINE",0x26E,12340,0),
+("MSG_LIST_STABLED_PETS",0x26F,12340,0),
+("CMSG_STABLE_PET",0x270,12340,0),
+("CMSG_UNSTABLE_PET",0x271,12340,0),
+("CMSG_BUY_STABLE_SLOT",0x272,12340,0),
+("SMSG_STABLE_RESULT",0x273,12340,0),
+("CMSG_STABLE_REVIVE_PET",0x274,12340,0),
+("CMSG_STABLE_SWAP_PET",0x275,12340,0),
+("MSG_QUEST_PUSH_RESULT",0x276,12340,0),
+("SMSG_PLAY_MUSIC",0x277,12340,0),
+("SMSG_PLAY_OBJECT_SOUND",0x278,12340,0),
+("CMSG_REQUEST_PET_INFO",0x279,12340,0),
+("CMSG_FAR_SIGHT",0x27A,12340,0),
+("SMSG_SPELLDISPELLOG",0x27B,12340,0),
+("SMSG_DAMAGE_CALC_LOG",0x27C,12340,0),
+("CMSG_ENABLE_DAMAGE_LOG",0x27D,12340,0),
+("CMSG_GROUP_CHANGE_SUB_GROUP",0x27E,12340,0),
+("CMSG_REQUEST_PARTY_MEMBER_STATS",0x27F,12340,0),
+("CMSG_GROUP_SWAP_SUB_GROUP",0x280,12340,0),
+("CMSG_RESET_FACTION_CHEAT",0x281,12340,0),
+("CMSG_AUTOSTORE_BANK_ITEM",0x282,12340,0),
+("CMSG_AUTOBANK_ITEM",0x283,12340,0),
+("MSG_QUERY_NEXT_MAIL_TIME",0x284,12340,0),
+("SMSG_RECEIVED_MAIL",0x285,12340,0),
+("SMSG_RAID_GROUP_ONLY",0x286,12340,0),
+("CMSG_SET_DURABILITY_CHEAT",0x287,12340,0),
+("CMSG_SET_PVP_RANK_CHEAT",0x288,12340,0),
+("CMSG_ADD_PVP_MEDAL_CHEAT",0x289,12340,0),
+("CMSG_DEL_PVP_MEDAL_CHEAT",0x28A,12340,0),
+("CMSG_SET_PVP_TITLE",0x28B,12340,0),
+("SMSG_PVP_CREDIT",0x28C,12340,0),
+("SMSG_AUCTION_REMOVED_NOTIFICATION",0x28D,12340,0),
+("CMSG_GROUP_RAID_CONVERT",0x28E,12340,0),
+("CMSG_GROUP_ASSISTANT_LEADER",0x28F,12340,0),
+("CMSG_BUYBACK_ITEM",0x290,12340,0),
+("SMSG_SERVER_MESSAGE",0x291,12340,0),
+("CMSG_SET_SAVED_INSTANCE_EXTEND",0x292,12340,0),
+("SMSG_LFG_OFFER_CONTINUE",0x293,12340,0),
+("CMSG_TEST_DROP_RATE",0x294,12340,0),
+("SMSG_TEST_DROP_RATE_RESULT",0x295,12340,0),
+("CMSG_LFG_GET_STATUS",0x296,12340,0),
+("SMSG_SHOW_MAILBOX",0x297,12340,0),
+("SMSG_RESET_RANGED_COMBAT_TIMER",0x298,12340,0),
+("SMSG_CHAT_NOT_IN_PARTY",0x299,12340,0),
+("CMSG_GMTICKETSYSTEM_TOGGLE",0x29A,12340,0),
+("CMSG_CANCEL_GROWTH_AURA",0x29B,12340,0),
+("SMSG_CANCEL_AUTO_REPEAT",0x29C,12340,0),
+("SMSG_STANDSTATE_UPDATE",0x29D,12340,0),
+("SMSG_LOOT_ALL_PASSED",0x29E,12340,0),
+("SMSG_LOOT_ROLL_WON",0x29F,12340,0),
+("CMSG_LOOT_ROLL",0x2A0,12340,0),
+("SMSG_LOOT_START_ROLL",0x2A1,12340,0),
+("SMSG_LOOT_ROLL",0x2A2,12340,0),
+("CMSG_LOOT_MASTER_GIVE",0x2A3,12340,0),
+("SMSG_LOOT_MASTER_LIST",0x2A4,12340,0),
+("SMSG_SET_FORCED_REACTIONS",0x2A5,12340,0),
+("SMSG_SPELL_FAILED_OTHER",0x2A6,12340,0),
+("SMSG_GAMEOBJECT_RESET_STATE",0x2A7,12340,0),
+("CMSG_REPAIR_ITEM",0x2A8,12340,0),
+("SMSG_CHAT_PLAYER_NOT_FOUND",0x2A9,12340,0),
+("MSG_TALENT_WIPE_CONFIRM",0x2AA,12340,0),
+("SMSG_SUMMON_REQUEST",0x2AB,12340,0),
+("CMSG_SUMMON_RESPONSE",0x2AC,12340,0),
+("MSG_DEV_SHOWLABEL",0x2AD,12340,0),
+("SMSG_MONSTER_MOVE_TRANSPORT",0x2AE,12340,0),
+("SMSG_PET_BROKEN",0x2AF,12340,0),
+("MSG_MOVE_FEATHER_FALL",0x2B0,12340,0),
+("MSG_MOVE_WATER_WALK",0x2B1,12340,0),
+("CMSG_SERVER_BROADCAST",0x2B2,12340,0),
+("CMSG_SELF_RES",0x2B3,12340,0),
+("SMSG_FEIGN_DEATH_RESISTED",0x2B4,12340,0),
+("CMSG_RUN_SCRIPT",0x2B5,12340,0),
+("SMSG_SCRIPT_MESSAGE",0x2B6,12340,0),
+("SMSG_DUEL_COUNTDOWN",0x2B7,12340,0),
+("SMSG_AREA_TRIGGER_MESSAGE",0x2B8,12340,0),
+("CMSG_SHOWING_HELM",0x2B9,12340,0),
+("CMSG_SHOWING_CLOAK",0x2BA,12340,0),
+("SMSG_ROLE_CHOSEN",0x2BB,12340,0),
+("SMSG_PLAYER_SKINNED",0x2BC,12340,0),
+("SMSG_DURABILITY_DAMAGE_DEATH",0x2BD,12340,0),
+("CMSG_SET_EXPLORATION",0x2BE,12340,0),
+("CMSG_SET_ACTIONBAR_TOGGLES",0x2BF,12340,0),
+("UMSG_DELETE_GUILD_CHARTER",0x2C0,12340,0),
+("MSG_PETITION_RENAME",0x2C1,12340,0),
+("SMSG_INIT_WORLD_STATES",0x2C2,12340,0),
+("SMSG_UPDATE_WORLD_STATE",0x2C3,12340,0),
+("CMSG_ITEM_NAME_QUERY",0x2C4,12340,0),
+("SMSG_ITEM_NAME_QUERY_RESPONSE",0x2C5,12340,0),
+("SMSG_PET_ACTION_FEEDBACK",0x2C6,12340,0),
+("CMSG_CHAR_RENAME",0x2C7,12340,0),
+("SMSG_CHAR_RENAME",0x2C8,12340,0),
+("CMSG_MOVE_SPLINE_DONE",0x2C9,12340,0),
+("CMSG_MOVE_FALL_RESET",0x2CA,12340,0),
+("SMSG_INSTANCE_SAVE_CREATED",0x2CB,12340,0),
+("SMSG_RAID_INSTANCE_INFO",0x2CC,12340,0),
+("CMSG_REQUEST_RAID_INFO",0x2CD,12340,0),
+("CMSG_MOVE_TIME_SKIPPED",0x2CE,12340,0),
+("CMSG_MOVE_FEATHER_FALL_ACK",0x2CF,12340,0),
+("CMSG_MOVE_WATER_WALK_ACK",0x2D0,12340,0),
+("CMSG_MOVE_NOT_ACTIVE_MOVER",0x2D1,12340,0),
+("SMSG_PLAY_SOUND",0x2D2,12340,0),
+("CMSG_BATTLEFIELD_STATUS",0x2D3,12340,0),
+("SMSG_BATTLEFIELD_STATUS",0x2D4,12340,0),
+("CMSG_BATTLEFIELD_PORT",0x2D5,12340,0),
+("MSG_INSPECT_HONOR_STATS",0x2D6,12340,0),
+("CMSG_BATTLEMASTER_HELLO",0x2D7,12340,0),
+("CMSG_MOVE_START_SWIM_CHEAT",0x2D8,12340,0),
+("CMSG_MOVE_STOP_SWIM_CHEAT",0x2D9,12340,0),
+("SMSG_FORCE_WALK_SPEED_CHANGE",0x2DA,12340,0),
+("CMSG_FORCE_WALK_SPEED_CHANGE_ACK",0x2DB,12340,0),
+("SMSG_FORCE_SWIM_BACK_SPEED_CHANGE",0x2DC,12340,0),
+("CMSG_FORCE_SWIM_BACK_SPEED_CHANGE_ACK",0x2DD,12340,0),
+("SMSG_FORCE_TURN_RATE_CHANGE",0x2DE,12340,0),
+("CMSG_FORCE_TURN_RATE_CHANGE_ACK",0x2DF,12340,0),
+("MSG_PVP_LOG_DATA",0x2E0,12340,0),
+("CMSG_LEAVE_BATTLEFIELD",0x2E1,12340,0),
+("CMSG_AREA_SPIRIT_HEALER_QUERY",0x2E2,12340,0),
+("CMSG_AREA_SPIRIT_HEALER_QUEUE",0x2E3,12340,0),
+("SMSG_AREA_SPIRIT_HEALER_TIME",0x2E4,12340,0),
+("CMSG_GM_UNTEACH",0x2E5,12340,0),
+("SMSG_WARDEN_DATA",0x2E6,12340,0),
+("CMSG_WARDEN_DATA",0x2E7,12340,0),
+("SMSG_GROUP_JOINED_BATTLEGROUND",0x2E8,12340,0),
+("MSG_BATTLEGROUND_PLAYER_POSITIONS",0x2E9,12340,0),
+("CMSG_PET_STOP_ATTACK",0x2EA,12340,0),
+("SMSG_BINDER_CONFIRM",0x2EB,12340,0),
+("SMSG_BATTLEGROUND_PLAYER_JOINED",0x2EC,12340,0),
+("SMSG_BATTLEGROUND_PLAYER_LEFT",0x2ED,12340,0),
+("CMSG_BATTLEMASTER_JOIN",0x2EE,12340,0),
+("SMSG_ADDON_INFO",0x2EF,12340,0),
+("CMSG_PET_UNLEARN",0x2F0,12340,0),
+("SMSG_PET_UNLEARN_CONFIRM",0x2F1,12340,0),
+("SMSG_PARTY_MEMBER_STATS_FULL",0x2F2,12340,0),
+("CMSG_PET_SPELL_AUTOCAST",0x2F3,12340,0),
+("SMSG_WEATHER",0x2F4,12340,0),
+("SMSG_PLAY_TIME_WARNING",0x2F5,12340,0),
+("SMSG_MINIGAME_SETUP",0x2F6,12340,0),
+("SMSG_MINIGAME_STATE",0x2F7,12340,0),
+("CMSG_MINIGAME_MOVE",0x2F8,12340,0),
+("SMSG_MINIGAME_MOVE_FAILED",0x2F9,12340,0),
+("SMSG_RAID_INSTANCE_MESSAGE",0x2FA,12340,0),
+("SMSG_COMPRESSED_MOVES",0x2FB,12340,0),
+("CMSG_GUILD_INFO_TEXT",0x2FC,12340,0),
+("SMSG_CHAT_RESTRICTED",0x2FD,12340,0),
+("SMSG_SPLINE_SET_RUN_SPEED",0x2FE,12340,0),
+("SMSG_SPLINE_SET_RUN_BACK_SPEED",0x2FF,12340,0),
+("SMSG_SPLINE_SET_SWIM_SPEED",0x300,12340,0),
+("SMSG_SPLINE_SET_WALK_SPEED",0x301,12340,0),
+("SMSG_SPLINE_SET_SWIM_BACK_SPEED",0x302,12340,0),
+("SMSG_SPLINE_SET_TURN_RATE",0x303,12340,0),
+("SMSG_SPLINE_MOVE_UNROOT",0x304,12340,0),
+("SMSG_SPLINE_MOVE_FEATHER_FALL",0x305,12340,0),
+("SMSG_SPLINE_MOVE_NORMAL_FALL",0x306,12340,0),
+("SMSG_SPLINE_MOVE_SET_HOVER",0x307,12340,0),
+("SMSG_SPLINE_MOVE_UNSET_HOVER",0x308,12340,0),
+("SMSG_SPLINE_MOVE_WATER_WALK",0x309,12340,0),
+("SMSG_SPLINE_MOVE_LAND_WALK",0x30A,12340,0),
+("SMSG_SPLINE_MOVE_START_SWIM",0x30B,12340,0),
+("SMSG_SPLINE_MOVE_STOP_SWIM",0x30C,12340,0),
+("SMSG_SPLINE_MOVE_SET_RUN_MODE",0x30D,12340,0),
+("SMSG_SPLINE_MOVE_SET_WALK_MODE",0x30E,12340,0),
+("CMSG_GM_NUKE_ACCOUNT",0x30F,12340,0),
+("MSG_GM_DESTROY_CORPSE",0x310,12340,0),
+("CMSG_GM_DESTROY_ONLINE_CORPSE",0x311,12340,0),
+("CMSG_ACTIVATETAXIEXPRESS",0x312,12340,0),
+("SMSG_SET_FACTION_ATWAR",0x313,12340,0),
+("SMSG_GAMETIMEBIAS_SET",0x314,12340,0),
+("CMSG_DEBUG_ACTIONS_START",0x315,12340,0),
+("CMSG_DEBUG_ACTIONS_STOP",0x316,12340,0),
+("CMSG_SET_FACTION_INACTIVE",0x317,12340,0),
+("CMSG_SET_WATCHED_FACTION",0x318,12340,0),
+("MSG_MOVE_TIME_SKIPPED",0x319,12340,0),
+("SMSG_SPLINE_MOVE_ROOT",0x31A,12340,0),
+("CMSG_SET_EXPLORATION_ALL",0x31B,12340,0),
+("SMSG_INVALIDATE_PLAYER",0x31C,12340,0),
+("CMSG_RESET_INSTANCES",0x31D,12340,0),
+("SMSG_INSTANCE_RESET",0x31E,12340,0),
+("SMSG_INSTANCE_RESET_FAILED",0x31F,12340,0),
+("SMSG_UPDATE_LAST_INSTANCE",0x320,12340,0),
+("MSG_RAID_TARGET_UPDATE",0x321,12340,0),
+("MSG_RAID_READY_CHECK",0x322,12340,0),
+("CMSG_LUA_USAGE",0x323,12340,0),
+("SMSG_PET_ACTION_SOUND",0x324,12340,0),
+("SMSG_PET_DISMISS_SOUND",0x325,12340,0),
+("SMSG_GHOSTEE_GONE",0x326,12340,0),
+("CMSG_GM_UPDATE_TICKET_STATUS",0x327,12340,0),
+("SMSG_GM_TICKET_STATUS_UPDATE",0x328,12340,0),
+("MSG_SET_DUNGEON_DIFFICULTY",0x329,12340,0),
+("CMSG_GMSURVEY_SUBMIT",0x32A,12340,0),
+("SMSG_UPDATE_INSTANCE_OWNERSHIP",0x32B,12340,0),
+("CMSG_IGNORE_KNOCKBACK_CHEAT",0x32C,12340,0),
+("SMSG_CHAT_PLAYER_AMBIGUOUS",0x32D,12340,0),
+("MSG_DELAY_GHOST_TELEPORT",0x32E,12340,0),
+("SMSG_SPELLINSTAKILLLOG",0x32F,12340,0),
+("SMSG_SPELL_UPDATE_CHAIN_TARGETS",0x330,12340,0),
+("CMSG_CHAT_FILTERED",0x331,12340,0),
+("SMSG_EXPECTED_SPAM_RECORDS",0x332,12340,0),
+("SMSG_SPELLSTEALLOG",0x333,12340,0),
+("CMSG_LOTTERY_QUERY_OBSOLETE",0x334,12340,0),
+("SMSG_LOTTERY_QUERY_RESULT_OBSOLETE",0x335,12340,0),
+("CMSG_BUY_LOTTERY_TICKET_OBSOLETE",0x336,12340,0),
+("SMSG_LOTTERY_RESULT_OBSOLETE",0x337,12340,0),
+("SMSG_CHARACTER_PROFILE",0x338,12340,0),
+("SMSG_CHARACTER_PROFILE_REALM_CONNECTED",0x339,12340,0),
+("SMSG_DEFENSE_MESSAGE",0x33A,12340,0),
+("SMSG_INSTANCE_DIFFICULTY",0x33B,12340,0),
+("MSG_GM_RESETINSTANCELIMIT",0x33C,12340,0),
+("SMSG_MOTD",0x33D,12340,0),
+("SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x33E,12340,0),
+("SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x33F,12340,0),
+("CMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY_ACK",0x340,12340,0),
+("MSG_MOVE_START_SWIM_CHEAT",0x341,12340,0),
+("MSG_MOVE_STOP_SWIM_CHEAT",0x342,12340,0),
+("SMSG_MOVE_SET_CAN_FLY",0x343,12340,0),
+("SMSG_MOVE_UNSET_CAN_FLY",0x344,12340,0),
+("CMSG_MOVE_SET_CAN_FLY_ACK",0x345,12340,0),
+("CMSG_MOVE_SET_FLY",0x346,12340,0),
+("CMSG_SOCKET_GEMS",0x347,12340,0),
+("CMSG_ARENA_TEAM_CREATE",0x348,12340,0),
+("SMSG_ARENA_TEAM_COMMAND_RESULT",0x349,12340,0),
+("MSG_MOVE_UPDATE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x34A,12340,0),
+("CMSG_ARENA_TEAM_QUERY",0x34B,12340,0),
+("SMSG_ARENA_TEAM_QUERY_RESPONSE",0x34C,12340,0),
+("CMSG_ARENA_TEAM_ROSTER",0x34D,12340,0),
+("SMSG_ARENA_TEAM_ROSTER",0x34E,12340,0),
+("CMSG_ARENA_TEAM_INVITE",0x34F,12340,0),
+("SMSG_ARENA_TEAM_INVITE",0x350,12340,0),
+("CMSG_ARENA_TEAM_ACCEPT",0x351,12340,0),
+("CMSG_ARENA_TEAM_DECLINE",0x352,12340,0),
+("CMSG_ARENA_TEAM_LEAVE",0x353,12340,0),
+("CMSG_ARENA_TEAM_REMOVE",0x354,12340,0),
+("CMSG_ARENA_TEAM_DISBAND",0x355,12340,0),
+("CMSG_ARENA_TEAM_LEADER",0x356,12340,0),
+("SMSG_ARENA_TEAM_EVENT",0x357,12340,0),
+("CMSG_BATTLEMASTER_JOIN_ARENA",0x358,12340,0),
+("MSG_MOVE_START_ASCEND",0x359,12340,0),
+("MSG_MOVE_STOP_ASCEND",0x35A,12340,0),
+("SMSG_ARENA_TEAM_STATS",0x35B,12340,0),
+("CMSG_LFG_JOIN",0x35C,12340,0),
+("CMSG_LFG_LEAVE",0x35D,12340,0),
+("CMSG_LFG_SEARCH_JOIN",0x35E,12340,0),
+("CMSG_LFG_SEARCH_LEAVE",0x35F,12340,0),
+("SMSG_LFG_SEARCH_RESULTS",0x360,12340,0),
+("SMSG_LFG_PROPOSAL_UPDATE",0x361,12340,0),
+("CMSG_LFG_PROPOSAL_RESPONSE",0x362,12340,0),
+("SMSG_LFG_ROLE_CHECK_UPDATE",0x363,12340,0),
+("SMSG_LFG_JOIN_RESULT",0x364,12340,0),
+("SMSG_LFG_QUEUE_STATUS",0x365,12340,0),
+("CMSG_SET_LFG_COMMENT",0x366,12340,0),
+("SMSG_LFG_UPDATE_PLAYER",0x367,12340,0),
+("SMSG_LFG_UPDATE_PARTY",0x368,12340,0),
+("SMSG_LFG_UPDATE_SEARCH",0x369,12340,0),
+("CMSG_LFG_SET_ROLES",0x36A,12340,0),
+("CMSG_LFG_SET_NEEDS",0x36B,12340,0),
+("CMSG_LFG_BOOT_PLAYER_VOTE",0x36C,12340,0),
+("SMSG_LFG_BOOT_PLAYER",0x36D,12340,0),
+("CMSG_LFG_GET_PLAYER_INFO",0x36E,12340,0),
+("SMSG_LFG_PLAYER_INFO",0x36F,12340,0),
+("CMSG_LFG_TELEPORT",0x370,12340,0),
+("CMSG_LFG_GET_PARTY_INFO",0x371,12340,0),
+("SMSG_LFG_PARTY_INFO",0x372,12340,0),
+("SMSG_TITLE_EARNED",0x373,12340,0),
+("CMSG_SET_TITLE",0x374,12340,0),
+("CMSG_CANCEL_MOUNT_AURA",0x375,12340,0),
+("SMSG_ARENA_ERROR",0x376,12340,0),
+("MSG_INSPECT_ARENA_TEAMS",0x377,12340,0),
+("SMSG_DEATH_RELEASE_LOC",0x378,12340,0),
+("CMSG_CANCEL_TEMP_ENCHANTMENT",0x379,12340,0),
+("SMSG_FORCED_DEATH_UPDATE",0x37A,12340,0),
+("CMSG_CHEAT_SET_HONOR_CURRENCY",0x37B,12340,0),
+("CMSG_CHEAT_SET_ARENA_CURRENCY",0x37C,12340,0),
+("MSG_MOVE_SET_FLIGHT_SPEED_CHEAT",0x37D,12340,0),
+("MSG_MOVE_SET_FLIGHT_SPEED",0x37E,12340,0),
+("MSG_MOVE_SET_FLIGHT_BACK_SPEED_CHEAT",0x37F,12340,0),
+("MSG_MOVE_SET_FLIGHT_BACK_SPEED",0x380,12340,0),
+("SMSG_FORCE_FLIGHT_SPEED_CHANGE",0x381,12340,0),
+("CMSG_FORCE_FLIGHT_SPEED_CHANGE_ACK",0x382,12340,0),
+("SMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE",0x383,12340,0),
+("CMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE_ACK",0x384,12340,0),
+("SMSG_SPLINE_SET_FLIGHT_SPEED",0x385,12340,0),
+("SMSG_SPLINE_SET_FLIGHT_BACK_SPEED",0x386,12340,0),
+("CMSG_MAELSTROM_INVALIDATE_CACHE",0x387,12340,0),
+("SMSG_FLIGHT_SPLINE_SYNC",0x388,12340,0),
+("CMSG_SET_TAXI_BENCHMARK_MODE",0x389,12340,0),
+("SMSG_JOINED_BATTLEGROUND_QUEUE",0x38A,12340,0),
+("SMSG_REALM_SPLIT",0x38B,12340,0),
+("CMSG_REALM_SPLIT",0x38C,12340,0),
+("CMSG_MOVE_CHNG_TRANSPORT",0x38D,12340,0),
+("MSG_PARTY_ASSIGNMENT",0x38E,12340,0),
+("SMSG_OFFER_PETITION_ERROR",0x38F,12340,0),
+("SMSG_TIME_SYNC_REQ",0x390,12340,0),
+("CMSG_TIME_SYNC_RESP",0x391,12340,0),
+("CMSG_SEND_LOCAL_EVENT",0x392,12340,0),
+("CMSG_SEND_GENERAL_TRIGGER",0x393,12340,0),
+("CMSG_SEND_COMBAT_TRIGGER",0x394,12340,0),
+("CMSG_MAELSTROM_GM_SENT_MAIL",0x395,12340,0),
+("SMSG_RESET_FAILED_NOTIFY",0x396,12340,0),
+("SMSG_REAL_GROUP_UPDATE",0x397,12340,0),
+("SMSG_LFG_DISABLED",0x398,12340,0),
+("CMSG_ACTIVE_PVP_CHEAT",0x399,12340,0),
+("CMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY",0x39A,12340,0),
+("SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE",0x39B,12340,0),
+("SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE_WRITE_FILE",0x39C,12340,0),
+("SMSG_UPDATE_COMBO_POINTS",0x39D,12340,0),
+("SMSG_VOICE_SESSION_ROSTER_UPDATE",0x39E,12340,0),
+("SMSG_VOICE_SESSION_LEAVE",0x39F,12340,0),
+("SMSG_VOICE_SESSION_ADJUST_PRIORITY",0x3A0,12340,0),
+("CMSG_VOICE_SET_TALKER_MUTED_REQUEST",0x3A1,12340,0),
+("SMSG_VOICE_SET_TALKER_MUTED",0x3A2,12340,0),
+("SMSG_INIT_EXTRA_AURA_INFO_OBSOLETE",0x3A3,12340,0),
+("SMSG_SET_EXTRA_AURA_INFO_OBSOLETE",0x3A4,12340,0),
+("SMSG_SET_EXTRA_AURA_INFO_NEED_UPDATE_OBSOLETE",0x3A5,12340,0),
+("SMSG_CLEAR_EXTRA_AURA_INFO_OBSOLETE",0x3A6,12340,0),
+("MSG_MOVE_START_DESCEND",0x3A7,12340,0),
+("CMSG_IGNORE_REQUIREMENTS_CHEAT",0x3A8,12340,0),
+("SMSG_IGNORE_REQUIREMENTS_CHEAT",0x3A9,12340,0),
+("SMSG_SPELL_CHANCE_PROC_LOG",0x3AA,12340,0),
+("CMSG_MOVE_SET_RUN_SPEED",0x3AB,12340,0),
+("SMSG_DISMOUNT",0x3AC,12340,0),
+("MSG_MOVE_UPDATE_CAN_FLY",0x3AD,12340,0),
+("MSG_RAID_READY_CHECK_CONFIRM",0x3AE,12340,0),
+("CMSG_VOICE_SESSION_ENABLE",0x3AF,12340,0),
+("SMSG_VOICE_SESSION_ENABLE",0x3B0,12340,0),
+("SMSG_VOICE_PARENTAL_CONTROLS",0x3B1,12340,0),
+("CMSG_GM_WHISPER",0x3B2,12340,0),
+("SMSG_GM_MESSAGECHAT",0x3B3,12340,0),
+("MSG_GM_GEARRATING",0x3B4,12340,0),
+("CMSG_COMMENTATOR_ENABLE",0x3B5,12340,0),
+("SMSG_COMMENTATOR_STATE_CHANGED",0x3B6,12340,0),
+("CMSG_COMMENTATOR_GET_MAP_INFO",0x3B7,12340,0),
+("SMSG_COMMENTATOR_MAP_INFO",0x3B8,12340,0),
+("CMSG_COMMENTATOR_GET_PLAYER_INFO",0x3B9,12340,0),
+("SMSG_COMMENTATOR_GET_PLAYER_INFO",0x3BA,12340,0),
+("SMSG_COMMENTATOR_PLAYER_INFO",0x3BB,12340,0),
+("CMSG_COMMENTATOR_ENTER_INSTANCE",0x3BC,12340,0),
+("CMSG_COMMENTATOR_EXIT_INSTANCE",0x3BD,12340,0),
+("CMSG_COMMENTATOR_INSTANCE_COMMAND",0x3BE,12340,0),
+("SMSG_CLEAR_TARGET",0x3BF,12340,0),
+("CMSG_BOT_DETECTED",0x3C0,12340,0),
+("SMSG_CROSSED_INEBRIATION_THRESHOLD",0x3C1,12340,0),
+("CMSG_CHEAT_PLAYER_LOGIN",0x3C2,12340,0),
+("CMSG_CHEAT_PLAYER_LOOKUP",0x3C3,12340,0),
+("SMSG_CHEAT_PLAYER_LOOKUP",0x3C4,12340,0),
+("SMSG_KICK_REASON",0x3C5,12340,0),
+("MSG_RAID_READY_CHECK_FINISHED",0x3C6,12340,0),
+("CMSG_COMPLAIN",0x3C7,12340,0),
+("SMSG_COMPLAIN_RESULT",0x3C8,12340,0),
+("SMSG_FEATURE_SYSTEM_STATUS",0x3C9,12340,0),
+("CMSG_GM_SHOW_COMPLAINTS",0x3CA,12340,0),
+("CMSG_GM_UNSQUELCH",0x3CB,12340,0),
+("CMSG_CHANNEL_SILENCE_VOICE",0x3CC,12340,0),
+("CMSG_CHANNEL_SILENCE_ALL",0x3CD,12340,0),
+("CMSG_CHANNEL_UNSILENCE_VOICE",0x3CE,12340,0),
+("CMSG_CHANNEL_UNSILENCE_ALL",0x3CF,12340,0),
+("CMSG_TARGET_CAST",0x3D0,12340,0),
+("CMSG_TARGET_SCRIPT_CAST",0x3D1,12340,0),
+("CMSG_CHANNEL_DISPLAY_LIST",0x3D2,12340,0),
+("CMSG_SET_ACTIVE_VOICE_CHANNEL",0x3D3,12340,0),
+("CMSG_GET_CHANNEL_MEMBER_COUNT",0x3D4,12340,0),
+("SMSG_CHANNEL_MEMBER_COUNT",0x3D5,12340,0),
+("CMSG_CHANNEL_VOICE_ON",0x3D6,12340,0),
+("CMSG_CHANNEL_VOICE_OFF",0x3D7,12340,0),
+("CMSG_DEBUG_LIST_TARGETS",0x3D8,12340,0),
+("SMSG_DEBUG_LIST_TARGETS",0x3D9,12340,0),
+("SMSG_AVAILABLE_VOICE_CHANNEL",0x3DA,12340,0),
+("CMSG_ADD_VOICE_IGNORE",0x3DB,12340,0),
+("CMSG_DEL_VOICE_IGNORE",0x3DC,12340,0),
+("CMSG_PARTY_SILENCE",0x3DD,12340,0),
+("CMSG_PARTY_UNSILENCE",0x3DE,12340,0),
+("MSG_NOTIFY_PARTY_SQUELCH",0x3DF,12340,0),
+("SMSG_COMSAT_RECONNECT_TRY",0x3E0,12340,0),
+("SMSG_COMSAT_DISCONNECT",0x3E1,12340,0),
+("SMSG_COMSAT_CONNECT_FAIL",0x3E2,12340,0),
+("SMSG_VOICE_CHAT_STATUS",0x3E3,12340,0),
+("CMSG_REPORT_PVP_AFK",0x3E4,12340,0),
+("SMSG_REPORT_PVP_AFK_RESULT",0x3E5,12340,0),
+("CMSG_GUILD_BANKER_ACTIVATE",0x3E6,12340,0),
+("CMSG_GUILD_BANK_QUERY_TAB",0x3E7,12340,0),
+("SMSG_GUILD_BANK_LIST",0x3E8,12340,0),
+("CMSG_GUILD_BANK_SWAP_ITEMS",0x3E9,12340,0),
+("CMSG_GUILD_BANK_BUY_TAB",0x3EA,12340,0),
+("CMSG_GUILD_BANK_UPDATE_TAB",0x3EB,12340,0),
+("CMSG_GUILD_BANK_DEPOSIT_MONEY",0x3EC,12340,0),
+("CMSG_GUILD_BANK_WITHDRAW_MONEY",0x3ED,12340,0),
+("MSG_GUILD_BANK_LOG_QUERY",0x3EE,12340,0),
+("CMSG_SET_CHANNEL_WATCH",0x3EF,12340,0),
+("SMSG_USERLIST_ADD",0x3F0,12340,0),
+("SMSG_USERLIST_REMOVE",0x3F1,12340,0),
+("SMSG_USERLIST_UPDATE",0x3F2,12340,0),
+("CMSG_CLEAR_CHANNEL_WATCH",0x3F3,12340,0),
+("SMSG_INSPECT_RESULTS",0x3F4,12340,0),
+("SMSG_GOGOGO_OBSOLETE",0x3F5,12340,0),
+("SMSG_ECHO_PARTY_SQUELCH",0x3F6,12340,0),
+("CMSG_SET_TITLE_SUFFIX",0x3F7,12340,0),
+("CMSG_SPELLCLICK",0x3F8,12340,0),
+("SMSG_LOOT_LIST",0x3F9,12340,0),
+("CMSG_GM_CHARACTER_RESTORE",0x3FA,12340,0),
+("CMSG_GM_CHARACTER_SAVE",0x3FB,12340,0),
+("SMSG_VOICESESSION_FULL",0x3FC,12340,0),
+("MSG_GUILD_PERMISSIONS",0x3FD,12340,0),
+("MSG_GUILD_BANK_MONEY_WITHDRAWN",0x3FE,12340,0),
+("MSG_GUILD_EVENT_LOG_QUERY",0x3FF,12340,0),
+("CMSG_MAELSTROM_RENAME_GUILD",0x400,12340,0),
+("CMSG_GET_MIRRORIMAGE_DATA",0x401,12340,0),
+("SMSG_MIRRORIMAGE_DATA",0x402,12340,0),
+("SMSG_FORCE_DISPLAY_UPDATE",0x403,12340,0),
+("SMSG_SPELL_CHANCE_RESIST_PUSHBACK",0x404,12340,0),
+("CMSG_IGNORE_DIMINISHING_RETURNS_CHEAT",0x405,12340,0),
+("SMSG_IGNORE_DIMINISHING_RETURNS_CHEAT",0x406,12340,0),
+("CMSG_KEEP_ALIVE",0x407,12340,0),
+("SMSG_RAID_READY_CHECK_ERROR",0x408,12340,0),
+("CMSG_OPT_OUT_OF_LOOT",0x409,12340,0),
+("MSG_QUERY_GUILD_BANK_TEXT",0x40A,12340,0),
+("CMSG_SET_GUILD_BANK_TEXT",0x40B,12340,0),
+("CMSG_SET_GRANTABLE_LEVELS",0x40C,12340,0),
+("CMSG_GRANT_LEVEL",0x40D,12340,0),
+("CMSG_REFER_A_FRIEND",0x40E,12340,0),
+("MSG_GM_CHANGE_ARENA_RATING",0x40F,12340,0),
+("CMSG_DECLINE_CHANNEL_INVITE",0x410,12340,0),
+("SMSG_GROUPACTION_THROTTLED",0x411,12340,0),
+("SMSG_OVERRIDE_LIGHT",0x412,12340,0),
+("SMSG_TOTEM_CREATED",0x413,12340,0),
+("CMSG_TOTEM_DESTROYED",0x414,12340,0),
+("CMSG_EXPIRE_RAID_INSTANCE",0x415,12340,0),
+("CMSG_NO_SPELL_VARIANCE",0x416,12340,0),
+("CMSG_QUESTGIVER_STATUS_MULTIPLE_QUERY",0x417,12340,0),
+("SMSG_QUESTGIVER_STATUS_MULTIPLE",0x418,12340,0),
+("CMSG_SET_PLAYER_DECLINED_NAMES",0x419,12340,0),
+("SMSG_SET_PLAYER_DECLINED_NAMES_RESULT",0x41A,12340,0),
+("CMSG_QUERY_SERVER_BUCK_DATA",0x41B,12340,0),
+("CMSG_CLEAR_SERVER_BUCK_DATA",0x41C,12340,0),
+("SMSG_SERVER_BUCK_DATA",0x41D,12340,0),
+("SMSG_SEND_UNLEARN_SPELLS",0x41E,12340,0),
+("SMSG_PROPOSE_LEVEL_GRANT",0x41F,12340,0),
+("CMSG_ACCEPT_LEVEL_GRANT",0x420,12340,0),
+("SMSG_REFER_A_FRIEND_ERROR",0x421,12340,0),
+("SMSG_SPLINE_MOVE_SET_FLYING",0x422,12340,0),
+("SMSG_SPLINE_MOVE_UNSET_FLYING",0x423,12340,0),
+("SMSG_SUMMON_CANCEL",0x424,12340,0),
+("CMSG_CHANGE_PERSONAL_ARENA_RATING",0x425,12340,0),
+("CMSG_ALTER_APPEARANCE",0x426,12340,0),
+("SMSG_ENABLE_BARBER_SHOP",0x427,12340,0),
+("SMSG_BARBER_SHOP_RESULT",0x428,12340,0),
+("CMSG_CALENDAR_GET_CALENDAR",0x429,12340,0),
+("CMSG_CALENDAR_GET_EVENT",0x42A,12340,0),
+("CMSG_CALENDAR_GUILD_FILTER",0x42B,12340,0),
+("CMSG_CALENDAR_ARENA_TEAM",0x42C,12340,0),
+("CMSG_CALENDAR_ADD_EVENT",0x42D,12340,0),
+("CMSG_CALENDAR_UPDATE_EVENT",0x42E,12340,0),
+("CMSG_CALENDAR_REMOVE_EVENT",0x42F,12340,0),
+("CMSG_CALENDAR_COPY_EVENT",0x430,12340,0),
+("CMSG_CALENDAR_EVENT_INVITE",0x431,12340,0),
+("CMSG_CALENDAR_EVENT_RSVP",0x432,12340,0),
+("CMSG_CALENDAR_EVENT_REMOVE_INVITE",0x433,12340,0),
+("CMSG_CALENDAR_EVENT_STATUS",0x434,12340,0),
+("CMSG_CALENDAR_EVENT_MODERATOR_STATUS",0x435,12340,0),
+("SMSG_CALENDAR_SEND_CALENDAR",0x436,12340,0),
+("SMSG_CALENDAR_SEND_EVENT",0x437,12340,0),
+("SMSG_CALENDAR_FILTER_GUILD",0x438,12340,0),
+("SMSG_CALENDAR_ARENA_TEAM",0x439,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE",0x43A,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED",0x43B,12340,0),
+("SMSG_CALENDAR_EVENT_STATUS",0x43C,12340,0),
+("SMSG_CALENDAR_COMMAND_RESULT",0x43D,12340,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_ADDED",0x43E,12340,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_REMOVED",0x43F,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_ALERT",0x440,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT",0x441,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_STATUS_ALERT",0x442,12340,0),
+("SMSG_CALENDAR_EVENT_REMOVED_ALERT",0x443,12340,0),
+("SMSG_CALENDAR_EVENT_UPDATED_ALERT",0x444,12340,0),
+("SMSG_CALENDAR_EVENT_MODERATOR_STATUS_ALERT",0x445,12340,0),
+("CMSG_CALENDAR_COMPLAIN",0x446,12340,0),
+("CMSG_CALENDAR_GET_NUM_PENDING",0x447,12340,0),
+("SMSG_CALENDAR_SEND_NUM_PENDING",0x448,12340,0),
+("CMSG_SAVE_DANCE",0x449,12340,0),
+("SMSG_NOTIFY_DANCE",0x44A,12340,0),
+("CMSG_PLAY_DANCE",0x44B,12340,0),
+("SMSG_PLAY_DANCE",0x44C,12340,0),
+("CMSG_LOAD_DANCES",0x44D,12340,0),
+("CMSG_STOP_DANCE",0x44E,12340,0),
+("SMSG_STOP_DANCE",0x44F,12340,0),
+("CMSG_SYNC_DANCE",0x450,12340,0),
+("CMSG_DANCE_QUERY",0x451,12340,0),
+("SMSG_DANCE_QUERY_RESPONSE",0x452,12340,0),
+("SMSG_INVALIDATE_DANCE",0x453,12340,0),
+("CMSG_DELETE_DANCE",0x454,12340,0),
+("SMSG_LEARNED_DANCE_MOVES",0x455,12340,0),
+("CMSG_LEARN_DANCE_MOVE",0x456,12340,0),
+("CMSG_UNLEARN_DANCE_MOVE",0x457,12340,0),
+("CMSG_SET_RUNE_COUNT",0x458,12340,0),
+("CMSG_SET_RUNE_COOLDOWN",0x459,12340,0),
+("MSG_MOVE_SET_PITCH_RATE_CHEAT",0x45A,12340,0),
+("MSG_MOVE_SET_PITCH_RATE",0x45B,12340,0),
+("SMSG_FORCE_PITCH_RATE_CHANGE",0x45C,12340,0),
+("CMSG_FORCE_PITCH_RATE_CHANGE_ACK",0x45D,12340,0),
+("SMSG_SPLINE_SET_PITCH_RATE",0x45E,12340,0),
+("CMSG_CALENDAR_EVENT_INVITE_NOTES",0x45F,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_NOTES",0x460,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_NOTES_ALERT",0x461,12340,0),
+("CMSG_UPDATE_MISSILE_TRAJECTORY",0x462,12340,0),
+("SMSG_UPDATE_ACCOUNT_DATA_COMPLETE",0x463,12340,0),
+("SMSG_TRIGGER_MOVIE",0x464,12340,0),
+("CMSG_COMPLETE_MOVIE",0x465,12340,0),
+("CMSG_SET_GLYPH_SLOT",0x466,12340,0),
+("CMSG_SET_GLYPH",0x467,12340,0),
+("SMSG_ACHIEVEMENT_EARNED",0x468,12340,0),
+("SMSG_DYNAMIC_DROP_ROLL_RESULT",0x469,12340,0),
+("SMSG_CRITERIA_UPDATE",0x46A,12340,0),
+("CMSG_QUERY_INSPECT_ACHIEVEMENTS",0x46B,12340,0),
+("SMSG_RESPOND_INSPECT_ACHIEVEMENTS",0x46C,12340,0),
+("CMSG_DISMISS_CONTROLLED_VEHICLE",0x46D,12340,0),
+("CMSG_COMPLETE_ACHIEVEMENT_CHEAT",0x46E,12340,0),
+("SMSG_QUESTUPDATE_ADD_PVP_KILL",0x46F,12340,0),
+("CMSG_SET_CRITERIA_CHEAT",0x470,12340,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_UPDATED",0x471,12340,0),
+("CMSG_UNITANIMTIER_CHEAT",0x472,12340,0),
+("CMSG_CHAR_CUSTOMIZE",0x473,12340,0),
+("SMSG_CHAR_CUSTOMIZE",0x474,12340,0),
+("SMSG_PET_RENAMEABLE",0x475,12340,0),
+("CMSG_REQUEST_VEHICLE_EXIT",0x476,12340,0),
+("CMSG_REQUEST_VEHICLE_PREV_SEAT",0x477,12340,0),
+("CMSG_REQUEST_VEHICLE_NEXT_SEAT",0x478,12340,0),
+("CMSG_REQUEST_VEHICLE_SWITCH_SEAT",0x479,12340,0),
+("CMSG_PET_LEARN_TALENT",0x47A,12340,0),
+("CMSG_PET_UNLEARN_TALENTS",0x47B,12340,0),
+("SMSG_SET_PHASE_SHIFT",0x47C,12340,0),
+("SMSG_ALL_ACHIEVEMENT_DATA",0x47D,12340,0),
+("CMSG_FORCE_SAY_CHEAT",0x47E,12340,0),
+("SMSG_HEALTH_UPDATE",0x47F,12340,0),
+("SMSG_POWER_UPDATE",0x480,12340,0),
+("CMSG_GAMEOBJ_REPORT_USE",0x481,12340,0),
+("SMSG_HIGHEST_THREAT_UPDATE",0x482,12340,0),
+("SMSG_THREAT_UPDATE",0x483,12340,0),
+("SMSG_THREAT_REMOVE",0x484,12340,0),
+("SMSG_THREAT_CLEAR",0x485,12340,0),
+("SMSG_CONVERT_RUNE",0x486,12340,0),
+("SMSG_RESYNC_RUNES",0x487,12340,0),
+("SMSG_ADD_RUNE_POWER",0x488,12340,0),
+("CMSG_START_QUEST",0x489,12340,0),
+("CMSG_REMOVE_GLYPH",0x48A,12340,0),
+("CMSG_DUMP_OBJECTS",0x48B,12340,0),
+("SMSG_DUMP_OBJECTS_DATA",0x48C,12340,0),
+("CMSG_DISMISS_CRITTER",0x48D,12340,0),
+("SMSG_NOTIFY_DEST_LOC_SPELL_CAST",0x48E,12340,0),
+("CMSG_AUCTION_LIST_PENDING_SALES",0x48F,12340,0),
+("SMSG_AUCTION_LIST_PENDING_SALES",0x490,12340,0),
+("SMSG_MODIFY_COOLDOWN",0x491,12340,0),
+("SMSG_PET_UPDATE_COMBO_POINTS",0x492,12340,0),
+("CMSG_ENABLETAXI",0x493,12340,0),
+("SMSG_PRE_RESURRECT",0x494,12340,0),
+("SMSG_AURA_UPDATE_ALL",0x495,12340,0),
+("SMSG_AURA_UPDATE",0x496,12340,0),
+("CMSG_FLOOD_GRACE_CHEAT",0x497,12340,0),
+("SMSG_SERVER_FIRST_ACHIEVEMENT",0x498,12340,0),
+("SMSG_PET_LEARNED_SPELL",0x499,12340,0),
+("SMSG_PET_REMOVED_SPELL",0x49A,12340,0),
+("CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE",0x49B,12340,0),
+("CMSG_HEARTH_AND_RESURRECT",0x49C,12340,0),
+("SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA",0x49D,12340,0),
+("SMSG_CRITERIA_DELETED",0x49E,12340,0),
+("SMSG_ACHIEVEMENT_DELETED",0x49F,12340,0),
+("CMSG_SERVER_INFO_QUERY",0x4A0,12340,0),
+("SMSG_SERVER_INFO_RESPONSE",0x4A1,12340,0),
+("CMSG_CHECK_LOGIN_CRITERIA",0x4A2,12340,0),
+("SMSG_SERVER_BUCK_DATA_START",0x4A3,12340,0),
+("CMSG_SET_BREATH",0x4A4,12340,0),
+("CMSG_QUERY_VEHICLE_STATUS",0x4A5,12340,0),
+("SMSG_BATTLEGROUND_INFO_THROTTLED",0x4A6,12340,0),
+("SMSG_SET_VEHICLE_REC_ID",0x4A7,12340,0),
+("CMSG_RIDE_VEHICLE_INTERACT",0x4A8,12340,0),
+("CMSG_CONTROLLER_EJECT_PASSENGER",0x4A9,12340,0),
+("SMSG_PET_GUIDS",0x4AA,12340,0),
+("SMSG_CLIENTCACHE_VERSION",0x4AB,12340,0),
+("CMSG_CHANGE_GDF_ARENA_RATING",0x4AC,12340,0),
+("CMSG_SET_ARENA_TEAM_RATING_BY_INDEX",0x4AD,12340,0),
+("CMSG_SET_ARENA_TEAM_WEEKLY_GAMES",0x4AE,12340,0),
+("CMSG_SET_ARENA_TEAM_SEASON_GAMES",0x4AF,12340,0),
+("CMSG_SET_ARENA_MEMBER_WEEKLY_GAMES",0x4B0,12340,0),
+("CMSG_SET_ARENA_MEMBER_SEASON_GAMES",0x4B1,12340,0),
+("SMSG_ITEM_REFUND_INFO_RESPONSE",0x4B2,12340,0),
+("CMSG_GET_ITEM_REFUND_INFO",0x4B3,12340,0),
+("CMSG_ITEM_REFUND",0x4B4,12340,0),
+("SMSG_ITEM_REFUND_RESULT",0x4B5,12340,0),
+("CMSG_CORPSE_TRANSPORT_QUERY",0x4B6,12340,0),
+("SMSG_CORPSE_TRANSPORT_QUERY",0x4B7,12340,0),
+("CMSG_UNUSED5",0x4B8,12340,0),
+("CMSG_UNUSED6",0x4B9,12340,0),
+("CMSG_CALENDAR_EVENT_SIGNUP",0x4BA,12340,0),
+("SMSG_CALENDAR_CLEAR_PENDING_ACTION",0x4BB,12340,0),
+("SMSG_LOAD_EQUIPMENT_SET",0x4BC,12340,0),
+("CMSG_SAVE_EQUIPMENT_SET",0x4BD,12340,0),
+("CMSG_ON_MISSILE_TRAJECTORY_COLLISION",0x4BE,12340,0),
+("SMSG_NOTIFY_MISSILE_TRAJECTORY_COLLISION",0x4BF,12340,0),
+("SMSG_TALENT_UPDATE",0x4C0,12340,0),
+("CMSG_LEARN_TALENT_GROUP",0x4C1,12340,0),
+("CMSG_PET_LEARN_TALENT_GROUP",0x4C2,12340,0),
+("CMSG_SET_ACTIVE_TALENT_GROUP_OBSOLETE",0x4C3,12340,0),
+("CMSG_GM_GRANT_ACHIEVEMENT",0x4C4,12340,0),
+("CMSG_GM_REMOVE_ACHIEVEMENT",0x4C5,12340,0),
+("CMSG_GM_SET_CRITERIA_FOR_PLAYER",0x4C6,12340,0),
+("SMSG_DESTROY_ARENA_UNIT",0x4C7,12340,0),
+("SMSG_ARENA_TEAM_CHANGE_FAILED",0x4C8,12340,0),
+("CMSG_PROFILEDATA_REQUEST",0x4C9,12340,0),
+("SMSG_PROFILEDATA_RESPONSE",0x4CA,12340,0),
+("CMSG_START_BATTLEFIELD_CHEAT",0x4CB,12340,0),
+("CMSG_END_BATTLEFIELD_CHEAT",0x4CC,12340,0),
+("SMSG_COMPOUND_MOVE",0x4CD,12340,0),
+("SMSG_MOVE_GRAVITY_DISABLE",0x4CE,12340,0),
+("CMSG_MOVE_GRAVITY_DISABLE_ACK",0x4CF,12340,0),
+("SMSG_MOVE_GRAVITY_ENABLE",0x4D0,12340,0),
+("CMSG_MOVE_GRAVITY_ENABLE_ACK",0x4D1,12340,0),
+("MSG_MOVE_GRAVITY_CHNG",0x4D2,12340,0),
+("SMSG_SPLINE_MOVE_GRAVITY_DISABLE",0x4D3,12340,0),
+("SMSG_SPLINE_MOVE_GRAVITY_ENABLE",0x4D4,12340,0),
+("CMSG_USE_EQUIPMENT_SET",0x4D5,12340,0),
+("SMSG_USE_EQUIPMENT_SET_RESULT",0x4D6,12340,0),
+("CMSG_FORCE_ANIM",0x4D7,12340,0),
+("SMSG_FORCE_ANIM",0x4D8,12340,0),
+("CMSG_CHAR_FACTION_CHANGE",0x4D9,12340,0),
+("SMSG_CHAR_FACTION_CHANGE",0x4DA,12340,0),
+("CMSG_PVP_QUEUE_STATS_REQUEST",0x4DB,12340,0),
+("SMSG_PVP_QUEUE_STATS",0x4DC,12340,0),
+("CMSG_SET_PAID_SERVICE_CHEAT",0x4DD,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE",0x4DE,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE_RESPONSE",0x4DF,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_ENTERING",0x4E0,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE",0x4E1,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE_RESPONSE",0x4E2,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST",0x4E3,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST_RESPONSE",0x4E4,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_EJECT_PENDING",0x4E5,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_EJECTED",0x4E6,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_EXIT_REQUEST",0x4E7,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_STATE_CHANGED",0x4E8,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_ADVANCE_STATE",0x4E9,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_SET_NEXT_TRANSITION_TIME",0x4EA,12340,0),
+("MSG_SET_RAID_DIFFICULTY",0x4EB,12340,0),
+("CMSG_XPGAIN",0x4EC,12340,0),
+("SMSG_XPGAIN",0x4ED,12340,0),
+("SMSG_GMTICKET_RESPONSE_ERROR",0x4EE,12340,0),
+("SMSG_GMTICKET_GET_RESPONSE",0x4EF,12340,0),
+("CMSG_GMTICKET_RESOLVE_RESPONSE",0x4F0,12340,0),
+("SMSG_GMTICKET_RESOLVE_RESPONSE",0x4F1,12340,0),
+("SMSG_GMTICKET_CREATE_RESPONSE_TICKET",0x4F2,12340,0),
+("CMSG_GM_CREATE_TICKET_RESPONSE",0x4F3,12340,0),
+("CMSG_SERVERINFO",0x4F4,12340,0),
+("SMSG_SERVERINFO",0x4F5,12340,0),
+("CMSG_UI_TIME_REQUEST",0x4F6,12340,0),
+("SMSG_UI_TIME",0x4F7,12340,0),
+("CMSG_CHAR_RACE_CHANGE",0x4F8,12340,0),
+("MSG_VIEW_PHASE_SHIFT",0x4F9,12340,0),
+("SMSG_TALENTS_INVOLUNTARILY_RESET",0x4FA,12340,0),
+("CMSG_DEBUG_SERVER_GEO",0x4FB,12340,0),
+("SMSG_DEBUG_SERVER_GEO",0x4FC,12340,0),
+("SMSG_LOOT_UPDATE",0x4FD,12340,0),
+("UMSG_UPDATE_GROUP_INFO",0x4FE,12340,0),
+("CMSG_READY_FOR_ACCOUNT_DATA_TIMES",0x4FF,12340,0),
+("CMSG_QUERY_GET_ALL_QUESTS",0x500,12340,0),
+("SMSG_ALL_QUESTS_COMPLETED",0x501,12340,0),
+("CMSG_GMLAGREPORT_SUBMIT",0x502,12340,0),
+("CMSG_AFK_MONITOR_INFO_REQUEST",0x503,12340,0),
+("SMSG_AFK_MONITOR_INFO_RESPONSE",0x504,12340,0),
+("CMSG_AFK_MONITOR_INFO_CLEAR",0x505,12340,0),
+("SMSG_AREA_TRIGGER_NO_CORPSE",0x506,12340,0),
+("CMSG_GM_NUKE_CHARACTER",0x507,12340,0),
+("CMSG_LOW_LEVEL_RAID",0x508,12340,0),
+("CMSG_LOW_LEVEL_RAID_USER",0x509,12340,0),
+("SMSG_CAMERA_SHAKE",0x50A,12340,0),
+("SMSG_SOCKET_GEMS",0x50B,12340,0),
+("CMSG_SET_CHARACTER_MODEL",0x50C,12340,0),
+("SMSG_CONNECT_TO",0x50D,12340,0),
+("CMSG_CONNECT_TO_FAILED",0x50E,12340,0),
+("SMSG_SUSPEND_COMMS",0x50F,12340,0),
+("CMSG_SUSPEND_COMMS_ACK",0x510,12340,0),
+("SMSG_RESUME_COMMS",0x511,12340,0),
+("CMSG_AUTH_CONTINUED_SESSION",0x512,12340,0),
+("CMSG_DROP_NEW_CONNECTION",0x513,12340,0),
+("SMSG_SEND_ALL_COMBAT_LOG",0x514,12340,0),
+("SMSG_OPEN_LFG_DUNGEON_FINDER",0x515,12340,0),
+("SMSG_MOVE_SET_COLLISION_HGT",0x516,12340,0),
+("CMSG_MOVE_SET_COLLISION_HGT_ACK",0x517,12340,0),
+("MSG_MOVE_SET_COLLISION_HGT",0x518,12340,0),
+("CMSG_CLEAR_RANDOM_BG_WIN_TIME",0x519,12340,0),
+("CMSG_CLEAR_HOLIDAY_BG_WIN_TIME",0x51A,12340,0),
+("CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND",0x51B,12340,0),
+("SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT1",0x51C,12340,0),
+("SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT2",0x51D,12340,0),
+("SMSG_COMPRESSED_UNKNOWN_1310",0x51E,12340,0),
+("NUM_MSG_TYPES",0x0,12340,1);
diff --git a/sql_mr/Opcodes/opcodes_mangos_13623.sql b/sql_mr/Opcodes/opcodes_mangos_13623.sql
new file mode 100644
index 00000000000..c2dbb836775
--- /dev/null
+++ b/sql_mr/Opcodes/opcodes_mangos_13623.sql
@@ -0,0 +1,1272 @@
+-- Opcode table for client build 13623
+
+CREATE TABLE IF NOT EXISTS `opcodes` (
+    `version` smallint(5) NOT NULL COMMENT "Client build",
+    `name` varchar(64) NOT NULL COMMENT "opcode name",
+    `value` int(10) NOT NULL COMMENT "opcode value",
+    `flags` int(10) unsigned NOT NULL DEFAULT "0" COMMENT "current opcode flags",
+    UNIQUE KEY `version` (`version`,`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT="Universal opcode storage";
+
+DELETE FROM `opcodes` WHERE `version` = 13623;
+
+INSERT INTO `opcodes` (`name`, `value`, `version`, `flags`) VALUES
+("CMSG_WORLD_TELEPORT",0x08581,13623,0),
+("CMSG_TELEPORT_TO_UNIT",0x0E1AC,13623,0),
+("SMSG_CHECK_FOR_BOTS",0x0FEC8,13623,0),
+("CMSG_BOT_DETECTED2",0x10002,13623,0),
+("SMSG_FORCEACTIONSHOW",0x0AC84,13623,0),
+("SMSG_PETGODMODE",0x0F2CC,13623,0),
+("SMSG_GODMODE",0x023EC,13623,0),
+("SMSG_DESTRUCTIBLE_BUILDING_DAMAGE",0x0A0E0,13623,0),
+("CMSG_CHAR_CREATE",0x07EEC,13623,0),
+("CMSG_CHAR_ENUM",0x06AA4,13623,0),
+("CMSG_CHAR_DELETE",0x03B84,13623,0),
+("SMSG_CHAR_CREATE",0x0F7EC,13623,0),
+("SMSG_CHAR_ENUM",0x0ECCC,13623,0),
+("SMSG_CHAR_DELETE",0x0BC80,13623,0),
+("CMSG_PLAYER_LOGIN",0x08180,13623,0),
+("SMSG_NEW_WORLD",0x0451E,13623,0),
+("SMSG_TRANSFER_PENDING",0x07BE0,13623,0),
+("SMSG_TRANSFER_ABORTED",0x02BE0,13623,0),
+("SMSG_CHARACTER_LOGIN_FAILED",0x07ACC,13623,0),
+("SMSG_LOGIN_SETTIMESPEED",0x039AC,13623,0),
+("SMSG_GAMETIME_UPDATE",0x0F1EC,13623,0),
+("CMSG_GAMETIME_SET",0x020C4,13623,0),
+("SMSG_GAMETIME_SET",0x07888,13623,0),
+("CMSG_GAMESPEED_SET",0x02084,13623,0),
+("SMSG_GAMESPEED_SET",0x03EC0,13623,0),
+("CMSG_SERVERTIME",0x10005,13623,0),
+("SMSG_SERVERTIME",0x023A4,13623,0),
+("CMSG_PLAYER_LOGOUT",0x0F78C,13623,0),
+("CMSG_LOGOUT_REQUEST",0x0A7A8,13623,0),
+("SMSG_LOGOUT_RESPONSE",0x0F788,13623,0),
+("SMSG_LOGOUT_COMPLETE",0x0A0A4,13623,0),
+("CMSG_LOGOUT_CANCEL",0x039E8,13623,0),
+("SMSG_LOGOUT_CANCEL_ACK",0x0EE88,13623,0),
+("CMSG_NAME_QUERY",0x07AAC,13623,0),
+("SMSG_NAME_QUERY_RESPONSE",0x07BC8,13623,0),
+("CMSG_PET_NAME_QUERY",0x0F180,13623,0),
+("SMSG_PET_NAME_QUERY_RESPONSE",0x068AC,13623,0),
+("CMSG_GUILD_QUERY",0x0AFC4,13623,0),
+("SMSG_GUILD_QUERY_RESPONSE",0x03F80,13623,0),
+("CMSG_COMMENTATOR_START_WARGAME",0x08588,13623,0),
+("SMSG_ITEM_QUERY_SINGLE_RESPONSE",0x00C4E,13623,0),
+("SMSG_ITEM_QUERY_MULTIPLE_RESPONSE",0x10009,13623,0),
+("CMSG_PAGE_TEXT_QUERY",0x0AC8C,13623,0),
+("SMSG_PAGE_TEXT_QUERY_RESPONSE",0x0B084,13623,0),
+("CMSG_QUEST_QUERY",0x0EFE8,13623,0),
+("SMSG_QUEST_QUERY_RESPONSE",0x07BA0,13623,0),
+("CMSG_GAMEOBJECT_QUERY",0x072A0,13623,0),
+("SMSG_GAMEOBJECT_QUERY_RESPONSE",0x0F4E8,13623,0),
+("CMSG_CREATURE_QUERY",0x0268C,13623,0),
+("SMSG_CREATURE_QUERY_RESPONSE",0x0E6AC,13623,0),
+("CMSG_WHO",0x0A4CC,13623,0),
+("SMSG_WHO",0x0BE8C,13623,0),
+("CMSG_WHOIS",0x02180,13623,0),
+("SMSG_WHOIS",0x0B1A4,13623,0),
+("CMSG_CONTACT_LIST",0x0EAA4,13623,0),
+("SMSG_CONTACT_LIST",0x0748C,13623,0),
+("SMSG_FRIEND_STATUS",0x0F68C,13623,0),
+("CMSG_ADD_FRIEND",0x03980,13623,0),
+("CMSG_DEL_FRIEND",0x02980,13623,0),
+("CMSG_SET_CONTACT_NOTES",0x07DCC,13623,0),
+("CMSG_ADD_IGNORE",0x06780,13623,0),
+("CMSG_DEL_IGNORE",0x0F384,13623,0),
+("CMSG_GROUP_INVITE",0x027C0,13623,0),
+("SMSG_GROUP_INVITE",0x0A8A8,13623,0),
+("CMSG_GROUP_CANCEL",0x1000A,13623,0),
+("SMSG_GROUP_CANCEL",0x06AAC,13623,0),
+("CMSG_GROUP_ACCEPT",0x0368C,13623,0),
+("CMSG_GROUP_DECLINE",0x0B4CC,13623,0),
+("SMSG_GROUP_DECLINE",0x0ABAC,13623,0),
+("CMSG_GROUP_UNINVITE",0x04F74,13623,0),
+("CMSG_GROUP_UNINVITE_GUID",0x0E3C8,13623,0),
+("SMSG_GROUP_UNINVITE",0x03ACC,13623,0),
+("CMSG_GROUP_SET_LEADER",0x0B6E0,13623,0),
+("SMSG_GROUP_SET_LEADER",0x0E88C,13623,0),
+("CMSG_LOOT_METHOD",0x0FCCC,13623,0),
+("CMSG_GROUP_DISBAND",0x0BE88,13623,0),
+("SMSG_GROUP_DESTROYED",0x022CC,13623,0),
+("SMSG_GROUP_LIST",0x06D8C,13623,0),
+("SMSG_PARTY_MEMBER_STATS",0x029AC,13623,0),
+("SMSG_PARTY_COMMAND_RESULT",0x026E0,13623,0),
+("CMSG_GUILD_CREATE",0x02219,13623,0),
+("CMSG_GUILD_INVITE",0x02DA8,13623,0),
+("SMSG_GUILD_INVITE",0x0010C,13623,0),
+("CMSG_GUILD_ACCEPT",0x03729,13623,0),
+("CMSG_GUILD_DECLINE",0x0352D,13623,0),
+("SMSG_GUILD_DECLINE",0x07DEC,13623,0),
+("CMSG_GUILD_INFO",0x06884,13623,0),
+("SMSG_GUILD_INFO",0x020A8,13623,0),
+("CMSG_GUILD_ROSTER",0x0B2A4,13623,0),
+("SMSG_GUILD_ROSTER",0x04D5C,13623,0),
+("CMSG_GUILD_PROMOTE",0x02109,13623,0),
+("CMSG_GUILD_DEMOTE",0x0330D,13623,0),
+("CMSG_GUILD_LEAVE",0x03329,13623,0),
+("CMSG_GUILD_REMOVE",0x0312D,13623,0),
+("CMSG_GUILD_DISBAND",0x0372D,13623,0),
+("CMSG_GUILD_LEADER",0x02650,13623,0),
+("CMSG_GUILD_MOTD",0x0272D,13623,0),
+("CMSG_QUERY_GUILD_REWARDS",0x02210,13623,0),
+("CMSG_QUERY_GUILD_MAX_XP",0x0350D,13623,0),
+("CMSG_QUERY_GUILD_XP",0x03509,13623,0),
+("SMSG_GUILD_EVENT",0x0B7C4,13623,0),
+("SMSG_GUILD_UPDATE_ROSTER",0x0085E,13623,0),
+("SMSG_GUILD_RANKS_UPDATE",0x0004C,13623,0),
+("SMSG_GUILD_REWARDS_LIST",0x00C4C,13623,0),
+("SMSG_GUILD_TRADESKILL_UPDATE",0x0454E,13623,0),
+("SMSG_GUILD_MAX_DAILY_XP",0x0441C,13623,0),
+("SMSG_GUILD_NEWS_UPDATE",0x0485E,13623,0),
+("SMSG_GUILD_XP_UPDATE",0x0440E,13623,0),
+("SMSG_GUILD_COMMAND_RESULT",0x023C0,13623,0),
+("CMSG_MESSAGECHAT_SAY",0x0002A,13623,0),
+("CMSG_MESSAGECHAT_YELL",0x00802,13623,0),
+("CMSG_MESSAGECHAT_CHANNEL",0x00821,13623,0),
+("CMSG_MESSAGECHAT_WHISPER",0x00000,13623,0),
+("CMSG_MESSAGECHAT_GUILD",0x00823,13623,0),
+("CMSG_MESSAGECHAT_OFFICER",0x00861,13623,0),
+("CMSG_MESSAGECHAT_AFK",0x0086B,13623,0),
+("CMSG_MESSAGECHAT_DND",0x00003,13623,0),
+("CMSG_MESSAGECHAT_EMOTE",0x00042,13623,0),
+("CMSG_MESSAGECHAT_PARTY",0x0084B,13623,0),
+("CMSG_MESSAGECHAT_PARTY_LEADER",0x0080B,13623,0),
+("CMSG_MESSAGECHAT_RAID",0x00803,13623,0),
+("CMSG_MESSAGECHAT_RAID_LEADER",0x00863,13623,0),
+("CMSG_MESSAGECHAT_BATTLEGROUND",0x00063,13623,0),
+("CMSG_MESSAGECHAT_BATTLEGROUND_LEADER",0x00860,13623,0),
+("CMSG_MESSAGECHAT_RAID_WARNING",0x00061,13623,0),
+("SMSG_MESSAGECHAT",0x061E4,13623,0),
+("CMSG_JOIN_CHANNEL",0x00002,13623,0),
+("CMSG_LEAVE_CHANNEL",0x0000B,13623,0),
+("SMSG_CHANNEL_NOTIFY",0x07CAC,13623,0),
+("CMSG_CHANNEL_LIST",0x07FE0,13623,0),
+("SMSG_CHANNEL_LIST",0x069E0,13623,0),
+("CMSG_CHANNEL_PASSWORD",0x0080A,13623,0),
+("CMSG_CHANNEL_SET_OWNER",0x00800,13623,0),
+("CMSG_CHANNEL_OWNER",0x00848,13623,0),
+("CMSG_CHANNEL_MODERATOR",0x00828,13623,0),
+("CMSG_CHANNEL_UNMODERATOR",0x00809,13623,0),
+("CMSG_CHANNEL_MUTE",0x00023,13623,0),
+("CMSG_CHANNEL_UNMUTE",0x00841,13623,0),
+("CMSG_CHANNEL_INVITE",0x00020,13623,0),
+("CMSG_CHANNEL_KICK",0x00068,13623,0),
+("CMSG_CHANNEL_ROSTER_INFO",0x00069,13623,0),
+("CMSG_CHANNEL_BAN",0x0000A,13623,0),
+("CMSG_CHANNEL_UNBAN",0x00048,13623,0),
+("CMSG_CHANNEL_ANNOUNCEMENTS",0x0004B,13623,0),
+("CMSG_CHANNEL_MODERATE",0x10018,13623,0),
+("SMSG_UPDATE_OBJECT",0x03780,13623,0),
+("SMSG_DESTROY_OBJECT",0x02AA0,13623,0),
+("CMSG_USE_ITEM",0x07080,13623,0),
+("CMSG_OPEN_ITEM",0x0A2A8,13623,0),
+("CMSG_READ_ITEM",0x0F3C0,13623,0),
+("SMSG_READ_ITEM_OK",0x0A988,13623,0),
+("SMSG_READ_ITEM_FAILED",0x0A4EC,13623,0),
+("SMSG_ITEM_COOLDOWN",0x06CC8,13623,0),
+("CMSG_GAMEOBJ_USE",0x029E4,13623,0),
+("CMSG_DESTROY_ITEMS",0x0B8A8,13623,0),
+("SMSG_GAMEOBJECT_CUSTOM_ANIM",0x036A0,13623,0),
+("CMSG_AREATRIGGER",0x0ADA8,13623,0),
+("MSG_MOVE_START_FORWARD",0x0EBAC,13623,0),
+("MSG_MOVE_START_BACKWARD",0x072E4,13623,0),
+("MSG_MOVE_STOP",0x034E0,13623,0),
+("MSG_MOVE_START_STRAFE_LEFT",0x060E8,13623,0),
+("MSG_MOVE_START_STRAFE_RIGHT",0x07DA4,13623,0),
+("MSG_MOVE_STOP_STRAFE",0x0F9A8,13623,0),
+("MSG_MOVE_JUMP",0x065AC,13623,0),
+("MSG_MOVE_START_TURN_LEFT",0x0B8C8,13623,0),
+("MSG_MOVE_START_TURN_RIGHT",0x0F9E4,13623,0),
+("MSG_MOVE_STOP_TURN",0x0E2E8,13623,0),
+("MSG_MOVE_START_PITCH_UP",0x060E4,13623,0),
+("MSG_MOVE_START_PITCH_DOWN",0x0ADC4,13623,0),
+("MSG_MOVE_STOP_PITCH",0x028E8,13623,0),
+("MSG_MOVE_SET_RUN_MODE",0x0E7A8,13623,0),
+("MSG_MOVE_SET_WALK_MODE",0x03FAC,13623,0),
+("MSG_MOVE_TOGGLE_LOGGING",0x1001D,13623,0),
+("MSG_MOVE_TELEPORT",0x024E4,13623,0),
+("MSG_MOVE_TELEPORT_CHEAT",0x0E7EC,13623,0),
+("MSG_MOVE_TELEPORT_ACK",0x06DAC,13623,0),
+("MSG_MOVE_TOGGLE_FALL_LOGGING",0x1001F,13623,0),
+("MSG_MOVE_FALL_LAND",0x0AFAC,13623,0),
+("MSG_MOVE_START_SWIM",0x026C0,13623,0),
+("MSG_MOVE_STOP_SWIM",0x0FDE8,13623,0),
+("MSG_MOVE_SET_RUN_SPEED_CHEAT",0x10020,13623,0),
+("MSG_MOVE_SET_RUN_SPEED",0x064A0,13623,0),
+("MSG_MOVE_SET_RUN_BACK_SPEED_CHEAT",0x10021,13623,0),
+("MSG_MOVE_SET_RUN_BACK_SPEED",0x0B5EC,13623,0),
+("MSG_MOVE_SET_WALK_SPEED_CHEAT",0x10022,13623,0),
+("MSG_MOVE_SET_WALK_SPEED",0x0F284,13623,0),
+("MSG_MOVE_SET_SWIM_SPEED_CHEAT",0x10023,13623,0),
+("MSG_MOVE_SET_SWIM_SPEED",0x02380,13623,0),
+("MSG_MOVE_SET_SWIM_BACK_SPEED_CHEAT",0x10024,13623,0),
+("MSG_MOVE_SET_SWIM_BACK_SPEED",0x0B0AC,13623,0),
+("MSG_MOVE_SET_ALL_SPEED_CHEAT",0x10025,13623,0),
+("MSG_MOVE_SET_TURN_RATE_CHEAT",0x10026,13623,0),
+("MSG_MOVE_SET_TURN_RATE",0x0A3A8,13623,0),
+("MSG_MOVE_TOGGLE_COLLISION_CHEAT",0x00028,13623,0),
+("MSG_MOVE_SET_FACING",0x0ABC4,13623,0),
+("MSG_MOVE_SET_PITCH",0x0EBA0,13623,0),
+("MSG_MOVE_WORLDPORT_ACK",0x02FC0,13623,0),
+("SMSG_MONSTER_MOVE",0x0F1A4,13623,0),
+("SMSG_MOVE_WATER_WALK",0x02E84,13623,0),
+("SMSG_MOVE_LAND_WALK",0x02084,13623,0),
+("MSG_MOVE_SET_RAW_POSITION_ACK",0x0F4A0,13623,0),
+("CMSG_MOVE_SET_RAW_POSITION",0x0F0C8,13623,0),
+("SMSG_FORCE_RUN_SPEED_CHANGE",0x0F1CC,13623,0),
+("CMSG_FORCE_RUN_SPEED_CHANGE_ACK",0x026C8,13623,0),
+("SMSG_FORCE_RUN_BACK_SPEED_CHANGE",0x1002E,13623,0),
+("CMSG_FORCE_RUN_BACK_SPEED_CHANGE_ACK",0x078E4,13623,0),
+("SMSG_FORCE_SWIM_SPEED_CHANGE",0x0F5A0,13623,0),
+("CMSG_FORCE_SWIM_SPEED_CHANGE_ACK",0x0B1A0,13623,0),
+("SMSG_FORCE_MOVE_ROOT",0x02F88,13623,0),
+("CMSG_FORCE_MOVE_ROOT_ACK",0x07184,13623,0),
+("SMSG_FORCE_MOVE_UNROOT",0x030A0,13623,0),
+("CMSG_FORCE_MOVE_UNROOT_ACK",0x07FA8,13623,0),
+("MSG_MOVE_ROOT",0x0ABA8,13623,0),
+("MSG_MOVE_UNROOT",0x02088,13623,0),
+("MSG_MOVE_HEARTBEAT",0x022EC,13623,0),
+("SMSG_MOVE_KNOCK_BACK",0x0B180,13623,0),
+("CMSG_MOVE_KNOCK_BACK_ACK",0x0F580,13623,0),
+("MSG_MOVE_KNOCK_BACK",0x0B0E8,13623,0),
+("SMSG_MOVE_FEATHER_FALL",0x06088,13623,0),
+("SMSG_MOVE_NORMAL_FALL",0x06CE0,13623,0),
+("SMSG_MOVE_SET_HOVER",0x06AE0,13623,0),
+("SMSG_MOVE_UNSET_HOVER",0x03FE0,13623,0),
+("SMSG_MOVE_SET_WALK_IN_AIR",0x0A980,13623,0),
+("SMSG_MOVE_UNSET_WALK_IN_AIR",0x07784,13623,0),
+("CMSG_MOVE_HOVER_ACK",0x0F4CC,13623,0),
+("MSG_MOVE_HOVER",0x02FCC,13623,0),
+("CMSG_TRIGGER_CINEMATIC_CHEAT",0x1003D,13623,0),
+("CMSG_OPENING_CINEMATIC",0x0B1E8,13623,0),
+("SMSG_TRIGGER_CINEMATIC",0x073A4,13623,0),
+("CMSG_NEXT_CINEMATIC_CAMERA",0x0B2CC,13623,0),
+("CMSG_COMPLETE_CINEMATIC",0x02ACC,13623,0),
+("SMSG_TUTORIAL_FLAGS",0x03384,13623,0),
+("CMSG_TUTORIAL_FLAG",0x0E4CC,13623,0),
+("CMSG_TUTORIAL_CLEAR",0x0A5E4,13623,0),
+("CMSG_TUTORIAL_RESET",0x0DE75,13623,0),
+("CMSG_STANDSTATECHANGE",0x0FC88,13623,0),
+("CMSG_EMOTE",0x0FAC4,13623,0),
+("SMSG_EMOTE",0x0EEA0,13623,0),
+("CMSG_TEXT_EMOTE",0x0E9E0,13623,0),
+("SMSG_TEXT_EMOTE",0x0BB8C,13623,0),
+("CMSG_AUTOEQUIP_GROUND_ITEM",0x10044,13623,0),
+("CMSG_AUTOSTORE_GROUND_ITEM",0x02FC8,13623,0),
+("CMSG_AUTOSTORE_LOOT_ITEM",0x0B2E8,13623,0),
+("CMSG_STORE_LOOT_IN_SLOT",0x07FCC,13623,0),
+("CMSG_AUTOEQUIP_ITEM",0x0E1C0,13623,0),
+("CMSG_AUTOSTORE_BAG_ITEM",0x0EDCC,13623,0),
+("CMSG_SWAP_ITEM",0x0E8AC,13623,0),
+("CMSG_SWAP_INV_ITEM",0x03EC4,13623,0),
+("CMSG_SPLIT_ITEM",0x0FDAC,13623,0),
+("CMSG_AUTOEQUIP_ITEM_SLOT",0x0E8A8,13623,0),
+("CMSG_DESTROYITEM",0x0B8A8,13623,0),
+("SMSG_INVENTORY_CHANGE_FAILURE",0x0AFCC,13623,0),
+("SMSG_OPEN_CONTAINER",0x01C5F,13623,0),
+("CMSG_INSPECT",0x078A8,13623,0),
+("SMSG_INSPECT",0x07AC8,13623,0),
+("CMSG_INITIATE_TRADE",0x00413,13623,0),
+("CMSG_BEGIN_TRADE",0x00F93,13623,0),
+("CMSG_BUSY_TRADE",0x1004C,13623,0),
+("CMSG_IGNORE_TRADE",0x1004D,13623,0),
+("CMSG_ACCEPT_TRADE",0x00891,13623,0),
+("CMSG_UNACCEPT_TRADE",0x00811,13623,0),
+("CMSG_CANCEL_TRADE",0x00013,13623,0),
+("CMSG_SET_TRADE_ITEM",0x00A11,13623,0),
+("CMSG_CLEAR_TRADE_ITEM",0x00213,13623,0),
+("CMSG_SET_TRADE_GOLD",0x00C13,13623,0),
+("SMSG_TRADE_STATUS",0x0494E,13623,0),
+("SMSG_TRADE_STATUS_EXTENDED",0x0400C,13623,0),
+("SMSG_INITIALIZE_FACTIONS",0x025C0,13623,0),
+("SMSG_SET_FACTION_VISIBLE",0x03988,13623,0),
+("SMSG_SET_FACTION_STANDING",0x0718C,13623,0),
+("CMSG_SET_FACTION_ATWAR",0x10055,13623,0),
+("CMSG_SET_FACTION_CHEAT",0x10056,13623,0),
+("SMSG_SET_PROFICIENCY",0x0BBA8,13623,0),
+("CMSG_SET_ACTION_BUTTON",0x072E8,13623,0),
+("SMSG_ACTION_BUTTONS",0x02CCC,13623,0),
+("SMSG_INITIAL_SPELLS",0x06584,13623,0),
+("SMSG_LEARNED_SPELL",0x076E8,13623,0),
+("SMSG_SUPERCEDED_SPELL",0x0E8E4,13623,0),
+("CMSG_NEW_SPELL_SLOT",0x10057,13623,0),
+("CMSG_CAST_SPELL",0x065C4,13623,0),
+("CMSG_CANCEL_CAST",0x0A1C0,13623,0),
+("SMSG_CAST_FAILED",0x02A8C,13623,0),
+("SMSG_SPELL_START",0x06BA8,13623,0),
+("SMSG_SPELL_GO",0x030C0,13623,0),
+("SMSG_SPELL_FAILURE",0x0F9CC,13623,0),
+("SMSG_SPELL_COOLDOWN",0x0F3E8,13623,0),
+("SMSG_COOLDOWN_EVENT",0x0EAEC,13623,0),
+("CMSG_CANCEL_AURA",0x07684,13623,0),
+("SMSG_EQUIPMENT_SET_SAVED",0x0B0C0,13623,0),
+("SMSG_PET_CAST_FAILED",0x0A9CC,13623,0),
+("MSG_CHANNEL_START",0x02BAC,13623,0),
+("MSG_CHANNEL_UPDATE",0x062AC,13623,0),
+("CMSG_CANCEL_CHANNELLING",0x0A780,13623,0),
+("SMSG_AI_REACTION",0x031CC,13623,0),
+("CMSG_SET_SELECTION",0x06488,13623,0),
+("CMSG_EQUIPMENT_SET_DELETE",0x0AEA0,13623,0),
+("CMSG_INSTANCE_LOCK_WARNING_RESPONSE",0x0E476,13623,0),
+("CMSG_UNUSED2",0x10058,13623,0),
+("CMSG_ATTACKSWING",0x074A8,13623,0),
+("CMSG_ATTACKSTOP",0x062C4,13623,0),
+("SMSG_ATTACKSTART",0x0B68C,13623,0),
+("SMSG_ATTACKSTOP",0x06DCC,13623,0),
+("SMSG_ATTACKSWING_NOTINRANGE",0x036C4,13623,0),
+("SMSG_ATTACKSWING_BADFACING",0x067A8,13623,0),
+("SMSG_INSTANCE_LOCK_WARNING_QUERY",0x0B574,13623,0),
+("SMSG_ATTACKSWING_DEADTARGET",0x0A7C4,13623,0),
+("SMSG_ATTACKSWING_CANT_ATTACK",0x06188,13623,0),
+("SMSG_ATTACKERSTATEUPDATE",0x0BBC0,13623,0),
+("SMSG_BATTLEFIELD_PORT_DENIED",0x10059,13623,0),
+("SMSG_DAMAGE_DONE_OBSOLETE",0x1005A,13623,0),
+("SMSG_UNIT_SPELLCAST_START",0x0BDE0,13623,0),
+("SMSG_CANCEL_COMBAT",0x0BAE4,13623,0),
+("SMSG_SPELLBREAKLOG",0x0BDAC,13623,0),
+("SMSG_SPELLHEALLOG",0x06E84,13623,0),
+("SMSG_SPELLENERGIZELOG",0x0F0EC,13623,0),
+("SMSG_BREAK_TARGET",0x02488,13623,0),
+("CMSG_SAVE_PLAYER",0x1005C,13623,0),
+("CMSG_SETDEATHBINDPOINT",0x0A94E,13623,0),
+("SMSG_BINDPOINTUPDATE",0x0A9A0,13623,0),
+("CMSG_GETDEATHBINDZONE",0x1005E,13623,0),
+("SMSG_BINDZONEREPLY",0x0ACAC,13623,0),
+("SMSG_PLAYERBOUND",0x06BCC,13623,0),
+("SMSG_CLIENT_CONTROL_UPDATE",0x03C84,13623,0),
+("CMSG_REPOP_REQUEST",0x0A9E4,13623,0),
+("SMSG_RESURRECT_REQUEST",0x0F3A0,13623,0),
+("CMSG_RESURRECT_RESPONSE",0x0BBE8,13623,0),
+("CMSG_LOOT",0x0FCEC,13623,0),
+("CMSG_LOOT_MONEY",0x079E0,13623,0),
+("CMSG_LOOT_RELEASE",0x03CE8,13623,0),
+("SMSG_LOOT_RESPONSE",0x0F38C,13623,0),
+("SMSG_LOOT_RELEASE_RESPONSE",0x023C8,13623,0),
+("SMSG_LOOT_REMOVED",0x06F88,13623,0),
+("SMSG_LOOT_MONEY_NOTIFY",0x067C0,13623,0),
+("SMSG_LOOT_ITEM_NOTIFY",0x0AECC,13623,0),
+("SMSG_LOOT_CLEAR_MONEY",0x03480,13623,0),
+("SMSG_ITEM_PUSH_RESULT",0x0FBE8,13623,0),
+("SMSG_DUEL_REQUESTED",0x03FC8,13623,0),
+("SMSG_DUEL_OUTOFBOUNDS",0x068C0,13623,0),
+("SMSG_DUEL_INBOUNDS",0x0ECA4,13623,0),
+("SMSG_DUEL_COMPLETE",0x0FCE8,13623,0),
+("SMSG_DUEL_WINNER",0x079E4,13623,0),
+("CMSG_DUEL_ACCEPTED",0x0A688,13623,0),
+("CMSG_DUEL_CANCELLED",0x06F8C,13623,0),
+("SMSG_MOUNTRESULT",0x02AEC,13623,0),
+("SMSG_DISMOUNTRESULT",0x0F9C0,13623,0),
+("SMSG_PUREMOUNT_CANCELLED_OBSOLETE",0x0054E,13623,0),
+("CMSG_MOUNTSPECIAL_ANIM",0x02EE4,13623,0),
+("SMSG_MOUNTSPECIAL_ANIM",0x02388,13623,0),
+("SMSG_PET_TAME_FAILURE",0x0FDA8,13623,0),
+("CMSG_PET_SET_ACTION",0x03C8C,13623,0),
+("CMSG_PET_ACTION",0x0AFC0,13623,0),
+("CMSG_PET_ABANDON",0x0A480,13623,0),
+("CMSG_PET_RENAME",0x038E8,13623,0),
+("SMSG_PET_NAME_INVALID",0x01457,13623,0),
+("SMSG_PET_SPELLS",0x0B780,13623,0),
+("SMSG_PET_MODE",0x079C0,13623,0),
+("CMSG_GOSSIP_HELLO",0x074C8,13623,0),
+("CMSG_GOSSIP_SELECT_OPTION",0x0FF88,13623,0),
+("SMSG_GOSSIP_MESSAGE",0x0BBC8,13623,0),
+("SMSG_GOSSIP_COMPLETE",0x0F0AC,13623,0),
+("CMSG_NPC_TEXT_QUERY",0x0A2EC,13623,0),
+("SMSG_NPC_TEXT_UPDATE",0x0B2AC,13623,0),
+("SMSG_NPC_WONT_TALK",0x10061,13623,0),
+("CMSG_QUESTGIVER_STATUS_QUERY",0x0FDEC,13623,0),
+("SMSG_QUESTGIVER_STATUS",0x07988,13623,0),
+("CMSG_QUESTGIVER_HELLO",0x036AC,13623,0),
+("SMSG_QUESTGIVER_QUEST_LIST",0x02B88,13623,0),
+("CMSG_QUESTGIVER_QUERY_QUEST",0x02CC0,13623,0),
+("CMSG_QUESTGIVER_QUEST_AUTOLAUNCH",0x10064,13623,0),
+("SMSG_QUESTGIVER_QUEST_DETAILS",0x068A0,13623,0),
+("CMSG_QUESTGIVER_ACCEPT_QUEST",0x020C4,13623,0),
+("CMSG_QUESTGIVER_COMPLETE_QUEST",0x0B5AC,13623,0),
+("SMSG_QUESTGIVER_REQUEST_ITEMS",0x06EE0,13623,0),
+("CMSG_QUESTGIVER_REQUEST_REWARD",0x023A8,13623,0),
+("SMSG_QUESTGIVER_OFFER_REWARD",0x03FCC,13623,0),
+("CMSG_QUESTGIVER_CHOOSE_REWARD",0x06AC0,13623,0),
+("SMSG_QUESTGIVER_QUEST_INVALID",0x10065,13623,0),
+("CMSG_QUESTGIVER_CANCEL",0x061EC,13623,0),
+("SMSG_QUESTGIVER_QUEST_COMPLETE",0x0050E,13623,0),
+("SMSG_QUESTGIVER_QUEST_FAILED",0x0A084,13623,0),
+("CMSG_QUESTLOG_SWAP_QUEST",0x10068,13623,0),
+("CMSG_QUESTLOG_REMOVE_QUEST",0x0EDA8,13623,0),
+("SMSG_QUESTLOG_FULL",0x061EC,13623,0),
+("SMSG_QUESTUPDATE_FAILED",0x0E588,13623,0),
+("SMSG_QUESTUPDATE_FAILEDTIMER",0x0F7CC,13623,0),
+("SMSG_QUESTUPDATE_COMPLETE",0x0EDA0,13623,0),
+("SMSG_QUESTUPDATE_ADD_KILL",0x0ADA0,13623,0),
+("SMSG_QUESTUPDATE_ADD_ITEM",0x1006B,13623,0),
+("CMSG_QUEST_CONFIRM_ACCEPT",0x06FCC,13623,0),
+("SMSG_QUEST_CONFIRM_ACCEPT",0x07C8C,13623,0),
+("CMSG_PUSHQUESTTOPARTY",0x029E8,13623,0),
+("CMSG_LIST_INVENTORY",0x0EDC8,13623,0),
+("SMSG_LIST_INVENTORY",0x0F8AC,13623,0),
+("CMSG_SELL_ITEM",0x063A4,13623,0),
+("SMSG_SELL_ITEM",0x037AC,13623,0),
+("CMSG_BUY_ITEM",0x0EA84,13623,0),
+("SMSG_BUY_ITEM",0x069CC,13623,0),
+("SMSG_BUY_FAILED",0x06CE8,13623,0),
+("CMSG_TAXICLEARALLNODES",0x1006C,13623,0),
+("CMSG_TAXIENABLEALLNODES",0x1006D,13623,0),
+("CMSG_TAXISHOWNODES",0x0B8E8,13623,0),
+("SMSG_SHOWTAXINODES",0x02B84,13623,0),
+("CMSG_TAXINODE_STATUS_QUERY",0x0A1EC,13623,0),
+("SMSG_TAXINODE_STATUS",0x077E8,13623,0),
+("CMSG_TAXIQUERYAVAILABLENODES",0x0BE8E,13623,0),
+("CMSG_ACTIVATETAXI",0x039A4,13623,0),
+("SMSG_ACTIVATETAXIREPLY",0x07A84,13623,0),
+("SMSG_NEW_TAXI_PATH",0x0E5E4,13623,0),
+("CMSG_TRAINER_LIST",0x0E5AC,13623,0),
+("SMSG_TRAINER_LIST",0x0BBE0,13623,0),
+("CMSG_TRAINER_BUY_SPELL",0x0FDC8,13623,0),
+("SMSG_TRAINER_BUY_RESULT",0x06DEC,13623,0),
+("CMSG_BINDER_ACTIVATE",0x0A48C,13623,0),
+("SMSG_PLAYERBINDERROR",0x0EEC8,13623,0),
+("CMSG_BANKER_ACTIVATE",0x0E7E0,13623,0),
+("SMSG_SHOW_BANK",0x027A4,13623,0),
+("CMSG_BUY_BANK_SLOT",0x02BA0,13623,0),
+("SMSG_BUY_BANK_SLOT_RESULT",0x10076,13623,0),
+("CMSG_PETITION_SHOWLIST",0x0FCC4,13623,0),
+("SMSG_PETITION_SHOWLIST",0x0FCC0,13623,0),
+("CMSG_PETITION_BUY",0x0B3E4,13623,0),
+("CMSG_PETITION_SHOW_SIGNATURES",0x02CA8,13623,0),
+("SMSG_PETITION_SHOW_SIGNATURES",0x0E2E0,13623,0),
+("CMSG_PETITION_SIGN",0x03AA0,13623,0),
+("SMSG_PETITION_SIGN_RESULTS",0x0A1A4,13623,0),
+("MSG_PETITION_DECLINE",0x032E0,13623,0),
+("CMSG_OFFER_PETITION",0x07AC4,13623,0),
+("CMSG_TURN_IN_PETITION",0x0A584,13623,0),
+("SMSG_TURN_IN_PETITION_RESULTS",0x035AC,13623,0),
+("CMSG_PETITION_QUERY",0x0B1AC,13623,0),
+("SMSG_PETITION_QUERY_RESPONSE",0x0FB80,13623,0),
+("SMSG_FISH_NOT_HOOKED",0x039EC,13623,0),
+("SMSG_FISH_ESCAPED",0x0F080,13623,0),
+("CMSG_BUG",0x034AC,13623,0),
+("SMSG_NOTIFICATION",0x0BC88,13623,0),
+("CMSG_PLAYED_TIME",0x0F480,13623,0),
+("SMSG_PLAYED_TIME",0x0E4C8,13623,0),
+("CMSG_QUERY_TIME",0x0B1C0,13623,0),
+("SMSG_QUERY_TIME_RESPONSE",0x0F1AC,13623,0),
+("SMSG_LOG_XPGAIN",0x0B880,13623,0),
+("SMSG_AURACASTLOG",0x10080,13623,0),
+("CMSG_RECLAIM_CORPSE",0x07CC8,13623,0),
+("CMSG_WRAP_ITEM",0x06E54,13623,0),
+("SMSG_LEVELUP_INFO",0x0B9C4,13623,0),
+("MSG_MINIMAP_PING",0x0C475,13623,0),
+("SMSG_RESISTLOG",0x10084,13623,0),
+("SMSG_ENCHANTMENTLOG",0x0F5AC,13623,0),
+("CMSG_SET_SKILL_CHEAT",0x10085,13623,0),
+("SMSG_START_MIRROR_TIMER",0x0B4A8,13623,0),
+("SMSG_PAUSE_MIRROR_TIMER",0x021EC,13623,0),
+("SMSG_STOP_MIRROR_TIMER",0x0A68C,13623,0),
+("CMSG_PING",0x0064E,13623,0),
+("SMSG_PONG",0x0A01B,13623,0),
+("SMSG_CLEAR_COOLDOWN",0x036CC,13623,0),
+("SMSG_GAMEOBJECT_PAGETEXT",0x0E5C8,13623,0),
+("CMSG_SETSHEATHED",0x0AAE4,13623,0),
+("SMSG_COOLDOWN_CHEAT",0x0AAA4,13623,0),
+("SMSG_SPELL_DELAYED",0x0A3E8,13623,0),
+("CMSG_QUEST_POI_QUERY",0x07DE0,13623,0),
+("SMSG_QUEST_POI_QUERY_RESPONSE",0x06AEC,13623,0),
+("CMSG_GHOST",0x10088,13623,0),
+("CMSG_GM_INVIS",0x10089,13623,0),
+("SMSG_INVALID_PROMOTION_CODE",0x069AC,13623,0),
+("MSG_GM_BIND_OTHER",0x1008B,13623,0),
+("MSG_GM_SUMMON",0x1008C,13623,0),
+("SMSG_ITEM_TIME_UPDATE",0x066A4,13623,0),
+("SMSG_ITEM_ENCHANT_TIME_UPDATE",0x066A0,13623,0),
+("SMSG_AUTH_CHALLENGE",0x06019,13623,0),
+("CMSG_AUTH_SESSION",0x00E0E,13623,0),
+("SMSG_AUTH_RESPONSE",0x0B28C,13623,0),
+("MSG_GM_SHOWLABEL",0x1008D,13623,0),
+("CMSG_PET_CAST_SPELL",0x02888,13623,0),
+("MSG_SAVE_GUILD_EMBLEM",0x031AC,13623,0),
+("MSG_TABARDVENDOR_ACTIVATE",0x02C80,13623,0),
+("SMSG_PLAY_SPELL_VISUAL",0x0FF8C,13623,0),
+("CMSG_ZONEUPDATE",0x033E4,13623,0),
+("SMSG_PARTYKILLLOG",0x0AB84,13623,0),
+("SMSG_COMPRESSED_UPDATE_OBJECT",0x0EAC0,13623,0),
+("SMSG_PLAY_SPELL_IMPACT",0x0A3E4,13623,0),
+("SMSG_EXPLORATION_EXPERIENCE",0x0A9C4,13623,0),
+("CMSG_GM_SET_SECURITY_GROUP",0x1008E,13623,0),
+("CMSG_GM_NUKE",0x1008F,13623,0),
+("MSG_RANDOM_ROLL",0x0B7A4,13623,0),
+("SMSG_ENVIRONMENTALDAMAGELOG",0x0E1C8,13623,0),
+("CMSG_PLAYER_DIFFICULTY_CHANGE",0x07E5D,13623,0),
+("SMSG_RWHOIS",0x071C8,13623,0),
+("SMSG_LFG_PLAYER_REWARD",0x02C88,13623,0),
+("SMSG_LFG_TELEPORT_DENIED",0x0EAA0,13623,0),
+("CMSG_UNLEARN_SPELL",0x10090,13623,0),
+("CMSG_UNLEARN_SKILL",0x063C8,13623,0),
+("SMSG_REMOVED_SPELL",0x07CA0,13623,0),
+("CMSG_DECHARGE",0x10092,13623,0),
+("CMSG_GMTICKET_CREATE",0x06380,13623,0),
+("SMSG_GMTICKET_CREATE",0x0A8A0,13623,0),
+("CMSG_GMTICKET_UPDATETEXT",0x07F8C,13623,0),
+("SMSG_GMTICKET_UPDATETEXT",0x0A5E8,13623,0),
+("SMSG_ACCOUNT_DATA_TIMES",0x07280,13623,0),
+("CMSG_REQUEST_ACCOUNT_DATA",0x0EEAC,13623,0),
+("CMSG_UPDATE_ACCOUNT_DATA",0x072A4,13623,0),
+("SMSG_UPDATE_ACCOUNT_DATA",0x0F7A0,13623,0),
+("SMSG_CLEAR_FAR_SIGHT_IMMEDIATE",0x0BEE4,13623,0),
+("SMSG_PLAYER_DIFFICULTY_CHANGE",0x02A80,13623,0),
+("CMSG_GM_TEACH",0x10095,13623,0),
+("CMSG_GM_CREATE_ITEM_TARGET",0x10096,13623,0),
+("CMSG_GMTICKET_GETTICKET",0x0B4C4,13623,0),
+("SMSG_GMTICKET_GETTICKET",0x02284,13623,0),
+("CMSG_UNLEARN_TALENTS",0x10098,13623,0),
+("SMSG_UPDATE_INSTANCE_ENCOUNTER_UNIT",0x0EDA4,13623,0),
+("SMSG_GAMEOBJECT_DESPAWN_ANIM",0x0BFA8,13623,0),
+("MSG_CORPSE_QUERY",0x0E0C8,13623,0),
+("CMSG_GMTICKET_DELETETICKET",0x0FBE4,13623,0),
+("SMSG_GMTICKET_DELETETICKET",0x0F48C,13623,0),
+("SMSG_CHAT_WRONG_FACTION",0x0BB88,13623,0),
+("CMSG_GMTICKET_SYSTEMSTATUS",0x0ACE0,13623,0),
+("SMSG_GMTICKET_SYSTEMSTATUS",0x0B9C0,13623,0),
+("CMSG_SPIRIT_HEALER_ACTIVATE",0x0F3AC,13623,0),
+("SMSG_QUEST_FORCE_REMOVED",0x034E8,13623,0),
+("CMSG_SKILL_BUY_STEP",0x1009E,13623,0),
+("CMSG_SKILL_BUY_RANK",0x1009F,13623,0),
+("SMSG_SPIRIT_HEALER_CONFIRM",0x0B9C0,13623,0),
+("CMSG_CHARACTER_POINT_CHEAT",0x100A0,13623,0),
+("SMSG_GOSSIP_POI",0x0B9AC,13623,0),
+("CMSG_CHAT_IGNORED",0x0A78C,13623,0),
+("CMSG_GUILD_RANK",0x02709,13623,0),
+("SMSG_GUILD_RANK",0x0411E,13623,0),
+("CMSG_GUILD_ADD_RANK",0x02309,13623,0),
+("CMSG_GUILD_DEL_RANK",0x02129,13623,0),
+("CMSG_GUILD_SWITCH_RANK",0x100A6,13623,0),
+("CMSG_GUILD_SET_NOTE",0x0232D,13623,0),
+("SMSG_LOGIN_VERIFY_WORLD",0x028C0,13623,0),
+("CMSG_CLEAR_EXPLORATION",0x100A9,13623,0),
+("CMSG_SEND_MAIL",0x02DEC,13623,0),
+("SMSG_SEND_MAIL_RESULT",0x0E5C0,13623,0),
+("CMSG_GET_MAIL_LIST",0x0B284,13623,0),
+("SMSG_MAIL_LIST_RESULT",0x0F1C8,13623,0),
+("CMSG_BATTLEFIELD_LIST",0x00508,13623,0),
+("SMSG_BATTLEFIELD_LIST",0x0490C,13623,0),
+("CMSG_BATTLEFIELD_JOIN",0x00C91,13623,0),
+("SMSG_JOINED_BATTLEGROUND_QUEUE",0x0090E,13623,0),
+("CMSG_REQUEST_RATED_BG_INFO",0x08501,13623,0),
+("CMSG_REQUEST_PVP_OPTIONS_ENABLED",0x00188,13623,0),
+("CMSG_BATTLEMASTER_JOIN_RATED",0x10104,13623,0),
+("CMSG_TAXICLEARNODE",0x100AD,13623,0),
+("CMSG_TAXIENABLENODE",0x100AE,13623,0),
+("CMSG_ITEM_TEXT_QUERY",0x0F280,13623,0),
+("SMSG_ITEM_TEXT_QUERY_RESPONSE",0x077C8,13623,0),
+("CMSG_MAIL_TAKE_MONEY",0x0E8EC,13623,0),
+("CMSG_MAIL_TAKE_ITEM",0x062A8,13623,0),
+("CMSG_MAIL_MARK_AS_READ",0x0E8C0,13623,0),
+("CMSG_MAIL_RETURN_TO_SENDER",0x065A4,13623,0),
+("CMSG_MAIL_DELETE",0x07DE4,13623,0),
+("CMSG_MAIL_CREATE_TEXT_ITEM",0x0FAE4,13623,0),
+("SMSG_SPELLLOGMISS",0x0B4A4,13623,0),
+("SMSG_SPELLLOGEXECUTE",0x0B6E8,13623,0),
+("SMSG_DEBUGAURAPROC",0x100B6,13623,0),
+("SMSG_PERIODICAURALOG",0x03388,13623,0),
+("SMSG_SPELLDAMAGESHIELD",0x073A0,13623,0),
+("SMSG_SPELLNONMELEEDAMAGELOG",0x074AC,13623,0),
+("CMSG_LEARN_TALENT",0x0A7CC,13623,0),
+("SMSG_RESURRECT_FAILED",0x0D557,13623,0),
+("CMSG_TOGGLE_PVP",0x06480,13623,0),
+("SMSG_ZONE_UNDER_ATTACK",0x0BD80,13623,0),
+("MSG_AUCTION_HELLO",0x0B3A0,13623,0),
+("CMSG_AUCTION_SELL_ITEM",0x0EE8C,13623,0),
+("CMSG_AUCTION_REMOVE_ITEM",0x03EEC,13623,0),
+("CMSG_AUCTION_LIST_ITEMS",0x0E48C,13623,0),
+("CMSG_AUCTION_LIST_OWNER_ITEMS",0x02D8C,13623,0),
+("CMSG_AUCTION_PLACE_BID",0x0A6A0,13623,0),
+("SMSG_AUCTION_COMMAND_RESULT",0x0AAE0,13623,0),
+("SMSG_AUCTION_LIST_RESULT",0x0A1A8,13623,0),
+("SMSG_AUCTION_OWNER_LIST_RESULT",0x03CA8,13623,0),
+("SMSG_AUCTION_BIDDER_NOTIFICATION",0x0ACEC,13623,0),
+("SMSG_AUCTION_OWNER_NOTIFICATION",0x06C80,13623,0),
+("SMSG_PROCRESIST",0x07E80,13623,0),
+("SMSG_STANDSTATE_CHANGE_FAILURE_OBSOLETE",0x06DCC,13623,0),
+("SMSG_DISPEL_FAILED",0x0AAE8,13623,0),
+("SMSG_SPELLORDAMAGE_IMMUNE",0x073C8,13623,0),
+("CMSG_AUCTION_LIST_BIDDER_ITEMS",0x021C0,13623,0),
+("SMSG_AUCTION_BIDDER_LIST_RESULT",0x0E5A8,13623,0),
+("SMSG_SET_FLAT_SPELL_MODIFIER",0x02BC8,13623,0),
+("SMSG_SET_PCT_SPELL_MODIFIER",0x0A6E8,13623,0),
+("CMSG_SET_AMMO",0x100BF,13623,0),
+("SMSG_CORPSE_RECLAIM_DELAY",0x031C4,13623,0),
+("CMSG_SET_ACTIVE_MOVER",0x06CA0,13623,0),
+("CMSG_PET_CANCEL_AURA",0x0F6C0,13623,0),
+("CMSG_PLAYER_AI_CHEAT",0x100C2,13623,0),
+("CMSG_CANCEL_AUTO_REPEAT_SPELL",0x075CC,13623,0),
+("MSG_GM_ACCOUNT_ONLINE",0x100C3,13623,0),
+("MSG_LIST_STABLED_PETS",0x06EAC,13623,0),
+("SMSG_STABLE_RESULT",0x0EACC,13623,0),
+("CMSG_STABLE_REVIVE_PET",0x100C7,13623,0),
+("CMSG_STABLE_CHANGE_SLOT",0x00291,13623,0),
+("MSG_QUEST_PUSH_RESULT",0x022A4,13623,0),
+("SMSG_PLAY_MUSIC",0x0AE54,13623,0),
+("SMSG_PLAY_OBJECT_SOUND",0x07DA0,13623,0),
+("CMSG_REQUEST_PET_INFO",0x0EAE4,13623,0),
+("CMSG_FAR_SIGHT",0x0B2EC,13623,0),
+("SMSG_SPELLDISPELLOG",0x03C56,13623,0),
+("SMSG_DAMAGE_CALC_LOG",0x0FD84,13623,0),
+("CMSG_ENABLE_DAMAGE_LOG",0x100CB,13623,0),
+("CMSG_GROUP_CHANGE_SUB_GROUP",0x03A80,13623,0),
+("CMSG_REQUEST_PARTY_MEMBER_STATS",0x070C8,13623,0),
+("CMSG_GROUP_SWAP_SUB_GROUP",0x0677F,13623,0),
+("CMSG_RESET_FACTION_CHEAT",0x100CD,13623,0),
+("CMSG_AUTOSTORE_BANK_ITEM",0x0F2AC,13623,0),
+("CMSG_AUTOBANK_ITEM",0x066E4,13623,0),
+("MSG_QUERY_NEXT_MAIL_TIME",0x025C8,13623,0),
+("SMSG_RECEIVED_MAIL",0x075E4,13623,0),
+("SMSG_RAID_GROUP_ONLY",0x00554,13623,0),
+("CMSG_SET_DURABILITY_CHEAT",0x100CE,13623,0),
+("CMSG_SET_PVP_RANK_CHEAT",0x100CF,13623,0),
+("CMSG_ADD_PVP_MEDAL_CHEAT",0x100D0,13623,0),
+("CMSG_DEL_PVP_MEDAL_CHEAT",0x100D1,13623,0),
+("CMSG_SET_PVP_TITLE",0x100D2,13623,0),
+("SMSG_PVP_CREDIT",0x037C8,13623,0),
+("SMSG_AUCTION_REMOVED_NOTIFICATION",0x0B1EC,13623,0),
+("CMSG_GROUP_RAID_CONVERT",0x0628C,13623,0),
+("CMSG_GROUP_ASSISTANT_LEADER",0x03F84,13623,0),
+("CMSG_BUYBACK_ITEM",0x0A4C4,13623,0),
+("SMSG_SERVER_MESSAGE",0x078C0,13623,0),
+("CMSG_SET_SAVED_INSTANCE_EXTEND",0x02588,13623,0),
+("SMSG_LFG_OFFER_CONTINUE",0x063EC,13623,0),
+("CMSG_MEETINGSTONE_CHEAT",0x100D5,13623,0),
+("SMSG_MEETINGSTONE_SETQUEUE",0x0ED88,13623,0),
+("CMSG_MEETINGSTONE_INFO",0x0F984,13623,0),
+("SMSG_MEETINGSTONE_COMPLETE",0x0F680,13623,0),
+("SMSG_MEETINGSTONE_IN_PROGRESS",0x0E7C4,13623,0),
+("SMSG_MEETINGSTONE_MEMBER_ADDED",0x0B2A8,13623,0),
+("CMSG_GMTICKETSYSTEM_TOGGLE",0x100D7,13623,0),
+("CMSG_CANCEL_GROWTH_AURA",0x0FECC,13623,0),
+("SMSG_CANCEL_AUTO_REPEAT",0x03DE0,13623,0),
+("SMSG_STANDSTATE_UPDATE",0x0E6A8,13623,0),
+("SMSG_LOOT_ALL_PASSED",0x06AC4,13623,0),
+("SMSG_LOOT_ROLL_WON",0x06280,13623,0),
+("CMSG_LOOT_ROLL",0x0BDA8,13623,0),
+("SMSG_LOOT_START_ROLL",0x0EB84,13623,0),
+("SMSG_LOOT_ROLL",0x066A8,13623,0),
+("CMSG_LOOT_MASTER_GIVE",0x100DA,13623,0),
+("SMSG_LOOT_MASTER_LIST",0x0ECC4,13623,0),
+("SMSG_SET_FORCED_REACTIONS",0x100DB,13623,0),
+("SMSG_SPELL_FAILED_OTHER",0x0E7A4,13623,0),
+("SMSG_GAMEOBJECT_RESET_STATE",0x022E0,13623,0),
+("CMSG_REPAIR_ITEM",0x039E4,13623,0),
+("SMSG_CHAT_PLAYER_NOT_FOUND",0x035A0,13623,0),
+("MSG_TALENT_WIPE_CONFIRM",0x0BFC4,13623,0),
+("SMSG_SUMMON_REQUEST",0x03AE4,13623,0),
+("CMSG_SUMMON_RESPONSE",0x06BA0,13623,0),
+("MSG_MOVE_TOGGLE_GRAVITY_CHEAT",0x100DD,13623,0),
+("SMSG_MONSTER_MOVE_TRANSPORT",0x0248C,13623,0),
+("SMSG_PET_BROKEN",0x075E0,13623,0),
+("MSG_MOVE_FEATHER_FALL",0x0B6A8,13623,0),
+("MSG_MOVE_WATER_WALK",0x0E1A4,13623,0),
+("CMSG_SERVER_BROADCAST",0x100DE,13623,0),
+("CMSG_SELF_RES",0x0AEC4,13623,0),
+("SMSG_FEIGN_DEATH_RESISTED",0x03BE8,13623,0),
+("CMSG_RUN_SCRIPT",0x100DF,13623,0),
+("SMSG_SCRIPT_MESSAGE",0x100E0,13623,0),
+("SMSG_DUEL_COUNTDOWN",0x0E8E0,13623,0),
+("SMSG_AREA_TRIGGER_MESSAGE",0x0EAE0,13623,0),
+("CMSG_SHOWING_HELM",0x0B7C0,13623,0),
+("CMSG_SHOWING_CLOAK",0x07AA4,13623,0),
+("SMSG_LFG_ROLE_CHOSEN",0x0A9AC,13623,0),
+("SMSG_PLAYER_SKINNED",0x0BAA0,13623,0),
+("SMSG_DURABILITY_DAMAGE_DEATH",0x0FDA0,13623,0),
+("CMSG_SET_EXPLORATION",0x100E1,13623,0),
+("CMSG_SET_ACTIONBAR_TOGGLES",0x032C4,13623,0),
+("MSG_PETITION_RENAME",0x070C0,13623,0),
+("SMSG_INIT_WORLD_STATES",0x0F6E8,13623,0),
+("SMSG_UPDATE_WORLD_STATE",0x0F784,13623,0),
+("CMSG_ITEM_NAME_QUERY",0x100E3,13623,0),
+("SMSG_ITEM_NAME_QUERY_RESPONSE",0x07BC8,13623,0),
+("SMSG_PET_ACTION_FEEDBACK",0x02584,13623,0),
+("CMSG_CHAR_RENAME",0x027C4,13623,0),
+("SMSG_CHAR_RENAME",0x0E0EC,13623,0),
+("CMSG_MOVE_SPLINE_DONE",0x069E8,13623,0),
+("CMSG_MOVE_FALL_RESET",0x100E6,13623,0),
+("SMSG_INSTANCE_SAVE_CREATED",0x0BBC4,13623,0),
+("SMSG_RAID_INSTANCE_INFO",0x100E7,13623,0),
+("CMSG_REQUEST_RAID_INFO",0x03DE4,13623,0),
+("CMSG_MOVE_TIME_SKIPPED",0x0E180,13623,0),
+("CMSG_MOVE_FEATHER_FALL_ACK",0x06EA8,13623,0),
+("CMSG_MOVE_WATER_WALK_ACK",0x021C4,13623,0),
+("CMSG_MOVE_NOT_ACTIVE_MOVER",0x0B9A8,13623,0),
+("SMSG_PLAY_SOUND",0x02EA8,13623,0),
+("CMSG_BATTLEFIELD_STATUS",0x08188,13623,0),
+("SMSG_BATTLEFIELD_STATUS1",0x0454C,13623,0),
+("SMSG_BATTLEFIELD_STATUS2",0x0051E,13623,0),
+("SMSG_BATTLEFIELD_STATUS3",0x0081C,13623,0),
+("SMSG_BATTLEFIELD_STATUS4",0x04C4C,13623,0),
+("CMSG_BATTLEFIELD_PORT",0x00E11,13623,0),
+("CMSG_INSPECT_HONOR_STATS",0x00E93,13623,0),
+("SMSG_INSPECT_HONOR_STATS",0x0005E,13623,0),
+("CMSG_BATTLEMASTER_HELLO",0x06D57,13623,0),
+("CMSG_MOVE_START_SWIM_CHEAT",0x026C0,13623,0),
+("CMSG_MOVE_STOP_SWIM_CHEAT",0x06988,13623,0),
+("SMSG_FORCE_WALK_SPEED_CHANGE",0x068E8,13623,0),
+("CMSG_FORCE_WALK_SPEED_CHANGE_ACK",0x078CC,13623,0),
+("SMSG_FORCE_SWIM_BACK_SPEED_CHANGE",0x002DC,13623,0),
+("CMSG_FORCE_SWIM_BACK_SPEED_CHANGE_ACK",0x0E8C4,13623,0),
+("SMSG_FORCE_TURN_RATE_CHANGE",0x0375E,13623,0),
+("CMSG_FORCE_TURN_RATE_CHANGE_ACK",0x0E384,13623,0),
+("MSG_PVP_LOG_DATA",0x00C0E,13623,0),
+("CMSG_BATTLEFIELD_REQUEST_SCORE_DATA",0x00493,13623,0),
+("CMSG_LEAVE_BATTLEFIELD",0x07DC4,13623,0),
+("CMSG_AREA_SPIRIT_HEALER_QUERY",0x0A6C0,13623,0),
+("CMSG_AREA_SPIRIT_HEALER_QUEUE",0x0F388,13623,0),
+("SMSG_AREA_SPIRIT_HEALER_TIME",0x06D80,13623,0),
+("CMSG_GM_UNTEACH",0x100FD,13623,0),
+("SMSG_WARDEN_DATA",0x0F8A0,13623,0),
+("CMSG_WARDEN_DATA",0x02F84,13623,0),
+("SMSG_GROUP_JOINED_BATTLEGROUND",0x00D1E,13623,0),
+("CMSG_BATTLEGROUND_PLAYER_POSITIONS",0x00293,13623,0),
+("SMSG_BATTLEGROUND_PLAYER_POSITIONS",0x0045C,13623,0),
+("CMSG_PET_STOP_ATTACK",0x10100,13623,0),
+("SMSG_BINDER_CONFIRM",0x033C4,13623,0),
+("SMSG_BATTLEGROUND_PLAYER_JOINED",0x0494C,13623,0),
+("SMSG_BATTLEGROUND_PLAYER_LEFT",0x00D1C,13623,0),
+("CMSG_BATTLEMASTER_JOIN",0x00137,13623,0),
+("SMSG_ADDON_INFO",0x0EA80,13623,0),
+("CMSG_PET_UNLEARN",0x10105,13623,0),
+("SMSG_PET_UNLEARN_CONFIRM",0x10106,13623,0),
+("SMSG_PARTY_MEMBER_STATS_FULL",0x0BA8C,13623,0),
+("CMSG_PET_SPELL_AUTOCAST",0x0B6A4,13623,0),
+("SMSG_WEATHER",0x079A0,13623,0),
+("SMSG_PLAY_TIME_WARNING",0x032EC,13623,0),
+("SMSG_MINIGAME_SETUP",0x01C74,13623,0),
+("SMSG_MINIGAME_STATE",0x04C7F,13623,0),
+("CMSG_MINIGAME_MOVE",0x0B2E4,13623,0),
+("SMSG_MINIGAME_MOVE_FAILED",0x10109,13623,0),
+("SMSG_RAID_INSTANCE_MESSAGE",0x06680,13623,0),
+("SMSG_COMPRESSED_MOVES",0x06FE4,13623,0),
+("CMSG_GUILD_INFO_TEXT",0x0270D,13623,0),
+("SMSG_CHAT_RESTRICTED",0x03EC8,13623,0),
+("SMSG_SPLINE_SET_RUN_SPEED",0x0F9E8,13623,0),
+("SMSG_SPLINE_SET_RUN_BACK_SPEED",0x0E9C0,13623,0),
+("SMSG_SPLINE_SET_SWIM_SPEED",0x0B2C0,13623,0),
+("SMSG_SPLINE_SET_WALK_SPEED",0x03EA8,13623,0),
+("SMSG_SPLINE_SET_SWIM_BACK_SPEED",0x021C8,13623,0),
+("SMSG_SPLINE_SET_TURN_RATE",0x07EAC,13623,0),
+("SMSG_SPLINE_MOVE_UNROOT",0x1010B,13623,0),
+("SMSG_SPLINE_MOVE_FEATHER_FALL",0x1010C,13623,0),
+("SMSG_SPLINE_MOVE_NORMAL_FALL",0x1010D,13623,0),
+("SMSG_SPLINE_MOVE_SET_HOVER",0x1010E,13623,0),
+("SMSG_SPLINE_MOVE_UNSET_HOVER",0x1010F,13623,0),
+("SMSG_SPLINE_MOVE_WATER_WALK",0x061C0,13623,0),
+("SMSG_SPLINE_MOVE_LAND_WALK",0x0A7C8,13623,0),
+("SMSG_SPLINE_MOVE_START_SWIM",0x10112,13623,0),
+("SMSG_SPLINE_MOVE_STOP_SWIM",0x10113,13623,0),
+("SMSG_SPLINE_MOVE_SET_RUN_MODE",0x10114,13623,0),
+("SMSG_SPLINE_MOVE_SET_WALK_MODE",0x10115,13623,0),
+("CMSG_GM_NUKE_ACCOUNT",0x10116,13623,0),
+("MSG_GM_DESTROY_CORPSE",0x10117,13623,0),
+("CMSG_GM_DESTROY_ONLINE_CORPSE",0x10118,13623,0),
+("CMSG_ACTIVATETAXIEXPRESS",0x0FC8C,13623,0),
+("SMSG_SET_FACTION_ATWAR",0x02780,13623,0),
+("SMSG_GAMETIMEBIAS_SET",0x1011A,13623,0),
+("CMSG_DEBUG_ACTIONS_START",0x1011B,13623,0),
+("CMSG_DEBUG_ACTIONS_STOP",0x1011C,13623,0),
+("CMSG_SET_FACTION_INACTIVE",0x1011D,13623,0),
+("CMSG_SET_WATCHED_FACTION",0x1011E,13623,0),
+("MSG_MOVE_TIME_SKIPPED",0x025E4,13623,0),
+("SMSG_SPLINE_MOVE_ROOT",0x01E55,13623,0),
+("CMSG_SET_EXPLORATION_ALL",0x10120,13623,0),
+("SMSG_INVALIDATE_PLAYER",0x0A884,13623,0),
+("CMSG_RESET_INSTANCES",0x0AAA0,13623,0),
+("SMSG_INSTANCE_RESET",0x030E8,13623,0),
+("SMSG_INSTANCE_RESET_FAILED",0x03BA0,13623,0),
+("SMSG_UPDATE_LAST_INSTANCE",0x033E8,13623,0),
+("MSG_RAID_TARGET_UPDATE",0x0A5AC,13623,0),
+("MSG_RAID_READY_CHECK",0x0FDC0,13623,0),
+("CMSG_LUA_USAGE",0x10122,13623,0),
+("SMSG_PET_ACTION_SOUND",0x030E4,13623,0),
+("SMSG_PET_DISMISS_SOUND",0x0B7E0,13623,0),
+("SMSG_GHOSTEE_GONE",0x10123,13623,0),
+("CMSG_GM_UPDATE_TICKET_STATUS",0x10124,13623,0),
+("SMSG_GM_TICKET_STATUS_UPDATE",0x072C4,13623,0),
+("MSG_SET_DUNGEON_DIFFICULTY",0x074E0,13623,0),
+("CMSG_GMSURVEY_SUBMIT",0x0E280,13623,0),
+("SMSG_UPDATE_INSTANCE_OWNERSHIP",0x03B8C,13623,0),
+("CMSG_IGNORE_KNOCKBACK_CHEAT",0x10126,13623,0),
+("SMSG_CHAT_PLAYER_AMBIGUOUS",0x06AE8,13623,0),
+("MSG_DELAY_GHOST_TELEPORT",0x10127,13623,0),
+("SMSG_SPELLINSTAKILLLOG",0x061C8,13623,0),
+("SMSG_SPELL_UPDATE_CHAIN_TARGETS",0x036A4,13623,0),
+("CMSG_CHAT_FILTERED",0x00D5D,13623,0),
+("SMSG_EXPECTED_SPAM_RECORDS",0x06084,13623,0),
+("SMSG_SPELLSTEALLOG",0x09F74,13623,0),
+("CMSG_LOTTERY_QUERY_OBSOLETE",0x10129,13623,0),
+("SMSG_LOTTERY_QUERY_RESULT_OBSOLETE",0x1012A,13623,0),
+("CMSG_BUY_LOTTERY_TICKET_OBSOLETE",0x00336,13623,0),
+("SMSG_LOTTERY_RESULT_OBSOLETE",0x1012C,13623,0),
+("SMSG_CHARACTER_PROFILE",0x1012D,13623,0),
+("SMSG_CHARACTER_PROFILE_REALM_CONNECTED",0x1012E,13623,0),
+("SMSG_DEFENSE_MESSAGE",0x065EC,13623,0),
+("SMSG_INSTANCE_DIFFICULTY",0x0A55E,13623,0),
+("MSG_GM_RESETINSTANCELIMIT",0x1012F,13623,0),
+("SMSG_MOTD",0x077C0,13623,0),
+("SMSG_MOVE_SET_FLIGHT",0x0C57F,13623,0),
+("SMSG_MOVE_UNSET_FLIGHT",0x0BDA0,13623,0),
+("CMSG_MOVE_FLIGHT_ACK",0x0A3C8,13623,0),
+("MSG_MOVE_START_SWIM_CHEAT",0x026C0,13623,0),
+("MSG_MOVE_STOP_SWIM_CHEAT",0x06988,13623,0),
+("SMSG_MOVE_SET_CAN_FLY",0x0BDA0,13623,0),
+("SMSG_MOVE_UNSET_CAN_FLY",0x03084,13623,0),
+("CMSG_MOVE_SET_CAN_FLY_ACK",0x0FCAC,13623,0),
+("CMSG_MOVE_SET_FLY",0x0E0E0,13623,0),
+("CMSG_SOCKET_GEMS",0x076C4,13623,0),
+("CMSG_ARENA_TEAM_CREATE",0x00509,13623,0),
+("SMSG_ARENA_TEAM_COMMAND_RESULT",0x0040C,13623,0),
+("CMSG_ARENA_TEAM_QUERY",0x0B9C8,13623,0),
+("SMSG_ARENA_TEAM_QUERY_RESPONSE",0x03DE8,13623,0),
+("CMSG_ARENA_TEAM_ROSTER",0x06BAC,13623,0),
+("SMSG_ARENA_TEAM_ROSTER",0x0EC80,13623,0),
+("CMSG_ARENA_TEAM_INVITE",0x0E9CC,13623,0),
+("SMSG_ARENA_TEAM_INVITE",0x063A0,13623,0),
+("CMSG_ARENA_TEAM_ACCEPT",0x061AC,13623,0),
+("CMSG_ARENA_TEAM_DECLINE",0x0F2C0,13623,0),
+("CMSG_ARENA_TEAM_LEAVE",0x064C4,13623,0),
+("CMSG_ARENA_TEAM_REMOVE",0x07E84,13623,0),
+("CMSG_ARENA_TEAM_DISBAND",0x0698C,13623,0),
+("CMSG_ARENA_TEAM_LEADER",0x0218C,13623,0),
+("SMSG_ARENA_TEAM_EVENT",0x074C4,13623,0),
+("CMSG_BATTLEMASTER_JOIN_ARENA",0x00311,13623,0),
+("MSG_MOVE_START_ASCEND",0x0BDC0,13623,0),
+("MSG_MOVE_STOP_ASCEND",0x0FCA8,13623,0),
+("SMSG_ARENA_TEAM_STATS",0x09F5F,13623,0),
+("CMSG_LFG_JOIN",0x063C0,13623,0),
+("CMSG_LFG_LEAVE",0x03688,13623,0),
+("CMSG_SEARCH_LFG_JOIN",0x061CC,13623,0),
+("CMSG_SEARCH_LFG_LEAVE",0x0847D,13623,0),
+("SMSG_UPDATE_LFG_LIST",0x0768C,13623,0),
+("SMSG_LFG_PROPOSAL_UPDATE",0x032AC,13623,0),
+("CMSG_LFG_PROPOSAL_RESULT",0x0A7A4,13623,0),
+("SMSG_LFG_ROLE_CHECK_UPDATE",0x0F2A8,13623,0),
+("SMSG_LFG_JOIN_RESULT",0x0338C,13623,0),
+("SMSG_LFG_QUEUE_STATUS",0x0B388,13623,0),
+("CMSG_SET_LFG_COMMENT",0x0E1C4,13623,0),
+("SMSG_LFG_UPDATE_PLAYER",0x0E284,13623,0),
+("SMSG_LFG_UPDATE_PARTY",0x02CE8,13623,0),
+("SMSG_LFG_UPDATE_LIST",0x03880,13623,0),
+("CMSG_LFG_SET_ROLES",0x0E8CC,13623,0),
+("CMSG_LFG_SET_NEEDS",0x10145,13623,0),
+("CMSG_LFG_SET_BOOT_VOTE",0x0D65D,13623,0),
+("SMSG_LFG_BOOT_PROPOSAL_UPDATE",0x079AC,13623,0),
+("CMSG_LFD_PLAYER_LOCK_INFO_REQUEST",0x0E5E8,13623,0),
+("SMSG_LFG_PLAYER_INFO",0x0E088,13623,0),
+("CMSG_LFG_TELEPORT",0x0FA88,13623,0),
+("CMSG_LFD_PARTY_LOCK_INFO_REQUEST",0x00574,13623,0),
+("SMSG_LFG_PARTY_INFO",0x060A0,13623,0),
+("SMSG_TITLE_EARNED",0x06C8C,13623,0),
+("CMSG_SET_TITLE",0x0EC8C,13623,0),
+("CMSG_CANCEL_MOUNT_AURA",0x064CC,13623,0),
+("SMSG_ARENA_ERROR",0x02FEC,13623,0),
+("MSG_INSPECT_ARENA_TEAMS",0x0FDA4,13623,0),
+("SMSG_DEATH_RELEASE_LOC",0x033C8,13623,0),
+("CMSG_CANCEL_TEMP_ENCHANTMENT",0x0E484,13623,0),
+("SMSG_FORCED_DEATH_UPDATE",0x0FFE8,13623,0),
+("CMSG_CHEAT_SET_HONOR_CURRENCY",0x1014D,13623,0),
+("CMSG_CHEAT_SET_ARENA_CURRENCY",0x1014E,13623,0),
+("SMSG_INIT_CURRENCY",0x0091C,13623,0),
+("SMSG_UPDATE_CURRENCY",0x0405E,13623,0),
+("SMSG_UPDATE_CURRENCY_WEEK_LIMIT",0x04C5C,13623,0),
+("MSG_MOVE_SET_FLIGHT_SPEED_CHEAT",0x1014F,13623,0),
+("MSG_MOVE_SET_FLIGHT_SPEED",0x0B088,13623,0),
+("MSG_MOVE_SET_FLIGHT_BACK_SPEED_CHEAT",0x10150,13623,0),
+("MSG_MOVE_SET_FLIGHT_BACK_SPEED",0x0B484,13623,0),
+("SMSG_FORCE_FLIGHT_SPEED_CHANGE",0x0E5CC,13623,0),
+("CMSG_FORCE_FLIGHT_SPEED_CHANGE_ACK",0x0A98C,13623,0),
+("SMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE",0x10153,13623,0),
+("CMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE_ACK",0x0FBC8,13623,0),
+("SMSG_SPLINE_SET_FLIGHT_SPEED",0x0E0C0,13623,0),
+("SMSG_SPLINE_SET_FLIGHT_BACK_SPEED",0x0F2EC,13623,0),
+("CMSG_MAELSTROM_INVALIDATE_CACHE",0x10155,13623,0),
+("SMSG_FLIGHT_SPLINE_SYNC",0x0BFAC,13623,0),
+("CMSG_SET_TAXI_BENCHMARK_MODE",0x073C4,13623,0),
+("SMSG_REALM_SPLIT",0x025EC,13623,0),
+("CMSG_REALM_SPLIT",0x060AC,13623,0),
+("CMSG_MOVE_CHNG_TRANSPORT",0x10158,13623,0),
+("MSG_PARTY_ASSIGNMENT",0x028AC,13623,0),
+("SMSG_OFFER_PETITION_ERROR",0x07DC0,13623,0),
+("SMSG_TIME_SYNC_REQ",0x0AA80,13623,0),
+("CMSG_TIME_SYNC_RESP",0x0A8AC,13623,0),
+("CMSG_SEND_LOCAL_EVENT",0x1015A,13623,0),
+("CMSG_SEND_GENERAL_TRIGGER",0x1015B,13623,0),
+("CMSG_SEND_COMBAT_TRIGGER",0x1015C,13623,0),
+("CMSG_MAELSTROM_GM_SENT_MAIL",0x1015D,13623,0),
+("SMSG_RESET_FAILED_NOTIFY",0x0BD5C,13623,0),
+("SMSG_REAL_GROUP_UPDATE",0x031C0,13623,0),
+("SMSG_LFG_DISABLED",0x0F880,13623,0),
+("CMSG_ACTIVE_PVP_CHEAT",0x1015E,13623,0),
+("CMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY",0x1015F,13623,0),
+("SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE",0x10160,13623,0),
+("SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE_WRITE_FILE",0x10161,13623,0),
+("SMSG_UPDATE_COMBO_POINTS",0x037A8,13623,0),
+("SMSG_VOICE_SESSION_ROSTER_UPDATE",0x0ACC0,13623,0),
+("SMSG_VOICE_SESSION_LEAVE",0x078A4,13623,0),
+("SMSG_VOICE_SESSION_ADJUST_PRIORITY",0x10165,13623,0),
+("CMSG_VOICE_SET_TALKER_MUTED_REQUEST",0x10166,13623,0),
+("SMSG_VOICE_SET_TALKER_MUTED",0x0E3E4,13623,0),
+("SMSG_INIT_EXTRA_AURA_INFO_OBSOLETE",0x10168,13623,0),
+("SMSG_SET_EXTRA_AURA_INFO_OBSOLETE",0x10169,13623,0),
+("SMSG_SET_EXTRA_AURA_INFO_NEED_UPDATE_OBSOLETE",0x1016A,13623,0),
+("SMSG_CLEAR_EXTRA_AURA_INFO_OBSOLETE",0x1016B,13623,0),
+("MSG_MOVE_START_DESCEND",0x07880,13623,0),
+("CMSG_IGNORE_REQUIREMENTS_CHEAT",0x1016D,13623,0),
+("SMSG_IGNORE_REQUIREMENTS_CHEAT",0x07C84,13623,0),
+("SMSG_SPELL_CHANCE_PROC_LOG",0x1016E,13623,0),
+("CMSG_MOVE_SET_RUN_SPEED",0x1016F,13623,0),
+("SMSG_DISMOUNT",0x03CC4,13623,0),
+("MSG_MOVE_UPDATE_CAN_FLY",0x025E0,13623,0),
+("MSG_RAID_READY_CHECK_CONFIRM",0x0A2AC,13623,0),
+("CMSG_VOICE_SESSION_ENABLE",0x0FEA4,13623,0),
+("SMSG_VOICE_SESSION_ENABLE",0x10170,13623,0),
+("SMSG_VOICE_PARENTAL_CONTROLS",0x071E8,13623,0),
+("CMSG_GM_WHISPER",0x10172,13623,0),
+("SMSG_GM_MESSAGECHAT",0x03AEC,13623,0),
+("MSG_GM_GEARRATING",0x10173,13623,0),
+("CMSG_COMMENTATOR_ENABLE",0x0B1C4,13623,0),
+("SMSG_COMMENTATOR_STATE_CHANGED",0x0E0E4,13623,0),
+("CMSG_COMMENTATOR_GET_MAP_INFO",0x028C4,13623,0),
+("SMSG_COMMENTATOR_MAP_INFO",0x0A4E8,13623,0),
+("CMSG_COMMENTATOR_GET_PLAYER_INFO",0x0BBA0,13623,0),
+("SMSG_COMMENTATOR_GET_PLAYER_INFO",0x10177,13623,0),
+("SMSG_COMMENTATOR_PLAYER_INFO",0x0758C,13623,0),
+("CMSG_COMMENTATOR_ENTER_INSTANCE",0x07BCC,13623,0),
+("CMSG_COMMENTATOR_EXIT_INSTANCE",0x0B8E4,13623,0),
+("CMSG_COMMENTATOR_INSTANCE_COMMAND",0x07D80,13623,0),
+("SMSG_CLEAR_TARGET",0x0A7AC,13623,0),
+("CMSG_BOT_DETECTED",0x0E757,13623,0),
+("SMSG_CROSSED_INEBRIATION_THRESHOLD",0x0A580,13623,0),
+("CMSG_CHEAT_PLAYER_LOGIN",0x1017D,13623,0),
+("CMSG_CHEAT_PLAYER_LOOKUP",0x1017E,13623,0),
+("SMSG_CHEAT_PLAYER_LOOKUP",0x1017F,13623,0),
+("SMSG_KICK_REASON",0x0EAC8,13623,0),
+("MSG_RAID_READY_CHECK_FINISHED",0x0A0A0,13623,0),
+("CMSG_COMPLAIN",0x068C8,13623,0),
+("SMSG_COMPLAIN_RESULT",0x070CC,13623,0),
+("SMSG_FEATURE_SYSTEM_STATUS",0x03DAC,13623,0),
+("CMSG_GM_SHOW_COMPLAINTS",0x10181,13623,0),
+("CMSG_GM_UNSQUELCH",0x10182,13623,0),
+("CMSG_CHANNEL_SILENCE_VOICE",0x00801,13623,0),
+("CMSG_CHANNEL_SILENCE_ALL",0x00021,13623,0),
+("CMSG_CHANNEL_UNSILENCE_VOICE",0x0002B,13623,0),
+("CMSG_CHANNEL_UNSILENCE_ALL",0x00840,13623,0),
+("CMSG_TARGET_CAST",0x10183,13623,0),
+("CMSG_TARGET_SCRIPT_CAST",0x10184,13623,0),
+("CMSG_CHANNEL_DISPLAY_LIST",0x10185,13623,0),
+("CMSG_SET_ACTIVE_VOICE_CHANNEL",0x032A4,13623,0),
+("CMSG_GET_CHANNEL_MEMBER_COUNT",0x00009,13623,0),
+("SMSG_CHANNEL_MEMBER_COUNT",0x02CEC,13623,0),
+("CMSG_CHANNEL_VOICE_ON",0x05A98,13623,0),
+("CMSG_CHANNEL_VOICE_OFF",0x07A88,13623,0),
+("CMSG_DEBUG_LIST_TARGETS",0x10187,13623,0),
+("SMSG_DEBUG_LIST_TARGETS",0x10188,13623,0),
+("SMSG_AVAILABLE_VOICE_CHANNEL",0x0F8C8,13623,0),
+("CMSG_ADD_VOICE_IGNORE",0x0EF75,13623,0),
+("CMSG_DEL_VOICE_IGNORE",0x0BD7E,13623,0),
+("CMSG_PARTY_SILENCE",0x0F755,13623,0),
+("CMSG_PARTY_UNSILENCE",0x02F7D,13623,0),
+("MSG_NOTIFY_PARTY_SQUELCH",0x0E8E8,13623,0),
+("SMSG_COMSAT_RECONNECT_TRY",0x07E7E,13623,0),
+("SMSG_COMSAT_DISCONNECT",0x02E57,13623,0),
+("SMSG_COMSAT_CONNECT_FAIL",0x0647E,13623,0),
+("SMSG_VOICE_CHAT_STATUS",0x06B88,13623,0),
+("CMSG_REPORT_PVP_AFK",0x0E3AC,13623,0),
+("SMSG_REPORT_PVP_AFK_RESULT",0x078E8,13623,0),
+("CMSG_GUILD_BANKER_ACTIVATE",0x0FFC4,13623,0),
+("CMSG_GUILD_BANK_QUERY_TAB",0x0A788,13623,0),
+("SMSG_GUILD_BANK_LIST",0x0A6A8,13623,0),
+("CMSG_GUILD_BANK_SWAP_ITEMS",0x0A8C4,13623,0),
+("CMSG_GUILD_BANK_BUY_TAB",0x078AC,13623,0),
+("CMSG_GUILD_BANK_UPDATE_TAB",0x0E3CC,13623,0),
+("CMSG_GUILD_BANK_DEPOSIT_MONEY",0x06FE8,13623,0),
+("CMSG_GUILD_BANK_WITHDRAW_MONEY",0x073A8,13623,0),
+("CMSG_GUILD_BANK_NOTE",0x07680,13623,0),
+("MSG_GUILD_BANK_LOG_QUERY",0x0F584,13623,0),
+("CMSG_SET_CHANNEL_WATCH",0x07FE0,13623,0),
+("SMSG_USERLIST_ADD",0x0F8CC,13623,0),
+("SMSG_USERLIST_REMOVE",0x0EF80,13623,0),
+("SMSG_USERLIST_UPDATE",0x02C8C,13623,0),
+("CMSG_CLEAR_CHANNEL_WATCH",0x0A1E0,13623,0),
+("SMSG_INSPECT_TALENT",0x0F8C0,13623,0),
+("SMSG_GOGOGO_OBSOLETE",0x10195,13623,0),
+("SMSG_ECHO_PARTY_SQUELCH",0x02AC4,13623,0),
+("CMSG_SET_TITLE_SUFFIX",0x10196,13623,0),
+("CMSG_SPELLCLICK",0x0F9A4,13623,0),
+("SMSG_LOOT_LIST",0x0F684,13623,0),
+("CMSG_GM_CHARACTER_RESTORE",0x10198,13623,0),
+("CMSG_GM_CHARACTER_SAVE",0x10199,13623,0),
+("SMSG_VOICESESSION_FULL",0x0A456,13623,0),
+("MSG_GUILD_PERMISSIONS",0x0F4C4,13623,0),
+("MSG_GUILD_BANK_MONEY_WITHDRAWN",0x06CE4,13623,0),
+("MSG_GUILD_EVENT_LOG_QUERY",0x069EC,13623,0),
+("CMSG_MAELSTROM_RENAME_GUILD",0x1019A,13623,0),
+("CMSG_GET_MIRRORIMAGE_DATA",0x0A08C,13623,0),
+("SMSG_MIRRORIMAGE_DATA",0x0E2A4,13623,0),
+("SMSG_FORCE_DISPLAY_UPDATE",0x06788,13623,0),
+("SMSG_SPELL_CHANCE_RESIST_PUSHBACK",0x1019C,13623,0),
+("CMSG_IGNORE_DIMINISHING_RETURNS_CHEAT",0x1019D,13623,0),
+("SMSG_IGNORE_DIMINISHING_RETURNS_CHEAT",0x0747E,13623,0),
+("CMSG_KEEP_ALIVE",0x02CE0,13623,0),
+("SMSG_RAID_READY_CHECK_ERROR",0x0547E,13623,0),
+("CMSG_OPT_OUT_OF_LOOT",0x075A4,13623,0),
+("MSG_QUERY_GUILD_BANK_TEXT",0x0A2C4,13623,0),
+("CMSG_SET_GUILD_BANK_TEXT",0x07680,13623,0),
+("CMSG_SET_GRANTABLE_LEVELS",0x101A1,13623,0),
+("CMSG_GRANT_LEVEL",0x0B980,13623,0),
+("CMSG_REFER_A_FRIEND",0x101A2,13623,0),
+("MSG_GM_CHANGE_ARENA_RATING",0x101A3,13623,0),
+("CMSG_DECLINE_CHANNEL_INVITE",0x0DF7F,13623,0),
+("SMSG_GROUPACTION_THROTTLED",0x101A5,13623,0),
+("SMSG_OVERRIDE_LIGHT",0x00756,13623,0),
+("SMSG_TOTEM_CREATED",0x02EAC,13623,0),
+("CMSG_TOTEM_DESTROYED",0x034A0,13623,0),
+("CMSG_EXPIRE_RAID_INSTANCE",0x101A7,13623,0),
+("CMSG_NO_SPELL_VARIANCE",0x101A8,13623,0),
+("CMSG_QUESTGIVER_STATUS_MULTIPLE_QUERY",0x02DAC,13623,0),
+("SMSG_QUESTGIVER_STATUS_MULTIPLE",0x0F5C0,13623,0),
+("CMSG_SET_PLAYER_DECLINED_NAMES",0x0ADC0,13623,0),
+("SMSG_SET_PLAYER_DECLINED_NAMES_RESULT",0x0BAAC,13623,0),
+("CMSG_QUERY_SERVER_BUCK_DATA",0x101AC,13623,0),
+("CMSG_CLEAR_SERVER_BUCK_DATA",0x101AD,13623,0),
+("SMSG_SERVER_BUCK_DATA",0x101AE,13623,0),
+("SMSG_SEND_UNLEARN_SPELLS",0x0BDE8,13623,0),
+("SMSG_PROPOSE_LEVEL_GRANT",0x0B476,13623,0),
+("CMSG_ACCEPT_LEVEL_GRANT",0x0B5CC,13623,0),
+("SMSG_REFER_A_FRIEND_FAILURE",0x07F7C,13623,0),
+("SMSG_SPLINE_MOVE_SET_FLYING",0x05D54,13623,0),
+("SMSG_SPLINE_MOVE_UNSET_FLYING",0x07688,13623,0),
+("SMSG_SUMMON_CANCEL",0x070A8,13623,0),
+("CMSG_CHANGE_PERSONAL_ARENA_RATING",0x101B2,13623,0),
+("CMSG_ALTER_APPEARANCE",0x034A4,13623,0),
+("SMSG_ENABLE_BARBER_SHOP",0x037E8,13623,0),
+("SMSG_BARBER_SHOP_RESULT",0x03188,13623,0),
+("CMSG_CALENDAR_GET_CALENDAR",0x101B4,13623,0),
+("CMSG_CALENDAR_GET_EVENT",0x03580,13623,0),
+("CMSG_CALENDAR_GUILD_FILTER",0x0ADAC,13623,0),
+("CMSG_CALENDAR_ARENA_TEAM",0x0E9AC,13623,0),
+("CMSG_CALENDAR_ADD_EVENT",0x0F488,13623,0),
+("CMSG_CALENDAR_UPDATE_EVENT",0x0F084,13623,0),
+("CMSG_CALENDAR_REMOVE_EVENT",0x06C88,13623,0),
+("CMSG_CALENDAR_COPY_EVENT",0x0BF84,13623,0),
+("CMSG_CALENDAR_EVENT_INVITE",0x0F6C4,13623,0),
+("CMSG_CALENDAR_EVENT_RSVP",0x0757F,13623,0),
+("CMSG_CALENDAR_EVENT_REMOVE_INVITE",0x0EBCC,13623,0),
+("CMSG_CALENDAR_EVENT_STATUS",0x0BC84,13623,0),
+("CMSG_CALENDAR_EVENT_MODERATOR_STATUS",0x0BDE4,13623,0),
+("SMSG_CALENDAR_SEND_CALENDAR",0x0B0A4,13623,0),
+("SMSG_CALENDAR_SEND_EVENT",0x0FAA4,13623,0),
+("SMSG_CALENDAR_FILTER_GUILD",0x02FC4,13623,0),
+("SMSG_CALENDAR_ARENA_TEAM",0x021E0,13623,0),
+("SMSG_CALENDAR_EVENT_INVITE",0x0A5A0,13623,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED",0x0A9E0,13623,0),
+("SMSG_CALENDAR_EVENT_STATUS",0x07EC0,13623,0),
+("SMSG_CALENDAR_COMMAND_RESULT",0x0AD80,13623,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_ADDED",0x02AE0,13623,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_REMOVED",0x0FCE0,13623,0),
+("SMSG_CALENDAR_EVENT_INVITE_ALERT",0x0AFA8,13623,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT",0x0FEE0,13623,0),
+("SMSG_CALENDAR_EVENT_INVITE_STATUS_ALERT",0x0F7C8,13623,0),
+("SMSG_CALENDAR_EVENT_REMOVED_ALERT",0x06288,13623,0),
+("SMSG_CALENDAR_EVENT_UPDATED_ALERT",0x029C0,13623,0),
+("SMSG_CALENDAR_EVENT_MODERATOR_STATUS_ALERT",0x0ABC8,13623,0),
+("CMSG_CALENDAR_COMPLAIN",0x01E75,13623,0),
+("CMSG_CALENDAR_GET_NUM_PENDING",0x0EFAC,13623,0),
+("SMSG_CALENDAR_SEND_NUM_PENDING",0x0A8E0,13623,0),
+("CMSG_SAVE_DANCE",0x101C3,13623,0),
+("SMSG_NOTIFY_DANCE",0x03488,13623,0),
+("CMSG_PLAY_DANCE",0x02288,13623,0),
+("SMSG_PLAY_DANCE",0x0B4EC,13623,0),
+("CMSG_LOAD_DANCES",0x101C4,13623,0),
+("CMSG_STOP_DANCE",0x03080,13623,0),
+("SMSG_STOP_DANCE",0x0E0A8,13623,0),
+("CMSG_SYNC_DANCE",0x101C6,13623,0),
+("CMSG_DANCE_QUERY",0x022A0,13623,0),
+("SMSG_DANCE_QUERY_RESPONSE",0x031A8,13623,0),
+("SMSG_INVALIDATE_DANCE",0x0BEE8,13623,0),
+("CMSG_DELETE_DANCE",0x101C8,13623,0),
+("SMSG_LEARNED_DANCE_MOVES",0x06F80,13623,0),
+("CMSG_LEARN_DANCE_MOVE",0x101C9,13623,0),
+("CMSG_UNLEARN_DANCE_MOVE",0x101CA,13623,0),
+("CMSG_SET_RUNE_COUNT",0x101CB,13623,0),
+("CMSG_SET_RUNE_COOLDOWN",0x101CC,13623,0),
+("MSG_MOVE_SET_PITCH_RATE_CHEAT",0x101CD,13623,0),
+("MSG_MOVE_SET_PITCH_RATE",0x0ABA4,13623,0),
+("SMSG_FORCE_PITCH_RATE_CHANGE",0x101CE,13623,0),
+("CMSG_FORCE_PITCH_RATE_CHANGE_ACK",0x0E6C0,13623,0),
+("SMSG_SPLINE_SET_PITCH_RATE",0x070c4,13623,0),
+("SMSG_MOVE_ABANDON_TRANSPORT",0x101D0,13623,0),
+("SMSG_CALENDAR_UPDATE_INVITE_LIST",0x071A0,13623,0),
+("SMSG_CALENDAR_UPDATE_INVITE_LIST2",0x0EDC4,13623,0),
+("CMSG_UPDATE_MISSILE_TRAJECTORY",0x00E54,13623,0),
+("SMSG_UPDATE_ACCOUNT_DATA_COMPLETE",0x0B1CC,13623,0),
+("SMSG_TRIGGER_MOVIE",0x020C8,13623,0),
+("CMSG_COMPLETE_MOVIE",0x0E188,13623,0),
+("CMSG_SET_GLYPH_SLOT",0x101D4,13623,0),
+("CMSG_SET_GLYPH",0x101D5,13623,0),
+("SMSG_ACHIEVEMENT_EARNED",0x0F5E4,13623,0),
+("SMSG_DYNAMIC_DROP_ROLL_RESULT",0x101D7,13623,0),
+("SMSG_CRITERIA_UPDATE",0x0AFC8,13623,0),
+("CMSG_QUERY_INSPECT_ACHIEVEMENTS",0x069A0,13623,0),
+("SMSG_RESPOND_INSPECT_ACHIEVEMENTS",0x101DA,13623,0),
+("CMSG_DISMISS_CONTROLLED_VEHICLE",0x0E3C0,13623,0),
+("CMSG_COMPLETE_ACHIEVEMENT_CHEAT",0x101DC,13623,0),
+("SMSG_QUESTUPDATE_ADD_PVP_KILL",0x078E0,13623,0),
+("CMSG_SET_CRITERIA_CHEAT",0x101DD,13623,0),
+("SMSG_CALENDAR_UPDATE_INVITE_LIST3",0x0A2A0,13623,0),
+("CMSG_UNITANIMTIER_CHEAT",0x101DE,13623,0),
+("CMSG_CHAR_CUSTOMIZE",0x06484,13623,0),
+("SMSG_CHAR_CUSTOMIZE",0x02da4,13623,0),
+("SMSG_PET_RENAMEABLE",0x0B6C8,13623,0),
+("CMSG_REQUEST_VEHICLE_EXIT",0x0B3CC,13623,0),
+("CMSG_REQUEST_PLAYER_VEHICLE_EXIT",0x0208C,13623,0),
+("CMSG_REQUEST_VEHICLE_PREV_SEAT",0x02DE4,13623,0),
+("CMSG_REQUEST_VEHICLE_NEXT_SEAT",0x064E4,13623,0),
+("CMSG_REQUEST_VEHICLE_SWITCH_SEAT",0x0A8CC,13623,0),
+("CMSG_PET_LEARN_TALENT",0x0A7A0,13623,0),
+("CMSG_PET_UNLEARN_TALENTS",0x08F5D,13623,0),
+("SMSG_SET_PHASE_SHIFT",0x0044C,13623,0),
+("SMSG_ALL_ACHIEVEMENT_DATA",0x0400E,13623,0),
+("CMSG_FORCE_SAY_CHEAT",0x101E7,13623,0),
+("SMSG_HEALTH_UPDATE",0x02AA8,13623,0),
+("SMSG_POWER_UPDATE",0x065E8,13623,0),
+("CMSG_GAMEOBJ_REPORT_USE",0x023A0,13623,0),
+("SMSG_HIGHEST_THREAT_UPDATE",0x03F7E,13623,0),
+("SMSG_THREAT_UPDATE",0x0B480,13623,0),
+("SMSG_THREAT_REMOVE",0x029E0,13623,0),
+("SMSG_THREAT_CLEAR",0x0FFC8,13623,0),
+("SMSG_CONVERT_RUNE",0x0B4AC,13623,0),
+("SMSG_RESYNC_RUNES",0x101E9,13623,0),
+("SMSG_ADD_RUNE_POWER",0x101EA,13623,0),
+("CMSG_START_QUEST",0x00613,13623,0),
+("CMSG_REMOVE_GLYPH",0x101EC,13623,0),
+("CMSG_DUMP_OBJECTS",0x101ED,13623,0),
+("SMSG_DUMP_OBJECTS_DATA",0x101EE,13623,0),
+("CMSG_DISMISS_CRITTER",0x0B7CC,13623,0),
+("SMSG_NOTIFY_DEST_LOC_SPELL_CAST",0x03588,13623,0),
+("CMSG_AUCTION_LIST_PENDING_SALES",0x0EDEC,13623,0),
+("SMSG_AUCTION_LIST_PENDING_SALES",0x0BAC4,13623,0),
+("SMSG_MODIFY_COOLDOWN",0x030CC,13623,0),
+("SMSG_PET_UPDATE_COMBO_POINTS",0x07588,13623,0),
+("CMSG_ENABLETAXI",0x0328C,13623,0),
+("SMSG_PRE_RESURRECT",0x066C4,13623,0),
+("SMSG_AURA_UPDATE_ALL",0x037E0,13623,0),
+("SMSG_AURA_UPDATE",0x065C0,13623,0),
+("CMSG_FLOOD_GRACE_CHEAT",0x101F2,13623,0),
+("SMSG_SERVER_FIRST_ACHIEVEMENT",0x068CC,13623,0),
+("SMSG_PET_LEARNED_SPELL",0x0B3C4,13623,0),
+("SMSG_PET_REMOVED_SPELL",0x0F28C,13623,0),
+("CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE",0x0E988,13623,0),
+("CMSG_HEARTH_AND_RESURRECT",0x10009,13623,0),
+("SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA",0x03380,13623,0),
+("SMSG_CRITERIA_DELETED",0x0AF84,13623,0),
+("SMSG_ACHIEVEMENT_DELETED",0x0E6A0,13623,0),
+("CMSG_SERVER_INFO_QUERY",0x101F6,13623,0),
+("SMSG_SERVER_INFO_RESPONSE",0x101F7,13623,0),
+("CMSG_CHECK_LOGIN_CRITERIA",0x101F8,13623,0),
+("SMSG_SERVER_BUCK_DATA_START",0x101F9,13623,0),
+("CMSG_QUERY_VEHICLE_STATUS",0x101F0,13623,0),
+("SMSG_BATTLEGROUND_INFO_THROTTLED",0x075C4,13623,0),
+("SMSG_PLAYER_VEHICLE_DATA",0x0A5A4,13623,0),
+("CMSG_PLAYER_VEHICLE_ENTER",0x0AEC8,13623,0),
+("CMSG_EJECT_PASSENGER",0x0F688,13623,0),
+("SMSG_PET_GUIDS",0x0E4E8,13623,0),
+("SMSG_CLIENTCACHE_VERSION",0x02EC4,13623,0),
+("SMSG_ITEM_REFUND_INFO_RESPONSE",0x0095E,13623,0),
+("CMSG_ITEM_REFUND_INFO",0x031E0,13623,0),
+("CMSG_ITEM_REFUND",0x062E8,13623,0),
+("SMSG_ITEM_REFUND_RESULT",0x0441E,13623,0),
+("CMSG_CORPSE_MAP_POSITION_QUERY",0x023CC,13623,0),
+("SMSG_CORPSE_MAP_POSITION_QUERY_RESPONSE",0x1020A,13623,0),
+("CMSG_LFG_SET_ROLES_2",0x1020B,13623,0),
+("CMSG_CALENDAR_CONTEXT_EVENT_SIGNUP",0x0AEAC,13623,0),
+("SMSG_CALENDAR_ACTION_PENDING",0x07E8C,13623,0),
+("SMSG_EQUIPMENT_SET_LIST",0x0F1A8,13623,0),
+("CMSG_EQUIPMENT_SET_SAVE",0x0BFC0,13623,0),
+("CMSG_UPDATE_PROJECTILE_POSITION",0x0EF7F,13623,0),
+("SMSG_SET_PROJECTILE_POSITION",0x02C84,13623,0),
+("SMSG_TALENTS_INFO",0x075C4,13623,0),
+("CMSG_LEARN_PREVIEW_TALENTS",0x0FFAC,13623,0),
+("CMSG_LEARN_PREVIEW_TALENTS_PET",0x0BCE8,13623,0),
+("SMSG_ARENA_OPPONENT_UPDATE",0x028CC,13623,0),
+("SMSG_ARENA_TEAM_CHANGE_FAILED_QUEUED",0x0B2A0,13623,0),
+("SMSG_MULTIPLE_PACKETS",0x0FEC0,13623,0),
+("SMSG_FORCE_UNK1_SPEED_CHANGE",0x10219,13623,0),
+("CMSG_FORCE_UNK1_SPEED_CHANGE_ACK",0x0F0C0,13623,0),
+("SMSG_FORCE_UNK2_SPEED_CHANGE",0x1021B,13623,0),
+("CMSG_FORCE_UNK2_SPEED_CHANGE_ACK",0x07DE8,13623,0),
+("SMSG_MOVE_LEVITATING",0x0B8AC,13623,0),
+("SMSG_SPLINE_MOVE_UNKNOWN_1235",0x1021E,13623,0),
+("SMSG_SPLINE_MOVE_UNKNOWN_1236",0x1022F,13623,0),
+("CMSG_EQUIPMENT_SET_USE",0x0E8A0,13623,0),
+("SMSG_EQUIPMENT_SET_USE_RESULT",0x076AC,13623,0),
+("SMSG_UNKNOWN_1240",0x0B8E0,13623,0),
+("CMSG_CHAR_FACTION_CHANGE",0x0BBCC,13623,0),
+("SMSG_CHAR_FACTION_CHANGE",0x023AC,13623,0),
+("SMSG_BATTLEFIELD_MGR_ENTRY_INVITE",0x10226,13623,0),
+("CMSG_BATTLEFIELD_MGR_ENTRY_INVITE_RESPONSE",0x00005,13623,0),
+("SMSG_BATTLEFIELD_MGR_ENTERED",0x00004,13623,0),
+("SMSG_BATTLEFIELD_MGR_QUEUE_INVITE",0x10069,13623,0),
+("CMSG_BATTLEFIELD_MGR_QUEUE_INVITE_RESPONSE",0x08108,13623,0),
+("CMSG_BATTLEFIELD_MGR_QUEUE_REQUEST",0x0011D,13623,0),
+("SMSG_BATTLEFIELD_MGR_QUEUE_REQUEST_RESPONSE",0x0011C,13623,0),
+("SMSG_BATTLEFIELD_MGR_EJECT_PENDING",0x0011B,13623,0),
+("SMSG_BATTLEFIELD_MGR_EJECTED",0x0011A,13623,0),
+("CMSG_BATTLEFIELD_MGR_EXIT_REQUEST",0x08580,13623,0),
+("SMSG_BATTLEFIELD_MGR_STATE_CHANGE",0x0352D,13623,0),
+("MSG_SET_RAID_DIFFICULTY",0x0B5E8,13623,0),
+("SMSG_TOGGLE_XP_GAIN",0x07980,13623,0),
+("SMSG_GMRESPONSE_DB_ERROR",0x0E0A0,13623,0),
+("SMSG_GMRESPONSE_RECEIVED",0x033AC,13623,0),
+("CMSG_GMRESPONSE_RESOLVE",0x062C8,13623,0),
+("SMSG_GMRESPONSE_STATUS_UPDATE",0x00101,13623,0),
+("CMSG_WORLD_STATE_UI_TIMER_UPDATE",0x03FA8,13623,0),
+("SMSG_WORLD_STATE_UI_TIMER_UPDATE",0x05557,13623,0),
+("CMSG_CHAR_RACE_CHANGE",0x06EA4,13623,0),
+("SMSG_TALENTS_INVOLUNTARILY_RESET",0x02A84,13623,0),
+("SMSG_UNKNOWN_1276",0x00093,13623,0),
+("SMSG_LOOT_SLOT_CHANGED",0x031EC,13623,0),
+("CMSG_READY_FOR_ACCOUNT_DATA_TIMES",0x07DA8,13623,0),
+("CMSG_QUERY_QUESTS_COMPLETED",0x0FE84,13623,0),
+("SMSG_QUERY_QUESTS_COMPLETED_RESPONSE",0x0F1E8,13623,0),
+("CMSG_GM_REPORT_LAG",0x03FA0,13623,0),
+("SMSG_CORPSE_NOT_IN_INSTANCE",0x031E4,13623,0),
+("CMSG_SET_ALLOW_LOW_LEVEL_RAID1",0x035EC,13623,0),
+("CMSG_SET_ALLOW_LOW_LEVEL_RAID2",0x029C4,13623,0),
+("SMSG_CAMERA_SHAKE",0x1009E,13623,0),
+("SMSG_UPDATE_ITEM_ENCHANTMENTS",0x020E8,13623,0),
+("SMSG_REDIRECT_CLIENT",0x0201B,13623,0),
+("CMSG_REDIRECTION_FAILED",0x10007,13623,0),
+("SMSG_UNKNOWN_1295",0x10008,13623,0),
+("CMSG_UNKNOWN_1296",0x10009,13623,0),
+("SMSG_FORCE_SEND_QUEUED_PACKETS",0x06EC8,13623,0),
+("CMSG_REDIRECTION_AUTH_PROOF",0x00E4C,13623,0),
+("SMSG_COMBAT_LOG_MULTIPLE",0x033A8,13623,0),
+("SMSG_LFG_OPEN_FROM_GOSSIP",0x071EC,13623,0),
+("SMSG_UNKNOWN_1302",0x10010,13623,0),
+("CMSG_UNKNOWN_1303",0x06BE0,13623,0),
+("SMSG_UNKNOWN_1304",0x072E0,13623,0),
+("CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND",0x06DC8,13623,0),
+("SMSG_UNKNOWN_1308",0x10011,13623,0),
+("CMSG_TRANSFORM",0x04577,13623,0),
+("SMSG_UNKNOWN_1310",0x02E88,13623,0),
+("SMSG_UNKNOWN_1311",0x01E76,13623,0),
+("SMSG_UNKNOWN_1312",0x04D56,13623,0),
+("SMSG_UNKNOWN_1314",0x10256,13623,0),
+("SMSG_UNKNOWN_1315",0x10257,13623,0),
+("SMSG_UNKNOWN_1316",0x10258,13623,0),
+("SMSG_UNKNOWN_1317",0x10259,13623,0),
+("CMSG_UNKNOWN_1320",0x1025C,13623,0),
+("SMSG_UNKNOWN_1329",0x02D57,13623,0),
+("SMSG_SEND_QUEUED_PACKETS",0x10012,13623,0),
+("CMSG_REDIRECT_AUTH_PROOF",0x00100,13623,0),
+("CMSG_AUTO_DECLINE_GUILD_INVITES",0x08589,13623,0),
+("CMSG_SET_PRIMARY_TALENT_TREE",0x0FEA8,13623,0),
+("CMSG_GROUP_SET_ROLES",0x08509,13623,0),
+("CMSG_WORLD_LOGIN",0x08508,13623,0),
+("CMSG_RETURN_TO_GRAVEYARD",0x00593,13623,0),
+("NUM_MSG_TYPES",0x0,13623,1);
diff --git a/sql_mr/Opcodes/opcodes_mangos_14333.sql b/sql_mr/Opcodes/opcodes_mangos_14333.sql
new file mode 100644
index 00000000000..7b968ff986a
--- /dev/null
+++ b/sql_mr/Opcodes/opcodes_mangos_14333.sql
@@ -0,0 +1,1278 @@
+-- Opcode table for client build 14333
+
+CREATE TABLE IF NOT EXISTS `opcodes` (
+    `version` smallint(5) NOT NULL COMMENT "Client build",
+    `name` varchar(64) NOT NULL COMMENT "opcode name",
+    `value` int(10) NOT NULL COMMENT "opcode value",
+    `flags` int(10) unsigned NOT NULL DEFAULT "0" COMMENT "current opcode flags",
+    UNIQUE KEY `version` (`version`,`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT="Universal opcode storage";
+
+DELETE FROM `opcodes` WHERE `version` = 14333;
+
+INSERT INTO `opcodes` (`version`, `name`, `value`, `flags`) VALUES
+(14333, 'CMSG_ACCEPT_LEVEL_GRANT', 58018, 0),
+(14333, 'CMSG_ACCEPT_TRADE', 2240, 0),
+(14333, 'CMSG_ACTIVATETAXI', 41647, 0),
+(14333, 'CMSG_ACTIVATETAXIEXPRESS', 59110, 0),
+(14333, 'CMSG_ACTIVE_PVP_CHEAT', 0, 0),
+(14333, 'CMSG_ADD_FRIEND', 10915, 0),
+(14333, 'CMSG_ADD_IGNORE', 28262, 0),
+(14333, 'CMSG_ADD_PVP_MEDAL_CHEAT', 0, 0),
+(14333, 'CMSG_ADD_VOICE_IGNORE', 10926, 0),
+(14333, 'CMSG_ALTER_APPEARANCE', 32419, 0),
+(14333, 'CMSG_AREATRIGGER', 25254, 0),
+(14333, 'CMSG_AREA_SPIRIT_HEALER_QUERY', 13035, 0),
+(14333, 'CMSG_AREA_SPIRIT_HEALER_QUEUE', 15078, 0),
+(14333, 'CMSG_ARENA_TEAM_ACCEPT', 11959, 0),
+(14333, 'CMSG_ARENA_TEAM_CREATE', 0, 0),
+(14333, 'CMSG_ARENA_TEAM_DECLINE', 44775, 0),
+(14333, 'CMSG_ARENA_TEAM_DISBAND', 58083, 0),
+(14333, 'CMSG_ARENA_TEAM_INVITE', 43579, 0),
+(14333, 'CMSG_ARENA_TEAM_LEADER', 28267, 0),
+(14333, 'CMSG_ARENA_TEAM_LEAVE', 14950, 0),
+(14333, 'CMSG_ARENA_TEAM_QUERY', 63022, 0),
+(14333, 'CMSG_ARENA_TEAM_REMOVE', 48879, 0),
+(14333, 'CMSG_ARENA_TEAM_ROSTER', 31334, 0),
+(14333, 'CMSG_ATTACKSTOP', 28331, 0),
+(14333, 'CMSG_ATTACKSWING', 26171, 0),
+(14333, 'CMSG_AUCTION_LIST_BIDDER_ITEMS', 47862, 0),
+(14333, 'CMSG_AUCTION_LIST_ITEMS', 28279, 0),
+(14333, 'CMSG_AUCTION_LIST_OWNER_ITEMS', 10923, 0),
+(14333, 'CMSG_AUCTION_LIST_PENDING_SALES', 0, 0),
+(14333, 'CMSG_AUCTION_PLACE_BID', 8827, 0),
+(14333, 'CMSG_AUCTION_REMOVE_ITEM', 46634, 0),
+(14333, 'CMSG_AUCTION_SELL_ITEM', 27243, 0),
+(14333, 'CMSG_AUTH_SESSION', 10656, 0),
+(14333, 'CMSG_AUTOBANK_ITEM', 0, 0),
+(14333, 'CMSG_AUTOEQUIP_GROUND_ITEM', 0, 0),
+(14333, 'CMSG_AUTOEQUIP_ITEM', 45814, 0),
+(14333, 'CMSG_AUTOEQUIP_ITEM_SLOT', 48754, 0),
+(14333, 'CMSG_AUTOSTORE_BAG_ITEM', 32362, 0),
+(14333, 'CMSG_AUTOSTORE_BANK_ITEM', 0, 0),
+(14333, 'CMSG_AUTOSTORE_GROUND_ITEM', 0, 0),
+(14333, 'CMSG_AUTOSTORE_LOOT_ITEM', 65151, 0),
+(14333, 'CMSG_AUTO_DECLINE_GUILD_INVITES', 0, 0),
+(14333, 'CMSG_BANKER_ACTIVATE', 0, 0),
+(14333, 'CMSG_BATTLEFIELD_JOIN', 43104, 0),
+(14333, 'CMSG_BATTLEFIELD_LIST', 0, 0),
+(14333, 'CMSG_BATTLEFIELD_MGR_ENTRY_INVITE_RESPONSE', 0, 0),
+(14333, 'CMSG_BATTLEFIELD_MGR_EXIT_REQUEST', 0, 0),
+(14333, 'CMSG_BATTLEFIELD_MGR_QUEUE_INVITE_RESPONSE', 0, 0),
+(14333, 'CMSG_BATTLEFIELD_MGR_QUEUE_REQUEST', 0, 0),
+(14333, 'CMSG_BATTLEFIELD_PORT', 0, 0),
+(14333, 'CMSG_BATTLEFIELD_REQUEST_SCORE_DATA', 34923, 0),
+(14333, 'CMSG_BATTLEFIELD_STATUS', 13856, 0),
+(14333, 'CMSG_BATTLEGROUND_PLAYER_POSITIONS', 39147, 0),
+(14333, 'CMSG_BATTLEMASTER_HELLO', 0, 0),
+(14333, 'CMSG_BATTLEMASTER_JOIN', 0, 0),
+(14333, 'CMSG_BATTLEMASTER_JOIN_ARENA', 2154, 0),
+(14333, 'CMSG_BATTLEMASTER_JOIN_RATED', 0, 0),
+(14333, 'CMSG_BEGIN_TRADE', 0, 0),
+(14333, 'CMSG_BINDER_ACTIVATE', 60015, 0),
+(14333, 'CMSG_BOT_DETECTED', 0, 0),
+(14333, 'CMSG_BOT_DETECTED2', 0, 0),
+(14333, 'CMSG_BUG', 25186, 0),
+(14333, 'CMSG_BUSY_TRADE', 0, 0),
+(14333, 'CMSG_BUYBACK_ITEM', 43695, 0),
+(14333, 'CMSG_BUY_BANK_SLOT', 41654, 0),
+(14333, 'CMSG_BUY_ITEM', 25194, 0),
+(14333, 'CMSG_BUY_LOTTERY_TICKET_OBSOLETE', 0, 0),
+(14333, 'CMSG_CALENDAR_ADD_EVENT', 60066, 0),
+(14333, 'CMSG_CALENDAR_ARENA_TEAM', 47743, 0),
+(14333, 'CMSG_CALENDAR_COMPLAIN', 0, 0),
+(14333, 'CMSG_CALENDAR_CONTEXT_EVENT_SIGNUP', 30251, 0),
+(14333, 'CMSG_CALENDAR_COPY_EVENT', 44726, 0),
+(14333, 'CMSG_CALENDAR_EVENT_INVITE', 61106, 0),
+(14333, 'CMSG_CALENDAR_EVENT_MODERATOR_STATUS', 28215, 0),
+(14333, 'CMSG_CALENDAR_EVENT_REMOVE_INVITE', 43642, 0),
+(14333, 'CMSG_CALENDAR_EVENT_RSVP', 28327, 0),
+(14333, 'CMSG_CALENDAR_EVENT_STATUS', 41583, 0),
+(14333, 'CMSG_CALENDAR_GET_CALENDAR', 9842, 0),
+(14333, 'CMSG_CALENDAR_GET_EVENT', 65134, 0),
+(14333, 'CMSG_CALENDAR_GET_NUM_PENDING', 10991, 0),
+(14333, 'CMSG_CALENDAR_GUILD_FILTER', 15986, 0),
+(14333, 'CMSG_CALENDAR_REMOVE_EVENT', 59111, 0),
+(14333, 'CMSG_CALENDAR_UPDATE_EVENT', 29242, 0),
+(14333, 'CMSG_CANCEL_AURA', 48874, 0),
+(14333, 'CMSG_CANCEL_AUTO_REPEAT_SPELL', 13922, 0),
+(14333, 'CMSG_CANCEL_CAST', 13043, 0),
+(14333, 'CMSG_CANCEL_CHANNELLING', 43619, 0),
+(14333, 'CMSG_CANCEL_GROWTH_AURA', 15998, 0),
+(14333, 'CMSG_CANCEL_MOUNT_AURA', 65210, 0),
+(14333, 'CMSG_CANCEL_TEMP_ENCHANTMENT', 41518, 0),
+(14333, 'CMSG_CANCEL_TRADE', 10474, 0),
+(14333, 'CMSG_CAST_SPELL', 29435, 0),
+(14333, 'CMSG_CHANGE_PERSONAL_ARENA_RATING', 0, 0),
+(14333, 'CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE', 0, 0),
+(14333, 'CMSG_CHANNEL_ANNOUNCEMENTS', 0, 0),
+(14333, 'CMSG_CHANNEL_BAN', 0, 0),
+(14333, 'CMSG_CHANNEL_DISPLAY_LIST', 0, 0),
+(14333, 'CMSG_CHANNEL_INVITE', 0, 0),
+(14333, 'CMSG_CHANNEL_KICK', 0, 0),
+(14333, 'CMSG_CHANNEL_LIST', 31398, 0),
+(14333, 'CMSG_CHANNEL_MODERATE', 0, 0),
+(14333, 'CMSG_CHANNEL_MODERATOR', 0, 0),
+(14333, 'CMSG_CHANNEL_MUTE', 0, 0),
+(14333, 'CMSG_CHANNEL_OWNER', 0, 0),
+(14333, 'CMSG_CHANNEL_PASSWORD', 0, 0),
+(14333, 'CMSG_CHANNEL_ROSTER_INFO', 0, 0),
+(14333, 'CMSG_CHANNEL_SET_OWNER', 0, 0),
+(14333, 'CMSG_CHANNEL_SILENCE_ALL', 0, 0),
+(14333, 'CMSG_CHANNEL_SILENCE_VOICE', 0, 0),
+(14333, 'CMSG_CHANNEL_UNBAN', 0, 0),
+(14333, 'CMSG_CHANNEL_UNMODERATOR', 0, 0),
+(14333, 'CMSG_CHANNEL_UNMUTE', 0, 0),
+(14333, 'CMSG_CHANNEL_UNSILENCE_ALL', 0, 0),
+(14333, 'CMSG_CHANNEL_UNSILENCE_VOICE', 0, 0),
+(14333, 'CMSG_CHANNEL_VOICE_OFF', 0, 0),
+(14333, 'CMSG_CHANNEL_VOICE_ON', 0, 0),
+(14333, 'CMSG_CHARACTER_POINT_CHEAT', 0, 0),
+(14333, 'CMSG_CHAR_CREATE', 10786, 0),
+(14333, 'CMSG_CHAR_CUSTOMIZE', 10854, 0),
+(14333, 'CMSG_CHAR_DELETE', 28210, 0),
+(14333, 'CMSG_CHAR_ENUM', 4241, 0),
+(14333, 'CMSG_CHAR_FACTION_CHANGE', 30262, 0),
+(14333, 'CMSG_CHAR_RACE_CHANGE', 45686, 0),
+(14333, 'CMSG_CHAR_RENAME', 25187, 0),
+(14333, 'CMSG_CHAT_FILTERED', 0, 0),
+(14333, 'CMSG_CHAT_IGNORED', 0, 0),
+(14333, 'CMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY', 0, 0),
+(14333, 'CMSG_CHEAT_PLAYER_LOGIN', 0, 0),
+(14333, 'CMSG_CHEAT_PLAYER_LOOKUP', 0, 0),
+(14333, 'CMSG_CHEAT_SET_ARENA_CURRENCY', 0, 0),
+(14333, 'CMSG_CHEAT_SET_HONOR_CURRENCY', 0, 0),
+(14333, 'CMSG_CHECK_LOGIN_CRITERIA', 0, 0),
+(14333, 'CMSG_CLEAR_CHANNEL_WATCH', 16034, 0),
+(14333, 'CMSG_CLEAR_EXPLORATION', 0, 0),
+(14333, 'CMSG_CLEAR_SERVER_BUCK_DATA', 0, 0),
+(14333, 'CMSG_CLEAR_TRADE_ITEM', 2464, 0),
+(14333, 'CMSG_COMMENTATOR_ENABLE', 13935, 0),
+(14333, 'CMSG_COMMENTATOR_ENTER_INSTANCE', 13871, 0),
+(14333, 'CMSG_COMMENTATOR_EXIT_INSTANCE', 59127, 0),
+(14333, 'CMSG_COMMENTATOR_GET_MAP_INFO', 58098, 0),
+(14333, 'CMSG_COMMENTATOR_GET_PLAYER_INFO', 47739, 0),
+(14333, 'CMSG_COMMENTATOR_INSTANCE_COMMAND', 29431, 0),
+(14333, 'CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND', 31350, 0),
+(14333, 'CMSG_COMMENTATOR_START_WARGAME', 0, 0),
+(14333, 'CMSG_COMPLAIN', 60003, 0),
+(14333, 'CMSG_COMPLETE_ACHIEVEMENT_CHEAT', 0, 0),
+(14333, 'CMSG_COMPLETE_CINEMATIC', 45815, 0),
+(14333, 'CMSG_COMPLETE_MOVIE', 63039, 0),
+(14333, 'CMSG_CONTACT_LIST', 31291, 0),
+(14333, 'CMSG_CORPSE_MAP_POSITION_QUERY', 58918, 0),
+(14333, 'CMSG_CREATURE_QUERY', 42594, 0),
+(14333, 'CMSG_CUF_PROFILES_SAVE', 6242, 0),
+(14333, 'CMSG_DANCE_QUERY', 42687, 0),
+(14333, 'CMSG_DEBUG_ACTIONS_START', 0, 0),
+(14333, 'CMSG_DEBUG_ACTIONS_STOP', 0, 0),
+(14333, 'CMSG_DEBUG_LIST_TARGETS', 0, 0),
+(14333, 'CMSG_DECHARGE', 0, 0),
+(14333, 'CMSG_DECLINE_CHANNEL_INVITE', 0, 0),
+(14333, 'CMSG_DELETE_DANCE', 0, 0),
+(14333, 'CMSG_DEL_FRIEND', 15931, 0),
+(14333, 'CMSG_DEL_IGNORE', 31414, 0),
+(14333, 'CMSG_DEL_PVP_MEDAL_CHEAT', 0, 0),
+(14333, 'CMSG_DEL_VOICE_IGNORE', 0, 0),
+(14333, 'CMSG_DESTROYITEM', 28282, 0),
+(14333, 'CMSG_DESTROY_ITEMS', 28282, 0),
+(14333, 'CMSG_DISMISS_CONTROLLED_VEHICLE', 0, 0),
+(14333, 'CMSG_DISMISS_CRITTER', 0, 0),
+(14333, 'CMSG_DUEL_ACCEPTED', 63035, 0),
+(14333, 'CMSG_DUEL_CANCELLED', 13870, 0),
+(14333, 'CMSG_DUMP_OBJECTS', 0, 0),
+(14333, 'CMSG_EJECT_PASSENGER', 15982, 0),
+(14333, 'CMSG_EMOTE', 0, 0),
+(14333, 'CMSG_ENABLETAXI', 0, 0),
+(14333, 'CMSG_ENABLE_DAMAGE_LOG', 0, 0),
+(14333, 'CMSG_EQUIPMENT_SET_DELETE', 65215, 0),
+(14333, 'CMSG_EQUIPMENT_SET_SAVE', 57966, 0),
+(14333, 'CMSG_EQUIPMENT_SET_USE', 0, 0),
+(14333, 'CMSG_EXPIRE_RAID_INSTANCE', 0, 0),
+(14333, 'CMSG_FAR_SIGHT', 0, 0),
+(14333, 'CMSG_FLOOD_GRACE_CHEAT', 0, 0),
+(14333, 'CMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE_ACK', 0, 0),
+(14333, 'CMSG_FORCE_FLIGHT_SPEED_CHANGE_ACK', 0, 0),
+(14333, 'CMSG_FORCE_MOVE_ROOT_ACK', 0, 0),
+(14333, 'CMSG_FORCE_MOVE_UNROOT_ACK', 0, 0),
+(14333, 'CMSG_FORCE_PITCH_RATE_CHANGE_ACK', 0, 0),
+(14333, 'CMSG_FORCE_RUN_BACK_SPEED_CHANGE_ACK', 0, 0),
+(14333, 'CMSG_FORCE_RUN_SPEED_CHANGE_ACK', 0, 0),
+(14333, 'CMSG_FORCE_SAY_CHEAT', 0, 0),
+(14333, 'CMSG_FORCE_SWIM_BACK_SPEED_CHANGE_ACK', 0, 0),
+(14333, 'CMSG_FORCE_SWIM_SPEED_CHANGE_ACK', 0, 0),
+(14333, 'CMSG_FORCE_TURN_RATE_CHANGE_ACK', 0, 0),
+(14333, 'CMSG_FORCE_UNK1_SPEED_CHANGE_ACK', 0, 0),
+(14333, 'CMSG_FORCE_UNK2_SPEED_CHANGE_ACK', 0, 0),
+(14333, 'CMSG_FORCE_WALK_SPEED_CHANGE_ACK', 0, 0),
+(14333, 'CMSG_GAMEOBJECT_QUERY', 15102, 0),
+(14333, 'CMSG_GAMEOBJ_REPORT_USE', 60967, 0),
+(14333, 'CMSG_GAMEOBJ_USE', 29371, 0),
+(14333, 'CMSG_GAMESPEED_SET', 0, 0),
+(14333, 'CMSG_GAMETIME_SET', 62123, 0),
+(14333, 'CMSG_GETDEATHBINDZONE', 0, 0),
+(14333, 'CMSG_GET_CHANNEL_MEMBER_COUNT', 0, 0),
+(14333, 'CMSG_GET_MAIL_LIST', 59955, 0),
+(14333, 'CMSG_GET_MIRRORIMAGE_DATA', 61162, 0),
+(14333, 'CMSG_GHOST', 0, 0),
+(14333, 'CMSG_GMRESPONSE_RESOLVE', 62003, 0),
+(14333, 'CMSG_GMSURVEY_SUBMIT', 48827, 0),
+(14333, 'CMSG_GMTICKETSYSTEM_TOGGLE', 0, 0),
+(14333, 'CMSG_GMTICKET_CREATE', 8739, 0),
+(14333, 'CMSG_GMTICKET_DELETETICKET', 65058, 0),
+(14333, 'CMSG_GMTICKET_GETTICKET', 12962, 0),
+(14333, 'CMSG_GMTICKET_SYSTEMSTATUS', 32359, 0),
+(14333, 'CMSG_GMTICKET_UPDATETEXT', 27179, 0),
+(14333, 'CMSG_GM_CHARACTER_RESTORE', 0, 0),
+(14333, 'CMSG_GM_CHARACTER_SAVE', 0, 0),
+(14333, 'CMSG_GM_CREATE_ITEM_TARGET', 0, 0),
+(14333, 'CMSG_GM_DESTROY_ONLINE_CORPSE', 0, 0),
+(14333, 'CMSG_GM_INVIS', 0, 0),
+(14333, 'CMSG_GM_NUKE', 0, 0),
+(14333, 'CMSG_GM_NUKE_ACCOUNT', 0, 0),
+(14333, 'CMSG_GM_REPORT_LAG', 58022, 0),
+(14333, 'CMSG_GM_SET_SECURITY_GROUP', 0, 0),
+(14333, 'CMSG_GM_SHOW_COMPLAINTS', 0, 0),
+(14333, 'CMSG_GM_TEACH', 0, 0),
+(14333, 'CMSG_GM_UNSQUELCH', 0, 0),
+(14333, 'CMSG_GM_UNTEACH', 0, 0),
+(14333, 'CMSG_GM_UPDATE_TICKET_STATUS', 0, 0),
+(14333, 'CMSG_GM_WHISPER', 0, 0),
+(14333, 'CMSG_GOSSIP_HELLO', 61051, 0),
+(14333, 'CMSG_GOSSIP_SELECT_OPTION', 10979, 0),
+(14333, 'CMSG_GRANT_LEVEL', 14894, 0),
+(14333, 'CMSG_GROUP_ACCEPT', 0, 0),
+(14333, 'CMSG_GROUP_ASSISTANT_LEADER', 25123, 0),
+(14333, 'CMSG_GROUP_CANCEL', 0, 0),
+(14333, 'CMSG_GROUP_CHANGE_SUB_GROUP', 9890, 0),
+(14333, 'CMSG_GROUP_DECLINE', 0, 0),
+(14333, 'CMSG_GROUP_DISBAND', 10987, 0),
+(14333, 'CMSG_GROUP_INVITE', 16465, 0),
+(14333, 'CMSG_GROUP_RAID_CONVERT', 14014, 0),
+(14333, 'CMSG_GROUP_SET_LEADER', 45690, 0),
+(14333, 'CMSG_GROUP_SET_ROLES', 0, 0),
+(14333, 'CMSG_GROUP_SWAP_SUB_GROUP', 57890, 0),
+(14333, 'CMSG_GROUP_UNINVITE', 0, 0),
+(14333, 'CMSG_GROUP_UNINVITE_GUID', 65211, 0),
+(14333, 'CMSG_GUILD_ACCEPT', 0, 0),
+(14333, 'CMSG_GUILD_ADD_RANK', 0, 0),
+(14333, 'CMSG_GUILD_BANKER_ACTIVATE', 9906, 0),
+(14333, 'CMSG_GUILD_BANK_BUY_TAB', 14003, 0),
+(14333, 'CMSG_GUILD_BANK_DEPOSIT_MONEY', 10799, 0),
+(14333, 'CMSG_GUILD_BANK_NOTE', 28198, 0),
+(14333, 'CMSG_GUILD_BANK_QUERY_TAB', 42531, 0),
+(14333, 'CMSG_GUILD_BANK_SWAP_ITEMS', 64242, 0),
+(14333, 'CMSG_GUILD_BANK_UPDATE_TAB', 29307, 0),
+(14333, 'CMSG_GUILD_BANK_WITHDRAW_MONEY', 8942, 0),
+(14333, 'CMSG_GUILD_CREATE', 0, 0),
+(14333, 'CMSG_GUILD_DECLINE', 0, 0),
+(14333, 'CMSG_GUILD_DEL_RANK', 0, 0),
+(14333, 'CMSG_GUILD_DEMOTE', 0, 0),
+(14333, 'CMSG_GUILD_DISBAND', 0, 0),
+(14333, 'CMSG_GUILD_INFO', 8814, 0),
+(14333, 'CMSG_GUILD_INFO_TEXT', 0, 0),
+(14333, 'CMSG_GUILD_INVITE', 62002, 0),
+(14333, 'CMSG_GUILD_LEADER', 0, 0),
+(14333, 'CMSG_GUILD_LEAVE', 0, 0),
+(14333, 'CMSG_GUILD_MOTD', 0, 0),
+(14333, 'CMSG_GUILD_PROMOTE', 0, 0),
+(14333, 'CMSG_GUILD_QUERY', 41578, 0),
+(14333, 'CMSG_GUILD_RANK', 0, 0),
+(14333, 'CMSG_GUILD_REMOVE', 0, 0),
+(14333, 'CMSG_GUILD_ROSTER', 0, 0),
+(14333, 'CMSG_GUILD_SET_NOTE', 0, 0),
+(14333, 'CMSG_GUILD_SWITCH_RANK', 0, 0),
+(14333, 'CMSG_HEARTH_AND_RESURRECT', 32358, 0),
+(14333, 'CMSG_IGNORE_DIMINISHING_RETURNS_CHEAT', 0, 0),
+(14333, 'CMSG_IGNORE_KNOCKBACK_CHEAT', 0, 0),
+(14333, 'CMSG_IGNORE_REQUIREMENTS_CHEAT', 0, 0),
+(14333, 'CMSG_IGNORE_TRADE', 0, 0),
+(14333, 'CMSG_INITIATE_TRADE', 0, 0),
+(14333, 'CMSG_INSPECT', 27311, 0),
+(14333, 'CMSG_INSPECT_HONOR_STATS', 0, 0),
+(14333, 'CMSG_INSTANCE_LOCK_WARNING_RESPONSE', 0, 0),
+(14333, 'CMSG_ITEM_NAME_QUERY', 32503, 0),
+(14333, 'CMSG_ITEM_REFUND', 30250, 0),
+(14333, 'CMSG_ITEM_REFUND_INFO', 57974, 0),
+(14333, 'CMSG_ITEM_TEXT_QUERY', 32503, 0),
+(14333, 'CMSG_JOIN_CHANNEL', 23317, 0),
+(14333, 'CMSG_KEEP_ALIVE', 59071, 0),
+(14333, 'CMSG_LEARN_DANCE_MOVE', 0, 0),
+(14333, 'CMSG_LEARN_PREVIEW_TALENTS', 61994, 0),
+(14333, 'CMSG_LEARN_PREVIEW_TALENTS_PET', 13050, 0),
+(14333, 'CMSG_LEARN_TALENT', 0, 0),
+(14333, 'CMSG_LEAVE_BATTLEFIELD', 28402, 0),
+(14333, 'CMSG_LEAVE_CHANNEL', 21397, 0),
+(14333, 'CMSG_LFD_PARTY_LOCK_INFO_REQUEST', 45822, 0),
+(14333, 'CMSG_LFD_PLAYER_LOCK_INFO_REQUEST', 0, 0),
+(14333, 'CMSG_LFG_JOIN', 16050, 0),
+(14333, 'CMSG_LFG_LEAVE', 29350, 0),
+(14333, 'CMSG_LFG_PROPOSAL_RESULT', 47850, 0),
+(14333, 'CMSG_LFG_SET_BOOT_VOTE', 42747, 0),
+(14333, 'CMSG_LFG_SET_NEEDS', 0, 0),
+(14333, 'CMSG_LFG_SET_ROLES', 9975, 0),
+(14333, 'CMSG_LFG_SET_ROLES_2', 0, 0),
+(14333, 'CMSG_LFG_TELEPORT', 46707, 0),
+(14333, 'CMSG_LIST_INVENTORY', 60155, 0),
+(14333, 'CMSG_LOAD_DANCES', 0, 0),
+(14333, 'CMSG_LOGOUT_CANCEL', 62143, 0),
+(14333, 'CMSG_LOGOUT_REQUEST', 45734, 0),
+(14333, 'CMSG_LOOT', 29291, 0),
+(14333, 'CMSG_LOOT_MASTER_GIVE', 10866, 0),
+(14333, 'CMSG_LOOT_METHOD', 61026, 0),
+(14333, 'CMSG_LOOT_MONEY', 15082, 0),
+(14333, 'CMSG_LOOT_RELEASE', 57971, 0),
+(14333, 'CMSG_LOOT_ROLL', 11951, 0),
+(14333, 'CMSG_LOTTERY_QUERY_OBSOLETE', 0, 0),
+(14333, 'CMSG_LUA_USAGE', 0, 0),
+(14333, 'CMSG_MAELSTROM_GM_SENT_MAIL', 0, 0),
+(14333, 'CMSG_MAELSTROM_INVALIDATE_CACHE', 0, 0),
+(14333, 'CMSG_MAELSTROM_RENAME_GUILD', 0, 0),
+(14333, 'CMSG_MAIL_CREATE_TEXT_ITEM', 27247, 0),
+(14333, 'CMSG_MAIL_DELETE', 11955, 0),
+(14333, 'CMSG_MAIL_MARK_AS_READ', 41643, 0),
+(14333, 'CMSG_MAIL_RETURN_TO_SENDER', 30306, 0),
+(14333, 'CMSG_MAIL_TAKE_ITEM', 64058, 0),
+(14333, 'CMSG_MAIL_TAKE_MONEY', 43762, 0),
+(14333, 'CMSG_MEETINGSTONE_CHEAT', 0, 0),
+(14333, 'CMSG_MEETINGSTONE_INFO', 30242, 0),
+(14333, 'CMSG_MESSAGECHAT_AFK', 4497, 0),
+(14333, 'CMSG_MESSAGECHAT_BATTLEGROUND', 0, 0),
+(14333, 'CMSG_MESSAGECHAT_BATTLEGROUND_LEADER', 0, 0),
+(14333, 'CMSG_MESSAGECHAT_CHANNEL', 23477, 0),
+(14333, 'CMSG_MESSAGECHAT_DND', 6961, 0),
+(14333, 'CMSG_MESSAGECHAT_EMOTE', 32438, 0),
+(14333, 'CMSG_MESSAGECHAT_GUILD', 4369, 0),
+(14333, 'CMSG_MESSAGECHAT_OFFICER', 0, 0),
+(14333, 'CMSG_MESSAGECHAT_PARTY', 0, 0),
+(14333, 'CMSG_MESSAGECHAT_PARTY_LEADER', 0, 0),
+(14333, 'CMSG_MESSAGECHAT_RAID', 0, 0),
+(14333, 'CMSG_MESSAGECHAT_RAID_LEADER', 0, 0),
+(14333, 'CMSG_MESSAGECHAT_RAID_WARNING', 0, 0),
+(14333, 'CMSG_MESSAGECHAT_SAY', 22965, 0),
+(14333, 'CMSG_MESSAGECHAT_WHISPER', 23349, 0),
+(14333, 'CMSG_MESSAGECHAT_YELL', 5041, 0),
+(14333, 'CMSG_MINIGAME_MOVE', 64234, 0),
+(14333, 'CMSG_MOUNTSPECIAL_ANIM', 43631, 0),
+(14333, 'CMSG_MOVE_CHNG_TRANSPORT', 0, 0),
+(14333, 'CMSG_MOVE_FALL_RESET', 0, 0),
+(14333, 'CMSG_MOVE_FEATHER_FALL_ACK', 0, 0),
+(14333, 'CMSG_MOVE_FLIGHT_ACK', 0, 0),
+(14333, 'CMSG_MOVE_HOVER_ACK', 0, 0),
+(14333, 'CMSG_MOVE_KNOCK_BACK_ACK', 0, 0),
+(14333, 'CMSG_MOVE_NOT_ACTIVE_MOVER', 0, 0),
+(14333, 'CMSG_MOVE_SET_CAN_FLY_ACK', 0, 0),
+(14333, 'CMSG_MOVE_SET_FLY', 0, 0),
+(14333, 'CMSG_MOVE_SET_RAW_POSITION', 0, 0),
+(14333, 'CMSG_MOVE_SET_RUN_SPEED', 0, 0),
+(14333, 'CMSG_MOVE_SPLINE_DONE', 0, 0),
+(14333, 'CMSG_MOVE_START_SWIM_CHEAT', 0, 0),
+(14333, 'CMSG_MOVE_STOP_SWIM_CHEAT', 0, 0),
+(14333, 'CMSG_MOVE_TIME_SKIPPED', 0, 0),
+(14333, 'CMSG_MOVE_WATER_WALK_ACK', 0, 0),
+(14333, 'CMSG_NAME_QUERY', 29286, 0),
+(14333, 'CMSG_NEW_SPELL_SLOT', 0, 0),
+(14333, 'CMSG_NEXT_CINEMATIC_CAMERA', 41658, 0),
+(14333, 'CMSG_NO_SPELL_VARIANCE', 0, 0),
+(14333, 'CMSG_NPC_TEXT_QUERY', 15087, 0),
+(14333, 'CMSG_OFFER_PETITION', 12030, 0),
+(14333, 'CMSG_OPENING_CINEMATIC', 12862, 0),
+(14333, 'CMSG_OPEN_ITEM', 13943, 0),
+(14333, 'CMSG_OPT_OUT_OF_LOOT', 48803, 0),
+(14333, 'CMSG_PAGE_TEXT_QUERY', 62207, 0),
+(14333, 'CMSG_PARTY_SILENCE', 25323, 0),
+(14333, 'CMSG_PARTY_UNSILENCE', 63031, 0),
+(14333, 'CMSG_PETITION_BUY', 10790, 0),
+(14333, 'CMSG_PETITION_QUERY', 32310, 0),
+(14333, 'CMSG_PETITION_SHOWLIST', 0, 0),
+(14333, 'CMSG_PETITION_SHOW_SIGNATURES', 64054, 0),
+(14333, 'CMSG_PETITION_SIGN', 9918, 0),
+(14333, 'CMSG_PET_ABANDON', 0, 0),
+(14333, 'CMSG_PET_ACTION', 29234, 0),
+(14333, 'CMSG_PET_CANCEL_AURA', 26358, 0),
+(14333, 'CMSG_PET_CAST_SPELL', 0, 0),
+(14333, 'CMSG_PET_LEARN_TALENT', 62178, 0),
+(14333, 'CMSG_PET_NAME_QUERY', 48702, 0),
+(14333, 'CMSG_PET_RENAME', 47854, 0),
+(14333, 'CMSG_PET_SET_ACTION', 10862, 0),
+(14333, 'CMSG_PET_SPELL_AUTOCAST', 26366, 0),
+(14333, 'CMSG_PET_STOP_ATTACK', 64102, 0),
+(14333, 'CMSG_PET_UNLEARN', 0, 0),
+(14333, 'CMSG_PET_UNLEARN_TALENTS', 0, 0),
+(14333, 'CMSG_PING', 10528, 0),
+(14333, 'CMSG_PLAYED_TIME', 61154, 0),
+(14333, 'CMSG_PLAYER_AI_CHEAT', 0, 0),
+(14333, 'CMSG_PLAYER_DIFFICULTY_CHANGE', 0, 0),
+(14333, 'CMSG_PLAYER_LOGIN', 4305, 0),
+(14333, 'CMSG_PLAYER_LOGOUT', 60142, 0),
+(14333, 'CMSG_PLAYER_VEHICLE_ENTER', 61090, 0),
+(14333, 'CMSG_PLAY_DANCE', 12859, 0),
+(14333, 'CMSG_PUSHQUESTTOPARTY', 8882, 0),
+(14333, 'CMSG_QUERY_GUILD_MAX_XP', 0, 0),
+(14333, 'CMSG_QUERY_GUILD_REWARDS', 0, 0),
+(14333, 'CMSG_QUERY_GUILD_XP', 0, 0),
+(14333, 'CMSG_QUERY_INSPECT_ACHIEVEMENTS', 12967, 0),
+(14333, 'CMSG_QUERY_QUESTS_COMPLETED', 65075, 0),
+(14333, 'CMSG_QUERY_SERVER_BUCK_DATA', 0, 0),
+(14333, 'CMSG_QUERY_TIME', 0, 0),
+(14333, 'CMSG_QUERY_VEHICLE_STATUS', 0, 0),
+(14333, 'CMSG_QUESTGIVER_ACCEPT_QUEST', 62123, 0),
+(14333, 'CMSG_QUESTGIVER_CANCEL', 57955, 0),
+(14333, 'CMSG_QUESTGIVER_CHOOSE_REWARD', 16043, 0),
+(14333, 'CMSG_QUESTGIVER_COMPLETE_QUEST', 29411, 0),
+(14333, 'CMSG_QUESTGIVER_HELLO', 0, 0),
+(14333, 'CMSG_QUESTGIVER_QUERY_QUEST', 48875, 0),
+(14333, 'CMSG_QUESTGIVER_QUEST_AUTOLAUNCH', 0, 0),
+(14333, 'CMSG_QUESTGIVER_REQUEST_REWARD', 57983, 0),
+(14333, 'CMSG_QUESTGIVER_STATUS_MULTIPLE_QUERY', 41722, 0),
+(14333, 'CMSG_QUESTGIVER_STATUS_QUERY', 29219, 0),
+(14333, 'CMSG_QUESTLOG_REMOVE_QUEST', 14911, 0),
+(14333, 'CMSG_QUESTLOG_SWAP_QUEST', 0, 0),
+(14333, 'CMSG_QUEST_CONFIRM_ACCEPT', 62135, 0),
+(14333, 'CMSG_QUEST_POI_QUERY', 62190, 0),
+(14333, 'CMSG_QUEST_QUERY', 11006, 0),
+(14333, 'CMSG_READY_FOR_ACCOUNT_DATA_TIMES', 61990, 0),
+(14333, 'CMSG_READ_ITEM', 27239, 0),
+(14333, 'CMSG_REALM_SPLIT', 46818, 0),
+(14333, 'CMSG_RECLAIM_CORPSE', 32374, 0),
+(14333, 'CMSG_REDIRECTION_AUTH_PROOF', 8480, 0),
+(14333, 'CMSG_REDIRECTION_FAILED', 0, 0),
+(14333, 'CMSG_REDIRECT_AUTH_PROOF', 0, 0),
+(14333, 'CMSG_REFER_A_FRIEND', 0, 0),
+(14333, 'CMSG_REMOVE_GLYPH', 0, 0),
+(14333, 'CMSG_REPAIR_ITEM', 12991, 0),
+(14333, 'CMSG_REPOP_REQUEST', 62010, 0),
+(14333, 'CMSG_REPORT_PVP_AFK', 28194, 0),
+(14333, 'CMSG_REQUEST_ACCOUNT_DATA', 32315, 0),
+(14333, 'CMSG_REQUEST_PARTY_MEMBER_STATS', 9835, 0),
+(14333, 'CMSG_REQUEST_PET_INFO', 42658, 0),
+(14333, 'CMSG_REQUEST_PLAYER_VEHICLE_EXIT', 14910, 0),
+(14333, 'CMSG_REQUEST_PVP_OPTIONS_ENABLED', 0, 0),
+(14333, 'CMSG_REQUEST_RAID_INFO', 46706, 0),
+(14333, 'CMSG_REQUEST_RATED_BG_INFO', 16384, 0),
+(14333, 'CMSG_REQUEST_VEHICLE_EXIT', 0, 0),
+(14333, 'CMSG_REQUEST_VEHICLE_NEXT_SEAT', 61042, 0),
+(14333, 'CMSG_REQUEST_VEHICLE_PREV_SEAT', 29247, 0),
+(14333, 'CMSG_REQUEST_VEHICLE_SWITCH_SEAT', 11967, 0),
+(14333, 'CMSG_RESET_FACTION_CHEAT', 0, 0),
+(14333, 'CMSG_RESET_INSTANCES', 57899, 0),
+(14333, 'CMSG_RESURRECT_RESPONSE', 47666, 0),
+(14333, 'CMSG_RETURN_TO_GRAVEYARD', 47339, 0),
+(14333, 'CMSG_RUN_SCRIPT', 0, 0),
+(14333, 'CMSG_SAVE_DANCE', 0, 0),
+(14333, 'CMSG_SAVE_PLAYER', 0, 0),
+(14333, 'CMSG_SEARCH_LFG_JOIN', 43558, 0),
+(14333, 'CMSG_SEARCH_LFG_LEAVE', 64234, 0),
+(14333, 'CMSG_SELF_RES', 45747, 0),
+(14333, 'CMSG_SELL_ITEM', 9907, 0),
+(14333, 'CMSG_SEND_COMBAT_TRIGGER', 0, 0),
+(14333, 'CMSG_SEND_GENERAL_TRIGGER', 0, 0),
+(14333, 'CMSG_SEND_LOCAL_EVENT', 0, 0),
+(14333, 'CMSG_SEND_MAIL', 16400, 0),
+(14333, 'CMSG_SERVERTIME', 0, 0),
+(14333, 'CMSG_SERVER_BROADCAST', 0, 0),
+(14333, 'CMSG_SERVER_INFO_QUERY', 0, 0),
+(14333, 'CMSG_SETDEATHBINDPOINT', 0, 0),
+(14333, 'CMSG_SETSHEATHED', 30370, 0),
+(14333, 'CMSG_SET_ACTIONBAR_TOGGLES', 48738, 0),
+(14333, 'CMSG_SET_ACTION_BUTTON', 31411, 0),
+(14333, 'CMSG_SET_ACTIVE_MOVER', 0, 0),
+(14333, 'CMSG_SET_ACTIVE_VOICE_CHANNEL', 9782, 0),
+(14333, 'CMSG_SET_ALLOW_LOW_LEVEL_RAID1', 32499, 0),
+(14333, 'CMSG_SET_ALLOW_LOW_LEVEL_RAID2', 0, 0),
+(14333, 'CMSG_SET_AMMO', 0, 0),
+(14333, 'CMSG_SET_CHANNEL_WATCH', 31398, 0),
+(14333, 'CMSG_SET_CONTACT_NOTES', 45738, 0),
+(14333, 'CMSG_SET_CRITERIA_CHEAT', 0, 0),
+(14333, 'CMSG_SET_DURABILITY_CHEAT', 0, 0),
+(14333, 'CMSG_SET_EXPLORATION', 0, 0),
+(14333, 'CMSG_SET_EXPLORATION_ALL', 0, 0),
+(14333, 'CMSG_SET_FACTION_ATWAR', 11810, 0),
+(14333, 'CMSG_SET_FACTION_CHEAT', 0, 0),
+(14333, 'CMSG_SET_FACTION_INACTIVE', 65075, 0),
+(14333, 'CMSG_SET_GLYPH', 0, 0),
+(14333, 'CMSG_SET_GLYPH_SLOT', 0, 0),
+(14333, 'CMSG_SET_GRANTABLE_LEVELS', 0, 0),
+(14333, 'CMSG_SET_GUILD_BANK_TEXT', 28198, 0),
+(14333, 'CMSG_SET_LFG_COMMENT', 58998, 0),
+(14333, 'CMSG_SET_PLAYER_DECLINED_NAMES', 16102, 0),
+(14333, 'CMSG_SET_PRIMARY_TALENT_TREE', 46631, 0),
+(14333, 'CMSG_SET_PVP_RANK_CHEAT', 0, 0),
+(14333, 'CMSG_SET_PVP_TITLE', 0, 0),
+(14333, 'CMSG_SET_RUNE_COOLDOWN', 0, 0),
+(14333, 'CMSG_SET_RUNE_COUNT', 0, 0),
+(14333, 'CMSG_SET_SAVED_INSTANCE_EXTEND', 44715, 0),
+(14333, 'CMSG_SET_SELECTION', 26150, 0),
+(14333, 'CMSG_SET_SKILL_CHEAT', 0, 0),
+(14333, 'CMSG_SET_TAXI_BENCHMARK_MODE', 32319, 0),
+(14333, 'CMSG_SET_TITLE', 25211, 0),
+(14333, 'CMSG_SET_TITLE_SUFFIX', 0, 0),
+(14333, 'CMSG_SET_TRADE_GOLD', 0, 0),
+(14333, 'CMSG_SET_TRADE_ITEM', 39011, 0),
+(14333, 'CMSG_SET_WATCHED_FACTION', 13879, 0),
+(14333, 'CMSG_SHOWING_CLOAK', 13878, 0),
+(14333, 'CMSG_SHOWING_HELM', 46695, 0),
+(14333, 'CMSG_SKILL_BUY_RANK', 0, 0),
+(14333, 'CMSG_SKILL_BUY_STEP', 0, 0),
+(14333, 'CMSG_SOCKET_GEMS', 9899, 0),
+(14333, 'CMSG_SPELLCLICK', 0, 0),
+(14333, 'CMSG_SPIRIT_HEALER_ACTIVATE', 46774, 0),
+(14333, 'CMSG_SPLIT_ITEM', 28263, 0),
+(14333, 'CMSG_STABLE_CHANGE_SLOT', 0, 0),
+(14333, 'CMSG_STABLE_REVIVE_PET', 0, 0),
+(14333, 'CMSG_STANDSTATECHANGE', 13034, 0),
+(14333, 'CMSG_START_QUEST', 39112, 0),
+(14333, 'CMSG_STOP_DANCE', 12019, 0),
+(14333, 'CMSG_STORE_LOOT_IN_SLOT', 0, 0),
+(14333, 'CMSG_SUMMON_RESPONSE', 31290, 0),
+(14333, 'CMSG_SWAP_INV_ITEM', 0, 0),
+(14333, 'CMSG_SWAP_ITEM', 15035, 0),
+(14333, 'CMSG_SYNC_DANCE', 0, 0),
+(14333, 'CMSG_TARGET_CAST', 0, 0),
+(14333, 'CMSG_TARGET_SCRIPT_CAST', 0, 0),
+(14333, 'CMSG_TAXICLEARALLNODES', 0, 0),
+(14333, 'CMSG_TAXICLEARNODE', 0, 0),
+(14333, 'CMSG_TAXIENABLEALLNODES', 0, 0),
+(14333, 'CMSG_TAXIENABLENODE', 0, 0),
+(14333, 'CMSG_TAXINODE_STATUS_QUERY', 26146, 0),
+(14333, 'CMSG_TAXIQUERYAVAILABLENODES', 0, 0),
+(14333, 'CMSG_TAXISHOWNODES', 43639, 0),
+(14333, 'CMSG_TELEPORT_TO_UNIT', 0, 0),
+(14333, 'CMSG_TEXT_EMOTE', 0, 0),
+(14333, 'CMSG_TIME_SYNC_RESP', 0, 0),
+(14333, 'CMSG_TOGGLE_PVP', 47727, 0),
+(14333, 'CMSG_TOTEM_DESTROYED', 16055, 0),
+(14333, 'CMSG_TRAINER_BUY_SPELL', 47655, 0),
+(14333, 'CMSG_TRAINER_LIST', 48826, 0),
+(14333, 'CMSG_TRANSFORM', 0, 0),
+(14333, 'CMSG_TRIGGER_CINEMATIC_CHEAT', 0, 0),
+(14333, 'CMSG_TURN_IN_PETITION', 29306, 0),
+(14333, 'CMSG_TUTORIAL_CLEAR', 45819, 0),
+(14333, 'CMSG_TUTORIAL_FLAG', 9834, 0),
+(14333, 'CMSG_TUTORIAL_RESET', 46783, 0),
+(14333, 'CMSG_UNACCEPT_TRADE', 34888, 0),
+(14333, 'CMSG_UNITANIMTIER_CHEAT', 0, 0),
+(14333, 'CMSG_UNKNOWN_1296', 2464, 0),
+(14333, 'CMSG_UNKNOWN_1303', 0, 0),
+(14333, 'CMSG_UNKNOWN_1320', 0, 0),
+(14333, 'CMSG_UNLEARN_DANCE_MOVE', 0, 0),
+(14333, 'CMSG_UNLEARN_SKILL', 45806, 0),
+(14333, 'CMSG_UNLEARN_SPELL', 0, 0),
+(14333, 'CMSG_UNLEARN_TALENTS', 0, 0),
+(14333, 'CMSG_UNUSED2', 0, 0),
+(14333, 'CMSG_UPDATE_ACCOUNT_DATA', 26367, 0),
+(14333, 'CMSG_UPDATE_MISSILE_TRAJECTORY', 0, 0),
+(14333, 'CMSG_UPDATE_PROJECTILE_POSITION', 0, 0),
+(14333, 'CMSG_USE_ITEM', 8883, 0),
+(14333, 'CMSG_VOICE_SESSION_ENABLE', 47779, 0),
+(14333, 'CMSG_VOICE_SET_TALKER_MUTED_REQUEST', 0, 0),
+(14333, 'CMSG_WARDEN_DATA', 58107, 0),
+(14333, 'CMSG_WHO', 62131, 0),
+(14333, 'CMSG_WHOIS', 9955, 0),
+(14333, 'CMSG_WORLD_LOGIN', 16401, 0),
+(14333, 'CMSG_WORLD_STATE_UI_TIMER_UPDATE', 25122, 0),
+(14333, 'CMSG_WORLD_TELEPORT', 0, 0),
+(14333, 'CMSG_WRAP_ITEM', 0, 0),
+(14333, 'CMSG_ZONEUPDATE', 44727, 0),
+(14333, 'MSG_AUCTION_HELLO', 28335, 0),
+(14333, 'MSG_CHANNEL_START', 0, 0),
+(14333, 'MSG_CHANNEL_UPDATE', 0, 0),
+(14333, 'MSG_CORPSE_QUERY', 12850, 0),
+(14333, 'MSG_DELAY_GHOST_TELEPORT', 0, 0),
+(14333, 'MSG_GM_ACCOUNT_ONLINE', 0, 0),
+(14333, 'MSG_GM_BIND_OTHER', 0, 0),
+(14333, 'MSG_GM_CHANGE_ARENA_RATING', 0, 0),
+(14333, 'MSG_GM_DESTROY_CORPSE', 0, 0),
+(14333, 'MSG_GM_GEARRATING', 0, 0),
+(14333, 'MSG_GM_RESETINSTANCELIMIT', 0, 0),
+(14333, 'MSG_GM_SHOWLABEL', 0, 0),
+(14333, 'MSG_GM_SUMMON', 0, 0),
+(14333, 'MSG_GUILD_BANK_LOG_QUERY', 29418, 0),
+(14333, 'MSG_GUILD_BANK_MONEY_WITHDRAWN', 14070, 0),
+(14333, 'MSG_GUILD_EVENT_LOG_QUERY', 44734, 0),
+(14333, 'MSG_GUILD_PERMISSIONS', 57902, 0),
+(14333, 'MSG_INSPECT_ARENA_TEAMS', 29347, 0),
+(14333, 'MSG_LIST_STABLED_PETS', 45682, 0),
+(14333, 'MSG_MINIMAP_PING', 0, 0),
+(14333, 'MSG_MOVE_FALL_LAND', 35041, 0),
+(14333, 'MSG_MOVE_FEATHER_FALL', 0, 0),
+(14333, 'MSG_MOVE_HEARTBEAT', 10467, 0),
+(14333, 'MSG_MOVE_HOVER', 0, 0),
+(14333, 'MSG_MOVE_JUMP', 14442, 0),
+(14333, 'MSG_MOVE_KNOCK_BACK', 0, 0),
+(14333, 'MSG_MOVE_ROOT', 2283, 0),
+(14333, 'MSG_MOVE_SET_ALL_SPEED_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_SET_FACING', 38984, 0),
+(14333, 'MSG_MOVE_SET_FLIGHT_BACK_SPEED', 0, 0),
+(14333, 'MSG_MOVE_SET_FLIGHT_BACK_SPEED_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_SET_FLIGHT_SPEED', 0, 0),
+(14333, 'MSG_MOVE_SET_FLIGHT_SPEED_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_SET_PITCH', 47201, 0),
+(14333, 'MSG_MOVE_SET_PITCH_RATE', 0, 0),
+(14333, 'MSG_MOVE_SET_PITCH_RATE_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_SET_RAW_POSITION_ACK', 0, 0),
+(14333, 'MSG_MOVE_SET_RUN_BACK_SPEED', 0, 0),
+(14333, 'MSG_MOVE_SET_RUN_BACK_SPEED_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_SET_RUN_MODE', 0, 0),
+(14333, 'MSG_MOVE_SET_RUN_SPEED', 0, 0),
+(14333, 'MSG_MOVE_SET_RUN_SPEED_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_SET_SWIM_BACK_SPEED', 0, 0),
+(14333, 'MSG_MOVE_SET_SWIM_BACK_SPEED_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_SET_SWIM_SPEED', 0, 0),
+(14333, 'MSG_MOVE_SET_SWIM_SPEED_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_SET_TURN_RATE', 0, 0),
+(14333, 'MSG_MOVE_SET_TURN_RATE_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_SET_WALK_MODE', 0, 0),
+(14333, 'MSG_MOVE_SET_WALK_SPEED', 0, 0),
+(14333, 'MSG_MOVE_SET_WALK_SPEED_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_START_ASCEND', 6378, 0),
+(14333, 'MSG_MOVE_START_BACKWARD', 2147, 0),
+(14333, 'MSG_MOVE_START_DESCEND', 2121, 0),
+(14333, 'MSG_MOVE_START_FORWARD', 6369, 0),
+(14333, 'MSG_MOVE_START_PITCH_DOWN', 0, 0),
+(14333, 'MSG_MOVE_START_PITCH_UP', 0, 0),
+(14333, 'MSG_MOVE_START_STRAFE_LEFT', 35010, 0),
+(14333, 'MSG_MOVE_START_STRAFE_RIGHT', 47171, 0),
+(14333, 'MSG_MOVE_START_SWIM', 47169, 0),
+(14333, 'MSG_MOVE_START_SWIM_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_START_TURN_LEFT', 2122, 0),
+(14333, 'MSG_MOVE_START_TURN_RIGHT', 35040, 0),
+(14333, 'MSG_MOVE_STOP', 10346, 0),
+(14333, 'MSG_MOVE_STOP_ASCEND', 6249, 0),
+(14333, 'MSG_MOVE_STOP_PITCH', 0, 0),
+(14333, 'MSG_MOVE_STOP_STRAFE', 43232, 0),
+(14333, 'MSG_MOVE_STOP_SWIM', 0, 0),
+(14333, 'MSG_MOVE_STOP_SWIM_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_STOP_TURN', 14434, 0),
+(14333, 'MSG_MOVE_TELEPORT', 0, 0),
+(14333, 'MSG_MOVE_TELEPORT_ACK', 0, 0),
+(14333, 'MSG_MOVE_TELEPORT_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_TIME_SKIPPED', 0, 0),
+(14333, 'MSG_MOVE_TOGGLE_COLLISION_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_TOGGLE_FALL_LOGGING', 0, 0),
+(14333, 'MSG_MOVE_TOGGLE_GRAVITY_CHEAT', 0, 0),
+(14333, 'MSG_MOVE_TOGGLE_LOGGING', 0, 0),
+(14333, 'MSG_MOVE_UNROOT', 0, 0),
+(14333, 'MSG_MOVE_UPDATE_CAN_FLY', 0, 0),
+(14333, 'MSG_MOVE_WATER_WALK', 0, 0),
+(14333, 'MSG_MOVE_WORLDPORT_ACK', 0, 0),
+(14333, 'MSG_NOTIFY_PARTY_SQUELCH', 30315, 0),
+(14333, 'MSG_OPCODE_UNKNOWN', 0, 0),
+(14333, 'MSG_PARTY_ASSIGNMENT', 41514, 0),
+(14333, 'MSG_PETITION_DECLINE', 44591, 0),
+(14333, 'MSG_PETITION_RENAME', 64250, 0),
+(14333, 'MSG_PVP_LOG_DATA', 21349, 0),
+(14333, 'MSG_QUERY_GUILD_BANK_TEXT', 41526, 0),
+(14333, 'MSG_QUERY_NEXT_MAIL_TIME', 64098, 0),
+(14333, 'MSG_QUEST_PUSH_RESULT', 48698, 0),
+(14333, 'MSG_RAID_READY_CHECK', 42554, 0),
+(14333, 'MSG_RAID_READY_CHECK_CONFIRM', 44662, 0),
+(14333, 'MSG_RAID_READY_CHECK_FINISHED', 14054, 0),
+(14333, 'MSG_RAID_TARGET_UPDATE', 26362, 0),
+(14333, 'MSG_RANDOM_ROLL', 65275, 0),
+(14333, 'MSG_SAVE_GUILD_EMBLEM', 27190, 0),
+(14333, 'MSG_SET_DUNGEON_DIFFICULTY', 41534, 0),
+(14333, 'MSG_SET_RAID_DIFFICULTY', 64115, 0),
+(14333, 'MSG_TABARDVENDOR_ACTIVATE', 60143, 0),
+(14333, 'MSG_TALENT_WIPE_CONFIRM', 11943, 0),
+(14333, 'SMSG_ACCOUNT_DATA_TIMES', 11838, 0),
+(14333, 'SMSG_ACHIEVEMENT_DELETED', 60158, 0),
+(14333, 'SMSG_ACHIEVEMENT_EARNED', 47866, 0),
+(14333, 'SMSG_ACTION_BUTTONS', 28346, 0),
+(14333, 'SMSG_ACTIVATETAXIREPLY', 44722, 0),
+(14333, 'SMSG_ADDON_INFO', 27310, 0),
+(14333, 'SMSG_ADD_RUNE_POWER', 0, 0),
+(14333, 'SMSG_AI_REACTION', 45807, 0),
+(14333, 'SMSG_ALL_ACHIEVEMENT_DATA', 39749, 0),
+(14333, 'SMSG_AREA_SPIRIT_HEALER_TIME', 0, 0),
+(14333, 'SMSG_AREA_TRIGGER_MESSAGE', 31394, 0),
+(14333, 'SMSG_ARENA_ERROR', 62206, 0),
+(14333, 'SMSG_ARENA_OPPONENT_UPDATE', 31343, 0),
+(14333, 'SMSG_ARENA_TEAM_CHANGE_FAILED_QUEUED', 41515, 0),
+(14333, 'SMSG_ARENA_TEAM_COMMAND_RESULT', 35653, 0),
+(14333, 'SMSG_ARENA_TEAM_EVENT', 29299, 0),
+(14333, 'SMSG_ARENA_TEAM_INVITE', 43754, 0),
+(14333, 'SMSG_ARENA_TEAM_QUERY_RESPONSE', 65071, 0),
+(14333, 'SMSG_ARENA_TEAM_ROSTER', 41590, 0),
+(14333, 'SMSG_ARENA_TEAM_STATS', 11963, 0),
+(14333, 'SMSG_ATTACKERSTATEUPDATE', 48678, 0),
+(14333, 'SMSG_ATTACKSTART', 27170, 0),
+(14333, 'SMSG_ATTACKSTOP', 59135, 0),
+(14333, 'SMSG_ATTACKSWING_BADFACING', 25131, 0),
+(14333, 'SMSG_ATTACKSWING_CANT_ATTACK', 63015, 0),
+(14333, 'SMSG_ATTACKSWING_DEADTARGET', 15975, 0),
+(14333, 'SMSG_ATTACKSWING_NOTINRANGE', 61159, 0),
+(14333, 'SMSG_AUCTION_BIDDER_LIST_RESULT', 27319, 0),
+(14333, 'SMSG_AUCTION_BIDDER_NOTIFICATION', 44647, 0),
+(14333, 'SMSG_AUCTION_COMMAND_RESULT', 8815, 0),
+(14333, 'SMSG_AUCTION_LIST_PENDING_SALES', 13951, 0),
+(14333, 'SMSG_AUCTION_LIST_RESULT', 61111, 0),
+(14333, 'SMSG_AUCTION_OWNER_LIST_RESULT', 58027, 0),
+(14333, 'SMSG_AUCTION_OWNER_NOTIFICATION', 15979, 0),
+(14333, 'SMSG_AUCTION_REMOVED_NOTIFICATION', 10943, 0),
+(14333, 'SMSG_AURACASTLOG', 0, 0),
+(14333, 'SMSG_AURA_UPDATE', 10807, 0),
+(14333, 'SMSG_AURA_UPDATE_ALL', 27299, 0),
+(14333, 'SMSG_AUTH_CHALLENGE', 35856, 0),
+(14333, 'SMSG_AUTH_RESPONSE', 48891, 0),
+(14333, 'SMSG_AVAILABLE_VOICE_CHANNEL', 26355, 0),
+(14333, 'SMSG_BARBER_SHOP_RESULT', 65258, 0),
+(14333, 'SMSG_BATTLEFIELD_LIST', 21249, 0),
+(14333, 'SMSG_BATTLEFIELD_MGR_EJECTED', 7973, 0),
+(14333, 'SMSG_BATTLEFIELD_MGR_EJECT_PENDING', 38689, 0),
+(14333, 'SMSG_BATTLEFIELD_MGR_ENTERED', 6977, 0),
+(14333, 'SMSG_BATTLEFIELD_MGR_ENTRY_INVITE', 54053, 0),
+(14333, 'SMSG_BATTLEFIELD_MGR_QUEUE_INVITE', 23299, 0),
+(14333, 'SMSG_BATTLEFIELD_MGR_QUEUE_REQUEST_RESPONSE', 8035, 0),
+(14333, 'SMSG_BATTLEFIELD_MGR_STATE_CHANGE', 867, 0),
+(14333, 'SMSG_BATTLEFIELD_PORT_DENIED', 0, 0),
+(14333, 'SMSG_BATTLEFIELD_STATUS1', 2823, 0),
+(14333, 'SMSG_BATTLEFIELD_STATUS2', 19205, 0),
+(14333, 'SMSG_BATTLEFIELD_STATUS3', 20323, 0),
+(14333, 'SMSG_BATTLEFIELD_STATUS4', 771, 0),
+(14333, 'SMSG_BATTLEGROUND_INFO_THROTTLED', 47807, 0),
+(14333, 'SMSG_BATTLEGROUND_PLAYER_JOINED', 23335, 0),
+(14333, 'SMSG_BATTLEGROUND_PLAYER_LEFT', 0, 0),
+(14333, 'SMSG_BATTLEGROUND_PLAYER_POSITIONS', 0, 0),
+(14333, 'SMSG_BINDER_CONFIRM', 11878, 0),
+(14333, 'SMSG_BINDPOINTUPDATE', 32294, 0),
+(14333, 'SMSG_BINDZONEREPLY', 25134, 0),
+(14333, 'SMSG_BREAK_TARGET', 26283, 0),
+(14333, 'SMSG_BUY_BANK_SLOT_RESULT', 0, 0),
+(14333, 'SMSG_BUY_FAILED', 0, 0),
+(14333, 'SMSG_BUY_ITEM', 0, 0),
+(14333, 'SMSG_CALENDAR_ACTION_PENDING', 10879, 0),
+(14333, 'SMSG_CALENDAR_ARENA_TEAM', 46711, 0),
+(14333, 'SMSG_CALENDAR_COMMAND_RESULT', 48682, 0),
+(14333, 'SMSG_CALENDAR_EVENT_INVITE', 25279, 0),
+(14333, 'SMSG_CALENDAR_EVENT_INVITE_ALERT', 30390, 0),
+(14333, 'SMSG_CALENDAR_EVENT_INVITE_REMOVED', 59122, 0),
+(14333, 'SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT', 12010, 0),
+(14333, 'SMSG_CALENDAR_EVENT_INVITE_STATUS_ALERT', 28258, 0),
+(14333, 'SMSG_CALENDAR_EVENT_MODERATOR_STATUS_ALERT', 13874, 0),
+(14333, 'SMSG_CALENDAR_EVENT_REMOVED_ALERT', 58990, 0),
+(14333, 'SMSG_CALENDAR_EVENT_STATUS', 46762, 0),
+(14333, 'SMSG_CALENDAR_EVENT_UPDATED_ALERT', 31403, 0),
+(14333, 'SMSG_CALENDAR_FILTER_GUILD', 11834, 0),
+(14333, 'SMSG_CALENDAR_RAID_LOCKOUT_ADDED', 43699, 0),
+(14333, 'SMSG_CALENDAR_RAID_LOCKOUT_REMOVED', 63226, 0),
+(14333, 'SMSG_CALENDAR_SEND_CALENDAR', 12910, 0),
+(14333, 'SMSG_CALENDAR_SEND_EVENT', 42674, 0),
+(14333, 'SMSG_CALENDAR_SEND_NUM_PENDING', 13859, 0),
+(14333, 'SMSG_CALENDAR_UPDATE_INVITE_LIST', 29302, 0),
+(14333, 'SMSG_CALENDAR_UPDATE_INVITE_LIST2', 59946, 0),
+(14333, 'SMSG_CALENDAR_UPDATE_INVITE_LIST3', 14898, 0),
+(14333, 'SMSG_CAMERA_SHAKE', 0, 0),
+(14333, 'SMSG_CANCEL_AUTO_REPEAT', 65191, 0),
+(14333, 'SMSG_CANCEL_COMBAT', 41659, 0),
+(14333, 'SMSG_CAST_FAILED', 46630, 0),
+(14333, 'SMSG_CHANNEL_LIST', 32375, 0),
+(14333, 'SMSG_CHANNEL_MEMBER_COUNT', 64247, 0),
+(14333, 'SMSG_CHANNEL_NOTIFY', 9910, 0),
+(14333, 'SMSG_CHARACTER_LOGIN_FAILED', 45795, 0),
+(14333, 'SMSG_CHARACTER_PROFILE', 0, 0),
+(14333, 'SMSG_CHARACTER_PROFILE_REALM_CONNECTED', 0, 0),
+(14333, 'SMSG_CHAR_CREATE', 15926, 0),
+(14333, 'SMSG_CHAR_CUSTOMIZE', 0, 0),
+(14333, 'SMSG_CHAR_DELETE', 16122, 0),
+(14333, 'SMSG_CHAR_ENUM', 50983, 0),
+(14333, 'SMSG_CHAR_FACTION_CHANGE', 0, 0),
+(14333, 'SMSG_CHAR_RENAME', 0, 0),
+(14333, 'SMSG_CHAT_PLAYER_AMBIGUOUS', 15983, 0),
+(14333, 'SMSG_CHAT_PLAYER_NOT_FOUND', 45730, 0),
+(14333, 'SMSG_CHAT_RESTRICTED', 30311, 0),
+(14333, 'SMSG_CHAT_WRONG_FACTION', 8755, 0),
+(14333, 'SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE', 0, 0),
+(14333, 'SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE_WRITE_FILE', 0, 0),
+(14333, 'SMSG_CHEAT_PLAYER_LOOKUP', 0, 0),
+(14333, 'SMSG_CHECK_FOR_BOTS', 0, 0),
+(14333, 'SMSG_CLEAR_COOLDOWN', 60030, 0),
+(14333, 'SMSG_CLEAR_EXTRA_AURA_INFO_OBSOLETE', 0, 0),
+(14333, 'SMSG_CLEAR_FAR_SIGHT_IMMEDIATE', 28283, 0),
+(14333, 'SMSG_CLEAR_TARGET', 44651, 0),
+(14333, 'SMSG_CLIENTCACHE_VERSION', 41527, 0),
+(14333, 'SMSG_CLIENT_CONTROL_UPDATE', 57959, 0),
+(14333, 'SMSG_COMBAT_LOG_MULTIPLE', 61047, 0),
+(14333, 'SMSG_COMMENTATOR_GET_PLAYER_INFO', 0, 0),
+(14333, 'SMSG_COMMENTATOR_MAP_INFO', 30454, 0),
+(14333, 'SMSG_COMMENTATOR_PLAYER_INFO', 57910, 0),
+(14333, 'SMSG_COMMENTATOR_STATE_CHANGED', 10999, 0),
+(14333, 'SMSG_COMPLAIN_RESULT', 32318, 0),
+(14333, 'SMSG_COMPRESSED_MOVES', 26159, 0),
+(14333, 'SMSG_COMPRESSED_UPDATE_OBJECT', 57919, 0),
+(14333, 'SMSG_COMSAT_CONNECT_FAIL', 0, 0),
+(14333, 'SMSG_COMSAT_DISCONNECT', 0, 0),
+(14333, 'SMSG_COMSAT_RECONNECT_TRY', 0, 0),
+(14333, 'SMSG_CONTACT_LIST', 48867, 0),
+(14333, 'SMSG_CONVERT_RUNE', 41706, 0),
+(14333, 'SMSG_COOLDOWN_CHEAT', 41715, 0),
+(14333, 'SMSG_COOLDOWN_EVENT', 63219, 0),
+(14333, 'SMSG_CORPSE_MAP_POSITION_QUERY_RESPONSE', 0, 0),
+(14333, 'SMSG_CORPSE_NOT_IN_INSTANCE', 47799, 0),
+(14333, 'SMSG_CORPSE_RECLAIM_DELAY', 63011, 0),
+(14333, 'SMSG_CREATURE_QUERY_RESPONSE', 43623, 0),
+(14333, 'SMSG_CRITERIA_DELETED', 61991, 0),
+(14333, 'SMSG_CRITERIA_UPDATE', 41719, 0),
+(14333, 'SMSG_CROSSED_INEBRIATION_THRESHOLD', 9983, 0),
+(14333, 'SMSG_CUF_PROFILES_LOAD', 53027, 0),
+(14333, 'SMSG_DAMAGE_CALC_LOG', 27375, 0),
+(14333, 'SMSG_DAMAGE_DONE_OBSOLETE', 0, 0),
+(14333, 'SMSG_DANCE_QUERY_RESPONSE', 16123, 0),
+(14333, 'SMSG_DEATH_RELEASE_LOC', 45691, 0),
+(14333, 'SMSG_DEBUGAURAPROC', 0, 0),
+(14333, 'SMSG_DEBUG_LIST_TARGETS', 0, 0),
+(14333, 'SMSG_DEFENSE_MESSAGE', 63158, 0),
+(14333, 'SMSG_DESTROY_OBJECT', 65214, 0),
+(14333, 'SMSG_DESTRUCTIBLE_BUILDING_DAMAGE', 47726, 0),
+(14333, 'SMSG_DISMOUNT', 9787, 0),
+(14333, 'SMSG_DISMOUNTRESULT', 9903, 0),
+(14333, 'SMSG_DISPEL_FAILED', 42738, 0),
+(14333, 'SMSG_DUEL_COMPLETE', 46846, 0),
+(14333, 'SMSG_DUEL_COUNTDOWN', 32371, 0),
+(14333, 'SMSG_DUEL_INBOUNDS', 60006, 0),
+(14333, 'SMSG_DUEL_OUTOFBOUNDS', 47730, 0),
+(14333, 'SMSG_DUEL_REQUESTED', 43630, 0),
+(14333, 'SMSG_DUEL_WINNER', 15090, 0),
+(14333, 'SMSG_DUMP_OBJECTS_DATA', 0, 0),
+(14333, 'SMSG_DURABILITY_DAMAGE_DEATH', 48806, 0),
+(14333, 'SMSG_DYNAMIC_DROP_ROLL_RESULT', 0, 0),
+(14333, 'SMSG_ECHO_PARTY_SQUELCH', 10874, 0),
+(14333, 'SMSG_EMOTE', 30462, 0),
+(14333, 'SMSG_ENABLE_BARBER_SHOP', 13946, 0),
+(14333, 'SMSG_ENCHANTMENTLOG', 42670, 0),
+(14333, 'SMSG_ENVIRONMENTALDAMAGELOG', 28390, 0),
+(14333, 'SMSG_EQUIPMENT_SET_LIST', 15918, 0),
+(14333, 'SMSG_EQUIPMENT_SET_SAVED', 30374, 0),
+(14333, 'SMSG_EQUIPMENT_SET_USE_RESULT', 29311, 0),
+(14333, 'SMSG_EXPECTED_SPAM_RECORDS', 44723, 0),
+(14333, 'SMSG_EXPLORATION_EXPERIENCE', 42602, 0),
+(14333, 'SMSG_FEATURE_SYSTEM_STATUS', 8033, 0),
+(14333, 'SMSG_FEIGN_DEATH_RESISTED', 47659, 0),
+(14333, 'SMSG_FISH_ESCAPED', 27391, 0),
+(14333, 'SMSG_FISH_NOT_HOOKED', 60079, 0),
+(14333, 'SMSG_FLIGHT_SPLINE_SYNC', 65266, 0),
+(14333, 'SMSG_FORCEACTIONSHOW', 31466, 0),
+(14333, 'SMSG_FORCED_DEATH_UPDATE', 27322, 0),
+(14333, 'SMSG_FORCE_DISPLAY_UPDATE', 8878, 0),
+(14333, 'SMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE', 0, 0),
+(14333, 'SMSG_FORCE_FLIGHT_SPEED_CHANGE', 0, 0),
+(14333, 'SMSG_FORCE_MOVE_ROOT', 0, 0),
+(14333, 'SMSG_FORCE_MOVE_UNROOT', 0, 0),
+(14333, 'SMSG_FORCE_PITCH_RATE_CHANGE', 0, 0),
+(14333, 'SMSG_FORCE_RUN_BACK_SPEED_CHANGE', 0, 0),
+(14333, 'SMSG_FORCE_RUN_SPEED_CHANGE', 0, 0),
+(14333, 'SMSG_FORCE_SEND_QUEUED_PACKETS', 3088, 0),
+(14333, 'SMSG_FORCE_SWIM_BACK_SPEED_CHANGE', 0, 0),
+(14333, 'SMSG_FORCE_SWIM_SPEED_CHANGE', 0, 0),
+(14333, 'SMSG_FORCE_TURN_RATE_CHANGE', 0, 0),
+(14333, 'SMSG_FORCE_UNK1_SPEED_CHANGE', 0, 0),
+(14333, 'SMSG_FORCE_UNK2_SPEED_CHANGE', 0, 0),
+(14333, 'SMSG_FORCE_WALK_SPEED_CHANGE', 0, 0),
+(14333, 'SMSG_FRIEND_STATUS', 16062, 0),
+(14333, 'SMSG_GAMEOBJECT_CUSTOM_ANIM', 0, 0),
+(14333, 'SMSG_GAMEOBJECT_DESPAWN_ANIM', 13047, 0),
+(14333, 'SMSG_GAMEOBJECT_PAGETEXT', 32506, 0),
+(14333, 'SMSG_GAMEOBJECT_QUERY_RESPONSE', 44735, 0),
+(14333, 'SMSG_GAMEOBJECT_RESET_STATE', 43694, 0),
+(14333, 'SMSG_GAMESPEED_SET', 43698, 0),
+(14333, 'SMSG_GAMETIMEBIAS_SET', 0, 0),
+(14333, 'SMSG_GAMETIME_SET', 45679, 0),
+(14333, 'SMSG_GAMETIME_UPDATE', 27390, 0),
+(14333, 'SMSG_GHOSTEE_GONE', 0, 0),
+(14333, 'SMSG_GMRESPONSE_DB_ERROR', 29290, 0),
+(14333, 'SMSG_GMRESPONSE_RECEIVED', 47718, 0),
+(14333, 'SMSG_GMRESPONSE_STATUS_UPDATE', 16528, 0),
+(14333, 'SMSG_GMTICKET_CREATE', 43759, 0),
+(14333, 'SMSG_GMTICKET_DELETETICKET', 63218, 0),
+(14333, 'SMSG_GMTICKET_GETTICKET', 63083, 0),
+(14333, 'SMSG_GMTICKET_SYSTEMSTATUS', 44606, 0),
+(14333, 'SMSG_GMTICKET_UPDATETEXT', 63019, 0),
+(14333, 'SMSG_GM_MESSAGECHAT', 41570, 0),
+(14333, 'SMSG_GM_TICKET_STATUS_UPDATE', 46778, 0),
+(14333, 'SMSG_GODMODE', 30439, 0),
+(14333, 'SMSG_GOGOGO_OBSOLETE', 0, 0),
+(14333, 'SMSG_GOSSIP_COMPLETE', 63139, 0),
+(14333, 'SMSG_GOSSIP_MESSAGE', 25318, 0),
+(14333, 'SMSG_GOSSIP_POI', 8762, 0),
+(14333, 'SMSG_GROUPACTION_THROTTLED', 0, 0),
+(14333, 'SMSG_GROUP_CANCEL', 42535, 0),
+(14333, 'SMSG_GROUP_DECLINE', 13031, 0),
+(14333, 'SMSG_GROUP_DESTROYED', 27382, 0),
+(14333, 'SMSG_GROUP_INVITE', 0, 0),
+(14333, 'SMSG_GROUP_JOINED_BATTLEGROUND', 34567, 0),
+(14333, 'SMSG_GROUP_LIST', 48819, 0),
+(14333, 'SMSG_GROUP_SET_LEADER', 14947, 0),
+(14333, 'SMSG_GROUP_UNINVITE', 48747, 0),
+(14333, 'SMSG_GUILD_BANK_LIST', 60010, 0),
+(14333, 'SMSG_GUILD_COMMAND_RESULT', 62058, 0),
+(14333, 'SMSG_GUILD_DECLINE', 63151, 0),
+(14333, 'SMSG_GUILD_EVENT', 26226, 0),
+(14333, 'SMSG_GUILD_INFO', 16047, 0),
+(14333, 'SMSG_GUILD_INVITE', 40805, 0),
+(14333, 'SMSG_GUILD_MAX_DAILY_XP', 0, 0),
+(14333, 'SMSG_GUILD_NEWS_UPDATE', 36673, 0),
+(14333, 'SMSG_GUILD_QUERY_RESPONSE', 30435, 0),
+(14333, 'SMSG_GUILD_RANK', 3845, 0),
+(14333, 'SMSG_GUILD_RANKS_UPDATE', 0, 0),
+(14333, 'SMSG_GUILD_REWARDS_LIST', 49923, 0),
+(14333, 'SMSG_GUILD_ROSTER', 6983, 0),
+(14333, 'SMSG_GUILD_TRADESKILL_UPDATE', 835, 0),
+(14333, 'SMSG_GUILD_UPDATE_ROSTER', 0, 0),
+(14333, 'SMSG_GUILD_XP_UPDATE', 0, 0),
+(14333, 'SMSG_HEALTH_UPDATE', 46698, 0),
+(14333, 'SMSG_HIGHEST_THREAT_UPDATE', 13995, 0),
+(14333, 'SMSG_IGNORE_DIMINISHING_RETURNS_CHEAT', 0, 0),
+(14333, 'SMSG_IGNORE_REQUIREMENTS_CHEAT', 0, 0),
+(14333, 'SMSG_INITIALIZE_FACTIONS', 14890, 0),
+(14333, 'SMSG_INITIAL_SPELLS', 63150, 0),
+(14333, 'SMSG_INIT_CURRENCY', 49987, 0),
+(14333, 'SMSG_INIT_EXTRA_AURA_INFO_OBSOLETE', 0, 0),
+(14333, 'SMSG_INIT_WORLD_STATES', 32439, 0),
+(14333, 'SMSG_INSPECT', 47742, 0),
+(14333, 'SMSG_INSPECT_HONOR_STATS', 53025, 0),
+(14333, 'SMSG_INSPECT_TALENT', 60151, 0),
+(14333, 'SMSG_INSTANCE_DIFFICULTY', 0, 0),
+(14333, 'SMSG_INSTANCE_LOCK_WARNING_QUERY', 0, 0),
+(14333, 'SMSG_INSTANCE_RESET', 46771, 0),
+(14333, 'SMSG_INSTANCE_RESET_FAILED', 12907, 0),
+(14333, 'SMSG_INSTANCE_SAVE_CREATED', 44587, 0),
+(14333, 'SMSG_INVALIDATE_DANCE', 8874, 0),
+(14333, 'SMSG_INVALIDATE_PLAYER', 41727, 0),
+(14333, 'SMSG_INVALID_PROMOTION_CODE', 27171, 0),
+(14333, 'SMSG_INVENTORY_CHANGE_FAILURE', 13986, 0),
+(14333, 'SMSG_ITEM_COOLDOWN', 63230, 0),
+(14333, 'SMSG_ITEM_ENCHANT_TIME_UPDATE', 13866, 0),
+(14333, 'SMSG_ITEM_NAME_QUERY_RESPONSE', 64103, 0),
+(14333, 'SMSG_ITEM_PUSH_RESULT', 42659, 0),
+(14333, 'SMSG_ITEM_QUERY_MULTIPLE_RESPONSE', 0, 0),
+(14333, 'SMSG_ITEM_QUERY_SINGLE_RESPONSE', 0, 0),
+(14333, 'SMSG_ITEM_REFUND_INFO_RESPONSE', 56067, 0),
+(14333, 'SMSG_ITEM_REFUND_RESULT', 34661, 0),
+(14333, 'SMSG_ITEM_TEXT_QUERY_RESPONSE', 31294, 0),
+(14333, 'SMSG_ITEM_TIME_UPDATE', 30270, 0),
+(14333, 'SMSG_JOINED_BATTLEGROUND_QUEUE', 56065, 0),
+(14333, 'SMSG_KICK_REASON', 43574, 0),
+(14333, 'SMSG_LEARNED_DANCE_MOVES', 42731, 0),
+(14333, 'SMSG_LEARNED_SPELL', 13862, 0),
+(14333, 'SMSG_LEVELUP_INFO', 58030, 0),
+(14333, 'SMSG_LFG_BOOT_PROPOSAL_UPDATE', 62007, 0),
+(14333, 'SMSG_LFG_DISABLED', 44799, 0),
+(14333, 'SMSG_LFG_JOIN_RESULT', 13930, 0),
+(14333, 'SMSG_LFG_OFFER_CONTINUE', 43774, 0),
+(14333, 'SMSG_LFG_OPEN_FROM_GOSSIP', 44794, 0),
+(14333, 'SMSG_LFG_PARTY_INFO', 44714, 0),
+(14333, 'SMSG_LFG_PLAYER_INFO', 60095, 0),
+(14333, 'SMSG_LFG_PLAYER_REWARD', 8886, 0),
+(14333, 'SMSG_LFG_PROPOSAL_UPDATE', 64226, 0),
+(14333, 'SMSG_LFG_QUEUE_STATUS', 28278, 0),
+(14333, 'SMSG_LFG_ROLE_CHECK_UPDATE', 9891, 0),
+(14333, 'SMSG_LFG_ROLE_CHOSEN', 10935, 0),
+(14333, 'SMSG_LFG_TELEPORT_DENIED', 59059, 0),
+(14333, 'SMSG_LFG_UPDATE_LIST', 26227, 0),
+(14333, 'SMSG_LFG_UPDATE_PARTY', 26222, 0),
+(14333, 'SMSG_LFG_UPDATE_PLAYER', 31271, 0),
+(14333, 'SMSG_LIST_INVENTORY', 52035, 0),
+(14333, 'SMSG_LOGIN_SETTIMESPEED', 30319, 0),
+(14333, 'SMSG_LOGIN_VERIFY_WORLD', 47735, 0),
+(14333, 'SMSG_LOGOUT_CANCEL_ACK', 43575, 0),
+(14333, 'SMSG_LOGOUT_COMPLETE', 41599, 0),
+(14333, 'SMSG_LOGOUT_RESPONSE', 25274, 0),
+(14333, 'SMSG_LOG_XPGAIN', 61050, 0),
+(14333, 'SMSG_LOOT_ALL_PASSED', 29218, 0),
+(14333, 'SMSG_LOOT_CLEAR_MONEY', 43706, 0),
+(14333, 'SMSG_LOOT_ITEM_NOTIFY', 65271, 0),
+(14333, 'SMSG_LOOT_LIST', 45739, 0),
+(14333, 'SMSG_LOOT_MASTER_LIST', 41662, 0),
+(14333, 'SMSG_LOOT_MONEY_NOTIFY', 46647, 0),
+(14333, 'SMSG_LOOT_RELEASE_RESPONSE', 63086, 0),
+(14333, 'SMSG_LOOT_REMOVED', 12927, 0),
+(14333, 'SMSG_LOOT_RESPONSE', 63075, 0),
+(14333, 'SMSG_LOOT_ROLL', 28211, 0),
+(14333, 'SMSG_LOOT_ROLL_WON', 10922, 0),
+(14333, 'SMSG_LOOT_SLOT_CHANGED', 12027, 0),
+(14333, 'SMSG_LOOT_START_ROLL', 29226, 0),
+(14333, 'SMSG_LOTTERY_QUERY_RESULT_OBSOLETE', 0, 0),
+(14333, 'SMSG_LOTTERY_RESULT_OBSOLETE', 0, 0),
+(14333, 'SMSG_MAIL_LIST_RESULT', 63034, 0),
+(14333, 'SMSG_MEETINGSTONE_COMPLETE', 64106, 0),
+(14333, 'SMSG_MEETINGSTONE_IN_PROGRESS', 11898, 0),
+(14333, 'SMSG_MEETINGSTONE_MEMBER_ADDED', 15086, 0),
+(14333, 'SMSG_MEETINGSTONE_SETQUEUE', 14906, 0),
+(14333, 'SMSG_MESSAGECHAT', 27178, 0),
+(14333, 'SMSG_MINIGAME_MOVE_FAILED', 0, 0),
+(14333, 'SMSG_MINIGAME_SETUP', 62071, 0),
+(14333, 'SMSG_MINIGAME_STATE', 0, 0),
+(14333, 'SMSG_MIRRORIMAGE_DATA', 10859, 0),
+(14333, 'SMSG_MODIFY_COOLDOWN', 9979, 0),
+(14333, 'SMSG_MONSTER_MOVE', 43750, 0),
+(14333, 'SMSG_MONSTER_MOVE_TRANSPORT', 45754, 0),
+(14333, 'SMSG_MOTD', 59131, 0),
+(14333, 'SMSG_MOUNTRESULT', 61170, 0),
+(14333, 'SMSG_MOUNTSPECIAL_ANIM', 8947, 0),
+(14333, 'SMSG_MOVE_ABANDON_TRANSPORT', 0, 0),
+(14333, 'SMSG_MOVE_FEATHER_FALL', 0, 0),
+(14333, 'SMSG_MOVE_KNOCK_BACK', 0, 0),
+(14333, 'SMSG_MOVE_LAND_WALK', 0, 0),
+(14333, 'SMSG_MOVE_LEVITATING', 0, 0),
+(14333, 'SMSG_MOVE_NORMAL_FALL', 0, 0),
+(14333, 'SMSG_MOVE_SET_CAN_FLY', 0, 0),
+(14333, 'SMSG_MOVE_SET_FLIGHT', 0, 0),
+(14333, 'SMSG_MOVE_SET_HOVER', 0, 0),
+(14333, 'SMSG_MOVE_SET_WALK_IN_AIR', 0, 0),
+(14333, 'SMSG_MOVE_UNSET_CAN_FLY', 0, 0),
+(14333, 'SMSG_MOVE_UNSET_FLIGHT', 0, 0),
+(14333, 'SMSG_MOVE_UNSET_HOVER', 0, 0),
+(14333, 'SMSG_MOVE_UNSET_WALK_IN_AIR', 0, 0),
+(14333, 'SMSG_MOVE_WATER_WALK', 0, 0),
+(14333, 'SMSG_MULTIPLE_PACKETS', 10870, 0),
+(14333, 'SMSG_NAME_QUERY_RESPONSE', 64103, 0),
+(14333, 'SMSG_NEW_TAXI_PATH', 27302, 0),
+(14333, 'SMSG_NEW_WORLD', 0, 0),
+(14333, 'SMSG_NOTIFICATION', 30375, 0),
+(14333, 'SMSG_NOTIFY_DANCE', 9778, 0),
+(14333, 'SMSG_NOTIFY_DEST_LOC_SPELL_CAST', 8826, 0),
+(14333, 'SMSG_NPC_TEXT_UPDATE', 11007, 0),
+(14333, 'SMSG_NPC_WONT_TALK', 0, 0),
+(14333, 'SMSG_OFFER_PETITION_ERROR', 9851, 0),
+(14333, 'SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA', 8890, 0),
+(14333, 'SMSG_OPEN_CONTAINER', 0, 0),
+(14333, 'SMSG_OVERRIDE_LIGHT', 14902, 0),
+(14333, 'SMSG_PAGE_TEXT_QUERY_RESPONSE', 30255, 0),
+(14333, 'SMSG_PARTYKILLLOG', 12918, 0),
+(14333, 'SMSG_PARTY_COMMAND_RESULT', 62191, 0),
+(14333, 'SMSG_PARTY_MEMBER_STATS', 45755, 0),
+(14333, 'SMSG_PARTY_MEMBER_STATS_FULL', 10938, 0),
+(14333, 'SMSG_PAUSE_MIRROR_TIMER', 41711, 0),
+(14333, 'SMSG_PERIODICAURALOG', 41635, 0),
+(14333, 'SMSG_PETGODMODE', 29434, 0),
+(14333, 'SMSG_PETITION_QUERY_RESPONSE', 15031, 0),
+(14333, 'SMSG_PETITION_SHOWLIST', 29354, 0),
+(14333, 'SMSG_PETITION_SHOW_SIGNATURES', 64187, 0),
+(14333, 'SMSG_PETITION_SIGN_RESULTS', 28271, 0),
+(14333, 'SMSG_PET_ACTION_FEEDBACK', 27259, 0),
+(14333, 'SMSG_PET_ACTION_SOUND', 25339, 0),
+(14333, 'SMSG_PET_BROKEN', 65082, 0),
+(14333, 'SMSG_PET_CAST_FAILED', 60074, 0),
+(14333, 'SMSG_PET_DISMISS_SOUND', 16115, 0),
+(14333, 'SMSG_PET_GUIDS', 60975, 0),
+(14333, 'SMSG_PET_LEARNED_SPELL', 62059, 0),
+(14333, 'SMSG_PET_MODE', 60966, 0),
+(14333, 'SMSG_PET_NAME_INVALID', 0, 0),
+(14333, 'SMSG_PET_NAME_QUERY_RESPONSE', 31482, 0),
+(14333, 'SMSG_PET_REMOVED_SPELL', 48870, 0),
+(14333, 'SMSG_PET_RENAMEABLE', 11839, 0),
+(14333, 'SMSG_PET_SPELLS', 26275, 0),
+(14333, 'SMSG_PET_TAME_FAILURE', 16054, 0),
+(14333, 'SMSG_PET_UNLEARN_CONFIRM', 0, 0),
+(14333, 'SMSG_PET_UPDATE_COMBO_POINTS', 41702, 0),
+(14333, 'SMSG_PLAYED_TIME', 11938, 0),
+(14333, 'SMSG_PLAYERBINDERROR', 41579, 0),
+(14333, 'SMSG_PLAYERBOUND', 28334, 0),
+(14333, 'SMSG_PLAYER_DIFFICULTY_CHANGE', 32431, 0),
+(14333, 'SMSG_PLAYER_MOVE', 21313, 0),
+(14333, 'SMSG_PLAYER_SKINNED', 64246, 0),
+(14333, 'SMSG_PLAYER_VEHICLE_DATA', 64107, 0),
+(14333, 'SMSG_PLAY_DANCE', 12979, 0),
+(14333, 'SMSG_PLAY_MUSIC', 0, 0),
+(14333, 'SMSG_PLAY_OBJECT_SOUND', 61995, 0),
+(14333, 'SMSG_PLAY_SOUND', 9762, 0),
+(14333, 'SMSG_PLAY_SPELL_IMPACT', 0, 0),
+(14333, 'SMSG_PLAY_SPELL_VISUAL', 0, 0),
+(14333, 'SMSG_PLAY_TIME_WARNING', 60134, 0),
+(14333, 'SMSG_PONG', 3216, 0),
+(14333, 'SMSG_POWER_UPDATE', 46782, 0),
+(14333, 'SMSG_PRE_RESURRECT', 9966, 0),
+(14333, 'SMSG_PROCRESIST', 47843, 0),
+(14333, 'SMSG_PROPOSE_LEVEL_GRANT', 0, 0),
+(14333, 'SMSG_PUREMOUNT_CANCELLED_OBSOLETE', 0, 0),
+(14333, 'SMSG_PVP_CREDIT', 26155, 0),
+(14333, 'SMSG_QUERY_QUESTS_COMPLETED_RESPONSE', 31486, 0),
+(14333, 'SMSG_QUERY_TIME_RESPONSE', 15091, 0),
+(14333, 'SMSG_QUESTGIVER_OFFER_REWARD', 59043, 0),
+(14333, 'SMSG_QUESTGIVER_QUEST_COMPLETE', 4867, 0),
+(14333, 'SMSG_QUESTGIVER_QUEST_DETAILS', 62054, 0),
+(14333, 'SMSG_QUESTGIVER_QUEST_FAILED', 59134, 0),
+(14333, 'SMSG_QUESTGIVER_QUEST_INVALID', 0, 0),
+(14333, 'SMSG_QUESTGIVER_QUEST_LIST', 31462, 0),
+(14333, 'SMSG_QUESTGIVER_REQUEST_ITEMS', 15990, 0),
+(14333, 'SMSG_QUESTGIVER_STATUS', 26363, 0),
+(14333, 'SMSG_QUESTGIVER_STATUS_MULTIPLE', 28219, 0),
+(14333, 'SMSG_QUESTLOG_FULL', 57955, 0),
+(14333, 'SMSG_QUESTUPDATE_ADD_ITEM', 0, 0),
+(14333, 'SMSG_QUESTUPDATE_ADD_KILL', 46714, 0),
+(14333, 'SMSG_QUESTUPDATE_ADD_PVP_KILL', 29310, 0),
+(14333, 'SMSG_QUESTUPDATE_COMPLETE', 14963, 0),
+(14333, 'SMSG_QUESTUPDATE_FAILED', 60087, 0),
+(14333, 'SMSG_QUESTUPDATE_FAILEDTIMER', 47863, 0),
+(14333, 'SMSG_QUEST_CONFIRM_ACCEPT', 8879, 0),
+(14333, 'SMSG_QUEST_FORCE_REMOVED', 10874, 0),
+(14333, 'SMSG_QUEST_POI_QUERY_RESPONSE', 26175, 0),
+(14333, 'SMSG_QUEST_QUERY_RESPONSE', 44771, 0),
+(14333, 'SMSG_RAID_GROUP_ONLY', 0, 0),
+(14333, 'SMSG_RAID_INSTANCE_INFO', 0, 0),
+(14333, 'SMSG_RAID_INSTANCE_MESSAGE', 26231, 0),
+(14333, 'SMSG_RAID_READY_CHECK_ERROR', 0, 0),
+(14333, 'SMSG_READ_ITEM_FAILED', 28391, 0),
+(14333, 'SMSG_READ_ITEM_OK', 46823, 0),
+(14333, 'SMSG_REALM_SPLIT', 26924, 0),
+(14333, 'SMSG_REAL_GROUP_UPDATE', 42607, 0),
+(14333, 'SMSG_RECEIVED_MAIL', 32491, 0),
+(14333, 'SMSG_REDIRECT_CLIENT', 1040, 0),
+(14333, 'SMSG_REFER_A_FRIEND_FAILURE', 26303, 0),
+(14333, 'SMSG_REMOVED_SPELL', 31478, 0),
+(14333, 'SMSG_REPORT_PVP_AFK_RESULT', 30378, 0),
+(14333, 'SMSG_RESET_FAILED_NOTIFY', 0, 0),
+(14333, 'SMSG_RESISTLOG', 0, 0),
+(14333, 'SMSG_RESPOND_INSPECT_ACHIEVEMENTS', 0, 0),
+(14333, 'SMSG_RESURRECT_FAILED', 0, 0),
+(14333, 'SMSG_RESURRECT_REQUEST', 12846, 0),
+(14333, 'SMSG_RESYNC_RUNES', 0, 0),
+(14333, 'SMSG_RWHOIS', 58938, 0),
+(14333, 'SMSG_SCRIPT_MESSAGE', 0, 0),
+(14333, 'SMSG_SELL_ITEM', 0, 0),
+(14333, 'SMSG_SEND_MAIL_RESULT', 42750, 0),
+(14333, 'SMSG_SEND_QUEUED_PACKETS', 0, 0),
+(14333, 'SMSG_SEND_UNLEARN_SPELLS', 43746, 0),
+(14333, 'SMSG_SERVERTIME', 29238, 0),
+(14333, 'SMSG_SERVER_BUCK_DATA', 0, 0),
+(14333, 'SMSG_SERVER_BUCK_DATA_START', 0, 0),
+(14333, 'SMSG_SERVER_FIRST_ACHIEVEMENT', 61055, 0),
+(14333, 'SMSG_SERVER_INFO_RESPONSE', 0, 0),
+(14333, 'SMSG_SERVER_MESSAGE', 58927, 0),
+(14333, 'SMSG_SET_EXTRA_AURA_INFO_NEED_UPDATE_OBSOLETE', 0, 0),
+(14333, 'SMSG_SET_EXTRA_AURA_INFO_OBSOLETE', 0, 0),
+(14333, 'SMSG_SET_FACTION_ATWAR', 31422, 0),
+(14333, 'SMSG_SET_FACTION_STANDING', 9963, 0),
+(14333, 'SMSG_SET_FACTION_VISIBLE', 28394, 0),
+(14333, 'SMSG_SET_FLAT_SPELL_MODIFIER', 46827, 0),
+(14333, 'SMSG_SET_FORCED_REACTIONS', 16098, 0),
+(14333, 'SMSG_SET_PCT_SPELL_MODIFIER', 64175, 0),
+(14333, 'SMSG_SET_PHASE_SHIFT', 56069, 0),
+(14333, 'SMSG_SET_PLAYER_DECLINED_NAMES_RESULT', 0, 0),
+(14333, 'SMSG_SET_PROFICIENCY', 32486, 0),
+(14333, 'SMSG_SET_PROJECTILE_POSITION', 64035, 0),
+(14333, 'SMSG_SHOWTAXINODES', 43647, 0),
+(14333, 'SMSG_SHOW_BANK', 60070, 0),
+(14333, 'SMSG_SPELLBREAKLOG', 61182, 0),
+(14333, 'SMSG_SPELLDAMAGESHIELD', 30446, 0),
+(14333, 'SMSG_SPELLDISPELLOG', 0, 0),
+(14333, 'SMSG_SPELLENERGIZELOG', 31274, 0),
+(14333, 'SMSG_SPELLHEALLOG', 63091, 0),
+(14333, 'SMSG_SPELLINSTAKILLLOG', 25342, 0),
+(14333, 'SMSG_SPELLLOGEXECUTE', 57891, 0),
+(14333, 'SMSG_SPELLLOGMISS', 30243, 0),
+(14333, 'SMSG_SPELLNONMELEEDAMAGELOG', 45742, 0),
+(14333, 'SMSG_SPELLORDAMAGE_IMMUNE', 58914, 0),
+(14333, 'SMSG_SPELLSTEALLOG', 0, 0),
+(14333, 'SMSG_SPELL_CHANCE_PROC_LOG', 0, 0),
+(14333, 'SMSG_SPELL_CHANCE_RESIST_PUSHBACK', 0, 0),
+(14333, 'SMSG_SPELL_COOLDOWN', 29303, 0),
+(14333, 'SMSG_SPELL_DELAYED', 46646, 0),
+(14333, 'SMSG_SPELL_FAILED_OTHER', 12007, 0),
+(14333, 'SMSG_SPELL_FAILURE', 8955, 0),
+(14333, 'SMSG_SPELL_GO', 10791, 0),
+(14333, 'SMSG_SPELL_START', 42546, 0),
+(14333, 'SMSG_SPELL_UPDATE_CHAIN_TARGETS', 26214, 0),
+(14333, 'SMSG_SPIRIT_HEALER_CONFIRM', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_FEATHER_FALL', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_LAND_WALK', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_NORMAL_FALL', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_ROOT', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_SET_FLYING', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_SET_HOVER', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_SET_RUN_MODE', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_SET_WALK_MODE', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_START_SWIM', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_STOP_SWIM', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_UNKNOWN_1235', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_UNKNOWN_1236', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_UNROOT', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_UNSET_FLYING', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_UNSET_HOVER', 0, 0),
+(14333, 'SMSG_SPLINE_MOVE_WATER_WALK', 0, 0),
+(14333, 'SMSG_SPLINE_SET_FLIGHT_BACK_SPEED', 0, 0),
+(14333, 'SMSG_SPLINE_SET_FLIGHT_SPEED', 0, 0),
+(14333, 'SMSG_SPLINE_SET_PITCH_RATE', 0, 0),
+(14333, 'SMSG_SPLINE_SET_RUN_BACK_SPEED', 0, 0),
+(14333, 'SMSG_SPLINE_SET_RUN_SPEED', 0, 0),
+(14333, 'SMSG_SPLINE_SET_SWIM_BACK_SPEED', 0, 0);
+
+INSERT INTO `opcodes` (`version`, `name`, `value`, `flags`) VALUES
+(14333, 'SMSG_SPLINE_SET_SWIM_SPEED', 0, 0),
+(14333, 'SMSG_SPLINE_SET_TURN_RATE', 0, 0),
+(14333, 'SMSG_SPLINE_SET_WALK_SPEED', 0, 0),
+(14333, 'SMSG_STABLE_RESULT', 59958, 0),
+(14333, 'SMSG_STANDSTATE_CHANGE_FAILURE_OBSOLETE', 59135, 0),
+(14333, 'SMSG_STANDSTATE_UPDATE', 58102, 0),
+(14333, 'SMSG_START_MIRROR_TIMER', 43687, 0),
+(14333, 'SMSG_STOP_DANCE', 29375, 0),
+(14333, 'SMSG_STOP_MIRROR_TIMER', 46654, 0),
+(14333, 'SMSG_SUMMON_CANCEL', 0, 0),
+(14333, 'SMSG_SUMMON_REQUEST', 8959, 0),
+(14333, 'SMSG_SUPERCEDED_SPELL', 15934, 0),
+(14333, 'SMSG_TALENTS_INFO', 47807, 0),
+(14333, 'SMSG_TALENTS_INVOLUNTARILY_RESET', 0, 0),
+(14333, 'SMSG_TAXINODE_STATUS', 8810, 0),
+(14333, 'SMSG_TEXT_EMOTE', 9967, 0),
+(14333, 'SMSG_THREAT_CLEAR', 14966, 0),
+(14333, 'SMSG_THREAT_REMOVE', 30246, 0),
+(14333, 'SMSG_THREAT_UPDATE', 11879, 0),
+(14333, 'SMSG_TIME_SYNC_REQ', 0, 0),
+(14333, 'SMSG_TITLE_EARNED', 44730, 0),
+(14333, 'SMSG_TOGGLE_XP_GAIN', 27318, 0),
+(14333, 'SMSG_TOTEM_CREATED', 29239, 0),
+(14333, 'SMSG_TRADE_STATUS', 56161, 0),
+(14333, 'SMSG_TRADE_STATUS_EXTENDED', 57127, 0),
+(14333, 'SMSG_TRAINER_BUY_RESULT', 58087, 0),
+(14333, 'SMSG_TRAINER_LIST', 26210, 0),
+(14333, 'SMSG_TRANSFER_ABORTED', 26287, 0),
+(14333, 'SMSG_TRANSFER_PENDING', 9962, 0),
+(14333, 'SMSG_TRIGGER_CINEMATIC', 41726, 0),
+(14333, 'SMSG_TRIGGER_MOVIE', 25210, 0),
+(14333, 'SMSG_TURN_IN_PETITION_RESULTS', 26286, 0),
+(14333, 'SMSG_TUTORIAL_FLAGS', 32370, 0),
+(14333, 'SMSG_UNIT_SPELLCAST_START', 47786, 0),
+(14333, 'SMSG_UNKNOWN_1240', 0, 0),
+(14333, 'SMSG_UNKNOWN_1276', 0, 0),
+(14333, 'SMSG_UNKNOWN_1295', 0, 0),
+(14333, 'SMSG_UNKNOWN_1302', 0, 0),
+(14333, 'SMSG_UNKNOWN_1304', 0, 0),
+(14333, 'SMSG_UNKNOWN_1308', 0, 0),
+(14333, 'SMSG_UNKNOWN_1310', 0, 0),
+(14333, 'SMSG_UNKNOWN_1311', 0, 0),
+(14333, 'SMSG_UNKNOWN_1312', 0, 0),
+(14333, 'SMSG_UNKNOWN_1314', 0, 0),
+(14333, 'SMSG_UNKNOWN_1315', 0, 0),
+(14333, 'SMSG_UNKNOWN_1316', 0, 0),
+(14333, 'SMSG_UNKNOWN_1317', 0, 0),
+(14333, 'SMSG_UNKNOWN_1329', 0, 0),
+(14333, 'SMSG_UPDATE_ACCOUNT_DATA', 43622, 0),
+(14333, 'SMSG_UPDATE_ACCOUNT_DATA_COMPLETE', 27183, 0),
+(14333, 'SMSG_UPDATE_COMBO_POINTS', 48755, 0),
+(14333, 'SMSG_UPDATE_CURRENCY', 54051, 0),
+(14333, 'SMSG_UPDATE_CURRENCY_WEEK_LIMIT', 0, 0),
+(14333, 'SMSG_UPDATE_INSTANCE_ENCOUNTER_UNIT', 16114, 0),
+(14333, 'SMSG_UPDATE_INSTANCE_OWNERSHIP', 31275, 0),
+(14333, 'SMSG_UPDATE_ITEM_ENCHANTMENTS', 14010, 0),
+(14333, 'SMSG_UPDATE_LAST_INSTANCE', 43570, 0),
+(14333, 'SMSG_UPDATE_LFG_LIST', 60983, 0),
+(14333, 'SMSG_UPDATE_OBJECT', 29351, 0),
+(14333, 'SMSG_UPDATE_WORLD_STATE', 0, 0),
+(14333, 'SMSG_USERLIST_ADD', 46719, 0),
+(14333, 'SMSG_USERLIST_REMOVE', 58086, 0),
+(14333, 'SMSG_USERLIST_UPDATE', 47847, 0),
+(14333, 'SMSG_VOICESESSION_FULL', 0, 0),
+(14333, 'SMSG_VOICE_CHAT_STATUS', 11946, 0),
+(14333, 'SMSG_VOICE_PARENTAL_CONTROLS', 46826, 0),
+(14333, 'SMSG_VOICE_SESSION_ADJUST_PRIORITY', 0, 0),
+(14333, 'SMSG_VOICE_SESSION_ENABLE', 0, 0),
+(14333, 'SMSG_VOICE_SESSION_LEAVE', 59943, 0),
+(14333, 'SMSG_VOICE_SESSION_ROSTER_UPDATE', 63078, 0),
+(14333, 'SMSG_VOICE_SET_TALKER_MUTED', 46754, 0),
+(14333, 'SMSG_WARDEN_DATA', 31286, 0),
+(14333, 'SMSG_WEATHER', 65066, 0),
+(14333, 'SMSG_WHO', 8763, 0),
+(14333, 'SMSG_WHOIS', 43638, 0),
+(14333, 'SMSG_WORLD_STATE_UI_TIMER_UPDATE', 0, 0),
+(14333, 'SMSG_ZONE_UNDER_ATTACK', 65138, 0),
+(14333, 'NUM_MSG_TYPES',0x0,1);
diff --git a/sql_mr/Opcodes/opcodes_mangos_15595.sql b/sql_mr/Opcodes/opcodes_mangos_15595.sql
new file mode 100644
index 00000000000..63cb6e6f817
--- /dev/null
+++ b/sql_mr/Opcodes/opcodes_mangos_15595.sql
@@ -0,0 +1,1401 @@
+-- Opcode table for client build 15595
+
+CREATE TABLE IF NOT EXISTS `opcodes` (
+    `version` smallint(5) NOT NULL COMMENT "Client build",
+    `name` varchar(64) NOT NULL COMMENT "opcode name",
+    `value` int(10) NOT NULL COMMENT "opcode value",
+    `flags` int(10) unsigned NOT NULL DEFAULT "0" COMMENT "current opcode flags",
+    UNIQUE KEY `version` (`version`,`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT="Universal opcode storage";
+
+DELETE FROM `opcodes` WHERE `version` = 15595;
+
+INSERT INTO `opcodes` (`name`, `value`, `version`, `flags`) VALUES
+("MSG_WOW_CONNECTION",0x4F57,15595,0),
+("SMSG_AUTH_CHALLENGE",0x4542,15595,0),
+("CMSG_AUTH_SESSION",0x0449,15595,0),
+("SMSG_AUTH_RESPONSE",0x5DB6,15595,0),
+("MSG_NULL_ACTION",0x1001,15595,0),
+("CMSG_BOOTME",0x1002,15595,0),
+("CMSG_DBLOOKUP",0x1003,15595,0),
+("SMSG_DBLOOKUP",0x1004,15595,0),
+("CMSG_QUERY_OBJECT_POSITION",0x1005,15595,0),
+("SMSG_QUERY_OBJECT_POSITION",0x1006,15595,0),
+("CMSG_QUERY_OBJECT_ROTATION",0x1007,15595,0),
+("SMSG_QUERY_OBJECT_ROTATION",0x1008,15595,0),
+("CMSG_WORLD_TELEPORT",0x1009,15595,0),
+("CMSG_TELEPORT_TO_UNIT",0x100A,15595,0),
+("CMSG_ZONE_MAP",0x100B,15595,0),
+("SMSG_ZONE_MAP",0x100C,15595,0),
+("CMSG_DEBUG_CHANGECELLZONE",0x100D,15595,0),
+("CMSG_MOVE_CHARACTER_CHEAT",0x100E,15595,0),
+("SMSG_MOVE_CHARACTER_CHEAT",0x100F,15595,0),
+("CMSG_RECHARGE",0x1010,15595,0),
+("CMSG_LEARN_SPELL",0x1011,15595,0),
+("CMSG_CREATEMONSTER",0x1012,15595,0),
+("CMSG_DESTROYMONSTER",0x1013,15595,0),
+("CMSG_CREATEITEM",0x1014,15595,0),
+("CMSG_CREATEGAMEOBJECT",0x1015,15595,0),
+("SMSG_CHECK_FOR_BOTS",0x1016,15595,0),
+("CMSG_MAKEMONSTERATTACKGUID",0x1017,15595,0),
+("CMSG_BOT_DETECTED2",0x1018,15595,0),
+("CMSG_FORCEACTION",0x1019,15595,0),
+("CMSG_FORCEACTIONONOTHER",0x101A,15595,0),
+("CMSG_FORCEACTIONSHOW",0x101B,15595,0),
+("SMSG_FORCEACTIONSHOW",0x101C,15595,0),
+("CMSG_PETGODMODE",0x101D,15595,0),
+("SMSG_PETGODMODE",0x101E,15595,0),
+("SMSG_REFER_A_FRIEND_EXPIRED",0x101F,15595,0),
+("CMSG_WEATHER_SPEED_CHEAT",0x1020,15595,0),
+("CMSG_UNDRESSPLAYER",0x1021,15595,0),
+("CMSG_BEASTMASTER",0x1022,15595,0),
+("CMSG_GODMODE",0x1023,15595,0),
+("SMSG_GODMODE",0x1024,15595,0),
+("CMSG_CHEAT_SETMONEY",0x1025,15595,0),
+("CMSG_LEVEL_CHEAT",0x1026,15595,0),
+("CMSG_PET_LEVEL_CHEAT",0x1027,15595,0),
+("CMSG_SET_WORLDSTATE",0x1028,15595,0),
+("CMSG_COOLDOWN_CHEAT",0x1029,15595,0),
+("CMSG_USE_SKILL_CHEAT",0x102A,15595,0),
+("CMSG_FLAG_QUEST",0x102B,15595,0),
+("CMSG_FLAG_QUEST_FINISH",0x102C,15595,0),
+("CMSG_CLEAR_QUEST",0x102D,15595,0),
+("CMSG_SEND_EVENT",0x102E,15595,0),
+("CMSG_DEBUG_AISTATE",0x102F,15595,0),
+("SMSG_DEBUG_AISTATE",0x1030,15595,0),
+("CMSG_DISABLE_PVP_CHEAT",0x1031,15595,0),
+("CMSG_ADVANCE_SPAWN_TIME",0x1032,15595,0),
+("SMSG_DESTRUCTIBLE_BUILDING_DAMAGE",0x4825,15595,0),
+("CMSG_AUTH_SRP6_BEGIN",0x1034,15595,0),
+("CMSG_AUTH_SRP6_PROOF",0x1035,15595,0),
+("CMSG_AUTH_SRP6_RECODE",0x1036,15595,0),
+("CMSG_CHAR_CREATE",0x4A36,15595,0),
+("CMSG_CHAR_ENUM",0x0502,15595,0),
+("CMSG_CHAR_DELETE",0x6425,15595,0),
+("SMSG_AUTH_SRP6_RESPONSE",0x103A,15595,0),
+("SMSG_CHAR_CREATE",0x2D05,15595,0),
+("SMSG_CHAR_ENUM",0x10B0,15595,0),
+("SMSG_CHAR_DELETE",0x0304,15595,0),
+("CMSG_PLAYER_LOGIN",0x05B1,15595,0),
+("SMSG_NEW_WORLD",0x79B1,15595,0),
+("SMSG_TRANSFER_PENDING",0x18A6,15595,0),
+("SMSG_TRANSFER_ABORTED",0x0537,15595,0),
+("SMSG_CHARACTER_LOGIN_FAILED",0x1042,15595,0),
+("SMSG_LOGIN_SETTIMESPEED",0x4D15,15595,0),
+("SMSG_GAMETIME_UPDATE",0x1044,15595,0),
+("CMSG_GAMETIME_SET",0x1045,15595,0),
+("SMSG_GAMETIME_SET",0x1046,15595,0),
+("CMSG_GAMESPEED_SET",0x1047,15595,0),
+("SMSG_GAMESPEED_SET",0x1048,15595,0),
+("CMSG_SERVERTIME",0x1049,15595,0),
+("SMSG_SERVERTIME",0x104A,15595,0),
+("CMSG_PLAYER_LOGOUT",0x104B,15595,0),
+("CMSG_LOGOUT_REQUEST",0x0A25,15595,0),
+("SMSG_LOGOUT_RESPONSE",0x0524,15595,0),
+("SMSG_LOGOUT_COMPLETE",0x2137,15595,0),
+("CMSG_LOGOUT_CANCEL",0x2324,15595,0),
+("SMSG_LOGOUT_CANCEL_ACK",0x6514,15595,0),
+("CMSG_NAME_QUERY",0x2224,15595,0),
+("SMSG_NAME_QUERY_RESPONSE",0x6E04,15595,0),
+("CMSG_PET_NAME_QUERY",0x6F24,15595,0),
+("SMSG_PET_NAME_QUERY_RESPONSE",0x4C37,15595,0),
+("CMSG_GUILD_QUERY",0x4426,15595,0),
+("SMSG_GUILD_QUERY_RESPONSE",0x0E06,15595,0),
+("CMSG_PAGE_TEXT_QUERY",0x6614,15595,0),
+("SMSG_PAGE_TEXT_QUERY_RESPONSE",0x2B14,15595,0),
+("CMSG_QUEST_QUERY",0x0D06,15595,0),
+("SMSG_QUEST_QUERY_RESPONSE",0x6936,15595,0),
+("CMSG_GAMEOBJECT_QUERY",0x4017,15595,0),
+("SMSG_GAMEOBJECT_QUERY_RESPONSE",0x0915,15595,0),
+("CMSG_CREATURE_QUERY",0x2706,15595,0),
+("SMSG_CREATURE_QUERY_RESPONSE",0x6024,15595,0),
+("CMSG_WHO",0x6C15,15595,0),
+("SMSG_WHO",0x6907,15595,0),
+("CMSG_WHOIS",0x6B05,15595,0),
+("SMSG_WHOIS",0x6917,15595,0),
+("CMSG_CONTACT_LIST",0x4534,15595,0),
+("SMSG_CONTACT_LIST",0x6017,15595,0),
+("SMSG_FRIEND_STATUS",0x0717,15595,0),
+("CMSG_ADD_FRIEND",0x6527,15595,0),
+("CMSG_DEL_FRIEND",0x6A15,15595,0),
+("CMSG_SET_CONTACT_NOTES",0x6135,15595,0),
+("CMSG_ADD_IGNORE",0x4726,15595,0),
+("CMSG_DEL_IGNORE",0x6D26,15595,0),
+("CMSG_GROUP_INVITE",0x0513,15595,0),
+("SMSG_GROUP_INVITE",0x31B2,15595,0),
+("CMSG_GROUP_CANCEL",0x1071,15595,0),
+("SMSG_GROUP_CANCEL",0x1072,15595,0),
+("CMSG_GROUP_INVITE_RESPONSE",0x0410,15595,0),
+("SMSG_GROUP_DECLINE",0x6835,15595,0),
+("CMSG_GROUP_UNINVITE",0x1076,15595,0),
+("CMSG_GROUP_UNINVITE_GUID",0x2E07,15595,0),
+("SMSG_GROUP_UNINVITE",0x0A07,15595,0),
+("CMSG_GROUP_SET_LEADER",0x4C17,15595,0),
+("SMSG_GROUP_SET_LEADER",0x0526,15595,0),
+("CMSG_LOOT_METHOD",0x2F24,15595,0),
+("CMSG_GROUP_DISBAND",0x2804,15595,0),
+("SMSG_GROUP_DESTROYED",0x2207,15595,0),
+("SMSG_GROUP_LIST",0x4C24,15595,0),
+("SMSG_PARTY_MEMBER_STATS",0x2104,15595,0),
+("SMSG_PARTY_COMMAND_RESULT",0x6E07,15595,0),
+("UMSG_UPDATE_GROUP_MEMBERS",0x1081,15595,0),
+("CMSG_GUILD_CREATE",0x1082,15595,0),
+("CMSG_GUILD_INVITE",0x24B0,15595,0),
+("SMSG_GUILD_INVITE",0x14A2,15595,0),
+("CMSG_GUILD_ACCEPT",0x2531,15595,0),
+("CMSG_GUILD_DECLINE",0x3231,15595,0),
+("SMSG_GUILD_DECLINE",0x2C07,15595,0),
+("CMSG_GUILD_INFO",0x1088,15595,0),
+("SMSG_GUILD_INFO",0x1089,15595,0),
+("CMSG_GUILD_ROSTER",0x1226,15595,0),
+("SMSG_GUILD_ROSTER",0x3DA3,15595,0),
+("CMSG_GUILD_PROMOTE",0x1030,15595,0),
+("CMSG_GUILD_SET_RANK",0x3032,15595,0),
+("CMSG_GUILD_SWITCH_RANK",0x1221,15595,0),
+("CMSG_GUILD_DEMOTE",0x1020,15595,0),
+("CMSG_GUILD_LEAVE",0x1021,15595,0),
+("CMSG_GUILD_REMOVE",0x1231,15595,0),
+("CMSG_GUILD_DISBAND",0x3226,15595,0),
+("CMSG_GUILD_LEADER",0x3034,15595,0),
+("CMSG_GUILD_MOTD",0x1035,15595,0),
+("SMSG_GUILD_EVENT",0x0705,15595,0),
+("SMSG_GUILD_COMMAND_RESULT",0x7DB3,15595,0),
+("CMSG_GUILD_AUTO_DECLINE_TOGGLE",0x2034,15595,0),
+("CMSG_GUILD_AUTO_DECLINE",0x1234,15595,0),
+("CMSG_GUILD_QUERY_RANKS",0x1026,15595,0),
+("SMSG_GUILD_QUERY_RANKS_RESULT",0x30B4,15595,0),
+("UMSG_UPDATE_GUILD",0x1095,15595,0),
+("CMSG_MESSAGECHAT_ADDON_BATTLEGROUND",0x0D46,15595,0),
+("CMSG_MESSAGECHAT_ADDON_GUILD",0x0544,15595,0),
+("CMSG_MESSAGECHAT_ADDON_OFFICER",0x3954,15595,0),
+("CMSG_MESSAGECHAT_ADDON_PARTY",0x0546,15595,0),
+("CMSG_MESSAGECHAT_ADDON_RAID",0x1D56,15595,0),
+("CMSG_MESSAGECHAT_ADDON_WHISPER",0x2146,15595,0),
+("CMSG_MESSAGECHAT_AFK",0x0D44,15595,0),
+("CMSG_MESSAGECHAT_BATTLEGROUND",0x2156,15595,0),
+("CMSG_MESSAGECHAT_CHANNEL",0x1D44,15595,0),
+("CMSG_MESSAGECHAT_DND",0x2946,15595,0),
+("CMSG_MESSAGECHAT_EMOTE",0x1156,15595,0),
+("CMSG_MESSAGECHAT_GUILD",0x3956,15595,0),
+("CMSG_MESSAGECHAT_OFFICER",0x1946,15595,0),
+("CMSG_MESSAGECHAT_PARTY",0x1D46,15595,0),
+("CMSG_MESSAGECHAT_RAID",0x2D44,15595,0),
+("CMSG_MESSAGECHAT_RAID_WARNING",0x0944,15595,0),
+("CMSG_MESSAGECHAT_SAY",0x1154,15595,0),
+("CMSG_MESSAGECHAT_WHISPER",0x0D56,15595,0),
+("CMSG_MESSAGECHAT_YELL",0x3544,15595,0),
+("SMSG_MESSAGECHAT",0x2026,15595,0),
+("CMSG_JOIN_CHANNEL",0x0156,15595,0),
+("CMSG_LEAVE_CHANNEL",0x2D56,15595,0),
+("SMSG_CHANNEL_NOTIFY",0x0825,15595,0),
+("CMSG_CHANNEL_LIST",0x1556,15595,0),
+("SMSG_CHANNEL_LIST",0x2214,15595,0),
+("CMSG_CHANNEL_PASSWORD",0x2556,15595,0),
+("CMSG_CHANNEL_SET_OWNER",0x3556,15595,0),
+("CMSG_CHANNEL_OWNER",0x3D44,15595,0),
+("CMSG_CHANNEL_MODERATOR",0x0146,15595,0),
+("CMSG_CHANNEL_UNMODERATOR",0x1954,15595,0),
+("CMSG_CHANNEL_MUTE",0x2554,15595,0),
+("CMSG_CHANNEL_UNMUTE",0x3554,15595,0),
+("CMSG_CHANNEL_INVITE",0x0144,15595,0),
+("CMSG_CHANNEL_KICK",0x3156,15595,0),
+("CMSG_CHANNEL_BAN",0x3D56,15595,0),
+("CMSG_CHANNEL_UNBAN",0x2D46,15595,0),
+("CMSG_CHANNEL_ANNOUNCEMENTS",0x1146,15595,0),
+("CMSG_CHANNEL_MODERATE",0x2944,15595,0),
+("SMSG_UPDATE_OBJECT",0x4715,15595,0),
+("SMSG_DESTROY_OBJECT",0x4724,15595,0),
+("CMSG_USE_ITEM",0x2C06,15595,0),
+("CMSG_OPEN_ITEM",0x6A34,15595,0),
+("CMSG_READ_ITEM",0x2F16,15595,0),
+("SMSG_READ_ITEM_OK",0x2605,15595,0),
+("SMSG_READ_ITEM_FAILED",0x0F16,15595,0),
+("SMSG_ITEM_COOLDOWN",0x4D14,15595,0),
+("CMSG_GAMEOBJ_USE",0x4E17,15595,0),
+("CMSG_DESTROY_ITEMS",0x10B3,15595,0),
+("SMSG_GAMEOBJECT_CUSTOM_ANIM",0x10B4,15595,0),
+("CMSG_AREATRIGGER",0x0937,15595,0),
+("CMSG_MOVE_START_FORWARD",0x7814,15595,0),
+("CMSG_MOVE_START_BACKWARD",0x330A,15595,0),
+("CMSG_MOVE_STOP",0x320A,15595,0),
+("CMSG_MOVE_START_STRAFE_LEFT",0x3A16,15595,0),
+("CMSG_MOVE_START_STRAFE_RIGHT",0x3A02,15595,0),
+("CMSG_MOVE_STOP_STRAFE",0x3002,15595,0),
+("CMSG_MOVE_JUMP",0x7A06,15595,0),
+("CMSG_MOVE_START_TURN_LEFT",0x700C,15595,0),
+("CMSG_MOVE_START_TURN_RIGHT",0x7000,15595,0),
+("CMSG_MOVE_STOP_TURN",0x331E,15595,0),
+("CMSG_MOVE_START_PITCH_UP",0x3304,15595,0),
+("CMSG_MOVE_START_PITCH_DOWN",0x3908,15595,0),
+("CMSG_MOVE_STOP_PITCH",0x7216,15595,0),
+("CMSG_MOVE_SET_RUN_MODE",0x791A,15595,0),
+("CMSG_MOVE_SET_WALK_MODE",0x7002,15595,0),
+("MSG_MOVE_TOGGLE_LOGGING",0x10C5,15595,0),
+("SMSG_MOVE_TELEPORT",0x55A0,15595,0),
+("MSG_MOVE_TELEPORT_CHEAT",0x10C7,15595,0),
+("CMSG_MOVE_TELEPORT_ACK",0x390C,15595,0),
+("MSG_MOVE_TOGGLE_FALL_LOGGING",0x10C9,15595,0),
+("CMSG_MOVE_FALL_LAND",0x380A,15595,0),
+("CMSG_MOVE_START_SWIM",0x3206,15595,0),
+("CMSG_MOVE_STOP_SWIM",0x3802,15595,0),
+("MSG_MOVE_SET_RUN_SPEED_CHEAT",0x10CD,15595,0),
+("SMSG_MOVE_SET_RUN_SPEED",0x3DB5,15595,0),
+("MSG_MOVE_SET_RUN_BACK_SPEED_CHEAT",0x10CF,15595,0),
+("SMSG_MOVE_SET_RUN_BACK_SPEED",0x71B1,15595,0),
+("MSG_MOVE_SET_WALK_SPEED_CHEAT",0x10D1,15595,0),
+("SMSG_MOVE_SET_WALK_SPEED",0x1DA4,15595,0),
+("MSG_MOVE_SET_SWIM_SPEED_CHEAT",0x10D3,15595,0),
+("SMSG_MOVE_SET_SWIM_SPEED",0x15A7,15595,0),
+("MSG_MOVE_SET_SWIM_BACK_SPEED_CHEAT",0x10D5,15595,0),
+("SMSG_MOVE_SET_SWIM_BACK_SPEED",0x5CA6,15595,0),
+("MSG_MOVE_SET_ALL_SPEED_CHEAT",0x10D7,15595,0),
+("MSG_MOVE_SET_TURN_RATE_CHEAT",0x10D8,15595,0),
+("SMSG_MOVE_SET_TURN_RATE",0x30A5,15595,0),
+("MSG_MOVE_TOGGLE_COLLISION_CHEAT",0x10DA,15595,0),
+("CMSG_MOVE_SET_FACING",0x7914,15595,0),
+("CMSG_MOVE_SET_PITCH",0x7312,15595,0),
+("MSG_MOVE_WORLDPORT_ACK",0x2411,15595,0),
+("SMSG_MONSTER_MOVE",0x6E17,15595,0),
+("SMSG_MOVE_WATER_WALK",0x75B1,15595,0),
+("SMSG_MOVE_LAND_WALK",0x34B7,15595,0),
+("CMSG_MOVE_CHARM_PORT_CHEAT",0x10E1,15595,0),
+("CMSG_MOVE_SET_RAW_POSITION",0x10E2,15595,0),
+("SMSG_FORCE_RUN_SPEED_CHANGE",0x10E3,15595,0),
+("CMSG_FORCE_RUN_SPEED_CHANGE_ACK",0x10E4,15595,0),
+("SMSG_FORCE_RUN_BACK_SPEED_CHANGE",0x10E5,15595,0),
+("CMSG_FORCE_RUN_BACK_SPEED_CHANGE_ACK",0x10E6,15595,0),
+("SMSG_FORCE_SWIM_SPEED_CHANGE",0x10E7,15595,0),
+("CMSG_FORCE_SWIM_SPEED_CHANGE_ACK",0x10E8,15595,0),
+("SMSG_FORCE_MOVE_ROOT",0x7DA0,15595,0),
+("CMSG_FORCE_MOVE_ROOT_ACK",0x701E,15595,0),
+("SMSG_FORCE_MOVE_UNROOT",0x7DB4,15595,0),
+("CMSG_FORCE_MOVE_UNROOT_ACK",0x7808,15595,0),
+("MSG_MOVE_ROOT",0x10ED,15595,0),
+("MSG_MOVE_UNROOT",0x10EE,15595,0),
+("MSG_MOVE_HEARTBEAT",0x3914,15595,0),
+("SMSG_MOVE_KNOCK_BACK",0x5CB4,15595,0),
+("CMSG_MOVE_KNOCK_BACK_ACK",0x721C,15595,0),
+("SMSG_MOVE_UPDATE_KNOCK_BACK",0x3DB2,15595,0),
+("SMSG_MOVE_FEATHER_FALL",0x79B0,15595,0),
+("SMSG_MOVE_NORMAL_FALL",0x51B6,15595,0),
+("SMSG_MOVE_SET_HOVER",0x5CB3,15595,0),
+("SMSG_MOVE_UNSET_HOVER",0x51B3,15595,0),
+("CMSG_MOVE_HOVER_ACK",0x10F7,15595,0),
+("MSG_MOVE_HOVER",0x10F8,15595,0),
+("CMSG_TRIGGER_CINEMATIC_CHEAT",0x10F9,15595,0),
+("CMSG_OPENING_CINEMATIC",0x10FA,15595,0),
+("SMSG_TRIGGER_CINEMATIC",0x6C27,15595,0),
+("CMSG_NEXT_CINEMATIC_CAMERA",0x10FC,15595,0),
+("CMSG_COMPLETE_CINEMATIC",0x10FD,15595,0),
+("SMSG_TUTORIAL_FLAGS",0x0B35,15595,0),
+("CMSG_TUTORIAL_FLAG",0x6C26,15595,0),
+("CMSG_TUTORIAL_CLEAR",0x6515,15595,0),
+("CMSG_TUTORIAL_RESET",0x2726,15595,0),
+("CMSG_STANDSTATECHANGE",0x0535,15595,0),
+("CMSG_EMOTE",0x4C26,15595,0),
+("SMSG_EMOTE",0x0A34,15595,0),
+("CMSG_TEXT_EMOTE",0x2E24,15595,0),
+("SMSG_TEXT_EMOTE",0x0B05,15595,0),
+("CMSG_AUTOEQUIP_GROUND_ITEM",0x1107,15595,0),
+("CMSG_AUTOSTORE_GROUND_ITEM",0x1108,15595,0),
+("CMSG_AUTOSTORE_LOOT_ITEM",0x0E34,15595,0),
+("CMSG_STORE_LOOT_IN_SLOT",0x110A,15595,0),
+("CMSG_AUTOEQUIP_ITEM",0x4304,15595,0),
+("CMSG_AUTOSTORE_BAG_ITEM",0x0236,15595,0),
+("CMSG_SWAP_ITEM",0x6326,15595,0),
+("CMSG_SWAP_INV_ITEM",0x2614,15595,0),
+("CMSG_SPLIT_ITEM",0x0F17,15595,0),
+("CMSG_AUTOEQUIP_ITEM_SLOT",0x4A17,15595,0),
+("CMSG_UNCLAIM_LICENSE",0x1111,15595,0),
+("CMSG_DESTROYITEM",0x4A27,15595,0),
+("SMSG_INVENTORY_CHANGE_FAILURE",0x2236,15595,0),
+("SMSG_OPEN_CONTAINER",0x4714,15595,0),
+("CMSG_INSPECT",0x0927,15595,0),
+("SMSG_INSPECT_RESULTS_UPDATE",0x1116,15595,0),
+("CMSG_INITIATE_TRADE",0x7916,15595,0),
+("CMSG_BEGIN_TRADE",0x721E,15595,0),
+("CMSG_BUSY_TRADE",0x331C,15595,0),
+("CMSG_IGNORE_TRADE",0x7112,15595,0),
+("CMSG_ACCEPT_TRADE",0x7110,15595,0),
+("CMSG_UNACCEPT_TRADE",0x391A,15595,0),
+("CMSG_CANCEL_TRADE",0x731E,15595,0),
+("CMSG_SET_TRADE_ITEM",0x7B0C,15595,0),
+("CMSG_CLEAR_TRADE_ITEM",0x7018,15595,0),
+("CMSG_SET_TRADE_GOLD",0x3008,15595,0),
+("SMSG_TRADE_STATUS",0x5CA3,15595,0),
+("SMSG_TRADE_STATUS_EXTENDED",0x70A2,15595,0),
+("SMSG_INITIALIZE_FACTIONS",0x4634,15595,0),
+("SMSG_SET_FACTION_VISIBLE",0x2525,15595,0),
+("SMSG_SET_FACTION_STANDING",0x0126,15595,0),
+("CMSG_SET_FACTION_ATWAR",0x0706,15595,0),
+("CMSG_SET_FACTION_CHEAT",0x1127,15595,0),
+("SMSG_SET_PROFICIENCY",0x6207,15595,0),
+("CMSG_SET_ACTION_BUTTON",0x6F06,15595,0),
+("SMSG_ACTION_BUTTONS",0x38B5,15595,0),
+("SMSG_INITIAL_SPELLS",0x0104,15595,0),
+("SMSG_LEARNED_SPELL",0x58A2,15595,0),
+("SMSG_SUPERCEDED_SPELL",0x35B0,15595,0),
+("CMSG_NEW_SPELL_SLOT",0x112E,15595,0),
+("CMSG_CAST_SPELL",0x4C07,15595,0),
+("CMSG_CANCEL_CAST",0x0115,15595,0),
+("SMSG_CAST_FAILED",0x4D16,15595,0),
+("SMSG_SPELL_START",0x6415,15595,0),
+("SMSG_SPELL_GO",0x6E16,15595,0),
+("SMSG_SPELL_FAILURE",0x0C34,15595,0),
+("SMSG_SPELL_COOLDOWN",0x4B16,15595,0),
+("SMSG_COOLDOWN_EVENT",0x4F26,15595,0),
+("CMSG_CANCEL_AURA",0x0E26,15595,0),
+("SMSG_EQUIPMENT_SET_ID",0x2216,15595,0),
+("SMSG_PET_CAST_FAILED",0x2B15,15595,0),
+("SMSG_CHANNEL_START",0x0A15,15595,0),
+("SMSG_CHANNEL_UPDATE",0x2417,15595,0),
+("CMSG_CANCEL_CHANNELLING",0x6C25,15595,0),
+("SMSG_AI_REACTION",0x0637,15595,0),
+("CMSG_SET_SELECTION",0x0506,15595,0),
+("CMSG_DELETEEQUIPMENT_SET",0x4D07,15595,0),
+("CMSG_INSTANCE_LOCK_RESPONSE",0x1140,15595,0),
+("CMSG_DEBUG_PASSIVE_AURA",0x1141,15595,0),
+("CMSG_ATTACKSWING",0x0926,15595,0),
+("CMSG_ATTACKSTOP",0x4106,15595,0),
+("SMSG_ATTACKSTART",0x2D15,15595,0),
+("SMSG_ATTACKSTOP",0x0934,15595,0),
+("SMSG_ATTACKSWING_NOTINRANGE",0x0B36,15595,0),
+("SMSG_ATTACKSWING_BADFACING",0x6C07,15595,0),
+("SMSG_PENDING_RAID_LOCK",0x4F17,15595,0),
+("SMSG_ATTACKSWING_DEADTARGET",0x2B26,15595,0),
+("SMSG_ATTACKSWING_CANT_ATTACK",0x0016,15595,0),
+("SMSG_ATTACKERSTATEUPDATE",0x0B25,15595,0),
+("SMSG_BATTLEFIELD_PORT_DENIED",0x114C,15595,0),
+("CMSG_PERFORM_ACTION_SET",0x114D,15595,0),
+("SMSG_RESUME_CAST_BAR",0x114E,15595,0),
+("SMSG_CANCEL_COMBAT",0x4F04,15595,0),
+("SMSG_SPELLBREAKLOG",0x6B17,15595,0),
+("SMSG_SPELLHEALLOG",0x2816,15595,0),
+("SMSG_SPELLENERGIZELOG",0x0414,15595,0),
+("SMSG_BREAK_TARGET",0x0105,15595,0),
+("CMSG_SAVE_PLAYER",0x1154,15595,0),
+("CMSG_SETDEATHBINDPOINT",0x1155,15595,0),
+("SMSG_BINDPOINTUPDATE",0x0527,15595,0),
+("CMSG_GETDEATHBINDZONE",0x1157,15595,0),
+("SMSG_BINDZONEREPLY",0x1158,15595,0),
+("SMSG_PLAYERBOUND",0x2516,15595,0),
+("SMSG_CLIENT_CONTROL_UPDATE",0x2837,15595,0),
+("CMSG_REPOP_REQUEST",0x6235,15595,0),
+("SMSG_RESURRECT_REQUEST",0x2905,15595,0),
+("CMSG_RESURRECT_RESPONSE",0x6827,15595,0),
+("CMSG_LOOT",0x0127,15595,0),
+("CMSG_LOOT_CURRENCY",0x781C,15595,0),
+("CMSG_LOOT_MONEY",0x6227,15595,0),
+("CMSG_LOOT_RELEASE",0x2007,15595,0),
+("SMSG_LOOT_RESPONSE",0x4C16,15595,0),
+("SMSG_LOOT_RELEASE_RESPONSE",0x6D25,15595,0),
+("SMSG_LOOT_REMOVED",0x6817,15595,0),
+("SMSG_LOOT_CURRENCY_REMOVED",0x1DB4,15595,0),
+("SMSG_LOOT_MONEY_NOTIFY",0x2836,15595,0),
+("SMSG_LOOT_ITEM_NOTIFY",0x6D15,15595,0),
+("SMSG_LOOT_CLEAR_MONEY",0x2B37,15595,0),
+("SMSG_ITEM_PUSH_RESULT",0x0E15,15595,0),
+("SMSG_DUEL_REQUESTED",0x4504,15595,0),
+("SMSG_DUEL_OUTOFBOUNDS",0x0C26,15595,0),
+("SMSG_DUEL_INBOUNDS",0x0A27,15595,0),
+("SMSG_DUEL_COMPLETE",0x2527,15595,0),
+("SMSG_DUEL_WINNER",0x2D36,15595,0),
+("CMSG_DUEL_ACCEPTED",0x2136,15595,0),
+("CMSG_DUEL_CANCELLED",0x6624,15595,0),
+("SMSG_MOUNTRESULT",0x116F,15595,0),
+("SMSG_DISMOUNTRESULT",0x1170,15595,0),
+("SMSG_REMOVED_FROM_PVP_QUEUE",0x1171,15595,0),
+("CMSG_MOUNTSPECIAL_ANIM",0x2807,15595,0),
+("SMSG_MOUNTSPECIAL_ANIM",0x0217,15595,0),
+("SMSG_PET_TAME_FAILURE",0x6B24,15595,0),
+("CMSG_PET_SET_ACTION",0x6904,15595,0),
+("CMSG_PET_ACTION",0x0226,15595,0),
+("CMSG_PET_ABANDON",0x0C24,15595,0),
+("CMSG_PET_RENAME",0x6406,15595,0),
+("SMSG_PET_NAME_INVALID",0x6007,15595,0),
+("SMSG_PET_SPELLS",0x4114,15595,0),
+("SMSG_PET_MODE",0x2235,15595,0),
+("CMSG_GOSSIP_HELLO",0x4525,15595,0),
+("CMSG_GOSSIP_SELECT_OPTION",0x0216,15595,0),
+("SMSG_GOSSIP_MESSAGE",0x2035,15595,0),
+("SMSG_GOSSIP_COMPLETE",0x0806,15595,0),
+("CMSG_NPC_TEXT_QUERY",0x4E24,15595,0),
+("SMSG_NPC_TEXT_UPDATE",0x4436,15595,0),
+("SMSG_NPC_WONT_TALK",0x1182,15595,0),
+("CMSG_QUESTGIVER_STATUS_QUERY",0x4407,15595,0),
+("SMSG_QUESTGIVER_STATUS",0x2115,15595,0),
+("CMSG_QUESTGIVER_HELLO",0x0D17,15595,0),
+("SMSG_QUESTGIVER_QUEST_LIST",0x0134,15595,0),
+("CMSG_QUESTGIVER_QUERY_QUEST",0x2F14,15595,0),
+("CMSG_QUESTGIVER_QUEST_AUTOLAUNCH",0x1188,15595,0),
+("SMSG_QUESTGIVER_QUEST_DETAILS",0x2425,15595,0),
+("CMSG_QUESTGIVER_ACCEPT_QUEST",0x6B37,15595,0),
+("CMSG_QUESTGIVER_COMPLETE_QUEST",0x0114,15595,0),
+("SMSG_QUESTGIVER_REQUEST_ITEMS",0x6236,15595,0),
+("CMSG_QUESTGIVER_REQUEST_REWARD",0x2534,15595,0),
+("SMSG_QUESTGIVER_OFFER_REWARD",0x2427,15595,0),
+("CMSG_QUESTGIVER_CHOOSE_REWARD",0x2125,15595,0),
+("SMSG_QUESTGIVER_QUEST_INVALID",0x4016,15595,0),
+("CMSG_QUESTGIVER_CANCEL",0x1191,15595,0),
+("SMSG_QUESTGIVER_QUEST_COMPLETE",0x55A4,15595,0),
+("SMSG_QUESTGIVER_QUEST_FAILED",0x4236,15595,0),
+("CMSG_QUESTLOG_SWAP_QUEST",0x1194,15595,0),
+("CMSG_QUESTLOG_REMOVE_QUEST",0x0D16,15595,0),
+("SMSG_QUESTLOG_FULL",0x0E36,15595,0),
+("SMSG_QUESTUPDATE_FAILED",0x6324,15595,0),
+("SMSG_QUESTUPDATE_FAILEDTIMER",0x6427,15595,0),
+("SMSG_QUESTUPDATE_COMPLETE",0x2937,15595,0),
+("SMSG_QUESTUPDATE_ADD_KILL",0x0D27,15595,0),
+("SMSG_QUESTUPDATE_ADD_ITEM_OBSOLETE",0x119B,15595,0),
+("CMSG_QUEST_CONFIRM_ACCEPT",0x0D15,15595,0),
+("SMSG_QUEST_CONFIRM_ACCEPT",0x6F07,15595,0),
+("CMSG_PUSHQUESTTOPARTY",0x4B14,15595,0),
+("CMSG_LIST_INVENTORY",0x2806,15595,0),
+("SMSG_LIST_INVENTORY",0x7CB0,15595,0),
+("CMSG_SELL_ITEM",0x4E15,15595,0),
+("SMSG_SELL_ITEM",0x6105,15595,0),
+("CMSG_BUY_ITEM",0x0736,15595,0),
+("SMSG_BUY_ITEM",0x0F26,15595,0),
+("SMSG_BUY_FAILED",0x6435,15595,0),
+("CMSG_TAXICLEARALLNODES",0x11A7,15595,0),
+("CMSG_TAXIENABLEALLNODES",0x11A8,15595,0),
+("CMSG_TAXISHOWNODES",0x11A9,15595,0),
+("SMSG_SHOWTAXINODES",0x2A36,15595,0),
+("CMSG_TAXINODE_STATUS_QUERY",0x2F25,15595,0),
+("SMSG_TAXINODE_STATUS",0x2936,15595,0),
+("CMSG_TAXIQUERYAVAILABLENODES",0x6C06,15595,0),
+("CMSG_ACTIVATETAXI",0x6E06,15595,0),
+("SMSG_ACTIVATETAXIREPLY",0x6A37,15595,0),
+("SMSG_NEW_TAXI_PATH",0x4B35,15595,0),
+("CMSG_TRAINER_LIST",0x2336,15595,0),
+("SMSG_TRAINER_LIST",0x4414,15595,0),
+("CMSG_TRAINER_BUY_SPELL",0x4415,15595,0),
+("SMSG_TRAINER_SERVICE",0x6A05,15595,0),
+("SMSG_TRAINER_BUY_FAILED",0x0004,15595,0),
+("CMSG_BINDER_ACTIVATE",0x4006,15595,0),
+("SMSG_PLAYERBINDERROR",0x6A24,15595,0),
+("CMSG_BANKER_ACTIVATE",0x0005,15595,0),
+("SMSG_SHOW_BANK",0x2627,15595,0),
+("CMSG_BUY_BANK_SLOT",0x0425,15595,0),
+("CMSG_PETITION_SHOWLIST",0x4617,15595,0),
+("SMSG_PETITION_SHOWLIST",0x6405,15595,0),
+("CMSG_PETITION_BUY",0x4E05,15595,0),
+("CMSG_PETITION_SHOW_SIGNATURES",0x4F15,15595,0),
+("SMSG_PETITION_SHOW_SIGNATURES",0x0716,15595,0),
+("CMSG_PETITION_SIGN",0x0E04,15595,0),
+("SMSG_PETITION_SIGN_RESULTS",0x6217,15595,0),
+("MSG_PETITION_DECLINE",0x4905,15595,0),
+("CMSG_OFFER_PETITION",0x4817,15595,0),
+("CMSG_TURN_IN_PETITION",0x0B27,15595,0),
+("SMSG_TURN_IN_PETITION_RESULTS",0x0F07,15595,0),
+("CMSG_PETITION_QUERY",0x4424,15595,0),
+("SMSG_PETITION_QUERY_RESPONSE",0x4B37,15595,0),
+("SMSG_FISH_NOT_HOOKED",0x0A17,15595,0),
+("SMSG_FISH_ESCAPED",0x2205,15595,0),
+("CMSG_BUG",0x4035,15595,0),
+("SMSG_NOTIFICATION",0x14A0,15595,0),
+("CMSG_PLAYED_TIME",0x0804,15595,0),
+("SMSG_PLAYED_TIME",0x6037,15595,0),
+("CMSG_QUERY_TIME",0x0A36,15595,0),
+("SMSG_QUERY_TIME_RESPONSE",0x2124,15595,0),
+("SMSG_LOG_XPGAIN",0x4514,15595,0),
+("SMSG_AURACASTLOG",0x11D2,15595,0),
+("CMSG_RECLAIM_CORPSE",0x4036,15595,0),
+("CMSG_WRAP_ITEM",0x4F06,15595,0),
+("SMSG_LEVELUP_INFO",0x0435,15595,0),
+("MSG_MINIMAP_PING",0x6635,15595,0),
+("SMSG_RESISTLOG",0x11D7,15595,0),
+("SMSG_ENCHANTMENTLOG",0x6035,15595,0),
+("CMSG_SET_SKILL_CHEAT",0x11D9,15595,0),
+("SMSG_START_MIRROR_TIMER",0x6824,15595,0),
+("SMSG_PAUSE_MIRROR_TIMER",0x4015,15595,0),
+("SMSG_STOP_MIRROR_TIMER",0x0B06,15595,0),
+("CMSG_PING",0x444D,15595,0),
+("SMSG_PONG",0x4D42,15595,0),
+("SMSG_CLEAR_COOLDOWNS",0x59B4,15595,0),
+("SMSG_GAMEOBJECT_PAGETEXT",0x2925,15595,0),
+("CMSG_SETSHEATHED",0x4326,15595,0),
+("SMSG_COOLDOWN_CHEAT",0x11E2,15595,0),
+("SMSG_SPELL_DELAYED",0x0715,15595,0),
+("CMSG_QUEST_POI_QUERY",0x4037,15595,0),
+("SMSG_QUEST_POI_QUERY_RESPONSE",0x6304,15595,0),
+("CMSG_GHOST",0x11E6,15595,0),
+("CMSG_GM_INVIS",0x11E7,15595,0),
+("SMSG_INVALID_PROMOTION_CODE",0x11E8,15595,0),
+("MSG_GM_BIND_OTHER",0x11E9,15595,0),
+("MSG_GM_SUMMON",0x11EA,15595,0),
+("SMSG_ITEM_TIME_UPDATE",0x2407,15595,0),
+("SMSG_ITEM_ENCHANT_TIME_UPDATE",0x0F27,15595,0),
+("MSG_GM_SHOWLABEL",0x11F0,15595,0),
+("CMSG_PET_CAST_SPELL",0x6337,15595,0),
+("MSG_SAVE_GUILD_EMBLEM",0x2404,15595,0),
+("MSG_TABARDVENDOR_ACTIVATE",0x6926,15595,0),
+("SMSG_PLAY_SPELL_VISUAL",0x55A5,15595,0),
+("CMSG_ZONEUPDATE",0x4F37,15595,0),
+("SMSG_PARTYKILLLOG",0x4937,15595,0),
+("SMSG_COMPRESSED_UPDATE_OBJECT",0x11F7,15595,0),
+("SMSG_EXPLORATION_EXPERIENCE",0x6716,15595,0),
+("CMSG_GM_SET_SECURITY_GROUP",0x11FA,15595,0),
+("CMSG_GM_NUKE",0x11FB,15595,0),
+("MSG_RANDOM_ROLL",0x0905,15595,0),
+("SMSG_ENVIRONMENTALDAMAGELOG",0x6C05,15595,0),
+("CMSG_CHANGEPLAYER_DIFFICULTY",0x6107,15595,0),
+("SMSG_RWHOIS",0x11FF,15595,0),
+("SMSG_LFG_PLAYER_REWARD",0x1200,15595,0),
+("SMSG_LFG_TELEPORT_DENIED",0x1201,15595,0),
+("CMSG_UNLEARN_SPELL",0x1202,15595,0),
+("CMSG_UNLEARN_SKILL",0x6106,15595,0),
+("SMSG_REMOVED_SPELL",0x4804,15595,0),
+("CMSG_DECHARGE",0x1205,15595,0),
+("CMSG_GMTICKET_CREATE",0x0137,15595,0),
+("SMSG_GMTICKET_CREATE",0x2107,15595,0),
+("CMSG_GMTICKET_UPDATETEXT",0x0636,15595,0),
+("SMSG_GMTICKET_UPDATETEXT",0x6535,15595,0),
+("SMSG_ACCOUNT_DATA_TIMES",0x4B05,15595,0),
+("CMSG_REQUEST_ACCOUNT_DATA",0x6505,15595,0),
+("CMSG_UPDATE_ACCOUNT_DATA",0x4736,15595,0),
+("SMSG_UPDATE_ACCOUNT_DATA",0x6837,15595,0),
+("SMSG_CLEAR_FAR_SIGHT_IMMEDIATE",0x120E,15595,0),
+("SMSG_CHANGEPLAYER_DIFFICULTY_RESULT",0x2217,15595,0),
+("CMSG_GM_TEACH",0x1210,15595,0),
+("CMSG_GM_CREATE_ITEM_TARGET",0x1211,15595,0),
+("CMSG_GMTICKET_GETTICKET",0x0326,15595,0),
+("SMSG_GMTICKET_GETTICKET",0x2C15,15595,0),
+("CMSG_UNLEARN_TALENTS",0x1214,15595,0),
+("SMSG_INSTANCE_ENCOUNTER",0x1215,15595,0),
+("SMSG_GAMEOBJECT_DESPAWN_ANIM",0x6735,15595,0),
+("MSG_CORPSE_QUERY",0x4336,15595,0),
+("CMSG_GMTICKET_DELETETICKET",0x6B14,15595,0),
+("SMSG_GMTICKET_DELETETICKET",0x6D17,15595,0),
+("SMSG_CHAT_WRONG_FACTION",0x6724,15595,0),
+("CMSG_GMTICKET_SYSTEMSTATUS",0x4205,15595,0),
+("SMSG_GMTICKET_SYSTEMSTATUS",0x0D35,15595,0),
+("CMSG_SPIRIT_HEALER_ACTIVATE",0x2E26,15595,0),
+("CMSG_SET_STAT_CHEAT",0x121E,15595,0),
+("SMSG_QUEST_FORCE_REMOVED",0x121F,15595,0),
+("CMSG_SKILL_BUY_STEP",0x1220,15595,0),
+("CMSG_SKILL_BUY_RANK",0x1221,15595,0),
+("CMSG_XP_CHEAT",0x1222,15595,0),
+("SMSG_SPIRIT_HEALER_CONFIRM",0x4917,15595,0),
+("CMSG_CHARACTER_POINT_CHEAT",0x1224,15595,0),
+("SMSG_GOSSIP_POI",0x4316,15595,0),
+("CMSG_CHAT_IGNORED",0x0D54,15595,0),
+("CMSG_GM_VISION",0x1227,15595,0),
+("CMSG_SERVER_COMMAND",0x1228,15595,0),
+("CMSG_GM_SILENCE",0x1229,15595,0),
+("CMSG_GM_REVEALTO",0x122A,15595,0),
+("CMSG_GM_RESURRECT",0x122B,15595,0),
+("CMSG_GM_SUMMONMOB",0x122C,15595,0),
+("CMSG_GM_MOVECORPSE",0x122D,15595,0),
+("CMSG_GM_FREEZE",0x122E,15595,0),
+("CMSG_GM_UBERINVIS",0x122F,15595,0),
+("CMSG_GM_REQUEST_PLAYER_INFO",0x1230,15595,0),
+("SMSG_GM_PLAYER_INFO",0x1231,15595,0),
+("CMSG_GUILD_RANK",0x1024,15595,0),
+("CMSG_GUILD_ADD_RANK",0x3030,15595,0),
+("CMSG_GUILD_DEL_RANK",0x3234,15595,0),
+("CMSG_GUILD_SET_NOTE",0x1233,15595,0),
+("SMSG_LOGIN_VERIFY_WORLD",0x2005,15595,0),
+("CMSG_CLEAR_EXPLORATION",0x1238,15595,0),
+("CMSG_SEND_MAIL",0x0523,15595,0),
+("SMSG_SEND_MAIL_RESULT",0x4927,15595,0),
+("CMSG_GET_MAIL_LIST",0x4D37,15595,0),
+("SMSG_MAIL_LIST_RESULT",0x4217,15595,0),
+("CMSG_BATTLEFIELD_LIST",0x3814,15595,0),
+("SMSG_BATTLEFIELD_LIST",0x71B5,15595,0),
+("CMSG_BATTLEFIELD_JOIN",0x123F,15595,0),
+("SMSG_FORCE_SET_VEHICLE_REC_ID",0x1240,15595,0),
+("CMSG_SET_VEHICLE_REC_ID_ACK",0x1241,15595,0),
+("CMSG_TAXICLEARNODE",0x1242,15595,0),
+("CMSG_TAXIENABLENODE",0x1243,15595,0),
+("CMSG_ITEM_TEXT_QUERY",0x2406,15595,0),
+("SMSG_ITEM_TEXT_QUERY_RESPONSE",0x2725,15595,0),
+("CMSG_MAIL_TAKE_MONEY",0x4034,15595,0),
+("CMSG_MAIL_TAKE_ITEM",0x2B06,15595,0),
+("CMSG_MAIL_MARK_AS_READ",0x0C07,15595,0),
+("CMSG_MAIL_RETURN_TO_SENDER",0x0816,15595,0),
+("CMSG_MAIL_DELETE",0x6104,15595,0),
+("CMSG_MAIL_CREATE_TEXT_ITEM",0x0B14,15595,0),
+("SMSG_SPELLLOGMISS",0x0625,15595,0),
+("SMSG_SPELLLOGEXECUTE",0x0626,15595,0),
+("SMSG_DEBUGAURAPROC",0x124E,15595,0),
+("SMSG_PERIODICAURALOG",0x0416,15595,0),
+("SMSG_SPELLDAMAGESHIELD",0x2927,15595,0),
+("SMSG_SPELLNONMELEEDAMAGELOG",0x4315,15595,0),
+("CMSG_LEARN_TALENT",0x0306,15595,0),
+("SMSG_RESURRECT_FAILED",0x1253,15595,0),
+("CMSG_TOGGLE_PVP",0x6815,15595,0),
+("SMSG_ZONE_UNDER_ATTACK",0x0A06,15595,0),
+("MSG_AUCTION_HELLO",0x2307,15595,0),
+("CMSG_AUCTION_SELL_ITEM",0x4A06,15595,0),
+("CMSG_AUCTION_REMOVE_ITEM",0x6426,15595,0),
+("CMSG_AUCTION_LIST_ITEMS",0x0324,15595,0),
+("CMSG_AUCTION_LIST_OWNER_ITEMS",0x0206,15595,0),
+("CMSG_AUCTION_PLACE_BID",0x2306,15595,0),
+("SMSG_AUCTION_COMMAND_RESULT",0x4C25,15595,0),
+("SMSG_AUCTION_LIST_RESULT",0x6637,15595,0),
+("SMSG_AUCTION_OWNER_LIST_RESULT",0x6C34,15595,0),
+("SMSG_AUCTION_BIDDER_NOTIFICATION",0x4E27,15595,0),
+("SMSG_AUCTION_OWNER_NOTIFICATION",0x4116,15595,0),
+("SMSG_PROCRESIST",0x1261,15595,0),
+("SMSG_COMBAT_EVENT_FAILED",0x1262,15595,0),
+("SMSG_DISPEL_FAILED",0x0307,15595,0),
+("SMSG_SPELLOGDAMAGE_IMMUNE",0x4507,15595,0),
+("CMSG_AUCTION_LIST_BIDDER_ITEMS",0x6937,15595,0),
+("SMSG_AUCTION_BIDDER_LIST_RESULT",0x0027,15595,0),
+("SMSG_SET_FLAT_SPELL_MODIFIER",0x2834,15595,0),
+("SMSG_SET_PCT_SPELL_MODIFIER",0x0224,15595,0),
+("CMSG_SET_AMMO",0x1269,15595,0),
+("SMSG_CORPSE_RECLAIM_DELAY",0x0D34,15595,0),
+("CMSG_SET_ACTIVE_MOVER",0x126B,15595,0),
+("CMSG_PET_CANCEL_AURA",0x4B25,15595,0),
+("CMSG_PLAYER_AI_CHEAT",0x126D,15595,0),
+("CMSG_CANCEL_AUTO_REPEAT_SPELL",0x6C35,15595,0),
+("MSG_GM_ACCOUNT_ONLINE",0x126F,15595,0),
+("MSG_LIST_STABLED_PETS",0x0834,15595,0),
+("CMSG_STABLE_PET",0x1271,15595,0),
+("CMSG_UNSTABLE_PET",0x1272,15595,0),
+("CMSG_BUY_STABLE_SLOT",0x1273,15595,0),
+("SMSG_STABLE_RESULT",0x2204,15595,0),
+("CMSG_STABLE_REVIVE_PET",0x1275,15595,0),
+("CMSG_STABLE_SWAP_PET",0x1276,15595,0),
+("MSG_QUEST_PUSH_RESULT",0x4515,15595,0),
+("SMSG_PLAY_MUSIC",0x4B06,15595,0),
+("SMSG_PLAY_OBJECT_SOUND",0x2635,15595,0),
+("CMSG_REQUEST_PET_INFO",0x4924,15595,0),
+("CMSG_FAR_SIGHT",0x4835,15595,0),
+("SMSG_SPELLDISPELLOG",0x4516,15595,0),
+("SMSG_DAMAGE_CALC_LOG",0x127D,15595,0),
+("CMSG_ENABLE_DAMAGE_LOG",0x127E,15595,0),
+("CMSG_GROUP_CHANGE_SUB_GROUP",0x4124,15595,0),
+("CMSG_REQUEST_PARTY_MEMBER_STATS",0x0C04,15595,0),
+("CMSG_GROUP_SWAP_SUB_GROUP",0x1281,15595,0),
+("CMSG_RESET_FACTION_CHEAT",0x1282,15595,0),
+("CMSG_AUTOSTORE_BANK_ITEM",0x0607,15595,0),
+("CMSG_AUTOBANK_ITEM",0x2537,15595,0),
+("MSG_QUERY_NEXT_MAIL_TIME",0x0F04,15595,0),
+("SMSG_RECEIVED_MAIL",0x2924,15595,0),
+("SMSG_RAID_GROUP_ONLY",0x0837,15595,0),
+("CMSG_SET_DURABILITY_CHEAT",0x1288,15595,0),
+("CMSG_SET_PVP_RANK_CHEAT",0x1289,15595,0),
+("CMSG_ADD_PVP_MEDAL_CHEAT",0x128A,15595,0),
+("CMSG_DEL_PVP_MEDAL_CHEAT",0x128B,15595,0),
+("CMSG_SET_PVP_TITLE",0x128C,15595,0),
+("SMSG_PVP_CREDIT",0x6015,15595,0),
+("SMSG_AUCTION_REMOVED_NOTIFICATION",0x2334,15595,0),
+("CMSG_GROUP_RAID_CONVERT",0x6E27,15595,0),
+("CMSG_GROUP_ASSISTANT_LEADER",0x6025,15595,0),
+("CMSG_BUYBACK_ITEM",0x6C17,15595,0),
+("SMSG_SERVER_MESSAGE",0x6C04,15595,0),
+("CMSG_SET_SAVED_INSTANCE_EXTEND",0x1293,15595,0),
+("SMSG_LFG_OFFER_CONTINUE",0x1294,15595,0),
+("CMSG_TEST_DROP_RATE",0x1295,15595,0),
+("SMSG_TEST_DROP_RATE_RESULT",0x1296,15595,0),
+("CMSG_LFG_GET_STATUS",0x1297,15595,0),
+("SMSG_SHOW_MAILBOX",0x1298,15595,0),
+("SMSG_RESET_RANGED_COMBAT_TIMER",0x1299,15595,0),
+("SMSG_CHAT_NOT_IN_PARTY",0x6A14,15595,0),
+("CMSG_GMTICKETSYSTEM_TOGGLE",0x129B,15595,0),
+("CMSG_CANCEL_GROWTH_AURA",0x129C,15595,0),
+("SMSG_CANCEL_AUTO_REPEAT",0x6436,15595,0),
+("SMSG_STANDSTATE_UPDATE",0x6F04,15595,0),
+("SMSG_LOOT_ALL_PASSED",0x6237,15595,0),
+("SMSG_LOOT_ROLL_WON",0x6617,15595,0),
+("CMSG_LOOT_ROLL",0x6934,15595,0),
+("SMSG_LOOT_START_ROLL",0x2227,15595,0),
+("SMSG_LOOT_ROLL",0x6507,15595,0),
+("CMSG_LOOT_MASTER_GIVE",0x4F35,15595,0),
+("SMSG_LOOT_MASTER_LIST",0x0325,15595,0),
+("SMSG_SET_FORCED_REACTIONS",0x4615,15595,0),
+("SMSG_SPELL_FAILED_OTHER",0x4535,15595,0),
+("SMSG_GAMEOBJECT_RESET_STATE",0x12A8,15595,0),
+("CMSG_REPAIR_ITEM",0x2917,15595,0),
+("SMSG_CHAT_PLAYER_NOT_FOUND",0x2526,15595,0),
+("MSG_TALENT_WIPE_CONFIRM",0x0107,15595,0),
+("SMSG_SUMMON_REQUEST",0x2A07,15595,0),
+("CMSG_SUMMON_RESPONSE",0x6F27,15595,0),
+("MSG_DEV_SHOWLABEL",0x12AE,15595,0),
+("SMSG_MONSTER_MOVE_TRANSPORT",0x2004,15595,0),
+("SMSG_PET_BROKEN",0x12B0,15595,0),
+("MSG_MOVE_FEATHER_FALL",0x12B1,15595,0),
+("MSG_MOVE_WATER_WALK",0x12B2,15595,0),
+("CMSG_SERVER_BROADCAST",0x12B3,15595,0),
+("CMSG_SELF_RES",0x6115,15595,0),
+("SMSG_FEIGN_DEATH_RESISTED",0x12B5,15595,0),
+("CMSG_RUN_SCRIPT",0x12B6,15595,0),
+("SMSG_SCRIPT_MESSAGE",0x12B7,15595,0),
+("SMSG_DUEL_COUNTDOWN",0x4836,15595,0),
+("SMSG_AREA_TRIGGER_MESSAGE",0x4505,15595,0),
+("CMSG_SHOWING_HELM",0x0735,15595,0),
+("CMSG_SHOWING_CLOAK",0x4135,15595,0),
+("SMSG_ROLE_CHOSEN",0x12BC,15595,0),
+("SMSG_PLAYER_SKINNED",0x12BD,15595,0),
+("SMSG_DURABILITY_DAMAGE_DEATH",0x4C27,15595,0),
+("CMSG_SET_EXPLORATION",0x12BF,15595,0),
+("CMSG_SET_ACTIONBAR_TOGGLES",0x2506,15595,0),
+("UMSG_DELETE_GUILD_CHARTER",0x12C1,15595,0),
+("MSG_PETITION_RENAME",0x4005,15595,0),
+("SMSG_INIT_WORLD_STATES",0x4C15,15595,0),
+("SMSG_UPDATE_WORLD_STATE",0x4816,15595,0),
+("SMSG_PET_ACTION_FEEDBACK",0x0807,15595,0),
+("CMSG_CHAR_RENAME",0x2327,15595,0),
+("SMSG_CHAR_RENAME",0x2024,15595,0),
+("CMSG_MOVE_SPLINE_DONE",0x790E,15595,0),
+("CMSG_MOVE_FALL_RESET",0x310A,15595,0),
+("SMSG_INSTANCE_SAVE_CREATED",0x0124,15595,0),
+("SMSG_RAID_INSTANCE_INFO",0x6626,15595,0),
+("CMSG_REQUEST_RAID_INFO",0x2F26,15595,0),
+("CMSG_MOVE_TIME_SKIPPED",0x7A0A,15595,0),
+("CMSG_MOVE_FEATHER_FALL_ACK",0x12D0,15595,0),
+("CMSG_MOVE_WATER_WALK_ACK",0x3B00,15595,0),
+("CMSG_MOVE_NOT_ACTIVE_MOVER",0x7A1A,15595,0),
+("SMSG_PLAY_SOUND",0x2134,15595,0),
+("CMSG_BATTLEFIELD_STATUS",0x2500,15595,0),
+("SMSG_BATTLEFIELD_STATUS",0x7DA1,15595,0),
+("SMSG_BATTLEFIELD_STATUS_ACTIVE",0x74A4,15595,0),
+("SMSG_BATTLEFIELD_STATUS_FAILED",0x71A7,15595,0),
+("SMSG_BATTLEFIELD_STATUS_QUEUED",0x35A1,15595,0),
+("SMSG_BATTLEFIELD_STATUS_NEEDCONFIRMATION",0x59A0,15595,0),
+("SMSG_BATTLEFIELD_STATUS_WAITFORGROUPS",0x75A2,15595,0),
+("CMSG_BATTLEFIELD_PORT",0x711A,15595,0),
+("CMSG_INSPECT_HONOR_STATS",0x791E,15595,0),
+("SMSG_INSPECT_HONOR_STATS",0x79A5,15595,0),
+("CMSG_BATTLEMASTER_HELLO",0x12D8,15595,0),
+("CMSG_MOVE_START_SWIM_CHEAT",0x12D9,15595,0),
+("CMSG_MOVE_STOP_SWIM_CHEAT",0x12DA,15595,0),
+("SMSG_FORCE_WALK_SPEED_CHANGE",0x12DB,15595,0),
+("CMSG_FORCE_WALK_SPEED_CHANGE_ACK",0x12DC,15595,0),
+("SMSG_FORCE_SWIM_BACK_SPEED_CHANGE",0x12DD,15595,0),
+("CMSG_FORCE_SWIM_BACK_SPEED_CHANGE_ACK",0x12DE,15595,0),
+("SMSG_FORCE_TURN_RATE_CHANGE",0x12DF,15595,0),
+("CMSG_FORCE_TURN_RATE_CHANGE_ACK",0x12E0,15595,0),
+("CMSG_PVP_LOG_DATA",0x7308,15595,0),
+("SMSG_PVP_LOG_DATA",0x5CB2,15595,0),
+("CMSG_LEAVE_BATTLEFIELD",0x3018,15595,0),
+("CMSG_AREA_SPIRIT_HEALER_QUERY",0x4907,15595,0),
+("CMSG_AREA_SPIRIT_HEALER_QUEUE",0x4815,15595,0),
+("SMSG_AREA_SPIRIT_HEALER_TIME",0x0734,15595,0),
+("CMSG_GM_UNTEACH",0x12E6,15595,0),
+("SMSG_WARDEN_DATA",0x12E7,15595,0),
+("CMSG_WARDEN_DATA",0x12E8,15595,0),
+("CMSG_BATTLEGROUND_PLAYER_POSITIONS",0x3902,15595,0),
+("SMSG_BATTLEGROUND_PLAYER_POSITIONS",0x58B4,15595,0),
+("CMSG_PET_STOP_ATTACK",0x6C14,15595,0),
+("SMSG_BINDER_CONFIRM",0x2835,15595,0),
+("SMSG_BATTLEGROUND_PLAYER_JOINED",0x50B0,15595,0),
+("SMSG_BATTLEGROUND_PLAYER_LEFT",0x59A6,15595,0),
+("CMSG_BATTLEMASTER_JOIN",0x7902,15595,0),
+("SMSG_ADDON_INFO",0x2C14,15595,0),
+("CMSG_PET_UNLEARN",0x12F1,15595,0),
+("SMSG_PET_UNLEARN_CONFIRM",0x12F2,15595,0),
+("SMSG_PARTY_MEMBER_STATS_FULL",0x0215,15595,0),
+("CMSG_PET_SPELL_AUTOCAST",0x2514,15595,0),
+("SMSG_WEATHER",0x2904,15595,0),
+("SMSG_PLAY_TIME_WARNING",0x12F6,15595,0),
+("SMSG_MINIGAME_SETUP",0x12F7,15595,0),
+("SMSG_MINIGAME_STATE",0x12F8,15595,0),
+("CMSG_MINIGAME_MOVE",0x12F9,15595,0),
+("SMSG_MINIGAME_MOVE_FAILED",0x12FA,15595,0),
+("SMSG_RAID_INSTANCE_MESSAGE",0x6E15,15595,0),
+("SMSG_COMPRESSED_MOVES",0x12FC,15595,0),
+("CMSG_GUILD_INFO_TEXT",0x3227,15595,0),
+("SMSG_CHAT_RESTRICTED",0x6536,15595,0),
+("SMSG_SPLINE_SET_RUN_SPEED",0x12FF,15595,0),
+("SMSG_SPLINE_SET_RUN_BACK_SPEED",0x1300,15595,0),
+("SMSG_SPLINE_SET_SWIM_SPEED",0x1301,15595,0),
+("SMSG_SPLINE_SET_WALK_SPEED",0x1302,15595,0),
+("SMSG_SPLINE_SET_SWIM_BACK_SPEED",0x1303,15595,0),
+("SMSG_SPLINE_SET_TURN_RATE",0x1304,15595,0),
+("SMSG_SPLINE_MOVE_UNROOT",0x75B6,15595,0),
+("SMSG_SPLINE_MOVE_FEATHER_FALL",0x1306,15595,0),
+("SMSG_SPLINE_MOVE_NORMAL_FALL",0x1307,15595,0),
+("SMSG_SPLINE_MOVE_SET_HOVER",0x14B6,15595,0),
+("SMSG_SPLINE_MOVE_UNSET_HOVER",0x7DA5,15595,0),
+("SMSG_SPLINE_MOVE_WATER_WALK",0x50A2,15595,0),
+("SMSG_SPLINE_MOVE_LAND_WALK",0x3DA7,15595,0),
+("SMSG_SPLINE_MOVE_START_SWIM",0x130C,15595,0),
+("SMSG_SPLINE_MOVE_STOP_SWIM",0x130D,15595,0),
+("SMSG_SPLINE_MOVE_SET_RUN_MODE",0x75A7,15595,0),
+("SMSG_SPLINE_MOVE_SET_WALK_MODE",0x54B6,15595,0),
+("CMSG_GM_NUKE_ACCOUNT",0x1310,15595,0),
+("MSG_GM_DESTROY_CORPSE",0x1311,15595,0),
+("CMSG_GM_DESTROY_ONLINE_CORPSE",0x1312,15595,0),
+("CMSG_ACTIVATETAXIEXPRESS",0x0515,15595,0),
+("SMSG_SET_FACTION_ATWAR",0x1314,15595,0),
+("SMSG_GAMETIMEBIAS_SET",0x1315,15595,0),
+("CMSG_DEBUG_ACTIONS_START",0x1316,15595,0),
+("CMSG_DEBUG_ACTIONS_STOP",0x1317,15595,0),
+("CMSG_SET_FACTION_INACTIVE",0x0E37,15595,0),
+("CMSG_SET_WATCHED_FACTION",0x2434,15595,0),
+("MSG_MOVE_TIME_SKIPPED",0x131A,15595,0),
+("SMSG_SPLINE_MOVE_ROOT",0x51B4,15595,0),
+("CMSG_SET_EXPLORATION_ALL",0x131C,15595,0),
+("SMSG_INVALIDATE_PLAYER",0x131D,15595,0),
+("CMSG_RESET_INSTANCES",0x6E14,15595,0),
+("SMSG_INSTANCE_RESET",0x6F05,15595,0),
+("SMSG_INSTANCE_RESET_FAILED",0x4725,15595,0),
+("SMSG_UPDATE_LAST_INSTANCE",0x0437,15595,0),
+("MSG_RAID_TARGET_UPDATE",0x2C36,15595,0),
+("MSG_RAID_READY_CHECK",0x2304,15595,0),
+("CMSG_LUA_USAGE",0x1324,15595,0),
+("SMSG_PET_ACTION_SOUND",0x4324,15595,0),
+("SMSG_PET_DISMISS_SOUND",0x2B05,15595,0),
+("SMSG_GHOSTEE_GONE",0x1327,15595,0),
+("CMSG_GM_UPDATE_TICKET_STATUS",0x1328,15595,0),
+("SMSG_GM_TICKET_STATUS_UPDATE",0x1329,15595,0),
+("MSG_SET_DUNGEON_DIFFICULTY",0x4925,15595,0),
+("CMSG_GMSURVEY_SUBMIT",0x2724,15595,0),
+("SMSG_UPDATE_INSTANCE_OWNERSHIP",0x4915,15595,0),
+("CMSG_IGNORE_KNOCKBACK_CHEAT",0x132D,15595,0),
+("SMSG_CHAT_PLAYER_AMBIGUOUS",0x2F34,15595,0),
+("MSG_DELAY_GHOST_TELEPORT",0x132F,15595,0),
+("SMSG_SPELLINSTAKILLLOG",0x6216,15595,0),
+("SMSG_SPELL_UPDATE_CHAIN_TARGETS",0x1331,15595,0),
+("CMSG_CHAT_FILTERED",0x1332,15595,0),
+("SMSG_EXPECTED_SPAM_RECORDS",0x1333,15595,0),
+("SMSG_SPELLSTEALLOG",0x4E26,15595,0),
+("CMSG_LOTTERY_QUERY_OBSOLETE",0x1335,15595,0),
+("SMSG_LOTTERY_QUERY_RESULT_OBSOLETE",0x1336,15595,0),
+("CMSG_BUY_LOTTERY_TICKET_OBSOLETE",0x1337,15595,0),
+("SMSG_LOTTERY_RESULT_OBSOLETE",0x1338,15595,0),
+("SMSG_CHARACTER_PROFILE",0x1339,15595,0),
+("SMSG_CHARACTER_PROFILE_REALM_CONNECTED",0x133A,15595,0),
+("SMSG_DEFENSE_MESSAGE",0x0314,15595,0),
+("SMSG_INSTANCE_DIFFICULTY",0x133C,15595,0),
+("MSG_GM_RESETINSTANCELIMIT",0x133D,15595,0),
+("SMSG_MOTD",0x0A35,15595,0),
+("SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x133F,15595,0),
+("SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x1340,15595,0),
+("CMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY_ACK",0x1341,15595,0),
+("MSG_MOVE_START_SWIM_CHEAT",0x1342,15595,0),
+("MSG_MOVE_STOP_SWIM_CHEAT",0x1343,15595,0),
+("SMSG_MOVE_SET_CAN_FLY",0x3DA1,15595,0),
+("SMSG_MOVE_UNSET_CAN_FLY",0x15A2,15595,0),
+("CMSG_MOVE_SET_CAN_FLY_ACK",0x790C,15595,0),
+("CMSG_MOVE_SET_FLY",0x1347,15595,0),
+("CMSG_SOCKET_GEMS",0x2F04,15595,0),
+("CMSG_ARENA_TEAM_CREATE",0x04A1,15595,0),
+("SMSG_ARENA_TEAM_COMMAND_RESULT",0x39B3,15595,0),
+("MSG_MOVE_UPDATE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x134B,15595,0),
+("CMSG_ARENA_TEAM_QUERY",0x0514,15595,0),
+("SMSG_ARENA_TEAM_QUERY_RESPONSE",0x6336,15595,0),
+("CMSG_ARENA_TEAM_ROSTER",0x6F37,15595,0),
+("SMSG_ARENA_TEAM_ROSTER",0x2717,15595,0),
+("CMSG_ARENA_TEAM_INVITE",0x2F27,15595,0),
+("SMSG_ARENA_TEAM_INVITE",0x0F36,15595,0),
+("CMSG_ARENA_TEAM_ACCEPT",0x2A25,15595,0),
+("CMSG_ARENA_TEAM_DECLINE",0x6925,15595,0),
+("CMSG_ARENA_TEAM_LEAVE",0x0E16,15595,0),
+("CMSG_ARENA_TEAM_REMOVE",0x2F05,15595,0),
+("CMSG_ARENA_TEAM_DISBAND",0x6504,15595,0),
+("CMSG_ARENA_TEAM_LEADER",0x4204,15595,0),
+("SMSG_ARENA_TEAM_EVENT",0x0617,15595,0),
+("CMSG_BATTLEMASTER_JOIN_ARENA",0x701C,15595,0),
+("CMSG_MOVE_START_ASCEND",0x390A,15595,0),
+("CMSG_MOVE_STOP_ASCEND",0x7B00,15595,0),
+("SMSG_ARENA_TEAM_STATS",0x4425,15595,0),
+("CMSG_LFG_JOIN",0x135D,15595,0),
+("CMSG_LFG_LEAVE",0x135E,15595,0),
+("CMSG_LFG_SEARCH_JOIN",0x135F,15595,0),
+("CMSG_LFG_SEARCH_LEAVE",0x1360,15595,0),
+("SMSG_LFG_SEARCH_RESULTS",0x1361,15595,0),
+("SMSG_LFG_PROPOSAL_UPDATE",0x1362,15595,0),
+("CMSG_LFG_PROPOSAL_RESPONSE",0x1363,15595,0),
+("SMSG_LFG_ROLE_CHECK_UPDATE",0x1364,15595,0),
+("SMSG_LFG_JOIN_RESULT",0x1365,15595,0),
+("SMSG_LFG_QUEUE_STATUS",0x1366,15595,0),
+("CMSG_SET_LFG_COMMENT",0x1367,15595,0),
+("SMSG_LFG_UPDATE_PLAYER",0x1368,15595,0),
+("SMSG_LFG_UPDATE_PARTY",0x1369,15595,0),
+("SMSG_LFG_UPDATE_SEARCH",0x136A,15595,0),
+("CMSG_LFG_SET_ROLES",0x136B,15595,0),
+("CMSG_LFG_SET_NEEDS",0x136C,15595,0),
+("CMSG_LFG_BOOT_PLAYER_VOTE",0x136D,15595,0),
+("SMSG_LFG_BOOT_PLAYER",0x136E,15595,0),
+("CMSG_LFG_GET_PLAYER_INFO",0x136F,15595,0),
+("SMSG_LFG_PLAYER_INFO",0x1370,15595,0),
+("CMSG_LFG_TELEPORT",0x1371,15595,0),
+("CMSG_LFG_GET_PARTY_INFO",0x1372,15595,0),
+("SMSG_LFG_PARTY_INFO",0x1373,15595,0),
+("SMSG_TITLE_EARNED",0x2426,15595,0),
+("CMSG_SET_TITLE",0x2117,15595,0),
+("CMSG_CANCEL_MOUNT_AURA",0x0635,15595,0),
+("SMSG_ARENA_ERROR",0x2D17,15595,0),
+("MSG_INSPECT_ARENA_TEAMS",0x2704,15595,0),
+("SMSG_DEATH_RELEASE_LOC",0x2F07,15595,0),
+("CMSG_CANCEL_TEMP_ENCHANTMENT",0x6C37,15595,0),
+("SMSG_FORCED_DEATH_UPDATE",0x137B,15595,0),
+("CMSG_CHEAT_SET_HONOR_CURRENCY",0x137C,15595,0),
+("CMSG_CHEAT_SET_ARENA_CURRENCY",0x137D,15595,0),
+("MSG_MOVE_SET_FLIGHT_SPEED_CHEAT",0x137E,15595,0),
+("SMSG_MOVE_SET_FLIGHT_SPEED",0x71A6,15595,0),
+("MSG_MOVE_SET_FLIGHT_BACK_SPEED_CHEAT",0x1380,15595,0),
+("SMSG_MOVE_SET_FLIGHT_BACK_SPEED",0x30A2,15595,0),
+("SMSG_FORCE_FLIGHT_SPEED_CHANGE",0x1382,15595,0),
+("CMSG_FORCE_FLIGHT_SPEED_CHANGE_ACK",0x1383,15595,0),
+("SMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE",0x1384,15595,0),
+("CMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE_ACK",0x1385,15595,0),
+("SMSG_SPLINE_SET_FLIGHT_SPEED",0x1386,15595,0),
+("SMSG_SPLINE_SET_FLIGHT_BACK_SPEED",0x1387,15595,0),
+("CMSG_MAELSTROM_INVALIDATE_CACHE",0x1388,15595,0),
+("SMSG_FLIGHT_SPLINE_SYNC",0x1389,15595,0),
+("CMSG_SET_TAXI_BENCHMARK_MODE",0x4314,15595,0),
+("SMSG_JOINED_BATTLEGROUND_QUEUE",0x138B,15595,0),
+("SMSG_REALM_SPLIT",0x2714,15595,0),
+("CMSG_REALM_SPLIT",0x2906,15595,0),
+("CMSG_MOVE_CHNG_TRANSPORT",0x3102,15595,0),
+("MSG_PARTY_ASSIGNMENT",0x0424,15595,0),
+("SMSG_OFFER_PETITION_ERROR",0x1390,15595,0),
+("SMSG_TIME_SYNC_REQ",0x3CA4,15595,0),
+("CMSG_TIME_SYNC_RESP",0x3B0C,15595,0),
+("CMSG_SEND_LOCAL_EVENT",0x1393,15595,0),
+("CMSG_SEND_GENERAL_TRIGGER",0x1394,15595,0),
+("CMSG_SEND_COMBAT_TRIGGER",0x1395,15595,0),
+("CMSG_MAELSTROM_GM_SENT_MAIL",0x1396,15595,0),
+("SMSG_RESET_FAILED_NOTIFY",0x4616,15595,0),
+("SMSG_REAL_GROUP_UPDATE",0x1398,15595,0),
+("SMSG_LFG_DISABLED",0x1399,15595,0),
+("CMSG_ACTIVE_PVP_CHEAT",0x139A,15595,0),
+("CMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY",0x139B,15595,0),
+("SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE",0x139C,15595,0),
+("SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE_WRITE_FILE",0x139D,15595,0),
+("SMSG_UPDATE_COMBO_POINTS",0x6B34,15595,0),
+("SMSG_VOICE_SESSION_ROSTER_UPDATE",0x139F,15595,0),
+("SMSG_VOICE_SESSION_LEAVE",0x13A0,15595,0),
+("SMSG_VOICE_SESSION_ADJUST_PRIORITY",0x13A1,15595,0),
+("CMSG_VOICE_SET_TALKER_MUTED_REQUEST",0x13A2,15595,0),
+("SMSG_VOICE_SET_TALKER_MUTED",0x13A3,15595,0),
+("SMSG_INIT_EXTRA_AURA_INFO_OBSOLETE",0x13A4,15595,0),
+("SMSG_SET_EXTRA_AURA_INFO_OBSOLETE",0x13A5,15595,0),
+("SMSG_SET_EXTRA_AURA_INFO_NEED_UPDATE_OBSOLETE",0x13A6,15595,0),
+("SMSG_CLEAR_EXTRA_AURA_INFO_OBSOLETE",0x13A7,15595,0),
+("CMSG_MOVE_START_DESCEND",0x3800,15595,0),
+("CMSG_IGNORE_REQUIREMENTS_CHEAT",0x13A9,15595,0),
+("SMSG_IGNORE_REQUIREMENTS_CHEAT",0x13AA,15595,0),
+("SMSG_SPELL_CHANCE_PROC_LOG",0x13AB,15595,0),
+("CMSG_MOVE_SET_RUN_SPEED",0x13AC,15595,0),
+("SMSG_DISMOUNT",0x2135,15595,0),
+("MSG_MOVE_UPDATE_CAN_FLY",0x13AE,15595,0),
+("MSG_RAID_READY_CHECK_CONFIRM",0x4F05,15595,0),
+("CMSG_VOICE_SESSION_ENABLE",0x13B0,15595,0),
+("SMSG_VOICE_SESSION_ENABLE",0x13B1,15595,0),
+("SMSG_VOICE_PARENTAL_CONTROLS",0x13B2,15595,0),
+("CMSG_GM_WHISPER",0x13B3,15595,0),
+("SMSG_GM_MESSAGECHAT",0x13B4,15595,0),
+("MSG_GM_GEARRATING",0x13B5,15595,0),
+("CMSG_COMMENTATOR_ENABLE",0x13B6,15595,0),
+("SMSG_COMMENTATOR_STATE_CHANGED",0x13B7,15595,0),
+("CMSG_COMMENTATOR_GET_MAP_INFO",0x13B8,15595,0),
+("SMSG_COMMENTATOR_MAP_INFO",0x13B9,15595,0),
+("CMSG_COMMENTATOR_GET_PLAYER_INFO",0x13BA,15595,0),
+("SMSG_COMMENTATOR_GET_PLAYER_INFO",0x13BB,15595,0),
+("SMSG_COMMENTATOR_PLAYER_INFO",0x13BC,15595,0),
+("CMSG_COMMENTATOR_ENTER_INSTANCE",0x13BD,15595,0),
+("CMSG_COMMENTATOR_EXIT_INSTANCE",0x13BE,15595,0),
+("CMSG_COMMENTATOR_INSTANCE_COMMAND",0x13BF,15595,0),
+("SMSG_CLEAR_TARGET",0x4B26,15595,0),
+("CMSG_BOT_DETECTED",0x13C1,15595,0),
+("SMSG_CROSSED_INEBRIATION_THRESHOLD",0x2036,15595,0),
+("CMSG_CHEAT_PLAYER_LOGIN",0x13C3,15595,0),
+("CMSG_CHEAT_PLAYER_LOOKUP",0x13C4,15595,0),
+("SMSG_CHEAT_PLAYER_LOOKUP",0x13C5,15595,0),
+("SMSG_KICK_REASON",0x13C6,15595,0),
+("MSG_RAID_READY_CHECK_FINISHED",0x2E15,15595,0),
+("CMSG_COMPLAIN",0x0427,15595,0),
+("SMSG_COMPLAIN_RESULT",0x6D24,15595,0),
+("SMSG_FEATURE_SYSTEM_STATUS",0x3DB7,15595,0),
+("CMSG_GM_SHOW_COMPLAINTS",0x13CB,15595,0),
+("CMSG_GM_UNSQUELCH",0x13CC,15595,0),
+("CMSG_CHANNEL_SILENCE_VOICE",0x13CD,15595,0),
+("CMSG_CHANNEL_SILENCE_ALL",0x13CE,15595,0),
+("CMSG_CHANNEL_UNSILENCE_VOICE",0x13CF,15595,0),
+("CMSG_CHANNEL_UNSILENCE_ALL",0x13D0,15595,0),
+("CMSG_TARGET_CAST",0x13D1,15595,0),
+("CMSG_TARGET_SCRIPT_CAST",0x13D2,15595,0),
+("CMSG_CHANNEL_DISPLAY_LIST",0x2144,15595,0),
+("CMSG_SET_ACTIVE_VOICE_CHANNEL",0x4305,15595,0),
+("CMSG_GET_CHANNEL_MEMBER_COUNT",0x13D5,15595,0),
+("SMSG_CHANNEL_MEMBER_COUNT",0x6414,15595,0),
+("CMSG_CHANNEL_VOICE_ON",0x1144,15595,0),
+("CMSG_CHANNEL_VOICE_OFF",0x13D8,15595,0),
+("CMSG_DEBUG_LIST_TARGETS",0x13D9,15595,0),
+("SMSG_DEBUG_LIST_TARGETS",0x13DA,15595,0),
+("SMSG_AVAILABLE_VOICE_CHANNEL",0x13DB,15595,0),
+("CMSG_ADD_VOICE_IGNORE",0x13DC,15595,0),
+("CMSG_DEL_VOICE_IGNORE",0x13DD,15595,0),
+("CMSG_PARTY_SILENCE",0x13DE,15595,0),
+("CMSG_PARTY_UNSILENCE",0x13DF,15595,0),
+("MSG_NOTIFY_PARTY_SQUELCH",0x13E0,15595,0),
+("SMSG_COMSAT_RECONNECT_TRY",0x13E1,15595,0),
+("SMSG_COMSAT_DISCONNECT",0x13E2,15595,0),
+("SMSG_COMSAT_CONNECT_FAIL",0x13E3,15595,0),
+("SMSG_VOICE_CHAT_STATUS",0x13E4,15595,0),
+("CMSG_REPORT_PVP_AFK",0x6734,15595,0),
+("SMSG_REPORT_PVP_AFK_RESULT",0x2D06,15595,0),
+("CMSG_GUILD_BANKER_ACTIVATE",0x2E37,15595,0),
+("CMSG_GUILD_BANK_QUERY_TAB",0x2E35,15595,0),
+("SMSG_GUILD_BANK_LIST",0x78A5,15595,0),
+("CMSG_GUILD_BANK_SWAP_ITEMS",0x2315,15595,0),
+("CMSG_GUILD_BANK_BUY_TAB",0x0C37,15595,0),
+("CMSG_GUILD_BANK_UPDATE_TAB",0x0106,15595,0),
+("CMSG_GUILD_BANK_DEPOSIT_MONEY",0x0707,15595,0),
+("CMSG_GUILD_BANK_WITHDRAW_MONEY",0x0037,15595,0),
+("CMSG_GUILD_BANK_LOG_QUERY",0x3224,15595,0),
+("SMSG_GUILD_BANK_LOG_QUERY_RESULT",0x30B2,15595,0),
+("CMSG_SET_CHANNEL_WATCH",0x4517,15595,0),
+("SMSG_USERLIST_ADD",0x0F37,15595,0),
+("SMSG_USERLIST_REMOVE",0x2006,15595,0),
+("SMSG_USERLIST_UPDATE",0x0135,15595,0),
+("CMSG_CLEAR_CHANNEL_WATCH",0x13F4,15595,0),
+("SMSG_INSPECT_RESULTS",0x4014,15595,0),
+("SMSG_GOGOGO_OBSOLETE",0x13F6,15595,0),
+("SMSG_ECHO_PARTY_SQUELCH",0x13F7,15595,0),
+("CMSG_SET_TITLE_SUFFIX",0x13F8,15595,0),
+("CMSG_SPELLCLICK",0x0805,15595,0),
+("SMSG_LOOT_LIST",0x6807,15595,0),
+("CMSG_GM_CHARACTER_RESTORE",0x13FB,15595,0),
+("CMSG_GM_CHARACTER_SAVE",0x13FC,15595,0),
+("SMSG_VOICESESSION_FULL",0x13FD,15595,0),
+("CMSG_GUILD_PERMISSIONS",0x3022,15595,0),
+("SMSG_GUILD_PERMISSIONS",0x34A3,15595,0),
+("CMSG_GUILD_BANK_MONEY_WITHDRAWN",0x1225,15595,0),
+("SMSG_GUILD_BANK_MONEY_WITHDRAWN",0x5DB4,15595,0),
+("CMSG_GUILD_EVENT_LOG_QUERY",0x1220,15595,0),
+("SMSG_GUILD_EVENT_LOG",0x10B2,15595,0),
+("CMSG_MAELSTROM_RENAME_GUILD",0x1401,15595,0),
+("CMSG_GET_MIRRORIMAGE_DATA",0x0C25,15595,0),
+("SMSG_MIRRORIMAGE_DATA",0x2634,15595,0),
+("SMSG_FORCE_DISPLAY_UPDATE",0x1404,15595,0),
+("SMSG_SPELL_CHANCE_RESIST_PUSHBACK",0x1405,15595,0),
+("CMSG_IGNORE_DIMINISHING_RETURNS_CHEAT",0x1406,15595,0),
+("SMSG_IGNORE_DIMINISHING_RETURNS_CHEAT",0x1407,15595,0),
+("CMSG_KEEP_ALIVE",0x0015,15595,0),
+("SMSG_RAID_READY_CHECK_ERROR",0x1409,15595,0),
+("CMSG_OPT_OUT_OF_LOOT",0x6B16,15595,0),
+("CMSG_QUERY_GUILD_BANK_TEXT",0x3220,15595,0),
+("SMSG_GUILD_BANK_TEXT",0x75A3,15595,0),
+("CMSG_SET_GUILD_BANK_TEXT",0x3023,15595,0),
+("CMSG_SET_GRANTABLE_LEVELS",0x140D,15595,0),
+("CMSG_GRANT_LEVEL",0x6D16,15595,0),
+("CMSG_REFER_A_FRIEND",0x140F,15595,0),
+("MSG_GM_CHANGE_ARENA_RATING",0x1410,15595,0),
+("CMSG_DECLINE_CHANNEL_INVITE",0x1411,15595,0),
+("SMSG_GROUPACTION_THROTTLED",0x1412,15595,0),
+("SMSG_OVERRIDE_LIGHT",0x1413,15595,0),
+("SMSG_TOTEM_CREATED",0x2414,15595,0),
+("CMSG_TOTEM_DESTROYED",0x4207,15595,0),
+("CMSG_EXPIRE_RAID_INSTANCE",0x1416,15595,0),
+("CMSG_NO_SPELL_VARIANCE",0x1417,15595,0),
+("CMSG_QUESTGIVER_STATUS_MULTIPLE_QUERY",0x6305,15595,0),
+("SMSG_QUESTGIVER_STATUS_MULTIPLE",0x4F25,15595,0),
+("CMSG_SET_PLAYER_DECLINED_NAMES",0x6316,15595,0),
+("SMSG_SET_PLAYER_DECLINED_NAMES_RESULT",0x2B25,15595,0),
+("CMSG_QUERY_SERVER_BUCK_DATA",0x141C,15595,0),
+("CMSG_CLEAR_SERVER_BUCK_DATA",0x141D,15595,0),
+("SMSG_SERVER_BUCK_DATA",0x141E,15595,0),
+("SMSG_SEND_UNLEARN_SPELLS",0x4E25,15595,0),
+("SMSG_PROPOSE_LEVEL_GRANT",0x6114,15595,0),
+("CMSG_ACCEPT_LEVEL_GRANT",0x0205,15595,0),
+("SMSG_REFER_A_FRIEND_FAILURE",0x2037,15595,0),
+("SMSG_SPLINE_MOVE_SET_FLYING",0x1423,15595,0),
+("SMSG_SPLINE_MOVE_UNSET_FLYING",0x1424,15595,0),
+("SMSG_SUMMON_CANCEL",0x1425,15595,0),
+("CMSG_CHANGE_PERSONAL_ARENA_RATING",0x1426,15595,0),
+("CMSG_ALTER_APPEARANCE",0x0914,15595,0),
+("SMSG_ENABLE_BARBER_SHOP",0x2D16,15595,0),
+("SMSG_BARBER_SHOP_RESULT",0x6125,15595,0),
+("CMSG_CALENDAR_GET_CALENDAR",0x2814,15595,0),
+("CMSG_CALENDAR_GET_EVENT",0x142B,15595,0),
+("CMSG_CALENDAR_GUILD_FILTER",0x142C,15595,0),
+("CMSG_CALENDAR_ARENA_TEAM",0x142D,15595,0),
+("CMSG_CALENDAR_ADD_EVENT",0x142E,15595,0),
+("CMSG_CALENDAR_UPDATE_EVENT",0x142F,15595,0),
+("CMSG_CALENDAR_REMOVE_EVENT",0x1430,15595,0),
+("CMSG_CALENDAR_COPY_EVENT",0x1431,15595,0),
+("CMSG_CALENDAR_EVENT_INVITE",0x1432,15595,0),
+("CMSG_CALENDAR_EVENT_RSVP",0x1433,15595,0),
+("CMSG_CALENDAR_EVENT_REMOVE_INVITE",0x1434,15595,0),
+("CMSG_CALENDAR_EVENT_STATUS",0x1435,15595,0),
+("CMSG_CALENDAR_EVENT_MODERATOR_STATUS",0x1436,15595,0),
+("SMSG_CALENDAR_SEND_CALENDAR",0x6805,15595,0),
+("SMSG_CALENDAR_SEND_EVENT",0x1438,15595,0),
+("SMSG_CALENDAR_FILTER_GUILD",0x1439,15595,0),
+("SMSG_CALENDAR_ARENA_TEAM",0x143A,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE",0x143B,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED",0x143C,15595,0),
+("SMSG_CALENDAR_EVENT_STATUS",0x143D,15595,0),
+("SMSG_CALENDAR_COMMAND_RESULT",0x143E,15595,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_ADDED",0x143F,15595,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_REMOVED",0x1440,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_ALERT",0x1441,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT",0x1442,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_STATUS_ALERT",0x1443,15595,0),
+("SMSG_CALENDAR_EVENT_REMOVED_ALERT",0x1444,15595,0),
+("SMSG_CALENDAR_EVENT_UPDATED_ALERT",0x1445,15595,0),
+("SMSG_CALENDAR_EVENT_MODERATOR_STATUS_ALERT",0x1446,15595,0),
+("CMSG_CALENDAR_COMPLAIN",0x1447,15595,0),
+("CMSG_CALENDAR_GET_NUM_PENDING",0x4D05,15595,0),
+("SMSG_CALENDAR_SEND_NUM_PENDING",0x0C17,15595,0),
+("CMSG_SAVE_DANCE",0x144A,15595,0),
+("SMSG_NOTIFY_DANCE",0x144B,15595,0),
+("CMSG_PLAY_DANCE",0x144C,15595,0),
+("SMSG_PLAY_DANCE",0x144D,15595,0),
+("CMSG_LOAD_DANCES",0x144E,15595,0),
+("CMSG_STOP_DANCE",0x144F,15595,0),
+("SMSG_STOP_DANCE",0x1450,15595,0),
+("CMSG_SYNC_DANCE",0x1451,15595,0),
+("CMSG_DANCE_QUERY",0x1452,15595,0),
+("SMSG_DANCE_QUERY_RESPONSE",0x1453,15595,0),
+("SMSG_INVALIDATE_DANCE",0x1454,15595,0),
+("CMSG_DELETE_DANCE",0x1455,15595,0),
+("SMSG_LEARNED_DANCE_MOVES",0x0E05,15595,0),
+("CMSG_LEARN_DANCE_MOVE",0x1457,15595,0),
+("CMSG_UNLEARN_DANCE_MOVE",0x1458,15595,0),
+("CMSG_SET_RUNE_COUNT",0x1459,15595,0),
+("CMSG_SET_RUNE_COOLDOWN",0x145A,15595,0),
+("MSG_MOVE_SET_PITCH_RATE_CHEAT",0x145B,15595,0),
+("SMSG_MOVE_SET_PITCH_RATE",0x75B0,15595,0),
+("SMSG_FORCE_PITCH_RATE_CHANGE",0x145D,15595,0),
+("CMSG_FORCE_PITCH_RATE_CHANGE_ACK",0x145E,15595,0),
+("SMSG_SPLINE_SET_PITCH_RATE",0x145F,15595,0),
+("CMSG_CALENDAR_EVENT_INVITE_NOTES",0x1460,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_NOTES",0x1461,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_NOTES_ALERT",0x1462,15595,0),
+("CMSG_UPDATE_MISSILE_TRAJECTORY",0x1463,15595,0),
+("SMSG_UPDATE_ACCOUNT_DATA_COMPLETE",0x2015,15595,0),
+("SMSG_TRIGGER_MOVIE",0x4625,15595,0),
+("CMSG_COMPLETE_MOVIE",0x1466,15595,0),
+("CMSG_SET_GLYPH_SLOT",0x1467,15595,0),
+("CMSG_SET_GLYPH",0x1468,15595,0),
+("SMSG_ACHIEVEMENT_EARNED",0x4405,15595,0),
+("SMSG_DYNAMIC_DROP_ROLL_RESULT",0x146A,15595,0),
+("SMSG_CRITERIA_UPDATE",0x6E37,15595,0),
+("CMSG_QUERY_INSPECT_ACHIEVEMENTS",0x4D27,15595,0),
+("SMSG_RESPOND_INSPECT_ACHIEVEMENTS",0x15B0,15595,0),
+("CMSG_DISMISS_CONTROLLED_VEHICLE",0x146E,15595,0),
+("CMSG_COMPLETE_ACHIEVEMENT_CHEAT",0x146F,15595,0),
+("SMSG_QUESTUPDATE_ADD_PVP_KILL",0x4416,15595,0),
+("CMSG_SET_CRITERIA_CHEAT",0x1471,15595,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_UPDATED",0x1472,15595,0),
+("CMSG_UNITANIMTIER_CHEAT",0x1473,15595,0),
+("CMSG_CHAR_CUSTOMIZE",0x2C34,15595,0),
+("SMSG_CHAR_CUSTOMIZE",0x4F16,15595,0),
+("SMSG_PET_RENAMEABLE",0x1476,15595,0),
+("CMSG_REQUEST_VEHICLE_EXIT",0x1477,15595,0),
+("CMSG_REQUEST_VEHICLE_PREV_SEAT",0x1478,15595,0),
+("CMSG_REQUEST_VEHICLE_NEXT_SEAT",0x1479,15595,0),
+("CMSG_REQUEST_VEHICLE_SWITCH_SEAT",0x147A,15595,0),
+("CMSG_PET_LEARN_TALENT",0x6725,15595,0),
+("CMSG_PET_UNLEARN_TALENTS",0x147C,15595,0),
+("SMSG_SET_PHASE_SHIFT",0x70A0,15595,0),
+("SMSG_ALL_ACHIEVEMENT_DATA",0x58B1,15595,0),
+("CMSG_FORCE_SAY_CHEAT",0x147F,15595,0),
+("SMSG_HEALTH_UPDATE",0x1480,15595,0),
+("SMSG_POWER_UPDATE",0x4A07,15595,0),
+("CMSG_GAMEOBJ_REPORT_USE",0x4827,15595,0),
+("SMSG_HIGHEST_THREAT_UPDATE",0x4104,15595,0),
+("SMSG_THREAT_UPDATE",0x4735,15595,0),
+("SMSG_THREAT_REMOVE",0x2E05,15595,0),
+("SMSG_THREAT_CLEAR",0x6437,15595,0),
+("SMSG_CONVERT_RUNE",0x4F14,15595,0),
+("SMSG_RESYNC_RUNES",0x6224,15595,0),
+("SMSG_ADD_RUNE_POWER",0x6915,15595,0),
+("CMSG_START_QUEST",0x148A,15595,0),
+("CMSG_REMOVE_GLYPH",0x148B,15595,0),
+("CMSG_DUMP_OBJECTS",0x148C,15595,0),
+("SMSG_DUMP_OBJECTS_DATA",0x148D,15595,0),
+("CMSG_DISMISS_CRITTER",0x148E,15595,0),
+("SMSG_NOTIFY_DEST_LOC_SPELL_CAST",0x148F,15595,0),
+("CMSG_AUCTION_LIST_PENDING_SALES",0x2C17,15595,0),
+("SMSG_AUCTION_LIST_PENDING_SALES",0x6A27,15595,0),
+("SMSG_MODIFY_COOLDOWN",0x6016,15595,0),
+("SMSG_PET_UPDATE_COMBO_POINTS",0x4325,15595,0),
+("CMSG_ENABLETAXI",0x0C16,15595,0),
+("SMSG_PRE_RESURRECT",0x6C36,15595,0),
+("SMSG_AURA_UPDATE_ALL",0x6916,15595,0),
+("SMSG_AURA_UPDATE",0x4707,15595,0),
+("CMSG_FLOOD_GRACE_CHEAT",0x1498,15595,0),
+("SMSG_SERVER_FIRST_ACHIEVEMENT",0x6424,15595,0),
+("SMSG_PET_LEARNED_SPELL",0x0507,15595,0),
+("SMSG_PET_REMOVED_SPELL",0x6A04,15595,0),
+("CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE",0x7310,15595,0),
+("CMSG_HEARTH_AND_RESURRECT",0x4B34,15595,0),
+("SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA",0x4D34,15595,0),
+("SMSG_CRITERIA_DELETED",0x2915,15595,0),
+("SMSG_ACHIEVEMENT_DELETED",0x6A16,15595,0),
+("CMSG_SERVER_INFO_QUERY",0x14A1,15595,0),
+("SMSG_SERVER_INFO_RESPONSE",0x14A2,15595,0),
+("CMSG_CHECK_LOGIN_CRITERIA",0x14A3,15595,0),
+("SMSG_SERVER_BUCK_DATA_START",0x14A4,15595,0),
+("CMSG_SET_BREATH",0x14A5,15595,0),
+("CMSG_QUERY_VEHICLE_STATUS",0x14A6,15595,0),
+("SMSG_BATTLEGROUND_INFO_THROTTLED",0x14A7,15595,0),
+("SMSG_SET_VEHICLE_REC_ID",0x14A8,15595,0),
+("CMSG_RIDE_VEHICLE_INTERACT",0x14A9,15595,0),
+("CMSG_CONTROLLER_EJECT_PASSENGER",0x14AA,15595,0),
+("SMSG_PET_GUIDS",0x2D26,15595,0),
+("SMSG_CLIENTCACHE_VERSION",0x2734,15595,0),
+("CMSG_CHANGE_GDF_ARENA_RATING",0x14AD,15595,0),
+("CMSG_SET_ARENA_TEAM_RATING_BY_INDEX",0x14AE,15595,0),
+("CMSG_SET_ARENA_TEAM_WEEKLY_GAMES",0x14AF,15595,0),
+("CMSG_SET_ARENA_TEAM_SEASON_GAMES",0x14B0,15595,0),
+("CMSG_SET_ARENA_MEMBER_WEEKLY_GAMES",0x14B1,15595,0),
+("CMSG_SET_ARENA_MEMBER_SEASON_GAMES",0x14B2,15595,0),
+("SMSG_SET_ITEM_PURCHASE_DATA",0x15A3,15595,0),
+("CMSG_GET_ITEM_PURCHASE_DATA",0x2206,15595,0),
+("CMSG_ITEM_PURCHASE_REFUND",0x6134,15595,0),
+("SMSG_ITEM_PURCHASE_REFUND_RESULT",0x5DB1,15595,0),
+("CMSG_CORPSE_TRANSPORT_QUERY",0x6205,15595,0),
+("SMSG_CORPSE_TRANSPORT_QUERY",0x0E35,15595,0),
+("CMSG_UNUSED5",0x14B9,15595,0),
+("CMSG_UNUSED6",0x14BA,15595,0),
+("CMSG_CALENDAR_EVENT_SIGNUP",0x14BB,15595,0),
+("SMSG_CALENDAR_CLEAR_PENDING_ACTION",0x14BC,15595,0),
+("SMSG_LOAD_EQUIPMENT_SET",0x2E04,15595,0),
+("CMSG_SAVE_EQUIPMENT_SET",0x4F27,15595,0),
+("CMSG_ON_MISSILE_TRAJECTORY_COLLISION",0x14BF,15595,0),
+("SMSG_NOTIFY_MISSILE_TRAJECTORY_COLLISION",0x14C0,15595,0),
+("SMSG_TALENT_UPDATE",0x6F26,15595,0),
+("CMSG_LEARN_TALENT_GROUP",0x2415,15595,0),
+("CMSG_PET_LEARN_TALENT_GROUP",0x6E24,15595,0),
+("CMSG_SET_ACTIVE_TALENT_GROUP_OBSOLETE",0x14C4,15595,0),
+("CMSG_GM_GRANT_ACHIEVEMENT",0x14C5,15595,0),
+("CMSG_GM_REMOVE_ACHIEVEMENT",0x14C6,15595,0),
+("CMSG_GM_SET_CRITERIA_FOR_PLAYER",0x14C7,15595,0),
+("SMSG_DESTROY_ARENA_UNIT",0x2637,15595,0),
+("SMSG_ARENA_TEAM_CHANGE_FAILED",0x14C9,15595,0),
+("CMSG_PROFILEDATA_REQUEST",0x14CA,15595,0),
+("SMSG_PROFILEDATA_RESPONSE",0x14CB,15595,0),
+("CMSG_START_BATTLEFIELD_CHEAT",0x14CC,15595,0),
+("CMSG_END_BATTLEFIELD_CHEAT",0x14CD,15595,0),
+("SMSG_COMPOUND_MOVE",0x14CE,15595,0),
+("SMSG_MOVE_GRAVITY_DISABLE",0x14CF,15595,0),
+("CMSG_MOVE_GRAVITY_DISABLE_ACK",0x14D0,15595,0),
+("SMSG_MOVE_GRAVITY_ENABLE",0x14D1,15595,0),
+("CMSG_MOVE_GRAVITY_ENABLE_ACK",0x14D2,15595,0),
+("MSG_MOVE_GRAVITY_CHNG",0x14D3,15595,0),
+("SMSG_SPLINE_MOVE_GRAVITY_DISABLE",0x5DB5,15595,0),
+("SMSG_SPLINE_MOVE_GRAVITY_ENABLE",0x3CA6,15595,0),
+("CMSG_USE_EQUIPMENT_SET",0x0417,15595,0),
+("SMSG_USE_EQUIPMENT_SET_RESULT",0x2424,15595,0),
+("CMSG_FORCE_ANIM",0x14D8,15595,0),
+("SMSG_FORCE_ANIM",0x14D9,15595,0),
+("CMSG_CHAR_FACTION_CHANGE",0x2735,15595,0),
+("SMSG_CHAR_FACTION_CHANGE",0x4C06,15595,0),
+("CMSG_PVP_QUEUE_STATS_REQUEST",0x14DC,15595,0),
+("SMSG_PVP_QUEUE_STATS",0x14DD,15595,0),
+("CMSG_SET_PAID_SERVICE_CHEAT",0x14DE,15595,0),
+("SMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE",0x14DF,15595,0),
+("CMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE_RESPONSE",0x14E0,15595,0),
+("SMSG_BATTLEFIELD_MANAGER_ENTERING",0x14E1,15595,0),
+("SMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE",0x14E2,15595,0),
+("CMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE_RESPONSE",0x14E3,15595,0),
+("CMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST",0x14E4,15595,0),
+("SMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST_RESPONSE",0x14E5,15595,0),
+("SMSG_BATTLEFIELD_MANAGER_EJECT_PENDING",0x14E6,15595,0),
+("SMSG_BATTLEFIELD_MANAGER_EJECTED",0x14E7,15595,0),
+("CMSG_BATTLEFIELD_MANAGER_EXIT_REQUEST",0x14E8,15595,0),
+("SMSG_BATTLEFIELD_MANAGER_STATE_CHANGED",0x14E9,15595,0),
+("CMSG_BATTLEFIELD_MANAGER_ADVANCE_STATE",0x14EA,15595,0),
+("CMSG_BATTLEFIELD_MANAGER_SET_NEXT_TRANSITION_TIME",0x14EB,15595,0),
+("MSG_SET_RAID_DIFFICULTY",0x0614,15595,0),
+("CMSG_XPGAIN",0x14ED,15595,0),
+("SMSG_XPGAIN",0x14EE,15595,0),
+("SMSG_GMTICKET_RESPONSE_ERROR",0x14EF,15595,0),
+("SMSG_GMTICKET_GET_RESPONSE",0x2E34,15595,0),
+("CMSG_GMTICKET_RESOLVE_RESPONSE",0x6506,15595,0),
+("SMSG_GMTICKET_RESOLVE_RESPONSE",0x0A04,15595,0),
+("SMSG_GMTICKET_CREATE_RESPONSE_TICKET",0x14F3,15595,0),
+("CMSG_GM_CREATE_TICKET_RESPONSE",0x14F4,15595,0),
+("CMSG_SERVERINFO",0x14F5,15595,0),
+("SMSG_SERVERINFO",0x14F6,15595,0),
+("CMSG_UI_TIME_REQUEST",0x4605,15595,0),
+("SMSG_UI_TIME",0x4A14,15595,0),
+("CMSG_CHAR_RACE_CHANGE",0x0D24,15595,0),
+("MSG_VIEW_PHASE_SHIFT",0x14FA,15595,0),
+("SMSG_TALENTS_INVOLUNTARILY_RESET",0x14FB,15595,0),
+("CMSG_DEBUG_SERVER_GEO",0x14FC,15595,0),
+("SMSG_DEBUG_SERVER_GEO",0x14FD,15595,0),
+("SMSG_LOOT_UPDATE",0x14FE,15595,0),
+("UMSG_UPDATE_GROUP_INFO",0x14FF,15595,0),
+("CMSG_READY_FOR_ACCOUNT_DATA_TIMES",0x2B16,15595,0),
+("CMSG_QUERY_GET_ALL_QUESTS",0x2317,15595,0),
+("SMSG_ALL_QUESTS_COMPLETED",0x6314,15595,0),
+("CMSG_GMLAGREPORT_SUBMIT",0x1503,15595,0),
+("CMSG_AFK_MONITOR_INFO_REQUEST",0x1504,15595,0),
+("SMSG_AFK_MONITOR_INFO_RESPONSE",0x1505,15595,0),
+("CMSG_AFK_MONITOR_INFO_CLEAR",0x1506,15595,0),
+("SMSG_AREA_TRIGGER_NO_CORPSE",0x2A14,15595,0),
+("CMSG_GM_NUKE_CHARACTER",0x1508,15595,0),
+("CMSG_LOW_LEVEL_RAID",0x4435,15595,0),
+("CMSG_LOW_LEVEL_RAID_USER",0x0536,15595,0),
+("SMSG_CAMERA_SHAKE",0x150B,15595,0),
+("SMSG_SOCKET_GEMS",0x150C,15595,0),
+("CMSG_SET_CHARACTER_MODEL",0x150D,15595,0),
+("SMSG_CONNECT_TO",0x0942,15595,0),
+("CMSG_CONNECT_TO_FAILED",0x150F,15595,0),
+("SMSG_SUSPEND_COMMS",0x1510,15595,0),
+("CMSG_SUSPEND_COMMS_ACK",0x1511,15595,0),
+("SMSG_RESUME_COMMS",0x1512,15595,0),
+("CMSG_AUTH_CONTINUED_SESSION",0x1513,15595,0),
+("CMSG_DROP_NEW_CONNECTION",0x1514,15595,0),
+("SMSG_SEND_ALL_COMBAT_LOG",0x1515,15595,0),
+("SMSG_OPEN_LFG_DUNGEON_FINDER",0x1516,15595,0),
+("SMSG_MOVE_SET_COLLISION_HGT",0x11B0,15595,0),
+("CMSG_MOVE_SET_COLLISION_HGT_ACK",0x1518,15595,0),
+("MSG_MOVE_SET_COLLISION_HGT",0x1519,15595,0),
+("CMSG_CLEAR_RANDOM_BG_WIN_TIME",0x151A,15595,0),
+("CMSG_CLEAR_HOLIDAY_BG_WIN_TIME",0x151B,15595,0),
+("CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND",0x151C,15595,0),
+("SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT1",0x151D,15595,0),
+("SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT2",0x151E,15595,0),
+("SMSG_COMPRESSED_UNKNOWN_1310",0x151F,15595,0),
+("SMSG_UNKNOWN_1311",0x1520,15595,0),
+("SMSG_UNKNOWN_1312",0x1521,15595,0),
+("UMSG_UNKNOWN_1313",0x1522,15595,0),
+("SMSG_UNKNOWN_1314",0x1523,15595,0),
+("SMSG_UNKNOWN_1315",0x1524,15595,0),
+("SMSG_UNKNOWN_1316",0x1525,15595,0),
+("SMSG_UNKNOWN_1317",0x1526,15595,0),
+("UMSG_UNKNOWN_1318",0x1527,15595,0),
+("UMSG_UNKNOWN_1319",0x1528,15595,0),
+("CMSG_UNKNOWN_1320",0x1529,15595,0),
+("UMSG_UNKNOWN_1321",0x152A,15595,0),
+("UMSG_UNKNOWN_1322",0x152B,15595,0),
+("UMSG_UNKNOWN_1323",0x152C,15595,0),
+("UMSG_UNKNOWN_1324",0x152D,15595,0),
+("UMSG_UNKNOWN_1325",0x152E,15595,0),
+("UMSG_UNKNOWN_1326",0x152F,15595,0),
+("UMSG_UNKNOWN_1327",0x1530,15595,0),
+("UMSG_UNKNOWN_1328",0x1531,15595,0),
+("SMSG_UNKNOWN_1329",0x1532,15595,0),
+("UMSG_UNKNOWN_1330",0x1533,15595,0),
+("UMSG_UNKNOWN_1331",0x1534,15595,0),
+("UMSG_UNKNOWN_1332",0x1535,15595,0),
+("UMSG_UNKNOWN_1333",0x1536,15595,0),
+("UMSG_UNKNOWN_1334",0x1537,15595,0),
+("SMSG_PLAYER_MOVE",0x79A2,15595,0),
+("SMSG_SPLINE_MOVE_SET_FLIGHT_BACK_SPEED",0x38B3,15595,0),
+("SMSG_SPLINE_MOVE_SET_FLIGHT_SPEED",0x39A0,15595,0),
+("SMSG_SPLINE_MOVE_SET_PITCH_RATE",0x14B0,15595,0),
+("SMSG_SPLINE_MOVE_SET_RUN_BACK_SPEED",0x3DB3,15595,0),
+("SMSG_SPLINE_MOVE_SET_RUN_SPEED",0x51B7,15595,0),
+("SMSG_SPLINE_MOVE_SET_SWIM_SPEED",0x39A4,15595,0),
+("SMSG_SPLINE_MOVE_SET_SWIM_BACK_SPEED",0x59A1,15595,0),
+("SMSG_SPLINE_MOVE_SET_TURN_RATE",0x78B5,15595,0),
+("SMSG_SPLINE_MOVE_SET_WALK_SPEED",0x34A5,15595,0),
+("CMSG_REORDER_CHARACTERS",0x0593,15595,0),
+("SMSG_SET_CURRENCY_WEEK_LIMIT",0x70A7,15595,0),
+("SMSG_SET_CURRENCY",0x59B0,15595,0),
+("SMSG_SEND_CURRENCIES",0x15A5,15595,0),
+("CMSG_SET_CURRENCY_FLAGS",0x7306,15595,0),
+("SMSG_WEEKLY_RESET_CURRENCIES",0x3CA1,15595,0),
+("CMSG_INSPECT_RATED_BG_STATS",0x3010,15595,0),
+("CMSG_REQUEST_RATED_BG_INFO",0x2423,15595,0),
+("CMSG_REQUEST_RATED_BG_STATS",0x05B3,15595,0),
+("SMSG_RATED_BG_STATS",0x34A1,15595,0),
+("CMSG_REQUEST_PVP_REWARDS",0x780C,15595,0),
+("SMSG_PVP_REWARDS",0x5DA4,15595,0),
+("CMSG_REQUEST_PVP_OPTIONS_ENABLED",0x24A1,15595,0),
+("SMSG_PVP_OPTIONS_ENABLED",0x50A1,15595,0),
+("NUM_MSG_TYPES",0x0,15595,1);
diff --git a/sql_mr/Opcodes/opcodes_mangos_15952.sql b/sql_mr/Opcodes/opcodes_mangos_15952.sql
new file mode 100644
index 00000000000..1fad7dafc86
--- /dev/null
+++ b/sql_mr/Opcodes/opcodes_mangos_15952.sql
@@ -0,0 +1,1350 @@
+-- Opcode table for client build 15952
+
+CREATE TABLE IF NOT EXISTS `opcodes` (
+    `version` smallint(5) NOT NULL COMMENT "Client build",
+    `name` varchar(64) NOT NULL COMMENT "opcode name",
+    `value` int(10) NOT NULL COMMENT "opcode value",
+    `flags` int(10) unsigned NOT NULL DEFAULT "0" COMMENT "current opcode flags",
+    UNIQUE KEY `version` (`version`,`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT="Universal opcode storage";
+
+DELETE FROM `opcodes` WHERE `version` = 15952;
+
+INSERT INTO `opcodes` (`name`, `value`, `version`, `flags`) VALUES
+("MSG_NULL_ACTION",0x1001,15952,0),
+("CMSG_BOOTME",0x1002,15952,0),
+("CMSG_DBLOOKUP",0x1003,15952,0),
+("SMSG_DBLOOKUP",0x1004,15952,0),
+("CMSG_QUERY_OBJECT_POSITION",0x1005,15952,0),
+("SMSG_QUERY_OBJECT_POSITION",0x1006,15952,0),
+("CMSG_QUERY_OBJECT_ROTATION",0x1007,15952,0),
+("SMSG_QUERY_OBJECT_ROTATION",0x1008,15952,0),
+("CMSG_WORLD_TELEPORT",0x1009,15952,0),
+("CMSG_TELEPORT_TO_UNIT",0x100A,15952,0),
+("CMSG_ZONE_MAP",0x100B,15952,0),
+("SMSG_ZONE_MAP",0x100C,15952,0),
+("CMSG_DEBUG_CHANGECELLZONE",0x100D,15952,0),
+("CMSG_MOVE_CHARACTER_CHEAT",0x100E,15952,0),
+("SMSG_MOVE_CHARACTER_CHEAT",0x100F,15952,0),
+("CMSG_RECHARGE",0x1010,15952,0),
+("CMSG_LEARN_SPELL",0x1011,15952,0),
+("CMSG_CREATEMONSTER",0x1012,15952,0),
+("CMSG_DESTROYMONSTER",0x1013,15952,0),
+("CMSG_CREATEITEM",0x1014,15952,0),
+("CMSG_CREATEGAMEOBJECT",0x1015,15952,0),
+("SMSG_CHECK_FOR_BOTS",0x1016,15952,0),
+("CMSG_MAKEMONSTERATTACKGUID",0x1017,15952,0),
+("CMSG_BOT_DETECTED2",0x1018,15952,0),
+("CMSG_FORCEACTION",0x1019,15952,0),
+("CMSG_FORCEACTIONONOTHER",0x101A,15952,0),
+("CMSG_FORCEACTIONSHOW",0x101B,15952,0),
+("SMSG_FORCEACTIONSHOW",0x101C,15952,0),
+("CMSG_PETGODMODE",0x101D,15952,0),
+("SMSG_PETGODMODE",0x101E,15952,0),
+("SMSG_REFER_A_FRIEND_EXPIRED",0x101F,15952,0),
+("CMSG_WEATHER_SPEED_CHEAT",0x1020,15952,0),
+("CMSG_UNDRESSPLAYER",0x1021,15952,0),
+("CMSG_BEASTMASTER",0x1022,15952,0),
+("CMSG_GODMODE",0x1023,15952,0),
+("SMSG_GODMODE",0x1024,15952,0),
+("CMSG_CHEAT_SETMONEY",0x1025,15952,0),
+("CMSG_LEVEL_CHEAT",0x1026,15952,0),
+("CMSG_PET_LEVEL_CHEAT",0x1027,15952,0),
+("CMSG_SET_WORLDSTATE",0x1028,15952,0),
+("CMSG_COOLDOWN_CHEAT",0x1029,15952,0),
+("CMSG_USE_SKILL_CHEAT",0x102A,15952,0),
+("CMSG_FLAG_QUEST",0x102B,15952,0),
+("CMSG_FLAG_QUEST_FINISH",0x102C,15952,0),
+("CMSG_CLEAR_QUEST",0x102D,15952,0),
+("CMSG_SEND_EVENT",0x102E,15952,0),
+("CMSG_DEBUG_AISTATE",0x102F,15952,0),
+("SMSG_DEBUG_AISTATE",0x1030,15952,0),
+("CMSG_DISABLE_PVP_CHEAT",0x1031,15952,0),
+("CMSG_ADVANCE_SPAWN_TIME",0x1032,15952,0),
+("SMSG_DESTRUCTIBLE_BUILDING_DAMAGE",0x1033,15952,0),
+("CMSG_AUTH_SRP6_BEGIN",0x1034,15952,0),
+("CMSG_AUTH_SRP6_PROOF",0x1035,15952,0),
+("CMSG_AUTH_SRP6_RECODE",0x1036,15952,0),
+("CMSG_CHAR_CREATE",0x469,15952,0),
+("CMSG_CHAR_ENUM",0xBA8,15952,0),
+("CMSG_CHAR_DELETE",0x0D6,15952,0),
+("SMSG_AUTH_SRP6_RESPONSE",0x103A,15952,0),
+("SMSG_CHAR_CREATE",0x4BB,15952,0),
+("SMSG_CHAR_ENUM",0xA71,15952,0),
+("SMSG_CHAR_DELETE",0x23A,15952,0),
+("CMSG_PLAYER_LOGIN",0xD25,15952,0),
+("SMSG_NEW_WORLD",0x103F,15952,0),
+("SMSG_TRANSFER_PENDING",0x1040,15952,0),
+("SMSG_TRANSFER_ABORTED",0x1041,15952,0),
+("SMSG_CHARACTER_LOGIN_FAILED",0x1042,15952,0),
+("SMSG_LOGIN_SETTIMESPEED",0x1043,15952,0),
+("SMSG_GAMETIME_UPDATE",0x1044,15952,0),
+("CMSG_GAMETIME_SET",0x1045,15952,0),
+("SMSG_GAMETIME_SET",0x1046,15952,0),
+("CMSG_GAMESPEED_SET",0x1047,15952,0),
+("SMSG_GAMESPEED_SET",0x1048,15952,0),
+("CMSG_SERVERTIME",0x1049,15952,0),
+("SMSG_SERVERTIME",0x104A,15952,0),
+("CMSG_PLAYER_LOGOUT",0x104B,15952,0),
+("CMSG_LOGOUT_REQUEST",0x104C,15952,0),
+("SMSG_LOGOUT_RESPONSE",0x104D,15952,0),
+("SMSG_LOGOUT_COMPLETE",0x104E,15952,0),
+("CMSG_LOGOUT_CANCEL",0x104F,15952,0),
+("SMSG_LOGOUT_CANCEL_ACK",0x1050,15952,0),
+("CMSG_NAME_QUERY",0x1051,15952,0),
+("SMSG_NAME_QUERY_RESPONSE",0x1052,15952,0),
+("CMSG_PET_NAME_QUERY",0x1053,15952,0),
+("SMSG_PET_NAME_QUERY_RESPONSE",0x1054,15952,0),
+("CMSG_GUILD_QUERY",0x1055,15952,0),
+("SMSG_GUILD_QUERY_RESPONSE",0x1056,15952,0),
+("CMSG_ITEM_QUERY_SINGLE",0x1057,15952,0),
+("CMSG_ITEM_QUERY_MULTIPLE",0x1058,15952,0),
+("SMSG_ITEM_QUERY_SINGLE_RESPONSE",0x1059,15952,0),
+("SMSG_ITEM_QUERY_MULTIPLE_RESPONSE",0x105A,15952,0),
+("CMSG_PAGE_TEXT_QUERY",0x105B,15952,0),
+("SMSG_PAGE_TEXT_QUERY_RESPONSE",0x105C,15952,0),
+("CMSG_QUEST_QUERY",0x105D,15952,0),
+("SMSG_QUEST_QUERY_RESPONSE",0x105E,15952,0),
+("CMSG_GAMEOBJECT_QUERY",0x105F,15952,0),
+("SMSG_GAMEOBJECT_QUERY_RESPONSE",0x1060,15952,0),
+("CMSG_CREATURE_QUERY",0x1061,15952,0),
+("SMSG_CREATURE_QUERY_RESPONSE",0x1062,15952,0),
+("CMSG_WHO",0x1063,15952,0),
+("SMSG_WHO",0x1064,15952,0),
+("CMSG_WHOIS",0x1065,15952,0),
+("SMSG_WHOIS",0x1066,15952,0),
+("CMSG_CONTACT_LIST",0x1067,15952,0),
+("SMSG_CONTACT_LIST",0x1068,15952,0),
+("SMSG_FRIEND_STATUS",0x1069,15952,0),
+("CMSG_ADD_FRIEND",0x106A,15952,0),
+("CMSG_DEL_FRIEND",0x106B,15952,0),
+("CMSG_SET_CONTACT_NOTES",0x106C,15952,0),
+("CMSG_ADD_IGNORE",0x106D,15952,0),
+("CMSG_DEL_IGNORE",0x106E,15952,0),
+("CMSG_GROUP_INVITE",0x106F,15952,0),
+("SMSG_GROUP_INVITE",0x1070,15952,0),
+("CMSG_GROUP_CANCEL",0x1071,15952,0),
+("SMSG_GROUP_CANCEL",0x1072,15952,0),
+("CMSG_GROUP_ACCEPT",0x1073,15952,0),
+("CMSG_GROUP_DECLINE",0x1074,15952,0),
+("SMSG_GROUP_DECLINE",0x1075,15952,0),
+("CMSG_GROUP_UNINVITE",0x1076,15952,0),
+("CMSG_GROUP_UNINVITE_GUID",0x1077,15952,0),
+("SMSG_GROUP_UNINVITE",0x1078,15952,0),
+("CMSG_GROUP_SET_LEADER",0x1079,15952,0),
+("SMSG_GROUP_SET_LEADER",0x107A,15952,0),
+("CMSG_LOOT_METHOD",0x107B,15952,0),
+("CMSG_GROUP_DISBAND",0x107C,15952,0),
+("SMSG_GROUP_DESTROYED",0x107D,15952,0),
+("SMSG_GROUP_LIST",0x107E,15952,0),
+("SMSG_PARTY_MEMBER_STATS",0x107F,15952,0),
+("SMSG_PARTY_COMMAND_RESULT",0x1080,15952,0),
+("UMSG_UPDATE_GROUP_MEMBERS",0x1081,15952,0),
+("CMSG_GUILD_CREATE",0x1082,15952,0),
+("CMSG_GUILD_INVITE",0x1083,15952,0),
+("SMSG_GUILD_INVITE",0x1084,15952,0),
+("CMSG_GUILD_ACCEPT",0x1085,15952,0),
+("CMSG_GUILD_DECLINE",0x1086,15952,0),
+("SMSG_GUILD_DECLINE",0x1087,15952,0),
+("CMSG_GUILD_INFO",0x1088,15952,0),
+("SMSG_GUILD_INFO",0x1089,15952,0),
+("CMSG_GUILD_ROSTER",0x108A,15952,0),
+("SMSG_GUILD_ROSTER",0x108B,15952,0),
+("CMSG_GUILD_PROMOTE",0x108C,15952,0),
+("CMSG_GUILD_DEMOTE",0x108D,15952,0),
+("CMSG_GUILD_LEAVE",0x108E,15952,0),
+("CMSG_GUILD_REMOVE",0x108F,15952,0),
+("CMSG_GUILD_DISBAND",0x1090,15952,0),
+("CMSG_GUILD_LEADER",0x1091,15952,0),
+("CMSG_GUILD_MOTD",0x1092,15952,0),
+("SMSG_GUILD_EVENT",0x1093,15952,0),
+("SMSG_GUILD_COMMAND_RESULT",0x1094,15952,0),
+("UMSG_UPDATE_GUILD",0x1095,15952,0),
+("CMSG_MESSAGECHAT",0x1096,15952,0),
+("SMSG_MESSAGECHAT",0x1097,15952,0),
+("CMSG_JOIN_CHANNEL",0x1098,15952,0),
+("CMSG_LEAVE_CHANNEL",0x1099,15952,0),
+("SMSG_CHANNEL_NOTIFY",0x109A,15952,0),
+("CMSG_CHANNEL_LIST",0x109B,15952,0),
+("SMSG_CHANNEL_LIST",0x109C,15952,0),
+("CMSG_CHANNEL_PASSWORD",0x109D,15952,0),
+("CMSG_CHANNEL_SET_OWNER",0x109E,15952,0),
+("CMSG_CHANNEL_OWNER",0x109F,15952,0),
+("CMSG_CHANNEL_MODERATOR",0x10A0,15952,0),
+("CMSG_CHANNEL_UNMODERATOR",0x10A1,15952,0),
+("CMSG_CHANNEL_MUTE",0x10A2,15952,0),
+("CMSG_CHANNEL_UNMUTE",0x10A3,15952,0),
+("CMSG_CHANNEL_INVITE",0x10A4,15952,0),
+("CMSG_CHANNEL_KICK",0x10A5,15952,0),
+("CMSG_CHANNEL_BAN",0x10A6,15952,0),
+("CMSG_CHANNEL_UNBAN",0x10A7,15952,0),
+("CMSG_CHANNEL_ANNOUNCEMENTS",0x10A8,15952,0),
+("CMSG_CHANNEL_MODERATE",0x10A9,15952,0),
+("SMSG_UPDATE_OBJECT",0x10AA,15952,0),
+("SMSG_DESTROY_OBJECT",0x10AB,15952,0),
+("CMSG_USE_ITEM",0x10AC,15952,0),
+("CMSG_OPEN_ITEM",0x10AD,15952,0),
+("CMSG_READ_ITEM",0x10AE,15952,0),
+("SMSG_READ_ITEM_OK",0x10AF,15952,0),
+("SMSG_READ_ITEM_FAILED",0x10B0,15952,0),
+("SMSG_ITEM_COOLDOWN",0x10B1,15952,0),
+("CMSG_GAMEOBJ_USE",0x10B2,15952,0),
+("CMSG_DESTROY_ITEMS",0x10B3,15952,0),
+("SMSG_GAMEOBJECT_CUSTOM_ANIM",0x10B4,15952,0),
+("CMSG_AREATRIGGER",0x10B5,15952,0),
+("MSG_MOVE_START_FORWARD",0x10B6,15952,0),
+("MSG_MOVE_START_BACKWARD",0x10B7,15952,0),
+("MSG_MOVE_STOP",0x10B8,15952,0),
+("MSG_MOVE_START_STRAFE_LEFT",0x10B9,15952,0),
+("MSG_MOVE_START_STRAFE_RIGHT",0x10BA,15952,0),
+("MSG_MOVE_STOP_STRAFE",0x10BB,15952,0),
+("MSG_MOVE_JUMP",0x10BC,15952,0),
+("MSG_MOVE_START_TURN_LEFT",0x10BD,15952,0),
+("MSG_MOVE_START_TURN_RIGHT",0x10BE,15952,0),
+("MSG_MOVE_STOP_TURN",0x10BF,15952,0),
+("MSG_MOVE_START_PITCH_UP",0x10C0,15952,0),
+("MSG_MOVE_START_PITCH_DOWN",0x10C1,15952,0),
+("MSG_MOVE_STOP_PITCH",0x10C2,15952,0),
+("MSG_MOVE_SET_RUN_MODE",0x10C3,15952,0),
+("MSG_MOVE_SET_WALK_MODE",0x10C4,15952,0),
+("MSG_MOVE_TOGGLE_LOGGING",0x10C5,15952,0),
+("MSG_MOVE_TELEPORT",0x10C6,15952,0),
+("MSG_MOVE_TELEPORT_CHEAT",0x10C7,15952,0),
+("MSG_MOVE_TELEPORT_ACK",0x10C8,15952,0),
+("MSG_MOVE_TOGGLE_FALL_LOGGING",0x10C9,15952,0),
+("MSG_MOVE_FALL_LAND",0x10CA,15952,0),
+("MSG_MOVE_START_SWIM",0x10CB,15952,0),
+("MSG_MOVE_STOP_SWIM",0x10CC,15952,0),
+("MSG_MOVE_SET_RUN_SPEED_CHEAT",0x10CD,15952,0),
+("MSG_MOVE_SET_RUN_SPEED",0x10CE,15952,0),
+("MSG_MOVE_SET_RUN_BACK_SPEED_CHEAT",0x10CF,15952,0),
+("MSG_MOVE_SET_RUN_BACK_SPEED",0x10D0,15952,0),
+("MSG_MOVE_SET_WALK_SPEED_CHEAT",0x10D1,15952,0),
+("MSG_MOVE_SET_WALK_SPEED",0x10D2,15952,0),
+("MSG_MOVE_SET_SWIM_SPEED_CHEAT",0x10D3,15952,0),
+("MSG_MOVE_SET_SWIM_SPEED",0x10D4,15952,0),
+("MSG_MOVE_SET_SWIM_BACK_SPEED_CHEAT",0x10D5,15952,0),
+("MSG_MOVE_SET_SWIM_BACK_SPEED",0x10D6,15952,0),
+("MSG_MOVE_SET_ALL_SPEED_CHEAT",0x10D7,15952,0),
+("MSG_MOVE_SET_TURN_RATE_CHEAT",0x10D8,15952,0),
+("MSG_MOVE_SET_TURN_RATE",0x10D9,15952,0),
+("MSG_MOVE_TOGGLE_COLLISION_CHEAT",0x10DA,15952,0),
+("MSG_MOVE_SET_FACING",0x10DB,15952,0),
+("MSG_MOVE_SET_PITCH",0x10DC,15952,0),
+("MSG_MOVE_WORLDPORT_ACK",0x10DD,15952,0),
+("SMSG_MONSTER_MOVE",0x10DE,15952,0),
+("SMSG_MOVE_WATER_WALK",0x10DF,15952,0),
+("SMSG_MOVE_LAND_WALK",0x10E0,15952,0),
+("CMSG_MOVE_CHARM_PORT_CHEAT",0x10E1,15952,0),
+("CMSG_MOVE_SET_RAW_POSITION",0x10E2,15952,0),
+("SMSG_FORCE_RUN_SPEED_CHANGE",0x10E3,15952,0),
+("CMSG_FORCE_RUN_SPEED_CHANGE_ACK",0x10E4,15952,0),
+("SMSG_FORCE_RUN_BACK_SPEED_CHANGE",0x10E5,15952,0),
+("CMSG_FORCE_RUN_BACK_SPEED_CHANGE_ACK",0x10E6,15952,0),
+("SMSG_FORCE_SWIM_SPEED_CHANGE",0x10E7,15952,0),
+("CMSG_FORCE_SWIM_SPEED_CHANGE_ACK",0x10E8,15952,0),
+("SMSG_FORCE_MOVE_ROOT",0x10E9,15952,0),
+("CMSG_FORCE_MOVE_ROOT_ACK",0x10EA,15952,0),
+("SMSG_FORCE_MOVE_UNROOT",0x10EB,15952,0),
+("CMSG_FORCE_MOVE_UNROOT_ACK",0x10EC,15952,0),
+("MSG_MOVE_ROOT",0x10ED,15952,0),
+("MSG_MOVE_UNROOT",0x10EE,15952,0),
+("MSG_MOVE_HEARTBEAT",0x10EF,15952,0),
+("SMSG_MOVE_KNOCK_BACK",0x10F0,15952,0),
+("CMSG_MOVE_KNOCK_BACK_ACK",0x10F1,15952,0),
+("MSG_MOVE_KNOCK_BACK",0x10F2,15952,0),
+("SMSG_MOVE_FEATHER_FALL",0x10F3,15952,0),
+("SMSG_MOVE_NORMAL_FALL",0x10F4,15952,0),
+("SMSG_MOVE_SET_HOVER",0x10F5,15952,0),
+("SMSG_MOVE_UNSET_HOVER",0x10F6,15952,0),
+("CMSG_MOVE_HOVER_ACK",0x10F7,15952,0),
+("MSG_MOVE_HOVER",0x10F8,15952,0),
+("CMSG_TRIGGER_CINEMATIC_CHEAT",0x10F9,15952,0),
+("CMSG_OPENING_CINEMATIC",0x10FA,15952,0),
+("SMSG_TRIGGER_CINEMATIC",0x10FB,15952,0),
+("CMSG_NEXT_CINEMATIC_CAMERA",0x10FC,15952,0),
+("CMSG_COMPLETE_CINEMATIC",0x10FD,15952,0),
+("SMSG_TUTORIAL_FLAGS",0x10FE,15952,0),
+("CMSG_TUTORIAL_FLAG",0x10FF,15952,0),
+("CMSG_TUTORIAL_CLEAR",0x1100,15952,0),
+("CMSG_TUTORIAL_RESET",0x1101,15952,0),
+("CMSG_STANDSTATECHANGE",0x1102,15952,0),
+("CMSG_EMOTE",0x1103,15952,0),
+("SMSG_EMOTE",0x1104,15952,0),
+("CMSG_TEXT_EMOTE",0x1105,15952,0),
+("SMSG_TEXT_EMOTE",0x1106,15952,0),
+("CMSG_AUTOEQUIP_GROUND_ITEM",0x1107,15952,0),
+("CMSG_AUTOSTORE_GROUND_ITEM",0x1108,15952,0),
+("CMSG_AUTOSTORE_LOOT_ITEM",0x1109,15952,0),
+("CMSG_STORE_LOOT_IN_SLOT",0x110A,15952,0),
+("CMSG_AUTOEQUIP_ITEM",0x110B,15952,0),
+("CMSG_AUTOSTORE_BAG_ITEM",0x110C,15952,0),
+("CMSG_SWAP_ITEM",0x110D,15952,0),
+("CMSG_SWAP_INV_ITEM",0x110E,15952,0),
+("CMSG_SPLIT_ITEM",0x110F,15952,0),
+("CMSG_AUTOEQUIP_ITEM_SLOT",0x1110,15952,0),
+("CMSG_UNCLAIM_LICENSE",0x1111,15952,0),
+("CMSG_DESTROYITEM",0x1112,15952,0),
+("SMSG_INVENTORY_CHANGE_FAILURE",0x1113,15952,0),
+("SMSG_OPEN_CONTAINER",0x1114,15952,0),
+("CMSG_INSPECT",0x1115,15952,0),
+("SMSG_INSPECT_RESULTS_UPDATE",0x1116,15952,0),
+("CMSG_INITIATE_TRADE",0x1117,15952,0),
+("CMSG_BEGIN_TRADE",0x1118,15952,0),
+("CMSG_BUSY_TRADE",0x1119,15952,0),
+("CMSG_IGNORE_TRADE",0x111A,15952,0),
+("CMSG_ACCEPT_TRADE",0x111B,15952,0),
+("CMSG_UNACCEPT_TRADE",0x111C,15952,0),
+("CMSG_CANCEL_TRADE",0x111D,15952,0),
+("CMSG_SET_TRADE_ITEM",0x111E,15952,0),
+("CMSG_CLEAR_TRADE_ITEM",0x111F,15952,0),
+("CMSG_SET_TRADE_GOLD",0x1120,15952,0),
+("SMSG_TRADE_STATUS",0x1121,15952,0),
+("SMSG_TRADE_STATUS_EXTENDED",0x1122,15952,0),
+("SMSG_INITIALIZE_FACTIONS",0x1123,15952,0),
+("SMSG_SET_FACTION_VISIBLE",0x1124,15952,0),
+("SMSG_SET_FACTION_STANDING",0x1125,15952,0),
+("CMSG_SET_FACTION_ATWAR",0x1126,15952,0),
+("CMSG_SET_FACTION_CHEAT",0x1127,15952,0),
+("SMSG_SET_PROFICIENCY",0x1128,15952,0),
+("CMSG_SET_ACTION_BUTTON",0x1129,15952,0),
+("SMSG_ACTION_BUTTONS",0x112A,15952,0),
+("SMSG_INITIAL_SPELLS",0x112B,15952,0),
+("SMSG_LEARNED_SPELL",0x112C,15952,0),
+("SMSG_SUPERCEDED_SPELL",0x112D,15952,0),
+("CMSG_NEW_SPELL_SLOT",0x112E,15952,0),
+("CMSG_CAST_SPELL",0x112F,15952,0),
+("CMSG_CANCEL_CAST",0x1130,15952,0),
+("SMSG_CAST_FAILED",0x1131,15952,0),
+("SMSG_SPELL_START",0x1132,15952,0),
+("SMSG_SPELL_GO",0x1133,15952,0),
+("SMSG_SPELL_FAILURE",0x1134,15952,0),
+("SMSG_SPELL_COOLDOWN",0x1135,15952,0),
+("SMSG_COOLDOWN_EVENT",0x1136,15952,0),
+("CMSG_CANCEL_AURA",0x1137,15952,0),
+("SMSG_EQUIPMENT_SET_ID",0x1138,15952,0),
+("SMSG_PET_CAST_FAILED",0x1139,15952,0),
+("MSG_CHANNEL_START",0x113A,15952,0),
+("MSG_CHANNEL_UPDATE",0x113B,15952,0),
+("CMSG_CANCEL_CHANNELLING",0x113C,15952,0),
+("SMSG_AI_REACTION",0x113D,15952,0),
+("CMSG_SET_SELECTION",0x113E,15952,0),
+("CMSG_DELETEEQUIPMENT_SET",0x113F,15952,0),
+("CMSG_INSTANCE_LOCK_RESPONSE",0x1140,15952,0),
+("CMSG_DEBUG_PASSIVE_AURA",0x1141,15952,0),
+("CMSG_ATTACKSWING",0x1142,15952,0),
+("CMSG_ATTACKSTOP",0x1143,15952,0),
+("SMSG_ATTACKSTART",0x1144,15952,0),
+("SMSG_ATTACKSTOP",0x1145,15952,0),
+("SMSG_ATTACKSWING_NOTINRANGE",0x1146,15952,0),
+("SMSG_ATTACKSWING_BADFACING",0x1147,15952,0),
+("SMSG_PENDING_RAID_LOCK",0x1148,15952,0),
+("SMSG_ATTACKSWING_DEADTARGET",0x1149,15952,0),
+("SMSG_ATTACKSWING_CANT_ATTACK",0x114A,15952,0),
+("SMSG_ATTACKERSTATEUPDATE",0x114B,15952,0),
+("SMSG_BATTLEFIELD_PORT_DENIED",0x114C,15952,0),
+("CMSG_PERFORM_ACTION_SET",0x114D,15952,0),
+("SMSG_RESUME_CAST_BAR",0x114E,15952,0),
+("SMSG_CANCEL_COMBAT",0x114F,15952,0),
+("SMSG_SPELLBREAKLOG",0x1150,15952,0),
+("SMSG_SPELLHEALLOG",0x1151,15952,0),
+("SMSG_SPELLENERGIZELOG",0x1152,15952,0),
+("SMSG_BREAK_TARGET",0x1153,15952,0),
+("CMSG_SAVE_PLAYER",0x1154,15952,0),
+("CMSG_SETDEATHBINDPOINT",0x1155,15952,0),
+("SMSG_BINDPOINTUPDATE",0x1156,15952,0),
+("CMSG_GETDEATHBINDZONE",0x1157,15952,0),
+("SMSG_BINDZONEREPLY",0x1158,15952,0),
+("SMSG_PLAYERBOUND",0x1159,15952,0),
+("SMSG_CLIENT_CONTROL_UPDATE",0x115A,15952,0),
+("CMSG_REPOP_REQUEST",0x115B,15952,0),
+("SMSG_RESURRECT_REQUEST",0x115C,15952,0),
+("CMSG_RESURRECT_RESPONSE",0x115D,15952,0),
+("CMSG_LOOT",0x115E,15952,0),
+("CMSG_LOOT_MONEY",0x115F,15952,0),
+("CMSG_LOOT_RELEASE",0x1160,15952,0),
+("SMSG_LOOT_RESPONSE",0x1161,15952,0),
+("SMSG_LOOT_RELEASE_RESPONSE",0x1162,15952,0),
+("SMSG_LOOT_REMOVED",0x1163,15952,0),
+("SMSG_LOOT_MONEY_NOTIFY",0x1164,15952,0),
+("SMSG_LOOT_ITEM_NOTIFY",0x1165,15952,0),
+("SMSG_LOOT_CLEAR_MONEY",0x1166,15952,0),
+("SMSG_ITEM_PUSH_RESULT",0x1167,15952,0),
+("SMSG_DUEL_REQUESTED",0x1168,15952,0),
+("SMSG_DUEL_OUTOFBOUNDS",0x1169,15952,0),
+("SMSG_DUEL_INBOUNDS",0x116A,15952,0),
+("SMSG_DUEL_COMPLETE",0x116B,15952,0),
+("SMSG_DUEL_WINNER",0x116C,15952,0),
+("CMSG_DUEL_ACCEPTED",0x116D,15952,0),
+("CMSG_DUEL_CANCELLED",0x116E,15952,0),
+("SMSG_MOUNTRESULT",0x116F,15952,0),
+("SMSG_DISMOUNTRESULT",0x1170,15952,0),
+("SMSG_REMOVED_FROM_PVP_QUEUE",0x1171,15952,0),
+("CMSG_MOUNTSPECIAL_ANIM",0x1172,15952,0),
+("SMSG_MOUNTSPECIAL_ANIM",0x1173,15952,0),
+("SMSG_PET_TAME_FAILURE",0x1174,15952,0),
+("CMSG_PET_SET_ACTION",0x1175,15952,0),
+("CMSG_PET_ACTION",0x1176,15952,0),
+("CMSG_PET_ABANDON",0x1177,15952,0),
+("CMSG_PET_RENAME",0x1178,15952,0),
+("SMSG_PET_NAME_INVALID",0x1179,15952,0),
+("SMSG_PET_SPELLS",0x117A,15952,0),
+("SMSG_PET_MODE",0x117B,15952,0),
+("CMSG_GOSSIP_HELLO",0x117C,15952,0),
+("CMSG_GOSSIP_SELECT_OPTION",0x117D,15952,0),
+("SMSG_GOSSIP_MESSAGE",0x117E,15952,0),
+("SMSG_GOSSIP_COMPLETE",0x117F,15952,0),
+("CMSG_NPC_TEXT_QUERY",0x1180,15952,0),
+("SMSG_NPC_TEXT_UPDATE",0x1181,15952,0),
+("SMSG_NPC_WONT_TALK",0x1182,15952,0),
+("CMSG_QUESTGIVER_STATUS_QUERY",0x1183,15952,0),
+("SMSG_QUESTGIVER_STATUS",0x1184,15952,0),
+("CMSG_QUESTGIVER_HELLO",0x1185,15952,0),
+("SMSG_QUESTGIVER_QUEST_LIST",0x1186,15952,0),
+("CMSG_QUESTGIVER_QUERY_QUEST",0x1187,15952,0),
+("CMSG_QUESTGIVER_QUEST_AUTOLAUNCH",0x1188,15952,0),
+("SMSG_QUESTGIVER_QUEST_DETAILS",0x1189,15952,0),
+("CMSG_QUESTGIVER_ACCEPT_QUEST",0x118A,15952,0),
+("CMSG_QUESTGIVER_COMPLETE_QUEST",0x118B,15952,0),
+("SMSG_QUESTGIVER_REQUEST_ITEMS",0x118C,15952,0),
+("CMSG_QUESTGIVER_REQUEST_REWARD",0x118D,15952,0),
+("SMSG_QUESTGIVER_OFFER_REWARD",0x118E,15952,0),
+("CMSG_QUESTGIVER_CHOOSE_REWARD",0x118F,15952,0),
+("SMSG_QUESTGIVER_QUEST_INVALID",0x1190,15952,0),
+("CMSG_QUESTGIVER_CANCEL",0x1191,15952,0),
+("SMSG_QUESTGIVER_QUEST_COMPLETE",0x1192,15952,0),
+("SMSG_QUESTGIVER_QUEST_FAILED",0x1193,15952,0),
+("CMSG_QUESTLOG_SWAP_QUEST",0x1194,15952,0),
+("CMSG_QUESTLOG_REMOVE_QUEST",0x1195,15952,0),
+("SMSG_QUESTLOG_FULL",0x1196,15952,0),
+("SMSG_QUESTUPDATE_FAILED",0x1197,15952,0),
+("SMSG_QUESTUPDATE_FAILEDTIMER",0x1198,15952,0),
+("SMSG_QUESTUPDATE_COMPLETE",0x1199,15952,0),
+("SMSG_QUESTUPDATE_ADD_KILL",0x119A,15952,0),
+("SMSG_QUESTUPDATE_ADD_ITEM_OBSOLETE",0x119B,15952,0),
+("CMSG_QUEST_CONFIRM_ACCEPT",0x119C,15952,0),
+("SMSG_QUEST_CONFIRM_ACCEPT",0x119D,15952,0),
+("CMSG_PUSHQUESTTOPARTY",0x119E,15952,0),
+("CMSG_LIST_INVENTORY",0x119F,15952,0),
+("SMSG_LIST_INVENTORY",0x11A0,15952,0),
+("CMSG_SELL_ITEM",0x11A1,15952,0),
+("SMSG_SELL_ITEM",0x11A2,15952,0),
+("CMSG_BUY_ITEM",0x11A3,15952,0),
+("CMSG_BUY_ITEM_IN_SLOT",0x11A4,15952,0),
+("SMSG_BUY_ITEM",0x11A5,15952,0),
+("SMSG_BUY_FAILED",0x11A6,15952,0),
+("CMSG_TAXICLEARALLNODES",0x11A7,15952,0),
+("CMSG_TAXIENABLEALLNODES",0x11A8,15952,0),
+("CMSG_TAXISHOWNODES",0x11A9,15952,0),
+("SMSG_SHOWTAXINODES",0x11AA,15952,0),
+("CMSG_TAXINODE_STATUS_QUERY",0x11AB,15952,0),
+("SMSG_TAXINODE_STATUS",0x11AC,15952,0),
+("CMSG_TAXIQUERYAVAILABLENODES",0x11AD,15952,0),
+("CMSG_ACTIVATETAXI",0x11AE,15952,0),
+("SMSG_ACTIVATETAXIREPLY",0x11AF,15952,0),
+("SMSG_NEW_TAXI_PATH",0x11B0,15952,0),
+("CMSG_TRAINER_LIST",0x11B1,15952,0),
+("SMSG_TRAINER_LIST",0x11B2,15952,0),
+("CMSG_TRAINER_BUY_SPELL",0x11B3,15952,0),
+("SMSG_TRAINER_BUY_SUCCEEDED",0x11B4,15952,0),
+("SMSG_TRAINER_BUY_FAILED",0x11B5,15952,0),
+("CMSG_BINDER_ACTIVATE",0x11B6,15952,0),
+("SMSG_PLAYERBINDERROR",0x11B7,15952,0),
+("CMSG_BANKER_ACTIVATE",0x11B8,15952,0),
+("SMSG_SHOW_BANK",0x11B9,15952,0),
+("CMSG_BUY_BANK_SLOT",0x11BA,15952,0),
+("SMSG_BUY_BANK_SLOT_RESULT",0x11BB,15952,0),
+("CMSG_PETITION_SHOWLIST",0x11BC,15952,0),
+("SMSG_PETITION_SHOWLIST",0x11BD,15952,0),
+("CMSG_PETITION_BUY",0x11BE,15952,0),
+("CMSG_PETITION_SHOW_SIGNATURES",0x11BF,15952,0),
+("SMSG_PETITION_SHOW_SIGNATURES",0x11C0,15952,0),
+("CMSG_PETITION_SIGN",0x11C1,15952,0),
+("SMSG_PETITION_SIGN_RESULTS",0x11C2,15952,0),
+("MSG_PETITION_DECLINE",0x11C3,15952,0),
+("CMSG_OFFER_PETITION",0x11C4,15952,0),
+("CMSG_TURN_IN_PETITION",0x11C5,15952,0),
+("SMSG_TURN_IN_PETITION_RESULTS",0x11C6,15952,0),
+("CMSG_PETITION_QUERY",0x11C7,15952,0),
+("SMSG_PETITION_QUERY_RESPONSE",0x11C8,15952,0),
+("SMSG_FISH_NOT_HOOKED",0x11C9,15952,0),
+("SMSG_FISH_ESCAPED",0x11CA,15952,0),
+("CMSG_BUG",0x11CB,15952,0),
+("SMSG_NOTIFICATION",0x11CC,15952,0),
+("CMSG_PLAYED_TIME",0x11CD,15952,0),
+("SMSG_PLAYED_TIME",0x11CE,15952,0),
+("CMSG_QUERY_TIME",0x11CF,15952,0),
+("SMSG_QUERY_TIME_RESPONSE",0x11D0,15952,0),
+("SMSG_LOG_XPGAIN",0x11D1,15952,0),
+("SMSG_AURACASTLOG",0x11D2,15952,0),
+("CMSG_RECLAIM_CORPSE",0x11D3,15952,0),
+("CMSG_WRAP_ITEM",0x11D4,15952,0),
+("SMSG_LEVELUP_INFO",0x11D5,15952,0),
+("MSG_MINIMAP_PING",0x11D6,15952,0),
+("SMSG_RESISTLOG",0x11D7,15952,0),
+("SMSG_ENCHANTMENTLOG",0x11D8,15952,0),
+("CMSG_SET_SKILL_CHEAT",0x11D9,15952,0),
+("SMSG_START_MIRROR_TIMER",0x11DA,15952,0),
+("SMSG_PAUSE_MIRROR_TIMER",0x11DB,15952,0),
+("SMSG_STOP_MIRROR_TIMER",0x11DC,15952,0),
+("CMSG_PING",0x11DD,15952,0),
+("SMSG_PONG",0x11DE,15952,0),
+("SMSG_CLEAR_COOLDOWN",0x11DF,15952,0),
+("SMSG_GAMEOBJECT_PAGETEXT",0x11E0,15952,0),
+("CMSG_SETSHEATHED",0x11E1,15952,0),
+("SMSG_COOLDOWN_CHEAT",0x11E2,15952,0),
+("SMSG_SPELL_DELAYED",0x11E3,15952,0),
+("CMSG_QUEST_POI_QUERY",0x11E4,15952,0),
+("SMSG_QUEST_POI_QUERY_RESPONSE",0x11E5,15952,0),
+("CMSG_GHOST",0x11E6,15952,0),
+("CMSG_GM_INVIS",0x11E7,15952,0),
+("SMSG_INVALID_PROMOTION_CODE",0x11E8,15952,0),
+("MSG_GM_BIND_OTHER",0x11E9,15952,0),
+("MSG_GM_SUMMON",0x11EA,15952,0),
+("SMSG_ITEM_TIME_UPDATE",0x11EB,15952,0),
+("SMSG_ITEM_ENCHANT_TIME_UPDATE",0x11EC,15952,0),
+("MSG_TRANSFER_INITIATE",0x4F57,15952,0),
+("SMSG_AUTH_CHALLENGE",0xEE8,15952,0),
+("CMSG_AUTH_SESSION",0xA82,15952,0),
+("SMSG_AUTH_RESPONSE",0xBBF,15952,0),
+("MSG_GM_SHOWLABEL",0x11F0,15952,0),
+("CMSG_PET_CAST_SPELL",0x11F1,15952,0),
+("MSG_SAVE_GUILD_EMBLEM",0x11F2,15952,0),
+("MSG_TABARDVENDOR_ACTIVATE",0x11F3,15952,0),
+("SMSG_PLAY_SPELL_VISUAL",0x11F4,15952,0),
+("CMSG_ZONEUPDATE",0x11F5,15952,0),
+("SMSG_PARTYKILLLOG",0x11F6,15952,0),
+("SMSG_COMPRESSED_UPDATE_OBJECT",0x11F7,15952,0),
+("SMSG_PLAY_SPELL_IMPACT",0x11F8,15952,0),
+("SMSG_EXPLORATION_EXPERIENCE",0x11F9,15952,0),
+("CMSG_GM_SET_SECURITY_GROUP",0x11FA,15952,0),
+("CMSG_GM_NUKE",0x11FB,15952,0),
+("MSG_RANDOM_ROLL",0x11FC,15952,0),
+("SMSG_ENVIRONMENTALDAMAGELOG",0x11FD,15952,0),
+("CMSG_CHANGEPLAYER_DIFFICULTY",0x11FE,15952,0),
+("SMSG_RWHOIS",0x11FF,15952,0),
+("SMSG_LFG_PLAYER_REWARD",0x1200,15952,0),
+("SMSG_LFG_TELEPORT_DENIED",0x1201,15952,0),
+("CMSG_UNLEARN_SPELL",0x1202,15952,0),
+("CMSG_UNLEARN_SKILL",0x1203,15952,0),
+("SMSG_REMOVED_SPELL",0x1204,15952,0),
+("CMSG_DECHARGE",0x1205,15952,0),
+("CMSG_GMTICKET_CREATE",0x1206,15952,0),
+("SMSG_GMTICKET_CREATE",0x1207,15952,0),
+("CMSG_GMTICKET_UPDATETEXT",0x1208,15952,0),
+("SMSG_GMTICKET_UPDATETEXT",0x1209,15952,0),
+("SMSG_ACCOUNT_DATA_TIMES",0x120A,15952,0),
+("CMSG_REQUEST_ACCOUNT_DATA",0x120B,15952,0),
+("CMSG_UPDATE_ACCOUNT_DATA",0x120C,15952,0),
+("SMSG_UPDATE_ACCOUNT_DATA",0x120D,15952,0),
+("SMSG_CLEAR_FAR_SIGHT_IMMEDIATE",0x120E,15952,0),
+("SMSG_CHANGEPLAYER_DIFFICULTY_RESULT",0x120F,15952,0),
+("CMSG_GM_TEACH",0x1210,15952,0),
+("CMSG_GM_CREATE_ITEM_TARGET",0x1211,15952,0),
+("CMSG_GMTICKET_GETTICKET",0x1212,15952,0),
+("SMSG_GMTICKET_GETTICKET",0x1213,15952,0),
+("CMSG_UNLEARN_TALENTS",0x1214,15952,0),
+("SMSG_INSTANCE_ENCOUNTER",0x1215,15952,0),
+("SMSG_GAMEOBJECT_DESPAWN_ANIM",0x1216,15952,0),
+("MSG_CORPSE_QUERY",0x1217,15952,0),
+("CMSG_GMTICKET_DELETETICKET",0x1218,15952,0),
+("SMSG_GMTICKET_DELETETICKET",0x1219,15952,0),
+("SMSG_CHAT_WRONG_FACTION",0x121A,15952,0),
+("CMSG_GMTICKET_SYSTEMSTATUS",0x121B,15952,0),
+("SMSG_GMTICKET_SYSTEMSTATUS",0x121C,15952,0),
+("CMSG_SPIRIT_HEALER_ACTIVATE",0x121D,15952,0),
+("CMSG_SET_STAT_CHEAT",0x121E,15952,0),
+("SMSG_QUEST_FORCE_REMOVED",0x121F,15952,0),
+("CMSG_SKILL_BUY_STEP",0x1220,15952,0),
+("CMSG_SKILL_BUY_RANK",0x1221,15952,0),
+("CMSG_XP_CHEAT",0x1222,15952,0),
+("SMSG_SPIRIT_HEALER_CONFIRM",0x1223,15952,0),
+("CMSG_CHARACTER_POINT_CHEAT",0x1224,15952,0),
+("SMSG_GOSSIP_POI",0x1225,15952,0),
+("CMSG_CHAT_IGNORED",0x1226,15952,0),
+("CMSG_GM_VISION",0x1227,15952,0),
+("CMSG_SERVER_COMMAND",0x1228,15952,0),
+("CMSG_GM_SILENCE",0x1229,15952,0),
+("CMSG_GM_REVEALTO",0x122A,15952,0),
+("CMSG_GM_RESURRECT",0x122B,15952,0),
+("CMSG_GM_SUMMONMOB",0x122C,15952,0),
+("CMSG_GM_MOVECORPSE",0x122D,15952,0),
+("CMSG_GM_FREEZE",0x122E,15952,0),
+("CMSG_GM_UBERINVIS",0x122F,15952,0),
+("CMSG_GM_REQUEST_PLAYER_INFO",0x1230,15952,0),
+("SMSG_GM_PLAYER_INFO",0x1231,15952,0),
+("CMSG_GUILD_RANK",0x1232,15952,0),
+("CMSG_GUILD_ADD_RANK",0x1233,15952,0),
+("CMSG_GUILD_DEL_RANK",0x1234,15952,0),
+("CMSG_GUILD_SET_PUBLIC_NOTE",0x1235,15952,0),
+("CMSG_GUILD_SET_OFFICER_NOTE",0x1236,15952,0),
+("SMSG_LOGIN_VERIFY_WORLD",0x1237,15952,0),
+("CMSG_CLEAR_EXPLORATION",0x1238,15952,0),
+("CMSG_SEND_MAIL",0x1239,15952,0),
+("SMSG_SEND_MAIL_RESULT",0x123A,15952,0),
+("CMSG_GET_MAIL_LIST",0x123B,15952,0),
+("SMSG_MAIL_LIST_RESULT",0x123C,15952,0),
+("CMSG_BATTLEFIELD_LIST",0x123D,15952,0),
+("SMSG_BATTLEFIELD_LIST",0x123E,15952,0),
+("CMSG_BATTLEFIELD_JOIN",0x123F,15952,0),
+("SMSG_FORCE_SET_VEHICLE_REC_ID",0x1240,15952,0),
+("CMSG_SET_VEHICLE_REC_ID_ACK",0x1241,15952,0),
+("CMSG_TAXICLEARNODE",0x1242,15952,0),
+("CMSG_TAXIENABLENODE",0x1243,15952,0),
+("CMSG_ITEM_TEXT_QUERY",0x1244,15952,0),
+("SMSG_ITEM_TEXT_QUERY_RESPONSE",0x1245,15952,0),
+("CMSG_MAIL_TAKE_MONEY",0x1246,15952,0),
+("CMSG_MAIL_TAKE_ITEM",0x1247,15952,0),
+("CMSG_MAIL_MARK_AS_READ",0x1248,15952,0),
+("CMSG_MAIL_RETURN_TO_SENDER",0x1249,15952,0),
+("CMSG_MAIL_DELETE",0x124A,15952,0),
+("CMSG_MAIL_CREATE_TEXT_ITEM",0x124B,15952,0),
+("SMSG_SPELLLOGMISS",0x124C,15952,0),
+("SMSG_SPELLLOGEXECUTE",0x124D,15952,0),
+("SMSG_DEBUGAURAPROC",0x124E,15952,0),
+("SMSG_PERIODICAURALOG",0x124F,15952,0),
+("SMSG_SPELLDAMAGESHIELD",0x1250,15952,0),
+("SMSG_SPELLNONMELEEDAMAGELOG",0x1251,15952,0),
+("CMSG_LEARN_TALENT",0x1252,15952,0),
+("SMSG_RESURRECT_FAILED",0x1253,15952,0),
+("CMSG_TOGGLE_PVP",0x1254,15952,0),
+("SMSG_ZONE_UNDER_ATTACK",0x1255,15952,0),
+("MSG_AUCTION_HELLO",0x1256,15952,0),
+("CMSG_AUCTION_SELL_ITEM",0x1257,15952,0),
+("CMSG_AUCTION_REMOVE_ITEM",0x1258,15952,0),
+("CMSG_AUCTION_LIST_ITEMS",0x1259,15952,0),
+("CMSG_AUCTION_LIST_OWNER_ITEMS",0x125A,15952,0),
+("CMSG_AUCTION_PLACE_BID",0x125B,15952,0),
+("SMSG_AUCTION_COMMAND_RESULT",0x125C,15952,0),
+("SMSG_AUCTION_LIST_RESULT",0x125D,15952,0),
+("SMSG_AUCTION_OWNER_LIST_RESULT",0x125E,15952,0),
+("SMSG_AUCTION_BIDDER_NOTIFICATION",0x125F,15952,0),
+("SMSG_AUCTION_OWNER_NOTIFICATION",0x1260,15952,0),
+("SMSG_PROCRESIST",0x1261,15952,0),
+("SMSG_COMBAT_EVENT_FAILED",0x1262,15952,0),
+("SMSG_DISPEL_FAILED",0x1263,15952,0),
+("SMSG_SPELLORDAMAGE_IMMUNE",0x1264,15952,0),
+("CMSG_AUCTION_LIST_BIDDER_ITEMS",0x1265,15952,0),
+("SMSG_AUCTION_BIDDER_LIST_RESULT",0x1266,15952,0),
+("SMSG_SET_FLAT_SPELL_MODIFIER",0x1267,15952,0),
+("SMSG_SET_PCT_SPELL_MODIFIER",0x1268,15952,0),
+("CMSG_SET_AMMO",0x1269,15952,0),
+("SMSG_CORPSE_RECLAIM_DELAY",0x126A,15952,0),
+("CMSG_SET_ACTIVE_MOVER",0x126B,15952,0),
+("CMSG_PET_CANCEL_AURA",0x126C,15952,0),
+("CMSG_PLAYER_AI_CHEAT",0x126D,15952,0),
+("CMSG_CANCEL_AUTO_REPEAT_SPELL",0x126E,15952,0),
+("MSG_GM_ACCOUNT_ONLINE",0x126F,15952,0),
+("MSG_LIST_STABLED_PETS",0x1270,15952,0),
+("CMSG_STABLE_PET",0x1271,15952,0),
+("CMSG_UNSTABLE_PET",0x1272,15952,0),
+("CMSG_BUY_STABLE_SLOT",0x1273,15952,0),
+("SMSG_STABLE_RESULT",0x1274,15952,0),
+("CMSG_STABLE_REVIVE_PET",0x1275,15952,0),
+("CMSG_STABLE_SWAP_PET",0x1276,15952,0),
+("MSG_QUEST_PUSH_RESULT",0x1277,15952,0),
+("SMSG_PLAY_MUSIC",0x1278,15952,0),
+("SMSG_PLAY_OBJECT_SOUND",0x1279,15952,0),
+("CMSG_REQUEST_PET_INFO",0x127A,15952,0),
+("CMSG_FAR_SIGHT",0x127B,15952,0),
+("SMSG_SPELLDISPELLOG",0x127C,15952,0),
+("SMSG_DAMAGE_CALC_LOG",0x127D,15952,0),
+("CMSG_ENABLE_DAMAGE_LOG",0x127E,15952,0),
+("CMSG_GROUP_CHANGE_SUB_GROUP",0x127F,15952,0),
+("CMSG_REQUEST_PARTY_MEMBER_STATS",0x1280,15952,0),
+("CMSG_GROUP_SWAP_SUB_GROUP",0x1281,15952,0),
+("CMSG_RESET_FACTION_CHEAT",0x1282,15952,0),
+("CMSG_AUTOSTORE_BANK_ITEM",0x1283,15952,0),
+("CMSG_AUTOBANK_ITEM",0x1284,15952,0),
+("MSG_QUERY_NEXT_MAIL_TIME",0x1285,15952,0),
+("SMSG_RECEIVED_MAIL",0x1286,15952,0),
+("SMSG_RAID_GROUP_ONLY",0x1287,15952,0),
+("CMSG_SET_DURABILITY_CHEAT",0x1288,15952,0),
+("CMSG_SET_PVP_RANK_CHEAT",0x1289,15952,0),
+("CMSG_ADD_PVP_MEDAL_CHEAT",0x128A,15952,0),
+("CMSG_DEL_PVP_MEDAL_CHEAT",0x128B,15952,0),
+("CMSG_SET_PVP_TITLE",0x128C,15952,0),
+("SMSG_PVP_CREDIT",0x128D,15952,0),
+("SMSG_AUCTION_REMOVED_NOTIFICATION",0x128E,15952,0),
+("CMSG_GROUP_RAID_CONVERT",0x128F,15952,0),
+("CMSG_GROUP_ASSISTANT_LEADER",0x1290,15952,0),
+("CMSG_BUYBACK_ITEM",0x1291,15952,0),
+("SMSG_SERVER_MESSAGE",0x1292,15952,0),
+("CMSG_SET_SAVED_INSTANCE_EXTEND",0x1293,15952,0),
+("SMSG_LFG_OFFER_CONTINUE",0x1294,15952,0),
+("CMSG_TEST_DROP_RATE",0x1295,15952,0),
+("SMSG_TEST_DROP_RATE_RESULT",0x1296,15952,0),
+("CMSG_LFG_GET_STATUS",0x1297,15952,0),
+("SMSG_SHOW_MAILBOX",0x1298,15952,0),
+("SMSG_RESET_RANGED_COMBAT_TIMER",0x1299,15952,0),
+("SMSG_CHAT_NOT_IN_PARTY",0x129A,15952,0),
+("CMSG_GMTICKETSYSTEM_TOGGLE",0x129B,15952,0),
+("CMSG_CANCEL_GROWTH_AURA",0x129C,15952,0),
+("SMSG_CANCEL_AUTO_REPEAT",0x129D,15952,0),
+("SMSG_STANDSTATE_UPDATE",0x129E,15952,0),
+("SMSG_LOOT_ALL_PASSED",0x129F,15952,0),
+("SMSG_LOOT_ROLL_WON",0x12A0,15952,0),
+("CMSG_LOOT_ROLL",0x12A1,15952,0),
+("SMSG_LOOT_START_ROLL",0x12A2,15952,0),
+("SMSG_LOOT_ROLL",0x12A3,15952,0),
+("CMSG_LOOT_MASTER_GIVE",0x12A4,15952,0),
+("SMSG_LOOT_MASTER_LIST",0x12A5,15952,0),
+("SMSG_SET_FORCED_REACTIONS",0x12A6,15952,0),
+("SMSG_SPELL_FAILED_OTHER",0x12A7,15952,0),
+("SMSG_GAMEOBJECT_RESET_STATE",0x12A8,15952,0),
+("CMSG_REPAIR_ITEM",0x12A9,15952,0),
+("SMSG_CHAT_PLAYER_NOT_FOUND",0x12AA,15952,0),
+("MSG_TALENT_WIPE_CONFIRM",0x12AB,15952,0),
+("SMSG_SUMMON_REQUEST",0x12AC,15952,0),
+("CMSG_SUMMON_RESPONSE",0x12AD,15952,0),
+("MSG_DEV_SHOWLABEL",0x12AE,15952,0),
+("SMSG_MONSTER_MOVE_TRANSPORT",0x12AF,15952,0),
+("SMSG_PET_BROKEN",0x12B0,15952,0),
+("MSG_MOVE_FEATHER_FALL",0x12B1,15952,0),
+("MSG_MOVE_WATER_WALK",0x12B2,15952,0),
+("CMSG_SERVER_BROADCAST",0x12B3,15952,0),
+("CMSG_SELF_RES",0x12B4,15952,0),
+("SMSG_FEIGN_DEATH_RESISTED",0x12B5,15952,0),
+("CMSG_RUN_SCRIPT",0x12B6,15952,0),
+("SMSG_SCRIPT_MESSAGE",0x12B7,15952,0),
+("SMSG_DUEL_COUNTDOWN",0x12B8,15952,0),
+("SMSG_AREA_TRIGGER_MESSAGE",0x12B9,15952,0),
+("CMSG_SHOWING_HELM",0x12BA,15952,0),
+("CMSG_SHOWING_CLOAK",0x12BB,15952,0),
+("SMSG_ROLE_CHOSEN",0x12BC,15952,0),
+("SMSG_PLAYER_SKINNED",0x12BD,15952,0),
+("SMSG_DURABILITY_DAMAGE_DEATH",0x12BE,15952,0),
+("CMSG_SET_EXPLORATION",0x12BF,15952,0),
+("CMSG_SET_ACTIONBAR_TOGGLES",0x12C0,15952,0),
+("UMSG_DELETE_GUILD_CHARTER",0x12C1,15952,0),
+("MSG_PETITION_RENAME",0x12C2,15952,0),
+("SMSG_INIT_WORLD_STATES",0x12C3,15952,0),
+("SMSG_UPDATE_WORLD_STATE",0x12C4,15952,0),
+("CMSG_ITEM_NAME_QUERY",0x12C5,15952,0),
+("SMSG_ITEM_NAME_QUERY_RESPONSE",0x12C6,15952,0),
+("SMSG_PET_ACTION_FEEDBACK",0x12C7,15952,0),
+("CMSG_CHAR_RENAME",0x12C8,15952,0),
+("SMSG_CHAR_RENAME",0x12C9,15952,0),
+("CMSG_MOVE_SPLINE_DONE",0x12CA,15952,0),
+("CMSG_MOVE_FALL_RESET",0x12CB,15952,0),
+("SMSG_INSTANCE_SAVE_CREATED",0x12CC,15952,0),
+("SMSG_RAID_INSTANCE_INFO",0x12CD,15952,0),
+("CMSG_REQUEST_RAID_INFO",0x12CE,15952,0),
+("CMSG_MOVE_TIME_SKIPPED",0x12CF,15952,0),
+("CMSG_MOVE_FEATHER_FALL_ACK",0x12D0,15952,0),
+("CMSG_MOVE_WATER_WALK_ACK",0x12D1,15952,0),
+("CMSG_MOVE_NOT_ACTIVE_MOVER",0x12D2,15952,0),
+("SMSG_PLAY_SOUND",0x12D3,15952,0),
+("CMSG_BATTLEFIELD_STATUS",0x12D4,15952,0),
+("SMSG_BATTLEFIELD_STATUS",0x12D5,15952,0),
+("CMSG_BATTLEFIELD_PORT",0x12D6,15952,0),
+("MSG_INSPECT_HONOR_STATS",0x12D7,15952,0),
+("CMSG_BATTLEMASTER_HELLO",0x12D8,15952,0),
+("CMSG_MOVE_START_SWIM_CHEAT",0x12D9,15952,0),
+("CMSG_MOVE_STOP_SWIM_CHEAT",0x12DA,15952,0),
+("SMSG_FORCE_WALK_SPEED_CHANGE",0x12DB,15952,0),
+("CMSG_FORCE_WALK_SPEED_CHANGE_ACK",0x12DC,15952,0),
+("SMSG_FORCE_SWIM_BACK_SPEED_CHANGE",0x12DD,15952,0),
+("CMSG_FORCE_SWIM_BACK_SPEED_CHANGE_ACK",0x12DE,15952,0),
+("SMSG_FORCE_TURN_RATE_CHANGE",0x12DF,15952,0),
+("CMSG_FORCE_TURN_RATE_CHANGE_ACK",0x12E0,15952,0),
+("MSG_PVP_LOG_DATA",0x12E1,15952,0),
+("CMSG_LEAVE_BATTLEFIELD",0x12E2,15952,0),
+("CMSG_AREA_SPIRIT_HEALER_QUERY",0x12E3,15952,0),
+("CMSG_AREA_SPIRIT_HEALER_QUEUE",0x12E4,15952,0),
+("SMSG_AREA_SPIRIT_HEALER_TIME",0x12E5,15952,0),
+("CMSG_GM_UNTEACH",0x12E6,15952,0),
+("SMSG_WARDEN_DATA",0x12E7,15952,0),
+("CMSG_WARDEN_DATA",0x12E8,15952,0),
+("SMSG_GROUP_JOINED_BATTLEGROUND",0x12E9,15952,0),
+("MSG_BATTLEGROUND_PLAYER_POSITIONS",0x12EA,15952,0),
+("CMSG_PET_STOP_ATTACK",0x12EB,15952,0),
+("SMSG_BINDER_CONFIRM",0x12EC,15952,0),
+("SMSG_BATTLEGROUND_PLAYER_JOINED",0x12ED,15952,0),
+("SMSG_BATTLEGROUND_PLAYER_LEFT",0x12EE,15952,0),
+("CMSG_BATTLEMASTER_JOIN",0x12EF,15952,0),
+("SMSG_ADDON_INFO",0x12F0,15952,0),
+("CMSG_PET_UNLEARN",0x12F1,15952,0),
+("SMSG_PET_UNLEARN_CONFIRM",0x12F2,15952,0),
+("SMSG_PARTY_MEMBER_STATS_FULL",0x12F3,15952,0),
+("CMSG_PET_SPELL_AUTOCAST",0x12F4,15952,0),
+("SMSG_WEATHER",0x12F5,15952,0),
+("SMSG_PLAY_TIME_WARNING",0x12F6,15952,0),
+("SMSG_MINIGAME_SETUP",0x12F7,15952,0),
+("SMSG_MINIGAME_STATE",0x12F8,15952,0),
+("CMSG_MINIGAME_MOVE",0x12F9,15952,0),
+("SMSG_MINIGAME_MOVE_FAILED",0x12FA,15952,0),
+("SMSG_RAID_INSTANCE_MESSAGE",0x12FB,15952,0),
+("SMSG_COMPRESSED_MOVES",0x12FC,15952,0),
+("CMSG_GUILD_INFO_TEXT",0x12FD,15952,0),
+("SMSG_CHAT_RESTRICTED",0x12FE,15952,0),
+("SMSG_SPLINE_SET_RUN_SPEED",0x12FF,15952,0),
+("SMSG_SPLINE_SET_RUN_BACK_SPEED",0x1300,15952,0),
+("SMSG_SPLINE_SET_SWIM_SPEED",0x1301,15952,0),
+("SMSG_SPLINE_SET_WALK_SPEED",0x1302,15952,0),
+("SMSG_SPLINE_SET_SWIM_BACK_SPEED",0x1303,15952,0),
+("SMSG_SPLINE_SET_TURN_RATE",0x1304,15952,0),
+("SMSG_SPLINE_MOVE_UNROOT",0x1305,15952,0),
+("SMSG_SPLINE_MOVE_FEATHER_FALL",0x1306,15952,0),
+("SMSG_SPLINE_MOVE_NORMAL_FALL",0x1307,15952,0),
+("SMSG_SPLINE_MOVE_SET_HOVER",0x1308,15952,0),
+("SMSG_SPLINE_MOVE_UNSET_HOVER",0x1309,15952,0),
+("SMSG_SPLINE_MOVE_WATER_WALK",0x130A,15952,0),
+("SMSG_SPLINE_MOVE_LAND_WALK",0x130B,15952,0),
+("SMSG_SPLINE_MOVE_START_SWIM",0x130C,15952,0),
+("SMSG_SPLINE_MOVE_STOP_SWIM",0x130D,15952,0),
+("SMSG_SPLINE_MOVE_SET_RUN_MODE",0x130E,15952,0),
+("SMSG_SPLINE_MOVE_SET_WALK_MODE",0x130F,15952,0),
+("CMSG_GM_NUKE_ACCOUNT",0x1310,15952,0),
+("MSG_GM_DESTROY_CORPSE",0x1311,15952,0),
+("CMSG_GM_DESTROY_ONLINE_CORPSE",0x1312,15952,0),
+("CMSG_ACTIVATETAXIEXPRESS",0x1313,15952,0),
+("SMSG_SET_FACTION_ATWAR",0x1314,15952,0),
+("SMSG_GAMETIMEBIAS_SET",0x1315,15952,0),
+("CMSG_DEBUG_ACTIONS_START",0x1316,15952,0),
+("CMSG_DEBUG_ACTIONS_STOP",0x1317,15952,0),
+("CMSG_SET_FACTION_INACTIVE",0x1318,15952,0),
+("CMSG_SET_WATCHED_FACTION",0x1319,15952,0),
+("MSG_MOVE_TIME_SKIPPED",0x131A,15952,0),
+("SMSG_SPLINE_MOVE_ROOT",0x131B,15952,0),
+("CMSG_SET_EXPLORATION_ALL",0x131C,15952,0),
+("SMSG_INVALIDATE_PLAYER",0x131D,15952,0),
+("CMSG_RESET_INSTANCES",0x131E,15952,0),
+("SMSG_INSTANCE_RESET",0x131F,15952,0),
+("SMSG_INSTANCE_RESET_FAILED",0x1320,15952,0),
+("SMSG_UPDATE_LAST_INSTANCE",0x1321,15952,0),
+("MSG_RAID_TARGET_UPDATE",0x1322,15952,0),
+("MSG_RAID_READY_CHECK",0x1323,15952,0),
+("CMSG_LUA_USAGE",0x1324,15952,0),
+("SMSG_PET_ACTION_SOUND",0x1325,15952,0),
+("SMSG_PET_DISMISS_SOUND",0x1326,15952,0),
+("SMSG_GHOSTEE_GONE",0x1327,15952,0),
+("CMSG_GM_UPDATE_TICKET_STATUS",0x1328,15952,0),
+("SMSG_GM_TICKET_STATUS_UPDATE",0x1329,15952,0),
+("MSG_SET_DUNGEON_DIFFICULTY",0x132A,15952,0),
+("CMSG_GMSURVEY_SUBMIT",0x132B,15952,0),
+("SMSG_UPDATE_INSTANCE_OWNERSHIP",0x132C,15952,0),
+("CMSG_IGNORE_KNOCKBACK_CHEAT",0x132D,15952,0),
+("SMSG_CHAT_PLAYER_AMBIGUOUS",0x132E,15952,0),
+("MSG_DELAY_GHOST_TELEPORT",0x132F,15952,0),
+("SMSG_SPELLINSTAKILLLOG",0x1330,15952,0),
+("SMSG_SPELL_UPDATE_CHAIN_TARGETS",0x1331,15952,0),
+("CMSG_CHAT_FILTERED",0x1332,15952,0),
+("SMSG_EXPECTED_SPAM_RECORDS",0x1333,15952,0),
+("SMSG_SPELLSTEALLOG",0x1334,15952,0),
+("CMSG_LOTTERY_QUERY_OBSOLETE",0x1335,15952,0),
+("SMSG_LOTTERY_QUERY_RESULT_OBSOLETE",0x1336,15952,0),
+("CMSG_BUY_LOTTERY_TICKET_OBSOLETE",0x1337,15952,0),
+("SMSG_LOTTERY_RESULT_OBSOLETE",0x1338,15952,0),
+("SMSG_CHARACTER_PROFILE",0x1339,15952,0),
+("SMSG_CHARACTER_PROFILE_REALM_CONNECTED",0x133A,15952,0),
+("SMSG_DEFENSE_MESSAGE",0x133B,15952,0),
+("SMSG_INSTANCE_DIFFICULTY",0x133C,15952,0),
+("MSG_GM_RESETINSTANCELIMIT",0x133D,15952,0),
+("SMSG_MOTD",0x133E,15952,0),
+("SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x133F,15952,0),
+("SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x1340,15952,0),
+("CMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY_ACK",0x1341,15952,0),
+("MSG_MOVE_START_SWIM_CHEAT",0x1342,15952,0),
+("MSG_MOVE_STOP_SWIM_CHEAT",0x1343,15952,0),
+("SMSG_MOVE_SET_CAN_FLY",0x1344,15952,0),
+("SMSG_MOVE_UNSET_CAN_FLY",0x1345,15952,0),
+("CMSG_MOVE_SET_CAN_FLY_ACK",0x1346,15952,0),
+("CMSG_MOVE_SET_FLY",0x1347,15952,0),
+("CMSG_SOCKET_GEMS",0x1348,15952,0),
+("CMSG_ARENA_TEAM_CREATE",0x1349,15952,0),
+("SMSG_ARENA_TEAM_COMMAND_RESULT",0x134A,15952,0),
+("MSG_MOVE_UPDATE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x134B,15952,0),
+("CMSG_ARENA_TEAM_QUERY",0x134C,15952,0),
+("SMSG_ARENA_TEAM_QUERY_RESPONSE",0x134D,15952,0),
+("CMSG_ARENA_TEAM_ROSTER",0x134E,15952,0),
+("SMSG_ARENA_TEAM_ROSTER",0x134F,15952,0),
+("CMSG_ARENA_TEAM_INVITE",0x1350,15952,0),
+("SMSG_ARENA_TEAM_INVITE",0x1351,15952,0),
+("CMSG_ARENA_TEAM_ACCEPT",0x1352,15952,0),
+("CMSG_ARENA_TEAM_DECLINE",0x1353,15952,0),
+("CMSG_ARENA_TEAM_LEAVE",0x1354,15952,0),
+("CMSG_ARENA_TEAM_REMOVE",0x1355,15952,0),
+("CMSG_ARENA_TEAM_DISBAND",0x1356,15952,0),
+("CMSG_ARENA_TEAM_LEADER",0x1357,15952,0),
+("SMSG_ARENA_TEAM_EVENT",0x1358,15952,0),
+("CMSG_BATTLEMASTER_JOIN_ARENA",0x1359,15952,0),
+("MSG_MOVE_START_ASCEND",0x135A,15952,0),
+("MSG_MOVE_STOP_ASCEND",0x135B,15952,0),
+("SMSG_ARENA_TEAM_STATS",0x135C,15952,0),
+("CMSG_LFG_JOIN",0x135D,15952,0),
+("CMSG_LFG_LEAVE",0x135E,15952,0),
+("CMSG_LFG_SEARCH_JOIN",0x135F,15952,0),
+("CMSG_LFG_SEARCH_LEAVE",0x1360,15952,0),
+("SMSG_LFG_SEARCH_RESULTS",0x1361,15952,0),
+("SMSG_LFG_PROPOSAL_UPDATE",0x1362,15952,0),
+("CMSG_LFG_PROPOSAL_RESPONSE",0x1363,15952,0),
+("SMSG_LFG_ROLE_CHECK_UPDATE",0x1364,15952,0),
+("SMSG_LFG_JOIN_RESULT",0x1365,15952,0),
+("SMSG_LFG_QUEUE_STATUS",0x1366,15952,0),
+("CMSG_SET_LFG_COMMENT",0x1367,15952,0),
+("SMSG_LFG_UPDATE_PLAYER",0x1368,15952,0),
+("SMSG_LFG_UPDATE_PARTY",0x1369,15952,0),
+("SMSG_LFG_UPDATE_SEARCH",0x136A,15952,0),
+("CMSG_LFG_SET_ROLES",0x136B,15952,0),
+("CMSG_LFG_SET_NEEDS",0x136C,15952,0),
+("CMSG_LFG_BOOT_PLAYER_VOTE",0x136D,15952,0),
+("SMSG_LFG_BOOT_PLAYER",0x136E,15952,0),
+("CMSG_LFG_GET_PLAYER_INFO",0x136F,15952,0),
+("SMSG_LFG_PLAYER_INFO",0x1370,15952,0),
+("CMSG_LFG_TELEPORT",0x1371,15952,0),
+("CMSG_LFG_GET_PARTY_INFO",0x1372,15952,0),
+("SMSG_LFG_PARTY_INFO",0x1373,15952,0),
+("SMSG_TITLE_EARNED",0x1374,15952,0),
+("CMSG_SET_TITLE",0x1375,15952,0),
+("CMSG_CANCEL_MOUNT_AURA",0x1376,15952,0),
+("SMSG_ARENA_ERROR",0x1377,15952,0),
+("MSG_INSPECT_ARENA_TEAMS",0x1378,15952,0),
+("SMSG_DEATH_RELEASE_LOC",0x1379,15952,0),
+("CMSG_CANCEL_TEMP_ENCHANTMENT",0x137A,15952,0),
+("SMSG_FORCED_DEATH_UPDATE",0x137B,15952,0),
+("CMSG_CHEAT_SET_HONOR_CURRENCY",0x137C,15952,0),
+("CMSG_CHEAT_SET_ARENA_CURRENCY",0x137D,15952,0),
+("MSG_MOVE_SET_FLIGHT_SPEED_CHEAT",0x137E,15952,0),
+("MSG_MOVE_SET_FLIGHT_SPEED",0x137F,15952,0),
+("MSG_MOVE_SET_FLIGHT_BACK_SPEED_CHEAT",0x1380,15952,0),
+("MSG_MOVE_SET_FLIGHT_BACK_SPEED",0x1381,15952,0),
+("SMSG_FORCE_FLIGHT_SPEED_CHANGE",0x1382,15952,0),
+("CMSG_FORCE_FLIGHT_SPEED_CHANGE_ACK",0x1383,15952,0),
+("SMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE",0x1384,15952,0),
+("CMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE_ACK",0x1385,15952,0),
+("SMSG_SPLINE_SET_FLIGHT_SPEED",0x1386,15952,0),
+("SMSG_SPLINE_SET_FLIGHT_BACK_SPEED",0x1387,15952,0),
+("CMSG_MAELSTROM_INVALIDATE_CACHE",0x1388,15952,0),
+("SMSG_FLIGHT_SPLINE_SYNC",0x1389,15952,0),
+("CMSG_SET_TAXI_BENCHMARK_MODE",0x138A,15952,0),
+("SMSG_JOINED_BATTLEGROUND_QUEUE",0x138B,15952,0),
+("SMSG_REALM_SPLIT",0x138C,15952,0),
+("CMSG_REALM_SPLIT",0x138D,15952,0),
+("CMSG_MOVE_CHNG_TRANSPORT",0x138E,15952,0),
+("MSG_PARTY_ASSIGNMENT",0x138F,15952,0),
+("SMSG_OFFER_PETITION_ERROR",0x1390,15952,0),
+("SMSG_TIME_SYNC_REQ",0x1391,15952,0),
+("CMSG_TIME_SYNC_RESP",0x1392,15952,0),
+("CMSG_SEND_LOCAL_EVENT",0x1393,15952,0),
+("CMSG_SEND_GENERAL_TRIGGER",0x1394,15952,0),
+("CMSG_SEND_COMBAT_TRIGGER",0x1395,15952,0),
+("CMSG_MAELSTROM_GM_SENT_MAIL",0x1396,15952,0),
+("SMSG_RESET_FAILED_NOTIFY",0x1397,15952,0),
+("SMSG_REAL_GROUP_UPDATE",0x1398,15952,0),
+("SMSG_LFG_DISABLED",0x1399,15952,0),
+("CMSG_ACTIVE_PVP_CHEAT",0x139A,15952,0),
+("CMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY",0x139B,15952,0),
+("SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE",0x139C,15952,0),
+("SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE_WRITE_FILE",0x139D,15952,0),
+("SMSG_UPDATE_COMBO_POINTS",0x139E,15952,0),
+("SMSG_VOICE_SESSION_ROSTER_UPDATE",0x139F,15952,0),
+("SMSG_VOICE_SESSION_LEAVE",0x13A0,15952,0),
+("SMSG_VOICE_SESSION_ADJUST_PRIORITY",0x13A1,15952,0),
+("CMSG_VOICE_SET_TALKER_MUTED_REQUEST",0x13A2,15952,0),
+("SMSG_VOICE_SET_TALKER_MUTED",0x13A3,15952,0),
+("SMSG_INIT_EXTRA_AURA_INFO_OBSOLETE",0x13A4,15952,0),
+("SMSG_SET_EXTRA_AURA_INFO_OBSOLETE",0x13A5,15952,0),
+("SMSG_SET_EXTRA_AURA_INFO_NEED_UPDATE_OBSOLETE",0x13A6,15952,0),
+("SMSG_CLEAR_EXTRA_AURA_INFO_OBSOLETE",0x13A7,15952,0),
+("MSG_MOVE_START_DESCEND",0x13A8,15952,0),
+("CMSG_IGNORE_REQUIREMENTS_CHEAT",0x13A9,15952,0),
+("SMSG_IGNORE_REQUIREMENTS_CHEAT",0x13AA,15952,0),
+("SMSG_SPELL_CHANCE_PROC_LOG",0x13AB,15952,0),
+("CMSG_MOVE_SET_RUN_SPEED",0x13AC,15952,0),
+("SMSG_DISMOUNT",0x13AD,15952,0),
+("MSG_MOVE_UPDATE_CAN_FLY",0x13AE,15952,0),
+("MSG_RAID_READY_CHECK_CONFIRM",0x13AF,15952,0),
+("CMSG_VOICE_SESSION_ENABLE",0x13B0,15952,0),
+("SMSG_VOICE_SESSION_ENABLE",0x13B1,15952,0),
+("SMSG_VOICE_PARENTAL_CONTROLS",0x13B2,15952,0),
+("CMSG_GM_WHISPER",0x13B3,15952,0),
+("SMSG_GM_MESSAGECHAT",0x13B4,15952,0),
+("MSG_GM_GEARRATING",0x13B5,15952,0),
+("CMSG_COMMENTATOR_ENABLE",0x13B6,15952,0),
+("SMSG_COMMENTATOR_STATE_CHANGED",0x13B7,15952,0),
+("CMSG_COMMENTATOR_GET_MAP_INFO",0x13B8,15952,0),
+("SMSG_COMMENTATOR_MAP_INFO",0x13B9,15952,0),
+("CMSG_COMMENTATOR_GET_PLAYER_INFO",0x13BA,15952,0),
+("SMSG_COMMENTATOR_GET_PLAYER_INFO",0x13BB,15952,0),
+("SMSG_COMMENTATOR_PLAYER_INFO",0x13BC,15952,0),
+("CMSG_COMMENTATOR_ENTER_INSTANCE",0x13BD,15952,0),
+("CMSG_COMMENTATOR_EXIT_INSTANCE",0x13BE,15952,0),
+("CMSG_COMMENTATOR_INSTANCE_COMMAND",0x13BF,15952,0),
+("SMSG_CLEAR_TARGET",0x13C0,15952,0),
+("CMSG_BOT_DETECTED",0x13C1,15952,0),
+("SMSG_CROSSED_INEBRIATION_THRESHOLD",0x13C2,15952,0),
+("CMSG_CHEAT_PLAYER_LOGIN",0x13C3,15952,0),
+("CMSG_CHEAT_PLAYER_LOOKUP",0x13C4,15952,0),
+("SMSG_CHEAT_PLAYER_LOOKUP",0x13C5,15952,0),
+("SMSG_KICK_REASON",0x13C6,15952,0),
+("MSG_RAID_READY_CHECK_FINISHED",0x13C7,15952,0),
+("CMSG_COMPLAIN",0x13C8,15952,0),
+("SMSG_COMPLAIN_RESULT",0x13C9,15952,0),
+("SMSG_FEATURE_SYSTEM_STATUS",0x13CA,15952,0),
+("CMSG_GM_SHOW_COMPLAINTS",0x13CB,15952,0),
+("CMSG_GM_UNSQUELCH",0x13CC,15952,0),
+("CMSG_CHANNEL_SILENCE_VOICE",0x13CD,15952,0),
+("CMSG_CHANNEL_SILENCE_ALL",0x13CE,15952,0),
+("CMSG_CHANNEL_UNSILENCE_VOICE",0x13CF,15952,0),
+("CMSG_CHANNEL_UNSILENCE_ALL",0x13D0,15952,0),
+("CMSG_TARGET_CAST",0x13D1,15952,0),
+("CMSG_TARGET_SCRIPT_CAST",0x13D2,15952,0),
+("CMSG_CHANNEL_DISPLAY_LIST",0x13D3,15952,0),
+("CMSG_SET_ACTIVE_VOICE_CHANNEL",0x13D4,15952,0),
+("CMSG_GET_CHANNEL_MEMBER_COUNT",0x13D5,15952,0),
+("SMSG_CHANNEL_MEMBER_COUNT",0x13D6,15952,0),
+("CMSG_CHANNEL_VOICE_ON",0x13D7,15952,0),
+("CMSG_CHANNEL_VOICE_OFF",0x13D8,15952,0),
+("CMSG_DEBUG_LIST_TARGETS",0x13D9,15952,0),
+("SMSG_DEBUG_LIST_TARGETS",0x13DA,15952,0),
+("SMSG_AVAILABLE_VOICE_CHANNEL",0x13DB,15952,0),
+("CMSG_ADD_VOICE_IGNORE",0x13DC,15952,0),
+("CMSG_DEL_VOICE_IGNORE",0x13DD,15952,0),
+("CMSG_PARTY_SILENCE",0x13DE,15952,0),
+("CMSG_PARTY_UNSILENCE",0x13DF,15952,0),
+("MSG_NOTIFY_PARTY_SQUELCH",0x13E0,15952,0),
+("SMSG_COMSAT_RECONNECT_TRY",0x13E1,15952,0),
+("SMSG_COMSAT_DISCONNECT",0x13E2,15952,0),
+("SMSG_COMSAT_CONNECT_FAIL",0x13E3,15952,0),
+("SMSG_VOICE_CHAT_STATUS",0x13E4,15952,0),
+("CMSG_REPORT_PVP_AFK",0x13E5,15952,0),
+("SMSG_REPORT_PVP_AFK_RESULT",0x13E6,15952,0),
+("CMSG_GUILD_BANKER_ACTIVATE",0x13E7,15952,0),
+("CMSG_GUILD_BANK_QUERY_TAB",0x13E8,15952,0),
+("SMSG_GUILD_BANK_LIST",0x13E9,15952,0),
+("CMSG_GUILD_BANK_SWAP_ITEMS",0x13EA,15952,0),
+("CMSG_GUILD_BANK_BUY_TAB",0x13EB,15952,0),
+("CMSG_GUILD_BANK_UPDATE_TAB",0x13EC,15952,0),
+("CMSG_GUILD_BANK_DEPOSIT_MONEY",0x13ED,15952,0),
+("CMSG_GUILD_BANK_WITHDRAW_MONEY",0x13EE,15952,0),
+("MSG_GUILD_BANK_LOG_QUERY",0x13EF,15952,0),
+("CMSG_SET_CHANNEL_WATCH",0x13F0,15952,0),
+("SMSG_USERLIST_ADD",0x13F1,15952,0),
+("SMSG_USERLIST_REMOVE",0x13F2,15952,0),
+("SMSG_USERLIST_UPDATE",0x13F3,15952,0),
+("CMSG_CLEAR_CHANNEL_WATCH",0x13F4,15952,0),
+("SMSG_INSPECT_RESULTS",0x13F5,15952,0),
+("SMSG_GOGOGO_OBSOLETE",0x13F6,15952,0),
+("SMSG_ECHO_PARTY_SQUELCH",0x13F7,15952,0),
+("CMSG_SET_TITLE_SUFFIX",0x13F8,15952,0),
+("CMSG_SPELLCLICK",0x13F9,15952,0),
+("SMSG_LOOT_LIST",0x13FA,15952,0),
+("CMSG_GM_CHARACTER_RESTORE",0x13FB,15952,0),
+("CMSG_GM_CHARACTER_SAVE",0x13FC,15952,0),
+("SMSG_VOICESESSION_FULL",0x13FD,15952,0),
+("MSG_GUILD_PERMISSIONS",0x13FE,15952,0),
+("MSG_GUILD_BANK_MONEY_WITHDRAWN",0x13FF,15952,0),
+("MSG_GUILD_EVENT_LOG_QUERY",0x1400,15952,0),
+("CMSG_MAELSTROM_RENAME_GUILD",0x1401,15952,0),
+("CMSG_GET_MIRRORIMAGE_DATA",0x1402,15952,0),
+("SMSG_MIRRORIMAGE_DATA",0x1403,15952,0),
+("SMSG_FORCE_DISPLAY_UPDATE",0x1404,15952,0),
+("SMSG_SPELL_CHANCE_RESIST_PUSHBACK",0x1405,15952,0),
+("CMSG_IGNORE_DIMINISHING_RETURNS_CHEAT",0x1406,15952,0),
+("SMSG_IGNORE_DIMINISHING_RETURNS_CHEAT",0x1407,15952,0),
+("CMSG_KEEP_ALIVE",0x1408,15952,0),
+("SMSG_RAID_READY_CHECK_ERROR",0x1409,15952,0),
+("CMSG_OPT_OUT_OF_LOOT",0x140A,15952,0),
+("MSG_QUERY_GUILD_BANK_TEXT",0x140B,15952,0),
+("CMSG_SET_GUILD_BANK_TEXT",0x140C,15952,0),
+("CMSG_SET_GRANTABLE_LEVELS",0x140D,15952,0),
+("CMSG_GRANT_LEVEL",0x140E,15952,0),
+("CMSG_REFER_A_FRIEND",0x140F,15952,0),
+("MSG_GM_CHANGE_ARENA_RATING",0x1410,15952,0),
+("CMSG_DECLINE_CHANNEL_INVITE",0x1411,15952,0),
+("SMSG_GROUPACTION_THROTTLED",0x1412,15952,0),
+("SMSG_OVERRIDE_LIGHT",0x1413,15952,0),
+("SMSG_TOTEM_CREATED",0x1414,15952,0),
+("CMSG_TOTEM_DESTROYED",0x1415,15952,0),
+("CMSG_EXPIRE_RAID_INSTANCE",0x1416,15952,0),
+("CMSG_NO_SPELL_VARIANCE",0x1417,15952,0),
+("CMSG_QUESTGIVER_STATUS_MULTIPLE_QUERY",0x1418,15952,0),
+("SMSG_QUESTGIVER_STATUS_MULTIPLE",0x1419,15952,0),
+("CMSG_SET_PLAYER_DECLINED_NAMES",0x141A,15952,0),
+("SMSG_SET_PLAYER_DECLINED_NAMES_RESULT",0x141B,15952,0),
+("CMSG_QUERY_SERVER_BUCK_DATA",0x141C,15952,0),
+("CMSG_CLEAR_SERVER_BUCK_DATA",0x141D,15952,0),
+("SMSG_SERVER_BUCK_DATA",0x141E,15952,0),
+("SMSG_SEND_UNLEARN_SPELLS",0x141F,15952,0),
+("SMSG_PROPOSE_LEVEL_GRANT",0x1420,15952,0),
+("CMSG_ACCEPT_LEVEL_GRANT",0x1421,15952,0),
+("SMSG_REFER_A_FRIEND_FAILURE",0x1422,15952,0),
+("SMSG_SPLINE_MOVE_SET_FLYING",0x1423,15952,0),
+("SMSG_SPLINE_MOVE_UNSET_FLYING",0x1424,15952,0),
+("SMSG_SUMMON_CANCEL",0x1425,15952,0),
+("CMSG_CHANGE_PERSONAL_ARENA_RATING",0x1426,15952,0),
+("CMSG_ALTER_APPEARANCE",0x1427,15952,0),
+("SMSG_ENABLE_BARBER_SHOP",0x1428,15952,0),
+("SMSG_BARBER_SHOP_RESULT",0x1429,15952,0),
+("CMSG_CALENDAR_GET_CALENDAR",0x142A,15952,0),
+("CMSG_CALENDAR_GET_EVENT",0x142B,15952,0),
+("CMSG_CALENDAR_GUILD_FILTER",0x142C,15952,0),
+("CMSG_CALENDAR_ARENA_TEAM",0x142D,15952,0),
+("CMSG_CALENDAR_ADD_EVENT",0x142E,15952,0),
+("CMSG_CALENDAR_UPDATE_EVENT",0x142F,15952,0),
+("CMSG_CALENDAR_REMOVE_EVENT",0x1430,15952,0),
+("CMSG_CALENDAR_COPY_EVENT",0x1431,15952,0),
+("CMSG_CALENDAR_EVENT_INVITE",0x1432,15952,0),
+("CMSG_CALENDAR_EVENT_RSVP",0x1433,15952,0),
+("CMSG_CALENDAR_EVENT_REMOVE_INVITE",0x1434,15952,0),
+("CMSG_CALENDAR_EVENT_STATUS",0x1435,15952,0),
+("CMSG_CALENDAR_EVENT_MODERATOR_STATUS",0x1436,15952,0),
+("SMSG_CALENDAR_SEND_CALENDAR",0x1437,15952,0),
+("SMSG_CALENDAR_SEND_EVENT",0x1438,15952,0),
+("SMSG_CALENDAR_FILTER_GUILD",0x1439,15952,0),
+("SMSG_CALENDAR_ARENA_TEAM",0x143A,15952,0),
+("SMSG_CALENDAR_EVENT_INVITE",0x143B,15952,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED",0x143C,15952,0),
+("SMSG_CALENDAR_EVENT_STATUS",0x143D,15952,0),
+("SMSG_CALENDAR_COMMAND_RESULT",0x143E,15952,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_ADDED",0x143F,15952,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_REMOVED",0x1440,15952,0),
+("SMSG_CALENDAR_EVENT_INVITE_ALERT",0x1441,15952,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT",0x1442,15952,0),
+("SMSG_CALENDAR_EVENT_INVITE_STATUS_ALERT",0x1443,15952,0),
+("SMSG_CALENDAR_EVENT_REMOVED_ALERT",0x1444,15952,0),
+("SMSG_CALENDAR_EVENT_UPDATED_ALERT",0x1445,15952,0),
+("SMSG_CALENDAR_EVENT_MODERATOR_STATUS_ALERT",0x1446,15952,0),
+("CMSG_CALENDAR_COMPLAIN",0x1447,15952,0),
+("CMSG_CALENDAR_GET_NUM_PENDING",0x1448,15952,0),
+("SMSG_CALENDAR_SEND_NUM_PENDING",0x1449,15952,0),
+("CMSG_SAVE_DANCE",0x144A,15952,0),
+("SMSG_NOTIFY_DANCE",0x144B,15952,0),
+("CMSG_PLAY_DANCE",0x144C,15952,0),
+("SMSG_PLAY_DANCE",0x144D,15952,0),
+("CMSG_LOAD_DANCES",0x144E,15952,0),
+("CMSG_STOP_DANCE",0x144F,15952,0),
+("SMSG_STOP_DANCE",0x1450,15952,0),
+("CMSG_SYNC_DANCE",0x1451,15952,0),
+("CMSG_DANCE_QUERY",0x1452,15952,0),
+("SMSG_DANCE_QUERY_RESPONSE",0x1453,15952,0),
+("SMSG_INVALIDATE_DANCE",0x1454,15952,0),
+("CMSG_DELETE_DANCE",0x1455,15952,0),
+("SMSG_LEARNED_DANCE_MOVES",0x1456,15952,0),
+("CMSG_LEARN_DANCE_MOVE",0x1457,15952,0),
+("CMSG_UNLEARN_DANCE_MOVE",0x1458,15952,0),
+("CMSG_SET_RUNE_COUNT",0x1459,15952,0),
+("CMSG_SET_RUNE_COOLDOWN",0x145A,15952,0),
+("MSG_MOVE_SET_PITCH_RATE_CHEAT",0x145B,15952,0),
+("MSG_MOVE_SET_PITCH_RATE",0x145C,15952,0),
+("SMSG_FORCE_PITCH_RATE_CHANGE",0x145D,15952,0),
+("CMSG_FORCE_PITCH_RATE_CHANGE_ACK",0x145E,15952,0),
+("SMSG_SPLINE_SET_PITCH_RATE",0x145F,15952,0),
+("CMSG_CALENDAR_EVENT_INVITE_NOTES",0x1460,15952,0),
+("SMSG_CALENDAR_EVENT_INVITE_NOTES",0x1461,15952,0),
+("SMSG_CALENDAR_EVENT_INVITE_NOTES_ALERT",0x1462,15952,0),
+("CMSG_UPDATE_MISSILE_TRAJECTORY",0x1463,15952,0),
+("SMSG_UPDATE_ACCOUNT_DATA_COMPLETE",0x1464,15952,0),
+("SMSG_TRIGGER_MOVIE",0x1465,15952,0),
+("CMSG_COMPLETE_MOVIE",0x1466,15952,0),
+("CMSG_SET_GLYPH_SLOT",0x1467,15952,0),
+("CMSG_SET_GLYPH",0x1468,15952,0),
+("SMSG_ACHIEVEMENT_EARNED",0x1469,15952,0),
+("SMSG_DYNAMIC_DROP_ROLL_RESULT",0x146A,15952,0),
+("SMSG_CRITERIA_UPDATE",0x146B,15952,0),
+("CMSG_QUERY_INSPECT_ACHIEVEMENTS",0x146C,15952,0),
+("SMSG_RESPOND_INSPECT_ACHIEVEMENTS",0x146D,15952,0),
+("CMSG_DISMISS_CONTROLLED_VEHICLE",0x146E,15952,0),
+("CMSG_COMPLETE_ACHIEVEMENT_CHEAT",0x146F,15952,0),
+("SMSG_QUESTUPDATE_ADD_PVP_KILL",0x1470,15952,0),
+("CMSG_SET_CRITERIA_CHEAT",0x1471,15952,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_UPDATED",0x1472,15952,0),
+("CMSG_UNITANIMTIER_CHEAT",0x1473,15952,0),
+("CMSG_CHAR_CUSTOMIZE",0x1474,15952,0),
+("SMSG_CHAR_CUSTOMIZE",0x1475,15952,0),
+("SMSG_PET_RENAMEABLE",0x1476,15952,0),
+("CMSG_REQUEST_VEHICLE_EXIT",0x1477,15952,0),
+("CMSG_REQUEST_VEHICLE_PREV_SEAT",0x1478,15952,0),
+("CMSG_REQUEST_VEHICLE_NEXT_SEAT",0x1479,15952,0),
+("CMSG_REQUEST_VEHICLE_SWITCH_SEAT",0x147A,15952,0),
+("CMSG_PET_LEARN_TALENT",0x147B,15952,0),
+("CMSG_PET_UNLEARN_TALENTS",0x147C,15952,0),
+("SMSG_SET_PHASE_SHIFT",0x147D,15952,0),
+("SMSG_ALL_ACHIEVEMENT_DATA",0x147E,15952,0),
+("CMSG_FORCE_SAY_CHEAT",0x147F,15952,0),
+("SMSG_HEALTH_UPDATE",0x1480,15952,0),
+("SMSG_POWER_UPDATE",0x1481,15952,0),
+("CMSG_GAMEOBJ_REPORT_USE",0x1482,15952,0),
+("SMSG_HIGHEST_THREAT_UPDATE",0x1483,15952,0),
+("SMSG_THREAT_UPDATE",0x1484,15952,0),
+("SMSG_THREAT_REMOVE",0x1485,15952,0),
+("SMSG_THREAT_CLEAR",0x1486,15952,0),
+("SMSG_CONVERT_RUNE",0x1487,15952,0),
+("SMSG_RESYNC_RUNES",0x1488,15952,0),
+("SMSG_ADD_RUNE_POWER",0x1489,15952,0),
+("CMSG_START_QUEST",0x148A,15952,0),
+("CMSG_REMOVE_GLYPH",0x148B,15952,0),
+("CMSG_DUMP_OBJECTS",0x148C,15952,0),
+("SMSG_DUMP_OBJECTS_DATA",0x148D,15952,0),
+("CMSG_DISMISS_CRITTER",0x148E,15952,0),
+("SMSG_NOTIFY_DEST_LOC_SPELL_CAST",0x148F,15952,0),
+("CMSG_AUCTION_LIST_PENDING_SALES",0x1490,15952,0),
+("SMSG_AUCTION_LIST_PENDING_SALES",0x1491,15952,0),
+("SMSG_MODIFY_COOLDOWN",0x1492,15952,0),
+("SMSG_PET_UPDATE_COMBO_POINTS",0x1493,15952,0),
+("CMSG_ENABLETAXI",0x1494,15952,0),
+("SMSG_PRE_RESURRECT",0x1495,15952,0),
+("SMSG_AURA_UPDATE_ALL",0x1496,15952,0),
+("SMSG_AURA_UPDATE",0x1497,15952,0),
+("CMSG_FLOOD_GRACE_CHEAT",0x1498,15952,0),
+("SMSG_SERVER_FIRST_ACHIEVEMENT",0x1499,15952,0),
+("SMSG_PET_LEARNED_SPELL",0x149A,15952,0),
+("SMSG_PET_REMOVED_SPELL",0x149B,15952,0),
+("CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE",0x149C,15952,0),
+("CMSG_HEARTH_AND_RESURRECT",0x149D,15952,0),
+("SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA",0x149E,15952,0),
+("SMSG_CRITERIA_DELETED",0x149F,15952,0),
+("SMSG_ACHIEVEMENT_DELETED",0x14A0,15952,0),
+("CMSG_SERVER_INFO_QUERY",0x14A1,15952,0),
+("SMSG_SERVER_INFO_RESPONSE",0x14A2,15952,0),
+("CMSG_CHECK_LOGIN_CRITERIA",0x14A3,15952,0),
+("SMSG_SERVER_BUCK_DATA_START",0x14A4,15952,0),
+("CMSG_SET_BREATH",0x14A5,15952,0),
+("CMSG_QUERY_VEHICLE_STATUS",0x14A6,15952,0),
+("SMSG_BATTLEGROUND_INFO_THROTTLED",0x14A7,15952,0),
+("SMSG_SET_VEHICLE_REC_ID",0x14A8,15952,0),
+("CMSG_RIDE_VEHICLE_INTERACT",0x14A9,15952,0),
+("CMSG_CONTROLLER_EJECT_PASSENGER",0x14AA,15952,0),
+("SMSG_PET_GUIDS",0x14AB,15952,0),
+("SMSG_CLIENTCACHE_VERSION",0x14AC,15952,0),
+("CMSG_CHANGE_GDF_ARENA_RATING",0x14AD,15952,0),
+("CMSG_SET_ARENA_TEAM_RATING_BY_INDEX",0x14AE,15952,0),
+("CMSG_SET_ARENA_TEAM_WEEKLY_GAMES",0x14AF,15952,0),
+("CMSG_SET_ARENA_TEAM_SEASON_GAMES",0x14B0,15952,0),
+("CMSG_SET_ARENA_MEMBER_WEEKLY_GAMES",0x14B1,15952,0),
+("CMSG_SET_ARENA_MEMBER_SEASON_GAMES",0x14B2,15952,0),
+("SMSG_SET_ITEM_PURCHASE_DATA",0x14B3,15952,0),
+("CMSG_GET_ITEM_PURCHASE_DATA",0x14B4,15952,0),
+("CMSG_ITEM_PURCHASE_REFUND",0x14B5,15952,0),
+("SMSG_ITEM_PURCHASE_REFUND_RESULT",0x14B6,15952,0),
+("CMSG_CORPSE_TRANSPORT_QUERY",0x14B7,15952,0),
+("SMSG_CORPSE_TRANSPORT_QUERY",0x14B8,15952,0),
+("CMSG_UNUSED5",0x14B9,15952,0),
+("CMSG_UNUSED6",0x14BA,15952,0),
+("CMSG_CALENDAR_EVENT_SIGNUP",0x14BB,15952,0),
+("SMSG_CALENDAR_CLEAR_PENDING_ACTION",0x14BC,15952,0),
+("SMSG_LOAD_EQUIPMENT_SET",0x14BD,15952,0),
+("CMSG_SAVE_EQUIPMENT_SET",0x14BE,15952,0),
+("CMSG_ON_MISSILE_TRAJECTORY_COLLISION",0x14BF,15952,0),
+("SMSG_NOTIFY_MISSILE_TRAJECTORY_COLLISION",0x14C0,15952,0),
+("SMSG_TALENT_UPDATE",0x14C1,15952,0),
+("CMSG_LEARN_TALENT_GROUP",0x14C2,15952,0),
+("CMSG_PET_LEARN_TALENT_GROUP",0x14C3,15952,0),
+("CMSG_SET_ACTIVE_TALENT_GROUP_OBSOLETE",0x14C4,15952,0),
+("CMSG_GM_GRANT_ACHIEVEMENT",0x14C5,15952,0),
+("CMSG_GM_REMOVE_ACHIEVEMENT",0x14C6,15952,0),
+("CMSG_GM_SET_CRITERIA_FOR_PLAYER",0x14C7,15952,0),
+("SMSG_DESTROY_ARENA_UNIT",0x14C8,15952,0),
+("SMSG_ARENA_TEAM_CHANGE_FAILED",0x14C9,15952,0),
+("CMSG_PROFILEDATA_REQUEST",0x14CA,15952,0),
+("SMSG_PROFILEDATA_RESPONSE",0x14CB,15952,0),
+("CMSG_START_BATTLEFIELD_CHEAT",0x14CC,15952,0),
+("CMSG_END_BATTLEFIELD_CHEAT",0x14CD,15952,0),
+("SMSG_COMPOUND_MOVE",0x14CE,15952,0),
+("SMSG_MOVE_GRAVITY_DISABLE",0x14CF,15952,0),
+("CMSG_MOVE_GRAVITY_DISABLE_ACK",0x14D0,15952,0),
+("SMSG_MOVE_GRAVITY_ENABLE",0x14D1,15952,0),
+("CMSG_MOVE_GRAVITY_ENABLE_ACK",0x14D2,15952,0),
+("MSG_MOVE_GRAVITY_CHNG",0x14D3,15952,0),
+("SMSG_SPLINE_MOVE_GRAVITY_DISABLE",0x14D4,15952,0),
+("SMSG_SPLINE_MOVE_GRAVITY_ENABLE",0x14D5,15952,0),
+("CMSG_USE_EQUIPMENT_SET",0x14D6,15952,0),
+("SMSG_USE_EQUIPMENT_SET_RESULT",0x14D7,15952,0),
+("CMSG_FORCE_ANIM",0x14D8,15952,0),
+("SMSG_FORCE_ANIM",0x14D9,15952,0),
+("CMSG_CHAR_FACTION_CHANGE",0x14DA,15952,0),
+("SMSG_CHAR_FACTION_CHANGE",0x14DB,15952,0),
+("CMSG_PVP_QUEUE_STATS_REQUEST",0x14DC,15952,0),
+("SMSG_PVP_QUEUE_STATS",0x14DD,15952,0),
+("CMSG_SET_PAID_SERVICE_CHEAT",0x14DE,15952,0),
+("SMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE",0x14DF,15952,0),
+("CMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE_RESPONSE",0x14E0,15952,0),
+("SMSG_BATTLEFIELD_MANAGER_ENTERING",0x14E1,15952,0),
+("SMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE",0x14E2,15952,0),
+("CMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE_RESPONSE",0x14E3,15952,0),
+("CMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST",0x14E4,15952,0),
+("SMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST_RESPONSE",0x14E5,15952,0),
+("SMSG_BATTLEFIELD_MANAGER_EJECT_PENDING",0x14E6,15952,0),
+("SMSG_BATTLEFIELD_MANAGER_EJECTED",0x14E7,15952,0),
+("CMSG_BATTLEFIELD_MANAGER_EXIT_REQUEST",0x14E8,15952,0),
+("SMSG_BATTLEFIELD_MANAGER_STATE_CHANGED",0x14E9,15952,0),
+("CMSG_BATTLEFIELD_MANAGER_ADVANCE_STATE",0x14EA,15952,0),
+("CMSG_BATTLEFIELD_MANAGER_SET_NEXT_TRANSITION_TIME",0x14EB,15952,0),
+("MSG_SET_RAID_DIFFICULTY",0x14EC,15952,0),
+("CMSG_XPGAIN",0x14ED,15952,0),
+("SMSG_XPGAIN",0x14EE,15952,0),
+("SMSG_GMTICKET_RESPONSE_ERROR",0x14EF,15952,0),
+("SMSG_GMTICKET_GET_RESPONSE",0x14F0,15952,0),
+("CMSG_GMTICKET_RESOLVE_RESPONSE",0x14F1,15952,0),
+("SMSG_GMTICKET_RESOLVE_RESPONSE",0x14F2,15952,0),
+("SMSG_GMTICKET_CREATE_RESPONSE_TICKET",0x14F3,15952,0),
+("CMSG_GM_CREATE_TICKET_RESPONSE",0x14F4,15952,0),
+("CMSG_SERVERINFO",0x14F5,15952,0),
+("SMSG_SERVERINFO",0x14F6,15952,0),
+("CMSG_UI_TIME_REQUEST",0x14F7,15952,0),
+("SMSG_UI_TIME",0x14F8,15952,0),
+("CMSG_CHAR_RACE_CHANGE",0x14F9,15952,0),
+("MSG_VIEW_PHASE_SHIFT",0x14FA,15952,0),
+("SMSG_TALENTS_INVOLUNTARILY_RESET",0x14FB,15952,0),
+("CMSG_DEBUG_SERVER_GEO",0x14FC,15952,0),
+("SMSG_DEBUG_SERVER_GEO",0x14FD,15952,0),
+("SMSG_LOOT_UPDATE",0x14FE,15952,0),
+("UMSG_UPDATE_GROUP_INFO",0x14FF,15952,0),
+("CMSG_READY_FOR_ACCOUNT_DATA_TIMES",0x1500,15952,0),
+("CMSG_QUERY_GET_ALL_QUESTS",0x1501,15952,0),
+("SMSG_ALL_QUESTS_COMPLETED",0x1502,15952,0),
+("CMSG_GMLAGREPORT_SUBMIT",0x1503,15952,0),
+("CMSG_AFK_MONITOR_INFO_REQUEST",0x1504,15952,0),
+("SMSG_AFK_MONITOR_INFO_RESPONSE",0x1505,15952,0),
+("CMSG_AFK_MONITOR_INFO_CLEAR",0x1506,15952,0),
+("SMSG_AREA_TRIGGER_NO_CORPSE",0x1507,15952,0),
+("CMSG_GM_NUKE_CHARACTER",0x1508,15952,0),
+("CMSG_LOW_LEVEL_RAID",0x1509,15952,0),
+("CMSG_LOW_LEVEL_RAID_USER",0x150A,15952,0),
+("SMSG_CAMERA_SHAKE",0x150B,15952,0),
+("SMSG_SOCKET_GEMS",0x150C,15952,0),
+("CMSG_SET_CHARACTER_MODEL",0x150D,15952,0),
+("SMSG_CONNECT_TO",0x150E,15952,0),
+("CMSG_CONNECT_TO_FAILED",0x150F,15952,0),
+("SMSG_SUSPEND_COMMS",0x1510,15952,0),
+("CMSG_SUSPEND_COMMS_ACK",0x1511,15952,0),
+("SMSG_RESUME_COMMS",0x1512,15952,0),
+("CMSG_AUTH_CONTINUED_SESSION",0x1513,15952,0),
+("CMSG_DROP_NEW_CONNECTION",0x1514,15952,0),
+("SMSG_SEND_ALL_COMBAT_LOG",0x1515,15952,0),
+("SMSG_OPEN_LFG_DUNGEON_FINDER",0x1516,15952,0),
+("SMSG_MOVE_SET_COLLISION_HGT",0x1517,15952,0),
+("CMSG_MOVE_SET_COLLISION_HGT_ACK",0x1518,15952,0),
+("MSG_MOVE_SET_COLLISION_HGT",0x1519,15952,0),
+("CMSG_CLEAR_RANDOM_BG_WIN_TIME",0x151A,15952,0),
+("CMSG_CLEAR_HOLIDAY_BG_WIN_TIME",0x151B,15952,0),
+("CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND",0x151C,15952,0),
+("SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT1",0x151D,15952,0),
+("SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT2",0x151E,15952,0),
+("SMSG_COMPRESSED_UNKNOWN_1310",0x151F,15952,0),
+("SMSG_UNKNOWN_1311",0x1520,15952,0),
+("SMSG_UNKNOWN_1312",0x1521,15952,0),
+("UMSG_UNKNOWN_1313",0x1522,15952,0),
+("SMSG_UNKNOWN_1314",0x1523,15952,0),
+("SMSG_UNKNOWN_1315",0x1524,15952,0),
+("SMSG_UNKNOWN_1316",0x1525,15952,0),
+("SMSG_UNKNOWN_1317",0x1526,15952,0),
+("UMSG_UNKNOWN_1318",0x1527,15952,0),
+("UMSG_UNKNOWN_1319",0x1528,15952,0),
+("CMSG_UNKNOWN_1320",0x1529,15952,0),
+("UMSG_UNKNOWN_1321",0x152A,15952,0),
+("UMSG_UNKNOWN_1322",0x152B,15952,0),
+("UMSG_UNKNOWN_1323",0x152C,15952,0),
+("UMSG_UNKNOWN_1324",0x152D,15952,0),
+("UMSG_UNKNOWN_1325",0x152E,15952,0),
+("UMSG_UNKNOWN_1326",0x152F,15952,0),
+("UMSG_UNKNOWN_1327",0x1530,15952,0),
+("UMSG_UNKNOWN_1328",0x1531,15952,0),
+("SMSG_UNKNOWN_1329",0x1532,15952,0),
+("UMSG_UNKNOWN_1330",0x1533,15952,0),
+("UMSG_UNKNOWN_1331",0x1534,15952,0),
+("UMSG_UNKNOWN_1332",0x1535,15952,0),
+("UMSG_UNKNOWN_1333",0x1536,15952,0),
+("UMSG_UNKNOWN_1334",0x1537,15952,0),
+("NUM_MSG_TYPES",0x0,15952,1);
diff --git a/sql_mr/Opcodes/opcodes_tc_15595.sql b/sql_mr/Opcodes/opcodes_tc_15595.sql
new file mode 100644
index 00000000000..637c5cf6a3d
--- /dev/null
+++ b/sql_mr/Opcodes/opcodes_tc_15595.sql
@@ -0,0 +1,1374 @@
+-- Opcode table for client build 15595
+
+CREATE TABLE IF NOT EXISTS `opcodes` (
+    `version` smallint(5) NOT NULL COMMENT "Client build",
+    `name` varchar(64) NOT NULL COMMENT "opcode name",
+    `value` int(10) NOT NULL COMMENT "opcode value",
+    `flags` int(10) unsigned NOT NULL DEFAULT "0" COMMENT "current opcode flags",
+    UNIQUE KEY `version` (`version`,`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT="Universal opcode storage";
+
+DELETE FROM `opcodes` WHERE `version` = 15595;
+
+INSERT INTO `opcodes` (`name`, `value`, `version`, `flags`) VALUES
+("CMSG_ACCEPT_LEVEL_GRANT",0x0205,15595,0),
+("CMSG_ACCEPT_TRADE",0x7110,15595,0),
+("CMSG_ACTIVATETAXI",0x6E06,15595,0),
+("CMSG_ACTIVATETAXIEXPRESS",0x0515,15595,0),
+("CMSG_ADDON_REGISTERED_PREFIXES",0x0954,15595,0),
+("CMSG_ADD_FRIEND",0x6527,15595,0),
+("CMSG_ADD_IGNORE",0x4726,15595,0),
+("CMSG_ADD_VOICE_IGNORE",0x0F06,15595,0),
+("CMSG_ALTER_APPEARANCE",0x0914,15595,0),
+("CMSG_AREATRIGGER",0x0937,15595,0),
+("CMSG_AREA_SPIRIT_HEALER_QUERY",0x4907,15595,0),
+("CMSG_AREA_SPIRIT_HEALER_QUEUE",0x4815,15595,0),
+("CMSG_ARENA_TEAM_ACCEPT",0x2A25,15595,0),
+("CMSG_ARENA_TEAM_CREATE",0x04A1,15595,0),
+("CMSG_ARENA_TEAM_DECLINE",0x6925,15595,0),
+("CMSG_ARENA_TEAM_DISBAND",0x6504,15595,0),
+("CMSG_ARENA_TEAM_INVITE",0x2F27,15595,0),
+("CMSG_ARENA_TEAM_LEADER",0x4204,15595,0),
+("CMSG_ARENA_TEAM_LEAVE",0x0E16,15595,0),
+("CMSG_ARENA_TEAM_QUERY",0x0514,15595,0),
+("CMSG_ARENA_TEAM_REMOVE",0x2F05,15595,0),
+("CMSG_ARENA_TEAM_ROSTER",0x6F37,15595,0),
+("CMSG_ATTACKSTOP",0x4106,15595,0),
+("CMSG_ATTACKSWING",0x0926,15595,0),
+("CMSG_AUCTION_LIST_BIDDER_ITEMS",0x6937,15595,0),
+("CMSG_AUCTION_LIST_ITEMS",0x0324,15595,0),
+("CMSG_AUCTION_LIST_OWNER_ITEMS",0x0206,15595,0),
+("CMSG_AUCTION_LIST_PENDING_SALES",0x2C17,15595,0),
+("CMSG_AUCTION_PLACE_BID",0x2306,15595,0),
+("CMSG_AUCTION_REMOVE_ITEM",0x6426,15595,0),
+("CMSG_AUCTION_SELL_ITEM",0x4A06,15595,0),
+("CMSG_AUTH_SESSION",0x0449,15595,0),
+("CMSG_AUTOBANK_ITEM",0x2537,15595,0),
+("CMSG_AUTOEQUIP_GROUND_ITEM",0x0000,15595,0),
+("CMSG_AUTOEQUIP_ITEM",0x4304,15595,0),
+("CMSG_AUTOEQUIP_ITEM_SLOT",0x4A17,15595,0),
+("CMSG_AUTOSTORE_BAG_ITEM",0x0236,15595,0),
+("CMSG_AUTOSTORE_BANK_ITEM",0x0607,15595,0),
+("CMSG_AUTOSTORE_GROUND_ITEM",0x0000,15595,0),
+("CMSG_AUTOSTORE_LOOT_ITEM",0x0E34,15595,0),
+("CMSG_AUTO_DECLINE_GUILD_INVITES",0x2034,15595,0),
+("CMSG_BANKER_ACTIVATE",0x0005,15595,0),
+("CMSG_BATTLEFIELD_JOIN",0x0000,15595,0),
+("CMSG_BATTLEFIELD_LEAVE",0x3018,15595,0),
+("CMSG_BATTLEFIELD_LIST",0x3814,15595,0),
+("CMSG_BATTLEFIELD_MGR_ENTRY_INVITE_RESPONSE",0x05A3,15595,0),
+("CMSG_BATTLEFIELD_MGR_EXIT_REQUEST",0x2490,15595,0),
+("CMSG_BATTLEFIELD_MGR_QUEUE_INVITE_RESPONSE",0x0413,15595,0),
+("CMSG_BATTLEFIELD_MGR_QUEUE_REQUEST",0x710C,15595,0),
+("CMSG_BATTLEFIELD_PORT",0x711A,15595,0),
+("CMSG_BATTLEFIELD_REQUEST_SCORE_DATA",0x0000,15595,0),
+("CMSG_BATTLEFIELD_STATUS",0x2500,15595,0),
+("CMSG_BATTLEGROUND_PLAYER_POSITIONS",0x3902,15595,0),
+("CMSG_BATTLEMASTER_JOIN",0x7902,15595,0),
+("CMSG_BATTLEMASTER_JOIN_ARENA",0x701C,15595,0),
+("CMSG_BATTLEMASTER_JOIN_RATED",0x3B18,15595,0),
+("CMSG_BEGIN_TRADE",0x721E,15595,0),
+("CMSG_BINDER_ACTIVATE",0x4006,15595,0),
+("CMSG_BOT_DETECTED2",0x0000,15595,0),
+("CMSG_BUG",0x4035,15595,0),
+("CMSG_BUSY_TRADE",0x331C,15595,0),
+("CMSG_BUYBACK_ITEM",0x6C17,15595,0),
+("CMSG_BUY_BANK_SLOT",0x0425,15595,0),
+("CMSG_BUY_ITEM",0x0736,15595,0),
+("CMSG_CALENDAR_ADD_EVENT",0x0726,15595,0),
+("CMSG_CALENDAR_ARENA_TEAM",0x0204,15595,0),
+("CMSG_CALENDAR_COMPLAIN",0x4C36,15595,0),
+("CMSG_CALENDAR_CONTEXT_EVENT_SIGNUP",0x0000,15595,0),
+("CMSG_CALENDAR_COPY_EVENT",0x0207,15595,0),
+("CMSG_CALENDAR_EVENT_INVITE",0x2435,15595,0),
+("CMSG_CALENDAR_EVENT_MODERATOR_STATUS",0x6B35,15595,0),
+("CMSG_CALENDAR_EVENT_REMOVE_INVITE",0x4337,15595,0),
+("CMSG_CALENDAR_EVENT_RSVP",0x0227,15595,0),
+("CMSG_CALENDAR_EVENT_SIGNUP",0x6606,15595,0),
+("CMSG_CALENDAR_EVENT_STATUS",0x2D24,15595,0),
+("CMSG_CALENDAR_GET_CALENDAR",0x2814,15595,0),
+("CMSG_CALENDAR_GET_EVENT",0x6416,15595,0),
+("CMSG_CALENDAR_GET_NUM_PENDING",0x4D05,15595,0),
+("CMSG_CALENDAR_GUILD_FILTER",0x4A16,15595,0),
+("CMSG_CALENDAR_REMOVE_EVENT",0x6636,15595,0),
+("CMSG_CALENDAR_UPDATE_EVENT",0x2114,15595,0),
+("CMSG_CANCEL_AURA",0x0E26,15595,0),
+("CMSG_CANCEL_AUTO_REPEAT_SPELL",0x6C35,15595,0),
+("CMSG_CANCEL_CAST",0x0115,15595,0),
+("CMSG_CANCEL_CHANNELLING",0x6C25,15595,0),
+("CMSG_CANCEL_GROWTH_AURA",0x0000,15595,0),
+("CMSG_CANCEL_MOUNT_AURA",0x0635,15595,0),
+("CMSG_CANCEL_QUEUED_SPELL",0x7B1C,15595,0),
+("CMSG_CANCEL_TEMP_ENCHANTMENT",0x6C37,15595,0),
+("CMSG_CANCEL_TRADE",0x731E,15595,0),
+("CMSG_CAST_SPELL",0x4C07,15595,0),
+("CMSG_CHANGEPLAYER_DIFFICULTY",0x6107,15595,0),
+("CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE",0x7310,15595,0),
+("CMSG_CHANNEL_ANNOUNCEMENTS",0x1146,15595,0),
+("CMSG_CHANNEL_BAN",0x3D56,15595,0),
+("CMSG_CHANNEL_DISPLAY_LIST",0x2144,15595,0),
+("CMSG_CHANNEL_INVITE",0x0144,15595,0),
+("CMSG_CHANNEL_KICK",0x3156,15595,0),
+("CMSG_CHANNEL_LIST",0x1556,15595,0),
+("CMSG_CHANNEL_MODERATE",0x2944,15595,0),
+("CMSG_CHANNEL_MODERATOR",0x0146,15595,0),
+("CMSG_CHANNEL_MUTE",0x2554,15595,0),
+("CMSG_CHANNEL_OWNER",0x3D44,15595,0),
+("CMSG_CHANNEL_PASSWORD",0x2556,15595,0),
+("CMSG_CHANNEL_ROSTER_INFO",0x3546,15595,0),
+("CMSG_CHANNEL_SET_OWNER",0x3556,15595,0),
+("CMSG_CHANNEL_SILENCE_ALL",0x2154,15595,0),
+("CMSG_CHANNEL_SILENCE_VOICE",0x2D54,15595,0),
+("CMSG_CHANNEL_UNBAN",0x2D46,15595,0),
+("CMSG_CHANNEL_UNMODERATOR",0x1954,15595,0),
+("CMSG_CHANNEL_UNMUTE",0x3554,15595,0),
+("CMSG_CHANNEL_UNSILENCE_ALL",0x2546,15595,0),
+("CMSG_CHANNEL_UNSILENCE_VOICE",0x3146,15595,0),
+("CMSG_CHANNEL_VOICE_OFF",0x3144,15595,0),
+("CMSG_CHANNEL_VOICE_ON",0x1144,15595,0),
+("CMSG_CHAR_CREATE",0x4A36,15595,0),
+("CMSG_CHAR_CUSTOMIZE",0x2C34,15595,0),
+("CMSG_CHAR_DELETE",0x6425,15595,0),
+("CMSG_CHAR_ENUM",0x0502,15595,0),
+("CMSG_CHAR_FACTION_CHANGE",0x2735,15595,0),
+("CMSG_CHAR_RACE_CHANGE",0x0D24,15595,0),
+("CMSG_CHAR_RENAME",0x2327,15595,0),
+("CMSG_CHAT_FILTERED",0x0946,15595,0),
+("CMSG_CHAT_IGNORED",0x0D54,15595,0),
+("CMSG_CLEAR_CHANNEL_WATCH",0x2604,15595,0),
+("CMSG_CLEAR_RAID_MARKER",0x7300,15595,0),
+("CMSG_CLEAR_TRADE_ITEM",0x7018,15595,0),
+("CMSG_COMMENTATOR_ENABLE",0x0B07,15595,0),
+("CMSG_COMMENTATOR_ENTER_INSTANCE",0x4105,15595,0),
+("CMSG_COMMENTATOR_EXIT_INSTANCE",0x6136,15595,0),
+("CMSG_COMMENTATOR_GET_MAP_INFO",0x0026,15595,0),
+("CMSG_COMMENTATOR_GET_PARTY_INFO",0x2412,15595,0),
+("CMSG_COMMENTATOR_GET_PLAYER_INFO",0x0D14,15595,0),
+("CMSG_COMMENTATOR_INSTANCE_COMMAND",0x0917,15595,0),
+("CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND",0x0025,15595,0),
+("CMSG_COMMENTATOR_START_WARGAME",0x25A0,15595,0),
+("CMSG_COMPLAIN",0x0427,15595,0),
+("CMSG_COMPLETE_CINEMATIC",0x2116,15595,0),
+("CMSG_COMPLETE_MOVIE",0x4136,15595,0),
+("CMSG_CONNECT_TO_FAILED",0x2533,15595,0),
+("CMSG_CONTACT_LIST",0x4534,15595,0),
+("CMSG_CORPSE_MAP_POSITION_QUERY",0x6205,15595,0),
+("CMSG_CREATURE_QUERY",0x2706,15595,0),
+("CMSG_DANCE_QUERY",0x4E07,15595,0),
+("CMSG_DECLINE_CHANNEL_INVITE",0x0000,15595,0),
+("CMSG_DELETEEQUIPMENT_SET",0x4D07,15595,0),
+("CMSG_DEL_FRIEND",0x6A15,15595,0),
+("CMSG_DEL_IGNORE",0x4727,15595,0),
+("CMSG_DEL_VOICE_IGNORE",0x0024,15595,0),
+("CMSG_DESTROY_ITEM",0x4A27,15595,0),
+("CMSG_DISMISS_CONTROLLED_VEHICLE",0x3218,15595,0),
+("CMSG_DISMISS_CRITTER",0x4227,15595,0),
+("CMSG_DUEL_ACCEPTED",0x2136,15595,0),
+("CMSG_DUEL_CANCELLED",0x6624,15595,0),
+("CMSG_DUNGEON_FINDER_GET_SYSTEM_INFO",0x0412,15595,0),
+("CMSG_EJECT_PASSENGER",0x6927,15595,0),
+("CMSG_EMOTE",0x4C26,15595,0),
+("CMSG_ENABLETAXI",0x0C16,15595,0),
+("CMSG_ENABLE_NAGLE",0x4449,15595,0),
+("CMSG_EQUIPMENT_SET_DELETE",0x0000,15595,0),
+("CMSG_EQUIPMENT_SET_SAVE",0x4F27,15595,0),
+("CMSG_EQUIPMENT_SET_USE",0x0417,15595,0),
+("CMSG_FAR_SIGHT",0x4835,15595,0),
+("CMSG_FORCE_MOVE_ROOT_ACK",0x701E,15595,0),
+("CMSG_FORCE_MOVE_UNROOT_ACK",0x7808,15595,0),
+("CMSG_GAMEOBJECT_QUERY",0x4017,15595,0),
+("CMSG_GAMEOBJ_REPORT_USE",0x4827,15595,0),
+("CMSG_GAMEOBJ_USE",0x4E17,15595,0),
+("CMSG_GAMESPEED_SET",0x0000,15595,0),
+("CMSG_GAMETIME_SET",0x0000,15595,0),
+("CMSG_GETDEATHBINDZONE",0x0000,15595,0),
+("CMSG_GET_MAIL_LIST",0x4D37,15595,0),
+("CMSG_GET_MIRRORIMAGE_DATA",0x0C25,15595,0),
+("CMSG_GHOST",0x0000,15595,0),
+("CMSG_GMRESPONSE_RESOLVE",0x6506,15595,0),
+("CMSG_GMSURVEY_SUBMIT",0x2724,15595,0),
+("CMSG_GMTICKET_CREATE",0x0137,15595,0),
+("CMSG_GMTICKET_DELETETICKET",0x6B14,15595,0),
+("CMSG_GMTICKET_GETTICKET",0x0326,15595,0),
+("CMSG_GMTICKET_SYSTEMSTATUS",0x4205,15595,0),
+("CMSG_GMTICKET_UPDATETEXT",0x0636,15595,0),
+("CMSG_GM_INVIS",0x0000,15595,0),
+("CMSG_GM_NUKE",0x0000,15595,0),
+("CMSG_GM_REPORT_LAG",0x6726,15595,0),
+("CMSG_GM_SET_SECURITY_GROUP",0x0000,15595,0),
+("CMSG_GOSSIP_HELLO",0x4525,15595,0),
+("CMSG_GOSSIP_SELECT_OPTION",0x0216,15595,0),
+("CMSG_GRANT_LEVEL",0x6D16,15595,0),
+("CMSG_GROUP_ASSISTANT_LEADER",0x6025,15595,0),
+("CMSG_GROUP_CANCEL",0x0000,15595,0),
+("CMSG_GROUP_CHANGE_SUB_GROUP",0x4124,15595,0),
+("CMSG_GROUP_DISBAND",0x2804,15595,0),
+("CMSG_GROUP_INVITE",0x0513,15595,0),
+("CMSG_GROUP_INVITE_RESPONSE",0x0410,15595,0),
+("CMSG_GROUP_RAID_CONVERT",0x6E27,15595,0),
+("CMSG_GROUP_REQUEST_JOIN_UPDATES",0x2583,15595,0),
+("CMSG_GROUP_SET_LEADER",0x4C17,15595,0),
+("CMSG_GROUP_SET_ROLES",0x25B1,15595,0),
+("CMSG_GROUP_SWAP_SUB_GROUP",0x0034,15595,0),
+("CMSG_GROUP_UNINVITE",0x0000,15595,0),
+("CMSG_GROUP_UNINVITE_GUID",0x2E07,15595,0),
+("CMSG_GUILD_ACCEPT",0x2531,15595,0),
+("CMSG_GUILD_ACHIEVEMENT_MEMBERS",0x3025,15595,0),
+("CMSG_GUILD_ACHIEVEMENT_PROGRESS_QUERY",0x3235,15595,0),
+("CMSG_GUILD_ADD_RANK",0x3030,15595,0),
+("CMSG_GUILD_ASSIGN_MEMBER_RANK",0x3032,15595,0),
+("CMSG_GUILD_BANKER_ACTIVATE",0x2E37,15595,0),
+("CMSG_GUILD_BANK_BUY_TAB",0x0C37,15595,0),
+("CMSG_GUILD_BANK_DEPOSIT_MONEY",0x0707,15595,0),
+("CMSG_GUILD_BANK_LOG_QUERY",0x3224,15595,0),
+("CMSG_GUILD_BANK_MONEY_WITHDRAWN_QUERY",0x1225,15595,0),
+("CMSG_GUILD_BANK_NOTE",0x0000,15595,0),
+("CMSG_GUILD_BANK_QUERY_TAB",0x2E35,15595,0),
+("CMSG_GUILD_BANK_QUERY_TEXT",0x3220,15595,0),
+("CMSG_GUILD_BANK_SWAP_ITEMS",0x2315,15595,0),
+("CMSG_GUILD_BANK_UPDATE_TAB",0x0106,15595,0),
+("CMSG_GUILD_BANK_WITHDRAW_MONEY",0x0037,15595,0),
+("CMSG_GUILD_CHANGE_NAME_REQUEST",0x1232,15595,0),
+("CMSG_GUILD_DECLINE",0x3231,15595,0),
+("CMSG_GUILD_DEL_RANK",0x3234,15595,0),
+("CMSG_GUILD_DEMOTE",0x1020,15595,0),
+("CMSG_GUILD_DISBAND",0x3226,15595,0),
+("CMSG_GUILD_EVENT_LOG_QUERY",0x1220,15595,0),
+("CMSG_GUILD_INFO",0x0000,15595,0),
+("CMSG_GUILD_INFO_TEXT",0x3227,15595,0),
+("CMSG_GUILD_INVITE",0x24B0,15595,0),
+("CMSG_GUILD_LEAVE",0x1021,15595,0),
+("CMSG_GUILD_MEMBER_SEND_SOR_REQUEST",0x3225,15595,0),
+("CMSG_GUILD_MOTD",0x1035,15595,0),
+("CMSG_GUILD_NEWS_UPDATE_STICKY",0x3223,15595,0),
+("CMSG_GUILD_PERMISSIONS",0x3022,15595,0),
+("CMSG_GUILD_PROMOTE",0x1030,15595,0),
+("CMSG_GUILD_QUERY",0x4426,15595,0),
+("CMSG_GUILD_QUERY_NEWS",0x3020,15595,0),
+("CMSG_GUILD_QUERY_RANKS",0x1026,15595,0),
+("CMSG_GUILD_REMOVE",0x1231,15595,0),
+("CMSG_GUILD_REPLACE_GUILD_MASTER",0x1034,15595,0),
+("CMSG_GUILD_REQUEST_CHALLENGE_UPDATE",0x1224,15595,0),
+("CMSG_GUILD_REQUEST_MAX_DAILY_XP",0x3232,15595,0),
+("CMSG_GUILD_REQUEST_PARTY_STATE",0x3900,15595,0),
+("CMSG_GUILD_ROSTER",0x1226,15595,0),
+("CMSG_GUILD_SET_ACHIEVEMENT_TRACKING",0x1027,15595,0),
+("CMSG_GUILD_SET_GUILD_MASTER",0x3034,15595,0),
+("CMSG_GUILD_SET_NOTE",0x1233,15595,0),
+("CMSG_GUILD_SET_RANK_PERMISSIONS",0x1024,15595,0),
+("CMSG_GUILD_SWITCH_RANK",0x1221,15595,0),
+("CMSG_HEARTH_AND_RESURRECT",0x4B34,15595,0),
+("CMSG_IGNORE_TRADE",0x7112,15595,0),
+("CMSG_INITIATE_TRADE",0x7916,15595,0),
+("CMSG_INSPECT",0x0927,15595,0),
+("CMSG_INSPECT_HONOR_STATS",0x791E,15595,0),
+("CMSG_INSTANCE_LOCK_WARNING_RESPONSE",0x6234,15595,0),
+("CMSG_ITEM_REFUND",0x6134,15595,0),
+("CMSG_ITEM_REFUND_INFO",0x2206,15595,0),
+("CMSG_ITEM_TEXT_QUERY",0x2406,15595,0),
+("CMSG_JOIN_CHANNEL",0x0156,15595,0),
+("CMSG_KEEP_ALIVE",0x0015,15595,0),
+("CMSG_LEARN_PREVIEW_TALENTS",0x2415,15595,0),
+("CMSG_LEARN_PREVIEW_TALENTS_PET",0x6E24,15595,0),
+("CMSG_LEARN_TALENT",0x0306,15595,0),
+("CMSG_LEAVE_CHANNEL",0x2D56,15595,0),
+("CMSG_LFG_GET_PLAYER_INFO",0x0000,15595,0),
+("CMSG_LFG_GET_STATUS",0x2581,15595,0),
+("CMSG_LFG_JOIN",0x2430,15595,0),
+("CMSG_LFG_LEAVE",0x2433,15595,0),
+("CMSG_LFG_LFR_JOIN",0x0531,15595,0),
+("CMSG_LFG_LFR_LEAVE",0x0500,15595,0),
+("CMSG_LFG_PARTY_LOCK_INFO_REQUEST",0x0000,15595,0),
+("CMSG_LFG_PROPOSAL_RESULT",0x0403,15595,0),
+("CMSG_LFG_SET_BOOT_VOTE",0x04B3,15595,0),
+("CMSG_LFG_SET_COMMENT",0x0530,15595,0),
+("CMSG_LFG_SET_ROLES",0x0480,15595,0),
+("CMSG_LFG_TELEPORT",0x2482,15595,0),
+("CMSG_LF_GUILD_ADD_RECRUIT",0x4448,15595,0),
+("CMSG_LF_GUILD_BROWSE",0x0548,15595,0),
+("CMSG_LF_GUILD_DECLINE_RECRUIT",0x1031,15595,0),
+("CMSG_LF_GUILD_GET_APPLICATIONS",0x1230,15595,0),
+("CMSG_LF_GUILD_GET_RECRUITS",0x3230,15595,0),
+("CMSG_LF_GUILD_POST_REQUEST",0x3237,15595,0),
+("CMSG_LF_GUILD_REMOVE_RECRUIT",0x3027,15595,0),
+("CMSG_LF_GUILD_SET_GUILD_POST",0x0448,15595,0),
+("CMSG_LIST_INVENTORY",0x2806,15595,0),
+("CMSG_LOAD_SCREEN",0x2422,15595,0),
+("CMSG_LOGOUT_CANCEL",0x2324,15595,0),
+("CMSG_LOGOUT_REQUEST",0x0A25,15595,0),
+("CMSG_LOG_DISCONNECT",0x446D,15595,0),
+("CMSG_LOOT",0x0127,15595,0),
+("CMSG_LOOT_CURRENCY",0x781C,15595,0),
+("CMSG_LOOT_MASTER_GIVE",0x4F35,15595,0),
+("CMSG_LOOT_METHOD",0x2F24,15595,0),
+("CMSG_LOOT_MONEY",0x6227,15595,0),
+("CMSG_LOOT_RELEASE",0x2007,15595,0),
+("CMSG_LOOT_ROLL",0x6934,15595,0),
+("CMSG_MAIL_CREATE_TEXT_ITEM",0x0B14,15595,0),
+("CMSG_MAIL_DELETE",0x6104,15595,0),
+("CMSG_MAIL_MARK_AS_READ",0x0C07,15595,0),
+("CMSG_MAIL_RETURN_TO_SENDER",0x0816,15595,0),
+("CMSG_MAIL_TAKE_ITEM",0x2B06,15595,0),
+("CMSG_MAIL_TAKE_MONEY",0x4034,15595,0),
+("CMSG_MEETINGSTONE_INFO",0x0000,15595,0),
+("CMSG_MESSAGECHAT_ADDON_BATTLEGROUND",0x0D46,15595,0),
+("CMSG_MESSAGECHAT_ADDON_GUILD",0x0544,15595,0),
+("CMSG_MESSAGECHAT_ADDON_OFFICER",0x3954,15595,0),
+("CMSG_MESSAGECHAT_ADDON_PARTY",0x0546,15595,0),
+("CMSG_MESSAGECHAT_ADDON_RAID",0x1D56,15595,0),
+("CMSG_MESSAGECHAT_ADDON_WHISPER",0x2146,15595,0),
+("CMSG_MESSAGECHAT_AFK",0x0D44,15595,0),
+("CMSG_MESSAGECHAT_BATTLEGROUND",0x2156,15595,0),
+("CMSG_MESSAGECHAT_CHANNEL",0x1D44,15595,0),
+("CMSG_MESSAGECHAT_DND",0x2946,15595,0),
+("CMSG_MESSAGECHAT_EMOTE",0x1156,15595,0),
+("CMSG_MESSAGECHAT_GUILD",0x3956,15595,0),
+("CMSG_MESSAGECHAT_OFFICER",0x1946,15595,0),
+("CMSG_MESSAGECHAT_PARTY",0x1D46,15595,0),
+("CMSG_MESSAGECHAT_RAID",0x2D44,15595,0),
+("CMSG_MESSAGECHAT_RAID_WARNING",0x0944,15595,0),
+("CMSG_MESSAGECHAT_SAY",0x1154,15595,0),
+("CMSG_MESSAGECHAT_WHISPER",0x0D56,15595,0),
+("CMSG_MESSAGECHAT_YELL",0x3544,15595,0),
+("CMSG_MINIGAME_MOVE",0x2A34,15595,0),
+("CMSG_MOUNTSPECIAL_ANIM",0x2807,15595,0),
+("CMSG_MOVE_CHARM_TELEPORT_CHEAT",0x0000,15595,0),
+("CMSG_MOVE_CHNG_TRANSPORT",0x3102,15595,0),
+("CMSG_MOVE_ENABLE_SWIM_TO_FLY_TRANS_ACK",0x0000,15595,0),
+("CMSG_MOVE_FALL_RESET",0x310A,15595,0),
+("CMSG_MOVE_FEATHER_FALL_ACK",0x3110,15595,0),
+("CMSG_MOVE_FORCE_FLIGHT_BACK_SPEED_CHANGE_ACK",0x310E,15595,0),
+("CMSG_MOVE_FORCE_FLIGHT_SPEED_CHANGE_ACK",0x7314,15595,0),
+("CMSG_MOVE_FORCE_PITCH_RATE_CHANGE_ACK",0x3100,15595,0),
+("CMSG_MOVE_FORCE_RUN_BACK_SPEED_CHANGE_ACK",0x3216,15595,0),
+("CMSG_MOVE_FORCE_RUN_SPEED_CHANGE_ACK",0x7818,15595,0),
+("CMSG_MOVE_FORCE_SWIM_BACK_SPEED_CHANGE_ACK",0x7A16,15595,0),
+("CMSG_MOVE_FORCE_SWIM_SPEED_CHANGE_ACK",0x7A10,15595,0),
+("CMSG_MOVE_FORCE_TURN_RATE_CHANGE_ACK",0x7316,15595,0),
+("CMSG_MOVE_FORCE_WALK_SPEED_CHANGE_ACK",0x7210,15595,0),
+("CMSG_MOVE_GRAVITY_DISABLE_ACK",0x3118,15595,0),
+("CMSG_MOVE_GRAVITY_ENABLE_ACK",0x700A,15595,0),
+("CMSG_MOVE_HOVER_ACK",0x3318,15595,0),
+("CMSG_MOVE_KNOCK_BACK_ACK",0x721C,15595,0),
+("CMSG_MOVE_NOT_ACTIVE_MOVER",0x7A1A,15595,0),
+("CMSG_MOVE_SET_CAN_FLY",0x720E,15595,0),
+("CMSG_MOVE_SET_CAN_FLY_ACK",0x790C,15595,0),
+("CMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY_ACK",0x3014,15595,0),
+("CMSG_MOVE_SET_COLLISION_HEIGHT_ACK",0x7114,15595,0),
+("CMSG_MOVE_SET_RELATIVE_POSITION",0x0000,15595,0),
+("CMSG_MOVE_SET_VEHICLE_REC_ID_ACK",0x0000,15595,0),
+("CMSG_MOVE_SPLINE_DONE",0x790E,15595,0),
+("CMSG_MOVE_TIME_SKIPPED",0x7A0A,15595,0),
+("CMSG_MOVE_TOGGLE_COLLISION_ACK",0x0000,15595,0),
+("CMSG_MOVE_WATER_WALK_ACK",0x3B00,15595,0),
+("CMSG_NAME_QUERY",0x2224,15595,0),
+("CMSG_NEW_SPELL_SLOT",0x0000,15595,0),
+("CMSG_NEXT_CINEMATIC_CAMERA",0x2014,15595,0),
+("CMSG_NPC_TEXT_QUERY",0x4E24,15595,0),
+("CMSG_OBJECT_UPDATE_FAILED",0x3808,15595,0),
+("CMSG_OBJECT_UPDATE_RESCUED",0x3906,15595,0),
+("CMSG_OFFER_PETITION",0x4817,15595,0),
+("CMSG_OPENING_CINEMATIC",0x0A16,15595,0),
+("CMSG_OPEN_ITEM",0x6A34,15595,0),
+("CMSG_OPT_OUT_OF_LOOT",0x6B16,15595,0),
+("CMSG_PAGE_TEXT_QUERY",0x6614,15595,0),
+("CMSG_PARTY_SILENCE",0x6B26,15595,0),
+("CMSG_PARTY_UNSILENCE",0x4D24,15595,0),
+("CMSG_PETITION_BUY",0x4E05,15595,0),
+("CMSG_PETITION_QUERY",0x4424,15595,0),
+("CMSG_PETITION_SHOWLIST",0x4617,15595,0),
+("CMSG_PETITION_SHOW_SIGNATURES",0x4F15,15595,0),
+("CMSG_PETITION_SIGN",0x0E04,15595,0),
+("CMSG_PET_ABANDON",0x0C24,15595,0),
+("CMSG_PET_ACTION",0x0226,15595,0),
+("CMSG_PET_CANCEL_AURA",0x4B25,15595,0),
+("CMSG_PET_CAST_SPELL",0x6337,15595,0),
+("CMSG_PET_LEARN_TALENT",0x6725,15595,0),
+("CMSG_PET_NAME_CACHE",0x0000,15595,0),
+("CMSG_PET_NAME_QUERY",0x6F24,15595,0),
+("CMSG_PET_RENAME",0x6406,15595,0),
+("CMSG_PET_SET_ACTION",0x6904,15595,0),
+("CMSG_PET_SPELL_AUTOCAST",0x2514,15595,0),
+("CMSG_PET_STOP_ATTACK",0x6C14,15595,0),
+("CMSG_PING",0x444D,15595,0),
+("CMSG_PLAYED_TIME",0x0804,15595,0),
+("CMSG_PLAYER_DIFFICULTY_CHANGE",0x0000,15595,0),
+("CMSG_PLAYER_LOGIN",0x05B1,15595,0),
+("CMSG_PLAYER_LOGOUT",0x0000,15595,0),
+("CMSG_PLAYER_VEHICLE_ENTER",0x2705,15595,0),
+("CMSG_PLAY_DANCE",0x6914,15595,0),
+("CMSG_PUSHQUESTTOPARTY",0x4B14,15595,0),
+("CMSG_PVP_LOG_DATA",0x7308,15595,0),
+("CMSG_QUERY_BATTLEFIELD_STATE",0x7202,15595,0),
+("CMSG_QUERY_GUILD_MEMBERS_FOR_RECIPE",0x1036,15595,0),
+("CMSG_QUERY_GUILD_MEMBER_RECIPES",0x1037,15595,0),
+("CMSG_QUERY_GUILD_RECIPES",0x3033,15595,0),
+("CMSG_QUERY_GUILD_REWARDS",0x3012,15595,0),
+("CMSG_QUERY_GUILD_XP",0x1237,15595,0),
+("CMSG_QUERY_INSPECT_ACHIEVEMENTS",0x4D27,15595,0),
+("CMSG_QUERY_QUESTS_COMPLETED",0x2317,15595,0),
+("CMSG_QUERY_TIME",0x0A36,15595,0),
+("CMSG_QUESTGIVER_ACCEPT_QUEST",0x6B37,15595,0),
+("CMSG_QUESTGIVER_CANCEL",0x0000,15595,0),
+("CMSG_QUESTGIVER_CHOOSE_REWARD",0x2125,15595,0),
+("CMSG_QUESTGIVER_COMPLETE_QUEST",0x0114,15595,0),
+("CMSG_QUESTGIVER_HELLO",0x0D17,15595,0),
+("CMSG_QUESTGIVER_QUERY_QUEST",0x2F14,15595,0),
+("CMSG_QUESTGIVER_QUEST_AUTOLAUNCH",0x0000,15595,0),
+("CMSG_QUESTGIVER_REQUEST_REWARD",0x2534,15595,0),
+("CMSG_QUESTGIVER_STATUS_MULTIPLE_QUERY",0x6305,15595,0),
+("CMSG_QUESTGIVER_STATUS_QUERY",0x4407,15595,0),
+("CMSG_QUESTLOG_REMOVE_QUEST",0x0D16,15595,0),
+("CMSG_QUESTLOG_SWAP_QUEST",0x0000,15595,0),
+("CMSG_QUEST_CONFIRM_ACCEPT",0x0D15,15595,0),
+("CMSG_QUEST_NPC_QUERY",0x7302,15595,0),
+("CMSG_QUEST_POI_QUERY",0x4037,15595,0),
+("CMSG_QUEST_QUERY",0x0D06,15595,0),
+("CMSG_RANDOMIZE_CHAR_NAME",0x2413,15595,0),
+("CMSG_READY_FOR_ACCOUNT_DATA_TIMES",0x2B16,15595,0),
+("CMSG_READ_ITEM",0x2F16,15595,0),
+("CMSG_REALM_SPLIT",0x2906,15595,0),
+("CMSG_RECLAIM_CORPSE",0x4036,15595,0),
+("CMSG_REDIRECTION_AUTH_PROOF",0x044D,15595,0),
+("CMSG_REFORGE_ITEM",0x331A,15595,0),
+("CMSG_REORDER_CHARACTERS",0x0593,15595,0),
+("CMSG_REPAIR_ITEM",0x2917,15595,0),
+("CMSG_REPLACE_ACCOUNT_DATA",0x0000,15595,0),
+("CMSG_REPOP_REQUEST",0x6235,15595,0),
+("CMSG_REPORT_PVP_AFK",0x6734,15595,0),
+("CMSG_REQUEST_ACCOUNT_DATA",0x6505,15595,0),
+("CMSG_REQUEST_CATEGORY_COOLDOWNS",0x7102,15595,0),
+("CMSG_REQUEST_CEMETERY_LIST",0x720A,15595,0),
+("CMSG_REQUEST_HOTFIX",0x2401,15595,0),
+("CMSG_REQUEST_INSPECT_RATED_BG_STATS",0x3010,15595,0),
+("CMSG_REQUEST_PARTY_MEMBER_STATS",0x0C04,15595,0),
+("CMSG_REQUEST_PET_INFO",0x4924,15595,0),
+("CMSG_REQUEST_PVP_OPTIONS_ENABLED",0x24A1,15595,0),
+("CMSG_REQUEST_PVP_REWARDS",0x780C,15595,0),
+("CMSG_REQUEST_RAID_INFO",0x2F26,15595,0),
+("CMSG_REQUEST_RATED_BG_INFO",0x2423,15595,0),
+("CMSG_REQUEST_RATED_BG_STATS",0x05B3,15595,0),
+("CMSG_REQUEST_RESEARCH_HISTORY",0x3306,15595,0),
+("CMSG_REQUEST_VEHICLE_EXIT",0x2B35,15595,0),
+("CMSG_REQUEST_VEHICLE_NEXT_SEAT",0x4434,15595,0),
+("CMSG_REQUEST_VEHICLE_PREV_SEAT",0x4C04,15595,0),
+("CMSG_REQUEST_VEHICLE_SWITCH_SEAT",0x4C14,15595,0),
+("CMSG_RESET_FACTION_CHEAT",0x4469,15595,0),
+("CMSG_RESET_INSTANCES",0x6E14,15595,0),
+("CMSG_RESURRECT_RESPONSE",0x6827,15595,0),
+("CMSG_RETURN_TO_GRAVEYARD",0x301E,15595,0),
+("CMSG_ROLE_POLL_BEGIN",0x0430,15595,0),
+("CMSG_SAVE_CUF_PROFILES",0x730E,15595,0),
+("CMSG_SAVE_PLAYER",0x0000,15595,0),
+("CMSG_SEARCH_LFG_JOIN",0x0000,15595,0),
+("CMSG_SEARCH_LFG_LEAVE",0x0000,15595,0),
+("CMSG_SELF_RES",0x6115,15595,0),
+("CMSG_SELL_ITEM",0x4E15,15595,0),
+("CMSG_SEND_MAIL",0x0523,15595,0),
+("CMSG_SEND_SOR_REQUEST_VIA_ADDRESS",0x0420,15595,0),
+("CMSG_SEND_SOR_REQUEST_VIA_BNET_ACCOUNT_ID",0x0482,15595,0),
+("CMSG_SERVERTIME",0x0000,15595,0),
+("CMSG_SETDEATHBINDPOINT",0x0000,15595,0),
+("CMSG_SETSHEATHED",0x4326,15595,0),
+("CMSG_SET_ACTIONBAR_TOGGLES",0x2506,15595,0),
+("CMSG_SET_ACTION_BUTTON",0x6F06,15595,0),
+("CMSG_SET_ACTIVE_MOVER",0x3314,15595,0),
+("CMSG_SET_ACTIVE_VOICE_CHANNEL",0x4305,15595,0),
+("CMSG_SET_ALLOW_LOW_LEVEL_RAID1",0x4435,15595,0),
+("CMSG_SET_ALLOW_LOW_LEVEL_RAID2",0x0536,15595,0),
+("CMSG_SET_CHANNEL_WATCH",0x4517,15595,0),
+("CMSG_SET_CONTACT_NOTES",0x6135,15595,0),
+("CMSG_SET_CURRENCY_FLAGS",0x7306,15595,0),
+("CMSG_SET_EVERYONE_IS_ASSISTANT",0x2530,15595,0),
+("CMSG_SET_FACTION_ATWAR",0x0706,15595,0),
+("CMSG_SET_FACTION_CHEAT",0x0000,15595,0),
+("CMSG_SET_FACTION_INACTIVE",0x0E37,15595,0),
+("CMSG_SET_GUILD_BANK_TEXT",0x3023,15595,0),
+("CMSG_SET_LFG_COMMENT",0x0000,15595,0),
+("CMSG_SET_PET_SLOT",0x3A04,15595,0),
+("CMSG_SET_PLAYER_DECLINED_NAMES",0x6316,15595,0),
+("CMSG_SET_PREFERED_CEMETERY",0x311E,15595,0),
+("CMSG_SET_PRIMARY_TALENT_TREE",0x4524,15595,0),
+("CMSG_SET_RELATIVE_POSITION",0x311A,15595,0),
+("CMSG_SET_SAVED_INSTANCE_EXTEND",0x6706,15595,0),
+("CMSG_SET_SELECTION",0x0506,15595,0),
+("CMSG_SET_SKILL_CHEAT",0x0000,15595,0),
+("CMSG_SET_TAXI_BENCHMARK_MODE",0x4314,15595,0),
+("CMSG_SET_TITLE",0x2117,15595,0),
+("CMSG_SET_TRADE_CURRENCY",0x3312,15595,0),
+("CMSG_SET_TRADE_GOLD",0x3008,15595,0),
+("CMSG_SET_TRADE_ITEM",0x7B0C,15595,0),
+("CMSG_SET_VEHICLE_REC_ID_ACK",0x3108,15595,0),
+("CMSG_SET_WATCHED_FACTION",0x2434,15595,0),
+("CMSG_SHOWING_CLOAK",0x4135,15595,0),
+("CMSG_SHOWING_HELM",0x0735,15595,0),
+("CMSG_SOCKET_GEMS",0x2F04,15595,0),
+("CMSG_SPELLCLICK",0x0805,15595,0),
+("CMSG_SPIRIT_HEALER_ACTIVATE",0x2E26,15595,0),
+("CMSG_SPLIT_ITEM",0x0F17,15595,0),
+("CMSG_STANDSTATECHANGE",0x0535,15595,0),
+("CMSG_START_QUEST",0x0000,15595,0),
+("CMSG_STOP_DANCE",0x2907,15595,0),
+("CMSG_STORE_LOOT_IN_SLOT",0x0000,15595,0),
+("CMSG_SUBMIT_BUG",0x2520,15595,0),
+("CMSG_SUBMIT_COMPLAIN",0x2501,15595,0),
+("CMSG_SUGGESTION_SUBMIT",0x2512,15595,0),
+("CMSG_SUMMON_RESPONSE",0x6F27,15595,0),
+("CMSG_SUSPEND_TOKEN",0x046D,15595,0),
+("CMSG_SWAP_INV_ITEM",0x2614,15595,0),
+("CMSG_SWAP_ITEM",0x6326,15595,0),
+("CMSG_SYNC_DANCE",0x0036,15595,0),
+("CMSG_TAXICLEARALLNODES",0x0000,15595,0),
+("CMSG_TAXIENABLEALLNODES",0x0000,15595,0),
+("CMSG_TAXINODE_STATUS_QUERY",0x2F25,15595,0),
+("CMSG_TAXIQUERYAVAILABLENODES",0x6C06,15595,0),
+("CMSG_TAXISHOWNODES",0x0000,15595,0),
+("CMSG_TELEPORT_TO_UNIT",0x4206,15595,0),
+("CMSG_TEXT_EMOTE",0x2E24,15595,0),
+("CMSG_TIME_ADJUSTMENT_RESPONSE",0x3818,15595,0),
+("CMSG_TIME_SYNC_RESP",0x3B0C,15595,0),
+("CMSG_TIME_SYNC_RESP_FAILED",0x710A,15595,0),
+("CMSG_TOGGLE_PVP",0x6815,15595,0),
+("CMSG_TOTEM_DESTROYED",0x4207,15595,0),
+("CMSG_TRAINER_BUY_SPELL",0x4415,15595,0),
+("CMSG_TRAINER_LIST",0x2336,15595,0),
+("CMSG_TRANSMOGRIFY_ITEMS",0x3B0E,15595,0),
+("CMSG_TRIGGER_CINEMATIC_CHEAT",0x0000,15595,0),
+("CMSG_TURN_IN_PETITION",0x0B27,15595,0),
+("CMSG_TUTORIAL_CLEAR",0x6515,15595,0),
+("CMSG_TUTORIAL_FLAG",0x6C26,15595,0),
+("CMSG_TUTORIAL_RESET",0x2726,15595,0),
+("CMSG_UNACCEPT_TRADE",0x391A,15595,0),
+("CMSG_UNLEARN_SKILL",0x6106,15595,0),
+("CMSG_UNLEARN_SPECIALIZATION",0x3210,15595,0),
+("CMSG_UNREGISTER_ALL_ADDON_PREFIXES",0x3D54,15595,0),
+("CMSG_UPDATE_ACCOUNT_DATA",0x4736,15595,0),
+("CMSG_UPDATE_MISSILE_TRAJECTORY",0x781E,15595,0),
+("CMSG_UPDATE_PROJECTILE_POSITION",0x0E24,15595,0),
+("CMSG_USED_FOLLOW",0x7912,15595,0),
+("CMSG_USE_ITEM",0x2C06,15595,0),
+("CMSG_VIOLENCE_LEVEL",0x7816,15595,0),
+("CMSG_VOICE_SESSION_ENABLE",0x2314,15595,0),
+("CMSG_VOID_STORAGE_QUERY",0x790A,15595,0),
+("CMSG_VOID_STORAGE_TRANSFER",0x380E,15595,0),
+("CMSG_VOID_STORAGE_UNLOCK",0x7B14,15595,0),
+("CMSG_VOID_SWAP_ITEM",0x3204,15595,0),
+("CMSG_WARDEN_DATA",0x25A2,15595,0),
+("CMSG_WARGAME_ACCEPT",0x2410,15595,0),
+("CMSG_WARGAME_START",0x05A0,15595,0),
+("CMSG_WHO",0x6C15,15595,0),
+("CMSG_WHOIS",0x6B05,15595,0),
+("CMSG_WORLD_STATE_UI_TIMER_UPDATE",0x4605,15595,0),
+("CMSG_WORLD_TELEPORT",0x24B2,15595,0),
+("CMSG_WRAP_ITEM",0x4F06,15595,0),
+("CMSG_ZONEUPDATE",0x4F37,15595,0),
+("MSG_AUCTION_HELLO",0x2307,15595,0),
+("MSG_CHANNEL_START",0x0A15,15595,0),
+("MSG_CHANNEL_UPDATE",0x2417,15595,0),
+("MSG_CORPSE_QUERY",0x4336,15595,0),
+("MSG_GM_BIND_OTHER",0x0000,15595,0),
+("MSG_GM_SHOWLABEL",0x0000,15595,0),
+("MSG_GM_SUMMON",0x0000,15595,0),
+("MSG_INSPECT_ARENA_TEAMS",0x2704,15595,0),
+("MSG_LIST_STABLED_PETS",0x0834,15595,0),
+("MSG_MINIMAP_PING",0x6635,15595,0),
+("MSG_MOVE_CHARM_TELEPORT_CHEAT",0x7A08,15595,0),
+("MSG_MOVE_FALL_LAND",0x380A,15595,0),
+("MSG_MOVE_FEATHER_FALL",0x0000,15595,0),
+("MSG_MOVE_GRAVITY_CHNG",0x0000,15595,0),
+("MSG_MOVE_HEARTBEAT",0x3914,15595,0),
+("MSG_MOVE_HOVER",0x0000,15595,0),
+("MSG_MOVE_JUMP",0x7A06,15595,0),
+("MSG_MOVE_SET_ALL_SPEED_CHEAT",0x0000,15595,0),
+("MSG_MOVE_SET_COLLISION_HEIGHT",0x0000,15595,0),
+("MSG_MOVE_SET_FACING",0x7914,15595,0),
+("MSG_MOVE_SET_FLIGHT_SPEED_CHEAT",0x0000,15595,0),
+("MSG_MOVE_SET_PITCH",0x7312,15595,0),
+("MSG_MOVE_SET_RAW_POSITION_ACK",0x0000,15595,0),
+("MSG_MOVE_SET_RUN_BACK_SPEED_CHEAT",0x0000,15595,0),
+("MSG_MOVE_SET_RUN_MODE",0x791A,15595,0),
+("MSG_MOVE_SET_RUN_SPEED_CHEAT",0x0000,15595,0),
+("MSG_MOVE_SET_SWIM_BACK_SPEED_CHEAT",0x0000,15595,0),
+("MSG_MOVE_SET_SWIM_SPEED_CHEAT",0x0000,15595,0),
+("MSG_MOVE_SET_TURN_RATE_CHEAT",0x0000,15595,0),
+("MSG_MOVE_SET_WALK_MODE",0x7002,15595,0),
+("MSG_MOVE_SET_WALK_SPEED_CHEAT",0x0000,15595,0),
+("MSG_MOVE_START_ASCEND",0x390A,15595,0),
+("MSG_MOVE_START_BACKWARD",0x330A,15595,0),
+("MSG_MOVE_START_DESCEND",0x3800,15595,0),
+("MSG_MOVE_START_FORWARD",0x7814,15595,0),
+("MSG_MOVE_START_PITCH_DOWN",0x3908,15595,0),
+("MSG_MOVE_START_PITCH_UP",0x3304,15595,0),
+("MSG_MOVE_START_STRAFE_LEFT",0x3A16,15595,0),
+("MSG_MOVE_START_STRAFE_RIGHT",0x3A02,15595,0),
+("MSG_MOVE_START_SWIM",0x3206,15595,0),
+("MSG_MOVE_START_TURN_LEFT",0x700C,15595,0),
+("MSG_MOVE_START_TURN_RIGHT",0x7000,15595,0),
+("MSG_MOVE_STOP",0x320A,15595,0),
+("MSG_MOVE_STOP_ASCEND",0x7B00,15595,0),
+("MSG_MOVE_STOP_PITCH",0x7216,15595,0),
+("MSG_MOVE_STOP_STRAFE",0x3002,15595,0),
+("MSG_MOVE_STOP_SWIM",0x3802,15595,0),
+("MSG_MOVE_STOP_TURN",0x331E,15595,0),
+("MSG_MOVE_TELEPORT",0x55A0,15595,0),
+("MSG_MOVE_TELEPORT_ACK",0x390C,15595,0),
+("MSG_MOVE_TELEPORT_CHEAT",0x3A10,15595,0),
+("MSG_MOVE_TIME_SKIPPED",0x19B3,15595,0),
+("MSG_MOVE_TOGGLE_COLLISION_CHEAT",0x7B04,15595,0),
+("MSG_MOVE_TOGGLE_FALL_LOGGING",0x0000,15595,0),
+("MSG_MOVE_TOGGLE_LOGGING",0x0000,15595,0),
+("MSG_MOVE_UPDATE_CAN_FLY",0x0000,15595,0),
+("MSG_MOVE_UPDATE_FLIGHT_SPEED",0x30B1,15595,0),
+("MSG_MOVE_UPDATE_MOUSE",0x0000,15595,0),
+("MSG_MOVE_UPDATE_RUN_SPEED",0x14A6,15595,0),
+("MSG_MOVE_UPDATE_TELEPORT",0x50B2,15595,0),
+("MSG_MOVE_WATER_WALK",0x0000,15595,0),
+("MSG_MOVE_WORLDPORT_ACK",0x2411,15595,0),
+("MSG_NOTIFY_PARTY_SQUELCH",0x4D06,15595,0),
+("MSG_PARTY_ASSIGNMENT",0x0424,15595,0),
+("MSG_PETITION_DECLINE",0x4905,15595,0),
+("MSG_PETITION_RENAME",0x4005,15595,0),
+("MSG_PVP_LOG_DATA",0x0000,15595,0),
+("MSG_QUERY_NEXT_MAIL_TIME",0x0F04,15595,0),
+("MSG_QUEST_PUSH_RESULT",0x4515,15595,0),
+("MSG_RAID_READY_CHECK",0x2304,15595,0),
+("MSG_RAID_READY_CHECK_CONFIRM",0x4F05,15595,0),
+("MSG_RAID_READY_CHECK_FINISHED",0x2E15,15595,0),
+("MSG_RAID_TARGET_UPDATE",0x2C36,15595,0),
+("MSG_RANDOM_ROLL",0x0905,15595,0),
+("MSG_SAVE_GUILD_EMBLEM",0x2404,15595,0),
+("MSG_SET_DUNGEON_DIFFICULTY",0x4925,15595,0),
+("MSG_SET_RAID_DIFFICULTY",0x0614,15595,0),
+("MSG_START_MOVE_FORWARD",0x0000,15595,0),
+("MSG_TABARDVENDOR_ACTIVATE",0x6926,15595,0),
+("MSG_TALENT_WIPE_CONFIRM",0x0107,15595,0),
+("MSG_VERIFY_CONNECTIVITY",0x4F57,15595,0),
+("SMSG_ACCOUNT_DATA_TIMES",0x4B05,15595,0),
+("SMSG_ACCOUNT_INFO_RESPONSE",0x10A7,15595,0),
+("SMSG_ACCOUNT_RESTRICTED_WARNING",0x51A7,15595,0),
+("SMSG_ACHIEVEMENT_DELETED",0x6A16,15595,0),
+("SMSG_ACHIEVEMENT_EARNED",0x4405,15595,0),
+("SMSG_ACTION_BUTTONS",0x38B5,15595,0),
+("SMSG_ACTIVATETAXIREPLY",0x6A37,15595,0),
+("SMSG_ADDON_INFO",0x2C14,15595,0),
+("SMSG_ADD_RUNE_POWER",0x6915,15595,0),
+("SMSG_AI_REACTION",0x0637,15595,0),
+("SMSG_ALL_ACHIEVEMENT_DATA",0x58B1,15595,0),
+("SMSG_AREA_SPIRIT_HEALER_TIME",0x0734,15595,0),
+("SMSG_AREA_TRIGGER_MESSAGE",0x4505,15595,0),
+("SMSG_AREA_TRIGGER_MOVEMENT_UPDATE",0x3DB1,15595,0),
+("SMSG_ARENA_ERROR",0x2D17,15595,0),
+("SMSG_ARENA_OPPONENT_UPDATE",0x2637,15595,0),
+("SMSG_ARENA_TEAM_CHANGE_FAILED_QUEUED",0x6E34,15595,0),
+("SMSG_ARENA_TEAM_COMMAND_RESULT",0x39B3,15595,0),
+("SMSG_ARENA_TEAM_EVENT",0x0617,15595,0),
+("SMSG_ARENA_TEAM_INVITE",0x0F36,15595,0),
+("SMSG_ARENA_TEAM_QUERY_RESPONSE",0x6336,15595,0),
+("SMSG_ARENA_TEAM_ROSTER",0x2717,15595,0),
+("SMSG_ARENA_TEAM_STATS",0x4425,15595,0),
+("SMSG_ATTACKERSTATEUPDATE",0x0B25,15595,0),
+("SMSG_ATTACKSTART",0x2D15,15595,0),
+("SMSG_ATTACKSTOP",0x0934,15595,0),
+("SMSG_ATTACKSWING_BADFACING",0x0B36,15595,0),
+("SMSG_ATTACKSWING_CANT_ATTACK",0x0016,15595,0),
+("SMSG_ATTACKSWING_DEADTARGET",0x2B26,15595,0),
+("SMSG_ATTACKSWING_NOTINRANGE",0x6C07,15595,0),
+("SMSG_AUCTION_BIDDER_LIST_RESULT",0x0027,15595,0),
+("SMSG_AUCTION_BIDDER_NOTIFICATION",0x4E27,15595,0),
+("SMSG_AUCTION_COMMAND_RESULT",0x4C25,15595,0),
+("SMSG_AUCTION_LIST_PENDING_SALES",0x6A27,15595,0),
+("SMSG_AUCTION_LIST_RESULT",0x6637,15595,0),
+("SMSG_AUCTION_OWNER_LIST_RESULT",0x6C34,15595,0),
+("SMSG_AUCTION_OWNER_NOTIFICATION",0x4116,15595,0),
+("SMSG_AUCTION_REMOVED_NOTIFICATION",0x2334,15595,0),
+("SMSG_AURACASTLOG",0x0000,15595,0),
+("SMSG_AURA_POINTS_DEPLETED",0x7CB7,15595,0),
+("SMSG_AURA_UPDATE",0x4707,15595,0),
+("SMSG_AURA_UPDATE_ALL",0x6916,15595,0),
+("SMSG_AUTH_CHALLENGE",0x4542,15595,0),
+("SMSG_AUTH_RESPONSE",0x5DB6,15595,0),
+("SMSG_AVAILABLE_VOICE_CHANNEL",0x2E16,15595,0),
+("SMSG_AVERAGE_ITEM_LEVEL_INFORM",0x5DA7,15595,0),
+("SMSG_BARBER_SHOP_RESULT",0x6125,15595,0),
+("SMSG_BATTLEFIELD_LIST",0x71B5,15595,0),
+("SMSG_BATTLEFIELD_MGR_EJECTED",0x7DB7,15595,0),
+("SMSG_BATTLEFIELD_MGR_EJECT_PENDING",0x34A2,15595,0),
+("SMSG_BATTLEFIELD_MGR_ENTERED",0x5CA0,15595,0),
+("SMSG_BATTLEFIELD_MGR_ENTRY_INVITE",0x34B3,15595,0),
+("SMSG_BATTLEFIELD_MGR_EXIT_REQUEST",0x51B1,15595,0),
+("SMSG_BATTLEFIELD_MGR_QUEUE_INVITE",0x15A6,15595,0),
+("SMSG_BATTLEFIELD_MGR_QUEUE_REQUEST_RESPONSE",0x79B6,15595,0),
+("SMSG_BATTLEFIELD_MGR_STATE_CHANGE",0x35B4,15595,0),
+("SMSG_BATTLEFIELD_PLAYER_POSITIONS",0x58B4,15595,0),
+("SMSG_BATTLEFIELD_PORT_DENIED",0x35A3,15595,0),
+("SMSG_BATTLEFIELD_RATED_INFO",0x54A3,15595,0),
+("SMSG_BATTLEFIELD_STATUS",0x7DA1,15595,0),
+("SMSG_BATTLEFIELD_STATUS_QUEUED",0x35A1,15595,0),
+("SMSG_BATTLEFIELD_STATUS_ACTIVE",0x74A4,15595,0),
+("SMSG_BATTLEFIELD_STATUS_NEEDCONFIRMATION",0x59A0,15595,0),
+("SMSG_BATTLEFIELD_STATUS_WAITFORGROUPS",0x75A2,15595,0),
+("SMSG_BATTLEFIELD_STATUS_FAILED",0x71A7,15595,0),
+("SMSG_BATTLEGROUND_INFO_THROTTLED",0x34B2,15595,0),
+("SMSG_BATTLEGROUND_PLAYER_JOINED",0x50B0,15595,0),
+("SMSG_BATTLEGROUND_PLAYER_LEFT",0x59A6,15595,0),
+("SMSG_BINDER_CONFIRM",0x2835,15595,0),
+("SMSG_BINDPOINTUPDATE",0x0527,15595,0),
+("SMSG_BINDZONEREPLY",0x0000,15595,0),
+("SMSG_BREAK_TARGET",0x0105,15595,0),
+("SMSG_BUY_BANK_SLOT_RESULT",0x0000,15595,0),
+("SMSG_BUY_FAILED",0x6435,15595,0),
+("SMSG_BUY_ITEM",0x0F26,15595,0),
+("SMSG_CALENDAR_ACTION_PENDING",0x0000,15595,0),
+("SMSG_CALENDAR_ARENA_TEAM",0x0615,15595,0),
+("SMSG_CALENDAR_CLEAR_PENDING_ACTION",0x2106,15595,0),
+("SMSG_CALENDAR_COMMAND_RESULT",0x6F36,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE",0x4E16,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_ALERT",0x2A05,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_NOTES",0x0E17,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_NOTES_ALERT",0x2535,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED",0x0725,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT",0x2617,15595,0),
+("SMSG_CALENDAR_EVENT_INVITE_STATUS_ALERT",0x6625,15595,0),
+("SMSG_CALENDAR_EVENT_MODERATOR_STATUS_ALERT",0x6B06,15595,0),
+("SMSG_CALENDAR_EVENT_REMOVED_ALERT",0x6D35,15595,0),
+("SMSG_CALENDAR_EVENT_STATUS",0x2A27,15595,0),
+("SMSG_CALENDAR_EVENT_UPDATED_ALERT",0x0907,15595,0),
+("SMSG_CALENDAR_FILTER_GUILD",0x4A26,15595,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_ADDED",0x2305,15595,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_REMOVED",0x2E25,15595,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_UPDATED",0x4636,15595,0),
+("SMSG_CALENDAR_SEND_CALENDAR",0x6805,15595,0),
+("SMSG_CALENDAR_SEND_EVENT",0x0C35,15595,0),
+("SMSG_CALENDAR_SEND_NUM_PENDING",0x0C17,15595,0),
+("SMSG_CALENDAR_UPDATE_INVITE_LIST",0x0000,15595,0),
+("SMSG_CAMERA_SHAKE",0x4214,15595,0),
+("SMSG_CANCEL_AUTO_REPEAT",0x6436,15595,0),
+("SMSG_CANCEL_COMBAT",0x4F04,15595,0),
+("SMSG_CAST_FAILED",0x4D16,15595,0),
+("SMSG_CHANNEL_LIST",0x2214,15595,0),
+("SMSG_CHANNEL_MEMBER_COUNT",0x6414,15595,0),
+("SMSG_CHANNEL_NOTIFY",0x0825,15595,0),
+("SMSG_CHARACTER_LOGIN_FAILED",0x4417,15595,0),
+("SMSG_CHAR_CREATE",0x2D05,15595,0),
+("SMSG_CHAR_CUSTOMIZE",0x4F16,15595,0),
+("SMSG_CHAR_DELETE",0x0304,15595,0),
+("SMSG_CHAR_ENUM",0x10B0,15595,0),
+("SMSG_CHAR_FACTION_CHANGE",0x4C06,15595,0),
+("SMSG_CHAR_RENAME",0x2024,15595,0),
+("SMSG_CHAT_IGNORED_ACCOUNT_MUTED",0x15A4,15595,0),
+("SMSG_CHAT_NOT_IN_PARTY",0x6A14,15595,0),
+("SMSG_CHAT_PLAYER_AMBIGUOUS",0x2F34,15595,0),
+("SMSG_CHAT_PLAYER_NOT_FOUND",0x2526,15595,0),
+("SMSG_CHAT_RESTRICTED",0x6536,15595,0),
+("SMSG_CHAT_SERVER_DISCONNECTED",0x6D34,15595,0),
+("SMSG_CHAT_SERVER_RECONNECTED",0x6905,15595,0),
+("SMSG_CHAT_WRONG_FACTION",0x6724,15595,0),
+("SMSG_CHECK_FOR_BOTS",0x0000,15595,0),
+("SMSG_CLEAR_BOSS_EMOTES",0x19A3,15595,0),
+("SMSG_CLEAR_COOLDOWN",0x0627,15595,0),
+("SMSG_CLEAR_COOLDOWNS",0x59B4,15595,0),
+("SMSG_CLEAR_FAR_SIGHT_IMMEDIATE",0x2A04,15595,0),
+("SMSG_CLEAR_TARGET",0x4B26,15595,0),
+("SMSG_CLIENTCACHE_VERSION",0x2734,15595,0),
+("SMSG_CLIENT_CONTROL_UPDATE",0x2837,15595,0),
+("SMSG_COMBAT_EVENT_FAILED",0x2B07,15595,0),
+("SMSG_COMBAT_LOG_MULTIPLE",0x0000,15595,0),
+("SMSG_COMMENTATOR_MAP_INFO",0x0327,15595,0),
+("SMSG_COMMENTATOR_PARTY_INFO",0x38B0,15595,0),
+("SMSG_COMMENTATOR_PLAYER_INFO",0x2F36,15595,0),
+("SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT1",0x2126,15595,0),
+("SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT2",0x6814,15595,0),
+("SMSG_COMMENTATOR_STATE_CHANGED",0x0737,15595,0),
+("SMSG_COMPLAIN_RESULT",0x6D24,15595,0),
+("SMSG_COMPRESSED_ACHIEVEMENT_DATA",0x0000,15595,0),
+("SMSG_COMPRESSED_CHAR_ENUM",0x0000,15595,0),
+("SMSG_COMPRESSED_GUILD_ROSTER",0x0000,15595,0),
+("SMSG_COMPRESSED_MOVES",0x0517,15595,0),
+("SMSG_COMPRESSED_UPDATE_OBJECT",0x0000,15595,0),
+("SMSG_COMSAT_CONNECT_FAIL",0x6317,15595,0),
+("SMSG_COMSAT_DISCONNECT",0x0316,15595,0),
+("SMSG_COMSAT_RECONNECT_TRY",0x4D35,15595,0),
+("SMSG_CONTACT_LIST",0x6017,15595,0),
+("SMSG_CONVERT_RUNE",0x4F14,15595,0),
+("SMSG_COOLDOWN_CHEAT",0x4537,15595,0),
+("SMSG_COOLDOWN_EVENT",0x4F26,15595,0),
+("SMSG_CORPSE_MAP_POSITION_QUERY_RESPONSE",0x0E35,15595,0),
+("SMSG_CORPSE_NOT_IN_INSTANCE",0x2A14,15595,0),
+("SMSG_CORPSE_RECLAIM_DELAY",0x0D34,15595,0),
+("SMSG_CREATURE_QUERY_RESPONSE",0x6024,15595,0),
+("SMSG_CRITERIA_DELETED",0x2915,15595,0),
+("SMSG_CRITERIA_UPDATE",0x6E37,15595,0),
+("SMSG_CROSSED_INEBRIATION_THRESHOLD",0x2036,15595,0),
+("SMSG_CURRENCY_LOOT_REMOVED",0x1DB4,15595,0),
+("SMSG_CURRENCY_LOOT_RESTORED",0x30A0,15595,0),
+("SMSG_CUSTOM_LOAD_SCREEN",0x1DB6,15595,0),
+("SMSG_DAMAGE_CALC_LOG",0x2436,15595,0),
+("SMSG_DAMAGE_DONE_OBSOLETE",0x0000,15595,0),
+("SMSG_DANCE_QUERY_RESPONSE",0x2F06,15595,0),
+("SMSG_DB_REPLY",0x38A4,15595,0),
+("SMSG_DEATH_RELEASE_LOC",0x2F07,15595,0),
+("SMSG_DEBUG_RUNE_REGEN",0x31B3,15595,0),
+("SMSG_DEFENSE_MESSAGE",0x0314,15595,0),
+("SMSG_DESTROY_OBJECT",0x4724,15595,0),
+("SMSG_DESTRUCTIBLE_BUILDING_DAMAGE",0x4825,15595,0),
+("SMSG_DIFFERENT_INSTANCE_FROM_PARTY",0x15B1,15595,0),
+("SMSG_DISENCHANT_CREDIT",0x55A2,15595,0),
+("SMSG_DISMOUNT",0x2135,15595,0),
+("SMSG_DISMOUNTRESULT",0x0D25,15595,0),
+("SMSG_DISPEL_FAILED",0x0307,15595,0),
+("SMSG_DISPLAY_GAME_ERROR",0x31A6,15595,0),
+("SMSG_DONT_AUTO_PUSH_SPELLS_TO_ACTION_BAR",0x38A2,15595,0),
+("SMSG_DROP_NEW_CONNECTION",0x4D40,15595,0),
+("SMSG_DUEL_COMPLETE",0x2527,15595,0),
+("SMSG_DUEL_COUNTDOWN",0x4836,15595,0),
+("SMSG_DUEL_INBOUNDS",0x0A27,15595,0),
+("SMSG_DUEL_OUTOFBOUNDS",0x0C26,15595,0),
+("SMSG_DUEL_REQUESTED",0x4504,15595,0),
+("SMSG_DUEL_WINNER",0x2D36,15595,0),
+("SMSG_DUMP_RIDE_TICKETS_RESPONSE",0x11A3,15595,0),
+("SMSG_DURABILITY_DAMAGE_DEATH",0x4C27,15595,0),
+("SMSG_ECHO_PARTY_SQUELCH",0x0814,15595,0),
+("SMSG_EMOTE",0x0A34,15595,0),
+("SMSG_ENABLE_BARBER_SHOP",0x2D16,15595,0),
+("SMSG_ENCHANTMENTLOG",0x6035,15595,0),
+("SMSG_ENVIRONMENTALDAMAGELOG",0x6C05,15595,0),
+("SMSG_EQUIPMENT_SET_LIST",0x2E04,15595,0),
+("SMSG_EQUIPMENT_SET_SAVED",0x2216,15595,0),
+("SMSG_EQUIPMENT_SET_USE_RESULT",0x2424,15595,0),
+("SMSG_EXPECTED_SPAM_RECORDS",0x4D36,15595,0),
+("SMSG_EXPLORATION_EXPERIENCE",0x6716,15595,0),
+("SMSG_FAILED_PLAYER_CONDITION",0x19A4,15595,0),
+("SMSG_FEATURE_SYSTEM_STATUS",0x3DB7,15595,0),
+("SMSG_FEIGN_DEATH_RESISTED",0x0D05,15595,0),
+("SMSG_FISH_ESCAPED",0x2205,15595,0),
+("SMSG_FISH_NOT_HOOKED",0x0A17,15595,0),
+("SMSG_FLIGHT_SPLINE_SYNC",0x0924,15595,0),
+("SMSG_FLOOD_DETECTED",0x0542,15595,0),
+("SMSG_FORCEACTIONSHOW",0x0000,15595,0),
+("SMSG_FORCED_DEATH_UPDATE",0x2606,15595,0),
+("SMSG_FORCE_DISPLAY_UPDATE",0x0000,15595,0),
+("SMSG_FORCE_SEND_QUEUED_PACKETS",0x0140,15595,0),
+("SMSG_FORCE_SET_VEHICLE_REC_ID",0x70A1,15595,0),
+("SMSG_FORGE_MASTER_SET",0x70B7,15595,0),
+("SMSG_FRIEND_STATUS",0x0717,15595,0),
+("SMSG_GAMEOBJECT_CUSTOM_ANIM",0x4936,15595,0),
+("SMSG_GAMEOBJECT_DESPAWN_ANIM",0x6735,15595,0),
+("SMSG_GAMEOBJECT_PAGETEXT",0x2925,15595,0),
+("SMSG_GAMEOBJECT_QUERY_RESPONSE",0x0915,15595,0),
+("SMSG_GAMEOBJECT_RESET_STATE",0x2A16,15595,0),
+("SMSG_GAMESPEED_SET",0x4E34,15595,0),
+("SMSG_GAMETIME_SET",0x0014,15595,0),
+("SMSG_GAMETIME_UPDATE",0x4127,15595,0),
+("SMSG_GAME_EVENT_DEBUG_LOG",0x31A7,15595,0),
+("SMSG_GAME_OBJECT_ACTIVATE_ANIM_KIT",0x14A3,15595,0),
+("SMSG_GMRESPONSE_DB_ERROR",0x0006,15595,0),
+("SMSG_GMRESPONSE_RECEIVED",0x2E34,15595,0),
+("SMSG_GMRESPONSE_STATUS_UPDATE",0x0A04,15595,0),
+("SMSG_GMTICKET_CREATE",0x2107,15595,0),
+("SMSG_GMTICKET_DELETETICKET",0x6D17,15595,0),
+("SMSG_GMTICKET_GETTICKET",0x2C15,15595,0),
+("SMSG_GMTICKET_SYSTEMSTATUS",0x0D35,15595,0),
+("SMSG_GMTICKET_UPDATETEXT",0x6535,15595,0),
+("SMSG_GM_MESSAGECHAT",0x6434,15595,0),
+("SMSG_GM_PLAYER_INFO",0x4A15,15595,0),
+("SMSG_GM_TICKET_STATUS_UPDATE",0x2C25,15595,0),
+("SMSG_GODMODE",0x0405,15595,0),
+("SMSG_GOSSIP_COMPLETE",0x0806,15595,0),
+("SMSG_GOSSIP_MESSAGE",0x2035,15595,0),
+("SMSG_GOSSIP_POI",0x4316,15595,0),
+("SMSG_GROUPACTION_THROTTLED",0x6524,15595,0),
+("SMSG_GROUP_CANCEL",0x4D25,15595,0),
+("SMSG_GROUP_DECLINE",0x6835,15595,0),
+("SMSG_GROUP_DESTROYED",0x2207,15595,0),
+("SMSG_GROUP_INVITE",0x31B2,15595,0),
+("SMSG_GROUP_LIST",0x4C24,15595,0),
+("SMSG_GROUP_SET_LEADER",0x0526,15595,0),
+("SMSG_GROUP_SET_ROLE",0x39A6,15595,0),
+("SMSG_GROUP_UNINVITE",0x0A07,15595,0),
+("SMSG_GUILD_ACHIEVEMENT_DATA",0x54B7,15595,0),
+("SMSG_GUILD_ACHIEVEMENT_DELETED",0x35A0,15595,0),
+("SMSG_GUILD_ACHIEVEMENT_EARNED",0x50B5,15595,0),
+("SMSG_GUILD_ACHIEVEMENT_MEMBERS",0x38A5,15595,0),
+("SMSG_GUILD_BANK_LIST",0x78A5,15595,0),
+("SMSG_GUILD_BANK_LOG_QUERY_RESULT",0x30B2,15595,0),
+("SMSG_GUILD_BANK_MONEY_WITHDRAWN",0x5DB4,15595,0),
+("SMSG_GUILD_BANK_QUERY_TEXT_RESULT",0x75A3,15595,0),
+("SMSG_GUILD_CANCEL",0x0000,15595,0),
+("SMSG_GUILD_CHALLENGE_COMPLETED",0x39A3,15595,0),
+("SMSG_GUILD_CHALLENGE_UPDATED",0x18B1,15595,0),
+("SMSG_GUILD_CHANGE_NAME_RESULT",0x3CB1,15595,0),
+("SMSG_GUILD_COMMAND_RESULT",0x7DB3,15595,0),
+("SMSG_GUILD_COMMAND_RESULT_2",0x2707,15595,0),
+("SMSG_GUILD_CRITERIA_DATA",0x14B4,15595,0),
+("SMSG_GUILD_CRITERIA_DELETED",0x55B1,15595,0),
+("SMSG_GUILD_DECLINE",0x2C07,15595,0),
+("SMSG_GUILD_EVENT",0x0705,15595,0),
+("SMSG_GUILD_EVENT_LOG_QUERY_RESULT",0x10B2,15595,0),
+("SMSG_GUILD_FLAGGED_FOR_RENAME",0x30B6,15595,0),
+("SMSG_GUILD_INVITE",0x14A2,15595,0),
+("SMSG_GUILD_INVITE_CANCEL",0x0606,15595,0),
+("SMSG_GUILD_KNOWN_RECIPES",0x0000,15595,0),
+("SMSG_GUILD_MAX_DAILY_XP",0x79B5,15595,0),
+("SMSG_GUILD_MEMBERS_FOR_RECIPE",0x1CB7,15595,0),
+("SMSG_GUILD_MEMBER_DAILY_RESET",0x10A5,15595,0),
+("SMSG_GUILD_MEMBER_RECIPES",0x1CB0,15595,0),
+("SMSG_GUILD_MEMBER_UPDATE_NOTE",0x7CA0,15595,0),
+("SMSG_GUILD_MOVE_COMPLETE",0x11B2,15595,0),
+("SMSG_GUILD_MOVE_STARTING",0x70A4,15595,0),
+("SMSG_GUILD_NEWS_DELETED",0x74A7,15595,0),
+("SMSG_GUILD_NEWS_UPDATE",0x35A7,15595,0),
+("SMSG_GUILD_PARTY_STATE_RESPONSE",0x50A6,15595,0),
+("SMSG_GUILD_PERMISSIONS_QUERY_RESULTS",0x34A3,15595,0),
+("SMSG_GUILD_QUERY_RESPONSE",0x0E06,15595,0),
+("SMSG_GUILD_RANK",0x30B4,15595,0),
+("SMSG_GUILD_RANKS_UPDATE",0x5DA0,15595,0),
+("SMSG_GUILD_RECIPES",0x10B3,15595,0),
+("SMSG_GUILD_RENAMED",0x74A6,15595,0),
+("SMSG_GUILD_REPUTATION_REACTION_CHANGED",0x74B0,15595,0),
+("SMSG_GUILD_REPUTATION_WEEKLY_CAP",0x30B7,15595,0),
+("SMSG_GUILD_RESET",0x1CB5,15595,0),
+("SMSG_GUILD_REWARDS_LIST",0x1DB0,15595,0),
+("SMSG_GUILD_ROSTER",0x3DA3,15595,0),
+("SMSG_GUILD_SET_NOTE",0x0000,15595,0),
+("SMSG_GUILD_TRADESKILL_UPDATE",0x0000,15595,0),
+("SMSG_GUILD_UPDATE_ROSTER",0x18B0,15595,0),
+("SMSG_GUILD_XP",0x3DB0,15595,0),
+("SMSG_GUILD_XP_GAIN",0x14A1,15595,0),
+("SMSG_GUILD_XP_UPDATE",0x0000,15595,0),
+("SMSG_HEALTH_UPDATE",0x4734,15595,0),
+("SMSG_HIGHEST_THREAT_UPDATE",0x4104,15595,0),
+("SMSG_HOTFIX_INFO",0x19B5,15595,0),
+("SMSG_HOTFIX_NOTIFY",0x55A7,15595,0),
+("SMSG_INITIALIZE_FACTIONS",0x4634,15595,0),
+("SMSG_INITIAL_SPELLS",0x0104,15595,0),
+("SMSG_INIT_CURRENCY",0x15A5,15595,0),
+("SMSG_INIT_WORLD_STATES",0x4C15,15595,0),
+("SMSG_INSPECT",0x0000,15595,0),
+("SMSG_INSPECT_HONOR_STATS",0x79A5,15595,0),
+("SMSG_INSPECT_RATED_BG_STATS",0x19A5,15595,0),
+("SMSG_INSPECT_RESULTS_UPDATE",0x0C14,15595,0),
+("SMSG_INSPECT_TALENT",0x4014,15595,0),
+("SMSG_INSTANCE_DIFFICULTY",0x0000,15595,0),
+("SMSG_INSTANCE_LOCK_WARNING_QUERY",0x4F17,15595,0),
+("SMSG_INSTANCE_RESET",0x6F05,15595,0),
+("SMSG_INSTANCE_RESET_FAILED",0x4725,15595,0),
+("SMSG_INSTANCE_SAVE_CREATED",0x0124,15595,0),
+("SMSG_INVALIDATE_DANCE",0x0E27,15595,0),
+("SMSG_INVALIDATE_PLAYER",0x6325,15595,0),
+("SMSG_INVALID_PROMOTION_CODE",0x6F25,15595,0),
+("SMSG_INVENTORY_CHANGE_FAILURE",0x2236,15595,0),
+("SMSG_ITEM_ADD_PASSIVE",0x7CB4,15595,0),
+("SMSG_ITEM_COOLDOWN",0x4D14,15595,0),
+("SMSG_ITEM_ENCHANT_TIME_UPDATE",0x0F27,15595,0),
+("SMSG_ITEM_EXPIRE_PURCHASE_REFUND",0x1CA0,15595,0),
+("SMSG_ITEM_PUSH_RESULT",0x0E15,15595,0),
+("SMSG_ITEM_REFUND_INFO_RESPONSE",0x15A3,15595,0),
+("SMSG_ITEM_REFUND_RESULT",0x5DB1,15595,0),
+("SMSG_ITEM_REMOVE_PASSIVE",0x39A1,15595,0),
+("SMSG_ITEM_SEND_PASSIVE",0x70B1,15595,0),
+("SMSG_ITEM_TEXT_QUERY_RESPONSE",0x2725,15595,0),
+("SMSG_ITEM_TIME_UPDATE",0x2407,15595,0),
+("SMSG_JOINED_BATTLEGROUND_QUEUE",0x0000,15595,0),
+("SMSG_KICK_REASON",0x0000,15595,0),
+("SMSG_LEARNED_DANCE_MOVES",0x0E05,15595,0),
+("SMSG_LEARNED_SPELL",0x58A2,15595,0),
+("SMSG_LEVELUP_INFO",0x0435,15595,0),
+("SMSG_LFG_BOOT_PROPOSAL_UPDATE",0x0F05,15595,0),
+("SMSG_LFG_DISABLED",0x0815,15595,0),
+("SMSG_LFG_JOIN_RESULT",0x38B6,15595,0),
+("SMSG_LFG_OFFER_CONTINUE",0x6B27,15595,0),
+("SMSG_LFG_OPEN_FROM_GOSSIP",0x0000,15595,0),
+("SMSG_LFG_PARTY_INFO",0x2325,15595,0),
+("SMSG_LFG_PLAYER_INFO",0x4B36,15595,0),
+("SMSG_LFG_PLAYER_REWARD",0x6834,15595,0),
+("SMSG_LFG_PROPOSAL_UPDATE",0x7DA6,15595,0),
+("SMSG_LFG_QUEUE_STATUS",0x78B4,15595,0),
+("SMSG_LFG_ROLE_CHECK_UPDATE",0x0336,15595,0),
+("SMSG_LFG_ROLE_CHOSEN",0x6A26,15595,0),
+("SMSG_LFG_SLOT_INVALID",0x54B5,15595,0),
+("SMSG_LFG_TELEPORT_DENIED",0x0E14,15595,0),
+("SMSG_LFG_UPDATE_LIST",0x0000,15595,0),
+("SMSG_LFG_UPDATE_PARTY",0x0000,15595,0),
+("SMSG_LFG_UPDATE_PLAYER",0x0000,15595,0),
+("SMSG_LFG_UPDATE_SEARCH",0x54A1,15595,0),
+("SMSG_LFG_UPDATE_STATUS",0x31A4,15595,0),
+("SMSG_LFG_UPDATE_STATUS_NONE",0x7CA1,15595,0),
+("SMSG_LF_GUILD_APPLICANT_LIST_UPDATED",0x10A4,15595,0),
+("SMSG_LF_GUILD_APPLICATIONS_LIST_CHANGED",0x71A5,15595,0),
+("SMSG_LF_GUILD_BROWSE_UPDATED",0x1DA3,15595,0),
+("SMSG_LF_GUILD_COMMAND_RESULT",0x54A6,15595,0),
+("SMSG_LF_GUILD_MEMBERSHIP_LIST_UPDATED",0x1CA5,15595,0),
+("SMSG_LF_GUILD_POST_UPDATED",0x35B7,15595,0),
+("SMSG_LF_GUILD_RECRUIT_LIST_UPDATED",0x1CB2,15595,0),
+("SMSG_LIST_INVENTORY",0x7CB0,15595,0),
+("SMSG_LOAD_CUF_PROFILES",0x50B1,15595,0),
+("SMSG_LOGIN_SETTIMESPEED",0x4D15,15595,0),
+("SMSG_LOGIN_VERIFY_WORLD",0x2005,15595,0),
+("SMSG_LOGOUT_CANCEL_ACK",0x6514,15595,0),
+("SMSG_LOGOUT_COMPLETE",0x2137,15595,0),
+("SMSG_LOGOUT_RESPONSE",0x0524,15595,0),
+("SMSG_LOG_XPGAIN",0x4514,15595,0),
+("SMSG_LOOT_ALL_PASSED",0x6237,15595,0),
+("SMSG_LOOT_CLEAR_MONEY",0x2B37,15595,0),
+("SMSG_LOOT_CONTENTS",0x11B1,15595,0),
+("SMSG_LOOT_ITEM_NOTIFY",0x6D15,15595,0),
+("SMSG_LOOT_LIST",0x6807,15595,0),
+("SMSG_LOOT_MASTER_LIST",0x0325,15595,0),
+("SMSG_LOOT_MONEY_NOTIFY",0x2836,15595,0),
+("SMSG_LOOT_RELEASE_RESPONSE",0x6D25,15595,0),
+("SMSG_LOOT_REMOVED",0x6817,15595,0),
+("SMSG_LOOT_RESPONSE",0x4C16,15595,0),
+("SMSG_LOOT_ROLL",0x6507,15595,0),
+("SMSG_LOOT_ROLL_WON",0x6617,15595,0),
+("SMSG_LOOT_SLOT_CHANGED",0x2935,15595,0),
+("SMSG_LOOT_START_ROLL",0x2227,15595,0),
+("SMSG_MAIL_LIST_RESULT",0x4217,15595,0),
+("SMSG_MAP_OBJ_EVENTS",0x54B2,15595,0),
+("SMSG_MEETINGSTONE_COMPLETE",0x2524,15595,0),
+("SMSG_MEETINGSTONE_IN_PROGRESS",0x2D35,15595,0),
+("SMSG_MEETINGSTONE_MEMBER_ADDED",0x0000,15595,0),
+("SMSG_MEETINGSTONE_SETQUEUE",0x0000,15595,0),
+("SMSG_MESSAGECHAT",0x2026,15595,0),
+("SMSG_MESSAGE_BOX",0x30A1,15595,0),
+("SMSG_MINIGAME_SETUP",0x6727,15595,0),
+("SMSG_MINIGAME_STATE",0x2E17,15595,0),
+("SMSG_MIRRORIMAGE_DATA",0x2634,15595,0),
+("SMSG_MISSILE_CANCEL",0x3DB4,15595,0),
+("SMSG_MODIFY_COOLDOWN",0x6016,15595,0),
+("SMSG_MONEY_NOTIFY",0x55B6,15595,0),
+("SMSG_MONSTER_MOVE",0x6E17,15595,0),
+("SMSG_MONSTER_MOVE_TRANSPORT",0x2004,15595,0),
+("SMSG_MOTD",0x0A35,15595,0),
+("SMSG_MOUNTRESULT",0x2225,15595,0),
+("SMSG_MOUNTSPECIAL_ANIM",0x0217,15595,0),
+("SMSG_MOVE_COLLISION_DISABLE",0x31B0,15595,0),
+("SMSG_MOVE_COLLISION_ENABLE",0x11A7,15595,0),
+("SMSG_MOVE_DISABLE_COLLISION",0x0000,15595,0),
+("SMSG_MOVE_DISABLE_GRAVITY",0x0000,15595,0),
+("SMSG_MOVE_ENABLE_COLLISION",0x0000,15595,0),
+("SMSG_MOVE_ENABLE_GRAVITY",0x0000,15595,0),
+("SMSG_MOVE_FEATHER_FALL",0x79B0,15595,0),
+("SMSG_MOVE_GRAVITY_DISABLE",0x75B2,15595,0),
+("SMSG_MOVE_GRAVITY_ENABLE",0x30B3,15595,0),
+("SMSG_MOVE_KNOCK_BACK",0x5CB4,15595,0),
+("SMSG_MOVE_LAND_WALK",0x34B7,15595,0),
+("SMSG_MOVE_NORMAL_FALL",0x51B6,15595,0),
+("SMSG_MOVE_ROOT",0x7DA0,15595,0),
+("SMSG_MOVE_SET_ACTIVE_MOVER",0x11B3,15595,0),
+("SMSG_MOVE_SET_CAN_FLY",0x3DA1,15595,0),
+("SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x59A2,15595,0),
+("SMSG_MOVE_SET_COLLISION_HEIGHT",0x11B0,15595,0),
+("SMSG_MOVE_SET_COMPOUND_STATE",0x75A0,15595,0),
+("SMSG_MOVE_SET_FLIGHT_BACK_SPEED",0x30A2,15595,0),
+("SMSG_MOVE_SET_FLIGHT_SPEED",0x71A6,15595,0),
+("SMSG_MOVE_SET_HOVER",0x5CB3,15595,0),
+("SMSG_MOVE_SET_PITCH_RATE",0x75B0,15595,0),
+("SMSG_MOVE_SET_RUN_BACK_SPEED",0x71B1,15595,0),
+("SMSG_MOVE_SET_RUN_SPEED",0x3DB5,15595,0),
+("SMSG_MOVE_SET_SWIM_BACK_SPEED",0x5CA6,15595,0),
+("SMSG_MOVE_SET_SWIM_SPEED",0x15A7,15595,0),
+("SMSG_MOVE_SET_TURN_RATE",0x30A5,15595,0),
+("SMSG_MOVE_SET_VEHICLE_REC_ID",0x0000,15595,0),
+("SMSG_MOVE_SET_WALK_IN_AIR",0x0000,15595,0),
+("SMSG_MOVE_SET_WALK_SPEED",0x1DA4,15595,0),
+("SMSG_MOVE_UNROOT",0x7DB4,15595,0),
+("SMSG_MOVE_UNSET_CAN_FLY",0x15A2,15595,0),
+("SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x7DB2,15595,0),
+("SMSG_MOVE_UNSET_HOVER",0x51B3,15595,0),
+("SMSG_MOVE_UNSET_WALK_IN_AIR",0x0000,15595,0),
+("SMSG_MOVE_UPDATE_COLLISION_HEIGHT",0x59A3,15595,0),
+("SMSG_MOVE_UPDATE_FLIGHT_BACK_SPEED",0x74A0,15595,0),
+("SMSG_MOVE_UPDATE_KNOCK_BACK",0x3DB2,15595,0),
+("SMSG_MOVE_UPDATE_PITCH_RATE",0x1DB5,15595,0),
+("SMSG_MOVE_UPDATE_RUN_BACK_SPEED",0x3DA6,15595,0),
+("SMSG_MOVE_UPDATE_SWIM_BACK_SPEED",0x30B5,15595,0),
+("SMSG_MOVE_UPDATE_SWIM_SPEED",0x59B5,15595,0),
+("SMSG_MOVE_UPDATE_TELEPORT",0x0000,15595,0),
+("SMSG_MOVE_UPDATE_TURN_RATE",0x5DA1,15595,0),
+("SMSG_MOVE_UPDATE_WALK_SPEED",0x54A2,15595,0),
+("SMSG_MOVE_WATER_WALK",0x75B1,15595,0),
+("SMSG_MULTIPLE_PACKETS",0x6736,15595,0),
+("SMSG_NAME_QUERY_RESPONSE",0x6E04,15595,0),
+("SMSG_NEW_TAXI_PATH",0x4B35,15595,0),
+("SMSG_NEW_WORLD",0x79B1,15595,0),
+("SMSG_NEW_WORLD_ABORT",0x14B7,15595,0),
+("SMSG_NOTIFICATION",0x14A0,15595,0),
+("SMSG_NOTIFY_DANCE",0x4904,15595,0),
+("SMSG_NOTIFY_DEST_LOC_SPELL_CAST",0x6204,15595,0),
+("SMSG_NPC_TEXT_UPDATE",0x4436,15595,0),
+("SMSG_NPC_WONT_TALK",0x0000,15595,0),
+("SMSG_OFFER_PETITION_ERROR",0x2716,15595,0),
+("SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA",0x4D34,15595,0),
+("SMSG_OPEN_CONTAINER",0x4714,15595,0),
+("SMSG_OPEN_LFG_DUNGEON_FINDER",0x2C37,15595,0),
+("SMSG_OVERRIDE_LIGHT",0x4225,15595,0),
+("SMSG_PAGE_TEXT_QUERY_RESPONSE",0x2B14,15595,0),
+("SMSG_PARTYKILLLOG",0x4937,15595,0),
+("SMSG_PARTY_COMMAND_RESULT",0x6E07,15595,0),
+("SMSG_PARTY_MEMBER_STATS",0x2104,15595,0),
+("SMSG_PARTY_MEMBER_STATS_FULL",0x0215,15595,0),
+("SMSG_PAUSE_MIRROR_TIMER",0x4015,15595,0),
+("SMSG_PERIODICAURALOG",0x0416,15595,0),
+("SMSG_PETGODMODE",0x2E36,15595,0),
+("SMSG_PETITION_ALREADY_SIGNED",0x5DA3,15595,0),
+("SMSG_PETITION_QUERY_RESPONSE",0x4B37,15595,0),
+("SMSG_PETITION_SHOWLIST",0x6405,15595,0),
+("SMSG_PETITION_SHOW_SIGNATURES",0x0716,15595,0),
+("SMSG_PETITION_SIGN_RESULTS",0x6217,15595,0),
+("SMSG_PET_ACTION_FEEDBACK",0x0807,15595,0),
+("SMSG_PET_ACTION_SOUND",0x4324,15595,0),
+("SMSG_PET_ADDED",0x3CA5,15595,0),
+("SMSG_PET_BROKEN",0x2E27,15595,0),
+("SMSG_PET_CAST_FAILED",0x2B15,15595,0),
+("SMSG_PET_DISMISS_SOUND",0x2B05,15595,0),
+("SMSG_PET_GUIDS",0x2D26,15595,0),
+("SMSG_PET_LEARNED_SPELL",0x0507,15595,0),
+("SMSG_PET_MODE",0x2235,15595,0),
+("SMSG_PET_NAME_INVALID",0x6007,15595,0),
+("SMSG_PET_NAME_QUERY_RESPONSE",0x4C37,15595,0),
+("SMSG_PET_REMOVED_SPELL",0x6A04,15595,0),
+("SMSG_PET_RENAMEABLE",0x2B27,15595,0),
+("SMSG_PET_SLOT_UPDATED",0x51A3,15595,0),
+("SMSG_PET_SPELLS",0x4114,15595,0),
+("SMSG_PET_TAME_FAILURE",0x6B24,15595,0),
+("SMSG_PET_UPDATE_COMBO_POINTS",0x4325,15595,0),
+("SMSG_PLAYED_TIME",0x6037,15595,0),
+("SMSG_PLAYERBINDERROR",0x6A24,15595,0),
+("SMSG_PLAYERBOUND",0x2516,15595,0),
+("SMSG_PLAYER_DIFFICULTY_CHANGE",0x2217,15595,0),
+("SMSG_PLAYER_MOVE",0x79A2,15595,0),
+("SMSG_PLAYER_SKINNED",0x0116,15595,0),
+("SMSG_PLAYER_UNK_DEAD_ALIVE",0x0000,15595,0),
+("SMSG_PLAYER_VEHICLE_DATA",0x4115,15595,0),
+("SMSG_PLAY_DANCE",0x4704,15595,0),
+("SMSG_PLAY_MUSIC",0x4B06,15595,0),
+("SMSG_PLAY_OBJECT_SOUND",0x2635,15595,0),
+("SMSG_PLAY_ONE_SHOT_ANIM_KIT",0x4A35,15595,0),
+("SMSG_PLAY_SOUND",0x2134,15595,0),
+("SMSG_PLAY_SPELL_VISUAL",0x10B1,15595,0),
+("SMSG_PLAY_SPELL_VISUAL_KIT",0x55A5,15595,0),
+("SMSG_PLAY_TIME_WARNING",0x4814,15595,0),
+("SMSG_PONG",0x4D42,15595,0),
+("SMSG_POWER_UPDATE",0x4A07,15595,0),
+("SMSG_PRE_RESURRECT",0x6C36,15595,0),
+("SMSG_PROCRESIST",0x0426,15595,0),
+("SMSG_PROPOSE_LEVEL_GRANT",0x6114,15595,0),
+("SMSG_PUREMOUNT_CANCELLED_OBSOLETE",0x0000,15595,0),
+("SMSG_PVP_CREDIT",0x6015,15595,0),
+("SMSG_PVP_LOG_DATA",0x5CB2,15595,0),
+("SMSG_PVP_OPTIONS_ENABLED",0x50A1,15595,0),
+("SMSG_QUERY_QUESTS_COMPLETED_RESPONSE",0x6314,15595,0),
+("SMSG_QUERY_TIME_RESPONSE",0x2124,15595,0),
+("SMSG_QUESTGIVER_OFFER_REWARD",0x2427,15595,0),
+("SMSG_QUESTGIVER_QUEST_COMPLETE",0x55A4,15595,0),
+("SMSG_QUESTGIVER_QUEST_DETAILS",0x2425,15595,0),
+("SMSG_QUESTGIVER_QUEST_FAILED",0x4236,15595,0),
+("SMSG_QUESTGIVER_QUEST_INVALID",0x4016,15595,0),
+("SMSG_QUESTGIVER_QUEST_LIST",0x0134,15595,0),
+("SMSG_QUESTGIVER_REQUEST_ITEMS",0x6236,15595,0),
+("SMSG_QUESTGIVER_STATUS",0x2115,15595,0),
+("SMSG_QUESTGIVER_STATUS_MULTIPLE",0x4F25,15595,0),
+("SMSG_QUESTLOG_FULL",0x0E36,15595,0),
+("SMSG_QUESTUPDATE_ADD_ITEM",0x0000,15595,0),
+("SMSG_QUESTUPDATE_ADD_KILL",0x0D27,15595,0),
+("SMSG_QUESTUPDATE_ADD_PVP_KILL",0x4416,15595,0),
+("SMSG_QUESTUPDATE_COMPLETE",0x2937,15595,0),
+("SMSG_QUESTUPDATE_FAILED",0x6324,15595,0),
+("SMSG_QUESTUPDATE_FAILEDTIMER",0x6427,15595,0),
+("SMSG_QUEST_NPC_QUERY_RESPONSE",0x75A1,15595,0),
+("SMSG_QUEST_CONFIRM_ACCEPT",0x6F07,15595,0),
+("SMSG_QUEST_FORCE_REMOVE",0x6605,15595,0),
+("SMSG_QUEST_POI_QUERY_RESPONSE",0x6304,15595,0),
+("SMSG_QUEST_QUERY_RESPONSE",0x6936,15595,0),
+("SMSG_RAID_GROUP_ONLY",0x0837,15595,0),
+("SMSG_RAID_INSTANCE_INFO",0x6626,15595,0),
+("SMSG_RAID_INSTANCE_MESSAGE",0x6E15,15595,0),
+("SMSG_RAID_MARKERS_CHANGED",0x10A1,15595,0),
+("SMSG_RAID_READY_CHECK_THROTTLED_ERROR",0x2607,15595,0),
+("SMSG_RAID_SUMMON_FAILED",0x18B6,15595,0),
+("SMSG_RANDOMIZE_CHAR_NAME",0x38B1,15595,0),
+("SMSG_RATED_BG_RATING",0x15A1,15595,0),
+("SMSG_RATED_BG_STATS",0x34A1,15595,0),
+("SMSG_READ_ITEM_FAILED",0x0F16,15595,0),
+("SMSG_READ_ITEM_OK",0x2605,15595,0),
+("SMSG_REALM_SPLIT",0x2714,15595,0),
+("SMSG_REAL_GROUP_UPDATE",0x0F34,15595,0),
+("SMSG_RECEIVED_MAIL",0x2924,15595,0),
+("SMSG_REDIRECT_CLIENT",0x0942,15595,0),
+("SMSG_REFER_A_FRIEND_EXPIRED",0x4934,15595,0),
+("SMSG_REFER_A_FRIEND_FAILURE",0x2037,15595,0),
+("SMSG_REFORGE_RESULT",0x58A4,15595,0),
+("SMSG_REMOVED_SPELL",0x4804,15595,0),
+("SMSG_REPORT_PVP_AFK_RESULT",0x2D06,15595,0),
+("SMSG_REQUEST_CEMETERY_LIST_RESPONSE",0x30A7,15595,0),
+("SMSG_REQUEST_PVP_REWARDS_RESPONSE",0x5DA4,15595,0),
+("SMSG_RESEARCH_COMPLETE",0x35A6,15595,0),
+("SMSG_RESEARCH_SETUP_HISTORY",0x10B6,15595,0),
+("SMSG_RESET_COMPRESSION_CONTEXT",0x0142,15595,0),
+("SMSG_RESET_FAILED_NOTIFY",0x4616,15595,0),
+("SMSG_RESISTLOG",0x0000,15595,0),
+("SMSG_RESPOND_INSPECT_ACHIEVEMENTS",0x15B0,15595,0),
+("SMSG_RESURRECT_REQUEST",0x2905,15595,0),
+("SMSG_RESYNC_RUNES",0x6224,15595,0),
+("SMSG_ROLE_POLL_BEGIN",0x70B0,15595,0),
+("SMSG_RWHOIS",0x2437,15595,0),
+("SMSG_SELL_ITEM",0x6105,15595,0),
+("SMSG_SEND_MAIL_RESULT",0x4927,15595,0),
+("SMSG_SEND_UNLEARN_SPELLS",0x4E25,15595,0),
+("SMSG_SERVERTIME",0x6327,15595,0),
+("SMSG_SERVER_FIRST_ACHIEVEMENT",0x6424,15595,0),
+("SMSG_SERVER_INFO_RESPONSE",0x74B5,15595,0),
+("SMSG_SERVER_MESSAGE",0x6C04,15595,0),
+("SMSG_SERVER_PERF",0x74B6,15595,0),
+("SMSG_SET_AI_ANIM_KIT",0x0000,15595,0),
+("SMSG_SET_DF_FAST_LAUNCH_RESULT",0x35B6,15595,0),
+("SMSG_SET_FACTION_ATWAR",0x4216,15595,0),
+("SMSG_SET_FACTION_STANDING",0x0126,15595,0),
+("SMSG_SET_FACTION_VISIBLE",0x2525,15595,0),
+("SMSG_SET_FLAT_SPELL_MODIFIER",0x2834,15595,0),
+("SMSG_SET_FORCED_REACTIONS",0x4615,15595,0),
+("SMSG_SET_MELEE_ANIM_KIT",0x0000,15595,0),
+("SMSG_SET_MOVEMENT_ANIM_KIT",0x0000,15595,0),
+("SMSG_SET_PCT_SPELL_MODIFIER",0x0224,15595,0),
+("SMSG_SET_PHASE_SHIFT",0x70A0,15595,0),
+("SMSG_SET_PLAYER_DECLINED_NAMES_RESULT",0x2B25,15595,0),
+("SMSG_SET_PLAY_HOVER_ANIM",0x30A6,15595,0),
+("SMSG_SET_PROFICIENCY",0x6207,15595,0),
+("SMSG_SET_PROJECTILE_POSITION",0x2616,15595,0),
+("SMSG_SHOWTAXINODES",0x2A36,15595,0),
+("SMSG_SHOW_BANK",0x2627,15595,0),
+("SMSG_SHOW_RATINGS",0x11B4,15595,0),
+("SMSG_SOR_START_EXPERIENCE_INCOMPLETE",0x7CA7,15595,0),
+("SMSG_SPELLBREAKLOG",0x6B17,15595,0),
+("SMSG_SPELLDAMAGESHIELD",0x2927,15595,0),
+("SMSG_SPELLDISPELLOG",0x4516,15595,0),
+("SMSG_SPELLENERGIZELOG",0x0414,15595,0),
+("SMSG_SPELLHEALLOG",0x2816,15595,0),
+("SMSG_SPELLINSTAKILLLOG",0x6216,15595,0),
+("SMSG_SPELLINTERRUPTLOG",0x1DA7,15595,0),
+("SMSG_SPELLLOGEXECUTE",0x0626,15595,0),
+("SMSG_SPELLLOGMISS",0x0625,15595,0),
+("SMSG_SPELLNONMELEEDAMAGELOG",0x4315,15595,0),
+("SMSG_SPELLORDAMAGE_IMMUNE",0x4507,15595,0),
+("SMSG_SPELLSTEALLOG",0x4E26,15595,0),
+("SMSG_SPELL_CATEGORY_COOLDOWN",0x71B6,15595,0),
+("SMSG_SPELL_COOLDOWN",0x4B16,15595,0),
+("SMSG_SPELL_DELAYED",0x0715,15595,0),
+("SMSG_SPELL_FAILED_OTHER",0x0C34,15595,0),
+("SMSG_SPELL_FAILURE",0x4535,15595,0),
+("SMSG_SPELL_GO",0x6E16,15595,0),
+("SMSG_SPELL_START",0x6415,15595,0),
+("SMSG_SPELL_UPDATE_CHAIN_TARGETS",0x6006,15595,0),
+("SMSG_SPIRIT_HEALER_CONFIRM",0x4917,15595,0),
+("SMSG_SPLINE_MOVE_COLLISION_DISABLE",0x35B1,15595,0),
+("SMSG_SPLINE_MOVE_COLLISION_ENABLE",0x3CB0,15595,0),
+("SMSG_SPLINE_MOVE_GRAVITY_DISABLE",0x5DB5,15595,0),
+("SMSG_SPLINE_MOVE_GRAVITY_ENABLE",0x3CA6,15595,0),
+("SMSG_SPLINE_MOVE_ROOT",0x51B4,15595,0),
+("SMSG_SPLINE_MOVE_SET_FEATHER_FALL",0x3DA5,15595,0),
+("SMSG_SPLINE_MOVE_SET_FLIGHT_BACK_SPEED",0x38B3,15595,0),
+("SMSG_SPLINE_MOVE_SET_FLIGHT_SPEED",0x39A0,15595,0),
+("SMSG_SPLINE_MOVE_SET_FLYING",0x31B5,15595,0),
+("SMSG_SPLINE_MOVE_SET_HOVER",0x14B6,15595,0),
+("SMSG_SPLINE_MOVE_SET_LAND_WALK",0x3DA7,15595,0),
+("SMSG_SPLINE_MOVE_SET_NORMAL_FALL",0x38B2,15595,0),
+("SMSG_SPLINE_MOVE_SET_PITCH_RATE",0x14B0,15595,0),
+("SMSG_SPLINE_MOVE_SET_RUN_BACK_SPEED",0x3DB3,15595,0),
+("SMSG_SPLINE_MOVE_SET_RUN_MODE",0x75A7,15595,0),
+("SMSG_SPLINE_MOVE_SET_RUN_SPEED",0x51B7,15595,0),
+("SMSG_SPLINE_MOVE_SET_SWIM_BACK_SPEED",0x59A1,15595,0),
+("SMSG_SPLINE_MOVE_SET_SWIM_SPEED",0x39A4,15595,0),
+("SMSG_SPLINE_MOVE_SET_TURN_RATE",0x78B5,15595,0),
+("SMSG_SPLINE_MOVE_SET_WALK_MODE",0x54B6,15595,0),
+("SMSG_SPLINE_MOVE_SET_WALK_SPEED",0x34A5,15595,0),
+("SMSG_SPLINE_MOVE_SET_WATER_WALK",0x0000,15595,0),
+("SMSG_SPLINE_MOVE_START_SWIM",0x31A5,15595,0),
+("SMSG_SPLINE_MOVE_STOP_SWIM",0x1DA2,15595,0),
+("SMSG_SPLINE_MOVE_UNROOT",0x75B6,15595,0),
+("SMSG_SPLINE_MOVE_UNSET_FLYING",0x58A6,15595,0),
+("SMSG_SPLINE_MOVE_UNSET_HOVER",0x7DA5,15595,0),
+("SMSG_SPLINE_MOVE_WATER_WALK",0x50A2,15595,0),
+("SMSG_STABLE_RESULT",0x2204,15595,0),
+("SMSG_STANDSTATE_UPDATE",0x6F04,15595,0),
+("SMSG_START_MIRROR_TIMER",0x6824,15595,0),
+("SMSG_START_TIMER",0x59A5,15595,0),
+("SMSG_STOP_DANCE",0x4637,15595,0),
+("SMSG_STOP_MIRROR_TIMER",0x0B06,15595,0),
+("SMSG_STREAMING_MOVIE",0x15B7,15595,0),
+("SMSG_SUMMON_CANCEL",0x0B34,15595,0),
+("SMSG_SUMMON_REQUEST",0x2A07,15595,0),
+("SMSG_SUPERCEDED_SPELL",0x35B0,15595,0),
+("SMSG_SUPPRESS_NPC_GREETINGS",0x74B1,15595,0),
+("SMSG_SUSPEND_COMMS",0x4140,15595,0),
+("SMSG_SUSPEND_TOKEN_RESPONSE",0x14B1,15595,0),
+("SMSG_TALENTS_ERROR",0x0916,15595,0),
+("SMSG_TALENTS_INFO",0x6F26,15595,0),
+("SMSG_TALENTS_INVOLUNTARILY_RESET",0x2C27,15595,0),
+("SMSG_TAXINODE_STATUS",0x2936,15595,0),
+("SMSG_TEST_DROP_RATE_RESULT",0x6816,15595,0),
+("SMSG_TEXT_EMOTE",0x0B05,15595,0),
+("SMSG_THREAT_CLEAR",0x6437,15595,0),
+("SMSG_THREAT_REMOVE",0x2E05,15595,0),
+("SMSG_THREAT_UPDATE",0x4735,15595,0),
+("SMSG_TIME_ADJUSTMENT",0x79B7,15595,0),
+("SMSG_TIME_SYNC_REQ",0x3CA4,15595,0),
+("SMSG_TITLE_EARNED",0x2426,15595,0),
+("SMSG_TOGGLE_XP_GAIN",0x6704,15595,0),
+("SMSG_TOTEM_CREATED",0x2414,15595,0),
+("SMSG_TRADE_STATUS",0x5CA3,15595,0),
+("SMSG_TRADE_STATUS_EXTENDED",0x70A2,15595,0),
+("SMSG_TRAINER_BUY_FAILED",0x0004,15595,0),
+("SMSG_TRAINER_BUY_SUCCEEDED",0x6A05,15595,0),
+("SMSG_TRAINER_LIST",0x4414,15595,0),
+("SMSG_TRANSFER_ABORTED",0x0537,15595,0),
+("SMSG_TRANSFER_PENDING",0x18A6,15595,0),
+("SMSG_TRIGGER_CINEMATIC",0x6C27,15595,0),
+("SMSG_TRIGGER_MOVIE",0x4625,15595,0),
+("SMSG_TURN_IN_PETITION_RESULTS",0x0F07,15595,0),
+("SMSG_TUTORIAL_FLAGS",0x0B35,15595,0),
+("SMSG_UNIT_HEALTH_FREQUENT",0x2C26,15595,0),
+("SMSG_UNIT_SPELLCAST_START",0x2517,15595,0),
+("SMSG_UPDATE_ACCOUNT_DATA",0x6837,15595,0),
+("SMSG_UPDATE_ACCOUNT_DATA_COMPLETE",0x2015,15595,0),
+("SMSG_UPDATE_COMBO_POINTS",0x6B34,15595,0),
+("SMSG_UPDATE_CURRENCY",0x59B0,15595,0),
+("SMSG_UPDATE_CURRENCY_WEEK_LIMIT",0x70A7,15595,0),
+("SMSG_UPDATE_DUNGEON_ENCOUNTER_FOR_LOOT",0x3CB5,15595,0),
+("SMSG_UPDATE_INSTANCE_ENCOUNTER_UNIT",0x4007,15595,0),
+("SMSG_UPDATE_INSTANCE_OWNERSHIP",0x4915,15595,0),
+("SMSG_UPDATE_ITEM_ENCHANTMENTS",0x6014,15595,0),
+("SMSG_UPDATE_LAST_INSTANCE",0x0437,15595,0),
+("SMSG_UPDATE_OBJECT",0x4715,15595,0),
+("SMSG_UPDATE_SERVER_PLAYER_POSITION",0x74A3,15595,0),
+("SMSG_UPDATE_WORLD_STATE",0x4816,15595,0),
+("SMSG_USERLIST_ADD",0x0F37,15595,0),
+("SMSG_USERLIST_REMOVE",0x2006,15595,0),
+("SMSG_USERLIST_UPDATE",0x0135,15595,0),
+("SMSG_VOICESESSION_FULL",0x6225,15595,0),
+("SMSG_VOICE_CHAT_STATUS",0x0F15,15595,0),
+("SMSG_VOICE_PARENTAL_CONTROLS",0x0534,15595,0),
+("SMSG_VOICE_SESSION_LEAVE",0x2A24,15595,0),
+("SMSG_VOICE_SESSION_ROSTER_UPDATE",0x2A17,15595,0),
+("SMSG_VOICE_SET_TALKER_MUTED",0x6E35,15595,0),
+("SMSG_VOID_ITEM_SWAP_RESPONSE",0x78A2,15595,0),
+("SMSG_VOID_STORAGE_CONTENTS",0x75B4,15595,0),
+("SMSG_VOID_STORAGE_FAILED",0x18A7,15595,0),
+("SMSG_VOID_STORAGE_TRANSFER_CHANGES",0x51A6,15595,0),
+("SMSG_VOID_TRANSFER_RESULT",0x1DA6,15595,0),
+("SMSG_WAIT_QUEUE_FINISH",0x75B7,15595,0),
+("SMSG_WAIT_QUEUE_UPDATE",0x58A1,15595,0),
+("SMSG_WARDEN_DATA",0x31A0,15595,0),
+("SMSG_WARGAME_CHECK_ENTRY",0x3DA4,15595,0),
+("SMSG_WARGAME_REQUEST_SENT",0x59B2,15595,0),
+("SMSG_WEATHER",0x2904,15595,0),
+("SMSG_WEEKLY_LAST_RESET",0x50A5,15595,0),
+("SMSG_WEEKLY_RESET_CURRENCY",0x3CA1,15595,0),
+("SMSG_WEEKLY_SPELL_USAGE",0x39B7,15595,0),
+("SMSG_WEEKLY_SPELL_USAGE_UPDATE",0x11B5,15595,0),
+("SMSG_WHO",0x6907,15595,0),
+("SMSG_WHOIS",0x6917,15595,0),
+("SMSG_WORLD_SERVER_INFO",0x31A2,15595,0),
+("SMSG_WORLD_STATE_UI_TIMER_UPDATE",0x4A14,15595,0),
+("SMSG_XP_GAIN_ABORTED",0x50B4,15595,0),
+("SMSG_ZONE_UNDER_ATTACK",0x0A06,15595,0),
+("NUM_MSG_TYPES",0x0,15595,1);
diff --git a/sql_mr/custom_characters_tables.sql b/sql_mr/custom_characters_tables.sql
new file mode 100644
index 00000000000..63f87205671
--- /dev/null
+++ b/sql_mr/custom_characters_tables.sql
@@ -0,0 +1,393 @@
+-- Random Battleground
+--
+
+DROP TABLE IF EXISTS `character_battleground_random`;
+CREATE TABLE `character_battleground_random` (
+    `guid` int(11) unsigned NOT NULL DEFAULT '0',
+    PRIMARY KEY  (`guid`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+-- Anticheat tables from /dev/rsa
+
+DROP TABLE IF EXISTS `anticheat_config`;
+CREATE TABLE `anticheat_config` (
+    `checktype` mediumint(8) unsigned NOT NULL COMMENT 'Type of check',
+    `description` varchar(255),
+    `check_period` int(11) unsigned NOT NULL default '0' COMMENT 'Time period of check, in ms, 0 - always',
+    `alarmscount` int(11) unsigned NOT NULL default '1'COMMENT 'Count of alarms before action',
+    `disableoperation` tinyint(3) unsigned NOT NULL default '0'COMMENT 'Anticheat disable operations in main core code after check fail',
+    `messagenum` int(11) NOT NULL default '0' COMMENT 'Number of system message',
+    `intparam1` mediumint(8) NOT NULL default '0' COMMENT 'Int parameter 1',
+    `intparam2` mediumint(8) NOT NULL default '0' COMMENT 'Int parameter 2',
+    `floatparam1` float NOT NULL default '0' COMMENT 'Float parameter 1',
+    `floatparam2` float NOT NULL default '0' COMMENT 'Float parameter 2',
+    `action1` mediumint(8) NOT NULL default '0' COMMENT 'Action 1',
+    `actionparam1` mediumint(8) NOT NULL default '0' COMMENT 'Action parameter 1',
+    `action2` mediumint(8) NOT NULL default '0' COMMENT 'Action 1',
+    `actionparam2` mediumint(8) NOT NULL default '0' COMMENT 'Action parameter 1',
+    `disabledzones` varchar(255) NOT NULL DEFAULT '' COMMENT 'List of zones, in which check disabled.',
+    PRIMARY KEY (`checktype`)
+) DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Anticheat configuration';
+
+  -- better not drop table here, because of custom data
+CREATE TABLE IF NOT EXISTS `anticheat_log` (
+    `playername` varchar(32) NOT NULL,
+    `checktype` mediumint(8) unsigned NOT NULL,
+    `alarm_time` datetime NOT NULL,
+    `reason` varchar(255) NOT NULL DEFAULT 'Unknown',
+    `guid` int(11) unsigned NOT NULL,
+    `action1` mediumint(8) NOT NULL default '0',
+    `action2` mediumint(8) NOT NULL default '0',
+    PRIMARY KEY (`checktype`, `alarm_time`, `guid`),
+    KEY idx_Player (`guid`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Anticheat log table';
+
+-- Anticheat
+-- Config
+
+-- Main checks
+REPLACE INTO `anticheat_config`
+    (`checktype`, `description`, `check_period`, `alarmscount`, `disableoperation`, `messagenum`, `intparam1`, `intparam2`, `floatparam1`, `floatparam2`, `action1`, `actionparam1`, `action2`, `actionparam2`)
+VALUES
+    -- Main checks
+    (0, "Null check",         0, 1, 0, 11000, 0, 0,    0, 0, 1, 0, 0, 0),
+    (1, "Movement cheat",     0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0),
+    (2, "Spell cheat",        0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0),
+    (3, "Quest cheat",        0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0),
+    (4, "Transport cheat",    0, 3, 0, 11000, 0, 0,  300,50, 2, 1, 0, 0),
+    (5, "Damage cheat",       0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0),
+    (6, "Item cheat",         0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0),
+    (7, "Warden check",       0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0);
+
+-- Subchecks
+REPLACE INTO `anticheat_config`
+    (`checktype`, `description`, `check_period`, `alarmscount`, `disableoperation`, `messagenum`, `intparam1`, `intparam2`, `floatparam1`, `floatparam2`, `action1`, `actionparam1`, `action2`, `actionparam2`)
+VALUES
+    (101, "Speed hack",              500, 5, 0, 11000,    10000, 0, 0.0012,    0, 2, 1, 6, 20000),
+    (102, "Fly hack",                500, 5, 0, 11000,    20000, 0,   10.0,    0, 2, 1, 0, 0),
+    (103, "Wall climb hack",         500, 2, 0, 11000,    10000, 0, 0.0015, 2.37, 2, 1, 0, 0),
+    (104, "Waterwalking hack",      1000, 3, 0, 11000,    20000, 0,      0,    0, 2, 1, 0, 0),
+    (105, "Teleport to plane hack",  500, 1, 0, 11000,        0, 0, 0.0001,  0.1, 2, 1, 0, 0),
+    (106, "AirJump hack" ,           500, 3, 0, 11000,    30000, 0,   10.0, 25.0, 2, 1, 0, 0),
+    (107, "Teleport hack" ,            0, 1, 0, 11000,        0, 0,   50.0,    0, 2, 1, 0, 0),
+    (108, "Fall hack" ,                0, 3, 0, 11000,    10000, 0,      0,    0, 2, 1, 0, 0),
+    (109, "Z Axis hack" ,              0, 1, 0, 11000,        0, 0,0.00001, 10.0, 2, 1, 0, 0),
+    (201, "Spell invalid",             0, 1, 0, 11000,        0, 0,      0,    0, 2, 1, 0, 0),
+    (202, "Spellcast in dead state",   0, 1, 0, 11000,        0, 0,      0,    0, 2, 1, 0, 0),
+    (203, "Spell not valid for player",0, 1, 0, 11000,        0, 0,      0,    0, 2, 1, 0, 0),
+    (204, "Spell not in player book",  0, 1, 0, 11000,        0, 0,      0,    0, 2, 1, 0, 0),
+    (501, "Spell damage hack",         0, 1, 0, 11000,        0, 50000,  0,    0, 2, 1, 0, 0),
+    (502, "Melee damage hack",         0, 1, 0, 11000,        0, 50000,  0,    0, 2, 1, 0, 0),
+    (601, "Item dupe hack",            0, 1, 0, 11000,        0,     0,  0,    0, 2, 1, 0, 0),
+    (701, "Warden memory check",       0, 1, 0, 11000,        0,     0,  0,    0, 2, 1, 0, 0),
+    (702, "Warden key check",          0, 1, 0, 11000,        0,     0,  0,    0, 2, 1, 0, 0),
+    (703, "Warden checksum check",     0, 1, 0, 11000,        0,     0,  0,    0, 2, 1, 0, 0),
+    (704, "Warden timeout check",      0, 1, 0, 11000,        0,     0,  0,    0, 2, 1, 0, 0);
+
+-- Autobroadcast
+-- Commit 72d1f7a22d13399135d0
+
+  -- better not drop table here, because of custom data
+CREATE TABLE IF NOT EXISTS `autobroadcast` (
+  `id` int(11) NOT NULL auto_increment,
+  `text` longtext NOT NULL,
+  `next` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=INNODB  DEFAULT CHARSET=utf8;
+
+-- BOP item trade
+
+  -- better not drop table here, because of custom data
+CREATE TABLE IF NOT EXISTS `item_soulbound_trade_data` (
+    `itemGuid` int(16) unsigned NOT NULL DEFAULT '0',
+    `allowedPlayers` varchar(255) NOT NULL DEFAULT '',
+    PRIMARY KEY (`itemGuid`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='BOP item trade cache';
+
+-- Group flags and roles support
+-- Commit a5e57729fc5211bb6a2f
+
+ALTER TABLE `group_member`
+    ADD COLUMN  `roles` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Member roles bit mask' AFTER `subgroup`;
+
+ALTER TABLE `group_member`
+    CHANGE `assistant` `memberFlags` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Member flags bit mask';
+
+ALTER TABLE `groups`
+    DROP `mainTank`,
+    DROP `mainAssistant`;
+
+-- Instance Extend LFG
+-- Commit 020d4e346d38b961bf62
+
+ALTER TABLE `character_instance`
+    ADD COLUMN `extend` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Instance extend (bool)' AFTER `permanent`;
+
+-- Refer a friend
+
+ALTER TABLE `characters`
+    ADD COLUMN `grantableLevels` tinyint(3) unsigned NOT NULL default '0' AFTER `actionBars`;
+
+-- Refer new WorldStateMgr by rsa
+-- Commit adf97bc1d3d55c4c0fecc72020a61e3e39257f9a
+
+ALTER TABLE `characters`
+    CHANGE `dungeon_difficulty` `dungeon_difficulty` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+
+-- Saved Variables
+-- Commit 0525ca144e282cec2478
+
+ALTER TABLE `saved_variables`
+    ADD COLUMN `NextRandomBGResetTime` bigint(40) unsigned NOT NULL default 0 AFTER `NextWeeklyQuestResetTime`;
+
+-- Pet dualspec for hunter pets (mangosR2 repo)
+
+ALTER TABLE `pet_spell`
+    ADD COLUMN `spec` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `active`,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`guid`, `spell`, `spec`);
+
+-- Pet table cleanup
+ALTER TABLE `character_pet`
+  DROP `resettalents_cost`,
+  DROP `resettalents_time`,
+  CHANGE `Reactstate` `Reactstate` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+
+DROP TABLE IF EXISTS hidden_rating;
+CREATE TABLE IF NOT EXISTS hidden_rating (
+    guid INT(11) UNSIGNED NOT NULL,
+    rating2 INT(10) UNSIGNED NOT NULL,
+    rating3 INT(10) UNSIGNED NOT NULL,
+    rating5 INT(10) UNSIGNED NOT NULL,
+    PRIMARY KEY  (guid)
+) ENGINE=INNODB  DEFAULT CHARSET=utf8;
+
+-- ADVANCE CHARACTERS TABLE
+
+SET FOREIGN_KEY_CHECKS=0;
+-- ----------------------------
+-- Table structure for `character_stats`
+-- ----------------------------
+DROP TABLE IF EXISTS `character_stats`;
+CREATE TABLE `character_stats` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier, Low part',
+  `maxhealth` int(10) unsigned NOT NULL default '0',
+  `maxpower1` int(10) unsigned NOT NULL default '0',
+  `maxpower2` int(10) unsigned NOT NULL default '0',
+  `maxpower3` int(10) unsigned NOT NULL default '0',
+  `maxpower4` int(10) unsigned NOT NULL default '0',
+  `maxpower5` int(10) unsigned NOT NULL default '0',
+  `maxpower6` int(10) unsigned NOT NULL default '0',
+  `maxpower7` int(10) unsigned NOT NULL default '0',
+  `strength` int(10) unsigned NOT NULL default '0',
+  `agility` int(10) unsigned NOT NULL default '0',
+  `stamina` int(10) unsigned NOT NULL default '0',
+  `intellect` int(10) unsigned NOT NULL default '0',
+  `spirit` int(10) unsigned NOT NULL default '0',
+  `armor` int(10) unsigned NOT NULL default '0',
+  `resHoly` int(10) unsigned NOT NULL default '0',
+  `resFire` int(10) unsigned NOT NULL default '0',
+  `resNature` int(10) unsigned NOT NULL default '0',
+  `resFrost` int(10) unsigned NOT NULL default '0',
+  `resShadow` int(10) unsigned NOT NULL default '0',
+  `resArcane` int(10) unsigned NOT NULL default '0',
+  `blockPct` float unsigned NOT NULL default '0',
+  `dodgePct` float unsigned NOT NULL default '0',
+  `parryPct` float unsigned NOT NULL default '0',
+  `critPct` float unsigned NOT NULL default '0',
+  `rangedCritPct` float unsigned NOT NULL default '0',
+  `spellCritPct` float unsigned NOT NULL default '0',
+  `attackPower` int(10) unsigned NOT NULL default '0',
+  `rangedAttackPower` int(10) unsigned NOT NULL default '0',
+  `spellPower` int(10) unsigned NOT NULL default '0',
+  `apmelee` int(11) NOT NULL,
+  `ranged` int(11) NOT NULL,
+  `blockrating` int(11) NOT NULL,
+  `defrating` int(11) NOT NULL,
+  `dodgerating` int(11) NOT NULL,
+  `parryrating` int(11) NOT NULL,
+  `resilience` int(11) NOT NULL,
+  `manaregen` float NOT NULL,
+  `melee_hitrating` int(11) NOT NULL,
+  `melee_critrating` int(11) NOT NULL,
+  `melee_hasterating` int(11) NOT NULL,
+  `melee_mainmindmg` float NOT NULL,
+  `melee_mainmaxdmg` float NOT NULL,
+  `melee_offmindmg` float NOT NULL,
+  `melee_offmaxdmg` float NOT NULL,
+  `melee_maintime` float NOT NULL,
+  `melee_offtime` float NOT NULL,
+  `ranged_critrating` int(11) NOT NULL,
+  `ranged_hasterating` int(11) NOT NULL,
+  `ranged_hitrating` int(11) NOT NULL,
+  `ranged_mindmg` float NOT NULL,
+  `ranged_maxdmg` float NOT NULL,
+  `ranged_attacktime` float NOT NULL,
+  `spell_hitrating` int(11) NOT NULL,
+  `spell_critrating` int(11) NOT NULL,
+  `spell_hasterating` int(11) NOT NULL,
+  `spell_bonusdmg` int(11) NOT NULL,
+  `spell_bonusheal` int(11) NOT NULL,
+  `spell_critproc` float NOT NULL,
+  `account` int(11) unsigned NOT NULL default '0',
+  `name` varchar(12) NOT NULL default '',
+  `race` tinyint(3) unsigned NOT NULL default '0',
+  `class` tinyint(3) unsigned NOT NULL default '0',
+  `gender` tinyint(3) unsigned NOT NULL default '0',
+  `level` tinyint(3) unsigned NOT NULL default '0',
+  `map` int(11) unsigned NOT NULL default '0',
+  `money` int(10) unsigned NOT NULL default '0',
+  `totaltime` int(11) unsigned NOT NULL default '0',
+  `online` int(10) unsigned NOT NULL default '0',
+  `arenaPoints` int(10) unsigned NOT NULL default '0',
+  `totalHonorPoints` int(10) unsigned NOT NULL default '0',
+  `totalKills` int(10) unsigned NOT NULL default '0',
+  `equipmentCache` longtext NOT NULL,
+  `specCount` tinyint(3) unsigned NOT NULL default '1',
+  `activeSpec` tinyint(3) unsigned NOT NULL default '0',
+  `data` longtext NOT NULL,
+  PRIMARY KEY  (`guid`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `worldstate_data`;
+CREATE TABLE IF NOT EXISTS `worldstate_data` (
+    `state_id`         int(10) unsigned NOT NULL COMMENT 'WorldState ID (may be 0)',
+    `instance`         int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'WorldState instance',
+    `type`             int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'WorldState type',
+    `condition`        int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Condition (dependent from type)',
+    `flags`            int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Current flags of WorldState',
+    `value`            int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Current value of WorldState',
+    `renewtime`        bigint(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Time of last renew of WorldState',
+    PRIMARY KEY (`state_id`,`instance`, `type`, `condition`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='WorldState data storage';
+
+DROP TABLE IF EXISTS `item_refund_instance`;
+CREATE TABLE `item_refund_instance` (
+  `itemGuid` int(11) unsigned NOT NULL COMMENT 'Item Guid',
+  `playerGuid` int(11) unsigned NOT NULL COMMENT 'Player Guid',
+  `paidMoney` int(11) unsigned NOT NULL DEFAULT '0',
+  `paidExtendedCost` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`itemGuid`,`playerGuid`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Item Refund System';
+
+DROP TABLE IF EXISTS `calendar_events`;
+CREATE TABLE `calendar_events` (
+  `eventId`          int(11) unsigned NOT NULL DEFAULT '0',
+  `creatorGuid`      int(11) unsigned NOT NULL DEFAULT '0',
+  `guildId`          int(11) unsigned NOT NULL DEFAULT '0',
+  `type`             tinyint(3) unsigned NOT NULL DEFAULT '4',
+  `flags`            int(11) unsigned NOT NULL DEFAULT '0',
+  `dungeonId`        int(11) NOT NULL DEFAULT '-1',
+  `eventTime`        int(11) unsigned NOT NULL DEFAULT '0',
+  `title`            varchar(256) NOT NULL DEFAULT '',
+  `description`      varchar(1024) NOT NULL DEFAULT '',
+  PRIMARY KEY  (`eventId`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `calendar_invites`;
+CREATE TABLE `calendar_invites` (
+  `inviteId`         int(11) unsigned NOT NULL DEFAULT '0',
+  `eventId`          int(11) unsigned NOT NULL DEFAULT '0',
+  `inviteeGuid`      int(11) unsigned NOT NULL DEFAULT '0',
+  `senderGuid`       int(11) unsigned NOT NULL DEFAULT '0',
+  `status`           tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `lastUpdateTime`   int(11) unsigned NOT NULL DEFAULT '0',
+  `rank`             tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `description`      varchar(256) NOT NULL DEFAULT '',
+  PRIMARY KEY  (`inviteId`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+-- chat log tables from mns
+DROP TABLE IF EXISTS `chat_log_bg`;
+CREATE TABLE `chat_log_bg` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `type` TINYINT(2) NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `members` TEXT,
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `chat_log_channel`;
+CREATE TABLE `chat_log_channel` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `channel` VARCHAR(255) NOT NULL DEFAULT '',
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `chat_log_chat`;
+CREATE TABLE `chat_log_chat` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `type` TINYINT(2) NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `chat_log_guild`;
+CREATE TABLE `chat_log_guild` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `type` TINYINT(2) NOT NULL DEFAULT 4,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `guild` VARCHAR(255) NOT NULL DEFAULT '',
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `chat_log_party`;
+CREATE TABLE `chat_log_party` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `members` TEXT,
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `chat_log_raid`;
+CREATE TABLE `chat_log_raid` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `type` TINYINT(2) NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `members` TEXT,
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `chat_log_whisper`;
+CREATE TABLE `chat_log_whisper` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `to` VARCHAR(12) NOT NULL DEFAULT '',
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
diff --git a/sql_mr/custom_mangos_masquerade_begin.sql b/sql_mr/custom_mangos_masquerade_begin.sql
new file mode 100644
index 00000000000..cb0bc1a8df7
--- /dev/null
+++ b/sql_mr/custom_mangos_masquerade_begin.sql
@@ -0,0 +1,9 @@
+-- query for begin table masquerading (ALL changest must be rollbacked in  custom_mangos_masquerade_end.sql !)
+--
+
+RENAME TABLE `vehicle_accessory` TO `r2_vehicle_accessory`;
+
+CREATE VIEW `vehicle_accessory` (`vehicle_entry`, `seat`, `accessory_entry`, `comment`)
+    AS SELECT `vehicle_entry`, `seat`, `accessory_entry`, `comment`
+    FROM `r2_vehicle_accessory`;
+
diff --git a/sql_mr/custom_mangos_masquerade_end.sql b/sql_mr/custom_mangos_masquerade_end.sql
new file mode 100644
index 00000000000..fdda53a85e5
--- /dev/null
+++ b/sql_mr/custom_mangos_masquerade_end.sql
@@ -0,0 +1,4 @@
+-- query for finish table masquerading (must rollback all changes from custom_mangos_masquerade_begin.sql)
+--
+DROP VIEW IF EXISTS `vehicle_accessory`;
+RENAME TABLE `r2_vehicle_accessory` TO `vehicle_accessory`;
diff --git a/sql_mr/custom_mangos_tables.sql b/sql_mr/custom_mangos_tables.sql
new file mode 100644
index 00000000000..9d79bc3ee77
--- /dev/null
+++ b/sql_mr/custom_mangos_tables.sql
@@ -0,0 +1,330 @@
+-- Implement DBC encounters
+
+DROP TABLE IF EXISTS `instance_encounters`;
+CREATE TABLE `instance_encounters` (
+    `entry` int(10) unsigned NOT NULL COMMENT 'Unique entry from DungeonEncounter.dbc',
+    `creditType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+    `creditEntry` int(10) unsigned NOT NULL DEFAULT '0',
+    `lastEncounterDungeon` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'If not 0, LfgDungeon.dbc entry for the instance it is last encounter in',
+    `comment` varchar(255) NOT NULL DEFAULT '',
+     PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- LFG dungeon reward structure from TC
+
+DROP TABLE IF EXISTS `lfg_dungeon_rewards`;
+CREATE TABLE `lfg_dungeon_rewards` (
+    `dungeonId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Dungeon entry from dbc',
+    `maxLevel` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Max level at which this reward is rewarded',
+    `firstQuestId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest id with rewards for first dungeon this day',
+    `firstMoneyVar` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Money multiplier for completing the dungeon first time in a day with less players than max',
+    `firstXPVar` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Experience multiplier for completing the dungeon first time in a day with less players than max',
+    `otherQuestId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest id with rewards for Nth dungeon this day',
+    `otherMoneyVar` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Money multiplier for completing the dungeon Nth time in a day with less players than max',
+    `otherXPVar` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Experience multiplier for completing the dungeon Nth time in a day with less players than max',
+    PRIMARY KEY (`dungeonId`, `maxLevel`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- Pet scaling data table from /dev/rsa
+
+DROP TABLE IF EXISTS `pet_scaling_data`;
+CREATE TABLE `pet_scaling_data` (
+  `creature_entry` mediumint(8) unsigned NOT NULL,
+  `aura` mediumint(8) unsigned NOT NULL default '0',
+  `healthbase` mediumint(8) NOT NULL default '0',
+  `health` mediumint(8) NOT NULL default '0',
+  `powerbase` mediumint(8) NOT NULL default '0',
+  `power` mediumint(8) NOT NULL default '0',
+  `str` mediumint(8) NOT NULL default '0',
+  `agi` mediumint(8) NOT NULL default '0',
+  `sta` mediumint(8) NOT NULL default '0',
+  `inte` mediumint(8) NOT NULL default '0',
+  `spi` mediumint(8) NOT NULL default '0',
+  `armor` mediumint(8) NOT NULL default '0',
+  `resistance1` mediumint(8) NOT NULL default '0',
+  `resistance2` mediumint(8) NOT NULL default '0',
+  `resistance3` mediumint(8) NOT NULL default '0',
+  `resistance4` mediumint(8) NOT NULL default '0',
+  `resistance5` mediumint(8) NOT NULL default '0',
+  `resistance6` mediumint(8) NOT NULL default '0',
+  `apbase` mediumint(8) NOT NULL default '0',
+  `apbasescale` mediumint(8) NOT NULL default '0',
+  `attackpower` mediumint(8) NOT NULL default '0',
+  `damage` mediumint(8) NOT NULL default '0',
+  `spelldamage` mediumint(8) NOT NULL default '0',
+  `spellhit` mediumint(8) NOT NULL default '0',
+  `hit` mediumint(8) NOT NULL default '0',
+  `expertize` mediumint(8) NOT NULL default '0',
+  `attackspeed` mediumint(8) NOT NULL default '0',
+  `crit` mediumint(8) NOT NULL default '0',
+  `regen` mediumint(8) NOT NULL default '0',
+  PRIMARY KEY (`creature_entry`, `aura`)
+) DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores pet scaling data (in percent from owner value).';
+
+-- Spell DBC
+DROP TABLE IF EXISTS `spell_dbc`;
+CREATE TABLE IF NOT EXISTS `spell_dbc` (
+  `Id` int(10) unsigned NOT NULL,
+  `Category` int(10) unsigned NOT NULL DEFAULT '0',
+  `Dispel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Mechanic` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Attributes` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx2` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx3` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx4` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx5` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx6` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx7` int(10) unsigned NOT NULL DEFAULT '0',
+  `Stances` int(10) unsigned NOT NULL DEFAULT '0',
+  `StancesNot` int(10) unsigned NOT NULL DEFAULT '0',
+  `Targets` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiresSpellFocus` int(10) unsigned NOT NULL DEFAULT '0',
+  `CasterAuraState` int(10) unsigned NOT NULL DEFAULT '0',
+  `TargetAuraState` int(10) NOT NULL DEFAULT '0',
+  `CasterAuraStateNot` int(10) unsigned NOT NULL DEFAULT '0',
+  `TargetAuraStateNot` int(10) NOT NULL DEFAULT '0',
+  `CasterAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `TargetAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExcludeCasterAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExcludeTargetAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `CastingTimeIndex` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `RecoveryTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `CategoryRecoveryTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `InterruptFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraInterruptFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProcFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProcChance` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ProcCharges` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BaseLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DurationIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PowerType` int(10) NOT NULL DEFAULT '0',
+  `ManaCost` int(10) NOT NULL DEFAULT '0',
+  `ManaCostPerLevel` int(10) NOT NULL DEFAULT '0',
+  `ManaPerSecond` int(10) NOT NULL DEFAULT '0',
+  `ManaPerSecondPerLevel` int(10) NOT NULL DEFAULT '0',
+  `RangeIndex` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `Speed` int(10) NOT NULL DEFAULT '0',
+  `StackAmount` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EquippedItemClass` int(11) NOT NULL DEFAULT '-1',
+  `EquippedItemSubClassMask` int(11) NOT NULL DEFAULT '0',
+  `EquippedItemInventoryTypeMask` int(11) NOT NULL DEFAULT '0',
+  `Effect1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Effect2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Effect3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectDieSides1` int(11) NOT NULL DEFAULT '0',
+  `EffectDieSides2` int(11) NOT NULL DEFAULT '0',
+  `EffectDieSides3` int(11) NOT NULL DEFAULT '0',
+  `EffectRealPointsPerLevel1` float NOT NULL DEFAULT '0',
+  `EffectRealPointsPerLevel2` float NOT NULL DEFAULT '0',
+  `EffectRealPointsPerLevel3` float NOT NULL DEFAULT '0',
+  `EffectBasePoints1` int(11) NOT NULL DEFAULT '0',
+  `EffectBasePoints2` int(11) NOT NULL DEFAULT '0',
+  `EffectBasePoints3` int(11) NOT NULL DEFAULT '0',
+  `EffectMechanic1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectMechanic2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectMechanic3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectImplicitTargetA1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectImplicitTargetA2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectImplicitTargetA3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectImplicitTargetB1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectImplicitTargetB2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectImplicitTargetB3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectRadiusIndex1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectRadiusIndex2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectRadiusIndex3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EffectApplyAuraName1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EffectApplyAuraName2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EffectApplyAuraName3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EffectAmplitude1` int(11) NOT NULL DEFAULT '0',
+  `EffectAmplitude2` int(11) NOT NULL DEFAULT '0',
+  `EffectAmplitude3` int(11) NOT NULL DEFAULT '0',
+  `EffectMultipleValue1` float NOT NULL DEFAULT '0',
+  `EffectMultipleValue2` float NOT NULL DEFAULT '0',
+  `EffectMultipleValue3` float NOT NULL DEFAULT '0',
+  `EffectItemType1` int(11) NOT NULL DEFAULT '0',
+  `EffectItemType2` int(11) unsigned NOT NULL DEFAULT '0',
+  `EffectMiscValue1` int(11) NOT NULL DEFAULT '0',
+  `EffectMiscValue2` int(11) NOT NULL DEFAULT '0',
+  `EffectMiscValue3` int(11) NOT NULL DEFAULT '0',
+  `EffectMiscValueB1` int(11) NOT NULL DEFAULT '0',
+  `EffectMiscValueB2` int(11) NOT NULL DEFAULT '0',
+  `EffectMiscValueB3` int(11) NOT NULL DEFAULT '0',
+  `EffectTriggerSpell1` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectTriggerSpell2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectTriggerSpell3` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMaskA1` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMaskA2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMaskA3` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMaskB1` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMaskB2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMaskB3` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMaskC1` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMaskC2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMaskC3` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellIconID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ManaCostPercentage` int(10) NOT NULL DEFAULT '0',
+  `StartRecoveryCategory` int(10) NOT NULL DEFAULT '0',
+  `StartRecoveryTime` int(10) NOT NULL DEFAULT '0',
+  `MaxTargetLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyName` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyFlags1` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyFlags2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyFlags3` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxAffectedTargets` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DmgClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PreventionType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DmgMultiplier1` float NOT NULL DEFAULT '0',
+  `DmgMultiplier2` float NOT NULL DEFAULT '0',
+  `DmgMultiplier3` float NOT NULL DEFAULT '0',
+  `AreaGroupId` int(11) NOT NULL DEFAULT '0',
+  `SchoolMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `RuneCostID` int(10) NOT NULL DEFAULT '0',
+  `Comment` text NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Custom spell.dbc entries';
+
+
+-- Spell disabled
+-- Commit 70d09c64ce0d3263a7e4
+
+DROP TABLE IF EXISTS `spell_disabled`;
+CREATE TABLE `spell_disabled` (
+    `entry` int(11) unsigned NOT NULL default 0 COMMENT 'spell entry',
+    `ischeat_spell` tinyint(3) unsigned NOT NULL default 0 COMMENT 'mark spell as cheat',
+    `active` tinyint(3) unsigned NOT NULL default 1 COMMENT 'enable check of this spell',
+    PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Disabled Spell System';
+
+-- Vehicle accessory
+
+ALTER TABLE `vehicle_accessory`
+    ADD COLUMN `flags` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'various flags' AFTER `accessory_entry`,
+    ADD COLUMN `offset_x` FLOAT NOT NULL DEFAULT '0' COMMENT 'custom passenger offset X' AFTER `flags`,
+    ADD COLUMN `offset_y` FLOAT NOT NULL DEFAULT '0' COMMENT 'custom passenger offset Y' AFTER `offset_x`,
+    ADD COLUMN `offset_z` FLOAT NOT NULL DEFAULT '0' COMMENT 'custom passenger offset Z' AFTER `offset_y`,
+    ADD COLUMN `offset_o` FLOAT NOT NULL DEFAULT '0' COMMENT 'custom passenger offset O' AFTER `offset_z`;
+
+-- Areatrigger table format change
+
+ALTER TABLE `areatrigger_teleport`
+    CHANGE `required_quest_done` `required_quest_done_A` int(11) UNSIGNED NOT NULL DEFAULT "0" COMMENT "Alliance quest",
+    CHANGE `required_quest_done_heroic` `required_quest_done_heroic_A` int(11) UNSIGNED NOT NULL DEFAULT "0" COMMENT "Alliance heroic quest",
+    ADD COLUMN `required_quest_done_H` int(11) UNSIGNED NOT NULL DEFAULT "0" COMMENT "Horde quest" AFTER `required_quest_done_A`,
+    ADD COLUMN `required_quest_done_heroic_H` int(11) UNSIGNED NOT NULL DEFAULT "0" COMMENT "Horde heroic quest" AFTER `required_quest_done_heroic_A`,
+    ADD COLUMN `minGS` int(11) UNSIGNED NOT NULL DEFAULT "0" COMMENT "Min player gear score",
+    ADD COLUMN `maxGS` int(11) UNSIGNED NOT NULL DEFAULT "0" COMMENT "Max player gear score",
+    ADD COLUMN `achiev_id_0` int(11) UNSIGNED NOT NULL DEFAULT "0" COMMENT "Required achievement to enter in heroic difficulty",
+    ADD COLUMN `achiev_id_1` int(11) UNSIGNED NOT NULL DEFAULT "0" COMMENT "Required achievement to enter in extra difficulty",
+    ADD COLUMN `combat_mode` int(11) UNSIGNED NOT NULL DEFAULT "0" COMMENT "Possibility for enter while zone in combat";
+
+UPDATE `areatrigger_teleport` SET `required_quest_done_H`=`required_quest_done_A` WHERE `required_quest_done_A` > 0;
+UPDATE `areatrigger_teleport` SET `required_quest_done_heroic_H`=`required_quest_done_heroic_A` WHERE `required_quest_done_heroic_A` > 0;
+
+-- Creature on kill Reputation
+
+ALTER TABLE `creature_onkill_reputation`
+    ADD COLUMN `ChampioningAura` int(11) unsigned NOT NULL default 0 AFTER `TeamDependent`;
+
+-- Pet levelstats
+
+ALTER TABLE `pet_levelstats`
+    ADD `mindmg` MEDIUMINT(11) NOT NULL DEFAULT 0 COMMENT 'Min base damage' AFTER `armor`,
+    ADD `maxdmg` MEDIUMINT(11) NOT NULL DEFAULT 0 COMMENT 'Max base damage' AFTER `mindmg`,
+    ADD `attackpower` MEDIUMINT(11) NOT NULL DEFAULT 0 COMMENT 'Attack power' AFTER `maxdmg`;
+
+-- Pet spell auras
+
+ALTER TABLE `spell_pet_auras`
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`spell`, `effectId`, `pet`, `aura`);
+
+CREATE TABLE IF NOT EXISTS `creature_spell` (
+    `guid`      int(11) unsigned NOT NULL COMMENT 'Unique entry from creature_template',
+    `spell`     int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Spell id from DBC',
+    `index`     tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Spell index',
+    `active`    tinyint(3) unsigned NOT NULL DEFAULT '0'COMMENT 'Active state for this spell',
+    `disabled`  tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Boolean state for spell',
+    `flags`     int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Spell custom flags',
+     PRIMARY KEY (`guid`,`index`,`active`)
+) DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Creature spells storage';
+
+-- Player race/faction change tables
+
+CREATE TABLE IF NOT EXISTS `player_factionchange_achievements` (
+    `alliance_id` int(8) NOT NULL,
+    `horde_id` int(8) NOT NULL,
+    `CommentA` varchar(255) NOT NULL,
+    `CommentH` varchar(255) NOT NULL,
+    PRIMARY KEY (`alliance_id`,`horde_id`)
+) DEFAULT CHARSET=UTF8;
+
+CREATE TABLE IF NOT EXISTS `player_factionchange_items` (
+    `race_A` int(8) NOT NULL DEFAULT '0',
+    `alliance_id` int(8) NOT NULL,
+    `commentA` varchar(255) DEFAULT NULL,
+    `race_H` int(8) NOT NULL DEFAULT '0',
+    `horde_id` int(8) NOT NULL,
+    `commentH` varchar(255) DEFAULT NULL,
+    PRIMARY KEY (`alliance_id`,`horde_id`)
+) DEFAULT CHARSET=UTF8;
+
+CREATE TABLE IF NOT EXISTS `player_factionchange_reputations` (
+    `race_A` int(8) NOT NULL DEFAULT '0',
+    `alliance_id` int(8) NOT NULL,
+    `commentA` varchar(255) DEFAULT NULL,
+    `race_H` int(8) NOT NULL DEFAULT '0',
+    `horde_id` int(8) NOT NULL,
+    `commentH` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`alliance_id`,`horde_id`)
+) DEFAULT CHARSET=UTF8;
+
+CREATE TABLE IF NOT EXISTS  `player_factionchange_spells` (
+    `race_A` int(8) NOT NULL DEFAULT '0',
+    `alliance_id` int(8) NOT NULL,
+    `commentA` varchar(255) DEFAULT NULL,
+    `race_H` int(8) NOT NULL DEFAULT '0',
+    `horde_id` int(8) NOT NULL,
+    `commentH` varchar(255) DEFAULT NULL,
+    PRIMARY KEY (`race_A`,`alliance_id`,`race_H`,`horde_id`)
+) DEFAULT CHARSET=UTF8;
+
+CREATE TABLE `player_factionchange_titles` (
+  `alliance_id` int(8) NOT NULL,
+  `alliance_comment` varchar(255) NOT NULL,
+  `horde_id` int(8) NOT NULL,
+  `horde_comment` varchar(255) NOT NULL,
+  PRIMARY KEY (`alliance_id`,`horde_id`)
+) DEFAULT CHARSET=utf8;
+
+CREATE TABLE `player_factionchange_quests` (
+    `alliance_id` int(8) NOT NULL,
+    `commentA` varchar(255) DEFAULT NULL,
+    `horde_id` int(8) NOT NULL,
+    `commentH` varchar(255) DEFAULT NULL,
+    PRIMARY KEY (`alliance_id`, `horde_id`)
+) DEFAULT CHARSET=UTF8;
+
+-- Implement spell linked definitions storage
+CREATE TABLE IF NOT EXISTS `spell_linked` (
+    `entry`            int(10) unsigned NOT NULL COMMENT 'Spell entry',
+    `linked_entry`     int(10) unsigned NOT NULL COMMENT 'Linked spell entry',
+    `type`             int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Type of link',
+    `effect_mask`      int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'mask of effect (NY)',
+    `comment`          varchar(255) NOT NULL DEFAULT '',
+     PRIMARY KEY (`entry`,`linked_entry`,`type`)
+) DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Linked spells storage';
+
+CREATE TABLE IF NOT EXISTS `worldstate_template` (
+    `state_id`         int(10) unsigned NOT NULL COMMENT 'WorldState ID',
+    `type`             int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'WorldState type',
+    `condition`        int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Default condition (dependent from type)',
+    `flags`            int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Default flags of WorldState',
+    `default`          int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Default value of WorldState',
+    `linked_id`        int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'ID of linked WorldState',
+    `ScriptName`       char(64) NOT NULL default '' COMMENT 'Script name for WorldState (FFU)',
+    `comment`          varchar(255) NOT NULL DEFAULT '',
+    PRIMARY KEY (`state_id`,`type`,`condition`,`linked_id`)
+) DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='WorldState templates storage';
diff --git a/sql_mr/custom_realmd_tables.sql b/sql_mr/custom_realmd_tables.sql
new file mode 100644
index 00000000000..36ee739d632
--- /dev/null
+++ b/sql_mr/custom_realmd_tables.sql
@@ -0,0 +1,845 @@
+-- Refer a friend
+
+  -- better not to drop table here, because of custom data comment out drop some people may clear table if they choose
+-- DROP TABLE `account_friends`;
+CREATE TABLE IF NOT EXISTS `account_friends` (
+    `id` int(11) unsigned NOT NULL default '0',
+    `friend_id` int(11) unsigned NOT NULL default '0',
+    `bind_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Bring date',
+    `expire_date` datetime NOT NULL DEFAULT 0 COMMENT 'Expire date',
+    PRIMARY KEY (`id`, `friend_id`)
+) DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores accounts for refer-a-friend system.';
+
+-- Warden data table structure from TOM_RUS
+DROP TABLE IF EXISTS `warden_data_result`;
+CREATE TABLE `warden_data_result` (
+  `id` int(4) NOT NULL auto_increment,
+  `check` int(3) default NULL,
+  `data` tinytext,
+  `str` tinytext,
+  `address` int(8) default NULL,
+  `length` int(2) default NULL,
+  `result` tinytext,
+  `comment` text,
+  PRIMARY KEY  (`id`)
+) DEFAULT CHARSET=utf8;
+
+-- realmd table update for warden
+ALTER TABLE `account`
+    ADD COLUMN `os` VARCHAR(4) DEFAULT '' NOT NULL AFTER `locale`;
+
+-- Warden data from TOM_RUS
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','07F223143C69271AA2A851FECF6DC883A9D3A7DBA6FE26CC','','710730','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C7D18F99DBC446A4B36E78B9130B6FA2E365B3D2D4199DF5','','28940','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','AA1A8559776F873F26954F15E49E6041EDC2C3766AD87A59','','21826','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','5F342A4D0EA9DB35F93FAE6E32670D810F017309817AA7C0','','676970','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','C57BD89DD447131EA2083784AB4DA8BD58CF3E182F1D8AF6','','690106','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','69AA85EFE8A1A990DA5ECFED4FAFD5B14F1D52EF2548FD15','','12905','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','083ECAD073DE2D61E3564B4BF767C9D1F8F15AA0495F5A76','','41096','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','C774D64EF60AD5A141FC56F3D02AE78AC147770FAE25D8FE','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','502C59CAFEA11E9584C13BFE75F85EB79936AEEE31B44165','','12194860','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','4FBE8978A662428C616AABD71DA5562E4AC21F54BEB8ADBF','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','83D3F7FD7DCA144AD8219A6A4E20F0CFC6E7EA208C4144FF','','3033068','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','4623652','7','578B7D08578BF1',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','00523153EE2298A8D80D7B26B7067CA7B26AC06FF374FE7B','','673210','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','91BC368FA14A3FE3E13D0B1056F485F846925E613D8E8903','','12194860','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','10010636','12','8166443FFF1FFFD9565CD95E',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8FEFDBC58301AB0E0D0F6EBC5FBDA5ED9A7126873A9AB337','','682394','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B40FF92D4F092599EA9014C88B474DE4352C3F1635109882','','448492','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','42B596FF923054531E4918DC39E08F8564FED16D559B494A','','29852','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','24291D6733A7CEFA3D54C3BCCAE95D56D8365BAB42AEE1CE','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','6C4E321E2D5A153F2BB664EB6EEDF8D67FDE7ECC8076D087','','3990720','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FB649706C8F1AFF5990B5F3118DFE54FF6F9609C6991C161','','3045776','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D1B451C906B81261B048FD4025217245950C11660815367F','','28920','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','40079A1083A6B57E3B713992BD395FB6650B631E4C4B8D4E','','29852','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3F8FEFE08CB358D6613656AFDB498AB8C599BA18B5574FB6','','682378','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','EECA71B5536EE1992FD7825A5CCC4B7F9F3B413C0DA498B6','','29884','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B8786BFF2421ED1F1FB30F3F0BAF671FC1DAD5B3B33124C8','','28956','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BF0C842D635D9D8B3F6FF84EF6DF7C963C485EBAF02D17B0','','28920','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9672ED2A27C4972E04DF4471C95492C721024E241995170C','','36924','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','63532B056020A261251BD24AB026BBC5D4468AF863136044','','17906','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','7D38C80FEAB10B857A4A7BEF15D27A58FB43FD875E29C73C','','3990720','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B158752316672A90BF29846E7AD64BA4FD1699C638BFD3B6','','2299116','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','4549AE7CA28700562D996CBC78FA7341DC05F644C01474E4','','3000288','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','EE77806A4F5723FD9C6FC6F43308C8AB448E0A139CB43700','','690106','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','046D6EA3E99E275F51CAA591BD8C478B6F964A3072018F43','','21660','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B1682CE919907AD7D8990F3D8272CFF24A996162565D52B4','','676970','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','22E057649A8BF1D9672841EF47A4DA175AAC082FFEF059DA','','710730','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','7BA62D5F5CFEB545D1AE646962F4EB9A91B93EF8FFD5D1B0','','710554','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','702802D919D9E5C3FD42CA9188936C73E47F87CFA419025A','','3033068','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FDA6D997BFB8A991B57755633D1AB3C7E567A74C1EC09937','','3070052','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','84F6BDD28490937867774E7BF8D5B78F68BF9EB43DE90F10','','477912','60','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5A5B4BA32BD937FF253016AE836DD44B794F8D05982860A6','','447736','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A243986665C7FCA1E60A9F209DE9431C3098D082DF1C4528','','682378','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','7CC89374CE3A9C07DCD685006690B828931D60085EE5FEE8','','710554','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','01F10590E6DFED79523D26C043D5424174BEF1011F3F4974','','477928','60','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','C9728BDC4B77BAA7B3515AFD3628EDB0986DFA20B46917B4','','672746','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','179B80E5E054521E44BA8F5978D5FC489CC9E514B350A3FF','','28956','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5417948','5','7734FF2485',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7769A67D6E2460450873133B0CFF99B67A58CE6C404A17F8','','17282','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','CF3896074EEBC0F93B539FD44E4D825227D4C1556B8F2279','','3990720','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','88F2833B5267A71A0CA72509C40819B99283A6E556FD9038','','198','10','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','8491566','5','8B4D10890D',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F7229DF2D879A9E8D5BCEDCDC7046D75BAEE1C9D4DA41E55','','3638348','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','AE78585CD862134059B13669FC416B8124752EC6471DDCE6','','28940','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B408E9F9B475E4B6A81F9B7F2E060824F618FFDABBFFE805','','13634','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A9DA016B83961F95097E08F2DEBE69517C7573FFF06D8C4B','','668874','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0E74160C242EF826D09BCE4ED535E9A9D251B1CD20E31891','','24812','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A58E4D44D952C1F9DB7B5E423167EE4C28AD02668C5B86AF','','710730','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','35A9FC42ACBF3A147B0C8CF67BA04EC979C6534B20249B45','','28956','12','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5345746','7','746583F9177760',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','1430DC4A627EA5FA2CFF9C010CE16022F259F81DB6047879','','13634','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','85A005398AF851382267C01BB6FB04AEF2093213C20EC200','','360508','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','96916CD89649027A9A8BBFBD28AE190CD5D590E24BBAD451','','13033','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','056D57A5C1A46883400E1F69405750B23DE18C3032C3D91C','','27270','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','87C641E1EDBD96D9F170C7BE0FA13F45611DCDF41AC02526','','41127','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','1F378DF1E7BD99164DDC7401A98CA5E9551BD50B4A35D5AA','','34176','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B5ED443D6CA2F6095BAC8DAFDC8F3413F7B473916357C17E','','209352','75','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','A2BC3FF01787A38CB88B3EF45C1CD97DA113157FC395D38C','','30012','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','190862E5018F1428E5B12BFDAD08283ECD057B34AD722846','','41228','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6E0E55BE8690F64442E275559E6C9F8A3FDCAA00937D1C13','','49347','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B6FC4C07BB2CBE7C5C854CD99DAFEC0D1AE4101FC51460F9','','477912','60','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3B5955C3B498489869990F08A4CAE566A7D689C23990518B','','156','8','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','7246064','6','8950108B450C',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F24317DAA28AA477996EEBB9538A89569ABF9B185A3EA4E4','','718842','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','DA25A4134671325719833878E2556455EC4321A2207B6728','','198','10','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','DC9490A7BEB43C64585E013B5260BE843D126EB3BCEBAC11','','50040','26','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','4BB92BBD5CA8C192C9D0E1EDB6C21FF3F4A61ED1B151365F','','673210','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','13E8DD1C9F5501A270A59CC4B61311F6D5D18DC3F2AA351A','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','346CFA39FF98198BDE1C23673FBF51A50CFF5ADED784F077','','17522','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','0590FC57AB448975FA46C314A8AB75AF96DF0FD0A3D9FB23','Afd32uu','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E37D413DC96A92D3CEAB8A482B8F5397587A0E654C9A0166','','672954','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E7D5551799C2C7F0072BC3149A22F37D09EA1EB83F64C655','','3045912','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7CC5260578671130CA5B3392BA5CFD0F3DE0BE1085E556B6','','9977','32','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','F44A40945F24385D089E040A733553EEFF92EFAAB0636323','','134968','32','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D3122CF30EE55310CF4A710E61B190D2B108227B746B41AD','','679578','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7E3CC1BC53477D84F05F623BBC94B9DE8D01A2607CA935DB','','41188','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','DC06565CC1512B5A91A848E08BC4FBC6DA705F6503667852','','41127','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','03DC47CDFBB14C5CF0D0010FA5424556F951585588A2180A','','29916','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','29EC91C4D87891FECDED381CE65A86A259F00DD788833E4D','','174688','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','31F024003681765368F6EFB667E83CE1D12799723AA99BF9','','685304','44','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6A82AC1D0BFEF5DA7385510CBC57189FACD42E45E0D2A65E','','30012','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3901FBD52655E12ADA4EEDED3B365B1DDFAAA925A140097F','','448492','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6E9991A25EC347BEA5813EDE0A842D746779C97606565B5A','','17906','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0AC9F2B104AC5AA9131FB14E669B98D30D056936625B0245','','27270','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A338B3DA78A6683CBEE08A63C5EEFBE1AF33BF54983D583D','','684876','29','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','38759C29F2ACF42DA9D16EF35837A470DC7C42C3284B2A3C','','3049492','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','F35817564FC39F4DB7994021352FEEB86E2FEE86C11B8DBB','','360508','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','09FAC087283873DAEE0AD074ABF7DDB1B395F5CF6BC2141E','','28956','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','87FE57916743AF3C97CC3B583B29E89B6E503D31D1747B64','','676970','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','97D854645011BAD1F6625679511D78D1B7367A51EB0FCC6E','','668874','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','12369F6F1B875FB5CC5E67445ADEAE2B295D196596679317','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5034278808E93A3DFC9BEFFD8E180FEFA24DFC5056ED3BE1','','433168','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','55EF16220A7EF3F74A9D895821610DFBD2A757FB05C792D5','','209352','75','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','67445533AA0BB737D2F74C9258148C6C667794F0E3D07498','','45324','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','AA8649100B17A9C5BE227F47F867FADE51AD242BAAD39821','','3045632','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','85545FE9242B2474574EEBABBF452FBD11497073CB1E46A5','','41080','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9DACD6981681F53650B681EAE68065D26F4803682058709D','','448456','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','96B74F1436A05E658E3282164BC3CBDF4DBBB2CF6A5B866F','','9977','32','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','033BD6861DF7878DC9470EC2F699772BB2F3D5000490866F','','90202','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','B797D0AF3164EE83167D5C054A511A5B209A70C6655C408B','IPSect','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D91A2764435C5091D3F9471AB8B5F397E609330294694488','','710730','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','94EED02DCDB71789E50917DA401A03F4B91BDBEA050D8BCA','','3766400','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','2DF33CBB544E2D5238FB591F2547AC507B4D8A652D789F2B','','2303444','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','7860712','5','742DF6407C',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','81A74F35F0F887144D59F93647C18C70C5FEEF542A7F3782','','709322','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','2E1F8A68FDDF084A950B786A1EE7E0CE43E62449A56F92A3','','3045632','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B1F8988B6664A90E79503FA5D843C3CB97BFDC23EB8C7690','','433168','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0277E26DE31814DFD675A59E526669E39080E033BAE88859','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','10714892','8','BB8D243FD4D0313E',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','09BBFC19FCADC69D6B5BF655A5BB6350B4A8120C3EB557D2','','3990720','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','BF4ABDEB726B0060E74701C03180C3CB02170ADCB7DCB61C','','3049872','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','9990741','9','8B878000000089463C',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D259A46A6D1855C436BFC96FB9376BDCDF5E9FFAE8B4147C','','3045616','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F425A62A44097742D72A05669B6BE93AD9CEFE9E40D71E48','','3045976','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B134291F515D136B6576FFBC0133C7859755974611170D07','','20512','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','125BE691985D8DB37068DC14D74EA2DA1260E4A63D3F74BF','','45324','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E06E3C5B356B34BA92F6765108556AD53ABB74B986D5810E','','3070052','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8CC87DFF61F2EC82DE033865C9879010D94E1614369FE286','','710554','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E1F5233450FEFFB6F0E8F2B17683047A485828FEDD3E5B80','','448456','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','31BA6EA4DF2362676AB71F4CB60B0D40FA51A3AABD25D5CB','','36924','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C14630E1D519EB85C254C536FE81DC490977E869BD5CD884','','12985','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B337F892EEDD52A5B978C116A19D927134273626EFC4DAA3','','17890','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D97560108AA21A487EC9278759F7615BFA304A933776A201','','18680','35','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','DA59505BA61459508532CBEAD246DCD2C8E7BF5C6D3CE676','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5803CA69E5B7F1DF08D95219894D75F52EDB1AD429E562D9','','174688','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8A1099E19139D91573286DBB3DED2CC093A99FD178F7FEC8','','3033068','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0331B438B085F55C06F7F697160845BE953D9CE789AA62A4','','3000288','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E844078A5671FF7DB0621E7F1C7EDDF9C92F5A9FA0477FCB','','41023','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','AAD7F47B231861913F353341FD26E5AA89AFB586FB6A5366','','672746','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','136DFB3FE66D2830DF46EE155FCAEADC9624FFE1410088DA','','3041472','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C6015A0D5C9109768BA4233639A51F163CC7ED58749E5026','','25724','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','9C668CE4D328EEA9B6AB7AD5FF54169289B35B230275A43C','','3049872','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FC3C95E71F968C46BD5DB5C9EF9B0A5BDCC5619B805046F5','','2299060','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FBE3808C0E36BFBC1D1F5A0E508CA89E81E550CD2FDEEC48','','149','5','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','35A8252DBC65514E858256C497141153812EE61C724BF5A9','','710730','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','CC79AA9AE29A52A998181D183D38974221B8BAC0AB534E7D','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B89F25A249D295580E649F5ABE0C65EC24401F4889A4FB16','','668874','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','742A0A9997B9E857C355AA75797466506BAE73D44D26399D','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E7975701601B2FDF8262098521B7BB4FF5CCC484F8E919E7','','3045776','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','43E81BE830F169F4EDD23B84ABFA9D15EF12C978FE134346','','60648','56','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','66CA9E464A2122E301A72FAEF13A4853D8CB1A45C177E854','','178504','96','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','0A3C294B0799FD2C9EC17C1CCBCD174A51B6A2ECC62FEF17','IPSect','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','6E9CE81BFCAF0C250705FCC599981D2D9E4D474A7E857B37','','2299108','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8734D6E081D5C993DCE8161CFDFC6197F39A487E4083A3E1','','149','5','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A33355AF7B5FF3CECB3A6059F6621F30AEE695D69421EA2B','','3049492','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BF8CEA63013511BDE0B551DAAC492DFBB9608645140B88F7','','29916','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8D5D5E99EAB2ED21A104913B05D6BD7A8E63ADA56B66CDED','','3022016','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','778256BFEF82EA60C4E0F25083655FB2BB75B83FD60A9C06','','18680','35','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','43FB8007D7DD7B01FFBEEA3EF9D0242778565544281EC761','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','94DCF5D21FE2106F5303216C14AD55EEDC1B19FDC91D5F76','','28704','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7EBBF90F7D8462D1453479DF9AC5943AF483FE2828C74FDD','','477928','60','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','A171148491E099B12CCD1708B784D8C3B09737772C7780C0','','401992','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5350ACB75F9FA498FE0D2A371649C9FD9716BDDE2C32F5FB','','13634','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','85E53280630956C58D4CA7FD8DC5FE73C9A2A03314DFF294','','45223','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','391BC8A81D4EB6D526BAF0DC3468CAA36C9207B82E194B7A','','130380','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0F88FA5CD9B9950F850C18FE76C948FF43CDDE3E75638FF1','','17938','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','EB63FC60164AFF92726DA658882BF1CE47CF0BF6C80B1B97','','690106','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E30B2494142B416BBE95DA3DAE4A82CBDF3A020715F10E8B','','4011280','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6CA1C19D0E9191CBC9CA3D5BC3CF1D19764D8F17C6B54AE4','','59620','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','4730B7A7EC70544A688211A5C754C357A090116092D3EC4D','','682378','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','10000022','6','894644894E54',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','713A7B79619AEF3C47E44102F86EDCE0D6AFBC5ABE87F861','','13538','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','575F1C6AF7C71085C7D9CB2291844D9F2DA3B71391C0B941','','36907','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','296F233E4FAC4CF419D5FBF2701AC4D5AA0866CB4D0DAEC6','','3045976','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','933C1A228C99E35DF309838B25B7D5EA3A8E961E81D81D32','','673194','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9EC125252C3738478CA942DCB59030097194B284A9162B32','','59620','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','6665F3FB8DC6BE71C152C3674B5783D6E57FE8BF796D190C','','3634252','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E120DD63042FEFF9E7FCEC0CA44D2544F03C5D4CDBA1C008','','12985','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','09BDABA6CB17BE561B4104124A3D0266C858D194A8765198','drvsys_mon','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3AAE69E7088E4060EA32EF95E9B6D9532460F5B84EE4EC80','','684876','29','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','990D4E1C2D63C8E447F034642686D57B727064E3EDE13B00','','448500','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E88F31BDC5513216CF3701CAF8BE954CCC7EAE0E7AC7D942','','594348','26','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','81229C1E56FA72E01B52E8CBB8BB5F55ED48A11B72E7729B','','710554','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B4D0CDE7D53493A1549328F711013F07DBD3A9BE88DB2EF9','','685304','44','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D6CA6F94FF248F722F97037C1AE7C8DE0191D5F4D1E3A5B8','','156','8','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','9C9DF1E868BB33D43676F21096C4F75759C0807096EEB886','','60648','56','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','1C79B3B5A74A4F09A1FAE19BB15CDCF26B5F917861071F1C','','198','10','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','AC1AD3E831A4C758858350A8A197A24FE82583F4B0E39A85','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','56E4980485E3129E94F370E7066E80B07141C4A669B9FC0F','','672746','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','C21574305E0377A3D2B72D1E1546B9D62DCFA8B1A4405F16','','3638348','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','AA74121AF835978BC1C1BB402A8B7388CB7C075C1227C253','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D6457A86DFADF9825D6093090AED2A807FE7DA6ECF5922AF','','3065956','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','1BAB7E6B5ACBEED8F54B667EDF13A385B9E146C0C50D9FB7','','448456','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','7517484','7','7518683B010000',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','01000FEAC61ED76FE04ED1169C40289D96C71A1564E38FCB','','690106','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','F095338ED87C658C916CC604A427F4ED95309C4A07B7898C','','34176','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','800E120187DF74A231722FB887B3944AD16A703FB8CB9D39','','28920','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2CFCE981C322A54724E1418B6A6D1896B95D584630EEEA43','','38300','21','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5081862','8','6840AAB600C60200',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','481751066D6C97AD5EE90173E8ED107BB1C9FD873B0CE55A','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','7FC57D49535798CDA7E4DC5DCEA2E085AAB9A68BF7F9469D','','149','5','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','33357C112DE0195F013FAAC4D57AB1BE77417934CE03A2B9','','3766400','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BF8AC678DC3CD354BADBFE46C9173D34CC84D13302190EBB','','21826','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','4E2F9721D52A7552AE2728B9695F1523DD62DC0569237C3F','','2299108','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9F015E7D8A11F30AA1954D9FEA7142D0247E3C09FF2BFF72','','12194860','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','1EB5AD39B94DB5CDC3294DF49FA589DFBE2C674D07E4B211','','710730','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E9D67F07E035A64B89C9E91614DC1930FEF61DC3A5C1BBA6','','690106','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','36411C2FF2C3AC51B7F6A6B8DF61DBD4E5895C27438847BE','','59620','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A77F30CBB8057E0DB37782367C8462FA98D4DB21DE936ECD','','3049492','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','7452688','10','8B81CC07000025000000',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A8C806E1FB7CA3625E6BB6F5E4D9E2BF0EBDBE70BA7226F7','','3049872','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B3DD04807DEA2679045F4F197BDDAED5C7CCEEFE19622B43','','360508','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B075C8B4D8C5D83FE703677319491DC816EA5103901B44A8','','682394','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','53DB506C0341B50BEA3897E2E3C0DD74C2CA2D8F5F34A2E4','','59620','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E112F38956124FE0F48BF569F5E81B40E293DC6E16B544D6','','17282','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0363EF2B1AAE09E6C2B1FA555E706F4EE094BE678DA27598','','3766400','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','EA256F01B6340C99E27611B39C5ED28CF2FA202436F0972F','','49564','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A86C95C4E58495A10F5F1C9B5B62D3365132E8DC62863E8B','','198','12','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','56DD8D99991F83AFA2E169315B395BD388B248340E9C64D3','','30044','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','684B23E010C3D6B88CC12BD9F0B6B0CE00D692C71BFB84A8','','28940','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','83AEEFCDF4C2E80B18DDF93D99120A89F916C19206D257AB','','668874','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D68651921F5CD387C7E860FB7C3B143409735748E3B2FB7F','','682394','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','A4D501A9DB9D84BD8695A8BF61FC853BF434D2D4B352C7A0','HideEx','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5E77F12C032D4FEF559F9B837B85BDB9D95ADB10C9F56649','','448504','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F08406AEDFA8F19B6FB7C9ADDE0BFEE82CB0D2E275593150','','2303444','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','AC0EC72522ADA5B2BFFAFAC92D6D0A0225E1D5C727CDFFA7','','672602','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','4D1A7D1C88AB04438510E3255184E51EAE2036BB09DB553A','','700714','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','68BBC36F75DC763B573DACAB1D6D8F70E667638AA894BEE9','','717898','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','2AC3C23FBDE2C1EC46C9ECFF71BD7F603F17C9DFC1328D1C','','3638348','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C365E9FE00580EBB14EE863A5CE3C8139B1A59A610520AE7','','3766400','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','DB2A0451B9753100085C9D149B61CE47A195D77C8B709143','','178504','96','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0871F69205FA62C74C2DDE200A3911FC3E41A4FB8BAB9817','','682378','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0017307F2FF889462B0FA06018D99EB1F847F189B6CC9B99','','21826','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0FEFCD6B0BF8C2816A9259AB5FD7B89231AEB8D92DE53D26','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','87EAD79656133B3183C2E452886D8F00C5EC6C9D741673A2','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','C2B6C5E19FA98D121B2CDE51789BD2883A324015E7D131E0','','710554','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B6F3A7D557A3E3BC4833C3D9B6B0B0609255591CC8AB3B65','','3022016','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5283280','12','558BECB8084E0000E8731DF0',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','AEA87B23CD9463E9693B6C053C1D9030F8E229DA308DBF29','','90202','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8C16C7E8EEAD49AE67E4E91E229FFBCE2F6590A48348914E','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','7B2DCA97CD348E45490C288EADE9303CE270CF57F28EB1E4','','690106','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BC10B10BE398F2397FA6962C4E59C8CF11FDD7158EC222A5','','29916','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8E53EC1B8ABE90C9A5C087671DE0A3007BEA4488EE5415D0','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','65B5CE07A794164101F7E379D21A7A544EF1EC2A3A39A2D8','','27270','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C6C8597824F249180A53196699421ADF7857A5C4E4F80D6F','','13033','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FE677759E719178BC5CB49DA252D9B635F76030FC4C9876C','','673194','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5265823','5','72118B5518',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','BA2D161EF412084B0229A08E64D5A445C4E9F9F2645535E5','','706314','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0174B647A535F206711D3EEEF08D3F421BCABD7016A2F103','','17282','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','5F5F754FD6E7BAC9650B715387646CF992813730A2BA37DA','','2303444','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D2CC7F98209E9A9BBA483BD1E9A916E40EB971EE2129AFF8','','3990720','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E8C741CC79005898FFD0026821F61A2E4E67C695C6E1CE1C','','198','10','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','23B364A9012EF40A39EC4D04A91F9B60FC7EF7D85E3F240A','','18680','35','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C9363F808D37F13FC09EBB7F700AD09EEB27DA046E41FD52','','36907','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2D92FC5B8603E18F50D9CAA0922F5C7BB89E42A4656ED2D5','','3766400','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','EDEDBC5B1A3D92D2A91192118898FDBF840C967C82968D70','','3045912','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','BFEF06E80472106B57B15D711F94A25243F6ABA7FE354C95','ndis_x86','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FB20B0EB9ACF571FE37C6B69CBE86F7906F96B996D7E5EFA','','2303444','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','917AC1C48C1FF354FD594A3705C70A2C356FE981275E7FB5','','22792','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','48CD29D8B39DC07B0FD071FD8C643E07A8FC2C9AFC2A3083','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','11154396','8','D893FEC0488C11C1',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','FB13A8360C8E23B83ED7309625A7EFBAEE7DCF737068C5A6','','174688','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3C8D85F85ED5DD0354561F84EACA575123DE05EE941C28D2','','56063','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','FBC20EEA52B5882209BC016EC14818376CA7BAF28780BCED','','22792','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','210D85A84F7BE48F3EB427E0CBCCD9C146320ABAAB5E28D8','','41096','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','953107F9F718795B6DF9E5E5BEE0EA949800CAD0EB71F891','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','FBBA36D0FC5434D12EE1509E148FF908D51F18719CCBEABC','IPSect','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','82CB32BA2A05B228F2F8D0313C185EB6FDC50A94340F40C8','','209352','75','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','079172B91B1768A2650A87BAB06AF700BB4C9A0B5E5B983B','','17522','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','881751DF112F817E799953E00E94543DA4610968437DB7C6','','12194860','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9A47B274EAAC888FA2007B4EC0623580365458E3621CC416','','28956','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','77344CE014111FAAA66DEF35B670B2E76AE878B054F85285','','61874','42','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0A74CBD8DFF245DA5E8691C1174F037D7ABE823E265226AB','','685656','44','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0E13ADDD413B679E2984060D929440064FAC308FC2B90742','','3049872','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D0D8CE5001596C6F4A766FE94726FE7E337F42469CB96CA1','','3065956','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','313C58F8401B47F716B220B88411CAD0E85966D95B301591','','13033','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','ACBDC68A4D748C48ED1180DD3DA52632EA6FC275BFC35D5B','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BACA83A742B9E09CD07787BC6B50389707EA94C41886BAD0','','448504','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','549B42D266E7F17B7F30B72E301A9CB3C5E3865DE9B7E90B','','60648','56','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','86DB854557D75BEEE7DA820FCA15669B08C760E8B165B06F','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','02D5FBD9E30D43ACED0EFD00CF16DAA69EDD262C292136AB','','178504','96','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B9D920131EFC38767012340CF0FFBFE154DBA28E6EF3B859','','61874','42','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','96E6CAE70AF690F5D552E0948C29CA9AA527DEBF9731B16B','','20512','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','375B22B4990997348A8AEDD53319897BE196398B4F1DBAC3','','30012','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','932F4622AE9F1B3990900F1F88375FA1DD7C238F7C6133C6','','684876','29','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','43583C7BCCD9DF14C64CC84710BEE44DD30E199F579890AE','','3049872','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','97CF98F0BCABA04BC2BAD40FBD4EBFB3C1FD8A7139D5C9B9','','433168','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','97A0E0F8F8ACE7F1E6492DAFADE8F45B366446E79C1B0419','','3049452','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5284488','9','7507C7451400000000',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C3546D16052E0DC1838E7A6E18936B88CC8A40C2AEC0BE3B','','21826','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','4179D6BD8C2F11AD5D5C103A7877504074009AB53AE4D8A6','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2C360CEAB996C8D6E5DE3FFAC30E412DED48E7814D1CE110','','20512','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6F1486BE58078BD453F1B249947BB99CB8E17E9A355CE024','','41228','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','924F4631DC3167BCFAB02F92DDB49A871DA0C55122EF9EB8','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','411029C5B28D942ED3C7BC1F4299162D874838A661410894','','700714','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B9093BAED730E86AF004119B3B7258938C56902915C2E8BA','','501956','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','63BD2D7FF6C5442795361031E5768C396A37AE38AF98DB11','','668874','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','754A2FE56037B971E128FFAA669032C511BDA3A62524CE03','','28956','12','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','9AEFDCDB62EBC2DABD6CEBF8C411C1145274FCA7CED890CB','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3AC57BAC3B782AE5ADBB899CCC060D4E8F66E5217F7DF654','','676970','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2F0D9702A58D6D5A8599529A0A816AA101AFE581D98416B2','','56063','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','77804219E627B4D38C9F95194301A895180B598AEFA9963F','','3022016','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0D1B99EDC8E458705A88E72F7FDEEE9233DB21290A0098E6','','149','5','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BB795B4069F985BF44C7418DE264C3B0E9BA6D61A116FF81','','90202','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5A6EEBA1E6B9EE71BD4A5F63014E9928302C36FC806DC796','','3766400','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BA5777AF7FFF3895935669878D662B585912A759A2DFCE68','','24812','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','5E690DB1AD8910886334158C6D4452FA2CE896634BCDDF40','','580768','52','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','42A8F651F55F697E783ADA1959A2833276F970F1EE0410C7','','41280','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5296496','12','558BEC81ECE80D00006A0AE8',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','445A6894B8C1838462D7D0D29FBE6BF815B5E6C344971349','','31924','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','C010786A38F396503B7411FBADA0C1A68795F54A7AAE228E','','679578','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','E3185EE4428291F9D2E4080C2EB1B19ADB005AD26EF0A993','IPSect','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','7739760','11','01BE80000000E805B6FFFF',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','1995FA3235ADA4B25232DC6403E7463A8D1864528BF9FDD4','','12905','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5124558','5','8BF08D4608',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','30A26827798B7F1646003A9E846E8A9A8FF10A9DF926825A','','49564','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A567BBE4CA9D8E976083024E8D68903CF15CEA88C47C9961','','2299060','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BEA7165D7DD8E24E31B1C3D791A47A28731E1BACD1189A17','','24812','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0971A7CEB84D392670C7B8CBB61776762C25259D8E772CA5','','13538','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','13200A59A28561A413FADAADFFFE4521A209CB691EA199A5','','690106','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5090917','8','E886EE1D0083C40C',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','56CABE081991356465BDE1DA3B8DED099DF9B6E746D1B531','','25724','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','F98469C704F8B8ABC1A251EF8FC1E4CB5CEF1E007BAB5EA5','','57602','42','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','6A64BF5AC652747B47E0B8E6593B7EEAC1EF38E0A84F4F5D','','3049452','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','978BCD17BC9C81B05A2F0A50EC2CC206EC5F6AB1FE40D38D','','28956','12','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A28EDC898CEB14FB52591754DEF981C7168DD2421D0742FA','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','35E88DF07F0D48A0B7ABD53F4865DB762E6935529DC826DF','','360508','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','BF1FB7E4C3CDD5D5A93AA1B24FC822AA5537DBB59F696818','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','343F1AFF6DA7A967D2DB958C608A6E2A19F83E862F8E3954','','149','5','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','10694516','8','2F549A416F12033B',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0B008034F97BD411A9F900D87578258AA1B79873850BC12B','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','C5A35B72E6BC604BAC9AA218908B3747D6850769CEA79C0F','','2299092','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','FDDB2AA7F8884C8E3A7ED646B3E9E4AF5A8C0704130C39A7','','29852','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F57343CEA7133DE6469B1CFD1A749845D553B8D806B2BAA4','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','565A63583AC736E3CAFB95EE5AF9A64D3A7D3C3A8B234121','','3045912','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E26CF0E2ED92F608A80733CE703D7EA2C3DB83FE46182519','','3766400','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2F44EE3A34EFF98303B3724005EF3A8AC89CB25F9CA1B8BC','','12985','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C32F7CDB33BEF7B3093262F89263884DBB44E57D74D646B7','','12985','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','2357AD2012CEBA72283F93460AC5FF55E4E5719A5AB9F5B9','drvsys_mon','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','1C1595A1A64016D8725619CBC2FC7ABD41835320958A97FD','','676970','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','DB5765A8B8D5F636D619E44669E9D3EF968BD8011C5D6999','','36907','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','70B78734AC394D83D45427E0B7C88351E9BB108ED59C7E71','','37136','40','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','85F2A5072D2D7557155CBF5157CAA460B19470DEE8AF96BB','','22792','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','4609669','5','8986100F00',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6C33FD80565B2860A76C87BB772E794E2FF444D813079A2F','','685656','44','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F09BEAD15FDEBD09240316D9E2E736028B54972B13F14E5E','','673194','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','302E114D921D40EE54585BD9D63B9BDDFF7A2BD4D678DA97','','30044','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','24807D7810C58A4B9A070A21B8AE50A0385DD4B4C6BD8B6F','','3049872','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B6BDECA858773B6F995AC6496923F5D0CBFDB1F76DB29C58','','198','12','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5296823','7','75166824020000',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C125EB3FD1B222ACE1B518959D96C5AC83EEAF109E9C6D20','','12194860','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8AFF28C3E6367B10340FB963B093AB52E61B267C541D5659','','2299108','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','734D3EDDA69D9DD307032245FA0806456E2F02E90C2291E2','','36907','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9CB5A848D90B7FA4F58801ABD8A68EF8FDF8C602063C2CD6','','13033','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','C8BCF785F8B7118D0270016E620E2C3DF6802E034471E5E4','','3033068','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8FB282098C8BB4EC10C8398E44C630677C6E2785227E31D3','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2381BB2B613C58C364E962738335EBC2F3EFF81009DE49E4','','37180','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','AA2A24A7C90D149C7817640B0D2D46C8A4B4D52146837605','','501956','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6815D749CCA8C1738A5F3236A737F0B70AE037E82D46033A','','448500','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F9F131F27BCC37FEF638FB8EDDAC29400652020C290D4F75','','676970','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','319CBACC4CD2E1F54F8C8FC41EF44A3A9C492A652B00C622','','18700','32','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A4A7DB31BF51180F1ACFEA6C0E59AC84B43D022CB4BB817D','','2299116','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0DF639ED45B0C578DD616DD191014727A3C22C346E9FF73C','','50040','26','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','72944B7FED63C1D2FC9D2CF6A07B5788731BE2B02215CEE4','','447736','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9148E18CF9213B25197C247F08CCA4C0DC60FEA73E3A247C','','13250','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','ADA39A6A805BDF59271BBCE21734E8F28182164563CA15AA','','29916','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D5C852D85FA4393D027615506B7DEE07A1074AA4633019D8','','41023','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D06EE8DDC2115E5895E96D26A2A2F11FC566297D1D21BD26','','56063','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3AFE3B981D50B26FCAAC9DBE5A4BCB24F5BC3E9348AAA04B','','25724','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','058E826BD75C26BACE712DF9D67B0A751896515802E9DDAE','','501956','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','6E4C9CA0F7140E32D9284AF2E0EEB76419696771D4DDE887','','3634252','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','29E43B1309ACB344AC777636BE838F0BFE6A04570B7FB09C','','700714','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5B7AC53977D57C5756A2F61582DD386EC93F5FE180FAB5DC','','27270','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','22BF8D63A306178F368016E4657CCFCA5B2B21EBC90B8DB2','','50040','26','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','1E8729EE000CD5BD8BABC49C368E0FF5AC08BC2B30921BC4','','709322','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8A1304B9AB2579F392F92D8A592308728EF76B26AE258A41','','4011280','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8A90AA547378BD5930D24FC415AEC08EF52E29B22073335F','','710730','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','4BBF42A918109CC23F231B8E657076A213601AD681C032D1','HideEx','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','06D9E92AE3953D13A0AC5FA31EC24B16C6A2260E2D32BF8E','','41096','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D4D3A9950FA07FAEDAD0658F9128007ADE282C043210A201','','683146','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','94530FBCCC455105E8BB67E5B19BE0A4534A6F39A1201B52','','13291422','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','4198410','6','CCCCCCCCCCCC',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','2313AF1E20F446936533F9440B220BEA966D9EB3A0502DCF','','178504','96','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','F982BFDF01EB3BC6FFB70E897BFE21376232B2EEEFB25E58','','20512','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','26308A71C6F483CC7795A01A2F2CF7E7EE97787C12CACC52','','2299108','33','',NULL);
+
+-- Warden data from TOM_RUS
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','7452688','10','8B81CC07000025000000',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','368334F9A3A549DFD3ABC9793E4EB83E837AA43F010354D1','ndis_x86','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','5DA702DF95570780875ADB4C64259E887CE0A867D9B67711','Afd32uu','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B51E8DA25AAE556552404F5172642D0808A89E2AFE870B23','','694376','44','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','4748EAC0350B1B56D8549157AAAAF4FF35438078A7E37AB5','','34176','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','FBE20B03C75572D992273F192CE72CE78A65E6764BF8E6F6','','36907','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D8C1B9DEF3CA9CA59C5B827F055729B636FD55BA6242F9F0','','694376','44','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','448475EBCA685E5A4ECC5F810740C9181825B49613CDDDA8','','477928','60','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2AF2DEE0CA5F307895E5773A083AEB862EA3D5210E037F06','','41080','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','1708C050FF0C98DE59FE8F070273D80F9C1A612D336AB9FC','','3049452','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','ED6BB184C9DD307229A023C1905E6EE73981D3E088D69FE6','','676970','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','EB63A86D51668323A18AE2F8CE2BDD1ADAE57375B5F76C6B','','45223','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','5837373EE8D4CCB5687045C04A4297450ACDE774FE973917','','673194','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','65CCA5E079D38DCF32053D8DEE6C5ECF88E6AD8E1CF5379B','','31924','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FB895125A69DE5DB112B4731F6216668EB09C4F57943D85A','','706314','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','A388E8CE523DB7C3C501AC5DB2C8AAE58FD1831E75665C48','','401992','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','77C74B5E4CBCA9150FB64261E497AC4E7642A316C89B291A','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8A2C4F7F3367A4648744D8964BB9A6833182ECABFE015B00','','3022016','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','4609675','5','5E5DC20800',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E8A24A78E6A716734CC666B48263B424804A42155C0BDB51','','18700','32','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3C881D2F0634D9223A36DF5266A7CF36B503DCF424441FA5','','28928','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7B3D92577810CAB5DA0134FDDA91CE6F36003C5373526774','','41023','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','7F794E0811DA99DABA76CD9925B3E78045425E32880F05D3','','672746','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','08235E08E4F83DDEA588D9FE32BD084FB26BDA6DEBB1E416','','668874','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5EF7C22867612F48FE5B41E219A1CA389AE8D32D8F0FC46B','','21660','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','C7C78789911D6B30FA6E67198EF03B73CEE37576AEBFF5EA','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','62BF4E6440FE3F28138094B46FB469CDEB35008DEB652B8B','','3045776','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E24027620A1723C203E8084AD6269A852CD50D6F79D50530','','36544','55','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','49CA50FCF2699AE5F4A867156A5D8053C4239B36DACE170C','HideEx','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','073F4A76F248FE7C38F799437D475B9A2E9E81FA08B0C6BB','','17666','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','6ECA7966F2845B9B61C6D9356E4FE4C913FE917808C8AFFE','','684876','29','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','30BA488B3964465B142E75F6D1E1BA42DC9F489C3AC70BDA','','2299092','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','55492051D368975D444428D6218A7D731555ABF7C3391E7D','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','94E0CEC4F7BDE7844C4D4ACF62E5C96ECF1D11FC2169CF8E','','433168','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5003A599A1162170A30F1906C0AD5B16DC7041E72D28A4B4','','28956','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','686F700B2223502053CAFDF9977D8774E905E76B8C960E7C','','3049492','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','F5A776E794B34ABBF93CA93E9230B7224CA088AB741DCB57','','13291422','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','4A67D56DDA6B0E7D9117CFDB17EC6572E68B9300609FFE3C','','28956','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','1B695DF78AA0708221E0EC2F5A69AB7078ED8143B2EAD174','','668874','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7C8CD40E29AE999923CD8EAFC233E619C73885A0258A6E3D','','21826','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','73407824E9064DF5F1161A204A272A9CD69026EB4DF1004A','','29916','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B21609972E46C9BC8C6A77A18161A77D0C1D4001DC892DF1','','41080','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BB66A6AC45D02568067987834ECD8BF0A2BD0DAD06D12753','','17762','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2550EB7C358B7FB86FAF0EACDDC3111118769F448D93BF7A','','49347','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B6E4EF9350CA859576DB74D02C115D5A19C79AA58B0F6681','','684876','29','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','451D2C8FF751743B52109FF5D95ED633DDBD8BCDB80EB7A9','','17906','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','4A0161A4E5D50F11F58E1B23B281ABDA106625E3DC5A179C','','685304','44','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E4F21910D4B5D3E7B5461ED384889F6D0969645AE83F7601','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','B9756E3E1093B54511AC5A7B85711E53CEBEA373EF4866EE','Afde32uu','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A5AD6C8506004101E42165CD95051A7B5F13FBADD027461B','','710730','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B8AE30A02C59219D144EE95228C6CC9F99916F6FE423C940','','700714','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','DAFD84BA8F977F5CFEEC9310C0EEF8F949F8EB6B827EBE71','','3990720','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B42986974893A82D73CC497B3252E9B844A11A99ACF46BEA','','41188','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','11287980','8','04000000903C9F00',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0DC0953AE42E913121092DF17BC2BEE8BE133D1C53C8BFFD','','17762','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','72C81E9BA425C54DE57BF4B7745D9C8D6B44D56E8FE933BA','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','100426CD22E80090502AA7A087B094B49ACFF4E7A09773ED','','30044','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','46C797D1E60CC458E6C9D874650B996D10FC52641C2E7AA7','','676970','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','DEA2C8A5775AA8CA86B8241BD418979D10DF4587E8E95C87','','250','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','8807783067F9FF2697A61DEE925760682EB894C6F0A798AE','Afd32uu','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F63823A1F60619FDE6B4D6F3915EFB03EC03DEBEC82AFB9E','','673210','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E4DFD66163F2A65ECDD2EE9CA8062D707CC51882336F6483','','130380','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','88182C96807A6025E628C90CE436C9EC54EC5FEC858A12B2','','690106','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','EC322863C90B861E66A0008554BB8702EA92E1406F6F1711','','3070052','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','9C851C7C05E54E5514E7BE038ABC5C669A3F5747EC573333','','3022016','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','11154396','8','D893FEC0488C11C1',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','46D70E5C13F6D16BDD01A7481D9AFA51B73202070CA5D712','','673210','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','CBEBB5F6F4EFB1324D17AB6CB48C573B639A37EAFD6299B4','','683146','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','684575AAC0D8BC30D5325D56D3D522380E85ABFF380FA80F','','17938','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','952BC8983C2CAEB6239BB2774F176A7F87A9F2DC10261205','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','4EAE0459E341062DB99658136D494BD79511B883F00BCE6A','','57602','42','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','67E6E0A4006561DC5A67026886D1FF37AD14C5AA1AEA3CAD','','149','5','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','222FE6B0A70CE2CEE633597E018706B3F78C338D96F6D9DC','','38300','21','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','79747D68A5D6CD203671EF43029F17591E42BBCDB60B8B93','IPSect','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','77ECC7613D44E56210F7CCDD6046226B41C8F087E901C94D','','682394','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','77A59932BC8D497D992A213256ABD52C4D5F4FFB8A06002E','','49564','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','2D14DD3BC859535580D8D9DC3BE7D59865A4E3FD112598A5','drvsys_mon','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','9B487CD5032D00424A24FF3185AC4C17246729ECCE431951','','3049872','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','978D8D1F3E1EF11CEBC4B65B13F1C5CE6E9E220E71B255B9','','13033','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','1F5AD2397EB3CA814C5D156C6777C040F5D73085F3751C35','','433168','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','912807952F9397C8F2B718C9164424D720E4EFC681DA3099','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','095F1A232F56B3DDA3338B5DE2CA310E5CF0EC0B6F72E87F','','17890','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','2A5E27A3EE36254F61795E168A98C055772F88CEA5CCD6F1','','3033068','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','4319BA4F2139568E87BAAC5F7C95121DD98D710B1C901E2B','','718842','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','74E55BA8CDEFB5BD54BF1C0B0D326721D756440BA33C3ECE','','27270','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','ED9FED6EE63B6C5E35C9E4615AC444603F6BF1FBC669D8B5','','13033','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','DF967A96C67C8D6CB1955D1CA06556F37EEFC88D26F1D684','','90202','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2BDB1F4509561B2F846AAE7A5354008215C1EF4BDD0EA1D1','','49347','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5124558','5','8BF08D4608',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0F3B3F0934C1B1E32DC9F83F67308BF9CFCCEB0EFE10B2FA','','672602','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E89980FFE6987D22DF5379283F53DA8DC3B5CD4862BA22C4','','335122','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','7517484','7','7518683B010000',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','4198410','6','CCCCCCCCCCCC',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','156B3F2929664A16C3DA2D47CE3050B3A1BC32F9C30E4776','','27270','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','65B03F581DEAA68B6A07C679C6B620A2623FD83EB4C4978B','','28940','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','044C63CB9F480E28E02D68426C1F3D69BD146B39A7F081B5','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B3BC7201BF77B362B943C8C13F9E70A751906F304F9AE133','','673210','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5417948','5','7734FF2485',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','7246064','6','8950108B450C',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','10714892','8','BB8D243FD4D0313E',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','4783BF04A6BD423D63CD955407780BE0E15A70BC2643F853','','28928','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A71B471FFB4C58A2C99FC6818DD0269C4AE4C5686D5FDA87','','690106','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3EA0347F1F7D9BC9CAE387816DFBE4F492F53533400315B4','','17762','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','10010636','12','8166443FFF1FFFD9565CD95E',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','AA5ADEE929B0B2FB655080B35D19607695F611672E6AD364','','3045616','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2DAAB5C524CA576967A7B0B713C1C34DA8EBF3990A86730C','','28704','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D0042CAE82A7121F7783A1382F542074B34ABFDF50A1B13A','','22792','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','4D30286AD524AB2EB05C1A361A81036F787B1C0ACA36DD74','','30012','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','03F9E0F9328E7C7025C0D5C59585700F19E29E8C8F9BF5B4','','49564','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','430C4F44FD7CDF1A51F7A8FA5852ECCDA6CFA92C2A6ACB3A','','28920','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','A2886E2080C54F25867AEDACDADD8F5175545F44512A3B58','','672746','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8438939BFCD0C550664ADE2DD75DD15FA23DC435EB5FC011','','3638348','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5296823','7','75166824020000',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','66480AAA84C5C00B64EEABE96DD21EB3773228B144E25D0E','','20512','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','76C1B0FAC29E4E41FC6DAC31A0592CB0087BCE0D052904FE','','61874','42','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','DA219765DA22ABBDBE5486CF7DB01C283FBF9986732C9A91','','37180','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F58BFE40291DD85F45C47E0E255594382DE0180AAE1F1FC9','','149','5','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8D8A305C43A3DD47DE550F256BD5F4B1753EDCC079AF279E','','3070052','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','69CA60928A9A85D79ED39596C018DF899BD14C6219EFE088','','41080','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','8D9AA947B904C003D06ACDF4EA0C84104612B274696999C4','','17890','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','289CBF469FC750449980BFC2CA6AD7E42A69E14595D140A3','','209352','75','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','49961CDE71B612E5432EAB389E7AD193476E05BB2778B751','','700714','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','43818F9575A04BF426F4BE167052859015CC63622F7D4F3A','','672746','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7828B55FDE24719EC377E29FAE55BA6324020D00CD42A99D','','360508','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','5432916108AFDFA313B6D88C886D87B5722E43EEBCAFC627','','0','8','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','106F24060B7A4FC87A7971A4B0EFC1021F7181A09598C336','','17906','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','13AA99805639421566A2652F0A7104939EA52EF0F77CFB03','','24812','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D0938B578EC70162A30A25571CD5DC7E765780F6191EAE1B','','710730','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','70FA2C3749960F1B0D881FDB186DB9992D6EFD30C6674104','','580768','52','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BCA2CC6F5740DEF5D01D314146879036A5B6965C01424B0C','','45223','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','47DD279576A64BCB3A4AF23D55895600C73BB5C214B70AEF','','3049452','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','09C9B53C215456866BF764553A7B7E4F1F20F33A8D2CB613','','3638348','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3EC2D3876D82F424718D3B8E0B87562244C3F5A11A29F0E8','','682394','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7B4E9BBDC89694CCAE5BA6996D4240EB2E0C9C7F03CC5D40','','59620','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E2333772B05ABC620076EB66CFBB4AFE2313CCB6D719399F','','3065956','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','2EB4C04C0946264F5BC8EFBAA832CA97381A8A6523BAB093','','178504','96','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0E3DE8374276C08D5DD241ABA2AC0AC1D2319F5CD22AAB52','','2303444','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FDB8DF478DADD2E36619D63D04D106EDB86EBF8FB9EC8CB4','','3000288','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BA76761FA5F569497047C3484FBC6FDDD8AFA71B96FE93C8','','24812','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2496E15413F7008A01FA53AC109C01E45B80BF2C3BC2F205','','56063','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','CACB6383E8613E41489D93D7FE7235BE61214F9AE0825F44','','13291422','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','931C403D2562AEE58EEB2586D73D51323A3A739860290AA6','','690106','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','1A95AFB270B9C0D170E7280816891492C21E87D92E9EA6E5','','433168','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7483929857AE7A16C2D9EB0857EB1D5E9477479C2EEF0B5C','','37180','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','379E1F6905F203E1026DB54A58AF588EF5726D9F50FCF369','Afde32uu','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','08394625CCD77F36897EF283FAA0C019EE9F36775182584F','Afd32uu','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D9ADFC0283E75A86A3E1672BF50F5D1AD8E8466AE7086437','','27270','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D37F6219417C0E5196D3A4473D57ED767E6D9B49BB2B9555','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','93AAFBD4B8B50D6AE72F3BA7002D76791942D0EC0E61253A','','41127','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','F9B132A5E1FFF379EC7175C12A58683C85272CC96E03E161','','41023','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','1867D3CEC9379D1E6B8A1B9B667BDB1B6084B02ED9A60864','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','86548378A25632100F7E6E872ECF4D591B7542D977B623AE','','3049452','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9E00F6F9AF1D63FA2628E60B7BF2B1D63EFDD42D69929A73','','41080','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','7DDD4CF1352822A1F9D19775498EE865FABB26C69F8FDEFE','','209352','75','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3D793384AD147BDDE98743EBE1E943263EFD6CAD542E2757','','17522','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9014AFDE93FDAC6C20971BEE76898FBB300A744CCBC24DA1','','28956','12','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D1212D7155D2C3114DA596070139C0B3610597CA0CE1CB17','','149','5','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','BE18517661568A9D7F3CC9548592867F3A987A705866F60F','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5D833D8DF05A7AF50DF945F5AF6880D325AC52B3ABC815AF','','41188','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','1AA3B0D9AD368562F181E4E5D498652B3859210C126824D8','','672602','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','331E027A700CAFDBEAC9E80B68B8304D0895D52947447448','','501956','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','8E704337CE9F823A8A93947130ED1EE14A99F2EDB5458B94','','12194860','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','BB1C818F79DB2F1FF71B7CB181021EB4F425311D09DAAE81','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F1AD484D3F189A08EBF420C235D16ECAF1B485092FB063D6','','3045776','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','1CF7028BE4D68B7AC6BB8061BECBFF402860541D04C90C0C','','17906','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2550D8249054E57086D4F4CF80396C686A71673C070711DA','','17890','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E864BD00AEB4F3D18CFFA7AADEAC7926A9A1E3EA7588F17A','','29884','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9E70338B4C8C845F8514925463DB624FC4423F9C467F5E62','','685304','44','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FC5EF49EDEE7A5268395298071BBA270822547A7416AEFB1','','3634252','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','10694516','8','2F549A416F12033B',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','8282F57B7C3CD9B449B6363D5C9E792C2044EA2C3F381F9F','','17282','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B793EEE20E44B2942C6522F79343C58738A1A8489A381FB0','','24812','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6178EE9E575927A3505835AC88DA31BE15F0622DA55B31EB','','28956','12','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','7BFD2D88793D6AB1A2351A3E8873B1E20CF44BF6563A0930','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','4102F13984A4E146C134D3F607AE7CA1B3263A22B52308C6','','447736','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','EA1C4CA2A64548757BC2ED1C5BB6D2B5094AAD5B5C331F7D','','683146','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','BEB42A9DB2B656B2DFF3DD7D1B8D87033F1D99A019CD4BB5','','3045632','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','4E209437251EBB0CF31CF8A7CCF2C873A4D759B9563D573E','','34176','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','85EB9C8A36B32287F096CF73F7FAE8B57405321342E9B779','','17666','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2EDE42629DD4A72669FFC9BBFBE15F357BF241853DBF7B2E','','27270','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','FF47A1D9514F4DD81BDA23FC9018F03D894F9096E26EF809','','18680','35','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','65185BBCA1D9995EA4B796E908B9F78923FDAE2D0C2500BC','','594348','26','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BD55E51B55A8FAB82CBF45012D761B1BEEE9BC0DAD8A83CD','','28920','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','AACC3E694ACD478B1F99714734B5A43BD7D7A2A3565ED9B2','','3049492','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','4609669','5','8986100F00',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','F3C07663325C5358F58A547725FBDF8DEF591021CD94513D','','685304','44','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','503B5AB938616DE7672103919957B421FA8B6C98F72375F6','','20512','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3B6EFA3FF9443BEF4CBD2E7CAE08DA1753C79E5EDFA8510F','','37136','40','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3E5D1B5BBAD191442388FBD5236F5406CB2CA68EDF986328','','17666','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D8AB51DCC7840369846821B2A6B229CBA2E42C0CA566792D','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F8004FA24C4925FAA3ED4993B0D457C5E4C5371915BB93D0','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','EAF4A696D564F6BC800BF0F6D732E4E92B50133DE02EE8C4','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','30BDC2BC3E4A2055426FA0EC67DBDEB7705C58047EFFA4D6','','61874','42','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3C8BCED97B2F9E5A52587E725004E136DED2B53AB2DB9D4F','','20512','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0B586F15A8CFD6B7A96632FF2B48D0F71E9D06BFAC174002','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B2B3043BF9CDF3DB535D52ABC45BE586E6B8097B58D82C45','','17890','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9ED22064CDACF86DAC8C365C325EE428A87B628D137E038E','','28920','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','2254B046D6D8D1A47E5F9275474B5EEE7A96CD99E8D952E9','','682378','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','0A268B6DB28320A1956B54C36C61C625B02A48A4768A0823','Afd32uu','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','41B3450DB8D10C506A561C7B95354A7792286D837C08B437','','12194860','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5CEDF5982800D9C6D16F9D357AEA17BBBAABADC8F3A12EC6','','45223','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3399D1DE6156FDE8614333B6C4AB0F5B2354381AAB7AF818','','3049872','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','31DA5322A7B1F1715CA35F0976C201122A76D46A719F0C28','','335122','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','36172791F3ACC5EFD406A7AD6F5D218279B94D458BDD60C3','','700714','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','C64DDA3E5D94BD0DEFEDDB867DD304177B554C5771CF4DEF','','682378','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','701D57AFE1315795AFE1340C35E923FE69C36EFC670C0BA5','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D55BBE3C196C2FE07829CC54717C0A2A27C13A38ED4CF582','','30012','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','DAD3C22D23FAB30C9AA6796E19EAB23CB7DCCD639854C14F','','3045976','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B3EC9710B55079104420F126BA7257F8FD7DC39D46880E5B','','2299060','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7762CCDD012D51167BF42F775CC307238C35EA5DA55B999E','','41096','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','CEB7B2C893B8410CA8716C77DB679AB860F7F0E86BCF2D8E','','12194860','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','C584FF543FABE32DBA3206AB324CAFAD92497C4926BBF8B2','HideEx','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','122B96C9AD3D43FA5EE82ADFA464904F304EB7FD4CB5622D','','2299108','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3EFBC5B273BFF42D9F704C74DC2381B8A0D50D61C2F1512E','','717898','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8C5824E4A6D16714A2BFB5FC9D0CBF4706B8A2170DA87D7B','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','402282B90E06579656CF454305C0B5A925C95FBF6A7CF265','','477928','60','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','71B36C6D650EF0D049328643E5B12E73DF95B58B2F30D0DC','','17938','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','7C49C303394E1493D897E802528CA8E558B6A7BFE8320F08','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','2C190F9E920AF2EF67DA4D06905C2A6A0A2BC63D0192BAC5','','3045632','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E59168C40E1A0C9F8896EA9E2D684988D81A522FFCDC51D5','','3766400','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3C825803D3ABF20A11495E54718A2D83A0B35FD7D741B5E1','','12905','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','DCF32E3E1C5DF813DFB137A2D9B21D95B0AF66CC2AD0F245','','41023','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','7B66BDB4A0A713A7B315888708B88F90CCF7313832CCE35E','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FFAF20DD14D7018A4156F000D1455DF36966513EB76F93E7','','2299116','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0C59AA1F05D2D9D3C0C5ECF6A38D9FF57187A7A461DEE908','','717898','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','913AA6D16EBE73143FA4B4EF89C786668C6E7DD0B936DD18','','90202','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','A9F5CA81A547D8F8051928A287DD280F7FE835B2858CEED5','','20512','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','16B4D8897AEED4732A47239CDC99603D2F505D0AD602847F','','673210','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','23F29E10D55E8701A1A699A1C05CED4553676E9FBA5B51F5','','13634','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','9A65A024256C0D7D677C9F24A9C16A48BEA9B03CCA016098','','3000288','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','AA0004288ED58DE4324FA521F849807DB1EF33634C7FE8C3','','61874','42','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E400A401BD0376A0475F1216731F5EE0DDF42C9A4FA805D2','','59620','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5265823','5','72118B5518',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FD434987A57E848192562B61CA0D67BDCEA2392514CDD0AF','','3000288','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','88C140A6580061C775D9141887FABD3F20E574DC4C0C4BBB','','9977','32','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3623B441A5D414AFD6650C8B8623ECF3C3A9129E1F5A81C1','','672954','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','393A06D430D287FEC1C02F9945C34BA2A7954241C6357909','','335122','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0955A3267A3E576B9BD823BB210E8200F37CCB0421BF208C','','685656','44','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','1A00ED18B456ADC1A1F39A5DEF572250FB0CCAC8BECA9DD8','','477928','60','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','370B9B6E3AA987595F986C5716BF9FFCF0369438D5DC5D11','','156','8','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E8E85DFE24D8D20852A37D702CDF029C3B1FA30B99CAA4BE','','447736','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5090917','8','E886EE1D0083C40C',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FA24C5FEEAF4538DD4913F10C99F3F64380B7354EB318386','','3041472','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C6AD92AC13B340575AB5D0769A1A7EED47BC42A5968E67D6','','37136','40','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','990EFFE367D44A29E82F62C57B6041A66F66C1D100B05639','','28956','12','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','631E42C3B6ED8A22F5AFA903176A7EB011754F5ABF2081EF','','3766400','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D8AB4091C51177D7BBA7384EE12E0384A7EDB73E38D15920','','13291422','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','54AAA1926869D259C427870A620AE0C24AFC9B472F424633','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','CC0E40919988E53DA0B447F0984A30D51CC42E9DB54A8F1F','','49564','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','396E7EC540DC2C74CD6709753CC627517E3A2DB8A1EF3633','','29916','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','84A5A077180DFB9841E8DF4A4EC49EADE886D905768EE032','','57602','42','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','072300C283F8DF72B3ED5F3CD8B7DF47574AECF7B21FBB59','','668874','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D4FC9A6022B7CFA81904503E43B813631D4735D80BC61868','','9977','32','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','47B5A19B87234257CB6C1485AB2C0CB25513260F60094BEE','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B8B6F4BA5FD45F0ABDCB060F72987987B6EF62B80C9E378F','','12194860','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','261F2915266F20B7289A1560176F24198930C61540BEFA01','','3638348','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','019A378006B0677C0B2F42C6CA882EC571D504E7D8F5B05B','','17282','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','4E82DD9F04571D6DAB2FFCFCD638699D1D4C84917F720F32','','717898','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','EAA75F6AE049552C55AFFDABB7268682428B1A9BF028C4D4','','673194','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F1431C669453FE0BD95430ECD8328EA0D3CD37BA658F094E','','198','12','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8AD8C581E8BAF7A2140211C4298A93E229493F272F4EFF4A','','3045912','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C154E3B6CE0B979BA98FEDAA1829DCCF2A7172642DEF9EFC','','37180','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','295A29C81B1B9CC9B6758440BED913ED4D8B5E05A90D7CE7','','41023','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3ED9105E3D1F31AD1D4376C54B07D18348C56E7453D161B2','','690106','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','74C75B8F0147ADA8610F6C9BB80C4BDA543C1D95943ADCEB','','0','8','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7BE7A7D3F4AD8B30A0A144D5D4AC5E569BB9A0D18AB590FC','','37180','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0B5C54A4850924038D95A3F1C44F300921CEA1E13644842E','','57602','42','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5081862','8','6840AAB600C60200',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','876743AA30D61C83444427F4F18203B2FF443C337E5DD190','','22792','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C83A14C21D1E66345574E3E0E3613E924F702883A30A1809','','31924','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','8491566','5','8B4D10890D',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2545F02B4FC2F5425960A2E5C0299936C99FF2EC68A5ECDB','','501956','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','85EF9C6353712A8D0E2E27B1702B510A95B1305473F86345','','41023','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','35282392AA86692A153FC159D6E13C74F9DF01661E4867D6','','13538','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0D6CC3008615CD5BFB96A90620805B78D5BFBC6100B1AF0D','','13538','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D573179188521C485CFD24A9EE9CDA77C540A31EE68E3E78','','41228','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','8FA80694C3766FC1B041103EB35EBA3B7C77081A5DA8FFD8','','28940','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','CD6B8F9D23612C807F7653D29F1F1C54BC8F917C5C5BD8F1','Afd32uu','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','FCB5CF830DB536208D4C58E5838D1C8798F0738247EF0867','','672602','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','4451680A3F41926C1545701887F93A0A49CC29C3E114AADB','','4011280','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6BE2C4F29ADF49AE5BF0485A27A854087E775FA28047168C','','27270','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','016FF5D8685E37969B1B7C310756DCD93D4AB34256837031','','38300','21','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','4623652','7','578B7D08578BF1',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6726DA4A8F112CC25DD78500CA9BF792DB688F7D8D1FBC4B','','57602','42','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9F8B3A3C70027496420A619969CF1EB7AF447D245DA766A0','','29884','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E74FFC8ADF5FE8A0FE0F10BCABCFCEDB3B2B9C2307340D7C','','3041472','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','B31302D6A47971059B2643B57D2D50EBEBEAA89BE483F1F4','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2F761DEA3CD3394A0091D745FD2976B52F3B16BB0A48BC80','','29884','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8E44EC966A93870696359D3E2474D12C071A381B9403B1B9','','673210','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2424AFA7FEC48FF09E5E3BDAF93FAA74743A7551B6FB1495','','56063','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','ACCF5804D419F30643F87A650C4DC6E0E10266922692AECE','','682378','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6EC19D6D1244E3FE787AE448EC905C509DBA3C01FBE34F24','','41280','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','5B2D2EE40383C33D381998995210918AC6B1AD67C5880F6D','','710554','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','83FFE0F8F224D5E56C38D731EFE8AD5AD1285B1AD4FA019B','','683146','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9D67A809FD8FDA1E1504F0C038E21E1D5FC4C6D11F426228','','28940','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2965EC092EC0A4B3D4A3C781F0A0A542824C77B7300BF50C','','45324','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','FE31901F5558E6555DA6BC5B1BC3415E82CB97DECBB486BB','','41096','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B35406A77D6501A50F41981C7C137AD5272EB612F4A74109','','29884','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','7275397E511B45264BCFA30E3A3F8101894AA3923D91BE6E','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','CA7D8D0E1F20385DCF6FC209799750CE9D0160B0C67196E7','','700714','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','F5CCDA244D826B3180E7C49193B3B0B5DBF651EC67DCB47A','','594348','26','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7977F1E72B30179072EE1784396AB0406D06162051CA1EDB','','37136','40','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','603F8A015D8436CCBCD68B26FF6006E7A81BA9A8D9524B1F','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','9631E9EBC78E0333010E522045852C7BEA44655080D418F3','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','43BE7C00605D9FECAEFAE38D8FFEAED78B8382563A245F10','','9977','32','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E493F1BAED1DBE7A0D429BF1A5D665636D29069060310BF0','','13291422','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6C53203FA95EBE4DBB0A7F3E85994058DECA069A5244C29E','','130380','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','5A07E5A0525DBD5005CBDE16F7393EC8B795ADB2327C2F96','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D7665366F333BD580C5F8E2FF8971294F69E99EC7E3623F3','','717898','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','9990741','9','8B878000000089463C',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','FB87EB8F178C69D9F7576AC7FF75D0479467057A2B6C956D','','9977','32','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','292911AC98E7ED34DF021B562D5DEBE8DAA15570B552978B','','3000288','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','6618F45C49D47C4105070C085FD5C384254A62E4AB614DB9','','3634252','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','316E531545999AFC533814888434999501FEA8ABFBAF8655','','134968','32','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9945ED64886F68664A4BDF50731F4B4DC680273AB2E0DBCB','','20512','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','1D4D6EC7B6B26553FC914D28BF9B62FD81D0B865DE606D97','','29884','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','63B2D2ACF6E912CDC68282B080A2D610BE6AFE8EBB95FD31','','3070052','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B0955BAC042D5441496103E7C45E38609A9AE3799D534BD9','','18680','35','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','6488E44D4E965581650F73F6E68DD8F863795162D99104F8','','682378','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','CC0D3F7D8FCF928A55F92F6414F4AEF7AD75DED5819BF870','','13538','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','CD3835965AF27EC338F828666CD06089B847B04A2DD56AE0','','17938','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D04E9CF6A03D4767AFF1E4EE0EFBC333AEBA5B0552F15957','','0','9','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','120904F033D78A13DB0971F095C809852B7EB876D1A8AA01','','3045632','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7DDD19DCF77E27DF0A31BC21C7F716FF85076AF065F102DC','','36924','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','5486E2CDD98AC3F25C223FD515CE7EF3FB09AC12ED338C86','','198','10','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','F8D6423F01E5369D16F6F70180083B936F0DDE3737B23308','','2299092','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','EC10CC349A8E654240B27B03EE1232B9CCED28F7104CCB71','','49347','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','29E064ACC509206873A1D548F4816DB60D29D6EE9FF63A56','','682378','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E1A8A2A81920A7BA9F419A6D19CAC3DD9E292EF39F963234','','676970','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','32393EB09F7C829F58612E5E47018F7203C43218C3506C79','','20512','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','AFC4D19CACEDE8E9A2FDE3CC3D29CF8556AF4980872DFE1A','','3033068','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','09A2B97FD351B1D339030233AC51C741E0ECDC21AA7A152B','','3049452','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2B2AF2171B8A9FC0D44EFE0ECDCB9DE1A55ACC8D83661E16','','41023','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D111B236DC42EB338870E72FF6EE3141714D0437864B02AE','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E6DC6898929D1DA9F5768A9BFCBE848F8C1F31E8B6910FB8','','335122','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','85A32F8B5F8430A086D27E62EB17D878E49CE815F6AC91CA','IPSect','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B6CB7B905A6BDD64BC032BE71927C1FE31153D14D6CF87E1','','447736','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','40EE7F4EEE1D707ECB770CDBBB54730CB863CC8E268D4208','','3634252','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D74E308262D8C52ACE81B66F1D90C160AC86B2E0508176C1','','0','8','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E15287D29EE155299619F8E93E66B55B564FD921FA41CF50','','3049452','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','58DFAEE44A52F0D5A58B0C94F0E5E63C1C7F76206D7FA7CA','','22792','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','83705EAE8AAD9709494E52EB05AC0481C998C15730E61099','','30012','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','0271F4D624304A48CB7CDFA016E3A735DCA3170FAD557468','','3070052','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','217DFFE3C12F984992E1E0AE7B5864061572BA301B21D869','','178504','96','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','C5C7AC33D1E4CF33E661033006BFEDE08523B643CCF51261','','3045356','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','4618113','10','FF1554F79D003B470C89',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D45144FC835266270E67CFB1F2900FD227B63204698A3EA7','','50040','26','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','B5BB832AEEC591196864E08A392592C5789D76D3DDDD4DBF','','27270','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','93582814E00150E2DD750ACAD7BD1719C4EBCD4C06F482AB','','28940','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','FD6B6AC7FA5F2E7828CB1B429A9442383BD93E762A5D7D00','','31924','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','51DF4EDECBBE42CC7C5D6723318F98E43E14A45F41CBD124','','41080','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','F2B2260FDD23E5F268FAAE4D1A48E74C452F2AC5D114765D','','57602','42','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','69FBDB69EC2E113EF691E47EDD46E40F03D1EBE226A1F7CE','','29884','20','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','E3E431D8F8FB38F0F2586D0F50D809BCCEB13651C5EF2619','','682394','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','2294015927F07D884FE2923FA17B3A8BCABC0A378930CF84','','679578','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','0A022AB25C52F94404A01F96687B2D6E6BE774237254BD05','','20512','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','65EEE243504EDC3319C3528B1A1E8061A3E75F4C25B61F95','','41228','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','877C654036A29FC108FE8D69D416361732D7A0270E51189D','','3022016','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','1A223564DF9E7BADD3CF858FB8250FE59F892232AC3B412D','','4011280','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','4FEDF58FB4DE45289C97ACCF16EB2DEA6FBC85C74A52D3C9','','37180','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','D4BE47EA1D68B92E2AD8307D139877705BE2B6A98B6A916E','','13033','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9658AC7EF426A52C327BBC1ED71C6FA6DC5940E35DCC18C7','','18680','35','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5345746','7','746583F9177760',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','1B17998CD8E0CDA4D84B0A0F9DB05E536DACE0348A883D24','ndis_x86','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','BB9B86ED12359A465B02387A1D727F11F78D35C8B7FCC2FC','','2299092','33','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','842BC1A8C53902D26018B1C5E05ADCD70D973A968E298331','','50040','26','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3E894F9682573CC0AD54C7E9873C9026AC050929392D0B93','','3049452','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','4A31E3D24FD6D576D84EF1BFB813D0F066870DEB38C32E47','','21826','11','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','EEA122B4C066EC0B196F67511E633EBACB37C4EA6AE4BFF7','','41096','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','66211671BEF80FB973B1C9595A70B462AD79EC83530DFE89','','12905','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3760BBD6FE99A0BBEE0AB61A8BD52A6ABCAC48FF3CB265B8','','3070052','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','70F425426612D0D8495386C2375F7A4183548C0D4E7DFA46','','594348','26','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','BB310E9DDE9259027123500E65F9FA1E8D9D0F5FE8381CD2','','3638348','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5296496','12','558BEC81ECE80D00006A0AE8',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6FFB5E4982D306680E0C59087DA961CD4F6B068E323C3BB4','','401992','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','6DDCA79B7460A1F3671532A28FDCEB331DE6CA550E3178D0','','3766400','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','A8F7B2FB37CF3BEF43D6CE5C0BF85E85077E681490BA1C4C','','37136','40','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','052F425E7528B3A7155C45EEE530F915DBB154E5C8876E25','','50040','26','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5283280','12','558BECB8084E0000E8731DF0',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','D6DE200B631AF71BFBC76202D82649942FD6ED9BC4A9EF75','','198','12','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','7860712','5','742DF6407C',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','61077261C66B2CF9B199F115A3A656EA6A00068F151E3656','','706314','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','513FC0F0673A9DF86FA1FA05371040C14634CE08311ED619','','401992','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','5E0970A6EB246A79DDF427CB76D0D921F971E13921DD5D2C','','134968','32','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','53CAC3EF654610AC7E043C6AAD62709EF0B5400DBDE755EB','','149','5','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','566637D06BAEA9190B7CE510C697F72CD20FE3D958A95A25','','3049888','31','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('113','3C9B0CC7FE020EEBD43E6B1D88EDDF0EC46AC35974765068','drvsys_mon','0','0','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BDFEE5DCDD37FC5B2A1B3E42FBE5F7997CFED35E86062EB6','','28920','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','7794AE60131E4D07860DB48047206784B885B30457EAB83E','','12194860','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','653A308BB00D914AE1ECD773BA4B0BA7724874BC62647D10','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','06B696C35F905E75B451A02E121BDA0330CD44E0D9B872BF','','60648','56','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','35E8CD9E8CBD879B1E53278926C634AA8B72B8D9A20009F9','','17522','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9B13F2E744904ADAAA062F9113A576D11C2C450D1CD6A4AB','','13033','36','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','60851B4A6F7338632A84795FBBB20320E49AD2CC2034BA80','','28940','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3BC0BE02AE0B6975974D3B13B811EC6BDACBF9EE122BE633','','90202','13','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','E47F7DD8D5B5C29B70AFFD4F25AA286167D411937F9BD247','','36907','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','35D1CDEE86A410DF087DE6D5F5AC6289C4888B9753293E73','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','2ED2EEB29EE0D48477779E5CA875F1F5F15CCE74CA85BDAA','','28956','17','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','78C3A74F7624B26478D4C98BAF1194D9A8E1B33D6AF89DD6','','174688','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','3D02551F548DFB58832626FE90A7AAA12824D93A54A0DC14','','709322','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','09D04CF8ABC51D06D874784442987E5F2631041550607255','','36544','55','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','F3CD473F8C85977895CA5BA9DC22185BCCBBF6B977205193','','448492','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','30E2F23DB1038D16D2DEEAB1D0F1790D961E468368DC5108','','30012','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','540D465F760320A63981289D30CD40CCC770EE126523C71D','','477912','60','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','C461E1BE054FE29A1FD58B33D33890BC4A1279DE4F572B47','','37180','24','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','1AC3D903CFCA11321E76A257BDA0608E5060030BE745CCF3','','130380','14','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('243','','','5284488','9','7507C7451400000000',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','96281A2887E61232007D7015E4A35DA118794841A8EC84BC','','3037164','22','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','8A1AC926B46A9E3D60D3BD87A59FF77D7B80A1510BC327A7','','710730','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','3620B6BDF3993B87FD35E906FE8376A04FF34684E2023D8E','','41280','16','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','025C373F05EC6E809EF5A86A903570FDA14D219286BCED5E','','448492','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('178','5C0E4EE98C4E34CBE44F6BD595C13DD675555164A8D491DA','','710554','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','BECE667BF9443EF6515E8E154F74FC2C5817455C8636DB72','','501956','48','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','94F1DA3E0D955761826D6BC932E26F44D321B4838C7567D8','','13538','15','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','EA3A3AD71FD14B038C98F256E80C1EFA1F45562A3DF92E7D','','22792','25','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','AD5A8CBF55EC436DA968EE0B9744C93F65D9E0D6E3C1B136','','174688','37','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','9B6B3B311BA9007C06CF0D146BB979B11CF295C58768DD4F','','31924','23','',NULL);
+INSERT INTO `warden_data_result` (`check`, `data`, `str`, `address`, `length`, `result`, `comment`) values('191','A373FDB6A789CC46072A4CC51A429C817C40862DC6C0190F','','30012','16','',NULL);
+
+DROP TABLE IF EXISTS `account_forcepermission`;
+CREATE TABLE `account_forcepermission` (
+    `AccountID` int(11) unsigned NOT NULL DEFAULT '0',
+    `realmID` int(3) unsigned NOT NULL DEFAULT '0',
+    `Security` int(3) unsigned NOT NULL DEFAULT '0',
+    `Comment` varchar(32) NOT NULL DEFAULT '',
+    PRIMARY KEY (AccountID, realmID)
+) DEFAULT CHARSET=utf8;
+
diff --git a/sql_mr/custom_rerun_every_mangos_DB_update.sql b/sql_mr/custom_rerun_every_mangos_DB_update.sql
new file mode 100644
index 00000000000..99376757510
--- /dev/null
+++ b/sql_mr/custom_rerun_every_mangos_DB_update.sql
@@ -0,0 +1,10 @@
+-- use this SQL once after fresh build and after every DB update.
+-- copy spells from creature_spell_template creature_spell table
+REPLACE INTO `creature_spell` (`guid`,`spell`,`index`) (SELECT entry, spell1, 0 FROM `creature_template_spells` WHERE spell1 > 0);
+REPLACE INTO `creature_spell` (`guid`,`spell`,`index`) (SELECT entry, spell2, 1 FROM `creature_template_spells` WHERE spell2 > 0);
+REPLACE INTO `creature_spell` (`guid`,`spell`,`index`) (SELECT entry, spell3, 2 FROM `creature_template_spells` WHERE spell3 > 0);
+REPLACE INTO `creature_spell` (`guid`,`spell`,`index`) (SELECT entry, spell4, 3 FROM `creature_template_spells` WHERE spell4 > 0);
+REPLACE INTO `creature_spell` (`guid`,`spell`,`index`) (SELECT entry, spell5, 4 FROM `creature_template_spells` WHERE spell5 > 0);
+REPLACE INTO `creature_spell` (`guid`,`spell`,`index`) (SELECT entry, spell6, 5 FROM `creature_template_spells` WHERE spell6 > 0);
+REPLACE INTO `creature_spell` (`guid`,`spell`,`index`) (SELECT entry, spell7, 6 FROM `creature_template_spells` WHERE spell7 > 0);
+REPLACE INTO `creature_spell` (`guid`,`spell`,`index`) (SELECT entry, spell8, 7 FROM `creature_template_spells` WHERE spell8 > 0);
diff --git a/sql_mr/innormative_words.txt b/sql_mr/innormative_words.txt
new file mode 100644
index 00000000000..6e78f9197a2
--- /dev/null
+++ b/sql_mr/innormative_words.txt
@@ -0,0 +1,359 @@
+ атсос 
+ атсаси
+ атсасу
+ ахуе
+ ахуй
+ беспизд 
+ беспезд 
+ бесписд 
+ беспесд 
+ беспест
+ блё
+ бля
+бляд
+ блят 
+ блять
+ бляти
+взъебк 
+взъебу
+взъёба 
+впиздячи 
+впизду
+вротебанств 
+вхуяри 
+вхуячи 
+ выеба 
+ выебыш
+ выебыва
+ выпёзд
+ выпизд
+ доеба
+ доебы
+ доёбы
+ гнида 
+ гандон
+ гондон
+ гандос
+долбаеб
+долбаёб
+долбоеб
+долбоёб
+допизде
+допизди
+дуроеб
+дуроёб
+ еба
+ ебал
+ ебан
+ ебар
+ ебат
+ еби 
+ ебичес
+ ебичис
+ ебис
+ ебла
+ ебли
+ ебля
+ ебнут
+ ебокв
+ ебобеи
+ ебобее
+ ебона
+ ебена
+ ебу 
+ ебун
+ ебуч
+ ебс 
+ ебукенти
+ епал
+ епаны
+ епашь
+ епи 
+ епт 
+ епона 
+ епут
+ ёба 
+ ёбн
+ ёбан
+ ёбар
+ заеб
+ заиб
+ заеп
+ заёп 
+ заёб
+залупа 
+залупи
+залупо
+залупы
+запизде
+запиздя
+запизди
+захуя
+захуи
+захуй
+злоебуч
+злоебан
+зхуя
+ ибаный
+ ибаные
+ ибаная
+ ибанат
+ ибаного
+ ибасос 
+ иобаный 
+ ипал 
+ ипали
+ ипан
+ ипать
+ ипат 
+испезде
+испезди
+испизде
+испизди
+исхуячи
+йобаный
+йебать
+йебанат
+йебанись
+коноеби
+ кончита 
+ кончито 
+ куроеб
+мозгоеб
+ монда 
+ манда 
+мандоёб 
+мондоеб 
+мудак 
+ мудач
+мудацк
+мудоеб
+мудопятств
+наебну
+напизди
+настоеба
+нахуи
+нахуя
+ нах 
+нехуи
+нихуя
+ некуя
+ никуя
+ниибац
+ ниибато
+ ниибаты
+ ниибата
+ неипат
+ неипет
+ ниипет
+ неебет
+ неепет
+ обконч
+объеба
+ объебос
+ однохуиствен
+ окуе
+ остопизд
+ отпизди
+ отпизжу
+ отпиздо
+ отъеб
+ отодран
+ отодрал
+ оттрах
+ отхуяч
+ охуе
+ охуителън
+ охуячи
+ пезда
+ пезды
+ пездю
+ пезду
+ пезди
+ пезде
+ песда
+ песды
+ песдю
+ песду
+ песди
+перепизди
+перехуяри
+ песта
+ песте
+ песты
+ песто
+ пёзды
+ пизде
+ пизды
+ пиздю
+ пизда
+ пиздо
+ пизду
+ пизди
+ пиздя
+ пинде
+ писде
+ писды
+ писдю
+ писда
+ писди
+ писдо
+ писду
+ писдя
+ пнх 
+подъеб
+ поеба
+поебен
+поепат
+ поипат
+попезде
+попезди
+попизде
+попизди
+ посос 
+ пососи
+ пососу
+ пососе
+ посаси
+ посасу
+ посасе
+похуе
+похуи
+похую
+похуяри
+приеба
+припезди
+припизди
+прихуяри
+проеба
+пропезди
+пропизди
+ разеб
+ разьеб
+разъеб
+распезд
+распизд
+расхуюжи
+спизди
+схуяри
+схуяли
+схуя
+тыбля
+тычебля
+тычёбля
+ уебан
+ уебарь
+ уебал
+ уебат
+ уебак
+уебок
+уeбки
+уебыва
+уёбок
+уёбак
+уёбки
+уёбыш
+упезди
+упёзды
+упизди
+худоебин
+ хуе 
+ хуес
+ хуег
+ хуед
+ хуел
+ хуец
+ хуи
+ хули 
+ хуле 
+ хулиф
+ хулив
+ хулеф
+ хулев
+ хую
+ хуё
+ хуя
+ нахер 
+ нахера 
+ херня 
+ херню 
+чебля
+чёбля
+ свинотрах
+ сука
+ суки 
+ суке 
+ суко
+ сучар
+ сучк 
+ сучка 
+ сучко 
+ сучки 
+ сучке 
+ сцук 
+ сцуке 
+ сцуки 
+ сцука
+ сцуко 
+ съеб 
+съебал
+съебис
+пидор
+ пидар
+ пидр 
+ пидрил
+ лаха 
+ лахам
+ лох 
+ лоха 
+ лохи 
+ лохом
+ лохос
+ лоху 
+ лошара 
+ лошары 
+ лошат 
+ лоши 
+ лошил
+ лошит
+ лошок
+ лошня 
+ лошу 
+ сосал
+ соси 
+ сосит
+ сосни
+ сосу 
+ сосун
+ сосат
+ отсос 
+ отсоса
+ отсоси
+ отсосу
+ отсосеш
+ отсосёш
+ отсосем
+ подсос
+ трах
+ фпизду 
+ фпёзды 
+ ужоснах 
+ ужаснах
+ цука 
+ цуко 
+ цуки 
+ яхуеюблятьсантимата
+ shit
+ fuck
+ dick 
+ dicks 
+ prick
+ asshole
+ asslick
+ asslicker
+ whore
+ bitch
+ cunt 
+ cunts 
+ cocksuck
+ cocksucker
diff --git a/sql_mr/letter_analogs.txt b/sql_mr/letter_analogs.txt
new file mode 100644
index 00000000000..2fa7ad81d63
--- /dev/null
+++ b/sql_mr/letter_analogs.txt
@@ -0,0 +1,59 @@
+аАaA
+бБbB6
+вВvVwWB
+гГgGr
+дДdDg
+еЕёЁeE3
+ёЁеЕeE3
+жЖzZ
+зЗzZ3
+иИйЙiIuU1
+йЙиИiIjJuU1
+кКkK
+лЛlL1
+мМmM
+нНnNhH
+оОoO0Q
+пПpPn
+рРrRpP
+сСcC
+тТtT7
+уУuUyY
+фФfF
+хХhHxX
+цЦcC
+чЧ4
+шШ
+щЩ
+ъЪb
+ыЫyY
+ьЬb
+эЭ3
+юЮuU
+яЯR
+aAаА
+bBбБВ
+cCсСцЦ
+dDдД
+eEеЕ3
+fFфФ
+gGгГ
+hHхХнН
+iIиИйЙ1
+jJйЙиИ1
+kKкК
+lLлЛ1
+mMмМ
+nNнНп
+oOоО0
+pПпPрР
+qQО0
+rRрРяЯг
+sSсС
+tTтТ
+uUуУиИ
+vVвВ
+wWвВ
+xXхХ
+yYыЫуУ
+zZзЗ
diff --git a/sql_mr/mr00017_mangos_anticheat.sql b/sql_mr/mr00017_mangos_anticheat.sql
new file mode 100644
index 00000000000..c11da43b94a
--- /dev/null
+++ b/sql_mr/mr00017_mangos_anticheat.sql
@@ -0,0 +1,7 @@
+-- Anticheat
+
+DELETE FROM `mangos_string` WHERE `entry`='11000';
+INSERT INTO `mangos_string`
+    (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
+VALUES
+    (11000, '|cffff0000[Anticheat]: Cheater detected. Nickname: %s. Cheat type: %s.|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '|cffff0000[Античит]: Читер обнаружен. Имя: %s. Тип чита: %s.|r');
diff --git a/sql_mr/mr00017_mangos_arena_announcer.sql b/sql_mr/mr00017_mangos_arena_announcer.sql
new file mode 100644
index 00000000000..b598ee662b6
--- /dev/null
+++ b/sql_mr/mr00017_mangos_arena_announcer.sql
@@ -0,0 +1,7 @@
+-- Arena Announcer
+
+DELETE FROM `mangos_string` WHERE `entry`='17898';
+INSERT INTO `mangos_string`
+    (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
+VALUES
+    (17898, '|cffff0000[Arena Queue Announcer]:|r %ux%u %s started!|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '|cffff0000[Анонс Арены]:|r %ux%u %s начинается!|r');
diff --git a/sql_mr/mr00017_mangos_autobroadcast.sql b/sql_mr/mr00017_mangos_autobroadcast.sql
new file mode 100644
index 00000000000..021610c456c
--- /dev/null
+++ b/sql_mr/mr00017_mangos_autobroadcast.sql
@@ -0,0 +1,8 @@
+-- Autobroadcast
+-- Commit 991d1b3b6f4ab7bb129d
+
+DELETE FROM `mangos_string` WHERE `entry`='1300';
+INSERT INTO `mangos_string`
+    (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
+VALUES
+    (1300, '|cffffcc00[Server]: |cff00ff00%s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/sql_mr/mr00017_mangos_lightwell.sql b/sql_mr/mr00017_mangos_lightwell.sql
new file mode 100644
index 00000000000..1f8403ae32b
--- /dev/null
+++ b/sql_mr/mr00017_mangos_lightwell.sql
@@ -0,0 +1,26 @@
+-- Lightwell
+-- Commit 97e7463c82ad95cdc63f
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (31897, 31896, 31895, 31894, 31893, 31883);
+INSERT INTO `creature_template_addon`
+    (`entry`, `auras`)
+VALUES 
+    (31897,59907),
+    (31896,59907),
+    (31895,59907),
+    (31894,59907),
+    (31893,59907),
+    (31883,59907);
+
+UPDATE `creature_template` SET `UnitFlags`='4', `ExtraFlags`='2' WHERE `entry` IN (31897, 31896, 31895, 31894, 31893, 31883);
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (31897, 31896, 31895, 31894, 31893, 31883);
+INSERT INTO `npc_spellclick_spells`
+    (`npc_entry`, `spell_id`, `quest_start`, `cast_flags`)
+VALUES 
+    (31897,60123,0,2),
+    (31896,60123,0,2),
+    (31895,60123,0,2),
+    (31894,60123,0,2),
+    (31893,60123,0,2),
+    (31883,60123,0,2);
diff --git a/sql_mr/mr00017_mangos_pandora_trader.sql b/sql_mr/mr00017_mangos_pandora_trader.sql
new file mode 100644
index 00000000000..4898ae77679
--- /dev/null
+++ b/sql_mr/mr00017_mangos_pandora_trader.sql
@@ -0,0 +1,39 @@
+-- Pandora Trader
+/* Drop this line if need Pandora Trader (not Blizzlike)
+  -- Vendor
+DELETE FROM `creature_template` WHERE `entry`='99321';
+INSERT INTO `creature_template`
+    (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `modelid_1`, `modelid_2`, `modelid_3`, `modelid_4`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `minhealth`, `maxhealth`, `minmana`, `maxmana`, `armor`, `faction_A`, `faction_H`, `npcflag`, `speed_walk`, `speed_run`, `scale`, `rank`, `mindmg`, `maxdmg`, `dmgschool`, `attackpower`, `dmg_multiplier`, `baseattacktime`, `rangeattacktime`, `unit_class`, `unit_flags`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `minrangedmg`, `maxrangedmg`, `rangedattackpower`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `PetSpellDataId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `InhabitType`, `unk16`, `unk17`, `RacialLeader`, `questItem1`, `questItem2`, `questItem3`, `questItem4`, `questItem5`, `questItem6`, `movementId`, `RegenHealth`, `equipment_id`, `mechanic_immune_mask`, `flags_extra`, `ScriptName`)
+VALUES
+    (99321, 0, 0, 0, 0, 0, 25811, 0, 25811, 0, 'Pandora receller', 'Moneychanger', '', 0, 80, 80, 22000, 22000, 0, 0, 9730, 2007, 2007, 128, 1, 1.14286, 1, 0, 420, 630, 0, 158, 1, 2000, 2000, 1, 33282, 0, 0, 0, 0, 0, 0, 336, 504, 126, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, '');
+
+DELETE FROM `locales_creature` WHERE `entry`='99321';
+INSERT INTO `locales_creature`
+    (`entry`, `name_loc1`, `name_loc2`, `name_loc3`, `name_loc4`, `name_loc5`, `name_loc6`, `name_loc7`, `name_loc8`, `subname_loc1`, `subname_loc2`, `subname_loc3`, `subname_loc4`, `subname_loc5`, `subname_loc6`, `subname_loc7`, `subname_loc8`)
+VALUES
+    (99321, 'Pandora reseller', '', '', '', '', '', '', 'Перекупщик Пандоры', 'Moneychanger', NULL, NULL, NULL, NULL, NULL, NULL, 'Меняла');
+
+DELETE FROM `creature` WHERE `guid`='99321';
+INSERT INTO `creature`
+    (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`,      `DeathState`, `MovementType`)
+VALUES
+    (99321, 99321, 571, 1, 1, 25811, 0, 5809.08, 623.377, 647.744, 2.0217, 600, 0, 0, 22000, 0, 0, 0);
+
+  -- Items
+DELETE FROM `npc_vendor` WHERE `entry`='99321';
+INSERT INTO `npc_vendor`
+    (`entry`, `item`, `maxcount`, `incrtime`, `ExtendedCost`)
+VALUES
+    (99321, 41596, 0, 0 ,2707),
+    (99321, 47241, 0, 0 ,1909),
+    (99321, 44990, 0, 0 ,2707),
+    (99321, 43228, 0, 0 ,2707),
+    (99321, 47241, 0, 0 ,2589),
+    (99321, 47241, 0, 0 ,2637),
+    (99321, 47241, 0, 0 ,2743),
+    (99321, 49426, 0, 0 ,2723),
+    (99321, 43589, 0, 0 ,2707),
+    (99321, 49908, 0, 0 ,2723);
+    -- (99321, ??, 0, 0 ,2707), //1 Emblem of Triumph
+    -- (99321, ??, 0, 0 ,2723); //15 Emblem of Triumph
+-- */
diff --git a/sql_mr/mr00017_mangos_playercreateinfo_spell.sql b/sql_mr/mr00017_mangos_playercreateinfo_spell.sql
new file mode 100644
index 00000000000..1bfbecacec5
--- /dev/null
+++ b/sql_mr/mr00017_mangos_playercreateinfo_spell.sql
@@ -0,0 +1,9 @@
+-- missing passive aura for spell 22570
+-- Commit 1dd5a80d385e2b35671c
+
+DELETE FROM `playercreateinfo_spell` WHERE `Spell`='44835';
+INSERT INTO `playercreateinfo_spell`
+    (`race`, `class`, `Spell`, `Note`)
+VALUES
+    (4, 11, 44835, 'Maim Interrupt'),
+    (6, 11, 44835, 'Maim Interrupt');
diff --git a/sql_mr/mr00017_mangos_raise_ally.sql b/sql_mr/mr00017_mangos_raise_ally.sql
new file mode 100644
index 00000000000..249670e22fd
--- /dev/null
+++ b/sql_mr/mr00017_mangos_raise_ally.sql
@@ -0,0 +1,12 @@
+-- Raise Ally
+-- Commit 8f022d171f3e383e2e77
+UPDATE `creature_template` SET `ScriptName`='npc_risen_ally' WHERE `entry`='30230';
+DELETE FROM `creature_spell` WHERE `guid` IN (30230);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(30230, 62225, 0, 0, 0, 0),
+(30230, 47480, 1, 0, 0, 0),
+(30230, 47481, 2, 0, 0, 0),
+(30230, 47482, 3, 0, 0, 0),
+(30230, 47484, 4, 0, 0, 0),
+(30230, 67886, 5, 0, 0, 0);
+
diff --git a/sql_mr/mr00019_mangos_item_convert.sql b/sql_mr/mr00019_mangos_item_convert.sql
new file mode 100644
index 00000000000..47b68f8ea7f
--- /dev/null
+++ b/sql_mr/mr00019_mangos_item_convert.sql
@@ -0,0 +1,15 @@
+-- Item Convert
+
+REPLACE INTO `item_convert`
+    (`entry`, `item`)
+VALUES
+    (50337, 44136),
+    (50335, 44133),
+    (50370, 44152),
+    (50367, 44149),
+    (50368, 44159),
+    (50369, 44150),
+    (50372, 44701),
+    (50373, 44702),
+    (50336, 44134),
+    (50338, 44135);
diff --git a/sql_mr/mr00019_mangos_refer_a_friend.sql b/sql_mr/mr00019_mangos_refer_a_friend.sql
new file mode 100644
index 00000000000..889ef20e1bd
--- /dev/null
+++ b/sql_mr/mr00019_mangos_refer_a_friend.sql
@@ -0,0 +1,17 @@
+-- Refer a friend
+
+DELETE FROM `command` WHERE `name` IN ('account friend add','account friend delete', 'account friend list');
+
+INSERT INTO `command`
+    (`name`, `security`, `help`)
+VALUES
+    ('account friend add',3,'Syntax: .account friend add [#accountId|$accountName] [#friendaccountId|$friendaccountName]\r\n\r\nSet friend account.'),
+    ('account friend delete',3,'Syntax: .account friend delete [#accountId|$accountName] [#friendaccountId|$friendaccountName]\r\n\r\nDelete friend account.'),
+    ('account friend list',3,'Syntax: .account friend list [#accountId|$accountName]\r\n\r\nList friends for account.');
+
+DELETE FROM `mangos_string` WHERE `entry` IN (11133,11134);
+INSERT INTO `mangos_string`
+    (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
+VALUES
+    (11133,'RAF system ok.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+    (11134,'RAF system error.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql_mr/mr00020_mangos_dungeon_rewards_lfg.sql b/sql_mr/mr00020_mangos_dungeon_rewards_lfg.sql
new file mode 100644
index 00000000000..27c2f92b283
--- /dev/null
+++ b/sql_mr/mr00020_mangos_dungeon_rewards_lfg.sql
@@ -0,0 +1,20 @@
+-- LFG dungeon reward structure from TC
+
+REPLACE INTO `lfg_dungeon_rewards`
+    (`dungeonId`, `maxLevel`, `firstQuestId`, `firstMoneyVar`, `firstXPVar`, `otherQuestId`, `otherMoneyVar`, `otherXPVar`)
+VALUES
+    (258, 15, 24881, 0, 0, 24889, 0, 0),
+    (258, 25, 24882, 0, 0, 24890, 0, 0),
+    (258, 34, 24883, 0, 0, 24891, 0, 0),
+    (258, 45, 24884, 0, 0, 24892, 0, 0),
+    (258, 55, 24885, 0, 0, 24893, 0, 0),
+    (258, 60, 24886, 0, 0, 24894, 0, 0),
+    (259, 64, 24887, 0, 0, 24895, 0, 0),
+    (259, 70, 24888, 0, 0, 24896, 0, 0),
+    (260, 70, 24922, 0, 0, 24923, 0, 0),
+    (261, 80, 24790, 0, 0, 24791, 0, 0),
+    (262, 80, 24788, 0, 0, 24789, 0, 0),
+    (285, 80, 25482, 0, 0, 0, 0, 0),
+    (286, 80, 25484, 0, 0, 0, 0, 0),
+    (287, 80, 25483, 0, 0, 0, 0, 0),
+    (288, 80, 25485, 0, 0, 0, 0, 0);
diff --git a/sql_mr/mr00022_mangos_playerbot.sql b/sql_mr/mr00022_mangos_playerbot.sql
new file mode 100644
index 00000000000..d9f52a4c217
--- /dev/null
+++ b/sql_mr/mr00022_mangos_playerbot.sql
@@ -0,0 +1,9 @@
+-- Playerbot
+
+DELETE FROM `command` WHERE `name` = 'bot';
+INSERT INTO `command`
+    (`name`, `security`, `help`)
+VALUES 
+    ('bot',0,'Syntax:\r.bot add BOTNAME (add character to world)\r.bot remove BOTNAME (remove character from world)\r.bot co|combatorder BOTNAME COMBATORDER [TARGET]');
+
+DELETE FROM `gossip_menu_option` WHERE `option_text` = 'GOSSIP_OPTION_BOT';
diff --git a/sql_mr/mr00055_characters_pet_dualspec.sql b/sql_mr/mr00055_characters_pet_dualspec.sql
new file mode 100644
index 00000000000..45b66733b58
--- /dev/null
+++ b/sql_mr/mr00055_characters_pet_dualspec.sql
@@ -0,0 +1,7 @@
+-- Pet dualspec for hunter pets (mangosR2 repo)
+ALTER TABLE `pet_spell`
+    DROP `spec`;
+
+ALTER TABLE `pet_spell` ADD `spec` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `active`;
+ALTER TABLE `pet_spell` DROP PRIMARY KEY;
+ALTER TABLE `pet_spell` ADD PRIMARY KEY ( `guid` , `spell` , `spec` );
diff --git a/sql_mr/mr00107_mangos_reset_pet_talents.sql b/sql_mr/mr00107_mangos_reset_pet_talents.sql
new file mode 100644
index 00000000000..ba901731712
--- /dev/null
+++ b/sql_mr/mr00107_mangos_reset_pet_talents.sql
@@ -0,0 +1,2 @@
+-- missing trainer_class for enable gossip menu
+UPDATE `creature_template` SET `TrainerClass` = 3 WHERE `subname` = 'Pet Trainer';
diff --git a/sql_mr/mr00118_characters_anticheat_config.sql b/sql_mr/mr00118_characters_anticheat_config.sql
new file mode 100644
index 00000000000..1a78840d3a0
--- /dev/null
+++ b/sql_mr/mr00118_characters_anticheat_config.sql
@@ -0,0 +1,41 @@
+-- Anticheat
+-- Config
+
+-- Main checks
+REPLACE INTO `anticheat_config`
+    (`checktype`, `description`, `check_period`, `alarmscount`, `disableoperation`, `messagenum`, `intparam1`, `intparam2`, `floatparam1`, `floatparam2`, `action1`, `actionparam1`, `action2`, `actionparam2`)
+VALUES
+    -- Main checks
+    (0, "Null check",         0, 1, 0, 11000, 0, 0,    0, 0, 1, 0, 0, 0),
+    (1, "Movement cheat",     0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0),
+    (2, "Spell cheat",        0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0),
+    (3, "Quest cheat",        0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0),
+    (4, "Transport cheat",    0, 3, 0, 11000, 0, 0,  300,50, 2, 1, 0, 0),
+    (5, "Damage cheat",       0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0),
+    (6, "Item cheat",         0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0),
+    (7, "Warden check",       0, 1, 0, 11000, 0, 0,    0, 0, 2, 1, 0, 0);
+
+-- Subchecks
+REPLACE INTO `anticheat_config`
+    (`checktype`, `description`, `check_period`, `alarmscount`, `disableoperation`, `messagenum`, `intparam1`, `intparam2`, `floatparam1`, `floatparam2`, `action1`, `actionparam1`, `action2`, `actionparam2`)
+VALUES
+    (101, "Speed hack",              500, 5, 0, 11000,    10000, 0, 0.0012,    0, 2, 1, 6, 20000),
+    (102, "Fly hack",                500, 5, 0, 11000,    20000, 0,   10.0,    0, 2, 1, 0, 0),
+    (103, "Wall climb hack",         500, 2, 0, 11000,    10000, 0, 0.0015, 2.37, 2, 1, 0, 0),
+    (104, "Waterwalking hack",      1000, 3, 0, 11000,    20000, 0,      0,    0, 2, 1, 0, 0),
+    (105, "Teleport to plane hack",  500, 1, 0, 11000,        0, 0, 0.0001,  0.1, 2, 1, 0, 0),
+    (106, "AirJump hack" ,           500, 3, 0, 11000,    30000, 0,   10.0, 25.0, 2, 1, 0, 0),
+    (107, "Teleport hack" ,            0, 1, 0, 11000,        0, 0,   50.0,    0, 2, 1, 0, 0),
+    (108, "Fall hack" ,                0, 3, 0, 11000,    10000, 0,      0,    0, 2, 1, 0, 0),
+    (109, "Z Axis hack" ,              0, 1, 0, 11000,        0, 0,0.00001, 10.0, 2, 1, 0, 0),
+    (201, "Spell invalid",             0, 1, 0, 11000,        0, 0,      0,    0, 2, 1, 0, 0),
+    (202, "Spellcast in dead state",   0, 1, 0, 11000,        0, 0,      0,    0, 2, 1, 0, 0),
+    (203, "Spell not valid for player",0, 1, 0, 11000,        0, 0,      0,    0, 2, 1, 0, 0),
+    (204, "Spell not in player book",  0, 1, 0, 11000,        0, 0,      0,    0, 2, 1, 0, 0),
+    (501, "Spell damage hack",         0, 1, 0, 11000,        0, 50000,  0,    0, 2, 1, 0, 0),
+    (502, "Melee damage hack",         0, 1, 0, 11000,        0, 50000,  0,    0, 2, 1, 0, 0),
+    (601, "Item dupe hack",            0, 1, 0, 11000,        0,     0,  0,    0, 2, 1, 0, 0),
+    (701, "Warden memory check",       0, 1, 0, 11000,        0,     0,  0,    0, 2, 1, 0, 0),
+    (702, "Warden key check",          0, 1, 0, 11000,        0,     0,  0,    0, 2, 1, 0, 0),
+    (703, "Warden checksum check",     0, 1, 0, 11000,        0,     0,  0,    0, 2, 1, 0, 0),
+    (704, "Warden timeout check",      0, 1, 0, 11000,        0,     0,  0,    0, 2, 1, 0, 0);
diff --git a/sql_mr/mr00118_realmd_warden.sql b/sql_mr/mr00118_realmd_warden.sql
new file mode 100644
index 00000000000..b169b362276
--- /dev/null
+++ b/sql_mr/mr00118_realmd_warden.sql
@@ -0,0 +1,13 @@
+-- Warden data table structure from TOM_RUS
+DROP TABLE IF EXISTS `warden_data_result`;
+CREATE TABLE `warden_data_result` (
+  `id` int(4) NOT NULL auto_increment,
+  `check` int(3) default NULL,
+  `data` tinytext,
+  `str` tinytext,
+  `address` int(8) default NULL,
+  `length` int(2) default NULL,
+  `result` tinytext,
+  `comment` text,
+  PRIMARY KEY  (`id`)
+) DEFAULT CHARSET=utf8;
diff --git a/sql_mr/mr00176_characters_pet_cleanup.sql b/sql_mr/mr00176_characters_pet_cleanup.sql
new file mode 100644
index 00000000000..bb4db686f8f
--- /dev/null
+++ b/sql_mr/mr00176_characters_pet_cleanup.sql
@@ -0,0 +1,4 @@
+-- Pet table cleanup
+ALTER TABLE `character_pet`
+  DROP `resettalents_cost`,
+  DROP `resettalents_time`;
diff --git a/sql_mr/mr00242_mangos_creature_onkill_reputation.sql b/sql_mr/mr00242_mangos_creature_onkill_reputation.sql
new file mode 100644
index 00000000000..f3ac6b162b6
--- /dev/null
+++ b/sql_mr/mr00242_mangos_creature_onkill_reputation.sql
@@ -0,0 +1,2 @@
+-- Creature on kill Reputation
+UPDATE creature_onkill_reputation SET ChampioningAura = 57818 WHERE (RewOnKillRepFaction1= 1037 OR RewOnKillRepFaction2 = 1052) AND ChampioningAura = 0;
diff --git a/sql_mr/mr00299_mangos_mangos_string.sql b/sql_mr/mr00299_mangos_mangos_string.sql
new file mode 100644
index 00000000000..76295861523
--- /dev/null
+++ b/sql_mr/mr00299_mangos_mangos_string.sql
@@ -0,0 +1,14 @@
+DELETE FROM mangos_string WHERE entry BETWEEN 17890 AND 17896;
+INSERT INTO mangos_string (entry, content_default, content_loc8) VALUES
+(17890, 'Gamemaster %s banned account %s for %s. Reason: %s', 'Гейммастер %s забанил аккаунт %s на %s. Причина: %s'),
+(17891, 'Gamemaster %s banned account %s permanently. Reason: %s', 'Гейммастер %s забанил аккаунт %s перманентно. Причина: %s'),
+(17892, 'Gamemaster %s banned character %s for %s. Reason: %s', 'Гейммастер %s забанил персонажа %s на %s. Причина: %s'),
+(17893, 'Gamemaster %s banned character %s permanently. Reason: %s', 'Гейммастер %s забанил персонажа %s перманентно. Причина: %s'),
+(17894, 'Gamemaster %s banned IP address %s for %s. Reason: %s', 'Гейммастер %s забанил IP адрес %s на %s. Причина: %s'),
+(17895, 'Gamemaster %s banned IP address %s permanently. Reason: %s', 'Гейммастер %s забанил IP адрес %s перманентно. Причина: %s'),
+(17896, 'Gamemaster %s disabled %s\'s chat for %u minutes.', 'Гейммастер %s заблокировал чат %s на %u минут.');
+
+DELETE FROM mangos_string WHERE entry IN (548, 549);
+INSERT INTO mangos_string (entry, content_default, content_loc1, content_loc2, content_loc3, content_loc4, content_loc5, content_loc6, content_loc7, content_loc8) VALUES
+(548, 'Player%s %s (guid: %u) Account: %s (id: %u) E-mail: %s GMLevel: %u Last IP: %s Last login: %s Latency: %ums', NULL, NULL, NULL, NULL, NULL, NULL, NULL,'Игрок%s %s (GUID: %u) Аккаунт: %s (id: %u) Е-мейл: %s Уровень доступа: %u Последний IP: %s Последний вход: %s Задержка: %ums'),
+(549, 'Race: %s Class: %s Played time: %s Level: %u Money: %ug%us%uc', NULL, NULL, NULL, NULL, NULL, NULL, NULL,'Раса: %s Класс: %s Сыгранное время: %s Уровень: %u Количество денег: %ug%us');
diff --git a/sql_mr/mr00303_characters_hidden_rating.sql b/sql_mr/mr00303_characters_hidden_rating.sql
new file mode 100644
index 00000000000..f41ca791763
--- /dev/null
+++ b/sql_mr/mr00303_characters_hidden_rating.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS hidden_rating;
+CREATE TABLE IF NOT EXISTS hidden_rating (
+    guid INT(11) UNSIGNED NOT NULL,
+    rating2 INT(10) UNSIGNED NOT NULL,
+    rating3 INT(10) UNSIGNED NOT NULL,
+    rating5 INT(10) UNSIGNED NOT NULL,
+    PRIMARY KEY  (guid)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
diff --git a/sql_mr/mr00319_characters_Advance_chars_stats.sql b/sql_mr/mr00319_characters_Advance_chars_stats.sql
new file mode 100644
index 00000000000..6f1243f2463
--- /dev/null
+++ b/sql_mr/mr00319_characters_Advance_chars_stats.sql
@@ -0,0 +1,86 @@
+-- ADVANCE CHARACTERS TABLE
+
+SET FOREIGN_KEY_CHECKS=0;
+-- ----------------------------
+-- Table structure for `character_stats`
+-- ----------------------------
+DROP TABLE IF EXISTS `character_stats`;
+CREATE TABLE `character_stats` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier, Low part',
+  `maxhealth` int(10) unsigned NOT NULL default '0',
+  `maxpower1` int(10) unsigned NOT NULL default '0',
+  `maxpower2` int(10) unsigned NOT NULL default '0',
+  `maxpower3` int(10) unsigned NOT NULL default '0',
+  `maxpower4` int(10) unsigned NOT NULL default '0',
+  `maxpower5` int(10) unsigned NOT NULL default '0',
+  `maxpower6` int(10) unsigned NOT NULL default '0',
+  `maxpower7` int(10) unsigned NOT NULL default '0',
+  `strength` int(10) unsigned NOT NULL default '0',
+  `agility` int(10) unsigned NOT NULL default '0',
+  `stamina` int(10) unsigned NOT NULL default '0',
+  `intellect` int(10) unsigned NOT NULL default '0',
+  `spirit` int(10) unsigned NOT NULL default '0',
+  `armor` int(10) unsigned NOT NULL default '0',
+  `resHoly` int(10) unsigned NOT NULL default '0',
+  `resFire` int(10) unsigned NOT NULL default '0',
+  `resNature` int(10) unsigned NOT NULL default '0',
+  `resFrost` int(10) unsigned NOT NULL default '0',
+  `resShadow` int(10) unsigned NOT NULL default '0',
+  `resArcane` int(10) unsigned NOT NULL default '0',
+  `blockPct` float unsigned NOT NULL default '0',
+  `dodgePct` float unsigned NOT NULL default '0',
+  `parryPct` float unsigned NOT NULL default '0',
+  `critPct` float unsigned NOT NULL default '0',
+  `rangedCritPct` float unsigned NOT NULL default '0',
+  `spellCritPct` float unsigned NOT NULL default '0',
+  `attackPower` int(10) unsigned NOT NULL default '0',
+  `rangedAttackPower` int(10) unsigned NOT NULL default '0',
+  `spellPower` int(10) unsigned NOT NULL default '0',
+  `apmelee` int(11) NOT NULL,
+  `ranged` int(11) NOT NULL,
+  `blockrating` int(11) NOT NULL,
+  `defrating` int(11) NOT NULL,
+  `dodgerating` int(11) NOT NULL,
+  `parryrating` int(11) NOT NULL,
+  `resilience` int(11) NOT NULL,
+  `manaregen` float NOT NULL,
+  `melee_hitrating` int(11) NOT NULL,
+  `melee_critrating` int(11) NOT NULL,
+  `melee_hasterating` int(11) NOT NULL,
+  `melee_mainmindmg` float NOT NULL,
+  `melee_mainmaxdmg` float NOT NULL,
+  `melee_offmindmg` float NOT NULL,
+  `melee_offmaxdmg` float NOT NULL,
+  `melee_maintime` float NOT NULL,
+  `melee_offtime` float NOT NULL,
+  `ranged_critrating` int(11) NOT NULL,
+  `ranged_hasterating` int(11) NOT NULL,
+  `ranged_hitrating` int(11) NOT NULL,
+  `ranged_mindmg` float NOT NULL,
+  `ranged_maxdmg` float NOT NULL,
+  `ranged_attacktime` float NOT NULL,
+  `spell_hitrating` int(11) NOT NULL,
+  `spell_critrating` int(11) NOT NULL,
+  `spell_hasterating` int(11) NOT NULL,
+  `spell_bonusdmg` int(11) NOT NULL,
+  `spell_bonusheal` int(11) NOT NULL,
+  `spell_critproc` float NOT NULL,
+  `account` int(11) unsigned NOT NULL default '0',
+  `name` varchar(12) NOT NULL default '',
+  `race` tinyint(3) unsigned NOT NULL default '0',
+  `class` tinyint(3) unsigned NOT NULL default '0',
+  `gender` tinyint(3) unsigned NOT NULL default '0',
+  `level` tinyint(3) unsigned NOT NULL default '0',
+  `map` int(11) unsigned NOT NULL default '0',
+  `money` int(10) unsigned NOT NULL default '0',
+  `totaltime` int(11) unsigned NOT NULL default '0',
+  `online` int(10) unsigned NOT NULL default '0',
+  `arenaPoints` int(10) unsigned NOT NULL default '0',
+  `totalHonorPoints` int(10) unsigned NOT NULL default '0',
+  `totalKills` int(10) unsigned NOT NULL default '0',
+  `equipmentCache` longtext NOT NULL,
+  `specCount` tinyint(3) unsigned NOT NULL default '1',
+  `activeSpec` tinyint(3) unsigned NOT NULL default '0',
+  `data` longtext NOT NULL,
+  PRIMARY KEY  (`guid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/sql_mr/mr00480_mangos_shaman_overload.sql b/sql_mr/mr00480_mangos_shaman_overload.sql
new file mode 100644
index 00000000000..6ee11ddde8a
--- /dev/null
+++ b/sql_mr/mr00480_mangos_shaman_overload.sql
@@ -0,0 +1,37 @@
+-- Lightning Bolt
+DELETE FROM spell_chain WHERE first_spell = 45284;
+INSERT INTO spell_chain (spell_id, prev_spell, first_spell, rank) VALUES
+(45284,     0, 45284,  1),
+(45286, 45284, 45284,  2),
+(45287, 45286, 45284,  3),
+(45288, 45287, 45284,  4),
+(45289, 45288, 45284,  5),
+(45290, 45289, 45284,  6),
+(45291, 45290, 45284,  7),
+(45292, 45291, 45284,  8),
+(45293, 45292, 45284,  9),
+(45294, 45293, 45284, 10),
+(45295, 45294, 45284, 11),
+(45296, 45295, 45284, 12),
+(49239, 45296, 45284, 13),
+(49240, 49239, 45284, 14);
+
+DELETE FROM spell_bonus_data WHERE entry = 45284;
+INSERT INTO spell_bonus_data (entry, direct_bonus, comments) VALUES
+(45284, 0.3572, 'Shaman - Lightning Bolt Overload Proc');
+
+-- Chain Lightning
+DELETE FROM spell_chain WHERE first_spell = 45297;
+INSERT INTO spell_chain (spell_id, prev_spell, first_spell, rank) VALUES
+(45297,     0, 45297, 1),
+(45298, 45297, 45297, 2),
+(45299, 45298, 45297, 3),
+(45300, 45299, 45297, 4),
+(45301, 45300, 45297, 5),
+(45302, 45301, 45297, 6),
+(49268, 45302, 45297, 7),
+(49269, 49268, 45297, 8);
+
+DELETE FROM spell_bonus_data WHERE entry = 45297;
+INSERT INTO spell_bonus_data (entry, direct_bonus, comments) VALUES
+(45297, 0.2857, 'Shaman - Chain Lightning Overload Proc');
diff --git a/sql_mr/mr00528_mangos_lfg_quests.sql b/sql_mr/mr00528_mangos_lfg_quests.sql
new file mode 100644
index 00000000000..d467deb598b
--- /dev/null
+++ b/sql_mr/mr00528_mangos_lfg_quests.sql
@@ -0,0 +1,3 @@
+-- set LFG primary quests daily
+UPDATE `quest_template` SET `QuestFlags` = `QuestFlags` | 4096 WHERE `entry` IN
+    (SELECT `firstQuestId` FROM `lfg_dungeon_rewards` WHERE `otherQuestId` != 0);
diff --git a/sql_mr/mr00786_mangos_area_auras_cleanup.sql b/sql_mr/mr00786_mangos_area_auras_cleanup.sql
new file mode 100644
index 00000000000..5f75f2de220
--- /dev/null
+++ b/sql_mr/mr00786_mangos_area_auras_cleanup.sql
@@ -0,0 +1,3 @@
+-- Spell Area
+DELETE FROM `spell_area` WHERE `spell`='74411';
+DELETE FROM `spell_area` WHERE `spell`='74410';
diff --git a/sql_mr/mr00992_mangos_creature_template.sql b/sql_mr/mr00992_mangos_creature_template.sql
new file mode 100644
index 00000000000..700c4f40bc9
--- /dev/null
+++ b/sql_mr/mr00992_mangos_creature_template.sql
@@ -0,0 +1,14 @@
+-- SET Diminishing Returns for taunt
+UPDATE creature_template SET ExtraFlags = ExtraFlags|8192 WHERE rank = 3;
+
+-- Not Diminishing Returns for taunt
+UPDATE creature_template SET ExtraFlags = ExtraFlags&~8192 WHERE entry IN (
+-- Instructor Razuvious
+16061, 29940,
+-- Toravon the Ice Watcher
+38433, 38462,
+-- Gormok the Impaler
+34796, 35438, 35439, 35440,
+-- Lady Deathwhisper
+36855, 38106, 38296, 38297
+);
diff --git a/sql_mr/mr01004_mangos_spell_dbc.sql b/sql_mr/mr01004_mangos_spell_dbc.sql
new file mode 100644
index 00000000000..b382ee45362
--- /dev/null
+++ b/sql_mr/mr01004_mangos_spell_dbc.sql
@@ -0,0 +1,87 @@
+-- Spell DBC
+INSERT IGNORE INTO `spell_dbc`
+    (`Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`)
+VALUES
+    (24395, 0, 0, 536936848, 32768, 4, 0, 0, 0, 0, 0, 1, 1, 0, 0, 101, 0, 0, 40, 40, 85, 1, 0, -1, 0, 0, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 77, 77, 77, 0, 0, 0, 0, 0, 0, 1, 5, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Bestial Wrath - Immunity'),
+    (24396, 0, 0, 536936848, 32768, 4, 0, 0, 0, 0, 0, 1, 1, 0, 0, 101, 0, 0, 40, 40, 85, 1, 0, -1, 0, 0, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 77, 77, 77, 0, 0, 0, 0, 0, 0, 14, 13, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Bestial Wrath - Immunity'),
+    (24397, 0, 0, 536936848, 268468224, 4, 0, 0, 0, 0, 0, 1, 1, 0, 0, 101, 0, 0, 40, 40, 85, 1, 0, -1, 0, 0, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 77, 77, 77, 0, 0, 0, 0, 0, 0, 7, 10, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Bestial Wrath - Immunity'),
+    (26592, 0, 0, 536936848, 268468224, 4, 0, 0, 0, 0, 0, 1, 1, 0, 0, 101, 0, 0, 40, 40, 85, 1, 0, -1, 0, 0, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 77, 77, 77, 0, 0, 0, 0, 0, 0, 2, 18, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Bestial Wrath - Immunity'),
+    (24900, 0, 0, 400, 1024, 0, 0, 2097152, 0, 1, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 166, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Heart of the Wild - Cat Bonus'),
+    (24899, 0, 0, 400, 1024, 0, 0, 2097152, 0, 144, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 137, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Heart of the Wild - Bear Bonus'),
+    (56817, 0, 0, 384, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 16, 100, 1, 0, 67, 67, 1, 0, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Rune Strike - Aura for 56815'),
+    (62388, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Demonic Circle: Teleport(48020) - casterAuraSpell'),
+    (66002, 0, 0, 159383552, 32, 16384, 33620480, 128, 393288, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2925, 3075, 0, 0, 0, 0, 18, 0, 0, 31, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 'Proc from Touch of Darkness 10'),
+    (66000, 0, 0, 159383552, 32, 16384, 33620480, 128, 393288, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 5850, 6150, 0, 0, 0, 0, 18, 0, 0, 31, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 'Proc from Touch of Darkness 25'),
+    (65952, 0, 0, 159383552, 32, 16384, 33620480, 128, 393288, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 5850, 6150, 0, 0, 0, 0, 18, 0, 0, 31, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 'Proc from Touch of Light 25'),
+    (65951, 0, 0, 159383552, 32, 16384, 33620480, 128, 393288, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2925, 3075, 0, 0, 0, 0, 18, 0, 0, 31, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 'Proc from Touch of Light 10'),
+    (65142, 3, 22, 0, 0, 0, 128, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 21, 13, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 'Crypt Fever - SPELL_AURA_LINKED'),
+    (34145, 0, 0, 0, 0, 0, 67108864, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 80, 80, 0, 1, 0, -1, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29886, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 'Ritual of Souls Rank 1 - Trigger Create Soulwell (29886)'),
+    (58888, 0, 0, 0, 0, 0, 67108864, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 68, 68, 0, 1, 0, -1, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58889, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 'Ritual of Souls Rank 2 - Trigger Create Soulwell (58889)'),
+    (61988, 0, 0, 671089024, 268436480, 4, 269484032, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 25, 13, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Divine Shield Exclude Aura - 61988'),
+    (42876, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 9275 reward serverside spell'),
+    (44987, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11521 reward serverside spell'),
+    (48803, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 12214 reward serverside spell'),
+    (68496, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item_template serverside spell'),
+    (72958, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item_template serverside spell'),
+    (32780, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 10040 reward serverside spell'),
+    (45453, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11587 reward serverside spell'),
+    (25347, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item_template serverside spell'),
+    (45315, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11566 reward serverside spell'),
+    (43236, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11288 reward serverside spell'),
+    (43459, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11332 reward serverside spell'),
+    (43499, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11250 reward serverside spell'),
+    (44275, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11432 reward serverside spell'),
+    (64689, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 13854 and 13862 reward serverside spell'),
+    (50574, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 12597 reward serverside spell'),
+    (71356, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2108 spellid0 serverside spell'),
+    (71803, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2108 spellid1 serverside spell'),
+    (72111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2136 spellid0 serverside spell'),
+    (72125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2136 spellid1 serverside spell'),
+    (70816, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid0 serverside spell'),
+    (72233, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid1 serverside spell'),
+    (72234, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid2 serverside spell'),
+    (72235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid3 serverside spell'),
+    (58428, 0, 0, 671089024, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 100, 0, 0, 0, 0, 18, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 226, 0, 0, 20000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 'Overkill - aura remove spell'),
+    (43503, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11261 reward serverside spell'),
+    (39613, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 10967 reward serverside spell'),
+    (34448, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Serverside spell orb of translocation (gobjid=180911)'),
+    (34452, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Serverside spell orb of translocation (gobjid=180912)'),
+    (39616, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 10966 reward serverside spell'),
+    (11202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item 3776 spellid_1 serverside spell'),
+    (25359, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item 21293 spellid_2 serverside spell'),
+    (40145, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11000 RewSpellCast serverside spell'),
+    (45767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11670 RewSpellCast serverside spell'),
+    (71098, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 24451 RewSpellCast serverside spell'),
+    (70878, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Creature 40160 creature_addon serverside spell'),
+    (38406, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 10721 RewSpellCast serverside spell'),
+    (44805, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Aura used in creature_addon - serverside spell'),
+    (3617, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'NPC 32958 suicide spell'),
+    (58630, 0, 0, 536870912, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Mal''ganis credit marker'),
+    (68572, 0, 0, 536870912, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Grand Champions credit marker'),
+    (68574, 0, 0, 536870912, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Argent Champion credit marker'),
+    (59046, 0, 0, 536870912, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Tribunal of Ages credit marker'),
+    (68184, 0, 0, 536870912, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Faction Champions credit marker'),
+    (59450, 0, 0, 536870912, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'The Four Horsemen credit marker'),
+    (65195, 0, 0, 536870912, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'The Iron Council credit marker'),
+    (64899, 0, 0, 536870912, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Hodir credit marker'),
+    (64985, 0, 0, 536870912, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Thorim credit marker'),
+    (65074, 0, 0, 536870912, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 16, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Freya credit marker');
+
+-- XT-002 Heart Overload Trigger Spell
+DELETE FROM `spell_dbc` WHERE `Id`=62791;
+INSERT INTO `spell_dbc` (`Id`,`Effect1`,`Comment`) VALUES (62791,3,'XT-002 Heart Overload Trigger Spell');
+
+-- Vault of Archavon - Earth, Wind & Fire - Achievement Check
+DELETE FROM `spell_dbc` WHERE `id` IN (68308);
+INSERT INTO `spell_dbc` (`Id`, `Attributes`, `AttributesEx`, `AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`Effect1`,`EffectImplicitTargetA1`,`EffectImplicitTargetB1`,`comment`)
+VALUES (68308, 0x09800100, 0x00000420, 0x00004005, 0x10040000, 0x00000080, 0x00000008, 0x00001000, 3, 1, 0, 'Vault of Archavon - Earth, Wind & Fire - Achievement Check');
+
+-- Glyph of Blackstab - 3.2.2
+DELETE FROM `spell_dbc` WHERE `Id`=63975;
+INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES
+(63975,0,0,384,0,0,262144,128,0,0,0,0,1,0,0,0,0,0,0,0,0,13,0,-1,0,0,77,0,0,0,1,1,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,'Glyph of Blackstab - 3.2.2');
+
+-- GY Mid Trigger - 2.0.12 spell - AV Snowfall Graveyard
+DELETE FROM `spell_dbc` WHERE `Id`=24677;
+INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES
+(24677,0,0,256,0,4,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,6,0,-1,0,0,77,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,'GY Mid Trigger - 2.0.12 spell - AV Snowfall Graveyard');
diff --git a/sql_mr/mr01120_characters_anticheat_extend.sql b/sql_mr/mr01120_characters_anticheat_extend.sql
new file mode 100644
index 00000000000..f04e34a0c3c
--- /dev/null
+++ b/sql_mr/mr01120_characters_anticheat_extend.sql
@@ -0,0 +1,5 @@
+-- anticheat config disabled zones column
+ALTER TABLE `anticheat_config`
+    ADD COLUMN `disabledzones` varchar(255) NOT NULL DEFAULT '' 
+    COMMENT 'List of zones, in which check disabled.'
+    AFTER `actionparam2`;
diff --git a/sql_mr/mr01129_mangos_typos_in_commands.sql b/sql_mr/mr01129_mangos_typos_in_commands.sql
new file mode 100644
index 00000000000..97825362de9
--- /dev/null
+++ b/sql_mr/mr01129_mangos_typos_in_commands.sql
@@ -0,0 +1,10 @@
+DELETE FROM `command` WHERE `name` IN ('cast','cast back','cast self','cast target');
+INSERT INTO `command` (`name`,`security`,`help`) VALUES
+('cast', 3,'Syntax: .cast #spellid [triggered]\r\n  Cast #spellid to selected target. If no target selected cast to self. If \'triggered\' or part provided then spell casted with triggered flag.'),
+('cast back', 3,'Syntax: .cast back #spellid [triggered]\r\n  Selected target will cast #spellid to your character. If \'triggered\' or part provided then spell casted with triggered flag.'),
+('cast self', 3,'Syntax: .cast self #spellid [triggered]\r\nCast #spellid by target at target itself. If \'triggered\' or part provided then spell casted with triggered flag.'),
+('cast target', 3,'Syntax: .cast target #spellid [triggered]\r\n  Selected target will cast #spellid to his victim. If \'triggered\' or part provided then spell casted with triggered flag.');
+
+DELETE IGNORE FROM `command` WHERE `name` = 'cast dist';
+INSERT IGNORE INTO `command` (`name`,`security`,`help`) VALUES
+('cast dist', 3,'Syntax: .cast dist #spellid [#dist [triggered]]\r\n  You will cast spell to pint at distance #dist. If \'triggered\' or part provided then spell casted with triggered flag. Not all spells can be casted as area spells.');
diff --git a/sql_mr/mr01157_mangos_faction_change_reputations.sql b/sql_mr/mr01157_mangos_faction_change_reputations.sql
new file mode 100644
index 00000000000..f342cc479f6
--- /dev/null
+++ b/sql_mr/mr01157_mangos_faction_change_reputations.sql
@@ -0,0 +1,15 @@
+-- Race Faction Change - Reputations
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '47', 'Ironforge', '0', '530', 'Darkspear Trolls');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '509', 'The League of Arathor', '0', '510', 'The Defilers');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '730', 'Stormpike Guard', '0', '729', 'Frostwolf Clan');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '890', 'Silverwing Sentinels', '0', '889', 'Warsong Outriders');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '946', 'Honor Hold', '0', '947', 'Thrallmar');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '978', 'Kurenai', '0', '941', 'The Mag\'har');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '1037', 'Alliance Vanguard', '0', '1052', 'Horde Expedition');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '1050', 'Valiance Expedition', '0', '1085', 'Warsong Offensive');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '1068', 'Explorers\' League', '0', '1064', 'The Taunka');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '1126', 'The Frostborn', '0', '1067', 'The Hand of Vengeance');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '54', 'Gnomeregan Exiles', '0', '81', 'Thunder Bluff');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '69', 'Darnassus', '0', '68', 'Undercity');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '72', 'Stormwind', '0', '76', 'Orgrimmar');
+INSERT INTO `player_factionchange_reputations` VALUES ('0', '930', 'Exodar', '0', '911', 'Silvermoon City');
diff --git a/sql_mr/mr01189_characters_wowarmory.sql b/sql_mr/mr01189_characters_wowarmory.sql
new file mode 100644
index 00000000000..701d0432530
--- /dev/null
+++ b/sql_mr/mr01189_characters_wowarmory.sql
@@ -0,0 +1,3 @@
+-- Drop WowArmory support
+DROP TABLE IF EXISTS `armory_character_stats`;
+DROP TABLE IF EXISTS `armory_character_feed_log`;
diff --git a/sql_mr/mr01204_mangos_pet_scaling.sql b/sql_mr/mr01204_mangos_pet_scaling.sql
new file mode 100644
index 00000000000..995d85c49df
--- /dev/null
+++ b/sql_mr/mr01204_mangos_pet_scaling.sql
@@ -0,0 +1,92 @@
+-- Pet scaling data table from /dev/rsa
+
+-- Creature 0 (default) - MUST be exist!
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 0;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(0, 0, 0, 1000, 0, 1500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 200, 0, 0, 0, 100, 100, 100, 100, 0, 0);
+
+-- Pet 1 - default hunter pet
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 1;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(1,     0, 0, 1050, 0, 1500, 0, 0, 45, 0, 0, 35, 40, 40, 40, 40, 40, 40, 20, 200, 22, 0, 13, 100, 100, 100, 100, 0, 0),
+(1, 62758, 0,    0, 0,    0, 0, 0,  9, 0, 0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  6, 0,  3,   0,   0,   0,   0, 0, 0),
+(1, 62762, 0,    0, 0,    0, 0, 0, 18, 0, 0,  0,  0,  0,  0,  0,  0,  0,  0,   0, 12, 0,  6,   0,   0,   0,   0, 0, 0);
+
+-- Pet 26611 - shaman spirit wolf
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 29264;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(29264,     0, 0, 1000, 0, 1500, 0, 0, 30, 0, 0, 35, 40, 40, 40, 40, 40, 40, 20, 200, 22, 0, 13, 100, 100, 100, 100, 0, 0),
+(29264, 63271, 0,    0, 0,    0, 0, 0,  0, 0, 0,  0,  0,  0,  0,  0,  0,  0,  0,   0, 30, 0,  0,   0,   0,   0,   0, 0, 0);
+
+-- Pet 26125 - DK ghoul
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 26125;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(26125,     0, 0, 1000, 0, 0, 70, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 100, 0, 83, 0, 0, 100, 100, 100, 0, 0),
+(26125, 48965, 0,    0, 0, 0, 14, 0,  6, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,   0, 0,  0, 0, 0,   0,   0,   0, 0, 0),
+(26125, 49571, 0,    0, 0, 0, 28, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,   0, 0,  0, 0, 0,   0,   0,   0, 0, 0),
+(26125, 49572, 0,    0, 0, 0, 42, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,   0, 0,  0, 0, 0,   0,   0,   0, 0, 0),
+(26125, 58686, 0,    0, 0, 0, 40, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,   0, 0,  0, 0, 0,   0,   0,   0, 0, 0);
+
+-- Pet 416 - warlock imp
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 416;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(416, 0, 0, 840, 0, 495, 0, 0, 75, 30, 0, 35, 40, 40, 40, 40, 40, 40, 10, 100, 57, 0, 15, 100, 100, 100, 100, 0, 20);
+
+-- Pet 417 - warlock felhunter
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 417;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(417, 0, 0, 950, 0, 1150, 0, 0, 75, 30, 0, 35, 40, 40, 40, 40, 40, 40, 20, 200, 57, 0, 15, 100, 100, 100, 100, 0, 20);
+
+-- Pet 1860 - warlock voidwalker
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 1860;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(1860,     0, 0, 1100, 0, 1150, 0, 0, 75, 30, 0, 35, 40, 40, 40, 40, 40, 40, 20, 200, 57, 0, 15, 100, 100, 100, 100, 0, 20),
+(1860, 57277, 0,    0, 0,    0, 0, 0, 20,  0, 0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0, 0,  0,   0,   0,   0,   0, 0,  0);
+
+-- Pet 1863 - warlock succubus
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 1863;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(1863, 0, 0, 910, 0, 1150, 0, 0, 75, 30, 0, 35, 40, 40, 40, 40, 40, 40, 20, 200, 57, 0, 15, 100, 100, 100, 100, 0, 20);
+
+-- Pet 17252 - warlock felguard
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 17252;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(17252,     0, 0, 1100, 0, 1150, 0, 0, 75, 30, 0, 35, 40, 40, 40, 40, 40, 40, 20, 200, 57, 0, 15, 100, 100, 100, 100, 0, 20),
+(17252, 56246, 0,    0, 0,    0, 0, 0,  0,  0, 0,  0,  0,  0,  0,  0,  0,  0,  0,   0, 20, 0,  0,   0,   0,   0,   0, 0,  0);
+
+
+-- Pet 37994 - Mage water elemental
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 37994;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(37994, 0, 0, 1000, 0, 1500, 0, 0, 30, 30, 0, 35, 0, 0, 0, 0, 0, 0, 20, 200, 0, 0, 40, 100, 100, 100, 100, 0, 0);
+
+-- Pet 19668 - Priest  Shadowfiend
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 19668;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(19668, 0, 0, 1000, 0, 1500, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 200, 400, 0, 67, 100, 100, 100, 100, 0, 0);
+
+-- Guardian 31216 - mage Mirror image
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 31216;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(31216, 0, 0, 1000, 0, 1500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 200, 0, 0, 33, 100, 100, 100, 100, 0, 0);
+
+-- Guardian 27829 - DK Gargoyle
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 27829;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(27829, 0, 0, 1000, 0, 1500, 100, 0, 100, 0, 0, 35, 0, 0, 0, 0, 0, 0, 20, 200, 0, 0, 50, 100, 100, 100, 100, 0, 0);
+
+-- Guardian 15352 - Greater Earth Elemental
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 15352;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(15352, 0, 0, 1000, 0, 1500, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 200, 40, 0, 30, 100, 100, 100, 100, 0, 0);
+
+-- Guardian 15438 - Greater Fire Elemental
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 15438;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(15438, 0, 0, 1000, 0, 1500, 0, 0, 20, 10, 0, 0, 0, 0, 0, 0, 0, 0, 20, 200, 80, 0, 40, 100, 100, 100, 100, 0, 0);
+
+-- Pet 510 - Mage water elemental (old guardian)
+DELETE FROM `pet_scaling_data` WHERE `creature_entry` = 510;
+INSERT INTO `pet_scaling_data` (`creature_entry`, `aura`, `healthbase`, `health`, `powerbase`, `power`, `str`, `agi`, `sta`, `inte`, `spi`, `armor`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `apbase`, `apbasescale`, `attackpower`, `damage`, `spelldamage`, `spellhit`, `hit`, `expertize`, `attackspeed`, `crit`, `regen`) VALUES
+(510, 0, 0, 1000, 0, 1500, 0, 0, 30, 30, 0, 35, 0, 0, 0, 0, 0, 0, 20, 200, 0, 0, 40, 100, 100, 100, 100, 0, 0);
+
diff --git a/sql_mr/mr01208_mangos_pet_levelstats.sql b/sql_mr/mr01208_mangos_pet_levelstats.sql
new file mode 100644
index 00000000000..659182f238f
--- /dev/null
+++ b/sql_mr/mr01208_mangos_pet_levelstats.sql
@@ -0,0 +1,767 @@
+-- Pets levelstats from wowwiki
+
+-- default pet
+DELETE FROM `pet_levelstats` WHERE `creature_entry`='1';
+INSERT INTO `pet_levelstats`
+    (`creature_entry`, `level`, `hp`, `mana`, `armor`, `mindmg`, `maxdmg`, `attackpower`, `str`, `agi`, `sta`, `inte`, `spi`)
+VALUES
+    (1, 1, 42, 1, 20, 2, 3, 10, 22, 20, 22, 20, 20),
+    (1, 2, 55, 1, 21, 3, 4, 11, 23, 21, 23, 20, 20),
+    (1, 3, 71, 1, 46, 3, 6, 12, 24, 21, 24, 20, 21),
+    (1, 4, 86, 1, 82, 5, 7, 13, 25, 22, 25, 21, 21),
+    (1, 5, 102, 1, 126, 6, 9, 13, 26, 23, 25, 21, 21),
+    (1, 6, 120, 1, 180, 7, 11, 14, 27, 24, 26, 21, 22),
+    (1, 7, 137, 1, 245, 9, 14, 15, 28, 24, 27, 21, 22),
+    (1, 8, 156, 1, 322, 10, 15, 16, 29, 25, 28, 22, 22),
+    (1, 9, 176, 1, 412, 11, 16, 17, 30, 26, 29, 22, 23),
+    (1, 10, 198, 1, 518, 11, 17, 17, 31, 26, 30, 22, 23),
+    (1, 11, 222, 1, 545, 12, 18, 18, 32, 27, 34, 22, 24),
+    (1, 12, 247, 1, 580, 13, 19, 19, 33, 28, 38, 23, 25),
+    (1, 13, 273, 1, 615, 13, 20, 20, 34, 30, 42, 23, 25),
+    (1, 14, 300, 1, 650, 14, 21, 21, 35, 31, 46, 23, 27),
+    (1, 15, 328, 1, 685, 15, 23, 22, 37, 32, 51, 24, 28),
+    (1, 16, 356, 1, 721, 16, 24, 24, 38, 33, 55, 25, 29),
+    (1, 17, 386, 1, 756, 17, 25, 26, 40, 34, 59, 25, 30),
+    (1, 18, 417, 1, 791, 18, 27, 27, 42, 36, 63, 25, 30),
+    (1, 19, 449, 1, 826, 19, 28, 28, 44, 37, 67, 26, 32),
+    (1, 20, 484, 1, 861, 20, 30, 30, 45, 39, 72, 27, 33),
+    (1, 21, 521, 1, 897, 21, 31, 32, 47, 39, 76, 27, 34),
+    (1, 22, 562, 1, 932, 22, 32, 34, 49, 40, 80, 27, 35),
+    (1, 23, 605, 1, 967, 23, 33, 35, 50, 42, 84, 28, 36),
+    (1, 24, 651, 1, 1002, 24, 35, 36, 52, 43, 88, 28, 37),
+    (1, 25, 699, 1, 1037, 25, 36, 37, 53, 45, 94, 29, 39),
+    (1, 26, 750, 1, 1072, 26, 37, 39, 55, 46, 98, 30, 39),
+    (1, 27, 800, 1, 1108, 27, 39, 40, 56, 47, 102, 30, 40),
+    (1, 28, 853, 1, 1142, 28, 40, 42, 58, 49, 106, 30, 41),
+    (1, 29, 905, 1, 1177, 29, 41, 44, 60, 50, 110, 31, 42),
+    (1, 30, 955, 1, 1212, 30, 43, 44, 61, 52, 115, 32, 44),
+    (1, 31, 1006, 1, 1247, 30, 44, 46, 63, 53, 120, 32, 44),
+    (1, 32, 1057, 1, 1283, 31, 45, 47, 64, 54, 124, 33, 46),
+    (1, 33, 1110, 1, 1317, 32, 46, 49, 66, 56, 128, 33, 46),
+    (1, 34, 1163, 1, 1353, 33, 47, 50, 67, 57, 132, 33, 48),
+    (1, 35, 1220, 1, 1387, 34, 48, 52, 69, 59, 138, 35, 49),
+    (1, 36, 1277, 1, 1494, 36, 50, 54, 70, 60, 142, 35, 50),
+    (1, 37, 1336, 1, 1607, 37, 51, 55, 72, 61, 146, 35, 52),
+    (1, 38, 1395, 1, 1724, 38, 53, 57, 74, 63, 151, 36, 52),
+    (1, 39, 1459, 1, 1849, 40, 55, 60, 76, 64, 155, 36, 54),
+    (1, 40, 1524, 1, 1980, 41, 57, 62, 78, 66, 160, 37, 55),
+    (1, 41, 1585, 1, 2117, 43, 59, 64, 81, 68, 165, 38, 56),
+    (1, 42, 1651, 1, 2262, 44, 61, 67, 86, 69, 169, 38, 57),
+    (1, 43, 1716, 1, 2414, 45, 64, 71, 91, 71, 174, 39, 58),
+    (1, 44, 1782, 1, 2574, 47, 67, 74, 97, 72, 178, 39, 59),
+    (1, 45, 1848, 1, 2742, 48, 70, 77, 102, 74, 184, 40, 61),
+    (1, 46, 1919, 1, 2798, 50, 73, 83, 104, 75, 188, 41, 62),
+    (1, 47, 1990, 1, 2853, 52, 76, 85, 106, 77, 193, 41, 63),
+    (1, 48, 2062, 1, 2907, 55, 79, 87, 108, 79, 197, 42, 64),
+    (1, 49, 2138, 1, 2963, 59, 82, 89, 110, 80, 202, 42, 66),
+    (1, 50, 2215, 1, 3018, 60, 87, 91, 113, 82, 207, 43, 67),
+    (1, 51, 2292, 1, 3072, 62, 88, 93, 115, 84, 212, 44, 68),
+    (1, 52, 2371, 1, 3128, 63, 90, 95, 117, 85, 216, 44, 69),
+    (1, 53, 2453, 1, 3183, 65, 91, 97, 119, 87, 221, 45, 70),
+    (1, 54, 2533, 1, 3237, 66, 93, 99, 122, 89, 226, 45, 72),
+    (1, 55, 2614, 1, 3292, 67, 94, 101, 124, 91, 231, 47, 73),
+    (1, 56, 2699, 1, 3348, 69, 96, 104, 127, 92, 236, 47, 74),
+    (1, 57, 2784, 1, 3402, 72, 101, 108, 129, 94, 241, 48, 76),
+    (1, 58, 2871, 1, 3457, 76, 106, 112, 131, 96, 245, 48, 77),
+    (1, 59, 2961, 1, 3512, 80, 112, 116, 134, 98, 250, 49, 78),
+    (1, 60, 3052, 1, 3814, 88, 123, 122, 136, 100, 256, 50, 80),
+    (1, 61, 3144, 1, 4113, 92, 133, 128, 139, 102, 161, 51, 81),
+    (1, 62, 3237, 1, 4410, 98, 162, 136, 141, 105, 266, 52, 83),
+    (1, 63, 3331, 1, 4708, 102, 164, 138, 144, 107, 271, 53, 85),
+    (1, 64, 3425, 1, 5006, 106, 166, 142, 146, 110, 276, 54, 87),
+    (1, 65, 3524, 1, 5303, 108, 168, 144, 149, 113, 281, 55, 89),
+    (1, 66, 3624, 1, 5601, 111, 169, 146, 151, 116, 287, 56, 91),
+    (1, 67, 3728, 1, 5900, 115, 170, 148, 154, 119, 292, 57, 93),
+    (1, 68, 3834, 1, 6197, 118, 171, 150, 156, 122, 297, 58, 95),
+    (1, 69, 3941, 1, 6495, 123, 173, 153, 159, 125, 302, 59, 97),
+    (1, 70, 4051, 1, 6794, 138, 174, 155, 162, 128, 307, 60, 99),
+    (1, 71, 4162, 1, 7093, 152, 205, 167, 165, 131, 311, 61, 97),
+    (1, 72, 4273, 1, 7392, 175, 228, 179, 168, 134, 316, 62, 99),
+    (1, 73, 4384, 1, 7691, 189, 246, 192, 171, 137, 321, 63, 101),
+    (1, 74, 4495, 1, 7990, 205, 267, 205, 174, 140, 326, 64, 103),
+    (1, 75, 4606, 1, 8289, 221, 289, 217, 177, 143, 331, 65, 105),
+    (1, 76, 4717, 1, 8588, 237, 308, 229, 180, 146, 336, 66, 107),
+    (1, 77, 4828, 1, 8887, 252, 331, 242, 183, 149, 341, 67, 109),
+    (1, 78, 4939, 1, 9186, 262, 353, 257, 186, 152, 346, 68, 111),
+    (1, 79, 5050, 1, 9485, 280, 375, 270, 189, 155, 351, 69, 113),
+    (1, 80, 5161, 1, 9784, 346, 499, 287, 192, 158, 356, 70, 115);
+
+-- warlock imp
+DELETE FROM pet_levelstats WHERE creature_entry = 416;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(416, 1, 140, 48, 20, 2, 3, 10, 20, 20, 20, 24, 23),
+(416, 2, 149, 59, 20, 3, 4, 11, 21, 20, 20, 25, 24),
+(416, 3, 158, 70, 20, 3, 6, 12, 22, 20, 21, 26, 25),
+(416, 4, 168, 81, 33, 5, 7, 13, 23, 21, 21, 27, 26),
+(416, 5, 177, 92, 49, 6, 9, 13, 23, 21, 22, 28, 27),
+(416, 6, 186, 103, 68, 7, 11, 14, 24, 21, 22, 29, 27),
+(416, 7, 195, 114, 92, 9, 14, 15, 25, 21, 23, 30, 28),
+(416, 8, 204, 125, 117, 10, 15, 16, 26, 21, 23, 31, 29),
+(416, 9, 213, 136, 147, 11, 16, 17, 27, 21, 23, 32, 30),
+(416, 10, 223, 147, 180, 11, 17, 17, 27, 22, 24, 33, 31),
+(416, 11, 232, 158, 190, 12, 18, 18, 28, 22, 24, 37, 35),
+(416, 12, 250, 180, 203, 13, 19, 19, 29, 22, 26, 41, 39),
+(416, 13, 289, 203, 215, 13, 20, 20, 30, 22, 26, 44, 43),
+(416, 14, 299, 227, 228, 14, 21, 21, 31, 22, 28, 50, 47),
+(416, 15, 309, 251, 240, 15, 23, 22, 32, 23, 29, 54, 52),
+(416, 16, 329, 275, 253, 16, 24, 24, 34, 23, 30, 57, 56),
+(416, 17, 350, 300, 265, 17, 25, 26, 36, 23, 31, 61, 60),
+(416, 18, 362, 314, 278, 18, 27, 27, 37, 23, 32, 65, 65),
+(416, 19, 393, 351, 291, 19, 28, 28, 38, 23, 33, 70, 69),
+(416, 20, 403, 377, 303, 20, 30, 30, 40, 24, 35, 74, 74),
+(416, 21, 425, 393, 320, 21, 31, 32, 42, 24, 44, 87, 64),
+(416, 22, 449, 420, 346, 22, 32, 34, 44, 24, 46, 91, 67),
+(416, 23, 473, 447, 360, 23, 33, 35, 45, 24, 47, 95, 69),
+(416, 24, 520, 476, 373, 24, 35, 36, 46, 25, 49, 99, 73),
+(416, 25, 540, 504, 386, 25, 36, 37, 47, 25, 50, 104, 75),
+(416, 26, 569, 534, 399, 26, 37, 39, 49, 25, 51, 107, 78),
+(416, 27, 571, 564, 411, 27, 39, 40, 50, 25, 53, 111, 81),
+(416, 28, 574, 592, 424, 28, 40, 42, 52, 25, 54, 118, 86),
+(416, 29, 576, 620, 436, 29, 41, 44, 54, 26, 56, 122, 89),
+(416, 30, 579, 648, 449, 30, 43, 44, 54, 26, 57, 128, 92),
+(416, 31, 581, 676, 462, 30, 44, 46, 56, 26, 59, 131, 95),
+(416, 32, 590, 720, 476, 31, 45, 47, 57, 26, 61, 136, 98),
+(416, 33, 598, 742, 488, 32, 46, 49, 59, 27, 61, 139, 101),
+(416, 34, 601, 793, 501, 33, 47, 50, 60, 27, 63, 143, 104),
+(416, 35, 609, 845, 513, 0, 0, 0, 64, 19, 62, 66, 107),
+(416, 36, 617, 879, 525, 0, 0, 0, 67, 19, 62, 66, 110),
+(416, 37, 626, 916, 537, 0, 0, 0, 69, 19, 63, 68, 112),
+(416, 38, 634, 952, 549, 0, 0, 0, 70, 19, 63, 68, 115),
+(416, 39, 642, 988, 561, 0, 0, 0, 72, 19, 64, 69, 118),
+(416, 40, 650, 1026, 639, 0, 0, 0, 74, 20, 64, 156, 142),
+(416, 41, 668, 1063, 694, 0, 0, 0, 77, 20, 65, 160, 143),
+(416, 42, 676, 1103, 756, 44, 61, 67, 77, 29, 61, 159, 131),
+(416, 43, 685, 1187, 808, 0, 0, 0, 87, 20, 66, 167, 145),
+(416, 44, 693, 1214, 853, 0, 0, 0, 91, 21, 66, 170, 146),
+(416, 45, 701, 1240, 884, 0, 0, 0, 96, 21, 67, 174, 148),
+(416, 46, 709, 1267, 910, 0, 0, 83, 93, 30, 66, 175, 144),
+(416, 47, 718, 1294, 928, 0, 0, 85, 95, 31, 68, 180, 148),
+(416, 48, 726, 1320, 946, 0, 0, 87, 97, 31, 68, 184, 151),
+(416, 49, 734, 1347, 964, 0, 0, 89, 99, 31, 70, 188, 155),
+(416, 50, 747, 1391, 983, 63, 87, 91, 101, 32, 72, 192, 158),
+(416, 51, 750, 1435, 996, 0, 0, 0, 109, 22, 74, 202, 161),
+(416, 52, 764, 1481, 1013, 0, 0, 0, 112, 24, 76, 208, 165),
+(416, 53, 787, 1527, 1039, 0, 0, 0, 114, 25, 78, 215, 168),
+(416, 54, 820, 1573, 1055, 66, 93, 99, 109, 33, 77, 209, 172),
+(416, 55, 836, 1620, 1078, 0, 0, 0, 119, 26, 81, 229, 177),
+(416, 56, 846, 1666, 1091, 69, 96, 104, 114, 34, 80, 221, 181),
+(416, 57, 850, 1714, 1101, 0, 0, 0, 123, 27, 83, 243, 185),
+(416, 58, 862, 1763, 1125, 0, 0, 0, 125, 27, 84, 250, 189),
+(416, 59, 878, 1824, 1150, 0, 0, 0, 127, 27, 85, 258, 192),
+(416, 60, 920, 1898, 1163, 88, 123, 122, 122, 35, 86, 264, 260),
+(416, 61, 973, 1925, 1608, 0, 0, 0, 132, 29, 88, 271, 239),
+(416, 62, 1050, 1977, 2807, 183, 162, 116, 126, 35, 102, 328, 212),
+(416, 63, 1188, 2030, 1732, 0, 0, 0, 137, 32, 92, 285, 244),
+(416, 64, 1292, 2084, 1809, 0, 0, 0, 139, 33, 95, 292, 247),
+(416, 65, 1335, 2137, 1844, 0, 0, 0, 140, 33, 97, 299, 250),
+(416, 66, 1357, 2191, 1872, 0, 0, 0, 141, 33, 97, 306, 255),
+(416, 67, 1401, 2244, 1900, 0, 0, 0, 142, 33, 98, 313, 258),
+(416, 68, 1429, 2298, 1987, 0, 0, 0, 143, 34, 98, 320, 260),
+(416, 69, 1464, 2351, 2008, 0, 0, 0, 144, 36, 100, 327, 262),
+(416, 70, 1528, 2568, 2207, 138, 174, 135, 145, 39, 101, 327, 263),
+(416, 71, 1580, 2632, 2319, 0, 0, 0, 148, 40, 102, 342, 269),
+(416, 72, 1639, 2695, 2431, 0, 0, 0, 150, 41, 104, 351, 274),
+(416, 73, 1699, 2763, 2544, 0, 0, 0, 153, 44, 104, 358, 280),
+(416, 74, 1761, 2830, 2660, 0, 0, 0, 156, 45, 108, 365, 283),
+(416, 75, 1821, 2896, 2760, 0, 0, 0, 159, 46, 109, 373, 288),
+(416, 76, 1882, 2964, 2890, 0, 0, 0, 164, 48, 110, 381, 295),
+(416, 77, 1949, 3033, 2999, 0, 0, 0, 166, 49, 113, 390, 300),
+(416, 78, 2011, 3100, 3110, 0, 0, 0, 168, 50, 114, 397, 308),
+(416, 79, 2073, 3167, 3150, 0, 0, 0, 171, 51, 115, 392, 313),
+(416, 80, 2129, 3228, 6273, 346, 499, 287, 297, 79, 118, 369, 367);
+
+-- warlock voidwalker
+DELETE FROM pet_levelstats WHERE creature_entry = 1860;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(1860, 1, 40, 48, 831, 13, 19, 38, 29, 10, 29, 25, 27),
+(1860, 2, 49, 59, 40, 0, 0, 0, 14, 15, 2, 1, 0),
+(1860, 3, 58, 70, 60, 0, 0, 0, 15, 16, 4, 1, 0),
+(1860, 4, 68, 81, 80, 0, 0, 0, 17, 17, 8, 2, 0),
+(1860, 5, 77, 92, 100, 0, 0, 0, 18, 18, 12, 2, 0),
+(1860, 6, 86, 103, 120, 0, 0, 0, 20, 19, 16, 3, 0),
+(1860, 7, 95, 114, 140, 0, 0, 0, 22, 20, 21, 3, 0),
+(1860, 8, 104, 125, 160, 0, 0, 0, 23, 21, 25, 4, 0),
+(1860, 9, 113, 136, 180, 0, 0, 0, 25, 22, 27, 4, 0),
+(1860, 10, 260, 147, 831, 13, 19, 38, 29, 10, 29, 25, 27),
+(1860, 11, 291, 158, 875, 14, 20, 40, 30, 10, 32, 26, 28),
+(1860, 12, 322, 180, 782, 7, 10, 42, 31, 26, 36, 24, 31),
+(1860, 13, 354, 203, 827, 7, 11, 44, 32, 28, 43, 26, 32),
+(1860, 14, 368, 227, 878, 7, 11, 46, 33, 28, 44, 25, 35),
+(1860, 15, 421, 251, 925, 8, 12, 48, 34, 30, 48, 26, 37),
+(1860, 16, 455, 275, 975, 9, 13, 52, 36, 30, 52, 27, 39),
+(1860, 17, 490, 300, 1022, 9, 13, 56, 38, 31, 55, 28, 42),
+(1860, 18, 528, 314, 1068, 10, 14, 58, 39, 33, 59, 28, 44),
+(1860, 19, 566, 351, 1120, 10, 15, 60, 40, 33, 63, 30, 46),
+(1860, 20, 606, 377, 1165, 11, 16, 64, 42, 35, 67, 31, 49),
+(1860, 21, 653, 393, 1232, 19, 27, 68, 44, 36, 80, 53, 39),
+(1860, 22, 699, 420, 1282, 20, 28, 72, 46, 36, 84, 54, 41),
+(1860, 23, 746, 447, 1330, 21, 29, 74, 47, 38, 89, 56, 42),
+(1860, 24, 823, 476, 1378, 22, 30, 78, 49, 39, 93, 57, 43),
+(1860, 25, 854, 504, 1427, 23, 31, 80, 50, 40, 97, 60, 44),
+(1860, 26, 911, 534, 1474, 24, 32, 84, 52, 41, 101, 62, 46),
+(1860, 27, 968, 564, 1524, 24, 34, 86, 53, 42, 105, 63, 47),
+(1860, 28, 1035, 592, 1572, 25, 35, 90, 55, 43, 110, 65, 48),
+(1860, 29, 1127, 620, 1619, 26, 36, 94, 57, 44, 114, 67, 49),
+(1860, 30, 1215, 648, 1667, 27, 37, 94, 57, 46, 118, 69, 51),
+(1860, 31, 1292, 676, 1715, 28, 38, 98, 59, 47, 123, 71, 52),
+(1860, 32, 1386, 720, 1766, 29, 39, 100, 60, 47, 127, 73, 53),
+(1860, 33, 1457, 742, 1812, 29, 40, 104, 62, 49, 131, 74, 54),
+(1860, 34, 1574, 793, 1861, 30, 41, 106, 63, 50, 135, 76, 56),
+(1860, 35, 1690, 845, 2238, 49, 65, 110, 65, 21, 146, 62, 57),
+(1860, 36, 1760, 879, 2415, 50, 67, 112, 66, 21, 150, 63, 59),
+(1860, 37, 1830, 916, 2602, 51, 70, 116, 68, 21, 155, 64, 60),
+(1860, 38, 1924, 952, 2795, 53, 71, 120, 70, 22, 159, 66, 62),
+(1860, 39, 1974, 988, 3002, 54, 74, 124, 72, 22, 164, 67, 63),
+(1860, 40, 2052, 1026, 3219, 56, 76, 128, 74, 23, 170, 70, 65),
+(1860, 41, 2135, 1063, 2826, 0, 0, 0, 77, 58, 152, 51, 66),
+(1860, 42, 2215, 1103, 3034, 40, 54, 142, 81, 59, 156, 70, 67),
+(1860, 43, 2260, 1187, 3228, 43, 57, 152, 86, 61, 169, 72, 69),
+(1860, 44, 2290, 1214, 3463, 0, 0, 0, 91, 61, 164, 54, 71),
+(1860, 45, 2303, 1240, 3620, 0, 0, 0, 96, 64, 169, 55, 72),
+(1860, 46, 2349, 1267, 3722, 46, 60, 176, 98, 65, 173, 77, 73),
+(1860, 47, 2358, 1294, 3796, 0, 0, 180, 100, 66, 177, 78, 75),
+(1860, 48, 2436, 1320, 3868, 0, 0, 184, 102, 68, 181, 80, 76),
+(1860, 49, 2474, 1347, 3943, 0, 0, 188, 104, 69, 186, 82, 78),
+(1860, 50, 2527, 1391, 4013, 60, 79, 193, 107, 71, 190, 84, 80),
+(1860, 51, 2560, 1435, 4068, 0, 0, 0, 109, 72, 194, 60, 127),
+(1860, 52, 2661, 1481, 4136, 0, 0, 0, 112, 74, 198, 62, 128),
+(1860, 53, 2757, 1527, 4207, 0, 0, 0, 114, 75, 203, 63, 131),
+(1860, 54, 2840, 1573, 4307, 61, 81, 210, 115, 76, 207, 90, 85),
+(1860, 55, 2876, 1620, 4362, 0, 0, 0, 119, 79, 211, 65, 135),
+(1860, 56, 3006, 1666, 4428, 0, 0, 0, 121, 80, 215, 66, 139),
+(1860, 57, 3110, 1714, 4500, 0, 0, 0, 123, 81, 220, 67, 142),
+(1860, 58, 3222, 1763, 4579, 0, 0, 0, 125, 82, 224, 68, 144),
+(1860, 59, 3318, 1824, 4673, 39, 53, 234, 127, 83, 230, 69, 147),
+(1860, 60, 3419, 1874, 4745, 42, 57, 238, 129, 85, 249, 70, 150),
+(1860, 61, 3522, 1925, 5196, 0, 0, 0, 132, 89, 251, 78, 153),
+(1860, 62, 3627, 1977, 7223, 190, 263, 246, 133, 36, 279, 124, 102),
+(1860, 63, 3726, 2030, 6104, 0, 0, 0, 137, 93, 255, 93, 160),
+(1860, 64, 3830, 2184, 6561, 0, 0, 0, 139, 95, 259, 102, 164),
+(1860, 65, 3934, 2237, 7020, 0, 0, 0, 142, 97, 264, 119, 167),
+(1860, 66, 4145, 2391, 7481, 0, 0, 0, 144, 99, 268, 122, 168),
+(1860, 67, 4321, 2444, 7944, 0, 0, 0, 146, 101, 272, 124, 170),
+(1860, 68, 4529, 2598, 8409, 0, 0, 0, 148, 104, 276, 127, 175),
+(1860, 69, 4764, 2751, 8876, 0, 0, 0, 151, 106, 278, 130, 185),
+(1860, 70, 4860, 2885, 9070, 0, 0, 286, 153, 109, 280, 133, 122),
+(1860, 71, 5010, 2992, 9484, 0, 0, 0, 155, 112, 283, 137, 194),
+(1860, 72, 5161, 3100, 9861, 0, 0, 0, 157, 114, 286, 141, 197),
+(1860, 73, 5313, 3208, 10231, 0, 0, 0, 159, 116, 289, 145, 201),
+(1860, 74, 5466, 3317, 10603, 0, 0, 0, 163, 120, 293, 151, 205),
+(1860, 75, 5620, 3426, 10983, 0, 0, 0, 165, 123, 296, 156, 214),
+(1860, 76, 5775, 3535, 14155, 303, 430, 408, 214, 67, 309, 143, 196),
+(1860, 77, 5930, 3645, 14652, 315, 446, 452, 236, 72, 314, 144, 200),
+(1860, 78, 6086, 3758, 12125, 0, 0, 0, 172, 129, 306, 172, 226),
+(1860, 79, 6243, 3874, 12508, 0, 0, 0, 174, 131, 310, 178, 231),
+(1860, 80, 6401, 3997, 16148, 358, 501, 608, 314, 140, 328, 185, 239);
+
+-- warlock succubus
+DELETE FROM pet_levelstats WHERE creature_entry = 1863;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(1863, 1, 40, 48, 563, 29, 39, 64, 42, 35, 67, 31, 49),
+(1863, 2, 49, 59, 40, 0, 0, 0, 14, 15, 2, 1, 26),
+(1863, 3, 58, 70, 60, 0, 0, 0, 15, 16, 4, 1, 27),
+(1863, 4, 68, 81, 80, 0, 0, 0, 17, 17, 8, 2, 27),
+(1863, 5, 77, 92, 100, 0, 0, 0, 18, 18, 12, 2, 28),
+(1863, 6, 86, 103, 120, 0, 0, 0, 20, 19, 16, 3, 29),
+(1863, 7, 95, 114, 140, 0, 0, 0, 22, 20, 21, 3, 29),
+(1863, 8, 104, 125, 160, 0, 0, 0, 23, 21, 25, 4, 30),
+(1863, 9, 113, 136, 180, 0, 0, 0, 25, 22, 29, 4, 31),
+(1863, 10, 123, 147, 200, 0, 0, 0, 26, 23, 33, 5, 31),
+(1863, 11, 132, 158, 220, 0, 0, 0, 28, 25, 38, 6, 32),
+(1863, 12, 150, 180, 240, 0, 0, 0, 29, 26, 42, 8, 33),
+(1863, 13, 169, 203, 280, 0, 0, 0, 31, 27, 46, 9, 34),
+(1863, 14, 189, 227, 320, 0, 0, 0, 33, 28, 50, 11, 35),
+(1863, 15, 209, 251, 360, 0, 0, 0, 34, 29, 55, 14, 35),
+(1863, 16, 229, 275, 400, 0, 0, 0, 36, 30, 59, 16, 36),
+(1863, 17, 250, 300, 460, 0, 0, 0, 37, 31, 63, 20, 37),
+(1863, 18, 262, 314, 510, 0, 0, 0, 39, 32, 67, 24, 38),
+(1863, 19, 293, 351, 550, 0, 0, 0, 40, 33, 72, 29, 39),
+(1863, 20, 303, 377, 563, 29, 39, 64, 42, 35, 67, 31, 49),
+(1863, 21, 325, 393, 604, 29, 40, 68, 44, 36, 80, 53, 39),
+(1863, 22, 349, 420, 628, 31, 42, 72, 46, 36, 84, 54, 41),
+(1863, 23, 373, 447, 652, 32, 43, 74, 47, 38, 89, 56, 42),
+(1863, 24, 400, 476, 675, 33, 45, 78, 49, 39, 93, 57, 43),
+(1863, 25, 440, 504, 699, 34, 47, 80, 50, 40, 97, 60, 44),
+(1863, 26, 469, 534, 721, 36, 48, 84, 52, 41, 101, 62, 46),
+(1863, 27, 501, 564, 745, 37, 50, 86, 53, 42, 105, 63, 47),
+(1863, 28, 534, 592, 768, 38, 52, 90, 55, 43, 110, 65, 48),
+(1863, 29, 566, 620, 791, 40, 54, 94, 57, 44, 114, 67, 49),
+(1863, 30, 599, 648, 815, 41, 56, 94, 57, 46, 118, 69, 51),
+(1863, 31, 631, 676, 838, 42, 57, 98, 59, 47, 123, 71, 52),
+(1863, 32, 680, 720, 862, 43, 59, 100, 60, 47, 127, 73, 53),
+(1863, 33, 728, 742, 884, 44, 60, 104, 62, 49, 131, 74, 54),
+(1863, 34, 661, 793, 908, 46, 62, 106, 63, 50, 135, 76, 56),
+(1863, 35, 699, 845, 950, 0, 0, 0, 63, 51, 136, 73, 57),
+(1863, 36, 737, 879, 990, 0, 0, 0, 67, 52, 137, 72, 58),
+(1863, 37, 776, 916, 1038, 0, 0, 0, 69, 53, 138, 70, 59),
+(1863, 38, 814, 952, 1095, 53, 78, 120, 70, 55, 139, 0, 91),
+(1863, 39, 852, 988, 1163, 0, 0, 0, 72, 56, 142, 68, 62),
+(1863, 40, 890, 1026, 1244, 0, 0, 0, 74, 57, 147, 67, 64),
+(1863, 41, 928, 1063, 1338, 0, 0, 0, 77, 58, 152, 68, 66),
+(1863, 42, 976, 1103, 1448, 66, 89, 142, 81, 59, 156, 70, 67),
+(1863, 43, 1005, 1187, 1560, 0, 0, 0, 87, 60, 160, 72, 69),
+(1863, 44, 1043, 1214, 1670, 0, 0, 0, 91, 61, 164, 74, 71),
+(1863, 45, 1081, 1240, 1738, 0, 0, 0, 96, 64, 169, 75, 72),
+(1863, 46, 1119, 1267, 1773, 0, 0, 176, 98, 65, 173, 77, 73),
+(1863, 47, 1158, 1294, 1808, 0, 0, 180, 100, 66, 177, 78, 75),
+(1863, 48, 1196, 1320, 1843, 0, 0, 184, 102, 68, 181, 80, 76),
+(1863, 49, 1234, 1347, 1878, 0, 0, 188, 104, 69, 186, 82, 78),
+(1863, 50, 1277, 1391, 1912, 94, 124, 194, 107, 71, 190, 84, 80),
+(1863, 51, 1320, 1435, 1945, 0, 0, 0, 109, 72, 194, 86, 81),
+(1863, 52, 1364, 1481, 1984, 0, 0, 0, 112, 74, 198, 88, 83),
+(1863, 53, 1407, 1527, 2020, 0, 0, 0, 114, 75, 203, 90, 85),
+(1863, 54, 1450, 1573, 2056, 0, 0, 0, 116, 77, 207, 92, 87),
+(1863, 55, 1493, 1620, 2089, 0, 0, 0, 119, 79, 211, 94, 88),
+(1863, 56, 1536, 1666, 2113, 0, 0, 0, 121, 80, 215, 96, 90),
+(1863, 57, 1580, 1714, 2156, 0, 0, 0, 123, 82, 220, 99, 92),
+(1863, 58, 1623, 1763, 2189, 0, 0, 0, 125, 84, 224, 101, 94),
+(1863, 59, 1666, 1824, 2230, 0, 0, 0, 128, 86, 228, 103, 96),
+(1863, 60, 1709, 1874, 2261, 0, 0, 0, 130, 87, 232, 106, 98),
+(1863, 61, 1754, 1925, 2300, 0, 0, 0, 132, 89, 237, 108, 101),
+(1863, 62, 1800, 1977, 4340, 229, 319, 246, 133, 36, 279, 124, 102),
+(1863, 63, 1845, 2030, 2440, 0, 0, 0, 137, 93, 245, 113, 105),
+(1863, 64, 1891, 2084, 2550, 0, 0, 0, 139, 95, 249, 116, 107),
+(1863, 65, 1936, 2137, 2700, 0, 0, 0, 142, 97, 254, 119, 109),
+(1863, 66, 1982, 2191, 2910, 0, 0, 0, 144, 99, 258, 122, 112),
+(1863, 67, 2027, 2244, 3150, 0, 0, 0, 146, 101, 262, 124, 114),
+(1863, 68, 2073, 2298, 3450, 0, 0, 0, 148, 104, 266, 127, 117),
+(1863, 69, 2118, 2351, 3800, 0, 0, 0, 151, 106, 271, 130, 119),
+(1863, 70, 2164, 2405, 4293, 121, 162, 286, 153, 108, 280, 133, 122),
+(1863, 71, 2211, 2460, 4479, 0, 0, 0, 155, 110, 284, 136, 124),
+(1863, 72, 2259, 2516, 4666, 0, 0, 0, 157, 111, 288, 139, 125),
+(1863, 73, 2308, 2573, 4854, 0, 0, 0, 159, 113, 293, 143, 127),
+(1863, 74, 2358, 2631, 5042, 0, 0, 0, 161, 115, 298, 147, 131),
+(1863, 75, 2409, 2660, 5231, 0, 0, 0, 164, 118, 303, 150, 134),
+(1863, 76, 2461, 2735, 5421, 0, 0, 0, 167, 120, 309, 154, 137),
+(1863, 77, 2512, 2793, 5612, 0, 0, 0, 170, 122, 314, 156, 141),
+(1863, 78, 2562, 2852, 5804, 0, 0, 0, 172, 124, 319, 158, 143),
+(1863, 79, 2612, 2911, 5997, 0, 0, 0, 175, 127, 324, 160, 147),
+(1863, 80, 2665, 2989, 9706, 461, 635, 608, 314, 129, 328, 170, 209);
+
+-- warlock felhunter
+DELETE FROM pet_levelstats WHERE creature_entry = 417;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(417, 1, 60, 48, 834, 31, 42, 94, 57, 46, 118, 69, 51),
+(417, 2, 73, 59, 168, 0, 0, 0, 12, 18, 14, 13, 23),
+(417, 3, 87, 70, 191, 0, 0, 0, 14, 19, 17, 15, 24),
+(417, 4, 101, 81, 215, 0, 0, 0, 15, 20, 19, 17, 25),
+(417, 5, 115, 92, 239, 0, 0, 0, 17, 21, 22, 19, 26),
+(417, 6, 129, 103, 263, 0, 0, 0, 19, 22, 24, 21, 27),
+(417, 7, 152, 114, 287, 0, 0, 0, 20, 23, 27, 23, 28),
+(417, 8, 156, 125, 310, 0, 0, 0, 22, 24, 29, 25, 29),
+(417, 9, 170, 136, 334, 0, 0, 0, 23, 25, 32, 27, 30),
+(417, 10, 184, 147, 358, 0, 0, 0, 25, 26, 34, 29, 31),
+(417, 11, 198, 158, 382, 0, 0, 0, 27, 27, 37, 31, 32),
+(417, 12, 225, 180, 406, 0, 0, 0, 28, 28, 41, 33, 33),
+(417, 13, 254, 203, 429, 0, 0, 0, 30, 29, 45, 35, 34),
+(417, 14, 284, 227, 453, 0, 0, 0, 31, 30, 50, 37, 35),
+(417, 15, 313, 251, 477, 0, 0, 0, 33, 31, 54, 39, 36),
+(417, 16, 343, 275, 501, 0, 0, 0, 35, 32, 58, 41, 37),
+(417, 17, 375, 300, 525, 0, 0, 0, 36, 33, 62, 43, 38),
+(417, 18, 392, 314, 548, 0, 0, 0, 38, 34, 67, 45, 39),
+(417, 19, 438, 351, 572, 0, 0, 0, 39, 35, 71, 47, 40),
+(417, 20, 471, 377, 596, 0, 0, 0, 41, 36, 75, 49, 41),
+(417, 21, 500, 400, 620, 0, 0, 0, 43, 37, 80, 51, 42),
+(417, 22, 528, 423, 644, 0, 0, 0, 44, 38, 84, 53, 43),
+(417, 23, 558, 447, 667, 0, 0, 0, 46, 39, 88, 55, 44),
+(417, 24, 595, 476, 691, 0, 0, 0, 47, 40, 93, 57, 45),
+(417, 25, 630, 504, 715, 0, 0, 0, 49, 41, 97, 59, 46),
+(417, 26, 678, 543, 739, 0, 0, 0, 51, 42, 101, 61, 47),
+(417, 27, 705, 564, 763, 0, 0, 0, 52, 43, 105, 63, 48),
+(417, 28, 740, 592, 786, 0, 0, 0, 54, 44, 110, 65, 49),
+(417, 29, 775, 620, 810, 0, 0, 0, 55, 45, 114, 67, 50),
+(417, 30, 800, 648, 834, 31, 42, 94, 57, 46, 118, 69, 51),
+(417, 31, 856, 676, 857, 32, 43, 98, 59, 47, 123, 71, 52),
+(417, 32, 921, 720, 882, 33, 45, 100, 60, 47, 127, 73, 53),
+(417, 33, 987, 742, 905, 34, 46, 104, 62, 49, 131, 74, 54),
+(417, 34, 1047, 793, 929, 35, 47, 106, 63, 50, 135, 76, 56),
+(417, 35, 1107, 845, 953, 0, 0, 0, 65, 52, 137, 73, 57),
+(417, 36, 1167, 879, 977, 0, 0, 0, 67, 53, 138, 72, 58),
+(417, 37, 1227, 916, 1001, 0, 0, 0, 68, 54, 138, 70, 60),
+(417, 38, 1288, 952, 1024, 0, 0, 0, 70, 55, 139, 69, 61),
+(417, 39, 1348, 988, 1048, 0, 0, 0, 71, 56, 142, 68, 62),
+(417, 40, 1408, 1026, 1250, 0, 0, 0, 73, 57, 146, 67, 64),
+(417, 41, 1468, 1063, 1390, 0, 0, 0, 76, 58, 151, 68, 65),
+(417, 42, 1408, 1026, 1484, 48, 64, 142, 81, 59, 156, 70, 67),
+(417, 43, 1588, 1187, 1550, 0, 0, 0, 87, 60, 160, 71, 68),
+(417, 44, 1648, 1214, 1650, 0, 0, 0, 91, 61, 164, 73, 70),
+(417, 45, 1708, 1240, 2159, 66, 87, 172, 96, 25, 169, 67, 72),
+(417, 46, 1768, 1267, 1817, 0, 0, 176, 98, 65, 173, 77, 73),
+(417, 47, 1928, 1294, 1853, 0, 0, 180, 100, 66, 177, 78, 75),
+(417, 48, 1889, 1320, 1888, 0, 0, 184, 102, 68, 181, 80, 76),
+(417, 49, 1950, 1347, 1925, 0, 0, 188, 104, 69, 186, 82, 78),
+(417, 50, 2638, 1977, 1959, 65, 86, 194, 107, 71, 190, 84, 80),
+(417, 51, 2055, 1435, 2041, 0, 0, 0, 109, 72, 195, 86, 82),
+(417, 52, 2108, 1481, 2125, 0, 0, 0, 111, 74, 199, 88, 84),
+(417, 53, 2161, 1527, 2213, 0, 0, 0, 113, 75, 204, 90, 86),
+(417, 54, 2213, 1573, 2305, 0, 0, 0, 116, 77, 208, 92, 88),
+(417, 55, 2266, 1620, 2400, 0, 0, 0, 118, 78, 213, 94, 90),
+(417, 56, 2318, 1666, 2499, 0, 0, 0, 120, 80, 217, 96, 92),
+(417, 57, 2371, 1714, 2602, 0, 0, 0, 123, 82, 222, 99, 94),
+(417, 58, 2424, 1763, 2709, 0, 0, 0, 125, 83, 226, 101, 97),
+(417, 59, 2476, 1824, 2821, 0, 0, 0, 127, 85, 231, 103, 99),
+(417, 60, 2529, 1874, 2938, 0, 0, 0, 130, 87, 235, 106, 101),
+(417, 61, 2583, 1925, 3059, 0, 0, 0, 132, 89, 240, 108, 103),
+(417, 62, 3518, 2833, 3479, 175, 243, 246, 133, 36, 279, 124, 102),
+(417, 63, 2693, 2030, 3317, 0, 0, 0, 137, 93, 249, 113, 107),
+(417, 64, 2758, 2084, 3454, 0, 0, 0, 139, 95, 253, 116, 109),
+(417, 65, 2823, 2139, 3597, 0, 0, 0, 141, 97, 258, 119, 111),
+(417, 66, 2888, 2195, 3745, 0, 0, 0, 143, 99, 262, 121, 113),
+(417, 67, 2944, 2252, 3900, 0, 0, 0, 146, 101, 267, 124, 115),
+(417, 68, 3000, 2300, 4061, 0, 0, 0, 148, 103, 271, 127, 117),
+(417, 69, 3056, 2360, 4229, 0, 0, 0, 150, 105, 276, 130, 120),
+(417, 70, 3112, 2420, 4400, 92, 123, 286, 153, 108, 280, 133, 122),
+(417, 71, 3169, 2478, 4561, 0, 0, 0, 156, 111, 285, 136, 124),
+(417, 72, 3227, 2535, 4721, 0, 0, 0, 159, 113, 290, 139, 126),
+(417, 73, 3283, 2594, 4882, 0, 0, 0, 162, 116, 294, 143, 128),
+(417, 74, 3342, 2653, 5041, 0, 0, 0, 165, 118, 298, 146, 129),
+(417, 75, 3403, 2711, 5199, 0, 0, 0, 167, 121, 304, 150, 131),
+(417, 76, 3459, 2772, 5363, 0, 0, 0, 170, 124, 309, 153, 132),
+(417, 77, 3518, 2833, 7056, 293, 415, 452, 236, 172, 314, 144, 200),
+(417, 78, 3576, 2894, 5688, 0, 0, 0, 175, 129, 319, 157, 137),
+(417, 79, 3645, 2954, 5868, 0, 0, 0, 177, 130, 324, 158, 140),
+(417, 80, 3733, 3025, 7782, 333, 466, 608, 314, 190, 328, 150, 209);
+
+-- warlock felguard
+DELETE FROM pet_levelstats WHERE creature_entry = 17252;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(17252, 1, 40, 48, 3494, 113, 149, 194, 107, 71, 190, 84, 80),
+(17252, 2, 49, 59, 40, 0, 0, 0, 14, 15, 2, 1, 26),
+(17252, 3, 58, 70, 60, 0, 0, 0, 15, 16, 4, 1, 27),
+(17252, 4, 68, 81, 80, 0, 0, 0, 17, 17, 8, 2, 27),
+(17252, 5, 77, 92, 100, 0, 0, 0, 18, 18, 12, 2, 28),
+(17252, 6, 86, 103, 120, 0, 0, 0, 20, 19, 16, 3, 29),
+(17252, 7, 95, 114, 140, 0, 0, 0, 22, 20, 21, 3, 29),
+(17252, 8, 104, 125, 160, 0, 0, 0, 23, 21, 25, 4, 30),
+(17252, 9, 113, 136, 180, 0, 0, 0, 25, 22, 29, 4, 31),
+(17252, 10, 123, 147, 200, 0, 0, 0, 26, 23, 33, 5, 31),
+(17252, 11, 132, 158, 220, 0, 0, 0, 28, 25, 38, 6, 32),
+(17252, 12, 150, 180, 240, 0, 0, 0, 29, 26, 42, 8, 33),
+(17252, 13, 169, 203, 280, 0, 0, 0, 31, 27, 46, 9, 34),
+(17252, 14, 189, 227, 320, 0, 0, 0, 33, 28, 50, 11, 35),
+(17252, 15, 209, 251, 360, 0, 0, 0, 34, 29, 55, 14, 35),
+(17252, 16, 229, 275, 400, 0, 0, 0, 36, 30, 59, 16, 36),
+(17252, 17, 250, 300, 460, 0, 0, 0, 37, 31, 63, 20, 37),
+(17252, 18, 262, 314, 510, 0, 0, 0, 39, 32, 67, 24, 38),
+(17252, 19, 293, 351, 550, 0, 0, 0, 40, 33, 72, 29, 39),
+(17252, 20, 303, 377, 563, 0, 0, 0, 42, 35, 67, 31, 49),
+(17252, 21, 325, 393, 604, 0, 0, 0, 44, 36, 80, 53, 39),
+(17252, 22, 349, 420, 628, 0, 0, 0, 46, 36, 84, 54, 41),
+(17252, 23, 373, 447, 652, 0, 0, 0, 47, 38, 89, 56, 42),
+(17252, 24, 400, 476, 675, 0, 0, 0, 49, 39, 93, 57, 43),
+(17252, 25, 440, 504, 699, 0, 0, 0, 50, 40, 97, 60, 44),
+(17252, 26, 469, 534, 721, 0, 0, 0, 52, 41, 101, 62, 46),
+(17252, 27, 501, 564, 745, 0, 0, 0, 53, 42, 105, 63, 47),
+(17252, 28, 534, 592, 768, 0, 0, 0, 55, 43, 110, 65, 48),
+(17252, 29, 566, 620, 791, 0, 0, 0, 57, 44, 114, 67, 49),
+(17252, 30, 599, 648, 815, 0, 0, 0, 57, 46, 118, 69, 51),
+(17252, 31, 631, 676, 838, 0, 0, 0, 59, 47, 123, 71, 52),
+(17252, 32, 680, 720, 862, 0, 0, 0, 60, 47, 127, 73, 53),
+(17252, 33, 728, 742, 884, 0, 0, 0, 62, 49, 131, 74, 54),
+(17252, 34, 661, 793, 908, 0, 0, 0, 64, 50, 135, 76, 56),
+(17252, 35, 699, 845, 950, 0, 0, 0, 63, 51, 136, 73, 57),
+(17252, 36, 737, 879, 990, 0, 0, 0, 67, 52, 137, 72, 58),
+(17252, 37, 776, 916, 1038, 0, 0, 0, 69, 53, 138, 70, 59),
+(17252, 38, 814, 952, 1095, 0, 0, 0, 70, 55, 139, 69, 61),
+(17252, 39, 852, 988, 1163, 0, 0, 0, 72, 56, 142, 68, 62),
+(17252, 40, 890, 1026, 1244, 0, 0, 0, 74, 57, 147, 67, 64),
+(17252, 41, 928, 1063, 1338, 0, 0, 0, 77, 58, 152, 68, 66),
+(17252, 42, 976, 1103, 1448, 0, 0, 0, 81, 59, 156, 70, 67),
+(17252, 43, 1005, 1187, 1560, 0, 0, 0, 87, 60, 160, 72, 69),
+(17252, 44, 1043, 1214, 1670, 0, 0, 0, 91, 61, 164, 74, 71),
+(17252, 45, 1081, 1240, 1738, 0, 0, 0, 96, 64, 169, 75, 72),
+(17252, 46, 1119, 1267, 1773, 0, 0, 0, 98, 65, 173, 77, 73),
+(17252, 47, 1158, 1294, 1808, 0, 0, 0, 100, 66, 177, 78, 75),
+(17252, 48, 1196, 1320, 1843, 0, 0, 0, 102, 68, 181, 80, 76),
+(17252, 49, 1234, 1347, 1878, 0, 0, 0, 105, 69, 186, 82, 78),
+(17252, 50, 2877, 2391, 3494, 113, 149, 194, 107, 71, 190, 84, 80),
+(17252, 51, 2920, 2435, 3559, 122, 160, 198, 109, 72, 223, 97, 81),
+(17252, 52, 3164, 2481, 3624, 127, 167, 202, 111, 73, 228, 100, 82),
+(17252, 53, 3207, 2527, 3686, 127, 167, 206, 113, 75, 233, 102, 84),
+(17252, 54, 3350, 2573, 3752, 0, 0, 0, 116, 77, 238, 104, 87),
+(17252, 55, 3493, 2620, 3814, 0, 0, 0, 119, 78, 243, 106, 88),
+(17252, 56, 3536, 2766, 3878, 135, 176, 220, 120, 79, 248, 108, 89),
+(17252, 57, 3680, 2814, 3941, 0, 0, 0, 123, 82, 251, 111, 92),
+(17252, 58, 3723, 2913, 4006, 0, 0, 0, 125, 84, 255, 113, 94),
+(17252, 59, 3866, 2924, 4067, 0, 0, 0, 128, 86, 258, 115, 96),
+(17252, 60, 3909, 3174, 4635, 0, 0, 0, 130, 87, 270, 118, 98),
+(17252, 61, 4054, 3225, 6300, 0, 0, 0, 132, 90, 274, 121, 101),
+(17252, 62, 4300, 3377, 6276, 240, 329, 246, 133, 36, 279, 124, 102),
+(17252, 63, 4545, 3430, 6440, 0, 0, 0, 137, 93, 286, 123, 105),
+(17252, 64, 4691, 3584, 6550, 0, 0, 0, 139, 95, 295, 128, 107),
+(17252, 65, 4749, 3646, 6612, 0, 0, 0, 142, 98, 300, 129, 110),
+(17252, 66, 4876, 3778, 6910, 0, 0, 0, 144, 99, 306, 130, 112),
+(17252, 67, 4984, 3863, 7150, 0, 0, 0, 146, 101, 310, 131, 114),
+(17252, 68, 5197, 3949, 7450, 0, 0, 0, 148, 105, 325, 132, 117),
+(17252, 69, 5208, 4035, 7800, 0, 0, 0, 151, 107, 335, 133, 119),
+(17252, 70, 5320, 4170, 7927, 176, 232, 323, 153, 108, 351, 196, 122),
+(17252, 71, 5471, 4277, 8267, 0, 0, 0, 155, 109, 359, 204, 124),
+(17252, 72, 5623, 4384, 8607, 0, 0, 0, 158, 111, 367, 211, 125),
+(17252, 73, 5776, 4492, 8952, 0, 0, 0, 161, 113, 375, 219, 128),
+(17252, 74, 5930, 4600, 9297, 0, 0, 0, 164, 115, 382, 227, 130),
+(17252, 75, 6085, 4709, 9647, 0, 0, 0, 166, 118, 390, 235, 132),
+(17252, 76, 6241, 4818, 9997, 0, 0, 0, 170, 121, 399, 242, 135),
+(17252, 77, 6398, 4927, 10352, 0, 0, 0, 172, 124, 407, 250, 138),
+(17252, 78, 6556, 5036, 10712, 0, 0, 0, 174, 125, 414, 257, 141),
+(17252, 79, 6711, 5144, 11067, 0, 0, 0, 176, 127, 423, 266, 145),
+(17252, 80, 6872, 5266, 14033, 329, 495, 608, 314, 129, 428, 280, 209);
+
+-- DK Ghoul
+DELETE FROM `pet_levelstats` WHERE `creature_entry` = 26125;
+INSERT INTO `pet_levelstats` (`creature_entry`, `level`, `hp`, `mana`, `armor`, `mindmg`, `maxdmg`, `attackpower`, `str`, `agi`, `sta`, `inte`, `spi`) VALUES
+(26125, 1, 48, 80, 10, 1, 3, 10, 20, 25, 16, 20, 8),
+(26125, 55, 3126, 1484, 5994, 0, 0, 0, 239, 623, 263, 49, 78),
+(26125, 56, 3183, 1510, 6105, 0, 0, 0, 242, 633, 267, 49, 79),
+(26125, 57, 3240, 1536, 6215, 0, 0, 0, 246, 642, 271, 50, 80),
+(26125, 58, 3297, 1562, 6326, 0, 0, 0, 249, 651, 275, 51, 81),
+(26125, 59, 3354, 1588, 6437, 0, 0, 0, 252, 661, 279, 51, 83),
+(26125, 60, 3411, 1614, 6547, 0, 0, 0, 256, 670, 283, 52, 84),
+(26125, 61, 3468, 1640, 6658, 0, 0, 0, 259, 679, 286, 53, 85),
+(26125, 62, 3525, 1666, 6768, 0, 0, 0, 263, 689, 290, 53, 86),
+(26125, 63, 3582, 1692, 6879, 0, 0, 0, 266, 698, 294, 54, 88),
+(26125, 64, 3639, 1718, 6990, 0, 0, 0, 273, 707, 298, 54, 89),
+(26125, 65, 3696, 1744, 7100, 0, 0, 0, 277, 716, 302, 55, 90),
+(26125, 66, 3753, 1770, 7211, 0, 0, 0, 280, 726, 306, 56, 91),
+(26125, 67, 3810, 1796, 7322, 0, 0, 0, 284, 735, 310, 56, 93),
+(26125, 68, 3867, 1822, 7432, 0, 0, 0, 287, 744, 314, 57, 94),
+(26125, 69, 3924, 1848, 7543, 0, 0, 0, 290, 754, 318, 58, 95),
+(26125, 70, 3981, 1874, 7654, 0, 0, 0, 294, 763, 322, 58, 96),
+(26125, 71, 4038, 1900, 7764, 0, 0, 0, 297, 772, 326, 59, 98),
+(26125, 72, 4095, 1926, 7875, 0, 0, 0, 301, 782, 330, 60, 99),
+(26125, 73, 4152, 1952, 7986, 0, 0, 0, 304, 791, 334, 60, 100),
+(26125, 74, 4209, 1978, 8096, 0, 0, 0, 308, 800, 337, 61, 101),
+(26125, 75, 4266, 2004, 8207, 0, 0, 0, 311, 809, 341, 62, 103),
+(26125, 76, 4323, 2030, 8317, 0, 0, 0, 315, 819, 345, 62, 104),
+(26125, 77, 4380, 2056, 8428, 0, 0, 0, 318, 828, 349, 63, 105),
+(26125, 78, 4437, 2082, 8539, 0, 0, 0, 325, 837, 353, 64, 106),
+(26125, 79, 4494, 2108, 8649, 0, 0, 0, 329, 847, 357, 64, 108),
+(26125, 80, 4551, 2134, 8760, 193, 278, 1167, 332, 856, 361, 65, 109);
+
+-- DK Gargoyle
+DELETE FROM pet_levelstats WHERE creature_entry = 27829;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(27829, 1,    48,   80,   10, 1, 3, 10, 20, 16, 13, 20,  8),
+(27829, 40, 2271, 1094, 2233, 0, 0, 0,  98, 55, 52, 59, 47),
+(27829, 41, 2328, 1120, 2290, 0, 0, 0, 100, 56, 53, 60, 48),
+(27829, 42, 2385, 1146, 2347, 0, 0, 0, 102, 57, 54, 61, 49),
+(27829, 43, 2442, 1172, 2404, 0, 0, 0, 104, 58, 55, 62, 50),
+(27829, 44, 2499, 1198, 2461, 0, 0, 0, 106, 59, 56, 63, 51),
+(27829, 45, 2556, 1224, 2518, 0, 0, 0, 108, 60, 57, 64, 52),
+(27829, 46, 2613, 1250, 2575, 0, 0, 0, 110, 61, 58, 65, 53),
+(27829, 47, 2670, 1276, 2632, 0, 0, 0, 112, 62, 59, 66, 54),
+(27829, 48, 2727, 1302, 2689, 0, 0, 0, 114, 63, 60, 67, 55),
+(27829, 49, 2784, 1328, 2746, 0, 0, 0, 116, 64, 61, 68, 56),
+(27829, 50, 2841, 1354, 2803, 0, 0, 0, 118, 65, 62, 69, 57),
+(27829, 51, 2898, 1380, 2860, 0, 0, 0, 120, 66, 63, 70, 58),
+(27829, 52, 2955, 1406, 2917, 0, 0, 0, 122, 67, 64, 71, 59),
+(27829, 53, 3012, 1432, 2974, 0, 0, 0, 124, 68, 65, 72, 60),
+(27829, 54, 3069, 1458, 3031, 0, 0, 0, 126, 69, 66, 73, 61),
+(27829, 55, 3126, 1484, 3088, 0, 0, 0, 128, 70, 67, 74, 62),
+(27829, 56, 3183, 1510, 3145, 0, 0, 0, 130, 71, 68, 75, 63),
+(27829, 57, 3240, 1536, 3202, 0, 0, 0, 132, 72, 69, 76, 64),
+(27829, 58, 3297, 1562, 3259, 0, 0, 0, 134, 73, 70, 77, 65),
+(27829, 59, 3354, 1588, 3316, 0, 0, 0, 136, 74, 71, 78, 66),
+(27829, 60, 3411, 1614, 3373, 0, 0, 0, 138, 75, 72, 79, 67),
+(27829, 61, 3468, 1640, 3430, 0, 0, 0, 140, 76, 73, 80, 68),
+(27829, 62, 3525, 1666, 3487, 0, 0, 0, 142, 77, 74, 81, 69),
+(27829, 63, 3582, 1692, 3544, 0, 0, 0, 144, 78, 75, 82, 70),
+(27829, 64, 3639, 1718, 3601, 0, 0, 0, 146, 79, 76, 83, 71),
+(27829, 65, 3696, 1744, 3658, 0, 0, 0, 148, 80, 77, 84, 72),
+(27829, 66, 3753, 1770, 3715, 0, 0, 0, 150, 81, 78, 85, 73),
+(27829, 67, 3810, 1796, 3772, 0, 0, 0, 152, 82, 79, 86, 74),
+(27829, 68, 3867, 1822, 3829, 0, 0, 0, 154, 83, 80, 87, 75),
+(27829, 69, 3924, 1848, 3886, 0, 0, 0, 156, 84, 81, 88, 76),
+(27829, 70, 3981, 1874, 3943, 0, 0, 0, 158, 85, 82, 89, 77),
+(27829, 71, 4038, 1900, 4000, 0, 0, 0, 160, 86, 83, 90, 78),
+(27829, 72, 4095, 1926, 4057, 0, 0, 0, 162, 87, 84, 91, 79),
+(27829, 73, 4152, 1952, 4114, 0, 0, 0, 164, 88, 85, 92, 80),
+(27829, 74, 4209, 1978, 4171, 0, 0, 0, 166, 89, 86, 93, 81),
+(27829, 75, 4266, 2004, 4228, 0, 0, 0, 168, 90, 87, 94, 82),
+(27829, 76, 4323, 2030, 4285, 0, 0, 0, 170, 91, 88, 95, 83),
+(27829, 77, 4380, 2056, 4342, 0, 0, 0, 172, 92, 89, 96, 84),
+(27829, 78, 4437, 2082, 4399, 0, 0, 0, 174, 93, 90, 97, 85),
+(27829, 79, 4494, 2108, 4456, 0, 0, 0, 176, 94, 91, 98, 86),
+(27829, 80, 4551, 2134, 4513, 310, 504, 622, 178, 95, 92, 99, 87);
+
+-- Water elemental
+DELETE FROM pet_levelstats WHERE creature_entry = 37994;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(37994, 1,  42, 22, 20, 2, 3, 10, 22, 20, 22, 20, 20),
+(37994, 50, 1234, 1000, 108,   63,  87,  91, 13, 19, 50, 43, 53),
+(37994, 51, 1250, 1115, 112,   64,  88,  94, 15, 20, 51, 44, 54),
+(37994, 52, 1271, 1135, 128,   65,  90,  96, 17, 21, 52, 44, 55),
+(37994, 53, 1280, 1152, 183,   66,  92,  98, 19, 22, 53, 45, 56),
+(37994, 54, 1304, 1161, 237,   67,  93,  99, 22, 23, 54, 45, 57),
+(37994, 55, 1329, 1182, 292,   68,  95, 102, 24, 24, 55, 47, 58),
+(37994, 56, 1341, 1200, 348,   69,  96, 104, 27, 25, 57, 47, 59),
+(37994, 57, 1355, 1234, 402,   86, 100, 105, 29, 26, 58, 48, 60),
+(37994, 58, 1364, 1242, 457,  104, 109, 106, 31, 27, 59, 48, 61),
+(37994, 59, 1372, 1259, 512,  110, 115, 109, 34, 28, 60, 49, 62),
+(37994, 60, 1381, 1262, 814,  134, 123, 112, 35, 29, 61, 50, 63),
+(37994, 61, 1390, 1274, 1113, 157, 145, 114, 36, 30, 62, 51, 64),
+(37994, 62, 1400, 1282, 1410, 179, 162, 116, 37, 31, 63, 52, 65),
+(37994, 63, 1411, 1291, 1708, 190, 166, 126, 38, 32, 64, 53, 66),
+(37994, 64, 1419, 1300, 1006, 182, 170, 142, 39, 33, 65, 54, 67),
+(37994, 65, 1429, 1304, 1303, 186, 178, 153, 40, 34, 66, 55, 68),
+(37994, 66, 1435, 1321, 1601, 189, 187, 163, 41, 35, 67, 56, 69),
+(37994, 67, 1450, 1330, 1900, 192, 198, 172, 42, 36, 68, 57, 70),
+(37994, 68, 1458, 1341, 1197, 199, 210, 181, 43, 37, 69, 58, 71),
+(37994, 69, 1464, 1351, 2008, 122, 144, 127, 44, 36, 70, 77,  72),
+(37994, 70, 1528, 1568, 2207, 138, 174, 135, 45, 39, 71, 78,  73),
+(37994, 71, 1580, 1632, 2319, 142, 224, 182, 48, 40, 72, 82,  75),
+(37994, 72, 1639, 1695, 2431, 146, 312, 204, 50, 41, 74, 83,  77),
+(37994, 73, 1699, 1763, 2544, 154, 368, 255, 53, 44, 76, 85,  80),
+(37994, 74, 1761, 1830, 2660, 162, 424, 301, 54, 45, 78, 87,  82),
+(37994, 75, 1821, 1896, 2760, 168, 482, 390, 56, 46, 79, 89,  84),
+(37994, 76, 1882, 1964, 2890, 184, 520, 470, 57, 48, 80, 90,  85),
+(37994, 77, 1949, 2033, 2999, 212, 59,  550, 58, 50, 83, 92,  90),
+(37994, 78, 2011, 2100, 3110, 263, 640, 622, 59, 54, 85, 94,  91),
+(37994, 79, 2073, 2167, 3150, 322, 720, 710, 60, 61, 88, 96,  92),
+(37994, 80, 3200, 2800, 4000, 410, 850, 820, 62, 86, 92, 101, 94);
+
+-- Mirror image
+DELETE FROM pet_levelstats WHERE creature_entry = 31216;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(31216, 1,  42, 22, 20, 2, 3, 10, 22, 20, 22, 20, 20),
+(31216, 80, 2680, 2400, 8600, 182, 216, 110, 72, 86, 152, 191, 94);
+
+-- Priest Shadowfiend
+DELETE FROM pet_levelstats WHERE creature_entry = 19668;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(19668,  1,   42,   22,   20,   2,   3,  10, 22, 20, 22, 20, 20),
+(19668, 66, 6888, 3195, 2745, 125, 480, 770, 48, 71, 78, 87, 87),
+(19668, 67, 6944, 3252, 2900, 130, 520, 780, 49, 72, 79, 88, 88),
+(19668, 68, 6000, 3300, 3061, 135, 550, 790, 50, 73, 80, 89, 89),
+(19668, 69, 6056, 3360, 3229, 140, 590, 800, 51, 75, 81, 90, 90),
+(19668, 70, 6112, 3420, 3400, 145, 610, 810, 52, 76, 82, 89, 91),
+(19668, 71, 6169, 3478, 3561, 150, 635, 820, 53, 77, 83, 92, 92),
+(19668, 72, 6227, 3535, 3721, 155, 655, 830, 54, 78, 84, 93, 93),
+(19668, 73, 6283, 3594, 3882, 160, 680, 840, 55, 79, 85, 94, 94),
+(19668, 74, 6342, 3653, 4041, 165, 700, 850, 56, 80, 86, 95, 95),
+(19668, 75, 6403, 3711, 4199, 170, 720, 860, 57, 81, 87, 96, 96),
+(19668, 76, 6459, 3772, 4363, 175, 750, 870, 58, 82, 88, 97 ,97),
+(19668, 77, 6518, 3833, 4400, 180, 780, 880, 59, 83, 89, 96, 98),
+(19668, 78, 6576, 3894, 4420, 185, 600, 890, 60, 84, 90, 98, 99),
+(19668, 79, 6645, 3954, 4400, 188, 615, 900, 61, 85, 91, 100, 100),
+(19668, 80, 7266, 4759, 4500, 190, 620, 910, 62, 86, 92, 101, 102);
+
+-- Spirit wolf
+DELETE FROM pet_levelstats WHERE creature_entry = 29264;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(29264,  1,   42,   22,   20,  2,   3,   10,  22, 20, 22, 20, 20),
+(29264, 40, 5271, 1094, 2233, 73, 100,  190,  98, 55, 52, 59, 47),
+(29264, 41, 5328, 1120, 2290, 75, 110,  220, 100, 56, 53, 60, 48),
+(29264, 42, 5385, 1146, 2347, 76, 130,  240, 102, 57, 54, 61, 49),
+(29264, 43, 5442, 1172, 2404, 78, 160,  260, 104, 58, 55, 62, 50),
+(29264, 44, 5499, 1198, 2461, 80, 180,  280, 106, 59, 56, 63, 51),
+(29264, 45, 5556, 1224, 2518, 85, 200,  300, 108, 60, 57, 64, 52),
+(29264, 46, 5613, 1250, 2575, 90, 220,  320, 110, 61, 58, 65, 53),
+(29264, 47, 5670, 1276, 2632, 95, 240,  340, 112, 62, 59, 66, 54),
+(29264, 48, 5727, 1302, 2689, 100, 260, 360, 114, 63, 60, 67, 55),
+(29264, 49, 5784, 1328, 2746, 110, 280, 380, 116, 64, 61, 68, 56),
+(29264, 50, 5841, 1354, 2803, 120, 300, 400, 118, 65, 62, 69, 57),
+(29264, 51, 5898, 1380, 2860, 130, 350, 440, 120, 66, 63, 70, 58),
+(29264, 52, 5955, 1406, 2917, 140, 400, 470, 122, 67, 64, 71, 59),
+(29264, 53, 5012, 1432, 2974, 150, 450, 500, 124, 68, 65, 72, 60),
+(29264, 54, 6069, 1458, 3031, 160, 480, 520, 126, 69, 66, 73, 61),
+(29264, 55, 6126, 1484, 3088, 170, 500, 550, 128, 70, 67, 74, 62),
+(29264, 56, 6183, 1510, 3145, 180, 520, 600, 130, 71, 68, 75, 63),
+(29264, 57, 6240, 1536, 3202, 190, 545, 620, 132, 72, 69, 76, 64),
+(29264, 58, 6297, 1562, 3259, 200, 560, 640, 134, 73, 70, 77, 65),
+(29264, 59, 6354, 1588, 3316, 210, 575, 660, 136, 74, 71, 78, 66),
+(29264, 60, 6411, 1614, 3373, 220, 600, 680, 138, 75, 72, 79, 67),
+(29264, 61, 6468, 1640, 3430, 230, 620, 700, 140, 76, 73, 80, 68),
+(29264, 62, 6525, 1666, 3487, 240, 630, 720, 142, 77, 74, 81, 69),
+(29264, 63, 6582, 1692, 3544, 250, 655, 740, 144, 78, 75, 82, 70),
+(29264, 64, 6639, 1718, 3601, 260, 670, 760, 146, 79, 76, 83, 71),
+(29264, 65, 6696, 1744, 3658, 270, 685, 790, 148, 80, 77, 84, 72),
+(29264, 66, 6753, 1770, 3715, 280, 705, 810, 150, 81, 78, 85, 73),
+(29264, 67, 6810, 1796, 3772, 290, 720, 820, 152, 82, 79, 86, 74),
+(29264, 68, 6867, 1822, 3829, 300, 730, 840, 154, 83, 80, 87, 75),
+(29264, 69, 6924, 1848, 3886, 310, 740, 860, 156, 84, 81, 88, 76),
+(29264, 70, 7200, 1890, 3800, 320, 750, 900, 158, 82, 79, 92, 88),
+(29264, 71, 8038, 1900, 4000, 325, 760, 930, 160, 86, 83, 90, 78),
+(29264, 72, 8095, 1926, 4057, 330, 770, 940, 162, 87, 84, 91, 79),
+(29264, 73, 8152, 1952, 4114, 340, 780, 950, 164, 88, 85, 92, 80),
+(29264, 74, 8209, 1978, 4171, 350, 790, 960, 166, 89, 86, 93, 81),
+(29264, 75, 8266, 2004, 4228, 360, 800, 970, 168, 90, 87, 94, 82),
+(29264, 76, 8323, 2030, 4285, 370, 810, 980, 170, 91, 88, 95, 83),
+(29264, 77, 8380, 2056, 4342, 380, 820, 990, 172, 92, 89, 96, 84),
+(29264, 78, 8437, 2082, 4399, 390, 830, 1000,174, 93, 90, 97, 85),
+(29264, 79, 8494, 2108, 4456, 400, 840, 1090,176, 94, 91, 98, 86),
+(29264, 80, 8600, 3800, 4800, 410, 850, 1100,180, 122,92, 101, 94);
+
+-- From FallenangelX (need more research)
+-- Greater Earth Elemental
+DELETE FROM pet_levelstats WHERE creature_entry = 15352;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(15352,  1,   42,   22,    20,  2,  3, 10,  22, 20,  22,  20,  20),
+(15352, 66, 7100,    0,  7000, 50, 83,  0, 132, 62,  96, 132, 320),
+(15352, 67, 7464,    0,  7521, 50, 84,  0, 141, 64, 100, 134, 330),
+(15352, 68, 7828,    0,  8042, 51, 85,  0, 150, 66, 105, 136, 340),
+(15352, 69, 8192,    0,  8564, 52, 86,  0, 159, 68, 110, 139, 350),
+(15352, 70, 8557,    0,  9085, 52, 87,  0, 168, 70, 114, 141, 360),
+(15352, 71, 8921,    0,  9607, 53, 89,  0, 178, 72, 119, 143, 370),
+(15352, 72, 9285,    0, 10128, 54, 90,  0, 187, 74, 124, 146, 380),
+(15352, 73, 9650,    0, 10650, 55, 91,  0, 196, 76, 129, 148, 390),
+(15352, 74, 10014,   0, 11171, 55, 92,  0, 205, 78, 133, 150, 400),
+(15352, 75, 10378,   0, 11692, 56, 93,  0, 214, 80, 138, 153, 410),
+(15352, 76, 10742,   0, 12214, 57, 95,  0, 224, 82, 143, 155, 420),
+(15352, 77, 11107,   0, 12735, 57, 96,  0, 233, 84, 147, 157, 430),
+(15352, 78, 11471,   0, 13257, 58, 97,  0, 242, 86, 152, 160, 440),
+(15352, 79, 11835,   0, 13778, 59, 98,  0, 251, 88, 157, 162, 450),
+(15352, 80, 12200,2120, 14300, 60,100,812, 261, 90, 162, 165, 460);
+
+-- Greater Fire Elemental
+DELETE FROM pet_levelstats WHERE creature_entry = 15438;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+( 15438,  1,   42,   22,   20,   2,   3,  10,  22,  20,  22,  20,  20),
+( 15438, 68, 6800, 2052,  980, 123, 164,   0, 230, 138,  99, 320, 340),
+( 15438, 69, 6900, 2071,  990, 126, 167,   0, 241, 139, 101, 327, 350),
+( 15438, 70, 7000, 2090, 1000, 129, 171,   0, 252, 141, 103, 334, 360),
+( 15438, 71, 7100, 2109, 1010, 132, 175,   0, 264, 143, 105, 341, 370),
+( 15438, 72, 7200, 2128, 1020, 135, 179,   0, 275, 145, 107, 348, 380),
+( 15438, 73, 7300, 2147, 1030, 138, 183,   0, 286, 147, 109, 355, 390),
+( 15438, 74, 7400, 2166, 1040, 141, 187,   0, 298, 149, 112, 362, 400),
+( 15438, 75, 7500, 2185, 1050, 144, 190,   0, 309, 150, 114, 369, 410),
+( 15438, 76, 7600, 2204, 1060, 147, 194,   0, 320, 152, 116, 376, 420),
+( 15438, 77, 7700, 2223, 1070, 150, 198,   0, 332, 154, 118, 383, 430),
+( 15438, 78, 7800, 2242, 1080, 153, 202,   0, 343, 156, 120, 390, 440),
+( 15438, 79, 7900, 2261, 1090, 156, 206,   0, 354, 158, 122, 397, 450),
+( 15438, 80, 8000, 2280, 1100, 160, 210,1480, 366, 160, 125, 405, 460);
+
+-- Mage Water elemental (old guardian)
+DELETE FROM pet_levelstats WHERE creature_entry = 510;
+INSERT INTO pet_levelstats (creature_entry, level, hp, mana, armor, mindmg, maxdmg, attackpower, str, agi, sta, inte, spi) VALUES
+(510, 1,  42, 22, 20, 2, 3, 10, 22, 20, 22, 20, 20),
+(510, 50, 1234, 1000, 108,   63,  87,  91, 13, 19, 50, 43, 53),
+(510, 51, 1250, 1115, 112,   64,  88,  94, 15, 20, 51, 44, 54),
+(510, 52, 1271, 1135, 128,   65,  90,  96, 17, 21, 52, 44, 55),
+(510, 53, 1280, 1152, 183,   66,  92,  98, 19, 22, 53, 45, 56),
+(510, 54, 1304, 1161, 237,   67,  93,  99, 22, 23, 54, 45, 57),
+(510, 55, 1329, 1182, 292,   68,  95, 102, 24, 24, 55, 47, 58),
+(510, 56, 1341, 1200, 348,   69,  96, 104, 27, 25, 57, 47, 59),
+(510, 57, 1355, 1234, 402,   86, 100, 105, 29, 26, 58, 48, 60),
+(510, 58, 1364, 1242, 457,  104, 109, 106, 31, 27, 59, 48, 61),
+(510, 59, 1372, 1259, 512,  110, 115, 109, 34, 28, 60, 49, 62),
+(510, 60, 1381, 1262, 814,  134, 123, 112, 35, 29, 61, 50, 63),
+(510, 61, 1390, 1274, 1113, 157, 145, 114, 36, 30, 62, 51, 64),
+(510, 62, 1400, 1282, 1410, 179, 162, 116, 37, 31, 63, 52, 65),
+(510, 63, 1411, 1291, 1708, 190, 166, 126, 38, 32, 64, 53, 66),
+(510, 64, 1419, 1300, 1006, 182, 170, 142, 39, 33, 65, 54, 67),
+(510, 65, 1429, 1304, 1303, 186, 178, 153, 40, 34, 66, 55, 68),
+(510, 66, 1435, 1321, 1601, 189, 187, 163, 41, 35, 67, 56, 69),
+(510, 67, 1450, 1330, 1900, 192, 198, 172, 42, 36, 68, 57, 70),
+(510, 68, 1458, 1341, 1197, 199, 210, 181, 43, 37, 69, 58, 71),
+(510, 69, 1464, 1351, 2008, 122, 144, 127, 44, 36, 70, 77,  72),
+(510, 70, 1528, 1568, 2207, 138, 174, 135, 45, 39, 71, 78,  73),
+(510, 71, 1580, 1632, 2319, 142, 224, 182, 48, 40, 72, 82,  75),
+(510, 72, 1639, 1695, 2431, 146, 312, 204, 50, 41, 74, 83,  77),
+(510, 73, 1699, 1763, 2544, 154, 368, 255, 53, 44, 76, 85,  80),
+(510, 74, 1761, 1830, 2660, 162, 424, 301, 54, 45, 78, 87,  82),
+(510, 75, 1821, 1896, 2760, 168, 482, 390, 56, 46, 79, 89,  84),
+(510, 76, 1882, 1964, 2890, 184, 520, 470, 57, 48, 80, 90,  85),
+(510, 77, 1949, 2033, 2999, 212, 59,  550, 58, 50, 83, 92,  90),
+(510, 78, 2011, 2100, 3110, 263, 640, 622, 59, 54, 85, 94,  91),
+(510, 79, 2073, 2167, 3150, 322, 720, 710, 60, 61, 88, 96,  92),
+(510, 80, 2300, 2200, 3250, 360, 780, 740, 62, 86, 92, 99,  93);
diff --git a/sql_mr/mr01280_mangos_spell_proc_event_hacks.sql b/sql_mr/mr01280_mangos_spell_proc_event_hacks.sql
new file mode 100644
index 00000000000..27bb1e574a3
--- /dev/null
+++ b/sql_mr/mr01280_mangos_spell_proc_event_hacks.sql
@@ -0,0 +1,38 @@
+-- Arcane Potency 
+DELETE FROM spell_chain WHERE spell_ID IN (57529, 57531);
+INSERT INTO spell_chain (spell_id, prev_spell, first_spell, rank, req_spell) VALUES
+(57529, 0, 57529, 1, 0),
+(57531,57529, 57529, 2,0);
+
+DELETE FROM spell_proc_event WHERE entry IN (57529, 57531);
+INSERT INTO spell_proc_event VALUES (57529, 0x00, 3, 0x61400035 | 0x200000 | 0x20000 | 0x0000040 | 0x000080 | 0x00000002 | 0x00000200 | 0x00001000 | 0x00800000, 0, 0, 0x00001000 | 0x00008000 | 0x00000002 | 0x00001000 | 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- Fingers of Frost
+DELETE FROM spell_proc_event WHERE entry IN (44543, 44545);
+-- (74396) Fingers of Frost
+DELETE FROM `spell_proc_event` WHERE `entry` IN (74396);
+INSERT INTO `spell_proc_event` VALUES (74396, 0x00, 0x03, 685904631, 685904631, 685904631, 1151048, 1151048, 1151048, 0, 0, 0, 65536, 0, 0, 0, 0);
+
+-- Savage Combat
+DELETE FROM spell_proc_event WHERE entry = 51682; 
+INSERT INTO spell_proc_event VALUES (51682, 0x00, 8, 0x10014000, 0x10014000, 0x10014000, 0x00080000, 0x00080000, 0x00080000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- Vanish & Invisibility
+DELETE FROM spell_proc_event WHERE entry IN (26888, 32612);
+
+-- https://github.com/mangosR2/mangos/commit/11b986b85cc29a8b2b398370c97c36335f709940
+-- (56636) Taste for Blood
+DELETE FROM spell_proc_event WHERE entry = 56636;
+INSERT INTO spell_proc_event VALUES (56636, 0x00, 0x04, 0x00000020, 0x00000020, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0, 0, 6);
+
+-- (588) Inner Fire
+DELETE FROM spell_proc_event WHERE entry = 588;
+INSERT INTO spell_proc_event VALUES (588, 0x00, 0x06, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0, 0, 0);
+
+-- (37483) Improved Kill Command
+DELETE FROM spell_proc_event WHERE entry = 37483;
+INSERT INTO spell_proc_event VALUES (37483, 0x00, 0x09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0);
+
+-- (47535) Rapture (Rank 1)
+DELETE FROM `spell_proc_event` WHERE `entry` IN (47535);
+INSERT INTO `spell_proc_event` VALUES (47535, 0x02, 0x06, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x08000000, 0x00600000, 0, 0, 0);
diff --git a/sql_mr/mr01299_mangos_battleground_template.sql b/sql_mr/mr01299_mangos_battleground_template.sql
new file mode 100644
index 00000000000..74c9b1c974d
--- /dev/null
+++ b/sql_mr/mr01299_mangos_battleground_template.sql
@@ -0,0 +1,16 @@
+-- Alterac Valley
+UPDATE battleground_template SET AllianceStartO = 3.6, HordeStartO = 1.24 WHERE id = 1;
+-- Warsong Gulch
+UPDATE battleground_template SET HordeStartO = 0 WHERE id = 2;
+-- Nagrand Arena
+UPDATE battleground_template SET AllianceStartO = 5.21, HordeStartO = 2.06 WHERE id = 4;
+-- Blade's Edge Arena
+UPDATE battleground_template SET AllianceStartO = 4, HordeStartO = 0.903205 WHERE id = 5;
+-- Ruins of Lordaeron
+UPDATE battleground_template SET AllianceStartO = 4.83, HordeStartO = 1.7 WHERE id = 8;
+-- Dalaran Sewers
+UPDATE battleground_template SET HordeStartO = 3.14 WHERE id = 10;
+-- The Ring of Valor
+UPDATE battleground_template SET AllianceStartO = 4.72, HordeStartO = 1.6 WHERE id = 11;
+-- Isle of Conquest
+UPDATE battleground_template SET AllianceStartO = 0, HordeStartO = 3.14159 WHERE id = 30;
diff --git a/sql_mr/mr01330_mangos_creature.sql b/sql_mr/mr01330_mangos_creature.sql
new file mode 100644
index 00000000000..384ad1caf45
--- /dev/null
+++ b/sql_mr/mr01330_mangos_creature.sql
@@ -0,0 +1,8 @@
+-- set 1 day respawn time to every creature in BGs/arenas
+UPDATE creature SET spawntimesecs = 86400 WHERE map IN (30, 489, 529, 559, 562, 566, 572, 607, 617, 618, 628);
+-- set 10 seconds respawn time to:
+UPDATE creature SET spawntimesecs = 10 WHERE id IN (
+-- Spirit Guides
+13116, 13117,
+-- SotA demolishers
+28781);
diff --git a/sql_mr/mr01330_mangos_gameobject.sql b/sql_mr/mr01330_mangos_gameobject.sql
new file mode 100644
index 00000000000..b521070fa72
--- /dev/null
+++ b/sql_mr/mr01330_mangos_gameobject.sql
@@ -0,0 +1,6 @@
+-- set 1 day respawn time to every game object in BGs/arenas
+UPDATE gameobject SET spawntimesecs = 86400 WHERE map IN (30, 489, 529, 559, 562, 566, 572, 607, 617, 618, 628);
+-- set 10 seconds respawn time to:
+UPDATE gameobject SET spawntimesecs = 10 WHERE id IN (
+-- SotA Seaforium Charges
+190753, 194086);
diff --git a/sql_mr/mr01337_mangos_server_spells.sql b/sql_mr/mr01337_mangos_server_spells.sql
new file mode 100644
index 00000000000..2a2464d1261
--- /dev/null
+++ b/sql_mr/mr01337_mangos_server_spells.sql
@@ -0,0 +1,50 @@
+-- server-side spells (not found in DBC)
+-- 18350, counter-type triggered spell (template)
+DELETE FROM `spell_dbc` WHERE `Id` = 18350;
+INSERT INTO `spell_dbc`
+    ( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES
+    (18350,        0,          0,            0,              0,               0,               0,               0,               0,         0,            0,         0,                  1,                    0,           0,          101,             0,          0,           0,            0,              39,            1,             0,                  -1,                          0,                               0,         6,       122,         0,                 1,                 0,                 0,                           0,                           0,                           0,                   0,                   0,                   0,                 0,                 0,                 0,                        1,                        1,                        0,                        0,                        0,                        0,                    0,                    0,                    0,                      4,                      0,                      0,                  0,                  0,                  0,                      0,                      0,                      0,                  0,                  0,                  0,                   0,                   0,                   0,                     0,                     0,                     0,                        0,                        0,                        0,                        0,                        0,                        0,                        0,                        0,                        0,                0,                 0,                   0,                   0,                   0,                    0,          0,                0,                0,                0,                0,             0,            1, 'Server-side triggered spell 18350');
+
+-- Replacement for spell 63974 "Glyph of Shred triggered (reingeneered)"
+DELETE FROM `spell_dbc` WHERE ID=63974;
+INSERT INTO `spell_dbc` (`Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`)
+VALUES ( 63974 , 0 , 0 , 0 , 128 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 101 , 0 , 0 , 0 , 0 , 29 , 2 , 99 , -1 , 0 , 0 , 6 , 122 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 6 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 4 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 7 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 ,'spell 63974 "Glyph of Shred triggered (reingeneered)"');
+
+-- Eadric the Pure achievement criteria complete spell (Trial of the Champion)
+DELETE FROM spell_dbc WHERE Id=68575;
+INSERT INTO spell_dbc (Id, Category, Dispel, Mechanic, Attributes, AttributesEx, AttributesEx2, AttributesEx3, AttributesEx4, AttributesEx5, AttributesEx6, AttributesEx7, Stances, StancesNot, Targets, RequiresSpellFocus, CasterAuraSpell, TargetAuraSpell, ExcludeCasterAuraSpell, ExcludeTargetAuraSpell, CastingTimeIndex, RecoveryTime, CategoryRecoveryTime, InterruptFlags, AuraInterruptFlags, ProcFlags, ProcChance, ProcCharges, MaxLevel, BaseLevel, SpellLevel, DurationIndex, RangeIndex, StackAmount, EquippedItemClass, EquippedItemSubClassMask, EquippedItemInventoryTypeMask, Effect1, Effect2, Effect3, EffectDieSides1, EffectDieSides2, EffectDieSides3, EffectRealPointsPerLevel1, EffectRealPointsPerLevel2, EffectRealPointsPerLevel3, EffectBasePoints1, EffectBasePoints2, EffectBasePoints3, EffectMechanic1, EffectMechanic2, EffectMechanic3, EffectImplicitTargetA1, EffectImplicitTargetA2, EffectImplicitTargetA3, EffectImplicitTargetB1, EffectImplicitTargetB2, EffectImplicitTargetB3, EffectRadiusIndex1, EffectRadiusIndex2, EffectRadiusIndex3, EffectApplyAuraName1, EffectApplyAuraName2, EffectApplyAuraName3, EffectAmplitude1, EffectAmplitude2, EffectAmplitude3, EffectMultipleValue1, EffectMultipleValue2, EffectMultipleValue3, EffectItemType1, EffectItemType2, EffectMiscValue1, EffectMiscValue2, EffectMiscValue3, EffectMiscValueB1, EffectMiscValueB2, EffectMiscValueB3, EffectTriggerSpell1, EffectTriggerSpell2, EffectTriggerSpell3, EffectSpellClassMaskA1, EffectSpellClassMaskA2, EffectSpellClassMaskA3, EffectSpellClassMaskB1, EffectSpellClassMaskB2, EffectSpellClassMaskB3, EffectSpellClassMaskC1, EffectSpellClassMaskC2, EffectSpellClassMaskC3, SpellIconID, MaxTargetLevel, SpellFamilyName, SpellFamilyFlags1, SpellFamilyFlags2, SpellFamilyFlags3, MaxAffectedTargets, DmgClass, PreventionType, DmgMultiplier1, DmgMultiplier2, DmgMultiplier3, AreaGroupId, SchoolMask, Comment) VALUES
+('68575','0','0','0','536870912','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','1','0','0','0','0','0','101','0','0','0','0','0','1','0','-1','0','0','3','0','0','0','0','0','0','0','0','0','0','0','0','0','0','18','0','0','16','0','0','28','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','Eadric the Pure achievement criteria complete spell (Trial of the Champion)');
+
+-- need records for this:
+-- 8320
+-- 16630
+-- 19229
+-- 22904
+-- 23209
+-- 24606
+-- 31770
+-- 32184
+-- 32186
+-- 33801
+-- 33897
+-- 35256
+-- 37492
+-- 37503
+-- 40200
+-- 40426
+-- 41910
+-- 42686
+-- 42778
+-- 43537
+-- 47067
+-- 47531
+-- 47805
+-- 54437
+-- 62431
+-- 62474
+-- 64884
+-- 65095
+-- 65142
+-- 66319
+-- 69357
+-- 71382
diff --git a/sql_mr/mr01350_mangos_areatrigger_data.sql b/sql_mr/mr01350_mangos_areatrigger_data.sql
new file mode 100644
index 00000000000..23b52c3b506
--- /dev/null
+++ b/sql_mr/mr01350_mangos_areatrigger_data.sql
@@ -0,0 +1,6 @@
+-- Areatrigger additional data
+UPDATE `areatrigger_teleport` SET `achiev_id_0` = 4530, `achiev_id_1` = 4597 WHERE `target_map` = 631;
+
+-- UPDATE `areatrigger_teleport` SET `combat_mode` = 1 WHERE `target_map` = 631;
+
+UPDATE `areatrigger_teleport` SET `minGS` = 192 WHERE `target_map` > 600;
diff --git a/sql_mr/mr01384_mangos_spell_bonus_data.sql b/sql_mr/mr01384_mangos_spell_bonus_data.sql
new file mode 100644
index 00000000000..e7a8500ae59
--- /dev/null
+++ b/sql_mr/mr01384_mangos_spell_bonus_data.sql
@@ -0,0 +1,45 @@
+-- Spell bonus data
+-- Lifebloom
+UPDATE `spell_bonus_data` SET `direct_bonus`= 0.8 WHERE `entry`= 33763;
+
+DELETE FROM `spell_bonus_data` WHERE entry IN (30451, 51963, 52042, 52752, 54158, 56161, 58621, 64844, 64085);
+INSERT INTO `spell_bonus_data`
+    (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`)
+VALUES
+    -- Gargoyle Strike
+    (51963, 0, 0, 0.33, 0,'Gargoyle Strike'),
+    -- Healing Stream Totem
+    (52042, 0, 0, 0, 0,'Healing Stream Totem'),
+    -- Ancestral Awakening
+    (52752, 0, 0, 0, 0,'Ancestral Awakening'),
+    -- Judgement
+    (54158, 0, 0, 0, 0,'Judgement'),
+    -- Glyph of  Prayer of Healing
+    (56161, 0, 0, 0, 0,'Glyph of Prayer of Healing'),
+    -- Glyph of Chains of Ice (it's correct, but bonus value is simple)
+    (58621, 0, 0, 0.08, 0, 'Glyph of Chains of Ice'),
+    -- Priest - Divine Hymn
+    (64844, 0.564, 0, 0, 0, 'Priest - Divine Hymn'),
+    -- Priest - Vampiric Touch Dispel
+    (64085, 2.4, 0, 0, 0, 'Priest - Vampiric Touch Dispel');
+
+-- SPELL_AURA_DAMAGE_SHIELD by Warlord
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (7294, 467, 2947);
+INSERT INTO `spell_bonus_data`(`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+    ( 467, 0.033, 0, 0, 0,'Druid - Thorns'),
+    (7294, 0.033, 0, 0, 0,'Paladin - Retribution Aura'),
+    (2947, 0.033, 0, 0, 0,'Warlock - Fire Shield (Imp)');
+
+-- Item's
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (16614, 45055, 60488);
+INSERT INTO `spell_bonus_data`(`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+(16614, 0, 0, 0, 0, 'Item - Storm Gauntlets - Lightning Strike'),
+(45055, 0, 0, 0, 0, 'Item - Timbal''s Focusing Crystal'),
+(60488, 0, 0, 0, 0, 'Item - Extract of Necromatic Power');
+
+-- pet attack's by say1981
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (17253,16827,49966);
+INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
+    (17253, 0, 0, 0.08, 0, 'Bite (Rank 1) - Hunter pet'),
+    (16827, 0, 0, 0.08, 0, 'Claw (Rank 1) - Hunter pet'),
+    (49966, 0, 0, 0.08, 0, 'Smack (Rank 1) - Hunter pet');
diff --git a/sql_mr/mr01393_realmd_account_forcepermission.sql b/sql_mr/mr01393_realmd_account_forcepermission.sql
new file mode 100644
index 00000000000..8029cba724b
--- /dev/null
+++ b/sql_mr/mr01393_realmd_account_forcepermission.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS account_forcepermission;
+CREATE TABLE account_forcepermission (
+    AccountID int(11) unsigned NOT NULL DEFAULT '0',
+    realmID int(3) unsigned NOT NULL DEFAULT '0',
+    Security int(3) unsigned NOT NULL DEFAULT '0',
+    Comment varchar(32) NOT NULL DEFAULT '',
+    PRIMARY KEY (AccountID, realmID)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
diff --git a/sql_mr/mr01448_mangos_spell_dbc_extend.sql b/sql_mr/mr01448_mangos_spell_dbc_extend.sql
new file mode 100644
index 00000000000..7107202ab81
--- /dev/null
+++ b/sql_mr/mr01448_mangos_spell_dbc_extend.sql
@@ -0,0 +1,3 @@
+-- spell_dbc correct
+ALTER TABLE `spell_dbc`
+    CHANGE `Stances` `Stances` int(10) unsigned NOT NULL default '0';
diff --git a/sql_mr/mr01515_mangos_the_ring_of_valor.sql b/sql_mr/mr01515_mangos_the_ring_of_valor.sql
new file mode 100644
index 00000000000..a1e84338e8d
--- /dev/null
+++ b/sql_mr/mr01515_mangos_the_ring_of_valor.sql
@@ -0,0 +1,60 @@
+-- The Ring of Valor
+
+-- gameobject initial guid
+SET @GAMEOBJECT := 541000;
+
+UPDATE gameobject_template SET faction='114', flags='32' WHERE entry IN (192704, 192705, 192388, 192387, 192393, 192394, 192389, 192390);
+
+DELETE FROM `gameobject` WHERE map = '618';
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @GAMEOBJECT AND @GAMEOBJECT+15;
+INSERT INTO gameobject (guid, id, map, spawnMask, phaseMask, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state) VALUES
+-- buffs
+(@GAMEOBJECT,'184663','618','1','1','735.551819','-284.794678','28.276682','0.034906','0','0','1','0','-120','100','1'),
+(@GAMEOBJECT+1,'184664','618','1','1','791.224487','-284.794464','28.276682','2.600535','0','0','1','0','-120','100','1'),
+-- elevators
+(@GAMEOBJECT+2,'194582','618','1','1','763.536377','-294.535767','0.505383','3.141593','0','0','1','0','120','100','1'),
+(@GAMEOBJECT+3,'194586','618','1','1','763.506348','-273.873352','0.505383','0','0','0','1','0','120','100','1'),
+-- fire
+(@GAMEOBJECT+4,'192704','618','1','1','743.543457','-283.799469','28.286655','0','0','0','1','0','120','100','1'),
+(@GAMEOBJECT+5,'192705','618','1','1','782.971802','-283.799469','28.286655','0','0','0','1','0','120','100','1'),
+(@GAMEOBJECT+6,'192388','618','1','1','743.711060','-284.099609','27.542587','3.141593','0','0','1','0','120','100','1'),
+(@GAMEOBJECT+7,'192387','618','1','1','783.221252','-284.133362','27.535686','0','0','0','1','0','120','100','1'),
+-- gears
+(@GAMEOBJECT+8,'192393','618','1','1','763.664551','-261.872986','26.686588','0','0','0','1','0','120','100','1'),
+(@GAMEOBJECT+9,'192394','618','1','1','763.578979','-306.146149','26.665222','3.141593','0','0','1','0','120','100','1'),
+-- pillars
+(@GAMEOBJECT+10,'194583','618','1','1','763.632385','-306.162384','25.909504','3.141593','0','0','1','0','120','100','1'),
+(@GAMEOBJECT+11,'194584','618','1','1','723.644287','-284.493256','24.648525','3.141593','0','0','1','0','120','100','1'),
+(@GAMEOBJECT+12,'194585','618','1','1','763.611145','-261.856750','25.909504','0','0','0','1','0','120','100','1'),
+(@GAMEOBJECT+13,'194587','618','1','1','802.211609','-284.493256','24.648525','0','0','0','1','0','120','100','1'),
+-- pulley
+(@GAMEOBJECT+14,'192389','618','1','1','700.722290','-283.990662','39.517582','3.141593','0','0','1','0','120','100','1'),
+(@GAMEOBJECT+15,'192390','618','1','1','826.303833','-283.996429','39.517582','0','0','0','1','0','120','100','1');
+
+DELETE FROM gameobject_battleground WHERE guid IN (SELECT guid FROM gameobject WHERE `map` = 618);
+INSERT INTO gameobject_battleground (guid, event1, event2) VALUES
+-- buffs
+(@GAMEOBJECT,   253, 0),
+(@GAMEOBJECT+1, 253, 0),
+-- elevators
+(@GAMEOBJECT+2, 254, 0),
+(@GAMEOBJECT+3, 254, 0),
+-- gears
+(@GAMEOBJECT+8,   7, 0),
+(@GAMEOBJECT+9,   7, 0),
+-- pillars
+(@GAMEOBJECT+10,  6, 0),
+(@GAMEOBJECT+11,  6, 0),
+(@GAMEOBJECT+12,  6, 0),
+(@GAMEOBJECT+13,  6, 0),
+-- static go
+(@GAMEOBJECT+14,  5, 0),
+(@GAMEOBJECT+15,  5, 0);
+
+DELETE FROM battleground_events WHERE `map` = '618';
+INSERT INTO battleground_events (map, event1, event2, description) VALUES
+(618, 253, 0, 'buffs'),
+(618, 254, 0, 'doors'),
+(618, 5, 0, 'spawn static go'),
+(618, 6, 0, 'spawn pillars'),
+(618, 7, 0, 'spawn gears');
diff --git a/sql_mr/mr01610_mangos_opvp_capture_points.sql b/sql_mr/mr01610_mangos_opvp_capture_points.sql
new file mode 100644
index 00000000000..42d44deb804
--- /dev/null
+++ b/sql_mr/mr01610_mangos_opvp_capture_points.sql
@@ -0,0 +1,4 @@
+-- Zangarmarsh fixes
+-- red aura in c_t_a
+DELETE FROM `creature_template_addon` WHERE entry = 77096;
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `b2_0_sheath`, `b2_1_pvp_state`, `emote`, `moveflags`, `auras`) VALUES (77096, 0, 0, 1, 0, 0, 0, 32839);
diff --git a/sql_mr/mr01612_mangos_dalaran_arena.sql b/sql_mr/mr01612_mangos_dalaran_arena.sql
new file mode 100644
index 00000000000..08f0ee0ef7b
--- /dev/null
+++ b/sql_mr/mr01612_mangos_dalaran_arena.sql
@@ -0,0 +1,42 @@
+-- Dalaran Arena
+
+-- gameobject initial guid
+SET @GAMEOBJECT := 540000;
+
+UPDATE gameobject_template SET faction=114, flags=32, size=1.5 WHERE entry IN (192642, 192643);
+
+DELETE FROM `gameobject` WHERE map = 617;
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @GAMEOBJECT AND @GAMEOBJECT+999;
+INSERT INTO gameobject (guid, id, map, spawnMask, phaseMask, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state) VALUES
+-- buffs
+(@GAMEOBJECT,184663,617,1,1,1291.7,813.424,7.11472,4.64562,0,0,0.730314,-0.683111,86400,100,1),
+(@GAMEOBJECT+1,184664,617,1,1,1291.7,768.911,7.11472,1.55194,0,0,0.700409,0.713742,86400,100,1),
+-- doors
+(@GAMEOBJECT+2,192642,617,1,1,1350.95,817.2,21.4096,3.15,0,0,0.99627,0.0862864,86400,100,1),
+(@GAMEOBJECT+3,192643,617,1,1,1232.65,764.913,21.4729,6.3,0,0,0.0310211,-0.999519,86400,100,1),
+-- waterfall
+(@GAMEOBJECT+4,194395,617,1,1,1291.6,791.05,7.11,3.22012,0,0,0.999229,-0.0392542,86400,100,1),
+(@GAMEOBJECT+5,191877,617,1,1,1291.6,791.05,7.11,3.22012,0,0,0.999229,-0.0392542,86400,100,1);
+
+DELETE FROM gameobject_battleground WHERE guid IN (SELECT guid FROM gameobject WHERE map=617);
+INSERT INTO gameobject_battleground (guid, event1, event2) VALUES
+-- buffs
+(@GAMEOBJECT,253,0),
+(@GAMEOBJECT+1,253,0),
+-- doors
+(@GAMEOBJECT+2,254,0),
+(@GAMEOBJECT+3,254,0),
+-- waterfall
+(@GAMEOBJECT+4,250,0),
+(@GAMEOBJECT+5,249,0);
+
+DELETE FROM battleground_events WHERE map = 617;
+INSERT INTO battleground_events (map, event1, event2, description) VALUES
+(617, 253, 0, 'buffs'),
+(617, 254, 0, 'doors'),
+(617, 250, 0, 'waterfall visual'),
+(617, 249, 0, 'waterfall collision');
+-- (617, 248, 0, 'waterfall sprouts');
+
+-- Fix Rotation for all Objects in Map
+UPDATE gameobject SET rotation0=0, rotation1=0, rotation2=SIN(orientation*0.5), rotation3=COS(orientation*0.5) WHERE map =  617;
diff --git a/sql_mr/mr01640_mangos_name_announce.sql b/sql_mr/mr01640_mangos_name_announce.sql
new file mode 100644
index 00000000000..18796bcdc23
--- /dev/null
+++ b/sql_mr/mr01640_mangos_name_announce.sql
@@ -0,0 +1,9 @@
+DELETE FROM `command` WHERE name = 'nameannounce';
+INSERT INTO `command` VALUES ('nameannounce', 1, 'Syntax: .nameannounce $MessageToBroadcast\r\n\r\nSend a global message to all players online in chat log with colored sender\'s name.');
+
+DELETE FROM `mangos_string` WHERE entry IN (12000, 12001, 12002);
+INSERT INTO `mangos_string` (`entry`,`content_default`) VALUES
+(12000,'|c1f40af20 <Mod>|cffff0000[%s]|c1f40af20 announce:|cffffff00 %s|r'),
+(12001,'|c1f40af20 <GM>|cffff0000[%s]|c1f40af20 announce:|cffffff00 %s|r'),
+(12002,'|c1f40af20 <Admin>|cffff0000[%s]|c1f40af20 announce:|cffffff00 %s|r');
+
diff --git a/sql_mr/mr01662_mangos_areatrigger_teleport.sql b/sql_mr/mr01662_mangos_areatrigger_teleport.sql
new file mode 100644
index 00000000000..8ebcfd18e81
--- /dev/null
+++ b/sql_mr/mr01662_mangos_areatrigger_teleport.sql
@@ -0,0 +1,29 @@
+UPDATE areatrigger_teleport SET combat_mode = 1 WHERE id IN
+-- ICC IceCrown Citadel
+(5670, 
+-- Trial of the Crusader
+5503,
+-- Trial of the Champion
+5505,
+-- Vault of Archavon
+5258,
+-- Ulduar Raid
+5379,
+-- Naxxramas
+5191, 5192, 5193, 5194,
+-- Sunwell Plateau 
+4889,
+-- Zul'Aman
+4738,
+-- Black Temple
+4598,
+-- Gruul\'s Lair 
+4535, 
+-- The Eye
+4470,
+-- Serpentshrine Cavern
+4416,
+-- Karazhan
+4131, 4135,
+-- Zul'Gurub 
+3928);
diff --git a/sql_mr/mr01678_mangos_custom_areatriggers.sql b/sql_mr/mr01678_mangos_custom_areatriggers.sql
new file mode 100644
index 00000000000..629d20515f6
--- /dev/null
+++ b/sql_mr/mr01678_mangos_custom_areatriggers.sql
@@ -0,0 +1,13 @@
+-- Template for creating custom rules for transfer to absent in AreaTrigger.dbc maps.
+DELETE FROM `areatrigger_teleport` WHERE `id` BETWEEN 100000 AND 101000;
+INSERT INTO `areatrigger_teleport` (`id`, `name`, `required_level`, `required_item`, `required_item2`, `heroic_key`, `heroic_key2`, `required_quest_done_A`, `required_quest_done_H`, `required_quest_done_heroic_A`, `required_quest_done_heroic_H`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`, `minGS`, `maxGS`, `achiev_id_0`, `achiev_id_1`, `combat_mode`) VALUES
+(100013, 'Map 13', 1, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+(100025, 'Map 25', 1, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+(100037, 'Map 37', 1, 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+(100042, 'Map 42', 1, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+(100169, 'Map 169', 1, 0, 0, 0, 0, 0, 0, 0, 0, 169, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+(100451, 'Map 451', 1, 0, 0, 0, 0, 0, 0, 0, 0, 451, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+(100573, 'Map 573', 1, 0, 0, 0, 0, 0, 0, 0, 0, 573, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+(100597, 'Map 597', 1, 0, 0, 0, 0, 0, 0, 0, 0, 597, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+(100605, 'Map 605', 1, 0, 0, 0, 0, 0, 0, 0, 0, 605, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+(100606, 'Map 606', 1, 0, 0, 0, 0, 0, 0, 0, 0, 606, 0, 0, 0, 0, 0, 0, 0, 0, 0);
diff --git a/sql_mr/mr01736_characters_pet_extend.sql b/sql_mr/mr01736_characters_pet_extend.sql
new file mode 100644
index 00000000000..906d0c6b2a0
--- /dev/null
+++ b/sql_mr/mr01736_characters_pet_extend.sql
@@ -0,0 +1,3 @@
+-- Pet table cleanup
+ALTER TABLE `character_pet`
+  CHANGE `Reactstate` `Reactstate` INT(10) UNSIGNED NOT NULL DEFAULT '0';
diff --git a/sql_mr/mr01765_realmd_warden_data.sql b/sql_mr/mr01765_realmd_warden_data.sql
new file mode 100644
index 00000000000..c739b6afbc3
--- /dev/null
+++ b/sql_mr/mr01765_realmd_warden_data.sql
@@ -0,0 +1,788 @@
+-- Warden data from TOM_RUS
+INSERT INTO `warden_data_result`(`check`,`data`,`str`,`address`,`length`,`result`,`comment`) VALUES
+(178,'07F223143C69271AA2A851FECF6DC883A9D3A7DBA6FE26CC','',710730,23,'',NULL),
+(191,'C7D18F99DBC446A4B36E78B9130B6FA2E365B3D2D4199DF5','',28940,17,'',NULL),
+(191,'AA1A8559776F873F26954F15E49E6041EDC2C3766AD87A59','',21826,11,'',NULL),
+(178,'5F342A4D0EA9DB35F93FAE6E32670D810F017309817AA7C0','',676970,23,'',NULL),
+(178,'C57BD89DD447131EA2083784AB4DA8BD58CF3E182F1D8AF6','',690106,23,'',NULL),
+(191,'69AA85EFE8A1A990DA5ECFED4FAFD5B14F1D52EF2548FD15','',12905,36,'',NULL),
+(191,'083ECAD073DE2D61E3564B4BF767C9D1F8F15AA0495F5A76','',41096,24,'',NULL),
+(178,'C774D64EF60AD5A141FC56F3D02AE78AC147770FAE25D8FE','',3037164,22,'',NULL),
+(191,'502C59CAFEA11E9584C13BFE75F85EB79936AEEE31B44165','',12194860,37,'',NULL),
+(178,'4FBE8978A662428C616AABD71DA5562E4AC21F54BEB8ADBF','',3037164,22,'',NULL),
+(178,'83D3F7FD7DCA144AD8219A6A4E20F0CFC6E7EA208C4144FF','',3033068,22,'',NULL),
+(178,'00523153EE2298A8D80D7B26B7067CA7B26AC06FF374FE7B','',673210,23,'',NULL),
+(191,'91BC368FA14A3FE3E13D0B1056F485F846925E613D8E8903','',12194860,37,'',NULL),
+(178,'8FEFDBC58301AB0E0D0F6EBC5FBDA5ED9A7126873A9AB337','',682394,23,'',NULL),
+(191,'B40FF92D4F092599EA9014C88B474DE4352C3F1635109882','',448492,48,'',NULL),
+(191,'42B596FF923054531E4918DC39E08F8564FED16D559B494A','',29852,20,'',NULL),
+(178,'24291D6733A7CEFA3D54C3BCCAE95D56D8365BAB42AEE1CE','',3037164,22,'',NULL),
+(178,'6C4E321E2D5A153F2BB664EB6EEDF8D67FDE7ECC8076D087','',3990720,23,'',NULL),
+(178,'FB649706C8F1AFF5990B5F3118DFE54FF6F9609C6991C161','',3045776,31,'',NULL),
+(191,'D1B451C906B81261B048FD4025217245950C11660815367F','',28920,23,'',NULL),
+(191,'40079A1083A6B57E3B713992BD395FB6650B631E4C4B8D4E','',29852,20,'',NULL),
+(178,'3F8FEFE08CB358D6613656AFDB498AB8C599BA18B5574FB6','',682378,23,'',NULL),
+(191,'EECA71B5536EE1992FD7825A5CCC4B7F9F3B413C0DA498B6','',29884,20,'',NULL),
+(191,'B8786BFF2421ED1F1FB30F3F0BAF671FC1DAD5B3B33124C8','',28956,17,'',NULL),
+(191,'BF0C842D635D9D8B3F6FF84EF6DF7C963C485EBAF02D17B0','',28920,23,'',NULL),
+(191,'9672ED2A27C4972E04DF4471C95492C721024E241995170C','',36924,24,'',NULL),
+(191,'63532B056020A261251BD24AB026BBC5D4468AF863136044','',17906,11,'',NULL),
+(178,'7D38C80FEAB10B857A4A7BEF15D27A58FB43FD875E29C73C','',3990720,23,'',NULL),
+(178,'B158752316672A90BF29846E7AD64BA4FD1699C638BFD3B6','',2299116,33,'',NULL),
+(178,'4549AE7CA28700562D996CBC78FA7341DC05F644C01474E4','',3000288,31,'',NULL),
+(178,'EE77806A4F5723FD9C6FC6F43308C8AB448E0A139CB43700','',690106,23,'',NULL),
+(191,'046D6EA3E99E275F51CAA591BD8C478B6F964A3072018F43','',21660,15,'',NULL),
+(178,'B1682CE919907AD7D8990F3D8272CFF24A996162565D52B4','',676970,23,'',NULL),
+(178,'22E057649A8BF1D9672841EF47A4DA175AAC082FFEF059DA','',710730,23,'',NULL),
+(178,'7BA62D5F5CFEB545D1AE646962F4EB9A91B93EF8FFD5D1B0','',710554,23,'',NULL),
+(178,'702802D919D9E5C3FD42CA9188936C73E47F87CFA419025A','',3033068,22,'',NULL),
+(178,'FDA6D997BFB8A991B57755633D1AB3C7E567A74C1EC09937','',3070052,22,'',NULL),
+(191,'84F6BDD28490937867774E7BF8D5B78F68BF9EB43DE90F10','',477912,60,'',NULL),
+(191,'5A5B4BA32BD937FF253016AE836DD44B794F8D05982860A6','',447736,48,'',NULL),
+(178,'A243986665C7FCA1E60A9F209DE9431C3098D082DF1C4528','',682378,23,'',NULL),
+(178,'7CC89374CE3A9C07DCD685006690B828931D60085EE5FEE8','',710554,23,'',NULL),
+(191,'01F10590E6DFED79523D26C043D5424174BEF1011F3F4974','',477928,60,'',NULL),
+(178,'C9728BDC4B77BAA7B3515AFD3628EDB0986DFA20B46917B4','',672746,23,'',NULL),
+(191,'179B80E5E054521E44BA8F5978D5FC489CC9E514B350A3FF','',28956,17,'',NULL),
+(191,'7769A67D6E2460450873133B0CFF99B67A58CE6C404A17F8','',17282,15,'',NULL),
+(178,'CF3896074EEBC0F93B539FD44E4D825227D4C1556B8F2279','',3990720,23,'',NULL),
+(178,'88F2833B5267A71A0CA72509C40819B99283A6E556FD9038','',198,10,'',NULL),
+(178,'F7229DF2D879A9E8D5BCEDCDC7046D75BAEE1C9D4DA41E55','',3638348,23,'',NULL),
+(191,'AE78585CD862134059B13669FC416B8124752EC6471DDCE6','',28940,17,'',NULL),
+(191,'B408E9F9B475E4B6A81F9B7F2E060824F618FFDABBFFE805','',13634,11,'',NULL),
+(178,'A9DA016B83961F95097E08F2DEBE69517C7573FFF06D8C4B','',668874,23,'',NULL),
+(191,'0E74160C242EF826D09BCE4ED535E9A9D251B1CD20E31891','',24812,14,'',NULL),
+(178,'A58E4D44D952C1F9DB7B5E423167EE4C28AD02668C5B86AF','',710730,23,'',NULL),
+(191,'35A9FC42ACBF3A147B0C8CF67BA04EC979C6534B20249B45','',28956,12,'',NULL),
+(191,'1430DC4A627EA5FA2CFF9C010CE16022F259F81DB6047879','',13634,11,'',NULL),
+(191,'85A005398AF851382267C01BB6FB04AEF2093213C20EC200','',360508,13,'',NULL),
+(191,'96916CD89649027A9A8BBFBD28AE190CD5D590E24BBAD451','',13033,36,'',NULL),
+(191,'056D57A5C1A46883400E1F69405750B23DE18C3032C3D91C','',27270,13,'',NULL),
+(191,'87C641E1EDBD96D9F170C7BE0FA13F45611DCDF41AC02526','',41127,24,'',NULL),
+(191,'1F378DF1E7BD99164DDC7401A98CA5E9551BD50B4A35D5AA','',34176,25,'',NULL),
+(178,'B5ED443D6CA2F6095BAC8DAFDC8F3413F7B473916357C17E','',209352,75,'',NULL),
+(191,'A2BC3FF01787A38CB88B3EF45C1CD97DA113157FC395D38C','',30012,16,'',NULL),
+(191,'190862E5018F1428E5B12BFDAD08283ECD057B34AD722846','',41228,24,'',NULL),
+(191,'6E0E55BE8690F64442E275559E6C9F8A3FDCAA00937D1C13','',49347,24,'',NULL),
+(191,'B6FC4C07BB2CBE7C5C854CD99DAFEC0D1AE4101FC51460F9','',477912,60,'',NULL),
+(178,'3B5955C3B498489869990F08A4CAE566A7D689C23990518B','',156,8,'',NULL),
+(178,'F24317DAA28AA477996EEBB9538A89569ABF9B185A3EA4E4','',718842,23,'',NULL),
+(178,'DA25A4134671325719833878E2556455EC4321A2207B6728','',198,10,'',NULL),
+(191,'DC9490A7BEB43C64585E013B5260BE843D126EB3BCEBAC11','',50040,26,'',NULL),
+(178,'4BB92BBD5CA8C192C9D0E1EDB6C21FF3F4A61ED1B151365F','',673210,23,'',NULL),
+(178,'13E8DD1C9F5501A270A59CC4B61311F6D5D18DC3F2AA351A','',3037164,22,'',NULL),
+(191,'346CFA39FF98198BDE1C23673FBF51A50CFF5ADED784F077','',17522,15,'',NULL),
+(113,'0590FC57AB448975FA46C314A8AB75AF96DF0FD0A3D9FB23','Afd32uu',0,0,'',NULL),
+(178,'E37D413DC96A92D3CEAB8A482B8F5397587A0E654C9A0166','',672954,23,'',NULL),
+(178,'E7D5551799C2C7F0072BC3149A22F37D09EA1EB83F64C655','',3045912,31,'',NULL),
+(191,'7CC5260578671130CA5B3392BA5CFD0F3DE0BE1085E556B6','',9977,32,'',NULL),
+(191,'F44A40945F24385D089E040A733553EEFF92EFAAB0636323','',134968,32,'',NULL),
+(178,'D3122CF30EE55310CF4A710E61B190D2B108227B746B41AD','',679578,23,'',NULL),
+(191,'7E3CC1BC53477D84F05F623BBC94B9DE8D01A2607CA935DB','',41188,24,'',NULL),
+(191,'DC06565CC1512B5A91A848E08BC4FBC6DA705F6503667852','',41127,24,'',NULL),
+(191,'03DC47CDFBB14C5CF0D0010FA5424556F951585588A2180A','',29916,16,'',NULL),
+(191,'29EC91C4D87891FECDED381CE65A86A259F00DD788833E4D','',174688,37,'',NULL),
+(191,'31F024003681765368F6EFB667E83CE1D12799723AA99BF9','',685304,44,'',NULL),
+(191,'6A82AC1D0BFEF5DA7385510CBC57189FACD42E45E0D2A65E','',30012,16,'',NULL),
+(191,'3901FBD52655E12ADA4EEDED3B365B1DDFAAA925A140097F','',448492,48,'',NULL),
+(191,'6E9991A25EC347BEA5813EDE0A842D746779C97606565B5A','',17906,11,'',NULL),
+(191,'0AC9F2B104AC5AA9131FB14E669B98D30D056936625B0245','',27270,13,'',NULL),
+(178,'A338B3DA78A6683CBEE08A63C5EEFBE1AF33BF54983D583D','',684876,29,'',NULL),
+(178,'38759C29F2ACF42DA9D16EF35837A470DC7C42C3284B2A3C','',3049492,22,'',NULL),
+(191,'F35817564FC39F4DB7994021352FEEB86E2FEE86C11B8DBB','',360508,13,'',NULL),
+(191,'09FAC087283873DAEE0AD074ABF7DDB1B395F5CF6BC2141E','',28956,17,'',NULL),
+(178,'87FE57916743AF3C97CC3B583B29E89B6E503D31D1747B64','',676970,23,'',NULL),
+(178,'97D854645011BAD1F6625679511D78D1B7367A51EB0FCC6E','',668874,23,'',NULL),
+(178,'12369F6F1B875FB5CC5E67445ADEAE2B295D196596679317','',0,9,'',NULL),
+(191,'5034278808E93A3DFC9BEFFD8E180FEFA24DFC5056ED3BE1','',433168,48,'',NULL),
+(178,'55EF16220A7EF3F74A9D895821610DFBD2A757FB05C792D5','',209352,75,'',NULL),
+(191,'67445533AA0BB737D2F74C9258148C6C667794F0E3D07498','',45324,24,'',NULL),
+(178,'AA8649100B17A9C5BE227F47F867FADE51AD242BAAD39821','',3045632,31,'',NULL),
+(191,'85545FE9242B2474574EEBABBF452FBD11497073CB1E46A5','',41080,24,'',NULL),
+(191,'9DACD6981681F53650B681EAE68065D26F4803682058709D','',448456,48,'',NULL),
+(191,'96B74F1436A05E658E3282164BC3CBDF4DBBB2CF6A5B866F','',9977,32,'',NULL),
+(191,'033BD6861DF7878DC9470EC2F699772BB2F3D5000490866F','',90202,13,'',NULL),
+(113,'B797D0AF3164EE83167D5C054A511A5B209A70C6655C408B','IPSect',0,0,'',NULL),
+(178,'D91A2764435C5091D3F9471AB8B5F397E609330294694488','',710730,23,'',NULL),
+(191,'94EED02DCDB71789E50917DA401A03F4B91BDBEA050D8BCA','',3766400,37,'',NULL),
+(178,'2DF33CBB544E2D5238FB591F2547AC507B4D8A652D789F2B','',2303444,33,'',NULL),
+(178,'81A74F35F0F887144D59F93647C18C70C5FEEF542A7F3782','',709322,22,'',NULL),
+(178,'2E1F8A68FDDF084A950B786A1EE7E0CE43E62449A56F92A3','',3045632,31,'',NULL),
+(191,'B1F8988B6664A90E79503FA5D843C3CB97BFDC23EB8C7690','',433168,48,'',NULL),
+(178,'0277E26DE31814DFD675A59E526669E39080E033BAE88859','',0,9,'',NULL),
+(178,'09BBFC19FCADC69D6B5BF655A5BB6350B4A8120C3EB557D2','',3990720,23,'',NULL),
+(178,'BF4ABDEB726B0060E74701C03180C3CB02170ADCB7DCB61C','',3049872,31,'',NULL),
+(178,'D259A46A6D1855C436BFC96FB9376BDCDF5E9FFAE8B4147C','',3045616,31,'',NULL),
+(178,'F425A62A44097742D72A05669B6BE93AD9CEFE9E40D71E48','',3045976,31,'',NULL),
+(191,'B134291F515D136B6576FFBC0133C7859755974611170D07','',20512,16,'',NULL),
+(191,'125BE691985D8DB37068DC14D74EA2DA1260E4A63D3F74BF','',45324,24,'',NULL),
+(178,'E06E3C5B356B34BA92F6765108556AD53ABB74B986D5810E','',3070052,22,'',NULL),
+(178,'8CC87DFF61F2EC82DE033865C9879010D94E1614369FE286','',710554,23,'',NULL),
+(191,'E1F5233450FEFFB6F0E8F2B17683047A485828FEDD3E5B80','',448456,48,'',NULL),
+(191,'31BA6EA4DF2362676AB71F4CB60B0D40FA51A3AABD25D5CB','',36924,24,'',NULL),
+(191,'C14630E1D519EB85C254C536FE81DC490977E869BD5CD884','',12985,36,'',NULL),
+(191,'B337F892EEDD52A5B978C116A19D927134273626EFC4DAA3','',17890,11,'',NULL),
+(191,'D97560108AA21A487EC9278759F7615BFA304A933776A201','',18680,35,'',NULL),
+(178,'DA59505BA61459508532CBEAD246DCD2C8E7BF5C6D3CE676','',3037164,22,'',NULL),
+(191,'5803CA69E5B7F1DF08D95219894D75F52EDB1AD429E562D9','',174688,37,'',NULL),
+(178,'8A1099E19139D91573286DBB3DED2CC093A99FD178F7FEC8','',3033068,22,'',NULL),
+(178,'0331B438B085F55C06F7F697160845BE953D9CE789AA62A4','',3000288,31,'',NULL),
+(191,'E844078A5671FF7DB0621E7F1C7EDDF9C92F5A9FA0477FCB','',41023,24,'',NULL),
+(178,'AAD7F47B231861913F353341FD26E5AA89AFB586FB6A5366','',672746,23,'',NULL),
+(178,'136DFB3FE66D2830DF46EE155FCAEADC9624FFE1410088DA','',3041472,31,'',NULL),
+(191,'C6015A0D5C9109768BA4233639A51F163CC7ED58749E5026','',25724,20,'',NULL),
+(178,'9C668CE4D328EEA9B6AB7AD5FF54169289B35B230275A43C','',3049872,31,'',NULL),
+(178,'FC3C95E71F968C46BD5DB5C9EF9B0A5BDCC5619B805046F5','',2299060,33,'',NULL),
+(178,'FBE3808C0E36BFBC1D1F5A0E508CA89E81E550CD2FDEEC48','',149,5,'',NULL),
+(178,'35A8252DBC65514E858256C497141153812EE61C724BF5A9','',710730,23,'',NULL),
+(178,'CC79AA9AE29A52A998181D183D38974221B8BAC0AB534E7D','',0,9,'',NULL),
+(178,'B89F25A249D295580E649F5ABE0C65EC24401F4889A4FB16','',668874,23,'',NULL),
+(178,'742A0A9997B9E857C355AA75797466506BAE73D44D26399D','',3037164,22,'',NULL),
+(178,'E7975701601B2FDF8262098521B7BB4FF5CCC484F8E919E7','',3045776,31,'',NULL),
+(178,'43E81BE830F169F4EDD23B84ABFA9D15EF12C978FE134346','',60648,56,'',NULL),
+(178,'66CA9E464A2122E301A72FAEF13A4853D8CB1A45C177E854','',178504,96,'',NULL),
+(113,'0A3C294B0799FD2C9EC17C1CCBCD174A51B6A2ECC62FEF17','IPSect',0,0,'',NULL),
+(178,'6E9CE81BFCAF0C250705FCC599981D2D9E4D474A7E857B37','',2299108,33,'',NULL),
+(178,'8734D6E081D5C993DCE8161CFDFC6197F39A487E4083A3E1','',149,5,'',NULL),
+(178,'A33355AF7B5FF3CECB3A6059F6621F30AEE695D69421EA2B','',3049492,22,'',NULL),
+(191,'BF8CEA63013511BDE0B551DAAC492DFBB9608645140B88F7','',29916,16,'',NULL),
+(178,'8D5D5E99EAB2ED21A104913B05D6BD7A8E63ADA56B66CDED','',3022016,31,'',NULL),
+(191,'778256BFEF82EA60C4E0F25083655FB2BB75B83FD60A9C06','',18680,35,'',NULL),
+(178,'43FB8007D7DD7B01FFBEEA3EF9D0242778565544281EC761','',0,9,'',NULL),
+(191,'94DCF5D21FE2106F5303216C14AD55EEDC1B19FDC91D5F76','',28704,16,'',NULL),
+(191,'7EBBF90F7D8462D1453479DF9AC5943AF483FE2828C74FDD','',477928,60,'',NULL),
+(191,'A171148491E099B12CCD1708B784D8C3B09737772C7780C0','',401992,14,'',NULL),
+(191,'5350ACB75F9FA498FE0D2A371649C9FD9716BDDE2C32F5FB','',13634,11,'',NULL),
+(191,'85E53280630956C58D4CA7FD8DC5FE73C9A2A03314DFF294','',45223,24,'',NULL),
+(191,'391BC8A81D4EB6D526BAF0DC3468CAA36C9207B82E194B7A','',130380,14,'',NULL),
+(191,'0F88FA5CD9B9950F850C18FE76C948FF43CDDE3E75638FF1','',17938,11,'',NULL),
+(178,'EB63FC60164AFF92726DA658882BF1CE47CF0BF6C80B1B97','',690106,23,'',NULL),
+(178,'E30B2494142B416BBE95DA3DAE4A82CBDF3A020715F10E8B','',4011280,23,'',NULL),
+(191,'6CA1C19D0E9191CBC9CA3D5BC3CF1D19764D8F17C6B54AE4','',59620,13,'',NULL),
+(178,'4730B7A7EC70544A688211A5C754C357A090116092D3EC4D','',682378,23,'',NULL),
+(191,'713A7B79619AEF3C47E44102F86EDCE0D6AFBC5ABE87F861','',13538,11,'',NULL),
+(191,'575F1C6AF7C71085C7D9CB2291844D9F2DA3B71391C0B941','',36907,24,'',NULL),
+(178,'296F233E4FAC4CF419D5FBF2701AC4D5AA0866CB4D0DAEC6','',3045976,31,'',NULL),
+(178,'933C1A228C99E35DF309838B25B7D5EA3A8E961E81D81D32','',673194,23,'',NULL),
+(191,'9EC125252C3738478CA942DCB59030097194B284A9162B32','',59620,13,'',NULL),
+(178,'6665F3FB8DC6BE71C152C3674B5783D6E57FE8BF796D190C','',3634252,23,'',NULL),
+(191,'E120DD63042FEFF9E7FCEC0CA44D2544F03C5D4CDBA1C008','',12985,36,'',NULL),
+(113,'09BDABA6CB17BE561B4104124A3D0266C858D194A8765198','drvsys_mon',0,0,'',NULL),
+(178,'3AAE69E7088E4060EA32EF95E9B6D9532460F5B84EE4EC80','',684876,29,'',NULL),
+(191,'990D4E1C2D63C8E447F034642686D57B727064E3EDE13B00','',448500,48,'',NULL),
+(191,'E88F31BDC5513216CF3701CAF8BE954CCC7EAE0E7AC7D942','',594348,26,'',NULL),
+(178,'81229C1E56FA72E01B52E8CBB8BB5F55ED48A11B72E7729B','',710554,23,'',NULL),
+(191,'B4D0CDE7D53493A1549328F711013F07DBD3A9BE88DB2EF9','',685304,44,'',NULL),
+(178,'D6CA6F94FF248F722F97037C1AE7C8DE0191D5F4D1E3A5B8','',156,8,'',NULL),
+(178,'9C9DF1E868BB33D43676F21096C4F75759C0807096EEB886','',60648,56,'',NULL),
+(178,'1C79B3B5A74A4F09A1FAE19BB15CDCF26B5F917861071F1C','',198,10,'',NULL),
+(178,'AC1AD3E831A4C758858350A8A197A24FE82583F4B0E39A85','',3049888,31,'',NULL),
+(178,'56E4980485E3129E94F370E7066E80B07141C4A669B9FC0F','',672746,23,'',NULL),
+(178,'C21574305E0377A3D2B72D1E1546B9D62DCFA8B1A4405F16','',3638348,23,'',NULL),
+(178,'AA74121AF835978BC1C1BB402A8B7388CB7C075C1227C253','',3049888,31,'',NULL),
+(178,'D6457A86DFADF9825D6093090AED2A807FE7DA6ECF5922AF','',3065956,22,'',NULL),
+(191,'1BAB7E6B5ACBEED8F54B667EDF13A385B9E146C0C50D9FB7','',448456,48,'',NULL),
+(178,'01000FEAC61ED76FE04ED1169C40289D96C71A1564E38FCB','',690106,23,'',NULL),
+(191,'F095338ED87C658C916CC604A427F4ED95309C4A07B7898C','',34176,25,'',NULL),
+(191,'800E120187DF74A231722FB887B3944AD16A703FB8CB9D39','',28920,23,'',NULL),
+(191,'2CFCE981C322A54724E1418B6A6D1896B95D584630EEEA43','',38300,21,'',NULL),
+(178,'481751066D6C97AD5EE90173E8ED107BB1C9FD873B0CE55A','',3037164,22,'',NULL),
+(178,'7FC57D49535798CDA7E4DC5DCEA2E085AAB9A68BF7F9469D','',149,5,'',NULL),
+(191,'33357C112DE0195F013FAAC4D57AB1BE77417934CE03A2B9','',3766400,37,'',NULL),
+(191,'BF8AC678DC3CD354BADBFE46C9173D34CC84D13302190EBB','',21826,11,'',NULL),
+(178,'4E2F9721D52A7552AE2728B9695F1523DD62DC0569237C3F','',2299108,33,'',NULL),
+(191,'9F015E7D8A11F30AA1954D9FEA7142D0247E3C09FF2BFF72','',12194860,37,'',NULL),
+(178,'1EB5AD39B94DB5CDC3294DF49FA589DFBE2C674D07E4B211','',710730,23,'',NULL),
+(178,'E9D67F07E035A64B89C9E91614DC1930FEF61DC3A5C1BBA6','',690106,23,'',NULL),
+(191,'36411C2FF2C3AC51B7F6A6B8DF61DBD4E5895C27438847BE','',59620,13,'',NULL),
+(178,'A77F30CBB8057E0DB37782367C8462FA98D4DB21DE936ECD','',3049492,22,'',NULL),
+(178,'A8C806E1FB7CA3625E6BB6F5E4D9E2BF0EBDBE70BA7226F7','',3049872,31,'',NULL),
+(191,'B3DD04807DEA2679045F4F197BDDAED5C7CCEEFE19622B43','',360508,13,'',NULL),
+(178,'B075C8B4D8C5D83FE703677319491DC816EA5103901B44A8','',682394,23,'',NULL),
+(191,'53DB506C0341B50BEA3897E2E3C0DD74C2CA2D8F5F34A2E4','',59620,13,'',NULL),
+(191,'E112F38956124FE0F48BF569F5E81B40E293DC6E16B544D6','',17282,15,'',NULL),
+(191,'0363EF2B1AAE09E6C2B1FA555E706F4EE094BE678DA27598','',3766400,37,'',NULL),
+(191,'EA256F01B6340C99E27611B39C5ED28CF2FA202436F0972F','',49564,24,'',NULL),
+(178,'A86C95C4E58495A10F5F1C9B5B62D3365132E8DC62863E8B','',198,12,'',NULL),
+(191,'56DD8D99991F83AFA2E169315B395BD388B248340E9C64D3','',30044,16,'',NULL),
+(191,'684B23E010C3D6B88CC12BD9F0B6B0CE00D692C71BFB84A8','',28940,17,'',NULL),
+(178,'83AEEFCDF4C2E80B18DDF93D99120A89F916C19206D257AB','',668874,23,'',NULL),
+(178,'D68651921F5CD387C7E860FB7C3B143409735748E3B2FB7F','',682394,23,'',NULL),
+(113,'A4D501A9DB9D84BD8695A8BF61FC853BF434D2D4B352C7A0','HideEx',0,0,'',NULL),
+(191,'5E77F12C032D4FEF559F9B837B85BDB9D95ADB10C9F56649','',448504,48,'',NULL),
+(178,'F08406AEDFA8F19B6FB7C9ADDE0BFEE82CB0D2E275593150','',2303444,33,'',NULL),
+(178,'AC0EC72522ADA5B2BFFAFAC92D6D0A0225E1D5C727CDFFA7','',672602,23,'',NULL),
+(178,'4D1A7D1C88AB04438510E3255184E51EAE2036BB09DB553A','',700714,23,'',NULL),
+(178,'68BBC36F75DC763B573DACAB1D6D8F70E667638AA894BEE9','',717898,23,'',NULL),
+(178,'2AC3C23FBDE2C1EC46C9ECFF71BD7F603F17C9DFC1328D1C','',3638348,23,'',NULL),
+(191,'C365E9FE00580EBB14EE863A5CE3C8139B1A59A610520AE7','',3766400,37,'',NULL),
+(178,'DB2A0451B9753100085C9D149B61CE47A195D77C8B709143','',178504,96,'',NULL),
+(178,'0871F69205FA62C74C2DDE200A3911FC3E41A4FB8BAB9817','',682378,23,'',NULL),
+(191,'0017307F2FF889462B0FA06018D99EB1F847F189B6CC9B99','',21826,11,'',NULL),
+(178,'0FEFCD6B0BF8C2816A9259AB5FD7B89231AEB8D92DE53D26','',3045356,22,'',NULL),
+(178,'87EAD79656133B3183C2E452886D8F00C5EC6C9D741673A2','',3037164,22,'',NULL),
+(178,'C2B6C5E19FA98D121B2CDE51789BD2883A324015E7D131E0','',710554,23,'',NULL),
+(178,'B6F3A7D557A3E3BC4833C3D9B6B0B0609255591CC8AB3B65','',3022016,31,'',NULL),
+(191,'AEA87B23CD9463E9693B6C053C1D9030F8E229DA308DBF29','',90202,13,'',NULL),
+(178,'8C16C7E8EEAD49AE67E4E91E229FFBCE2F6590A48348914E','',3049888,31,'',NULL),
+(178,'7B2DCA97CD348E45490C288EADE9303CE270CF57F28EB1E4','',690106,23,'',NULL),
+(191,'BC10B10BE398F2397FA6962C4E59C8CF11FDD7158EC222A5','',29916,16,'',NULL),
+(178,'8E53EC1B8ABE90C9A5C087671DE0A3007BEA4488EE5415D0','',3037164,22,'',NULL),
+(191,'65B5CE07A794164101F7E379D21A7A544EF1EC2A3A39A2D8','',27270,13,'',NULL),
+(191,'C6C8597824F249180A53196699421ADF7857A5C4E4F80D6F','',13033,36,'',NULL),
+(178,'FE677759E719178BC5CB49DA252D9B635F76030FC4C9876C','',673194,23,'',NULL),
+(178,'BA2D161EF412084B0229A08E64D5A445C4E9F9F2645535E5','',706314,23,'',NULL),
+(191,'0174B647A535F206711D3EEEF08D3F421BCABD7016A2F103','',17282,15,'',NULL),
+(178,'5F5F754FD6E7BAC9650B715387646CF992813730A2BA37DA','',2303444,33,'',NULL),
+(178,'D2CC7F98209E9A9BBA483BD1E9A916E40EB971EE2129AFF8','',3990720,23,'',NULL),
+(178,'E8C741CC79005898FFD0026821F61A2E4E67C695C6E1CE1C','',198,10,'',NULL),
+(191,'23B364A9012EF40A39EC4D04A91F9B60FC7EF7D85E3F240A','',18680,35,'',NULL),
+(191,'C9363F808D37F13FC09EBB7F700AD09EEB27DA046E41FD52','',36907,24,'',NULL),
+(191,'2D92FC5B8603E18F50D9CAA0922F5C7BB89E42A4656ED2D5','',3766400,37,'',NULL),
+(178,'EDEDBC5B1A3D92D2A91192118898FDBF840C967C82968D70','',3045912,31,'',NULL),
+(113,'BFEF06E80472106B57B15D711F94A25243F6ABA7FE354C95','ndis_x86',0,0,'',NULL),
+(178,'FB20B0EB9ACF571FE37C6B69CBE86F7906F96B996D7E5EFA','',2303444,33,'',NULL),
+(191,'917AC1C48C1FF354FD594A3705C70A2C356FE981275E7FB5','',22792,25,'',NULL),
+(178,'48CD29D8B39DC07B0FD071FD8C643E07A8FC2C9AFC2A3083','',3045356,22,'',NULL),
+(191,'FB13A8360C8E23B83ED7309625A7EFBAEE7DCF737068C5A6','',174688,37,'',NULL),
+(191,'3C8D85F85ED5DD0354561F84EACA575123DE05EE941C28D2','',56063,25,'',NULL),
+(191,'FBC20EEA52B5882209BC016EC14818376CA7BAF28780BCED','',22792,25,'',NULL),
+(191,'210D85A84F7BE48F3EB427E0CBCCD9C146320ABAAB5E28D8','',41096,24,'',NULL),
+(178,'953107F9F718795B6DF9E5E5BEE0EA949800CAD0EB71F891','',3037164,22,'',NULL),
+(113,'FBBA36D0FC5434D12EE1509E148FF908D51F18719CCBEABC','IPSect',0,0,'',NULL),
+(178,'82CB32BA2A05B228F2F8D0313C185EB6FDC50A94340F40C8','',209352,75,'',NULL),
+(191,'079172B91B1768A2650A87BAB06AF700BB4C9A0B5E5B983B','',17522,15,'',NULL),
+(191,'881751DF112F817E799953E00E94543DA4610968437DB7C6','',12194860,37,'',NULL),
+(191,'9A47B274EAAC888FA2007B4EC0623580365458E3621CC416','',28956,17,'',NULL),
+(191,'77344CE014111FAAA66DEF35B670B2E76AE878B054F85285','',61874,42,'',NULL),
+(191,'0A74CBD8DFF245DA5E8691C1174F037D7ABE823E265226AB','',685656,44,'',NULL),
+(178,'0E13ADDD413B679E2984060D929440064FAC308FC2B90742','',3049872,31,'',NULL),
+(178,'D0D8CE5001596C6F4A766FE94726FE7E337F42469CB96CA1','',3065956,22,'',NULL),
+(191,'313C58F8401B47F716B220B88411CAD0E85966D95B301591','',13033,36,'',NULL),
+(178,'ACBDC68A4D748C48ED1180DD3DA52632EA6FC275BFC35D5B','',0,9,'',NULL),
+(191,'BACA83A742B9E09CD07787BC6B50389707EA94C41886BAD0','',448504,48,'',NULL),
+(178,'549B42D266E7F17B7F30B72E301A9CB3C5E3865DE9B7E90B','',60648,56,'',NULL),
+(178,'86DB854557D75BEEE7DA820FCA15669B08C760E8B165B06F','',3037164,22,'',NULL),
+(178,'02D5FBD9E30D43ACED0EFD00CF16DAA69EDD262C292136AB','',178504,96,'',NULL),
+(191,'B9D920131EFC38767012340CF0FFBFE154DBA28E6EF3B859','',61874,42,'',NULL),
+(191,'96E6CAE70AF690F5D552E0948C29CA9AA527DEBF9731B16B','',20512,16,'',NULL),
+(191,'375B22B4990997348A8AEDD53319897BE196398B4F1DBAC3','',30012,16,'',NULL),
+(178,'932F4622AE9F1B3990900F1F88375FA1DD7C238F7C6133C6','',684876,29,'',NULL),
+(178,'43583C7BCCD9DF14C64CC84710BEE44DD30E199F579890AE','',3049872,31,'',NULL),
+(191,'97CF98F0BCABA04BC2BAD40FBD4EBFB3C1FD8A7139D5C9B9','',433168,48,'',NULL),
+(178,'97A0E0F8F8ACE7F1E6492DAFADE8F45B366446E79C1B0419','',3049452,22,'',NULL),
+(191,'C3546D16052E0DC1838E7A6E18936B88CC8A40C2AEC0BE3B','',21826,11,'',NULL),
+(178,'4179D6BD8C2F11AD5D5C103A7877504074009AB53AE4D8A6','',3045356,22,'',NULL),
+(191,'2C360CEAB996C8D6E5DE3FFAC30E412DED48E7814D1CE110','',20512,16,'',NULL),
+(191,'6F1486BE58078BD453F1B249947BB99CB8E17E9A355CE024','',41228,24,'',NULL),
+(178,'924F4631DC3167BCFAB02F92DDB49A871DA0C55122EF9EB8','',0,9,'',NULL),
+(178,'411029C5B28D942ED3C7BC1F4299162D874838A661410894','',700714,23,'',NULL),
+(191,'B9093BAED730E86AF004119B3B7258938C56902915C2E8BA','',501956,48,'',NULL),
+(178,'63BD2D7FF6C5442795361031E5768C396A37AE38AF98DB11','',668874,23,'',NULL),
+(191,'754A2FE56037B971E128FFAA669032C511BDA3A62524CE03','',28956,12,'',NULL),
+(178,'9AEFDCDB62EBC2DABD6CEBF8C411C1145274FCA7CED890CB','',3037164,22,'',NULL),
+(178,'3AC57BAC3B782AE5ADBB899CCC060D4E8F66E5217F7DF654','',676970,23,'',NULL),
+(191,'2F0D9702A58D6D5A8599529A0A816AA101AFE581D98416B2','',56063,25,'',NULL),
+(178,'77804219E627B4D38C9F95194301A895180B598AEFA9963F','',3022016,31,'',NULL),
+(178,'0D1B99EDC8E458705A88E72F7FDEEE9233DB21290A0098E6','',149,5,'',NULL),
+(191,'BB795B4069F985BF44C7418DE264C3B0E9BA6D61A116FF81','',90202,13,'',NULL),
+(191,'5A6EEBA1E6B9EE71BD4A5F63014E9928302C36FC806DC796','',3766400,37,'',NULL),
+(191,'BA5777AF7FFF3895935669878D662B585912A759A2DFCE68','',24812,14,'',NULL),
+(178,'5E690DB1AD8910886334158C6D4452FA2CE896634BCDDF40','',580768,52,'',NULL),
+(191,'42A8F651F55F697E783ADA1959A2833276F970F1EE0410C7','',41280,16,'',NULL),
+(191,'445A6894B8C1838462D7D0D29FBE6BF815B5E6C344971349','',31924,23,'',NULL),
+(178,'C010786A38F396503B7411FBADA0C1A68795F54A7AAE228E','',679578,23,'',NULL),
+(113,'E3185EE4428291F9D2E4080C2EB1B19ADB005AD26EF0A993','IPSect',0,0,'',NULL),
+(191,'1995FA3235ADA4B25232DC6403E7463A8D1864528BF9FDD4','',12905,36,'',NULL),
+(191,'30A26827798B7F1646003A9E846E8A9A8FF10A9DF926825A','',49564,24,'',NULL),
+(178,'A567BBE4CA9D8E976083024E8D68903CF15CEA88C47C9961','',2299060,33,'',NULL),
+(191,'BEA7165D7DD8E24E31B1C3D791A47A28731E1BACD1189A17','',24812,14,'',NULL),
+(191,'0971A7CEB84D392670C7B8CBB61776762C25259D8E772CA5','',13538,11,'',NULL),
+(178,'13200A59A28561A413FADAADFFFE4521A209CB691EA199A5','',690106,23,'',NULL),
+(191,'56CABE081991356465BDE1DA3B8DED099DF9B6E746D1B531','',25724,20,'',NULL),
+(191,'F98469C704F8B8ABC1A251EF8FC1E4CB5CEF1E007BAB5EA5','',57602,42,'',NULL),
+(178,'6A64BF5AC652747B47E0B8E6593B7EEAC1EF38E0A84F4F5D','',3049452,22,'',NULL),
+(191,'978BCD17BC9C81B05A2F0A50EC2CC206EC5F6AB1FE40D38D','',28956,12,'',NULL),
+(178,'A28EDC898CEB14FB52591754DEF981C7168DD2421D0742FA','',3037164,22,'',NULL),
+(191,'35E88DF07F0D48A0B7ABD53F4865DB762E6935529DC826DF','',360508,13,'',NULL),
+(178,'BF1FB7E4C3CDD5D5A93AA1B24FC822AA5537DBB59F696818','',3037164,22,'',NULL),
+(178,'343F1AFF6DA7A967D2DB958C608A6E2A19F83E862F8E3954','',149,5,'',NULL),
+(178,'0B008034F97BD411A9F900D87578258AA1B79873850BC12B','',3049888,31,'',NULL),
+(178,'C5A35B72E6BC604BAC9AA218908B3747D6850769CEA79C0F','',2299092,33,'',NULL),
+(191,'FDDB2AA7F8884C8E3A7ED646B3E9E4AF5A8C0704130C39A7','',29852,20,'',NULL),
+(178,'F57343CEA7133DE6469B1CFD1A749845D553B8D806B2BAA4','',3037164,22,'',NULL),
+(178,'565A63583AC736E3CAFB95EE5AF9A64D3A7D3C3A8B234121','',3045912,31,'',NULL),
+(191,'E26CF0E2ED92F608A80733CE703D7EA2C3DB83FE46182519','',3766400,37,'',NULL),
+(191,'2F44EE3A34EFF98303B3724005EF3A8AC89CB25F9CA1B8BC','',12985,36,'',NULL),
+(191,'C32F7CDB33BEF7B3093262F89263884DBB44E57D74D646B7','',12985,36,'',NULL),
+(113,'2357AD2012CEBA72283F93460AC5FF55E4E5719A5AB9F5B9','drvsys_mon',0,0,'',NULL),
+(178,'1C1595A1A64016D8725619CBC2FC7ABD41835320958A97FD','',676970,23,'',NULL),
+(191,'DB5765A8B8D5F636D619E44669E9D3EF968BD8011C5D6999','',36907,24,'',NULL),
+(191,'70B78734AC394D83D45427E0B7C88351E9BB108ED59C7E71','',37136,40,'',NULL),
+(191,'85F2A5072D2D7557155CBF5157CAA460B19470DEE8AF96BB','',22792,25,'',NULL),
+(191,'6C33FD80565B2860A76C87BB772E794E2FF444D813079A2F','',685656,44,'',NULL),
+(178,'F09BEAD15FDEBD09240316D9E2E736028B54972B13F14E5E','',673194,23,'',NULL),
+(191,'302E114D921D40EE54585BD9D63B9BDDFF7A2BD4D678DA97','',30044,16,'',NULL),
+(178,'24807D7810C58A4B9A070A21B8AE50A0385DD4B4C6BD8B6F','',3049872,31,'',NULL),
+(178,'B6BDECA858773B6F995AC6496923F5D0CBFDB1F76DB29C58','',198,12,'',NULL),
+(191,'C125EB3FD1B222ACE1B518959D96C5AC83EEAF109E9C6D20','',12194860,37,'',NULL),
+(178,'8AFF28C3E6367B10340FB963B093AB52E61B267C541D5659','',2299108,33,'',NULL),
+(191,'734D3EDDA69D9DD307032245FA0806456E2F02E90C2291E2','',36907,24,'',NULL),
+(191,'9CB5A848D90B7FA4F58801ABD8A68EF8FDF8C602063C2CD6','',13033,36,'',NULL),
+(178,'C8BCF785F8B7118D0270016E620E2C3DF6802E034471E5E4','',3033068,22,'',NULL),
+(178,'8FB282098C8BB4EC10C8398E44C630677C6E2785227E31D3','',0,9,'',NULL),
+(191,'2381BB2B613C58C364E962738335EBC2F3EFF81009DE49E4','',37180,24,'',NULL),
+(191,'AA2A24A7C90D149C7817640B0D2D46C8A4B4D52146837605','',501956,48,'',NULL),
+(191,'6815D749CCA8C1738A5F3236A737F0B70AE037E82D46033A','',448500,48,'',NULL),
+(178,'F9F131F27BCC37FEF638FB8EDDAC29400652020C290D4F75','',676970,23,'',NULL),
+(191,'319CBACC4CD2E1F54F8C8FC41EF44A3A9C492A652B00C622','',18700,32,'',NULL),
+(178,'A4A7DB31BF51180F1ACFEA6C0E59AC84B43D022CB4BB817D','',2299116,33,'',NULL),
+(191,'0DF639ED45B0C578DD616DD191014727A3C22C346E9FF73C','',50040,26,'',NULL),
+(191,'72944B7FED63C1D2FC9D2CF6A07B5788731BE2B02215CEE4','',447736,48,'',NULL),
+(191,'9148E18CF9213B25197C247F08CCA4C0DC60FEA73E3A247C','',13250,15,'',NULL),
+(191,'ADA39A6A805BDF59271BBCE21734E8F28182164563CA15AA','',29916,16,'',NULL),
+(191,'D5C852D85FA4393D027615506B7DEE07A1074AA4633019D8','',41023,24,'',NULL),
+(191,'D06EE8DDC2115E5895E96D26A2A2F11FC566297D1D21BD26','',56063,25,'',NULL),
+(191,'3AFE3B981D50B26FCAAC9DBE5A4BCB24F5BC3E9348AAA04B','',25724,20,'',NULL),
+(191,'058E826BD75C26BACE712DF9D67B0A751896515802E9DDAE','',501956,48,'',NULL),
+(178,'6E4C9CA0F7140E32D9284AF2E0EEB76419696771D4DDE887','',3634252,23,'',NULL),
+(178,'29E43B1309ACB344AC777636BE838F0BFE6A04570B7FB09C','',700714,23,'',NULL),
+(191,'5B7AC53977D57C5756A2F61582DD386EC93F5FE180FAB5DC','',27270,13,'',NULL),
+(191,'22BF8D63A306178F368016E4657CCFCA5B2B21EBC90B8DB2','',50040,26,'',NULL),
+(178,'1E8729EE000CD5BD8BABC49C368E0FF5AC08BC2B30921BC4','',709322,22,'',NULL),
+(178,'8A1304B9AB2579F392F92D8A592308728EF76B26AE258A41','',4011280,23,'',NULL),
+(178,'8A90AA547378BD5930D24FC415AEC08EF52E29B22073335F','',710730,23,'',NULL),
+(113,'4BBF42A918109CC23F231B8E657076A213601AD681C032D1','HideEx',0,0,'',NULL),
+(191,'06D9E92AE3953D13A0AC5FA31EC24B16C6A2260E2D32BF8E','',41096,24,'',NULL),
+(178,'D4D3A9950FA07FAEDAD0658F9128007ADE282C043210A201','',683146,23,'',NULL),
+(191,'94530FBCCC455105E8BB67E5B19BE0A4534A6F39A1201B52','',13291422,37,'',NULL),
+(178,'2313AF1E20F446936533F9440B220BEA966D9EB3A0502DCF','',178504,96,'',NULL),
+(191,'F982BFDF01EB3BC6FFB70E897BFE21376232B2EEEFB25E58','',20512,16,'',NULL),
+(178,'26308A71C6F483CC7795A01A2F2CF7E7EE97787C12CACC52','',2299108,33,'',NULL),
+(113,'368334F9A3A549DFD3ABC9793E4EB83E837AA43F010354D1','ndis_x86',0,0,'',NULL),
+(113,'5DA702DF95570780875ADB4C64259E887CE0A867D9B67711','Afd32uu',0,0,'',NULL),
+(191,'B51E8DA25AAE556552404F5172642D0808A89E2AFE870B23','',694376,44,'',NULL),
+(191,'4748EAC0350B1B56D8549157AAAAF4FF35438078A7E37AB5','',34176,25,'',NULL),
+(191,'FBE20B03C75572D992273F192CE72CE78A65E6764BF8E6F6','',36907,24,'',NULL),
+(191,'D8C1B9DEF3CA9CA59C5B827F055729B636FD55BA6242F9F0','',694376,44,'',NULL),
+(191,'448475EBCA685E5A4ECC5F810740C9181825B49613CDDDA8','',477928,60,'',NULL),
+(191,'2AF2DEE0CA5F307895E5773A083AEB862EA3D5210E037F06','',41080,24,'',NULL),
+(178,'1708C050FF0C98DE59FE8F070273D80F9C1A612D336AB9FC','',3049452,22,'',NULL),
+(178,'ED6BB184C9DD307229A023C1905E6EE73981D3E088D69FE6','',676970,23,'',NULL),
+(191,'EB63A86D51668323A18AE2F8CE2BDD1ADAE57375B5F76C6B','',45223,24,'',NULL),
+(178,'5837373EE8D4CCB5687045C04A4297450ACDE774FE973917','',673194,23,'',NULL),
+(191,'65CCA5E079D38DCF32053D8DEE6C5ECF88E6AD8E1CF5379B','',31924,23,'',NULL),
+(178,'FB895125A69DE5DB112B4731F6216668EB09C4F57943D85A','',706314,23,'',NULL),
+(191,'A388E8CE523DB7C3C501AC5DB2C8AAE58FD1831E75665C48','',401992,14,'',NULL),
+(178,'77C74B5E4CBCA9150FB64261E497AC4E7642A316C89B291A','',3045356,22,'',NULL),
+(178,'8A2C4F7F3367A4648744D8964BB9A6833182ECABFE015B00','',3022016,31,'',NULL),
+(191,'E8A24A78E6A716734CC666B48263B424804A42155C0BDB51','',18700,32,'',NULL),
+(191,'3C881D2F0634D9223A36DF5266A7CF36B503DCF424441FA5','',28928,17,'',NULL),
+(191,'7B3D92577810CAB5DA0134FDDA91CE6F36003C5373526774','',41023,24,'',NULL),
+(178,'7F794E0811DA99DABA76CD9925B3E78045425E32880F05D3','',672746,23,'',NULL),
+(178,'08235E08E4F83DDEA588D9FE32BD084FB26BDA6DEBB1E416','',668874,23,'',NULL),
+(191,'5EF7C22867612F48FE5B41E219A1CA389AE8D32D8F0FC46B','',21660,15,'',NULL),
+(178,'C7C78789911D6B30FA6E67198EF03B73CEE37576AEBFF5EA','',3045356,22,'',NULL),
+(178,'62BF4E6440FE3F28138094B46FB469CDEB35008DEB652B8B','',3045776,31,'',NULL),
+(191,'E24027620A1723C203E8084AD6269A852CD50D6F79D50530','',36544,55,'',NULL),
+(113,'49CA50FCF2699AE5F4A867156A5D8053C4239B36DACE170C','HideEx',0,0,'',NULL),
+(191,'073F4A76F248FE7C38F799437D475B9A2E9E81FA08B0C6BB','',17666,11,'',NULL),
+(178,'6ECA7966F2845B9B61C6D9356E4FE4C913FE917808C8AFFE','',684876,29,'',NULL),
+(178,'30BA488B3964465B142E75F6D1E1BA42DC9F489C3AC70BDA','',2299092,33,'',NULL),
+(178,'55492051D368975D444428D6218A7D731555ABF7C3391E7D','',3049888,31,'',NULL),
+(191,'94E0CEC4F7BDE7844C4D4ACF62E5C96ECF1D11FC2169CF8E','',433168,48,'',NULL),
+(191,'5003A599A1162170A30F1906C0AD5B16DC7041E72D28A4B4','',28956,17,'',NULL),
+(178,'686F700B2223502053CAFDF9977D8774E905E76B8C960E7C','',3049492,22,'',NULL),
+(191,'F5A776E794B34ABBF93CA93E9230B7224CA088AB741DCB57','',13291422,37,'',NULL),
+(191,'4A67D56DDA6B0E7D9117CFDB17EC6572E68B9300609FFE3C','',28956,17,'',NULL),
+(178,'1B695DF78AA0708221E0EC2F5A69AB7078ED8143B2EAD174','',668874,23,'',NULL),
+(191,'7C8CD40E29AE999923CD8EAFC233E619C73885A0258A6E3D','',21826,11,'',NULL),
+(191,'73407824E9064DF5F1161A204A272A9CD69026EB4DF1004A','',29916,16,'',NULL),
+(191,'B21609972E46C9BC8C6A77A18161A77D0C1D4001DC892DF1','',41080,24,'',NULL),
+(191,'BB66A6AC45D02568067987834ECD8BF0A2BD0DAD06D12753','',17762,11,'',NULL),
+(191,'2550EB7C358B7FB86FAF0EACDDC3111118769F448D93BF7A','',49347,24,'',NULL),
+(178,'B6E4EF9350CA859576DB74D02C115D5A19C79AA58B0F6681','',684876,29,'',NULL),
+(191,'451D2C8FF751743B52109FF5D95ED633DDBD8BCDB80EB7A9','',17906,11,'',NULL),
+(191,'4A0161A4E5D50F11F58E1B23B281ABDA106625E3DC5A179C','',685304,44,'',NULL),
+(178,'E4F21910D4B5D3E7B5461ED384889F6D0969645AE83F7601','',3037164,22,'',NULL),
+(113,'B9756E3E1093B54511AC5A7B85711E53CEBEA373EF4866EE','Afde32uu',0,0,'',NULL),
+(178,'A5AD6C8506004101E42165CD95051A7B5F13FBADD027461B','',710730,23,'',NULL),
+(178,'B8AE30A02C59219D144EE95228C6CC9F99916F6FE423C940','',700714,23,'',NULL),
+(178,'DAFD84BA8F977F5CFEEC9310C0EEF8F949F8EB6B827EBE71','',3990720,23,'',NULL),
+(191,'B42986974893A82D73CC497B3252E9B844A11A99ACF46BEA','',41188,24,'',NULL),
+(191,'0DC0953AE42E913121092DF17BC2BEE8BE133D1C53C8BFFD','',17762,11,'',NULL),
+(178,'72C81E9BA425C54DE57BF4B7745D9C8D6B44D56E8FE933BA','',3049888,31,'',NULL),
+(191,'100426CD22E80090502AA7A087B094B49ACFF4E7A09773ED','',30044,16,'',NULL),
+(178,'46C797D1E60CC458E6C9D874650B996D10FC52641C2E7AA7','',676970,23,'',NULL),
+(178,'DEA2C8A5775AA8CA86B8241BD418979D10DF4587E8E95C87','',250,11,'',NULL),
+(113,'8807783067F9FF2697A61DEE925760682EB894C6F0A798AE','Afd32uu',0,0,'',NULL),
+(178,'F63823A1F60619FDE6B4D6F3915EFB03EC03DEBEC82AFB9E','',673210,23,'',NULL),
+(191,'E4DFD66163F2A65ECDD2EE9CA8062D707CC51882336F6483','',130380,14,'',NULL),
+(178,'88182C96807A6025E628C90CE436C9EC54EC5FEC858A12B2','',690106,23,'',NULL),
+(178,'EC322863C90B861E66A0008554BB8702EA92E1406F6F1711','',3070052,22,'',NULL),
+(178,'9C851C7C05E54E5514E7BE038ABC5C669A3F5747EC573333','',3022016,31,'',NULL),
+(178,'46D70E5C13F6D16BDD01A7481D9AFA51B73202070CA5D712','',673210,23,'',NULL),
+(178,'CBEBB5F6F4EFB1324D17AB6CB48C573B639A37EAFD6299B4','',683146,23,'',NULL),
+(191,'684575AAC0D8BC30D5325D56D3D522380E85ABFF380FA80F','',17938,11,'',NULL),
+(178,'952BC8983C2CAEB6239BB2774F176A7F87A9F2DC10261205','',3045356,22,'',NULL),
+(191,'4EAE0459E341062DB99658136D494BD79511B883F00BCE6A','',57602,42,'',NULL),
+(178,'67E6E0A4006561DC5A67026886D1FF37AD14C5AA1AEA3CAD','',149,5,'',NULL),
+(191,'222FE6B0A70CE2CEE633597E018706B3F78C338D96F6D9DC','',38300,21,'',NULL),
+(113,'79747D68A5D6CD203671EF43029F17591E42BBCDB60B8B93','IPSect',0,0,'',NULL),
+(178,'77ECC7613D44E56210F7CCDD6046226B41C8F087E901C94D','',682394,23,'',NULL),
+(191,'77A59932BC8D497D992A213256ABD52C4D5F4FFB8A06002E','',49564,24,'',NULL),
+(113,'2D14DD3BC859535580D8D9DC3BE7D59865A4E3FD112598A5','drvsys_mon',0,0,'',NULL),
+(178,'9B487CD5032D00424A24FF3185AC4C17246729ECCE431951','',3049872,31,'',NULL),
+(191,'978D8D1F3E1EF11CEBC4B65B13F1C5CE6E9E220E71B255B9','',13033,36,'',NULL),
+(191,'1F5AD2397EB3CA814C5D156C6777C040F5D73085F3751C35','',433168,48,'',NULL),
+(178,'912807952F9397C8F2B718C9164424D720E4EFC681DA3099','',3045356,22,'',NULL),
+(191,'095F1A232F56B3DDA3338B5DE2CA310E5CF0EC0B6F72E87F','',17890,11,'',NULL),
+(178,'2A5E27A3EE36254F61795E168A98C055772F88CEA5CCD6F1','',3033068,22,'',NULL),
+(178,'4319BA4F2139568E87BAAC5F7C95121DD98D710B1C901E2B','',718842,23,'',NULL),
+(191,'74E55BA8CDEFB5BD54BF1C0B0D326721D756440BA33C3ECE','',27270,13,'',NULL),
+(191,'ED9FED6EE63B6C5E35C9E4615AC444603F6BF1FBC669D8B5','',13033,36,'',NULL),
+(191,'DF967A96C67C8D6CB1955D1CA06556F37EEFC88D26F1D684','',90202,13,'',NULL),
+(191,'2BDB1F4509561B2F846AAE7A5354008215C1EF4BDD0EA1D1','',49347,24,'',NULL),
+(178,'0F3B3F0934C1B1E32DC9F83F67308BF9CFCCEB0EFE10B2FA','',672602,23,'',NULL),
+(178,'E89980FFE6987D22DF5379283F53DA8DC3B5CD4862BA22C4','',335122,23,'',NULL),
+(191,'156B3F2929664A16C3DA2D47CE3050B3A1BC32F9C30E4776','',27270,13,'',NULL),
+(191,'65B03F581DEAA68B6A07C679C6B620A2623FD83EB4C4978B','',28940,17,'',NULL),
+(178,'044C63CB9F480E28E02D68426C1F3D69BD146B39A7F081B5','',0,9,'',NULL),
+(178,'B3BC7201BF77B362B943C8C13F9E70A751906F304F9AE133','',673210,23,'',NULL),
+(191,'4783BF04A6BD423D63CD955407780BE0E15A70BC2643F853','',28928,17,'',NULL),
+(178,'A71B471FFB4C58A2C99FC6818DD0269C4AE4C5686D5FDA87','',690106,23,'',NULL),
+(191,'3EA0347F1F7D9BC9CAE387816DFBE4F492F53533400315B4','',17762,11,'',NULL),
+(178,'AA5ADEE929B0B2FB655080B35D19607695F611672E6AD364','',3045616,31,'',NULL),
+(191,'2DAAB5C524CA576967A7B0B713C1C34DA8EBF3990A86730C','',28704,16,'',NULL),
+(191,'D0042CAE82A7121F7783A1382F542074B34ABFDF50A1B13A','',22792,25,'',NULL),
+(191,'4D30286AD524AB2EB05C1A361A81036F787B1C0ACA36DD74','',30012,16,'',NULL),
+(191,'03F9E0F9328E7C7025C0D5C59585700F19E29E8C8F9BF5B4','',49564,24,'',NULL),
+(191,'430C4F44FD7CDF1A51F7A8FA5852ECCDA6CFA92C2A6ACB3A','',28920,23,'',NULL),
+(178,'A2886E2080C54F25867AEDACDADD8F5175545F44512A3B58','',672746,23,'',NULL),
+(178,'8438939BFCD0C550664ADE2DD75DD15FA23DC435EB5FC011','',3638348,23,'',NULL),
+(191,'66480AAA84C5C00B64EEABE96DD21EB3773228B144E25D0E','',20512,16,'',NULL),
+(191,'76C1B0FAC29E4E41FC6DAC31A0592CB0087BCE0D052904FE','',61874,42,'',NULL),
+(191,'DA219765DA22ABBDBE5486CF7DB01C283FBF9986732C9A91','',37180,24,'',NULL),
+(178,'F58BFE40291DD85F45C47E0E255594382DE0180AAE1F1FC9','',149,5,'',NULL),
+(178,'8D8A305C43A3DD47DE550F256BD5F4B1753EDCC079AF279E','',3070052,22,'',NULL),
+(191,'69CA60928A9A85D79ED39596C018DF899BD14C6219EFE088','',41080,24,'',NULL),
+(191,'8D9AA947B904C003D06ACDF4EA0C84104612B274696999C4','',17890,11,'',NULL),
+(178,'289CBF469FC750449980BFC2CA6AD7E42A69E14595D140A3','',209352,75,'',NULL),
+(178,'49961CDE71B612E5432EAB389E7AD193476E05BB2778B751','',700714,23,'',NULL),
+(178,'43818F9575A04BF426F4BE167052859015CC63622F7D4F3A','',672746,23,'',NULL),
+(191,'7828B55FDE24719EC377E29FAE55BA6324020D00CD42A99D','',360508,13,'',NULL),
+(178,'5432916108AFDFA313B6D88C886D87B5722E43EEBCAFC627','',0,8,'',NULL),
+(191,'106F24060B7A4FC87A7971A4B0EFC1021F7181A09598C336','',17906,11,'',NULL),
+(191,'13AA99805639421566A2652F0A7104939EA52EF0F77CFB03','',24812,14,'',NULL),
+(178,'D0938B578EC70162A30A25571CD5DC7E765780F6191EAE1B','',710730,23,'',NULL),
+(178,'70FA2C3749960F1B0D881FDB186DB9992D6EFD30C6674104','',580768,52,'',NULL),
+(191,'BCA2CC6F5740DEF5D01D314146879036A5B6965C01424B0C','',45223,24,'',NULL),
+(178,'47DD279576A64BCB3A4AF23D55895600C73BB5C214B70AEF','',3049452,22,'',NULL),
+(178,'09C9B53C215456866BF764553A7B7E4F1F20F33A8D2CB613','',3638348,23,'',NULL),
+(178,'3EC2D3876D82F424718D3B8E0B87562244C3F5A11A29F0E8','',682394,23,'',NULL),
+(191,'7B4E9BBDC89694CCAE5BA6996D4240EB2E0C9C7F03CC5D40','',59620,13,'',NULL),
+(178,'E2333772B05ABC620076EB66CFBB4AFE2313CCB6D719399F','',3065956,22,'',NULL),
+(178,'2EB4C04C0946264F5BC8EFBAA832CA97381A8A6523BAB093','',178504,96,'',NULL),
+(178,'0E3DE8374276C08D5DD241ABA2AC0AC1D2319F5CD22AAB52','',2303444,33,'',NULL),
+(178,'FDB8DF478DADD2E36619D63D04D106EDB86EBF8FB9EC8CB4','',3000288,31,'',NULL),
+(191,'BA76761FA5F569497047C3484FBC6FDDD8AFA71B96FE93C8','',24812,14,'',NULL),
+(191,'2496E15413F7008A01FA53AC109C01E45B80BF2C3BC2F205','',56063,25,'',NULL),
+(191,'CACB6383E8613E41489D93D7FE7235BE61214F9AE0825F44','',13291422,37,'',NULL),
+(178,'931C403D2562AEE58EEB2586D73D51323A3A739860290AA6','',690106,23,'',NULL),
+(191,'1A95AFB270B9C0D170E7280816891492C21E87D92E9EA6E5','',433168,48,'',NULL),
+(191,'7483929857AE7A16C2D9EB0857EB1D5E9477479C2EEF0B5C','',37180,24,'',NULL),
+(113,'379E1F6905F203E1026DB54A58AF588EF5726D9F50FCF369','Afde32uu',0,0,'',NULL),
+(113,'08394625CCD77F36897EF283FAA0C019EE9F36775182584F','Afd32uu',0,0,'',NULL),
+(191,'D9ADFC0283E75A86A3E1672BF50F5D1AD8E8466AE7086437','',27270,13,'',NULL),
+(178,'D37F6219417C0E5196D3A4473D57ED767E6D9B49BB2B9555','',0,9,'',NULL),
+(191,'93AAFBD4B8B50D6AE72F3BA7002D76791942D0EC0E61253A','',41127,24,'',NULL),
+(191,'F9B132A5E1FFF379EC7175C12A58683C85272CC96E03E161','',41023,24,'',NULL),
+(178,'1867D3CEC9379D1E6B8A1B9B667BDB1B6084B02ED9A60864','',3037164,22,'',NULL),
+(178,'86548378A25632100F7E6E872ECF4D591B7542D977B623AE','',3049452,22,'',NULL),
+(191,'9E00F6F9AF1D63FA2628E60B7BF2B1D63EFDD42D69929A73','',41080,24,'',NULL),
+(178,'7DDD4CF1352822A1F9D19775498EE865FABB26C69F8FDEFE','',209352,75,'',NULL),
+(191,'3D793384AD147BDDE98743EBE1E943263EFD6CAD542E2757','',17522,15,'',NULL),
+(191,'9014AFDE93FDAC6C20971BEE76898FBB300A744CCBC24DA1','',28956,12,'',NULL),
+(178,'D1212D7155D2C3114DA596070139C0B3610597CA0CE1CB17','',149,5,'',NULL),
+(178,'BE18517661568A9D7F3CC9548592867F3A987A705866F60F','',3049888,31,'',NULL),
+(191,'5D833D8DF05A7AF50DF945F5AF6880D325AC52B3ABC815AF','',41188,24,'',NULL),
+(178,'1AA3B0D9AD368562F181E4E5D498652B3859210C126824D8','',672602,23,'',NULL),
+(191,'331E027A700CAFDBEAC9E80B68B8304D0895D52947447448','',501956,48,'',NULL),
+(191,'8E704337CE9F823A8A93947130ED1EE14A99F2EDB5458B94','',12194860,37,'',NULL),
+(178,'BB1C818F79DB2F1FF71B7CB181021EB4F425311D09DAAE81','',0,9,'',NULL),
+(178,'F1AD484D3F189A08EBF420C235D16ECAF1B485092FB063D6','',3045776,31,'',NULL),
+(191,'1CF7028BE4D68B7AC6BB8061BECBFF402860541D04C90C0C','',17906,11,'',NULL),
+(191,'2550D8249054E57086D4F4CF80396C686A71673C070711DA','',17890,11,'',NULL),
+(191,'E864BD00AEB4F3D18CFFA7AADEAC7926A9A1E3EA7588F17A','',29884,20,'',NULL),
+(191,'9E70338B4C8C845F8514925463DB624FC4423F9C467F5E62','',685304,44,'',NULL),
+(178,'FC5EF49EDEE7A5268395298071BBA270822547A7416AEFB1','',3634252,23,'',NULL),
+(191,'8282F57B7C3CD9B449B6363D5C9E792C2044EA2C3F381F9F','',17282,15,'',NULL),
+(191,'B793EEE20E44B2942C6522F79343C58738A1A8489A381FB0','',24812,14,'',NULL),
+(191,'6178EE9E575927A3505835AC88DA31BE15F0622DA55B31EB','',28956,12,'',NULL),
+(178,'7BFD2D88793D6AB1A2351A3E8873B1E20CF44BF6563A0930','',3049888,31,'',NULL),
+(191,'4102F13984A4E146C134D3F607AE7CA1B3263A22B52308C6','',447736,48,'',NULL),
+(178,'EA1C4CA2A64548757BC2ED1C5BB6D2B5094AAD5B5C331F7D','',683146,23,'',NULL),
+(178,'BEB42A9DB2B656B2DFF3DD7D1B8D87033F1D99A019CD4BB5','',3045632,31,'',NULL),
+(191,'4E209437251EBB0CF31CF8A7CCF2C873A4D759B9563D573E','',34176,25,'',NULL),
+(191,'85EB9C8A36B32287F096CF73F7FAE8B57405321342E9B779','',17666,11,'',NULL),
+(191,'2EDE42629DD4A72669FFC9BBFBE15F357BF241853DBF7B2E','',27270,13,'',NULL),
+(191,'FF47A1D9514F4DD81BDA23FC9018F03D894F9096E26EF809','',18680,35,'',NULL),
+(191,'65185BBCA1D9995EA4B796E908B9F78923FDAE2D0C2500BC','',594348,26,'',NULL),
+(191,'BD55E51B55A8FAB82CBF45012D761B1BEEE9BC0DAD8A83CD','',28920,17,'',NULL),
+(178,'AACC3E694ACD478B1F99714734B5A43BD7D7A2A3565ED9B2','',3049492,22,'',NULL),
+(191,'F3C07663325C5358F58A547725FBDF8DEF591021CD94513D','',685304,44,'',NULL),
+(191,'503B5AB938616DE7672103919957B421FA8B6C98F72375F6','',20512,16,'',NULL),
+(191,'3B6EFA3FF9443BEF4CBD2E7CAE08DA1753C79E5EDFA8510F','',37136,40,'',NULL),
+(191,'3E5D1B5BBAD191442388FBD5236F5406CB2CA68EDF986328','',17666,11,'',NULL),
+(178,'D8AB51DCC7840369846821B2A6B229CBA2E42C0CA566792D','',0,9,'',NULL),
+(178,'F8004FA24C4925FAA3ED4993B0D457C5E4C5371915BB93D0','',3037164,22,'',NULL),
+(178,'EAF4A696D564F6BC800BF0F6D732E4E92B50133DE02EE8C4','',0,9,'',NULL),
+(191,'30BDC2BC3E4A2055426FA0EC67DBDEB7705C58047EFFA4D6','',61874,42,'',NULL),
+(191,'3C8BCED97B2F9E5A52587E725004E136DED2B53AB2DB9D4F','',20512,16,'',NULL),
+(178,'0B586F15A8CFD6B7A96632FF2B48D0F71E9D06BFAC174002','',3049888,31,'',NULL),
+(191,'B2B3043BF9CDF3DB535D52ABC45BE586E6B8097B58D82C45','',17890,11,'',NULL),
+(191,'9ED22064CDACF86DAC8C365C325EE428A87B628D137E038E','',28920,17,'',NULL),
+(178,'2254B046D6D8D1A47E5F9275474B5EEE7A96CD99E8D952E9','',682378,23,'',NULL),
+(113,'0A268B6DB28320A1956B54C36C61C625B02A48A4768A0823','Afd32uu',0,0,'',NULL),
+(191,'41B3450DB8D10C506A561C7B95354A7792286D837C08B437','',12194860,37,'',NULL),
+(191,'5CEDF5982800D9C6D16F9D357AEA17BBBAABADC8F3A12EC6','',45223,24,'',NULL),
+(178,'3399D1DE6156FDE8614333B6C4AB0F5B2354381AAB7AF818','',3049872,31,'',NULL),
+(178,'31DA5322A7B1F1715CA35F0976C201122A76D46A719F0C28','',335122,23,'',NULL),
+(178,'36172791F3ACC5EFD406A7AD6F5D218279B94D458BDD60C3','',700714,23,'',NULL),
+(178,'C64DDA3E5D94BD0DEFEDDB867DD304177B554C5771CF4DEF','',682378,23,'',NULL),
+(178,'701D57AFE1315795AFE1340C35E923FE69C36EFC670C0BA5','',0,9,'',NULL),
+(191,'D55BBE3C196C2FE07829CC54717C0A2A27C13A38ED4CF582','',30012,16,'',NULL),
+(178,'DAD3C22D23FAB30C9AA6796E19EAB23CB7DCCD639854C14F','',3045976,31,'',NULL),
+(178,'B3EC9710B55079104420F126BA7257F8FD7DC39D46880E5B','',2299060,33,'',NULL),
+(191,'7762CCDD012D51167BF42F775CC307238C35EA5DA55B999E','',41096,24,'',NULL),
+(191,'CEB7B2C893B8410CA8716C77DB679AB860F7F0E86BCF2D8E','',12194860,37,'',NULL),
+(113,'C584FF543FABE32DBA3206AB324CAFAD92497C4926BBF8B2','HideEx',0,0,'',NULL),
+(178,'122B96C9AD3D43FA5EE82ADFA464904F304EB7FD4CB5622D','',2299108,33,'',NULL),
+(178,'3EFBC5B273BFF42D9F704C74DC2381B8A0D50D61C2F1512E','',717898,23,'',NULL),
+(178,'8C5824E4A6D16714A2BFB5FC9D0CBF4706B8A2170DA87D7B','',0,9,'',NULL),
+(191,'402282B90E06579656CF454305C0B5A925C95FBF6A7CF265','',477928,60,'',NULL),
+(191,'71B36C6D650EF0D049328643E5B12E73DF95B58B2F30D0DC','',17938,11,'',NULL),
+(178,'7C49C303394E1493D897E802528CA8E558B6A7BFE8320F08','',3037164,22,'',NULL),
+(178,'2C190F9E920AF2EF67DA4D06905C2A6A0A2BC63D0192BAC5','',3045632,31,'',NULL),
+(191,'E59168C40E1A0C9F8896EA9E2D684988D81A522FFCDC51D5','',3766400,37,'',NULL),
+(191,'3C825803D3ABF20A11495E54718A2D83A0B35FD7D741B5E1','',12905,36,'',NULL),
+(191,'DCF32E3E1C5DF813DFB137A2D9B21D95B0AF66CC2AD0F245','',41023,24,'',NULL),
+(178,'7B66BDB4A0A713A7B315888708B88F90CCF7313832CCE35E','',3045356,22,'',NULL),
+(178,'FFAF20DD14D7018A4156F000D1455DF36966513EB76F93E7','',2299116,33,'',NULL),
+(178,'0C59AA1F05D2D9D3C0C5ECF6A38D9FF57187A7A461DEE908','',717898,23,'',NULL),
+(191,'913AA6D16EBE73143FA4B4EF89C786668C6E7DD0B936DD18','',90202,13,'',NULL),
+(191,'A9F5CA81A547D8F8051928A287DD280F7FE835B2858CEED5','',20512,16,'',NULL),
+(178,'16B4D8897AEED4732A47239CDC99603D2F505D0AD602847F','',673210,23,'',NULL),
+(191,'23F29E10D55E8701A1A699A1C05CED4553676E9FBA5B51F5','',13634,11,'',NULL),
+(178,'9A65A024256C0D7D677C9F24A9C16A48BEA9B03CCA016098','',3000288,31,'',NULL),
+(191,'AA0004288ED58DE4324FA521F849807DB1EF33634C7FE8C3','',61874,42,'',NULL),
+(191,'E400A401BD0376A0475F1216731F5EE0DDF42C9A4FA805D2','',59620,13,'',NULL),
+(178,'FD434987A57E848192562B61CA0D67BDCEA2392514CDD0AF','',3000288,31,'',NULL),
+(191,'88C140A6580061C775D9141887FABD3F20E574DC4C0C4BBB','',9977,32,'',NULL),
+(178,'3623B441A5D414AFD6650C8B8623ECF3C3A9129E1F5A81C1','',672954,23,'',NULL),
+(178,'393A06D430D287FEC1C02F9945C34BA2A7954241C6357909','',335122,23,'',NULL),
+(191,'0955A3267A3E576B9BD823BB210E8200F37CCB0421BF208C','',685656,44,'',NULL),
+(191,'1A00ED18B456ADC1A1F39A5DEF572250FB0CCAC8BECA9DD8','',477928,60,'',NULL),
+(178,'370B9B6E3AA987595F986C5716BF9FFCF0369438D5DC5D11','',156,8,'',NULL),
+(191,'E8E85DFE24D8D20852A37D702CDF029C3B1FA30B99CAA4BE','',447736,48,'',NULL),
+(178,'FA24C5FEEAF4538DD4913F10C99F3F64380B7354EB318386','',3041472,31,'',NULL),
+(191,'C6AD92AC13B340575AB5D0769A1A7EED47BC42A5968E67D6','',37136,40,'',NULL),
+(191,'990EFFE367D44A29E82F62C57B6041A66F66C1D100B05639','',28956,12,'',NULL),
+(191,'631E42C3B6ED8A22F5AFA903176A7EB011754F5ABF2081EF','',3766400,37,'',NULL),
+(191,'D8AB4091C51177D7BBA7384EE12E0384A7EDB73E38D15920','',13291422,37,'',NULL),
+(178,'54AAA1926869D259C427870A620AE0C24AFC9B472F424633','',3049888,31,'',NULL),
+(191,'CC0E40919988E53DA0B447F0984A30D51CC42E9DB54A8F1F','',49564,24,'',NULL),
+(191,'396E7EC540DC2C74CD6709753CC627517E3A2DB8A1EF3633','',29916,16,'',NULL),
+(191,'84A5A077180DFB9841E8DF4A4EC49EADE886D905768EE032','',57602,42,'',NULL),
+(178,'072300C283F8DF72B3ED5F3CD8B7DF47574AECF7B21FBB59','',668874,23,'',NULL),
+(191,'D4FC9A6022B7CFA81904503E43B813631D4735D80BC61868','',9977,32,'',NULL),
+(178,'47B5A19B87234257CB6C1485AB2C0CB25513260F60094BEE','',3037164,22,'',NULL),
+(191,'B8B6F4BA5FD45F0ABDCB060F72987987B6EF62B80C9E378F','',12194860,37,'',NULL),
+(178,'261F2915266F20B7289A1560176F24198930C61540BEFA01','',3638348,23,'',NULL),
+(191,'019A378006B0677C0B2F42C6CA882EC571D504E7D8F5B05B','',17282,15,'',NULL),
+(178,'4E82DD9F04571D6DAB2FFCFCD638699D1D4C84917F720F32','',717898,23,'',NULL),
+(178,'EAA75F6AE049552C55AFFDABB7268682428B1A9BF028C4D4','',673194,23,'',NULL),
+(178,'F1431C669453FE0BD95430ECD8328EA0D3CD37BA658F094E','',198,12,'',NULL),
+(178,'8AD8C581E8BAF7A2140211C4298A93E229493F272F4EFF4A','',3045912,31,'',NULL),
+(191,'C154E3B6CE0B979BA98FEDAA1829DCCF2A7172642DEF9EFC','',37180,24,'',NULL),
+(191,'295A29C81B1B9CC9B6758440BED913ED4D8B5E05A90D7CE7','',41023,24,'',NULL),
+(178,'3ED9105E3D1F31AD1D4376C54B07D18348C56E7453D161B2','',690106,23,'',NULL),
+(178,'74C75B8F0147ADA8610F6C9BB80C4BDA543C1D95943ADCEB','',0,8,'',NULL),
+(191,'7BE7A7D3F4AD8B30A0A144D5D4AC5E569BB9A0D18AB590FC','',37180,24,'',NULL),
+(191,'0B5C54A4850924038D95A3F1C44F300921CEA1E13644842E','',57602,42,'',NULL),
+(191,'876743AA30D61C83444427F4F18203B2FF443C337E5DD190','',22792,25,'',NULL),
+(191,'C83A14C21D1E66345574E3E0E3613E924F702883A30A1809','',31924,23,'',NULL),
+(191,'2545F02B4FC2F5425960A2E5C0299936C99FF2EC68A5ECDB','',501956,48,'',NULL),
+(191,'85EF9C6353712A8D0E2E27B1702B510A95B1305473F86345','',41023,24,'',NULL),
+(191,'35282392AA86692A153FC159D6E13C74F9DF01661E4867D6','',13538,11,'',NULL),
+(191,'0D6CC3008615CD5BFB96A90620805B78D5BFBC6100B1AF0D','',13538,15,'',NULL),
+(191,'D573179188521C485CFD24A9EE9CDA77C540A31EE68E3E78','',41228,24,'',NULL),
+(191,'8FA80694C3766FC1B041103EB35EBA3B7C77081A5DA8FFD8','',28940,17,'',NULL),
+(113,'CD6B8F9D23612C807F7653D29F1F1C54BC8F917C5C5BD8F1','Afd32uu',0,0,'',NULL),
+(178,'FCB5CF830DB536208D4C58E5838D1C8798F0738247EF0867','',672602,23,'',NULL),
+(178,'4451680A3F41926C1545701887F93A0A49CC29C3E114AADB','',4011280,23,'',NULL),
+(191,'6BE2C4F29ADF49AE5BF0485A27A854087E775FA28047168C','',27270,13,'',NULL),
+(191,'016FF5D8685E37969B1B7C310756DCD93D4AB34256837031','',38300,21,'',NULL),
+(191,'6726DA4A8F112CC25DD78500CA9BF792DB688F7D8D1FBC4B','',57602,42,'',NULL),
+(191,'9F8B3A3C70027496420A619969CF1EB7AF447D245DA766A0','',29884,20,'',NULL),
+(178,'E74FFC8ADF5FE8A0FE0F10BCABCFCEDB3B2B9C2307340D7C','',3041472,31,'',NULL),
+(178,'B31302D6A47971059B2643B57D2D50EBEBEAA89BE483F1F4','',3037164,22,'',NULL),
+(191,'2F761DEA3CD3394A0091D745FD2976B52F3B16BB0A48BC80','',29884,20,'',NULL),
+(178,'8E44EC966A93870696359D3E2474D12C071A381B9403B1B9','',673210,23,'',NULL),
+(191,'2424AFA7FEC48FF09E5E3BDAF93FAA74743A7551B6FB1495','',56063,25,'',NULL),
+(178,'ACCF5804D419F30643F87A650C4DC6E0E10266922692AECE','',682378,23,'',NULL),
+(191,'6EC19D6D1244E3FE787AE448EC905C509DBA3C01FBE34F24','',41280,16,'',NULL),
+(178,'5B2D2EE40383C33D381998995210918AC6B1AD67C5880F6D','',710554,23,'',NULL),
+(178,'83FFE0F8F224D5E56C38D731EFE8AD5AD1285B1AD4FA019B','',683146,23,'',NULL),
+(191,'9D67A809FD8FDA1E1504F0C038E21E1D5FC4C6D11F426228','',28940,17,'',NULL),
+(191,'2965EC092EC0A4B3D4A3C781F0A0A542824C77B7300BF50C','',45324,24,'',NULL),
+(191,'FE31901F5558E6555DA6BC5B1BC3415E82CB97DECBB486BB','',41096,24,'',NULL),
+(191,'B35406A77D6501A50F41981C7C137AD5272EB612F4A74109','',29884,20,'',NULL),
+(178,'7275397E511B45264BCFA30E3A3F8101894AA3923D91BE6E','',3037164,22,'',NULL),
+(178,'CA7D8D0E1F20385DCF6FC209799750CE9D0160B0C67196E7','',700714,23,'',NULL),
+(191,'F5CCDA244D826B3180E7C49193B3B0B5DBF651EC67DCB47A','',594348,26,'',NULL),
+(191,'7977F1E72B30179072EE1784396AB0406D06162051CA1EDB','',37136,40,'',NULL),
+(178,'603F8A015D8436CCBCD68B26FF6006E7A81BA9A8D9524B1F','',3045356,22,'',NULL),
+(178,'9631E9EBC78E0333010E522045852C7BEA44655080D418F3','',3049888,31,'',NULL),
+(191,'43BE7C00605D9FECAEFAE38D8FFEAED78B8382563A245F10','',9977,32,'',NULL),
+(191,'E493F1BAED1DBE7A0D429BF1A5D665636D29069060310BF0','',13291422,37,'',NULL),
+(191,'6C53203FA95EBE4DBB0A7F3E85994058DECA069A5244C29E','',130380,14,'',NULL),
+(178,'5A07E5A0525DBD5005CBDE16F7393EC8B795ADB2327C2F96','',3045356,22,'',NULL),
+(178,'D7665366F333BD580C5F8E2FF8971294F69E99EC7E3623F3','',717898,23,'',NULL),
+(191,'FB87EB8F178C69D9F7576AC7FF75D0479467057A2B6C956D','',9977,32,'',NULL),
+(178,'292911AC98E7ED34DF021B562D5DEBE8DAA15570B552978B','',3000288,31,'',NULL),
+(178,'6618F45C49D47C4105070C085FD5C384254A62E4AB614DB9','',3634252,23,'',NULL),
+(191,'316E531545999AFC533814888434999501FEA8ABFBAF8655','',134968,32,'',NULL),
+(191,'9945ED64886F68664A4BDF50731F4B4DC680273AB2E0DBCB','',20512,16,'',NULL),
+(191,'1D4D6EC7B6B26553FC914D28BF9B62FD81D0B865DE606D97','',29884,20,'',NULL),
+(178,'63B2D2ACF6E912CDC68282B080A2D610BE6AFE8EBB95FD31','',3070052,22,'',NULL),
+(191,'B0955BAC042D5441496103E7C45E38609A9AE3799D534BD9','',18680,35,'',NULL),
+(178,'6488E44D4E965581650F73F6E68DD8F863795162D99104F8','',682378,23,'',NULL),
+(191,'CC0D3F7D8FCF928A55F92F6414F4AEF7AD75DED5819BF870','',13538,15,'',NULL),
+(191,'CD3835965AF27EC338F828666CD06089B847B04A2DD56AE0','',17938,11,'',NULL),
+(178,'D04E9CF6A03D4767AFF1E4EE0EFBC333AEBA5B0552F15957','',0,9,'',NULL),
+(178,'120904F033D78A13DB0971F095C809852B7EB876D1A8AA01','',3045632,31,'',NULL),
+(191,'7DDD19DCF77E27DF0A31BC21C7F716FF85076AF065F102DC','',36924,24,'',NULL),
+(178,'5486E2CDD98AC3F25C223FD515CE7EF3FB09AC12ED338C86','',198,10,'',NULL),
+(178,'F8D6423F01E5369D16F6F70180083B936F0DDE3737B23308','',2299092,33,'',NULL),
+(191,'EC10CC349A8E654240B27B03EE1232B9CCED28F7104CCB71','',49347,24,'',NULL),
+(178,'29E064ACC509206873A1D548F4816DB60D29D6EE9FF63A56','',682378,23,'',NULL),
+(178,'E1A8A2A81920A7BA9F419A6D19CAC3DD9E292EF39F963234','',676970,23,'',NULL),
+(191,'32393EB09F7C829F58612E5E47018F7203C43218C3506C79','',20512,16,'',NULL),
+(178,'AFC4D19CACEDE8E9A2FDE3CC3D29CF8556AF4980872DFE1A','',3033068,22,'',NULL),
+(178,'09A2B97FD351B1D339030233AC51C741E0ECDC21AA7A152B','',3049452,22,'',NULL),
+(191,'2B2AF2171B8A9FC0D44EFE0ECDCB9DE1A55ACC8D83661E16','',41023,24,'',NULL),
+(178,'D111B236DC42EB338870E72FF6EE3141714D0437864B02AE','',3045356,22,'',NULL),
+(178,'E6DC6898929D1DA9F5768A9BFCBE848F8C1F31E8B6910FB8','',335122,23,'',NULL),
+(113,'85A32F8B5F8430A086D27E62EB17D878E49CE815F6AC91CA','IPSect',0,0,'',NULL),
+(191,'B6CB7B905A6BDD64BC032BE71927C1FE31153D14D6CF87E1','',447736,48,'',NULL),
+(178,'40EE7F4EEE1D707ECB770CDBBB54730CB863CC8E268D4208','',3634252,23,'',NULL),
+(178,'D74E308262D8C52ACE81B66F1D90C160AC86B2E0508176C1','',0,8,'',NULL),
+(178,'E15287D29EE155299619F8E93E66B55B564FD921FA41CF50','',3049452,22,'',NULL),
+(191,'58DFAEE44A52F0D5A58B0C94F0E5E63C1C7F76206D7FA7CA','',22792,25,'',NULL),
+(191,'83705EAE8AAD9709494E52EB05AC0481C998C15730E61099','',30012,16,'',NULL),
+(178,'0271F4D624304A48CB7CDFA016E3A735DCA3170FAD557468','',3070052,22,'',NULL),
+(178,'217DFFE3C12F984992E1E0AE7B5864061572BA301B21D869','',178504,96,'',NULL),
+(178,'C5C7AC33D1E4CF33E661033006BFEDE08523B643CCF51261','',3045356,22,'',NULL),
+(191,'D45144FC835266270E67CFB1F2900FD227B63204698A3EA7','',50040,26,'',NULL),
+(191,'B5BB832AEEC591196864E08A392592C5789D76D3DDDD4DBF','',27270,13,'',NULL),
+(191,'93582814E00150E2DD750ACAD7BD1719C4EBCD4C06F482AB','',28940,17,'',NULL),
+(191,'FD6B6AC7FA5F2E7828CB1B429A9442383BD93E762A5D7D00','',31924,23,'',NULL),
+(191,'51DF4EDECBBE42CC7C5D6723318F98E43E14A45F41CBD124','',41080,24,'',NULL),
+(191,'F2B2260FDD23E5F268FAAE4D1A48E74C452F2AC5D114765D','',57602,42,'',NULL),
+(191,'69FBDB69EC2E113EF691E47EDD46E40F03D1EBE226A1F7CE','',29884,20,'',NULL),
+(178,'E3E431D8F8FB38F0F2586D0F50D809BCCEB13651C5EF2619','',682394,23,'',NULL),
+(178,'2294015927F07D884FE2923FA17B3A8BCABC0A378930CF84','',679578,23,'',NULL),
+(191,'0A022AB25C52F94404A01F96687B2D6E6BE774237254BD05','',20512,16,'',NULL),
+(191,'65EEE243504EDC3319C3528B1A1E8061A3E75F4C25B61F95','',41228,24,'',NULL),
+(178,'877C654036A29FC108FE8D69D416361732D7A0270E51189D','',3022016,31,'',NULL),
+(178,'1A223564DF9E7BADD3CF858FB8250FE59F892232AC3B412D','',4011280,23,'',NULL),
+(191,'4FEDF58FB4DE45289C97ACCF16EB2DEA6FBC85C74A52D3C9','',37180,24,'',NULL),
+(191,'D4BE47EA1D68B92E2AD8307D139877705BE2B6A98B6A916E','',13033,36,'',NULL),
+(191,'9658AC7EF426A52C327BBC1ED71C6FA6DC5940E35DCC18C7','',18680,35,'',NULL),
+(113,'1B17998CD8E0CDA4D84B0A0F9DB05E536DACE0348A883D24','ndis_x86',0,0,'',NULL),
+(178,'BB9B86ED12359A465B02387A1D727F11F78D35C8B7FCC2FC','',2299092,33,'',NULL),
+(191,'842BC1A8C53902D26018B1C5E05ADCD70D973A968E298331','',50040,26,'',NULL),
+(178,'3E894F9682573CC0AD54C7E9873C9026AC050929392D0B93','',3049452,22,'',NULL),
+(191,'4A31E3D24FD6D576D84EF1BFB813D0F066870DEB38C32E47','',21826,11,'',NULL),
+(191,'EEA122B4C066EC0B196F67511E633EBACB37C4EA6AE4BFF7','',41096,24,'',NULL),
+(191,'66211671BEF80FB973B1C9595A70B462AD79EC83530DFE89','',12905,36,'',NULL),
+(178,'3760BBD6FE99A0BBEE0AB61A8BD52A6ABCAC48FF3CB265B8','',3070052,22,'',NULL),
+(191,'70F425426612D0D8495386C2375F7A4183548C0D4E7DFA46','',594348,26,'',NULL),
+(178,'BB310E9DDE9259027123500E65F9FA1E8D9D0F5FE8381CD2','',3638348,23,'',NULL),
+(191,'6FFB5E4982D306680E0C59087DA961CD4F6B068E323C3BB4','',401992,14,'',NULL),
+(191,'6DDCA79B7460A1F3671532A28FDCEB331DE6CA550E3178D0','',3766400,37,'',NULL),
+(191,'A8F7B2FB37CF3BEF43D6CE5C0BF85E85077E681490BA1C4C','',37136,40,'',NULL),
+(191,'052F425E7528B3A7155C45EEE530F915DBB154E5C8876E25','',50040,26,'',NULL),
+(178,'D6DE200B631AF71BFBC76202D82649942FD6ED9BC4A9EF75','',198,12,'',NULL),
+(178,'61077261C66B2CF9B199F115A3A656EA6A00068F151E3656','',706314,23,'',NULL),
+(191,'513FC0F0673A9DF86FA1FA05371040C14634CE08311ED619','',401992,14,'',NULL),
+(191,'5E0970A6EB246A79DDF427CB76D0D921F971E13921DD5D2C','',134968,32,'',NULL),
+(178,'53CAC3EF654610AC7E043C6AAD62709EF0B5400DBDE755EB','',149,5,'',NULL),
+(178,'566637D06BAEA9190B7CE510C697F72CD20FE3D958A95A25','',3049888,31,'',NULL),
+(113,'3C9B0CC7FE020EEBD43E6B1D88EDDF0EC46AC35974765068','drvsys_mon',0,0,'',NULL),
+(191,'BDFEE5DCDD37FC5B2A1B3E42FBE5F7997CFED35E86062EB6','',28920,23,'',NULL),
+(191,'7794AE60131E4D07860DB48047206784B885B30457EAB83E','',12194860,37,'',NULL),
+(178,'653A308BB00D914AE1ECD773BA4B0BA7724874BC62647D10','',3037164,22,'',NULL),
+(178,'06B696C35F905E75B451A02E121BDA0330CD44E0D9B872BF','',60648,56,'',NULL),
+(191,'35E8CD9E8CBD879B1E53278926C634AA8B72B8D9A20009F9','',17522,15,'',NULL),
+(191,'9B13F2E744904ADAAA062F9113A576D11C2C450D1CD6A4AB','',13033,36,'',NULL),
+(191,'60851B4A6F7338632A84795FBBB20320E49AD2CC2034BA80','',28940,17,'',NULL),
+(191,'3BC0BE02AE0B6975974D3B13B811EC6BDACBF9EE122BE633','',90202,13,'',NULL),
+(191,'E47F7DD8D5B5C29B70AFFD4F25AA286167D411937F9BD247','',36907,24,'',NULL),
+(178,'35D1CDEE86A410DF087DE6D5F5AC6289C4888B9753293E73','',3037164,22,'',NULL),
+(191,'2ED2EEB29EE0D48477779E5CA875F1F5F15CCE74CA85BDAA','',28956,17,'',NULL),
+(191,'A373FDB6A789CC46072A4CC51A429C817C40862DC6C0190F','',30012,16,'',NULL),
+(178,'3D02551F548DFB58832626FE90A7AAA12824D93A54A0DC14','',709322,22,'',NULL),
+(191,'09D04CF8ABC51D06D874784442987E5F2631041550607255','',36544,55,'',NULL),
+(191,'F3CD473F8C85977895CA5BA9DC22185BCCBBF6B977205193','',448492,48,'',NULL),
+(191,'30E2F23DB1038D16D2DEEAB1D0F1790D961E468368DC5108','',30012,16,'',NULL),
+(191,'540D465F760320A63981289D30CD40CCC770EE126523C71D','',477912,60,'',NULL),
+(191,'C461E1BE054FE29A1FD58B33D33890BC4A1279DE4F572B47','',37180,24,'',NULL),
+(191,'1AC3D903CFCA11321E76A257BDA0608E5060030BE745CCF3','',130380,14,'',NULL),
+(178,'96281A2887E61232007D7015E4A35DA118794841A8EC84BC','',3037164,22,'',NULL),
+(178,'8A1AC926B46A9E3D60D3BD87A59FF77D7B80A1510BC327A7','',710730,23,'',NULL),
+(178,'5C0E4EE98C4E34CBE44F6BD595C13DD675555164A8D491DA','',710554,23,'',NULL),
+(191,'3620B6BDF3993B87FD35E906FE8376A04FF34684E2023D8E','',41280,16,'',NULL),
+(191,'025C373F05EC6E809EF5A86A903570FDA14D219286BCED5E','',448492,48,'',NULL),
+(191,'BECE667BF9443EF6515E8E154F74FC2C5817455C8636DB72','',501956,48,'',NULL),
+(191,'94F1DA3E0D955761826D6BC932E26F44D321B4838C7567D8','',13538,15,'',NULL),
+(191,'EA3A3AD71FD14B038C98F256E80C1EFA1F45562A3DF92E7D','',22792,25,'',NULL),
+(191,'AD5A8CBF55EC436DA968EE0B9744C93F65D9E0D6E3C1B136','',174688,37,'',NULL),
+(191,'9B6B3B311BA9007C06CF0D146BB979B11CF295C58768DD4F','',31924,23,'',NULL),
+(217,'','WPESPY.DLL',0,0,'','WPE PRO - injected dll'),
+(217,'','RPE.DLL',0,0,'','rEdoX Packet Editor - injected dll'),
+(243,'','',4623652,7,'578B7D08578BF1','Pointer to realmlist address'),
+(243,'','',10010636,12,'8166443FFF1FFFD9565CD95E',NULL),
+(243,'','',5417948,5,'7734FF2485','FrameXML Signature Check'),
+(243,'','',8491566,5,'8B4D10890D','Lua DoString'),
+(243,'','',5345746,7,'746583F9177760','Lua Protection Patch'),
+(243,'','',7246064,6,'8950108B450C','Movement State related'),
+(243,'','',7860712,5,'742DF6407C',NULL),
+(243,'','',10714892,8,'BB8D243FD4D0313E','Wall Climb'),
+(243,'','',9990741,9,'8B878000000089463C','No Fall Damage Patch'),
+(243,'','',10000022,6,'894644894E54',NULL),
+(243,'','',7517484,7,'7518683B010000','Follow Unit Check'),
+(243,'','',5081862,8,'6840AAB600C60200',NULL),
+(243,'','',7452688,10,'8B81CC07000025000000','WoWEmuHacker Injection'),
+(243,'','',5283280,12,'558BECB8084E0000E8731DF0','AddChatMessage'),
+(243,'','',5265823,5,'72118B5518','Language Patch'),
+(243,'','',11154396,8,'D893FEC0488C11C1','Jump Momentum'),
+(243,'','',5284488,9,'7507C7451400000000','Language Patch'),
+(243,'','',5296496,12,'558BEC81ECE80D00006A0AE8','SendChatMessage'),
+(243,'','',7739760,11,'01BE80000000E805B6FFFF','Jump related?'),
+(243,'','',5124558,5,'8BF08D4608','GetCharacterInfo'),
+(243,'','',5090917,8,'E886EE1D0083C40C',NULL),
+(243,'','',10694516,8,'2F549A416F12033B','Wall Climb'),
+(243,'','',4609669,5,'8986100F00','Login Password Pointer'),
+(243,'','',5296823,7,'75166824020000','Language patch (speak all)'),
+(243,'','',4198410,6,'CCCCCCCCCCCC',NULL),
+(243,'','',4609675,5,'5E5DC20800','Loggin Result'),
+(243,'','',11287980,8,'04000000903C9F00','Parental Controls related'),
+(243,'','',4618113,10,'FF1554F79D003B470C89','WS2_32.Send'),
+(243,'','',5345728,2,'558B','Lua Protection Remover'),
+(243,'','',7726137,2,'7414','Walk on Water Patch'),
+(243,'','',8016620,2,'7417','Collision M2 Special'),
+(243,'','',8016079,6,'0F8462010000','Collision M2 Regular'),
+(243,'','',8054762,2,'7506','Collision WMD'),
+(243,'','',9995315,2,'7544','Multi-Jump Patch');
diff --git a/sql_mr/mr01792_mangos_spell_linked.sql b/sql_mr/mr01792_mangos_spell_linked.sql
new file mode 100644
index 00000000000..acb21660ff5
--- /dev/null
+++ b/sql_mr/mr01792_mangos_spell_linked.sql
@@ -0,0 +1,36 @@
+-- Implement spell linked definitions storage
+
+DELETE FROM `spell_linked` WHERE `entry` = 25780;
+INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `effect_mask`, `comment`) VALUES
+(25780, 57339, 1, 0, 'Paladin - threat addon after 3.0');
+
+DELETE FROM `spell_linked` WHERE `entry` = 21178;
+INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `effect_mask`, `comment`) VALUES
+(21178, 57339, 1, 0, 'Druid Bear form - threat addon after 3.0');
+
+DELETE FROM `spell_linked` WHERE `entry` = 7376;
+INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `effect_mask`, `comment`) VALUES
+(7376, 57339, 1, 0, 'Warrior Defensive Stance Passive - threat addon after 3.0');
+
+DELETE FROM `spell_linked` WHERE `entry` = 64382;
+INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `effect_mask`, `comment`) VALUES
+(64382, 64380, 4, 0, 'Shattering Throw - Immunity dispell');
+
+DELETE FROM `spell_linked` WHERE `entry` = 32375;
+INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `effect_mask`, `comment`) VALUES
+(32375, 43241, 4, 0, 'Mass Dispel - Cosmetic');
+
+-- Gift of the Naaru Visual
+DELETE FROM `spell_linked` WHERE `linked_entry` = 57901;
+INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `effect_mask`, `comment`) VALUES
+(28880, 57901, 1, 0, 'Gift of the Naaru Visual'),
+(59542, 57901, 1, 0, 'Gift of the Naaru Visual'),
+(59543, 57901, 1, 0, 'Gift of the Naaru Visual'),
+(59544, 57901, 1, 0, 'Gift of the Naaru Visual'),
+(59545, 57901, 1, 0, 'Gift of the Naaru Visual'),
+(59547, 57901, 1, 0, 'Gift of the Naaru Visual'),
+(59548, 57901, 1, 0, 'Gift of the Naaru Visual');
+
+DELETE FROM `spell_linked` WHERE `linked_entry` = 61719;
+INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `comment`) VALUE
+(61716, 61719, 1, 'Rabbit Costume - Easter Lay Noblegarden Egg Aura');
diff --git a/sql_mr/mr01793_mangos_string_statemgr.sql b/sql_mr/mr01793_mangos_string_statemgr.sql
new file mode 100644
index 00000000000..8805b8f0b66
--- /dev/null
+++ b/sql_mr/mr01793_mangos_string_statemgr.sql
@@ -0,0 +1,31 @@
+-- State manager command line info
+DELETE FROM `mangos_string` WHERE `entry` IN (526,527,528,529,530,531,532,533,534,535,536,537,538,1132,1133,1134,1192);
+INSERT INTO `mangos_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
+(526,'%s states (movement generators) stack:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(527,' Priority: %i State: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(532,'        Targeted to %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(535,'        Home movement to (X:%f Y:%f Z:%f)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(536,'        Home movement used for player?!?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(538,'        (non-standart state %s)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1132,'        Follow %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+
+/* old (mangos default) values
+INSERT INTO `mangos_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
+(526,'%s (lowguid: %u) movement generators stack:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(527,'   Idle',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(528,'   Random',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(529,'   Waypoint',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(530,'   Animal random',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(531,'   Confused',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(532,'   Targeted to player %s (lowguid %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(533,'   Targeted to creature %s (lowguid %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(534,'   Targeted to <NULL>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(535,'   Home movement to (X:%f Y:%f Z:%f)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(536,'   Home movement used for player?!?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(537,'   Taxi flight',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1192,'  Effect movement',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(538,'   Unknown movement generator (%u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1132,'   Follow player %s (lowguid %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1133,'   Follow creature %s (lowguid %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1134,'   Follow <NULL>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+*/
diff --git a/sql_mr/mr01817_mangos_Honorable_Defender.sql b/sql_mr/mr01817_mangos_Honorable_Defender.sql
new file mode 100644
index 00000000000..b06ce5bf937
--- /dev/null
+++ b/sql_mr/mr01817_mangos_Honorable_Defender.sql
@@ -0,0 +1,58 @@
+DELETE FROM creature_template_addon WHERE entry IN (35379, 35380, 36349, 36350);
+INSERT INTO creature_template_addon (entry, auras) VALUES
+(35379, 66157), -- eye of storm alliance
+(35380, 66157), -- eye of storm horde
+(36349, 68652), -- arathi basin alliance
+(36350, 68652); -- arathi basin horde
+
+UPDATE creature_template SET FactionAlliance = 534, FactionHorde = 534, UnitFlags = 0x2000202 WHERE entry IN (35379, 36349); -- ally
+UPDATE creature_template SET FactionAlliance = 714, FactionHorde = 714, UnitFlags = 0x2000202 WHERE entry IN (35380, 36350); -- horde
+
+-- new positions in arathi basin
+DELETE FROM creature WHERE id IN (35379, 35380, 36349, 36350);
+INSERT INTO creature (guid, id, map, spawnMask, phaseMask, position_x, position_y, position_z, spawntimesecs, spawndist) VALUES
+(152000, 36349, 529, 1, 1, 1166.79, 1200.13, -56.7086, 10, 0 ),-- stable
+(152001, 36349, 529, 1, 1, 977.016, 1046.62, -44.8092, 10, 0 ),-- forge
+(152002, 36349, 529, 1, 1, 806.182, 874.272, -55.9937, 10, 0 ),-- farm
+(152003, 36349, 529, 1, 1, 856.142, 1148.9, 11.1847, 10, 0 ),  -- lumber mill
+(152004, 36349, 529, 1, 1, 1146.92, 848.178, -110.917, 10, 0 ),-- mine
+
+(152005, 36350, 529, 1, 1, 1166.79, 1200.13, -56.7086, 10, 0 ),-- stable
+(152006, 36350, 529, 1, 1, 977.016, 1046.62, -44.8092, 10, 0 ),-- forge
+(152007, 36350, 529, 1, 1, 806.182, 874.272, -55.9937, 10, 0 ),-- farm
+(152008, 36350, 529, 1, 1, 856.142, 1148.9, 11.1847, 10, 0 ),  -- lumber mill
+(152009, 36350, 529, 1, 1, 1146.92, 848.178, -110.917, 10, 0 );-- mine
+
+INSERT INTO creature (guid, id, map, spawnMask, phaseMask, position_x, position_y, position_z, spawntimesecs, spawndist) VALUES
+(152010, 35379, 566, 1, 1, 2286.382568, 1402.460205,1197.108521 , 10, 0 ), -- draenei ruins
+(152011, 35379, 566, 1, 1, 2284.859619, 1731.055786,1189.883057 , 10, 0 ), -- mage tower
+(152012, 35379, 566, 1, 1, 2043.890747, 1729.769897,1189.863037 , 10, 0 ), -- fel reaver ruins
+(152013, 35379, 566, 1, 1, 2048.877930, 1393.445435,1194.356934 , 10, 0 ), -- blood elf tower
+
+(152014, 35380, 566, 1, 1, 2286.382568, 1402.460205,1197.108521 , 10, 0 ), -- draenei ruins
+(152015, 35380, 566, 1, 1, 2284.859619, 1731.055786,1189.883057 , 10, 0 ), -- mage tower
+(152016, 35380, 566, 1, 1, 2043.890747, 1729.769897,1189.863037 , 10, 0 ), -- fel reaver ruins
+(152017, 35380, 566, 1, 1, 2048.877930, 1393.445435,1194.356934 , 10, 0 ); -- blood elf tower
+
+DELETE FROM creature_battleground WHERE guid BETWEEN 152000 AND 152017;
+INSERT INTO creature_battleground (guid, event1, event2) VALUES
+-- arathi basin
+(152000, 0, 3),
+(152001, 1, 3),
+(152002, 2, 3),
+(152003, 3, 3),
+(152004, 4, 3),
+(152005, 0, 4),
+(152006, 1, 4),
+(152007, 2, 4),
+(152008, 3, 4),
+(152009, 4, 4),
+-- eye of storm
+(152010, 2, 0),
+(152011, 3, 0),
+(152012, 0, 0),
+(152013, 1, 0),
+(152014, 2, 1),
+(152015, 3, 1),
+(152016, 0, 1),
+(152017, 1, 1);
diff --git a/sql_mr/mr01839_mangos_Isle_of_Conquest.sql b/sql_mr/mr01839_mangos_Isle_of_Conquest.sql
new file mode 100644
index 00000000000..0a6425a94b0
--- /dev/null
+++ b/sql_mr/mr01839_mangos_Isle_of_Conquest.sql
@@ -0,0 +1,708 @@
+-- Isle of Conquest
+
+-- creature and gameobject initial guid
+SET @CREATURE := 520000;
+SET @GAMEOBJECT := 520000;
+DELETE FROM `creature` WHERE `guid` BETWEEN @CREATURE AND @CREATURE+9999;
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @GAMEOBJECT AND @GAMEOBJECT+9999;
+
+SET NAMES utf8;
+DELETE FROM mangos_string WHERE entry BETWEEN 20080 AND 20102;
+INSERT INTO mangos_string (entry, content_default, content_loc6, content_loc7, content_loc8) VALUES
+(20080, 'The battle will begin in 2 minutes.', 'La batalla por la Isla de la Conquista comenzará en 2 minutos.', 'La batalla por la Isla de la Conquista comenzará en 2 minutos.', 'Бой на Острове Завоеваний начнется через 2 минуты!'),
+(20081, 'The battle will begin in 1 minute.', 'La batalla por la Isla de la Conquista comenzará en 1 minuto.', 'La batalla por la Isla de la Conquista comenzará en 1 minuto.', 'Бой на Острове Завоеваний начнется уже через 1 минуту! Начинайте готовиться!'),
+(20082, 'The battle will begin in 30 seconds!', 'La batalla por la Isla de la Conquista comenzará en 30 segundos. ¡Preparaos!', 'La batalla por la Isla de la Conquista comenzará en 30 segundos. ¡Preparaos!', 'Бой на Острове Завоеваний начнется через 30 секунд! Будьте готовы!'),
+(20083, 'The battle has begun!', '¡La batalla por la Isla de la Conquista ha comenzado!', '¡La batalla por la Isla de la Conquista ha comenzado!', 'Бой начался!'),
+(20084, 'Alliance Keep', 'Fortaleza de la Alianza', 'Fortaleza de la Alianza', 'крепость Альянса'),
+(20085, 'Horde Keep', 'Fortaleza de la Horda', 'Fortaleza de la Horda', 'крепость Орды'),
+(20086, 'The Alliance wins!', '¡Gana la Alianza!', '¡Gana la Alianza!', 'Альянс побеждает!'),
+(20087, 'The Horde wins!', '¡Gana la Horda!', '¡Gana la Horda!', 'Орда побеждает!'),
+(20088, 'The west gate of the Alliance has been destroyed!', '¡La puerta oeste de la fortaleza de la Alianza ha sido destruida!', '¡La puerta oeste de la fortaleza de la Alianza ha sido destruida!', 'Восточные врата Альянса разрушены!'),
+(20089, 'The east gate of the Alliance has been destroyed!', '¡La puerta este de la fortaleza de la Alianza ha sido destruida!', '¡La puerta este de la fortaleza de la Alianza ha sido destruida!', 'Западные врата Альянса разрушены!'),
+(20090, 'The front gate of the Alliance has been destroyed!', '¡La puerta central de la fortaleza de la Alianza ha sido destruida!', '¡La puerta central de la fortaleza de la Alianza ha sido destruida!', 'Южные врата Альянса разрушены!'),
+(20091, 'The west gate of the Horde has been destroyed!', '¡La puerta oeste de la fortaleza de la Horda ha sido destruida!', '¡La puerta oeste de la fortaleza de la Horda ha sido destruida!', 'Восточные врата Орды разрушены!'),
+(20092, 'The east gate of the Horde has been destroyed!', '¡La puerta este de la fortaleza de la Horda ha sido destruida!', '¡La puerta este de la fortaleza de la Horda ha sido destruida!', 'Западные врата Орды разрушены!'),
+(20093, 'The front gate of Horde has been destroyed!', '¡La puerta central de la fortaleza de la Horda ha sido destruida!', '¡La puerta central de la fortaleza de la Horda ha sido destruida!', 'Южные врата Орды разрушены!'),
+(20094, '$n has assaulted the %s', '¡$n ha asaltado %s!', '¡$n ha asaltado %s!', '$n захватывает %s'),
+(20095, '$n has defended the %s', '¡$n ha defendido %s!', '¡$n ha defendido %s!', '$n отбивает и возвращает под свой контроль %s'),
+(20096, '$n claims the %s! If left unchallenged, the %s will control it in 1 minute!', '¡$n reclama %s! ¡Si nadie se lo impide, la %s tomará el control en 1 minuto!' , '¡$n reclama %s! ¡Si nadie se lo impide, la %s tomará el control en 1 minuto!', '$n захватывает %s! Если ничего не предпринимать, %s получит контроль уже через 1 минуту!'),
+(20097, 'The %s has taken the %s', 'La %s ha tomado %s.', 'La %s ha tomado %s.', '%s захватывает %s'),
+(20098, 'Workshop', 'el Taller', 'el Taller', 'Мастерская'),
+(20099, 'Docks', 'los Muelles', 'los Muelles', 'Причал'),
+(20100, 'Refinery', 'la Refinería', 'la Refinería', 'Нефтезавод'),
+(20101, 'Quarry', 'la Cantera', 'la Cantera', 'Каменоломня'),
+(20102, 'Hangar', 'el Hangar', 'el Hangar', 'Ангар');
+
+-- IOC vehicles
+
+-- Alliance Gunship Cannon
+UPDATE creature_template SET VehicleTemplateId = 452, iconName = 'Gunner', AIName = 'NullAI', faction_A = 3, faction_H = 3, ScriptName = '' WHERE entry = 34929;
+-- Horde Gunship Cannon
+UPDATE creature_template SET VehicleTemplateId = 453, iconName = 'Gunner', AIName = 'NullAI', faction_A = 6, faction_H = 6, ScriptName = '' WHERE entry = 34935;
+-- Keep Cannon
+UPDATE creature_template SET ScriptName = '', AIName = 'NullAI' WHERE entry IN (34944, 35429);
+UPDATE creature_template SET VehicleTemplateId = 160, iconName = 'Gunner', faction_A = 35, faction_H = 35, unit_flags = unit_flags | 4 WHERE entry IN (34944, 35429);
+
+UPDATE creature_template SET mechanic_immune_mask = mechanic_immune_mask|1|2|8|16|32|64|128|1024|2048|4096|8192|131072|262144|8388608|16777216|67108864 WHERE entry IN (34944, 35429, 34793, 35413, 34775, 35415, 34776, 35431, 35069, 35433, 34802, 35419, 35273, 35421);
+
+-- Alli Glaive Thrower
+UPDATE creature_template SET AIName = 'NullAI' WHERE entry = 34802;
+UPDATE creature_template SET VehicleTemplateId = 447, iconName = 'vehichleCursor', faction_A = 3, faction_H = 3, ScriptName = '' WHERE entry IN (34802, 35419);
+
+-- Horde Glaive Thrower
+UPDATE creature_template SET AIName = 'NullAI' WHERE entry = 35273;
+UPDATE creature_template SET VehicleTemplateId = 447, iconName = 'vehichleCursor', faction_A = 6, faction_H = 6, ScriptName = '' WHERE entry IN (35273, 35421);
+
+-- Catapult
+UPDATE creature_template SET VehicleTemplateId = 438, iconName = 'vehichleCursor', faction_A = 35, faction_H = 35, speed_walk = 2.4, speed_run = 2.8, ScriptName = '' WHERE entry in (34793, 35413);
+
+-- Demolisher
+UPDATE creature_template SET VehicleTemplateId = 509, iconName = 'vehichleCursor', faction_A = 35, faction_H = 35, ScriptName = '' WHERE entry IN (34775, 35415);
+
+-- Horde Siege Engine
+UPDATE creature_template SET AIName = 'NullAI' WHERE entry = 35069;
+UPDATE creature_template SET VehicleTemplateId = 435, iconName = 'vehichleCursor', faction_A = 6, faction_H = 6, ScriptName = '' WHERE entry IN (35069, 35433);
+
+-- Ally Siege Engine
+UPDATE creature_template SET AIName = 'NullAI' WHERE entry = 34776;
+UPDATE creature_template SET VehicleTemplateId = 435, iconName = 'vehichleCursor', faction_A = 3, faction_H = 3, ScriptName = '' WHERE entry IN (34776, 35431);
+
+-- Ally/horde Siege Turret
+UPDATE creature_template SET AIName = 'NullAI' WHERE entry IN (34777, 36355);
+UPDATE creature_template SET iconName = 'Gunner', VehicleTemplateId = 436, ScriptName = '' WHERE entry IN (34777, 35436, 36355, 36357);
+
+-- Horde/Ally Flame Turret
+UPDATE creature_template SET AIName = 'NullAI' WHERE entry IN (34778, 36356);
+UPDATE creature_template SET iconName = 'Gunner', VehicleTemplateId = 437, ScriptName = '' WHERE entry IN (34778, 35417, 36356, 36358);
+
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (34929, 34935, 34944, 34793, 34775, 34776, 35069, 34802, 35273, 34778, 36356, 34777, 36355);
+INSERT INTO npc_spellclick_spells (npc_entry, spell_id, quest_start, quest_start_active, quest_end, cast_flags) VALUES
+(34929, 60968, 0, 0, 0, 1),
+(34935, 60968, 0, 0, 0, 1),
+(34944, 60968, 0, 0, 0, 1),
+(34793, 60968, 0, 0, 0, 1),
+(34793, 68362, 0, 0, 0, 3),
+(34775, 60968, 0, 0, 0, 1),
+(34775, 68365, 0, 0, 0, 3),
+(34776, 60968, 0, 0, 0, 1),
+(34776, 68364, 0, 0, 0, 3),
+(35069, 60968, 0, 0, 0, 1),
+(34802, 60968, 0, 0, 0, 1),
+(34802, 68363, 0, 0, 0, 3),
+(35273, 60968, 0, 0, 0, 1),
+(35273, 68363, 0, 0, 0, 3),
+(34778, 60968, 0, 0, 0, 1),
+(36356, 60968, 0, 0, 0, 1),
+(34777, 60968, 0, 0, 0, 1),
+(36355, 60968, 0, 0, 0, 1);
+
+DELETE FROM creature_spell WHERE guid IN (34929, 35410, 34935, 34944, 35429, 34793, 34775, 34776, 35069, 34802, 35273, 34778, 36356, 34777, 36355);
+INSERT INTO creature_spell (guid, spell, `index`) VALUES
+(34929, 69495, 0),
+(34935, 68825, 0),
+(34944, 67452, 0),
+(34944, 68169, 1),
+(34793, 66218, 0),
+(34793, 66296, 1),
+(34775, 67440, 0),
+(34775, 67441, 1),
+(34776, 67816, 0),
+(34776, 69502, 1),
+(35069, 67816, 0),
+(35069, 69502, 1),
+(34802, 66456, 0),
+(34802, 67195, 1),
+(35273, 66456, 0),
+(35273, 67195, 1),
+(34777, 67462, 0),
+(34777, 69505, 1),
+(36355, 67462, 0),
+(36355, 69505, 1);
+
+DELETE FROM creature_spell WHERE guid IN (34778, 36356);
+INSERT INTO creature_spell (guid, spell, `index`) VALUES
+(34778, 66183, 0),
+(34778, 66186, 1),
+(36356, 66183, 0),
+(36356, 66186, 1);
+
+-- /IOC vehicles by /dev/rsa
+
+-- alliance boss
+UPDATE creature_template SET faction_A = 84, faction_H = 84, difficulty_entry_1 = 35403, ScriptName = 'boss_bg_ioc' WHERE entry = 34924;
+-- alli boss guard faction
+UPDATE creature_template SET faction_A = 84, faction_H = 84 WHERE entry = 34919;
+-- horde boss
+UPDATE creature_template SET faction_A = 83, faction_H = 83, difficulty_entry_1 = 35405, ScriptName = 'boss_bg_ioc' WHERE entry = 34922;
+-- horde boss guard faction
+UPDATE creature_template SET faction_A = 83, faction_H = 83 WHERE entry = 34918;
+
+-- make sure doors arent clickable
+UPDATE gameobject_template SET flags = flags | 4 WHERE entry IN (195223,195703,195491,195451,195452,195437,195436);
+
+-- alli flags in keeps
+UPDATE gameobject_template SET faction = 83, flags = 0 WHERE entry IN (195397, 195396, 195392, 195391);
+-- horde flags in keeps
+UPDATE gameobject_template SET faction = 84, flags = 0 WHERE entry IN (195399, 195398, 195394, 195393);
+
+-- Seaforium charges
+UPDATE gameobject_template SET data2 = 1, data4 = 1, data7 = 10 WHERE entry IN (195331, 195235);
+
+-- some people say bombs should be consumed after 3 uses, some say they dont disappear.. Im making them non-consumable
+-- if huge bombs should have 3 charges, type has to be changed to spellcaster too, as goobers dont have charges
+-- bombs in the horde keep
+UPDATE gameobject_template SET faction = 1997, flags = 0, data5 = 0 WHERE entry IN (195333, 195232);
+-- bombs in the alli keep
+UPDATE gameobject_template SET faction = 1995, flags = 0, data5 = 0 WHERE entry IN (195332, 195237);
+
+-- horde teleporters
+UPDATE gameobject_template SET faction = 1995, flags = 0 WHERE entry IN (195313, 195314);
+UPDATE gameobject_template SET faction = 1995 WHERE entry = 195326;
+-- alliance teleporters
+UPDATE gameobject_template SET faction = 1997, flags = 0 WHERE entry IN (195315, 195316);
+UPDATE gameobject_template SET faction = 1997 WHERE entry = 195320;
+
+-- scriptnames
+UPDATE gameobject_template SET ScriptName = '' WHERE entry BETWEEN 195313 AND 195316;
+-- gunship portals
+-- disabled till fixed
+-- UPDATE gameobject_template SET ScriptName = 'go_ic_teleport' WHERE entry IN (195320, 195326);
+
+-- teleports
+DELETE FROM `spell_script_target`WHERE `entry` IN (66550, 66551);
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+('66551', '0', '195313'), -- horde teleporters
+('66550', '0', '195314'),
+('66550', '0', '195315'), -- alliance teleporters
+('66551', '0', '195316');
+
+-- no regeneration buff for vehicles
+DELETE FROM creature_template_addon WHERE entry IN (34929, 34935, 34944, 34793, 34775, 34776, 35069, 34802, 35273, 34778, 36356, 34777, 36355);
+INSERT INTO creature_template_addon (entry, auras) VALUES
+(34929, 52455),
+(34935, 52455),
+(34944, 52455),
+(34793, 52455),
+(34775, 52455),
+(34776, 52455),
+(35069, 52455),
+(34802, 52455),
+(35273, 52455),
+(34778, 52455),
+(36356, 52455),
+(34777, 52455),
+(36355, 52455);
+
+-- Achievements
+DELETE FROM achievement_criteria_requirement WHERE criteria_id IN (11492, 11493, 11494, 11495, 12059, 12066, 12067, 12132, 12163);
+INSERT INTO achievement_criteria_requirement VALUES
+(11492, 6, 4710, 0),  -- Four Car Garage (x4)
+(11493, 6, 4710, 0),
+(11494, 6, 4710, 0),
+(11495, 6, 4710, 0),
+(12059, 6, 4710, 0),  -- Isle of Conquest All-Star
+(12066, 6, 4710, 0),  -- A-bomb-inable
+(12067, 6, 4710, 0),  -- A-bomb-ination
+(12132, 6, 4710, 0),  -- Cut the Blue Wire... No the Red Wire!
+(12163, 6, 4710, 0);  -- Back Door Job
+
+###############################
+-- SPAWNING STATIC OBJECTS
+###############################
+DELETE FROM gameobject WHERE map=628;
+INSERT INTO gameobject (guid, id, map, spawnMask, phaseMask, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state) VALUES
+-- chairs
+(@GAMEOBJECT , 160415 , 628 , 3 , 1 , 1117.19 , -365.674 , 18.8456 , 0.968657 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+1 , 195418 , 628 , 3 , 1 , 632.156 , -304.503 , 5.4879 , 1.15603 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+2 , 195416 , 628 , 3 , 1 , 643.86 , -270.204 , 5.48898 , 2.36903 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+3 , 160410 , 628 , 3 , 1 , 902.234 , -455.508 , 18.3935 , -1.00356 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+4 , 160410 , 628 , 3 , 1 , 1066.19 , -337.214 , 18.8225 , 0.453785 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+5 , 160418 , 628 , 3 , 1 , 810.237 , -461.2 , 25.4627 , 1.5708 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+6 , 160416 , 628 , 3 , 1 , 798.324 , -444.951 , 22.5601 , -1.02102 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+7 , 160416 , 628 , 3 , 1 , 1081.81 , -358.637 , 18.5531 , 1.92859 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+8 , 160419 , 628 , 3 , 1 , 814.931 , -470.816 , 33.6373 , -3.12412 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+9 , 195410 , 628 , 3 , 1 , 632.876 , -282.461 , 5.45364 , -0.851094 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+10 , 195414 , 628 , 3 , 1 , 635.796 , -276.295 , 5.48659 , -3.03273 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+11 , 160415 , 628 , 3 , 1 , 762.245 , -444.795 , 22.8526 , -1.98095 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+-- flagpoles
+(@GAMEOBJECT+12 , 195131 , 628 , 3 , 1 , 1269.5 , -400.809 , 37.6253 , -1.74278 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+13 , 195131 , 628 , 3 , 1 , 726.385 , -360.205 , 17.8153 , -1.6057 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+14 , 195131 , 628 , 3 , 1 , 807.78 , -1000.07 , 132.381 , -1.91986 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+15 , 195131 , 628 , 3 , 1 , 776.229 , -804.283 , 6.45052 , 1.6057 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+16 , 195131 , 628 , 3 , 1 , 251.016 , -1159.32 , 17.2376 , -2.23147 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+17 , 195439 , 628 , 3 , 1 , 1284.76 , -705.668 , 48.9163 , -3.08918 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+18 , 195439 , 628 , 3 , 1 , 299.153 , -784.589 , 48.9162 , -0.157079 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+-- stoves
+(@GAMEOBJECT+19 , 174863 , 628 , 3 , 1 , 903.291 , -457.345 , 18.1356 , 2.23402 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+20 , 174863 , 628 , 3 , 1 , 11068.1 , -336.373 , 18.5647 , -2.59181 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+21 , 160411 , 628 , 3 , 1 , 761.462 , -446.684 , 22.5602 , 0.244344 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+22 , 160411 , 628 , 3 , 1 , 1118.32 , -363.969 , 18.5532 , -3.08918 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+-- bench
+(@GAMEOBJECT+23 , 186896 , 628 , 3 , 1 , 834.208 , -461.826 , 22.3067 , 1.5708 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+24 , 186922 , 628 , 3 , 1 , 826.153 , -461.985 , 22.5149 , 1.5708 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+25 , 186899 , 628 , 3 , 1 , 817.446 , -470.47 , 25.372 , -1.56207 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+26 , 186904 , 628 , 3 , 1 , 827.001 , -474.415 , 25.372 , 1.57952 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+27 , 186897 , 628 , 3 , 1 , 819.264 , -461.961 , 22.7614 , 1.57952 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+-- bonfires
+(@GAMEOBJECT+28 , 195376 , 628 , 3 , 1 , 1162.91 , -734.578 , 48.8948 , -2.9845 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+29 , 195208 , 628 , 3 , 1 , 1282.34 , -799.762 , 87.1357 , -3.13286 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+30 , 195210 , 628 , 3 , 1 , 1358.06 , -732.178 , 87.1606 , -3.13284 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+31 , 195207 , 628 , 3 , 1 , 1281.76 , -732.844 , 87.1574 , -3.13246 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+32 , 195209 , 628 , 3 , 1 , 1358.81 , -797.899 , 87.2953 , 3.13312 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+33 , 195377 , 628 , 3 , 1 , 1162.21 , -790.543 , 48.9162 , 2.27765 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+-- braziers
+(@GAMEOBJECT+34 , 195402 , 628 , 3 , 1 , 1262.21 , -751.358 , 48.8133 , 2.26893 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+35 , 195403 , 628 , 3 , 1 , 1262.58 , -781.861 , 48.8132 , 2.04203 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+36 , 195425 , 628 , 3 , 1 , 223.818 , -839.352 , 60.7917 , 1.09083 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+37 , 195424 , 628 , 3 , 1 , 224.277 , -822.77 , 60.7917 , 2.06822 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+-- huge seaforium bombs
+(@GAMEOBJECT+38 , 195332 , 628 , 3 , 1 , 297.321 , -851.321 , 48.9163 , -0.942477 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+39 , 195332 , 628 , 3 , 1 , 298.104 , -861.026 , 48.9163 , -2.75761 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+40 , 195332 , 628 , 3 , 1 , 300.372 , -818.733 , 48.9162 , 0.785397 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+41 , 195332 , 628 , 3 , 1 , 302.135 , -810.708 , 48.9162 , -1.0472 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+42 , 195333 , 628 , 3 , 1 , 1268.31 , -745.783 , 48.9188 , 0.785397 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+43 , 195333 , 628 , 3 , 1 , 1268.51 , -738.122 , 48.9175 , -1.0472 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+44 , 195333 , 628 , 3 , 1 , 1273.07 , -786.573 , 48.9419 , -0.942477 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+45 , 195333 , 628 , 3 , 1 , 1273.85 , -796.278 , 48.9364 , -2.75761 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+
+###############################
+-- DYNAMIC OBJECTS
+###############################
+
+-- BANNERS, order:
+--  contested
+--  alli in conflict
+--  horde in conflict
+--  alli owned
+--  horde owned
+
+-- docks
+(@GAMEOBJECT+46 , 195157 , 628 , 3 , 1 , 726.385 , -360.205 , 17.8153 , -1.62316 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+47 , 180059 , 628 , 3 , 1 , 726.385 , -360.205 , 17.8153 , -1.62316 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+48 , 180061 , 628 , 3 , 1 , 726.385 , -360.205 , 17.8153 , -1.62316 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+49 , 180058 , 628 , 3 , 1 , 726.385 , -360.205 , 17.8153 , -1.62316 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+50 , 180060 , 628 , 3 , 1 , 726.385 , -360.205 , 17.8153 , -1.62316 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+-- hangar
+(@GAMEOBJECT+51 , 195158 , 628 , 3 , 1 , 807.78 , -1000.07 , 132.381 , -1.93732 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+52 , 180059 , 628 , 3 , 1 , 807.78 , -1000.07 , 132.381 , -1.93732 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+53 , 180061 , 628 , 3 , 1 , 807.78 , -1000.07 , 132.381 , -1.93732 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+54 , 180058 , 628 , 3 , 1 , 807.78 , -1000.07 , 132.381 , -1.93732 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+55 , 180060 , 628 , 3 , 1 , 807.78 , -1000.07 , 132.381 , -1.93732 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+-- workshop
+(@GAMEOBJECT+56 , 195133 , 628 , 3 , 1 , 776.229 , -804.283 , 6.45052 , 1.6057 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+57 , 180059 , 628 , 3 , 1 , 776.229 , -804.283 , 6.45052 , 1.6057 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+58 , 180061 , 628 , 3 , 1 , 776.229 , -804.283 , 6.45052 , 1.6057 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+59 , 180058 , 628 , 3 , 1 , 776.229 , -804.283 , 6.45052 , 1.6057 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+60 , 180060 , 628 , 3 , 1 , 776.229 , -804.283 , 6.45052 , 1.6057 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+-- quarry
+(@GAMEOBJECT+61 , 195338 , 628 , 3 , 1 , 251.016 , -1159.32 , 17.2376 , -2.25147 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+62 , 180059 , 628 , 3 , 1 , 251.016 , -1159.32 , 17.2376 , -2.25147 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+63 , 180061 , 628 , 3 , 1 , 251.016 , -1159.32 , 17.2376 , -2.25147 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+64 , 180058 , 628 , 3 , 1 , 251.016 , -1159.32 , 17.2376 , -2.25147 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+65 , 180060 , 628 , 3 , 1 , 251.016 , -1159.32 , 17.2376 , -2.25147 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+-- refinery
+(@GAMEOBJECT+66 , 195343 , 628 , 3 , 1 , 1269.5 , -400.809 , 37.6253 , -1.76278 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+67 , 180059 , 628 , 3 , 1 , 1269.5 , -400.809 , 37.6253 , -1.76278 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+68 , 180061 , 628 , 3 , 1 , 1269.5 , -400.809 , 37.6253 , -1.76278 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+69 , 180058 , 628 , 3 , 1 , 1269.5 , -400.809 , 37.6253 , -1.76278 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+70 , 180060 , 628 , 3 , 1 , 1269.5 , -400.809 , 37.6253 , -1.76278 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+
+-- Keeps
+--  alli contested
+--  horde contested
+--  alli owned
+--  horde owned
+-- Alli keep
+(@GAMEOBJECT+71 , 195397 , 628 , 3 , 1 , 299.153 , -784.589 , 48.9162 , -0.157079 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+72 , 195399 , 628 , 3 , 1 , 299.153 , -784.589 , 48.9162 , -0.157079 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+73 , 195396 , 628 , 3 , 1 , 299.153 , -784.589 , 48.9162 , -0.157079 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+74 , 195398 , 628 , 3 , 1 , 299.153 , -784.589 , 48.9162 , -0.157079 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+-- Horde keep
+(@GAMEOBJECT+75 , 195392 , 628 , 3 , 1 , 1284.76 , -705.668 , 48.9163 , -3.08918 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+76 , 195394 , 628 , 3 , 1 , 1284.76 , -705.668 , 48.9163 , -3.08918 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+77 , 195391 , 628 , 3 , 1 , 1284.76 , -705.668 , 48.9163 , -3.08918 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+78 , 195393 , 628 , 3 , 1 , 1284.76 , -705.668 , 48.9163 , -3.08918 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+
+-- banner auras
+(@GAMEOBJECT+79 , 180100 , 628 , 3 , 1 , 726.385 , -360.205 , 17.8153 , -1.62316 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+80 , 180101 , 628 , 3 , 1 , 726.385 , -360.205 , 17.8153 , -1.62316 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+81 , 180102 , 628 , 3 , 1 , 726.385 , -360.205 , 17.8153 , -1.62316 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+
+(@GAMEOBJECT+82 , 180100 , 628 , 3 , 1 , 807.78 , -1000.07 , 132.381 , -1.93732 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+83 , 180101 , 628 , 3 , 1 , 807.78 , -1000.07 , 132.381 , -1.93732 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+84 , 180102 , 628 , 3 , 1 , 807.78 , -1000.07 , 132.381 , -1.93732 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+
+(@GAMEOBJECT+85 , 180100 , 628 , 3 , 1 , 776.229 , -804.283 , 6.45052 , 1.6057 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+86 , 180101 , 628 , 3 , 1 , 776.229 , -804.283 , 6.45052 , 1.6057 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+87 , 180102 , 628 , 3 , 1 , 776.229 , -804.283 , 6.45052 , 1.6057 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+
+(@GAMEOBJECT+88 , 180100 , 628 , 3 , 1 , 251.016 , -1159.32 , 17.2376 , -2.25147 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+89 , 180101 , 628 , 3 , 1 , 251.016 , -1159.32 , 17.2376 , -2.25147 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+90 , 180102 , 628 , 3 , 1 , 251.016 , -1159.32 , 17.2376 , -2.25147 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+
+(@GAMEOBJECT+91 , 180100 , 628 , 3 , 1 , 1269.5 , -400.809 , 37.6253 , -1.76278 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+92 , 180101 , 628 , 3 , 1 , 1269.5 , -400.809 , 37.6253 , -1.76278 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+93 , 180102 , 628 , 3 , 1 , 1269.5 , -400.809 , 37.6253 , -1.76278 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+
+(@GAMEOBJECT+94 , 180100 , 628 , 3 , 1 , 299.153 , -784.589 , 48.9162 , -0.157079 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+95 , 180101 , 628 , 3 , 1 , 299.153 , -784.589 , 48.9162 , -0.157079 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+
+(@GAMEOBJECT+96 , 180100 , 628 , 3 , 1 , 1284.76 , -705.668 , 48.9163 , -3.08918 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+97 , 180101 , 628 , 3 , 1 , 1284.76 , -705.668 , 48.9163 , -3.08918 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+
+-- tower portcullisses
+(@GAMEOBJECT+98 , 195436 , 628 , 3 , 1 , 401.024 , -780.724 , 49.9482 , -2.52896 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+99 , 195436 , 628 , 3 , 1 , 399.802 , -885.208 , 50.1939 , 2.516 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+100 , 195437 , 628 , 3 , 1 , 1156.89 , -843.998 , 48.6322 , 0.732934 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+101 , 195437 , 628 , 3 , 1 , 1157.05 , -682.36 , 48.6322 , -0.829132 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+-- keep portcullisses
+(@GAMEOBJECT+102 , 195452 , 628 , 3 , 1 , 273.033 , -832.199 , 51.4109 , -0.0261791 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+103 , 195451 , 628 , 3 , 1 , 288.203 , -832.767 , 51.4681 , 6.24156 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+104 , 195223 , 628 , 3 , 1 , 1283.05 , -765.878 , 50.8297 , -3.13286 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+-- teleports
+(@GAMEOBJECT+105 , 195315 , 628 , 3 , 1 , 324.635 , -749.128 , 49.3602 , 0.0174525 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+106 , 195315 , 628 , 3 , 1 , 311.92 , -913.972 , 48.8159 , 3.08918 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+107 , 195315 , 628 , 3 , 1 , 425.675 , -857.09 , 48.5104 , -1.6057 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+108 , 195316 , 628 , 3 , 1 , 323.54 , -888.361 , 48.9197 , 0.0349063 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+109 , 195316 , 628 , 3 , 1 , 326.285 , -777.366 , 49.0208 , 3.12412 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+110 , 195316 , 628 , 3 , 1 , 397.089 , -859.382 , 48.8993 , 1.64061 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+111 , 195314 , 628 , 3 , 1 , 1143.25 , -779.599 , 48.629 , 1.64061 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+112 , 195314 , 628 , 3 , 1 , 1236.53 , -669.415 , 48.2729 , 0.104719 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+113 , 195314 , 628 , 3 , 1 , 1235.09 , -857.898 , 48.9163 , 3.07177 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+114 , 195313 , 628 , 3 , 1 , 1233.27 , -844.526 , 48.8824 , -0.0174525 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+115 , 195313 , 628 , 3 , 1 , 1235.53 , -683.872 , 49.304 , -3.08918 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+116 , 195313 , 628 , 3 , 1 , 1158.76 , -746.182 , 48.6277 , -1.51844 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+-- teleport effects
+(@GAMEOBJECT+117 , 195701 , 628 , 3 , 1 , 425.686 , -857.092 , 48.51 , -1.62316 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+118 , 195701 , 628 , 3 , 1 , 324.634 , -749.148 , 49.359 , 0.0174525 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+119 , 195701 , 628 , 3 , 1 , 311.911 , -913.986 , 48.8157 , 3.08918 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+120 , 195701 , 628 , 3 , 1 , 326.266 , -777.347 , 49.0215 , 3.12412 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+121 , 195701 , 628 , 3 , 1 , 323.55 , -888.347 , 48.9198 , 0.0174525 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+122 , 195701 , 628 , 3 , 1 , 397.116 , -859.378 , 48.8989 , 1.64061 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+123 , 195702 , 628 , 3 , 1 , 1143.25 , -779.623 , 48.6291 , 1.62316 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+124 , 195702 , 628 , 3 , 1 , 1158.64 , -746.148 , 48.6277 , -1.50098 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+125 , 195702 , 628 , 3 , 1 , 1233.25 , -844.573 , 48.8836 , 0.0174525 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+126 , 195702 , 628 , 3 , 1 , 1235.07 , -857.957 , 48.9163 , 3.05433 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+127 , 195702 , 628 , 3 , 1 , 1236.46 , -669.344 , 48.2684 , 0.087266 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+(@GAMEOBJECT+128 , 195702 , 628 , 3 , 1 , 1235.6 , -683.806 , 49.3028 , -3.07177 , 0 , 0 , 0 , 0 , 0 , 0 , 1),
+-- gunship portals
+(@GAMEOBJECT+129 , 195320 , 628 , 3 , 1 , 827.958 , -994.467 , 134.071 , 0 , 0 , 0 , 0 , 0 , 0 , 0, 0),
+(@GAMEOBJECT+130 , 195320 , 628 , 3 , 1 , 738.613 , -1106.58 , 134.745 , 2.54818 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+131 , 195320 , 628 , 3 , 1 , 672.283 , -1156.99 , 133.706 , 1.37881 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+132 , 195326 , 628 , 3 , 1 , 827.958 , -994.467 , 134.071 , 0 , 0 , 0 , 0 , 0 , 0 , 0, 0),
+(@GAMEOBJECT+133 , 195326 , 628 , 3 , 1 , 738.613 , -1106.58 , 134.745 , 2.54818 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+(@GAMEOBJECT+134 , 195326 , 628 , 3 , 1 , 672.283 , -1156.99 , 133.706 , 1.37881 , 0 , 0 , 0 , 0 , 0 , 0 , 0),
+-- seaforium bombs
+(@GAMEOBJECT+135 , 195232 , 628 , 3 , 1 , 750.601 , -864.597 , 13.4754 , 1.93731 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+136 , 195232 , 628 , 3 , 1 , 785.509 , -864.715 , 13.3993 , 2.47837 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+137 , 195237 , 628 , 3 , 1 , 750.601 , -864.597 , 13.4754 , 1.93731 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+138 , 195237 , 628 , 3 , 1 , 785.509 , -864.715 , 13.3993 , 2.47837 , 0 , 0 , 0 , 0 , 10 , 0 , 0);
+
+DELETE FROM gameobject_battleground WHERE guid IN (SELECT guid FROM gameobject WHERE map=628);
+INSERT INTO gameobject_battleground (guid, event1, event2) VALUES
+(@GAMEOBJECT+46 , 0 , 0),
+(@GAMEOBJECT+47 , 0 , 1),
+(@GAMEOBJECT+48 , 0 , 2),
+(@GAMEOBJECT+49 , 0 , 3),
+(@GAMEOBJECT+50 , 0 , 4),
+(@GAMEOBJECT+51 , 1 , 0),
+(@GAMEOBJECT+52 , 1 , 1),
+(@GAMEOBJECT+53 , 1 , 2),
+(@GAMEOBJECT+54 , 1 , 3),
+(@GAMEOBJECT+55 , 1 , 4),
+(@GAMEOBJECT+56 , 2 , 0),
+(@GAMEOBJECT+57 , 2 , 1),
+(@GAMEOBJECT+58 , 2 , 2),
+(@GAMEOBJECT+59 , 2 , 3),
+(@GAMEOBJECT+60 , 2 , 4),
+(@GAMEOBJECT+61 , 3 , 0),
+(@GAMEOBJECT+62 , 3 , 1),
+(@GAMEOBJECT+63 , 3 , 2),
+(@GAMEOBJECT+64 , 3 , 3),
+(@GAMEOBJECT+65 , 3 , 4),
+(@GAMEOBJECT+66 , 4 , 0),
+(@GAMEOBJECT+67 , 4 , 1),
+(@GAMEOBJECT+68 , 4 , 2),
+(@GAMEOBJECT+69 , 4 , 3),
+(@GAMEOBJECT+70 , 4 , 4),
+(@GAMEOBJECT+71 , 5 , 1),
+(@GAMEOBJECT+72 , 5 , 2),
+(@GAMEOBJECT+73 , 5 , 3),
+(@GAMEOBJECT+74 , 5 , 4),
+(@GAMEOBJECT+75 , 6 , 1),
+(@GAMEOBJECT+76 , 6 , 2),
+(@GAMEOBJECT+77 , 6 , 3),
+(@GAMEOBJECT+78 , 6 , 4),
+(@GAMEOBJECT+79 , 0 , 3),
+(@GAMEOBJECT+80 , 0 , 4),
+(@GAMEOBJECT+81 , 0 , 0),
+(@GAMEOBJECT+82 , 1 , 3),
+(@GAMEOBJECT+83 , 1 , 4),
+(@GAMEOBJECT+84 , 1 , 0),
+(@GAMEOBJECT+85 , 2 , 3),
+(@GAMEOBJECT+86 , 2 , 4),
+(@GAMEOBJECT+87 , 2 , 0),
+(@GAMEOBJECT+88 , 3 , 3),
+(@GAMEOBJECT+89 , 3 , 4),
+(@GAMEOBJECT+90 , 3 , 0),
+(@GAMEOBJECT+91 , 4 , 3),
+(@GAMEOBJECT+92 , 4 , 4),
+(@GAMEOBJECT+93 , 4 , 0),
+(@GAMEOBJECT+94 , 5 , 3),
+(@GAMEOBJECT+95 , 5 , 4),
+(@GAMEOBJECT+96 , 6 , 3),
+(@GAMEOBJECT+97 , 6 , 4),
+(@GAMEOBJECT+98 , 254 , 0),
+(@GAMEOBJECT+99 , 254 , 0),
+(@GAMEOBJECT+100 , 254 , 0),
+(@GAMEOBJECT+101 , 254 , 0),
+(@GAMEOBJECT+102 , 251 , 0),
+(@GAMEOBJECT+103 , 251 , 0),
+(@GAMEOBJECT+104 , 252 , 0),
+(@GAMEOBJECT+105 , 7 , 0),
+(@GAMEOBJECT+106 , 7 , 0),
+(@GAMEOBJECT+107 , 7 , 0),
+(@GAMEOBJECT+108 , 7 , 0),
+(@GAMEOBJECT+109 , 7 , 0),
+(@GAMEOBJECT+110 , 7 , 0),
+(@GAMEOBJECT+111 , 7 , 0),
+(@GAMEOBJECT+112 , 7 , 0),
+(@GAMEOBJECT+113 , 7 , 0),
+(@GAMEOBJECT+114 , 7 , 0),
+(@GAMEOBJECT+115 , 7 , 0),
+(@GAMEOBJECT+116 , 7 , 0),
+(@GAMEOBJECT+117 , 254 , 0),
+(@GAMEOBJECT+118 , 254 , 0),
+(@GAMEOBJECT+119 , 254 , 0),
+(@GAMEOBJECT+120 , 254 , 0),
+(@GAMEOBJECT+121 , 254 , 0),
+(@GAMEOBJECT+122 , 254 , 0),
+(@GAMEOBJECT+123 , 254 , 0),
+(@GAMEOBJECT+124 , 254 , 0),
+(@GAMEOBJECT+125 , 254 , 0),
+(@GAMEOBJECT+126 , 254 , 0),
+(@GAMEOBJECT+127 , 254 , 0),
+(@GAMEOBJECT+128 , 254 , 0),
+(@GAMEOBJECT+129 , 1 , 3),
+(@GAMEOBJECT+130 , 1 , 3),
+(@GAMEOBJECT+131 , 1 , 3),
+(@GAMEOBJECT+132 , 1 , 4),
+(@GAMEOBJECT+133 , 1 , 4),
+(@GAMEOBJECT+134 , 1 , 4),
+(@GAMEOBJECT+135 , 2 , 3),
+(@GAMEOBJECT+136 , 2 , 3),
+(@GAMEOBJECT+137 , 2 , 4),
+(@GAMEOBJECT+138 , 2 , 4);
+
+DELETE FROM battleground_events WHERE map = 628;
+INSERT INTO battleground_events (map, event1, event2, description) VALUES
+(628, 0, 0, 'Dock - Neutral'),
+(628, 0, 1, 'Dock - Alliance contested'),
+(628, 0, 2, 'Dock - Horde contested'),
+(628, 0, 3, 'Dock - Alliance owned'),
+(628, 0, 4, 'Dock - Horde owned'),
+(628, 1, 0, 'Hangar - Neutral'),
+(628, 1, 1, 'Hangar - Alliance contested'),
+(628, 1, 2, 'Hangar - Horde contested'),
+(628, 1, 3, 'Hangar - Alliance owned'),
+(628, 1, 4, 'Hangar - Horde owned'),
+(628, 2, 0, 'Workshop - Neutral'),
+(628, 2, 1, 'Workshop - Alliance contested'),
+(628, 2, 2, 'Workshop - Horde contested'),
+(628, 2, 3, 'Workshop - Alliance owned'),
+(628, 2, 4, 'Workshop - Horde owned'),
+(628, 3, 0, 'Quarry - Neutral'),
+(628, 3, 1, 'Quarry - Alliance contested'),
+(628, 3, 2, 'Quarry - Horde contested'),
+(628, 3, 3, 'Quarry - Alliance owned'),
+(628, 3, 4, 'Quarry - Horde owned'),
+(628, 4, 0, 'Refinery - Neutral'),
+(628, 4, 1, 'Refinery - Alliance contested'),
+(628, 4, 2, 'Refinery - Horde contested'),
+(628, 4, 3, 'Refinery - Alliance owned'),
+(628, 4, 4, 'Refinery - Horde owned'),
+(628, 5, 1, 'Alli keep - Alliance contested'),
+(628, 5, 2, 'Alli keep - Horde contested'),
+(628, 5, 3, 'Alli keep - Alliance owned'),
+(628, 5, 4, 'Alli keep - Horde owned'),
+(628, 6, 1, 'Horde keep - Alliance contested'),
+(628, 6, 2, 'Horde keep - Horde contested'),
+(628, 6, 3, 'Horde keep - Alliance owned'),
+(628, 6, 4, 'Horde keep - Horde owned'),
+(628, 7, 0, 'Base teleport spawn'),
+(628, 8, 0, 'Npcs'),
+(628, 9, 0, 'Alli Boss guards'),
+(628, 10, 0, 'Horde Boss guards'),
+(628, 11, 0, 'Alli Boss'),
+(628, 12, 0, 'Horde Boss'),
+(628, 251, 0, 'Alli Boss gate'),
+(628, 252, 0, 'Horde Boss gate'),
+(628, 254, 0, 'Door');
+
+################################################################
+-- DYNAMIC CREATURES
+################################################################
+DELETE FROM creature WHERE map=628;
+INSERT INTO creature (guid, id, map, spawnMask, phaseMask, modelid, equipment_id, position_x, position_y, position_z, orientation, spawntimesecs, spawndist, currentwaypoint, curhealth, curmana, DeathState, MovementType) VALUES
+-- workshop siege engines
+(@CREATURE, 34776, 628, 3, 1, 0, 0, 773.680542, -884.092041, 16.8090363, 1.58824956, 180000, 0, 0, 250000, 0, 0, 0),
+(@CREATURE+1, 35069, 628, 3, 1, 0, 0, 773.680542, -884.092041, 16.8090363, 1.58824956, 180000, 0, 0, 250000, 0, 0, 0),
+-- workshop demolishers
+(@CREATURE+2, 34775, 628, 3, 1, 0, 0, 751.8281, -852.732666, 12.5250978, 1.46607661, 180000, 0, 0, 70000, 0, 0, 0),
+(@CREATURE+3, 34775, 628, 3, 1, 0, 0, 761.809, -854.2274, 12.5263243, 1.46607661, 180000, 0, 0, 70000, 0, 0, 0),
+(@CREATURE+4, 34775, 628, 3, 1, 0, 0, 783.4722, -853.9601, 12.54775, 1.71042264, 180000, 0, 0, 70000, 0, 0, 0),
+(@CREATURE+5, 34775, 628, 3, 1, 0, 0, 793.055542, -852.71875, 12.5671329, 1.71042264, 180000, 0, 0, 70000, 0, 0, 0),
+(@CREATURE+6, 34775, 628, 3, 1, 0, 0, 751.8281, -852.732666, 12.5250978, 1.46607661, 180000, 0, 0, 70000, 0, 0, 0),
+(@CREATURE+7, 34775, 628, 3, 1, 0, 0, 761.809, -854.2274, 12.5263243, 1.46607661, 180000, 0, 0, 70000, 0, 0, 0),
+(@CREATURE+8, 34775, 628, 3, 1, 0, 0, 783.4722, -853.9601, 12.54775, 1.71042264, 180000, 0, 0, 70000, 0, 0, 0),
+(@CREATURE+9, 34775, 628, 3, 1, 0, 0, 793.055542, -852.71875, 12.5671329, 1.71042264, 180000, 0, 0, 70000, 0, 0, 0),
+-- dock glaive throwers
+(@CREATURE+10, 34802, 628, 3, 1, 0, 0, 779.3125, -342.972229, 12.2104874, 4.712389, 180000, 0, 0, 50000, 0, 0, 0),
+(@CREATURE+11, 34802, 628, 3, 1, 0, 0, 790.029541, -342.899323, 12.2128582, 4.71238, 180000, 0, 0, 50000, 0, 0, 0),
+(@CREATURE+12, 35273, 628, 3, 1, 0, 0, 779.3125, -342.972229, 12.2104874, 4.712389, 180000, 0, 0, 50000, 0, 0, 0),
+(@CREATURE+13, 35273, 628, 3, 1, 0, 0, 790.029541, -342.899323, 12.2128582, 4.71238, 180000, 0, 0, 50000, 0, 0, 0),
+-- dock catapults
+(@CREATURE+14, 34793, 628, 3, 1, 0, 0, 757.283, -341.7795, 12.2113762, 4.729842, 180000, 0, 0, 15000, 0, 0, 0),
+(@CREATURE+15, 34793, 628, 3, 1, 0, 0, 766.947937, -342.053833, 12.2009945, 4.694, 180000, 0, 0, 15000, 0, 0, 0),
+(@CREATURE+16, 34793, 628, 3, 1, 0, 0, 800.3785, -342.607635, 12.1669979, 4.6774, 180000, 0, 0, 15000, 0, 0, 0),
+(@CREATURE+17, 34793, 628, 3, 1, 0, 0, 810.7257, -342.083344, 12.1675768, 4.6600, 180000, 0, 0, 15000, 0, 0, 0),
+(@CREATURE+18, 34793, 628, 3, 1, 0, 0, 757.283, -341.7795, 12.2113762, 4.729842, 180000, 0, 0, 15000, 0, 0, 0),
+(@CREATURE+19, 34793, 628, 3, 1, 0, 0, 766.947937, -342.053833, 12.2009945, 4.694, 180000, 0, 0, 15000, 0, 0, 0),
+(@CREATURE+20, 34793, 628, 3, 1, 0, 0, 800.3785, -342.607635, 12.1669979, 4.6774, 180000, 0, 0, 15000, 0, 0, 0),
+(@CREATURE+21, 34793, 628, 3, 1, 0, 0, 810.7257, -342.083344, 12.1675768, 4.6600, 180000, 0, 0, 15000, 0, 0, 0),
+-- spirit guides (alli - docks, hangar, workshop, alli keep, horde keep, alli rescue point)
+(@CREATURE+22, 13116, 628, 3, 1, 0, 0, 629.57, -279.83, 11.33, 0.0, 10, 0, 0, 24420, 4868, 0, 0),
+(@CREATURE+23, 13116, 628, 3, 1, 0, 0, 780.729, -1103.08, 135.51, 2.27, 10, 0, 0, 24420, 4868, 0, 0),
+(@CREATURE+24, 13116, 628, 3, 1, 0, 0, 775.74, -652.77, 9.31, 4.27, 10, 0, 0, 24420, 4868, 0, 0),
+(@CREATURE+25, 13116, 628, 3, 1, 0, 0, 278.42, -883.20, 49.89, 1.53, 10, 0, 0, 24420, 4868, 0, 0),
+(@CREATURE+26, 13116, 628, 3, 1, 0, 0, 1300.91, -834.04, 48.91, 1.69, 10, 0, 0, 24420, 4868, 0, 0),
+(@CREATURE+27, 13116, 628, 3, 1, 0, 0, 438.86, -310.04, 51.81, 5.87, 10, 0, 0, 24420, 4868, 0, 0),
+-- spirit guides (horde - docks, hangar, workshop, horde keep, alli keep, horde rescue point)
+(@CREATURE+28, 13117, 628, 3, 1, 0, 0, 629.57, -279.83, 11.33, 0.0, 10, 0, 0, 24420, 4868, 0, 0),
+(@CREATURE+29, 13117, 628, 3, 1, 0, 0, 780.729, -1103.08, 135.51, 2.27, 10, 0, 0, 24420, 4868, 0, 0),
+(@CREATURE+30, 13117, 628, 3, 1, 0, 0, 775.74, -652.77, 9.31, 4.27, 10, 0, 0, 24420, 4868, 0, 0),
+(@CREATURE+31, 13117, 628, 3, 1, 0, 0, 1300.91, -834.04, 48.91, 1.69, 10, 0, 0, 24420, 4868, 0, 0),
+(@CREATURE+32, 13117, 628, 3, 1, 0, 0, 278.42, -883.20, 49.89, 1.53, 10, 0, 0, 24420, 4868, 0, 0),
+(@CREATURE+33, 13117, 628, 3, 1, 0, 0, 1148.65, -1250.98, 16.60, 1.74, 10, 0, 0, 24420, 4868, 0, 0),
+-- bosses (horde, alli)
+(@CREATURE+34, 34922, 628, 3, 1, 0, 0, 1295.44, -765.733, 70.0541, 0.0, 864000, 0, 0, 600001, 0, 0, 0),
+(@CREATURE+35, 34924, 628, 3, 1, 0, 0, 224.983, -831.573, 60.9034, 0.0, 864000, 0, 0, 600001, 0, 0, 0),
+-- boss guards (4x horde, 4x alli)
+(@CREATURE+36, 34918, 628, 3, 1, 0, 0, 1296.01, -773.256, 69.958, 0.292168, 180000, 0, 0, 4608, 0, 0, 0),
+(@CREATURE+37, 34918, 628, 3, 1, 0, 0, 1295.94, -757.756, 69.9587, 6.02165, 180000, 0, 0, 4608, 0, 0, 0),
+(@CREATURE+38, 34918, 628, 3, 1, 0, 0, 1295.09, -760.927, 69.9587, 5.94311, 180000, 0, 0, 4608, 0, 0, 0),
+(@CREATURE+39, 34918, 628, 3, 1, 0, 0, 1295.13, -769.7, 69.95, 0.34, 180000, 0, 0, 4608, 0, 0, 0),
+(@CREATURE+40, 34919, 628, 3, 1, 0, 0, 223.969, -822.958, 60.8151, 0.46337, 180000, 0, 0, 4608, 0, 0, 0),
+(@CREATURE+41, 34919, 628, 3, 1, 0, 0, 224.211, -826.952, 60.8188, 6.25961, 180000, 0, 0, 4608, 0, 0, 0),
+(@CREATURE+42, 34919, 628, 3, 1, 0, 0, 223.119, -838.386, 60.8145, 5.64857, 180000, 0, 0, 4608, 0, 0, 0),
+(@CREATURE+43, 34919, 628, 3, 1, 0, 0, 223.889, -835.102, 60.8201, 6.21642, 180000, 0, 0, 4608, 0, 0, 0),
+-- keep cannons
+(@CREATURE+44, 34944, 628, 3, 1, 0, 0, 415.825, -754.634, 87.799, 1.78024, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+45, 34944, 628, 3, 1, 0, 0, 410.142, -755.332, 87.7991, 1.78024, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+46, 34944, 628, 3, 1, 0, 0, 424.33, -879.352, 88.0446, 0.436332, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+47, 34944, 628, 3, 1, 0, 0, 425.602, -786.646, 87.7991, 5.74213, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+48, 34944, 628, 3, 1, 0, 0, 426.743, -884.939, 87.9613, 0.436332, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+49, 34944, 628, 3, 1, 0, 0, 404.736, -755.495, 87.7989, 1.78024, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+50, 34944, 628, 3, 1, 0, 0, 428.375, -780.797, 87.7991, 5.79449, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+51, 34944, 628, 3, 1, 0, 0, 429.175, -890.436, 88.0446, 0.436332, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+52, 34944, 628, 3, 1, 0, 0, 430.872, -775.278, 87.7991, 5.88176, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+53, 34944, 628, 3, 1, 0, 0, 408.056, -911.283, 88.0445, 4.64258, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+54, 34944, 628, 3, 1, 0, 0, 413.609, -911.566, 88.0447, 4.66003, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+55, 34944, 628, 3, 1, 0, 0, 402.554, -910.557, 88.0446, 4.57276, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+56, 34944, 628, 3, 1, 0, 0, 1158.91, -660.144, 87.9332, 0.750492, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+57, 34944, 628, 3, 1, 0, 0, 1156.22, -866.809, 87.8754, 5.27089, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+58, 34944, 628, 3, 1, 0, 0, 1163.74, -663.67, 88.3571, 0.558505, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+59, 34944, 628, 3, 1, 0, 0, 1135.18, -683.896, 88.0409, 3.9619, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+60, 34944, 628, 3, 1, 0, 0, 1138.91, -836.359, 88.3728, 2.18166, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+61, 34944, 628, 3, 1, 0, 0, 1162.08, -863.717, 88.358, 5.48033, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+62, 34944, 628, 3, 1, 0, 0, 1167.13, -669.212, 87.9682, 0.383972, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+63, 34944, 628, 3, 1, 0, 0, 1137.72, -688.517, 88.4023, 3.9619, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+64, 34944, 628, 3, 1, 0, 0, 1135.29, -840.878, 88.0252, 2.30383, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+65, 34944, 628, 3, 1, 0, 0, 1144.33, -833.309, 87.9268, 2.14675, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+66, 34944, 628, 3, 1, 0, 0, 1135.29, -840.878, 88.0252, 2.30383, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+67, 34944, 628, 3, 1, 0, 0, 1142.59, -691.946, 87.9756, 3.9619, 180000, 0, 0, 35000, 0, 0, 0),
+(@CREATURE+68, 34944, 628, 3, 1, 0, 0, 1166.13, -858.391, 87.9653, 5.63741, 180000, 0, 0, 35000, 0, 0, 0);
+
+DELETE FROM creature_battleground WHERE guid IN (SELECT guid FROM creature WHERE map=628);
+INSERT INTO creature_battleground (guid, event1, event2) VALUES
+-- siege engines
+(@CREATURE , 2 , 3),
+(@CREATURE+1 , 2 , 4),
+-- demolishers
+(@CREATURE+2 , 2 , 3),
+(@CREATURE+3 , 2 , 3),
+(@CREATURE+4 , 2 , 3),
+(@CREATURE+5 , 2 , 3),
+(@CREATURE+6 , 2 , 4),
+(@CREATURE+7 , 2 , 4),
+(@CREATURE+8 , 2 , 4),
+(@CREATURE+9 , 2 , 4),
+-- glaive throwers
+(@CREATURE+10 , 0 , 3),
+(@CREATURE+11 , 0 , 3),
+(@CREATURE+12 , 0 , 4),
+(@CREATURE+13 , 0 , 4),
+-- catapults
+(@CREATURE+14 , 0 , 3),
+(@CREATURE+15 , 0 , 3),
+(@CREATURE+16 , 0 , 3),
+(@CREATURE+17 , 0 , 3),
+(@CREATURE+18 , 0 , 4),
+(@CREATURE+19 , 0 , 4),
+(@CREATURE+20 , 0 , 4),
+(@CREATURE+21 , 0 , 4),
+-- spirit guides
+(@CREATURE+22 , 0 , 3),
+(@CREATURE+23 , 1 , 3),
+(@CREATURE+24 , 2 , 3),
+(@CREATURE+25 , 5 , 3),
+(@CREATURE+26 , 6 , 3),
+(@CREATURE+28 , 0 , 4),
+(@CREATURE+29 , 1 , 4),
+(@CREATURE+30 , 2 , 4),
+(@CREATURE+31 , 5 , 4),
+(@CREATURE+32 , 6 , 4),
+-- bosses
+(@CREATURE+34 , 12 , 0),
+(@CREATURE+35 , 11 , 0),
+-- boss guards
+(@CREATURE+36 , 10 , 0),
+(@CREATURE+37 , 10 , 0),
+(@CREATURE+38 , 10 , 0),
+(@CREATURE+39 , 10 , 0),
+(@CREATURE+40 , 9 , 0),
+(@CREATURE+41 , 9 , 0),
+(@CREATURE+42 , 9 , 0),
+(@CREATURE+43 , 9 , 0),
+-- keep cannons
+(@CREATURE+44 , 8 , 0),
+(@CREATURE+45 , 8 , 0),
+(@CREATURE+46 , 8 , 0),
+(@CREATURE+47 , 8 , 0),
+(@CREATURE+48 , 8 , 0),
+(@CREATURE+49 , 8 , 0),
+(@CREATURE+50 , 8 , 0),
+(@CREATURE+51 , 8 , 0),
+(@CREATURE+52 , 8 , 0),
+(@CREATURE+53 , 8 , 0),
+(@CREATURE+54 , 8 , 0),
+(@CREATURE+55 , 8 , 0),
+(@CREATURE+56 , 8 , 0),
+(@CREATURE+57 , 8 , 0),
+(@CREATURE+58 , 8 , 0),
+(@CREATURE+59 , 8 , 0),
+(@CREATURE+60 , 8 , 0),
+(@CREATURE+61 , 8 , 0),
+(@CREATURE+62 , 8 , 0),
+(@CREATURE+63 , 8 , 0),
+(@CREATURE+64 , 8 , 0),
+(@CREATURE+65 , 8 , 0),
+(@CREATURE+66 , 8 , 0),
+(@CREATURE+67 , 8 , 0),
+(@CREATURE+68 , 8 , 0);
+
+DELETE FROM achievement_criteria_requirement WHERE criteria_id IN (12066, 12067, 12163);
+INSERT INTO achievement_criteria_requirement VALUES
+(12066, 0, 0, 0),  -- A-bomb-inable
+(12067, 0, 0, 0),  -- A-bomb-ination
+(12163, 0, 0, 0);  -- Back Door Job
diff --git a/sql_mr/mr01867_mangos_faction_change_achievements.sql b/sql_mr/mr01867_mangos_faction_change_achievements.sql
new file mode 100644
index 00000000000..c42d423a7e8
--- /dev/null
+++ b/sql_mr/mr01867_mangos_faction_change_achievements.sql
@@ -0,0 +1,120 @@
+-- Race Faction Change - Achievements
+INSERT INTO `player_factionchange_achievements` VALUES ('33', '1358', 'Complete 130 quests in Borean Tundra', 'Complete 150 quests in Borean Tundra');
+INSERT INTO `player_factionchange_achievements` VALUES ('34', '1356', 'Complete 130 quests in Howling Fjord', 'Complete 105 quests in Howling Fjord');
+INSERT INTO `player_factionchange_achievements` VALUES ('35', '1359', 'Complete 115 quests in Dragonblight', 'Complete 130 quests in Dragonblight');
+INSERT INTO `player_factionchange_achievements` VALUES ('37', '1357', 'Complete 85 quests in Grizzly Hills', 'Complete 75 quests in Grizzly Hills');
+INSERT INTO `player_factionchange_achievements` VALUES ('41', '1360', 'Complete the Northrend quest achievements listed below.', 'Complete the Northrend quest achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('202', '1502', 'Grab the flag and capture it in under 75 seconds.', 'Grab the flag and capture it in under 75 seconds.');
+INSERT INTO `player_factionchange_achievements` VALUES ('203', '1251', 'In a single Warsong Gulch battle, kill 2 flag carriers before they leave the Silverwing Flag Room', 'In a single Warsong Gulch battle, kill 2 flag carriers before they leave the Warsong Flag Room');
+INSERT INTO `player_factionchange_achievements` VALUES ('206', '1252', 'Kill 100 flag carriers in Warsong Gulch.', 'Kill 100 flag carriers in Warsong Gulch.');
+INSERT INTO `player_factionchange_achievements` VALUES ('220', '873', 'Win Alterac Valley without losing a tower or captain. You must also control all of the Horde\'s towers', 'Win Alterac Valley without losing a tower or captain. You must also control all of the Alliance\'s towers');
+INSERT INTO `player_factionchange_achievements` VALUES ('225', '1164', 'Win Alterac Valley while your team controls both mines.', 'Win Alterac Valley while your team controls both mines.');
+INSERT INTO `player_factionchange_achievements` VALUES ('230', '1175', 'Complete the battleground achievements listed below.', 'Complete the battleground achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('246', '1005', 'Get an honorable, killing blow on six different races.', 'Get an honorable, killing blow on six different races.');
+INSERT INTO `player_factionchange_achievements` VALUES ('388', '1006', 'Kill 50 enemy players in any of your home cities.', 'Kill 50 enemy players in any of your home cities.');
+INSERT INTO `player_factionchange_achievements` VALUES ('433', '443', 'Earned the title, Grand Marshal', 'Earned the title, High Warlord');
+INSERT INTO `player_factionchange_achievements` VALUES ('434', '445', 'Earned the title, Field Marshal', 'Earned the title, Warlord');
+INSERT INTO `player_factionchange_achievements` VALUES ('435', '444', 'Earned the title, Commander', 'Earned the title, Lieutenant General');
+INSERT INTO `player_factionchange_achievements` VALUES ('436', '447', 'Earned the title, Lieutenant Commander', 'Earned the title, Champion');
+INSERT INTO `player_factionchange_achievements` VALUES ('437', '448', 'Earned the title, Knight-Champion', 'Earned the title, Centurion');
+INSERT INTO `player_factionchange_achievements` VALUES ('438', '469', 'Earned the title, Knight-Captain', 'Earned the title, Legionnaire');
+INSERT INTO `player_factionchange_achievements` VALUES ('439', '451', 'Earned the title, Knight', 'Earned the title, Stone Guard');
+INSERT INTO `player_factionchange_achievements` VALUES ('440', '452', 'Earned the title, Sergeant Major', 'Earned the title, First Sergeant');
+INSERT INTO `player_factionchange_achievements` VALUES ('441', '450', 'Earned the title, Master Sergeant', 'Earned the title, Senior Sergeant');
+INSERT INTO `player_factionchange_achievements` VALUES ('442', '454', 'Earned the title, Private', 'Earned the title, Scout');
+INSERT INTO `player_factionchange_achievements` VALUES ('470', '468', 'Earned the title, Corporal', 'Earned the title, Grunt');
+INSERT INTO `player_factionchange_achievements` VALUES ('471', '453', 'Earned the title, Sergeant', 'Earned the title, Sergeant');
+INSERT INTO `player_factionchange_achievements` VALUES ('472', '449', 'Earned the title, Knight-Lieutenant', 'Earned the title, Blood Guard');
+INSERT INTO `player_factionchange_achievements` VALUES ('473', '446', 'Earned the title, Marshal', 'Earned the title, General');
+INSERT INTO `player_factionchange_achievements` VALUES ('604', '603', 'Kill 5 Horde players in each of the cities listed below', 'Kill 5 Alliance players in each of the cities listed below');
+INSERT INTO `player_factionchange_achievements` VALUES ('610', '615', 'Kill Thrall', 'Kill King Varian Wrynn');
+INSERT INTO `player_factionchange_achievements` VALUES ('611', '616', 'Kill Cairne Bloodhoof', 'Kill King Magni Bronzebeard');
+INSERT INTO `player_factionchange_achievements` VALUES ('612', '617', 'Kill Lady Sylvanas Windrunner', 'Kill High Priestess Tyrande Whisperwind');
+INSERT INTO `player_factionchange_achievements` VALUES ('613', '618', 'Kill Lor\'themar Theron', 'Kill Prophet Velen');
+INSERT INTO `player_factionchange_achievements` VALUES ('614', '619', 'Slay the leaders of the Horde', 'Slay the leaders of the Alliance');
+INSERT INTO `player_factionchange_achievements` VALUES ('701', '700', 'Obtain an Insignia or Medallion of the Alliance', 'Obtain an Insignia or Medallion of the Horde');
+INSERT INTO `player_factionchange_achievements` VALUES ('707', '706', 'Obtain a Stormpike Battle Charger', 'Obtain a Frostwolf Howler');
+INSERT INTO `player_factionchange_achievements` VALUES ('709', '708', 'Gain exalted reputation with the Stormpike Guard', 'Gain exalted reputation with the Frostwolf Clan');
+INSERT INTO `player_factionchange_achievements` VALUES ('711', '710', 'Gain exalted reputation with The League of Arathor', 'Gain exalted reputation with The Forsaken Defilers');
+INSERT INTO `player_factionchange_achievements` VALUES ('713', '712', 'Gain exalted reputation with the Silverwing Sentinels', 'Gain exalted reputation with the Warsong Outriders');
+INSERT INTO `player_factionchange_achievements` VALUES ('764', '763', 'Raise all of The Burning Crusade dungeon reputations to exalted.', 'Raise all of The Burning Crusade dungeon reputations to exalted.');
+INSERT INTO `player_factionchange_achievements` VALUES ('899', '901', 'Earn exalted status with the Kurenai', 'Earn exalted status with The Mag\'har');
+INSERT INTO `player_factionchange_achievements` VALUES ('907', '714', 'Raise your reputation values in Warsong Gulch, Arathi Basin and Alterac Valley to Exalted.', 'Raise your reputation values in Warsong Gulch, Arathi Basin and Alterac Valley to Exalted.');
+INSERT INTO `player_factionchange_achievements` VALUES ('908', '909', 'Complete 100 battlegrounds at max level.', 'Complete 100 battlegrounds at max level.');
+INSERT INTO `player_factionchange_achievements` VALUES ('942', '943', 'Raise your reputation level from unfriendly to exalted with Timbermaw Hold, Sporeggar and the Kurenai', 'Raise your reputation level from unfriendly to exalted with Timbermaw Hold, Sporeggar and The Mag\'har');
+INSERT INTO `player_factionchange_achievements` VALUES ('948', '762', 'Earn Exalted reputation with all six Alliance factions.', 'Earn Exalted reputation with all six Horde factions.');
+INSERT INTO `player_factionchange_achievements` VALUES ('963', '965', 'Visit the Candy Buckets in Kalimdor.', 'Visit the Candy Buckets in Kalimdor.');
+INSERT INTO `player_factionchange_achievements` VALUES ('966', '967', 'Visit the Candy Buckets in Eastern Kingdoms.', 'Visit the Candy Buckets in Eastern Kingdoms.');
+INSERT INTO `player_factionchange_achievements` VALUES ('969', '968', 'Visit the Candy Buckets in Outland.', 'Visit the Candy Buckets in Outland.');
+INSERT INTO `player_factionchange_achievements` VALUES ('970', '971', 'Complete the Kalimdor, Eastern Kingdoms and Outland Tricks and Treats achievements.', 'Complete the Kalimdor, Eastern Kingdoms and Outland Tricks and Treats achievements.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1012', '1011', 'Gain exalted reputation with the Alliance Vanguard', 'Gain exalted reputation with the Horde Expedition');
+INSERT INTO `player_factionchange_achievements` VALUES ('1022', '1025', 'Honor the flames of Eastern Kingdoms.', 'Honor the flames of Eastern Kingdoms.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1023', '1026', 'Honor the flames of Kalimdor.', 'Honor the flames of Kalimdor.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1024', '1027', 'Honor the flames of Outland.', 'Honor the flames of Outland.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1028', '1031', 'Desecrate the Horde\'s bonfires in Eastern Kingdoms', 'Desecrate the Alliance\'s bonfires in Eastern Kingdoms');
+INSERT INTO `player_factionchange_achievements` VALUES ('1029', '1032', 'Desecrate the Horde\'s bonfires in Kalimdor', 'Desecrate the Alliance\'s bonfires in Kalimdor');
+INSERT INTO `player_factionchange_achievements` VALUES ('1030', '1033', 'Desecrate the Horde\'s bonfires in Outland', 'Desecrate the Alliance\'s bonfires in Outland');
+INSERT INTO `player_factionchange_achievements` VALUES ('1034', '1036', 'Complete the Flame Warden of Eastern Kingdoms, Kalimdor and Outland achievements', 'Complete the Flame Keeper of Eastern Kingdoms, Kalimdor and Outland achievements');
+INSERT INTO `player_factionchange_achievements` VALUES ('1035', '1037', 'Complete the Extinguishing Eastern Kingdoms, Kalimdor and Outland achievements.', 'Complete the Extinguishing Eastern Kingdoms, Kalimdor and Outland achievements.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1038', '1039', 'Complete the Midsummer achievements listed below.', 'Complete the Midsummer achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1040', '1041', 'Ruin Hallow\'s End for the Horde by completing Sergeant Hartman\'s quests which involve crashing the wickerman festival and cleaning up the stinkbombs from Southshore', 'Ruin Hallow\'s End for the Alliance by completing Darkcaller Yanka\'s quests which involve going to Southshore, ruining the kegs with rotten eggs and tossing stinkbombs into the town');
+INSERT INTO `player_factionchange_achievements` VALUES ('1151', '224', 'In Alterac Valley, kill 50 enemy players in the Hall of the Stormpike', 'In Alterac Valley, kill 50 enemy players in the Hall of the Frostwolf');
+INSERT INTO `player_factionchange_achievements` VALUES ('1167', '1168', 'Complete the Alterac Valley achievements listed below.', 'Complete the Alterac Valley achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1169', '1170', 'Complete the Arathi Basin achievements listed below.', 'Complete the Arathi Basin achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1172', '1173', 'Complete the Warsong Gulch achievements listed below.', 'Complete the Warsong Gulch achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1184', '1203', 'Drink the Brewfest beers listed below.', 'Drink the Brewfest beers listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1189', '1271', 'Complete 80 quests in Hellfire Peninsula', 'Complete 90 quests in Hellfire Peninsula');
+INSERT INTO `player_factionchange_achievements` VALUES ('1191', '1272', 'Complete 63 quests in Terokkar Forest', 'Complete 68 quests in Terokkar Forest');
+INSERT INTO `player_factionchange_achievements` VALUES ('1192', '1273', 'Complete 75 quests in Nagrand', 'Complete 87 quests in Nagrand');
+INSERT INTO `player_factionchange_achievements` VALUES ('1262', '1274', 'Complete the Outland quest achievements listed below.', 'Complete the Outland quest achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1255', '259', 'Throw a snowball at King Magni Bronzebeard during the Feast of Winter Veil', 'Throw a snowball at Cairne Bloodhoof during the Feast of Winter Veil');
+INSERT INTO `player_factionchange_achievements` VALUES ('1279', '1280', 'Get completely smashed, put on your best perfume, throw a handful of rose petals on Sraaz and then kiss him. You\'ll regret it in the morning', 'Get completely smashed, put on your best perfume, throw a handful of rose petals on Jeremiah Payson and then kiss him. You\'ll regret it in the morning');
+INSERT INTO `player_factionchange_achievements` VALUES ('1563', '1784', 'Complete the cooking achievements listed below.', 'Complete the cooking achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1656', '1657', 'Complete the Hallow\'s End achievements listed below.', 'Complete the Hallow\'s End achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1676', '1677', 'Complete 700 quests in Eastern Kingdoms', 'Complete 550 quests in Eastern Kingdoms');
+INSERT INTO `player_factionchange_achievements` VALUES ('1678', '1680', 'Complete 700 quests in Kalimdor', 'Complete 685 quests in Kalimdor');
+INSERT INTO `player_factionchange_achievements` VALUES ('1681', '1682', 'Complete the quest achievements listed below.', 'Complete the quest achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1684', '1683', 'Complete the Brewfest achievements listed below.', 'Complete the Brewfest achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1686', '1685', 'Use Mistletoe on the Alliance Brothers during the Feast of Winter Veil', 'Use Mistletoe on the Horde Brothers during the Feast of Winter Veil');
+INSERT INTO `player_factionchange_achievements` VALUES ('1692', '1691', 'Complete the Winter Veil achievements listed below.', 'Complete the Winter Veil achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1697', '1698', 'Complete the Lovely Charm Bracelet daily quest for each Alliance capital.', 'Complete the Lovely Charm Bracelet daily quest for each Horde capital.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1707', '1693', 'Complete the Love is in the Air achievements listed below.', 'Complete the Love is in the Air achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1737', '2476', 'Destroy each of the vehicles listed below.', 'Destroy each of the vehicles listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1752', '2776', 'Complete the Wintergrasp achievements listed below.', 'Complete the Wintergrasp achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1757', '2200', 'Defend the beach without losing any walls.', 'Defend the beach without losing any walls.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1762', '2192', 'Win a Strand of the Ancients battle without losing any siege vehicles.', 'Win a Strand of the Ancients battle without losing any siege vehicles.');
+INSERT INTO `player_factionchange_achievements` VALUES ('1782', '1783', 'Complete each of the cooking daily quests offered by Katherine Lee in Dalaran', 'Complete each of the cooking daily quests offered by Awilo Lon\'gomba in Dalaran');
+INSERT INTO `player_factionchange_achievements` VALUES ('2016', '2017', 'Complete the Grizzly Hills PvP daily quests listed below.', 'Complete the Grizzly Hills PvP daily quests listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2144', '2145', 'Complete the world events achievements listed below.', 'Complete the world events achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2194', '2195', 'Complete the Strand of the Ancients achievements listed below.', 'Complete the Strand of the Ancients achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2419', '2497', 'Find your pet Spring Rabbit another one to love in each of the towns listed below.', 'Find your pet Spring Rabbit another one to love in each of the towns listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2421', '2420', 'Hide a Brightly Colored Egg in Stormwind City', 'Hide a Brightly Colored Egg in Silvermoon City');
+INSERT INTO `player_factionchange_achievements` VALUES ('2536', '2537', 'Obtain 100 mounts.', 'Obtain 100 mounts.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2760', '2769', 'Earn exalted status with and the right to represent Darnassus in the Argent Tournament.', 'Earn exalted status with and the right to represent the Undercity in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2761', '2767', 'Earn exalted status with and the right to represent the Exodar in the Argent Tournament.', 'Earn exalted status with and the right to represent Silvermoon City in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2762', '2768', 'Earn exalted status with and the right to represent the Gnomeregan Exiles in the Argent Tournament.', 'Earn exalted status with and the right to represent Thunder Bluff in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2763', '2766', 'Earn exalted status with and the right to represent Ironforge in the Argent Tournament.', 'Earn exalted status with and the right to represent Sen\'jin in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2764', '2765', 'Earn exalted status with and the right to represent Stormwind in the Argent Tournament.', 'Earn exalted status with and the right to represent Orgrimmar in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2770', '2771', 'Earn exalted status with and the right to represent every Alliance race\'s faction in the Argent Tournament.', 'Earn exalted status with and the right to represent every Horde race\'s faction in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2777', '2787', 'Earn the right to represent Darnassus in the Argent Tournament.', 'Earn the right to represent the Undercity in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2778', '2785', 'Earn the right to represent the Exodar in the Argent Tournament.', 'Earn the right to represent Silvermoon City in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2779', '2786', 'Earn the right to represent the Gnomeregan Exiles in the Argent Tournament.', 'Earn the right to represent Thunder Bluff in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2780', '2784', 'Earn the right to represent Ironforge in the Argent Tournament.', 'Earn the right to represent Sen\'jin in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2781', '2783', 'Earn the right to represent Stormwind in the Argent Tournament.', 'Earn the right to represent Orgrimmar in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2782', '2788', 'Earn the right to represent every Alliance race\'s faction in the Argent Tournament.', 'Earn the right to represent every Horde race\'s faction in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2797', '2798', 'Complete the Noblegarden achievements listed below.', 'Complete the Noblegarden achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('2817', '2816', 'Earn exalted status with and the right to represent every Alliance race\'s faction in the Argent Tournament.', 'Earn exalted status with and the right to represent every Horde race\'s faction in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('3478', '3656', 'Complete the Pilgrim\'s Bounty achievements listed below.', 'Complete the Pilgrim\'s Bounty achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('3556', '3557', 'Acquire the Spirit of Sharing from a complete Bountiful Table feast at every Alliance capital', 'Acquire the Spirit of Sharing from a complete Bountiful Table feast at every Horde capital');
+INSERT INTO `player_factionchange_achievements` VALUES ('3576', '3577', 'Cook up one of every Pilgrim\'s Bounty dish.', 'Cook up one of every Pilgrim\'s Bounty dish.');
+INSERT INTO `player_factionchange_achievements` VALUES ('3580', '3581', 'While wearing either a Pilgrim\'s Dress, Robe, or Attire, take a seat at each enemy capital\'s Bountiful Table.', 'While wearing either a Pilgrim\'s Dress, Robe, or Attire, take a seat at each enemy capital\'s Bountiful Table.');
+INSERT INTO `player_factionchange_achievements` VALUES ('3596', '3597', 'Complete each of the Pilgrim\'s Bounty dailies.', 'Complete each of the Pilgrim\'s Bounty dailies.');
+INSERT INTO `player_factionchange_achievements` VALUES ('3676', '3677', 'Earn both exalted status with The Silver Covenant and the right to represent a city in the Argent Tournament.', 'Earn both exalted status with The Sunreavers and the right to represent a city in the Argent Tournament.');
+INSERT INTO `player_factionchange_achievements` VALUES ('3846', '4176', 'Win Isle of Conquest while your team controls the Quarry and Oil Refinery.', 'Win Isle of Conquest while your team controls the Quarry and Oil Refinery.');
+INSERT INTO `player_factionchange_achievements` VALUES ('3851', '4177', 'Win Isle of Conquest while controlling the Quarry, Oil Refinery, Shipyard, Siege Workshop and Hangar.', 'Win Isle of Conquest while controlling the Quarry, Oil Refinery, Shipyard, Siege Workshop and Hangar.');
+INSERT INTO `player_factionchange_achievements` VALUES ('3856', '4256', 'Destroy the following vehicles in Isle of Conquest', 'Destroy the following vehicles in Isle of Conquest');
+INSERT INTO `player_factionchange_achievements` VALUES ('3857', '3957', 'Complete the Isle of Conquest achievements listed below.', 'Complete the Isle of Conquest achievements listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('4156', '4079', 'In the Trial of the Grand Crusader, reach a Tribute Chest with 50 attempts remaining and without allowing any raid member to die during any of the boss encounters in 25-player mode.', 'In the Trial of the Grand Crusader, reach a Tribute Chest with 50 attempts remaining and without allowing any raid member to die during any of the boss encounters in 25-player mode.');
+INSERT INTO `player_factionchange_achievements` VALUES ('4436', '4437', 'Pelt the enemy leaders listed below.', 'Pelt the enemy leaders listed below.');
+INSERT INTO `player_factionchange_achievements` VALUES ('4786', '4790', 'You assisted High Tinker Mekkatorque and the Gnomeregan Exiles in the recapture of Gnomeregan\'s surface.', 'You assisted High Tinker Mekkatorque and the Gnomeregan Exiles in the recapture of Gnomeregan\'s surface.');
+INSERT INTO `player_factionchange_achievements` VALUES ('5332', '5347', 'Earn a battleground rating of 1300', 'Earn a battleground rating of 1300');
diff --git a/sql_mr/mr01867_mangos_faction_change_titles.sql b/sql_mr/mr01867_mangos_faction_change_titles.sql
new file mode 100644
index 00000000000..b70dd72b8ce
--- /dev/null
+++ b/sql_mr/mr01867_mangos_faction_change_titles.sql
@@ -0,0 +1,23 @@
+-- Race Faction Change - Titles
+INSERT INTO `player_factionchange_titles` VALUES ('1','Private <Name>','15','Scout <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('2','Corporal <Name>','16','Grunt <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('3','Sergeant <Name>','17','Sergeant <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('4','Master Sergeant <Name>','18','Senior Sergeant <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('5','Sergeant Major <Name>','19','First Sergeant <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('6','Knight <Name>','20','Stone Guard <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('7','Knight-Lieutenant <Name>','21','Blood Guard <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('8','Knight-Captain <Name>','22','Legionnaire <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('9','Knight-Champion <Name>','23','Centurion <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('10','Lieutenant Commander <Name>','24','Champion <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('11','Commander <Name>','25','Lieutenant General <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('12','Marshal <Name>','26','General <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('13','Field Marshal <Name>','27','Warlord <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('14','Grand Marshal <Name>','28','High Warlord <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('48','Justicar <Name>','47','Conqueror <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('75','Flame Warden <Name>','76','Flame Keeper <Name>');
+INSERT INTO `player_factionchange_titles` VALUES ('113','<Name> of Gnomeregan','153','<Name> of Thunder Bluff');
+INSERT INTO `player_factionchange_titles` VALUES ('126','<Name> of the Alliance','127','<Name> of the Horde');
+INSERT INTO `player_factionchange_titles` VALUES ('146','<Name> of the Exodar','152','<Name> of Silvermoon');
+INSERT INTO `player_factionchange_titles` VALUES ('147','<Name> of Darnassus','154','<Name> of the Undercity');
+INSERT INTO `player_factionchange_titles` VALUES ('148','<Name> of Ironforge','151','<Name> of Sen\'jin');
+INSERT INTO `player_factionchange_titles` VALUES ('149','<Name> of Stormwind','150','<Name> of Orgrimmar');
diff --git a/sql_mr/mr01902_mangos_creature_ai_scripts.sql b/sql_mr/mr01902_mangos_creature_ai_scripts.sql
new file mode 100644
index 00000000000..0c66e8978a8
--- /dev/null
+++ b/sql_mr/mr01902_mangos_creature_ai_scripts.sql
@@ -0,0 +1,3 @@
+-- Friend of Fowl achieve
+UPDATE `creature_ai_scripts` SET `action1_param3` = 3 WHERE `id` IN(2380101, 2474601);
+UPDATE `creature_template` SET `CreatureType` = 1 WHERE `entry` IN(23801, 24746);
diff --git a/sql_mr/mr01918_characters_characters.sql b/sql_mr/mr01918_characters_characters.sql
new file mode 100644
index 00000000000..d05c1438f04
--- /dev/null
+++ b/sql_mr/mr01918_characters_characters.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `characters`
+    CHANGE `dungeon_difficulty` `dungeon_difficulty` INT(10) UNSIGNED NOT NULL DEFAULT '0';
diff --git a/sql_mr/mr01997_mangos_achievements_fixes.sql b/sql_mr/mr01997_mangos_achievements_fixes.sql
new file mode 100644
index 00000000000..0ef1598dc56
--- /dev/null
+++ b/sql_mr/mr01997_mangos_achievements_fixes.sql
@@ -0,0 +1,176 @@
+-- Achievements works (Please keep deletion and insert in right order)
+
+DELETE FROM achievement_criteria_requirement WHERE criteria_id IN
+(608,609,610,1242,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1815,1816,1817,1818,1819,1820,1821,
+1822,1823,1824,1825,1826,3353,4227,5512,5529,5530,5531,5532,5533,5534,5535,5536,5537,5538,5539,5540,5541,5542,5543,5544,5545,
+6641,6642,6643,6644,6651,6652,6653,6654,6655,6656,6657,6659,
+5546,5547,5548,5726,5727,5728,5734,5735,5736,5737,5738,5739,5809,5810,7020,7625,7628,8587,8588,8589,8590,8599,8600,8601,
+8602,8607,8608,8609,8610,8615,8616,8617,8618,8759,8758,9165,9166,10391,11497,11498,11500,11501,12178,12179,12181,12182,12398,13254,13255);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (608, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (609, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (610, 11);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1242, 11);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1802, 0);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1803, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1804, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1805, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1806, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1807, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1808, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1809, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1810, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1811, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1812, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1813, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1814, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1815, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1816, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1817, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1818, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1819, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1820, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1821, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1822, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1823, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1824, 0);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1825, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (1826, 11);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (3353, 0);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`, `value1`) VALUES (4227, 15, 3);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`, `value1`) VALUES (4227, 5, 26682);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (5512,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5529,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5530,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5531,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5532,0,0,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (5533,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5534,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5535,0,0,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (5536,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5537,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5538,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5539,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5540,0,0,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (5541,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5542,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5543,0,0,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (5544,6,2597,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5545,6,3358,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5546,6,3277,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5547,6,3820,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (5548,6,4384,0);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (5726, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (5727, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (5728, 11);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (5734, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (5735, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (5736, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (5737, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (5738, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (5739, 11);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (5809, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (5810, 11);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6641,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6641,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6642,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6642,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6643,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6643,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6644,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6644,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6651,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6651,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6652,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6652,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6653,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6653,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6654,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6654,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6655,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6655,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6656,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6656,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6657,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6657,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (6659,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (6659,16,201,0);
+
+-- INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (7020, 11); 
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`, `value1`) VALUES (7020, 6, 4571);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`, `value1`) VALUES (7020, 7, 23335);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (7625, 0); -- Must be type 11 ???
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (7628, 0); -- Must be type 11 ???
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8587, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8588, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8589, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8590, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8599, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8600, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8601, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8602, 11);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8607, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8608, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8609, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8610, 11);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8615, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8616, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8617, 11);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8618, 11);
+
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8759, 0);
+INSERT INTO `achievement_criteria_requirement` (`criteria_id`, `type`) VALUES (8758, 0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (9165,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (9166,0,0,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (10391,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (10391,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (11497,6,4710,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (11498,6,4710,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (11500,6,4710,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (11501,6,4710,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (12178,6,4710,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (12179,6,4710,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (12181,6,4710,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (12182,6,4710,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (12398,5,58818,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (12398,16,201,0);
+
+INSERT INTO `achievement_criteria_requirement` VALUES (13254,0,0,0);
+INSERT INTO `achievement_criteria_requirement` VALUES (13255,6,4710,0);
+
+-- Friend or Fowl
+DELETE FROM  `achievement_criteria_requirement` WHERE criteria_id=3821;
+INSERT INTO `achievement_criteria_requirement` VALUES (3821,0,0,0);
diff --git a/sql_mr/mr02128_00_mangos_worldstate.sql b/sql_mr/mr02128_00_mangos_worldstate.sql
new file mode 100644
index 00000000000..61e05571368
--- /dev/null
+++ b/sql_mr/mr02128_00_mangos_worldstate.sql
@@ -0,0 +1,35 @@
+-- Implement WorldState templates table
+DROP TABLE IF EXISTS `worldstate_template`;
+CREATE TABLE IF NOT EXISTS `worldstate_template` (
+    `state_id`         int(10) unsigned NOT NULL COMMENT 'WorldState ID',
+    `type`             int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'WorldState type',
+    `condition`        int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Default condition (dependent from type)',
+    `flags`            int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Default flags of WorldState',
+    `default`          int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Default value of WorldState',
+    `linked_id`        int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'ID of linked WorldState',
+    `ScriptName`       char(64) NOT NULL default '' COMMENT 'Script name for WorldState (FFU)',
+    `comment`          varchar(255) NOT NULL DEFAULT '',
+    PRIMARY KEY (`state_id`,`type`,`condition`,`linked_id`)
+) DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='WorldState templates storage';
+
+-- WorldStateMgr commands/info
+DELETE FROM `command` WHERE `name` IN ('ws','ws add', 'ws list', 'ws global', 'ws reload', 'ws update');
+INSERT INTO `command` (`name`, `security`, `help`) VALUES
+('ws',2,'Syntax: .ws \r\n\r\nList settings of WorldState manager.'),
+('ws list',2,'Syntax: .ws list\r\n\r\nList all current WorldStates for player.'),
+('ws global',3,'Syntax: .ws global\r\n\r\nList all current WorldStates in world.'),
+('ws update',3,'Syntax: .ws update Id Value\r\n\r\nUpdate WorldState [Id] value to [Value].'),
+('ws add',3,'Syntax: .ws add Id \r\n\r\nAdd WorldState [Id] with default values to world.'),
+('ws reload',3,'Syntax: .ws reload \r\n\r\nReload all WorldState/templates (same as .reload worldstate).');
+
+-- State manager command line info
+DELETE FROM `mangos_string` WHERE `entry` IN (1550, 1551, 1552, 1553, 1554, 1555, 1556, 1557, 1558, 1559);
+INSERT INTO `mangos_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
+(1550,' State: %u, Type: %u, Condition: %u, Instance: %u, Value: %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1551,' State: %u, %u, %u, %u, %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1552,' State: %u added, (instance %u) value: %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1553,' State: %u (instance %u) updated from value %u to %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1554,' State: %u (instance %u) added!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1555,' World States reloaded, count of states %u, templates %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1556,' Error in WorldState operations!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1557,' WorldState settings: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql_mr/mr02128_characters_worldstate.sql b/sql_mr/mr02128_characters_worldstate.sql
new file mode 100644
index 00000000000..8f763fa0de9
--- /dev/null
+++ b/sql_mr/mr02128_characters_worldstate.sql
@@ -0,0 +1,12 @@
+-- Implement WorldState data storage table
+DROP TABLE IF EXISTS `worldstate_data`;
+CREATE TABLE IF NOT EXISTS `worldstate_data` (
+    `state_id`         int(10) unsigned NOT NULL COMMENT 'WorldState ID (may be 0)',
+    `instance`         int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'WorldState instance',
+    `type`             int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'WorldState type',
+    `condition`        int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Condition (dependent from type)',
+    `flags`            int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Current flags of WorldState',
+    `value`            int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Current value of WorldState',
+    `renewtime`        bigint(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Time of last renew of WorldState',
+    PRIMARY KEY (`state_id`,`instance`, `type`, `condition`)
+) DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='WorldState data storage';
diff --git a/sql_mr/mr02159_00_mangos_vehicle_data.sql b/sql_mr/mr02159_00_mangos_vehicle_data.sql
new file mode 100644
index 00000000000..02ccfe60c74
--- /dev/null
+++ b/sql_mr/mr02159_00_mangos_vehicle_data.sql
@@ -0,0 +1,455 @@
+UPDATE creature_template SET VehicleTemplateId = 53 WHERE entry = 26590;
+UPDATE creature_template SET VehicleTemplateId = 200 WHERE entry = 28605;
+UPDATE creature_template SET VehicleTemplateId = 200 WHERE entry = 28607;
+UPDATE creature_template SET VehicleTemplateId = 174 WHERE entry = 31722;
+UPDATE creature_template SET VehicleTemplateId = 312 WHERE entry = 31857;
+UPDATE creature_template SET VehicleTemplateId = 312 WHERE entry = 31858;
+UPDATE creature_template SET VehicleTemplateId = 165 WHERE entry = 32535;
+UPDATE creature_template SET VehicleTemplateId = 479 WHERE entry = 35634;
+UPDATE creature_template SET VehicleTemplateId = 489 WHERE entry = 35768;
+UPDATE creature_template SET VehicleTemplateId = 223 WHERE entry = 30248;
+UPDATE creature_template SET VehicleTemplateId = 736 WHERE  entry = 31788;
+UPDATE creature_template SET VehicleTemplateId = 0   WHERE  entry IN (33297,33298,33300,33301,33408,33409,33414,33416,33418,34125,36558,36557);
+UPDATE creature_template SET VehicleTemplateId = 106 WHERE  entry = 34802;
+UPDATE creature_template SET VehicleTemplateId = 106 WHERE  entry = 35419;
+UPDATE creature_template SET VehicleTemplateId = 106 WHERE  entry = 35421;
+UPDATE creature_template SET VehicleTemplateId = 106 WHERE  entry = 35415;
+UPDATE creature_template SET VehicleTemplateId = 36  WHERE  entry = 35413;
+UPDATE creature_template SET VehicleTemplateId = 79  WHERE  entry = 35427;
+UPDATE creature_template SET VehicleTemplateId = 79  WHERE  entry = 35429;
+UPDATE creature_template SET VehicleTemplateId = 223 WHERE  entry = 31749;
+
+UPDATE creature_template SET IconName = 'vehichleCursor' WHERE VehicleTemplateId > 0 AND IconName IS NULL;
+
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (33109, 33167, 33062, 33060, 33067);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(33109, 62309, 0, 0, 0, 1),  -- Demolisher
+(33167, 62309, 0, 0, 0, 1),  -- Demolisher mechanic seat
+(33062, 65030, 0, 0, 0, 1),  -- Chopper
+(33060, 65031, 0, 0, 0, 1),  -- Siege engine
+(33067, 65031, 0, 0, 0, 1);  -- Siege engine turret
+
+-- Salvaged Chopper
+UPDATE `creature_template` SET `AIName` = 'NullAI' WHERE `entry` IN (33062, 34045);
+
+-- Siege engine
+UPDATE `creature_template` SET `AIName` = 'NullAI' WHERE `entry` IN (33060);
+REPLACE INTO `creature_template_spells` SET `entry` = 33060, `spell1` = 62345, `spell2` = 62522, `spell3` = 62346;
+UPDATE `creature_template` SET `AIName` = 'NullAI' WHERE `entry` IN (33067);
+
+-- demolisher
+UPDATE `creature_template` SET `AIName` = 'NullAI' WHERE `entry` IN (33109);
+REPLACE INTO `creature_template_spells` SET `entry` = 33109, `spell1` = 62306, `spell2` = 62490, `spell3` = 62308, `spell4` = 62324;
+
+-- Salvaged Siege Turret by traponinet
+DELETE FROM `creature_spell` WHERE `guid` IN (33067);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(33067, 62358, 0, 0, 0, 0),
+(33067, 62359, 1, 0, 0, 0),
+(33067, 64677, 2, 0, 0, 0);
+
+-- Salvaged Demolisher Mechanic Seat
+DELETE FROM `creature_spell` WHERE `guid` IN (33167);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(33167, 62634, 0, 0, 0, 0),
+(33167, 64979, 1, 0, 0, 0),
+(33167, 62479, 2, 0, 0, 0),
+(33167, 62471, 3, 0, 0, 0),
+(33167, 62428, 5, 0, 0, 0);
+
+-- Flame Leviathan mechanic seat
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (33114);
+INSERT INTO `npc_spellclick_spells` (npc_entry, spell_id, quest_start, quest_start_active, quest_end, cast_flags) VALUES
+(33114,46598, 0, 0, 0, 1);
+
+UPDATE `creature_template` SET `AIName` = 'NullAI' WHERE `entry` IN (33114, 33142, 33143);
+
+-- Earthen Stoneshaper
+UPDATE creature_template SET UnitFlags = 33587968 WHERE entry=33620;
+-- Ymirjar Skycaller true fix (delete hack from YTDB)
+DELETE FROM creature_template_addon WHERE entry IN (31260, 37643);
+-- Traveler's Tundra Mammoth
+-- Grand Ice Mammoth
+-- Grand Black War Mammoth
+-- Grand Caravan Mammoth
+DELETE FROM creature_template_addon WHERE entry = 32638;
+UPDATE creature_template SET VehicleTemplateId = 312, IconName = 'vehichleCursor' WHERE entry IN (32640, 31857, 31858, 31861, 31862, 32212, 32213);
+
+-- Quests
+DELETE FROM `creature_spell` WHERE `guid` IN (28605, 28606, 28607);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(28605, 52264, 0, 0, 0, 0),
+(28605, 52268, 1, 0, 0, 0),
+(28606, 52264, 0, 0, 0, 0),
+(28606, 52268, 1, 0, 0, 0),
+(28607, 52264, 0, 0, 0, 0),
+(28607, 52268, 1, 0, 0, 0);
+
+-- From Lanc
+-- quest 12953
+REPLACE INTO `creature_template_spells` SET `entry` = 30066, `spell1` = 55812;
+
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (30066);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(30066, 44002, 12953, 1, 12953, 1);
+-- INSERT IGNORE INTO spell_script_target VALUES (55812, 1, 30096); -- listed for TargetEntry 30096 does not have any implicit target TARGET_SCRIPT(38) or TARGET_SCRIPT_COORDINATES (46) or TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT (40).
+
+-- From lanc
+/* 7th Legion Chain Gun */
+UPDATE `creature_template` SET `IconName` = 'Gunner' WHERE `entry` IN (27714);
+
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (27714);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(27714, 67373, 0, 0, 0, 1);
+
+/* Broken-down Shredder */
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (27354);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(27354, 48533, 12244, 1, 12244, 1),
+(27354, 48533, 12270, 1, 12270, 1);
+
+DELETE FROM `spell_script_target` WHERE `entry` IN (48610);
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+(48610, 1, 27423), (48610, 1, 27371);
+
+/* Forsaken Blight Spreader */
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (26523);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(26523, 47961, 0, 0, 0, 1);
+
+/* Argent Tournament mount */
+DELETE FROM `creature_spell` WHERE `guid` IN (33844,33845);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(33844, 62544, 0, 0, 0, 0),
+(33844, 64342, 1, 0, 0, 0),
+(33844, 63010, 2, 0, 0, 0),
+(33844, 62552, 3, 0, 0, 0),
+(33844, 64077, 4, 0, 0, 0),
+(33844, 62863, 5, 0, 0, 0),
+(33844, 63034, 6, 0, 0, 0),
+(33845, 62544, 0, 0, 0, 0),
+(33845, 64342, 1, 0, 0, 0),
+(33845, 63010, 2, 0, 0, 0),
+(33845, 62552, 3, 0, 0, 0),
+(33845, 64077, 4, 0, 0, 0),
+(33845, 62863, 5, 0, 0, 0),
+(33845, 63034, 6, 0, 0, 0);
+
+UPDATE creature_template SET KillCredit1 = 33340 WHERE entry IN (33272);
+UPDATE creature_template SET KillCredit1 = 33339 WHERE entry IN (33243);
+
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (33842, 33843);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(33842, 63791, 13829, 1, 0, 3),
+(33842, 63791, 13839, 1, 0, 3),
+(33842, 63791, 13838, 1, 0, 3),
+(33843, 63792, 13828, 1, 0, 3),
+(33843, 63792, 13837, 1, 0, 3),
+(33843, 63792, 13835, 1, 0, 3);
+
+-- Quest vehicles Support: Going Bearback (12851)
+UPDATE `creature_template` SET `VehicleTemplateId` = 308 WHERE entry IN (29598);
+REPLACE INTO `creature_template_spells` SET `entry` = 29598, `spell1` = 54897, `spell2` = 54907;
+
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (29598);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(29598, 54908, 12851, 1, 12851, 1);
+
+-- INSERT IGNORE INTO spell_script_target VALUES (54897, 1, 29358); --listed for TargetEntry 29358 does not have any implicit target TARGET_SCRIPT(38) or TARGET_SCRIPT_COORDINATES (46) or TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT (40).
+
+/* Frostbrood Vanquisher */
+UPDATE `creature_template` SET `InhabitType` = 3 WHERE `entry` = 28670;
+
+-- from lanc
+-- Infected Kodo fix quest (11690)
+INSERT IGNORE INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+(45877, 1, 25596);
+
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (25334, 27107);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(25334, 47917, 11652, 1, 11652, 1);
+
+-- REPLACE INTO spell_script_target VALUES (47962, 1, 27107); -- listed for TargetEntry 27107 does not have any implicit target TARGET_SCRIPT(38) or TARGET_SCRIPT_COORDINATES (46) or TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT (40).
+
+-- from lanc
+-- Refurbished Shredder (quest 12050)
+UPDATE `creature_template` SET `VehicleTemplateId` = 300 WHERE `entry` IN (27061);
+DELETE FROM `creature_spell` WHERE `guid` IN (27061);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(27061, 47939, 0, 0, 0, 0),
+(27061, 47921, 1, 0, 0, 0),
+(27061, 47966, 2, 0, 0, 0),
+(27061, 47938, 3, 0, 0, 0);
+
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (27061);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES (27061, 47920, 0, 0, 0, 1);
+REPLACE INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES 
+(47939, 0, 188539);
+
+-- Argent Cannon (quest 13086)
+UPDATE `creature_template` SET `VehicleTemplateId` = 244 WHERE `entry` IN (30236);
+UPDATE `npc_spellclick_spells` SET `quest_start` = 13086, `quest_start_active` = 1, `quest_end` = 13086 WHERE `npc_entry` = 30236 AND `spell_id` = 57573;
+
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (27996);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(27996, 50343, 12498, 1, 12498, 1);
+
+-- Quest 13236 Gift of the Lich King
+REPLACE INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+(58916, 2, 31254),
+(58917, 1, 31276);
+
+-- Quest: Defending Wyrmrest Temple (12372)
+UPDATE `dbscripts_on_gossip` SET `datalong2` = 3 WHERE `id` = 9568;
+
+UPDATE `creature_template` SET `InhabitType` = 3 WHERE `entry` = 27629;
+
+REPLACE INTO creature_ai_scripts VALUES (2769801,27698,8,0,100,0,49367,-1,0,0,33,27698,6,0,0,0,0,0,0,0,0,0,'q12372');
+UPDATE creature_template SET AIName='EventAI' WHERE entry=27698;
+
+-- Quest King of the Mountain (13280)
+DELETE FROM npc_spellclick_spells WHERE npc_entry = 31736;
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES (31736, 59592, 13280, 1, 0, 3);
+
+-- Njorndar Proto-Drake
+UPDATE creature_template SET VehicleTemplateId = 228 WHERE entry = 30272;
+DELETE FROM npc_spellclick_spells WHERE npc_entry = 30272;
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES (30272, 57401, 13071, 1, 13071, 1);
+
+-- Updates vehicles by lanc
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (32189, 29433, 29555);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES 
+(32189, 46598, 0, 0, 0, 1),
+(29433, 47020, 0, 0, 0, 1),
+(29555, 47020, 0, 0, 0, 1);
+
+UPDATE `creature_template_addon` SET `emote` = 0 WHERE `entry` = 29433;
+UPDATE `creature_template_addon` SET `moveflags` = 0 WHERE `entry` = 29625;
+
+-- from lanc
+-- All Support Vehicles for mount The Argent Tournament
+DELETE FROM `creature_spell` WHERE `guid` IN (33324, 33323, 33322, 33321, 33320, 33319, 33318, 33317, 33316);
+
+SET @GUID := 33324;
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(@GUID, 62544, 0, 0, 0, 0),
+(@GUID, 64342, 1, 0, 0, 0),
+(@GUID, 63010, 2, 0, 0, 0),
+(@GUID, 62552, 3, 0, 0, 0),
+(@GUID, 64077, 4, 0, 0, 0),
+(@GUID, 62863, 5, 0, 0, 0),
+(@GUID, 63034, 6, 0, 0, 0);
+
+SET @GUID := 33323;
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(@GUID, 62544, 0, 0, 0, 0),
+(@GUID, 64342, 1, 0, 0, 0),
+(@GUID, 63010, 2, 0, 0, 0),
+(@GUID, 62552, 3, 0, 0, 0),
+(@GUID, 64077, 4, 0, 0, 0),
+(@GUID, 62863, 5, 0, 0, 0),
+(@GUID, 63034, 6, 0, 0, 0);
+
+SET @GUID := 33322;
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(@GUID, 62544, 0, 0, 0, 0),
+(@GUID, 64342, 1, 0, 0, 0),
+(@GUID, 63010, 2, 0, 0, 0),
+(@GUID, 62552, 3, 0, 0, 0),
+(@GUID, 64077, 4, 0, 0, 0),
+(@GUID, 62863, 5, 0, 0, 0),
+(@GUID, 63034, 6, 0, 0, 0);
+
+SET @GUID := 33321;
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(@GUID, 62544, 0, 0, 0, 0),
+(@GUID, 64342, 1, 0, 0, 0),
+(@GUID, 63010, 2, 0, 0, 0),
+(@GUID, 62552, 3, 0, 0, 0),
+(@GUID, 64077, 4, 0, 0, 0),
+(@GUID, 62863, 5, 0, 0, 0),
+(@GUID, 63034, 6, 0, 0, 0);
+
+SET @GUID := 33320;
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(@GUID, 62544, 0, 0, 0, 0),
+(@GUID, 64342, 1, 0, 0, 0),
+(@GUID, 63010, 2, 0, 0, 0),
+(@GUID, 62552, 3, 0, 0, 0),
+(@GUID, 64077, 4, 0, 0, 0),
+(@GUID, 62863, 5, 0, 0, 0),
+(@GUID, 63034, 6, 0, 0, 0);
+
+SET @GUID := 33319;
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(@GUID, 62544, 0, 0, 0, 0),
+(@GUID, 64342, 1, 0, 0, 0),
+(@GUID, 63010, 2, 0, 0, 0),
+(@GUID, 62552, 3, 0, 0, 0),
+(@GUID, 64077, 4, 0, 0, 0),
+(@GUID, 62863, 5, 0, 0, 0),
+(@GUID, 63034, 6, 0, 0, 0);
+
+SET @GUID := 33318;
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(@GUID, 62544, 0, 0, 0, 0),
+(@GUID, 64342, 1, 0, 0, 0),
+(@GUID, 63010, 2, 0, 0, 0),
+(@GUID, 62552, 3, 0, 0, 0),
+(@GUID, 64077, 4, 0, 0, 0),
+(@GUID, 62863, 5, 0, 0, 0),
+(@GUID, 63034, 6, 0, 0, 0);
+
+SET @GUID := 33317;
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(@GUID, 62544, 0, 0, 0, 0),
+(@GUID, 64342, 1, 0, 0, 0),
+(@GUID, 63010, 2, 0, 0, 0),
+(@GUID, 62552, 3, 0, 0, 0),
+(@GUID, 64077, 4, 0, 0, 0),
+(@GUID, 62863, 5, 0, 0, 0),
+(@GUID, 63034, 6, 0, 0, 0);
+
+SET @GUID := 33316;
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(@GUID, 62544, 0, 0, 0, 0),
+(@GUID, 64342, 1, 0, 0, 0),
+(@GUID, 63010, 2, 0, 0, 0),
+(@GUID, 62552, 3, 0, 0, 0),
+(@GUID, 64077, 4, 0, 0, 0),
+(@GUID, 62863, 5, 0, 0, 0),
+(@GUID, 63034, 6, 0, 0, 0);
+
+DELETE FROM `npc_spellclick_spells` WHERE npc_entry = 33870;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(33870, 63663, 13664, 1, 0, 3);
+
+-- Typo fix for Argent Mount
+DELETE FROM `creature_spell` WHERE `guid` IN (33844, 33845);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(33844, 62544, 0, 0, 0, 0),
+(33844, 64342, 1, 0, 0, 0),
+(33844, 63010, 2, 0, 0, 0),
+(33844, 62552, 3, 0, 0, 0),
+(33844, 64077, 4, 0, 0, 0),
+(33844, 62863, 5, 0, 0, 0),
+(33844, 63034, 6, 0, 0, 0),
+(33845, 62544, 0, 0, 0, 0),
+(33845, 64342, 1, 0, 0, 0),
+(33845, 63010, 2, 0, 0, 0),
+(33845, 62552, 3, 0, 0, 0),
+(33845, 64077, 4, 0, 0, 0),
+(33845, 62863, 5, 0, 0, 0),
+(33845, 63034, 6, 0, 0, 0);
+
+UPDATE `creature_template` SET `VehicleTemplateId` = 30 WHERE `entry` = 30021;
+REPLACE INTO `creature_template_spells` SET `entry` = 30021, `spell1` = 55982, `spell2` = 55980;
+UPDATE `creature_template` SET `VehicleTemplateId` = 529 WHERE `entry` = 33782;
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (30021, 33782);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(30021, 55785, 0, 0, 0, 3),
+(33782, 63151, 0, 0, 0, 1);
+
+-- Rocket Propelled Warhead (quest 12437)
+UPDATE `creature_template` SET `InhabitType` = 6, `UnitFlags` = `UnitFlags`|16384, `SpeedWalk` = 4, `SpeedRun` = 4 WHERE `entry` = 27593;
+UPDATE `creature_model_info` SET `bounding_radius` = 0.534723,`combat_reach` = 3.5 WHERE `modelid` = 26611;
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` = 27593;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(27593, 49177, 12437, 1, 0, 1);
+
+-- Wintergrasp vehicles
+
+-- Wintergrasp tower cannon
+SET @GUID := 28366;
+UPDATE `creature_template` SET AIName = 'NullAI' WHERE entry = @GUID;
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (@GUID);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES (@GUID, 60962, 0, 0, 0, 1);
+
+-- Wintergrasp siege Engine (Alliance)
+SET @GUID := 28312;
+UPDATE `creature_template` SET `VehicleTemplateId` = 324, `AIName` = 'NullAI' WHERE `entry` = @GUID;
+
+DELETE FROM `creature_spell` WHERE `guid` IN (@GUID);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+-- (@GUID, 51678, 0, 0, 0, 0);
+(@GUID, 54109, 0, 0, 0, 0);
+
+-- Wintergrasp Alliance siege turret (accessory)
+SET @GUID := 28319;
+UPDATE `creature_template` SET AIName = 'NullAI' WHERE entry = @GUID;
+
+DELETE FROM `creature_spell` WHERE `guid` IN (@GUID);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(@GUID, 57609, 0, 0, 0, 0);
+
+-- Wintergrasp siege Engine (Horde)
+SET @GUID := 32627;
+UPDATE `creature_template` SET `AIName` = 'NullAI' WHERE `entry` = @GUID;
+
+DELETE FROM `creature_spell` WHERE `guid` IN (@GUID);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+-- (@GUID, 51678, 0, 0, 0, 0);
+(@GUID, 54109, 0, 0, 0, 0);
+
+-- Wintergrasp Horde siege turret (accessory)
+SET @GUID := 32629;
+UPDATE `creature_template` SET AIName = 'NullAI' WHERE entry = @GUID;
+
+DELETE FROM `creature_spell` WHERE `guid` IN (@GUID);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+(@GUID, 57609, 0, 0, 0, 0);
+-- UPDATE `creature_template` SET faction_A = 1979, faction_H = 1979 WHERE entry = 32629;
+
+-- Wintergrasp Demolisher
+SET @GUID := 28094;
+UPDATE `creature_template` SET AIName = 'NullAI' WHERE entry = @GUID;
+
+DELETE FROM `creature_spell` WHERE `guid` IN (@GUID);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+-- (@GUID, 50652, 0, 0, 0, 0),
+(@GUID, 54107, 0, 0, 0, 0),
+-- (@GUID, 50896, 1, 0, 0, 0),
+(@GUID, 57618, 1, 0, 0, 0);
+
+-- Wintergrasp Catapult
+SET @GUID := 27881;
+UPDATE `creature_template` SET `AIName` = 'NullAI' WHERE `entry` = @GUID;
+
+DELETE FROM `creature_spell` WHERE `guid` IN (@GUID);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`, `active`, `disabled`, `flags`) VALUES
+-- (@GUID, 50025, 0, 0, 0, 0),
+(@GUID, 57606, 0, 0, 0, 0),
+(@GUID, 50989, 1, 0, 0, 0);
+
+-- Under Development
+
+-- Highland Mustang
+-- DELETE FROM npc_spellclick_spells WHERE npc_entry IN (26472);
+-- INSERT INTO npc_spellclick_spells VALUES (26472, 67373, 0, 0, 0, 1);
+
+-- Kor Kron war Rider
+-- DELETE FROM npc_spellclick_spells WHERE npc_entry IN (26813);
+-- INSERT INTO npc_spellclick_spells VALUES (26813, 47424, 0, 0, 0, 1);
+
+-- Kor Kron war Rider 2
+-- DELETE FROM npc_spellclick_spells WHERE npc_entry IN (26572);
+-- INSERT INTO npc_spellclick_spells VALUES (26572, 47424, 0, 0, 0, 1);
+
+-- Onslaught Warhorse
+-- DELETE FROM npc_spellclick_spells WHERE npc_entry IN (27213);
+-- INSERT INTO npc_spellclick_spells VALUES (27213, 67373, 0, 0, 0, 1);
+
+-- Steel Gate Flying manchine
+-- DELETE FROM npc_spellclick_spells WHERE npc_entry IN (24418);
+-- INSERT INTO npc_spellclick_spells VALUES (24418, 67373, 0, 0, 0, 1);
+
+
+-- Wooly mammoth bull
+-- DELETE FROM npc_spellclick_spells WHERE npc_entry IN (25743);
+-- INSERT INTO npc_spellclick_spells VALUES (25743, 43695, 0, 0, 0, 0);
+
+-- Wyrmrest skytalon
+-- DELETE FROM npc_spellclick_spells WHERE npc_entry = 32535;
+-- INSERT INTO npc_spellclick_spells VALUES (32535, 61245, 0, 0, 0, 1);
diff --git a/sql_mr/mr02240_mangos_spell_dbc_command.sql b/sql_mr/mr02240_mangos_spell_dbc_command.sql
new file mode 100644
index 00000000000..992fc07d548
--- /dev/null
+++ b/sql_mr/mr02240_mangos_spell_dbc_command.sql
@@ -0,0 +1,7 @@
+-- Implement spell_dbc reload command
+DELETE FROM `command` WHERE `name` IN ('reload spell_dbc');
+INSERT INTO `command`
+    (`name`, `security`, `help`)
+VALUES
+    ('reload spell_dbc',3,'Syntax: .reload spell_dbc\r\n\r\nReload `spell_dbc` table (very UNSAFE operation + small memleak)');
+
diff --git a/sql_mr/mr02283_realmd_account_access.sql b/sql_mr/mr02283_realmd_account_access.sql
new file mode 100644
index 00000000000..5ed0ae75812
--- /dev/null
+++ b/sql_mr/mr02283_realmd_account_access.sql
@@ -0,0 +1,25 @@
+ALTER TABLE realmd_db_version CHANGE COLUMN required_10008_01_realmd_realmd_db_version required_12112_01_realmd_account_access bit;
+
+DROP TABLE IF EXISTS `account_access`;
+
+CREATE TABLE `account_access` (
+  `id` int(10) unsigned NOT NULL,
+  `gmlevel` tinyint(3) unsigned NOT NULL,
+  `RealmID` int(11) NOT NULL DEFAULT '-1',
+  PRIMARY KEY (`id`,`RealmID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Account Access System';
+
+INSERT IGNORE INTO `account_access` (`id`,`gmlevel`,`RealmID`) 
+    SELECT `id`, `gmlevel`, -1 FROM `account` 
+    WHERE `account`.`gmlevel` > 0;
+
+ALTER TABLE `account` DROP `gmlevel`;
+
+-- This expression may give error - if table `account_forcepermission` not created, this normal.
+
+INSERT IGNORE INTO `account_access` (`id`,`gmlevel`,`RealmID`) 
+    SELECT `AccountID`,`Security`, `realmID` FROM `account_forcepermission`
+WHERE `account_forcepermission`.`AccountID` > 4;
+
+DROP TABLE IF EXISTS `account_forcepermission`;
+
diff --git a/sql_mr/mr02310_mangos_worldstate_templates.sql b/sql_mr/mr02310_mangos_worldstate_templates.sql
new file mode 100644
index 00000000000..429a88806c8
--- /dev/null
+++ b/sql_mr/mr02310_mangos_worldstate_templates.sql
@@ -0,0 +1,701 @@
+-- Data for fill worlstate template values (clean mangos)
+TRUNCATE TABLE `worldstate_template`;
+
+-- Flags definition
+SET @FLAG_ACTIVE          = 2; -- 0x2
+SET @FLAG_INITIAL_STATE   = 65536; -- 0x10000
+SET @FLAG_NOT_EXPIREABLE  = 262144; -- 0x40000
+
+-- Combinations of flag
+SET @FLAG_INITIAL_ACTIVE = @FLAG_ACTIVE + @FLAG_INITIAL_STATE;
+SET @FLAG_INITIAL_ACTIVE_NONEXPIRE = @FLAG_ACTIVE + @FLAG_INITIAL_STATE + @FLAG_NOT_EXPIREABLE;
+
+-- Common
+DELETE FROM `worldstate_template` WHERE `type` = 1 AND `condition` = 0;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(1941, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1942, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1943, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2259, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'common'),
+(2260, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'common'),
+(2261, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'common'),
+(2262, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'common'),
+(2263, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'common'),
+(2264, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'common'),
+(2851, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(3695, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4273, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Arena season ID
+(3191, 1, 0, @FLAG_INITIAL_ACTIVE_NONEXPIRE, 8, 0, '', 'Current arena season'),
+(3901, 1, 0, @FLAG_INITIAL_ACTIVE_NONEXPIRE, 7, 0, '', 'Previous arena season'),
+-- Wintergrasp
+(3710, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Battle for Wintergrasp active 1'),
+(3801, 1, 0, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'Battle for Wintergrasp active 2 (negative)'),
+(3802, 1, 0, @FLAG_INITIAL_ACTIVE, 0, 3801, '', 'WinterGrasp defender (0- ally, 1-horde)'),
+(3803, 1, 0, @FLAG_INITIAL_ACTIVE, 1, 3801, '', 'WinterGrasp attacker (0- ally, 1-horde)'),
+(3781, 1, 0, @FLAG_INITIAL_ACTIVE, 1331819537, 0, '', 'Wintergrasp timer 1'),
+(4354, 1, 0, @FLAG_INITIAL_ACTIVE, 1331819537, 0, '', 'Wintergrasp timer 2');
+
+-- Common values, where excluded in instances and some maps
+DELETE FROM `worldstate_template` WHERE `type` = 9 AND `condition` = 0;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Non-instance (UnCommon)
+(2322, 9, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2323, 9, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2324, 9, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2325, 9, 0, @FLAG_INITIAL_ACTIVE, 0, 0, '', '');
+
+-- Eastern Plaguelands
+DELETE FROM `worldstate_template` WHERE `type` = 5 AND `condition` = 139;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Counters
+(2327, 5, 139, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2328, 5, 139, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- North pass
+(2352, 5, 139, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2372, 5, 139, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2373, 5, 139, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- PlagueWood
+(2353, 5, 139, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2370, 5, 139, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2371, 5, 139, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Crown guard
+(2355, 5, 139, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2378, 5, 139, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2379, 5, 139, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- East wall
+(2361, 5, 139, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2354, 5, 139, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2356, 5, 139, @FLAG_INITIAL_ACTIVE, 0, 0, '', '');
+
+-- Hellfire peninsula
+DELETE FROM `worldstate_template` WHERE `type` = 5 AND `condition` = 3483;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Stadium
+(2470, 5, 3483, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2471, 5, 3483, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2472, 5, 3483, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+-- Overlook
+(2480, 5, 3483, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2481, 5, 3483, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2482, 5, 3483, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+-- Broken hill
+(2483, 5, 3483, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2484, 5, 3483, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2485, 5, 3483, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+-- Counter horde
+(2478, 5, 3483, @FLAG_INITIAL_ACTIVE, 0, 2489, '', ''),
+(2489, 5, 3483, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+-- Counter ally
+(2476, 5, 3483, @FLAG_INITIAL_ACTIVE, 0, 2490, '', ''),
+(2490, 5, 3483, @FLAG_INITIAL_ACTIVE, 1, 0, '', '');
+
+-- Terrokar forest
+DELETE FROM `worldstate_template` WHERE `type` = 5 AND `condition` = 3519;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Counter
+(2620, 5, 3519, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2621, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 2620, '', ''),
+(2622, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 2620, '', ''),
+-- TF locked
+(2508, 5, 3519, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2767, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2768, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- TF lock timer
+(2509, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2512, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2510, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Tower 1
+(2681, 5, 3519, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2682, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2683, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Tower 2
+(2686, 5, 3519, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2684, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2685, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Tower 3
+(2690, 5, 3519, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2688, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2689, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Tower 5
+(2693, 5, 3519, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2691, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2692, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Tower 4
+(2696, 5, 3519, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2694, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2695, 5, 3519, @FLAG_INITIAL_ACTIVE, 0, 0, '', '');
+
+-- Zangarmarsh
+DELETE FROM `worldstate_template` WHERE `type` = 5 AND `condition` = 3521;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Beacon east
+(2555, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2556, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2557, 5, 3521, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+-- Beacon west
+(2558, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2559, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2560, 5, 3521, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+-- Tower West
+(2644, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2645, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2646, 5, 3521, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+-- GraveYard
+(2647, 5, 3521, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2648, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2649, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Tower East
+(2650, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2651, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2652, 5, 3521, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+
+-- (2653, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Unk'),
+
+-- Ally flag
+(2655, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2656, 5, 3521, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+-- Horde flag
+(2657, 5, 3521, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2658, 5, 3521, @FLAG_INITIAL_ACTIVE, 0, 0, '', '');
+
+-- Halaa WorldPvP area
+DELETE FROM `worldstate_template` WHERE `type` = 5 AND `condition` = 3518;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Nagrand
+(2491, 5, 3518, @FLAG_INITIAL_ACTIVE, 15, 0, '', ''),
+(2493, 5, 3518, @FLAG_INITIAL_ACTIVE, 15, 0, '', ''),
+(2503, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2502, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Wywern north
+(2762, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2662, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2663, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2664, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Wywern south
+(2760, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2670, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2668, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2669, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Wywern west
+(2761, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2667, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2665, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2666, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Wywern east
+(2763, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2659, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2660, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2661, 5, 3518, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Halaa common
+(2671, 5, 3518, @FLAG_INITIAL_ACTIVE, 1,  0, '', ''),
+(2672, 5, 3518, @FLAG_INITIAL_ACTIVE, 0,  0, '', ''),
+(2673, 5, 3518, @FLAG_INITIAL_ACTIVE, 0,  0, '', ''),
+(2676, 5, 3518, @FLAG_INITIAL_ACTIVE, 0,  0, '', ''),
+(2677, 5, 3518, @FLAG_INITIAL_ACTIVE, 0,  0, '', '');
+
+-- Silithus
+DELETE FROM `worldstate_template` WHERE `type` = 5 AND `condition` = 1377;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(2313, 5, 1377, @FLAG_INITIAL_ACTIVE, 0, 2317, '', ''),
+(2314, 5, 1377, @FLAG_INITIAL_ACTIVE, 0, 2317, '', ''),
+(2317, 5, 1377, @FLAG_INITIAL_ACTIVE, 200,  0, '', '');
+
+-- WinterGrasp
+DELETE FROM `worldstate_template` WHERE `type` = 5 AND `condition` = 4197;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Vehicle numbers
+(3680, 5, 4197, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Vehicle number ally'),
+(3681, 5, 4197, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Vehicle max number ally'),
+(3690, 5, 4197, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Vehicle number horde'),
+(3691, 5, 4197, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Vehicle max number horde'),
+-- Another vehicle numbers (old version?)
+(3490, 5, 4197, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Vehicle number horde'),
+(3491, 5, 4197, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Vehicle max number horde'),
+-- Workshops
+(3698, 5, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'WORLDSTATE_WORKSHOP_K_W'),
+(3699, 5, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'WORLDSTATE_WORKSHOP_K_E'),
+(3700, 5, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'WORLDSTATE_WORKSHOP_NW'),
+(3701, 5, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'WORLDSTATE_WORKSHOP_NE'),
+(3702, 5, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'WORLDSTATE_WORKSHOP_SW'),
+(3703, 5, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'WORLDSTATE_WORKSHOP_SE'),
+-- Buildings
+(3773, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191810'),
+(3763, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190375'),
+-- South tower
+(3704, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190356'),
+(3705, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190357'),
+(3706, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190358'),
+-- Wall
+(3765, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191797'),
+(3771, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191798'),
+(3768, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191805'),
+-- Tower of keep
+(3711, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190221'),
+(3712, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190378'),
+(3713, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190373'),
+(3714, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190377'),
+-- Buildings
+(3749, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190219'),
+(3750, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190220'),
+(3764, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191795'),
+(3772, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191796'),
+(3762, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191799'),
+(3766, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191800'),
+(3770, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191801'),
+(3751, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191802'),
+(3752, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191803'),
+(3767, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191804'),
+(3769, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191806'),
+(3759, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191807'),
+(3760, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191808'),
+(3761, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '191809'),
+(3753, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190369'),
+(3758, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190370'),
+(3754, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190371'),
+(3757, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190372'),
+(3755, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190374'),
+(3756, 10, 4197, @FLAG_INITIAL_ACTIVE, 1, 0, '', '190376');
+
+-- Gameobjects link to WS
+UPDATE `gameobject_template` SET `data23` = 3773 WHERE `entry` = 191810;
+UPDATE `gameobject_template` SET `data23` = 3763 WHERE `entry` = 190375;
+UPDATE `gameobject_template` SET `data23` = 3704 WHERE `entry` = 190356;
+UPDATE `gameobject_template` SET `data23` = 3705 WHERE `entry` = 190357;
+UPDATE `gameobject_template` SET `data23` = 3706 WHERE `entry` = 190358;
+UPDATE `gameobject_template` SET `data23` = 3765 WHERE `entry` = 191797;
+UPDATE `gameobject_template` SET `data23` = 3771 WHERE `entry` = 191798;
+UPDATE `gameobject_template` SET `data23` = 3768 WHERE `entry` = 191805;
+UPDATE `gameobject_template` SET `data23` = 3711 WHERE `entry` = 190221;
+UPDATE `gameobject_template` SET `data23` = 3712 WHERE `entry` = 190378;
+UPDATE `gameobject_template` SET `data23` = 3713 WHERE `entry` = 190373;
+UPDATE `gameobject_template` SET `data23` = 3714 WHERE `entry` = 190377;
+UPDATE `gameobject_template` SET `data23` = 3749 WHERE `entry` = 190219;
+UPDATE `gameobject_template` SET `data23` = 3750 WHERE `entry` = 190220;
+UPDATE `gameobject_template` SET `data23` = 3764 WHERE `entry` = 191795;
+UPDATE `gameobject_template` SET `data23` = 3772 WHERE `entry` = 191796;
+UPDATE `gameobject_template` SET `data23` = 3762 WHERE `entry` = 191799;
+UPDATE `gameobject_template` SET `data23` = 3766 WHERE `entry` = 191800;
+UPDATE `gameobject_template` SET `data23` = 3770 WHERE `entry` = 191801;
+UPDATE `gameobject_template` SET `data23` = 3751 WHERE `entry` = 191802;
+UPDATE `gameobject_template` SET `data23` = 3752 WHERE `entry` = 191803;
+UPDATE `gameobject_template` SET `data23` = 3767 WHERE `entry` = 191804;
+UPDATE `gameobject_template` SET `data23` = 3769 WHERE `entry` = 191806;
+UPDATE `gameobject_template` SET `data23` = 3759 WHERE `entry` = 191807;
+UPDATE `gameobject_template` SET `data23` = 3760 WHERE `entry` = 191808;
+UPDATE `gameobject_template` SET `data23` = 3761 WHERE `entry` = 191809;
+UPDATE `gameobject_template` SET `data23` = 3753 WHERE `entry` = 190369;
+UPDATE `gameobject_template` SET `data23` = 3758 WHERE `entry` = 190370;
+UPDATE `gameobject_template` SET `data23` = 3754 WHERE `entry` = 190371;
+UPDATE `gameobject_template` SET `data23` = 3757 WHERE `entry` = 190372;
+UPDATE `gameobject_template` SET `data23` = 3755 WHERE `entry` = 190374;
+UPDATE `gameobject_template` SET `data23` = 3756 WHERE `entry` = 190376;
+
+-- Battlegrounds
+-- Alterac valley
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = 30;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Stoneheart Grave
+(1301, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1302, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1303, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1304, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Stormpike first aid station
+(1325, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1326, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1327, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1328, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Frostwolf Hut
+(1329, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1330, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1331, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1332, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Stormpike first aid station
+(1333, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1334, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1335, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1336, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Frostwolf Grave
+(1337, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1338, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1339, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1340, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Snowfall Grave
+(1341, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1342, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1343, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1344, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Iceblood grave
+(1346, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1347, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1348, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1349, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Dunbaldar South Bunker
+(1361, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1370, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1375, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1378, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Dunbaldar North Bunker
+(1362, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1374, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1379, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1371, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Icewing Bunker
+(1363, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1372, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1376, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1380, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Stoneheart Bunker
+(1364, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1373, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1377, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1381, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Iceblood Tower
+(1368, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1385, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1390, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1395, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Tower Point
+(1367, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1384, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1389, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1394, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Frostwolf East
+(1366, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1383, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1388, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1393, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Frostwolf West
+(1365, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1382, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1387, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1392, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Mines
+(1355, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'South mine - alliance'),
+(1356, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'South mine - horde'),
+(1357, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'South mine - neytral'),
+(1358, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'North mine - alliance'),
+(1359, 4, 30, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'North mine - horde'),
+(1360, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'North mine - neytral'),
+-- Weather?
+(1966, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'Snowfall'),
+-- Counters
+(3127, 4, 30, @FLAG_INITIAL_ACTIVE, 600, 3134, '', 'Alliance score'),
+(3128, 4, 30, @FLAG_INITIAL_ACTIVE, 600, 3133, '', 'Horde score'),
+(3133, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(3134, 4, 30, @FLAG_INITIAL_ACTIVE, 1, 0, '', '');
+
+-- WS
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = 489;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(1545, 4, 489, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1546, 4, 489, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1581, 4, 489, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1582, 4, 489, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1601, 4, 489, @FLAG_INITIAL_ACTIVE, 3, 0, '', ''),
+(2338, 4, 489, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2339, 4, 489, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4247, 4, 489, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4248, 4, 489, @FLAG_INITIAL_ACTIVE, 25, 0, '', '');
+
+-- AB
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = 529;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Stable
+(1842, 4, 529, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1767, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1768, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1769, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1770, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Farm
+(1845, 4, 529, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1772, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1773, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1774, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1775, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Blacksmith
+(1846, 4, 529, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1782, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1783, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1784, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1785, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Goldmine
+(1843, 4, 529, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1787, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1788, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1789, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1790, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Lumbermill
+(1844, 4, 529, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(1792, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1793, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1794, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1795, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Unk
+(1861, 4, 529, @FLAG_INITIAL_ACTIVE, 2, 0, '', ''),
+-- Occupied
+(1776, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1777, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1778, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(1779, 4, 529, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Resources
+(1780, 4, 529, @FLAG_INITIAL_ACTIVE, 1600, 0, '', ''),
+(1955, 4, 529, @FLAG_INITIAL_ACTIVE, 1400, 0, '', '');
+
+-- EY
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = 566;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Counters
+(2749, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 2752, '', ''),
+(2750, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 2753, '', ''),
+(2752, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2753, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Blood elf
+(2722, 4, 566, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2723, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2724, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Fel reaver
+(2725, 4, 566, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2726, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2727, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Mage tower
+(2728, 4, 566, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2729, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2730, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Draenei ruins
+(2731, 4, 566, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2732, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2733, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Flags
+(2757, 4, 566, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(2769, 4, 566, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'Flag aliance'),
+(2770, 4, 566, @FLAG_INITIAL_ACTIVE, 1, 0, '', 'Flag horde'),
+-- Unk 1
+(2735, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2736, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2737, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2738, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2739, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2740, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2741, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(2742, 4, 566, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Unk2
+(2565, 4, 566, @FLAG_INITIAL_ACTIVE, 142, 0, '', ''),
+(3085, 4, 566, @FLAG_INITIAL_ACTIVE, 379, 0, '', '');
+
+-- Strand of the ancients
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = 607;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Timer
+(3559, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Minutes'),
+(3560, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', '10 secs'),
+(3561, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'secs'),
+(3564, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Battle finish timer (data - 3559,3560,3561)'),
+(3565, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Round timer (data - 3559,3560,3561)'),
+(3571, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Bonus timer (data - 3559,3560,3561)'),
+-- State (?)
+(3536, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(3537, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 3536, '', ''),
+-- Attackers
+(4352, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4353, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Gateways
+(3614, 4, 607, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(3617, 4, 607, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(3620, 4, 607, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(3623, 4, 607, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(3638, 4, 607, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(3849, 4, 607, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+-- Horde GY
+(3632, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(3633, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(3634, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Alliance GY
+(3635, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(3636, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(3637, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Alliance attack token
+(3626, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(3627, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Horde attack token
+(3628, 4, 607, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(3629, 4, 607, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+-- Defence token
+(3630, 4, 607, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(3631, 4, 607, @FLAG_INITIAL_ACTIVE, 0, 0, '', '');
+
+-- Isle of conquest
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = 628;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+-- Counters
+(4221, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4222, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4226, 4, 628, @FLAG_INITIAL_ACTIVE, 300, 4221, '', ''),
+(4227, 4, 628, @FLAG_INITIAL_ACTIVE, 300, 4222, '', ''),
+-- Workshop
+(4294, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4228, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4293, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4229, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4230, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Hangar
+(4296, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4300, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4297, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4299, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4298, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Docks
+(4301, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4302, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4303, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4304, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4305, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Quarry
+(4306, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4307, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4308, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4309, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4310, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Refinery
+(4311, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4312, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4313, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4314, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4315, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+-- Gates
+(4317, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4318, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4319, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4320, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4321, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4322, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4323, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4324, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4325, 4, 628, @FLAG_INITIAL_ACTIVE, 0, 0, '', ''),
+(4326, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4327, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', ''),
+(4328, 4, 628, @FLAG_INITIAL_ACTIVE, 1, 0, '', '');
+
+-- Arenas
+-- Dalaran arena
+SET @MAP := 617;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(3610, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Arena counters activate'),
+(3600, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 3610, '', 'Arena Green command counter'),
+(3601, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 3610, '', 'Arena Gold command counter');
+
+-- Ring of Valor
+SET @MAP := 618;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(3610, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Arena counter activate'),
+(3600, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 3610, '', 'Arena Green command counter'),
+(3601, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 3610, '', 'Arena Gold command counter');
+
+-- Instances
+-- Zulaman
+SET @MAP := 568;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(3104, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Main WS'),
+(3106, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 3104, '', 'Counter');
+
+-- Violet hold
+SET @MAP := 608;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(3816, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Main WS'),
+(3815, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 3816, '', 'Prisons'),
+(3810, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 3816, '', 'Portals');
+
+-- Ruby sanctum
+SET @MAP := 724;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(5051, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Main WS'),
+(5050, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 5051, '', 'Counter shadow'),
+(5049, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 5051, '', 'Counter real');
+
+-- Culling of Stratholme
+SET @MAP := 595;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(3479, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Crates WS'),
+(3480, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 3479, '', 'Crates count');
+
+-- Hyjal
+SET @MAP := 534;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(2453, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Enemy WS'),
+(2454, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 2453, '', 'Enemy count'),
+(2842, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Waves');
+
+-- Old hillsbrad
+SET @MAP := 560;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(2436, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Old Hillsbrad WS');
+
+-- Dark portal
+SET @MAP := 269;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(2541, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Main WS'),
+(2540, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 2541, '', 'Shield'),
+(2784, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Rift');
+
+-- Ulduar raid
+SET @MAP := 603;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(4132, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Algalon timer'),
+(4131, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 4132, '', 'Algalon timer counter');
+
+-- Halls of reflection
+SET @MAP := 668;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(4884, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'HOR Waves main WS'),
+(4882, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 4884, '', 'HOR Waves counter');
+
+-- Trial of Crusader
+SET @MAP := 649;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(4390, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'TOC attempts main WS'),
+(4389, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 4390, '', 'TOC attempts counter');
+
+-- Oculus
+SET @MAP := 578;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(3524, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Oculus CONSTRUCTS'),
+(3486, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 3524, '', 'Oculus CONSTRUCTS_COUNT');
+
+-- ICC
+SET @MAP := 631;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(4903, 4, @MAP, @FLAG_INITIAL_STATE, 0, 0, '', 'Quest 24874/24879 active'),
+(4904, 4, @MAP, @FLAG_INITIAL_STATE, 0, 4903, '', 'Quest 24874/24879 remining time');
+
+-- Culling of stratholme
+SET @MAP := 595;
+DELETE FROM `worldstate_template` WHERE `type` = 4 AND `condition` = @MAP;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(3479, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'COS Crates'),
+(3480, 4, @MAP, @FLAG_INITIAL_ACTIVE, 0, 3479, '', 'COS Crates count');
+
+-- Zones
+-- Ebon hold
+-- SET @MAP := 609;
+SET @_ZONE := 4298;
+DELETE FROM `worldstate_template` WHERE `type` = 5 AND `condition` = @_ZONE;
+INSERT INTO `worldstate_template` (`state_id`, `type`, `condition`, `flags`, `default`, `linked_id`, `ScriptName`, `comment`) VALUES
+(3592, 5, @_ZONE, @FLAG_INITIAL_ACTIVE, 0, 3605, '', 'Remains'),
+(3603, 5, @_ZONE, @FLAG_INITIAL_ACTIVE, 0, 3603, '', 'Countdown'),
+(3605, 5, @_ZONE, @FLAG_INITIAL_ACTIVE, 0, 0, '', 'Main WS');
+
+-- Arenas
diff --git a/sql_mr/mr02343_characters_item_refund_instance.sql b/sql_mr/mr02343_characters_item_refund_instance.sql
new file mode 100644
index 00000000000..0115f576237
--- /dev/null
+++ b/sql_mr/mr02343_characters_item_refund_instance.sql
@@ -0,0 +1,10 @@
+-- Implement item refund data storage table
+
+DROP TABLE IF EXISTS `item_refund_instance`;
+CREATE TABLE `item_refund_instance` (
+  `itemGuid` int(11) unsigned NOT NULL COMMENT 'Item Guid',
+  `playerGuid` int(11) unsigned NOT NULL COMMENT 'Player Guid',
+  `paidMoney` int(11) unsigned NOT NULL DEFAULT '0',
+  `paidExtendedCost` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`itemGuid`,`playerGuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Item Refund System';
diff --git a/sql_mr/mr02417_00_mangos_pet_spell_auras.sql b/sql_mr/mr02417_00_mangos_pet_spell_auras.sql
new file mode 100644
index 00000000000..a2df48fd553
--- /dev/null
+++ b/sql_mr/mr02417_00_mangos_pet_spell_auras.sql
@@ -0,0 +1,89 @@
+-- Pet spell auras
+DELETE FROM `spell_pet_auras` WHERE `aura`='54566'; -- Deathknight Pet Scaling
+DELETE FROM `spell_pet_auras` WHERE `spell` IN (34455,34459,34460); -- Ferocious Inspiration
+DELETE FROM `spell_pet_auras` WHERE `spell` IN (54037,54038); -- Improved Felhunter
+DELETE FROM `spell_pet_auras` WHERE `spell`='0' AND `pet` IN (1,89,416,417,510,1860,1863,15352,15438,17252,19668,24207,26125,27829,28017,29264,31216,37994);
+INSERT INTO `spell_pet_auras` (`spell`, `effectId`, `pet`, `aura`) VALUES
+-- Hunter Pets
+(0,0,1,34902),
+(0,0,1,34903),
+(0,0,1,34904),
+(0,0,1,61017),
+-- Warlock Infernal
+(0,0,89,34947),
+(0,0,89,34956),
+(0,0,89,34957),
+(0,0,89,34958),
+(0,0,89,61013),
+-- Warkock Imp
+(0,0,416,34947),
+(0,0,416,34956),
+(0,0,416,34957),
+(0,0,416,34958),
+(0,0,416,61013),
+-- Warlock Felhunter
+(0,0,417,34947),
+(0,0,417,34956),
+(0,0,417,34957),
+(0,0,417,34958),
+(0,0,417,61013),
+(54037,0,417,56249),
+(54038,0,417,56249),
+-- Mage Water Elemental (old guardian)
+(0,0,510,34947),
+(0,0,510,34956),
+-- Warlock Voidwalker
+(0,0,1860,34947),
+(0,0,1860,34956),
+(0,0,1860,34957),
+(0,0,1860,34958),
+(0,0,1860,61013),
+-- Warlock Succubus
+(0,0,1863,34947),
+(0,0,1863,34956),
+(0,0,1863,34957),
+(0,0,1863,34958),
+(0,0,1863,61013),
+-- Greater Earth Elemetal
+(0,0,15352,34947),
+-- Shaman Greater Fire Elemetal
+(0,0,15438,34956),
+(0,0,15438,34947),
+-- Warlock Felguard
+(0,0,17252,34947),
+(0,0,17252,34956),
+(0,0,17252,34957),
+(0,0,17252,34958),
+(0,0,17252,61013),
+-- Shadowfiend
+(0,0,19668,34947),
+-- Deathknight Army of the Dead Ghoul
+(0,0,24207,51996),
+(0,0,24207,54566),
+(0,0,24207,61697),
+(0,0,24207,50142),
+-- Deathknight Ghoul
+(0,0,26125,51996),
+(0,0,26125,54566),
+(0,0,26125,61697),
+(0,0,26125,50142),
+-- DK Gargoyle
+(0,0,27829,54566),
+-- Deathknight Bloodworms
+(0,0,28017,50453),
+-- Shaman Wolf
+(0,0,29264,58877),
+(0,0,29264,34902),
+(0,0,29264,34903),
+(0,0,29264,34904),
+(0,0,29264,61783),
+-- Mage Mirror Image
+(0,0,31216,49866),
+(0,0,31216,34947),
+-- Mage Water Elemental
+(0,0,37994,34947),
+(0,0,37994,34956),
+-- Ferocious Inspiration
+(34455,0,0,75593),
+(34459,0,0,75446),
+(34460,0,0,75447);
diff --git a/sql_mr/mr02420_mangos_creature_template_addon.sql b/sql_mr/mr02420_mangos_creature_template_addon.sql
new file mode 100644
index 00000000000..11b0bfa6827
--- /dev/null
+++ b/sql_mr/mr02420_mangos_creature_template_addon.sql
@@ -0,0 +1,9 @@
+-- fix shadowfiend
+-- UPDATE `creature_template_addon` SET `b2_1_pvp_state` = 40 WHERE `entry` = 19668;
+
+-- Scarlet Gryphon
+-- DELETE FROM `creature_template_addon` WHERE `entry` IN (28614,28616);
+
+-- Fixup DB
+-- DELETE FROM `creature_template_addon` WHERE `entry` IN (27241,27268,27661,27662, 31884, 24751, 28816, 29836, 38248, 30268, 32222, 38308, 38309, 29838, 29982, 30935, 30934); ???
+-- DELETE FROM `vehicle_accessory` WHERE `accessory_entry` = 36658; -- Scourgelord Tyrannus
diff --git a/sql_mr/mr02426_00_mangos_transport_gameobjects.sql b/sql_mr/mr02426_00_mangos_transport_gameobjects.sql
new file mode 100644
index 00000000000..1ac5efe967d
--- /dev/null
+++ b/sql_mr/mr02426_00_mangos_transport_gameobjects.sql
@@ -0,0 +1,6 @@
+-- Transport rewrite
+-- ICC normal ships
+UPDATE `gameobject_template` SET `data9` = 3 WHERE `entry` IN (201580,201581);
+-- ICC heroic ships
+UPDATE `gameobject_template` SET `data9` = 12 WHERE `entry` IN (201811,201812);
+
diff --git a/sql_mr/mr02426_01_mangos_transport_command.sql b/sql_mr/mr02426_01_mangos_transport_command.sql
new file mode 100644
index 00000000000..aa6fec7282d
--- /dev/null
+++ b/sql_mr/mr02426_01_mangos_transport_command.sql
@@ -0,0 +1,10 @@
+-- Transport rewrite
+DELETE FROM `command` WHERE `name` IN ('transport','transport go','transport list','transport current', 'transport path');
+INSERT INTO `command` (`name`, `security`, `help`) VALUES
+('transport', 3, 'Syntax: .transport #transportEntry\r\nGive info by transport entry.'),
+('transport go', 3, 'Syntax: .transport #transportEntry\r\nTeleport to transport position.'),
+('transport list', 3, 'Syntax: .transport list [#mapId]\r\nList transports on map mapId (or on current map).'),
+('transport current', 3, 'Syntax: .transport current\r\nCurrent transport parameters.'),
+('transport start', 3, 'Syntax: .transport start #transportEntry\r\nStart transport movement.'),
+('transport stop', 3, 'Syntax: .transport stop #transportEntry\r\nStop transport movement'),
+('transport path', 3, 'Syntax: .transport path [#transportEntry]\r\nList  Transport path for given entry (or current).');
diff --git a/sql_mr/mr02472_mangos_spell_script_target_addition.sql b/sql_mr/mr02472_mangos_spell_script_target_addition.sql
new file mode 100644
index 00000000000..ff01a77a189
--- /dev/null
+++ b/sql_mr/mr02472_mangos_spell_script_target_addition.sql
@@ -0,0 +1,27 @@
+-- Additions for spell_script_target
+/* NOTICE: Targets, which need often a spell_script_target entry are:
+    Target_Script - 38
+    Target_AreaEffect_Instant
+    maybe some more, but i think not
+*/
+
+-- Berserk - Sartharion encounter - target dragon bosses only
+INSERT IGNORE INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES 
+(61632, 1, 28860);
+
+-- Flaming Arrow ---- Quest Going Bearback (12851)
+DELETE FROM spell_script_target WHERE spell_script_target.entry = 54897;
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+(54897, 1, 29351),
+(54897, 1, 29358);
+
+-- Wintergrasp spell building targets
+DELETE FROM `spell_script_target` WHERE `entry` IN (56575,56661,56663,56665,56667,56669,61408);
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+(56575, 1, 27852),
+(56661, 1, 27852),
+(56663, 1, 27852),
+(56665, 1, 27852),
+(56667, 1, 27852),
+(56669, 1, 27852),
+(61408, 1, 27852);
diff --git a/sql_mr/mr02481_mangos_pet_spells.sql b/sql_mr/mr02481_mangos_pet_spells.sql
new file mode 100644
index 00000000000..e25b31be309
--- /dev/null
+++ b/sql_mr/mr02481_mangos_pet_spells.sql
@@ -0,0 +1,30 @@
+-- Pet (same pet and pet summon) spells correct (only for use with pet scaling system!)
+
+-- Need correct spellcasting for this!
+-- UPDATE creature_template SET spell1 = 12470, spell2 = 57984 WHERE entry = 15438;
+-- DELETE FROM `creature_template_spells` WHERE `entry` = 15352;
+UPDATE `creature_template_spells` SET `spell1` = 40133 WHERE `entry` = 15439;
+UPDATE `creature_template_spells` SET `spell1` = 40132 WHERE `entry` = 15430;
+
+DELETE FROM `dbscripts_on_event` WHERE `id` IN (14859,14858);
+INSERT INTO `dbscripts_on_event` (`id`, `delay`, `command`, `datalong`, `datalong2`, `buddy_entry`, `search_radius`, `data_flags`, `dataint`, `dataint2`, `x`, `y`, `z`, `o`, `comments`) VALUES
+(14858, 1, 15, 33663, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 'Summon greater Earth elemental'),
+(14859, 1, 15, 32982, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 'Summon greater Fire  elemental');
+
+-- Valkyr guardian
+UPDATE `creature_template` SET `MinLevelMana` = '6500', `MaxLevelMana` = '6500' WHERE `entry` =38391;
+REPLACE INTO `creature_template_spells` SET `entry` = 38391, `spell1` = 71841;
+REPLACE INTO `creature_spell` (`guid`,`spell`,`index`) VALUES (38391, 71841, 0);
+
+-- Mirror Image
+UPDATE `creature_template` SET `SpeedWalk` = 2.5, `ModelId3` = 11686, `MinLevel` = 80, `MaxLevel` = 80, `EquipmentTemplateId` = 0 WHERE `entry` = 31216;
+DELETE FROM `creature_spell` WHERE `guid` IN (31216);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`) VALUES
+(31216, 59637, 0),
+(31216, 59638, 1);
+
+-- DK Gargoyle
+DELETE FROM `creature_spell` WHERE `guid` IN (27829);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`) VALUES
+(27829, 51963, 0),
+(27829, 43375, 1);
diff --git a/sql_mr/mr02486_mangos_Strand_of_the_Ancients.sql b/sql_mr/mr02486_mangos_Strand_of_the_Ancients.sql
new file mode 100644
index 00000000000..ce4efcd5100
--- /dev/null
+++ b/sql_mr/mr02486_mangos_Strand_of_the_Ancients.sql
@@ -0,0 +1,640 @@
+-- Strand of the Ancients
+
+-- creature and gameobject initial guid
+SET @CREATURE := 510000;
+SET @GAMEOBJECT := 510000;
+
+DELETE FROM `creature` WHERE `guid` BETWEEN @CREATURE AND @CREATURE+9999;
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @GAMEOBJECT AND @GAMEOBJECT+9999;
+
+-- Rigger Sparklight
+UPDATE creature_template SET npcflag = 1, ScriptName = 'npc_sa_vendor' WHERE entry IN (29260, 29262);
+-- Seaforium source
+-- left this to remove old bad hack
+-- DELETE FROM creature_template WHERE entry = 50000;
+-- modify some "should not be changed" data in DB
+-- dummy radius for passing some check, only 1 charge and 10 seconds delay
+UPDATE gameobject_template SET data2 = 1, data4 = 1, data7 = 10 WHERE entry = 190752;
+-- set factions for 2 Massive Seaforium Bombs
+-- use these if needed in Your DB (maybe already have better factions?)
+-- UPDATE gameobject_template SET faction = 3 WHERE entry = 190753;
+-- UPDATE gameobject_template SET faction = 6 WHERE entry = 194086;
+
+-- Achievements
+DELETE FROM achievement_criteria_requirement WHERE criteria_id IN (6447);
+INSERT INTO achievement_criteria_requirement VALUES
+(6447, 6, 4384, 0);
+
+-- Doors
+UPDATE gameobject_template SET faction = 14 WHERE entry IN (192549, 190727, 190726, 190723, 190724, 190722);
+-- Cleanup for UDB, as ytdb doesnt have flag 16 there..
+-- UPDATE gameobject_template SET flags=flags|16 WHERE entry = 192829;
+UPDATE gameobject_template SET faction = 3 WHERE entry = 194082;
+UPDATE gameobject_template SET faction = 6 WHERE entry = 194083;
+-- make Defender's Portal usable by all factions (rest is handled by script)
+UPDATE gameobject_template SET faction=0 , ScriptName = 'go_sa_def_portal' WHERE entry = 191575;
+
+-- Massive Seaforium Charge (fix wrong use area - "Not valid area" message)
+UPDATE item_template SET area = 0, Map = 607 WHERE entry = 39213;
+
+-- Seaforium barrels
+UPDATE gameobject_template SET faction = 12, data0 = 52415, data1 = 1 WHERE entry = 190753;
+UPDATE gameobject_template SET faction = 29, data0 = 52415, data1 = 1 WHERE entry = 194086;
+UPDATE locales_gameobject SET name_loc3 = 'Zephyriumbombe', name_loc6 = 'Barril de Seforio', name_loc7 = 'Barril de Seforio' WHERE entry IN (190753, 194086);
+
+-- Banners - horde/alli occupied, clickable banner
+UPDATE gameobject_template SET flags = 0 WHERE entry IN (191309, 191310);
+
+-- Vehicles support
+-- Battleground Demolisher
+UPDATE creature_template SET npcflag = 0, minlevel = 70, maxlevel = 70, minhealth = 80000, maxhealth = 80000, mechanic_immune_mask = mechanic_immune_mask|1|2|8|16|32|64|128|1024|2048|4096|8192|131072|262144|8388608|16777216|67108864, vehicle_id = 158, ScriptName = '', AIName = 'NullAI' WHERE entry IN (28781, 32796);
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (28781, 32796);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(28781, 60968, 0, 0, 0, 1),
+(32796, 60968, 0, 0, 0, 1);
+-- Demolishers must not heal
+DELETE FROM creature_template_addon WHERE entry IN (28781, 32796);
+INSERT INTO creature_template_addon VALUES
+(28781, 0, 0, 0, 0, 0, 0, 52455),
+(32796, 0, 0, 0, 0, 0, 0, 52455);
+
+-- Antipersonnel Cannon
+UPDATE `creature_template` SET npcflag = 0, minlevel = 80, maxlevel = 80, iconName = 'Gunner', unit_flags=4, minhealth = 44910, maxhealth = 44910, faction_A = 35, faction_H = 35, RegenHealth=0, mechanic_immune_mask = mechanic_immune_mask|1|2|8|16|32|64|128|1024|2048|4096|8192|131072|262144|8388608|16777216|67108864, ScriptName = '', AIName = 'NullAI' WHERE entry IN (27894, 32795);
+DELETE FROM npc_spellclick_spells WHERE npc_entry IN (27894, 32795);
+INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(27894, 60968, 0, 0, 0, 1),
+(32795, 60968, 0, 0, 0, 1);
+-- Cannon must not heal
+DELETE FROM creature_template_addon WHERE entry IN (27894, 32795);
+INSERT INTO creature_template_addon VALUES
+(27894, 0, 0, 0, 0, 0, 0, 52455),
+(32795, 0, 0, 0, 0, 0, 0, 52455);
+
+-- Rigger Sparklight
+DELETE FROM creature WHERE guid BETWEEN @CREATURE+35 AND @CREATURE;
+INSERT INTO creature (guid,id,map,spawnMask,phaseMask,modelid,equipment_id,position_x,position_y,position_z,orientation,spawntimesecs,spawndist,currentwaypoint,curhealth,curmana,DeathState,MovementType)  VALUES
+(@CREATURE, 29260, 607, 3, 1, 0, 0, 1360.81, -322.18, 36.83, 0.32, 800, 0, 0, 6986, 0, 0, 0),
+(@CREATURE+1, 29262, 607, 3, 1, 0, 0, 1363.87, 220.95, 37.06, 2.67, 800, 0, 0, 6986, 0, 0, 0),
+-- Antipersonnel Cannon
+(@CREATURE+2, 27894, 607, 3, 1, 0, 0, 1421.94, -196.53, 42.18, 0.90, 800, 0, 0, 63000, 0, 0, 0),
+(@CREATURE+3, 27894, 607, 3, 1, 0, 0, 1455.09, -219.92, 41.95, 1.03, 800, 0, 0, 63000, 0, 0, 0),
+(@CREATURE+4, 27894, 607, 3, 1, 0, 0, 1405.33, 84.25, 41.18, 5.40, 800, 0, 0, 63000, 0, 0, 0),
+(@CREATURE+5, 27894, 607, 3, 1, 0, 0, 1436.51, 110.02, 41.40, 5.32, 800, 0, 0, 63000, 0, 0, 0),
+(@CREATURE+6, 27894, 607, 3, 1, 0, 0, 1236.33, 92.17, 64.96, 5.68, 800, 0, 0, 63000, 0, 0, 0),
+(@CREATURE+7, 27894, 607, 3, 1, 0, 0, 1215.04, 57.73, 64.73, 5.71, 800, 0, 0, 63000, 0, 0, 0),
+(@CREATURE+8, 27894, 607, 3, 1, 0, 0, 1232.35, -187.34, 66.94, 0.37, 800, 0, 0, 63000, 0, 0, 0),
+(@CREATURE+9, 27894, 607, 3, 1, 0, 0, 1249.95, -223.74, 66.72, 0.43, 800, 0, 0, 63000, 0, 0, 0),
+(@CREATURE+10, 27894, 607, 3, 1, 0, 0, 1068.82, -127.38, 96.44, 0.06, 800, 0, 0, 63000, 0, 0, 0),
+(@CREATURE+11, 27894, 607, 3, 1, 0, 0, 1068.35, -87.04, 93.80, 6.24, 800, 0, 0, 63000, 0, 0, 0),
+-- Battleground Demolisher
+(@CREATURE+12, 28781, 607, 3, 1, 0, 0, 1582.57, -96.37, 8.47, 5.57, 10, 0, 0, 80000, 0, 0, 0),
+(@CREATURE+13, 28781, 607, 3, 1, 0, 0, 1610.55, -117.52, 8.77, 2.44, 10, 0, 0, 80000, 0, 0, 0),
+(@CREATURE+14, 28781, 607, 3, 1, 0, 0, 1594.24, 39.16, 7.49, 0.62, 10, 0, 0, 80000, 0, 0, 0),
+(@CREATURE+15, 28781, 607, 3, 1, 0, 0, 1618.60, 62.26, 7.17, 3.61, 10, 0, 0, 80000, 0, 0, 0),
+(@CREATURE+16, 28781, 607, 3, 1, 0, 0, 1371.2, -317.169, 34.9982, 1.93504, 10, 0, 0, 80000, 0, 0, 0),
+(@CREATURE+17, 28781, 607, 3, 1, 0, 0, 1365.52, -301.854, 34.0439, 1.91998, 10, 0, 0, 80000, 0, 0, 0),
+(@CREATURE+18, 28781, 607, 3, 1, 0, 0, 1353.28, 224.092, 35.2432, 4.35363, 10, 0, 0, 80000, 0, 0, 0),
+(@CREATURE+19, 28781, 607, 3, 1, 0, 0, 1347.65, 208.805, 34.2892, 4.39378, 10, 0, 0, 80000, 0, 0, 0),
+-- Horde and Alliance Spirit Guides
+(@CREATURE+20, 13116, 607, 3, 1, 0, 0, 1400.49, -293.963, 32.0608, 2.08096, 10, 0, 0, 37890, 6310, 0, 0),
+(@CREATURE+21, 13117, 607, 3, 1, 0, 0, 1400.49, -293.963, 32.0608, 2.08096, 10, 0, 0, 37420, 6310, 0, 0),
+(@CREATURE+22, 13116, 607, 3, 1, 0, 0, 1400.49, -293.963, 32.0608, 2.08096, 10, 0, 0, 37890, 6310, 0, 0),
+(@CREATURE+23, 13117, 607, 3, 1, 0, 0, 1400.49, -293.963, 32.0608, 2.08096, 10, 0, 0, 37420, 6310, 0, 0),
+(@CREATURE+24, 13116, 607, 3, 1, 0, 0, 1389.22, 205.673, 32.0597, 4.445, 10, 0, 0, 37890, 6310, 0, 0),
+(@CREATURE+25, 13117, 607, 3, 1, 0, 0, 1389.22, 205.673, 32.0597, 4.445, 10, 0, 0, 37420, 6310, 0, 0),
+(@CREATURE+26, 13116, 607, 3, 1, 0, 0, 1389.22, 205.673, 32.0597, 4.445, 10, 0, 0, 37890, 6310, 0, 0),
+(@CREATURE+27, 13117, 607, 3, 1, 0, 0, 1389.22, 205.673, 32.0597, 4.445, 10, 0, 0, 37420, 6310, 0, 0),
+(@CREATURE+28, 13116, 607, 3, 1, 0, 0, 1111.58, 6.40605, 69.2963, 6.20037, 10, 0, 0, 37890, 6310, 0, 0),
+(@CREATURE+29, 13117, 607, 3, 1, 0, 0, 1111.58, 6.40605, 69.2963, 6.20037, 10, 0, 0, 37420, 6310, 0, 0),
+(@CREATURE+30, 13116, 607, 3, 1, 0, 0, 1111.58, 6.40605, 69.2963, 6.20037, 10, 0, 0, 37890, 6310, 0, 0),
+(@CREATURE+31, 13117, 607, 3, 1, 0, 0, 1111.58, 6.40605, 69.2963, 6.20037, 10, 0, 0, 37420, 6310, 0, 0),
+(@CREATURE+32, 13116, 607, 3, 1, 0, 0, 952.963, -192.742, 92.3584, 0.35779, 10, 0, 0, 37890, 6310, 0, 0),
+(@CREATURE+33, 13117, 607, 3, 1, 0, 0, 952.963, -192.742, 92.3584, 0.35779, 10, 0, 0, 37420, 6310, 0, 0),
+(@CREATURE+34, 13116, 607, 3, 1, 0, 0, 1448.78, -52.9605, 5.74272, 0.0530517, 10, 0, 0, 37890, 6310, 0, 0),
+(@CREATURE+35, 13117, 607, 3, 1, 0, 0, 1448.78, -52.9605, 5.74272, 0.0530517, 10, 0, 0, 37420, 6310, 0, 0);
+
+DELETE FROM creature_battleground WHERE guid IN (SELECT guid FROM creature WHERE `map` = 607);
+INSERT INTO creature_battleground VALUES
+-- Workshops
+(@CREATURE, 9, 0),
+(@CREATURE+1, 9, 0),
+-- Antipersonnel Cannon
+(@CREATURE+2, 10, 0),
+(@CREATURE+3, 10, 0),
+(@CREATURE+4, 10, 0),
+(@CREATURE+5, 10, 0),
+(@CREATURE+6, 10, 0),
+(@CREATURE+7, 10, 0),
+(@CREATURE+8, 10, 0),
+(@CREATURE+9, 10, 0),
+(@CREATURE+10, 10, 0),
+(@CREATURE+11, 10, 0),
+-- Battleground Demolisher
+(@CREATURE+12, 9, 0),
+(@CREATURE+13, 9, 0),
+(@CREATURE+14, 9, 0),
+(@CREATURE+15, 9, 0),
+(@CREATURE+16, 12, 0),
+(@CREATURE+17, 12, 0),
+(@CREATURE+18, 13, 0),
+(@CREATURE+19, 13, 0),
+-- Horde and Alliance Spirit Guides
+(@CREATURE+20, 0, 1),
+(@CREATURE+21, 0, 2),
+(@CREATURE+22, 0, 3),
+(@CREATURE+23, 0, 4),
+(@CREATURE+24, 1, 1),
+(@CREATURE+25, 1, 2),
+(@CREATURE+26, 1, 3),
+(@CREATURE+27, 1, 4),
+(@CREATURE+28, 2, 1),
+(@CREATURE+29, 2, 2),
+(@CREATURE+30, 2, 3),
+(@CREATURE+31, 2, 4),
+(@CREATURE+32, 3, 3),
+(@CREATURE+33, 3, 4),
+(@CREATURE+34, 4, 3),
+(@CREATURE+35, 4, 4);
+
+DELETE FROM gameobject WHERE guid BETWEEN @GAMEOBJECT + 182 AND @GAMEOBJECT;
+INSERT INTO gameobject VALUES
+-- Titan Relic & Doors
+(@GAMEOBJECT, 194082, 607, 3, 1, 836.502, -108.811, 111.587, 0.121379, 0, 0, 0.0606524, 0.998159, 86400, 0, 1),
+(@GAMEOBJECT+1, 194083, 607, 3, 1, 836.502, -108.811, 111.587, 0.121379, 0, 0, 0.0606524, 0.998159, 86400, 0, 1),
+(@GAMEOBJECT+2, 190727, 607, 3, 1, 1054.47, -107.76, 82.16, 0.06, 0, 0, 0.008726535, 0.9999619, 600, 0, 1),
+(@GAMEOBJECT+3, 190726, 607, 3, 1, 1228.62, -212.12, 55.34, 0.48, 0, 0, 0.008726535, 0.9999619, 600, 0, 1),
+(@GAMEOBJECT+4, 190723, 607, 3, 1, 1215.82, 80.64, 53.38, 5.68, 0, 0, 0.008726535, 0.9999619, 600, 0, 1),
+(@GAMEOBJECT+5, 190724, 607, 3, 1, 1431.05, -219.21, 30.89, 0.83, 0, 0, 0.008726535, 0.9999619, 600, 0, 1),
+(@GAMEOBJECT+6, 190722, 607, 3, 1, 1413.15, 107.78, 28.69, 5.42, 0, 0, 0.008726535, 0.9999619, 600, 0, 1),
+(@GAMEOBJECT+7, 192549, 607, 3, 1, 873.3, -108.286, 117.171, 0.00894308, 0, 0, 0.00447152, 0.99999, 600, 0, 1),
+
+-- Flags
+(@GAMEOBJECT+8, 180058, 607, 3, 1, 1337.23, -157.79, 30.8947, 3.51587, 0, 0, 0.982541, -0.186048, 86400, 100, 1), -- Alliance contested banner
+(@GAMEOBJECT+9, 180060, 607, 3, 1, 1337.23, -157.79, 30.8947, 3.51587, 0, 0, 0.982541, -0.186048, 86400, 100, 1), -- Horde contested banner
+(@GAMEOBJECT+10, 180058, 607, 3, 1, 1337.23, -157.79, 30.8947, 3.51587, 0, 0, 0.982541, -0.186048, 86400, 100, 1), -- Alliance occupied banner (not clickable)
+(@GAMEOBJECT+11, 180060, 607, 3, 1, 1337.23, -157.79, 30.8947, 3.51587, 0, 0, 0.982541, -0.186048, 86400, 100, 1), -- Horde occupied banner
+(@GAMEOBJECT+12, 180100, 607, 3, 1, 1337.23, -157.79, 30.8947, 3.51587, 0, 0, 0.982541, -0.186048, 86400, 100, 1), -- Alliance Banner Aura, for contested state
+(@GAMEOBJECT+13, 180101, 607, 3, 1, 1337.23, -157.79, 30.8947, 3.51587, 0, 0, 0.982541, -0.186048, 86400, 100, 1), -- Horde Banner Aura, for contested state
+(@GAMEOBJECT+14, 180100, 607, 3, 1, 1337.23, -157.79, 30.8947, 3.51587, 0, 0, 0.982541, -0.186048, 86400, 100, 1), -- Alliance Banner Aura, for occupied state
+(@GAMEOBJECT+15, 180101, 607, 3, 1, 1337.23, -157.79, 30.8947, 3.51587, 0, 0, 0.982541, -0.186048, 86400, 100, 1), -- Horde Banner Aura, for occupied state
+(@GAMEOBJECT+16, 191311, 607, 3, 1, 1337.23, -157.79, 30.8947, 3.51587, 0, 0, 0.982541, -0.186048, 86400, 100, 1), -- Flagpole
+
+(@GAMEOBJECT+17, 180058, 607, 3, 1, 1315.55, 11.8483, 31.2072, 2.85221, 0, 0, 0.989551, 0.144186, 86400, 100, 1), -- Alliance Banner
+(@GAMEOBJECT+18, 180060, 607, 3, 1, 1315.55, 11.8483, 31.2072, 2.85221, 0, 0, 0.989551, 0.144186, 86400, 100, 1), -- Horde Banner
+(@GAMEOBJECT+19, 180058, 607, 3, 1, 1315.55, 11.8483, 31.2072, 2.85221, 0, 0, 0.989551, 0.144186, 86400, 100, 1), -- Alliance Banner
+(@GAMEOBJECT+20, 180060, 607, 3, 1, 1315.55, 11.8483, 31.2072, 2.85221, 0, 0, 0.989551, 0.144186, 86400, 100, 1), -- Horde Banner
+(@GAMEOBJECT+21, 180100, 607, 3, 1, 1315.55, 11.8483, 31.2072, 2.85221, 0, 0, 0.989551, 0.144186, 86400, 100, 1), -- Alliance Banner Aura
+(@GAMEOBJECT+22, 180101, 607, 3, 1, 1315.55, 11.8483, 31.2072, 2.85221, 0, 0, 0.989551, 0.144186, 86400, 100, 1), -- Horde Banner Aura
+(@GAMEOBJECT+23, 180100, 607, 3, 1, 1315.55, 11.8483, 31.2072, 2.85221, 0, 0, 0.989551, 0.144186, 86400, 100, 1), -- Alliance Banner Aura
+(@GAMEOBJECT+24, 180101, 607, 3, 1, 1315.55, 11.8483, 31.2072, 2.85221, 0, 0, 0.989551, 0.144186, 86400, 100, 1), -- Horde Banner Aura
+(@GAMEOBJECT+25, 191311, 607, 3, 1, 1315.55, 11.8483, 31.2072, 2.85221, 0, 0, 0.989551, 0.144186, 86400, 100, 1), -- Flagpole
+
+(@GAMEOBJECT+26, 180058, 607, 3, 1, 1206.8, -68.2148, 70.0845, 3.14279, 0, 0, 1, -0.00059919, 86400, 100, 1), -- Alliance Banner
+(@GAMEOBJECT+27, 180060, 607, 3, 1, 1206.8, -68.2148, 70.0845, 3.14279, 0, 0, 1, -0.00059919, 86400, 100, 1), -- Horde Banner
+(@GAMEOBJECT+28, 180058, 607, 3, 1, 1206.8, -68.2148, 70.0845, 3.14279, 0, 0, 1, -0.00059919, 86400, 100, 1), -- Alliance Banner
+(@GAMEOBJECT+29, 180060, 607, 3, 1, 1206.8, -68.2148, 70.0845, 3.14279, 0, 0, 1, -0.00059919, 86400, 100, 1), -- Horde Banner
+(@GAMEOBJECT+30, 180100, 607, 3, 1, 1206.8, -68.2148, 70.0845, 3.14279, 0, 0, 1, -0.00059919, 86400, 100, 1), -- Alliance Banner Aura
+(@GAMEOBJECT+31, 180101, 607, 3, 1, 1206.8, -68.2148, 70.0845, 3.14279, 0, 0, 1, -0.00059919, 86400, 100, 1), -- Horde Banner Aura
+(@GAMEOBJECT+32, 180100, 607, 3, 1, 1206.8, -68.2148, 70.0845, 3.14279, 0, 0, 1, -0.00059919, 86400, 100, 1), -- Alliance Banner Aura
+(@GAMEOBJECT+33, 180101, 607, 3, 1, 1206.8, -68.2148, 70.0845, 3.14279, 0, 0, 1, -0.00059919, 86400, 100, 1), -- Horde Banner Aura
+(@GAMEOBJECT+34, 191311, 607, 3, 1, 1206.8, -68.2148, 70.0845, 3.14279, 0, 0, 1, -0.00059919, 86400, 100, 1), -- Flagpole
+-- Defender's Portal
+(@GAMEOBJECT+35, 191575, 607, 3, 1, 1468.12, -225.7, 30.8969, 5.68042, 0, 0, 0.296839, -0.954928, 25, 0, 1),
+(@GAMEOBJECT+36, 191575, 607, 3, 1, 1394.07, 72.3632, 31.0541, 0.818809, 0, 0, 0.398063, 0.917358, 25, 0, 1),
+(@GAMEOBJECT+37, 191575, 607, 3, 1, 1216.12, 47.7665, 54.2785, 4.05465, 0, 0, 0.897588, -0.440835, 25, 0, 1),
+(@GAMEOBJECT+38, 191575, 607, 3, 1, 1255.73, -233.153, 56.4357, 5.01833, 0, 0, 0.591105, -0.806595, 25, 0, 1),
+(@GAMEOBJECT+39, 191575, 607, 3, 1, 1065.02, -89.9522, 81.0758, 1.58771, 0, 0, 0.71306, 0.701103, 25, 0, 1),
+(@GAMEOBJECT+40, 191575, 607, 3, 1, 880.162, -95.979, 109.835, 3.14672, 0, 0, 0.999997, -0.00256531, 25, 0, 1),
+(@GAMEOBJECT+41, 191575, 607, 3, 1, 880.68, -120.799, 109.835, 3.16636, 0, 0, 0.999923, -0.0123816, 25, 0, 1),
+-- Seaforium Bombs
+-- Western base bombs
+(@GAMEOBJECT+42, 190753 , 607 , 3 , 1 , 1333.45 , 211.354 , 31.0538 , 5.03666 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+43, 190753 , 607 , 3 , 1 , 1334.29 , 209.582 , 31.0532 , 1.28088 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+44, 190753 , 607 , 3 , 1 , 1332.72 , 210.049 , 31.0532 , 1.28088 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+45, 190753 , 607 , 3 , 1 , 1334.28 , 210.78 , 31.0538 , 3.85856 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+46, 190753 , 607 , 3 , 1 , 1332.64 , 211.39 , 31.0532 , 1.29266 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+47, 190753 , 607 , 3 , 1 , 1371.41 , 194.028 , 31.5107 , 0.753095 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+48, 190753 , 607 , 3 , 1 , 1372.39 , 194.951 , 31.4679 , 0.753095 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+49, 190753 , 607 , 3 , 1 , 1371.58 , 196.942 , 30.9349 , 1.01777 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+50, 190753 , 607 , 3 , 1 , 1370.43 , 196.614 , 30.9349 , 0.957299 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+51, 190753 , 607 , 3 , 1 , 1369.46 , 196.877 , 30.9351 , 2.45348 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+52, 190753 , 607 , 3 , 1 , 1370.35 , 197.361 , 30.9349 , 1.08689 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+53, 190753 , 607 , 3 , 1 , 1369.47 , 197.941 , 30.9349 , 0.984787 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+54, 194086 , 607 , 3 , 1 , 1333.45 , 211.354 , 31.0538 , 5.03666 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+55, 194086 , 607 , 3 , 1 , 1334.29 , 209.582 , 31.0532 , 1.28088 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+56, 194086 , 607 , 3 , 1 , 1332.72 , 210.049 , 31.0532 , 1.28088 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+57, 194086 , 607 , 3 , 1 , 1334.28 , 210.78 , 31.0538 , 3.85856 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+58, 194086 , 607 , 3 , 1 , 1332.64 , 211.39 , 31.0532 , 1.29266 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+59, 194086 , 607 , 3 , 1 , 1371.41 , 194.028 , 31.5107 , 0.753095 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+60, 194086 , 607 , 3 , 1 , 1372.39 , 194.951 , 31.4679 , 0.753095 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+61, 194086 , 607 , 3 , 1 , 1371.58 , 196.942 , 30.9349 , 1.01777 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+62, 194086 , 607 , 3 , 1 , 1370.43 , 196.614 , 30.9349 , 0.957299 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+63, 194086 , 607 , 3 , 1 , 1369.46 , 196.877 , 30.9351 , 2.45348 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+64, 194086 , 607 , 3 , 1 , 1370.35 , 197.361 , 30.9349 , 1.08689 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+65, 194086 , 607 , 3 , 1 , 1369.47 , 197.941 , 30.9349 , 0.984787 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+-- Beach bombs
+(@GAMEOBJECT+66, 190753 , 607 , 3 , 1 , 1592.49 , 47.5969 , 7.52271 , 4.63218 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+67, 190753 , 607 , 3 , 1 , 1593.91 , 47.8036 , 7.65856 , 4.63218 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+68, 190753 , 607 , 3 , 1 , 1593.13 , 46.8106 , 7.54073 , 4.63218 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+69, 190753 , 607 , 3 , 1 , 1589.22 , 36.3616 , 7.45975 , 4.64396 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+70, 190753 , 607 , 3 , 1 , 1588.24 , 35.5842 , 7.55613 , 4.79564 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+71, 190753 , 607 , 3 , 1 , 1588.14 , 36.7611 , 7.49675 , 4.79564 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+72, 190753 , 607 , 3 , 1 , 1595.74 , 35.5278 , 7.46602 , 4.90246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+73, 190753 , 607 , 3 , 1 , 1596 , 36.6475 , 7.47991 , 4.90246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+74, 190753 , 607 , 3 , 1 , 1597.03 , 36.2356 , 7.48631 , 4.90246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+75, 190753 , 607 , 3 , 1 , 1597.93 , 37.1214 , 7.51725 , 4.90246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+76, 190753 , 607 , 3 , 1 , 1598.16 , 35.888 , 7.50018 , 4.90246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+77, 190753 , 607 , 3 , 1 , 1579.6 , -98.0917 , 8.48478 , 1.37996 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+78, 190753 , 607 , 3 , 1 , 1581.2 , -98.401 , 8.47483 , 1.37996 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+79, 190753 , 607 , 3 , 1 , 1580.38 , -98.9556 , 8.4772 , 1.38781 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+80, 190753 , 607 , 3 , 1 , 1585.68 , -104.966 , 8.88551 , 0.493246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+81, 190753 , 607 , 3 , 1 , 1586.15 , -106.033 , 9.10616 , 0.493246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+82, 190753 , 607 , 3 , 1 , 1584.88 , -105.394 , 8.82985 , 0.493246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+83, 190753 , 607 , 3 , 1 , 1581.87 , -100.899 , 8.46164 , 0.929142 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+84, 190753 , 607 , 3 , 1 , 1581.48 , -99.4657 , 8.46926 , 0.929142 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+85, 190753 , 607 , 3 , 1 , 1583.2 , -91.2291 , 8.49227 , 1.40038 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+86, 190753 , 607 , 3 , 1 , 1581.94 , -91.0119 , 8.49977 , 1.40038 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+87, 190753 , 607 , 3 , 1 , 1582.33 , -91.951 , 8.49353 , 1.1844 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+88, 194086 , 607 , 3 , 1 , 1592.49 , 47.5969 , 7.52271 , 4.63218 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+89, 194086 , 607 , 3 , 1 , 1593.91 , 47.8036 , 7.65856 , 4.63218 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+90, 194086 , 607 , 3 , 1 , 1593.13 , 46.8106 , 7.54073 , 4.63218 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+91, 194086 , 607 , 3 , 1 , 1589.22 , 36.3616 , 7.45975 , 4.64396 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+92, 194086 , 607 , 3 , 1 , 1588.24 , 35.5842 , 7.55613 , 4.79564 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+93, 194086 , 607 , 3 , 1 , 1588.14 , 36.7611 , 7.49675 , 4.79564 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+94, 194086 , 607 , 3 , 1 , 1595.74 , 35.5278 , 7.46602 , 4.90246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+95, 194086 , 607 , 3 , 1 , 1596 , 36.6475 , 7.47991 , 4.90246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+96, 194086 , 607 , 3 , 1 , 1597.03 , 36.2356 , 7.48631 , 4.90246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+97, 194086 , 607 , 3 , 1 , 1597.93 , 37.1214 , 7.51725 , 4.90246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+98, 194086 , 607 , 3 , 1 , 1598.16 , 35.888 , 7.50018 , 4.90246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+99, 194086 , 607 , 3 , 1 , 1579.6 , -98.0917 , 8.48478 , 1.37996 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+100, 194086 , 607 , 3 , 1 , 1581.2 , -98.401 , 8.47483 , 1.37996 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+101, 194086 , 607 , 3 , 1 , 1580.38 , -98.9556 , 8.4772 , 1.38781 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+102, 194086 , 607 , 3 , 1 , 1585.68 , -104.966 , 8.88551 , 0.493246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+103, 194086 , 607 , 3 , 1 , 1586.15 , -106.033 , 9.10616 , 0.493246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+104, 194086 , 607 , 3 , 1 , 1584.88 , -105.394 , 8.82985 , 0.493246 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+105, 194086 , 607 , 3 , 1 , 1581.87 , -100.899 , 8.46164 , 0.929142 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+106, 194086 , 607 , 3 , 1 , 1581.48 , -99.4657 , 8.46926 , 0.929142 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+107, 194086 , 607 , 3 , 1 , 1583.2 , -91.2291 , 8.49227 , 1.40038 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+108, 194086 , 607 , 3 , 1 , 1581.94 , -91.0119 , 8.49977 , 1.40038 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+109, 194086 , 607 , 3 , 1 , 1582.33 , -91.951 , 8.49353 , 1.1844 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+-- Eastern base bombs
+(@GAMEOBJECT+110 , 190753 , 607 , 3 , 1 , 1342.06 , -304.049 , 30.9532 , 5.59507 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+111, 190753 , 607 , 3 , 1 , 1340.96 , -304.536 , 30.9458 , 1.28323 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+112, 190753 , 607 , 3 , 1 , 1341.22 , -303.316 , 30.9413 , 0.486051 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+113, 190753 , 607 , 3 , 1 , 1342.22 , -302.939 , 30.986 , 4.87643 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+114, 190753 , 607 , 3 , 1 , 1382.16 , -287.466 , 32.3063 , 4.80968 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+115, 190753 , 607 , 3 , 1 , 1381 , -287.58 , 32.2805 , 4.80968 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+116, 190753 , 607 , 3 , 1 , 1381.55 , -286.536 , 32.3929 , 2.84225 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+117, 190753 , 607 , 3 , 1 , 1382.75 , -286.354 , 32.4099 , 1.00442 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+118, 190753 , 607 , 3 , 1 , 1379.92 , -287.34 , 32.2872 , 3.81615 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+119, 194086 , 607 , 3 , 1 , 1342.06 , -304.049 , 30.9532 , 5.59507 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+120, 194086 , 607 , 3 , 1 , 1340.96 , -304.536 , 30.9458 , 1.28323 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+121, 194086 , 607 , 3 , 1 , 1341.22 , -303.316 , 30.9413 , 0.486051 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+122, 194086 , 607 , 3 , 1 , 1342.22 , -302.939 , 30.986 , 4.87643 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+123, 194086 , 607 , 3 , 1 , 1382.16 , -287.466 , 32.3063 , 4.80968 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+124, 194086 , 607 , 3 , 1 , 1381 , -287.58 , 32.2805 , 4.80968 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+125, 194086 , 607 , 3 , 1 , 1381.55 , -286.536 , 32.3929 , 2.84225 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+126, 194086 , 607 , 3 , 1 , 1382.75 , -286.354 , 32.4099 , 1.00442 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+127, 194086 , 607 , 3 , 1 , 1379.92 , -287.34 , 32.2872 , 3.81615 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+-- Middle bombs (both beach and relic side)
+(@GAMEOBJECT+128 , 190753 , 607 , 3 , 1 , 1100.52 , -2.41391 , 70.2984 , 0.131054 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+129, 190753 , 607 , 3 , 1 , 1099.35 , -2.13851 , 70.3375 , 4.4586 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+130, 190753 , 607 , 3 , 1 , 1099.59 , -1.00329 , 70.238 , 2.49903 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+131, 190753 , 607 , 3 , 1 , 1097.79 , 0.571316 , 70.159 , 4.00307 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+132, 190753 , 607 , 3 , 1 , 1098.74 , -7.23252 , 70.7972 , 4.1523 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+133, 190753 , 607 , 3 , 1 , 1098.46 , -5.91443 , 70.6715 , 4.1523 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+134, 190753 , 607 , 3 , 1 , 1097.53 , -7.39704 , 70.7959 , 4.1523 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+135, 190753 , 607 , 3 , 1 , 1097.32 , -6.64233 , 70.7424 , 4.1523 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+136, 190753 , 607 , 3 , 1 , 1096.45 , -5.96664 , 70.7242 , 4.1523 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+137, 190753 , 607 , 3 , 1 , 971.725 , 0.496763 , 86.8467 , 2.09233 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+138, 190753 , 607 , 3 , 1 , 973.589 , 0.119518 , 86.7985 , 3.17225 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+139, 190753 , 607 , 3 , 1 , 972.524 , 1.25333 , 86.8351 , 5.28497 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+140, 190753 , 607 , 3 , 1 , 971.993 , 2.05668 , 86.8584 , 5.28497 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+141, 190753 , 607 , 3 , 1 , 973.635 , 2.11805 , 86.8197 , 2.36722 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+142, 190753 , 607 , 3 , 1 , 974.791 , 1.74679 , 86.7942 , 1.5936 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+143, 190753 , 607 , 3 , 1 , 974.771 , 3.0445 , 86.8125 , 0.647199 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+144, 190753 , 607 , 3 , 1 , 979.554 , 3.6037 , 86.7923 , 1.69178 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+145, 190753 , 607 , 3 , 1 , 979.758 , 2.57519 , 86.7748 , 1.76639 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+146, 190753 , 607 , 3 , 1 , 980.769 , 3.48904 , 86.7939 , 1.76639 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+147, 190753 , 607 , 3 , 1 , 979.122 , 2.87109 , 86.7794 , 1.76639 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+148, 190753 , 607 , 3 , 1 , 986.167 , 4.85363 , 86.8439 , 1.5779 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+149, 190753 , 607 , 3 , 1 , 986.176 , 3.50367 , 86.8217 , 1.5779 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+150, 190753 , 607 , 3 , 1 , 987.33 , 4.67389 , 86.8486 , 1.5779 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+151, 190753 , 607 , 3 , 1 , 985.23 , 4.65898 , 86.8368 , 1.5779 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+152, 190753 , 607 , 3 , 1 , 984.556 , 3.54097 , 86.8137 , 1.5779 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+153, 194086 , 607 , 3 , 1 , 1100.52 , -2.41391 , 70.2984 , 0.131054 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+154, 194086 , 607 , 3 , 1 , 1099.35 , -2.13851 , 70.3375 , 4.4586 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+155, 194086 , 607 , 3 , 1 , 1099.59 , -1.00329 , 70.238 , 2.49903 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+156, 194086 , 607 , 3 , 1 , 1097.79 , 0.571316 , 70.159 , 4.00307 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+157, 194086 , 607 , 3 , 1 , 1098.74 , -7.23252 , 70.7972 , 4.1523 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+158, 194086 , 607 , 3 , 1 , 1098.46 , -5.91443 , 70.6715 , 4.1523 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+159, 194086 , 607 , 3 , 1 , 1097.53 , -7.39704 , 70.7959 , 4.1523 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+160, 194086 , 607 , 3 , 1 , 1097.32 , -6.64233 , 70.7424 , 4.1523 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+161, 194086 , 607 , 3 , 1 , 1096.45 , -5.96664 , 70.7242 , 4.1523 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+162, 194086 , 607 , 3 , 1 , 971.725 , 0.496763 , 86.8467 , 2.09233 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+163, 194086 , 607 , 3 , 1 , 973.589 , 0.119518 , 86.7985 , 3.17225 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+164, 194086 , 607 , 3 , 1 , 972.524 , 1.25333 , 86.8351 , 5.28497 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+165, 194086 , 607 , 3 , 1 , 971.993 , 2.05668 , 86.8584 , 5.28497 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+166, 194086 , 607 , 3 , 1 , 973.635 , 2.11805 , 86.8197 , 2.36722 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+167, 194086 , 607 , 3 , 1 , 974.791 , 1.74679 , 86.7942 , 1.5936 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+168, 194086 , 607 , 3 , 1 , 974.771 , 3.0445 , 86.8125 , 0.647199 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+169, 194086 , 607 , 3 , 1 , 979.554 , 3.6037 , 86.7923 , 1.69178 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+170, 194086 , 607 , 3 , 1 , 979.758 , 2.57519 , 86.7748 , 1.76639 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+171, 194086 , 607 , 3 , 1 , 980.769 , 3.48904 , 86.7939 , 1.76639 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+172, 194086 , 607 , 3 , 1 , 979.122 , 2.87109 , 86.7794 , 1.76639 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+173, 194086 , 607 , 3 , 1 , 986.167 , 4.85363 , 86.8439 , 1.5779 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+174, 194086 , 607 , 3 , 1 , 986.176 , 3.50367 , 86.8217 , 1.5779 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+175, 194086 , 607 , 3 , 1 , 987.33 , 4.67389 , 86.8486 , 1.5779 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+176, 194086 , 607 , 3 , 1 , 985.23 , 4.65898 , 86.8368 , 1.5779 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+177, 194086 , 607 , 3 , 1 , 984.556 , 3.54097 , 86.8137 , 1.5779 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+178, 192687 , 607 , 3 , 1 , 1415.57 , 105.176 , 41.5615 , 5.44516 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+179, 192689 , 607 , 3 , 1 , 1433.34 , -216.488 , 43.4646 , 0.871786 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+180, 192690 , 607 , 3 , 1 , 1231.73 , -210.455 , 67.8883 , 0.512855 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+181, 192691 , 607 , 3 , 1 , 1218.8 , 78.7113 , 65.5368 , 5.64543 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
+(@GAMEOBJECT+182, 192685 , 607 , 3 , 1 , 1057.88 , -107.601 , 94.7255 , 0.0471208 , 0 , 0 , 0 , 0 , 10 , 0 , 0);
+
+DELETE FROM gameobject_battleground WHERE guid IN (SELECT guid FROM gameobject WHERE map=607);
+INSERT INTO gameobject_battleground VALUES
+-- Titan Relic & Doors
+(@GAMEOBJECT, 14, 1),
+(@GAMEOBJECT+1, 14, 2),
+(@GAMEOBJECT+2, 11, 0),
+(@GAMEOBJECT+3, 11, 0),
+(@GAMEOBJECT+4, 11, 0),
+(@GAMEOBJECT+5, 11, 0),
+(@GAMEOBJECT+6, 11, 0),
+(@GAMEOBJECT+7, 11, 0),
+
+(@GAMEOBJECT+8, 0, 1),
+(@GAMEOBJECT+9, 0, 2),
+(@GAMEOBJECT+10, 0, 3),
+(@GAMEOBJECT+11, 0, 4),
+(@GAMEOBJECT+12, 0, 1),
+(@GAMEOBJECT+13, 0, 2),
+(@GAMEOBJECT+14, 0, 3),
+(@GAMEOBJECT+15, 0, 4),
+(@GAMEOBJECT+16, 11, 0),
+
+(@GAMEOBJECT+17, 1, 1),
+(@GAMEOBJECT+18, 1, 2),
+(@GAMEOBJECT+19, 1, 3),
+(@GAMEOBJECT+20, 1, 4),
+(@GAMEOBJECT+21, 1, 1),
+(@GAMEOBJECT+22, 1, 2),
+(@GAMEOBJECT+23, 1, 3),
+(@GAMEOBJECT+24, 1, 4),
+(@GAMEOBJECT+25, 11, 0),
+
+(@GAMEOBJECT+26, 2, 1),
+(@GAMEOBJECT+27, 2, 2),
+(@GAMEOBJECT+28, 2, 3),
+(@GAMEOBJECT+29, 2, 4),
+(@GAMEOBJECT+30, 2, 1),
+(@GAMEOBJECT+31, 2, 2),
+(@GAMEOBJECT+32, 2, 3),
+(@GAMEOBJECT+33, 2, 4),
+(@GAMEOBJECT+34, 11, 0),
+-- Defender's Portal
+(@GAMEOBJECT+35, 11, 0),
+(@GAMEOBJECT+36, 11, 0),
+(@GAMEOBJECT+37, 11, 0),
+(@GAMEOBJECT+38, 11, 0),
+(@GAMEOBJECT+39, 11, 0),
+(@GAMEOBJECT+40, 11, 0),
+(@GAMEOBJECT+41, 11, 0),
+-- Seaforium Bombs
+-- Western base bombs
+(@GAMEOBJECT+42, 6, 3),
+(@GAMEOBJECT+43, 6, 3),
+(@GAMEOBJECT+44, 6, 3),
+(@GAMEOBJECT+45, 6, 3),
+(@GAMEOBJECT+46, 6, 3),
+(@GAMEOBJECT+47, 6, 3),
+(@GAMEOBJECT+48, 6, 3),
+(@GAMEOBJECT+49, 6, 3),
+(@GAMEOBJECT+50, 6, 3),
+(@GAMEOBJECT+51, 6, 3),
+(@GAMEOBJECT+52, 6, 3),
+(@GAMEOBJECT+53, 6, 3),
+(@GAMEOBJECT+54, 6, 4),
+(@GAMEOBJECT+55, 6, 4),
+(@GAMEOBJECT+56, 6, 4),
+(@GAMEOBJECT+57, 6, 4),
+(@GAMEOBJECT+58, 6, 4),
+(@GAMEOBJECT+59, 6, 4),
+(@GAMEOBJECT+60, 6, 4),
+(@GAMEOBJECT+61, 6, 4),
+(@GAMEOBJECT+62, 6, 4),
+(@GAMEOBJECT+63, 6, 4),
+(@GAMEOBJECT+64, 6, 4),
+(@GAMEOBJECT+65, 6, 4),
+-- Beach bombs
+(@GAMEOBJECT+66, 8, 3),
+(@GAMEOBJECT+67, 8, 3),
+(@GAMEOBJECT+68, 8, 3),
+(@GAMEOBJECT+69, 8, 3),
+(@GAMEOBJECT+70, 8, 3),
+(@GAMEOBJECT+71, 8, 3),
+(@GAMEOBJECT+72, 8, 3),
+(@GAMEOBJECT+73, 8, 3),
+(@GAMEOBJECT+74, 8, 3),
+(@GAMEOBJECT+75, 8, 3),
+(@GAMEOBJECT+76, 8, 3),
+(@GAMEOBJECT+77, 8, 3),
+(@GAMEOBJECT+78, 8, 3),
+(@GAMEOBJECT+79, 8, 3),
+(@GAMEOBJECT+80, 8, 3),
+(@GAMEOBJECT+81, 8, 3),
+(@GAMEOBJECT+82, 8, 3),
+(@GAMEOBJECT+83, 8, 3),
+(@GAMEOBJECT+84, 8, 3),
+(@GAMEOBJECT+85, 8, 3),
+(@GAMEOBJECT+86, 8, 3),
+(@GAMEOBJECT+87, 8, 3),
+(@GAMEOBJECT+88, 8, 4),
+(@GAMEOBJECT+89, 8, 4),
+(@GAMEOBJECT+90, 8, 4),
+(@GAMEOBJECT+91, 8, 4),
+(@GAMEOBJECT+92, 8, 4),
+(@GAMEOBJECT+93, 8, 4),
+(@GAMEOBJECT+94, 8, 4),
+(@GAMEOBJECT+95, 8, 4),
+(@GAMEOBJECT+96, 8, 4),
+(@GAMEOBJECT+97, 8, 4),
+(@GAMEOBJECT+98, 8, 4),
+(@GAMEOBJECT+99, 8, 4),
+(@GAMEOBJECT+100, 8, 4),
+(@GAMEOBJECT+101, 8, 4),
+(@GAMEOBJECT+102, 8, 4),
+(@GAMEOBJECT+103, 8, 4),
+(@GAMEOBJECT+104, 8, 4),
+(@GAMEOBJECT+105, 8, 4),
+(@GAMEOBJECT+106, 8, 4),
+(@GAMEOBJECT+107, 8, 4),
+(@GAMEOBJECT+108, 8, 4),
+(@GAMEOBJECT+109, 8, 4),
+-- Eastern base bombs
+(@GAMEOBJECT+110, 5, 4),
+(@GAMEOBJECT+111, 5, 3),
+(@GAMEOBJECT+112, 5, 3),
+(@GAMEOBJECT+113, 5, 3),
+(@GAMEOBJECT+114, 5, 3),
+(@GAMEOBJECT+115, 5, 3),
+(@GAMEOBJECT+116, 5, 3),
+(@GAMEOBJECT+117, 5, 3),
+(@GAMEOBJECT+118, 5, 3),
+(@GAMEOBJECT+119, 5, 4),
+(@GAMEOBJECT+120, 5, 4),
+(@GAMEOBJECT+121, 5, 4),
+(@GAMEOBJECT+122, 5, 4),
+(@GAMEOBJECT+123, 5, 4),
+(@GAMEOBJECT+124, 5, 4),
+(@GAMEOBJECT+125, 5, 4),
+(@GAMEOBJECT+126, 5, 4),
+(@GAMEOBJECT+127, 5, 4),
+-- Middle bombs (both beach and relic side)
+(@GAMEOBJECT+128, 7, 3),
+(@GAMEOBJECT+129, 7, 3),
+(@GAMEOBJECT+130, 7, 3),
+(@GAMEOBJECT+131, 7, 3),
+(@GAMEOBJECT+132, 7, 3),
+(@GAMEOBJECT+133, 7, 3),
+(@GAMEOBJECT+134, 7, 3),
+(@GAMEOBJECT+135, 7, 3),
+(@GAMEOBJECT+136, 7, 3),
+(@GAMEOBJECT+137, 7, 3),
+(@GAMEOBJECT+138, 7, 3),
+(@GAMEOBJECT+139, 7, 3),
+(@GAMEOBJECT+140, 7, 3),
+(@GAMEOBJECT+141, 7, 3),
+(@GAMEOBJECT+142, 7, 3),
+(@GAMEOBJECT+143, 7, 3),
+(@GAMEOBJECT+144, 7, 3),
+(@GAMEOBJECT+145, 7, 3),
+(@GAMEOBJECT+146, 7, 3),
+(@GAMEOBJECT+147, 7, 3),
+(@GAMEOBJECT+148, 7, 3),
+(@GAMEOBJECT+149, 7, 3),
+(@GAMEOBJECT+150, 7, 3),
+(@GAMEOBJECT+151, 7, 3),
+(@GAMEOBJECT+152, 7, 3),
+(@GAMEOBJECT+153, 7, 4),
+(@GAMEOBJECT+154, 7, 4),
+(@GAMEOBJECT+155, 7, 4),
+(@GAMEOBJECT+156, 7, 4),
+(@GAMEOBJECT+157, 7, 4),
+(@GAMEOBJECT+158, 7, 4),
+(@GAMEOBJECT+159, 7, 4),
+(@GAMEOBJECT+160, 7, 4),
+(@GAMEOBJECT+161, 7, 4),
+(@GAMEOBJECT+162, 7, 4),
+(@GAMEOBJECT+163, 7, 4),
+(@GAMEOBJECT+164, 7, 4),
+(@GAMEOBJECT+165, 7, 4),
+(@GAMEOBJECT+166, 7, 4),
+(@GAMEOBJECT+167, 7, 4),
+(@GAMEOBJECT+168, 7, 4),
+(@GAMEOBJECT+169, 7, 4),
+(@GAMEOBJECT+170, 7, 4),
+(@GAMEOBJECT+171, 7, 4),
+(@GAMEOBJECT+172, 7, 4),
+(@GAMEOBJECT+173, 7, 4),
+(@GAMEOBJECT+174, 7, 4),
+(@GAMEOBJECT+175, 7, 4),
+(@GAMEOBJECT+176, 7, 4),
+(@GAMEOBJECT+177, 7, 4),
+(@GAMEOBJECT+178, 15, 0),
+(@GAMEOBJECT+179, 16, 0),
+(@GAMEOBJECT+180, 17, 0),
+(@GAMEOBJECT+181, 18, 0),
+(@GAMEOBJECT+182, 19, 0);
+
+DELETE FROM battleground_events WHERE map = 607;
+INSERT INTO battleground_events (map, event1, event2, description) VALUES
+(607, 0, 1, 'East gy - A contested'),   -- flags, spirit healers only
+(607, 0, 2, 'East gy - H contested'),
+(607, 0, 3, 'East gy - A occupied'),
+(607, 0, 4, 'East gy - H occupied'),
+(607, 1, 1, 'West gy - A contested'),
+(607, 1, 2, 'West gy - H contested'),
+(607, 1, 3, 'West gy - A occupied'),
+(607, 1, 4, 'West gy - H occupied'),
+(607, 2, 1, 'Central gy - A contested'),
+(607, 2, 2, 'Central gy - H contested'),
+(607, 2, 3, 'Central gy - A occupied'),
+(607, 2, 4, 'Central gy - H occupied'),
+(607, 3, 3, 'Relic gy A'),
+(607, 3, 4, 'Relic gy H'),
+(607, 4, 3, 'Beach gy A'),
+(607, 4, 4, 'Beach gy H'),
+(607, 5, 3, 'East bombs - A occupied'), -- bombs only
+(607, 5, 4, 'East bombs - H occupied'),
+(607, 6, 3, 'West bombs - A occupied'),
+(607, 6, 4, 'West bombs - H occupied'),
+(607, 7, 3, 'Central bombs - A occupied'),
+(607, 7, 4, 'Central bombs - H occupied'),
+(607, 8, 3, 'Beach bombs - A occupied'),
+(607, 8, 4, 'Beach bombs - H occupied'),
+(607, 9, 0, 'Dock demolishers, factory npcs'),
+(607, 10, 0, 'Defender cannons'),
+(607, 11, 0, 'Gameobjects'),            -- flagpoles, defender portals, gates, relic
+(607, 12, 0, 'E base demolishers'),
+(607, 13, 0, 'W base demolishers'),
+(607, 14, 1, 'Titan Relic - A attacking'),
+(607, 14, 2, 'Titan Relic - H attacking'),
+(607, 15, 0, 'Green sigil'),
+(607, 16, 0, 'Blue sigil'),
+(607, 17, 0, 'Red sigil'),
+(607, 18, 0, 'Purple sigil'),
+(607, 19, 0, 'Yellow sigil');
+
+-- Fix Rotation for all Objects in Map
+UPDATE gameobject SET rotation0=0, rotation1=0, rotation2=SIN(orientation*0.5), rotation3=COS(orientation*0.5) WHERE map = 607;
+
+DELETE FROM mangos_string WHERE entry BETWEEN 20000 AND 20044;
+INSERT INTO mangos_string (entry, content_default, content_loc1, content_loc2, content_loc3, content_loc4, content_loc5, content_loc6, content_loc7, content_loc8) VALUES
+(20000, 'The battle for Strand of the Ancients begins in 2 minute.', NULL, NULL, 'Die Schlacht um den Strand der Uralten beginnt in 2 Minuten.', NULL, NULL, 'La batalla por la Playa de los Ancestros comenzará en 2 minutos.', 'La batalla por la Playa de los Ancestros comenzará en 2 minutos.', 'Битва за Берег Древних начнется через 2 минуты.'),
+(20001, 'The battle for Strand of the Ancients begins in 1 minute.', NULL, NULL, 'Die Schlacht um den Strand der Uralten beginnt in 1 Minute.', NULL, NULL, 'La batalla por la Playa de los Ancestros comenzará en 1 minuto.', 'La batalla por la Playa de los Ancestros comenzará en 1 minuto.', 'Битва за Берег Древних начнется через 1 минуту.'),
+(20002, 'The battle for Strand of the Ancients begins in 30 seconds.', NULL, NULL, 'Die Schlacht um den Strand der Uralten beginnt in 30 Sekunden.', NULL, NULL, 'La batalla por la Playa de los Ancestros comenzará en 30 segundos. ¡Preparaos!', 'La batalla por la Playa de los Ancestros comenzará en 30 segundos. ¡Preparaos!', 'Битва за Берег Древних начнется через 30 секунд. Приготовтесь!'),
+(20003, 'The battle for Strand of the Ancients has begun!', NULL, NULL, 'Lasst die Schlacht um den Strand der Uralten beginnen!', NULL, NULL, '¡Que comience la batalla por la Playa de los Ancestros!', '¡Que comience la batalla por la Playa de los Ancestros!', 'Битва за Берег Древних началась! '),
+(20004, 'The %s is under attack!', NULL, NULL, '%s wird angegriffen!', NULL, NULL, '¡La puerta %s esta siendo asediada!', '¡La puerta %s esta siendo asediada!', 'Врата %s подвергаются нападению!'),
+(20005, 'The %s is damaged!', NULL, NULL, '%s ist beschadigt!', NULL, NULL, '¡La puerta %s ha sido dañada!', '¡La puerta %s ha sido dañada!', 'Врата %s повреждены!'),
+(20006, 'The %s was destroyed!', NULL, NULL, '%s ist zerstort!', NULL, NULL, '¡La puerta %s ha sido destruida!', '¡La puerta %s ha sido destruida!', 'Врата %s уничтожены!'),
+(20007, 'Gate of the Green Emerald', NULL, NULL, 'Das Tor des Smaragdhorizonts', NULL, NULL, 'de la Esmeralda Verde', 'de la Esmeralda Verde', 'Зеленого изумруда'),
+(20008, 'Gate of the Blue Sapphire', NULL, NULL, 'Das Tor des Saphirhimmels', NULL, NULL, 'del Zafiro Azul', 'del Zafiro Azul', 'Синего сапфира'),
+(20009, 'Gate of the Purple Amethyst', NULL, NULL, 'Das Tor des Amethysystems', NULL, NULL, 'de la Amatista Púrpura', 'de la Amatista Púrpura', 'Лилового аметиста'),
+(20010, 'Gate of the Red Sun', NULL, NULL, 'Das Tor der Rubinsonne', NULL, NULL, 'del Sol Rojo', 'del Sol Rojo', 'Красного солнца'),
+(20011, 'Gate of the Yellow Moon', NULL, NULL, 'Das Tor des Goldmondes', NULL, NULL, 'de la Luna Amarilla', 'de la Luna Amarilla', 'Желтой луны'),
+(20012, 'Chamber of Ancient Relics', NULL, NULL,'Die Kammer der Uralten', NULL, NULL, 'Cámara de Reliquias Antiguas', 'Cámara de Reliquias Antiguas', 'Комната древних святынь'),
+(20013, 'East graveyard!', NULL, NULL, 'ostlicher Friedhof!', NULL, NULL, 'Cementerio Este', 'Cementerio Este', 'Восточное кладбище!'),
+(20014, 'West graveyard!', NULL, NULL, 'westlicher Friedhof!', NULL, NULL, 'Cementerio Oeste', 'Cementerio Oeste', 'Западное кладбище!'),
+(20015, 'South graveyard!', NULL, NULL, 'sudlicher Friedhof!', NULL, NULL, 'Cementerio Sur', 'Cementerio Sur', 'Южное кладбище!'),
+(20016, '$n placed a Seaforium Charge!', NULL, NULL, '$n plaziert eine Zephyriumladung!', NULL, NULL, '¡$n ha colocado una carga de seforio!', '¡$n ha colocado una carga de seforio!', '$n заложил сифориевый заряд!'),
+(20017, 'The Alliance won the first round, the Relic of Titan was captured!', NULL, NULL, 'Die Allianz hat die erste Runde gewonnen, das Titanenportal erobert!', NULL, NULL, '¡La Alianza gana la primera ronda! ¡La reliquia de Titán ha sido capturada!', '¡La Alianza gana la primera ronda! ¡La reliquia de Titán ha sido capturada!', 'Первый раунд за Альянсом! Реликвия Титана захвачена!'),
+(20018, 'The Horde won the first round, the Relic of Titan was captured!', NULL, NULL, 'Die Horde hat die erste Runde gewonnen, das Titanenportal erobert!', NULL, NULL, '¡La Horda gana la primera ronda! ¡La reliquia de Titán ha sido capturada!', '¡La Horda gana la primera ronda! ¡La reliquia de Titán ha sido capturada!', 'Первый раунд за Ордой! Реликвия Титана захвачена!'),
+(20019, 'The Alliance won the second round, the Relic of Titan was captured!', NULL, NULL, 'Die Allianz hat die zweite Runde gewonnen, das Titanenportal erobert!', NULL, NULL, '¡La Horda gana la segunda ronda! ¡La reliquia de Titán ha sido capturada!', '¡La Horda gana la segunda ronda! ¡La reliquia de Titán ha sido capturada!', 'Второй раунд за Альянсом! Реликвия Титана захвачена!'),
+(20020, 'The Horde won the second round, the Relic of Titan was captured!', NULL, NULL, 'Die Horde hat die zweite Runde gewonnen, das Titanenportal erobert!', NULL, NULL, '¡La Alianza gana la segunda ronda! ¡La reliquia de Titán ha sido capturada!', '¡La Alianza gana la segunda ronda! ¡La reliquia de Titán ha sido capturada!', 'Второй раунд за Ордой! Реликвия Титана захвачена!'),
+(20021, 'The Eastern Graveyard has been captured by the Horde!', NULL, NULL, NULL, NULL, NULL, '¡La Horda ha capturado el cementerio oriental!', '¡La Horda ha capturado el cementerio oriental!', 'Орда захватила Восточное кладбище!'),
+(20022, 'The Western Graveyard has been captured by the Horde!', NULL, NULL, NULL, NULL, NULL, '¡La Horda ha capturado el cementerio occidental!', '¡La Horda ha capturado el cementerio occidental!', 'Орда захватила Западное кладбище!'),
+(20023, 'The Southern Graveyard has been captured by the Horde!', NULL, NULL, NULL, NULL, NULL, '¡La Horda ha capturado el cementerio sur!', '¡La Horda ha capturado el cementerio sur!', 'Орда захватила Южное кладбище!'),
+(20024, 'The Eastern Graveyard has been captured by the Alliance!', NULL, NULL, NULL, NULL, NULL, '¡La Alianza ha capturado el cementerio oriental!', '¡La Alianza ha capturado el cementerio oriental!', 'Альянс захватил Восточное кладбище!'),
+(20025, 'The Western Graveyard has been captured by the Alliance!', NULL, NULL, NULL, NULL, NULL, '¡La Alianza ha capturado el cementerio occidental!', '¡La Alianza ha capturado el cementerio occidental!', 'Альянс захватил Западное кладбище!'),
+(20026, 'The Southern Graveyard has been captured by the Alliance!', NULL, NULL, NULL, NULL, NULL, '¡La Alianza ha capturado el cementerio sur!', '¡La Alianza ha capturado el cementerio sur!', 'Альянс захватил Южное кладбище!'),
+(20027, 'The chamber has been breached! The Titan Relic is vulnerable!', NULL, NULL, NULL, NULL, NULL, '¡La puerta de la Cámara de Reliquias antiguas ha sido destruida! ¡La reliquia de titán es vulnerable!', '¡La puerta de la Cámara de Reliquias antiguas ha sido destruida! ¡La reliquia de titán es vulnerable!', 'Комната древних святынь разрушена!'),
+(20028, 'The Gate of the Green Emerald was destroyed!', NULL, NULL, 'Das Tor des Smaragdhorizonts ist zerstort!', NULL, NULL, '¡La puerta de la Esmeralda Verde ha sido destruida!', '¡La puerta de la Esmeralda Verde ha sido destruida!', 'Врата Зеленого Изумруда разрушены!'),
+(20029, 'The Gate of the Blue Sapphire was destroyed!', NULL, NULL, 'Das Tor des Saphirhimmels ist zerstort!', NULL, NULL, '¡La puerta del Zafiro Azul ha sido destruida!', '¡La puerta del Zafiro Azul ha sido destruida!', 'Врата Синего Сапфира разрушены!'),
+(20030, 'The Gate of the Purple Amethyst was destroyed!', NULL, NULL, 'Das Tor des Amethyststerns ist zerstort worden', NULL, NULL, '¡La puerta de la Amatista Púrpura ha sido destruida!', '¡La puerta de la Amatista Púrpura ha sido destruida!', 'Врата Лилового Аметиста разрушены!'),
+(20031, 'The Gate of the Red Sun was destroyed!', NULL, NULL, 'Das Tor der Rubinsonne ist zerstort worden!', NULL, NULL, '¡La puerta del Sol Rojo ha sido destruida!', '¡La puerta del Sol Rojo ha sido destruida!', 'Врата Красного Солнца разрушены!'),
+(20032, 'The Gate of the Yellow Moon was destroyed!', NULL, NULL, 'Das Tor des Goldmondes ist zerstort worden!', NULL, NULL, '¡La puerta de la Luna Amarilla ha sido destruida!', '¡La puerta de la Luna Amarilla ha sido destruida!', 'Врата Желтой Луны разрушены!'),
+(20033, 'The Chamber of Ancient Relics is under attack!',  NULL,  NULL,  NULL,  NULL,  NULL, '¡La puerta de la Cámara de Reliquias antiguas esta siendo asediada!',  '¡La puerta de la Cámara de Reliquias antiguas esta siendo asediada!',  'Комната древних святынь повреждена!'),
+(20034, 'The Gate of the Green Emerald is damaged!', NULL, NULL, 'Das Tor des Smaragdhorizonts ist beschadigt worden', NULL, NULL, '¡La puerta de la Esmeralda Verde ha sido dañada!', '¡La puerta de la Esmeralda Verde ha sido dañada!', 'Врата Зеленого Изумруда повреждены!'),
+(20035, 'The Gate of the Blue Sapphire is damaged!', NULL, NULL, 'Das Tor des Saphirhimmels ist beschadigt worden!', NULL, NULL, '¡La puerta del Zafiro Azul ha sido dañada!', '¡La puerta del Zafiro Azul ha sido dañada!', 'Врата Синего Сапфира повреждены!'),
+(20036, 'The Gate of the Purple Amethyst is damaged!', NULL, NULL, 'Das Tor des Amethyststerns ist beschadigt worden!', NULL, NULL, '¡La puerta de la Amatista Púrpura ha sido dañada!', '¡La puerta de la Amatista Púrpura ha sido dañada!', 'Врата Лилового Аметиста повреждены!'),
+(20037, 'The Gate of the Red Sun is damaged!', NULL, NULL, 'Das Tor der Rubinsonne ist beschadigt worden!', NULL, NULL, '¡La puerta del Sol Rojo ha sido dañada!', '¡La puerta del Sol Rojo ha sido dañada!', 'Врата Красного Солнца повреждены!'),
+(20038, 'The Gate of the Yellow Moon is damaged!', NULL, NULL, 'Das Tor des Goldmondes ist beschadigt worden!', NULL, NULL, '¡La puerta de la Luna Amarilla ha sido dañada!', '¡La puerta de la Luna Amarilla ha sido dañada!', 'Врата Желтой Луны повреждены!'),
+(20039, 'The Horde won the first round, the Relic of Titan was no captured!', NULL, NULL, 'Runde 1 - Beendet!', NULL, NULL, '¡Ronda 1 acabada!', '¡Ronda 1 acabada!', 'Первый раунд за Ордой! Реликвия Титана не была захвачена!'),
+(20040, 'The Alliance won the first round, the Relic of Titan was no captured!', NULL, NULL, 'Runde 1 - Beendet!', NULL, NULL, '¡Ronda 1 acabada!', '¡Ronda 1 acabada!', 'Первый раунд за Альянсом! Реликвия Титана не была захвачена!'),
+(20041, 'The Horde won the second round, the Relic of Titan was no captured!', NULL, NULL, 'Runde 2 - Beendet!', NULL, NULL, '¡Ronda 2 acabada!', '¡Ronda 2 acabada!', 'Второй раунд за Ордой! Реликвия Титана не была захвачена!'),
+(20042, 'The Alliance won the second round, the Relic of Titan was no captured!', NULL, NULL, 'Runde 2 - Beendet!', NULL, NULL, '¡Ronda 2 acabada!', '¡Ronda 2 acabada!', 'Второй раунд за Альянсом! Реликвия Титана не была захвачена!'),
+(20043, 'Round 1 - Finished!',  NULL,  NULL,  'Runde 1 - Beendet!',  NULL,  NULL,  '¡Ronda 1 acabada!', '¡Ronda 1 acabada!', 'Первый раунд окончен'),
+(20044, 'The game has ended in a draw!', NULL, NULL, 'Das Spiel ist unentschieden!!!', NULL, NULL, '¡El campo de batalla ha acabado en empate!', '¡El campo de batalla ha acabado en empate!', 'Ничья!!!');
diff --git a/sql_mr/mr02507_02_mangos_vehicle_accessory.sql b/sql_mr/mr02507_02_mangos_vehicle_accessory.sql
new file mode 100644
index 00000000000..3e2b36dc00f
--- /dev/null
+++ b/sql_mr/mr02507_02_mangos_vehicle_accessory.sql
@@ -0,0 +1,5 @@
+--
+-- `vehicle_accessory`
+--
+
+UPDATE `vehicle_accessory` SET `flags` = 1 WHERE `vehicle_entry` IN (27626, 28312, 32627, 32930, 33109, 33060, 33113, 33114, 36678, 33214, 33778, 33687, 28018, 28614, 35069, 34776);
diff --git a/sql_mr/mr02526_01_opcodes_mangos_12340.sql b/sql_mr/mr02526_01_opcodes_mangos_12340.sql
new file mode 100644
index 00000000000..3a7116abe18
--- /dev/null
+++ b/sql_mr/mr02526_01_opcodes_mangos_12340.sql
@@ -0,0 +1,1325 @@
+-- Opcode table for client build 12340
+
+CREATE TABLE IF NOT EXISTS `opcodes` (
+    `version` smallint(5) NOT NULL COMMENT "Client build",
+    `name` varchar(64) NOT NULL COMMENT "opcode name",
+    `value` int(10) NOT NULL COMMENT "opcode value",
+    `flags` int(10) unsigned NOT NULL DEFAULT "0" COMMENT "current opcode flags",
+    UNIQUE KEY `version` (`version`,`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT="Universal opcode storage";
+
+DELETE FROM `opcodes` WHERE `version` = 12340;
+
+INSERT INTO `opcodes` (`name`, `value`, `version`, `flags`) VALUES
+("MSG_NULL_ACTION",0x000,12340,0),
+("CMSG_BOOTME",0x001,12340,0),
+("CMSG_DBLOOKUP",0x002,12340,0),
+("SMSG_DBLOOKUP",0x003,12340,0),
+("CMSG_QUERY_OBJECT_POSITION",0x004,12340,0),
+("SMSG_QUERY_OBJECT_POSITION",0x005,12340,0),
+("CMSG_QUERY_OBJECT_ROTATION",0x006,12340,0),
+("SMSG_QUERY_OBJECT_ROTATION",0x007,12340,0),
+("CMSG_WORLD_TELEPORT",0x008,12340,0),
+("CMSG_TELEPORT_TO_UNIT",0x009,12340,0),
+("CMSG_ZONE_MAP",0x00A,12340,0),
+("SMSG_ZONE_MAP",0x00B,12340,0),
+("CMSG_DEBUG_CHANGECELLZONE",0x00C,12340,0),
+("CMSG_MOVE_CHARACTER_CHEAT",0x00D,12340,0),
+("SMSG_MOVE_CHARACTER_CHEAT",0x00E,12340,0),
+("CMSG_RECHARGE",0x00F,12340,0),
+("CMSG_LEARN_SPELL",0x010,12340,0),
+("CMSG_CREATEMONSTER",0x011,12340,0),
+("CMSG_DESTROYMONSTER",0x012,12340,0),
+("CMSG_CREATEITEM",0x013,12340,0),
+("CMSG_CREATEGAMEOBJECT",0x014,12340,0),
+("SMSG_CHECK_FOR_BOTS",0x015,12340,0),
+("CMSG_MAKEMONSTERATTACKGUID",0x016,12340,0),
+("CMSG_BOT_DETECTED2",0x017,12340,0),
+("CMSG_FORCEACTION",0x018,12340,0),
+("CMSG_FORCEACTIONONOTHER",0x019,12340,0),
+("CMSG_FORCEACTIONSHOW",0x01A,12340,0),
+("SMSG_FORCEACTIONSHOW",0x01B,12340,0),
+("CMSG_PETGODMODE",0x01C,12340,0),
+("SMSG_PETGODMODE",0x01D,12340,0),
+("SMSG_REFER_A_FRIEND_EXPIRED",0x01E,12340,0),
+("CMSG_WEATHER_SPEED_CHEAT",0x01F,12340,0),
+("CMSG_UNDRESSPLAYER",0x020,12340,0),
+("CMSG_BEASTMASTER",0x021,12340,0),
+("CMSG_GODMODE",0x022,12340,0),
+("SMSG_GODMODE",0x023,12340,0),
+("CMSG_CHEAT_SETMONEY",0x024,12340,0),
+("CMSG_LEVEL_CHEAT",0x025,12340,0),
+("CMSG_PET_LEVEL_CHEAT",0x026,12340,0),
+("CMSG_SET_WORLDSTATE",0x027,12340,0),
+("CMSG_COOLDOWN_CHEAT",0x028,12340,0),
+("CMSG_USE_SKILL_CHEAT",0x029,12340,0),
+("CMSG_FLAG_QUEST",0x02A,12340,0),
+("CMSG_FLAG_QUEST_FINISH",0x02B,12340,0),
+("CMSG_CLEAR_QUEST",0x02C,12340,0),
+("CMSG_SEND_EVENT",0x02D,12340,0),
+("CMSG_DEBUG_AISTATE",0x02E,12340,0),
+("SMSG_DEBUG_AISTATE",0x02F,12340,0),
+("CMSG_DISABLE_PVP_CHEAT",0x030,12340,0),
+("CMSG_ADVANCE_SPAWN_TIME",0x031,12340,0),
+("SMSG_DESTRUCTIBLE_BUILDING_DAMAGE",0x032,12340,0),
+("CMSG_AUTH_SRP6_BEGIN",0x033,12340,0),
+("CMSG_AUTH_SRP6_PROOF",0x034,12340,0),
+("CMSG_AUTH_SRP6_RECODE",0x035,12340,0),
+("CMSG_CHAR_CREATE",0x036,12340,0),
+("CMSG_CHAR_ENUM",0x037,12340,0),
+("CMSG_CHAR_DELETE",0x038,12340,0),
+("SMSG_AUTH_SRP6_RESPONSE",0x039,12340,0),
+("SMSG_CHAR_CREATE",0x03A,12340,0),
+("SMSG_CHAR_ENUM",0x03B,12340,0),
+("SMSG_CHAR_DELETE",0x03C,12340,0),
+("CMSG_PLAYER_LOGIN",0x03D,12340,0),
+("SMSG_NEW_WORLD",0x03E,12340,0),
+("SMSG_TRANSFER_PENDING",0x03F,12340,0),
+("SMSG_TRANSFER_ABORTED",0x040,12340,0),
+("SMSG_CHARACTER_LOGIN_FAILED",0x041,12340,0),
+("SMSG_LOGIN_SETTIMESPEED",0x042,12340,0),
+("SMSG_GAMETIME_UPDATE",0x043,12340,0),
+("CMSG_GAMETIME_SET",0x044,12340,0),
+("SMSG_GAMETIME_SET",0x045,12340,0),
+("CMSG_GAMESPEED_SET",0x046,12340,0),
+("SMSG_GAMESPEED_SET",0x047,12340,0),
+("CMSG_SERVERTIME",0x048,12340,0),
+("SMSG_SERVERTIME",0x049,12340,0),
+("CMSG_PLAYER_LOGOUT",0x04A,12340,0),
+("CMSG_LOGOUT_REQUEST",0x04B,12340,0),
+("SMSG_LOGOUT_RESPONSE",0x04C,12340,0),
+("SMSG_LOGOUT_COMPLETE",0x04D,12340,0),
+("CMSG_LOGOUT_CANCEL",0x04E,12340,0),
+("SMSG_LOGOUT_CANCEL_ACK",0x04F,12340,0),
+("CMSG_NAME_QUERY",0x050,12340,0),
+("SMSG_NAME_QUERY_RESPONSE",0x051,12340,0),
+("CMSG_PET_NAME_QUERY",0x052,12340,0),
+("SMSG_PET_NAME_QUERY_RESPONSE",0x053,12340,0),
+("CMSG_GUILD_QUERY",0x054,12340,0),
+("SMSG_GUILD_QUERY_RESPONSE",0x055,12340,0),
+("CMSG_ITEM_QUERY_SINGLE",0x056,12340,0),
+("CMSG_ITEM_QUERY_MULTIPLE",0x057,12340,0),
+("SMSG_ITEM_QUERY_SINGLE_RESPONSE",0x058,12340,0),
+("SMSG_ITEM_QUERY_MULTIPLE_RESPONSE",0x059,12340,0),
+("CMSG_PAGE_TEXT_QUERY",0x05A,12340,0),
+("SMSG_PAGE_TEXT_QUERY_RESPONSE",0x05B,12340,0),
+("CMSG_QUEST_QUERY",0x05C,12340,0),
+("SMSG_QUEST_QUERY_RESPONSE",0x05D,12340,0),
+("CMSG_GAMEOBJECT_QUERY",0x05E,12340,0),
+("SMSG_GAMEOBJECT_QUERY_RESPONSE",0x05F,12340,0),
+("CMSG_CREATURE_QUERY",0x060,12340,0),
+("SMSG_CREATURE_QUERY_RESPONSE",0x061,12340,0),
+("CMSG_WHO",0x062,12340,0),
+("SMSG_WHO",0x063,12340,0),
+("CMSG_WHOIS",0x064,12340,0),
+("SMSG_WHOIS",0x065,12340,0),
+("CMSG_CONTACT_LIST",0x066,12340,0),
+("SMSG_CONTACT_LIST",0x067,12340,0),
+("SMSG_FRIEND_STATUS",0x068,12340,0),
+("CMSG_ADD_FRIEND",0x069,12340,0),
+("CMSG_DEL_FRIEND",0x06A,12340,0),
+("CMSG_SET_CONTACT_NOTES",0x06B,12340,0),
+("CMSG_ADD_IGNORE",0x06C,12340,0),
+("CMSG_DEL_IGNORE",0x06D,12340,0),
+("CMSG_GROUP_INVITE",0x06E,12340,0),
+("SMSG_GROUP_INVITE",0x06F,12340,0),
+("CMSG_GROUP_CANCEL",0x070,12340,0),
+("SMSG_GROUP_CANCEL",0x071,12340,0),
+("CMSG_GROUP_ACCEPT",0x072,12340,0),
+("CMSG_GROUP_DECLINE",0x073,12340,0),
+("SMSG_GROUP_DECLINE",0x074,12340,0),
+("CMSG_GROUP_UNINVITE",0x075,12340,0),
+("CMSG_GROUP_UNINVITE_GUID",0x076,12340,0),
+("SMSG_GROUP_UNINVITE",0x077,12340,0),
+("CMSG_GROUP_SET_LEADER",0x078,12340,0),
+("SMSG_GROUP_SET_LEADER",0x079,12340,0),
+("CMSG_LOOT_METHOD",0x07A,12340,0),
+("CMSG_GROUP_DISBAND",0x07B,12340,0),
+("SMSG_GROUP_DESTROYED",0x07C,12340,0),
+("SMSG_GROUP_LIST",0x07D,12340,0),
+("SMSG_PARTY_MEMBER_STATS",0x07E,12340,0),
+("SMSG_PARTY_COMMAND_RESULT",0x07F,12340,0),
+("UMSG_UPDATE_GROUP_MEMBERS",0x080,12340,0),
+("CMSG_GUILD_CREATE",0x081,12340,0),
+("CMSG_GUILD_INVITE",0x082,12340,0),
+("SMSG_GUILD_INVITE",0x083,12340,0),
+("CMSG_GUILD_ACCEPT",0x084,12340,0),
+("CMSG_GUILD_DECLINE",0x085,12340,0),
+("SMSG_GUILD_DECLINE",0x086,12340,0),
+("CMSG_GUILD_INFO",0x087,12340,0),
+("SMSG_GUILD_INFO",0x088,12340,0),
+("CMSG_GUILD_ROSTER",0x089,12340,0),
+("SMSG_GUILD_ROSTER",0x08A,12340,0),
+("CMSG_GUILD_PROMOTE",0x08B,12340,0),
+("CMSG_GUILD_DEMOTE",0x08C,12340,0),
+("CMSG_GUILD_LEAVE",0x08D,12340,0),
+("CMSG_GUILD_REMOVE",0x08E,12340,0),
+("CMSG_GUILD_DISBAND",0x08F,12340,0),
+("CMSG_GUILD_LEADER",0x090,12340,0),
+("CMSG_GUILD_MOTD",0x091,12340,0),
+("SMSG_GUILD_EVENT",0x092,12340,0),
+("SMSG_GUILD_COMMAND_RESULT",0x093,12340,0),
+("UMSG_UPDATE_GUILD",0x094,12340,0),
+("CMSG_MESSAGECHAT",0x095,12340,0),
+("SMSG_MESSAGECHAT",0x096,12340,0),
+("CMSG_JOIN_CHANNEL",0x097,12340,0),
+("CMSG_LEAVE_CHANNEL",0x098,12340,0),
+("SMSG_CHANNEL_NOTIFY",0x099,12340,0),
+("CMSG_CHANNEL_LIST",0x09A,12340,0),
+("SMSG_CHANNEL_LIST",0x09B,12340,0),
+("CMSG_CHANNEL_PASSWORD",0x09C,12340,0),
+("CMSG_CHANNEL_SET_OWNER",0x09D,12340,0),
+("CMSG_CHANNEL_OWNER",0x09E,12340,0),
+("CMSG_CHANNEL_MODERATOR",0x09F,12340,0),
+("CMSG_CHANNEL_UNMODERATOR",0x0A0,12340,0),
+("CMSG_CHANNEL_MUTE",0x0A1,12340,0),
+("CMSG_CHANNEL_UNMUTE",0x0A2,12340,0),
+("CMSG_CHANNEL_INVITE",0x0A3,12340,0),
+("CMSG_CHANNEL_KICK",0x0A4,12340,0),
+("CMSG_CHANNEL_BAN",0x0A5,12340,0),
+("CMSG_CHANNEL_UNBAN",0x0A6,12340,0),
+("CMSG_CHANNEL_ANNOUNCEMENTS",0x0A7,12340,0),
+("CMSG_CHANNEL_MODERATE",0x0A8,12340,0),
+("SMSG_UPDATE_OBJECT",0x0A9,12340,0),
+("SMSG_DESTROY_OBJECT",0x0AA,12340,0),
+("CMSG_USE_ITEM",0x0AB,12340,0),
+("CMSG_OPEN_ITEM",0x0AC,12340,0),
+("CMSG_READ_ITEM",0x0AD,12340,0),
+("SMSG_READ_ITEM_OK",0x0AE,12340,0),
+("SMSG_READ_ITEM_FAILED",0x0AF,12340,0),
+("SMSG_ITEM_COOLDOWN",0x0B0,12340,0),
+("CMSG_GAMEOBJ_USE",0x0B1,12340,0),
+("CMSG_DESTROY_ITEMS",0x0B2,12340,0),
+("SMSG_GAMEOBJECT_CUSTOM_ANIM",0x0B3,12340,0),
+("CMSG_AREATRIGGER",0x0B4,12340,0),
+("MSG_MOVE_START_FORWARD",0x0B5,12340,0),
+("MSG_MOVE_START_BACKWARD",0x0B6,12340,0),
+("MSG_MOVE_STOP",0x0B7,12340,0),
+("MSG_MOVE_START_STRAFE_LEFT",0x0B8,12340,0),
+("MSG_MOVE_START_STRAFE_RIGHT",0x0B9,12340,0),
+("MSG_MOVE_STOP_STRAFE",0x0BA,12340,0),
+("MSG_MOVE_JUMP",0x0BB,12340,0),
+("MSG_MOVE_START_TURN_LEFT",0x0BC,12340,0),
+("MSG_MOVE_START_TURN_RIGHT",0x0BD,12340,0),
+("MSG_MOVE_STOP_TURN",0x0BE,12340,0),
+("MSG_MOVE_START_PITCH_UP",0x0BF,12340,0),
+("MSG_MOVE_START_PITCH_DOWN",0x0C0,12340,0),
+("MSG_MOVE_STOP_PITCH",0x0C1,12340,0),
+("MSG_MOVE_SET_RUN_MODE",0x0C2,12340,0),
+("MSG_MOVE_SET_WALK_MODE",0x0C3,12340,0),
+("MSG_MOVE_TOGGLE_LOGGING",0x0C4,12340,0),
+("MSG_MOVE_TELEPORT",0x0C5,12340,0),
+("MSG_MOVE_TELEPORT_CHEAT",0x0C6,12340,0),
+("MSG_MOVE_TELEPORT_ACK",0x0C7,12340,0),
+("MSG_MOVE_TOGGLE_FALL_LOGGING",0x0C8,12340,0),
+("MSG_MOVE_FALL_LAND",0x0C9,12340,0),
+("MSG_MOVE_START_SWIM",0x0CA,12340,0),
+("MSG_MOVE_STOP_SWIM",0x0CB,12340,0),
+("MSG_MOVE_SET_RUN_SPEED_CHEAT",0x0CC,12340,0),
+("MSG_MOVE_SET_RUN_SPEED",0x0CD,12340,0),
+("MSG_MOVE_SET_RUN_BACK_SPEED_CHEAT",0x0CE,12340,0),
+("MSG_MOVE_SET_RUN_BACK_SPEED",0x0CF,12340,0),
+("MSG_MOVE_SET_WALK_SPEED_CHEAT",0x0D0,12340,0),
+("MSG_MOVE_SET_WALK_SPEED",0x0D1,12340,0),
+("MSG_MOVE_SET_SWIM_SPEED_CHEAT",0x0D2,12340,0),
+("MSG_MOVE_SET_SWIM_SPEED",0x0D3,12340,0),
+("MSG_MOVE_SET_SWIM_BACK_SPEED_CHEAT",0x0D4,12340,0),
+("MSG_MOVE_SET_SWIM_BACK_SPEED",0x0D5,12340,0),
+("MSG_MOVE_SET_ALL_SPEED_CHEAT",0x0D6,12340,0),
+("MSG_MOVE_SET_TURN_RATE_CHEAT",0x0D7,12340,0),
+("MSG_MOVE_SET_TURN_RATE",0x0D8,12340,0),
+("MSG_MOVE_TOGGLE_COLLISION_CHEAT",0x0D9,12340,0),
+("MSG_MOVE_SET_FACING",0x0DA,12340,0),
+("MSG_MOVE_SET_PITCH",0x0DB,12340,0),
+("MSG_MOVE_WORLDPORT_ACK",0x0DC,12340,0),
+("SMSG_MONSTER_MOVE",0x0DD,12340,0),
+("SMSG_MOVE_WATER_WALK",0x0DE,12340,0),
+("SMSG_MOVE_LAND_WALK",0x0DF,12340,0),
+("CMSG_MOVE_CHARM_PORT_CHEAT",0x0E0,12340,0),
+("CMSG_MOVE_SET_RAW_POSITION",0x0E1,12340,0),
+("SMSG_FORCE_RUN_SPEED_CHANGE",0x0E2,12340,0),
+("CMSG_FORCE_RUN_SPEED_CHANGE_ACK",0x0E3,12340,0),
+("SMSG_FORCE_RUN_BACK_SPEED_CHANGE",0x0E4,12340,0),
+("CMSG_FORCE_RUN_BACK_SPEED_CHANGE_ACK",0x0E5,12340,0),
+("SMSG_FORCE_SWIM_SPEED_CHANGE",0x0E6,12340,0),
+("CMSG_FORCE_SWIM_SPEED_CHANGE_ACK",0x0E7,12340,0),
+("SMSG_FORCE_MOVE_ROOT",0x0E8,12340,0),
+("CMSG_FORCE_MOVE_ROOT_ACK",0x0E9,12340,0),
+("SMSG_FORCE_MOVE_UNROOT",0x0EA,12340,0),
+("CMSG_FORCE_MOVE_UNROOT_ACK",0x0EB,12340,0),
+("MSG_MOVE_ROOT",0x0EC,12340,0),
+("MSG_MOVE_UNROOT",0x0ED,12340,0),
+("MSG_MOVE_HEARTBEAT",0x0EE,12340,0),
+("SMSG_MOVE_KNOCK_BACK",0x0EF,12340,0),
+("CMSG_MOVE_KNOCK_BACK_ACK",0x0F0,12340,0),
+("MSG_MOVE_KNOCK_BACK",0x0F1,12340,0),
+("SMSG_MOVE_FEATHER_FALL",0x0F2,12340,0),
+("SMSG_MOVE_NORMAL_FALL",0x0F3,12340,0),
+("SMSG_MOVE_SET_HOVER",0x0F4,12340,0),
+("SMSG_MOVE_UNSET_HOVER",0x0F5,12340,0),
+("CMSG_MOVE_HOVER_ACK",0x0F6,12340,0),
+("MSG_MOVE_HOVER",0x0F7,12340,0),
+("CMSG_TRIGGER_CINEMATIC_CHEAT",0x0F8,12340,0),
+("CMSG_OPENING_CINEMATIC",0x0F9,12340,0),
+("SMSG_TRIGGER_CINEMATIC",0x0FA,12340,0),
+("CMSG_NEXT_CINEMATIC_CAMERA",0x0FB,12340,0),
+("CMSG_COMPLETE_CINEMATIC",0x0FC,12340,0),
+("SMSG_TUTORIAL_FLAGS",0x0FD,12340,0),
+("CMSG_TUTORIAL_FLAG",0x0FE,12340,0),
+("CMSG_TUTORIAL_CLEAR",0x0FF,12340,0),
+("CMSG_TUTORIAL_RESET",0x100,12340,0),
+("CMSG_STANDSTATECHANGE",0x101,12340,0),
+("CMSG_EMOTE",0x102,12340,0),
+("SMSG_EMOTE",0x103,12340,0),
+("CMSG_TEXT_EMOTE",0x104,12340,0),
+("SMSG_TEXT_EMOTE",0x105,12340,0),
+("CMSG_AUTOEQUIP_GROUND_ITEM",0x106,12340,0),
+("CMSG_AUTOSTORE_GROUND_ITEM",0x107,12340,0),
+("CMSG_AUTOSTORE_LOOT_ITEM",0x108,12340,0),
+("CMSG_STORE_LOOT_IN_SLOT",0x109,12340,0),
+("CMSG_AUTOEQUIP_ITEM",0x10A,12340,0),
+("CMSG_AUTOSTORE_BAG_ITEM",0x10B,12340,0),
+("CMSG_SWAP_ITEM",0x10C,12340,0),
+("CMSG_SWAP_INV_ITEM",0x10D,12340,0),
+("CMSG_SPLIT_ITEM",0x10E,12340,0),
+("CMSG_AUTOEQUIP_ITEM_SLOT",0x10F,12340,0),
+("CMSG_UNCLAIM_LICENSE",0x110,12340,0),
+("CMSG_DESTROYITEM",0x111,12340,0),
+("SMSG_INVENTORY_CHANGE_FAILURE",0x112,12340,0),
+("SMSG_OPEN_CONTAINER",0x113,12340,0),
+("CMSG_INSPECT",0x114,12340,0),
+("SMSG_INSPECT_RESULTS_UPDATE",0x115,12340,0),
+("CMSG_INITIATE_TRADE",0x116,12340,0),
+("CMSG_BEGIN_TRADE",0x117,12340,0),
+("CMSG_BUSY_TRADE",0x118,12340,0),
+("CMSG_IGNORE_TRADE",0x119,12340,0),
+("CMSG_ACCEPT_TRADE",0x11A,12340,0),
+("CMSG_UNACCEPT_TRADE",0x11B,12340,0),
+("CMSG_CANCEL_TRADE",0x11C,12340,0),
+("CMSG_SET_TRADE_ITEM",0x11D,12340,0),
+("CMSG_CLEAR_TRADE_ITEM",0x11E,12340,0),
+("CMSG_SET_TRADE_GOLD",0x11F,12340,0),
+("SMSG_TRADE_STATUS",0x120,12340,0),
+("SMSG_TRADE_STATUS_EXTENDED",0x121,12340,0),
+("SMSG_INITIALIZE_FACTIONS",0x122,12340,0),
+("SMSG_SET_FACTION_VISIBLE",0x123,12340,0),
+("SMSG_SET_FACTION_STANDING",0x124,12340,0),
+("CMSG_SET_FACTION_ATWAR",0x125,12340,0),
+("CMSG_SET_FACTION_CHEAT",0x126,12340,0),
+("SMSG_SET_PROFICIENCY",0x127,12340,0),
+("CMSG_SET_ACTION_BUTTON",0x128,12340,0),
+("SMSG_ACTION_BUTTONS",0x129,12340,0),
+("SMSG_INITIAL_SPELLS",0x12A,12340,0),
+("SMSG_LEARNED_SPELL",0x12B,12340,0),
+("SMSG_SUPERCEDED_SPELL",0x12C,12340,0),
+("CMSG_NEW_SPELL_SLOT",0x12D,12340,0),
+("CMSG_CAST_SPELL",0x12E,12340,0),
+("CMSG_CANCEL_CAST",0x12F,12340,0),
+("SMSG_CAST_FAILED",0x130,12340,0),
+("SMSG_SPELL_START",0x131,12340,0),
+("SMSG_SPELL_GO",0x132,12340,0),
+("SMSG_SPELL_FAILURE",0x133,12340,0),
+("SMSG_SPELL_COOLDOWN",0x134,12340,0),
+("SMSG_COOLDOWN_EVENT",0x135,12340,0),
+("CMSG_CANCEL_AURA",0x136,12340,0),
+("SMSG_EQUIPMENT_SET_ID",0x137,12340,0),
+("SMSG_PET_CAST_FAILED",0x138,12340,0),
+("MSG_CHANNEL_START",0x139,12340,0),
+("MSG_CHANNEL_UPDATE",0x13A,12340,0),
+("CMSG_CANCEL_CHANNELLING",0x13B,12340,0),
+("SMSG_AI_REACTION",0x13C,12340,0),
+("CMSG_SET_SELECTION",0x13D,12340,0),
+("CMSG_DELETEEQUIPMENT_SET",0x13E,12340,0),
+("CMSG_INSTANCE_LOCK_RESPONSE",0x13F,12340,0),
+("CMSG_DEBUG_PASSIVE_AURA",0x140,12340,0),
+("CMSG_ATTACKSWING",0x141,12340,0),
+("CMSG_ATTACKSTOP",0x142,12340,0),
+("SMSG_ATTACKSTART",0x143,12340,0),
+("SMSG_ATTACKSTOP",0x144,12340,0),
+("SMSG_ATTACKSWING_NOTINRANGE",0x145,12340,0),
+("SMSG_ATTACKSWING_BADFACING",0x146,12340,0),
+("SMSG_PENDING_RAID_LOCK",0x147,12340,0),
+("SMSG_ATTACKSWING_DEADTARGET",0x148,12340,0),
+("SMSG_ATTACKSWING_CANT_ATTACK",0x149,12340,0),
+("SMSG_ATTACKERSTATEUPDATE",0x14A,12340,0),
+("SMSG_BATTLEFIELD_PORT_DENIED",0x14B,12340,0),
+("CMSG_PERFORM_ACTION_SET",0x14C,12340,0),
+("SMSG_RESUME_CAST_BAR",0x14D,12340,0),
+("SMSG_CANCEL_COMBAT",0x14E,12340,0),
+("SMSG_SPELLBREAKLOG",0x14F,12340,0),
+("SMSG_SPELLHEALLOG",0x150,12340,0),
+("SMSG_SPELLENERGIZELOG",0x151,12340,0),
+("SMSG_BREAK_TARGET",0x152,12340,0),
+("CMSG_SAVE_PLAYER",0x153,12340,0),
+("CMSG_SETDEATHBINDPOINT",0x154,12340,0),
+("SMSG_BINDPOINTUPDATE",0x155,12340,0),
+("CMSG_GETDEATHBINDZONE",0x156,12340,0),
+("SMSG_BINDZONEREPLY",0x157,12340,0),
+("SMSG_PLAYERBOUND",0x158,12340,0),
+("SMSG_CLIENT_CONTROL_UPDATE",0x159,12340,0),
+("CMSG_REPOP_REQUEST",0x15A,12340,0),
+("SMSG_RESURRECT_REQUEST",0x15B,12340,0),
+("CMSG_RESURRECT_RESPONSE",0x15C,12340,0),
+("CMSG_LOOT",0x15D,12340,0),
+("CMSG_LOOT_MONEY",0x15E,12340,0),
+("CMSG_LOOT_RELEASE",0x15F,12340,0),
+("SMSG_LOOT_RESPONSE",0x160,12340,0),
+("SMSG_LOOT_RELEASE_RESPONSE",0x161,12340,0),
+("SMSG_LOOT_REMOVED",0x162,12340,0),
+("SMSG_LOOT_MONEY_NOTIFY",0x163,12340,0),
+("SMSG_LOOT_ITEM_NOTIFY",0x164,12340,0),
+("SMSG_LOOT_CLEAR_MONEY",0x165,12340,0),
+("SMSG_ITEM_PUSH_RESULT",0x166,12340,0),
+("SMSG_DUEL_REQUESTED",0x167,12340,0),
+("SMSG_DUEL_OUTOFBOUNDS",0x168,12340,0),
+("SMSG_DUEL_INBOUNDS",0x169,12340,0),
+("SMSG_DUEL_COMPLETE",0x16A,12340,0),
+("SMSG_DUEL_WINNER",0x16B,12340,0),
+("CMSG_DUEL_ACCEPTED",0x16C,12340,0),
+("CMSG_DUEL_CANCELLED",0x16D,12340,0),
+("SMSG_MOUNTRESULT",0x16E,12340,0),
+("SMSG_DISMOUNTRESULT",0x16F,12340,0),
+("SMSG_REMOVED_FROM_PVP_QUEUE",0x170,12340,0),
+("CMSG_MOUNTSPECIAL_ANIM",0x171,12340,0),
+("SMSG_MOUNTSPECIAL_ANIM",0x172,12340,0),
+("SMSG_PET_TAME_FAILURE",0x173,12340,0),
+("CMSG_PET_SET_ACTION",0x174,12340,0),
+("CMSG_PET_ACTION",0x175,12340,0),
+("CMSG_PET_ABANDON",0x176,12340,0),
+("CMSG_PET_RENAME",0x177,12340,0),
+("SMSG_PET_NAME_INVALID",0x178,12340,0),
+("SMSG_PET_SPELLS",0x179,12340,0),
+("SMSG_PET_MODE",0x17A,12340,0),
+("CMSG_GOSSIP_HELLO",0x17B,12340,0),
+("CMSG_GOSSIP_SELECT_OPTION",0x17C,12340,0),
+("SMSG_GOSSIP_MESSAGE",0x17D,12340,0),
+("SMSG_GOSSIP_COMPLETE",0x17E,12340,0),
+("CMSG_NPC_TEXT_QUERY",0x17F,12340,0),
+("SMSG_NPC_TEXT_UPDATE",0x180,12340,0),
+("SMSG_NPC_WONT_TALK",0x181,12340,0),
+("CMSG_QUESTGIVER_STATUS_QUERY",0x182,12340,0),
+("SMSG_QUESTGIVER_STATUS",0x183,12340,0),
+("CMSG_QUESTGIVER_HELLO",0x184,12340,0),
+("SMSG_QUESTGIVER_QUEST_LIST",0x185,12340,0),
+("CMSG_QUESTGIVER_QUERY_QUEST",0x186,12340,0),
+("CMSG_QUESTGIVER_QUEST_AUTOLAUNCH",0x187,12340,0),
+("SMSG_QUESTGIVER_QUEST_DETAILS",0x188,12340,0),
+("CMSG_QUESTGIVER_ACCEPT_QUEST",0x189,12340,0),
+("CMSG_QUESTGIVER_COMPLETE_QUEST",0x18A,12340,0),
+("SMSG_QUESTGIVER_REQUEST_ITEMS",0x18B,12340,0),
+("CMSG_QUESTGIVER_REQUEST_REWARD",0x18C,12340,0),
+("SMSG_QUESTGIVER_OFFER_REWARD",0x18D,12340,0),
+("CMSG_QUESTGIVER_CHOOSE_REWARD",0x18E,12340,0),
+("SMSG_QUESTGIVER_QUEST_INVALID",0x18F,12340,0),
+("CMSG_QUESTGIVER_CANCEL",0x190,12340,0),
+("SMSG_QUESTGIVER_QUEST_COMPLETE",0x191,12340,0),
+("SMSG_QUESTGIVER_QUEST_FAILED",0x192,12340,0),
+("CMSG_QUESTLOG_SWAP_QUEST",0x193,12340,0),
+("CMSG_QUESTLOG_REMOVE_QUEST",0x194,12340,0),
+("SMSG_QUESTLOG_FULL",0x195,12340,0),
+("SMSG_QUESTUPDATE_FAILED",0x196,12340,0),
+("SMSG_QUESTUPDATE_FAILEDTIMER",0x197,12340,0),
+("SMSG_QUESTUPDATE_COMPLETE",0x198,12340,0),
+("SMSG_QUESTUPDATE_ADD_KILL",0x199,12340,0),
+("SMSG_QUESTUPDATE_ADD_ITEM_OBSOLETE",0x19A,12340,0),
+("CMSG_QUEST_CONFIRM_ACCEPT",0x19B,12340,0),
+("SMSG_QUEST_CONFIRM_ACCEPT",0x19C,12340,0),
+("CMSG_PUSHQUESTTOPARTY",0x19D,12340,0),
+("CMSG_LIST_INVENTORY",0x19E,12340,0),
+("SMSG_LIST_INVENTORY",0x19F,12340,0),
+("CMSG_SELL_ITEM",0x1A0,12340,0),
+("SMSG_SELL_ITEM",0x1A1,12340,0),
+("CMSG_BUY_ITEM",0x1A2,12340,0),
+("CMSG_BUY_ITEM_IN_SLOT",0x1A3,12340,0),
+("SMSG_BUY_ITEM",0x1A4,12340,0),
+("SMSG_BUY_FAILED",0x1A5,12340,0),
+("CMSG_TAXICLEARALLNODES",0x1A6,12340,0),
+("CMSG_TAXIENABLEALLNODES",0x1A7,12340,0),
+("CMSG_TAXISHOWNODES",0x1A8,12340,0),
+("SMSG_SHOWTAXINODES",0x1A9,12340,0),
+("CMSG_TAXINODE_STATUS_QUERY",0x1AA,12340,0),
+("SMSG_TAXINODE_STATUS",0x1AB,12340,0),
+("CMSG_TAXIQUERYAVAILABLENODES",0x1AC,12340,0),
+("CMSG_ACTIVATETAXI",0x1AD,12340,0),
+("SMSG_ACTIVATETAXIREPLY",0x1AE,12340,0),
+("SMSG_NEW_TAXI_PATH",0x1AF,12340,0),
+("CMSG_TRAINER_LIST",0x1B0,12340,0),
+("SMSG_TRAINER_LIST",0x1B1,12340,0),
+("CMSG_TRAINER_BUY_SPELL",0x1B2,12340,0),
+("SMSG_TRAINER_BUY_SUCCEEDED",0x1B3,12340,0),
+("SMSG_TRAINER_BUY_FAILED",0x1B4,12340,0),
+("CMSG_BINDER_ACTIVATE",0x1B5,12340,0),
+("SMSG_PLAYERBINDERROR",0x1B6,12340,0),
+("CMSG_BANKER_ACTIVATE",0x1B7,12340,0),
+("SMSG_SHOW_BANK",0x1B8,12340,0),
+("CMSG_BUY_BANK_SLOT",0x1B9,12340,0),
+("SMSG_BUY_BANK_SLOT_RESULT",0x1BA,12340,0),
+("CMSG_PETITION_SHOWLIST",0x1BB,12340,0),
+("SMSG_PETITION_SHOWLIST",0x1BC,12340,0),
+("CMSG_PETITION_BUY",0x1BD,12340,0),
+("CMSG_PETITION_SHOW_SIGNATURES",0x1BE,12340,0),
+("SMSG_PETITION_SHOW_SIGNATURES",0x1BF,12340,0),
+("CMSG_PETITION_SIGN",0x1C0,12340,0),
+("SMSG_PETITION_SIGN_RESULTS",0x1C1,12340,0),
+("MSG_PETITION_DECLINE",0x1C2,12340,0),
+("CMSG_OFFER_PETITION",0x1C3,12340,0),
+("CMSG_TURN_IN_PETITION",0x1C4,12340,0),
+("SMSG_TURN_IN_PETITION_RESULTS",0x1C5,12340,0),
+("CMSG_PETITION_QUERY",0x1C6,12340,0),
+("SMSG_PETITION_QUERY_RESPONSE",0x1C7,12340,0),
+("SMSG_FISH_NOT_HOOKED",0x1C8,12340,0),
+("SMSG_FISH_ESCAPED",0x1C9,12340,0),
+("CMSG_BUG",0x1CA,12340,0),
+("SMSG_NOTIFICATION",0x1CB,12340,0),
+("CMSG_PLAYED_TIME",0x1CC,12340,0),
+("SMSG_PLAYED_TIME",0x1CD,12340,0),
+("CMSG_QUERY_TIME",0x1CE,12340,0),
+("SMSG_QUERY_TIME_RESPONSE",0x1CF,12340,0),
+("SMSG_LOG_XPGAIN",0x1D0,12340,0),
+("SMSG_AURACASTLOG",0x1D1,12340,0),
+("CMSG_RECLAIM_CORPSE",0x1D2,12340,0),
+("CMSG_WRAP_ITEM",0x1D3,12340,0),
+("SMSG_LEVELUP_INFO",0x1D4,12340,0),
+("MSG_MINIMAP_PING",0x1D5,12340,0),
+("SMSG_RESISTLOG",0x1D6,12340,0),
+("SMSG_ENCHANTMENTLOG",0x1D7,12340,0),
+("CMSG_SET_SKILL_CHEAT",0x1D8,12340,0),
+("SMSG_START_MIRROR_TIMER",0x1D9,12340,0),
+("SMSG_PAUSE_MIRROR_TIMER",0x1DA,12340,0),
+("SMSG_STOP_MIRROR_TIMER",0x1DB,12340,0),
+("CMSG_PING",0x1DC,12340,0),
+("SMSG_PONG",0x1DD,12340,0),
+("SMSG_CLEAR_COOLDOWN",0x1DE,12340,0),
+("SMSG_GAMEOBJECT_PAGETEXT",0x1DF,12340,0),
+("CMSG_SETSHEATHED",0x1E0,12340,0),
+("SMSG_COOLDOWN_CHEAT",0x1E1,12340,0),
+("SMSG_SPELL_DELAYED",0x1E2,12340,0),
+("CMSG_QUEST_POI_QUERY",0x1E3,12340,0),
+("SMSG_QUEST_POI_QUERY_RESPONSE",0x1E4,12340,0),
+("CMSG_GHOST",0x1E5,12340,0),
+("CMSG_GM_INVIS",0x1E6,12340,0),
+("SMSG_INVALID_PROMOTION_CODE",0x1E7,12340,0),
+("MSG_GM_BIND_OTHER",0x1E8,12340,0),
+("MSG_GM_SUMMON",0x1E9,12340,0),
+("SMSG_ITEM_TIME_UPDATE",0x1EA,12340,0),
+("SMSG_ITEM_ENCHANT_TIME_UPDATE",0x1EB,12340,0),
+("SMSG_AUTH_CHALLENGE",0x1EC,12340,0),
+("CMSG_AUTH_SESSION",0x1ED,12340,0),
+("SMSG_AUTH_RESPONSE",0x1EE,12340,0),
+("MSG_GM_SHOWLABEL",0x1EF,12340,0),
+("CMSG_PET_CAST_SPELL",0x1F0,12340,0),
+("MSG_SAVE_GUILD_EMBLEM",0x1F1,12340,0),
+("MSG_TABARDVENDOR_ACTIVATE",0x1F2,12340,0),
+("SMSG_PLAY_SPELL_VISUAL",0x1F3,12340,0),
+("CMSG_ZONEUPDATE",0x1F4,12340,0),
+("SMSG_PARTYKILLLOG",0x1F5,12340,0),
+("SMSG_COMPRESSED_UPDATE_OBJECT",0x1F6,12340,0),
+("SMSG_PLAY_SPELL_IMPACT",0x1F7,12340,0),
+("SMSG_EXPLORATION_EXPERIENCE",0x1F8,12340,0),
+("CMSG_GM_SET_SECURITY_GROUP",0x1F9,12340,0),
+("CMSG_GM_NUKE",0x1FA,12340,0),
+("MSG_RANDOM_ROLL",0x1FB,12340,0),
+("SMSG_ENVIRONMENTALDAMAGELOG",0x1FC,12340,0),
+("CMSG_CHANGEPLAYER_DIFFICULTY",0x1FD,12340,0),
+("SMSG_RWHOIS",0x1FE,12340,0),
+("SMSG_LFG_PLAYER_REWARD",0x1FF,12340,0),
+("SMSG_LFG_TELEPORT_DENIED",0x200,12340,0),
+("CMSG_UNLEARN_SPELL",0x201,12340,0),
+("CMSG_UNLEARN_SKILL",0x202,12340,0),
+("SMSG_REMOVED_SPELL",0x203,12340,0),
+("CMSG_DECHARGE",0x204,12340,0),
+("CMSG_GMTICKET_CREATE",0x205,12340,0),
+("SMSG_GMTICKET_CREATE",0x206,12340,0),
+("CMSG_GMTICKET_UPDATETEXT",0x207,12340,0),
+("SMSG_GMTICKET_UPDATETEXT",0x208,12340,0),
+("SMSG_ACCOUNT_DATA_TIMES",0x209,12340,0),
+("CMSG_REQUEST_ACCOUNT_DATA",0x20A,12340,0),
+("CMSG_UPDATE_ACCOUNT_DATA",0x20B,12340,0),
+("SMSG_UPDATE_ACCOUNT_DATA",0x20C,12340,0),
+("SMSG_CLEAR_FAR_SIGHT_IMMEDIATE",0x20D,12340,0),
+("SMSG_CHANGEPLAYER_DIFFICULTY_RESULT",0x20E,12340,0),
+("CMSG_GM_TEACH",0x20F,12340,0),
+("CMSG_GM_CREATE_ITEM_TARGET",0x210,12340,0),
+("CMSG_GMTICKET_GETTICKET",0x211,12340,0),
+("SMSG_GMTICKET_GETTICKET",0x212,12340,0),
+("CMSG_UNLEARN_TALENTS",0x213,12340,0),
+("SMSG_INSTANCE_ENCOUNTER",0x214,12340,0),
+("SMSG_GAMEOBJECT_DESPAWN_ANIM",0x215,12340,0),
+("MSG_CORPSE_QUERY",0x216,12340,0),
+("CMSG_GMTICKET_DELETETICKET",0x217,12340,0),
+("SMSG_GMTICKET_DELETETICKET",0x218,12340,0),
+("SMSG_CHAT_WRONG_FACTION",0x219,12340,0),
+("CMSG_GMTICKET_SYSTEMSTATUS",0x21A,12340,0),
+("SMSG_GMTICKET_SYSTEMSTATUS",0x21B,12340,0),
+("CMSG_SPIRIT_HEALER_ACTIVATE",0x21C,12340,0),
+("CMSG_SET_STAT_CHEAT",0x21D,12340,0),
+("SMSG_QUEST_FORCE_REMOVED",0x21E,12340,0),
+("CMSG_SKILL_BUY_STEP",0x21F,12340,0),
+("CMSG_SKILL_BUY_RANK",0x220,12340,0),
+("CMSG_XP_CHEAT",0x221,12340,0),
+("SMSG_SPIRIT_HEALER_CONFIRM",0x222,12340,0),
+("CMSG_CHARACTER_POINT_CHEAT",0x223,12340,0),
+("SMSG_GOSSIP_POI",0x224,12340,0),
+("CMSG_CHAT_IGNORED",0x225,12340,0),
+("CMSG_GM_VISION",0x226,12340,0),
+("CMSG_SERVER_COMMAND",0x227,12340,0),
+("CMSG_GM_SILENCE",0x228,12340,0),
+("CMSG_GM_REVEALTO",0x229,12340,0),
+("CMSG_GM_RESURRECT",0x22A,12340,0),
+("CMSG_GM_SUMMONMOB",0x22B,12340,0),
+("CMSG_GM_MOVECORPSE",0x22C,12340,0),
+("CMSG_GM_FREEZE",0x22D,12340,0),
+("CMSG_GM_UBERINVIS",0x22E,12340,0),
+("CMSG_GM_REQUEST_PLAYER_INFO",0x22F,12340,0),
+("SMSG_GM_PLAYER_INFO",0x230,12340,0),
+("CMSG_GUILD_RANK",0x231,12340,0),
+("CMSG_GUILD_ADD_RANK",0x232,12340,0),
+("CMSG_GUILD_DEL_RANK",0x233,12340,0),
+("CMSG_GUILD_SET_PUBLIC_NOTE",0x234,12340,0),
+("CMSG_GUILD_SET_OFFICER_NOTE",0x235,12340,0),
+("SMSG_LOGIN_VERIFY_WORLD",0x236,12340,0),
+("CMSG_CLEAR_EXPLORATION",0x237,12340,0),
+("CMSG_SEND_MAIL",0x238,12340,0),
+("SMSG_SEND_MAIL_RESULT",0x239,12340,0),
+("CMSG_GET_MAIL_LIST",0x23A,12340,0),
+("SMSG_MAIL_LIST_RESULT",0x23B,12340,0),
+("CMSG_BATTLEFIELD_LIST",0x23C,12340,0),
+("SMSG_BATTLEFIELD_LIST",0x23D,12340,0),
+("CMSG_BATTLEFIELD_JOIN",0x23E,12340,0),
+("SMSG_FORCE_SET_VEHICLE_REC_ID",0x23F,12340,0),
+("CMSG_SET_VEHICLE_REC_ID_ACK",0x240,12340,0),
+("CMSG_TAXICLEARNODE",0x241,12340,0),
+("CMSG_TAXIENABLENODE",0x242,12340,0),
+("CMSG_ITEM_TEXT_QUERY",0x243,12340,0),
+("SMSG_ITEM_TEXT_QUERY_RESPONSE",0x244,12340,0),
+("CMSG_MAIL_TAKE_MONEY",0x245,12340,0),
+("CMSG_MAIL_TAKE_ITEM",0x246,12340,0),
+("CMSG_MAIL_MARK_AS_READ",0x247,12340,0),
+("CMSG_MAIL_RETURN_TO_SENDER",0x248,12340,0),
+("CMSG_MAIL_DELETE",0x249,12340,0),
+("CMSG_MAIL_CREATE_TEXT_ITEM",0x24A,12340,0),
+("SMSG_SPELLLOGMISS",0x24B,12340,0),
+("SMSG_SPELLLOGEXECUTE",0x24C,12340,0),
+("SMSG_DEBUGAURAPROC",0x24D,12340,0),
+("SMSG_PERIODICAURALOG",0x24E,12340,0),
+("SMSG_SPELLDAMAGESHIELD",0x24F,12340,0),
+("SMSG_SPELLNONMELEEDAMAGELOG",0x250,12340,0),
+("CMSG_LEARN_TALENT",0x251,12340,0),
+("SMSG_RESURRECT_FAILED",0x252,12340,0),
+("CMSG_TOGGLE_PVP",0x253,12340,0),
+("SMSG_ZONE_UNDER_ATTACK",0x254,12340,0),
+("MSG_AUCTION_HELLO",0x255,12340,0),
+("CMSG_AUCTION_SELL_ITEM",0x256,12340,0),
+("CMSG_AUCTION_REMOVE_ITEM",0x257,12340,0),
+("CMSG_AUCTION_LIST_ITEMS",0x258,12340,0),
+("CMSG_AUCTION_LIST_OWNER_ITEMS",0x259,12340,0),
+("CMSG_AUCTION_PLACE_BID",0x25A,12340,0),
+("SMSG_AUCTION_COMMAND_RESULT",0x25B,12340,0),
+("SMSG_AUCTION_LIST_RESULT",0x25C,12340,0),
+("SMSG_AUCTION_OWNER_LIST_RESULT",0x25D,12340,0),
+("SMSG_AUCTION_BIDDER_NOTIFICATION",0x25E,12340,0),
+("SMSG_AUCTION_OWNER_NOTIFICATION",0x25F,12340,0),
+("SMSG_PROCRESIST",0x260,12340,0),
+("SMSG_COMBAT_EVENT_FAILED",0x261,12340,0),
+("SMSG_DISPEL_FAILED",0x262,12340,0),
+("SMSG_SPELLORDAMAGE_IMMUNE",0x263,12340,0),
+("CMSG_AUCTION_LIST_BIDDER_ITEMS",0x264,12340,0),
+("SMSG_AUCTION_BIDDER_LIST_RESULT",0x265,12340,0),
+("SMSG_SET_FLAT_SPELL_MODIFIER",0x266,12340,0),
+("SMSG_SET_PCT_SPELL_MODIFIER",0x267,12340,0),
+("CMSG_SET_AMMO",0x268,12340,0),
+("SMSG_CORPSE_RECLAIM_DELAY",0x269,12340,0),
+("CMSG_SET_ACTIVE_MOVER",0x26A,12340,0),
+("CMSG_PET_CANCEL_AURA",0x26B,12340,0),
+("CMSG_PLAYER_AI_CHEAT",0x26C,12340,0),
+("CMSG_CANCEL_AUTO_REPEAT_SPELL",0x26D,12340,0),
+("MSG_GM_ACCOUNT_ONLINE",0x26E,12340,0),
+("MSG_LIST_STABLED_PETS",0x26F,12340,0),
+("CMSG_STABLE_PET",0x270,12340,0),
+("CMSG_UNSTABLE_PET",0x271,12340,0),
+("CMSG_BUY_STABLE_SLOT",0x272,12340,0),
+("SMSG_STABLE_RESULT",0x273,12340,0),
+("CMSG_STABLE_REVIVE_PET",0x274,12340,0),
+("CMSG_STABLE_SWAP_PET",0x275,12340,0),
+("MSG_QUEST_PUSH_RESULT",0x276,12340,0),
+("SMSG_PLAY_MUSIC",0x277,12340,0),
+("SMSG_PLAY_OBJECT_SOUND",0x278,12340,0),
+("CMSG_REQUEST_PET_INFO",0x279,12340,0),
+("CMSG_FAR_SIGHT",0x27A,12340,0),
+("SMSG_SPELLDISPELLOG",0x27B,12340,0),
+("SMSG_DAMAGE_CALC_LOG",0x27C,12340,0),
+("CMSG_ENABLE_DAMAGE_LOG",0x27D,12340,0),
+("CMSG_GROUP_CHANGE_SUB_GROUP",0x27E,12340,0),
+("CMSG_REQUEST_PARTY_MEMBER_STATS",0x27F,12340,0),
+("CMSG_GROUP_SWAP_SUB_GROUP",0x280,12340,0),
+("CMSG_RESET_FACTION_CHEAT",0x281,12340,0),
+("CMSG_AUTOSTORE_BANK_ITEM",0x282,12340,0),
+("CMSG_AUTOBANK_ITEM",0x283,12340,0),
+("MSG_QUERY_NEXT_MAIL_TIME",0x284,12340,0),
+("SMSG_RECEIVED_MAIL",0x285,12340,0),
+("SMSG_RAID_GROUP_ONLY",0x286,12340,0),
+("CMSG_SET_DURABILITY_CHEAT",0x287,12340,0),
+("CMSG_SET_PVP_RANK_CHEAT",0x288,12340,0),
+("CMSG_ADD_PVP_MEDAL_CHEAT",0x289,12340,0),
+("CMSG_DEL_PVP_MEDAL_CHEAT",0x28A,12340,0),
+("CMSG_SET_PVP_TITLE",0x28B,12340,0),
+("SMSG_PVP_CREDIT",0x28C,12340,0),
+("SMSG_AUCTION_REMOVED_NOTIFICATION",0x28D,12340,0),
+("CMSG_GROUP_RAID_CONVERT",0x28E,12340,0),
+("CMSG_GROUP_ASSISTANT_LEADER",0x28F,12340,0),
+("CMSG_BUYBACK_ITEM",0x290,12340,0),
+("SMSG_SERVER_MESSAGE",0x291,12340,0),
+("CMSG_SET_SAVED_INSTANCE_EXTEND",0x292,12340,0),
+("SMSG_LFG_OFFER_CONTINUE",0x293,12340,0),
+("CMSG_TEST_DROP_RATE",0x294,12340,0),
+("SMSG_TEST_DROP_RATE_RESULT",0x295,12340,0),
+("CMSG_LFG_GET_STATUS",0x296,12340,0),
+("SMSG_SHOW_MAILBOX",0x297,12340,0),
+("SMSG_RESET_RANGED_COMBAT_TIMER",0x298,12340,0),
+("SMSG_CHAT_NOT_IN_PARTY",0x299,12340,0),
+("CMSG_GMTICKETSYSTEM_TOGGLE",0x29A,12340,0),
+("CMSG_CANCEL_GROWTH_AURA",0x29B,12340,0),
+("SMSG_CANCEL_AUTO_REPEAT",0x29C,12340,0),
+("SMSG_STANDSTATE_UPDATE",0x29D,12340,0),
+("SMSG_LOOT_ALL_PASSED",0x29E,12340,0),
+("SMSG_LOOT_ROLL_WON",0x29F,12340,0),
+("CMSG_LOOT_ROLL",0x2A0,12340,0),
+("SMSG_LOOT_START_ROLL",0x2A1,12340,0),
+("SMSG_LOOT_ROLL",0x2A2,12340,0),
+("CMSG_LOOT_MASTER_GIVE",0x2A3,12340,0),
+("SMSG_LOOT_MASTER_LIST",0x2A4,12340,0),
+("SMSG_SET_FORCED_REACTIONS",0x2A5,12340,0),
+("SMSG_SPELL_FAILED_OTHER",0x2A6,12340,0),
+("SMSG_GAMEOBJECT_RESET_STATE",0x2A7,12340,0),
+("CMSG_REPAIR_ITEM",0x2A8,12340,0),
+("SMSG_CHAT_PLAYER_NOT_FOUND",0x2A9,12340,0),
+("MSG_TALENT_WIPE_CONFIRM",0x2AA,12340,0),
+("SMSG_SUMMON_REQUEST",0x2AB,12340,0),
+("CMSG_SUMMON_RESPONSE",0x2AC,12340,0),
+("MSG_DEV_SHOWLABEL",0x2AD,12340,0),
+("SMSG_MONSTER_MOVE_TRANSPORT",0x2AE,12340,0),
+("SMSG_PET_BROKEN",0x2AF,12340,0),
+("MSG_MOVE_FEATHER_FALL",0x2B0,12340,0),
+("MSG_MOVE_WATER_WALK",0x2B1,12340,0),
+("CMSG_SERVER_BROADCAST",0x2B2,12340,0),
+("CMSG_SELF_RES",0x2B3,12340,0),
+("SMSG_FEIGN_DEATH_RESISTED",0x2B4,12340,0),
+("CMSG_RUN_SCRIPT",0x2B5,12340,0),
+("SMSG_SCRIPT_MESSAGE",0x2B6,12340,0),
+("SMSG_DUEL_COUNTDOWN",0x2B7,12340,0),
+("SMSG_AREA_TRIGGER_MESSAGE",0x2B8,12340,0),
+("CMSG_SHOWING_HELM",0x2B9,12340,0),
+("CMSG_SHOWING_CLOAK",0x2BA,12340,0),
+("SMSG_ROLE_CHOSEN",0x2BB,12340,0),
+("SMSG_PLAYER_SKINNED",0x2BC,12340,0),
+("SMSG_DURABILITY_DAMAGE_DEATH",0x2BD,12340,0),
+("CMSG_SET_EXPLORATION",0x2BE,12340,0),
+("CMSG_SET_ACTIONBAR_TOGGLES",0x2BF,12340,0),
+("UMSG_DELETE_GUILD_CHARTER",0x2C0,12340,0),
+("MSG_PETITION_RENAME",0x2C1,12340,0),
+("SMSG_INIT_WORLD_STATES",0x2C2,12340,0),
+("SMSG_UPDATE_WORLD_STATE",0x2C3,12340,0),
+("CMSG_ITEM_NAME_QUERY",0x2C4,12340,0),
+("SMSG_ITEM_NAME_QUERY_RESPONSE",0x2C5,12340,0),
+("SMSG_PET_ACTION_FEEDBACK",0x2C6,12340,0),
+("CMSG_CHAR_RENAME",0x2C7,12340,0),
+("SMSG_CHAR_RENAME",0x2C8,12340,0),
+("CMSG_MOVE_SPLINE_DONE",0x2C9,12340,0),
+("CMSG_MOVE_FALL_RESET",0x2CA,12340,0),
+("SMSG_INSTANCE_SAVE_CREATED",0x2CB,12340,0),
+("SMSG_RAID_INSTANCE_INFO",0x2CC,12340,0),
+("CMSG_REQUEST_RAID_INFO",0x2CD,12340,0),
+("CMSG_MOVE_TIME_SKIPPED",0x2CE,12340,0),
+("CMSG_MOVE_FEATHER_FALL_ACK",0x2CF,12340,0),
+("CMSG_MOVE_WATER_WALK_ACK",0x2D0,12340,0),
+("CMSG_MOVE_NOT_ACTIVE_MOVER",0x2D1,12340,0),
+("SMSG_PLAY_SOUND",0x2D2,12340,0),
+("CMSG_BATTLEFIELD_STATUS",0x2D3,12340,0),
+("SMSG_BATTLEFIELD_STATUS",0x2D4,12340,0),
+("CMSG_BATTLEFIELD_PORT",0x2D5,12340,0),
+("MSG_INSPECT_HONOR_STATS",0x2D6,12340,0),
+("CMSG_BATTLEMASTER_HELLO",0x2D7,12340,0),
+("CMSG_MOVE_START_SWIM_CHEAT",0x2D8,12340,0),
+("CMSG_MOVE_STOP_SWIM_CHEAT",0x2D9,12340,0),
+("SMSG_FORCE_WALK_SPEED_CHANGE",0x2DA,12340,0),
+("CMSG_FORCE_WALK_SPEED_CHANGE_ACK",0x2DB,12340,0),
+("SMSG_FORCE_SWIM_BACK_SPEED_CHANGE",0x2DC,12340,0),
+("CMSG_FORCE_SWIM_BACK_SPEED_CHANGE_ACK",0x2DD,12340,0),
+("SMSG_FORCE_TURN_RATE_CHANGE",0x2DE,12340,0),
+("CMSG_FORCE_TURN_RATE_CHANGE_ACK",0x2DF,12340,0),
+("MSG_PVP_LOG_DATA",0x2E0,12340,0),
+("CMSG_LEAVE_BATTLEFIELD",0x2E1,12340,0),
+("CMSG_AREA_SPIRIT_HEALER_QUERY",0x2E2,12340,0),
+("CMSG_AREA_SPIRIT_HEALER_QUEUE",0x2E3,12340,0),
+("SMSG_AREA_SPIRIT_HEALER_TIME",0x2E4,12340,0),
+("CMSG_GM_UNTEACH",0x2E5,12340,0),
+("SMSG_WARDEN_DATA",0x2E6,12340,0),
+("CMSG_WARDEN_DATA",0x2E7,12340,0),
+("SMSG_GROUP_JOINED_BATTLEGROUND",0x2E8,12340,0),
+("MSG_BATTLEGROUND_PLAYER_POSITIONS",0x2E9,12340,0),
+("CMSG_PET_STOP_ATTACK",0x2EA,12340,0),
+("SMSG_BINDER_CONFIRM",0x2EB,12340,0),
+("SMSG_BATTLEGROUND_PLAYER_JOINED",0x2EC,12340,0),
+("SMSG_BATTLEGROUND_PLAYER_LEFT",0x2ED,12340,0),
+("CMSG_BATTLEMASTER_JOIN",0x2EE,12340,0),
+("SMSG_ADDON_INFO",0x2EF,12340,0),
+("CMSG_PET_UNLEARN",0x2F0,12340,0),
+("SMSG_PET_UNLEARN_CONFIRM",0x2F1,12340,0),
+("SMSG_PARTY_MEMBER_STATS_FULL",0x2F2,12340,0),
+("CMSG_PET_SPELL_AUTOCAST",0x2F3,12340,0),
+("SMSG_WEATHER",0x2F4,12340,0),
+("SMSG_PLAY_TIME_WARNING",0x2F5,12340,0),
+("SMSG_MINIGAME_SETUP",0x2F6,12340,0),
+("SMSG_MINIGAME_STATE",0x2F7,12340,0),
+("CMSG_MINIGAME_MOVE",0x2F8,12340,0),
+("SMSG_MINIGAME_MOVE_FAILED",0x2F9,12340,0),
+("SMSG_RAID_INSTANCE_MESSAGE",0x2FA,12340,0),
+("SMSG_COMPRESSED_MOVES",0x2FB,12340,0),
+("CMSG_GUILD_INFO_TEXT",0x2FC,12340,0),
+("SMSG_CHAT_RESTRICTED",0x2FD,12340,0),
+("SMSG_SPLINE_SET_RUN_SPEED",0x2FE,12340,0),
+("SMSG_SPLINE_SET_RUN_BACK_SPEED",0x2FF,12340,0),
+("SMSG_SPLINE_SET_SWIM_SPEED",0x300,12340,0),
+("SMSG_SPLINE_SET_WALK_SPEED",0x301,12340,0),
+("SMSG_SPLINE_SET_SWIM_BACK_SPEED",0x302,12340,0),
+("SMSG_SPLINE_SET_TURN_RATE",0x303,12340,0),
+("SMSG_SPLINE_MOVE_UNROOT",0x304,12340,0),
+("SMSG_SPLINE_MOVE_FEATHER_FALL",0x305,12340,0),
+("SMSG_SPLINE_MOVE_NORMAL_FALL",0x306,12340,0),
+("SMSG_SPLINE_MOVE_SET_HOVER",0x307,12340,0),
+("SMSG_SPLINE_MOVE_UNSET_HOVER",0x308,12340,0),
+("SMSG_SPLINE_MOVE_WATER_WALK",0x309,12340,0),
+("SMSG_SPLINE_MOVE_LAND_WALK",0x30A,12340,0),
+("SMSG_SPLINE_MOVE_START_SWIM",0x30B,12340,0),
+("SMSG_SPLINE_MOVE_STOP_SWIM",0x30C,12340,0),
+("SMSG_SPLINE_MOVE_SET_RUN_MODE",0x30D,12340,0),
+("SMSG_SPLINE_MOVE_SET_WALK_MODE",0x30E,12340,0),
+("CMSG_GM_NUKE_ACCOUNT",0x30F,12340,0),
+("MSG_GM_DESTROY_CORPSE",0x310,12340,0),
+("CMSG_GM_DESTROY_ONLINE_CORPSE",0x311,12340,0),
+("CMSG_ACTIVATETAXIEXPRESS",0x312,12340,0),
+("SMSG_SET_FACTION_ATWAR",0x313,12340,0),
+("SMSG_GAMETIMEBIAS_SET",0x314,12340,0),
+("CMSG_DEBUG_ACTIONS_START",0x315,12340,0),
+("CMSG_DEBUG_ACTIONS_STOP",0x316,12340,0),
+("CMSG_SET_FACTION_INACTIVE",0x317,12340,0),
+("CMSG_SET_WATCHED_FACTION",0x318,12340,0),
+("MSG_MOVE_TIME_SKIPPED",0x319,12340,0),
+("SMSG_SPLINE_MOVE_ROOT",0x31A,12340,0),
+("CMSG_SET_EXPLORATION_ALL",0x31B,12340,0),
+("SMSG_INVALIDATE_PLAYER",0x31C,12340,0),
+("CMSG_RESET_INSTANCES",0x31D,12340,0),
+("SMSG_INSTANCE_RESET",0x31E,12340,0),
+("SMSG_INSTANCE_RESET_FAILED",0x31F,12340,0),
+("SMSG_UPDATE_LAST_INSTANCE",0x320,12340,0),
+("MSG_RAID_TARGET_UPDATE",0x321,12340,0),
+("MSG_RAID_READY_CHECK",0x322,12340,0),
+("CMSG_LUA_USAGE",0x323,12340,0),
+("SMSG_PET_ACTION_SOUND",0x324,12340,0),
+("SMSG_PET_DISMISS_SOUND",0x325,12340,0),
+("SMSG_GHOSTEE_GONE",0x326,12340,0),
+("CMSG_GM_UPDATE_TICKET_STATUS",0x327,12340,0),
+("SMSG_GM_TICKET_STATUS_UPDATE",0x328,12340,0),
+("MSG_SET_DUNGEON_DIFFICULTY",0x329,12340,0),
+("CMSG_GMSURVEY_SUBMIT",0x32A,12340,0),
+("SMSG_UPDATE_INSTANCE_OWNERSHIP",0x32B,12340,0),
+("CMSG_IGNORE_KNOCKBACK_CHEAT",0x32C,12340,0),
+("SMSG_CHAT_PLAYER_AMBIGUOUS",0x32D,12340,0),
+("MSG_DELAY_GHOST_TELEPORT",0x32E,12340,0),
+("SMSG_SPELLINSTAKILLLOG",0x32F,12340,0),
+("SMSG_SPELL_UPDATE_CHAIN_TARGETS",0x330,12340,0),
+("CMSG_CHAT_FILTERED",0x331,12340,0),
+("SMSG_EXPECTED_SPAM_RECORDS",0x332,12340,0),
+("SMSG_SPELLSTEALLOG",0x333,12340,0),
+("CMSG_LOTTERY_QUERY_OBSOLETE",0x334,12340,0),
+("SMSG_LOTTERY_QUERY_RESULT_OBSOLETE",0x335,12340,0),
+("CMSG_BUY_LOTTERY_TICKET_OBSOLETE",0x336,12340,0),
+("SMSG_LOTTERY_RESULT_OBSOLETE",0x337,12340,0),
+("SMSG_CHARACTER_PROFILE",0x338,12340,0),
+("SMSG_CHARACTER_PROFILE_REALM_CONNECTED",0x339,12340,0),
+("SMSG_DEFENSE_MESSAGE",0x33A,12340,0),
+("SMSG_INSTANCE_DIFFICULTY",0x33B,12340,0),
+("MSG_GM_RESETINSTANCELIMIT",0x33C,12340,0),
+("SMSG_MOTD",0x33D,12340,0),
+("SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x33E,12340,0),
+("SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x33F,12340,0),
+("CMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY_ACK",0x340,12340,0),
+("MSG_MOVE_START_SWIM_CHEAT",0x341,12340,0),
+("MSG_MOVE_STOP_SWIM_CHEAT",0x342,12340,0),
+("SMSG_MOVE_SET_CAN_FLY",0x343,12340,0),
+("SMSG_MOVE_UNSET_CAN_FLY",0x344,12340,0),
+("CMSG_MOVE_SET_CAN_FLY_ACK",0x345,12340,0),
+("CMSG_MOVE_SET_FLY",0x346,12340,0),
+("CMSG_SOCKET_GEMS",0x347,12340,0),
+("CMSG_ARENA_TEAM_CREATE",0x348,12340,0),
+("SMSG_ARENA_TEAM_COMMAND_RESULT",0x349,12340,0),
+("MSG_MOVE_UPDATE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",0x34A,12340,0),
+("CMSG_ARENA_TEAM_QUERY",0x34B,12340,0),
+("SMSG_ARENA_TEAM_QUERY_RESPONSE",0x34C,12340,0),
+("CMSG_ARENA_TEAM_ROSTER",0x34D,12340,0),
+("SMSG_ARENA_TEAM_ROSTER",0x34E,12340,0),
+("CMSG_ARENA_TEAM_INVITE",0x34F,12340,0),
+("SMSG_ARENA_TEAM_INVITE",0x350,12340,0),
+("CMSG_ARENA_TEAM_ACCEPT",0x351,12340,0),
+("CMSG_ARENA_TEAM_DECLINE",0x352,12340,0),
+("CMSG_ARENA_TEAM_LEAVE",0x353,12340,0),
+("CMSG_ARENA_TEAM_REMOVE",0x354,12340,0),
+("CMSG_ARENA_TEAM_DISBAND",0x355,12340,0),
+("CMSG_ARENA_TEAM_LEADER",0x356,12340,0),
+("SMSG_ARENA_TEAM_EVENT",0x357,12340,0),
+("CMSG_BATTLEMASTER_JOIN_ARENA",0x358,12340,0),
+("MSG_MOVE_START_ASCEND",0x359,12340,0),
+("MSG_MOVE_STOP_ASCEND",0x35A,12340,0),
+("SMSG_ARENA_TEAM_STATS",0x35B,12340,0),
+("CMSG_LFG_JOIN",0x35C,12340,0),
+("CMSG_LFG_LEAVE",0x35D,12340,0),
+("CMSG_LFG_SEARCH_JOIN",0x35E,12340,0),
+("CMSG_LFG_SEARCH_LEAVE",0x35F,12340,0),
+("SMSG_LFG_SEARCH_RESULTS",0x360,12340,0),
+("SMSG_LFG_PROPOSAL_UPDATE",0x361,12340,0),
+("CMSG_LFG_PROPOSAL_RESPONSE",0x362,12340,0),
+("SMSG_LFG_ROLE_CHECK_UPDATE",0x363,12340,0),
+("SMSG_LFG_JOIN_RESULT",0x364,12340,0),
+("SMSG_LFG_QUEUE_STATUS",0x365,12340,0),
+("CMSG_SET_LFG_COMMENT",0x366,12340,0),
+("SMSG_LFG_UPDATE_PLAYER",0x367,12340,0),
+("SMSG_LFG_UPDATE_PARTY",0x368,12340,0),
+("SMSG_LFG_UPDATE_SEARCH",0x369,12340,0),
+("CMSG_LFG_SET_ROLES",0x36A,12340,0),
+("CMSG_LFG_SET_NEEDS",0x36B,12340,0),
+("CMSG_LFG_BOOT_PLAYER_VOTE",0x36C,12340,0),
+("SMSG_LFG_BOOT_PLAYER",0x36D,12340,0),
+("CMSG_LFG_GET_PLAYER_INFO",0x36E,12340,0),
+("SMSG_LFG_PLAYER_INFO",0x36F,12340,0),
+("CMSG_LFG_TELEPORT",0x370,12340,0),
+("CMSG_LFG_GET_PARTY_INFO",0x371,12340,0),
+("SMSG_LFG_PARTY_INFO",0x372,12340,0),
+("SMSG_TITLE_EARNED",0x373,12340,0),
+("CMSG_SET_TITLE",0x374,12340,0),
+("CMSG_CANCEL_MOUNT_AURA",0x375,12340,0),
+("SMSG_ARENA_ERROR",0x376,12340,0),
+("MSG_INSPECT_ARENA_TEAMS",0x377,12340,0),
+("SMSG_DEATH_RELEASE_LOC",0x378,12340,0),
+("CMSG_CANCEL_TEMP_ENCHANTMENT",0x379,12340,0),
+("SMSG_FORCED_DEATH_UPDATE",0x37A,12340,0),
+("CMSG_CHEAT_SET_HONOR_CURRENCY",0x37B,12340,0),
+("CMSG_CHEAT_SET_ARENA_CURRENCY",0x37C,12340,0),
+("MSG_MOVE_SET_FLIGHT_SPEED_CHEAT",0x37D,12340,0),
+("MSG_MOVE_SET_FLIGHT_SPEED",0x37E,12340,0),
+("MSG_MOVE_SET_FLIGHT_BACK_SPEED_CHEAT",0x37F,12340,0),
+("MSG_MOVE_SET_FLIGHT_BACK_SPEED",0x380,12340,0),
+("SMSG_FORCE_FLIGHT_SPEED_CHANGE",0x381,12340,0),
+("CMSG_FORCE_FLIGHT_SPEED_CHANGE_ACK",0x382,12340,0),
+("SMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE",0x383,12340,0),
+("CMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE_ACK",0x384,12340,0),
+("SMSG_SPLINE_SET_FLIGHT_SPEED",0x385,12340,0),
+("SMSG_SPLINE_SET_FLIGHT_BACK_SPEED",0x386,12340,0),
+("CMSG_MAELSTROM_INVALIDATE_CACHE",0x387,12340,0),
+("SMSG_FLIGHT_SPLINE_SYNC",0x388,12340,0),
+("CMSG_SET_TAXI_BENCHMARK_MODE",0x389,12340,0),
+("SMSG_JOINED_BATTLEGROUND_QUEUE",0x38A,12340,0),
+("SMSG_REALM_SPLIT",0x38B,12340,0),
+("CMSG_REALM_SPLIT",0x38C,12340,0),
+("CMSG_MOVE_CHNG_TRANSPORT",0x38D,12340,0),
+("MSG_PARTY_ASSIGNMENT",0x38E,12340,0),
+("SMSG_OFFER_PETITION_ERROR",0x38F,12340,0),
+("SMSG_TIME_SYNC_REQ",0x390,12340,0),
+("CMSG_TIME_SYNC_RESP",0x391,12340,0),
+("CMSG_SEND_LOCAL_EVENT",0x392,12340,0),
+("CMSG_SEND_GENERAL_TRIGGER",0x393,12340,0),
+("CMSG_SEND_COMBAT_TRIGGER",0x394,12340,0),
+("CMSG_MAELSTROM_GM_SENT_MAIL",0x395,12340,0),
+("SMSG_RESET_FAILED_NOTIFY",0x396,12340,0),
+("SMSG_REAL_GROUP_UPDATE",0x397,12340,0),
+("SMSG_LFG_DISABLED",0x398,12340,0),
+("CMSG_ACTIVE_PVP_CHEAT",0x399,12340,0),
+("CMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY",0x39A,12340,0),
+("SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE",0x39B,12340,0),
+("SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE_WRITE_FILE",0x39C,12340,0),
+("SMSG_UPDATE_COMBO_POINTS",0x39D,12340,0),
+("SMSG_VOICE_SESSION_ROSTER_UPDATE",0x39E,12340,0),
+("SMSG_VOICE_SESSION_LEAVE",0x39F,12340,0),
+("SMSG_VOICE_SESSION_ADJUST_PRIORITY",0x3A0,12340,0),
+("CMSG_VOICE_SET_TALKER_MUTED_REQUEST",0x3A1,12340,0),
+("SMSG_VOICE_SET_TALKER_MUTED",0x3A2,12340,0),
+("SMSG_INIT_EXTRA_AURA_INFO_OBSOLETE",0x3A3,12340,0),
+("SMSG_SET_EXTRA_AURA_INFO_OBSOLETE",0x3A4,12340,0),
+("SMSG_SET_EXTRA_AURA_INFO_NEED_UPDATE_OBSOLETE",0x3A5,12340,0),
+("SMSG_CLEAR_EXTRA_AURA_INFO_OBSOLETE",0x3A6,12340,0),
+("MSG_MOVE_START_DESCEND",0x3A7,12340,0),
+("CMSG_IGNORE_REQUIREMENTS_CHEAT",0x3A8,12340,0),
+("SMSG_IGNORE_REQUIREMENTS_CHEAT",0x3A9,12340,0),
+("SMSG_SPELL_CHANCE_PROC_LOG",0x3AA,12340,0),
+("CMSG_MOVE_SET_RUN_SPEED",0x3AB,12340,0),
+("SMSG_DISMOUNT",0x3AC,12340,0),
+("MSG_MOVE_UPDATE_CAN_FLY",0x3AD,12340,0),
+("MSG_RAID_READY_CHECK_CONFIRM",0x3AE,12340,0),
+("CMSG_VOICE_SESSION_ENABLE",0x3AF,12340,0),
+("SMSG_VOICE_SESSION_ENABLE",0x3B0,12340,0),
+("SMSG_VOICE_PARENTAL_CONTROLS",0x3B1,12340,0),
+("CMSG_GM_WHISPER",0x3B2,12340,0),
+("SMSG_GM_MESSAGECHAT",0x3B3,12340,0),
+("MSG_GM_GEARRATING",0x3B4,12340,0),
+("CMSG_COMMENTATOR_ENABLE",0x3B5,12340,0),
+("SMSG_COMMENTATOR_STATE_CHANGED",0x3B6,12340,0),
+("CMSG_COMMENTATOR_GET_MAP_INFO",0x3B7,12340,0),
+("SMSG_COMMENTATOR_MAP_INFO",0x3B8,12340,0),
+("CMSG_COMMENTATOR_GET_PLAYER_INFO",0x3B9,12340,0),
+("SMSG_COMMENTATOR_GET_PLAYER_INFO",0x3BA,12340,0),
+("SMSG_COMMENTATOR_PLAYER_INFO",0x3BB,12340,0),
+("CMSG_COMMENTATOR_ENTER_INSTANCE",0x3BC,12340,0),
+("CMSG_COMMENTATOR_EXIT_INSTANCE",0x3BD,12340,0),
+("CMSG_COMMENTATOR_INSTANCE_COMMAND",0x3BE,12340,0),
+("SMSG_CLEAR_TARGET",0x3BF,12340,0),
+("CMSG_BOT_DETECTED",0x3C0,12340,0),
+("SMSG_CROSSED_INEBRIATION_THRESHOLD",0x3C1,12340,0),
+("CMSG_CHEAT_PLAYER_LOGIN",0x3C2,12340,0),
+("CMSG_CHEAT_PLAYER_LOOKUP",0x3C3,12340,0),
+("SMSG_CHEAT_PLAYER_LOOKUP",0x3C4,12340,0),
+("SMSG_KICK_REASON",0x3C5,12340,0),
+("MSG_RAID_READY_CHECK_FINISHED",0x3C6,12340,0),
+("CMSG_COMPLAIN",0x3C7,12340,0),
+("SMSG_COMPLAIN_RESULT",0x3C8,12340,0),
+("SMSG_FEATURE_SYSTEM_STATUS",0x3C9,12340,0),
+("CMSG_GM_SHOW_COMPLAINTS",0x3CA,12340,0),
+("CMSG_GM_UNSQUELCH",0x3CB,12340,0),
+("CMSG_CHANNEL_SILENCE_VOICE",0x3CC,12340,0),
+("CMSG_CHANNEL_SILENCE_ALL",0x3CD,12340,0),
+("CMSG_CHANNEL_UNSILENCE_VOICE",0x3CE,12340,0),
+("CMSG_CHANNEL_UNSILENCE_ALL",0x3CF,12340,0),
+("CMSG_TARGET_CAST",0x3D0,12340,0),
+("CMSG_TARGET_SCRIPT_CAST",0x3D1,12340,0),
+("CMSG_CHANNEL_DISPLAY_LIST",0x3D2,12340,0),
+("CMSG_SET_ACTIVE_VOICE_CHANNEL",0x3D3,12340,0),
+("CMSG_GET_CHANNEL_MEMBER_COUNT",0x3D4,12340,0),
+("SMSG_CHANNEL_MEMBER_COUNT",0x3D5,12340,0),
+("CMSG_CHANNEL_VOICE_ON",0x3D6,12340,0),
+("CMSG_CHANNEL_VOICE_OFF",0x3D7,12340,0),
+("CMSG_DEBUG_LIST_TARGETS",0x3D8,12340,0),
+("SMSG_DEBUG_LIST_TARGETS",0x3D9,12340,0),
+("SMSG_AVAILABLE_VOICE_CHANNEL",0x3DA,12340,0),
+("CMSG_ADD_VOICE_IGNORE",0x3DB,12340,0),
+("CMSG_DEL_VOICE_IGNORE",0x3DC,12340,0),
+("CMSG_PARTY_SILENCE",0x3DD,12340,0),
+("CMSG_PARTY_UNSILENCE",0x3DE,12340,0),
+("MSG_NOTIFY_PARTY_SQUELCH",0x3DF,12340,0),
+("SMSG_COMSAT_RECONNECT_TRY",0x3E0,12340,0),
+("SMSG_COMSAT_DISCONNECT",0x3E1,12340,0),
+("SMSG_COMSAT_CONNECT_FAIL",0x3E2,12340,0),
+("SMSG_VOICE_CHAT_STATUS",0x3E3,12340,0),
+("CMSG_REPORT_PVP_AFK",0x3E4,12340,0),
+("SMSG_REPORT_PVP_AFK_RESULT",0x3E5,12340,0),
+("CMSG_GUILD_BANKER_ACTIVATE",0x3E6,12340,0),
+("CMSG_GUILD_BANK_QUERY_TAB",0x3E7,12340,0),
+("SMSG_GUILD_BANK_LIST",0x3E8,12340,0),
+("CMSG_GUILD_BANK_SWAP_ITEMS",0x3E9,12340,0),
+("CMSG_GUILD_BANK_BUY_TAB",0x3EA,12340,0),
+("CMSG_GUILD_BANK_UPDATE_TAB",0x3EB,12340,0),
+("CMSG_GUILD_BANK_DEPOSIT_MONEY",0x3EC,12340,0),
+("CMSG_GUILD_BANK_WITHDRAW_MONEY",0x3ED,12340,0),
+("MSG_GUILD_BANK_LOG_QUERY",0x3EE,12340,0),
+("CMSG_SET_CHANNEL_WATCH",0x3EF,12340,0),
+("SMSG_USERLIST_ADD",0x3F0,12340,0),
+("SMSG_USERLIST_REMOVE",0x3F1,12340,0),
+("SMSG_USERLIST_UPDATE",0x3F2,12340,0),
+("CMSG_CLEAR_CHANNEL_WATCH",0x3F3,12340,0),
+("SMSG_INSPECT_RESULTS",0x3F4,12340,0),
+("SMSG_GOGOGO_OBSOLETE",0x3F5,12340,0),
+("SMSG_ECHO_PARTY_SQUELCH",0x3F6,12340,0),
+("CMSG_SET_TITLE_SUFFIX",0x3F7,12340,0),
+("CMSG_SPELLCLICK",0x3F8,12340,0),
+("SMSG_LOOT_LIST",0x3F9,12340,0),
+("CMSG_GM_CHARACTER_RESTORE",0x3FA,12340,0),
+("CMSG_GM_CHARACTER_SAVE",0x3FB,12340,0),
+("SMSG_VOICESESSION_FULL",0x3FC,12340,0),
+("MSG_GUILD_PERMISSIONS",0x3FD,12340,0),
+("MSG_GUILD_BANK_MONEY_WITHDRAWN",0x3FE,12340,0),
+("MSG_GUILD_EVENT_LOG_QUERY",0x3FF,12340,0),
+("CMSG_MAELSTROM_RENAME_GUILD",0x400,12340,0),
+("CMSG_GET_MIRRORIMAGE_DATA",0x401,12340,0),
+("SMSG_MIRRORIMAGE_DATA",0x402,12340,0),
+("SMSG_FORCE_DISPLAY_UPDATE",0x403,12340,0),
+("SMSG_SPELL_CHANCE_RESIST_PUSHBACK",0x404,12340,0),
+("CMSG_IGNORE_DIMINISHING_RETURNS_CHEAT",0x405,12340,0),
+("SMSG_IGNORE_DIMINISHING_RETURNS_CHEAT",0x406,12340,0),
+("CMSG_KEEP_ALIVE",0x407,12340,0),
+("SMSG_RAID_READY_CHECK_ERROR",0x408,12340,0),
+("CMSG_OPT_OUT_OF_LOOT",0x409,12340,0),
+("MSG_QUERY_GUILD_BANK_TEXT",0x40A,12340,0),
+("CMSG_SET_GUILD_BANK_TEXT",0x40B,12340,0),
+("CMSG_SET_GRANTABLE_LEVELS",0x40C,12340,0),
+("CMSG_GRANT_LEVEL",0x40D,12340,0),
+("CMSG_REFER_A_FRIEND",0x40E,12340,0),
+("MSG_GM_CHANGE_ARENA_RATING",0x40F,12340,0),
+("CMSG_DECLINE_CHANNEL_INVITE",0x410,12340,0),
+("SMSG_GROUPACTION_THROTTLED",0x411,12340,0),
+("SMSG_OVERRIDE_LIGHT",0x412,12340,0),
+("SMSG_TOTEM_CREATED",0x413,12340,0),
+("CMSG_TOTEM_DESTROYED",0x414,12340,0),
+("CMSG_EXPIRE_RAID_INSTANCE",0x415,12340,0),
+("CMSG_NO_SPELL_VARIANCE",0x416,12340,0),
+("CMSG_QUESTGIVER_STATUS_MULTIPLE_QUERY",0x417,12340,0),
+("SMSG_QUESTGIVER_STATUS_MULTIPLE",0x418,12340,0),
+("CMSG_SET_PLAYER_DECLINED_NAMES",0x419,12340,0),
+("SMSG_SET_PLAYER_DECLINED_NAMES_RESULT",0x41A,12340,0),
+("CMSG_QUERY_SERVER_BUCK_DATA",0x41B,12340,0),
+("CMSG_CLEAR_SERVER_BUCK_DATA",0x41C,12340,0),
+("SMSG_SERVER_BUCK_DATA",0x41D,12340,0),
+("SMSG_SEND_UNLEARN_SPELLS",0x41E,12340,0),
+("SMSG_PROPOSE_LEVEL_GRANT",0x41F,12340,0),
+("CMSG_ACCEPT_LEVEL_GRANT",0x420,12340,0),
+("SMSG_REFER_A_FRIEND_ERROR",0x421,12340,0),
+("SMSG_SPLINE_MOVE_SET_FLYING",0x422,12340,0),
+("SMSG_SPLINE_MOVE_UNSET_FLYING",0x423,12340,0),
+("SMSG_SUMMON_CANCEL",0x424,12340,0),
+("CMSG_CHANGE_PERSONAL_ARENA_RATING",0x425,12340,0),
+("CMSG_ALTER_APPEARANCE",0x426,12340,0),
+("SMSG_ENABLE_BARBER_SHOP",0x427,12340,0),
+("SMSG_BARBER_SHOP_RESULT",0x428,12340,0),
+("CMSG_CALENDAR_GET_CALENDAR",0x429,12340,0),
+("CMSG_CALENDAR_GET_EVENT",0x42A,12340,0),
+("CMSG_CALENDAR_GUILD_FILTER",0x42B,12340,0),
+("CMSG_CALENDAR_ARENA_TEAM",0x42C,12340,0),
+("CMSG_CALENDAR_ADD_EVENT",0x42D,12340,0),
+("CMSG_CALENDAR_UPDATE_EVENT",0x42E,12340,0),
+("CMSG_CALENDAR_REMOVE_EVENT",0x42F,12340,0),
+("CMSG_CALENDAR_COPY_EVENT",0x430,12340,0),
+("CMSG_CALENDAR_EVENT_INVITE",0x431,12340,0),
+("CMSG_CALENDAR_EVENT_RSVP",0x432,12340,0),
+("CMSG_CALENDAR_EVENT_REMOVE_INVITE",0x433,12340,0),
+("CMSG_CALENDAR_EVENT_STATUS",0x434,12340,0),
+("CMSG_CALENDAR_EVENT_MODERATOR_STATUS",0x435,12340,0),
+("SMSG_CALENDAR_SEND_CALENDAR",0x436,12340,0),
+("SMSG_CALENDAR_SEND_EVENT",0x437,12340,0),
+("SMSG_CALENDAR_FILTER_GUILD",0x438,12340,0),
+("SMSG_CALENDAR_ARENA_TEAM",0x439,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE",0x43A,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED",0x43B,12340,0),
+("SMSG_CALENDAR_EVENT_STATUS",0x43C,12340,0),
+("SMSG_CALENDAR_COMMAND_RESULT",0x43D,12340,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_ADDED",0x43E,12340,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_REMOVED",0x43F,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_ALERT",0x440,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT",0x441,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_STATUS_ALERT",0x442,12340,0),
+("SMSG_CALENDAR_EVENT_REMOVED_ALERT",0x443,12340,0),
+("SMSG_CALENDAR_EVENT_UPDATED_ALERT",0x444,12340,0),
+("SMSG_CALENDAR_EVENT_MODERATOR_STATUS_ALERT",0x445,12340,0),
+("CMSG_CALENDAR_COMPLAIN",0x446,12340,0),
+("CMSG_CALENDAR_GET_NUM_PENDING",0x447,12340,0),
+("SMSG_CALENDAR_SEND_NUM_PENDING",0x448,12340,0),
+("CMSG_SAVE_DANCE",0x449,12340,0),
+("SMSG_NOTIFY_DANCE",0x44A,12340,0),
+("CMSG_PLAY_DANCE",0x44B,12340,0),
+("SMSG_PLAY_DANCE",0x44C,12340,0),
+("CMSG_LOAD_DANCES",0x44D,12340,0),
+("CMSG_STOP_DANCE",0x44E,12340,0),
+("SMSG_STOP_DANCE",0x44F,12340,0),
+("CMSG_SYNC_DANCE",0x450,12340,0),
+("CMSG_DANCE_QUERY",0x451,12340,0),
+("SMSG_DANCE_QUERY_RESPONSE",0x452,12340,0),
+("SMSG_INVALIDATE_DANCE",0x453,12340,0),
+("CMSG_DELETE_DANCE",0x454,12340,0),
+("SMSG_LEARNED_DANCE_MOVES",0x455,12340,0),
+("CMSG_LEARN_DANCE_MOVE",0x456,12340,0),
+("CMSG_UNLEARN_DANCE_MOVE",0x457,12340,0),
+("CMSG_SET_RUNE_COUNT",0x458,12340,0),
+("CMSG_SET_RUNE_COOLDOWN",0x459,12340,0),
+("MSG_MOVE_SET_PITCH_RATE_CHEAT",0x45A,12340,0),
+("MSG_MOVE_SET_PITCH_RATE",0x45B,12340,0),
+("SMSG_FORCE_PITCH_RATE_CHANGE",0x45C,12340,0),
+("CMSG_FORCE_PITCH_RATE_CHANGE_ACK",0x45D,12340,0),
+("SMSG_SPLINE_SET_PITCH_RATE",0x45E,12340,0),
+("CMSG_CALENDAR_EVENT_INVITE_NOTES",0x45F,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_NOTES",0x460,12340,0),
+("SMSG_CALENDAR_EVENT_INVITE_NOTES_ALERT",0x461,12340,0),
+("CMSG_UPDATE_MISSILE_TRAJECTORY",0x462,12340,0),
+("SMSG_UPDATE_ACCOUNT_DATA_COMPLETE",0x463,12340,0),
+("SMSG_TRIGGER_MOVIE",0x464,12340,0),
+("CMSG_COMPLETE_MOVIE",0x465,12340,0),
+("CMSG_SET_GLYPH_SLOT",0x466,12340,0),
+("CMSG_SET_GLYPH",0x467,12340,0),
+("SMSG_ACHIEVEMENT_EARNED",0x468,12340,0),
+("SMSG_DYNAMIC_DROP_ROLL_RESULT",0x469,12340,0),
+("SMSG_CRITERIA_UPDATE",0x46A,12340,0),
+("CMSG_QUERY_INSPECT_ACHIEVEMENTS",0x46B,12340,0),
+("SMSG_RESPOND_INSPECT_ACHIEVEMENTS",0x46C,12340,0),
+("CMSG_DISMISS_CONTROLLED_VEHICLE",0x46D,12340,0),
+("CMSG_COMPLETE_ACHIEVEMENT_CHEAT",0x46E,12340,0),
+("SMSG_QUESTUPDATE_ADD_PVP_KILL",0x46F,12340,0),
+("CMSG_SET_CRITERIA_CHEAT",0x470,12340,0),
+("SMSG_CALENDAR_RAID_LOCKOUT_UPDATED",0x471,12340,0),
+("CMSG_UNITANIMTIER_CHEAT",0x472,12340,0),
+("CMSG_CHAR_CUSTOMIZE",0x473,12340,0),
+("SMSG_CHAR_CUSTOMIZE",0x474,12340,0),
+("SMSG_PET_RENAMEABLE",0x475,12340,0),
+("CMSG_REQUEST_VEHICLE_EXIT",0x476,12340,0),
+("CMSG_REQUEST_VEHICLE_PREV_SEAT",0x477,12340,0),
+("CMSG_REQUEST_VEHICLE_NEXT_SEAT",0x478,12340,0),
+("CMSG_REQUEST_VEHICLE_SWITCH_SEAT",0x479,12340,0),
+("CMSG_PET_LEARN_TALENT",0x47A,12340,0),
+("CMSG_PET_UNLEARN_TALENTS",0x47B,12340,0),
+("SMSG_SET_PHASE_SHIFT",0x47C,12340,0),
+("SMSG_ALL_ACHIEVEMENT_DATA",0x47D,12340,0),
+("CMSG_FORCE_SAY_CHEAT",0x47E,12340,0),
+("SMSG_HEALTH_UPDATE",0x47F,12340,0),
+("SMSG_POWER_UPDATE",0x480,12340,0),
+("CMSG_GAMEOBJ_REPORT_USE",0x481,12340,0),
+("SMSG_HIGHEST_THREAT_UPDATE",0x482,12340,0),
+("SMSG_THREAT_UPDATE",0x483,12340,0),
+("SMSG_THREAT_REMOVE",0x484,12340,0),
+("SMSG_THREAT_CLEAR",0x485,12340,0),
+("SMSG_CONVERT_RUNE",0x486,12340,0),
+("SMSG_RESYNC_RUNES",0x487,12340,0),
+("SMSG_ADD_RUNE_POWER",0x488,12340,0),
+("CMSG_START_QUEST",0x489,12340,0),
+("CMSG_REMOVE_GLYPH",0x48A,12340,0),
+("CMSG_DUMP_OBJECTS",0x48B,12340,0),
+("SMSG_DUMP_OBJECTS_DATA",0x48C,12340,0),
+("CMSG_DISMISS_CRITTER",0x48D,12340,0),
+("SMSG_NOTIFY_DEST_LOC_SPELL_CAST",0x48E,12340,0),
+("CMSG_AUCTION_LIST_PENDING_SALES",0x48F,12340,0),
+("SMSG_AUCTION_LIST_PENDING_SALES",0x490,12340,0),
+("SMSG_MODIFY_COOLDOWN",0x491,12340,0),
+("SMSG_PET_UPDATE_COMBO_POINTS",0x492,12340,0),
+("CMSG_ENABLETAXI",0x493,12340,0),
+("SMSG_PRE_RESURRECT",0x494,12340,0),
+("SMSG_AURA_UPDATE_ALL",0x495,12340,0),
+("SMSG_AURA_UPDATE",0x496,12340,0),
+("CMSG_FLOOD_GRACE_CHEAT",0x497,12340,0),
+("SMSG_SERVER_FIRST_ACHIEVEMENT",0x498,12340,0),
+("SMSG_PET_LEARNED_SPELL",0x499,12340,0),
+("SMSG_PET_REMOVED_SPELL",0x49A,12340,0),
+("CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE",0x49B,12340,0),
+("CMSG_HEARTH_AND_RESURRECT",0x49C,12340,0),
+("SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA",0x49D,12340,0),
+("SMSG_CRITERIA_DELETED",0x49E,12340,0),
+("SMSG_ACHIEVEMENT_DELETED",0x49F,12340,0),
+("CMSG_SERVER_INFO_QUERY",0x4A0,12340,0),
+("SMSG_SERVER_INFO_RESPONSE",0x4A1,12340,0),
+("CMSG_CHECK_LOGIN_CRITERIA",0x4A2,12340,0),
+("SMSG_SERVER_BUCK_DATA_START",0x4A3,12340,0),
+("CMSG_SET_BREATH",0x4A4,12340,0),
+("CMSG_QUERY_VEHICLE_STATUS",0x4A5,12340,0),
+("SMSG_BATTLEGROUND_INFO_THROTTLED",0x4A6,12340,0),
+("SMSG_SET_VEHICLE_REC_ID",0x4A7,12340,0),
+("CMSG_RIDE_VEHICLE_INTERACT",0x4A8,12340,0),
+("CMSG_CONTROLLER_EJECT_PASSENGER",0x4A9,12340,0),
+("SMSG_PET_GUIDS",0x4AA,12340,0),
+("SMSG_CLIENTCACHE_VERSION",0x4AB,12340,0),
+("CMSG_CHANGE_GDF_ARENA_RATING",0x4AC,12340,0),
+("CMSG_SET_ARENA_TEAM_RATING_BY_INDEX",0x4AD,12340,0),
+("CMSG_SET_ARENA_TEAM_WEEKLY_GAMES",0x4AE,12340,0),
+("CMSG_SET_ARENA_TEAM_SEASON_GAMES",0x4AF,12340,0),
+("CMSG_SET_ARENA_MEMBER_WEEKLY_GAMES",0x4B0,12340,0),
+("CMSG_SET_ARENA_MEMBER_SEASON_GAMES",0x4B1,12340,0),
+("SMSG_ITEM_REFUND_INFO_RESPONSE",0x4B2,12340,0),
+("CMSG_GET_ITEM_REFUND_INFO",0x4B3,12340,0),
+("CMSG_ITEM_REFUND",0x4B4,12340,0),
+("SMSG_ITEM_REFUND_RESULT",0x4B5,12340,0),
+("CMSG_CORPSE_TRANSPORT_QUERY",0x4B6,12340,0),
+("SMSG_CORPSE_TRANSPORT_QUERY",0x4B7,12340,0),
+("CMSG_UNUSED5",0x4B8,12340,0),
+("CMSG_UNUSED6",0x4B9,12340,0),
+("CMSG_CALENDAR_EVENT_SIGNUP",0x4BA,12340,0),
+("SMSG_CALENDAR_CLEAR_PENDING_ACTION",0x4BB,12340,0),
+("SMSG_LOAD_EQUIPMENT_SET",0x4BC,12340,0),
+("CMSG_SAVE_EQUIPMENT_SET",0x4BD,12340,0),
+("CMSG_ON_MISSILE_TRAJECTORY_COLLISION",0x4BE,12340,0),
+("SMSG_NOTIFY_MISSILE_TRAJECTORY_COLLISION",0x4BF,12340,0),
+("SMSG_TALENT_UPDATE",0x4C0,12340,0),
+("CMSG_LEARN_TALENT_GROUP",0x4C1,12340,0),
+("CMSG_PET_LEARN_TALENT_GROUP",0x4C2,12340,0),
+("CMSG_SET_ACTIVE_TALENT_GROUP_OBSOLETE",0x4C3,12340,0),
+("CMSG_GM_GRANT_ACHIEVEMENT",0x4C4,12340,0),
+("CMSG_GM_REMOVE_ACHIEVEMENT",0x4C5,12340,0),
+("CMSG_GM_SET_CRITERIA_FOR_PLAYER",0x4C6,12340,0),
+("SMSG_DESTROY_ARENA_UNIT",0x4C7,12340,0),
+("SMSG_ARENA_TEAM_CHANGE_FAILED",0x4C8,12340,0),
+("CMSG_PROFILEDATA_REQUEST",0x4C9,12340,0),
+("SMSG_PROFILEDATA_RESPONSE",0x4CA,12340,0),
+("CMSG_START_BATTLEFIELD_CHEAT",0x4CB,12340,0),
+("CMSG_END_BATTLEFIELD_CHEAT",0x4CC,12340,0),
+("SMSG_COMPOUND_MOVE",0x4CD,12340,0),
+("SMSG_MOVE_GRAVITY_DISABLE",0x4CE,12340,0),
+("CMSG_MOVE_GRAVITY_DISABLE_ACK",0x4CF,12340,0),
+("SMSG_MOVE_GRAVITY_ENABLE",0x4D0,12340,0),
+("CMSG_MOVE_GRAVITY_ENABLE_ACK",0x4D1,12340,0),
+("MSG_MOVE_GRAVITY_CHNG",0x4D2,12340,0),
+("SMSG_SPLINE_MOVE_GRAVITY_DISABLE",0x4D3,12340,0),
+("SMSG_SPLINE_MOVE_GRAVITY_ENABLE",0x4D4,12340,0),
+("CMSG_USE_EQUIPMENT_SET",0x4D5,12340,0),
+("SMSG_USE_EQUIPMENT_SET_RESULT",0x4D6,12340,0),
+("CMSG_FORCE_ANIM",0x4D7,12340,0),
+("SMSG_FORCE_ANIM",0x4D8,12340,0),
+("CMSG_CHAR_FACTION_CHANGE",0x4D9,12340,0),
+("SMSG_CHAR_FACTION_CHANGE",0x4DA,12340,0),
+("CMSG_PVP_QUEUE_STATS_REQUEST",0x4DB,12340,0),
+("SMSG_PVP_QUEUE_STATS",0x4DC,12340,0),
+("CMSG_SET_PAID_SERVICE_CHEAT",0x4DD,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE",0x4DE,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE_RESPONSE",0x4DF,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_ENTERING",0x4E0,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE",0x4E1,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE_RESPONSE",0x4E2,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST",0x4E3,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST_RESPONSE",0x4E4,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_EJECT_PENDING",0x4E5,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_EJECTED",0x4E6,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_EXIT_REQUEST",0x4E7,12340,0),
+("SMSG_BATTLEFIELD_MANAGER_STATE_CHANGED",0x4E8,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_ADVANCE_STATE",0x4E9,12340,0),
+("CMSG_BATTLEFIELD_MANAGER_SET_NEXT_TRANSITION_TIME",0x4EA,12340,0),
+("MSG_SET_RAID_DIFFICULTY",0x4EB,12340,0),
+("CMSG_XPGAIN",0x4EC,12340,0),
+("SMSG_XPGAIN",0x4ED,12340,0),
+("SMSG_GMTICKET_RESPONSE_ERROR",0x4EE,12340,0),
+("SMSG_GMTICKET_GET_RESPONSE",0x4EF,12340,0),
+("CMSG_GMTICKET_RESOLVE_RESPONSE",0x4F0,12340,0),
+("SMSG_GMTICKET_RESOLVE_RESPONSE",0x4F1,12340,0),
+("SMSG_GMTICKET_CREATE_RESPONSE_TICKET",0x4F2,12340,0),
+("CMSG_GM_CREATE_TICKET_RESPONSE",0x4F3,12340,0),
+("CMSG_SERVERINFO",0x4F4,12340,0),
+("SMSG_SERVERINFO",0x4F5,12340,0),
+("CMSG_UI_TIME_REQUEST",0x4F6,12340,0),
+("SMSG_UI_TIME",0x4F7,12340,0),
+("CMSG_CHAR_RACE_CHANGE",0x4F8,12340,0),
+("MSG_VIEW_PHASE_SHIFT",0x4F9,12340,0),
+("SMSG_TALENTS_INVOLUNTARILY_RESET",0x4FA,12340,0),
+("CMSG_DEBUG_SERVER_GEO",0x4FB,12340,0),
+("SMSG_DEBUG_SERVER_GEO",0x4FC,12340,0),
+("SMSG_LOOT_UPDATE",0x4FD,12340,0),
+("UMSG_UPDATE_GROUP_INFO",0x4FE,12340,0),
+("CMSG_READY_FOR_ACCOUNT_DATA_TIMES",0x4FF,12340,0),
+("CMSG_QUERY_GET_ALL_QUESTS",0x500,12340,0),
+("SMSG_ALL_QUESTS_COMPLETED",0x501,12340,0),
+("CMSG_GMLAGREPORT_SUBMIT",0x502,12340,0),
+("CMSG_AFK_MONITOR_INFO_REQUEST",0x503,12340,0),
+("SMSG_AFK_MONITOR_INFO_RESPONSE",0x504,12340,0),
+("CMSG_AFK_MONITOR_INFO_CLEAR",0x505,12340,0),
+("SMSG_AREA_TRIGGER_NO_CORPSE",0x506,12340,0),
+("CMSG_GM_NUKE_CHARACTER",0x507,12340,0),
+("CMSG_LOW_LEVEL_RAID",0x508,12340,0),
+("CMSG_LOW_LEVEL_RAID_USER",0x509,12340,0),
+("SMSG_CAMERA_SHAKE",0x50A,12340,0),
+("SMSG_SOCKET_GEMS",0x50B,12340,0),
+("CMSG_SET_CHARACTER_MODEL",0x50C,12340,0),
+("SMSG_CONNECT_TO",0x50D,12340,0),
+("CMSG_CONNECT_TO_FAILED",0x50E,12340,0),
+("SMSG_SUSPEND_COMMS",0x50F,12340,0),
+("CMSG_SUSPEND_COMMS_ACK",0x510,12340,0),
+("SMSG_RESUME_COMMS",0x511,12340,0),
+("CMSG_AUTH_CONTINUED_SESSION",0x512,12340,0),
+("CMSG_DROP_NEW_CONNECTION",0x513,12340,0),
+("SMSG_SEND_ALL_COMBAT_LOG",0x514,12340,0),
+("SMSG_OPEN_LFG_DUNGEON_FINDER",0x515,12340,0),
+("SMSG_MOVE_SET_COLLISION_HGT",0x516,12340,0),
+("CMSG_MOVE_SET_COLLISION_HGT_ACK",0x517,12340,0),
+("MSG_MOVE_SET_COLLISION_HGT",0x518,12340,0),
+("CMSG_CLEAR_RANDOM_BG_WIN_TIME",0x519,12340,0),
+("CMSG_CLEAR_HOLIDAY_BG_WIN_TIME",0x51A,12340,0),
+("CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND",0x51B,12340,0),
+("SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT1",0x51C,12340,0),
+("SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT2",0x51D,12340,0),
+("SMSG_COMPRESSED_UNKNOWN_1310",0x51E,12340,0),
+("NUM_MSG_TYPES",0x0,12340,1);
diff --git a/sql_mr/mr02526_02_mangos_opcodes_command.sql b/sql_mr/mr02526_02_mangos_opcodes_command.sql
new file mode 100644
index 00000000000..acb1cba9d58
--- /dev/null
+++ b/sql_mr/mr02526_02_mangos_opcodes_command.sql
@@ -0,0 +1,4 @@
+-- opcodes DB storing
+DELETE FROM `command` WHERE `name` IN ('reload opcodes');
+INSERT INTO `command` (`name`, `security`, `help`) VALUES
+('reload opcodes',3,'Syntax: .reload opcodes\r\nReload all opcodes for current client build from DB.');
diff --git a/sql_mr/mr02535_mangos_creature_template.sql b/sql_mr/mr02535_mangos_creature_template.sql
new file mode 100644
index 00000000000..c04eaf10ba0
--- /dev/null
+++ b/sql_mr/mr02535_mangos_creature_template.sql
@@ -0,0 +1,19 @@
+-- Creature template
+
+-- Goregek
+UPDATE `creature_template` SET `MinLevel` = 76, `MaxLevel` = 80, `MinLevelHealth` = 4200, `MaxLevelHealth` = 4200, `ExtraFlags` = `ExtraFlags` | 2048 WHERE `entry` = 28214;
+
+DELETE FROM `creature_spell` WHERE `guid` IN (28214);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`) VALUES
+(28214, 52743, 0),
+(28214, 52744, 1),
+(28214, 54188, 2),
+(28214, 54178, 3),
+(28214, 52748, 4);
+-- (28214, 51959, 5);
+
+-- Charged War Golem from Venom
+DELETE FROM `creature_spell` WHERE `guid` IN (29005);
+INSERT INTO `creature_spell` (`guid`, `spell`, `index`) VALUES
+(29005, 61380, 0),
+(29005, 47911, 1);
diff --git a/sql_mr/mr02535_mangos_faction_change_quests.sql b/sql_mr/mr02535_mangos_faction_change_quests.sql
new file mode 100644
index 00000000000..7a43010e1b4
--- /dev/null
+++ b/sql_mr/mr02535_mangos_faction_change_quests.sql
@@ -0,0 +1,8 @@
+-- Records of player_factionchange_quests
+INSERT INTO player_factionchange_quests VALUES (12742, 'A Special Surprise(A)', 12739, 'A Special Surprise(H)');
+INSERT INTO player_factionchange_quests VALUES (12743, 'A Special Surprise(A)', 12747, 'A Special Surprise(H)');
+INSERT INTO player_factionchange_quests VALUES (12744, 'A Special Surprise(A)', 12748, 'A Special Surprise(H)');
+INSERT INTO player_factionchange_quests VALUES (12745, 'A Special Surprise(A)', 12749, 'A Special Surprise(H)');
+INSERT INTO player_factionchange_quests VALUES (12746, 'A Special Surprise(A)', 12750, 'A Special Surprise(H)');
+-- INSERT INTO player_factionchange_quests VALUES (28649, 'A Special Surprise(A)', 28650, 'A Special Surprise(H)'); Uncomment on Cataclysm
+INSERT INTO player_factionchange_quests VALUES (13188, 'Where Kings Walk', 13189, 'Warchief''s Blessing');
diff --git a/sql_mr/mr02564_mangos_vehicle_accessory.sql b/sql_mr/mr02564_mangos_vehicle_accessory.sql
new file mode 100644
index 00000000000..dff4d5ab77e
--- /dev/null
+++ b/sql_mr/mr02564_mangos_vehicle_accessory.sql
@@ -0,0 +1,3 @@
+-- Hardcoded item Id's. Hide vehicle accessory.
+
+UPDATE vehicle_accessory SET flags = flags | 2 WHERE accessory_entry IN (33114, 33167);
diff --git a/sql_mr/mr02577_characters_calendar.sql b/sql_mr/mr02577_characters_calendar.sql
new file mode 100644
index 00000000000..99c3912008d
--- /dev/null
+++ b/sql_mr/mr02577_characters_calendar.sql
@@ -0,0 +1,28 @@
+-- Calendar tables structure
+
+DROP TABLE IF EXISTS `calendar_events`;
+CREATE TABLE `calendar_events` (
+  `eventId`          int(11) unsigned NOT NULL DEFAULT '0',
+  `creatorGuid`      int(11) unsigned NOT NULL DEFAULT '0',
+  `guildId`          int(11) unsigned NOT NULL DEFAULT '0',
+  `type`             tinyint(3) unsigned NOT NULL DEFAULT '4',
+  `flags`            int(11) unsigned NOT NULL DEFAULT '0',
+  `dungeonId`        int(11) NOT NULL DEFAULT '-1',
+  `eventTime`        int(11) unsigned NOT NULL DEFAULT '0',
+  `title`            varchar(256) NOT NULL DEFAULT '',
+  `description`      varchar(1024) NOT NULL DEFAULT '',
+  PRIMARY KEY  (`eventId`)
+) DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `calendar_invites`;
+CREATE TABLE `calendar_invites` (
+  `inviteId`         int(11) unsigned NOT NULL DEFAULT '0',
+  `eventId`          int(11) unsigned NOT NULL DEFAULT '0',
+  `inviteeGuid`      int(11) unsigned NOT NULL DEFAULT '0',
+  `senderGuid`       int(11) unsigned NOT NULL DEFAULT '0',
+  `status`           tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `lastUpdateTime`   int(11) unsigned NOT NULL DEFAULT '0',
+  `rank`             tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `description`      varchar(256) NOT NULL DEFAULT '',
+  PRIMARY KEY  (`inviteId`)
+) DEFAULT CHARSET=utf8;
diff --git a/sql_mr/mr02645_mangos_lunar_festival.sql b/sql_mr/mr02645_mangos_lunar_festival.sql
new file mode 100644
index 00000000000..62f26ea80f7
--- /dev/null
+++ b/sql_mr/mr02645_mangos_lunar_festival.sql
@@ -0,0 +1,11 @@
+--
+-- Lunar Festival
+--
+
+-- Check your DB. Game objects (Id: 300058) should be placed on center of creatures (Id:15897)!
+DELETE FROM spell_script_target WHERE entry = 26373;
+INSERT INTO spell_script_target (entry, type, targetEntry) VALUES (26373, 0, 300058);
+
+DELETE FROM dbscripts_on_go_template_use WHERE `id` = 300058;
+INSERT INTO dbscripts_on_go_template_use (id, delay, command, datalong, datalong2, buddy_entry, search_radius, data_flags, dataint, dataint2, dataint3, dataint4, x, y, z, o, comments) VALUES
+(300058, 0, 15, 26448, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 'Holiday - Teleport: Moonglade');
diff --git a/sql_mr/mr02655_realm_multiaccount.sql b/sql_mr/mr02655_realm_multiaccount.sql
new file mode 100644
index 00000000000..1d412314e40
--- /dev/null
+++ b/sql_mr/mr02655_realm_multiaccount.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS `multi_IP_whitelist`;
+CREATE TABLE `multi_IP_whitelist` (
+  `id` int(32) NOT NULL AUTO_INCREMENT,
+  `whitelist` varchar(500) DEFAULT NULL,
+  `comment` longtext,
+  PRIMARY KEY (`id`)
+) DEFAULT CHARSET=utf8;
diff --git a/sql_mr/mr02702_mangos_mass_mail_ex.sql b/sql_mr/mr02702_mangos_mass_mail_ex.sql
new file mode 100644
index 00000000000..82df418ae74
--- /dev/null
+++ b/sql_mr/mr02702_mangos_mass_mail_ex.sql
@@ -0,0 +1,12 @@
+
+UPDATE `command`
+SET `help` = 'Syntax: .send mass items #racemask|$racename|alliance|horde|all [male|female] "#subject" "#text" itemid1[:count1] itemid2[:count2] ... itemidN[:countN]\r\n\r\nSend a mail to players. Subject and mail text must be in "". Gender may be omitted. If for itemid not provided related count values then expected 1, if count > max items in stack then items will be send in required amount stacks. All stacks amount in mail limited to 12.'
+WHERE `name` = 'send mass items';
+
+UPDATE `command`
+SET `help` = 'Syntax: .send mass mail #racemask|$racename|alliance|horde|all [male|female] "#subject" "#text"\r\n\r\nSend a mail to players. Subject and mail text must be in "". Gender may be omitted.'
+WHERE `name` = 'send mass mail';
+
+UPDATE `command`
+SET `help` = 'Syntax: .send mass money #racemask|$racename|alliance|horde|all [male|female] "#subject" "#text" #money\r\n\r\nSend mail with money to players. Subject and mail text must be in "". Gender may be omitted.'
+WHERE `name` = 'send mass money';
diff --git a/sql_mr/mr02725_characters_temporary.sql b/sql_mr/mr02725_characters_temporary.sql
new file mode 100644
index 00000000000..0730871037e
--- /dev/null
+++ b/sql_mr/mr02725_characters_temporary.sql
@@ -0,0 +1,103 @@
+-- ------------------------------------- --
+-- ------- I am a temporary file ------- --
+-- After a month my data will be deleted --
+-- ------------------------------------- --
+-- ===================================== --
+
+-- ---------- --
+-- 2012-03-08 --
+-- ---------- --
+-- mr2725
+-- DROP TABLE IF EXISTS `chat_log_bg`;
+CREATE TABLE `chat_log_bg` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `type` TINYINT(2) NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `members` TEXT,
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+-- DROP TABLE IF EXISTS `chat_log_channel`;
+CREATE TABLE `chat_log_channel` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `channel` VARCHAR(255) NOT NULL DEFAULT '',
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+-- DROP TABLE IF EXISTS `chat_log_chat`;
+CREATE TABLE `chat_log_chat` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `type` TINYINT(2) NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+-- DROP TABLE IF EXISTS `chat_log_guild`;
+CREATE TABLE `chat_log_guild` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `type` TINYINT(2) NOT NULL DEFAULT 4,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `guild` VARCHAR(255) NOT NULL DEFAULT '',
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+-- DROP TABLE IF EXISTS `chat_log_party`;
+CREATE TABLE `chat_log_party` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `members` TEXT,
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+-- DROP TABLE IF EXISTS `chat_log_raid`;
+CREATE TABLE `chat_log_raid` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `type` TINYINT(2) NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `members` TEXT,
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
+
+-- DROP TABLE IF EXISTS `chat_log_whisper`;
+CREATE TABLE `chat_log_whisper` (
+            `guid` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+            `date_time` DATETIME NOT NULL,
+            `pname` VARCHAR(12) NOT NULL DEFAULT '',
+            `to` VARCHAR(12) NOT NULL DEFAULT '',
+            `msg` TEXT,
+            `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+            `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+            `status` SET('hidden', 'marked', 'banned') NOT NULL DEFAULT '',
+            PRIMARY KEY (`guid`)
+) DEFAULT CHARSET=utf8;
diff --git a/sql_mr/mr02765_mangos_faction_change_spells.sql b/sql_mr/mr02765_mangos_faction_change_spells.sql
new file mode 100644
index 00000000000..e634837c02b
--- /dev/null
+++ b/sql_mr/mr02765_mangos_faction_change_spells.sql
@@ -0,0 +1,847 @@
+-- Race Faction Change - Spells
+INSERT INTO `player_factionchange_spells` (`race_A`, `alliance_id`, `commentA`, `race_H`, `horde_id`, `commentH`) VALUES
+(0, 458, 'Brown Horse', 0, 6654, 'Brown Wolf'),
+(0, 470, 'Black Stallion', 0, 64658, 'Black Wolf'),
+(0, 472, 'Pinto', 0, 580, 'Timber Wolf'),
+(0, 3561, 'Teleport: Stormwind', 0, 3567, 'Teleport: Orgrimmar'),
+(0, 3562, 'Teleport: Ironforge', 0, 3563, 'Teleport: Undercity'),
+(0, 3565, 'Teleport: Darnassus', 0, 3566, 'Teleport: Thunder Bluff'),
+(0, 6648, 'Chestnut Mare', 0, 6653, 'Dire Wolf'),
+(0, 6777, 'Gray Ram', 0, 8395, 'Emerald Raptor'),
+(0, 6898, 'White Ram', 0, 10796, 'Turquoise Raptor'),
+(0, 6899, 'Brown Ram', 0, 10799, 'Violet Raptor'),
+(0, 8394, 'Striped Frostsaber', 0, 64977, 'Black Skeletal Horse'),
+(0, 10059, 'Portal: Stormwind', 0, 11417, 'Portal: Orgrimmar'),
+(0, 10789, 'Spotted Frostsaber', 0, 17464, 'Brown Skeletal Horse'),
+(0, 10793, 'Striped Nightsaber', 0, 17463, 'Blue Skeletal Horse'),
+(0, 10873, 'Red Mechanostrider', 0, 64657, 'White Kodo'),
+(0, 10969, 'Blue Mechanostrider', 0, 18990, 'Brown Kodo'),
+(0, 11416, 'Portal: Ironforge', 0, 11418, 'Portal: Undercity'),
+(0, 11419, 'Portal: Darnassus', 0, 11420, 'Portal: Thunder Bluff'),
+(0, 13819, 'Warhorse', 0, 34769, 'Summon Warhorse'),
+(0, 15779, 'White Mechanostrider Mod B', 0, 18992, 'Teal Kodo'),
+(0, 16082, 'Palomino', 0, 16080, 'Red Wolf'),
+(0, 16083, 'White Stallion', 0, 16081, 'Winter Wolf'),
+(0, 17229, 'Winterspring Frostsaber', 0, 64659, 'Venomhide Ravasaur'),
+(0, 17453, 'Green Mechanostrider', 0, 18989, 'Gray Kodo'),
+(0, 17459, 'Icy Blue Mechanostrider Mod A', 0, 18991, 'Green Kodo'),
+(0, 17460, 'Frost Ram', 0, 17450, 'Ivory Raptor'),
+(0, 17461, 'Black Ram', 0, 16084, 'Mottled Red Raptor'),
+(0, 22717, 'Black War Steed', 0, 22724, 'Black War Wolf'),
+(0, 22718, 'Black War Kodo', 0, 22719, 'Black Battlestrider'),
+(0, 22719, 'Black Battlestrider', 0, 22718, 'Black War Kodo'),
+(0, 22720, 'Black War Ram', 0, 22721, 'Black War Raptor'),
+(0, 22723, 'Black War Tiger', 0, 22722, 'Red Skeletal Warhorse'),
+(0, 23214, 'Charger', 0, 34767, 'Summon Charger'),
+(0, 23219, 'Swift Mistsaber', 0, 23246, 'Purple Skeletal Warhorse'),
+(0, 23221, 'Swift Frostsaber', 0, 66846, 'Ochre Skeletal Warhorse'),
+(0, 23222, 'Swift Yellow Mechanostrider', 0, 23247, 'Great White Kodo'),
+(0, 23223, 'Swift White Mechanostrider', 0, 23248, 'Great Gray Kodo'),
+(0, 23225, 'Swift Green Mechanostrider', 0, 23249, 'Great Brown Kodo'),
+(0, 23227, 'Swift Palomino', 0, 23251, 'Swift Timber Wolf'),
+(0, 23228, 'Swift White Steed', 0, 23252, 'Swift Gray Wolf'),
+(0, 23229, 'Swift Brown Steed', 0, 23250, 'Swift Brown Wolf'),
+(0, 23238, 'Swift Brown Ram', 0, 23243, 'Swift Orange Raptor'),
+(0, 23239, 'Swift Gray Ram', 0, 23241, 'Swift Blue Raptor'),
+(0, 23240, 'Swift White Ram', 0, 23242, 'Swift Olive Raptor'),
+(0, 23338, 'Swift Stormsaber', 0, 17465, 'Green Skeletal Warhorse'),
+(0, 23510, 'Stormpike Battle Charger', 0, 23509, 'Frostwolf Howler'),
+(0, 31801, 'Seal of Vengeance', 0, 53736, 'Seal of Corruption'),
+(0, 32182, 'Heroism', 0, 2825, 'Bloodlust'),
+(0, 32235, 'Golden Gryphon', 0, 32245, 'Green Wind Rider'),
+(0, 32239, 'Ebon Gryphon', 0, 32243, 'Tawny Wind Rider'),
+(0, 32240, 'Snowy Gryphon', 0, 32244, 'Blue Wind Rider'),
+(0, 32242, 'Swift Blue Gryphon', 0, 32296, 'Swift Yellow Wind Rider'),
+(0, 32266, 'Portal: Exodar', 0, 32267, 'Portal: Silvermoon'),
+(0, 32271, 'Teleport: Exodar', 0, 32272, 'Teleport: Silvermoon'),
+(0, 32289, 'Swift Red Gryphon', 0, 32246, 'Swift Red Wind Rider'),
+(0, 32290, 'Swift Green Gryphon', 0, 32295, 'Swift Green Wind Rider'),
+(0, 32292, 'Swift Purple Gryphon', 0, 32297, 'Swift Purple Wind Rider'),
+(0, 33690, 'Teleport: Shattrath(A)', 0, 35715, 'Teleport: Shattrath(H)'),
+(0, 33691, 'Portal: Shattrath(A)', 0, 35717, 'Portal: Shattrath(H)'),
+(0, 34406, 'Brown Elekk', 0, 35022, 'Black Hawkstrider'),
+(0, 35710, 'Gray Elekk', 0, 35020, 'Blue Hawkstrider'),
+(0, 35711, 'Purple Elekk', 0, 34795, 'Red Hawkstrider'),
+(0, 35712, 'Great Green Elekk', 0, 35027, 'Swift Purple Hawkstrider'),
+(0, 35713, 'Great Blue Elekk', 0, 35025, 'Swift Green Hawkstrider'),
+(0, 35714, 'Great Purple Elekk', 0, 33660, 'Swift Pink Hawkstrider'),
+(0, 48027, 'Black War Elekk', 0, 35028, 'Swift Warstrider'),
+(0, 49359, 'Teleport: Theramore', 0, 49358, 'Teleport: Stonard'),
+(0, 49360, 'Portal: Theramore', 0, 40361, 'Portal: Stonard'),
+(0, 60424, 'Mekgineer''s Chopper', 0, 55531, 'Mechano-hog'),
+(0, 61229, 'Armored Snowy Gryphon', 0, 61230, 'Armored Blue Wind Rider'),
+(0, 62609, 'Argent Squire', 0, 62746, 'Argent Gruntling'),
+(0, 62736, 'Stormwind Banner', 0, 62742, 'Orgrimmar Banner'),
+(0, 62737, 'Ironforge Banner', 0, 62738, 'Sen''jin Banner'),
+(0, 62739, 'Darnassus Banner', 0, 62743, 'Undercity Banner'),
+(0, 62740, 'Exodar Banner', 0, 62744, 'Silvermoon City Banner'),
+(0, 62741, 'Gnomeregan Banner', 0, 62745, 'Thunder Bluff Banner'),
+(0, 63232, 'Stormwind Steed', 0, 63640, 'Orgrimmar Wolf'),
+(0, 63636, 'Ironforge Ram', 0, 63635, 'Darkspear Raptor'),
+(0, 63637, 'Darnassian Nightsaber', 0, 63643, 'Forsaken Warhorse'),
+(0, 63638, 'Gnomeregan Mechanostrider', 0, 63641, 'Thunder Bluff Kodo'),
+(0, 63639, 'Exodar Elekk', 0, 63642, 'Silvermoon Hawkstrider'),
+(0, 63641, 'Thunder Bluff Kodo', 0, 63638, 'Gnomeregan Mechanostrider'),
+(0, 65637, 'Great Red Elekk', 0, 65639, 'Swift Red Hawkstrider'),
+(0, 65638, 'Swift Moonsaber', 0, 65645, 'White Skeletal Warhorse'),
+(0, 65640, 'Swift Gray Steed', 0, 65646, 'Swift Burgundy Wolf'),
+(0, 65641, 'Great Golden Kodo', 0, 65642, 'Turbostrider'),
+(0, 65642, 'Turbostrider', 0, 65641, 'Great Golden Kodo'),
+(0, 65643, 'Swift Violet Ram', 0, 65644, 'Swift Purple Raptor'),
+(0, 66087, 'Silver Covenant Hippogryph', 0, 66088, 'Sunreaver Dragonhawk'),
+(0, 66090, 'Quel''dorei Steed', 0, 66091, 'Sunreaver Hawkstrider'),
+(0, 66847, 'Striped Dawnsaber', 0, 17462, 'Red Skeletal Horse'),
+(0, 67064, 'Pattern: Royal Moonshroud Robe', 0, 67144, 'Pattern: Royal Moonshroud Robe'),
+(0, 67065, 'Pattern: Royal Moonshroud Bracers', 0, 67147, 'Pattern: Royal Moonshroud Bracers'),
+(0, 67066, 'Pattern: Merlin''s Robe', 0, 67146, 'Pattern: Merlin''s Robe'),
+(0, 67079, 'Pattern: Bejeweled Wizard''s Bracers', 0, 67145, 'Pattern: Bejeweled Wizard''s Bracers'),
+(0, 67080, 'Pattern: Ensorcelled Nerubian Breastplate', 0, 67136, 'Pattern: Ensorcelled Nerubian Breastplate'),
+(0, 67081, 'Pattern: Black Chitin Bracers', 0, 67137, 'Pattern: Black Chitin Bracers'),
+(0, 67082, 'Pattern: Crusader''s Dragonscale Breastplate', 0, 67138, 'Pattern: Crusader''s Dragonscale Breastplate'),
+(0, 67083, 'Pattern: Crusader''s Dragonscale Bracers', 0, 67143, 'Pattern: Crusader''s Dragonscale Bracers'),
+(0, 67084, 'Pattern: Lunar Eclipse Chestguard', 0, 67140, 'Pattern: Lunar Eclipse Chestguard'),
+(0, 67085, 'Pattern: Moonshadow Armguards', 0, 67141, 'Pattern: Moonshadow Armguards'),
+(0, 67086, 'Pattern: Knightbane Carapace', 0, 67142, 'Pattern: Knightbane Carapace'),
+(0, 67087, 'Pattern: Bracers of Swift Death', 0, 67139, 'Pattern: Bracers of Swift Death'),
+(0, 67091, 'Plans: Breastplate of the White Knight', 0, 67130, 'Plans: Breastplate of the White Knight'),
+(0, 67092, 'Plans: Saronite Swordbreakers', 0, 67131, 'Plans: Saronite Swordbreakers'),
+(0, 67093, 'Plans: Titanium Razorplate', 0, 67132, 'Plans: Titanium Razorplate'),
+(0, 67094, 'Plans: Titanium Spikeguards', 0, 67133, 'Plans: Titanium Spikeguards'),
+(0, 67095, 'Plans: Sunforged Breastplate', 0, 67134, 'Plans: Sunforged Breastplate'),
+(0, 67096, 'Plans: Sunforged Bracers', 0, 67135, 'Plans: Sunforged Bracers'),
+(0, 68057, 'Swift Alliance Steed', 0, 68056, 'Swift Horde Wolf'),
+(0, 68187, 'Crusader''s White Warhorse', 0, 68188, 'Crusader''s Black Warhorse'),
+(0, 61425, 'Traveler\'s Tundra Mammoth', 0, 61447, 'Traveler\'s Tundra Mammoth'),
+(1, 458, 'Brown Horse', 3, 6899, 'Brown Ram'),
+(1, 458, 'Brown Horse', 4, 10793, 'Striped Nightsaber'),
+(1, 458, 'Brown Horse', 5, 17463, 'Blue Skeletal Horse'),
+(1, 458, 'Brown Horse', 6, 64657, 'White Kodo'),
+(1, 458, 'Brown Horse', 7, 10873, 'Red Mechanostrider'),
+(1, 458, 'Brown Horse', 8, 10799, 'Violet Raptor'),
+(1, 458, 'Brown Horse', 10, 34795, 'Red Hawkstrider'),
+(1, 458, 'Brown Horse', 11, 35711, 'Purple Elekk'),
+(1, 470, 'Black Stallion', 4, 66847, 'Striped Dawnsaber'),
+(1, 470, 'Black Stallion', 5, 17462, 'Red Skeletal Horse'),
+(1, 470, 'Black Stallion', 7, 17454, 'Unpainted Mechanostrider'),
+(1, 470, 'Black Stallion', 10, 35018, 'Purple Hawkstrider'),
+(1, 472, 'Pinto', 3, 6777, 'Gray Ram'),
+(1, 472, 'Pinto', 4, 8394, 'Striped Frostsaber'),
+(1, 472, 'Pinto', 5, 64977, 'Black Skeletal Horse'),
+(1, 472, 'Pinto', 6, 18990, 'Brown Kodo'),
+(1, 472, 'Pinto', 7, 10969, 'Blue Mechanostrider'),
+(1, 472, 'Pinto', 8, 8395, 'Emerald Raptor'),
+(1, 472, 'Pinto', 10, 35022, 'Black Hawkstrider'),
+(1, 472, 'Pinto', 11, 34406, 'Brown Elekk'),
+(1, 6648, 'Chestnut Mare', 3, 6898, 'White Ram'),
+(1, 6648, 'Chestnut Mare', 4, 10789, 'Spotted Frostsaber'),
+(1, 6648, 'Chestnut Mare', 5, 17464, 'Brown Skeletal Horse'),
+(1, 6648, 'Chestnut Mare', 6, 18989, 'Gray Kodo'),
+(1, 6648, 'Chestnut Mare', 7, 17453, 'Green Mechanostrider'),
+(1, 6648, 'Chestnut Mare', 8, 10796, 'Turquoise Raptor'),
+(1, 6648, 'Chestnut Mare', 10, 35020, 'Blue Hawkstrider'),
+(1, 6648, 'Chestnut Mare', 11, 35710, 'Gray Elekk'),
+(1, 6777, 'Gray Ram', 8, 580, 'Timber Wolf'),
+(1, 6898, 'White Ram', 8, 6653, 'Dire Wolf'),
+(1, 6899, 'Brown Ram', 8, 6654, 'Brown Wolf'),
+(1, 8394, 'Striped Frostsaber', 5, 580, 'Timber Wolf'),
+(1, 10789, 'Spotted Frostsaber', 5, 6653, 'Dire Wolf'),
+(1, 10793, 'Striped Nightsaber', 5, 6654, 'Brown Wolf'),
+(1, 10873, 'Red Mechanostrider', 6, 6654, 'Brown Wolf'),
+(1, 10969, 'Blue Mechanostrider', 6, 580, 'Timber Wolf'),
+(1, 15779, 'White Mechanostrider Mod B', 6, 16081, 'Winter Wolf'),
+(1, 16056, 'Ancient Frostsaber', 5, 16080, 'Red Wolf'),
+(1, 16082, 'Palomino', 6, 18991, 'Green Kodo'),
+(1, 16082, 'Palomino', 8, 16084, 'Mottled Red Raptor'),
+(1, 16083, 'White Stallion', 6, 18992, 'Teal Kodo'),
+(1, 16083, 'White Stallion', 8, 17450, 'Ivory Raptor'),
+(1, 17453, 'Green Mechanostrider', 6, 6653, 'Dire Wolf'),
+(1, 17454, 'Unpainted Mechanostrider', 6, 64658, 'Black Wolf'),
+(1, 17459, 'Icy Blue Mechanostrider Mod A', 6, 16080, 'Red Wolf'),
+(1, 17460, 'Frost Ram', 8, 16081, 'Winter Wolf'),
+(1, 17461, 'Black Ram', 8, 16080, 'Red Wolf'),
+(1, 22717, 'Black War Steed', 5, 22722, 'Red Skeletal Warhorse'),
+(1, 22717, 'Black War Steed', 6, 22718, 'Black War Kodo'),
+(1, 22717, 'Black War Steed', 8, 22721, 'Black War Raptor'),
+(1, 22717, 'Black War Steed', 10, 35028, 'Swift Warstrider'),
+(1, 22719, 'Black Battlestrider', 6, 22724, 'Black War Wolf'),
+(1, 22720, 'Black War Ram', 8, 22724, 'Black War Wolf'),
+(1, 22723, 'Black War Tiger', 5, 22724, 'Black War Wolf'),
+(1, 23219, 'Swift Mistsaber', 5, 23252, 'Swift Gray Wolf'),
+(1, 23221, 'Swift Frostsaber', 5, 23251, 'Swift Timber Wolf'),
+(1, 23222, 'Swift Yellow Mechanostrider', 6, 23251, 'Swift Timber Wolf'),
+(1, 23223, 'Swift White Mechanostrider', 6, 23252, 'Swift Gray Wolf'),
+(1, 23225, 'Swift Green Mechanostrider', 6, 23250, 'Swift Brown Wolf'),
+(1, 23227, 'Swift Palomino', 3, 23238, 'Swift Brown Ram'),
+(1, 23227, 'Swift Palomino', 4, 23221, 'Swift Frostsaber'),
+(1, 23227, 'Swift Palomino', 5, 66846, 'Ochre Skeletal Warhorse'),
+(1, 23227, 'Swift Palomino', 6, 23247, 'Great White Kodo'),
+(1, 23227, 'Swift Palomino', 7, 23222, 'Swift Yellow Mechanostrider'),
+(1, 23227, 'Swift Palomino', 8, 23243, 'Swift Orange Raptor'),
+(1, 23227, 'Swift Palomino', 10, 33660, 'Swift Pink Hawkstrider'),
+(1, 23227, 'Swift Palomino', 11, 35714, 'Great Purple Elekk'),
+(1, 23228, 'Swift White Steed', 3, 23240, 'Swift White Ram'),
+(1, 23228, 'Swift White Steed', 4, 23219, 'Swift Mistsaber'),
+(1, 23228, 'Swift White Steed', 5, 23246, 'Purple Skeletal Warhorse'),
+(1, 23228, 'Swift White Steed', 6, 23248, 'Great Gray Kodo'),
+(1, 23228, 'Swift White Steed', 7, 23223, 'Swift White Mechanostrider'),
+(1, 23228, 'Swift White Steed', 8, 23242, 'Swift Olive Raptor'),
+(1, 23228, 'Swift White Steed', 10, 35027, 'Swift Purple Hawkstrider'),
+(1, 23228, 'Swift White Steed', 11, 35712, 'Great Green Elekk'),
+(1, 23229, 'Swift Brown Steed', 3, 23239, 'Swift Gray Ram'),
+(1, 23229, 'Swift Brown Steed', 4, 23338, 'Swift Stormsaber'),
+(1, 23229, 'Swift Brown Steed', 5, 17465, 'Green Skeletal Warhorse'),
+(1, 23229, 'Swift Brown Steed', 6, 23249, 'Great Brown Kodo'),
+(1, 23229, 'Swift Brown Steed', 7, 23225, 'Swift Green Mechanostrider'),
+(1, 23229, 'Swift Brown Steed', 8, 23241, 'Swift Blue Raptor'),
+(1, 23229, 'Swift Brown Steed', 10, 35025, 'Swift Green Hawkstrider'),
+(1, 23229, 'Swift Brown Steed', 11, 35713, 'Great Blue Elekk'),
+(1, 23238, 'Swift Brown Ram', 8, 23251, 'Swift Timber Wolf'),
+(1, 23239, 'Swift Gray Ram', 8, 23250, 'Swift Brown Wolf'),
+(1, 23240, 'Swift White Ram', 8, 23252, 'Swift Gray Wolf'),
+(1, 23338, 'Swift Stormsaber', 5, 23250, 'Swift Brown Wolf'),
+(1, 34406, 'Brown Elekk', 10, 580, 'Timber Wolf'),
+(1, 35710, 'Gray Elekk', 10, 6653, 'Dire Wolf'),
+(1, 35711, 'Purple Elekk', 10, 6654, 'Brown Wolf'),
+(1, 35712, 'Great Green Elekk', 10, 23252, 'Swift Gray Wolf'),
+(1, 35713, 'Great Blue Elekk', 10, 23250, 'Swift Brown Wolf'),
+(1, 35714, 'Great Purple Elekk', 10, 23251, 'Swift Timber Wolf'),
+(1, 48027, 'Black War Elekk', 10, 22724, 'Black War Wolf'),
+(1, 63232, 'Stormwind Steed', 3, 63636, 'Ironforge Ram'),
+(1, 63232, 'Stormwind Steed', 4, 63637, 'Darnassian Nightsaber'),
+(1, 63232, 'Stormwind Steed', 5, 63643, 'Forsaken Warhorse'),
+(1, 63232, 'Stormwind Steed', 6, 63641, 'Thunder Bluff Kodo'),
+(1, 63232, 'Stormwind Steed', 7, 63638, 'Gnomeregan Mechanostrider'),
+(1, 63232, 'Stormwind Steed', 8, 63635, 'Darkspear Raptor'),
+(1, 63232, 'Stormwind Steed', 10, 63642, 'Silvermoon Hawkstrider'),
+(1, 63232, 'Stormwind Steed', 11, 63639, 'Exodar Elekk'),
+(1, 63636, 'Ironforge Ram', 8, 63640, 'Orgrimmar Wolf'),
+(1, 63637, 'Darnassian Nightsaber', 5, 63640, 'Orgrimmar Wolf'),
+(1, 63638, 'Gnomeregan Mechanostrider', 6, 63640, 'Orgrimmar Wolf'),
+(1, 63639, 'Exodar Elekk', 10, 63640, 'Orgrimmar Wolf'),
+(1, 65637, 'Great Red Elekk', 10, 65646, 'Swift Burgundy Wolf'),
+(1, 65638, 'Swift Moonsaber', 5, 65646, 'Swift Burgundy Wolf'),
+(1, 65640, 'Swift Gray Steed', 3, 65643, 'Swift Violet Ram'),
+(1, 65640, 'Swift Gray Steed', 4, 65638, 'Swift Moonsaber'),
+(1, 65640, 'Swift Gray Steed', 5, 65645, 'White Skeletal Warhorse'),
+(1, 65640, 'Swift Gray Steed', 6, 65641, 'Great Golden Kodo'),
+(1, 65640, 'Swift Gray Steed', 7, 65642, 'Turbostrider'),
+(1, 65640, 'Swift Gray Steed', 8, 65644, 'Swift Purple Raptor'),
+(1, 65640, 'Swift Gray Steed', 10, 65639, 'Swift Red Hawkstrider'),
+(1, 65640, 'Swift Gray Steed', 11, 65637, 'Great Red Elekk'),
+(1, 65642, 'Turbostrider', 6, 65646, 'Swift Burgundy Wolf'),
+(1, 65643, 'Swift Violet Ram', 8, 65646, 'Swift Burgundy Wolf'),
+(1, 66847, 'Striped Dawnsaber', 5, 64658, 'Black Wolf'),
+(2, 580, 'Timber Wolf', 5, 64977, 'Black Skeletal Horse'),
+(2, 580, 'Timber Wolf', 6, 18990, 'Brown Kodo'),
+(2, 580, 'Timber Wolf', 8, 8395, 'Emerald Raptor'),
+(2, 580, 'Timber Wolf', 10, 35022, 'Black Hawkstrider'),
+(2, 6653, 'Dire Wolf', 5, 17464, 'Brown Skeletal Horse'),
+(2, 6653, 'Dire Wolf', 6, 18989, 'Gray Kodo'),
+(2, 6653, 'Dire Wolf', 8, 10796, 'Turquoise Raptor'),
+(2, 6653, 'Dire Wolf', 10, 35020, 'Blue Hawkstrider'),
+(2, 6654, 'Brown Wolf', 5, 17463, 'Blue Skeletal Horse'),
+(2, 6654, 'Brown Wolf', 6, 64657, 'White Kodo'),
+(2, 6654, 'Brown Wolf', 8, 10799, 'Violet Raptor'),
+(2, 6654, 'Brown Wolf', 10, 34795, 'Red Hawkstrider'),
+(2, 23250, 'Swift Brown Wolf', 5, 17465, 'Green Skeletal Warhorse'),
+(2, 23250, 'Swift Brown Wolf', 6, 23249, 'Great Brown Kodo'),
+(2, 23250, 'Swift Brown Wolf', 8, 23241, 'Swift Blue Raptor'),
+(2, 23250, 'Swift Brown Wolf', 10, 35025, 'Swift Green Hawkstrider'),
+(2, 23251, 'Swift Timber Wolf', 5, 66846, 'Ochre Skeletal Warhorse'),
+(2, 23251, 'Swift Timber Wolf', 6, 23247, 'Great White Kodo'),
+(2, 23251, 'Swift Timber Wolf', 8, 23243, 'Swift Orange Raptor'),
+(2, 23251, 'Swift Timber Wolf', 10, 33660, 'Swift Pink Hawkstrider'),
+(2, 23252, 'Swift Gray Wolf', 5, 23246, 'Purple Skeletal Warhorse'),
+(2, 23252, 'Swift Gray Wolf', 6, 23248, 'Great Gray Kodo'),
+(2, 23252, 'Swift Gray Wolf', 8, 23242, 'Swift Olive Raptor'),
+(2, 23252, 'Swift Gray Wolf', 10, 35027, 'Swift Purple Hawkstrider'),
+(2, 63640, 'Orgrimmar Wolf', 5, 63643, 'Forsaken Warhorse'),
+(2, 63640, 'Orgrimmar Wolf', 6, 63641, 'Thunder Bluff Kodo'),
+(2, 63640, 'Orgrimmar Wolf', 8, 63635, 'Darkspear Raptor'),
+(2, 63640, 'Orgrimmar Wolf', 10, 63642, 'Silvermoon Hawkstrider'),
+(2, 64658, 'Black Wolf', 5, 17462, 'Red Skeletal Horse'),
+(2, 64658, 'Black Wolf', 10, 35018, 'Purple Hawkstrider'),
+(2, 65646, 'Swift Burgundy Wolf', 5, 65645, 'White Skeletal Warhorse'),
+(2, 65646, 'Swift Burgundy Wolf', 6, 65641, 'Great Golden Kodo'),
+(2, 65646, 'Swift Burgundy Wolf', 8, 65644, 'Swift Purple Raptor'),
+(2, 65646, 'Swift Burgundy Wolf', 10, 65639, 'Swift Red Hawkstrider'),
+(3, 458, 'Brown Horse', 2, 10799, 'Violet Raptor'),
+(3, 472, 'Pinto', 2, 8395, 'Emerald Raptor'),
+(3, 6648, 'Chestnut Mare', 2, 10796, 'Turquoise Raptor'),
+(3, 6777, 'Gray Ram', 1, 472, 'Pinto'),
+(3, 6777, 'Gray Ram', 2, 580, 'Timber Wolf'),
+(3, 6777, 'Gray Ram', 4, 8394, 'Striped Frostsaber'),
+(3, 6777, 'Gray Ram', 5, 64977, 'Black Skeletal Horse'),
+(3, 6777, 'Gray Ram', 6, 18990, 'Brown Kodo'),
+(3, 6777, 'Gray Ram', 7, 10969, 'Blue Mechanostrider'),
+(3, 6777, 'Gray Ram', 10, 35022, 'Black Hawkstrider'),
+(3, 6777, 'Gray Ram', 11, 34406, 'Brown Elekk'),
+(3, 6898, 'White Ram', 1, 6648, 'Chestnut Mare'),
+(3, 6898, 'White Ram', 2, 6653, 'Dire Wolf'),
+(3, 6898, 'White Ram', 4, 10789, 'Spotted Frostsaber'),
+(3, 6898, 'White Ram', 5, 17464, 'Brown Skeletal Horse'),
+(3, 6898, 'White Ram', 6, 18989, 'Gray Kodo'),
+(3, 6898, 'White Ram', 7, 17453, 'Green Mechanostrider'),
+(3, 6898, 'White Ram', 10, 35020, 'Blue Hawkstrider'),
+(3, 6898, 'White Ram', 11, 35710, 'Gray Elekk'),
+(3, 6899, 'Brown Ram', 1, 458, 'Brown Horse'),
+(3, 6899, 'Brown Ram', 2, 6654, 'Brown Wolf'),
+(3, 6899, 'Brown Ram', 4, 10793, 'Striped Nightsaber'),
+(3, 6899, 'Brown Ram', 5, 17463, 'Blue Skeletal Horse'),
+(3, 6899, 'Brown Ram', 6, 64657, 'White Kodo'),
+(3, 6899, 'Brown Ram', 7, 10873, 'Red Mechanostrider'),
+(3, 6899, 'Brown Ram', 10, 34795, 'Red Hawkstrider'),
+(3, 6899, 'Brown Ram', 11, 35711, 'Purple Elekk'),
+(3, 8394, 'Striped Frostsaber', 5, 8395, 'Emerald Raptor'),
+(3, 10789, 'Spotted Frostsaber', 5, 10796, 'Turquoise Raptor'),
+(3, 10793, 'Striped Nightsaber', 5, 10799, 'Violet Raptor'),
+(3, 10873, 'Red Mechanostrider', 6, 10799, 'Violet Raptor'),
+(3, 10969, 'Blue Mechanostrider', 6, 8395, 'Emerald Raptor'),
+(3, 15779, 'White Mechanostrider Mod B', 6, 17450, 'Ivory Raptor'),
+(3, 16056, 'Ancient Frostsaber', 5, 16084, 'Mottled Red Raptor'),
+(3, 16082, 'Palomino', 2, 16084, 'Mottled Red Raptor'),
+(3, 16083, 'White Stallion', 2, 17450, 'Ivory Raptor'),
+(3, 17453, 'Green Mechanostrider', 6, 10796, 'Turquoise Raptor'),
+(3, 17459, 'Icy Blue Mechanostrider Mod A', 6, 16084, 'Mottled Red Raptor'),
+(3, 17460, 'Frost Ram', 2, 16081, 'Winter Wolf'),
+(3, 17460, 'Frost Ram', 6, 18992, 'Teal Kodo'),
+(3, 17461, 'Black Ram', 2, 16080, 'Red Wolf'),
+(3, 17461, 'Black Ram', 6, 18991, 'Green Kodo'),
+(3, 22717, 'Black War Steed', 2, 22721, 'Black War Raptor'),
+(3, 22719, 'Black Battlestrider', 6, 22721, 'Black War Raptor'),
+(3, 22720, 'Black War Ram', 2, 22724, 'Black War Wolf'),
+(3, 22720, 'Black War Ram', 5, 22722, 'Red Skeletal Warhorse'),
+(3, 22720, 'Black War Ram', 6, 22718, 'Black War Kodo'),
+(3, 22720, 'Black War Ram', 10, 35028, 'Swift Warstrider'),
+(3, 22723, 'Black War Tiger', 5, 22721, 'Black War Raptor'),
+(3, 23219, 'Swift Mistsaber', 5, 23242, 'Swift Olive Raptor'),
+(3, 23221, 'Swift Frostsaber', 5, 23243, 'Swift Orange Raptor'),
+(3, 23222, 'Swift Yellow Mechanostrider', 6, 23243, 'Swift Orange Raptor'),
+(3, 23223, 'Swift White Mechanostrider', 6, 23242, 'Swift Olive Raptor'),
+(3, 23225, 'Swift Green Mechanostrider', 6, 23241, 'Swift Blue Raptor'),
+(3, 23227, 'Swift Palomino', 2, 23243, 'Swift Orange Raptor'),
+(3, 23228, 'Swift White Steed', 2, 23242, 'Swift Olive Raptor'),
+(3, 23229, 'Swift Brown Steed', 2, 23241, 'Swift Blue Raptor'),
+(3, 23238, 'Swift Brown Ram', 1, 23227, 'Swift Palomino'),
+(3, 23238, 'Swift Brown Ram', 2, 23251, 'Swift Timber Wolf'),
+(3, 23238, 'Swift Brown Ram', 4, 23221, 'Swift Frostsaber'),
+(3, 23238, 'Swift Brown Ram', 5, 66846, 'Ochre Skeletal Warhorse'),
+(3, 23238, 'Swift Brown Ram', 6, 23247, 'Great White Kodo'),
+(3, 23238, 'Swift Brown Ram', 7, 23222, 'Swift Yellow Mechanostrider'),
+(3, 23238, 'Swift Brown Ram', 10, 33660, 'Swift Pink Hawkstrider'),
+(3, 23238, 'Swift Brown Ram', 11, 35714, 'Great Purple Elekk'),
+(3, 23239, 'Swift Gray Ram', 1, 23229, 'Swift Brown Steed'),
+(3, 23239, 'Swift Gray Ram', 2, 23250, 'Swift Brown Wolf'),
+(3, 23239, 'Swift Gray Ram', 4, 23338, 'Swift Stormsaber'),
+(3, 23239, 'Swift Gray Ram', 5, 17465, 'Green Skeletal Warhorse'),
+(3, 23239, 'Swift Gray Ram', 6, 23249, 'Great Brown Kodo'),
+(3, 23239, 'Swift Gray Ram', 7, 23225, 'Swift Green Mechanostrider'),
+(3, 23239, 'Swift Gray Ram', 10, 35025, 'Swift Green Hawkstrider'),
+(3, 23239, 'Swift Gray Ram', 11, 35713, 'Great Blue Elekk'),
+(3, 23240, 'Swift White Ram', 1, 23228, 'Swift White Steed'),
+(3, 23240, 'Swift White Ram', 2, 23252, 'Swift Gray Wolf'),
+(3, 23240, 'Swift White Ram', 4, 23219, 'Swift Mistsaber'),
+(3, 23240, 'Swift White Ram', 5, 23246, 'Purple Skeletal Warhorse'),
+(3, 23240, 'Swift White Ram', 6, 23248, 'Great Gray Kodo'),
+(3, 23240, 'Swift White Ram', 7, 23223, 'Swift White Mechanostrider'),
+(3, 23240, 'Swift White Ram', 10, 35027, 'Swift Purple Hawkstrider'),
+(3, 23240, 'Swift White Ram', 11, 35712, 'Great Green Elekk'),
+(3, 23338, 'Swift Stormsaber', 5, 23241, 'Swift Blue Raptor'),
+(3, 34406, 'Brown Elekk', 10, 8395, 'Emerald Raptor'),
+(3, 35710, 'Gray Elekk', 10, 10796, 'Turquoise Raptor'),
+(3, 35711, 'Purple Elekk', 10, 10799, 'Violet Raptor'),
+(3, 35712, 'Great Green Elekk', 10, 23242, 'Swift Olive Raptor'),
+(3, 35713, 'Great Blue Elekk', 10, 23241, 'Swift Blue Raptor'),
+(3, 35714, 'Great Purple Elekk', 10, 23243, 'Swift Orange Raptor'),
+(3, 48027, 'Black War Elekk', 10, 0, 'Black War Rapto'),
+(3, 63232, 'Stormwind Steed', 2, 63635, 'Darkspear Raptor'),
+(3, 63636, 'Ironforge Ram', 1, 63232, 'Stormwind Steed'),
+(3, 63636, 'Ironforge Ram', 2, 63640, 'Orgrimmar Wolf'),
+(3, 63636, 'Ironforge Ram', 4, 63637, 'Darnassian Nightsaber'),
+(3, 63636, 'Ironforge Ram', 5, 63643, 'Forsaken Warhorse'),
+(3, 63636, 'Ironforge Ram', 6, 63641, 'Thunder Bluff Kodo'),
+(3, 63636, 'Ironforge Ram', 7, 63638, 'Gnomeregan Mechanostrider'),
+(3, 63636, 'Ironforge Ram', 10, 63642, 'Silvermoon Hawkstrider'),
+(3, 63636, 'Ironforge Ram', 11, 63639, 'Exodar Elekk'),
+(3, 63637, 'Darnassian Nightsaber', 5, 63635, 'Darkspear Raptor'),
+(3, 63638, 'Gnomeregan Mechanostrider', 6, 63635, 'Darkspear Raptor'),
+(3, 63639, 'Exodar Elekk', 10, 63635, 'Darkspear Raptor'),
+(3, 65637, 'Great Red Elekk', 10, 65644, 'Swift Purple Raptor'),
+(3, 65638, 'Swift Moonsaber', 5, 65644, 'Swift Purple Raptor'),
+(3, 65640, 'Swift Gray Steed', 2, 65644, 'Swift Purple Raptor'),
+(3, 65642, 'Turbostrider', 6, 65644, 'Swift Purple Raptor'),
+(3, 65643, 'Swift Violet Ram', 1, 65640, 'Swift Gray Steed'),
+(3, 65643, 'Swift Violet Ram', 2, 65646, 'Swift Burgundy Wolf'),
+(3, 65643, 'Swift Violet Ram', 4, 65638, 'Swift Moonsaber'),
+(3, 65643, 'Swift Violet Ram', 5, 65645, 'White Skeletal Warhorse'),
+(3, 65643, 'Swift Violet Ram', 6, 65641, 'Great Golden Kodo'),
+(3, 65643, 'Swift Violet Ram', 7, 65642, 'Turbostrider'),
+(3, 65643, 'Swift Violet Ram', 10, 65639, 'Swift Red Hawkstrider'),
+(3, 65643, 'Swift Violet Ram', 11, 65637, 'Great Red Elekk'),
+(4, 458, 'Brown Horse', 2, 17463, 'Blue Skeletal Horse'),
+(4, 470, 'Black Stallion', 2, 17462, 'Red Skeletal Horse'),
+(4, 472, 'Pinto', 2, 64977, 'Black Skeletal Horse'),
+(4, 6648, 'Chestnut Mare', 2, 17464, 'Brown Skeletal Horse'),
+(4, 6777, 'Gray Ram', 8, 64977, 'Black Skeletal Horse'),
+(4, 6898, 'White Ram', 8, 17464, 'Brown Skeletal Horse'),
+(4, 6899, 'Brown Ram', 8, 17463, 'Blue Skeletal Horse'),
+(4, 8394, 'Striped Frostsaber', 1, 472, 'Pinto'),
+(4, 8394, 'Striped Frostsaber', 2, 580, 'Timber Wolf'),
+(4, 8394, 'Striped Frostsaber', 3, 6777, 'Gray Ram'),
+(4, 8394, 'Striped Frostsaber', 6, 18990, 'Brown Kodo'),
+(4, 8394, 'Striped Frostsaber', 7, 10969, 'Blue Mechanostrider'),
+(4, 8394, 'Striped Frostsaber', 8, 8395, 'Emerald Raptor'),
+(4, 8394, 'Striped Frostsaber', 10, 35022, 'Black Hawkstrider'),
+(4, 8394, 'Striped Frostsaber', 11, 34406, 'Brown Elekk'),
+(4, 10789, 'Spotted Frostsaber', 1, 6648, 'Chestnut Mare'),
+(4, 10789, 'Spotted Frostsaber', 2, 6653, 'Dire Wolf'),
+(4, 10789, 'Spotted Frostsaber', 3, 6898, 'White Ram'),
+(4, 10789, 'Spotted Frostsaber', 6, 18989, 'Gray Kodo'),
+(4, 10789, 'Spotted Frostsaber', 7, 17453, 'Green Mechanostrider'),
+(4, 10789, 'Spotted Frostsaber', 8, 10796, 'Turquoise Raptor'),
+(4, 10789, 'Spotted Frostsaber', 10, 35020, 'Blue Hawkstrider'),
+(4, 10789, 'Spotted Frostsaber', 11, 35710, 'Gray Elekk'),
+(4, 10793, 'Striped Nightsaber', 1, 458, 'Brown Horse'),
+(4, 10793, 'Striped Nightsaber', 2, 6654, 'Brown Wolf'),
+(4, 10793, 'Striped Nightsaber', 3, 6899, 'Brown Ram'),
+(4, 10793, 'Striped Nightsaber', 6, 64657, 'White Kodo'),
+(4, 10793, 'Striped Nightsaber', 7, 10873, 'Red Mechanostrider'),
+(4, 10793, 'Striped Nightsaber', 8, 10799, 'Violet Raptor'),
+(4, 10793, 'Striped Nightsaber', 10, 34795, 'Red Hawkstrider'),
+(4, 10793, 'Striped Nightsaber', 11, 35711, 'Purple Elekk'),
+(4, 10873, 'Red Mechanostrider', 6, 17463, 'Blue Skeletal Horse'),
+(4, 10969, 'Blue Mechanostrider', 6, 64977, 'Black Skeletal Horse'),
+(4, 16056, 'Ancient Frostsaber', 2, 16080, 'Red Wolf'),
+(4, 16056, 'Ancient Frostsaber', 6, 18991, 'Green Kodo'),
+(4, 16056, 'Ancient Frostsaber', 8, 16084, 'Mottled Red Raptor'),
+(4, 17453, 'Green Mechanostrider', 6, 17464, 'Brown Skeletal Horse'),
+(4, 17454, 'Unpainted Mechanostrider', 6, 17462, 'Red Skeletal Horse'),
+(4, 22717, 'Black War Steed', 2, 22722, 'Red Skeletal Warhorse'),
+(4, 22719, 'Black Battlestrider', 6, 22722, 'Red Skeletal Warhorse'),
+(4, 22720, 'Black War Ram', 8, 22722, 'Red Skeletal Warhorse'),
+(4, 22723, 'Black War Tiger', 2, 22724, 'Black War Wolf'),
+(4, 22723, 'Black War Tiger', 6, 22718, 'Black War Kodo'),
+(4, 22723, 'Black War Tiger', 8, 22721, 'Black War Raptor'),
+(4, 23219, 'Swift Mistsaber', 1, 23228, 'Swift White Steed'),
+(4, 23219, 'Swift Mistsaber', 2, 23252, 'Swift Gray Wolf'),
+(4, 23219, 'Swift Mistsaber', 3, 23240, 'Swift White Ram'),
+(4, 23219, 'Swift Mistsaber', 6, 23248, 'Great Gray Kodo'),
+(4, 23219, 'Swift Mistsaber', 7, 23223, 'Swift White Mechanostrider'),
+(4, 23219, 'Swift Mistsaber', 8, 23242, 'Swift Olive Raptor'),
+(4, 23219, 'Swift Mistsaber', 10, 35027, 'Swift Purple Hawkstrider'),
+(4, 23219, 'Swift Mistsaber', 11, 35712, 'Great Green Elekk'),
+(4, 23221, 'Swift Frostsaber', 1, 23227, 'Swift Palomino'),
+(4, 23221, 'Swift Frostsaber', 2, 23251, 'Swift Timber Wolf'),
+(4, 23221, 'Swift Frostsaber', 3, 23238, 'Swift Brown Ram'),
+(4, 23221, 'Swift Frostsaber', 6, 23247, 'Great White Kodo'),
+(4, 23221, 'Swift Frostsaber', 7, 23222, 'Swift Yellow Mechanostrider'),
+(4, 23221, 'Swift Frostsaber', 8, 23243, 'Swift Orange Raptor'),
+(4, 23221, 'Swift Frostsaber', 10, 33660, 'Swift Pink Hawkstrider'),
+(4, 23221, 'Swift Frostsaber', 11, 35714, 'Great Purple Elekk'),
+(4, 23222, 'Swift Yellow Mechanostrider', 6, 66846, 'Ochre Skeletal Warhorse'),
+(4, 23223, 'Swift White Mechanostrider', 6, 23246, 'Purple Skeletal Warhorse'),
+(4, 23225, 'Swift Green Mechanostrider', 6, 17465, 'Green Skeletal Warhorse'),
+(4, 23227, 'Swift Palomino', 2, 66846, 'Ochre Skeletal Warhorse'),
+(4, 23228, 'Swift White Steed', 2, 23246, 'Purple Skeletal Warhorse'),
+(4, 23229, 'Swift Brown Steed', 2, 17465, 'Green Skeletal Warhorse'),
+(4, 23238, 'Swift Brown Ram', 8, 66846, 'Ochre Skeletal Warhorse'),
+(4, 23239, 'Swift Gray Ram', 8, 17465, 'Green Skeletal Warhorse'),
+(4, 23240, 'Swift White Ram', 8, 23246, 'Purple Skeletal Warhorse'),
+(4, 23338, 'Swift Stormsaber', 1, 23229, 'Swift Brown Steed'),
+(4, 23338, 'Swift Stormsaber', 2, 23250, 'Swift Brown Wolf'),
+(4, 23338, 'Swift Stormsaber', 3, 23239, 'Swift Gray Ram'),
+(4, 23338, 'Swift Stormsaber', 6, 23249, 'Great Brown Kodo'),
+(4, 23338, 'Swift Stormsaber', 7, 23225, 'Swift Green Mechanostrider'),
+(4, 23338, 'Swift Stormsaber', 8, 23241, 'Swift Blue Raptor'),
+(4, 23338, 'Swift Stormsaber', 10, 35025, 'Swift Green Hawkstrider'),
+(4, 23338, 'Swift Stormsaber', 11, 35713, 'Great Blue Elekk'),
+(4, 34406, 'Brown Elekk', 10, 64977, 'Black Skeletal Horse'),
+(4, 35710, 'Gray Elekk', 10, 17464, 'Brown Skeletal Horse'),
+(4, 35711, 'Purple Elekk', 10, 17463, 'Blue Skeletal Horse'),
+(4, 35712, 'Great Green Elekk', 10, 23246, 'Purple Skeletal Warhorse'),
+(4, 35713, 'Great Blue Elekk', 10, 17465, 'Green Skeletal Warhorse'),
+(4, 35714, 'Great Purple Elekk', 10, 66846, 'Ochre Skeletal Warhorse'),
+(4, 48027, 'Black War Elekk', 10, 22722, 'Red Skeletal Warhorse'),
+(4, 63232, 'Stormwind Steed', 2, 63643, 'Forsaken Warhorse'),
+(4, 63636, 'Ironforge Ram', 8, 63643, 'Forsaken Warhorse'),
+(4, 63637, 'Darnassian Nightsaber', 1, 63232, 'Stormwind Steed'),
+(4, 63637, 'Darnassian Nightsaber', 2, 63640, 'Orgrimmar Wolf'),
+(4, 63637, 'Darnassian Nightsaber', 3, 63636, 'Ironforge Ram'),
+(4, 63637, 'Darnassian Nightsaber', 6, 63641, 'Thunder Bluff Kodo'),
+(4, 63637, 'Darnassian Nightsaber', 7, 63638, 'Gnomeregan Mechanostrider'),
+(4, 63637, 'Darnassian Nightsaber', 8, 63635, 'Darkspear Raptor'),
+(4, 63637, 'Darnassian Nightsaber', 11, 63639, 'Exodar Elekk'),
+(4, 63638, 'Gnomeregan Mechanostrider', 6, 63643, 'Forsaken Warhorse'),
+(4, 63639, 'Exodar Elekk', 10, 63643, 'Forsaken Warhorse'),
+(4, 65637, 'Great Red Elekk', 10, 65645, 'White Skeletal Warhorse'),
+(4, 65638, 'Swift Moonsaber', 1, 65640, 'Swift Gray Steed'),
+(4, 65638, 'Swift Moonsaber', 2, 65646, 'Swift Burgundy Wolf'),
+(4, 65638, 'Swift Moonsaber', 3, 65643, 'Swift Violet Ram'),
+(4, 65638, 'Swift Moonsaber', 6, 65641, 'Great Golden Kodo'),
+(4, 65638, 'Swift Moonsaber', 7, 65642, 'Turbostrider'),
+(4, 65638, 'Swift Moonsaber', 8, 65644, 'Swift Purple Raptor'),
+(4, 65638, 'Swift Moonsaber', 11, 65637, 'Great Red Elekk'),
+(4, 65640, 'Swift Gray Steed', 2, 65645, 'White Skeletal Warhorse'),
+(4, 65642, 'Turbostrider', 6, 65645, 'White Skeletal Warhorse'),
+(4, 65643, 'Swift Violet Ram', 8, 65645, 'White Skeletal Warhorse'),
+(4, 66847, 'Striped Dawnsaber', 1, 470, 'Black Stallion'),
+(4, 66847, 'Striped Dawnsaber', 2, 64658, 'Black Wolf'),
+(4, 66847, 'Striped Dawnsaber', 7, 17454, 'Unpainted Mechanostrider'),
+(4, 66847, 'Striped Dawnsaber', 10, 35018, 'Purple Hawkstrider'),
+(5, 17462, 'Red Skeletal Horse', 2, 64658, 'Black Wolf'),
+(5, 17462, 'Red Skeletal Horse', 10, 35018, 'Purple Hawkstrider'),
+(5, 17463, 'Blue Skeletal Horse', 2, 6654, 'Brown Wolf'),
+(5, 17463, 'Blue Skeletal Horse', 6, 64657, 'White Kodo'),
+(5, 17463, 'Blue Skeletal Horse', 8, 10799, 'Violet Raptor'),
+(5, 17463, 'Blue Skeletal Horse', 10, 34795, 'Red Hawkstrider'),
+(5, 17464, 'Brown Skeletal Horse', 2, 6653, 'Dire Wolf'),
+(5, 17464, 'Brown Skeletal Horse', 6, 18989, 'Gray Kodo'),
+(5, 17464, 'Brown Skeletal Horse', 8, 10796, 'Turquoise Raptor'),
+(5, 17464, 'Brown Skeletal Horse', 10, 35020, 'Blue Hawkstrider'),
+(5, 17465, 'Green Skeletal Warhorse', 2, 23250, 'Swift Brown Wolf'),
+(5, 17465, 'Green Skeletal Warhorse', 6, 23249, 'Great Brown Kodo'),
+(5, 17465, 'Green Skeletal Warhorse', 8, 23241, 'Swift Blue Raptor'),
+(5, 17465, 'Green Skeletal Warhorse', 10, 35025, 'Swift Green Hawkstrider'),
+(5, 23246, 'Purple Skeletal Warhorse', 2, 23252, 'Swift Gray Wolf'),
+(5, 23246, 'Purple Skeletal Warhorse', 6, 23248, 'Great Gray Kodo'),
+(5, 23246, 'Purple Skeletal Warhorse', 8, 23242, 'Swift Olive Raptor'),
+(5, 23246, 'Purple Skeletal Warhorse', 10, 35027, 'Swift Purple Hawkstrider'),
+(5, 63643, 'Forsaken Warhorse', 2, 63640, 'Orgrimmar Wolf'),
+(5, 63643, 'Forsaken Warhorse', 6, 63641, 'Thunder Bluff Kodo'),
+(5, 63643, 'Forsaken Warhorse', 8, 63635, 'Darkspear Raptor'),
+(5, 63643, 'Forsaken Warhorse', 10, 63642, 'Silvermoon Hawkstrider'),
+(5, 64977, 'Black Skeletal Horse', 2, 580, 'Timber Wolf'),
+(5, 64977, 'Black Skeletal Horse', 6, 18990, 'Brown Kodo'),
+(5, 64977, 'Black Skeletal Horse', 8, 8395, 'Emerald Raptor'),
+(5, 64977, 'Black Skeletal Horse', 10, 35022, 'Black Hawkstrider'),
+(5, 65645, 'White Skeletal Warhorse', 2, 65646, 'Swift Burgundy Wolf'),
+(5, 65645, 'White Skeletal Warhorse', 6, 65641, 'Great Golden Kodo'),
+(5, 65645, 'White Skeletal Warhorse', 8, 65644, 'Swift Purple Raptor'),
+(5, 65645, 'White Skeletal Warhorse', 10, 65639, 'Swift Red Hawkstrider'),
+(5, 66846, 'Ochre Skeletal Warhorse', 2, 23251, 'Swift Timber Wolf'),
+(5, 66846, 'Ochre Skeletal Warhorse', 6, 23247, 'Great White Kodo'),
+(5, 66846, 'Ochre Skeletal Warhorse', 8, 23243, 'Swift Orange Raptor'),
+(5, 66846, 'Ochre Skeletal Warhorse', 10, 33660, 'Swift Pink Hawkstrider'),
+(6, 18989, 'Gray Kodo', 2, 6653, 'Dire Wolf'),
+(6, 18989, 'Gray Kodo', 5, 17464, 'Brown Skeletal Horse'),
+(6, 18989, 'Gray Kodo', 8, 10796, 'Turquoise Raptor'),
+(6, 18989, 'Gray Kodo', 10, 35020, 'Blue Hawkstrider'),
+(6, 18990, 'Brown Kodo', 2, 580, 'Timber Wolf'),
+(6, 18990, 'Brown Kodo', 5, 64977, 'Black Skeletal Horse'),
+(6, 18990, 'Brown Kodo', 8, 8395, 'Emerald Raptor'),
+(6, 18990, 'Brown Kodo', 10, 35022, 'Black Hawkstrider'),
+(6, 23247, 'Great White Kodo', 2, 23251, 'Swift Timber Wolf'),
+(6, 23247, 'Great White Kodo', 5, 66846, 'Ochre Skeletal Warhorse'),
+(6, 23247, 'Great White Kodo', 8, 23243, 'Swift Orange Raptor'),
+(6, 23247, 'Great White Kodo', 10, 33660, 'Swift Pink Hawkstrider'),
+(6, 23248, 'Great Gray Kodo', 2, 23252, 'Swift Gray Wolf'),
+(6, 23248, 'Great Gray Kodo', 5, 23246, 'Purple Skeletal Warhorse'),
+(6, 23248, 'Great Gray Kodo', 8, 23242, 'Swift Olive Raptor'),
+(6, 23248, 'Great Gray Kodo', 10, 35027, 'Swift Purple Hawkstrider'),
+(6, 23249, 'Great Brown Kodo', 2, 23250, 'Swift Brown Wolf'),
+(6, 23249, 'Great Brown Kodo', 5, 17465, 'Green Skeletal Warhorse'),
+(6, 23249, 'Great Brown Kodo', 8, 23241, 'Swift Blue Raptor'),
+(6, 23249, 'Great Brown Kodo', 10, 35025, 'Swift Green Hawkstrider'),
+(6, 63641, 'Thunder Bluff Kodo', 2, 63640, 'Orgrimmar Wolf'),
+(6, 63641, 'Thunder Bluff Kodo', 5, 63643, 'Forsaken Warhorse'),
+(6, 63641, 'Thunder Bluff Kodo', 8, 63635, 'Darkspear Raptor'),
+(6, 63641, 'Thunder Bluff Kodo', 10, 63642, 'Silvermoon Hawkstrider'),
+(6, 64657, 'White Kodo', 2, 6654, 'Brown Wolf'),
+(6, 64657, 'White Kodo', 5, 17463, 'Blue Skeletal Horse'),
+(6, 64657, 'White Kodo', 8, 10799, 'Violet Raptor'),
+(6, 64657, 'White Kodo', 10, 34795, 'Red Hawkstrider'),
+(6, 65641, 'Great Golden Kodo', 2, 65646, 'Swift Burgundy Wolf'),
+(6, 65641, 'Great Golden Kodo', 5, 65645, 'White Skeletal Warhorse'),
+(6, 65641, 'Great Golden Kodo', 8, 65644, 'Swift Purple Raptor'),
+(6, 65641, 'Great Golden Kodo', 10, 65639, 'Swift Red Hawkstrider'),
+(7, 0, 'lue Mechanostrider', 2, 580, 'Timber Wolf'),
+(7, 458, 'Brown Horse', 2, 64657, 'White Kodo'),
+(7, 472, 'Pinto', 2, 18990, 'Brown Kodo'),
+(7, 6648, 'Chestnut Mare', 2, 18989, 'Gray Kodo'),
+(7, 6777, 'Gray Ram', 8, 18990, 'Brown Kodo'),
+(7, 6898, 'White Ram', 8, 18989, 'Gray Kodo'),
+(7, 6899, 'Brown Ram', 8, 64657, 'White Kodo'),
+(7, 8394, 'Striped Frostsaber', 5, 18990, 'Brown Kodo'),
+(7, 10789, 'Spotted Frostsaber', 5, 18989, 'Gray Kodo'),
+(7, 10793, 'Striped Nightsaber', 5, 64657, 'White Kodo'),
+(7, 10873, 'Red Mechanostrider', 1, 458, 'Brown Horse'),
+(7, 10873, 'Red Mechanostrider', 2, 6654, 'Brown Wolf'),
+(7, 10873, 'Red Mechanostrider', 3, 6899, 'Brown Ram'),
+(7, 10873, 'Red Mechanostrider', 4, 10793, 'Striped Nightsaber'),
+(7, 10873, 'Red Mechanostrider', 5, 17463, 'Blue Skeletal Horse'),
+(7, 10873, 'Red Mechanostrider', 8, 10799, 'Violet Raptor'),
+(7, 10873, 'Red Mechanostrider', 10, 34795, 'Red Hawkstrider'),
+(7, 10873, 'Red Mechanostrider', 11, 35711, 'Purple Elekk'),
+(7, 10969, 'Blue Mechanostrider', 1, 472, 'Pinto'),
+(7, 10969, 'Blue Mechanostrider', 3, 6777, 'Gray Ram'),
+(7, 10969, 'Blue Mechanostrider', 4, 8394, 'Striped Frostsaber'),
+(7, 10969, 'Blue Mechanostrider', 5, 64977, 'Black Skeletal Horse'),
+(7, 10969, 'Blue Mechanostrider', 8, 8395, 'Emerald Raptor'),
+(7, 10969, 'Blue Mechanostrider', 10, 35022, 'Black Hawkstrider'),
+(7, 10969, 'Blue Mechanostrider', 11, 34406, 'Brown Elekk'),
+(7, 15779, 'White Mechanostrider Mod B', 2, 16081, 'Winter Wolf'),
+(7, 15779, 'White Mechanostrider Mod B', 8, 17450, 'Ivory Raptor'),
+(7, 16056, 'Ancient Frostsaber', 5, 18991, 'Green Kodo'),
+(7, 16082, 'Palomino', 2, 18991, 'Green Kodo'),
+(7, 16083, 'White Stallion', 2, 18992, 'Teal Kodo'),
+(7, 17453, 'Green Mechanostrider', 1, 6648, 'Chestnut Mare'),
+(7, 17453, 'Green Mechanostrider', 2, 6653, 'Dire Wolf'),
+(7, 17453, 'Green Mechanostrider', 3, 6898, 'White Ram'),
+(7, 17453, 'Green Mechanostrider', 4, 10789, 'Spotted Frostsaber'),
+(7, 17453, 'Green Mechanostrider', 5, 17464, 'Brown Skeletal Horse'),
+(7, 17453, 'Green Mechanostrider', 8, 10796, 'Turquoise Raptor'),
+(7, 17453, 'Green Mechanostrider', 10, 35020, 'Blue Hawkstrider'),
+(7, 17453, 'Green Mechanostrider', 11, 35710, 'Gray Elekk'),
+(7, 17454, 'Unpainted Mechanostrider', 1, 470, 'Black Stallion'),
+(7, 17454, 'Unpainted Mechanostrider', 2, 64658, 'Black Wolf'),
+(7, 17454, 'Unpainted Mechanostrider', 4, 66847, 'Striped Dawnsaber'),
+(7, 17454, 'Unpainted Mechanostrider', 5, 17462, 'Red Skeletal Horse'),
+(7, 17454, 'Unpainted Mechanostrider', 10, 35018, 'Purple Hawkstrider'),
+(7, 17459, 'Icy Blue Mechanostrider Mod A', 2, 16080, 'Red Wolf'),
+(7, 17459, 'Icy Blue Mechanostrider Mod A', 8, 16084, 'Mottled Red Raptor'),
+(7, 17460, 'Frost Ram', 8, 18992, 'Teal Kodo'),
+(7, 17461, 'Black Ram', 8, 18991, 'Green Kodo'),
+(7, 22717, 'Black War Steed', 2, 22718, 'Black War Kodo'),
+(7, 22719, 'Black Battlestrider', 2, 22724, 'Black War Wolf'),
+(7, 22719, 'Black Battlestrider', 5, 22722, 'Red Skeletal Warhorse'),
+(7, 22719, 'Black Battlestrider', 8, 22721, 'Black War Raptor'),
+(7, 22719, 'Black Battlestrider', 10, 35028, 'Swift Warstrider'),
+(7, 22720, 'Black War Ram', 8, 22718, 'Black War Kodo'),
+(7, 22723, 'Black War Tiger', 5, 22718, 'Black War Kodo'),
+(7, 23219, 'Swift Mistsaber', 5, 23248, 'Great Gray Kodo'),
+(7, 23221, 'Swift Frostsaber', 5, 23247, 'Great White Kodo'),
+(7, 23222, 'Swift Yellow Mechanostrider', 1, 23227, 'Swift Palomino'),
+(7, 23222, 'Swift Yellow Mechanostrider', 2, 23251, 'Swift Timber Wolf'),
+(7, 23222, 'Swift Yellow Mechanostrider', 3, 23238, 'Swift Brown Ram'),
+(7, 23222, 'Swift Yellow Mechanostrider', 4, 23221, 'Swift Frostsaber'),
+(7, 23222, 'Swift Yellow Mechanostrider', 5, 66846, 'Ochre Skeletal Warhorse'),
+(7, 23222, 'Swift Yellow Mechanostrider', 8, 23243, 'Swift Orange Raptor'),
+(7, 23222, 'Swift Yellow Mechanostrider', 10, 33660, 'Swift Pink Hawkstrider'),
+(7, 23222, 'Swift Yellow Mechanostrider', 11, 35714, 'Great Purple Elekk'),
+(7, 23223, 'Swift White Mechanostrider', 1, 23228, 'Swift White Steed'),
+(7, 23223, 'Swift White Mechanostrider', 2, 23252, 'Swift Gray Wolf'),
+(7, 23223, 'Swift White Mechanostrider', 3, 23240, 'Swift White Ram'),
+(7, 23223, 'Swift White Mechanostrider', 4, 23219, 'Swift Mistsaber'),
+(7, 23223, 'Swift White Mechanostrider', 5, 23246, 'Purple Skeletal Warhorse'),
+(7, 23223, 'Swift White Mechanostrider', 8, 23242, 'Swift Olive Raptor'),
+(7, 23223, 'Swift White Mechanostrider', 10, 35027, 'Swift Purple Hawkstrider'),
+(7, 23223, 'Swift White Mechanostrider', 11, 35712, 'Great Green Elekk'),
+(7, 23225, 'Swift Green Mechanostrider', 1, 23229, 'Swift Brown Steed'),
+(7, 23225, 'Swift Green Mechanostrider', 2, 23250, 'Swift Brown Wolf'),
+(7, 23225, 'Swift Green Mechanostrider', 3, 23239, 'Swift Gray Ram'),
+(7, 23225, 'Swift Green Mechanostrider', 4, 23338, 'Swift Stormsaber'),
+(7, 23225, 'Swift Green Mechanostrider', 5, 17465, 'Green Skeletal Warhorse'),
+(7, 23225, 'Swift Green Mechanostrider', 8, 23241, 'Swift Blue Raptor'),
+(7, 23225, 'Swift Green Mechanostrider', 10, 35025, 'Swift Green Hawkstrider'),
+(7, 23225, 'Swift Green Mechanostrider', 11, 35713, 'Great Blue Elekk'),
+(7, 23227, 'Swift Palomino', 2, 23247, 'Great White Kodo'),
+(7, 23228, 'Swift White Steed', 2, 23248, 'Great Gray Kodo'),
+(7, 23229, 'Swift Brown Steed', 2, 23249, 'Great Brown Kodo'),
+(7, 23238, 'Swift Brown Ram', 8, 23247, 'Great White Kodo'),
+(7, 23239, 'Swift Gray Ram', 8, 23249, 'Great Brown Kodo'),
+(7, 23240, 'Swift White Ram', 8, 23248, 'Great Gray Kodo'),
+(7, 23338, 'Swift Stormsaber', 5, 23249, 'Great Brown Kodo'),
+(7, 34406, 'Brown Elekk', 10, 18990, 'Brown Kodo'),
+(7, 35710, 'Gray Elekk', 10, 18989, 'Gray Kodo'),
+(7, 35711, 'Purple Elekk', 10, 64657, 'White Kodo'),
+(7, 35712, 'Great Green Elekk', 10, 23248, 'Great Gray Kodo'),
+(7, 35713, 'Great Blue Elekk', 10, 23249, 'Great Brown Kodo'),
+(7, 35714, 'Great Purple Elekk', 10, 23247, 'Great White Kodo'),
+(7, 48027, 'Black War Elekk', 10, 22718, 'Black War Kodo'),
+(7, 63232, 'Stormwind Steed', 2, 63641, 'Thunder Bluff Kodo'),
+(7, 63636, 'Ironforge Ram', 8, 63641, 'Thunder Bluff Kodo'),
+(7, 63637, 'Darnassian Nightsaber', 5, 63641, 'Thunder Bluff Kodo'),
+(7, 63638, 'Gnomeregan Mechanostrider', 1, 63232, 'Stormwind Steed'),
+(7, 63638, 'Gnomeregan Mechanostrider', 2, 63640, 'Orgrimmar Wolf'),
+(7, 63638, 'Gnomeregan Mechanostrider', 3, 63636, 'Ironforge Ram'),
+(7, 63638, 'Gnomeregan Mechanostrider', 4, 63637, 'Darnassian Nightsaber'),
+(7, 63638, 'Gnomeregan Mechanostrider', 5, 63643, 'Forsaken Warhorse'),
+(7, 63638, 'Gnomeregan Mechanostrider', 8, 63635, 'Darkspear Raptor'),
+(7, 63638, 'Gnomeregan Mechanostrider', 10, 63642, 'Silvermoon Hawkstrider'),
+(7, 63638, 'Gnomeregan Mechanostrider', 11, 63639, 'Exodar Elekk'),
+(7, 63639, 'Exodar Elekk', 10, 63641, 'Thunder Bluff Kodo'),
+(7, 65637, 'Great Red Elekk', 10, 65641, 'Great Golden Kodo'),
+(7, 65638, 'Swift Moonsaber', 5, 65641, 'Great Golden Kodo'),
+(7, 65640, 'Swift Gray Steed', 2, 65641, 'Great Golden Kodo'),
+(7, 65642, 'Turbostrider', 1, 65640, 'Swift Gray Steed'),
+(7, 65642, 'Turbostrider', 2, 65646, 'Swift Burgundy Wolf'),
+(7, 65642, 'Turbostrider', 3, 65643, 'Swift Violet Ram'),
+(7, 65642, 'Turbostrider', 4, 65638, 'Swift Moonsaber'),
+(7, 65642, 'Turbostrider', 5, 65645, 'White Skeletal Warhorse'),
+(7, 65642, 'Turbostrider', 8, 65644, 'Swift Purple Raptor'),
+(7, 65642, 'Turbostrider', 10, 65639, 'Swift Red Hawkstrider'),
+(7, 65642, 'Turbostrider', 11, 65637, 'Great Red Elekk'),
+(7, 65643, 'Swift Violet Ram', 8, 65641, 'Great Golden Kodo'),
+(8, 8395, 'Emerald Raptor', 2, 580, 'Timber Wolf'),
+(8, 8395, 'Emerald Raptor', 5, 64977, 'Black Skeletal Horse'),
+(8, 8395, 'Emerald Raptor', 6, 18990, 'Brown Kodo'),
+(8, 8395, 'Emerald Raptor', 10, 35022, 'Black Hawkstrider'),
+(8, 10796, 'Turquoise Raptor', 2, 6653, 'Dire Wolf'),
+(8, 10796, 'Turquoise Raptor', 5, 17464, 'Brown Skeletal Horse'),
+(8, 10796, 'Turquoise Raptor', 6, 18989, 'Gray Kodo'),
+(8, 10796, 'Turquoise Raptor', 10, 35020, 'Blue Hawkstrider'),
+(8, 10799, 'Violet Raptor', 2, 6654, 'Brown Wolf'),
+(8, 10799, 'Violet Raptor', 5, 17463, 'Blue Skeletal Horse'),
+(8, 10799, 'Violet Raptor', 6, 64657, 'White Kodo'),
+(8, 10799, 'Violet Raptor', 10, 34795, 'Red Hawkstrider'),
+(8, 23241, 'Swift Blue Raptor', 2, 23250, 'Swift Brown Wolf'),
+(8, 23241, 'Swift Blue Raptor', 5, 17465, 'Green Skeletal Warhorse'),
+(8, 23241, 'Swift Blue Raptor', 6, 23249, 'Great Brown Kodo'),
+(8, 23241, 'Swift Blue Raptor', 10, 35025, 'Swift Green Hawkstrider'),
+(8, 23242, 'Swift Olive Raptor', 2, 23252, 'Swift Gray Wolf'),
+(8, 23242, 'Swift Olive Raptor', 5, 23246, 'Purple Skeletal Warhorse'),
+(8, 23242, 'Swift Olive Raptor', 6, 23248, 'Great Gray Kodo'),
+(8, 23242, 'Swift Olive Raptor', 10, 35027, 'Swift Purple Hawkstrider'),
+(8, 23243, 'Swift Orange Raptor', 2, 23251, 'Swift Timber Wolf'),
+(8, 23243, 'Swift Orange Raptor', 5, 66846, 'Ochre Skeletal Warhorse'),
+(8, 23243, 'Swift Orange Raptor', 6, 23247, 'Great White Kodo'),
+(8, 23243, 'Swift Orange Raptor', 10, 33660, 'Swift Pink Hawkstrider'),
+(8, 63635, 'Darkspear Raptor', 2, 63640, 'Orgrimmar Wolf'),
+(8, 63635, 'Darkspear Raptor', 5, 63643, 'Forsaken Warhorse'),
+(8, 63635, 'Darkspear Raptor', 6, 63641, 'Thunder Bluff Kodo'),
+(8, 63635, 'Darkspear Raptor', 10, 63642, 'Silvermoon Hawkstrider'),
+(8, 65644, 'Swift Purple Raptor', 2, 65646, 'Swift Burgundy Wolf'),
+(8, 65644, 'Swift Purple Raptor', 5, 65645, 'White Skeletal Warhorse'),
+(8, 65644, 'Swift Purple Raptor', 6, 65641, 'Great Golden Kodo'),
+(8, 65644, 'Swift Purple Raptor', 10, 65639, 'Swift Red Hawkstrider'),
+(10, 33660, 'Swift Pink Hawkstrider', 2, 23251, 'Swift Timber Wolf'),
+(10, 33660, 'Swift Pink Hawkstrider', 5, 66846, 'Ochre Skeletal Warhorse'),
+(10, 33660, 'Swift Pink Hawkstrider', 6, 23247, 'Great White Kodo'),
+(10, 33660, 'Swift Pink Hawkstrider', 8, 23243, 'Swift Orange Raptor'),
+(10, 34795, 'Red Hawkstrider', 2, 6654, 'Brown Wolf'),
+(10, 34795, 'Red Hawkstrider', 5, 17463, 'Blue Skeletal Horse'),
+(10, 34795, 'Red Hawkstrider', 6, 64657, 'White Kodo'),
+(10, 34795, 'Red Hawkstrider', 8, 10799, 'Violet Raptor'),
+(10, 35018, 'Purple Hawkstrider', 2, 64658, 'Black Wolf'),
+(10, 35018, 'Purple Hawkstrider', 5, 17462, 'Red Skeletal Horse'),
+(10, 35020, 'Blue Hawkstrider', 2, 6653, 'Dire Wolf'),
+(10, 35020, 'Blue Hawkstrider', 5, 17464, 'Brown Skeletal Horse'),
+(10, 35020, 'Blue Hawkstrider', 6, 18989, 'Gray Kodo'),
+(10, 35020, 'Blue Hawkstrider', 8, 10796, 'Turquoise Raptor'),
+(10, 35022, 'Black Hawkstrider', 2, 580, 'Timber Wolf'),
+(10, 35022, 'Black Hawkstrider', 5, 64977, 'Black Skeletal Horse'),
+(10, 35022, 'Black Hawkstrider', 6, 18990, 'Brown Kodo'),
+(10, 35022, 'Black Hawkstrider', 8, 8395, 'Emerald Raptor'),
+(10, 35025, 'Swift Green Hawkstrider', 2, 23250, 'Swift Brown Wolf'),
+(10, 35025, 'Swift Green Hawkstrider', 5, 17465, 'Green Skeletal Warhorse'),
+(10, 35025, 'Swift Green Hawkstrider', 6, 23249, 'Great Brown Kodo'),
+(10, 35025, 'Swift Green Hawkstrider', 8, 23241, 'Swift Blue Raptor'),
+(10, 35027, 'Swift Purple Hawkstrider', 2, 23252, 'Swift Gray Wolf'),
+(10, 35027, 'Swift Purple Hawkstrider', 5, 23246, 'Purple Skeletal Warhorse'),
+(10, 35027, 'Swift Purple Hawkstrider', 6, 23248, 'Great Gray Kodo'),
+(10, 35027, 'Swift Purple Hawkstrider', 8, 23242, 'Swift Olive Raptor'),
+(10, 63642, 'Silvermoon Hawkstrider', 2, 63640, 'Orgrimmar Wolf'),
+(10, 63642, 'Silvermoon Hawkstrider', 5, 63643, 'Forsaken Warhorse'),
+(10, 63642, 'Silvermoon Hawkstrider', 6, 63641, 'Thunder Bluff Kodo'),
+(10, 63642, 'Silvermoon Hawkstrider', 8, 63635, 'Darkspear Raptor'),
+(10, 65639, 'Swift Red Hawkstrider', 2, 65646, 'Swift Burgundy Wolf'),
+(10, 65639, 'Swift Red Hawkstrider', 5, 65645, 'White Skeletal Warhorse'),
+(10, 65639, 'Swift Red Hawkstrider', 6, 65641, 'Great Golden Kodo'),
+(10, 65639, 'Swift Red Hawkstrider', 8, 65644, 'Swift Purple Raptor'),
+(11, 458, 'Brown Horse', 2, 34795, 'Red Hawkstrider'),
+(11, 470, 'Black Stallion', 2, 35018, 'Purple Hawkstrider'),
+(11, 472, 'Pinto', 2, 35022, 'Black Hawkstrider'),
+(11, 6648, 'Chestnut Mare', 2, 35020, 'Blue Hawkstrider'),
+(11, 6777, 'Gray Ram', 8, 35022, 'Black Hawkstrider'),
+(11, 6898, 'White Ram', 8, 35020, 'Blue Hawkstrider'),
+(11, 6899, 'Brown Ram', 8, 34795, 'Red Hawkstrider'),
+(11, 8394, 'Striped Frostsaber', 5, 35022, 'Black Hawkstrider'),
+(11, 10789, 'Spotted Frostsaber', 5, 35020, 'Blue Hawkstrider'),
+(11, 10793, 'Striped Nightsaber', 5, 34795, 'Red Hawkstrider'),
+(11, 10873, 'Red Mechanostrider', 6, 34795, 'Red Hawkstrider'),
+(11, 10969, 'Blue Mechanostrider', 6, 35022, 'Black Hawkstrider'),
+(11, 17453, 'Green Mechanostrider', 6, 35020, 'Blue Hawkstrider'),
+(11, 17454, 'Unpainted Mechanostrider', 6, 35018, 'Purple Hawkstrider'),
+(11, 22717, 'Black War Steed', 2, 35028, 'Swift Warstrider'),
+(11, 22719, 'Black Battlestrider', 6, 35028, 'Swift Warstrider'),
+(11, 22720, 'Black War Ram', 8, 35028, 'Swift Warstrider'),
+(11, 22723, 'Black War Tiger', 5, 35028, 'Swift Warstrider'),
+(11, 23219, 'Swift Mistsaber', 5, 35027, 'Swift Purple Hawkstrider'),
+(11, 23221, 'Swift Frostsaber', 5, 33660, 'Swift Pink Hawkstrider'),
+(11, 23222, 'Swift Yellow Mechanostrider', 6, 33660, 'Swift Pink Hawkstrider'),
+(11, 23223, 'Swift White Mechanostrider', 6, 35027, 'Swift Purple Hawkstrider'),
+(11, 23225, 'Swift Green Mechanostrider', 6, 35025, 'Swift Green Hawkstrider'),
+(11, 23227, 'Swift Palomino', 2, 33660, 'Swift Pink Hawkstrider'),
+(11, 23228, 'Swift White Steed', 2, 35027, 'Swift Purple Hawkstrider'),
+(11, 23229, 'Swift Brown Steed', 2, 35025, 'Swift Green Hawkstrider'),
+(11, 23238, 'Swift Brown Ram', 8, 33660, 'Swift Pink Hawkstrider'),
+(11, 23239, 'Swift Gray Ram', 8, 35025, 'Swift Green Hawkstrider'),
+(11, 23240, 'Swift White Ram', 8, 35027, 'Swift Purple Hawkstrider'),
+(11, 23338, 'Swift Stormsaber', 5, 35025, 'Swift Green Hawkstrider'),
+(11, 34406, 'Brown Elekk', 1, 472, 'Pinto'),
+(11, 34406, 'Brown Elekk', 2, 580, 'Timber Wolf'),
+(11, 34406, 'Brown Elekk', 3, 6777, 'Gray Ram'),
+(11, 34406, 'Brown Elekk', 4, 8394, 'Striped Frostsaber'),
+(11, 34406, 'Brown Elekk', 5, 64977, 'Black Skeletal Horse'),
+(11, 34406, 'Brown Elekk', 6, 18990, 'Brown Kodo'),
+(11, 34406, 'Brown Elekk', 7, 10969, 'Blue Mechanostrider'),
+(11, 34406, 'Brown Elekk', 8, 8395, 'Emerald Raptor'),
+(11, 35710, 'Gray Elekk', 1, 6648, 'Chestnut Mare'),
+(11, 35710, 'Gray Elekk', 2, 6653, 'Dire Wolf'),
+(11, 35710, 'Gray Elekk', 3, 6898, 'White Ram'),
+(11, 35710, 'Gray Elekk', 4, 10789, 'Spotted Frostsaber'),
+(11, 35710, 'Gray Elekk', 5, 17464, 'Brown Skeletal Horse'),
+(11, 35710, 'Gray Elekk', 6, 18989, 'Gray Kodo'),
+(11, 35710, 'Gray Elekk', 7, 17453, 'Green Mechanostrider'),
+(11, 35710, 'Gray Elekk', 8, 10796, 'Turquoise Raptor'),
+(11, 35711, 'Purple Elekk', 1, 458, 'Brown Horse'),
+(11, 35711, 'Purple Elekk', 2, 6654, 'Brown Wolf'),
+(11, 35711, 'Purple Elekk', 3, 6899, 'Brown Ram'),
+(11, 35711, 'Purple Elekk', 4, 10793, 'Striped Nightsaber'),
+(11, 35711, 'Purple Elekk', 5, 17463, 'Blue Skeletal Horse'),
+(11, 35711, 'Purple Elekk', 6, 64657, 'White Kodo'),
+(11, 35711, 'Purple Elekk', 7, 10873, 'Red Mechanostrider'),
+(11, 35711, 'Purple Elekk', 8, 10799, 'Violet Raptor'),
+(11, 35712, 'Great Green Elekk', 1, 23228, 'Swift White Steed'),
+(11, 35712, 'Great Green Elekk', 2, 23252, 'Swift Gray Wolf'),
+(11, 35712, 'Great Green Elekk', 3, 23240, 'Swift White Ram'),
+(11, 35712, 'Great Green Elekk', 4, 23219, 'Swift Mistsaber'),
+(11, 35712, 'Great Green Elekk', 5, 23246, 'Purple Skeletal Warhorse'),
+(11, 35712, 'Great Green Elekk', 6, 23248, 'Great Gray Kodo'),
+(11, 35712, 'Great Green Elekk', 7, 23223, 'Swift White Mechanostrider'),
+(11, 35712, 'Great Green Elekk', 8, 23242, 'Swift Olive Raptor'),
+(11, 35713, 'Great Blue Elekk', 1, 23229, 'Swift Brown Steed'),
+(11, 35713, 'Great Blue Elekk', 2, 23250, 'Swift Brown Wolf'),
+(11, 35713, 'Great Blue Elekk', 3, 23239, 'Swift Gray Ram'),
+(11, 35713, 'Great Blue Elekk', 4, 23338, 'Swift Stormsaber'),
+(11, 35713, 'Great Blue Elekk', 5, 17465, 'Green Skeletal Warhorse'),
+(11, 35713, 'Great Blue Elekk', 6, 23249, 'Great Brown Kodo'),
+(11, 35713, 'Great Blue Elekk', 7, 23225, 'Swift Green Mechanostrider'),
+(11, 35713, 'Great Blue Elekk', 8, 23241, 'Swift Blue Raptor'),
+(11, 35714, 'Great Purple Elekk', 1, 23227, 'Swift Palomino'),
+(11, 35714, 'Great Purple Elekk', 2, 23251, 'Swift Timber Wolf'),
+(11, 35714, 'Great Purple Elekk', 3, 23238, 'Swift Brown Ram'),
+(11, 35714, 'Great Purple Elekk', 4, 23221, 'Swift Frostsaber'),
+(11, 35714, 'Great Purple Elekk', 5, 66846, 'Ochre Skeletal Warhorse'),
+(11, 35714, 'Great Purple Elekk', 6, 23247, 'Great White Kodo'),
+(11, 35714, 'Great Purple Elekk', 7, 23222, 'Swift Yellow Mechanostrider'),
+(11, 35714, 'Great Purple Elekk', 8, 23243, 'Swift Orange Raptor'),
+(11, 48027, 'Black War Elekk', 2, 22724, 'Black War Wolf'),
+(11, 48027, 'Black War Elekk', 5, 22722, 'Red Skeletal Warhorse'),
+(11, 48027, 'Black War Elekk', 6, 22718, 'Black War Kodo'),
+(11, 48027, 'Black War Elekk', 8, 22721, 'Black War Raptor'),
+(11, 63232, 'Stormwind Steed', 2, 63642, 'Silvermoon Hawkstrider'),
+(11, 63636, 'Ironforge Ram', 8, 63642, 'Silvermoon Hawkstrider'),
+(11, 63637, 'Darnassian Nightsaber', 5, 63642, 'Silvermoon Hawkstrider'),
+(11, 63638, 'Gnomeregan Mechanostrider', 6, 63642, 'Silvermoon Hawkstrider'),
+(11, 63639, 'Exodar Elekk', 1, 63232, 'Stormwind Steed'),
+(11, 63639, 'Exodar Elekk', 2, 63640, 'Orgrimmar Wolf'),
+(11, 63639, 'Exodar Elekk', 3, 63636, 'Ironforge Ram'),
+(11, 63639, 'Exodar Elekk', 4, 63637, 'Darnassian Nightsaber'),
+(11, 63639, 'Exodar Elekk', 5, 63643, 'Forsaken Warhorse'),
+(11, 63639, 'Exodar Elekk', 6, 63641, 'Thunder Bluff Kodo'),
+(11, 63639, 'Exodar Elekk', 7, 63638, 'Gnomeregan Mechanostrider'),
+(11, 63639, 'Exodar Elekk', 8, 63635, 'Darkspear Raptor'),
+(11, 65637, 'Great Red Elekk', 1, 65640, 'Swift Gray Steed'),
+(11, 65637, 'Great Red Elekk', 2, 65646, 'Swift Burgundy Wolf'),
+(11, 65637, 'Great Red Elekk', 3, 65643, 'Swift Violet Ram'),
+(11, 65637, 'Great Red Elekk', 4, 65638, 'Swift Moonsaber'),
+(11, 65637, 'Great Red Elekk', 5, 65645, 'White Skeletal Warhorse'),
+(11, 65637, 'Great Red Elekk', 6, 65641, 'Great Golden Kodo'),
+(11, 65637, 'Great Red Elekk', 7, 65642, 'Turbostrider'),
+(11, 65637, 'Great Red Elekk', 8, 65644, 'Swift Purple Raptor'),
+(11, 65638, 'Swift Moonsaber', 5, 65639, 'Swift Red Hawkstrider'),
+(11, 65640, 'Swift Gray Steed', 2, 65639, 'Swift Red Hawkstrider'),
+(11, 65642, 'Turbostrider', 6, 65639, 'Swift Red Hawkstrider'),
+(11, 65643, 'Swift Violet Ram', 8, 65639, 'Swift Red Hawkstrider'),
+(11, 66847, 'Striped Dawnsaber', 5, 35018, 'Purple Hawkstrider');
diff --git a/sql_mr/mr02773_mangos_faction_change_items.sql b/sql_mr/mr02773_mangos_faction_change_items.sql
new file mode 100644
index 00000000000..6b7c8f289ae
--- /dev/null
+++ b/sql_mr/mr02773_mangos_faction_change_items.sql
@@ -0,0 +1,731 @@
+-- Race Faction Change - Items
+INSERT INTO `player_factionchange_items` VALUES ('0', '15196', 'Private\'s Tabard', '0', '15197', 'Scout\'s Tabard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '18606', 'Alliance Battle Standard', '0', '18607', 'Horde Battle Standard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '19032', 'Stormpike Battle Tabard', '0', '19031', 'Frostwolf Battle Tabard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '19506', 'Silverwing Battle Tabard', '0', '19505', 'Warsong Battle Tabard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '20132', 'Arathor Battle Tabard', '0', '20131', 'Battle Tabard of the Defilers');
+INSERT INTO `player_factionchange_items` VALUES ('0', '23999', 'Honor Hold Tabard', '0', '24004', 'Thrallmar Tabard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '28234', 'Medallion of the Alliance(115)', '0', '28240', 'Medallion of the Horde(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '28235', 'Medallion of the Alliance(115)', '0', '28241', 'Medallion of the Horde(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '28236', 'Medallion of the Alliance(115)', '0', '28242', 'Medallion of the Horde(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '28237', 'Medallion of the Alliance(115)', '0', '28243', 'Medallion of the Horde(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '28238', 'Medallion of the Alliance(115)', '0', '28239', 'Medallion of the Horde(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '28379', 'Sergeant\'s Heavy Cape(123)', '0', '28378', 'Sergeant\'s Heavy Cape(123)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '28380', 'Sergeant\'s Heavy Cloak(123)', '0', '28377', 'Sergeant\'s Heavy Cloak(123)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '28952', 'Grand Marshal\'s Quickblade(115)', '0', '28926', 'High Warlord\'s Quickblade(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '28954', 'Grand Marshal\'s Shanker(115)', '0', '28929', 'High Warlord\'s Shanker(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '28955', 'Grand Marshal\'s Shiv(115)', '0', '28930', 'High Warlord\'s Shiv(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '29136', 'Far Seer\'s Helm(115)', '0', '29135', 'Earthcaller\'s Headdress(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '29140', 'Cloak of the Ancient Spirits(115)', '0', '29139', 'Ceremonial Cover(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '29142', 'Kurenai Kilt(115)', '0', '29141', 'Tempest Leggings(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '29144', 'Worg Hide Quiver(109)', '0', '29143', 'Clefthoof Hide Quiver(109)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '29146', 'Band of Elemental Spirits(115)', '0', '29145', 'Band of Ancestral Spirits(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '29148', 'Blackened Leather Spaulders(115)', '0', '29147', 'Talbuk Hide Spaulders(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '29153', 'Blade of the Archmage(100)', '0', '29155', 'Stormcaller(100)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '29166', 'Hellforged Halberd(115)', '0', '29167', 'Blackened Spear(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '29169', 'Ring of Convalescence(115)', '0', '29168', 'Ancestral Band(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '30348', 'Medallion of the Alliance(115)', '0', '30343', 'Medallion of the Horde(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '30349', 'Medallion of the Alliance(115)', '0', '30346', 'Medallion of the Horde(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '30350', 'Medallion of the Alliance(115)', '0', '30344', 'Medallion of the Horde(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '30351', 'Medallion of the Alliance(115)', '0', '30345', 'Medallion of the Horde(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '30597', 'Halaani Claymore(114)', '0', '30570', 'Arkadian Claymore(114)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '30599', 'Avenging Blades(108)', '0', '30568', 'The Sharp Cookie(108)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '31774', 'Kurenai Tabard', '0', '31773', 'Mag\'har Tabard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '37864', 'Medallion of the Alliance(128)', '0', '37865', 'Medallion of the Horde(128)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '38453', 'Shield of the Lion-hearted(166)', '0', '38452', 'Bulwark of the Warchief(166)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '38455', 'Hammer of the Alliance Vanguard(166)', '0', '38454', 'Warsong Punisher(166)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '38459', 'Orb of the Eastern Kingdoms(166)', '0', '38458', 'Darkspear Orb(166)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '38463', 'Lordaeron\'s Resolve(166)', '0', '38462', 'Warsong Stormshield(166)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '38465', 'Vanguard Soldier\'s Dagger(166)', '0', '38461', 'Warsong Shanker(166)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '38589', 'Medallion of the Alliance(115)', '0', '38588', 'Medallion of the Horde(115)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '42123', 'Medallion of the Alliance(200)', '0', '42122', 'Medallion of the Horde(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '42124', 'Medallion of the Alliance(226)', '0', '42126', 'Medallion of the Horde(226)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '44413', 'Mekgineer\'s Chopper', '0', '41508', 'Mechano-hog');
+INSERT INTO `player_factionchange_items` VALUES ('0', '44503', 'Schematic: Mekgineers Chopper', '0', '44502', 'Schematic: Mechano-Hog');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45011', 'Stormwind Banner', '0', '45014', 'Orgrimmar Banner');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45018', 'Ironforge Banner', '0', '45015', 'Sen\'jin Banner');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45019', 'Gnomeregan Banner', '0', '45013', 'Thunder Bluff Banner');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45020', 'Exodar Banner', '0', '45017', 'Silvermoon City Banner');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45021', 'Darnassus Banner', '0', '45016', 'Undercity Banner');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45074', 'Claymore of the Prophet(200)', '0', '45205', 'Greatsword of the Sin\'dorei(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45075', 'Ironforge Smasher(200)', '0', '45203', 'Grimhorn Crusher(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45076', 'Teldrassil Protector(200)', '0', '45204', 'Axe of the Sen\'jin Protector(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45077', 'Dagger of the Rising Moon(200)', '0', '45222', 'Spinal Destroyer(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45078', 'Dagger of Lunar Purity(200)', '0', '45214', 'Scalpel of the Royal Apothecary(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45128', 'Silvery Sylvan Stave(200)', '0', '45212', 'Staff of Feral Furies(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45129', 'Gnomeregan Bonechopper(200)', '0', '45208', 'Blade of the Keening Banshee(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45130', 'Blunderbuss of Khaz Modan(200)', '0', '45210', 'Sen\'jin Beakblade Longrifle(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45131', 'Jouster\'s Fury(200)', '0', '45219', 'Jouster\'s Fury(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45152', 'Pendant of Azure Dreams(200)', '0', '45223', 'Razor\'s Edge Pendant(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45153', 'Susurrating Shell Necklace(200)', '0', '45206', 'Choker of Feral Fury(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45154', 'Necklace of Valiant Blood(200)', '0', '45213', 'Pendant of Emerald Crusader(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45155', 'Choker of Spiral Focus(200)', '0', '45207', 'Necklace of Stolen Skulls(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45156', 'Sash of Shattering Hearts(200)', '0', '45209', 'Sash of Trumpted Pride(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45159', 'Treads of Nimble Evasion(200)', '0', '45220', 'Treads of the Earnest Squire(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45160', 'Girdle of Valorous Defeat(200)', '0', '45217', 'Clinch of Savage Fury(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45163', 'Stanchions of Unseatable Furor(200)', '0', '45218', 'Blood-Caked Stompers(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45181', 'Wrap of the Everliving Tree(200)', '0', '45211', 'Waistguard of Equine Fury(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45182', 'Gauntlets of Shattered Pride(200)', '0', '45216', 'Gauntlets of Mending Touch(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45183', 'Treads of the Glorious Spirit(200)', '0', '45221', 'Treads of Whispering Dreams(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45184', 'Cinch of Bonded Servitude(200)', '0', '45215', 'Links of Unquenched Savagery(200)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45574', 'Stormwind Tabard', '0', '45581', 'Orgrimmar Tabard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45577', 'Ironforge Tabard', '0', '45582', 'Sen\'jin Tabard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45578', 'Gnomeregan Tabard', '0', '45584', 'Thunder Bluff Tabard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45579', 'Darnassus Tabard', '0', '45583', 'Undercity Tabard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '45580', 'Exodar Tabard', '0', '45585', 'Silvermoon City Tabard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46817', 'Silver Covenant Tabard', '0', '46818', 'Sunreaver Tabard');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46958', 'Steel Bladebreaker(245)', '0', '47255', 'Stygian Bladebreaker(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46959', 'Band of the Violent Temperment(245)', '0', '47252', 'Ring of the Violent Temperament(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46960', 'Breastplate of Cruel Intent(245)', '0', '47251', 'Cuirass of Cruel Intent(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46961', 'Boneshatter Armplates(245)', '0', '47253', 'Boneshatter Vambraces(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46962', 'Chestplate of the Towering Monstrosity(245)', '0', '47254', 'Hauberk of the Towering Monstrosity(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46963', 'Crystal Plated Vanguard(245)', '0', '47260', 'Forlorn Barrier(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46964', 'Crystal Plated Vanguard(258)', '0', '47421', 'Forlorn Barrier(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46965', 'Breastplate of Cruel Intent(258)', '0', '47412', 'Cuirass of Cruel Intent(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46966', 'Band of the Violent Temperment(258)', '0', '47413', 'Ring of the Violent Temperament(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46967', 'Boneshatter Armplates(258)', '0', '47414', 'Boneshatter Vambraces(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46968', 'Chestplate of the Towering Monstrosity(258)', '0', '47415', 'Hauberk of the Towering Monstrosity(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46969', 'Steel Bladebreaker(258)', '0', '47416', 'Stygian Bladebreaker(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46970', 'Drape of the Untamed Predator(245)', '0', '47257', 'Cloak of the Untamed Predator(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46971', 'Drape of the Untamed Predator(258)', '0', '47418', 'Cloak of the Untamed Predator(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46972', 'Cord of the Tenebrous Mist(245)', '0', '47258', 'Belt of the Tenebrous Mist(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46973', 'Cord of the Tenebrous Mist(258)', '0', '47419', 'Belt of the Tenebrous Mist(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46974', 'Leggings of the Broken Beast(245)', '0', '47259', 'Legwraps of the Broken Beast(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46975', 'Leggings of the Broken Beast(258)', '0', '47420', 'Legwraps of the Broken Beast(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46976', 'Shawl of the Refreshing Winds(245)', '0', '47256', 'Drape of the Refreshing Winds(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46977', 'Shawl of the Refreshing Winds(258)', '0', '47417', 'Drape of the Refreshing Winds(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46979', 'Blade of Tarasque(245)', '0', '47261', 'Barb of Tarasque(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46980', 'Blade of Tarasque(258)', '0', '47422', 'Barb of Tarasque(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46985', 'Boots of the Courageous(245)', '0', '47263', 'Sabatons of the Courageous(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46986', 'Boots of the Courageous(258)', '0', '47424', 'Sabatons of the Courageous(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46988', 'Boots of the Unrelenting Storm(245)', '0', '47262', 'Boots of the Harsh Winter(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46989', 'Boots of the Unrelenting Storm(258)', '0', '47423', 'Boots of the Harsh Winter(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46990', 'Belt of the Ice Burrower(245)', '0', '47265', 'Binding of the Ice Burrower(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46991', 'Belt of the Ice Burrower(258)', '0', '47426', 'Binding of the Ice Burrower(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46992', 'Flowing Vestments of Ascent(245)', '0', '47264', 'Flowing Robes of Ascent(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46993', 'Flowing Vestments of Ascent(258)', '0', '47425', 'Flowing Robes of Ascent(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46994', 'Talonstrike(245)', '0', '47267', 'Death\'s Head Crossbow(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46995', 'Talonstrike(258)', '0', '47428', 'Death\'s Head Crossbow(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46996', 'Lionhead Slasher(245)', '0', '47266', 'Blood Fury(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46997', 'Dawnbreaker Greaves(245)', '0', '47269', 'Dawnbreaker Sabatons(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '46999', 'Bloodbath Belt(245)', '0', '47268', 'Bloodbath Girdle(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47000', 'Cuirass of Calamitous Fate(245)', '0', '47270', 'Vest of Calamitous Fate(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47001', 'Lionhead Slasher(258)', '0', '47427', 'Blood Fury(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47002', 'Bloodbath Belt(258)', '0', '47429', 'Bloodbath Girdle(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47003', 'Dawnbreaker Greaves', '0', '47430', 'Dawnbreaker Sabatons');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47004', 'Cuirass of Calamitous Fate(258)', '0', '47431', 'Vest of Calamitous Fate(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47041', 'Solace of the Defeated(245)', '0', '47271', 'Solace of the Fallen(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47042', 'Pride of the Eredar(245)', '0', '47275', 'Pride of the Demon Lord(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47043', 'Charge of the Demon Lord(245)', '0', '47272', 'Charge of the Eredar(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47051', 'Leggings of the Soothing Touch(245)', '0', '47274', 'Pants of the Soothing Touch(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47052', 'Legguards of Feverish Dedication(245)', '0', '47273', 'Legplates of Feverish Dedication(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47053', 'Symbol of Transgression(245)', '0', '47276', 'Talisman of Heedless Sins(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47054', 'Band of Deplorable Violence(245)', '0', '47327', 'Lurid Manifestation(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47055', 'Bracers of the Autumn Willow(245)', '0', '47277', 'Bindings of the Autumn Willow(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47056', 'Bracers of Cloudy Omen(245)', '0', '47280', 'Legplates of Feverish Dedication(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47057', 'Legplates of Failing Light(245)', '0', '47279', 'Leggings of Failing Light(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47059', 'Solace of the Defeated(258)', '0', '47432', 'Solace of the Fallen(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47060', 'Charge of the Demon Lord(258)', '0', '47433', 'Charge of the Eredar(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47061', 'Legguards of Feverish Dedication(258)', '0', '47434', 'Legplates of Feverish Dedication(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47062', 'Leggings of the Soothing Touch(258)', '0', '47435', 'Pants of the Soothing Touch(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47063', 'Pride of the Eredar(258)', '0', '47436', 'Pride of the Demon Lord(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47064', 'Symbol of Transgression(258)', '0', '47437', 'Talisman of Heedless Sins(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47066', 'Bracers of the Autumn Willow(258)', '0', '47438', 'Bindings of the Autumn Willow(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47067', 'Legplates of Failing Light(258)', '0', '47440', 'Leggings of Failing Light(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47068', 'Bracers of Cloudy Omen(258)', '0', '47441', 'Wristwraps of Cloudy Omen(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47069', 'Justicebringer(245)', '0', '47285', 'Dual-blade Butcher(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47070', 'Ring of Callous Aggression(245)', '0', '47282', 'Band of Callous Aggression(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47071', 'Treads of the Icewalker(245)', '0', '47284', 'Icewalker Treads(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47072', 'Girdle of Bloodied Scars(245)', '0', '47283', 'Belt of Bloodied Scars(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47073', 'Bracers of the Untold Massacre(245)', '0', '47281', 'Bracers of the Silent Massacre(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47074', 'Bracers of the Untold Massacre(258)', '0', '47442', 'Bracers of the Silent Massacre(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47075', 'Ring of Callous Aggression(258)', '0', '47443', 'Band of Callous Aggression(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47076', 'Girdle of Bloodied Scars(258)', '0', '47444', 'Belt of Bloodied Scars(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47077', 'Treads of the Icewalker(258)', '0', '47445', 'Icewalker Treads(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47078', 'Justicebringer(258)', '0', '47446', 'Dual-blade Butcher(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47079', 'Bastion of Purity(245)', '0', '47287', 'Bastion of Resolve(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47080', 'Satrina\'s Impeding Scarab(245)', '0', '47290', 'Juggernaut\'s Vitality(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47081', 'Cord of Biting Cold(245)', '0', '47286', 'Belt of Biting Cold(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47082', 'Chestplate of the Frostborn Hero(245)', '0', '47288', 'Chestplate of the Frostwolf Hero(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47083', 'Legguards of Concealed Hatred(245)', '0', '47289', 'Leggings of Concealed Hatred(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47084', 'Cord of Biting Cold(258)', '0', '47447', 'Belt of Biting Cold(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47085', 'Bastion of Purity(258)', '0', '47448', 'Bastion of Resolve(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47086', 'Chestplate of the Frostborn Hero(258)', '0', '47449', 'Chestplate of the Frostwolf Hero(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47087', 'Legguards of Concealed Hatred(258)', '0', '47450', 'Leggings of Concealed Hatred(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47088', 'Satrina\'s Impeding Scarab(258)', '0', '47451', 'Juggernaut\'s Vitality(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47089', 'Cloak of Displacement(245)', '0', '47291', 'Shroud of Displacement(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47090', 'Boots of Tremoring Earth(245)', '0', '47295', 'Sabatons of Tremoring Earth(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47092', 'Boots of the Mourning Widow(245)', '0', '47293', 'Sandals of the Mourning Widow(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47093', 'Vambraces of the Broken Bond(245)', '0', '47294', 'Bracers of the Broken Bond(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47094', 'Vestments of the Shattered Fellowship(245)', '0', '47292', 'Robes of the Shattered Fellowship(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47095', 'Cloak of Displacement(258)', '0', '47452', 'Shroud of Displacement(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47096', 'Vestments of the Shattered Fellowship(258)', '0', '47453', 'Robes of the Shattered Fellowship(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47097', 'Boots of the Mourning Widow(258)', '0', '47454', 'Sandals of the Mourning Widow(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47098', 'Vambraces of the Broken Bond(258)', '0', '47455', 'Bracers of the Broken Bond(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47099', 'Boots of Tremoring Earth(258)', '0', '47456', 'Sabatons of Tremoring Earth(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47104', 'Twin Spike(245)', '0', '47300', 'Gouge of the Frigid Heart(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47105', 'The Executioner\'s Malice(245)', '0', '47297', 'The Executioner\'s Vice(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47106', 'Sabatons of Ruthless Judgment(245)', '0', '47296', 'Greaves of Ruthless Judgment(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47107', 'Belt of the Merciless Killer(245)', '0', '47299', 'Belt of the Pitiless Killer(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47108', 'Bracers of the Shieldmaiden(245)', '0', '47298', 'Armguards of the Shieldmaiden(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47109', 'Sabatons of Ruthless Judgment(258)', '0', '47457', 'Greaves of Ruthless Judgment(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47110', 'The Executioner\'s Malice(258)', '0', '47458', 'The Executioner\'s Vice(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47111', 'Bracers of the Shieldmaiden(258)', '0', '47459', 'Armguards of the Shieldmaiden(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47112', 'Belt of the Merciless Killer(258)', '0', '47460', 'Belt of the Pitiless Killer(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47113', 'Twin Spike(258)', '0', '47461', 'Gouge of the Frigid Heart(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47114', 'Lupine Longstaff(245)', '0', '47302', 'Twin\'s Pact(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47115', 'Death\'s Verdict(245)', '0', '47303', 'Death\'s Choice(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47116', 'The Arbiter\'s Muse(245)', '0', '47305', 'Legionnaire\'s Gorget(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47121', 'Legguards of Ascension(245)', '0', '47304', 'Legplates of Ascension(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47126', 'Skyweaver Robes(245)', '0', '47301', 'Skyweaver Vestments(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47129', 'Skyweaver Robes(258)', '0', '47462', 'Skyweaver Vestments(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47130', 'Lupine Longstaff(258)', '0', '47463', 'Twin\'s Pact(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47131', 'Death\'s Verdict(258)', '0', '47464', 'Death\'s Choice(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47132', 'Legguards of Ascension(258)', '0', '47465', 'Legplates of Ascension(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47133', 'The Arbiter\'s Muse(258)', '0', '47466', 'Legionnaire\'s Gorget(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47138', 'Chalice of Searing Light(245)', '0', '47309', 'Mystifying Charm(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47139', 'Wail of the Valkyr(245)', '0', '47307', 'Cry of the Valkyr(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47140', 'Cord of Pale Thorns(245)', '0', '47308', 'Belt of Pale Thorns(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47141', 'Bindings of Dark Essence(245)', '0', '47306', 'Dark Essence Bindings(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47142', 'Breastplate of the Frozen Lake(245)', '0', '47310', 'Chestplate of the Frozen Lake(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47143', 'Bindings of Dark Essence(258)', '0', '47467', 'Dark Essence Bindings(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47144', 'Wail of the Val\'kyr(258)', '0', '47468', 'Cry of the Val\'kyr(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47145', 'Cord of Pale Thorns(258)', '0', '47469', 'Belt of Pale Thorns(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47146', 'Chalice of Searing Light(258)', '0', '47470', 'Mystifying Charm(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47147', 'Breastplate of the Frozen Lake(258)', '0', '47471', 'Chestplate of the Frozen Lake(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47148', 'Stormpike Cleaver(245)', '0', '47314', 'Hellscream Slicer(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47149', 'Signet of the Traitor King(245)', '0', '47315', 'Band of the Traitor King(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47150', 'Greaves of the 7th Legion(245)', '0', '47312', 'Greaves of the Saronite Citadel(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47151', 'Bracers of Dark Determination(245)', '0', '47313', 'Armbands of Dark Determination(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47152', 'Belt of Deathly Dominion(245)', '0', '47311', 'Waistguard of Deathly Dominion(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47153', 'Belt of Deathly Dominion(258)', '0', '47472', 'Waistguard of Deathly Dominion(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47154', 'Greaves of the 7th Legion(258)', '0', '47473', 'Greaves of the Saronite Citadel(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47155', 'Bracers of Dark Determination(258)', '0', '47474', 'Armbands of Dark Determination(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47156', 'Stormpike Cleaver(258)', '0', '47475', 'Hellscream Slicer(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47157', 'Signet of the Traitor King(258)', '0', '47476', 'Band of the Traitor King(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47182', 'Reign of the Unliving(245)', '0', '47316', 'Reign of the Dead(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47183', 'Strength of the Nerub(245)', '0', '47320', 'Might of the Nerub(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47184', 'Legguards of the Lurking Threat(245)', '0', '47319', 'Leggings of the Lurking Threat(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47186', 'Legwraps of the Awakening(245)', '0', '47318', 'Leggings of the Awakening(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47187', 'Leggings of the Deepening Void(245)', '0', '47317', 'Breeches of the Deepening Void(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47188', 'Reign of the Unliving(258)', '0', '47477', 'Reign of the Dead(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47189', 'Leggings of the Deepening Void(258)', '0', '47478', 'Breeches of the Deepening Void(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47190', 'Legwraps of the Awakening(258)', '0', '47479', 'Leggings of the Awakening(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47191', 'Legguards of the Lurking Threat(258)', '0', '47480', 'Leggings of the Lurking Threat(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47192', 'Strength of the Nerub(258)', '0', '47481', 'Might of the Nerub(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47193', 'Misery\'s End(245)', '0', '47322', 'Suffering\'s End(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47194', 'Footpads of the Icy Floe(245)', '0', '47321', 'Boots of the Icy Floe(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47195', 'Belt of the Forgotten Martyr(245)', '0', '47323', 'Girdle of the Forgotten Martyr(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47203', 'Armbands of the Ashen Saint(245)', '0', '47324', 'Bindings of the Ashen Saint(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47204', 'Chestguard of Flowing Elements(245)', '0', '47325', 'Cuirass of Flowing Elements(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47205', 'Footpads of the Icy Floe(258)', '0', '47482', 'Boots of the Icy Floe(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47206', 'Misery\'s End(258)', '0', '47483', 'Suffering\'s End(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47207', 'Belt of the Forgotten Martyr(258)', '0', '47484', 'Girdle of the Forgotten Martyr(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47208', 'Armbands of the Ashen Saint(258)', '0', '47485', 'Bindings of the Ashen Saint(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47209', 'Chestguard of Flowing Elements(258)', '0', '47486', 'Cuirass of Flowing Elements(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47223', 'Ring of the Darkmender(245)', '0', '47278', 'Circle of the Darkmender(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47224', 'Ring of the Darkmender(258)', '0', '47439', 'Circle of the Darkmender(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47225', 'Maiden\'s Favor(245)', '0', '47328', 'Maiden\'s Adoration(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47233', 'Archon Glaive(245)', '0', '47329', 'Hellion Glaive(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47234', 'Gloves of Bitter Reprisal(245)', '0', '47330', 'Gauntlets of Bitter Reprisal(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47235', 'Gloves of the Lifeless Touch(245)', '0', '47326', 'Handwraps of the Lifeless Touch(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47236', 'Gloves of the Lifeless Touch(258)', '0', '47487', 'Handwraps of the Lifeless Touch(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47237', 'Band of Deplorable Violence(258)', '0', '47489', 'Lurid Manifestation(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47238', 'Maiden\'s Favor(258)', '0', '47490', 'Maiden\'s Adoration(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47239', 'Archon Glaive(258)', '0', '47491', 'Hellion Glaive(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47240', 'Gloves of Bitter Reprisal(258)', '0', '47492', 'Gauntlets of Bitter Reprisal(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47506', 'Silverwing Defender(258)', '0', '47513', 'Orgrim\'s Deflector(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47515', 'Decimation(258)', '0', '47516', 'Fleshrender(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47517', 'Blade of the Unbroken Covenant(258)', '0', '47518', 'Mortalis(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47519', 'Catastrophe(258)', '0', '47520', 'Grievance(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47521', 'BRK-1000(258)', '0', '47523', 'Fezzik\'s Autocannon(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47524', 'Clemency(258)', '0', '47525', 'Sufferance(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47526', 'Remorseless(258)', '0', '47528', 'Cudgel of the Damned(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47545', 'Vereesa\'s Dexterity(272)', '0', '47546', 'Sylvanas\' Cunning(272)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47547', 'Varian\'s Furor(272)', '0', '47548', 'Garrosh\'s Rage(272)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47549', 'Magni\'s Resolution(272)', '0', '47550', 'Cairne\'s Endurance(272)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47552', 'Jaina\'s Radiance(272)', '0', '47551', 'Aethas\' Intensity(272)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47553', 'Bolvar\'s Devotion(272)', '0', '47554', 'Lady Liadrin\'s Conviction(272)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47570', 'Saronite Swordbreakers(245)', '0', '47571', 'Saronite Swordbreakers(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47572', 'Titanium Spikeguards(245)', '0', '47573', 'Titanium Spikeguards(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47574', 'Sunforged Bracers(245)', '0', '47575', 'Sunforged Bracers(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47576', 'Crusader\'s Dragonscale Bracers(245)', '0', '47577', 'Crusader\'s Dragonscale Bracers(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47578', 'Carnivorous Band(232)', '0', '47854', 'Gormok\'s Band(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47579', 'Black Chitin Bracers(245)', '0', '47580', 'Black Chitin Bracers(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47581', 'Bracers of Swift Death(245)', '0', '47582', 'Bracers of Swift Death(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47583', 'Moonshadow Armguards(245)', '0', '47584', 'Moonshadow Armguards(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47585', 'Bejeweled Wizard\'s Bracers(245)', '0', '47586', 'Bejeweled Wizard\'s Bracers(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47587', 'Royal Moonshroud Bracers(245)', '0', '47588', 'Royal Moonshroud Bracers(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47589', 'Titanium Razorplate(245)', '0', '47590', 'Titanium Razorplate(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47591', 'Breastplate of the White Knight(245)', '0', '47592', 'Breastplate of the White Knight(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47593', 'Sunforged Breastplate(245)', '0', '47594', 'Sunforged Breastplate(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47595', 'Crusader\'s Dragonscale Breastplate(245)', '0', '47596', 'Crusader\'s Dragonscale Breastplate(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47597', 'Ensorcelled Nerubian Breastplate(245)', '0', '47598', 'Ensorcelled Nerubian Breastplate(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47599', 'Knightbane Carapace(245)', '0', '47600', 'Knightbane Carapace(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47602', 'Lunar Eclipse Chestguard(245)', '0', '47601', 'Lunar Eclipse Chestguard(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47603', 'Merlin\'s Robe(245)', '0', '47604', 'Merlin\'s Robe(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47605', 'Royal Moonshroud Robe(245)', '0', '47606', 'Royal Moonshroud Robe(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47607', 'Collar of Ceaseless Torment(232)', '0', '47849', 'Collar of Unending Torment(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47608', 'Acidmaw Boots(232)', '0', '47853', 'Acidmaw Treads(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47609', 'Gauntlets of Rising Anger(232)', '0', '47851', 'Gauntlets of Mounting Anger(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47610', 'Armbands of the Northern Stalker(232)', '0', '47850', 'Bracers of the Northern Stalker(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47611', 'Dreadscale Armguards(232)', '0', '47852', 'Dreadscale Bracers(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47612', 'Rod of Imprisoned Souls(232)', '0', '47856', 'Scepter of Imprisoned Souls(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47613', 'Shoulderpads of the Glacial Wilds(232)', '0', '47857', 'Pauldrons of the Glacial Wilds(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47614', 'Girdle of the Impaler(232)', '0', '47859', 'Belt of the Impaler(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47615', 'Belt of the Frozen Reach(232)', '0', '47858', 'Girdle of the Frozen Reach(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47616', 'Shoulderguards of the Spirit Walker(232)', '0', '47860', 'Pauldrons of the Spirit Walker(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47617', 'Icehowl Cinch(232)', '0', '47855', 'Icehowl Binding(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47618', 'Firestorm Ring(232)', '0', '47862', 'Firestorm Band(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47619', 'Amulet of Binding Elements(232)', '0', '47864', 'Pendant of Binding Elements(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47620', 'Leggings of the Demonic Messenger(232)', '0', '47865', 'Legwraps of the Demonic Messenger(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47621', 'Girdle of the Farseer(232)', '0', '47866', 'Darkspear Ritual Binding(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47622', 'Plans: Breastplate of the White Knight(85)', '0', '47640', 'Plans: Breastplate of the White Knight(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47623', 'Plans: Saronite Swordbreakers(85)', '0', '47641', 'Plans: Saronite Swordbreakers(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47624', 'Plans: Titanium Razorplate(85)', '0', '47644', 'Plans: Titanium Razorplate(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47625', 'Plans: Titanium Spikeguards(85)', '0', '47645', 'Plans: Titanium Spikeguards(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47626', 'Plans: Sunforged Breastplate(85)', '0', '47643', 'Plans: Sunforged Breastplate(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47627', 'Plans: Sunforged Bracers(85)', '0', '47642', 'Plans: Sunforged Bracers(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47628', 'Pattern: Ensorcelled Nerubian Breastplate(85)', '0', '47650', 'Pattern: Ensorcelled Nerubian Breastplate(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47629', 'Pattern: Black Chitin Bracers(85)', '0', '47646', 'Pattern: Black Chitin Bracers(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47630', 'Pattern: Crusader\'s Dragonscale Breastplate(85)', '0', '47649', 'Pattern: Crusader\'s Dragonscale Breastplate(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47631', 'Pattern: Crusader\'s Dragonscale Bracers(85)', '0', '47648', 'Pattern: Crusader\'s Dragonscale Bracers(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47632', 'Pattern: Lunar Eclipse Chestguard(85)', '0', '47652', 'Pattern: Lunar Eclipse Chestguard(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47633', 'Pattern: Moonshadow Armguards(85)', '0', '47653', 'Pattern: Moonshadow Armguards(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47634', 'Pattern: Knightbane Carapace(85)', '0', '47651', 'Pattern: Knightbane Carapace(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47635', 'Pattern: Bracers of Swift Death(85)', '0', '47647', 'Pattern: Bracers of Swift Death(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47654', 'Pattern: Bejeweled Wizard\'s Bracers(85)', '0', '47639', 'Pattern: Bejeweled Wizard\'s Bracers(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47655', 'Pattern: Merlin\'s Robe(85)', '0', '47638', 'Pattern: Merlin\'s Robe(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47656', 'Pattern: Royal Moonshroud Bracers(85)', '0', '47637', 'Pattern: Royal Moonshroud Bracers(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47657', 'Pattern: Royal Moonshroud Robe(85)', '0', '47636', 'Pattern: Royal Moonshroud Robe(85)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47663', 'Felspark Bindings(232)', '0', '47861', 'Felspark Bracers(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47669', 'Belt of the Winter Solstice(232)', '0', '47863', 'Belt of the Bloodhoof Emissary(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47674', 'Helm of Thunderous Rampage(245)', '0', '47675', 'Faceplate of Thunderous Rampage(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47676', 'Dirk of the Night Watch(232)', '0', '47871', 'Orcish Deathblade(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47677', 'Faceplate of the Honorbound(245)', '0', '47678', 'Headplate of the Honorbound(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47679', 'Endurance of the Infernal(232)', '0', '47872', 'Fortitude of the Infernal(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47680', 'Armguards of the Nether Lord(232)', '0', '47869', 'Armplates of the Nether Lord(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47681', 'Heaume of the Restless Watch(245)', '0', '47682', 'Helm of the Restless Watch(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47683', 'Sentinel Scouting Greaves(232)', '0', '47867', 'Warsong Poacher\'s Greaves(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47685', 'Helm of the Brooding Dragon(245)', '0', '47684', 'Coif of the Brooding Dragon(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47686', 'Helm of Inner Warmth(245)', '0', '47687', 'Headguard of Inner Warmth(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47689', 'Hood of Lethal Intent(245)', '0', '47688', 'Mask of Lethal Intent(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47690', 'Helm of Abundant Growth(245)', '0', '47691', 'Mask of Abundant Growth(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47693', 'Hood of Fiery Aftermath(245)', '0', '47692', 'Hood of Smoldering Aftermath(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47694', 'Helm of Clouded Sight(245)', '0', '47695', 'Hood of Clouded Sight(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47697', 'Pauldrons of Trembling Rage(245)', '0', '47696', 'Shoulderplates of Trembling Rage(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47698', 'Shoulderplates of Enduring Order(245)', '0', '47699', 'Shoulderguards of Enduring Order(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47700', 'Loop of the Twin Valkyr(232)', '0', '47888', 'Band of the Twin Val\'kyr(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47702', 'Pauldrons of the Cavalier(245)', '0', '47701', 'Shoulderplates of the Cavalier(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47703', 'Planestalker Signet(232)', '0', '47868', 'Planestalker Band(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47704', 'Epaulets of the Devourer(245)', '0', '47705', 'Pauldrons of the Devourer(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47707', 'Mantle of the Groundbreaker(245)', '0', '47706', 'Shoulders of the Groundbreaker(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47708', 'Duskstalker Shoulderpads(245)', '0', '47709', 'Duskstalker Pauldrons(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47712', 'Shoulders of the Fateful Accord(245)', '0', '47710', 'Epaulets of the Fateful Accord(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47713', 'Mantle of Catastrophic Emanation(245)', '0', '47714', 'Pauldrons of Catastrophic Emanation(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47715', 'Pauldrons of Revered Mortality(245)', '0', '47716', 'Mantle of Revered Mortality(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47717', 'Faceplate of the Silver Champion(232)', '0', '47876', 'Sunreaver Champion\'s Faceplate(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47718', 'Helm of the Silver Ranger(232)', '0', '47875', 'Sunreaver Ranger\'s Helm(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47719', 'Gloves of the Silver Assassin(232)', '0', '47878', 'Sunreaver Assassin\'s Gloves(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47720', 'Pauldrons of the Silver Defender(232)', '0', '47877', 'Sunreaver Defender\'s Pauldrons(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47721', 'Sandals of the Silver Magus(232)', '0', '47873', 'Sunreaver Magus\' Sandals(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47724', 'Blade of the Silver Disciple(232)', '0', '47874', 'Sunreaver Disciple\'s Blade(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47725', 'Victor\'s Call(232)', '0', '47881', 'Vengeance of the Forsaken(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47726', 'Talisman of Volatile Power(232)', '0', '47879', 'Fetish of Volatile Power(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47727', 'Fervor of the Frostborn(232)', '0', '47882', 'Eitrigg\'s Oath(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47728', 'Binding Light(232)', '0', '47880', 'Binding Stone(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47736', 'Icefall Blade(232)', '0', '47886', 'Nemesis Blade(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47737', 'Reckoning(232)', '0', '47884', 'Edge of Agony(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47738', 'Sabatons of the Lingering Vortex(232)', '0', '47885', 'Greaves of the Lingering Vortex(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47739', 'Armor of Shifting Shadows(232)', '0', '47887', 'Vest of Shifting Shadows(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47740', 'The Diplomat(232)', '0', '47883', 'Widebarrel Flintlock(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47741', 'Baelgun\'s Heavy Crossbow(232)', '0', '47907', 'Darkmaw Crossbow(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47742', 'Chalice of Benedictus(232)', '0', '47913', 'Lightbane Focus(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47743', 'Enlightenment(232)', '0', '47892', 'Illumination(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47744', 'Gloves of the Azure Prophet(232)', '0', '47893', 'Sen\'jin Ritualist Gloves(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47745', 'Gloves of Looming Shadow(232)', '0', '47889', 'Looming Shadow Wraps(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47746', 'Helm of the Snowy Grotto(232)', '0', '47891', 'Helm of the High Mesa(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47747', 'Darkbane Pendant(232)', '0', '47890', 'Darkbane Amulet(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47748', 'Khadgar\'s Hood of Conquest', '0', '47774', 'Sunstrider\'s Hood of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47749', 'Khadgar\'s Robe of Conquest', '0', '47776', 'Sunstrider\'s Robe of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47750', 'Khadgar\'s Leggings of Conquest', '0', '47775', 'Sunstrider\'s Leggings of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47751', 'Khadgar\'s Shoulderpads of Conquest', '0', '47777', 'Sunstrider\'s Shoulderpads of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47752', 'Khadgar\'s Gauntlets of Conquest', '0', '47773', 'Sunstrider\'s Gauntlets of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47753', 'Khadgar\'s Gauntlets of Triumph', '0', '47772', 'Sunstrider\'s Gauntlets of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47754', 'Khadgar\'s Hood of Triumph', '0', '47771', 'Sunstrider\'s Hood of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47755', 'Khadgar\'s Leggings of Triumph', '0', '47770', 'Sunstrider\'s Leggings of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47756', 'Khadgar\'s Robe of Triumph', '0', '47769', 'Sunstrider\'s Robe of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47757', 'Khadgar\'s Shoulderpads of Triumph', '0', '47768', 'Sunstrider\'s Shoulderpads of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47758', 'Khadgar\'s Shoulderpads of Triumph', '0', '47767', 'Sunstrider\'s Shoulderpads of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47759', 'Khadgar\'s Robe of Triumph', '0', '47766', 'Sunstrider\'s Robe of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47760', 'Khadgar\'s Leggings of Triumph', '0', '47765', 'Sunstrider\'s Leggings of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47761', 'Khadgar\'s Hood of Triumph', '0', '47764', 'Sunstrider\'s Hood of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47762', 'Khadgar\'s Gauntlets of Triumph', '0', '47763', 'Sunstrider\'s Gauntlets of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47778', 'Kel\'Thuzad\'s Hood of Triumph', '0', '47804', 'Gul\'dan\'s Hood of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47779', 'Kel\'Thuzad\'s Robe of Triumph', '0', '47806', 'Gul\'dan\'s Robe of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47780', 'Kel\'Thuzad\'s Leggings of Triumph', '0', '47805', 'Gul\'dan\'s Leggings of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47781', 'Kel\'Thuzad\'s Shoulderpads of Triumph', '0', '47807', 'Gul\'dan\'s Shoulderpads of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47782', 'Kel\'Thuzad\'s Gloves of Triumph', '0', '47803', 'Gul\'dan\'s Gloves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47783', 'Kel\'Thuzad\'s Gloves of Conquest', '0', '47802', 'Gul\'dan\'s Gloves of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47784', 'Kel\'Thuzad\'s Hood of Conquest', '0', '47801', 'Gul\'dan\'s Hood of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47785', 'Kel\'Thuzad\'s Leggings of Conquest', '0', '47800', 'Gul\'dan\'s Leggings of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47786', 'Kel\'Thuzad\'s Robe of Conquest', '0', '47799', 'Gul\'dan\'s Robe of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47787', 'Kel\'Thuzad\'s Shoulderpads of Conquest', '0', '47798', 'Gul\'dan\'s Shoulderpads of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47788', 'Kel\'Thuzad\'s Gloves of Triumph', '0', '47797', 'Gul\'dan\'s Gloves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47789', 'Kel\'Thuzad\'s Hood of Triumph', '0', '47796', 'Gul\'dan\'s Hood of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47790', 'Kel\'Thuzad\'s Leggings of Triumph', '0', '47795', 'Gul\'dan\'s Leggings of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47791', 'Kel\'Thuzad\'s Robe of Triumph', '0', '47794', 'Gul\'dan\'s Robe of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47792', 'Kel\'Thuzad\'s Shoulderpads of Triumph', '0', '47793', 'Gul\'dan\'s Shoulderpads of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47808', 'The Lion\'s Maw(232)', '0', '47898', 'Frostblade Hatchet(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47809', 'Argent Resolve(232)', '0', '47894', 'Mace of the Earthborn Chieftain(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47810', 'Crusader\'s Glory(232)', '0', '47899', 'Ardent Guard(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47811', 'Chestguard of the Warden(232)', '0', '47896', 'Stoneskin Chestplate(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47812', 'Vigilant Ward(232)', '0', '47895', 'Pride of the Kor\'kron(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47813', 'Helmet of the Crypt Lord(232)', '0', '47897', 'Helm of the Crypt Lord(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47814', 'Westfall Saber(232)', '0', '47903', 'Forsaken Bonecarver(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47815', 'Cold Convergence(232)', '0', '47900', 'Perdition(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47816', 'The Grinder(232)', '0', '47905', 'Blackhorn Bludgeon(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47829', 'Pauldrons of the Timeless Hunter(232)', '0', '47901', 'Pauldrons of the Shadow Hunter(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47830', 'Legplates of the Silver Hand(232)', '0', '47902', 'Legplates of Redeemed Blood(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47832', 'Spaulders of the Snow Bandit(232)', '0', '47904', 'Shoulderpads of the Snow Bandit(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47834', 'Fordragon Blades(232)', '0', '47911', 'Anguish(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47835', 'Bulwark of the Royal Guard(232)', '0', '47910', 'Aegis of the Coliseum(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47836', 'Legplates of the Immortal Spider(232)', '0', '47908', 'Sunwalker Legguards(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47837', 'Cinch of the Undying(232)', '0', '47909', 'Belt of the Eternal(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47838', 'Vestments of the Sleepless(232)', '0', '47906', 'Robes of the Sleepless(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47914', 'Velen\'s Cowl of Conquest', '0', '48068', 'Zabra\'s Cowl of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47915', 'Collar of Ceaseless Torment(245)', '0', '47988', 'Collar of Unending Torment(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47916', 'Armbands of the Northern Stalker(245)', '0', '47989', 'Bracers of the Northern Stalker(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47917', 'Gauntlets of Rising Anger(245)', '0', '47990', 'Gauntlets of Mounting Anger(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47918', 'Dreadscale Armguards(245)', '0', '47991', 'Dreadscale Bracers(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47919', 'Acidmaw Boots(245)', '0', '47992', 'Acidmaw Treads(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47920', 'Gormok\'s Band(245)', '0', '47993', 'Carnivorous Band(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47921', 'Icehowl Cinch(245)', '0', '47994', 'Icehowl Binding(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47922', 'Rod of Imprisoned Souls(245)', '0', '47995', 'Scepter of Imprisoned Souls(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47923', 'Shoulderpads of the Glacial Wilds(245)', '0', '47996', 'Pauldrons of the Glacial Wilds(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47924', 'Belt of the Frozen Reach(245)', '0', '47997', 'Girdle of the Frozen Reach(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47925', 'Girdle of the Impaler(245)', '0', '47998', 'Belt of the Impaler(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47926', 'Shoulderguards of the Spirit Walker(245)', '0', '47999', 'Pauldrons of the Spirit Walker(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47927', 'Felspark Bindings(245)', '0', '48000', 'Felspark Bracers(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47928', 'Firestorm Ring(245)', '0', '48001', 'Firestorm Band(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47929', 'Belt of the Winter Solstice(245)', '0', '48002', 'Belt of the Bloodhoof Emissary(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47930', 'Amulet of Binding Elements(245)', '0', '48003', 'Pendant of Binding Elements(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47931', 'Leggings of the Demonic Messenger(245)', '0', '48004', 'Legwraps of the Demonic Messenger(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47932', 'Girdle of the Farseer(245)', '0', '48005', 'Darkspear Ritual Binding(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47933', 'Sentinel Scouting Greaves(245)', '0', '48006', 'Warsong Poacher\'s Greaves(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47934', 'Planestalker Signet(245)', '0', '48007', 'Planestalker Band(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47935', 'Armguards of the Nether Lord(245)', '0', '48008', 'Armplates of the Nether Lord(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47936', 'Velen\'s Robe of Conquest', '0', '48070', 'Zabra\'s Robe of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47938', 'Dirk of the Night Watch(245)', '0', '48010', 'Orcish Deathblade(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47939', 'Endurance of the Infernal(245)', '0', '48011', 'Fortitude of the Infernal(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47940', 'Sandals of the Silver Magus(245)', '0', '48012', 'Sunreaver Magus\' Sandals(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47941', 'Blade of the Silver Disciple(245)', '0', '48013', 'Sunreaver Disciple\'s Blade(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47942', 'Helm of the Silver Ranger(245)', '0', '48014', 'Sunreaver Ranger\'s Helm(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47943', 'Faceplate of the Silver Champion(245)', '0', '48015', 'Sunreaver Champion\'s Faceplate(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47944', 'Pauldrons of the Silver Defender(245)', '0', '48016', 'Sunreaver Defender\'s Pauldrons(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47945', 'Gloves of the Silver Assassin(245)', '0', '48017', 'Sunreaver Assassin\'s Gloves(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47946', 'Talisman of Volatile Power(245)', '0', '48018', 'Fetish of Volatile Power(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47947', 'Binding Light(245)', '0', '48019', 'Binding Stone(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47948', 'Victor\'s Call(245)', '0', '48020', 'Vengeance of the Forsaken(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47949', 'Fervor of the Frostborn(245)', '0', '48021', 'Eitrigg\'s Oath(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47950', 'The Diplomat(245)', '0', '48022', 'Widebarrel Flintlock(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47951', 'Reckoning(245)', '0', '48023', 'Edge of Agony(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47952', 'Sabatons of the Lingering Vortex(245)', '0', '48024', 'Greaves of the Lingering Vortex(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47953', 'Icefall Blade(245)', '0', '48025', 'Nemesis Blade(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47954', 'Armor of Shifting Shadows(245)', '0', '48026', 'Vest of Shifting Shadows(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47955', 'Loop of the Twin Val\'kyr(245)', '0', '48027', 'Band of the Twin Val\'kyr(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47956', 'Gloves of Looming Shadow(245)', '0', '48028', 'Looming Shadow Wraps(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47957', 'Darkbane Pendant(245)', '0', '48030', 'Darkbane Amulet(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47958', 'Chalice of Benedictus(245)', '0', '48032', 'Lightbane Focus(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47959', 'Helm of the Snowy Grotto(245)', '0', '48034', 'Helm of the High Mesa(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47960', 'Enlightenment(245)', '0', '48036', 'Illumination(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47961', 'Gloves of the Azure Prophet(245)', '0', '48038', 'Sen\'jin Ritualist Gloves(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47962', 'Argent Resolve(245)', '0', '48039', 'Mace of the Earthborn Chieftain(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47963', 'Vigilant Ward(245)', '0', '48040', 'Pride of the Kor\'kron(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47964', 'Chestguard of the Warden(245)', '0', '48041', 'Stoneskin Chestplate(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47965', 'Headpiece of the Crypt Lord(245)', '0', '48042', 'Helm of the Crypt Lord(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47966', 'The Lion\'s Maw(245)', '0', '48043', 'Frostblade Hatchet(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47967', 'Crusader\'s Glory(245)', '0', '48044', 'Ardent Guard(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47968', 'Cold Convergence(245)', '0', '48045', 'Perdition(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47969', 'Pauldrons of the Timeless Hunter(245)', '0', '48046', 'Pauldrons of the Shadow Hunter(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47970', 'Legplates of the Silver Hand(245)', '0', '48047', 'Legplates of the Redeemed Blood Knight(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47971', 'Westfall Saber(245)', '0', '48048', 'Forsaken Bonecarver(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47972', 'Spaulders of the Snow Bandit(245)', '0', '48049', 'Shoulderpads of the Snow Bandit(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47973', 'The Grinder(245)', '0', '48050', 'Blackhorn Bludgeon(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47974', 'Vestments of the Sleepless(245)', '0', '48051', 'Robes of the Sleepless(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47975', 'Baelgun\'s Heavy Crossbow(245)', '0', '48052', 'Darkmaw Crossbow(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47976', 'Legplates of the Immortal Spider(245)', '0', '48053', 'Sunwalker Legguards(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47977', 'Cinch of the Undying(245)', '0', '48054', 'Belt of the Eternal(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47978', 'Bulwark of the Royal Guard(245)', '0', '48055', 'Aegis of the Coliseum(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47979', 'Fordragon Blades(245)', '0', '48056', 'Anguish(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47980', 'Velen\'s Leggings of Conquest', '0', '48069', 'Zabra\'s Leggings of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47981', 'Velen\'s Shoulderpads of Conquest', '0', '48071', 'Zabra\'s Shoulderpads of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47982', 'Velen\'s Gloves of Conquest', '0', '48067', 'Zabra\'s Gloves of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47983', 'Velen\'s Gloves of Triumph', '0', '48066', 'Zabra\'s Gloves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47984', 'Velen\'s Cowl of Triumph', '0', '48065', 'Zabra\'s Cowl of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47985', 'Velen\'s Leggings of Triumph', '0', '48064', 'Zabra\'s Leggings of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47986', 'Velen\'s Robe of Triumph', '0', '48063', 'Zabra\'s Robe of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '47987', 'Velen\'s Shoulderpads of Triumph', '0', '48062', 'Zabra\'s Shoulderpads of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48029', 'Velen\'s Shoulderpads of Triumph', '0', '48061', 'Zabra\'s Shoulderpads of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48031', 'Velen\'s Robe of Triumph', '0', '48060', 'Zabra\'s Robe of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48033', 'Velen\'s Leggings of Triumph', '0', '48059', 'Zabra\'s Leggings of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48035', 'Velen\'s Cowl of Triumph', '0', '48058', 'Zabra\'s Cowl of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48037', 'Velen\'s Gloves of Triumph', '0', '48057', 'Zabra\'s Gloves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48102', 'Malfurion\'s Headpiece of Conquest', '0', '48154', 'Runetotem\'s Headpiece of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48129', 'Malfurion\'s Robe of Conquest', '0', '48156', 'Runetotem\'s Robe of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48130', 'Malfurion\'s Leggings of Conquest', '0', '48155', 'Runetotem\'s Leggings of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48131', 'Malfurion\'s Spaulders of Conquest', '0', '48157', 'Runetotem\'s Spaulders of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48132', 'Malfurion\'s Handguards of Conquest', '0', '48153', 'Runetotem\'s Handguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48133', 'Malfurion\'s Handguards of Triumph', '0', '48152', 'Runetotem\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48134', 'Malfurion\'s Headpiece of Triumph', '0', '48151', 'Runetotem\'s Headpiece of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48135', 'Malfurion\'s Leggings of Triumph', '0', '48150', 'Runetotem\'s Leggings of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48136', 'Malfurion\'s Robe of Triumph', '0', '48149', 'Runetotem\'s Robe of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48137', 'Malfurion\'s Spaulders of Triumph', '0', '48148', 'Runetotem\'s Spaulders of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48138', 'Malfurion\'s Spaulders of Triumph', '0', '48147', 'Runetotem\'s Spaulders of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48139', 'Malfurion\'s Robe of Triumph', '0', '48146', 'Runetotem\'s Robe of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48140', 'Malfurion\'s Leggings of Triumph', '0', '48145', 'Runetotem\'s Leggings of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48141', 'Malfurion\'s Headpiece of Triumph', '0', '48144', 'Runetotem\'s Headpiece of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48142', 'Malfurion\'s Handguards of Triumph', '0', '48143', 'Runetotem\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48158', 'Malfurion\'s Cover of Conquest', '0', '48184', 'Runetotem\'s Cover of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48159', 'Malfurion\'s Vestments of Conquest', '0', '48186', 'Runetotem\'s Vestments of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48160', 'Malfurion\'s Trousers of Conquest', '0', '48185', 'Runetotem\'s Trousers of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48161', 'Malfurion\'s Mantle of Conquest', '0', '48187', 'Runetotem\'s Mantle of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48162', 'Malfurion\'s Gloves of Conquest', '0', '48183', 'Runetotem\'s Gloves of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48163', 'Malfurion\'s Gloves of Triumph', '0', '48182', 'Runetotem\'s Gloves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48164', 'Malfurion\'s Cover of Triumph', '0', '48181', 'Runetotem\'s Cover of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48165', 'Malfurion\'s Trousers of Triumph', '0', '48180', 'Runetotem\'s Trousers of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48166', 'Malfurion\'s Vestments of Triumph', '0', '48179', 'Runetotem\'s Vestments of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48167', 'Malfurion\'s Mantle of Triumph', '0', '48178', 'Runetotem\'s Mantle of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48168', 'Malfurion\'s Mantle of Triumph', '0', '48177', 'Runetotem\'s Mantle of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48169', 'Malfurion\'s Vestments of Triumph', '0', '48176', 'Runetotem\'s Vestments of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48170', 'Malfurion\'s Trousers of Triumph', '0', '48175', 'Runetotem\'s Trousers of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48171', 'Malfurion\'s Cover of Triumph', '0', '48174', 'Runetotem\'s Cover of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48172', 'Malfurion\'s Gloves of Triumph', '0', '48173', 'Runetotem\'s Gloves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48203', 'Malfurion\'s Handgrips of Triumph', '0', '48202', 'Runetotem\'s Handgrips of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48204', 'Malfurion\'s Headguard of Triumph', '0', '48201', 'Runetotem\'s Headguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48205', 'Malfurion\'s Legguards of Triumph', '0', '48200', 'Runetotem\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48206', 'Malfurion\'s Raiments of Triumph', '0', '48199', 'Runetotem\'s Raiments of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48207', 'Malfurion\'s Shoulderpads of Triumph', '0', '48198', 'Runetotem\'s Shoulderpads of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48208', 'Malfurion\'s Shoulderpads of Triumph', '0', '48197', 'Runetotem\'s Shoulderpads of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48209', 'Malfurion\'s Raiments of Triumph', '0', '48196', 'Runetotem\'s Raiments of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48210', 'Malfurion\'s Legguards of Triumph', '0', '48195', 'Runetotem\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48211', 'Malfurion\'s Headguard of Triumph', '0', '48194', 'Runetotem\'s Headguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48212', 'Malfurion\'s Handgrips of Triumph', '0', '48193', 'Runetotem\'s Handgrips of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48213', 'Malfurion\'s Handgrips of Conquest', '0', '48192', 'Runetotem\'s Handgrips of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48214', 'Malfurion\'s Headguard of Conquest', '0', '48188', 'Runetotem\'s Headguard of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48215', 'Malfurion\'s Legguards of Conquest', '0', '48190', 'Runetotem\'s Legguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48216', 'Malfurion\'s Raiments of Conquest', '0', '48189', 'Runetotem\'s Raiments of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48217', 'Malfurion\'s Shoulderpads of Conquest', '0', '48191', 'Runetotem\'s Shoulderpads of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48218', 'VanCleef\'s Helmet of Conquest', '0', '48245', 'Garona\'s Helmet of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48219', 'VanCleef\'s Breastplate of Conquest', '0', '48243', 'Garona\'s Breastplate of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48220', 'VanCleef\'s Legplates of Conquest', '0', '48246', 'Garona\'s Legplates of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48221', 'VanCleef\'s Pauldrons of Conquest', '0', '48247', 'Garona\'s Pauldrons of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48222', 'VanCleef\'s Gauntlets of Conquest', '0', '48244', 'Garona\'s Gauntlets of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48223', 'VanCleef\'s Breastplate of Triumph', '0', '48242', 'Garona\'s Breastplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48224', 'VanCleef\'s Gauntlets of Triumph', '0', '48241', 'Garona\'s Gauntlets of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48225', 'VanCleef\'s Helmet of Triumph', '0', '48240', 'Garona\'s Helmet of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48226', 'VanCleef\'s Legplates of Triumph', '0', '48239', 'Garona\'s Legplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48227', 'VanCleef\'s Pauldrons of Triumph', '0', '48238', 'Garona\'s Pauldrons of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48228', 'VanCleef\'s Pauldrons of Triumph', '0', '48237', 'Garona\'s Pauldrons of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48229', 'VanCleef\'s Legplates of Triumph', '0', '48236', 'Garona\'s Legplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48230', 'VanCleef\'s Helmet of Triumph', '0', '48235', 'Garona\'s Helmet of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48231', 'VanCleef\'s Gauntlets of Triumph', '0', '48234', 'Garona\'s Gauntlets of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48232', 'VanCleef\'s Breastplate of Triumph', '0', '48233', 'Garona\'s Breastplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48250', 'Windrunner\'s Headpiece of Conquest', '0', '48277', 'Windrunner\'s Headpiece of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48251', 'Windrunner\'s Tunic of Conquest', '0', '48275', 'Windrunner\'s Tunic of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48252', 'Windrunner\'s Legguards of Conquest', '0', '48278', 'Windrunner\'s Legguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48253', 'Windrunner\'s Spaulders of Conquest', '0', '48279', 'Windrunner\'s Spaulders of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48254', 'Windrunner\'s Handguards of Conquest', '0', '48276', 'Windrunner\'s Handguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48255', 'Windrunner\'s Tunic of Triumph', '0', '48274', 'Windrunner\'s Tunic of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48256', 'Windrunner\'s Handguards of Triumph', '0', '48273', 'Windrunner\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48257', 'Windrunner\'s Headpiece of Triumph', '0', '48272', 'Windrunner\'s Headpiece of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48258', 'Windrunner\'s Legguards of Triumph', '0', '48271', 'Windrunner\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48259', 'Windrunner\'s Spaulders of Triumph', '0', '48270', 'Windrunner\'s Spaulders of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48260', 'Windrunner\'s Spaulders of Triumph', '0', '48269', 'Windrunner\'s Spaulders of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48261', 'Windrunner\'s Legguards of Triumph', '0', '48268', 'Windrunner\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48262', 'Windrunner\'s Headpiece of Triumph', '0', '48267', 'Windrunner\'s Headpiece of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48263', 'Windrunner\'s Handguards of Triumph', '0', '48266', 'Windrunner\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48264', 'Windrunner\'s Tunic of Triumph', '0', '48265', 'Windrunner\'s Tunic of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48280', 'Nobundo\'s Headpiece of Conquest', '0', '48297', 'Thrall\'s Headpiece of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48281', 'Nobundo\'s Tunic of Conquest', '0', '48295', 'Thrall\'s Tunic of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48282', 'Nobundo\'s Legguards of Conquest', '0', '48298', 'Thrall\'s Legguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48283', 'Nobundo\'s Spaulders of Conquest', '0', '48299', 'Thrall\'s Spaulders of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48284', 'Nobundo\'s Handguards of Conquest', '0', '48296', 'Thrall\'s Handguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48285', 'Nobundo\'s Tunic of Triumph', '0', '48300', 'Thrall\'s Tunic of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48286', 'Nobundo\'s Handguards of Triumph', '0', '48301', 'Thrall\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48287', 'Nobundo\'s Headpiece of Triumph', '0', '48302', 'Thrall\'s Headpiece of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48288', 'Nobundo\'s Legguards of Triumph', '0', '48303', 'Thrall\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48289', 'Nobundo\'s Spaulders of Triumph', '0', '48304', 'Thrall\'s Spaulders of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48290', 'Nobundo\'s Spaulders of Triumph', '0', '48309', 'Thrall\'s Spaulders of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48291', 'Nobundo\'s Legguards of Triumph', '0', '48308', 'Thrall\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48292', 'Nobundo\'s Headpiece of Triumph', '0', '48307', 'Thrall\'s Headpiece of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48293', 'Nobundo\'s Handguards of Triumph', '0', '48306', 'Thrall\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48294', 'Nobundo\'s Tunic of Triumph', '0', '48305', 'Thrall\'s Tunic of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48310', 'Nobundo\'s Hauberk of Conquest', '0', '48336', 'Thrall\'s Hauberk of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48312', 'Nobundo\'s Gloves of Conquest', '0', '48337', 'Thrall\'s Gloves of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48313', 'Nobundo\'s Helm of Conquest', '0', '48338', 'Thrall\'s Helm of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48314', 'Nobundo\'s Kilt of Conquest', '0', '48339', 'Thrall\'s Kilt of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48315', 'Nobundo\'s Shoulderpads of Conquest', '0', '48340', 'Thrall\'s Shoulderpads of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48316', 'Nobundo\'s Hauberk of Triumph', '0', '48335', 'Thrall\'s Hauberk of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48317', 'Nobundo\'s Gloves of Triumph', '0', '48334', 'Thrall\'s Gloves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48318', 'Nobundo\'s Helm of Triumph', '0', '48333', 'Thrall\'s Helm of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48319', 'Nobundo\'s Kilt of Triumph', '0', '48332', 'Thrall\'s Kilt of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48320', 'Nobundo\'s Shoulderpads of Triumph', '0', '48331', 'Thrall\'s Shoulderpads of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48321', 'Nobundo\'s Shoulderpads of Triumph', '0', '48330', 'Thrall\'s Shoulderpads of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48322', 'Nobundo\'s Kilt of Triumph', '0', '48329', 'Thrall\'s Kilt of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48323', 'Nobundo\'s Helm of Triumph', '0', '48328', 'Thrall\'s Helm of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48324', 'Nobundo\'s Gloves of Triumph', '0', '48327', 'Thrall\'s Gloves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48325', 'Nobundo\'s Hauberk of Triumph', '0', '48326', 'Thrall\'s Hauberk of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48341', 'Nobundo\'s Chestguard of Conquest', '0', '48366', 'Thrall\'s Chestguard of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48342', 'Nobundo\'s Grips of Conquest', '0', '48367', 'Thrall\'s Grips of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48343', 'Nobundo\'s Faceguard of Conquest', '0', '48368', 'Thrall\'s Faceguard of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48344', 'Nobundo\'s War-Kilt of Conquest', '0', '48369', 'Thrall\'s War-Kilt of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48345', 'Nobundo\'s Shoulderguards of Conquest', '0', '48370', 'Thrall\'s Shoulderguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48346', 'Nobundo\'s Chestguard of Triumph', '0', '48365', 'Thrall\'s Chestguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48347', 'Nobundo\'s Grips of Triumph', '0', '48364', 'Thrall\'s Grips of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48348', 'Nobundo\'s Faceguard of Triumph', '0', '48363', 'Thrall\'s Faceguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48349', 'Nobundo\'s War-Kilt of Triumph', '0', '48362', 'Thrall\'s War-Kilt of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48350', 'Nobundo\'s Shoulderguards of Triumph', '0', '48361', 'Thrall\'s Shoulderguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48351', 'Nobundo\'s Shoulderguards of Triumph', '0', '48360', 'Thrall\'s Shoulderguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48352', 'Nobundo\'s War-Kilt of Triumph', '0', '48359', 'Thrall\'s War-Kilt of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48353', 'Nobundo\'s Faceguard of Triumph', '0', '48358', 'Thrall\'s Faceguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48354', 'Nobundo\'s Grips of Triumph', '0', '48357', 'Thrall\'s Grips of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48355', 'Nobundo\'s Chestguard of Triumph', '0', '48356', 'Thrall\'s Chestguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48371', 'Wrynn\'s Helmet of Conquest', '0', '48388', 'Hellscream\'s Helmet of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48372', 'Wrynn\'s Battleplate of Conquest', '0', '48386', 'Hellscream\'s Battleplate of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48373', 'Wrynn\'s Legplates of Conquest', '0', '48389', 'Hellscream\'s Legplates of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48374', 'Wrynn\'s Shoulderplates of Conquest', '0', '48390', 'Hellscream\'s Shoulderplates of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48375', 'Wrynn\'s Gauntlets of Conquest', '0', '48387', 'Hellscream\'s Gauntlets of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48376', 'Wrynn\'s Battleplate of Triumph', '0', '48391', 'Hellscream\'s Battleplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48377', 'Wrynn\'s Gauntlets of Triumph', '0', '48392', 'Hellscream\'s Gauntlets of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48378', 'Wrynn\'s Helmet of Triumph', '0', '48393', 'Hellscream\'s Helmet of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48379', 'Wrynn\'s Legplates of Triumph', '0', '48394', 'Hellscream\'s Legplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48380', 'Wrynn\'s Shoulderplates of Triumph', '0', '48395', 'Hellscream\'s Shoulderplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48381', 'Wrynn\'s Shoulderplates of Triumph', '0', '48400', 'Hellscream\'s Shoulderplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48382', 'Wrynn\'s Legplates of Triumph', '0', '48399', 'Hellscream\'s Legplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48383', 'Wrynn\'s Helmet of Triumph', '0', '48398', 'Hellscream\'s Helmet of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48384', 'Wrynn\'s Gauntlets of Triumph', '0', '48397', 'Hellscream\'s Gauntlets of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48385', 'Wrynn\'s Battleplate of Triumph', '0', '48396', 'Hellscream\'s Battleplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48429', 'Wrynn\'s Greathelm of Conquest', '0', '48458', 'Hellscream\'s Greathelm of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48430', 'Wrynn\'s Greathelm of Triumph', '0', '48463', 'Hellscream\'s Greathelm of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48433', 'Wrynn\'s Greathelm of Triumph', '0', '48468', 'Hellscream\'s Greathelm of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48436', 'Wrynn\'s Breastplate of Conquest', '0', '48456', 'Hellscream\'s Breastplate of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48445', 'Wrynn\'s Legguards of Conquest', '0', '48459', 'Hellscream\'s Legguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48446', 'Wrynn\'s Legguards of Triumph', '0', '48464', 'Hellscream\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48447', 'Wrynn\'s Legguards of Triumph', '0', '48469', 'Hellscream\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48448', 'Wrynn\'s Pauldrons of Conquest', '0', '48460', 'Hellscream\'s Pauldrons of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48449', 'Wrynn\'s Handguards of Conquest', '0', '48457', 'Hellscream\'s Handguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48450', 'Wrynn\'s Breastplate of Triumph', '0', '48461', 'Hellscream\'s Breastplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48451', 'Wrynn\'s Breastplate of Triumph', '0', '48466', 'Hellscream\'s Breastplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48452', 'Wrynn\'s Handguards of Triumph', '0', '48462', 'Hellscream\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48453', 'Wrynn\'s Handguards of Triumph', '0', '48467', 'Hellscream\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48454', 'Wrynn\'s Pauldrons of Triumph', '0', '48465', 'Hellscream\'s Pauldrons of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48455', 'Wrynn\'s Pauldrons of Triumph', '0', '48470', 'Hellscream\'s Pauldrons of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48472', 'Thassarian\'s Helmet of Conquest', '0', '48503', 'Koltira\'s Helmet of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48474', 'Thassarian\'s Battleplate of Conquest', '0', '48501', 'Koltira\'s Battleplate of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48476', 'Thassarian\'s Legplates of Conquest', '0', '48504', 'Koltira\'s Legplates of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48478', 'Thassarian\'s Shoulderplates of Conquest', '0', '48505', 'Koltira\'s Shoulderplates of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48480', 'Thassarian\'s Gauntlets of Conquest', '0', '48502', 'Koltira\'s Gauntlets of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48481', 'Thassarian\'s Battleplate of Triumph', '0', '48500', 'Koltira\'s Battleplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48482', 'Thassarian\'s Gauntlets of Triumph', '0', '48499', 'Koltira\'s Gauntlets of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48483', 'Thassarian\'s Helmet of Triumph', '0', '48498', 'Koltira\'s Helmet of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48484', 'Thassarian\'s Legplates of Triumph', '0', '48497', 'Koltira\'s Legplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48485', 'Thassarian\'s Shoulderplates of Triumph', '0', '48496', 'Koltira\'s Shoulderplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48486', 'Thassarian\'s Shoulderplates of Triumph', '0', '48495', 'Koltira\'s Shoulderplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48487', 'Thassarian\'s Legplates of Triumph', '0', '48494', 'Koltira\'s Legplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48488', 'Thassarian\'s Helmet of Triumph', '0', '48493', 'Koltira\'s Helmet of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48489', 'Thassarian\'s Gauntlets of Triumph', '0', '48492', 'Koltira\'s Gauntlets of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48490', 'Thassarian\'s Battleplate of Triumph', '0', '48491', 'Koltira\'s Battleplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48529', 'Thassarian\'s Faceguard of Conquest', '0', '48560', 'Koltira\'s Faceguard of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48531', 'Thassarian\'s Chestguard of Conquest', '0', '48558', 'Koltira\'s Chestguard of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48533', 'Thassarian\'s Legguards of Conquest', '0', '48561', 'Koltira\'s Legguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48535', 'Thassarian\'s Pauldrons of Conquest', '0', '48562', 'Koltira\'s Pauldrons of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48537', 'Thassarian\'s Handguards of Conquest', '0', '48559', 'Koltira\'s Handguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48538', 'Thassarian\'s Chestguard of Triumph', '0', '48557', 'Koltira\'s Chestguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48539', 'Thassarian\'s Handguards of Triumph', '0', '48556', 'Koltira\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48540', 'Thassarian\'s Faceguard of Triumph', '0', '48555', 'Koltira\'s Faceguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48541', 'Thassarian\'s Legguards of Triumph', '0', '48554', 'Koltira\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48542', 'Thassarian\'s Pauldrons of Triumph', '0', '48553', 'Koltira\'s Pauldrons of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48543', 'Thassarian\'s Pauldrons of Triumph', '0', '48552', 'Koltira\'s Pauldrons of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48544', 'Thassarian\'s Legguards of Triumph', '0', '48551', 'Koltira\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48545', 'Thassarian\'s Faceguard of Triumph', '0', '48550', 'Koltira\'s Faceguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48546', 'Thassarian\'s Handguards of Triumph', '0', '48549', 'Koltira\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48547', 'Thassarian\'s Chestguard of Triumph', '0', '48548', 'Koltira\'s Chestguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48564', 'Turalyon\'s Headpiece of Conquest', '0', '48597', 'Liadrin\'s Headpiece of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48566', 'Turalyon\'s Tunic of Conquest', '0', '48599', 'Liadrin\'s Tunic of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48568', 'Turalyon\'s Greaves of Conquest', '0', '48596', 'Liadrin\'s Greaves of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48572', 'Turalyon\'s Spaulders of Conquest', '0', '48595', 'Liadrin\'s Spaulders of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48574', 'Turalyon\'s Gloves of Conquest', '0', '48598', 'Liadrin\'s Gloves of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48575', 'Turalyon\'s Tunic of Triumph', '0', '48594', 'Liadrin\'s Tunic of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48576', 'Turalyon\'s Gloves of Triumph', '0', '48593', 'Liadrin\'s Gloves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48577', 'Turalyon\'s Headpiece of Triumph', '0', '48592', 'Liadrin\'s Headpiece of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48578', 'Turalyon\'s Greaves of Triumph', '0', '48591', 'Liadrin\'s Greaves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48579', 'Turalyon\'s Spaulders of Triumph', '0', '48590', 'Liadrin\'s Spaulders of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48580', 'Turalyon\'s Spaulders of Triumph', '0', '48585', 'Liadrin\'s Spaulders of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48581', 'Turalyon\'s Greaves of Triumph', '0', '48586', 'Liadrin\'s Greaves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48582', 'Turalyon\'s Headpiece of Triumph', '0', '48587', 'Liadrin\'s Headpiece of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48583', 'Turalyon\'s Gloves of Triumph', '0', '48588', 'Liadrin\'s Gloves of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48584', 'Turalyon\'s Tunic of Triumph', '0', '48589', 'Liadrin\'s Tunic of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48602', 'Turalyon\'s Battleplate of Conquest', '0', '48631', 'Liadrin\'s Battleplate of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48603', 'Turalyon\'s Gauntlets of Conquest', '0', '48630', 'Liadrin\'s Gauntlets of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48604', 'Turalyon\'s Helm of Conquest', '0', '48629', 'Liadrin\'s Helm of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48605', 'Turalyon\'s Legplates of Conquest', '0', '48628', 'Liadrin\'s Legplates of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48606', 'Turalyon\'s Shoulderplates of Conquest', '0', '48627', 'Liadrin\'s Shoulderplates of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48607', 'Turalyon\'s Battleplate of Triumph', '0', '48626', 'Liadrin\'s Battleplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48608', 'Turalyon\'s Gauntlets of Triumph', '0', '48625', 'Liadrin\'s Gauntlets of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48609', 'Turalyon\'s Helm of Triumph', '0', '48624', 'Liadrin\'s Helm of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48610', 'Turalyon\'s Legplates of Triumph', '0', '48623', 'Liadrin\'s Legplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48611', 'Turalyon\'s Shoulderplates of Triumph', '0', '48622', 'Liadrin\'s Shoulderplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48612', 'Turalyon\'s Shoulderplates of Triumph', '0', '48621', 'Liadrin\'s Shoulderplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48613', 'Turalyon\'s Legplates of Triumph', '0', '48620', 'Liadrin\'s Legplates of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48614', 'Turalyon\'s Helm of Triumph', '0', '48619', 'Liadrin\'s Helm of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48615', 'Turalyon\'s Gauntlets of Triumph', '0', '48618', 'Liadrin\'s Gauntlets of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48616', 'Turalyon\'s Battleplate of Triumph', '0', '48617', 'Liadrin\'s Battleplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48632', 'Turalyon\'s Breastplate of Conquest', '0', '48652', 'Liadrin\'s Breastplate of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48633', 'Turalyon\'s Handguards of Conquest', '0', '48653', 'Liadrin\'s Handguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48634', 'Turalyon\'s Faceguard of Conquest', '0', '48654', 'Liadrin\'s Faceguard of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48635', 'Turalyon\'s Legguards of Conquest', '0', '48655', 'Liadrin\'s Legguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48636', 'Turalyon\'s Shoulderguards of Conquest', '0', '48656', 'Liadrin\'s Shoulderguards of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48637', 'Turalyon\'s Shoulderguards of Triumph', '0', '48661', 'Liadrin\'s Shoulderguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48638', 'Turalyon\'s Legguards of Triumph', '0', '48660', 'Liadrin\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48639', 'Turalyon\'s Faceguard of Triumph', '0', '48659', 'Liadrin\'s Faceguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48640', 'Turalyon\'s Handguards of Triumph', '0', '48658', 'Liadrin\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48641', 'Turalyon\'s Breastplate of Triumph', '0', '48657', 'Liadrin\'s Breastplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48642', 'Turalyon\'s Breastplate of Triumph', '0', '48651', 'Liadrin\'s Breastplate of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48643', 'Turalyon\'s Handguards of Triumph', '0', '48650', 'Liadrin\'s Handguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48644', 'Turalyon\'s Faceguard of Triumph', '0', '48649', 'Liadrin\'s Faceguard of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48645', 'Turalyon\'s Legguards of Triumph', '0', '48648', 'Liadrin\'s Legguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48646', 'Turalyon\'s Shoulderguards of Triumph', '0', '48647', 'Liadrin\'s Shoulderguards of Triumph');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48671', 'Drape of Bitter Incantation(258)', '0', '48666', 'Drape of the Sunreavers(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48672', 'Shawl of Fervent Crusader(258)', '0', '48667', 'Shawl of the Devout Crusader(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48673', 'Cloak of the Silver Covenant(258)', '0', '48668', 'Cloak of Serrated Blades(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48674', 'Cloak of the Victorious Combatant(258)', '0', '48669', 'Cloak of the Triumphant Combatant(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48675', 'Cloak of the Unmoving Guardian(258)', '0', '48670', 'Cloak of the Unflinching Guardian(258)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48708', 'Spellstorm Blade(245)', '0', '48701', 'Spellharvest(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48709', 'Heartcrusher(245)', '0', '48693', 'Heartsmasher(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48710', 'Paragon\'s Breadth(245)', '0', '48705', 'Attrition(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48711', 'Rhok\'shalla, the Shadow\'s Bane(245)', '0', '48697', 'Frenzystrike Longbow(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48712', 'The Spinebreaker(245)', '0', '48703', 'The Facebreaker(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48713', 'Lothar\'s Edge(245)', '0', '48695', 'Mor\'kosh, the Bloodreaver(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48714', 'Honor of the Fallen(245)', '0', '48699', 'Blood and Glory(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '48743', 'Kel\'Thuzad\'s Robe ', '0', '47799', 'Gul\'dan\'s Robe of Conquest');
+INSERT INTO `player_factionchange_items` VALUES ('0', '49052', 'Tabard of Conquest(A)', '0', '49054', 'Tabard of Conquest(H)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '49231', 'Boots of the Grieving Soul(232)', '0', '49232', 'Sandals of the Grieving Soul(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '49234', 'Boots of the Grieving Soul(245)', '0', '49233', 'Sandals of the Grieving Soul(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '49235', 'Boots of Tortured Space(232)', '0', '49236', 'Sabatons of Tortured Space(232)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '49238', 'Boots of Tortured Space(245)', '0', '49237', 'Sabatons of Tortured Space(245)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '51377', 'Medallion of the Alliance(264)', '0', '51378', 'Medallion of the Horde(264)');
+INSERT INTO `player_factionchange_items` VALUES ('0', '17691', 'Stormpike Insignia Rank 1', '0', '17690', 'Frostwolf Insignia Rank 1');
+INSERT INTO `player_factionchange_items` VALUES ('0', '17900', 'Stormpike Insignia Rank 2', '0', '17905', 'Frostwolf Insignia Rank 2');
+INSERT INTO `player_factionchange_items` VALUES ('0', '17901', 'Stormpike Insignia Rank 3', '0', '17906', 'Frostwolf Insignia Rank 3');
+INSERT INTO `player_factionchange_items` VALUES ('0', '17902', 'Stormpike Insignia Rank 4', '0', '17907', 'Frostwolf Insignia Rank 4');
+INSERT INTO `player_factionchange_items` VALUES ('0', '17903', 'Stormpike Insignia Rank 5', '0', '17908', 'Frostwolf Insignia Rank 5');
+INSERT INTO `player_factionchange_items` VALUES ('0', '17904', 'Stormpike Insignia Rank 6', '0', '17909', 'Frostwolf Insignia Rank 6');
+INSERT INTO `player_factionchange_items` VALUES ('0', '15198', 'Knight\'s Colors', '0', '15199', 'Stone Guard\'s Herald');
+INSERT INTO `player_factionchange_items` VALUES ('0', '35467', 'Mooncloth Vestments(115)', '0', '35337', 'Mooncloth Vestments(115)');
+INSERT INTO `player_factionchange_items` VALUES (0, 44235, 'Reins of the Traveler\'s Tundra Mammoth', 0, 44234, 'Reins of the Traveler\'s Tundra Mammoth');
+INSERT INTO `player_factionchange_items` VALUES (0, 48073, 'Velen\'s Circlet of Conquest',   0, 48098, 'Zabra\'s Circlet of Conquest');
+INSERT INTO `player_factionchange_items` VALUES (0, 48072, 'Velen\'s Handwraps of Conquest', 0, 48097, 'Zabra\'s Handwraps of Conquest');
+INSERT INTO `player_factionchange_items` VALUES (0, 48074, 'Velen\'s Pants of Conquest',     0, 48099, 'Zabra\'s Pants of Conquest');
+INSERT INTO `player_factionchange_items` VALUES (0, 48075, 'Velen\'s Raiments of Conquest',  0, 48100, 'Zabra\'s Raiments of Conquest');
+INSERT INTO `player_factionchange_items` VALUES (0, 48076, 'Velen\'s Mantle of Conquest',    0, 48101, 'Zabra\'s Mantle of Conquest');
diff --git a/sql_mr/mr02790_mangos_area_spells.sql b/sql_mr/mr02790_mangos_area_spells.sql
new file mode 100644
index 00000000000..a5ffd4a2f01
--- /dev/null
+++ b/sql_mr/mr02790_mangos_area_spells.sql
@@ -0,0 +1,4 @@
+-- Frostmourne area spells
+DELETE FROM `spell_target_position` WHERE `id` = 70860;
+INSERT INTO `spell_target_position` VALUES
+(70860, 631, 529.302, -2124.49, 840.857, 3.1765);
\ No newline at end of file
diff --git a/sql_mr/mr02810_mangos_spell_proc_event.sql b/sql_mr/mr02810_mangos_spell_proc_event.sql
new file mode 100644
index 00000000000..5a46a2b9f54
--- /dev/null
+++ b/sql_mr/mr02810_mangos_spell_proc_event.sql
@@ -0,0 +1,792 @@
+-- Death Knight
+-- (49004) Scent of Blood 
+DELETE FROM spell_proc_event WHERE entry = 49004;
+INSERT INTO spell_proc_event VALUES (49004, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000, 0x00000000, 0x00000000, 0x00000008, 0x00000031, 0, 0, 0);
+
+-- (49200) Acclimation
+DELETE FROM spell_proc_event WHERE entry = 49200;
+INSERT INTO spell_proc_event VALUES (49200, 127, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (48988) Bloody Vengeance
+DELETE FROM spell_proc_event WHERE entry = 48988;
+INSERT INTO spell_proc_event VALUES (48988, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0);
+
+-- (49149) Chill of the Grave
+DELETE FROM spell_proc_event WHERE entry = 49149;
+INSERT INTO spell_proc_event VALUES (49149, 0x00, 0x0F, 0x00000006, 0x00000006, 0x00000006, 0x00020002, 0x00020002, 0x00020002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (66799) Desolation
+DELETE FROM spell_proc_event WHERE entry = 66799;
+INSERT INTO spell_proc_event VALUES (66799, 0x00, 0x0F, 0x00400000, 0x00400000, 0x00400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (49223) Dirge
+DELETE FROM spell_proc_event WHERE entry = 49223;
+INSERT INTO spell_proc_event VALUES (49223, 0x00, 0x0F, 0x00000011, 0x00000011, 0x00000011, 0x08000000, 0x08000000, 0x08000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (55666) Desecration
+DELETE FROM spell_proc_event WHERE entry = 55666;
+INSERT INTO spell_proc_event VALUES (55666, 0x00, 0x0F, 0x00000001,0x00000001, 0x00000001, 0x08000000, 0x08000000, 0x08000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (49194) Unholy Blight
+DELETE FROM spell_proc_event WHERE entry = 49194;
+INSERT INTO spell_proc_event VALUES (49194, 0x00, 0x0F, 0x00002000, 0x00002000, 0x00002000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (49032) Crypt Fever
+DELETE FROM spell_proc_event WHERE entry = 49032;
+INSERT INTO spell_proc_event VALUES (49032, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010010, 0x00000000, 0, 100, 0);
+
+-- (51099) Ebon Plaguebringer
+DELETE FROM spell_proc_event WHERE entry IN (51099, 3439);
+INSERT INTO spell_proc_event VALUES (51099, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010010, 0x00000000, 0, 100, 0);
+
+-- (49222) Bone Shield
+DELETE FROM spell_proc_event WHERE entry = 49222;
+INSERT INTO spell_proc_event VALUES (49222, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000202A8, 0x00000000, 0, 0, 2);
+
+-- (62147) Icy Touch Defense Increase
+DELETE FROM spell_proc_event WHERE entry = 62147;
+INSERT INTO spell_proc_event VALUES (62147, 0x00, 0x0F, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (50880) Icy Talons
+DELETE FROM spell_proc_event WHERE entry = 50880;
+INSERT INTO spell_proc_event VALUES (50880, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x04000000, 0x04000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x00000000, 0, 0, 0);
+
+-- (49467) Death Rune Mastery
+DELETE FROM spell_proc_event WHERE entry IN (49208, 49467, 54639);
+INSERT INTO spell_proc_event VALUES
+(49467, 0x00, 0x0F, 0x00000010, 0x00020000, 0x00000000, 0x00010010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0),
+(49208, 0x00, 0x0F, 0x00400000, 0x00010000, 0x00000000, 0x00010010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0),
+(54639, 0x00, 0x0F, 0x00400000, 0x00010000, 0x00000000, 0x00010010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (70652) Item - Death Knight T10 Tank 4P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70652;
+INSERT INTO spell_proc_event VALUES (70652, 0x00, 0x0F, 0x00000008, 0x00000008, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (67384) Item - Death Knight T9 DPS Relic (Obliterate, Scourge Strike, Death Strike)
+DELETE FROM spell_proc_event WHERE entry = 67384;
+INSERT INTO spell_proc_event VALUES (67384, 0x00, 0x0F, 0x00000010, 0x00000010, 0x00000010, 0x08020000, 0x08020000, 0x08020000, 0x00000080, 0x00000080, 0x00000080, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (67381) Item - Death Knight T9 Tank Relic (Rune Strike)
+DELETE FROM spell_proc_event WHERE entry = 67381;
+INSERT INTO spell_proc_event VALUES (67381, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x20000000, 0x20000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (64964) Item - Death Knight T8 Tank Relic (Rune Strike)
+DELETE FROM spell_proc_event WHERE entry = 64964;
+INSERT INTO spell_proc_event VALUES (64964, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x20000000, 0x20000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (71228) Item - Death Knight T10 Tank Relic (Runestrike)
+DELETE FROM spell_proc_event WHERE entry = 71228;
+INSERT INTO spell_proc_event VALUES (71228, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x20000000, 0x20000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (71226) Item - Death Knight T10 DPS Relic (Obliterate, Scourge Strike, Death Strike)
+DELETE FROM spell_proc_event WHERE entry = 71226;
+INSERT INTO spell_proc_event VALUES (71226, 0x00, 0x0F, 0x00000010, 0x00000010, 0x00000010, 0x08020000, 0x08020000, 0x08020000, 0x00000080, 0x00000080, 0x00000080, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (62459) Chains of Ice Frost Rune Refresh
+DELETE FROM spell_proc_event WHERE entry = 62459;
+INSERT INTO spell_proc_event VALUES (62459, 0x00, 0x0F, 0x00000004, 0x00000004, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (56817) Rune Strike
+DELETE FROM spell_proc_event WHERE entry = 56817;
+INSERT INTO spell_proc_event VALUES
+(56817, 0, 15, 0, 0, 0, 0x20000000, 0x20000000, 0x20000000, 0, 0, 0, 0x10, 0, 0, 0, 0);
+
+-- (51123) Killing Machine 
+DELETE FROM spell_proc_event WHERE entry IN (51123, 51127, 51128, 51129, 51130);
+INSERT INTO spell_proc_event VALUES 
+(51123, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1, 0, 0),
+(51127, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 2, 0, 0),
+(51128, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 3, 0, 0),
+(51129, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 4, 0, 0),
+(51130, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 5, 0, 0);
+
+-- (49217) Wandering Plague
+DELETE FROM spell_proc_event WHERE entry IN (49217, 49654, 49655);
+INSERT INTO spell_proc_event VALUES (49217, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0, 0, 3);
+
+-- (49219) Blood-Caked Blade
+DELETE FROM `spell_proc_event` WHERE `entry` IN (49219);
+INSERT INTO `spell_proc_event` VALUES (49219, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000, 0x00000000, 0, 0, 3);
+
+-- (51209) Hungering Cold
+DELETE FROM `spell_proc_event` WHERE `entry` IN (51209);
+INSERT INTO `spell_proc_event` VALUES (51209, 127, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x00000000, 0, 0, 0);
+
+-- Druid
+-- (16864) Omen of Clarity
+DELETE FROM spell_proc_event WHERE entry = 16864;
+INSERT INTO spell_proc_event VALUES (16864, 0x00, 0x07, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 5, 0, 0);
+
+-- (22812) Barkskin
+DELETE FROM spell_proc_event WHERE entry = 22812;
+
+-- (60726) LK Arena 6 Gladiator's Idol of Steadfastness
+DELETE FROM spell_proc_event WHERE entry = 60726;
+INSERT INTO spell_proc_event VALUES (60726, 0x00, 0x07, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 100, 0);
+
+-- (60701) LK Arena 6 Gladiator's Idol of Resolve
+DELETE FROM spell_proc_event WHERE entry = 60701;
+INSERT INTO spell_proc_event VALUES (60701, 0x00, 0x07, 0x00000000, 0x00000000, 0x00000000, 0x00000440, 0x00000440, 0x00000440, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 100, 0);
+
+-- (71176) Item - Druid T10 Balance Relic (Moonfire and Insect Swarm)
+DELETE FROM spell_proc_event WHERE entry = 71176;
+INSERT INTO spell_proc_event VALUES (71176, 0x00, 0x07, 0x00200002, 0x00200002, 0x00200002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (71174) Item - Druid T10 Feral Relic (Rake and Lacerate)
+DELETE FROM spell_proc_event WHERE entry = 71174;
+INSERT INTO spell_proc_event VALUES (71174, 0x00, 0x07, 0x00001000, 0x00001000, 0x00001000, 0x00000100, 0x00000100, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (71178) Item - Druid T10 Restoration Relic (Rejuvenation)
+DELETE FROM spell_proc_event WHERE entry = 71178;
+INSERT INTO spell_proc_event VALUES (71178, 0x00, 0x07, 0x00000010, 0x00000010, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0);
+
+-- (70723) Item - Druid T10 Balance 4P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70723;
+INSERT INTO spell_proc_event VALUES (70723, 0x00, 0x07, 0x00000005, 0x00000005, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 100, 0);
+
+-- (60724) LK Arena 5 Gladiator's Idol of Steadfastness
+DELETE FROM spell_proc_event WHERE entry = 60724;
+INSERT INTO spell_proc_event VALUES (60724, 0x00, 0x07, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 100, 0);
+
+-- (67353) Item - Druid T9 Feral Relic (Lacerate, Swipe, Mangle, and Shred)
+DELETE FROM spell_proc_event WHERE entry = 67353;
+INSERT INTO spell_proc_event VALUES (67353, 0x00, 0x07, 0x00008000, 0x00008000, 0x00008000, 0x00100500, 0x00100500, 0x00100500, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (67361) Item - Druid T9 Balance Relic (Moonfire)
+DELETE FROM spell_proc_event WHERE entry = 67361;
+INSERT INTO spell_proc_event VALUES (67361, 0x00, 0x07, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (67356) Item - Druid T9 Restoration Relic (Rejuvenation)
+DELETE FROM spell_proc_event WHERE entry = 67356;
+INSERT INTO spell_proc_event VALUES (67356, 0x00, 0x07, 0x00000010, 0x00000010, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00040000, 0, 50, 0);
+
+-- (64952) Item - Druid T8 Feral Relic
+DELETE FROM spell_proc_event WHERE entry  = 64952;
+INSERT INTO spell_proc_event VALUES (64952, 0x00, 0x07, 0x00000000, 0x00000000, 0x00000000, 0x00000440, 0x00000440, 0x00000440, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (48492) King of the Jungle
+DELETE FROM spell_proc_event WHERE entry IN (48492, 48494, 48495);
+INSERT INTO spell_proc_event VALUES (48492, 0x00, 0x07, 524288, 524288, 524288, 0x00000000, 0x00000000, 0x00000000, 2048, 2048, 2048, 16384, 0x00000000, 0, 0, 0);
+
+-- (54815) Glyph of Shred
+DELETE FROM spell_proc_event WHERE entry = 54815;
+INSERT INTO spell_proc_event VALUES (54815, 0x00, 0x07, 0x00008000, 0x00008000, 0x00008000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0, 0, 0);
+
+-- (54845) Glyph of Starfire
+DELETE FROM spell_proc_event WHERE entry = 54845;
+INSERT INTO spell_proc_event VALUES (54845, 0x00, 0x07, 0x00000004, 0x00000004, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0, 0, 0);
+
+-- (64752) Item - Druid T8 Feral 2P Bonus
+DELETE FROM spell_proc_event WHERE entry = 64752;
+INSERT INTO spell_proc_event VALUES (64752, 0x00, 0x07, 0x00801000, 0x00801000, 0x00801000, 0x00000100, 0x00000100, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (54754) Glyph of Rejuvenation
+DELETE FROM spell_proc_event WHERE entry = 54754;
+INSERT INTO spell_proc_event VALUES (54754, 0x00, 0x07, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0);
+
+-- Warrior 
+-- (12317) Enrage
+DELETE FROM spell_proc_event WHERE entry = 12317;
+
+-- (58388) Glyph of Devastate
+DELETE FROM spell_proc_event WHERE entry = 58388;
+INSERT INTO spell_proc_event VALUES (58388, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0x00000040, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 16, 0x00000000, 0, 100, 0);
+
+-- (58375) Glyph of Blocking
+DELETE FROM spell_proc_event WHERE entry = 58375;
+INSERT INTO spell_proc_event VALUES (58375, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000200, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 16, 0x00000000, 0, 100, 0);
+
+-- (29723) Sudden Death
+DELETE FROM spell_proc_event WHERE entry IN (29723, 52437);
+INSERT INTO spell_proc_event VALUES 
+(29723, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0),
+(52437, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 16, 0x00000000, 0, 100, 0);
+
+-- (46945) Safeguard
+DELETE FROM spell_proc_event WHERE entry = 46945;
+INSERT INTO spell_proc_event VALUES (46945, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00010000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0);
+
+-- (58387) Glyph of Sunder Armor
+DELETE FROM spell_proc_event WHERE entry = 58387;
+INSERT INTO spell_proc_event VALUES (58387, 0x00, 0x04, 0x00004000, 0x00004000, 0x00004000, 0x00000040, 0x00000040, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0, 0, 0);
+
+-- (57499) Warbringer
+DELETE FROM spell_proc_event WHERE entry = 57499;
+INSERT INTO spell_proc_event VALUES (57499, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 81920, 0x00000000, 0, 100, 0);
+
+-- (64938) Item - Warrior T8 Melee 2P Bonus
+DELETE FROM spell_proc_event WHERE entry = 64938;
+INSERT INTO spell_proc_event VALUES (64938, 0x00, 0x04, 0x00200040, 0x00200040, 0x00200040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (46910) Furious Attacks
+DELETE FROM spell_proc_event WHERE entry IN (46910, 46911);
+INSERT INTO spell_proc_event VALUES 
+(46910, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1, 0, 0),
+(46911, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 2, 0, 0);
+
+-- (46916) Slam! remove wrong proc conditions
+DELETE FROM `spell_proc_event` WHERE `entry` IN (46916);
+
+-- Shaman 
+-- (71198) Item - Shaman T10 Elemental Relic (Shocks)
+DELETE FROM spell_proc_event WHERE entry = 71198;
+INSERT INTO spell_proc_event VALUES (71198, 0x00, 0x0B, 0x10000000, 0x10000000, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (71217) Item - Shaman T10 Restoration Relic (Riptide)
+DELETE FROM spell_proc_event WHERE entry = 71217;
+INSERT INTO spell_proc_event VALUES (71217, 0x00, 0x0B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000010, 0x00000010, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (71214) Item - Shaman T10 Enhancement Relic (Stormstrike)
+DELETE FROM spell_proc_event WHERE entry = 71214;
+INSERT INTO spell_proc_event VALUES (71214, 0x00, 0x0B, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x01000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (70817) Item - Shaman T10 Elemental 4P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70817;
+INSERT INTO spell_proc_event VALUES (70817, 0x00, 0x0B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0, 0, 0);
+
+-- (70811) Item - Shaman T10 Elemental 2P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70811;
+INSERT INTO spell_proc_event VALUES (70811, 0x00, 0x0B, 0x00000003, 0x00000003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (70830) Item - Shaman T10 Enhancement 2P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70830;
+INSERT INTO spell_proc_event VALUES (70830, 0x00, 0x0B, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00004400, 0x00000000, 0, 0, 0);
+
+-- (67389) Item - Shaman T9 Restoration Relic (Chain Heal)
+DELETE FROM spell_proc_event WHERE entry = 67389;
+INSERT INTO spell_proc_event VALUES (67389, 0x00, 0x0B, 0x00000100, 0x00000100, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (67392) Item - Shaman T9 Enhancement Relic (Lava Lash)
+DELETE FROM spell_proc_event WHERE entry = 67392;
+INSERT INTO spell_proc_event VALUES (67392, 0x00, 0x0B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000004, 0x00000004, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (67386) Item - Shaman T9 Elemental Relic (Lightning Bolt)
+DELETE FROM spell_proc_event WHERE entry = 67386;
+INSERT INTO spell_proc_event VALUES (67386, 0x00, 0x0B, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (60765) Nax 25 Melee Shaman Totem
+DELETE FROM spell_proc_event WHERE entry = 60765;
+INSERT INTO spell_proc_event VALUES (60765, 0x00, 0x0B, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x01000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0, 100, 0);
+
+-- (60770) Totem of the Elemental Plane
+DELETE FROM spell_proc_event WHERE entry = 60770;
+INSERT INTO spell_proc_event VALUES (60770, 0x00, 0x0B, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (43750) Energized
+DELETE FROM spell_proc_event WHERE entry = 43750;
+INSERT INTO spell_proc_event VALUES (43750, 0x00, 0x0B, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (51940) Earthliving Weapon (Passive)
+DELETE FROM spell_proc_event WHERE entry = 51940;
+INSERT INTO spell_proc_event VALUES (51940, 0x00, 0x0B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (51521) Improved Stormstrike
+UPDATE spell_proc_event SET SchoolMask = 0, SpellFamilyName = 11, SpellFamilyMaskB0 = 0x01000010, SpellFamilyMaskB1 = 0x01000010, SpellFamilyMaskB2 = 0x01000010 WHERE entry = 51521;
+
+-- (974) Earth Shield
+DELETE FROM spell_proc_event WHERE entry = 974;
+INSERT INTO spell_proc_event VALUES (974, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000222A8, 0x00000000, 0, 0, 2);
+
+-- (324) Lightning Shield
+DELETE FROM spell_proc_event WHERE entry = 324;
+INSERT INTO spell_proc_event VALUES (324, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 2);
+
+-- (16166) Elemental Mastery
+DELETE FROM spell_proc_event WHERE entry = 16166;
+INSERT INTO spell_proc_event VALUES (16166, 0x00, 0x0B, 0x00000003, 0x00000000, 0x00000000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- Paladin
+-- (70756) Item - Paladin T10 Holy 4P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70756;
+INSERT INTO spell_proc_event VALUES (70756, 0x00, 0x0A, 0x00200000, 0x00200000, 0x00200000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 16384, 0x00000000, 0, 0, 0);
+
+-- (71194) Item - Paladin T10 Protection Relic (Shield of Righteousness)
+DELETE FROM spell_proc_event WHERE entry = 71194;
+INSERT INTO spell_proc_event VALUES (71194, 0x00, 0x0A, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x00100000, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (71191) Item - Paladin T10 Holy Relic (Holy Shock)
+DELETE FROM spell_proc_event WHERE entry = 71191;
+INSERT INTO spell_proc_event VALUES (71191, 127, 0x0A, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00010000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (71186) Item - Paladin T10 Retribution Relic (Crusader Strike)
+DELETE FROM spell_proc_event WHERE entry = 71186;
+INSERT INTO spell_proc_event VALUES (71186, 0x00, 0x0A, 0x00000000, 0x00000000, 0x00000000, 0x00008000, 0x00008000, 0x00008000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (70755) Item - Paladin T10 Holy 2P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70755;
+INSERT INTO spell_proc_event VALUES (70755, 0x00, 0x0A, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0, 100, 0);
+
+-- (70761) Item - Paladin T10 Protection 4P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70761;
+INSERT INTO spell_proc_event VALUES (70761, 0x00, 0x0A, 0x00000000, 0x00000000, 0x00000000, 0x80004000, 0x00000000, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (70765) Item - Paladin T10 Retribution 2P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70765;
+INSERT INTO spell_proc_event VALUES (70765, 0x00, 0x0A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (67365) Item - Paladin T9 Retribution Relic
+DELETE FROM spell_proc_event WHERE entry = 67365;
+INSERT INTO spell_proc_event VALUES (67365, 0x00, 0x0A, 0x00000000, 0x00000000, 0x00000000, 0x00400800, 0x00400800, 0x00400800, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (67379) Item - Paladin T9 Protection Relic (Hammer of The Righteous)
+DELETE FROM spell_proc_event WHERE entry = 67379;
+INSERT INTO spell_proc_event VALUES (67379, 0x00, 0x0A, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00040000, 0x00040000,  0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (67363) Item - Paladin T9 Holy Relic (Judgement)
+DELETE FROM spell_proc_event WHERE entry = 67363;
+INSERT INTO spell_proc_event VALUES (67363, 0x00, 0x0A, 0x80000000, 0x80000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (60635) LK Arena 5 Gladiator's Libram of Fortitude
+DELETE FROM spell_proc_event WHERE entry = 60635;
+INSERT INTO spell_proc_event VALUES (60635, 0x00, 0x0A, 0x00000000, 0x00000000, 0x00000000, 0x00008000, 0x00008000, 0x00008000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0, 100, 0);
+
+-- (60636) LK Arena 6 Gladiator's Libram of Fortitude
+DELETE FROM spell_proc_event WHERE entry = 60636;
+INSERT INTO spell_proc_event VALUES (60636, 0x00, 0x0A, 0x00000000, 0x00000000, 0x00000000, 0x00008000, 0x00008000, 0x00008000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0, 100, 0);
+
+-- (53601) Sacred Shield
+DELETE FROM spell_proc_event WHERE entry IN (53601);
+INSERT INTO spell_proc_event VALUES (53601, 0x7F, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00108000, 0x00000000, 0, 0, 6);
+
+-- (34753) Holy Concentration
+DELETE FROM spell_proc_event WHERE entry IN (34753, 34859, 34860);
+INSERT INTO spell_proc_event VALUES (34753, 0x00, 0x06, 0x00001800, 0x00001800, 0x00001800, 0x00000004, 0x00000004, 0x00000004, 0x000001000, 0x00001000, 0x00001000, 0x00000000, 0x00000002, 0, 0, 0);
+
+-- (53527) Divine Guardian
+DELETE FROM spell_proc_event where entry = 53527;
+
+-- Mage
+-- (12654) Ignite
+DELETE FROM spell_proc_event WHERE entry = 12654;
+INSERT INTO spell_proc_event VALUES (12654, 0x00, 0x03, 0x08000000, 0x08000000, 0x08000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0, 100, 0);
+
+-- (31571) Arcane Potency
+DELETE FROM spell_proc_event WHERE entry = 31571;
+INSERT INTO spell_proc_event VALUES (31571, 0x00, 0x03, 0x00000000, 0x00000000, 0x00000000, 0x00000022, 0x00000022, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 16384, 0x00000000, 0, 100, 0);
+
+-- (36032) Arcane Blast
+DELETE FROM spell_proc_event WHERE entry = 36032;
+INSERT INTO spell_proc_event VALUES (36032, 0x40, 0x03, 0x20000000, 0x9000, 0x00000000, 0x9000, 0x00000000, 0x00000000, 0x9000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (44404) Missile Barrage
+DELETE FROM spell_proc_event WHERE entry IN (44404, 54486, 54488, 54489, 54490);
+INSERT INTO spell_proc_event VALUES (44404, 0x00, 0x03, 0x20000021, 0x20000021, 0x20000021, 0x00009000, 0x00009000, 0x00009000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (44557) Improved Water Elemental
+DELETE FROM spell_proc_event WHERE entry = 44557;
+INSERT INTO spell_proc_event VALUES (44557, 0x00, 0x03, 0x00000020, 0x00000020, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (31571) Arcane Potency
+DELETE FROM spell_proc_event WHERE entry = 31571;
+INSERT INTO spell_proc_event VALUES (31571, 0x00, 0x03, 0x00000000, 0x00000000, 0x00000000, 0x00000022, 0x00000022, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0);
+
+-- (64343) Impact
+DELETE FROM spell_proc_event WHERE entry = 64343;
+INSERT INTO spell_proc_event VALUES (64343, 0x00, 0x03, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (56374) Glyph of Icy Veins
+DELETE FROM spell_proc_event WHERE entry = 56374;
+INSERT INTO spell_proc_event VALUES (56374, 0x00, 0x03, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00004000, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0);
+
+-- (11213) Arcane Concentration
+DELETE FROM spell_proc_event WHERE entry = 11213;
+INSERT INTO spell_proc_event VALUES (11213, 0x00, 0x03, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0, 0, 0);
+
+-- (57761) Brain Freeze
+DELETE FROM spell_proc_event WHERE entry = 57761;
+INSERT INTO spell_proc_event VALUES (57761, 0x00, 0x03, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00080000, 0, 0, 0);
+
+-- (44401) Missile Barrage
+DELETE FROM spell_proc_event WHERE entry = 44401;
+
+-- (44445) Hot Streak
+DELETE FROM spell_proc_event WHERE entry = 44445;
+INSERT INTO spell_proc_event VALUES (44445, 0x0, 0x03, 0x13, 0x13, 0x13, 0x011000, 0x011000, 0x011000, 0, 0, 0, 0, 0, 0, 0, 0);
+
+-- Warlock
+-- (63156) Decimation
+DELETE FROM spell_proc_event WHERE entry = 63156;
+INSERT INTO spell_proc_event VALUES (63156, 0x00, 0x05, 0x00000001, 0x00000001, 0x00000001, 0x000000C0, 0x000000C0, 0x000000C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (47230) Fel Synergy
+DELETE FROM spell_proc_event WHERE entry IN (47230, 47231, 54181);
+INSERT INTO spell_proc_event VALUES (47230, 0x7F, 0x05, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (17793) Improved Shadow Bolt 
+DELETE FROM spell_proc_event WHERE entry IN (17793, 17796, 17801, 17802, 17803);
+INSERT INTO spell_proc_event VALUES (17793, 0x00, 0x05, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00014000, 0x00000000, 0, 0, 0);
+
+-- (70841) Item - Warlock T10 4P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70841;
+INSERT INTO spell_proc_event VALUES (70841, 0x00, 0x05, 0x00000004, 0x00000000, 0x00000000, 0x00000100, 0x00000100, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (34936) Backlash
+DELETE FROM spell_proc_event WHERE entry = 34936;
+INSERT INTO spell_proc_event VALUES (34936, 0x00, 0x05, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00080000, 0, 0, 0);
+
+-- Priest
+-- (59907) Lightwell Charges
+DELETE FROM spell_proc_event WHERE entry = 59907;
+INSERT INTO spell_proc_event VALUES (59907, 0x00, 0x06, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00004000, 0x00004000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (32409) Shadow Word: Death
+DELETE FROM spell_proc_event WHERE entry = 32409;
+
+-- (33151) Surge of Light (Rank 1)
+DELETE FROM spell_proc_event WHERE entry = 33151;
+
+-- Rogue
+-- (51698) Honored Among Thieves
+DELETE FROM spell_proc_event WHERE entry = 51698;
+
+-- (70805) Item - Rogue T10 2P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70805;
+INSERT INTO spell_proc_event VALUES (70805, 0x00, 0x08, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (70803) Item - Rogue T10 4P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70803;
+INSERT INTO spell_proc_event VALUES (70803, 0x00, 0x08, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (14186) Seal Fate
+DELETE FROM spell_proc_event WHERE entry = 14186;
+INSERT INTO spell_proc_event VALUES (14186, 0x00, 0x08, 0x4200070E, 0x4200070E, 0x4200070E, 0x00000006, 0x00000006, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0);
+
+-- (14156) Ruthlessness
+DELETE FROM spell_proc_event WHERE entry = 14156;
+INSERT INTO spell_proc_event VALUES (14156, 0x00, 0x08, 0x003E0000, 0x003E0000, 0x003E0000, 0x00000009, 0x00000009, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (13983) Setup
+DELETE FROM spell_proc_event WHERE entry = 13983;
+INSERT INTO spell_proc_event VALUES (13983, 0x00, 0x08, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000018, 0, 0, 0);
+
+-- (51692) Waylay 
+DELETE FROM spell_proc_event WHERE entry = 51692;
+INSERT INTO spell_proc_event VALUES (51692, 0x00, 0x08, 0x00000204, 0x00000204, 0x00000204, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (56800) Glyph of Backstab
+DELETE FROM spell_proc_event WHERE entry = 56800;
+INSERT INTO spell_proc_event VALUES (56800, 0x00, 0x08, 0x00000004, 0x00000004, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0, 0, 0);
+
+-- Hunter
+-- (64860) Item - Hunter T8 4P Bonus
+DELETE FROM spell_proc_event WHERE entry = 64860;
+INSERT INTO spell_proc_event VALUES (64860, 0x00, 0x09, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); 
+
+-- (67151) Item - Hunter T9 4P Bonus (Steady Shot)
+DELETE FROM spell_proc_event WHERE entry = 67151;
+INSERT INTO spell_proc_event VALUES (67151, 0x00, 0x09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (70727) Item - Hunter T10 2P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70727;
+INSERT INTO spell_proc_event VALUES (70727, 0x00, 0x09, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (70730) Item - Hunter T10 4P Bonus
+DELETE FROM spell_proc_event WHERE entry = 70730;
+INSERT INTO spell_proc_event VALUES (70730, 0x00, 0x09, 0x00004000, 0x00004000, 0x00004000, 0x00000100, 0x00000100, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (56342) Lock and Load
+DELETE FROM spell_proc_event WHERE entry = 56342;
+INSERT INTO spell_proc_event VALUES (56342, 0x00, 0x09, 0x00000018, 0x00000018, 0x00000018, 0x08000000, 0x08000000, 0x08000000, 0x00064000, 0x00064000, 0x00064000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (53234) Piercing Shots
+DELETE FROM spell_proc_event WHERE entry = 53234;
+INSERT INTO spell_proc_event VALUES (53234, 0x00, 0x09, 0x00020000, 0x00020000, 0x00020000, 0x00000001, 0x00000001, 0x00000001, 0x00000801, 0x00000801, 0x00000801, 0x00000000, 0x00000002, 0, 0, 0);
+
+-- (19184) Entrapment
+DELETE FROM spell_proc_event WHERE entry = 19184;
+INSERT INTO spell_proc_event VALUES (19184, 0x00, 0x09, 0x00000000, 0x00000000, 0x00000000, 0x00002000, 0x00002000, 0x00002000, 0x00040000, 0x00040000, 0x00040000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (53257) Cobra Strikes
+DELETE FROM spell_proc_event WHERE entry = 53257;
+INSERT INTO spell_proc_event VALUES (53257, 0x00, 0x09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00011010, 0x00000002, 0, 100, 0);
+
+-- (61680) Culling the Herd
+DELETE FROM spell_proc_event WHERE entry = 61680;
+INSERT INTO spell_proc_event VALUES (61680, 0x00000000, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0);
+
+-- Trinkets, rings, weapon procs, enchants etc.
+-- Information about procchance and procflag undertakes with DBC.
+-- (55640) Lightweave Embroidery
+DELETE FROM spell_proc_event WHERE entry = 55640;
+INSERT INTO spell_proc_event VALUES (55640, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (57345) Darkmoon Card: Greatness
+DELETE FROM spell_proc_event WHERE entry = 57345;
+INSERT INTO spell_proc_event VALUES (57345, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (60487) Extract of Necromatic Power
+DELETE FROM spell_proc_event WHERE entry = 60487;
+INSERT INTO spell_proc_event VALUES (60487, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 15);
+
+-- (60490) Embrace of the Spider
+DELETE FROM spell_proc_event WHERE entry = 60490;
+INSERT INTO spell_proc_event VALUES (60490, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (58901) Tears of Anguish
+DELETE FROM spell_proc_event WHERE entry = 58901;
+INSERT INTO spell_proc_event VALUES (58901, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (64786) Comet's Trail
+DELETE FROM spell_proc_event WHERE entry = 64786;
+INSERT INTO spell_proc_event VALUES (64786, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (65005) Alacrity of the Elements
+DELETE FROM spell_proc_event WHERE entry = 65005;
+INSERT INTO spell_proc_event VALUES (65005, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (67670) Coliseum 5 CasterTrinket
+DELETE FROM spell_proc_event WHERE entry = 67670;
+INSERT INTO spell_proc_event VALUES (67670, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (64714) Flame of the Heavens
+DELETE FROM spell_proc_event WHERE entry = 64714;
+INSERT INTO spell_proc_event VALUES (64714, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (62114) Flow of Knowledge
+DELETE FROM spell_proc_event WHERE entry = 62114;
+INSERT INTO spell_proc_event VALUES (62114, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (64742) Pandora's Plea
+DELETE FROM spell_proc_event WHERE entry = 64742;
+INSERT INTO spell_proc_event VALUES (64742, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (62115) Strength of the Titans
+DELETE FROM spell_proc_event WHERE entry = 62115;
+INSERT INTO spell_proc_event VALUES (62115, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (65013) Pyrite Infusion
+DELETE FROM spell_proc_event WHERE entry = 65013;
+INSERT INTO spell_proc_event VALUES (65013, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (65025) Dark Matter
+DELETE FROM spell_proc_event WHERE entry = 65025;
+INSERT INTO spell_proc_event VALUES (65025, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (64738) Show of Faith
+DELETE FROM spell_proc_event WHERE entry = 64738;
+INSERT INTO spell_proc_event VALUES (64738, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (65002) Bonus Mana Regen
+DELETE FROM spell_proc_event WHERE entry = 65002;
+INSERT INTO spell_proc_event VALUES (65002, 127, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71892) Item - Icecrown 25 Heroic Dagger Proc
+DELETE FROM spell_proc_event WHERE entry = 71892;
+INSERT INTO spell_proc_event VALUES (71892, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 37, 45);
+
+-- (71880) Item - Icecrown 25 Normal Dagger Proc
+DELETE FROM spell_proc_event WHERE entry = 71880;
+INSERT INTO spell_proc_event VALUES (71880, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 37, 45);
+
+-- (71873) Item - Icecrown 25 Heroic Tank Weapon Proc
+DELETE FROM spell_proc_event WHERE entry = 71873;
+INSERT INTO spell_proc_event VALUES (71873, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71871) Item - Icecrown 25 Normal Tank Weapon Proc
+DELETE FROM spell_proc_event WHERE entry = 71871;
+INSERT INTO spell_proc_event VALUES (71871, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (72413) Item - Icecrown Reputation Ring Melee
+DELETE FROM spell_proc_event WHERE entry = 72413;
+INSERT INTO spell_proc_event VALUES (72413, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (64792) Blood of the Old God
+DELETE FROM spell_proc_event WHERE entry = 64792;
+INSERT INTO spell_proc_event VALUES (64792, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (33953) Essence of Life
+DELETE FROM spell_proc_event WHERE entry = 33953;
+INSERT INTO spell_proc_event VALUES (33953, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (60063) Now is the Time!
+DELETE FROM spell_proc_event WHERE entry = 60063;
+INSERT INTO spell_proc_event VALUES (60063, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (60493) Dying Curse
+DELETE FROM spell_proc_event WHERE entry = 60493;
+INSERT INTO spell_proc_event VALUES (60493, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71611) Item - Icecrown 25 Normal Healer Trinket 2
+DELETE FROM spell_proc_event WHERE entry = 71611;
+INSERT INTO spell_proc_event VALUES (71611, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71540) Item - Icecrown 10 Heroic Melee Trinket
+DELETE FROM spell_proc_event WHERE entry = 71540;
+INSERT INTO spell_proc_event VALUES (71540, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71402) Item - Icecrown 10 Normal Melee Trinket
+DELETE FROM spell_proc_event WHERE entry = 71402;
+INSERT INTO spell_proc_event VALUES (71402, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71602) Item - Icecrown 25 Normal Caster Trinket 1 Base
+DELETE FROM spell_proc_event WHERE entry = 71602;
+INSERT INTO spell_proc_event VALUES (71602, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71637) Item - Icecrown 25 Heroic Caster Trinket 2
+DELETE FROM spell_proc_event WHERE entry = 71637;
+INSERT INTO spell_proc_event VALUES (71637, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71606) Item - Icecrown 25 Normal Caster Trinket 2
+DELETE FROM spell_proc_event WHERE entry = 71606;
+INSERT INTO spell_proc_event VALUES (71606, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71645) Item - Icecrown 25 Heroic Caster Trinket 1 Base
+DELETE FROM spell_proc_event WHERE entry = 71645;
+INSERT INTO spell_proc_event VALUES (71645, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (67653) Coliseum 5 Tank Trinket
+DELETE FROM spell_proc_event WHERE entry = 67653;
+INSERT INTO spell_proc_event VALUES (67653, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (67672) Coliseum 5 Melee Trinket
+DELETE FROM spell_proc_event WHERE entry = 67672;
+INSERT INTO spell_proc_event VALUES (67672, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (67667) Coliseum 5 Healer Trinket
+DELETE FROM spell_proc_event WHERE entry = 67667;
+INSERT INTO spell_proc_event VALUES (67667, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (64415) Val'anyr Hammer of Ancient Kings - Equip Effect
+DELETE FROM spell_proc_event WHERE entry = 64415;
+INSERT INTO spell_proc_event VALUES (64415, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71519) Item - Icecrown 25 Normal Melee Trinket
+DELETE FROM spell_proc_event WHERE entry = 71519;
+INSERT INTO spell_proc_event VALUES (71519, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 105);
+
+-- (71562) Item - Icecrown 25 Heroic Melee Trinket
+DELETE FROM spell_proc_event WHERE entry = 71562;
+INSERT INTO spell_proc_event VALUES (71562, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 105);
+
+-- (71397) Item - Icecrown 25 Emblem Melee Trinket
+DELETE FROM spell_proc_event WHERE entry = 71397;
+
+-- (71404) Item - Icecrown Dungeon Melee Trinket
+DELETE FROM spell_proc_event WHERE entry = 71404;
+INSERT INTO spell_proc_event VALUES (71404, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (33648) Reflection of Torment
+DELETE FROM spell_proc_event WHERE entry = 33648;
+INSERT INTO spell_proc_event VALUES (33648, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (61356) Invigorating Earthsiege Diamond Passive
+DELETE FROM spell_proc_event WHERE entry = 61356;
+INSERT INTO spell_proc_event VALUES (61356, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (67712, 67758) Item - Coliseum 25 Caster Trinkets
+DELETE FROM spell_proc_event WHERE entry = 67758;
+INSERT INTO spell_proc_event VALUES (67758, 0x3F, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 2);
+DELETE FROM spell_proc_event WHERE entry = 67712;
+INSERT INTO spell_proc_event VALUES (67712, 0x3F, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 2);
+
+-- (72415) Item - Icecrown Reputation Ring Tank Trigger
+DELETE FROM spell_proc_event WHERE entry = 72415;
+INSERT INTO spell_proc_event VALUES (72415, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71585) Item - Icecrown 25 Emblem Healer Trinket
+DELETE FROM spell_proc_event WHERE entry = 71585;
+INSERT INTO spell_proc_event VALUES (71585, 127, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45);
+
+-- (71845) Item - Icecrown 25 Normal Caster Weapon Proc
+DELETE FROM spell_proc_event WHERE entry = 71845;
+INSERT INTO spell_proc_event VALUES (71845, 0x3F, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (72419) Item - Icecrown Reputation Ring Healer Trigger
+DELETE FROM spell_proc_event WHERE entry = 72419;
+INSERT INTO spell_proc_event VALUES (72419, 127, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- (41989) Fists of Fury
+DELETE FROM spell_proc_event WHERE entry = 41989;
+INSERT INTO spell_proc_event VALUES (41989, 127, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 3);
+
+-- (6770) Sap
+DELETE FROM `spell_proc_event` WHERE `entry` IN (6770);
+INSERT INTO `spell_proc_event` VALUES (6770, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x00000000, 0, 100, 0);
+
+-- (47201) Everlasting Affliction (1)
+DELETE FROM `spell_proc_event` WHERE `entry` IN (47201);
+INSERT INTO `spell_proc_event` VALUES (47201, 0x00, 0x05, 0x00004009, 0x00000000, 0x00000000, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000403, 0, 0, 0);
+
+-- (51124) Killing Machine
+DELETE FROM spell_proc_event WHERE entry IN (51124);
+INSERT INTO spell_proc_event VALUES (51124, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010010, 0x00080000, 0, 0, 0);
+
+-- (49796) Deathchill
+DELETE FROM spell_proc_event WHERE entry IN (49796);
+INSERT INTO spell_proc_event VALUES (49796, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010010, 0x00080000, 0, 0, 0);
+
+-- (56453) Lock and load triggered
+DELETE FROM `spell_proc_event` WHERE `entry` IN (56453);
+INSERT INTO `spell_proc_event` VALUES (56453, 0x00, 0x09, 0x00000800, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00080000, 0, 0, 0);
+
+-- (64869) Item - Mage T8 4P Bonus
+DELETE FROM `spell_proc_event` WHERE `entry` IN (64869);
+INSERT INTO `spell_proc_event` VALUES (64869, 0x00, 0x03, 0x00600021, 0x00000000, 0x00000000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00010000, 0, 0, 0);
+
+-- (11129) Combustion
+DELETE FROM `spell_proc_event` WHERE `entry` IN (11129);
+INSERT INTO `spell_proc_event` VALUES (11129, 0x00, 0x03, 0x08C00017, 0x00031048, 0x00000000, 0x00011000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000403, 0, 0, 0);
+
+-- (15337) Improved Spirit Tap
+DELETE FROM `spell_proc_event` WHERE `entry` IN (15337);
+INSERT INTO `spell_proc_event` VALUES (15337, 0x20, 0x06, 0x00802000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0);
+
+-- (50871) Savage Rend
+DELETE FROM `spell_proc_event` WHERE `entry` IN (50871);
+INSERT INTO `spell_proc_event` VALUES (50871, 0x00, 0x09, 0x00000000, 0x00000000, 0x00000000, 0x40000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000002, 0, 0, 0);
+
+-- (64882) Item - Paladin T8 Protection 4P Bonus
+DELETE FROM `spell_proc_event` WHERE `entry` IN (64882);
+INSERT INTO `spell_proc_event` VALUES (64882, 0x00, 0x0A, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
+
+-- Fingers of Frost talent auras proc
+DELETE FROM `spell_proc_event` WHERE `entry` IN (44543, 44545);
+INSERT INTO `spell_proc_event` VALUES
+(44543,0,0x03,0x021002A0,0x021002A0,0x021002A0,0x1000,0,0,0,0,0,0,0,0,0,0),
+(44545,0,0x03,0x021002A0,0x021002A0,0x021002A0,0x1000,0,0,0,0,0,0,0,0,0,0);
+
+-- Fingers of Frost buff aura charges dropping
+DELETE FROM `spell_proc_event` WHERE `entry` IN (74396);
+INSERT INTO `spell_proc_event` VALUES (74396, 0x10, 0x03, 0x28E212F7, 0x28E212F7, 0x28E212F7, 0x119048, 0x119048, 0x119048, 0, 0, 0, 0x10000, 0, 0, 0, 0);
+
+-- Item - Icecrown 25 Normal/Heroic Healer Weapon Proc
+DELETE FROM `spell_proc_event` WHERE `entry` IN (71865, 71868);
+INSERT INTO `spell_proc_event` VALUES
+(71865, 0x7F, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0, 0, 0x00010000, 0, 0, 0),
+(71868, 0x7F, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0, 0, 0x00010000, 0, 0, 0);
+
+-- Item - Icecrown 25 Normal/Heroic Ranged Weapon Proc
+DELETE FROM `spell_proc_event` WHERE `entry` IN (71835, 71836);
+INSERT INTO `spell_proc_event` VALUES
+(71835, 0x01, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0, 0, 0, 0, 0, 0),
+(71836, 0x01, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0, 0, 0, 0, 0, 0);
+
+-- (16164) Elemental Focus
+DELETE FROM `spell_proc_event` WHERE `entry` IN (16164);
+INSERT INTO `spell_proc_event` VALUES (16164, 0x1C, 0x0B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00015550, 0x00000002, 0, 0, 0);
+
+-- Pet
+-- (53178) Guard Dog
+DELETE FROM spell_proc_event WHERE entry IN (53178, 53179);
+INSERT INTO spell_proc_event (entry, SchoolMask, SpellFamilyName, SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2, procFlags, procEx, ppmRate, CustomChance, Cooldown) VALUES
+(53178, 0x00, 9, 0x00000000, 0x10000000, 0x00000000, 0x00010000, 0x00000000, 0, 100, 0);
+DELETE FROM `spell_chain` WHERE `first_spell` IN (53178); -- delete this!
+
+-- Pet
+-- (62764) Silverback
+DELETE FROM spell_proc_event WHERE entry IN (62764, 62765);
+INSERT INTO spell_proc_event (entry, SchoolMask, SpellFamilyName, SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2, procFlags, procEx, ppmRate, CustomChance, Cooldown) VALUES
+(62764, 0x00, 9, 0x00000000, 0x10000000, 0x00000000, 0x00010000, 0x00000000, 0, 100, 0);
+DELETE FROM `spell_chain` WHERE `first_spell` IN (62764); -- delete this!
+
+-- (70805) Item - Rogue T10 2P Bonus (Rank 3)
+DELETE FROM `spell_proc_event` WHERE `entry` IN (70805);
+INSERT INTO `spell_proc_event` VALUES (70805, 0x00, 0x08, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004400, 0x00000000, 0, 100, 0);
+
+-- (70664) Item - Druid T10 Restoration 4P Bonus (Rejuvenation)
+DELETE FROM `spell_proc_event` WHERE `entry` IN (70664);
+INSERT INTO `spell_proc_event` VALUES (70664, 0x00, 0x07, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00040000, 0, 2, 0);
+
+-- (48539) Revitalize (Rank 1)
+DELETE FROM `spell_proc_event` WHERE `entry` IN (48539, 48544, 48545);
+INSERT INTO `spell_proc_event` VALUES (48539, 0x00, 0x07, 0x00000010, 0x00000000, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00040000, 0, 101, 0);
diff --git a/sql_mr/mr02828_mangos_spell_linked.sql b/sql_mr/mr02828_mangos_spell_linked.sql
new file mode 100644
index 00000000000..240514d478b
--- /dev/null
+++ b/sql_mr/mr02828_mangos_spell_linked.sql
@@ -0,0 +1,5 @@
+
+DELETE FROM `spell_linked` WHERE `entry` IN (7744, 42292);
+INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `effect_mask`, `comment`) VALUES
+( 7744, 72757, 11, 0, 'Will of the Forsaken -> CD for PvP Trinket'),
+(42292, 72752, 11, 0, 'PvP Trinket -> CD for Will of the Forsaken');
diff --git a/sql_mr/mr02868_mangos_totems.sql b/sql_mr/mr02868_mangos_totems.sql
new file mode 100644
index 00000000000..edbbf31bde4
--- /dev/null
+++ b/sql_mr/mr02868_mangos_totems.sql
@@ -0,0 +1,12 @@
+/* Stoneclaw Totem */
+INSERT INTO creature_spell (guid, spell, `index`, active, disabled, flags) VALUES 
+('3579', '55328', '1', '0', '0', '0'),
+('3911', '55329', '1', '0', '0', '0'),
+('3912', '55330', '1', '0', '0', '0'),
+('3913', '55332', '1', '0', '0', '0'),
+('7398', '55333', '1', '0', '0', '0'),
+('7399', '55335', '1', '0', '0', '0'),
+('15478', '55278', '1', '0', '0', '0'),
+('31120', '58589', '1', '0', '0', '0'),
+('31121', '58590', '1', '0', '0', '0'),
+('31122', '58591', '1', '0', '0', '0');
diff --git a/sql_mr/mr02910_mangos_dungeon_encounters.sql b/sql_mr/mr02910_mangos_dungeon_encounters.sql
new file mode 100644
index 00000000000..a4bd464c503
--- /dev/null
+++ b/sql_mr/mr02910_mangos_dungeon_encounters.sql
@@ -0,0 +1,616 @@
+-- Implement DBC encounters
+TRUNCATE TABLE `instance_encounters`;
+
+INSERT INTO `instance_encounters` (`entry`, `creditType`, `creditEntry`, `lastEncounterDungeon`, `comment`) VALUES
+(161,0,644,0, 'Rhahk''zor'),
+(162,0,643,0, 'Sneed'),
+(163,0,1763,0, 'Gilnid'),
+(164,0,646,0, 'Mr. Smite'),
+(165,0,645,0, 'Cookie'),
+(166,0,647,0, 'Captain Greenskin'),
+(167,0,639,6, 'Edwin VanCleef'),
+(201,0,18371,0, 'Shirrak the Dead Watcher'),
+(202,0,18373,149, 'Exarch Maladaar'),
+(203,0,18341,0, 'Pandemonius'),
+(204,0,18343,0, 'Tavarok'),
+(205,0,18344,148, 'Nexus-Prince Shaffar'),
+(206,0,18472,0, 'Darkweaver Syth'),
+(207,0,18473,150, 'Talon King Ikiss'),
+(208,0,18731,0, 'Ambassador Hellmaw'),
+(209,0,18667,0, 'Blackheart the Inciter'),
+(210,0,18732,0, 'Grandmaster Vorpil'),
+(211,0,18708,151, 'Murmur'),
+(212,0,29309,0, 'Elder Nadox'),
+(213,0,29308,0, 'Prince Taldaram'),
+(214,0,29310,0, 'Jedoga Shadowseeker'),
+(215,0,29311,218, 'Herald Volazj'),
+(216,0,28684,0, 'Krik''thir the Gatewatcher'),
+(217,0,28921,0, 'Hadronox'),
+(218,0,29120,204, 'Anub''arak'),
+(219,0,4887,0, 'Ghamoo-ra'),
+(220,0,4831,0, 'Lady Sarevess'),
+(221,0,6243,0, 'Gelihast'),
+(222,0,12902,0, 'Lorgus Jett'),
+(224,0,4830,0, 'Old Serra''kis'),
+(225,0,4832,0, 'Twilight Lord Kelris'),
+(226,0,4829,10, 'Aku''mai'),
+(227,0,9018,30, 'High Interrogator Gerstahn'),
+(228,0,9025,0, 'Lord Roccor'),
+(229,0,9319,0, 'Houndmaster Grebmar'),
+(230,0,10096,0, 'Ring of Law'),
+(231,0,9024,0, 'Pyromancer Loregrain'),
+(232,0,9017,0, 'Lord Incendius'),
+(233,0,9041,0, 'Warder Stilgiss'),
+(234,0,9056,0, 'Fineous Darkvire'),
+(235,0,9016,0, 'Bael''Gar'),
+(236,0,9033,0, 'General Angerforge'),
+(237,0,8983,0, 'Golem Lord Argelmach'),
+(238,0,9537,0, 'Hurley Blackbreath'),
+(239,0,9502,0, 'Phalanx'),
+(240,0,9543,0, 'Ribbly Screwspigot'),
+(241,0,9499,0, 'Plugger Spazzring'),
+(242,0,9156,0, 'Ambassador Flamelash'),
+(243,0,9035,0, 'The Seven'),
+(244,0,9938,0, 'Magmus'),
+(245,0,9019,276, 'Emperor Dagran Thaurissan'),
+(246,0,18371,0, 'Shirrak the Dead Watcher'),
+(247,0,18373,178, 'Exarch Maladaar'),
+(248,0,18341,0, 'Pandemonius'),
+(249,0,18343,0, 'Tavarok'),
+(250,0,22930,0, 'Yor'),
+(251,0,18344,179, 'Nexus-Prince Shaffar'),
+(252,0,18472,0, 'Darkweaver Syth'),
+(253,0,23035,0, 'Anzu'),
+(254,0,18473,180, 'Talon King Ikiss'),
+(255,0,18731,0, 'Ambassador Hellmaw'),
+(256,0,18667,0, 'Blackheart the Inciter'),
+(257,0,18732,0, 'Grandmaster Vorpil'),
+(258,0,18708,181, 'Murmur'),
+(259,0,29309,0, 'Elder Nadox'),
+(260,0,29308,0, 'Prince Taldaram'),
+(261,0,29310,0, 'Jedoga Shadowseeker'),
+(262,0,30258,0, 'Amanitar'),
+(263,0,29311,219, 'Herald Volazj'),
+(264,0,28684,0, 'Krik''thir the Gatewatcher'),
+(265,0,28921,0, 'Hadronox'),
+(266,0,29120,241, 'Anub''arak'),
+(267,0,9196,0, 'Highlord Omokk'),
+(268,0,9236,0, 'Shadow Hunter Vosh''gajin'),
+(269,0,9237,0, 'War Master Voone'),
+(270,0,10596,0, 'Mother Smolderweb'),
+(271,0,10584,0, 'Urok Doomhowl'),
+(272,0,9736,0, 'Quartermaster Zigris'),
+(273,0,10268,0, 'Gizrul the Slavener'),
+(274,0,10220,0, 'Halycon'),
+(275,0,9568,32, 'Overlord Wyrmthalak'),
+(276,0,9816,0, 'Pyroguard Emberseer'),
+(277,0,10264,0, 'Solakar Flamewreath'),
+(278,0,10429,0, 'Warchief Rend Blackhand'),
+(279,0,10430,0, 'The Beast'),
+(280,0,10363,44, 'General Drakkisath'),
+(281,0,18096,170, 'Epoch Hunter'),
+(282,0,18096,183, 'Epoch Hunter'),
+(283,0,17862,0, 'Captain Skarloc'),
+(284,0,17862,0, 'Captain Skarloc'),
+(285,0,17848,0, 'Lieutenant Drake'),
+(286,0,17848,0, 'Lieutenant Drake'),
+(287,0,17879,0, 'Chrono Lord Deja'),
+(288,0,17879,0, 'Chrono Lord Deja'),
+(289,0,17880,0, 'Temporus'),
+(290,0,17880,0, 'Temporus'),
+(291,0,17881,171, 'Aeonus'),
+(292,0,17881,182, 'Aeonus'),
+(293,0,26529,0, 'Meathook'),
+(294,0,26530,0, 'Salram the Fleshcrafter'),
+(295,0,26532,0, 'Chrono-Lord Epoch'),
+(296,1,58630,209, 'Mal''ganis'),
+(297,0,26529,0, 'Meathook'),
+(298,0,26530,0, 'Salram the Fleshcrafter'),
+(299,0,26532,0, 'Chrono-Lord Epoch'),
+(300,1,58630,210, 'Mal''ganis'),
+(301,0,17941,0, 'Mennu the Betrayer'),
+(302,0,17991,0, 'Rokmar the Crackler'),
+(303,0,17942,140, 'Quagmirran'),
+(304,0,17941,0, 'Mennu the Betrayer'),
+(305,0,17991,0, 'Rokmar the Crackler'),
+(306,0,17942,184, 'Quagmirran'),
+(314,0,17797,0, 'Hydromancer Thespia'),
+(315,0,17797,0, 'Hydromancer Thespia'),
+(316,0,17796,0, 'Mekgineer Steamrigger'),
+(317,0,17796,0, 'Mekgineer Steamrigger'),
+(318,0,17798,147, 'Warlord Kalithresh'),
+(319,0,17798,185, 'Warlord Kalithresh'),
+(320,0,17770,0, 'Hungarfen'),
+(321,0,17770,0, 'Hungarfen'),
+(322,0,18105,0, 'Ghaz''an'),
+(323,0,18105,0, 'Ghaz''an'),
+(329,0,17826,0, 'Swamplord Musel''ek'),
+(330,0,17826,0, 'Swamplord Musel''ek'),
+(331,0,17882,146, 'The Black Stalker'),
+(332,0,17882,186, 'The Black Stalker'),
+(334,1,68572,0, 'Grand Champions'),
+(336,1,68572,0, 'Grand Champions'),
+(338,1,68574,0, 'Argent Champion'),
+(339,1,68574,0, 'Argent Champion'),
+(340,1,68663,245, 'The Black Knight'),
+(341,1,68663,249, 'The Black Knight'),
+(343,0,11490,0, 'Zevrim Thornhoof'),
+(344,0,13280,0, 'Hydrospawn'),
+(345,0,14327,0, 'Lethtendris'),
+(346,0,11492,34, 'Alzzin the Wildshaper'),
+(347,0,11488,0, 'Illyanna Ravenoak'),
+(348,0,11487,0, 'Magister Kalendris'),
+(349,0,11496,0, 'Immol''thar'),
+(350,0,11489,0, 'Tendris Warpwood'),
+(361,0,11486,36, 'Prince Tortheldrin'),
+(362,0,14326,0, 'Guard Mol''dar'),
+(363,0,14322,0, 'Stomper Kreeg'),
+(364,0,14321,0, 'Guard Fengus'),
+(365,0,14323,0, 'Guard Slip''kik'),
+(366,0,14325,0, 'Captain Kromcrush'),
+(367,0,14324,0, 'Cho''Rush the Observer'),
+(368,0,11501,38, 'King Gordok'),
+(369,0,26630,0, 'Trollgore'),
+(370,0,26630,0, 'Trollgore'),
+(371,0,26631,0, 'Novos the Summoner'),
+(372,0,26631,0, 'Novos the Summoner'),
+(373,0,27483,0, 'King Dred'),
+(374,0,27483,0, 'King Dred'),
+(375,1,61863,214, 'The Prophet Tharon''ja'),
+(376,1,61863,215, 'The Prophet Tharon''ja'),
+(378,0,7079,0, 'Viscous Fallout'),
+(379,0,7361,0, 'Grubbis'),
+(380,0,6235,0, 'Electrocutioner 6000'),
+(381,0,6229,0, 'Crowd Pummeler 9-60'),
+(382,0,7800,14, 'Mekgineer Thermaplugg'),
+(383,0,29304,0, 'Slad''ran'),
+(384,0,29304,0, 'Slad''ran'),
+(385,0,29573,0, 'Drakkari Colossus'),
+(386,0,29573,0, 'Drakkari Colossus'),
+(387,0,29305,0, 'Moorabi'),
+(388,0,29305,0, 'Moorabi'),
+(389,0,29932,0, 'Eck the Ferocious'),
+(390,0,29306,216, 'Gal''darah'),
+(391,0,29306,217, 'Gal''darah'),
+(392,0,17306,0, 'Watchkeeper Gargolmar'),
+(393,0,17306,0, 'Watchkeeper Gargolmar'),
+(394,0,17308,0, 'Omor the Unscarred'),
+(395,0,17308,0, 'Omor the Unscarred'),
+(396,0,17537,136, 'Vazruden the Herald'),
+(397,0,17537,188, 'Vazruden the Herald'),
+(401,0,17381,0, 'The Maker'),
+(402,0,17381,0, 'The Maker'),
+(403,0,17380,0, 'Broggok'),
+(404,0,17380,0, 'Broggok'),
+(405,0,17377,137, 'Keli''dan the Breaker'),
+(406,0,17377,187, 'Keli''dan the Breaker'),
+(407,0,16807,0, 'Grand Warlock Nethekurse'),
+(408,0,16807,0, 'Grand Warlock Nethekurse'),
+(409,0,20923,0, 'Blood Guard Porung'),
+(410,0,16809,0, 'Warbringer O''mrogg'),
+(411,0,16809,0, 'Warbringer O''mrogg'),
+(412,0,16808,138, 'Warchief Kargath Bladefist'),
+(413,0,16808,189, 'Warchief Kargath Bladefist'),
+(414,0,24723,0, 'Selin Fireheart'),
+(415,0,24723,0, 'Selin Fireheart'),
+(416,0,24744,0, 'Vexallus'),
+(417,0,24744,0, 'Vexallus'),
+(418,0,24560,0, 'Priestess Delrissa'),
+(419,0,24560,0, 'Priestess Delrissa'),
+(420,0,24664,198, 'Kael''thas Sunstrider'),
+(421,0,24664,201, 'Kael''thas Sunstrider'),
+(422,0,13282,0, 'Noxxion'),
+(423,0,12258,26, 'Razorlash'),
+(424,0,12236,272, 'Lord Vyletongue'),
+(425,0,12225,0, 'Celebras the Cursed'),
+(426,0,12203,0, 'Landslide'),
+(427,0,13601,0, 'Tinkerer Gizlock'),
+(428,0,13596,0, 'Rotgrip'),
+(429,0,12201,273, 'Princess Theradras'),
+(430,0,11517,0, 'Oggleflint'),
+(431,0,11520,4, 'Taragaman the Hungerer'),
+(432,0,11518,0, 'Jergosh the Invoker'),
+(433,0,11519,0, 'Bazzalan'),
+(434,0,7355,0, 'Tuten''kash'),
+(435,0,7357,0, 'Mordresh Fire Eye'),
+(436,0,8567,0, 'Glutton'),
+(437,0,7358,20, 'Amnennar the Coldbringer'),
+(438,0,6168,0, 'Roogug'),
+(439,0,4424,0, 'Aggem Thorncurse'),
+(440,0,4428,0, 'Death Speaker Jargba'),
+(441,0,4420,0, 'Overlord Ramtusk'),
+(443,0,4421,16, 'Charlga Razorflank'),
+(444,0,3983,0, 'Interrogator Vishas'),
+(445,0,4543,18, 'Bloodmage Thalnos'),
+(446,0,3974,0, 'Houndmaster Loksey'),
+(447,0,6487,165, 'Arcanist Doan'),
+(448,0,3975,163, 'Herod'),
+(449,0,4542,0, 'High Inquisitor Fairbanks'),
+(450,0,3977,164, 'High Inquisitor Whitemane'),
+(451,0,10506,0, 'Kirtonos the Herald'),
+(452,0,10503,0, 'Jandice Barov'),
+(453,0,11622,0, 'Rattlegore'),
+(454,0,10433,0, 'Marduk Blackpool'),
+(455,0,10432,0, 'Vectus'),
+(456,0,10508,0, 'Ras Frostwhisper'),
+(457,0,10505,0, 'Instructor Malicia'),
+(458,0,11261,0, 'Doctor Theolen Krastinov'),
+(459,0,10901,0, 'Lorekeeper Polkelt'),
+(460,0,10507,0, 'The Ravenian'),
+(461,0,10504,0, 'Lord Alexei Barov'),
+(462,0,10502,0, 'Lady Illucia Barov'),
+(463,0,1853,2, 'Darkmaster Gandling'),
+(464,0,3914,0, 'Rethilgore'),
+(465,0,3886,0, 'Razorclaw the Butcher'),
+(466,0,3887,0, 'Baron Silverlaine'),
+(467,0,4278,0, 'Commander Springvale'),
+(468,0,4279,0, 'Odo the Blindwatcher'),
+(469,0,4274,0, 'Fenrus the Devourer'),
+(470,0,3927,0, 'Wolf Master Nandos'),
+(471,0,4275,8, 'Archmage Arugal'),
+(472,0,10516,0, 'The Unforgiven'),
+(473,0,10558,0, 'Hearthsinger Forresten'),
+(474,0,10808,0, 'Timmy the Cruel'),
+(475,0,10997,0, 'Cannon Master Willey'),
+(476,0,11032,0, 'Malor the Zealous'),
+(477,0,10811,0, 'Archivist Galford'),
+(478,0,10813,40, 'Balnazzar'),
+(479,0,10436,0, 'Baroness Anastari'),
+(480,0,10437,0, 'Nerub''enkan'),
+(481,0,10438,0, 'Maleki the Pallid'),
+(482,0,10435,0, 'Magistrate Barthilas'),
+(483,0,10439,0, 'Ramnstein the Gorger'),
+(484,0,10440,274, 'Baron Rivendare'),
+(485,0,8580,0, 'Atal''alarion'),
+(486,0,5721,0, 'Dreamscythe'),
+(487,0,5720,0, 'Weaver'),
+(488,0,5710,0, 'Jammal''an the Prophet'),
+(490,0,5719,0, 'Morphaz'),
+(491,0,5722,0, 'Hazzas'),
+(492,0,8443,0, 'Avatar of Hakkar'),
+(493,0,5709,28, 'Shade of Eranikus'),
+(494,0,20870,0, 'Zereketh the Unbound'),
+(495,0,20870,0, 'Zereketh the Unbound'),
+(496,0,20885,0, 'Dalliah the Doomsayer'),
+(497,0,20885,0, 'Dalliah the Doomsayer'),
+(498,0,20886,0, 'Wrath-Scryer Soccothrates'),
+(499,0,20886,0, 'Wrath-Scryer Soccothrates'),
+(500,0,20912,174, 'Harbinger Skyriss'),
+(501,0,20912,190, 'Harbinger Skyriss'),
+(502,0,17976,0, 'Commander Sarannis'),
+(504,0,17976,0, 'Commander Sarannis'),
+(505,0,17975,0, 'High Botanist Freywinn'),
+(506,0,17975,0, 'High Botanist Freywinn'),
+(507,0,17978,0, 'Thorngrin the Tender'),
+(508,0,17978,0, 'Thorngrin the Tender'),
+(509,0,17980,0, 'Laj'),
+(510,0,17980,0, 'Laj'),
+(511,0,17977,173, 'Warp Splinter'),
+(512,0,17977,191, 'Warp Splinter'),
+(513,0,19219,0, 'Mechano-Lord Capacitus'),
+(514,0,19219,0, 'Mechano-Lord Capacitus'),
+(515,0,19221,0, 'Nethermancer Sepethrea'),
+(516,0,19221,0, 'Nethermancer Sepethrea'),
+(517,0,19220,172, 'Pathaleon the Calculator'),
+(518,0,19220,192, 'Pathaleon the Calculator'),
+(519,0,26796,0, 'Frozen Commander'),
+(520,0,26731,0, 'Grand Magus Telestra'),
+(521,0,26731,0, 'Grand Magus Telestra'),
+(522,0,26763,0, 'Anomalus'),
+(523,0,26763,0, 'Anomalus'),
+(524,0,26794,0, 'Ormorok the Tree-Shaper'),
+(525,0,26794,0, 'Ormrok the Tree-Shaper'),
+(526,0,26723,225, 'Keristrasza'),
+(527,0,26723,226, 'Keristrasza'),
+(528,0,27654,0, 'Drakos the Interrogator'),
+(529,0,27654,0, 'Drakos the Interrogator'),
+(530,0,27447,0, 'Varos Cloudstrider'),
+(531,0,27447,0, 'Varos Cloudstrider'),
+(532,0,27655,0, 'Mage-Lord Urom'),
+(533,0,27655,0, 'Mage-Lord Urom'),
+(534,0,27656,206, 'Ley-Guardian Eregos'),
+(535,0,27656,211, 'Ley-Guardian Eregos'),
+(536,0,1696,0, 'Targorr the Dread'),
+(537,0,1666,0, 'Kam Deepfury'),
+(538,0,1717,0, 'Hamhock'),
+(539,0,1716,0, 'Bazil Thredd'),
+(540,0,1663,12, 'Dextren Ward'),
+(541,0,29315,0, 'First Prisoner'),
+(542,0,29315,0, 'First Prisoner'),
+(543,0,29316,0, 'Second Prisoner'),
+(544,0,29316,0, 'Second Prisoner'),
+(545,0,31134,220, 'Cyanigosa'),
+(546,0,31134,221, 'Cyanigosa'),
+(547,0,6910,0, 'Revelosh'),
+(548,0,6906,0, 'The Lost Dwarves'),
+(549,0,7228,0, 'Ironaya'),
+(551,0,7206,0, 'Ancient Stone Keeper'),
+(552,0,7291,0, 'Galgann Firehammer'),
+(553,0,4854,0, 'Grimlok'),
+(554,0,2748,22, 'Archaedas'),
+(555,0,28586,0, 'General Bjarngrim'),
+(556,0,28586,0, 'General Bjarngrim'),
+(557,0,28587,0, 'Volkhan'),
+(558,0,28587,0, 'Volkhan'),
+(559,0,28546,0, 'Ionar'),
+(560,0,28546,0, 'Ionar'),
+(561,0,28923,207, 'Loken'),
+(562,0,28923,212, 'Loken'),
+(563,0,27977,0, 'Krystallus'),
+(564,0,27977,0, 'Krystallus'),
+(565,0,27975,0, 'Maiden of Grief'),
+(566,0,27975,0, 'Maiden of Grief'),
+(567,1,59046,0, 'Tribunal of Ages'),
+(568,1,59046,0, 'Tribunal of Ages'),
+(569,0,27978,208, 'Sjonnir the Ironshaper'),
+(570,0,27978,213, 'Sjonnir the Ironshaper'),
+(571,0,23953,0, 'Prince Keleseth'),
+(572,0,23953,0, 'Prince Keleseth'),
+(573,0,24201,0, 'Skarvold & Dalronn'),
+(574,0,24201,0, 'Skarvold & Dalronn'),
+(575,0,23980,202, 'Ingvar the Plunderer'),
+(576,0,23980,242, 'Ingvar the Plunderer'),
+(577,0,26668,0, 'Svala Sorrowgrave'),
+(578,0,26668,0, 'Svala Sorrowgrave'),
+(579,0,26687,0, 'Gortok Palehoof'),
+(580,0,26687,0, 'Gortok Palehoof'),
+(581,0,26693,0, 'Skadi the Ruthless'),
+(582,0,26693,0, 'Skadi the Ruthless'),
+(583,0,26861,203, 'King Ymiron'),
+(584,0,26861,205, 'King Ymiron'),
+(585,0,3671,0, 'Lady Anacondra'),
+(586,0,3669,0, 'Lord Cobrahn'),
+(587,0,3653,0, 'Kresh'),
+(588,0,3670,0, 'Lord Pythas'),
+(589,0,3674,0, 'Skum'),
+(590,0,3673,0, 'Lord Serpentis'),
+(591,0,5775,0, 'Verdan the Everliving'),
+(592,0,3654,1, 'Mutanus the Devourer'),
+(593,0,7795,0, 'Hydromancer Velratha'),
+(594,0,7273,0, 'Ghaz''rilla'),
+(595,0,8127,0, 'Antu''sul'),
+(596,0,7272,0, 'Theka the Martyr'),
+(597,0,7271,0, 'Witch Doctor Zum''rah'),
+(598,0,7796,0, 'Nekrum Gutchewer'),
+(599,0,7275,0, 'Shadowpriest Sezz''ziz'),
+(600,0,7267,24, 'Chief Ukorz Sandscalp'),
+(601,0,22887,0, 'High Warlord Naj''entus'),
+(602,0,22898,0, 'Supremus'),
+(603,0,22841,0, 'Shade of Akama'),
+(604,0,22871,0, 'Teron Gorefiend'),
+(605,0,22948,0, 'Gurtogg Bloodboil'),
+(606,0,23420,0, 'Reliquary of Souls'),
+(607,0,22947,0, 'Mother Shahraz'),
+(608,0,23426,0, 'The Illidari Council'),
+(609,0,22917,196, 'Illidan Stormrage'),
+(610,0,12435,0, 'Razorgore the Untamed'),
+(611,0,13020,0, 'Vaelastrasz the Corrupt'),
+(612,0,12017,0, 'Broodlord Lashlayer'),
+(613,0,11983,0, 'Firemaw'),
+(614,0,14601,0, 'Ebonroc'),
+(615,0,11981,0, 'Flamegor'),
+(616,0,14020,0, 'Chromaggus'),
+(617,0,11583,50, 'Nefarian'),
+(618,0,17767,0, 'Rage Winterchill'),
+(619,0,17808,0, 'Anetheron'),
+(620,0,17888,0, 'Kaz''rogal'),
+(621,0,17842,0, 'Azgalor'),
+(622,0,17968,195, 'Archimonde'),
+(623,0,21216,0, 'Hydross the Unstable'),
+(624,0,21217,0, 'The Lurker Below'),
+(625,0,21215,0, 'Leotheras the Blind'),
+(626,0,21214,0, 'Fathom-Lord Karathress'),
+(627,0,21213,0, 'Morogrim Tidewalker'),
+(628,0,21212,194, 'Lady Vashj'),
+(629,0,34797,0, 'Northrend Beasts'),
+(630,0,34797,0, 'Northrend Beasts'),
+(631,0,34797,0, 'Northrend Beasts'),
+(632,0,34797,0, 'Northrend Beasts'),
+(633,0,34780,0, 'Lord Jaraxxus'),
+(634,0,34780,0, 'Lord Jaraxxus'),
+(635,0,34780,0, 'Lord Jaraxxus'),
+(636,0,34780,0, 'Lord Jaraxxus'),
+(637,1,68184,0, 'Faction Champions'),
+(638,1,68184,0, 'Faction Champions'),
+(639,1,68184,0, 'Faction Champions'),
+(640,1,68184,0, 'Faction Champions'),
+(641,0,34496,0, 'Val''kyr Twins'),
+(642,0,34496,0, 'Val''kyr Twins'),
+(643,0,34496,0, 'Val''kyr Twins'),
+(644,0,34496,0, 'Val''kyr Twins'),
+(645,0,34564,246, 'Anub''arak'),
+(646,0,34564,248, 'Anub''arak'),
+(647,0,34564,247, 'Anub''arak'),
+(648,0,34564,250, 'Anub''arak'),
+(649,0,18831,0, 'High King Maulgar'),
+(650,0,19044,177, 'Gruul the Dragonkiller'),
+(651,0,17257,176, 'Magtheridon'),
+(652,0,15550,0, 'Attumen the Huntsman'),
+(653,0,15687,0, 'Moroes'),
+(654,0,16457,0, 'Maiden of the Virtue'),
+(655,0,16812,0, 'Opera Event'),
+(656,0,15691,0, 'The Curator'),
+(657,0,15688,0, 'Terestian Illhoof'),
+(658,0,16524,0, 'Shade of Aran'),
+(659,0,15689,0, 'Netherspite'),
+(660,0,22520,0, 'Chess Event'),
+(661,0,15690,175, 'Prince Malchezaar'),
+(662,0,17225,0, 'Nightbane'),
+(663,0,12118,0, 'Lucifron'),
+(664,0,11982,0, 'Magmadar'),
+(665,0,12259,0, 'Gehennas'),
+(666,0,12057,0, 'Garr'),
+(667,0,12264,0, 'Shazzrah'),
+(668,0,12056,0, 'Baron Geddon'),
+(669,0,12098,0, 'Sulfuron Harbinger'),
+(670,0,11988,0, 'Golemagg the Incinerator'),
+(671,0,12018,0, 'Majordomo Executus'),
+(672,0,11502,48, 'Ragnaros'),
+(673,0,15956,0, 'Anub''Rekhan'),
+(674,0,15956,0, 'Anub''Rekhan'),
+(677,0,15953,0, 'Grand Widow Faerlina'),
+(678,0,15953,0, 'Grand Widow Faerlina'),
+(679,0,15952,0, 'Maexxna'),
+(680,0,15952,0, 'Maexxna'),
+(681,0,15954,0, 'Noth the Plaguebringer'),
+(682,0,15954,0, 'Noth the Plaguebringer'),
+(683,0,15936,0, 'Heigan the Unclean'),
+(684,0,15936,0, 'Heigan the Unclean '),
+(685,0,16011,0, 'Loatheb'),
+(686,0,16011,0, 'Loatheb'),
+(687,0,16061,0, 'Instructor Razuvious'),
+(689,0,16061,0, 'Instructor Razuvious'),
+(690,0,16060,0, 'Gothik the Harvester'),
+(691,0,16060,0, 'Gothik the Harvester'),
+(692,1,59450,0, 'The Four Horsemen'),
+(693,1,59450,0, 'The Four Horsemen'),
+(694,0,16028,0, 'Patchwerk'),
+(695,0,16028,0, 'Patchwerk '),
+(696,0,15931,0, 'Grobbulus'),
+(697,0,15931,0, 'Grobbulus'),
+(698,0,15932,0, 'Gluth'),
+(699,0,15932,0, 'Gluth'),
+(700,0,15928,0, 'Thaddius'),
+(701,0,15928,0, 'Thaddius'),
+(702,0,15989,0, 'Sapphiron'),
+(703,0,15989,0, 'Sapphiron'),
+(704,0,15990,159, 'Kel''Thuzad'),
+(706,0,15990,227, 'Kel''Thuzad'),
+(707,0,10184,46, 'Onyxia'),
+(708,0,10184,257, 'Onyxia'),
+(709,0,15263,0, 'The Prophet Skeram'),
+(710,0,15544,0, 'Silithid Royalty'),
+(711,0,15516,0, 'Battleguard Sartura'),
+(712,0,15510,0, 'Fankriss the Unyielding'),
+(713,0,15299,0, 'Viscidus'),
+(714,0,15509,0, 'Princess Huhuran'),
+(715,0,15275,0, 'Twin Emperors'),
+(716,0,15517,0, 'Ouro'),
+(717,0,15727,161, 'C''thun'),
+(718,0,15348,0, 'Kurinnaxx'),
+(719,0,15341,0, 'General Rajaxx'),
+(720,0,15340,0, 'Moam'),
+(721,0,15370,0, 'Buru the Gorger'),
+(722,0,15369,0, 'Ayamiss the Hunter'),
+(723,0,15339,160, 'Ossirian the Unscarred'),
+(724,0,24892,0, 'Kalecgos'),
+(725,0,24882,0, 'Brutallus'),
+(726,0,25038,0, 'Felmyst'),
+(727,0,25165,0, 'Eredar Twins'),
+(728,0,25840,0, 'M''uru'),
+(729,0,25315,199, 'Kil''jaeden'),
+(730,0,19514,0, 'Al''ar'),
+(731,0,19516,0, 'Void Reaver'),
+(732,0,18805,0, 'High Astromancer Solarian'),
+(733,0,19622,193, 'Kael''thas Sunstrider'),
+(734,0,28859,223, 'Malygos'),
+(735,0,28859,237, 'Malygos'),
+(736,0,30452,0, 'Tenebron'),
+(737,0,30452,0, 'Tenebron'),
+(738,0,30451,0, 'Shadron'),
+(739,0,30451,0, 'Shadron'),
+(740,0,30449,0, 'Vesperon'),
+(741,0,30449,0, 'Vesperon'),
+(742,0,28860,224, 'Sartharion'),
+(743,0,28860,238, 'Sartharion'),
+(744,0,33113,0, 'Flame Leviathan'),
+(745,0,33118,0, 'Ignis the Furnace Master'),
+(746,0,33186,0, 'Razorscale'),
+(747,0,33293,0, 'XT-002 Deconstructor'),
+(748,1,65195,0, 'The Iron Council'),
+(749,0,32930,0, 'Kologarn'),
+(750,0,33515,0, 'Auriaya'),
+(751,1,64899,0, 'Hodir'),
+(752,1,64985,0, 'Thorim'),
+(753,1,65074,0, 'Freya'),
+(754,0,33432,0, 'Mimiron'),
+(755,0,33271,0, 'General Vezax'),
+(756,0,33288,0, 'Yogg-Saron'),
+(757,0,32871,243, 'Algalon the Observer'),
+(758,0,33113,0, 'Flame Leviathan'),
+(759,0,33118,0, 'Ignis the Furnace Master'),
+(760,0,33186,0, 'Razorscale'),
+(761,0,33293,0, 'XT-002 Deconstructor'),
+(762,1,65195,0, 'The Iron Council'),
+(763,0,32930,0, 'Kologarn'),
+(764,0,33515,0, 'Auriaya'),
+(765,1,64899,0, 'Hodir'),
+(766,1,64985,0, 'Thorim'),
+(767,1,65074,0, 'Freya'),
+(768,0,33432,0, 'Mimiron'),
+(769,0,33271,0, 'General Vezax'),
+(770,0,33288,0, 'Yogg-Saron'),
+(771,0,32871,244, 'Algalon the Observer'),
+(772,0,31125,0, 'Archavon the Stone Watcher'),
+(773,0,31125,0, 'Archavon the Stone Watcher'),
+(774,0,33993,0, 'Emalon the Storm Watcher'),
+(775,0,33993,0, 'Emalon the Storm Watcher'),
+(776,0,35013,0, 'Koralon the Flame Watcher'),
+(777,0,35013,0, 'Koralon the Flame Watcher'),
+(778,0,23574,0, 'Akil''zon'),
+(779,0,23576,0, 'Nalorakk'),
+(780,0,23578,0, 'Jan''alai'),
+(781,0,23577,0, 'Halazzi'),
+(782,0,24239,0, 'Hex Lord Malacrass'),
+(783,0,23863,197, 'Zul''jin'),
+(784,0,14507,0, 'High Priest Venoxis'),
+(785,0,14517,0, 'High Priestess Jeklik'),
+(786,0,14510,0, 'High Priestess Mar''li'),
+(787,0,11382,0, 'Bloodlord Mandokir'),
+(788,0,15083,0, 'Edge of Madness'),
+(789,0,14509,0, 'High Priest Thekal'),
+(790,0,15114,0, 'Gahz''ranka'),
+(791,0,14515,0, 'High Priestess Arlokk'),
+(792,0,11380,0, 'Jin''do the Hexxer'),
+(793,0,14834,42, 'Hakkar'),
+(829,0,36497,0, 'Bronjahm'),
+(830,0,36497,0, 'Bronjahm '),
+(831,0,36502,251, 'Devourer of Souls'),
+(832,0,36502,252, 'Devourer of Souls'),
+(833,0,36494,0, 'Forgemaster Garfrost'),
+(834,0,36494,0, 'Forgemaster Garfrost'),
+(835,0,36476,0, 'Krick'),
+(836,0,36476,0, 'Krick'),
+(837,0,36658,253, 'Overlord Tyrannus'),
+(838,0,36658,254, 'Overlord Tyrannus'),
+(839,0,38113,0, 'Marwyn'),
+(840,0,38113,0, 'Marwyn'),
+(841,0,38112,0, 'Falric'),
+(842,0,38112,0, 'Falric'),
+(843,1,72830,255, 'Escaped from Arthas'),
+(844,1,72830,256, 'Escaped from Arthas'),
+(845,0,36612,0, 'Lord Marrowgar'),
+(846,0,36855,0, 'Lady Deathwhisper'),
+(847,1,72959,0, 'Icecrown Gunship Battle'),
+(848,0,37813,0, 'Deathbringer Saurfang'),
+(849,0,36626,0, 'Festergut'),
+(850,0,36627,0, 'Rotface'),
+(851,0,36678,0, 'Professor Putricide'),
+(852,0,37970,0, 'Blood Council'),
+(853,0,37955,0, 'Queen Lana''thel'),
+(854,1,72706,0, 'Valithria Dreamwalker'),
+(855,0,36853,0, 'Sindragosa'),
+(856,0,36597,279, 'The Lich King'),
+(857,0,36612,0, 'Lord Marrowgar'),
+(858,0,36855,0, 'Lady Deathwhisper'),
+(859,1,72959,0, 'Icecrown Gunship Battle'),
+(860,0,37813,0, 'Deathbringer Saurfang'),
+(861,0,36626,0, 'Festergut'),
+(862,0,36627,0, 'Rotface'),
+(863,0,36678,0, 'Professor Putricide'),
+(864,0,37970,0, 'Blood Council'),
+(865,0,37955,0, 'Queen Lana''thel'),
+(866,1,72706,0, 'Valithria Dreamwalker'),
+(867,0,36853,0, 'Sindragosa'),
+(868,0,36597,280, 'The Lich King'),
+(883,0,4422,0, 'Agathelos the Raging'),
+(885,0,38433,239, 'Toravon the Ice Watcher'),
+(886,0,38433,240, 'Toravon the Ice Watcher'),
+(887,0,39863,293, 'Halion'),
+(888,0,39863,294, 'Halion'),
+(889,0,39751,0, 'Baltharus the Warborn'),
+(890,0,39751,0, 'Baltharus the Warborn'),
+(891,0,39747,0, 'Saviana Ragefire'),
+(892,0,39747,0, 'Saviana Ragefire'),
+(893,0,39746,0, 'General Zarithrian'),
+(894,0,39746,0, 'General Zarithrian');
diff --git a/sql_mr/mr02912_mangos_spell_hacks.sql b/sql_mr/mr02912_mangos_spell_hacks.sql
new file mode 100644
index 00000000000..4a7498a82f4
--- /dev/null
+++ b/sql_mr/mr02912_mangos_spell_hacks.sql
@@ -0,0 +1,810 @@
+-- Stormshield
+DELETE FROM `spell_dbc` WHERE `Id` = 64187;
+INSERT INTO `spell_dbc`
+    ( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES
+    (64187, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 6, 6, 0, 0, 1, 0, 0, 0, 0, 0, 249, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 147, 15, 0, 0, 0, 0, 0, 0, 0, 2048, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1065353216, 1065353216, 1065353216, 0, 8 , "Stormshield - Spell form Brundir with right mechanic immunity Mask - OVERRIDE");
+
+-- Replace DBC values for spell 58642 - "Glyph of Scourge Strike"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 58642;
+INSERT INTO `spell_dbc`
+( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (58642, 0, 0, 448, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 1, 0, 1, 0, -1, 0, 0, 6, 0, 0, 1, 1, 0, 0, 0, 0, 2, 8, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4294967295, 0, 0, 0, 0, 0, 262144, 0, 0, 0, 0, 0, "Glyph of Scourge Strike", 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+UPDATE `spell_dbc` SET
+`EffectTriggerSpell1` = 69961,
+`Comment` = 'Replacement for spell 58642 ("Glyph of Scourge Strike")'
+WHERE `Id` = 58642;
+
+-- Replace DBC values for spells 18754, 18755, 18756  - "Improved Succubus"
+--
+DELETE FROM spell_dbc WHERE Id IN (18754, 18755, 18756);
+INSERT INTO spell_dbc
+( Id, Dispel, Mechanic, Attributes, AttributesEx, AttributesEx2, AttributesEx3, AttributesEx4, AttributesEx5, Stances, StancesNot, Targets, CastingTimeIndex, AuraInterruptFlags, ProcFlags, ProcChance, ProcCharges, MaxLevel, BaseLevel, SpellLevel, DurationIndex, RangeIndex, StackAmount, EquippedItemClass, EquippedItemSubClassMask, EquippedItemInventoryTypeMask, Effect1, Effect2, Effect3, EffectDieSides1, EffectDieSides2, EffectDieSides3, EffectRealPointsPerLevel1, EffectRealPointsPerLevel2, EffectRealPointsPerLevel3, EffectBasePoints1, EffectBasePoints2, EffectBasePoints3, EffectMechanic1, EffectMechanic2, EffectMechanic3, EffectImplicitTargetA1, EffectImplicitTargetA2, EffectImplicitTargetA3, EffectImplicitTargetB1, EffectImplicitTargetB2, EffectImplicitTargetB3, EffectRadiusIndex1, EffectRadiusIndex2, EffectRadiusIndex3, EffectApplyAuraName1, EffectApplyAuraName2, EffectApplyAuraName3, EffectAmplitude1, EffectAmplitude2, EffectAmplitude3, EffectMultipleValue1, EffectMultipleValue2, EffectMultipleValue3, EffectMiscValue1, EffectMiscValue2, EffectMiscValue3, EffectMiscValueB1, EffectMiscValueB2, EffectMiscValueB3, EffectTriggerSpell1, EffectTriggerSpell2, EffectTriggerSpell3, EffectSpellClassMaskA1, EffectSpellClassMaskA2, EffectSpellClassMaskA3, EffectSpellClassMaskB1, EffectSpellClassMaskB2, EffectSpellClassMaskB3, EffectSpellClassMaskC1, EffectSpellClassMaskC2, EffectSpellClassMaskC3, Comment, MaxTargetLevel, SpellFamilyName, SpellFamilyFlags1, SpellFamilyFlags2, SpellFamilyFlags3, MaxAffectedTargets, DmgClass, PreventionType, DmgMultiplier1, DmgMultiplier2, DmgMultiplier3, AreaGroupId, SchoolMask )
+VALUES
+(18754, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, -23, 9, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 0, 0, 0, 108, 108, 0, 0, 0, 0, 0, 0, 0, 10, 1, 0, 0, 0, 0, 0, 0, 0, 1073741824, 0, 0, 1073741824, 0, 0, 0, 0, 0, "Improved Succubus (Rank 1)", 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 ),
+(18755, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, -45, 19, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 0, 0, 0, 108, 108, 0, 0, 0, 0, 0, 0, 0, 10, 1, 0, 0, 0, 0, 0, 0, 0, 1073741824, 0, 0, 1073741824, 0, 0, 0, 0, 0, "Improved Succubus (Rank 2)", 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 ),
+(18756, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, -67, 29, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 0, 0, 0, 108, 108, 0, 0, 0, 0, 0, 0, 0, 10, 1, 0, 0, 0, 0, 0, 0, 0, 1073741824, 0, 0, 1073741824, 0, 0, 0, 0, 0, "Improved Succubus (Rank 3)", 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+UPDATE spell_dbc SET
+EffectImplicitTargetA1 = 1
+-- Comment = 'Replacement for spells 18754, 18755, 18756 ("Improved Succubus")'
+WHERE Id IN (18754, 18755, 18756);
+
+-- Replace DBC values for spell 46924 - "Bladestorm"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 46924;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (46924, 0, 0, 0, 327696, 32784, 0, 1024, 0, 512, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 90000, 0, 0, 0, 0, 101, 0, 0, 60, 60, 32, 1, 0, 2, 173555, 0, 6, 6, 6, 1, 1, 1, 0, 0, 0, -1, -1, -1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 23, 147, 263, 1000, 0, 0, 0, 0, 0, 0, 1733, 0, 0, 0, 0, 50622, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 2782, "Bladestorm", 0, 4, 0, 16384, 0, 0, 2, 2, 1, 1, 1, 0, 1 );
+
+UPDATE `spell_dbc` SET
+`Category` = 891,
+`EffectMiscValue2` = 1838628819,
+`Comment` = 'Replacement for spell 46924 ("Bladestorm")'
+WHERE `Id` = 46924;
+
+-- Replace DBC values for spell 11129 - "Combustion"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 11129;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (11129, 0, 1, 0, 33816832, 268435456, 0, 67108864, 524352, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 65536, 100, 3, 0, 40, 40, 21, 1, 0, -1, 0, 0, 6, 64, 0, 1, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 108, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 28682, 0, 146800663, 200776, 0, 0, 0, 0, 0, 0, 0, 33, "Combustion", 0, 3, 0, 67108864, 8, 0, 1, 1, 1, 1, 1, 0, 4 );
+
+UPDATE `spell_dbc` SET
+`EffectSpellClassMaskA2` = 135240,
+`Comment` = 'Replacement for spell 11129 ("Combustion")'
+WHERE `Id` = 11129;
+
+-- Replace DBC values for spell 69147 - "Coldflame"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 69147;
+INSERT INTO `spell_dbc`
+( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (69147, 0, 0, 524288, 268435456, 0, 268435456, 1, 0, 0, 0, 0, 209, 0, 0, 101, 0, 0, 20, 20, 0, 1, 0, -1, 0, 0, 64, 64, 77, 0, 0, 1, 0, 0, 0, 0, 0, 69144, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69146, 33801, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Coldflame", 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+UPDATE spell_dbc SET
+EffectTriggerSpell2 = 0,
+Comment = 'Replacement for spell 69147 ("Coldflame")'
+WHERE Id = 69147;
+
+-- Replace DBC values for spell 33663 - "Earth Elemental Totem"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 33663;
+INSERT INTO `spell_dbc`
+( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (33663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 4, 1, 0, -1, 0, 0, 46, 64, 28, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15352, 0, 0, 61, 0, 32184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Earth Elemental Totem", 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+UPDATE `spell_dbc` SET
+EffectTriggerSpell2 = 0,
+`Comment` = 'Replacement for spell 33663 ("Earth Elemental Totem")'
+WHERE `Id` = 33663;
+
+-- Replace DBC values for spell 59103 - "Shadow Sickle"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 59103;
+INSERT INTO `spell_dbc`
+( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (59103, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 20, 20, 32, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Shadow Sickle", 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 32 );
+
+UPDATE `spell_dbc` SET
+`Effect1` = 0,
+`Comment` = 'Replacement for spell 59103 ("Shadow Sickle")'
+WHERE `Id` = 59103;
+
+-- Replace DBC values for spell 63132 - "Shield Level 3"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 63132;
+INSERT INTO `spell_dbc`
+( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (63132, 0, 0, 16777216, 268435456, 4, 268435456, 132, 40, 0, 0, 0, 1, 4718592, 0, 101, 0, 0, 0, 0, 6, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 30000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Shield Level 3", 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+-- Replace DBC values for spell 63131 - "Shield Level 2"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 63131;
+INSERT INTO `spell_dbc`
+( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (63131, 0, 0, 16777216, 268435456, 4, 268435456, 132, 40, 0, 0, 0, 1, 4718592, 0, 101, 0, 0, 0, 0, 6, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 30000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Shield Level 2", 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+-- Replace DBC values for spell 63130 - "Shield Level 1"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 63130;
+INSERT INTO `spell_dbc`
+( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (63130, 0, 0, 16777216, 268435456, 4, 268435456, 1610612868, 40, 0, 0, 0, 1, 4718592, 0, 101, 0, 0, 0, 0, 6, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 30000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Shield Level 1", 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+UPDATE `spell_dbc` SET
+`Effect1` = 0,
+`Comment` = 'Replacement for spells 63132, 63131, 63130 ("Shield Level")'
+WHERE `Id` IN (63132, 63131, 63130);
+
+-- Replace DBC values for spell 70842 - "Mana Barrier"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 70842;
+
+-- Replace DBC values for spell 49028 - "Dancing Rune Weapon"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 49028;
+INSERT INTO `spell_dbc`
+( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (49028, 0, 0, 0, 0, 0, 67109890, 0, 0, 0, 0, 0, 1, 0, 86288, 100, 0, 80, 55, 55, 29, 4, 0, 2, 173555, 0, 28, 6, 6, 1, 1, 1, 0, 0, 0, 0, 50706, 9, 0, 0, 0, 64, 1, 6, 0, 0, 0, 7, 0, 0, 0, 4, 4, 0, 0, 0, 1, 0, 0, 27893, 0, 0, 208, 0, 0, 0, 1206, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Dancing Rune Weapon", 0, 15, 1073741824, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1 );
+
+UPDATE `spell_dbc` SET
+EffectTriggerSpell2 = 0,
+RecoveryTime = 90000,
+`Comment` = 'Replacement for spell 49028 ("Dancing Rune Weapon")'
+WHERE `Id` = 49028;
+
+-- Replace DBC values for spell 27746 - "Nitrous Boost"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 27746;
+INSERT INTO `spell_dbc`
+( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (27746, 0, 0, 0, 131072, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 6, 6, 0, 1, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 31, 23, 0, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Nitrous Boost", 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1 );
+
+UPDATE `spell_dbc` SET
+`Effect2` = 0,
+`Comment` = 'Replacement for spell 27746 ("Nitrous Boost")'
+WHERE `Id` = 27746;
+
+-- Replace DBC values for spell 32982 - "Fire Elemental Totem"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 32982;
+INSERT INTO `spell_dbc`
+( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (32982, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 4, 1, 0, -1, 0, 0, 46, 64, 28, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15438, 0, 0, 61, 0, 32186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Fire Elemental Totem", 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+UPDATE `spell_dbc` SET
+EffectTriggerSpell2 = 0,
+`Comment` = 'Replacement for spell 32982 ("Fire Elemental Totem")'
+WHERE `Id` = 32982;
+
+-- Replace DBC values for spell 69029 - "Pursuit Confusion"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 69029;
+INSERT INTO `spell_dbc`
+( `Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (69029, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 29, 1, 0, -1, 0, 0, 6, 6, 6, 1, 1, 0, 0, 0, 0, -51, 49, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 33, 79, 284, 0, 0, 0, 0, 0, 0, 0, 127, 11, 0, 0, 0, 0, 0, 69357, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Pursuit Confusion", 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+UPDATE `spell_dbc` SET
+EffectTriggerSpell3 = 0,
+`Comment` = 'Replacement for spell 69029 ("Pursuit Confusion")'
+WHERE `Id` = 69029;
+
+-- Replace DBC values for spell 54114 - "Heart of the Phoenix"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 54114;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (54114, 0, 0, 0, 2306932736, 131105, 262145, 0, 128, 393224, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 101, 0, 0, 0, 0, 0, 13, 0, -1, 0, 0, 109, 3, 0, 1, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 454, "Heart of the Phoenix", 0, 9, 16777216, 0, 0, 0, 0, 0, 1, 1, 1, 0, 8 );
+
+UPDATE `spell_dbc` SET
+`EffectBasePoints1` = 99,
+`Comment` = 'Replacement for spell 54114 ("Heart of the Phoenix")'
+WHERE `Id` = 54114;
+
+-- Replace DBC values for spells Ebon Plaguebringer
+DELETE FROM `spell_dbc` WHERE `Id` IN (51726, 51734, 51735);
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`)
+VALUES
+(51726,0,3,22,262144,136,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,101,0,0,0,1,8,13,0,-1,0,0,6,6,0,1,1,0,0,0,0,29,3,0,0,0,0,6,6,0,0,0,0,0,0,0,284,4,0,0,0,0,0,0,0,22,126,0,0,0,0,65142,0,0,0,0,0,0,0,0,0,0,0,1933,0,15,0,2048,64,0,0,0,1,1,1,0,32,"Ebon Plague"),
+(51734,0,3,22,262144,136,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,101,0,0,0,1,8,13,0,-1,0,0,6,6,0,1,1,0,0,0,0,29,8,0,0,0,0,6,6,0,0,0,0,0,0,0,284,4,0,0,0,0,0,0,0,22,126,0,0,0,0,65142,0,0,0,0,0,0,0,0,0,0,0,1933,0,15,0,2048,64,0,0,0,1,1,1,0,32,"Ebon Plague"),
+(51735,0,3,22,262144,136,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,101,0,0,0,1,8,13,0,-1,0,0,6,6,0,1,1,0,0,0,0,29,12,0,0,0,0,6,6,0,0,0,0,0,0,0,284,4,0,0,0,0,0,0,0,22,126,0,0,0,0,65142,0,0,0,0,0,0,0,0,0,0,0,1933,0,15,0,2048,64,0,0,0,1,1,1,0,32,"Ebon Plague");
+
+UPDATE `spell_dbc` SET
+`AttributesEx6` = 8388608,
+`EffectApplyAuraName2` = 87,
+`SpellFamilyFlags3` = 80,
+`Comment` = 'Ebon Plague rank 1 - auraname to 87, stacking attributeEx6 and spellfamilyflag for Epidemic'
+WHERE `Id` = 51726;
+
+UPDATE `spell_dbc` SET
+`AttributesEx6` = 8388608,
+`EffectApplyAuraName2` = 87,
+`SpellFamilyFlags3` = 80,
+`Comment` = 'Ebon Plague rank 2 - auraname to 87, stacking attributeEx6 and spellfamilyflag for Epidemic'
+WHERE `Id` = 51734;
+
+UPDATE `spell_dbc` SET
+`AttributesEx6` = 8388608,
+`EffectApplyAuraName2` = 87,
+`SpellFamilyFlags3` = 80,
+`Comment` = 'Ebon Plague rank 3 - auraname to 87, stacking attributeEx6 and spellfamilyflag for Epidemic'
+WHERE `Id` = 51735;
+
+-- Update DBC value for Crypt Fever
+UPDATE `spell_dbc` SET
+`AttributesEx6` = 8388608
+WHERE `Id` = 65142;
+
+-- Tribunal of Ages achievement/encounter check
+DELETE FROM `spell_dbc` WHERE `Id` = 59046;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`)
+VALUES
+(59046,0,0,0,8388992,0,5,269484288,0,0,0,0,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,37,1,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,7,0,0,28,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Achievement Check - Tribunal of Ages");
+
+-- Mal'Ganis achievement/encounter check
+DELETE FROM `spell_dbc` WHERE `Id` = 58630;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`)
+VALUES
+(58630,0,0,0,8388992,0,5,269484288,0,0,0,0,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,37,1,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,7,0,0,28,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Achievement Check - Mal'Ganis");
+
+-- Replace DBC values for spell 42760 - "Goblin Gumbo"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 42760;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (42760, 11, 4, 0, 134217984, 0, 2147483648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 60000, 1, 0, 1, 33, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42755, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2375, "Goblin Gumbo", 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectApplyAuraName1` = 23,
+`EffectAmplitude1` = 30000
+-- Comment = 'Replacement for spell 42760 ("Goblin Gumbo")'
+WHERE `Id` = 42760;
+
+-- 38307 && 59043 - positive spell's
+--
+DELETE FROM `spell_dbc` WHERE `Id` IN (59043, 38307);
+INSERT INTO `spell_dbc` (`Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`) VALUES
+(38307, 0, 2, 0, 0, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 15, 0, 0, 101, 0, 0, 60, 60, 1, 4, 3, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 61, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 189, 0, 0, 0, 0, 0, 0, 0, 0, 16777216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 164, "", 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 32),
+(59043, 0, 2, 0, 0, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 15, 0, 0, 101, 0, 0, 60, 60, 1, 4, 3, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 154, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 189, 0, 0, 0, 0, 0, 0, 0, 0, 16777216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 164, "", 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 32);
+
+UPDATE `spell_dbc` SET
+`AttributesEx` = `AttributesEx` &~ 128,
+`Comment` = 'Replacement for spell 38307 ("The Dark of Night")'
+WHERE `Id` = 38307;
+
+UPDATE `spell_dbc` SET
+`AttributesEx` = `AttributesEx` &~ 128,
+`Comment` = 'Replacement for spell 59043 ("The Darkest Night")'
+WHERE `Id` = 59043;
+
+-- Replace DBC values for spell 47435 - "Scrape Corrosive Spit"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 47435;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (47435, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 24, 77, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "Scrape Corrosive Spit", 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+UPDATE `spell_dbc` SET
+`CasterAuraSpell`= 47447
+WHERE `Id` = 47435;
+
+-- Replace DBC values for spell 55689 - "Glyph of Shadow"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 55689;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (55689, 0, 0, 0, 192, 0, 0, 67108864, 0, 0, 0, 0, 134217728, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 65536, 100, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 99, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 61792, 0, 0, 0, 64, 0, 0, 64, 0, 0, 0, 0, 1, "Glyph of Shadow", 0, 6, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+UPDATE `spell_dbc` SET
+`Stances` = 0,
+`Comment` = 'Replacement for spell 55689 ("Glyph of Shadow") '
+WHERE `Id` = 55689;
+
+-- Replace DBC values for spell 48156 - "Mind Flay"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 48156;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (48156, 0, 0, 0, 65536, 67125252, 524288, 0, 0, 134225920, 8388608, 0, 134217728, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 15, 0, 0, 101, 0, 84, 80, 80, 27, 0, 0, 0, 0, 0, 4, 0, 0, -1, 0, 0, 6, 6, 6, 0, 1, 1, 0, 0, 0, 0, -51, 195, 0, 11, 0, 6, 6, 1, 0, 0, 0, 0, 0, 0, 4, 33, 227, 0, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58381, 0, 0, 0, 0, 0, 0, 0, 0, 0, 548, "Mind Flay", 9, 133, 1500, 0, 6, 0, 0, 64, 0, 1, 1, 1, 1, 1, 0, 32, 0 );
+
+UPDATE `spell_dbc` SET
+`SpellFamilyFlags3` = `SpellFamilyFlags3` | 1024,
+`Comment` = 'Replacement for spell 48156 ("Mind Flay")'
+WHERE `Id` = 48156;
+
+-- Replace DBC values for spell 15257, 15331, 15332 - "Shadow Weaving"
+--
+DELETE FROM `spell_dbc` WHERE `Id` IN (15257, 15331, 15332);
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (15257, 0, 0, 0, 448, 0, 0, 67108864, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15258, 0, 0, 42508304, 525314, 0, 0, 0, 0, 0, 0, 0, 9, "Shadow Weaving", 0, 6, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 ),
+       (15331, 0, 0, 0, 448, 0, 0, 67108864, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 65, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15258, 0, 0, 42508304, 525314, 0, 0, 0, 0, 0, 0, 0, 9, "Shadow Weaving", 0, 6, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 ),
+       (15332, 0, 0, 0, 448, 0, 0, 67108864, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 99, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15258, 0, 0, 42508304, 525314, 0, 0, 0, 0, 0, 0, 0, 9, "Shadow Weaving", 0, 6, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+UPDATE `spell_dbc` SET
+`EffectSpellClassMaskA3` = `EffectSpellClassMaskA3` | 64,
+`Comment` = 'Replacement for spell 15257,15331,15332 ("Shadow Weaving")'
+WHERE `Id` IN (15257, 15331, 15332);
+
+-- Replace DBC values for spells 66532, 66963, 66964, 66965 - "Fel Fireball" (all difficulties)- make them interruptable
+-- Lord Jaraxxus encounter, Trial of the Crusader
+DELETE FROM `spell_dbc` WHERE `Id` IN (66532, 66963, 66964, 66965);
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES
+(66532, 0, 1, 0, 0, 136, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 9, 0, 0, 101, 0, 0, 0, 0, 28, 13, 0, -1, 0, 0, 2, 6, 0, 775, 301, 0, 0, 0, 0, 15112, 5849, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2352, "Fel Fireball", 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 4 ),
+(66963, 0, 1, 0, 0, 136, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 9, 0, 0, 101, 0, 0, 0, 0, 28, 13, 0, -1, 0, 0, 2, 6, 0, 1251, 475, 0, 0, 0, 0, 24374, 9262, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2352, "Fel Fireball", 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 4 ),
+(66964, 0, 1, 0, 0, 136, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 9, 0, 0, 101, 0, 0, 0, 0, 28, 13, 0, -1, 0, 0, 2, 6, 0, 925, 401, 0, 0, 0, 0, 18037, 7799, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2352, "Fel Fireball", 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 4 ),
+(66965, 0, 1, 0, 0, 136, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 9, 0, 0, 101, 0, 0, 0, 0, 28, 13, 0, -1, 0, 0, 2, 6, 0, 1751, 551, 0, 0, 0, 0, 34124, 10724, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2352, "Fel Fireball", 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 4 );
+
+UPDATE `spell_dbc` SET
+`InterruptFlags` = 0x04,
+`Comment` = 'Replacement for spell "Fel Fireball" - set SPELL_INTERRUPT_FLAG_INTERRUPT'
+WHERE `Id` IN (66532, 66963, 66964, 66965);
+
+-- Replace DBC values for spell 64934 - "Item - Warrior T8 protection 4P bonus (absent in DBC)"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 64934;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (64934, 132, 0, 0, 327696, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 4, 64, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, -21, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Shield Wall", 0, 0, 0, 0, 4, 8192, 0, 0, 0, 2, 2, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`Comment` = 'Replace DBC values for spell 64934 - "Item - Warrior T8 protection 4P bonus (absent in DBC)"'
+WHERE `Id` IN (64934);
+
+-- Replace DBC values for spell 52143 - "Master of Ghouls"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 52143;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (52143, 0, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 6, 10, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, -60001, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 4096, 0, 0, 0, 32, 0, 0, 0, 0, 221, "Master of Ghouls", 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`ManaCost`=0, -- old value = 10
+`Comment` = 'Replacement for spell 52143 ("Master of Ghouls")'
+WHERE `Id` = 52143;
+
+-- Replace DBC values for spell 53258 - "Empower Rune Weapon"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 53258;
+INSERT INTO `spell_dbc` (`Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID`, `Comment`) VALUES
+(53258, 0, 0, 0, 262144, 1024, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 75, 75, 0, 5, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 146, 146, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2622, 0, 0, 0, 0, 15, 16384, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 'Empower Rune Weapon');
+
+UPDATE `spell_dbc` SET
+`Comment` = 'Replace DBC values for spell 53258 (absent in DBC)'
+WHERE `Id` = 53258;
+
+-- Replace DBC values for spell 25771 - "Forbearance"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 25771;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (25771, 0, 0, 25, 603979776, 196744, 4, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 13, 0, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 236, "Forbearance", 0, 0, 0, 0, 10, 0, 0, 128, 0, 0, 0, 1, 1, 1, 0, 2, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectMiscValue1` = 29,
+`Comment` = 'Replacement for spell 25771 ("Forbearance")'
+WHERE `Id` = 25771;
+
+-- Replace DBC values for spell 45438 - "Ice Block"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 45438;
+
+-- Replace DBC values for spell 53755 - "Flask of the Frost Wyrm"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 53755;
+-- Not needed anymore.
+/*INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (53755, 99, 0, 0, 671088640, 0, 1, 1048576, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1000, 0, 0, 0, 101, 0, 0, 46, 46, 42, 4, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 124, 124, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 13, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 126, 0, 0, 0, 0, 53901, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3623, "Flask of the Frost Wyrm", 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`SpellFamilyName` = 0,
+`Comment` = 'Replacement for spell 53755 ("Flask of the Frost Wyrm")'
+WHERE `Id` = 53755; */
+
+-- Replace DBC values for spell 23493 - "Restoration"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 23493;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (23493, 0, 0, 0, 134217984, 0, 0, 131072, 4096, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 4097, 0, 101, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 6, 0, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 1000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 358, "Restoration", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`AuraInterruptFlags` = 4099,
+`Comment` = 'Replacement for spell 23493 ("Restoration")'
+WHERE `Id` = 23493;
+
+-- Replace DBC values for spell 67016 - "Flask of the North"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 67016;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (67016, 0, 0, 0, 671088640, 0, 1, 1048576, 2228224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 15, 42, 4, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 46, 46, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 13, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3622, "Flask of the North", 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`SpellFamilyName` = 0,
+`Comment` = 'Replacement for spell 67016 ("Flask of the North")'
+WHERE `Id` = 67016;
+
+-- Replace DBC values for spell 67017 - "Flask of the North"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 67017;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (67017, 0, 0, 0, 671088640, 0, 1, 1048576, 2228224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 15, 42, 4, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 79, 79, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 99, 124, 0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3622, "Flask of the North", 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`SpellFamilyName` = 0,
+`Comment` = 'Replacement for spell 67017 ("Flask of the North")'
+WHERE `Id` = 67017;
+
+-- Replace DBC values for spell 67018 - "Flask of the North"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 67018;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (67018, 0, 0, 0, 671088640, 0, 1, 1048576, 2228224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 15, 42, 4, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3622, "Flask of the North", 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`SpellFamilyName` = 0,
+`Comment` = 'Replacement for spell 67018 ("Flask of the North")'
+WHERE `Id` = 67018;
+
+-- Replace DBC values for spell 50782 - "Slam"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 50782;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (50782, 0, 0, 0, 327696, 134218240, 0, 1536, 0, 0, 524288, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 13, 0, 0, 101, 0, 0, 1, 1, 0, 1, 150, 0, 0, 0, 2, 0, 0, 2, 173555, 0, 58, 0, 0, 1, 0, 0, 0, 0, 0, 249, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 559, "", 0, 133, 1500, 0, 4, 2097152, 0, 0, 0, 2, 2, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`ManaCost` = 0,
+`Comment` = 'Replacement for spell 50782 ("Slam")'
+WHERE `Id` = 50782;
+
+-- Replace DBC values for spell 69065 - "Impaled"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 69065;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (69065, 0, 0, 0, 2910846976, 1056, 268976133, 1245184, 8388736, 917512, 12292, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 537395200, 0, 101, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 13, 0, 0, -1, 0, 0, 6, 6, 0, 0, 1, 0, 0, 0, 0, 0, 9, 0, 0, 15, 0, 25, 25, 0, 0, 0, 0, 0, 0, 0, 12, 89, 0, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2163, "Impaled", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`AttributesEx3` = `AttributesEx3` &~ 1048576,
+`Comment` = 'Replacement for spell 69065 ("Impaled")'
+WHERE `Id` = 69065;
+
+-- Replace DBC values for spell 32375 - "Mass Dispel"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 32375;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (32375, 0, 0, 0, 536936448, 0, 524288, 0, 0, 0, 0, 0, 134217728, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 15, 0, 0, 101, 0, 0, 70, 70, 0, 0, 0, 0, 0, 0, 4, 0, 0, -1, 0, 0, 38, 64, 64, 1, 1, 1, 0, 0, 0, 0, 0, 72733, 0, 0, 0, 31, 16, 1, 0, 0, 0, 18, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 32592, 72734, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2267, "Mass Dispel", 33, 133, 1500, 0, 6, 0, 128, 0, 10, 1, 1, 1, 1, 1, 0, 2, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectImplicitTargetA2` = 1, -- old value = 16
+`Comment` = 'Replacement for spell 32375 "Mass Dispel"'
+WHERE `Id` = 32375;
+
+-- Replace DBC values for spell 32592 - "Mass Dispel"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 32592;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (32592, 0, 0, 0, 65536, 0, 524288, 0, 0, 0, 8388608, 0, 134217728, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 70, 70, 0, 0, 0, 0, 0, 0, 4, 0, 0, -1, 0, 0, 38, 64, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 16, 0, 0, 0, 0, 18, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 39897, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2267, "Mass Dispel", 0, 133, 0, 0, 6, 0, 128, 0, 10, 1, 1, 1, 1, 1, 0, 2, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectImplicitTargetA2` = 1, -- old value = 16
+`Comment` = 'Replacement for spell 32592 ("Mass Dispel")'
+WHERE `Id` = 32592;
+
+-- Replace DBC values for spell 45524 - "Chains of Ice"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 45524;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (45524, 0, 1, 0, 0, 134217728, 0, 0, 2048, 0, 8388608, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 58, 58, 1, 5, 0, 0, 0, 0, 3, 0, 0, -1, 0, 0, 6, 6, 3, 1, 1, 0, 0, 0, 0, -96, 9, 0, 11, 0, 0, 6, 6, 1, 0, 0, 0, 0, 0, 0, 33, 226, 0, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 180, "Chains of Ice", 0, 133, 1500, 0, 15, 4, 49152, 0, 0, 1, 1, 1, 1, 1, 0, 16, 261 );
+
+UPDATE `spell_dbc` SET
+`EffectImplicitTargetA3` = 0,
+`Comment` = 'Replacement for spell 45524 ("Chains of Ice")'
+WHERE `Id` = 45524;
+
+-- Replace DBC values for spell 65783 - "Ogre Pinata"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 65783;
+
+-- Replace DBC values for spell "Elemental Weapons"
+--
+DELETE FROM `spell_dbc` WHERE `Id` IN (16266, 29079, 29080);
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (16266, 0, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 6, 1, 1, 1, 0, 0, 0, 9, 9, 12, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 108, 108, 108, 0, 0, 0, 0, 0, 0, 0, 0, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 1048576, 0, 2097152, 0, 0, 8388608, 0, 0, 679, "Elemental Weapons", 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (29079, 0, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 6, 1, 1, 1, 0, 0, 0, 19, 19, 26, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 108, 108, 108, 0, 0, 0, 0, 0, 0, 0, 0, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 1048576, 0, 2097152, 0, 0, 8388608, 0, 0, 679, "Elemental Weapons", 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (29080, 0, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 6, 1, 1, 1, 0, 0, 0, 29, 29, 39, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 108, 108, 108, 0, 0, 0, 0, 0, 0, 0, 0, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 1048576, 0, 2097152, 0, 0, 8388608, 0, 0, 679, "Elemental Weapons", 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectMiscValue2` = 3,
+`EffectMiscValue3` = 3
+WHERE `Id` IN  (16266, 29079, 29080);
+
+-- Replace DBC values for spell 26374 - "Elune\'s Candle"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 26374;
+-- currently (YTDB 621) used over DB hack
+-- INSERT INTO `spell_dbc`
+-- ( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+-- VALUES (26374, 0, 0, 0, 262160, 525312, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, -1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "Elune\'s Candle", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`Effect1` = 64,
+`EffectTriggerSpell1` = 26636,
+`Comment` = 'Replacement for spell 26374 ("Elunes Candle")'
+WHERE `Id` = 26374;
+
+-- Replace DBC values for spell 54897 - "Flaming Arrow"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 54897;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (54897, 0, 0, 0, 16777472, 1024, 0, 0, 128, 0, 266240, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2000, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134, 35, 0, -1, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 87, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 54798, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 680, "Flaming Arrow", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectImplicitTargetA1` = 46,
+`Comment` = 'Replacement for spell 54897 ("Flaming Arrow")'
+WHERE `Id` = 54897;
+
+-- Replace DBC values for spell 66551 - "Teleport(BattlegroundIC)"
+
+DELETE FROM `spell_dbc` WHERE `Id` = 66551;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask` )
+VALUES (66551, 0, 0, 0, 67108864, 0, 4, 0, 8193, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 18, 1, 0, -1, 0, 0, 5, 6, 6, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 46, 0, 0, 0, 0, 0, 0, 139, 139, 0, 0, 0, 0, 0, 0, 0, 1059, 1102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1690, "", 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1 );
+
+UPDATE `spell_dbc` SET
+`RangeIndex` = 13,
+`Comment` = 'Replacement for spell 66551 ("Teleport(BattlegroundIC)")'
+WHERE `Id` = 66551;
+
+-- Replace DBC values for spell 12536 - "Clearcasting"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 12536;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (12536, 0, 1, 0, 327680, 0, 4, 1073741824, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 87376, 100, 1, 0, 10, 10, 8, 0, 0, 0, 0, 0, 6, 0, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, -1001, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 549591799, 168000, 0, 0, 0, 0, 0, 0, 0, 212, "Clearcasting", 0, 0, 0, 0, 3, 0, 2, 8, 0, 1, 1, 1, 1, 1, 0, 64, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectBasePoints1` = -101, -- old value = -1001
+`Comment` = 'Replacement for spell 12536 ("Clearcasting")'
+WHERE `Id` = 12536;
+
+-- Replace DBC values for spell 57761 - "Fireball!"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 57761;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (57761, 0, 1, 0, 327680, 0, 4, 1073741824, 128, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 10, 10, 8, 0, 0, 0, 0, 0, 6, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, -1001, -100001, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 108, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 10, 0, 0, 0, 0, 0, 0, 0, 1, 4096, 0, 1, 4096, 0, 0, 0, 0, 2938, "Fireball!", 0, 0, 0, 0, 3, 0, 2, 8, 0, 1, 1, 1, 1, 1, 0, 16, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectBasePoints1` = -101, -- old value = -1001
+`Comment` = 'Replacement for spell 57761 ("Fireball!")'
+WHERE `Id` = 57761;
+
+-- Replace DBC values for spell 63414 - Spinning Up
+DELETE FROM `spell_dbc` WHERE ID=63414;
+INSERT INTO `spell_dbc` (`Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`)
+VALUES ( 63414 , 0 , 0 , 0 , 0 , 268451844 , 4 , 0 , 0 , 0 , 1024 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 101 , 0 , 0 , 0 , 0 , 35 , 13 , 0 , -1 , 0 , 0 , 6 , 140 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 38 , 38 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 23 , 0 , 0 , 4000 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 63274 , 66490 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 2281 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 1 , 1 , 0 , 1 ,'Spinning Up');
+
+UPDATE `spell_dbc` SET
+`EffectImplicitTargetA1`=1, -- old value = 38
+`Comment` = 'Replacement for spell 63414 "Spinning Up"'
+WHERE Id=63414;
+
+-- Replace DBC values for spell 63274 - P3Wx2 Laser Barrage
+DELETE FROM `spell_dbc` WHERE ID=63274;
+INSERT INTO `spell_dbc` (`Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`)
+VALUES ( 63274 , 0 , 0 , 0 , 0 , 268451844 , 4 , 0 , 0 , 0 , 1024 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 101 , 0 , 0 , 0 , 0 , 1 , 13 , 0 , -1 , 0 , 0 , 6 , 6 , 6 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , -1 , 0 , 0 , 0 , 0 , 38 , 1 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 4 , 23 , 284 , 0 , 250 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 63293 , 63300 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 2281 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 1 , 1 , 0 , 1 ,'P3Wx2 Laser Barrage');
+
+UPDATE `spell_dbc` SET
+`EffectImplicitTargetA1`=38, -- old value = 38 # With value 1 ERROR:Table `spell_script_target`: spellId 63274 listed for TargetEntry 33576 does not have any implicit target TARGET_SCRIPT(38) or TARGET_SCRIPT_COORDINATES (46) or TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT (40).
+`Comment` = 'Replacement for spell 63274 "P3Wx2 Laser Barrage"'
+WHERE Id=63274;
+
+-- Replace DBC values for spell 64397 - Summon Swarming Guardian
+DELETE FROM `spell_dbc` WHERE ID=64397;
+INSERT INTO `spell_dbc` (`Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID`, `Comment`)
+VALUES ( 64397 , 0 , 0 , 0 , 256 , 268435456 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 101 , 0 , 0 , 0 , 0 , 21 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , -1 , 0 , 0 , 28 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 46 , 0 , 0 , 86 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 34034 , 0 , 0 , 66 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 1 , 1 , 0 , 1 , 0 ,'Summon Swarming Guardian');
+
+UPDATE `spell_dbc` SET
+`RangeIndex`=6, -- old value = 1
+`Comment` = 'Replacement for spell 64397 "Summon Swarming Guardian"'
+WHERE Id=64397;
+
+-- Replace DBC values for spell 71266 - "Swarming Shadows"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 71266;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (71266, 0, 0, 0, 0, 0, 4, 0, 129, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 13, 0, 0, -1, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38163, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2959, "Swarming Shadows", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 723, 32, 0 );
+
+UPDATE `spell_dbc` SET
+`AreaGroupId` = 0,
+`Comment` = 'Replacement for spell 71266 ("Swarming Shadows")'
+WHERE `Id` = 71266;
+
+-- Replace DBC values for spell 72890 - "Swarming Shadows"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 72890;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (72890, 0, 0, 0, 0, 0, 4, 0, 129, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 591, 0, 0, 0, 0, 0, 13, 0, 0, -1, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38163, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2959, "Swarming Shadows", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 723, 32, 0 );
+
+-- Put there corrects for spell data values in readable form (example below)
+UPDATE `spell_dbc` SET
+`AreaGroupId` = 0,
+`Comment` = 'Replacement for spell 72890 ("Swarming Shadows")'
+WHERE `Id` = 72890;
+
+-- Replace DBC values for spell 56046 - "Portal Beam"
+--
+DELETE FROM `spell_dbc` WHERE ID=56046;
+INSERT INTO `spell_dbc` (`Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID`, `Comment`)
+VALUES ( 56046 , 0 , 0 , 0 , 256 , 268435460 , 4 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 101 , 0 , 0 , 0 , 0 , 21 , 0 , 0 , 0 , 0 , 0 , 13 , 0 , 0 , -1 , 0 , 0 , 6 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 25 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 4 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 1 , 1 , 0 , 1 , 0 ,'Portal Beam - Malygos beginning spell');
+
+UPDATE `spell_dbc` SET
+`DurationIndex`=8, -- old value = 21
+`Comment` = 'Replacement for spell 56046 "Portal Beam"'
+WHERE Id=56046;
+
+-- Replace DBC values for spell 71189 - "Dreamwalker's Rage"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 71189;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (71189, 0, 0, 0, 0, 524288, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 9, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 9999999, 0, 0, 0, 0, 0, 22, 0, 0, 7, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3088, "Dreamwalker\'s Rage", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 8, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectRadiusIndex1` = 12,
+`Comment` = 'Replacement for spell 71189 ("Dreamwalker\'s Rage")'
+WHERE `Id` = 71189;
+
+-- Replace DBC values for spell 68985 - "Harvest Soul"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 68985;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (68985, 0, 0, 0, 256, 268435456, 4, 0, 0, 16777224, 1024, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 13, 0, 0, -1, 0, 0, 6, 6, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 236, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2723, "Harvest Soul", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 32, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectBasePoints1` = 0,
+`Comment` = 'Replacement for spell 68985 ("Harvest Soul")'
+WHERE `Id` = 68985;
+
+-- Replace DBC values for spell 64904 - "Hymn of Hope"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 64904;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (64904, 0, 1, 0, 0, 136, 1073741828, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 84, 80, 80, 31, 0, 0, 0, 0, 0, 5, 0, 0, -1, 0, 0, 137, 6, 0, 1, 1, 0, 0, 0, 0, 2, 19, 0, 0, 0, 0, 22, 22, 0, 30, 30, 0, 23, 23, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2894, "Hymn of Hope", 0, 0, 0, 0, 6, 0, 0, 16, 0, 0, 0, 1, 1, 1, 0, 2, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectApplyAuraName2` = 132,
+`Comment` = 'Replacement for spell 64904 ("Hymn of Hope")'
+WHERE `Id` = 64904;
+
+-- Replace DBC values for spell "Everlasting Affliction"
+--
+DELETE FROM `spell_dbc` WHERE `Id` IN (47201, 47202, 47203, 47204, 47205);
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES
+    (47201, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 65536, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 42, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 47422, 0, 0, 0, 0, 0, 0, 273, 0, 0, 0, 0, 3169, "Everlasting Affliction", 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 ),
+    (47202, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 65536, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 42, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 47422, 0, 0, 0, 0, 0, 0, 257, 0, 0, 0, 0, 3169, "Everlasting Affliction", 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 ),
+    (47203, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 65536, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 42, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 47422, 0, 0, 0, 0, 0, 0, 257, 0, 0, 0, 0, 3169, "Everlasting Affliction", 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 ),
+    (47204, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 65536, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 42, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 47422, 0, 0, 0, 0, 0, 0, 257, 0, 0, 0, 0, 3169, "Everlasting Affliction", 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 ),
+    (47205, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 65536, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 42, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 47422, 0, 0, 0, 0, 0, 0, 257, 0, 0, 0, 0, 3169, "Everlasting Affliction", 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectSpellClassMaskB1` = 0x2,
+`EffectSpellClassMaskB2` = 0x100,
+`Comment` = 'Replacement for spell "Everlasting Affliction"'
+WHERE `Id` IN (47201, 47202, 47203, 47204, 47205);
+
+-- Replace DBC values for spell "Improved Poisons"
+--
+DELETE FROM `spell_dbc` WHERE `Id` IN (14113,14114,14115,14116, 14117);
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES
+
+    (14113, 0, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 3, 9, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 107, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 26, 0, 0, 0, 0, 0, 0, 0, 65536, 0, 0, 8192, 0, 0, 0, 0, 0, 247, "Improved Poisons (replace by spell_dbc)", 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 ),
+    (14114, 0, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 7, 19, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 107, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 26, 0, 0, 0, 0, 0, 0, 0, 65536, 0, 0, 8192, 0, 0, 0, 0, 0, 247, "Improved Poisons (replace by spell_dbc)", 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 ),
+    (14115, 0, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 11, 29, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 107, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 26, 0, 0, 0, 0, 0, 0, 0, 65536, 0, 0, 8192, 0, 0, 0, 0, 0, 247, "Improved Poisons (replace by spell_dbc)", 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 ),
+    (14116, 0, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 15, 39, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 107, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 26, 0, 0, 0, 0, 0, 0, 0, 65536, 0, 0, 8192, 0, 0, 0, 0, 0, 247, "Improved Poisons (replace by spell_dbc)", 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 ),
+    (14117, 0, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 19, 49, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 107, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 26, 0, 0, 0, 0, 0, 0, 0, 65536, 0, 0, 8192, 0, 0, 0, 0, 0, 247, "Improved Poisons (replace by spell_dbc)", 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectSpellClassMaskA2` = 0x80000,
+`Comment` = 'Replacement for spell "Improved Poisons"'
+WHERE `Id` IN (14113,14114,14115,14116, 14117);
+
+DELETE FROM `spell_dbc` WHERE `Id` = 28429;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (28429, 0, 0, 0, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 20, 25, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28428, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 152, "Instant Poison Proc (replace by spell_dbc)", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`SpellFamilyFlags1` =  0x2000,
+`Comment` = 'Replacement for spell 28429 ("Instant Poison Proc")'
+WHERE `Id` = 28429;
+
+-- Replace DBC values for spell 37445 - "Mana Surge"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 37445;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (37445, 1141, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 15000, 0, 0, 0, 101, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 1, 0, 2, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, 224, 224, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 13, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 126, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 2281, "Mana Surge", 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`EffectSpellClassMaskA1` = 0,
+`EffectSpellClassMaskA2` = 0,
+`EffectSpellClassMaskA3` = 0,
+`Comment` = 'Replacement for spell 37445 ("Mana Surge")'
+WHERE `Id` = 37445;
+
+-- Replace DBC values for spell 62705 - Auto-repair
+--
+DELETE FROM `spell_dbc` WHERE ID = 62705;
+INSERT INTO `spell_dbc` (`Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID`, `Comment`)
+VALUES ( 62705 , 0 , 0 , 0 , 2843738112 , 1056 , 268976133 , 269680640 , 8388736 , 393224 , 16781316 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 101 , 0 , 0 , 0 , 0 , 3 , 0 , 0 , 0 , 0 , 0 , 3 , 0 , 0 , -1 , 0 , 0 , 77 , 137 , 6 , 1 , 1 , 0 , 0 , 0 , 0 , 99 , 99 , 0 , 0 , 0 , 0 , 18 , 18 , 18 , 8 , 8 , 8 , 13 , 13 , 13 , 0 , 0 , 4 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 3 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 656 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 1 , 1 , 0 , 1 , 0 ,'Auto-repair');
+
+UPDATE `spell_dbc` SET
+`ExcludeTargetAuraSpell` = 62705, -- old value = 0
+`Comment` = 'Replacement for spell 62705 "Auto-repair"'
+WHERE `Id` = 62705;
+
+-- Reconstruct DBC values for spell 49866 - "Mirror image initialize"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 49866;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (49866, 0, 0, 0, 536871168, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, -1, 0, 0, 140, 0, 0, 1, 0, 0, 0, 0, 0, 52348, 0, 0, 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45204, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 169, "Reconstruction: mirror image initialize", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+-- Replace DBC values for spell 22048 - "Attack"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 22048;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (22048, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 101, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 3, 25, 0, -1, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 680, "Attack", 0, 0, 0, 0, 11, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 4, 0 );
+
+UPDATE `spell_dbc` SET
+`MaxLevel` = 19,
+`SpellFamilyFlags1` = 1073741824, -- old value = 0
+`Comment` = 'Replacement for spell 22048 ("Attack")'
+WHERE `Id` = 22048;
+
+-- Replace DBC values for spell 71708 - "Empowered Flare"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 71708;
+INSERT INTO `spell_dbc`
+(`Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID`)
+VALUES (71708, 0, 0, 0, 0, 136, 0, 256, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 101, 0, 0, 70, 70, 0, 0, 0, 0, 0, 0, 1, 20, 0, -1, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 999, 0, 0, 0, 0, 0, 22, 0, 0, 15, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 816, "Empowered Flare", 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 4, 0 );
+
+UPDATE `spell_dbc` SET
+`AttributesEx6` = 0x20000000 -- old value = 0
+WHERE `Id` = 71708;
+
+-- Replace DBC values for spell 61719 - "Easter Lay Noblegarden Egg Aura"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 61719;
+INSERT INTO `spell_dbc`
+( `Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID` )
+VALUES (61719, 0, 0, 0, 134217984, 268437504, 0, 0, 524288, 0, 1024, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 63, 5902479, 0, 101, 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 15000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 61718, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "Easter Lay Noblegarden Egg Aura", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0 );
+
+UPDATE `spell_dbc` SET
+`AuraInterruptFlags` = 0 -- Interrupt by liked spell! (61716)
+WHERE `Id` = 61719;
+
+-- Replace DBC values for spell 69846 - "Frost Bomb"
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 69846;
+INSERT INTO `spell_dbc`
+(`Id`, `Category`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `RequiresSpellFocus`, `CasterAuraState`, `TargetAuraState`, `CasterAuraStateNot`, `TargetAuraStateNot`, `CasterAuraSpell`, `TargetAuraSpell`, `ExcludeCasterAuraSpell`, `ExcludeTargetAuraSpell`, `CastingTimeIndex`, `RecoveryTime`, `CategoryRecoveryTime`, `InterruptFlags`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `PowerType`, `ManaCost`, `ManaCostPerLevel`, `ManaPerSecond`, `ManaPerSecondPerLevel`, `RangeIndex`, `Speed`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectItemType1`, `EffectItemType2`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `SpellIconID`, `Comment`, `ManaCostPercentage`, `StartRecoveryCategory`, `StartRecoveryTime`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `RuneCostID`)
+VALUES (69846, 0, 0, 0, 384, 136, 4, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 9, 0, 0, 101, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 13, 8, 0, -1, 0, 0, 3, 28, 0, 1, 1, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, 87, 87, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37186, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1236, "Frost Bomb", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 16, 0 );
+
+UPDATE `spell_dbc` SET
+`Speed` = 0 -- old value = 8
+WHERE `Id` = 69846;
diff --git a/sql_mr/mr03135_mangos_rfc_commands.sql b/sql_mr/mr03135_mangos_rfc_commands.sql
new file mode 100644
index 00000000000..083fc5c6cab
--- /dev/null
+++ b/sql_mr/mr03135_mangos_rfc_commands.sql
@@ -0,0 +1,5 @@
+-- RFC commands
+DELETE FROM `command` WHERE `name` IN ('character changefaction', 'character changerace');
+INSERT INTO `command` (`name`, `security`, `help`) VALUES
+('character changerace', 3,'Syntax: .character changerace [$name]\r\nMark selected in game or by $name in command character for change race at next login.'),
+('character changefaction', 3,'Syntax: .character changefaction [$name]\r\nMark selected in game or by $name in command character for change faction at next login.');
diff --git a/sql_mr/mr03176_characters_guild.sql b/sql_mr/mr03176_characters_guild.sql
new file mode 100644
index 00000000000..1618f5872c1
--- /dev/null
+++ b/sql_mr/mr03176_characters_guild.sql
@@ -0,0 +1,2 @@
+
+ALTER TABLE `guild` CHANGE `info` `info` VARCHAR(500) NOT NULL DEFAULT '';
diff --git a/sql_mr/readme.txt b/sql_mr/readme.txt
new file mode 100644
index 00000000000..2c8efdd7ab5
--- /dev/null
+++ b/sql_mr/readme.txt
@@ -0,0 +1,23 @@
+You should install these files if you want to fully functionality
+
+Instructions for CLEAN DBs:
+1. Apply custom_characters_tables.sql (no need to run single sqls for fresh install)
+2. Apply custom_realmd_tables.sql (no need to run single sqls for fresh install)
+3. Apply custom_mangos_tables.sql
+4. Apply custom_rerun_every_YTDB_update.sql
+5. Apply mr*mangos*.sql
+
+Instructions for EXISTING DBs:
+1. Apply mr*characters*.sql
+2. Apply mr*realmd*.sql
+3. Apply mr*mangos*sql
+
+Instructions for Every Official DBs Update:
+1. Apply custom_rerun_every_YTDB_update.sql
+
+Guids :
+Name                            Creature                   GameObject
+The Ring of valor               0                          222001 - 222016
+Dalaran Arena                   0                          222020 - 222025
+Strand of the Ancients          200001 - 200036            200008 - 200185
+Isle of Conquest                300000 - 300068            300000 - 300138
diff --git a/sql_mr/static_guids_policy.txt b/sql_mr/static_guids_policy.txt
new file mode 100644
index 00000000000..b796610872c
--- /dev/null
+++ b/sql_mr/static_guids_policy.txt
@@ -0,0 +1,44 @@
+Static GUID distribution policy for mangosR2 branch
+Attention! If your use new GUID's scope for some creatures/objects - first define his in this table.
+------------------------------------------------------------------------------------------------------------
+Area           | map num |       | Creature start | Creature end | Object start | Object end | Comment     |
+------------------------------------------------------------------------------------------------------------
+World oPvP     | -all-   |       | 500000         | 509999       | 500000       | 509999     |             |
+------------------------------------------------------------------------------------------------------------
+Strand of the  |  607    |       | 510000         | 519999       | 510000       | 519999     |             |
+Ancients (SOTA)|         |       |                |              |              |            |             |
+------------------------------------------------------------------------------------------------------------
+Isle of        |  628    |       | 520000         | 529999       | 520000       | 529999     |             |
+ Conquest (IOC)|         |       |                |              |              |            |             |
+------------------------------------------------------------------------------------------------------------
+ Wintergrasp   |  571    |       | 530000         | 539999       | 530000       | 539999     |             |
+               |         |       |                |              |              |            |             |
+------------------------------------------------------------------------------------------------------------
+ Arenas:       |         |       | 540000         | 549999       | 540000       | 549999     |             |
+ Dalaran arena |         |  617  |     540000     |     540999   |     540000   |     540999 |             |
+ Ring of Valor |         |  618  |     541000     |     541999   |     541000   |     541999 |             |
+               |         |       |     542000     |     542999   |     542000   |     542999 |             |
+               |         |       |     543000     |     543999   |     543000   |     543999 |             |
+               |         |       |     544000     |     544999   |     544000   |     544999 |             |
+               |         |       |     545000     |     545999   |     545000   |     545999 |             |
+               |         |       |     546000     |     546999   |     546000   |     546999 |             |
+               |         |       |     547000     |     547999   |     547000   |     547999 |             |
+               |         |       |     548000     |     548999   |     548000   |     548999 |             |
+               |         |       |     549000     |     549999   |     549000   |     549999 |             |
+               |         |       |                |              |              |            |             |
+------------------------------------------------------------------------------------------------------------
+               |         |       | 550000         | 559999       | 550000       | 559999     |             |
+               |         |       |                |              |              |            |             |
+------------------------------------------------------------------------------------------------------------
+               |         |       | 560000         | 569999       | 560000       | 569999     |             |
+               |         |       |                |              |              |            |             |
+------------------------------------------------------------------------------------------------------------
+               |         |       | 570000         | 579999       | 570000       | 579999     |             |
+               |         |       |                |              |              |            |             |
+------------------------------------------------------------------------------------------------------------
+               |         |       | 580000         | 589999       | 580000       | 589999     |             |
+               |         |       |                |              |              |            |             |
+------------------------------------------------------------------------------------------------------------
+               |         |       | 590000         | 599999       | 590000       | 599999     |             |
+               |         |       |                |              |              |            |             |
+------------------------------------------------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cfcf2f6fcf6..977ce3f19a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,9 +26,9 @@ if(WIN32)
   )
 endif()
 
-add_subdirectory(bindings)
-add_subdirectory(framework)
 add_subdirectory(shared)
+add_subdirectory(framework)
 add_subdirectory(realmd)
 add_subdirectory(game)
 add_subdirectory(mangosd)
+add_subdirectory(bindings)
diff --git a/src/bindings/.gitignore b/src/bindings/.gitignore
index 22c02c26712..d78f18eb34c 100644
--- a/src/bindings/.gitignore
+++ b/src/bindings/.gitignore
@@ -14,3 +14,4 @@
 #
 */
 !universal/
+!ScriptDev2/
diff --git a/src/bindings/CMakeLists.txt b/src/bindings/CMakeLists.txt
index 63d7da5469f..3bcd071c2d7 100644
--- a/src/bindings/CMakeLists.txt
+++ b/src/bindings/CMakeLists.txt
@@ -16,4 +16,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# add_subdirectory(universal)
+add_subdirectory(ScriptDev2)
\ No newline at end of file
diff --git a/src/bindings/ScriptDev2 b/src/bindings/ScriptDev2
new file mode 160000
index 00000000000..2a8e75e7cf4
--- /dev/null
+++ b/src/bindings/ScriptDev2
@@ -0,0 +1 @@
+Subproject commit 2a8e75e7cf4bc5e2aefeac65ef7eafbb43950c12
diff --git a/src/bindings/universal/CMakeLists.txt b/src/bindings/universal/CMakeLists.txt
index 651bba6d080..e990c92e9f4 100644
--- a/src/bindings/universal/CMakeLists.txt
+++ b/src/bindings/universal/CMakeLists.txt
@@ -16,7 +16,17 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-file(GLOB_RECURSE mangosscript_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h)
+set(LIBRARY_NAME mangosscript)
+
+set(LIBRARY_SRCS
+    config.h
+    ScriptMgr.cpp
+    ScriptMgr.h
+    system.cpp
+    Scripts/sc_default.cpp
+    Scripts/sc_defines.cpp
+    Scripts/sc_defines.h
+   )
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/shared
@@ -26,60 +36,59 @@ include_directories(
   ${MYSQL_INCLUDE_DIR}
 )
 
-add_library(mangosscript SHARED
-  ${mangosscript_SRCS}
+add_library(${LIBRARY_NAME} SHARED
+  ${LIBRARY_SRCS}
 )
 
-add_dependencies(mangosscript revision.h)
+add_dependencies(${LIBRARY_NAME} revision.h)
 if(NOT ACE_USE_EXTERNAL)
-  add_dependencies(mangosscript ACE_Project)
-# add_dependencies(mangosscript ace)
+  add_dependencies(${LIBRARY_NAME} ACE_Project)
 endif()
 
-target_link_libraries(mangosscript
+target_link_libraries(${LIBRARY_NAME}
   ${ZLIB_LIBRARIES}
   ${ACE_LIBRARIES}
 )
 
 if(WIN32)
-  target_link_libraries(mangosscript
+  target_link_libraries(${LIBRARY_NAME}
     mangosd # FIXME: could this be done for unix? because unix won't generate exe.libs
   )
   if(WIN32 AND PLATFORM MATCHES X86)
-    target_link_libraries(mangosscript
+    target_link_libraries(${LIBRARY_NAME}
       debug ${WIN_DEBUGLIBS}
     )
   endif()
 endif()
 
 if(UNIX)
-  set(mangosscript_LINK_FLAGS "-pthread")
+  set(LIBRARY_LINK_FLAGS "-pthread")
   if(APPLE)
-    set(mangosscript_LINK_FLAGS "-framework Carbon ${mangosscript_LINK_FLAGS}")
+    set(LIBRARY_LINK_FLAGS "-framework Carbon ${LIBRARY_LINK_FLAGS}")
     # Needed for the linking because of the missing symbols
-    set(mangosscript_LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup ${mangosscript_LINK_FLAGS}")
+    set(LIBRARY_LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup ${LIBRARY_LINK_FLAGS}")
   endif()
 
   if(APPLE)
-    set(mangosscript_PROPERTIES INSTALL_NAME_DIR "${LIBS_DIR}")
+    set(LIBRARY_PROPERTIES INSTALL_NAME_DIR "${LIBS_DIR}")
   else()
-    set(mangosscript_PROPERTIES INSTALL_RPATH ${LIBS_DIR})
+    set(LIBRARY_PROPERTIES INSTALL_RPATH ${LIBS_DIR})
   endif()
 
   # Run out of build tree
-  set(mangosscript_PROPERTIES
-    ${mangosscript_PROPERTIES}
+  set(LIBRARY_PROPERTIES
+    ${LIBRARY_PROPERTIES}
     BUILD_WITH_INSTALL_RPATH OFF
   )
 
-  set_target_properties(mangosscript PROPERTIES
-    LINK_FLAGS ${mangosscript_LINK_FLAGS}
-    ${mangosscript_PROPERTIES}
+  set_target_properties(${LIBRARY_NAME} PROPERTIES
+    LINK_FLAGS ${LIBRARY_LINK_FLAGS}
+    ${LIBRARY_PROPERTIES}
   )
 endif()
 
 # LIBRARY = dyld / so, RUNTIME = dll
-install(TARGETS mangosscript
+install(TARGETS ${LIBRARY_NAME}
   LIBRARY DESTINATION ${LIBS_DIR}
   RUNTIME DESTINATION ${LIBS_DIR}
 )
diff --git a/src/bindings/universal/ScriptMgr.h b/src/bindings/universal/ScriptMgr.h
index 39d0bbbfd93..b8a8b0b84ee 100644
--- a/src/bindings/universal/ScriptMgr.h
+++ b/src/bindings/universal/ScriptMgr.h
@@ -44,7 +44,7 @@ struct Script
         pQuestSelect(NULL), pQuestComplete(NULL), pNPCDialogStatus(NULL), pGODialogStatus(NULL), pChooseReward(NULL),
         pItemHello(NULL), pGOHello(NULL), pProcessEventId(NULL), pAreaTrigger(NULL), pItemQuestAccept(NULL), pGOQuestAccept(NULL),
         pGOChooseReward(NULL), pItemUse(NULL), pEffectDummyGameObj(NULL), pEffectDummyCreature(NULL),
-        pEffectDummyItem(NULL), pEffectAuraDummy(NULL), GetAI(NULL)
+        pEffectDummyItem(NULL), pEffectScriptEffectNPC(NULL), pEffectAuraDummy(NULL), GetAI(NULL), GetInstanceData(NULL)
     {}
 
     std::string Name;
@@ -73,6 +73,7 @@ struct Script
     bool (*pEffectDummyGameObj  )(Unit*, uint32, SpellEffectIndex, GameObject* );
     bool (*pEffectDummyCreature )(Unit*, uint32, SpellEffectIndex, Creature* );
     bool (*pEffectDummyItem     )(Unit*, uint32, SpellEffectIndex, Item* );
+    bool (*pEffectScriptEffectNPC)(Unit*, uint32, SpellEffectIndex, Creature*);
     bool (*pEffectAuraDummy     )(const Aura*, bool);
 
     CreatureAI* (*GetAI)(Creature *_Creature);
diff --git a/src/cppunit/AdditionalMessage.cpp b/src/cppunit/AdditionalMessage.cpp
new file mode 100644
index 00000000000..9f3da13929b
--- /dev/null
+++ b/src/cppunit/AdditionalMessage.cpp
@@ -0,0 +1,41 @@
+#include <cppunit/AdditionalMessage.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+AdditionalMessage::AdditionalMessage()
+{
+}
+
+
+AdditionalMessage::AdditionalMessage( const std::string &detail1 )
+{
+  if ( !detail1.empty() )
+    addDetail( detail1 );
+}
+
+
+AdditionalMessage::AdditionalMessage( const char *detail1 )
+{
+  if ( detail1  &&  !std::string( detail1 ).empty() )
+    addDetail( std::string(detail1) );
+}
+
+
+AdditionalMessage::AdditionalMessage( const Message &other )
+    : SuperClass( other )
+{
+}
+
+
+AdditionalMessage &
+AdditionalMessage::operator =( const Message &other )
+{
+  SuperClass::operator =( other );
+
+  return *this;
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/Asserter.cpp b/src/cppunit/Asserter.cpp
new file mode 100644
index 00000000000..a9cf95cb4ad
--- /dev/null
+++ b/src/cppunit/Asserter.cpp
@@ -0,0 +1,101 @@
+#include <cppunit/Asserter.h>
+#include <cppunit/Exception.h>
+#include <cppunit/Message.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+void 
+Asserter::fail( std::string message, 
+                const SourceLine &sourceLine )
+{
+  fail( Message( "assertion failed", message ), sourceLine );
+}
+
+
+void 
+Asserter::fail( const Message &message, 
+                const SourceLine &sourceLine )
+{
+  throw Exception( message, sourceLine );
+}
+
+
+void 
+Asserter::failIf( bool shouldFail, 
+                  const Message &message, 
+                  const SourceLine &sourceLine )
+{
+  if ( shouldFail )
+    fail( message, sourceLine );
+}
+
+
+void 
+Asserter::failIf( bool shouldFail, 
+                  std::string message, 
+                  const SourceLine &sourceLine )
+{
+  failIf( shouldFail, Message( "assertion failed", message ), sourceLine );
+}
+
+
+std::string 
+Asserter::makeExpected( const std::string &expectedValue )
+{
+  return "Expected: " + expectedValue;
+}
+
+
+std::string 
+Asserter::makeActual( const std::string &actualValue )
+{
+  return "Actual  : " + actualValue;
+}
+
+
+Message 
+Asserter::makeNotEqualMessage( const std::string &expectedValue,
+                               const std::string &actualValue,
+                               const AdditionalMessage &additionalMessage,
+                               const std::string &shortDescription )
+{
+  Message message( shortDescription,
+                   makeExpected( expectedValue ),
+                   makeActual( actualValue ) );
+  message.addDetail( additionalMessage );
+
+  return message;
+}
+
+
+void 
+Asserter::failNotEqual( std::string expected, 
+                        std::string actual, 
+                        const SourceLine &sourceLine,
+                        const AdditionalMessage &additionalMessage,
+                        std::string shortDescription )
+{
+  fail( makeNotEqualMessage( expected,
+                             actual,
+                             additionalMessage,
+                             shortDescription ), 
+        sourceLine );
+}
+
+
+void 
+Asserter::failNotEqualIf( bool shouldFail,
+                          std::string expected, 
+                          std::string actual, 
+                          const SourceLine &sourceLine,
+                          const AdditionalMessage &additionalMessage,
+                          std::string shortDescription )
+{
+  if ( shouldFail )
+    failNotEqual( expected, actual, sourceLine, additionalMessage, shortDescription );
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/BeOsDynamicLibraryManager.cpp b/src/cppunit/BeOsDynamicLibraryManager.cpp
new file mode 100644
index 00000000000..b8568be0ce6
--- /dev/null
+++ b/src/cppunit/BeOsDynamicLibraryManager.cpp
@@ -0,0 +1,49 @@
+#include <cppunit/Portability.h>
+
+#if defined(CPPUNIT_HAVE_BEOS_DLL_LOADER)
+#include <cppunit/plugin/DynamicLibraryManager.h>
+
+#include <kernel/image.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+DynamicLibraryManager::LibraryHandle 
+DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
+{
+  return (LibraryHandle)::load_add_on( libraryName.c_str() );
+}
+
+
+void 
+DynamicLibraryManager::doReleaseLibrary()
+{
+  ::unload_add_on( (image_id)m_libraryHandle );
+}
+
+
+DynamicLibraryManager::Symbol 
+DynamicLibraryManager::doFindSymbol( const std::string &symbol )
+{
+  void *symbolPointer;
+  if ( ::get_image_symbol( (image_id)m_libraryHandle, 
+                           symbol.c_str(), 
+                           B_SYMBOL_TYPE_TEXT, 
+                           &symbolPointer ) == B_OK )
+    return symnolPointer;
+  return NULL;
+}
+
+
+std::string 
+DynamicLibraryManager::getLastErrorDetail() const
+{
+  return "";
+}
+
+
+CPPUNIT_NS_END
+
+
+#endif // defined(CPPUNIT_HAVE_BEOS_DLL_LOADER)
diff --git a/src/cppunit/BriefTestProgressListener.cpp b/src/cppunit/BriefTestProgressListener.cpp
new file mode 100644
index 00000000000..c38cea067b8
--- /dev/null
+++ b/src/cppunit/BriefTestProgressListener.cpp
@@ -0,0 +1,49 @@
+#include <cppunit/BriefTestProgressListener.h>
+#include <cppunit/Test.h>
+#include <cppunit/TestFailure.h>
+#include <cppunit/portability/Stream.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+BriefTestProgressListener::BriefTestProgressListener()
+    : m_lastTestFailed( false )
+{
+}
+
+
+BriefTestProgressListener::~BriefTestProgressListener()
+{
+}
+
+
+void 
+BriefTestProgressListener::startTest( Test *test )
+{
+  stdCOut() << test->getName();
+  stdCOut().flush();
+
+  m_lastTestFailed = false;
+}
+
+
+void 
+BriefTestProgressListener::addFailure( const TestFailure &failure )
+{
+  stdCOut() << " : " << (failure.isError() ? "error" : "assertion");
+  m_lastTestFailed  = true;
+}
+
+
+void 
+BriefTestProgressListener::endTest( Test *test )
+{
+  if ( !m_lastTestFailed )
+    stdCOut()  <<  " : OK";
+  stdCOut() << "\n";
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/CompilerOutputter.cpp b/src/cppunit/CompilerOutputter.cpp
new file mode 100644
index 00000000000..8196a5f87c9
--- /dev/null
+++ b/src/cppunit/CompilerOutputter.cpp
@@ -0,0 +1,216 @@
+#include <cppunit/config/SourcePrefix.h>
+#include <cppunit/Exception.h>
+#include <cppunit/SourceLine.h>
+#include <cppunit/TestFailure.h>
+#include <cppunit/TestResultCollector.h>
+#include <cppunit/CompilerOutputter.h>
+#include <algorithm>
+#include <cppunit/tools/StringTools.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+CompilerOutputter::CompilerOutputter( TestResultCollector *result,
+                                      OStream &stream,
+                                      const std::string &locationFormat )
+    : m_result( result )
+    , m_stream( stream )
+    , m_locationFormat( locationFormat )
+    , m_wrapColumn( CPPUNIT_WRAP_COLUMN )
+{
+}
+
+
+CompilerOutputter::~CompilerOutputter()
+{
+}
+
+
+void 
+CompilerOutputter::setLocationFormat( const std::string &locationFormat )
+{
+  m_locationFormat = locationFormat;
+}
+
+
+CompilerOutputter *
+CompilerOutputter::defaultOutputter( TestResultCollector *result,
+                                     OStream &stream )
+{
+  return new CompilerOutputter( result, stream );
+}
+
+
+void 
+CompilerOutputter::write()
+{
+  if ( m_result->wasSuccessful() )
+    printSuccess();
+  else
+    printFailureReport();
+}
+
+
+void 
+CompilerOutputter::printSuccess()
+{
+  m_stream  << "OK (" << m_result->runTests()  << ")\n";
+}
+
+
+void 
+CompilerOutputter::printFailureReport()
+{
+  printFailuresList();
+  printStatistics();
+}
+
+
+void 
+CompilerOutputter::printFailuresList()
+{
+  for ( int index =0; index < m_result->testFailuresTotal(); ++index)
+  {
+    printFailureDetail( m_result->failures()[ index ] );
+  }
+}
+
+
+void 
+CompilerOutputter::printFailureDetail( TestFailure *failure )
+{
+  printFailureLocation( failure->sourceLine() );
+  printFailureType( failure );
+  printFailedTestName( failure );
+  printFailureMessage( failure );
+}
+
+ 
+void 
+CompilerOutputter::printFailureLocation( SourceLine sourceLine )
+{
+  if ( !sourceLine.isValid() )
+  {
+    m_stream  <<  "##Failure Location unknown## : ";
+    return;
+  }
+
+  std::string location;
+  for ( unsigned int index = 0; index < m_locationFormat.length(); ++index )
+  {
+    char c = m_locationFormat[ index ];
+    if ( c == '%'  &&  ( index+1 < m_locationFormat.length() ) )
+    {
+      char command = m_locationFormat[index+1];
+      if ( processLocationFormatCommand( command, sourceLine ) )
+      {
+        ++index;
+        continue;
+      }
+    }
+
+    m_stream  << c;
+  }
+}
+
+
+bool 
+CompilerOutputter::processLocationFormatCommand( char command, 
+                                                 const SourceLine &sourceLine )
+{
+  switch ( command )
+  {
+  case 'p':
+    m_stream  <<  sourceLine.fileName();
+    return true;
+  case 'l':
+    m_stream  <<  sourceLine.lineNumber();
+    return true;
+  case 'f':
+    m_stream  <<  extractBaseName( sourceLine.fileName() );
+    return true;
+  }
+  
+  return false;
+}
+
+
+std::string 
+CompilerOutputter::extractBaseName( const std::string &fileName ) const
+{
+  int indexLastDirectorySeparator = fileName.find_last_of( '/' );
+  
+  if ( indexLastDirectorySeparator < 0 )
+    indexLastDirectorySeparator = fileName.find_last_of( '\\' );
+  
+  if ( indexLastDirectorySeparator < 0 )
+    return fileName;
+
+  return fileName.substr( indexLastDirectorySeparator +1 );
+}
+
+
+void 
+CompilerOutputter::printFailureType( TestFailure *failure )
+{
+  m_stream  <<  (failure->isError() ? "Error" : "Assertion");
+}
+
+
+void 
+CompilerOutputter::printFailedTestName( TestFailure *failure )
+{
+  m_stream  <<  "\nTest name: "  <<  failure->failedTestName();
+}
+
+
+void 
+CompilerOutputter::printFailureMessage( TestFailure *failure )
+{
+  m_stream  <<  "\n";
+  Exception *thrownException = failure->thrownException();
+  m_stream  << thrownException->message().shortDescription()  <<  "\n";
+
+  std::string message = thrownException->message().details();
+  if ( m_wrapColumn > 0 )
+    message = StringTools::wrap( message, m_wrapColumn );
+
+  m_stream  <<  message  <<  "\n";
+}
+
+
+void 
+CompilerOutputter::printStatistics()
+{
+  m_stream  <<  "Failures !!!\n";
+  m_stream  <<  "Run: "  <<  m_result->runTests()  << "   "
+            <<  "Failure total: "  <<  m_result->testFailuresTotal()  << "   "
+            <<  "Failures: "  <<  m_result->testFailures()  << "   "
+            <<  "Errors: "  <<  m_result->testErrors()
+            <<  "\n";
+}
+
+
+void 
+CompilerOutputter::setWrapColumn( int wrapColumn )
+{
+  m_wrapColumn = wrapColumn;
+}
+
+
+void 
+CompilerOutputter::setNoWrap()
+{
+  m_wrapColumn = 0;
+}
+
+
+int 
+CompilerOutputter::wrapColumn() const
+{
+  return m_wrapColumn;
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/DefaultProtector.cpp b/src/cppunit/DefaultProtector.cpp
new file mode 100644
index 00000000000..6fb306b2573
--- /dev/null
+++ b/src/cppunit/DefaultProtector.cpp
@@ -0,0 +1,42 @@
+#include <cppunit/Exception.h>
+#include <cppunit/extensions/TypeInfoHelper.h>
+#include "DefaultProtector.h"
+
+
+CPPUNIT_NS_BEGIN
+
+
+bool 
+DefaultProtector::protect( const Functor &functor,
+                           const ProtectorContext &context )
+{
+  try
+  {
+    return functor();
+  }
+  catch ( Exception &failure )
+  {
+    reportFailure( context, failure );
+  }
+  catch ( std::exception &e )
+  {
+    std::string shortDescription( "uncaught exception of type " );
+#if CPPUNIT_USE_TYPEINFO_NAME
+    shortDescription += TypeInfoHelper::getClassName( typeid(e) );
+#else
+    shortDescription += "std::exception (or derived).";
+#endif
+    Message message( shortDescription, e.what() );
+    reportError( context, message );
+  }
+  catch ( ... )
+  {
+    reportError( context,
+                 Message( "uncaught exception of unknown type") );
+  }
+  
+  return false;
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/DefaultProtector.h b/src/cppunit/DefaultProtector.h
new file mode 100644
index 00000000000..4a76ea0133a
--- /dev/null
+++ b/src/cppunit/DefaultProtector.h
@@ -0,0 +1,27 @@
+#ifndef CPPUNIT_DEFAULTPROTECTOR_H
+#define CPPUNIT_DEFAULTPROTECTOR_H
+
+#include <cppunit/Protector.h>
+
+CPPUNIT_NS_BEGIN
+
+/*! \brief Default protector that catch all exceptions (Implementation).
+ *
+ * Implementation detail.
+ * \internal This protector catch and generate a failure for the following
+ * exception types:
+ * - Exception
+ * - std::exception
+ * - ...
+ */
+class DefaultProtector : public Protector
+{
+public:
+  bool protect( const Functor &functor,
+                const ProtectorContext &context );
+};
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_DEFAULTPROTECTOR_H
+
diff --git a/src/cppunit/DllMain.cpp b/src/cppunit/DllMain.cpp
new file mode 100644
index 00000000000..51fe31ecef8
--- /dev/null
+++ b/src/cppunit/DllMain.cpp
@@ -0,0 +1,16 @@
+#define WIN32_LEAN_AND_MEAN 
+#define NOGDI
+#define NOUSER
+#define NOKERNEL
+#define NOSOUND
+#define BLENDFUNCTION void    // for mingw & gcc
+
+#include <windows.h>
+
+BOOL APIENTRY 
+DllMain( HANDLE hModule, 
+         DWORD  ul_reason_for_call, 
+         LPVOID lpReserved )
+{
+  return TRUE;
+}
diff --git a/src/cppunit/DynamicLibraryManager.cpp b/src/cppunit/DynamicLibraryManager.cpp
new file mode 100644
index 00000000000..e6f6294553b
--- /dev/null
+++ b/src/cppunit/DynamicLibraryManager.cpp
@@ -0,0 +1,77 @@
+#include <cppunit/plugin/DynamicLibraryManager.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+#include <cppunit/plugin/DynamicLibraryManagerException.h>
+
+CPPUNIT_NS_BEGIN
+
+
+DynamicLibraryManager::DynamicLibraryManager( const std::string &libraryFileName )
+    : m_libraryHandle( NULL )
+    , m_libraryName( libraryFileName )
+{
+  loadLibrary( libraryFileName );
+}
+
+
+DynamicLibraryManager::~DynamicLibraryManager()
+{
+  releaseLibrary();
+}
+
+
+DynamicLibraryManager::Symbol 
+DynamicLibraryManager::findSymbol( const std::string &symbol )
+{
+  try
+  {
+    Symbol symbolPointer = doFindSymbol( symbol );
+    if ( symbolPointer != NULL )
+      return symbolPointer;
+  }
+  catch ( ... )
+  {
+  }
+
+  throw DynamicLibraryManagerException( m_libraryName, 
+                                        symbol,
+                                        DynamicLibraryManagerException::symbolNotFound );
+  return NULL;    // keep compiler happy
+}
+
+
+void
+DynamicLibraryManager::loadLibrary( const std::string &libraryName )
+{
+  try
+  {
+    releaseLibrary();
+    m_libraryHandle = doLoadLibrary( libraryName );
+    if ( m_libraryHandle != NULL )
+      return;
+  }
+  catch (...)
+  {
+  }
+
+  throw DynamicLibraryManagerException( m_libraryName,
+                                        getLastErrorDetail(),
+                                        DynamicLibraryManagerException::loadingFailed );
+}
+
+
+void 
+DynamicLibraryManager::releaseLibrary()
+{
+  if ( m_libraryHandle != NULL )
+  {
+    doReleaseLibrary();
+    m_libraryHandle = NULL;
+  }
+}
+
+
+CPPUNIT_NS_END
+
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
diff --git a/src/cppunit/DynamicLibraryManagerException.cpp b/src/cppunit/DynamicLibraryManagerException.cpp
new file mode 100644
index 00000000000..8498652e029
--- /dev/null
+++ b/src/cppunit/DynamicLibraryManagerException.cpp
@@ -0,0 +1,41 @@
+#include <cppunit/plugin/DynamicLibraryManagerException.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+CPPUNIT_NS_BEGIN
+
+
+DynamicLibraryManagerException::DynamicLibraryManagerException( 
+                                         const std::string &libraryName,
+                                         const std::string &errorDetail,
+                                         Cause cause )
+    : std::runtime_error( "" ),
+      m_cause( cause )
+{
+  if ( cause == loadingFailed )
+    m_message = "Failed to load dynamic library: " + libraryName + "\n" + 
+                errorDetail;
+  else
+    m_message = "Symbol [" + errorDetail + "] not found in dynamic libary:" + 
+                libraryName;
+}
+
+
+DynamicLibraryManagerException::Cause 
+DynamicLibraryManagerException::getCause() const
+{
+  return m_cause;
+}
+
+
+const char *
+DynamicLibraryManagerException::what() const throw()
+{
+  return m_message.c_str();
+}
+
+
+CPPUNIT_NS_END
+
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
diff --git a/src/cppunit/Exception.cpp b/src/cppunit/Exception.cpp
new file mode 100644
index 00000000000..3bbe24b9b24
--- /dev/null
+++ b/src/cppunit/Exception.cpp
@@ -0,0 +1,126 @@
+#include <cppunit/Exception.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED
+/*!
+ * \deprecated Use SourceLine::isValid() instead.
+ */
+const std::string Exception::UNKNOWNFILENAME = "<unknown>";
+
+/*!
+ * \deprecated Use SourceLine::isValid() instead.
+ */
+const long Exception::UNKNOWNLINENUMBER = -1;
+#endif
+
+
+Exception::Exception( const Exception &other )
+   : std::exception( other )
+{ 
+  m_message = other.m_message; 
+  m_sourceLine = other.m_sourceLine;
+} 
+
+
+Exception::Exception( const Message &message, 
+                      const SourceLine &sourceLine )
+    : m_message( message )
+    , m_sourceLine( sourceLine )
+{
+}
+
+
+#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED
+Exception::Exception( std::string message, 
+                      long lineNumber, 
+                      std::string fileName )
+    : m_message( message )
+    , m_sourceLine( fileName, lineNumber )
+{
+}
+#endif
+
+
+Exception::~Exception() throw()
+{
+}
+
+
+Exception & 
+Exception::operator =( const Exception& other )
+{ 
+// Don't call superclass operator =(). VC++ STL implementation
+// has a bug. It calls the destructor and copy constructor of 
+// std::exception() which reset the virtual table to std::exception.
+//  SuperClass::operator =(other);
+
+  if ( &other != this )
+  {
+    m_message = other.m_message; 
+    m_sourceLine = other.m_sourceLine;
+  }
+
+  return *this; 
+}
+
+
+const char*
+Exception::what() const throw()
+{
+  Exception *mutableThis = CPPUNIT_CONST_CAST( Exception *, this );
+  mutableThis->m_whatMessage = m_message.shortDescription() + "\n" + 
+                               m_message.details();
+  return m_whatMessage.c_str();
+}
+
+
+SourceLine 
+Exception::sourceLine() const
+{
+  return m_sourceLine;
+}
+
+
+Message 
+Exception::message() const
+{
+  return m_message;
+}
+
+
+void 
+Exception::setMessage( const Message &message )
+{
+  m_message = message;
+}
+
+
+#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED
+long 
+Exception::lineNumber() const
+{ 
+  return m_sourceLine.isValid() ? m_sourceLine.lineNumber() : 
+                                  UNKNOWNLINENUMBER; 
+}
+
+
+std::string 
+Exception::fileName() const
+{ 
+  return m_sourceLine.isValid() ? m_sourceLine.fileName() : 
+                                  UNKNOWNFILENAME;
+}
+#endif
+
+
+Exception *
+Exception::clone() const
+{
+  return new Exception( *this );
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/Message.cpp b/src/cppunit/Message.cpp
new file mode 100644
index 00000000000..9d6a0e92b72
--- /dev/null
+++ b/src/cppunit/Message.cpp
@@ -0,0 +1,170 @@
+#include <cppunit/Message.h>
+#include <stdexcept>
+
+
+CPPUNIT_NS_BEGIN
+
+
+Message::Message()
+{
+}
+
+Message::Message( const Message &other )
+{
+   *this = other;
+}
+
+
+Message::Message( const std::string &shortDescription )
+    : m_shortDescription( shortDescription )
+{
+}
+
+
+Message::Message( const std::string &shortDescription,
+                  const std::string &detail1 )
+    : m_shortDescription( shortDescription )
+{
+  addDetail( detail1 );
+}
+
+
+Message::Message( const std::string &shortDescription,
+                  const std::string &detail1,
+                  const std::string &detail2 )
+    : m_shortDescription( shortDescription )
+{
+  addDetail( detail1, detail2 );
+}
+
+
+Message::Message( const std::string &shortDescription,
+                  const std::string &detail1,
+                  const std::string &detail2,
+                  const std::string &detail3 )
+    : m_shortDescription( shortDescription )
+{
+  addDetail( detail1, detail2, detail3 );
+}
+
+Message &
+Message::operator =( const Message &other )
+{
+   if ( this != &other )
+   {
+      m_shortDescription = other.m_shortDescription.c_str();
+      m_details.clear();
+      Details::const_iterator it = other.m_details.begin();
+      Details::const_iterator itEnd = other.m_details.end();
+      while ( it != itEnd )
+         m_details.push_back( (*it++).c_str() );
+   }
+
+   return *this;
+}
+
+
+const std::string &
+Message::shortDescription() const
+{
+  return m_shortDescription;
+}
+
+
+int 
+Message::detailCount() const
+{
+  return m_details.size();
+}
+
+
+std::string 
+Message::detailAt( int index ) const
+{
+  if ( index < 0  ||  index >= detailCount() )
+    throw std::invalid_argument( "Message::detailAt() : invalid index" );
+
+  return m_details[ index ];
+}
+
+
+std::string 
+Message::details() const
+{
+  std::string details;
+  for ( Details::const_iterator it = m_details.begin(); it != m_details.end(); ++it )
+  {
+    details += "- ";
+    details += *it;
+    details += '\n';
+  }
+  return details;
+}
+
+
+void 
+Message::clearDetails()
+{
+  m_details.clear();
+}
+
+
+void 
+Message::addDetail( const std::string &detail )
+{
+  m_details.push_back( detail );
+}
+
+
+void 
+Message::addDetail( const std::string &detail1,
+                    const std::string &detail2 )
+{
+  addDetail( detail1 );
+  addDetail( detail2 );
+}
+
+
+void 
+Message::addDetail( const std::string &detail1,
+                    const std::string &detail2,
+                    const std::string &detail3 )
+{
+  addDetail( detail1, detail2 );
+  addDetail( detail3 );
+}
+
+
+void 
+Message::addDetail( const Message &message )
+{
+  m_details.insert( m_details.end(), 
+                    message.m_details.begin(), 
+                    message.m_details.end() );
+}
+
+
+void 
+Message::setShortDescription( const std::string &shortDescription )
+{
+  m_shortDescription = shortDescription;
+}
+
+
+bool 
+Message::operator ==( const Message &other ) const
+{
+  return m_shortDescription == other.m_shortDescription  &&
+         m_details == other.m_details;
+}
+
+
+bool 
+Message::operator !=( const Message &other ) const
+{
+  return !( *this == other );
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/PlugInManager.cpp b/src/cppunit/PlugInManager.cpp
new file mode 100644
index 00000000000..b595deefbae
--- /dev/null
+++ b/src/cppunit/PlugInManager.cpp
@@ -0,0 +1,110 @@
+#include <cppunit/config/SourcePrefix.h>
+#include <cppunit/XmlOutputterHook.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/plugin/PlugInManager.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/plugin/DynamicLibraryManager.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+PlugInManager::PlugInManager()
+{
+}
+
+
+PlugInManager::~PlugInManager()
+{
+  for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it )
+    unload( *it );
+}
+
+
+void
+PlugInManager::load( const std::string &libraryFileName,
+                     const PlugInParameters &parameters )
+{
+  PlugInInfo info;
+  info.m_fileName = libraryFileName;
+  info.m_manager = new DynamicLibraryManager( libraryFileName );
+
+  TestPlugInSignature plug = (TestPlugInSignature)info.m_manager->findSymbol( 
+        CPPUNIT_STRINGIZE( CPPUNIT_PLUGIN_EXPORTED_NAME ) );
+  info.m_interface = (*plug)();
+
+  m_plugIns.push_back( info );
+  
+  info.m_interface->initialize( &TestFactoryRegistry::getRegistry(), parameters );
+}
+
+
+void 
+PlugInManager::unload( const std::string &libraryFileName )
+{
+  for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it )
+  {
+    if ( (*it).m_fileName == libraryFileName )
+    {
+      unload( *it );
+      m_plugIns.erase( it );
+      break;
+    }
+  }
+}
+
+
+void 
+PlugInManager::addListener( TestResult *eventManager )
+{
+  for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it )
+    (*it).m_interface->addListener( eventManager );
+}
+
+
+void 
+PlugInManager::removeListener( TestResult *eventManager )
+{
+  for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it )
+    (*it).m_interface->removeListener( eventManager );
+}
+
+
+void 
+PlugInManager::unload( PlugInInfo &plugIn )
+{
+  try
+  {
+    plugIn.m_interface->uninitialize( &TestFactoryRegistry::getRegistry() );
+    delete plugIn.m_manager;
+  }
+  catch (...)
+  {
+    delete plugIn.m_manager;
+    plugIn.m_manager = NULL;
+    throw;
+  }
+}
+
+
+void 
+PlugInManager::addXmlOutputterHooks( XmlOutputter *outputter )
+{
+  for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it )
+    (*it).m_interface->addXmlOutputterHooks( outputter );
+}
+
+
+void 
+PlugInManager::removeXmlOutputterHooks()
+{
+  for ( PlugIns::iterator it = m_plugIns.begin(); it != m_plugIns.end(); ++it )
+    (*it).m_interface->removeXmlOutputterHooks();
+}
+
+
+CPPUNIT_NS_END
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
diff --git a/src/cppunit/PlugInParameters.cpp b/src/cppunit/PlugInParameters.cpp
new file mode 100644
index 00000000000..1b532f9fa26
--- /dev/null
+++ b/src/cppunit/PlugInParameters.cpp
@@ -0,0 +1,28 @@
+#include <cppunit/plugin/PlugInParameters.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+CPPUNIT_NS_BEGIN
+
+
+PlugInParameters::PlugInParameters( const std::string &commandLine )
+    : m_commandLine( commandLine )
+{
+}
+
+
+PlugInParameters::~PlugInParameters()
+{
+}
+
+
+std::string 
+PlugInParameters::getCommandLine() const
+{
+  return m_commandLine;
+}
+
+
+CPPUNIT_NS_END
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
diff --git a/src/cppunit/Protector.cpp b/src/cppunit/Protector.cpp
new file mode 100644
index 00000000000..5c171ec4627
--- /dev/null
+++ b/src/cppunit/Protector.cpp
@@ -0,0 +1,86 @@
+#include <cppunit/Exception.h>
+#include <cppunit/Message.h>
+#include <cppunit/Protector.h>
+#include <cppunit/TestResult.h>
+#include "ProtectorContext.h"
+#include <memory>
+
+CPPUNIT_NS_BEGIN
+
+Functor::~Functor()
+{
+}
+
+
+Protector::~Protector()
+{
+}
+
+
+void 
+Protector::reportError( const ProtectorContext &context,
+                        const Exception &error ) const
+{
+  std::auto_ptr<Exception> actualError( error.clone() );
+  actualError->setMessage( actualMessage( actualError->message(), context ) );
+  context.m_result->addError( context.m_test, 
+                              actualError.release() );
+}
+
+
+
+void 
+Protector::reportError( const ProtectorContext &context,
+                        const Message &message,
+                        const SourceLine &sourceLine ) const
+{
+  reportError( context, Exception( message, sourceLine ) );
+}
+
+
+void 
+Protector::reportFailure( const ProtectorContext &context,
+                          const Exception &failure ) const
+{
+  std::auto_ptr<Exception> actualFailure( failure.clone() );
+  actualFailure->setMessage( actualMessage( actualFailure->message(), context ) );
+  context.m_result->addFailure( context.m_test, 
+                                actualFailure.release() );
+}
+
+
+Message 
+Protector::actualMessage( const Message &message,
+                          const ProtectorContext &context ) const
+{
+  Message theActualMessage;
+  if ( context.m_shortDescription.empty() )
+    theActualMessage = message;
+  else
+  {
+    theActualMessage = Message( context.m_shortDescription, 
+                                message.shortDescription() );
+    theActualMessage.addDetail( message );
+  }
+
+  return theActualMessage;
+}
+
+
+
+
+ProtectorGuard::ProtectorGuard( TestResult *result,
+                                              Protector *protector )
+    : m_result( result )
+{
+  m_result->pushProtector( protector );
+}
+
+
+ProtectorGuard::~ProtectorGuard()
+{
+  m_result->popProtector();
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/ProtectorChain.cpp b/src/cppunit/ProtectorChain.cpp
new file mode 100644
index 00000000000..f528341eb1f
--- /dev/null
+++ b/src/cppunit/ProtectorChain.cpp
@@ -0,0 +1,86 @@
+#include "ProtectorChain.h"
+
+CPPUNIT_NS_BEGIN
+
+
+class ProtectorChain::ProtectFunctor : public Functor
+{
+public:
+  ProtectFunctor( Protector *protector,
+                  const Functor &functor,
+                  const ProtectorContext &context )
+      : m_protector( protector )
+      , m_functor( functor )
+      , m_context( context )
+  {
+  }
+
+  bool operator()() const
+  {
+    return m_protector->protect( m_functor, m_context );
+  }
+
+private:
+  Protector *m_protector;
+  const Functor &m_functor;
+  const ProtectorContext &m_context;
+};
+
+
+ProtectorChain::~ProtectorChain()
+{
+  while ( count() > 0 )
+    pop();
+}
+
+
+void 
+ProtectorChain::push( Protector *protector )
+{
+  m_protectors.push_back( protector );
+}
+
+
+void 
+ProtectorChain::pop()
+{
+  delete m_protectors.back();
+  m_protectors.pop_back();
+}
+
+int 
+ProtectorChain::count() const
+{
+  return m_protectors.size();
+}
+
+
+bool 
+ProtectorChain::protect( const Functor &functor,
+                         const ProtectorContext &context )
+{
+  if ( m_protectors.empty() )
+    return functor();
+
+  Functors functors;
+  for ( int index = m_protectors.size()-1; index >= 0; --index )
+  {
+    const Functor &protectedFunctor = 
+              functors.empty() ? functor : *functors.back();
+
+    functors.push_back( new ProtectFunctor( m_protectors[index],
+                                            protectedFunctor, 
+                                            context ) );
+  }
+
+  const Functor &outermostFunctor = *functors.back();
+  bool succeed = outermostFunctor();
+
+  for ( unsigned int deletingIndex = 0; deletingIndex < m_protectors.size(); ++deletingIndex )
+    delete functors[deletingIndex];
+
+  return succeed;
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/ProtectorChain.h b/src/cppunit/ProtectorChain.h
new file mode 100644
index 00000000000..711b56fbc79
--- /dev/null
+++ b/src/cppunit/ProtectorChain.h
@@ -0,0 +1,51 @@
+#ifndef CPPUNIT_PROTECTORCHAIN_H
+#define CPPUNIT_PROTECTORCHAIN_H
+
+#include <cppunit/Protector.h>
+#include <cppunit/portability/CppUnitDeque.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
+
+CPPUNIT_NS_BEGIN
+
+/*! \brief Protector chain (Implementation).
+ * Implementation detail.
+ * \internal Protector that protect a Functor using a chain of nested Protector.
+ */
+class CPPUNIT_API ProtectorChain : public Protector
+{
+public:
+  ~ProtectorChain();
+
+  void push( Protector *protector );
+
+  void pop();
+
+  int count() const;
+
+  bool protect( const Functor &functor,
+                const ProtectorContext &context );
+
+private:
+  class ProtectFunctor;
+
+private:
+  typedef CppUnitDeque<Protector *> Protectors;
+  Protectors m_protectors;
+
+  typedef CppUnitDeque<Functor *> Functors;
+};
+
+
+CPPUNIT_NS_END
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+#endif // CPPUNIT_PROTECTORCHAIN_H
+
diff --git a/src/cppunit/ProtectorContext.h b/src/cppunit/ProtectorContext.h
new file mode 100644
index 00000000000..c3d496c49cd
--- /dev/null
+++ b/src/cppunit/ProtectorContext.h
@@ -0,0 +1,38 @@
+#ifndef CPPUNIT_PROTECTORCONTEXT_H
+#define CPPUNIT_PROTECTORCONTEXT_H
+
+#include <cppunit/Portability.h>
+#include <string>
+
+CPPUNIT_NS_BEGIN
+
+class Test;
+class TestResult;
+
+
+/*! \brief Protector context (Implementation).
+ * Implementation detail.
+ * \internal Context use to report failure in Protector.
+ */
+class CPPUNIT_API ProtectorContext
+{
+public:
+  ProtectorContext( Test *test,
+                    TestResult *result,
+                    const std::string &shortDescription )
+      : m_test( test )
+      , m_result( result )
+      , m_shortDescription( shortDescription )
+  {
+  }
+
+  Test *m_test;
+  TestResult *m_result;
+  std::string m_shortDescription;
+};
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_PROTECTORCONTEXT_H
+
diff --git a/src/cppunit/RepeatedTest.cpp b/src/cppunit/RepeatedTest.cpp
new file mode 100644
index 00000000000..2533ca1d9a2
--- /dev/null
+++ b/src/cppunit/RepeatedTest.cpp
@@ -0,0 +1,29 @@
+#include <cppunit/extensions/RepeatedTest.h>
+#include <cppunit/TestResult.h>
+
+CPPUNIT_NS_BEGIN
+
+
+// Counts the number of test cases that will be run by this test.
+int
+RepeatedTest::countTestCases() const
+{ 
+  return TestDecorator::countTestCases() * m_timesRepeat; 
+}
+
+
+// Runs a repeated test
+void 
+RepeatedTest::run( TestResult *result )
+{
+  for ( int n = 0; n < m_timesRepeat; n++ ) 
+  {
+    if ( result->shouldStop() )
+        break;
+
+    TestDecorator::run( result );
+  }
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/ShlDynamicLibraryManager.cpp b/src/cppunit/ShlDynamicLibraryManager.cpp
new file mode 100644
index 00000000000..9f4be227722
--- /dev/null
+++ b/src/cppunit/ShlDynamicLibraryManager.cpp
@@ -0,0 +1,53 @@
+#include <cppunit/Portability.h>
+
+#if defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
+#include <cppunit/plugin/DynamicLibraryManager.h>
+
+#include <dl.h>
+#include <unistd.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+DynamicLibraryManager::LibraryHandle 
+DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
+{
+   return ::shl_load(libraryName.c_str(), BIND_IMMEDIATE, 0L);
+}
+
+
+void 
+DynamicLibraryManager::doReleaseLibrary()
+{
+  ::shl_unload( (shl_t)m_libraryHandle);
+}
+
+
+DynamicLibraryManager::Symbol 
+DynamicLibraryManager::doFindSymbol( const std::string &symbol )
+{
+   DynamicLibraryManager::Symbol L_symaddr = 0;
+   if ( ::shl_findsym( (shl_t*)(&m_libraryHandle), 
+                       symbol.c_str(), 
+                       TYPE_UNDEFINED, 
+                       &L_symaddr ) == 0 )
+   {
+      return L_symaddr;
+   } 
+
+   return 0;
+}
+
+
+std::string 
+DynamicLibraryManager::getLastErrorDetail() const
+{
+  return "";
+}
+
+
+CPPUNIT_NS_END
+
+
+#endif // defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
diff --git a/src/cppunit/SourceLine.cpp b/src/cppunit/SourceLine.cpp
new file mode 100644
index 00000000000..dfadae3f0ea
--- /dev/null
+++ b/src/cppunit/SourceLine.cpp
@@ -0,0 +1,81 @@
+#include <cppunit/SourceLine.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+SourceLine::SourceLine() :
+    m_lineNumber( -1 )
+{
+}
+
+
+SourceLine::SourceLine( const SourceLine &other )
+   : m_fileName( other.m_fileName.c_str() )
+   , m_lineNumber( other.m_lineNumber )
+{
+}
+
+
+SourceLine::SourceLine( const std::string &fileName,
+                        int lineNumber )
+   : m_fileName( fileName.c_str() )
+   , m_lineNumber( lineNumber )
+{
+}
+
+
+SourceLine &
+SourceLine::operator =( const SourceLine &other )
+{
+   if ( this != &other )
+   {
+      m_fileName = other.m_fileName.c_str();
+      m_lineNumber = other.m_lineNumber;
+   }
+   return *this;
+}
+
+
+SourceLine::~SourceLine()
+{
+}
+
+
+bool 
+SourceLine::isValid() const
+{
+  return !m_fileName.empty();
+}
+
+
+int 
+SourceLine::lineNumber() const
+{
+  return m_lineNumber;
+}
+
+
+std::string 
+SourceLine::fileName() const
+{
+  return m_fileName;
+}
+
+
+bool 
+SourceLine::operator ==( const SourceLine &other ) const
+{
+  return m_fileName == other.m_fileName  &&
+         m_lineNumber == other.m_lineNumber;
+}
+
+
+bool 
+SourceLine::operator !=( const SourceLine &other ) const
+{
+  return !( *this == other );
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/StringTools.cpp b/src/cppunit/StringTools.cpp
new file mode 100644
index 00000000000..dc995d8b27e
--- /dev/null
+++ b/src/cppunit/StringTools.cpp
@@ -0,0 +1,80 @@
+#include <cppunit/tools/StringTools.h>
+#include <cppunit/portability/Stream.h>
+#include <algorithm>
+
+
+CPPUNIT_NS_BEGIN
+
+
+std::string 
+StringTools::toString( int value )
+{
+  OStringStream stream;
+  stream << value;
+  return stream.str();
+}
+
+
+std::string 
+StringTools::toString( double value )
+{
+  OStringStream stream;
+  stream << value;
+  return stream.str();
+}
+
+
+StringTools::Strings
+StringTools::split( const std::string &text, 
+                    char separator )
+{
+  Strings splittedText;
+
+  std::string::const_iterator itStart = text.begin();
+  while ( !text.empty() )
+  {
+    std::string::const_iterator itSeparator = std::find( itStart, 
+                                                         text.end(), 
+                                                         separator );
+    splittedText.push_back( text.substr( itStart - text.begin(),
+                                         itSeparator - itStart ) );
+    if ( itSeparator == text.end() )
+      break;
+    itStart = itSeparator +1;
+  }
+
+  return splittedText;
+}
+
+
+std::string 
+StringTools::wrap( const std::string &text,
+                   int wrapColumn )
+{
+  const char lineBreak = '\n';
+  Strings lines = split( text, lineBreak );
+
+  std::string wrapped;
+  for ( Strings::const_iterator it = lines.begin(); it != lines.end(); ++it )
+  {
+    if ( it != lines.begin() )
+      wrapped += lineBreak;
+
+    const std::string &line = *it;
+    unsigned int index =0;
+    while ( index < line.length() )
+    {
+      std::string lineSlice( line.substr( index, wrapColumn ) );
+      wrapped += lineSlice;
+      index += wrapColumn;
+      if ( index < line.length() )
+        wrapped += lineBreak;
+    }
+  }
+
+  return wrapped;
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/SynchronizedObject.cpp b/src/cppunit/SynchronizedObject.cpp
new file mode 100644
index 00000000000..1764538e59e
--- /dev/null
+++ b/src/cppunit/SynchronizedObject.cpp
@@ -0,0 +1,32 @@
+#include <cppunit/SynchronizedObject.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+SynchronizedObject::SynchronizedObject( SynchronizationObject *syncObject )
+    : m_syncObject( syncObject == 0 ? new SynchronizationObject() : 
+                                      syncObject )
+{
+}
+
+
+SynchronizedObject::~SynchronizedObject()
+{
+  delete m_syncObject;
+}
+
+
+/** Accept a new synchronization object for protection of this instance
+ * TestResult assumes ownership of the object
+ */
+void 
+SynchronizedObject::setSynchronizationObject( SynchronizationObject *syncObject )
+{ 
+  delete m_syncObject; 
+  m_syncObject = syncObject; 
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/Test.cpp b/src/cppunit/Test.cpp
new file mode 100644
index 00000000000..fef8be79399
--- /dev/null
+++ b/src/cppunit/Test.cpp
@@ -0,0 +1,97 @@
+#include <cppunit/Portability.h>
+#include <cppunit/Test.h>
+#include <cppunit/TestPath.h>
+#include <stdexcept>
+
+
+CPPUNIT_NS_BEGIN
+
+
+Test *
+Test::getChildTestAt( int index ) const
+{
+  checkIsValidIndex( index );
+  return doGetChildTestAt( index );
+}
+
+
+Test *
+Test::findTest( const std::string &testName ) const
+{
+  TestPath path;
+  Test *mutableThis = CPPUNIT_CONST_CAST( Test *, this );
+  mutableThis->findTestPath( testName, path );
+  if ( !path.isValid() )
+    throw std::invalid_argument( "No test named <" + testName + "> found in test <"
+                                 + getName() + ">." );
+  return path.getChildTest();
+}
+
+
+bool 
+Test::findTestPath( const std::string &testName,
+                    TestPath &testPath ) const
+{
+  Test *mutableThis = CPPUNIT_CONST_CAST( Test *, this );
+  if ( getName() == testName )
+  {
+    testPath.add( mutableThis );
+    return true;
+  }
+
+  int childCount = getChildTestCount();
+  for ( int childIndex =0; childIndex < childCount; ++childIndex )
+  {
+    if ( getChildTestAt( childIndex )->findTestPath( testName, testPath ) )
+    {
+      testPath.insert( mutableThis, 0 );
+      return true;
+    }
+  }
+
+  return false;
+}
+
+
+bool 
+Test::findTestPath( const Test *test,
+                    TestPath &testPath ) const
+{
+  Test *mutableThis = CPPUNIT_CONST_CAST( Test *, this );
+  if ( this == test )
+  {
+    testPath.add( mutableThis );
+    return true;
+  }
+
+  int childCount = getChildTestCount();
+  for ( int childIndex =0; childIndex < childCount; ++childIndex )
+  {
+    if ( getChildTestAt( childIndex )->findTestPath( test, testPath ) )
+    {
+      testPath.insert( mutableThis, 0 );
+      return true;
+    }
+  }
+
+  return false;
+}
+
+
+TestPath 
+Test::resolveTestPath( const std::string &testPath ) const
+{
+  Test *mutableThis = CPPUNIT_CONST_CAST( Test *, this );
+  return TestPath( mutableThis, testPath );
+}
+
+
+void 
+Test::checkIsValidIndex( int index ) const
+{
+  if ( index < 0  ||  index >= getChildTestCount() )
+    throw std::out_of_range( "Test::checkValidIndex(): invalid index" );
+}
+  
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestAssert.cpp b/src/cppunit/TestAssert.cpp
new file mode 100644
index 00000000000..6e4e794b25b
--- /dev/null
+++ b/src/cppunit/TestAssert.cpp
@@ -0,0 +1,46 @@
+#include <cppunit/TestAssert.h>
+#include <cppunit/portability/FloatingPoint.h>
+
+CPPUNIT_NS_BEGIN
+
+
+void 
+assertDoubleEquals( double expected,
+                    double actual,
+                    double delta,
+                    SourceLine sourceLine,
+                    const std::string &message )
+{
+  AdditionalMessage msg( "Delta   : " + 
+                         assertion_traits<double>::toString(delta) );
+  msg.addDetail( AdditionalMessage(message) );
+
+  bool equal;
+  if ( floatingPointIsFinite(expected)  &&  floatingPointIsFinite(actual) )
+      equal = fabs( expected - actual ) <= delta;
+  else
+  {
+    // If expected or actual is not finite, it may be +inf, -inf or NaN (Not a Number).
+    // Value of +inf or -inf leads to a true equality regardless of delta if both
+    // expected and actual have the same value (infinity sign).
+    // NaN Value should always lead to a failed equality.
+    if ( floatingPointIsUnordered(expected)  ||  floatingPointIsUnordered(actual) )
+    { 
+       equal = false;  // expected or actual is a NaN
+    }
+    else // ordered values, +inf or -inf comparison
+    {
+       equal = expected == actual;
+    }
+  }
+
+  Asserter::failNotEqualIf( !equal,
+                            assertion_traits<double>::toString(expected),
+                            assertion_traits<double>::toString(actual),
+                            sourceLine, 
+                            msg, 
+                            "double equality assertion failed" );
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestCase.cpp b/src/cppunit/TestCase.cpp
new file mode 100644
index 00000000000..13c05257f62
--- /dev/null
+++ b/src/cppunit/TestCase.cpp
@@ -0,0 +1,137 @@
+#include <cppunit/Portability.h>
+#include <cppunit/Exception.h>
+#include <cppunit/Protector.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/TestResult.h>
+#include <stdexcept>
+
+#if CPPUNIT_USE_TYPEINFO_NAME
+#  include <typeinfo>
+#endif
+
+CPPUNIT_NS_BEGIN
+
+/*! \brief Functor to call test case method (Implementation).
+ *
+ * Implementation detail.
+ */
+class TestCaseMethodFunctor : public Functor
+{
+public:
+  typedef void (TestCase::*Method)();
+
+  TestCaseMethodFunctor( TestCase *target,
+                         Method method )
+     : m_target( target )
+     , m_method( method )
+  {
+  }
+
+  bool operator()() const
+  {
+    (m_target->*m_method)();
+    return true;
+  }
+
+private:
+  TestCase *m_target;
+  Method m_method;
+};
+
+
+/** Constructs a test case.
+ *  \param name the name of the TestCase.
+ **/
+TestCase::TestCase( const std::string &name )
+    : m_name(name)
+{
+}
+
+
+/// Run the test and catch any exceptions that are triggered by it 
+void 
+TestCase::run( TestResult *result )
+{
+  result->startTest(this);
+/*
+  try {
+    setUp();
+
+    try {
+      runTest();
+    }
+    catch ( Exception &e ) {
+      Exception *copy = e.clone();
+      result->addFailure( this, copy );
+    }
+    catch ( std::exception &e ) {
+      result->addError( this, new Exception( Message( "uncaught std::exception", 
+                                                      e.what() ) ) );
+    }
+    catch (...) {
+      Exception *e = new Exception( Message( "uncaught unknown exception" ) );
+      result->addError( this, e );
+    }
+
+    try {
+      tearDown();
+    }
+    catch (...) {
+      result->addError( this, new Exception( Message( "tearDown() failed" ) ) );
+    }
+  }
+  catch (...) {
+    result->addError( this, new Exception( Message( "setUp() failed" ) ) );
+  }
+*/
+  if ( result->protect( TestCaseMethodFunctor( this, &TestCase::setUp ),
+                        this,
+                       "setUp() failed" ) )
+  {
+    result->protect( TestCaseMethodFunctor( this, &TestCase::runTest ),
+                     this );
+  }
+
+  result->protect( TestCaseMethodFunctor( this, &TestCase::tearDown ),
+                   this,
+                   "tearDown() failed" );
+
+  result->endTest( this );
+}
+
+
+/// All the work for runTest is deferred to subclasses 
+void 
+TestCase::runTest()
+{
+}
+
+
+/** Constructs a test case for a suite.
+ * \deprecated This constructor was used by fixture when TestFixture did not exist.
+ *             Have your fixture inherits TestFixture instead of TestCase.
+ * \internal
+ *  This TestCase was intended for use by the TestCaller and should not
+ *  be used by a test case for which run() is called.
+ **/
+TestCase::TestCase()
+    : m_name( "" )
+{
+}
+
+
+/// Destructs a test case
+TestCase::~TestCase()
+{
+}
+
+
+/// Returns the name of the test case
+std::string 
+TestCase::getName() const
+{ 
+  return m_name; 
+}
+  
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestCaseDecorator.cpp b/src/cppunit/TestCaseDecorator.cpp
new file mode 100644
index 00000000000..a7229f4b259
--- /dev/null
+++ b/src/cppunit/TestCaseDecorator.cpp
@@ -0,0 +1,47 @@
+#include <cppunit/extensions/TestCaseDecorator.h>
+
+CPPUNIT_NS_BEGIN
+
+
+TestCaseDecorator::TestCaseDecorator( TestCase *test )
+    : TestCase( test->getName() ),
+      m_test( test )
+{ 
+}
+
+
+TestCaseDecorator::~TestCaseDecorator()
+{
+  delete m_test;
+}
+
+
+std::string 
+TestCaseDecorator::getName() const
+{ 
+  return m_test->getName(); 
+}
+
+
+void 
+TestCaseDecorator::setUp()
+{
+  m_test->setUp();
+}
+
+
+void 
+TestCaseDecorator::tearDown()
+{
+  m_test->tearDown();
+}
+
+
+void 
+TestCaseDecorator::runTest()
+{
+  m_test->runTest();
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestComposite.cpp b/src/cppunit/TestComposite.cpp
new file mode 100644
index 00000000000..4768791b572
--- /dev/null
+++ b/src/cppunit/TestComposite.cpp
@@ -0,0 +1,77 @@
+#include <cppunit/TestComposite.h>
+#include <cppunit/TestResult.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+TestComposite::TestComposite( const std::string &name )
+    : m_name( name )
+{
+}
+
+
+TestComposite::~TestComposite()
+{
+}
+
+
+void 
+TestComposite::run( TestResult *result )
+{
+  doStartSuite( result );
+  doRunChildTests( result );
+  doEndSuite( result );
+}
+
+
+int 
+TestComposite::countTestCases() const
+{
+  int count = 0;
+  
+  int childCount = getChildTestCount();
+  for ( int index =0; index < childCount; ++index )
+    count += getChildTestAt( index )->countTestCases();
+  
+  return count;
+}
+
+
+std::string 
+TestComposite::getName() const
+{
+  return m_name;
+}
+
+
+void 
+TestComposite::doStartSuite( TestResult *controller )
+{
+  controller->startSuite( this );
+}
+
+
+void 
+TestComposite::doRunChildTests( TestResult *controller )
+{
+  int childCount = getChildTestCount();
+  for ( int index =0; index < childCount; ++index )
+  {
+    if ( controller->shouldStop() )
+      break;
+
+    getChildTestAt( index )->run( controller );
+  }
+}
+
+
+void 
+TestComposite::doEndSuite( TestResult *controller )
+{
+  controller->endSuite( this );
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/TestDecorator.cpp b/src/cppunit/TestDecorator.cpp
new file mode 100644
index 00000000000..4e25a6af9b4
--- /dev/null
+++ b/src/cppunit/TestDecorator.cpp
@@ -0,0 +1,53 @@
+#include <cppunit/extensions/TestDecorator.h>
+
+CPPUNIT_NS_BEGIN
+
+
+TestDecorator::TestDecorator( Test *test )
+    : m_test( test)
+{ 
+}
+
+
+TestDecorator::~TestDecorator()
+{
+  delete m_test;
+}
+
+
+int 
+TestDecorator::countTestCases() const
+{ 
+  return m_test->countTestCases(); 
+}
+
+
+void 
+TestDecorator::run( TestResult *result )
+{ 
+  m_test->run(result); 
+}
+
+
+std::string 
+TestDecorator::getName() const
+{ 
+  return m_test->getName(); 
+}
+
+
+int 
+TestDecorator::getChildTestCount() const
+{
+  return m_test->getChildTestCount();
+}
+
+
+Test *
+TestDecorator::doGetChildTestAt( int index ) const
+{
+  return m_test->getChildTestAt( index );
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestFactoryRegistry.cpp b/src/cppunit/TestFactoryRegistry.cpp
new file mode 100644
index 00000000000..afe10bb4b9b
--- /dev/null
+++ b/src/cppunit/TestFactoryRegistry.cpp
@@ -0,0 +1,161 @@
+#include <cppunit/config/SourcePrefix.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/portability/CppUnitMap.h>
+#include <cppunit/TestSuite.h>
+#include <assert.h>
+
+
+CPPUNIT_NS_BEGIN
+
+/*! \brief (INTERNAL) List of all TestFactoryRegistry.
+ */
+class TestFactoryRegistryList
+{
+private:
+  typedef CppUnitMap<std::string, TestFactoryRegistry *, std::less<std::string> > Registries;
+  Registries m_registries;
+
+  enum State {
+    doNotChange =0,
+    notCreated,
+    exist,
+    destroyed
+  };
+
+  static State stateFlag( State newState = doNotChange )
+  {
+    static State state = notCreated;
+    if ( newState != doNotChange )
+      state = newState;
+    return state;
+  }
+
+  static TestFactoryRegistryList *getInstance()
+  {
+    static TestFactoryRegistryList list;
+    return &list;
+  }
+
+  TestFactoryRegistry *getInternalRegistry( const std::string &name )
+  {
+    Registries::const_iterator foundIt = m_registries.find( name );
+    if ( foundIt == m_registries.end() )
+    {
+      TestFactoryRegistry *factory = new TestFactoryRegistry( name );
+      m_registries.insert( std::pair<const std::string, TestFactoryRegistry*>( name, factory ) );
+      return factory;
+    }
+    return (*foundIt).second;
+  }
+
+public:
+  TestFactoryRegistryList()
+  {
+    stateFlag( exist );
+  }
+
+  ~TestFactoryRegistryList()
+  {
+    for ( Registries::iterator it = m_registries.begin(); it != m_registries.end(); ++it )
+      delete (*it).second;
+
+    stateFlag( destroyed );
+  }
+
+  static TestFactoryRegistry *getRegistry( const std::string &name )
+  {
+    // If the following assertion failed, then TestFactoryRegistry::getRegistry() 
+    // was called during static variable destruction without checking the registry 
+    // validity beforehand using TestFactoryRegistry::isValid() beforehand.
+    assert( isValid() );
+    if ( !isValid() )         // release mode
+      return NULL;            // => force CRASH
+
+    return getInstance()->getInternalRegistry( name );
+  }
+
+  static bool isValid()
+  {
+    return stateFlag() != destroyed;
+  }
+};
+
+
+
+TestFactoryRegistry::TestFactoryRegistry( std::string name ) :
+    m_name( name )
+{
+}
+
+
+TestFactoryRegistry::~TestFactoryRegistry()
+{
+}
+
+
+TestFactoryRegistry &
+TestFactoryRegistry::getRegistry( const std::string &name )
+{
+  return *TestFactoryRegistryList::getRegistry( name );
+}
+
+
+void 
+TestFactoryRegistry::registerFactory( const std::string &name,
+                                      TestFactory *factory )
+{
+  registerFactory( factory );
+}
+
+
+void 
+TestFactoryRegistry::registerFactory( TestFactory *factory )
+{
+  m_factories.insert( factory );
+}
+
+
+void 
+TestFactoryRegistry::unregisterFactory( TestFactory *factory )
+{
+  m_factories.erase( factory );
+}
+
+
+void 
+TestFactoryRegistry::addRegistry( const std::string &name )
+{
+  registerFactory( &getRegistry( name ) );
+}
+
+
+Test *
+TestFactoryRegistry::makeTest()
+{
+  TestSuite *suite = new TestSuite( m_name );
+  addTestToSuite( suite );
+  return suite;
+}
+
+
+void 
+TestFactoryRegistry::addTestToSuite( TestSuite *suite )
+{
+  for ( Factories::iterator it = m_factories.begin(); 
+        it != m_factories.end(); 
+        ++it )
+  {
+    TestFactory *factory = *it;
+    suite->addTest( factory->makeTest() );
+  }
+}
+
+
+bool 
+TestFactoryRegistry::isValid()
+{
+  return TestFactoryRegistryList::isValid();
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestFailure.cpp b/src/cppunit/TestFailure.cpp
new file mode 100644
index 00000000000..e31e1389380
--- /dev/null
+++ b/src/cppunit/TestFailure.cpp
@@ -0,0 +1,71 @@
+#include <cppunit/Exception.h>
+#include <cppunit/Test.h>
+#include <cppunit/TestFailure.h>
+
+CPPUNIT_NS_BEGIN
+
+
+/// Constructs a TestFailure with the given test and exception.
+TestFailure::TestFailure( Test *failedTest, 
+                          Exception *thrownException,
+                          bool isError ) :
+    m_failedTest( failedTest ), 
+    m_thrownException( thrownException ),
+    m_isError( isError )
+{
+}
+
+/// Deletes the owned exception.
+TestFailure::~TestFailure()
+{ 
+  delete m_thrownException; 
+}
+
+/// Gets the failed test.
+Test *
+TestFailure::failedTest() const
+{ 
+  return m_failedTest; 
+}
+
+
+/// Gets the thrown exception. Never \c NULL.
+Exception *
+TestFailure::thrownException() const
+{ 
+  return m_thrownException; 
+}
+
+
+/// Gets the failure location.
+SourceLine 
+TestFailure::sourceLine() const
+{
+  return m_thrownException->sourceLine();
+}
+
+
+/// Indicates if the failure is a failed assertion or an error.
+bool 
+TestFailure::isError() const
+{
+  return m_isError;
+}
+
+
+/// Gets the name of the failed test.
+std::string 
+TestFailure::failedTestName() const
+{
+  return m_failedTest->getName();
+}
+
+
+TestFailure *
+TestFailure::clone() const
+{
+  return new TestFailure( m_failedTest, m_thrownException->clone(), m_isError );
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestLeaf.cpp b/src/cppunit/TestLeaf.cpp
new file mode 100644
index 00000000000..3d8767cf523
--- /dev/null
+++ b/src/cppunit/TestLeaf.cpp
@@ -0,0 +1,28 @@
+#include <cppunit/TestLeaf.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+int 
+TestLeaf::countTestCases() const
+{
+  return 1;
+}
+
+
+int 
+TestLeaf::getChildTestCount() const
+{
+  return 0;
+}
+
+
+Test *
+TestLeaf::doGetChildTestAt( int index ) const
+{
+  checkIsValidIndex( index );
+  return NULL;    // never called, checkIsValidIndex() always throw.
+}
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestNamer.cpp b/src/cppunit/TestNamer.cpp
new file mode 100644
index 00000000000..eec9be97344
--- /dev/null
+++ b/src/cppunit/TestNamer.cpp
@@ -0,0 +1,44 @@
+#include <cppunit/extensions/TestNamer.h>
+#include <cppunit/extensions/TypeInfoHelper.h>
+#include <string>
+
+
+CPPUNIT_NS_BEGIN
+
+
+#if CPPUNIT_HAVE_RTTI
+TestNamer::TestNamer( const std::type_info &typeInfo )
+{
+  m_fixtureName = TypeInfoHelper::getClassName( typeInfo );
+}
+#endif
+
+
+TestNamer::TestNamer( const std::string &fixtureName )
+  : m_fixtureName( fixtureName )
+{
+}
+
+
+TestNamer::~TestNamer()
+{
+}
+
+
+std::string 
+TestNamer::getFixtureName() const
+{
+  return m_fixtureName;
+}
+
+
+std::string 
+TestNamer::getTestNameFor( const std::string &testMethodName ) const
+{
+  return getFixtureName() + "::" + testMethodName;
+}
+
+
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestPath.cpp b/src/cppunit/TestPath.cpp
new file mode 100644
index 00000000000..a2783a293e4
--- /dev/null
+++ b/src/cppunit/TestPath.cpp
@@ -0,0 +1,254 @@
+#include <cppunit/Portability.h>
+#include <cppunit/Test.h>
+#include <cppunit/TestPath.h>
+#include <stdexcept>
+
+
+CPPUNIT_NS_BEGIN
+
+
+TestPath::TestPath()
+{
+}
+
+
+TestPath::TestPath( Test *root )
+{
+  add( root );
+}
+
+
+TestPath::TestPath( const TestPath &other, 
+                    int indexFirst, 
+                    int count )
+{
+  int countAdjustment = 0;
+  if ( indexFirst < 0 )
+  {
+    countAdjustment = indexFirst;
+    indexFirst = 0;
+  }
+
+  if ( count < 0 )
+    count = other.getTestCount();
+  else
+    count += countAdjustment;
+
+  int index = indexFirst;
+  while ( count-- > 0  &&  index < other.getTestCount() )
+    add( other.getTestAt( index++ ) );
+}
+
+
+TestPath::TestPath( Test *searchRoot, 
+                    const std::string &pathAsString )
+{
+  PathTestNames testNames;
+
+  Test *parentTest = findActualRoot( searchRoot, pathAsString, testNames );
+  add( parentTest );
+
+  for ( unsigned int index = 1; index < testNames.size(); ++index )
+  {
+    bool childFound = false;
+    for ( int childIndex =0; childIndex < parentTest->getChildTestCount(); ++childIndex )
+    {
+      if ( parentTest->getChildTestAt( childIndex )->getName() == testNames[index] )
+      {
+        childFound = true;
+        parentTest = parentTest->getChildTestAt( childIndex );
+        break;
+      }
+    }
+
+    if ( !childFound )
+      throw std::invalid_argument( "TestPath::TestPath(): failed to resolve test name <"+
+                                   testNames[index] + "> of path <" + pathAsString + ">" );
+
+    add( parentTest );
+  }
+}
+
+
+TestPath::TestPath( const TestPath &other )
+  : m_tests( other.m_tests )
+{
+}
+
+
+TestPath::~TestPath()
+{
+}
+
+
+TestPath &
+TestPath::operator =( const TestPath &other )
+{
+  if ( &other != this )
+    m_tests = other.m_tests;
+  return *this;
+}
+
+
+bool 
+TestPath::isValid() const
+{
+  return getTestCount() > 0;
+}
+
+
+void 
+TestPath::add( Test *test )
+{
+  m_tests.push_back( test );
+}
+
+
+void 
+TestPath::add( const TestPath &path )
+{
+  for ( int index =0; index < path.getTestCount(); ++index )
+    add( path.getTestAt( index ) );
+}
+
+
+void 
+TestPath::insert( Test *test, 
+                  int index )
+{
+  if ( index < 0  ||  index > getTestCount() )
+    throw std::out_of_range( "TestPath::insert(): index out of range" );
+  m_tests.insert( m_tests.begin() + index, test );
+}
+
+void 
+TestPath::insert( const TestPath &path, 
+                  int index )
+{
+  int itemIndex = path.getTestCount() -1;
+  while ( itemIndex >= 0 )
+    insert( path.getTestAt( itemIndex-- ), index );
+}
+
+
+void 
+TestPath::removeTests()
+{
+  while ( isValid() )
+    removeTest( 0 );
+}
+
+
+void 
+TestPath::removeTest( int index )
+{
+  checkIndexValid( index );
+  m_tests.erase( m_tests.begin() + index );
+}
+
+
+void 
+TestPath::up()
+{
+  checkIndexValid( 0 );
+  removeTest( getTestCount() -1 );
+}
+
+
+int 
+TestPath::getTestCount() const
+{
+  return m_tests.size();
+}
+
+
+Test *
+TestPath::getTestAt( int index ) const
+{
+  checkIndexValid( index );
+  return m_tests[index];
+}
+
+
+Test *
+TestPath::getChildTest() const
+{
+  return getTestAt( getTestCount() -1 );
+}
+
+
+void 
+TestPath::checkIndexValid( int index ) const
+{
+  if ( index < 0  ||  index >= getTestCount() )
+    throw std::out_of_range( "TestPath::checkIndexValid(): index out of range" );
+}
+
+
+std::string 
+TestPath::toString() const
+{
+  std::string asString( "/" );
+  for ( int index =0; index < getTestCount(); ++index )
+  {
+    if ( index > 0 )
+      asString += '/';
+    asString += getTestAt(index)->getName();
+  }
+
+  return asString;
+}
+
+
+Test *
+TestPath::findActualRoot( Test *searchRoot,
+                          const std::string &pathAsString,
+                          PathTestNames &testNames )
+{
+  bool isRelative = splitPathString( pathAsString, testNames );
+
+  if ( isRelative  &&  pathAsString.empty() )
+    return searchRoot;
+
+  if ( testNames.empty() )
+    throw std::invalid_argument( "TestPath::TestPath(): invalid root or root name in absolute path" );
+
+  Test *root = isRelative ? searchRoot->findTest( testNames[0] )  // throw if bad test name
+                          : searchRoot;
+  if ( root->getName() != testNames[0] )
+    throw std::invalid_argument( "TestPath::TestPath(): searchRoot does not match path root name" );
+
+  return root;
+}
+
+
+bool
+TestPath::splitPathString( const std::string &pathAsString,
+                           PathTestNames &testNames )
+{
+  if ( pathAsString.empty() )
+    return true;
+
+  bool isRelative = pathAsString[0] != '/';
+
+  int index = (isRelative ? 0 : 1);
+  while ( true )
+  {
+    int separatorIndex = pathAsString.find( '/', index );
+    if ( separatorIndex >= 0 )
+    {
+      testNames.push_back( pathAsString.substr( index, separatorIndex - index ) );
+      index = separatorIndex + 1;
+    }
+    else
+    {
+      testNames.push_back( pathAsString.substr( index ) );
+      break;
+    }
+  }
+
+  return isRelative;
+}
+  
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestPlugInDefaultImpl.cpp b/src/cppunit/TestPlugInDefaultImpl.cpp
new file mode 100644
index 00000000000..1e398258689
--- /dev/null
+++ b/src/cppunit/TestPlugInDefaultImpl.cpp
@@ -0,0 +1,63 @@
+#include <cppunit/config/SourcePrefix.h>
+
+#if !defined(CPPUNIT_NO_TESTPLUGIN)
+
+#include <cppunit/TestSuite.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/plugin/TestPlugInDefaultImpl.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+TestPlugInDefaultImpl::TestPlugInDefaultImpl() 
+{
+}
+
+
+TestPlugInDefaultImpl::~TestPlugInDefaultImpl()
+{
+}
+
+
+void 
+TestPlugInDefaultImpl::initialize( TestFactoryRegistry *registry,
+                                   const PlugInParameters &parameters )
+{
+}
+
+
+void 
+TestPlugInDefaultImpl::addListener( TestResult *eventManager )
+{
+}
+
+
+void 
+TestPlugInDefaultImpl::removeListener( TestResult *eventManager )
+{
+}
+
+
+void 
+TestPlugInDefaultImpl::addXmlOutputterHooks( XmlOutputter *outputter )
+{
+}
+
+
+void 
+TestPlugInDefaultImpl::removeXmlOutputterHooks()
+{
+}
+
+
+void 
+TestPlugInDefaultImpl::uninitialize( TestFactoryRegistry *registry )
+{
+}
+
+
+CPPUNIT_NS_END
+
+
+#endif // !defined(CPPUNIT_NO_TESTPLUGIN)
diff --git a/src/cppunit/TestResult.cpp b/src/cppunit/TestResult.cpp
new file mode 100644
index 00000000000..6be19f1a1b8
--- /dev/null
+++ b/src/cppunit/TestResult.cpp
@@ -0,0 +1,196 @@
+#include <cppunit/Test.h>
+#include <cppunit/TestFailure.h>
+#include <cppunit/TestListener.h>
+#include <cppunit/TestResult.h>
+#include <cppunit/tools/Algorithm.h>
+#include <algorithm>
+#include "DefaultProtector.h"
+#include "ProtectorChain.h"
+#include "ProtectorContext.h"
+
+CPPUNIT_NS_BEGIN
+
+
+TestResult::TestResult( SynchronizationObject *syncObject )
+    : SynchronizedObject( syncObject )
+    , m_protectorChain( new ProtectorChain() )
+    , m_stop( false )
+{ 
+  m_protectorChain->push( new DefaultProtector() );
+}
+
+
+TestResult::~TestResult()
+{
+  delete m_protectorChain;
+}
+
+
+void 
+TestResult::reset()
+{
+  ExclusiveZone zone( m_syncObject ); 
+  m_stop = false;
+}
+
+
+void 
+TestResult::addError( Test *test, 
+                      Exception *e )
+{ 
+  TestFailure failure( test, e, true );
+  addFailure( failure );
+}
+
+
+void 
+TestResult::addFailure( Test *test, Exception *e )
+{ 
+  TestFailure failure( test, e, false );
+  addFailure( failure );
+}
+
+
+void 
+TestResult::addFailure( const TestFailure &failure )
+{
+  ExclusiveZone zone( m_syncObject ); 
+  for ( TestListeners::iterator it = m_listeners.begin();
+        it != m_listeners.end(); 
+        ++it )
+    (*it)->addFailure( failure );
+}
+
+
+void 
+TestResult::startTest( Test *test )
+{ 
+  ExclusiveZone zone( m_syncObject ); 
+  for ( TestListeners::iterator it = m_listeners.begin();
+        it != m_listeners.end(); 
+        ++it )
+    (*it)->startTest( test );
+}
+
+  
+void 
+TestResult::endTest( Test *test )
+{ 
+  ExclusiveZone zone( m_syncObject ); 
+  for ( TestListeners::iterator it = m_listeners.begin();
+        it != m_listeners.end(); 
+        ++it )
+    (*it)->endTest( test );
+}
+
+
+void 
+TestResult::startSuite( Test *test )
+{
+  ExclusiveZone zone( m_syncObject ); 
+  for ( TestListeners::iterator it = m_listeners.begin();
+        it != m_listeners.end(); 
+        ++it )
+    (*it)->startSuite( test );
+}
+
+
+void 
+TestResult::endSuite( Test *test )
+{
+  ExclusiveZone zone( m_syncObject ); 
+  for ( TestListeners::iterator it = m_listeners.begin();
+        it != m_listeners.end(); 
+        ++it )
+    (*it)->endSuite( test );
+}
+
+
+bool 
+TestResult::shouldStop() const
+{ 
+  ExclusiveZone zone( m_syncObject );
+  return m_stop; 
+}
+
+
+void 
+TestResult::stop()
+{ 
+  ExclusiveZone zone( m_syncObject );
+  m_stop = true; 
+}
+
+
+void 
+TestResult::addListener( TestListener *listener )
+{
+  ExclusiveZone zone( m_syncObject ); 
+  m_listeners.push_back( listener );
+}
+
+
+void 
+TestResult::removeListener ( TestListener *listener )
+{
+  ExclusiveZone zone( m_syncObject ); 
+  removeFromSequence( m_listeners, listener );
+}
+
+
+void 
+TestResult::runTest( Test *test )
+{
+  startTestRun( test );
+  test->run( this );
+  endTestRun( test );
+}
+
+
+void 
+TestResult::startTestRun( Test *test )
+{
+  ExclusiveZone zone( m_syncObject ); 
+  for ( TestListeners::iterator it = m_listeners.begin();
+        it != m_listeners.end(); 
+        ++it )
+    (*it)->startTestRun( test, this );
+}
+
+
+void 
+TestResult::endTestRun( Test *test )
+{
+  ExclusiveZone zone( m_syncObject ); 
+  for ( TestListeners::iterator it = m_listeners.begin();
+        it != m_listeners.end(); 
+        ++it )
+    (*it)->endTestRun( test, this );
+}
+
+
+bool 
+TestResult::protect( const Functor &functor,
+                     Test *test,
+                     const std::string &shortDescription )
+{
+  ProtectorContext context( test, this, shortDescription );
+  return m_protectorChain->protect( functor, context );
+}
+
+
+void 
+TestResult::pushProtector( Protector *protector )
+{
+  m_protectorChain->push( protector );
+}
+
+
+void 
+TestResult::popProtector()
+{
+  m_protectorChain->pop();
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestResultCollector.cpp b/src/cppunit/TestResultCollector.cpp
new file mode 100644
index 00000000000..4371c503066
--- /dev/null
+++ b/src/cppunit/TestResultCollector.cpp
@@ -0,0 +1,117 @@
+#include <cppunit/TestFailure.h>
+#include <cppunit/TestResultCollector.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+TestResultCollector::TestResultCollector( SynchronizationObject *syncObject )
+    : TestSuccessListener( syncObject )
+{
+  reset();
+}
+
+
+TestResultCollector::~TestResultCollector()
+{
+  freeFailures();
+}
+
+
+void 
+TestResultCollector::freeFailures()
+{
+  TestFailures::iterator itFailure = m_failures.begin();
+  while ( itFailure != m_failures.end() )
+    delete *itFailure++;
+  m_failures.clear();
+}
+
+
+void 
+TestResultCollector::reset()
+{
+  TestSuccessListener::reset();
+
+  ExclusiveZone zone( m_syncObject ); 
+  freeFailures();
+  m_testErrors = 0;
+  m_tests.clear();
+}
+
+
+void 
+TestResultCollector::startTest( Test *test )
+{
+  ExclusiveZone zone (m_syncObject); 
+  m_tests.push_back( test );
+}
+
+
+void 
+TestResultCollector::addFailure( const TestFailure &failure )
+{
+  TestSuccessListener::addFailure( failure );
+
+  ExclusiveZone zone( m_syncObject ); 
+  if ( failure.isError() )
+    ++m_testErrors;
+  m_failures.push_back( failure.clone() );
+}
+
+
+/// Gets the number of run tests.
+int 
+TestResultCollector::runTests() const
+{ 
+  ExclusiveZone zone( m_syncObject ); 
+  return m_tests.size(); 
+}
+
+
+/// Gets the number of detected errors (uncaught exception).
+int 
+TestResultCollector::testErrors() const
+{ 
+  ExclusiveZone zone( m_syncObject );
+  return m_testErrors;
+}
+
+
+/// Gets the number of detected failures (failed assertion).
+int 
+TestResultCollector::testFailures() const
+{ 
+  ExclusiveZone zone( m_syncObject ); 
+  return m_failures.size() - m_testErrors;
+}
+
+
+/// Gets the total number of detected failures.
+int 
+TestResultCollector::testFailuresTotal() const
+{
+  ExclusiveZone zone( m_syncObject ); 
+  return m_failures.size();
+}
+
+
+/// Returns a the list failures (random access collection).
+const TestResultCollector::TestFailures & 
+TestResultCollector::failures() const
+{ 
+  ExclusiveZone zone( m_syncObject );
+  return m_failures; 
+}
+
+
+const TestResultCollector::Tests &
+TestResultCollector::tests() const
+{
+  ExclusiveZone zone( m_syncObject );
+  return m_tests;
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/TestRunner.cpp b/src/cppunit/TestRunner.cpp
new file mode 100644
index 00000000000..8d95a6308c1
--- /dev/null
+++ b/src/cppunit/TestRunner.cpp
@@ -0,0 +1,101 @@
+#include <cppunit/config/SourcePrefix.h>
+#include <cppunit/TestRunner.h>
+#include <cppunit/TestPath.h>
+#include <cppunit/TestResult.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+TestRunner::WrappingSuite::WrappingSuite( const std::string &name ) 
+    : TestSuite( name )
+{
+}
+
+
+int 
+TestRunner::WrappingSuite::getChildTestCount() const
+{
+  if ( hasOnlyOneTest() )
+    return getUniqueChildTest()->getChildTestCount();
+  return TestSuite::getChildTestCount();
+}
+
+
+std::string 
+TestRunner::WrappingSuite::getName() const
+{
+  if ( hasOnlyOneTest() )
+    return getUniqueChildTest()->getName();
+  return TestSuite::getName();
+}
+
+
+Test *
+TestRunner::WrappingSuite::doGetChildTestAt( int index ) const
+{
+  if ( hasOnlyOneTest() )
+    return getUniqueChildTest()->getChildTestAt( index );
+  return TestSuite::doGetChildTestAt( index );
+}
+
+
+void 
+TestRunner::WrappingSuite::run( TestResult *result )
+{
+  if ( hasOnlyOneTest() )
+    getUniqueChildTest()->run( result );
+  else
+    TestSuite::run( result );
+}
+
+
+bool 
+TestRunner::WrappingSuite::hasOnlyOneTest() const
+{
+  return TestSuite::getChildTestCount() == 1;
+}
+
+
+Test *
+TestRunner::WrappingSuite::getUniqueChildTest() const
+{
+  return TestSuite::doGetChildTestAt( 0 );
+}
+
+
+
+
+
+TestRunner::TestRunner()
+    : m_suite( new WrappingSuite() )
+{
+}
+
+
+TestRunner::~TestRunner()
+{
+  delete m_suite;
+}
+
+
+void 
+TestRunner::addTest( Test *test )
+{
+  m_suite->addTest( test ); 
+}
+
+
+void 
+TestRunner::run( TestResult &controller,
+                 const std::string &testPath )
+{
+  TestPath path = m_suite->resolveTestPath( testPath );
+  Test *testToRun = path.getChildTest();
+
+  controller.runTest( testToRun );
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/TestSetUp.cpp b/src/cppunit/TestSetUp.cpp
new file mode 100644
index 00000000000..d4d85308939
--- /dev/null
+++ b/src/cppunit/TestSetUp.cpp
@@ -0,0 +1,32 @@
+#include <cppunit/extensions/TestSetUp.h>
+
+CPPUNIT_NS_BEGIN
+
+
+TestSetUp::TestSetUp( Test *test ) : TestDecorator( test ) 
+{
+}
+
+
+void 
+TestSetUp::setUp()
+{
+}
+
+
+void 
+TestSetUp::tearDown() 
+{
+}
+
+
+void
+TestSetUp::run( TestResult *result )
+{ 
+  setUp();
+  TestDecorator::run(result);
+  tearDown();
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TestSuccessListener.cpp b/src/cppunit/TestSuccessListener.cpp
new file mode 100644
index 00000000000..3c9c8214c69
--- /dev/null
+++ b/src/cppunit/TestSuccessListener.cpp
@@ -0,0 +1,44 @@
+#include <cppunit/TestSuccessListener.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+TestSuccessListener::TestSuccessListener( SynchronizationObject *syncObject )
+    : SynchronizedObject( syncObject )
+    , m_success( true )
+{
+}
+
+
+TestSuccessListener::~TestSuccessListener()
+{
+}
+
+
+void 
+TestSuccessListener::reset()
+{
+  ExclusiveZone zone( m_syncObject );
+  m_success = true;
+}
+
+
+void 
+TestSuccessListener::addFailure( const TestFailure &failure )
+{
+  ExclusiveZone zone( m_syncObject );
+  m_success = false;
+}
+
+
+bool 
+TestSuccessListener::wasSuccessful() const
+{
+  ExclusiveZone zone( m_syncObject );
+  return m_success;
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/TestSuite.cpp b/src/cppunit/TestSuite.cpp
new file mode 100644
index 00000000000..8dd2ea6e719
--- /dev/null
+++ b/src/cppunit/TestSuite.cpp
@@ -0,0 +1,64 @@
+#include <cppunit/config/SourcePrefix.h>
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestResult.h>
+
+CPPUNIT_NS_BEGIN
+
+
+/// Default constructor
+TestSuite::TestSuite( std::string name )
+    : TestComposite( name )
+{
+}
+
+
+/// Destructor
+TestSuite::~TestSuite()
+{ 
+  deleteContents(); 
+}
+
+
+/// Deletes all tests in the suite.
+void 
+TestSuite::deleteContents()
+{
+  int childCount = getChildTestCount();
+  for ( int index =0; index < childCount; ++index )
+    delete getChildTestAt( index );
+
+  m_tests.clear();
+}
+
+
+/// Adds a test to the suite. 
+void 
+TestSuite::addTest( Test *test )
+{ 
+  m_tests.push_back( test ); 
+}
+
+
+const CppUnitVector<Test *> &
+TestSuite::getTests() const
+{
+  return m_tests;
+}
+
+
+int 
+TestSuite::getChildTestCount() const
+{
+  return m_tests.size();
+}
+
+
+Test *
+TestSuite::doGetChildTestAt( int index ) const
+{
+  return m_tests[index];
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/TestSuiteBuilderContext.cpp b/src/cppunit/TestSuiteBuilderContext.cpp
new file mode 100644
index 00000000000..ff71b52c136
--- /dev/null
+++ b/src/cppunit/TestSuiteBuilderContext.cpp
@@ -0,0 +1,85 @@
+#include <cppunit/TestSuite.h>
+#include <cppunit/extensions/TestFixtureFactory.h>
+#include <cppunit/extensions/TestNamer.h>
+#include <cppunit/extensions/TestSuiteBuilderContext.h>
+
+
+CPPUNIT_NS_BEGIN
+
+TestSuiteBuilderContextBase::TestSuiteBuilderContextBase( 
+                                 TestSuite &suite,
+                                 const TestNamer &namer,
+                                 TestFixtureFactory &factory )
+  : m_suite( suite )
+  , m_namer( namer )
+  , m_factory( factory )
+{
+}
+
+
+TestSuiteBuilderContextBase::~TestSuiteBuilderContextBase()
+{
+}
+
+
+void 
+TestSuiteBuilderContextBase::addTest( Test *test )
+{
+  m_suite.addTest( test );
+}
+
+
+std::string 
+TestSuiteBuilderContextBase::getFixtureName() const
+{
+  return m_namer.getFixtureName();
+}
+
+
+std::string 
+TestSuiteBuilderContextBase::getTestNameFor( 
+                                 const std::string &testMethodName ) const
+{
+  return m_namer.getTestNameFor( testMethodName );
+}
+
+
+TestFixture *
+TestSuiteBuilderContextBase::makeTestFixture() const
+{
+  return m_factory.makeFixture();
+}
+
+
+void 
+TestSuiteBuilderContextBase::addProperty( const std::string &key, 
+                                          const std::string &value )
+{
+  Properties::iterator it = m_properties.begin();
+  for ( ; it != m_properties.end(); ++it )
+  {
+    if ( (*it).first == key )
+    {
+      (*it).second = value;
+      return;
+    }
+  }
+
+  Property property( key, value );
+  m_properties.push_back( property );
+}
+
+const std::string 
+TestSuiteBuilderContextBase::getStringProperty( const std::string &key ) const
+{
+  Properties::const_iterator it = m_properties.begin();
+  for ( ; it != m_properties.end(); ++it )
+  {
+    if ( (*it).first == key )
+      return (*it).second;
+  }
+  return "";
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TextOutputter.cpp b/src/cppunit/TextOutputter.cpp
new file mode 100644
index 00000000000..f74214fc63d
--- /dev/null
+++ b/src/cppunit/TextOutputter.cpp
@@ -0,0 +1,140 @@
+#include <cppunit/Exception.h>
+#include <cppunit/SourceLine.h>
+#include <cppunit/TestFailure.h>
+#include <cppunit/TextOutputter.h>
+#include <cppunit/TestResultCollector.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+TextOutputter::TextOutputter( TestResultCollector *result,
+                              OStream &stream )
+    : m_result( result )
+    , m_stream( stream )
+{
+}
+
+
+TextOutputter::~TextOutputter()
+{
+}
+
+
+void 
+TextOutputter::write() 
+{
+  printHeader();
+  m_stream << "\n";
+  printFailures();
+  m_stream << "\n";
+}
+
+
+void 
+TextOutputter::printFailures()
+{
+  TestResultCollector::TestFailures::const_iterator itFailure = m_result->failures().begin();
+  int failureNumber = 1;
+  while ( itFailure != m_result->failures().end() ) 
+  {
+    m_stream  <<  "\n";
+    printFailure( *itFailure++, failureNumber++ );
+  }
+}
+
+
+void 
+TextOutputter::printFailure( TestFailure *failure,
+                             int failureNumber )
+{
+  printFailureListMark( failureNumber );
+  m_stream << ' ';
+  printFailureTestName( failure );
+  m_stream << ' ';
+  printFailureType( failure );
+  m_stream << ' ';
+  printFailureLocation( failure->sourceLine() );
+  m_stream << "\n";
+  printFailureDetail( failure->thrownException() );
+  m_stream << "\n";
+}
+
+
+void 
+TextOutputter::printFailureListMark( int failureNumber )
+{
+  m_stream << failureNumber << ")";
+}
+
+
+void 
+TextOutputter::printFailureTestName( TestFailure *failure )
+{
+  m_stream << "test: " << failure->failedTestName();
+}
+
+
+void 
+TextOutputter::printFailureType( TestFailure *failure )
+{
+  m_stream << "("
+           << (failure->isError() ? "E" : "F")
+           << ")";
+}
+
+
+void 
+TextOutputter::printFailureLocation( SourceLine sourceLine )
+{
+  if ( !sourceLine.isValid() )
+    return;
+
+  m_stream << "line: " << sourceLine.lineNumber()
+           << ' ' << sourceLine.fileName();
+}
+
+
+void 
+TextOutputter::printFailureDetail( Exception *thrownException )
+{
+  m_stream  <<  thrownException->message().shortDescription()  <<  "\n";
+  m_stream  <<  thrownException->message().details();
+}
+
+
+void 
+TextOutputter::printHeader()
+{
+  if ( m_result->wasSuccessful() )
+    m_stream << "\nOK (" << m_result->runTests () << " tests)\n" ;
+  else
+  {
+    m_stream << "\n";
+    printFailureWarning();
+    printStatistics();
+  }
+}
+
+
+void 
+TextOutputter::printFailureWarning()
+{
+  m_stream  << "!!!FAILURES!!!\n";
+}
+
+
+void 
+TextOutputter::printStatistics()
+{
+  m_stream  << "Test Results:\n";
+
+  m_stream  <<  "Run:  "  <<  m_result->runTests()
+            <<  "   Failures: "  <<  m_result->testFailures()
+            <<  "   Errors: "  <<  m_result->testErrors()
+            <<  "\n";
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/TextTestProgressListener.cpp b/src/cppunit/TextTestProgressListener.cpp
new file mode 100644
index 00000000000..7fa92ce39e3
--- /dev/null
+++ b/src/cppunit/TextTestProgressListener.cpp
@@ -0,0 +1,43 @@
+#include <cppunit/TestFailure.h>
+#include <cppunit/TextTestProgressListener.h>
+#include <cppunit/portability/Stream.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+TextTestProgressListener::TextTestProgressListener()
+{
+}
+
+
+TextTestProgressListener::~TextTestProgressListener()
+{
+}
+
+
+void 
+TextTestProgressListener::startTest( Test *test )
+{
+  stdCOut() << ".";
+}
+
+
+void 
+TextTestProgressListener::addFailure( const TestFailure &failure )
+{
+  stdCOut() << ( failure.isError() ? "E" : "F" );
+}
+
+
+void 
+TextTestProgressListener::endTestRun( Test *test, 
+                                      TestResult *eventManager )
+{
+  stdCOut()  <<  "\n";
+  stdCOut().flush();
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/TextTestResult.cpp b/src/cppunit/TextTestResult.cpp
new file mode 100644
index 00000000000..871eb6da333
--- /dev/null
+++ b/src/cppunit/TextTestResult.cpp
@@ -0,0 +1,50 @@
+#include <cppunit/Exception.h>
+#include <cppunit/Test.h>
+#include <cppunit/TestFailure.h>
+#include <cppunit/TextTestResult.h>
+#include <cppunit/TextOutputter.h>
+#include <cppunit/portability/Stream.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+TextTestResult::TextTestResult()
+{
+  addListener( this );
+}
+
+
+void 
+TextTestResult::addFailure( const TestFailure &failure )
+{
+  TestResultCollector::addFailure( failure );
+  stdCOut() << ( failure.isError() ? "E" : "F" );
+}
+
+
+void 
+TextTestResult::startTest( Test *test )
+{
+  TestResultCollector::startTest (test);
+  stdCOut() << ".";
+}
+
+
+void 
+TextTestResult::print( OStream &stream ) 
+{
+  TextOutputter outputter( this, stream );
+  outputter.write();
+}
+
+
+OStream &
+operator <<( OStream &stream, 
+             TextTestResult &result )
+{ 
+  result.print (stream); return stream; 
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TextTestRunner.cpp b/src/cppunit/TextTestRunner.cpp
new file mode 100644
index 00000000000..1534ec0ccd3
--- /dev/null
+++ b/src/cppunit/TextTestRunner.cpp
@@ -0,0 +1,144 @@
+// ==> Implementation of cppunit/ui/text/TestRunner.h
+
+#include <cppunit/config/SourcePrefix.h>
+#include <cppunit/TestSuite.h>
+#include <cppunit/TextTestResult.h>
+#include <cppunit/TextOutputter.h>
+#include <cppunit/TextTestProgressListener.h>
+#include <cppunit/TestResult.h>
+#include <cppunit/ui/text/TextTestRunner.h>
+#include <cppunit/portability/Stream.h>
+#include <stdexcept>
+
+
+CPPUNIT_NS_BEGIN
+
+
+/*! Constructs a new text runner.
+ * \param outputter used to print text result. Owned by the runner.
+ */
+TextTestRunner::TextTestRunner( Outputter *outputter ) 
+    : m_result( new TestResultCollector() )
+    , m_eventManager( new TestResult() )
+    , m_outputter( outputter )
+{
+  if ( !m_outputter )
+    m_outputter = new TextOutputter( m_result, stdCOut() );
+  m_eventManager->addListener( m_result );
+}
+
+
+TextTestRunner::~TextTestRunner()
+{
+  delete m_eventManager;
+  delete m_outputter;
+  delete m_result;
+}
+
+
+/*! Runs the named test case.
+ *
+ * \param testName Name of the test case to run. If an empty is given, then
+ *                 all added tests are run. The name can be the name of any
+ *                 test in the hierarchy.
+ * \param doWait if \c true then the user must press the RETURN key 
+ *               before the run() method exit.
+ * \param doPrintResult if \c true (default) then the test result are printed
+ *                      on the standard output.
+ * \param doPrintProgress if \c true (default) then TextTestProgressListener is
+ *                        used to show the progress.
+ * \return \c true is the test was successful, \c false if the test
+ *         failed or was not found.
+ */
+bool
+TextTestRunner::run( std::string testName,
+                       bool doWait,
+                       bool doPrintResult,
+                       bool doPrintProgress )
+{
+  TextTestProgressListener progress;
+  if ( doPrintProgress )
+    m_eventManager->addListener( &progress );
+
+  TestRunner *pThis = this;
+  pThis->run( *m_eventManager, testName );
+
+  if ( doPrintProgress )
+    m_eventManager->removeListener( &progress );
+
+  printResult( doPrintResult );
+  wait( doWait );
+
+  return m_result->wasSuccessful();
+}
+
+
+void 
+TextTestRunner::wait( bool doWait )
+{
+#if !defined( CPPUNIT_NO_STREAM )
+  if ( doWait ) 
+  {
+    stdCOut() << "<RETURN> to continue\n";
+    stdCOut().flush();
+    std::cin.get ();
+  }
+#endif
+}
+
+
+void 
+TextTestRunner::printResult( bool doPrintResult )
+{
+  stdCOut() << "\n";
+  if ( doPrintResult )
+    m_outputter->write();
+}
+
+
+/*! Returns the result of the test run.
+ * Use this after calling run() to access the result of the test run.
+ */
+TestResultCollector &
+TextTestRunner::result() const
+{
+  return *m_result;
+}
+
+
+/*! Returns the event manager.
+ * The instance of TestResult results returned is the one that is used to run the
+ * test. Use this to register additional TestListener before running the tests.
+ */
+TestResult &
+TextTestRunner::eventManager() const
+{
+  return *m_eventManager;
+}
+
+
+/*! Specifies an alternate outputter.
+ *
+ * Notes that the outputter will be use after the test run only if \a printResult was
+ * \c true.
+ * \param outputter New outputter to use. The previous outputter is destroyed. 
+ *                  The TextTestRunner assumes ownership of the outputter.
+ * \see CompilerOutputter, XmlOutputter, TextOutputter.
+ */
+void 
+TextTestRunner::setOutputter( Outputter *outputter )
+{
+  delete m_outputter;
+  m_outputter = outputter;
+}
+
+
+void 
+TextTestRunner::run( TestResult &controller,
+                     const std::string &testPath )
+{
+  TestRunner::run( controller, testPath );
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/TypeInfoHelper.cpp b/src/cppunit/TypeInfoHelper.cpp
new file mode 100644
index 00000000000..bd01001b469
--- /dev/null
+++ b/src/cppunit/TypeInfoHelper.cpp
@@ -0,0 +1,53 @@
+#include <cppunit/Portability.h>
+#include <cppunit/extensions/TypeInfoHelper.h>
+
+#if CPPUNIT_HAVE_RTTI
+
+#include <string>
+
+#if CPPUNIT_HAVE_GCC_ABI_DEMANGLE
+#include <cxxabi.h>
+#endif
+
+
+CPPUNIT_NS_BEGIN
+
+
+std::string 
+TypeInfoHelper::getClassName( const std::type_info &info )
+{
+#if defined(CPPUNIT_HAVE_GCC_ABI_DEMANGLE)  &&  CPPUNIT_HAVE_GCC_ABI_DEMANGLE
+
+  int status = 0;
+  char* c_name = 0;
+
+  c_name = abi::__cxa_demangle( info.name(), 0, 0, &status );
+  
+  std::string name( c_name );
+  free( c_name );  
+
+#else   // CPPUNIT_HAVE_GCC_ABI_DEMANGLE
+
+  static std::string classPrefix( "class " );
+  std::string name( info.name() );
+
+  // Work around gcc 3.0 bug: strip number before type name.
+  unsigned int firstNotDigitIndex = 0;
+  while ( firstNotDigitIndex < name.length()  &&
+          name[firstNotDigitIndex] >= '0'  &&
+          name[firstNotDigitIndex] <= '9' )
+    ++firstNotDigitIndex;
+  name = name.substr( firstNotDigitIndex );
+
+  if ( name.substr( 0, classPrefix.length() ) == classPrefix )
+    return name.substr( classPrefix.length() );
+
+#endif  // CPPUNIT_HAVE_GCC_ABI_DEMANGLE
+
+  return name;
+}
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNIT_HAVE_RTTI
diff --git a/src/cppunit/UnixDynamicLibraryManager.cpp b/src/cppunit/UnixDynamicLibraryManager.cpp
new file mode 100644
index 00000000000..f235cce5ae0
--- /dev/null
+++ b/src/cppunit/UnixDynamicLibraryManager.cpp
@@ -0,0 +1,44 @@
+#include <cppunit/Portability.h>
+
+#if defined(CPPUNIT_HAVE_UNIX_DLL_LOADER)
+#include <cppunit/plugin/DynamicLibraryManager.h>
+
+#include <dlfcn.h>
+#include <unistd.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+DynamicLibraryManager::LibraryHandle 
+DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
+{
+  return ::dlopen( libraryName.c_str(), RTLD_NOW | RTLD_GLOBAL );
+}
+
+
+void 
+DynamicLibraryManager::doReleaseLibrary()
+{
+  ::dlclose( m_libraryHandle);
+}
+
+
+DynamicLibraryManager::Symbol 
+DynamicLibraryManager::doFindSymbol( const std::string &symbol )
+{
+  return ::dlsym ( m_libraryHandle, symbol.c_str() );
+}
+
+
+std::string 
+DynamicLibraryManager::getLastErrorDetail() const
+{
+  return "";
+}
+
+
+CPPUNIT_NS_END
+
+
+#endif // defined(CPPUNIT_HAVE_UNIX_DLL_LOADER)
diff --git a/src/cppunit/Win32DynamicLibraryManager.cpp b/src/cppunit/Win32DynamicLibraryManager.cpp
new file mode 100644
index 00000000000..acadf462740
--- /dev/null
+++ b/src/cppunit/Win32DynamicLibraryManager.cpp
@@ -0,0 +1,73 @@
+#include <cppunit/Portability.h>
+
+#if defined(CPPUNIT_HAVE_WIN32_DLL_LOADER)
+#include <cppunit/plugin/DynamicLibraryManager.h>
+
+#define WIN32_LEAN_AND_MEAN 
+#define NOGDI
+#define NOUSER
+#define NOKERNEL
+#define NOSOUND
+#define NOMINMAX
+#define BLENDFUNCTION void    // for mingw & gcc  
+#include <windows.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+DynamicLibraryManager::LibraryHandle 
+DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
+{
+  return ::LoadLibraryA( libraryName.c_str() );
+}
+
+
+void 
+DynamicLibraryManager::doReleaseLibrary()
+{
+  ::FreeLibrary( (HINSTANCE)m_libraryHandle );
+}
+
+
+DynamicLibraryManager::Symbol 
+DynamicLibraryManager::doFindSymbol( const std::string &symbol )
+{
+  return (DynamicLibraryManager::Symbol)::GetProcAddress( 
+     (HINSTANCE)m_libraryHandle, 
+     symbol.c_str() );
+}
+
+
+std::string 
+DynamicLibraryManager::getLastErrorDetail() const
+{
+  LPVOID lpMsgBuf;
+  ::FormatMessageA( 
+      FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+      FORMAT_MESSAGE_FROM_SYSTEM | 
+      FORMAT_MESSAGE_IGNORE_INSERTS,
+      NULL,
+      GetLastError(),
+      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+      (LPSTR) &lpMsgBuf,
+      0,
+      NULL 
+  );
+
+  std::string message = (LPCSTR)lpMsgBuf;
+
+  // Display the string.
+//  ::MessageBoxA( NULL, (LPCSTR)lpMsgBuf, "Error", MB_OK | MB_ICONINFORMATION );
+
+  // Free the buffer.
+  ::LocalFree( lpMsgBuf );
+
+  return message;
+}
+
+
+CPPUNIT_NS_END
+
+
+#endif // defined(CPPUNIT_HAVE_WIN32_DLL_LOADER)
diff --git a/src/cppunit/XmlDocument.cpp b/src/cppunit/XmlDocument.cpp
new file mode 100644
index 00000000000..31f9115a7e1
--- /dev/null
+++ b/src/cppunit/XmlDocument.cpp
@@ -0,0 +1,106 @@
+#include <cppunit/config/SourcePrefix.h>
+#include <cppunit/tools/XmlDocument.h>
+#include <cppunit/tools/XmlElement.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+XmlDocument::XmlDocument( const std::string &encoding,
+                          const std::string &styleSheet )
+  : m_styleSheet( styleSheet )
+  , m_rootElement( new XmlElement( "DummyRoot" ) )
+  , m_standalone( true )
+{
+  setEncoding( encoding );
+}
+
+
+XmlDocument::~XmlDocument()
+{
+  delete m_rootElement;
+}
+
+
+
+std::string 
+XmlDocument::encoding() const
+{
+  return m_encoding;
+}
+
+
+void 
+XmlDocument::setEncoding( const std::string &encoding )
+{
+  m_encoding = encoding.empty() ? std::string("ISO-8859-1") : encoding;
+}
+
+
+std::string 
+XmlDocument::styleSheet() const
+{
+  return m_styleSheet;
+}
+
+
+void 
+XmlDocument::setStyleSheet( const std::string &styleSheet )
+{
+  m_styleSheet = styleSheet;
+}
+
+
+bool
+XmlDocument::standalone() const
+{
+  return m_standalone;
+}
+
+
+void
+XmlDocument::setStandalone( bool standalone )
+{
+  m_standalone = standalone;
+}
+
+
+void 
+XmlDocument::setRootElement( XmlElement *rootElement )
+{
+  if ( rootElement == m_rootElement )
+    return;
+
+  delete m_rootElement;
+  m_rootElement = rootElement;
+}
+
+
+XmlElement &
+XmlDocument::rootElement() const
+{
+  return *m_rootElement;
+}
+
+
+std::string 
+XmlDocument::toString() const
+{
+  std::string asString = "<?xml version=\"1.0\" "
+                         "encoding='" + m_encoding + "'";
+  if ( m_standalone )
+      asString += " standalone='yes'";
+
+  asString += " ?>\n"; 
+
+  if ( !m_styleSheet.empty() )
+    asString += "<?xml-stylesheet type=\"text/xsl\" href=\"" + m_styleSheet + "\"?>\n";
+
+  asString += m_rootElement->toString();
+
+  return asString;
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/XmlElement.cpp b/src/cppunit/XmlElement.cpp
new file mode 100644
index 00000000000..f930ad4e938
--- /dev/null
+++ b/src/cppunit/XmlElement.cpp
@@ -0,0 +1,226 @@
+#include <cppunit/tools/StringTools.h>
+#include <cppunit/tools/XmlElement.h>
+#include <stdexcept>
+
+
+CPPUNIT_NS_BEGIN
+
+  
+XmlElement::XmlElement( std::string elementName,
+                        std::string content ) 
+  : m_name( elementName )
+  , m_content( content )
+{
+}
+
+    
+XmlElement::XmlElement( std::string elementName,
+                        int numericContent )
+  : m_name( elementName )
+{
+  setContent( numericContent );
+}
+
+
+XmlElement::~XmlElement()
+{
+  Elements::iterator itNode = m_elements.begin();
+  while ( itNode != m_elements.end() )
+  {
+    XmlElement *element = *itNode++;
+    delete element;
+  }
+}
+
+
+std::string 
+XmlElement::name() const
+{
+  return m_name;
+}
+
+
+std::string 
+XmlElement::content() const
+{
+  return m_content;
+}
+
+
+void 
+XmlElement::setName( const std::string &name )
+{
+  m_name = name;
+}
+
+
+void 
+XmlElement::setContent( const std::string &content )
+{
+  m_content = content;
+}
+
+
+void 
+XmlElement::setContent( int numericContent )
+{
+  m_content = StringTools::toString( numericContent );
+}
+
+
+void 
+XmlElement::addAttribute( std::string attributeName,
+                          std::string value  )
+{
+  m_attributes.push_back( Attribute( attributeName, value ) );
+}
+
+
+void 
+XmlElement::addAttribute( std::string attributeName,
+                          int numericValue )
+{
+  addAttribute( attributeName, StringTools::toString( numericValue ) );
+}
+
+
+void 
+XmlElement::addElement( XmlElement *node )
+{
+  m_elements.push_back( node );
+}
+
+
+int 
+XmlElement::elementCount() const
+{
+  return m_elements.size();
+}
+
+
+XmlElement *
+XmlElement::elementAt( int index ) const
+{
+  if ( index < 0  ||  index >= elementCount() )
+    throw std::invalid_argument( "XmlElement::elementAt(), out of range index" );
+
+  return m_elements[ index ];
+}
+
+
+XmlElement *
+XmlElement::elementFor( const std::string &name ) const
+{
+  Elements::const_iterator itElement = m_elements.begin();
+  for ( ; itElement != m_elements.end(); ++itElement )
+  {
+    if ( (*itElement)->name() == name )
+      return *itElement;
+  }
+
+  throw std::invalid_argument( "XmlElement::elementFor(), not matching child element found" );
+  return NULL;  // make some compilers happy.
+}
+
+
+std::string 
+XmlElement::toString( const std::string &indent ) const
+{
+  std::string element( indent );
+  element += "<";
+  element += m_name;
+  if ( !m_attributes.empty() )
+  {
+    element += " ";
+    element += attributesAsString();
+  }
+  element += ">";
+
+  if ( !m_elements.empty() )
+  {
+    element += "\n";
+
+    std::string subNodeIndent( indent + "  " );
+    Elements::const_iterator itNode = m_elements.begin();
+    while ( itNode != m_elements.end() )
+    {
+      const XmlElement *node = *itNode++;
+      element += node->toString( subNodeIndent );
+    }
+
+    element += indent;
+  }
+
+  if ( !m_content.empty() )
+  {
+    element += escape( m_content );
+    if ( !m_elements.empty() )
+    {
+      element += "\n";
+      element += indent;
+    }
+  }
+
+  element += "</";
+  element += m_name;
+  element += ">\n";
+
+  return element;
+}
+
+
+std::string 
+XmlElement::attributesAsString() const
+{
+  std::string attributes;
+  Attributes::const_iterator itAttribute = m_attributes.begin();
+  while ( itAttribute != m_attributes.end() )
+  {
+    if ( !attributes.empty() )
+       attributes += " ";
+
+    const Attribute &attribute = *itAttribute++;
+    attributes += attribute.first;
+    attributes += "=\"";
+    attributes += escape( attribute.second );
+    attributes += "\"";
+  }
+  return attributes;
+}
+
+
+std::string 
+XmlElement::escape( std::string value ) const
+{
+  std::string escaped;
+  for ( unsigned int index =0; index < value.length(); ++index )
+  {
+    char c = value[index ];
+    switch ( c )    // escape all predefined XML entity (safe?)
+    {
+    case '<': 
+      escaped += "&lt;";
+      break;
+    case '>': 
+      escaped += "&gt;";
+      break;
+    case '&': 
+      escaped += "&amp;";
+      break;
+    case '\'': 
+      escaped += "&apos;";
+      break;
+    case '"': 
+      escaped += "&quot;";
+      break;
+    default:
+      escaped += c;
+    }
+  }
+  
+  return escaped;
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/XmlOutputter.cpp b/src/cppunit/XmlOutputter.cpp
new file mode 100644
index 00000000000..c605e335c0f
--- /dev/null
+++ b/src/cppunit/XmlOutputter.cpp
@@ -0,0 +1,205 @@
+#include <cppunit/Exception.h>
+#include <cppunit/Test.h>
+#include <cppunit/TestFailure.h>
+#include <cppunit/TestResultCollector.h>
+#include <cppunit/XmlOutputter.h>
+#include <cppunit/XmlOutputterHook.h>
+#include <cppunit/tools/XmlDocument.h>
+#include <cppunit/tools/XmlElement.h>
+#include <stdlib.h>
+#include <algorithm>
+
+
+CPPUNIT_NS_BEGIN
+
+
+XmlOutputter::XmlOutputter( TestResultCollector *result,
+                            OStream &stream,
+                            std::string encoding )
+  : m_result( result )
+  , m_stream( stream )
+  , m_xml( new XmlDocument( encoding ) )
+{
+}
+
+
+XmlOutputter::~XmlOutputter()
+{
+  delete m_xml;
+}
+
+
+void 
+XmlOutputter::addHook( XmlOutputterHook *hook )
+{
+  m_hooks.push_back( hook );
+}
+
+
+void 
+XmlOutputter::removeHook( XmlOutputterHook *hook )
+{
+  m_hooks.erase( std::find( m_hooks.begin(), m_hooks.end(), hook ) );
+}
+
+
+void 
+XmlOutputter::write()
+{
+  setRootNode();
+  m_stream  <<  m_xml->toString();
+}
+
+
+void 
+XmlOutputter::setStyleSheet( const std::string &styleSheet )
+{
+  m_xml->setStyleSheet( styleSheet );
+}
+
+
+void
+XmlOutputter::setStandalone( bool standalone )
+{
+  m_xml->setStandalone( standalone );
+}
+ 
+
+void
+XmlOutputter::setRootNode()
+{
+  XmlElement *rootNode = new XmlElement( "TestRun" );
+  m_xml->setRootElement( rootNode );
+
+  for ( Hooks::iterator it = m_hooks.begin(); it != m_hooks.end(); ++it )
+    (*it)->beginDocument( m_xml );
+
+  FailedTests failedTests;
+  fillFailedTestsMap( failedTests );
+
+  addFailedTests( failedTests, rootNode );
+  addSuccessfulTests( failedTests, rootNode );
+  addStatistics( rootNode );
+
+  for ( Hooks::iterator itEnd = m_hooks.begin(); itEnd != m_hooks.end(); ++itEnd )
+    (*itEnd)->endDocument( m_xml );
+}
+
+
+void 
+XmlOutputter::fillFailedTestsMap( FailedTests &failedTests )
+{
+  const TestResultCollector::TestFailures &failures = m_result->failures();
+  TestResultCollector::TestFailures::const_iterator itFailure = failures.begin();
+  while ( itFailure != failures.end() )
+  {
+    TestFailure *failure = *itFailure++;
+    failedTests.insert( std::pair<Test* const, TestFailure*>(failure->failedTest(), failure ) );
+  }
+}
+
+
+void
+XmlOutputter::addFailedTests( FailedTests &failedTests,
+                              XmlElement *rootNode )
+{
+  XmlElement *testsNode = new XmlElement( "FailedTests" );
+  rootNode->addElement( testsNode );
+
+  const TestResultCollector::Tests &tests = m_result->tests();
+  for ( unsigned int testNumber = 0; testNumber < tests.size(); ++testNumber )
+  {
+    Test *test = tests[testNumber];
+    if ( failedTests.find( test ) != failedTests.end() )
+      addFailedTest( test, failedTests[test], testNumber+1, testsNode );
+  }
+}
+
+
+void
+XmlOutputter::addSuccessfulTests( FailedTests &failedTests,
+                                           XmlElement *rootNode )
+{
+  XmlElement *testsNode = new XmlElement( "SuccessfulTests" );
+  rootNode->addElement( testsNode );
+
+  const TestResultCollector::Tests &tests = m_result->tests();
+  for ( unsigned int testNumber = 0; testNumber < tests.size(); ++testNumber )
+  {
+    Test *test = tests[testNumber];
+    if ( failedTests.find( test ) == failedTests.end() )
+      addSuccessfulTest( test, testNumber+1, testsNode );
+  }
+}
+
+
+void
+XmlOutputter::addStatistics( XmlElement *rootNode )
+{
+  XmlElement *statisticsElement = new XmlElement( "Statistics" );
+  rootNode->addElement( statisticsElement );
+  statisticsElement->addElement( new XmlElement( "Tests", m_result->runTests() ) );
+  statisticsElement->addElement( new XmlElement( "FailuresTotal", 
+                                                 m_result->testFailuresTotal() ) );
+  statisticsElement->addElement( new XmlElement( "Errors", m_result->testErrors() ) );
+  statisticsElement->addElement( new XmlElement( "Failures", m_result->testFailures() ) );
+
+  for ( Hooks::iterator it = m_hooks.begin(); it != m_hooks.end(); ++it )
+    (*it)->statisticsAdded( m_xml, statisticsElement );
+}
+
+
+void
+XmlOutputter::addFailedTest( Test *test,
+                             TestFailure *failure,
+                             int testNumber,
+                             XmlElement *testsNode )
+{
+  Exception *thrownException = failure->thrownException();
+  
+  XmlElement *testElement = new XmlElement( "FailedTest" );
+  testsNode->addElement( testElement );
+  testElement->addAttribute( "id", testNumber );
+  testElement->addElement( new XmlElement( "Name", test->getName() ) );
+  testElement->addElement( new XmlElement( "FailureType", 
+                                           failure->isError() ? "Error" : 
+                                                                "Assertion" ) );
+
+  if ( failure->sourceLine().isValid() )
+    addFailureLocation( failure, testElement );
+
+  testElement->addElement( new XmlElement( "Message", thrownException->what() ) );
+
+  for ( Hooks::iterator it = m_hooks.begin(); it != m_hooks.end(); ++it )
+    (*it)->failTestAdded( m_xml, testElement, test, failure );
+}
+
+
+void
+XmlOutputter::addFailureLocation( TestFailure *failure,
+                                  XmlElement *testElement )
+{
+  XmlElement *locationNode = new XmlElement( "Location" );
+  testElement->addElement( locationNode );
+  SourceLine sourceLine = failure->sourceLine();
+  locationNode->addElement( new XmlElement( "File", sourceLine.fileName() ) );
+  locationNode->addElement( new XmlElement( "Line", sourceLine.lineNumber() ) );
+}
+
+
+void
+XmlOutputter::addSuccessfulTest( Test *test, 
+                                 int testNumber,
+                                 XmlElement *testsNode )
+{
+  XmlElement *testElement = new XmlElement( "Test" );
+  testsNode->addElement( testElement );
+  testElement->addAttribute( "id", testNumber );
+  testElement->addElement( new XmlElement( "Name", test->getName() ) );
+
+  for ( Hooks::iterator it = m_hooks.begin(); it != m_hooks.end(); ++it )
+    (*it)->successfulTestAdded( m_xml, testElement, test );
+}
+
+
+CPPUNIT_NS_END
diff --git a/src/cppunit/XmlOutputterHook.cpp b/src/cppunit/XmlOutputterHook.cpp
new file mode 100644
index 00000000000..4b4e8d8e559
--- /dev/null
+++ b/src/cppunit/XmlOutputterHook.cpp
@@ -0,0 +1,44 @@
+#include <cppunit/XmlOutputterHook.h>
+
+
+CPPUNIT_NS_BEGIN
+
+
+void 
+XmlOutputterHook::beginDocument( XmlDocument *document )
+{
+}
+
+
+void 
+XmlOutputterHook::endDocument( XmlDocument *document )
+{
+}
+
+
+void 
+XmlOutputterHook::failTestAdded( XmlDocument *document,
+                                 XmlElement *testElement,
+                                 Test *test,
+                                 TestFailure *failure )
+{
+}
+
+
+void 
+XmlOutputterHook::successfulTestAdded( XmlDocument *document,
+                                       XmlElement *testElement,
+                                       Test *test )
+{
+}
+
+
+void 
+XmlOutputterHook::statisticsAdded( XmlDocument *document,
+                                   XmlElement *statisticsElement )
+{
+}
+
+
+CPPUNIT_NS_END
+
diff --git a/src/cppunit/pchdef.h b/src/cppunit/pchdef.h
new file mode 100644
index 00000000000..42e51736c2e
--- /dev/null
+++ b/src/cppunit/pchdef.h
@@ -0,0 +1 @@
+#pragma once;
diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index c6014c2999f..417fb4bb17a 100644
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -16,9 +16,37 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# include(${CMAKE_SOURCE_DIR}/dep/tbb/tbbinclude.cmake)
+set(LIBRARY_NAME framework)
 
-file(GLOB_RECURSE framework_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h)
+set(LIBRARY_SRCS
+    Dynamic/FactoryHolder.h
+    Dynamic/ObjectRegistry.h
+    GameSystem/Grid.h
+    GameSystem/GridLoader.h
+    GameSystem/GridReference.h
+    GameSystem/GridRefManager.h
+    GameSystem/NGrid.h
+    GameSystem/TypeContainer.h
+    GameSystem/TypeContainerFunctions.h
+    GameSystem/TypeContainerVisitor.h
+    Platform/CompilerDefs.h
+    Platform/Define.h
+    Policies/CreationPolicy.h
+    Policies/MemoryManagement.cpp
+    Policies/ObjectLifeTime.cpp
+    Policies/ObjectLifeTime.h
+    Policies/Singleton.h
+    Policies/ThreadingModel.h
+    Utilities/ByteConverter.h
+    Utilities/Callback.h
+    Utilities/EventProcessor.cpp
+    Utilities/EventProcessor.h
+    Utilities/LinkedList.h
+    Utilities/LinkedReference/Reference.h
+    Utilities/LinkedReference/RefManager.h
+    Utilities/TypeList.h
+    Utilities/UnorderedMapSet.h
+   )
 
 source_group("Other"
   REGULAR_EXPRESSION .*
@@ -53,20 +81,18 @@ include_directories(
   ${ACE_INCLUDE_DIR}
 )
 
-add_library(framework STATIC
-  ${framework_SRCS}
+add_library(${LIBRARY_NAME} STATIC
+  ${LIBRARY_SRCS}
 )
 
 if(NOT TBB_USE_EXTERNAL)
-  add_dependencies(framework TBB_Project)
-# add_dependencies(framework tbb)
-# add_dependencies(framework tbbmalloc)
+  add_dependencies(${LIBRARY_NAME} TBB_Project)
 endif()
+
 if(NOT ACE_USE_EXTERNAL)
-  add_dependencies(framework ACE_Project)
-# add_dependencies(framework ace)
+  add_dependencies(${LIBRARY_NAME} ACE_Project)
 endif()
 
-target_link_libraries(framework
-  ${TBB_LIBRARIES}
-)
+if(USE_TBB_MALLOC)
+  target_link_libraries(${LIBRARY_NAME} ${TBB_LIBRARIES} )
+endif()
diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h
index 617007e7122..46794f5f9de 100644
--- a/src/framework/Dynamic/FactoryHolder.h
+++ b/src/framework/Dynamic/FactoryHolder.h
@@ -22,7 +22,7 @@
 #include "Platform/Define.h"
 #include "Utilities/TypeList.h"
 #include "ObjectRegistry.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 /** FactoryHolder holds a factory object of a specific type
  */
diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h
index 12aae86522a..b030d981fe0 100644
--- a/src/framework/Dynamic/ObjectRegistry.h
+++ b/src/framework/Dynamic/ObjectRegistry.h
@@ -39,7 +39,7 @@ class MANGOS_DLL_DECL ObjectRegistry
         const T* GetRegistryItem(Key key) const
         {
             typename RegistryMapType::const_iterator iter = i_registeredObjects.find(key);
-            return( iter == i_registeredObjects.end() ? NULL : iter->second );
+            return (iter == i_registeredObjects.end() ? NULL : iter->second);
         }
 
         /// Inserts a registry item
diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h
index 3f9c8a7e4cb..45952a9f3d0 100644
--- a/src/framework/GameSystem/Grid.h
+++ b/src/framework/GameSystem/Grid.h
@@ -34,6 +34,7 @@
 #include "Policies/ThreadingModel.h"
 #include "TypeContainer.h"
 #include "TypeContainerVisitor.h"
+#include "Timer.h"
 
 // forward declaration
 template<class A, class T, class O> class GridLoader;
diff --git a/src/framework/GameSystem/TypeContainerFunctionsPtr.h b/src/framework/GameSystem/TypeContainerFunctionsPtr.h
deleted file mode 100644
index e660e0e300e..00000000000
--- a/src/framework/GameSystem/TypeContainerFunctionsPtr.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef TYPECONTAINER_FUNCTIONS_PTR_H
-#define TYPECONTAINER_FUNCTIONS_PTR_H
-
-/*
- * Here you'll find a list of helper functions to make
- * the TypeContainer usefull.  Without it, its hard
- * to access or mutate the container.
- */
-
-#include "Platform/Define.h"
-#include "Utilities/TypeList.h"
-#include <map>
-
-namespace MaNGOS
-{
-    /* ContainerMapList Helpers */
-    // count functions
-    //    template<class SPECIFIC_TYPE> size_t Count(const ContainerMapList<SPECIFIC_TYPE> &elements, CountedPtr<SPECIFIC_TYPE>* /*fake*/)
-    //    {
-    //        return elements._element.size();
-    //    };
-    //
-    //    template<class SPECIFIC_TYPE> size_t Count(const ContainerMapList<TypeNull> &elements, CountedPtr<SPECIFIC_TYPE>* /*fake*/)
-    //    {
-    //        return 0;
-    //    }
-    //
-    //    template<class SPECIFIC_TYPE, class T> size_t Count(const ContainerMapList<T> &elements, CountedPtr<SPECIFIC_TYPE>* /*fake*/)
-    //    {
-    //        return 0;
-    //    }
-    //
-    //    template<class SPECIFIC_TYPE, class T> size_t Count(const ContainerMapList<TypeList<SPECIFIC_TYPE, T> >&elements, SPECIFIC_TYPE* fake)
-    //    {
-    //        return Count(elements._elements,fake);
-    //    }
-    //
-    //    template<class SPECIFIC_TYPE, class H, class T> size_t Count(const ContainerMapList<TypeList<H, T> >&elements, SPECIFIC_TYPE* fake)
-    //    {
-    //        return Count(elements._TailElements, fake);
-    //    }
-
-    // non-const find functions
-    template<class SPECIFIC_TYPE> CountedPtr<SPECIFIC_TYPE>& Find(ContainerMapList<SPECIFIC_TYPE> &elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* /*fake*/)
-    {
-        typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE> >::iterator iter = elements._element.find(hdl);
-        return (iter == elements._element.end() ? NullPtr<SPECIFIC_TYPE>((SPECIFIC_TYPE*)NULL) : iter->second);
-    };
-
-    template<class SPECIFIC_TYPE> CountedPtr<SPECIFIC_TYPE>& Find(ContainerMapList<TypeNull> &elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* /*fake*/)
-    {
-        return NullPtr<SPECIFIC_TYPE>((SPECIFIC_TYPE*)NULL);// terminate recursion
-    }
-
-    template<class SPECIFIC_TYPE, class T> CountedPtr<SPECIFIC_TYPE>& Find(ContainerMapList<T> &elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* /*fake*/)
-    {
-        return NullPtr<SPECIFIC_TYPE>((SPECIFIC_TYPE*)NULL);// this is a missed
-    }
-
-    template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(ContainerMapList<TypeList<H, T> >&elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake)
-    {
-        CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl,fake);
-        return (!t ? Find(elements._TailElements, hdl,fake) : t);
-    }
-
-    // const find functions
-    template<class SPECIFIC_TYPE> const CountedPtr<SPECIFIC_TYPE>& Find(const ContainerMapList<SPECIFIC_TYPE> &elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* /*fake*/)
-    {
-        typename CountedPtr<SPECIFIC_TYPE>::iterator iter = elements._element.find(hdl);
-        return (iter == elements._element.end() ? NullPtr<SPECIFIC_TYPE>((SPECIFIC_TYPE*)NULL) : iter->second);
-    };
-
-    template<class SPECIFIC_TYPE> const CountedPtr<SPECIFIC_TYPE>& Find(const ContainerMapList<TypeNull> &elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* /*fake*/)
-    {
-        return NullPtr<SPECIFIC_TYPE>((SPECIFIC_TYPE*)NULL);
-    }
-
-    template<class SPECIFIC_TYPE, class T> const CountedPtr<SPECIFIC_TYPE>& Find(const ContainerMapList<T> &elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* /*fake*/)
-    {
-        return NullPtr<SPECIFIC_TYPE>((SPECIFIC_TYPE*)NULL);
-    }
-
-    template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(const ContainerMapList<TypeList<H, T> >&elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake)
-    {
-        CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl,fake);
-        if(!t)
-            t = Find(elements._TailElement, hdl,fake);
-
-        return t;
-    }
-
-    // non-const insert functions
-    template<class SPECIFIC_TYPE> CountedPtr<SPECIFIC_TYPE>& Insert(ContainerMapList<SPECIFIC_TYPE> &elements, CountedPtr<SPECIFIC_TYPE> &obj, OBJECT_HANDLE hdl)
-    {
-        elements._element[hdl] = obj;
-        return obj;
-    };
-
-    template<class SPECIFIC_TYPE> CountedPtr<SPECIFIC_TYPE>& Insert(ContainerMapList<TypeNull> &elements, CountedPtr<SPECIFIC_TYPE> &obj, OBJECT_HANDLE hdl)
-    {
-        return NullPtr<SPECIFIC_TYPE>((SPECIFIC_TYPE*)NULL);
-    }
-
-    // this is a missed
-    template<class SPECIFIC_TYPE, class T> CountedPtr<SPECIFIC_TYPE>& Insert(ContainerMapList<T> &elements, CountedPtr<SPECIFIC_TYPE> &obj, OBJECT_HANDLE hdl)
-    {
-        return NullPtr<SPECIFIC_TYPE>((SPECIFIC_TYPE*)NULL);// a missed
-    }
-
-    // Recursion
-    template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Insert(ContainerMapList<TypeList<H, T> >&elements, CountedPtr<SPECIFIC_TYPE> &obj, OBJECT_HANDLE hdl)
-    {
-        CountedPtr<SPECIFIC_TYPE> &t= Insert(elements._elements, obj, hdl);
-        return (!t ? Insert(elements._TailElements, obj, hdl) : t);
-    }
-
-    // non-const remove method
-    template<class SPECIFIC_TYPE> bool Remove(ContainerMapList<SPECIFIC_TYPE> &elements, CountedPtr<SPECIFIC_TYPE> &obj, OBJECT_HANDLE hdl)
-    {
-        typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE> >::iterator iter = elements._element.find(hdl);
-        if( iter != elements._element.end() )
-        {
-            elements._element.erase(iter);
-            return true;
-        }
-
-        return false;                                       // found... terminate the search
-    }
-
-    template<class SPECIFIC_TYPE> bool Remove(ContainerMapList<TypeNull> &elements, CountedPtr<SPECIFIC_TYPE> &obj, OBJECT_HANDLE hdl)
-    {
-        return false;
-    }
-
-    // this is a missed
-    template<class SPECIFIC_TYPE, class T> bool Remove(ContainerMapList<T> &elements, CountedPtr<SPECIFIC_TYPE> &obj, OBJECT_HANDLE hdl)
-    {
-        return false;
-    }
-
-    template<class SPECIFIC_TYPE, class T, class H> bool Remove(ContainerMapList<TypeList<H, T> > &elements, CountedPtr<SPECIFIC_TYPE> &obj, OBJECT_HANDLE hdl)
-    {
-        // The head element is bad
-        bool t = Remove(elements._elements, obj, hdl);
-        return ( !t ? Remove(elements._TailElements, obj, hdl) : t );
-    }
-
-}
-#endif
diff --git a/src/framework/Platform/CompilerDefs.h b/src/framework/Platform/CompilerDefs.h
index 558cc490026..2ffa2d9dc2d 100644
--- a/src/framework/Platform/CompilerDefs.h
+++ b/src/framework/Platform/CompilerDefs.h
@@ -29,6 +29,7 @@
 #  define PLATFORM PLATFORM_WINDOWS
 #elif defined( __WIN32__ ) || defined( WIN32 ) || defined( _WIN32 )
 #  define PLATFORM PLATFORM_WINDOWS
+#  define WIN_X86
 #elif defined( __APPLE_CC__ )
 #  define PLATFORM PLATFORM_APPLE
 #elif defined( __INTEL_COMPILER )
@@ -50,6 +51,9 @@
 #  define COMPILER COMPILER_INTEL
 #elif defined( __GNUC__ )
 #  define COMPILER COMPILER_GNU
+#  ifdef  __clang__
+#      define CLANG 1
+#  endif
 #else
 #  pragma error "FATAL ERROR: Unknown compiler."
 #endif
diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
index 89ea94e163f..7e9c934d014 100644
--- a/src/framework/Platform/Define.h
+++ b/src/framework/Platform/Define.h
@@ -41,7 +41,7 @@
 
 typedef ACE_SHLIB_HANDLE MANGOS_LIBRARY_HANDLE;
 
-#define MANGOS_SCRIPT_NAME "mangosscript"
+#define MANGOS_SCRIPT_NAME "mangosscriptR2"
 #define MANGOS_SCRIPT_SUFFIX ACE_DLL_SUFFIX
 #define MANGOS_SCRIPT_PREFIX ACE_DLL_PREFIX
 #define MANGOS_LOAD_LIBRARY(libname)    ACE_OS::dlopen(libname)
@@ -114,14 +114,23 @@ typedef ACE_UINT32 uint32;
 typedef ACE_UINT16 uint16;
 typedef ACE_UINT8 uint8;
 
-#if COMPILER != COMPILER_MICROSOFT
+#if COMPILER != COMPILER_MICROSOFT && !defined(__MINGW32__)
 typedef uint16      WORD;
 typedef uint32      DWORD;
 #endif //COMPILER
 
+#define CONCAT(x, y) CONCAT1(x, y)
+#define CONCAT1(x, y) x##y
+#define STATIC_ASSERT_WORKAROUND(expr, msg) typedef char CONCAT(static_assert_failed_at_line_, __LINE__) [(expr) ? 1 : -1]
+
 #if COMPILER == COMPILER_GNU
 #  if !defined(__GXX_EXPERIMENTAL_CXX0X__) || (__GNUC__ < 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ < 7)
 #    define override
+#    define static_assert(a, b) STATIC_ASSERT_WORKAROUND(a, b)
+#  endif
+#elif COMPILER == COMPILER_MICROSOFT
+#  if _MSC_VER < 1600
+#    define static_assert(a, b) STATIC_ASSERT_WORKAROUND(a, b)
 #  endif
 #endif
 
diff --git a/src/framework/Policies/MemoryManagement.cpp b/src/framework/Policies/MemoryManagement.cpp
index 240158e936a..31dc8e1240f 100644
--- a/src/framework/Policies/MemoryManagement.cpp
+++ b/src/framework/Policies/MemoryManagement.cpp
@@ -18,7 +18,12 @@
 
 //lets use Intel scalable_allocator by default and
 //switch to OS specific allocator only when _STANDARD_MALLOC is defined
+
 #ifndef USE_STANDARD_MALLOC
+#include <stdexcept>
+#include "Platform/Define.h"
+
+#ifdef USE_TBB_MALLOC
 
 #include "../../dep/tbb/include/tbb/scalable_allocator.h"
 
@@ -72,4 +77,60 @@ void operator delete[](void* ptr, const std::nothrow_t&) throw()
     scalable_free(ptr);
 }
 
-#endif
+#elseif PLATFORM == PLATFORM_WINDOWS || defined(USE_FASTMM_MALLOC)
+
+#include "../../dep/fastmm/FastMM.h"
+
+void* operator new(size_t mem_size)
+{
+    void* result = FastMM_malloc(mem_size);
+
+    if (!result)
+        throw std::exception("FastMM: Error! operator new");
+
+    return result;
+}
+
+void* operator new[](size_t mem_size)
+{
+    void* result = FastMM_malloc(mem_size);
+
+    if (!result)
+        throw std::exception("FastMM: Error! operator new with array");
+
+    return result;
+}
+
+void operator delete(void* pointer) throw()
+{
+    FastMM_free(pointer);
+}
+
+void operator delete[](void* pointer) throw()
+{
+    FastMM_free(pointer);
+}
+
+void* operator new(size_t mem_size, const std::nothrow_t&) throw()
+{
+    return FastMM_malloc(mem_size);
+}
+
+void* operator new[](size_t mem_size, const std::nothrow_t&) throw()
+{
+    return FastMM_malloc(mem_size);
+}
+
+void operator delete(void* pointer, const std::nothrow_t&) throw()
+{
+    FastMM_free(pointer);
+}
+
+void operator delete[](void* pointer, const std::nothrow_t&) throw()
+{
+    FastMM_free(pointer);
+}
+
+#endif // USE_TBB_MALLOC/ USE_FASTMM_MALLOC
+
+#endif // !USE_STANDARD_MALLOC
diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h
index bd4627ad46b..2e079025e34 100644
--- a/src/framework/Policies/Singleton.h
+++ b/src/framework/Policies/Singleton.h
@@ -41,6 +41,7 @@ namespace MaNGOS
         public:
 
             static T& Instance();
+            virtual void Update() {};
 
         protected:
 
@@ -62,6 +63,56 @@ namespace MaNGOS
             static T *si_instance;
             static bool si_destroyed;
     };
+
+    template<typename T, class ThreadingModel, class CreatePolicy, class LifeTimePolicy>
+    T* Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::si_instance = NULL;
+
+    template<typename T, class ThreadingModel, class CreatePolicy, class LifeTimePolicy>
+    bool Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::si_destroyed = false;
+
+    template<typename T, class ThreadingModel, class CreatePolicy, class LifeTimePolicy>
+    T& MaNGOS::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::Instance()
+    {
+        if (!si_instance)
+        {
+            // double-checked Locking pattern
+            Guard();
+
+            if (!si_instance)
+            {
+                if (si_destroyed)
+                {
+                    si_destroyed = false;
+                    LifeTimePolicy::OnDeadReference();
+                }
+
+                si_instance = CreatePolicy::Create();
+                LifeTimePolicy::ScheduleCall(&DestroySingleton);
+            }
+        }
+
+        return *si_instance;
+    }
+
+    template<typename T, class ThreadingModel, class CreatePolicy, class LifeTimePolicy>
+    void MaNGOS::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::DestroySingleton()
+    {
+        CreatePolicy::Destroy(si_instance);
+        si_instance = NULL;
+        si_destroyed = true;
+    }
 }
 
+#define INSTANTIATE_SINGLETON_1(TYPE) \
+    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
+
+#define INSTANTIATE_SINGLETON_2(TYPE, THREADINGMODEL) \
+    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
+
+#define INSTANTIATE_SINGLETON_3(TYPE, THREADINGMODEL, CREATIONPOLICY ) \
+    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >;
+
+#define INSTANTIATE_SINGLETON_4(TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME) \
+    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >;
+
 #endif
diff --git a/src/framework/Policies/SingletonImp.h b/src/framework/Policies/SingletonImp.h
deleted file mode 100644
index 1ec983be20c..00000000000
--- a/src/framework/Policies/SingletonImp.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef MANGOS_SINGLETONIMPL_H
-#define MANGOS_SINGLETONIMPL_H
-
-#include "Singleton.h"
-
-// avoid the using namespace here cuz
-// its a .h file afterall
-
-template
-<
-typename T,
-class ThreadingModel,
-class CreatePolicy,
-class LifeTimePolicy
->
-T& MaNGOS::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::Instance()
-{
-    if (!si_instance)
-    {
-        // double-checked Locking pattern
-        Guard();
-
-        if (!si_instance)
-        {
-            if (si_destroyed)
-            {
-                si_destroyed = false;
-                LifeTimePolicy::OnDeadReference();
-            }
-
-            si_instance = CreatePolicy::Create();
-            LifeTimePolicy::ScheduleCall(&DestroySingleton);
-        }
-    }
-
-    return *si_instance;
-}
-
-template
-<
-typename T,
-class ThreadingModel,
-class CreatePolicy,
-class LifeTimePolicy
->
-void MaNGOS::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::DestroySingleton()
-{
-    CreatePolicy::Destroy(si_instance);
-    si_instance = NULL;
-    si_destroyed = true;
-}
-
-#define INSTANTIATE_SINGLETON_1(TYPE) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >; \
-    template<> TYPE* MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >::si_instance = 0; \
-    template<> bool MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >::si_destroyed = false
-
-#define INSTANTIATE_SINGLETON_2(TYPE, THREADINGMODEL) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >; \
-    template<> TYPE* MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >::si_instance = 0; \
-    template<> bool MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >::si_destroyed = false
-
-#define INSTANTIATE_SINGLETON_3(TYPE, THREADINGMODEL, CREATIONPOLICY ) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >; \
-    template<> TYPE* MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >::si_instance = 0; \
-    template<> bool MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeType<TYPE> >::si_destroyed = false
-
-#define INSTANTIATE_SINGLETON_4(TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >; \
-    template<> TYPE* MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_instance = 0; \
-    template<> bool MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_destroyed = false
-
-#endif
diff --git a/src/framework/Utilities/EventProcessor.cpp b/src/framework/Utilities/EventProcessor.cpp
index 62a873a4972..873f3b1e5a9 100644
--- a/src/framework/Utilities/EventProcessor.cpp
+++ b/src/framework/Utilities/EventProcessor.cpp
@@ -75,8 +75,8 @@ void EventProcessor::KillAllEvents(bool force)
         {
             delete i_old->second;
 
-            if (!force)                                      // need per-element cleanup
-                m_events.erase (i_old);
+            if (!force)                                     // need per-element cleanup
+                m_events.erase(i_old);
         }
     }
 
diff --git a/src/framework/Utilities/EventProcessor.h b/src/framework/Utilities/EventProcessor.h
index 617bf86c480..98786fc14dc 100644
--- a/src/framework/Utilities/EventProcessor.h
+++ b/src/framework/Utilities/EventProcessor.h
@@ -22,21 +22,19 @@
 #include "Platform/Define.h"
 
 #include <map>
+#include <queue>
 
 // Note. All times are in milliseconds here.
 
 class BasicEvent
 {
     public:
-
-        BasicEvent()
-            : to_Abort(false)
-        {
-        }
+        BasicEvent(uint32 type)
+            : to_Abort(false), m_type(type)
+        {};
 
         virtual ~BasicEvent()                               // override destructor to perform some actions on event removal
-        {
-        };
+        {};
 
         // this method executes when the event is triggered
         // return false if event does not want to be deleted
@@ -48,16 +46,19 @@ class BasicEvent
         virtual void Abort(uint64 /*e_time*/) {}            // this method executes when the event is aborted
 
         bool to_Abort;                                      // set by externals when the event is aborted, aborted events don't execute
-        // and get Abort call when deleted
+                                                            // and get Abort call when deleted
+
+        uint32 const& GetType()          { return m_type;}
 
         // these can be used for time offset control
         uint64 m_addTime;                                   // time when the event was added to queue, filled by event handler
         uint64 m_execTime;                                  // planned time of next execution, filled by event handler
+        uint32 const m_type;                                // Event type (for use in some calculation)
 };
 
 typedef std::multimap<uint64, BasicEvent*> EventList;
 
-class EventProcessor
+class MANGOS_DLL_SPEC EventProcessor
 {
     public:
 
diff --git a/src/framework/Utilities/LinkedList.h b/src/framework/Utilities/LinkedList.h
index 5c472a45f3a..db0f7dd2a92 100644
--- a/src/framework/Utilities/LinkedList.h
+++ b/src/framework/Utilities/LinkedList.h
@@ -38,8 +38,8 @@ class LinkedListElement
         LinkedListElement()  { iNext = NULL; iPrev = NULL; }
         ~LinkedListElement() { delink(); }
 
-        bool hasNext() const  { return (iNext->iNext != NULL); }
-        bool hasPrev() const  { return (iPrev->iPrev != NULL); }
+        bool hasNext() const  { return (iNext != NULL && iNext->iNext != NULL); }
+        bool hasPrev() const  { return (iPrev != NULL && iPrev->iPrev != NULL); }
         bool isInList() const { return (iNext != NULL && iPrev != NULL); }
 
         LinkedListElement      * next()       { return hasNext() ? iNext : NULL; }
diff --git a/src/framework/Utilities/LinkedReference/Reference.h b/src/framework/Utilities/LinkedReference/Reference.h
index bd0b7e900ce..d7c5610a3d4 100644
--- a/src/framework/Utilities/LinkedReference/Reference.h
+++ b/src/framework/Utilities/LinkedReference/Reference.h
@@ -90,15 +90,15 @@ class Reference : public LinkedListElement
             return iRefTo != NULL;
         }
 
-        Reference<TO,FROM>      * next()       { return((Reference<TO, FROM>      *) LinkedListElement::next()); }
-        Reference<TO,FROM> const* next() const { return((Reference<TO, FROM> const*) LinkedListElement::next()); }
-        Reference<TO,FROM>      * prev()       { return((Reference<TO, FROM>      *) LinkedListElement::prev()); }
-        Reference<TO,FROM> const* prev() const { return((Reference<TO, FROM> const*) LinkedListElement::prev()); }
-
-        Reference<TO,FROM>      * nocheck_next()       { return((Reference<TO, FROM>      *) LinkedListElement::nocheck_next()); }
-        Reference<TO,FROM> const* nocheck_next() const { return((Reference<TO, FROM> const*) LinkedListElement::nocheck_next()); }
-        Reference<TO,FROM>      * nocheck_prev()       { return((Reference<TO, FROM>      *) LinkedListElement::nocheck_prev()); }
-        Reference<TO,FROM> const* nocheck_prev() const { return((Reference<TO, FROM> const*) LinkedListElement::nocheck_prev()); }
+        Reference<TO, FROM>*       next()       { return ((Reference<TO, FROM>*) LinkedListElement::next()); }
+        Reference<TO, FROM> const* next() const { return ((Reference<TO, FROM> const*) LinkedListElement::next()); }
+        Reference<TO, FROM>*       prev()       { return ((Reference<TO, FROM>*) LinkedListElement::prev()); }
+        Reference<TO, FROM> const* prev() const { return ((Reference<TO, FROM> const*) LinkedListElement::prev()); }
+
+        Reference<TO, FROM>*       nocheck_next()       { return ((Reference<TO, FROM>*) LinkedListElement::nocheck_next()); }
+        Reference<TO, FROM> const* nocheck_next() const { return ((Reference<TO, FROM> const*) LinkedListElement::nocheck_next()); }
+        Reference<TO, FROM>*       nocheck_prev()       { return ((Reference<TO, FROM>*) LinkedListElement::nocheck_prev()); }
+        Reference<TO, FROM> const* nocheck_prev() const { return ((Reference<TO, FROM> const*) LinkedListElement::nocheck_prev()); }
 
         TO* operator->() const { return iRefTo; }
         TO* getTarget() const { return iRefTo; }
diff --git a/src/framework/Utilities/UnorderedMapSet.h b/src/framework/Utilities/UnorderedMapSet.h
index 0f4f1f195e2..04d95e41285 100644
--- a/src/framework/Utilities/UnorderedMapSet.h
+++ b/src/framework/Utilities/UnorderedMapSet.h
@@ -25,6 +25,9 @@
 #if COMPILER == COMPILER_INTEL
 #  include <ext/hash_map>
 #  include <ext/hash_set>
+#elif CLANG
+#  include <tr1/unordered_map>
+#  include <tr1/unordered_set>
 #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 #  include <tr1/unordered_map>
 #  include <tr1/unordered_set>
@@ -42,27 +45,33 @@
 #ifdef _STLPORT_VERSION
 #  define UNORDERED_MAP std::hash_map
 #  define UNORDERED_SET std::hash_set
+#  define UNORDERED_MULTIMAP std::hash_multimap
 #  define HASH_NAMESPACE_START namespace std {
 #  define HASH_NAMESPACE_END }
 using std::hash_map;
 using std::hash_set;
+using std::hash_multimap;
 #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1600    // VS100
 #  define UNORDERED_MAP std::unordered_map
 #  define UNORDERED_SET std::unordered_set
+#  define UNORDERED_MULTIMAP std::unordered_multimap
 #  define HASH_NAMESPACE_START namespace std {
 #  define HASH_NAMESPACE_END }
 #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1
 #  define UNORDERED_MAP std::tr1::unordered_map
 #  define UNORDERED_SET std::tr1::unordered_set
+#  define UNORDERED_MULTIMAP std::tr1::unordered_multimap
 #  define HASH_NAMESPACE_START namespace std { namespace tr1 {
 #  define HASH_NAMESPACE_END } }
 #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300
 #  define UNORDERED_MAP stdext::hash_map
 #  define UNORDERED_SET stdext::hash_set
+#  define UNORDERED_MULTIMAP stdext::hash_multimap
 #  define HASH_NAMESPACE_START namespace stdext {
 #  define HASH_NAMESPACE_END }
 using stdext::hash_map;
 using stdext::hash_set;
+using stdext::hash_multimap;
 
 #if !_HAS_TRADITIONAL_STL
 
@@ -83,18 +92,28 @@ HASH_NAMESPACE_END
 #elif COMPILER == COMPILER_INTEL
 #  define UNORDERED_MAP std::hash_map
 #  define UNORDERED_SET std::hash_set
+#  define UNORDERED_MULTIMAP std::hash_multimap
 #  define HASH_NAMESPACE_START namespace std {
 #  define HASH_NAMESPACE_END }
 using std::hash_map;
 using std::hash_set;
+using std::hash_multimap;
 #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 #  define UNORDERED_MAP std::tr1::unordered_map
 #  define UNORDERED_SET std::tr1::unordered_set
+#  define UNORDERED_MULTIMAP std::tr1::unordered_multimap
+#  define HASH_NAMESPACE_START namespace std { namespace tr1 {
+#  define HASH_NAMESPACE_END } }
+#elif COMPILER == COMPILER_GNU && CLANG
+#  define UNORDERED_MAP std::tr1::unordered_map
+#  define UNORDERED_SET std::tr1::unordered_set
+#  define UNORDERED_MULTIMAP std::tr1::unordered_multimap
 #  define HASH_NAMESPACE_START namespace std { namespace tr1 {
 #  define HASH_NAMESPACE_END } }
 #elif COMPILER == COMPILER_GNU && __GNUC__ >= 3
 #  define UNORDERED_MAP __gnu_cxx::hash_map
 #  define UNORDERED_SET __gnu_cxx::hash_set
+#  define UNORDERED_MULTIMAP __gnu_cxx::hash_multimap
 #  define HASH_NAMESPACE_START namespace __gnu_cxx {
 #  define HASH_NAMESPACE_END }
 
@@ -127,10 +146,12 @@ HASH_NAMESPACE_END
 #else
 #  define UNORDERED_MAP std::hash_map
 #  define UNORDERED_SET std::hash_set
+#  define UNORDERED_MULTIMAP std::hash_multimap
 #  define HASH_NAMESPACE_START namespace std {
 #  define HASH_NAMESPACE_END }
 using std::hash_map;
 using std::hash_set;
+using std::hash_multimap;
 #endif
 
 #endif
diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp
index b8e4d55232c..6f363c6669b 100644
--- a/src/game/AccountMgr.cpp
+++ b/src/game/AccountMgr.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2011-2013 MangosR2 <http://github.com/MangosR2>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,8 +21,10 @@
 #include "Database/DatabaseEnv.h"
 #include "ObjectAccessor.h"
 #include "ObjectGuid.h"
+#include "ObjectMgr.h"
 #include "Player.h"
-#include "Policies/SingletonImp.h"
+#include "World.h"
+#include "Policies/Singleton.h"
 #include "Util.h"
 #include "Auth/Sha1.h"
 
@@ -30,25 +33,48 @@ extern DatabaseType LoginDatabase;
 INSTANTIATE_SINGLETON_1(AccountMgr);
 
 AccountMgr::AccountMgr()
-{}
+{
+    mPlayerDataCacheMap.clear();
+    mRAFLinkedMap.clear();
+}
 
 AccountMgr::~AccountMgr()
 {}
 
 AccountOpResult AccountMgr::CreateAccount(std::string username, std::string password)
 {
-    if(utf8length(username) > MAX_ACCOUNT_STR)
+    if (utf8length(username) > MAX_ACCOUNT_STR)
+        return AOR_NAME_TOO_LONG;                           // username's too long
+
+    normalizeString(username);
+    normalizeString(password);
+
+    if (GetId(username))
+    {
+        return AOR_NAME_ALREDY_EXIST;                       // username does already exist
+    }
+
+    if (!LoginDatabase.PExecute("INSERT INTO account(username,sha_pass_hash,joindate) VALUES('%s','%s',NOW())", username.c_str(), CalculateShaPassHash(username, password).c_str()))
+        return AOR_DB_INTERNAL_ERROR;                       // unexpected error
+    LoginDatabase.Execute("INSERT INTO realmcharacters (realmid, acctid, numchars) SELECT realmlist.id, account.id, 0 FROM realmlist,account LEFT JOIN realmcharacters ON acctid=account.id WHERE acctid IS NULL");
+
+    return AOR_OK;                                          // everything's fine
+}
+
+AccountOpResult AccountMgr::CreateAccount(std::string username, std::string password, uint32 expansion)
+{
+    if (utf8length(username) > MAX_ACCOUNT_STR)
         return AOR_NAME_TOO_LONG;                           // username's too long
 
     normalizeString(username);
     normalizeString(password);
 
-    if(GetId(username))
+    if (GetId(username))
     {
         return AOR_NAME_ALREDY_EXIST;                       // username does already exist
     }
 
-    if(!LoginDatabase.PExecute("INSERT INTO account(username,sha_pass_hash,joindate) VALUES('%s','%s',NOW())", username.c_str(), CalculateShaPassHash(username, password).c_str()))
+    if (!LoginDatabase.PExecute("INSERT INTO account(username,sha_pass_hash,joindate,expansion) VALUES('%s','%s',NOW(),'%u')", username.c_str(), CalculateShaPassHash(username, password).c_str(), expansion))
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error
     LoginDatabase.Execute("INSERT INTO realmcharacters (realmid, acctid, numchars) SELECT realmlist.id, account.id, 0 FROM realmlist,account LEFT JOIN realmcharacters ON acctid=account.id WHERE acctid IS NULL");
 
@@ -57,41 +83,43 @@ AccountOpResult AccountMgr::CreateAccount(std::string username, std::string pass
 
 AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
 {
-    QueryResult *result = LoginDatabase.PQuery("SELECT 1 FROM account WHERE id='%u'", accid);
-    if(!result)
+    QueryResult* result = LoginDatabase.PQuery("SELECT 1 FROM account WHERE id='%u'", accid);
+    if (!result)
         return AOR_NAME_NOT_EXIST;                          // account doesn't exist
     delete result;
 
     // existing characters list
-    result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE account='%u'",accid);
+    result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE account='%u'", accid);
     if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 guidlo = fields[0].GetUInt32();
             ObjectGuid guid = ObjectGuid(HIGHGUID_PLAYER, guidlo);
 
             // kick if player currently
             ObjectAccessor::KickPlayer(guid);
             Player::DeleteFromDB(guid, accid, false);       // no need to update realm characters
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
 
         delete result;
     }
 
     // table realm specific but common for all characters of account for realm
-    CharacterDatabase.PExecute("DELETE FROM character_tutorial WHERE account = '%u'",accid);
+    CharacterDatabase.PExecute("DELETE FROM character_tutorial WHERE account = '%u'", accid);
 
     LoginDatabase.BeginTransaction();
 
     bool res =
         LoginDatabase.PExecute("DELETE FROM account WHERE id='%u'", accid) &&
+        LoginDatabase.PExecute("DELETE FROM account_access WHERE id ='%d'", accid) &&
         LoginDatabase.PExecute("DELETE FROM realmcharacters WHERE acctid='%u'", accid);
 
     LoginDatabase.CommitTransaction();
 
-    if(!res)
+    if (!res)
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error;
 
     return AOR_OK;
@@ -99,15 +127,15 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
 
 AccountOpResult AccountMgr::ChangeUsername(uint32 accid, std::string new_uname, std::string new_passwd)
 {
-    QueryResult *result = LoginDatabase.PQuery("SELECT 1 FROM account WHERE id='%u'", accid);
-    if(!result)
+    QueryResult* result = LoginDatabase.PQuery("SELECT 1 FROM account WHERE id='%u'", accid);
+    if (!result)
         return AOR_NAME_NOT_EXIST;                          // account doesn't exist
     delete result;
 
-    if(utf8length(new_uname) > MAX_ACCOUNT_STR)
+    if (utf8length(new_uname) > MAX_ACCOUNT_STR)
         return AOR_NAME_TOO_LONG;
 
-    if(utf8length(new_passwd) > MAX_ACCOUNT_STR)
+    if (utf8length(new_passwd) > MAX_ACCOUNT_STR)
         return AOR_PASS_TOO_LONG;
 
     normalizeString(new_uname);
@@ -116,8 +144,8 @@ AccountOpResult AccountMgr::ChangeUsername(uint32 accid, std::string new_uname,
     std::string safe_new_uname = new_uname;
     LoginDatabase.escape_string(safe_new_uname);
 
-    if(!LoginDatabase.PExecute("UPDATE account SET v='0',s='0',username='%s',sha_pass_hash='%s' WHERE id='%u'", safe_new_uname.c_str(),
-                CalculateShaPassHash(new_uname, new_passwd).c_str(), accid))
+    if (!LoginDatabase.PExecute("UPDATE account SET v='0',s='0',username='%s',sha_pass_hash='%s' WHERE id='%u'", safe_new_uname.c_str(),
+                                CalculateShaPassHash(new_uname, new_passwd).c_str(), accid))
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error
 
     return AOR_OK;
@@ -127,7 +155,7 @@ AccountOpResult AccountMgr::ChangePassword(uint32 accid, std::string new_passwd)
 {
     std::string username;
 
-    if(!GetName(accid, username))
+    if (!GetName(accid, username))
         return AOR_NAME_NOT_EXIST;                          // account doesn't exist
 
     if (utf8length(new_passwd) > MAX_ACCOUNT_STR)
@@ -136,8 +164,8 @@ AccountOpResult AccountMgr::ChangePassword(uint32 accid, std::string new_passwd)
     normalizeString(new_passwd);
 
     // also reset s and v to force update at next realmd login
-    if(!LoginDatabase.PExecute("UPDATE account SET v='0', s='0', sha_pass_hash='%s' WHERE id='%u'",
-                CalculateShaPassHash(username, new_passwd).c_str(), accid))
+    if (!LoginDatabase.PExecute("UPDATE account SET v='0', s='0', sha_pass_hash='%s' WHERE id='%u'",
+                                CalculateShaPassHash(username, new_passwd).c_str(), accid))
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error
 
     return AOR_OK;
@@ -146,8 +174,8 @@ AccountOpResult AccountMgr::ChangePassword(uint32 accid, std::string new_passwd)
 uint32 AccountMgr::GetId(std::string username)
 {
     LoginDatabase.escape_string(username);
-    QueryResult *result = LoginDatabase.PQuery("SELECT id FROM account WHERE username = '%s'", username.c_str());
-    if(!result)
+    QueryResult* result = LoginDatabase.PQuery("SELECT id FROM account WHERE username = '%s'", username.c_str());
+    if (!result)
         return 0;
     else
     {
@@ -159,8 +187,8 @@ uint32 AccountMgr::GetId(std::string username)
 
 AccountTypes AccountMgr::GetSecurity(uint32 acc_id)
 {
-    QueryResult *result = LoginDatabase.PQuery("SELECT gmlevel FROM account WHERE id = '%u'", acc_id);
-    if(result)
+    QueryResult* result = LoginDatabase.PQuery("SELECT `gmlevel` FROM `account_access` WHERE `id` = '%u' AND (`RealmID` = '%u' OR `RealmID` = -1)", acc_id, sWorld.getConfig(CONFIG_UINT32_REALMID));
+    if (result)
     {
         AccountTypes sec = AccountTypes((*result)[0].GetInt32());
         delete result;
@@ -170,10 +198,10 @@ AccountTypes AccountMgr::GetSecurity(uint32 acc_id)
     return SEC_PLAYER;
 }
 
-bool AccountMgr::GetName(uint32 acc_id, std::string &name)
+bool AccountMgr::GetName(uint32 acc_id, std::string& name)
 {
-    QueryResult *result = LoginDatabase.PQuery("SELECT username FROM account WHERE id = '%u'", acc_id);
-    if(result)
+    QueryResult* result = LoginDatabase.PQuery("SELECT username FROM account WHERE id = '%u'", acc_id);
+    if (result)
     {
         name = (*result)[0].GetCppString();
         delete result;
@@ -186,10 +214,10 @@ bool AccountMgr::GetName(uint32 acc_id, std::string &name)
 uint32 AccountMgr::GetCharactersCount(uint32 acc_id)
 {
     // check character count
-    QueryResult *result = CharacterDatabase.PQuery("SELECT COUNT(guid) FROM characters WHERE account = '%u'", acc_id);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT COUNT(guid) FROM characters WHERE account = '%u'", acc_id);
     if (result)
     {
-        Field *fields=result->Fetch();
+        Field* fields = result->Fetch();
         uint32 charcount = fields[0].GetUInt32();
         delete result;
         return charcount;
@@ -201,12 +229,12 @@ uint32 AccountMgr::GetCharactersCount(uint32 acc_id)
 bool AccountMgr::CheckPassword(uint32 accid, std::string passwd)
 {
     std::string username;
-    if(!GetName(accid, username))
+    if (!GetName(accid, username))
         return false;
 
     normalizeString(passwd);
 
-    QueryResult *result = LoginDatabase.PQuery("SELECT 1 FROM account WHERE id='%u' AND sha_pass_hash='%s'", accid, CalculateShaPassHash(username, passwd).c_str());
+    QueryResult* result = LoginDatabase.PQuery("SELECT 1 FROM account WHERE id='%u' AND sha_pass_hash='%s'", accid, CalculateShaPassHash(username, passwd).c_str());
     if (result)
     {
         delete result;
@@ -218,15 +246,15 @@ bool AccountMgr::CheckPassword(uint32 accid, std::string passwd)
 
 bool AccountMgr::normalizeString(std::string& utf8str)
 {
-    wchar_t wstr_buf[MAX_ACCOUNT_STR+1];
+    wchar_t wstr_buf[MAX_ACCOUNT_STR + 1];
 
     size_t wstr_len = MAX_ACCOUNT_STR;
-    if(!Utf8toWStr(utf8str,wstr_buf,wstr_len))
+    if (!Utf8toWStr(utf8str, wstr_buf, wstr_len))
         return false;
 
-    std::transform( &wstr_buf[0], wstr_buf+wstr_len, &wstr_buf[0], wcharToUpperOnlyLatin );
+    std::transform(&wstr_buf[0], wstr_buf + wstr_len, &wstr_buf[0], wcharToUpperOnlyLatin);
 
-    return WStrToUtf8(wstr_buf,wstr_len,utf8str);
+    return WStrToUtf8(wstr_buf, wstr_len, utf8str);
 }
 
 std::string AccountMgr::CalculateShaPassHash(std::string& name, std::string& password)
@@ -243,3 +271,298 @@ std::string AccountMgr::CalculateShaPassHash(std::string& name, std::string& pas
 
     return encoded;
 }
+
+RafLinkedList* AccountMgr::GetRAFAccounts(uint32 accid, bool referred)
+{
+
+    RafLinkedMap::iterator itr = mRAFLinkedMap.find(std::pair<uint32,bool>(accid, referred));
+    if (itr == mRAFLinkedMap.end())
+    {
+        QueryResult* result;
+
+        if (referred)
+            result = LoginDatabase.PQuery("SELECT `friend_id` FROM `account_friends` WHERE `id` = %u AND `expire_date` > NOW() LIMIT %u", accid, sWorld.getConfig(CONFIG_UINT32_RAF_MAXREFERERS));
+        else
+            result = LoginDatabase.PQuery("SELECT `id` FROM `account_friends` WHERE `friend_id` = %u AND `expire_date` > NOW() LIMIT %u", accid, sWorld.getConfig(CONFIG_UINT32_RAF_MAXREFERALS));
+
+        RafLinkedList acclist;
+
+        if (result)
+        {
+            do
+            {
+                Field* fields = result->Fetch();
+                uint32 refaccid = fields[0].GetUInt32();
+                acclist.push_back(refaccid);
+            }
+            while (result->NextRow());
+            delete result;
+        }
+        mRAFLinkedMap.insert(RafLinkedMap::value_type(std::pair<uint32,bool>(accid, referred), acclist));
+        itr = mRAFLinkedMap.find(std::pair<uint32,bool>(accid, referred));
+    }
+
+    return &itr->second;
+}
+
+AccountOpResult AccountMgr::AddRAFLink(uint32 accid, uint32 friendid)
+{
+    if (!LoginDatabase.PExecute("INSERT INTO `account_friends`  (`id`, `friend_id`, `expire_date`) VALUES (%u,%u,NOW() + INTERVAL 3 MONTH)", accid, friendid))
+        return AOR_DB_INTERNAL_ERROR;
+
+    RafLinkedList* referred = GetRAFAccounts(accid, true);
+    if (referred)
+        referred->push_back(friendid);
+
+    RafLinkedList* referal = GetRAFAccounts(friendid, false);
+    if (referal)
+        referal->push_back(accid);
+
+    return AOR_OK;
+}
+
+AccountOpResult AccountMgr::DeleteRAFLink(uint32 accid, uint32 friendid)
+{
+    if (!LoginDatabase.PExecute("DELETE FROM `account_friends` WHERE `id` = %u AND `friend_id` = %u", accid, friendid))
+        return AOR_DB_INTERNAL_ERROR;
+
+    RafLinkedList* referred = GetRAFAccounts(accid, true);
+    if (referred)
+    {
+        for (RafLinkedList::iterator itr1 = referred->begin(); itr1 != referred->end();)
+        {
+            if (*itr1 == accid)
+                itr1 = referred->erase(itr1);
+            else
+                ++itr1;
+        }
+    }
+
+    RafLinkedList* referal = GetRAFAccounts(friendid, false);
+    if (referal)
+    {
+        for (RafLinkedList::iterator itr1 = referal->begin(); itr1 != referal->end();)
+        {
+            if (*itr1 == friendid)
+                itr1 = referal->erase(itr1);
+            else
+                ++itr1;
+        }
+    }
+
+    return AOR_OK;
+}
+
+// name must be checked to correctness (if received) before call this function
+ObjectGuid AccountMgr::GetPlayerGuidByName(std::string name)
+{
+    ObjectGuid guid;
+
+    PlayerDataCache const* cache = GetPlayerDataCache(name);
+    if (cache)
+    {
+        guid = ObjectGuid(HIGHGUID_PLAYER, cache->lowguid);
+    }
+
+    return guid;
+}
+
+bool AccountMgr::GetPlayerNameByGUID(ObjectGuid guid, std::string& name)
+{
+    PlayerDataCache const* cache = GetPlayerDataCache(guid);
+    if (cache)
+    {
+        name = cache->name;
+        return true;
+    }
+
+    return false;
+}
+
+Team AccountMgr::GetPlayerTeamByGUID(ObjectGuid guid)
+{
+    PlayerDataCache const* cache = GetPlayerDataCache(guid);
+    if (cache)
+        return Player::TeamForRace(cache->race);
+
+    return TEAM_NONE;
+}
+
+uint32 AccountMgr::GetPlayerAccountIdByGUID(ObjectGuid guid)
+{
+    if (!guid.IsPlayer())
+        return 0;
+
+    PlayerDataCache const* cache = GetPlayerDataCache(guid);
+    if (cache)
+        return cache->account;
+
+    return 0;
+}
+
+uint32 AccountMgr::GetPlayerAccountIdByPlayerName(const std::string& name)
+{
+    PlayerDataCache const* cache = GetPlayerDataCache(name);
+    if (cache)
+        return cache->account;
+
+    return 0;
+}
+
+void AccountMgr::ClearPlayerDataCache(ObjectGuid guid)
+{
+    if (!guid || !guid.IsPlayer())
+        return;
+
+    PlayerDataCache const* cache = GetPlayerDataCache(guid, false);
+
+    if (cache)
+    {
+        uint32 accId = cache->account;
+
+        PlayerDataCacheMap::iterator itr = mPlayerDataCacheMap.find(guid);
+        if (itr != mPlayerDataCacheMap.end())
+            mPlayerDataCacheMap.erase(itr);
+
+        RafLinkedMap::iterator itr1 = mRAFLinkedMap.find(std::pair<uint32,bool>(accId, true));
+        if (itr1 != mRAFLinkedMap.end())
+            mRAFLinkedMap.erase(itr1);
+        itr1 = mRAFLinkedMap.find(std::pair<uint32,bool>(accId, false));
+        if (itr1 != mRAFLinkedMap.end())
+            mRAFLinkedMap.erase(itr1);
+    }
+
+}
+
+void AccountMgr::MakePlayerDataCache(Player* player)
+{
+    if (!player || !player->GetSession())
+        return;
+
+    ObjectGuid guid = player->GetObjectGuid();
+
+    PlayerDataCache cache;
+    cache.account  = player->GetSession()->GetAccountId();;
+    cache.lowguid  = guid.GetCounter();
+    cache.race     = player->getRace();
+    cache.name     = player->GetName();
+
+    mPlayerDataCacheMap.insert(PlayerDataCacheMap::value_type(guid, cache));
+}
+
+PlayerDataCache const* AccountMgr::GetPlayerDataCache(ObjectGuid guid, bool force)
+{
+    PlayerDataCacheMap::const_iterator itr;
+    {
+        itr = mPlayerDataCacheMap.find(guid);
+        if (itr != mPlayerDataCacheMap.end()) 
+            return &itr->second;
+    }
+    if (!force)
+        return NULL;
+
+    Player* player = sObjectMgr.GetPlayer(guid);
+    if (player)
+    {
+        MakePlayerDataCache(player);
+    }
+    else
+    {
+        QueryResult* result = CharacterDatabase.PQuery("SELECT account, name, race FROM characters WHERE guid = '%u'", guid.GetCounter());
+        if (result)
+        {
+            PlayerDataCache cache;
+            cache.account = (*result)[0].GetUInt32();
+            cache.lowguid = guid.GetCounter();
+            cache.name    = (*result)[1].GetCppString();
+            cache.race    = (*result)[2].GetUInt8();
+
+            mPlayerDataCacheMap.insert(PlayerDataCacheMap::value_type(guid, cache));
+            delete result;
+        }
+    }
+
+    {
+        itr = mPlayerDataCacheMap.find(guid);
+        if (itr != mPlayerDataCacheMap.end()) 
+            return &itr->second;
+    }
+
+    return NULL;
+}
+
+PlayerDataCache const* AccountMgr::GetPlayerDataCache(const std::string& name)
+{
+    {
+        for (PlayerDataCacheMap::const_iterator itr = mPlayerDataCacheMap.begin(); itr != mPlayerDataCacheMap.end(); ++itr)
+            if (itr->second.name == name)
+                return &itr->second;
+    }
+
+    ObjectGuid guid;
+
+    QueryResult* result = CharacterDatabase.PQuery("SELECT account, guid, race FROM characters WHERE name = '%s'", name.c_str());
+    if (result)
+    {
+        PlayerDataCache cache;
+        cache.account  = (*result)[0].GetUInt32();
+        cache.lowguid  = (*result)[1].GetUInt32();
+        cache.race     = (*result)[2].GetUInt8();
+        cache.name     = name;
+
+        guid = ObjectGuid(HIGHGUID_PLAYER, cache.lowguid);
+
+        mPlayerDataCacheMap.insert(PlayerDataCacheMap::value_type(guid, cache));
+        delete result;
+    }
+
+    {
+        PlayerDataCacheMap::const_iterator itr = mPlayerDataCacheMap.find(guid);
+        if (itr != mPlayerDataCacheMap.end()) 
+            return &itr->second;
+    }
+
+    return NULL;
+}
+
+uint32 AccountMgr::GetCharactersCount(uint32 acc_id, bool full)
+{
+    if (full)
+    {
+        QueryResult* result = LoginDatabase.PQuery("SELECT SUM(numchars) FROM realmcharacters WHERE acctid = '%u'", acc_id);
+        if (result)
+        {
+            Field* fields =result->Fetch();
+            uint32 acctcharcount = fields[0].GetUInt32();
+            delete result;
+            return acctcharcount;
+        }
+    }
+    else
+    {
+        QueryResult* result = CharacterDatabase.PQuery("SELECT COUNT(guid) FROM characters WHERE account = '%u'", acc_id);
+        uint8 charcount = 0;
+        if (result)
+        {
+            Field *fields = result->Fetch();
+            charcount = fields[0].GetUInt8();
+            delete result;
+            return charcount;
+        }
+    }
+    return 0;
+}
+
+void AccountMgr::UpdateCharactersCount(uint32 acc_id, uint32 realm_id)
+{
+    uint32 charcount = GetCharactersCount(acc_id, false);
+    LoginDatabase.BeginTransaction();
+    LoginDatabase.PExecute("DELETE FROM realmcharacters WHERE acctid= '%u' AND realmid = '%u'", acc_id, realm_id);
+    LoginDatabase.PExecute("INSERT INTO realmcharacters (numchars, acctid, realmid) VALUES (%u, %u, %u)",  charcount, acc_id, realm_id);
+    LoginDatabase.CommitTransaction();
+}
+
+void AccountMgr::LockAccount(uint32 acc_id, bool lock)
+{
+    LoginDatabase.PExecute( "UPDATE account SET locked = '%u' WHERE id = '%u'", uint32(lock), acc_id);
+}
diff --git a/src/game/AccountMgr.h b/src/game/AccountMgr.h
index a55c1b2cdd9..b93b071a384 100644
--- a/src/game/AccountMgr.h
+++ b/src/game/AccountMgr.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2011-2013 MangosR2 <http://github.com/MangosR2>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,9 +21,13 @@
 #define _ACCMGR_H
 
 #include "Common.h"
+#include "ObjectGuid.h"
+#include "SharedDefines.h"
 #include "Policies/Singleton.h"
 #include <string>
 
+class Player;
+
 enum AccountOpResult
 {
     AOR_OK,
@@ -33,15 +38,36 @@ enum AccountOpResult
     AOR_DB_INTERNAL_ERROR
 };
 
+struct PlayerDataCache
+{
+    uint32      lowguid;
+    uint32      account;
+    std::string name;
+    uint8       race;
+};
+
 #define MAX_ACCOUNT_STR 16
 
-class AccountMgr
+typedef UNORDERED_MAP<ObjectGuid, PlayerDataCache> PlayerDataCacheMap;
+typedef std::vector<uint32> RafLinkedList;
+typedef std::pair<uint32, bool> RafLinkedPair;
+typedef UNORDERED_MAP<RafLinkedPair, RafLinkedList > RafLinkedMap;
+
+HASH_NAMESPACE_START
+template<> class hash <RafLinkedPair>
+{
+    public: size_t operator()(const RafLinkedPair& __x) const { return (size_t)(uint32(__x.second) << 31) | (__x.first); }
+};
+HASH_NAMESPACE_END
+
+class AccountMgr : public MaNGOS::Singleton<AccountMgr, MaNGOS::ClassLevelLockable<AccountMgr, MANGOSR2_MUTEX_MODEL_2> >
 {
     public:
         AccountMgr();
         ~AccountMgr();
 
         AccountOpResult CreateAccount(std::string username, std::string password);
+        AccountOpResult CreateAccount(std::string username, std::string password, uint32 expansion);
         AccountOpResult DeleteAccount(uint32 accid);
         AccountOpResult ChangeUsername(uint32 accid, std::string new_uname, std::string new_passwd);
         AccountOpResult ChangePassword(uint32 accid, std::string new_passwd);
@@ -49,11 +75,35 @@ class AccountMgr
 
         uint32 GetId(std::string username);
         AccountTypes GetSecurity(uint32 acc_id);
-        bool GetName(uint32 acc_id, std::string &name);
+        bool GetName(uint32 acc_id, std::string& name);
         uint32 GetCharactersCount(uint32 acc_id);
         std::string CalculateShaPassHash(std::string& name, std::string& password);
 
+        ObjectGuid GetPlayerGuidByName(std::string name);
+        bool GetPlayerNameByGUID(ObjectGuid guid, std::string &name);
+        Team GetPlayerTeamByGUID(ObjectGuid guid);
+        uint32 GetPlayerAccountIdByGUID(ObjectGuid guid);
+        uint32 GetPlayerAccountIdByPlayerName(const std::string& name);
+
+        uint32 GetCharactersCount(uint32 acc_id, bool full);
+        void UpdateCharactersCount(uint32 acc_id, uint32 realm_id);
+
+        void LockAccount(uint32 acc_id, bool lock);
+
+        PlayerDataCache const* GetPlayerDataCache(ObjectGuid guid, bool force = true);
+        PlayerDataCache const* GetPlayerDataCache(const std::string& name);
+        void  ClearPlayerDataCache(ObjectGuid guid);
+        void  MakePlayerDataCache(Player* player);
+
+        RafLinkedList* GetRAFAccounts(uint32 accid, bool referred = true);
+        AccountOpResult AddRAFLink(uint32 accid, uint32 friendid);
+        AccountOpResult DeleteRAFLink(uint32 accid, uint32 friendid);
+
         static bool normalizeString(std::string& utf8str);
+
+    private:
+        PlayerDataCacheMap  mPlayerDataCacheMap;
+        RafLinkedMap        mRAFLinkedMap;
 };
 
 #define sAccountMgr MaNGOS::Singleton<AccountMgr>::Instance()
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
index 208394b459a..2866c03f9a4 100644
--- a/src/game/AchievementMgr.cpp
+++ b/src/game/AchievementMgr.cpp
@@ -18,6 +18,7 @@
 
 #include "Common.h"
 #include "AchievementMgr.h"
+#include "DBCStores.h"
 #include "Player.h"
 #include "WorldPacket.h"
 #include "DBCEnums.h"
@@ -35,12 +36,20 @@
 #include "CellImpl.h"
 #include "Language.h"
 #include "MapManager.h"
-#include "BattleGround.h"
-#include "BattleGroundAB.h"
+#include "BattleGround/BattleGround.h"
+#include "BattleGround/BattleGroundAB.h"
+#include "BattleGround/BattleGroundAV.h"
+#include "BattleGround/BattleGroundEY.h"
+#include "BattleGround/BattleGroundIC.h"
+#include "BattleGround/BattleGroundSA.h"
+#include "BattleGround/BattleGroundWS.h"
 #include "Map.h"
 #include "InstanceData.h"
+#include "DBCStructure.h"
+#include "Chat.h"
+
+#include "Policies/Singleton.h"
 
-#include "Policies/SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1(AchievementGlobalMgr);
 
@@ -53,17 +62,10 @@ namespace MaNGOS
                 : i_player(pl), i_msgtype(msgtype), i_textId(textId), i_achievementId(ach_id) {}
             void operator()(WorldPacket& data, int32 loc_idx)
             {
-                char const* text = sObjectMgr.GetMangosString(i_textId,loc_idx);
+                char const* text = sObjectMgr.GetMangosString(i_textId, loc_idx);
 
-                data << uint8(i_msgtype);
-                data << uint32(LANG_UNIVERSAL);
-                data << i_player.GetObjectGuid();
-                data << uint32(5);
-                data << i_player.GetObjectGuid();
-                data << uint32(strlen(text)+1);
-                data << text;
-                data << uint8(0);
-                data << uint32(i_achievementId);
+                ChatHandler::BuildChatPacket(data, i_msgtype, text, LANG_UNIVERSAL, i_player.GetChatTag(),  i_player.GetObjectGuid(), NULL, i_player.GetObjectGuid(), NULL, NULL,
+                    i_achievementId);
             }
 
         private:
@@ -77,7 +79,7 @@ namespace MaNGOS
 
 bool AchievementCriteriaRequirement::IsValid(AchievementCriteriaEntry const* criteria)
 {
-    switch(criteria->requiredType)
+    switch (criteria->requiredType)
     {
         case ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE:
         case ACHIEVEMENT_CRITERIA_TYPE_WIN_BG:
@@ -85,8 +87,10 @@ bool AchievementCriteriaRequirement::IsValid(AchievementCriteriaEntry const* cri
         case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST:      // only hardcoded list
         case ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET:
         case ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL:
+        case ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA:
         case ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA:
         case ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM:
+        case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST:// only children's week event
         case ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM:
         case ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE:
         case ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2:
@@ -95,13 +99,16 @@ bool AchievementCriteriaRequirement::IsValid(AchievementCriteriaEntry const* cri
         case ACHIEVEMENT_CRITERIA_TYPE_WIN_DUEL:
         case ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE:
         case ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL2:
+        case ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE:
+        case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL:
+        case ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS:
             break;
         default:
-            sLog.outErrorDb( "Table `achievement_criteria_requirement` have not supported data for criteria %u (Not supported as of its criteria type: %u), ignore.", criteria->ID, criteria->requiredType);
+            sLog.outErrorDb("Table `achievement_criteria_requirement` have not supported data for criteria %u (Not supported as of its criteria type: %u), ignore.", criteria->ID, criteria->requiredType);
             return false;
     }
 
-    switch(requirementType)
+    switch (requirementType)
     {
         case ACHIEVEMENT_CRITERIA_REQUIRE_NONE:
         case ACHIEVEMENT_CRITERIA_REQUIRE_VALUE:
@@ -113,44 +120,44 @@ bool AchievementCriteriaRequirement::IsValid(AchievementCriteriaEntry const* cri
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_CREATURE:
             if (!creature.id || !ObjectMgr::GetCreatureTemplate(creature.id))
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have nonexistent creature id in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,creature.id);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have nonexistent creature id in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, creature.id);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_CLASS_RACE:
             if (!classRace.class_id && !classRace.race_id)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_PLAYER_CLASS_RACE (%u) must have not 0 in one from value fields, ignore.",
-                    criteria->ID, criteria->requiredType,requirementType);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_PLAYER_CLASS_RACE (%u) must have not 0 in one from value fields, ignore.",
+                                criteria->ID, criteria->requiredType, requirementType);
                 return false;
             }
-            if (classRace.class_id && ((1 << (classRace.class_id-1)) & CLASSMASK_ALL_PLAYABLE)==0)
+            if (classRace.class_id && ((1 << (classRace.class_id - 1)) & CLASSMASK_ALL_PLAYABLE) == 0)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have nonexistent class in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,classRace.class_id);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have nonexistent class in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, classRace.class_id);
                 return false;
             }
-            if (classRace.race_id && ((1 << (classRace.race_id-1)) & RACEMASK_ALL_PLAYABLE)==0)
+            if (classRace.race_id && ((1 << (classRace.race_id - 1)) & RACEMASK_ALL_PLAYABLE) == 0)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have nonexistent race in value2 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,classRace.race_id);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have nonexistent race in value2 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, classRace.race_id);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_LESS_HEALTH:
             if (health.percent < 1 || health.percent > 100)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_PLAYER_LESS_HEALTH (%u) have wrong percent value in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,health.percent);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_PLAYER_LESS_HEALTH (%u) have wrong percent value in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, health.percent);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_DEAD:
             if (player_dead.own_team_flag > 1)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_DEAD (%u) have wrong boolean value1 (%u).",
-                    criteria->ID, criteria->requiredType,requirementType,player_dead.own_team_flag);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_DEAD (%u) have wrong boolean value1 (%u).",
+                                criteria->ID, criteria->requiredType, requirementType, player_dead.own_team_flag);
                 return false;
             }
             return true;
@@ -160,20 +167,20 @@ bool AchievementCriteriaRequirement::IsValid(AchievementCriteriaEntry const* cri
             SpellEntry const* spellEntry = sSpellStore.LookupEntry(aura.spell_id);
             if (!spellEntry)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement %s (%u) have wrong spell id in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,(requirementType==ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA?"ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA":"ACHIEVEMENT_CRITERIA_REQUIRE_T_AURA"),requirementType,aura.spell_id);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement %s (%u) have wrong spell id in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, (requirementType == ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA ? "ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA" : "ACHIEVEMENT_CRITERIA_REQUIRE_T_AURA"), requirementType, aura.spell_id);
                 return false;
             }
             if (aura.effect_idx >= MAX_EFFECT_INDEX)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement %s (%u) have wrong spell effect index in value2 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,(requirementType==ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA?"ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA":"ACHIEVEMENT_CRITERIA_REQUIRE_T_AURA"),requirementType,aura.effect_idx);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement %s (%u) have wrong spell effect index in value2 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, (requirementType == ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA ? "ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA" : "ACHIEVEMENT_CRITERIA_REQUIRE_T_AURA"), requirementType, aura.effect_idx);
                 return false;
             }
             if (!spellEntry->EffectApplyAuraName[aura.effect_idx])
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement %s (%u) have non-aura spell effect (ID: %u Effect: %u), ignore.",
-                    criteria->ID, criteria->requiredType,(requirementType==ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA?"ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA":"ACHIEVEMENT_CRITERIA_REQUIRE_T_AURA"),requirementType,aura.spell_id,aura.effect_idx);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement %s (%u) have non-aura spell effect (ID: %u Effect: %u), ignore.",
+                                criteria->ID, criteria->requiredType, (requirementType == ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA ? "ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA" : "ACHIEVEMENT_CRITERIA_REQUIRE_T_AURA"), requirementType, aura.spell_id, aura.effect_idx);
                 return false;
             }
             return true;
@@ -181,129 +188,129 @@ bool AchievementCriteriaRequirement::IsValid(AchievementCriteriaEntry const* cri
         case ACHIEVEMENT_CRITERIA_REQUIRE_S_AREA:
             if (!GetAreaEntryByAreaID(area.id))
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_S_AREA (%u) have wrong area id in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,area.id);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_S_AREA (%u) have wrong area id in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, area.id);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_LEVEL:
             if (level.minlevel > STRONG_MAX_LEVEL)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_T_LEVEL (%u) have wrong minlevel in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,level.minlevel);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_T_LEVEL (%u) have wrong minlevel in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, level.minlevel);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_GENDER:
             if (gender.gender > GENDER_NONE)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_T_GENDER (%u) have wrong gender in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,gender.gender);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_T_GENDER (%u) have wrong gender in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, gender.gender);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_MAP_DIFFICULTY:
             if (difficulty.difficulty >= MAX_DIFFICULTY)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_MAP_DIFFICULTY (%u) have wrong difficulty in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,difficulty.difficulty);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_MAP_DIFFICULTY (%u) have wrong difficulty in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, difficulty.difficulty);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_MAP_PLAYER_COUNT:
             if (map_players.maxcount <= 0)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_MAP_PLAYER_COUNT (%u) have wrong max players count in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,map_players.maxcount);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_MAP_PLAYER_COUNT (%u) have wrong max players count in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, map_players.maxcount);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_TEAM:
             if (team.team != ALLIANCE && team.team != HORDE)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_T_TEAM (%u) have unknown team in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,team.team);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_T_TEAM (%u) have unknown team in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, team.team);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_S_DRUNK:
-            if(drunk.state >= MAX_DRUNKEN)
+            if (drunk.state >= MAX_DRUNKEN)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_S_DRUNK (%u) have unknown drunken state in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,drunk.state);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_S_DRUNK (%u) have unknown drunken state in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, drunk.state);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_HOLIDAY:
             if (!sHolidaysStore.LookupEntry(holiday.id))
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_HOLIDAY (%u) have unknown holiday in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,holiday.id);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_HOLIDAY (%u) have unknown holiday in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, holiday.id);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPPED_ITEM_LVL:
-            if(equipped_item.item_quality >= MAX_ITEM_QUALITY)
+            if (equipped_item.item_quality >= MAX_ITEM_QUALITY)
             {
-                sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPPED_ITEM_LVL (%u) have unknown quality state in value1 (%u), ignore.",
-                    criteria->ID, criteria->requiredType,requirementType,equipped_item.item_quality);
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPPED_ITEM_LVL (%u) have unknown quality state in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, equipped_item.item_quality);
                 return false;
             }
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_KNOWN_TITLE:
+        {
+            CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(known_title.title_id);
+            if (!titleInfo)
             {
-                CharTitlesEntry const *titleInfo = sCharTitlesStore.LookupEntry(known_title.title_id);
-                if (!titleInfo)
-                {
-                    sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_KNOWN_TITLE (%u) have unknown title_id in value1 (%u), ignore.",
-                        criteria->ID, criteria->requiredType, requirementType, known_title.title_id);
-                    return false;
-                }
-                return true;
+                sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_KNOWN_TITLE (%u) have unknown title_id in value1 (%u), ignore.",
+                                criteria->ID, criteria->requiredType, requirementType, known_title.title_id);
+                return false;
             }
+            return true;
+        }
         default:
-            sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) have data for not supported data type (%u), ignore.", criteria->ID, criteria->requiredType,requirementType);
+            sLog.outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) have data for not supported data type (%u), ignore.", criteria->ID, criteria->requiredType, requirementType);
             return false;
     }
 }
 
 bool AchievementCriteriaRequirement::Meets(uint32 criteria_id, Player const* source, Unit const* target, uint32 miscvalue1 /*= 0*/) const
 {
-    switch(requirementType)
+    switch (requirementType)
     {
         case ACHIEVEMENT_CRITERIA_REQUIRE_NONE:
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_CREATURE:
-            if (!target || target->GetTypeId()!=TYPEID_UNIT)
+            if (!target || target->GetTypeId() != TYPEID_UNIT)
                 return false;
             return target->GetEntry() == creature.id;
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_CLASS_RACE:
-            if (!target || target->GetTypeId()!=TYPEID_PLAYER)
+            if (!target || target->GetTypeId() != TYPEID_PLAYER)
                 return false;
-            if(classRace.class_id && classRace.class_id != ((Player*)target)->getClass())
+            if (classRace.class_id && classRace.class_id != ((Player*)target)->getClass())
                 return false;
-            if(classRace.race_id && classRace.race_id != ((Player*)target)->getRace())
+            if (classRace.race_id && classRace.race_id != ((Player*)target)->getRace())
                 return false;
             return true;
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_LESS_HEALTH:
-            if (!target || target->GetTypeId()!=TYPEID_PLAYER)
+            if (!target || target->GetTypeId() != TYPEID_PLAYER)
                 return false;
-            return target->GetHealth()*100 <= health.percent*target->GetMaxHealth();
+            return target->GetHealth() * 100 <= health.percent * target->GetMaxHealth();
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_DEAD:
             if (!target || target->GetTypeId() != TYPEID_PLAYER || target->isAlive() || ((Player*)target)->GetDeathTimer() == 0)
                 return false;
             // flag set == must be same team, not set == different team
             return (((Player*)target)->GetTeam() == source->GetTeam()) == (player_dead.own_team_flag != 0);
         case ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA:
-            return source->HasAura(aura.spell_id,SpellEffectIndex(aura.effect_idx));
+            return source->HasAura(aura.spell_id, SpellEffectIndex(aura.effect_idx));
         case ACHIEVEMENT_CRITERIA_REQUIRE_S_AREA:
         {
-            uint32 zone_id,area_id;
-            source->GetZoneAndAreaId(zone_id,area_id);
-            return area.id==zone_id || area.id==area_id;
+            uint32 zone_id, area_id;
+            source->GetZoneAndAreaId(zone_id, area_id);
+            return area.id == zone_id || area.id == area_id;
         }
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_AURA:
-            return target && target->HasAura(aura.spell_id,SpellEffectIndex(aura.effect_idx));
+            return target && target->HasAura(aura.spell_id, SpellEffectIndex(aura.effect_idx));
         case ACHIEVEMENT_CRITERIA_REQUIRE_VALUE:
             return miscvalue1 >= value.minvalue;
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_LEVEL:
@@ -317,13 +324,13 @@ bool AchievementCriteriaRequirement::Meets(uint32 criteria_id, Player const* sou
         case ACHIEVEMENT_CRITERIA_REQUIRE_DISABLED:
             return false;                                   // always fail
         case ACHIEVEMENT_CRITERIA_REQUIRE_MAP_DIFFICULTY:
-            return source->GetMap()->GetSpawnMode()==difficulty.difficulty;
+            return source->GetMap()->GetSpawnMode() == difficulty.difficulty;
         case ACHIEVEMENT_CRITERIA_REQUIRE_MAP_PLAYER_COUNT:
             return source->GetMap()->GetPlayersCountExceptGMs() <= map_players.maxcount;
         case ACHIEVEMENT_CRITERIA_REQUIRE_T_TEAM:
             if (!target || target->GetTypeId() != TYPEID_PLAYER)
                 return false;
-            return ((Player*)target)->GetTeam() == team.team;
+            return ((Player*)target)->GetTeam() == Team(team.team);
         case ACHIEVEMENT_CRITERIA_REQUIRE_S_DRUNK:
             return (uint32)Player::GetDrunkenstateByValue(source->GetDrunkValue()) >= drunk.state;
         case ACHIEVEMENT_CRITERIA_REQUIRE_HOLIDAY:
@@ -331,9 +338,9 @@ bool AchievementCriteriaRequirement::Meets(uint32 criteria_id, Player const* sou
         case ACHIEVEMENT_CRITERIA_REQUIRE_BG_LOSS_TEAM_SCORE:
         {
             BattleGround* bg = source->GetBattleGround();
-            if(!bg)
+            if (!bg)
                 return false;
-            return bg->IsTeamScoreInRange(source->GetTeam()==ALLIANCE ? HORDE : ALLIANCE,bg_loss_team_score.min_score,bg_loss_team_score.max_score);
+            return bg->IsTeamScoreInRange(source->GetTeam() == ALLIANCE ? HORDE : ALLIANCE, bg_loss_team_score.min_score, bg_loss_team_score.max_score);
         }
         case ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT:
         {
@@ -343,14 +350,14 @@ bool AchievementCriteriaRequirement::Meets(uint32 criteria_id, Player const* sou
             if (!data)
             {
                 sLog.outErrorDb("Achievement system call ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT (%u) for achievement criteria %u for map %u but map not have instance script",
-                    ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT, criteria_id, source->GetMapId());
+                                ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT, criteria_id, source->GetMapId());
                 return false;
             }
             return data->CheckAchievementCriteriaMeet(criteria_id, source, target, miscvalue1);
         }
         case ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPPED_ITEM_LVL:
         {
-            Item* item = source->GetItemByPos(INVENTORY_SLOT_BAG_0,miscvalue1);
+            Item* item = source->GetItemByPos(INVENTORY_SLOT_BAG_0, miscvalue1);
             if (!item)
                 return false;
             ItemPrototype const* proto = item->GetProto();
@@ -383,14 +390,14 @@ bool AchievementCriteriaRequirement::Meets(uint32 criteria_id, Player const* sou
 
 bool AchievementCriteriaRequirementSet::Meets(Player const* source, Unit const* target, uint32 miscvalue /*= 0*/) const
 {
-    for(Storage::const_iterator itr = storage.begin(); itr != storage.end(); ++itr)
-        if(!itr->Meets(criteria_id, source, target, miscvalue))
+    for (Storage::const_iterator itr = storage.begin(); itr != storage.end(); ++itr)
+        if (!itr->Meets(criteria_id, source, target, miscvalue))
             return false;
 
     return true;
 }
 
-AchievementMgr::AchievementMgr(Player *player)
+AchievementMgr::AchievementMgr(Player* player)
 {
     m_player = player;
 }
@@ -401,16 +408,16 @@ AchievementMgr::~AchievementMgr()
 
 void AchievementMgr::Reset()
 {
-    for(CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin(); iter!=m_completedAchievements.end(); ++iter)
+    for (CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin(); iter != m_completedAchievements.end(); ++iter)
     {
-        WorldPacket data(SMSG_ACHIEVEMENT_DELETED,4);
+        WorldPacket data(SMSG_ACHIEVEMENT_DELETED, 4);
         data << uint32(iter->first);
         m_player->SendDirectMessage(&data);
     }
 
-    for(CriteriaProgressMap::const_iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter)
+    for (CriteriaProgressMap::const_iterator iter = m_criteriaProgress.begin(); iter != m_criteriaProgress.end(); ++iter)
     {
-        WorldPacket data(SMSG_CRITERIA_DELETED,4);
+        WorldPacket data(SMSG_CRITERIA_DELETED, 4);
         data << uint32(iter->first);
         m_player->SendDirectMessage(&data);
     }
@@ -431,23 +438,27 @@ void AchievementMgr::ResetAchievementCriteria(AchievementCriteriaTypes type, uin
         return;
 
     AchievementCriteriaEntryList const& achievementCriteriaList = sAchievementMgr.GetAchievementCriteriaByType(type);
-    for(AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i!=achievementCriteriaList.end(); ++i)
+    for (AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i != achievementCriteriaList.end(); ++i)
     {
-        AchievementCriteriaEntry const *achievementCriteria = (*i);
+        AchievementCriteriaEntry const* achievementCriteria = (*i);
 
-        AchievementEntry const *achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement);
+        AchievementEntry const* achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement);
         // Checked in LoadAchievementCriteriaList
 
         // don't update already completed criteria
-        if (IsCompletedCriteria(achievementCriteria,achievement))
+        if (IsCompletedCriteria(achievementCriteria, achievement))
             continue;
 
         switch (type)
         {
+            case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY: // reset days of daily quests complete
+                if(miscvalue1 == ACHIEVEMENT_CRITERIA_CONDITION_DAILY)
+                    SetCriteriaProgress(achievementCriteria, achievement, 0, PROGRESS_SET);
+                break;
             case ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE:     // have total statistic also not expected to be reset
             case ACHIEVEMENT_CRITERIA_TYPE_HEALING_DONE:    // have total statistic also not expected to be reset
                 if (achievementCriteria->healing_done.flag == miscvalue1 &&
-                    achievementCriteria->healing_done.mapid == miscvalue2)
+                        achievementCriteria->healing_done.mapid == miscvalue2)
                     SetCriteriaProgress(achievementCriteria, achievement, 0, PROGRESS_SET);
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA: // have total statistic also not expected to be reset
@@ -455,6 +466,44 @@ void AchievementMgr::ResetAchievementCriteria(AchievementCriteriaTypes type, uin
                 if (achievementCriteria->win_rated_arena.flag == miscvalue1)
                     SetCriteriaProgress(achievementCriteria, achievement, 0, PROGRESS_SET);
                 break;
+            case ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS:
+            case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL:
+            case ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL:
+            case ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE:
+            case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA:
+            case ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET:
+            case ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL:
+            {
+                switch(achievementCriteria->referredAchievement) // All achievements that should reset its progress.
+                {
+                    case 73:
+                    case 204:
+                    case 203:
+                    case 213:
+                    case 216:
+                    case 229:
+                    case 231:
+                    case 582:
+                    case 583:
+                    case 584:
+                    case 587:
+                    case 872:
+                    case 1153:
+                    case 1251:
+                    case 1765:
+                    case 1766:
+                    case 2189:
+                    case 2190:
+                    case 2193:
+                    case 3845:
+                    case 3848:
+                    case 3849:
+                    case 3853:
+                        SetCriteriaProgress(achievementCriteria, achievement, 0, PROGRESS_SET);
+                    default: continue; // Do not reset progress for other achievements.
+                }
+                break;
+            }
             default:                                        // reset all cases
                 break;
         }
@@ -464,52 +513,55 @@ void AchievementMgr::ResetAchievementCriteria(AchievementCriteriaTypes type, uin
 void AchievementMgr::DeleteFromDB(ObjectGuid guid)
 {
     uint32 lowguid = guid.GetCounter();
-    CharacterDatabase.BeginTransaction ();
+    CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE guid = %u", lowguid);
     CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE guid = %u", lowguid);
-    CharacterDatabase.CommitTransaction ();
+    CharacterDatabase.CommitTransaction();
 }
 
 void AchievementMgr::SaveToDB()
 {
-    static SqlStatementID delComplAchievements ;
-    static SqlStatementID insComplAchievements ;
-    static SqlStatementID delProgress ;
-    static SqlStatementID insProgress ;
-
-    if(!m_completedAchievements.empty())
+    if (!m_completedAchievements.empty())
     {
-        //delete existing achievements in the loop
-        for(CompletedAchievementMap::iterator iter = m_completedAchievements.begin(); iter!=m_completedAchievements.end(); ++iter)
+        static SqlStatementID delComplAchievements;
+        static SqlStatementID insComplAchievements;
+
+        SqlStatement delStmt = CharacterDatabase.CreateStatement(delComplAchievements, "DELETE FROM character_achievement WHERE guid = ? AND achievement = ?");
+        SqlStatement insStmt = CharacterDatabase.CreateStatement(insComplAchievements, "INSERT INTO character_achievement (guid, achievement, date) VALUES (?, ?, ?)");
+
+        // delete existing achievements in the loop
+        for (CompletedAchievementMap::iterator iter = m_completedAchievements.begin(); iter != m_completedAchievements.end(); ++iter)
         {
-            if(!iter->second.changed)
+            if (!iter->second.changed)
                 continue;
 
             /// mark as saved in db
             iter->second.changed = false;
 
-            SqlStatement stmt = CharacterDatabase.CreateStatement(delComplAchievements, "DELETE FROM character_achievement WHERE guid = ? AND achievement = ?");
-            stmt.PExecute(GetPlayer()->GetGUIDLow(), iter->first);
-
-            stmt = CharacterDatabase.CreateStatement(insComplAchievements, "INSERT INTO character_achievement (guid, achievement, date) VALUES (?, ?, ?)");
-            stmt.PExecute(GetPlayer()->GetGUIDLow(), iter->first, uint64(iter->second.date));
+            delStmt.PExecute(GetPlayer()->GetGUIDLow(), iter->first);
+            insStmt.PExecute(GetPlayer()->GetGUIDLow(), iter->first, uint64(iter->second.date));
         }
     }
 
-    if(!m_criteriaProgress.empty())
+    if (!m_criteriaProgress.empty())
     {
-        //insert achievements
-        for(CriteriaProgressMap::iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter)
+        static SqlStatementID delProgress;
+        static SqlStatementID insProgress;
+
+        SqlStatement delStmt = CharacterDatabase.CreateStatement(delProgress, "DELETE FROM character_achievement_progress WHERE guid = ? AND criteria = ?");
+        SqlStatement insStmt = CharacterDatabase.CreateStatement(insProgress, "INSERT INTO character_achievement_progress (guid, criteria, counter, date) VALUES (?, ?, ?, ?)");
+
+        // insert achievements
+        for (CriteriaProgressMap::iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter)
         {
-            if(!iter->second.changed)
+            if (!iter->second.changed)
                 continue;
 
             /// mark as updated in db
             iter->second.changed = false;
 
             // new/changed record data
-            SqlStatement stmt = CharacterDatabase.CreateStatement(delProgress, "DELETE FROM character_achievement_progress WHERE guid = ? AND criteria = ?");
-            stmt.PExecute(GetPlayer()->GetGUIDLow(), iter->first);
+            delStmt.PExecute(GetPlayer()->GetGUIDLow(), iter->first);
 
             bool needSave = iter->second.counter != 0;
             if (!needSave)
@@ -519,43 +571,41 @@ void AchievementMgr::SaveToDB()
             }
 
             if (needSave)
-            {
-                stmt = CharacterDatabase.CreateStatement(insProgress, "INSERT INTO character_achievement_progress (guid, criteria, counter, date) VALUES (?, ?, ?, ?)");
-                stmt.PExecute(GetPlayer()->GetGUIDLow(), iter->first, iter->second.counter, uint64(iter->second.date));
-            }
+                insStmt.PExecute(GetPlayer()->GetGUIDLow(), iter->first, iter->second.counter, uint64(iter->second.date));
         }
     }
 }
 
-void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *criteriaResult)
+void AchievementMgr::LoadFromDB(QueryResult* achievementResult, QueryResult* criteriaResult)
 {
     // Note: this code called before any character data loading so don't must triggering any events req. inventory/etc
     // all like cases must be happens in CheckAllAchievementCriteria called after character data load
 
-    if(achievementResult)
+    if (achievementResult)
     {
         do
         {
-            Field *fields = achievementResult->Fetch();
+            Field* fields = achievementResult->Fetch();
 
             uint32 achievement_id = fields[0].GetUInt32();
 
             // don't must happen: cleanup at server startup in sAchievementMgr.LoadCompletedAchievements()
-            if(!sAchievementStore.LookupEntry(achievement_id))
+            if (!sAchievementStore.LookupEntry(achievement_id))
                 continue;
 
             CompletedAchievementData& ca = m_completedAchievements[achievement_id];
             ca.date = time_t(fields[1].GetUInt64());
             ca.changed = false;
-        } while(achievementResult->NextRow());
+        }
+        while (achievementResult->NextRow());
         delete achievementResult;
     }
 
-    if(criteriaResult)
+    if (criteriaResult)
     {
         do
         {
-            Field *fields = criteriaResult->Fetch();
+            Field* fields = criteriaResult->Fetch();
 
             uint32 id      = fields[0].GetUInt32();
             uint32 counter = fields[1].GetUInt32();
@@ -565,8 +615,8 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri
             if (!criteria)
             {
                 // we will remove nonexistent criteria for all characters
-                sLog.outError("Nonexistent achievement criteria %u data removed from table `character_achievement_progress`.",id);
-                CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE criteria = %u",id);
+                sLog.outError("AchievementMgr::LoadFromDB Nonexistent achievement criteria %u data removed from table `character_achievement_progress`.", id);
+                CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE criteria = %u", id);
                 continue;
             }
 
@@ -577,6 +627,15 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri
             progress.timedCriteriaFailed = false;
 
             AchievementEntry const* achievement = sAchievementStore.LookupEntry(criteria->referredAchievement);
+
+            if (!achievement)
+            {
+                // we will remove nonexistent referred achievement for all characters
+                sLog.outError("AchievementMgr::LoadFromDB Nonexistent achievement criteria %u (referred achievement %u) data removed from table `character_achievement_progress`.",id, criteria->referredAchievement);
+                CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE criteria = %u",id);
+                continue;
+            }
+
             // Checked in LoadAchievementCriteriaList
 
             // A failed achievement will be removed on next tick - TODO: Possible that timer 2 is reseted
@@ -602,7 +661,8 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri
                     progress.changed = true;
                 }
             }
-        } while(criteriaResult->NextRow());
+        }
+        while (criteriaResult->NextRow());
         delete criteriaResult;
     }
 
@@ -610,22 +670,27 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri
 
 void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement)
 {
-    if(GetPlayer()->GetSession()->PlayerLoading())
+    if (GetPlayer()->GetSession()->PlayerLoading())
         return;
 
     DEBUG_FILTER_LOG(LOG_FILTER_ACHIEVEMENT_UPDATES, "AchievementMgr::SendAchievementEarned(%u)", achievement->ID);
 
-    if (Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId()))
+    // Not broadcast a hidden achievement
+    if(achievement->flags & ACHIEVEMENT_FLAG_HIDDEN)
+        return;
+
+    Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId());
+    if (guild)
     {
-        MaNGOS::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED,achievement->ID);
+        MaNGOS::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED, achievement->ID);
         MaNGOS::LocalizedPacketDo<MaNGOS::AchievementChatBuilder> say_do(say_builder);
-        guild->BroadcastWorker(say_do,GetPlayer());
+        guild->BroadcastWorker(say_do, GetPlayer());
     }
 
-    if(achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_KILL|ACHIEVEMENT_FLAG_REALM_FIRST_REACH))
+    if (achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_KILL | ACHIEVEMENT_FLAG_REALM_FIRST_REACH))
     {
         // broadcast realm first reached
-        WorldPacket data(SMSG_SERVER_FIRST_ACHIEVEMENT, strlen(GetPlayer()->GetName())+1+8+4+4);
+        WorldPacket data(SMSG_SERVER_FIRST_ACHIEVEMENT, strlen(GetPlayer()->GetName()) + 1 + 8 + 4 + 4);
         data << GetPlayer()->GetName();
         data << GetPlayer()->GetObjectGuid();
         data << uint32(achievement->ID);
@@ -635,24 +700,24 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement)
     // if player is in world he can tell his friends about new achievement
     else if (GetPlayer()->IsInWorld())
     {
-        MaNGOS::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED,achievement->ID);
+        MaNGOS::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED, achievement->ID);
         MaNGOS::LocalizedPacketDo<MaNGOS::AchievementChatBuilder> say_do(say_builder);
-        MaNGOS::CameraDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::AchievementChatBuilder> > say_worker(GetPlayer(),sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_SAY),say_do);
+        MaNGOS::CameraDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::AchievementChatBuilder> > say_worker(GetPlayer(), sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_SAY), say_do);
 
         Cell::VisitWorldObjects(GetPlayer(), say_worker, sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_SAY));
     }
 
-    WorldPacket data(SMSG_ACHIEVEMENT_EARNED, 8+4+8);
+    WorldPacket data(SMSG_ACHIEVEMENT_EARNED, GetPlayer()->GetPackGUID().size() + 4 + 4);
     data << GetPlayer()->GetPackGUID();
     data << uint32(achievement->ID);
-    data << uint32(secsToTimeBitFields(time(NULL)));
+    data.AppendPackedTime(time(NULL));
     data << uint32(0);
     GetPlayer()->SendMessageToSetInRange(&data, sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_SAY), true);
 }
 
 void AchievementMgr::SendCriteriaUpdate(uint32 id, CriteriaProgress const* progress)
 {
-    WorldPacket data(SMSG_CRITERIA_UPDATE, 8+4+8);
+    WorldPacket data(SMSG_CRITERIA_UPDATE, 4 + 4 + 9 + GetPlayer()->GetPackGUID().size() + 4 + 4 + 4 + 4);
     data << uint32(id);
 
     time_t now = time(NULL);
@@ -661,7 +726,7 @@ void AchievementMgr::SendCriteriaUpdate(uint32 id, CriteriaProgress const* progr
 
     data << GetPlayer()->GetPackGUID();
     data << uint32(progress->timedCriteriaFailed ? 1 : 0);
-    data << uint32(secsToTimeBitFields(now));
+    data.AppendPackedTime(now);
     data << uint32(now - progress->date);                   // timer 1
     data << uint32(now - progress->date);                   // timer 2
     GetPlayer()->SendDirectMessage(&data);
@@ -673,7 +738,7 @@ void AchievementMgr::SendCriteriaUpdate(uint32 id, CriteriaProgress const* progr
 void AchievementMgr::CheckAllAchievementCriteria()
 {
     // suppress sending packets
-    for(uint32 i=0; i<ACHIEVEMENT_CRITERIA_TYPE_TOTAL; ++i)
+    for (uint32 i = 0; i < ACHIEVEMENT_CRITERIA_TYPE_TOTAL; ++i)
         UpdateAchievementCriteria(AchievementCriteriaTypes(i));
 }
 
@@ -705,9 +770,9 @@ void AchievementMgr::StartTimedAchievementCriteria(AchievementCriteriaTypes type
         return;
 
     AchievementCriteriaEntryList const& achievementCriteriaList = sAchievementMgr.GetAchievementCriteriaByType(type);
-    for(AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i!=achievementCriteriaList.end(); ++i)
+    for (AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i != achievementCriteriaList.end(); ++i)
     {
-        AchievementCriteriaEntry const *achievementCriteria = (*i);
+        AchievementCriteriaEntry const* achievementCriteria = (*i);
 
         // only apply to specific timedRequirementId related criteria
         if (achievementCriteria->timedCriteriaMiscId != timedRequirementId)
@@ -716,15 +781,15 @@ void AchievementMgr::StartTimedAchievementCriteria(AchievementCriteriaTypes type
         if (!achievementCriteria->IsExplicitlyStartedTimedCriteria())
             continue;
 
-        AchievementEntry const *achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement);
+        AchievementEntry const* achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement);
         // Checked in LoadAchievementCriteriaList
 
         if ((achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_HORDE    && GetPlayer()->GetTeam() != HORDE) ||
-            (achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_ALLIANCE && GetPlayer()->GetTeam() != ALLIANCE))
+                (achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_ALLIANCE && GetPlayer()->GetTeam() != ALLIANCE))
             continue;
 
         // don't update already completed criteria
-        if (IsCompletedCriteria(achievementCriteria,achievement))
+        if (IsCompletedCriteria(achievementCriteria, achievement))
             continue;
 
         // Only the Quest-Complete Timed Achievements need the groupcheck, so this check is only needed here
@@ -804,7 +869,7 @@ void AchievementMgr::DoFailedTimedAchievementCriterias()
 /**
  * this function will be called whenever the user might have done a criteria relevant action
  */
-void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1, uint32 miscvalue2, Unit *unit, uint32 time)
+void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1, uint32 miscvalue2, Unit* unit, uint32 time)
 {
     DETAIL_FILTER_LOG(LOG_FILTER_ACHIEVEMENT_UPDATES, "AchievementMgr::UpdateAchievementCriteria(%u, %u, %u, %u)", type, miscvalue1, miscvalue2, time);
 
@@ -812,19 +877,27 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
         return;
 
     AchievementCriteriaEntryList const& achievementCriteriaList = sAchievementMgr.GetAchievementCriteriaByType(type);
-    for(AchievementCriteriaEntryList::const_iterator itr = achievementCriteriaList.begin(); itr != achievementCriteriaList.end(); ++itr)
+    for (AchievementCriteriaEntryList::const_iterator itr = achievementCriteriaList.begin(); itr != achievementCriteriaList.end(); ++itr)
     {
-        AchievementCriteriaEntry const *achievementCriteria = *itr;
+        AchievementCriteriaEntry const* achievementCriteria = *itr;
 
-        AchievementEntry const *achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement);
-        // Checked in LoadAchievementCriteriaList
+        AchievementEntry const* achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement);
+        // *achievement Checked in LoadAchievementCriteriaList
+
+        // Don't complete "First on server" achieves for GMs
+        if (m_player->GetSession()->GetSecurity() > SEC_PLAYER)
+        {
+            if ((achievement->flags & ACHIEVEMENT_FLAG_REALM_FIRST_REACH) ||
+                (achievement->flags & ACHIEVEMENT_FLAG_REALM_FIRST_RAID_REACH))
+                continue;
+        }
 
         if ((achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_HORDE    && GetPlayer()->GetTeam() != HORDE) ||
-            (achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_ALLIANCE && GetPlayer()->GetTeam() != ALLIANCE))
+                (achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_ALLIANCE && GetPlayer()->GetTeam() != ALLIANCE))
             continue;
 
         // don't update already completed criteria
-        if (IsCompletedCriteria(achievementCriteria,achievement))
+        if (IsCompletedCriteria(achievementCriteria, achievement))
             continue;
 
         // init values, real set in switch
@@ -833,8 +906,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
 
         switch (type)
         {
-            // std. case: increment at 1
-            case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST:
+                // std. case: increment at 1
             case ACHIEVEMENT_CRITERIA_TYPE_NUMBER_OF_TALENT_RESETS:
             case ACHIEVEMENT_CRITERIA_TYPE_LOSE_DUEL:
             case ACHIEVEMENT_CRITERIA_TYPE_CREATE_AUCTION:
@@ -845,12 +917,12 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_FLIGHT_PATHS_TAKEN:
             case ACHIEVEMENT_CRITERIA_TYPE_ACCEPTED_SUMMONINGS:
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
                 change = 1;
                 progressType = PROGRESS_ACCUMULATE;
                 break;
-            // std case: increment at miscvalue1
+                // std case: increment at miscvalue1
             case ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_VENDORS:
             case ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_FOR_TALENTS:
             case ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD:
@@ -862,12 +934,12 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED:
             case ACHIEVEMENT_CRITERIA_TYPE_TOTAL_HEALING_RECEIVED:
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
                 change = miscvalue1;
                 progressType = PROGRESS_ACCUMULATE;
                 break;
-            // std case: high value at miscvalue1
+                // std case: high value at miscvalue1
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_BID:
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_SOLD: /* FIXME: for online player only currently */
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_DEALT:
@@ -875,13 +947,13 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEAL_CASTED:
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALING_RECEIVED:
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
                 change = miscvalue1;
                 progressType = PROGRESS_HIGHEST;
                 break;
 
-            // specialized cases
+                // specialized cases
 
             case ACHIEVEMENT_CRITERIA_TYPE_WIN_BG:
             {
@@ -891,25 +963,65 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 if (achievementCriteria->win_bg.bgMapID != GetPlayer()->GetMapId())
                     continue;
 
+                BattleGround* bg = GetPlayer()->GetBattleGround();
+                if (!bg)
+                    continue;
+
                 if (achievementCriteria->win_bg.additionalRequirement1_type || achievementCriteria->win_bg.additionalRequirement2_type)
                 {
-                    // those requirements couldn't be found in the dbc
-                    AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
-                    if (!data || !data->Meets(GetPlayer(),unit))
-                        continue;
+                    // some hardcoded requirements
+                    switch(achievementCriteria->referredAchievement)
+                    {
+                        case 1164:             // AV, own both mines (horde)
+                        case 225:              // AV, own both mines (alliance)
+                        {
+
+                            TeamIndex team = GetTeamIndex(GetPlayer()->GetTeam());
+                            if(!((BattleGroundAV*)bg)->IsMineOwnedBy(BG_AV_NORTH_MINE,team) || !((BattleGroundAV*)bg)->IsMineOwnedBy(BG_AV_SOUTH_MINE,team))
+                                continue;
+                            break;
+                        }
+                        case 220:               // AV, win while your towers and captain are ok, enemy towers destroyed (alliance)
+                        case 873:               // AV, win while your towers and captain are ok, enemy towers destroyed (horde)
+                        {
+                            if (bg->GetTypeID(true) != BATTLEGROUND_AV)
+                                continue;
+
+                            TeamIndex team = GetTeamIndex(GetPlayer()->GetTeam());
+                            if(!((BattleGroundAV*)bg)->hasAllTowers(team))
+                                continue;
+                            break;
+                        }
+                        case 3851:              // IoC, win while controlling each 5 nodes (alliance)
+                        case 4177:              // IoC, win while controlling each 5 nodes (horde)
+                        {
+                            if (bg->GetTypeID(true) != BATTLEGROUND_IC)
+                                continue;
+
+                            TeamIndex team = GetTeamIndex(GetPlayer()->GetTeam());
+                            if(!((BattleGroundIC*)bg)->hasAllNodes(team))
+                                continue;
+                            break;
+                        }
+                        default:
+                        {
+                            // those requirements couldn't be found in the dbc
+                            AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
+                            if (!data || !data->Meets(GetPlayer(),unit))
+                                continue;
+                            break;
+                        }
+                    }
                 }
                 // some hardcoded requirements
                 else
                 {
-                    BattleGround* bg = GetPlayer()->GetBattleGround();
-                    if (!bg)
-                        continue;
 
-                    switch(achievementCriteria->referredAchievement)
+                    switch (achievementCriteria->referredAchievement)
                     {
                         case 161:                           // AB, Overcome a 500 resource disadvantage
                         {
-                            if (bg->GetTypeID() != BATTLEGROUND_AB)
+                            if (bg->GetTypeID(true) != BATTLEGROUND_AB)
                                 continue;
                             if (!((BattleGroundAB*)bg)->IsTeamScores500Disadvantage(GetPlayer()->GetTeam()))
                                 continue;
@@ -918,13 +1030,31 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                         case 156:                           // AB, win while controlling all 5 flags (all nodes)
                         case 784:                           // EY, win while holding 4 bases (all nodes)
                         {
-                            if(!bg->IsAllNodesConrolledByTeam(GetPlayer()->GetTeam()))
+                            if (!bg->IsAllNodesControlledByTeam(GetPlayer()->GetTeam()))
                                 continue;
                             break;
                         }
                         case 1762:                          // SA, win without losing any siege vehicles
                         case 2192:                          // SA, win without losing any siege vehicles
-                            continue;                       // not implemented
+                        {
+                            if (bg->GetTypeID(true) != BATTLEGROUND_SA)
+                                continue;
+
+                            if (((BattleGroundSA*)bg)->isDemolisherDestroyed[GetPlayer()->GetTeam() == ALLIANCE ? 0 : 1])
+                                continue;
+                            break;
+                        }
+                        case 3846:                          // IoC, win while controlling each 5 nodes (alliance)
+                        case 4176:                          // IoC, win while controlling each 5 nodes (horde)
+                        {
+                            if (bg->GetTypeID(true) != BATTLEGROUND_IC)
+                                continue;
+
+                            TeamIndex team = GetTeamIndex(GetPlayer()->GetTeam());
+                            if(!((BattleGroundIC*)bg)->hasAllResNodes(team))
+                                continue;
+                            break;
+                        }
                     }
                 }
 
@@ -935,17 +1065,84 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE:
             {
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
-                if(achievementCriteria->kill_creature.creatureID != miscvalue1)
+                if (achievementCriteria->kill_creature.creatureID != miscvalue1)
                     continue;
 
                 // those requirements couldn't be found in the dbc
                 AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
-                if(!data || !data->Meets(GetPlayer(),unit))
+                if (!data || !data->Meets(GetPlayer(), unit))
                     continue;
 
-                change = miscvalue2;
+                // For custom cases
+                uint32 changeValue = miscvalue2;
+
+                // some hardcoded criterias
+                switch (achievementCriteria->referredAchievement)
+                {
+                    case 2189:                  // Artillery Expert (SotA)
+                    case 1763:                  // Artillery Veteran (SotA)
+                    {
+                        //if not at bg
+                        BattleGround* bg = GetPlayer()->GetBattleGround();
+                        if (!bg)
+                            continue;
+                        if (bg->GetTypeID(true) != BATTLEGROUND_SA)
+                            continue;
+                        //if not on vehicle
+                        if(!GetPlayer()->hasUnitState(UNIT_STAT_ON_VEHICLE))
+                            continue;
+                        break;
+                    }
+                    case 1871:                  // Experienced Drake Rider (The Oculus)
+                    {
+                        VehicleKitPtr vehicleKit = GetPlayer()->GetVehicle();
+                        if(!vehicleKit)
+                            continue;
+                        uint32 DragonEntry = vehicleKit->GetBase()->GetEntry();
+
+                        if (!(achievementCriteria->ID == 7177 && DragonEntry == 27756) &&   // Ruby Dragon
+                            !(achievementCriteria->ID == 7178 && DragonEntry == 27692) &&   // Emerald Dragon
+                            !(achievementCriteria->ID == 7179 && DragonEntry == 27755))     // Amber Dragon
+                            continue;
+                        break;
+                    }
+                    case 4539:                  // Once Bitten, Twice Shy(10) (ICC Lana'thel)
+                    {
+                        if (changeValue)
+                            continue;
+
+                        if (GetPlayer()->GetMap()->GetDifficulty() != RAID_DIFFICULTY_10MAN_HEROIC &&
+                            GetPlayer()->GetMap()->GetDifficulty() != RAID_DIFFICULTY_10MAN_NORMAL)
+                            continue;
+
+                        if (!(achievementCriteria->ID == 12780 && !GetPlayer()->HasAura(70871)) &&
+                            !(achievementCriteria->ID == 13011 && GetPlayer()->HasAura(70871)))
+                            continue;
+
+                        changeValue = 1;
+                        break;
+                    }
+                    case 4618:                  // Once Bitten, Twice Shy(25) (ICC Lana'thel)
+                    {
+                        if (changeValue)
+                            continue;
+
+                        if (GetPlayer()->GetMap()->GetDifficulty() != RAID_DIFFICULTY_25MAN_HEROIC &&
+                            GetPlayer()->GetMap()->GetDifficulty() != RAID_DIFFICULTY_25MAN_NORMAL)
+                            continue;
+
+                        if (!(achievementCriteria->ID == 13012 && !GetPlayer()->HasAura(70871)) &&
+                            !(achievementCriteria->ID == 13013 && GetPlayer()->HasAura(70871)))
+                            continue;
+
+                        changeValue = 1;
+                        break;
+                    }
+                }
+
+                change = changeValue;
                 progressType = PROGRESS_ACCUMULATE;
                 break;
             }
@@ -954,7 +1151,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 bool ok = true;
 
                 // skip wrong class achievements
-                for(uint8 i = 1; i < MAX_CLASSES; ++i)
+                for (uint8 i = 1; i < MAX_CLASSES; ++i)
                 {
                     if (achievIdByClass[i] == achievement->ID && i != GetPlayer()->getClass())
                     {
@@ -967,7 +1164,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     continue;
 
                 // skip wrong race achievements
-                for(uint8 i = 1; i < MAX_RACES; ++i)
+                for (uint8 i = 1; i < MAX_RACES; ++i)
                 {
                     if (achievIdByRace[i] == achievement->ID && i != GetPlayer()->getRace())
                     {
@@ -986,7 +1183,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL:
             {
                 // update at loading or specific skill update
-                if(miscvalue1 && miscvalue1 != achievementCriteria->reach_skill_level.skillID)
+                if (miscvalue1 && miscvalue1 != achievementCriteria->reach_skill_level.skillID)
                     continue;
                 change = GetPlayer()->GetBaseSkillValue(achievementCriteria->reach_skill_level.skillID);
                 progressType = PROGRESS_HIGHEST;
@@ -995,7 +1192,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL:
             {
                 // update at loading or specific skill update
-                if(miscvalue1 && miscvalue1 != achievementCriteria->learn_skill_level.skillID)
+                if (miscvalue1 && miscvalue1 != achievementCriteria->learn_skill_level.skillID)
                     continue;
                 change = GetPlayer()->GetPureMaxSkillValue(achievementCriteria->learn_skill_level.skillID);
                 progressType = PROGRESS_HIGHEST;
@@ -1003,7 +1200,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             }
             case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_ACHIEVEMENT:
             {
-                if(m_completedAchievements.find(achievementCriteria->complete_achievement.linkedAchievement) == m_completedAchievements.end())
+                if (m_completedAchievements.find(achievementCriteria->complete_achievement.linkedAchievement) == m_completedAchievements.end())
                     continue;
 
                 change = 1;
@@ -1012,31 +1209,63 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             }
             case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST_COUNT:
             {
-                uint32 counter =0;
-                for(QuestStatusMap::const_iterator itr = GetPlayer()->getQuestStatusMap().begin(); itr!=GetPlayer()->getQuestStatusMap().end(); ++itr)
-                    if(itr->second.m_rewarded)
-                        counter++;
+                uint32 counter = 0;
+                for (QuestStatusMap::const_iterator itr = GetPlayer()->GetQuestStatusMap().begin(); itr != GetPlayer()->GetQuestStatusMap().end(); ++itr)
+                    if (itr->second.m_rewarded)
+                        ++counter;
                 change = counter;
                 progressType = PROGRESS_HIGHEST;
                 break;
             }
+            case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY:
+            {
+                // skip at login
+                if(!miscvalue1)
+                    continue;
+
+                // Add one day of daily quests
+                change = 1;
+                progressType = PROGRESS_ACCUMULATE;
+                break;
+            }
             case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_IN_ZONE:
             {
                 // speedup for non-login case
-                if(miscvalue1 && miscvalue1 != achievementCriteria->complete_quests_in_zone.zoneID)
+                if (miscvalue1 && miscvalue1 != achievementCriteria->complete_quests_in_zone.zoneID)
                     continue;
 
-                uint32 counter =0;
-                for(QuestStatusMap::const_iterator itr = GetPlayer()->getQuestStatusMap().begin(); itr!=GetPlayer()->getQuestStatusMap().end(); ++itr)
+                uint32 counter = 0;
+                for (QuestStatusMap::const_iterator itr = GetPlayer()->GetQuestStatusMap().begin(); itr != GetPlayer()->GetQuestStatusMap().end(); ++itr)
                 {
                     Quest const* quest = sObjectMgr.GetQuestTemplate(itr->first);
-                    if(itr->second.m_rewarded && quest->GetZoneOrSort() >= 0 && uint32(quest->GetZoneOrSort()) == achievementCriteria->complete_quests_in_zone.zoneID)
-                        counter++;
+                    if (itr->second.m_rewarded && quest->GetZoneOrSort() >= 0 && uint32(quest->GetZoneOrSort()) == achievementCriteria->complete_quests_in_zone.zoneID)
+                        ++counter;
                 }
                 change = counter;
                 progressType = PROGRESS_HIGHEST;
                 break;
             }
+            case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST:
+            {
+                // skip at login
+                if (!miscvalue1)
+                    continue;
+
+                // Daily Chores (Children's Week event)
+                if (achievementCriteria->referredAchievement == 1789)
+                {
+                    // those requirements couldn't be found in the dbc
+                    AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
+                    if(!data)
+                        continue;
+                    if(!data->Meets(GetPlayer(),unit))
+                        continue;
+                }
+
+                change = 1;
+                progressType = PROGRESS_ACCUMULATE;
+                break;
+            }
             case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND:
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
                 if(!miscvalue1)
@@ -1058,22 +1287,22 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_DEATH:
             {
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
                 // skip wrong arena achievements, if not achievIdByArenaSlot then normal total death counter
                 bool notfit = false;
-                for(int j = 0; j < MAX_ARENA_SLOT; ++j)
+                for (int j = 0; j < MAX_ARENA_SLOT; ++j)
                 {
-                    if(achievIdByArenaSlot[j] == achievement->ID)
+                    if (achievIdByArenaSlot[j] == achievement->ID)
                     {
                         BattleGround* bg = GetPlayer()->GetBattleGround();
-                        if(!bg || !bg->isArena() || ArenaTeam::GetSlotByType(bg->GetArenaType()) != j)
+                        if (!bg || !bg->isArena() || ArenaTeam::GetSlotByType(bg->GetArenaType()) != j)
                             notfit = true;
 
                         break;
                     }
                 }
-                if(notfit)
+                if (notfit)
                     continue;
 
                 change = 1;
@@ -1083,35 +1312,35 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_DEATH_IN_DUNGEON:
             {
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
 
                 Map const* map = GetPlayer()->IsInWorld() ? GetPlayer()->GetMap() : sMapMgr.FindMap(GetPlayer()->GetMapId(), GetPlayer()->GetInstanceId());
-                if(!map || !map->IsDungeon())
+                if (!map || !map->IsDungeon())
                     continue;
 
                 // search case
                 bool found = false;
-                for(int j = 0; achievIdForDungeon[j][0]; ++j)
+                for (int j = 0; achievIdForDungeon[j][0]; ++j)
                 {
-                    if(achievIdForDungeon[j][0] == achievement->ID)
+                    if (achievIdForDungeon[j][0] == achievement->ID)
                     {
-                        if(map->IsRaid())
+                        if (map->IsRaid())
                         {
                             // if raid accepted (ignore difficulty)
-                            if(!achievIdForDungeon[j][2])
+                            if (!achievIdForDungeon[j][2])
                                 break;                      // for
                         }
-                        else if(GetPlayer()->GetDungeonDifficulty()==DUNGEON_DIFFICULTY_NORMAL)
+                        else if (GetPlayer()->GetDungeonDifficulty() == DUNGEON_DIFFICULTY_NORMAL)
                         {
                             // dungeon in normal mode accepted
-                            if(!achievIdForDungeon[j][1])
+                            if (!achievIdForDungeon[j][1])
                                 break;                      // for
                         }
                         else
                         {
                             // dungeon in heroic mode accepted
-                            if(!achievIdForDungeon[j][3])
+                            if (!achievIdForDungeon[j][3])
                                 break;                      // for
                         }
 
@@ -1119,10 +1348,10 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                         break;                              // for
                     }
                 }
-                if(!found)
+                if (!found)
                     continue;
 
-                //FIXME: work only for instances where max==min for players
+                // FIXME: work only for instances where max==min for players
                 if (map->GetMaxPlayers() != achievementCriteria->death_in_dungeon.manLimit)
                     continue;
 
@@ -1133,20 +1362,20 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             }
             case ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_CREATURE:
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
-                if(miscvalue1 != achievementCriteria->killed_by_creature.creatureEntry)
+                if (miscvalue1 != achievementCriteria->killed_by_creature.creatureEntry)
                     continue;
                 change = 1;
                 progressType = PROGRESS_ACCUMULATE;
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_PLAYER:
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
 
                 // if team check required: must kill by opposition faction
-                if(achievement->ID==318 && miscvalue2==uint32(GetPlayer()->GetTeam()))
+                if (achievement->ID == 318 && miscvalue2 == uint32(GetPlayer()->GetTeam()))
                     continue;
 
                 change = 1;
@@ -1155,12 +1384,12 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_FALL_WITHOUT_DYING:
             {
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
 
                 // those requirements couldn't be found in the dbc
                 AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
-                if(!data || !data->Meets(GetPlayer(),unit))
+                if (!data || !data->Meets(GetPlayer(), unit))
                     continue;
 
                 // miscvalue1 is the ingame fallheight*100 as stored in dbc
@@ -1170,9 +1399,9 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             }
             case ACHIEVEMENT_CRITERIA_TYPE_DEATHS_FROM:
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
-                if(miscvalue2 != achievementCriteria->death_from.type)
+                if (miscvalue2 != achievementCriteria->death_from.type)
                     continue;
                 change = 1;
                 progressType = PROGRESS_ACCUMULATE;
@@ -1188,23 +1417,23 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 else
                 {
                     // login case.
-                    if(!GetPlayer()->GetQuestRewardStatus(achievementCriteria->complete_quest.questID))
+                    if (!GetPlayer()->GetQuestRewardStatus(achievementCriteria->complete_quest.questID))
                         continue;
                 }
 
                 // exist many achievements with this criteria, use at this moment hardcoded check to skip simple case
-                switch(achievement->ID)
+                switch (achievement->ID)
                 {
                     case 31:
-                    //case 1275: // these timed achievements have to be "started" on Quest Accept
-                    //case 1276:
-                    //case 1277:
+                        // case 1275: // these timed achievements have to be "started" on Quest Accept
+                        // case 1276:
+                        // case 1277:
                     case 1282:
                     case 1789:
                     {
                         // those requirements couldn't be found in the dbc
                         AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
-                        if(!data || !data->Meets(GetPlayer(),unit))
+                        if (!data || !data->Meets(GetPlayer(), unit))
                             continue;
                         break;
                     }
@@ -1226,13 +1455,63 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 if (!miscvalue1 || miscvalue1 != achievementCriteria->be_spell_target.spellID)
                     continue;
 
-                // those requirements couldn't be found in the dbc
-                AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
-                if(!data)
-                    continue;
+                // for special conditions
+                switch (achievementCriteria->referredAchievement)
+                {
+                    case 1757:          // Defense of the Ancients(alliance)
+                    case 2200:          // Defense of the Ancients(horde)
+                    {
+                        // If not in SotA
+                        BattleGround * bg = GetPlayer()->GetBattleGround();
+                        if(!bg || bg->GetTypeID(true) != BATTLEGROUND_SA)
+                            continue;
 
-                if(!data->Meets(GetPlayer(),unit))
-                    continue;
+                        // If hasnt all walls.
+                        if(!((BattleGroundSA*)bg)->winSAwithAllWalls(GetPlayer()->GetTeam()))
+                            continue;
+                        break;
+                    }
+                    case 1761:          // The Dapper Sapper (SotA)
+                    case 2193:          // Explosives Expert (SotA)
+                    {
+                        // If not in SotA
+                        BattleGround * bg = GetPlayer()->GetBattleGround();
+                        if(!bg || bg->GetTypeID(true) != BATTLEGROUND_SA)
+                            continue;
+                        break;
+                    }
+                    case 3850:          // Mowed Down (IoC) (both)
+                    {
+                        //if not at bg
+                        BattleGround* bg = GetPlayer()->GetBattleGround();
+                        if (!bg)
+                            continue;
+                        if (bg->GetTypeID(true) != BATTLEGROUND_IC)
+                            continue;
+                        if(!((GetPlayer()->GetVehicle()) && (GetPlayer()->GetVehicle()->GetBase()->GetEntry() == 34944)))
+                            continue;
+                        break;
+                    }
+                    case 1310:          // Storm the Beach (SotA)
+                    {
+                        // If not in SotA
+                        BattleGround * bg = GetPlayer()->GetBattleGround();
+                        if(!bg || bg->GetTypeID(true) != BATTLEGROUND_SA)
+                            continue;
+                        break;
+                    }
+                    default:
+                    {
+                        // those requirements couldn't be found in the dbc
+                        AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
+
+                        if (!data)
+                            continue;
+                        if (!data->Meets(GetPlayer(),unit))
+                            continue;
+                        break;
+                    }
+                }
 
                 change = 1;
                 progressType = PROGRESS_ACCUMULATE;
@@ -1246,10 +1525,10 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
 
                 // those requirements couldn't be found in the dbc
                 AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
-                if(!data)
+                if (!data)
                     continue;
 
-                if(!data->Meets(GetPlayer(),unit))
+                if (!data->Meets(GetPlayer(), unit))
                     continue;
 
                 change = 1;
@@ -1257,10 +1536,10 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 break;
             }
             case ACHIEVEMENT_CRITERIA_TYPE_LEARN_SPELL:
-                if(miscvalue1 && miscvalue1!=achievementCriteria->learn_spell.spellID)
+                if (miscvalue1 && miscvalue1 != achievementCriteria->learn_spell.spellID)
                     continue;
 
-                if(!GetPlayer()->HasSpell(achievementCriteria->learn_spell.spellID))
+                if (!GetPlayer()->HasSpell(achievementCriteria->learn_spell.spellID))
                     continue;
 
                 change = 1;
@@ -1276,11 +1555,11 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     continue;
 
                 // zone specific
-                if(achievementCriteria->loot_type.lootTypeCount==1)
+                if (achievementCriteria->loot_type.lootTypeCount == 1)
                 {
                     // those requirements couldn't be found in the dbc
                     AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
-                    if(!data || !data->Meets(GetPlayer(),unit))
+                    if (!data || !data->Meets(GetPlayer(), unit))
                         continue;
                 }
 
@@ -1289,23 +1568,88 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 break;
             }
             case ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM:
+            {
                 // speedup for non-login case
                 if(miscvalue1 && achievementCriteria->own_item.itemID != miscvalue1)
                     continue;
-                change = GetPlayer()->GetItemCount(achievementCriteria->own_item.itemID, true);
-                progressType = PROGRESS_HIGHEST;
+
+                // check item count
+                if(!miscvalue2)
+                    continue;
+
+                change = miscvalue2;
+                progressType = PROGRESS_ACCUMULATE;
+                break;
+            }
+            case ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA:
+            {
+                //miscvalue1 = mapID
+                //miscvalue2 = ArenaType
+                if(!miscvalue1)
+                    continue;
+                if(achievementCriteria->win_arena.mapID != miscvalue1)
+                    continue;
+
+                // Victories statistic for ArenaType
+                switch(achievementCriteria->referredAchievement)
+                {
+                    case 362:
+                        if(miscvalue2 != ARENA_TYPE_5v5)
+                            continue;
+                        break;
+                    case 364:
+                        if(miscvalue2 != ARENA_TYPE_3v3)
+                            continue;
+                        break;
+                    case 366:
+                        if(miscvalue2 != ARENA_TYPE_2v2)
+                            continue;
+                        break;
+                }
+
+                change = 1;
+                progressType = PROGRESS_ACCUMULATE;
+                break;
+            }
+            case ACHIEVEMENT_CRITERIA_TYPE_PLAY_ARENA:
+            {
+                //miscvalue1 = mapID
+                //miscvalue2 = ArenaType
+                if(!miscvalue1 || achievementCriteria->play_arena.mapID != miscvalue1)
+                    continue;
+
+                // Matches statistic for ArenaType
+                switch(achievementCriteria->referredAchievement)
+                {
+                    case 363:
+                        if(miscvalue2!=ARENA_TYPE_5v5)
+                            continue;
+                        break;
+                    case 365:
+                        if(miscvalue2!=ARENA_TYPE_3v3)
+                            continue;
+                        break;
+                    case 367:
+                        if(miscvalue2!=ARENA_TYPE_2v2)
+                            continue;
+                        break;
+                }
+
+                change = 1;
+                progressType = PROGRESS_ACCUMULATE;
                 break;
+            }
             case ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA:
                 // miscvalue1 contains the personal rating
                 if (!miscvalue1)                            // no update at login
                     continue;
 
                 // additional requirements
-                if(achievementCriteria->win_rated_arena.flag==ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE)
+                if (achievementCriteria->win_rated_arena.flag == ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE)
                 {
                     // those requirements couldn't be found in the dbc
                     AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
-                    if(!data || !data->Meets(GetPlayer(),unit,miscvalue1))
+                    if (!data || !data->Meets(GetPlayer(), unit, miscvalue1))
                     {
                         // reset the progress as we have a win without the requirement.
                         SetCriteriaProgress(achievementCriteria, achievement, 0, PROGRESS_SET);
@@ -1333,9 +1677,9 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             }
             case ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM:
                 // You _have_ to loot that item, just owning it when logging in does _not_ count!
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
-                if(miscvalue1 != achievementCriteria->own_item.itemID)
+                if (miscvalue1 != achievementCriteria->own_item.itemID)
                     continue;
                 change = miscvalue2;
                 progressType = PROGRESS_ACCUMULATE;
@@ -1343,31 +1687,31 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_EXPLORE_AREA:
             {
                 WorldMapOverlayEntry const* worldOverlayEntry = sWorldMapOverlayStore.LookupEntry(achievementCriteria->explore_area.areaReference);
-                if(!worldOverlayEntry)
+                if (!worldOverlayEntry)
                     break;
 
                 bool matchFound = false;
                 for (int j = 0; j < MAX_WORLD_MAP_OVERLAY_AREA_IDX; ++j)
                 {
                     uint32 area_id = worldOverlayEntry->areatableID[j];
-                    if(!area_id)                            // array have 0 only in empty tail
+                    if (!area_id)                           // array have 0 only in empty tail
                         break;
 
                     int32 exploreFlag = GetAreaFlagByAreaID(area_id);
-                    if(exploreFlag < 0)
+                    if (exploreFlag < 0)
                         continue;
 
                     uint32 playerIndexOffset = uint32(exploreFlag) / 32;
-                    uint32 mask = 1<< (uint32(exploreFlag) % 32);
+                    uint32 mask = 1 << (uint32(exploreFlag) % 32);
 
-                    if(GetPlayer()->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + playerIndexOffset) & mask)
+                    if (GetPlayer()->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + playerIndexOffset) & mask)
                     {
                         matchFound = true;
                         break;
                     }
                 }
 
-                if(!matchFound)
+                if (!matchFound)
                     continue;
 
                 change = 1;
@@ -1401,7 +1745,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_VISIT_BARBER_SHOP:
             {
                 // skip for login case
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
                 change = 1;
                 progressType = PROGRESS_HIGHEST;
@@ -1410,14 +1754,14 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM:
             {
                 // miscvalue1 = equip_slot+1 (for avoid use 0)
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
-                uint32 item_slot = miscvalue1-1;
-                if(item_slot != achievementCriteria->equip_epic_item.itemSlot)
+                uint32 item_slot = miscvalue1 - 1;
+                if (item_slot != achievementCriteria->equip_epic_item.itemSlot)
                     continue;
                 // those requirements couldn't be found in the dbc
                 AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
-                if(!data || !data->Meets(GetPlayer(),unit,item_slot))
+                if (!data || !data->Meets(GetPlayer(), unit, item_slot))
                     continue;
                 change = 1;
                 progressType = PROGRESS_HIGHEST;
@@ -1428,17 +1772,17 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             {
                 // miscvalue1 = itemid
                 // miscvalue2 = diced value
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
-                if(miscvalue2 != achievementCriteria->roll_greed_on_loot.rollValue)
+                if (miscvalue2 != achievementCriteria->roll_greed_on_loot.rollValue)
                     continue;
-                ItemPrototype const *pProto = ObjectMgr::GetItemPrototype( miscvalue1 );
+                ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(miscvalue1);
 
                 uint32 requiredItemLevel = 0;
                 if (achievementCriteria->ID == 2412 || achievementCriteria->ID == 2358)
                     requiredItemLevel = 185;
 
-                if(!pProto || pProto->ItemLevel <requiredItemLevel)
+                if (!pProto || pProto->ItemLevel < requiredItemLevel)
                     continue;
                 change = 1;
                 progressType = PROGRESS_ACCUMULATE;
@@ -1447,15 +1791,15 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE:
             {
                 // miscvalue1 = emote
-                if(!miscvalue1)
+                if (!miscvalue1)
                     continue;
-                if(miscvalue1 != achievementCriteria->do_emote.emoteID)
+                if (miscvalue1 != achievementCriteria->do_emote.emoteID)
                     continue;
-                if(achievementCriteria->do_emote.count)
+                if (achievementCriteria->do_emote.count)
                 {
                     // those requirements couldn't be found in the dbc
                     AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
-                    if(!data || !data->Meets(GetPlayer(),unit))
+                    if (!data || !data->Meets(GetPlayer(), unit))
                         continue;
                 }
 
@@ -1471,11 +1815,11 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
 
                 if (achievementCriteria->healing_done.flag == ACHIEVEMENT_CRITERIA_CONDITION_MAP)
                 {
-                    if(GetPlayer()->GetMapId() != achievementCriteria->healing_done.mapid)
+                    if (GetPlayer()->GetMapId() != achievementCriteria->healing_done.mapid)
                         continue;
 
                     // map specific case (BG in fact) expected player targeted damage/heal
-                    if(!unit || unit->GetTypeId()!=TYPEID_PLAYER)
+                    if (!unit || unit->GetTypeId() != TYPEID_PLAYER)
                         continue;
                 }
 
@@ -1509,13 +1853,96 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 if (!miscvalue1)
                     continue;
 
-                // those requirements couldn't be found in the dbc
-                AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
-                if (!data)
-                    continue;
+                BattleGround* bg = GetPlayer()->GetBattleGround();
+                switch(achievementCriteria->referredAchievement)
+                {
+                    case 207:                       // Save The Day
+                    {
+                        if (!bg || !unit)
+                            continue;
 
-                if (!data->Meets(GetPlayer(),unit))
-                    continue;
+                        if (bg->GetTypeID(true) != BATTLEGROUND_WS)
+                            continue;
+
+                        switch(GetPlayer()->GetTeam())
+                        {
+                            case ALLIANCE:
+                                if (!(((BattleGroundWS*)bg)->GetFlagState(HORDE) == BG_WS_FLAG_STATE_ON_BASE) || !unit->HasAura(23335) || GetPlayer()->GetAreaId() != 4572)
+                                    continue;
+                                break;
+                            case HORDE:
+                                if (!(((BattleGroundWS*)bg)->GetFlagState(ALLIANCE) == BG_WS_FLAG_STATE_ON_BASE) || !unit->HasAura(23333) || GetPlayer()->GetAreaId() != 4571)
+                                    continue;
+                                break;
+                            default:
+                                break;
+                        }
+                        break;
+                    }
+                    case 223:                       // The Sickly Gazelle
+                    {
+                        if (!bg || !unit)
+                            continue;
+
+                        if (bg->GetTypeID(true) != BATTLEGROUND_AV)
+                            continue;
+
+                        if (unit->GetAreaId() != 3057 || !unit->IsMounted())
+                            continue;
+                        break;
+                    }
+                    case 1259:                      // Not So Fast (WS)
+                        if (!bg || !unit)
+                            continue;
+                        if (bg->GetTypeID(true) != BATTLEGROUND_WS)
+                            continue;
+                        if(!unit->HasAura(23451))
+                            continue;
+                        break;
+                    case 1764:                      // Drop It (SotA)
+                    case 2190:                      // Drop It Now (SotA)
+                        if (!bg || !unit)
+                            continue;
+                        if (bg->GetTypeID(true) != BATTLEGROUND_SA)
+                            continue;
+                        if(!unit->HasAura(52418))
+                            continue;
+                        break;
+                    case 1109:                      // 5v5 Honorable Kills
+                        if(!bg)
+                            continue;
+                        if(!bg->isArena())
+                            continue;
+                        if(bg->GetArenaType() != ARENA_TYPE_5v5)
+                            continue;
+                        break;
+                    case 1110:                      // 3v3 Honorable Kills
+                        if(!bg)
+                            continue;
+                        if(!bg->isArena())
+                            continue;
+                        if(bg->GetArenaType() != ARENA_TYPE_3v3)
+                            continue;
+                        break;
+                    case 1111:                      // 2v2 Honorable Kills
+                        if(!bg)
+                            continue;
+                        if(!bg->isArena())
+                            continue;
+                        if(bg->GetArenaType() != ARENA_TYPE_2v2)
+                            continue;
+                        break;
+                    default:
+                    {
+                        // those requirements couldn't be found in the dbc
+                        AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
+                        if(!data)
+                            continue;
+                        if(!data->Meets(GetPlayer(),unit))
+                            continue;
+                        break;
+                    }
+                }
 
                 change = 1;
                 progressType = PROGRESS_ACCUMULATE;
@@ -1537,14 +1964,14 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
 
                 uint32 spellCount = 0;
                 for (PlayerSpellMap::const_iterator spellIter = GetPlayer()->GetSpellMap().begin();
-                    spellIter != GetPlayer()->GetSpellMap().end();
-                    ++spellIter)
+                        spellIter != GetPlayer()->GetSpellMap().end();
+                        ++spellIter)
                 {
                     SkillLineAbilityMapBounds bounds = sSpellMgr.GetSkillLineAbilityMapBounds(spellIter->first);
-                    for(SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter)
+                    for (SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter)
                     {
-                        if(skillIter->second->skillId == achievementCriteria->learn_skillline_spell.skillLine)
-                            spellCount++;
+                        if (skillIter->second->skillId == achievementCriteria->learn_skillline_spell.skillLine)
+                            ++spellCount;
                     }
                 }
                 change = spellCount;
@@ -1563,13 +1990,64 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     if (!data)
                         continue;
 
-                    if (!data->Meets(GetPlayer(),unit))
+                    if (!data->Meets(GetPlayer(), unit))
                         continue;
                 }
 
                 change = 1;
                 progressType = PROGRESS_ACCUMULATE;
                 break;
+            case ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE:
+            {
+                // miscvalue1 = CreatureType
+                // miscvalue2 = Given XP
+                if(!miscvalue1)
+                    continue;
+
+                switch(achievementCriteria->referredAchievement)
+                {
+                    case 107:               // Creature kills
+                    {
+                        // Creature types is not stored in dbc
+                        if( (achievementCriteria->ID == 4948 && miscvalue1 == CREATURE_TYPE_BEAST) ||
+                            (achievementCriteria->ID == 4949 && miscvalue1 == CREATURE_TYPE_DEMON) ||
+                            (achievementCriteria->ID == 4950 && miscvalue1 == CREATURE_TYPE_DRAGONKIN) ||
+                            (achievementCriteria->ID == 4951 && miscvalue1 == CREATURE_TYPE_ELEMENTAL) ||
+                            (achievementCriteria->ID == 4952 && miscvalue1 == CREATURE_TYPE_GIANT) ||
+                            (achievementCriteria->ID == 4953 && miscvalue1 == CREATURE_TYPE_HUMANOID) ||
+                            (achievementCriteria->ID == 4954 && miscvalue1 == CREATURE_TYPE_MECHANICAL) ||
+                            (achievementCriteria->ID == 4955 && miscvalue1 == CREATURE_TYPE_UNDEAD) ||
+                            (achievementCriteria->ID == 4956 && miscvalue1 == CREATURE_TYPE_NOT_SPECIFIED) ||
+                            (achievementCriteria->ID == 4957 && miscvalue1 == CREATURE_TYPE_TOTEM) )
+                            break;
+                        continue;
+                    }
+                    case 108:               // Critters kills
+                    {
+                        if(miscvalue1 != CREATURE_TYPE_CRITTER)
+                            continue;
+                        break;
+                    }
+                    case 1197:              // Total kills
+                    {
+                        break;
+                    }
+                    case 1198:              // Total kills that grant experience or honor
+                    {
+                        if(miscvalue2 < 1)
+                            continue;
+                        break;
+                    }
+                    default:
+                    {
+                        continue;
+                    }
+                }
+
+                change = 1;
+                progressType = PROGRESS_ACCUMULATE;
+                break;
+            }
             case ACHIEVEMENT_CRITERIA_TYPE_GAIN_REVERED_REPUTATION:
                 change = GetPlayer()->GetReputationMgr().GetReveredFactionCount();
                 progressType = PROGRESS_HIGHEST;
@@ -1602,13 +2080,13 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
 
                 uint32 spellCount = 0;
                 for (PlayerSpellMap::const_iterator spellIter = GetPlayer()->GetSpellMap().begin();
-                    spellIter != GetPlayer()->GetSpellMap().end();
-                    ++spellIter)
+                        spellIter != GetPlayer()->GetSpellMap().end();
+                        ++spellIter)
                 {
                     SkillLineAbilityMapBounds bounds = sSpellMgr.GetSkillLineAbilityMapBounds(spellIter->first);
-                    for(SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter)
+                    for (SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter)
                         if (skillIter->second->skillId == achievementCriteria->learn_skill_line.skillLine)
-                            spellCount++;
+                            ++spellCount;
                 }
                 change = spellCount;
                 progressType = PROGRESS_HIGHEST;
@@ -1636,9 +2114,328 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 change = GetPlayer()->GetMoney();
                 progressType = PROGRESS_HIGHEST;
                 break;
+            case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL:
+            {
+                if(!miscvalue1)
+                    continue;
+                BattleGround* bg=GetPlayer()->GetBattleGround();
+
+                // those requirements couldn't be found in the dbc
+                switch(achievementCriteria->referredAchievement)
+                {
+                    case 229:                   // The Grim Reaper
+                    {
+                        if (!bg)
+                            continue;
+
+                        if (achievementCriteria->ID == 1823 && bg->GetTypeID(true) == BATTLEGROUND_WS ||
+                            achievementCriteria->ID == 1820 && bg->GetTypeID(true) == BATTLEGROUND_AB ||
+                            achievementCriteria->ID == 1822 && bg->GetTypeID(true) == BATTLEGROUND_EY ||
+                            achievementCriteria->ID == 1821 && bg->GetTypeID(true) == BATTLEGROUND_AV ||
+                            // achievementCriteria->ID == && bg->GetTypeID(true) == BATLLEGROUND_SA ||
+                            achievementCriteria->ID == 12579 && bg->GetTypeID(true) == BATTLEGROUND_IC)
+                            break;
+                        continue;
+                    }
+                    case 252:                   // With a Little Helper from My Friends (Event: Feast of Winter Veil)
+                    {
+                        Player* plr = GetPlayer();
+                        if (!((plr->GetAura(26274,EFFECT_INDEX_0)) && (achievementCriteria->ID == 3829)) ||
+                            !((plr->GetAura(26157,EFFECT_INDEX_0)) && (achievementCriteria->ID == 3826)) ||
+                            !((plr->GetAura(26272,EFFECT_INDEX_0)) && (achievementCriteria->ID == 3827)) ||
+                            !((plr->GetAura(26273,EFFECT_INDEX_0)) && (achievementCriteria->ID == 3828)) )
+                            continue;
+                        break;
+                    }
+                    case 381:                   // World Honorable Kills
+                    {
+                        // if at battleground
+                        if(bg)
+                            continue;
+                        if( (achievementCriteria->ID == 5492 && GetPlayer()->GetMapId() == 0) ||    // Eastern Kingdoms
+                            (achievementCriteria->ID == 5493 && GetPlayer()->GetMapId() == 1) ||    // Kalimdor
+                            (achievementCriteria->ID == 5494 && GetPlayer()->GetMapId() == 530) ||  // Outland
+                            (achievementCriteria->ID == 5495 && GetPlayer()->GetMapId() == 571) )   // Northrend
+                            break;
+                        continue;
+                    }
+                    case 382:                   // BattleGround Honorable Kills
+                    {
+                        if(!bg)
+                            continue;
+                        if( (achievementCriteria->ID == 5499 && GetPlayer()->GetMapId() == 529) ||  // AB
+                            (achievementCriteria->ID == 5500 && GetPlayer()->GetMapId() == 30) ||   // AV
+                            (achievementCriteria->ID == 5501 && GetPlayer()->GetMapId() == 489) ||  // WS
+                            (achievementCriteria->ID == 5502 && GetPlayer()->GetMapId() == 566) ||  // EY
+                            (achievementCriteria->ID == 5503 && GetPlayer()->GetMapId() == 607) ||  // SA
+                            (achievementCriteria->ID == 13260 && GetPlayer()->GetMapId() == 628) )  // IC
+                            break;
+                        continue;
+                    }
+                    case 1112:                  // Eye of the Storm Honorable Kills
+                        if(!bg || (bg->GetTypeID(true) != BATTLEGROUND_EY))
+                            continue;
+                        break;
+                    case 1113:                  // Alterac Valley Honorable Kills
+                        if(!bg || (bg->GetTypeID(true) != BATTLEGROUND_AV))
+                            continue;
+                        break;
+                    case 1114:                  // Arathi Basin Honorable Kills
+                        if(!bg || (bg->GetTypeID(true) != BATTLEGROUND_AB))
+                            continue;
+                        break;
+                    case 1115:                  // Warsong Gulch Honorable Kills
+                        if(!bg || (bg->GetTypeID(true) != BATTLEGROUND_WS))
+                            continue;
+                        break;
+                    case 1261:                  // G.N.E.R.D. Rage
+                        if(!GetPlayer()->HasAura(48890))
+                            continue;
+                        break;
+                    case 1486:                  // Strand of the Ancients Honorable Kills
+                        if(!bg || (bg->GetTypeID(true) != BATTLEGROUND_SA))
+                            continue;
+                        break;
+                    case 3850:                  // Mowed Down (IoC)
+                    {
+                        //if not at bg
+                        BattleGround* bg = GetPlayer()->GetBattleGround();
+                        if (!bg)
+                            continue;
+                        if (bg->GetTypeID(true) != BATTLEGROUND_IC)
+                            continue;
+                        if(!((GetPlayer()->GetVehicle()) && (GetPlayer()->GetVehicle()->GetBase()->GetEntry() == 34944)))
+                            continue;
+                        break;
+                    }
+                    case 3855:                  // Glaive Grave (IoC)
+                    {
+                        // if not at bg
+                        BattleGround* bg = GetPlayer()->GetBattleGround();
+                        if (!bg)
+                            continue;
+                        if (bg->GetTypeID(true) != BATTLEGROUND_IC)
+                           continue;
+                        // without deaths
+                        if(bg->GetPlayerScore(GetPlayer(),SCORE_DEATHS)!=0)
+                            continue;
+                        // if not on vehicle
+                        if(!GetPlayer()->GetVehicle())
+                            continue;
+                        // if vehicle is Glaive Thrower
+                        if(GetPlayer()->GetVehicle()->GetBase()->GetEntry() != 34802)
+                            continue;
+                        break;
+                    }
+                    case 4779:                  // Isle of Conquests Honorable Kills
+                        if(!bg || (bg->GetTypeID(true) != BATTLEGROUND_IC))
+                            continue;
+                        break;
+                }
+                change = 1;
+                progressType = PROGRESS_ACCUMULATE;
+                break;
+            }
+            case ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS:
+            {
+                // miscvalue1 = kills count
+                // miscvalue2 = creature entry
+                if (!miscvalue1)
+                    continue;
+
+                // those requirements couldn't be found in the dbc
+                AchievementCriteriaRequirementSet const* data = sAchievementMgr.GetCriteriaRequirementSet(achievementCriteria);
+
+                if(achievementCriteria->healing_done.flag != 0)
+                {
+                    if(GetPlayer()->GetMapId() != achievementCriteria->healing_done.mapid)
+                    {
+                        continue;
+                    }
+                    else
+                    {
+                        if(data && !data->Meets(GetPlayer(),unit))
+                            continue;
+                    }
+                }
+                else
+                {
+                    if(!data)
+                        continue;
+                    if(!data->Meets(GetPlayer(),unit))
+                        continue;
+                }
+
+                BattleGround* bg = GetPlayer()->GetBattleGround();
+
+                // some hardcoded requirements
+                switch(achievementCriteria->referredAchievement)
+                {
+                    case 231:                   // Wrecking Ball
+                        if(!bg || bg->GetPlayerScore(GetPlayer(),SCORE_DEATHS) != 0)
+                            continue;
+                        break;
+                    case 233:                   // Bloodthirsty Berserker
+                        if(!bg || !GetPlayer()->HasAura(24378))
+                            continue;
+                        break;
+                    case 1488:                  // World Killing Blows
+                    {
+                        if(bg)
+                            continue;
+                        if( (achievementCriteria->ID == 5512 && GetPlayer()->GetMapId() == 0) ||    // Eastern Kingdoms
+                            (achievementCriteria->ID == 5530 && GetPlayer()->GetMapId() == 1) ||    // Kalimdor
+                            (achievementCriteria->ID == 5531 && GetPlayer()->GetMapId() == 530) ||  // Burning Crusade Areas
+                            (achievementCriteria->ID == 5532 && GetPlayer()->GetMapId() == 571) )   // Northrend
+                            break;
+                        continue;
+                    }
+                    case 1490:                  // Arena Killing Blows
+                    {
+                        if (!bg || !unit || unit->GetTypeId() != TYPEID_PLAYER)
+                            continue;
+                        if (!bg->isArena())
+                            continue;
+                        if ((achievementCriteria->ID == 5533 && GetPlayer()->GetMapId() == 559) ||  // Nagrand Arena
+                            (achievementCriteria->ID == 5534 && GetPlayer()->GetMapId() == 562) ||  // Blade's Edge Arena
+                            (achievementCriteria->ID == 5535 && GetPlayer()->GetMapId() == 572) ||  // Ruins of Lordaeron
+                            (achievementCriteria->ID == 9165 && GetPlayer()->GetMapId() == 617) ||  // Dalaran Sewers
+                            (achievementCriteria->ID == 9166 && GetPlayer()->GetMapId() == 618) )   // Ring of Valor
+                            break;
+                        continue;
+                    }
+                    case 1491:                  // Battleground Killing Blows
+                    {
+                        if (!bg || !bg->isArena() || !unit || unit->GetTypeId() != TYPEID_PLAYER)
+                            continue;
+                        if ((achievementCriteria->ID == 5436 && GetPlayer()->GetMapId() == 30) ||   // AV
+                            (achievementCriteria->ID == 5537 && GetPlayer()->GetMapId() == 529) ||  // AB
+                            (achievementCriteria->ID == 5538 && GetPlayer()->GetMapId() == 489) ||  // WS
+                            (achievementCriteria->ID == 5539 && GetPlayer()->GetMapId() == 566) ||  // EY
+                            (achievementCriteria->ID == 5540 && GetPlayer()->GetMapId() == 607) ||  // SA
+                            (achievementCriteria->ID == 13224 && GetPlayer()->GetMapId() == 628) )  // IC
+                            break;
+                        continue;
+                    }
+                    case 1492:                  // 2v2 Arena Killing Blows
+                    case 1493:                  // 3v3 Arena Killing Blows
+                    case 1494:                  // 5v5 Arena Killing Blows
+                    {
+                        if (!bg || !unit || unit->GetTypeId() != TYPEID_PLAYER)
+                            continue;
+                        if (!bg->isArena())
+                            continue;
+                        if ((achievementCriteria->ID == 5441 && bg->GetArenaType() == ARENA_TYPE_2v2) ||
+                            (achievementCriteria->ID == 5442 && bg->GetArenaType() == ARENA_TYPE_3v3) ||
+                            (achievementCriteria->ID == 5443 && bg->GetArenaType() == ARENA_TYPE_5v5) )
+                            break;
+                        continue;
+                    }
+                    case 3856:                  // Demolition Derby (alliance)
+                    case 4256:                  // Demolition Derby (horde)
+                    {
+                        if (!unit || unit->GetTypeId() != TYPEID_UNIT)
+                            continue;
+                        uint32 AchCrID = achievementCriteria->ID;
+                        if( ((AchCrID == 11497 || AchCrID == 12178) && miscvalue2 == 34802) ||  // Glaive Thrower
+                            ((AchCrID == 11498 || AchCrID == 12179) && miscvalue2 == 34775) ||  // Demolisher
+                            ((AchCrID == 11500 || AchCrID == 12181) && miscvalue2 == 34793) ||  // Catapult
+                            ((AchCrID == 11501 || AchCrID == 12182) && miscvalue2 == 34776) )   // Siege Engine
+                            break;
+                        continue;
+                    }
+                }
+
+                change = miscvalue1;
+                progressType = PROGRESS_ACCUMULATE;
+                break;
+            }
+            case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA:
+            {
+                if (GetPlayer()->GetAreaId() != achievementCriteria->honorable_kill_at_area.areaID)
+                    continue;
+
+                change = miscvalue1;
+                progressType = PROGRESS_ACCUMULATE;
+                break;
+            }
+            case ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE:
+            {
+                if (!miscvalue1 || !miscvalue2 || miscvalue2 != achievementCriteria->objective_capture.captureID)
+                    continue;
+
+                BattleGround* bg = GetPlayer()->GetBattleGround();
+                if (!bg)
+                    continue;
+
+                // some hardcoded requirements
+                switch(achievementCriteria->objective_capture.captureID)
+                {
+                    case WS_OBJECTIVE_CAPTURE_FLAG:      // WS, capture a flag
+                    {
+                        if (bg->GetTypeID(true) != BATTLEGROUND_WS)
+                            continue;
+                                                         // WS, capture 3 flags without dying
+                        if (achievementCriteria->referredAchievement == 204)
+                        {
+                            if (bg->GetPlayerScore(GetPlayer(), SCORE_DEATHS))
+                                continue;
+                        }
+                        break;
+                    }
+                    case WS_OBJECTIVE_RETURN_FLAG:       // WS, return a flag
+                    {
+                        if (bg->GetTypeID(true) != BATTLEGROUND_WS)
+                            continue;
+                        break;
+                    }
+                    case AV_OBJECTIVE_ASSAULT_TOWER:     // AV, assault a tower
+                    case AV_OBJECTIVE_ASSAULT_GRAVEYARD: // AV, assault a graveyard
+                    case AV_OBJECTIVE_DEFEND_TOWER:      // AV, defend a tower
+                    case AV_OBJECTIVE_DEFEND_GRAVEYARD:  // AV, defend a graveyard
+                    {
+                        if (bg->GetTypeID(true) != BATTLEGROUND_AV)
+                            continue;
+                        break;
+                    }
+                    case AB_OBJECTIVE_ASSAULT_BASE:      // AB, assault a base
+                    case AB_OBJECTIVE_DEFEND_BASE:       // AB, defend a base
+                    {
+                        if (bg->GetTypeID(true) != BATTLEGROUND_AB)
+                            continue;
+                        break;
+                    }
+                    case EY_OBJECTIVE_CAPTURE_FLAG:      // EY, capture a flag
+                    {
+                        if (bg->GetTypeID(true) != BATTLEGROUND_EY)
+                            continue;
+
+                        switch(achievementCriteria->referredAchievement)
+                        {
+                            case 211:                    // EY, capture flag while controling all 4 bases
+                            {
+                                if (!bg->IsAllNodesControlledByTeam(GetPlayer()->GetTeam()))
+                                    continue;
+                                break;
+                            }
+                            case 216:                    // EY, capture 3 flags without dying
+                            {
+                                if (bg->GetPlayerScore(GetPlayer(), SCORE_DEATHS))
+                                    continue;
+                                break;
+                            }
+                        }
+                        break;
+                    }
+                }
+
+                change = miscvalue1;
+                progressType = PROGRESS_ACCUMULATE;
+                break;
+            }
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING:
             {
-                if(!miscvalue1 || achievementCriteria->highest_team_rating.teamtype != miscvalue1)
+                if (!miscvalue1 || achievementCriteria->highest_team_rating.teamtype != miscvalue1)
                     continue;
 
                 change = miscvalue2;
@@ -1647,10 +2444,10 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             }
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_PERSONAL_RATING:
             {
-                if(!miscvalue1 || achievementCriteria->highest_personal_rating.teamtype != miscvalue1)
+                if (!miscvalue1 || achievementCriteria->highest_personal_rating.teamtype != miscvalue1)
                     continue;
 
-                if(achievementCriteria->highest_personal_rating.teamrating != 0 && achievementCriteria->highest_personal_rating.teamrating > miscvalue2)
+                if (achievementCriteria->highest_personal_rating.teamrating != 0 && achievementCriteria->highest_personal_rating.teamrating > miscvalue2)
                     continue;
 
                 change = miscvalue2;
@@ -1672,6 +2469,15 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 progressType = PROGRESS_ACCUMULATE;
                 break;
             }
+            case ACHIEVEMENT_CRITERIA_TYPE_USE_LFD_TO_GROUP_WITH_PLAYERS:
+            {
+                if (!miscvalue1)
+                    continue;
+
+                change = 1;
+                progressType = PROGRESS_ACCUMULATE;
+                break;
+            }
             // std case: not exist in DBC, not triggered in code as result
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALTH:
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_SPELLPOWER:
@@ -1680,19 +2486,10 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_STAT:
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_RATING:
                 break;
-            // FIXME: not triggered in code as result, need to implement
-            case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY:
+                // FIXME: not triggered in code as result, need to implement
             case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_RAID:
-            case ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE:
-            case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA:
-            case ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA:
-            case ACHIEVEMENT_CRITERIA_TYPE_PLAY_ARENA:
-            case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL:
             case ACHIEVEMENT_CRITERIA_TYPE_OWN_RANK:
-            case ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS:
-            case ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE:
             case ACHIEVEMENT_CRITERIA_TYPE_EARN_ACHIEVEMENT_POINTS:
-            case ACHIEVEMENT_CRITERIA_TYPE_USE_LFD_TO_GROUP_WITH_PLAYERS:
                 break;                                   // Not implemented yet :(
         }
 
@@ -1700,6 +2497,12 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
     }
 }
 
+uint32 AchievementMgr::GetCriteriaProgressCounter(AchievementCriteriaEntry const* entry) const
+{
+    CriteriaProgressMap::const_iterator iter = m_criteriaProgress.find(entry->ID);
+    return iter != m_criteriaProgress.end() ? iter->second.counter : 0;
+}
+
 uint32 AchievementMgr::GetCriteriaProgressMaxCounter(AchievementCriteriaEntry const* achievementCriteria, AchievementEntry const* achievement)
 {
     uint32 resultValue = 0;
@@ -1723,11 +2526,16 @@ uint32 AchievementMgr::GetCriteriaProgressMaxCounter(AchievementCriteriaEntry co
         case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST_COUNT:
             resultValue = achievementCriteria->complete_quest_count.totalQuestCount;
             break;
+        case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY:
+            resultValue = achievementCriteria->complete_daily_quest_daily.numberOfDays;
+            break;
         case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_IN_ZONE:
             resultValue = achievementCriteria->complete_quests_in_zone.questCount;
             break;
         case ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE:
         case ACHIEVEMENT_CRITERIA_TYPE_HEALING_DONE:
+        case ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS:
+        case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL:
             resultValue = achievementCriteria->healing_done.count;
             break;
         case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST:
@@ -1753,6 +2561,9 @@ uint32 AchievementMgr::GetCriteriaProgressMaxCounter(AchievementCriteriaEntry co
         case ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM:
             resultValue = achievementCriteria->own_item.itemCount;
             break;
+        case ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA:
+            resultValue = achievementCriteria->win_arena.count;
+            break;
         case ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA:
             resultValue = achievementCriteria->win_rated_arena.count;
             break;
@@ -1761,6 +2572,7 @@ uint32 AchievementMgr::GetCriteriaProgressMaxCounter(AchievementCriteriaEntry co
             break;
         case ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM:
             resultValue = achievementCriteria->use_item.itemCount;
+//            resultValue = achievementCriteria->use_item.itemCount ? achievementCriteria->use_item.itemCount : 1;
             break;
         case ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM:
             resultValue = achievementCriteria->loot_item.itemCount;
@@ -1832,9 +2644,18 @@ uint32 AchievementMgr::GetCriteriaProgressMaxCounter(AchievementCriteriaEntry co
         case ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL:
             resultValue = achievementCriteria->honorable_kill.killCount;
             break;
+        case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA:
+            resultValue = achievementCriteria->honorable_kill_at_area.killCount;
+            break;
+        case ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE:
+            resultValue = achievementCriteria->objective_capture.captureCount;
+            break;
         case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_PERSONAL_RATING:
             resultValue = achievementCriteria->highest_personal_rating.teamrating;
             break;
+        case ACHIEVEMENT_CRITERIA_TYPE_USE_LFD_TO_GROUP_WITH_PLAYERS:
+            resultValue = achievementCriteria->use_lfg.dungeonsComplete;
+            break;
 
         // handle all statistic-only criteria here
         case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND:
@@ -1873,7 +2694,7 @@ uint32 AchievementMgr::GetCriteriaProgressMaxCounter(AchievementCriteriaEntry co
             break;
     }
 
-    if (achievement->flags & ACHIEVEMENT_FLAG_COUNTER)
+    if (achievement && (achievement->flags & ACHIEVEMENT_FLAG_COUNTER))
         resultValue = std::numeric_limits<uint32>::max();
 
     return resultValue;
@@ -1900,7 +2721,7 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve
 
     uint32 maxcounter = GetCriteriaProgressMaxCounter(achievementCriteria, achievement);
 
-    return progress->counter >= maxcounter || (achievement->flags & ACHIEVEMENT_FLAG_REQ_COUNT && progress->counter);
+    return progress->counter >= maxcounter || ((achievement->flags & ACHIEVEMENT_FLAG_REQ_COUNT) && progress->counter);
 }
 
 void AchievementMgr::CompletedCriteriaFor(AchievementEntry const* achievement)
@@ -1910,7 +2731,7 @@ void AchievementMgr::CompletedCriteriaFor(AchievementEntry const* achievement)
         return;
 
     // already completed and stored
-    if (m_completedAchievements.find(achievement->ID)!=m_completedAchievements.end())
+    if (m_completedAchievements.find(achievement->ID) != m_completedAchievements.end())
         return;
 
     if (IsCompletedAchievement(achievement))
@@ -1941,7 +2762,7 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry)
             AchievementCriteriaEntry const* criteria = *itr;
 
             CriteriaProgressMap::const_iterator itrProgress = m_criteriaProgress.find(criteria->ID);
-            if(itrProgress == m_criteriaProgress.end())
+            if (itrProgress == m_criteriaProgress.end())
                 continue;
 
             CriteriaProgress const* progress = &itrProgress->second;
@@ -1990,7 +2811,7 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* criteri
     if (changeValue > max_value)
         changeValue = max_value;
 
-    CriteriaProgress *progress = NULL;
+    CriteriaProgress* progress = NULL;
     uint32 old_value = 0;
     uint32 newValue = 0;
 
@@ -2025,7 +2846,7 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* criteri
         progress = &iter->second;
 
         old_value = progress->counter;
-        switch(ptype)
+        switch (ptype)
         {
             case PROGRESS_SET:
                 newValue = changeValue;
@@ -2052,6 +2873,10 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* criteri
     // update client side value
     SendCriteriaUpdate(criteria->ID, progress);
 
+    // nothing do for counter case
+    if ((achievement->flags & ACHIEVEMENT_FLAG_COUNTER) && !(achievement->flags & ACHIEVEMENT_FLAG_SUMM)) //second check for "Tastes Like Chicken" and alike
+        return;
+
     // update dependent achievements state at criteria complete
     if (old_value < progress->counter)
     {
@@ -2078,7 +2903,7 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* criteri
     {
         if (progress->counter < max_value)
         {
-            WorldPacket data(SMSG_CRITERIA_DELETED,4);
+            WorldPacket data(SMSG_CRITERIA_DELETED, 4);
             data << uint32(criteria->ID);
             m_player->SendDirectMessage(&data);
         }
@@ -2098,18 +2923,18 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* criteri
 void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement)
 {
     DETAIL_LOG("AchievementMgr::CompletedAchievement(%u)", achievement->ID);
-    if(achievement->flags & ACHIEVEMENT_FLAG_COUNTER || m_completedAchievements.find(achievement->ID)!=m_completedAchievements.end())
+    if ((achievement->flags & ACHIEVEMENT_FLAG_COUNTER) || m_completedAchievements.find(achievement->ID) != m_completedAchievements.end())
         return;
 
     SendAchievementEarned(achievement);
+    // wow armory begin
+    GetPlayer()->CreateWowarmoryFeed(1, achievement->ID, 0, 0);
+    // wow armory end
     CompletedAchievementData& ca =  m_completedAchievements[achievement->ID];
     ca.date = time(NULL);
     ca.changed = true;
 
-    // don't insert for ACHIEVEMENT_FLAG_REALM_FIRST_KILL since otherwise only the first group member would reach that achievement
-    // TODO: where do set this instead?
-    if(!(achievement->flags & ACHIEVEMENT_FLAG_REALM_FIRST_KILL))
-        sAchievementMgr.SetRealmCompleted(achievement);
+    sAchievementMgr.SetRealmCompleted(achievement);
 
     UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_ACHIEVEMENT);
 
@@ -2117,29 +2942,29 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement)
     AchievementReward const* reward = sAchievementMgr.GetAchievementReward(achievement, GetPlayer()->getGender());
 
     // no rewards
-    if(!reward)
+    if (!reward)
         return;
 
     // titles
-    if(uint32 titleId = reward->titleId[GetPlayer()->GetTeam() == HORDE ? 1 : 0])
+    if (uint32 titleId = reward->titleId[GetPlayer()->GetTeam() == HORDE ? 1 : 0])
     {
-        if(CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId))
+        if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId))
             GetPlayer()->SetTitle(titleEntry);
     }
 
     // mail
-    if(reward->sender)
+    if (reward->sender)
     {
-        Item* item = reward->itemId ? Item::CreateItem(reward->itemId, 1, GetPlayer ()) : NULL;
+        Item* item = reward->itemId ? Item::CreateItem(reward->itemId, 1, GetPlayer()) : NULL;
 
         int loc_idx = GetPlayer()->GetSession()->GetSessionDbLocaleIndex();
 
         // subject and text
         std::string subject = reward->subject;
         std::string text = reward->text;
-        if ( loc_idx >= 0 )
+        if (loc_idx >= 0)
         {
-            if(AchievementRewardLocale const* loc = sAchievementMgr.GetAchievementRewardLocale(achievement, GetPlayer()->getGender()))
+            if (AchievementRewardLocale const* loc = sAchievementMgr.GetAchievementRewardLocale(achievement, GetPlayer()->getGender()))
             {
                 if (loc->subject.size() > size_t(loc_idx) && !loc->subject[loc_idx].empty())
                     subject = loc->subject[loc_idx];
@@ -2150,7 +2975,7 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement)
 
         MailDraft draft(subject, text);
 
-        if(item)
+        if (item)
         {
             // save new item before send
             item->SaveToDB();                               // save for prevent lost at next mail load, if send fail then item will deleted
@@ -2173,13 +2998,13 @@ void AchievementMgr::IncompletedAchievement(AchievementEntry const* achievement)
     if (itr == m_completedAchievements.end())
         return;
 
-    WorldPacket data(SMSG_ACHIEVEMENT_DELETED,4);
+    WorldPacket data(SMSG_ACHIEVEMENT_DELETED, 4);
     data << uint32(achievement->ID);
     m_player->SendDirectMessage(&data);
 
     if (!itr->second.changed)                               // complete state saved
         CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE guid = %u AND achievement = %u",
-            GetPlayer()->GetGUIDLow(), achievement->ID);
+                                   GetPlayer()->GetGUIDLow(), achievement->ID);
 
     m_completedAchievements.erase(achievement->ID);
 
@@ -2187,13 +3012,13 @@ void AchievementMgr::IncompletedAchievement(AchievementEntry const* achievement)
     AchievementReward const* reward = sAchievementMgr.GetAchievementReward(achievement, GetPlayer()->getGender());
 
     // no rewards
-    if(!reward)
+    if (!reward)
         return;
 
     // titles
-    if(uint32 titleId = reward->titleId[GetPlayer()->GetTeam() == HORDE ? 0 : 1])
+    if (uint32 titleId = reward->titleId[GetPlayer()->GetTeam() == HORDE ? 0 : 1])
     {
-        if(CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId))
+        if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId))
             GetPlayer()->SetTitle(titleEntry, true);
     }
 
@@ -2203,7 +3028,7 @@ void AchievementMgr::IncompletedAchievement(AchievementEntry const* achievement)
 void AchievementMgr::SendAllAchievementData()
 {
     // since we don't know the exact size of the packed GUIDs this is just an approximation
-    WorldPacket data(SMSG_ALL_ACHIEVEMENT_DATA, 4*2+m_completedAchievements.size()*4*2+m_completedAchievements.size()*7*4);
+    WorldPacket data(SMSG_ALL_ACHIEVEMENT_DATA, m_completedAchievements.size() * (4 + 4) + m_criteriaProgress.size() * (4 + 9 + 9 + 4 + 4 + 4 + 4));
     BuildAllDataPacket(&data);
     GetPlayer()->GetSession()->SendPacket(&data);
 }
@@ -2211,7 +3036,7 @@ void AchievementMgr::SendAllAchievementData()
 void AchievementMgr::SendRespondInspectAchievements(Player* player)
 {
     // since we don't know the exact size of the packed GUIDs this is just an approximation
-    WorldPacket data(SMSG_RESPOND_INSPECT_ACHIEVEMENTS, 4+4*2+m_completedAchievements.size()*4*2+m_completedAchievements.size()*7*4);
+    WorldPacket data(SMSG_RESPOND_INSPECT_ACHIEVEMENTS, GetPlayer()->GetPackGUID().size() + m_completedAchievements.size() * (4 + 4) + m_criteriaProgress.size() * (4 + 9 + 9 + 4 + 4 + 4 + 4));
     data << GetPlayer()->GetPackGUID();
     BuildAllDataPacket(&data);
     player->GetSession()->SendPacket(&data);
@@ -2220,23 +3045,27 @@ void AchievementMgr::SendRespondInspectAchievements(Player* player)
 /**
  * used by both SMSG_ALL_ACHIEVEMENT_DATA  and SMSG_RESPOND_INSPECT_ACHIEVEMENT
  */
-void AchievementMgr::BuildAllDataPacket(WorldPacket *data)
+void AchievementMgr::BuildAllDataPacket(WorldPacket* data)
 {
-    for(CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin(); iter!=m_completedAchievements.end(); ++iter)
+    for (CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin(); iter != m_completedAchievements.end(); ++iter)
     {
+        const AchievementEntry *achiev = sAchievementStore.LookupEntry(iter->first);
+        if(achiev->flags & ACHIEVEMENT_FLAG_HIDDEN)
+            continue;
+
         *data << uint32(iter->first);
-        *data << uint32(secsToTimeBitFields(iter->second.date));
+        data->AppendPackedTime(iter->second.date);
     }
     *data << int32(-1);
 
     time_t now = time(NULL);
-    for(CriteriaProgressMap::const_iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter)
+    for (CriteriaProgressMap::const_iterator iter = m_criteriaProgress.begin(); iter != m_criteriaProgress.end(); ++iter)
     {
         *data << uint32(iter->first);
         data->appendPackGUID(iter->second.counter);
         *data << GetPlayer()->GetPackGUID();
         *data << uint32(iter->second.timedCriteriaFailed ? 1 : 0);
-        *data << uint32(secsToTimeBitFields(now));
+        data->AppendPackedTime(now);
         *data << uint32(now - iter->second.date);
         *data << uint32(now - iter->second.date);
     }
@@ -2250,9 +3079,59 @@ AchievementCriteriaEntryList const& AchievementGlobalMgr::GetAchievementCriteria
     return m_AchievementCriteriasByType[type];
 }
 
+AchievementCriteriaEntryList const* AchievementGlobalMgr::GetAchievementCriteriaByAchievement(uint32 id)
+{
+    AchievementCriteriaListByAchievement::const_iterator itr = m_AchievementCriteriaListByAchievement.find(id);
+    return itr != m_AchievementCriteriaListByAchievement.end() ? &itr->second : NULL;
+}
+
+AchievementEntryList const* AchievementGlobalMgr::GetAchievementByReferencedId(uint32 id) const
+{
+    AchievementListByReferencedId::const_iterator itr = m_AchievementListByReferencedId.find(id);
+    return itr != m_AchievementListByReferencedId.end() ? &itr->second : NULL;
+}
+
+AchievementReward const* AchievementGlobalMgr::GetAchievementReward(AchievementEntry const* achievement, uint8 gender) const
+{
+    AchievementRewardsMapBounds bounds = m_achievementRewards.equal_range(achievement->ID);
+    for (AchievementRewardsMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+        if (iter->second.gender == GENDER_NONE || uint8(iter->second.gender) == gender)
+            return &iter->second;
+
+    return NULL;
+}
+
+AchievementRewardLocale const* AchievementGlobalMgr::GetAchievementRewardLocale(AchievementEntry const* achievement, uint8 gender) const
+{
+    AchievementRewardLocalesMapBounds bounds = m_achievementRewardLocales.equal_range(achievement->ID);
+    for (AchievementRewardLocalesMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+        if (iter->second.gender == GENDER_NONE || uint8(iter->second.gender) == gender)
+            return &iter->second;
+
+    return NULL;
+}
+
+AchievementCriteriaRequirementSet const* AchievementGlobalMgr::GetCriteriaRequirementSet(AchievementCriteriaEntry const* achievementCriteria)
+{
+    AchievementCriteriaRequirementMap::const_iterator iter = m_criteriaRequirementMap.find(achievementCriteria->ID);
+    return iter != m_criteriaRequirementMap.end() ? &iter->second : NULL;
+}
+
+bool AchievementGlobalMgr::IsRealmCompleted(AchievementEntry const* achievement) const
+{
+    AllCompletedAchievements::const_iterator itr = m_allCompletedAchievements.find(achievement->ID);
+    return itr != m_allCompletedAchievements.end() && time_t(itr->second + 2) < time(NULL);
+}
+
+void AchievementGlobalMgr::SetRealmCompleted(AchievementEntry const* achievement)
+{
+    if (m_allCompletedAchievements.find(achievement->ID) == m_allCompletedAchievements.end())
+        m_allCompletedAchievements[achievement->ID] = time(NULL);
+}
+
 void AchievementGlobalMgr::LoadAchievementCriteriaList()
 {
-    if (sAchievementCriteriaStore.GetNumRows()==0)
+    if (sAchievementCriteriaStore.GetNumRows() == 0)
     {
         BarGoLink bar(1);
         bar.step();
@@ -2294,7 +3173,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList()
 
 void AchievementGlobalMgr::LoadAchievementReferenceList()
 {
-    if(sAchievementStore.GetNumRows()==0)
+    if (sAchievementStore.GetNumRows() == 0)
     {
         BarGoLink bar(1);
         bar.step();
@@ -2335,7 +3214,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaRequirements()
 {
     m_criteriaRequirementMap.clear();                       // need for reload case
 
-    QueryResult *result = WorldDatabase.Query("SELECT criteria_id, type, value1, value2 FROM achievement_criteria_requirement");
+    QueryResult* result = WorldDatabase.Query("SELECT criteria_id, type, value1, value2 FROM achievement_criteria_requirement");
 
     if (!result)
     {
@@ -2353,18 +3232,18 @@ void AchievementGlobalMgr::LoadAchievementCriteriaRequirements()
     do
     {
         bar.step();
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         uint32 criteria_id = fields[0].GetUInt32();
 
         AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(criteria_id);
 
         if (!criteria)
         {
-            sLog.outErrorDb( "Table `achievement_criteria_requirement`.`criteria_id` %u does not exist, ignoring.", criteria_id);
+            sLog.outErrorDb("Table `achievement_criteria_requirement`.`criteria_id` %u does not exist, ignoring.", criteria_id);
             continue;
         }
 
-        AchievementCriteriaRequirement data(fields[1].GetUInt32(),fields[2].GetUInt32(),fields[3].GetUInt32());
+        AchievementCriteriaRequirement data(fields[1].GetUInt32(), fields[2].GetUInt32(), fields[3].GetUInt32());
 
         if (!data.IsValid(criteria))
         {
@@ -2385,7 +3264,8 @@ void AchievementGlobalMgr::LoadAchievementCriteriaRequirements()
 
         // counting requirements
         ++count;
-    } while(result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -2393,13 +3273,13 @@ void AchievementGlobalMgr::LoadAchievementCriteriaRequirements()
     for (uint32 entryId = 0; entryId < sAchievementCriteriaStore.GetNumRows(); ++entryId)
     {
         AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(entryId);
-        if(!criteria)
+        if (!criteria)
             continue;
 
-        switch(criteria->requiredType)
+        switch (criteria->requiredType)
         {
             case ACHIEVEMENT_CRITERIA_TYPE_WIN_BG:
-                if(!criteria->win_bg.additionalRequirement1_type && !criteria->win_bg.additionalRequirement2_type)
+                if (!criteria->win_bg.additionalRequirement1_type && !criteria->win_bg.additionalRequirement2_type)
                     continue;
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE:
@@ -2410,43 +3290,46 @@ void AchievementGlobalMgr::LoadAchievementCriteriaRequirements()
                 // Checked in LoadAchievementCriteriaList
 
                 // exist many achievements with this criteria, use at this moment hardcoded check to skil simple case
-                switch(achievement->ID)
+                switch (achievement->ID)
                 {
                     case 31:
-                    //case 1275: // these timed achievements are "started" on Quest Accept, and simple ended on quest-complete
-                    //case 1276:
-                    //case 1277:
+                        // case 1275: // these timed achievements are "started" on Quest Accept, and simple ended on quest-complete
+                        // case 1276:
+                        // case 1277:
                     case 1282:
                     case 1789:
                         break;
                     default:
                         continue;
                 }
+                break;
             }
             case ACHIEVEMENT_CRITERIA_TYPE_FALL_WITHOUT_DYING:
                 break;                                      // any cases
             case ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL:      // any cases
                 break;
+            case ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA:
+                break;
             case ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA: // need skip generic cases
-                if(criteria->win_rated_arena.flag!=ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE)
+                if (criteria->win_rated_arena.flag != ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE)
                     continue;
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM: // any cases
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE:        // need skip generic cases
-                if(criteria->do_emote.count==0)
+                if (criteria->do_emote.count == 0)
                     continue;
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL:// any cases
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_WIN_DUEL:        // skip statistics
-                if(criteria->win_duel.duelCount==0)
+                if (criteria->win_duel.duelCount == 0)
                     continue;
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL2:     // any cases
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE:       // need skip generic cases
-                if(criteria->loot_type.lootTypeCount!=1)
+                if (criteria->loot_type.lootTypeCount != 1)
                     continue;
                 break;
             default:                                        // type not use DB data, ignore
@@ -2458,12 +3341,12 @@ void AchievementGlobalMgr::LoadAchievementCriteriaRequirements()
     }
 
     sLog.outString();
-    sLog.outString(">> Loaded %u additional achievement criteria data (%u disabled).",count,disabled_count);
+    sLog.outString(">> Loaded %u additional achievement criteria data (%u disabled).", count, disabled_count);
 }
 
 void AchievementGlobalMgr::LoadCompletedAchievements()
 {
-    QueryResult *result = CharacterDatabase.Query("SELECT achievement FROM character_achievement GROUP BY achievement");
+    QueryResult* result = CharacterDatabase.Query("SELECT `achievement`, `date` FROM `character_achievement` GROUP BY `achievement`");
 
     if (!result)
     {
@@ -2479,24 +3362,25 @@ void AchievementGlobalMgr::LoadCompletedAchievements()
     do
     {
         bar.step();
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
 
         uint32 achievement_id = fields[0].GetUInt32();
         if (!sAchievementStore.LookupEntry(achievement_id))
         {
             // we will remove nonexistent achievement for all characters
-            sLog.outError("Nonexistent achievement %u data removed from table `character_achievement`.",achievement_id);
-            CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE achievement = %u",achievement_id);
+            sLog.outError("Nonexistent achievement %u data removed from table `character_achievement`.", achievement_id);
+            CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE achievement = %u", achievement_id);
             continue;
         }
 
-        m_allCompletedAchievements.insert(achievement_id);
-    } while(result->NextRow());
+        m_allCompletedAchievements[achievement_id] = time_t(fields[1].GetUInt64());
+    }
+    while (result->NextRow());
 
     delete result;
 
     sLog.outString();
-    sLog.outString(">> Loaded %lu realm completed achievements.",(unsigned long)m_allCompletedAchievements.size());
+    sLog.outString(">> Loaded %lu realm completed achievements.", (unsigned long)m_allCompletedAchievements.size());
 }
 
 void AchievementGlobalMgr::LoadRewards()
@@ -2504,7 +3388,7 @@ void AchievementGlobalMgr::LoadRewards()
     m_achievementRewards.clear();                           // need for reload case
 
     //                                                0      1       2        3        4     5       6        7
-    QueryResult *result = WorldDatabase.Query("SELECT entry, gender, title_A, title_H, item, sender, subject, text FROM achievement_reward");
+    QueryResult* result = WorldDatabase.Query("SELECT entry, gender, title_A, title_H, item, sender, subject, text FROM achievement_reward");
 
     if (!result)
     {
@@ -2524,11 +3408,11 @@ void AchievementGlobalMgr::LoadRewards()
     {
         bar.step();
 
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         uint32 entry = fields[0].GetUInt32();
         if (!sAchievementStore.LookupEntry(entry))
         {
-            sLog.outErrorDb( "Table `achievement_reward` has wrong achievement (Entry: %u), ignore", entry);
+            sLog.outErrorDb("Table `achievement_reward` has wrong achievement (Entry: %u), ignore", entry);
             continue;
         }
 
@@ -2542,7 +3426,7 @@ void AchievementGlobalMgr::LoadRewards()
         reward.text       = fields[7].GetCppString();
 
         if (reward.gender >= MAX_GENDER)
-            sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) has wrong gender %u.", entry, reward.gender);
+            sLog.outErrorDb("Table `achievement_reward` (Entry: %u) has wrong gender %u.", entry, reward.gender);
 
         // GENDER_NONE must be single (so or already in and none must be attempt added new data or just adding and none in)
         // other duplicate cases prevented by DB primary key
@@ -2553,20 +3437,20 @@ void AchievementGlobalMgr::LoadRewards()
             if (iter->second.gender == GENDER_NONE || reward.gender == GENDER_NONE)
             {
                 dup = true;
-                sLog.outErrorDb( "Table `achievement_reward` must have single GENDER_NONE (%u) case (Entry: %u), ignore duplicate case", GENDER_NONE, entry);
+                sLog.outErrorDb("Table `achievement_reward` must have single GENDER_NONE (%u) case (Entry: %u), ignore duplicate case", GENDER_NONE, entry);
                 break;
             }
         }
         if (dup)
             continue;
 
-        if ((reward.titleId[0]==0)!=(reward.titleId[1]==0))
-            sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) has title (A: %u H: %u) only for one from teams.", entry, reward.titleId[0], reward.titleId[1]);
+        if ((reward.titleId[0] == 0) != (reward.titleId[1] == 0))
+            sLog.outErrorDb("Table `achievement_reward` (Entry: %u) has title (A: %u H: %u) only for one from teams.", entry, reward.titleId[0], reward.titleId[1]);
 
         // must be title or mail at least
         if (!reward.titleId[0] && !reward.titleId[1] && !reward.sender)
         {
-            sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) not have title or item reward data, ignore.", entry);
+            sLog.outErrorDb("Table `achievement_reward` (Entry: %u) not have title or item reward data, ignore.", entry);
             continue;
         }
 
@@ -2575,7 +3459,7 @@ void AchievementGlobalMgr::LoadRewards()
             CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(reward.titleId[0]);
             if (!titleEntry)
             {
-                sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) has invalid title id (%u) in `title_A`, set to 0", entry, reward.titleId[0]);
+                sLog.outErrorDb("Table `achievement_reward` (Entry: %u) has invalid title id (%u) in `title_A`, set to 0", entry, reward.titleId[0]);
                 reward.titleId[0] = 0;
             }
         }
@@ -2585,37 +3469,37 @@ void AchievementGlobalMgr::LoadRewards()
             CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(reward.titleId[1]);
             if (!titleEntry)
             {
-                sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) has invalid title id (%u) in `title_A`, set to 0", entry, reward.titleId[1]);
+                sLog.outErrorDb("Table `achievement_reward` (Entry: %u) has invalid title id (%u) in `title_A`, set to 0", entry, reward.titleId[1]);
                 reward.titleId[1] = 0;
             }
         }
 
-        //check mail data before item for report including wrong item case
+        // check mail data before item for report including wrong item case
         if (reward.sender)
         {
             if (!ObjectMgr::GetCreatureTemplate(reward.sender))
             {
-                sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) has invalid creature entry %u as sender, mail reward skipped.", entry, reward.sender);
+                sLog.outErrorDb("Table `achievement_reward` (Entry: %u) has invalid creature entry %u as sender, mail reward skipped.", entry, reward.sender);
                 reward.sender = 0;
             }
         }
         else
         {
             if (reward.itemId)
-                sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) not have sender data but have item reward, item will not rewarded", entry);
+                sLog.outErrorDb("Table `achievement_reward` (Entry: %u) not have sender data but have item reward, item will not rewarded", entry);
 
             if (!reward.subject.empty())
-                sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) not have sender data but have mail subject.", entry);
+                sLog.outErrorDb("Table `achievement_reward` (Entry: %u) not have sender data but have mail subject.", entry);
 
             if (!reward.text.empty())
-                sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) not have sender data but have mail text.", entry);
+                sLog.outErrorDb("Table `achievement_reward` (Entry: %u) not have sender data but have mail text.", entry);
         }
 
         if (reward.itemId)
         {
             if (!ObjectMgr::GetItemPrototype(reward.itemId))
             {
-                sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) has invalid item id %u, reward mail will be without item.", entry, reward.itemId);
+                sLog.outErrorDb("Table `achievement_reward` (Entry: %u) has invalid item id %u, reward mail will be without item.", entry, reward.itemId);
                 reward.itemId = 0;
             }
         }
@@ -2623,19 +3507,20 @@ void AchievementGlobalMgr::LoadRewards()
         m_achievementRewards.insert(AchievementRewardsMap::value_type(entry, reward));
         ++count;
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
     sLog.outString();
-    sLog.outString( ">> Loaded %u achievement rewards", count );
+    sLog.outString(">> Loaded %u achievement rewards", count);
 }
 
 void AchievementGlobalMgr::LoadRewardLocales()
 {
-    m_achievementRewardLocales.clear();                       // need for reload case
+    m_achievementRewardLocales.clear();                     // need for reload case
 
-    QueryResult *result = WorldDatabase.Query("SELECT entry,gender,subject_loc1,text_loc1,subject_loc2,text_loc2,subject_loc3,text_loc3,subject_loc4,text_loc4,subject_loc5,text_loc5,subject_loc6,text_loc6,subject_loc7,text_loc7,subject_loc8,text_loc8 FROM locales_achievement_reward");
+    QueryResult* result = WorldDatabase.Query("SELECT entry,gender,subject_loc1,text_loc1,subject_loc2,text_loc2,subject_loc3,text_loc3,subject_loc4,text_loc4,subject_loc5,text_loc5,subject_loc6,text_loc6,subject_loc7,text_loc7,subject_loc8,text_loc8 FROM locales_achievement_reward");
 
     if (!result)
     {
@@ -2652,14 +3537,14 @@ void AchievementGlobalMgr::LoadRewardLocales()
 
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         bar.step();
 
         uint32 entry = fields[0].GetUInt32();
 
-        if (m_achievementRewards.find(entry)==m_achievementRewards.end())
+        if (m_achievementRewards.find(entry) == m_achievementRewards.end())
         {
-            sLog.outErrorDb( "Table `locales_achievement_reward` (Entry: %u) has locale strings for nonexistent achievement reward .", entry);
+            sLog.outErrorDb("Table `locales_achievement_reward` (Entry: %u) has locale strings for nonexistent achievement reward .", entry);
             continue;
         }
 
@@ -2668,7 +3553,7 @@ void AchievementGlobalMgr::LoadRewardLocales()
         data.gender = Gender(fields[1].GetUInt8());
 
         if (data.gender >= MAX_GENDER)
-            sLog.outErrorDb( "Table `locales_achievement_reward` (Entry: %u) has wrong gender %u.", entry, data.gender);
+            sLog.outErrorDb("Table `locales_achievement_reward` (Entry: %u) has wrong gender %u.", entry, data.gender);
 
         // GENDER_NONE must be single (so or already in and none must be attempt added new data or just adding and none in)
         // other duplicate cases prevented by DB primary key
@@ -2679,35 +3564,35 @@ void AchievementGlobalMgr::LoadRewardLocales()
             if (iter->second.gender == GENDER_NONE || data.gender == GENDER_NONE)
             {
                 dup = true;
-                sLog.outErrorDb( "Table `locales_achievement_reward` must have single GENDER_NONE (%u) case (Entry: %u), ignore duplicate case", GENDER_NONE, entry);
+                sLog.outErrorDb("Table `locales_achievement_reward` must have single GENDER_NONE (%u) case (Entry: %u), ignore duplicate case", GENDER_NONE, entry);
                 break;
             }
         }
         if (dup)
             continue;
 
-        for(int i = 1; i < MAX_LOCALE; ++i)
+        for (int i = 1; i < MAX_LOCALE; ++i)
         {
-            std::string str = fields[2+2*(i-1)].GetCppString();
-            if(!str.empty())
+            std::string str = fields[2 + 2 * (i - 1)].GetCppString();
+            if (!str.empty())
             {
                 int idx = sObjectMgr.GetOrNewIndexForLocale(LocaleConstant(i));
-                if(idx >= 0)
+                if (idx >= 0)
                 {
-                    if(data.subject.size() <= size_t(idx))
-                        data.subject.resize(idx+1);
+                    if (data.subject.size() <= size_t(idx))
+                        data.subject.resize(idx + 1);
 
                     data.subject[idx] = str;
                 }
             }
-            str = fields[2+2*(i-1)+1].GetCppString();
-            if(!str.empty())
+            str = fields[2 + 2 * (i - 1) + 1].GetCppString();
+            if (!str.empty())
             {
                 int idx = sObjectMgr.GetOrNewIndexForLocale(LocaleConstant(i));
-                if(idx >= 0)
+                if (idx >= 0)
                 {
-                    if(data.text.size() <= size_t(idx))
-                        data.text.resize(idx+1);
+                    if (data.text.size() <= size_t(idx))
+                        data.text.resize(idx + 1);
 
                     data.text[idx] = str;
                 }
@@ -2716,10 +3601,11 @@ void AchievementGlobalMgr::LoadRewardLocales()
 
         m_achievementRewardLocales.insert(AchievementRewardLocalesMap::value_type(entry, data));
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
     sLog.outString();
-    sLog.outString( ">> Loaded %lu achievement reward locale strings", (unsigned long)m_achievementRewardLocales.size() );
+    sLog.outString(">> Loaded %lu achievement reward locale strings", (unsigned long)m_achievementRewardLocales.size());
 }
diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h
index f18a0ade911..92207ac2751 100644
--- a/src/game/AchievementMgr.h
+++ b/src/game/AchievementMgr.h
@@ -22,19 +22,21 @@
 #include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCEnums.h"
-#include "DBCStores.h"
 #include "SharedDefines.h"
 #include "ObjectGuid.h"
 
 #include <map>
 #include <string>
 
+struct AchievementEntry;
+struct AchievementCriteriaEntry;
+
 typedef std::list<AchievementCriteriaEntry const*> AchievementCriteriaEntryList;
 typedef std::list<AchievementEntry const*>         AchievementEntryList;
 
-typedef std::map<uint32,AchievementCriteriaEntryList> AchievementCriteriaListByAchievement;
-typedef std::map<uint32,AchievementEntryList>         AchievementListByReferencedId;
-typedef std::map<uint32,time_t>                       AchievementCriteriaFailTimeMap;
+typedef UNORDERED_MAP<uint32, AchievementCriteriaEntryList> AchievementCriteriaListByAchievement;
+typedef UNORDERED_MAP<uint32, AchievementEntryList>         AchievementListByReferencedId;
+typedef UNORDERED_MAP<uint32, time_t>                       AchievementCriteriaFailTimeMap;
 
 struct CriteriaProgress
 {
@@ -49,7 +51,7 @@ enum AchievementCriteriaRequirementType
     ACHIEVEMENT_CRITERIA_REQUIRE_NONE                = 0,   // 0              0
     ACHIEVEMENT_CRITERIA_REQUIRE_T_CREATURE          = 1,   // creature_id    0
     ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_CLASS_RACE = 2,   // class_id       race_id
-    ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_LESS_HEALTH= 3,   // health_percent 0
+    ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_LESS_HEALTH = 3,  // health_percent 0
     ACHIEVEMENT_CRITERIA_REQUIRE_T_PLAYER_DEAD       = 4,   // own_team       0             not corpse (not released body), own_team==false if enemy team expected
     ACHIEVEMENT_CRITERIA_REQUIRE_S_AURA              = 5,   // spell_id       effect_idx
     ACHIEVEMENT_CRITERIA_REQUIRE_S_AREA              = 6,   // area id        0
@@ -213,7 +215,7 @@ struct AchievementCriteriaRequirementSet
         Storage storage;
 };
 
-typedef std::map<uint32,AchievementCriteriaRequirementSet> AchievementCriteriaRequirementMap;
+typedef UNORDERED_MAP<uint32, AchievementCriteriaRequirementSet> AchievementCriteriaRequirementMap;
 
 struct AchievementReward
 {
@@ -259,12 +261,12 @@ class AchievementMgr
 
         void Reset();
         static void DeleteFromDB(ObjectGuid guid);
-        void LoadFromDB(QueryResult *achievementResult, QueryResult *criteriaResult);
+        void LoadFromDB(QueryResult* achievementResult, QueryResult* criteriaResult);
         void SaveToDB();
-        void ResetAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1=0, uint32 miscvalue2=0);
+        void ResetAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1 = 0, uint32 miscvalue2 = 0);
         void StartTimedAchievementCriteria(AchievementCriteriaTypes type, uint32 timedRequirementId, time_t startTime = 0);
         void DoFailedTimedAchievementCriterias();
-        void UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1=0, uint32 miscvalue2=0, Unit *unit=NULL, uint32 time=0);
+        void UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1 = 0, uint32 miscvalue2 = 0, Unit* unit = NULL, uint32 time = 0);
         void CheckAllAchievementCriteria();
         void SendAllAchievementData();
         void SendRespondInspectAchievements(Player* player);
@@ -281,27 +283,22 @@ class AchievementMgr
         CompletedAchievementMap const& GetCompletedAchievements() const { return m_completedAchievements; }
         bool IsCompletedCriteria(AchievementCriteriaEntry const* criteria, AchievementEntry const* achievement) const;
 
-        uint32 GetCriteriaProgressCounter(AchievementCriteriaEntry const* entry) const
-        {
-            CriteriaProgressMap::const_iterator iter = m_criteriaProgress.find(entry->ID);
-            return iter != m_criteriaProgress.end() ? iter->second.counter : 0;
-        }
-
+        uint32 GetCriteriaProgressCounter(AchievementCriteriaEntry const* entry) const;
         static uint32 GetCriteriaProgressMaxCounter(AchievementCriteriaEntry const* entry, AchievementEntry const* achievement);
 
         // Use PROGRESS_SET only for reset/downgrade criteria progress
         enum ProgressType { PROGRESS_SET, PROGRESS_ACCUMULATE, PROGRESS_HIGHEST };
         void SetCriteriaProgress(AchievementCriteriaEntry const* criteria, AchievementEntry const* achievement, uint32 changeValue, ProgressType ptype);
+        void CompletedAchievement(AchievementEntry const* entry);
+        bool IsCompletedAchievement(AchievementEntry const* entry);
 
     private:
         void SendAchievementEarned(AchievementEntry const* achievement);
         void SendCriteriaUpdate(uint32 id, CriteriaProgress const* progress);
         void CompletedCriteriaFor(AchievementEntry const* achievement);
-        void CompletedAchievement(AchievementEntry const* entry);
         void IncompletedAchievement(AchievementEntry const* entry);
-        bool IsCompletedAchievement(AchievementEntry const* entry);
         void CompleteAchievementsWithRefs(AchievementEntry const* entry);
-        void BuildAllDataPacket(WorldPacket *data);
+        void BuildAllDataPacket(WorldPacket* data);
 
         Player* m_player;
         CriteriaProgressMap m_criteriaProgress;
@@ -313,53 +310,14 @@ class AchievementGlobalMgr
 {
     public:
         AchievementCriteriaEntryList const& GetAchievementCriteriaByType(AchievementCriteriaTypes type);
-        AchievementCriteriaEntryList const* GetAchievementCriteriaByAchievement(uint32 id)
-        {
-            AchievementCriteriaListByAchievement::const_iterator itr = m_AchievementCriteriaListByAchievement.find(id);
-            return itr != m_AchievementCriteriaListByAchievement.end() ? &itr->second : NULL;
-        }
-
-        AchievementEntryList const* GetAchievementByReferencedId(uint32 id) const
-        {
-            AchievementListByReferencedId::const_iterator itr = m_AchievementListByReferencedId.find(id);
-            return itr != m_AchievementListByReferencedId.end() ? &itr->second : NULL;
-        }
-
-        AchievementReward const* GetAchievementReward(AchievementEntry const* achievement, uint8 gender) const
-        {
-            AchievementRewardsMapBounds bounds = m_achievementRewards.equal_range(achievement->ID);
-            for (AchievementRewardsMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
-                if(iter->second.gender == GENDER_NONE || uint8(iter->second.gender) == gender)
-                    return &iter->second;
+        AchievementCriteriaEntryList const* GetAchievementCriteriaByAchievement(uint32 id);
+        AchievementEntryList const* GetAchievementByReferencedId(uint32 id) const;
+        AchievementReward const* GetAchievementReward(AchievementEntry const* achievement, uint8 gender) const;
+        AchievementRewardLocale const* GetAchievementRewardLocale(AchievementEntry const* achievement, uint8 gender) const;
+        AchievementCriteriaRequirementSet const* GetCriteriaRequirementSet(AchievementCriteriaEntry const* achievementCriteria);
 
-            return NULL;
-        }
-
-        AchievementRewardLocale const* GetAchievementRewardLocale(AchievementEntry const* achievement, uint8 gender) const
-        {
-            AchievementRewardLocalesMapBounds bounds = m_achievementRewardLocales.equal_range(achievement->ID);
-            for (AchievementRewardLocalesMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
-                if(iter->second.gender == GENDER_NONE || uint8(iter->second.gender) == gender)
-                    return &iter->second;
-
-            return NULL;
-        }
-
-        AchievementCriteriaRequirementSet const* GetCriteriaRequirementSet(AchievementCriteriaEntry const *achievementCriteria)
-        {
-            AchievementCriteriaRequirementMap::const_iterator iter = m_criteriaRequirementMap.find(achievementCriteria->ID);
-            return iter!=m_criteriaRequirementMap.end() ? &iter->second : NULL;
-        }
-
-        bool IsRealmCompleted(AchievementEntry const* achievement) const
-        {
-            return m_allCompletedAchievements.find(achievement->ID) != m_allCompletedAchievements.end();
-        }
-
-        void SetRealmCompleted(AchievementEntry const* achievement)
-        {
-            m_allCompletedAchievements.insert(achievement->ID);
-        }
+        bool IsRealmCompleted(AchievementEntry const* achievement) const;
+        void SetRealmCompleted(AchievementEntry const* achievement);
 
         void LoadAchievementCriteriaList();
         void LoadAchievementCriteriaRequirements();
@@ -367,6 +325,7 @@ class AchievementGlobalMgr
         void LoadCompletedAchievements();
         void LoadRewards();
         void LoadRewardLocales();
+
     private:
         AchievementCriteriaRequirementMap m_criteriaRequirementMap;
 
@@ -377,7 +336,7 @@ class AchievementGlobalMgr
         // store achievements by referenced achievement id to speed up lookup
         AchievementListByReferencedId m_AchievementListByReferencedId;
 
-        typedef std::set<uint32> AllCompletedAchievements;
+        typedef UNORDERED_MAP<uint32, time_t> AllCompletedAchievements;
         AllCompletedAchievements m_allCompletedAchievements;
 
         AchievementRewardsMap       m_achievementRewards;
diff --git a/src/game/AggressorAI.cpp b/src/game/AggressorAI.cpp
index 9f6e874408d..4f03eccd921 100644
--- a/src/game/AggressorAI.cpp
+++ b/src/game/AggressorAI.cpp
@@ -28,38 +28,37 @@
 #include <list>
 
 int
-AggressorAI::Permissible(const Creature *creature)
+AggressorAI::Permissible(const Creature* creature)
 {
     // have some hostile factions, it will be selected by IsHostileTo check at MoveInLineOfSight
-    if( !creature->IsCivilian() && !creature->IsNeutralToAll() )
+    if (!creature->IsCivilian() && !creature->IsNeutralToAll())
         return PERMIT_BASE_PROACTIVE;
 
     return PERMIT_BASE_NO;
 }
 
-AggressorAI::AggressorAI(Creature *c) : CreatureAI(c), i_state(STATE_NORMAL), i_tracker(TIME_INTERVAL_LOOK)
+AggressorAI::AggressorAI(Creature* c) : CreatureAI(c), i_state(STATE_NORMAL), i_tracker(TIME_INTERVAL_LOOK)
 {
 }
 
 void
-AggressorAI::MoveInLineOfSight(Unit *u)
+AggressorAI::MoveInLineOfSight(Unit* u)
 {
     // Ignore Z for flying creatures
-    if( !m_creature->CanFly() && m_creature->GetDistanceZ(u) > CREATURE_Z_ATTACK_RANGE )
+    if (!m_creature->CanFly() && m_creature->GetDistanceZ(u) > CREATURE_Z_ATTACK_RANGE)
         return;
 
     if (m_creature->CanInitiateAttack() && u->isTargetableForAttack() &&
-        m_creature->IsHostileTo(u) && u->isInAccessablePlaceFor(m_creature))
+            m_creature->IsHostileTo(u) && u->isInAccessablePlaceFor(m_creature))
     {
         float attackRadius = m_creature->GetAttackDistance(u);
-        if(m_creature->IsWithinDistInMap(u, attackRadius) && m_creature->IsWithinLOSInMap(u) )
+        if (m_creature->IsWithinDistInMap(u, attackRadius) && m_creature->IsWithinLOSInMap(u))
         {
-            if(!m_creature->getVictim())
+            if (!m_creature->getVictim())
             {
                 AttackStart(u);
-                u->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
             }
-            else if(sMapStore.LookupEntry(m_creature->GetMapId())->IsDungeon())
+            else if (sMapStore.LookupEntry(m_creature->GetMapId())->IsDungeon())
             {
                 m_creature->AddThreat(u);
                 u->SetInCombatWith(m_creature);
@@ -100,17 +99,19 @@ void AggressorAI::EnterEvadeMode()
     else
     {
         DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Creature stopped attacking, victim out run him [guid=%u]", m_creature->GetGUIDLow());
-        //i_state = STATE_LOOK_AT_VICTIM;
-        //i_tracker.Reset(TIME_INTERVAL_LOOK);
+        // i_state = STATE_LOOK_AT_VICTIM;
+        // i_tracker.Reset(TIME_INTERVAL_LOOK);
     }
 
     if (!m_creature->isCharmed())
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
 
         // Remove ChaseMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead
-        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
-            m_creature->GetMotionMaster()->MoveTargetedHome();
+        if (m_creature->IsInUnitState(UNIT_ACTION_CHASE))
+            m_creature->GetUnitStateMgr().DropAction(UNIT_ACTION_CHASE);
+
+        m_creature->GetMotionMaster()->MoveTargetedHome();
     }
 
     m_creature->DeleteThreatList();
@@ -123,7 +124,7 @@ void
 AggressorAI::UpdateAI(const uint32 /*diff*/)
 {
     // update i_victimGuid if m_creature->getVictim() !=0 and changed
-    if(!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+    if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
         return;
 
     i_victimGuid = m_creature->getVictim()->GetObjectGuid();
@@ -132,19 +133,19 @@ AggressorAI::UpdateAI(const uint32 /*diff*/)
 }
 
 bool
-AggressorAI::IsVisible(Unit *pl) const
+AggressorAI::IsVisible(Unit* pl) const
 {
-    return m_creature->IsWithinDist(pl,sWorld.getConfig(CONFIG_FLOAT_SIGHT_MONSTER))
-        && pl->isVisibleForOrDetect(m_creature,m_creature,true);
+    return m_creature->IsWithinDist(pl, sWorld.getConfig(CONFIG_FLOAT_SIGHT_MONSTER))
+           && pl->isVisibleForOrDetect(m_creature, m_creature, true);
 }
 
 void
-AggressorAI::AttackStart(Unit *u)
+AggressorAI::AttackStart(Unit* u)
 {
-    if( !u )
+    if (!u)
         return;
 
-    if(m_creature->Attack(u,true))
+    if (m_creature->Attack(u, true))
     {
         i_victimGuid = u->GetObjectGuid();
 
@@ -152,6 +153,6 @@ AggressorAI::AttackStart(Unit *u)
         m_creature->SetInCombatWith(u);
         u->SetInCombatWith(m_creature);
 
-        m_creature->GetMotionMaster()->MoveChase(u);
+        HandleMovementOnAttackStart(u);
     }
 }
diff --git a/src/game/AggressorAI.h b/src/game/AggressorAI.h
index beefeed0d4a..96b290588e9 100644
--- a/src/game/AggressorAI.h
+++ b/src/game/AggressorAI.h
@@ -27,23 +27,23 @@ class Creature;
 
 class MANGOS_DLL_DECL AggressorAI : public CreatureAI
 {
-    enum AggressorState
-    {
-        STATE_NORMAL = 1,
-        STATE_LOOK_AT_VICTIM = 2
-    };
+        enum AggressorState
+        {
+            STATE_NORMAL = 1,
+            STATE_LOOK_AT_VICTIM = 2
+        };
 
     public:
 
-        explicit AggressorAI(Creature *c);
+        explicit AggressorAI(Creature* c);
 
-        void MoveInLineOfSight(Unit *);
-        void AttackStart(Unit *);
+        void MoveInLineOfSight(Unit*);
+        void AttackStart(Unit*);
         void EnterEvadeMode();
-        bool IsVisible(Unit *) const;
+        bool IsVisible(Unit*) const;
 
         void UpdateAI(const uint32);
-        static int Permissible(const Creature *);
+        static int Permissible(const Creature*);
 
     private:
         ObjectGuid i_victimGuid;
diff --git a/src/game/AntiCheat.cpp b/src/game/AntiCheat.cpp
new file mode 100644
index 00000000000..7a722b0d953
--- /dev/null
+++ b/src/game/AntiCheat.cpp
@@ -0,0 +1,1086 @@
+/*
+ * Copyright (C) 2010-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ * based on Xeross code
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "revision.h"
+#include "Language.h"
+#include "Player.h"
+#include "ObjectMgr.h"
+#include "SpellMgr.h"
+#include "warden/WardenWin.h"
+#include "warden/WardenMac.h"
+#include "World.h"
+
+#define ANTICHEAT_DEFAULT_DELTA 2000
+
+static AntiCheatCheckEntry AntiCheatCheckList[] =
+{
+// Checks
+    { true,  CHECK_NULL,                    &AntiCheat::CheckNull          },
+    { true,  CHECK_MOVEMENT,                &AntiCheat::CheckMovement      },
+    { true,  CHECK_SPELL,                   &AntiCheat::CheckSpell         },
+    { true,  CHECK_QUEST,                   &AntiCheat::CheckQuest         },
+    { true,  CHECK_TRANSPORT,               &AntiCheat::CheckOnTransport   },
+    { true,  CHECK_DAMAGE,                  &AntiCheat::CheckDamage        },
+    { true,  CHECK_ITEM,                    &AntiCheat::CheckItem          },
+    { true,  CHECK_WARDEN,                  &AntiCheat::CheckWarden        },
+// Subchecks
+    { true,  CHECK_MOVEMENT_SPEED,          &AntiCheat::CheckSpeed         },
+    { true,  CHECK_MOVEMENT_FLY,            &AntiCheat::CheckFly           },
+    { true,  CHECK_MOVEMENT_MOUNTAIN,       &AntiCheat::CheckMountain      },
+    { true,  CHECK_MOVEMENT_WATERWALKING,   &AntiCheat::CheckWaterWalking  },
+    { true,  CHECK_MOVEMENT_TP2PLANE,       &AntiCheat::CheckTp2Plane      },
+    { true,  CHECK_MOVEMENT_AIRJUMP,        &AntiCheat::CheckAirJump       },
+    { true,  CHECK_MOVEMENT_TELEPORT,       &AntiCheat::CheckTeleport      },
+    { true,  CHECK_MOVEMENT_FALL,           &AntiCheat::CheckFall          },
+    { true,  CHECK_MOVEMENT_ZAXIS,          &AntiCheat::CheckZAxis         },
+    { true,  CHECK_DAMAGE_SPELL,            &AntiCheat::CheckSpellDamage   },
+    { true,  CHECK_DAMAGE_MELEE,            &AntiCheat::CheckMeleeDamage   },
+    { true,  CHECK_SPELL_VALID,             &AntiCheat::CheckSpellValid    },
+    { true,  CHECK_SPELL_ONDEATH,           &AntiCheat::CheckSpellOndeath  },
+    { true,  CHECK_SPELL_FAMILY,            &AntiCheat::CheckSpellFamily   },
+    { true,  CHECK_SPELL_INBOOK,            &AntiCheat::CheckSpellInbook   },
+    { true,  CHECK_ITEM_UPDATE,             &AntiCheat::CheckItemUpdate    },
+    { true,  CHECK_WARDEN_KEY,              &AntiCheat::CheckWardenKey     },
+    { true,  CHECK_WARDEN_CHECKSUM,         &AntiCheat::CheckWardenCheckSum},
+    { true,  CHECK_WARDEN_MEMORY,           &AntiCheat::CheckWardenMemory  },
+    { true,  CHECK_WARDEN_TIMEOUT,          &AntiCheat::CheckWardenTimeOut },
+    // Finish for search
+    { false, CHECK_MAX,                     NULL }
+};
+
+
+AntiCheat::AntiCheat(Player* player)
+{
+    m_player              = player;
+    m_MovedLen            = 0.0f;
+    m_isFall              = false;
+    m_isActiveMover       = true;
+    //
+    m_currentmovementInfo = NULL;
+    m_currentMover        = ((Unit*)player);
+    m_currentspellID      = 0;
+    m_currentOpcode       = 0;
+    m_currentConfig       = NULL;
+    m_currentDelta        = 0.0f;
+    m_currentDeltaZ       = 0.0f;
+    m_lastfalltime        = 0;
+    m_lastfallz           = 0.0f;
+    m_lastSpeedRate       = 1.0f;
+    m_currentTimeSkipped  = 0;
+    //
+    m_immuneTime          = WorldTimer::getMSTime();
+    m_lastClientTime      = WorldTimer::getMSTime();
+    m_lastLiveState       = ALIVE;
+    //
+    m_currentCheckResult.clear();
+    m_counters.clear();
+    m_oldCheckTime.clear();
+    m_lastalarmtime.clear();
+    m_lastactiontime.clear();
+    SetImmune(ANTICHEAT_DEFAULT_DELTA);
+
+};
+
+AntiCheat::~AntiCheat()
+{
+};
+
+bool AntiCheat::CheckNull()
+{
+    DEBUG_LOG("AntiCheat: CheckNull called");
+    return true;
+};
+
+AntiCheatCheckEntry* AntiCheat::_FindCheck(AntiCheatCheck checktype)
+{
+
+    for(uint16 i = 0; AntiCheatCheckList[i].checkType != CHECK_MAX; ++i)
+    {
+        AntiCheatCheckEntry* pEntry = &AntiCheatCheckList[i];
+        if (pEntry->checkType == checktype)
+            return &AntiCheatCheckList[i];
+    }
+
+    return NULL;
+};
+
+AntiCheatConfig const* AntiCheat::_FindConfig(AntiCheatCheck checkType)
+{
+    return sObjectMgr.GetAntiCheatConfig(uint32(checkType));
+};
+
+bool AntiCheat::_DoAntiCheatCheck(AntiCheatCheck checktype)
+{
+    m_currentConfig = _FindConfig(checktype);
+
+    if (!m_currentConfig)
+        return true;
+
+    AntiCheatCheckEntry* _check = _FindCheck(checktype);
+
+    if (!_check)
+        return true;
+
+    bool checkpassed = true;
+
+    if (_check->active && CheckTimer(checktype) && CheckNeeded(checktype))
+    {
+        if (m_counters.find(checktype) == m_counters.end())
+            m_counters.insert(std::make_pair(checktype, 0));
+
+        if (!(this->*(_check->Handler))() && !isImmune())
+        {
+            if (m_currentConfig->disableOperation)
+                checkpassed = false;
+            ++m_counters[checktype];
+
+            if (m_lastalarmtime.find(checktype) == m_lastalarmtime.end())
+                m_lastalarmtime.insert(std::make_pair(checktype, 0));
+
+            m_lastalarmtime[checktype] = WorldTimer::getMSTime();
+
+            if (m_counters[checktype] >= m_currentConfig->alarmsCount)
+            {
+                m_currentCheckResult.insert(0,m_currentConfig->description.c_str());
+                DoAntiCheatAction(checktype, m_currentCheckResult);
+                m_counters[checktype] = 0;
+                m_currentCheckResult.clear();
+            }
+        }
+        else
+        {
+            if (WorldTimer::getMSTimeDiff(m_lastalarmtime[checktype],WorldTimer::getMSTime()) > sWorld.getConfig(CONFIG_UINT32_ANTICHEAT_ACTION_DELAY)
+                || (m_currentConfig->checkParam[0] > 0 && m_currentConfig->alarmsCount > 1 && WorldTimer::getMSTimeDiff(m_lastalarmtime[checktype],WorldTimer::getMSTime()) > m_currentConfig->checkParam[0]))
+            {
+                m_counters[checktype] = 0;
+            }
+        }
+        m_oldCheckTime[checktype] = WorldTimer::getMSTime();
+    }
+
+
+    // Subchecks, if exist
+    if (checktype < 100 && _check->active && CheckNeeded(checktype))
+    {
+        for (int i=1; i < 99; ++i )
+        {
+            uint32 subcheck = checktype * 100 + i;
+
+            if (_FindConfig(AntiCheatCheck(subcheck)))
+            {
+                checkpassed |= _DoAntiCheatCheck(AntiCheatCheck(subcheck));
+            }
+            else
+                break;
+        }
+    }
+    // If any of checks fail, return false
+    return checkpassed;
+};
+
+bool AntiCheat::CheckTimer(AntiCheatCheck checkType)
+{
+    AntiCheatConfig const* config = _FindConfig(checkType);
+
+    if (!config->checkPeriod)
+        return true;
+
+    const uint32 currentTime = WorldTimer::getMSTime();
+
+    if (m_oldCheckTime.find(checkType) == m_oldCheckTime.end())
+        m_oldCheckTime.insert(std::make_pair(checkType, currentTime));
+
+    if (currentTime - m_oldCheckTime[checkType] >= config->checkPeriod)
+        return true;
+
+    return false;
+}
+
+void AntiCheat::DoAntiCheatAction(AntiCheatCheck checkType, std::string reason)
+{
+    AntiCheatConfig const* config = _FindConfig(checkType);
+
+    if (!config)
+        return;
+
+    if (m_lastactiontime.find(checkType) == m_lastactiontime.end())
+        m_lastactiontime.insert(std::make_pair(checkType, 0));
+
+    if (WorldTimer::getMSTime() - m_lastactiontime[checkType] >= sWorld.getConfig(CONFIG_UINT32_ANTICHEAT_ACTION_DELAY) * 1000)
+    {
+        m_lastactiontime[checkType] = WorldTimer::getMSTime();
+
+        std::string name = GetPlayer()->GetName();
+        std::string namechat;
+        MapEntry const* mapEntry = sMapStore.LookupEntry(GetPlayer()->GetMapId());
+        uint32 zone_id, area_id;
+        GetPlayer()->GetZoneAndAreaId(zone_id,area_id);
+        AreaTableEntry const* zoneEntry = GetAreaEntryByAreaID(zone_id);
+        AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(area_id);
+        char buffer[255];
+
+        namechat.clear();
+        namechat.append(" |cddff0000|Hplayer:");
+        namechat.append(name);
+        namechat.append("|h[");
+        namechat.append(name);
+        namechat.append("]|h|r ");
+        sprintf(buffer," Map %u (%s), Zone %u (%s) Area |cbbdd0000|Harea:%u|h[%s]|h|r ",
+        GetPlayer()->GetMapId(), (mapEntry ? mapEntry->name[sWorld.GetDefaultDbcLocale()] : "<unknown>" ),
+        zone_id, (zoneEntry ? zoneEntry->area_name[sWorld.GetDefaultDbcLocale()] : "<unknown>" ),
+        area_id, (areaEntry ? areaEntry->area_name[sWorld.GetDefaultDbcLocale()] : "<unknown>" ));
+
+        if (m_currentspellID)
+        {
+            SpellEntry const *spellInfo = sSpellStore.LookupEntry(m_currentspellID);
+            if (spellInfo)
+                sprintf(buffer,", last spell |cbbee0000|Hspell:%u|h[%s]|h|r  ",
+                    m_currentspellID, spellInfo->SpellName[sWorld.GetDefaultDbcLocale()]);
+        }
+
+        namechat.append(buffer);
+
+        for (int i=0; i < ANTICHEAT_ACTIONS; ++i )
+        {
+            AntiCheatAction actionID = AntiCheatAction(config->actionType[i]);
+
+
+            switch(actionID)
+            {
+                case    ANTICHEAT_ACTION_KICK:
+                        GetPlayer()->GetSession()->KickPlayer();
+                break;
+
+                case    ANTICHEAT_ACTION_BAN:
+                    sWorld.BanAccount(BAN_CHARACTER, name.c_str(), config->actionParam[i], reason, "AntiCheat");
+                break;
+
+                case    ANTICHEAT_ACTION_SHEEP:
+                    {
+                        uint32 sheepAura = 28272;
+                        switch (urand(0,6))
+                        {
+                            case 0:
+                                sheepAura = 118;
+                            break;
+                            case 1:
+                                sheepAura = 28271;
+                            break;
+                            case 2:
+                                sheepAura = 28272;
+                            break;
+                            case 3:
+                                sheepAura = 61025;
+                            break;
+                            case 4:
+                                sheepAura = 61721;
+                            break;
+                            case 5:
+                                sheepAura = 71319;
+                            break;
+                            default:
+                            break;
+                        }
+                        GetPlayer()->_AddAura(sheepAura,config->actionParam[i]);
+
+                        if (checkType == CHECK_MOVEMENT_FLY ||
+                            GetPlayer()->HasAuraType(SPELL_AURA_FLY))
+                            {
+                                GetPlayer()->CastSpell(GetPlayer(), 55001, true);
+                            }
+                    }
+                break;
+
+                case    ANTICHEAT_ACTION_STUN:
+                        GetPlayer()->_AddAura(13005,config->actionParam[i]);
+                break;
+
+                case    ANTICHEAT_ACTION_SICKNESS:
+                        GetPlayer()->_AddAura(15007,config->actionParam[i]);
+                break;
+
+                case    ANTICHEAT_ACTION_ANNOUNCE_GM:
+                        sWorld.SendWorldTextWithSecurity(AccountTypes(config->actionParam[i]), config->messageNum, namechat.c_str(), config->description.c_str());
+                break;
+
+                case    ANTICHEAT_ACTION_ANNOUNCE_ALL:
+                        sWorld.SendWorldText(config->messageNum, name.c_str(), config->description.c_str());
+                break;
+
+                case    ANTICHEAT_ACTION_LOG:
+                case    ANTICHEAT_ACTION_NULL:
+                default:
+                break;
+
+            }
+        }
+    }
+
+    if (config->actionType[0] != ANTICHEAT_ACTION_NULL)
+    {
+        if (reason == "" )
+        {
+            sLog.outError("AntiCheat action log: Missing Reason parameter!");
+            return;
+        }
+
+        const char* playerName = GetPlayer()->GetName();
+
+        if ( !playerName )
+        {
+           sLog.outError("AntiCheat action log: Player with no name?");
+           return;
+        }
+
+        CharacterDatabase.PExecute("REPLACE INTO `anticheat_log` (`guid`, `playername`, `checktype`, `alarm_time`, `action1`, `action2`, `reason`)"
+                                   "VALUES ('%u','%s','%u',NOW(),'%u','%u','%s')",
+                                   GetPlayer()->GetObjectGuid().GetCounter(),
+                                   playerName,
+                                   checkType,
+                                   config->actionType[0],
+                                   config->actionType[1],
+                                   reason.c_str());
+    }
+
+}
+
+bool AntiCheat::CheckNeeded(AntiCheatCheck checktype)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_ANTICHEAT_ENABLE)
+        || !GetPlayer()->IsInWorld()
+        || !GetPlayer()->GetMap()
+        || GetPlayer()->IsBeingTeleported()
+        || GetPlayer()->GetPlayerbotAI()
+        || GetPlayer()->GetSession()->GetSecurity() > int32(sWorld.getConfig(CONFIG_UINT32_ANTICHEAT_GMLEVEL)))
+        return false;
+
+    if (!m_currentConfig->disabledZones.empty())
+    {
+        uint32 zone, area;
+        GetPlayer()->GetZoneAndAreaId(zone,area);
+        if (m_currentConfig->disabledZones.find(zone) != m_currentConfig->disabledZones.end())
+            return false;
+    }
+
+    AntiCheatCheck checkMainType =  (checktype >= 100) ? AntiCheatCheck(checktype / 100) : checktype;
+
+    switch( checkMainType)
+    {
+        case CHECK_NULL:
+            return false;
+            break;
+        case CHECK_MOVEMENT:
+            if (   GetPlayer()->IsOnTransport()
+                || GetPlayer()->HasMovementFlag(MOVEFLAG_ONTRANSPORT)
+                || GetPlayer()->IsInUnitState(UNIT_ACTION_CONFUSED)
+                || GetPlayer()->IsTaxiFlying()
+                || GetPlayer()->GetMapId() == 607    // Strand of the Ancients ships bug
+                || GetPlayer()->GetMapId() == 369    // Metro
+                || GetPlayer()->GetZoneId() == 4395) // Dalaran
+                return false;
+
+            // Ranger: dont check if player is passenger
+            if (VehicleKitPtr pVehicle = GetPlayer()->GetVehicle())
+                if (pVehicle->GetBase() && pVehicle->GetBase()->GetTypeId() == TYPEID_PLAYER)
+                    if (pVehicle->GetBase()->GetCharmerOrOwnerGuid() != GetPlayer()->GetObjectGuid())
+                        return false;
+            break;
+        case CHECK_SPELL:
+            break;
+        case CHECK_QUEST:
+            return false;
+            break;
+        case CHECK_TRANSPORT:
+            if (!isActiveMover())
+                return false;
+            break;
+        case CHECK_WARDEN:
+            if (!sWorld.getConfig(CONFIG_BOOL_ANTICHEAT_WARDEN))
+                return false;
+            break;
+        case CHECK_DAMAGE:
+        case CHECK_ITEM:
+            break;
+        default:
+            return false;
+    }
+
+    if (checktype < 100 )
+        return true;
+
+    switch( checktype)
+    {
+        case CHECK_MOVEMENT_SPEED:
+            if  (GetMover()->HasAura(56266))
+                return false;
+            break;
+        case CHECK_MOVEMENT_FLY:
+        case CHECK_MOVEMENT_ZAXIS:
+            if (isCanFly() || !GetMover())
+                return false;
+            break;
+        case CHECK_MOVEMENT_WATERWALKING:
+            if (!m_currentmovementInfo->HasMovementFlag(MOVEFLAG_WATERWALKING))
+                return false;
+            break;
+        case CHECK_MOVEMENT_TP2PLANE:
+            if (GetMover()->IsOnTransport())
+                return false;
+            if (m_currentmovementInfo->HasMovementFlag(MovementFlags(MOVEFLAG_SWIMMING | MOVEFLAG_CAN_FLY | MOVEFLAG_FLYING)))
+                return false;
+            if (GetMover()->HasAura(60068) && GetMover()->GetTerrain()->IsUnderWater(m_currentmovementInfo->GetPosition().getX(), m_currentmovementInfo->GetPosition().getY(), m_currentmovementInfo->GetPosition().getZ() - 5.0f))
+                return false;
+            break;
+        case CHECK_MOVEMENT_AIRJUMP:
+            if (isCanFly() ||
+                !isActiveMover() ||
+                GetMover()->GetTerrain()->IsUnderWater(m_currentmovementInfo->GetPosition().getX(), m_currentmovementInfo->GetPosition().getY(), m_currentmovementInfo->GetPosition().getZ()-5.0f))
+                return false;
+            break;
+        case CHECK_MOVEMENT_TELEPORT:
+            if (!isActiveMover() || GetPlayer()->IsBeingTeleported())
+                return false;
+            break;
+        case CHECK_MOVEMENT_FALL:
+            if (isCanFly() || !isActiveMover())
+                return false;
+            break;
+        case CHECK_MOVEMENT_MOUNTAIN:
+            if (isCanFly() || !isActiveMover())
+                return false;
+            break;
+        default:
+            break;
+    }
+
+    return true;
+
+}
+
+// Movement checks
+bool AntiCheat::CheckMovement()
+{
+    if (!GetPlayer()->IsSelfMover() && isActiveMover())
+    {
+        SetActiveMover(false);
+        m_currentMover  = GetPlayer()->GetMover();
+        m_MovedLen = 0.0f;
+        SetImmune(ANTICHEAT_DEFAULT_DELTA);
+    }
+    else if (GetPlayer()->IsSelfMover() && !isActiveMover())
+    {
+        SetActiveMover(true);
+        m_currentMover  = ((Unit*)GetPlayer());
+        m_MovedLen = 0.0f;
+        SetImmune(ANTICHEAT_DEFAULT_DELTA);
+    }
+
+    if (GetPlayer()->IsBeingTeleported())
+        SetImmune(ANTICHEAT_DEFAULT_DELTA);
+
+    SetLastLiveState(GetPlayer()->getDeathState());
+
+    float delta_x   = GetMover()->GetPositionX() - m_currentmovementInfo->GetPosition().getX();
+    float delta_y   = GetMover()->GetPositionY() - m_currentmovementInfo->GetPosition().getY();
+    m_currentDeltaZ = GetMover()->GetPositionZ() - m_currentmovementInfo->GetPosition().getZ();
+
+    m_currentDelta = sqrt(delta_x * delta_x + delta_y * delta_y);
+
+    m_MovedLen += m_currentDelta;
+
+    return true;
+}
+
+bool AntiCheat::CheckSpeed()
+{
+    float speedRate   = 1.0f;
+    int   serverDelta = WorldTimer::getMSTimeDiff(m_oldCheckTime[CHECK_MOVEMENT_SPEED],WorldTimer::getMSTime());
+
+    if (m_currentTimeSkipped > 0 && (float)m_currentTimeSkipped < serverDelta)
+    {
+        serverDelta += m_currentTimeSkipped;
+        m_currentTimeSkipped = 0;
+    }
+    else if (m_currentTimeSkipped > 0 && (float)m_currentTimeSkipped > serverDelta)
+    {
+        m_currentTimeSkipped = 0;
+        return true;
+    }
+    uint32 clientTime  = m_currentmovementInfo->time;
+    int clientDelta = clientTime - m_lastClientTime;
+
+    m_lastClientTime   = clientTime;
+
+    float delta_t     = float(std::max(clientDelta,serverDelta));
+
+    float moveSpeed = m_MovedLen / delta_t;
+
+    m_MovedLen = 0.0f;
+
+    std::string mode;
+
+    if (m_currentmovementInfo->HasMovementFlag(MOVEFLAG_FLYING))
+    {
+        speedRate = GetMover()->GetSpeed(MOVE_FLIGHT);
+        mode = "MOVE_FLIGHT";
+    }
+    else if (m_currentmovementInfo->HasMovementFlag(MOVEFLAG_SWIMMING))
+    {
+        speedRate = GetMover()->GetSpeed(MOVE_SWIM);
+        mode = "MOVE_SWIM";
+    }
+    else if (m_currentmovementInfo->HasMovementFlag(MOVEFLAG_WALK_MODE))
+    {
+        speedRate = GetMover()->GetSpeed(MOVE_WALK);
+        mode = "MOVE_WALK";
+    }
+    else
+    {
+        speedRate = GetMover()->GetSpeed(MOVE_RUN);
+        mode = "MOVE_RUN";
+    }
+
+    if (m_currentmovementInfo->HasMovementFlag(MOVEFLAG_FALLING))
+        speedRate = m_lastSpeedRate;
+
+    if (speedRate < m_lastSpeedRate)
+    {
+        m_lastSpeedRate = speedRate;
+        return true;
+    }
+    m_lastSpeedRate = speedRate;
+
+    if ( moveSpeed / speedRate <= m_currentConfig->checkFloatParam[0] )
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," Speed is %f but allowed %f Mode is %s, opcode is %s, client delta is %d, server delta is %d",
+                 moveSpeed / speedRate, m_currentConfig->checkFloatParam[0],mode.c_str(), LookupOpcodeName(m_currentOpcode), clientDelta, serverDelta);
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
+
+
+bool AntiCheat::CheckWaterWalking()
+{
+    if  (   GetMover()->HasAuraType(SPELL_AURA_WATER_WALK)
+        ||  GetMover()->HasAura(60068)
+        ||  GetMover()->HasAura(61081)
+        ||  GetMover()->HasAuraType(SPELL_AURA_GHOST)
+        )
+        return true;
+
+    m_currentCheckResult.clear();
+
+    return false;
+}
+
+bool AntiCheat::CheckTeleport()
+{
+
+    if (m_currentDelta < m_currentConfig->checkFloatParam[0])
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," Moved with with one tick on %e but allowed %e",
+                 m_currentDelta, m_currentConfig->checkFloatParam[0]);
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+
+    return false;
+}
+
+bool AntiCheat::CheckMountain()
+{
+    if (m_currentmovementInfo->HasMovementFlag(MovementFlags(MOVEFLAG_FLYING | MOVEFLAG_SWIMMING)))
+        return true;
+
+    if ( m_currentDeltaZ > 0 )
+        return true;
+
+    int  serverDelta = WorldTimer::getMSTimeDiff(m_oldCheckTime[CHECK_MOVEMENT_MOUNTAIN],WorldTimer::getMSTime());
+
+    float zSpeed = - m_currentDeltaZ / serverDelta;
+
+    float tg_z = (m_currentDelta > 0.0f) ? (-m_currentDeltaZ / m_currentDelta) : -99999;
+
+    if (tg_z < m_currentConfig->checkFloatParam[1] || zSpeed < m_currentConfig->checkFloatParam[0] )
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," deltaZ %e, angle %e, speedZ %e ",
+                 m_currentDeltaZ, tg_z, zSpeed);
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+
+    return false;
+}
+
+bool AntiCheat::CheckFall()
+{
+    if (!m_isFall)
+    {
+        m_lastfalltime = m_currentmovementInfo->GetFallTime();
+        m_lastfallz    = m_currentmovementInfo->GetPosition().getZ();
+        SetInFall(true);
+    }
+    else
+    {
+        if (m_lastfallz - m_currentmovementInfo->GetPosition().getZ() >= 0.0f)
+            SetInFall(false);
+    }
+    return true;
+}
+
+bool AntiCheat::CheckFly()
+{
+    if (!m_currentmovementInfo->HasMovementFlag(MovementFlags(MOVEFLAG_CAN_FLY | MOVEFLAG_FLYING | MOVEFLAG_ROOT)))
+        return true;
+
+    if (m_currentmovementInfo->HasMovementFlag(MOVEFLAG_FALLING)
+        || m_currentmovementInfo->HasMovementFlag(MOVEFLAG_FALLINGFAR))
+        return true;
+
+    if (GetMover()->GetTerrain()->IsUnderWater(m_currentmovementInfo->GetPosition().getX(), m_currentmovementInfo->GetPosition().getY(), m_currentmovementInfo->GetPosition().getZ() - 2.0f))
+        return true;
+
+    float ground_z = GetMover()->GetMap()->GetHeight(GetPlayer()->GetPhaseMask(),GetPlayer()->GetPositionX(),GetPlayer()->GetPositionY(),MAX_HEIGHT);
+    float floor_z  = GetMover()->GetMap()->GetHeight(GetPlayer()->GetPhaseMask(),GetPlayer()->GetPositionX(),GetPlayer()->GetPositionY(),GetPlayer()->GetPositionZ());
+    float map_z    = ((floor_z <= (INVALID_HEIGHT+5.0f)) ? ground_z : floor_z);
+
+    if (map_z + m_currentConfig->checkFloatParam[0] > GetPlayer()->GetPositionZ() && map_z > (INVALID_HEIGHT + m_currentConfig->checkFloatParam[0] + 5.0f))
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," flying without fly auras on height %e but allowed %e",
+                 GetPlayer()->GetPositionZ(), map_z + m_currentConfig->checkFloatParam[0]);
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+
+    return false;
+}
+
+bool AntiCheat::CheckAirJump()
+{
+    if (m_currentOpcode != MSG_MOVE_JUMP)
+        return true;
+    if (!m_currentmovementInfo->HasMovementFlag(MOVEFLAG_FALLING) || !GetMover()->m_movementInfo.HasMovementFlag(MOVEFLAG_FALLING))
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," player Z = %f, opcode %s", GetPlayer()->GetPositionZ(), LookupOpcodeName(m_currentOpcode));
+
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
+
+bool AntiCheat::CheckTp2Plane()
+{
+    if (m_currentmovementInfo->GetPosition().getZ() > m_currentConfig->checkFloatParam[0] || m_currentmovementInfo->GetPosition().getZ() < -m_currentConfig->checkFloatParam[0])
+        return true;
+
+    if (GetMover()->HasAuraType(SPELL_AURA_GHOST))
+        return true;
+
+    float plane_z = 0.0f;
+
+    plane_z = GetMover()->GetMap()->GetHeight(GetPlayer()->GetPhaseMask(),m_currentmovementInfo->GetPosition().getX(), m_currentmovementInfo->GetPosition().getY(), MAX_HEIGHT) - m_currentmovementInfo->GetPosition().getZ();
+    plane_z = (plane_z < -500.0f) ? 0 : plane_z; //check holes in heigth map
+    if(plane_z < m_currentConfig->checkFloatParam[1] && plane_z > -m_currentConfig->checkFloatParam[1])
+            return true;
+
+    char buffer[255];
+    sprintf(buffer," Plane Z = %e, player Z = %e, opcode %s",
+                 plane_z, GetPlayer()->GetPositionZ(), LookupOpcodeName(m_currentOpcode));
+
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+
+}
+
+bool AntiCheat::CheckZAxis()
+{
+    if (m_currentDeltaZ > 0.0f && fabs(GetPlayer()->GetPositionZ()) < MAX_HEIGHT) //Don't check falling.
+        return true;
+
+    float delta_x   = GetPlayer()->GetPositionX() - m_currentmovementInfo->GetPosition().getX();
+    float delta_y   = GetPlayer()->GetPositionY() - m_currentmovementInfo->GetPosition().getY();
+
+    if(fabs(delta_x) > m_currentConfig->checkFloatParam[0] || fabs(delta_y) > m_currentConfig->checkFloatParam[0])
+        return true;
+
+    float delta_z   = GetPlayer()->GetPositionZ() - m_currentmovementInfo->GetPosition().getZ();
+
+    if (fabs(delta_z) < m_currentConfig->checkFloatParam[1] && fabs(GetPlayer()->GetPositionZ()) < MAX_HEIGHT)
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," Possible attempt use Z-Axis hack. Moving on Z axis without of moving to XY - %e, but allowed %e",
+                 delta_z, m_currentConfig->checkFloatParam[1]);
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+
+    return false;
+}
+
+// Transport checks
+bool AntiCheat::CheckOnTransport()
+{
+
+    if  (GetMover()->HasAura(56266))
+        return true;
+
+    // transports size limited
+    // (also received at zeppelin/lift leave by some reason with t_* as absolute in continent coordinates, can be safely skipped)
+    if ( m_currentmovementInfo->GetTransportPos()->x < m_currentConfig->checkFloatParam[1] && 
+        m_currentmovementInfo->GetTransportPos()->y < m_currentConfig->checkFloatParam[1] && 
+        m_currentmovementInfo->GetTransportPos()->z < 2.0f * m_currentConfig->checkFloatParam[1])
+        return true;
+
+    float trans_rad = sqrt(m_currentmovementInfo->GetTransportPos()->x * m_currentmovementInfo->GetTransportPos()->x + m_currentmovementInfo->GetTransportPos()->y * m_currentmovementInfo->GetTransportPos()->y + m_currentmovementInfo->GetTransportPos()->z * m_currentmovementInfo->GetTransportPos()->z);
+    if (trans_rad < + m_currentConfig->checkFloatParam[0])
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," Transport radius = %f, opcode = %s, on-transport coordinates %f, %f, %f ",
+                 trans_rad, LookupOpcodeName(m_currentOpcode),
+                 m_currentmovementInfo->GetTransportPos()->x,
+                 m_currentmovementInfo->GetTransportPos()->y,
+                 m_currentmovementInfo->GetTransportPos()->z);
+
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
+
+// Spell checks
+bool AntiCheat::CheckSpell()
+{
+// in process
+    return true;
+}
+
+bool AntiCheat::CheckSpellValid()
+{
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(m_currentspellID);
+
+    // not have spell in spellbook or spell passive and not casted by client
+    if (spellInfo && !IsPassiveSpell(spellInfo) && !sObjectMgr.IsSpellDisabled(m_currentspellID))
+        return true;
+
+    std::string mode = spellInfo ? (IsPassiveSpell(spellInfo) ? " is passive spell!" : " disabled.") : "absent in DBC!";
+
+    char buffer[255];
+    sprintf(buffer," player try cast spell %u, but spell %s",
+                 m_currentspellID, mode.c_str());
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
+
+bool AntiCheat::CheckSpellOndeath()
+{
+
+    if (GetPlayer()->getDeathState() == ALIVE)
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," player is not in ALIVE state, but cast spell %u ",
+                 m_currentspellID);
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+
+}
+
+bool AntiCheat::CheckSpellFamily()
+{
+// in process
+    if (!m_currentspellID)
+        return true;
+
+    bool checkPassed = true;
+    std::string mode = "";
+
+    SkillLineAbilityMapBounds skill_bounds = sSpellMgr.GetSkillLineAbilityMapBounds(m_currentspellID);
+
+    for(SkillLineAbilityMap::const_iterator _spell_idx = skill_bounds.first; _spell_idx != skill_bounds.second; ++_spell_idx)
+    {
+        SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(_spell_idx->second->skillId);
+
+        if (!pSkill)
+            continue;
+
+        if (pSkill->id == 769)
+        {
+            checkPassed = false;
+            mode = " it is GM spell!";
+        }
+    }
+
+    if (checkPassed)
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," spell %u, reason: %s", m_currentspellID,mode.c_str());
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+
+}
+
+bool AntiCheat::CheckSpellInbook()
+{
+//    SpellEntry const* spellInfo = sSpellStore.LookupEntry(m_currentspellID);
+
+    // not have spell in spellbook or spell passive and not casted by client
+    if (!GetPlayer()->GetUInt16Value(PLAYER_FIELD_BYTES2, 0) == 0 ||
+         GetPlayer()->HasActiveSpell(m_currentspellID) ||
+        m_currentspellID == 1843)
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," player try cast spell %u, but not has this in spellbook!",
+                 m_currentspellID);
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
+
+// Quest checks
+bool AntiCheat::CheckQuest()
+{
+// in process
+    return true;
+}
+
+// Damage checks
+bool AntiCheat::CheckDamage()
+{
+// in process
+    return true;
+}
+
+bool AntiCheat::CheckSpellDamage()
+{
+    if (!m_currentspellID)
+        return true;
+
+    if (m_currentDamage < m_currentConfig->checkParam[1])
+        return true;
+
+/*
+    uint32 calcdamage = 0;
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(m_currentspellID);
+    if (spellInfo)
+    {
+        for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+        {
+            calcdamage +=;
+        }
+
+    }
+*/
+
+    char buffer[255];
+    sprintf(buffer," Spell %d damage dealt is %d, but allowed %g",
+                 m_currentspellID, m_currentDamage, m_currentConfig->checkFloatParam[1]);
+
+    m_currentspellID = 0;
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
+
+bool AntiCheat::CheckMeleeDamage()
+{
+    if (m_currentspellID)
+        return true;
+
+    if (m_currentDamage < m_currentConfig->checkParam[1])
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," Dealt melee damage %d, but allowed %g",
+                 m_currentDamage, m_currentConfig->checkFloatParam[1]);
+
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
+
+bool AntiCheat::isCanFly()
+{
+    if (   GetMover()->HasAuraType(SPELL_AURA_FLY)
+        || GetMover()->HasAuraType(SPELL_AURA_MOD_FLIGHT_SPEED)
+        || GetMover()->HasAuraType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED)
+        || GetMover()->HasAuraType(SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACKING)
+        || GetMover()->HasAuraType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED_STACKING)
+        || GetMover()->HasAuraType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED_NOT_STACKING)
+       )
+        return true;
+
+    return false;
+}
+
+bool AntiCheat::isInFall()
+{
+    return m_isFall;
+}
+
+bool AntiCheat::isImmune()
+{
+    if (m_immuneTime > WorldTimer::getMSTime())
+        return true;
+    else
+        return false;
+}
+
+void AntiCheat::SetImmune(uint32 timeDelta)
+{
+    m_immuneTime = WorldTimer::getMSTime() + timeDelta;
+}
+
+void AntiCheat::SetLastLiveState(DeathState state)
+{
+    if (state  != m_lastLiveState)
+    {
+        m_lastLiveState = state;
+        SetImmune(ANTICHEAT_DEFAULT_DELTA);
+    }
+}
+
+// Item checks
+bool AntiCheat::CheckItem()
+{
+// in process
+    return true;
+}
+
+bool AntiCheat::CheckItemUpdate()
+{
+    if (m_testitem && m_item && (m_item == m_testitem))
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," Attempt of use item dupe cheat (WPE hack). Possible server crush later.");
+
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
+
+// Warden checks
+bool AntiCheat::CheckWarden()
+{
+// in process
+    return true;
+}
+
+bool AntiCheat::CheckWardenCheckSum()
+{
+    if (!m_wardenCheckResult)
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," Warden detect not valid checksum in answer. Possible cheating (WPE hack).");
+
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
+
+bool AntiCheat::CheckWardenKey()
+{
+    if (!m_wardenCheckResult)
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," Warden detect not valid key code in answer. Possible cheating (WPE hack).");
+
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
+
+bool AntiCheat::CheckWardenMemory()
+{
+    if (!m_wardenCheckResult)
+        return true;
+
+    std::string mode;
+
+    switch (m_wardenCheck)
+    {
+        case MEM_CHECK:
+            mode = "memory check";
+            break;
+        case PAGE_CHECK_A:
+        case PAGE_CHECK_B:
+            mode = "page check";
+            break;
+        case MPQ_CHECK:
+            mode = "MPQ check";
+            break;
+        case LUA_STR_CHECK:
+            mode = "LUA check";
+            break;
+        case DRIVER_CHECK:
+            mode = "driver check";
+            break;
+        case TIMING_CHECK:
+            mode = "timing check";
+            break;
+        case PROC_CHECK:
+            mode = "proc check";
+            break;
+        case MODULE_CHECK:
+            mode = "module check";
+            break;
+        case FAKE_CHECK:
+            mode = "MAC fake check";
+            return true;
+        default:
+            mode = "unknown check";
+            break;
+    }
+
+    char buffer[255];
+    sprintf(buffer," Warden report that %s is fail. Last check is %u.", mode.c_str(), m_wardenCheckNum);
+
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
+
+bool AntiCheat::CheckWardenTimeOut()
+{
+    if (!m_wardenCheckResult)
+        return true;
+
+    char buffer[255];
+    sprintf(buffer," Warden report, that client is not fit to timeout sending request. Client possible use cheat software!");
+
+    m_currentCheckResult.clear();
+    m_currentCheckResult.append(buffer);
+    return false;
+}
diff --git a/src/game/AntiCheat.h b/src/game/AntiCheat.h
new file mode 100644
index 00000000000..ddd14c56910
--- /dev/null
+++ b/src/game/AntiCheat.h
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2010-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ * based on gimly && CWN code
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Common.h"
+#include <string>
+
+class Player;
+class MovementInfo;
+
+enum AntiCheatCheck
+{
+    // Check types
+    CHECK_NULL              = 0,
+    CHECK_MOVEMENT          = 1,
+    CHECK_SPELL             = 2,
+    CHECK_QUEST             = 3,
+    CHECK_TRANSPORT         = 4,
+    CHECK_DAMAGE            = 5,
+    CHECK_ITEM              = 6,
+    CHECK_WARDEN            = 7,
+    // Check subtypes
+    // Movement checks
+    CHECK_MOVEMENT_SPEED        = 100 * CHECK_MOVEMENT + 1,
+    CHECK_MOVEMENT_FLY          = 100 * CHECK_MOVEMENT + 2,
+    CHECK_MOVEMENT_MOUNTAIN     = 100 * CHECK_MOVEMENT + 3,
+    CHECK_MOVEMENT_WATERWALKING = 100 * CHECK_MOVEMENT + 4,
+    CHECK_MOVEMENT_TP2PLANE     = 100 * CHECK_MOVEMENT + 5,
+    CHECK_MOVEMENT_AIRJUMP      = 100 * CHECK_MOVEMENT + 6,
+    CHECK_MOVEMENT_TELEPORT     = 100 * CHECK_MOVEMENT + 7,
+    CHECK_MOVEMENT_FALL         = 100 * CHECK_MOVEMENT + 8,
+    CHECK_MOVEMENT_ZAXIS        = 100 * CHECK_MOVEMENT + 9,
+    // Spell checks
+    CHECK_SPELL_VALID           = 100 * CHECK_SPELL + 1,
+    CHECK_SPELL_ONDEATH         = 100 * CHECK_SPELL + 2,
+    CHECK_SPELL_FAMILY          = 100 * CHECK_SPELL + 3,
+    CHECK_SPELL_INBOOK          = 100 * CHECK_SPELL + 4,
+    // Damage checks
+    CHECK_DAMAGE_SPELL          = 100 * CHECK_DAMAGE + 1,
+    CHECK_DAMAGE_MELEE          = 100 * CHECK_DAMAGE + 2,
+    // Item checks
+    CHECK_ITEM_UPDATE           = 100 * CHECK_ITEM   + 1,
+    // Warden checks
+    CHECK_WARDEN_MEMORY         = 100 * CHECK_WARDEN + 1,
+    CHECK_WARDEN_KEY            = 100 * CHECK_WARDEN + 2,
+    CHECK_WARDEN_CHECKSUM       = 100 * CHECK_WARDEN + 3,
+    CHECK_WARDEN_TIMEOUT        = 100 * CHECK_WARDEN + 4,
+    // End of list
+    CHECK_MAX
+};
+
+enum AntiCheatAction
+{
+    ANTICHEAT_ACTION_NULL             = 0,
+    ANTICHEAT_ACTION_LOG              = 1,
+    ANTICHEAT_ACTION_ANNOUNCE_GM      = 2,
+    ANTICHEAT_ACTION_ANNOUNCE_ALL     = 3,
+    ANTICHEAT_ACTION_KICK             = 4,
+    ANTICHEAT_ACTION_BAN              = 5,
+    ANTICHEAT_ACTION_SHEEP            = 6,
+    ANTICHEAT_ACTION_STUN             = 7,
+    ANTICHEAT_ACTION_SICKNESS         = 8,
+};
+
+struct AntiCheatCheckEntry;
+struct AntiCheatConfig;
+
+class AntiCheat
+{
+
+    public:
+        explicit AntiCheat(Player* player);
+        ~AntiCheat();
+
+        // External used for set variables
+        void       SetTimeSkipped(uint32 time_skipped) { m_currentTimeSkipped = time_skipped; }
+        void       SetInFall(bool isFall) { m_isFall = isFall; }
+        bool       isCanFly();
+        bool       isInFall();
+        bool       isActiveMover() { return m_isActiveMover; }
+        void       SetActiveMover(bool isActive) { m_isActiveMover = isActive; }
+        bool       isImmune();
+        void       SetImmune(uint32 timeDelta);
+        void       SetLastLiveState(DeathState state);
+
+        // Checks
+        bool CheckNeeded(AntiCheatCheck checktype);
+
+        // Check selectors
+        bool DoAntiCheatCheck(AntiCheatCheck checkType, MovementInfo& movementInfo, uint32 opcode = 0)
+            {
+                m_currentmovementInfo = &movementInfo;
+                m_currentOpcode = opcode;
+                return _DoAntiCheatCheck(checkType);
+            }
+
+        bool DoAntiCheatCheck(AntiCheatCheck checkType, uint32 spellID, uint32 opcode = 0, uint32 damage = 0)
+            {
+                m_currentspellID = spellID;
+                m_currentOpcode = opcode;
+                m_currentDamage = damage;
+                return _DoAntiCheatCheck(checkType);
+            }
+
+        bool DoAntiCheatCheck(AntiCheatCheck checkType, Item* item, Item* testitem)
+            {
+                m_item = item;
+                m_testitem = testitem;
+                return _DoAntiCheatCheck(checkType);
+            }
+
+        bool DoAntiCheatCheck(AntiCheatCheck checkType, uint8 wardenType, bool result)
+            {
+                m_wardenCheck = wardenType;
+                m_wardenCheckResult = result;
+                m_wardenCheckNum = 0;
+                return _DoAntiCheatCheck(checkType);
+            }
+
+        bool DoAntiCheatCheck(AntiCheatCheck checkType, uint8 wardenType, uint32 checkNum)
+            {
+                m_wardenCheck = wardenType;
+                m_wardenCheckNum = checkNum;
+                m_wardenCheckResult = true;
+                return _DoAntiCheatCheck(checkType);
+            }
+
+        void DoAntiCheatAction(AntiCheatCheck checkType, std::string reason);
+
+        // Check functions
+        bool CheckNull();
+
+        // movement
+        bool CheckMovement();
+        bool CheckTp2Plane();
+        bool CheckFly();
+        bool CheckAirJump();
+        bool CheckMountain();
+        bool CheckWaterWalking();
+        bool CheckSpeed();
+        bool CheckTeleport();
+        bool CheckFall();
+        bool CheckZAxis();
+
+        // Transport
+        bool CheckOnTransport();
+
+        // quest
+        bool CheckQuest();
+
+        // spell
+        bool CheckSpell();
+        bool CheckSpellValid();
+        bool CheckSpellOndeath();
+        bool CheckSpellFamily();
+        bool CheckSpellInbook();
+
+        // damage
+        bool CheckDamage();
+        bool CheckSpellDamage();
+        bool CheckMeleeDamage();
+
+        // Items
+        bool CheckItem();
+        bool CheckItemUpdate();
+
+        // Warden
+        bool CheckWarden();
+        bool CheckWardenKey();
+        bool CheckWardenCheckSum();
+        bool CheckWardenMemory();
+        bool CheckWardenTimeOut();
+
+    private:
+
+        // Internal fuctions
+        bool                       CheckTimer(AntiCheatCheck checkType);
+        bool                       _DoAntiCheatCheck(AntiCheatCheck checktype);
+        AntiCheatCheckEntry*       _FindCheck(AntiCheatCheck checktype);
+        AntiCheatConfig const*     _FindConfig(AntiCheatCheck checktype);
+        Player*                    GetPlayer() { return m_player;};
+        Unit*                      GetMover()  { return m_currentMover;};
+
+        // Saved variables
+        float                                   m_MovedLen;          //Length of traveled way
+        uint32                                  m_immuneTime;
+        bool                                    m_isFall;
+        bool                                    m_isTeleported;
+        bool                                    m_isActiveMover;
+        uint32                                  m_lastfalltime;
+        uint32                                  m_lastClientTime;
+        DeathState                              m_lastLiveState;
+        float                                   m_lastfallz;
+        float                                   m_lastSpeedRate;
+        Player*                                 m_player;
+        std::map<AntiCheatCheck, uint32>        m_counters;               // counter of alarms
+        std::map<AntiCheatCheck, uint32>        m_oldCheckTime;           // last time when check processed
+        std::map<AntiCheatCheck, uint32>        m_lastalarmtime;          // last time when alarm generated
+        std::map<AntiCheatCheck, uint32>        m_lastactiontime;         // last time when action is called
+
+        // Variables for current check
+        Unit*                      m_currentMover;
+        MovementInfo*              m_currentmovementInfo;
+        uint32                     m_currentDamage;
+        uint32                     m_currentspellID;
+        uint32                     m_currentOpcode;
+        uint32                     m_currentTimeSkipped;
+        std::string                m_currentCheckResult;
+        AntiCheatConfig const*     m_currentConfig;
+        float                      m_currentDelta;
+        float                      m_currentDeltaZ;
+        Item*                      m_item;
+        Item*                      m_testitem;
+        uint8                      m_wardenCheck;
+        bool                       m_wardenCheckResult;
+        uint32                     m_wardenCheckNum;
+
+};
+
+struct AntiCheatCheckEntry
+{
+    public:
+        bool           active;
+        AntiCheatCheck checkType;
+        bool           (AntiCheat::*Handler)();
+};
diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp
index 5e946d2158f..a1b98858584 100644
--- a/src/game/ArenaTeam.cpp
+++ b/src/game/ArenaTeam.cpp
@@ -23,13 +23,47 @@
 #include "World.h"
 #include "Player.h"
 
+void ArenaTeamMember::ModifyMatchmakerRating(Player* plr, int32 mod, ArenaType type)
+{
+    if (type == ARENA_TYPE_2v2)
+    {
+        if (int32(matchmaker_rating) + mod <  0)
+            matchmaker_rating =  0;
+        else
+        {
+            matchmaker_rating += mod;
+            CharacterDatabase.PExecute("UPDATE hidden_rating SET rating2 = '%u' WHERE guid = '%u'", matchmaker_rating, plr->GetObjectGuid().GetCounter());
+        }
+    }
+    if (type == ARENA_TYPE_3v3)
+    {
+        if (int32(matchmaker_rating) + mod <  0)
+            matchmaker_rating =  0;
+        else
+        {
+            matchmaker_rating += mod;
+            CharacterDatabase.PExecute("UPDATE hidden_rating SET rating3 = '%u' WHERE guid = '%u'", matchmaker_rating, plr->GetObjectGuid().GetCounter());
+        }
+    }
+    if (type == ARENA_TYPE_5v5)
+    {
+        if (int32(matchmaker_rating) + mod <  0)
+            matchmaker_rating = 0;
+        else
+        {
+            matchmaker_rating += mod;
+            CharacterDatabase.PExecute("UPDATE hidden_rating SET rating5 = '%u' WHERE guid = '%u'", matchmaker_rating, plr->GetObjectGuid().GetCounter());
+        }
+    }
+}
+
 void ArenaTeamMember::ModifyPersonalRating(Player* plr, int32 mod, uint32 slot)
 {
     if (int32(personal_rating) + mod < 0)
         personal_rating = 0;
     else
         personal_rating += mod;
-    if(plr)
+    if (plr)
         plr->SetArenaTeamInfoField(slot, ARENA_TEAM_PERSONAL_RATING, personal_rating);
 }
 
@@ -49,7 +83,7 @@ ArenaTeam::ArenaTeam()
     int32 conf_value = sWorld.getConfig(CONFIG_INT32_ARENA_STARTRATING);
     if (conf_value < 0)                                     // -1 = select by season id
     {
-        if (sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_ID) >= 6)
+        if (sWorldStateMgr.GetWorldStateValue(ARENA_SEASON_ID) >= 6)
             m_stats.rating    = 0;
         else
             m_stats.rating    = 1500;
@@ -90,10 +124,10 @@ bool ArenaTeam::Create(ObjectGuid captainGuid, ArenaType type, std::string arena
     // CharacterDatabase.PExecute("DELETE FROM arena_team WHERE arenateamid='%u'", m_TeamId); - MAX(arenateam)+1 not exist
     CharacterDatabase.PExecute("DELETE FROM arena_team_member WHERE arenateamid='%u'", m_TeamId);
     CharacterDatabase.PExecute("INSERT INTO arena_team (arenateamid,name,captainguid,type,BackgroundColor,EmblemStyle,EmblemColor,BorderStyle,BorderColor) "
-        "VALUES('%u','%s','%u','%u','%u','%u','%u','%u','%u')",
-        m_TeamId, arenaTeamName.c_str(), m_CaptainGuid.GetCounter(), m_Type, m_BackgroundColor, m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor);
+                               "VALUES('%u','%s','%u','%u','%u','%u','%u','%u','%u')",
+                               m_TeamId, arenaTeamName.c_str(), m_CaptainGuid.GetCounter(), m_Type, m_BackgroundColor, m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor);
     CharacterDatabase.PExecute("INSERT INTO arena_team_stats (arenateamid, rating, games_week, wins_week, games_season, wins_season, rank) VALUES "
-        "('%u', '%u', '%u', '%u', '%u', '%u', '%u')", m_TeamId, m_stats.rating, m_stats.games_week, m_stats.wins_week, m_stats.games_season, m_stats.wins_season, m_stats.rank);
+                               "('%u', '%u', '%u', '%u', '%u', '%u', '%u')", m_TeamId, m_stats.rating, m_stats.games_week, m_stats.wins_week, m_stats.games_season, m_stats.wins_season, m_stats.rank);
 
     CharacterDatabase.CommitTransaction();
 
@@ -110,7 +144,7 @@ bool ArenaTeam::AddMember(ObjectGuid playerGuid)
     if (GetMembersSize() >= GetMaxMembersSize())
         return false;
 
-    Player *pl = sObjectMgr.GetPlayer(playerGuid);
+    Player* pl = sObjectMgr.GetPlayer(playerGuid);
     if (pl)
     {
         if (pl->GetArenaTeamId(GetSlot()))
@@ -125,7 +159,7 @@ bool ArenaTeam::AddMember(ObjectGuid playerGuid)
     else
     {
         //                                                     0     1
-        QueryResult *result = CharacterDatabase.PQuery("SELECT name, class FROM characters WHERE guid='%u'", playerGuid.GetCounter());
+        QueryResult* result = CharacterDatabase.PQuery("SELECT name, class FROM characters WHERE guid='%u'", playerGuid.GetCounter());
         if (!result)
             return false;
 
@@ -154,10 +188,56 @@ bool ArenaTeam::AddMember(ObjectGuid playerGuid)
     newmember.wins_season       = 0;
     newmember.wins_week         = 0;
 
+    if (GetType() == ARENA_TYPE_2v2)
+    {
+        QueryResult *result = CharacterDatabase.PQuery("SELECT rating2 FROM hidden_rating WHERE guid='%u'", playerGuid.GetCounter());
+
+        if (!result)
+        {
+            CharacterDatabase.PExecute("INSERT INTO hidden_rating (guid, rating2, rating3, rating5) VALUES""('%u', '%u', '%u', '%u')", playerGuid.GetCounter(), 1500, 1500, 1500);
+            newmember.matchmaker_rating = 1500;
+        }
+        else
+        {
+            newmember.matchmaker_rating = (*result)[0].GetUInt32();
+            delete result;
+        }
+    }
+    if (GetType() == ARENA_TYPE_3v3)
+    {
+        QueryResult *result = CharacterDatabase.PQuery("SELECT rating3 FROM hidden_rating WHERE guid='%u'", playerGuid.GetCounter());
+
+        if (!result)
+        {
+            CharacterDatabase.PExecute("INSERT INTO hidden_rating (guid, rating2, rating3, rating5) VALUES""('%u', '%u', '%u', '%u')", playerGuid.GetCounter(), 1500, 1500, 1500);
+            newmember.matchmaker_rating = 1500;
+        }
+        else
+        {
+            newmember.matchmaker_rating = (*result)[0].GetUInt32();
+            delete result;
+        }
+    }
+    if (GetType() == ARENA_TYPE_5v5)
+    {
+        QueryResult *result = CharacterDatabase.PQuery("SELECT rating5 FROM hidden_rating WHERE guid='%u'", playerGuid.GetCounter());
+
+        if (!result)
+        {
+            CharacterDatabase.PExecute("INSERT INTO hidden_rating (guid, rating2, rating3, rating5) VALUES""('%u', '%u', '%u', '%u')", playerGuid.GetCounter(), 1500, 1500, 1500);
+            newmember.matchmaker_rating = 1500;
+        }
+        else
+        {
+            newmember.matchmaker_rating = (*result)[0].GetUInt32();
+            delete result;
+        }
+    }
+
     int32 conf_value = sWorld.getConfig(CONFIG_INT32_ARENA_STARTPERSONALRATING);
     if (conf_value < 0)                                     // -1 = select by season id
     {
-        if (sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_ID) >= 6)
+        if (sWorldStateMgr.GetWorldStateValue(ARENA_SEASON_ID) >= 6)
         {
             if (m_stats.rating < 1000)
                 newmember.personal_rating = 0;
@@ -174,9 +254,9 @@ bool ArenaTeam::AddMember(ObjectGuid playerGuid)
 
     m_members.push_back(newmember);
 
-    CharacterDatabase.PExecute("INSERT INTO arena_team_member (arenateamid, guid, personal_rating) VALUES ('%u', '%u', '%u')", m_TeamId, newmember.guid.GetCounter(), newmember.personal_rating );
+    CharacterDatabase.PExecute("INSERT INTO arena_team_member (arenateamid, guid, personal_rating) VALUES ('%u', '%u', '%u')", m_TeamId, newmember.guid.GetCounter(), newmember.personal_rating);
 
-    if(pl)
+    if (pl)
     {
         pl->SetInArenaTeam(m_TeamId, GetSlot(), GetType());
         pl->SetArenaTeamIdInvited(0);
@@ -189,12 +269,12 @@ bool ArenaTeam::AddMember(ObjectGuid playerGuid)
     return true;
 }
 
-bool ArenaTeam::LoadArenaTeamFromDB(QueryResult *arenaTeamDataResult)
+bool ArenaTeam::LoadArenaTeamFromDB(QueryResult* arenaTeamDataResult)
 {
-    if(!arenaTeamDataResult)
+    if (!arenaTeamDataResult)
         return false;
 
-    Field *fields = arenaTeamDataResult->Fetch();
+    Field* fields = arenaTeamDataResult->Fetch();
 
     m_TeamId             = fields[0].GetUInt32();
     m_Name               = fields[1].GetCppString();
@@ -209,7 +289,7 @@ bool ArenaTeam::LoadArenaTeamFromDB(QueryResult *arenaTeamDataResult)
     m_EmblemColor        = fields[6].GetUInt32();
     m_BorderStyle        = fields[7].GetUInt32();
     m_BorderColor        = fields[8].GetUInt32();
-    //load team stats
+    // load team stats
     m_stats.rating       = fields[9].GetUInt32();
     m_stats.games_week   = fields[10].GetUInt32();
     m_stats.wins_week    = fields[11].GetUInt32();
@@ -220,30 +300,30 @@ bool ArenaTeam::LoadArenaTeamFromDB(QueryResult *arenaTeamDataResult)
     return true;
 }
 
-bool ArenaTeam::LoadMembersFromDB(QueryResult *arenaTeamMembersResult)
+bool ArenaTeam::LoadMembersFromDB(QueryResult* arenaTeamMembersResult)
 {
-    if(!arenaTeamMembersResult)
+    if (!arenaTeamMembersResult)
         return false;
 
     bool captainPresentInTeam = false;
 
     do
     {
-        Field *fields = arenaTeamMembersResult->Fetch();
-        //prevent crash if db records are broken, when all members in result are already processed and current team hasn't got any members
+        Field* fields = arenaTeamMembersResult->Fetch();
+        // prevent crash if db records are broken, when all members in result are already processed and current team hasn't got any members
         if (!fields)
             break;
         uint32 arenaTeamId        = fields[0].GetUInt32();
         if (arenaTeamId < m_TeamId)
         {
-            //there is in table arena_team_member record which doesn't have arenateamid in arena_team table, report error
+            // there is in table arena_team_member record which doesn't have arenateamid in arena_team table, report error
             sLog.outErrorDb("ArenaTeam %u does not exist but it has record in arena_team_member table, deleting it!", arenaTeamId);
             CharacterDatabase.PExecute("DELETE FROM arena_team_member WHERE arenateamid = '%u'", arenaTeamId);
             continue;
         }
 
         if (arenaTeamId > m_TeamId)
-            //we loaded all members for this arena_team already, break cycle
+            // we loaded all members for this arena_team already, break cycle
             break;
 
         ArenaTeamMember newmember;
@@ -256,9 +336,56 @@ bool ArenaTeam::LoadMembersFromDB(QueryResult *arenaTeamMembersResult)
         newmember.name            = fields[7].GetCppString();
         newmember.Class           = fields[8].GetUInt8();
 
-        //check if member exists in characters table
+        if (GetType() == ARENA_TYPE_2v2)
+        {
+            QueryResult *result = CharacterDatabase.PQuery("SELECT rating2 FROM hidden_rating WHERE guid='%u'", fields[1].GetUInt32());
+
+            if (!result)
+            {
+                CharacterDatabase.PExecute("INSERT INTO hidden_rating (guid, rating2, rating3, rating5) VALUES""('%u', '%u', '%u', '%u')", fields[1].GetUInt32(), 1500, 1500, 1500);
+                newmember.matchmaker_rating = 1500;
+            }
+            else
+            {
+                newmember.matchmaker_rating = (*result)[0].GetUInt32();
+                delete result;
+            }
+        }
+        if (GetType() == ARENA_TYPE_3v3)
+        {
+            QueryResult *result = CharacterDatabase.PQuery("SELECT rating3 FROM hidden_rating WHERE guid='%u'", fields[1].GetUInt32());
+
+            if (!result)
+            {
+                CharacterDatabase.PExecute("INSERT INTO hidden_rating (guid, rating2, rating3, rating5) VALUES""('%u', '%u', '%u', '%u')", fields[1].GetUInt32(), 1500, 1500, 1500);
+                newmember.matchmaker_rating = 1500;
+            }
+            else
+            {
+                newmember.matchmaker_rating = (*result)[0].GetUInt32();
+                delete result;
+            }
+        }
+        if (GetType() == ARENA_TYPE_5v5)
+        {
+            QueryResult *result = CharacterDatabase.PQuery("SELECT rating5 FROM hidden_rating WHERE guid='%u'", fields[1].GetUInt32());
+
+            if (!result)
+            {
+                CharacterDatabase.PExecute("INSERT INTO hidden_rating (guid, rating2, rating3, rating5) VALUES""('%u', '%u', '%u', '%u')", fields[1].GetUInt32(), 1500, 1500, 1500);
+                newmember.matchmaker_rating = 1500;
+            }
+            else
+            {
+                newmember.matchmaker_rating = (*result)[0].GetUInt32();
+                delete result;
+            }
+        }
+
+        // check if member exists in characters table
         if (newmember.name.empty())
         {
+            CharacterDatabase.PExecute("DELETE FROM hidden_rating where guid = '%u'", fields[1].GetUInt32());
             sLog.outErrorDb("ArenaTeam %u has member with empty name - probably player %s doesn't exist, deleting him from memberlist!", arenaTeamId, newmember.guid.GetString().c_str());
             DelMember(newmember.guid);
             continue;
@@ -272,7 +399,8 @@ bool ArenaTeam::LoadMembersFromDB(QueryResult *arenaTeamMembersResult)
             captainPresentInTeam = true;
 
         m_members.push_back(newmember);
-    } while (arenaTeamMembersResult->NextRow());
+    }
+    while (arenaTeamMembersResult->NextRow());
 
     if (Empty() || !captainPresentInTeam)
     {
@@ -287,7 +415,7 @@ bool ArenaTeam::LoadMembersFromDB(QueryResult *arenaTeamMembersResult)
 void ArenaTeam::SetCaptain(ObjectGuid guid)
 {
     // disable remove/promote buttons
-    Player *oldcaptain = sObjectMgr.GetPlayer(GetCaptainGuid());
+    Player* oldcaptain = sObjectMgr.GetPlayer(GetCaptainGuid());
     if (oldcaptain)
         oldcaptain->SetArenaTeamInfoField(GetSlot(), ARENA_TEAM_MEMBER, 1);
 
@@ -298,7 +426,8 @@ void ArenaTeam::SetCaptain(ObjectGuid guid)
     CharacterDatabase.PExecute("UPDATE arena_team SET captainguid = '%u' WHERE arenateamid = '%u'", guid.GetCounter(), m_TeamId);
 
     // enable remove/promote buttons
-    if (Player *newcaptain = sObjectMgr.GetPlayer(guid))
+    Player* newcaptain = sObjectMgr.GetPlayer(guid);
+    if (newcaptain)
         newcaptain->SetArenaTeamInfoField(GetSlot(), ARENA_TEAM_MEMBER, 0);
 }
 
@@ -313,18 +442,19 @@ void ArenaTeam::DelMember(ObjectGuid guid)
         }
     }
 
-    if (Player* player = sObjectMgr.GetPlayer(guid))
+    Player* player = sObjectMgr.GetPlayer(guid);
+    if (player)
     {
         player->GetSession()->SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, GetName(), "", 0);
         // delete all info regarding this team
-        for(int i = 0; i < ARENA_TEAM_END; ++i)
+        for (int i = 0; i < ARENA_TEAM_END; ++i)
             player->SetArenaTeamInfoField(GetSlot(), ArenaTeamInfoType(i), 0);
     }
 
     CharacterDatabase.PExecute("DELETE FROM arena_team_member WHERE arenateamid = '%u' AND guid = '%u'", GetId(), guid.GetCounter());
 }
 
-void ArenaTeam::Disband(WorldSession *session)
+void ArenaTeam::Disband(WorldSession* session)
 {
     // event
     if (session)
@@ -347,9 +477,9 @@ void ArenaTeam::Disband(WorldSession *session)
     sObjectMgr.RemoveArenaTeam(m_TeamId);
 }
 
-void ArenaTeam::Roster(WorldSession *session)
+void ArenaTeam::Roster(WorldSession* session)
 {
-    Player *pl = NULL;
+    Player* pl = NULL;
 
     uint8 unk308 = 0;
 
@@ -374,7 +504,7 @@ void ArenaTeam::Roster(WorldSession *session)
         data << uint32(itr->games_season);                  // played this season
         data << uint32(itr->wins_season);                   // wins this season
         data << uint32(itr->personal_rating);               // personal rating
-        if(unk308)
+        if (unk308)
         {
             data << float(0.0);                             // 308 unk
             data << float(0.0);                             // 308 unk
@@ -385,9 +515,9 @@ void ArenaTeam::Roster(WorldSession *session)
     DEBUG_LOG("WORLD: Sent SMSG_ARENA_TEAM_ROSTER");
 }
 
-void ArenaTeam::Query(WorldSession *session)
+void ArenaTeam::Query(WorldSession* session)
 {
-    WorldPacket data(SMSG_ARENA_TEAM_QUERY_RESPONSE, 4*7+GetName().size()+1);
+    WorldPacket data(SMSG_ARENA_TEAM_QUERY_RESPONSE, 4 * 7 + GetName().size() + 1);
     data << uint32(GetId());                                // team id
     data << GetName();                                      // team name
     data << uint32(GetType());                              // arena team type (2=2x2, 3=3x3 or 5=5x5)
@@ -400,9 +530,9 @@ void ArenaTeam::Query(WorldSession *session)
     DEBUG_LOG("WORLD: Sent SMSG_ARENA_TEAM_QUERY_RESPONSE");
 }
 
-void ArenaTeam::Stats(WorldSession *session)
+void ArenaTeam::Stats(WorldSession* session)
 {
-    WorldPacket data(SMSG_ARENA_TEAM_STATS, 4*7);
+    WorldPacket data(SMSG_ARENA_TEAM_STATS, 4 * 7);
     data << uint32(GetId());                                // team id
     data << uint32(m_stats.rating);                         // rating
     data << uint32(m_stats.games_week);                     // games this week
@@ -417,21 +547,21 @@ void ArenaTeam::NotifyStatsChanged()
 {
     // this is called after a rated match ended
     // updates arena team stats for every member of the team (not only the ones who participated!)
-    for(MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
+    for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
     {
-        Player * plr = sObjectMgr.GetPlayer(itr->guid);
-        if(plr)
+        Player* plr = sObjectMgr.GetPlayer(itr->guid);
+        if (plr)
             Stats(plr->GetSession());
     }
 }
 
-void ArenaTeam::InspectStats(WorldSession *session, ObjectGuid guid)
+void ArenaTeam::InspectStats(WorldSession* session, ObjectGuid guid)
 {
     ArenaTeamMember* member = GetMember(guid);
-    if(!member)
+    if (!member)
         return;
 
-    WorldPacket data(MSG_INSPECT_ARENA_TEAMS, 8+1+4*6);
+    WorldPacket data(MSG_INSPECT_ARENA_TEAMS, 8 + 1 + 4 * 6);
     data << guid;                                           // player guid
     data << uint8(GetSlot());                               // slot (0...2)
     data << uint32(GetId());                                // arena team id
@@ -456,7 +586,7 @@ void ArenaTeam::SetEmblem(uint32 backgroundColor, uint32 emblemStyle, uint32 emb
 
 void ArenaTeam::SetStats(uint32 stat_type, uint32 value)
 {
-    switch(stat_type)
+    switch (stat_type)
     {
         case STAT_TYPE_RATING:
             m_stats.rating = value;
@@ -488,12 +618,12 @@ void ArenaTeam::SetStats(uint32 stat_type, uint32 value)
     }
 }
 
-void ArenaTeam::BroadcastPacket(WorldPacket *packet)
+void ArenaTeam::BroadcastPacket(WorldPacket* packet)
 {
     for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
     {
-        Player *player = sObjectMgr.GetPlayer(itr->guid);
-        if(player)
+        Player* player = sObjectMgr.GetPlayer(itr->guid);
+        if (player)
             player->GetSession()->SendPacket(packet);
     }
 }
@@ -502,7 +632,7 @@ void ArenaTeam::BroadcastEvent(ArenaTeamEvents event, ObjectGuid guid, char cons
 {
     uint8 strCount = !str1 ? 0 : (!str2 ? 1 : (!str3 ? 2 : 3));
 
-    WorldPacket data(SMSG_ARENA_TEAM_EVENT, 1 + 1 + 1*strCount + (!guid ? 0 : 8));
+    WorldPacket data(SMSG_ARENA_TEAM_EVENT, 1 + 1 + 1 * strCount + (!guid ? 0 : 8));
     data << uint8(event);
     data << uint8(strCount);
 
@@ -528,9 +658,9 @@ void ArenaTeam::BroadcastEvent(ArenaTeamEvents event, ObjectGuid guid, char cons
     DEBUG_LOG("WORLD: Sent SMSG_ARENA_TEAM_EVENT");
 }
 
-uint8 ArenaTeam::GetSlotByType(ArenaType type )
+uint8 ArenaTeam::GetSlotByType(ArenaType type)
 {
-    switch(type)
+    switch (type)
     {
         case ARENA_TYPE_2v2: return 0;
         case ARENA_TYPE_3v3: return 1;
@@ -545,7 +675,7 @@ uint8 ArenaTeam::GetSlotByType(ArenaType type )
 bool ArenaTeam::HaveMember(ObjectGuid guid) const
 {
     for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
-        if(itr->guid == guid)
+        if (itr->guid == guid)
             return true;
 
     return false;
@@ -561,7 +691,7 @@ uint32 ArenaTeam::GetPoints(uint32 MemberRating)
     if (rating <= 1500)
     {
         // As of Season 6 and later, all teams below 1500 rating will earn points as if they were a 1500 rated team
-        if (sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_ID) >= 6)
+        if (sWorldStateMgr.GetWorldStateValue(ARENA_SEASON_ID) >= 6)
             rating = 1500;
 
         points = (float)rating * 0.22f + 14.0f;
@@ -572,7 +702,7 @@ uint32 ArenaTeam::GetPoints(uint32 MemberRating)
     // type penalties for <5v5 teams
     if (m_Type == ARENA_TYPE_2v2)
         points *= 0.76f;
-    else if(m_Type == ARENA_TYPE_3v3)
+    else if (m_Type == ARENA_TYPE_3v3)
         points *= 0.88f;
 
     return (uint32) points;
@@ -583,10 +713,10 @@ float ArenaTeam::GetChanceAgainst(uint32 own_rating, uint32 enemy_rating)
     // returns the chance to win against a team with the given rating, used in the rating adjustment calculation
     // ELO system
 
-    if (sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_ID) >= 6)
+    if (sWorldStateMgr.GetWorldStateValue(ARENA_SEASON_ID) >= 6)
         if (enemy_rating < 1000)
             enemy_rating = 1000;
-    return 1.0f/(1.0f+exp(log(10.0f)*(float)((float)enemy_rating - (float)own_rating)/400.0f));
+    return 1.0f / (1.0f + exp(log(10.0f) * (float)((float)enemy_rating - (float)own_rating) / 400.0f));
 }
 
 void ArenaTeam::FinishGame(int32 mod)
@@ -601,7 +731,7 @@ void ArenaTeam::FinishGame(int32 mod)
     // update team's rank
     m_stats.rank = 1;
     ObjectMgr::ArenaTeamMap::const_iterator i = sObjectMgr.GetArenaTeamMapBegin();
-    for ( ; i != sObjectMgr.GetArenaTeamMapEnd(); ++i)
+    for (; i != sObjectMgr.GetArenaTeamMapEnd(); ++i)
     {
         if (i->second->GetType() == this->m_Type && i->second->GetStats().rating > m_stats.rating)
             ++m_stats.rank;
@@ -615,7 +745,7 @@ int32 ArenaTeam::WonAgainst(uint32 againstRating)
     float chance = GetChanceAgainst(m_stats.rating, againstRating);
     float K = (m_stats.rating < 1000) ? 48.0f : 32.0f;
     // calculate the rating modification (ELO system with k=32 or k=48 if rating<1000)
-    int32 mod = (int32)floor(K* (1.0f - chance));
+    int32 mod = (int32)floor(K * (1.0f - chance));
     // modify the team stats accordingly
     FinishGame(mod);
     m_stats.wins_week += 1;
@@ -634,16 +764,22 @@ int32 ArenaTeam::LostAgainst(uint32 againstRating)
     // calculate the rating modification (ELO system with k=32 or k=48 if rating<1000)
     int32 mod = (int32)ceil(K * (0.0f - chance));
     // modify the team stats accordingly
+
+    if(againstRating <= sWorld.getConfig(CONFIG_UINT32_LOSERNOCHANGE) || m_stats.rating <= sWorld.getConfig(CONFIG_UINT32_LOSERNOCHANGE))
+        mod = 0;
+    else if (m_stats.rating <= sWorld.getConfig(CONFIG_UINT32_LOSERHALFCHANGE))
+        mod /= 2;
+
     FinishGame(mod);
 
     // return the rating change, used to display it on the results screen
     return mod;
 }
 
-void ArenaTeam::MemberLost(Player * plr, uint32 againstRating)
+void ArenaTeam::MemberLost(Player* plr, uint32 againstRating)
 {
     // called for each participant of a match after losing
-    for(MemberList::iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
+    for (MemberList::iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
     {
         if (itr->guid == plr->GetObjectGuid())
         {
@@ -652,7 +788,21 @@ void ArenaTeam::MemberLost(Player * plr, uint32 againstRating)
             float K = (itr->personal_rating < 1000) ? 48.0f : 32.0f;
             // calculate the rating modification (ELO system with k=32 or k=48 if rating<1000)
             int32 mod = (int32)ceil(K * (0.0f - chance));
+
+            if(againstRating <= sWorld.getConfig(CONFIG_UINT32_LOSERNOCHANGE) || itr->personal_rating <= sWorld.getConfig(CONFIG_UINT32_LOSERNOCHANGE))
+                mod = 0;
+            else if (itr->personal_rating <= sWorld.getConfig(CONFIG_UINT32_LOSERHALFCHANGE))
+                mod /= 2;
+
             itr->ModifyPersonalRating(plr, mod, GetSlot());
+
+            // update matchmaker rating
+            chance = GetChanceAgainst(itr->matchmaker_rating, againstRating);
+            K = (itr->matchmaker_rating < 1000) ? 48.0f : 32.0f;
+            // calculate the rating modification (ELO system with k=32 or k=48 if rating<1000)
+            mod = (int32)ceil(K * (0.0f - chance));
+            itr->ModifyMatchmakerRating(plr,mod,GetType());
+
             // update personal played stats
             itr->games_week += 1;
             itr->games_season += 1;
@@ -667,7 +817,7 @@ void ArenaTeam::MemberLost(Player * plr, uint32 againstRating)
 void ArenaTeam::OfflineMemberLost(ObjectGuid guid, uint32 againstRating)
 {
     // called for offline player after ending rated arena match!
-    for(MemberList::iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
+    for (MemberList::iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
     {
         if (itr->guid == guid)
         {
@@ -680,6 +830,23 @@ void ArenaTeam::OfflineMemberLost(ObjectGuid guid, uint32 againstRating)
                 itr->personal_rating = 0;
             else
                 itr->personal_rating += mod;
+
+            // update matchmaker rating
+            chance = GetChanceAgainst(itr->matchmaker_rating, againstRating);
+            K = (itr->matchmaker_rating < 1000) ? 48.0f : 32.0f;
+            mod = (int32)ceil(K * (0.0f - chance));
+            if (int32(itr->matchmaker_rating) + mod < 0)
+                itr->matchmaker_rating = 0;
+            else
+                itr->matchmaker_rating += mod;
+
+            if(GetType() == ARENA_TYPE_2v2)
+                CharacterDatabase.PExecute("UPDATE hidden_rating SET rating2 = '%u' WHERE guid = '%u'", itr->matchmaker_rating, guid.GetCounter());
+            if(GetType() == ARENA_TYPE_3v3)
+                CharacterDatabase.PExecute("UPDATE hidden_rating SET rating3 = '%u' WHERE guid = '%u'", itr->matchmaker_rating, guid.GetCounter());
+            if(GetType() == ARENA_TYPE_5v5)
+                CharacterDatabase.PExecute("UPDATE hidden_rating SET rating5 = '%u' WHERE guid = '%u'", itr->matchmaker_rating, guid.GetCounter());
+
             // update personal played stats
             itr->games_week += 1;
             itr->games_season += 1;
@@ -688,10 +855,10 @@ void ArenaTeam::OfflineMemberLost(ObjectGuid guid, uint32 againstRating)
     }
 }
 
-void ArenaTeam::MemberWon(Player * plr, uint32 againstRating)
+void ArenaTeam::MemberWon(Player* plr, uint32 againstRating)
 {
     // called for each participant after winning a match
-    for(MemberList::iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
+    for (MemberList::iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
     {
         if (itr->guid == plr->GetObjectGuid())
         {
@@ -699,8 +866,16 @@ void ArenaTeam::MemberWon(Player * plr, uint32 againstRating)
             float chance = GetChanceAgainst(itr->personal_rating, againstRating);
             float K = (itr->personal_rating < 1000) ? 48.0f : 32.0f;
             // calculate the rating modification (ELO system with k=32 or k=48 if rating<1000)
-            int32 mod = (int32)floor(K* (1.0f - chance));
+            int32 mod = (int32)floor(K * (1.0f - chance));
             itr->ModifyPersonalRating(plr, mod, GetSlot());
+
+            // update matchmaker rating
+            chance = GetChanceAgainst(itr->matchmaker_rating, againstRating);
+            K = (itr->matchmaker_rating < 1000) ? 48.0f : 32.0f;
+            mod = (int32)ceil(K * (1.0f - chance));
+            // calculate the rating modification (ELO system with k=32 or k=48 if rating<1000)
+            itr->ModifyMatchmakerRating(plr, mod, GetType());
+
             // update personal stats
             itr->games_week += 1;
             itr->games_season += 1;
@@ -723,7 +898,7 @@ void ArenaTeam::UpdateArenaPointsHelper(std::map<uint32, uint32>& PlayerPoints)
         return;
     // to get points, a player has to participate in at least 30% of the matches
     uint32 min_plays = (uint32) ceil(m_stats.games_week * 0.3);
-    for(MemberList::const_iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
+    for (MemberList::const_iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
     {
         // the player participated in enough games, update his points
         uint32 points_to_add = 0;
@@ -734,7 +909,7 @@ void ArenaTeam::UpdateArenaPointsHelper(std::map<uint32, uint32>& PlayerPoints)
         std::map<uint32, uint32>::iterator plr_itr = PlayerPoints.find(itr->guid.GetCounter());
         if (plr_itr != PlayerPoints.end())
         {
-            //check if there is already more points
+            // check if there is already more points
             if (plr_itr->second < points_to_add)
                 PlayerPoints[itr->guid.GetCounter()] = points_to_add;
         }
@@ -749,7 +924,7 @@ void ArenaTeam::SaveToDB()
     // called after a match has ended, or when calculating arena_points
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("UPDATE arena_team_stats SET rating = '%u',games_week = '%u',games_season = '%u',rank = '%u',wins_week = '%u',wins_season = '%u' WHERE arenateamid = '%u'", m_stats.rating, m_stats.games_week, m_stats.games_season, m_stats.rank, m_stats.wins_week, m_stats.wins_season, GetId());
-    for(MemberList::const_iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
+    for (MemberList::const_iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
     {
         CharacterDatabase.PExecute("UPDATE arena_team_member SET played_week = '%u', wons_week = '%u', played_season = '%u', wons_season = '%u', personal_rating = '%u' WHERE arenateamid = '%u' AND guid = '%u'", itr->games_week, itr->wins_week, itr->games_season, itr->wins_season, itr->personal_rating, m_TeamId, itr->guid.GetCounter());
     }
@@ -758,9 +933,9 @@ void ArenaTeam::SaveToDB()
 
 void ArenaTeam::FinishWeek()
 {
-    m_stats.games_week = 0;                                   // played this week
-    m_stats.wins_week = 0;                                    // wins this week
-    for(MemberList::iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
+    m_stats.games_week = 0;                                 // played this week
+    m_stats.wins_week = 0;                                  // wins this week
+    for (MemberList::iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
     {
         itr->games_week = 0;
         itr->wins_week = 0;
@@ -771,11 +946,32 @@ bool ArenaTeam::IsFighting() const
 {
     for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
     {
-        if (Player *p = sObjectMgr.GetPlayer(itr->guid))
+        Player* plr = sObjectMgr.GetPlayer(itr->guid);
+        if (plr)
         {
-            if (p->GetMap()->IsBattleArena())
+            if (plr->GetMap()->IsBattleArena())
                 return true;
         }
     }
     return false;
 }
+
+// add new arena event to all already connected team members
+void ArenaTeam::MassInviteToEvent(WorldSession* session)
+{
+    WorldPacket data(SMSG_CALENDAR_ARENA_TEAM);
+
+    data << uint32(m_members.size());
+
+    for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
+    {
+        uint32 level = Player::GetLevelFromDB(itr->guid);
+
+        if (itr->guid != session->GetPlayer()->GetObjectGuid())
+        {
+            data << itr->guid.WriteAsPacked();
+            data << uint8(level);
+        }
+    }
+    session->SendPacket(&data);
+}
diff --git a/src/game/ArenaTeam.h b/src/game/ArenaTeam.h
index 450f1b8a292..1cfd404ffec 100644
--- a/src/game/ArenaTeam.h
+++ b/src/game/ArenaTeam.h
@@ -28,6 +28,13 @@ class WorldPacket;
 class WorldSession;
 class Player;
 
+enum ArenaWorldStates
+{
+    ARENA_SEASON_ID          = 3191,
+    ARENA_SEASON_PREVIOUS_ID = 3901,
+};
+
+
 enum ArenaTeamCommandTypes
 {
     ERR_ARENA_TEAM_CREATE_S                 = 0x00,
@@ -97,8 +104,10 @@ struct ArenaTeamMember
     uint32 games_season;
     uint32 wins_season;
     uint32 personal_rating;
+    uint32 matchmaker_rating;
 
     void ModifyPersonalRating(Player* plr, int32 mod, uint32 slot);
+    void ModifyMatchmakerRating(Player* plr, int32 mod, ArenaType type);
 };
 
 struct ArenaTeamStats
@@ -120,7 +129,7 @@ class ArenaTeam
         ~ArenaTeam();
 
         bool Create(ObjectGuid captainGuid, ArenaType type, std::string arenaTeamName);
-        void Disband(WorldSession *session);
+        void Disband(WorldSession* session);
 
         typedef std::list<ArenaTeamMember> MemberList;
 
@@ -173,13 +182,13 @@ class ArenaTeam
 
         bool IsFighting() const;
 
-        bool LoadArenaTeamFromDB(QueryResult *arenaTeamDataResult);
-        bool LoadMembersFromDB(QueryResult *arenaTeamMembersResult);
+        bool LoadArenaTeamFromDB(QueryResult* arenaTeamDataResult);
+        bool LoadMembersFromDB(QueryResult* arenaTeamMembersResult);
         void LoadStatsFromDB(uint32 ArenaTeamId);
 
         void SaveToDB();
 
-        void BroadcastPacket(WorldPacket *packet);
+        void BroadcastPacket(WorldPacket* packet);
 
         void BroadcastEvent(ArenaTeamEvents event, ObjectGuid guid, char const* str1 = NULL, char const* str2 = NULL, char const* str3 = NULL);
         void BroadcastEvent(ArenaTeamEvents event, char const* str1 = NULL, char const* str2 = NULL, char const* str3 = NULL)
@@ -187,26 +196,32 @@ class ArenaTeam
             BroadcastEvent(event, ObjectGuid(), str1, str2, str3);
         }
 
-        void Roster(WorldSession *session);
-        void Query(WorldSession *session);
-        void Stats(WorldSession *session);
-        void InspectStats(WorldSession *session, ObjectGuid guid);
+        void Roster(WorldSession* session);
+        void Query(WorldSession* session);
+        void Stats(WorldSession* session);
+        void InspectStats(WorldSession* session, ObjectGuid guid);
 
         uint32 GetPoints(uint32 MemberRating);
         float GetChanceAgainst(uint32 own_rating, uint32 enemy_rating);
         int32 WonAgainst(uint32 againstRating);
-        void MemberWon(Player * plr, uint32 againstRating);
+        void MemberWon(Player* plr, uint32 againstRating);
         int32 LostAgainst(uint32 againstRating);
-        void MemberLost(Player * plr, uint32 againstRating);
+        void MemberLost(Player* plr, uint32 againstRating);
         void OfflineMemberLost(ObjectGuid guid, uint32 againstRating);
 
-        void UpdateArenaPointsHelper(std::map<uint32, uint32> & PlayerPoints);
+        void UpdateArenaPointsHelper(std::map<uint32, uint32>& PlayerPoints);
 
         void NotifyStatsChanged();
 
         void FinishWeek();
         void FinishGame(int32 mod);
 
+        void SetBattleRating(uint32 rating) { BattleRating = rating; }
+        uint32 GetBattleRating() { return BattleRating; }
+
+        // Calendar
+        void MassInviteToEvent(WorldSession* session);
+
     protected:
 
         uint32 m_TeamId;
@@ -222,5 +237,7 @@ class ArenaTeam
 
         MemberList m_members;
         ArenaTeamStats m_stats;
+
+        uint32 BattleRating;
 };
 #endif
diff --git a/src/game/ArenaTeamHandler.cpp b/src/game/ArenaTeamHandler.cpp
index e1c0f0028b9..2226344bfe1 100644
--- a/src/game/ArenaTeamHandler.cpp
+++ b/src/game/ArenaTeamHandler.cpp
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "AccountMgr.h"
 #include "WorldSession.h"
 #include "WorldPacket.h"
 #include "Log.h"
@@ -26,7 +27,7 @@
 #include "World.h"
 #include "SocialMgr.h"
 
-void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recv_data)
+void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("MSG_INSPECT_ARENA_TEAMS");
 
@@ -34,84 +35,88 @@ void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recv_data)
     recv_data >> guid;
     DEBUG_LOG("Inspect Arena stats %s", guid.GetString().c_str());
 
-    if(Player *plr = sObjectMgr.GetPlayer(guid))
+    Player* plr = sObjectMgr.GetPlayer(guid);
+    if (plr)
     {
         for (uint8 i = 0; i < MAX_ARENA_SLOT; ++i)
         {
-            if(uint32 a_id = plr->GetArenaTeamId(i))
+            if (uint32 a_id = plr->GetArenaTeamId(i))
             {
-                if(ArenaTeam *at = sObjectMgr.GetArenaTeamById(a_id))
+                ArenaTeam* at = sObjectMgr.GetArenaTeamById(a_id);
+                if (at)
                     at->InspectStats(this, plr->GetObjectGuid());
             }
         }
     }
 }
 
-void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket & recv_data)
+void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket& recv_data)
 {
-    DEBUG_LOG( "WORLD: Received CMSG_ARENA_TEAM_QUERY" );
+    DEBUG_LOG("WORLD: Received CMSG_ARENA_TEAM_QUERY");
 
     uint32 ArenaTeamId;
     recv_data >> ArenaTeamId;
 
-    if(ArenaTeam *arenateam = sObjectMgr.GetArenaTeamById(ArenaTeamId))
+    ArenaTeam* arenateam = sObjectMgr.GetArenaTeamById(ArenaTeamId);
+    if (arenateam)
     {
         arenateam->Query(this);
         arenateam->Stats(this);
     }
 }
 
-void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket & recv_data)
+void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket& recv_data)
 {
-    DEBUG_LOG( "WORLD: Received CMSG_ARENA_TEAM_ROSTER" );
+    DEBUG_LOG("WORLD: Received CMSG_ARENA_TEAM_ROSTER");
 
     uint32 ArenaTeamId;                                     // arena team id
     recv_data >> ArenaTeamId;
 
-    if(ArenaTeam *arenateam = sObjectMgr.GetArenaTeamById(ArenaTeamId))
+    ArenaTeam* arenateam = sObjectMgr.GetArenaTeamById(ArenaTeamId);
+    if (arenateam)
         arenateam->Roster(this);
 }
 
-void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recv_data)
+void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_ARENA_TEAM_INVITE");
 
     uint32 ArenaTeamId;                                     // arena team id
     std::string Invitedname;
 
-    Player * player = NULL;
+    Player* player = NULL;
 
     recv_data >> ArenaTeamId >> Invitedname;
 
-    if(!Invitedname.empty())
+    if (!Invitedname.empty())
     {
-        if(!normalizePlayerName(Invitedname))
+        if (!normalizePlayerName(Invitedname))
             return;
 
         player = ObjectAccessor::FindPlayerByName(Invitedname.c_str());
     }
 
-    if(!player)
+    if (!player)
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", Invitedname, ERR_ARENA_TEAM_PLAYER_NOT_FOUND_S);
         return;
     }
 
-    if(player->getLevel() < sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
+    if (player->getLevel() < sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", player->GetName(), ERR_ARENA_TEAM_TARGET_TOO_LOW_S);
         return;
     }
 
-    ArenaTeam *arenateam = sObjectMgr.GetArenaTeamById(ArenaTeamId);
-    if(!arenateam)
+    ArenaTeam* arenateam = sObjectMgr.GetArenaTeamById(ArenaTeamId);
+    if (!arenateam)
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PLAYER_NOT_IN_TEAM);
         return;
     }
 
     // OK result but not send invite
-    if(player->GetSocial()->HasIgnore(GetPlayer()->GetObjectGuid()))
+    if (player->GetSocial()->HasIgnore(GetPlayer()->GetObjectGuid()))
         return;
 
     if (!sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GUILD) && player->GetTeam() != GetPlayer()->GetTeam())
@@ -120,19 +125,19 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recv_data)
         return;
     }
 
-    if(player->GetArenaTeamId(arenateam->GetSlot()))
+    if (player->GetArenaTeamId(arenateam->GetSlot()))
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", player->GetName(), ERR_ALREADY_IN_ARENA_TEAM_S);
         return;
     }
 
-    if(player->GetArenaTeamIdInvited())
+    if (player->GetArenaTeamIdInvited())
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", player->GetName(), ERR_ALREADY_INVITED_TO_ARENA_TEAM_S);
         return;
     }
 
-    if(arenateam->GetMembersSize() >= arenateam->GetMaxMembersSize())
+    if (arenateam->GetMembersSize() >= arenateam->GetMaxMembersSize())
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, arenateam->GetName(), "", ERR_ARENA_TEAM_TOO_MANY_MEMBERS_S);
         return;
@@ -142,7 +147,7 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recv_data)
 
     player->SetArenaTeamIdInvited(arenateam->GetId());
 
-    WorldPacket data(SMSG_ARENA_TEAM_INVITE, (8+10));
+    WorldPacket data(SMSG_ARENA_TEAM_INVITE, (8 + 10));
     data << GetPlayer()->GetName();
     data << arenateam->GetName();
     player->GetSession()->SendPacket(&data);
@@ -150,11 +155,11 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recv_data)
     DEBUG_LOG("WORLD: Sent SMSG_ARENA_TEAM_INVITE");
 }
 
-void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recv_data*/)
+void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket& /*recv_data*/)
 {
     DEBUG_LOG("CMSG_ARENA_TEAM_ACCEPT");                    // empty opcode
 
-    ArenaTeam *at = sObjectMgr.GetArenaTeamById(_player->GetArenaTeamIdInvited());
+    ArenaTeam* at = sObjectMgr.GetArenaTeamById(_player->GetArenaTeamIdInvited());
     if (!at)
         return;
 
@@ -166,7 +171,7 @@ void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recv_data*/)
     }
 
     if (!sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GUILD) &&
-        _player->GetTeam() != sObjectMgr.GetPlayerTeamByGUID(at->GetCaptainGuid()))
+            _player->GetTeam() != sAccountMgr.GetPlayerTeamByGUID(at->GetCaptainGuid()))
     {
         // not let enemies sign petition
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_NOT_ALLIED);
@@ -176,7 +181,7 @@ void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recv_data*/)
     if (!at->AddMember(_player->GetObjectGuid()))
     {
         // arena team not found
-        SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,"","",ERR_ARENA_TEAM_INTERNAL);
+        SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_INTERNAL);
         return;
     }
 
@@ -184,21 +189,21 @@ void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recv_data*/)
     at->BroadcastEvent(ERR_ARENA_TEAM_JOIN_SS, _player->GetObjectGuid(), _player->GetName(), at->GetName().c_str());
 }
 
-void WorldSession::HandleArenaTeamDeclineOpcode(WorldPacket & /*recv_data*/)
+void WorldSession::HandleArenaTeamDeclineOpcode(WorldPacket& /*recv_data*/)
 {
     DEBUG_LOG("CMSG_ARENA_TEAM_DECLINE");                   // empty opcode
 
     _player->SetArenaTeamIdInvited(0);                      // no more invited
 }
 
-void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recv_data)
+void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_ARENA_TEAM_LEAVE");
 
     uint32 ArenaTeamId;                                     // arena team id
     recv_data >> ArenaTeamId;
 
-    ArenaTeam *at = sObjectMgr.GetArenaTeamById(ArenaTeamId);
+    ArenaTeam* at = sObjectMgr.GetArenaTeamById(ArenaTeamId);
     if (!at)
         return;
 
@@ -226,14 +231,15 @@ void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recv_data)
     SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, at->GetName(), "", 0);
 }
 
-void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recv_data)
+void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_ARENA_TEAM_DISBAND");
 
     uint32 ArenaTeamId;                                     // arena team id
     recv_data >> ArenaTeamId;
 
-    if (ArenaTeam *at = sObjectMgr.GetArenaTeamById(ArenaTeamId))
+    ArenaTeam* at = sObjectMgr.GetArenaTeamById(ArenaTeamId);
+    if (at)
     {
         if (at->GetCaptainGuid() != _player->GetObjectGuid())
             return;
@@ -246,7 +252,7 @@ void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recv_data)
     }
 }
 
-void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recv_data)
+void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_ARENA_TEAM_REMOVE");
 
@@ -256,7 +262,7 @@ void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recv_data)
     recv_data >> ArenaTeamId;
     recv_data >> name;
 
-    ArenaTeam *at = sObjectMgr.GetArenaTeamById(ArenaTeamId);
+    ArenaTeam* at = sObjectMgr.GetArenaTeamById(ArenaTeamId);
     if (!at)                                                // arena team not found
         return;
 
@@ -288,7 +294,7 @@ void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recv_data)
     at->BroadcastEvent(ERR_ARENA_TEAM_REMOVE_SSS, name.c_str(), at->GetName().c_str(), _player->GetName());
 }
 
-void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket & recv_data)
+void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_ARENA_TEAM_LEADER");
 
@@ -298,8 +304,8 @@ void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket & recv_data)
     recv_data >> ArenaTeamId;
     recv_data >> name;
 
-    ArenaTeam *at = sObjectMgr.GetArenaTeamById(ArenaTeamId);
-    if (!at)                                                 // arena team not found
+    ArenaTeam* at = sObjectMgr.GetArenaTeamById(ArenaTeamId);
+    if (!at)                                                // arena team not found
         return;
 
     if (at->GetCaptainGuid() != _player->GetObjectGuid())
@@ -329,7 +335,7 @@ void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket & recv_data)
 
 void WorldSession::SendArenaTeamCommandResult(uint32 team_action, const std::string& team, const std::string& player, uint32 error_id)
 {
-    WorldPacket data(SMSG_ARENA_TEAM_COMMAND_RESULT, 4+team.length()+1+player.length()+1+4);
+    WorldPacket data(SMSG_ARENA_TEAM_COMMAND_RESULT, 4 + team.length() + 1 + player.length() + 1 + 4);
     data << uint32(team_action);
     data << team;
     data << player;
@@ -339,10 +345,10 @@ void WorldSession::SendArenaTeamCommandResult(uint32 team_action, const std::str
 
 void WorldSession::SendNotInArenaTeamPacket(uint8 type)
 {
-    WorldPacket data(SMSG_ARENA_ERROR, 4+1);                // 886 - You are not in a %uv%u arena team
+    WorldPacket data(SMSG_ARENA_ERROR, 4 + 1);              // 886 - You are not in a %uv%u arena team
     uint32 unk = 0;
     data << uint32(unk);                                    // unk(0)
-    if(!unk)
+    if (!unk)
         data << uint8(type);                                // team type (2=2v2,3=3v3,5=5v5), can be used for custom types...
     SendPacket(&data);
 }
diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
index 4b4b68e59bf..8075e99d17f 100644
--- a/src/game/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
@@ -4,12 +4,13 @@
 #include "../ObjectMgr.h"
 #include "../AuctionHouseMgr.h"
 #include "SystemConfig.h"
+#include "../SQLStorages.h"
 
 // Format is YYYYMMDDRR where RR is the change in the conf file
 // for that day.
 #define AUCTIONHOUSEBOT_CONF_VERSION    2010102201
 
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 struct BuyerAuctionEval
 {
@@ -121,23 +122,23 @@ class AHB_Seller_Config
         void        SetMaxTime(uint32 value) { m_maxTime = value; }
         uint32      GetMaxTime() const { return m_maxTime; }
         // Data access classified by item class and item quality //
-        void        SetItemsAmountPerClass(AuctionQuality quality, ItemClass itemclass, uint32 amount) { m_ItemInfo[quality].ItemClassInfos[itemclass].AmountOfItems=amount * m_ItemInfo[quality].ItemClassInfos[itemclass].Quantity; }
+        void        SetItemsAmountPerClass(AuctionQuality quality, ItemClass itemclass, uint32 amount) { m_ItemInfo[quality].ItemClassInfos[itemclass].AmountOfItems = amount * m_ItemInfo[quality].ItemClassInfos[itemclass].Quantity; }
         uint32      GetItemsAmountPerClass(AuctionQuality quality, ItemClass itemclass) const { return m_ItemInfo[quality].ItemClassInfos[itemclass].AmountOfItems; }
-        void        SetItemsQuantityPerClass(AuctionQuality quality, ItemClass itemclass, uint32 qty) { m_ItemInfo[quality].ItemClassInfos[itemclass].Quantity=qty; }
+        void        SetItemsQuantityPerClass(AuctionQuality quality, ItemClass itemclass, uint32 qty) { m_ItemInfo[quality].ItemClassInfos[itemclass].Quantity = qty; }
         uint32      GetItemsQuantityPerClass(AuctionQuality quality, ItemClass itemclass) const { return m_ItemInfo[quality].ItemClassInfos[itemclass].Quantity; }
         void        SetMissedItemsPerClass(AuctionQuality quality, ItemClass itemclass, uint32 found)
         {
-            if (m_ItemInfo[quality].ItemClassInfos[itemclass].AmountOfItems > found )
-                m_ItemInfo[quality].ItemClassInfos[itemclass].MissItems=m_ItemInfo[quality].ItemClassInfos[itemclass].AmountOfItems - found;
+            if (m_ItemInfo[quality].ItemClassInfos[itemclass].AmountOfItems > found)
+                m_ItemInfo[quality].ItemClassInfos[itemclass].MissItems = m_ItemInfo[quality].ItemClassInfos[itemclass].AmountOfItems - found;
             else
                 m_ItemInfo[quality].ItemClassInfos[itemclass].MissItems = 0;
         }
         uint32      GetMissedItemsPerClass(AuctionQuality quality, ItemClass itemclass) const { return m_ItemInfo[quality].ItemClassInfos[itemclass].MissItems; }
 
         // Data for every quality of item //
-        void        SetItemsAmountPerQuality(AuctionQuality quality, uint32 cnt) { m_ItemInfo[quality].AmountOfItems=cnt; }
+        void        SetItemsAmountPerQuality(AuctionQuality quality, uint32 cnt) { m_ItemInfo[quality].AmountOfItems = cnt; }
         uint32      GetItemsAmountPerQuality(AuctionQuality quality) const { return m_ItemInfo[quality].AmountOfItems; }
-        void        SetPriceRatioPerQuality(AuctionQuality quality, uint32 value) { m_ItemInfo[quality].PriceRatio=value; }
+        void        SetPriceRatioPerQuality(AuctionQuality quality, uint32 value) { m_ItemInfo[quality].PriceRatio = value; }
         uint32      GetPriceRatioPerQuality(AuctionQuality quality) const { return m_ItemInfo[quality].PriceRatio; }
 
     private:
@@ -190,7 +191,7 @@ class AuctionBotSeller : public AuctionBotAgent
         void addNewAuctions(AHB_Seller_Config& config);
         void SetItemsRatio(uint32 al, uint32 ho, uint32 ne);
         void SetItemsRatioForHouse(AuctionHouseType house, uint32 val);
-        void SetItemsAmount(uint32 (&vals) [MAX_AUCTION_QUALITY]);
+        void SetItemsAmount(uint32(&vals) [MAX_AUCTION_QUALITY]);
         void SetItemsAmountForQuality(AuctionQuality quality, uint32 val);
         void LoadConfig();
 
@@ -201,13 +202,13 @@ class AuctionBotSeller : public AuctionBotAgent
 
         void        LoadSellerValues(AHB_Seller_Config& config);
         uint32      SetStat(AHB_Seller_Config& config);
-        bool        getRandomArray( AHB_Seller_Config& config, RandomArray& ra, const std::vector<std::vector<uint32> >& addedItem  );
-        void        SetPricesOfItem(ItemPrototype const *itemProto, AHB_Seller_Config& config, uint32& buyp, uint32& bidp, uint32 stackcnt, ItemQualities itemQuality);
+        bool        getRandomArray(AHB_Seller_Config& config, RandomArray& ra, const std::vector<std::vector<uint32> >& addedItem);
+        void        SetPricesOfItem(ItemPrototype const* itemProto, AHB_Seller_Config& config, uint32& buyp, uint32& bidp, uint32 stackcnt, ItemQualities itemQuality);
         void        LoadItemsQuantity(AHB_Seller_Config& config);
 };
 
-INSTANTIATE_SINGLETON_1( AuctionHouseBot );
-INSTANTIATE_SINGLETON_1( AuctionBotConfig );
+INSTANTIATE_SINGLETON_1(AuctionHouseBot);
+INSTANTIATE_SINGLETON_1(AuctionBotConfig);
 
 //== AuctionBotConfig functions ============================
 
@@ -236,13 +237,13 @@ bool AuctionBotConfig::Initialize()
         return false;
     }
 
-    if ((getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO)==0) && (getConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO)==0) && (getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO)==0) &&
-        !getConfig(CONFIG_BOOL_AHBOT_BUYER_ALLIANCE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_HORDE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_NEUTRAL_ENABLED))
+    if ((getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO) == 0) && (getConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO) == 0) && (getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO) == 0) &&
+            !getConfig(CONFIG_BOOL_AHBOT_BUYER_ALLIANCE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_HORDE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_NEUTRAL_ENABLED))
     {
         sLog.outString("All feature of AuctionHouseBot are disabled! (If you want to use it please set config in 'ahbot.conf')");
         return false;
     }
-    if ((getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO)==0) && (getConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO)==0) && (getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO)==0))
+    if ((getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO) == 0) && (getConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO) == 0) && (getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO) == 0))
         sLog.outString("AuctionHouseBot SELLER is disabled! (If you want to use it please set config in 'ahbot.conf')");
 
     if (!getConfig(CONFIG_BOOL_AHBOT_BUYER_ALLIANCE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_HORDE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_NEUTRAL_ENABLED))
@@ -255,7 +256,7 @@ bool AuctionBotConfig::Initialize()
 
 void AuctionBotConfig::setConfig(AuctionBotConfigUInt32Values index, char const* fieldname, uint32 defvalue)
 {
-    setConfig(index, m_AhBotCfg.GetIntDefault(fieldname,defvalue));
+    setConfig(index, m_AhBotCfg.GetIntDefault(fieldname, defvalue));
     if (int32(getConfig(index)) < 0)
     {
         sLog.outError("AHBot: %s (%i) can't be negative. Using %u instead.", fieldname, int32(getConfig(index)), defvalue);
@@ -265,7 +266,7 @@ void AuctionBotConfig::setConfig(AuctionBotConfigUInt32Values index, char const*
 
 void AuctionBotConfig::setConfigMax(AuctionBotConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 maxvalue)
 {
-    setConfig(index, m_AhBotCfg.GetIntDefault(fieldname,defvalue));
+    setConfig(index, m_AhBotCfg.GetIntDefault(fieldname, defvalue));
     if (getConfig(index) > maxvalue)
     {
         sLog.outError("AHBot: %s (%u) must be in range 0...%u. Using %u instead.", fieldname, getConfig(index), maxvalue, maxvalue);
@@ -275,7 +276,7 @@ void AuctionBotConfig::setConfigMax(AuctionBotConfigUInt32Values index, char con
 
 void AuctionBotConfig::setConfigMinMax(AuctionBotConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue, uint32 maxvalue)
 {
-    setConfig(index, m_AhBotCfg.GetIntDefault(fieldname,defvalue));
+    setConfig(index, m_AhBotCfg.GetIntDefault(fieldname, defvalue));
     if (getConfig(index) > maxvalue)
     {
         sLog.outError("AHBot: %s (%u) must be in range %u...%u. Using %u instead.", fieldname, getConfig(index), minvalue, maxvalue, maxvalue);
@@ -290,13 +291,18 @@ void AuctionBotConfig::setConfigMinMax(AuctionBotConfigUInt32Values index, char
 
 void AuctionBotConfig::setConfig(AuctionBotConfigBoolValues index, char const* fieldname, bool defvalue)
 {
-    setConfig(index, m_AhBotCfg.GetBoolDefault(fieldname,defvalue));
+    setConfig(index, m_AhBotCfg.GetBoolDefault(fieldname, defvalue));
 }
 
-//Get AuctionHousebot configuration file
+void AuctionBotConfig::setConfig(AuctionBotConfigFloatValues index, char const* fieldname, float defvalue)
+{
+    setConfig(index, m_AhBotCfg.GetFloatDefault(fieldname,defvalue));
+}
+
+// Get AuctionHousebot configuration file
 void AuctionBotConfig::GetConfigFromFile()
 {
-    //Check config file version
+    // Check config file version
     if (m_AhBotCfg.GetIntDefault("ConfVersion", 0) != AUCTIONHOUSEBOT_CONF_VERSION)
         sLog.outError("AHBot: Configuration file version doesn't match expected version. Some config variables may be wrong or missing.");
 
@@ -321,6 +327,8 @@ void AuctionBotConfig::GetConfigFromFile()
     setConfig(CONFIG_BOOL_AHBOT_BIND_USE                     , "AuctionHouseBot.Bind.Use"                    , true);
     setConfig(CONFIG_BOOL_AHBOT_BIND_QUEST                   , "AuctionHouseBot.Bind.Quest"                  , false);
     setConfig(CONFIG_BOOL_AHBOT_LOCKBOX_ENABLED              , "AuctionHouseBot.LockBox.Enabled"             , false);
+    setConfig(CONFIG_BOOL_AHBOT_PETS_ENABLED                 , "AuctionHouseBot.Pets.Enabled"                , false);
+    setConfig(CONFIG_BOOL_AHBOT_DM_CARDS_ENABLED             , "AuctionHouseBot.DMcards.Enabled"             , false);
 
     setConfig(CONFIG_BOOL_AHBOT_BUYPRICE_SELLER              , "AuctionHouseBot.BuyPrice.Seller"             , true);
 
@@ -368,7 +376,7 @@ void AuctionBotConfig::GetConfigFromFile()
     setConfigMinMax(CONFIG_UINT32_AHBOT_BUYER_CHANCE_RATIO_ALLIANCE, "AuctionHouseBot.Buyer.Alliance.Chance.Ratio", 3, 1, 100);
     setConfigMinMax(CONFIG_UINT32_AHBOT_BUYER_CHANCE_RATIO_HORDE   , "AuctionHouseBot.Buyer.Horde.Chance.Ratio"   , 3, 1, 100);
     setConfigMinMax(CONFIG_UINT32_AHBOT_BUYER_CHANCE_RATIO_NEUTRAL , "AuctionHouseBot.Buyer.Neutral.Chance.Ratio" , 3, 1, 100);
-    setConfigMinMax(CONFIG_UINT32_AHBOT_BUYER_RECHECK_INTERVAL     , "AuctionHouseBot.Buyer.Recheck.Interval"     , 20,1, DAY/MINUTE);
+    setConfigMinMax(CONFIG_UINT32_AHBOT_BUYER_RECHECK_INTERVAL     , "AuctionHouseBot.Buyer.Recheck.Interval"     , 20, 1, DAY / MINUTE);
 
     setConfig(CONFIG_BOOL_AHBOT_DEBUG_SELLER                 , "AuctionHouseBot.DEBUG.Seller"               , false);
     setConfig(CONFIG_BOOL_AHBOT_DEBUG_BUYER                  , "AuctionHouseBot.DEBUG.Buyer"                , false);
@@ -388,6 +396,12 @@ void AuctionBotConfig::GetConfigFromFile()
     setConfig(CONFIG_UINT32_AHBOT_CLASS_TRADEGOOD_MAX_ITEM_LEVEL   , "AuctionHouseBot.Class.TradeGood.ItemLevel.Max" , 0);
     setConfig(CONFIG_UINT32_AHBOT_CLASS_CONTAINER_MIN_ITEM_LEVEL   , "AuctionHouseBot.Class.Container.ItemLevel.Min" , 0);
     setConfig(CONFIG_UINT32_AHBOT_CLASS_CONTAINER_MAX_ITEM_LEVEL   , "AuctionHouseBot.Class.Container.ItemLevel.Max" , 0);
+
+    setConfig(CONFIG_FLOAT_AHBOT_BIND_NO_MULTIPLIER           , "AuctionHouseBot.Bind.No.Multiplier"                     , 1.0f );
+    setConfig(CONFIG_FLOAT_AHBOT_BIND_PICKUP_MULTIPLIER       , "AuctionHouseBot.Bind.Pickup.Multiplier"                 , 1.0f );
+    setConfig(CONFIG_FLOAT_AHBOT_BIND_EQUIP_MULTIPLIER        , "AuctionHouseBot.Bind.Equip.Multiplier"                  , 1.0f );
+    setConfig(CONFIG_FLOAT_AHBOT_BIND_USE_MULTIPLIER          , "AuctionHouseBot.Bind.Use.Multiplier"                    , 1.0f );
+    setConfig(CONFIG_FLOAT_AHBOT_BIND_QUEST_MULTIPLIER        , "AuctionHouseBot.Bind.Quest.Multiplier"                  , 1.0f );
 }
 
 bool AuctionBotConfig::Reload()
@@ -440,8 +454,8 @@ uint32 AuctionBotConfig::getConfigItemQualityAmount(AuctionQuality quality) cons
         case AUCTION_QUALITY_WHITE: return getConfig(CONFIG_UINT32_AHBOT_ITEM_WHITE_AMOUNT);
         case AUCTION_QUALITY_GREEN: return getConfig(CONFIG_UINT32_AHBOT_ITEM_GREEN_AMOUNT);
         case AUCTION_QUALITY_BLUE:  return getConfig(CONFIG_UINT32_AHBOT_ITEM_BLUE_AMOUNT);
-        case AUCTION_QUALITY_PURPLE:return getConfig(CONFIG_UINT32_AHBOT_ITEM_PURPLE_AMOUNT);
-        case AUCTION_QUALITY_ORANGE:return getConfig(CONFIG_UINT32_AHBOT_ITEM_ORANGE_AMOUNT);
+        case AUCTION_QUALITY_PURPLE: return getConfig(CONFIG_UINT32_AHBOT_ITEM_PURPLE_AMOUNT);
+        case AUCTION_QUALITY_ORANGE: return getConfig(CONFIG_UINT32_AHBOT_ITEM_ORANGE_AMOUNT);
         default:                    return getConfig(CONFIG_UINT32_AHBOT_ITEM_YELLOW_AMOUNT);
     }
 }
@@ -475,7 +489,7 @@ bool AuctionBotBuyer::Initialize()
     if (!active_house)
         return false;
 
-    //load Check interval
+    // load Check interval
     m_CheckInterval = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_BUYER_RECHECK_INTERVAL) * MINUTE;
     DETAIL_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot buyer interval between 2 check = %u", m_CheckInterval);
     sLog.SetLogFilter(LOG_FILTER_AHBOT_BUYER, !sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_DEBUG_BUYER));
@@ -485,22 +499,22 @@ bool AuctionBotBuyer::Initialize()
 void AuctionBotBuyer::LoadBuyerValues(AHB_Buyer_Config& config)
 {
     uint32 FactionChance;
-    switch(config.GetHouseType())
+    switch (config.GetHouseType())
     {
         case AUCTION_HOUSE_ALLIANCE:
-            config.BuyerPriceRatio = sAuctionBotConfig.getConfig( CONFIG_UINT32_AHBOT_ALLIANCE_PRICE_RATIO )+50;
-            FactionChance = sAuctionBotConfig.getConfig( CONFIG_UINT32_AHBOT_BUYER_CHANCE_RATIO_ALLIANCE );
+            config.BuyerPriceRatio = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_PRICE_RATIO) + 50;
+            FactionChance = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_BUYER_CHANCE_RATIO_ALLIANCE);
             break;
         case AUCTION_HOUSE_HORDE:
-            config.BuyerPriceRatio = sAuctionBotConfig.getConfig( CONFIG_UINT32_AHBOT_HORDE_PRICE_RATIO )+50;
-            FactionChance = sAuctionBotConfig.getConfig( CONFIG_UINT32_AHBOT_BUYER_CHANCE_RATIO_HORDE );
+            config.BuyerPriceRatio = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_HORDE_PRICE_RATIO) + 50;
+            FactionChance = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_BUYER_CHANCE_RATIO_HORDE);
             break;
         default:
-            config.BuyerPriceRatio = sAuctionBotConfig.getConfig( CONFIG_UINT32_AHBOT_NEUTRAL_PRICE_RATIO )+50;
-            FactionChance = sAuctionBotConfig.getConfig( CONFIG_UINT32_AHBOT_BUYER_CHANCE_RATIO_NEUTRAL );
+            config.BuyerPriceRatio = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_PRICE_RATIO) + 50;
+            FactionChance = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_BUYER_CHANCE_RATIO_NEUTRAL);
             break;
     }
-    config.FactionChance=5000*FactionChance;
+    config.FactionChance = 5000 * FactionChance;
 }
 
 void AuctionBotBuyer::LoadConfig()
@@ -516,59 +530,59 @@ void AuctionBotBuyer::LoadConfig()
 uint32 AuctionBotBuyer::GetBuyableEntry(AHB_Buyer_Config& config)
 {
     config.SameItemInfo.clear();
-    uint32 count=0;
-    time_t Now=time(NULL);
+    uint32 count = 0;
+    time_t Now = time(NULL);
 
     AuctionHouseObject::AuctionEntryMapBounds bounds = sAuctionMgr.GetAuctionsMap(config.GetHouseType())->GetAuctionsBounds();
     for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
     {
-        AuctionEntry *Aentry = itr->second;
-        Item *item = sAuctionMgr.GetAItem(Aentry->itemGuidLow);
+        AuctionEntry* Aentry = itr->second;
+        Item* item = sAuctionMgr.GetAItem(Aentry->itemGuidLow);
         if (item)
         {
-            ItemPrototype const *prototype = item->GetProto();
+            ItemPrototype const* prototype = item->GetProto();
             if (prototype)
             {
                 ++config.SameItemInfo[item->GetEntry()].ItemCount;    // Structure constructor will make sure Element are correctly initialised if entry is created here.
-                config.SameItemInfo[item->GetEntry()].BuyPrice =config.SameItemInfo[item->GetEntry()].BuyPrice + (itr->second->buyout/item->GetCount());
-                config.SameItemInfo[item->GetEntry()].BidPrice =config.SameItemInfo[item->GetEntry()].BidPrice + (itr->second->startbid/item->GetCount());
+                config.SameItemInfo[item->GetEntry()].BuyPrice = config.SameItemInfo[item->GetEntry()].BuyPrice + (itr->second->buyout / item->GetCount());
+                config.SameItemInfo[item->GetEntry()].BidPrice = config.SameItemInfo[item->GetEntry()].BidPrice + (itr->second->startbid / item->GetCount());
                 if (itr->second->buyout != 0)
                 {
-                    if (itr->second->buyout/item->GetCount() < config.SameItemInfo[item->GetEntry()].MinBuyPrice)
-                        config.SameItemInfo[item->GetEntry()].MinBuyPrice = itr->second->buyout/item->GetCount();
+                    if (itr->second->buyout / item->GetCount() < config.SameItemInfo[item->GetEntry()].MinBuyPrice)
+                        config.SameItemInfo[item->GetEntry()].MinBuyPrice = itr->second->buyout / item->GetCount();
                     else if (config.SameItemInfo[item->GetEntry()].MinBuyPrice == 0)
-                        config.SameItemInfo[item->GetEntry()].MinBuyPrice = itr->second->buyout/item->GetCount();
+                        config.SameItemInfo[item->GetEntry()].MinBuyPrice = itr->second->buyout / item->GetCount();
                 }
-                if (itr->second->startbid/item->GetCount() < config.SameItemInfo[item->GetEntry()].MinBidPrice)
-                    config.SameItemInfo[item->GetEntry()].MinBidPrice = itr->second->startbid/item->GetCount();
+                if (itr->second->startbid / item->GetCount() < config.SameItemInfo[item->GetEntry()].MinBidPrice)
+                    config.SameItemInfo[item->GetEntry()].MinBidPrice = itr->second->startbid / item->GetCount();
                 else if (config.SameItemInfo[item->GetEntry()].MinBidPrice == 0)
-                    config.SameItemInfo[item->GetEntry()].MinBidPrice = itr->second->startbid/item->GetCount();
+                    config.SameItemInfo[item->GetEntry()].MinBidPrice = itr->second->startbid / item->GetCount();
 
                 if (!Aentry->owner)
                 {
 
-                    if ((Aentry->bid!=0) && Aentry->bidder) // Add bided by player
+                    if ((Aentry->bid != 0) && Aentry->bidder) // Add bided by player
                     {
-                        config.CheckedEntry[Aentry->Id].LastExist=Now;
-                        config.CheckedEntry[Aentry->Id].AuctionId=Aentry->Id;
+                        config.CheckedEntry[Aentry->Id].LastExist = Now;
+                        config.CheckedEntry[Aentry->Id].AuctionId = Aentry->Id;
                         ++count;
                     }
                 }
                 else
                 {
-                    if (Aentry->bid!=0)
+                    if (Aentry->bid != 0)
                     {
-                        if  (Aentry->bidder)
+                        if (Aentry->bidder)
                         {
-                            config.CheckedEntry[Aentry->Id].LastExist=Now;
-                            config.CheckedEntry[Aentry->Id].AuctionId=Aentry->Id;
+                            config.CheckedEntry[Aentry->Id].LastExist = Now;
+                            config.CheckedEntry[Aentry->Id].AuctionId = Aentry->Id;
                             ++count;
                         }
                     }
                     else
                     {
-                        config.CheckedEntry[Aentry->Id].LastExist=Now;
-                        config.CheckedEntry[Aentry->Id].AuctionId=Aentry->Id;
+                        config.CheckedEntry[Aentry->Id].LastExist = Now;
+                        config.CheckedEntry[Aentry->Id].AuctionId = Aentry->Id;
                         ++count;
                     }
                 }
@@ -576,18 +590,18 @@ uint32 AuctionBotBuyer::GetBuyableEntry(AHB_Buyer_Config& config)
         }
     }
 
-    DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: %u items added to buyable vector for ah type: %u",count, config.GetHouseType());
+    DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: %u items added to buyable vector for ah type: %u", count, config.GetHouseType());
     DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: SameItemInfo size = " SIZEFMTD, config.SameItemInfo.size());
     return count;
 }
 
 void AuctionBotBuyer::PrepareListOfEntry(AHB_Buyer_Config& config)
 {
-    time_t Now=time(NULL)-5;
+    time_t Now = time(NULL) - 5;
 
-    for (CheckEntryMap::iterator itr=config.CheckedEntry.begin();itr != config.CheckedEntry.end();)
+    for (CheckEntryMap::iterator itr = config.CheckedEntry.begin(); itr != config.CheckedEntry.end();)
     {
-        if (itr->second.LastExist  < (Now-5))
+        if (itr->second.LastExist  < (Now - 5))
             config.CheckedEntry.erase(itr++);
         else
             ++itr;
@@ -598,109 +612,110 @@ void AuctionBotBuyer::PrepareListOfEntry(AHB_Buyer_Config& config)
 
 bool AuctionBotBuyer::IsBuyableEntry(uint32 buyoutPrice, double InGame_BuyPrice, double MaxBuyablePrice, uint32 MinBuyPrice, uint32 MaxChance, uint32 ChanceRatio)
 {
-    double ratio=0;
-    uint32 Chance=0;
+    double ratio = 0;
+    uint32 Chance = 0;
 
     if (buyoutPrice <= MinBuyPrice)
     {
         if (buyoutPrice <= MaxBuyablePrice)
-            Chance=MaxChance;
+            Chance = MaxChance;
         else
         {
 
             if ((buyoutPrice > 0) && (MaxBuyablePrice > 0))
             {
-                    ratio = buyoutPrice / MaxBuyablePrice;
-                    if (ratio < 10)
-                        Chance=MaxChance - (ratio*(MaxChance/10));
-                    else Chance=1;
+                ratio = buyoutPrice / MaxBuyablePrice;
+                if (ratio < 10)
+                    Chance = MaxChance - (ratio * (MaxChance / 10));
+                else Chance = 1;
             }
         }
     }
     else if (buyoutPrice <= InGame_BuyPrice)
     {
         if (buyoutPrice <= MaxBuyablePrice)
-            Chance=MaxChance/5;
+            Chance = MaxChance / 5;
         else
         {
 
             if ((buyoutPrice > 0) && (MaxBuyablePrice > 0))
             {
-                    ratio = buyoutPrice / MaxBuyablePrice;
-                    if (ratio < 10)
-                        Chance=(MaxChance/5) - (ratio*(MaxChance/50));
-                    else Chance=1;
+                ratio = buyoutPrice / MaxBuyablePrice;
+                if (ratio < 10)
+                    Chance = (MaxChance / 5) - (ratio * (MaxChance / 50));
+                else Chance = 1;
             }
         }
     }
     else if (buyoutPrice <= MaxBuyablePrice)
-        Chance = MaxChance/10;
+        Chance = MaxChance / 10;
     else
     {
         if ((buyoutPrice > 0) && (MaxBuyablePrice > 0))
         {
             ratio = buyoutPrice / MaxBuyablePrice;
             if (ratio < 10)
-                Chance=(MaxChance/5) - (ratio*(MaxChance/50));
-            else Chance=0;
-         }
+                Chance = (MaxChance / 5) - (ratio * (MaxChance / 50));
+            else Chance = 0;
+        }
         else Chance = 0;
     }
-    uint32 RandNum = urand(1,ChanceRatio);
-    if (RandNum<=Chance)
+    uint32 RandNum = urand(1, ChanceRatio);
+    if (RandNum <= Chance)
     {
-        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: WIN BUY! Chance = %u, num = %u.",Chance, RandNum);
+        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: WIN BUY! Chance = %u, num = %u.", Chance, RandNum);
         return true;
     }
     else
     {
-        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot:LOOSE BUY! Chance = %u, num = %u.",Chance, RandNum);
+        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot:LOOSE BUY! Chance = %u, num = %u.", Chance, RandNum);
         return false;
     }
 }
 
 bool AuctionBotBuyer::IsBidableEntry(uint32 bidPrice, double InGame_BuyPrice, double MaxBidablePrice, uint32 MinBidPrice, uint32 MaxChance, uint32 ChanceRatio)
 {
-    double ratio=0;
-    uint32 Chance=0;
+    double ratio = 0;
+    uint32 Chance = 0;
 
     if (bidPrice <= MinBidPrice)
     {
         if ((InGame_BuyPrice != 0) && (bidPrice < (InGame_BuyPrice - (InGame_BuyPrice / 30))))
-            Chance=MaxChance;
+            Chance = MaxChance;
         else
         {
             if (bidPrice < MaxBidablePrice)
             {
                 ratio = MaxBidablePrice / bidPrice;
                 if (ratio < 3)
-                    Chance = ((MaxChance/500)*ratio);
+                    Chance = ((MaxChance / 500) * ratio);
                 else
-                    Chance = (MaxChance/500);
+                    Chance = (MaxChance / 500);
             }
         }
     }
     else if (bidPrice < (InGame_BuyPrice - (InGame_BuyPrice / 30)))
-        Chance=(MaxChance/10);
+        Chance = (MaxChance / 10);
     else
     {
         if (bidPrice < MaxBidablePrice)
         {
             ratio = MaxBidablePrice / bidPrice;
             if (ratio < 4)
-                Chance = ((MaxChance/1000)*ratio);
+                Chance = ((MaxChance / 1000) * ratio);
             else
-                Chance = (MaxChance/1000);
+                Chance = (MaxChance / 1000);
         }
     }
-    uint32 RandNum = urand(1,ChanceRatio);
-    if (RandNum<=Chance)
+    uint32 RandNum = urand(1, ChanceRatio);
+    if (RandNum <= Chance)
     {
-        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: WIN BID! Chance = %u, num = %u.",Chance, RandNum);
+        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: WIN BID! Chance = %u, num = %u.", Chance, RandNum);
         return true;
-    } else
+    }
+    else
     {
-        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: LOOSE BID! Chance = %u, num = %u.",Chance, RandNum);
+        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: LOOSE BID! Chance = %u, num = %u.", Chance, RandNum);
         return false;
     }
 }
@@ -713,7 +728,7 @@ void AuctionBotBuyer::PlaceBidToEntry(AuctionEntry* auction, uint32 bidPrice)
 
 void AuctionBotBuyer::BuyEntry(AuctionEntry* auction)
 {
-   DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: Entry %u buyed at %.2fg", auction->Id, float(auction->buyout) / 10000.0f);
+    DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: Entry %u buyed at %.2fg", auction->Id, float(auction->buyout) / 10000.0f);
     auction->UpdateBid(auction->buyout);
 }
 
@@ -727,19 +742,19 @@ void AuctionBotBuyer::addNewAuctionBuyerBotBid(AHB_Buyer_Config& config)
     uint32 BuyCycles;
     if (config.CheckedEntry.size() > sAuctionBotConfig.GetItemPerCycleBoost())
     {
-        BuyCycles=sAuctionBotConfig.GetItemPerCycleBoost();
+        BuyCycles = sAuctionBotConfig.GetItemPerCycleBoost();
         BASIC_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: Boost value used for Buyer! (if this happens often adjust both ItemsPerCycle in ahbot.conf)");
     }
     else
-        BuyCycles=sAuctionBotConfig.GetItemPerCycleNormal();
+        BuyCycles = sAuctionBotConfig.GetItemPerCycleNormal();
 
-    for (CheckEntryMap::iterator itr =config.CheckedEntry.begin(); itr != config.CheckedEntry.end();)
+    for (CheckEntryMap::iterator itr = config.CheckedEntry.begin(); itr != config.CheckedEntry.end();)
     {
         AuctionEntry* auction = auctionHouse->GetAuction(itr->second.AuctionId);
         if (!auction || auction->moneyDeliveryTime)         // is auction not active now
         {
             DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: Entry %u on ah %u doesn't exists, perhaps bought already?",
-                itr->second.AuctionId, auction->GetHouseId());
+                             itr->second.AuctionId, auction->GetHouseId());
 
             config.CheckedEntry.erase(itr++);
             continue;
@@ -755,59 +770,59 @@ void AuctionBotBuyer::addNewAuctionBuyerBotBid(AHB_Buyer_Config& config)
         if (BuyCycles == 0)
             break;
 
-        uint32 MaxChance=5000;
+        uint32 MaxChance = 5000;
 
-        Item *item = sAuctionMgr.GetAItem(auction->itemGuidLow);
+        Item* item = sAuctionMgr.GetAItem(auction->itemGuidLow);
         if (!item)                                          // auction item not accessible, possible auction in payment pending mode
         {
             config.CheckedEntry.erase(itr++);
             continue;
         }
 
-        ItemPrototype const *prototype = item->GetProto();
+        ItemPrototype const* prototype = item->GetProto();
 
         uint32 BasePrice = sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_BUYPRICE_BUYER) ? prototype->BuyPrice : prototype->SellPrice;
         BasePrice *= item->GetCount();
 
-        double MaxBuyablePrice = ( BasePrice * config.BuyerPriceRatio )/100;
+        double MaxBuyablePrice = (BasePrice * config.BuyerPriceRatio) / 100;
         BuyerItemInfoMap::iterator sameitem_itr = config.SameItemInfo.find(item->GetEntry());
-        uint32 buyoutPrice = auction->buyout/item->GetCount();
+        uint32 buyoutPrice = auction->buyout / item->GetCount();
 
         uint32 bidPrice;
         uint32 bidPriceByItem;
         if (auction->bid >= auction->startbid)
         {
             bidPrice = auction->GetAuctionOutBid();
-            bidPriceByItem = auction->bid/item->GetCount();
+            bidPriceByItem = auction->bid / item->GetCount();
         }
         else
         {
             bidPrice = auction->startbid;
-            bidPriceByItem = auction->startbid/item->GetCount();
+            bidPriceByItem = auction->startbid / item->GetCount();
         }
 
         double InGame_BuyPrice;
         double InGame_BidPrice;
-        if (sameitem_itr==config.SameItemInfo.end())
+        if (sameitem_itr == config.SameItemInfo.end())
         {
-            InGame_BuyPrice=0;
-            InGame_BidPrice=0;
+            InGame_BuyPrice = 0;
+            InGame_BidPrice = 0;
         }
         else
         {
             if (sameitem_itr->second.ItemCount == 1) MaxBuyablePrice = MaxBuyablePrice * 5; // if only one item exist can be buyed if the price is high too.
-            InGame_BuyPrice=sameitem_itr->second.BuyPrice/sameitem_itr->second.ItemCount;
-            InGame_BidPrice=sameitem_itr->second.BidPrice/sameitem_itr->second.ItemCount;
+            InGame_BuyPrice = sameitem_itr->second.BuyPrice / sameitem_itr->second.ItemCount;
+            InGame_BidPrice = sameitem_itr->second.BidPrice / sameitem_itr->second.ItemCount;
         }
 
-        double MaxBidablePrice = MaxBuyablePrice - ( MaxBuyablePrice / 30); // Max Bidable price defined to 70% of max buyable price
+        double MaxBidablePrice = MaxBuyablePrice - (MaxBuyablePrice / 30);  // Max Bidable price defined to 70% of max buyable price
 
         DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: Auction added with data:");
         DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: MaxPrice of Entry %u is %.1fg.", itr->second.AuctionId, MaxBuyablePrice / 10000);
-        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: GamePrice buy=%.1fg, bid=%.1fg.",InGame_BuyPrice/10000, InGame_BidPrice / 10000);
+        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: GamePrice buy=%.1fg, bid=%.1fg.", InGame_BuyPrice / 10000, InGame_BidPrice / 10000);
         DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: Minimal price see in AH Buy=%ug, Bid=%ug.",
-            sameitem_itr->second.MinBuyPrice / 10000,sameitem_itr->second.MinBidPrice / 10000);
-        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: Actual Entry price,  Buy=%ug, Bid=%ug.", buyoutPrice / 10000, bidPrice/ 10000);
+                         sameitem_itr->second.MinBuyPrice / 10000, sameitem_itr->second.MinBidPrice / 10000);
+        DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: Actual Entry price,  Buy=%ug, Bid=%ug.", buyoutPrice / 10000, bidPrice / 10000);
 
         if (!auction->owner)                // Original auction owner
         {
@@ -817,19 +832,19 @@ void AuctionBotBuyer::addNewAuctionBuyerBotBid(AHB_Buyer_Config& config)
         {
             if (IsBuyableEntry(buyoutPrice, InGame_BuyPrice, MaxBuyablePrice, sameitem_itr->second.MinBuyPrice, MaxChance, config.FactionChance))
             {
-                if (IsBidableEntry(bidPriceByItem, InGame_BuyPrice, MaxBidablePrice, sameitem_itr->second.MinBidPrice, MaxChance/2, config.FactionChance))
-                    if (urand(0,5)==0) PlaceBidToEntry(auction, bidPrice); else BuyEntry(auction);
+                if (IsBidableEntry(bidPriceByItem, InGame_BuyPrice, MaxBidablePrice, sameitem_itr->second.MinBidPrice, MaxChance / 2, config.FactionChance))
+                        if (urand(0, 5) == 0) PlaceBidToEntry(auction, bidPrice); else BuyEntry(auction);
                 else
                     BuyEntry(auction);
             }
             else
             {
-                if (IsBidableEntry(bidPriceByItem, InGame_BuyPrice, MaxBidablePrice, sameitem_itr->second.MinBidPrice, MaxChance/2, config.FactionChance))
+                if (IsBidableEntry(bidPriceByItem, InGame_BuyPrice, MaxBidablePrice, sameitem_itr->second.MinBidPrice, MaxChance / 2, config.FactionChance))
                     PlaceBidToEntry(auction, bidPrice);
             }
         }
         else // buyout = 0 mean only bid are possible
-            if (IsBidableEntry(bidPriceByItem, InGame_BuyPrice, MaxBidablePrice, sameitem_itr->second.MinBidPrice,MaxChance, config.FactionChance))
+            if (IsBidableEntry(bidPriceByItem, InGame_BuyPrice, MaxBidablePrice, sameitem_itr->second.MinBidPrice, MaxChance, config.FactionChance))
                 PlaceBidToEntry(auction, bidPrice);
 
         itr->second.LastChecked = Now;
@@ -877,14 +892,14 @@ bool AuctionBotSeller::Initialize()
     {
         std::stringstream includeStream(sAuctionBotConfig.GetAHBotIncludes());
         std::string temp;
-        while (getline(includeStream,temp, ','))
+        while (getline(includeStream, temp, ','))
             includeItems.push_back(atoi(temp.c_str()));
     }
 
     {
         std::stringstream excludeStream(sAuctionBotConfig.GetAHBotExcludes());
         std::string temp;
-        while (getline(excludeStream,temp, ','))
+        while (getline(excludeStream, temp, ','))
             excludeItems.push_back(atoi(temp.c_str()));
 
     }
@@ -902,7 +917,8 @@ bool AuctionBotSeller::Initialize()
             Field* fields = result->Fetch();
             npcItems.push_back(fields[0].GetUInt32());
 
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
         delete result;
     }
     else
@@ -915,16 +931,16 @@ bool AuctionBotSeller::Initialize()
 
     sLog.outString("Loading loot items for filter..");
     if (QueryResult* result = WorldDatabase.PQuery(
-        "SELECT item FROM creature_loot_template UNION "
-        "SELECT item FROM disenchant_loot_template UNION "
-        "SELECT item FROM fishing_loot_template UNION "
-        "SELECT item FROM gameobject_loot_template UNION "
-        "SELECT item FROM item_loot_template UNION "
-        "SELECT item FROM milling_loot_template UNION "
-        "SELECT item FROM pickpocketing_loot_template UNION "
-        "SELECT item FROM prospecting_loot_template UNION "
-        "SELECT item FROM skinning_loot_template UNION "
-        "SELECT item FROM spell_loot_template"))
+                                  "SELECT item FROM creature_loot_template UNION "
+                                  "SELECT item FROM disenchant_loot_template UNION "
+                                  "SELECT item FROM fishing_loot_template UNION "
+                                  "SELECT item FROM gameobject_loot_template UNION "
+                                  "SELECT item FROM item_loot_template UNION "
+                                  "SELECT item FROM milling_loot_template UNION "
+                                  "SELECT item FROM pickpocketing_loot_template UNION "
+                                  "SELECT item FROM prospecting_loot_template UNION "
+                                  "SELECT item FROM skinning_loot_template UNION "
+                                  "SELECT item FROM spell_loot_template"))
     {
         BarGoLink bar(result->GetRowCount());
         do
@@ -937,7 +953,8 @@ bool AuctionBotSeller::Initialize()
                 continue;
 
             lootItems.push_back(fields[0].GetUInt32());
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
         delete result;
     }
     else
@@ -952,8 +969,8 @@ bool AuctionBotSeller::Initialize()
 
     uint32 itemsAdded = 0;
 
-    BarGoLink bar(sItemStorage.MaxEntry);
-    for (uint32 itemID = 0; itemID < sItemStorage.MaxEntry; ++itemID)
+    BarGoLink bar(sItemStorage.GetMaxEntry());
+    for (uint32 itemID = 0; itemID < sItemStorage.GetMaxEntry(); ++itemID)
     {
         ItemPrototype const* prototype = sObjectMgr.GetItemPrototype(itemID);
 
@@ -969,7 +986,7 @@ bool AuctionBotSeller::Initialize()
         // forced exclude filter
         bool isExcludeItem = false;
         for (size_t i = 0; (i < excludeItems.size() && (!isExcludeItem)); ++i)
-            if (itemID ==excludeItems[i])
+            if (itemID == excludeItems[i])
                 isExcludeItem = true;
         if (isExcludeItem)
             continue;
@@ -1017,7 +1034,7 @@ bool AuctionBotSeller::Initialize()
         // no price filter
         if (sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_BUYPRICE_SELLER))
         {
-            if(prototype->BuyPrice == 0)
+            if (prototype->BuyPrice == 0)
                 continue;
         }
         else
@@ -1087,7 +1104,7 @@ bool AuctionBotSeller::Initialize()
                         continue;
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MIN_SKILL_RANK))
                     if (prototype->RequiredSkillRank < value)
-                    continue;
+                        continue;
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MAX_SKILL_RANK))
                     if (prototype->RequiredSkillRank > value)
                         continue;
@@ -1112,7 +1129,8 @@ bool AuctionBotSeller::Initialize()
                 break;
             }
             case ITEM_CLASS_MISC:
-                if (prototype->SubClass==ITEM_SUBCLASS_JUNK_MOUNT)
+            {
+                if (prototype->SubClass == ITEM_SUBCLASS_JUNK_MOUNT)
                 {
                     if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_MISC_MOUNT_MIN_REQ_LEVEL))
                         if (prototype->RequiredLevel < value)
@@ -1138,7 +1156,24 @@ bool AuctionBotSeller::Initialize()
                         continue;
                 }
 
+                if (prototype->BagFamily & BAG_FAMILY_MASK_VANITY_PETS)
+                {
+                    // skip pets if disabled
+                    if (!sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_PETS_ENABLED))
+                        continue;
+                }
+                break;
+            }
+            case ITEM_CLASS_QUEST:
+            {
+                if (prototype->BagFamily & BAG_FAMILY_MASK_INSCRIPTION_SUPP)
+                {
+                    // skip darkmoon cards if disabled
+                    if (!sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_DM_CARDS_ENABLED))
+                        continue;
+                }
                 break;
+            }
             case ITEM_CLASS_GLYPH:
             {
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_GLYPH_MIN_REQ_LEVEL))
@@ -1198,10 +1233,10 @@ bool AuctionBotSeller::Initialize()
     sLog.outString("Items loaded      \tGrey\tWhite\tGreen\tBlue\tPurple\tOrange\tYellow");
     for (uint32 i = 0; i < MAX_ITEM_CLASS; ++i)
         sLog.outString("%-18s\t" SIZEFMTD "\t" SIZEFMTD "\t" SIZEFMTD "\t" SIZEFMTD "\t" SIZEFMTD "\t" SIZEFMTD "\t" SIZEFMTD,
-            sAuctionBotConfig.GetItemClassName(ItemClass(i)),
-            m_ItemPool[0][i].size(), m_ItemPool[1][i].size(), m_ItemPool[2][i].size(),
-            m_ItemPool[3][i].size(), m_ItemPool[4][i].size(), m_ItemPool[5][i].size(),
-            m_ItemPool[6][i].size());
+                       sAuctionBotConfig.GetItemClassName(ItemClass(i)),
+                       m_ItemPool[0][i].size(), m_ItemPool[1][i].size(), m_ItemPool[2][i].size(),
+                       m_ItemPool[3][i].size(), m_ItemPool[4][i].size(), m_ItemPool[5][i].size(),
+                       m_ItemPool[6][i].size());
 
     sLog.outString();
     sLog.outString("AHBot seller configuration data loaded and initilized");
@@ -1349,11 +1384,11 @@ void AuctionBotSeller::LoadItemsQuantity(AHB_Seller_Config& config)
     for (uint32 j = 0; j < MAX_AUCTION_QUALITY; ++j)
     {
         uint32 indice = config.GetItemsAmountPerQuality(AuctionQuality(j)) /
-            (sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_CONSUMABLE_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_CONTAINER_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_WEAPON_AMOUNT) +
-            sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_GEM_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_ARMOR_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_REAGENT_AMOUNT) +
-            sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_PROJECTILE_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_TRADEGOOD_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_GENERIC_AMOUNT) +
-            sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_RECIPE_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_QUIVER_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_QUEST_AMOUNT) +
-            sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_KEY_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_MISC_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_GLYPH_AMOUNT));
+                        (sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_CONSUMABLE_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_CONTAINER_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_WEAPON_AMOUNT) +
+                         sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_GEM_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_ARMOR_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_REAGENT_AMOUNT) +
+                         sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_PROJECTILE_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_TRADEGOOD_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_GENERIC_AMOUNT) +
+                         sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_RECIPE_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_QUIVER_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_QUEST_AMOUNT) +
+                         sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_KEY_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_MISC_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_GLYPH_AMOUNT));
         for (uint32 i = 0; i < MAX_ITEM_CLASS; ++i)
             config.SetItemsAmountPerClass(AuctionQuality(j), ItemClass(i), indice);
     }
@@ -1363,7 +1398,7 @@ void AuctionBotSeller::LoadSellerValues(AHB_Seller_Config& config)
 {
     LoadItemsQuantity(config);
     uint32 PriceRatio;
-    switch(config.GetHouseType())
+    switch (config.GetHouseType())
     {
         case AUCTION_HOUSE_ALLIANCE:
             PriceRatio = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_PRICE_RATIO);
@@ -1375,22 +1410,22 @@ void AuctionBotSeller::LoadSellerValues(AHB_Seller_Config& config)
             PriceRatio = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_PRICE_RATIO);
             break;
     }
-    config.SetPriceRatioPerQuality(AUCTION_QUALITY_GREY,PriceRatio);
-    config.SetPriceRatioPerQuality(AUCTION_QUALITY_WHITE,PriceRatio);
-    config.SetPriceRatioPerQuality(AUCTION_QUALITY_GREEN,PriceRatio);
-    config.SetPriceRatioPerQuality(AUCTION_QUALITY_BLUE,PriceRatio);
-    config.SetPriceRatioPerQuality(AUCTION_QUALITY_PURPLE,PriceRatio);
-    config.SetPriceRatioPerQuality(AUCTION_QUALITY_ORANGE,PriceRatio);
-    config.SetPriceRatioPerQuality(AUCTION_QUALITY_YELLOW,PriceRatio);
-
-    //load min and max auction times
+    config.SetPriceRatioPerQuality(AUCTION_QUALITY_GREY, PriceRatio);
+    config.SetPriceRatioPerQuality(AUCTION_QUALITY_WHITE, PriceRatio);
+    config.SetPriceRatioPerQuality(AUCTION_QUALITY_GREEN, PriceRatio);
+    config.SetPriceRatioPerQuality(AUCTION_QUALITY_BLUE, PriceRatio);
+    config.SetPriceRatioPerQuality(AUCTION_QUALITY_PURPLE, PriceRatio);
+    config.SetPriceRatioPerQuality(AUCTION_QUALITY_ORANGE, PriceRatio);
+    config.SetPriceRatioPerQuality(AUCTION_QUALITY_YELLOW, PriceRatio);
+
+    // load min and max auction times
     config.SetMinTime(sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_MINTIME));
     config.SetMaxTime(sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_MAXTIME));
 
     DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_SELLER, "AHBot: minTime = %u", config.GetMinTime());
     DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_SELLER, "AHBot: maxTime = %u", config.GetMaxTime());
 
-    DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_SELLER, "AHBot: For AH type %u",config.GetHouseType());
+    DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_SELLER, "AHBot: For AH type %u", config.GetHouseType());
     DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_SELLER, "AHBot: GreyItems = %u", config.GetItemsAmountPerQuality(AUCTION_QUALITY_GREY));
     DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_SELLER, "AHBot: WhiteItems = %u", config.GetItemsAmountPerQuality(AUCTION_QUALITY_WHITE));
     DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_SELLER, "AHBot: GreenItems = %u", config.GetItemsAmountPerQuality(AUCTION_QUALITY_GREEN));
@@ -1410,11 +1445,11 @@ uint32 AuctionBotSeller::SetStat(AHB_Seller_Config& config)
     AuctionHouseObject::AuctionEntryMapBounds bounds = sAuctionMgr.GetAuctionsMap(config.GetHouseType())->GetAuctionsBounds();
     for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
     {
-        AuctionEntry *Aentry = itr->second;
-        Item *item = sAuctionMgr.GetAItem(Aentry->itemGuidLow);
+        AuctionEntry* Aentry = itr->second;
+        Item* item = sAuctionMgr.GetAItem(Aentry->itemGuidLow);
         if (item)
         {
-            ItemPrototype const *prototype = item->GetProto();
+            ItemPrototype const* prototype = item->GetProto();
             if (prototype)
             {
                 if (!Aentry->owner)                         // Add only ahbot items
@@ -1424,38 +1459,38 @@ uint32 AuctionBotSeller::SetStat(AHB_Seller_Config& config)
             }
         }
     }
-    uint32 count=0;
-    for (uint32 j=0; j<MAX_AUCTION_QUALITY; ++j)
+    uint32 count = 0;
+    for (uint32 j = 0; j < MAX_AUCTION_QUALITY; ++j)
     {
-        for (uint32 i=0;i<MAX_ITEM_CLASS;++i)
+        for (uint32 i = 0; i < MAX_ITEM_CLASS; ++i)
         {
             config.SetMissedItemsPerClass((AuctionQuality) j, (ItemClass) i, ItemsInAH[j][i]);
-            count+=config.GetMissedItemsPerClass((AuctionQuality) j, (ItemClass) i);
+            count += config.GetMissedItemsPerClass((AuctionQuality) j, (ItemClass) i);
         }
     }
 
     DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_SELLER, "AHBot: Missed Item       \tGrey\tWhite\tGreen\tBlue\tPurple\tOrange\tYellow");
-    for (uint32 i=0; i<MAX_ITEM_CLASS;++i)
+    for (uint32 i = 0; i < MAX_ITEM_CLASS; ++i)
     {
         DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_SELLER, "AHBot: %-18s\t%u\t%u\t%u\t%u\t%u\t%u\t%u",
-            sAuctionBotConfig.GetItemClassName(ItemClass(i)),
-            config.GetMissedItemsPerClass(AUCTION_QUALITY_GREY, (ItemClass) i),
-            config.GetMissedItemsPerClass(AUCTION_QUALITY_WHITE, (ItemClass) i),
-            config.GetMissedItemsPerClass(AUCTION_QUALITY_GREEN, (ItemClass) i),
-            config.GetMissedItemsPerClass(AUCTION_QUALITY_BLUE, (ItemClass) i),
-            config.GetMissedItemsPerClass(AUCTION_QUALITY_PURPLE, (ItemClass) i),
-            config.GetMissedItemsPerClass(AUCTION_QUALITY_ORANGE, (ItemClass) i),
-            config.GetMissedItemsPerClass(AUCTION_QUALITY_YELLOW, (ItemClass) i));
+                         sAuctionBotConfig.GetItemClassName(ItemClass(i)),
+                         config.GetMissedItemsPerClass(AUCTION_QUALITY_GREY, (ItemClass) i),
+                         config.GetMissedItemsPerClass(AUCTION_QUALITY_WHITE, (ItemClass) i),
+                         config.GetMissedItemsPerClass(AUCTION_QUALITY_GREEN, (ItemClass) i),
+                         config.GetMissedItemsPerClass(AUCTION_QUALITY_BLUE, (ItemClass) i),
+                         config.GetMissedItemsPerClass(AUCTION_QUALITY_PURPLE, (ItemClass) i),
+                         config.GetMissedItemsPerClass(AUCTION_QUALITY_ORANGE, (ItemClass) i),
+                         config.GetMissedItemsPerClass(AUCTION_QUALITY_YELLOW, (ItemClass) i));
     }
     config.LastMissedItem = count;
     return count;
 }
 
 // getRandomArray is used to make aviable the possibility to add any of missed item in place of first one to last one.
-bool AuctionBotSeller::getRandomArray( AHB_Seller_Config& config, RandomArray& ra, const std::vector<std::vector<uint32> >& addedItem  )
+bool AuctionBotSeller::getRandomArray(AHB_Seller_Config& config, RandomArray& ra, const std::vector<std::vector<uint32> >& addedItem)
 {
     ra.clear();
-    bool Ok=false;
+    bool Ok = false;
 
     for (uint32 j = 0; j < MAX_AUCTION_QUALITY; ++j)
     {
@@ -1467,7 +1502,7 @@ bool AuctionBotSeller::getRandomArray( AHB_Seller_Config& config, RandomArray& r
                 miss_item.color = j;
                 miss_item.itemclass = i;
                 ra.push_back(miss_item);
-                Ok=true;
+                Ok = true;
             }
         }
     }
@@ -1475,16 +1510,40 @@ bool AuctionBotSeller::getRandomArray( AHB_Seller_Config& config, RandomArray& r
 }
 
 // Set items price. All important value are passed by address.
-void AuctionBotSeller::SetPricesOfItem(ItemPrototype const *itemProto, AHB_Seller_Config& config, uint32& buyp, uint32& bidp, uint32 stackcnt, ItemQualities itemQuality)
+void AuctionBotSeller::SetPricesOfItem(ItemPrototype const* itemProto, AHB_Seller_Config& config, uint32& buyp, uint32& bidp, uint32 stackcnt, ItemQualities itemQuality)
 {
     double temp_buyp = buyp * stackcnt *
-        (itemQuality < MAX_AUCTION_QUALITY ? config.GetPriceRatioPerQuality(AuctionQuality(itemQuality)) : 1) ;
+                       (itemQuality < MAX_AUCTION_QUALITY ? config.GetPriceRatioPerQuality(AuctionQuality(itemQuality)) : 1) ;
+
+    if (itemProto)
+    {
+        switch (itemProto->Bonding)
+        {
+            case NO_BIND:
+                temp_buyp *= sAuctionBotConfig.getConfig(CONFIG_FLOAT_AHBOT_BIND_NO_MULTIPLIER);
+                break;
+            case BIND_WHEN_PICKED_UP:
+                temp_buyp *= sAuctionBotConfig.getConfig(CONFIG_FLOAT_AHBOT_BIND_PICKUP_MULTIPLIER);
+                break;
+            case BIND_WHEN_EQUIPPED:
+                temp_buyp *= sAuctionBotConfig.getConfig(CONFIG_FLOAT_AHBOT_BIND_EQUIP_MULTIPLIER);
+                break;
+            case BIND_WHEN_USE:
+                temp_buyp *= sAuctionBotConfig.getConfig(CONFIG_FLOAT_AHBOT_BIND_USE_MULTIPLIER);
+                break;
+            case BIND_QUEST_ITEM:
+                temp_buyp *= sAuctionBotConfig.getConfig(CONFIG_FLOAT_AHBOT_BIND_QUEST_MULTIPLIER);
+                break;
+            default:
+                break;
+        }
+    }
 
     double randrange = temp_buyp * 0.4;
-    buyp = (urand(temp_buyp-randrange, temp_buyp+randrange)/100)+1;
-    double urandrange=buyp*40;
-    double temp_bidp = buyp*50;
-    bidp = (urand(temp_bidp-urandrange, temp_bidp+urandrange)/100)+1;
+    buyp = (urand(temp_buyp - randrange, temp_buyp + randrange) / 100) + 1;
+    double urandrange = buyp * 40;
+    double temp_bidp = buyp * 50;
+    bidp = (urand(temp_bidp - urandrange, temp_bidp + urandrange) / 100) + 1;
 }
 
 void AuctionBotSeller::SetItemsRatio(uint32 al, uint32 ho, uint32 ne)
@@ -1512,7 +1571,7 @@ void AuctionBotSeller::SetItemsRatioForHouse(AuctionHouseType house, uint32 val)
     LoadItemsQuantity(m_HouseConfig[house]);
 }
 
-void AuctionBotSeller::SetItemsAmount(uint32 (&vals) [MAX_AUCTION_QUALITY])
+void AuctionBotSeller::SetItemsAmount(uint32(&vals) [MAX_AUCTION_QUALITY])
 {
     sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_ITEM_GREY_AMOUNT, vals[AUCTION_QUALITY_GREY]);
     sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_ITEM_WHITE_AMOUNT, vals[AUCTION_QUALITY_WHITE]);
@@ -1534,8 +1593,8 @@ void AuctionBotSeller::SetItemsAmountForQuality(AuctionQuality quality, uint32 v
         case AUCTION_QUALITY_WHITE: sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_ITEM_WHITE_AMOUNT, val); break;
         case AUCTION_QUALITY_GREEN: sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_ITEM_GREEN_AMOUNT, val); break;
         case AUCTION_QUALITY_BLUE:  sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_ITEM_BLUE_AMOUNT, val); break;
-        case AUCTION_QUALITY_PURPLE:sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_ITEM_PURPLE_AMOUNT, val); break;
-        case AUCTION_QUALITY_ORANGE:sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_ITEM_ORANGE_AMOUNT, val); break;
+        case AUCTION_QUALITY_PURPLE: sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_ITEM_PURPLE_AMOUNT, val); break;
+        case AUCTION_QUALITY_ORANGE: sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_ITEM_ORANGE_AMOUNT, val); break;
         default:                    sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_ITEM_YELLOW_AMOUNT, val); break;
     }
 
@@ -1552,10 +1611,10 @@ void AuctionBotSeller::addNewAuctions(AHB_Seller_Config& config)
     // If there is large amount of items missed we can use boost value to get fast filled AH
     if (config.LastMissedItem > sAuctionBotConfig.GetItemPerCycleBoost())
     {
-        items=sAuctionBotConfig.GetItemPerCycleBoost();
+        items = sAuctionBotConfig.GetItemPerCycleBoost();
         BASIC_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: Boost value used to fill AH! (if this happens often adjust both ItemsPerCycle in ahbot.conf)");
     }
-    else items=sAuctionBotConfig.GetItemPerCycleNormal();
+    else items = sAuctionBotConfig.GetItemPerCycleNormal();
 
     uint32 houseid;
     switch (config.GetHouseType())
@@ -1570,18 +1629,18 @@ void AuctionBotSeller::addNewAuctions(AHB_Seller_Config& config)
     AuctionHouseObject* auctionHouse = sAuctionMgr.GetAuctionsMap(config.GetHouseType());
 
     RandomArray randArray;
-    std::vector<std::vector<uint32> > ItemsAdded(MAX_AUCTION_QUALITY,std::vector<uint32> (MAX_ITEM_CLASS));
+    std::vector<std::vector<uint32> > ItemsAdded(MAX_AUCTION_QUALITY, std::vector<uint32> (MAX_ITEM_CLASS));
     // Main loop
     // getRandomArray will give what categories of items should be added (return true if there is at least 1 items missed)
-    while (getRandomArray(config,randArray, ItemsAdded) && (items>0))
+    while (getRandomArray(config, randArray, ItemsAdded) && (items > 0))
     {
         --items;
 
         // Select random position from missed items table
-        uint32 pos =  (urand(0,randArray.size()-1));
+        uint32 pos = (urand(0, randArray.size() - 1));
 
         // Set itemID with random item ID for selected categories and color, from m_ItemPool table
-        uint32 itemID = m_ItemPool[randArray[pos].color][randArray[pos].itemclass][urand(0,m_ItemPool[randArray[pos].color][randArray[pos].itemclass].size()-1)];
+        uint32 itemID = m_ItemPool[randArray[pos].color][randArray[pos].itemclass][urand(0, m_ItemPool[randArray[pos].color][randArray[pos].itemclass].size() - 1)];
         ++ ItemsAdded[randArray[pos].color][randArray[pos].itemclass]; // Helper table to avoid rescan from DB in this loop. (has we add item in random orders)
 
         if (!itemID)
@@ -1688,7 +1747,7 @@ void AuctionHouseBot::SetItemsRatioForHouse(AuctionHouseType house, uint32 val)
         seller->SetItemsRatioForHouse(house, val);
 }
 
-void AuctionHouseBot::SetItemsAmount(uint32 (&vals) [MAX_AUCTION_QUALITY])
+void AuctionHouseBot::SetItemsAmount(uint32(&vals) [MAX_AUCTION_QUALITY])
 {
     if (AuctionBotSeller* seller = dynamic_cast<AuctionBotSeller*>(m_Seller))
         seller->SetItemsAmount(vals);
@@ -1724,10 +1783,11 @@ void AuctionHouseBot::PrepareStatusInfos(AuctionHouseBotStatusInfo& statusInfo)
         AuctionHouseObject::AuctionEntryMapBounds bounds = sAuctionMgr.GetAuctionsMap(AuctionHouseType(i))->GetAuctionsBounds();
         for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
         {
-            AuctionEntry *Aentry = itr->second;
-            if (Item *item = sAuctionMgr.GetAItem(Aentry->itemGuidLow))
+            AuctionEntry* Aentry = itr->second;
+            Item* item = sAuctionMgr.GetAItem(Aentry->itemGuidLow);
+            if (item)
             {
-                ItemPrototype const *prototype = item->GetProto();
+                ItemPrototype const* prototype = item->GetProto();
                 if (!Aentry->owner)                         // Add only ahbot items
                 {
                     if (prototype->Quality < MAX_AUCTION_QUALITY)
@@ -1756,10 +1816,10 @@ void AuctionHouseBot::Update()
 {
     // nothing do...
     if (!m_Buyer && !m_Seller)
-         return;
+        return;
 
     // scan all possible update cases until first success
-    for (uint32 count = 0; count < 2*MAX_AUCTION_HOUSE_TYPE; ++count)
+    for (uint32 count = 0; count < 2 * MAX_AUCTION_HOUSE_TYPE; ++count)
     {
         bool successStep = false;
 
@@ -1775,7 +1835,7 @@ void AuctionHouseBot::Update()
         }
 
         ++m_OperationSelector;
-        if (m_OperationSelector >= 2*MAX_AUCTION_HOUSE_TYPE)
+        if (m_OperationSelector >= 2 * MAX_AUCTION_HOUSE_TYPE)
             m_OperationSelector = 0;
 
         // one success update per call
diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.h b/src/game/AuctionHouseBot/AuctionHouseBot.h
index 61a8316ab22..7682e9fe3ee 100644
--- a/src/game/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/game/AuctionHouseBot/AuctionHouseBot.h
@@ -100,9 +100,21 @@ enum AuctionBotConfigBoolValues
     CONFIG_BOOL_AHBOT_SELLER_ENABLED,
     CONFIG_BOOL_AHBOT_BUYER_ENABLED,
     CONFIG_BOOL_AHBOT_LOCKBOX_ENABLED,
+    CONFIG_BOOL_AHBOT_PETS_ENABLED,
+    CONFIG_BOOL_AHBOT_DM_CARDS_ENABLED,
     CONFIG_UINT32_AHBOT_BOOL_COUNT
 };
 
+enum AuctionBotConfigFloatValues
+{
+    CONFIG_FLOAT_AHBOT_BIND_NO_MULTIPLIER,
+    CONFIG_FLOAT_AHBOT_BIND_PICKUP_MULTIPLIER,
+    CONFIG_FLOAT_AHBOT_BIND_EQUIP_MULTIPLIER,
+    CONFIG_FLOAT_AHBOT_BIND_USE_MULTIPLIER,
+    CONFIG_FLOAT_AHBOT_BIND_QUEST_MULTIPLIER,
+    CONFIG_UINT32_AHBOT_FLOAT_COUNT
+};
+
 // All basic config data used by other AHBot classes for self-configure.
 class AuctionBotConfig
 {
@@ -116,8 +128,11 @@ class AuctionBotConfig
 
         uint32      getConfig(AuctionBotConfigUInt32Values index) const { return m_configUint32Values[index]; }
         bool        getConfig(AuctionBotConfigBoolValues index) const { return m_configBoolValues[index]; }
-        void        setConfig(AuctionBotConfigBoolValues index, bool value) { m_configBoolValues[index]=value; }
-        void        setConfig(AuctionBotConfigUInt32Values index, uint32 value) { m_configUint32Values[index]=value; }
+        void        setConfig(AuctionBotConfigBoolValues index, bool value) { m_configBoolValues[index] = value; }
+        void        setConfig(AuctionBotConfigUInt32Values index, uint32 value) { m_configUint32Values[index] = value; }
+
+        void        setConfig(AuctionBotConfigFloatValues index, float value) { m_configFloatValues[index]=value; }
+        float       getConfig(AuctionBotConfigFloatValues index) const { return m_configFloatValues[index]; }
 
         uint32 getConfigItemAmountRatio(AuctionHouseType houseType) const;
         bool getConfigBuyerEnabled(AuctionHouseType houseType) const;
@@ -141,6 +156,7 @@ class AuctionBotConfig
 
         uint32 m_configUint32Values[CONFIG_UINT32_AHBOT_UINT32_COUNT];
         bool   m_configBoolValues[CONFIG_UINT32_AHBOT_BOOL_COUNT];
+        float  m_configFloatValues[CONFIG_UINT32_AHBOT_FLOAT_COUNT];
 
         void SetAHBotIncludes(const std::string& AHBotIncludes) { m_AHBotIncludes = AHBotIncludes; }
         void SetAHBotExcludes(const std::string& AHBotExcludes) { m_AHBotExcludes = AHBotExcludes; }
@@ -149,6 +165,7 @@ class AuctionBotConfig
         void setConfigMax(AuctionBotConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 maxvalue);
         void setConfigMinMax(AuctionBotConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue, uint32 maxvalue);
         void setConfig(AuctionBotConfigBoolValues index, char const* fieldname, bool defvalue);
+        void setConfig(AuctionBotConfigFloatValues index, char const* fieldname, float defvalue);
         void GetConfigFromFile();
 };
 
@@ -160,8 +177,8 @@ class AuctionBotAgent
         AuctionBotAgent() {}
         virtual ~AuctionBotAgent() {}
     public:
-        virtual bool Initialize() =0;
-        virtual bool Update(AuctionHouseType houseType) =0;
+        virtual bool Initialize() = 0;
+        virtual bool Update(AuctionHouseType houseType) = 0;
 };
 
 struct AuctionHouseBotStatusInfoPerType
@@ -186,7 +203,7 @@ class AuctionHouseBot
         // Followed method is mainly used by level3.cpp for ingame/console command
         void SetItemsRatio(uint32 al, uint32 ho, uint32 ne);
         void SetItemsRatioForHouse(AuctionHouseType house, uint32 val);
-        void SetItemsAmount(uint32 (&vals) [MAX_AUCTION_QUALITY]);
+        void SetItemsAmount(uint32(&vals) [MAX_AUCTION_QUALITY]);
         void SetItemsAmountForQuality(AuctionQuality quality, uint32 val);
         bool ReloadAllConfig();
         void Rebuild(bool all);
diff --git a/src/game/AuctionHouseBot/ahbot.conf.dist.in b/src/game/AuctionHouseBot/ahbot.conf.dist.in
index 94e1d72b57e..edade389312 100644
--- a/src/game/AuctionHouseBot/ahbot.conf.dist.in
+++ b/src/game/AuctionHouseBot/ahbot.conf.dist.in
@@ -60,6 +60,14 @@ ConfVersion=2010102201
 #        Enable or not lockbox in auctionhouse
 #    Default 0 (Disabled)
 #
+#    AuctionHouseBot.Pets.Enabled
+#        Enable or not pets in auctionhouse
+#    Default 0 (Disabled)
+#
+#    AuctionHouseBot.DMcards.Enabled
+#        Enable or not darkmoon cards in auctionhouse
+#    Default 0 (Disabled)
+#
 #    AuctionHouseBot.ItemsPerCycle.Boost
 #        This value is used to fill DB faster than normal when there is more than this value missed items.
 #        Normaly this value is used only first start of the server with empty auction table.
@@ -171,6 +179,8 @@ AuctionHouseBot.Bind.Equip = 1
 AuctionHouseBot.Bind.Use = 1
 AuctionHouseBot.Bind.Quest = 0
 AuctionHouseBot.LockBox.Enabled = 0
+AuctionHouseBot.Pets.Enabled = 0
+AuctionHouseBot.DMcards.Enabled = 0
 
 AuctionHouseBot.ItemsPerCycle.Boost = 75
 AuctionHouseBot.ItemsPerCycle.Normal = 20
@@ -226,6 +236,13 @@ AuctionHouseBot.Class.Container.ItemLevel.Max = 0
 AuctionHouseBot.forceIncludeItems = ""
 AuctionHouseBot.forceExcludeItems = ""
 
+# Additional parameters - for R2 branch use
+AuctionHouseBot.Bind.No.Multiplier = 1
+AuctionHouseBot.Bind.Pickup.Multiplier = 1
+AuctionHouseBot.Bind.Equip.Multiplier = 1
+AuctionHouseBot.Bind.Use.Multiplier = 1
+AuctionHouseBot.Bind.Quest.Multiplier = 1
+
 ###################################################################################################################
 # Buyer config
 #
diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/AuctionHouseHandler.cpp
index ee1c9bf2665..99cc250a165 100644
--- a/src/game/AuctionHouseHandler.cpp
+++ b/src/game/AuctionHouseHandler.cpp
@@ -21,6 +21,7 @@
 #include "Opcodes.h"
 #include "Log.h"
 #include "World.h"
+#include "AccountMgr.h"
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "Player.h"
@@ -34,12 +35,12 @@
 // post-incrementation is always slower than pre-incrementation !
 
 // void called when player click on auctioneer npc
-void WorldSession::HandleAuctionHelloOpcode(WorldPacket & recv_data)
+void WorldSession::HandleAuctionHelloOpcode(WorldPacket& recv_data)
 {
     ObjectGuid auctioneerGuid;                              // NPC guid
     recv_data >> auctioneerGuid;
 
-    Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(auctioneerGuid, UNIT_NPC_FLAG_AUCTIONEER);
+    Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(auctioneerGuid, UNIT_NPC_FLAG_AUCTIONEER);
     if (!unit)
     {
         DEBUG_LOG("WORLD: HandleAuctionHelloOpcode - %s not found or you can't interact with him.", auctioneerGuid.GetString().c_str());
@@ -67,7 +68,7 @@ void WorldSession::SendAuctionHello(Unit* unit)
 }
 
 // call this method when player bids, creates, or deletes auction
-void WorldSession::SendAuctionCommandResult(AuctionEntry *auc, AuctionAction Action, AuctionError ErrorCode, InventoryResult invError)
+void WorldSession::SendAuctionCommandResult(AuctionEntry* auc, AuctionAction Action, AuctionError ErrorCode, InventoryResult invError)
 {
     WorldPacket data(SMSG_AUCTION_COMMAND_RESULT, 16);
     data << uint32(auc ? auc->Id : 0);
@@ -84,7 +85,7 @@ void WorldSession::SendAuctionCommandResult(AuctionEntry *auc, AuctionAction Act
             data << uint32(invError);
             break;
         case AUCTION_ERR_HIGHER_BID:
-            data << ObjectGuid(HIGHGUID_PLAYER,auc->bidder);// new bidder guid
+            data << ObjectGuid(HIGHGUID_PLAYER, auc->bidder); // new bidder guid
             data << uint32(auc->bid);                       // new bid
             data << uint32(auc->GetAuctionOutBid());        // new AuctionOutBid?
             break;
@@ -98,7 +99,7 @@ void WorldSession::SendAuctionCommandResult(AuctionEntry *auc, AuctionAction Act
 // this function sends notification, if bidder is online
 void WorldSession::SendAuctionBidderNotification(AuctionEntry* auction)
 {
-    WorldPacket data(SMSG_AUCTION_BIDDER_NOTIFICATION, (8*4));
+    WorldPacket data(SMSG_AUCTION_BIDDER_NOTIFICATION, (8 * 4));
     data << uint32(auction->GetHouseId());
     data << uint32(auction->Id);
     data << ObjectGuid(HIGHGUID_PLAYER, auction->bidder);
@@ -115,7 +116,7 @@ void WorldSession::SendAuctionBidderNotification(AuctionEntry* auction)
 // this void causes on client to display: "Your auction sold"
 void WorldSession::SendAuctionOwnerNotification(AuctionEntry* auction)
 {
-    WorldPacket data(SMSG_AUCTION_OWNER_NOTIFICATION, (7*4));
+    WorldPacket data(SMSG_AUCTION_OWNER_NOTIFICATION, (7 * 4));
     data << uint32(auction->Id);
     data << uint32(auction->bid);                           // if 0, client shows ERR_AUCTION_EXPIRED_S, else ERR_AUCTION_SOLD_S (works only when guid==0)
     data << uint32(auction->GetAuctionOutBid());            // AuctionOutBid?
@@ -140,7 +141,7 @@ void WorldSession::SendAuctionOwnerNotification(AuctionEntry* auction)
 // shows ERR_AUCTION_REMOVED_S
 void WorldSession::SendAuctionRemovedNotification(AuctionEntry* auction)
 {
-    WorldPacket data(SMSG_AUCTION_REMOVED_NOTIFICATION, (3*4));
+    WorldPacket data(SMSG_AUCTION_REMOVED_NOTIFICATION, (3 * 4));
     data << uint32(auction->Id);
     data << uint32(auction->itemTemplate);
     data << uint32(auction->itemRandomPropertyId);
@@ -149,14 +150,14 @@ void WorldSession::SendAuctionRemovedNotification(AuctionEntry* auction)
 }
 
 // this function sends mail to old bidder
-void WorldSession::SendAuctionOutbiddedMail(AuctionEntry *auction)
+void WorldSession::SendAuctionOutbiddedMail(AuctionEntry* auction)
 {
     ObjectGuid oldBidder_guid = ObjectGuid(HIGHGUID_PLAYER, auction->bidder);
-    Player *oldBidder = sObjectMgr.GetPlayer(oldBidder_guid);
+    Player* oldBidder = sObjectMgr.GetPlayer(oldBidder_guid);
 
     uint32 oldBidder_accId = 0;
-    if(!oldBidder)
-        oldBidder_accId = sObjectMgr.GetPlayerAccountIdByGUID(oldBidder_guid);
+    if (!oldBidder)
+        oldBidder_accId = sAccountMgr.GetPlayerAccountIdByGUID(oldBidder_guid);
 
     // old bidder exist
     if (oldBidder || oldBidder_accId)
@@ -168,8 +169,8 @@ void WorldSession::SendAuctionOutbiddedMail(AuctionEntry *auction)
             oldBidder->GetSession()->SendAuctionBidderNotification(auction);
 
         MailDraft(msgAuctionOutbiddedSubject.str(), "")     // TODO: fix body
-            .SetMoney(auction->bid)
-            .SendMailTo(MailReceiver(oldBidder, oldBidder_guid), auction, MAIL_CHECK_MASK_COPIED);
+        .SetMoney(auction->bid)
+        .SendMailTo(MailReceiver(oldBidder, oldBidder_guid), auction, MAIL_CHECK_MASK_COPIED);
     }
 }
 
@@ -177,11 +178,11 @@ void WorldSession::SendAuctionOutbiddedMail(AuctionEntry *auction)
 void WorldSession::SendAuctionCancelledToBidderMail(AuctionEntry* auction)
 {
     ObjectGuid bidder_guid = ObjectGuid(HIGHGUID_PLAYER, auction->bidder);
-    Player *bidder = sObjectMgr.GetPlayer(bidder_guid);
+    Player* bidder = sObjectMgr.GetPlayer(bidder_guid);
 
     uint32 bidder_accId = 0;
     if (!bidder)
-        bidder_accId = sObjectMgr.GetPlayerAccountIdByGUID(bidder_guid);
+        bidder_accId = sAccountMgr.GetPlayerAccountIdByGUID(bidder_guid);
 
     // bidder exist
     if (bidder || bidder_accId)
@@ -193,8 +194,8 @@ void WorldSession::SendAuctionCancelledToBidderMail(AuctionEntry* auction)
             bidder->GetSession()->SendAuctionRemovedNotification(auction);
 
         MailDraft(msgAuctionCancelledSubject.str(), "")     // TODO: fix body
-            .SetMoney(auction->bid)
-            .SendMailTo(MailReceiver(bidder, bidder_guid), auction, MAIL_CHECK_MASK_COPIED);
+        .SetMoney(auction->bid)
+        .SendMailTo(MailReceiver(bidder, bidder_guid), auction, MAIL_CHECK_MASK_COPIED);
     }
 }
 
@@ -207,7 +208,7 @@ AuctionHouseEntry const* WorldSession::GetCheckedAuctionHouseForAuctioneer(Objec
     {
         // command case will return only if player have real access to command
         // using special access modes (1,-1) done at mode set in command, so not need recheck
-        if (GetPlayer()->GetAuctionAccessMode()==0 && !ChatHandler(GetPlayer()).FindCommand("auction"))
+        if (GetPlayer()->GetAuctionAccessMode() == 0 && !ChatHandler(GetPlayer()).FindCommand("auction"))
         {
             DEBUG_LOG("%s attempt open auction in cheating way.", guid.GetString().c_str());
             return NULL;
@@ -231,13 +232,13 @@ AuctionHouseEntry const* WorldSession::GetCheckedAuctionHouseForAuctioneer(Objec
 }
 
 // this void creates new auction and adds auction to some auctionhouse
-void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
+void WorldSession::HandleAuctionSellItem(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: HandleAuctionSellItem");
 
     ObjectGuid auctioneerGuid;
     uint32 etime, bid, buyout, itemCount;
-    std::vector<ObjectGuid> guids;
+    GuidVector guids;
     std::vector<uint32> stackSizes;
 
     recv_data >> auctioneerGuid;
@@ -265,7 +266,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
     if (!bid || !etime)
         return;                                             // check for cheaters
 
-    Player *pl = GetPlayer();
+    Player* pl = GetPlayer();
 
     AuctionHouseEntry const* auctionHouseEntry = GetCheckedAuctionHouseForAuctioneer(auctioneerGuid);
     if (!auctionHouseEntry)
@@ -301,7 +302,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
 
         uint32 stackSize = stackSizes[i];
 
-        Item *it = pl->GetItemByGuid(itemGuid);
+        Item* it = pl->GetItemByGuid(itemGuid);
 
         // do not allow to sell already auctioned items
         if (sAuctionMgr.GetAItem(itemGuid.GetCounter()))
@@ -340,8 +341,8 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
 
         if (GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE))
         {
-            sLog.outCommand(GetAccountId(),"GM %s (Account: %u) create auction: %s (Entry: %u Count: %u)",
-                GetPlayerName(), GetAccountId(), it->GetProto()->Name1, it->GetEntry(), it->GetCount());
+            sLog.outCommand(GetAccountId(), "GM %s (Account: %u) create auction: %s (Entry: %u Count: %u)",
+                            GetPlayerName(), GetAccountId(), it->GetProto()->Name1, it->GetEntry(), it->GetCount());
         }
 
         if (stackSize == 0)
@@ -353,7 +354,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
         if (!pl->HasItemCount(it->GetEntry(), stackSize))   // not enough items
             continue;
 
-        Item *newItem = it->CloneItem(stackSize);
+        Item* newItem = it->CloneItem(stackSize);
 
         pl->DestroyItemCount(it, stackSize, true);
 
@@ -362,7 +363,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
         AuctionEntry* AH = auctionHouse->AddAuction(auctionHouseEntry, newItem, etime, bid, buyout, deposit, pl);
 
         DETAIL_LOG("selling %s to auctioneer %s with initial bid %u with buyout %u and with time %u (in sec) in auctionhouse %u",
-            itemGuid.GetString().c_str(), auctioneerGuid.GetString().c_str(), bid, buyout, etime, auctionHouseEntry->houseId);
+                   itemGuid.GetString().c_str(), auctioneerGuid.GetString().c_str(), bid, buyout, etime, auctionHouseEntry->houseId);
 
         SendAuctionCommandResult(AH, AUCTION_STARTED, AUCTION_OK);
 
@@ -371,7 +372,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
 }
 
 // this function is called when client bids or buys out auction
-void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
+void WorldSession::HandleAuctionPlaceBid(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: HandleAuctionPlaceBid");
 
@@ -395,8 +396,8 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
 
-    AuctionEntry *auction = auctionHouse->GetAuction(auctionId);
-    Player *pl = GetPlayer();
+    AuctionEntry* auction = auctionHouse->GetAuction(auctionId);
+    Player* pl = GetPlayer();
 
     if (!auction || auction->owner == pl->GetGUIDLow())
     {
@@ -409,7 +410,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
 
     // impossible have online own another character (use this for speedup check in case online owner)
     Player* auction_owner = sObjectMgr.GetPlayer(ownerGuid);
-    if (!auction_owner && sObjectMgr.GetPlayerAccountIdByGUID(ownerGuid) == pl->GetSession()->GetAccountId())
+    if (!auction_owner && sAccountMgr.GetPlayerAccountIdByGUID(ownerGuid) == pl->GetSession()->GetAccountId())
     {
         // you cannot bid your another character auction:
         SendAuctionCommandResult(NULL, AUCTION_BID_PLACED, AUCTION_ERR_BID_OWN);
@@ -426,7 +427,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
 
     // price too low for next bid if not buyout
     if ((price < auction->buyout || auction->buyout == 0) &&
-        price < auction->bid + auction->GetAuctionOutBid())
+            price < auction->bid + auction->GetAuctionOutBid())
     {
         // client test but possible in result lags
         SendAuctionCommandResult(auction, AUCTION_BID_PLACED, AUCTION_ERR_BID_INCREMENT);
@@ -453,7 +454,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
 }
 
 // this void is called when auction_owner cancels his auction
-void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
+void WorldSession::HandleAuctionRemoveItem(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: HandleAuctionRemoveItem");
 
@@ -461,7 +462,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
     uint32 auctionId;
     recv_data >> auctioneerGuid;
     recv_data >> auctionId;
-    //DEBUG_LOG("Cancel AUCTION AuctionID: %u", auctionId);
+    // DEBUG_LOG("Cancel AUCTION AuctionID: %u", auctionId);
 
     AuctionHouseEntry const* auctionHouseEntry = GetCheckedAuctionHouseForAuctioneer(auctioneerGuid);
     if (!auctionHouseEntry)
@@ -474,8 +475,8 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
 
-    AuctionEntry *auction = auctionHouse->GetAuction(auctionId);
-    Player *pl = GetPlayer();
+    AuctionEntry* auction = auctionHouse->GetAuction(auctionId);
+    Player* pl = GetPlayer();
 
     if (!auction || auction->owner != pl->GetGUIDLow())
     {
@@ -484,7 +485,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
         return;
     }
 
-    Item *pItem = sAuctionMgr.GetAItem(auction->itemGuidLow);
+    Item* pItem = sAuctionMgr.GetAItem(auction->itemGuidLow);
     if (!pItem)
     {
         sLog.outError("Auction id: %u has nonexistent item (item guid : %u)!!!", auction->Id, auction->itemGuidLow);
@@ -509,8 +510,8 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
 
     // item will deleted or added to received mail list
     MailDraft(msgAuctionCanceledOwner.str(), "")            // TODO: fix body
-        .AddItem(pItem)
-        .SendMailTo(pl, auction, MAIL_CHECK_MASK_COPIED);
+    .AddItem(pItem)
+    .SendMailTo(pl, auction, MAIL_CHECK_MASK_COPIED);
 
     // inform player, that auction is removed
     SendAuctionCommandResult(auction, AUCTION_REMOVED, AUCTION_OK);
@@ -525,7 +526,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
 }
 
 // called when player lists his bids
-void WorldSession::HandleAuctionListBidderItems(WorldPacket & recv_data)
+void WorldSession::HandleAuctionListBidderItems(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: HandleAuctionListBidderItems");
 
@@ -553,8 +554,8 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket & recv_data)
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
 
-    WorldPacket data(SMSG_AUCTION_BIDDER_LIST_RESULT, (4+4+4));
-    Player *pl = GetPlayer();
+    WorldPacket data(SMSG_AUCTION_BIDDER_LIST_RESULT, (4 + 4 + 4));
+    Player* pl = GetPlayer();
     data << uint32(0);                                      // add 0 as count
     uint32 count = 0;
     uint32 totalcount = 0;
@@ -563,7 +564,7 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket & recv_data)
         --outbiddedCount;
         uint32 outbiddedAuctionId;
         recv_data >> outbiddedAuctionId;
-        AuctionEntry *auction = auctionHouse->GetAuction(outbiddedAuctionId);
+        AuctionEntry* auction = auctionHouse->GetAuction(outbiddedAuctionId);
         if (auction && auction->BuildAuctionInfo(data))
         {
             ++totalcount;
@@ -579,7 +580,7 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket & recv_data)
 }
 
 // this void sends player info about his auctions
-void WorldSession::HandleAuctionListOwnerItems(WorldPacket & recv_data)
+void WorldSession::HandleAuctionListOwnerItems(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: HandleAuctionListOwnerItems");
 
@@ -600,7 +601,7 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket & recv_data)
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
 
-    WorldPacket data(SMSG_AUCTION_OWNER_LIST_RESULT, (4+4+4));
+    WorldPacket data(SMSG_AUCTION_OWNER_LIST_RESULT, (4 + 4 + 4));
     data << uint32(0);                                      // amount place holder
 
     uint32 count = 0;
@@ -614,7 +615,7 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket & recv_data)
 }
 
 // this void is called when player clicks on search button
-void WorldSession::HandleAuctionListItems(WorldPacket & recv_data)
+void WorldSession::HandleAuctionListItems(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: HandleAuctionListItems");
 
@@ -672,10 +673,10 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recv_data)
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
 
-    //DEBUG_LOG("Auctionhouse search %s list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u",
+    // DEBUG_LOG("Auctionhouse search %s list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u",
     //  auctioneerGuid.GetString().c_str(), listfrom, searchedname.c_str(), levelmin, levelmax, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, usable);
 
-    WorldPacket data(SMSG_AUCTION_LIST_RESULT, (4+4+4));
+    WorldPacket data(SMSG_AUCTION_LIST_RESULT, (4 + 4 + 4));
     uint32 count = 0;
     uint32 totalcount = 0;
     data << uint32(0);
@@ -688,7 +689,7 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recv_data)
     wstrToLower(wsearchedname);
 
     BuildListAuctionItems(auctions, data, wsearchedname, listfrom, levelmin, levelmax, usable,
-        auctionSlotID, auctionMainCategory, auctionSubCategory, quality, count, totalcount, isFull);
+                          auctionSlotID, auctionMainCategory, auctionSubCategory, quality, count, totalcount, isFull);
 
     data.put<uint32>(0, count);
     data << uint32(totalcount);
@@ -696,7 +697,7 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recv_data)
     SendPacket(&data);
 }
 
-void WorldSession::HandleAuctionListPendingSales(WorldPacket & recv_data)
+void WorldSession::HandleAuctionListPendingSales(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_AUCTION_LIST_PENDING_SALES");
 
diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
index f395e0e047f..675ce329774 100644
--- a/src/game/AuctionHouseMgr.cpp
+++ b/src/game/AuctionHouseMgr.cpp
@@ -34,7 +34,8 @@
 #include "WorldSession.h"
 #include "Mail.h"
 
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
+#include "ahbot/AhBot.h"
 
 INSTANTIATE_SINGLETON_1(AuctionHouseMgr);
 
@@ -44,17 +45,17 @@ AuctionHouseMgr::AuctionHouseMgr()
 
 AuctionHouseMgr::~AuctionHouseMgr()
 {
-    for(ItemMap::const_iterator itr = mAitems.begin(); itr != mAitems.end(); ++itr)
+    for (ItemMap::const_iterator itr = mAitems.begin(); itr != mAitems.end(); ++itr)
         delete itr->second;
 }
 
-AuctionHouseObject * AuctionHouseMgr::GetAuctionsMap(AuctionHouseEntry const* house)
+AuctionHouseObject* AuctionHouseMgr::GetAuctionsMap(AuctionHouseEntry const* house)
 {
-    if(sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
+    if (sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
         return &mAuctions[AUCTION_HOUSE_NEUTRAL];
 
     // team have linked auction houses
-    switch(GetAuctionHouseTeam(house))
+    switch (GetAuctionHouseTeam(house))
     {
         case ALLIANCE: return &mAuctions[AUCTION_HOUSE_ALLIANCE];
         case HORDE:    return &mAuctions[AUCTION_HOUSE_HORDE];
@@ -62,7 +63,7 @@ AuctionHouseObject * AuctionHouseMgr::GetAuctionsMap(AuctionHouseEntry const* ho
     }
 }
 
-uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item *pItem)
+uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item* pItem)
 {
     float deposit = float(pItem->GetProto()->SellPrice * pItem->GetCount() * (time / MIN_AUCTION_TIME));
 
@@ -77,14 +78,14 @@ uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32
 }
 
 // does not clear ram
-void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction)
+void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry* auction)
 {
-    Item *pItem = GetAItem(auction->itemGuidLow);
+    Item* pItem = GetAItem(auction->itemGuidLow);
     if (!pItem)
         return;
 
     ObjectGuid bidder_guid = ObjectGuid(HIGHGUID_PLAYER, auction->bidder);
-    Player *bidder = sObjectMgr.GetPlayer(bidder_guid);
+    Player* bidder = sObjectMgr.GetPlayer(bidder_guid);
 
     uint32 bidder_accId = 0;
 
@@ -104,12 +105,12 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction)
         }
         else
         {
-            bidder_accId = sObjectMgr.GetPlayerAccountIdByGUID(bidder_guid);
+            bidder_accId = sAccountMgr.GetPlayerAccountIdByGUID(bidder_guid);
             bidder_security = bidder_accId ? sAccountMgr.GetSecurity(bidder_accId) : SEC_PLAYER;
 
             if (bidder_security > SEC_PLAYER)               // not do redundant DB requests
             {
-                if (!sObjectMgr.GetPlayerNameByGUID(bidder_guid, bidder_name))
+                if (!sAccountMgr.GetPlayerNameByGUID(bidder_guid, bidder_name))
                     bidder_name = sObjectMgr.GetMangosStringForDBCLocale(LANG_UNKNOWN);
             }
         }
@@ -119,17 +120,17 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction)
             std::string owner_name;
             if (auction_owner)
                 owner_name = auction_owner->GetName();
-            else if (ownerGuid && !sObjectMgr.GetPlayerNameByGUID(ownerGuid, owner_name))
+            else if (ownerGuid && !sAccountMgr.GetPlayerNameByGUID(ownerGuid, owner_name))
                 owner_name = sObjectMgr.GetMangosStringForDBCLocale(LANG_UNKNOWN);
 
-            uint32 owner_accid = sObjectMgr.GetPlayerAccountIdByGUID(ownerGuid);
+            uint32 owner_accid = sAccountMgr.GetPlayerAccountIdByGUID(ownerGuid);
 
-            sLog.outCommand(bidder_accId,"GM %s (Account: %u) won item in auction (Entry: %u Count: %u) and pay money: %u. Original owner %s (Account: %u)",
-                bidder_name.c_str(), bidder_accId, auction->itemTemplate, auction->itemCount, auction->bid, owner_name.c_str(), owner_accid);
+            sLog.outCommand(bidder_accId, "GM %s (Account: %u) won item in auction (Entry: %u Count: %u) and pay money: %u. Original owner %s (Account: %u)",
+                            bidder_name.c_str(), bidder_accId, auction->itemTemplate, auction->itemCount, auction->bid, owner_name.c_str(), owner_accid);
         }
     }
     else if (!bidder)
-        bidder_accId = sObjectMgr.GetPlayerAccountIdByGUID(bidder_guid);
+        bidder_accId = sAccountMgr.GetPlayerAccountIdByGUID(bidder_guid);
 
     if (auction_owner)
         auction_owner->GetSession()->SendAuctionOwnerNotification(auction);
@@ -162,8 +163,8 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction)
 
         // will delete item or place to receiver mail list
         MailDraft(msgAuctionWonSubject.str(), msgAuctionWonBody.str())
-            .AddItem(pItem)
-            .SendMailTo(MailReceiver(bidder, bidder_guid), auction, MAIL_CHECK_MASK_COPIED);
+        .AddItem(pItem)
+        .SendMailTo(MailReceiver(bidder, bidder_guid), auction, MAIL_CHECK_MASK_COPIED);
     }
     // receiver not exist
     else
@@ -176,14 +177,14 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction)
 }
 
 // call this method to send mail to auction owner, when auction is successful, it does not clear ram
-void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry * auction)
+void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry* auction)
 {
     ObjectGuid owner_guid = ObjectGuid(HIGHGUID_PLAYER, auction->owner);
-    Player *owner = sObjectMgr.GetPlayer(owner_guid);
+    Player* owner = sObjectMgr.GetPlayer(owner_guid);
 
     uint32 owner_accId = 0;
     if (!owner)
-        owner_accId = sObjectMgr.GetPlayerAccountIdByGUID(owner_guid);
+        owner_accId = sAccountMgr.GetPlayerAccountIdByGUID(owner_guid);
 
     // owner exist
     if (owner || owner_accId)
@@ -211,15 +212,16 @@ void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry * auction)
         }
 
         MailDraft(msgAuctionSuccessfulSubject.str(), auctionSuccessfulBody.str())
-            .SetMoney(profit)
-            .SendMailTo(MailReceiver(owner, owner_guid), auction, MAIL_CHECK_MASK_COPIED);
+        .SetMoney(profit)
+        .SendMailTo(MailReceiver(owner, owner_guid), auction, MAIL_CHECK_MASK_COPIED);
     }
 }
 
 // does not clear ram
-void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry * auction)
-{                                                           // return an item in auction to its owner by mail
-    Item *pItem = GetAItem(auction->itemGuidLow);
+void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry* auction)
+{
+    // return an item in auction to its owner by mail
+    Item* pItem = GetAItem(auction->itemGuidLow);
     if (!pItem)
     {
         sLog.outError("Auction item (GUID: %u) not found, and lost.", auction->itemGuidLow);
@@ -227,11 +229,11 @@ void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry * auction)
     }
 
     ObjectGuid owner_guid = ObjectGuid(HIGHGUID_PLAYER, auction->owner);
-    Player *owner = sObjectMgr.GetPlayer(owner_guid);
+    Player* owner = sObjectMgr.GetPlayer(owner_guid);
 
     uint32 owner_accId = 0;
     if (!owner)
-        owner_accId = sObjectMgr.GetPlayerAccountIdByGUID(owner_guid);
+        owner_accId = sAccountMgr.GetPlayerAccountIdByGUID(owner_guid);
 
     // owner exist
     if (owner || owner_accId)
@@ -247,8 +249,8 @@ void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry * auction)
 
         // will delete item or place to receiver mail list
         MailDraft(subject.str(), "")                        // TODO: fix body
-            .AddItem(pItem)
-            .SendMailTo(MailReceiver(owner, owner_guid), auction, MAIL_CHECK_MASK_COPIED);
+        .AddItem(pItem)
+        .SendMailTo(MailReceiver(owner, owner_guid), auction, MAIL_CHECK_MASK_COPIED);
     }
     // owner not found
     else
@@ -263,7 +265,7 @@ void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry * auction)
 void AuctionHouseMgr::LoadAuctionItems()
 {
     // data needs to be at first place for Item::LoadFromDB 0   1    2        3
-    QueryResult *result = CharacterDatabase.Query("SELECT data,text,itemguid,item_template FROM auction JOIN item_instance ON itemguid = guid");
+    QueryResult* result = CharacterDatabase.Query("SELECT data,text,itemguid,item_template FROM auction JOIN item_instance ON itemguid = guid");
 
     if (!result)
     {
@@ -278,7 +280,7 @@ void AuctionHouseMgr::LoadAuctionItems()
 
     uint32 count = 0;
 
-    Field *fields;
+    Field* fields;
     do
     {
         bar.step();
@@ -287,15 +289,15 @@ void AuctionHouseMgr::LoadAuctionItems()
         uint32 item_guid        = fields[2].GetUInt32();
         uint32 item_template    = fields[3].GetUInt32();
 
-        ItemPrototype const *proto = ObjectMgr::GetItemPrototype(item_template);
+        ItemPrototype const* proto = ObjectMgr::GetItemPrototype(item_template);
 
         if (!proto)
         {
-            sLog.outError("AuctionHouseMgr::LoadAuctionItems: Unknown item (GUID: %u id: #%u) in auction, skipped.", item_guid,item_template);
+            sLog.outError("AuctionHouseMgr::LoadAuctionItems: Unknown item (GUID: %u id: #%u) in auction, skipped.", item_guid, item_template);
             continue;
         }
 
-        Item *item = NewItemOrBag(proto);
+        Item* item = NewItemOrBag(proto);
 
         if (!item->LoadFromDB(item_guid, fields))
         {
@@ -315,7 +317,7 @@ void AuctionHouseMgr::LoadAuctionItems()
 
 void AuctionHouseMgr::LoadAuctions()
 {
-    QueryResult *result = CharacterDatabase.Query("SELECT COUNT(*) FROM auction");
+    QueryResult* result = CharacterDatabase.Query("SELECT COUNT(*) FROM auction");
     if (!result)
     {
         BarGoLink bar(1);
@@ -325,8 +327,8 @@ void AuctionHouseMgr::LoadAuctions()
         return;
     }
 
-    Field *fields = result->Fetch();
-    uint32 AuctionCount=fields[0].GetUInt32();
+    Field* fields = result->Fetch();
+    uint32 AuctionCount = fields[0].GetUInt32();
     delete result;
 
     if (!AuctionCount)
@@ -350,7 +352,7 @@ void AuctionHouseMgr::LoadAuctions()
 
     BarGoLink bar(AuctionCount);
 
-    typedef std::map<uint32, std::wstring> PlayerNames;
+    typedef UNORDERED_MAP<uint32, std::wstring> PlayerNames;
     PlayerNames playerNames;                                // caching for load time
 
     do
@@ -359,7 +361,7 @@ void AuctionHouseMgr::LoadAuctions()
 
         bar.step();
 
-        AuctionEntry *auction = new AuctionEntry;
+        AuctionEntry* auction = new AuctionEntry;
         auction->Id = fields[0].GetUInt32();
         uint32 houseid  = fields[1].GetUInt32();
         auction->itemGuidLow = fields[2].GetUInt32();
@@ -375,7 +377,7 @@ void AuctionHouseMgr::LoadAuctions()
             if (plWName.empty())
             {
                 std::string plName;
-                if (!sObjectMgr.GetPlayerNameByGUID(ObjectGuid(HIGHGUID_PLAYER, auction->owner), plName))
+                if (!sAccountMgr.GetPlayerNameByGUID(ObjectGuid(HIGHGUID_PLAYER, auction->owner), plName))
                     plName = sObjectMgr.GetMangosStringForDBCLocale(LANG_UNKNOWN);
 
                 Utf8toWStr(plName, plWName);
@@ -410,16 +412,16 @@ void AuctionHouseMgr::LoadAuctions()
 
             // overwrite by real item data
             if ((auction->itemTemplate != pItem->GetEntry()) ||
-                (auction->itemCount != pItem->GetCount()) ||
-                (auction->itemRandomPropertyId != pItem->GetItemRandomPropertyId()))
+                    (auction->itemCount != pItem->GetCount()) ||
+                    (auction->itemRandomPropertyId != pItem->GetItemRandomPropertyId()))
             {
                 auction->itemTemplate = pItem->GetEntry();
                 auction->itemCount    = pItem->GetCount();
                 auction->itemRandomPropertyId = pItem->GetItemRandomPropertyId();
 
-                //No SQL injection (no strings)
+                // No SQL injection (no strings)
                 CharacterDatabase.PExecute("UPDATE auction SET item_template = %u, item_count = %u, item_randompropertyid = %i WHERE itemguid = %u",
-                    auction->itemTemplate, auction->itemCount, auction->itemRandomPropertyId, auction->itemGuidLow);
+                                           auction->itemTemplate, auction->itemCount, auction->itemRandomPropertyId, auction->itemGuidLow);
             }
         }
 
@@ -432,7 +434,7 @@ void AuctionHouseMgr::LoadAuctions()
 
             // Attempt send item back to owner
             std::ostringstream msgAuctionCanceledOwner;
-            msgAuctionCanceledOwner << auction->itemTemplate << ":"<< auction->itemRandomPropertyId << ":" << AUCTION_CANCELED << ":" << auction->Id << ":" << auction->itemCount;
+            msgAuctionCanceledOwner << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_CANCELED << ":" << auction->Id << ":" << auction->itemCount;
 
             if (auction->itemGuidLow)
             {
@@ -442,9 +444,9 @@ void AuctionHouseMgr::LoadAuctions()
                 auction->itemGuidLow = 0;
 
                 // item will deleted or added to received mail list
-                MailDraft(msgAuctionCanceledOwner.str(), "")    // TODO: fix body
-                    .AddItem(pItem)
-                    .SendMailTo(MailReceiver(ObjectGuid(HIGHGUID_PLAYER, auction->owner)), auction, MAIL_CHECK_MASK_COPIED);
+                MailDraft(msgAuctionCanceledOwner.str(), "")// TODO: fix body
+                .AddItem(pItem)
+                .SendMailTo(MailReceiver(ObjectGuid(HIGHGUID_PLAYER, auction->owner)), auction, MAIL_CHECK_MASK_COPIED);
             }
 
             auction->DeleteFromDB();
@@ -455,7 +457,8 @@ void AuctionHouseMgr::LoadAuctions()
 
         GetAuctionsMap(auction->auctionHouseEntry)->AddAuction(auction);
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 
     sLog.outString();
@@ -555,6 +558,7 @@ AuctionHouseEntry const* AuctionHouseMgr::GetAuctionHouseEntry(Unit* unit)
                 {
                     case ALLIANCE: houseid = player->GetAuctionAccessMode() == 0 ? 1 : 6; break;
                     case HORDE:    houseid = player->GetAuctionAccessMode() == 0 ? 6 : 1; break;
+                    default: break;
                 }
             }
         }
@@ -567,13 +571,14 @@ void AuctionHouseObject::Update()
 {
     time_t curTime = sWorld.GetGameTime();
     ///- Handle expired auctions
-    for (AuctionEntryMap::iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); )
+    for (AuctionEntryMap::iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end();)
     {
         if (itr->second->moneyDeliveryTime)                 // pending auction
         {
             if (curTime > itr->second->moneyDeliveryTime)
             {
                 sAuctionMgr.SendAuctionSuccessfulMail(itr->second);
+                auctionbot.Won(itr->second);
 
                 itr->second->DeleteFromDB();
                 MANGOS_ASSERT(!itr->second->itemGuidLow);   // already removed or send in mail at won
@@ -593,6 +598,7 @@ void AuctionHouseObject::Update()
                 else
                 {
                     sAuctionMgr.SendAuctionExpiredMail(itr->second);
+                    auctionbot.Expired(itr->second);
 
                     itr->second->DeleteFromDB();
                     delete itr->second;
@@ -608,9 +614,9 @@ void AuctionHouseObject::Update()
 
 void AuctionHouseObject::BuildListBidderItems(WorldPacket& data, Player* player, uint32& count, uint32& totalcount)
 {
-    for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin();itr != AuctionsMap.end();++itr)
+    for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr)
     {
-        AuctionEntry *Aentry = itr->second;
+        AuctionEntry* Aentry = itr->second;
         if (Aentry->moneyDeliveryTime)                      // skip pending sell auctions
             continue;
         if (Aentry->bidder == player->GetGUIDLow())
@@ -626,7 +632,7 @@ void AuctionHouseObject::BuildListOwnerItems(WorldPacket& data, Player* player,
 {
     for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr)
     {
-        AuctionEntry *Aentry = itr->second;
+        AuctionEntry* Aentry = itr->second;
         if (Aentry->moneyDeliveryTime)                      // skip pending sell auctions
             continue;
         if (Aentry->owner == player->GetGUIDLow())
@@ -638,7 +644,7 @@ void AuctionHouseObject::BuildListOwnerItems(WorldPacket& data, Player* player,
     }
 }
 
-int AuctionEntry::CompareAuctionEntry(uint32 column, const AuctionEntry *auc, Player* viewPlayer) const
+int AuctionEntry::CompareAuctionEntry(uint32 column, const AuctionEntry* auc, Player* viewPlayer) const
 {
     switch (column)
     {
@@ -746,7 +752,7 @@ int AuctionEntry::CompareAuctionEntry(uint32 column, const AuctionEntry *auc, Pl
             if (bid1 < bid2)
                 return -1;
             else if (bid1 > bid2)
-                    return +1;
+                return +1;
             break;
         }
         case 9:                                             // quantity = 9
@@ -771,7 +777,7 @@ int AuctionEntry::CompareAuctionEntry(uint32 column, const AuctionEntry *auc, Pl
     return 0;
 }
 
-bool AuctionSorter::operator()(const AuctionEntry *auc1, const AuctionEntry *auc2) const
+bool AuctionSorter::operator()(const AuctionEntry* auc1, const AuctionEntry* auc2) const
 {
     if (m_sort[0] == MAX_AUCTION_SORT)                      // not sorted
         return false;
@@ -793,16 +799,16 @@ bool AuctionSorter::operator()(const AuctionEntry *auc1, const AuctionEntry *auc
 }
 
 void WorldSession::BuildListAuctionItems(std::vector<AuctionEntry*> const& auctions, WorldPacket& data, std::wstring const& wsearchedname, uint32 listfrom, uint32 levelmin,
-    uint32 levelmax, uint32 usable, uint32 inventoryType, uint32 itemClass, uint32 itemSubClass, uint32 quality, uint32& count, uint32& totalcount, bool isFull)
+        uint32 levelmax, uint32 usable, uint32 inventoryType, uint32 itemClass, uint32 itemSubClass, uint32 quality, uint32& count, uint32& totalcount, bool isFull)
 {
     int loc_idx = _player->GetSession()->GetSessionDbLocaleIndex();
 
     for (std::vector<AuctionEntry*>::const_iterator itr = auctions.begin(); itr != auctions.end(); ++itr)
     {
-        AuctionEntry *Aentry = *itr;
-        if (Aentry->moneyDeliveryTime)
+        AuctionEntry* Aentry = *itr;
+        if (!Aentry || Aentry->moneyDeliveryTime)
             continue;
-        Item *item = sAuctionMgr.GetAItem(Aentry->itemGuidLow);
+        Item* item = sAuctionMgr.GetAItem(Aentry->itemGuidLow);
         if (!item)
             continue;
 
@@ -813,7 +819,7 @@ void WorldSession::BuildListAuctionItems(std::vector<AuctionEntry*> const& aucti
         }
         else
         {
-            ItemPrototype const *proto = item->GetProto();
+            ItemPrototype const* proto = item->GetProto();
 
             if (itemClass != 0xffffffff && proto->Class != itemClass)
                 continue;
@@ -830,8 +836,20 @@ void WorldSession::BuildListAuctionItems(std::vector<AuctionEntry*> const& aucti
             if (levelmin != 0x00 && (proto->RequiredLevel < levelmin || (levelmax != 0x00 && proto->RequiredLevel > levelmax)))
                 continue;
 
-            if (usable != 0x00 && _player->CanUseItem(item) != EQUIP_ERR_OK)
-                continue;
+            if (usable != 0x00)
+            {
+                if (_player->CanUseItem(item) != EQUIP_ERR_OK)
+                    continue;
+
+                if (proto->Class == ITEM_CLASS_RECIPE)
+                {
+                    if (SpellEntry const* spell = sSpellStore.LookupEntry(proto->Spells[0].SpellId))
+                    {
+                        if (_player->HasSpell(spell->EffectTriggerSpell[EFFECT_INDEX_0]))
+                            continue;
+                    }
+                }
+            }
 
             std::string name = proto->Name1;
             sObjectMgr.GetItemLocaleStrings(proto->ItemId, loc_idx, &name);
@@ -854,7 +872,7 @@ void AuctionHouseObject::BuildListPendingSales(WorldPacket& data, Player* player
 {
     for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr)
     {
-        AuctionEntry *Aentry = itr->second;
+        AuctionEntry* Aentry = itr->second;
         if (!Aentry->moneyDeliveryTime)                     // skip not pending auctions
             continue;
         if (Aentry->owner == player->GetGUIDLow())
@@ -878,11 +896,11 @@ void AuctionHouseObject::BuildListPendingSales(WorldPacket& data, Player* player
     }
 }
 
-AuctionEntry* AuctionHouseObject::AddAuction(AuctionHouseEntry const* auctionHouseEntry, Item* newItem, uint32 etime, uint32 bid, uint32 buyout, uint32 deposit, Player * pl /*= NULL*/)
+AuctionEntry* AuctionHouseObject::AddAuction(AuctionHouseEntry const* auctionHouseEntry, Item* newItem, uint32 etime, uint32 bid, uint32 buyout, uint32 deposit, Player* pl /*= NULL*/)
 {
     uint32 auction_time = uint32(etime * sWorld.getConfig(CONFIG_FLOAT_RATE_AUCTION_TIME));
 
-    AuctionEntry *AH = new AuctionEntry;
+    AuctionEntry* AH = new AuctionEntry;
     AH->Id = sObjectMgr.GenerateAuctionID();
     AH->itemGuidLow = newItem->GetObjectGuid().GetCounter();
     AH->itemTemplate = newItem->GetEntry();
@@ -920,9 +938,9 @@ AuctionEntry* AuctionHouseObject::AddAuction(AuctionHouseEntry const* auctionHou
 }
 
 // this function inserts to WorldPacket auction's data
-bool AuctionEntry::BuildAuctionInfo(WorldPacket & data) const
+bool AuctionEntry::BuildAuctionInfo(WorldPacket& data) const
 {
-    Item *pItem = sAuctionMgr.GetAItem(itemGuidLow);
+    Item* pItem = sAuctionMgr.GetAItem(itemGuidLow);
     if (!pItem)
     {
         sLog.outError("auction to item, that doesn't exist !!!!");
@@ -947,7 +965,7 @@ bool AuctionEntry::BuildAuctionInfo(WorldPacket & data) const
     data << uint32(startbid);                               // Auction->startbid (not sure if useful)
     data << uint32(bid ? GetAuctionOutBid() : 0);           // minimal outbid
     data << uint32(buyout);                                 // auction->buyout
-    data << uint32((expireTime-time(NULL))*IN_MILLISECONDS);// time left
+    data << uint32((expireTime - time(NULL))*IN_MILLISECONDS); // time left
     data << ObjectGuid(HIGHGUID_PLAYER, bidder);            // auction->bidder current
     data << uint32(bid);                                    // current bid
     return true;
@@ -969,16 +987,16 @@ uint32 AuctionEntry::GetAuctionOutBid() const
 
 void AuctionEntry::DeleteFromDB() const
 {
-    //No SQL injection (Id is integer)
+    // No SQL injection (Id is integer)
     CharacterDatabase.PExecute("DELETE FROM auction WHERE id = '%u'", Id);
 }
 
 void AuctionEntry::SaveToDB() const
 {
-    //No SQL injection (no strings)
+    // No SQL injection (no strings)
     CharacterDatabase.PExecute("INSERT INTO auction (id,houseid,itemguid,item_template,item_count,item_randompropertyid,itemowner,buyoutprice,time,moneyTime,buyguid,lastbid,startbid,deposit) "
-        "VALUES ('%u', '%u', '%u', '%u', '%u', '%i', '%u', '%u', '" UI64FMTD "', '" UI64FMTD "', '%u', '%u', '%u', '%u')",
-        Id, auctionHouseEntry->houseId, itemGuidLow, itemTemplate, itemCount, itemRandomPropertyId, owner, buyout, (uint64)expireTime, (uint64)moneyDeliveryTime, bidder, bid, startbid, deposit);
+                               "VALUES ('%u', '%u', '%u', '%u', '%u', '%i', '%u', '%u', '" UI64FMTD "', '" UI64FMTD "', '%u', '%u', '%u', '%u')",
+                               Id, auctionHouseEntry->houseId, itemGuidLow, itemTemplate, itemCount, itemRandomPropertyId, owner, buyout, (uint64)expireTime, (uint64)moneyDeliveryTime, bidder, bid, startbid, deposit);
 }
 
 void AuctionEntry::AuctionBidWinning(Player* newbidder)
@@ -992,6 +1010,7 @@ void AuctionEntry::AuctionBidWinning(Player* newbidder)
     CharacterDatabase.CommitTransaction();
 
     sAuctionMgr.SendAuctionWonMail(this);
+    auctionbot.Won(this);
 }
 
 bool AuctionEntry::UpdateBid(uint32 newbid, Player* newbidder /*=NULL*/)
diff --git a/src/game/AuctionHouseMgr.h b/src/game/AuctionHouseMgr.h
index 8e3707734b0..d7ec428059e 100644
--- a/src/game/AuctionHouseMgr.h
+++ b/src/game/AuctionHouseMgr.h
@@ -21,14 +21,17 @@
 
 #include "Common.h"
 #include "SharedDefines.h"
+#include "Platform/Define.h"
 #include "Policies/Singleton.h"
 #include "DBCStructure.h"
+#include "Item.h"
 
-class Item;
 class Player;
 class Unit;
 class WorldPacket;
 
+struct ItemProtoType;
+
 #define MIN_AUCTION_TIME (12*HOUR)
 #define MAX_AUCTION_SORT 12
 #define AUCTION_SORT_REVERSED 0x10
@@ -55,6 +58,10 @@ enum AuctionAction
 
 struct AuctionEntry
 {
+    AuctionEntry() : m_deleted(false) {};
+
+    bool   m_deleted;
+
     uint32 Id;
     uint32 itemGuidLow;                                     // can be 0 after send won mail with item
     uint32 itemTemplate;
@@ -76,18 +83,18 @@ struct AuctionEntry
     uint32 GetHouseFaction() const { return auctionHouseEntry->faction; }
     uint32 GetAuctionCut() const;
     uint32 GetAuctionOutBid() const;
-    bool BuildAuctionInfo(WorldPacket & data) const;
+    bool BuildAuctionInfo(WorldPacket& data) const;
     void DeleteFromDB() const;
     void SaveToDB() const;
     void AuctionBidWinning(Player* bidder = NULL);
 
     // -1,0,+1 order result
-    int CompareAuctionEntry(uint32 column, const AuctionEntry *auc, Player* viewPlayer) const;
+    int CompareAuctionEntry(uint32 column, const AuctionEntry* auc, Player* viewPlayer) const;
 
     bool UpdateBid(uint32 newbid, Player* newbidder = NULL);// true if normal bid, false if buyout, bidder==NULL for generated bid
 };
 
-//this class is used as auctionhouse instance
+// this class is used as auctionhouse instance
 class AuctionHouseObject
 {
     public:
@@ -106,15 +113,15 @@ class AuctionHouseObject
         AuctionEntryMap const& GetAuctions() const { return AuctionsMap; }
         AuctionEntryMapBounds GetAuctionsBounds() const {return AuctionEntryMapBounds(AuctionsMap.begin(), AuctionsMap.end()); }
 
-        void AddAuction(AuctionEntry *ah)
+        void AddAuction(AuctionEntry* ah)
         {
-            MANGOS_ASSERT( ah );
+            MANGOS_ASSERT(ah);
             AuctionsMap[ah->Id] = ah;
         }
 
         AuctionEntry* GetAuction(uint32 id) const
         {
-            AuctionEntryMap::const_iterator itr = AuctionsMap.find( id );
+            AuctionEntryMap::const_iterator itr = AuctionsMap.find(id);
             return itr != AuctionsMap.end() ? itr->second : NULL;
         }
 
@@ -129,7 +136,7 @@ class AuctionHouseObject
         void BuildListOwnerItems(WorldPacket& data, Player* player, uint32& count, uint32& totalcount);
         void BuildListPendingSales(WorldPacket& data, Player* player, uint32& count);
 
-        AuctionEntry* AddAuction(AuctionHouseEntry const* auctionHouseEntry, Item* newItem, uint32 etime, uint32 bid, uint32 buyout = 0, uint32 deposit = 0, Player * pl = NULL);
+        AuctionEntry* AddAuction(AuctionHouseEntry const* auctionHouseEntry, Item* newItem, uint32 etime, uint32 bid, uint32 buyout = 0, uint32 deposit = 0, Player* pl = NULL);
     private:
         AuctionEntryMap AuctionsMap;
 };
@@ -138,8 +145,8 @@ class AuctionSorter
 {
     public:
         AuctionSorter(AuctionSorter const& sorter) : m_sort(sorter.m_sort), m_viewPlayer(sorter.m_viewPlayer) {}
-        AuctionSorter(uint8 *sort, Player* viewPlayer) : m_sort(sort), m_viewPlayer(viewPlayer) {}
-        bool operator()(const AuctionEntry *auc1, const AuctionEntry *auc2) const;
+        AuctionSorter(uint8* sort, Player* viewPlayer) : m_sort(sort), m_viewPlayer(viewPlayer) {}
+        bool operator()(const AuctionEntry* auc1, const AuctionEntry* auc2) const;
 
     private:
         uint8* m_sort;
@@ -155,7 +162,7 @@ enum AuctionHouseType
 
 #define MAX_AUCTION_HOUSE_TYPE 3
 
-class AuctionHouseMgr
+class AuctionHouseMgr : public MaNGOS::Singleton<AuctionHouseMgr, MaNGOS::ClassLevelLockable<AuctionHouseMgr, MANGOSR2_MUTEX_MODEL_2> >
 {
     public:
         AuctionHouseMgr();
@@ -176,17 +183,17 @@ class AuctionHouseMgr
             return NULL;
         }
 
-        //auction messages
-        void SendAuctionWonMail( AuctionEntry * auction );
-        void SendAuctionSuccessfulMail( AuctionEntry * auction );
-        void SendAuctionExpiredMail( AuctionEntry * auction );
-        static uint32 GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item *pItem);
+        // auction messages
+        void SendAuctionWonMail(AuctionEntry* auction);
+        void SendAuctionSuccessfulMail(AuctionEntry* auction);
+        void SendAuctionExpiredMail(AuctionEntry* auction);
+        static uint32 GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item* pItem);
 
         static uint32 GetAuctionHouseTeam(AuctionHouseEntry const* house);
         static AuctionHouseEntry const* GetAuctionHouseEntry(Unit* unit);
 
     public:
-        //load first auction items, because of check if item exists, when loading
+        // load first auction items, because of check if item exists, when loading
         void LoadAuctionItems();
         void LoadAuctions();
 
@@ -197,7 +204,6 @@ class AuctionHouseMgr
 
     private:
         AuctionHouseObject  mAuctions[MAX_AUCTION_HOUSE_TYPE];
-
         ItemMap             mAitems;
 };
 
diff --git a/src/game/Bag.cpp b/src/game/Bag.cpp
index d64af4819ab..a43d308bd88 100644
--- a/src/game/Bag.cpp
+++ b/src/game/Bag.cpp
@@ -48,13 +48,13 @@ void Bag::AddToWorld()
             m_bagslot[i]->AddToWorld();
 }
 
-void Bag::RemoveFromWorld()
+void Bag::RemoveFromWorld(bool remove)
 {
     for (uint32 i = 0; i < GetBagSize(); ++i)
         if (m_bagslot[i])
-            m_bagslot[i]->RemoveFromWorld();
+            m_bagslot[i]->RemoveFromWorld(remove);
 
-    Item::RemoveFromWorld();
+    Item::RemoveFromWorld(remove);
 }
 
 bool Bag::Create(uint32 guidlow, uint32 itemid, Player const* owner)
@@ -219,7 +219,7 @@ uint32 Bag::GetItemCountWithLimitCategory(uint32 limitCategory, Item* eItem) con
 
     for (uint32 i = 0; i < GetBagSize(); ++i)
         if (m_bagslot[i])
-            if (m_bagslot[i] != eItem && m_bagslot[i]->GetProto()->ItemLimitCategory == limitCategory )
+            if (m_bagslot[i] != eItem && m_bagslot[i]->GetProto()->ItemLimitCategory == limitCategory)
                 count += m_bagslot[i]->GetCount();
 
     return count;
diff --git a/src/game/Bag.h b/src/game/Bag.h
index 2896a5655cd..9de45719702 100644
--- a/src/game/Bag.h
+++ b/src/game/Bag.h
@@ -34,12 +34,12 @@ class Bag : public Item
         ~Bag();
 
         void AddToWorld();
-        void RemoveFromWorld();
+        virtual void RemoveFromWorld(bool remove) override;
 
         bool Create(uint32 guidlow, uint32 itemid, Player const* owner);
 
         void Clear();
-        void StoreItem(uint8 slot, Item *pItem, bool update);
+        void StoreItem(uint8 slot, Item* pItem, bool update);
         void RemoveItem(uint8 slot, bool update);
 
         Item* GetItemByPos(uint8 slot) const;
diff --git a/src/game/BattleField/BattleField.cpp b/src/game/BattleField/BattleField.cpp
new file mode 100644
index 00000000000..46047e46fe6
--- /dev/null
+++ b/src/game/BattleField/BattleField.cpp
@@ -0,0 +1,774 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "BattleField.h"
+#include "Language.h"
+#include "World.h"
+#include "ObjectMgr.h"
+#include "Object.h"
+#include "GameObject.h"
+#include "Player.h"
+#include "MapManager.h"
+#include "SpellAuras.h"
+#include "Unit.h"
+
+BattleField::BattleField(uint32 id) : OutdoorPvP(id), m_battleFieldId(0)
+{
+    m_isBattleField = true;
+
+    m_defender = TeamIndex(urand(0, 1));
+    m_state = BF_STATE_COOLDOWN;
+    m_timer = 15 * MINUTE * IN_MILLISECONDS;
+    m_queueUpdateTimer = 30000;
+    m_scoresUpdateTimer = 5000;
+
+    bAboutSend = false;
+}
+
+void BattleField::KickPlayer(Player* plr)
+{
+    float x, y, z;
+    if (!GetKickPosition(plr, x, y, z))
+        return;
+
+    plr->TeleportTo(plr->GetMapId(), x, y, z, plr->GetOrientation());
+}
+
+void BattleField::InitPlayerScore(Player* plr)
+{
+    m_playerScores[plr->GetObjectGuid()] = new BFPlayerScore();
+}
+
+void BattleField::InitPlayerScores()
+{
+    for (BFPlayerScoreMap::iterator itr = m_playerScores.begin(); itr != m_playerScores.end(); ++itr)
+        delete itr->second;
+
+    m_playerScores.clear();
+
+    for (GuidZoneMap::iterator itr = m_zonePlayers.begin(); itr != m_zonePlayers.end(); ++itr)
+    {
+        if (!itr->first)
+            continue;
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+        if (!plr)
+            continue;
+
+        InitPlayerScore(plr);
+    }
+}
+
+bool BattleField::UpdatePlayerScores()
+{
+    bool bRemoved = false;
+    for (BFPlayerScoreMap::iterator itr = m_playerScores.begin(); itr != m_playerScores.end();)
+    {
+        if (itr->second->removeTime && itr->second->removeTime + itr->second->removeDelay < time(NULL))
+        {
+            delete itr->second;
+            if (Player* plr = GetMap()->GetPlayer(itr->first))
+                KickPlayer(plr);
+
+            if (IsMember(itr->first))
+            {
+                RemovePlayerFromRaid(itr->first);
+                bRemoved = true;
+            }
+
+            m_playerScores.erase(itr++);
+
+        }
+        else
+            ++itr;
+    }
+
+    return bRemoved;
+}
+
+Map* BattleField::GetMap()
+{
+    return sMapMgr.CreateMap(m_mapId, NULL);
+}
+
+Group* BattleField::GetFreeRaid(TeamIndex teamIdx)
+{
+    for (std::set<Group*>::iterator itr = m_Raids[teamIdx].begin(); itr != m_Raids[teamIdx].end(); ++itr)
+        if (!(*itr)->IsFull())
+            return *itr;
+
+    return NULL;
+}
+
+bool BattleField::IsMember(ObjectGuid guid)
+{
+    return GetGroupFor(guid) != NULL;
+}
+
+Group* BattleField::GetGroupFor(ObjectGuid guid)
+{
+    for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
+        for (std::set<Group*>::iterator itr = m_Raids[i].begin(); itr != m_Raids[i].end(); ++itr)
+            if ((*itr)->IsMember(guid))
+                return *itr;
+
+    return NULL;
+}
+
+bool BattleField::AddPlayerToRaid(Player* player)
+{
+    if (!player->IsInWorld())
+        return false;
+
+    DEBUG_LOG("Battlefield: Adding player %s to raid", player->GetGuidStr().c_str());
+
+    if (Group* group = player->GetGroup())
+    {
+        DEBUG_LOG("Battlefield: Player %s already has group %s, uninviting", player->GetGuidStr().c_str(), group->GetObjectGuid().GetString().c_str());
+        group->RemoveMember(player->GetObjectGuid(), 0);
+    }
+
+    TeamIndex teamIdx = GetTeamIndex(player->GetTeam());
+    Group* group = GetFreeRaid(teamIdx);
+    if (!group)
+    {
+        DEBUG_LOG("Battlefield: No free raid for %s!", player->GetGuidStr().c_str());
+        if (IsTeamFull(teamIdx))
+        {
+            DEBUG_LOG("Battlefield: BattleField is full! Can't add player %s!", player->GetGuidStr().c_str());
+            return false;
+        }
+
+        DEBUG_LOG("Battlefield: Trying to create new group for %s!", player->GetGuidStr().c_str());
+        group = new Group(GROUPTYPE_NORMAL);
+        group->SetBattlefieldGroup(this);
+        if (group->Create(player->GetObjectGuid(), player->GetName()))
+            DEBUG_LOG("Battlefield: Successfully created new group %s", group->GetObjectGuid().GetString().c_str());
+        else
+            DEBUG_LOG("Failed to create group!");
+
+        m_Raids[teamIdx].insert(group);
+    }
+    else if (group->IsMember(player->GetObjectGuid()))
+    {
+        DEBUG_LOG("Battlefield: Raid already has players %s, making some shit", player->GetGuidStr().c_str());
+        uint8 subgroup = group->GetMemberGroup(player->GetObjectGuid());
+        player->SetBattleGroundRaid(group->GetObjectGuid(), subgroup);
+    }
+    else
+    {
+        if (IsTeamFull(teamIdx))
+        {
+            DEBUG_LOG("Battlefield: Group %s found, but battlefield is full! Can't add player %s!", group->GetObjectGuid().GetString().c_str(), player->GetGuidStr().c_str());
+            return false;
+        }
+
+        return group->AddMember(player->GetObjectGuid(), player->GetName());
+    }
+
+    return true;
+}
+
+bool BattleField::RemovePlayerFromRaid(ObjectGuid guid)
+{
+    if (Group* group = GetGroupFor(guid))
+    {
+        if (group->RemoveMember(guid, 0) == 0)
+            delete group;
+
+        return true;
+    }
+
+    return false;
+}
+
+uint32 BattleField::GetPlayerCountByTeam(TeamIndex teamIdx)
+{
+    uint32 count = 0;
+    for (std::set<Group*>::iterator itr = m_Raids[teamIdx].begin(); itr != m_Raids[teamIdx].end(); ++itr)
+        count += (*itr)->GetMembersCount();
+
+    return count;
+}
+
+bool BattleField::IsTeamFull(TeamIndex teamIdx)
+{
+    return m_QueuedPlayers[teamIdx].size() + m_InvitedPlayers[teamIdx].size() + GetPlayerCountByTeam(teamIdx) >= m_maxPlayersPerTeam;
+}
+
+void BattleField::InvitePlayerToQueue(Player* player)
+{
+    if (IsMember(player->GetObjectGuid()))
+        return;
+
+    TeamIndex teamIdx = GetTeamIndex(player->GetTeam());
+    // he is in queue or waiting to accept teleport button
+    if (m_QueuedPlayers[teamIdx].find(player->GetObjectGuid()) != m_QueuedPlayers[teamIdx].end())
+        return;
+    if (m_InvitedPlayers[teamIdx].find(player->GetObjectGuid()) != m_InvitedPlayers[teamIdx].end())
+        return;
+
+    if (!IsTeamFull(teamIdx))
+        player->GetSession()->SendBfInvitePlayerToQueue(GetBattlefieldGuid());
+    //else
+    //    player->GetSession()->SendBfQueueInviteResponse(GetBattlefieldGuid(), GetQueueGuid(), m_zoneId, true, true);
+}
+
+void BattleField::OnPlayerInviteResponse(Player* plr, bool accept)
+{
+    if (!accept || IsMember(plr->GetObjectGuid()))
+        return;
+
+    TeamIndex teamIdx = GetTeamIndex(plr->GetTeam());
+    // not needed
+    std::map<ObjectGuid, time_t>::iterator itr = m_InvitedPlayers[teamIdx].find(plr->GetObjectGuid());
+    if (itr != m_InvitedPlayers[teamIdx].end())
+        m_InvitedPlayers[teamIdx].erase(itr);
+
+    if (IsTeamFull(teamIdx))
+    {
+        plr->GetSession()->SendBfQueueInviteResponse(GetBattlefieldGuid(), GetQueueGuid(), m_zoneId, true, true);
+        return;
+    }
+
+    if (m_QueuedPlayers[teamIdx].find(plr->GetObjectGuid()) == m_QueuedPlayers[teamIdx].end())
+    {
+        if (m_state == BF_STATE_IN_PROGRESS)
+        {
+            m_InvitedPlayers[teamIdx][plr->GetObjectGuid()] = time(NULL) + BF_TIME_TO_ACCEPT;
+            plr->GetSession()->SendBfInvitePlayerToWar(GetBattlefieldGuid(), m_zoneId, BF_TIME_TO_ACCEPT);
+        }
+        else
+        {
+            m_QueuedPlayers[teamIdx].insert(plr->GetObjectGuid());
+            plr->GetSession()->SendBfQueueInviteResponse(GetBattlefieldGuid(), GetQueueGuid(), m_zoneId, true, false);
+        }
+    }
+}
+
+bool BattleField::OnPlayerPortResponse(Player* plr, bool accept)
+{
+    if (IsMember(plr->GetObjectGuid()))
+        return false;
+
+    if (accept)
+    {
+        TeamIndex teamIdx = GetTeamIndex(plr->GetTeam());
+        std::map<ObjectGuid, time_t>::iterator itr = m_InvitedPlayers[teamIdx].find(plr->GetObjectGuid());
+        // he was not invited by core
+        if (itr == m_InvitedPlayers[teamIdx].end())
+            return false;
+
+        m_InvitedPlayers[teamIdx].erase(itr);
+
+        if (AddPlayerToRaid(plr))
+        {
+            DEBUG_LOG("Battlefield: AddPlayerToRaid for %s returned: TRUE", plr->GetGuidStr().c_str());
+            plr->GetSession()->SendBfEntered(GetBattlefieldGuid());
+        }
+        else
+            DEBUG_LOG("Battlefield: AddPlayerToRaid for %s returned: FALSE", plr->GetGuidStr().c_str());
+
+        if (plr->GetZoneId() == m_zoneId)
+        {
+            if (m_playerScores.find(plr->GetObjectGuid()) == m_playerScores.end())  // must never happen
+                InitPlayerScore(plr);
+
+            SendUpdateWorldStatesTo(plr);
+        }
+        //else
+            // controlled in script
+
+        return true;
+    }
+    else if (m_state == BF_STATE_IN_PROGRESS && plr->GetZoneId() == m_zoneId)
+    {
+        plr->GetSession()->SendBfLeaveMessage(GetBattlefieldGuid(), BATTLEFIELD_LEAVE_REASON_EXITED);
+        if (m_playerScores.find(plr->GetObjectGuid()) != m_playerScores.end())
+        {
+            m_playerScores[plr->GetObjectGuid()]->removeTime = time(NULL);
+            m_playerScores[plr->GetObjectGuid()]->removeDelay = BF_UNACCEPTED_REMOVE_DELAY;
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+bool BattleField::OnPlayerQueueExitRequest(Player* plr)
+{
+    if (IsMember(plr->GetObjectGuid()))
+    {
+        plr->GetSession()->SendBfLeaveMessage(GetBattlefieldGuid(), BATTLEFIELD_LEAVE_REASON_EXITED);
+        RemovePlayerFromRaid(plr->GetObjectGuid());
+        SendRemoveWorldStates(plr);
+        if (m_playerScores.find(plr->GetObjectGuid()) != m_playerScores.end())
+        {
+            m_playerScores[plr->GetObjectGuid()]->removeTime = time(NULL);
+            m_playerScores[plr->GetObjectGuid()]->removeDelay = BF_UNACCEPTED_REMOVE_DELAY;
+        }
+        return true;
+    }
+
+    std::set<ObjectGuid>::iterator itr = m_QueuedPlayers[GetTeamIndex(plr->GetTeam())].find(plr->GetObjectGuid());
+    if (itr != m_QueuedPlayers[GetTeamIndex(plr->GetTeam())].end())
+    {
+        m_QueuedPlayers[GetTeamIndex(plr->GetTeam())].erase(itr);
+
+        plr->GetSession()->SendBfLeaveMessage(GetBattlefieldGuid(), BATTLEFIELD_LEAVE_REASON_EXITED);
+        if (m_playerScores.find(plr->GetObjectGuid()) != m_playerScores.end())
+        {
+            m_playerScores[plr->GetObjectGuid()]->removeTime = time(NULL);
+            m_playerScores[plr->GetObjectGuid()]->removeDelay = BF_UNACCEPTED_REMOVE_DELAY;
+        }
+        return true;
+    }
+
+    return false;
+}
+
+bool BattleField::OnGroupDeleted(Group* group)
+{
+    for (uint32 i = 0; i < 2; ++i)
+        for (std::set<Group*>::iterator itr = m_Raids[i].begin(); itr != m_Raids[i].end(); ++itr)
+            if (*itr == group)
+            {
+                m_Raids[i].erase(itr);
+                return true;
+            }
+
+    return false;
+}
+
+void BattleField::OnPlayerGroupDisband(Player* plr)
+{
+    SendRemoveWorldStates(plr);
+    plr->GetSession()->SendBfLeaveMessage(GetBattlefieldGuid(), BATTLEFIELD_LEAVE_REASON_EXITED);
+
+    if (m_playerScores.find(plr->GetObjectGuid()) != m_playerScores.end())
+    {
+        m_playerScores[plr->GetObjectGuid()]->removeTime = time(NULL);
+        m_playerScores[plr->GetObjectGuid()]->removeDelay = BF_UNACCEPTED_REMOVE_DELAY;
+    }
+}
+
+void BattleField::HandlePlayerAFK(Player* plr)
+{
+    if (m_state != BF_STATE_IN_PROGRESS || !IsMember(plr->GetObjectGuid()))
+        return;
+
+    RemovePlayerFromRaid(plr->GetObjectGuid());
+    plr->GetSession()->SendBfLeaveMessage(GetBattlefieldGuid(), BATTLEFIELD_LEAVE_REASON_EXITED);
+    KickPlayer(plr);
+}
+
+bool BFObject::IsIntact() const
+{
+    return state == BF_OBJECTSTATE_NEUTRAL_INTACT || state == BF_OBJECTSTATE_HORDE_INTACT || state == BF_OBJECTSTATE_ALLIANCE_INTACT;
+}
+
+bool BFObject::IsDamaged() const
+{
+    return state == BF_OBJECTSTATE_NEUTRAL_DAMAGED || state == BF_OBJECTSTATE_HORDE_DAMAGED || state == BF_OBJECTSTATE_ALLIANCE_DAMAGED;
+}
+
+bool BFObject::IsDestroyed() const
+{
+    return state == BF_OBJECTSTATE_NEUTRAL_DESTROYED || state == BF_OBJECTSTATE_HORDE_DESTROYED || state == BF_OBJECTSTATE_ALLIANCE_DESTROYED;
+}
+
+void BFObject::SendUpdateWorldState()
+{
+    opvp->SendUpdateWorldStateForMap(worldState, state, ((BattleField*)opvp)->GetMap());
+}
+
+void BattleField::StartBattle(TeamIndex defender)
+{
+    m_startTime = time(NULL);
+    m_state = BF_STATE_IN_PROGRESS;
+    m_timer = m_battleDuration;
+    m_defender = defender;
+
+    InitPlayerScores();
+
+    DEBUG_LOG("Disbanding groups");
+    for (uint32 i = 0; i < PVP_TEAM_COUNT; ++i)
+    {
+        while (!m_Raids[i].empty())
+        {
+            Group* group = *m_Raids[i].begin();
+            group->Disband();
+            delete group;
+        }
+    }
+
+    for (GuidZoneMap::iterator itr = m_zonePlayers.begin(); itr != m_zonePlayers.end(); ++itr)
+    {
+        if (!itr->first)
+            continue;
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+        if (!plr)
+            continue;
+
+        uint8 idx = 0;
+        std::set<ObjectGuid>::iterator itr2 = m_QueuedPlayers[idx].find(itr->first);
+        if (itr2 == m_QueuedPlayers[idx].end())
+        {
+            ++idx;
+            itr2 = m_QueuedPlayers[idx].find(itr->first);
+        }
+
+        if (itr2 != m_QueuedPlayers[idx].end())
+        {
+            m_InvitedPlayers[idx][itr->first] = time(NULL) + BF_TIME_TO_ACCEPT;
+            plr->GetSession()->SendBfInvitePlayerToWar(GetBattlefieldGuid(), m_zoneId, BF_TIME_TO_ACCEPT);
+            m_QueuedPlayers[idx].erase(itr2);
+        }
+        else
+        {
+            plr->GetSession()->SendBfLeaveMessage(GetBattlefieldGuid(), BATTLEFIELD_LEAVE_REASON_EXITED);
+            SendRemoveWorldStates(plr);
+            if (m_playerScores.find(itr->first) != m_playerScores.end())
+            {
+                m_playerScores[itr->first]->removeTime = time(NULL);
+                m_playerScores[itr->first]->removeDelay = BF_UNACCEPTED_REMOVE_DELAY;
+            }
+        }
+    }
+
+    // non-zone queued players
+    for (uint32 i = 0; i < PVP_TEAM_COUNT; ++i)
+    {
+        for (std::set<ObjectGuid>::iterator itr = m_QueuedPlayers[i].begin(); itr != m_QueuedPlayers[i].end();)
+        {
+            if (Player* plr = sObjectMgr.GetPlayer(*itr, true))
+            {
+                m_InvitedPlayers[i][plr->GetObjectGuid()] = time(NULL) + BF_TIME_TO_ACCEPT;
+                plr->GetSession()->SendBfInvitePlayerToWar(GetBattlefieldGuid(), m_zoneId, BF_TIME_TO_ACCEPT);
+            }
+
+            m_QueuedPlayers[i].erase(itr++);
+        }
+    }
+}
+
+void BattleField::EndBattle(TeamIndex winner, bool byTimer)
+{
+    m_defender = winner;
+    m_state = BF_STATE_COOLDOWN;
+    m_timer = m_cooldownDuration;
+    bInvited = false;
+    bAboutSend = false;
+
+    RewardPlayersAtEnd(winner);
+}
+
+void BattleField::Update(uint32 diff)
+{
+    if (m_timer < diff)
+    {
+        if (m_state == BF_STATE_COOLDOWN)
+            StartBattle(m_defender);
+        else if (m_state == BF_STATE_IN_PROGRESS)
+            EndBattle(m_defender, true);
+
+        return;
+    }
+    else
+        m_timer -= diff;
+
+    if (m_state == BF_STATE_IN_PROGRESS)
+        if (m_scoresUpdateTimer < diff)
+        {
+            m_scoresUpdateTimer = 5000;
+            UpdatePlayerScores();
+        }
+        else
+            m_scoresUpdateTimer -= diff;
+
+    if (m_state == BF_STATE_COOLDOWN && m_timer <= m_startInviteDelay && !bInvited)
+    {
+        bInvited = true;
+        for (GuidZoneMap::iterator itr = m_zonePlayers.begin(); itr != m_zonePlayers.end(); ++itr)
+        {
+            if (!itr->first)
+                continue;
+
+            Player* plr = sObjectMgr.GetPlayer(itr->first);
+            if (!plr)
+                continue;
+
+            InvitePlayerToQueue(plr);
+        }
+    }
+
+    if (m_state == BF_STATE_IN_PROGRESS)
+    {
+        for (uint32 i = 0; i < PVP_TEAM_COUNT; ++i)
+        {
+            for (std::map<ObjectGuid, time_t>::iterator itr = m_InvitedPlayers[i].begin(); itr != m_InvitedPlayers[i].end();)
+            {
+                if (itr->second < time(NULL))
+                {
+                    if (Player* plr = GetMap()->GetPlayer(itr->first))
+                        plr->GetSession()->SendBfLeaveMessage(GetBattlefieldGuid(), BATTLEFIELD_LEAVE_REASON_EXITED);
+                    m_InvitedPlayers[i].erase(itr++);
+                }
+                else
+                    ++itr;
+            }
+        }
+    }
+
+    if (m_queueUpdateTimer < diff)
+    {
+        m_queueUpdateTimer = 30000;
+
+        for (uint32 i = 0; i < PVP_TEAM_COUNT; ++i)
+        {
+            for (std::set<ObjectGuid>::iterator itr = m_QueuedPlayers[i].begin(); itr != m_QueuedPlayers[i].end();)
+            {
+                if (!sObjectMgr.GetPlayer(*itr, true))
+                    m_QueuedPlayers[i].erase(itr++);
+                else
+                    ++itr;
+            }
+        }
+    }
+    else
+        m_queueUpdateTimer -= diff;
+}
+
+void BattleField::HandlePlayerEnterZone(Player* pPlayer, bool isMainZone)
+{
+    OutdoorPvP::HandlePlayerEnterZone(pPlayer, isMainZone);
+
+    if (!IsMember(pPlayer->GetObjectGuid()))
+    {
+        if (m_state == BF_STATE_IN_PROGRESS)
+        {
+            m_InvitedPlayers[GetTeamIndex(pPlayer->GetTeam())][pPlayer->GetObjectGuid()] = time(NULL) + BF_TIME_TO_ACCEPT;
+            pPlayer->GetSession()->SendBfInvitePlayerToWar(GetBattlefieldGuid(), m_zoneId, BF_TIME_TO_ACCEPT);
+        }
+        else if (m_state == BF_STATE_COOLDOWN && m_timer < m_startInviteDelay)
+            InvitePlayerToQueue(pPlayer);
+    }
+
+    BFPlayerScoreMap::iterator itr = m_playerScores.find(pPlayer->GetObjectGuid());
+    if (itr == m_playerScores.end())
+        InitPlayerScore(pPlayer);
+    else
+    {
+        if (m_state == BF_STATE_IN_PROGRESS && itr->second->removeTime && m_startTime > itr->second->removeTime)
+            SetupPlayerPosition(pPlayer);
+
+        itr->second->removeTime = 0;
+    }
+}
+
+void BattleField::HandlePlayerLeaveZone(Player* pPlayer, bool isMainZone)
+{
+    OutdoorPvP::HandlePlayerLeaveZone(pPlayer, isMainZone);
+
+    BFPlayerScoreMap::iterator itr = m_playerScores.find(pPlayer->GetObjectGuid());
+    if (itr != m_playerScores.end())
+    {
+        if (IsMember(itr->first))
+        {
+            pPlayer->GetSession()->SendBfLeaveMessage(GetBattlefieldGuid(), BATTLEFIELD_LEAVE_REASON_EXITED);
+            itr->second->removeTime = time(NULL);
+            itr->second->removeDelay = BF_UNACCEPTED_REMOVE_DELAY;
+        }
+        else
+            m_playerScores.erase(itr);
+    }
+}
+
+void BattleField::SpawnCreature(Creature* pCreature, uint32 respawnTime, bool despawn)
+{
+    if (despawn)
+    {
+        pCreature->SetRespawnDelay(respawnTime ? respawnTime : 7 * DAY);
+        pCreature->ForcedDespawn();
+    }
+    else
+    {
+        pCreature->SetRespawnDelay(respawnTime ? respawnTime : 5 * MINUTE);
+        pCreature->Respawn();
+    }
+}
+
+Creature* BattleField::SpawnCreature(ObjectGuid guid, uint32 respawnTime, bool despawn)
+{
+    if (Creature* pCreature = GetMap()->GetCreature(guid))
+    {
+        SpawnCreature(pCreature, respawnTime, despawn);
+
+        return pCreature;
+    }
+
+    return NULL;
+}
+
+void BattleField::SendWarningToAll(int32 entry)
+{
+    for (GuidZoneMap::iterator itr = m_zonePlayers.begin(); itr != m_zonePlayers.end(); ++itr)
+    {
+        if (!itr->first)
+            continue;
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+        if (!plr)
+            continue;
+
+        if (plr->GetZoneId() != m_zoneId)
+            continue;
+
+        int32 loc_idx = plr->GetSession()->GetSessionDbLocaleIndex();
+
+        char const* text = sObjectMgr.GetMangosString(entry, loc_idx);
+
+        WorldPacket data(SMSG_MESSAGECHAT, 200);
+        data << uint8(CHAT_MSG_RAID_BOSS_EMOTE);
+        data << uint32(LANG_UNIVERSAL);
+        data << ObjectGuid();
+        data << uint32(0);
+        data << uint32(1);
+        data << uint8(0);
+        data << ObjectGuid();
+        data << uint32(strlen(text) + 1);
+        data << text;
+        data << uint8(0);
+        plr->GetSession()->SendPacket(&data);
+    }
+}
+
+void BattleField::SetupPlayerPositions()
+{
+    for (GuidZoneMap::iterator itr = m_zonePlayers.begin(); itr != m_zonePlayers.end(); ++itr)
+    {
+        if (!itr->first || !IsMember(itr->first))
+            continue;
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+        if (!plr)
+            continue;
+
+        SetupPlayerPosition(plr);
+    }
+}
+
+void BattleField::PlayerLoggedIn(Player* plr)
+{
+    if (Group* group = GetGroupFor(plr->GetObjectGuid()))
+    {
+        uint8 subgroup = group->GetMemberGroup(plr->GetObjectGuid());
+        plr->SetBattleGroundRaid(group->GetObjectGuid(), subgroup);
+    }
+}
+
+void BattleField::QuestCreditTeam(uint32 credit, Team team, WorldObject* source, float radius)
+{
+    for (GuidZoneMap::iterator itr = m_zonePlayers.begin(); itr != m_zonePlayers.end(); ++itr)
+    {
+        if (!itr->first || !IsMember(itr->first))
+            continue;
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+        if (!plr)
+            continue;
+
+        if (plr->GetTeam() != team || source && radius > 0.0f && source->GetDistance2d(plr->GetPositionX(), plr->GetPositionY()) > radius)
+            continue;
+
+        plr->KilledMonsterCredit(credit);
+    }
+}
+
+void BattleField::SendUpdateWorldStatesToAll()
+{
+    Map::PlayerList const& pList = GetMap()->GetPlayers();
+    for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
+    {
+        Player* player = itr->getSource();
+        if (!player || !player->IsInWorld())
+            continue;
+
+        // timer sent before function
+        SendUpdateWorldStatesTo(player);
+    }
+}
+
+void BFObject::SetIntact()
+{
+    if (owner == TEAM_INDEX_ALLIANCE)
+        state = BF_OBJECTSTATE_ALLIANCE_INTACT;
+    else if (owner == TEAM_INDEX_HORDE)
+        state = BF_OBJECTSTATE_HORDE_INTACT;
+    else
+        state = BF_OBJECTSTATE_NEUTRAL_INTACT;
+}
+
+void BFObject::SetDamaged()
+{
+    if (owner == TEAM_INDEX_ALLIANCE)
+        state = BF_OBJECTSTATE_ALLIANCE_DAMAGED;
+    else if (owner == TEAM_INDEX_HORDE)
+        state = BF_OBJECTSTATE_HORDE_DAMAGED;
+    else
+        state = BF_OBJECTSTATE_NEUTRAL_DAMAGED;
+}
+
+void BFObject::SetDestroyed()
+{
+    if (owner == TEAM_INDEX_ALLIANCE)
+        state = BF_OBJECTSTATE_ALLIANCE_DESTROYED;
+    else if (owner == TEAM_INDEX_HORDE)
+        state = BF_OBJECTSTATE_HORDE_DESTROYED;
+    else
+        state = BF_OBJECTSTATE_NEUTRAL_DESTROYED;
+}
+
+void BFObject::UpdateStateForOwner()
+{
+    if (IsIntact())
+        SetIntact();
+    else if (IsDamaged())
+        SetDamaged();
+    else if (IsDestroyed())
+        SetDestroyed();
+}
+
+void BFObject::InitFor(TeamIndex teamIdx, bool reset)
+{
+    owner = teamIdx;
+    if (reset)
+        SetIntact();
+    else
+        UpdateStateForOwner();
+
+    if (GameObject* obj = opvp->GetMap()->GetGameObject(guid))
+    {
+        if (reset)
+            obj->Rebuild(NULL);
+
+        obj->SetUInt32Value(GAMEOBJECT_FACTION, BFFactions[owner]);
+    }
+}
diff --git a/src/game/BattleField/BattleField.h b/src/game/BattleField/BattleField.h
new file mode 100644
index 00000000000..f8dc16a7262
--- /dev/null
+++ b/src/game/BattleField/BattleField.h
@@ -0,0 +1,213 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef BATTLEFIELD_H
+#define BATTLEFIELD_H
+
+#include "Common.h"
+#include "ObjectGuid.h"
+#include "SharedDefines.h"
+#include "OutdoorPvP/OutdoorPvP.h"
+
+class BattleField;
+class Group;
+
+enum BFState
+{
+    BF_STATE_COOLDOWN       = 0,
+    BF_STATE_IN_PROGRESS    = 1
+};
+
+enum
+{
+    BF_INACTIVE_REMOVE_DELAY    = 5 * MINUTE,
+    BF_UNACCEPTED_REMOVE_DELAY  = 10,
+    BF_TIME_TO_ACCEPT           = 20,
+};
+
+enum BFObjectState
+{
+    BF_OBJECTSTATE_NONE                 = 0,
+    BF_OBJECTSTATE_NEUTRAL_INTACT       = 1,
+    BF_OBJECTSTATE_NEUTRAL_DAMAGED      = 2,
+    BF_OBJECTSTATE_NEUTRAL_DESTROYED    = 3,
+    BF_OBJECTSTATE_HORDE_INTACT         = 4,
+    BF_OBJECTSTATE_HORDE_DAMAGED        = 5,
+    BF_OBJECTSTATE_HORDE_DESTROYED      = 6,
+    BF_OBJECTSTATE_ALLIANCE_INTACT      = 7,
+    BF_OBJECTSTATE_ALLIANCE_DAMAGED     = 8,
+    BF_OBJECTSTATE_ALLIANCE_DESTROYED   = 9,
+};
+
+const uint32 BFFactions[3] = { 1, 2, 35 };
+
+enum
+{
+    SPELL_ALLIANCE_CONTROLS_FACTORY_PHASE_SHIFT = 56617, // PHASE 32
+    SPELL_HORDE_CONTROLS_FACTORY_PHASE_SHIFT    = 56618, // PHASE 16
+
+    SPELL_ALLIANCE_CONTROL_PHASE_SHIFT          = 60027, // PHASE 65
+    SPELL_HORDE_CONTROL_PHASE_SHIFT             = 60028, // PHASE 129
+};
+
+class BFObject
+{
+    public:
+        BFObject(uint32 _id, BattleField* _opvp) : id(_id), opvp(_opvp) { }
+
+        uint32 id;
+        BattleField* opvp;
+        TeamIndex owner;
+        uint32 worldState;
+        BFObjectState state;
+        ObjectGuid guid;
+
+        virtual void InitFor(TeamIndex teamIdx, bool reset = true);
+        bool IsIntact() const;
+        bool IsDamaged() const;
+        bool IsDestroyed() const;
+
+        void SetIntact();
+        void SetDamaged();
+        void SetDestroyed();
+
+        void UpdateStateForOwner();
+
+        virtual void SendUpdateWorldState();
+};
+
+class BFPlayerScore
+{
+    public:
+        BFPlayerScore() : removeTime(0), removeDelay(0) { }
+        virtual ~BFPlayerScore() { }
+
+        time_t removeTime;
+        uint32 removeDelay;
+};
+
+typedef std::map<ObjectGuid, BFPlayerScore*> BFPlayerScoreMap;
+
+class MANGOS_DLL_SPEC BattleField : public OutdoorPvP
+{
+    public:
+        BattleField(uint32 id);
+
+        virtual void HandlePlayerEnterZone(Player* pPlayer, bool isMainZone) override;
+        virtual void HandlePlayerLeaveZone(Player* pPlayer, bool isMainZone) override;
+
+        void OnPlayerInviteResponse(Player* plr, bool accept);
+        virtual bool OnPlayerPortResponse(Player* plr, bool accept);
+        virtual bool OnPlayerQueueExitRequest(Player* plr);
+        virtual bool OnGroupDeleted(Group* group);
+        virtual void OnPlayerGroupDisband(Player* plr);
+        void HandlePlayerAFK(Player* plr);
+        void PlayerLoggedIn(Player* plr);
+
+        virtual void StartBattle(TeamIndex defender);
+        virtual void EndBattle(TeamIndex winner, bool byTimer);
+        virtual void Update(uint32 diff) override;
+
+        Map* GetMap();
+        TeamIndex GetDefender() const { return m_defender; }
+        TeamIndex GetAttacker() const { return m_defender == TEAM_INDEX_ALLIANCE ? TEAM_INDEX_HORDE : TEAM_INDEX_ALLIANCE; }
+        BFState GetState() const { return m_state; }
+        uint32 GetTimer() const { return m_timer; }
+        void SetTimer(uint32 value) { m_timer = value; }
+
+        virtual void GraveYardChanged(uint8 id, TeamIndex newOwner) { };
+
+        BFPlayerScoreMap& GetPlayerScoreMap() { return m_playerScores; }
+
+        virtual bool CriteriaMeets(uint32 criteriaId, Player* plr) { return false; }
+
+        uint32 GetBattleDuration() const { return m_battleDuration; }
+        uint32 GetStartInviteDelay() const { return m_startInviteDelay; }
+        uint32 GetCooldownDuration() const { return m_cooldownDuration; }
+        uint32 GetMaxPlayersPerTeam() const { return m_maxPlayersPerTeam; }
+        uint32 GetStopTeleportingTime() const { return m_stopTeleportingTime; }
+
+        void SendWarningToAll(int32 entry);
+
+        void QuestCreditTeam(uint32 credit, Team team, WorldObject* source = NULL, float radius = -1.0f);
+
+        uint32 GetZoneId() { return m_zoneId; }
+
+        bool IsMember(ObjectGuid guid) override;
+
+        void SpawnCreature(Creature* pCreature, uint32 respawnTime = 0, bool despawn = false);
+        Creature* SpawnCreature(ObjectGuid guid, uint32 respawnTime = 0, bool despawn = false);
+
+        bool AddPlayerToRaid(Player* player);
+        bool RemovePlayerFromRaid(ObjectGuid guid);
+
+        void InvitePlayerToQueue(Player* player);
+
+        uint32 GetBattlefieldId() const { return m_battleFieldId; }
+        ObjectGuid GetBattlefieldGuid() const { return ObjectGuid(HIGHGUID_BATTLEGROUND, uint32((2 << 16) | m_battleFieldId)); }
+        ObjectGuid GetQueueGuid() const { return ObjectGuid(uint64((HIGHGUID_BATTLEGROUND << 24) | m_battleFieldId)); }
+
+    protected:
+        void KickPlayer(Player* plr);
+        virtual bool GetKickPosition(Player* plr, float& x, float& y, float& z) { return false; }
+        virtual void InitPlayerScore(Player* plr);
+        void InitPlayerScores();
+        virtual bool UpdatePlayerScores();
+
+        Group* GetFreeRaid(TeamIndex teamIdx);
+        Group* GetGroupFor(ObjectGuid guid);
+        uint32 GetPlayerCountByTeam(TeamIndex teamIdx);
+        bool IsTeamFull(TeamIndex teamIdx);
+
+        virtual void RewardPlayersAtEnd(TeamIndex winner) { };
+
+        void SetupPlayerPositions();
+        virtual void SetupPlayerPosition(Player* player) { };
+
+        virtual void SendUpdateWorldStatesToAll();
+        virtual void SendUpdateWorldStatesTo(Player* player) { }
+
+        // variables
+        uint32 m_battleFieldId;
+        BFPlayerScoreMap m_playerScores;
+        uint32 m_mapId;
+        std::set<Group*> m_Raids[PVP_TEAM_COUNT];
+        std::set<ObjectGuid> m_QueuedPlayers[PVP_TEAM_COUNT];           // players that are in queue
+        std::map<ObjectGuid, time_t> m_InvitedPlayers[PVP_TEAM_COUNT];  // player to whom teleport invitation is send and who are waited to accept
+
+        uint32 m_zoneId;
+        uint32 m_queueUpdateTimer;
+        uint32 m_scoresUpdateTimer;
+
+        TeamIndex m_defender;
+        BFState m_state;
+        uint32 m_timer;
+
+        uint32 m_battleDuration;
+        uint32 m_startInviteDelay;
+        uint32 m_cooldownDuration;
+        uint32 m_maxPlayersPerTeam;
+        uint32 m_stopTeleportingTime;
+
+        time_t m_startTime;
+
+        bool bInvited;
+        bool bAboutSend;
+};
+
+#endif
\ No newline at end of file
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
deleted file mode 100644
index 883223800cd..00000000000
--- a/src/game/BattleGround.cpp
+++ /dev/null
@@ -1,1838 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Object.h"
-#include "Player.h"
-#include "BattleGround.h"
-#include "BattleGroundMgr.h"
-#include "Creature.h"
-#include "MapManager.h"
-#include "Language.h"
-#include "SpellAuras.h"
-#include "ArenaTeam.h"
-#include "World.h"
-#include "Group.h"
-#include "ObjectGuid.h"
-#include "ObjectMgr.h"
-#include "Mail.h"
-#include "WorldPacket.h"
-#include "Util.h"
-#include "Formulas.h"
-#include "GridNotifiersImpl.h"
-
-namespace MaNGOS
-{
-    class BattleGroundChatBuilder
-    {
-        public:
-            BattleGroundChatBuilder(ChatMsg msgtype, int32 textId, Player const* source, va_list* args = NULL)
-                : i_msgtype(msgtype), i_textId(textId), i_source(source), i_args(args) {}
-            void operator()(WorldPacket& data, int32 loc_idx)
-            {
-                char const* text = sObjectMgr.GetMangosString(i_textId,loc_idx);
-
-                if (i_args)
-                {
-                    // we need copy va_list before use or original va_list will corrupted
-                    va_list ap;
-                    va_copy(ap,*i_args);
-
-                    char str [2048];
-                    vsnprintf(str,2048,text, ap );
-                    va_end(ap);
-
-                    do_helper(data,&str[0]);
-                }
-                else
-                    do_helper(data,text);
-            }
-        private:
-            void do_helper(WorldPacket& data, char const* text)
-            {
-                ObjectGuid targetGuid = i_source ? i_source ->GetObjectGuid() : ObjectGuid();
-
-                data << uint8(i_msgtype);
-                data << uint32(LANG_UNIVERSAL);
-                data << ObjectGuid(targetGuid);             // there 0 for BG messages
-                data << uint32(0);                          // can be chat msg group or something
-                data << ObjectGuid(targetGuid);
-                data << uint32(strlen(text)+1);
-                data << text;
-                data << uint8(i_source ? i_source->chatTag() : uint8(0));
-            }
-
-            ChatMsg i_msgtype;
-            int32 i_textId;
-            Player const* i_source;
-            va_list* i_args;
-    };
-
-    class BattleGroundYellBuilder
-    {
-        public:
-            BattleGroundYellBuilder(uint32 language, int32 textId, Creature const* source, va_list* args = NULL)
-                : i_language(language), i_textId(textId), i_source(source), i_args(args) {}
-            void operator()(WorldPacket& data, int32 loc_idx)
-            {
-                char const* text = sObjectMgr.GetMangosString(i_textId,loc_idx);
-
-                if(i_args)
-                {
-                    // we need copy va_list before use or original va_list will corrupted
-                    va_list ap;
-                    va_copy(ap,*i_args);
-
-                    char str [2048];
-                    vsnprintf(str,2048,text, ap );
-                    va_end(ap);
-
-                    do_helper(data,&str[0]);
-                }
-                else
-                    do_helper(data,text);
-            }
-        private:
-            void do_helper(WorldPacket& data, char const* text)
-            {
-                //copyied from BuildMonsterChat
-                data << uint8(CHAT_MSG_MONSTER_YELL);
-                data << uint32(i_language);
-                data << ObjectGuid(i_source->GetObjectGuid());
-                data << uint32(0);                          // 2.1.0
-                data << uint32(strlen(i_source->GetName())+1);
-                data << i_source->GetName();
-                data << ObjectGuid();                       // Unit Target - isn't important for bgs
-                data << uint32(strlen(text)+1);
-                data << text;
-                data << uint8(0);                                      // ChatTag - for bgs allways 0?
-            }
-
-            uint32 i_language;
-            int32 i_textId;
-            Creature const* i_source;
-            va_list* i_args;
-    };
-
-
-    class BattleGround2ChatBuilder
-    {
-        public:
-            BattleGround2ChatBuilder(ChatMsg msgtype, int32 textId, Player const* source, int32 arg1, int32 arg2)
-                : i_msgtype(msgtype), i_textId(textId), i_source(source), i_arg1(arg1), i_arg2(arg2) {}
-            void operator()(WorldPacket& data, int32 loc_idx)
-            {
-                char const* text = sObjectMgr.GetMangosString(i_textId,loc_idx);
-                char const* arg1str = i_arg1 ? sObjectMgr.GetMangosString(i_arg1,loc_idx) : "";
-                char const* arg2str = i_arg2 ? sObjectMgr.GetMangosString(i_arg2,loc_idx) : "";
-
-                char str [2048];
-                snprintf(str,2048,text, arg1str, arg2str );
-
-                ObjectGuid targetGuid = i_source  ? i_source ->GetObjectGuid() : ObjectGuid();
-
-                data << uint8(i_msgtype);
-                data << uint32(LANG_UNIVERSAL);
-                data << ObjectGuid(targetGuid);             // there 0 for BG messages
-                data << uint32(0);                          // can be chat msg group or something
-                data << ObjectGuid(targetGuid);
-                data << uint32(strlen(str)+1);
-                data << str;
-                data << uint8(i_source ? i_source->chatTag() : uint8(0));
-            }
-        private:
-
-            ChatMsg i_msgtype;
-            int32 i_textId;
-            Player const* i_source;
-            int32 i_arg1;
-            int32 i_arg2;
-    };
-
-    class BattleGround2YellBuilder
-    {
-        public:
-            BattleGround2YellBuilder(uint32 language, int32 textId, Creature const* source, int32 arg1, int32 arg2)
-                : i_language(language), i_textId(textId), i_source(source), i_arg1(arg1), i_arg2(arg2) {}
-            void operator()(WorldPacket& data, int32 loc_idx)
-            {
-                char const* text = sObjectMgr.GetMangosString(i_textId,loc_idx);
-                char const* arg1str = i_arg1 ? sObjectMgr.GetMangosString(i_arg1,loc_idx) : "";
-                char const* arg2str = i_arg2 ? sObjectMgr.GetMangosString(i_arg2,loc_idx) : "";
-
-                char str [2048];
-                snprintf(str, 2048, text, arg1str, arg2str);
-                //copyied from BuildMonsterChat
-                data << uint8(CHAT_MSG_MONSTER_YELL);
-                data << uint32(i_language);
-                data << ObjectGuid(i_source->GetObjectGuid());
-                data << uint32(0);                          // 2.1.0
-                data << uint32(strlen(i_source->GetName())+1);
-                data << i_source->GetName();
-                data << ObjectGuid();                       // Unit Target - isn't important for bgs
-                data << uint32(strlen(str)+1);
-                data << str;
-                data << uint8(0);                           // ChatTag - for bgs allways 0?
-            }
-        private:
-
-            uint32 i_language;
-            int32 i_textId;
-            Creature const* i_source;
-            int32 i_arg1;
-            int32 i_arg2;
-    };
-}                                                           // namespace MaNGOS
-
-template<class Do>
-void BattleGround::BroadcastWorker(Do& _do)
-{
-    for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-        if (Player *plr = ObjectAccessor::FindPlayer(itr->first))
-            _do(plr);
-}
-
-BattleGround::BattleGround()
-{
-    m_TypeID            = BattleGroundTypeId(0);
-    m_Status            = STATUS_NONE;
-    m_ClientInstanceID  = 0;
-    m_EndTime           = 0;
-    m_BracketId         = BG_BRACKET_ID_TEMPLATE;
-    m_InvitedAlliance   = 0;
-    m_InvitedHorde      = 0;
-    m_ArenaType         = ARENA_TYPE_NONE;
-    m_IsArena           = false;
-    m_Winner            = TEAM_NONE;
-    m_StartTime         = 0;
-    m_Events            = 0;
-    m_IsRated           = false;
-    m_BuffChange        = false;
-    m_Name              = "";
-    m_LevelMin          = 0;
-    m_LevelMax          = 0;
-    m_InBGFreeSlotQueue = false;
-
-    m_MaxPlayersPerTeam = 0;
-    m_MaxPlayers        = 0;
-    m_MinPlayersPerTeam = 0;
-    m_MinPlayers        = 0;
-
-    m_MapId             = 0;
-    m_Map               = NULL;
-
-    m_TeamStartLocX[BG_TEAM_ALLIANCE]   = 0;
-    m_TeamStartLocX[BG_TEAM_HORDE]      = 0;
-
-    m_TeamStartLocY[BG_TEAM_ALLIANCE]   = 0;
-    m_TeamStartLocY[BG_TEAM_HORDE]      = 0;
-
-    m_TeamStartLocZ[BG_TEAM_ALLIANCE]   = 0;
-    m_TeamStartLocZ[BG_TEAM_HORDE]      = 0;
-
-    m_TeamStartLocO[BG_TEAM_ALLIANCE]   = 0;
-    m_TeamStartLocO[BG_TEAM_HORDE]      = 0;
-
-    m_ArenaTeamIds[BG_TEAM_ALLIANCE]   = 0;
-    m_ArenaTeamIds[BG_TEAM_HORDE]      = 0;
-
-    m_ArenaTeamRatingChanges[BG_TEAM_ALLIANCE]   = 0;
-    m_ArenaTeamRatingChanges[BG_TEAM_HORDE]      = 0;
-
-    m_BgRaids[BG_TEAM_ALLIANCE]         = NULL;
-    m_BgRaids[BG_TEAM_HORDE]            = NULL;
-
-    m_PlayersCount[BG_TEAM_ALLIANCE]    = 0;
-    m_PlayersCount[BG_TEAM_HORDE]       = 0;
-
-    m_TeamScores[BG_TEAM_ALLIANCE]      = 0;
-    m_TeamScores[BG_TEAM_HORDE]         = 0;
-
-    m_PrematureCountDown = false;
-    m_PrematureCountDownTimer = 0;
-
-    m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_2M;
-    m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_1M;
-    m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_30S;
-    m_StartDelayTimes[BG_STARTING_EVENT_FOURTH] = BG_START_DELAY_NONE;
-    //we must set to some default existing values
-    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
-    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_WS_START_ONE_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_WS_START_HALF_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_WS_HAS_BEGUN;
-}
-
-BattleGround::~BattleGround()
-{
-    // remove objects and creatures
-    // (this is done automatically in mapmanager update, when the instance is reset after the reset time)
-
-    int size = m_BgObjects.size();
-    for(int i = 0; i < size; ++i)
-        DelObject(i);
-
-    sBattleGroundMgr.RemoveBattleGround(GetInstanceID(), GetTypeID());
-
-    // skip template bgs as they were never added to visible bg list
-    BattleGroundBracketId bracketId = GetBracketId();
-    if (bracketId != BG_BRACKET_ID_TEMPLATE)
-        sBattleGroundMgr.DeleteClientVisibleInstanceId(GetTypeID(), bracketId, GetClientInstanceID());
-
-    // unload map
-    // map can be null at bg destruction
-    if (m_Map)
-        m_Map->SetUnload();
-
-    // remove from bg free slot queue
-    this->RemoveFromBGFreeSlotQueue();
-
-    for(BattleGroundScoreMap::const_iterator itr = m_PlayerScores.begin(); itr != m_PlayerScores.end(); ++itr)
-        delete itr->second;
-}
-
-void BattleGround::Update(uint32 diff)
-{
-    if (!GetPlayersSize())
-    {
-        // BG is empty
-        // if there are no players invited, delete BG
-        // this will delete arena or bg object, where any player entered
-        // [[   but if you use battleground object again (more battles possible to be played on 1 instance)
-        //      then this condition should be removed and code:
-        //      if (!GetInvitedCount(HORDE) && !GetInvitedCount(ALLIANCE))
-        //          this->AddToFreeBGObjectsQueue(); // not yet implemented
-        //      should be used instead of current
-        // ]]
-        // BattleGround Template instance cannot be updated, because it would be deleted
-        if (!GetInvitedCount(HORDE) && !GetInvitedCount(ALLIANCE))
-            delete this;
-
-        return;
-    }
-
-    // remove offline players from bg after 5 minutes
-    if (!m_OfflineQueue.empty())
-    {
-        BattleGroundPlayerMap::iterator itr = m_Players.find(*(m_OfflineQueue.begin()));
-        if (itr != m_Players.end())
-        {
-            if (itr->second.OfflineRemoveTime <= sWorld.GetGameTime())
-            {
-                RemovePlayerAtLeave(itr->first, true, true);// remove player from BG
-                m_OfflineQueue.pop_front();                 // remove from offline queue
-                //do not use itr for anything, because it is erased in RemovePlayerAtLeave()
-            }
-        }
-    }
-
-    /*********************************************************/
-    /***           BATTLEGROUND BALLANCE SYSTEM            ***/
-    /*********************************************************/
-
-    // if less then minimum players are in on one side, then start premature finish timer
-    if (GetStatus() == STATUS_IN_PROGRESS && !isArena() && sBattleGroundMgr.GetPrematureFinishTime() && (GetPlayersCountByTeam(ALLIANCE) < GetMinPlayersPerTeam() || GetPlayersCountByTeam(HORDE) < GetMinPlayersPerTeam()))
-    {
-        if (!m_PrematureCountDown)
-        {
-            m_PrematureCountDown = true;
-            m_PrematureCountDownTimer = sBattleGroundMgr.GetPrematureFinishTime();
-        }
-        else if (m_PrematureCountDownTimer < diff)
-        {
-            // time's up!
-            Team winner = TEAM_NONE;
-            if (GetPlayersCountByTeam(ALLIANCE) >= GetMinPlayersPerTeam())
-                winner = ALLIANCE;
-            else if (GetPlayersCountByTeam(HORDE) >= GetMinPlayersPerTeam())
-                winner = HORDE;
-
-            EndBattleGround(winner);
-            m_PrematureCountDown = false;
-        }
-        else if (!sBattleGroundMgr.isTesting())
-        {
-            uint32 newtime = m_PrematureCountDownTimer - diff;
-            // announce every minute
-            if (newtime > (MINUTE * IN_MILLISECONDS))
-            {
-                if (newtime / (MINUTE * IN_MILLISECONDS) != m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS))
-                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS)));
-            }
-            else
-            {
-                //announce every 15 seconds
-                if (newtime / (15 * IN_MILLISECONDS) != m_PrematureCountDownTimer / (15 * IN_MILLISECONDS))
-                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / IN_MILLISECONDS));
-            }
-            m_PrematureCountDownTimer = newtime;
-        }
-
-    }
-    else if (m_PrematureCountDown)
-        m_PrematureCountDown = false;
-
-    /*********************************************************/
-    /***           ARENA BUFF OBJECT SPAWNING              ***/
-    /*********************************************************/
-    if (isArena() && !m_ArenaBuffSpawned)
-    {
-        // 60 seconds after start the buffobjects in arena should get spawned
-        if (m_StartTime > uint32(m_StartDelayTimes[BG_STARTING_EVENT_FIRST] + ARENA_SPAWN_BUFF_OBJECTS))
-        {
-            SpawnEvent(ARENA_BUFF_EVENT, 0, true);
-            m_ArenaBuffSpawned = true;
-        }
-    }
-
-    /*********************************************************/
-    /***           BATTLEGROUND STARTING SYSTEM            ***/
-    /*********************************************************/
-
-    if (GetStatus() == STATUS_WAIT_JOIN && GetPlayersSize())
-    {
-        ModifyStartDelayTime(diff);
-
-        if (!(m_Events & BG_STARTING_EVENT_1))
-        {
-            m_Events |= BG_STARTING_EVENT_1;
-
-            // setup here, only when at least one player has ported to the map
-            if (!SetupBattleGround())
-            {
-                EndNow();
-                return;
-            }
-
-            StartingEventCloseDoors();
-            SetStartDelayTime(m_StartDelayTimes[BG_STARTING_EVENT_FIRST]);
-            //first start warning - 2 or 1 minute, only if defined
-            if (m_StartMessageIds[BG_STARTING_EVENT_FIRST])
-                SendMessageToAll(m_StartMessageIds[BG_STARTING_EVENT_FIRST], CHAT_MSG_BG_SYSTEM_NEUTRAL);
-        }
-        // After 1 minute or 30 seconds, warning is signalled
-        else if (GetStartDelayTime() <= m_StartDelayTimes[BG_STARTING_EVENT_SECOND] && !(m_Events & BG_STARTING_EVENT_2))
-        {
-            m_Events |= BG_STARTING_EVENT_2;
-            SendMessageToAll(m_StartMessageIds[BG_STARTING_EVENT_SECOND], CHAT_MSG_BG_SYSTEM_NEUTRAL);
-        }
-        // After 30 or 15 seconds, warning is signalled
-        else if (GetStartDelayTime() <= m_StartDelayTimes[BG_STARTING_EVENT_THIRD] && !(m_Events & BG_STARTING_EVENT_3))
-        {
-            m_Events |= BG_STARTING_EVENT_3;
-            SendMessageToAll(m_StartMessageIds[BG_STARTING_EVENT_THIRD], CHAT_MSG_BG_SYSTEM_NEUTRAL);
-        }
-        // delay expired (atfer 2 or 1 minute)
-        else if (GetStartDelayTime() <= 0 && !(m_Events & BG_STARTING_EVENT_4))
-        {
-            m_Events |= BG_STARTING_EVENT_4;
-
-            StartingEventOpenDoors();
-
-            SendMessageToAll(m_StartMessageIds[BG_STARTING_EVENT_FOURTH], CHAT_MSG_BG_SYSTEM_NEUTRAL);
-            SetStatus(STATUS_IN_PROGRESS);
-            SetStartDelayTime(m_StartDelayTimes[BG_STARTING_EVENT_FOURTH]);
-
-            // remove preparation
-            if (isArena())
-            {
-                for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-                {
-                    if (Player* player = sObjectMgr.GetPlayer(itr->first))
-                        player->RemoveAurasDueToSpell(SPELL_ARENA_PREPARATION);
-                }
-
-                CheckArenaWinConditions();
-            }
-            else
-            {
-
-                PlaySoundToAll(SOUND_BG_START);
-
-                for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-                    if (Player* plr = sObjectMgr.GetPlayer(itr->first))
-                        plr->RemoveAurasDueToSpell(SPELL_PREPARATION);
-                //Announce BG starting
-                if (sWorld.getConfig(CONFIG_BOOL_BATTLEGROUND_QUEUE_ANNOUNCER_START))
-                {
-                    sWorld.SendWorldText(LANG_BG_STARTED_ANNOUNCE_WORLD, GetName(), GetMinLevel(), GetMaxLevel());
-                }
-            }
-        }
-    }
-
-    /*********************************************************/
-    /***           BATTLEGROUND ENDING SYSTEM              ***/
-    /*********************************************************/
-
-    if (GetStatus() == STATUS_WAIT_LEAVE)
-    {
-        // remove all players from battleground after 2 minutes
-        m_EndTime -= diff;
-        if (m_EndTime <= 0)
-        {
-            m_EndTime = 0;
-            BattleGroundPlayerMap::iterator itr, next;
-            for(itr = m_Players.begin(); itr != m_Players.end(); itr = next)
-            {
-                next = itr;
-                ++next;
-                //itr is erased here!
-                RemovePlayerAtLeave(itr->first, true, true);// remove player from BG
-                // do not change any battleground's private variables
-            }
-        }
-    }
-
-    //update start time
-    m_StartTime += diff;
-}
-
-void BattleGround::SetTeamStartLoc(Team team, float X, float Y, float Z, float O)
-{
-    BattleGroundTeamIndex teamIdx = GetTeamIndexByTeamId(team);
-    m_TeamStartLocX[teamIdx] = X;
-    m_TeamStartLocY[teamIdx] = Y;
-    m_TeamStartLocZ[teamIdx] = Z;
-    m_TeamStartLocO[teamIdx] = O;
-}
-
-void BattleGround::SendPacketToAll(WorldPacket *packet)
-{
-    for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-    {
-        if (itr->second.OfflineRemoveTime)
-            continue;
-
-        if (Player *plr = sObjectMgr.GetPlayer(itr->first))
-            plr->GetSession()->SendPacket(packet);
-        else
-            sLog.outError("BattleGround:SendPacketToAll: %s not found!", itr->first.GetString().c_str());
-    }
-}
-
-void BattleGround::SendPacketToTeam(Team teamId, WorldPacket *packet, Player *sender, bool self)
-{
-    for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-    {
-        if (itr->second.OfflineRemoveTime)
-            continue;
-
-        Player *plr = sObjectMgr.GetPlayer(itr->first);
-        if (!plr)
-        {
-            sLog.outError("BattleGround:SendPacketToTeam: %s not found!", itr->first.GetString().c_str());
-            continue;
-        }
-
-        if (!self && sender == plr)
-            continue;
-
-        Team team = itr->second.PlayerTeam;
-        if (!team) team = plr->GetTeam();
-
-        if (team == teamId)
-            plr->GetSession()->SendPacket(packet);
-    }
-}
-
-void BattleGround::PlaySoundToAll(uint32 SoundID)
-{
-    WorldPacket data;
-    sBattleGroundMgr.BuildPlaySoundPacket(&data, SoundID);
-    SendPacketToAll(&data);
-}
-
-void BattleGround::PlaySoundToTeam(uint32 SoundID, Team teamId)
-{
-    WorldPacket data;
-
-    for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-    {
-        if (itr->second.OfflineRemoveTime)
-            continue;
-
-        Player *plr = sObjectMgr.GetPlayer(itr->first);
-        if (!plr)
-        {
-            sLog.outError("BattleGround:PlaySoundToTeam: %s not found!", itr->first.GetString().c_str());
-            continue;
-        }
-
-        Team team = itr->second.PlayerTeam;
-        if(!team) team = plr->GetTeam();
-
-        if (team == teamId)
-        {
-            sBattleGroundMgr.BuildPlaySoundPacket(&data, SoundID);
-            plr->GetSession()->SendPacket(&data);
-        }
-    }
-}
-
-void BattleGround::CastSpellOnTeam(uint32 SpellID, Team teamId)
-{
-    for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-    {
-        if (itr->second.OfflineRemoveTime)
-            continue;
-
-        Player *plr = sObjectMgr.GetPlayer(itr->first);
-
-        if (!plr)
-        {
-            sLog.outError("BattleGround:CastSpellOnTeam: %s not found!", itr->first.GetString().c_str());
-            continue;
-        }
-
-        Team team = itr->second.PlayerTeam;
-        if(!team) team = plr->GetTeam();
-
-        if (team == teamId)
-            plr->CastSpell(plr, SpellID, true);
-    }
-}
-
-void BattleGround::RewardHonorToTeam(uint32 Honor, Team teamId)
-{
-    for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-    {
-        if (itr->second.OfflineRemoveTime)
-            continue;
-
-        Player *plr = sObjectMgr.GetPlayer(itr->first);
-
-        if (!plr)
-        {
-            sLog.outError("BattleGround:RewardHonorToTeam: %s not found!", itr->first.GetString().c_str());
-            continue;
-        }
-
-        Team team = itr->second.PlayerTeam;
-        if(!team) team = plr->GetTeam();
-
-        if (team == teamId)
-            UpdatePlayerScore(plr, SCORE_BONUS_HONOR, Honor);
-    }
-}
-
-void BattleGround::RewardReputationToTeam(uint32 faction_id, uint32 Reputation, Team teamId)
-{
-    FactionEntry const* factionEntry = sFactionStore.LookupEntry(faction_id);
-
-    if (!factionEntry)
-        return;
-
-    for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-    {
-        if (itr->second.OfflineRemoveTime)
-            continue;
-
-        Player *plr = sObjectMgr.GetPlayer(itr->first);
-
-        if (!plr)
-        {
-            sLog.outError("BattleGround:RewardReputationToTeam: %s not found!", itr->first.GetString().c_str());
-            continue;
-        }
-
-        Team team = itr->second.PlayerTeam;
-        if(!team) team = plr->GetTeam();
-
-        if (team == teamId)
-            plr->GetReputationMgr().ModifyReputation(factionEntry, Reputation);
-    }
-}
-
-void BattleGround::UpdateWorldState(uint32 Field, uint32 Value)
-{
-    WorldPacket data;
-    sBattleGroundMgr.BuildUpdateWorldStatePacket(&data, Field, Value);
-    SendPacketToAll(&data);
-}
-
-void BattleGround::UpdateWorldStateForPlayer(uint32 Field, uint32 Value, Player *Source)
-{
-    WorldPacket data;
-    sBattleGroundMgr.BuildUpdateWorldStatePacket(&data, Field, Value);
-    Source->GetSession()->SendPacket(&data);
-}
-
-void BattleGround::EndBattleGround(Team winner)
-{
-    this->RemoveFromBGFreeSlotQueue();
-
-    ArenaTeam * winner_arena_team = NULL;
-    ArenaTeam * loser_arena_team = NULL;
-    uint32 loser_rating = 0;
-    uint32 winner_rating = 0;
-    WorldPacket data;
-    int32 winmsg_id = 0;
-
-    if (winner == ALLIANCE)
-    {
-        winmsg_id = isBattleGround() ? LANG_BG_A_WINS : LANG_ARENA_GOLD_WINS;
-
-        PlaySoundToAll(SOUND_ALLIANCE_WINS);                // alliance wins sound
-    }
-    else if (winner == HORDE)
-    {
-        winmsg_id = isBattleGround() ? LANG_BG_H_WINS : LANG_ARENA_GREEN_WINS;
-
-        PlaySoundToAll(SOUND_HORDE_WINS);                   // horde wins sound
-    }
-
-    SetWinner(winner);
-
-    SetStatus(STATUS_WAIT_LEAVE);
-    //we must set it this way, because end time is sent in packet!
-    m_EndTime = TIME_TO_AUTOREMOVE;
-
-    // arena rating calculation
-    if (isArena() && isRated())
-    {
-        winner_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(winner));
-        loser_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(GetOtherTeam(winner)));
-        if (winner_arena_team && loser_arena_team)
-        {
-            loser_rating = loser_arena_team->GetStats().rating;
-            winner_rating = winner_arena_team->GetStats().rating;
-            int32 winner_change = winner_arena_team->WonAgainst(loser_rating);
-            int32 loser_change = loser_arena_team->LostAgainst(winner_rating);
-            DEBUG_LOG("--- Winner rating: %u, Loser rating: %u, Winner change: %i, Loser change: %i ---", winner_rating, loser_rating, winner_change, loser_change);
-            SetArenaTeamRatingChangeForTeam(winner, winner_change);
-            SetArenaTeamRatingChangeForTeam(GetOtherTeam(winner), loser_change);
-        }
-        else
-        {
-            SetArenaTeamRatingChangeForTeam(ALLIANCE, 0);
-            SetArenaTeamRatingChangeForTeam(HORDE, 0);
-        }
-    }
-
-    for(BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-    {
-        Team team = itr->second.PlayerTeam;
-
-        if (itr->second.OfflineRemoveTime)
-        {
-            //if rated arena match - make member lost!
-            if (isArena() && isRated() && winner_arena_team && loser_arena_team)
-            {
-                if (team == winner)
-                    winner_arena_team->OfflineMemberLost(itr->first, loser_rating);
-                else
-                    loser_arena_team->OfflineMemberLost(itr->first, winner_rating);
-            }
-            continue;
-        }
-
-        Player *plr = sObjectMgr.GetPlayer(itr->first);
-        if (!plr)
-        {
-            sLog.outError("BattleGround:EndBattleGround %s not found!", itr->first.GetString().c_str());
-            continue;
-        }
-
-        // should remove spirit of redemption
-        if (plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
-            plr->RemoveSpellsCausingAura(SPELL_AURA_MOD_SHAPESHIFT);
-
-        if (!plr->isAlive())
-        {
-            plr->ResurrectPlayer(1.0f);
-            plr->SpawnCorpseBones();
-        }
-        else
-        {
-            //needed cause else in av some creatures will kill the players at the end
-            plr->CombatStop();
-            plr->getHostileRefManager().deleteReferences();
-        }
-
-        //this line is obsolete - team is set ALWAYS
-        //if(!team) team = plr->GetTeam();
-
-        // per player calculation
-        if (isArena() && isRated() && winner_arena_team && loser_arena_team)
-        {
-            if (team == winner)
-            {
-                // update achievement BEFORE personal rating update
-                ArenaTeamMember* member = winner_arena_team->GetMember(plr->GetObjectGuid());
-                if (member)
-                    plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA, member->personal_rating);
-
-                winner_arena_team->MemberWon(plr,loser_rating);
-
-                if (member)
-                {
-                    plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_PERSONAL_RATING, GetArenaType(), member->personal_rating);
-                    plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING, GetArenaType(), winner_arena_team->GetStats().rating);
-                }
-            }
-            else
-            {
-                loser_arena_team->MemberLost(plr,winner_rating);
-
-                // Arena lost => reset the win_rated_arena having the "no_loose" condition
-                plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA, ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE);
-            }
-        }
-
-        if (team == winner)
-        {
-            RewardMark(plr,ITEM_WINNER_COUNT);
-            RewardQuestComplete(plr);
-            plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, 1);
-        }
-        else
-            RewardMark(plr,ITEM_LOSER_COUNT);
-
-        plr->CombatStopWithPets(true);
-
-        BlockMovement(plr);
-
-        sBattleGroundMgr.BuildPvpLogDataPacket(&data, this);
-        plr->GetSession()->SendPacket(&data);
-
-        BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(GetTypeID(), GetArenaType());
-        sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, this, plr->GetBattleGroundQueueIndex(bgQueueTypeId), STATUS_IN_PROGRESS, TIME_TO_AUTOREMOVE, GetStartTime(), GetArenaType());
-        plr->GetSession()->SendPacket(&data);
-        plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND, 1);
-    }
-
-    if (isArena() && isRated() && winner_arena_team && loser_arena_team)
-    {
-        // update arena points only after increasing the player's match count!
-        //obsolete: winner_arena_team->UpdateArenaPointsHelper();
-        //obsolete: loser_arena_team->UpdateArenaPointsHelper();
-        // save the stat changes
-        winner_arena_team->SaveToDB();
-        loser_arena_team->SaveToDB();
-        // send updated arena team stats to players
-        // this way all arena team members will get notified, not only the ones who participated in this match
-        winner_arena_team->NotifyStatsChanged();
-        loser_arena_team->NotifyStatsChanged();
-    }
-
-    if (winmsg_id)
-        SendMessageToAll(winmsg_id, CHAT_MSG_BG_SYSTEM_NEUTRAL);
-}
-
-uint32 BattleGround::GetBonusHonorFromKill(uint32 kills) const
-{
-    //variable kills means how many honorable kills you scored (so we need kills * honor_for_one_kill)
-    return (uint32)MaNGOS::Honor::hk_honor_at_level(GetMaxLevel(), kills);
-}
-
-uint32 BattleGround::GetBattlemasterEntry() const
-{
-    switch(GetTypeID())
-    {
-        case BATTLEGROUND_AV: return 15972;
-        case BATTLEGROUND_WS: return 14623;
-        case BATTLEGROUND_AB: return 14879;
-        case BATTLEGROUND_EY: return 22516;
-        case BATTLEGROUND_NA: return 20200;
-        default:              return 0;
-    }
-}
-
-void BattleGround::RewardMark(Player *plr,uint32 count)
-{
-    switch(GetTypeID())
-    {
-        case BATTLEGROUND_AV:
-            if (count == ITEM_WINNER_COUNT)
-                RewardSpellCast(plr,SPELL_AV_MARK_WINNER);
-            else
-                RewardSpellCast(plr,SPELL_AV_MARK_LOSER);
-            break;
-        case BATTLEGROUND_WS:
-            if (count == ITEM_WINNER_COUNT)
-                RewardSpellCast(plr,SPELL_WS_MARK_WINNER);
-            else
-                RewardSpellCast(plr,SPELL_WS_MARK_LOSER);
-            break;
-        case BATTLEGROUND_AB:
-            if (count == ITEM_WINNER_COUNT)
-                RewardSpellCast(plr,SPELL_AB_MARK_WINNER);
-            else
-                RewardSpellCast(plr,SPELL_AB_MARK_LOSER);
-            break;
-        case BATTLEGROUND_EY:                               // no rewards
-        default:
-            break;
-    }
-}
-
-void BattleGround::RewardSpellCast(Player *plr, uint32 spell_id)
-{
-    // 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
-    if (plr->GetDummyAura(SPELL_AURA_PLAYER_INACTIVE))
-        return;
-
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
-    if(!spellInfo)
-    {
-        sLog.outError("Battleground reward casting spell %u not exist.",spell_id);
-        return;
-    }
-
-    plr->CastSpell(plr, spellInfo, true);
-}
-
-void BattleGround::RewardItem(Player *plr, uint32 item_id, uint32 count)
-{
-    // 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
-    if (plr->GetDummyAura(SPELL_AURA_PLAYER_INACTIVE))
-        return;
-
-    ItemPosCountVec dest;
-    uint32 no_space_count = 0;
-    uint8 msg = plr->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, item_id, count, &no_space_count );
-
-    if( msg == EQUIP_ERR_ITEM_NOT_FOUND)
-    {
-        sLog.outErrorDb("Battleground reward item (Entry %u) not exist in `item_template`.",item_id);
-        return;
-    }
-
-    if( msg != EQUIP_ERR_OK )                               // convert to possible store amount
-        count -= no_space_count;
-
-    if( count != 0 && !dest.empty())                        // can add some
-        if (Item* item = plr->StoreNewItem( dest, item_id, true, 0))
-            plr->SendNewItem(item,count,true,false);
-
-    if (no_space_count > 0)
-        SendRewardMarkByMail(plr,item_id,no_space_count);
-}
-
-void BattleGround::SendRewardMarkByMail(Player *plr,uint32 mark, uint32 count)
-{
-    uint32 bmEntry = GetBattlemasterEntry();
-    if (!bmEntry)
-        return;
-
-    ItemPrototype const* markProto = ObjectMgr::GetItemPrototype(mark);
-    if (!markProto)
-        return;
-
-    if (Item* markItem = Item::CreateItem(mark,count,plr))
-    {
-        // save new item before send
-        markItem->SaveToDB();                               // save for prevent lost at next mail load, if send fail then item will deleted
-
-        int loc_idx = plr->GetSession()->GetSessionDbLocaleIndex();
-
-        // subject: item name
-        std::string subject = markProto->Name1;
-        sObjectMgr.GetItemLocaleStrings(markProto->ItemId, loc_idx, &subject);
-
-        // text
-        std::string textFormat = plr->GetSession()->GetMangosString(LANG_BG_MARK_BY_MAIL);
-        char textBuf[300];
-        snprintf(textBuf, 300, textFormat.c_str(), GetName(), GetName());
-
-        MailDraft(subject, textBuf)
-            .AddItem(markItem)
-            .SendMailTo(plr, MailSender(MAIL_CREATURE, bmEntry));
-    }
-}
-
-void BattleGround::RewardQuestComplete(Player *plr)
-{
-    uint32 quest;
-    switch(GetTypeID())
-    {
-        case BATTLEGROUND_AV:
-            quest = SPELL_AV_QUEST_REWARD;
-            break;
-        case BATTLEGROUND_WS:
-            quest = SPELL_WS_QUEST_REWARD;
-            break;
-        case BATTLEGROUND_AB:
-            quest = SPELL_AB_QUEST_REWARD;
-            break;
-        case BATTLEGROUND_EY:
-            quest = SPELL_EY_QUEST_REWARD;
-            break;
-        default:
-            return;
-    }
-
-    RewardSpellCast(plr, quest);
-}
-
-void BattleGround::BlockMovement(Player *plr)
-{
-    plr->SetClientControl(plr, 0);                          // movement disabled NOTE: the effect will be automatically removed by client when the player is teleported from the battleground, so no need to send with uint8(1) in RemovePlayerAtLeave()
-}
-
-void BattleGround::RemovePlayerAtLeave(ObjectGuid guid, bool Transport, bool SendPacket)
-{
-    Team team = GetPlayerTeam(guid);
-    bool participant = false;
-    // Remove from lists/maps
-    BattleGroundPlayerMap::iterator itr = m_Players.find(guid);
-    if (itr != m_Players.end())
-    {
-        UpdatePlayersCountByTeam(team, true);               // -1 player
-        m_Players.erase(itr);
-        // check if the player was a participant of the match, or only entered through gm command (goname)
-        participant = true;
-    }
-
-    BattleGroundScoreMap::iterator itr2 = m_PlayerScores.find(guid);
-    if (itr2 != m_PlayerScores.end())
-    {
-        delete itr2->second;                                // delete player's score
-        m_PlayerScores.erase(itr2);
-    }
-
-    Player *plr = sObjectMgr.GetPlayer(guid);
-
-    if (plr)
-    {
-        // should remove spirit of redemption
-        if (plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
-            plr->RemoveSpellsCausingAura(SPELL_AURA_MOD_SHAPESHIFT);
-
-        plr->RemoveAurasDueToSpell(isArena() ? SPELL_ARENA_DAMPENING : SPELL_BATTLEGROUND_DAMPENING);
-
-        if (!plr->isAlive())                                // resurrect on exit
-        {
-            plr->ResurrectPlayer(1.0f);
-            plr->SpawnCorpseBones();
-        }
-    }
-
-    RemovePlayer(plr, guid);                                // BG subclass specific code
-
-    if(participant) // if the player was a match participant, remove auras, calc rating, update queue
-    {
-        BattleGroundTypeId bgTypeId = GetTypeID();
-        BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(GetTypeID(), GetArenaType());
-        if (plr)
-        {
-            plr->ClearAfkReports();
-
-            if (!team) team = plr->GetTeam();
-
-            // if arena, remove the specific arena auras
-            if (isArena())
-            {
-                plr->RemoveArenaAuras(true);                // removes debuffs / dots etc., we don't want the player to die after porting out
-                bgTypeId=BATTLEGROUND_AA;                   // set the bg type to all arenas (it will be used for queue refreshing)
-
-                // unsummon current and summon old pet if there was one and there isn't a current pet
-                plr->RemovePet(PET_SAVE_NOT_IN_SLOT);
-                plr->ResummonPetTemporaryUnSummonedIfAny();
-
-                if (isRated() && GetStatus() == STATUS_IN_PROGRESS)
-                {
-                    //left a rated match while the encounter was in progress, consider as loser
-                    ArenaTeam * winner_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(GetOtherTeam(team)));
-                    ArenaTeam * loser_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(team));
-                    if (winner_arena_team && loser_arena_team)
-                        loser_arena_team->MemberLost(plr,winner_arena_team->GetRating());
-                }
-            }
-            if (SendPacket)
-            {
-                WorldPacket data;
-                sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, this, plr->GetBattleGroundQueueIndex(bgQueueTypeId), STATUS_NONE, 0, 0, ARENA_TYPE_NONE);
-                plr->GetSession()->SendPacket(&data);
-            }
-
-            // this call is important, because player, when joins to battleground, this method is not called, so it must be called when leaving bg
-            plr->RemoveBattleGroundQueueId(bgQueueTypeId);
-        }
-        else
-        // removing offline participant
-        {
-            if (isRated() && GetStatus() == STATUS_IN_PROGRESS)
-            {
-                //left a rated match while the encounter was in progress, consider as loser
-                ArenaTeam * others_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(GetOtherTeam(team)));
-                ArenaTeam * players_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(team));
-                if (others_arena_team && players_arena_team)
-                    players_arena_team->OfflineMemberLost(guid, others_arena_team->GetRating());
-            }
-        }
-
-        // remove from raid group if player is member
-        if (Group *group = GetBgRaid(team))
-        {
-            if( !group->RemoveMember(guid, 0) )             // group was disbanded
-            {
-                SetBgRaid(team, NULL);
-                delete group;
-            }
-        }
-        DecreaseInvitedCount(team);
-        //we should update battleground queue, but only if bg isn't ending
-        if (isBattleGround() && GetStatus() < STATUS_WAIT_LEAVE)
-        {
-            // a player has left the battleground, so there are free slots -> add to queue
-            AddToBGFreeSlotQueue();
-            sBattleGroundMgr.ScheduleQueueUpdate(0, ARENA_TYPE_NONE, bgQueueTypeId, bgTypeId, GetBracketId());
-        }
-
-        // Let others know
-        WorldPacket data;
-        sBattleGroundMgr.BuildPlayerLeftBattleGroundPacket(&data, guid);
-        SendPacketToTeam(team, &data, plr, false);
-    }
-
-    if (plr)
-    {
-        // Do next only if found in battleground
-        plr->SetBattleGroundId(0, BATTLEGROUND_TYPE_NONE);  // We're not in BG.
-        // reset destination bg team
-        plr->SetBGTeam(TEAM_NONE);
-
-        if (Transport)
-            plr->TeleportToBGEntryPoint();
-
-        DETAIL_LOG("BATTLEGROUND: Removed player %s from BattleGround.", plr->GetName());
-    }
-
-    //battleground object will be deleted next BattleGround::Update() call
-}
-
-// this method is called when no players remains in battleground
-void BattleGround::Reset()
-{
-    SetWinner(TEAM_NONE);
-    SetStatus(STATUS_WAIT_QUEUE);
-    SetStartTime(0);
-    SetEndTime(0);
-    SetArenaType(ARENA_TYPE_NONE);
-    SetRated(false);
-
-    m_Events = 0;
-
-    // door-event2 is always 0
-    m_ActiveEvents[BG_EVENT_DOOR] = 0;
-    if (isArena())
-    {
-        m_ActiveEvents[ARENA_BUFF_EVENT] = BG_EVENT_NONE;
-        m_ArenaBuffSpawned = false;
-    }
-
-    if (m_InvitedAlliance > 0 || m_InvitedHorde > 0)
-        sLog.outError("BattleGround system: bad counter, m_InvitedAlliance: %d, m_InvitedHorde: %d", m_InvitedAlliance, m_InvitedHorde);
-
-    m_InvitedAlliance = 0;
-    m_InvitedHorde = 0;
-    m_InBGFreeSlotQueue = false;
-
-    m_Players.clear();
-
-    for(BattleGroundScoreMap::const_iterator itr = m_PlayerScores.begin(); itr != m_PlayerScores.end(); ++itr)
-        delete itr->second;
-    m_PlayerScores.clear();
-}
-
-void BattleGround::StartBattleGround()
-{
-    SetStartTime(0);
-
-    // add BG to free slot queue
-    AddToBGFreeSlotQueue();
-
-    // add bg to update list
-    // This must be done here, because we need to have already invited some players when first BG::Update() method is executed
-    // and it doesn't matter if we call StartBattleGround() more times, because m_BattleGrounds is a map and instance id never changes
-    sBattleGroundMgr.AddBattleGround(GetInstanceID(), GetTypeID(), this);
-}
-
-void BattleGround::StartTimedAchievement(AchievementCriteriaTypes type, uint32 entry)
-{
-    for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
-        if (Player* pPlayer = GetBgMap()->GetPlayer(itr->first))
-            pPlayer->GetAchievementMgr().StartTimedAchievementCriteria(type, entry);
-}
-
-void BattleGround::AddPlayer(Player *plr)
-{
-    // remove afk from player
-    if (plr->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK))
-        plr->ToggleAFK();
-
-    // score struct must be created in inherited class
-
-    ObjectGuid guid = plr->GetObjectGuid();
-    Team team = plr->GetBGTeam();
-
-    BattleGroundPlayer bp;
-    bp.OfflineRemoveTime = 0;
-    bp.PlayerTeam = team;
-
-    // Add to list/maps
-    m_Players[guid] = bp;
-
-    UpdatePlayersCountByTeam(team, false);                  // +1 player
-
-    WorldPacket data;
-    sBattleGroundMgr.BuildPlayerJoinedBattleGroundPacket(&data, plr);
-    SendPacketToTeam(team, &data, plr, false);
-
-    // add arena specific auras
-    if (isArena())
-    {
-        plr->RemoveArenaSpellCooldowns();
-        plr->RemoveArenaAuras();
-        plr->RemoveAllEnchantments(TEMP_ENCHANTMENT_SLOT);
-        if (team == ALLIANCE)                               // gold
-        {
-            if (plr->GetTeam() == HORDE)
-                plr->CastSpell(plr, SPELL_HORDE_GOLD_FLAG,true);
-            else
-                plr->CastSpell(plr, SPELL_ALLIANCE_GOLD_FLAG,true);
-        }
-        else                                                // green
-        {
-            if (plr->GetTeam() == HORDE)
-                plr->CastSpell(plr, SPELL_HORDE_GREEN_FLAG,true);
-            else
-                plr->CastSpell(plr, SPELL_ALLIANCE_GREEN_FLAG,true);
-        }
-
-        plr->DestroyConjuredItems(true);
-        plr->UnsummonPetTemporaryIfAny();
-
-        if(GetStatus() == STATUS_WAIT_JOIN)                 // not started yet
-            plr->CastSpell(plr, SPELL_ARENA_PREPARATION, true);
-
-        plr->CastSpell(plr, SPELL_ARENA_DAMPENING, true);
-    }
-    else
-    {
-        if(GetStatus() == STATUS_WAIT_JOIN)                 // not started yet
-            plr->CastSpell(plr, SPELL_PREPARATION, true);   // reduces all mana cost of spells.
-
-        plr->CastSpell(plr, SPELL_BATTLEGROUND_DAMPENING, true);
-    }
-
-    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HEALING_DONE, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
-    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
-
-    // setup BG group membership
-    PlayerAddedToBGCheckIfBGIsRunning(plr);
-    AddOrSetPlayerToCorrectBgGroup(plr, guid, team);
-
-    // Log
-    DETAIL_LOG("BATTLEGROUND: Player %s joined the battle.", plr->GetName());
-}
-
-/* this method adds player to his team's bg group, or sets his correct group if player is already in bg group */
-void BattleGround::AddOrSetPlayerToCorrectBgGroup(Player *plr, ObjectGuid plr_guid, Team team)
-{
-    if (Group* group = GetBgRaid(team))                     // raid already exist
-    {
-        if (group->IsMember(plr_guid))
-        {
-            uint8 subgroup = group->GetMemberGroup(plr_guid);
-            plr->SetBattleGroundRaid(group, subgroup);
-        }
-        else
-        {
-            group->AddMember(plr_guid, plr->GetName());
-            if (Group* originalGroup = plr->GetOriginalGroup())
-                if (originalGroup->IsLeader(plr_guid))
-                    group->ChangeLeader(plr_guid);
-        }
-    }
-    else                                                    // first player joined
-    {
-        group = new Group;
-        SetBgRaid(team, group);
-        group->Create(plr_guid, plr->GetName());
-    }
-}
-
-// This method should be called when player logs into running battleground
-void BattleGround::EventPlayerLoggedIn(Player* player, ObjectGuid plr_guid)
-{
-    // player is correct pointer
-    for(OfflineQueue::iterator itr = m_OfflineQueue.begin(); itr != m_OfflineQueue.end(); ++itr)
-    {
-        if (*itr == plr_guid)
-        {
-            m_OfflineQueue.erase(itr);
-            break;
-        }
-    }
-    m_Players[plr_guid].OfflineRemoveTime = 0;
-    PlayerAddedToBGCheckIfBGIsRunning(player);
-    // if battleground is starting, then add preparation aura
-    // we don't have to do that, because preparation aura isn't removed when player logs out
-}
-
-// This method should be called when player logs out from running battleground
-void BattleGround::EventPlayerLoggedOut(Player* player)
-{
-    // player is correct pointer, it is checked in WorldSession::LogoutPlayer()
-    m_OfflineQueue.push_back(player->GetObjectGuid());
-    m_Players[player->GetObjectGuid()].OfflineRemoveTime = sWorld.GetGameTime() + MAX_OFFLINE_TIME;
-    if (GetStatus() == STATUS_IN_PROGRESS)
-    {
-        // drop flag and handle other cleanups
-        RemovePlayer(player, player->GetObjectGuid());
-
-        // 1 player is logging out, if it is the last, then end arena!
-        if (isArena())
-            if (GetAlivePlayersCountByTeam(player->GetTeam()) <= 1 && GetPlayersCountByTeam(GetOtherTeam(player->GetTeam())))
-                EndBattleGround(GetOtherTeam(player->GetTeam()));
-    }
-}
-
-/* This method should be called only once ... it adds pointer to queue */
-void BattleGround::AddToBGFreeSlotQueue()
-{
-    // make sure to add only once
-    if (!m_InBGFreeSlotQueue && isBattleGround())
-    {
-        sBattleGroundMgr.BGFreeSlotQueue[m_TypeID].push_front(this);
-        m_InBGFreeSlotQueue = true;
-    }
-}
-
-/* This method removes this battleground from free queue - it must be called when deleting battleground - not used now*/
-void BattleGround::RemoveFromBGFreeSlotQueue()
-{
-    // set to be able to re-add if needed
-    m_InBGFreeSlotQueue = false;
-    for (BGFreeSlotQueueType::iterator itr = sBattleGroundMgr.BGFreeSlotQueue[m_TypeID].begin(); itr != sBattleGroundMgr.BGFreeSlotQueue[m_TypeID].end(); ++itr)
-    {
-        if ((*itr)->GetInstanceID() == GetInstanceID())
-        {
-            sBattleGroundMgr.BGFreeSlotQueue[m_TypeID].erase(itr);
-            return;
-        }
-    }
-}
-
-// get the number of free slots for team
-// returns the number how many players can join battleground to MaxPlayersPerTeam
-uint32 BattleGround::GetFreeSlotsForTeam(Team team) const
-{
-    //return free slot count to MaxPlayerPerTeam
-    if (GetStatus() == STATUS_WAIT_JOIN || GetStatus() == STATUS_IN_PROGRESS)
-        return (GetInvitedCount(team) < GetMaxPlayersPerTeam()) ? GetMaxPlayersPerTeam() - GetInvitedCount(team) : 0;
-
-    return 0;
-}
-
-bool BattleGround::HasFreeSlots() const
-{
-    return GetPlayersSize() < GetMaxPlayers();
-}
-
-void BattleGround::UpdatePlayerScore(Player *Source, uint32 type, uint32 value)
-{
-    //this procedure is called from virtual function implemented in bg subclass
-    BattleGroundScoreMap::const_iterator itr = m_PlayerScores.find(Source->GetObjectGuid());
-
-    if(itr == m_PlayerScores.end())                         // player not found...
-        return;
-
-    switch(type)
-    {
-        case SCORE_KILLING_BLOWS:                           // Killing blows
-            itr->second->KillingBlows += value;
-            break;
-        case SCORE_DEATHS:                                  // Deaths
-            itr->second->Deaths += value;
-            break;
-        case SCORE_HONORABLE_KILLS:                         // Honorable kills
-            itr->second->HonorableKills += value;
-            break;
-        case SCORE_BONUS_HONOR:                             // Honor bonus
-            // do not add honor in arenas
-            if (isBattleGround())
-            {
-                // reward honor instantly
-                if (Source->RewardHonor(NULL, 1, (float)value))
-                    itr->second->BonusHonor += value;
-            }
-            break;
-            //used only in EY, but in MSG_PVP_LOG_DATA opcode
-        case SCORE_DAMAGE_DONE:                             // Damage Done
-            itr->second->DamageDone += value;
-            break;
-        case SCORE_HEALING_DONE:                            // Healing Done
-            itr->second->HealingDone += value;
-            break;
-        default:
-            sLog.outError("BattleGround: Unknown player score type %u", type);
-            break;
-    }
-}
-
-bool BattleGround::AddObject(uint32 type, uint32 entry, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3, uint32 /*respawnTime*/)
-{
-    // must be created this way, adding to godatamap would add it to the base map of the instance
-    // and when loading it (in go::LoadFromDB()), a new guid would be assigned to the object, and a new object would be created
-    // so we must create it specific for this instance
-    GameObject * go = new GameObject;
-    if (!go->Create(GetBgMap()->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT),entry, GetBgMap(),
-        PHASEMASK_NORMAL, x,y,z,o, QuaternionData(rotation0,rotation1,rotation2,rotation3)))
-    {
-        sLog.outErrorDb("Gameobject template %u not found in database! BattleGround not created!", entry);
-        sLog.outError("Cannot create gameobject template %u! BattleGround not created!", entry);
-        delete go;
-        return false;
-    }
-/*
-    uint32 guid = go->GetGUIDLow();
-
-    // without this, UseButtonOrDoor caused the crash, since it tried to get go info from godata
-    // iirc that was changed, so adding to go data map is no longer required if that was the only function using godata from GameObject without checking if it existed
-    GameObjectData& data = sObjectMgr.NewGOData(guid);
-
-    data.id             = entry;
-    data.mapid          = GetMapId();
-    data.posX           = x;
-    data.posY           = y;
-    data.posZ           = z;
-    data.orientation    = o;
-    data.rotation0      = rotation0;
-    data.rotation1      = rotation1;
-    data.rotation2      = rotation2;
-    data.rotation3      = rotation3;
-    data.spawntimesecs  = respawnTime;
-    data.spawnMask      = 1;
-    data.animprogress   = 100;
-    data.go_state       = 1;
-*/
-    // add to world, so it can be later looked up from HashMapHolder
-    go->AddToWorld();
-    m_BgObjects[type] = go->GetObjectGuid();
-    return true;
-}
-
-//some doors aren't despawned so we cannot handle their closing in gameobject::update()
-//it would be nice to correctly implement GO_ACTIVATED state and open/close doors in gameobject code
-void BattleGround::DoorClose(ObjectGuid guid)
-{
-    GameObject *obj = GetBgMap()->GetGameObject(guid);
-    if (obj)
-    {
-        //if doors are open, close it
-        if (obj->getLootState() == GO_ACTIVATED && obj->GetGoState() != GO_STATE_READY)
-        {
-            //change state to allow door to be closed
-            obj->SetLootState(GO_READY);
-            obj->UseDoorOrButton(RESPAWN_ONE_DAY);
-        }
-    }
-    else
-        sLog.outError("BattleGround: Door %s not found (cannot close doors)", guid.GetString().c_str());
-}
-
-void BattleGround::DoorOpen(ObjectGuid guid)
-{
-    GameObject *obj = GetBgMap()->GetGameObject(guid);
-    if (obj)
-    {
-        //change state to be sure they will be opened
-        obj->SetLootState(GO_READY);
-        obj->UseDoorOrButton(RESPAWN_ONE_DAY);
-    }
-    else
-        sLog.outError("BattleGround: Door %s not found! - doors will be closed.", guid.GetString().c_str());
-}
-
-void BattleGround::OnObjectDBLoad(Creature* creature)
-{
-    const BattleGroundEventIdx eventId = sBattleGroundMgr.GetCreatureEventIndex(creature->GetGUIDLow());
-    if (eventId.event1 == BG_EVENT_NONE)
-        return;
-    m_EventObjects[MAKE_PAIR32(eventId.event1, eventId.event2)].creatures.push_back(creature->GetObjectGuid());
-    if (!IsActiveEvent(eventId.event1, eventId.event2))
-        SpawnBGCreature(creature->GetObjectGuid(), RESPAWN_ONE_DAY);
-}
-
-ObjectGuid BattleGround::GetSingleCreatureGuid(uint8 event1, uint8 event2)
-{
-    BGCreatures::const_iterator itr = m_EventObjects[MAKE_PAIR32(event1, event2)].creatures.begin();
-    if (itr != m_EventObjects[MAKE_PAIR32(event1, event2)].creatures.end())
-        return *itr;
-    return ObjectGuid();
-}
-
-void BattleGround::OnObjectDBLoad(GameObject* obj)
-{
-    const BattleGroundEventIdx eventId = sBattleGroundMgr.GetGameObjectEventIndex(obj->GetGUIDLow());
-    if (eventId.event1 == BG_EVENT_NONE)
-        return;
-    m_EventObjects[MAKE_PAIR32(eventId.event1, eventId.event2)].gameobjects.push_back(obj->GetObjectGuid());
-    if (!IsActiveEvent(eventId.event1, eventId.event2))
-    {
-        SpawnBGObject(obj->GetObjectGuid(), RESPAWN_ONE_DAY);
-    }
-    else
-    {
-        // it's possible, that doors aren't spawned anymore (wsg)
-        if (GetStatus() >= STATUS_IN_PROGRESS && IsDoor(eventId.event1, eventId.event2))
-            DoorOpen(obj->GetObjectGuid());
-    }
-}
-
-bool BattleGround::IsDoor(uint8 event1, uint8 event2)
-{
-    if (event1 == BG_EVENT_DOOR)
-    {
-        if (event2 > 0)
-        {
-            sLog.outError("BattleGround too high event2 for event1:%i", event1);
-            return false;
-        }
-        return true;
-    }
-    return false;
-}
-
-void BattleGround::OpenDoorEvent(uint8 event1, uint8 event2 /*=0*/)
-{
-    if (!IsDoor(event1, event2))
-    {
-        sLog.outError("BattleGround:OpenDoorEvent this is no door event1:%u event2:%u", event1, event2);
-        return;
-    }
-    if (!IsActiveEvent(event1, event2))                 // maybe already despawned (eye)
-    {
-        sLog.outError("BattleGround:OpenDoorEvent this event isn't active event1:%u event2:%u", event1, event2);
-        return;
-    }
-    BGObjects::const_iterator itr = m_EventObjects[MAKE_PAIR32(event1, event2)].gameobjects.begin();
-    for(; itr != m_EventObjects[MAKE_PAIR32(event1, event2)].gameobjects.end(); ++itr)
-        DoorOpen(*itr);
-}
-
-void BattleGround::SpawnEvent(uint8 event1, uint8 event2, bool spawn)
-{
-    // stop if we want to spawn something which was already spawned
-    // or despawn something which was already despawned
-    if (event2 == BG_EVENT_NONE || (spawn && m_ActiveEvents[event1] == event2)
-        || (!spawn && m_ActiveEvents[event1] != event2))
-        return;
-
-    if (spawn)
-    {
-        // if event gets spawned, the current active event mus get despawned
-        SpawnEvent(event1, m_ActiveEvents[event1], false);
-        m_ActiveEvents[event1] = event2;                    // set this event to active
-    }
-    else
-        m_ActiveEvents[event1] = BG_EVENT_NONE;             // no event active if event2 gets despawned
-
-    BGCreatures::const_iterator itr = m_EventObjects[MAKE_PAIR32(event1, event2)].creatures.begin();
-    for(; itr != m_EventObjects[MAKE_PAIR32(event1, event2)].creatures.end(); ++itr)
-        SpawnBGCreature(*itr, (spawn) ? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY);
-    BGObjects::const_iterator itr2 = m_EventObjects[MAKE_PAIR32(event1, event2)].gameobjects.begin();
-    for(; itr2 != m_EventObjects[MAKE_PAIR32(event1, event2)].gameobjects.end(); ++itr2)
-        SpawnBGObject(*itr2, (spawn) ? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY);
-}
-
-void BattleGround::SpawnBGObject(ObjectGuid guid, uint32 respawntime)
-{
-    Map* map = GetBgMap();
-
-    GameObject *obj = map->GetGameObject(guid);
-    if(!obj)
-        return;
-    if (respawntime == 0)
-    {
-        //we need to change state from GO_JUST_DEACTIVATED to GO_READY in case battleground is starting again
-        if (obj->getLootState() == GO_JUST_DEACTIVATED)
-            obj->SetLootState(GO_READY);
-        obj->SetRespawnTime(0);
-        map->Add(obj);
-    }
-    else
-    {
-        map->Add(obj);
-        obj->SetRespawnTime(respawntime);
-        obj->SetLootState(GO_JUST_DEACTIVATED);
-    }
-}
-
-void BattleGround::SpawnBGCreature(ObjectGuid guid, uint32 respawntime)
-{
-    Map* map = GetBgMap();
-
-    Creature* obj = map->GetCreature(guid);
-    if (!obj)
-        return;
-    if (respawntime == 0)
-    {
-        obj->Respawn();
-        map->Add(obj);
-    }
-    else
-    {
-        map->Add(obj);
-        obj->SetRespawnDelay(respawntime);
-        obj->SetDeathState(JUST_DIED);
-        obj->RemoveCorpse();
-    }
-}
-
-bool BattleGround::DelObject(uint32 type)
-{
-    if (!m_BgObjects[type])
-        return true;
-
-    GameObject *obj = GetBgMap()->GetGameObject(m_BgObjects[type]);
-    if (!obj)
-    {
-        sLog.outError("Can't find gobject: %s", m_BgObjects[type].GetString().c_str());
-        return false;
-    }
-
-    obj->SetRespawnTime(0);                                 // not save respawn time
-    obj->Delete();
-    m_BgObjects[type].Clear();
-    return true;
-}
-
-void BattleGround::SendMessageToAll(int32 entry, ChatMsg type, Player const* source)
-{
-    MaNGOS::BattleGroundChatBuilder bg_builder(type, entry, source);
-    MaNGOS::LocalizedPacketDo<MaNGOS::BattleGroundChatBuilder> bg_do(bg_builder);
-    BroadcastWorker(bg_do);
-}
-
-void BattleGround::SendYellToAll(int32 entry, uint32 language, ObjectGuid guid)
-{
-    Creature* source = GetBgMap()->GetCreature(guid);
-    if(!source)
-        return;
-    MaNGOS::BattleGroundYellBuilder bg_builder(language, entry, source);
-    MaNGOS::LocalizedPacketDo<MaNGOS::BattleGroundYellBuilder> bg_do(bg_builder);
-    BroadcastWorker(bg_do);
-}
-
-void BattleGround::PSendMessageToAll(int32 entry, ChatMsg type, Player const* source, ...)
-{
-    va_list ap;
-    va_start(ap, source);
-
-    MaNGOS::BattleGroundChatBuilder bg_builder(type, entry, source, &ap);
-    MaNGOS::LocalizedPacketDo<MaNGOS::BattleGroundChatBuilder> bg_do(bg_builder);
-    BroadcastWorker(bg_do);
-
-    va_end(ap);
-}
-
-void BattleGround::SendMessage2ToAll(int32 entry, ChatMsg type, Player const* source, int32 arg1, int32 arg2)
-{
-    MaNGOS::BattleGround2ChatBuilder bg_builder(type, entry, source, arg1, arg2);
-    MaNGOS::LocalizedPacketDo<MaNGOS::BattleGround2ChatBuilder> bg_do(bg_builder);
-    BroadcastWorker(bg_do);
-}
-
-void BattleGround::SendYell2ToAll(int32 entry, uint32 language, ObjectGuid guid, int32 arg1, int32 arg2)
-{
-    Creature* source = GetBgMap()->GetCreature(guid);
-    if(!source)
-        return;
-    MaNGOS::BattleGround2YellBuilder bg_builder(language, entry, source, arg1, arg2);
-    MaNGOS::LocalizedPacketDo<MaNGOS::BattleGround2YellBuilder> bg_do(bg_builder);
-    BroadcastWorker(bg_do);
-}
-
-void BattleGround::EndNow()
-{
-    RemoveFromBGFreeSlotQueue();
-    SetStatus(STATUS_WAIT_LEAVE);
-    SetEndTime(0);
-}
-
-/*
-important notice:
-buffs aren't spawned/despawned when players captures anything
-buffs are in their positions when battleground starts
-*/
-void BattleGround::HandleTriggerBuff(ObjectGuid go_guid)
-{
-    GameObject *obj = GetBgMap()->GetGameObject(go_guid);
-    if (!obj || obj->GetGoType() != GAMEOBJECT_TYPE_TRAP || !obj->isSpawned())
-        return;
-
-    // static buffs are already handled just by database and don't need
-    // battleground code
-    if (!m_BuffChange)
-    {
-        obj->SetLootState(GO_JUST_DEACTIVATED);             // can be despawned or destroyed
-        return;
-    }
-
-    // change buff type, when buff is used:
-    // TODO this can be done when poolsystem works for instances
-    int32 index = m_BgObjects.size() - 1;
-    while (index >= 0 && m_BgObjects[index] != go_guid)
-        index--;
-    if (index < 0)
-    {
-        sLog.outError("BattleGround (Type: %u) has buff trigger %s GOType: %u but it hasn't that object in its internal data",
-            GetTypeID(), go_guid.GetString().c_str(), obj->GetGoType());
-        return;
-    }
-
-    //randomly select new buff
-    uint8 buff = urand(0, 2);
-    uint32 entry = obj->GetEntry();
-    if (m_BuffChange && entry != Buff_Entries[buff])
-    {
-        //despawn current buff
-        SpawnBGObject(m_BgObjects[index], RESPAWN_ONE_DAY);
-        //set index for new one
-        for (uint8 currBuffTypeIndex = 0; currBuffTypeIndex < 3; ++currBuffTypeIndex)
-        {
-            if (entry == Buff_Entries[currBuffTypeIndex])
-            {
-                index -= currBuffTypeIndex;
-                index += buff;
-            }
-        }
-    }
-
-    SpawnBGObject(m_BgObjects[index], BUFF_RESPAWN_TIME);
-}
-
-void BattleGround::HandleKillPlayer( Player *player, Player *killer )
-{
-    // add +1 deaths
-    UpdatePlayerScore(player, SCORE_DEATHS, 1);
-
-    // add +1 kills to group and +1 killing_blows to killer
-    if (killer)
-    {
-        UpdatePlayerScore(killer, SCORE_HONORABLE_KILLS, 1);
-        UpdatePlayerScore(killer, SCORE_KILLING_BLOWS, 1);
-
-        for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-        {
-            Player *plr = sObjectMgr.GetPlayer(itr->first);
-
-            if (!plr || plr == killer)
-                continue;
-
-            if (plr->GetTeam() == killer->GetTeam() && plr->IsAtGroupRewardDistance(player))
-                UpdatePlayerScore(plr, SCORE_HONORABLE_KILLS, 1);
-        }
-    }
-
-    // to be able to remove insignia -- ONLY IN BattleGrounds
-    if (!isArena())
-        player->SetFlag( UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE );
-}
-
-// return the player's team based on battlegroundplayer info
-// used in same faction arena matches mainly
-Team BattleGround::GetPlayerTeam(ObjectGuid guid)
-{
-    BattleGroundPlayerMap::const_iterator itr = m_Players.find(guid);
-    if (itr != m_Players.end())
-        return itr->second.PlayerTeam;
-    return TEAM_NONE;
-}
-
-bool BattleGround::IsPlayerInBattleGround(ObjectGuid guid)
-{
-    BattleGroundPlayerMap::const_iterator itr = m_Players.find(guid);
-    if (itr != m_Players.end())
-        return true;
-    return false;
-}
-
-void BattleGround::PlayerAddedToBGCheckIfBGIsRunning(Player* plr)
-{
-    if (GetStatus() != STATUS_WAIT_LEAVE)
-        return;
-
-    WorldPacket data;
-    BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(GetTypeID(), GetArenaType());
-
-    BlockMovement(plr);
-
-    sBattleGroundMgr.BuildPvpLogDataPacket(&data, this);
-    plr->GetSession()->SendPacket(&data);
-
-    sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, this, plr->GetBattleGroundQueueIndex(bgQueueTypeId), STATUS_IN_PROGRESS, GetEndTime(), GetStartTime(), GetArenaType());
-    plr->GetSession()->SendPacket(&data);
-}
-
-uint32 BattleGround::GetAlivePlayersCountByTeam(Team team) const
-{
-    int count = 0;
-    for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-    {
-        if (itr->second.PlayerTeam == team)
-        {
-            Player * pl = sObjectMgr.GetPlayer(itr->first);
-            if (pl && pl->isAlive())
-                ++count;
-        }
-    }
-    return count;
-}
-
-void BattleGround::CheckArenaWinConditions()
-{
-    if (!GetAlivePlayersCountByTeam(ALLIANCE) && GetPlayersCountByTeam(HORDE))
-        EndBattleGround(HORDE);
-    else if (GetPlayersCountByTeam(ALLIANCE) && !GetAlivePlayersCountByTeam(HORDE))
-        EndBattleGround(ALLIANCE);
-}
-
-void BattleGround::SetBgRaid(Team team, Group *bg_raid)
-{
-    Group* &old_raid = m_BgRaids[GetTeamIndexByTeamId(team)];
-
-    if (old_raid)
-        old_raid->SetBattlegroundGroup(NULL);
-
-    if (bg_raid)
-        bg_raid->SetBattlegroundGroup(this);
-
-    old_raid = bg_raid;
-}
-
-WorldSafeLocsEntry const* BattleGround::GetClosestGraveYard( Player* player )
-{
-    return sObjectMgr.GetClosestGraveYard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->GetTeam());
-}
-
-bool BattleGround::IsTeamScoreInRange(Team team, uint32 minScore, uint32 maxScore) const
-{
-    BattleGroundTeamIndex team_idx = GetTeamIndexByTeamId(team);
-    uint32 score = (m_TeamScores[team_idx] < 0) ? 0 : uint32(m_TeamScores[team_idx]);
-    return score >= minScore && score <= maxScore;
-}
-
-void BattleGround::SetBracket( PvPDifficultyEntry const* bracketEntry )
-{
-    m_BracketId  = bracketEntry->GetBracketId();
-    SetLevelRange(bracketEntry->minLevel,bracketEntry->maxLevel);
-}
diff --git a/src/game/BattleGround/BattleGround.cpp b/src/game/BattleGround/BattleGround.cpp
new file mode 100644
index 00000000000..dc80548fc7f
--- /dev/null
+++ b/src/game/BattleGround/BattleGround.cpp
@@ -0,0 +1,2126 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Object.h"
+#include "Player.h"
+#include "BattleGround.h"
+#include "BattleGroundMgr.h"
+#include "Creature.h"
+#include "MapManager.h"
+#include "Language.h"
+#include "SpellAuras.h"
+#include "ArenaTeam.h"
+#include "World.h"
+#include "Group.h"
+#include "ObjectGuid.h"
+#include "ObjectMgr.h"
+#include "Mail.h"
+#include "WorldPacket.h"
+#include "Util.h"
+#include "Formulas.h"
+#include "GridNotifiersImpl.h"
+#include "Chat.h"
+
+namespace MaNGOS
+{
+    class BattleGroundChatBuilder
+    {
+        public:
+            BattleGroundChatBuilder(ChatMsg msgtype, int32 textId, Player const* source, va_list* args = NULL)
+                : i_msgtype(msgtype), i_textId(textId), i_source(source), i_args(args) {}
+            void operator()(WorldPacket& data, int32 loc_idx)
+            {
+                char const* text = sObjectMgr.GetMangosString(i_textId, loc_idx);
+
+                ObjectGuid sourceGuid = i_source ? i_source ->GetObjectGuid() : ObjectGuid();
+                std::string sourceName = i_source ? i_source ->GetName() : "";
+
+                if (i_args)
+                {
+                    // we need copy va_list before use or original va_list will corrupted
+                    va_list ap;
+                    va_copy(ap, *i_args);
+
+                    char str [2048];
+                    vsnprintf(str, 2048, text, ap);
+                    va_end(ap);
+
+                    ChatHandler::BuildChatPacket(data, i_msgtype, &str[0], LANG_UNIVERSAL, CHAT_TAG_NONE, sourceGuid, sourceName.c_str());
+                }
+                else
+                    ChatHandler::BuildChatPacket(data, i_msgtype, text, LANG_UNIVERSAL, CHAT_TAG_NONE, sourceGuid, sourceName.c_str(), sourceGuid, sourceName.c_str());
+            }
+        private:
+            ChatMsg i_msgtype;
+            int32 i_textId;
+            Player const* i_source;
+            va_list* i_args;
+    };
+
+    class BattleGroundWarningBuilder
+    {
+        public:
+            BattleGroundWarningBuilder(int32 textId, va_list* args = NULL)
+                : i_textId(textId), i_args(args) {}
+            void operator()(WorldPacket& data, int32 loc_idx)
+            {
+                char const* text = sObjectMgr.GetMangosString(i_textId, loc_idx);
+
+                if (i_args)
+                {
+                    // we need copy va_list before use or original va_list will corrupted
+                    va_list ap;
+                    va_copy(ap, *i_args);
+
+                    char str [2048];
+                    vsnprintf(str, 2048, text, ap);
+                    va_end(ap);
+
+                    WorldPacket data(SMSG_MESSAGECHAT, 200);
+
+                    do_helper(data, &str[0]);
+                }
+                else
+                    do_helper(data, text);
+            }
+        private:
+            void do_helper(WorldPacket& data, char const* text)
+            {
+                data << uint8(CHAT_MSG_RAID_BOSS_EMOTE);
+                data << uint32(LANG_UNIVERSAL);
+                data << uint64(0);             // there 0 for BG messages
+                data << uint32(0);             // can be chat msg group or something
+                data << uint32(1);
+                data << uint8(0);
+                data << uint64(0);
+                data << uint32(strlen(text)+1);
+                data << text;
+                data << uint8(0);
+            }
+
+            int32 i_textId;
+            va_list* i_args;
+    };
+
+    class BattleGroundYellBuilder
+    {
+        public:
+            BattleGroundYellBuilder(Language language, int32 textId, Creature const* source, va_list* args = NULL)
+                : i_language(language), i_textId(textId), i_source(source), i_args(args) {}
+            void operator()(WorldPacket& data, int32 loc_idx)
+            {
+                char const* text = sObjectMgr.GetMangosString(i_textId, loc_idx);
+
+                if (i_args)
+                {
+                    // we need copy va_list before use or original va_list will corrupted
+                    va_list ap;
+                    va_copy(ap, *i_args);
+
+                    char str [2048];
+                    vsnprintf(str, 2048, text, ap);
+                    va_end(ap);
+
+                    ChatHandler::BuildChatPacket(data, CHAT_MSG_MONSTER_YELL, &str[0], i_language, CHAT_TAG_NONE, i_source->GetObjectGuid(), i_source->GetName());
+                }
+                else
+                    ChatHandler::BuildChatPacket(data, CHAT_MSG_MONSTER_YELL, text, i_language, CHAT_TAG_NONE, i_source->GetObjectGuid(), i_source->GetName());
+            }
+        private:
+            Language i_language;
+            int32 i_textId;
+            Creature const* i_source;
+            va_list* i_args;
+    };
+
+
+    class BattleGround2ChatBuilder
+    {
+        public:
+            BattleGround2ChatBuilder(ChatMsg msgtype, int32 textId, Player const* source, int32 arg1, int32 arg2)
+                : i_msgtype(msgtype), i_textId(textId), i_source(source), i_arg1(arg1), i_arg2(arg2) {}
+            void operator()(WorldPacket& data, int32 loc_idx)
+            {
+                char const* text = sObjectMgr.GetMangosString(i_textId, loc_idx);
+                char const* arg1str = i_arg1 ? sObjectMgr.GetMangosString(i_arg1, loc_idx) : "";
+                char const* arg2str = i_arg2 ? sObjectMgr.GetMangosString(i_arg2, loc_idx) : "";
+
+                char str [2048];
+                snprintf(str, 2048, text, arg1str, arg2str);
+
+                ObjectGuid guid;
+                char const* pName = NULL;
+                if (i_source)
+                {
+                    guid = i_source->GetObjectGuid();
+                    pName = i_source->GetName();
+                }
+                ChatHandler::BuildChatPacket(data, i_msgtype, str, LANG_UNIVERSAL, CHAT_TAG_NONE, ObjectGuid(), NULL, guid, pName);
+            }
+        private:
+            ChatMsg i_msgtype;
+            int32 i_textId;
+            Player const* i_source;
+            int32 i_arg1;
+            int32 i_arg2;
+    };
+
+    class BattleGround2YellBuilder
+    {
+        public:
+            BattleGround2YellBuilder(uint32 language, int32 textId, Creature const* source, int32 arg1, int32 arg2)
+                : i_language(language), i_textId(textId), i_source(source), i_arg1(arg1), i_arg2(arg2) {}
+            void operator()(WorldPacket& data, int32 loc_idx)
+            {
+                char const* text = sObjectMgr.GetMangosString(i_textId, loc_idx);
+                char const* arg1str = i_arg1 ? sObjectMgr.GetMangosString(i_arg1, loc_idx) : "";
+                char const* arg2str = i_arg2 ? sObjectMgr.GetMangosString(i_arg2, loc_idx) : "";
+
+                char str [2048];
+                snprintf(str, 2048, text, arg1str, arg2str);
+
+                ChatHandler::BuildChatPacket(data, CHAT_MSG_MONSTER_YELL, str, LANG_UNIVERSAL, CHAT_TAG_NONE, i_source ? i_source ->GetObjectGuid() : ObjectGuid(), i_source ? i_source ->GetName() : "");
+            }
+        private:
+
+            uint32 i_language;
+            int32 i_textId;
+            Creature const* i_source;
+            int32 i_arg1;
+            int32 i_arg2;
+    };
+}                                                           // namespace MaNGOS
+
+template<class Do>
+void BattleGround::BroadcastWorker(Do& _do)
+{
+    for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+        if (Player* plr = ObjectAccessor::FindPlayer(itr->first))
+            _do(plr);
+}
+
+BattleGround::BattleGround()
+{
+    m_TypeID            = BattleGroundTypeId(0);
+    m_RandomTypeID      = BattleGroundTypeId(0);
+    m_Status            = STATUS_NONE;
+    m_ClientInstanceID  = 0;
+    m_EndTime           = 0;
+    m_BracketId         = BG_BRACKET_ID_TEMPLATE;
+    m_InvitedAlliance   = 0;
+    m_InvitedHorde      = 0;
+    m_ArenaType         = ARENA_TYPE_NONE;
+    m_IsArena           = false;
+    m_Winner            = TEAM_NONE;
+    m_StartTime         = 0;
+    m_Events            = 0;
+    m_IsRated           = false;
+    m_IsRandom          = false;
+    m_Name              = "";
+    m_LevelMin          = 0;
+    m_LevelMax          = 0;
+    m_InBGFreeSlotQueue = false;
+
+    m_MaxPlayersPerTeam = 0;
+    m_MaxPlayers        = 0;
+    m_MinPlayersPerTeam = 0;
+    m_MinPlayers        = 0;
+
+    m_MapId             = 0;
+    m_Map               = NULL;
+
+    m_TeamStartLocX[TEAM_INDEX_ALLIANCE]    = 0;
+    m_TeamStartLocX[TEAM_INDEX_HORDE]       = 0;
+
+    m_TeamStartLocY[TEAM_INDEX_ALLIANCE]    = 0;
+    m_TeamStartLocY[TEAM_INDEX_HORDE]       = 0;
+
+    m_TeamStartLocZ[TEAM_INDEX_ALLIANCE]    = 0;
+    m_TeamStartLocZ[TEAM_INDEX_HORDE]       = 0;
+
+    m_TeamStartLocO[TEAM_INDEX_ALLIANCE]    = 0;
+    m_TeamStartLocO[TEAM_INDEX_HORDE]       = 0;
+
+    m_ArenaTeamIds[TEAM_INDEX_ALLIANCE]     = 0;
+    m_ArenaTeamIds[TEAM_INDEX_HORDE]        = 0;
+
+    m_ArenaTeamRatingChanges[TEAM_INDEX_ALLIANCE]   = 0;
+    m_ArenaTeamRatingChanges[TEAM_INDEX_HORDE]      = 0;
+
+    m_BgRaids[TEAM_INDEX_ALLIANCE]          = ObjectGuid();
+    m_BgRaids[TEAM_INDEX_HORDE]             = ObjectGuid();
+
+    m_PlayersCount[TEAM_INDEX_ALLIANCE]     = 0;
+    m_PlayersCount[TEAM_INDEX_HORDE]        = 0;
+
+    m_TeamScores[TEAM_INDEX_ALLIANCE]       = 0;
+    m_TeamScores[TEAM_INDEX_HORDE]          = 0;
+
+    m_PrematureCountDown = false;
+    m_PrematureCountDownTimer = 0;
+
+    m_ArenaEnded = false;
+
+    m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_2M;
+    m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_1M;
+    m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_30S;
+    m_StartDelayTimes[BG_STARTING_EVENT_FOURTH] = BG_START_DELAY_NONE;
+    // we must set to some default existing values
+    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
+    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_WS_START_ONE_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_WS_START_HALF_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_WS_HAS_BEGUN;
+    FillInitialWorldStates();
+}
+
+BattleGround::~BattleGround()
+{
+    // remove objects and creatures
+    // (this is done automatically in mapmanager update, when the instance is reset after the reset time)
+
+    sBattleGroundMgr.RemoveBattleGround(GetInstanceID(), GetTypeID());
+
+    // skip template bgs as they were never added to visible bg list
+    BattleGroundBracketId bracketId = GetBracketId();
+    if (bracketId != BG_BRACKET_ID_TEMPLATE)
+        sBattleGroundMgr.DeleteClientVisibleInstanceId(GetTypeID(), bracketId, GetClientInstanceID());
+
+    // unload map
+    // map can be null at bg destruction
+    if (m_Map)
+        m_Map->SetUnload();
+
+    // remove from bg free slot queue
+    this->RemoveFromBGFreeSlotQueue();
+
+    for (BattleGroundScoreMap::const_iterator itr = m_PlayerScores.begin(); itr != m_PlayerScores.end(); ++itr)
+        delete itr->second;
+}
+
+/* Map pointers */
+void BattleGround::SetBgMap(BattleGroundMap* map)
+{
+    m_Map = map;
+}
+
+BattleGroundMap* BattleGround::GetBgMap()
+{
+    MANGOS_ASSERT(m_Map);
+    return m_Map;
+}
+
+uint32 BattleGround::GetInstanceID()
+{
+    return m_Map ? m_Map->GetInstanceId() : 0;
+}
+
+void BattleGround::Update(uint32 diff)
+{
+    if (!GetPlayersSize())
+    {
+        // BG is empty
+        // if there are no players invited, delete BG
+        // this will delete arena or bg object, where any player entered
+        // [[   but if you use battleground object again (more battles possible to be played on 1 instance)
+        //      then this condition should be removed and code:
+        //      if (!GetInvitedCount(HORDE) && !GetInvitedCount(ALLIANCE))
+        //          this->AddToFreeBGObjectsQueue(); // not yet implemented
+        //      should be used instead of current
+        // ]]
+        // BattleGround Template instance cannot be updated, because it would be deleted
+        if (!GetInvitedCount(HORDE) && !GetInvitedCount(ALLIANCE))
+            delete this;
+
+        return;
+    }
+
+    // remove offline players from bg after 5 minutes
+    if (!m_OfflineQueue.empty())
+    {
+        BattleGroundPlayerMap::iterator itr = m_Players.find(*(m_OfflineQueue.begin()));
+        if (itr != m_Players.end())
+        {
+            if (itr->second.OfflineRemoveTime <= sWorld.GetGameTime())
+            {
+                RemovePlayerAtLeave(itr->first, true, true);// remove player from BG
+                m_OfflineQueue.pop_front();                 // remove from offline queue
+                // do not use itr for anything, because it is erased in RemovePlayerAtLeave()
+            }
+        }
+    }
+
+    /*********************************************************/
+    /***           BATTLEGROUND BALLANCE SYSTEM            ***/
+    /*********************************************************/
+
+    // if less then minimum players are in on one side, then start premature finish timer
+    if (GetStatus() == STATUS_IN_PROGRESS && !isArena() && sBattleGroundMgr.GetPrematureFinishTime() && (GetPlayersCountByTeam(ALLIANCE) < GetMinPlayersPerTeam() || GetPlayersCountByTeam(HORDE) < GetMinPlayersPerTeam()))
+    {
+        if (!m_PrematureCountDown)
+        {
+            m_PrematureCountDown = true;
+            m_PrematureCountDownTimer = sBattleGroundMgr.GetPrematureFinishTime();
+        }
+        else if (m_PrematureCountDownTimer < diff)
+        {
+            // time's up!
+            Team winner = TEAM_NONE;
+            if (GetPlayersCountByTeam(ALLIANCE) >= GetMinPlayersPerTeam())
+                winner = ALLIANCE;
+            else if (GetPlayersCountByTeam(HORDE) >= GetMinPlayersPerTeam())
+                winner = HORDE;
+
+            EndBattleGround(winner);
+            m_PrematureCountDown = false;
+        }
+        else if (!sBattleGroundMgr.isTesting())
+        {
+            uint32 newtime = m_PrematureCountDownTimer - diff;
+            // announce every minute
+            if (newtime > (MINUTE * IN_MILLISECONDS))
+            {
+                if (newtime / (MINUTE * IN_MILLISECONDS) != m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS))
+                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS)));
+            }
+            else
+            {
+                // announce every 15 seconds
+                if (newtime / (15 * IN_MILLISECONDS) != m_PrematureCountDownTimer / (15 * IN_MILLISECONDS))
+                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / IN_MILLISECONDS));
+            }
+            m_PrematureCountDownTimer = newtime;
+        }
+
+    }
+    else if (m_PrematureCountDown)
+        m_PrematureCountDown = false;
+
+    /*********************************************************/
+    /***           ARENA BUFF OBJECT SPAWNING              ***/
+    /*********************************************************/
+    if (isArena() && !m_ArenaBuffSpawned)
+    {
+        // 60 seconds after start the buffobjects in arena should get spawned
+        if (m_StartTime > uint32(m_StartDelayTimes[BG_STARTING_EVENT_FIRST] + ARENA_SPAWN_BUFF_OBJECTS))
+        {
+            SpawnEvent(ARENA_BUFF_EVENT, 0, true);
+            m_ArenaBuffSpawned = true;
+        }
+    }
+
+    /*********************************************************/
+    /***           BATTLEGROUND STARTING SYSTEM            ***/
+    /*********************************************************/
+
+    if (GetStatus() == STATUS_WAIT_JOIN && GetPlayersSize())
+    {
+        // -- hacky anti-buggers check - prevent players from leave start BG location before BG actually starts
+        // -- only Arathi Basin and Eye of the Storm supported for now
+        float deadly_Z = 0.0f;
+        if (GetMapId() == 529)                              // Arathi Basin
+            deadly_Z = -20.0f;
+        else if (GetMapId() == 566)                         // Eye of the Storm
+            deadly_Z = 1260.0f;
+        else if (GetMapId() == 607)                         // Strand of the Ancients
+            deadly_Z = -200.0f;
+
+        for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+        {
+            Player* plr = sObjectMgr.GetPlayer(itr->first);
+            if (plr)
+            {
+                TeamIndex teamIndex = GetTeamIndex(plr->GetTeam());
+                if (!plr->isGameMaster() && plr->GetPositionZ() < deadly_Z)
+                    plr->TeleportTo(GetMapId(), m_TeamStartLocX[teamIndex], m_TeamStartLocY[teamIndex], m_TeamStartLocZ[teamIndex], m_TeamStartLocO[teamIndex]);
+            }
+        }
+        // ----------------------------------------------------------------------------------------------------
+
+        ModifyStartDelayTime(diff);
+
+        if (!(m_Events & BG_STARTING_EVENT_1))
+        {
+            m_Events |= BG_STARTING_EVENT_1;
+
+            // setup here, only when at least one player has ported to the map
+            if (!SetupBattleGround())
+            {
+                EndNow();
+                return;
+            }
+
+            StartingEventCloseDoors();
+            SetStartDelayTime(m_StartDelayTimes[BG_STARTING_EVENT_FIRST]);
+            // first start warning - 2 or 1 minute, only if defined
+            if (m_StartMessageIds[BG_STARTING_EVENT_FIRST])
+                SendMessageToAll(m_StartMessageIds[BG_STARTING_EVENT_FIRST], CHAT_MSG_BG_SYSTEM_NEUTRAL);
+        }
+        // After 1 minute or 30 seconds, warning is signalled
+        else if (GetStartDelayTime() <= m_StartDelayTimes[BG_STARTING_EVENT_SECOND] && !(m_Events & BG_STARTING_EVENT_2))
+        {
+            m_Events |= BG_STARTING_EVENT_2;
+            SendMessageToAll(m_StartMessageIds[BG_STARTING_EVENT_SECOND], CHAT_MSG_BG_SYSTEM_NEUTRAL);
+        }
+        // After 30 or 15 seconds, warning is signalled
+        else if (GetStartDelayTime() <= m_StartDelayTimes[BG_STARTING_EVENT_THIRD] && !(m_Events & BG_STARTING_EVENT_3))
+        {
+            m_Events |= BG_STARTING_EVENT_3;
+            SendMessageToAll(m_StartMessageIds[BG_STARTING_EVENT_THIRD], CHAT_MSG_BG_SYSTEM_NEUTRAL);
+        }
+        // delay expired (atfer 2 or 1 minute)
+        else if (GetStartDelayTime() <= 0 && !(m_Events & BG_STARTING_EVENT_4))
+        {
+            m_Events |= BG_STARTING_EVENT_4;
+
+            StartingEventOpenDoors();
+
+            SendMessageToAll(m_StartMessageIds[BG_STARTING_EVENT_FOURTH], CHAT_MSG_BG_SYSTEM_NEUTRAL);
+            SetStatus(STATUS_IN_PROGRESS);
+            SetStartDelayTime(m_StartDelayTimes[BG_STARTING_EVENT_FOURTH]);
+
+            // remove preparation
+            if (isArena())
+            {
+                //TODO : add arena sound PlaySoundToAll(SOUND_ARENA_START);
+
+                // remove auras with duration lower than 30s and arena preparation
+                for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+                {
+                    Player* plr = sObjectMgr.GetPlayer(itr->first);
+                    if (plr)
+                    {
+                        // BG Status packet
+                        WorldPacket status;
+                        BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(m_TypeID, GetArenaType());
+                        uint32 queueSlot = plr->GetBattleGroundQueueIndex(bgQueueTypeId);
+                        sBattleGroundMgr.BuildBattleGroundStatusPacket(&status, this, queueSlot, GetStatus(), 0, GetStartTime(), GetArenaType(), plr->GetBGTeam());
+                        plr->GetSession()->SendPacket(&status);
+
+                        plr->RemoveAurasDueToSpell(SPELL_ARENA_PREPARATION);
+                        plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_PLAY_ARENA, plr->GetMapId(), GetArenaType());
+                    }
+                }
+
+                //Announce Arena starting
+                if (sWorld.getConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_START))
+                {
+                    sWorld.SendWorldText(LANG_ARENA_STARTED_ANNOUNCE_WORLD, GetArenaType(), GetArenaType(), GetName());
+                }
+
+                CheckArenaWinConditions();
+            }
+            else
+            {
+
+                PlaySoundToAll(SOUND_BG_START);
+
+                for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+                {
+                    Player* plr = sObjectMgr.GetPlayer(itr->first);
+                    if (plr)
+                        plr->RemoveAurasDueToSpell(SPELL_PREPARATION);
+                }
+                // Announce BG starting
+                if (sWorld.getConfig(CONFIG_BOOL_BATTLEGROUND_QUEUE_ANNOUNCER_START))
+                {
+                    sWorld.SendWorldText(LANG_BG_STARTED_ANNOUNCE_WORLD, GetName(), GetMinLevel(), GetMaxLevel());
+                }
+            }
+        }
+    }
+
+    /*********************************************************/
+    /***           BATTLEGROUND ENDING SYSTEM              ***/
+    /*********************************************************/
+
+    if (GetStatus() == STATUS_WAIT_LEAVE)
+    {
+        // remove all players from battleground after 2 minutes
+        m_EndTime -= diff;
+        if (m_EndTime <= 0)
+        {
+            m_EndTime = 0;
+            BattleGroundPlayerMap::iterator itr, next;
+            for (itr = m_Players.begin(); itr != m_Players.end(); itr = next)
+            {
+                next = itr;
+                ++next;
+                // itr is erased here!
+                RemovePlayerAtLeave(itr->first, true, true);// remove player from BG
+                // do not change any battleground's private variables
+            }
+        }
+    }
+
+    // Arena time limit
+    if (isArena() && !m_ArenaEnded)
+    {
+        if (m_StartTime > uint32(ARENA_TIME_LIMIT))
+        {
+            Team winner;
+            // winner is team with higher damage
+            if (GetDamageDoneForTeam(ALLIANCE) > GetDamageDoneForTeam(HORDE))
+                winner = ALLIANCE;
+            else if (GetDamageDoneForTeam(HORDE) > GetDamageDoneForTeam(ALLIANCE))
+                winner = HORDE;
+            else
+                winner = TEAM_NONE;
+           EndBattleGround(winner);
+           m_ArenaEnded = true;
+        }
+    }
+
+    // update start time
+    m_StartTime += diff;
+}
+
+void BattleGround::SetTeamStartLoc(Team team, float X, float Y, float Z, float O)
+{
+    TeamIndex teamIdx = GetTeamIndex(team);
+    m_TeamStartLocX[teamIdx] = X;
+    m_TeamStartLocY[teamIdx] = Y;
+    m_TeamStartLocZ[teamIdx] = Z;
+    m_TeamStartLocO[teamIdx] = O;
+}
+
+void BattleGround::SendPacketToAll(WorldPacket* packet)
+{
+    for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        if (itr->second.OfflineRemoveTime)
+            continue;
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+        if (plr)
+            plr->GetSession()->SendPacket(packet);
+        else
+            sLog.outError("BattleGround:SendPacketToAll: %s not found!", itr->first.GetString().c_str());
+    }
+}
+
+void BattleGround::SendPacketToTeam(Team teamId, WorldPacket* packet, Player* sender, bool self)
+{
+    for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        if (itr->second.OfflineRemoveTime)
+            continue;
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+        if (!plr)
+        {
+            sLog.outError("BattleGround:SendPacketToTeam: %s not found!", itr->first.GetString().c_str());
+            continue;
+        }
+
+        if (!self && sender == plr)
+            continue;
+
+        Team team = itr->second.PlayerTeam;
+        if (!team) team = plr->GetTeam();
+
+        if (team == teamId)
+            plr->GetSession()->SendPacket(packet);
+    }
+}
+
+void BattleGround::PlaySoundToAll(uint32 SoundID)
+{
+    WorldPacket data;
+    sBattleGroundMgr.BuildPlaySoundPacket(&data, SoundID);
+    SendPacketToAll(&data);
+}
+
+void BattleGround::PlaySoundToTeam(uint32 SoundID, Team teamId)
+{
+    WorldPacket data;
+
+    for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        if (itr->second.OfflineRemoveTime)
+            continue;
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+        if (!plr)
+        {
+            sLog.outError("BattleGround:PlaySoundToTeam: %s not found!", itr->first.GetString().c_str());
+            continue;
+        }
+
+        Team team = itr->second.PlayerTeam;
+        if (!team) team = plr->GetTeam();
+
+        if (team == teamId)
+        {
+            sBattleGroundMgr.BuildPlaySoundPacket(&data, SoundID);
+            plr->GetSession()->SendPacket(&data);
+        }
+    }
+}
+
+void BattleGround::CastSpellOnTeam(uint32 SpellID, Team teamId)
+{
+    for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        if (itr->second.OfflineRemoveTime)
+            continue;
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+
+        if (!plr)
+        {
+            sLog.outError("BattleGround:CastSpellOnTeam: %s not found!", itr->first.GetString().c_str());
+            continue;
+        }
+
+        Team team = itr->second.PlayerTeam;
+        if (!team) team = plr->GetTeam();
+
+        if (team == teamId)
+            plr->CastSpell(plr, SpellID, true);
+    }
+}
+
+void BattleGround::RewardHonorToTeam(uint32 Honor, Team teamId)
+{
+    for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        if (itr->second.OfflineRemoveTime)
+            continue;
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+
+        if (!plr)
+        {
+            sLog.outError("BattleGround:RewardHonorToTeam: %s not found!", itr->first.GetString().c_str());
+            continue;
+        }
+
+        Team team = itr->second.PlayerTeam;
+        if (!team) team = plr->GetTeam();
+
+        if (team == teamId)
+            UpdatePlayerScore(plr, SCORE_BONUS_HONOR, Honor);
+    }
+}
+
+void BattleGround::RewardReputationToTeam(uint32 faction_id, uint32 Reputation, Team teamId)
+{
+    FactionEntry const* factionEntry = sFactionStore.LookupEntry(faction_id);
+
+    if (!factionEntry)
+        return;
+
+    for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        if (itr->second.OfflineRemoveTime)
+            continue;
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+
+        if (!plr)
+        {
+            sLog.outError("BattleGround:RewardReputationToTeam: %s not found!", itr->first.GetString().c_str());
+            continue;
+        }
+
+        Team team = itr->second.PlayerTeam;
+        if (!team) team = plr->GetTeam();
+
+        if (team == teamId)
+            plr->GetReputationMgr().ModifyReputation(factionEntry, Reputation);
+    }
+}
+
+void BattleGround::RewardXpToTeam(uint32 Xp, float percentOfLevel, Team team)
+{
+    for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        if (itr->second.OfflineRemoveTime)
+            continue;
+        Player *plr = sObjectMgr.GetPlayer(itr->first);
+
+        if (!plr)
+        {
+            sLog.outError("BattleGround:RewardXpToTeam: Player (GUID: %s) not found!", itr->first.GetString().c_str());
+            continue;
+        }
+
+        uint32 bgTeam = itr->second.PlayerTeam;
+        if(!team) bgTeam = plr->GetTeam();
+
+        if (bgTeam == team)
+        {
+            uint32 gain = Xp;
+            if (gain == 0 && percentOfLevel != 0)
+            {
+                percentOfLevel = percentOfLevel / 100;
+                gain = uint32(float(plr->GetUInt32Value(PLAYER_NEXT_LEVEL_XP))*percentOfLevel);
+            }
+            plr->GiveXP(gain, NULL);
+        }
+    }
+}
+
+void BattleGround::UpdateWorldState(uint32 stateId, uint32 value)
+{
+    sWorldStateMgr.SetWorldStateValueFor(GetBgMap(), stateId, value);
+}
+
+void BattleGround::UpdateWorldStateForPlayer(uint32 stateId, uint32 value, Player* pPlayer)
+{
+    sWorldStateMgr.SetWorldStateValueFor(pPlayer, stateId, value);
+}
+
+void BattleGround::EndBattleGround(Team winner)
+{
+    this->RemoveFromBGFreeSlotQueue();
+
+    ArenaTeam* winner_arena_team = NULL;
+    ArenaTeam* loser_arena_team = NULL;
+    uint32 loser_rating = 0;
+    uint32 winner_rating = 0;
+    WorldPacket data;
+    int32 winmsg_id = 0;
+
+    if (winner == ALLIANCE)
+    {
+        winmsg_id = isBattleGround() ? LANG_BG_A_WINS : LANG_ARENA_GOLD_WINS;
+
+        PlaySoundToAll(SOUND_ALLIANCE_WINS);                // alliance wins sound
+    }
+    else if (winner == HORDE)
+    {
+        winmsg_id = isBattleGround() ? LANG_BG_H_WINS : LANG_ARENA_GREEN_WINS;
+
+        PlaySoundToAll(SOUND_HORDE_WINS);                   // horde wins sound
+    }
+
+    SetWinner(winner);
+
+    SetStatus(STATUS_WAIT_LEAVE);
+
+    // we must set it this way, because end time is sent in packet!
+    m_EndTime = TIME_TO_AUTOREMOVE;
+
+    // arena rating calculation
+    if (isArena() && isRated())
+    {
+        winner_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(winner));
+        loser_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(GetOtherTeam(winner)));
+        if (winner_arena_team && loser_arena_team && winner_arena_team->GetId() != loser_arena_team->GetId())
+        {
+            loser_rating = loser_arena_team->GetBattleRating();
+            winner_rating = winner_arena_team->GetBattleRating();
+            int32 winner_change = winner_arena_team->WonAgainst(loser_rating);
+            int32 loser_change = loser_arena_team->LostAgainst(winner_rating);
+            DEBUG_LOG("--- Winner rating: %u, Loser rating: %u, Winner change: %i, Loser change: %i ---", winner_rating, loser_rating, winner_change, loser_change);
+            SetArenaTeamRatingChangeForTeam(winner, winner_change);
+            SetArenaTeamRatingChangeForTeam(GetOtherTeam(winner), loser_change);
+        }
+        else
+        {
+            SetArenaTeamRatingChangeForTeam(ALLIANCE, 0);
+            SetArenaTeamRatingChangeForTeam(HORDE, 0);
+        }
+    }
+
+    for (BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        Team team = itr->second.PlayerTeam;
+
+        if (itr->second.OfflineRemoveTime)
+        {
+            // if rated arena match - make member lost!
+            if (isArena() && isRated() && winner_arena_team && loser_arena_team)
+            {
+                if (team == winner)
+                    winner_arena_team->OfflineMemberLost(itr->first, loser_rating);
+                else
+                    loser_arena_team->OfflineMemberLost(itr->first, winner_rating);
+            }
+            continue;
+        }
+
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+        if (!plr)
+        {
+            sLog.outError("BattleGround:EndBattleGround %s not found!", itr->first.GetString().c_str());
+            continue;
+        }
+
+        // should remove spirit of redemption
+        if (plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
+            plr->RemoveSpellsCausingAura(SPELL_AURA_MOD_SHAPESHIFT);
+
+        if (!plr->isAlive())
+        {
+            plr->ResurrectPlayer(100);
+            plr->SpawnCorpseBones();
+        }
+        else
+        {
+            // needed cause else in av some creatures will kill the players at the end
+            plr->CombatStop();
+            plr->getHostileRefManager().deleteReferences();
+        }
+
+        // this line is obsolete - team is set ALWAYS
+        // if(!team) team = plr->GetTeam();
+
+        // per player calculation
+        if (isArena() && isRated() && winner_arena_team && loser_arena_team && winner_arena_team->GetId() != loser_arena_team->GetId())
+        {
+            if (team == winner)
+            {
+                // update achievement BEFORE personal rating update
+                ArenaTeamMember* member = winner_arena_team->GetMember(plr->GetObjectGuid());
+                if (member)
+                {
+                    plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA, member->personal_rating);
+                    plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA, plr->GetMapId(), GetArenaType());
+                }
+
+                winner_arena_team->MemberWon(plr, loser_rating);
+
+                if (member)
+                {
+                    plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_PERSONAL_RATING, GetArenaType(), member->personal_rating);
+                    plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING, GetArenaType(), winner_arena_team->GetStats().rating);
+                }
+            }
+            else
+            {
+                loser_arena_team->MemberLost(plr, winner_rating);
+
+                // Arena lost => reset the win_rated_arena having the "no_loose" condition
+                plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA, ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE);
+            }
+        }
+
+        uint32 win_kills = plr->IsRandomBGWinner() ? BG_REWARD_WINNER_HONOR_LAST : BG_REWARD_WINNER_HONOR_FIRST;
+        uint32 loos_kills = plr->IsRandomBGWinner() ? BG_REWARD_LOOSER_HONOR_LAST : BG_REWARD_LOOSER_HONOR_FIRST;
+        uint32 win_arena = plr->IsRandomBGWinner() ? BG_REWARD_WINNER_ARENA_LAST : BG_REWARD_WINNER_ARENA_FIRST;
+
+        if (team == winner)
+        {
+            RewardMark(plr, ITEM_WINNER_COUNT);
+            RewardQuestComplete(plr);
+
+            if (IsRandom() || BattleGroundMgr::IsBGWeekend(GetTypeID()))
+            {
+                UpdatePlayerScore(plr, SCORE_BONUS_HONOR, GetBonusHonorFromKill(win_kills*4));
+                plr->ModifyArenaPoints(win_arena);
+                if (!plr->IsRandomBGWinner())
+                    plr->SetRandomBGWinner(true);
+            }
+
+            plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, 1);
+        }
+        else
+        {
+            RewardMark(plr, ITEM_LOSER_COUNT);
+            if (IsRandom() || BattleGroundMgr::IsBGWeekend(GetTypeID()))
+                UpdatePlayerScore(plr, SCORE_BONUS_HONOR, GetBonusHonorFromKill(loos_kills*4));
+        }
+
+        plr->CombatStopWithPets(true);
+
+        BlockMovement(plr);
+
+        sBattleGroundMgr.BuildPvpLogDataPacket(&data, this);
+        plr->GetSession()->SendPacket(&data);
+
+        BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(GetTypeID(), GetArenaType());
+        sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, this, plr->GetBattleGroundQueueIndex(bgQueueTypeId), STATUS_IN_PROGRESS, TIME_TO_AUTOREMOVE, GetStartTime(), GetArenaType(), plr->GetBGTeam());
+        plr->GetSession()->SendPacket(&data);
+        plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND, 1);
+    }
+
+    if (isArena() && isRated() && winner_arena_team && loser_arena_team && winner_arena_team->GetId() != loser_arena_team->GetId())
+    {
+        // update arena points only after increasing the player's match count!
+        // obsolete: winner_arena_team->UpdateArenaPointsHelper();
+        // obsolete: loser_arena_team->UpdateArenaPointsHelper();
+        // save the stat changes
+        winner_arena_team->SaveToDB();
+        loser_arena_team->SaveToDB();
+        // send updated arena team stats to players
+        // this way all arena team members will get notified, not only the ones who participated in this match
+        winner_arena_team->NotifyStatsChanged();
+        loser_arena_team->NotifyStatsChanged();
+    }
+
+    if (winmsg_id)
+        SendMessageToAll(winmsg_id, CHAT_MSG_BG_SYSTEM_NEUTRAL);
+}
+
+uint32 BattleGround::GetBonusHonorFromKill(uint32 kills) const
+{
+    // variable kills means how many honorable kills you scored (so we need kills * honor_for_one_kill)
+    return (uint32)MaNGOS::Honor::hk_honor_at_level(GetMaxLevel(), kills);
+}
+
+uint32 BattleGround::GetBattlemasterEntry() const
+{
+    switch (GetTypeID(true))
+    {
+        case BATTLEGROUND_AV: return 15972;
+        case BATTLEGROUND_WS: return 14623;
+        case BATTLEGROUND_AB: return 14879;
+        case BATTLEGROUND_EY: return 22516;
+        case BATTLEGROUND_NA: return 20200;
+        default:              return 0;
+    }
+}
+
+void BattleGround::RewardMark(Player* plr, uint32 count)
+{
+    switch (GetTypeID(true))
+    {
+        case BATTLEGROUND_AV:
+            if (count == ITEM_WINNER_COUNT)
+                RewardSpellCast(plr, SPELL_AV_MARK_WINNER);
+            else
+                RewardSpellCast(plr, SPELL_AV_MARK_LOSER);
+            break;
+        case BATTLEGROUND_WS:
+            if (count == ITEM_WINNER_COUNT)
+                RewardSpellCast(plr, SPELL_WS_MARK_WINNER);
+            else
+                RewardSpellCast(plr, SPELL_WS_MARK_LOSER);
+            break;
+        case BATTLEGROUND_AB:
+            if (count == ITEM_WINNER_COUNT)
+                RewardSpellCast(plr, SPELL_AB_MARK_WINNER);
+            else
+                RewardSpellCast(plr, SPELL_AB_MARK_LOSER);
+            break;
+        case BATTLEGROUND_EY:                               // no rewards
+        default:
+            break;
+    }
+}
+
+void BattleGround::RewardSpellCast(Player* plr, uint32 spell_id)
+{
+    // 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
+    if (plr->GetDummyAura(SPELL_AURA_PLAYER_INACTIVE))
+        return;
+
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell_id);
+    if (!spellInfo)
+    {
+        sLog.outError("Battleground reward casting spell %u not exist.", spell_id);
+        return;
+    }
+
+    plr->CastSpell(plr, spellInfo, true);
+}
+
+void BattleGround::RewardItem(Player* plr, uint32 item_id, uint32 count)
+{
+    // 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
+    if (plr->GetDummyAura(SPELL_AURA_PLAYER_INACTIVE))
+        return;
+
+    ItemPosCountVec dest;
+    uint32 no_space_count = 0;
+    uint8 msg = plr->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, item_id, count, &no_space_count);
+
+    if (msg == EQUIP_ERR_ITEM_NOT_FOUND)
+    {
+        sLog.outErrorDb("Battleground reward item (Entry %u) not exist in `item_template`.", item_id);
+        return;
+    }
+
+    if (msg != EQUIP_ERR_OK)                                // convert to possible store amount
+        count -= no_space_count;
+
+    if (count != 0 && !dest.empty())                        // can add some
+        if (Item* item = plr->StoreNewItem(dest, item_id, true, 0))
+            plr->SendNewItem(item, count, true, false);
+
+    if (no_space_count > 0)
+        SendRewardMarkByMail(plr, item_id, no_space_count);
+}
+
+void BattleGround::SendRewardMarkByMail(Player* plr, uint32 mark, uint32 count)
+{
+    uint32 bmEntry = GetBattlemasterEntry();
+    if (!bmEntry)
+        return;
+
+    ItemPrototype const* markProto = ObjectMgr::GetItemPrototype(mark);
+    if (!markProto)
+        return;
+
+    if (Item* markItem = Item::CreateItem(mark, count, plr))
+    {
+        // save new item before send
+        markItem->SaveToDB();                               // save for prevent lost at next mail load, if send fail then item will deleted
+
+        int loc_idx = plr->GetSession()->GetSessionDbLocaleIndex();
+
+        // subject: item name
+        std::string subject = markProto->Name1;
+        sObjectMgr.GetItemLocaleStrings(markProto->ItemId, loc_idx, &subject);
+
+        // text
+        std::string textFormat = plr->GetSession()->GetMangosString(LANG_BG_MARK_BY_MAIL);
+        char textBuf[300];
+        snprintf(textBuf, 300, textFormat.c_str(), GetName(), GetName());
+
+        MailDraft(subject, textBuf)
+        .AddItem(markItem)
+        .SendMailTo(plr, MailSender(MAIL_CREATURE, bmEntry));
+    }
+}
+
+void BattleGround::RewardQuestComplete(Player* plr)
+{
+    uint32 quest;
+    switch (GetTypeID(true))
+    {
+        case BATTLEGROUND_AV:
+            quest = SPELL_AV_QUEST_REWARD;
+            break;
+        case BATTLEGROUND_WS:
+            quest = SPELL_WS_QUEST_REWARD;
+            break;
+        case BATTLEGROUND_AB:
+            quest = SPELL_AB_QUEST_REWARD;
+            break;
+        case BATTLEGROUND_EY:
+            quest = SPELL_EY_QUEST_REWARD;
+            break;
+        default:
+            return;
+    }
+
+    RewardSpellCast(plr, quest);
+}
+
+void BattleGround::BlockMovement(Player* plr)
+{
+    plr->SetClientControl(plr, 0);                          // movement disabled NOTE: the effect will be automatically removed by client when the player is teleported from the battleground, so no need to send with uint8(1) in RemovePlayerAtLeave()
+}
+
+void BattleGround::RemovePlayerAtLeave(ObjectGuid guid, bool Transport, bool SendPacket)
+{
+    Team team = GetPlayerTeam(guid);
+    bool participant = false;
+    // Remove from lists/maps
+    BattleGroundPlayerMap::iterator itr = m_Players.find(guid);
+    if (itr != m_Players.end())
+    {
+        UpdatePlayersCountByTeam(team, true);               // -1 player
+        m_Players.erase(itr);
+        // check if the player was a participant of the match, or only entered through gm command (goname)
+        participant = true;
+    }
+
+    BattleGroundScoreMap::iterator itr2 = m_PlayerScores.find(guid);
+    if (itr2 != m_PlayerScores.end())
+    {
+        delete itr2->second;                                // delete player's score
+        m_PlayerScores.erase(itr2);
+    }
+
+    Player* plr = sObjectMgr.GetPlayer(guid);
+
+    if (plr)
+    {
+        // should remove spirit of redemption
+        if (plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
+            plr->RemoveSpellsCausingAura(SPELL_AURA_MOD_SHAPESHIFT);
+
+        plr->RemoveAurasDueToSpell(isArena() ? SPELL_ARENA_DAMPENING : SPELL_BATTLEGROUND_DAMPENING);
+
+        if (!plr->isAlive())                                // resurrect on exit
+        {
+            plr->ResurrectPlayer(100);
+            plr->SpawnCorpseBones();
+        }
+    }
+    else
+        sObjectAccessor.ConvertCorpseForPlayer(guid);
+
+    RemovePlayer(plr, guid);                                // BG subclass specific code
+
+    if (participant) // if the player was a match participant, remove auras, calc rating, update queue
+    {
+        BattleGroundTypeId bgTypeId = GetTypeID();
+        BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(GetTypeID(), GetArenaType());
+        if (plr)
+        {
+            plr->ClearAfkReports();
+
+            if (!team) team = plr->GetTeam();
+
+            plr->RemoveArenaAuras(true);                // removes debuffs / dots etc., we don't want the player to die after porting out
+            // if arena, remove the specific arena auras
+            if (isArena())
+            {
+                bgTypeId = BATTLEGROUND_AA;                 // set the bg type to all arenas (it will be used for queue refreshing)
+
+                // unsummon current and summon old pet if there was one and there isn't a current pet
+                plr->RemovePet(PET_SAVE_NOT_IN_SLOT);
+                plr->ResummonPetTemporaryUnSummonedIfAny();
+
+                if (isRated() && GetStatus() == STATUS_IN_PROGRESS)
+                {
+                    // left a rated match while the encounter was in progress, consider as loser
+                    ArenaTeam* winner_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(GetOtherTeam(team)));
+                    ArenaTeam* loser_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(team));
+                    if (winner_arena_team && loser_arena_team)
+                        loser_arena_team->MemberLost(plr, winner_arena_team->GetRating());
+                }
+            }
+            if (SendPacket)
+            {
+                WorldPacket data;
+                sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, this, plr->GetBattleGroundQueueIndex(bgQueueTypeId), STATUS_NONE, 0, 0, ARENA_TYPE_NONE, TEAM_NONE);
+                plr->GetSession()->SendPacket(&data);
+            }
+
+            // this call is important, because player, when joins to battleground, this method is not called, so it must be called when leaving bg
+            plr->RemoveBattleGroundQueueId(bgQueueTypeId);
+        }
+        else
+            // removing offline participant
+        {
+            if (isRated() && GetStatus() == STATUS_IN_PROGRESS)
+            {
+                // left a rated match while the encounter was in progress, consider as loser
+                ArenaTeam* others_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(GetOtherTeam(team)));
+                ArenaTeam* players_arena_team = sObjectMgr.GetArenaTeamById(GetArenaTeamIdForTeam(team));
+                if (others_arena_team && players_arena_team)
+                    players_arena_team->OfflineMemberLost(guid, others_arena_team->GetRating());
+            }
+        }
+
+        // remove from raid group if player is member
+        if (Group* group = GetBgRaid(team))
+        {
+            if (!group->RemoveMember(guid, 0))              // group was disbanded
+            {
+                SetBgRaid(team, NULL);
+                group->SetBattlegroundGroup(NULL);
+                delete group;
+            }
+        }
+        DecreaseInvitedCount(team);
+        // we should update battleground queue, but only if bg isn't ending
+        if (isBattleGround() && GetStatus() < STATUS_WAIT_LEAVE)
+        {
+            // a player has left the battleground, so there are free slots -> add to queue
+            AddToBGFreeSlotQueue();
+            sBattleGroundMgr.ScheduleQueueUpdate(0, ARENA_TYPE_NONE, bgQueueTypeId, bgTypeId, GetBracketId());
+        }
+
+        // Let others know
+        WorldPacket data;
+        sBattleGroundMgr.BuildPlayerLeftBattleGroundPacket(&data, guid);
+        SendPacketToTeam(team, &data, plr, false);
+    }
+
+    if (plr)
+    {
+        // Do next only if found in battleground
+        plr->SetBattleGroundId(0, BATTLEGROUND_TYPE_NONE);  // We're not in BG.
+        // reset destination bg team
+        plr->SetBGTeam(TEAM_NONE);
+
+        if (Transport)
+            plr->TeleportToBGEntryPoint();
+
+        DETAIL_LOG("BATTLEGROUND: Removed player %s from BattleGround.", plr->GetName());
+    }
+
+    // battleground object will be deleted next BattleGround::Update() call
+}
+
+// this method is called when no players remains in battleground
+void BattleGround::Reset()
+{
+    SetWinner(TEAM_NONE);
+    SetStatus(STATUS_WAIT_QUEUE);
+    SetStartTime(0);
+    SetEndTime(0);
+    SetArenaType(ARENA_TYPE_NONE);
+    SetRated(false);
+
+    m_Events = 0;
+
+    // door-event2 is always 0
+    m_ActiveEvents[BG_EVENT_DOOR] = 0;
+    m_ActiveEvents[IC_EVENT_BOSS_A] = 0;
+    m_ActiveEvents[IC_EVENT_BOSS_H] = 0;
+    if (isArena())
+    {
+        m_ActiveEvents[ARENA_BUFF_EVENT] = BG_EVENT_NONE;
+        m_ArenaBuffSpawned = false;
+    }
+
+    if (m_InvitedAlliance > 0 || m_InvitedHorde > 0)
+        sLog.outError("BattleGround system: bad counter, m_InvitedAlliance: %d, m_InvitedHorde: %d", m_InvitedAlliance, m_InvitedHorde);
+
+    m_InvitedAlliance = 0;
+    m_InvitedHorde = 0;
+    m_InBGFreeSlotQueue = false;
+
+    m_Players.clear();
+
+    for (BattleGroundScoreMap::const_iterator itr = m_PlayerScores.begin(); itr != m_PlayerScores.end(); ++itr)
+        delete itr->second;
+    m_PlayerScores.clear();
+}
+
+void BattleGround::StartBattleGround()
+{
+    SetStartTime(0);
+
+    // add BG to free slot queue
+    AddToBGFreeSlotQueue();
+
+    // add bg to update list
+    // This must be done here, because we need to have already invited some players when first BG::Update() method is executed
+    // and it doesn't matter if we call StartBattleGround() more times, because m_BattleGrounds is a map and instance id never changes
+    sBattleGroundMgr.AddBattleGround(GetInstanceID(), GetTypeID(), this);
+}
+
+void BattleGround::StartTimedAchievement(AchievementCriteriaTypes type, uint32 entry)
+{
+    for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+        if (Player* pPlayer = GetBgMap()->GetPlayer(itr->first))
+            pPlayer->GetAchievementMgr().StartTimedAchievementCriteria(type, entry);
+}
+
+void BattleGround::AddPlayer(Player* plr)
+{
+    // remove afk from player
+    if (plr->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK))
+        plr->ToggleAFK();
+
+    // score struct must be created in inherited class
+
+    ObjectGuid guid = plr->GetObjectGuid();
+    Team team = plr->GetBGTeam();
+
+    BattleGroundPlayer bp;
+    bp.OfflineRemoveTime = 0;
+    bp.PlayerTeam = team;
+
+    // Add to list/maps
+    m_Players[guid] = bp;
+
+    UpdatePlayersCountByTeam(team, false);                  // +1 player
+
+    WorldPacket data;
+    sBattleGroundMgr.BuildPlayerJoinedBattleGroundPacket(&data, plr);
+    SendPacketToTeam(team, &data, plr, false);
+
+    // add arena specific auras
+    if (isArena())
+    {
+        plr->RemoveArenaSpellCooldowns();
+        plr->RemoveArenaAuras();
+        if (team == ALLIANCE)                               // gold
+        {
+            if (plr->GetTeam() == HORDE)
+                plr->CastSpell(plr, SPELL_HORDE_GOLD_FLAG, true);
+            else
+                plr->CastSpell(plr, SPELL_ALLIANCE_GOLD_FLAG, true);
+        }
+        else                                                // green
+        {
+            if (plr->GetTeam() == HORDE)
+                plr->CastSpell(plr, SPELL_HORDE_GREEN_FLAG, true);
+            else
+                plr->CastSpell(plr, SPELL_ALLIANCE_GREEN_FLAG, true);
+        }
+
+        plr->DestroyConjuredItems(true);
+        plr->UnsummonPetTemporaryIfAny();
+
+        if (GetStatus() == STATUS_WAIT_JOIN)                // not started yet
+            plr->CastSpell(plr, SPELL_ARENA_PREPARATION, true);
+
+        plr->CastSpell(plr, SPELL_ARENA_DAMPENING, true);
+    }
+    else
+    {
+        plr->CastSpell(plr, SPELL_BATTLEGROUND_DAMPENING, true);
+
+        if (GetStatus() == STATUS_WAIT_JOIN)                 // not started yet
+            plr->CastSpell(plr, SPELL_PREPARATION, true);   // reduces all mana cost of spells.
+
+        plr->CastSpell(plr, SPELL_BATTLEGROUND_DAMPENING, true);
+    }
+
+    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
+    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
+    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
+    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
+    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
+    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
+    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
+    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HEALING_DONE, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
+    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
+    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
+    plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
+
+    // setup BG group membership
+    PlayerAddedToBGCheckIfBGIsRunning(plr);
+    AddOrSetPlayerToCorrectBgGroup(plr, guid, team);
+
+    // Log
+    DETAIL_LOG("BATTLEGROUND: Player %s joined the battle.", plr->GetName());
+}
+
+uint32 BattleGround::GetDamageDoneForTeam(Team team)
+{
+    uint32 finaldamage = 0;
+    for (BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+        if (!plr)
+            continue;
+
+        Team bgTeam = itr->second.PlayerTeam;
+        if (!bgTeam)
+            bgTeam = plr->GetTeam();
+
+        if (bgTeam == team)
+            finaldamage += GetPlayerScore(plr, SCORE_DAMAGE_DONE);
+    }
+    return finaldamage;
+}
+
+/* this method adds player to his team's bg group, or sets his correct group if player is already in bg group */
+void BattleGround::AddOrSetPlayerToCorrectBgGroup(Player* plr, ObjectGuid plr_guid, Team team)
+{
+    if (Group* group = GetBgRaid(team))                     // raid already exist
+    {
+        if (group->isLFDGroup())
+        {
+            sLog.outError("BattleGround::AddOrSetPlayerToCorrectBgGroup cheat attempt: try add player %s to %s for BG, but group is LFG type!", plr_guid.GetString().c_str(), group->GetObjectGuid().GetString().c_str());
+            return;
+        }
+
+        if (group->IsMember(plr_guid))
+        {
+            uint8 subgroup = group->GetMemberGroup(plr_guid);
+            plr->SetBattleGroundRaid(group->GetObjectGuid(), subgroup);
+        }
+        else
+        {
+            group->AddMember(plr_guid, plr->GetName());
+            if (Group* originalGroup = plr->GetOriginalGroup())
+                if (originalGroup->IsLeader(plr_guid))
+                    group->ChangeLeader(plr_guid);
+        }
+    }
+    else                                                    // first player joined
+    {
+        group = new Group(GROUPTYPE_BG);
+
+        // Need first set BG type for group, even his be wrong type
+        group->SetBattlegroundGroup(this);
+
+        if (group->Create(plr_guid, plr->GetName()))
+        {
+            SetBgRaid(team, group);
+        }
+        else
+        {
+            delete group;
+            return;
+        }
+
+    }
+}
+
+// This method should be called when player logs into running battleground
+void BattleGround::EventPlayerLoggedIn(Player* player, ObjectGuid plr_guid)
+{
+    // player is correct pointer
+    for (OfflineQueue::iterator itr = m_OfflineQueue.begin(); itr != m_OfflineQueue.end(); ++itr)
+    {
+        if (*itr == plr_guid)
+        {
+            m_OfflineQueue.erase(itr);
+            break;
+        }
+    }
+    m_Players[plr_guid].OfflineRemoveTime = 0;
+    PlayerAddedToBGCheckIfBGIsRunning(player);
+    // if battleground is starting, then add preparation aura
+    // we don't have to do that, because preparation aura isn't removed when player logs out
+}
+
+// This method should be called when player logs out from running battleground
+void BattleGround::EventPlayerLoggedOut(Player* player)
+{
+    // player is correct pointer, it is checked in WorldSession::LogoutPlayer()
+    m_OfflineQueue.push_back(player->GetObjectGuid());
+    m_Players[player->GetObjectGuid()].OfflineRemoveTime = sWorld.GetGameTime() + MAX_OFFLINE_TIME;
+    if (GetStatus() == STATUS_IN_PROGRESS)
+    {
+        // drop flag and handle other cleanups
+        RemovePlayer(player, player->GetObjectGuid());
+
+        // 1 player is logging out, if it is the last, then end arena!
+        if (isArena())
+            if (GetAlivePlayersCountByTeam(player->GetTeam()) <= 1 && GetPlayersCountByTeam(GetOtherTeam(player->GetTeam())))
+                EndBattleGround(GetOtherTeam(player->GetTeam()));
+    }
+}
+
+/* This method should be called only once ... it adds pointer to queue */
+void BattleGround::AddToBGFreeSlotQueue()
+{
+    // make sure to add only once
+    if (!m_InBGFreeSlotQueue && isBattleGround())
+    {
+        sBattleGroundMgr.BGFreeSlotQueue[m_TypeID].push_front(this);
+        m_InBGFreeSlotQueue = true;
+    }
+}
+
+/* This method removes this battleground from free queue - it must be called when deleting battleground - not used now*/
+void BattleGround::RemoveFromBGFreeSlotQueue()
+{
+    // set to be able to re-add if needed
+    m_InBGFreeSlotQueue = false;
+    for (BGFreeSlotQueueType::iterator itr = sBattleGroundMgr.BGFreeSlotQueue[m_TypeID].begin(); itr != sBattleGroundMgr.BGFreeSlotQueue[m_TypeID].end(); ++itr)
+    {
+        if ((*itr)->GetInstanceID() == GetInstanceID())
+        {
+            sBattleGroundMgr.BGFreeSlotQueue[m_TypeID].erase(itr);
+            return;
+        }
+    }
+}
+
+// get the number of free slots for team
+// returns the number how many players can join battleground to MaxPlayersPerTeam
+uint32 BattleGround::GetFreeSlotsForTeam(Team team) const
+{
+    // return free slot count to MaxPlayerPerTeam
+    if (GetStatus() == STATUS_WAIT_JOIN || GetStatus() == STATUS_IN_PROGRESS)
+        return (GetInvitedCount(team) < GetMaxPlayersPerTeam()) ? GetMaxPlayersPerTeam() - GetInvitedCount(team) : 0;
+
+    return 0;
+}
+
+bool BattleGround::HasFreeSlots() const
+{
+    return GetPlayersSize() < GetMaxPlayers();
+}
+
+void BattleGround::UpdatePlayerScore(Player* Source, uint32 type, uint32 value)
+{
+    // this procedure is called from virtual function implemented in bg subclass
+    BattleGroundScoreMap::const_iterator itr = m_PlayerScores.find(Source->GetObjectGuid());
+
+    if (itr == m_PlayerScores.end())                        // player not found...
+        return;
+
+    switch (type)
+    {
+        case SCORE_KILLING_BLOWS:                           // Killing blows
+            itr->second->KillingBlows += value;
+            break;
+        case SCORE_DEATHS:                                  // Deaths
+            itr->second->Deaths += value;
+            break;
+        case SCORE_HONORABLE_KILLS:                         // Honorable kills
+            itr->second->HonorableKills += value;
+            break;
+        case SCORE_BONUS_HONOR:                             // Honor bonus
+            // do not add honor in arenas
+            if (isBattleGround())
+            {
+                // reward honor instantly
+                if (Source->RewardHonor(NULL, 1, (float)value))
+                    itr->second->BonusHonor += value;
+            }
+            break;
+            // used only in EY, but in MSG_PVP_LOG_DATA opcode
+        case SCORE_DAMAGE_DONE:                             // Damage Done
+            itr->second->DamageDone += value;
+            break;
+        case SCORE_HEALING_DONE:                            // Healing Done
+            itr->second->HealingDone += value;
+            break;
+        default:
+            sLog.outError("BattleGround: Unknown player score type %u", type);
+            break;
+    }
+}
+
+bool BattleGround::AddObject(uint32 type, uint32 entry, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3, uint32 /*respawnTime*/)
+{
+    // must be created this way, adding to godatamap would add it to the base map of the instance
+    // and when loading it (in go::LoadFromDB()), a new guid would be assigned to the object, and a new object would be created
+    // so we must create it specific for this instance
+    GameObject* go = new GameObject;
+    if (!go->Create(GetBgMap()->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), entry, GetBgMap(),
+                    PHASEMASK_NORMAL, x, y, z, o, QuaternionData(rotation0, rotation1, rotation2, rotation3)))
+    {
+        sLog.outErrorDb("Gameobject template %u not found in database! BattleGround not created!", entry);
+        sLog.outError("Cannot create gameobject template %u! BattleGround not created!", entry);
+        delete go;
+        return false;
+    }
+    /*
+        uint32 guid = go->GetGUIDLow();
+
+        // without this, UseButtonOrDoor caused the crash, since it tried to get go info from godata
+        // iirc that was changed, so adding to go data map is no longer required if that was the only function using godata from GameObject without checking if it existed
+        GameObjectData& data = sObjectMgr.NewGOData(guid);
+
+        data.id             = entry;
+        data.mapid          = GetMapId();
+        data.posX           = x;
+        data.posY           = y;
+        data.posZ           = z;
+        data.orientation    = o;
+        data.rotation0      = rotation0;
+        data.rotation1      = rotation1;
+        data.rotation2      = rotation2;
+        data.rotation3      = rotation3;
+        data.spawntimesecs  = respawnTime;
+        data.spawnMask      = 1;
+        data.animprogress   = 100;
+        data.go_state       = 1;
+    */
+    // add to world, so it can be later looked up from HashMapHolder
+    go->AddToWorld();
+    m_BgObjects[type] = go->GetObjectGuid();
+    return true;
+}
+
+// some doors aren't despawned so we cannot handle their closing in gameobject::update()
+// it would be nice to correctly implement GO_ACTIVATED state and open/close doors in gameobject code
+void BattleGround::DoorClose(ObjectGuid guid)
+{
+    GameObject* obj = GetBgMap()->GetGameObject(guid);
+    if (obj)
+    {
+        // if doors are open, close it
+        if (obj->getLootState() == GO_ACTIVATED && obj->GetGoState() != GO_STATE_READY)
+        {
+            // change state to allow door to be closed
+            obj->SetLootState(GO_READY);
+            obj->UseDoorOrButton(RESPAWN_ONE_DAY);
+        }
+    }
+    else
+        sLog.outError("BattleGround: Door %s not found (cannot close doors)", guid.GetString().c_str());
+}
+
+void BattleGround::DoorOpen(ObjectGuid guid)
+{
+    GameObject* obj = GetBgMap()->GetGameObject(guid);
+    if (obj)
+    {
+        // change state to be sure they will be opened
+        obj->SetLootState(GO_READY);
+        obj->UseDoorOrButton(RESPAWN_ONE_DAY);
+    }
+    else
+        sLog.outError("BattleGround: Door %s not found! - doors will be closed.", guid.GetString().c_str());
+}
+
+void BattleGround::OnObjectDBLoad(Creature* creature)
+{
+    const BattleGroundEventIdx eventId = sBattleGroundMgr.GetCreatureEventIndex(creature->GetGUIDLow());
+    if (eventId.event1 == BG_EVENT_NONE)
+        return;
+    m_EventObjects[MAKE_PAIR32(eventId.event1, eventId.event2)].creatures.push_back(creature->GetObjectGuid());
+    if (!IsActiveEvent(eventId.event1, eventId.event2))
+        SpawnBGCreature(creature->GetObjectGuid(), RESPAWN_ONE_DAY);
+
+    if (BattleGroundSpawnFactions faction = GetSpawnFactionFor(creature->GetObjectGuid()))
+        creature->setFaction(faction);
+}
+
+ObjectGuid BattleGround::GetSingleCreatureGuid(uint8 event1, uint8 event2)
+{
+    GuidVector::const_iterator itr = m_EventObjects[MAKE_PAIR32(event1, event2)].creatures.begin();
+    if (itr != m_EventObjects[MAKE_PAIR32(event1, event2)].creatures.end())
+        return *itr;
+    return ObjectGuid();
+}
+
+void BattleGround::OnObjectDBLoad(GameObject* obj)
+{
+    const BattleGroundEventIdx eventId = sBattleGroundMgr.GetGameObjectEventIndex(obj->GetGUIDLow());
+    if (eventId.event1 == BG_EVENT_NONE)
+        return;
+    m_EventObjects[MAKE_PAIR32(eventId.event1, eventId.event2)].gameobjects.push_back(obj->GetObjectGuid());
+    if (!IsActiveEvent(eventId.event1, eventId.event2))
+    {
+        SpawnBGObject(obj->GetObjectGuid(), RESPAWN_ONE_DAY);
+    }
+    else
+    {
+        // it's possible, that doors aren't spawned anymore (wsg)
+        if (GetStatus() >= STATUS_IN_PROGRESS && IsDoor(eventId.event1, eventId.event2))
+            DoorOpen(obj->GetObjectGuid());
+    }
+
+    if (Team team = GetSpawnTeamFor(obj->GetObjectGuid()))
+        obj->SetTeam(team);
+}
+
+bool BattleGround::IsDoor(uint8 event1, uint8 event2)
+{
+    if (event1 == BG_EVENT_DOOR || event1 == IC_EVENT_BOSS_A || event1 == IC_EVENT_BOSS_H)
+    {
+        if (event2 > 0)
+        {
+            sLog.outError("BattleGround too high event2 for event1:%i", event1);
+            return false;
+        }
+        return true;
+    }
+    return false;
+}
+
+void BattleGround::OpenDoorEvent(uint8 event1, uint8 event2 /*=0*/)
+{
+    if (!IsDoor(event1, event2))
+    {
+        sLog.outError("BattleGround:OpenDoorEvent this is no door event1:%u event2:%u", event1, event2);
+        return;
+    }
+    if (!IsActiveEvent(event1, event2))                 // maybe already despawned (eye)
+    {
+        sLog.outError("BattleGround:OpenDoorEvent this event isn't active event1:%u event2:%u", event1, event2);
+        return;
+    }
+    GuidVector::const_iterator itr = m_EventObjects[MAKE_PAIR32(event1, event2)].gameobjects.begin();
+    for (; itr != m_EventObjects[MAKE_PAIR32(event1, event2)].gameobjects.end(); ++itr)
+        DoorOpen(*itr);
+}
+
+void BattleGround::SpawnEvent(uint8 event1, uint8 event2, bool spawn)
+{
+    // stop if we want to spawn something which was already spawned
+    // or despawn something which was already despawned
+    if (event2 == BG_EVENT_NONE || (spawn && m_ActiveEvents[event1] == event2)
+            || (!spawn && m_ActiveEvents[event1] != event2))
+        return;
+
+    if (spawn)
+    {
+        // if event gets spawned, the current active event mus get despawned
+        SpawnEvent(event1, m_ActiveEvents[event1], false);
+        m_ActiveEvents[event1] = event2;                    // set this event to active
+    }
+    else
+        m_ActiveEvents[event1] = BG_EVENT_NONE;             // no event active if event2 gets despawned
+
+    GuidVector::const_iterator itr = m_EventObjects[MAKE_PAIR32(event1, event2)].creatures.begin();
+    for (; itr != m_EventObjects[MAKE_PAIR32(event1, event2)].creatures.end(); ++itr)
+        SpawnBGCreature(*itr, (spawn) ? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY);
+    GuidVector::const_iterator itr2 = m_EventObjects[MAKE_PAIR32(event1, event2)].gameobjects.begin();
+    for (; itr2 != m_EventObjects[MAKE_PAIR32(event1, event2)].gameobjects.end(); ++itr2)
+        SpawnBGObject(*itr2, (spawn) ? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY);
+}
+
+void BattleGround::SpawnBGObject(ObjectGuid guid, uint32 respawntime)
+{
+    Map* map = GetBgMap();
+
+    GameObject* obj = map->GetGameObject(guid);
+    if (!obj)
+        return;
+    if (respawntime == 0)
+    {
+        // we need to change state from GO_JUST_DEACTIVATED to GO_READY in case battleground is starting again
+        if (obj->getLootState() == GO_JUST_DEACTIVATED)
+            obj->SetLootState(GO_READY);
+        obj->Respawn();
+        map->Add(obj);
+        if (obj->GetGOInfo()->type == GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING)
+            obj->Rebuild(NULL);
+
+        GameObjectData const *data = sObjectMgr.GetGOData(obj->GetGUIDLow());
+        if (data)
+        {
+            uint32 respawn = data->spawntimesecs;
+            obj->SetRespawnDelay(respawn);
+        }
+    }
+    else
+    {
+        map->Add(obj);
+        obj->SetRespawnTime(respawntime);
+        obj->SetLootState(GO_JUST_DEACTIVATED);
+        if (obj->GetGOInfo()->type == GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING)
+            obj->Rebuild(NULL);
+    }
+    if (Team team = GetSpawnTeamFor(obj->GetObjectGuid()))
+        obj->SetTeam(team);
+}
+
+void BattleGround::SpawnBGCreature(ObjectGuid guid, uint32 respawntime)
+{
+    Map* map = GetBgMap();
+
+    Creature* obj = map->GetCreature(guid);
+    if (!obj)
+        return;
+    if (respawntime == 0)
+    {
+        obj->Respawn();
+        map->Add(obj);
+        CreatureData const *data = sObjectMgr.GetCreatureData(obj->GetGUIDLow());
+        if (data)
+        {
+            uint32 respawn = data->spawntimesecs;
+            obj->SetRespawnDelay(respawn);
+        }
+    }
+    else
+    {
+        map->Add(obj);
+        obj->SetRespawnDelay(respawntime);
+        if (obj->IsVehicle())
+        {
+            if (obj->GetVehicleKit())
+                obj->GetVehicleKit()->RemoveAllPassengers();
+        }
+        obj->SetDeathState(JUST_DIED);
+        obj->RemoveCorpse();
+
+        float x, y, z, o;
+        obj->GetRespawnCoord(x,y,z,&o);
+        obj->NearTeleportTo(x,y,z,o);
+    }
+    if (BattleGroundSpawnFactions faction = GetSpawnFactionFor(obj->GetObjectGuid()))
+        obj->setFaction(faction);
+}
+
+BattleGroundSpawnFactions BattleGround::GetSpawnFactionFor(ObjectGuid const& guid) const
+{
+    switch (GetSpawnTeamFor(guid))
+    {
+        case HORDE:
+            return SPAWN_FACTION_HORDE;
+        case ALLIANCE:
+            return SPAWN_FACTION_ALLIANCE;
+        case TEAM_INVALID:
+            return SPAWN_FACTION_NEUTRAL;
+        case TEAM_NONE:
+        default:
+            break;
+    }
+    return SPAWN_FACTION_UNCHANGED;
+}
+
+bool BattleGround::DelObject(uint32 type)
+{
+    if (!m_BgObjects[type])
+        return true;
+
+    GameObject* obj = GetBgMap()->GetGameObject(m_BgObjects[type]);
+    if (!obj)
+    {
+        sLog.outError("Can't find gobject: %s", m_BgObjects[type].GetString().c_str());
+        return false;
+    }
+
+    obj->SetRespawnTime(0);                                 // not save respawn time
+    obj->Delete();
+    m_BgObjects[type].Clear();
+    return true;
+}
+
+void BattleGround::MakeInteractive(uint8 event1, uint8 event2, bool interactive)
+{
+    // make the gameobject clickable
+    uint32 objEvent = MAKE_PAIR32(event1, event2);
+    for (std::vector<ObjectGuid>::iterator itr = m_EventObjects[objEvent].gameobjects.begin(); itr != m_EventObjects[objEvent].gameobjects.end(); ++itr)
+    {
+        if (GameObject * pEventGameObject = GetBgMap()->GetGameObject((*itr)))
+        {
+            if (interactive)
+            {
+                if (pEventGameObject->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT))
+                    pEventGameObject->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+            }
+            else
+            {
+                if (!pEventGameObject->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT))
+                    pEventGameObject->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+            }
+        }
+    }
+}
+
+void BattleGround::SendMessageToAll(int32 entry, ChatMsg type, Player const* source)
+{
+    MaNGOS::BattleGroundChatBuilder bg_builder(type, entry, source);
+    MaNGOS::LocalizedPacketDo<MaNGOS::BattleGroundChatBuilder> bg_do(bg_builder);
+    BroadcastWorker(bg_do);
+}
+
+void BattleGround::SendYellToAll(int32 entry, uint32 language, ObjectGuid guid)
+{
+    Creature* source = GetBgMap()->GetCreature(guid);
+    if (!source)
+        return;
+    MaNGOS::BattleGroundYellBuilder bg_builder(Language(language), entry, source);
+    MaNGOS::LocalizedPacketDo<MaNGOS::BattleGroundYellBuilder> bg_do(bg_builder);
+    BroadcastWorker(bg_do);
+}
+
+void BattleGround::PSendMessageToAll(int32 entry, ChatMsg type, Player const* source, ...)
+{
+    va_list ap;
+    va_start(ap, source);
+
+    MaNGOS::BattleGroundChatBuilder bg_builder(type, entry, source, &ap);
+    MaNGOS::LocalizedPacketDo<MaNGOS::BattleGroundChatBuilder> bg_do(bg_builder);
+    BroadcastWorker(bg_do);
+
+    va_end(ap);
+}
+
+void BattleGround::SendMessage2ToAll(int32 entry, ChatMsg type, Player const* source, int32 arg1, int32 arg2)
+{
+    MaNGOS::BattleGround2ChatBuilder bg_builder(type, entry, source, arg1, arg2);
+    MaNGOS::LocalizedPacketDo<MaNGOS::BattleGround2ChatBuilder> bg_do(bg_builder);
+    BroadcastWorker(bg_do);
+}
+
+void BattleGround::SendYell2ToAll(int32 entry, uint32 language, ObjectGuid guid, int32 arg1, int32 arg2)
+{
+    Creature* source = GetBgMap()->GetCreature(guid);
+    if (!source)
+        return;
+    MaNGOS::BattleGround2YellBuilder bg_builder(language, entry, source, arg1, arg2);
+    MaNGOS::LocalizedPacketDo<MaNGOS::BattleGround2YellBuilder> bg_do(bg_builder);
+    BroadcastWorker(bg_do);
+}
+
+void BattleGround::SendWarningToAll(int32 entry, ...)
+{
+    MaNGOS::BattleGroundWarningBuilder bg_builder(entry);
+    MaNGOS::LocalizedPacketDo<MaNGOS::BattleGroundWarningBuilder> bg_do(bg_builder);
+    BroadcastWorker(bg_do);
+}
+
+void BattleGround::EndNow()
+{
+    RemoveFromBGFreeSlotQueue();
+    SetStatus(STATUS_WAIT_LEAVE);
+    SetEndTime(0);
+}
+
+/*
+important notice:
+buffs aren't spawned/despawned when players captures anything
+buffs are in their positions when battleground starts
+*/
+void BattleGround::HandleTriggerBuff(ObjectGuid go_guid)
+{
+    GameObject* obj = GetBgMap()->GetGameObject(go_guid);
+    if (!obj || obj->GetGoType() != GAMEOBJECT_TYPE_TRAP || !obj->isSpawned())
+        return;
+
+    obj->SetLootState(GO_JUST_DEACTIVATED);             // can be despawned or destroyed
+}
+
+void BattleGround::HandleKillPlayer(Player* player, Player* killer)
+{
+    // add +1 deaths
+    UpdatePlayerScore(player, SCORE_DEATHS, 1);
+
+    // add +1 kills to group and +1 killing_blows to killer
+    if (killer)
+    {
+        UpdatePlayerScore(killer, SCORE_HONORABLE_KILLS, 1);
+        UpdatePlayerScore(killer, SCORE_KILLING_BLOWS, 1);
+
+        killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL, 1);
+        killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA, 1);
+        killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, 1);
+
+        for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+        {
+            Player* plr = sObjectMgr.GetPlayer(itr->first);
+
+            if (!plr || plr == killer || !plr->isAlive())
+                continue;
+
+            if (plr->GetTeam() == killer->GetTeam() && plr->IsAtGroupRewardDistance(player))
+            {
+                UpdatePlayerScore(plr, SCORE_HONORABLE_KILLS, 1);
+
+                plr->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL, 1);
+                plr->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA, 1);
+            }
+        }
+    }
+
+    // to be able to remove insignia -- ONLY IN BattleGrounds
+    if (!isArena())
+        player->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
+}
+
+// return the player's team based on battlegroundplayer info
+// used in same faction arena matches mainly
+Team BattleGround::GetPlayerTeam(ObjectGuid guid)
+{
+    BattleGroundPlayerMap::const_iterator itr = m_Players.find(guid);
+    if (itr != m_Players.end())
+        return itr->second.PlayerTeam;
+    return TEAM_NONE;
+}
+
+bool BattleGround::IsPlayerInBattleGround(ObjectGuid guid)
+{
+    BattleGroundPlayerMap::const_iterator itr = m_Players.find(guid);
+    if (itr != m_Players.end())
+        return true;
+    return false;
+}
+
+void BattleGround::PlayerAddedToBGCheckIfBGIsRunning(Player* plr)
+{
+    if (GetStatus() != STATUS_WAIT_LEAVE)
+        return;
+
+    WorldPacket data;
+    BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(GetTypeID(), GetArenaType());
+
+    BlockMovement(plr);
+
+    sBattleGroundMgr.BuildPvpLogDataPacket(&data, this);
+    plr->GetSession()->SendPacket(&data);
+
+    sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, this, plr->GetBattleGroundQueueIndex(bgQueueTypeId), STATUS_IN_PROGRESS, GetEndTime(), GetStartTime(), GetArenaType(), plr->GetBGTeam());
+    plr->GetSession()->SendPacket(&data);
+}
+
+uint32 BattleGround::GetAlivePlayersCountByTeam(Team team) const
+{
+    int count = 0;
+    for (BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        if (itr->second.PlayerTeam == team)
+        {
+            Player* pl = sObjectMgr.GetPlayer(itr->first);
+            if (pl && pl->isAlive())
+                ++count;
+        }
+    }
+    return count;
+}
+
+void BattleGround::CheckArenaWinConditions()
+{
+    if (!GetAlivePlayersCountByTeam(ALLIANCE) && GetPlayersCountByTeam(HORDE))
+        EndBattleGround(HORDE);
+    else if (GetPlayersCountByTeam(ALLIANCE) && !GetAlivePlayersCountByTeam(HORDE))
+        EndBattleGround(ALLIANCE);
+}
+
+Group* BattleGround::GetBgRaid(Team team)
+{
+    return sObjectMgr.GetGroup(m_BgRaids[GetTeamIndex(team)]);
+}
+
+void BattleGround::SetBgRaid(Team team, Group* bg_raid)
+{
+    Group* old_raid = GetBgRaid(team);
+
+    if (old_raid)
+        old_raid->SetBattlegroundGroup(NULL);
+
+    if (bg_raid)
+    {
+        bg_raid->SetBattlegroundGroup(this);
+        m_BgRaids[GetTeamIndex(team)] = bg_raid->GetObjectGuid();
+    }
+    else
+        m_BgRaids[GetTeamIndex(team)] = ObjectGuid();
+}
+
+WorldSafeLocsEntry const* BattleGround::GetClosestGraveYard(Player* player)
+{
+    return sObjectMgr.GetClosestGraveYard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->GetTeam());
+}
+
+bool BattleGround::IsTeamScoreInRange(Team team, uint32 minScore, uint32 maxScore) const
+{
+    TeamIndex team_idx = GetTeamIndex(team);
+    uint32 score = (m_TeamScores[team_idx] < 0) ? 0 : uint32(m_TeamScores[team_idx]);
+    return score >= minScore && score <= maxScore;
+}
+
+void BattleGround::SetBracket(PvPDifficultyEntry const* bracketEntry)
+{
+    m_BracketId  = bracketEntry->GetBracketId();
+    SetLevelRange(bracketEntry->minLevel, bracketEntry->maxLevel);
+}
+
+GameObject* BattleGround::GetBGObject(uint32 type)
+{
+    GameObject *obj = GetBgMap()->GetGameObject(m_BgObjects[type]);
+    if (!obj)
+        sLog.outError("couldn't get gameobject %i",type);
+    return obj;
+}
+
+uint32 BattleGround::GetPlayerScore(Player* pPlayer, uint32 type)
+{
+    BattleGroundScoreMap::const_iterator itr = m_PlayerScores.find(pPlayer->GetObjectGuid());
+    if (itr == m_PlayerScores.end())                         // player not found...
+        return 0;
+
+    switch(type)
+    {
+        case SCORE_KILLING_BLOWS:                            // Killing blows
+            return itr->second->KillingBlows;
+        case SCORE_DEATHS:                                   // Deaths
+            return itr->second->Deaths;
+        case SCORE_HONORABLE_KILLS:                          // Honorable kills
+            return itr->second->HonorableKills;
+        case SCORE_BONUS_HONOR:                              // Honor bonus
+            return itr->second->BonusHonor;
+        case SCORE_DAMAGE_DONE:                              // Damage Done
+            return itr->second->DamageDone;
+        case SCORE_HEALING_DONE:                             // Healing Done
+            return itr->second->HealingDone;
+        default:
+            sLog.outError("BattleGround: Unknown player score type %u", type);
+            return 0;
+    }
+}
+
+void BattleGround::FillInitialWorldState(uint32 stateId, uint32 value)
+{
+    sWorldStateMgr.SetWorldStateValueFor(GetBgMap(), stateId, value);
+}
diff --git a/src/game/BattleGround.h b/src/game/BattleGround/BattleGround.h
similarity index 78%
rename from src/game/BattleGround.h
rename to src/game/BattleGround/BattleGround.h
index 6e4170b59d4..ec5088a3bdd 100644
--- a/src/game/BattleGround.h
+++ b/src/game/BattleGround/BattleGround.h
@@ -24,11 +24,14 @@
 #include "Map.h"
 #include "ByteBuffer.h"
 #include "ObjectGuid.h"
+#include "WorldStateMgr.h"
 
 // magic event-numbers
 #define BG_EVENT_NONE 255
 // those generic events should get a high event id
 #define BG_EVENT_DOOR 254
+#define IC_EVENT_BOSS_A 251
+#define IC_EVENT_BOSS_H 252
 // only arena event
 // cause this buff apears 90sec after start in every bg i implement it here
 #define ARENA_BUFF_EVENT 253
@@ -112,6 +115,7 @@ enum BattleGroundTimeIntervals
     RESPAWN_IMMEDIATELY             = 0,                    // secs
     BUFF_RESPAWN_TIME               = 180,                  // secs
     ARENA_SPAWN_BUFF_OBJECTS        = 90000,                // ms - 90sec after start
+    ARENA_TIME_LIMIT                = 2820000,              // ms - 47 minutes after start
 };
 
 enum BattleGroundStartTimeIntervals
@@ -130,6 +134,16 @@ enum BattleGroundBuffObjects
     BG_OBJECTID_BERSERKERBUFF_ENTRY = 179905
 };
 
+enum BattleGroundRandomRewards
+{
+    BG_REWARD_WINNER_HONOR_FIRST    = 30,
+    BG_REWARD_WINNER_ARENA_FIRST    = 25,
+    BG_REWARD_WINNER_HONOR_LAST     = 15,
+    BG_REWARD_WINNER_ARENA_LAST     = 0,
+    BG_REWARD_LOOSER_HONOR_FIRST    = 5,
+    BG_REWARD_LOOSER_HONOR_LAST     = 5
+};
+
 const uint32 Buff_Entries[3] = { BG_OBJECTID_SPEEDBUFF_ENTRY, BG_OBJECTID_REGENBUFF_ENTRY, BG_OBJECTID_BERSERKERBUFF_ENTRY };
 
 enum BattleGroundStatus
@@ -151,48 +165,35 @@ struct BattleGroundObjectInfo
 {
     BattleGroundObjectInfo() : object(NULL), timer(0), spellid(0) {}
 
-    GameObject  *object;
+    GameObject* object;
     int32       timer;
     uint32      spellid;
 };
 
-// handle the queue types and bg types separately to enable joining queue for different sized arenas at the same time
-enum BattleGroundQueueTypeId
-{
-    BATTLEGROUND_QUEUE_NONE     = 0,
-    BATTLEGROUND_QUEUE_AV       = 1,
-    BATTLEGROUND_QUEUE_WS       = 2,
-    BATTLEGROUND_QUEUE_AB       = 3,
-    BATTLEGROUND_QUEUE_EY       = 4,
-    BATTLEGROUND_QUEUE_SA       = 5,
-    BATTLEGROUND_QUEUE_IC       = 6,
-    BATTLEGROUND_QUEUE_2v2      = 7,
-    BATTLEGROUND_QUEUE_3v3      = 8,
-    BATTLEGROUND_QUEUE_5v5      = 9
-};
-#define MAX_BATTLEGROUND_QUEUE_TYPES 10
-
 enum ScoreType
 {
     SCORE_KILLING_BLOWS         = 1,
     SCORE_DEATHS                = 2,
     SCORE_HONORABLE_KILLS       = 3,
     SCORE_BONUS_HONOR           = 4,
-    //EY, but in MSG_PVP_LOG_DATA opcode!
+    // EY, but in MSG_PVP_LOG_DATA opcode!
     SCORE_DAMAGE_DONE           = 5,
     SCORE_HEALING_DONE          = 6,
-    //WS
+    // WS
     SCORE_FLAG_CAPTURES         = 7,
     SCORE_FLAG_RETURNS          = 8,
-    //AB
+    // AB
     SCORE_BASES_ASSAULTED       = 9,
     SCORE_BASES_DEFENDED        = 10,
-    //AV
+    // AV
     SCORE_GRAVEYARDS_ASSAULTED  = 11,
     SCORE_GRAVEYARDS_DEFENDED   = 12,
     SCORE_TOWERS_ASSAULTED      = 13,
     SCORE_TOWERS_DEFENDED       = 14,
-    SCORE_SECONDARY_OBJECTIVES  = 15
+    SCORE_SECONDARY_OBJECTIVES  = 15,
+    // SA
+    SCORE_GATES_DESTROYED       = 16,
+    SCORE_DEMOLISHERS_DESTROYED = 17
 };
 
 enum BattleGroundType
@@ -201,14 +202,15 @@ enum BattleGroundType
     TYPE_ARENA            = 4
 };
 
-enum BattleGroundTeamIndex
+
+enum BattleGroundSpawnFactions
 {
-    BG_TEAM_ALLIANCE        = 0,
-    BG_TEAM_HORDE           = 1
+    SPAWN_FACTION_UNCHANGED = 0,
+    SPAWN_FACTION_ALLIANCE = 3,
+    SPAWN_FACTION_HORDE = 6,
+    SPAWN_FACTION_NEUTRAL = 35,
 };
 
-#define BG_TEAMS_COUNT  2
-
 enum BattleGroundStartingEvents
 {
     BG_STARTING_EVENT_NONE  = 0x00,
@@ -254,7 +256,7 @@ class BattleGroundScore
         BattleGroundScore() : KillingBlows(0), Deaths(0), HonorableKills(0),
             BonusHonor(0), DamageDone(0), HealingDone(0)
         {}
-        virtual ~BattleGroundScore() {}                     //virtual destructor is used when deleting score from scores map
+        virtual ~BattleGroundScore() {}                     // virtual destructor is used when deleting score from scores map
 
         uint32 KillingBlows;
         uint32 Deaths;
@@ -273,7 +275,7 @@ This class is used to:
 */
 class BattleGround
 {
-    friend class BattleGroundMgr;
+        friend class BattleGroundMgr;
 
     public:
         /* Construction */
@@ -290,17 +292,17 @@ class BattleGround
         virtual void StartingEventOpenDoors() {}
 
         /* achievement req. */
-        virtual bool IsAllNodesConrolledByTeam(Team /*team*/) const { return false; }
+        virtual bool IsAllNodesControlledByTeam(Team /*team*/) const { return false; }
         bool IsTeamScoreInRange(Team team, uint32 minScore, uint32 maxScore) const;
 
         /* Battleground */
         // Get methods:
         char const* GetName() const         { return m_Name; }
-        BattleGroundTypeId GetTypeID() const { return m_TypeID; }
+        BattleGroundTypeId GetTypeID(bool GetRandom = false) const { return GetRandom ? m_RandomTypeID : m_TypeID; }
         BattleGroundBracketId GetBracketId() const { return m_BracketId; }
         // the instanceId check is also used to determine a bg-template
         // that's why the m_map hack is here..
-        uint32 GetInstanceID()              { return m_Map?GetBgMap()->GetInstanceId():0; }
+        uint32 GetInstanceID();
         BattleGroundStatus GetStatus() const { return m_Status; }
         uint32 GetClientInstanceID() const  { return m_ClientInstanceID; }
         uint32 GetStartTime() const         { return m_StartTime; }
@@ -319,11 +321,21 @@ class BattleGround
         Team GetWinner() const              { return m_Winner; }
         uint32 GetBattlemasterEntry() const;
         uint32 GetBonusHonorFromKill(uint32 kills) const;
+        bool IsRandom() { return m_IsRandom; }
+
+        // Strand of the Ancients related
+        virtual Team   GetDefender()                    const   { return TEAM_NONE; }
+        virtual uint8  GetGydController(uint8 /*gyd*/)  const   { return false; }
+
+        // Method for change BG creatures faction after spawn (by new event)
+        virtual BattleGroundSpawnFactions GetSpawnFactionFor(ObjectGuid const& guid) const;
+        virtual Team GetSpawnTeamFor(ObjectGuid const& guid) const { return TEAM_NONE; }
 
         // Set methods:
         void SetName(char const* Name)      { m_Name = Name; }
         void SetTypeID(BattleGroundTypeId TypeID) { m_TypeID = TypeID; }
-        //here we can count minlevel and maxlevel for players
+        void SetRandomTypeID(BattleGroundTypeId TypeID) { m_RandomTypeID = TypeID; }
+        // here we can count minlevel and maxlevel for players
         void SetBracket(PvPDifficultyEntry const* bracketEntry);
         void SetStatus(BattleGroundStatus Status) { m_Status = Status; }
         void SetClientInstanceID(uint32 InstanceID) { m_ClientInstanceID = InstanceID; }
@@ -343,11 +355,13 @@ class BattleGround
         void SetMaxPlayersPerTeam(uint32 MaxPlayers) { m_MaxPlayersPerTeam = MaxPlayers; }
         void SetMinPlayersPerTeam(uint32 MinPlayers) { m_MinPlayersPerTeam = MinPlayers; }
 
-        void AddToBGFreeSlotQueue();                        //this queue will be useful when more battlegrounds instances will be available
-        void RemoveFromBGFreeSlotQueue();                   //this method could delete whole BG instance, if another free is available
+        void AddToBGFreeSlotQueue();                        // this queue will be useful when more battlegrounds instances will be available
+        void RemoveFromBGFreeSlotQueue();                   // this method could delete whole BG instance, if another free is available
 
         void DecreaseInvitedCount(Team team)      { (team == ALLIANCE) ? --m_InvitedAlliance : --m_InvitedHorde; }
         void IncreaseInvitedCount(Team team)      { (team == ALLIANCE) ? ++m_InvitedAlliance : ++m_InvitedHorde; }
+        void SetRandom(bool isRandom) { m_IsRandom = isRandom; }
+
         uint32 GetInvitedCount(Team team) const
         {
             if (team == ALLIANCE)
@@ -370,6 +384,7 @@ class BattleGround
         BattleGroundScoreMap::const_iterator GetPlayerScoresBegin() const { return m_PlayerScores.begin(); }
         BattleGroundScoreMap::const_iterator GetPlayerScoresEnd() const { return m_PlayerScores.end(); }
         uint32 GetPlayerScoresSize() const { return m_PlayerScores.size(); }
+        uint32 GetPlayerScore(Player* pPlayer, uint32 type);
 
         void StartBattleGround();
 
@@ -380,17 +395,13 @@ class BattleGround
         uint32 GetMapId() const { return m_MapId; }
 
         /* Map pointers */
-        void SetBgMap(BattleGroundMap* map) { m_Map = map; }
-        BattleGroundMap* GetBgMap()
-        {
-            MANGOS_ASSERT(m_Map);
-            return m_Map;
-        }
+        void SetBgMap(BattleGroundMap* map);
+        BattleGroundMap* GetBgMap();
 
         void SetTeamStartLoc(Team team, float X, float Y, float Z, float O);
-        void GetTeamStartLoc(Team team, float &X, float &Y, float &Z, float &O) const
+        void GetTeamStartLoc(Team team, float& X, float& Y, float& Z, float& O) const
         {
-            BattleGroundTeamIndex idx = GetTeamIndexByTeamId(team);
+            TeamIndex idx = GetTeamIndex(team);
             X = m_TeamStartLocX[idx];
             Y = m_TeamStartLocY[idx];
             Z = m_TeamStartLocZ[idx];
@@ -399,9 +410,10 @@ class BattleGround
 
         /* Packet Transfer */
         // method that should fill worldpacket with actual world states (not yet implemented for all battlegrounds!)
-        virtual void FillInitialWorldStates(WorldPacket& /*data*/, uint32& /*count*/) {}
-        void SendPacketToTeam(Team team, WorldPacket *packet, Player *sender = NULL, bool self = true);
-        void SendPacketToAll(WorldPacket *packet);
+        virtual void FillInitialWorldStates() {}
+        void FillInitialWorldState(uint32 stateId, uint32 value);
+        void SendPacketToTeam(Team team, WorldPacket* packet, Player* sender = NULL, bool self = true);
+        void SendPacketToAll(WorldPacket* packet);
 
         template<class Do>
         void BroadcastWorker(Do& _do);
@@ -411,54 +423,63 @@ class BattleGround
         void CastSpellOnTeam(uint32 SpellID, Team team);
         void RewardHonorToTeam(uint32 Honor, Team team);
         void RewardReputationToTeam(uint32 faction_id, uint32 Reputation, Team team);
-        void RewardMark(Player *plr,uint32 count);
-        void SendRewardMarkByMail(Player *plr,uint32 mark, uint32 count);
-        void RewardItem(Player *plr, uint32 item_id, uint32 count);
-        void RewardQuestComplete(Player *plr);
-        void RewardSpellCast(Player *plr, uint32 spell_id);
+        void RewardXpToTeam(uint32 Xp, float percentOfLevel, Team TeamID);
+        void RewardMark(Player* plr, uint32 count);
+        void SendRewardMarkByMail(Player* plr, uint32 mark, uint32 count);
+        void RewardItem(Player* plr, uint32 item_id, uint32 count);
+        void RewardQuestComplete(Player* plr);
+        void RewardSpellCast(Player* plr, uint32 spell_id);
         void UpdateWorldState(uint32 Field, uint32 Value);
-        void UpdateWorldStateForPlayer(uint32 Field, uint32 Value, Player *Source);
+        void UpdateWorldStateForPlayer(uint32 Field, uint32 Value, Player* Source);
         virtual void EndBattleGround(Team winner);
-        void BlockMovement(Player *plr);
+        void BlockMovement(Player* plr);
 
         void SendMessageToAll(int32 entry, ChatMsg type, Player const* source = NULL);
         void SendYellToAll(int32 entry, uint32 language, ObjectGuid guid);
-        void PSendMessageToAll(int32 entry, ChatMsg type, Player const* source, ...  );
+        void PSendMessageToAll(int32 entry, ChatMsg type, Player const* source, ...);
+        void SendWarningToAll(int32 entry, ...);
+
+        GameObject* GetBGObject(uint32 type);
 
         // specialized version with 2 string id args
         void SendMessage2ToAll(int32 entry, ChatMsg type, Player const* source, int32 strId1 = 0, int32 strId2 = 0);
         void SendYell2ToAll(int32 entry, uint32 language, ObjectGuid guid, int32 arg1, int32 arg2);
 
         /* Raid Group */
-        Group *GetBgRaid(Team team) const { return m_BgRaids[GetTeamIndexByTeamId(team)]; }
-        void SetBgRaid(Team team, Group *bg_raid);
+        Group* GetBgRaid(Team team);
+        void SetBgRaid(Team team, Group* bg_raid);
 
-        virtual void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
+        virtual void UpdatePlayerScore(Player* Source, uint32 type, uint32 value);
 
-        static BattleGroundTeamIndex GetTeamIndexByTeamId(Team team) { return team == ALLIANCE ? BG_TEAM_ALLIANCE : BG_TEAM_HORDE; }
-        uint32 GetPlayersCountByTeam(Team team) const { return m_PlayersCount[GetTeamIndexByTeamId(team)]; }
+        uint32 GetPlayersCountByTeam(Team team) const { return m_PlayersCount[GetTeamIndex(team)]; }
         uint32 GetAlivePlayersCountByTeam(Team team) const; // used in arenas to correctly handle death in spirit of redemption / last stand etc. (killer = killed) cases
         void UpdatePlayersCountByTeam(Team team, bool remove)
         {
             if (remove)
-                --m_PlayersCount[GetTeamIndexByTeamId(team)];
+                --m_PlayersCount[GetTeamIndex(team)];
             else
-                ++m_PlayersCount[GetTeamIndexByTeamId(team)];
+                ++m_PlayersCount[GetTeamIndex(team)];
         }
 
         // used for rated arena battles
-        void SetArenaTeamIdForTeam(Team team, uint32 ArenaTeamId) { m_ArenaTeamIds[GetTeamIndexByTeamId(team)] = ArenaTeamId; }
-        uint32 GetArenaTeamIdForTeam(Team team) const             { return m_ArenaTeamIds[GetTeamIndexByTeamId(team)]; }
-        void SetArenaTeamRatingChangeForTeam(Team team, int32 RatingChange) { m_ArenaTeamRatingChanges[GetTeamIndexByTeamId(team)] = RatingChange; }
-        int32 GetArenaTeamRatingChangeForTeam(Team team) const    { return m_ArenaTeamRatingChanges[GetTeamIndexByTeamId(team)]; }
+        void SetArenaTeamIdForTeam(Team team, uint32 ArenaTeamId) { m_ArenaTeamIds[GetTeamIndex(team)] = ArenaTeamId; }
+        uint32 GetArenaTeamIdForTeam(Team team) const             { return m_ArenaTeamIds[GetTeamIndex(team)]; }
+        void SetArenaTeamRatingChangeForTeam(Team team, int32 RatingChange) { m_ArenaTeamRatingChanges[GetTeamIndex(team)] = RatingChange; }
+        int32 GetArenaTeamRatingChangeForTeam(Team team) const    { return m_ArenaTeamRatingChanges[GetTeamIndex(team)]; }
         void CheckArenaWinConditions();
 
         /* Triggers handle */
         // must be implemented in BG subclass
         virtual void HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/) {}
         // must be implemented in BG subclass if need AND call base class generic code
-        virtual void HandleKillPlayer(Player *player, Player *killer);
-        virtual void HandleKillUnit(Creature* /*unit*/, Player* /*killer*/) { return; };
+        virtual void HandleKillPlayer(Player* player, Player* killer);
+        virtual void HandleKillUnit(Creature* /*unit*/, Player* /*killer*/) {}
+
+        // Process Capture event
+        virtual bool HandleEvent(uint32 /*eventId*/, GameObject* /*go*/) { return false; }
+
+        // Called when a gameobject is created
+        virtual void HandleGameObjectCreate(GameObject* /*go*/) {}
 
         /* Battleground events */
         virtual void EventPlayerDroppedFlag(Player* /*player*/) {}
@@ -467,15 +488,18 @@ class BattleGround
         void EventPlayerLoggedIn(Player* player, ObjectGuid plr_guid);
         void EventPlayerLoggedOut(Player* player);
 
+        virtual void EventPlayerDamageGO(Player* /*player*/, GameObject* /*target_obj*/, uint32 /*eventId*/, uint32 /*bySpellId*/) {}
+        virtual void EventSpawnGOSA(Player* /*owner*/, Creature* /*obj*/, float /*x*/, float /*y*/, float /*z*/) {}
+
         /* Death related */
         virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
 
-        virtual void AddPlayer(Player *plr);                // must be implemented in BG subclass
+        virtual void AddPlayer(Player* plr);                // must be implemented in BG subclass
 
-        void AddOrSetPlayerToCorrectBgGroup(Player *plr, ObjectGuid plr_guid, Team team);
+        void AddOrSetPlayerToCorrectBgGroup(Player* plr, ObjectGuid plr_guid, Team team);
 
         virtual void RemovePlayerAtLeave(ObjectGuid guid, bool Transport, bool SendPacket);
-                                                            // can be extended in in BG subclass
+        // can be extended in in BG subclass
 
         /* event related */
         // called when a creature gets added to map (NOTE: only triggered if
@@ -497,34 +521,32 @@ class BattleGround
 
         void HandleTriggerBuff(ObjectGuid go_guid);
 
-        // TODO: make this protected:
-        typedef std::vector<ObjectGuid> BGObjects;
-        typedef std::vector<ObjectGuid> BGCreatures;
         // TODO drop m_BGObjects
-        BGObjects m_BgObjects;
+        GuidVector m_BgObjects;
         void SpawnBGObject(ObjectGuid guid, uint32 respawntime);
         bool AddObject(uint32 type, uint32 entry, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime = 0);
         void SpawnBGCreature(ObjectGuid guid, uint32 respawntime);
         bool DelObject(uint32 type);
+        void MakeInteractive(uint8 event1, uint8 event2, bool interactive);
 
         void DoorOpen(ObjectGuid guid);
         void DoorClose(ObjectGuid guid);
 
-        virtual bool HandlePlayerUnderMap(Player * /*plr*/) { return false; }
+        virtual bool HandlePlayerUnderMap(Player* /*plr*/) { return false; }
 
         // since arenas can be AvA or Hvh, we have to get the "temporary" team of a player
         Team GetPlayerTeam(ObjectGuid guid);
-        static Team GetOtherTeam(Team team){ return team ? ((team == ALLIANCE) ? HORDE : ALLIANCE) : TEAM_NONE; }
-        static BattleGroundTeamIndex GetOtherTeamIndex(BattleGroundTeamIndex teamIdx){ return teamIdx == BG_TEAM_ALLIANCE ? BG_TEAM_HORDE : BG_TEAM_ALLIANCE; }
+        static Team GetOtherTeam(Team team) { return team ? ((team == ALLIANCE) ? HORDE : ALLIANCE) : TEAM_NONE; }
+        static TeamIndex GetOtherTeamIndex(TeamIndex teamIdx){ return teamIdx == TEAM_INDEX_ALLIANCE ? TEAM_INDEX_HORDE : TEAM_INDEX_ALLIANCE; }
         bool IsPlayerInBattleGround(ObjectGuid guid);
 
         /* virtual score-array - get's used in bg-subclasses */
-        int32 m_TeamScores[BG_TEAMS_COUNT];
+        int32 m_TeamScores[PVP_TEAM_COUNT];
 
         struct EventObjects
         {
-            BGObjects gameobjects;
-            BGCreatures creatures;
+            GuidVector gameobjects;
+            GuidVector creatures;
         };
 
         // cause we create it dynamicly i use a map - to avoid resizing when
@@ -536,9 +558,10 @@ class BattleGround
         // door-events are automaticly added - but _ALL_ other must be in this vector
         std::map<uint8, uint8> m_ActiveEvents;
 
+        uint32 GetDamageDoneForTeam(Team team);
 
     protected:
-        //this method is called, when BG cannot spawn its own spirit guide, or something is wrong, It correctly ends BattleGround
+        // this method is called, when BG cannot spawn its own spirit guide, or something is wrong, It correctly ends BattleGround
         void EndNow();
         void PlayerAddedToBGCheckIfBGIsRunning(Player* plr);
 
@@ -546,7 +569,7 @@ class BattleGround
 
         BattleGroundScoreMap m_PlayerScores;                // Player scores
         // must be implemented in BG subclass
-        virtual void RemovePlayer(Player * /*player*/, ObjectGuid /*guid*/) {}
+        virtual void RemovePlayer(Player* /*player*/, ObjectGuid /*guid*/) {}
 
         /* Player lists, those need to be accessible by inherited classes */
         BattleGroundPlayerMap  m_Players;
@@ -556,16 +579,17 @@ class BattleGround
         */
         uint8 m_Events;
         BattleGroundStartTimeIntervals  m_StartDelayTimes[BG_STARTING_EVENT_COUNT];
-        //this must be filled in constructors!
+        // this must be filled in constructors!
         uint32 m_StartMessageIds[BG_STARTING_EVENT_COUNT];
 
-        bool   m_BuffChange;
+        bool   m_IsRandom;
 
     private:
         /* Battleground */
         BattleGroundTypeId m_TypeID;
+        BattleGroundTypeId m_RandomTypeID;
         BattleGroundStatus m_Status;
-        uint32 m_ClientInstanceID;                          //the instance-id which is sent to the client and without any other internal use
+        uint32 m_ClientInstanceID;                          // the instance-id which is sent to the client and without any other internal use
         uint32 m_StartTime;
         bool m_ArenaBuffSpawned;                            // to cache if arenabuff event is started (cause bool is faster than checking IsActiveEvent)
         int32 m_EndTime;                                    // it is set to 120000 when bg is ending and it decreases itself
@@ -578,7 +602,8 @@ class BattleGround
         bool   m_IsRated;                                   // is this battle rated?
         bool   m_PrematureCountDown;
         uint32 m_PrematureCountDownTimer;
-        char const *m_Name;
+        bool   m_ArenaEnded;
+        char const* m_Name;
 
         /* Player lists */
         typedef std::deque<ObjectGuid> OfflineQueue;
@@ -591,15 +616,15 @@ class BattleGround
         uint32 m_InvitedHorde;
 
         /* Raid Group */
-        Group *m_BgRaids[BG_TEAMS_COUNT];                                // 0 - alliance, 1 - horde
+        ObjectGuid m_BgRaids[PVP_TEAM_COUNT];                   // 0 - alliance, 1 - horde
 
         /* Players count by team */
-        uint32 m_PlayersCount[BG_TEAMS_COUNT];
+        uint32 m_PlayersCount[PVP_TEAM_COUNT];
 
         /* Arena team ids by team */
-        uint32 m_ArenaTeamIds[BG_TEAMS_COUNT];
+        uint32 m_ArenaTeamIds[PVP_TEAM_COUNT];
 
-        int32 m_ArenaTeamRatingChanges[BG_TEAMS_COUNT];
+        int32 m_ArenaTeamRatingChanges[PVP_TEAM_COUNT];
 
         /* Limits */
         uint32 m_LevelMin;
@@ -612,48 +637,10 @@ class BattleGround
         /* Start location */
         uint32 m_MapId;
         BattleGroundMap* m_Map;
-        float m_TeamStartLocX[BG_TEAMS_COUNT];
-        float m_TeamStartLocY[BG_TEAMS_COUNT];
-        float m_TeamStartLocZ[BG_TEAMS_COUNT];
-        float m_TeamStartLocO[BG_TEAMS_COUNT];
-};
-
-// helper functions for world state list fill
-inline void FillInitialWorldState(ByteBuffer& data, uint32& count, uint32 state, uint32 value)
-{
-    data << uint32(state);
-    data << uint32(value);
-    ++count;
-}
-
-inline void FillInitialWorldState(ByteBuffer& data, uint32& count, uint32 state, int32 value)
-{
-    data << uint32(state);
-    data << int32(value);
-    ++count;
-}
-
-inline void FillInitialWorldState(ByteBuffer& data, uint32& count, uint32 state, bool value)
-{
-    data << uint32(state);
-    data << uint32(value?1:0);
-    ++count;
-}
-
-struct WorldStatePair
-{
-    uint32 state;
-    uint32 value;
+        float m_TeamStartLocX[PVP_TEAM_COUNT];
+        float m_TeamStartLocY[PVP_TEAM_COUNT];
+        float m_TeamStartLocZ[PVP_TEAM_COUNT];
+        float m_TeamStartLocO[PVP_TEAM_COUNT];
 };
 
-inline void FillInitialWorldState(ByteBuffer& data, uint32& count, WorldStatePair const* array)
-{
-    for(WorldStatePair const* itr = array; itr->state; ++itr)
-    {
-        data << uint32(itr->state);
-        data << uint32(itr->value);
-        ++count;
-    }
-}
-
 #endif
diff --git a/src/game/BattleGroundAA.cpp b/src/game/BattleGround/BattleGroundAA.cpp
similarity index 87%
rename from src/game/BattleGroundAA.cpp
rename to src/game/BattleGround/BattleGroundAA.cpp
index c6630fa9245..a00039fa7b7 100644
--- a/src/game/BattleGroundAA.cpp
+++ b/src/game/BattleGround/BattleGroundAA.cpp
@@ -28,7 +28,7 @@ BattleGroundAA::BattleGroundAA()
     m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
     m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
     m_StartDelayTimes[BG_STARTING_EVENT_FOURTH] = BG_START_DELAY_NONE;
-    //we must set messageIds
+    // we must set messageIds
     m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_ARENA_ONE_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_ARENA_THIRTY_SECONDS;
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
@@ -53,16 +53,16 @@ void BattleGroundAA::StartingEventOpenDoors()
 {
 }
 
-void BattleGroundAA::AddPlayer(Player *plr)
+void BattleGroundAA::AddPlayer(Player* plr)
 {
     BattleGround::AddPlayer(plr);
-    //create score and add it to map, default values are set in constructor
+    // create score and add it to map, default values are set in constructor
     BattleGroundAAScore* sc = new BattleGroundAAScore;
 
     m_PlayerScores[plr->GetObjectGuid()] = sc;
 }
 
-void BattleGroundAA::RemovePlayer(Player * /*plr*/, ObjectGuid /*guid*/)
+void BattleGroundAA::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
 {
 }
 
@@ -71,7 +71,7 @@ void BattleGroundAA::HandleKillPlayer(Player* player, Player* killer)
     BattleGround::HandleKillPlayer(player, killer);
 }
 
-void BattleGroundAA::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
+void BattleGroundAA::HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/)
 {
 }
 
diff --git a/src/game/BattleGroundAA.h b/src/game/BattleGround/BattleGroundAA.h
similarity index 82%
rename from src/game/BattleGroundAA.h
rename to src/game/BattleGround/BattleGroundAA.h
index cd5ee902da0..0627f03329b 100644
--- a/src/game/BattleGroundAA.h
+++ b/src/game/BattleGround/BattleGroundAA.h
@@ -25,12 +25,12 @@ class BattleGroundAAScore : public BattleGroundScore
     public:
         BattleGroundAAScore() {};
         virtual ~BattleGroundAAScore() {};
-        //TODO fix me
+        // TODO fix me
 };
 
 class BattleGroundAA : public BattleGround
 {
-    friend class BattleGroundMgr;
+        friend class BattleGroundMgr;
 
     public:
         BattleGroundAA();
@@ -38,13 +38,13 @@ class BattleGroundAA : public BattleGround
         void Update(uint32 diff);
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
+        virtual void AddPlayer(Player* plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
 
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
+        void RemovePlayer(Player* plr, ObjectGuid guid);
+        void HandleAreaTrigger(Player* Source, uint32 Trigger);
         bool SetupBattleGround();
-        void HandleKillPlayer(Player* player, Player *killer);
+        void HandleKillPlayer(Player* player, Player* killer);
 };
 #endif
diff --git a/src/game/BattleGround/BattleGroundAB.cpp b/src/game/BattleGround/BattleGroundAB.cpp
new file mode 100644
index 00000000000..14828974ff0
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundAB.cpp
@@ -0,0 +1,563 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Object.h"
+#include "Player.h"
+#include "BattleGround.h"
+#include "BattleGroundAB.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "BattleGroundMgr.h"
+#include "Language.h"
+#include "Util.h"
+#include "WorldPacket.h"
+#include "MapManager.h"
+#include "DBCStores.h"                                   // TODO REMOVE this when graveyard handling for pvp is updated
+
+BattleGroundAB::BattleGroundAB()
+{
+    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
+    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_AB_START_ONE_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_AB_START_HALF_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_AB_HAS_BEGUN;
+}
+
+BattleGroundAB::~BattleGroundAB()
+{
+}
+
+void BattleGroundAB::Update(uint32 diff)
+{
+    BattleGround::Update(diff);
+
+    if (GetStatus() == STATUS_IN_PROGRESS)
+    {
+        int team_points[PVP_TEAM_COUNT] = { 0, 0 };
+
+        for (uint8 node = 0; node < BG_AB_NODES_MAX; ++node)
+        {
+            // 3 sec delay to spawn new banner instead previous despawned one
+            if (m_BannerTimers[node].timer)
+            {
+                if (m_BannerTimers[node].timer > diff)
+                    m_BannerTimers[node].timer -= diff;
+                else
+                {
+                    m_BannerTimers[node].timer = 0;
+                    _CreateBanner(node, m_BannerTimers[node].type, m_BannerTimers[node].teamIndex, false);
+                }
+            }
+
+            // 1-minute to occupy a node from contested state
+            if (m_NodeTimers[node])
+            {
+                if (m_NodeTimers[node] > diff)
+                    m_NodeTimers[node] -= diff;
+                else
+                {
+                    m_NodeTimers[node] = 0;
+                    // Change from contested to occupied !
+                    uint8 teamIndex = m_Nodes[node] - 1;
+                    m_prevNodes[node] = m_Nodes[node];
+                    m_Nodes[node] += 2;
+                    // create new occupied banner
+                    _CreateBanner(node, BG_AB_NODE_TYPE_OCCUPIED, teamIndex, true);
+                    _SendNodeUpdate(node);
+                    _NodeOccupied(node, (teamIndex == 0) ? ALLIANCE : HORDE);
+                    // Message to chatlog
+
+                    if (teamIndex == 0)
+                    {
+                        SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL, LANG_BG_ALLY, _GetNodeNameId(node));
+                        PlaySoundToAll(BG_AB_SOUND_NODE_CAPTURED_ALLIANCE);
+                    }
+                    else
+                    {
+                        SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN, CHAT_MSG_BG_SYSTEM_HORDE, NULL, LANG_BG_HORDE, _GetNodeNameId(node));
+                        PlaySoundToAll(BG_AB_SOUND_NODE_CAPTURED_HORDE);
+                    }
+                }
+            }
+
+            for (uint8 team = 0; team < PVP_TEAM_COUNT; ++team)
+                if (m_Nodes[node] == team + BG_AB_NODE_TYPE_OCCUPIED)
+                    ++team_points[team];
+        }
+
+        // Accumulate points
+        for (uint8 team = 0; team < PVP_TEAM_COUNT; ++team)
+        {
+            int points = team_points[team];
+            if (!points)
+                continue;
+            m_lastTick[team] += diff;
+            if (m_lastTick[team] > BG_AB_TickIntervals[points])
+            {
+                m_lastTick[team] -= BG_AB_TickIntervals[points];
+                m_TeamScores[team] += BG_AB_TickPoints[points];
+                m_honorScoreTicks[team] += BG_AB_TickPoints[points];
+                m_ReputationScoreTicks[team] += BG_AB_TickPoints[points];
+                if (m_ReputationScoreTicks[team] >= m_ReputationTicks)
+                {
+                    (team == TEAM_INDEX_ALLIANCE) ? RewardReputationToTeam(509, 10, ALLIANCE) : RewardReputationToTeam(510, 10, HORDE);
+                    m_ReputationScoreTicks[team] -= m_ReputationTicks;
+                }
+                if (m_honorScoreTicks[team] >= m_honorTicks)
+                {
+                    RewardHonorToTeam(GetBonusHonorFromKill(1), (team == TEAM_INDEX_ALLIANCE) ? ALLIANCE : HORDE);
+                    m_honorScoreTicks[team] -= m_honorTicks;
+                }
+                if (!m_IsInformedNearVictory && m_TeamScores[team] > BG_AB_WARNING_NEAR_VICTORY_SCORE)
+                {
+                    if (team == TEAM_INDEX_ALLIANCE)
+                        SendMessageToAll(LANG_BG_AB_A_NEAR_VICTORY, CHAT_MSG_BG_SYSTEM_NEUTRAL);
+                    else
+                        SendMessageToAll(LANG_BG_AB_H_NEAR_VICTORY, CHAT_MSG_BG_SYSTEM_NEUTRAL);
+                    PlaySoundToAll(BG_AB_SOUND_NEAR_VICTORY);
+                    m_IsInformedNearVictory = true;
+                }
+
+                if (m_TeamScores[team] > BG_AB_MAX_TEAM_SCORE)
+                    m_TeamScores[team] = BG_AB_MAX_TEAM_SCORE;
+                if (team == TEAM_INDEX_ALLIANCE)
+                    UpdateWorldState(BG_AB_OP_RESOURCES_ALLY, m_TeamScores[team]);
+                if (team == TEAM_INDEX_HORDE)
+                    UpdateWorldState(BG_AB_OP_RESOURCES_HORDE, m_TeamScores[team]);
+
+                // update achievement flags
+                // we increased m_TeamScores[team] so we just need to check if it is 500 more than other teams resources
+                // horde will be a bit disadvantaged, but we can assume that points aren't updated for both team in same Update() call
+                uint8 otherTeam = (team + 1) % PVP_TEAM_COUNT;
+                if (m_TeamScores[team] > m_TeamScores[otherTeam] + 500)
+                    m_TeamScores500Disadvantage[otherTeam] = true;
+            }
+        }
+
+        // Test win condition
+        if (m_TeamScores[TEAM_INDEX_ALLIANCE] >= BG_AB_MAX_TEAM_SCORE)
+            EndBattleGround(ALLIANCE);
+        if (m_TeamScores[TEAM_INDEX_HORDE] >= BG_AB_MAX_TEAM_SCORE)
+            EndBattleGround(HORDE);
+    }
+}
+
+void BattleGroundAB::StartingEventCloseDoors()
+{
+}
+
+void BattleGroundAB::StartingEventOpenDoors()
+{
+    OpenDoorEvent(BG_EVENT_DOOR);
+
+    // Players that join battleground after start are not eligible to get achievement.
+    StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, AB_EVENT_START_BATTLE);
+}
+
+void BattleGroundAB::AddPlayer(Player* plr)
+{
+    BattleGround::AddPlayer(plr);
+    // create score and add it to map, default values are set in the constructor
+    BattleGroundABScore* sc = new BattleGroundABScore;
+
+    m_PlayerScores[plr->GetObjectGuid()] = sc;
+}
+
+void BattleGroundAB::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
+{
+
+}
+
+void BattleGroundAB::HandleAreaTrigger(Player* source, uint32 trigger)
+{
+    switch (trigger)
+    {
+        case 3948:                                          // Arathi Basin Alliance Exit.
+            if (source->GetTeam() != ALLIANCE)
+                source->GetSession()->SendNotification(LANG_BATTLEGROUND_ONLY_ALLIANCE_USE);
+            else
+                source->LeaveBattleground();
+            break;
+        case 3949:                                          // Arathi Basin Horde Exit.
+            if (source->GetTeam() != HORDE)
+                source->GetSession()->SendNotification(LANG_BATTLEGROUND_ONLY_HORDE_USE);
+            else
+                source->LeaveBattleground();
+            break;
+        case 3866:                                          // Stables
+        case 3869:                                          // Gold Mine
+        case 3867:                                          // Farm
+        case 3868:                                          // Lumber Mill
+        case 3870:                                          // Black Smith
+        case 4020:                                          // Unk1
+        case 4021:                                          // Unk2
+            // break;
+        default:
+            // sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", trigger);
+            // source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", trigger);
+            break;
+    }
+}
+
+/*  type: 0-neutral, 1-contested, 3-occupied
+    teamIndex: 0-ally, 1-horde                        */
+void BattleGroundAB::_CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay)
+{
+    // Just put it into the queue
+    if (delay)
+    {
+        m_BannerTimers[node].timer = 2000;
+        m_BannerTimers[node].type = type;
+        m_BannerTimers[node].teamIndex = teamIndex;
+        return;
+    }
+
+    // cause the node-type is in the generic form
+    // please see in the headerfile for the ids
+    if (type != BG_AB_NODE_TYPE_NEUTRAL)
+        type += teamIndex;
+
+    SpawnEvent(node, type, true);                           // will automaticly despawn other events
+}
+
+int32 BattleGroundAB::_GetNodeNameId(uint8 node)
+{
+    switch (node)
+    {
+        case BG_AB_NODE_STABLES:    return LANG_BG_AB_NODE_STABLES;
+        case BG_AB_NODE_BLACKSMITH: return LANG_BG_AB_NODE_BLACKSMITH;
+        case BG_AB_NODE_FARM:       return LANG_BG_AB_NODE_FARM;
+        case BG_AB_NODE_LUMBER_MILL: return LANG_BG_AB_NODE_LUMBER_MILL;
+        case BG_AB_NODE_GOLD_MINE:  return LANG_BG_AB_NODE_GOLD_MINE;
+        default:
+            MANGOS_ASSERT(0);
+            break;
+    }
+    return 0;
+}
+
+void BattleGroundAB::FillInitialWorldStates()
+{
+    const uint8 plusArray[] = {0, 2, 3, 0, 1};
+
+    // Node icons
+    for (uint8 node = 0; node < BG_AB_NODES_MAX; ++node)
+        FillInitialWorldState(BG_AB_OP_NODEICONS[node], m_Nodes[node] == 0);
+
+    // Node occupied states
+    for (uint8 node = 0; node < BG_AB_NODES_MAX; ++node)
+        for (uint8 i = 1; i < BG_AB_NODES_MAX; ++i)
+            FillInitialWorldState(BG_AB_OP_NODESTATES[node] + plusArray[i], m_Nodes[node] == i);
+
+    // How many bases each team owns
+    uint8 ally = 0, horde = 0;
+    for (uint8 node = 0; node < BG_AB_NODES_MAX; ++node)
+        if (m_Nodes[node] == BG_AB_NODE_STATUS_ALLY_OCCUPIED)
+            ++ally;
+        else if (m_Nodes[node] == BG_AB_NODE_STATUS_HORDE_OCCUPIED)
+            ++horde;
+
+    FillInitialWorldState(BG_AB_OP_OCCUPIED_BASES_ALLY, ally);
+    FillInitialWorldState(BG_AB_OP_OCCUPIED_BASES_HORDE, horde);
+
+    // Team scores
+    FillInitialWorldState(BG_AB_OP_RESOURCES_MAX,      BG_AB_MAX_TEAM_SCORE);
+    FillInitialWorldState(BG_AB_OP_RESOURCES_WARNING,  BG_AB_WARNING_NEAR_VICTORY_SCORE);
+    FillInitialWorldState(BG_AB_OP_RESOURCES_ALLY,     m_TeamScores[TEAM_INDEX_ALLIANCE]);
+    FillInitialWorldState(BG_AB_OP_RESOURCES_HORDE,    m_TeamScores[TEAM_INDEX_HORDE]);
+
+    // other unknown
+    FillInitialWorldState(0x745, 0x2);         // 37 1861 unk
+}
+
+void BattleGroundAB::_SendNodeUpdate(uint8 node)
+{
+    // Send node owner state update to refresh map icons on client
+    const uint8 plusArray[] = {0, 2, 3, 0, 1};
+
+    if (m_prevNodes[node])
+        UpdateWorldState(BG_AB_OP_NODESTATES[node] + plusArray[m_prevNodes[node]], WORLD_STATE_REMOVE);
+    else
+        UpdateWorldState(BG_AB_OP_NODEICONS[node], WORLD_STATE_REMOVE);
+
+    UpdateWorldState(BG_AB_OP_NODESTATES[node] + plusArray[m_Nodes[node]], WORLD_STATE_ADD);
+
+    // How many bases each team owns
+    uint8 ally = 0, horde = 0;
+    for (uint8 i = 0; i < BG_AB_NODES_MAX; ++i)
+        if (m_Nodes[i] == BG_AB_NODE_STATUS_ALLY_OCCUPIED)
+            ++ally;
+        else if (m_Nodes[i] == BG_AB_NODE_STATUS_HORDE_OCCUPIED)
+            ++horde;
+
+    UpdateWorldState(BG_AB_OP_OCCUPIED_BASES_ALLY, ally);
+    UpdateWorldState(BG_AB_OP_OCCUPIED_BASES_HORDE, horde);
+}
+
+void BattleGroundAB::_NodeOccupied(uint8 node, Team team)
+{
+    uint8 capturedNodes = 0;
+    for (uint8 i = 0; i < BG_AB_NODES_MAX; ++i)
+    {
+        if (m_Nodes[node] == GetTeamIndex(team) + BG_AB_NODE_TYPE_OCCUPIED && !m_NodeTimers[i])
+            ++capturedNodes;
+    }
+    if (capturedNodes >= 5)
+        CastSpellOnTeam(SPELL_AB_QUEST_REWARD_5_BASES, team);
+    if (capturedNodes >= 4)
+        CastSpellOnTeam(SPELL_AB_QUEST_REWARD_4_BASES, team);
+}
+
+/* Invoked if a player used a banner as a gameobject */
+void BattleGroundAB::EventPlayerClickedOnFlag(Player* source, GameObject* target_obj)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    uint8 event = (sBattleGroundMgr.GetGameObjectEventIndex(target_obj->GetGUIDLow())).event1;
+    if (event >= BG_AB_NODES_MAX)                           // not a node
+        return;
+    BG_AB_Nodes node = BG_AB_Nodes(event);
+
+    TeamIndex teamIndex = GetTeamIndex(source->GetTeam());
+
+    // Check if player really could use this banner, not cheated
+    if (!(m_Nodes[node] == 0 || teamIndex == m_Nodes[node] % 2))
+        return;
+
+    source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
+    uint32 sound = 0;
+
+    // TODO in the following code we should restructure a bit to avoid
+    // duplication (or maybe write functions?)
+    // If node is neutral, change to contested
+    if (m_Nodes[node] == BG_AB_NODE_TYPE_NEUTRAL)
+    {
+        UpdatePlayerScore(source, SCORE_BASES_ASSAULTED, 1);
+        source->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, 1, 122);
+
+        m_prevNodes[node] = m_Nodes[node];
+        m_Nodes[node] = teamIndex + 1;
+        // create new contested banner
+        _CreateBanner(node, BG_AB_NODE_TYPE_CONTESTED, teamIndex, true);
+        _SendNodeUpdate(node);
+        m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
+
+        if (teamIndex == 0)
+            SendMessage2ToAll(LANG_BG_AB_NODE_CLAIMED, CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node), LANG_BG_ALLY);
+        else
+            SendMessage2ToAll(LANG_BG_AB_NODE_CLAIMED, CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node), LANG_BG_HORDE);
+
+        sound = BG_AB_SOUND_NODE_CLAIMED;
+    }
+    // If node is contested
+    else if ((m_Nodes[node] == BG_AB_NODE_STATUS_ALLY_CONTESTED) || (m_Nodes[node] == BG_AB_NODE_STATUS_HORDE_CONTESTED))
+    {
+        // If last state is NOT occupied, change node to enemy-contested
+        if (m_prevNodes[node] < BG_AB_NODE_TYPE_OCCUPIED)
+        {
+            UpdatePlayerScore(source, SCORE_BASES_ASSAULTED, 1);
+            m_prevNodes[node] = m_Nodes[node];
+            m_Nodes[node] = teamIndex + BG_AB_NODE_TYPE_CONTESTED;
+            // create new contested banner
+            _CreateBanner(node, BG_AB_NODE_TYPE_CONTESTED, teamIndex, true);
+            _SendNodeUpdate(node);
+            m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
+
+            if (teamIndex == TEAM_INDEX_ALLIANCE)
+                SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED, CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
+            else
+                SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED, CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node));
+        }
+        // If contested, change back to occupied
+        else
+        {
+            UpdatePlayerScore(source, SCORE_BASES_DEFENDED, 1);
+            source->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, 1, 123);
+
+            m_prevNodes[node] = m_Nodes[node];
+            m_Nodes[node] = teamIndex + BG_AB_NODE_TYPE_OCCUPIED;
+            // create new occupied banner
+            _CreateBanner(node, BG_AB_NODE_TYPE_OCCUPIED, teamIndex, true);
+            _SendNodeUpdate(node);
+            m_NodeTimers[node] = 0;
+            _NodeOccupied(node, (teamIndex == TEAM_INDEX_ALLIANCE) ? ALLIANCE : HORDE);
+
+            if (teamIndex == TEAM_INDEX_ALLIANCE)
+                SendMessage2ToAll(LANG_BG_AB_NODE_DEFENDED, CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
+            else
+                SendMessage2ToAll(LANG_BG_AB_NODE_DEFENDED, CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node));
+        }
+        sound = (teamIndex == TEAM_INDEX_ALLIANCE) ? BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE : BG_AB_SOUND_NODE_ASSAULTED_HORDE;
+    }
+    // If node is occupied, change to enemy-contested
+    else
+    {
+        UpdatePlayerScore(source, SCORE_BASES_ASSAULTED, 1);
+        source->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, 1, 122);
+
+        m_prevNodes[node] = m_Nodes[node];
+        m_Nodes[node] = teamIndex + BG_AB_NODE_TYPE_CONTESTED;
+        // create new contested banner
+        _CreateBanner(node, BG_AB_NODE_TYPE_CONTESTED, teamIndex, true);
+        _SendNodeUpdate(node);
+        m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
+
+        if (teamIndex == TEAM_INDEX_ALLIANCE)
+            SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED, CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
+        else
+            SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED, CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node));
+
+        sound = (teamIndex == TEAM_INDEX_ALLIANCE) ? BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE : BG_AB_SOUND_NODE_ASSAULTED_HORDE;
+    }
+
+    // If node is occupied again, send "X has taken the Y" msg.
+    if (m_Nodes[node] >= BG_AB_NODE_TYPE_OCCUPIED)
+    {
+        if (teamIndex == TEAM_INDEX_ALLIANCE)
+            SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL, LANG_BG_ALLY, _GetNodeNameId(node));
+        else
+            SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN, CHAT_MSG_BG_SYSTEM_HORDE, NULL, LANG_BG_HORDE, _GetNodeNameId(node));
+    }
+    PlaySoundToAll(sound);
+}
+
+bool BattleGroundAB::SetupBattleGround()
+{
+    return true;
+}
+
+void BattleGroundAB::Reset()
+{
+    // call parent's class reset
+    BattleGround::Reset();
+
+    for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
+    {
+        m_TeamScores[i] = 0;
+        m_lastTick[i] = 0;
+        m_honorScoreTicks[i] = 0;
+        m_ReputationScoreTicks[i] = 0;
+        m_TeamScores500Disadvantage[i] = false;
+    }
+
+    m_IsInformedNearVictory = false;
+    bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID());
+    m_honorTicks = isBGWeekend ? AB_WEEKEND_HONOR_INTERVAL : AB_NORMAL_HONOR_INTERVAL;
+    m_ReputationTicks = isBGWeekend ? AB_WEEKEND_REPUTATION_INTERVAL : AB_NORMAL_REPUTATION_INTERVAL;
+
+    for (uint8 i = 0; i < BG_AB_NODES_MAX; ++i)
+    {
+        m_Nodes[i] = 0;
+        m_prevNodes[i] = 0;
+        m_NodeTimers[i] = 0;
+        m_BannerTimers[i].timer = 0;
+
+        // all nodes owned by neutral team at beginning
+        m_ActiveEvents[i] = BG_AB_NODE_TYPE_NEUTRAL;
+    }
+
+}
+
+void BattleGroundAB::EndBattleGround(Team winner)
+{
+    // win reward
+    if (winner == ALLIANCE)
+        RewardHonorToTeam(GetBonusHonorFromKill(1), ALLIANCE);
+    if (winner == HORDE)
+        RewardHonorToTeam(GetBonusHonorFromKill(1), HORDE);
+    // complete map_end rewards (even if no team wins)
+    RewardHonorToTeam(GetBonusHonorFromKill(1), HORDE);
+    RewardHonorToTeam(GetBonusHonorFromKill(1), ALLIANCE);
+
+    BattleGround::EndBattleGround(winner);
+}
+
+WorldSafeLocsEntry const* BattleGroundAB::GetClosestGraveYard(Player* player)
+{
+    TeamIndex teamIndex = GetTeamIndex(player->GetTeam());
+
+    // Is there any occupied node for this team?
+    std::vector<uint8> nodes;
+    for (uint8 i = 0; i < BG_AB_NODES_MAX; ++i)
+        if (m_Nodes[i] == teamIndex + 3)
+            nodes.push_back(i);
+
+    WorldSafeLocsEntry const* good_entry = NULL;
+    // If so, select the closest node to place ghost on
+    if (!nodes.empty())
+    {
+        float plr_x = player->GetPositionX();
+        float plr_y = player->GetPositionY();
+
+        float mindist = 999999.0f;
+        for (uint8 i = 0; i < nodes.size(); ++i)
+        {
+            WorldSafeLocsEntry const* entry = sWorldSafeLocsStore.LookupEntry(BG_AB_GraveyardIds[nodes[i]]);
+            if (!entry)
+                continue;
+            float dist = (entry->x - plr_x) * (entry->x - plr_x) + (entry->y - plr_y) * (entry->y - plr_y);
+            if (mindist > dist)
+            {
+                mindist = dist;
+                good_entry = entry;
+            }
+        }
+        nodes.clear();
+    }
+    // If not, place ghost on starting location
+    if (!good_entry)
+        good_entry = sWorldSafeLocsStore.LookupEntry(BG_AB_GraveyardIds[teamIndex + 5]);
+
+    return good_entry;
+}
+
+void BattleGroundAB::UpdatePlayerScore(Player* source, uint32 type, uint32 value)
+{
+    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(source->GetObjectGuid());
+    if (itr == m_PlayerScores.end())                        // player not found...
+        return;
+
+    uint32 achCriId;
+
+    switch (type)
+    {
+        case SCORE_BASES_ASSAULTED:
+            ((BattleGroundABScore*)itr->second)->BasesAssaulted += value;
+            achCriId = AB_OBJECTIVE_ASSAULT_BASE;
+            break;
+        case SCORE_BASES_DEFENDED:
+            ((BattleGroundABScore*)itr->second)->BasesDefended += value;
+            achCriId = AB_OBJECTIVE_DEFEND_BASE;
+            break;
+        default:
+            BattleGround::UpdatePlayerScore(source, type, value);
+            return;
+    }
+
+    source->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, 1, achCriId);
+}
+
+bool BattleGroundAB::IsAllNodesControlledByTeam(Team team) const
+{
+    for (uint8 i = 0; i < BG_AB_NODES_MAX; ++i)
+        if ((team == ALLIANCE && m_Nodes[i] != BG_AB_NODE_STATUS_ALLY_OCCUPIED) ||
+                (team == HORDE && m_Nodes[i] != BG_AB_NODE_STATUS_HORDE_OCCUPIED))
+            return false;
+
+    return true;
+}
diff --git a/src/game/BattleGround/BattleGroundAB.h b/src/game/BattleGround/BattleGroundAB.h
new file mode 100644
index 00000000000..b38cbe4a8f9
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundAB.h
@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __BATTLEGROUNDAB_H
+#define __BATTLEGROUNDAB_H
+
+#include "Common.h"
+#include "BattleGround.h"
+
+enum BG_AB_WorldStates
+{
+    BG_AB_OP_OCCUPIED_BASES_HORDE       = 1778,
+    BG_AB_OP_OCCUPIED_BASES_ALLY        = 1779,
+    BG_AB_OP_RESOURCES_ALLY             = 1776,
+    BG_AB_OP_RESOURCES_HORDE            = 1777,
+    BG_AB_OP_RESOURCES_MAX              = 1780,
+    BG_AB_OP_RESOURCES_WARNING          = 1955
+            /*
+                BG_AB_OP_STABLE_ICON                = 1842, // Stable map icon (NONE)
+                BG_AB_OP_STABLE_STATE_ALIENCE       = 1767, // Stable map state (ALIENCE)
+                BG_AB_OP_STABLE_STATE_HORDE         = 1768, // Stable map state (HORDE)
+                BG_AB_OP_STABLE_STATE_CON_ALI       = 1769, // Stable map state (CON ALIENCE)
+                BG_AB_OP_STABLE_STATE_CON_HOR       = 1770, // Stable map state (CON HORDE)
+                BG_AB_OP_FARM_ICON                  = 1845, // Farm map icon (NONE)
+                BG_AB_OP_FARM_STATE_ALIENCE         = 1772, // Farm state (ALIENCE)
+                BG_AB_OP_FARM_STATE_HORDE           = 1773, // Farm state (HORDE)
+                BG_AB_OP_FARM_STATE_CON_ALI         = 1774, // Farm state (CON ALIENCE)
+                BG_AB_OP_FARM_STATE_CON_HOR         = 1775, // Farm state (CON HORDE)
+
+                BG_AB_OP_BLACKSMITH_ICON            = 1846, // Blacksmith map icon (NONE)
+                BG_AB_OP_BLACKSMITH_STATE_ALIENCE   = 1782, // Blacksmith map state (ALIENCE)
+                BG_AB_OP_BLACKSMITH_STATE_HORDE     = 1783, // Blacksmith map state (HORDE)
+                BG_AB_OP_BLACKSMITH_STATE_CON_ALI   = 1784, // Blacksmith map state (CON ALIENCE)
+                BG_AB_OP_BLACKSMITH_STATE_CON_HOR   = 1785, // Blacksmith map state (CON HORDE)
+                BG_AB_OP_LUMBERMILL_ICON            = 1844, // Lumber Mill map icon (NONE)
+                BG_AB_OP_LUMBERMILL_STATE_ALIENCE   = 1792, // Lumber Mill map state (ALIENCE)
+                BG_AB_OP_LUMBERMILL_STATE_HORDE     = 1793, // Lumber Mill map state (HORDE)
+                BG_AB_OP_LUMBERMILL_STATE_CON_ALI   = 1794, // Lumber Mill map state (CON ALIENCE)
+                BG_AB_OP_LUMBERMILL_STATE_CON_HOR   = 1795, // Lumber Mill map state (CON HORDE)
+                BG_AB_OP_GOLDMINE_ICON              = 1843, // Gold Mine map icon (NONE)
+                BG_AB_OP_GOLDMINE_STATE_ALIENCE     = 1787, // Gold Mine map state (ALIENCE)
+                BG_AB_OP_GOLDMINE_STATE_HORDE       = 1788, // Gold Mine map state (HORDE)
+                BG_AB_OP_GOLDMINE_STATE_CON_ALI     = 1789, // Gold Mine map state (CON ALIENCE
+                BG_AB_OP_GOLDMINE_STATE_CON_HOR     = 1790, // Gold Mine map state (CON HORDE)
+            */
+};
+
+const uint32 BG_AB_OP_NODESTATES[5] =    {1767, 1782, 1772, 1792, 1787};
+
+const uint32 BG_AB_OP_NODEICONS[5]  =    {1842, 1846, 1845, 1844, 1843};
+
+/* node events */
+// node-events are just event1=BG_AB_Nodes, event2=BG_AB_NodeStatus
+// so we don't need to define the constants here :)
+
+enum BG_AB_Timers
+{
+    BG_AB_FLAG_CAPTURING_TIME           = 60000,
+};
+
+enum BG_AB_Score
+{
+    BG_AB_WARNING_NEAR_VICTORY_SCORE    = 1400,
+    BG_AB_MAX_TEAM_SCORE                = 1600
+};
+
+/* do NOT change the order, else wrong behaviour */
+enum BG_AB_Nodes
+{
+    BG_AB_NODE_STABLES          = 0,
+    BG_AB_NODE_BLACKSMITH       = 1,
+    BG_AB_NODE_FARM             = 2,
+    BG_AB_NODE_LUMBER_MILL      = 3,
+    BG_AB_NODE_GOLD_MINE        = 4,
+    BG_AB_NODES_ERROR           = 255
+};
+
+#define BG_AB_NODES_MAX   5
+#define BG_AB_EVENT_START_BATTLE 9158
+
+enum BG_AB_NodeStatus
+{
+    BG_AB_NODE_TYPE_NEUTRAL             = 0,
+    BG_AB_NODE_TYPE_CONTESTED           = 1,
+    BG_AB_NODE_STATUS_ALLY_CONTESTED    = 1,
+    BG_AB_NODE_STATUS_HORDE_CONTESTED   = 2,
+    BG_AB_NODE_TYPE_OCCUPIED            = 3,
+    BG_AB_NODE_STATUS_ALLY_OCCUPIED     = 3,
+    BG_AB_NODE_STATUS_HORDE_OCCUPIED    = 4
+};
+
+enum BG_AB_Sounds
+{
+    BG_AB_SOUND_NODE_CLAIMED            = 8192,
+    BG_AB_SOUND_NODE_CAPTURED_ALLIANCE  = 8173,
+    BG_AB_SOUND_NODE_CAPTURED_HORDE     = 8213,
+    BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE = 8212,
+    BG_AB_SOUND_NODE_ASSAULTED_HORDE    = 8174,
+    BG_AB_SOUND_NEAR_VICTORY            = 8456
+};
+
+enum BG_AB_Objectives
+{
+    AB_OBJECTIVE_ASSAULT_BASE = 122,
+    AB_OBJECTIVE_DEFEND_BASE  = 123
+};
+
+#define AB_NORMAL_HONOR_INTERVAL        260
+#define AB_WEEKEND_HONOR_INTERVAL       160
+#define AB_NORMAL_REPUTATION_INTERVAL   160
+#define AB_WEEKEND_REPUTATION_INTERVAL  120
+#define AB_EVENT_START_BATTLE           9158
+
+// Tick intervals and given points: case 0,1,2,3,4,5 captured nodes
+const uint32 BG_AB_TickIntervals[6] = {0, 12000, 9000, 6000, 3000, 1000};
+const uint32 BG_AB_TickPoints[6] = {0, 10, 10, 10, 10, 30};
+
+// WorldSafeLocs ids for 5 nodes, and for ally, and horde starting location
+const uint32 BG_AB_GraveyardIds[7] = {895, 894, 893, 897, 896, 898, 899};
+
+// x, y, z, o
+const float BG_AB_BuffPositions[BG_AB_NODES_MAX][4] =
+{
+    {1185.71f, 1185.24f, -56.36f, 2.56f},                   // stables
+    {990.75f, 1008.18f, -42.60f, 2.43f},                    // blacksmith
+    {817.66f, 843.34f, -56.54f, 3.01f},                     // farm
+    {807.46f, 1189.16f, 11.92f, 5.44f},                     // lumber mill
+    {1146.62f, 816.94f, -98.49f, 6.14f}                     // gold mine
+};
+
+struct BG_AB_BannerTimer
+{
+    uint32      timer;
+    uint8       type;
+    uint8       teamIndex;
+};
+
+class BattleGroundABScore : public BattleGroundScore
+{
+    public:
+        BattleGroundABScore(): BasesAssaulted(0), BasesDefended(0) {};
+        virtual ~BattleGroundABScore() {};
+        uint32 BasesAssaulted;
+        uint32 BasesDefended;
+};
+
+class BattleGroundAB : public BattleGround
+{
+        friend class BattleGroundMgr;
+
+    public:
+        BattleGroundAB();
+        ~BattleGroundAB();
+
+        void Update(uint32 diff);
+        void AddPlayer(Player* plr);
+        virtual void StartingEventCloseDoors();
+        virtual void StartingEventOpenDoors();
+        void RemovePlayer(Player* plr, ObjectGuid guid);
+        void HandleAreaTrigger(Player* source, uint32 trigger);
+        virtual bool SetupBattleGround();
+        virtual void Reset();
+        void EndBattleGround(Team winner);
+        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
+
+        /* Scorekeeping */
+        virtual void UpdatePlayerScore(Player* source, uint32 type, uint32 value);
+
+        virtual void FillInitialWorldStates();
+
+        /* Nodes occupying */
+        virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj);
+
+        /* achievement req. */
+        bool IsAllNodesControlledByTeam(Team team) const override;
+        bool IsTeamScores500Disadvantage(Team team) const { return m_TeamScores500Disadvantage[GetTeamIndex(team)]; }
+
+    private:
+        /* Gameobject spawning/despawning */
+        void _CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay);
+        void _DelBanner(uint8 node, uint8 type, uint8 teamIndex);
+        void _SendNodeUpdate(uint8 node);
+
+        /* Creature spawning/despawning */
+        // TODO: working, scripted peons spawning
+        void _NodeOccupied(uint8 node, Team team);
+
+        int32 _GetNodeNameId(uint8 node);
+
+        /* Nodes info:
+            0: neutral
+            1: ally contested
+            2: horde contested
+            3: ally occupied
+            4: horde occupied     */
+        uint8               m_Nodes[BG_AB_NODES_MAX];
+        uint8               m_prevNodes[BG_AB_NODES_MAX];   // used for performant wordlstate-updating
+        BG_AB_BannerTimer   m_BannerTimers[BG_AB_NODES_MAX];
+        uint32              m_NodeTimers[BG_AB_NODES_MAX];
+        uint32              m_lastTick[PVP_TEAM_COUNT];
+        uint32              m_honorScoreTicks[PVP_TEAM_COUNT];
+        uint32              m_ReputationScoreTicks[PVP_TEAM_COUNT];
+        bool                m_IsInformedNearVictory;
+        uint32              m_honorTicks;
+        uint32              m_ReputationTicks;
+        // need for achievements
+        bool                m_TeamScores500Disadvantage[PVP_TEAM_COUNT];
+};
+#endif
diff --git a/src/game/BattleGround/BattleGroundAV.cpp b/src/game/BattleGround/BattleGroundAV.cpp
new file mode 100644
index 00000000000..a628c57a7d9
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundAV.cpp
@@ -0,0 +1,851 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Player.h"
+#include "BattleGround.h"
+#include "BattleGroundAV.h"
+#include "BattleGroundMgr.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "Language.h"
+#include "WorldPacket.h"
+#include "DBCStores.h"                                   // TODO REMOVE this when graveyard handling for pvp is updated
+
+BattleGroundAV::BattleGroundAV()
+{
+    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
+    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_AV_START_ONE_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_AV_START_HALF_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_AV_HAS_BEGUN;
+}
+
+BattleGroundAV::~BattleGroundAV()
+{
+}
+
+void BattleGroundAV::HandleKillPlayer(Player* player, Player* killer)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    BattleGround::HandleKillPlayer(player, killer);
+    UpdateScore(GetTeamIndex(player->GetTeam()), -1);
+}
+
+void BattleGroundAV::HandleKillUnit(Creature* creature, Player* killer)
+{
+    DEBUG_LOG("BattleGroundAV: HandleKillUnit %i", creature->GetEntry());
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+    uint8 event1 = (sBattleGroundMgr.GetCreatureEventIndex(creature->GetGUIDLow())).event1;
+    if (event1 == BG_EVENT_NONE)
+        return;
+    switch (event1)
+    {
+        case BG_AV_BOSS_A:
+            CastSpellOnTeam(BG_AV_BOSS_KILL_QUEST_SPELL, HORDE);   // this is a spell which finishes a quest where a player has to kill the boss
+            RewardReputationToTeam(BG_AV_FACTION_H, m_RepBoss, HORDE);
+            RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_BOSS), HORDE);
+            SendYellToAll(LANG_BG_AV_A_GENERAL_DEAD, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0));
+            EndBattleGround(HORDE);
+            break;
+        case BG_AV_BOSS_H:
+            CastSpellOnTeam(BG_AV_BOSS_KILL_QUEST_SPELL, ALLIANCE); // this is a spell which finishes a quest where a player has to kill the boss
+            RewardReputationToTeam(BG_AV_FACTION_A, m_RepBoss, ALLIANCE);
+            RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_BOSS), ALLIANCE);
+            SendYellToAll(LANG_BG_AV_H_GENERAL_DEAD, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0));
+            EndBattleGround(ALLIANCE);
+            break;
+        case BG_AV_CAPTAIN_A:
+            if (IsActiveEvent(BG_AV_NodeEventCaptainDead_A, 0))
+                return;
+            RewardReputationToTeam(BG_AV_FACTION_H, m_RepCaptain, HORDE);
+            RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_CAPTAIN), HORDE);
+            UpdateScore(TEAM_INDEX_ALLIANCE, (-1) * BG_AV_RES_CAPTAIN);
+            // spawn destroyed aura
+            SpawnEvent(BG_AV_NodeEventCaptainDead_A, 0, true);
+            break;
+        case BG_AV_CAPTAIN_H:
+            if (IsActiveEvent(BG_AV_NodeEventCaptainDead_H, 0))
+                return;
+            RewardReputationToTeam(BG_AV_FACTION_A, m_RepCaptain, ALLIANCE);
+            RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_CAPTAIN), ALLIANCE);
+            UpdateScore(TEAM_INDEX_HORDE, (-1) * BG_AV_RES_CAPTAIN);
+            // spawn destroyed aura
+            SpawnEvent(BG_AV_NodeEventCaptainDead_H, 0, true);
+            break;
+        case BG_AV_MINE_BOSSES_NORTH:
+            ChangeMineOwner(BG_AV_NORTH_MINE, GetTeamIndex(killer->GetTeam()));
+            break;
+        case BG_AV_MINE_BOSSES_SOUTH:
+            ChangeMineOwner(BG_AV_SOUTH_MINE, GetTeamIndex(killer->GetTeam()));
+            break;
+    }
+}
+
+void BattleGroundAV::HandleQuestComplete(uint32 questid, Player* player)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+    TeamIndex teamIdx = GetTeamIndex(player->GetTeam());
+    MANGOS_ASSERT(teamIdx != TEAM_INDEX_NEUTRAL);
+
+    uint32 reputation = 0;                                  // reputation for the whole team (other reputation must be done in db)
+    // TODO add events (including quest not available anymore, next quest availabe, go/npc de/spawning)
+    sLog.outError("BattleGroundAV: Quest %i completed", questid);
+    switch (questid)
+    {
+        case BG_AV_QUEST_A_SCRAPS1:
+        case BG_AV_QUEST_A_SCRAPS2:
+        case BG_AV_QUEST_H_SCRAPS1:
+        case BG_AV_QUEST_H_SCRAPS2:
+            m_Team_QuestStatus[teamIdx][0] += 20;
+            reputation = 1;
+            if (m_Team_QuestStatus[teamIdx][0] == 500 || m_Team_QuestStatus[teamIdx][0] == 1000 || m_Team_QuestStatus[teamIdx][0] == 1500)  //25,50,75 turn ins
+            {
+                DEBUG_LOG("BattleGroundAV: Quest %i completed starting with unit upgrading..", questid);
+                for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i)
+                    if (m_Nodes[i].Owner == teamIdx && m_Nodes[i].State == POINT_CONTROLLED)
+                        PopulateNode(i);
+            }
+            break;
+        case BG_AV_QUEST_A_COMMANDER1:
+        case BG_AV_QUEST_H_COMMANDER1:
+            m_Team_QuestStatus[teamIdx][1]++;
+            reputation = 1;
+            if (m_Team_QuestStatus[teamIdx][1] == 120)
+                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
+            break;
+        case BG_AV_QUEST_A_COMMANDER2:
+        case BG_AV_QUEST_H_COMMANDER2:
+            m_Team_QuestStatus[teamIdx][2]++;
+            reputation = 2;
+            if (m_Team_QuestStatus[teamIdx][2] == 60)
+                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
+            break;
+        case BG_AV_QUEST_A_COMMANDER3:
+        case BG_AV_QUEST_H_COMMANDER3:
+            m_Team_QuestStatus[teamIdx][3]++;
+            reputation = 5;
+            if (m_Team_QuestStatus[teamIdx][1] == 30)
+                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
+            break;
+        case BG_AV_QUEST_A_BOSS1:
+        case BG_AV_QUEST_H_BOSS1:
+            m_Team_QuestStatus[teamIdx][4] += 4;            // there are 2 quests where you can turn in 5 or 1 item.. ( + 4 cause +1 will be done some lines below)
+            reputation = 4;
+        case BG_AV_QUEST_A_BOSS2:
+        case BG_AV_QUEST_H_BOSS2:
+            m_Team_QuestStatus[teamIdx][4]++;
+            reputation += 1;
+            if (m_Team_QuestStatus[teamIdx][4] >= 200)
+                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
+            break;
+        case BG_AV_QUEST_A_NEAR_MINE:
+        case BG_AV_QUEST_H_NEAR_MINE:
+            m_Team_QuestStatus[teamIdx][5]++;
+            reputation = 2;
+            if (m_Team_QuestStatus[teamIdx][5] == 28)
+            {
+                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
+                if (m_Team_QuestStatus[teamIdx][6] == 7)
+                    DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here - ground assault ready", questid);
+            }
+            break;
+        case BG_AV_QUEST_A_OTHER_MINE:
+        case BG_AV_QUEST_H_OTHER_MINE:
+            m_Team_QuestStatus[teamIdx][6]++;
+            reputation = 3;
+            if (m_Team_QuestStatus[teamIdx][6] == 7)
+            {
+                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
+                if (m_Team_QuestStatus[teamIdx][5] == 20)
+                    DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here - ground assault ready", questid);
+            }
+            break;
+        case BG_AV_QUEST_A_RIDER_HIDE:
+        case BG_AV_QUEST_H_RIDER_HIDE:
+            m_Team_QuestStatus[teamIdx][7]++;
+            reputation = 1;
+            if (m_Team_QuestStatus[teamIdx][7] == 25)
+            {
+                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
+                if (m_Team_QuestStatus[teamIdx][8] == 25)
+                    DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here - rider assault ready", questid);
+            }
+            break;
+        case BG_AV_QUEST_A_RIDER_TAME:
+        case BG_AV_QUEST_H_RIDER_TAME:
+            m_Team_QuestStatus[teamIdx][8]++;
+            reputation = 1;
+            if (m_Team_QuestStatus[teamIdx][8] == 25)
+            {
+                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
+                if (m_Team_QuestStatus[teamIdx][7] == 25)
+                    DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here - rider assault ready", questid);
+            }
+            break;
+        default:
+            DEBUG_LOG("BattleGroundAV: Quest %i completed but is not interesting for us", questid);
+            return;
+            break;
+    }
+    if (reputation)
+        RewardReputationToTeam((player->GetTeam() == ALLIANCE) ? BG_AV_FACTION_A : BG_AV_FACTION_H, reputation, player->GetTeam());
+}
+
+void BattleGroundAV::UpdateScore(TeamIndex teamIdx, int32 points)
+{
+    // note: to remove reinforcements points must be negative, for adding reinforcements points must be positive
+    MANGOS_ASSERT(teamIdx == TEAM_INDEX_ALLIANCE || teamIdx == TEAM_INDEX_HORDE);
+    m_TeamScores[teamIdx] += points;                      // m_TeamScores is int32 - so no problems here
+
+    if (points < 0)
+    {
+        if (m_TeamScores[teamIdx] < 1)
+        {
+            m_TeamScores[teamIdx] = 0;
+            // other team will win:
+            EndBattleGround((teamIdx == TEAM_INDEX_ALLIANCE) ? HORDE : ALLIANCE);
+        }
+        else if (!m_IsInformedNearLose[teamIdx] && m_TeamScores[teamIdx] < BG_AV_SCORE_NEAR_LOSE)
+        {
+            SendMessageToAll((teamIdx == TEAM_INDEX_HORDE) ? LANG_BG_AV_H_NEAR_LOSE : LANG_BG_AV_A_NEAR_LOSE, CHAT_MSG_BG_SYSTEM_NEUTRAL);
+            PlaySoundToAll(BG_AV_SOUND_NEAR_LOSE);
+            m_IsInformedNearLose[teamIdx] = true;
+        }
+    }
+    // must be called here, else it could display a negative value
+    UpdateWorldState(((teamIdx == TEAM_INDEX_HORDE) ? BG_AV_Horde_Score : BG_AV_Alliance_Score), m_TeamScores[teamIdx]);
+}
+
+void BattleGroundAV::Update(uint32 diff)
+{
+    BattleGround::Update(diff);
+
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    // add points from mine owning, and look if the neutral team can reclaim the mine
+    for (uint8 mine = 0; mine < BG_AV_MAX_MINES; ++mine)
+    {
+        if (m_Mine_Owner[mine] != TEAM_INDEX_NEUTRAL)
+        {
+            m_Mine_Timer[mine] -= diff;
+            if (m_Mine_Timer[mine] <= 0)
+            {
+                UpdateScore(TeamIndex(m_Mine_Owner[mine]), WORLD_STATE_ADD);
+                m_Mine_Timer[mine] = BG_AV_MINE_TICK_TIMER;
+            }
+
+            if (m_Mine_Reclaim_Timer[mine] > diff)
+                m_Mine_Reclaim_Timer[mine] -= diff;
+            else
+                ChangeMineOwner(mine, TEAM_INDEX_NEUTRAL);
+        }
+    }
+
+    // looks for all timers of the nodes and destroy the building (for graveyards the building wont get destroyed, it goes just to the other team
+    for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i)
+    {
+        if (m_Nodes[i].State == POINT_ASSAULTED)
+        {
+            if (m_Nodes[i].Timer > diff)
+                m_Nodes[i].Timer -= diff;
+            else
+                EventPlayerDestroyedPoint(i);
+        }
+    }
+}
+
+void BattleGroundAV::StartingEventCloseDoors()
+{
+    DEBUG_LOG("BattleGroundAV: entering state STATUS_WAIT_JOIN ...");
+}
+
+void BattleGroundAV::StartingEventOpenDoors()
+{
+    UpdateWorldState(BG_AV_SHOW_H_SCORE, 1);
+    UpdateWorldState(BG_AV_SHOW_A_SCORE, 1);
+
+    OpenDoorEvent(BG_EVENT_DOOR);
+
+    // Players that join battleground after start are not available to get achievement.
+    StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, BG_AV_EVENT_START_BATTLE);
+}
+
+void BattleGroundAV::AddPlayer(Player* plr)
+{
+    BattleGround::AddPlayer(plr);
+    // create score and add it to map, default values are set in constructor
+    BattleGroundAVScore* sc = new BattleGroundAVScore;
+    m_PlayerScores[plr->GetObjectGuid()] = sc;
+}
+
+void BattleGroundAV::EndBattleGround(Team winner)
+{
+    // calculate bonuskills for both teams:
+    uint32 tower_survived[PVP_TEAM_COUNT]  = {0, 0};
+    uint32 graves_owned[PVP_TEAM_COUNT]    = {0, 0};
+    uint32 mines_owned[PVP_TEAM_COUNT]     = {0, 0};
+    // towers all not destroyed:
+    for (BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_STONEHEART_BUNKER; ++i)
+        if (m_Nodes[i].State == POINT_CONTROLLED)
+            if (m_Nodes[i].TotalOwner == TEAM_INDEX_ALLIANCE)
+                ++tower_survived[TEAM_INDEX_ALLIANCE];
+    for (BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_TOWER; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i)
+        if (m_Nodes[i].State == POINT_CONTROLLED)
+            if (m_Nodes[i].TotalOwner == TEAM_INDEX_HORDE)
+                ++tower_survived[TEAM_INDEX_HORDE];
+
+    // graves all controlled
+    for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i)
+        if (m_Nodes[i].State == POINT_CONTROLLED && m_Nodes[i].Owner != TEAM_INDEX_NEUTRAL)
+            ++graves_owned[m_Nodes[i].Owner];
+
+    for (uint8 i = 0; i < BG_AV_MAX_MINES; ++i)
+        if (m_Mine_Owner[i] != TEAM_INDEX_NEUTRAL)
+            ++mines_owned[m_Mine_Owner[i]];
+
+    // now we have the values give the honor/reputation to the teams:
+    Team team[PVP_TEAM_COUNT]      = { ALLIANCE, HORDE };
+    uint32 faction[PVP_TEAM_COUNT]   = { BG_AV_FACTION_A, BG_AV_FACTION_H };
+    for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
+    {
+        if (tower_survived[i])
+        {
+            RewardReputationToTeam(faction[i], tower_survived[i] * m_RepSurviveTower, team[i]);
+            RewardHonorToTeam(GetBonusHonorFromKill(tower_survived[i] * BG_AV_KILL_SURVIVING_TOWER), team[i]);
+        }
+        DEBUG_LOG("BattleGroundAV: EndbattleGround: bgteam: %u towers:%u honor:%u rep:%u", i, tower_survived[i], GetBonusHonorFromKill(tower_survived[i] * BG_AV_KILL_SURVIVING_TOWER), tower_survived[i] * BG_AV_REP_SURVIVING_TOWER);
+        if (graves_owned[i])
+            RewardReputationToTeam(faction[i], graves_owned[i] * m_RepOwnedGrave, team[i]);
+        if (mines_owned[i])
+            RewardReputationToTeam(faction[i], mines_owned[i] * m_RepOwnedMine, team[i]);
+        // captain survived?:
+        if (!IsActiveEvent(BG_AV_NodeEventCaptainDead_A + GetTeamIndex(team[i]), 0))
+        {
+            RewardReputationToTeam(faction[i], m_RepSurviveCaptain, team[i]);
+            RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_SURVIVING_CAPTAIN), team[i]);
+        }
+    }
+
+    // both teams:
+    if (m_HonorMapComplete)
+    {
+        RewardHonorToTeam(m_HonorMapComplete, ALLIANCE);
+        RewardHonorToTeam(m_HonorMapComplete, HORDE);
+    }
+    BattleGround::EndBattleGround(winner);
+}
+
+void BattleGroundAV::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
+{
+}
+
+void BattleGroundAV::HandleAreaTrigger(Player* source, uint32 trigger)
+{
+    // this is wrong way to implement these things. On official it done by gameobject spell cast.
+    switch (trigger)
+    {
+        case 95:
+        case 2608:
+            if (source->GetTeam() != ALLIANCE)
+                source->GetSession()->SendNotification(LANG_BATTLEGROUND_ONLY_ALLIANCE_USE);
+            else
+                source->LeaveBattleground();
+            break;
+        case 2606:
+            if (source->GetTeam() != HORDE)
+                source->GetSession()->SendNotification(LANG_BATTLEGROUND_ONLY_HORDE_USE);
+            else
+                source->LeaveBattleground();
+            break;
+        case 3326:
+        case 3327:
+        case 3328:
+        case 3329:
+        case 3330:
+        case 3331:
+            // source->Unmount();
+            break;
+        default:
+            DEBUG_LOG("BattleGroundAV: WARNING: Unhandled AreaTrigger in Battleground: %u", trigger);
+//            source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", trigger);
+            break;
+    }
+}
+
+void BattleGroundAV::UpdatePlayerScore(Player* source, uint32 type, uint32 value)
+{
+
+    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(source->GetObjectGuid());
+    if (itr == m_PlayerScores.end())                        // player not found...
+        return;
+
+    uint32 achCriId = 0;
+
+    switch (type)
+    {
+        case SCORE_GRAVEYARDS_ASSAULTED:
+            ((BattleGroundAVScore*)itr->second)->GraveyardsAssaulted += value;
+            achCriId = AV_OBJECTIVE_ASSAULT_GRAVEYARD;
+            break;
+        case SCORE_GRAVEYARDS_DEFENDED:
+            ((BattleGroundAVScore*)itr->second)->GraveyardsDefended += value;
+            achCriId = AV_OBJECTIVE_DEFEND_GRAVEYARD;
+            break;
+        case SCORE_TOWERS_ASSAULTED:
+            ((BattleGroundAVScore*)itr->second)->TowersAssaulted += value;
+            achCriId = AV_OBJECTIVE_ASSAULT_TOWER;
+            break;
+        case SCORE_TOWERS_DEFENDED:
+            ((BattleGroundAVScore*)itr->second)->TowersDefended += value;
+            achCriId = AV_OBJECTIVE_DEFEND_TOWER;
+            break;
+        case SCORE_SECONDARY_OBJECTIVES:
+            ((BattleGroundAVScore*)itr->second)->SecondaryObjectives += value;
+            break;
+        default:
+            BattleGround::UpdatePlayerScore(source, type, value);
+            return;
+    }
+
+    if (achCriId > 0)
+        source->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, 1, achCriId);
+}
+
+void BattleGroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node)
+{
+    DEBUG_LOG("BattleGroundAV: player destroyed point node %i", node);
+
+    MANGOS_ASSERT(m_Nodes[node].Owner != TEAM_INDEX_NEUTRAL)
+    TeamIndex ownerTeamIdx = TeamIndex(m_Nodes[node].Owner);
+    Team ownerTeam = ownerTeamIdx == TEAM_INDEX_ALLIANCE ? ALLIANCE : HORDE;
+
+    // despawn banner
+    DestroyNode(node);
+    PopulateNode(node);
+    UpdateNodeWorldState(node);
+
+    if (IsTower(node))
+    {
+        uint8 tmp = node - BG_AV_NODES_DUNBALDAR_SOUTH;
+        // despawn marshal (one of those guys protecting the boss)
+        SpawnEvent(BG_AV_MARSHAL_A_SOUTH + tmp, 0, false);
+
+        UpdateScore(GetOtherTeamIndex(ownerTeamIdx), (-1) * BG_AV_RES_TOWER);
+        RewardReputationToTeam((ownerTeam == ALLIANCE) ? BG_AV_FACTION_A : BG_AV_FACTION_H, m_RepTowerDestruction, ownerTeam);
+        RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_TOWER), ownerTeam);
+        SendYell2ToAll(LANG_BG_AV_TOWER_TAKEN, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0), GetNodeName(node), (ownerTeam == ALLIANCE) ? LANG_BG_ALLY : LANG_BG_HORDE);
+    }
+    else
+    {
+        SendYell2ToAll(LANG_BG_AV_GRAVE_TAKEN, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0), GetNodeName(node), (ownerTeam == ALLIANCE) ? LANG_BG_ALLY : LANG_BG_HORDE);
+    }
+}
+
+void BattleGroundAV::ChangeMineOwner(uint8 mine, TeamIndex teamIdx)
+{
+    m_Mine_Timer[mine] = BG_AV_MINE_TICK_TIMER;
+    // TODO implement quest 7122
+    // mine=0 northmine, mine=1 southmine
+    // TODO changing the owner should result in setting respawntime to infinite for current creatures (they should fight the new ones), spawning new mine owners creatures and changing the chest - objects so that the current owning team can use them
+    MANGOS_ASSERT(mine == BG_AV_NORTH_MINE || mine == BG_AV_SOUTH_MINE);
+    if (m_Mine_Owner[mine] == teamIdx)
+        return;
+
+    m_Mine_PrevOwner[mine] = m_Mine_Owner[mine];
+    m_Mine_Owner[mine] = teamIdx;
+
+    SendMineWorldStates(mine);
+
+    SpawnEvent(BG_AV_MINE_EVENT + mine, teamIdx, true);
+    SpawnEvent(BG_AV_MINE_BOSSES + mine, teamIdx, true);
+
+    if (teamIdx != TEAM_INDEX_NEUTRAL)
+    {
+        PlaySoundToAll((teamIdx == TEAM_INDEX_ALLIANCE) ? BG_AV_SOUND_ALLIANCE_GOOD : BG_AV_SOUND_HORDE_GOOD);
+        m_Mine_Reclaim_Timer[mine] = BG_AV_MINE_RECLAIM_TIMER;
+        SendYell2ToAll(LANG_BG_AV_MINE_TAKEN , LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0),
+                       (teamIdx == TEAM_INDEX_ALLIANCE) ? LANG_BG_ALLY : LANG_BG_HORDE,
+                       (mine == BG_AV_NORTH_MINE) ? LANG_BG_AV_MINE_NORTH : LANG_BG_AV_MINE_SOUTH);
+    }
+}
+
+bool BattleGroundAV::PlayerCanDoMineQuest(int32 GOId, Team team)
+{
+    if (GOId == BG_AV_OBJECTID_MINE_N)
+        return (m_Mine_Owner[BG_AV_NORTH_MINE] == GetTeamIndex(team));
+    if (GOId == BG_AV_OBJECTID_MINE_S)
+        return (m_Mine_Owner[BG_AV_SOUTH_MINE] == GetTeamIndex(team));
+    return true;                                            // cause it's no mine'object it is ok if this is true
+}
+
+/// will spawn and despawn creatures around a node
+/// more a wrapper around spawnevent cause graveyards are special
+void BattleGroundAV::PopulateNode(BG_AV_Nodes node)
+{
+    TeamIndex teamIdx = m_Nodes[node].Owner;
+    if (IsGrave(node) && teamIdx != TEAM_INDEX_NEUTRAL)
+    {
+        uint32 graveDefenderType;
+        if (m_Team_QuestStatus[teamIdx][0] < 500)
+            graveDefenderType = 0;
+        else if (m_Team_QuestStatus[teamIdx][0] < 1000)
+            graveDefenderType = 1;
+        else if (m_Team_QuestStatus[teamIdx][0] < 1500)
+            graveDefenderType = 2;
+        else
+            graveDefenderType = 3;
+
+        if (m_Nodes[node].State == POINT_CONTROLLED) // we can spawn the current owner event
+            SpawnEvent(BG_AV_NODES_MAX + node, teamIdx * BG_AV_MAX_GRAVETYPES + graveDefenderType, true);
+        else // we despawn the event from the prevowner
+            SpawnEvent(BG_AV_NODES_MAX + node, m_Nodes[node].PrevOwner * BG_AV_MAX_GRAVETYPES + graveDefenderType, false);
+    }
+    SpawnEvent(node, (teamIdx * BG_AV_MAX_STATES) + m_Nodes[node].State, true);
+}
+
+/// called when using a banner
+void BattleGroundAV::EventPlayerClickedOnFlag(Player* source, GameObject* target_obj)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+    DEBUG_LOG("BattleGroundAV: using gameobject %i", target_obj->GetEntry());
+    uint8 event = (sBattleGroundMgr.GetGameObjectEventIndex(target_obj->GetGUIDLow())).event1;
+    if (event >= BG_AV_NODES_MAX)                           // not a node
+        return;
+    BG_AV_Nodes node = BG_AV_Nodes(event);
+    switch ((sBattleGroundMgr.GetGameObjectEventIndex(target_obj->GetGUIDLow())).event2 % BG_AV_MAX_STATES)
+    {
+        case POINT_CONTROLLED:
+            EventPlayerAssaultsPoint(source, node);
+            break;
+        case POINT_ASSAULTED:
+            EventPlayerDefendsPoint(source, node);
+            break;
+        default:
+            break;
+    }
+}
+
+void BattleGroundAV::EventPlayerDefendsPoint(Player* player, BG_AV_Nodes node)
+{
+    MANGOS_ASSERT(GetStatus() == STATUS_IN_PROGRESS);
+
+    TeamIndex teamIdx = GetTeamIndex(player->GetTeam());
+
+    if (m_Nodes[node].Owner == TeamIndex(teamIdx) || m_Nodes[node].State != POINT_ASSAULTED)
+        return;
+    if (m_Nodes[node].TotalOwner == TEAM_INDEX_NEUTRAL)     // initial snowfall capture
+    {
+        // until snowfall doesn't belong to anyone it is better handled in assault - code (best would be to have a special function
+        // for neutral nodes.. but doing this just for snowfall will be a bit to much i think
+        MANGOS_ASSERT(node == BG_AV_NODES_SNOWFALL_GRAVE);  // currently the only neutral grave
+        EventPlayerAssaultsPoint(player, node);
+        return;
+    }
+
+    DEBUG_LOG("BattleGroundAV: player defends node: %i", node);
+    if (m_Nodes[node].PrevOwner != TeamIndex(teamIdx))
+    {
+        sLog.outError("BattleGroundAV: player defends point which doesn't belong to his team %i", node);
+        return;
+    }
+
+    DefendNode(node, teamIdx);                              // set the right variables for nodeinfo
+    PopulateNode(node);                                     // spawn node-creatures (defender for example)
+    UpdateNodeWorldState(node);                             // send new mapicon to the player
+
+    if (IsTower(node))
+    {
+        SendYell2ToAll(LANG_BG_AV_TOWER_DEFENDED, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0),
+                       GetNodeName(node),
+                       (teamIdx == TEAM_INDEX_ALLIANCE) ? LANG_BG_ALLY : LANG_BG_HORDE);
+        UpdatePlayerScore(player, SCORE_TOWERS_DEFENDED, 1);
+        PlaySoundToAll(BG_AV_SOUND_BOTH_TOWER_DEFEND);
+    }
+    else
+    {
+        SendYell2ToAll(LANG_BG_AV_GRAVE_DEFENDED, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0),
+                       GetNodeName(node),
+                       (teamIdx == TEAM_INDEX_ALLIANCE) ? LANG_BG_ALLY : LANG_BG_HORDE);
+        UpdatePlayerScore(player, SCORE_GRAVEYARDS_DEFENDED, 1);
+        player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, 1, 65);
+
+        // update the statistic for the defending player
+        PlaySoundToAll((teamIdx == TEAM_INDEX_ALLIANCE) ? BG_AV_SOUND_ALLIANCE_GOOD : BG_AV_SOUND_HORDE_GOOD);
+    }
+}
+
+void BattleGroundAV::EventPlayerAssaultsPoint(Player* player, BG_AV_Nodes node)
+{
+    // TODO implement quest 7101, 7081
+    TeamIndex teamIdx  = GetTeamIndex(player->GetTeam());
+    DEBUG_LOG("BattleGroundAV: player assaults node %i", node);
+    if (m_Nodes[node].Owner == TeamIndex(teamIdx) || TeamIndex(teamIdx) == m_Nodes[node].TotalOwner)
+        return;
+
+    AssaultNode(node, teamIdx);                             // update nodeinfo variables
+    UpdateNodeWorldState(node);                             // send mapicon
+    PopulateNode(node);
+
+    if (IsTower(node))
+    {
+        SendYell2ToAll(LANG_BG_AV_TOWER_ASSAULTED, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0),
+                       GetNodeName(node),
+                       (teamIdx == TEAM_INDEX_ALLIANCE) ? LANG_BG_ALLY : LANG_BG_HORDE);
+        UpdatePlayerScore(player, SCORE_TOWERS_ASSAULTED, 1);
+    }
+    else
+    {
+        SendYell2ToAll(LANG_BG_AV_GRAVE_ASSAULTED, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0),
+                       GetNodeName(node),
+                       (teamIdx == TEAM_INDEX_ALLIANCE) ? LANG_BG_ALLY : LANG_BG_HORDE);
+        // update the statistic for the assaulting player
+        UpdatePlayerScore(player, SCORE_GRAVEYARDS_ASSAULTED, 1);
+    }
+
+    PlaySoundToAll((teamIdx == TEAM_INDEX_ALLIANCE) ? BG_AV_SOUND_ALLIANCE_ASSAULTS : BG_AV_SOUND_HORDE_ASSAULTS);
+}
+
+void BattleGroundAV::FillInitialWorldStates()
+{
+    bool stateok;
+    for (uint8 i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i)
+    {
+        for (uint8 j = 0; j < BG_AV_MAX_STATES; ++j)
+        {
+            stateok = (m_Nodes[i].State == j);
+            FillInitialWorldState(BG_AV_NodeWorldStates[i][GetWorldStateType(j, TEAM_INDEX_ALLIANCE)],
+                m_Nodes[i].Owner == TEAM_INDEX_ALLIANCE && stateok);
+            FillInitialWorldState(BG_AV_NodeWorldStates[i][GetWorldStateType(j, TEAM_INDEX_HORDE)],
+                m_Nodes[i].Owner == TEAM_INDEX_HORDE && stateok);
+        }
+    }
+
+    if (m_Nodes[BG_AV_NODES_SNOWFALL_GRAVE].Owner == TEAM_INDEX_NEUTRAL)    // cause neutral teams aren't handled generic
+        FillInitialWorldState(AV_SNOWFALL_N, WORLD_STATE_ADD);
+
+    FillInitialWorldState(BG_AV_Alliance_Score, m_TeamScores[TEAM_INDEX_ALLIANCE]);
+    FillInitialWorldState(BG_AV_Horde_Score,    m_TeamScores[TEAM_INDEX_HORDE]);
+    FillInitialWorldState(BG_AV_MineWorldStates[BG_AV_NORTH_MINE][m_Mine_Owner[BG_AV_NORTH_MINE]], WORLD_STATE_ADD);
+
+    if (m_Mine_Owner[BG_AV_NORTH_MINE] != m_Mine_PrevOwner[BG_AV_NORTH_MINE])
+        FillInitialWorldState(BG_AV_MineWorldStates[BG_AV_NORTH_MINE][m_Mine_PrevOwner[BG_AV_NORTH_MINE]], WORLD_STATE_REMOVE);
+
+    FillInitialWorldState( BG_AV_MineWorldStates[BG_AV_SOUTH_MINE][m_Mine_Owner[BG_AV_SOUTH_MINE]], WORLD_STATE_ADD);
+    if (m_Mine_Owner[BG_AV_SOUTH_MINE] != m_Mine_PrevOwner[BG_AV_SOUTH_MINE])
+        FillInitialWorldState(BG_AV_MineWorldStates[BG_AV_SOUTH_MINE][m_Mine_PrevOwner[BG_AV_SOUTH_MINE]], WORLD_STATE_REMOVE);
+}
+
+void BattleGroundAV::UpdateNodeWorldState(BG_AV_Nodes node)
+{
+    UpdateWorldState(BG_AV_NodeWorldStates[node][GetWorldStateType(m_Nodes[node].State, m_Nodes[node].Owner)], WORLD_STATE_ADD);
+    if (m_Nodes[node].PrevOwner == TEAM_INDEX_NEUTRAL)      // currently only snowfall is supported as neutral node
+        UpdateWorldState(AV_SNOWFALL_N, WORLD_STATE_REMOVE);
+    else
+        UpdateWorldState(BG_AV_NodeWorldStates[node][GetWorldStateType(m_Nodes[node].PrevState,m_Nodes[node].PrevOwner)], WORLD_STATE_REMOVE);
+}
+
+void BattleGroundAV::SendMineWorldStates(uint32 mine)
+{
+    MANGOS_ASSERT(mine == BG_AV_NORTH_MINE || mine == BG_AV_SOUTH_MINE);
+
+    UpdateWorldState(BG_AV_MineWorldStates[mine][m_Mine_Owner[mine]], WORLD_STATE_ADD);
+    if (m_Mine_Owner[mine] != m_Mine_PrevOwner[mine])
+        UpdateWorldState(BG_AV_MineWorldStates[mine][m_Mine_PrevOwner[mine]], WORLD_STATE_REMOVE);
+}
+
+WorldSafeLocsEntry const* BattleGroundAV::GetClosestGraveYard(Player* plr)
+{
+    float x = plr->GetPositionX();
+    float y = plr->GetPositionY();
+    TeamIndex teamIdx = GetTeamIndex(plr->GetTeam());
+    WorldSafeLocsEntry const* good_entry = NULL;
+    if (GetStatus() == STATUS_IN_PROGRESS)
+    {
+        // Is there any occupied node for this team?
+        float mindist = 9999999.0f;
+        for (uint8 i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i)
+        {
+            if (m_Nodes[i].Owner != teamIdx || m_Nodes[i].State != POINT_CONTROLLED)
+                continue;
+            WorldSafeLocsEntry const* entry = sWorldSafeLocsStore.LookupEntry(BG_AV_GraveyardIds[i]);
+            if (!entry)
+                continue;
+            float dist = (entry->x - x) * (entry->x - x) + (entry->y - y) * (entry->y - y);
+            if (mindist > dist)
+            {
+                mindist = dist;
+                good_entry = entry;
+            }
+        }
+    }
+    // If not, place ghost in the starting-cave
+    if (!good_entry)
+        good_entry = sWorldSafeLocsStore.LookupEntry(BG_AV_GraveyardIds[teamIdx + 7]);
+
+    return good_entry;
+}
+
+uint32 BattleGroundAV::GetNodeName(BG_AV_Nodes node) const
+{
+    switch (node)
+    {
+        case BG_AV_NODES_FIRSTAID_STATION:  return LANG_BG_AV_NODE_GRAVE_STORM_AID;
+        case BG_AV_NODES_DUNBALDAR_SOUTH:   return LANG_BG_AV_NODE_TOWER_DUN_S;
+        case BG_AV_NODES_DUNBALDAR_NORTH:   return LANG_BG_AV_NODE_TOWER_DUN_N;
+        case BG_AV_NODES_STORMPIKE_GRAVE:   return LANG_BG_AV_NODE_GRAVE_STORMPIKE;
+        case BG_AV_NODES_ICEWING_BUNKER:    return LANG_BG_AV_NODE_TOWER_ICEWING;
+        case BG_AV_NODES_STONEHEART_GRAVE:  return LANG_BG_AV_NODE_GRAVE_STONE;
+        case BG_AV_NODES_STONEHEART_BUNKER: return LANG_BG_AV_NODE_TOWER_STONE;
+        case BG_AV_NODES_SNOWFALL_GRAVE:    return LANG_BG_AV_NODE_GRAVE_SNOW;
+        case BG_AV_NODES_ICEBLOOD_TOWER:    return LANG_BG_AV_NODE_TOWER_ICE;
+        case BG_AV_NODES_ICEBLOOD_GRAVE:    return LANG_BG_AV_NODE_GRAVE_ICE;
+        case BG_AV_NODES_TOWER_POINT:       return LANG_BG_AV_NODE_TOWER_POINT;
+        case BG_AV_NODES_FROSTWOLF_GRAVE:   return LANG_BG_AV_NODE_GRAVE_FROST;
+        case BG_AV_NODES_FROSTWOLF_ETOWER:  return LANG_BG_AV_NODE_TOWER_FROST_E;
+        case BG_AV_NODES_FROSTWOLF_WTOWER:  return LANG_BG_AV_NODE_TOWER_FROST_W;
+        case BG_AV_NODES_FROSTWOLF_HUT:     return LANG_BG_AV_NODE_GRAVE_FROST_HUT;
+        default: break;
+    }
+    return 0;
+}
+
+void BattleGroundAV::AssaultNode(BG_AV_Nodes node, TeamIndex teamIdx)
+{
+    MANGOS_ASSERT(m_Nodes[node].TotalOwner != TeamIndex(teamIdx));
+    MANGOS_ASSERT(m_Nodes[node].Owner != TeamIndex(teamIdx));
+    // only assault an assaulted node if no totalowner exists:
+    MANGOS_ASSERT(m_Nodes[node].State != POINT_ASSAULTED || m_Nodes[node].TotalOwner == TEAM_INDEX_NEUTRAL);
+    // the timer gets another time, if the previous owner was 0 == Neutral
+    m_Nodes[node].Timer      = (m_Nodes[node].PrevOwner != TEAM_INDEX_NEUTRAL) ? BG_AV_CAPTIME : BG_AV_SNOWFALL_FIRSTCAP;
+    m_Nodes[node].PrevOwner  = m_Nodes[node].Owner;
+    m_Nodes[node].Owner      = TeamIndex(teamIdx);
+    m_Nodes[node].PrevState  = m_Nodes[node].State;
+    m_Nodes[node].State      = POINT_ASSAULTED;
+}
+
+void BattleGroundAV::DestroyNode(BG_AV_Nodes node)
+{
+    MANGOS_ASSERT(m_Nodes[node].State == POINT_ASSAULTED);
+
+    m_Nodes[node].TotalOwner = m_Nodes[node].Owner;
+    m_Nodes[node].PrevOwner  = m_Nodes[node].Owner;
+    m_Nodes[node].PrevState  = m_Nodes[node].State;
+    m_Nodes[node].State      = POINT_CONTROLLED;
+    m_Nodes[node].Timer      = 0;
+}
+
+void BattleGroundAV::InitNode(BG_AV_Nodes node, TeamIndex teamIdx, bool tower)
+{
+    m_Nodes[node].TotalOwner = teamIdx;
+    m_Nodes[node].Owner      = teamIdx;
+    m_Nodes[node].PrevOwner  = teamIdx;
+    m_Nodes[node].State      = POINT_CONTROLLED;
+    m_Nodes[node].PrevState  = m_Nodes[node].State;
+    m_Nodes[node].State      = POINT_CONTROLLED;
+    m_Nodes[node].Timer      = 0;
+    m_Nodes[node].Tower      = tower;
+    m_ActiveEvents[node] = teamIdx * BG_AV_MAX_STATES + m_Nodes[node].State;
+    if (IsGrave(node))                                      // grave-creatures are special cause of a quest
+        m_ActiveEvents[node + BG_AV_NODES_MAX]  = teamIdx * BG_AV_MAX_GRAVETYPES;
+}
+
+void BattleGroundAV::DefendNode(BG_AV_Nodes node, TeamIndex teamIdx)
+{
+    MANGOS_ASSERT(m_Nodes[node].TotalOwner == TeamIndex(teamIdx));
+    MANGOS_ASSERT(m_Nodes[node].Owner != TeamIndex(teamIdx));
+    MANGOS_ASSERT(m_Nodes[node].State != POINT_CONTROLLED);
+    m_Nodes[node].PrevOwner  = m_Nodes[node].Owner;
+    m_Nodes[node].Owner      = TeamIndex(teamIdx);
+    m_Nodes[node].PrevState  = m_Nodes[node].State;
+    m_Nodes[node].State      = POINT_CONTROLLED;
+    m_Nodes[node].Timer      = 0;
+}
+
+void BattleGroundAV::Reset()
+{
+    BattleGround::Reset();
+    // set the reputation and honor variables:
+    bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID());
+
+    m_HonorMapComplete    = (isBGWeekend) ? BG_AV_KILL_MAP_COMPLETE_HOLIDAY : BG_AV_KILL_MAP_COMPLETE;
+    m_RepTowerDestruction = (isBGWeekend) ? BG_AV_REP_TOWER_HOLIDAY         : BG_AV_REP_TOWER;
+    m_RepCaptain          = (isBGWeekend) ? BG_AV_REP_CAPTAIN_HOLIDAY       : BG_AV_REP_CAPTAIN;
+    m_RepBoss             = (isBGWeekend) ? BG_AV_REP_BOSS_HOLIDAY          : BG_AV_REP_BOSS;
+    m_RepOwnedGrave       = (isBGWeekend) ? BG_AV_REP_OWNED_GRAVE_HOLIDAY   : BG_AV_REP_OWNED_GRAVE;
+    m_RepSurviveCaptain   = (isBGWeekend) ? BG_AV_REP_SURVIVING_CAPTAIN_HOLIDAY : BG_AV_REP_SURVIVING_CAPTAIN;
+    m_RepSurviveTower     = (isBGWeekend) ? BG_AV_REP_SURVIVING_TOWER_HOLIDAY : BG_AV_REP_SURVIVING_TOWER;
+    m_RepOwnedMine        = (isBGWeekend) ? BG_AV_REP_OWNED_MINE_HOLIDAY    : BG_AV_REP_OWNED_MINE;
+
+    for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
+    {
+        for (uint8 j = 0; j < 9; ++j)                       // 9 quests getting tracked
+            m_Team_QuestStatus[i][j] = 0;
+        m_TeamScores[i]         = BG_AV_SCORE_INITIAL_POINTS;
+        m_IsInformedNearLose[i] = false;
+        m_ActiveEvents[BG_AV_NodeEventCaptainDead_A + i] = BG_EVENT_NONE;
+    }
+
+    for (uint8 i = 0; i < BG_AV_MAX_MINES; ++i)
+    {
+        m_Mine_Owner[i] = TEAM_INDEX_NEUTRAL;
+        m_Mine_PrevOwner[i] = m_Mine_Owner[i];
+        m_ActiveEvents[BG_AV_MINE_BOSSES + i] = TEAM_INDEX_NEUTRAL;
+        m_ActiveEvents[BG_AV_MINE_EVENT + i] = TEAM_INDEX_NEUTRAL;
+        m_Mine_Timer[i] = BG_AV_MINE_TICK_TIMER;
+    }
+
+    m_ActiveEvents[BG_AV_CAPTAIN_A] = 0;
+    m_ActiveEvents[BG_AV_CAPTAIN_H] = 0;
+    m_ActiveEvents[BG_AV_HERALD] = 0;
+    m_ActiveEvents[BG_AV_BOSS_A] = 0;
+    m_ActiveEvents[BG_AV_BOSS_H] = 0;
+    for (BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i)  // towers
+        m_ActiveEvents[BG_AV_MARSHAL_A_SOUTH + i - BG_AV_NODES_DUNBALDAR_SOUTH] = 0;
+
+    for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_STONEHEART_GRAVE; ++i)  // alliance graves
+        InitNode(i, TEAM_INDEX_ALLIANCE, false);
+    for (BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_STONEHEART_BUNKER; ++i)  // alliance towers
+        InitNode(i, TEAM_INDEX_ALLIANCE, true);
+
+    for (BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_GRAVE; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i)       // horde graves
+        InitNode(i, TEAM_INDEX_HORDE, false);
+    for (BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_TOWER; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i)    // horde towers
+        InitNode(i, TEAM_INDEX_HORDE, true);
+
+    InitNode(BG_AV_NODES_SNOWFALL_GRAVE, TEAM_INDEX_NEUTRAL, false);                            // give snowfall neutral owner
+
+}
+
+bool BattleGroundAV::hasAllTowers(TeamIndex team)
+{
+    // if the winner team captain is dead, no need to check further
+    if ((IsActiveEvent((team == TEAM_INDEX_ALLIANCE) ? BG_AV_NodeEventCaptainDead_A : BG_AV_NodeEventCaptainDead_H, 0)))
+        return false;
+
+    // all winner towers/bunkers have to be owned by the winners, enemy ones must be destroyed (none in conflict)
+    for (int i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i)
+        if (m_Nodes[i].Owner != team || m_Nodes[i].State != POINT_CONTROLLED)
+            return false;
+
+    return true;
+}
diff --git a/src/game/BattleGroundAV.h b/src/game/BattleGround/BattleGroundAV.h
similarity index 86%
rename from src/game/BattleGroundAV.h
rename to src/game/BattleGround/BattleGroundAV.h
index f5dcdc84a8a..94052776b7d 100644
--- a/src/game/BattleGroundAV.h
+++ b/src/game/BattleGround/BattleGroundAV.h
@@ -25,6 +25,7 @@
 #define BG_AV_MAX_NODE_DISTANCE             25              // distance in which players are still counted in range of a banner (for alliance towers this is calculated from the center of the tower)
 
 #define BG_AV_BOSS_KILL_QUEST_SPELL         23658
+#define BG_AV_EVENT_START_BATTLE            9166
 
 #define BG_AV_CAPTIME                       240000          // 4 minutes
 #define BG_AV_SNOWFALL_FIRSTCAP             300000          // 5 minutes but i also have seen 4:05
@@ -68,8 +69,6 @@
 #define BG_AV_REP_OWNED_MINE                24
 #define BG_AV_REP_OWNED_MINE_HOLIDAY        36
 
-#define BG_AV_EVENT_START_BATTLE            9166
-
 enum BG_AV_Sounds
 {
     BG_AV_SOUND_NEAR_LOSE               = 8456,             // not confirmed yet
@@ -203,20 +202,8 @@ enum BG_AV_WorldStates
     AV_SNOWFALL_N               = 1966,
 };
 
-// special version with  more wide values range that BattleGroundTeamIndex
-// BattleGroundAVTeamIndex <- BattleGroundTeamIndex cast safe
-// BattleGroundAVTeamIndex -> BattleGroundTeamIndex cast safe and array with BG_TEAMS_COUNT elements must checked != BG_AV_TEAM_NEUTRAL before used
-enum BattleGroundAVTeamIndex
-{
-    BG_AV_TEAM_ALLIANCE        = BG_TEAM_ALLIANCE,
-    BG_AV_TEAM_HORDE           = BG_TEAM_HORDE,
-    BG_AV_TEAM_NEUTRAL         = 2,                         // this is the neutral owner of snowfall
-};
-
-#define BG_AV_TEAMS_COUNT 3
-
 // alliance_control horde_control neutral_control
-const uint32 BG_AV_MineWorldStates[2][BG_AV_TEAMS_COUNT] = {
+const uint32 BG_AV_MineWorldStates[2][3] = {
     {1358, 1359, 1360},
     {1355, 1356, 1357}
 };
@@ -285,15 +272,23 @@ enum BG_AV_QuestIds
 
 struct BG_AV_NodeInfo
 {
-    BattleGroundAVTeamIndex TotalOwner;
-    BattleGroundAVTeamIndex Owner;
-    BattleGroundAVTeamIndex PrevOwner;
+    TeamIndex    TotalOwner;
+    TeamIndex    Owner;
+    TeamIndex    PrevOwner;
     BG_AV_States State;
     BG_AV_States PrevState;
     uint32       Timer;
     bool         Tower;
 };
 
+enum BG_AV_Objectives
+{
+    AV_OBJECTIVE_ASSAULT_TOWER       = 61,
+    AV_OBJECTIVE_ASSAULT_GRAVEYARD   = 63,
+    AV_OBJECTIVE_DEFEND_TOWER        = 64,
+    AV_OBJECTIVE_DEFEND_GRAVEYARD    = 65
+};
+
 inline BG_AV_Nodes &operator++(BG_AV_Nodes &i)
 {
     return i = BG_AV_Nodes(i + 1);
@@ -326,14 +321,14 @@ class BattleGroundAV : public BattleGround
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
         // world states
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count);
+        virtual void FillInitialWorldStates();
 
         void RemovePlayer(Player *plr, ObjectGuid guid);
         void HandleAreaTrigger(Player *Source, uint32 Trigger);
         virtual void Reset();
 
         /*general stuff*/
-        void UpdateScore(BattleGroundTeamIndex teamIdx, int32 points);
+        void UpdateScore(TeamIndex teamIdx, int32 points);
         void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
 
         /*handle stuff*/ // these are functions which get called from extern scripts
@@ -342,49 +337,52 @@ class BattleGroundAV : public BattleGround
         void HandleKillUnit(Creature *creature, Player *killer);
         void HandleQuestComplete(uint32 questid, Player *player);
         bool PlayerCanDoMineQuest(int32 GOId, Team team);
+        bool IsMineOwnedBy(uint8 mine, uint32 team) { return (m_Mine_Owner[mine] == int8(team)) ? true : false; }
 
         void EndBattleGround(Team winner);
 
         virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player *plr);
 
-        static BattleGroundAVTeamIndex GetAVTeamIndexByTeamId(Team team) { return BattleGroundAVTeamIndex(GetTeamIndexByTeamId(team)); }
+        // for achievement Stormpike/Frostwolf Perfection
+        bool hasAllTowers(TeamIndex team);
+
     private:
         /* Nodes occupying */
         void EventPlayerAssaultsPoint(Player* player, BG_AV_Nodes node);
         void EventPlayerDefendsPoint(Player* player, BG_AV_Nodes node);
         void EventPlayerDestroyedPoint(BG_AV_Nodes node);
 
-        void AssaultNode(BG_AV_Nodes node, BattleGroundTeamIndex teamIdx);
+        void AssaultNode(BG_AV_Nodes node, TeamIndex teamIdx);
         void DestroyNode(BG_AV_Nodes node);
-        void InitNode(BG_AV_Nodes node, BattleGroundAVTeamIndex teamIdx, bool tower);
-        void DefendNode(BG_AV_Nodes node, BattleGroundTeamIndex teamIdx);
+        void InitNode(BG_AV_Nodes node, TeamIndex teamIdx, bool tower);
+        void DefendNode(BG_AV_Nodes node, TeamIndex teamIdx);
 
         void PopulateNode(BG_AV_Nodes node);
 
-        uint32 GetNodeName(BG_AV_Nodes node);
-        const bool IsTower(BG_AV_Nodes node) { return (node == BG_AV_NODES_ERROR)? false : m_Nodes[node].Tower; }
-        const bool IsGrave(BG_AV_Nodes node) { return (node == BG_AV_NODES_ERROR)? false : !m_Nodes[node].Tower; }
+        uint32 GetNodeName(BG_AV_Nodes node) const;
+        bool IsTower(BG_AV_Nodes node) const { return (node == BG_AV_NODES_ERROR) ? false : m_Nodes[node].Tower; }
+        bool IsGrave(BG_AV_Nodes node) const { return (node == BG_AV_NODES_ERROR) ? false : !m_Nodes[node].Tower; }
 
         /*mine*/
-        void ChangeMineOwner(uint8 mine, BattleGroundAVTeamIndex teamIdx);
+        void ChangeMineOwner(uint8 mine, TeamIndex teamIdx);
 
         /*worldstates*/
-        uint8 GetWorldStateType(uint8 state, BattleGroundAVTeamIndex teamIdx) const { return teamIdx * BG_AV_MAX_STATES + state; }
+        uint8 GetWorldStateType(uint8 state, TeamIndex teamIdx) const { return teamIdx * BG_AV_MAX_STATES + state; }
         void SendMineWorldStates(uint32 mine);
         void UpdateNodeWorldState(BG_AV_Nodes node);
 
         /*variables */
-        uint32 m_Team_QuestStatus[BG_TEAMS_COUNT][9];       // [x][y] x=team y=questcounter
+        uint32 m_Team_QuestStatus[PVP_TEAM_COUNT][9];       // [x][y] x=team y=questcounter
 
         BG_AV_NodeInfo m_Nodes[BG_AV_NODES_MAX];
 
         // only for worldstates needed
-        BattleGroundAVTeamIndex m_Mine_Owner[BG_AV_MAX_MINES];
-        BattleGroundAVTeamIndex m_Mine_PrevOwner[BG_AV_MAX_MINES];
+        TeamIndex m_Mine_Owner[BG_AV_MAX_MINES];
+        TeamIndex m_Mine_PrevOwner[BG_AV_MAX_MINES];
         int32 m_Mine_Timer[BG_AV_MAX_MINES];
         uint32 m_Mine_Reclaim_Timer[BG_AV_MAX_MINES];
 
-        bool m_IsInformedNearLose[BG_TEAMS_COUNT];
+        bool m_IsInformedNearLose[PVP_TEAM_COUNT];
 
         uint32 m_HonorMapComplete;
         uint32 m_RepTowerDestruction;
diff --git a/src/game/BattleGround/BattleGroundBE.cpp b/src/game/BattleGround/BattleGroundBE.cpp
new file mode 100644
index 00000000000..08789e1693e
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundBE.cpp
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Object.h"
+#include "Player.h"
+#include "BattleGround.h"
+#include "BattleGroundBE.h"
+#include "ObjectMgr.h"
+#include "WorldPacket.h"
+#include "Language.h"
+
+BattleGroundBE::BattleGroundBE()
+{
+    m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
+    m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
+    m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
+    m_StartDelayTimes[BG_STARTING_EVENT_FOURTH] = BG_START_DELAY_NONE;
+    // we must set messageIds
+    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_ARENA_ONE_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_ARENA_THIRTY_SECONDS;
+    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
+    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
+}
+
+BattleGroundBE::~BattleGroundBE()
+{
+}
+
+void BattleGroundBE::Update(uint32 diff)
+{
+    BattleGround::Update(diff);
+
+    /*if (GetStatus() == STATUS_IN_PROGRESS)
+    {
+        // update something
+    }*/
+}
+
+void BattleGroundBE::StartingEventCloseDoors()
+{
+}
+
+void BattleGroundBE::StartingEventOpenDoors()
+{
+    OpenDoorEvent(BG_EVENT_DOOR);
+}
+
+void BattleGroundBE::AddPlayer(Player* plr)
+{
+    BattleGround::AddPlayer(plr);
+    // create score and add it to map, default values are set in constructor
+    BattleGroundBEScore* sc = new BattleGroundBEScore;
+
+    m_PlayerScores[plr->GetObjectGuid()] = sc;
+
+    UpdateWorldState(0x9f1, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0x9f0, GetAlivePlayersCountByTeam(HORDE));
+}
+
+void BattleGroundBE::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
+{
+    if (GetStatus() == STATUS_WAIT_LEAVE)
+        return;
+
+    UpdateWorldState(0x9f1, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0x9f0, GetAlivePlayersCountByTeam(HORDE));
+
+    CheckArenaWinConditions();
+}
+
+void BattleGroundBE::HandleKillPlayer(Player* player, Player* killer)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    if (!killer)
+    {
+        sLog.outError("Killer player not found");
+        return;
+    }
+
+    BattleGround::HandleKillPlayer(player, killer);
+
+    UpdateWorldState(0x9f1, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0x9f0, GetAlivePlayersCountByTeam(HORDE));
+
+    CheckArenaWinConditions();
+}
+
+bool BattleGroundBE::HandlePlayerUnderMap(Player* player)
+{
+    player->TeleportTo(GetMapId(), 6238.930176f, 262.963470f, 0.889519f, player->GetOrientation());
+    return true;
+}
+
+void BattleGroundBE::HandleAreaTrigger(Player* source, uint32 trigger)
+{
+    // this is wrong way to implement these things. On official it done by gameobject spell cast.
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    // uint32 spellId = 0;
+    // uint64 buff_guid = 0;
+    switch (trigger)
+    {
+        case 4538:                                          // buff trigger?
+            // buff_guid = m_BgObjects[BG_BE_OBJECT_BUFF_1];
+            break;
+        case 4539:                                          // buff trigger?
+            // buff_guid = m_BgObjects[BG_BE_OBJECT_BUFF_2];
+            break;
+        default:
+            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", trigger);
+            source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", trigger);
+            break;
+    }
+
+    // if (buff_guid)
+    //    HandleTriggerBuff(buff_guid, source);
+}
+
+void BattleGroundBE::FillInitialWorldStates()
+{
+    FillInitialWorldState(0x9f1, GetAlivePlayersCountByTeam(ALLIANCE));
+    FillInitialWorldState(0x9f0, GetAlivePlayersCountByTeam(HORDE));
+    FillInitialWorldState(0x9f3, 1);
+}
+
+void BattleGroundBE::Reset()
+{
+    // call parent's class reset
+    BattleGround::Reset();
+}
+
+bool BattleGroundBE::SetupBattleGround()
+{
+    return true;
+}
+
+void BattleGroundBE::UpdatePlayerScore(Player* source, uint32 type, uint32 value)
+{
+
+    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(source->GetObjectGuid());
+    if (itr == m_PlayerScores.end())                        // player not found...
+        return;
+
+    // there is nothing special in this score
+    BattleGround::UpdatePlayerScore(source, type, value);
+
+}
+
+/*
+21:45:46 id:231310 [S2C] SMSG_INIT_WORLD_STATES (706 = 0x02C2) len: 86
+0000: 32 02 00 00 76 0e 00 00 00 00 00 00 09 00 f3 09  |  2...v...........
+0010: 00 00 01 00 00 00 f1 09 00 00 01 00 00 00 f0 09  |  ................
+0020: 00 00 02 00 00 00 d4 08 00 00 00 00 00 00 d8 08  |  ................
+0030: 00 00 00 00 00 00 d7 08 00 00 00 00 00 00 d6 08  |  ................
+0040: 00 00 00 00 00 00 d5 08 00 00 00 00 00 00 d3 08  |  ................
+0050: 00 00 00 00 00 00                                |  ......
+
+spell 32724 - Gold Team
+spell 32725 - Green Team
+35774 Gold Team
+35775 Green Team
+*/
diff --git a/src/game/BattleGroundBE.h b/src/game/BattleGround/BattleGroundBE.h
similarity index 75%
rename from src/game/BattleGroundBE.h
rename to src/game/BattleGround/BattleGroundBE.h
index 75c2f936d80..97509f53f8b 100644
--- a/src/game/BattleGroundBE.h
+++ b/src/game/BattleGround/BattleGroundBE.h
@@ -29,7 +29,7 @@ class BattleGroundBEScore : public BattleGroundScore
 
 class BattleGroundBE : public BattleGround
 {
-    friend class BattleGroundMgr;
+        friend class BattleGroundMgr;
 
     public:
         BattleGroundBE();
@@ -37,19 +37,19 @@ class BattleGroundBE : public BattleGround
         void Update(uint32 diff);
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
+        virtual void AddPlayer(Player* plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
 
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
+        void RemovePlayer(Player* plr, ObjectGuid guid);
+        void HandleAreaTrigger(Player* source, uint32 trigger);
         bool SetupBattleGround();
         virtual void Reset();
-        virtual void FillInitialWorldStates(WorldPacket &d, uint32& count);
-        void HandleKillPlayer(Player* player, Player *killer);
-        bool HandlePlayerUnderMap(Player * plr);
+        virtual void FillInitialWorldStates();
+        void HandleKillPlayer(Player* player, Player* killer);
+        bool HandlePlayerUnderMap(Player* plr);
 
         /* Scorekeeping */
-        void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
+        void UpdatePlayerScore(Player* source, uint32 type, uint32 value);
 };
 #endif
diff --git a/src/game/BattleGround/BattleGroundDS.cpp b/src/game/BattleGround/BattleGroundDS.cpp
new file mode 100644
index 00000000000..a74e1dbab62
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundDS.cpp
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Object.h"
+#include "Player.h"
+#include "BattleGround.h"
+#include "BattleGroundDS.h"
+#include "ObjectMgr.h"
+#include "WorldPacket.h"
+#include "Language.h"
+
+BattleGroundDS::BattleGroundDS()
+{
+
+    m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
+    m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
+    m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
+    m_StartDelayTimes[BG_STARTING_EVENT_FOURTH] = BG_START_DELAY_NONE;
+    // we must set messageIds
+    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_ARENA_ONE_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_ARENA_THIRTY_SECONDS;
+    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
+    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
+}
+
+BattleGroundDS::~BattleGroundDS()
+{
+
+}
+
+void BattleGroundDS::Update(uint32 diff)
+{
+    BattleGround::Update(diff);
+    if (GetStatus() == STATUS_IN_PROGRESS)
+    {
+        // push people from the tubes
+        if (pushbackCheck)
+        {
+            // knockback
+            if (m_uiKnockback < diff)
+            {
+                for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+                {
+                    Player *plr = sObjectMgr.GetPlayer(itr->first);
+                    if (!plr)
+                        continue;
+
+                    if (GameObject* obj = plr->GetGameObject(48018))                         // Remove Demonic Circle
+                        obj->Delete();
+
+                    if (plr->GetPositionZ() < 11.0f)
+                        continue;
+
+                    float angle = (plr->GetBGTeam() == ALLIANCE /*gold*/) ? plr->GetAngle(1259.58f, 764.43f) : plr->GetAngle(1325.84f, 817.304f);
+
+                    plr->KnockBackWithAngle(angle, 45, 7);
+
+                    if (plr->IsWithinDist2d(1214, 765, 50) && plr->IsWithinLOS(1214, 765, 14))
+                        plr->KnockBackWithAngle(6.40f,55,7);
+
+                    if (plr->IsWithinDist2d(1369, 817, 50) && plr->IsWithinLOS(1369, 817, 14))
+                        plr->KnockBackWithAngle(3.03f,55,7);
+                }
+                pushbackCheck = false;
+                m_uiKnockback = 1000;
+            }
+            else
+                m_uiKnockback -= diff;
+        }
+
+        // in case pushback failed
+        if (teleportCheck)
+        {
+            if (m_uiTeleport < diff)
+            {
+                for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+                {
+                    Player* plr = sObjectMgr.GetPlayer(itr->first);
+                    if (plr)
+                    {
+                        if (plr->GetPositionZ() < 11.0f)
+                            continue;
+
+                        float x, y;
+                        if (plr->GetBGTeam() == ALLIANCE)
+                        {
+                            x = 1259.58f;
+                            y = 764.43f;
+                        }
+                        else
+                        {
+                            x = 1325.84f;
+                            y = 817.304f;
+                        }
+                        plr->TeleportTo(GetMapId(), x + urand(0,2), y + urand(0,2), 3.15f, plr->GetOrientation());
+                    }
+                }
+
+                teleportCheck = false;
+
+                // close the gate
+                OpenDoorEvent(BG_EVENT_DOOR);
+            }
+            else
+                m_uiTeleport -= diff;
+        }
+
+        // Waterfall
+        if (m_uiWaterfall < diff)
+        {
+            if (waterfallActivated)
+            {
+                SpawnEvent(WATERFALL_EVENT, 0, false);
+                waterfallActivated = false;
+            }
+            else
+            {
+                SpawnEvent(WATERFALL_EVENT, 0, true);
+                waterfallActivated = true;
+
+                for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+                {
+                    Player * plr = sObjectMgr.GetPlayer(itr->first);
+                    if (plr && plr->GetDistance2d(1291, 790) <= 6)
+                        plr->KnockBackFrom(plr, -20.0f, 9.0f);
+                }
+            }
+            m_uiWaterfall = urand(30,45)*IN_MILLISECONDS;
+        }
+        else
+            m_uiWaterfall -= diff;
+    }
+}
+
+void BattleGroundDS::StartingEventCloseDoors()
+{
+}
+
+void BattleGroundDS::StartingEventOpenDoors()
+{
+    OpenDoorEvent(BG_EVENT_DOOR);
+}
+
+void BattleGroundDS::AddPlayer(Player* plr)
+{
+    BattleGround::AddPlayer(plr);
+    // create score and add it to map, default values are set in constructor
+    BattleGroundDSScore* sc = new BattleGroundDSScore;
+
+    m_PlayerScores[plr->GetObjectGuid()] = sc;
+
+    UpdateWorldState(0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0xe10, GetAlivePlayersCountByTeam(HORDE));
+}
+
+void BattleGroundDS::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
+{
+    if (GetStatus() == STATUS_WAIT_LEAVE)
+        return;
+
+    UpdateWorldState(0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0xe10, GetAlivePlayersCountByTeam(HORDE));
+
+    CheckArenaWinConditions();
+}
+
+void BattleGroundDS::HandleKillPlayer(Player* player, Player* killer)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    if (!killer)
+    {
+        sLog.outError("BattleGroundDS: Killer player not found");
+        return;
+    }
+
+    BattleGround::HandleKillPlayer(player, killer);
+
+    UpdateWorldState(0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0xe10, GetAlivePlayersCountByTeam(HORDE));
+
+    CheckArenaWinConditions();
+}
+
+bool BattleGroundDS::HandlePlayerUnderMap(Player* player)
+{
+    player->TeleportTo(GetMapId(),1299.046f,784.825f,9.338f,player->GetOrientation());
+    return true;
+}
+
+void BattleGroundDS::HandleAreaTrigger(Player* source, uint32 trigger)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    switch (trigger)
+    {
+        case 5326:
+            source->TeleportTo(GetMapId(),1299.046f, 784.825f, 9.338f, source->GetOrientation());
+            break;
+        case 5347:
+        case 5348:
+            break;
+        default:
+            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", trigger);
+            source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", trigger);
+            break;
+    }
+}
+
+void BattleGroundDS::FillInitialWorldStates()
+{
+    FillInitialWorldState(0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    FillInitialWorldState(0xe10, GetAlivePlayersCountByTeam(HORDE));
+    FillInitialWorldState(0xe1a, 1);
+}
+
+void BattleGroundDS::Reset()
+{
+    //call parent's class reset
+    BattleGround::Reset();
+    m_uiTeleport = 10000;
+    teleportCheck = true;
+
+    m_uiKnockback = 5000;
+    pushbackCheck = true;
+
+    m_uiWaterfall = 2000;
+    waterfallActivated = false;
+}
+
+bool BattleGroundDS::SetupBattleGround()
+{
+    return true;
+}
diff --git a/src/game/BattleGround/BattleGroundDS.h b/src/game/BattleGround/BattleGroundDS.h
new file mode 100644
index 00000000000..795cec8c4b6
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundDS.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __BATTLEGROUNDDS_H
+#define __BATTLEGROUNDDS_H
+
+#define WATERFALL_EVENT 250
+
+class BattleGround;
+
+class BattleGroundDSScore : public BattleGroundScore
+{
+    public:
+        BattleGroundDSScore() {};
+        virtual ~BattleGroundDSScore() {};
+};
+
+class BattleGroundDS : public BattleGround
+{
+        friend class BattleGroundMgr;
+
+    public:
+        BattleGroundDS();
+        ~BattleGroundDS();
+        void Update(uint32 diff);
+
+        /* inherited from BattlegroundClass */
+        virtual void AddPlayer(Player* plr);
+        virtual void StartingEventCloseDoors();
+        virtual void StartingEventOpenDoors();
+
+        void RemovePlayer(Player* plr, ObjectGuid guid);
+        void HandleAreaTrigger(Player* source, uint32 trigger);
+        bool SetupBattleGround();
+        virtual void Reset();
+        virtual void FillInitialWorldStates();
+        void HandleKillPlayer(Player* player, Player* killer);
+        bool HandlePlayerUnderMap(Player* plr);
+        bool teleportCheck;
+        uint32 m_uiTeleport;
+
+        bool pushbackCheck;
+        uint32 m_uiWaterfall;
+        bool waterfallActivated;
+
+    private:
+        uint32 m_uiKnockback;
+};
+#endif
diff --git a/src/game/BattleGround/BattleGroundEY.cpp b/src/game/BattleGround/BattleGroundEY.cpp
new file mode 100644
index 00000000000..273cf0c0317
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundEY.cpp
@@ -0,0 +1,613 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Object.h"
+#include "Player.h"
+#include "BattleGround.h"
+#include "BattleGroundEY.h"
+#include "Creature.h"
+#include "ObjectMgr.h"
+#include "BattleGroundMgr.h"
+#include "Language.h"
+#include "WorldPacket.h"
+#include "Util.h"
+#include "MapManager.h"
+
+BattleGroundEY::BattleGroundEY()
+{
+    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
+    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_EY_START_ONE_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_THIRD] = LANG_BG_EY_START_HALF_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_EY_HAS_BEGUN;
+}
+
+BattleGroundEY::~BattleGroundEY()
+{
+}
+
+void BattleGroundEY::Update(uint32 diff)
+{
+    BattleGround::Update(diff);
+
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    // resource counter
+    if (m_resourceUpdateTimer < diff)
+    {
+        UpdateResources();
+        m_resourceUpdateTimer = EY_RESOURCES_UPDATE_TIME;
+    }
+    else
+        m_resourceUpdateTimer -= diff;
+
+    // flag respawn
+    if (m_flagState == EY_FLAG_STATE_WAIT_RESPAWN || m_flagState == EY_FLAG_STATE_ON_GROUND)
+    {
+        if (m_flagRespawnTimer < diff)
+        {
+            m_flagRespawnTimer = 0;
+            if (m_flagState == EY_FLAG_STATE_WAIT_RESPAWN)
+                RespawnFlag();
+            else
+                RespawnDroppedFlag();
+        }
+        else
+            m_flagRespawnTimer -= diff;
+    }
+}
+
+void BattleGroundEY::StartingEventCloseDoors()
+{
+}
+
+void BattleGroundEY::StartingEventOpenDoors()
+{
+    // eye-doors are despawned, not opened
+    SpawnEvent(BG_EVENT_DOOR, 0, false);
+
+    // Players that join battleground after start are not eligible to get achievement.
+    StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, EY_EVENT_START_BATTLE);
+}
+
+void BattleGroundEY::AddPoints(Team team, uint32 points)
+{
+    TeamIndex team_index = GetTeamIndex(team);
+    m_TeamScores[team_index] += points;
+    m_honorScoreTicks[team_index] += points;
+    if (m_honorScoreTicks[team_index] >= m_honorTicks)
+    {
+        RewardHonorToTeam(GetBonusHonorFromKill(1), team);
+        m_honorScoreTicks[team_index] -= m_honorTicks;
+    }
+}
+
+void BattleGroundEY::UpdateResources()
+{
+    if (m_towersAlliance > 0)
+    {
+        AddPoints(ALLIANCE, eyTickPoints[m_towersAlliance - 1]);
+        UpdateTeamScore(ALLIANCE);
+    }
+    if (m_towersHorde > 0)
+    {
+        AddPoints(HORDE, eyTickPoints[m_towersHorde - 1]);
+        UpdateTeamScore(HORDE);
+    }
+}
+
+void BattleGroundEY::UpdateTeamScore(Team team)
+{
+    uint32 score = m_TeamScores[GetTeamIndex(team)];
+
+    if (score >= EY_MAX_TEAM_SCORE)
+    {
+        score = EY_MAX_TEAM_SCORE;
+        EndBattleGround(team);
+    }
+
+    if (team == ALLIANCE)
+        UpdateWorldState(WORLD_STATE_EY_RESOURCES_ALLIANCE, score);
+    else
+        UpdateWorldState(WORLD_STATE_EY_RESOURCES_HORDE, score);
+}
+
+void BattleGroundEY::EndBattleGround(Team winner)
+{
+    // win reward
+    if (winner == ALLIANCE)
+        RewardHonorToTeam(GetBonusHonorFromKill(1), ALLIANCE);
+    if (winner == HORDE)
+        RewardHonorToTeam(GetBonusHonorFromKill(1), HORDE);
+    // complete map reward
+    RewardHonorToTeam(GetBonusHonorFromKill(1), ALLIANCE);
+    RewardHonorToTeam(GetBonusHonorFromKill(1), HORDE);
+
+    // disable capture points
+    for (uint8 i = 0; i < EY_NODES_MAX; ++i)
+        if (GameObject* go = GetBgMap()->GetGameObject(m_towers[i]))
+            go->SetLootState(GO_JUST_DEACTIVATED);
+
+    BattleGround::EndBattleGround(winner);
+}
+
+void BattleGroundEY::AddPlayer(Player* plr)
+{
+    BattleGround::AddPlayer(plr);
+    // create score and add it to map
+    BattleGroundEYScore* sc = new BattleGroundEYScore;
+
+    m_PlayerScores[plr->GetObjectGuid()] = sc;
+}
+
+void BattleGroundEY::RemovePlayer(Player* plr, ObjectGuid guid)
+{
+    // sometimes flag aura not removed :(
+    if (IsFlagPickedUp())
+    {
+        if (m_flagCarrier == guid)
+        {
+            if (plr)
+                EventPlayerDroppedFlag(plr);
+            else
+            {
+                ClearFlagCarrier();
+                RespawnFlag();
+            }
+        }
+    }
+}
+
+void BattleGroundEY::HandleGameObjectCreate(GameObject* go)
+{
+    // set initial data and activate capture points
+    switch (go->GetEntry())
+    {
+        case GO_CAPTURE_POINT_BLOOD_ELF_TOWER:
+            m_towers[NODE_BLOOD_ELF_TOWER] = go->GetObjectGuid();
+            go->SetCapturePointSlider(CAPTURE_SLIDER_NEUTRAL);
+            break;
+        case GO_CAPTURE_POINT_FEL_REAVER_RUINS:
+            m_towers[NODE_FEL_REAVER_RUINS] = go->GetObjectGuid();
+            go->SetCapturePointSlider(CAPTURE_SLIDER_NEUTRAL);
+            break;
+        case GO_CAPTURE_POINT_MAGE_TOWER:
+            m_towers[NODE_MAGE_TOWER] = go->GetObjectGuid();
+            go->SetCapturePointSlider(CAPTURE_SLIDER_NEUTRAL);
+            break;
+        case GO_CAPTURE_POINT_DRAENEI_RUINS:
+            m_towers[NODE_DRAENEI_RUINS] = go->GetObjectGuid();
+            go->SetCapturePointSlider(CAPTURE_SLIDER_NEUTRAL);
+            break;
+        default:
+            break;
+    }
+}
+
+// process the capture events
+bool BattleGroundEY::HandleEvent(uint32 eventId, GameObject* go)
+{
+    for (uint8 i = 0; i < EY_NODES_MAX; ++i)
+    {
+        if (eyTowers[i] == go->GetEntry())
+        {
+            for (uint8 j = 0; j < 4; ++j)
+            {
+                if (eyTowerEvents[i][j].eventEntry == eventId && m_towerWorldState[i] != eyTowerEvents[i][j].worldState)
+                {
+                    ProcessCaptureEvent(go, i, eyTowerEvents[i][j].team, eyTowerEvents[i][j].worldState, eyTowerEvents[i][j].message);
+
+                    // no need to iterate other events or towers
+                    return false;
+                }
+            }
+            // no need to iterate other towers
+            return false;
+        }
+    }
+
+    return false;
+}
+
+void BattleGroundEY::ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team, uint32 newWorldState, uint32 message)
+{
+    if (team == ALLIANCE)
+    {
+        // update counter
+        ++m_towersAlliance;
+        UpdateWorldState(WORLD_STATE_EY_TOWER_COUNT_ALLIANCE, m_towersAlliance);
+
+        SendMessageToAll(message, CHAT_MSG_BG_SYSTEM_ALLIANCE);
+
+        // spawn gameobjects
+        SpawnEvent(towerId, TEAM_INDEX_ALLIANCE, true);
+    }
+    else if (team == HORDE)
+    {
+        // update counter
+        ++m_towersHorde;
+        UpdateWorldState(WORLD_STATE_EY_TOWER_COUNT_HORDE, m_towersHorde);
+
+        SendMessageToAll(message, CHAT_MSG_BG_SYSTEM_HORDE);
+
+        // spawn gameobjects
+        SpawnEvent(towerId, TEAM_INDEX_HORDE, true);
+    }
+    else
+    {
+        if (m_towerOwner[towerId] == ALLIANCE)
+        {
+            // update counter
+            --m_towersAlliance;
+            UpdateWorldState(WORLD_STATE_EY_TOWER_COUNT_ALLIANCE, m_towersAlliance);
+
+            SendMessageToAll(message, CHAT_MSG_BG_SYSTEM_ALLIANCE);
+        }
+        else
+        {
+            // update counter
+            --m_towersHorde;
+            UpdateWorldState(WORLD_STATE_EY_TOWER_COUNT_HORDE, m_towersHorde);
+
+            SendMessageToAll(message, CHAT_MSG_BG_SYSTEM_HORDE);
+        }
+
+        // despawn gameobjects
+        SpawnEvent(towerId, EY_NEUTRAL_TEAM, true);
+    }
+
+    // update tower state
+    UpdateWorldState(m_towerWorldState[towerId], WORLD_STATE_REMOVE);
+    m_towerWorldState[towerId] = newWorldState;
+    UpdateWorldState(m_towerWorldState[towerId], WORLD_STATE_ADD);
+
+    // update capture point owner
+    m_towerOwner[towerId] = team;
+}
+
+void BattleGroundEY::HandleAreaTrigger(Player* source, uint32 trigger)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    if (!source->isAlive())                                 // hack code, must be removed later
+        return;
+
+    switch (trigger)
+    {
+        case AREATRIGGER_BLOOD_ELF_TOWER_POINT:
+            if (m_towerOwner[NODE_BLOOD_ELF_TOWER] == source->GetTeam())
+                EventPlayerCapturedFlag(source, NODE_BLOOD_ELF_TOWER);
+            break;
+        case AREATRIGGER_FEL_REAVER_RUINS_POINT:
+            if (m_towerOwner[NODE_FEL_REAVER_RUINS] == source->GetTeam())
+                EventPlayerCapturedFlag(source, NODE_FEL_REAVER_RUINS);
+            break;
+        case AREATRIGGER_MAGE_TOWER_POINT:
+            if (m_towerOwner[NODE_MAGE_TOWER] == source->GetTeam())
+                EventPlayerCapturedFlag(source, NODE_MAGE_TOWER);
+            break;
+        case AREATRIGGER_DRAENEI_RUINS_POINT:
+            if (m_towerOwner[NODE_DRAENEI_RUINS] == source->GetTeam())
+                EventPlayerCapturedFlag(source, NODE_DRAENEI_RUINS);
+            break;
+    }
+}
+
+bool BattleGroundEY::SetupBattleGround()
+{
+    return true;
+}
+
+void BattleGroundEY::Reset()
+{
+    // call parent's class reset
+    BattleGround::Reset();
+
+    m_TeamScores[TEAM_INDEX_ALLIANCE] = 0;
+    m_TeamScores[TEAM_INDEX_HORDE] = 0;
+
+    m_towersAlliance = 0;
+    m_towersHorde = 0;
+
+    m_honorTicks = BattleGroundMgr::IsBGWeekend(GetTypeID()) ? EY_WEEKEND_HONOR_INTERVAL : EY_NORMAL_HONOR_INTERVAL;
+    m_honorScoreTicks[TEAM_INDEX_ALLIANCE] = 0;
+    m_honorScoreTicks[TEAM_INDEX_HORDE] = 0;
+
+    m_flagState = EY_FLAG_STATE_ON_BASE;
+    m_flagCarrier.Clear();
+    m_DroppedFlagGuid.Clear();
+
+    m_flagRespawnTimer = 0;
+    m_resourceUpdateTimer = 0;
+
+    m_towerWorldState[NODE_BLOOD_ELF_TOWER] = WORLD_STATE_EY_BLOOD_ELF_TOWER_NEUTRAL;
+    m_towerWorldState[NODE_FEL_REAVER_RUINS] = WORLD_STATE_EY_FEL_REAVER_RUINS_NEUTRAL;
+    m_towerWorldState[NODE_MAGE_TOWER] = WORLD_STATE_EY_MAGE_TOWER_NEUTRAL;
+    m_towerWorldState[NODE_DRAENEI_RUINS] = WORLD_STATE_EY_DRAENEI_RUINS_NEUTRAL;
+
+    for (uint8 i = 0; i < EY_NODES_MAX; ++i)
+    {
+        m_towerOwner[i] = TEAM_NONE;
+        m_ActiveEvents[i] = EY_NEUTRAL_TEAM;
+    }
+
+    // the flag in the middle is spawned at beginning
+    m_ActiveEvents[EY_EVENT_CAPTURE_FLAG] = EY_EVENT2_FLAG_CENTER;
+}
+
+void BattleGroundEY::RespawnFlag()
+{
+    m_flagState = EY_FLAG_STATE_ON_BASE;
+    // will despawn captured flags at the node and spawn in center
+    SpawnEvent(EY_EVENT_CAPTURE_FLAG, EY_EVENT2_FLAG_CENTER, true);
+
+    PlaySoundToAll(EY_SOUND_FLAG_RESET);
+    SendMessageToAll(LANG_BG_EY_RESETED_FLAG, CHAT_MSG_BG_SYSTEM_NEUTRAL);
+
+    UpdateWorldState(WORLD_STATE_EY_NETHERSTORM_FLAG_READY, WORLD_STATE_ADD);
+}
+
+void BattleGroundEY::RespawnDroppedFlag()
+{
+    RespawnFlag();
+
+    GameObject* obj = GetBgMap()->GetGameObject(GetDroppedFlagGuid());
+    if (obj)
+        obj->Delete();
+    else
+        sLog.outError("BattleGroundEY: Unknown dropped flag: %s", GetDroppedFlagGuid().GetString().c_str());
+
+    ClearDroppedFlagGuid();
+}
+
+void BattleGroundEY::HandleKillPlayer(Player* player, Player* killer)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    BattleGround::HandleKillPlayer(player, killer);
+    EventPlayerDroppedFlag(player);
+}
+
+void BattleGroundEY::EventPlayerDroppedFlag(Player* source)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+    {
+        // if not running, do not cast things at the dropper player, neither send unnecessary messages
+        // just take off the aura
+        if (IsFlagPickedUp() && GetFlagCarrierGuid() == source->GetObjectGuid())
+        {
+            ClearFlagCarrier();
+            source->RemoveAurasDueToSpell(EY_NETHERSTORM_FLAG_SPELL);
+        }
+        return;
+    }
+
+    if (!IsFlagPickedUp())
+        return;
+
+    if (GetFlagCarrierGuid() != source->GetObjectGuid())
+        return;
+
+    ClearFlagCarrier();
+    source->RemoveAurasDueToSpell(EY_NETHERSTORM_FLAG_SPELL);
+    m_flagState = EY_FLAG_STATE_ON_GROUND;
+    m_flagRespawnTimer = EY_FLAG_RESPAWN_TIME;
+    source->CastSpell(source, SPELL_RECENTLY_DROPPED_FLAG, true);
+    source->CastSpell(source, EY_PLAYER_DROPPED_FLAG_SPELL, true);
+
+    if (source->GetTeam() == ALLIANCE)
+    {
+        UpdateWorldState(WORLD_STATE_EY_NETHERSTORM_FLAG_STATE_ALLIANCE, 1);
+        SendMessageToAll(LANG_BG_EY_DROPPED_FLAG, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL);
+    }
+    else
+    {
+        UpdateWorldState(WORLD_STATE_EY_NETHERSTORM_FLAG_STATE_HORDE, 1);
+        SendMessageToAll(LANG_BG_EY_DROPPED_FLAG, CHAT_MSG_BG_SYSTEM_HORDE, NULL);
+    }
+}
+
+void BattleGroundEY::EventPlayerClickedOnFlag(Player* source, GameObject* target_obj)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS || IsFlagPickedUp() || !source->IsWithinDistInMap(target_obj, 10))
+        return;
+
+    if (m_flagState == EY_FLAG_STATE_ON_BASE)
+        UpdateWorldState(WORLD_STATE_EY_NETHERSTORM_FLAG_READY, WORLD_STATE_REMOVE);
+
+    if (source->GetTeam() == ALLIANCE)
+    {
+        PlaySoundToAll(EY_SOUND_FLAG_PICKED_UP_ALLIANCE);
+
+        m_flagState = EY_FLAG_STATE_ON_ALLIANCE_PLAYER;
+        UpdateWorldState(WORLD_STATE_EY_NETHERSTORM_FLAG_STATE_ALLIANCE, 2);
+    }
+    else
+    {
+        PlaySoundToAll(EY_SOUND_FLAG_PICKED_UP_HORDE);
+
+        m_flagState = EY_FLAG_STATE_ON_HORDE_PLAYER;
+        UpdateWorldState(WORLD_STATE_EY_NETHERSTORM_FLAG_STATE_HORDE, 2);
+    }
+
+    // despawn center-flag
+    SpawnEvent(EY_EVENT_CAPTURE_FLAG, EY_EVENT2_FLAG_CENTER, false);
+
+    SetFlagCarrier(source->GetObjectGuid());
+    // get flag aura on player
+    source->CastSpell(source, EY_NETHERSTORM_FLAG_SPELL, true);
+    source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
+
+    if (source->GetTeam() == ALLIANCE)
+        PSendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL, source->GetName());
+    else
+        PSendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG, CHAT_MSG_BG_SYSTEM_HORDE, NULL, source->GetName());
+}
+
+void BattleGroundEY::EventPlayerCapturedFlag(Player* source, EYNodes node)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS || GetFlagCarrierGuid() != source->GetObjectGuid())
+        return;
+
+    ClearFlagCarrier();
+
+    m_flagState = EY_FLAG_STATE_WAIT_RESPAWN;
+    m_flagRespawnTimer = EY_FLAG_RESPAWN_TIME;
+
+    source->RemoveAurasDueToSpell(EY_NETHERSTORM_FLAG_SPELL);
+    source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
+
+    if (source->GetTeam() == ALLIANCE)
+    {
+        PlaySoundToAll(EY_SOUND_FLAG_CAPTURED_ALLIANCE);
+
+        if (m_towersAlliance > 0)
+            AddPoints(ALLIANCE, eyFlagPoints[m_towersAlliance - 1]);
+
+        SendMessageToAll(LANG_BG_EY_CAPTURED_FLAG_A, CHAT_MSG_BG_SYSTEM_ALLIANCE, source);
+    }
+    else
+    {
+        PlaySoundToAll(EY_SOUND_FLAG_CAPTURED_HORDE);
+
+        if (m_towersHorde > 0)
+            AddPoints(HORDE, eyFlagPoints[m_towersHorde - 1]);
+
+        SendMessageToAll(LANG_BG_EY_CAPTURED_FLAG_H, CHAT_MSG_BG_SYSTEM_HORDE, source);
+    }
+
+    SpawnEvent(EY_EVENT_CAPTURE_FLAG, node, true);
+
+    UpdatePlayerScore(source, SCORE_FLAG_CAPTURES, 1);
+}
+
+void BattleGroundEY::UpdatePlayerScore(Player* source, uint32 type, uint32 value)
+{
+    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(source->GetObjectGuid());
+    if (itr == m_PlayerScores.end())                        // player not found
+        return;
+
+    switch (type)
+    {
+        case SCORE_FLAG_CAPTURES:                           // flags captured
+            ((BattleGroundEYScore*)itr->second)->FlagCaptures += value;
+            source->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, 1, EY_OBJECTIVE_CAPTURE_FLAG);
+            break;
+        default:
+            BattleGround::UpdatePlayerScore(source, type, value);
+            break;
+    }
+}
+
+void BattleGroundEY::FillInitialWorldStates()
+{
+    // counter states
+    FillInitialWorldState(WORLD_STATE_EY_TOWER_COUNT_ALLIANCE, m_towersAlliance);
+    FillInitialWorldState(WORLD_STATE_EY_TOWER_COUNT_HORDE, m_towersHorde);
+
+    FillInitialWorldState(WORLD_STATE_EY_RESOURCES_ALLIANCE, m_TeamScores[TEAM_INDEX_ALLIANCE]);
+    FillInitialWorldState(WORLD_STATE_EY_RESOURCES_HORDE, m_TeamScores[TEAM_INDEX_HORDE]);
+
+    // tower world states
+    FillInitialWorldState(WORLD_STATE_EY_BLOOD_ELF_TOWER_ALLIANCE, m_towerOwner[NODE_BLOOD_ELF_TOWER] == ALLIANCE);
+    FillInitialWorldState(WORLD_STATE_EY_BLOOD_ELF_TOWER_HORDE, m_towerOwner[NODE_BLOOD_ELF_TOWER] == HORDE);
+    FillInitialWorldState(WORLD_STATE_EY_BLOOD_ELF_TOWER_NEUTRAL, m_towerOwner[NODE_BLOOD_ELF_TOWER] == TEAM_NONE);
+
+    FillInitialWorldState(WORLD_STATE_EY_FEL_REAVER_RUINS_ALLIANCE, m_towerOwner[NODE_FEL_REAVER_RUINS] == ALLIANCE);
+    FillInitialWorldState(WORLD_STATE_EY_FEL_REAVER_RUINS_HORDE, m_towerOwner[NODE_FEL_REAVER_RUINS] == HORDE);
+    FillInitialWorldState(WORLD_STATE_EY_FEL_REAVER_RUINS_NEUTRAL, m_towerOwner[NODE_FEL_REAVER_RUINS] == TEAM_NONE);
+
+    FillInitialWorldState(WORLD_STATE_EY_MAGE_TOWER_ALLIANCE, m_towerOwner[NODE_MAGE_TOWER] == ALLIANCE);
+    FillInitialWorldState(WORLD_STATE_EY_MAGE_TOWER_HORDE, m_towerOwner[NODE_MAGE_TOWER] == HORDE);
+    FillInitialWorldState(WORLD_STATE_EY_MAGE_TOWER_NEUTRAL, m_towerOwner[NODE_MAGE_TOWER] == TEAM_NONE);
+
+    FillInitialWorldState(WORLD_STATE_EY_DRAENEI_RUINS_ALLIANCE, m_towerOwner[NODE_DRAENEI_RUINS] == ALLIANCE);
+    FillInitialWorldState(WORLD_STATE_EY_DRAENEI_RUINS_HORDE, m_towerOwner[NODE_DRAENEI_RUINS] == HORDE);
+    FillInitialWorldState(WORLD_STATE_EY_DRAENEI_RUINS_NEUTRAL, m_towerOwner[NODE_DRAENEI_RUINS] == TEAM_NONE);
+
+    // flag states
+    FillInitialWorldState(WORLD_STATE_EY_NETHERSTORM_FLAG_READY, m_flagState == EY_FLAG_STATE_ON_BASE);
+    FillInitialWorldState(WORLD_STATE_EY_NETHERSTORM_FLAG_STATE_ALLIANCE, m_flagState == EY_FLAG_STATE_ON_ALLIANCE_PLAYER ? 2 : 1);
+    FillInitialWorldState(WORLD_STATE_EY_NETHERSTORM_FLAG_STATE_HORDE, m_flagState == EY_FLAG_STATE_ON_HORDE_PLAYER ? 2 : 1);
+
+    // capture point states - not need fill! unique for each other point
+    // FillInitialWorldState(WORLD_STATE_EY_CAPTURE_POINT_SLIDER_DISPLAY, WORLD_STATE_REMOVE);
+}
+
+WorldSafeLocsEntry const* BattleGroundEY::GetClosestGraveYard(Player* player)
+{
+    uint32 g_id = 0;
+
+    switch (player->GetTeam())
+    {
+        case ALLIANCE: g_id = GRAVEYARD_EY_MAIN_ALLIANCE; break;
+        case HORDE:    g_id = GRAVEYARD_EY_MAIN_HORDE;    break;
+        default:       return NULL;
+    }
+
+    float distance, nearestDistance;
+
+    WorldSafeLocsEntry const* entry = sWorldSafeLocsStore.LookupEntry(g_id);
+    WorldSafeLocsEntry const* nearestEntry = entry;
+
+    if (!entry)
+    {
+        sLog.outError("BattleGroundEY: Not found the main team graveyard. Graveyard system isn't working!");
+        return NULL;
+    }
+
+    float plr_x = player->GetPositionX();
+    float plr_y = player->GetPositionY();
+    float plr_z = player->GetPositionZ();
+
+
+    distance = (entry->x - plr_x) * (entry->x - plr_x) + (entry->y - plr_y) * (entry->y - plr_y) + (entry->z - plr_z) * (entry->z - plr_z);
+    nearestDistance = distance;
+
+    for (uint8 i = 0; i < EY_NODES_MAX; ++i)
+    {
+        if (m_towerOwner[i] == player->GetTeam())
+        {
+            entry = sWorldSafeLocsStore.LookupEntry(eyGraveyards[i]);
+            if (!entry)
+                sLog.outError("BattleGroundEY: Not found graveyard: %u", eyGraveyards[i]);
+            else
+            {
+                distance = (entry->x - plr_x) * (entry->x - plr_x) + (entry->y - plr_y) * (entry->y - plr_y) + (entry->z - plr_z) * (entry->z - plr_z);
+                if (distance < nearestDistance)
+                {
+                    nearestDistance = distance;
+                    nearestEntry = entry;
+                }
+            }
+        }
+    }
+
+    return nearestEntry;
+}
+
+bool BattleGroundEY::IsAllNodesControlledByTeam(Team team) const
+{
+    for (uint8 i = 0; i < EY_NODES_MAX; ++i)
+        if (m_towerOwner[i] != team)
+            return false;
+
+    return true;
+}
diff --git a/src/game/BattleGround/BattleGroundEY.h b/src/game/BattleGround/BattleGroundEY.h
new file mode 100644
index 00000000000..47cb61660cd
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundEY.h
@@ -0,0 +1,329 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __BATTLEGROUNDEY_H
+#define __BATTLEGROUNDEY_H
+
+#include "Language.h"
+
+class BattleGround;
+
+#define EY_FLAG_RESPAWN_TIME            (10 * IN_MILLISECONDS) //10 seconds
+#define EY_RESOURCES_UPDATE_TIME        (2 * IN_MILLISECONDS) //2 seconds
+#define BG_EY_EVENT_START_BATTLE        13180
+#define EY_OBJECTIVE_CAPTURE_FLAG       183
+
+enum EYWorldStates
+{
+    WORLD_STATE_EY_RESOURCES_ALLIANCE                   = 2749,
+    WORLD_STATE_EY_RESOURCES_HORDE                      = 2750,
+    WORLD_STATE_EY_TOWER_COUNT_ALLIANCE                 = 2752,
+    WORLD_STATE_EY_TOWER_COUNT_HORDE                    = 2753,
+
+    WORLD_STATE_EY_BLOOD_ELF_TOWER_ALLIANCE             = 2723,
+    WORLD_STATE_EY_BLOOD_ELF_TOWER_HORDE                = 2724,
+    WORLD_STATE_EY_BLOOD_ELF_TOWER_NEUTRAL              = 2722,
+    //WORLD_STATE_EY_BLOOD_ELF_TOWER_ALLIANCE_CONFLICT  = 2735, // unused on retail
+    //WORLD_STATE_EY_BLOOD_ELF_TOWER_HORDE_CONFLICT     = 2736, // unused on retail
+
+    WORLD_STATE_EY_FEL_REAVER_RUINS_ALLIANCE            = 2726,
+    WORLD_STATE_EY_FEL_REAVER_RUINS_HORDE               = 2727,
+    WORLD_STATE_EY_FEL_REAVER_RUINS_NEUTRAL             = 2725,
+    //WORLD_STATE_EY_FEL_REAVER_RUINS_ALLIANCE_CONFLICT = 2739, // unused on retail
+    //WORLD_STATE_EY_FEL_REAVER_RUINS_HORDE_CONFLICT    = 2740, // unused on retail
+
+    WORLD_STATE_EY_MAGE_TOWER_ALLIANCE                  = 2730,
+    WORLD_STATE_EY_MAGE_TOWER_HORDE                     = 2729,
+    WORLD_STATE_EY_MAGE_TOWER_NEUTRAL                   = 2728,
+    //WORLD_STATE_EY_MAGE_TOWER_ALLIANCE_CONFLICT       = 2741, // unused on retail
+    //WORLD_STATE_EY_MAGE_TOWER_HORDE_CONFLICT          = 2742, // unused on retail
+
+    WORLD_STATE_EY_DRAENEI_RUINS_ALLIANCE               = 2732,
+    WORLD_STATE_EY_DRAENEI_RUINS_HORDE                  = 2733,
+    WORLD_STATE_EY_DRAENEI_RUINS_NEUTRAL                = 2731,
+    //WORLD_STATE_EY_DRAENEI_RUINS_ALLIANCE_CONFLICT    = 2738, // unused on retail
+    //WORLD_STATE_EY_DRAENEI_RUINS_HORDE_CONFLICT       = 2737, // unused on retail
+
+    WORLD_STATE_EY_NETHERSTORM_FLAG_READY               = 2757,
+    WORLD_STATE_EY_NETHERSTORM_FLAG_STATE_ALLIANCE      = 2769,
+    WORLD_STATE_EY_NETHERSTORM_FLAG_STATE_HORDE         = 2770,
+
+};
+
+enum EYCapturePoints
+{
+    GO_CAPTURE_POINT_BLOOD_ELF_TOWER            = 184080,
+    GO_CAPTURE_POINT_FEL_REAVER_RUINS           = 184081,
+    GO_CAPTURE_POINT_MAGE_TOWER                 = 184082,
+    GO_CAPTURE_POINT_DRAENEI_RUINS              = 184083
+};
+
+enum EYEvents
+{
+    //EVENT_BLOOD_ELF_TOWER_WIN_ALLIANCE        = 12965,
+    //EVENT_BLOOD_ELF_TOWER_WIN_HORDE           = 12964,
+    EVENT_BLOOD_ELF_TOWER_PROGRESS_ALLIANCE     = 12905,
+    EVENT_BLOOD_ELF_TOWER_PROGRESS_HORDE        = 12904,
+    EVENT_BLOOD_ELF_TOWER_NEUTRAL_ALLIANCE      = 12957,
+    EVENT_BLOOD_ELF_TOWER_NEUTRAL_HORDE         = 12956,
+
+    //EVENT_FEL_REAVER_RUINS_WIN_ALLIANCE       = 12969,
+    //EVENT_FEL_REAVER_RUINS_WIN_HORDE          = 12968,
+    EVENT_FEL_REAVER_RUINS_PROGRESS_ALLIANCE    = 12911,
+    EVENT_FEL_REAVER_RUINS_PROGRESS_HORDE       = 12910,
+    EVENT_FEL_REAVER_RUINS_NEUTRAL_ALLIANCE     = 12960,
+    EVENT_FEL_REAVER_RUINS_NEUTRAL_HORDE        = 12961,
+
+    //EVENT_MAGE_TOWER_WIN_ALLIANCE             = 12971,
+    //EVENT_MAGE_TOWER_WIN_HORDE                = 12970,
+    EVENT_MAGE_TOWER_PROGRESS_ALLIANCE          = 12909,
+    EVENT_MAGE_TOWER_PROGRESS_HORDE             = 12908,
+    EVENT_MAGE_TOWER_NEUTRAL_ALLIANCE           = 12962,
+    EVENT_MAGE_TOWER_NEUTRAL_HORDE              = 12963,
+
+    //EVENT_DRAENEI_RUINS_WIN_ALLIANCE          = 12967,
+    //EVENT_DRAENEI_RUINS_WIN_HORDE             = 12966,
+    EVENT_DRAENEI_RUINS_PROGRESS_ALLIANCE       = 12907,
+    EVENT_DRAENEI_RUINS_PROGRESS_HORDE          = 12906,
+    EVENT_DRAENEI_RUINS_NEUTRAL_ALLIANCE        = 12958,
+    EVENT_DRAENEI_RUINS_NEUTRAL_HORDE           = 12959
+};
+
+enum EYSounds
+{
+    EY_SOUND_FLAG_PICKED_UP_ALLIANCE    = 8212,
+    EY_SOUND_FLAG_CAPTURED_HORDE        = 8213,
+    EY_SOUND_FLAG_PICKED_UP_HORDE       = 8174,
+    EY_SOUND_FLAG_CAPTURED_ALLIANCE     = 8173,
+    EY_SOUND_FLAG_RESET                 = 8192
+};
+
+enum EYSpells
+{
+    EY_NETHERSTORM_FLAG_SPELL           = 34976,
+    EY_PLAYER_DROPPED_FLAG_SPELL        = 34991
+};
+
+enum EYPointsTrigger
+{
+    AREATRIGGER_BLOOD_ELF_TOWER_POINT   = 4476, // also 4512
+    AREATRIGGER_FEL_REAVER_RUINS_POINT  = 4514, // also 4515
+    AREATRIGGER_MAGE_TOWER_POINT        = 4516, // also 4517
+    AREATRIGGER_DRAENEI_RUINS_POINT     = 4518, // also 4519
+
+    AREATRIGGER_BLOOD_ELF_TOWER_BUFF    = 4568,
+    AREATRIGGER_FEL_REAVER_RUINS_BUFF   = 4569,
+    //AREATRIGGER_FEL_REAVER_RUINS_BUFF_2 = 5866,
+    AREATRIGGER_MAGE_TOWER_BUFF         = 4570,
+    AREATRIGGER_DRAENEI_RUINS_BUFF      = 4571
+
+    //AREATRIGGER_EY_HORDE_START          = 4530,
+    //AREATRIGGER_EY_ALLIANCE_START       = 4531
+};
+
+enum EYGaveyards
+{
+    GRAVEYARD_EY_MAIN_ALLIANCE      = 1103,
+    GRAVEYARD_EY_MAIN_HORDE         = 1104,
+    GRAVEYARD_FEL_REAVER_RUINS      = 1105,
+    GRAVEYARD_BLOOD_ELF_TOWER       = 1106,
+    GRAVEYARD_DRAENEI_RUINS         = 1107,
+    GRAVEYARD_MAGE_TOWER            = 1108
+};
+
+enum EYNodes
+{
+    // TODO: Re-change order after we drop battleground_event and associated tables
+    NODE_BLOOD_ELF_TOWER            = 1,
+    NODE_FEL_REAVER_RUINS           = 0,
+    NODE_MAGE_TOWER                 = 3,
+    NODE_DRAENEI_RUINS              = 2
+};
+
+#define EY_NODES_MAX 4
+
+// node-events work like this: event1:nodeid, event2:state (0alliance,1horde,2neutral)
+#define EY_NEUTRAL_TEAM 2
+#define EY_EVENT_CAPTURE_FLAG 4 // event1=4, event2=nodeid or 4 for the default center spawn
+#define EY_EVENT2_FLAG_CENTER 4 // maximum node is 3 so 4 for center is ok
+// all other event2 are just nodeids, i won't define something here
+
+enum EYBuffs
+{
+    // buffs
+    EY_OBJECT_SPEEDBUFF_FEL_REAVER_RUINS    = 1,
+    EY_OBJECT_REGENBUFF_FEL_REAVER_RUINS    = 2,
+    EY_OBJECT_BERSERKBUFF_FEL_REAVER_RUINS  = 3,
+    EY_OBJECT_SPEEDBUFF_BLOOD_ELF_TOWER     = 4,
+    EY_OBJECT_REGENBUFF_BLOOD_ELF_TOWER     = 5,
+    EY_OBJECT_BERSERKBUFF_BLOOD_ELF_TOWER   = 6,
+    EY_OBJECT_SPEEDBUFF_DRAENEI_RUINS       = 7,
+    EY_OBJECT_REGENBUFF_DRAENEI_RUINS       = 8,
+    EY_OBJECT_BERSERKBUFF_DRAENEI_RUINS     = 9,
+    EY_OBJECT_SPEEDBUFF_MAGE_TOWER          = 10,
+    EY_OBJECT_REGENBUFF_MAGE_TOWER          = 11,
+    EY_OBJECT_BERSERKBUFF_MAGE_TOWER        = 12,
+    EY_OBJECT_MAX                           = 13
+};
+
+#define EY_NORMAL_HONOR_INTERVAL        260
+#define EY_WEEKEND_HONOR_INTERVAL       160
+#define EY_EVENT_START_BATTLE           13180
+
+enum EYScore
+{
+    EY_WARNING_NEAR_VICTORY_SCORE       = 1400,
+    EY_MAX_TEAM_SCORE                   = 1600
+};
+
+enum EYFlagState
+{
+    EY_FLAG_STATE_ON_BASE               = 0,
+    EY_FLAG_STATE_WAIT_RESPAWN          = 1,
+    EY_FLAG_STATE_ON_ALLIANCE_PLAYER    = 2,
+    EY_FLAG_STATE_ON_HORDE_PLAYER       = 3,
+    EY_FLAG_STATE_ON_GROUND             = 4
+};
+
+static const uint8 eyTickPoints[EY_NODES_MAX] = {1, 2, 5, 10};
+static const uint32 eyFlagPoints[EY_NODES_MAX] = {75, 85, 100, 500};
+
+static const uint32 eyGraveyards[EY_NODES_MAX] = {GRAVEYARD_FEL_REAVER_RUINS, GRAVEYARD_BLOOD_ELF_TOWER, GRAVEYARD_DRAENEI_RUINS, GRAVEYARD_MAGE_TOWER};
+static const uint32 eyTriggers[EY_NODES_MAX] = {AREATRIGGER_FEL_REAVER_RUINS_BUFF, AREATRIGGER_BLOOD_ELF_TOWER_BUFF, AREATRIGGER_DRAENEI_RUINS_BUFF, AREATRIGGER_MAGE_TOWER_BUFF};
+
+struct EYTowerEvent
+{
+    uint32  eventEntry;
+    Team    team;
+    uint32  message;
+    uint32  worldState;
+};
+
+static const EYTowerEvent eyTowerEvents[EY_NODES_MAX][4] =
+{
+    {
+        {EVENT_FEL_REAVER_RUINS_PROGRESS_ALLIANCE,  ALLIANCE,   LANG_BG_EY_HAS_TAKEN_A_B_TOWER, WORLD_STATE_EY_FEL_REAVER_RUINS_ALLIANCE},
+        {EVENT_FEL_REAVER_RUINS_PROGRESS_HORDE,     HORDE,      LANG_BG_EY_HAS_TAKEN_H_F_RUINS, WORLD_STATE_EY_FEL_REAVER_RUINS_HORDE},
+        {EVENT_FEL_REAVER_RUINS_NEUTRAL_HORDE,      TEAM_NONE,  LANG_BG_EY_HAS_LOST_A_F_RUINS,  WORLD_STATE_EY_FEL_REAVER_RUINS_NEUTRAL},
+        {EVENT_FEL_REAVER_RUINS_NEUTRAL_ALLIANCE,   TEAM_NONE,  LANG_BG_EY_HAS_LOST_H_F_RUINS,  WORLD_STATE_EY_FEL_REAVER_RUINS_NEUTRAL},
+    },
+    {
+        {EVENT_BLOOD_ELF_TOWER_PROGRESS_ALLIANCE,   ALLIANCE,   LANG_BG_EY_HAS_TAKEN_A_B_TOWER, WORLD_STATE_EY_BLOOD_ELF_TOWER_ALLIANCE},
+        {EVENT_BLOOD_ELF_TOWER_PROGRESS_HORDE,      HORDE,      LANG_BG_EY_HAS_TAKEN_H_B_TOWER, WORLD_STATE_EY_BLOOD_ELF_TOWER_HORDE},
+        {EVENT_BLOOD_ELF_TOWER_NEUTRAL_HORDE,       TEAM_NONE,  LANG_BG_EY_HAS_LOST_A_B_TOWER,  WORLD_STATE_EY_BLOOD_ELF_TOWER_NEUTRAL},
+        {EVENT_BLOOD_ELF_TOWER_NEUTRAL_ALLIANCE,    TEAM_NONE,  LANG_BG_EY_HAS_LOST_H_B_TOWER,  WORLD_STATE_EY_BLOOD_ELF_TOWER_NEUTRAL},
+    },
+    {
+        {EVENT_DRAENEI_RUINS_PROGRESS_ALLIANCE,     ALLIANCE,   LANG_BG_EY_HAS_TAKEN_A_D_RUINS, WORLD_STATE_EY_DRAENEI_RUINS_ALLIANCE},
+        {EVENT_DRAENEI_RUINS_PROGRESS_HORDE,        HORDE,      LANG_BG_EY_HAS_TAKEN_H_D_RUINS, WORLD_STATE_EY_DRAENEI_RUINS_HORDE},
+        {EVENT_DRAENEI_RUINS_NEUTRAL_HORDE,         TEAM_NONE,  LANG_BG_EY_HAS_LOST_A_D_RUINS,  WORLD_STATE_EY_DRAENEI_RUINS_NEUTRAL},
+        {EVENT_DRAENEI_RUINS_NEUTRAL_ALLIANCE,      TEAM_NONE,  LANG_BG_EY_HAS_LOST_H_D_RUINS,  WORLD_STATE_EY_DRAENEI_RUINS_NEUTRAL},
+    },
+    {
+        {EVENT_MAGE_TOWER_PROGRESS_ALLIANCE,        ALLIANCE,   LANG_BG_EY_HAS_TAKEN_A_M_TOWER, WORLD_STATE_EY_MAGE_TOWER_ALLIANCE},
+        {EVENT_MAGE_TOWER_PROGRESS_HORDE,           HORDE,      LANG_BG_EY_HAS_TAKEN_H_M_TOWER, WORLD_STATE_EY_MAGE_TOWER_HORDE},
+        {EVENT_MAGE_TOWER_NEUTRAL_HORDE,            TEAM_NONE,  LANG_BG_EY_HAS_LOST_A_M_TOWER,  WORLD_STATE_EY_MAGE_TOWER_NEUTRAL},
+        {EVENT_MAGE_TOWER_NEUTRAL_ALLIANCE,         TEAM_NONE,  LANG_BG_EY_HAS_LOST_H_M_TOWER,  WORLD_STATE_EY_MAGE_TOWER_NEUTRAL},
+    },
+};
+
+static const uint32 eyTowers[EY_NODES_MAX] = {GO_CAPTURE_POINT_FEL_REAVER_RUINS, GO_CAPTURE_POINT_BLOOD_ELF_TOWER, GO_CAPTURE_POINT_DRAENEI_RUINS, GO_CAPTURE_POINT_MAGE_TOWER};
+
+class BattleGroundEYScore : public BattleGroundScore
+{
+    public:
+        BattleGroundEYScore() : FlagCaptures(0) {};
+        virtual ~BattleGroundEYScore() {};
+        uint32 FlagCaptures;
+};
+
+class BattleGroundEY : public BattleGround
+{
+        friend class BattleGroundMgr;
+
+    public:
+        BattleGroundEY();
+        ~BattleGroundEY();
+        void Update(uint32 diff);
+
+        /* inherited from BattlegroundClass */
+        virtual void AddPlayer(Player* plr);
+        virtual void StartingEventCloseDoors();
+        virtual void StartingEventOpenDoors();
+
+        /* BG Flags */
+        ObjectGuid const& GetFlagCarrierGuid() const { return m_flagCarrier; }
+        void SetFlagCarrier(ObjectGuid guid) { m_flagCarrier = guid; }
+        void ClearFlagCarrier() { m_flagCarrier.Clear(); }
+        bool IsFlagPickedUp() const  { return !m_flagCarrier.IsEmpty(); }
+        uint8 GetFlagState() const { return m_flagState; }
+        void RespawnFlag();
+        void RespawnDroppedFlag();
+
+        void RemovePlayer(Player* plr, ObjectGuid guid) override;
+        bool HandleEvent(uint32 eventId, GameObject* go) override;
+        void HandleGameObjectCreate(GameObject* go) override;
+        void HandleAreaTrigger(Player* source, uint32 trigger) override;
+        void HandleKillPlayer(Player* player, Player* killer) override;
+
+        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
+        virtual bool SetupBattleGround() override;
+        virtual void Reset() override;
+        void UpdateTeamScore(Team team);
+        void EndBattleGround(Team winner);
+        void UpdatePlayerScore(Player* source, uint32 type, uint32 value);
+        virtual void FillInitialWorldStates();
+        void SetDroppedFlagGuid(ObjectGuid guid)     { m_DroppedFlagGuid = guid;}
+        void ClearDroppedFlagGuid()                  { m_DroppedFlagGuid.Clear();}
+        ObjectGuid const& GetDroppedFlagGuid() const { return m_DroppedFlagGuid;}
+
+        /* Battleground Events */
+        virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj);
+        virtual void EventPlayerDroppedFlag(Player* source);
+
+        /* achievement req. */
+        bool IsAllNodesControlledByTeam(Team team) const override;
+
+    private:
+        // process capture events
+        void ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team, uint32 newWorldState, uint32 message);
+        void EventPlayerCapturedFlag(Player* source, EYNodes node);     // NOTE: virtual BattleGround::EventPlayerCapturedFlag has different parameters list
+        void UpdateResources();
+
+        /* Scorekeeping */
+        void AddPoints(Team team, uint32 points);
+
+        EYFlagState m_flagState;
+        ObjectGuid m_flagCarrier;
+        ObjectGuid m_DroppedFlagGuid;
+
+        uint8 m_towersAlliance;
+        uint8 m_towersHorde;
+
+        uint32 m_towerWorldState[EY_NODES_MAX];
+
+        Team m_towerOwner[EY_NODES_MAX];
+        ObjectGuid m_towers[EY_NODES_MAX];
+
+        uint32 m_honorTicks;
+        uint32 m_honorScoreTicks[PVP_TEAM_COUNT];
+
+        uint32 m_flagRespawnTimer;
+        uint32 m_resourceUpdateTimer;
+};
+#endif
diff --git a/src/game/BattleGround/BattleGroundHandler.cpp b/src/game/BattleGround/BattleGroundHandler.cpp
new file mode 100644
index 00000000000..75f87c79674
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundHandler.cpp
@@ -0,0 +1,865 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Common.h"
+#include "SharedDefines.h"
+#include "WorldPacket.h"
+#include "Opcodes.h"
+#include "Log.h"
+#include "Player.h"
+#include "ObjectMgr.h"
+#include "WorldSession.h"
+#include "Object.h"
+#include "Chat.h"
+#include "BattleGroundEY.h"
+#include "BattleGroundMgr.h"
+#include "BattleGroundWS.h"
+#include "BattleGround.h"
+#include "ArenaTeam.h"
+#include "Language.h"
+#include "ScriptMgr.h"
+#include "World.h"
+
+void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket& recv_data)
+{
+    ObjectGuid guid;
+    recv_data >> guid;
+
+    DEBUG_LOG("WORLD: Recvd CMSG_BATTLEMASTER_HELLO Message from %s", guid.GetString().c_str());
+
+    Creature* pCreature = GetPlayer()->GetMap()->GetCreature(guid);
+
+    if (!pCreature)
+        return;
+
+    if (!pCreature->isBattleMaster())                       // it's not battlemaster
+        return;
+
+    // Stop the npc if moving
+    pCreature->StopMoving();
+
+    BattleGroundTypeId bgTypeId = sBattleGroundMgr.GetBattleMasterBG(pCreature->GetEntry());
+
+    if (bgTypeId == BATTLEGROUND_TYPE_NONE)
+        return;
+
+    if (!_player->GetBGAccessByLevel(bgTypeId))
+    {
+        // temp, must be gossip message...
+        SendNotification(LANG_YOUR_BG_LEVEL_REQ_ERROR);
+        return;
+    }
+
+    SendBattlegGroundList(guid, bgTypeId);
+}
+
+void WorldSession::SendBattlegGroundList(ObjectGuid guid, BattleGroundTypeId bgTypeId)
+{
+    WorldPacket data;
+    sBattleGroundMgr.BuildBattleGroundListPacket(&data, guid, _player, bgTypeId, 0);
+    SendPacket(&data);
+}
+
+void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recv_data)
+{
+    ObjectGuid guid;
+    uint32 bgTypeId_;
+    uint32 instanceId;
+    uint8 joinAsGroup;
+    bool isPremade = false;
+    Group* grp;
+
+    recv_data >> guid;                                      // battlemaster guid
+    recv_data >> bgTypeId_;                                 // battleground type id (DBC id)
+    recv_data >> instanceId;                                // instance id, 0 if First Available selected
+    recv_data >> joinAsGroup;                               // join as group
+
+    if (!sBattlemasterListStore.LookupEntry(bgTypeId_))
+    {
+        sLog.outError("Battleground: invalid bgtype (%u) received. possible cheater? player guid %u", bgTypeId_, _player->GetGUIDLow());
+        return;
+    }
+
+    BattleGroundTypeId bgTypeId = BattleGroundTypeId(bgTypeId_);
+
+    DEBUG_LOG("WORLD: Recvd CMSG_BATTLEMASTER_JOIN Message from %s", guid.GetString().c_str());
+
+    // can do this, since it's battleground, not arena
+    BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, ARENA_TYPE_NONE);
+    BattleGroundQueueTypeId bgQueueTypeIdRandom = BattleGroundMgr::BGQueueTypeId(BATTLEGROUND_RB, ARENA_TYPE_NONE);
+
+    // ignore if player is already in BG
+    if (_player->InBattleGround())
+        return;
+
+    // get bg instance or bg template if instance not found
+    BattleGround* bg = NULL;
+    if (instanceId)
+        bg = sBattleGroundMgr.GetBattleGroundThroughClientInstance(instanceId, bgTypeId);
+
+    if (!bg && !(bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId)))
+    {
+        sLog.outError("Battleground: no available bg / template found");
+        return;
+    }
+
+    // expected bracket entry
+    PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel());
+    if (!bracketEntry)
+        return;
+
+    GroupJoinBattlegroundResult err;
+
+    // check queue conditions
+    if (!joinAsGroup)
+    {
+        // check Deserter debuff
+        if (!_player->CanJoinToBattleground())
+        {
+            WorldPacket data;
+            sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, ERR_GROUP_JOIN_BATTLEGROUND_DESERTERS);
+            _player->GetSession()->SendPacket(&data);
+            return;
+        }
+
+        if (_player->GetBattleGroundQueueIndex(bgQueueTypeIdRandom) < PLAYER_MAX_BATTLEGROUND_QUEUES)
+        {
+            //player is already in random queue
+            WorldPacket data;
+            sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, ERR_IN_RANDOM_BG);
+            _player->GetSession()->SendPacket(&data);
+            return;
+        }
+
+        if(_player->InBattleGroundQueue() && bgTypeId == BATTLEGROUND_RB)
+        {
+            //player is already in queue, can't start random queue
+            WorldPacket data;
+            sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, ERR_IN_NON_RANDOM_BG);
+            _player->GetSession()->SendPacket(&data);
+            return;
+        }
+
+        // check if already in queue
+        if (_player->GetBattleGroundQueueIndex(bgQueueTypeId) < PLAYER_MAX_BATTLEGROUND_QUEUES)
+            // player is already in this queue
+            return;
+        // check if has free queue slots
+        if (!_player->HasFreeBattleGroundQueueId())
+        {
+            WorldPacket data;
+            sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, ERR_BATTLEGROUND_TOO_MANY_QUEUES);
+            _player->GetSession()->SendPacket(&data);
+            return;
+        }
+    }
+    else
+    {
+        grp = _player->GetGroup();
+        // no group found, error
+        if (!grp || grp->isLFDGroup())
+            return;
+        if (grp->GetLeaderGuid() != _player->GetObjectGuid())
+            return;
+
+        bool have_bots = false;
+        for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* member = itr->getSource();
+            if (!member)
+                continue;                                   // this should never happen
+            if (member->GetPlayerbotAI())
+            {
+                ChatHandler(_player).PSendSysMessage("|cffff0000You cannot get in battleground queue as premade because you have bots in your group. Adding you in queue as single player.");
+                have_bots = true;
+                joinAsGroup = false;
+                break;
+            }
+        }
+        if (!have_bots)
+        {
+            err = grp->CanJoinBattleGroundQueue(bg, bgQueueTypeId, 0, bg->GetMaxPlayersPerTeam(), false, 0);
+            isPremade = sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH) &&
+                    (grp->GetMembersCount() >= bg->GetMinPlayersPerTeam());
+        }
+    }
+    // if we're here, then the conditions to join a bg are met. We can proceed in joining.
+
+    // _player->GetGroup() was already checked, grp is already initialized
+    BattleGroundQueue& bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId];
+    if (joinAsGroup)
+    {
+        GroupQueueInfo* ginfo = NULL;
+        uint32 avgTime = 0;
+
+        if (err > 0)
+        {
+            DEBUG_LOG("Battleground: the following players are joining as group:");
+            ginfo = bgQueue.AddGroup(_player, grp, bgTypeId, bracketEntry, ARENA_TYPE_NONE, false, isPremade, 0);
+            avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry->GetBracketId());
+        }
+
+        for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* member = itr->getSource();
+            if (!member)
+                continue;                                   // this should never happen
+
+            WorldPacket data;
+
+            if (err <= 0)
+            {
+                sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, err);
+                member->GetSession()->SendPacket(&data);
+                continue;
+            }
+
+            // add to queue
+            uint32 queueSlot = member->AddBattleGroundQueueId(bgQueueTypeId);
+
+            // send status packet (in queue)
+            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, ginfo->arenaType, TEAM_NONE);
+            member->GetSession()->SendPacket(&data);
+            sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, err);
+            member->GetSession()->SendPacket(&data);
+            DEBUG_LOG("Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s", bgQueueTypeId, bgTypeId, member->GetGUIDLow(), member->GetName());
+        }
+        DEBUG_LOG("Battleground: group end");
+    }
+    else
+    {
+        GroupQueueInfo* ginfo = bgQueue.AddGroup(_player, NULL, bgTypeId, bracketEntry, ARENA_TYPE_NONE, false, isPremade, 0);
+        uint32 avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry->GetBracketId());
+        // already checked if queueSlot is valid, now just get it
+        uint32 queueSlot = _player->AddBattleGroundQueueId(bgQueueTypeId);
+
+        WorldPacket data;
+        // send status packet (in queue)
+        sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, ginfo->arenaType, TEAM_NONE);
+        SendPacket(&data);
+        DEBUG_LOG("Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s", bgQueueTypeId, bgTypeId, _player->GetGUIDLow(), _player->GetName());
+    }
+    sBattleGroundMgr.ScheduleQueueUpdate(0, ARENA_TYPE_NONE, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId());
+}
+
+void WorldSession::HandleBattleGroundPlayerPositionsOpcode(WorldPacket& /*recv_data*/)
+{
+    // empty opcode
+    DEBUG_LOG("WORLD: Recvd MSG_BATTLEGROUND_PLAYER_POSITIONS Message");
+
+    BattleGround* bg = _player->GetBattleGround();
+    if (!bg)                                                // can't be received if player not in battleground
+        return;
+
+    switch (bg->GetTypeID(true))
+    {
+        case BATTLEGROUND_WS:
+        {
+            uint32 flagCarrierCount = 0;
+
+            Player* flagCarrierAlliance = sObjectMgr.GetPlayer(((BattleGroundWS*)bg)->GetAllianceFlagCarrierGuid());
+            if (flagCarrierAlliance)
+                ++flagCarrierCount;
+
+            Player* flagCarrierHorde = sObjectMgr.GetPlayer(((BattleGroundWS*)bg)->GetHordeFlagCarrierGuid());
+            if (flagCarrierHorde)
+                ++flagCarrierCount;
+
+            WorldPacket data(MSG_BATTLEGROUND_PLAYER_POSITIONS, 4 + 4 + 16 * flagCarrierCount);
+            data << uint32(0);
+            data << uint32(flagCarrierCount);
+
+            if (flagCarrierAlliance)
+            {
+                data << flagCarrierAlliance->GetObjectGuid();
+                data << float(flagCarrierAlliance->GetPositionX());
+                data << float(flagCarrierAlliance->GetPositionY());
+            }
+            if (flagCarrierHorde)
+            {
+                data << flagCarrierHorde->GetObjectGuid();
+                data << float(flagCarrierHorde->GetPositionX());
+                data << float(flagCarrierHorde->GetPositionY());
+            }
+
+            SendPacket(&data);
+            break;
+        }
+        case BATTLEGROUND_EY:
+        {
+            uint32 flagCarrierCount = 0;
+
+            Player* flagCarrier = sObjectMgr.GetPlayer(((BattleGroundEY*)bg)->GetFlagCarrierGuid());
+            if (flagCarrier)
+                flagCarrierCount = 1;
+
+            WorldPacket data(MSG_BATTLEGROUND_PLAYER_POSITIONS, 4 + 4 + 16 * flagCarrierCount);
+            data << uint32(0);
+            data << uint32(flagCarrierCount);
+
+            if (flagCarrier)
+            {
+                data << flagCarrier->GetObjectGuid();
+                data << float(flagCarrier->GetPositionX());
+                data << float(flagCarrier->GetPositionY());
+            }
+
+            SendPacket(&data);
+            break;
+        }
+        case BATTLEGROUND_AB:
+        case BATTLEGROUND_AV:
+        {
+            // for other BG types - send default
+            WorldPacket data(MSG_BATTLEGROUND_PLAYER_POSITIONS, 4 + 4);
+            data << uint32(0);
+            data << uint32(0);
+            SendPacket(&data);
+            break;
+        }
+        default:
+            // maybe it is sent also in arena - do nothing
+            break;
+    }
+}
+
+void WorldSession::HandlePVPLogDataOpcode(WorldPacket& /*recv_data*/)
+{
+    DEBUG_LOG("WORLD: Recvd MSG_PVP_LOG_DATA Message");
+
+    BattleGround* bg = _player->GetBattleGround();
+    if (!bg)
+        return;
+
+    // arena finish version will send in BattleGround::EndBattleGround directly
+    if (bg->isArena())
+        return;
+
+    WorldPacket data;
+    sBattleGroundMgr.BuildPvpLogDataPacket(&data, bg);
+    SendPacket(&data);
+
+    DEBUG_LOG("WORLD: Sent MSG_PVP_LOG_DATA Message");
+}
+
+void WorldSession::HandleBattlefieldListOpcode(WorldPacket& recv_data)
+{
+    DEBUG_LOG("WORLD: Recvd CMSG_BATTLEFIELD_LIST Message");
+
+    uint32 bgTypeId;
+    recv_data >> bgTypeId;                                  // id from DBC
+
+    uint8 fromWhere;
+    recv_data >> fromWhere;                                 // 0 - battlemaster (lua: ShowBattlefieldList), 1 - UI (lua: RequestBattlegroundInstanceInfo)
+
+    uint8 unk1;
+    recv_data >> unk1;                                      // unknown 3.2.2
+
+    BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(bgTypeId);
+    if (!bl)
+    {
+        sLog.outError("Battleground: invalid bgtype received.");
+        return;
+    }
+
+    WorldPacket data;
+    sBattleGroundMgr.BuildBattleGroundListPacket(&data, ObjectGuid(), _player, BattleGroundTypeId(bgTypeId), fromWhere);
+    SendPacket(&data);
+}
+
+void WorldSession::HandleBattleFieldPortOpcode(WorldPacket& recv_data)
+{
+    DEBUG_LOG("WORLD: Recvd CMSG_BATTLEFIELD_PORT Message");
+
+    uint8 type;                                             // arenatype if arena
+    uint8 unk2;                                             // unk, can be 0x0 (may be if was invited?) and 0x1
+    uint32 bgTypeId_;                                       // type id from dbc
+    uint16 unk;                                             // 0x1F90 constant?
+    uint8 action;                                           // enter battle 0x1, leave queue 0x0
+
+    recv_data >> type >> unk2 >> bgTypeId_ >> unk >> action;
+
+    if (!sBattlemasterListStore.LookupEntry(bgTypeId_))
+    {
+        sLog.outError("BattlegroundHandler: invalid bgtype (%u) received.", bgTypeId_);
+        return;
+    }
+
+    if (type && !IsArenaTypeValid(ArenaType(type)))
+    {
+        sLog.outError("BattlegroundHandler: Invalid CMSG_BATTLEFIELD_PORT received from player (%u), arena type wrong: %u.", _player->GetGUIDLow(), type);
+        return;
+    }
+
+    if (!_player->InBattleGroundQueue())
+    {
+        sLog.outError("BattlegroundHandler: Invalid CMSG_BATTLEFIELD_PORT received from player (%u), he is not in bg_queue.", _player->GetGUIDLow());
+        return;
+    }
+
+    // get GroupQueueInfo from BattleGroundQueue
+    BattleGroundTypeId bgTypeId = BattleGroundTypeId(bgTypeId_);
+    BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, ArenaType(type));
+    BattleGroundQueue& bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId];
+    // we must use temporary variable, because GroupQueueInfo pointer can be deleted in BattleGroundQueue::RemovePlayer() function
+    GroupQueueInfo ginfo;
+    if (!bgQueue.GetPlayerGroupInfoData(_player->GetObjectGuid(), &ginfo))
+    {
+        sLog.outError("BattlegroundHandler: itrplayerstatus not found.");
+        return;
+    }
+    // if action == 1, then instanceId is required
+    if (!ginfo.IsInvitedToBGInstanceGUID && action == 1)
+    {
+        sLog.outError("BattlegroundHandler: instance not found.");
+        return;
+    }
+
+    BattleGround* bg = sBattleGroundMgr.GetBattleGround(ginfo.IsInvitedToBGInstanceGUID, bgTypeId);
+
+    // bg template might and must be used in case of leaving queue, when instance is not created yet
+    if (!bg && action == 0)
+        bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
+    if (!bg)
+    {
+        sLog.outError("BattlegroundHandler: bg_template not found for type id %u.", bgTypeId);
+        return;
+    }
+
+    // expected bracket entry
+    PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel());
+    if (!bracketEntry)
+        return;
+
+    // some checks if player isn't cheating - it is not exactly cheating, but we cannot allow it
+    if (action == 1 && ginfo.arenaType == ARENA_TYPE_NONE)
+    {
+        // if player is trying to enter battleground (not arena!) and he has deserter debuff, we must just remove him from queue
+        if (!_player->CanJoinToBattleground())
+        {
+            // send bg command result to show nice message
+            WorldPacket data2;
+            sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data2, ERR_GROUP_JOIN_BATTLEGROUND_DESERTERS);
+            _player->GetSession()->SendPacket(&data2);
+            action = 0;
+            DEBUG_LOG("Battleground: player %s (%u) has a deserter debuff, do not port him to battleground!", _player->GetName(), _player->GetGUIDLow());
+        }
+        // if player don't match battleground max level, then do not allow him to enter! (this might happen when player leveled up during his waiting in queue
+        if (_player->getLevel() > bg->GetMaxLevel())
+        {
+            sLog.outError("Battleground: Player %s (%u) has level (%u) higher than maxlevel (%u) of battleground (%u)! Do not port him to battleground!",
+                          _player->GetName(), _player->GetGUIDLow(), _player->getLevel(), bg->GetMaxLevel(), bg->GetTypeID());
+            action = 0;
+        }
+    }
+    uint32 queueSlot = _player->GetBattleGroundQueueIndex(bgQueueTypeId);
+    WorldPacket data;
+    switch (action)
+    {
+        case 1:                                         // port to battleground
+            if (!_player->IsInvitedForBattleGroundQueueType(bgQueueTypeId))
+                return;                                 // cheating?
+
+            if (!_player->InBattleGround())
+                _player->SetBattleGroundEntryPoint();
+
+            // resurrect the player
+            if (!_player->isAlive())
+            {
+                _player->ResurrectPlayer(100);
+                _player->SpawnCorpseBones();
+            }
+            // stop taxi flight at port
+            if (_player->IsTaxiFlying())
+                _player->InterruptTaxiFlying();
+
+            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_IN_PROGRESS, 0, bg->GetStartTime(), bg->GetArenaType(), _player->GetBGTeam());
+            _player->GetSession()->SendPacket(&data);
+            // remove battleground queue status from BGmgr
+            bgQueue.RemovePlayer(_player->GetObjectGuid(), false);
+            // this is still needed here if battleground "jumping" shouldn't add deserter debuff
+            // also this is required to prevent stuck at old battleground after SetBattleGroundId set to new
+            if (BattleGround* currentBg = _player->GetBattleGround())
+                currentBg->RemovePlayerAtLeave(_player->GetObjectGuid(), false, true);
+
+            // set the destination instance id
+            _player->SetBattleGroundId(bg->GetInstanceID(), bgTypeId);
+            // set the destination team
+            _player->SetBGTeam(ginfo.GroupTeam);
+            // bg->HandleBeforeTeleportToBattleGround(_player);
+            _player->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+            _player->RemoveSpellsCausingAura(SPELL_AURA_FLY);
+            sBattleGroundMgr.SendToBattleGround(_player, ginfo.IsInvitedToBGInstanceGUID, bgTypeId);
+            // add only in HandleMoveWorldPortAck()
+            // bg->AddPlayer(_player,team);
+            DEBUG_LOG("Battleground: player %s (%u) joined battle for bg %u, bgtype %u, queue type %u.", _player->GetName(), _player->GetGUIDLow(), bg->GetInstanceID(), bg->GetTypeID(), bgQueueTypeId);
+            break;
+        case 0:                                         // leave queue
+            // if player leaves rated arena match before match start, it is counted as he played but he lost
+            /*if (ginfo.IsRated && ginfo.IsInvitedToBGInstanceGUID)
+            {
+                ArenaTeam* at = sObjectMgr.GetArenaTeamById(ginfo.ArenaTeamId);
+                if (at)
+                {
+                    DEBUG_LOG("UPDATING memberLost's personal arena rating for %s by opponents rating: %u, because he has left queue!", _player->GetGuidStr().c_str(), ginfo.OpponentsTeamRating);
+                    at->MemberLost(_player, ginfo.OpponentsTeamRating);
+                    at->SaveToDB();
+                }
+            }*/
+            _player->RemoveBattleGroundQueueId(bgQueueTypeId);  // must be called this way, because if you move this call to queue->removeplayer, it causes bugs
+            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_NONE, 0, 0, ARENA_TYPE_NONE, TEAM_NONE);
+            bgQueue.RemovePlayer(_player->GetObjectGuid(), true);
+            // player left queue, we should update it - do not update Arena Queue
+            if (ginfo.arenaType == ARENA_TYPE_NONE)
+                sBattleGroundMgr.ScheduleQueueUpdate(ginfo.ArenaTeamRating, ginfo.arenaType, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId());
+            SendPacket(&data);
+            DEBUG_LOG("Battleground: player %s (%u) left queue for bgtype %u, queue type %u.", _player->GetName(), _player->GetGUIDLow(), bg->GetTypeID(), bgQueueTypeId);
+            break;
+        default:
+            sLog.outError("Battleground port: unknown action %u", action);
+            break;
+    }
+}
+
+void WorldSession::HandleLeaveBattlefieldOpcode(WorldPacket& recv_data)
+{
+    DEBUG_LOG("WORLD: Recvd CMSG_LEAVE_BATTLEFIELD Message");
+
+    recv_data.read_skip<uint8>();                           // unk1
+    recv_data.read_skip<uint8>();                           // unk2
+    recv_data.read_skip<uint32>();                          // BattleGroundTypeId
+    recv_data.read_skip<uint16>();                          // unk3
+
+    // if(bgTypeId >= MAX_BATTLEGROUND_TYPES)               // cheating? but not important in this case
+    //    return;
+
+    // not allow leave battleground in combat
+    if (_player->isInCombat())
+        if (BattleGround* bg = _player->GetBattleGround())
+            if (bg->GetStatus() != STATUS_WAIT_LEAVE)
+                return;
+
+    _player->LeaveBattleground();
+}
+
+void WorldSession::HandleBattlefieldStatusOpcode(WorldPacket& /*recv_data*/)
+{
+    // empty opcode
+    DEBUG_LOG("WORLD: Battleground status");
+
+    WorldPacket data;
+    // we must update all queues here
+    BattleGround* bg = NULL;
+    for (uint8 i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
+    {
+        BattleGroundQueueTypeId bgQueueTypeId = _player->GetBattleGroundQueueTypeId(i);
+        if (!bgQueueTypeId)
+            continue;
+
+        BattleGroundTypeId bgTypeId = BattleGroundMgr::BGTemplateId(bgQueueTypeId);
+        ArenaType arenaType = BattleGroundMgr::BGArenaType(bgQueueTypeId);
+        // bgTypeId is always BATTLEGROUND_AA for arena whereas GetBattleGroundTypeId() is the actual arena map type
+        if (bgTypeId == _player->GetBattleGroundTypeId() || (bgTypeId == BATTLEGROUND_AA && sBattleGroundMgr.IsArenaType(_player->GetBattleGroundTypeId())))
+        {
+            bg = _player->GetBattleGround();
+            // i cannot check any variable from player class because player class doesn't know if player is in 2v2 / 3v3 or 5v5 arena
+            // so i must use bg pointer to get that information
+            if (bg && bg->GetArenaType() == arenaType)
+            {
+                // this line is checked, i only don't know if GetStartTime is changing itself after bg end!
+                // send status in BattleGround
+                sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, i, STATUS_IN_PROGRESS, bg->GetEndTime(), bg->GetStartTime(), arenaType, _player->GetBGTeam());
+                SendPacket(&data);
+                continue;
+            }
+        }
+        // we are sending update to player about queue - he can be invited there!
+        // get GroupQueueInfo for queue status
+        BattleGroundQueue& bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId];
+        GroupQueueInfo ginfo;
+        if (!bgQueue.GetPlayerGroupInfoData(_player->GetObjectGuid(), &ginfo))
+            continue;
+        if (ginfo.IsInvitedToBGInstanceGUID)
+        {
+            bg = sBattleGroundMgr.GetBattleGround(ginfo.IsInvitedToBGInstanceGUID, bgTypeId);
+            if (!bg)
+                continue;
+            uint32 remainingTime = WorldTimer::getMSTimeDiff(WorldTimer::getMSTime(), ginfo.RemoveInviteTime);
+            // send status invited to BattleGround
+            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, i, STATUS_WAIT_JOIN, remainingTime, 0, arenaType, TEAM_NONE);
+            SendPacket(&data);
+        }
+        else
+        {
+            bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
+            if (!bg)
+                continue;
+
+            // expected bracket entry
+            PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel());
+            if (!bracketEntry)
+                continue;
+
+            uint32 avgTime = bgQueue.GetAverageQueueWaitTime(&ginfo, bracketEntry->GetBracketId());
+            // send status in BattleGround Queue
+            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, i, STATUS_WAIT_QUEUE, avgTime, WorldTimer::getMSTimeDiff(ginfo.JoinTime, WorldTimer::getMSTime()), arenaType, TEAM_NONE);
+            SendPacket(&data);
+        }
+    }
+}
+
+void WorldSession::HandleAreaSpiritHealerQueryOpcode(WorldPacket& recv_data)
+{
+    DEBUG_LOG("WORLD: CMSG_AREA_SPIRIT_HEALER_QUERY");
+
+    BattleGround* bg = _player->GetBattleGround();
+    if (!bg)
+        return;
+
+    ObjectGuid guid;
+    recv_data >> guid;
+
+    Creature* unit = GetPlayer()->GetMap()->GetCreature(guid);
+    if (!unit)
+        return;
+
+    if (!unit->isSpiritService())                           // it's not spirit service
+        return;
+
+    unit->SendAreaSpiritHealerQueryOpcode(GetPlayer());
+}
+
+void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPacket& recv_data)
+{
+    DEBUG_LOG("WORLD: CMSG_AREA_SPIRIT_HEALER_QUEUE");
+
+    BattleGround* bg = _player->GetBattleGround();
+    if (!bg)
+        return;
+
+    ObjectGuid guid;
+    recv_data >> guid;
+
+    Creature* unit = GetPlayer()->GetMap()->GetCreature(guid);
+    if (!unit)
+        return;
+
+    if (!unit->isSpiritService())                           // it's not spirit service
+        return;
+
+    sScriptMgr.OnGossipHello(GetPlayer(), unit);
+}
+
+void WorldSession::HandleBattlemasterJoinArena(WorldPacket& recv_data)
+{
+    DEBUG_LOG("WORLD: CMSG_BATTLEMASTER_JOIN_ARENA");
+    // recv_data.hexlike();
+
+    ObjectGuid guid;                                        // arena Battlemaster guid
+    uint8 arenaslot;                                        // 2v2, 3v3 or 5v5
+    uint8 asGroup;                                          // asGroup
+    uint8 isRated;                                          // isRated
+
+    recv_data >> guid >> arenaslot >> asGroup >> isRated;
+
+    // ignore if we already in BG or BG queue
+    if (_player->InBattleGround())
+        return;
+
+    Creature* unit = GetPlayer()->GetMap()->GetCreature(guid);
+    if (!unit)
+        return;
+
+    if (!unit->isBattleMaster())                            // it's not battle master
+        return;
+
+    ArenaType arenatype;
+    uint32 arenaRating = 0;
+
+    switch (arenaslot)
+    {
+        case 0:
+            arenatype = ARENA_TYPE_2v2;
+            break;
+        case 1:
+            arenatype = ARENA_TYPE_3v3;
+            break;
+        case 2:
+            arenatype = ARENA_TYPE_5v5;
+            break;
+        default:
+            sLog.outError("Unknown arena slot %u at HandleBattlemasterJoinArena()", arenaslot);
+            return;
+    }
+
+    // check existence
+    BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(BATTLEGROUND_AA);
+    if (!bg)
+    {
+        sLog.outError("Battleground: template bg (all arenas) not found");
+        return;
+    }
+
+    BattleGroundTypeId bgTypeId = bg->GetTypeID();
+    BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, arenatype);
+    PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel());
+    if (!bracketEntry)
+        return;
+
+    GroupJoinBattlegroundResult err;
+
+    Group* grp = NULL;
+
+    // check queue conditions
+    if (!asGroup)
+    {
+        // you can't join in this way by client
+        if (isRated)
+            return;
+
+        // check if already in queue
+        if (_player->GetBattleGroundQueueIndex(bgQueueTypeId) < PLAYER_MAX_BATTLEGROUND_QUEUES)
+            // player is already in this queue
+            return;
+        // check if has free queue slots
+        if (!_player->HasFreeBattleGroundQueueId())
+            return;
+    }
+    else
+    {
+        grp = _player->GetGroup();
+        // no group found, error
+        if (!grp || grp->isLFDGroup())
+            return;
+        if (grp->GetLeaderGuid() != _player->GetObjectGuid())
+            return;
+        // may be Group::CanJoinBattleGroundQueue should be moved to player class...
+        err = grp->CanJoinBattleGroundQueue(bg, bgQueueTypeId, arenatype, arenatype, (bool)isRated, arenaslot);
+    }
+
+    uint32 ateamId = 0;
+
+    if (isRated)
+    {
+        ateamId = _player->GetArenaTeamId(arenaslot);
+        // check real arena team existence only here (if it was moved to group->CanJoin .. () then we would have to get it twice)
+        ArenaTeam* at = sObjectMgr.GetArenaTeamById(ateamId);
+        if (!at)
+        {
+            _player->GetSession()->SendNotInArenaTeamPacket(arenatype);
+            return;
+        }
+        // get the team rating for queue
+        arenaRating = at->GetRating();
+        // the arena team id must match for everyone in the group
+        // get the personal ratings for queue
+        uint32 avg_pers_rating = 0;
+
+        for (Group::member_citerator citr = grp->GetMemberSlots().begin(); citr != grp->GetMemberSlots().end(); ++citr)
+        {
+            ArenaTeamMember const* at_member = at->GetMember(citr->guid);
+            if (!at_member)                                 // group member joining to arena must be in leader arena team
+                return;
+
+            avg_pers_rating += at_member->matchmaker_rating;
+        }
+
+        avg_pers_rating /= grp->GetMembersCount();
+
+        /* Save mmr before enter arena (matchmaker rating fix) */
+        at->SetBattleRating(avg_pers_rating);
+
+        arenaRating = avg_pers_rating;
+    }
+
+    BattleGroundQueue& bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId];
+    if (asGroup)
+    {
+        uint32 avgTime = 0;
+
+        if (err > 0)
+        {
+            DEBUG_LOG("Battleground: arena join as group start");
+            if (isRated)
+                DEBUG_LOG("Battleground: arena team id %u, leader %s queued with rating %u for type %u", _player->GetArenaTeamId(arenaslot), _player->GetName(), arenaRating, arenatype);
+
+            // set arena rated type to show correct minimap arena icon
+            bg->SetRated(isRated);
+
+            GroupQueueInfo* ginfo = bgQueue.AddGroup(_player, grp, bgTypeId, bracketEntry, arenatype, isRated, false, arenaRating, ateamId);
+            avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry->GetBracketId());
+        }
+
+        for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* member = itr->getSource();
+            if (!member)
+                continue;
+
+            WorldPacket data;
+
+            if (err <= 0)
+            {
+                sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, err);
+                member->GetSession()->SendPacket(&data);
+                continue;
+            }
+
+            // add to queue
+            uint32 queueSlot = member->AddBattleGroundQueueId(bgQueueTypeId);
+
+            // send status packet (in queue)
+            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, arenatype, TEAM_NONE);
+            member->GetSession()->SendPacket(&data);
+            sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, err);
+            member->GetSession()->SendPacket(&data);
+            DEBUG_LOG("Battleground: player joined queue for arena as group bg queue type %u bg type %u: GUID %u, NAME %s", bgQueueTypeId, bgTypeId, member->GetGUIDLow(), member->GetName());
+        }
+        DEBUG_LOG("Battleground: arena join as group end");
+    }
+    else
+    {
+        GroupQueueInfo* ginfo = bgQueue.AddGroup(_player, NULL, bgTypeId, bracketEntry, arenatype, isRated, false, arenaRating, ateamId);
+        uint32 avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry->GetBracketId());
+        uint32 queueSlot = _player->AddBattleGroundQueueId(bgQueueTypeId);
+
+        WorldPacket data;
+        // send status packet (in queue)
+        sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, arenatype, TEAM_NONE);
+        SendPacket(&data);
+        DEBUG_LOG("Battleground: player joined queue for arena, skirmish, bg queue type %u bg type %u: GUID %u, NAME %s", bgQueueTypeId, bgTypeId, _player->GetGUIDLow(), _player->GetName());
+    }
+    sBattleGroundMgr.ScheduleQueueUpdate(arenaRating, arenatype, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId());
+}
+
+void WorldSession::HandleReportPvPAFK(WorldPacket& recv_data)
+{
+    ObjectGuid playerGuid;
+    recv_data >> playerGuid;
+    Player* reportedPlayer = sObjectMgr.GetPlayer(playerGuid);
+
+    if (!reportedPlayer)
+    {
+        DEBUG_LOG("WorldSession::HandleReportPvPAFK: player not found");
+        return;
+    }
+
+    DEBUG_LOG("WorldSession::HandleReportPvPAFK: %s reported %s", _player->GetName(), reportedPlayer->GetName());
+
+    reportedPlayer->ReportedAfkBy(_player);
+}
diff --git a/src/game/BattleGround/BattleGroundIC.cpp b/src/game/BattleGround/BattleGroundIC.cpp
new file mode 100644
index 00000000000..b31315bab0c
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundIC.cpp
@@ -0,0 +1,922 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Player.h"
+#include "BattleGround.h"
+#include "BattleGroundIC.h"
+#include "BattleGroundMgr.h"
+#include "Language.h"
+#include "WorldPacket.h"
+#include "GameObject.h"
+#include "ObjectMgr.h"
+#include "Vehicle.h"
+#include "Creature.h"
+#include "MapManager.h"
+#include "Transports.h"
+#include "Object.h"
+#include "Util.h"
+
+/*
+* BattleGround Isle of Conquest:
+* TODO:
+*   - Fix Vehicles on Transports; teleporting from ground onto transports; transports disappearing after relog
+*   - Add scripts to bosses (Crushing Leap, Rage)
+*   - Correct spawn of Siege Engine
+*   - If a base is owned by a team and a vehicle from the base IS being used, it should not disappear if the opposite team caps the base
+*   - Fix buffs from owning quarry / refinery for +15% siege dmg (they are given correctly, just dont work)
+*/
+
+BattleGroundIC::BattleGroundIC()
+{
+    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_BG_IC_START_TWO_MINUTES;
+    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_IC_START_ONE_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_IC_START_HALF_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_IC_HAS_BEGUN;
+
+    m_BgObjects.resize(BG_IC_MAXOBJ);
+}
+
+BattleGroundIC::~BattleGroundIC()
+{
+}
+
+void BattleGroundIC::Reset()
+{
+    //call parent's class reset
+    BattleGround::Reset();
+
+    for (uint8 i = 0; i < BG_IC_GATE_MAX; i++)
+        GateStatus[i] = BG_IC_GO_GATES_NORMAL;
+
+    closeFortressDoorsTimer = CLOSE_DOORS_TIME;
+    doorsClosed = false;        // main keep gates
+    aOpen = false;              // gate to the alli boss
+    hOpen = false;              // gate to the horde boss
+
+    for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
+        m_TeamScores[i] = BG_IC_SCORE_INITIAL_POINTS;
+
+    for (uint8 i = 0; i < BG_IC_NODES_MAX; ++i)
+    {
+        m_prevNodes[i] = 0;
+        m_NodeTimers[i] = 0;
+        m_BannerTimers[i].timer = 0;
+
+        // all nodes except keeps are owned by neutral team at the beginning
+        if (i < BG_IC_NODE_A_KEEP)
+        {
+            m_ActiveEvents[i] = BG_IC_NODE_TYPE_NEUTRAL;
+            m_Nodes[i] = 0;
+        }
+    }
+
+    // you get reinforcements/honor just for owning quarry and refinery
+    for (uint8 node = BG_IC_NODE_QUARRY; node <= BG_IC_NODE_REFINERY; node++)
+    {
+        m_resource_Timer[node] = BG_IC_RESOURCE_TICK_TIMER;
+    }
+
+    m_ActiveEvents[BG_IC_NODE_A_KEEP] = BG_IC_NODE_STATUS_ALLY_OCCUPIED;
+    m_ActiveEvents[BG_IC_NODE_H_KEEP] = BG_IC_NODE_STATUS_HORDE_OCCUPIED;
+    m_Nodes[BG_IC_NODE_A_KEEP] = BG_IC_NODE_STATUS_ALLY_OCCUPIED;
+    m_Nodes[BG_IC_NODE_H_KEEP] = BG_IC_NODE_STATUS_HORDE_OCCUPIED;
+
+    SpawnEvent(IC_EVENT_ADD_TELEPORT, 0, true);
+    SpawnEvent(IC_EVENT_ADD_VEH, 0, true);
+    SpawnEvent(IC_EVENT_BOSS_H, 0, true);
+    SpawnEvent(IC_EVENT_BOSS_A, 0, true);
+
+    // spawn bosses and their guards just when one of the gates is destroyed, to prevent some abusing
+    SpawnEvent(IC_EVENT_ADD_A_BOSS, 0, false);
+    SpawnEvent(IC_EVENT_ADD_A_GUARDS, 0, false);
+    SpawnEvent(IC_EVENT_ADD_H_BOSS, 0, false);
+    SpawnEvent(IC_EVENT_ADD_H_GUARDS, 0, false);
+
+    SpawnGates();
+
+    gunshipHorde = NULL;
+    gunshipAlliance = NULL;
+}
+
+void BattleGroundIC::SendTransportInit(Player* player)
+{
+    if (!gunshipAlliance || !gunshipHorde)
+        return;
+
+    UpdateData transData;
+
+    gunshipAlliance->BuildCreateUpdateBlockForPlayer(&transData, player);
+    gunshipHorde->BuildCreateUpdateBlockForPlayer(&transData, player);
+
+    WorldPacket packet;
+
+    transData.BuildPacket(&packet);
+    player->GetSession()->SendPacket(&packet);
+}
+
+void BattleGroundIC::UpdateScore(TeamIndex teamIdx, int32 points )
+{
+    // note: to remove reinforcements points must be negative, for adding reinforcements points must be positive
+    MANGOS_ASSERT( teamIdx == TEAM_INDEX_ALLIANCE || teamIdx == TEAM_INDEX_HORDE);
+    m_TeamScores[teamIdx] += points;                      // m_TeamScores is int32 - so no problems here
+
+    if (points < 0)
+    {
+        if (m_TeamScores[teamIdx] < 1)
+        {
+            m_TeamScores[teamIdx] = 0;
+            // other team will win:
+            EndBattleGround((teamIdx == TEAM_INDEX_ALLIANCE)? HORDE : ALLIANCE);
+        }
+    }
+    // must be called here, else it could display a negative value
+    UpdateWorldState(((teamIdx == TEAM_INDEX_HORDE) ? BG_TEAM_HORDE_REINFORC : BG_TEAM_ALLIANCE_REINFORC), m_TeamScores[teamIdx]);
+}
+
+void BattleGroundIC::Update(uint32 diff)
+{
+    BattleGround::Update(diff);
+
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    if (!doorsClosed)
+    {
+        if (closeFortressDoorsTimer <= diff)
+        {
+            // correct visual of closed gates is at "damaged" flag
+            for (int i = BG_IC_GO_T_ALLIANCE_GATE_1; i <= BG_IC_GO_T_HORDE_GATE_3; ++i)
+                GetBGObject(i)->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED);
+
+            for (int i = BG_IC_GO_T_ALLIANCE_WEST; i <= BG_IC_GO_T_HORDE_FRONT; ++i)
+                DelObject(i);
+
+            doorsClosed = true;
+        } else closeFortressDoorsTimer -= diff;
+    }
+
+    for (int node = 0; node < BG_IC_NODES_MAX; ++node)
+    {
+        // 3 sec delay to spawn new banner instead previous despawned one
+        if (m_BannerTimers[node].timer)
+        {
+            if (m_BannerTimers[node].timer > diff)
+                m_BannerTimers[node].timer -= diff;
+            else
+            {
+                m_BannerTimers[node].timer = 0;
+                _CreateBanner(node, m_BannerTimers[node].type, m_BannerTimers[node].teamIndex, false);
+            }
+        }
+
+        // 1-minute to occupy a node from contested state
+        if (m_NodeTimers[node])
+        {
+            if (m_NodeTimers[node] > diff)
+                m_NodeTimers[node] -= diff;
+            else
+            {
+                m_NodeTimers[node] = 0;
+                // Change from contested to occupied !
+                uint8 teamIndex = m_Nodes[node]-1;
+                m_prevNodes[node] = m_Nodes[node];
+                m_Nodes[node] += 2;
+                // create new occupied banner
+                _CreateBanner(node, BG_IC_NODE_TYPE_OCCUPIED, teamIndex, true);
+                _SendNodeUpdate(node);
+                // Message to chatlog
+                if (teamIndex == TEAM_INDEX_ALLIANCE)
+                {
+                    SendMessage2ToAll(LANG_BG_IC_NODE_TAKEN,CHAT_MSG_BG_SYSTEM_ALLIANCE,NULL,LANG_BG_ALLY,_GetNodeNameId(node));
+                    PlaySoundToAll(BG_IC_SOUND_NODE_CAPTURED_ALLIANCE);
+                }
+                else
+                {
+                    SendMessage2ToAll(LANG_BG_IC_NODE_TAKEN,CHAT_MSG_BG_SYSTEM_HORDE,NULL,LANG_BG_HORDE,_GetNodeNameId(node));
+                    PlaySoundToAll(BG_IC_SOUND_NODE_CAPTURED_HORDE);
+                }
+
+                // gunship starting
+                if (node == BG_IC_NODE_HANGAR)
+                    (teamIndex == TEAM_INDEX_ALLIANCE ? gunshipAlliance : gunshipHorde)->Start();
+            }
+        }
+    }
+
+    // add a point every 45 secs to quarry/refinery owner
+    for (uint8 node = BG_IC_NODE_QUARRY; node <= BG_IC_NODE_REFINERY; node++)
+    {
+        if (m_Nodes[node] >= BG_IC_NODE_TYPE_OCCUPIED)
+        {
+            if (m_resource_Timer[node] <= diff)
+            {
+                UpdateScore(TeamIndex(m_Nodes[node] - BG_IC_NODE_TYPE_OCCUPIED) , 1);
+                RewardHonorToTeam(GetBonusHonorFromKill(1), (m_Nodes[node] - BG_IC_NODE_TYPE_OCCUPIED == 0 ? ALLIANCE : HORDE));
+                m_resource_Timer[node] = BG_IC_RESOURCE_TICK_TIMER;
+            }
+            else
+                m_resource_Timer[node] -= diff;
+        }
+    }
+    HandleBuffs();
+}
+
+void BattleGroundIC::StartingEventCloseDoors()
+{
+}
+
+void BattleGroundIC::StartingEventOpenDoors()
+{
+    OpenDoorEvent(BG_EVENT_DOOR);                        // used for activating teleport effects + opening tower gates
+    for (int i = BG_IC_GO_T_ALLIANCE_WEST; i <= BG_IC_GO_T_HORDE_FRONT; ++i)
+        DoorOpen(m_BgObjects[i]);
+
+    // make teleporters clickable
+    MakeInteractive(IC_EVENT_ADD_TELEPORT, 0, true);
+}
+
+void BattleGroundIC::AddPlayer(Player* plr)
+{
+    BattleGround::AddPlayer(plr);
+    // create score and add it to map, default values are set in constructor
+    BattleGroundICScore* sc = new BattleGroundICScore;
+
+    m_PlayerScores[plr->GetObjectGuid()] = sc;
+
+    SendTransportInit(plr);
+
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        MakeInteractive(IC_EVENT_ADD_TELEPORT, 0, false);
+    else
+        // default behaviour of teleports is "clickable", so this could be also skipped
+        MakeInteractive(IC_EVENT_ADD_TELEPORT, 0, true);
+}
+
+void BattleGroundIC::RemovePlayer(Player* plr)
+{
+    if (plr)
+    {
+        plr->RemoveAurasDueToSpell(SPELL_QUARRY);
+        plr->RemoveAurasDueToSpell(SPELL_REFINERY);
+    }
+}
+
+void BattleGroundIC::HandleAreaTrigger(Player* source, uint32 trigger)
+{
+    // this is wrong way to implement these things. On official it done by gameobject spell cast.
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    switch (trigger)
+    {
+        case 5535:
+            if (source->GetTeam() == ALLIANCE && hOpen == false)
+                source->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 68502);
+            break;
+        case 5555:
+            if (source->GetTeam() == HORDE && aOpen == false)
+                source->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 68502);
+            break;
+        case 5536:
+            break;
+        default:
+            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", trigger);
+            source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", trigger);
+            break;
+    }
+}
+
+/*  type: 0-neutral, 1-contested, 3-occupied
+    teamIndex: 0-ally, 1-horde                        */
+void BattleGroundIC::_CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay)
+{
+    // Just put it into the queue
+    if (delay)
+    {
+        m_BannerTimers[node].timer = 2000;
+        m_BannerTimers[node].type = type;
+        m_BannerTimers[node].teamIndex = teamIndex;
+        return;
+    }
+
+    // cause the node-type is in the generic form
+    // please see in the headerfile for the ids
+    if (type != BG_IC_NODE_TYPE_NEUTRAL)
+        type += teamIndex;
+
+    SpawnEvent(node, type, true);                           // will automaticly despawn other events
+}
+
+int32 BattleGroundIC::_GetNodeNameId(uint8 node)
+{
+    switch (node)
+    {
+        case BG_IC_NODE_DOCKS:    return LANG_BG_IC_NODE_DOCKS;
+        case BG_IC_NODE_HANGAR:   return LANG_BG_IC_NODE_HANGAR;
+        case BG_IC_NODE_WORKSHOP: return LANG_BG_IC_NODE_WORKSHOP;
+        case BG_IC_NODE_QUARRY:   return LANG_BG_IC_NODE_QUARRY;
+        case BG_IC_NODE_REFINERY: return LANG_BG_IC_NODE_REFINERY;
+        case BG_IC_NODE_A_KEEP:   return LANG_BG_IC_ALLIANCE_KEEP;
+        case BG_IC_NODE_H_KEEP:   return LANG_BG_IC_HORDE_KEEP;
+        default:
+            MANGOS_ASSERT(0);
+            break;
+    }
+    return 0;
+}
+
+void BattleGroundIC::UpdatePlayerScore(Player* source, uint32 type, uint32 value, bool doAddHonor)
+{
+    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(source->GetObjectGuid());
+
+    if (itr == m_PlayerScores.end())                         // player not found...
+        return;
+
+    switch(type)
+    {
+        case SCORE_BASES_ASSAULTED:
+            ((BattleGroundICScore*)itr->second)->BasesAssaulted += value;
+            break;
+        case SCORE_BASES_DEFENDED:
+            ((BattleGroundICScore*)itr->second)->BasesDefended += value;
+            break;
+        default:
+            BattleGround::UpdatePlayerScore(source, type, value);
+            break;
+    }
+}
+
+void BattleGroundIC::FillInitialWorldStates()
+{
+    FillInitialWorldState(BG_TEAM_ALLIANCE_REINFORC_SET, BG_TEAM_ALLIANCE_REINFORC_SET);
+    FillInitialWorldState(BG_TEAM_HORDE_RENFORC_SET,     BG_TEAM_HORDE_RENFORC_SET);
+    FillInitialWorldState(BG_TEAM_ALLIANCE_REINFORC,     m_TeamScores[TEAM_INDEX_ALLIANCE]);
+    FillInitialWorldState(BG_TEAM_HORDE_REINFORC,        m_TeamScores[TEAM_INDEX_HORDE]);
+
+    // Gate icons
+    for (uint8 z = 0; z < BG_IC_GATE_MAX; ++z)
+        FillInitialWorldState(BG_IC_GateStatus[z][GateStatus[z] == BG_IC_GO_GATES_DAMAGE ? 1 : 0], 1);
+
+    // Node icons
+    for (uint8 node = 0; node < BG_IC_NODES_MAX; ++node)
+        FillInitialWorldState( BG_IC_OP_NODEICONS[node], m_Nodes[node] == 0);
+
+    for (uint8 i = 0; i < BG_IC_NODES_MAX; ++i)
+        for (uint8 j = 0; j < 4; j++)
+            FillInitialWorldState(BG_IC_NodeWorldStates[i][j], m_Nodes[i] == (j + 1));
+}
+
+bool BattleGroundIC::SetupBattleGround()
+{
+    gunshipHorde = CreateTransport(GO_HORDE_GUNSHIP,TRANSPORT_PERIOD_TIME);
+    gunshipAlliance = CreateTransport(GO_ALLIANCE_GUNSHIP,TRANSPORT_PERIOD_TIME);
+
+    if (!gunshipAlliance || !gunshipHorde)
+    {
+        sLog.outError("Isle of Conquest: There was an error creating gunships!");
+        return false;
+    }
+
+    //Send transport init packet to all player in map
+    for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end();itr++)
+    {
+        Player* player = sObjectMgr.GetPlayer(itr->first);
+        if (player)
+            SendTransportInit(player);
+    }
+
+    return true;
+}
+
+void BattleGroundIC::SpawnGates()
+{
+    // is making arrays for spawning these worth it ?
+    AddObject(BG_IC_GO_T_ALLIANCE_GATE_1, BG_IC_GO_ALLIANCE_GATE_1, BG_IC_GATELOCS[0][0], BG_IC_GATELOCS[0][1], BG_IC_GATELOCS[0][2], BG_IC_GATELOCS[0][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+    AddObject(BG_IC_GO_T_ALLIANCE_GATE_2, BG_IC_GO_ALLIANCE_GATE_2, BG_IC_GATELOCS[1][0], BG_IC_GATELOCS[1][1], BG_IC_GATELOCS[1][2], BG_IC_GATELOCS[1][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+    AddObject(BG_IC_GO_T_ALLIANCE_GATE_3, BG_IC_GO_ALLIANCE_GATE_3, BG_IC_GATELOCS[2][0], BG_IC_GATELOCS[2][1], BG_IC_GATELOCS[2][2], BG_IC_GATELOCS[2][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+    AddObject(BG_IC_GO_T_HORDE_GATE_1, BG_IC_GO_HORDE_GATE_1, BG_IC_GATELOCS[3][0], BG_IC_GATELOCS[3][1], BG_IC_GATELOCS[3][2], BG_IC_GATELOCS[3][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+    AddObject(BG_IC_GO_T_HORDE_GATE_2, BG_IC_GO_HORDE_GATE_2, BG_IC_GATELOCS[4][0], BG_IC_GATELOCS[4][1], BG_IC_GATELOCS[4][2], BG_IC_GATELOCS[4][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+    AddObject(BG_IC_GO_T_HORDE_GATE_3, BG_IC_GO_HORDE_GATE_3, BG_IC_GATELOCS[5][0], BG_IC_GATELOCS[5][1], BG_IC_GATELOCS[5][2], BG_IC_GATELOCS[5][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+
+    AddObject(BG_IC_GO_T_ALLIANCE_WEST, BG_IC_GO_ALLIANCE_PORT, BG_IC_GATELOCS[0][0], BG_IC_GATELOCS[0][1], BG_IC_GATELOCS[0][2], BG_IC_GATELOCS[0][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+    AddObject(BG_IC_GO_T_ALLIANCE_EAST, BG_IC_GO_ALLIANCE_PORT, BG_IC_GATELOCS[1][0], BG_IC_GATELOCS[1][1], BG_IC_GATELOCS[1][2], BG_IC_GATELOCS[1][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+    AddObject(BG_IC_GO_T_ALLIANCE_FRONT, BG_IC_GO_ALLIANCE_PORT, BG_IC_GATELOCS[2][0], BG_IC_GATELOCS[2][1], BG_IC_GATELOCS[2][2], BG_IC_GATELOCS[2][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+    AddObject(BG_IC_GO_T_HORDE_WEST, BG_IC_GO_HORDE_PORT, BG_IC_GATELOCS[3][0], BG_IC_GATELOCS[3][1], BG_IC_GATELOCS[3][2], BG_IC_GATELOCS[3][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+    AddObject(BG_IC_GO_T_HORDE_EAST, BG_IC_GO_HORDE_PORT, BG_IC_GATELOCS[4][0], BG_IC_GATELOCS[4][1], BG_IC_GATELOCS[4][2], BG_IC_GATELOCS[4][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+    AddObject(BG_IC_GO_T_HORDE_FRONT, BG_IC_GO_HORDE_PORT, BG_IC_GATELOCS[5][0], BG_IC_GATELOCS[5][1], BG_IC_GATELOCS[5][2], BG_IC_GATELOCS[5][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_IMMEDIATELY);
+
+    for (int i = 0; i < BG_IC_MAXOBJ; ++i)
+        SpawnBGObject(m_BgObjects[i], RESPAWN_IMMEDIATELY);
+}
+
+void BattleGroundIC::HandleKillUnit(Creature *creature, Player *killer)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+       return;
+
+    uint8 event1 = (sBattleGroundMgr.GetCreatureEventIndex(creature->GetGUIDLow())).event1;
+    if (event1 == BG_EVENT_NONE)
+        return;
+
+    switch (event1)
+    {
+        case IC_EVENT_ADD_A_BOSS:
+            RewardHonorToTeam(GetBonusHonorFromKill(BG_IC_KILL_BOSS), HORDE);
+            EndBattleGround(HORDE);
+            break;
+        case IC_EVENT_ADD_H_BOSS:
+            RewardHonorToTeam(GetBonusHonorFromKill(BG_IC_KILL_BOSS), ALLIANCE);
+            EndBattleGround(ALLIANCE);
+            break;
+    }
+
+    if (creature->IsVehicle())
+        // must be killing blow
+        killer->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 68357);
+}
+
+void BattleGroundIC::HandleKillPlayer(Player* player, Player* killer)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    BattleGround::HandleKillPlayer(player, killer);
+    UpdateScore(GetTeamIndex(player->GetTeam()), -1);
+}
+
+void BattleGroundIC::EndBattleGround(Team winner)
+{
+    //win reward
+    if (winner)
+    {
+        RewardHonorToTeam(GetBonusHonorFromKill(1), winner);
+        RewardXpToTeam(0, 0.8f, winner);
+    }
+
+    //complete map_end rewards (even if no team wins)
+    RewardHonorToTeam(GetBonusHonorFromKill(2), HORDE);
+    RewardHonorToTeam(GetBonusHonorFromKill(2), ALLIANCE);
+    RewardXpToTeam(0, 0.8f, ALLIANCE);
+    RewardXpToTeam(0, 0.8f, HORDE);
+
+    BattleGround::EndBattleGround(winner);
+}
+
+void BattleGroundIC::_SendNodeUpdate(uint8 node)
+{
+    // Needed to prevent client from bugging
+    UpdateWorldState(BG_IC_OP_NODEICONS[node], m_Nodes[node] == 0);
+
+    // Send node owner state update to refresh map icons on client
+    for (uint8 j = 0; j < 4; j++)
+        UpdateWorldState(BG_IC_NodeWorldStates[node][j], m_Nodes[node] == (j + 1));
+
+    if ((node == BG_IC_NODE_QUARRY) || (node == BG_IC_NODE_REFINERY))
+    {
+        if (m_Nodes[node] >= BG_IC_NODE_TYPE_OCCUPIED)
+            m_resource_Timer[node] = BG_IC_RESOURCE_TICK_TIMER;
+    }
+}
+
+void BattleGroundIC::EventPlayerClickedOnFlag(Player *source, GameObject* target_obj)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    uint8 event = (sBattleGroundMgr.GetGameObjectEventIndex(target_obj->GetGUIDLow())).event1;
+    if (event >= BG_IC_NODES_MAX)                           // not a node
+        return;
+
+    BG_IC_Nodes node = BG_IC_Nodes(event);
+
+    TeamIndex teamIndex = GetTeamIndex(source->GetTeam());
+
+    // Check if player really could use this banner, not cheated
+    if (!(m_Nodes[node] == 0 || teamIndex == m_Nodes[node] % 2))
+        return;
+
+    source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
+    uint32 sound = 0;
+
+    // TODO in the following code we should restructure a bit to avoid
+    // duplication (or maybe write functions?)
+    // If node is neutral, change to contested
+    if (m_Nodes[node] == BG_IC_NODE_TYPE_NEUTRAL)
+    {
+        UpdatePlayerScore(source, SCORE_BASES_ASSAULTED, 1);
+        source->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE,1,245);
+        m_prevNodes[node] = m_Nodes[node];
+        m_Nodes[node] = teamIndex + 1;
+        // create new contested banner
+        _CreateBanner(node, BG_IC_NODE_TYPE_CONTESTED, teamIndex, true);
+        _SendNodeUpdate(node);
+        m_NodeTimers[node] = BG_IC_FLAG_CAPTURING_TIME;
+
+        if (teamIndex == TEAM_INDEX_ALLIANCE)
+            SendMessage2ToAll(LANG_BG_IC_NODE_CLAIMED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node), LANG_BG_ALLY);
+        else
+            SendMessage2ToAll(LANG_BG_IC_NODE_CLAIMED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node), LANG_BG_HORDE);
+
+        sound = BG_IC_SOUND_NODE_CLAIMED;
+    }
+    // If node is contested
+    else if ((m_Nodes[node] == BG_IC_NODE_STATUS_ALLY_CONTESTED) || (m_Nodes[node] == BG_IC_NODE_STATUS_HORDE_CONTESTED))
+    {
+        // If last state is NOT occupied, change node to enemy-contested
+        if (m_prevNodes[node] < BG_IC_NODE_TYPE_OCCUPIED)
+        {
+            UpdatePlayerScore(source, SCORE_BASES_ASSAULTED, 1);
+            m_prevNodes[node] = m_Nodes[node];
+            m_Nodes[node] = teamIndex + BG_IC_NODE_TYPE_CONTESTED;
+            // create new contested banner
+            _CreateBanner(node, BG_IC_NODE_TYPE_CONTESTED, teamIndex, true);
+            _SendNodeUpdate(node);
+            m_NodeTimers[node] = BG_IC_FLAG_CAPTURING_TIME;
+
+            if (teamIndex == TEAM_INDEX_ALLIANCE)
+                SendMessage2ToAll(LANG_BG_IC_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
+            else
+                SendMessage2ToAll(LANG_BG_IC_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node));
+        }
+        // If contested, change back to occupied
+        else
+        {
+            UpdatePlayerScore(source, SCORE_BASES_DEFENDED, 1);
+            source->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE,1,246);
+            m_prevNodes[node] = m_Nodes[node];
+            m_Nodes[node] = teamIndex + BG_IC_NODE_TYPE_OCCUPIED;
+            // create new occupied banner
+            _CreateBanner(node, BG_IC_NODE_TYPE_OCCUPIED, teamIndex, true);
+            _SendNodeUpdate(node);
+            m_NodeTimers[node] = 0;
+
+            if (teamIndex == TEAM_INDEX_ALLIANCE)
+                SendMessage2ToAll(LANG_BG_IC_NODE_DEFENDED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
+            else
+                SendMessage2ToAll(LANG_BG_IC_NODE_DEFENDED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node));
+        }
+        sound = (teamIndex == TEAM_INDEX_ALLIANCE) ? BG_IC_SOUND_NODE_ASSAULTED_ALLIANCE : BG_IC_SOUND_NODE_ASSAULTED_HORDE;
+    }
+
+    // If node is occupied, change to enemy-contested
+    else
+    {
+        UpdatePlayerScore(source, SCORE_BASES_ASSAULTED, 1);
+        source->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE,1,245);
+        m_prevNodes[node] = m_Nodes[node];
+        m_Nodes[node] = teamIndex + BG_IC_NODE_TYPE_CONTESTED;
+        // create new contested banner
+        _CreateBanner(node, BG_IC_NODE_TYPE_CONTESTED, teamIndex, true);
+        _SendNodeUpdate(node);
+        m_NodeTimers[node] = BG_IC_FLAG_CAPTURING_TIME;
+
+        if (teamIndex == TEAM_INDEX_ALLIANCE)
+            SendMessage2ToAll(LANG_BG_IC_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
+        else
+            SendMessage2ToAll(LANG_BG_IC_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node));
+
+        sound = (teamIndex == TEAM_INDEX_ALLIANCE) ? BG_IC_SOUND_NODE_ASSAULTED_ALLIANCE : BG_IC_SOUND_NODE_ASSAULTED_HORDE;
+
+        if (node == BG_IC_NODE_HANGAR)
+            (teamIndex == TEAM_INDEX_ALLIANCE ? gunshipHorde : gunshipAlliance)->Stop();
+    }
+    PlaySoundToAll(sound);
+}
+
+void BattleGroundIC::EventPlayerDamageGO(Player *player, GameObject* target_obj, uint32 eventId, uint32 doneBy)
+{
+    TeamIndex teamIndex = GetTeamIndex(player->GetTeam());
+
+    // Seaforium Charge Explosion (A-bomb-inable)
+    if (doneBy == 66676)
+        player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL, 68366);
+
+    // Huge Seaforium Charge Explosion (A-bomb-ination)
+    if (doneBy == 66672)
+        player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL, 68367);
+
+    uint32 type = 0;
+    switch (target_obj->GetEntry())
+    {
+        case BG_IC_GO_ALLIANCE_GATE_1:
+        {
+            type = BG_IC_GO_T_ALLIANCE_GATE_1;
+            if (eventId == 22082)
+            {
+                SendMessage2ToAll(LANG_BG_IC_A_WEST_GATE_DESTROYED, CHAT_MSG_BG_SYSTEM_ALLIANCE, player, doneBy);
+                UpdateWorldState(BG_IC_GateStatus[type][0], 0);             // needed for removing the old icon
+                UpdateWorldState(BG_IC_GateStatus[type][1], 1);
+                GateStatus[type] = BG_IC_GO_GATES_DAMAGE;                   // correct icon is at "damage" state (not flag), not "destroy"
+                RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE:HORDE);
+                SpawnEvent(IC_EVENT_ADD_A_BOSS, 0, true);
+                SpawnEvent(IC_EVENT_ADD_A_GUARDS, 0, true);
+
+                // prevent closing of the boss gates by destroying another wall gate
+                if (aOpen == false)
+                {
+                    OpenDoorEvent(IC_EVENT_BOSS_A);
+                    aOpen = true;
+                }
+            }
+            break;
+        }
+        case BG_IC_GO_ALLIANCE_GATE_2:
+        {
+            type = BG_IC_GO_T_ALLIANCE_GATE_2;
+            if (eventId == 22078)
+            {
+                SendMessage2ToAll(LANG_BG_IC_A_EAST_GATE_DESTROYED, CHAT_MSG_BG_SYSTEM_ALLIANCE, player, doneBy);
+                UpdateWorldState(BG_IC_GateStatus[type][0], 0);
+                UpdateWorldState(BG_IC_GateStatus[type][1], 1);
+                GateStatus[type] = BG_IC_GO_GATES_DAMAGE;
+                RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE:HORDE);
+                SpawnEvent(IC_EVENT_ADD_A_BOSS, 0, true);
+                SpawnEvent(IC_EVENT_ADD_A_GUARDS, 0, true);
+
+                if (aOpen == false)
+                {
+                    OpenDoorEvent(IC_EVENT_BOSS_A);
+                    aOpen = true;
+                }
+            }
+            break;
+        }
+        case BG_IC_GO_ALLIANCE_GATE_3:
+        {
+            type = BG_IC_GO_T_ALLIANCE_GATE_3;
+            if (eventId == 22080)
+            {
+                SendMessage2ToAll(LANG_BG_IC_A_FRONT_GATE_DESTROYED, CHAT_MSG_BG_SYSTEM_ALLIANCE, player, doneBy);
+                UpdateWorldState(BG_IC_GateStatus[type][0], 0);
+                UpdateWorldState(BG_IC_GateStatus[type][1], 1);
+                GateStatus[type] = BG_IC_GO_GATES_DAMAGE;
+                RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE:HORDE);
+                SpawnEvent(IC_EVENT_ADD_A_BOSS, 0, true);
+                SpawnEvent(IC_EVENT_ADD_A_GUARDS, 0, true);
+
+                if (aOpen == false)
+                {
+                    OpenDoorEvent(IC_EVENT_BOSS_A);
+                    aOpen = true;
+                }
+            }
+            break;
+        }
+        case BG_IC_GO_HORDE_GATE_1:
+        {
+            type = BG_IC_GO_T_HORDE_GATE_1;
+            if (eventId == 22081)
+            {
+                SendMessage2ToAll(LANG_BG_IC_H_WEST_GATE_DESTROYED, CHAT_MSG_BG_SYSTEM_HORDE, player, doneBy);
+                UpdateWorldState(BG_IC_GateStatus[type][0], 0);
+                UpdateWorldState(BG_IC_GateStatus[type][1], 1);
+                GateStatus[type] = BG_IC_GO_GATES_DAMAGE;
+                RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE:HORDE);
+                SpawnEvent(IC_EVENT_ADD_H_BOSS, 0, true);
+                SpawnEvent(IC_EVENT_ADD_H_GUARDS, 0, true);
+
+                if (hOpen == false)
+                {
+                    OpenDoorEvent(IC_EVENT_BOSS_H);
+                    hOpen = true;
+                }
+            }
+            break;
+        }
+        case BG_IC_GO_HORDE_GATE_2:
+        {
+            type = BG_IC_GO_T_HORDE_GATE_2;
+            if (eventId == 22083)
+            {
+                SendMessage2ToAll(LANG_BG_IC_H_EAST_GATE_DESTROYED, CHAT_MSG_BG_SYSTEM_HORDE, player, doneBy);
+                UpdateWorldState(BG_IC_GateStatus[type][0], 0);
+                UpdateWorldState(BG_IC_GateStatus[type][1], 1);
+                GateStatus[type] = BG_IC_GO_GATES_DAMAGE;
+                RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE:HORDE);
+                SpawnEvent(IC_EVENT_ADD_H_BOSS, 0, true);
+                SpawnEvent(IC_EVENT_ADD_H_GUARDS, 0, true);
+
+                if (hOpen == false)
+                {
+                    OpenDoorEvent(IC_EVENT_BOSS_H);
+                    hOpen = true;
+                }
+            }
+            break;
+        }
+        case BG_IC_GO_HORDE_GATE_3:
+        {
+            type = BG_IC_GO_T_HORDE_GATE_3;
+            if (eventId == 22079)
+            {
+                SendMessage2ToAll(LANG_BG_IC_H_FRONT_GATE_DESTROYED, CHAT_MSG_BG_SYSTEM_HORDE, player, doneBy);
+                UpdateWorldState(BG_IC_GateStatus[type][0], 0);
+                UpdateWorldState(BG_IC_GateStatus[type][1], 1);
+                GateStatus[type] = BG_IC_GO_GATES_DAMAGE;
+                RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE:HORDE);
+                SpawnEvent(IC_EVENT_ADD_H_BOSS, 0, true);
+                SpawnEvent(IC_EVENT_ADD_H_GUARDS, 0, true);
+
+                if (hOpen == false)
+                {
+                    OpenDoorEvent(IC_EVENT_BOSS_H);
+                    hOpen = true;
+                }
+            }
+            break;
+        }
+    }
+}
+
+WorldSafeLocsEntry const* BattleGroundIC::GetClosestGraveYard(Player* player)
+{
+    TeamIndex teamIndex = GetTeamIndex(player->GetTeam());
+
+    // Is there any occupied node for this team?
+    std::vector<uint8> nodes;
+    for (uint8 i = 0; i < BG_IC_NODES_MAX; ++i)
+        if (m_Nodes[i] == teamIndex + 3)
+            nodes.push_back(i);
+
+    WorldSafeLocsEntry const* good_entry = NULL;
+    // If so, select the closest node to place ghost on
+    if (!nodes.empty())
+    {
+        float plr_x = player->GetPositionX();
+        float plr_y = player->GetPositionY();
+
+        float mindist = 999999.0f;
+        for (uint8 i = 0; i < nodes.size(); ++i)
+        {
+            WorldSafeLocsEntry const*entry = sWorldSafeLocsStore.LookupEntry( BG_IC_GraveyardIds[nodes[i]] );
+            if (!entry)
+                continue;
+            float dist = (entry->x - plr_x)*(entry->x - plr_x)+(entry->y - plr_y)*(entry->y - plr_y);
+            if (mindist > dist)
+            {
+                mindist = dist;
+                good_entry = entry;
+            }
+        }
+        nodes.clear();
+    }
+    // If not, place ghost on starting location
+    if (!good_entry)
+        good_entry = sWorldSafeLocsStore.LookupEntry( BG_IC_GraveyardIds[teamIndex+5] );
+
+    return good_entry;
+}
+
+Transport* BattleGroundIC::CreateTransport(uint32 goEntry, uint32 period)
+{
+    // FIXME - remove this method always...
+    MOTransport* t = new MOTransport;
+
+    const GameObjectInfo* goinfo = sObjectMgr.GetGameObjectInfo(goEntry);
+
+    if (!goinfo)
+    {
+        sLog.outErrorDb("Transport ID: %u will not be loaded, gameobject_template missing", goEntry);
+        delete t;
+        return NULL;
+    }
+
+    std::set<uint32> mapsUsed;
+    t->SetDBPeriod(period);
+
+    if (!t->GenerateWaypoints(goinfo->moTransport.taxiPathId, mapsUsed))
+        // skip transports with empty waypoints list
+    {
+        sLog.outErrorDb("Transport (path id %u) path size = 0. Transport ignored, check DBC files or transport GO data0 field.",goinfo->moTransport.taxiPathId);
+        delete t;
+        return NULL;
+    }
+
+    WorldLocation const& loc = t->GetWayPoint(0).loc;
+
+    // creates the Gameobject
+    if (!t->Create(goEntry, loc.GetMapId(), loc.x, loc.y, loc.z, loc.o, GO_ANIMPROGRESS_DEFAULT, 0))
+    {
+        delete t;
+        return NULL;
+    }
+
+    t->SetMap(GetBgMap());
+
+    return t;
+}
+
+void BattleGroundIC::HandleBuffs()
+{
+    for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+    {
+        Player *plr = sObjectMgr.GetPlayer(itr->first);
+        if (plr)
+        {
+            // quarry / refinery buffs
+            for (uint8 node = BG_IC_NODE_QUARRY; node <= BG_IC_NODE_REFINERY; node++)
+            {
+                if (m_Nodes[node] >= BG_IC_NODE_TYPE_OCCUPIED)
+                {
+                    if ((node == BG_IC_NODE_QUARRY) && (!plr->HasAura(SPELL_QUARRY)) && (plr->GetTeam() == (m_Nodes[node] - BG_IC_NODE_TYPE_OCCUPIED == 0 ? ALLIANCE : HORDE)))
+                        plr->CastSpell(plr, SPELL_QUARRY, true);
+                    else if ((node == BG_IC_NODE_REFINERY) && (!plr->HasAura(SPELL_REFINERY)) && (plr->GetTeam() == (m_Nodes[node] - BG_IC_NODE_TYPE_OCCUPIED == 0 ? ALLIANCE : HORDE)))
+                        plr->CastSpell(plr, SPELL_REFINERY, true);
+                }
+                else
+                {
+                    if (node == BG_IC_NODE_QUARRY)
+                        plr->RemoveAurasDueToSpell(SPELL_QUARRY);
+                    else
+                        plr->RemoveAurasDueToSpell(SPELL_REFINERY);
+                }
+            }
+            // parachute handling
+            float height = plr->GetPositionZ();
+            if (height >= 180)
+                continue;
+
+            if (height < 180 && height > 140 && (!plr->HasAura(SPELL_PARACHUTE)))
+                plr->CastSpell(plr, SPELL_PARACHUTE, true);
+        }
+    }
+}
+
+Team BattleGroundIC::GetSpawnTeamFor(ObjectGuid const& guid) const
+{
+    if (guid.IsEmpty() || !guid.HasEntry())
+        return TEAM_NONE;
+
+    switch (guid.GetEntry())
+    {
+        case VEHICLE_IC_DEMOLISHER:
+        case VEHICLE_IC_DEMOLISHER_1:
+        {
+            if (m_Nodes[BG_IC_NODE_WORKSHOP] == BG_IC_NODE_STATUS_ALLY_OCCUPIED)
+                return ALLIANCE;
+
+            else if (m_Nodes[BG_IC_NODE_WORKSHOP] == BG_IC_NODE_STATUS_HORDE_OCCUPIED)
+                return HORDE;
+            break;
+        }
+        case VEHICLE_IC_CATAPULT:
+        case VEHICLE_IC_CATAPULT_1:
+        {
+            if (m_Nodes[BG_IC_NODE_DOCKS] == BG_IC_NODE_STATUS_ALLY_OCCUPIED)
+                return ALLIANCE;
+
+            else if (m_Nodes[BG_IC_NODE_DOCKS] == BG_IC_NODE_STATUS_HORDE_OCCUPIED)
+                return HORDE;
+            break;
+        }
+        case VEHICLE_IC_CANNON:
+        case VEHICLE_IC_CANNON_1:
+        {
+            WorldObject const* obj = const_cast<BattleGroundIC*>(this)->GetBgMap()->GetWorldObject(guid);
+            if (obj)
+                // simplest way to determine factions Ive found
+                return (obj->GetPositionX() > 1000.0f) ? HORDE : ALLIANCE;
+            break;
+        }
+        case VEHICLE_IC_GLAIVE_A:
+            return ALLIANCE;
+        case VEHICLE_IC_GLAIVE_H:
+            return HORDE;
+        default:
+            break;
+    }
+    return TEAM_INVALID;
+}
+
+bool BattleGroundIC::hasAllNodes(int8 team)
+{
+    for (int i = BG_IC_NODE_DOCKS; i <= BG_IC_NODE_REFINERY; ++i)
+        if (m_Nodes[i] != BG_IC_NODE_TYPE_OCCUPIED + team)
+            return false;
+
+    return true;
+}
+
+bool BattleGroundIC::hasAllResNodes(int8 team)
+{
+    for (int i = BG_IC_NODE_QUARRY; i <= BG_IC_NODE_REFINERY; ++i)
+        if (m_Nodes[i] != BG_IC_NODE_TYPE_OCCUPIED + team)
+            return false;
+
+    return true;
+}
diff --git a/src/game/BattleGround/BattleGroundIC.h b/src/game/BattleGround/BattleGroundIC.h
new file mode 100644
index 00000000000..67b778155c0
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundIC.h
@@ -0,0 +1,384 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __BATTLEGROUNDIC_H
+#define __BATTLEGROUNDIC_H
+
+class BattleGround;
+
+#include "Common.h"
+#include "BattleGround.h"
+
+#define BG_IC_SCORE_INITIAL_POINTS          300
+#define BG_IC_GATE_MAX                      6
+#define BG_IC_GRY_MAX                       6
+
+// Used only 2 nodes for check resource, but need create array for all! This define not used.
+#define BG_IC_MAX_RESOURCE_NODES            2
+
+#define BG_IC_KILL_BOSS                     4   // honor given for boss kill
+
+enum BG_IC_WorldStates
+{
+    BG_TEAM_ALLIANCE_REINFORC_SET      = 4221,
+    BG_TEAM_HORDE_RENFORC_SET          = 4222,
+    BG_TEAM_ALLIANCE_REINFORC          = 4226,
+    BG_TEAM_HORDE_REINFORC             = 4227,
+
+    /*BG_IC_GATE_FRONT_H_WS_CLOSED    = 4317,
+    BG_IC_GATE_WEST_H_WS_CLOSED     = 4318,
+    BG_IC_GATE_EAST_H_WS_CLOSED     = 4319,
+    BG_IC_GATE_FRONT_A_WS_CLOSED    = 4328,
+    BG_IC_GATE_WEST_A_WS_CLOSED     = 4327,
+    BG_IC_GATE_EAST_A_WS_CLOSED     = 4326,
+    BG_IC_GATE_FRONT_H_WS_OPEN      = 4322,
+    BG_IC_GATE_WEST_H_WS_OPEN       = 4321,
+    BG_IC_GATE_EAST_H_WS_OPEN       = 4320,
+    BG_IC_GATE_FRONT_A_WS_OPEN      = 4323,
+    BG_IC_GATE_WEST_A_WS_OPEN       = 4324,
+    BG_IC_GATE_EAST_A_WS_OPEN       = 4325,
+
+    BG_IC_DOCKS_UNCONTROLLED        = 4301,
+    BG_IC_DOCKS_CONFLICT_A          = 4305,
+    BG_IC_DOCKS_CONFLICT_H          = 4302,
+    BG_IC_DOCKS_CONTROLLED_A        = 4304,
+    BG_IC_DOCKS_CONTROLLED_H        = 4303,
+
+    BG_IC_HANGAR_UNCONTROLLED       = 4296,
+    BG_IC_HANGAR_CONFLICT_A         = 4300,
+    BG_IC_HANGAR_CONFLICT_H         = 4297,
+    BG_IC_HANGAR_CONTROLLED_A       = 4299,
+    BG_IC_HANGAR_CONTROLLED_H       = 4298,
+
+    BG_IC_WORKSHOP_UNCONTROLLED     = 4294,
+    BG_IC_WORKSHOP_CONFLICT_A       = 4228,
+    BG_IC_WORKSHOP_CONFLICT_H       = 4293,
+    BG_IC_WORKSHOP_CONTROLLED_A     = 4229,
+    BG_IC_WORKSHOP_CONTROLLED_H     = 4230,
+
+    BG_IC_QUARRY_UNCONTROLLED       = 4306,
+    BG_IC_QUARRY_CONFLICT_A         = 4310,
+    BG_IC_QUARRY_CONFLICT_H         = 4307,
+    BG_IC_QUARRY_CONTROLLED_A       = 4309,
+    BG_IC_QUARRY_CONTROLLED_H       = 4308,
+
+    BG_IC_REFINERY_UNCONTROLLED     = 4311,
+    BG_IC_REFINERY_CONFLICT_A       = 4315,
+    BG_IC_REFINERY_CONFLICT_H       = 4312,
+    BG_IC_REFINERY_CONTROLLED_A     = 4314,
+    BG_IC_REFINERY_CONTROLLED_H     = 4313,
+
+    BG_TEAM_ALLIANCE_KEEP_UNCONTROLLED = 4341,
+    BG_TEAM_ALLIANCE_KEEP_CONFLICT_A   = 4342,
+    BG_TEAM_ALLIANCE_KEEP_CONFLICT_H   = 4343,
+    BG_TEAM_ALLIANCE_KEEP_CONTROLLED_A = 4339,
+    BG_TEAM_ALLIANCE_KEEP_CONTROLLED_H = 4340,
+
+    BG_TEAM_HORDE_KEEP_UNCONTROLLED    = 4346,
+    BG_TEAM_HORDE_KEEP_CONFLICT_A      = 4347,
+    BG_TEAM_HORDE_KEEP_CONFLICT_H      = 4348,
+    BG_TEAM_HORDE_KEEP_CONTROLLED_A    = 4344,
+    BG_TEAM_HORDE_KEEP_CONTROLLED_H    = 4345*/
+};
+
+const uint32 BG_IC_OP_NODEICONS[7]  =    {4301, 4296, 4294, 4306, 4311, 4339, 4345};
+
+/* do NOT change the order, else wrong behaviour */
+enum BG_IC_Nodes
+{
+    BG_IC_NODE_DOCKS            = 0,
+    BG_IC_NODE_HANGAR           = 1,
+    BG_IC_NODE_WORKSHOP         = 2,
+    BG_IC_NODE_QUARRY           = 3,
+    BG_IC_NODE_REFINERY         = 4,
+    BG_IC_NODE_A_KEEP           = 5,
+    BG_IC_NODE_H_KEEP           = 6,
+    BG_IC_NODES_MAX             = 7,
+    BG_IC_NODES_ERROR           = 255,
+};
+
+// alliance_contested horde_contested a_owned h_owned
+const uint32 BG_IC_NodeWorldStates[BG_IC_NODES_MAX][4] =
+{
+    // Docks
+    {4305, 4302, 4304, 4303},
+    // Hangar
+    {4300, 4297, 4299, 4298},
+    // Workshop
+    {4228, 4293, 4229, 4230},
+    // Quarry
+    {4310, 4307, 4309, 4308},
+    // Refinery
+    {4315, 4312, 4314, 4313},
+    // Alliance keep
+    {4342, 4343, 4339, 4340},
+    // Horde keep
+    {4347, 4348, 4344, 4345}
+};
+
+const uint32 BG_IC_GateStatus[BG_IC_GATE_MAX][2] =
+{
+    {4327, 4324},   // alli west gate {closed, open gate}
+    {4326, 4325},   // alli east
+    {4328, 4323},   // alli front
+    {4318, 4321},   // horde west
+    {4319, 4320},   // horde east
+    {4317, 4322}    // horde front
+};
+
+enum BG_IC_GateStatus
+{
+    BG_IC_GO_GATES_NORMAL               = 1,
+    BG_IC_GO_GATES_DAMAGE               = 2,
+    BG_IC_GO_GATES_DESTROY              = 3
+};
+
+enum BG_IC_Spells
+{
+    SPELL_REFINERY          = 68719,
+    SPELL_QUARRY            = 68720,
+
+    SPELL_PARACHUTE         = 66657
+};
+
+enum BG_IC_GoId
+{
+    BG_IC_GO_ALLIANCE_GATE_1 = 195699, // west
+    BG_IC_GO_ALLIANCE_GATE_2 = 195698, // east
+    BG_IC_GO_ALLIANCE_GATE_3 = 195700, // front
+
+    BG_IC_GO_HORDE_GATE_1    = 195496, // west
+    BG_IC_GO_HORDE_GATE_2    = 195495, // east
+    BG_IC_GO_HORDE_GATE_3    = 195494, // front
+
+    BG_IC_GO_ALLIANCE_PORT  = 195703, // the actual portcullis that opens, without frame, needs to be spawned separately just at front gates
+    BG_IC_GO_HORDE_PORT     = 195491
+};
+
+enum BG_IC_GoType
+{
+    BG_IC_GO_T_ALLIANCE_GATE_1,
+    BG_IC_GO_T_ALLIANCE_GATE_2,
+    BG_IC_GO_T_ALLIANCE_GATE_3,
+
+    BG_IC_GO_T_HORDE_GATE_1,
+    BG_IC_GO_T_HORDE_GATE_2,
+    BG_IC_GO_T_HORDE_GATE_3,
+
+    BG_IC_GO_T_ALLIANCE_WEST,
+    BG_IC_GO_T_ALLIANCE_EAST,
+    BG_IC_GO_T_ALLIANCE_FRONT,
+
+    BG_IC_GO_T_HORDE_WEST,
+    BG_IC_GO_T_HORDE_EAST,
+    BG_IC_GO_T_HORDE_FRONT,
+
+    BG_IC_MAXOBJ = 12
+};
+
+enum BG_IC_GUNSHIPS
+{
+    GO_HORDE_GUNSHIP = 195276,
+    GO_ALLIANCE_GUNSHIP =  195121
+};
+
+
+enum BG_IC_NodeStatus
+{
+    BG_IC_NODE_TYPE_NEUTRAL             = 0,
+    BG_IC_NODE_TYPE_CONTESTED           = 1,
+    BG_IC_NODE_STATUS_ALLY_CONTESTED    = 1,
+    BG_IC_NODE_STATUS_HORDE_CONTESTED   = 2,
+    BG_IC_NODE_TYPE_OCCUPIED            = 3,
+    BG_IC_NODE_STATUS_ALLY_OCCUPIED     = 3,
+    BG_IC_NODE_STATUS_HORDE_OCCUPIED    = 4
+};
+
+enum BG_IC_Sounds
+{
+    BG_IC_SOUND_NODE_CLAIMED            = 8192,
+    BG_IC_SOUND_NODE_CAPTURED_ALLIANCE  = 8173,
+    BG_IC_SOUND_NODE_CAPTURED_HORDE     = 8213,
+    BG_IC_SOUND_NODE_ASSAULTED_ALLIANCE = 8212,
+    BG_IC_SOUND_NODE_ASSAULTED_HORDE    = 8174
+};
+
+// WorldSafeLocs ids for 5 nodes, and for ally, horde starting location
+const uint32 BG_IC_GraveyardIds[7] = {1480, 1481, 1482, 1485, 1486, 1483, 1484};
+
+enum BG_IC_Events
+{
+    IC_EVENT_ADD_TELEPORT       = 7,  // base teleports
+    IC_EVENT_ADD_VEH            = 8,  // keep cannons
+    IC_EVENT_ADD_A_GUARDS       = 9,
+    IC_EVENT_ADD_H_GUARDS       = 10,
+    IC_EVENT_ADD_A_BOSS         = 11,
+    IC_EVENT_ADD_H_BOSS         = 12,
+    // IC_EVENT_BOSS_A 251 - alli boss gate
+    // IC_EVENT_BOSS_H 252 - horde boss gate
+};
+
+struct BG_IC_BannerTimer
+{
+    uint32      timer;
+    uint8       type;
+    uint8       teamIndex;
+};
+
+enum BG_IC_Creatures
+{
+    NPC_HORDE_GUNSHIP_CANNON            = 34935,
+    NPC_ALLIANCE_GUNSHIP_CANNON         = 34929,
+    NPC_HIGH_COMMANDER_HALFORD_WYRMBANE = 34924,  // Alliance Boss
+    NPC_OVERLORD_AGMAR                  = 34922   // Horde Boss
+};
+
+enum BG_IC_Timers
+{
+    WORKSHOP_UPDATE_TIME        = 180000, // 3 minutes
+    TRANSPORT_PERIOD_TIME       = 120000,
+    BG_IC_FLAG_CAPTURING_TIME   = 60000,
+    BG_IC_RESOURCE_TICK_TIMER   = 45000,
+    CLOSE_DOORS_TIME            = 20000
+};
+
+enum CreaturesEntryIC
+{
+    VEHICLE_IC_DEMOLISHER   = 34775,
+    VEHICLE_IC_DEMOLISHER_1 = 35415,
+    VEHICLE_IC_CATAPULT     = 34793,
+    VEHICLE_IC_CATAPULT_1   = 35413,
+    VEHICLE_IC_CANNON       = 34944,
+    VEHICLE_IC_CANNON_1     = 35429,
+    VEHICLE_IC_GLAIVE_A     = 34802,
+    VEHICLE_IC_GLAIVE_H     = 35273,
+};
+
+/*const float hordeGunshipPassengers[5][4] =
+{
+    {-21.401f,  -31.343f,  34.173f,  4.62057f},
+    {-12.1064f, -31.9697f, 34.3807f, 4.62057f},
+    {-2.4877f,  -31.9885f, 34.8384f, 4.62057f},
+    {10.2664f,  -32.0713f, 35.7357f, 4.62057f},
+    {19.4636f,  -30.794f,  36.2254f, 4.83106f}
+};
+
+const float allianceGunshipPassengers[5][4] =
+{
+    {-41.7122f, 23.1838f, 22.5605f, 1.60659f},
+    {-31.0354f, 25.1286f, 21.6921f, 1.60659f},
+    {-21.4492f, 25.8326f, 21.6309f, 1.60659f},
+    {-12.4734f, 26.321f,  21.6237f, 1.60659f},
+    {-2.81125f, 26.2077f, 21.6566f, 1.60659f}
+};*/
+
+static float const BG_IC_GATELOCS[6][4] =
+{
+    // west / east / front alli gate
+    {351.615f,  -762.75f,   48.9162f,   -1.5708f},
+    {351.024f,  -903.326f,  48.9247f,   1.5708f},
+    {413.479f,  -833.95f,   48.5238f,   3.14159f},
+    // west / east / front horde gate
+    {1217.9f,   -676.948f,  47.6341f,   1.5708f},
+    {1218.74f,  -851.155f,  48.2533f,   -1.5708f},
+    {1150.9f,   -762.606f,  47.5077f,   3.14159f},
+};
+
+class BattleGroundICScore : public BattleGroundScore
+{
+    public:
+        BattleGroundICScore() : BasesAssaulted(0), BasesDefended(0) {};
+        virtual ~BattleGroundICScore() {};
+        uint32 BasesAssaulted;
+        uint32 BasesDefended;
+};
+
+class BattleGroundIC : public BattleGround
+{
+        friend class BattleGroundMgr;
+
+    public:
+        BattleGroundIC();
+        ~BattleGroundIC();
+
+        void Update(uint32 diff);
+
+        /* inherited from BattleGroundClass */
+        virtual void AddPlayer(Player *plr);
+        virtual void StartingEventCloseDoors();
+        virtual void StartingEventOpenDoors();
+        virtual void EventPlayerDamageGO(Player *player, GameObject* target_obj, uint32 eventId, uint32 doneBy = 0);
+        virtual void FillInitialWorldStates();
+        virtual void HandleKillUnit(Creature *unit, Player *killer);
+        virtual void HandleKillPlayer(Player* player, Player* killer);
+        virtual void Reset();
+
+        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
+
+        void RemovePlayer(Player* plr);
+        void HandleAreaTrigger(Player *Source, uint32 Trigger);
+        bool SetupBattleGround();
+        void EndBattleGround(Team winner);
+        void EventPlayerClickedOnFlag(Player *Source, GameObject* target_obj);
+        void UpdateScore(TeamIndex teamIdx, int32 points);
+        void SpawnGates();
+
+        /* Scorekeeping */
+        void UpdatePlayerScore(Player *Source, uint32 type, uint32 value, bool doAddHonor = true);
+
+        virtual Team GetSpawnTeamFor(ObjectGuid const& guid) const override;
+
+        // for achievement Mine
+        bool hasAllNodes(int8 team);
+
+        // for achievement Resource Glut
+        bool hasAllResNodes(int8 team);
+
+    private:
+        uint32 closeFortressDoorsTimer;
+        uint32 m_resource_Timer[BG_IC_NODES_MAX];
+        bool doorsClosed;
+        bool aOpen;
+        bool hOpen;
+
+        // Transports
+        Transport* gunshipAlliance;
+        Transport* gunshipHorde;
+        Transport* CreateTransport(uint32 goEntry,uint32 period);
+        void SendTransportInit(Player* player);
+
+        void HandleBuffs();
+
+        void _CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay);
+        void _SendNodeUpdate(uint8 node);
+        int32 _GetNodeNameId(uint8 node);
+
+        /* Nodes info:
+            0: neutral
+            1: ally contested
+            2: horde contested
+            3: ally occupied
+            4: horde occupied     */
+
+        uint8               m_Nodes[BG_IC_NODES_MAX];
+        uint8               m_prevNodes[BG_IC_NODES_MAX];   // used for performant wordlstate-updating
+        BG_IC_BannerTimer   m_BannerTimers[BG_IC_NODES_MAX];
+        uint32              m_NodeTimers[BG_IC_NODES_MAX];
+        int32               GateStatus[BG_IC_GATE_MAX];
+};
+#endif
diff --git a/src/game/BattleGround/BattleGroundMgr.cpp b/src/game/BattleGround/BattleGroundMgr.cpp
new file mode 100644
index 00000000000..74574cd8118
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundMgr.cpp
@@ -0,0 +1,2184 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Common.h"
+#include "SharedDefines.h"
+#include "Player.h"
+#include "BattleGroundMgr.h"
+#include "BattleGroundAV.h"
+#include "BattleGroundAB.h"
+#include "BattleGroundEY.h"
+#include "BattleGroundWS.h"
+#include "BattleGroundNA.h"
+#include "BattleGroundBE.h"
+#include "BattleGroundAA.h"
+#include "BattleGroundRL.h"
+#include "BattleGroundSA.h"
+#include "BattleGroundDS.h"
+#include "BattleGroundRV.h"
+#include "BattleGroundIC.h"
+#include "BattleGroundRB.h"
+#include "MapManager.h"
+#include "Map.h"
+#include "ObjectMgr.h"
+#include "ProgressBar.h"
+#include "Chat.h"
+#include "ArenaTeam.h"
+#include "World.h"
+#include "WorldPacket.h"
+#include "GameEventMgr.h"
+#include "Formulas.h"
+#include "WorldObjectEvents.h"
+
+#include "Policies/Singleton.h"
+
+INSTANTIATE_SINGLETON_1(BattleGroundMgr);
+
+/*********************************************************/
+/***            BATTLEGROUND QUEUE SYSTEM              ***/
+/*********************************************************/
+
+BattleGroundQueue::BattleGroundQueue()
+{
+    for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
+    {
+        for (uint8 j = 0; j < MAX_BATTLEGROUND_BRACKETS; ++j)
+        {
+            m_SumOfWaitTimes[i][j] = 0;
+            m_WaitTimeLastPlayer[i][j] = 0;
+            for (uint8 k = 0; k < COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME; ++k)
+                m_WaitTimes[i][j][k] = 0;
+        }
+    }
+}
+
+BattleGroundQueue::~BattleGroundQueue()
+{
+    m_QueuedPlayers.clear();
+    for (uint8 i = 0; i < MAX_BATTLEGROUND_BRACKETS; ++i)
+    {
+        for (uint8 j = 0; j < BG_QUEUE_GROUP_TYPES_COUNT; ++j)
+        {
+            for (GroupsQueueType::iterator itr = m_QueuedGroups[i][j].begin(); itr != m_QueuedGroups[i][j].end(); ++itr)
+                delete(*itr);
+            m_QueuedGroups[i][j].clear();
+        }
+    }
+}
+
+/*********************************************************/
+/***      BATTLEGROUND QUEUE SELECTION POOLS           ***/
+/*********************************************************/
+
+// selection pool initialization, used to clean up from prev selection
+void BattleGroundQueue::SelectionPool::Init()
+{
+    SelectedGroups.clear();
+    PlayerCount = 0;
+}
+
+// remove group info from selection pool
+// returns true when we need to try to add new group to selection pool
+// returns false when selection pool is ok or when we kicked smaller group than we need to kick
+// sometimes it can be called on empty selection pool
+bool BattleGroundQueue::SelectionPool::KickGroup(uint32 size)
+{
+    // find maxgroup or LAST group with size == size and kick it
+    bool found = false;
+    GroupsQueueType::iterator groupToKick = SelectedGroups.begin();
+    for (GroupsQueueType::iterator itr = groupToKick; itr != SelectedGroups.end(); ++itr)
+    {
+        if (abs((int32)((*itr)->Players.size() - size)) <= 1)
+        {
+            groupToKick = itr;
+            found = true;
+        }
+        else if (!found && (*itr)->Players.size() >= (*groupToKick)->Players.size())
+            groupToKick = itr;
+    }
+    // if pool is empty, do nothing
+    if (GetPlayerCount())
+    {
+        // update player count
+        GroupQueueInfo* ginfo = (*groupToKick);
+        SelectedGroups.erase(groupToKick);
+        PlayerCount -= ginfo->Players.size();
+        // return false if we kicked smaller group or there are enough players in selection pool
+        if (ginfo->Players.size() <= size + 1)
+            return false;
+    }
+    return true;
+}
+
+// add group to selection pool
+// used when building selection pools
+// returns true if we can invite more players, or when we added group to selection pool
+// returns false when selection pool is full
+bool BattleGroundQueue::SelectionPool::AddGroup(GroupQueueInfo* ginfo, uint32 desiredCount)
+{
+    // if group is larger than desired count - don't allow to add it to pool
+    if (!ginfo->IsInvitedToBGInstanceGUID && desiredCount >= PlayerCount + ginfo->Players.size())
+    {
+        SelectedGroups.push_back(ginfo);
+        // increase selected players count
+        PlayerCount += ginfo->Players.size();
+        return true;
+    }
+    if (PlayerCount < desiredCount)
+        return true;
+    return false;
+}
+
+/*********************************************************/
+/***               BATTLEGROUND QUEUES                 ***/
+/*********************************************************/
+
+// add group or player (grp == NULL) to bg queue with the given leader and bg specifications
+GroupQueueInfo* BattleGroundQueue::AddGroup(Player* leader, Group* grp, BattleGroundTypeId BgTypeId, PvPDifficultyEntry const*  bracketEntry, ArenaType arenaType, bool isRated, bool isPremade, uint32 arenaRating, uint32 arenateamid)
+{
+    BattleGroundBracketId bracketId =  bracketEntry->GetBracketId();
+
+    // create new ginfo
+    GroupQueueInfo* ginfo = new GroupQueueInfo;
+    ginfo->BgTypeId                  = BgTypeId;
+    ginfo->arenaType                 = arenaType;
+    ginfo->ArenaTeamId               = arenateamid;
+    ginfo->IsRated                   = isRated;
+    ginfo->IsInvitedToBGInstanceGUID = 0;
+    ginfo->JoinTime                  = WorldTimer::getMSTime();
+    ginfo->RemoveInviteTime          = 0;
+    ginfo->GroupTeam                 = leader->GetTeam();
+    ginfo->ArenaTeamRating           = arenaRating;
+    ginfo->OpponentsTeamRating       = 0;
+
+    ginfo->Players.clear();
+
+    // compute index (if group is premade or joined a rated match) to queues
+    uint32 index = 0;
+    if (!isRated && !isPremade)
+        index += PVP_TEAM_COUNT;                            // BG_QUEUE_PREMADE_* -> BG_QUEUE_NORMAL_*
+
+    if (ginfo->GroupTeam == HORDE)
+        ++index;                                            // BG_QUEUE_*_ALLIANCE -> BG_QUEUE_*_HORDE
+
+    DEBUG_LOG("Adding Group to BattleGroundQueue bgTypeId : %u, bracket_id : %u, index : %u", BgTypeId, bracketId, index);
+
+    uint32 lastOnlineTime = WorldTimer::getMSTime();
+
+    // announce world (this don't need mutex)
+    if (isRated && sWorld.getConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_JOIN))
+    {
+        sWorld.SendWorldText(LANG_ARENA_QUEUE_ANNOUNCE_WORLD_JOIN, ginfo->arenaType, ginfo->arenaType, ginfo->ArenaTeamRating);
+    }
+
+    // add players from group to ginfo
+    {
+        // ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_Lock);
+        if (grp)
+        {
+            for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
+            {
+                Player* member = itr->getSource();
+                if (!member)
+                    continue;   // this should never happen
+                PlayerQueueInfo& pl_info = m_QueuedPlayers[member->GetObjectGuid()];
+                pl_info.LastOnlineTime   = lastOnlineTime;
+                pl_info.GroupInfo        = ginfo;
+                // add the pinfo to ginfo's list
+                ginfo->Players[member->GetObjectGuid()]  = &pl_info;
+            }
+        }
+        else
+        {
+            PlayerQueueInfo& pl_info = m_QueuedPlayers[leader->GetObjectGuid()];
+            pl_info.LastOnlineTime   = lastOnlineTime;
+            pl_info.GroupInfo        = ginfo;
+            ginfo->Players[leader->GetObjectGuid()]  = &pl_info;
+        }
+
+        // add GroupInfo to m_QueuedGroups
+        m_QueuedGroups[bracketId][index].push_back(ginfo);
+
+        // announce to world, this code needs mutex
+        if (arenaType == ARENA_TYPE_NONE && !isRated && !isPremade && sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_QUEUE_ANNOUNCER_JOIN))
+        {
+            BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(ginfo->BgTypeId);
+            if (bg)
+            {
+                char const* bgName = bg->GetName();
+                uint32 MinPlayers = bg->GetMinPlayersPerTeam();
+                uint32 qHorde = 0;
+                uint32 qAlliance = 0;
+                uint32 q_min_level = bracketEntry->minLevel;
+                uint32 q_max_level = bracketEntry->maxLevel;
+                GroupsQueueType::const_iterator itr;
+                for (itr = m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_ALLIANCE].begin(); itr != m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_ALLIANCE].end(); ++itr)
+                    if (!(*itr)->IsInvitedToBGInstanceGUID)
+                        qAlliance += (*itr)->Players.size();
+                for (itr = m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_HORDE].begin(); itr != m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_HORDE].end(); ++itr)
+                    if (!(*itr)->IsInvitedToBGInstanceGUID)
+                        qHorde += (*itr)->Players.size();
+
+                // Show queue status to player only (when joining queue)
+                if (sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_QUEUE_ANNOUNCER_JOIN) == 1)
+                {
+                    ChatHandler(leader).PSendSysMessage(LANG_BG_QUEUE_ANNOUNCE_SELF, bgName, q_min_level, (q_max_level < sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL)) ? q_max_level : sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL),
+                                                        qAlliance, (MinPlayers > qAlliance) ? MinPlayers - qAlliance : (uint32)0, qHorde, (MinPlayers > qHorde) ? MinPlayers - qHorde : (uint32)0);
+                }
+                // System message
+                else
+                {
+                    sWorld.SendWorldText(LANG_BG_QUEUE_ANNOUNCE_WORLD, bgName, q_min_level, (q_max_level < sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL)) ? q_max_level : sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL),
+                                         qAlliance, (MinPlayers > qAlliance) ? MinPlayers - qAlliance : (uint32)0, qHorde, (MinPlayers > qHorde) ? MinPlayers - qHorde : (uint32)0);
+                }
+            }
+        }
+        //release mutex
+    }
+
+    return ginfo;
+}
+
+void BattleGroundQueue::PlayerInvitedToBGUpdateAverageWaitTime(GroupQueueInfo* ginfo, BattleGroundBracketId bracket_id)
+{
+    uint32 timeInQueue = WorldTimer::getMSTimeDiff(ginfo->JoinTime, WorldTimer::getMSTime());
+    uint8 team_index = TEAM_INDEX_ALLIANCE;                    // default set to TEAM_INDEX_ALLIANCE - or non rated arenas!
+    if (ginfo->arenaType == ARENA_TYPE_NONE)
+    {
+        if (ginfo->GroupTeam == HORDE)
+            team_index = TEAM_INDEX_HORDE;
+    }
+    else
+    {
+        if (ginfo->IsRated)
+            team_index = TEAM_INDEX_HORDE;                    // for rated arenas use TEAM_INDEX_HORDE
+    }
+
+    // store pointer to arrayindex of player that was added first
+    uint32* lastPlayerAddedPointer = &(m_WaitTimeLastPlayer[team_index][bracket_id]);
+    // remove his time from sum
+    m_SumOfWaitTimes[team_index][bracket_id] -= m_WaitTimes[team_index][bracket_id][(*lastPlayerAddedPointer)];
+    // set average time to new
+    m_WaitTimes[team_index][bracket_id][(*lastPlayerAddedPointer)] = timeInQueue;
+    // add new time to sum
+    m_SumOfWaitTimes[team_index][bracket_id] += timeInQueue;
+    // set index of last player added to next one
+    (*lastPlayerAddedPointer)++;
+    (*lastPlayerAddedPointer) %= COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME;
+}
+
+uint32 BattleGroundQueue::GetAverageQueueWaitTime(GroupQueueInfo* ginfo, BattleGroundBracketId bracket_id)
+{
+    uint8 team_index = TEAM_INDEX_ALLIANCE;                    // default set to TEAM_INDEX_ALLIANCE - or non rated arenas!
+    if (ginfo->arenaType == ARENA_TYPE_NONE)
+    {
+        if (ginfo->GroupTeam == HORDE)
+            team_index = TEAM_INDEX_HORDE;
+    }
+    else
+    {
+        if (ginfo->IsRated)
+            team_index = TEAM_INDEX_HORDE;                     // for rated arenas use TEAM_INDEX_HORDE
+    }
+    // check if there is enought values(we always add values > 0)
+    if (m_WaitTimes[team_index][bracket_id][COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME - 1])
+        return (m_SumOfWaitTimes[team_index][bracket_id] / COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME);
+    else
+        // if there aren't enough values return 0 - not available
+        return 0;
+}
+
+// remove player from queue and from group info, if group info is empty then remove it too
+void BattleGroundQueue::RemovePlayer(ObjectGuid guid, bool decreaseInvitedCount)
+{
+    // Player *plr = sObjectMgr.GetPlayer(guid);
+    // ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_Lock);
+
+    int32 bracket_id = -1;                                  // signed for proper for-loop finish
+    QueuedPlayersMap::iterator itr;
+
+    // remove player from map, if he's there
+    itr = m_QueuedPlayers.find(guid);
+    if (itr == m_QueuedPlayers.end())
+    {
+        sLog.outError("BattleGroundQueue: couldn't find for remove: %s", guid.GetString().c_str());
+        return;
+    }
+
+    GroupQueueInfo* group = itr->second.GroupInfo;
+    GroupsQueueType::iterator group_itr, group_itr_tmp;
+    // mostly people with the highest levels are in battlegrounds, thats why
+    // we count from MAX_BATTLEGROUND_QUEUES - 1 to 0
+    // variable index removes useless searching in other team's queue
+    uint32 index = GetTeamIndex(group->GroupTeam);
+
+    for (int8 bracket_id_tmp = MAX_BATTLEGROUND_BRACKETS - 1; bracket_id_tmp >= 0 && bracket_id == -1; --bracket_id_tmp)
+    {
+        // we must check premade and normal team's queue - because when players from premade are joining bg,
+        // they leave groupinfo so we can't use its players size to find out index
+        for (uint8 j = index; j < BG_QUEUE_GROUP_TYPES_COUNT; j += BG_QUEUE_NORMAL_ALLIANCE)
+        {
+            for (group_itr_tmp = m_QueuedGroups[bracket_id_tmp][j].begin(); group_itr_tmp != m_QueuedGroups[bracket_id_tmp][j].end(); ++group_itr_tmp)
+            {
+                if ((*group_itr_tmp) == group)
+                {
+                    bracket_id = bracket_id_tmp;
+                    group_itr = group_itr_tmp;
+                    // we must store index to be able to erase iterator
+                    index = j;
+                    break;
+                }
+            }
+        }
+    }
+    // player can't be in queue without group, but just in case
+    if (bracket_id == -1)
+    {
+        sLog.outError("BattleGroundQueue: ERROR Cannot find groupinfo for %s", guid.GetString().c_str());
+        return;
+    }
+    DEBUG_LOG("BattleGroundQueue: Removing %s, from bracket_id %u", guid.GetString().c_str(), (uint32)bracket_id);
+
+    // ALL variables are correctly set
+    // We can ignore leveling up in queue - it should not cause crash
+    // remove player from group
+    // if only one player there, remove group
+
+    // remove player queue info from group queue info
+    GroupQueueInfoPlayers::iterator pitr = group->Players.find(guid);
+    if (pitr != group->Players.end())
+        group->Players.erase(pitr);
+
+    // if invited to bg, and should decrease invited count, then do it
+    if (decreaseInvitedCount && group->IsInvitedToBGInstanceGUID)
+    {
+        BattleGround* bg = sBattleGroundMgr.GetBattleGround(group->IsInvitedToBGInstanceGUID, group->BgTypeId);
+        if (bg)
+            bg->DecreaseInvitedCount(group->GroupTeam);
+    }
+
+    // remove player queue info
+    m_QueuedPlayers.erase(itr);
+
+    // announce to world if arena team left queue for rated match, show only once
+    if (group->arenaType != ARENA_TYPE_NONE && group->IsRated && group->Players.empty() && sWorld.getConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_EXIT))
+        sWorld.SendWorldText(LANG_ARENA_QUEUE_ANNOUNCE_WORLD_EXIT, group->arenaType, group->arenaType, group->ArenaTeamRating);
+
+    // if player leaves queue and he is invited to rated arena match, then he have to loose
+    if (group->IsInvitedToBGInstanceGUID && group->IsRated && decreaseInvitedCount)
+    {
+        ArenaTeam* at = sObjectMgr.GetArenaTeamById(group->ArenaTeamId);
+        if (at)
+        {
+            DEBUG_LOG("UPDATING memberLost's personal arena rating for %s by opponents rating: %u", guid.GetString().c_str(), group->OpponentsTeamRating);
+            Player* plr = sObjectMgr.GetPlayer(guid);
+            if (plr)
+                at->MemberLost(plr, group->OpponentsTeamRating);
+            else
+                at->OfflineMemberLost(guid, group->OpponentsTeamRating);
+            at->SaveToDB();
+        }
+    }
+
+    // remove group queue info if needed
+    if (group->Players.empty())
+    {
+        m_QueuedGroups[bracket_id][index].erase(group_itr);
+        delete group;
+    }
+    // if group wasn't empty, so it wasn't deleted, and player have left a rated
+    // queue -> everyone from the group should leave too
+    // don't remove recursively if already invited to bg!
+    else if (!group->IsInvitedToBGInstanceGUID && group->IsRated)
+    {
+        // remove next player, this is recursive
+        // first send removal information
+        Player* plr2 = sObjectMgr.GetPlayer(group->Players.begin()->first);
+        if (plr2)
+        {
+            BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(group->BgTypeId);
+            BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(group->BgTypeId, group->arenaType);
+            uint32 queueSlot = plr2->GetBattleGroundQueueIndex(bgQueueTypeId);
+            plr2->RemoveBattleGroundQueueId(bgQueueTypeId); // must be called this way, because if you move this call to
+            // queue->removeplayer, it causes bugs
+            WorldPacket data;
+            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_NONE, 0, 0, ARENA_TYPE_NONE, TEAM_NONE);
+            plr2->GetSession()->SendPacket(&data);
+        }
+        // then actually delete, this may delete the group as well!
+        RemovePlayer(group->Players.begin()->first, decreaseInvitedCount);
+    }
+}
+
+// returns true when player pl_guid is in queue and is invited to bgInstanceGuid
+bool BattleGroundQueue::IsPlayerInvited(ObjectGuid pl_guid, const uint32 bgInstanceGuid, const uint32 removeTime)
+{
+    // ACE_Guard<ACE_Recursive_Thread_Mutex> g(m_Lock);
+    QueuedPlayersMap::const_iterator qItr = m_QueuedPlayers.find(pl_guid);
+    return (qItr != m_QueuedPlayers.end()
+            && qItr->second.GroupInfo->IsInvitedToBGInstanceGUID == bgInstanceGuid
+            && qItr->second.GroupInfo->RemoveInviteTime == removeTime);
+}
+
+bool BattleGroundQueue::GetPlayerGroupInfoData(ObjectGuid guid, GroupQueueInfo* ginfo)
+{
+    // ACE_Guard<ACE_Recursive_Thread_Mutex> g(m_Lock);
+    QueuedPlayersMap::const_iterator qItr = m_QueuedPlayers.find(guid);
+    if (qItr == m_QueuedPlayers.end())
+        return false;
+    *ginfo = *(qItr->second.GroupInfo);
+    return true;
+}
+
+bool BattleGroundQueue::InviteGroupToBG(GroupQueueInfo* ginfo, BattleGround* bg, Team side)
+{
+    // set side if needed
+    if (side)
+        ginfo->GroupTeam = side;
+
+    if (!ginfo->IsInvitedToBGInstanceGUID)
+    {
+        // not yet invited
+        // set invitation
+        ginfo->IsInvitedToBGInstanceGUID = bg->GetInstanceID();
+        BattleGroundTypeId bgTypeId = bg->GetTypeID();
+        BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, bg->GetArenaType());
+        BattleGroundBracketId bracket_id = bg->GetBracketId();
+
+        // set ArenaTeamId for rated matches
+        if (bg->isArena() && bg->isRated())
+            bg->SetArenaTeamIdForTeam(ginfo->GroupTeam, ginfo->ArenaTeamId);
+
+        ginfo->RemoveInviteTime = WorldTimer::getMSTime() + INVITE_ACCEPT_WAIT_TIME;
+
+        // loop through the players
+        for (GroupQueueInfoPlayers::iterator itr = ginfo->Players.begin(); itr != ginfo->Players.end(); ++itr)
+        {
+            // get the player
+            Player* plr = sObjectMgr.GetPlayer(itr->first);
+            // if offline, skip him, this should not happen - player is removed from queue when he logs out
+            if (!plr)
+                continue;
+
+            // invite the player
+            PlayerInvitedToBGUpdateAverageWaitTime(ginfo, bracket_id);
+            // sBattleGroundMgr.InvitePlayer(plr, bg, ginfo->Team);
+
+            // set invited player counters
+            bg->IncreaseInvitedCount(ginfo->GroupTeam);
+
+            plr->SetInviteForBattleGroundQueueType(bgQueueTypeId, ginfo->IsInvitedToBGInstanceGUID);
+
+            // create remind invite events
+            BGQueueInviteEvent* inviteEvent = new BGQueueInviteEvent(plr->GetObjectGuid(), ginfo->IsInvitedToBGInstanceGUID, bgTypeId, ginfo->arenaType, ginfo->RemoveInviteTime);
+            plr->AddEvent(inviteEvent, INVITATION_REMIND_TIME);
+            // create automatic remove events
+            BGQueueRemoveEvent* removeEvent = new BGQueueRemoveEvent(plr->GetObjectGuid(), ginfo->IsInvitedToBGInstanceGUID, bgTypeId, bgQueueTypeId, ginfo->RemoveInviteTime);
+            plr->AddEvent(removeEvent, INVITE_ACCEPT_WAIT_TIME);
+
+            WorldPacket data;
+
+            uint32 queueSlot = plr->GetBattleGroundQueueIndex(bgQueueTypeId);
+
+            DEBUG_LOG("Battleground: invited %s to BG instance %u queueindex %u bgtype %u, I can't help it if they don't press the enter battle button.",
+                      plr->GetGuidStr().c_str(), bg->GetInstanceID(), queueSlot, bg->GetTypeID());
+
+            // send status packet
+            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_JOIN, INVITE_ACCEPT_WAIT_TIME, 0, ginfo->arenaType, TEAM_NONE);
+            plr->GetSession()->SendPacket(&data);
+        }
+        return true;
+    }
+
+    return false;
+}
+
+/*
+This function is inviting players to already running battlegrounds
+Invitation type is based on config file
+large groups are disadvantageous, because they will be kicked first if invitation type = 1
+*/
+void BattleGroundQueue::FillPlayersToBG(BattleGround* bg, BattleGroundBracketId bracket_id)
+{
+    int32 hordeFree = bg->GetFreeSlotsForTeam(HORDE);
+    int32 aliFree   = bg->GetFreeSlotsForTeam(ALLIANCE);
+
+    // iterator for iterating through bg queue
+    GroupsQueueType::const_iterator Ali_itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].begin();
+    // count of groups in queue - used to stop cycles
+    uint32 aliCount = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].size();
+    // index to queue which group is current
+    uint32 aliIndex = 0;
+    for (; aliIndex < aliCount && m_SelectionPools[TEAM_INDEX_ALLIANCE].AddGroup((*Ali_itr), aliFree); ++aliIndex)
+        ++Ali_itr;
+    // the same thing for horde
+    GroupsQueueType::const_iterator Horde_itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].begin();
+    uint32 hordeCount = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].size();
+    uint32 hordeIndex = 0;
+    for (; hordeIndex < hordeCount && m_SelectionPools[TEAM_INDEX_HORDE].AddGroup((*Horde_itr), hordeFree); ++hordeIndex)
+        ++Horde_itr;
+
+    // if ofc like BG queue invitation is set in config, then we are happy
+    if (sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_INVITATION_TYPE) == 0)
+        return;
+
+    /*
+    if we reached this code, then we have to solve NP - complete problem called Subset sum problem
+    So one solution is to check all possible invitation subgroups, or we can use these conditions:
+    1. Last time when BattleGroundQueue::Update was executed we invited all possible players - so there is only small possibility
+        that we will invite now whole queue, because only 1 change has been made to queues from the last BattleGroundQueue::Update call
+    2. Other thing we should consider is group order in queue
+    */
+
+    // At first we need to compare free space in bg and our selection pool
+    int32 diffAli   = aliFree   - int32(m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount());
+    int32 diffHorde = hordeFree - int32(m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount());
+    while (abs(diffAli - diffHorde) > 1 && (m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount() > 0 || m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount() > 0))
+    {
+        // each cycle execution we need to kick at least 1 group
+        if (diffAli < diffHorde)
+        {
+            // kick alliance group, add to pool new group if needed
+            if (m_SelectionPools[TEAM_INDEX_ALLIANCE].KickGroup(diffHorde - diffAli))
+            {
+                for (; aliIndex < aliCount && m_SelectionPools[TEAM_INDEX_ALLIANCE].AddGroup((*Ali_itr), (aliFree >= diffHorde) ? aliFree - diffHorde : 0); ++aliIndex)
+                    ++Ali_itr;
+            }
+            // if ali selection is already empty, then kick horde group, but if there are less horde than ali in bg - break;
+            if (!m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount())
+            {
+                if (aliFree <= diffHorde + 1)
+                    break;
+                m_SelectionPools[TEAM_INDEX_HORDE].KickGroup(diffHorde - diffAli);
+            }
+        }
+        else
+        {
+            // kick horde group, add to pool new group if needed
+            if (m_SelectionPools[TEAM_INDEX_HORDE].KickGroup(diffAli - diffHorde))
+            {
+                for (; hordeIndex < hordeCount && m_SelectionPools[TEAM_INDEX_HORDE].AddGroup((*Horde_itr), (hordeFree >= diffAli) ? hordeFree - diffAli : 0); ++hordeIndex)
+                    ++Horde_itr;
+            }
+            if (!m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount())
+            {
+                if (hordeFree <= diffAli + 1)
+                    break;
+                m_SelectionPools[TEAM_INDEX_ALLIANCE].KickGroup(diffAli - diffHorde);
+            }
+        }
+        // count diffs after small update
+        diffAli   = aliFree   - int32(m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount());
+        diffHorde = hordeFree - int32(m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount());
+    }
+}
+
+// this method checks if premade versus premade battleground is possible
+// then after 30 mins (default) in queue it moves premade group to normal queue
+// it tries to invite as much players as it can - to MaxPlayersPerTeam, because premade groups have more than MinPlayersPerTeam players
+bool BattleGroundQueue::CheckPremadeMatch(BattleGroundBracketId bracket_id, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam)
+{
+    // check match
+    if (!m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].empty() && !m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].empty())
+    {
+        // start premade match
+        // if groups aren't invited
+        GroupsQueueType::const_iterator ali_group, horde_group;
+        for (ali_group = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].begin(); ali_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++ali_group)
+            if (!(*ali_group)->IsInvitedToBGInstanceGUID)
+                break;
+        for (horde_group = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].begin(); horde_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].end(); ++horde_group)
+            if (!(*horde_group)->IsInvitedToBGInstanceGUID)
+                break;
+
+        if (ali_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].end() && horde_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].end())
+        {
+            m_SelectionPools[TEAM_INDEX_ALLIANCE].AddGroup((*ali_group), MaxPlayersPerTeam);
+            m_SelectionPools[TEAM_INDEX_HORDE].AddGroup((*horde_group), MaxPlayersPerTeam);
+            // add groups/players from normal queue to size of bigger group
+            uint32 maxPlayers = std::max(m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount(), m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount());
+            GroupsQueueType::const_iterator itr;
+            for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
+            {
+                for (itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].begin(); itr != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++itr)
+                {
+                    // if itr can join BG and player count is less that maxPlayers, then add group to selectionpool
+                    if (!(*itr)->IsInvitedToBGInstanceGUID && !m_SelectionPools[i].AddGroup((*itr), maxPlayers))
+                        break;
+                }
+            }
+            // premade selection pools are set
+            return true;
+        }
+    }
+    // now check if we can move group from Premade queue to normal queue (timer has expired) or group size lowered!!
+    // this could be 2 cycles but i'm checking only first team in queue - it can cause problem -
+    // if first is invited to BG and seconds timer expired, but we can ignore it, because players have only 80 seconds to click to enter bg
+    // and when they click or after 80 seconds the queue info is removed from queue
+    uint32 time_before = WorldTimer::getMSTime() - sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH);
+    for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
+    {
+        if (!m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE + i].empty())
+        {
+            GroupsQueueType::iterator itr = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE + i].begin();
+            if (!(*itr)->IsInvitedToBGInstanceGUID && ((*itr)->JoinTime < time_before || (*itr)->Players.size() < MinPlayersPerTeam))
+            {
+                // we must insert group to normal queue and erase pointer from premade queue
+                m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].push_front((*itr));
+                m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE + i].erase(itr);
+            }
+        }
+    }
+    // selection pools are not set
+    return false;
+}
+
+// this method tries to create battleground or arena with MinPlayersPerTeam against MinPlayersPerTeam
+bool BattleGroundQueue::CheckNormalMatch(BattleGround* bg_template, BattleGroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers)
+{
+    GroupsQueueType::const_iterator itr_team[PVP_TEAM_COUNT];
+    for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
+    {
+        itr_team[i] = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].begin();
+        for (; itr_team[i] != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++(itr_team[i]))
+        {
+            if (!(*(itr_team[i]))->IsInvitedToBGInstanceGUID)
+            {
+                m_SelectionPools[i].AddGroup(*(itr_team[i]), maxPlayers);
+                if (m_SelectionPools[i].GetPlayerCount() >= minPlayers)
+                    break;
+            }
+        }
+    }
+    // try to invite same number of players - this cycle may cause longer wait time even if there are enough players in queue, but we want ballanced bg
+    uint32 j = TEAM_INDEX_ALLIANCE;
+    if (m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount() < m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount())
+        j = TEAM_INDEX_HORDE;
+    if (sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_INVITATION_TYPE) != 0
+            && m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount() >= minPlayers && m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount() >= minPlayers )
+    {
+        // we will try to invite more groups to team with less players indexed by j
+        ++(itr_team[j]);                                    // this will not cause a crash, because for cycle above reached break;
+        for (; itr_team[j] != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + j].end(); ++(itr_team[j]))
+        {
+            if (!(*(itr_team[j]))->IsInvitedToBGInstanceGUID)
+                if (!m_SelectionPools[j].AddGroup(*(itr_team[j]), m_SelectionPools[(j + 1) % PVP_TEAM_COUNT].GetPlayerCount()))
+                    break;
+        }
+        // do not allow to start bg with more than 2 players more on 1 faction
+        if (abs((int32)(m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount() - m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount())) > 2)
+            return false;
+    }
+    // allow 1v0 if debug bg
+    if (sBattleGroundMgr.isTesting() && bg_template->isBattleGround() && (m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount() || m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount()))
+        return true;
+    // return true if there are enough players in selection pools - enable to work .debug bg command correctly
+    return m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount() >= minPlayers && m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount() >= minPlayers;
+}
+
+// this method will check if we can invite players to same faction skirmish match
+bool BattleGroundQueue::CheckSkirmishForSameFaction(BattleGroundBracketId bracket_id, uint32 minPlayersPerTeam)
+{
+    if (m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount() < minPlayersPerTeam && m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount() < minPlayersPerTeam)
+        return false;
+    TeamIndex teamIdx = TEAM_INDEX_ALLIANCE;
+    TeamIndex otherTeamIdx = TEAM_INDEX_HORDE;
+    Team otherTeamId = HORDE;
+    if (m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount() == minPlayersPerTeam )
+    {
+        teamIdx = TEAM_INDEX_HORDE;
+        otherTeamIdx = TEAM_INDEX_ALLIANCE;
+        otherTeamId = ALLIANCE;
+    }
+    // clear other team's selection
+    m_SelectionPools[otherTeamIdx].Init();
+    // store last ginfo pointer
+    GroupQueueInfo* ginfo = m_SelectionPools[teamIdx].SelectedGroups.back();
+    // set itr_team to group that was added to selection pool latest
+    GroupsQueueType::iterator itr_team = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].begin();
+    for (; itr_team != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].end(); ++itr_team)
+        if (ginfo == *itr_team)
+            break;
+    if (itr_team == m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].end())
+        return false;
+    GroupsQueueType::iterator itr_team2 = itr_team;
+    ++itr_team2;
+    // invite players to other selection pool
+    for (; itr_team2 != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].end(); ++itr_team2)
+    {
+        // if selection pool is full then break;
+        if (!(*itr_team2)->IsInvitedToBGInstanceGUID && !m_SelectionPools[otherTeamIdx].AddGroup(*itr_team2, minPlayersPerTeam))
+            break;
+    }
+    if (m_SelectionPools[otherTeamIdx].GetPlayerCount() != minPlayersPerTeam)
+        return false;
+
+    // here we have correct 2 selections and we need to change one teams team and move selection pool teams to other team's queue
+    for (GroupsQueueType::iterator itr = m_SelectionPools[otherTeamIdx].SelectedGroups.begin(); itr != m_SelectionPools[otherTeamIdx].SelectedGroups.end(); ++itr)
+    {
+        // set correct team
+        (*itr)->GroupTeam = otherTeamId;
+        // add team to other queue
+        m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + otherTeamIdx].push_front(*itr);
+        // remove team from old queue
+        GroupsQueueType::iterator itr2 = itr_team;
+        ++itr2;
+        for (; itr2 != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].end(); ++itr2)
+        {
+            if (*itr2 == *itr)
+            {
+                m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].erase(itr2);
+                break;
+            }
+        }
+    }
+    return true;
+}
+
+/*
+this method is called when group is inserted, or player / group is removed from BG Queue - there is only one player's status changed, so we don't use while(true) cycles to invite whole queue
+it must be called after fully adding the members of a group to ensure group joining
+should be called from BattleGround::RemovePlayer function in some cases
+*/
+void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id, ArenaType arenaType, bool isRated, uint32 arenaRating)
+{
+    // ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_Lock);
+    // if no players in queue - do nothing
+    if (m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].empty() &&
+            m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].empty() &&
+            m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].empty() &&
+            m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].empty())
+        return;
+
+    // battleground with free slot for player should be always in the beggining of the queue
+    // maybe it would be better to create bgfreeslotqueue for each bracket_id
+    BGFreeSlotQueueType::iterator itr, next;
+    for (itr = sBattleGroundMgr.BGFreeSlotQueue[bgTypeId].begin(); itr != sBattleGroundMgr.BGFreeSlotQueue[bgTypeId].end() && !sBattleGroundMgr.BGFreeSlotQueue[bgTypeId].empty(); itr = next)
+    {
+
+        next = itr;
+        ++next;
+        // DO NOT allow queue manager to invite new player to arena
+        if ((*itr)->isBattleGround() && (*itr)->GetTypeID() == bgTypeId && (*itr)->GetBracketId() == bracket_id &&
+                (*itr)->GetStatus() > STATUS_WAIT_QUEUE && (*itr)->GetStatus() < STATUS_WAIT_LEAVE)
+        {
+            BattleGround* bg = *itr; // we have to store battleground pointer here, because when battleground is full, it is removed from free queue (not yet implemented!!)
+            // and iterator is invalid
+
+            // clear selection pools
+            m_SelectionPools[TEAM_INDEX_ALLIANCE].Init();
+            m_SelectionPools[TEAM_INDEX_HORDE].Init();
+
+            // call a function that does the job for us
+            FillPlayersToBG(bg, bracket_id);
+
+            // now everything is set, invite players
+            for(GroupsQueueType::const_iterator citr = m_SelectionPools[TEAM_INDEX_ALLIANCE].SelectedGroups.begin(); citr != m_SelectionPools[TEAM_INDEX_ALLIANCE].SelectedGroups.end(); ++citr)
+                InviteGroupToBG((*citr), bg, (*citr)->GroupTeam);
+            for(GroupsQueueType::const_iterator citr = m_SelectionPools[TEAM_INDEX_HORDE].SelectedGroups.begin(); citr != m_SelectionPools[TEAM_INDEX_HORDE].SelectedGroups.end(); ++citr)
+                InviteGroupToBG((*citr), bg, (*citr)->GroupTeam);
+
+            if (!bg->HasFreeSlots())
+            {
+                // remove BG from BGFreeSlotQueue
+                bg->RemoveFromBGFreeSlotQueue();
+            }
+        }
+    }
+
+    // finished iterating through the bgs with free slots, maybe we need to create a new bg
+
+    BattleGround* bg_template = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
+    if (!bg_template)
+    {
+        sLog.outError("Battleground: Update: bg template not found for %u", bgTypeId);
+        return;
+    }
+
+    PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketById(bg_template->GetMapId(), bracket_id);
+    if (!bracketEntry)
+    {
+        sLog.outError("Battleground: Update: bg bracket entry not found for map %u bracket id %u", bg_template->GetMapId(), bracket_id);
+        return;
+    }
+
+    // get the min. players per team, properly for larger arenas as well. (must have full teams for arena matches!)
+    uint32 MinPlayersPerTeam = bg_template->GetMinPlayersPerTeam();
+    uint32 MaxPlayersPerTeam = bg_template->GetMaxPlayersPerTeam();
+    if (sBattleGroundMgr.isTesting())
+        MinPlayersPerTeam = 1;
+    if (bg_template->isArena())
+    {
+        if (sBattleGroundMgr.isArenaTesting())
+        {
+            MaxPlayersPerTeam = 1;
+            MinPlayersPerTeam = 1;
+        }
+        else
+        {
+            // this switch can be much shorter
+            MaxPlayersPerTeam = arenaType;
+            MinPlayersPerTeam = arenaType;
+            /*switch(arenaType)
+            {
+            case ARENA_TYPE_2v2:
+                MaxPlayersPerTeam = 2;
+                MinPlayersPerTeam = 2;
+                break;
+            case ARENA_TYPE_3v3:
+                MaxPlayersPerTeam = 3;
+                MinPlayersPerTeam = 3;
+                break;
+            case ARENA_TYPE_5v5:
+                MaxPlayersPerTeam = 5;
+                MinPlayersPerTeam = 5;
+                break;
+            }*/
+        }
+    }
+
+    m_SelectionPools[TEAM_INDEX_ALLIANCE].Init();
+    m_SelectionPools[TEAM_INDEX_HORDE].Init();
+
+    if (bg_template->isBattleGround())
+    {
+        // check if there is premade against premade match
+        if (CheckPremadeMatch(bracket_id, MinPlayersPerTeam, MaxPlayersPerTeam))
+        {
+            // create new battleground
+            BattleGround* bg2 = sBattleGroundMgr.CreateNewBattleGround(bgTypeId, bracketEntry, ARENA_TYPE_NONE, false);
+            if (!bg2)
+            {
+                sLog.outError("BattleGroundQueue::Update - Cannot create battleground: %u", bgTypeId);
+                return;
+            }
+            //invite those selection pools
+            for(uint32 i = 0; i < PVP_TEAM_COUNT; i++)
+                for(GroupsQueueType::const_iterator citr = m_SelectionPools[TEAM_INDEX_ALLIANCE + i].SelectedGroups.begin(); citr != m_SelectionPools[TEAM_INDEX_ALLIANCE + i].SelectedGroups.end(); ++citr)
+                    InviteGroupToBG((*citr), bg2, (*citr)->GroupTeam);
+            //start bg
+            bg2->StartBattleGround();
+            //clear structures
+            m_SelectionPools[TEAM_INDEX_ALLIANCE].Init();
+            m_SelectionPools[TEAM_INDEX_HORDE].Init();
+        }
+    }
+
+    // now check if there are in queues enough players to start new game of (normal battleground, or non-rated arena)
+    if (!isRated)
+    {
+        // if there are enough players in pools, start new battleground or non rated arena
+        if (CheckNormalMatch(bg_template, bracket_id, MinPlayersPerTeam, MaxPlayersPerTeam)
+            || (bg_template->isArena() && CheckSkirmishForSameFaction(bracket_id, MinPlayersPerTeam)) )
+        {
+            // we successfully created a pool
+            BattleGround * bg2 = sBattleGroundMgr.CreateNewBattleGround(bgTypeId, bracketEntry, arenaType, false);
+            if (!bg2)
+            {
+                sLog.outError("BattleGroundQueue::Update - Cannot create battleground: %u", bgTypeId);
+                return;
+            }
+
+            // invite those selection pools
+            for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
+                for (GroupsQueueType::const_iterator citr = m_SelectionPools[TEAM_INDEX_ALLIANCE + i].SelectedGroups.begin(); citr != m_SelectionPools[TEAM_INDEX_ALLIANCE + i].SelectedGroups.end(); ++citr)
+                    InviteGroupToBG((*citr), bg2, (*citr)->GroupTeam);
+            // start bg
+            bg2->StartBattleGround();
+        }
+    }
+    else if (bg_template->isArena())
+    {
+        // found out the minimum and maximum ratings the newly added team should battle against
+        // arenaRating is the rating of the latest joined team, or 0
+        // 0 is on (automatic update call) and we must set it to team's with longest wait time
+        if (!arenaRating)
+        {
+            GroupQueueInfo* front1 = NULL;
+            GroupQueueInfo* front2 = NULL;
+            if (!m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].empty())
+            {
+                front1 = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].front();
+                arenaRating = front1->ArenaTeamRating;
+            }
+            if (!m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].empty())
+            {
+                front2 = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].front();
+                arenaRating = front2->ArenaTeamRating;
+            }
+            if (front1 && front2)
+            {
+                if (front1->JoinTime < front2->JoinTime)
+                    arenaRating = front1->ArenaTeamRating;
+            }
+            else if (!front1 && !front2)
+                return; // queues are empty
+        }
+
+        // set rating range
+        uint32 arenaMinRating = (arenaRating <= sBattleGroundMgr.GetMaxRatingDifference()) ? 0 : arenaRating - sBattleGroundMgr.GetMaxRatingDifference();
+        uint32 arenaMaxRating = arenaRating + sBattleGroundMgr.GetMaxRatingDifference();
+        // if max rating difference is set and the time past since server startup is greater than the rating discard time
+        // (after what time the ratings aren't taken into account when making teams) then
+        // the discard time is current_time - time_to_discard, teams that joined after that, will have their ratings taken into account
+        // else leave the discard time on 0, this way all ratings will be discarded
+        int32 discardTime = WorldTimer::getMSTime() - sBattleGroundMgr.GetRatingDiscardTimer();
+
+        // we need to find 2 teams which will play next game
+
+        GroupsQueueType::iterator itr_team[PVP_TEAM_COUNT];
+
+        // optimalization : --- we dont need to use selection_pools - each update we select max 2 groups
+
+        uint32 teamId = 0;
+
+        for (uint8 i = BG_QUEUE_PREMADE_ALLIANCE; i < BG_QUEUE_NORMAL_ALLIANCE; ++i)
+        {
+            // take the group that joined first
+            itr_team[i] = m_QueuedGroups[bracket_id][i].begin();
+            for (; itr_team[i] != m_QueuedGroups[bracket_id][i].end(); ++(itr_team[i]))
+            {
+                // if group match conditions, then add it to pool
+                if (!(*itr_team[i])->IsInvitedToBGInstanceGUID
+                        && (((*itr_team[i])->ArenaTeamRating >= arenaMinRating && (*itr_team[i])->ArenaTeamRating <= arenaMaxRating)
+                            || int((*itr_team[i])->JoinTime) < discardTime))
+                {
+                    m_SelectionPools[i].AddGroup((*itr_team[i]), MaxPlayersPerTeam);
+                    // break for cycle to be able to start selecting another group from same faction queue
+                    break;
+                }
+            }
+        }
+        // now we are done if we have 2 groups - ali vs horde!
+        // if we don't have, we must try to continue search in same queue
+        // tmp variables are correctly set
+        // this code isn't much userfriendly - but it is supposed to continue search for mathing group in HORDE queue
+        if (m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount() == 0 && m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount())
+        {
+            itr_team[TEAM_INDEX_ALLIANCE] = itr_team[TEAM_INDEX_HORDE];
+            ++itr_team[TEAM_INDEX_ALLIANCE];
+            for (; itr_team[TEAM_INDEX_ALLIANCE] != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].end(); ++(itr_team[TEAM_INDEX_ALLIANCE]))
+            {
+                if (!(*itr_team[TEAM_INDEX_ALLIANCE])->IsInvitedToBGInstanceGUID
+                    && (((*itr_team[TEAM_INDEX_ALLIANCE])->ArenaTeamRating >= arenaMinRating && (*itr_team[TEAM_INDEX_ALLIANCE])->ArenaTeamRating <= arenaMaxRating)
+                        || int((*itr_team[TEAM_INDEX_ALLIANCE])->JoinTime) < discardTime) )
+                {
+                    if ((*itr_team[TEAM_INDEX_ALLIANCE])->ArenaTeamId != teamId)
+                    {
+                        m_SelectionPools[TEAM_INDEX_ALLIANCE].AddGroup((*itr_team[TEAM_INDEX_ALLIANCE]), MaxPlayersPerTeam);
+                        break;
+                    }
+                }
+            }
+        }
+        // this code isn't much userfriendly - but it is supposed to continue search for mathing group in ALLIANCE queue
+        if (m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount() == 0 && m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount())
+        {
+            itr_team[TEAM_INDEX_HORDE] = itr_team[TEAM_INDEX_ALLIANCE];
+            ++itr_team[TEAM_INDEX_HORDE];
+            for (; itr_team[TEAM_INDEX_HORDE] != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++(itr_team[TEAM_INDEX_HORDE]))
+            {
+                if (!(*itr_team[TEAM_INDEX_HORDE])->IsInvitedToBGInstanceGUID
+                        && (((*itr_team[TEAM_INDEX_HORDE])->ArenaTeamRating >= arenaMinRating && (*itr_team[TEAM_INDEX_HORDE])->ArenaTeamRating <= arenaMaxRating)
+                            || int((*itr_team[TEAM_INDEX_HORDE])->JoinTime) < discardTime))
+                {
+                    if((*itr_team[TEAM_INDEX_HORDE])->ArenaTeamId != teamId)
+                    {
+                        m_SelectionPools[TEAM_INDEX_HORDE].AddGroup((*itr_team[TEAM_INDEX_HORDE]), MaxPlayersPerTeam);
+                        break;
+                    }
+                }
+            }
+        }
+
+        // if we have 2 teams, then start new arena and invite players!
+        if (m_SelectionPools[TEAM_INDEX_ALLIANCE].GetPlayerCount() && m_SelectionPools[TEAM_INDEX_HORDE].GetPlayerCount())
+        {
+            BattleGround* arena = sBattleGroundMgr.CreateNewBattleGround(bgTypeId, bracketEntry, arenaType, true);
+            if (!arena)
+            {
+                sLog.outError("BattlegroundQueue::Update couldn't create arena instance for rated arena match!");
+                return;
+            }
+
+            (*(itr_team[TEAM_INDEX_ALLIANCE]))->OpponentsTeamRating = (*(itr_team[TEAM_INDEX_HORDE]))->ArenaTeamRating;
+            DEBUG_LOG("setting oposite teamrating for team %u to %u", (*(itr_team[TEAM_INDEX_ALLIANCE]))->ArenaTeamId, (*(itr_team[TEAM_INDEX_ALLIANCE]))->OpponentsTeamRating);
+            (*(itr_team[TEAM_INDEX_HORDE]))->OpponentsTeamRating = (*(itr_team[TEAM_INDEX_ALLIANCE]))->ArenaTeamRating;
+            DEBUG_LOG("setting oposite teamrating for team %u to %u", (*(itr_team[TEAM_INDEX_HORDE]))->ArenaTeamId, (*(itr_team[TEAM_INDEX_HORDE]))->OpponentsTeamRating);
+            // now we must move team if we changed its faction to another faction queue, because then we will spam log by errors in Queue::RemovePlayer
+            if ((*(itr_team[TEAM_INDEX_ALLIANCE]))->GroupTeam != ALLIANCE)
+            {
+                // add to alliance queue
+                m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].push_front(*(itr_team[TEAM_INDEX_ALLIANCE]));
+                // erase from horde queue
+                m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].erase(itr_team[TEAM_INDEX_ALLIANCE]);
+                itr_team[TEAM_INDEX_ALLIANCE] = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].begin();
+            }
+            if ((*(itr_team[TEAM_INDEX_HORDE]))->GroupTeam != HORDE)
+            {
+                m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].push_front(*(itr_team[TEAM_INDEX_HORDE]));
+                m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].erase(itr_team[TEAM_INDEX_HORDE]);
+                itr_team[TEAM_INDEX_HORDE] = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].begin();
+            }
+
+            InviteGroupToBG(*(itr_team[TEAM_INDEX_ALLIANCE]), arena, ALLIANCE);
+            InviteGroupToBG(*(itr_team[TEAM_INDEX_HORDE]), arena, HORDE);
+
+            DEBUG_LOG("Starting rated arena match!");
+
+            arena->StartBattleGround();
+        }
+    }
+}
+
+/*********************************************************/
+/***            BATTLEGROUND MANAGER                   ***/
+/*********************************************************/
+
+BattleGroundMgr::BattleGroundMgr() : m_AutoDistributionTimeChecker(0), m_ArenaTesting(false)
+{
+    for (uint8 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; ++i)
+        m_BattleGrounds[i].clear();
+    m_NextRatingDiscardUpdate = GetRatingDiscardTimer();
+    m_Testing = false;
+}
+
+BattleGroundMgr::~BattleGroundMgr()
+{
+    DeleteAllBattleGrounds();
+}
+
+void BattleGroundMgr::DeleteAllBattleGrounds()
+{
+    // will also delete template bgs:
+    for (uint8 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; ++i)
+    {
+        for (BattleGroundSet::iterator itr = m_BattleGrounds[i].begin(); itr != m_BattleGrounds[i].end();)
+        {
+            BattleGround* bg = itr->second;
+            ++itr;                                          // step from invalidate iterator pos in result element remove in ~BattleGround call
+            delete bg;
+        }
+    }
+}
+
+// used to update running battlegrounds, and delete finished ones
+void BattleGroundMgr::Update(uint32 diff)
+{
+    // update scheduled queues
+    if (!m_QueueUpdateScheduler.empty())
+    {
+        std::vector<uint64> scheduled;
+        {
+            // create mutex
+            // ACE_Guard<MANGOSR2_MUTEX_MODEL_2> guard(SchedulerLock);
+            // copy vector and clear the other
+            scheduled = std::vector<uint64>(m_QueueUpdateScheduler);
+            m_QueueUpdateScheduler.clear();
+            // release lock
+        }
+
+        for (uint8 i = 0; i < scheduled.size(); ++i)
+        {
+            uint32 arenaRating = scheduled[i] >> 32;
+            ArenaType arenaType = ArenaType(scheduled[i] >> 24 & 255);
+            BattleGroundQueueTypeId bgQueueTypeId = BattleGroundQueueTypeId(scheduled[i] >> 16 & 255);
+            BattleGroundTypeId bgTypeId = BattleGroundTypeId((scheduled[i] >> 8) & 255);
+            BattleGroundBracketId bracket_id = BattleGroundBracketId(scheduled[i] & 255);
+            m_BattleGroundQueues[bgQueueTypeId].Update(bgTypeId, bracket_id, arenaType, arenaRating > 0, arenaRating);
+        }
+    }
+
+    // if rating difference counts, maybe force-update queues
+    if (sWorld.getConfig(CONFIG_UINT32_ARENA_MAX_RATING_DIFFERENCE) && GetRatingDiscardTimer())
+    {
+        // it's time to force update
+        if (m_NextRatingDiscardUpdate < diff)
+        {
+            // forced update for rated arenas (scan all, but skipped non rated)
+            DEBUG_LOG("BattleGroundMgr: UPDATING ARENA QUEUES");
+            for (uint8 qtype = BATTLEGROUND_QUEUE_2v2; qtype <= BATTLEGROUND_QUEUE_5v5; ++qtype)
+                for (uint8 bracket = BG_BRACKET_ID_FIRST; bracket < MAX_BATTLEGROUND_BRACKETS; ++bracket)
+                    m_BattleGroundQueues[qtype].Update(
+                        BATTLEGROUND_AA, BattleGroundBracketId(bracket),
+                        BattleGroundMgr::BGArenaType(BattleGroundQueueTypeId(qtype)), true, 0);
+
+            m_NextRatingDiscardUpdate = GetRatingDiscardTimer();
+        }
+        else
+            m_NextRatingDiscardUpdate -= diff;
+    }
+    if (sWorld.getConfig(CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS))
+    {
+        if (m_AutoDistributionTimeChecker < diff)
+        {
+            if (sWorld.GetGameTime() > m_NextAutoDistributionTime)
+            {
+                DistributeArenaPoints();
+                m_NextAutoDistributionTime = time_t(m_NextAutoDistributionTime + BATTLEGROUND_ARENA_POINT_DISTRIBUTION_DAY * sWorld.getConfig(CONFIG_UINT32_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS));
+                CharacterDatabase.PExecute("UPDATE saved_variables SET NextArenaPointDistributionTime = '" UI64FMTD "'", uint64(m_NextAutoDistributionTime));
+            }
+            m_AutoDistributionTimeChecker = 600000; // check 10 minutes
+        }
+        else
+            m_AutoDistributionTimeChecker -= diff;
+    }
+}
+
+void BattleGroundMgr::BuildBattleGroundStatusPacket(WorldPacket* data, BattleGround* bg, uint8 QueueSlot, uint8 StatusID, uint32 Time1, uint32 Time2, ArenaType arenatype, Team arenaTeam)
+{
+    // we can be in 2 queues in same time...
+
+    if (StatusID == 0 || !bg)
+    {
+        data->Initialize(SMSG_BATTLEFIELD_STATUS, 4 + 8);
+        *data << uint32(QueueSlot);                         // queue id (0...1)
+        *data << uint64(0);
+        return;
+    }
+
+    data->Initialize(SMSG_BATTLEFIELD_STATUS, (4 + 8 + 1 + 1 + 4 + 1 + 4 + 4 + 4));
+    *data << uint32(QueueSlot);                             // queue id (0...1) - player can be in 2 queues in time
+    // uint64 in client
+    *data << uint64(uint64(arenatype) | (uint64(0x0D) << 8) | (uint64(bg->GetTypeID()) << 16) | (uint64(0x1F90) << 48));
+    *data << uint8(0);                                      // 3.3.0, some level, only saw 80...
+    *data << uint8(0);                                      // 3.3.0, some level, only saw 80...
+    *data << uint32(bg->GetClientInstanceID());
+    // alliance/horde for BG and skirmish/rated for Arenas
+    // following displays the minimap-icon 0 = faction icon 1 = arenaicon
+    *data << uint8(bg->isRated());
+    *data << uint32(StatusID);                              // status
+    switch (StatusID)
+    {
+        case STATUS_WAIT_QUEUE:                             // status_in_queue
+            *data << uint32(Time1);                         // average wait time, milliseconds
+            *data << uint32(Time2);                         // time in queue, updated every minute!, milliseconds
+            break;
+        case STATUS_WAIT_JOIN:                              // status_invite
+            *data << uint32(bg->GetMapId());                // map id
+            *data << uint64(0);                             // 3.3.5, unknown
+            *data << uint32(Time1);                         // time to remove from queue, milliseconds
+            break;
+        case STATUS_IN_PROGRESS:                            // status_in_progress
+            *data << uint32(bg->GetMapId());                // map id
+            *data << uint64(0);                             // 3.3.5, unknown
+            *data << uint32(Time1);                         // time to bg auto leave, 0 at bg start, 120000 after bg end, milliseconds
+            *data << uint32(Time2);                         // time from bg start, milliseconds
+            *data << uint8(arenaTeam == ALLIANCE ? 1 : 0);  // arenaTeam (0 for horde, 1 for alliance)
+            break;
+        default:
+            sLog.outError("Unknown BG status!");
+            break;
+    }
+}
+
+void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket* data, BattleGround* bg)
+{
+    uint8 type = (bg->isArena() ? 1 : 0);
+    // last check on 3.0.3
+    data->Initialize(MSG_PVP_LOG_DATA, (1 + 1 + 4 + 40 * bg->GetPlayerScoresSize()));
+    *data << uint8(type);                                   // type (battleground=0/arena=1)
+
+    if (type)                                               // arena
+    {
+        // it seems this must be according to BG_WINNER_A/H and _NOT_ TEAM_INDEX_A/H
+        for (int8 i = 1; i >= 0; --i)
+        {
+            uint32 pointsLost = bg->m_ArenaTeamRatingChanges[i] < 0 ? abs(bg->m_ArenaTeamRatingChanges[i]) : 0;
+            uint32 pointsGained = bg->m_ArenaTeamRatingChanges[i] > 0 ? bg->m_ArenaTeamRatingChanges[i] : 0;
+
+            *data << uint32(pointsLost);                    // Rating Lost
+            *data << uint32(pointsGained);                  // Rating gained
+            *data << uint32(0);                             // Matchmaking Value
+            DEBUG_LOG("rating change: %d", bg->m_ArenaTeamRatingChanges[i]);
+        }
+
+        for (int8 i = 1; i >= 0; --i)
+        {
+            uint32 at_id = bg->m_ArenaTeamIds[i];
+            ArenaTeam* at = sObjectMgr.GetArenaTeamById(at_id);
+            if (at)
+                *data << at->GetName();
+            else
+                *data << (uint8)0;
+        }
+    }
+
+    if (bg->GetStatus() != STATUS_WAIT_LEAVE)
+        *data << uint8(0);                                  // bg not ended
+    else
+    {
+        *data << uint8(1);                                  // bg ended
+        Team team = bg->GetWinner();
+        uint8 uWinner = team == ALLIANCE ? 1
+                      : team == HORDE ? 0 : 2;
+        *data << uint8(uWinner);                            // who win
+    }
+
+    *data << (int32)(bg->GetPlayerScoresSize());
+
+    for (BattleGround::BattleGroundScoreMap::const_iterator itr = bg->GetPlayerScoresBegin(); itr != bg->GetPlayerScoresEnd(); ++itr)
+    {
+        *data << ObjectGuid(itr->first);
+        *data << (int32)itr->second->KillingBlows;
+        if (type == 0)
+        {
+            *data << (int32)itr->second->HonorableKills;
+            *data << (int32)itr->second->Deaths;
+            *data << (int32)(itr->second->BonusHonor);
+        }
+        else
+        {
+            Team team = bg->GetPlayerTeam(itr->first);
+            if (!team)
+                if (Player* player = sObjectMgr.GetPlayer(itr->first))
+                    team = player->GetTeam();
+
+            if (bg->GetWinner() == team && team != TEAM_NONE)
+                *data << uint8(1);
+            else
+                *data << uint8(0);
+        }
+        *data << (int32)itr->second->DamageDone;            // damage done
+        *data << (int32)itr->second->HealingDone;           // healing done
+        switch (bg->GetTypeID(true))                        // battleground specific things
+        {
+            case BATTLEGROUND_AV:
+                *data << (uint32)0x00000005;                // count of next fields
+                *data << (uint32)((BattleGroundAVScore*)itr->second)->GraveyardsAssaulted;  // GraveyardsAssaulted
+                *data << (uint32)((BattleGroundAVScore*)itr->second)->GraveyardsDefended;   // GraveyardsDefended
+                *data << (uint32)((BattleGroundAVScore*)itr->second)->TowersAssaulted;      // TowersAssaulted
+                *data << (uint32)((BattleGroundAVScore*)itr->second)->TowersDefended;       // TowersDefended
+                *data << (uint32)((BattleGroundAVScore*)itr->second)->SecondaryObjectives;  // SecondaryObjectives - free some of the Lieutnants
+                break;
+            case BATTLEGROUND_WS:
+                *data << (uint32)0x00000002;                // count of next fields
+                *data << (uint32)((BattleGroundWGScore*)itr->second)->FlagCaptures;         // flag captures
+                *data << (uint32)((BattleGroundWGScore*)itr->second)->FlagReturns;          // flag returns
+                break;
+            case BATTLEGROUND_AB:
+                *data << (uint32)0x00000002;                // count of next fields
+                *data << (uint32)((BattleGroundABScore*)itr->second)->BasesAssaulted;       // bases asssulted
+                *data << (uint32)((BattleGroundABScore*)itr->second)->BasesDefended;        // bases defended
+                break;
+            case BATTLEGROUND_EY:
+                *data << (uint32)0x00000001;                // count of next fields
+                *data << (uint32)((BattleGroundEYScore*)itr->second)->FlagCaptures;         // flag captures
+                break;
+            case BATTLEGROUND_SA:                           // wotlk
+                *data << (uint32)0x00000002;                // count of next fields
+                *data << (uint32)((BattleGroundSAScore*)itr->second)->DemolishersDestroyed; // demolishers destroyed
+                *data << (uint32)((BattleGroundSAScore*)itr->second)->GatesDestroyed;       // gates destroyed
+                break;
+            case BATTLEGROUND_IC:                           // wotlk
+                *data << uint32(0x00000002);                // count of next fields
+                *data << uint32(((BattleGroundICScore*)itr->second)->BasesAssaulted);       // bases asssulted
+                *data << uint32(((BattleGroundICScore*)itr->second)->BasesDefended);        // bases defended
+                break;
+            case BATTLEGROUND_NA:
+            case BATTLEGROUND_BE:
+            case BATTLEGROUND_AA:
+            case BATTLEGROUND_RL:
+            case BATTLEGROUND_DS:                           // wotlk
+            case BATTLEGROUND_RV:                           // wotlk
+            case BATTLEGROUND_RB:                           // wotlk
+                *data << (int32)0;                          // 0
+                break;
+            default:
+                DEBUG_LOG("Unhandled MSG_PVP_LOG_DATA for BG id %u", bg->GetTypeID(true));
+                *data << (int32)0;
+                break;
+        }
+    }
+}
+
+void BattleGroundMgr::BuildGroupJoinedBattlegroundPacket(WorldPacket* data, GroupJoinBattlegroundResult result)
+{
+    data->Initialize(SMSG_GROUP_JOINED_BATTLEGROUND, 4);
+    *data << int32(result);
+    if (result == ERR_BATTLEGROUND_JOIN_TIMED_OUT || result == ERR_BATTLEGROUND_JOIN_FAILED)
+        *data << uint64(0);                                 // player guid
+}
+
+void BattleGroundMgr::BuildUpdateWorldStatePacket(WorldPacket* data, uint32 field, uint32 value)
+{
+    data->Initialize(SMSG_UPDATE_WORLD_STATE, 4 + 4);
+    *data << uint32(field);
+    *data << uint32(value);
+}
+
+void BattleGroundMgr::BuildPlaySoundPacket(WorldPacket* data, uint32 soundid)
+{
+    data->Initialize(SMSG_PLAY_SOUND, 4);
+    *data << uint32(soundid);
+}
+
+void BattleGroundMgr::BuildPlayerLeftBattleGroundPacket(WorldPacket* data, ObjectGuid guid)
+{
+    data->Initialize(SMSG_BATTLEGROUND_PLAYER_LEFT, 8);
+    *data << ObjectGuid(guid);
+}
+
+void BattleGroundMgr::BuildPlayerJoinedBattleGroundPacket(WorldPacket* data, Player* plr)
+{
+    data->Initialize(SMSG_BATTLEGROUND_PLAYER_JOINED, 8);
+    *data << plr->GetObjectGuid();
+}
+
+BattleGround* BattleGroundMgr::GetBattleGroundThroughClientInstance(uint32 instanceId, BattleGroundTypeId bgTypeId)
+{
+    // cause at HandleBattleGroundJoinOpcode the clients sends the instanceid he gets from
+    // SMSG_BATTLEFIELD_LIST we need to find the battleground with this clientinstance-id
+    BattleGround* bg = GetBattleGroundTemplate(bgTypeId);
+    if (!bg)
+        return NULL;
+
+    if (bg->isArena())
+        return GetBattleGround(instanceId, bgTypeId);
+
+    for (BattleGroundSet::iterator itr = m_BattleGrounds[bgTypeId].begin(); itr != m_BattleGrounds[bgTypeId].end(); ++itr)
+    {
+        if (itr->second->GetClientInstanceID() == instanceId)
+            return itr->second;
+    }
+    return NULL;
+}
+
+BattleGround* BattleGroundMgr::GetBattleGround(uint32 InstanceID, BattleGroundTypeId bgTypeId)
+{
+    // search if needed
+    BattleGroundSet::iterator itr;
+    if (bgTypeId == BATTLEGROUND_TYPE_NONE)
+    {
+        for (uint8 i = BATTLEGROUND_AV; i < MAX_BATTLEGROUND_TYPE_ID; ++i)
+        {
+            itr = m_BattleGrounds[i].find(InstanceID);
+            if (itr != m_BattleGrounds[i].end())
+                return itr->second;
+        }
+        return NULL;
+    }
+    itr = m_BattleGrounds[bgTypeId].find(InstanceID);
+    return ((itr != m_BattleGrounds[bgTypeId].end()) ? itr->second : NULL);
+}
+
+BattleGround* BattleGroundMgr::GetBattleGroundTemplate(BattleGroundTypeId bgTypeId)
+{
+    // map is sorted and we can be sure that lowest instance id has only BG template
+    return m_BattleGrounds[bgTypeId].empty() ? NULL : m_BattleGrounds[bgTypeId].begin()->second;
+}
+
+uint32 BattleGroundMgr::CreateClientVisibleInstanceId(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id)
+{
+    if (IsArenaType(bgTypeId))
+        return 0;                                           // arenas don't have client-instanceids
+
+    // we create here an instanceid, which is just for
+    // displaying this to the client and without any other use..
+    // the client-instanceIds are unique for each battleground-type
+    // the instance-id just needs to be as low as possible, beginning with 1
+    // the following works, because std::set is default ordered with "<"
+    // the optimalization would be to use as bitmask std::vector<uint32> - but that would only make code unreadable
+    uint32 lastId = 0;
+    ClientBattleGroundIdSet& ids = m_ClientBattleGroundIds[bgTypeId][bracket_id];
+    for (ClientBattleGroundIdSet::const_iterator itr = ids.begin(); itr != ids.end();)
+    {
+        if ((++lastId) != *itr)                             // if there is a gap between the ids, we will break..
+            break;
+        lastId = *itr;
+    }
+    ids.insert(lastId + 1);
+    return lastId + 1;
+}
+
+// create a new battleground that will really be used to play
+BattleGround* BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeId, PvPDifficultyEntry const* bracketEntry, ArenaType arenaType, bool isRated)
+{
+    // get the template BG
+    BattleGround* bg_template = GetBattleGroundTemplate(bgTypeId);
+    if (!bg_template)
+    {
+        sLog.outError("BattleGround: CreateNewBattleGround - bg template not found for %u", bgTypeId);
+        return NULL;
+    }
+
+    bool isArena = false;
+
+    // for arenas there is random map used
+    if (bg_template->isArena())
+    {
+        BattleGroundTypeId arenas[] = { BATTLEGROUND_NA, BATTLEGROUND_BE, BATTLEGROUND_RL, BATTLEGROUND_DS, BATTLEGROUND_RV };
+        bgTypeId = arenas[urand(0, countof(arenas) - 1)];
+        bg_template = GetBattleGroundTemplate(bgTypeId);
+        if (!bg_template)
+        {
+            sLog.outError("BattleGround: CreateNewBattleGround - bg template not found for %u", bgTypeId);
+            return NULL;
+        }
+        isArena = true;
+    }
+
+    bool isRandom = false;
+
+    if (bgTypeId==BATTLEGROUND_RB)
+    {
+        BattleGroundTypeId random_bgs[] = {BATTLEGROUND_AV, BATTLEGROUND_WS, BATTLEGROUND_AB, BATTLEGROUND_EY, BATTLEGROUND_SA/*, BATTLEGROUND_IC*/};
+        uint32 bg_num = urand(0, sizeof(random_bgs)/sizeof(BattleGroundTypeId)-1);
+        bgTypeId = random_bgs[bg_num];
+        bg_template = GetBattleGroundTemplate(bgTypeId);
+        if (!bg_template)
+        {
+            sLog.outError("BattleGround: CreateNewBattleGround - bg template not found for %u", bgTypeId);
+            return NULL;
+        }
+        isRandom = true;
+    }
+
+    BattleGround* bg = NULL;
+    // create a copy of the BG template
+    switch (bgTypeId)
+    {
+        case BATTLEGROUND_AV:
+            bg = new BattleGroundAV(*(BattleGroundAV*)bg_template);
+            break;
+        case BATTLEGROUND_WS:
+            bg = new BattleGroundWS(*(BattleGroundWS*)bg_template);
+            break;
+        case BATTLEGROUND_AB:
+            bg = new BattleGroundAB(*(BattleGroundAB*)bg_template);
+            break;
+        case BATTLEGROUND_NA:
+            bg = new BattleGroundNA(*(BattleGroundNA*)bg_template);
+            break;
+        case BATTLEGROUND_BE:
+            bg = new BattleGroundBE(*(BattleGroundBE*)bg_template);
+            break;
+        case BATTLEGROUND_AA:
+            bg = new BattleGroundAA(*(BattleGroundAA*)bg_template);
+            break;
+        case BATTLEGROUND_EY:
+            bg = new BattleGroundEY(*(BattleGroundEY*)bg_template);
+            break;
+        case BATTLEGROUND_RL:
+            bg = new BattleGroundRL(*(BattleGroundRL*)bg_template);
+            break;
+        case BATTLEGROUND_SA:
+            bg = new BattleGroundSA(*(BattleGroundSA*)bg_template);
+            break;
+        case BATTLEGROUND_DS:
+            bg = new BattleGroundDS(*(BattleGroundDS*)bg_template);
+            break;
+        case BATTLEGROUND_RV:
+            bg = new BattleGroundRV(*(BattleGroundRV*)bg_template);
+            break;
+        case BATTLEGROUND_IC:
+            bg = new BattleGroundIC(*(BattleGroundIC*)bg_template);
+            break;
+        case BATTLEGROUND_RB:
+            bg = new BattleGroundRB(*(BattleGroundRB*)bg_template);
+            break;
+        default:
+            // error, but it is handled few lines above
+            return 0;
+    }
+
+    // set before Map creating for let use proper difficulty
+    bg->SetBracket(bracketEntry);
+
+    // will also set m_bgMap, instanceid
+    sMapMgr.CreateBgMap(bg->GetMapId(), bg);
+
+    bg->SetClientInstanceID(CreateClientVisibleInstanceId(isRandom ? BATTLEGROUND_RB : bgTypeId, bracketEntry->GetBracketId()));
+
+    // reset the new bg (set status to status_wait_queue from status_none)
+    bg->Reset();
+
+    // Set initial BG WorldStates (mostly setted in DB, but may be setted in script)
+    bg->FillInitialWorldStates();
+
+    // start the joining of the bg
+    bg->SetStatus(STATUS_WAIT_JOIN);
+    bg->SetArenaType(arenaType);
+    bg->SetRated(isRated);
+    bg->SetRandom(isRandom);
+    bg->SetTypeID(isRandom ? BATTLEGROUND_RB : isArena ? BATTLEGROUND_AA : bgTypeId);
+    bg->SetRandomTypeID(bgTypeId);
+
+    return bg;
+}
+
+// used to create the BG templates
+uint32 BattleGroundMgr::CreateBattleGround(BattleGroundTypeId bgTypeId, bool IsArena, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam, uint32 LevelMin, uint32 LevelMax, char const* BattleGroundName, uint32 MapID, float Team1StartLocX, float Team1StartLocY, float Team1StartLocZ, float Team1StartLocO, float Team2StartLocX, float Team2StartLocY, float Team2StartLocZ, float Team2StartLocO)
+{
+    // Create the BG
+    BattleGround* bg = NULL;
+    switch (bgTypeId)
+    {
+        case BATTLEGROUND_AV: bg = new BattleGroundAV; break;
+        case BATTLEGROUND_WS: bg = new BattleGroundWS; break;
+        case BATTLEGROUND_AB: bg = new BattleGroundAB; break;
+        case BATTLEGROUND_NA: bg = new BattleGroundNA; break;
+        case BATTLEGROUND_BE: bg = new BattleGroundBE; break;
+        case BATTLEGROUND_AA: bg = new BattleGroundAA; break;
+        case BATTLEGROUND_EY: bg = new BattleGroundEY; break;
+        case BATTLEGROUND_RL: bg = new BattleGroundRL; break;
+        case BATTLEGROUND_SA: bg = new BattleGroundSA; break;
+        case BATTLEGROUND_DS: bg = new BattleGroundDS; break;
+        case BATTLEGROUND_RV: bg = new BattleGroundRV; break;
+        case BATTLEGROUND_IC: bg = new BattleGroundIC; break;
+        case BATTLEGROUND_RB: bg = new BattleGroundRB; break;
+        default:              bg = new BattleGround;   break;                           // placeholder for non implemented BG
+    }
+
+    bg->SetMapId(MapID);
+    bg->SetTypeID(bgTypeId);
+    bg->SetArenaorBGType(IsArena);
+    bg->SetMinPlayersPerTeam(MinPlayersPerTeam);
+    bg->SetMaxPlayersPerTeam(MaxPlayersPerTeam);
+    bg->SetMinPlayers(MinPlayersPerTeam * 2);
+    bg->SetMaxPlayers(MaxPlayersPerTeam * 2);
+    bg->SetName(BattleGroundName);
+    bg->SetTeamStartLoc(ALLIANCE, Team1StartLocX, Team1StartLocY, Team1StartLocZ, Team1StartLocO);
+    bg->SetTeamStartLoc(HORDE,    Team2StartLocX, Team2StartLocY, Team2StartLocZ, Team2StartLocO);
+    bg->SetLevelRange(LevelMin, LevelMax);
+
+    // add bg to update list
+    AddBattleGround(bg->GetInstanceID(), bg->GetTypeID(), bg);
+
+    // return some not-null value, bgTypeId is good enough for me
+    return bgTypeId;
+}
+
+void BattleGroundMgr::CreateInitialBattleGrounds()
+{
+    uint32 count = 0;
+
+    //                                                0   1                 2                 3                4              5             6
+    QueryResult* result = WorldDatabase.Query("SELECT id, MinPlayersPerTeam,MaxPlayersPerTeam,AllianceStartLoc,AllianceStartO,HordeStartLoc,HordeStartO FROM battleground_template");
+
+    if (!result)
+    {
+        BarGoLink bar(1);
+
+        bar.step();
+
+        sLog.outString();
+        sLog.outErrorDb(">> Loaded 0 battlegrounds. DB table `battleground_template` is empty.");
+        return;
+    }
+
+    BarGoLink bar(result->GetRowCount());
+
+    do
+    {
+        Field* fields = result->Fetch();
+        bar.step();
+
+        uint32 bgTypeID_ = fields[0].GetUInt32();
+
+        // can be overwrite by values from DB
+        BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(bgTypeID_);
+        if (!bl)
+        {
+            sLog.outError("Battleground ID %u not found in BattlemasterList.dbc. Battleground not created.", bgTypeID_);
+            continue;
+        }
+
+        BattleGroundTypeId bgTypeID = BattleGroundTypeId(bgTypeID_);
+
+        bool IsArena = (bl->type == TYPE_ARENA);
+        uint32 MinPlayersPerTeam = fields[1].GetUInt32();
+        uint32 MaxPlayersPerTeam = fields[2].GetUInt32();
+
+        // check values from DB
+        if (MaxPlayersPerTeam == 0 || MinPlayersPerTeam == 0)
+        {
+            sLog.outErrorDb("Table `battleground_template` for id %u have wrong min/max players per team settings. BG not created.", bgTypeID);
+            continue;
+        }
+
+        if (MinPlayersPerTeam > MaxPlayersPerTeam)
+            MinPlayersPerTeam = MaxPlayersPerTeam;
+
+        float AStartLoc[4];
+        float HStartLoc[4];
+
+        uint32 start1 = fields[3].GetUInt32();
+
+        WorldSafeLocsEntry const* start = sWorldSafeLocsStore.LookupEntry(start1);
+        if (start)
+        {
+            AStartLoc[0] = start->x;
+            AStartLoc[1] = start->y;
+            AStartLoc[2] = start->z;
+            AStartLoc[3] = fields[4].GetFloat();
+        }
+        else if (bgTypeID == BATTLEGROUND_AA || bgTypeID == BATTLEGROUND_RB)
+        {
+            AStartLoc[0] = 0;
+            AStartLoc[1] = 0;
+            AStartLoc[2] = 0;
+            AStartLoc[3] = fields[4].GetFloat();
+        }
+        else
+        {
+            sLog.outErrorDb("Table `battleground_template` for id %u have nonexistent WorldSafeLocs.dbc id %u in field `AllianceStartLoc`. BG not created.", bgTypeID, start1);
+            continue;
+        }
+
+        uint32 start2 = fields[5].GetUInt32();
+
+        start = sWorldSafeLocsStore.LookupEntry(start2);
+        if (start)
+        {
+            HStartLoc[0] = start->x;
+            HStartLoc[1] = start->y;
+            HStartLoc[2] = start->z;
+            HStartLoc[3] = fields[6].GetFloat();
+        }
+        else if (bgTypeID == BATTLEGROUND_AA || bgTypeID == BATTLEGROUND_RB)
+        {
+            HStartLoc[0] = 0;
+            HStartLoc[1] = 0;
+            HStartLoc[2] = 0;
+            HStartLoc[3] = fields[6].GetFloat();
+        }
+        else
+        {
+            sLog.outErrorDb("Table `battleground_template` for id %u have nonexistent WorldSafeLocs.dbc id %u in field `HordeStartLoc`. BG not created.", bgTypeID, start2);
+            continue;
+        }
+
+        // sLog.outDetail("Creating battleground %s, %u-%u", bl->name[sWorld.GetDBClang()], MinLvl, MaxLvl);
+        if (!CreateBattleGround(bgTypeID, IsArena, MinPlayersPerTeam, MaxPlayersPerTeam, bl->minLevel, bl->maxLevel, bl->name[sWorld.GetDefaultDbcLocale()], bl->mapid[0], AStartLoc[0], AStartLoc[1], AStartLoc[2], AStartLoc[3], HStartLoc[0], HStartLoc[1], HStartLoc[2], HStartLoc[3]))
+            continue;
+
+        ++count;
+    }
+    while (result->NextRow());
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u battlegrounds", count);
+}
+
+void BattleGroundMgr::InitAutomaticArenaPointDistribution()
+{
+    if (sWorld.getConfig(CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS))
+    {
+        DEBUG_LOG("Initializing Automatic Arena Point Distribution");
+        QueryResult* result = CharacterDatabase.Query("SELECT NextArenaPointDistributionTime FROM saved_variables");
+        if (!result)
+        {
+            DEBUG_LOG("Battleground: Next arena point distribution time not found in SavedVariables, reseting it now.");
+            m_NextAutoDistributionTime = time_t(sWorld.GetGameTime() + BATTLEGROUND_ARENA_POINT_DISTRIBUTION_DAY * sWorld.getConfig(CONFIG_UINT32_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS));
+            CharacterDatabase.PExecute("INSERT INTO saved_variables (NextArenaPointDistributionTime) VALUES ('" UI64FMTD "')", uint64(m_NextAutoDistributionTime));
+        }
+        else
+        {
+            m_NextAutoDistributionTime = time_t((*result)[0].GetUInt64());
+            delete result;
+        }
+        DEBUG_LOG("Automatic Arena Point Distribution initialized.");
+    }
+}
+
+void BattleGroundMgr::DistributeArenaPoints()
+{
+    // used to distribute arena points based on last week's stats
+    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_START);
+
+    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_ONLINE_START);
+
+    // temporary structure for storing maximum points to add values for all players
+    std::map<uint32, uint32> PlayerPoints;
+
+    // at first update all points for all team members
+    for (ObjectMgr::ArenaTeamMap::iterator team_itr = sObjectMgr.GetArenaTeamMapBegin(); team_itr != sObjectMgr.GetArenaTeamMapEnd(); ++team_itr)
+    {
+        if (ArenaTeam* at = team_itr->second)
+        {
+            at->UpdateArenaPointsHelper(PlayerPoints);
+        }
+    }
+
+    // cycle that gives points to all players
+    for (std::map<uint32, uint32>::iterator plr_itr = PlayerPoints.begin(); plr_itr != PlayerPoints.end(); ++plr_itr)
+    {
+        // update to database
+        CharacterDatabase.PExecute("UPDATE characters SET arenaPoints = arenaPoints + '%u' WHERE guid = '%u'", plr_itr->second, plr_itr->first);
+        // add points if player is online
+        Player* pl = sObjectMgr.GetPlayer(ObjectGuid(HIGHGUID_PLAYER, plr_itr->first));
+        if (pl)
+            pl->ModifyArenaPoints(plr_itr->second);
+    }
+
+    PlayerPoints.clear();
+
+    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_ONLINE_END);
+
+    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_TEAM_START);
+    for (ObjectMgr::ArenaTeamMap::iterator titr = sObjectMgr.GetArenaTeamMapBegin(); titr != sObjectMgr.GetArenaTeamMapEnd(); ++titr)
+    {
+        if (ArenaTeam* at = titr->second)
+        {
+            at->FinishWeek();                              // set played this week etc values to 0 in memory, too
+            at->SaveToDB();                                // save changes
+            at->NotifyStatsChanged();                      // notify the players of the changes
+        }
+    }
+
+    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_TEAM_END);
+
+    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_END);
+}
+
+void BattleGroundMgr::BuildBattleGroundListPacket(WorldPacket* data, ObjectGuid guid, Player* plr, BattleGroundTypeId bgTypeId, uint8 fromWhere)
+{
+    if (!plr)
+        return;
+
+    uint32 win_kills = plr->IsRandomBGWinner() ? BG_REWARD_WINNER_HONOR_LAST : BG_REWARD_WINNER_HONOR_FIRST;
+    uint32 win_arena = plr->IsRandomBGWinner() ? BG_REWARD_WINNER_ARENA_LAST : BG_REWARD_WINNER_ARENA_FIRST;
+    uint32 loos_kills = plr->IsRandomBGWinner() ? BG_REWARD_LOOSER_HONOR_LAST : BG_REWARD_LOOSER_HONOR_FIRST;
+
+    win_kills = (uint32)MaNGOS::Honor::hk_honor_at_level(plr->getLevel(), win_kills*4);
+    loos_kills = (uint32)MaNGOS::Honor::hk_honor_at_level(plr->getLevel(), loos_kills*4);
+
+    data->Initialize(SMSG_BATTLEFIELD_LIST);
+    *data << guid;                                          // battlemaster guid
+    *data << uint8(fromWhere);                              // from where you joined
+    *data << uint32(bgTypeId);                              // battleground id
+    *data << uint8(0);                                      // unk
+    *data << uint8(0);                                      // unk
+
+    // Rewards
+    *data << uint8(plr->IsRandomBGWinner());               // 3.3.3 hasWin
+    *data << uint32( win_kills );                           // 3.3.3 winHonor
+    *data << uint32( win_arena );                           // 3.3.3 winArena
+    *data << uint32( loos_kills );                          // 3.3.3 lossHonor
+
+    uint8 isRandom = bgTypeId == BATTLEGROUND_RB;
+    *data << uint8(isRandom);                               // 3.3.3 isRandom
+    if (isRandom)
+    {
+        // Rewards (random)
+        *data << uint8(plr->IsRandomBGWinner());            // 3.3.3 hasWin_Random
+        *data << uint32( win_kills );                       // 3.3.3 winHonor_Random
+        *data << uint32( win_arena );                       // 3.3.3 winArena_Random
+        *data << uint32( loos_kills );                      // 3.3.3 lossHonor_Random
+    }
+
+    if (bgTypeId == BATTLEGROUND_AA)                         // arena
+    {
+        *data << uint32(0);                                 // arena - no instances showed
+    }
+    else                                                    // battleground
+    {
+        size_t count_pos = data->wpos();
+        uint32 count = 0;
+        *data << uint32(0);                                 // number of bg instances
+
+        BattleGround* bgTemplate = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
+        if (bgTemplate)
+        {
+            // expected bracket entry
+            if (PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bgTemplate->GetMapId(), plr->getLevel()))
+            {
+                BattleGroundBracketId bracketId = bracketEntry->GetBracketId();
+                ClientBattleGroundIdSet const& ids = m_ClientBattleGroundIds[bgTypeId][bracketId];
+                for (ClientBattleGroundIdSet::const_iterator itr = ids.begin(); itr != ids.end(); ++itr)
+                {
+                    *data << uint32(*itr);
+                    ++count;
+                }
+                data->put<uint32>(count_pos , count);
+            }
+        }
+    }
+}
+
+void BattleGroundMgr::SendToBattleGround(Player* pl, uint32 instanceId, BattleGroundTypeId bgTypeId)
+{
+    BattleGround* bg = GetBattleGround(instanceId, bgTypeId);
+    if (bg)
+    {
+        uint32 mapid = bg->GetMapId();
+        float x, y, z, O;
+        Team team = pl->GetBGTeam();
+        if (team == 0)
+            team = pl->GetTeam();
+        bg->GetTeamStartLoc(team, x, y, z, O);
+
+        DETAIL_LOG("BATTLEGROUND: Sending %s to map %u, X %f, Y %f, Z %f, O %f", pl->GetName(), mapid, x, y, z, O);
+        pl->TeleportTo(mapid, x, y, z, O);
+    }
+    else
+    {
+        sLog.outError("player %u trying to port to nonexistent bg instance %u", pl->GetGUIDLow(), instanceId);
+    }
+}
+
+bool BattleGroundMgr::IsArenaType(BattleGroundTypeId bgTypeId)
+{
+    switch (bgTypeId)
+    {
+        case BATTLEGROUND_NA:
+        case BATTLEGROUND_BE:
+        case BATTLEGROUND_RL:
+        case BATTLEGROUND_DS:
+        case BATTLEGROUND_RV:
+        case BATTLEGROUND_AA:
+            return true;
+        default:
+            break;
+    }
+    return false;
+}
+
+BattleGroundQueueTypeId BattleGroundMgr::BGQueueTypeId(BattleGroundTypeId bgTypeId, ArenaType arenaType)
+{
+    switch (bgTypeId)
+    {
+        case BATTLEGROUND_WS:
+            return BATTLEGROUND_QUEUE_WS;
+        case BATTLEGROUND_AB:
+            return BATTLEGROUND_QUEUE_AB;
+        case BATTLEGROUND_AV:
+            return BATTLEGROUND_QUEUE_AV;
+        case BATTLEGROUND_EY:
+            return BATTLEGROUND_QUEUE_EY;
+        case BATTLEGROUND_SA:
+            return BATTLEGROUND_QUEUE_SA;
+        case BATTLEGROUND_IC:
+            return BATTLEGROUND_QUEUE_IC;
+        case BATTLEGROUND_RB:
+            return BATTLEGROUND_QUEUE_RB;
+        case BATTLEGROUND_AA:
+        case BATTLEGROUND_NA:
+        case BATTLEGROUND_RL:
+        case BATTLEGROUND_BE:
+        case BATTLEGROUND_DS:
+        case BATTLEGROUND_RV:
+            switch (arenaType)
+            {
+                case ARENA_TYPE_2v2:
+                    return BATTLEGROUND_QUEUE_2v2;
+                case ARENA_TYPE_3v3:
+                    return BATTLEGROUND_QUEUE_3v3;
+                case ARENA_TYPE_5v5:
+                    return BATTLEGROUND_QUEUE_5v5;
+                default:
+                    break;
+            }
+            break;
+        default:
+            break;
+    }
+    return BATTLEGROUND_QUEUE_NONE;
+}
+
+BattleGroundTypeId BattleGroundMgr::BGTemplateId(BattleGroundQueueTypeId bgQueueTypeId)
+{
+    switch (bgQueueTypeId)
+    {
+        case BATTLEGROUND_QUEUE_WS:
+            return BATTLEGROUND_WS;
+        case BATTLEGROUND_QUEUE_AB:
+            return BATTLEGROUND_AB;
+        case BATTLEGROUND_QUEUE_AV:
+            return BATTLEGROUND_AV;
+        case BATTLEGROUND_QUEUE_EY:
+            return BATTLEGROUND_EY;
+        case BATTLEGROUND_QUEUE_SA:
+            return BATTLEGROUND_SA;
+        case BATTLEGROUND_QUEUE_IC:
+            return BATTLEGROUND_IC;
+        case BATTLEGROUND_QUEUE_RB:
+            return BATTLEGROUND_RB;
+        case BATTLEGROUND_QUEUE_2v2:
+        case BATTLEGROUND_QUEUE_3v3:
+        case BATTLEGROUND_QUEUE_5v5:
+            return BATTLEGROUND_AA;
+        default:
+            return BattleGroundTypeId(0);                   // used for unknown template (it exist and do nothing)
+    }
+}
+
+ArenaType BattleGroundMgr::BGArenaType(BattleGroundQueueTypeId bgQueueTypeId)
+{
+    switch (bgQueueTypeId)
+    {
+        case BATTLEGROUND_QUEUE_2v2:
+            return ARENA_TYPE_2v2;
+        case BATTLEGROUND_QUEUE_3v3:
+            return ARENA_TYPE_3v3;
+        case BATTLEGROUND_QUEUE_5v5:
+            return ARENA_TYPE_5v5;
+        default:
+            return ARENA_TYPE_NONE;
+    }
+}
+
+void BattleGroundMgr::ToggleTesting()
+{
+    m_Testing = !m_Testing;
+    if (m_Testing)
+        sWorld.SendWorldText(LANG_DEBUG_BG_ON);
+    else
+        sWorld.SendWorldText(LANG_DEBUG_BG_OFF);
+}
+
+void BattleGroundMgr::ToggleArenaTesting()
+{
+    m_ArenaTesting = !m_ArenaTesting;
+    if (m_ArenaTesting)
+        sWorld.SendWorldText(LANG_DEBUG_ARENA_ON);
+    else
+        sWorld.SendWorldText(LANG_DEBUG_ARENA_OFF);
+}
+
+void BattleGroundMgr::ScheduleQueueUpdate(uint32 arenaRating, ArenaType arenaType, BattleGroundQueueTypeId bgQueueTypeId, BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id)
+{
+    // ACE_Guard<MANGOSR2_MUTEX_MODEL_2> guard(SchedulerLock);
+    // we will use only 1 number created of bgTypeId and bracket_id
+    uint64 schedule_id = ((uint64)arenaRating << 32) | (arenaType << 24) | (bgQueueTypeId << 16) | (bgTypeId << 8) | bracket_id;
+    bool found = false;
+    for (uint8 i = 0; i < m_QueueUpdateScheduler.size(); ++i)
+    {
+        if (m_QueueUpdateScheduler[i] == schedule_id)
+        {
+            found = true;
+            break;
+        }
+    }
+    if (!found)
+        m_QueueUpdateScheduler.push_back(schedule_id);
+}
+
+uint32 BattleGroundMgr::GetMaxRatingDifference() const
+{
+    // this is for stupid people who can't use brain and set max rating difference to 0
+    uint32 diff = sWorld.getConfig(CONFIG_UINT32_ARENA_MAX_RATING_DIFFERENCE);
+    if (diff == 0)
+        diff = 5000;
+    return diff;
+}
+
+uint32 BattleGroundMgr::GetRatingDiscardTimer() const
+{
+    return sWorld.getConfig(CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER);
+}
+
+uint32 BattleGroundMgr::GetPrematureFinishTime() const
+{
+    return sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_PREMATURE_FINISH_TIMER);
+}
+
+void BattleGroundMgr::LoadBattleMastersEntry()
+{
+    mBattleMastersMap.clear();                              // need for reload case
+
+    QueryResult* result = WorldDatabase.Query("SELECT entry,bg_template FROM battlemaster_entry");
+
+    uint32 count = 0;
+
+    if (!result)
+    {
+        BarGoLink bar(1);
+        bar.step();
+
+        sLog.outString();
+        sLog.outString(">> Loaded 0 battlemaster entries - table is empty!");
+        return;
+    }
+
+    BarGoLink bar(result->GetRowCount());
+
+    do
+    {
+        ++count;
+        bar.step();
+
+        Field* fields = result->Fetch();
+
+        uint32 entry = fields[0].GetUInt32();
+        uint32 bgTypeId  = fields[1].GetUInt32();
+        if (!sBattlemasterListStore.LookupEntry(bgTypeId))
+        {
+            sLog.outErrorDb("Table `battlemaster_entry` contain entry %u for nonexistent battleground type %u, ignored.", entry, bgTypeId);
+            continue;
+        }
+
+        mBattleMastersMap[entry] = BattleGroundTypeId(bgTypeId);
+
+    }
+    while (result->NextRow());
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u battlemaster entries", count);
+}
+
+HolidayIds BattleGroundMgr::BGTypeToWeekendHolidayId(BattleGroundTypeId bgTypeId)
+{
+    switch (bgTypeId)
+    {
+        case BATTLEGROUND_AV: return HOLIDAY_CALL_TO_ARMS_AV;
+        case BATTLEGROUND_EY: return HOLIDAY_CALL_TO_ARMS_EY;
+        case BATTLEGROUND_WS: return HOLIDAY_CALL_TO_ARMS_WS;
+        case BATTLEGROUND_SA: return HOLIDAY_CALL_TO_ARMS_SA;
+        case BATTLEGROUND_AB: return HOLIDAY_CALL_TO_ARMS_AB;
+        default: return HOLIDAY_NONE;
+    }
+}
+
+BattleGroundTypeId BattleGroundMgr::WeekendHolidayIdToBGType(HolidayIds holiday)
+{
+    switch (holiday)
+    {
+        case HOLIDAY_CALL_TO_ARMS_AV: return BATTLEGROUND_AV;
+        case HOLIDAY_CALL_TO_ARMS_EY: return BATTLEGROUND_EY;
+        case HOLIDAY_CALL_TO_ARMS_WS: return BATTLEGROUND_WS;
+        case HOLIDAY_CALL_TO_ARMS_SA: return BATTLEGROUND_SA;
+        case HOLIDAY_CALL_TO_ARMS_AB: return BATTLEGROUND_AB;
+        default: return BATTLEGROUND_TYPE_NONE;
+    }
+}
+
+bool BattleGroundMgr::IsBGWeekend(BattleGroundTypeId bgTypeId)
+{
+    return sGameEventMgr.IsActiveHoliday(BGTypeToWeekendHolidayId(bgTypeId));
+}
+
+void BattleGroundMgr::LoadBattleEventIndexes()
+{
+    BattleGroundEventIdx events;
+    events.event1 = BG_EVENT_NONE;
+    events.event2 = BG_EVENT_NONE;
+    m_GameObjectBattleEventIndexMap.clear();             // need for reload case
+    m_GameObjectBattleEventIndexMap[-1] = events;
+    m_CreatureBattleEventIndexMap.clear();               // need for reload case
+    m_CreatureBattleEventIndexMap[-1] = events;
+
+    uint32 count = 0;
+
+    QueryResult* result =
+        //                           0         1           2                3                4              5           6
+        WorldDatabase.Query("SELECT data.typ, data.guid1, data.ev1 AS ev1, data.ev2 AS ev2, data.map AS m, data.guid2, description.map, "
+        //                              7                  8                   9
+                            "description.event1, description.event2, description.description "
+                            "FROM "
+                            "(SELECT '1' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
+                            "FROM gameobject_battleground AS a "
+                            "LEFT OUTER JOIN gameobject AS b ON a.guid = b.guid "
+                            "UNION "
+                            "SELECT '2' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
+                            "FROM creature_battleground AS a "
+                            "LEFT OUTER JOIN creature AS b ON a.guid = b.guid "
+                            ") data "
+                            "RIGHT OUTER JOIN battleground_events AS description ON data.map = description.map "
+                            "AND data.ev1 = description.event1 AND data.ev2 = description.event2 "
+                            // full outer join doesn't work in mysql :-/ so just UNION-select the same again and add a left outer join
+                            "UNION "
+                            "SELECT data.typ, data.guid1, data.ev1, data.ev2, data.map, data.guid2, description.map, "
+                            "description.event1, description.event2, description.description "
+                            "FROM "
+                            "(SELECT '1' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
+                            "FROM gameobject_battleground AS a "
+                            "LEFT OUTER JOIN gameobject AS b ON a.guid = b.guid "
+                            "UNION "
+                            "SELECT '2' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
+                            "FROM creature_battleground AS a "
+                            "LEFT OUTER JOIN creature AS b ON a.guid = b.guid "
+                            ") data "
+                            "LEFT OUTER JOIN battleground_events AS description ON data.map = description.map "
+                            "AND data.ev1 = description.event1 AND data.ev2 = description.event2 "
+                            "ORDER BY m, ev1, ev2");
+    if (!result)
+    {
+        BarGoLink bar(1);
+        bar.step();
+
+        sLog.outString();
+        sLog.outErrorDb(">> Loaded 0 battleground eventindexes.");
+        return;
+    }
+
+    BarGoLink bar(result->GetRowCount());
+
+    do
+    {
+        bar.step();
+        Field* fields = result->Fetch();
+        if (fields[2].GetUInt8() == BG_EVENT_NONE || fields[3].GetUInt8() == BG_EVENT_NONE)
+            continue;                                       // we don't need to add those to the eventmap
+
+        bool gameobject         = (fields[0].GetUInt8() == 1);
+        uint32 dbTableGuidLow   = fields[1].GetUInt32();
+        events.event1           = fields[2].GetUInt8();
+        events.event2           = fields[3].GetUInt8();
+        uint32 map              = fields[4].GetUInt32();
+
+        uint32 desc_map = fields[6].GetUInt32();
+        uint8 desc_event1 = fields[7].GetUInt8();
+        uint8 desc_event2 = fields[8].GetUInt8();
+        const char* description = fields[9].GetString();
+
+        // checking for NULL - through right outer join this will mean following:
+        if (fields[5].GetUInt32() != dbTableGuidLow)
+        {
+            sLog.outErrorDb("BattleGroundEvent: %s with nonexistent guid %u for event: map:%u, event1:%u, event2:%u (\"%s\")",
+                            (gameobject) ? "gameobject" : "creature", dbTableGuidLow, map, events.event1, events.event2, description);
+            continue;
+        }
+
+        // checking for NULL - through full outer join this can mean 2 things:
+        if (desc_map != map)
+        {
+            // there is an event missing
+            if (dbTableGuidLow == 0)
+            {
+                sLog.outErrorDb("BattleGroundEvent: missing db-data for map:%u, event1:%u, event2:%u (\"%s\")", desc_map, desc_event1, desc_event2, description);
+                continue;
+            }
+            // we have an event which shouldn't exist
+            else
+            {
+                sLog.outErrorDb("BattleGroundEvent: %s with guid %u is registered, for a nonexistent event: map:%u, event1:%u, event2:%u",
+                                (gameobject) ? "gameobject" : "creature", dbTableGuidLow, map, events.event1, events.event2);
+                continue;
+            }
+        }
+
+        if (gameobject)
+            m_GameObjectBattleEventIndexMap[dbTableGuidLow] = events;
+        else
+            m_CreatureBattleEventIndexMap[dbTableGuidLow] = events;
+
+        ++count;
+
+    }
+    while (result->NextRow());
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u battleground eventindexes", count);
+    delete result;
+}
diff --git a/src/game/BattleGround/BattleGroundMgr.h b/src/game/BattleGround/BattleGroundMgr.h
new file mode 100644
index 00000000000..ed3922488aa
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundMgr.h
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __BATTLEGROUNDMGR_H
+#define __BATTLEGROUNDMGR_H
+
+#include "Common.h"
+#include "Policies/Singleton.h"
+#include "SharedDefines.h"
+#include "DBCEnums.h"
+#include "BattleGround.h"
+#include "ace/Recursive_Thread_Mutex.h"
+
+typedef std::map<uint32, BattleGround*> BattleGroundSet;
+
+// this container can't be deque, because deque doesn't like removing the last element - if you remove it, it invalidates next iterator and crash appears
+typedef std::list<BattleGround*> BGFreeSlotQueueType;
+
+typedef UNORDERED_MAP<uint32, BattleGroundTypeId> BattleMastersMap;
+typedef UNORDERED_MAP<uint32, BattleGroundEventIdx> CreatureBattleEventIndexesMap;
+typedef UNORDERED_MAP<uint32, BattleGroundEventIdx> GameObjectBattleEventIndexesMap;
+
+#define BATTLEGROUND_ARENA_POINT_DISTRIBUTION_DAY 86400     // seconds in a day
+#define COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME 10
+
+struct GroupQueueInfo;                                      // type predefinition
+struct PlayerQueueInfo                                      // stores information for players in queue
+{
+    uint32  LastOnlineTime;                                 // for tracking and removing offline players from queue after 5 minutes
+    GroupQueueInfo* GroupInfo;                              // pointer to the associated groupqueueinfo
+};
+
+typedef std::map<ObjectGuid, PlayerQueueInfo*> GroupQueueInfoPlayers;
+
+struct GroupQueueInfo                                       // stores information about the group in queue (also used when joined as solo!)
+{
+    GroupQueueInfoPlayers Players;                          // player queue info map
+    Team  GroupTeam;                                        // Player team (ALLIANCE/HORDE)
+    BattleGroundTypeId BgTypeId;                            // battleground type id
+    bool    IsRated;                                        // rated
+    ArenaType arenaType;                                    // 2v2, 3v3, 5v5 or 0 when BG
+    uint32  ArenaTeamId;                                    // team id if rated match
+    uint32  JoinTime;                                       // time when group was added
+    uint32  RemoveInviteTime;                               // time when we will remove invite for players in group
+    uint32  IsInvitedToBGInstanceGUID;                      // was invited to certain BG
+    uint32  ArenaTeamRating;                                // if rated match, inited to the rating of the team
+    uint32  OpponentsTeamRating;                            // for rated arena matches
+};
+
+enum BattleGroundQueueGroupTypes
+{
+    BG_QUEUE_PREMADE_ALLIANCE   = 0,
+    BG_QUEUE_PREMADE_HORDE      = 1,
+    BG_QUEUE_NORMAL_ALLIANCE    = 2,
+    BG_QUEUE_NORMAL_HORDE       = 3
+};
+#define BG_QUEUE_GROUP_TYPES_COUNT 4
+
+class BattleGround;
+class BattleGroundQueue
+{
+    public:
+        BattleGroundQueue();
+        ~BattleGroundQueue();
+
+        void Update(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id, ArenaType arenaType = ARENA_TYPE_NONE, bool isRated = false, uint32 minRating = 0);
+
+        void FillPlayersToBG(BattleGround* bg, BattleGroundBracketId bracket_id);
+        bool CheckPremadeMatch(BattleGroundBracketId bracket_id, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam);
+        bool CheckNormalMatch(BattleGround* bg_template, BattleGroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers);
+        bool CheckSkirmishForSameFaction(BattleGroundBracketId bracket_id, uint32 minPlayersPerTeam);
+        GroupQueueInfo* AddGroup(Player* leader, Group* group, BattleGroundTypeId bgTypeId, PvPDifficultyEntry const*  bracketEntry, ArenaType arenaType, bool isRated, bool isPremade, uint32 ArenaRating, uint32 ArenaTeamId = 0);
+        void RemovePlayer(ObjectGuid guid, bool decreaseInvitedCount);
+        bool IsPlayerInvited(ObjectGuid pl_guid, const uint32 bgInstanceGuid, const uint32 removeTime);
+        bool GetPlayerGroupInfoData(ObjectGuid guid, GroupQueueInfo* ginfo);
+        void PlayerInvitedToBGUpdateAverageWaitTime(GroupQueueInfo* ginfo, BattleGroundBracketId bracket_id);
+        uint32 GetAverageQueueWaitTime(GroupQueueInfo* ginfo, BattleGroundBracketId bracket_id);
+
+    private:
+        // mutex that should not allow changing private data, nor allowing to update Queue during private data change.
+        ACE_Recursive_Thread_Mutex  m_Lock;
+
+
+        typedef std::map<ObjectGuid, PlayerQueueInfo> QueuedPlayersMap;
+        QueuedPlayersMap m_QueuedPlayers;
+
+        // we need constant add to begin and constant remove / add from the end, therefore deque suits our problem well
+        typedef std::list<GroupQueueInfo*> GroupsQueueType;
+
+        /*
+        This two dimensional array is used to store All queued groups
+        First dimension specifies the bgTypeId
+        Second dimension specifies the player's group types -
+             BG_QUEUE_PREMADE_ALLIANCE  is used for premade alliance groups and alliance rated arena teams
+             BG_QUEUE_PREMADE_HORDE     is used for premade horde groups and horde rated arena teams
+             BG_QUEUE_NORMAL_ALLIANCE   is used for normal (or small) alliance groups or non-rated arena matches
+             BG_QUEUE_NORMAL_HORDE      is used for normal (or small) horde groups or non-rated arena matches
+        */
+        GroupsQueueType m_QueuedGroups[MAX_BATTLEGROUND_BRACKETS][BG_QUEUE_GROUP_TYPES_COUNT];
+
+        // class to select and invite groups to bg
+        class SelectionPool
+        {
+            public:
+                void Init();
+                bool AddGroup(GroupQueueInfo* ginfo, uint32 desiredCount);
+                bool KickGroup(uint32 size);
+                uint32 GetPlayerCount() const {return PlayerCount;}
+            public:
+                GroupsQueueType SelectedGroups;
+            private:
+                uint32 PlayerCount;
+        };
+
+        // one selection pool for horde, other one for alliance
+        SelectionPool m_SelectionPools[PVP_TEAM_COUNT];
+
+        bool InviteGroupToBG(GroupQueueInfo* ginfo, BattleGround* bg, Team side);
+        uint32 m_WaitTimes[PVP_TEAM_COUNT][MAX_BATTLEGROUND_BRACKETS][COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME];
+        uint32 m_WaitTimeLastPlayer[PVP_TEAM_COUNT][MAX_BATTLEGROUND_BRACKETS];
+        uint32 m_SumOfWaitTimes[PVP_TEAM_COUNT][MAX_BATTLEGROUND_BRACKETS];
+};
+
+class BattleGroundMgr : public MaNGOS::Singleton<BattleGroundMgr, MaNGOS::ClassLevelLockable<BattleGroundMgr, MANGOSR2_MUTEX_MODEL_2> >
+{
+    public:
+        /* Construction */
+        BattleGroundMgr();
+        ~BattleGroundMgr();
+        void Update(uint32 diff);
+
+        /* Packet Building */
+        void BuildPlayerJoinedBattleGroundPacket(WorldPacket* data, Player* plr);
+        void BuildPlayerLeftBattleGroundPacket(WorldPacket* data, ObjectGuid guid);
+        void BuildBattleGroundListPacket(WorldPacket* data, ObjectGuid guid, Player* plr, BattleGroundTypeId bgTypeId, uint8 fromWhere);
+        void BuildGroupJoinedBattlegroundPacket(WorldPacket* data, GroupJoinBattlegroundResult result);
+        void BuildUpdateWorldStatePacket(WorldPacket* data, uint32 field, uint32 value);
+        void BuildPvpLogDataPacket(WorldPacket* data, BattleGround* bg);
+        void BuildBattleGroundStatusPacket(WorldPacket* data, BattleGround* bg, uint8 QueueSlot, uint8 StatusID, uint32 Time1, uint32 Time2, ArenaType arenatype, Team arenaTeam);
+        void BuildPlaySoundPacket(WorldPacket* data, uint32 soundid);
+
+        /* Battlegrounds */
+        BattleGround* GetBattleGroundThroughClientInstance(uint32 instanceId, BattleGroundTypeId bgTypeId);
+        BattleGround* GetBattleGround(uint32 InstanceID, BattleGroundTypeId bgTypeId); // there must be uint32 because MAX_BATTLEGROUND_TYPE_ID means unknown
+
+        BattleGround* GetBattleGroundTemplate(BattleGroundTypeId bgTypeId);
+        BattleGround* CreateNewBattleGround(BattleGroundTypeId bgTypeId, PvPDifficultyEntry const* bracketEntry, ArenaType arenaType, bool isRated);
+
+        uint32 CreateBattleGround(BattleGroundTypeId bgTypeId, bool IsArena, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam, uint32 LevelMin, uint32 LevelMax, char const* BattleGroundName, uint32 MapID, float Team1StartLocX, float Team1StartLocY, float Team1StartLocZ, float Team1StartLocO, float Team2StartLocX, float Team2StartLocY, float Team2StartLocZ, float Team2StartLocO);
+
+        void AddBattleGround(uint32 InstanceID, BattleGroundTypeId bgTypeId, BattleGround* BG) { m_BattleGrounds[bgTypeId][InstanceID] = BG; };
+        void RemoveBattleGround(uint32 instanceID, BattleGroundTypeId bgTypeId) { m_BattleGrounds[bgTypeId].erase(instanceID); }
+        uint32 CreateClientVisibleInstanceId(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id);
+        void DeleteClientVisibleInstanceId(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id, uint32 clientInstanceID)
+        {
+            m_ClientBattleGroundIds[bgTypeId][bracket_id].erase(clientInstanceID);
+        }
+
+        void CreateInitialBattleGrounds();
+        void DeleteAllBattleGrounds();
+
+        void SendToBattleGround(Player* pl, uint32 InstanceID, BattleGroundTypeId bgTypeId);
+
+        /* Battleground queues */
+        // these queues are instantiated when creating BattlegroundMrg
+        BattleGroundQueue m_BattleGroundQueues[MAX_BATTLEGROUND_QUEUE_TYPES]; // public, because we need to access them in BG handler code
+
+        BGFreeSlotQueueType BGFreeSlotQueue[MAX_BATTLEGROUND_TYPE_ID];
+
+        void ScheduleQueueUpdate(uint32 arenaRating, ArenaType arenaType, BattleGroundQueueTypeId bgQueueTypeId, BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id);
+        uint32 GetMaxRatingDifference() const;
+        uint32 GetRatingDiscardTimer()  const;
+        uint32 GetPrematureFinishTime() const;
+
+        void InitAutomaticArenaPointDistribution();
+        void DistributeArenaPoints();
+        void ToggleArenaTesting();
+        void ToggleTesting();
+
+        void LoadBattleMastersEntry();
+        BattleGroundTypeId GetBattleMasterBG(uint32 entry) const
+        {
+            BattleMastersMap::const_iterator itr = mBattleMastersMap.find(entry);
+            if (itr != mBattleMastersMap.end())
+                return itr->second;
+            return BATTLEGROUND_TYPE_NONE;
+        }
+
+        void LoadBattleEventIndexes();
+        const BattleGroundEventIdx GetCreatureEventIndex(uint32 dbTableGuidLow) const
+        {
+            CreatureBattleEventIndexesMap::const_iterator itr = m_CreatureBattleEventIndexMap.find(dbTableGuidLow);
+            if (itr != m_CreatureBattleEventIndexMap.end())
+                return itr->second;
+            return m_CreatureBattleEventIndexMap.find(-1)->second;
+        }
+        const BattleGroundEventIdx GetGameObjectEventIndex(uint32 dbTableGuidLow) const
+        {
+            GameObjectBattleEventIndexesMap::const_iterator itr = m_GameObjectBattleEventIndexMap.find(dbTableGuidLow);
+            if (itr != m_GameObjectBattleEventIndexMap.end())
+                return itr->second;
+            return m_GameObjectBattleEventIndexMap.find(-1)->second;
+        }
+
+        bool isArenaTesting() const { return m_ArenaTesting; }
+        bool isTesting() const { return m_Testing; }
+
+        static bool IsArenaType(BattleGroundTypeId bgTypeId);
+        static bool IsBattleGroundType(BattleGroundTypeId bgTypeId) { return !IsArenaType(bgTypeId); }
+        static BattleGroundQueueTypeId BGQueueTypeId(BattleGroundTypeId bgTypeId, ArenaType arenaType);
+        static BattleGroundTypeId BGTemplateId(BattleGroundQueueTypeId bgQueueTypeId);
+        static ArenaType BGArenaType(BattleGroundQueueTypeId bgQueueTypeId);
+
+        static HolidayIds BGTypeToWeekendHolidayId(BattleGroundTypeId bgTypeId);
+        static BattleGroundTypeId WeekendHolidayIdToBGType(HolidayIds holiday);
+        static bool IsBGWeekend(BattleGroundTypeId bgTypeId);
+    private:
+        MANGOSR2_MUTEX_MODEL_2    SchedulerLock;
+        BattleMastersMap    mBattleMastersMap;
+        CreatureBattleEventIndexesMap m_CreatureBattleEventIndexMap;
+        GameObjectBattleEventIndexesMap m_GameObjectBattleEventIndexMap;
+
+        /* Battlegrounds */
+        BattleGroundSet m_BattleGrounds[MAX_BATTLEGROUND_TYPE_ID];
+        std::vector<uint64> m_QueueUpdateScheduler;
+        typedef std::set<uint32> ClientBattleGroundIdSet;
+        ClientBattleGroundIdSet m_ClientBattleGroundIds[MAX_BATTLEGROUND_TYPE_ID][MAX_BATTLEGROUND_BRACKETS]; // the instanceids just visible for the client
+        uint32 m_NextRatingDiscardUpdate;
+        time_t m_NextAutoDistributionTime;
+        uint32 m_AutoDistributionTimeChecker;
+        bool   m_ArenaTesting;
+        bool   m_Testing;
+};
+
+#define sBattleGroundMgr MaNGOS::Singleton<BattleGroundMgr>::Instance()
+#endif
diff --git a/src/game/BattleGroundNA.cpp b/src/game/BattleGround/BattleGroundNA.cpp
similarity index 77%
rename from src/game/BattleGroundNA.cpp
rename to src/game/BattleGround/BattleGroundNA.cpp
index 541b5e79f12..0783f72dd0d 100644
--- a/src/game/BattleGroundNA.cpp
+++ b/src/game/BattleGround/BattleGroundNA.cpp
@@ -30,7 +30,7 @@ BattleGroundNA::BattleGroundNA()
     m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
     m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
     m_StartDelayTimes[BG_STARTING_EVENT_FOURTH] = BG_START_DELAY_NONE;
-    //we must set messageIds
+    // we must set messageIds
     m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_ARENA_ONE_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_ARENA_THIRTY_SECONDS;
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
@@ -61,10 +61,10 @@ void BattleGroundNA::StartingEventOpenDoors()
     OpenDoorEvent(BG_EVENT_DOOR);
 }
 
-void BattleGroundNA::AddPlayer(Player *plr)
+void BattleGroundNA::AddPlayer(Player* plr)
 {
     BattleGround::AddPlayer(plr);
-    //create score and add it to map, default values are set in constructor
+    // create score and add it to map, default values are set in constructor
     BattleGroundNAScore* sc = new BattleGroundNAScore;
 
     m_PlayerScores[plr->GetObjectGuid()] = sc;
@@ -84,7 +84,7 @@ void BattleGroundNA::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
     CheckArenaWinConditions();
 }
 
-void BattleGroundNA::HandleKillPlayer(Player *player, Player *killer)
+void BattleGroundNA::HandleKillPlayer(Player* player, Player* killer)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
@@ -95,7 +95,7 @@ void BattleGroundNA::HandleKillPlayer(Player *player, Player *killer)
         return;
     }
 
-    BattleGround::HandleKillPlayer(player,killer);
+    BattleGround::HandleKillPlayer(player, killer);
 
     UpdateWorldState(0xa0f, GetAlivePlayersCountByTeam(ALLIANCE));
     UpdateWorldState(0xa10, GetAlivePlayersCountByTeam(HORDE));
@@ -103,44 +103,44 @@ void BattleGroundNA::HandleKillPlayer(Player *player, Player *killer)
     CheckArenaWinConditions();
 }
 
-bool BattleGroundNA::HandlePlayerUnderMap(Player *player)
+bool BattleGroundNA::HandlePlayerUnderMap(Player* player)
 {
-    player->TeleportTo(GetMapId(),4055.504395f,2919.660645f,13.611241f,player->GetOrientation(),false);
+    player->TeleportTo(GetMapId(), 4055.504395f, 2919.660645f, 13.611241f, player->GetOrientation());
     return true;
 }
 
-void BattleGroundNA::HandleAreaTrigger(Player *Source, uint32 Trigger)
+void BattleGroundNA::HandleAreaTrigger(Player* source, uint32 trigger)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
 
-    //uint32 SpellId = 0;
-    //uint64 buff_guid = 0;
-    switch(Trigger)
+    // uint32 spellId = 0;
+    // uint64 buff_guid = 0;
+    switch (trigger)
     {
         case 4536:                                          // buff trigger?
         case 4537:                                          // buff trigger?
             break;
         default:
-            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", Trigger);
-            Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
+            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", trigger);
+            source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", trigger);
             break;
     }
 
-    //if (buff_guid)
-    //    HandleTriggerBuff(buff_guid,Source);
+    // if (buff_guid)
+    //    HandleTriggerBuff(buff_guid, source);
 }
 
-void BattleGroundNA::FillInitialWorldStates(WorldPacket &data, uint32& count)
+void BattleGroundNA::FillInitialWorldStates()
 {
-    FillInitialWorldState(data, count, 0xa0f, GetAlivePlayersCountByTeam(ALLIANCE));
-    FillInitialWorldState(data, count, 0xa10, GetAlivePlayersCountByTeam(HORDE));
-    FillInitialWorldState(data, count, 0xa11, 1);
+    FillInitialWorldState(0xa0f, GetAlivePlayersCountByTeam(ALLIANCE));
+    FillInitialWorldState(0xa10, GetAlivePlayersCountByTeam(HORDE));
+    FillInitialWorldState(0xa11, 1);
 }
 
 void BattleGroundNA::Reset()
 {
-    //call parent's class reset
+    // call parent's class reset
     BattleGround::Reset();
 }
 
diff --git a/src/game/BattleGroundNA.h b/src/game/BattleGround/BattleGroundNA.h
similarity index 76%
rename from src/game/BattleGroundNA.h
rename to src/game/BattleGround/BattleGroundNA.h
index 29169bf35ae..a5c0cb572d3 100644
--- a/src/game/BattleGroundNA.h
+++ b/src/game/BattleGround/BattleGroundNA.h
@@ -25,12 +25,12 @@ class BattleGroundNAScore : public BattleGroundScore
     public:
         BattleGroundNAScore() {};
         virtual ~BattleGroundNAScore() {};
-        //TODO fix me
+        // TODO fix me
 };
 
 class BattleGroundNA : public BattleGround
 {
-    friend class BattleGroundMgr;
+        friend class BattleGroundMgr;
 
     public:
         BattleGroundNA();
@@ -38,16 +38,16 @@ class BattleGroundNA : public BattleGround
         void Update(uint32 diff);
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
+        virtual void AddPlayer(Player* plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
 
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
+        void RemovePlayer(Player* plr, ObjectGuid guid);
+        void HandleAreaTrigger(Player* source, uint32 trigger);
         bool SetupBattleGround();
         virtual void Reset();
-        virtual void FillInitialWorldStates(WorldPacket &d, uint32& count);
-        void HandleKillPlayer(Player* player, Player *killer);
-        bool HandlePlayerUnderMap(Player * plr);
+        virtual void FillInitialWorldStates();
+        void HandleKillPlayer(Player* player, Player* killer);
+        bool HandlePlayerUnderMap(Player* plr);
 };
 #endif
diff --git a/src/game/BattleGroundRB.cpp b/src/game/BattleGround/BattleGroundRB.cpp
similarity index 80%
rename from src/game/BattleGroundRB.cpp
rename to src/game/BattleGround/BattleGroundRB.cpp
index a14dfc9dc5b..734d1eee80a 100644
--- a/src/game/BattleGroundRB.cpp
+++ b/src/game/BattleGround/BattleGroundRB.cpp
@@ -23,7 +23,7 @@
 
 BattleGroundRB::BattleGroundRB()
 {
-    //TODO FIX ME!
+    // TODO FIX ME!
     m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
     m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_WS_START_ONE_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_WS_START_HALF_MINUTE;
@@ -48,10 +48,10 @@ void BattleGroundRB::StartingEventOpenDoors()
 {
 }
 
-void BattleGroundRB::AddPlayer(Player *plr)
+void BattleGroundRB::AddPlayer(Player* plr)
 {
     BattleGround::AddPlayer(plr);
-    //create score and add it to map, default values are set in constructor
+    // create score and add it to map, default values are set in constructor
     BattleGroundABGScore* sc = new BattleGroundABGScore;
 
     m_PlayerScores[plr->GetObjectGuid()] = sc;
@@ -62,20 +62,20 @@ void BattleGroundRB::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
 
 }
 
-void BattleGroundRB::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
+void BattleGroundRB::HandleAreaTrigger(Player* /*source*/, uint32 /*trigger*/)
 {
     // this is wrong way to implement these things. On official it done by gameobject spell cast.
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
 }
 
-void BattleGroundRB::UpdatePlayerScore(Player* Source, uint32 type, uint32 value)
+void BattleGroundRB::UpdatePlayerScore(Player* source, uint32 type, uint32 value)
 {
 
-    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetObjectGuid());
+    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(source->GetObjectGuid());
 
-    if(itr == m_PlayerScores.end())                         // player not found...
+    if (itr == m_PlayerScores.end())                        // player not found...
         return;
 
-    BattleGround::UpdatePlayerScore(Source,type,value);
+    BattleGround::UpdatePlayerScore(source, type, value);
 }
diff --git a/src/game/BattleGroundRB.h b/src/game/BattleGround/BattleGroundRB.h
similarity index 81%
rename from src/game/BattleGroundRB.h
rename to src/game/BattleGround/BattleGroundRB.h
index 024652eb841..24ecb17eed5 100644
--- a/src/game/BattleGroundRB.h
+++ b/src/game/BattleGround/BattleGroundRB.h
@@ -30,7 +30,7 @@ class BattleGroundABGScore : public BattleGroundScore
 
 class BattleGroundRB : public BattleGround
 {
-    friend class BattleGroundMgr;
+        friend class BattleGroundMgr;
 
     public:
         BattleGroundRB();
@@ -38,16 +38,16 @@ class BattleGroundRB : public BattleGround
         void Update(uint32 diff);
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
+        virtual void AddPlayer(Player* plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
 
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
-        //bool SetupBattleGround();
+        void RemovePlayer(Player* plr, ObjectGuid guid);
+        void HandleAreaTrigger(Player* source, uint32 trigger);
+        // bool SetupBattleGround();
 
         /* Scorekeeping */
-        void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
+        void UpdatePlayerScore(Player* source, uint32 type, uint32 value);
 
     private:
 };
diff --git a/src/game/BattleGroundRL.cpp b/src/game/BattleGround/BattleGroundRL.cpp
similarity index 78%
rename from src/game/BattleGroundRL.cpp
rename to src/game/BattleGround/BattleGroundRL.cpp
index 0db6bc4d322..6d55a4215b1 100644
--- a/src/game/BattleGroundRL.cpp
+++ b/src/game/BattleGround/BattleGroundRL.cpp
@@ -30,7 +30,7 @@ BattleGroundRL::BattleGroundRL()
     m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
     m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
     m_StartDelayTimes[BG_STARTING_EVENT_FOURTH] = BG_START_DELAY_NONE;
-    //we must set messageIds
+    // we must set messageIds
     m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_ARENA_ONE_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_ARENA_THIRTY_SECONDS;
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
@@ -60,10 +60,10 @@ void BattleGroundRL::StartingEventOpenDoors()
     OpenDoorEvent(BG_EVENT_DOOR);
 }
 
-void BattleGroundRL::AddPlayer(Player *plr)
+void BattleGroundRL::AddPlayer(Player* plr)
 {
     BattleGround::AddPlayer(plr);
-    //create score and add it to map, default values are set in constructor
+    // create score and add it to map, default values are set in constructor
     BattleGroundRLScore* sc = new BattleGroundRLScore;
 
     m_PlayerScores[plr->GetObjectGuid()] = sc;
@@ -83,7 +83,7 @@ void BattleGroundRL::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
     CheckArenaWinConditions();
 }
 
-void BattleGroundRL::HandleKillPlayer(Player *player, Player *killer)
+void BattleGroundRL::HandleKillPlayer(Player* player, Player* killer)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
@@ -94,7 +94,7 @@ void BattleGroundRL::HandleKillPlayer(Player *player, Player *killer)
         return;
     }
 
-    BattleGround::HandleKillPlayer(player,killer);
+    BattleGround::HandleKillPlayer(player, killer);
 
     UpdateWorldState(0xbb8, GetAlivePlayersCountByTeam(ALLIANCE));
     UpdateWorldState(0xbb9, GetAlivePlayersCountByTeam(HORDE));
@@ -102,45 +102,45 @@ void BattleGroundRL::HandleKillPlayer(Player *player, Player *killer)
     CheckArenaWinConditions();
 }
 
-bool BattleGroundRL::HandlePlayerUnderMap(Player *player)
+bool BattleGroundRL::HandlePlayerUnderMap(Player* player)
 {
-    player->TeleportTo(GetMapId(),1285.810547f,1667.896851f,39.957642f,player->GetOrientation(),false);
+    player->TeleportTo(GetMapId(), 1285.810547f, 1667.896851f, 39.957642f, player->GetOrientation());
     return true;
 }
 
-void BattleGroundRL::HandleAreaTrigger(Player *Source, uint32 Trigger)
+void BattleGroundRL::HandleAreaTrigger(Player* source, uint32 trigger)
 {
     // this is wrong way to implement these things. On official it done by gameobject spell cast.
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
 
-    //uint32 SpellId = 0;
-    //uint64 buff_guid = 0;
-    switch(Trigger)
+    // uint32 spellId = 0;
+    // uint64 buff_guid = 0;
+    switch (trigger)
     {
         case 4696:                                          // buff trigger?
         case 4697:                                          // buff trigger?
             break;
         default:
-            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", Trigger);
-            Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
+            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", trigger);
+            source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", trigger);
             break;
     }
 
-    //if (buff_guid)
-    //    HandleTriggerBuff(buff_guid,Source);
+    // if (buff_guid)
+    //    HandleTriggerBuff(buff_guid, source);
 }
 
-void BattleGroundRL::FillInitialWorldStates(WorldPacket &data, uint32& count)
+void BattleGroundRL::FillInitialWorldStates()
 {
-    FillInitialWorldState(data, count, 0xbb8, GetAlivePlayersCountByTeam(ALLIANCE));
-    FillInitialWorldState(data, count, 0xbb9, GetAlivePlayersCountByTeam(HORDE));
-    FillInitialWorldState(data, count, 0xbba, 1);
+    FillInitialWorldState(0xbb8, GetAlivePlayersCountByTeam(ALLIANCE));
+    FillInitialWorldState(0xbb9, GetAlivePlayersCountByTeam(HORDE));
+    FillInitialWorldState(0xbba, 1);
 }
 
 void BattleGroundRL::Reset()
 {
-    //call parent's reset
+    // call parent's reset
     BattleGround::Reset();
 }
 
diff --git a/src/game/BattleGroundRL.h b/src/game/BattleGround/BattleGroundRL.h
similarity index 76%
rename from src/game/BattleGroundRL.h
rename to src/game/BattleGround/BattleGroundRL.h
index 7ce4d42a2a5..6859cc75575 100644
--- a/src/game/BattleGroundRL.h
+++ b/src/game/BattleGround/BattleGroundRL.h
@@ -25,12 +25,12 @@ class BattleGroundRLScore : public BattleGroundScore
     public:
         BattleGroundRLScore() {};
         virtual ~BattleGroundRLScore() {};
-        //TODO fix me
+        // TODO fix me
 };
 
 class BattleGroundRL : public BattleGround
 {
-    friend class BattleGroundMgr;
+        friend class BattleGroundMgr;
 
     public:
         BattleGroundRL();
@@ -38,16 +38,16 @@ class BattleGroundRL : public BattleGround
         void Update(uint32 diff);
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
+        virtual void AddPlayer(Player* plr);
         virtual void Reset();
-        virtual void FillInitialWorldStates(WorldPacket &d, uint32& count);
+        virtual void FillInitialWorldStates();
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
 
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
+        void RemovePlayer(Player* plr, ObjectGuid guid);
+        void HandleAreaTrigger(Player* source, uint32 trigger);
         bool SetupBattleGround();
-        void HandleKillPlayer(Player* player, Player *killer);
-        bool HandlePlayerUnderMap(Player * plr);
+        void HandleKillPlayer(Player* player, Player* killer);
+        bool HandlePlayerUnderMap(Player* plr);
 };
 #endif
diff --git a/src/game/BattleGround/BattleGroundRV.cpp b/src/game/BattleGround/BattleGroundRV.cpp
new file mode 100644
index 00000000000..d6f78272bae
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundRV.cpp
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Player.h"
+#include "BattleGround.h"
+#include "BattleGroundRV.h"
+#include "ObjectMgr.h"
+#include "WorldPacket.h"
+#include "GameObject.h"
+#include "Language.h"
+
+BattleGroundRV::BattleGroundRV()
+{
+
+    m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
+    m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
+    m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
+    m_StartDelayTimes[BG_STARTING_EVENT_FOURTH] = BG_START_DELAY_NONE;
+    // we must set messageIds
+    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_ARENA_ONE_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_ARENA_THIRTY_SECONDS;
+    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
+    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
+}
+
+BattleGroundRV::~BattleGroundRV()
+{
+
+}
+
+void BattleGroundRV::Update(uint32 diff)
+{
+    BattleGround::Update(diff);
+    if (GetStatus() == STATUS_IN_PROGRESS)
+    {
+        // teleport buggers
+        if (m_uiTeleport < diff)
+        {
+            for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+            {
+                Player * plr = sObjectMgr.GetPlayer(itr->first);
+                if (plr && plr->GetPositionZ() < 27)
+                    plr->TeleportTo(618, plr->GetPositionX(), plr->GetPositionY(), 29, plr->GetOrientation(), false);
+                if (plr && plr->GetPositionZ() < 27)
+                    plr->TeleportTo(618, plr->GetPositionX(), plr->GetPositionY(), 29, plr->GetOrientation());
+            }
+            m_uiTeleport = 1000;
+        }
+        else
+            m_uiTeleport -= diff;
+
+        if (m_uiPillarSwitch < diff)
+        {
+            for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+            {
+                Player * plr = sObjectMgr.GetPlayer(itr->first);
+                if (!plr)
+                    continue;
+
+                const int m_uiObjects[8] = {192393, 192394, 194583, 194584, 194585, 194587, 192389, 192390};
+
+                for (int i = 0; i < 8; ++i)
+                {
+                    if (GameObject * pPillar = plr->GetClosestGameObjectWithEntry(plr, m_uiObjects[i], 100))
+                    {
+                        pPillar->SetLootState(GO_READY);
+                        pPillar->UseDoorOrButton(RESPAWN_ONE_DAY);
+                    }
+                }
+                break; // End on 1 succesful iteration
+            }
+            // + urand(0, 30000);
+            m_uiPillarSwitch = 120000;
+        }
+        else
+            m_uiPillarSwitch -= diff;
+
+        if (m_uiFireTimer < diff)
+        {
+            // Handle Fire-lines
+            m_uiFireTimer = 90000 + urand(0, 30000);
+        }
+        else
+            m_uiFireTimer -= diff;
+    }
+}
+
+void BattleGroundRV::StartingEventCloseDoors()
+{
+}
+
+void BattleGroundRV::StartingEventOpenDoors()
+{
+    OpenDoorEvent(BG_EVENT_DOOR);
+}
+
+void BattleGroundRV::AddPlayer(Player* plr)
+{
+    BattleGround::AddPlayer(plr);
+    // create score and add it to map, default values are set in constructor
+    BattleGroundRVScore* sc = new BattleGroundRVScore;
+
+    m_PlayerScores[plr->GetObjectGuid()] = sc;
+
+    UpdateWorldState(0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0xe10, GetAlivePlayersCountByTeam(HORDE));
+}
+
+void BattleGroundRV::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
+{
+    if (GetStatus() == STATUS_WAIT_LEAVE)
+        return;
+
+    UpdateWorldState(0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0xe10, GetAlivePlayersCountByTeam(HORDE));
+
+    CheckArenaWinConditions();
+}
+
+void BattleGroundRV::HandleKillPlayer(Player* player, Player* killer)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    if (!killer)
+    {
+        sLog.outError("BattleGroundRV: Killer player not found");
+        return;
+    }
+
+    BattleGround::HandleKillPlayer(player, killer);
+
+    UpdateWorldState(0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0xe10, GetAlivePlayersCountByTeam(HORDE));
+
+    CheckArenaWinConditions();
+}
+
+bool BattleGroundRV::HandlePlayerUnderMap(Player* player)
+{
+    player->TeleportTo(GetMapId(), 763.5f, -284, 28.276f, player->GetOrientation());
+    return true;
+}
+
+void BattleGroundRV::HandleAreaTrigger(Player* source, uint32 trigger)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    switch(trigger)
+    {
+        case 5224:
+        case 5226:
+        case 5473:
+        case 5474:
+            break;
+        default:
+            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", trigger);
+            source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", trigger);
+            break;
+    }
+}
+
+void BattleGroundRV::FillInitialWorldStates()
+{
+    FillInitialWorldState(0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    FillInitialWorldState(0xe10, GetAlivePlayersCountByTeam(HORDE));
+    FillInitialWorldState(0xe1a, 1);
+}
+
+void BattleGroundRV::Reset()
+{
+    //call parent's class reset
+    BattleGround::Reset();
+    m_uiTeleport = 22000;
+    m_uiFireTimer = 90000;
+    m_uiPillarSwitch = 45000 + urand(0, 30000);
+}
+
+bool BattleGroundRV::SetupBattleGround()
+{
+    return true;
+}
diff --git a/src/game/BattleGround/BattleGroundRV.h b/src/game/BattleGround/BattleGroundRV.h
new file mode 100644
index 00000000000..50f1674b149
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundRV.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __BATTLEGROUNDRV_H
+#define __BATTLEGROUNDRV_H
+
+class BattleGround;
+
+class BattleGroundRVScore : public BattleGroundScore
+{
+    public:
+        BattleGroundRVScore() {};
+        virtual ~BattleGroundRVScore() {};
+        // TODO fix me
+};
+
+class BattleGroundRV : public BattleGround
+{
+        friend class BattleGroundMgr;
+
+    public:
+        BattleGroundRV();
+        ~BattleGroundRV();
+        void Update(uint32 diff);
+
+        /* inherited from BattlegroundClass */
+        virtual void AddPlayer(Player* plr);
+        virtual void StartingEventCloseDoors();
+        virtual void StartingEventOpenDoors();
+
+        void RemovePlayer(Player* plr, ObjectGuid guid);
+        void HandleAreaTrigger(Player* source, uint32 trigger);
+        bool SetupBattleGround();
+        virtual void Reset();
+        virtual void FillInitialWorldStates();
+        void HandleKillPlayer(Player* player, Player* killer);
+        bool HandlePlayerUnderMap(Player* plr);
+    private:
+        uint32 m_uiTeleport;
+        uint32 m_uiPillarSwitch;
+        uint32 m_uiFireTimer;
+};
+#endif
diff --git a/src/game/BattleGround/BattleGroundSA.cpp b/src/game/BattleGround/BattleGroundSA.cpp
new file mode 100644
index 00000000000..66f178903e4
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundSA.cpp
@@ -0,0 +1,1169 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "GameObject.h"
+#include "BattleGround.h"
+#include "BattleGroundSA.h"
+#include "WorldPacket.h"
+#include "Language.h"
+#include "Player.h"
+#include "Object.h"
+#include "Creature.h"
+#include "BattleGroundMgr.h"
+#include "Util.h"
+#include "MapManager.h"
+#include "ObjectMgr.h"
+
+/*
+* BattleGround Strand of the Ancients:
+* TODO:
+*   - Move all the harcoded variables such coords to header BattleGroundSA.h
+*   - Cosmetics & avoid hacks.
+*/
+
+static uint32 const BG_SA_GateStatus[6] = {3849, 3623, 3620, 3614, 3617, 3638};
+static uint32 const BG_SA_WorldStatusA[4] = {4352, 3631, 3627, 3626};         // alliance attacking
+static uint32 const BG_SA_WorldStatusH[4] = {4353, 3630, 3628, 3629};         // horde attacking
+
+// WorldSafeLocs ids for 5 gyd, and for ally, and horde starting location
+static uint32 const BG_SA_GraveyardIdsPhase[3] = {1347, 1346, 1348};
+static uint32 const BG_SA_GraveyardIds[2] = {1349, 1350};
+
+static int32 const GrraveYardWS[3][2]=
+{
+    {3636, 3632},
+    {3635, 3633},
+    {3637, 3634},
+};
+
+static float const BG_SA_START_LOCATIONS[7][4] = {
+    {1804.10f, -168.46f, 60.55f, 2.65f},                    // Pillar 1 - don't used now
+    {1803.71f, 118.61f, 59.83f, 3.56f},                     // Pillar 2 - don't used now
+    {1597.64f, -106.35f, 8.89f, 4.13f},                     // Dock 1
+    {1606.61f, 50.13f, 7.58f, 2.39f},                       // Dock 2
+    {1209.70f, -65.16f, 70.10f, 0.00f},                     // Defenders start loc
+    //Ships
+    {2679.696777f, -826.891235f, 3.712860f, 5.78367f},     //rot2 1 rot3 0.0002f
+    {2574.003662f, 981.261475f, 2.603424f, 0.807696f}
+};
+
+BattleGroundSA::BattleGroundSA()
+{
+    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_BG_SA_START_TWO_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_SA_START_ONE_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_SA_START_HALF_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_SA_HAS_BEGUN;
+
+    m_BgObjects.resize(BG_SA_MAXOBJ);
+    shipsStarted = false;
+    shipsSpawned = false;
+    isDemolisherDestroyed[0] = false; // ALLIANCE
+    isDemolisherDestroyed[1] = false; // HORDE
+    shipsTimer = BG_SA_BOAT_START;
+
+    for (int32 i = 0; i < BG_SA_GATE_MAX; ++i)
+        GateStatus[i] = BG_SA_GO_GATES_NORMAL;
+
+    TimerEnabled = false;
+    TimeST2Round = 120000;
+    Round_timer = 0;
+    Phase = SA_ROUND_ONE;
+
+    GateRoomAncientShrineDamaged = false;
+    GateGreenEmeraldDamaged = false;
+    GateBlueSaphireDamaged = false;
+    GateMauveAmethystDamaged = false;
+    GateRedSunDamaged = false;
+    GateYellowMoonDamaged = false;
+}
+
+BattleGroundSA::~BattleGroundSA()
+{
+}
+
+void BattleGroundSA::FillInitialWorldStates()
+{
+    for (uint8 i = 0; i < BG_SA_GRY_MAX; ++i)
+    {
+        if (m_Gyd[i] == BG_SA_GRAVE_STATUS_HORDE_OCCUPIED || m_Gyd[i] == BG_SA_GRAVE_STATUS_HORDE_CONTESTED)
+            _GydOccupied(i, HORDE);
+        else if (m_Gyd[i] == BG_SA_GRAVE_STATUS_ALLY_OCCUPIED || m_Gyd[i] == BG_SA_GRAVE_STATUS_ALLY_CONTESTED)
+            _GydOccupied(i, ALLIANCE);
+    }
+
+    for (uint8 i = 0; i < BG_SA_MAX_WS; ++i)
+    {
+        FillInitialWorldState(BG_SA_WorldStatusA[i], (GetDefender() == HORDE) ? 1 : 0);
+        FillInitialWorldState(BG_SA_WorldStatusH[i], (GetDefender() == HORDE) ? 0 : 1);
+    }
+
+    for (uint32 z = 0; z < BG_SA_GATE_MAX; ++z)
+    {
+        FillInitialWorldState(BG_SA_GateStatus[z], GateStatus[z]);
+        if ((z == 0) && (GetDefender() == HORDE))                                               // Ancient gate changes color depending on the defender
+            FillInitialWorldState(BG_SA_GateStatus[z], (GateStatus[z] + 3));
+    }
+
+    //Time will be sent on first update...
+    FillInitialWorldState(BG_SA_ENABLE_TIMER, TimerEnabled ? uint32(1) : uint32(0));
+    FillInitialWorldState(BG_SA_TIMER_MINUTES, uint32(0));
+    FillInitialWorldState(BG_SA_TIMER_10SEC, uint32(0));
+    FillInitialWorldState(BG_SA_TIMER_SEC, uint32(0));
+}
+
+void BattleGroundSA::StartShips()
+{
+    if (shipsStarted)
+        return;
+
+    DoorOpen(m_BgObjects[BG_SA_BOAT_ONE]);
+    DoorOpen(m_BgObjects[BG_SA_BOAT_TWO]);
+
+    for (int i = BG_SA_BOAT_ONE; i <= BG_SA_BOAT_TWO; i++)
+    {
+        for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+        {
+            Player* p = sObjectMgr.GetPlayer(itr->first);
+            if (p)
+            {
+                UpdateData data;
+                WorldPacket pkt;
+                GetBGObject(i)->BuildValuesUpdateBlockForPlayer(&data, p);
+                data.BuildPacket(&pkt);
+                p->GetSession()->SendPacket(&pkt);
+            }
+        }
+    }
+    shipsStarted = true;
+}
+
+void BattleGroundSA::ToggleTimer()
+{
+    TimerEnabled = !TimerEnabled;
+    UpdateWorldState(BG_SA_ENABLE_TIMER, (TimerEnabled) ? 1 : 0);
+}
+
+void BattleGroundSA::EndBattleGround(Team winner)
+{
+    //win reward
+    if(winner)
+    {
+        RewardHonorToTeam(GetBonusHonorFromKill(1), winner);
+        RewardXpToTeam(0, 0.8f, winner);
+    }
+
+    //complete map_end rewards (even if no team wins)
+    RewardHonorToTeam(GetBonusHonorFromKill(2), ALLIANCE);
+    RewardHonorToTeam(GetBonusHonorFromKill(2), HORDE);
+    RewardXpToTeam(0, 0.8f, ALLIANCE);
+    RewardXpToTeam(0, 0.8f, HORDE);
+
+    BattleGround::EndBattleGround(winner);
+}
+
+void BattleGroundSA::Update(uint32 diff)
+{
+    BattleGround::Update(diff);
+
+    if (GetStatus() == STATUS_WAIT_JOIN && !shipsStarted)
+        if (Phase == SA_ROUND_ONE) // Round one not started yet
+        {
+            if (shipsTimer <= diff)
+                StartShips();
+            else
+                shipsTimer -= diff;
+        }
+
+    if (GetStatus() == STATUS_IN_PROGRESS) // Battleground already in progress
+    {
+        if (Round_timer >= BG_SA_ROUNDLENGTH)
+        {
+            if (Phase == SA_ROUND_ONE) // Timeout of first round
+            {
+                PlaySoundToAll(BG_SA_SOUND_GYD_VICTORY);
+                SendMessageToAll(defender == ALLIANCE ? LANG_BG_SA_ALLIANCE_TIMEOUT_END_1ROUND : LANG_BG_SA_HORDE_TIMEOUT_END_1ROUND, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL);
+                SendWarningToAll(LANG_BG_SA_END_1ROUND);
+                RoundScores[0].winner = GetDefender();
+                RoundScores[0].time = BG_SA_ROUNDLENGTH;
+
+                for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+                {
+                    Player* plr = sObjectMgr.GetPlayer(itr->first);
+                    if (plr)
+                        plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, BG_SA_END_OF_ROUND);
+                }
+
+                ResetBattle(0, defender);
+            }
+            else // Timeout of second round
+            {
+                SendMessageToAll(defender == ALLIANCE ? LANG_BG_SA_ALLIANCE_TIMEOUT_END_2ROUND : LANG_BG_SA_HORDE_TIMEOUT_END_2ROUND, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL);
+                RoundScores[1].winner = GetDefender();
+
+                for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+                {
+                    Player* plr = sObjectMgr.GetPlayer(itr->first);
+                    if (plr)
+                        plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, BG_SA_END_OF_ROUND);
+                }
+
+                if (RoundScores[0].winner == GetDefender())
+                    EndBattleGround(GetDefender());
+                else
+                    EndBattleGround(TEAM_NONE);
+                return;
+            }
+        }
+        else
+            Round_timer += diff;
+
+        for (int gyd = 0; gyd < BG_SA_GRY_MAX; ++gyd)
+        {
+            // 3 sec delay to spawn new banner instead previous despawned one
+            if (m_BannerTimers[gyd].timer)
+            {
+                if (m_BannerTimers[gyd].timer > diff)
+                    m_BannerTimers[gyd].timer -= diff;
+                else
+                {
+                    m_BannerTimers[gyd].timer = 0;
+                    _CreateBanner(gyd, m_BannerTimers[gyd].type, m_BannerTimers[gyd].teamIndex, false);
+                }
+            }
+        }
+        UpdateTimer();
+    }
+
+    if (GetStatus() == STATUS_WAIT_JOIN && Phase == SA_ROUND_TWO) // Round two, not yet started
+    {
+        if (!shipsStarted)
+        {
+            if (shipsTimer <= diff)
+            {
+                SendMessageToAll(LANG_BG_SA_START_ONE_MINUTE, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL);
+                StartShips();
+            }
+            else
+                shipsTimer -= diff;
+        }
+
+        if (TimeST2Round < diff)
+        {
+            Phase = SA_ROUND_TWO;
+            SpawnEvent(SA_EVENT_ADD_NPC, 0, true);
+            SpawnEvent(SA_EVENT_ADD_BOMB_B, (GetDefender() == ALLIANCE ? BG_SA_GRAVE_STATUS_HORDE_OCCUPIED : BG_SA_GRAVE_STATUS_ALLY_OCCUPIED), true);
+            ToggleTimer();
+            SetStatus(STATUS_IN_PROGRESS); // Start round two
+            PlaySoundToAll(SOUND_BG_START);
+            SendWarningToAll(LANG_BG_SA_HAS_BEGUN);
+            StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, BG_SA_EVENT_START_BATTLE_2);
+
+            for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+            {
+                Player* plr = sObjectMgr.GetPlayer(itr->first);
+                if (plr)
+                    plr->RemoveAurasDueToSpell(SPELL_PREPARATION);
+            }
+        }
+        else
+            TimeST2Round -= diff;
+    }
+}
+
+void BattleGroundSA::ResetWorldStates()
+{
+    for (uint8 i = 0; i < BG_SA_GRY_MAX; ++i)
+    {
+        if (m_Gyd[i] == BG_SA_GRAVE_STATUS_HORDE_OCCUPIED || m_Gyd[i] == BG_SA_GRAVE_STATUS_HORDE_CONTESTED)
+            _GydOccupied(i, HORDE);
+        else if (m_Gyd[i] == BG_SA_GRAVE_STATUS_ALLY_OCCUPIED || m_Gyd[i] == BG_SA_GRAVE_STATUS_ALLY_CONTESTED)
+            _GydOccupied(i, ALLIANCE);
+    }
+
+    // beach graveyard
+    _GydOccupied(SA_EVENT_ADD_GRAVE_B, (GetDefender() == HORDE) ? ALLIANCE : HORDE);
+
+    // Reset world-state of gates
+    for (uint32 z = 0; z < BG_SA_GATE_MAX; ++z)
+    {
+        UpdateWorldState(BG_SA_GateStatus[z], GateStatus[z]);
+        if ((z == 0) && (GetDefender() == HORDE))
+            UpdateWorldState(BG_SA_GateStatus[z], (GateStatus[z] + 3));
+    }
+
+    for (uint8 i = 0; i < BG_SA_MAX_WS; ++i)
+    {
+        UpdateWorldState(BG_SA_WorldStatusA[i], (GetDefender() == HORDE) ? 1 : 0);
+        UpdateWorldState(BG_SA_WorldStatusH[i], (GetDefender() == HORDE) ? 0 : 1);
+    }
+}
+
+void BattleGroundSA::UpdateTimer()
+{
+    uint32 end_of_round = (BG_SA_ROUNDLENGTH - Round_timer);
+    UpdateWorldState(BG_SA_TIMER_MINUTES, end_of_round/60000);
+    UpdateWorldState(BG_SA_TIMER_10SEC, (end_of_round%60000)/10000);
+    UpdateWorldState(BG_SA_TIMER_SEC, ((end_of_round%60000)%10000)/1000);
+}
+
+void BattleGroundSA::StartingEventCloseDoors()
+{
+    // runs just in 1st phase
+}
+
+void BattleGroundSA::StartingEventOpenDoors()
+{
+    // runs just in 1st round
+    SpawnEvent(SA_EVENT_ADD_NPC, 0, true);
+    SpawnEvent(SA_EVENT_ADD_BOMB_B, (GetDefender() == ALLIANCE ? BG_SA_GRAVE_STATUS_HORDE_OCCUPIED : BG_SA_GRAVE_STATUS_ALLY_OCCUPIED), true);
+    ToggleTimer();
+    HandleInteractivity();
+    StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, BG_SA_EVENT_START_BATTLE_1);
+}
+
+void BattleGroundSA::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
+{
+}
+
+void BattleGroundSA::AddPlayer(Player* plr)
+{
+    BattleGround::AddPlayer(plr);
+
+    TeleportPlayerToCorrectLoc(plr);
+
+    BattleGroundSAScore* sc = new BattleGroundSAScore;
+
+    m_PlayerScores[plr->GetObjectGuid()] = sc;
+}
+
+void BattleGroundSA::HandleAreaTrigger(Player* /*source*/, uint32 /*trigger*/)
+{
+    // this is wrong way to implement these things. On official it done by gameobject spell cast.
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+}
+
+void BattleGroundSA::UpdatePlayerScore(Player* source, uint32 type, uint32 value)
+{
+
+    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(source->GetObjectGuid());
+    if (itr == m_PlayerScores.end())                        // player not found...
+        return;
+
+    switch (type)
+    {
+        case SCORE_DEMOLISHERS_DESTROYED:
+            ((BattleGroundSAScore*)itr->second)->DemolishersDestroyed += value;
+            break;
+        case SCORE_GATES_DESTROYED:
+            ((BattleGroundSAScore*)itr->second)->GatesDestroyed += value;
+            break;
+        default:
+            BattleGround::UpdatePlayerScore(source, type, value);
+            break;
+    }
+}
+
+void BattleGroundSA::ResetBattle(uint32 winner, Team teamDefending)
+{
+    Phase = SA_ROUND_TWO;
+    shipsTimer = BG_SA_BOAT_START;
+    shipsStarted = false;
+
+    for (int32 i = 0; i < BG_SA_GATE_MAX; ++i)
+        GateStatus[i] = BG_SA_GO_GATES_NORMAL;
+
+    SetStartTime(0);
+    defender = (teamDefending  == ALLIANCE) ?  HORDE : ALLIANCE;
+    relicGateDestroyed = false;
+    ToggleTimer();
+
+    SetupShips();
+
+    for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+    {
+        Player *plr = sObjectMgr.GetPlayer(itr->first);
+
+        if (!plr)
+            continue;
+
+        TeleportPlayerToCorrectLoc(plr, true);
+
+        if (plr->GetBGTeam() == defender && plr->GetItemByEntry(39213) != NULL)
+            plr->DestroyItemCount(39213, 1, true);
+    }
+
+    UpdatePhase();
+    ResetWorldStates();
+}
+
+void BattleGroundSA::Reset()
+{
+    //call parent's class reset
+    BattleGround::Reset();
+
+    defender = ((urand(0,1)) ? ALLIANCE : HORDE);
+    relicGateDestroyed = false;
+
+    for (uint8 i = 0; i <= SA_EVENT_ADD_YELLOW_SIGIL; ++i)
+        m_ActiveEvents[i] = BG_EVENT_NONE;
+
+    UpdatePhase();
+}
+
+void BattleGroundSA::UpdatePhase()
+{
+    if (Phase == SA_ROUND_TWO)
+    {
+        // despawn everything
+        for (uint8 i = 0; i <= SA_EVENT_ADD_YELLOW_SIGIL; ++i)
+            for (uint8 j = 0; j < 5; ++j)
+                SpawnEvent(i, j, false);
+
+        Round_timer = (BG_SA_ROUNDLENGTH - RoundScores[0].time);
+        SetStatus(STATUS_WAIT_JOIN);
+        SendMessageToAll(LANG_BG_SA_START_TWO_MINUTE, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL);
+
+        // adding Preparation buff for the 2nd round, has to be added in status STATUS_WAIT_JOIN
+        for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+        {
+            Player* plr = sObjectMgr.GetPlayer(itr->first);
+            if (plr)
+                plr->CastSpell(plr, SPELL_PREPARATION, true);
+        }
+        HandleInteractivity();
+    }
+
+    // Spawn banners and graveyards
+    for (uint8 i = 0; i < BG_SA_GRY_MAX; ++i)
+    {
+        m_BannerTimers[i].timer = 0;
+        SpawnEvent(i, (GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_ALLY_CONTESTED : BG_SA_GRAVE_STATUS_HORDE_CONTESTED, true);
+        m_Gyd[i] = ((GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_ALLY_CONTESTED : BG_SA_GRAVE_STATUS_HORDE_CONTESTED);
+    }
+
+    // spirit healers at the relic
+    SpawnEvent(SA_EVENT_ADD_GRAVE_A, (GetDefender() == ALLIANCE ? BG_SA_GRAVE_STATUS_ALLY_OCCUPIED : BG_SA_GRAVE_STATUS_HORDE_OCCUPIED), true);
+    /*TODO: fix next line, because now the array is out of bounds */
+    m_Gyd[SA_EVENT_ADD_GRAVE_A] = ((GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_ALLY_CONTESTED : BG_SA_GRAVE_STATUS_HORDE_CONTESTED);
+
+    // (Re)spawn graveyard at the beach.
+    SpawnEvent(SA_EVENT_ADD_GRAVE_B, (GetDefender() == ALLIANCE ? BG_SA_GRAVE_STATUS_HORDE_OCCUPIED : BG_SA_GRAVE_STATUS_ALLY_OCCUPIED), true);
+
+    SpawnEvent(SA_EVENT_ADD_GO, 0, true);
+    SpawnEvent(SA_EVENT_ADD_CANNON, 0, true);
+    SpawnEvent(SA_EVENT_ADD_RELIC, (GetDefender() == ALLIANCE) ? 2 : 1, true);
+    MakeInteractive(SA_EVENT_ADD_RELIC, (GetDefender() == ALLIANCE) ? 2 : 1, false);
+
+    // spawn gate sigils
+    for (uint8 i = SA_EVENT_ADD_GREEN_SIGIL; i <= SA_EVENT_ADD_YELLOW_SIGIL; ++i)
+        SpawnEvent(i, 0, true);
+}
+
+void BattleGroundSA::HandleInteractivity()
+{
+    for (int i = 0; i < BG_SA_GRY_MAX; i++)
+        MakeInteractive(i, (GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_ALLY_CONTESTED : BG_SA_GRAVE_STATUS_HORDE_CONTESTED, false);
+}
+
+bool BattleGroundSA::SetupBattleGround()
+{
+    return SetupShips();
+}
+
+bool BattleGroundSA::SetupShips()
+{
+    if (Phase == SA_ROUND_TWO)
+    {
+        for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+        {
+            Player* plr = sObjectMgr.GetPlayer(itr->first);
+            if (plr)
+                SendTransportsRemove(plr);
+        }
+    }
+
+    for (uint8 i = BG_SA_BOAT_ONE; i <= BG_SA_BOAT_TWO; ++i)
+    {
+        // Remove old ships
+        if (Phase == SA_ROUND_TWO)
+            DelObject(i);
+
+        uint32 boatid=0;
+        switch (i)
+        {
+            case BG_SA_BOAT_ONE:
+                boatid = GetDefender() == ALLIANCE ? BG_SA_BOAT_ONE_H : BG_SA_BOAT_ONE_A;
+                if (!(AddObject(i, boatid, BG_SA_START_LOCATIONS[i + 5][0], BG_SA_START_LOCATIONS[i + 5][1], BG_SA_START_LOCATIONS[i + 5][2]+ (GetDefender() == ALLIANCE ? -3.750f: 0) , BG_SA_START_LOCATIONS[i + 5][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_ONE_DAY)))
+                {
+                    sLog.outError("SA_ERROR: Can't spawn ships!");
+                    return false;
+                }
+
+                if (GameObject* boat = GetBGObject(i))
+                    boat->SetTransportPathRotation(QuaternionData(0.0f, 0.0f, 1.0f, 0.0002f));
+                break;
+            case BG_SA_BOAT_TWO:
+                boatid = GetDefender() == ALLIANCE ? BG_SA_BOAT_TWO_H : BG_SA_BOAT_TWO_A;
+                if (!(AddObject(i, boatid, BG_SA_START_LOCATIONS[i + 5][0], BG_SA_START_LOCATIONS[i + 5][1], BG_SA_START_LOCATIONS[i + 5][2]+ (GetDefender() == ALLIANCE ? -3.750f: 0) , BG_SA_START_LOCATIONS[i + 5][3], 0.0f, 0.0f, 0.0f, 0.0f, RESPAWN_ONE_DAY)))
+                {
+                    sLog.outError("SA_ERROR: Can't spawn ships!");
+                    return false;
+                }
+
+                if (GameObject* boat = GetBGObject(i))
+                    boat->SetTransportPathRotation(QuaternionData(0, 0, 1.0f, 0.00001f));
+                break;
+        }
+    }
+
+    SpawnBGObject(m_BgObjects[BG_SA_BOAT_ONE], RESPAWN_IMMEDIATELY);
+    SpawnBGObject(m_BgObjects[BG_SA_BOAT_TWO], RESPAWN_IMMEDIATELY);
+    shipsSpawned = true;
+
+    for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+    {
+        Player* plr = sObjectMgr.GetPlayer(itr->first);
+        if (plr)
+            SendTransportInit(plr);
+    }
+    return true;
+}
+
+/*  type: 0-neutral, 1-contested, 3-occupied
+    team: 0-ally, 1-horde                        */
+void BattleGroundSA::_CreateBanner(uint8 gry, uint8 type, uint8 teamIndex, bool delay)
+{
+    // Just put it into the queue
+    if (delay)
+    {
+        m_BannerTimers[gry].timer = 2000;
+        m_BannerTimers[gry].type = type;
+        m_BannerTimers[gry].teamIndex = teamIndex;
+        return;
+    }
+
+    SpawnEvent(gry, type, true);                           // will automaticly despawn other events
+}
+
+void BattleGroundSA::EventPlayerClickedOnFlag(Player *source, GameObject* target_obj)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    uint8 objectEvent = (sBattleGroundMgr.GetGameObjectEventIndex(target_obj->GetGUIDLow())).event1;
+    if (objectEvent >= BG_SA_GRY_MAX)                           // not a node
+        return;
+
+    BG_SA_Events gyd = BG_SA_Events(objectEvent);
+
+    TeamIndex teamIndex = GetTeamIndex(source->GetTeam());
+
+    //make the new banner not capturable by defenders
+    m_Gyd[gyd] = BG_SA_GRAVE_STATUS_OCCUPIED + teamIndex;
+    // create new occupied banner
+    _CreateBanner(gyd, (GetDefender() == ALLIANCE ? BG_SA_GRAVE_STATUS_HORDE_OCCUPIED : BG_SA_GRAVE_STATUS_ALLY_OCCUPIED), teamIndex, true);
+    // make the new occupied banner not clickable by anyone
+    MakeInteractive(gyd, (GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_HORDE_OCCUPIED : BG_SA_GRAVE_STATUS_ALLY_OCCUPIED, false);
+    _GydOccupied(gyd, (teamIndex == 0) ? ALLIANCE : HORDE);
+
+    RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE : HORDE);
+    RewardXpToTeam(0, 0.6f, (teamIndex == 0) ? ALLIANCE : HORDE);
+
+    if (teamIndex == TEAM_INDEX_ALLIANCE)
+    {
+        SendWarningToAllSA(gyd, ALLIANCE);
+        PlaySoundToAll(BG_SA_SOUND_GYD_CAPTURED_ALLIANCE);
+    }
+    else
+    {
+        SendWarningToAllSA(gyd, HORDE);
+        PlaySoundToAll(BG_SA_SOUND_GYD_CAPTURED_HORDE);
+    }
+    switch(gyd)
+    {
+        // east base
+        case SA_EVENT_ADD_GRAVE_E:
+            SpawnEvent(SA_EVENT_ADD_VECH_E, 0, true);
+            SpawnEvent(SA_EVENT_ADD_BOMB_E, (GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_HORDE_OCCUPIED : BG_SA_GRAVE_STATUS_ALLY_OCCUPIED, true);
+            break;
+        // west base
+        case SA_EVENT_ADD_GRAVE_W:
+            SpawnEvent(SA_EVENT_ADD_VECH_W, 0, true);
+            SpawnEvent(SA_EVENT_ADD_BOMB_W, (GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_HORDE_OCCUPIED : BG_SA_GRAVE_STATUS_ALLY_OCCUPIED, true);
+            break;
+        // central base
+        case SA_EVENT_ADD_GRAVE_C:
+            SpawnEvent(SA_EVENT_ADD_BOMB_C, (GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_HORDE_OCCUPIED : BG_SA_GRAVE_STATUS_ALLY_OCCUPIED, true);
+            break;
+        default:
+            break;
+    }
+}
+
+void BattleGroundSA::SendMessageSA(Player *player, uint32 type, uint32 name)
+{
+    uint32 entryMSG = 0;
+    TeamIndex teamIndex = GetTeamIndex(player->GetTeam());
+    switch (type)
+    {
+        case 0: entryMSG = LANG_BG_SA_GATE_ATTACK; break;
+        case 1: entryMSG = LANG_BG_SA_GATE_DAMAGE; break;
+        case 2: entryMSG = LANG_BG_SA_GATE_DETROYED; break;
+    }
+    if (teamIndex == TEAM_INDEX_ALLIANCE)
+        SendMessage2ToAll(entryMSG,CHAT_MSG_BG_SYSTEM_ALLIANCE, player, name);
+    else
+        SendMessage2ToAll(entryMSG,CHAT_MSG_BG_SYSTEM_HORDE, player, name);
+}
+
+void BattleGroundSA::EventPlayerDamageGO(Player *player, GameObject* target_obj, uint32 eventId, uint32 doneBy)
+{
+    TeamIndex teamIndex = GetTeamIndex(player->GetTeam());
+
+    // Seaforium Charge Explosion
+    if (doneBy == 52408)
+        player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, BG_SA_PLANT_SEAFORIUM_CHARGE);
+
+    BG_SA_GoType type = BG_SA_GO_GATES_T_NONE;
+    switch (target_obj->GetEntry())
+    {
+        case BG_SA_GO_GATES_ROOM_ANCIENT_SHRINE:
+        {
+            type = BG_SA_GO_GATES_T_ROOM_ANCIENT_SHRINE;
+            switch (eventId)
+            {
+                case 21630:
+                    if (!GateRoomAncientShrineDamaged)
+                    {
+                        SendMessageSA(player, BG_SA_ATTACK, _GatesName(target_obj));
+                        GateRoomAncientShrineDamaged = true;
+                    }
+                    break;
+                case 19836:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type);
+                    UpdateWorldState(BG_SA_GateStatus[type], (GetDefender() == HORDE) ? 5 : 2);
+                    GateStatus[type] = BG_SA_GO_GATES_DAMAGE;
+                    break;
+                case 19837:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type, true);
+                    UpdateWorldState(BG_SA_GateStatus[type], (GetDefender() == HORDE) ? 6 : 3);
+                    GateStatus[type] = BG_SA_GO_GATES_DESTROY;
+                    UpdatePlayerScore(player, SCORE_GATES_DESTROYED, 1);
+                    RewardHonorToTeam(100, (teamIndex == 0) ? ALLIANCE : HORDE);
+                    MakeInteractive(SA_EVENT_ADD_RELIC, (GetDefender() == ALLIANCE) ? 2 : 1, true);
+                    relicGateDestroyed = true;
+                    break;
+            }
+            break;
+        }
+        case BG_SA_GO_GATES_GREEN_EMERALD:
+        {
+            type = BG_SA_GO_GATES_T_GREEN_EMERALD;
+            switch (eventId)
+            {
+                case 21630:
+                    if (!GateGreenEmeraldDamaged)
+                    {
+                        SendMessageSA(player, BG_SA_ATTACK, _GatesName(target_obj));
+                        GateGreenEmeraldDamaged = true;
+                    }
+                    break;
+                case 19041:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type);
+                    UpdateWorldState(BG_SA_GateStatus[type], GateStatus[type] = BG_SA_GO_GATES_DAMAGE);
+                    break;
+                case 19046:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type, true);
+                    UpdateWorldState(BG_SA_GateStatus[type], GateStatus[type] = BG_SA_GO_GATES_DESTROY);
+                    UpdatePlayerScore(player, SCORE_GATES_DESTROYED, 1);
+                    RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE : HORDE);
+                    // make western/eastern graveyard capturable
+                    for (int i = SA_EVENT_ADD_GRAVE_E; i <= SA_EVENT_ADD_GRAVE_W; i++)
+                        MakeInteractive(i, (GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_ALLY_CONTESTED : BG_SA_GRAVE_STATUS_HORDE_CONTESTED, true);
+                    SpawnEvent(SA_EVENT_ADD_GREEN_SIGIL, 0, false);
+                    break;
+            }
+            break;
+        }
+        case BG_SA_GO_GATES_BLUE_SAPHIRE:
+        {
+            type = BG_SA_GO_GATES_T_BLUE_SAPHIRE;
+            switch (eventId)
+            {
+                case 21630:
+                    if (!GateBlueSaphireDamaged)
+                    {
+                        SendMessageSA(player, BG_SA_ATTACK, _GatesName(target_obj));
+                        GateBlueSaphireDamaged = true;
+                    }
+                    break;
+                case 19040:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type);
+                    UpdateWorldState(BG_SA_GateStatus[type], GateStatus[type] = BG_SA_GO_GATES_DAMAGE);
+                    break;
+                case 19045:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type, true);
+                    UpdateWorldState(BG_SA_GateStatus[type], GateStatus[type] = BG_SA_GO_GATES_DESTROY);
+                    UpdatePlayerScore(player, SCORE_GATES_DESTROYED, 1);
+                    RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE : HORDE);
+                    // make western/eastern graveyard capturable
+                    for (int i = SA_EVENT_ADD_GRAVE_E; i <= SA_EVENT_ADD_GRAVE_W; i++)
+                        MakeInteractive(i, (GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_ALLY_CONTESTED : BG_SA_GRAVE_STATUS_HORDE_CONTESTED, true);
+                    SpawnEvent(SA_EVENT_ADD_BLUE_SIGIL, 0, false);
+                    break;
+            }
+            break;
+        }
+        case BG_SA_GO_GATES_MAUVE_AMETHYST:
+        {
+            type = BG_SA_GO_GATES_T_MAUVE_AMETHYST;
+            switch (eventId)
+            {
+                case 21630:
+                    if (!GateMauveAmethystDamaged)
+                    {
+                        SendMessageSA(player, BG_SA_ATTACK, _GatesName(target_obj));
+                        GateMauveAmethystDamaged = true;
+                    }
+                    break;
+                case 19043:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type);
+                    UpdateWorldState(BG_SA_GateStatus[type], GateStatus[type] = BG_SA_GO_GATES_DAMAGE);
+                    break;
+                case 19048:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type, true);
+                    UpdateWorldState(BG_SA_GateStatus[type], GateStatus[type] = BG_SA_GO_GATES_DESTROY);
+                    UpdatePlayerScore(player, SCORE_GATES_DESTROYED, 1);
+                    RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE : HORDE);
+                    // make the central graveyard capturable
+                    MakeInteractive(SA_EVENT_ADD_GRAVE_C, (GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_ALLY_CONTESTED : BG_SA_GRAVE_STATUS_HORDE_CONTESTED, true);
+                    SpawnEvent(SA_EVENT_ADD_PURPLE_SIGIL, 0, false);
+                    break;
+            }
+            break;
+        }
+        case BG_SA_GO_GATES_RED_SUN:
+        {
+            type = BG_SA_GO_GATES_T_RED_SUN;
+            switch (eventId)
+            {
+                case 21630:
+                    if (!GateRedSunDamaged)
+                    {
+                        SendMessageSA(player, BG_SA_ATTACK, _GatesName(target_obj));
+                        GateRedSunDamaged = true;
+                    }
+                    break;
+                case 19042:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type);
+                    UpdateWorldState(BG_SA_GateStatus[type], GateStatus[type] = BG_SA_GO_GATES_DAMAGE);
+                    break;
+                case 19047:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type, true);
+                    UpdateWorldState(BG_SA_GateStatus[type], GateStatus[type] = BG_SA_GO_GATES_DESTROY);
+                    UpdatePlayerScore(player, SCORE_GATES_DESTROYED, 1);
+                    RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE : HORDE);
+                    // make the central graveyard capturable
+                    MakeInteractive(SA_EVENT_ADD_GRAVE_C, (GetDefender() == ALLIANCE) ? BG_SA_GRAVE_STATUS_ALLY_CONTESTED : BG_SA_GRAVE_STATUS_HORDE_CONTESTED, true);
+                    SpawnEvent(SA_EVENT_ADD_RED_SIGIL, 0, false);
+                    break;
+            }
+            break;
+        }
+        case BG_SA_GO_GATES_YELLOW_MOON:
+        {
+            type = BG_SA_GO_GATES_T_YELLOW_MOON;
+            switch (eventId)
+            {
+                case 21630:
+                    if (!GateYellowMoonDamaged)
+                    {
+                        SendMessageSA(player, BG_SA_ATTACK, _GatesName(target_obj));
+                        GateYellowMoonDamaged = true;
+                    }
+                    break;
+                case 19044:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type);
+                    UpdateWorldState(BG_SA_GateStatus[type], GateStatus[type] = BG_SA_GO_GATES_DAMAGE);
+                    break;
+                case 19049:
+                    SendWarningToAllSA(SA_EVENT_NONE, TEAM_NONE, true, type, true);
+                    UpdateWorldState(BG_SA_GateStatus[type], GateStatus[type] = BG_SA_GO_GATES_DESTROY);
+                    UpdatePlayerScore(player, SCORE_GATES_DESTROYED, 1);
+                    RewardHonorToTeam(85, (teamIndex == 0) ? ALLIANCE : HORDE);
+                    SpawnEvent(SA_EVENT_ADD_YELLOW_SIGIL, 0, false);
+                    break;
+            }
+            break;
+        }
+        case BG_SA_GO_TITAN_RELIC_A:
+        case BG_SA_GO_TITAN_RELIC_H:
+        {
+            if (eventId == 20572 && player->GetTeam() != GetDefender())
+            {
+                if (!relicGateDestroyed)
+                {
+                    player->GetSession()->KickPlayer();
+                    sLog.outError("Player %s has clicked SOTA Relic without Relic gate being destroyed", player->GetName());
+                    return;
+                }
+
+                //Achievement Storm the Beach (1310)
+                for (BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+                {
+                    Player* plr = sObjectMgr.GetPlayer(itr->first);
+                    if (plr)
+                    {
+                        if (plr->GetTeam() != defender)
+                            plr->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, BG_SA_STORM_THE_BEACH);
+                    }
+                }
+
+                if (Phase == SA_ROUND_ONE) // Victory at first round
+                {
+                    RoundScores[0].winner = GetDefender() == ALLIANCE ? HORDE : ALLIANCE;
+                    RoundScores[0].time = Round_timer;
+                    PlaySoundToAll(BG_SA_SOUND_GYD_VICTORY);
+                    SendMessageToAll(defender == HORDE ? LANG_BG_SA_ALLIANCE_END_1ROUND : LANG_BG_SA_HORDE_END_1ROUND, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL);
+                    SendWarningToAll(LANG_BG_SA_END_1ROUND);
+                    RewardHonorToTeam(150, (teamIndex == 0) ? ALLIANCE : HORDE);
+                    ResetBattle(player->GetTeam(), GetDefender());
+                }
+                else // Victory at second round
+                {
+                    RoundScores[1].winner = GetDefender() == ALLIANCE ? HORDE : ALLIANCE;
+                    SendMessageToAll(defender == HORDE ? LANG_BG_SA_ALLIANCE_END_2ROUND : LANG_BG_SA_HORDE_END_2ROUND, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL);
+                    RewardHonorToTeam(150, (teamIndex == 0) ? ALLIANCE : HORDE);
+                    EndBattleGround(player->GetTeam());
+                }
+            }
+            break;
+        }
+    }
+}
+
+void BattleGroundSA::HandleKillPlayer(Player* player, Player* killer)
+{
+
+    player->CastSpell(player, 52417, false);
+
+    BattleGround::HandleKillPlayer(player, killer);
+}
+
+void BattleGroundSA::HandleKillUnit(Creature* unit, Player* killer)
+{
+    if (!unit)
+        return;
+
+    if (unit->GetEntry() == 28781) // Demolisher
+    {
+        UpdatePlayerScore(killer, SCORE_DEMOLISHERS_DESTROYED, 1);
+        isDemolisherDestroyed[killer->GetTeam() == HORDE ? 0 : 1] = true;
+    }
+}
+
+int32 BattleGroundSA::_GatesName(GameObject* obj)
+{
+    if (!obj)
+        return 0;
+
+    switch (obj->GetEntry())
+    {
+        case BG_SA_GO_GATES_ROOM_ANCIENT_SHRINE:  return LANG_BG_SA_GATE_ROOM_ANCIENT_SHRINE;
+        case BG_SA_GO_GATES_GREEN_EMERALD:  return LANG_BG_SA_GATE_GREEN_EMERALD;
+        case BG_SA_GO_GATES_BLUE_SAPHIRE:  return LANG_BG_SA_GATE_BLUE_SAPHIRE;
+        case BG_SA_GO_GATES_MAUVE_AMETHYST:  return LANG_BG_SA_GATE_MAUVE_AMETHYST;
+        case BG_SA_GO_GATES_RED_SUN:  return LANG_BG_SA_GATE_RED_SUN_;
+        case BG_SA_GO_GATES_YELLOW_MOON:  return LANG_BG_SA_GATE_YELLOW_MOON;
+        default:
+            MANGOS_ASSERT(0);
+            break;
+    }
+    return 0;
+}
+
+int32 BattleGroundSA::_GydName(uint8 gyd)
+{
+    switch (gyd)
+    {
+        case 0: return LANG_BG_SA_EAST_GRAVEYARD;
+        case 1: return LANG_BG_SA_WEST_GRAVEYARD;
+        case 2: return LANG_BG_SA_SOUTH_GRAVEYARD;
+        default:
+            MANGOS_ASSERT(0);
+            break;
+    }
+    return 0;
+}
+
+WorldSafeLocsEntry const* BattleGroundSA::GetClosestGraveYard(Player* player)
+{
+    TeamIndex teamIndex = GetTeamIndex(player->GetTeam());
+
+    // Is there any occupied node for this team?
+    std::vector<uint8> gyd;
+    for (uint8 i = 0; i <= BG_SA_GRY_MAX; ++i)
+        // players should be able to ressurect at their faction's contested/occupied graveyards too
+        if ((m_Gyd[i] == teamIndex + BG_SA_GRAVE_STATUS_CONTESTED) || (m_Gyd[i] == teamIndex + BG_SA_GRAVE_STATUS_OCCUPIED))
+            gyd.push_back(i);
+
+    WorldSafeLocsEntry const* good_entry = NULL;
+    // If so, select the closest node to place ghost on
+    if (!gyd.empty())
+    {
+        float plr_x = player->GetPositionX();
+        float plr_y = player->GetPositionY();
+
+        float mindist = 999999.0f;
+        for (uint8 i = 0; i < gyd.size(); ++i)
+        {
+            WorldSafeLocsEntry const*entry = sWorldSafeLocsStore.LookupEntry(BG_SA_GraveyardIdsPhase[gyd[i]]);
+
+            if (!entry)
+                continue;
+
+            float dist = (entry->x - plr_x)*(entry->x - plr_x)+(entry->y - plr_y)*(entry->y - plr_y);
+            if (mindist > dist)
+            {
+                mindist = dist;
+                good_entry = entry;
+            }
+        }
+        gyd.clear();
+    }
+    // If not, place ghost on starting location
+    if (!good_entry)
+    {
+        if (GetDefender() == HORDE)
+        {
+            if (teamIndex == 0)
+                good_entry = sWorldSafeLocsStore.LookupEntry(BG_SA_GraveyardIds[1]);
+            else
+                good_entry = sWorldSafeLocsStore.LookupEntry(BG_SA_GraveyardIds[0]);
+        }
+        if (GetDefender() == ALLIANCE)
+        {
+            if (teamIndex == 0)
+                good_entry = sWorldSafeLocsStore.LookupEntry(BG_SA_GraveyardIds[0]);
+            else
+                good_entry = sWorldSafeLocsStore.LookupEntry(BG_SA_GraveyardIds[1]);
+        }
+    }
+    return good_entry;
+}
+
+void BattleGroundSA::_GydOccupied(uint8 node, Team team)
+{
+    if (node >= 0 && node < BG_SA_GRY_MAX)                                  // theres 4 defender graveyards, but the one at relic has no worldstate
+    {
+        UpdateWorldState(GrraveYardWS[node][0], team == HORDE ? 0 : 1);
+        UpdateWorldState(GrraveYardWS[node][1], team == HORDE ? 1 : 0);
+    }
+    else
+    {
+        for (int8 i = 0; i < BG_SA_MAX_WS; ++i)
+        {
+            UpdateWorldState(BG_SA_WorldStatusH[i], (team == HORDE) ? 1 : 0);
+            UpdateWorldState(BG_SA_WorldStatusA[i], (team == HORDE) ? 1 : 0);
+        }
+    }
+}
+
+void BattleGroundSA::SendWarningToAllSA(BG_SA_Events gyd, Team team, bool isDoor, BG_SA_GoType door, bool destroyed)
+{
+    if (!isDoor)
+    {
+        if (team == HORDE)
+        {
+            switch (gyd)
+            {
+                case SA_EVENT_ADD_GRAVE_E: SendWarningToAll(LANG_BG_SA_HORDE_EAST_CONQUESTED); break;
+                case SA_EVENT_ADD_GRAVE_W: SendWarningToAll(LANG_BG_SA_HORDE_WEST_CONQUESTED); break;
+                case SA_EVENT_ADD_GRAVE_C: SendWarningToAll(LANG_BG_SA_HORDE_SOUTH_CONQUESTED); break;
+                default: sLog.outError("Error in SA strings: Unknown graveyard %u", gyd); break;
+            }
+        }
+        else
+        {
+            switch (gyd)
+            {
+                case SA_EVENT_ADD_GRAVE_E: SendWarningToAll(LANG_BG_SA_ALLIANCE_EAST_CONQUESTED); break;
+                case SA_EVENT_ADD_GRAVE_W: SendWarningToAll(LANG_BG_SA_ALLIANCE_WEST_CONQUESTED); break;
+                case SA_EVENT_ADD_GRAVE_C: SendWarningToAll(LANG_BG_SA_ALLIANCE_SOUTH_CONQUESTED); break;
+                default: sLog.outError("Error in SA strings: Unknown graveyard %u", gyd); break;
+            }
+        }
+    }
+    else
+    {
+        if (destroyed)
+        {
+            switch (door)
+            {
+                case BG_SA_GO_GATES_T_ROOM_ANCIENT_SHRINE: SendWarningToAll(LANG_BG_SA_GATE_ROOM_ANCIENT_SHRINE_DESTROYED); break;
+                case BG_SA_GO_GATES_T_GREEN_EMERALD: SendWarningToAll(LANG_BG_SA_GATE_GREEN_EMERALD_DESTROYED); break;
+                case BG_SA_GO_GATES_T_BLUE_SAPHIRE: SendWarningToAll(LANG_BG_SA_GATE_BLUE_SAPHIRE_DESTROYED); break;
+                case BG_SA_GO_GATES_T_MAUVE_AMETHYST: SendWarningToAll(LANG_BG_SA_GATE_MAUVE_AMETHYST_DESTROYED); break;
+                case BG_SA_GO_GATES_T_RED_SUN: SendWarningToAll(LANG_BG_SA_GATE_RED_SUN_DESTROYED); break;
+                case BG_SA_GO_GATES_T_YELLOW_MOON: SendWarningToAll(LANG_BG_SA_GATE_YELLOW_MOON_DESTROYED); break;
+                default:
+                    sLog.outError("Error in SA strings: Unknown door %d", door); break;
+            }
+        }
+        else
+        {
+            switch (door)
+            {
+                case BG_SA_GO_GATES_T_ROOM_ANCIENT_SHRINE: SendWarningToAll(LANG_BG_SA_GATE_ROOM_ANCIENT_SHRINE_DAMAGED); break;
+                case BG_SA_GO_GATES_T_GREEN_EMERALD: SendWarningToAll(LANG_BG_SA_GATE_GREEN_EMERALD_DAMAGED); break;
+                case BG_SA_GO_GATES_T_BLUE_SAPHIRE: SendWarningToAll(LANG_BG_SA_GATE_BLUE_SAPHIRE_DAMAGED); break;
+                case BG_SA_GO_GATES_T_MAUVE_AMETHYST: SendWarningToAll(LANG_BG_SA_GATE_MAUVE_AMETHYST_DAMAGED); break;
+                case BG_SA_GO_GATES_T_RED_SUN: SendWarningToAll(LANG_BG_SA_GATE_RED_SUN_DAMAGED); break;
+                case BG_SA_GO_GATES_T_YELLOW_MOON: SendWarningToAll(LANG_BG_SA_GATE_YELLOW_MOON_DAMAGED); break;
+                default:
+                    sLog.outError("Error in SA strings: Unknown door %d", door); break;
+            }
+        }
+    }
+}
+
+void BattleGroundSA::TeleportPlayerToCorrectLoc(Player *plr, bool resetBattle)
+{
+    if (!plr)
+        return;
+
+    if (resetBattle)
+    {
+        if (!plr->isAlive())
+        {
+            plr->RemoveAurasDueToSpell(2584);
+            plr->ResurrectPlayer(100);
+            plr->SpawnCorpseBones();
+        }
+
+        plr->RemoveArenaAuras(true);
+        plr->SetHealth(plr->GetMaxHealth());
+        plr->SetPower(POWER_MANA, plr->GetMaxPower(POWER_MANA));
+        plr->CombatStopWithPets(true);
+    }
+
+    if (!shipsStarted)
+    {
+        if (plr->GetTeam() != GetDefender())
+        {
+            if (urand(0,1))
+                plr->TeleportTo(607, 2682.936f, -830.368f, 15.0f, 2.895f);
+            else
+                plr->TeleportTo(607, 2577.003f, 980.261f, 15.0f, 0.807f);
+
+        }
+        else
+            plr->TeleportTo(607, 1209.7f, -65.16f, 70.1f, 0.0f);
+    }
+    else if (GetStartTime() < (2 * MINUTE * IN_MILLISECONDS))
+    {
+        if (plr->GetTeam() != GetDefender())
+        {
+            if (urand(0,1))
+                plr->TeleportTo(607, 1804.10f, -168.46f, 60.55f, 2.65f);
+            else
+                plr->TeleportTo(607, 1803.71f, 118.61f, 59.83f, 3.56f);
+        }
+        else
+            plr->TeleportTo(607, 1209.7f, -65.16f, 70.1f, 0.0f);
+    }
+    else
+    {
+        if (plr->GetTeam() != GetDefender())
+        {
+            if (urand(0,1))
+                plr->TeleportTo(607, 1597.64f, -106.35f, 8.89f, 4.13f);
+            else
+                plr->TeleportTo(607, 1606.61f, 50.13f, 7.58f, 2.39f);
+        }
+        else
+            plr->TeleportTo(607, 1209.7f, -65.16f, 70.1f, 0.0f);
+    }
+    // AddPlayer is called before SetupShips, so this check is needed for the 1st round to prevent console spam
+    if (shipsSpawned)
+        SendTransportInit(plr);
+}
+
+void BattleGroundSA::SendTransportInit(Player *player)
+{
+    if (GetBGObject(BG_SA_BOAT_ONE) || GetBGObject(BG_SA_BOAT_TWO))
+    {
+        UpdateData transData;
+        if (GetBGObject(BG_SA_BOAT_ONE))
+            GetBGObject(BG_SA_BOAT_ONE)->BuildCreateUpdateBlockForPlayer(&transData, player);
+        if (GetBGObject(BG_SA_BOAT_TWO))
+            GetBGObject(BG_SA_BOAT_TWO)->BuildCreateUpdateBlockForPlayer(&transData, player);
+        WorldPacket packet;
+        transData.BuildPacket(&packet);
+        player->GetSession()->SendPacket(&packet);
+    }
+}
+
+void BattleGroundSA::SendTransportsRemove(Player * player)
+{
+    if (GetBGObject(BG_SA_BOAT_ONE) || GetBGObject(BG_SA_BOAT_TWO))
+    {
+        UpdateData transData;
+        if (GetBGObject(BG_SA_BOAT_ONE))
+            GetBGObject(BG_SA_BOAT_ONE)->BuildOutOfRangeUpdateBlock(&transData);
+        if (GetBGObject(BG_SA_BOAT_TWO))
+            GetBGObject(BG_SA_BOAT_TWO)->BuildOutOfRangeUpdateBlock(&transData);
+        WorldPacket packet;
+        transData.BuildPacket(&packet);
+        player->GetSession()->SendPacket(&packet);
+    }
+}
+
+Team BattleGroundSA::GetSpawnTeamFor(ObjectGuid const& guid) const
+{
+    if (guid.IsEmpty() || !guid.HasEntry())
+        return TEAM_NONE;
+
+    switch (guid.GetEntry())
+    {
+        case VEHICLE_SA_DEMOLISHER:
+        case VEHICLE_SA_DEMOLISHER_1:
+            return GetDefender() == ALLIANCE ? HORDE : ALLIANCE;
+        case VEHICLE_SA_CANNON:
+        case VEHICLE_SA_CANNON_1:
+            return GetDefender() == ALLIANCE ? ALLIANCE : HORDE;
+        default:
+            break;
+    }
+    return TEAM_NONE;
+}
+
+bool BattleGroundSA::winSAwithAllWalls(Team team)
+{
+   if (GetDefender() != team)
+        return false;
+
+    bool allNotDestroyed = true;
+
+    for (uint32 i = 0; i < BG_SA_GATE_MAX; ++i)
+        if (GateStatus[i] == BG_SA_GO_GATES_DESTROY)
+            allNotDestroyed = false;
+
+    return allNotDestroyed;
+}
diff --git a/src/game/BattleGround/BattleGroundSA.h b/src/game/BattleGround/BattleGroundSA.h
new file mode 100644
index 00000000000..227d4fc50f1
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundSA.h
@@ -0,0 +1,294 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __BATTLEGROUNDSA_H
+#define __BATTLEGROUNDSA_H
+
+class BattleGround;
+
+#define BG_SA_GRY_MAX 3
+#define BG_SA_GATE_MAX 6
+#define BG_SA_MAX_WS 4
+#define BG_SA_EVENT_START_BATTLE_1      23748       // First Round Start
+#define BG_SA_EVENT_START_BATTLE_2      21702       // Second Round Start
+
+enum BG_SA_WorldStates
+{
+    BG_SA_TIMER_MINUTES         = 3559,
+    BG_SA_TIMER_10SEC           = 3560,
+    BG_SA_TIMER_SEC             = 3561,
+    BG_SA_ALLY_ATTACKS          = 4352,
+    BG_SA_HORDE_ATTACKS         = 4353,
+
+    BG_SA_PURPLE_GATEWS         = 3614,
+    BG_SA_RED_GATEWS            = 3617,
+    BG_SA_BLUE_GATEWS           = 3620,
+    BG_SA_GREEN_GATEWS          = 3623,
+    BG_SA_YELLOW_GATEWS         = 3638,
+    BG_SA_ANCIENT_GATEWS        = 3849,
+
+    BG_SA_LEFT_GY_ALLIANCE      = 3635,
+    BG_SA_RIGHT_GY_ALLIANCE     = 3636,
+    BG_SA_CENTER_GY_ALLIANCE    = 3637,
+
+    BG_SA_RIGHT_ATT_TOKEN_ALL   = 3627,
+    BG_SA_LEFT_ATT_TOKEN_ALL    = 3626,
+
+    BG_SA_LEFT_ATT_TOKEN_HRD    = 3629,
+    BG_SA_RIGHT_ATT_TOKEN_HRD   = 3628,
+
+    BG_SA_HORDE_DEFENCE_TOKEN    = 3631,
+    BG_SA_ALLIANCE_DEFENCE_TOKEN = 3630,
+
+    BG_SA_RIGHT_GY_HORDE        = 3632,
+    BG_SA_LEFT_GY_HORDE         = 3633,
+    BG_SA_CENTER_GY_HORDE       = 3634,
+
+    BG_SA_BONUS_TIMER           = 0xdf3,
+    BG_SA_ENABLE_TIMER          = 3564,
+};
+
+enum BG_SA_Sounds
+{
+    BG_SA_SOUND_GYD_CAPTURED_ALLIANCE  = 8173,
+    BG_SA_SOUND_GYD_CAPTURED_HORDE     = 8213,
+    BG_SA_SOUND_GYD_VICTORY            = 8456
+};
+
+enum BG_SA_GraveYardStatus
+{
+    BG_SA_GRAVE_STATUS_CONTESTED         = 1,   // adding status_contested and status_occupied just to make some cases clearer
+    BG_SA_GRAVE_STATUS_ALLY_CONTESTED    = 1,   // Owned by the Allies, clickable for Horde
+    BG_SA_GRAVE_STATUS_HORDE_CONTESTED   = 2,   // Owned by the Horde, clickable for Alliance
+    BG_SA_GRAVE_STATUS_OCCUPIED          = 3,
+    BG_SA_GRAVE_STATUS_ALLY_OCCUPIED     = 3,   // Captured by the Allies, not clickable by anyone
+    BG_SA_GRAVE_STATUS_HORDE_OCCUPIED    = 4    // Captured by the Horde, not clickable by anyone
+};
+
+enum BG_SA_Spells
+{
+    BG_SA_END_OF_ROUND                  = 52459, // Achievement Criteria
+    BG_SA_PLANT_SEAFORIUM_CHARGE        = 60937, // Spell doesnt exist(Achievement Criteria)
+    BG_SA_STORM_THE_BEACH               = 65246, // Spell doesnt exist(Achievement Criteria)
+};
+
+enum BG_SA_Timers
+{
+    BG_SA_ROUNDLENGTH                   = 600000,
+    BG_SA_BOAT_START                    = 70000
+};
+
+enum BG_SA_GateStatus
+{
+    BG_SA_GO_GATES_NORMAL               = 1,
+    BG_SA_GO_GATES_DAMAGE               = 2,
+    BG_SA_GO_GATES_DESTROY              = 3
+};
+
+enum BG_SA_GoId
+{
+    BG_SA_GO_GATES_ROOM_ANCIENT_SHRINE  = 192549,
+    BG_SA_GO_GATES_GREEN_EMERALD        = 190722,
+    BG_SA_GO_GATES_BLUE_SAPHIRE         = 190724,
+    BG_SA_GO_GATES_MAUVE_AMETHYST       = 190723,
+    BG_SA_GO_GATES_RED_SUN              = 190726,
+    BG_SA_GO_GATES_YELLOW_MOON          = 190727,
+    BG_SA_GO_TITAN_RELIC_A              = 194082,   // spawned titan relic when allies attack
+    BG_SA_GO_TITAN_RELIC_H              = 194083
+};
+
+enum BG_SA_GoType
+{
+    BG_SA_GO_GATES_T_ROOM_ANCIENT_SHRINE    = 0,
+    BG_SA_GO_GATES_T_GREEN_EMERALD          = 1,
+    BG_SA_GO_GATES_T_BLUE_SAPHIRE           = 2,
+    BG_SA_GO_GATES_T_MAUVE_AMETHYST         = 3,
+    BG_SA_GO_GATES_T_RED_SUN                = 4,
+    BG_SA_GO_GATES_T_YELLOW_MOON            = 5,
+    BG_SA_GO_GATES_T_NONE                   = 255
+};
+
+enum BG_SA_Events
+{
+    SA_EVENT_ADD_GRAVE_E    = 0,        // east base spirit healers and flags
+    SA_EVENT_ADD_GRAVE_W    = 1,        // west base spirit healers and flags
+    SA_EVENT_ADD_GRAVE_C    = 2,        // central base spirit healers and flags
+    SA_EVENT_ADD_GRAVE_A    = 3,        // last defender graveyard, at the ancient shrine
+    SA_EVENT_ADD_GRAVE_B    = 4,        // beach spirit healers
+    SA_EVENT_ADD_BOMB_E     = 5,        // east base bombs
+    SA_EVENT_ADD_BOMB_W     = 6,        // west base bombs
+    SA_EVENT_ADD_BOMB_C     = 7,        // central base bombs (on both sides of the yellow gate)
+    SA_EVENT_ADD_BOMB_B     = 8,        // bombs on the beach
+    SA_EVENT_ADD_NPC        = 9,        // dock demolishers, factory npcs
+    SA_EVENT_ADD_CANNON     = 10,       // defender cannons
+    SA_EVENT_ADD_GO         = 11,       // flagpoles, defender portals
+    SA_EVENT_ADD_VECH_E     = 12,       // east base demolishers
+    SA_EVENT_ADD_VECH_W     = 13,       // west base demolishers
+    SA_EVENT_ADD_RELIC      = 14,       // titan relic
+    SA_EVENT_ADD_GREEN_SIGIL  = 15,     // green gate sigil
+    SA_EVENT_ADD_BLUE_SIGIL   = 16,     // blue gate sigil
+    SA_EVENT_ADD_RED_SIGIL    = 17,     // red gate sigil
+    SA_EVENT_ADD_PURPLE_SIGIL = 18,     // purple gate sigil
+    SA_EVENT_ADD_YELLOW_SIGIL = 19,     // yellow gate sigil
+    SA_EVENT_NONE           = 255       // no real BG event, only dummy
+};
+
+enum BG_SA_Boats
+{
+    BG_SA_BOAT_ONE,
+    BG_SA_BOAT_TWO,
+    BG_SA_MAXOBJ = 2
+};
+
+struct BG_SA_BannerTimer
+{
+    uint32      timer;
+    uint8       type;
+    uint8       teamIndex;
+};
+
+enum BG_SA_MessageType
+{
+    BG_SA_ATTACK            = 0,
+    BG_SA_DAMAGE            = 1,
+    BG_SA_DESTROY           = 2
+};
+
+enum BG_SA_Boat
+{
+    BG_SA_BOAT_ONE_A = 193182,
+    BG_SA_BOAT_TWO_H = 193183,
+    BG_SA_BOAT_ONE_H = 193184,
+    BG_SA_BOAT_TWO_A = 193185
+};
+
+enum BG_SA_Phase
+{
+    SA_ROUND_ONE = 1,
+    SA_ROUND_TWO = 2,
+};
+
+enum CreaturesEntrySA
+{
+    VEHICLE_SA_DEMOLISHER   = 28781,
+    VEHICLE_SA_DEMOLISHER_1 = 32796,
+    VEHICLE_SA_CANNON       = 27894,
+    VEHICLE_SA_CANNON_1     = 32795,
+};
+
+struct BG_SA_RoundScore
+{
+    Team winner;
+    uint32 time;
+};
+
+class BattleGroundSAScore : public BattleGroundScore
+{
+    public:
+        BattleGroundSAScore(): DemolishersDestroyed(0), GatesDestroyed(0) {};
+        virtual ~BattleGroundSAScore() {};
+        uint32 DemolishersDestroyed;
+        uint32 GatesDestroyed;
+};
+
+class BattleGroundSA : public BattleGround
+{
+        friend class BattleGroundMgr;
+
+    public:
+        BattleGroundSA();
+        ~BattleGroundSA();
+        void Update(uint32 diff);
+
+        /* inherited from BattlegroundClass */
+        virtual void AddPlayer(Player* plr);
+        virtual void StartingEventCloseDoors();
+        virtual void StartingEventOpenDoors();
+        virtual void EventPlayerDamageGO(Player *player, GameObject* target_obj, uint32 eventId, uint32 doneBy = 0);
+        virtual void FillInitialWorldStates();
+        virtual void EventPlayerClickedOnFlag(Player *source, GameObject* target_obj);
+        virtual void HandleKillUnit(Creature* unit, Player* killer);
+        virtual void HandleKillPlayer(Player* player, Player* killer);
+        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
+        virtual void Reset();
+
+        Team GetDefender() const { return defender; }
+        uint8 GetGydController(uint8 gyd) const { return m_Gyd[gyd]; }
+        int32 GetGateStatus(int32 Type) const { return GateStatus[Type]; }
+        void RemovePlayer(Player *plr, ObjectGuid guid);
+        void HandleAreaTrigger(Player *Source, uint32 Trigger);
+        void EndBattleGround(Team winner);
+        void ResetBattle(uint32 winner, Team teamDefending);
+        bool SetupBattleGround();
+        void SendMessageSA(Player *player, uint32 type, uint32 name);
+        void UpdateTimer();
+        void UpdatePhase();
+        uint32 Phase;
+        Team defender;
+        uint32 Round_timer;
+        uint32 TimeST2Round;
+        bool shipsStarted;
+        bool shipsSpawned;
+        bool relicGateDestroyed;
+        uint32 shipsTimer;
+        uint32 pillarOpenTimer;
+        /* Scorekeeping */
+        void UpdatePlayerScore(Player* Source, uint32 type, uint32 value);
+        /* For boats */
+        bool SetupShips();
+        void StartShips();
+        // Send packet to player for create boats (client part)
+        void SendTransportInit(Player *player);
+        // Send packet to player for destroy boats (client part)
+        void SendTransportsRemove(Player * player);
+        /* For SendWarningToAll */
+        void SendWarningToAllSA(BG_SA_Events gyd, Team team, bool isDoor = false, BG_SA_GoType door = BG_SA_GO_GATES_T_NONE, bool destroyed = false);
+
+        /* For vehicle's faction*/
+        virtual Team GetSpawnTeamFor(ObjectGuid const& guid) const override;
+
+        /* This teleports player to correct loc in function of BG status and it resurects player if necesary */
+        void TeleportPlayerToCorrectLoc(Player *player, bool resetBattle = false);
+        // for achievement - win with all walls
+        bool winSAwithAllWalls(Team team);
+        bool isDemolisherDestroyed[2];
+
+    private:
+        uint8 m_Gyd[BG_SA_GRY_MAX + 1];
+        uint8 m_prevGyd[BG_SA_GRY_MAX + 1];   // used for performant wordlstate-updating
+        BG_SA_RoundScore RoundScores[2];
+        /* Gameobject spawning/despawning */
+        void _CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay);
+        BG_SA_BannerTimer   m_BannerTimers[BG_SA_GRY_MAX];
+        int32 _GatesName(GameObject* obj);
+        int32 _GydName(uint8 gyd);
+        int32 GateStatus[BG_SA_GATE_MAX];
+        bool TimerEnabled;
+        void _GydOccupied(uint8 node,Team team);
+        void ToggleTimer();
+        void ResetWorldStates();
+        void HandleInteractivity();
+        /* check to avoid to much messages */
+        bool GateRoomAncientShrineDamaged;
+        bool GateGreenEmeraldDamaged;
+        bool GateBlueSaphireDamaged;
+        bool GateMauveAmethystDamaged;
+        bool GateRedSunDamaged;
+        bool GateYellowMoonDamaged;
+};
+#endif
diff --git a/src/game/BattleGround/BattleGroundWS.cpp b/src/game/BattleGround/BattleGroundWS.cpp
new file mode 100644
index 00000000000..6b0a79c0362
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundWS.cpp
@@ -0,0 +1,660 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Object.h"
+#include "Player.h"
+#include "BattleGround.h"
+#include "BattleGroundWS.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "ObjectMgr.h"
+#include "BattleGroundMgr.h"
+#include "WorldPacket.h"
+#include "Language.h"
+#include "MapManager.h"
+
+BattleGroundWS::BattleGroundWS()
+{
+    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
+    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_WS_START_ONE_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_WS_START_HALF_MINUTE;
+    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_WS_HAS_BEGUN;
+}
+
+BattleGroundWS::~BattleGroundWS()
+{
+}
+
+void BattleGroundWS::Update(uint32 diff)
+{
+    BattleGround::Update(diff);
+
+    if (GetStatus() == STATUS_IN_PROGRESS)
+    {
+        if (m_FlagState[TEAM_INDEX_ALLIANCE] == BG_WS_FLAG_STATE_WAIT_RESPAWN)
+        {
+            m_FlagsTimer[TEAM_INDEX_ALLIANCE] -= diff;
+
+            if (m_FlagsTimer[TEAM_INDEX_ALLIANCE] < 0)
+            {
+                m_FlagsTimer[TEAM_INDEX_ALLIANCE] = 0;
+                RespawnFlag(ALLIANCE, true);
+            }
+        }
+        if (m_FlagState[TEAM_INDEX_ALLIANCE] == BG_WS_FLAG_STATE_ON_GROUND)
+        {
+            m_FlagsDropTimer[TEAM_INDEX_ALLIANCE] -= diff;
+
+            if (m_FlagsDropTimer[TEAM_INDEX_ALLIANCE] < 0)
+            {
+                m_FlagsDropTimer[TEAM_INDEX_ALLIANCE] = 0;
+                RespawnFlagAfterDrop(ALLIANCE);
+            }
+        }
+        if (m_FlagState[TEAM_INDEX_HORDE] == BG_WS_FLAG_STATE_WAIT_RESPAWN)
+        {
+            m_FlagsTimer[TEAM_INDEX_HORDE] -= diff;
+
+            if (m_FlagsTimer[TEAM_INDEX_HORDE] < 0)
+            {
+                m_FlagsTimer[TEAM_INDEX_HORDE] = 0;
+                RespawnFlag(HORDE, true);
+            }
+        }
+        if (m_FlagState[TEAM_INDEX_HORDE] == BG_WS_FLAG_STATE_ON_GROUND)
+        {
+            m_FlagsDropTimer[TEAM_INDEX_HORDE] -= diff;
+
+            if (m_FlagsDropTimer[TEAM_INDEX_HORDE] < 0)
+            {
+                m_FlagsDropTimer[TEAM_INDEX_HORDE] = 0;
+                RespawnFlagAfterDrop(HORDE);
+            }
+        }
+        if (m_FlagState[TEAM_INDEX_ALLIANCE] >= BG_WS_FLAG_STATE_ON_PLAYER && m_FlagState[TEAM_INDEX_HORDE] >= BG_WS_FLAG_STATE_ON_PLAYER)
+        {
+            if (m_FocusedAssault < BG_WS_FIVE_MINUTES)
+            {
+                for (uint8 i = 0; i < PVP_TEAM_COUNT; i++)
+                {
+                    Player* carrier = sObjectMgr.GetPlayer(m_FlagKeepers[i]);
+                    if (!carrier)
+                        continue;
+
+                    if ((!carrier->HasAura(BG_WS_SPELL_FOCUSED_ASSAULT) && !carrier->HasAura(BG_WS_SPELL_BRUTAL_ASSAULT)) ||
+                        (m_FocusedAssaultExtra && m_FocusedAssault < diff))
+                        carrier->CastSpell(carrier, (m_FocusedAssault < diff) ? BG_WS_SPELL_BRUTAL_ASSAULT : BG_WS_SPELL_FOCUSED_ASSAULT, true);
+                }
+                if (m_FocusedAssault < BG_WS_FIVE_MINUTES && m_FocusedAssaultExtra)
+                    m_FocusedAssaultExtra = false;
+
+            }
+            else m_FocusedAssault -= diff;
+        }
+        else
+        {
+            m_FocusedAssault = BG_WS_CARRIER_DEBUFF;
+            m_FocusedAssaultExtra = true;
+        }
+
+        if (m_EndTimer <= diff)
+        {
+            uint32 allianceScore = GetTeamScore(ALLIANCE);
+            uint32 hordeScore    = GetTeamScore(HORDE);
+
+            if (allianceScore > hordeScore)
+                EndBattleGround(ALLIANCE);
+            else if (allianceScore < hordeScore)
+                EndBattleGround(HORDE);
+            else
+            {
+                // if 0 => tie
+                EndBattleGround(m_LastCapturedFlagTeam);
+            }
+        }
+        else
+        {
+            uint32 minutesLeftPrev = GetRemainingTimeInMinutes();
+            m_EndTimer -= diff;
+            uint32 minutesLeft = GetRemainingTimeInMinutes();
+
+            if (minutesLeft != minutesLeftPrev)
+                UpdateWorldState(BG_WS_TIME_REMAINING, minutesLeft);
+        }
+    }
+}
+
+void BattleGroundWS::StartingEventCloseDoors()
+{
+}
+
+void BattleGroundWS::StartingEventOpenDoors()
+{
+    OpenDoorEvent(BG_EVENT_DOOR);
+
+    // TODO implement timer to despawn doors after a short while
+
+    SpawnEvent(WS_EVENT_SPIRITGUIDES_SPAWN, 0, true);
+    SpawnEvent(WS_EVENT_FLAG_A, 0, true);
+    SpawnEvent(WS_EVENT_FLAG_H, 0, true);
+
+    // Players that join battleground after start are not eligible to get achievement.
+    StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, BG_WS_EVENT_START_BATTLE);
+}
+
+void BattleGroundWS::AddPlayer(Player* plr)
+{
+    BattleGround::AddPlayer(plr);
+    // create score and add it to map, default values are set in constructor
+    BattleGroundWGScore* sc = new BattleGroundWGScore;
+
+    m_PlayerScores[plr->GetObjectGuid()] = sc;
+}
+
+void BattleGroundWS::RespawnFlag(Team team, bool captured)
+{
+    if (team == ALLIANCE)
+    {
+        DEBUG_LOG("Respawn Alliance flag");
+        m_FlagState[TEAM_INDEX_ALLIANCE] = BG_WS_FLAG_STATE_ON_BASE;
+        SpawnEvent(WS_EVENT_FLAG_A, 0, true);
+    }
+    else
+    {
+        DEBUG_LOG("Respawn Horde flag");
+        m_FlagState[TEAM_INDEX_HORDE] = BG_WS_FLAG_STATE_ON_BASE;
+        SpawnEvent(WS_EVENT_FLAG_H, 0, true);
+    }
+
+    if (captured)
+    {
+        // when map_update will be allowed for battlegrounds this code will be useless
+        SpawnEvent(WS_EVENT_FLAG_A, 0, true);
+        SpawnEvent(WS_EVENT_FLAG_H, 0, true);
+        SendMessageToAll(LANG_BG_WS_F_PLACED, CHAT_MSG_BG_SYSTEM_NEUTRAL);
+        PlaySoundToAll(BG_WS_SOUND_FLAGS_RESPAWNED);        // flag respawned sound...
+    }
+}
+
+void BattleGroundWS::RespawnFlagAfterDrop(Team team)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    RespawnFlag(team, false);
+    if (team == ALLIANCE)
+        SendMessageToAll(LANG_BG_WS_ALLIANCE_FLAG_RESPAWNED, CHAT_MSG_BG_SYSTEM_NEUTRAL);
+    else
+        SendMessageToAll(LANG_BG_WS_HORDE_FLAG_RESPAWNED, CHAT_MSG_BG_SYSTEM_NEUTRAL);
+
+    PlaySoundToAll(BG_WS_SOUND_FLAGS_RESPAWNED);
+
+    GameObject* obj = GetBgMap()->GetGameObject(GetDroppedFlagGuid(team));
+    if (obj)
+        obj->Delete();
+    else
+        sLog.outError("Unknown dropped flag bg: %s", GetDroppedFlagGuid(team).GetString().c_str());
+
+    ClearDroppedFlagGuid(team);
+}
+
+void BattleGroundWS::EventPlayerCapturedFlag(Player* source)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    m_LastCapturedFlagTeam = source->GetTeam();
+
+    if (m_FirstCapturedFlagTeam == TEAM_NONE)
+        m_FirstCapturedFlagTeam = source->GetTeam();
+
+    Team winner = TEAM_NONE;
+
+    source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
+    if (source->GetTeam() == ALLIANCE)
+    {
+        if (!IsHordeFlagPickedUp())
+            return;
+        ClearHordeFlagCarrier();                            // must be before aura remove to prevent 2 events (drop+capture) at the same time
+        // horde flag in base (but not respawned yet)
+        m_FlagState[TEAM_INDEX_HORDE] = BG_WS_FLAG_STATE_WAIT_RESPAWN;
+        // Drop Horde Flag from Player
+        source->RemoveAurasDueToSpell(BG_WS_SPELL_WARSONG_FLAG);
+        if (GetTeamScore(ALLIANCE) < BG_WS_MAX_TEAM_SCORE)
+            AddPoint(ALLIANCE, 1);
+        PlaySoundToAll(BG_WS_SOUND_FLAG_CAPTURED_ALLIANCE);
+        RewardReputationToTeam(890, m_ReputationCapture, ALLIANCE);
+    }
+    else
+    {
+        if (!IsAllianceFlagPickedUp())
+            return;
+        ClearAllianceFlagCarrier();                         // must be before aura remove to prevent 2 events (drop+capture) at the same time
+        // alliance flag in base (but not respawned yet)
+        m_FlagState[TEAM_INDEX_ALLIANCE] = BG_WS_FLAG_STATE_WAIT_RESPAWN;
+        // Drop Alliance Flag from Player
+        source->RemoveAurasDueToSpell(BG_WS_SPELL_SILVERWING_FLAG);
+        if (GetTeamScore(HORDE) < BG_WS_MAX_TEAM_SCORE)
+            AddPoint(HORDE, 1);
+        PlaySoundToAll(BG_WS_SOUND_FLAG_CAPTURED_HORDE);
+        RewardReputationToTeam(889, m_ReputationCapture, HORDE);
+    }
+    // for flag capture is reward 2 honorable kills
+    RewardHonorToTeam(GetBonusHonorFromKill(2), source->GetTeam());
+
+    // despawn flags
+    SpawnEvent(WS_EVENT_FLAG_A, 0, false);
+    SpawnEvent(WS_EVENT_FLAG_H, 0, false);
+
+    if (source->GetTeam() == ALLIANCE)
+        SendMessageToAll(LANG_BG_WS_CAPTURED_HF, CHAT_MSG_BG_SYSTEM_ALLIANCE, source);
+    else
+        SendMessageToAll(LANG_BG_WS_CAPTURED_AF, CHAT_MSG_BG_SYSTEM_HORDE, source);
+
+    UpdateFlagState(source->GetTeam(), 1);                  // flag state none
+    UpdateTeamScore(source->GetTeam());
+    source->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, 1, 42);
+
+    // only flag capture should be updated
+    UpdatePlayerScore(source, SCORE_FLAG_CAPTURES, 1);      // +1 flag captures
+
+    if (GetTeamScore(ALLIANCE) == BG_WS_MAX_TEAM_SCORE)
+        winner = ALLIANCE;
+
+    if (GetTeamScore(HORDE) == BG_WS_MAX_TEAM_SCORE)
+        winner = HORDE;
+
+    if (winner)
+    {
+        UpdateWorldState(BG_WS_FLAG_UNK_ALLIANCE, 0);
+        UpdateWorldState(BG_WS_FLAG_UNK_HORDE, 0);
+        UpdateWorldState(BG_WS_FLAG_STATE_ALLIANCE, 1);
+        UpdateWorldState(BG_WS_FLAG_STATE_HORDE, 1);
+
+        EndBattleGround(winner);
+    }
+    else
+    {
+        m_FlagsTimer[GetOtherTeamIndex(GetTeamIndex(source->GetTeam()))] = BG_WS_FLAG_RESPAWN_TIME;
+    }
+}
+
+void BattleGroundWS::EventPlayerDroppedFlag(Player* source)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+    {
+        // if not running, do not cast things at the dropper player (prevent spawning the "dropped" flag), neither send unnecessary messages
+        // just take off the aura
+        if (source->GetTeam() == ALLIANCE)
+        {
+            if (!IsHordeFlagPickedUp())
+                return;
+            if (GetHordeFlagCarrierGuid() == source->GetObjectGuid())
+            {
+                ClearHordeFlagCarrier();
+                source->RemoveAurasDueToSpell(BG_WS_SPELL_WARSONG_FLAG);
+            }
+        }
+        else
+        {
+            if (!IsAllianceFlagPickedUp())
+                return;
+            if (GetAllianceFlagCarrierGuid() == source->GetObjectGuid())
+            {
+                ClearAllianceFlagCarrier();
+                source->RemoveAurasDueToSpell(BG_WS_SPELL_SILVERWING_FLAG);
+            }
+        }
+        return;
+    }
+
+    bool set = false;
+
+    if (source->GetTeam() == ALLIANCE)
+    {
+        if (!IsHordeFlagPickedUp())
+            return;
+        if (GetHordeFlagCarrierGuid() == source->GetObjectGuid())
+        {
+            ClearHordeFlagCarrier();
+            source->RemoveAurasDueToSpell(BG_WS_SPELL_WARSONG_FLAG);
+            m_FlagState[TEAM_INDEX_HORDE] = BG_WS_FLAG_STATE_ON_GROUND;
+            source->CastSpell(source, BG_WS_SPELL_WARSONG_FLAG_DROPPED, true);
+            set = true;
+        }
+    }
+    else
+    {
+        if (!IsAllianceFlagPickedUp())
+            return;
+        if (GetAllianceFlagCarrierGuid() == source->GetObjectGuid())
+        {
+            ClearAllianceFlagCarrier();
+            source->RemoveAurasDueToSpell(BG_WS_SPELL_SILVERWING_FLAG);
+            m_FlagState[TEAM_INDEX_ALLIANCE] = BG_WS_FLAG_STATE_ON_GROUND;
+            source->CastSpell(source, BG_WS_SPELL_SILVERWING_FLAG_DROPPED, true);
+            set = true;
+        }
+    }
+
+    if (set)
+    {
+        source->CastSpell(source, SPELL_RECENTLY_DROPPED_FLAG, true);
+        UpdateFlagState(source->GetTeam(), 1);
+
+        if (source->GetTeam() == ALLIANCE)
+        {
+            SendMessageToAll(LANG_BG_WS_DROPPED_HF, CHAT_MSG_BG_SYSTEM_HORDE, source);
+            UpdateWorldState(BG_WS_FLAG_UNK_HORDE, uint32(-1));
+        }
+        else
+        {
+            SendMessageToAll(LANG_BG_WS_DROPPED_AF, CHAT_MSG_BG_SYSTEM_ALLIANCE, source);
+            UpdateWorldState(BG_WS_FLAG_UNK_ALLIANCE, uint32(-1));
+        }
+
+        m_FlagsDropTimer[GetOtherTeamIndex(GetTeamIndex(source->GetTeam()))] = BG_WS_FLAG_DROP_TIME;
+    }
+}
+
+void BattleGroundWS::PickOrReturnFlag(Player* pPlayer, Team forTeam, bool pickedUp, bool fromGround/*false*/)
+{
+    int32 message_id = 0;
+
+    bool A = forTeam == ALLIANCE;
+
+    // Flag picked up from base or ground.
+    if (pickedUp)
+    {
+        message_id = A ? LANG_BG_WS_PICKEDUP_HF : LANG_BG_WS_PICKEDUP_AF;
+        PlaySoundToAll(A ? BG_WS_SOUND_HORDE_FLAG_PICKED_UP : BG_WS_SOUND_ALLIANCE_FLAG_PICKED_UP);
+        SpawnEvent(A ? WS_EVENT_FLAG_H : WS_EVENT_FLAG_A, 0, false);
+        A ? SetHordeFlagCarrier(pPlayer->GetObjectGuid()) : SetAllianceFlagCarrier(pPlayer->GetObjectGuid());
+        m_FlagState[A ? TEAM_INDEX_HORDE : TEAM_INDEX_ALLIANCE] = BG_WS_FLAG_STATE_ON_PLAYER;
+        // update world state to show correct flag carrier
+        UpdateFlagState(A ? ALLIANCE : HORDE, BG_WS_FLAG_STATE_ON_PLAYER);
+        UpdateWorldState(A ? BG_WS_FLAG_UNK_HORDE : BG_WS_FLAG_UNK_ALLIANCE, 1);
+        pPlayer->CastSpell(pPlayer, A ? BG_WS_SPELL_WARSONG_FLAG : BG_WS_SPELL_SILVERWING_FLAG, true);
+
+        if (!fromGround)
+            //For timed achivements (Quick Cap)
+            pPlayer->GetAchievementMgr().StartTimedAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, A ? BG_WS_SPELL_WARSONG_FLAG_PICKED : BG_WS_SPELL_SILVERWING_FLAG_PICKED);
+
+    }
+    // Flag on ground (not in base), return flag to base.
+    else
+    {
+        message_id = A ? LANG_BG_WS_RETURNED_AF : LANG_BG_WS_RETURNED_HF;
+        UpdateFlagState(A ? HORDE : ALLIANCE, BG_WS_FLAG_STATE_WAIT_RESPAWN);
+        RespawnFlag(A ? ALLIANCE : HORDE, false);
+        PlaySoundToAll(BG_WS_SOUND_FLAG_RETURNED);
+        UpdatePlayerScore(pPlayer, SCORE_FLAG_RETURNS, 1);
+    }
+
+    SendMessageToAll(message_id, A ? CHAT_MSG_BG_SYSTEM_ALLIANCE : CHAT_MSG_BG_SYSTEM_HORDE, pPlayer);
+    pPlayer->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
+}
+
+void BattleGroundWS::EventPlayerClickedOnFlag(Player* source, GameObject* target_obj)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    uint8 event = (sBattleGroundMgr.GetGameObjectEventIndex(target_obj->GetGUIDLow())).event1;
+
+    bool A = source->GetTeam() == ALLIANCE;
+    // Flag picked up from base.
+    if (GetFlagState(A ? HORDE : ALLIANCE) == BG_WS_FLAG_STATE_ON_BASE && event == (A ? WS_EVENT_FLAG_H : WS_EVENT_FLAG_A))
+        PickOrReturnFlag(source, A ? ALLIANCE : HORDE, true);
+    else
+    {
+        // Flag on ground (not in base). Return or picked up again.
+        if ((GetFlagState(ALLIANCE) == BG_WS_FLAG_STATE_ON_GROUND || GetFlagState(HORDE) == BG_WS_FLAG_STATE_ON_GROUND) &&
+            source->IsWithinDistInMap(target_obj, 10.0f))
+        {
+            Team team = A ? ALLIANCE : HORDE;
+            PickOrReturnFlag(source, team, !(GetFlagState(team) == BG_WS_FLAG_STATE_ON_GROUND), true);
+        }
+    }
+}
+
+void BattleGroundWS::RemovePlayer(Player* plr, ObjectGuid guid)
+{
+    // sometimes flag aura not removed :(
+    if (IsAllianceFlagPickedUp() && m_FlagKeepers[TEAM_INDEX_ALLIANCE] == guid)
+    {
+        if (!plr)
+        {
+            sLog.outError("BattleGroundWS: Removing offline player who has the FLAG!!");
+            ClearAllianceFlagCarrier();
+            RespawnFlag(ALLIANCE, false);
+        }
+        else
+            EventPlayerDroppedFlag(plr);
+    }
+    if (IsHordeFlagPickedUp() && m_FlagKeepers[TEAM_INDEX_HORDE] == guid)
+    {
+        if (!plr)
+        {
+            sLog.outError("BattleGroundWS: Removing offline player who has the FLAG!!");
+            ClearHordeFlagCarrier();
+            RespawnFlag(HORDE, false);
+        }
+        else
+            EventPlayerDroppedFlag(plr);
+    }
+}
+
+void BattleGroundWS::UpdateFlagState(Team team, uint32 value)
+{
+    if (team == ALLIANCE)
+        UpdateWorldState(BG_WS_FLAG_STATE_ALLIANCE, value);
+    else
+        UpdateWorldState(BG_WS_FLAG_STATE_HORDE, value);
+}
+
+void BattleGroundWS::UpdateTeamScore(Team team)
+{
+    if (team == ALLIANCE)
+        UpdateWorldState(BG_WS_FLAG_CAPTURES_ALLIANCE, GetTeamScore(team));
+    else
+        UpdateWorldState(BG_WS_FLAG_CAPTURES_HORDE, GetTeamScore(team));
+}
+
+void BattleGroundWS::HandleAreaTrigger(Player* source, uint32 trigger)
+{
+    // this is wrong way to implement these things. On official it done by gameobject spell cast.
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    // uint32 SpellId = 0;
+    // uint64 buff_guid = 0;
+    switch (trigger)
+    {
+        case 3686:                                          // Alliance elixir of speed spawn. Trigger not working, because located inside other areatrigger, can be replaced by IsWithinDist(object, dist) in BattleGround::Update().
+        case 3687:                                          // Horde elixir of speed spawn. Trigger not working, because located inside other areatrigger, can be replaced by IsWithinDist(object, dist) in BattleGround::Update().
+        case 3706:                                          // Alliance elixir of regeneration spawn
+        case 3708:                                          // Horde elixir of regeneration spawn
+        case 3707:                                          // Alliance elixir of berserk spawn
+        case 3709:                                          // Horde elixir of berserk spawn
+            break;
+        case 3646:                                          // Alliance Flag spawn
+            if (m_FlagState[TEAM_INDEX_HORDE] && !m_FlagState[TEAM_INDEX_ALLIANCE])
+                if (GetHordeFlagCarrierGuid() == source->GetObjectGuid())
+                    EventPlayerCapturedFlag(source);
+            break;
+        case 3647:                                          // Horde Flag spawn
+            if (m_FlagState[TEAM_INDEX_ALLIANCE] && !m_FlagState[TEAM_INDEX_HORDE])
+                if (GetAllianceFlagCarrierGuid() == source->GetObjectGuid())
+                    EventPlayerCapturedFlag(source);
+            break;
+        case 3649:                                          // unk1
+        case 3688:                                          // unk2
+        case 4628:                                          // unk3
+        case 4629:                                          // unk4
+            break;
+        default:
+            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", trigger);
+            source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", trigger);
+            break;
+    }
+}
+
+bool BattleGroundWS::SetupBattleGround()
+{
+    return true;
+}
+
+void BattleGroundWS::Reset()
+{
+    // call parent's class reset
+    BattleGround::Reset();
+
+    // spiritguides and flags not spawned at beginning
+    m_ActiveEvents[WS_EVENT_SPIRITGUIDES_SPAWN] = BG_EVENT_NONE;
+    m_ActiveEvents[WS_EVENT_FLAG_A] = BG_EVENT_NONE;
+    m_ActiveEvents[WS_EVENT_FLAG_H] = BG_EVENT_NONE;
+
+    for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i)
+    {
+        m_DroppedFlagGuid[i].Clear();
+        m_FlagKeepers[i].Clear();
+        m_FlagState[i]       = BG_WS_FLAG_STATE_ON_BASE;
+        m_TeamScores[i]      = 0;
+    }
+    bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID());
+    m_ReputationCapture = (isBGWeekend) ? 45 : 35;
+    m_HonorWinKills = (isBGWeekend) ? 3 : 1;
+    m_HonorEndKills = (isBGWeekend) ? 4 : 2;
+
+    m_FocusedAssault = BG_WS_CARRIER_DEBUFF;
+    m_FocusedAssaultExtra = true;
+
+    m_EndTimer = BG_WS_TIME_LIMIT;
+    m_LastCapturedFlagTeam = TEAM_NONE;
+    m_FirstCapturedFlagTeam = TEAM_NONE;
+}
+
+void BattleGroundWS::EndBattleGround(Team winner)
+{
+    // win reward
+    if (winner == ALLIANCE)
+        RewardHonorToTeam(GetBonusHonorFromKill(m_HonorWinKills), ALLIANCE);
+    if (winner == HORDE)
+        RewardHonorToTeam(GetBonusHonorFromKill(m_HonorWinKills), HORDE);
+    // complete map_end rewards (even if no team wins)
+    RewardHonorToTeam(GetBonusHonorFromKill(m_HonorEndKills), ALLIANCE);
+    RewardHonorToTeam(GetBonusHonorFromKill(m_HonorEndKills), HORDE);
+
+    BattleGround::EndBattleGround(winner);
+}
+
+void BattleGroundWS::HandleKillPlayer(Player* player, Player* killer)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    EventPlayerDroppedFlag(player);
+
+    BattleGround::HandleKillPlayer(player, killer);
+}
+
+void BattleGroundWS::UpdatePlayerScore(Player* source, uint32 type, uint32 value)
+{
+
+    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(source->GetObjectGuid());
+    if (itr == m_PlayerScores.end())                        // player not found
+        return;
+
+    uint32 achCriId;
+
+    switch (type)
+    {
+        case SCORE_FLAG_CAPTURES:                           // flags captured
+            ((BattleGroundWGScore*)itr->second)->FlagCaptures += value;
+            achCriId = WS_OBJECTIVE_CAPTURE_FLAG;
+            break;
+        case SCORE_FLAG_RETURNS:                            // flags returned
+            ((BattleGroundWGScore*)itr->second)->FlagReturns += value;
+            achCriId = WS_OBJECTIVE_RETURN_FLAG;
+            break;
+        default:
+            BattleGround::UpdatePlayerScore(source, type, value);
+            return;
+    }
+
+    source->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, 1, achCriId);
+}
+
+WorldSafeLocsEntry const* BattleGroundWS::GetClosestGraveYard(Player* player)
+{
+    // if status in progress, it returns main graveyards with spiritguides
+    // else it will return the graveyard in the flagroom - this is especially good
+    // if a player dies in preparation phase - then the player can't cheat
+    // and teleport to the graveyard outside the flagroom
+    // and start running around, while the doors are still closed
+    if (player->GetTeam() == ALLIANCE)
+    {
+        if (GetStatus() == STATUS_IN_PROGRESS)
+            return sWorldSafeLocsStore.LookupEntry(WS_GRAVEYARD_MAIN_ALLIANCE);
+        else
+            return sWorldSafeLocsStore.LookupEntry(WS_GRAVEYARD_FLAGROOM_ALLIANCE);
+    }
+    else
+    {
+        if (GetStatus() == STATUS_IN_PROGRESS)
+            return sWorldSafeLocsStore.LookupEntry(WS_GRAVEYARD_MAIN_HORDE);
+        else
+            return sWorldSafeLocsStore.LookupEntry(WS_GRAVEYARD_FLAGROOM_HORDE);
+    }
+}
+
+void BattleGroundWS::FillInitialWorldStates()
+{
+    FillInitialWorldState(BG_WS_FLAG_CAPTURES_ALLIANCE, GetTeamScore(ALLIANCE));
+    FillInitialWorldState(BG_WS_FLAG_CAPTURES_HORDE, GetTeamScore(HORDE));
+
+    if (m_FlagState[TEAM_INDEX_ALLIANCE] == BG_WS_FLAG_STATE_ON_GROUND)
+        FillInitialWorldState(BG_WS_FLAG_UNK_ALLIANCE, -1);
+    else if (m_FlagState[TEAM_INDEX_ALLIANCE] == BG_WS_FLAG_STATE_ON_PLAYER)
+        FillInitialWorldState(BG_WS_FLAG_UNK_ALLIANCE, 1);
+    else
+        FillInitialWorldState(BG_WS_FLAG_UNK_ALLIANCE, 0);
+
+    if (m_FlagState[TEAM_INDEX_HORDE] == BG_WS_FLAG_STATE_ON_GROUND)
+        FillInitialWorldState(BG_WS_FLAG_UNK_HORDE, -1);
+    else if (m_FlagState[TEAM_INDEX_HORDE] == BG_WS_FLAG_STATE_ON_PLAYER)
+        FillInitialWorldState(BG_WS_FLAG_UNK_HORDE, 1);
+    else
+        FillInitialWorldState(BG_WS_FLAG_UNK_HORDE, 0);
+
+    FillInitialWorldState(BG_WS_FLAG_CAPTURES_MAX, BG_WS_MAX_TEAM_SCORE);
+
+    if (m_FlagState[TEAM_INDEX_HORDE] == BG_WS_FLAG_STATE_ON_PLAYER)
+        FillInitialWorldState(BG_WS_FLAG_STATE_HORDE, 2);
+    else
+        FillInitialWorldState(BG_WS_FLAG_STATE_HORDE, 1);
+
+    if (m_FlagState[TEAM_INDEX_ALLIANCE] == BG_WS_FLAG_STATE_ON_PLAYER)
+        FillInitialWorldState(BG_WS_FLAG_STATE_ALLIANCE, 2);
+    else
+        FillInitialWorldState(BG_WS_FLAG_STATE_ALLIANCE, 1);
+
+    FillInitialWorldState(BG_WS_TIME_ENABLED, WORLD_STATE_ADD);
+    FillInitialWorldState(BG_WS_TIME_REMAINING, GetRemainingTimeInMinutes());
+}
diff --git a/src/game/BattleGround/BattleGroundWS.h b/src/game/BattleGround/BattleGroundWS.h
new file mode 100644
index 00000000000..88055cf82c7
--- /dev/null
+++ b/src/game/BattleGround/BattleGroundWS.h
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __BATTLEGROUNDWS_H
+#define __BATTLEGROUNDWS_H
+
+#include "BattleGround.h"
+
+#define BG_WS_MAX_TEAM_SCORE      3
+#define BG_WS_FLAG_RESPAWN_TIME   (23*IN_MILLISECONDS)
+#define BG_WS_FLAG_DROP_TIME      (10*IN_MILLISECONDS)
+#define BG_WS_TIME_LIMIT          (25*MINUTE*IN_MILLISECONDS)
+#define BG_WS_FIVE_MINUTES        (5*MINUTE*IN_MILLISECONDS)
+#define BG_WS_CARRIER_DEBUFF      (15*MINUTE*IN_MILLISECONDS)
+#define BG_WS_EVENT_START_BATTLE  8563
+
+enum BG_WS_Sound
+{
+    BG_WS_SOUND_FLAG_CAPTURED_ALLIANCE  = 8173,
+    BG_WS_SOUND_FLAG_CAPTURED_HORDE     = 8213,
+    BG_WS_SOUND_FLAG_PLACED             = 8232,
+    BG_WS_SOUND_FLAG_RETURNED           = 8192,
+    BG_WS_SOUND_HORDE_FLAG_PICKED_UP    = 8212,
+    BG_WS_SOUND_ALLIANCE_FLAG_PICKED_UP = 8174,
+    BG_WS_SOUND_FLAGS_RESPAWNED         = 8232
+};
+
+enum BG_WS_SpellId
+{
+    BG_WS_SPELL_WARSONG_FLAG            = 23333,
+    BG_WS_SPELL_WARSONG_FLAG_DROPPED    = 23334,
+    BG_WS_SPELL_WARSONG_FLAG_PICKED     = 61266,    // Not real, used to start timed event
+    BG_WS_SPELL_SILVERWING_FLAG         = 23335,
+    BG_WS_SPELL_SILVERWING_FLAG_DROPPED = 23336,
+    BG_WS_SPELL_SILVERWING_FLAG_PICKED  = 61265,    // Not real, used to start timed event
+    BG_WS_SPELL_FOCUSED_ASSAULT         = 46392,
+    BG_WS_SPELL_BRUTAL_ASSAULT          = 46393
+};
+
+enum BG_WS_WorldStates
+{
+    BG_WS_FLAG_UNK_ALLIANCE       = 1545,
+    BG_WS_FLAG_UNK_HORDE          = 1546,
+//    FLAG_UNK                      = 1547,
+    BG_WS_FLAG_CAPTURES_ALLIANCE  = 1581,
+    BG_WS_FLAG_CAPTURES_HORDE     = 1582,
+    BG_WS_FLAG_CAPTURES_MAX       = 1601,
+    BG_WS_FLAG_STATE_HORDE        = 2338,
+    BG_WS_FLAG_STATE_ALLIANCE     = 2339,
+    BG_WS_TIME_ENABLED            = 4247,
+    BG_WS_TIME_REMAINING          = 4248
+};
+
+enum BG_WS_FlagState
+{
+    BG_WS_FLAG_STATE_ON_BASE      = 0,
+    BG_WS_FLAG_STATE_WAIT_RESPAWN = 1,
+    BG_WS_FLAG_STATE_ON_PLAYER    = 2,
+    BG_WS_FLAG_STATE_ON_GROUND    = 3
+};
+
+enum BG_WS_Objectives
+{
+    WS_OBJECTIVE_CAPTURE_FLAG     = 42,
+    WS_OBJECTIVE_RETURN_FLAG      = 44
+};
+
+enum BG_WS_Graveyards
+{
+    WS_GRAVEYARD_FLAGROOM_ALLIANCE = 769,
+    WS_GRAVEYARD_FLAGROOM_HORDE    = 770,
+    WS_GRAVEYARD_MAIN_ALLIANCE     = 771,
+    WS_GRAVEYARD_MAIN_HORDE        = 772
+};
+
+class BattleGroundWGScore : public BattleGroundScore
+{
+    public:
+        BattleGroundWGScore() : FlagCaptures(0), FlagReturns(0) {};
+        virtual ~BattleGroundWGScore() {};
+        uint32 FlagCaptures;
+        uint32 FlagReturns;
+};
+
+
+enum BG_WS_Events
+{
+    WS_EVENT_FLAG_A               = 0,
+    WS_EVENT_FLAG_H               = 1,
+    // spiritguides will spawn (same moment, like WS_EVENT_DOOR_OPEN)
+    WS_EVENT_SPIRITGUIDES_SPAWN   = 2
+};
+
+class BattleGroundWS : public BattleGround
+{
+        friend class BattleGroundMgr;
+
+    public:
+        /* Construction */
+        BattleGroundWS();
+        ~BattleGroundWS();
+        void Update(uint32 diff);
+
+        /* inherited from BattlegroundClass */
+        virtual void AddPlayer(Player* plr);
+        virtual void StartingEventCloseDoors();
+        virtual void StartingEventOpenDoors();
+
+        /* BG Flags */
+        ObjectGuid GetAllianceFlagCarrierGuid() const { return m_FlagKeepers[TEAM_INDEX_ALLIANCE]; }
+        ObjectGuid GetHordeFlagCarrierGuid() const { return m_FlagKeepers[TEAM_INDEX_HORDE]; }
+
+        void SetAllianceFlagCarrier(ObjectGuid guid) { m_FlagKeepers[TEAM_INDEX_ALLIANCE] = guid; }
+        void SetHordeFlagCarrier(ObjectGuid guid) { m_FlagKeepers[TEAM_INDEX_HORDE] = guid; }
+
+        void ClearAllianceFlagCarrier() { m_FlagKeepers[TEAM_INDEX_ALLIANCE].Clear(); }
+        void ClearHordeFlagCarrier() { m_FlagKeepers[TEAM_INDEX_HORDE].Clear(); }
+
+        bool IsAllianceFlagPickedUp() const { return !m_FlagKeepers[TEAM_INDEX_ALLIANCE].IsEmpty(); }
+        bool IsHordeFlagPickedUp() const { return !m_FlagKeepers[TEAM_INDEX_HORDE].IsEmpty(); }
+
+        void RespawnFlag(Team team, bool captured);
+        void RespawnFlagAfterDrop(Team team);
+
+        uint8 GetFlagState(Team team) { return m_FlagState[GetTeamIndex(team)]; }
+
+        /* Battleground Events */
+        virtual void EventPlayerDroppedFlag(Player* source);
+        virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj);
+        virtual void EventPlayerCapturedFlag(Player* source);
+
+        void RemovePlayer(Player* plr, ObjectGuid guid);
+        void HandleAreaTrigger(Player* source, uint32 trigger);
+        void HandleKillPlayer(Player* player, Player* killer);
+        bool SetupBattleGround();
+        virtual void Reset();
+        void EndBattleGround(Team winner);
+        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
+        uint32 GetRemainingTimeInMinutes() { return m_EndTimer ? (m_EndTimer - 1) / (MINUTE * IN_MILLISECONDS) + 1 : 0; }
+
+        void UpdateFlagState(Team team, uint32 value);
+        void UpdateTeamScore(Team team);
+        void UpdatePlayerScore(Player* source, uint32 type, uint32 value);
+        void SetDroppedFlagGuid(ObjectGuid guid, Team team)  { m_DroppedFlagGuid[GetTeamIndex(team)] = guid;}
+        void ClearDroppedFlagGuid(Team team)  { m_DroppedFlagGuid[GetTeamIndex(team)].Clear();}
+        ObjectGuid const& GetDroppedFlagGuid(Team team) const { return m_DroppedFlagGuid[GetTeamIndex(team)];}
+        virtual void FillInitialWorldStates();
+
+        /* Scorekeeping */
+        uint32 GetTeamScore(Team team) const            { return m_TeamScores[GetTeamIndex(team)]; }
+        void AddPoint(Team team, uint32 Points = 1)     { m_TeamScores[GetTeamIndex(team)] += Points; }
+        void SetTeamPoint(Team team, uint32 Points = 0) { m_TeamScores[GetTeamIndex(team)] = Points; }
+        void RemovePoint(Team team, uint32 Points = 1)  { m_TeamScores[GetTeamIndex(team)] -= Points; }
+    private:
+        void PickOrReturnFlag(Player* pPlayer, Team forTeam, bool pickedUp, bool fromGround = false);
+
+        ObjectGuid m_FlagKeepers[PVP_TEAM_COUNT];
+
+        ObjectGuid m_DroppedFlagGuid[PVP_TEAM_COUNT];
+        uint8 m_FlagState[PVP_TEAM_COUNT];
+        int32 m_FlagsTimer[PVP_TEAM_COUNT];
+        int32 m_FlagsDropTimer[PVP_TEAM_COUNT];
+
+        uint32 m_ReputationCapture;
+        uint32 m_HonorWinKills;
+        uint32 m_HonorEndKills;
+        uint32 m_EndTimer;
+
+        Team   m_LastCapturedFlagTeam;
+        Team   m_FirstCapturedFlagTeam;
+
+        uint32 m_FocusedAssault;
+        bool   m_FocusedAssaultExtra;
+};
+
+#endif
diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp
deleted file mode 100644
index 76e1646f980..00000000000
--- a/src/game/BattleGroundAB.cpp
+++ /dev/null
@@ -1,572 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Object.h"
-#include "Player.h"
-#include "BattleGround.h"
-#include "BattleGroundAB.h"
-#include "Creature.h"
-#include "GameObject.h"
-#include "BattleGroundMgr.h"
-#include "Language.h"
-#include "Util.h"
-#include "WorldPacket.h"
-#include "MapManager.h"
-
-BattleGroundAB::BattleGroundAB()
-{
-    m_BuffChange = true;
-    m_BgObjects.resize(BG_AB_OBJECT_MAX);
-
-    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
-    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_AB_START_ONE_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_AB_START_HALF_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_AB_HAS_BEGUN;
-}
-
-BattleGroundAB::~BattleGroundAB()
-{
-}
-
-void BattleGroundAB::Update(uint32 diff)
-{
-    BattleGround::Update(diff);
-
-    if (GetStatus() == STATUS_IN_PROGRESS)
-    {
-        int team_points[BG_TEAMS_COUNT] = { 0, 0 };
-
-        for (int node = 0; node < BG_AB_NODES_MAX; ++node)
-        {
-            // 3 sec delay to spawn new banner instead previous despawned one
-            if (m_BannerTimers[node].timer)
-            {
-                if (m_BannerTimers[node].timer > diff)
-                    m_BannerTimers[node].timer -= diff;
-                else
-                {
-                    m_BannerTimers[node].timer = 0;
-                    _CreateBanner(node, m_BannerTimers[node].type, m_BannerTimers[node].teamIndex, false);
-                }
-            }
-
-            // 1-minute to occupy a node from contested state
-            if (m_NodeTimers[node])
-            {
-                if (m_NodeTimers[node] > diff)
-                    m_NodeTimers[node] -= diff;
-                else
-                {
-                    m_NodeTimers[node] = 0;
-                    // Change from contested to occupied !
-                    uint8 teamIndex = m_Nodes[node]-1;
-                    m_prevNodes[node] = m_Nodes[node];
-                    m_Nodes[node] += 2;
-                    // create new occupied banner
-                    _CreateBanner(node, BG_AB_NODE_TYPE_OCCUPIED, teamIndex, true);
-                    _SendNodeUpdate(node);
-                    _NodeOccupied(node,(teamIndex == 0) ? ALLIANCE:HORDE);
-                    // Message to chatlog
-
-                    if (teamIndex == 0)
-                    {
-                        SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN,CHAT_MSG_BG_SYSTEM_ALLIANCE,NULL,LANG_BG_ALLY,_GetNodeNameId(node));
-                        PlaySoundToAll(BG_AB_SOUND_NODE_CAPTURED_ALLIANCE);
-                    }
-                    else
-                    {
-                        SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN,CHAT_MSG_BG_SYSTEM_HORDE,NULL,LANG_BG_HORDE,_GetNodeNameId(node));
-                        PlaySoundToAll(BG_AB_SOUND_NODE_CAPTURED_HORDE);
-                    }
-                }
-            }
-
-            for (int team = 0; team < BG_TEAMS_COUNT; ++team)
-                if (m_Nodes[node] == team + BG_AB_NODE_TYPE_OCCUPIED)
-                    ++team_points[team];
-        }
-
-        // Accumulate points
-        for (int team = 0; team < BG_TEAMS_COUNT; ++team)
-        {
-            int points = team_points[team];
-            if (!points)
-                continue;
-            m_lastTick[team] += diff;
-            if (m_lastTick[team] > BG_AB_TickIntervals[points])
-            {
-                m_lastTick[team] -= BG_AB_TickIntervals[points];
-                m_TeamScores[team] += BG_AB_TickPoints[points];
-                m_HonorScoreTics[team] += BG_AB_TickPoints[points];
-                m_ReputationScoreTics[team] += BG_AB_TickPoints[points];
-                if (m_ReputationScoreTics[team] >= m_ReputationTics)
-                {
-                    (team == BG_TEAM_ALLIANCE) ? RewardReputationToTeam(509, 10, ALLIANCE) : RewardReputationToTeam(510, 10, HORDE);
-                    m_ReputationScoreTics[team] -= m_ReputationTics;
-                }
-                if (m_HonorScoreTics[team] >= m_HonorTics)
-                {
-                    RewardHonorToTeam(GetBonusHonorFromKill(1), (team == BG_TEAM_ALLIANCE) ? ALLIANCE : HORDE);
-                    m_HonorScoreTics[team] -= m_HonorTics;
-                }
-                if (!m_IsInformedNearVictory && m_TeamScores[team] > BG_AB_WARNING_NEAR_VICTORY_SCORE)
-                {
-                    if (team == BG_TEAM_ALLIANCE)
-                        SendMessageToAll(LANG_BG_AB_A_NEAR_VICTORY, CHAT_MSG_BG_SYSTEM_NEUTRAL);
-                    else
-                        SendMessageToAll(LANG_BG_AB_H_NEAR_VICTORY, CHAT_MSG_BG_SYSTEM_NEUTRAL);
-                    PlaySoundToAll(BG_AB_SOUND_NEAR_VICTORY);
-                    m_IsInformedNearVictory = true;
-                }
-
-                if (m_TeamScores[team] > BG_AB_MAX_TEAM_SCORE)
-                    m_TeamScores[team] = BG_AB_MAX_TEAM_SCORE;
-                if (team == BG_TEAM_ALLIANCE)
-                    UpdateWorldState(BG_AB_OP_RESOURCES_ALLY, m_TeamScores[team]);
-                if (team == BG_TEAM_HORDE)
-                    UpdateWorldState(BG_AB_OP_RESOURCES_HORDE, m_TeamScores[team]);
-
-                // update achievement flags
-                // we increased m_TeamScores[team] so we just need to check if it is 500 more than other teams resources
-                // horde will be a bit disadvantaged, but we can assume that points aren't updated for both team in same Update() call
-                uint8 otherTeam = (team + 1) % BG_TEAMS_COUNT;
-                if (m_TeamScores[team] > m_TeamScores[otherTeam] + 500)
-                    m_TeamScores500Disadvantage[otherTeam] = true;
-            }
-        }
-
-        // Test win condition
-        if (m_TeamScores[BG_TEAM_ALLIANCE] >= BG_AB_MAX_TEAM_SCORE)
-            EndBattleGround(ALLIANCE);
-        if (m_TeamScores[BG_TEAM_HORDE] >= BG_AB_MAX_TEAM_SCORE)
-            EndBattleGround(HORDE);
-    }
-}
-
-void BattleGroundAB::StartingEventCloseDoors()
-{
-    // despawn buffs
-    for (int i = 0; i < BG_AB_NODES_MAX * 3; ++i)
-        SpawnBGObject(m_BgObjects[BG_AB_OBJECT_SPEEDBUFF_STABLES + i], RESPAWN_ONE_DAY);
-}
-
-void BattleGroundAB::StartingEventOpenDoors()
-{
-    for (int i = 0; i < BG_AB_NODES_MAX; ++i)
-    {
-        //randomly select buff to spawn
-        uint8 buff = urand(0, 2);
-        SpawnBGObject(m_BgObjects[BG_AB_OBJECT_SPEEDBUFF_STABLES + buff + i * 3], RESPAWN_IMMEDIATELY);
-    }
-    OpenDoorEvent(BG_EVENT_DOOR);
-
-    // Players that join battleground after start are not eligible to get achievement.
-    StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, BG_AB_EVENT_START_BATTLE);
-}
-
-void BattleGroundAB::AddPlayer(Player *plr)
-{
-    BattleGround::AddPlayer(plr);
-    //create score and add it to map, default values are set in the constructor
-    BattleGroundABScore* sc = new BattleGroundABScore;
-
-    m_PlayerScores[plr->GetObjectGuid()] = sc;
-}
-
-void BattleGroundAB::RemovePlayer(Player * /*plr*/, ObjectGuid /*guid*/)
-{
-
-}
-
-void BattleGroundAB::HandleAreaTrigger(Player *Source, uint32 Trigger)
-{
-    switch(Trigger)
-    {
-        case 3948:                                          // Arathi Basin Alliance Exit.
-            if (Source->GetTeam() != ALLIANCE)
-                Source->GetSession()->SendNotification(LANG_BATTLEGROUND_ONLY_ALLIANCE_USE);
-            else
-                Source->LeaveBattleground();
-            break;
-        case 3949:                                          // Arathi Basin Horde Exit.
-            if (Source->GetTeam() != HORDE)
-                Source->GetSession()->SendNotification(LANG_BATTLEGROUND_ONLY_HORDE_USE);
-            else
-                Source->LeaveBattleground();
-            break;
-        case 3866:                                          // Stables
-        case 3869:                                          // Gold Mine
-        case 3867:                                          // Farm
-        case 3868:                                          // Lumber Mill
-        case 3870:                                          // Black Smith
-        case 4020:                                          // Unk1
-        case 4021:                                          // Unk2
-            //break;
-        default:
-            //sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", Trigger);
-            //Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
-            break;
-    }
-}
-
-/*  type: 0-neutral, 1-contested, 3-occupied
-    teamIndex: 0-ally, 1-horde                        */
-void BattleGroundAB::_CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay)
-{
-    // Just put it into the queue
-    if (delay)
-    {
-        m_BannerTimers[node].timer = 2000;
-        m_BannerTimers[node].type = type;
-        m_BannerTimers[node].teamIndex = teamIndex;
-        return;
-    }
-
-    // cause the node-type is in the generic form
-    // please see in the headerfile for the ids
-    if (type != BG_AB_NODE_TYPE_NEUTRAL)
-        type += teamIndex;
-
-    SpawnEvent(node, type, true);                           // will automaticly despawn other events
-}
-
-int32 BattleGroundAB::_GetNodeNameId(uint8 node)
-{
-    switch (node)
-    {
-        case BG_AB_NODE_STABLES:    return LANG_BG_AB_NODE_STABLES;
-        case BG_AB_NODE_BLACKSMITH: return LANG_BG_AB_NODE_BLACKSMITH;
-        case BG_AB_NODE_FARM:       return LANG_BG_AB_NODE_FARM;
-        case BG_AB_NODE_LUMBER_MILL:return LANG_BG_AB_NODE_LUMBER_MILL;
-        case BG_AB_NODE_GOLD_MINE:  return LANG_BG_AB_NODE_GOLD_MINE;
-        default:
-            MANGOS_ASSERT(0);
-    }
-    return 0;
-}
-
-void BattleGroundAB::FillInitialWorldStates(WorldPacket& data, uint32& count)
-{
-    const uint8 plusArray[] = {0, 2, 3, 0, 1};
-
-    // Node icons
-    for (uint8 node = 0; node < BG_AB_NODES_MAX; ++node)
-        FillInitialWorldState(data, count, BG_AB_OP_NODEICONS[node], m_Nodes[node]==0);
-
-    // Node occupied states
-    for (uint8 node = 0; node < BG_AB_NODES_MAX; ++node)
-        for (uint8 i = 1; i < BG_AB_NODES_MAX; ++i)
-            FillInitialWorldState(data, count, BG_AB_OP_NODESTATES[node] + plusArray[i], m_Nodes[node]==i);
-
-    // How many bases each team owns
-    uint8 ally = 0, horde = 0;
-    for (uint8 node = 0; node < BG_AB_NODES_MAX; ++node)
-        if (m_Nodes[node] == BG_AB_NODE_STATUS_ALLY_OCCUPIED)
-            ++ally;
-        else if (m_Nodes[node] == BG_AB_NODE_STATUS_HORDE_OCCUPIED)
-            ++horde;
-
-    FillInitialWorldState(data, count, BG_AB_OP_OCCUPIED_BASES_ALLY, ally);
-    FillInitialWorldState(data, count, BG_AB_OP_OCCUPIED_BASES_HORDE, horde);
-
-    // Team scores
-    FillInitialWorldState(data, count, BG_AB_OP_RESOURCES_MAX,      BG_AB_MAX_TEAM_SCORE);
-    FillInitialWorldState(data, count, BG_AB_OP_RESOURCES_WARNING,  BG_AB_WARNING_NEAR_VICTORY_SCORE);
-    FillInitialWorldState(data, count, BG_AB_OP_RESOURCES_ALLY,     m_TeamScores[BG_TEAM_ALLIANCE]);
-    FillInitialWorldState(data, count, BG_AB_OP_RESOURCES_HORDE,    m_TeamScores[BG_TEAM_HORDE]);
-
-    // other unknown
-    FillInitialWorldState(data, count, 0x745, 0x2);         // 37 1861 unk
-}
-
-void BattleGroundAB::_SendNodeUpdate(uint8 node)
-{
-    // Send node owner state update to refresh map icons on client
-    const uint8 plusArray[] = {0, 2, 3, 0, 1};
-
-    if (m_prevNodes[node])
-        UpdateWorldState(BG_AB_OP_NODESTATES[node] + plusArray[m_prevNodes[node]], 0);
-    else
-        UpdateWorldState(BG_AB_OP_NODEICONS[node], 0);
-
-    UpdateWorldState(BG_AB_OP_NODESTATES[node] + plusArray[m_Nodes[node]], 1);
-
-    // How many bases each team owns
-    uint8 ally = 0, horde = 0;
-    for (uint8 i = 0; i < BG_AB_NODES_MAX; ++i)
-        if (m_Nodes[i] == BG_AB_NODE_STATUS_ALLY_OCCUPIED)
-            ++ally;
-        else if (m_Nodes[i] == BG_AB_NODE_STATUS_HORDE_OCCUPIED)
-            ++horde;
-
-    UpdateWorldState(BG_AB_OP_OCCUPIED_BASES_ALLY, ally);
-    UpdateWorldState(BG_AB_OP_OCCUPIED_BASES_HORDE, horde);
-}
-
-void BattleGroundAB::_NodeOccupied(uint8 node,Team team)
-{
-    uint8 capturedNodes = 0;
-    for (uint8 i = 0; i < BG_AB_NODES_MAX; ++i)
-    {
-        if (m_Nodes[node] == GetTeamIndexByTeamId(team) + BG_AB_NODE_TYPE_OCCUPIED && !m_NodeTimers[i])
-            ++capturedNodes;
-    }
-    if (capturedNodes >= 5)
-        CastSpellOnTeam(SPELL_AB_QUEST_REWARD_5_BASES, team);
-    if (capturedNodes >= 4)
-        CastSpellOnTeam(SPELL_AB_QUEST_REWARD_4_BASES, team);
-}
-
-/* Invoked if a player used a banner as a gameobject */
-void BattleGroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* target_obj)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    uint8 event = (sBattleGroundMgr.GetGameObjectEventIndex(target_obj->GetGUIDLow())).event1;
-    if (event >= BG_AB_NODES_MAX)                           // not a node
-        return;
-    BG_AB_Nodes node = BG_AB_Nodes(event);
-
-    BattleGroundTeamIndex teamIndex = GetTeamIndexByTeamId(source->GetTeam());
-
-    // Check if player really could use this banner, not cheated
-    if (!(m_Nodes[node] == 0 || teamIndex == m_Nodes[node] % 2))
-        return;
-
-    source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
-    uint32 sound = 0;
-
-    // TODO in the following code we should restructure a bit to avoid
-    // duplication (or maybe write functions?)
-    // If node is neutral, change to contested
-    if (m_Nodes[node] == BG_AB_NODE_TYPE_NEUTRAL)
-    {
-        UpdatePlayerScore(source, SCORE_BASES_ASSAULTED, 1);
-        m_prevNodes[node] = m_Nodes[node];
-        m_Nodes[node] = teamIndex + 1;
-        // create new contested banner
-        _CreateBanner(node, BG_AB_NODE_TYPE_CONTESTED, teamIndex, true);
-        _SendNodeUpdate(node);
-        m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
-
-        if (teamIndex == 0)
-            SendMessage2ToAll(LANG_BG_AB_NODE_CLAIMED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node), LANG_BG_ALLY);
-        else
-            SendMessage2ToAll(LANG_BG_AB_NODE_CLAIMED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node), LANG_BG_HORDE);
-
-        sound = BG_AB_SOUND_NODE_CLAIMED;
-    }
-    // If node is contested
-    else if ((m_Nodes[node] == BG_AB_NODE_STATUS_ALLY_CONTESTED) || (m_Nodes[node] == BG_AB_NODE_STATUS_HORDE_CONTESTED))
-    {
-        // If last state is NOT occupied, change node to enemy-contested
-        if (m_prevNodes[node] < BG_AB_NODE_TYPE_OCCUPIED)
-        {
-            UpdatePlayerScore(source, SCORE_BASES_ASSAULTED, 1);
-            m_prevNodes[node] = m_Nodes[node];
-            m_Nodes[node] = teamIndex + BG_AB_NODE_TYPE_CONTESTED;
-            // create new contested banner
-            _CreateBanner(node, BG_AB_NODE_TYPE_CONTESTED, teamIndex, true);
-            _SendNodeUpdate(node);
-            m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
-
-            if (teamIndex == BG_TEAM_ALLIANCE)
-                SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
-            else
-                SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node));
-        }
-        // If contested, change back to occupied
-        else
-        {
-            UpdatePlayerScore(source, SCORE_BASES_DEFENDED, 1);
-            m_prevNodes[node] = m_Nodes[node];
-            m_Nodes[node] = teamIndex + BG_AB_NODE_TYPE_OCCUPIED;
-            // create new occupied banner
-            _CreateBanner(node, BG_AB_NODE_TYPE_OCCUPIED, teamIndex, true);
-            _SendNodeUpdate(node);
-            m_NodeTimers[node] = 0;
-            _NodeOccupied(node,(teamIndex == BG_TEAM_ALLIANCE) ? ALLIANCE:HORDE);
-
-            if (teamIndex == BG_TEAM_ALLIANCE)
-                SendMessage2ToAll(LANG_BG_AB_NODE_DEFENDED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
-            else
-                SendMessage2ToAll(LANG_BG_AB_NODE_DEFENDED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node));
-        }
-        sound = (teamIndex == BG_TEAM_ALLIANCE) ? BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE : BG_AB_SOUND_NODE_ASSAULTED_HORDE;
-    }
-    // If node is occupied, change to enemy-contested
-    else
-    {
-        UpdatePlayerScore(source, SCORE_BASES_ASSAULTED, 1);
-        m_prevNodes[node] = m_Nodes[node];
-        m_Nodes[node] = teamIndex + BG_AB_NODE_TYPE_CONTESTED;
-        // create new contested banner
-        _CreateBanner(node, BG_AB_NODE_TYPE_CONTESTED, teamIndex, true);
-        _SendNodeUpdate(node);
-        m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
-
-        if (teamIndex == BG_TEAM_ALLIANCE)
-            SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
-        else
-            SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node));
-
-        sound = (teamIndex == BG_TEAM_ALLIANCE) ? BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE : BG_AB_SOUND_NODE_ASSAULTED_HORDE;
-    }
-
-    // If node is occupied again, send "X has taken the Y" msg.
-    if (m_Nodes[node] >= BG_AB_NODE_TYPE_OCCUPIED)
-    {
-        if (teamIndex == BG_TEAM_ALLIANCE)
-            SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN,CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL, LANG_BG_ALLY, _GetNodeNameId(node));
-        else
-            SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN,CHAT_MSG_BG_SYSTEM_HORDE, NULL, LANG_BG_HORDE, _GetNodeNameId(node));
-    }
-    PlaySoundToAll(sound);
-}
-
-bool BattleGroundAB::SetupBattleGround()
-{
-    //buffs
-    for (int i = 0; i < BG_AB_NODES_MAX; ++i)
-    {
-        if (!AddObject(BG_AB_OBJECT_SPEEDBUFF_STABLES + 3 * i, Buff_Entries[0], BG_AB_BuffPositions[i][0], BG_AB_BuffPositions[i][1], BG_AB_BuffPositions[i][2], BG_AB_BuffPositions[i][3], 0, 0, sin(BG_AB_BuffPositions[i][3]/2), cos(BG_AB_BuffPositions[i][3]/2), RESPAWN_ONE_DAY)
-            || !AddObject(BG_AB_OBJECT_SPEEDBUFF_STABLES + 3 * i + 1, Buff_Entries[1], BG_AB_BuffPositions[i][0], BG_AB_BuffPositions[i][1], BG_AB_BuffPositions[i][2], BG_AB_BuffPositions[i][3], 0, 0, sin(BG_AB_BuffPositions[i][3]/2), cos(BG_AB_BuffPositions[i][3]/2), RESPAWN_ONE_DAY)
-            || !AddObject(BG_AB_OBJECT_SPEEDBUFF_STABLES + 3 * i + 2, Buff_Entries[2], BG_AB_BuffPositions[i][0], BG_AB_BuffPositions[i][1], BG_AB_BuffPositions[i][2], BG_AB_BuffPositions[i][3], 0, 0, sin(BG_AB_BuffPositions[i][3]/2), cos(BG_AB_BuffPositions[i][3]/2), RESPAWN_ONE_DAY)
-            )
-            sLog.outErrorDb("BatteGroundAB: Failed to spawn buff object!");
-    }
-
-    return true;
-}
-
-void BattleGroundAB::Reset()
-{
-    //call parent's class reset
-    BattleGround::Reset();
-
-    for (uint8 i = 0; i < BG_TEAMS_COUNT; ++i)
-    {
-        m_TeamScores[i]          = 0;
-        m_lastTick[i]            = 0;
-        m_HonorScoreTics[i]      = 0;
-        m_ReputationScoreTics[i] = 0;
-        m_TeamScores500Disadvantage[i] = false;
-    }
-
-    m_IsInformedNearVictory                 = false;
-    bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID());
-    m_HonorTics = (isBGWeekend) ? BG_AB_ABBGWeekendHonorTicks : BG_AB_NotABBGWeekendHonorTicks;
-    m_ReputationTics = (isBGWeekend) ? BG_AB_ABBGWeekendReputationTicks : BG_AB_NotABBGWeekendReputationTicks;
-
-    for (uint8 i = 0; i < BG_AB_NODES_MAX; ++i)
-    {
-        m_Nodes[i] = 0;
-        m_prevNodes[i] = 0;
-        m_NodeTimers[i] = 0;
-        m_BannerTimers[i].timer = 0;
-
-        // all nodes owned by neutral team at beginning
-        m_ActiveEvents[i] = BG_AB_NODE_TYPE_NEUTRAL;
-    }
-
-}
-
-void BattleGroundAB::EndBattleGround(Team winner)
-{
-    //win reward
-    if (winner == ALLIANCE)
-        RewardHonorToTeam(GetBonusHonorFromKill(1), ALLIANCE);
-    if (winner == HORDE)
-        RewardHonorToTeam(GetBonusHonorFromKill(1), HORDE);
-    //complete map_end rewards (even if no team wins)
-    RewardHonorToTeam(GetBonusHonorFromKill(1), HORDE);
-    RewardHonorToTeam(GetBonusHonorFromKill(1), ALLIANCE);
-
-    BattleGround::EndBattleGround(winner);
-}
-
-WorldSafeLocsEntry const* BattleGroundAB::GetClosestGraveYard(Player* player)
-{
-    BattleGroundTeamIndex teamIndex = GetTeamIndexByTeamId(player->GetTeam());
-
-    // Is there any occupied node for this team?
-    std::vector<uint8> nodes;
-    for (uint8 i = 0; i < BG_AB_NODES_MAX; ++i)
-        if (m_Nodes[i] == teamIndex + 3)
-            nodes.push_back(i);
-
-    WorldSafeLocsEntry const* good_entry = NULL;
-    // If so, select the closest node to place ghost on
-    if (!nodes.empty())
-    {
-        float plr_x = player->GetPositionX();
-        float plr_y = player->GetPositionY();
-
-        float mindist = 999999.0f;
-        for (uint8 i = 0; i < nodes.size(); ++i)
-        {
-            WorldSafeLocsEntry const*entry = sWorldSafeLocsStore.LookupEntry( BG_AB_GraveyardIds[nodes[i]] );
-            if (!entry)
-                continue;
-            float dist = (entry->x - plr_x)*(entry->x - plr_x)+(entry->y - plr_y)*(entry->y - plr_y);
-            if (mindist > dist)
-            {
-                mindist = dist;
-                good_entry = entry;
-            }
-        }
-        nodes.clear();
-    }
-    // If not, place ghost on starting location
-    if (!good_entry)
-        good_entry = sWorldSafeLocsStore.LookupEntry( BG_AB_GraveyardIds[teamIndex+5] );
-
-    return good_entry;
-}
-
-void BattleGroundAB::UpdatePlayerScore(Player *Source, uint32 type, uint32 value)
-{
-    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetObjectGuid());
-    if( itr == m_PlayerScores.end() )                         // player not found...
-        return;
-
-    switch(type)
-    {
-        case SCORE_BASES_ASSAULTED:
-            ((BattleGroundABScore*)itr->second)->BasesAssaulted += value;
-            break;
-        case SCORE_BASES_DEFENDED:
-            ((BattleGroundABScore*)itr->second)->BasesDefended += value;
-            break;
-        default:
-            BattleGround::UpdatePlayerScore(Source,type,value);
-            break;
-    }
-}
-
-bool BattleGroundAB::IsAllNodesConrolledByTeam(Team team) const
-{
-    uint32 count = 0;
-    for (int i = 0; i < BG_AB_NODES_MAX; ++i)
-        if ((team == ALLIANCE && m_Nodes[i] == BG_AB_NODE_STATUS_ALLY_OCCUPIED) ||
-            (team == HORDE    && m_Nodes[i] == BG_AB_NODE_STATUS_HORDE_OCCUPIED))
-            ++count;
-
-    return count == BG_AB_NODES_MAX;
-}
diff --git a/src/game/BattleGroundAB.h b/src/game/BattleGroundAB.h
deleted file mode 100644
index f6a254c43aa..00000000000
--- a/src/game/BattleGroundAB.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef __BATTLEGROUNDAB_H
-#define __BATTLEGROUNDAB_H
-
-#include "Common.h"
-#include "BattleGround.h"
-
-enum BG_AB_WorldStates
-{
-    BG_AB_OP_OCCUPIED_BASES_HORDE       = 1778,
-    BG_AB_OP_OCCUPIED_BASES_ALLY        = 1779,
-    BG_AB_OP_RESOURCES_ALLY             = 1776,
-    BG_AB_OP_RESOURCES_HORDE            = 1777,
-    BG_AB_OP_RESOURCES_MAX              = 1780,
-    BG_AB_OP_RESOURCES_WARNING          = 1955
-/*
-    BG_AB_OP_STABLE_ICON                = 1842,             //Stable map icon (NONE)
-    BG_AB_OP_STABLE_STATE_ALIENCE       = 1767,             //Stable map state (ALIENCE)
-    BG_AB_OP_STABLE_STATE_HORDE         = 1768,             //Stable map state (HORDE)
-    BG_AB_OP_STABLE_STATE_CON_ALI       = 1769,             //Stable map state (CON ALIENCE)
-    BG_AB_OP_STABLE_STATE_CON_HOR       = 1770,             //Stable map state (CON HORDE)
-    BG_AB_OP_FARM_ICON                  = 1845,             //Farm map icon (NONE)
-    BG_AB_OP_FARM_STATE_ALIENCE         = 1772,             //Farm state (ALIENCE)
-    BG_AB_OP_FARM_STATE_HORDE           = 1773,             //Farm state (HORDE)
-    BG_AB_OP_FARM_STATE_CON_ALI         = 1774,             //Farm state (CON ALIENCE)
-    BG_AB_OP_FARM_STATE_CON_HOR         = 1775,             //Farm state (CON HORDE)
-
-    BG_AB_OP_BLACKSMITH_ICON            = 1846,             //Blacksmith map icon (NONE)
-    BG_AB_OP_BLACKSMITH_STATE_ALIENCE   = 1782,             //Blacksmith map state (ALIENCE)
-    BG_AB_OP_BLACKSMITH_STATE_HORDE     = 1783,             //Blacksmith map state (HORDE)
-    BG_AB_OP_BLACKSMITH_STATE_CON_ALI   = 1784,             //Blacksmith map state (CON ALIENCE)
-    BG_AB_OP_BLACKSMITH_STATE_CON_HOR   = 1785,             //Blacksmith map state (CON HORDE)
-    BG_AB_OP_LUMBERMILL_ICON            = 1844,             //Lumber Mill map icon (NONE)
-    BG_AB_OP_LUMBERMILL_STATE_ALIENCE   = 1792,             //Lumber Mill map state (ALIENCE)
-    BG_AB_OP_LUMBERMILL_STATE_HORDE     = 1793,             //Lumber Mill map state (HORDE)
-    BG_AB_OP_LUMBERMILL_STATE_CON_ALI   = 1794,             //Lumber Mill map state (CON ALIENCE)
-    BG_AB_OP_LUMBERMILL_STATE_CON_HOR   = 1795,             //Lumber Mill map state (CON HORDE)
-    BG_AB_OP_GOLDMINE_ICON              = 1843,             //Gold Mine map icon (NONE)
-    BG_AB_OP_GOLDMINE_STATE_ALIENCE     = 1787,             //Gold Mine map state (ALIENCE)
-    BG_AB_OP_GOLDMINE_STATE_HORDE       = 1788,             //Gold Mine map state (HORDE)
-    BG_AB_OP_GOLDMINE_STATE_CON_ALI     = 1789,             //Gold Mine map state (CON ALIENCE
-    BG_AB_OP_GOLDMINE_STATE_CON_HOR     = 1790,             //Gold Mine map state (CON HORDE)
-*/
-};
-
-const uint32 BG_AB_OP_NODESTATES[5] =    {1767, 1782, 1772, 1792, 1787};
-
-const uint32 BG_AB_OP_NODEICONS[5]  =    {1842, 1846, 1845, 1844, 1843};
-
-enum BG_AB_ObjectType
-{
-    // TODO drop them (pool-system should be used for this)
-    //buffs
-    BG_AB_OBJECT_SPEEDBUFF_STABLES       = 1,
-    BG_AB_OBJECT_REGENBUFF_STABLES       = 2,
-    BG_AB_OBJECT_BERSERKBUFF_STABLES     = 3,
-    BG_AB_OBJECT_SPEEDBUFF_BLACKSMITH    = 4,
-    BG_AB_OBJECT_REGENBUFF_BLACKSMITH    = 5,
-    BG_AB_OBJECT_BERSERKBUFF_BLACKSMITH  = 6,
-    BG_AB_OBJECT_SPEEDBUFF_FARM          = 7,
-    BG_AB_OBJECT_REGENBUFF_FARM          = 8,
-    BG_AB_OBJECT_BERSERKBUFF_FARM        = 9,
-    BG_AB_OBJECT_SPEEDBUFF_LUMBER_MILL   = 10,
-    BG_AB_OBJECT_REGENBUFF_LUMBER_MILL   = 11,
-    BG_AB_OBJECT_BERSERKBUFF_LUMBER_MILL = 12,
-    BG_AB_OBJECT_SPEEDBUFF_GOLD_MINE     = 13,
-    BG_AB_OBJECT_REGENBUFF_GOLD_MINE     = 14,
-    BG_AB_OBJECT_BERSERKBUFF_GOLD_MINE   = 15,
-    BG_AB_OBJECT_MAX                     = 16,
-};
-
-
-/* node events */
-// node-events are just event1=BG_AB_Nodes, event2=BG_AB_NodeStatus
-// so we don't need to define the constants here :)
-
-enum BG_AB_Timers
-{
-    BG_AB_FLAG_CAPTURING_TIME           = 60000,
-};
-
-enum BG_AB_Score
-{
-    BG_AB_WARNING_NEAR_VICTORY_SCORE    = 1400,
-    BG_AB_MAX_TEAM_SCORE                = 1600
-};
-
-/* do NOT change the order, else wrong behaviour */
-enum BG_AB_Nodes
-{
-    BG_AB_NODE_STABLES          = 0,
-    BG_AB_NODE_BLACKSMITH       = 1,
-    BG_AB_NODE_FARM             = 2,
-    BG_AB_NODE_LUMBER_MILL      = 3,
-    BG_AB_NODE_GOLD_MINE        = 4,
-    BG_AB_NODES_ERROR           = 255
-};
-
-#define BG_AB_NODES_MAX   5
-
-enum BG_AB_NodeStatus
-{
-    BG_AB_NODE_TYPE_NEUTRAL             = 0,
-    BG_AB_NODE_TYPE_CONTESTED           = 1,
-    BG_AB_NODE_STATUS_ALLY_CONTESTED    = 1,
-    BG_AB_NODE_STATUS_HORDE_CONTESTED   = 2,
-    BG_AB_NODE_TYPE_OCCUPIED            = 3,
-    BG_AB_NODE_STATUS_ALLY_OCCUPIED     = 3,
-    BG_AB_NODE_STATUS_HORDE_OCCUPIED    = 4
-};
-
-enum BG_AB_Sounds
-{
-    BG_AB_SOUND_NODE_CLAIMED            = 8192,
-    BG_AB_SOUND_NODE_CAPTURED_ALLIANCE  = 8173,
-    BG_AB_SOUND_NODE_CAPTURED_HORDE     = 8213,
-    BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE = 8212,
-    BG_AB_SOUND_NODE_ASSAULTED_HORDE    = 8174,
-    BG_AB_SOUND_NEAR_VICTORY            = 8456
-};
-
-#define BG_AB_NotABBGWeekendHonorTicks      330
-#define BG_AB_ABBGWeekendHonorTicks         200
-#define BG_AB_NotABBGWeekendReputationTicks 200
-#define BG_AB_ABBGWeekendReputationTicks    150
-#define BG_AB_EVENT_START_BATTLE            9158
-
-// Tick intervals and given points: case 0,1,2,3,4,5 captured nodes
-const uint32 BG_AB_TickIntervals[6] = {0, 12000, 9000, 6000, 3000, 1000};
-const uint32 BG_AB_TickPoints[6] = {0, 10, 10, 10, 10, 30};
-
-// WorldSafeLocs ids for 5 nodes, and for ally, and horde starting location
-const uint32 BG_AB_GraveyardIds[7] = {895, 894, 893, 897, 896, 898, 899};
-
-// x, y, z, o
-const float BG_AB_BuffPositions[BG_AB_NODES_MAX][4] = {
-    {1185.71f, 1185.24f, -56.36f, 2.56f},                   // stables
-    {990.75f, 1008.18f, -42.60f, 2.43f},                    // blacksmith
-    {817.66f, 843.34f, -56.54f, 3.01f},                     // farm
-    {807.46f, 1189.16f, 11.92f, 5.44f},                     // lumber mill
-    {1146.62f, 816.94f, -98.49f, 6.14f}                     // gold mine
-};
-
-struct BG_AB_BannerTimer
-{
-    uint32      timer;
-    uint8       type;
-    uint8       teamIndex;
-};
-
-class BattleGroundABScore : public BattleGroundScore
-{
-    public:
-        BattleGroundABScore(): BasesAssaulted(0), BasesDefended(0) {};
-        virtual ~BattleGroundABScore() {};
-        uint32 BasesAssaulted;
-        uint32 BasesDefended;
-};
-
-class BattleGroundAB : public BattleGround
-{
-    friend class BattleGroundMgr;
-
-    public:
-        BattleGroundAB();
-        ~BattleGroundAB();
-
-        void Update(uint32 diff);
-        void AddPlayer(Player *plr);
-        virtual void StartingEventCloseDoors();
-        virtual void StartingEventOpenDoors();
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
-        virtual bool SetupBattleGround();
-        virtual void Reset();
-        void EndBattleGround(Team winner);
-        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
-
-        /* Scorekeeping */
-        virtual void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
-
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count);
-
-        /* Nodes occupying */
-        virtual void EventPlayerClickedOnFlag(Player *source, GameObject* target_obj);
-
-        /* achievement req. */
-        bool IsAllNodesConrolledByTeam(Team team) const;    // overwrited
-        bool IsTeamScores500Disadvantage(Team team) const { return m_TeamScores500Disadvantage[GetTeamIndexByTeamId(team)]; }
-    private:
-        /* Gameobject spawning/despawning */
-        void _CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay);
-        void _DelBanner(uint8 node, uint8 type, uint8 teamIndex);
-        void _SendNodeUpdate(uint8 node);
-
-        /* Creature spawning/despawning */
-        // TODO: working, scripted peons spawning
-        void _NodeOccupied(uint8 node,Team team);
-
-        int32 _GetNodeNameId(uint8 node);
-
-        /* Nodes info:
-            0: neutral
-            1: ally contested
-            2: horde contested
-            3: ally occupied
-            4: horde occupied     */
-        uint8               m_Nodes[BG_AB_NODES_MAX];
-        uint8               m_prevNodes[BG_AB_NODES_MAX];   // used for performant wordlstate-updating
-        BG_AB_BannerTimer   m_BannerTimers[BG_AB_NODES_MAX];
-        uint32              m_NodeTimers[BG_AB_NODES_MAX];
-        uint32              m_lastTick[BG_TEAMS_COUNT];
-        uint32              m_HonorScoreTics[BG_TEAMS_COUNT];
-        uint32              m_ReputationScoreTics[BG_TEAMS_COUNT];
-        bool                m_IsInformedNearVictory;
-        uint32              m_HonorTics;
-        uint32              m_ReputationTics;
-        // need for achievements
-        bool                m_TeamScores500Disadvantage[BG_TEAMS_COUNT];
-};
-#endif
diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp
deleted file mode 100644
index d8ffd5013f0..00000000000
--- a/src/game/BattleGroundAV.cpp
+++ /dev/null
@@ -1,834 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Player.h"
-#include "BattleGround.h"
-#include "BattleGroundAV.h"
-#include "BattleGroundMgr.h"
-#include "Creature.h"
-#include "GameObject.h"
-#include "Language.h"
-#include "WorldPacket.h"
-
-BattleGroundAV::BattleGroundAV()
-{
-    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
-    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_AV_START_ONE_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_AV_START_HALF_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_AV_HAS_BEGUN;
-}
-
-BattleGroundAV::~BattleGroundAV()
-{
-}
-
-void BattleGroundAV::HandleKillPlayer(Player *player, Player *killer)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    BattleGround::HandleKillPlayer(player, killer);
-    UpdateScore(GetTeamIndexByTeamId(player->GetTeam()), -1);
-}
-
-void BattleGroundAV::HandleKillUnit(Creature *creature, Player *killer)
-{
-    DEBUG_LOG("BattleGroundAV: HandleKillUnit %i", creature->GetEntry());
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-    uint8 event1 = (sBattleGroundMgr.GetCreatureEventIndex(creature->GetGUIDLow())).event1;
-    if (event1 == BG_EVENT_NONE)
-        return;
-    switch(event1)
-    {
-        case BG_AV_BOSS_A:
-            CastSpellOnTeam(BG_AV_BOSS_KILL_QUEST_SPELL, HORDE);   // this is a spell which finishes a quest where a player has to kill the boss
-            RewardReputationToTeam(BG_AV_FACTION_H, m_RepBoss, HORDE);
-            RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_BOSS), HORDE);
-            SendYellToAll(LANG_BG_AV_A_GENERAL_DEAD, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0));
-            EndBattleGround(HORDE);
-            break;
-        case BG_AV_BOSS_H:
-            CastSpellOnTeam(BG_AV_BOSS_KILL_QUEST_SPELL, ALLIANCE); // this is a spell which finishes a quest where a player has to kill the boss
-            RewardReputationToTeam(BG_AV_FACTION_A, m_RepBoss, ALLIANCE);
-            RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_BOSS), ALLIANCE);
-            SendYellToAll(LANG_BG_AV_H_GENERAL_DEAD, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0));
-            EndBattleGround(ALLIANCE);
-            break;
-        case BG_AV_CAPTAIN_A:
-            if (IsActiveEvent(BG_AV_NodeEventCaptainDead_A, 0))
-                return;
-            RewardReputationToTeam(BG_AV_FACTION_H, m_RepCaptain, HORDE);
-            RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_CAPTAIN), HORDE);
-            UpdateScore(BG_TEAM_ALLIANCE, (-1) * BG_AV_RES_CAPTAIN);
-            // spawn destroyed aura
-            SpawnEvent(BG_AV_NodeEventCaptainDead_A, 0, true);
-            break;
-        case BG_AV_CAPTAIN_H:
-            if (IsActiveEvent(BG_AV_NodeEventCaptainDead_H, 0))
-                return;
-            RewardReputationToTeam(BG_AV_FACTION_A, m_RepCaptain, ALLIANCE);
-            RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_CAPTAIN), ALLIANCE);
-            UpdateScore(BG_TEAM_HORDE, (-1) * BG_AV_RES_CAPTAIN);
-            // spawn destroyed aura
-            SpawnEvent(BG_AV_NodeEventCaptainDead_H, 0, true);
-            break;
-        case BG_AV_MINE_BOSSES_NORTH:
-            ChangeMineOwner(BG_AV_NORTH_MINE, GetAVTeamIndexByTeamId(killer->GetTeam()));
-            break;
-        case BG_AV_MINE_BOSSES_SOUTH:
-            ChangeMineOwner(BG_AV_SOUTH_MINE, GetAVTeamIndexByTeamId(killer->GetTeam()));
-            break;
-    }
-}
-
-void BattleGroundAV::HandleQuestComplete(uint32 questid, Player *player)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-    BattleGroundAVTeamIndex teamIdx = GetAVTeamIndexByTeamId(player->GetTeam());
-    MANGOS_ASSERT(teamIdx != BG_AV_TEAM_NEUTRAL);
-
-    uint32 reputation = 0;                                  // reputation for the whole team (other reputation must be done in db)
-    // TODO add events (including quest not available anymore, next quest availabe, go/npc de/spawning)
-    sLog.outError("BattleGroundAV: Quest %i completed", questid);
-    switch(questid)
-    {
-        case BG_AV_QUEST_A_SCRAPS1:
-        case BG_AV_QUEST_A_SCRAPS2:
-        case BG_AV_QUEST_H_SCRAPS1:
-        case BG_AV_QUEST_H_SCRAPS2:
-            m_Team_QuestStatus[teamIdx][0] += 20;
-            reputation = 1;
-            if( m_Team_QuestStatus[teamIdx][0] == 500 || m_Team_QuestStatus[teamIdx][0] == 1000 || m_Team_QuestStatus[teamIdx][0] == 1500 ) //25,50,75 turn ins
-            {
-                DEBUG_LOG("BattleGroundAV: Quest %i completed starting with unit upgrading..", questid);
-                for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i)
-                    if (m_Nodes[i].Owner == teamIdx && m_Nodes[i].State == POINT_CONTROLLED)
-                        PopulateNode(i);
-            }
-            break;
-        case BG_AV_QUEST_A_COMMANDER1:
-        case BG_AV_QUEST_H_COMMANDER1:
-            m_Team_QuestStatus[teamIdx][1]++;
-            reputation = 1;
-            if (m_Team_QuestStatus[teamIdx][1] == 120)
-                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
-            break;
-        case BG_AV_QUEST_A_COMMANDER2:
-        case BG_AV_QUEST_H_COMMANDER2:
-            m_Team_QuestStatus[teamIdx][2]++;
-            reputation = 2;
-            if (m_Team_QuestStatus[teamIdx][2] == 60)
-                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
-            break;
-        case BG_AV_QUEST_A_COMMANDER3:
-        case BG_AV_QUEST_H_COMMANDER3:
-            m_Team_QuestStatus[teamIdx][3]++;
-            reputation = 5;
-            if (m_Team_QuestStatus[teamIdx][1] == 30)
-                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
-            break;
-        case BG_AV_QUEST_A_BOSS1:
-        case BG_AV_QUEST_H_BOSS1:
-            m_Team_QuestStatus[teamIdx][4] += 4;               // there are 2 quests where you can turn in 5 or 1 item.. ( + 4 cause +1 will be done some lines below)
-            reputation = 4;
-        case BG_AV_QUEST_A_BOSS2:
-        case BG_AV_QUEST_H_BOSS2:
-            m_Team_QuestStatus[teamIdx][4]++;
-            reputation += 1;
-            if (m_Team_QuestStatus[teamIdx][4] >= 200)
-                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
-            break;
-        case BG_AV_QUEST_A_NEAR_MINE:
-        case BG_AV_QUEST_H_NEAR_MINE:
-            m_Team_QuestStatus[teamIdx][5]++;
-            reputation = 2;
-            if (m_Team_QuestStatus[teamIdx][5] == 28)
-            {
-                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
-                if (m_Team_QuestStatus[teamIdx][6] == 7)
-                    DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here - ground assault ready", questid);
-            }
-            break;
-        case BG_AV_QUEST_A_OTHER_MINE:
-        case BG_AV_QUEST_H_OTHER_MINE:
-            m_Team_QuestStatus[teamIdx][6]++;
-            reputation = 3;
-            if (m_Team_QuestStatus[teamIdx][6] == 7)
-            {
-                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
-                if (m_Team_QuestStatus[teamIdx][5] == 20)
-                    DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here - ground assault ready", questid);
-            }
-            break;
-        case BG_AV_QUEST_A_RIDER_HIDE:
-        case BG_AV_QUEST_H_RIDER_HIDE:
-            m_Team_QuestStatus[teamIdx][7]++;
-            reputation = 1;
-            if (m_Team_QuestStatus[teamIdx][7] == 25)
-            {
-                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
-                if (m_Team_QuestStatus[teamIdx][8] == 25)
-                    DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here - rider assault ready", questid);
-            }
-            break;
-        case BG_AV_QUEST_A_RIDER_TAME:
-        case BG_AV_QUEST_H_RIDER_TAME:
-            m_Team_QuestStatus[teamIdx][8]++;
-            reputation = 1;
-            if (m_Team_QuestStatus[teamIdx][8] == 25)
-            {
-                DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here", questid);
-                if (m_Team_QuestStatus[teamIdx][7] == 25)
-                    DEBUG_LOG("BattleGroundAV: Quest %i completed (need to implement some events here - rider assault ready", questid);
-            }
-            break;
-        default:
-            DEBUG_LOG("BattleGroundAV: Quest %i completed but is not interesting for us", questid);
-            return;
-            break;
-    }
-    if (reputation)
-        RewardReputationToTeam((player->GetTeam() == ALLIANCE) ? BG_AV_FACTION_A : BG_AV_FACTION_H, reputation, player->GetTeam());
-}
-
-void BattleGroundAV::UpdateScore(BattleGroundTeamIndex teamIdx, int32 points )
-{
-    // note: to remove reinforcements points must be negative, for adding reinforcements points must be positive
-    MANGOS_ASSERT( teamIdx == BG_TEAM_ALLIANCE || teamIdx == BG_TEAM_HORDE);
-    m_TeamScores[teamIdx] += points;                      // m_TeamScores is int32 - so no problems here
-
-    if (points < 0)
-    {
-        if (m_TeamScores[teamIdx] < 1)
-        {
-            m_TeamScores[teamIdx] = 0;
-            // other team will win:
-            EndBattleGround((teamIdx == BG_TEAM_ALLIANCE)? HORDE : ALLIANCE);
-        }
-        else if (!m_IsInformedNearLose[teamIdx] && m_TeamScores[teamIdx] < BG_AV_SCORE_NEAR_LOSE)
-        {
-            SendMessageToAll((teamIdx == BG_TEAM_HORDE) ? LANG_BG_AV_H_NEAR_LOSE : LANG_BG_AV_A_NEAR_LOSE, CHAT_MSG_BG_SYSTEM_NEUTRAL);
-            PlaySoundToAll(BG_AV_SOUND_NEAR_LOSE);
-            m_IsInformedNearLose[teamIdx] = true;
-        }
-    }
-    // must be called here, else it could display a negative value
-    UpdateWorldState(((teamIdx == BG_TEAM_HORDE) ? BG_AV_Horde_Score : BG_AV_Alliance_Score), m_TeamScores[teamIdx]);
-}
-
-void BattleGroundAV::Update(uint32 diff)
-{
-    BattleGround::Update(diff);
-
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    // add points from mine owning, and look if the neutral team can reclaim the mine
-    for(uint8 mine = 0; mine < BG_AV_MAX_MINES; mine++)
-    {
-        if (m_Mine_Owner[mine] != BG_AV_TEAM_NEUTRAL)
-        {
-            m_Mine_Timer[mine] -=diff;
-            if (m_Mine_Timer[mine] <= 0)
-            {
-                UpdateScore(BattleGroundTeamIndex(m_Mine_Owner[mine]), 1);
-                m_Mine_Timer[mine] = BG_AV_MINE_TICK_TIMER;
-            }
-
-            if (m_Mine_Reclaim_Timer[mine] > diff)
-                m_Mine_Reclaim_Timer[mine] -= diff;
-            else
-                ChangeMineOwner(mine, BG_AV_TEAM_NEUTRAL);
-        }
-    }
-
-    // looks for all timers of the nodes and destroy the building (for graveyards the building wont get destroyed, it goes just to the other team
-    for(BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i)
-    {
-        if (m_Nodes[i].State == POINT_ASSAULTED)
-        {
-            if (m_Nodes[i].Timer > diff)
-                m_Nodes[i].Timer -= diff;
-            else
-                EventPlayerDestroyedPoint(i);
-        }
-    }
-}
-
-void BattleGroundAV::StartingEventCloseDoors()
-{
-    DEBUG_LOG("BattleGroundAV: entering state STATUS_WAIT_JOIN ...");
-}
-
-void BattleGroundAV::StartingEventOpenDoors()
-{
-    UpdateWorldState(BG_AV_SHOW_H_SCORE, 1);
-    UpdateWorldState(BG_AV_SHOW_A_SCORE, 1);
-
-    OpenDoorEvent(BG_EVENT_DOOR);
-
-    // Players that join battleground after start are not available to get achievement.
-    StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, BG_AV_EVENT_START_BATTLE);
-}
-
-void BattleGroundAV::AddPlayer(Player *plr)
-{
-    BattleGround::AddPlayer(plr);
-    // create score and add it to map, default values are set in constructor
-    BattleGroundAVScore* sc = new BattleGroundAVScore;
-    m_PlayerScores[plr->GetObjectGuid()] = sc;
-}
-
-void BattleGroundAV::EndBattleGround(Team winner)
-{
-    // calculate bonuskills for both teams:
-    uint32 tower_survived[BG_TEAMS_COUNT]  = {0, 0};
-    uint32 graves_owned[BG_TEAMS_COUNT]    = {0, 0};
-    uint32 mines_owned[BG_TEAMS_COUNT]     = {0, 0};
-    // towers all not destroyed:
-    for(BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_STONEHEART_BUNKER; ++i)
-        if (m_Nodes[i].State == POINT_CONTROLLED)
-            if (m_Nodes[i].TotalOwner == BG_AV_TEAM_ALLIANCE)
-                ++tower_survived[BG_TEAM_ALLIANCE];
-    for(BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_TOWER; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i)
-        if (m_Nodes[i].State == POINT_CONTROLLED)
-            if (m_Nodes[i].TotalOwner == BG_AV_TEAM_HORDE)
-                ++tower_survived[BG_TEAM_HORDE];
-
-    // graves all controlled
-    for(BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i)
-        if (m_Nodes[i].State == POINT_CONTROLLED && m_Nodes[i].Owner != BG_AV_TEAM_NEUTRAL)
-            ++graves_owned[m_Nodes[i].Owner];
-
-    for (uint32 i = 0; i < BG_AV_MAX_MINES; ++i)
-        if (m_Mine_Owner[i] != BG_AV_TEAM_NEUTRAL)
-            ++mines_owned[m_Mine_Owner[i]];
-
-    // now we have the values give the honor/reputation to the teams:
-    Team team[BG_TEAMS_COUNT]      = { ALLIANCE, HORDE };
-    uint32 faction[BG_TEAMS_COUNT]   = { BG_AV_FACTION_A, BG_AV_FACTION_H };
-    for (uint32 i = 0; i < BG_TEAMS_COUNT; i++)
-    {
-        if (tower_survived[i])
-        {
-            RewardReputationToTeam(faction[i], tower_survived[i] * m_RepSurviveTower, team[i]);
-            RewardHonorToTeam(GetBonusHonorFromKill(tower_survived[i] * BG_AV_KILL_SURVIVING_TOWER), team[i]);
-        }
-        DEBUG_LOG("BattleGroundAV: EndbattleGround: bgteam: %u towers:%u honor:%u rep:%u", i, tower_survived[i], GetBonusHonorFromKill(tower_survived[i] * BG_AV_KILL_SURVIVING_TOWER), tower_survived[i] * BG_AV_REP_SURVIVING_TOWER);
-        if (graves_owned[i])
-            RewardReputationToTeam(faction[i], graves_owned[i] * m_RepOwnedGrave, team[i]);
-        if (mines_owned[i])
-            RewardReputationToTeam(faction[i], mines_owned[i] * m_RepOwnedMine, team[i]);
-        // captain survived?:
-        if (!IsActiveEvent(BG_AV_NodeEventCaptainDead_A + GetTeamIndexByTeamId(team[i]), 0))
-        {
-            RewardReputationToTeam(faction[i], m_RepSurviveCaptain, team[i]);
-            RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_SURVIVING_CAPTAIN), team[i]);
-        }
-    }
-
-    // both teams:
-    if (m_HonorMapComplete)
-    {
-        RewardHonorToTeam(m_HonorMapComplete, ALLIANCE);
-        RewardHonorToTeam(m_HonorMapComplete, HORDE);
-    }
-    BattleGround::EndBattleGround(winner);
-}
-
-void BattleGroundAV::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
-{
-}
-
-void BattleGroundAV::HandleAreaTrigger(Player *Source, uint32 Trigger)
-{
-    // this is wrong way to implement these things. On official it done by gameobject spell cast.
-    switch(Trigger)
-    {
-        case 95:
-        case 2608:
-            if (Source->GetTeam() != ALLIANCE)
-                Source->GetSession()->SendNotification(LANG_BATTLEGROUND_ONLY_ALLIANCE_USE);
-            else
-                Source->LeaveBattleground();
-            break;
-        case 2606:
-            if (Source->GetTeam() != HORDE)
-                Source->GetSession()->SendNotification(LANG_BATTLEGROUND_ONLY_HORDE_USE);
-            else
-                Source->LeaveBattleground();
-            break;
-        case 3326:
-        case 3327:
-        case 3328:
-        case 3329:
-        case 3330:
-        case 3331:
-            //Source->Unmount();
-            break;
-        default:
-            DEBUG_LOG("BattleGroundAV: WARNING: Unhandled AreaTrigger in Battleground: %u", Trigger);
-//            Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
-            break;
-    }
-}
-
-void BattleGroundAV::UpdatePlayerScore(Player* Source, uint32 type, uint32 value)
-{
-
-    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetObjectGuid());
-    if(itr == m_PlayerScores.end())                         // player not found...
-        return;
-
-    switch(type)
-    {
-        case SCORE_GRAVEYARDS_ASSAULTED:
-            ((BattleGroundAVScore*)itr->second)->GraveyardsAssaulted += value;
-            break;
-        case SCORE_GRAVEYARDS_DEFENDED:
-            ((BattleGroundAVScore*)itr->second)->GraveyardsDefended += value;
-            break;
-        case SCORE_TOWERS_ASSAULTED:
-            ((BattleGroundAVScore*)itr->second)->TowersAssaulted += value;
-            break;
-        case SCORE_TOWERS_DEFENDED:
-            ((BattleGroundAVScore*)itr->second)->TowersDefended += value;
-            break;
-        case SCORE_SECONDARY_OBJECTIVES:
-            ((BattleGroundAVScore*)itr->second)->SecondaryObjectives += value;
-            break;
-        default:
-            BattleGround::UpdatePlayerScore(Source, type, value);
-            break;
-    }
-}
-
-void BattleGroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node)
-{
-    DEBUG_LOG("BattleGroundAV: player destroyed point node %i", node);
-
-    MANGOS_ASSERT(m_Nodes[node].Owner != BG_AV_TEAM_NEUTRAL)
-    BattleGroundTeamIndex ownerTeamIdx = BattleGroundTeamIndex(m_Nodes[node].Owner);
-    Team ownerTeam = ownerTeamIdx == BG_TEAM_ALLIANCE ? ALLIANCE : HORDE;
-
-    // despawn banner
-    DestroyNode(node);
-    PopulateNode(node);
-    UpdateNodeWorldState(node);
-
-    if (IsTower(node))
-    {
-        uint8 tmp = node - BG_AV_NODES_DUNBALDAR_SOUTH;
-        // despawn marshal (one of those guys protecting the boss)
-        SpawnEvent(BG_AV_MARSHAL_A_SOUTH + tmp, 0, false);
-
-        UpdateScore(GetOtherTeamIndex(ownerTeamIdx), (-1) * BG_AV_RES_TOWER);
-        RewardReputationToTeam((ownerTeam == ALLIANCE) ? BG_AV_FACTION_A : BG_AV_FACTION_H, m_RepTowerDestruction, ownerTeam);
-        RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_TOWER), ownerTeam);
-        SendYell2ToAll(LANG_BG_AV_TOWER_TAKEN, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0), GetNodeName(node), (ownerTeam == ALLIANCE) ? LANG_BG_ALLY : LANG_BG_HORDE);
-    }
-    else
-    {
-        SendYell2ToAll(LANG_BG_AV_GRAVE_TAKEN, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0), GetNodeName(node), (ownerTeam == ALLIANCE) ? LANG_BG_ALLY : LANG_BG_HORDE);
-    }
-}
-
-void BattleGroundAV::ChangeMineOwner(uint8 mine, BattleGroundAVTeamIndex teamIdx)
-{
-    m_Mine_Timer[mine] = BG_AV_MINE_TICK_TIMER;
-    // TODO implement quest 7122
-    // mine=0 northmine, mine=1 southmine
-    // TODO changing the owner should result in setting respawntime to infinite for current creatures (they should fight the new ones), spawning new mine owners creatures and changing the chest - objects so that the current owning team can use them
-    MANGOS_ASSERT(mine == BG_AV_NORTH_MINE || mine == BG_AV_SOUTH_MINE);
-    if (m_Mine_Owner[mine] == teamIdx)
-        return;
-
-    m_Mine_PrevOwner[mine] = m_Mine_Owner[mine];
-    m_Mine_Owner[mine] = teamIdx;
-
-    SendMineWorldStates(mine);
-
-    SpawnEvent(BG_AV_MINE_EVENT + mine, teamIdx, true);
-    SpawnEvent(BG_AV_MINE_BOSSES + mine, teamIdx, true);
-
-    if (teamIdx != BG_AV_TEAM_NEUTRAL)
-    {
-        PlaySoundToAll((teamIdx == BG_AV_TEAM_ALLIANCE) ? BG_AV_SOUND_ALLIANCE_GOOD : BG_AV_SOUND_HORDE_GOOD);
-        m_Mine_Reclaim_Timer[mine] = BG_AV_MINE_RECLAIM_TIMER;
-        SendYell2ToAll(LANG_BG_AV_MINE_TAKEN , LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0),
-            (teamIdx == BG_AV_TEAM_ALLIANCE ) ? LANG_BG_ALLY : LANG_BG_HORDE,
-            (mine == BG_AV_NORTH_MINE) ? LANG_BG_AV_MINE_NORTH : LANG_BG_AV_MINE_SOUTH);
-    }
-}
-
-bool BattleGroundAV::PlayerCanDoMineQuest(int32 GOId, Team team)
-{
-    if (GOId == BG_AV_OBJECTID_MINE_N)
-        return (m_Mine_Owner[BG_AV_NORTH_MINE] == GetAVTeamIndexByTeamId(team));
-    if (GOId == BG_AV_OBJECTID_MINE_S)
-        return (m_Mine_Owner[BG_AV_SOUTH_MINE] == GetAVTeamIndexByTeamId(team));
-    return true;                                            // cause it's no mine'object it is ok if this is true
-}
-
-/// will spawn and despawn creatures around a node
-/// more a wrapper around spawnevent cause graveyards are special
-void BattleGroundAV::PopulateNode(BG_AV_Nodes node)
-{
-    BattleGroundAVTeamIndex teamIdx = m_Nodes[node].Owner;
-    if (IsGrave(node) && teamIdx != BG_AV_TEAM_NEUTRAL)
-    {
-        uint32 graveDefenderType;
-        if (m_Team_QuestStatus[teamIdx][0] < 500 )
-            graveDefenderType = 0;
-        else if (m_Team_QuestStatus[teamIdx][0] < 1000 )
-            graveDefenderType = 1;
-        else if (m_Team_QuestStatus[teamIdx][0] < 1500 )
-            graveDefenderType = 2;
-        else
-            graveDefenderType = 3;
-
-        if (m_Nodes[node].State == POINT_CONTROLLED) // we can spawn the current owner event
-            SpawnEvent(BG_AV_NODES_MAX + node, teamIdx * BG_AV_MAX_GRAVETYPES + graveDefenderType, true);
-        else // we despawn the event from the prevowner
-            SpawnEvent(BG_AV_NODES_MAX + node, m_Nodes[node].PrevOwner * BG_AV_MAX_GRAVETYPES + graveDefenderType, false);
-    }
-    SpawnEvent(node, (teamIdx * BG_AV_MAX_STATES) + m_Nodes[node].State, true);
-}
-
-/// called when using a banner
-void BattleGroundAV::EventPlayerClickedOnFlag(Player *source, GameObject* target_obj)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-    DEBUG_LOG("BattleGroundAV: using gameobject %i", target_obj->GetEntry());
-    uint8 event = (sBattleGroundMgr.GetGameObjectEventIndex(target_obj->GetGUIDLow())).event1;
-    if (event >= BG_AV_NODES_MAX)                           // not a node
-        return;
-    BG_AV_Nodes node = BG_AV_Nodes(event);
-    switch ((sBattleGroundMgr.GetGameObjectEventIndex(target_obj->GetGUIDLow())).event2 % BG_AV_MAX_STATES)
-    {
-        case POINT_CONTROLLED:
-            EventPlayerAssaultsPoint(source, node);
-            break;
-        case POINT_ASSAULTED:
-            EventPlayerDefendsPoint(source, node);
-            break;
-        default:
-            break;
-    }
-}
-
-void BattleGroundAV::EventPlayerDefendsPoint(Player* player, BG_AV_Nodes node)
-{
-    MANGOS_ASSERT(GetStatus() == STATUS_IN_PROGRESS);
-
-    BattleGroundTeamIndex teamIdx = GetTeamIndexByTeamId(player->GetTeam());
-
-    if (m_Nodes[node].Owner == BattleGroundAVTeamIndex(teamIdx) || m_Nodes[node].State != POINT_ASSAULTED)
-        return;
-    if( m_Nodes[node].TotalOwner == BG_AV_TEAM_NEUTRAL )    // initial snowfall capture
-    {
-        // until snowfall doesn't belong to anyone it is better handled in assault - code (best would be to have a special function
-        // for neutral nodes.. but doing this just for snowfall will be a bit to much i think
-        MANGOS_ASSERT(node == BG_AV_NODES_SNOWFALL_GRAVE);  // currently the only neutral grave
-        EventPlayerAssaultsPoint(player, node);
-        return;
-    }
-
-    DEBUG_LOG("BattleGroundAV: player defends node: %i", node);
-    if (m_Nodes[node].PrevOwner != BattleGroundAVTeamIndex(teamIdx))
-    {
-        sLog.outError("BattleGroundAV: player defends point which doesn't belong to his team %i", node);
-        return;
-    }
-
-    DefendNode(node, teamIdx);                              // set the right variables for nodeinfo
-    PopulateNode(node);                                     // spawn node-creatures (defender for example)
-    UpdateNodeWorldState(node);                             // send new mapicon to the player
-
-    if (IsTower(node))
-    {
-        SendYell2ToAll( LANG_BG_AV_TOWER_DEFENDED, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0),
-            GetNodeName(node),
-            ( teamIdx == BG_TEAM_ALLIANCE ) ? LANG_BG_ALLY:LANG_BG_HORDE);
-        UpdatePlayerScore(player, SCORE_TOWERS_DEFENDED, 1);
-        PlaySoundToAll(BG_AV_SOUND_BOTH_TOWER_DEFEND);
-    }
-    else
-    {
-        SendYell2ToAll(LANG_BG_AV_GRAVE_DEFENDED, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0),
-            GetNodeName(node),
-            ( teamIdx == BG_TEAM_ALLIANCE ) ? LANG_BG_ALLY:LANG_BG_HORDE);
-        UpdatePlayerScore(player, SCORE_GRAVEYARDS_DEFENDED, 1);
-    // update the statistic for the defending player
-        PlaySoundToAll((teamIdx == BG_TEAM_ALLIANCE)?BG_AV_SOUND_ALLIANCE_GOOD:BG_AV_SOUND_HORDE_GOOD);
-    }
-}
-
-void BattleGroundAV::EventPlayerAssaultsPoint(Player* player, BG_AV_Nodes node)
-{
-    // TODO implement quest 7101, 7081
-    BattleGroundTeamIndex teamIdx  = GetTeamIndexByTeamId(player->GetTeam());
-    DEBUG_LOG("BattleGroundAV: player assaults node %i", node);
-    if (m_Nodes[node].Owner == BattleGroundAVTeamIndex(teamIdx) || BattleGroundAVTeamIndex(teamIdx) == m_Nodes[node].TotalOwner)
-        return;
-
-    AssaultNode(node, teamIdx);                                // update nodeinfo variables
-    UpdateNodeWorldState(node);                             // send mapicon
-    PopulateNode(node);
-
-    if (IsTower(node))
-    {
-        SendYell2ToAll(LANG_BG_AV_TOWER_ASSAULTED, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0),
-            GetNodeName(node),
-            ( teamIdx == BG_TEAM_ALLIANCE ) ? LANG_BG_ALLY:LANG_BG_HORDE);
-        UpdatePlayerScore(player, SCORE_TOWERS_ASSAULTED, 1);
-    }
-    else
-    {
-        SendYell2ToAll(LANG_BG_AV_GRAVE_ASSAULTED, LANG_UNIVERSAL, GetSingleCreatureGuid(BG_AV_HERALD, 0),
-            GetNodeName(node),
-            ( teamIdx == BG_TEAM_ALLIANCE ) ? LANG_BG_ALLY:LANG_BG_HORDE);
-        // update the statistic for the assaulting player
-        UpdatePlayerScore(player, SCORE_GRAVEYARDS_ASSAULTED, 1);
-    }
-
-    PlaySoundToAll((teamIdx == BG_TEAM_ALLIANCE) ? BG_AV_SOUND_ALLIANCE_ASSAULTS : BG_AV_SOUND_HORDE_ASSAULTS);
-}
-
-void BattleGroundAV::FillInitialWorldStates(WorldPacket& data, uint32& count)
-{
-    bool stateok;
-    for (uint32 i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i)
-    {
-        for (uint8 j = 0; j < BG_AV_MAX_STATES; j++)
-        {
-            stateok = (m_Nodes[i].State == j);
-            FillInitialWorldState(data, count, BG_AV_NodeWorldStates[i][GetWorldStateType(j, BG_AV_TEAM_ALLIANCE)],
-                m_Nodes[i].Owner == BG_AV_TEAM_ALLIANCE && stateok);
-            FillInitialWorldState(data, count, BG_AV_NodeWorldStates[i][GetWorldStateType(j, BG_AV_TEAM_HORDE)],
-                m_Nodes[i].Owner == BG_AV_TEAM_HORDE && stateok);
-        }
-    }
-
-    if( m_Nodes[BG_AV_NODES_SNOWFALL_GRAVE].Owner == BG_AV_TEAM_NEUTRAL )   // cause neutral teams aren't handled generic
-        FillInitialWorldState(data, count, AV_SNOWFALL_N, 1);
-
-    FillInitialWorldState(data, count, BG_AV_Alliance_Score, m_TeamScores[BG_TEAM_ALLIANCE]);
-    FillInitialWorldState(data, count, BG_AV_Horde_Score,    m_TeamScores[BG_TEAM_HORDE]);
-    if( GetStatus() == STATUS_IN_PROGRESS )                 // only if game is running the teamscores are displayed
-    {
-        FillInitialWorldState(data, count, BG_AV_SHOW_A_SCORE, 1);
-        FillInitialWorldState(data, count, BG_AV_SHOW_H_SCORE, 1);
-    }
-    else
-    {
-        FillInitialWorldState(data, count, BG_AV_SHOW_A_SCORE, 0);
-        FillInitialWorldState(data, count, BG_AV_SHOW_H_SCORE, 0);
-    }
-
-    FillInitialWorldState(data, count, BG_AV_MineWorldStates[BG_AV_NORTH_MINE][m_Mine_Owner[BG_AV_NORTH_MINE]], 1);
-    if (m_Mine_Owner[BG_AV_NORTH_MINE] != m_Mine_PrevOwner[BG_AV_NORTH_MINE])
-        FillInitialWorldState(data, count, BG_AV_MineWorldStates[BG_AV_NORTH_MINE][m_Mine_PrevOwner[BG_AV_NORTH_MINE]], 0);
-
-    FillInitialWorldState(data, count, BG_AV_MineWorldStates[BG_AV_SOUTH_MINE][m_Mine_Owner[BG_AV_SOUTH_MINE]], 1);
-    if (m_Mine_Owner[BG_AV_SOUTH_MINE] != m_Mine_PrevOwner[BG_AV_SOUTH_MINE])
-        FillInitialWorldState(data, count, BG_AV_MineWorldStates[BG_AV_SOUTH_MINE][m_Mine_PrevOwner[BG_AV_SOUTH_MINE]], 0);
-}
-
-void BattleGroundAV::UpdateNodeWorldState(BG_AV_Nodes node)
-{
-    UpdateWorldState(BG_AV_NodeWorldStates[node][GetWorldStateType(m_Nodes[node].State,m_Nodes[node].Owner)], 1);
-    if( m_Nodes[node].PrevOwner == BG_AV_TEAM_NEUTRAL )     // currently only snowfall is supported as neutral node
-        UpdateWorldState(AV_SNOWFALL_N, 0);
-    else
-        UpdateWorldState(BG_AV_NodeWorldStates[node][GetWorldStateType(m_Nodes[node].PrevState,m_Nodes[node].PrevOwner)], 0);
-}
-
-void BattleGroundAV::SendMineWorldStates(uint32 mine)
-{
-    MANGOS_ASSERT(mine == BG_AV_NORTH_MINE || mine == BG_AV_SOUTH_MINE);
-
-    UpdateWorldState(BG_AV_MineWorldStates[mine][m_Mine_Owner[mine]], 1);
-    if (m_Mine_Owner[mine] != m_Mine_PrevOwner[mine])
-        UpdateWorldState(BG_AV_MineWorldStates[mine][m_Mine_PrevOwner[mine]], 0);
-}
-
-WorldSafeLocsEntry const* BattleGroundAV::GetClosestGraveYard(Player *plr)
-{
-    float x = plr->GetPositionX();
-    float y = plr->GetPositionY();
-    BattleGroundAVTeamIndex teamIdx = GetAVTeamIndexByTeamId(plr->GetTeam());
-    WorldSafeLocsEntry const* good_entry = NULL;
-    if (GetStatus() == STATUS_IN_PROGRESS)
-    {
-        // Is there any occupied node for this team?
-        float mindist = 9999999.0f;
-        for(uint8 i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i)
-        {
-            if (m_Nodes[i].Owner != teamIdx || m_Nodes[i].State != POINT_CONTROLLED)
-                continue;
-            WorldSafeLocsEntry const * entry = sWorldSafeLocsStore.LookupEntry( BG_AV_GraveyardIds[i] );
-            if (!entry)
-                continue;
-            float dist = (entry->x - x) * (entry->x - x) + (entry->y - y) * (entry->y - y);
-            if (mindist > dist)
-            {
-                mindist = dist;
-                good_entry = entry;
-            }
-        }
-    }
-    // If not, place ghost in the starting-cave
-    if (!good_entry)
-        good_entry = sWorldSafeLocsStore.LookupEntry( BG_AV_GraveyardIds[teamIdx + 7] );
-
-    return good_entry;
-}
-
-uint32 BattleGroundAV::GetNodeName(BG_AV_Nodes node)
-{
-    switch (node)
-    {
-        case BG_AV_NODES_FIRSTAID_STATION:  return LANG_BG_AV_NODE_GRAVE_STORM_AID;
-        case BG_AV_NODES_DUNBALDAR_SOUTH:   return LANG_BG_AV_NODE_TOWER_DUN_S;
-        case BG_AV_NODES_DUNBALDAR_NORTH:   return LANG_BG_AV_NODE_TOWER_DUN_N;
-        case BG_AV_NODES_STORMPIKE_GRAVE:   return LANG_BG_AV_NODE_GRAVE_STORMPIKE;
-        case BG_AV_NODES_ICEWING_BUNKER:    return LANG_BG_AV_NODE_TOWER_ICEWING;
-        case BG_AV_NODES_STONEHEART_GRAVE:  return LANG_BG_AV_NODE_GRAVE_STONE;
-        case BG_AV_NODES_STONEHEART_BUNKER: return LANG_BG_AV_NODE_TOWER_STONE;
-        case BG_AV_NODES_SNOWFALL_GRAVE:    return LANG_BG_AV_NODE_GRAVE_SNOW;
-        case BG_AV_NODES_ICEBLOOD_TOWER:    return LANG_BG_AV_NODE_TOWER_ICE;
-        case BG_AV_NODES_ICEBLOOD_GRAVE:    return LANG_BG_AV_NODE_GRAVE_ICE;
-        case BG_AV_NODES_TOWER_POINT:       return LANG_BG_AV_NODE_TOWER_POINT;
-        case BG_AV_NODES_FROSTWOLF_GRAVE:   return LANG_BG_AV_NODE_GRAVE_FROST;
-        case BG_AV_NODES_FROSTWOLF_ETOWER:  return LANG_BG_AV_NODE_TOWER_FROST_E;
-        case BG_AV_NODES_FROSTWOLF_WTOWER:  return LANG_BG_AV_NODE_TOWER_FROST_W;
-        case BG_AV_NODES_FROSTWOLF_HUT:     return LANG_BG_AV_NODE_GRAVE_FROST_HUT;
-        default: return 0; break;
-    }
-}
-
-void BattleGroundAV::AssaultNode(BG_AV_Nodes node, BattleGroundTeamIndex teamIdx)
-{
-    MANGOS_ASSERT(m_Nodes[node].TotalOwner != BattleGroundAVTeamIndex(teamIdx));
-    MANGOS_ASSERT(m_Nodes[node].Owner != BattleGroundAVTeamIndex(teamIdx));
-    // only assault an assaulted node if no totalowner exists:
-    MANGOS_ASSERT(m_Nodes[node].State != POINT_ASSAULTED || m_Nodes[node].TotalOwner == BG_AV_TEAM_NEUTRAL);
-    // the timer gets another time, if the previous owner was 0 == Neutral
-    m_Nodes[node].Timer      = (m_Nodes[node].PrevOwner != BG_AV_TEAM_NEUTRAL) ? BG_AV_CAPTIME : BG_AV_SNOWFALL_FIRSTCAP;
-    m_Nodes[node].PrevOwner  = m_Nodes[node].Owner;
-    m_Nodes[node].Owner      = BattleGroundAVTeamIndex(teamIdx);
-    m_Nodes[node].PrevState  = m_Nodes[node].State;
-    m_Nodes[node].State      = POINT_ASSAULTED;
-}
-
-void BattleGroundAV::DestroyNode(BG_AV_Nodes node)
-{
-    MANGOS_ASSERT(m_Nodes[node].State == POINT_ASSAULTED);
-
-    m_Nodes[node].TotalOwner = m_Nodes[node].Owner;
-    m_Nodes[node].PrevOwner  = m_Nodes[node].Owner;
-    m_Nodes[node].PrevState  = m_Nodes[node].State;
-    m_Nodes[node].State      = POINT_CONTROLLED;
-    m_Nodes[node].Timer      = 0;
-}
-
-void BattleGroundAV::InitNode(BG_AV_Nodes node, BattleGroundAVTeamIndex teamIdx, bool tower)
-{
-    m_Nodes[node].TotalOwner = teamIdx;
-    m_Nodes[node].Owner      = teamIdx;
-    m_Nodes[node].PrevOwner  = teamIdx;
-    m_Nodes[node].State      = POINT_CONTROLLED;
-    m_Nodes[node].PrevState  = m_Nodes[node].State;
-    m_Nodes[node].State      = POINT_CONTROLLED;
-    m_Nodes[node].Timer      = 0;
-    m_Nodes[node].Tower      = tower;
-    m_ActiveEvents[node] = teamIdx * BG_AV_MAX_STATES + m_Nodes[node].State;
-    if (IsGrave(node))                                      // grave-creatures are special cause of a quest
-        m_ActiveEvents[node + BG_AV_NODES_MAX]  = teamIdx * BG_AV_MAX_GRAVETYPES;
-}
-
-void BattleGroundAV::DefendNode(BG_AV_Nodes node, BattleGroundTeamIndex teamIdx)
-{
-    MANGOS_ASSERT(m_Nodes[node].TotalOwner == BattleGroundAVTeamIndex(teamIdx));
-    MANGOS_ASSERT(m_Nodes[node].Owner != BattleGroundAVTeamIndex(teamIdx));
-    MANGOS_ASSERT(m_Nodes[node].State != POINT_CONTROLLED);
-    m_Nodes[node].PrevOwner  = m_Nodes[node].Owner;
-    m_Nodes[node].Owner      = BattleGroundAVTeamIndex(teamIdx);
-    m_Nodes[node].PrevState  = m_Nodes[node].State;
-    m_Nodes[node].State      = POINT_CONTROLLED;
-    m_Nodes[node].Timer      = 0;
-}
-
-void BattleGroundAV::Reset()
-{
-    BattleGround::Reset();
-    // set the reputation and honor variables:
-    bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID());
-
-    m_HonorMapComplete    = (isBGWeekend) ? BG_AV_KILL_MAP_COMPLETE_HOLIDAY : BG_AV_KILL_MAP_COMPLETE;
-    m_RepTowerDestruction = (isBGWeekend) ? BG_AV_REP_TOWER_HOLIDAY         : BG_AV_REP_TOWER;
-    m_RepCaptain          = (isBGWeekend) ? BG_AV_REP_CAPTAIN_HOLIDAY       : BG_AV_REP_CAPTAIN;
-    m_RepBoss             = (isBGWeekend) ? BG_AV_REP_BOSS_HOLIDAY          : BG_AV_REP_BOSS;
-    m_RepOwnedGrave       = (isBGWeekend) ? BG_AV_REP_OWNED_GRAVE_HOLIDAY   : BG_AV_REP_OWNED_GRAVE;
-    m_RepSurviveCaptain   = (isBGWeekend) ? BG_AV_REP_SURVIVING_CAPTAIN_HOLIDAY : BG_AV_REP_SURVIVING_CAPTAIN;
-    m_RepSurviveTower     = (isBGWeekend) ? BG_AV_REP_SURVIVING_TOWER_HOLIDAY : BG_AV_REP_SURVIVING_TOWER;
-    m_RepOwnedMine        = (isBGWeekend) ? BG_AV_REP_OWNED_MINE_HOLIDAY    : BG_AV_REP_OWNED_MINE;
-
-    for(uint8 i = 0; i < BG_TEAMS_COUNT; i++)
-    {
-        for(uint8 j = 0; j < 9; j++)                        // 9 quests getting tracked
-            m_Team_QuestStatus[i][j] = 0;
-        m_TeamScores[i]         = BG_AV_SCORE_INITIAL_POINTS;
-        m_IsInformedNearLose[i] = false;
-        m_ActiveEvents[BG_AV_NodeEventCaptainDead_A + i] = BG_EVENT_NONE;
-    }
-
-    for(uint8 i = 0; i < BG_AV_MAX_MINES; i++)
-    {
-        m_Mine_Owner[i] = BG_AV_TEAM_NEUTRAL;
-        m_Mine_PrevOwner[i] = m_Mine_Owner[i];
-        m_ActiveEvents[BG_AV_MINE_BOSSES+ i] = BG_AV_TEAM_NEUTRAL;
-        m_ActiveEvents[BG_AV_MINE_EVENT + i] = BG_AV_TEAM_NEUTRAL;
-        m_Mine_Timer[i] = BG_AV_MINE_TICK_TIMER;
-    }
-
-    m_ActiveEvents[BG_AV_CAPTAIN_A] = 0;
-    m_ActiveEvents[BG_AV_CAPTAIN_H] = 0;
-    m_ActiveEvents[BG_AV_HERALD] = 0;
-    m_ActiveEvents[BG_AV_BOSS_A] = 0;
-    m_ActiveEvents[BG_AV_BOSS_H] = 0;
-    for(BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i)   // towers
-        m_ActiveEvents[BG_AV_MARSHAL_A_SOUTH + i - BG_AV_NODES_DUNBALDAR_SOUTH] = 0;
-
-    for(BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_STONEHEART_GRAVE; ++i)   // alliance graves
-        InitNode(i, BG_AV_TEAM_ALLIANCE, false);
-    for(BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_STONEHEART_BUNKER; ++i)   // alliance towers
-        InitNode(i, BG_AV_TEAM_ALLIANCE, true);
-
-    for(BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_GRAVE; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i)        // horde graves
-        InitNode(i, BG_AV_TEAM_HORDE, false);
-    for(BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_TOWER; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i)     // horde towers
-        InitNode(i, BG_AV_TEAM_HORDE, true);
-
-    InitNode(BG_AV_NODES_SNOWFALL_GRAVE, BG_AV_TEAM_NEUTRAL, false);                            // give snowfall neutral owner
-
-}
diff --git a/src/game/BattleGroundBE.cpp b/src/game/BattleGroundBE.cpp
deleted file mode 100644
index 8ce5b1e9aa7..00000000000
--- a/src/game/BattleGroundBE.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Object.h"
-#include "Player.h"
-#include "BattleGround.h"
-#include "BattleGroundBE.h"
-#include "ObjectMgr.h"
-#include "WorldPacket.h"
-#include "Language.h"
-
-BattleGroundBE::BattleGroundBE()
-{
-    m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
-    m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
-    m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
-    m_StartDelayTimes[BG_STARTING_EVENT_FOURTH] = BG_START_DELAY_NONE;
-    //we must set messageIds
-    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_ARENA_ONE_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_ARENA_THIRTY_SECONDS;
-    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
-    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
-}
-
-BattleGroundBE::~BattleGroundBE()
-{
-}
-
-void BattleGroundBE::Update(uint32 diff)
-{
-    BattleGround::Update(diff);
-
-    /*if (GetStatus() == STATUS_IN_PROGRESS)
-    {
-        // update something
-    }*/
-}
-
-void BattleGroundBE::StartingEventCloseDoors()
-{
-}
-
-void BattleGroundBE::StartingEventOpenDoors()
-{
-    OpenDoorEvent(BG_EVENT_DOOR);
-}
-
-void BattleGroundBE::AddPlayer(Player *plr)
-{
-    BattleGround::AddPlayer(plr);
-    //create score and add it to map, default values are set in constructor
-    BattleGroundBEScore* sc = new BattleGroundBEScore;
-
-    m_PlayerScores[plr->GetObjectGuid()] = sc;
-
-    UpdateWorldState(0x9f1, GetAlivePlayersCountByTeam(ALLIANCE));
-    UpdateWorldState(0x9f0, GetAlivePlayersCountByTeam(HORDE));
-}
-
-void BattleGroundBE::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
-{
-    if (GetStatus() == STATUS_WAIT_LEAVE)
-        return;
-
-    UpdateWorldState(0x9f1, GetAlivePlayersCountByTeam(ALLIANCE));
-    UpdateWorldState(0x9f0, GetAlivePlayersCountByTeam(HORDE));
-
-    CheckArenaWinConditions();
-}
-
-void BattleGroundBE::HandleKillPlayer(Player *player, Player *killer)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    if (!killer)
-    {
-        sLog.outError("Killer player not found");
-        return;
-    }
-
-    BattleGround::HandleKillPlayer(player,killer);
-
-    UpdateWorldState(0x9f1, GetAlivePlayersCountByTeam(ALLIANCE));
-    UpdateWorldState(0x9f0, GetAlivePlayersCountByTeam(HORDE));
-
-    CheckArenaWinConditions();
-}
-
-bool BattleGroundBE::HandlePlayerUnderMap(Player *player)
-{
-    player->TeleportTo(GetMapId(),6238.930176f,262.963470f,0.889519f,player->GetOrientation(),false);
-    return true;
-}
-
-void BattleGroundBE::HandleAreaTrigger(Player *Source, uint32 Trigger)
-{
-    // this is wrong way to implement these things. On official it done by gameobject spell cast.
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    //uint32 SpellId = 0;
-    //uint64 buff_guid = 0;
-    switch(Trigger)
-    {
-        case 4538:                                          // buff trigger?
-            //buff_guid = m_BgObjects[BG_BE_OBJECT_BUFF_1];
-            break;
-        case 4539:                                          // buff trigger?
-            //buff_guid = m_BgObjects[BG_BE_OBJECT_BUFF_2];
-            break;
-        default:
-            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", Trigger);
-            Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
-            break;
-    }
-
-    //if (buff_guid)
-    //    HandleTriggerBuff(buff_guid,Source);
-}
-
-void BattleGroundBE::FillInitialWorldStates(WorldPacket &data, uint32& count)
-{
-    FillInitialWorldState(data, count, 0x9f1, GetAlivePlayersCountByTeam(ALLIANCE));
-    FillInitialWorldState(data, count, 0x9f0, GetAlivePlayersCountByTeam(HORDE));
-    FillInitialWorldState(data, count, 0x9f3, 1);
-}
-
-void BattleGroundBE::Reset()
-{
-    //call parent's class reset
-    BattleGround::Reset();
-}
-
-bool BattleGroundBE::SetupBattleGround()
-{
-    return true;
-}
-
-void BattleGroundBE::UpdatePlayerScore(Player* Source, uint32 type, uint32 value)
-{
-
-    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetObjectGuid());
-    if(itr == m_PlayerScores.end())                         // player not found...
-        return;
-
-    //there is nothing special in this score
-    BattleGround::UpdatePlayerScore(Source, type, value);
-
-}
-
-/*
-21:45:46 id:231310 [S2C] SMSG_INIT_WORLD_STATES (706 = 0x02C2) len: 86
-0000: 32 02 00 00 76 0e 00 00 00 00 00 00 09 00 f3 09  |  2...v...........
-0010: 00 00 01 00 00 00 f1 09 00 00 01 00 00 00 f0 09  |  ................
-0020: 00 00 02 00 00 00 d4 08 00 00 00 00 00 00 d8 08  |  ................
-0030: 00 00 00 00 00 00 d7 08 00 00 00 00 00 00 d6 08  |  ................
-0040: 00 00 00 00 00 00 d5 08 00 00 00 00 00 00 d3 08  |  ................
-0050: 00 00 00 00 00 00                                |  ......
-
-spell 32724 - Gold Team
-spell 32725 - Green Team
-35774 Gold Team
-35775 Green Team
-*/
diff --git a/src/game/BattleGroundDS.cpp b/src/game/BattleGroundDS.cpp
deleted file mode 100644
index 56fd4189363..00000000000
--- a/src/game/BattleGroundDS.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Player.h"
-#include "BattleGround.h"
-#include "BattleGroundDS.h"
-#include "Language.h"
-
-BattleGroundDS::BattleGroundDS()
-{
-
-    m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
-    m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
-    m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
-    m_StartDelayTimes[BG_STARTING_EVENT_FOURTH] = BG_START_DELAY_NONE;
-    //we must set messageIds
-    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_ARENA_ONE_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_ARENA_THIRTY_SECONDS;
-    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
-    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
-}
-
-BattleGroundDS::~BattleGroundDS()
-{
-
-}
-
-void BattleGroundDS::Update(uint32 diff)
-{
-    BattleGround::Update(diff);
-}
-
-void BattleGroundDS::StartingEventCloseDoors()
-{
-}
-
-void BattleGroundDS::StartingEventOpenDoors()
-{
-}
-
-void BattleGroundDS::AddPlayer(Player *plr)
-{
-    BattleGround::AddPlayer(plr);
-    //create score and add it to map, default values are set in constructor
-    BattleGroundDSScore* sc = new BattleGroundDSScore;
-
-    m_PlayerScores[plr->GetObjectGuid()] = sc;
-}
-
-void BattleGroundDS::RemovePlayer(Player * /*plr*/, ObjectGuid /*guid*/)
-{
-}
-
-void BattleGroundDS::HandleKillPlayer(Player* player, Player* killer)
-{
-    BattleGround::HandleKillPlayer(player, killer);
-}
-
-void BattleGroundDS::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
-{
-}
-
-bool BattleGroundDS::SetupBattleGround()
-{
-    return true;
-}
diff --git a/src/game/BattleGroundDS.h b/src/game/BattleGroundDS.h
deleted file mode 100644
index 84701d8950c..00000000000
--- a/src/game/BattleGroundDS.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef __BATTLEGROUNDDS_H
-#define __BATTLEGROUNDDS_H
-
-class BattleGround;
-
-class BattleGroundDSScore : public BattleGroundScore
-{
-    public:
-        BattleGroundDSScore() {};
-        virtual ~BattleGroundDSScore() {};
-        //TODO fix me
-};
-
-class BattleGroundDS : public BattleGround
-{
-    friend class BattleGroundMgr;
-
-    public:
-        BattleGroundDS();
-        ~BattleGroundDS();
-        void Update(uint32 diff);
-
-        /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
-        virtual void StartingEventCloseDoors();
-        virtual void StartingEventOpenDoors();
-
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
-        bool SetupBattleGround();
-        void HandleKillPlayer(Player* player, Player *killer);
-};
-#endif
diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp
deleted file mode 100644
index bdf38859c2e..00000000000
--- a/src/game/BattleGroundEY.cpp
+++ /dev/null
@@ -1,764 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Object.h"
-#include "Player.h"
-#include "BattleGround.h"
-#include "BattleGroundEY.h"
-#include "Creature.h"
-#include "ObjectMgr.h"
-#include "BattleGroundMgr.h"
-#include "Language.h"
-#include "WorldPacket.h"
-#include "Util.h"
-#include "MapManager.h"
-
-BattleGroundEY::BattleGroundEY()
-{
-    m_BuffChange = true;
-    m_BgObjects.resize(BG_EY_OBJECT_MAX);
-
-    m_Points_Trigger[BG_EY_NODE_FEL_REAVER]    = TR_FEL_REAVER_BUFF;
-    m_Points_Trigger[BG_EY_NODE_BLOOD_ELF]     = TR_BLOOD_ELF_BUFF;
-    m_Points_Trigger[BG_EY_NODE_DRAENEI_RUINS] = TR_DRAENEI_RUINS_BUFF;
-    m_Points_Trigger[BG_EY_NODE_MAGE_TOWER]    = TR_MAGE_TOWER_BUFF;
-
-    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
-    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_EY_START_ONE_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_EY_START_HALF_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_EY_HAS_BEGUN;
-}
-
-BattleGroundEY::~BattleGroundEY()
-{
-}
-
-void BattleGroundEY::Update(uint32 diff)
-{
-    BattleGround::Update(diff);
-
-    if (GetStatus() == STATUS_IN_PROGRESS)
-    {
-        m_PointAddingTimer -= diff;
-        if (m_PointAddingTimer <= 0)
-        {
-            m_PointAddingTimer = BG_EY_FPOINTS_TICK_TIME;
-            if (m_TeamPointsCount[BG_TEAM_ALLIANCE] > 0)
-                AddPoints(ALLIANCE, BG_EY_TickPoints[m_TeamPointsCount[BG_TEAM_ALLIANCE] - 1]);
-            if (m_TeamPointsCount[BG_TEAM_HORDE] > 0)
-                AddPoints(HORDE, BG_EY_TickPoints[m_TeamPointsCount[BG_TEAM_HORDE] - 1]);
-        }
-
-        if (m_FlagState == BG_EY_FLAG_STATE_WAIT_RESPAWN || m_FlagState == BG_EY_FLAG_STATE_ON_GROUND)
-        {
-            m_FlagsTimer -= diff;
-
-            if (m_FlagsTimer < 0)
-            {
-                m_FlagsTimer = 0;
-                if (m_FlagState == BG_EY_FLAG_STATE_WAIT_RESPAWN)
-                    RespawnFlag(true);
-                else
-                    RespawnFlagAfterDrop();
-            }
-        }
-
-        m_TowerCapCheckTimer -= diff;
-        if (m_TowerCapCheckTimer <= 0)
-        {
-            //check if player joined point
-            /*I used this order of calls, because although we will check if one player is in gameobject's distance 2 times
-              but we can count of players on current point in CheckSomeoneLeftPoint
-            */
-            CheckSomeoneJoinedPoint();
-            //check if player left point
-            CheckSomeoneLeftPoint();
-            UpdatePointStatuses();
-            m_TowerCapCheckTimer = BG_EY_FPOINTS_TICK_TIME;
-        }
-    }
-}
-
-void BattleGroundEY::StartingEventCloseDoors()
-{
-}
-
-void BattleGroundEY::StartingEventOpenDoors()
-{
-    // eye-doors are despawned, not opened
-    SpawnEvent(BG_EVENT_DOOR, 0, false);
-
-    for(uint32 i = 0; i < BG_EY_NODES_MAX; ++i)
-    {
-        //randomly spawn buff
-        uint8 buff = urand(0, 2);
-        SpawnBGObject(m_BgObjects[BG_EY_OBJECT_SPEEDBUFF_FEL_REAVER + buff + i * 3], RESPAWN_IMMEDIATELY);
-    }
-
-    // Players that join battleground after start are not eligible to get achievement.
-    StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, BG_EY_EVENT_START_BATTLE);
-}
-
-void BattleGroundEY::AddPoints(Team team, uint32 Points)
-{
-    BattleGroundTeamIndex team_index = GetTeamIndexByTeamId(team);
-    m_TeamScores[team_index] += Points;
-    m_HonorScoreTics[team_index] += Points;
-    if (m_HonorScoreTics[team_index] >= m_HonorTics )
-    {
-        RewardHonorToTeam(GetBonusHonorFromKill(1), team);
-        m_HonorScoreTics[team_index] -= m_HonorTics;
-    }
-    UpdateTeamScore(team);
-}
-
-void BattleGroundEY::CheckSomeoneJoinedPoint()
-{
-    for (uint8 i = 0; i < BG_EY_NODES_MAX; ++i)
-    {
-        uint8 j = 0;
-        while (j < m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].size())
-        {
-            Player *plr = sObjectMgr.GetPlayer(m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS][j]);
-            if (!plr)
-            {
-                sLog.outError("BattleGroundEY:CheckSomeoneJoinedPoint: %s not found!", m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS][j].GetString().c_str());
-                ++j;
-                continue;
-            }
-            if (plr->CanCaptureTowerPoint() &&
-                plr->IsWithinDist3d(BG_EY_NodePositions[i][0], BG_EY_NodePositions[i][1], BG_EY_NodePositions[i][2], BG_EY_POINT_RADIUS))
-            {
-                //player joined point!
-                //show progress bar
-                UpdateWorldStateForPlayer(PROGRESS_BAR_PERCENT_GREY, BG_EY_PROGRESS_BAR_PERCENT_GREY, plr);
-                UpdateWorldStateForPlayer(PROGRESS_BAR_STATUS, m_PointBarStatus[i], plr);
-                UpdateWorldStateForPlayer(PROGRESS_BAR_SHOW, BG_EY_PROGRESS_BAR_SHOW, plr);
-                //add player to point
-                m_PlayersNearPoint[i].push_back(m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS][j]);
-                //remove player from "free space"
-                m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].erase(m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].begin() + j);
-            }
-            else
-                ++j;
-        }
-    }
-}
-
-void BattleGroundEY::CheckSomeoneLeftPoint()
-{
-    //reset current point counts
-    for (uint8 i = 0; i < 2*BG_EY_NODES_MAX; ++i)
-        m_CurrentPointPlayersCount[i] = 0;
-    for(uint8 i = 0; i < BG_EY_NODES_MAX; ++i)
-    {
-        uint8 j = 0;
-        while (j < m_PlayersNearPoint[i].size())
-        {
-            Player *plr = sObjectMgr.GetPlayer(m_PlayersNearPoint[i][j]);
-            if (!plr)
-            {
-                sLog.outError("BattleGroundEY:CheckSomeoneLeftPoint %s not found!", m_PlayersNearPoint[i][j].GetString().c_str());
-                //move nonexistent player to "free space" - this will cause many error showing in log, but it is a very important bug
-                m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].push_back(m_PlayersNearPoint[i][j]);
-                m_PlayersNearPoint[i].erase(m_PlayersNearPoint[i].begin() + j);
-                ++j;
-                continue;
-            }
-            if (!plr->CanCaptureTowerPoint() ||
-                !plr->IsWithinDist3d(BG_EY_NodePositions[i][0], BG_EY_NodePositions[i][1], BG_EY_NodePositions[i][2], BG_EY_POINT_RADIUS))
-                //move player out of point (add him to players that are out of points
-            {
-                m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].push_back(m_PlayersNearPoint[i][j]);
-                m_PlayersNearPoint[i].erase(m_PlayersNearPoint[i].begin() + j);
-                UpdateWorldStateForPlayer(PROGRESS_BAR_SHOW, BG_EY_PROGRESS_BAR_DONT_SHOW, plr);
-            }
-            else
-            {
-                //player is neat flag, so update count:
-                m_CurrentPointPlayersCount[2 * i + GetTeamIndexByTeamId(plr->GetTeam())]++;
-                ++j;
-            }
-        }
-    }
-}
-
-void BattleGroundEY::UpdatePointStatuses()
-{
-    for(uint8 point = 0; point < BG_EY_NODES_MAX; ++point)
-    {
-        if (m_PlayersNearPoint[point].empty())
-            continue;
-        //count new point bar status:
-        m_PointBarStatus[point] += (m_CurrentPointPlayersCount[2 * point] - m_CurrentPointPlayersCount[2 * point + 1] < BG_EY_POINT_MAX_CAPTURERS_COUNT) ? m_CurrentPointPlayersCount[2 * point] - m_CurrentPointPlayersCount[2 * point + 1] : BG_EY_POINT_MAX_CAPTURERS_COUNT;
-
-        if (m_PointBarStatus[point] > BG_EY_PROGRESS_BAR_ALI_CONTROLLED)
-            //point is fully alliance's
-            m_PointBarStatus[point] = BG_EY_PROGRESS_BAR_ALI_CONTROLLED;
-        if (m_PointBarStatus[point] < BG_EY_PROGRESS_BAR_HORDE_CONTROLLED)
-            //point is fully horde's
-            m_PointBarStatus[point] = BG_EY_PROGRESS_BAR_HORDE_CONTROLLED;
-
-        Team pointOwnerTeamId;
-        //find which team should own this point
-        if (m_PointBarStatus[point] <= BG_EY_PROGRESS_BAR_NEUTRAL_LOW)
-            pointOwnerTeamId = HORDE;
-        else if (m_PointBarStatus[point] >= BG_EY_PROGRESS_BAR_NEUTRAL_HIGH)
-            pointOwnerTeamId = ALLIANCE;
-        else
-            pointOwnerTeamId = TEAM_NONE;
-
-        for (uint8 i = 0; i < m_PlayersNearPoint[point].size(); ++i)
-        {
-            if (Player *plr = sObjectMgr.GetPlayer(m_PlayersNearPoint[point][i]))
-            {
-                UpdateWorldStateForPlayer(PROGRESS_BAR_STATUS, m_PointBarStatus[point], plr);
-                                                            //if point owner changed we must evoke event!
-                if (pointOwnerTeamId != m_PointOwnedByTeam[point])
-                {
-                    //point was uncontrolled and player is from team which captured point
-                    if (m_PointState[point] == EY_POINT_STATE_UNCONTROLLED && plr->GetTeam() == pointOwnerTeamId)
-                        EventTeamCapturedPoint(plr, point);
-
-                    //point was under control and player isn't from team which controlled it
-                    if (m_PointState[point] == EY_POINT_UNDER_CONTROL && plr->GetTeam() != m_PointOwnedByTeam[point])
-                        EventTeamLostPoint(plr, point);
-                }
-            }
-        }
-    }
-}
-
-void BattleGroundEY::UpdateTeamScore(Team team)
-{
-    uint32 score = GetTeamScore(team);
-
-    if (score >= BG_EY_MAX_TEAM_SCORE)
-    {
-        score = BG_EY_MAX_TEAM_SCORE;
-        EndBattleGround(team);
-    }
-
-    if (team == ALLIANCE)
-        UpdateWorldState(EY_ALLIANCE_RESOURCES, score);
-    else
-        UpdateWorldState(EY_HORDE_RESOURCES, score);
-}
-
-void BattleGroundEY::EndBattleGround(Team winner)
-{
-    //win reward
-    if (winner == ALLIANCE)
-        RewardHonorToTeam(GetBonusHonorFromKill(1), ALLIANCE);
-    if (winner == HORDE)
-        RewardHonorToTeam(GetBonusHonorFromKill(1), HORDE);
-    //complete map reward
-    RewardHonorToTeam(GetBonusHonorFromKill(1), ALLIANCE);
-    RewardHonorToTeam(GetBonusHonorFromKill(1), HORDE);
-
-    BattleGround::EndBattleGround(winner);
-}
-
-void BattleGroundEY::UpdatePointsCount(Team team)
-{
-    if (team == ALLIANCE)
-        UpdateWorldState(EY_ALLIANCE_BASE, m_TeamPointsCount[BG_TEAM_ALLIANCE]);
-    else
-        UpdateWorldState(EY_HORDE_BASE, m_TeamPointsCount[BG_TEAM_HORDE]);
-}
-
-void BattleGroundEY::UpdatePointsIcons(Team team, uint32 Point)
-{
-    //we MUST firstly send 0, after that we can send 1!!!
-    if (m_PointState[Point] == EY_POINT_UNDER_CONTROL)
-    {
-        UpdateWorldState(PointsIconStruct[Point].WorldStateControlIndex, 0);
-        if (team == ALLIANCE)
-            UpdateWorldState(PointsIconStruct[Point].WorldStateAllianceControlledIndex, 1);
-        else
-            UpdateWorldState(PointsIconStruct[Point].WorldStateHordeControlledIndex, 1);
-    }
-    else
-    {
-        if (team == ALLIANCE)
-            UpdateWorldState(PointsIconStruct[Point].WorldStateAllianceControlledIndex, 0);
-        else
-            UpdateWorldState(PointsIconStruct[Point].WorldStateHordeControlledIndex, 0);
-        UpdateWorldState(PointsIconStruct[Point].WorldStateControlIndex, 1);
-    }
-}
-
-void BattleGroundEY::AddPlayer(Player *plr)
-{
-    BattleGround::AddPlayer(plr);
-    //create score and add it to map
-    BattleGroundEYScore* sc = new BattleGroundEYScore;
-
-    m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].push_back(plr->GetObjectGuid());
-
-    m_PlayerScores[plr->GetObjectGuid()] = sc;
-}
-
-void BattleGroundEY::RemovePlayer(Player *plr, ObjectGuid guid)
-{
-    // sometimes flag aura not removed :(
-    for (int j = BG_EY_NODES_MAX; j >= 0; --j)
-    {
-        for(size_t i = 0; i < m_PlayersNearPoint[j].size(); ++i)
-            if (m_PlayersNearPoint[j][i] == guid)
-                m_PlayersNearPoint[j].erase(m_PlayersNearPoint[j].begin() + i);
-    }
-    if (IsFlagPickedup())
-    {
-        if (m_FlagKeeper == guid)
-        {
-            if (plr)
-                EventPlayerDroppedFlag(plr);
-            else
-            {
-                ClearFlagPicker();
-                RespawnFlag(true);
-            }
-        }
-    }
-}
-
-void BattleGroundEY::HandleAreaTrigger(Player *Source, uint32 Trigger)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    if(!Source->isAlive())                                  //hack code, must be removed later
-        return;
-
-    switch(Trigger)
-    {
-        case TR_BLOOD_ELF_POINT:
-            if (m_PointState[BG_EY_NODE_BLOOD_ELF] == EY_POINT_UNDER_CONTROL && m_PointOwnedByTeam[BG_EY_NODE_BLOOD_ELF] == Source->GetTeam())
-                if (m_FlagState && GetFlagPickerGuid() == Source->GetObjectGuid())
-                    EventPlayerCapturedFlag(Source, BG_EY_NODE_BLOOD_ELF);
-            break;
-        case TR_FEL_REAVER_POINT:
-            if (m_PointState[BG_EY_NODE_FEL_REAVER] == EY_POINT_UNDER_CONTROL && m_PointOwnedByTeam[BG_EY_NODE_FEL_REAVER] == Source->GetTeam())
-                if (m_FlagState && GetFlagPickerGuid() == Source->GetObjectGuid())
-                    EventPlayerCapturedFlag(Source, BG_EY_NODE_FEL_REAVER);
-            break;
-        case TR_MAGE_TOWER_POINT:
-            if (m_PointState[BG_EY_NODE_MAGE_TOWER] == EY_POINT_UNDER_CONTROL && m_PointOwnedByTeam[BG_EY_NODE_MAGE_TOWER] == Source->GetTeam())
-                if (m_FlagState && GetFlagPickerGuid() == Source->GetObjectGuid())
-                    EventPlayerCapturedFlag(Source, BG_EY_NODE_MAGE_TOWER);
-            break;
-        case TR_DRAENEI_RUINS_POINT:
-            if (m_PointState[BG_EY_NODE_DRAENEI_RUINS] == EY_POINT_UNDER_CONTROL && m_PointOwnedByTeam[BG_EY_NODE_DRAENEI_RUINS] == Source->GetTeam())
-                if (m_FlagState && GetFlagPickerGuid() == Source->GetObjectGuid())
-                    EventPlayerCapturedFlag(Source, BG_EY_NODE_DRAENEI_RUINS);
-            break;
-        case 4512:
-        case 4515:
-        case 4517:
-        case 4519:
-        case 4530:
-        case 4531:
-        case 4568:
-        case 4569:
-        case 4570:
-        case 4571:
-        case 5866:
-            break;
-        default:
-            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", Trigger);
-            Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
-            break;
-    }
-}
-
-bool BattleGroundEY::SetupBattleGround()
-{
-    //buffs
-    for (int i = 0; i < BG_EY_NODES_MAX; ++i)
-    {
-        AreaTriggerEntry const* at = sAreaTriggerStore.LookupEntry(m_Points_Trigger[i]);
-        if (!at)
-        {
-            sLog.outError("BattleGroundEY: Unknown trigger: %u", m_Points_Trigger[i]);
-            continue;
-        }
-        if (!AddObject(BG_EY_OBJECT_SPEEDBUFF_FEL_REAVER + i * 3, Buff_Entries[0], at->x, at->y, at->z, 0.907571f, 0, 0, 0.438371f, 0.898794f, RESPAWN_ONE_DAY)
-            || !AddObject(BG_EY_OBJECT_SPEEDBUFF_FEL_REAVER + i * 3 + 1, Buff_Entries[1], at->x, at->y, at->z, 0.907571f, 0, 0, 0.438371f, 0.898794f, RESPAWN_ONE_DAY)
-            || !AddObject(BG_EY_OBJECT_SPEEDBUFF_FEL_REAVER + i * 3 + 2, Buff_Entries[2], at->x, at->y, at->z, 0.907571f, 0, 0, 0.438371f, 0.898794f, RESPAWN_ONE_DAY)
-            )
-            sLog.outError("BattleGroundEY: Cannot spawn buff");
-    }
-
-    return true;
-}
-
-void BattleGroundEY::Reset()
-{
-    //call parent's class reset
-    BattleGround::Reset();
-
-    m_TeamScores[BG_TEAM_ALLIANCE] = 0;
-    m_TeamScores[BG_TEAM_HORDE] = 0;
-    m_TeamPointsCount[BG_TEAM_ALLIANCE] = 0;
-    m_TeamPointsCount[BG_TEAM_HORDE] = 0;
-    m_HonorScoreTics[BG_TEAM_ALLIANCE] = 0;
-    m_HonorScoreTics[BG_TEAM_HORDE] = 0;
-    m_FlagState = BG_EY_FLAG_STATE_ON_BASE;
-    m_FlagKeeper.Clear();
-    m_DroppedFlagGuid.Clear();
-    m_PointAddingTimer = 0;
-    m_TowerCapCheckTimer = 0;
-    bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID());
-    m_HonorTics = (isBGWeekend) ? BG_EY_EYWeekendHonorTicks : BG_EY_NotEYWeekendHonorTicks;
-
-    for(uint8 i = 0; i < BG_EY_NODES_MAX; ++i)
-    {
-        m_PointOwnedByTeam[i] = TEAM_NONE;
-        m_PointState[i] = EY_POINT_STATE_UNCONTROLLED;
-        m_PointBarStatus[i] = BG_EY_PROGRESS_BAR_STATE_MIDDLE;
-        m_PlayersNearPoint[i].clear();
-        m_PlayersNearPoint[i].reserve(15);                  //tip size
-        m_ActiveEvents[i] = BG_EYE_NEUTRAL_TEAM;            // neutral team owns every node
-    }
-    // the flag in the middle is spawned at beginning
-    m_ActiveEvents[BG_EY_EVENT_CAPTURE_FLAG] = BG_EY_EVENT2_FLAG_CENTER;
-
-    m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].clear();
-    m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].reserve(30);
-}
-
-void BattleGroundEY::RespawnFlag(bool send_message)
-{
-    m_FlagState = BG_EY_FLAG_STATE_ON_BASE;
-    // will despawn captured flags at the node and spawn in center
-    SpawnEvent(BG_EY_EVENT_CAPTURE_FLAG, BG_EY_EVENT2_FLAG_CENTER, true);
-
-    if (send_message)
-    {
-        SendMessageToAll(LANG_BG_EY_RESETED_FLAG, CHAT_MSG_BG_SYSTEM_NEUTRAL);
-        PlaySoundToAll(BG_EY_SOUND_FLAG_RESET);             // flags respawned sound...
-    }
-
-    UpdateWorldState(NETHERSTORM_FLAG, 1);
-}
-
-void BattleGroundEY::RespawnFlagAfterDrop()
-{
-    RespawnFlag(true);
-
-    GameObject *obj = GetBgMap()->GetGameObject(GetDroppedFlagGuid());
-    if (obj)
-        obj->Delete();
-    else
-        sLog.outError("BattleGroundEY: Unknown dropped flag: %s", GetDroppedFlagGuid().GetString().c_str());
-
-    ClearDroppedFlagGuid();
-}
-
-void BattleGroundEY::HandleKillPlayer(Player *player, Player *killer)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    BattleGround::HandleKillPlayer(player, killer);
-    EventPlayerDroppedFlag(player);
-}
-
-void BattleGroundEY::EventPlayerDroppedFlag(Player *Source)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-    {
-        // if not running, do not cast things at the dropper player, neither send unnecessary messages
-        // just take off the aura
-        if (IsFlagPickedup() && GetFlagPickerGuid() == Source->GetObjectGuid())
-        {
-            ClearFlagPicker();
-            Source->RemoveAurasDueToSpell(BG_EY_NETHERSTORM_FLAG_SPELL);
-        }
-        return;
-    }
-
-    if (!IsFlagPickedup())
-        return;
-
-    if (GetFlagPickerGuid() != Source->GetObjectGuid())
-        return;
-
-    ClearFlagPicker();
-    Source->RemoveAurasDueToSpell(BG_EY_NETHERSTORM_FLAG_SPELL);
-    m_FlagState = BG_EY_FLAG_STATE_ON_GROUND;
-    m_FlagsTimer = BG_EY_FLAG_RESPAWN_TIME;
-    Source->CastSpell(Source, SPELL_RECENTLY_DROPPED_FLAG, true);
-    Source->CastSpell(Source, BG_EY_PLAYER_DROPPED_FLAG_SPELL, true);
-    //this does not work correctly :( (it should remove flag carrier name)
-    UpdateWorldState(NETHERSTORM_FLAG_STATE_HORDE, BG_EY_FLAG_STATE_WAIT_RESPAWN);
-    UpdateWorldState(NETHERSTORM_FLAG_STATE_ALLIANCE, BG_EY_FLAG_STATE_WAIT_RESPAWN);
-
-    if (Source->GetTeam() == ALLIANCE)
-        SendMessageToAll(LANG_BG_EY_DROPPED_FLAG, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL);
-    else
-        SendMessageToAll(LANG_BG_EY_DROPPED_FLAG, CHAT_MSG_BG_SYSTEM_HORDE, NULL);
-}
-
-void BattleGroundEY::EventPlayerClickedOnFlag(Player *Source, GameObject* target_obj)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS || IsFlagPickedup() || !Source->IsWithinDistInMap(target_obj, 10))
-        return;
-
-    if (Source->GetTeam() == ALLIANCE)
-    {
-        UpdateWorldState(NETHERSTORM_FLAG_STATE_ALLIANCE, BG_EY_FLAG_STATE_ON_PLAYER);
-        PlaySoundToAll(BG_EY_SOUND_FLAG_PICKED_UP_ALLIANCE);
-    }
-    else
-    {
-        UpdateWorldState(NETHERSTORM_FLAG_STATE_HORDE, BG_EY_FLAG_STATE_ON_PLAYER);
-        PlaySoundToAll(BG_EY_SOUND_FLAG_PICKED_UP_HORDE);
-    }
-
-    if (m_FlagState == BG_EY_FLAG_STATE_ON_BASE)
-        UpdateWorldState(NETHERSTORM_FLAG, 0);
-    m_FlagState = BG_EY_FLAG_STATE_ON_PLAYER;
-
-    // despawn center-flag
-    SpawnEvent(BG_EY_EVENT_CAPTURE_FLAG, BG_EY_EVENT2_FLAG_CENTER, false);
-
-    SetFlagPicker(Source->GetObjectGuid());
-    //get flag aura on player
-    Source->CastSpell(Source, BG_EY_NETHERSTORM_FLAG_SPELL, true);
-    Source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
-
-    if (Source->GetTeam() == ALLIANCE)
-        PSendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL, Source->GetName());
-    else
-        PSendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG, CHAT_MSG_BG_SYSTEM_HORDE, NULL, Source->GetName());
-}
-
-void BattleGroundEY::EventTeamLostPoint(Player *Source, uint32 Point)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    // neutral node
-    Team team = m_PointOwnedByTeam[Point];
-
-    if (!team)
-        return;
-
-    if (team == ALLIANCE)
-        --m_TeamPointsCount[BG_TEAM_ALLIANCE];
-    else
-        --m_TeamPointsCount[BG_TEAM_HORDE];
-
-    // it's important to set the OwnedBy before despawning spiritguides, else
-    // player won't get teleported away
-    m_PointOwnedByTeam[Point] = TEAM_NONE;
-    m_PointState[Point] = EY_POINT_NO_OWNER;
-
-    SpawnEvent(Point, BG_EYE_NEUTRAL_TEAM, true);           // will despawn alliance/horde
-
-    //buff isn't despawned
-
-    if (team == ALLIANCE)
-        SendMessageToAll(LoosingPointTypes[Point].MessageIdAlliance,CHAT_MSG_BG_SYSTEM_ALLIANCE, Source);
-    else
-        SendMessageToAll(LoosingPointTypes[Point].MessageIdHorde,CHAT_MSG_BG_SYSTEM_HORDE, Source);
-
-    UpdatePointsIcons(team, Point);
-    UpdatePointsCount(team);
-}
-
-void BattleGroundEY::EventTeamCapturedPoint(Player *Source, uint32 Point)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    Team team = Source->GetTeam();
-
-    ++m_TeamPointsCount[GetTeamIndexByTeamId(team)];
-    SpawnEvent(Point, GetTeamIndexByTeamId(team), true);
-
-    //buff isn't respawned
-
-    m_PointOwnedByTeam[Point] = team;
-    m_PointState[Point] = EY_POINT_UNDER_CONTROL;
-
-    if (team == ALLIANCE)
-        SendMessageToAll(CapturingPointTypes[Point].MessageIdAlliance,CHAT_MSG_BG_SYSTEM_ALLIANCE, Source);
-    else
-        SendMessageToAll(CapturingPointTypes[Point].MessageIdHorde,CHAT_MSG_BG_SYSTEM_HORDE, Source);
-
-    UpdatePointsIcons(team, Point);
-    UpdatePointsCount(team);
-}
-
-void BattleGroundEY::EventPlayerCapturedFlag(Player *Source, BG_EY_Nodes node)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS || GetFlagPickerGuid() != Source->GetObjectGuid())
-        return;
-
-    ClearFlagPicker();
-    m_FlagState = BG_EY_FLAG_STATE_WAIT_RESPAWN;
-    Source->RemoveAurasDueToSpell(BG_EY_NETHERSTORM_FLAG_SPELL);
-
-    Source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
-
-    if (Source->GetTeam() == ALLIANCE)
-        PlaySoundToAll(BG_EY_SOUND_FLAG_CAPTURED_ALLIANCE);
-    else
-        PlaySoundToAll(BG_EY_SOUND_FLAG_CAPTURED_HORDE);
-
-    SpawnEvent(BG_EY_EVENT_CAPTURE_FLAG, node, true);
-
-    m_FlagsTimer = BG_EY_FLAG_RESPAWN_TIME;
-
-    BattleGroundTeamIndex team_id;
-    if (Source->GetTeam() == ALLIANCE)
-    {
-        team_id = BG_TEAM_ALLIANCE;
-        SendMessageToAll(LANG_BG_EY_CAPTURED_FLAG_A, CHAT_MSG_BG_SYSTEM_ALLIANCE, Source);
-    }
-    else
-    {
-        team_id = BG_TEAM_HORDE;
-        SendMessageToAll(LANG_BG_EY_CAPTURED_FLAG_H, CHAT_MSG_BG_SYSTEM_HORDE, Source);
-    }
-
-    if (m_TeamPointsCount[team_id] > 0)
-        AddPoints(Source->GetTeam(), BG_EY_FlagPoints[m_TeamPointsCount[team_id] - 1]);
-
-    UpdatePlayerScore(Source, SCORE_FLAG_CAPTURES, 1);
-}
-
-void BattleGroundEY::UpdatePlayerScore(Player *Source, uint32 type, uint32 value)
-{
-    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetObjectGuid());
-    if(itr == m_PlayerScores.end())                         // player not found
-        return;
-
-    switch(type)
-    {
-        case SCORE_FLAG_CAPTURES:                           // flags captured
-            ((BattleGroundEYScore*)itr->second)->FlagCaptures += value;
-            break;
-        default:
-            BattleGround::UpdatePlayerScore(Source, type, value);
-            break;
-    }
-}
-
-void BattleGroundEY::FillInitialWorldStates(WorldPacket& data, uint32& count)
-{
-    FillInitialWorldState(data, count, EY_HORDE_BASE,    m_TeamPointsCount[BG_TEAM_HORDE]);
-    FillInitialWorldState(data, count, EY_ALLIANCE_BASE, m_TeamPointsCount[BG_TEAM_ALLIANCE]);
-    FillInitialWorldState(data, count, 0xab6, 0x0);
-    FillInitialWorldState(data, count, 0xab5, 0x0);
-    FillInitialWorldState(data, count, 0xab4, 0x0);
-    FillInitialWorldState(data, count, 0xab3, 0x0);
-    FillInitialWorldState(data, count, 0xab2, 0x0);
-    FillInitialWorldState(data, count, 0xab1, 0x0);
-    FillInitialWorldState(data, count, 0xab0, 0x0);
-    FillInitialWorldState(data, count, 0xaaf, 0x0);
-
-    FillInitialWorldState(data, count, DRAENEI_RUINS_HORDE_CONTROL, m_PointOwnedByTeam[BG_EY_NODE_DRAENEI_RUINS] == HORDE && m_PointState[BG_EY_NODE_DRAENEI_RUINS] == EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, DRAENEI_RUINS_ALLIANCE_CONTROL, m_PointOwnedByTeam[BG_EY_NODE_DRAENEI_RUINS] == ALLIANCE && m_PointState[BG_EY_NODE_DRAENEI_RUINS] == EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, DRAENEI_RUINS_UNCONTROL, m_PointState[BG_EY_NODE_DRAENEI_RUINS] != EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, MAGE_TOWER_ALLIANCE_CONTROL, m_PointOwnedByTeam[BG_EY_NODE_MAGE_TOWER] == ALLIANCE && m_PointState[BG_EY_NODE_MAGE_TOWER] == EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, MAGE_TOWER_HORDE_CONTROL, m_PointOwnedByTeam[BG_EY_NODE_MAGE_TOWER] == HORDE && m_PointState[BG_EY_NODE_MAGE_TOWER] == EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, MAGE_TOWER_UNCONTROL, m_PointState[BG_EY_NODE_MAGE_TOWER] != EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, FEL_REAVER_HORDE_CONTROL, m_PointOwnedByTeam[BG_EY_NODE_FEL_REAVER] == HORDE && m_PointState[BG_EY_NODE_FEL_REAVER] == EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, FEL_REAVER_ALLIANCE_CONTROL, m_PointOwnedByTeam[BG_EY_NODE_FEL_REAVER] == ALLIANCE && m_PointState[BG_EY_NODE_FEL_REAVER] == EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, FEL_REAVER_UNCONTROL, m_PointState[BG_EY_NODE_FEL_REAVER] != EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, BLOOD_ELF_HORDE_CONTROL, m_PointOwnedByTeam[BG_EY_NODE_BLOOD_ELF] == HORDE && m_PointState[BG_EY_NODE_BLOOD_ELF] == EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, BLOOD_ELF_ALLIANCE_CONTROL, m_PointOwnedByTeam[BG_EY_NODE_BLOOD_ELF] == ALLIANCE && m_PointState[BG_EY_NODE_BLOOD_ELF] == EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, BLOOD_ELF_UNCONTROL, m_PointState[BG_EY_NODE_BLOOD_ELF] != EY_POINT_UNDER_CONTROL);
-    FillInitialWorldState(data, count, NETHERSTORM_FLAG, m_FlagState == BG_EY_FLAG_STATE_ON_BASE);
-    FillInitialWorldState(data, count, 0xad2, 0x1);
-    FillInitialWorldState(data, count, 0xad1, 0x1);
-    FillInitialWorldState(data, count, 0xabe, GetTeamScore(HORDE));
-    FillInitialWorldState(data, count, 0xabd, GetTeamScore(ALLIANCE));
-    FillInitialWorldState(data, count, 0xa05, 0x8e);
-    FillInitialWorldState(data, count, 0xaa0, 0x0);
-    FillInitialWorldState(data, count, 0xa9f, 0x0);
-    FillInitialWorldState(data, count, 0xa9e, 0x0);
-    FillInitialWorldState(data, count, 0xc0d, 0x17b);
-}
-
-WorldSafeLocsEntry const *BattleGroundEY::GetClosestGraveYard(Player* player)
-{
-    uint32 g_id = 0;
-
-    switch(player->GetTeam())
-    {
-        case ALLIANCE: g_id = EY_GRAVEYARD_MAIN_ALLIANCE; break;
-        case HORDE:    g_id = EY_GRAVEYARD_MAIN_HORDE;    break;
-        default:       return NULL;
-    }
-
-    float distance, nearestDistance;
-
-    WorldSafeLocsEntry const* entry = NULL;
-    WorldSafeLocsEntry const* nearestEntry = NULL;
-    entry = sWorldSafeLocsStore.LookupEntry(g_id);
-    nearestEntry = entry;
-
-    if (!entry)
-    {
-        sLog.outError("BattleGroundEY: Not found the main team graveyard. Graveyard system isn't working!");
-        return NULL;
-    }
-
-    float plr_x = player->GetPositionX();
-    float plr_y = player->GetPositionY();
-    float plr_z = player->GetPositionZ();
-
-
-    distance = (entry->x - plr_x)*(entry->x - plr_x) + (entry->y - plr_y)*(entry->y - plr_y) + (entry->z - plr_z)*(entry->z - plr_z);
-    nearestDistance = distance;
-
-    for(uint8 i = 0; i < BG_EY_NODES_MAX; ++i)
-    {
-        if (m_PointOwnedByTeam[i]==player->GetTeam() && m_PointState[i]==EY_POINT_UNDER_CONTROL)
-        {
-            entry = sWorldSafeLocsStore.LookupEntry(CapturingPointTypes[i].GraveYardId);
-            if (!entry)
-                sLog.outError("BattleGroundEY: Not found graveyard: %u",CapturingPointTypes[i].GraveYardId);
-            else
-            {
-                distance = (entry->x - plr_x)*(entry->x - plr_x) + (entry->y - plr_y)*(entry->y - plr_y) + (entry->z - plr_z)*(entry->z - plr_z);
-                if (distance < nearestDistance)
-                {
-                    nearestDistance = distance;
-                    nearestEntry = entry;
-                }
-            }
-        }
-    }
-
-    return nearestEntry;
-}
-
-bool BattleGroundEY::IsAllNodesConrolledByTeam(Team team) const
-{
-    for(int i = 0; i < BG_EY_NODES_MAX; ++i)
-        if (m_PointState[i] != EY_POINT_UNDER_CONTROL || m_PointOwnedByTeam[i] != team)
-            return false;
-
-    return true;
-}
diff --git a/src/game/BattleGroundEY.h b/src/game/BattleGroundEY.h
deleted file mode 100644
index b3a69c9bb22..00000000000
--- a/src/game/BattleGroundEY.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __BATTLEGROUNDEY_H
-#define __BATTLEGROUNDEY_H
-
-#include "Language.h"
-
-class BattleGround;
-
-#define BG_EY_FLAG_RESPAWN_TIME         (10*IN_MILLISECONDS) //10 seconds
-#define BG_EY_FPOINTS_TICK_TIME         (2*IN_MILLISECONDS)  //2 seconds
-
-enum BG_EY_WorldStates
-{
-    EY_ALLIANCE_RESOURCES           = 2749,
-    EY_HORDE_RESOURCES              = 2750,
-    EY_ALLIANCE_BASE                = 2752,
-    EY_HORDE_BASE                   = 2753,
-    DRAENEI_RUINS_HORDE_CONTROL     = 2733,
-    DRAENEI_RUINS_ALLIANCE_CONTROL  = 2732,
-    DRAENEI_RUINS_UNCONTROL         = 2731,
-    MAGE_TOWER_ALLIANCE_CONTROL     = 2730,
-    MAGE_TOWER_HORDE_CONTROL        = 2729,
-    MAGE_TOWER_UNCONTROL            = 2728,
-    FEL_REAVER_HORDE_CONTROL        = 2727,
-    FEL_REAVER_ALLIANCE_CONTROL     = 2726,
-    FEL_REAVER_UNCONTROL            = 2725,
-    BLOOD_ELF_HORDE_CONTROL         = 2724,
-    BLOOD_ELF_ALLIANCE_CONTROL      = 2723,
-    BLOOD_ELF_UNCONTROL             = 2722,
-    PROGRESS_BAR_PERCENT_GREY       = 2720,                 //100 = empty (only grey), 0 = blue|red (no grey)
-    PROGRESS_BAR_STATUS             = 2719,                 //50 init!, 48 ... hordak bere .. 33 .. 0 = full 100% hordacky , 100 = full alliance
-    PROGRESS_BAR_SHOW               = 2718,                 //1 init, 0 druhy send - bez messagu, 1 = controlled alliance
-    NETHERSTORM_FLAG                = 2757,
-    //set to 2 when flag is picked up, and to 1 if it is dropped
-    NETHERSTORM_FLAG_STATE_ALLIANCE = 2769,
-    NETHERSTORM_FLAG_STATE_HORDE    = 2770
-};
-
-enum BG_EY_ProgressBarConsts
-{
-    BG_EY_POINT_MAX_CAPTURERS_COUNT     = 5,
-    BG_EY_POINT_RADIUS                  = 70,
-    BG_EY_PROGRESS_BAR_DONT_SHOW        = 0,
-    BG_EY_PROGRESS_BAR_SHOW             = 1,
-    BG_EY_PROGRESS_BAR_PERCENT_GREY     = 40,
-    BG_EY_PROGRESS_BAR_STATE_MIDDLE     = 50,
-    BG_EY_PROGRESS_BAR_HORDE_CONTROLLED = 0,
-    BG_EY_PROGRESS_BAR_NEUTRAL_LOW      = 30,
-    BG_EY_PROGRESS_BAR_NEUTRAL_HIGH     = 70,
-    BG_EY_PROGRESS_BAR_ALI_CONTROLLED   = 100
-};
-
-enum BG_EY_Sounds
-{
-    //strange ids, but sure about them
-    BG_EY_SOUND_FLAG_PICKED_UP_ALLIANCE = 8212,
-    BG_EY_SOUND_FLAG_CAPTURED_HORDE     = 8213,
-    BG_EY_SOUND_FLAG_PICKED_UP_HORDE    = 8174,
-    BG_EY_SOUND_FLAG_CAPTURED_ALLIANCE  = 8173,
-    BG_EY_SOUND_FLAG_RESET              = 8192
-};
-
-enum BG_EY_Spells
-{
-    BG_EY_NETHERSTORM_FLAG_SPELL        = 34976,
-    BG_EY_PLAYER_DROPPED_FLAG_SPELL     = 34991
-};
-
-enum EYBattleGroundPointsTrigger
-{
-    TR_BLOOD_ELF_POINT        = 4476,
-    TR_FEL_REAVER_POINT       = 4514,
-    TR_MAGE_TOWER_POINT       = 4516,
-    TR_DRAENEI_RUINS_POINT    = 4518,
-    TR_BLOOD_ELF_BUFF         = 4568,
-    TR_FEL_REAVER_BUFF        = 4569,
-    TR_MAGE_TOWER_BUFF        = 4570,
-    TR_DRAENEI_RUINS_BUFF     = 4571
-};
-
-enum EYBattleGroundGaveyards
-{
-    EY_GRAVEYARD_MAIN_ALLIANCE     = 1103,
-    EY_GRAVEYARD_MAIN_HORDE        = 1104,
-    EY_GRAVEYARD_FEL_REAVER        = 1105,
-    EY_GRAVEYARD_BLOOD_ELF         = 1106,
-    EY_GRAVEYARD_DRAENEI_RUINS     = 1107,
-    EY_GRAVEYARD_MAGE_TOWER        = 1108
-};
-
-enum BG_EY_Nodes
-{
-    BG_EY_NODE_FEL_REAVER         = 0,
-    BG_EY_NODE_BLOOD_ELF          = 1,
-    BG_EY_NODE_DRAENEI_RUINS      = 2,
-    BG_EY_NODE_MAGE_TOWER         = 3,
-
-    // special internal node
-    BG_EY_PLAYERS_OUT_OF_POINTS   = 4,                      // used for store out of node players data
-};
-
-#define BG_EY_NODES_MAX             4
-#define BG_EY_NODES_MAX_WITH_SPEIAL 5
-
-// node-events work like this: event1:nodeid, event2:state (0alliance,1horde,2neutral)
-#define BG_EYE_NEUTRAL_TEAM 2
-#define BG_EY_EVENT_CAPTURE_FLAG 4                          // event1=4, event2=nodeid or 4 for the default center spawn
-#define BG_EY_EVENT2_FLAG_CENTER 4                          // maximum node is 3 so 4 for center is ok
-// all other event2 are just nodeids, i won't define something here
-
-// x, y, z
-// used to check, when player is in range of a node
-const float BG_EY_NodePositions[BG_EY_NODES_MAX][3] = {
-    {2024.600708f, 1742.819580f, 1195.157715f},             // BG_EY_NODE_FEL_REAVER
-    {2050.493164f, 1372.235962f, 1194.563477f},             // BG_EY_NODE_BLOOD_ELF
-    {2301.010498f, 1386.931641f, 1197.183472f},             // BG_EY_NODE_DRAENEI_RUINS
-    {2282.121582f, 1760.006958f, 1189.707153f}              // BG_EY_NODE_MAGE_TOWER
-};
-
-enum EYBattleGroundObjectTypes
-{
-    //buffs
-    BG_EY_OBJECT_SPEEDBUFF_FEL_REAVER           = 1,
-    BG_EY_OBJECT_REGENBUFF_FEL_REAVER           = 2,
-    BG_EY_OBJECT_BERSERKBUFF_FEL_REAVER         = 3,
-    BG_EY_OBJECT_SPEEDBUFF_BLOOD_ELF            = 4,
-    BG_EY_OBJECT_REGENBUFF_BLOOD_ELF            = 5,
-    BG_EY_OBJECT_BERSERKBUFF_BLOOD_ELF          = 6,
-    BG_EY_OBJECT_SPEEDBUFF_DRAENEI_RUINS        = 7,
-    BG_EY_OBJECT_REGENBUFF_DRAENEI_RUINS        = 8,
-    BG_EY_OBJECT_BERSERKBUFF_DRAENEI_RUINS      = 9,
-    BG_EY_OBJECT_SPEEDBUFF_MAGE_TOWER           = 10,
-    BG_EY_OBJECT_REGENBUFF_MAGE_TOWER           = 11,
-    BG_EY_OBJECT_BERSERKBUFF_MAGE_TOWER         = 12,
-    BG_EY_OBJECT_MAX                            = 13
-};
-
-#define BG_EY_NotEYWeekendHonorTicks    330
-#define BG_EY_EYWeekendHonorTicks       200
-#define BG_EY_EVENT_START_BATTLE        13180
-
-enum BG_EY_Score
-{
-    BG_EY_WARNING_NEAR_VICTORY_SCORE    = 1400,
-    BG_EY_MAX_TEAM_SCORE                = 1600
-};
-
-enum BG_EY_FlagState
-{
-    BG_EY_FLAG_STATE_ON_BASE      = 0,
-    BG_EY_FLAG_STATE_WAIT_RESPAWN = 1,
-    BG_EY_FLAG_STATE_ON_PLAYER    = 2,
-    BG_EY_FLAG_STATE_ON_GROUND    = 3
-};
-
-enum EYBattleGroundPointState
-{
-    EY_POINT_NO_OWNER           = 0,
-    EY_POINT_STATE_UNCONTROLLED = 0,
-    EY_POINT_UNDER_CONTROL      = 3
-};
-
-struct BattleGroundEYPointIconsStruct
-{
-    BattleGroundEYPointIconsStruct(uint32 _WorldStateControlIndex, uint32 _WorldStateAllianceControlledIndex, uint32 _WorldStateHordeControlledIndex)
-        : WorldStateControlIndex(_WorldStateControlIndex), WorldStateAllianceControlledIndex(_WorldStateAllianceControlledIndex), WorldStateHordeControlledIndex(_WorldStateHordeControlledIndex) {}
-    uint32 WorldStateControlIndex;
-    uint32 WorldStateAllianceControlledIndex;
-    uint32 WorldStateHordeControlledIndex;
-};
-
-struct BattleGroundEYLoosingPointStruct
-{
-    BattleGroundEYLoosingPointStruct(uint32 _MessageIdAlliance, uint32 _MessageIdHorde)
-        : MessageIdAlliance(_MessageIdAlliance), MessageIdHorde(_MessageIdHorde)
-    {}
-
-    uint32 MessageIdAlliance;
-    uint32 MessageIdHorde;
-};
-
-struct BattleGroundEYCapturingPointStruct
-{
-    BattleGroundEYCapturingPointStruct(uint32 _MessageIdAlliance, uint32 _MessageIdHorde, uint32 _GraveYardId)
-        : MessageIdAlliance(_MessageIdAlliance), MessageIdHorde(_MessageIdHorde), GraveYardId(_GraveYardId)
-    {}
-    uint32 MessageIdAlliance;
-    uint32 MessageIdHorde;
-    uint32 GraveYardId;
-};
-
-const uint8  BG_EY_TickPoints[BG_EY_NODES_MAX] = {1, 2, 5, 10};
-const uint32 BG_EY_FlagPoints[BG_EY_NODES_MAX] = {75, 85, 100, 500};
-
-//constant arrays:
-const BattleGroundEYPointIconsStruct PointsIconStruct[BG_EY_NODES_MAX] =
-{
-    BattleGroundEYPointIconsStruct(FEL_REAVER_UNCONTROL, FEL_REAVER_ALLIANCE_CONTROL, FEL_REAVER_HORDE_CONTROL),
-    BattleGroundEYPointIconsStruct(BLOOD_ELF_UNCONTROL, BLOOD_ELF_ALLIANCE_CONTROL, BLOOD_ELF_HORDE_CONTROL),
-    BattleGroundEYPointIconsStruct(DRAENEI_RUINS_UNCONTROL, DRAENEI_RUINS_ALLIANCE_CONTROL, DRAENEI_RUINS_HORDE_CONTROL),
-    BattleGroundEYPointIconsStruct(MAGE_TOWER_UNCONTROL, MAGE_TOWER_ALLIANCE_CONTROL, MAGE_TOWER_HORDE_CONTROL)
-};
-const BattleGroundEYLoosingPointStruct LoosingPointTypes[BG_EY_NODES_MAX] =
-{
-    BattleGroundEYLoosingPointStruct(LANG_BG_EY_HAS_LOST_A_F_RUINS, LANG_BG_EY_HAS_LOST_H_F_RUINS),
-    BattleGroundEYLoosingPointStruct(LANG_BG_EY_HAS_LOST_A_B_TOWER, LANG_BG_EY_HAS_LOST_H_B_TOWER),
-    BattleGroundEYLoosingPointStruct(LANG_BG_EY_HAS_LOST_A_D_RUINS, LANG_BG_EY_HAS_LOST_H_D_RUINS),
-    BattleGroundEYLoosingPointStruct(LANG_BG_EY_HAS_LOST_A_M_TOWER, LANG_BG_EY_HAS_LOST_H_M_TOWER)
-};
-const BattleGroundEYCapturingPointStruct CapturingPointTypes[BG_EY_NODES_MAX] =
-{
-    BattleGroundEYCapturingPointStruct(LANG_BG_EY_HAS_TAKEN_A_F_RUINS, LANG_BG_EY_HAS_TAKEN_H_F_RUINS, EY_GRAVEYARD_FEL_REAVER),
-    BattleGroundEYCapturingPointStruct(LANG_BG_EY_HAS_TAKEN_A_B_TOWER, LANG_BG_EY_HAS_TAKEN_H_B_TOWER, EY_GRAVEYARD_BLOOD_ELF),
-    BattleGroundEYCapturingPointStruct(LANG_BG_EY_HAS_TAKEN_A_D_RUINS, LANG_BG_EY_HAS_TAKEN_H_D_RUINS, EY_GRAVEYARD_DRAENEI_RUINS),
-    BattleGroundEYCapturingPointStruct(LANG_BG_EY_HAS_TAKEN_A_M_TOWER, LANG_BG_EY_HAS_TAKEN_H_M_TOWER, EY_GRAVEYARD_MAGE_TOWER)
-};
-
-class BattleGroundEYScore : public BattleGroundScore
-{
-    public:
-        BattleGroundEYScore () : FlagCaptures(0) {};
-        virtual ~BattleGroundEYScore() {};
-        uint32 FlagCaptures;
-};
-
-class BattleGroundEY : public BattleGround
-{
-    friend class BattleGroundMgr;
-
-    public:
-        BattleGroundEY();
-        ~BattleGroundEY();
-        void Update(uint32 diff);
-
-        /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
-        virtual void StartingEventCloseDoors();
-        virtual void StartingEventOpenDoors();
-
-        /* BG Flags */
-        ObjectGuid const& GetFlagPickerGuid() const { return m_FlagKeeper; }
-        void SetFlagPicker(ObjectGuid guid) { m_FlagKeeper = guid; }
-        void ClearFlagPicker()              { m_FlagKeeper.Clear(); }
-        bool IsFlagPickedup() const         { return !m_FlagKeeper.IsEmpty(); }
-        uint8 GetFlagState() const          { return m_FlagState; }
-        void RespawnFlag(bool send_message);
-        void RespawnFlagAfterDrop();
-
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
-        void HandleKillPlayer(Player *player, Player *killer);
-        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
-        virtual bool SetupBattleGround();
-        virtual void Reset();
-        void UpdateTeamScore(Team team);
-        void EndBattleGround(Team winner);
-        void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count);
-        void SetDroppedFlagGuid(ObjectGuid guid)     { m_DroppedFlagGuid = guid;}
-        void ClearDroppedFlagGuid()                  { m_DroppedFlagGuid.Clear();}
-        ObjectGuid const& GetDroppedFlagGuid() const { return m_DroppedFlagGuid;}
-
-        /* Battleground Events */
-        virtual void EventPlayerClickedOnFlag(Player *Source, GameObject* target_obj);
-        virtual void EventPlayerDroppedFlag(Player *Source);
-
-        /* achievement req. */
-        bool IsAllNodesConrolledByTeam(Team team) const;
-
-    private:
-        void EventPlayerCapturedFlag(Player *Source, BG_EY_Nodes node);
-        void EventTeamCapturedPoint(Player *Source, uint32 Point);
-        void EventTeamLostPoint(Player *Source, uint32 Point);
-        void UpdatePointsCount(Team team);
-        void UpdatePointsIcons(Team team, uint32 Point);
-
-        /* Point status updating procedures */
-        void CheckSomeoneLeftPoint();
-        void CheckSomeoneJoinedPoint();
-        void UpdatePointStatuses();
-
-        /* Scorekeeping */
-        uint32 GetTeamScore(Team team) const { return m_TeamScores[GetTeamIndexByTeamId(team)]; }
-        void AddPoints(Team team, uint32 Points);
-
-        void RemovePoint(Team team, uint32 Points = 1) { m_TeamScores[GetTeamIndexByTeamId(team)] -= Points; }
-        void SetTeamPoint(Team team, uint32 Points = 0) { m_TeamScores[GetTeamIndexByTeamId(team)] = Points; }
-
-        uint32 m_HonorScoreTics[2];
-        uint32 m_TeamPointsCount[BG_TEAMS_COUNT];
-
-        uint32 m_Points_Trigger[BG_EY_NODES_MAX];
-
-        ObjectGuid m_FlagKeeper;                            // keepers guid
-        ObjectGuid m_DroppedFlagGuid;
-        uint8 m_FlagState;                                  // for checking flag state
-        int32 m_FlagsTimer;
-        int32 m_TowerCapCheckTimer;
-
-        Team m_PointOwnedByTeam[BG_EY_NODES_MAX];
-        uint8 m_PointState[BG_EY_NODES_MAX];
-        int32 m_PointBarStatus[BG_EY_NODES_MAX];
-        typedef std::vector<ObjectGuid> PlayersNearPointType;
-        PlayersNearPointType m_PlayersNearPoint[BG_EY_NODES_MAX_WITH_SPEIAL];
-        uint8 m_CurrentPointPlayersCount[2*BG_EY_NODES_MAX];
-
-        int32 m_PointAddingTimer;
-        uint32 m_HonorTics;
-};
-#endif
diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp
deleted file mode 100644
index f44e9f9c486..00000000000
--- a/src/game/BattleGroundHandler.cpp
+++ /dev/null
@@ -1,806 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Common.h"
-#include "SharedDefines.h"
-#include "WorldPacket.h"
-#include "Opcodes.h"
-#include "Log.h"
-#include "Player.h"
-#include "ObjectMgr.h"
-#include "WorldSession.h"
-#include "Object.h"
-#include "Chat.h"
-#include "BattleGroundMgr.h"
-#include "BattleGroundWS.h"
-#include "BattleGround.h"
-#include "ArenaTeam.h"
-#include "Language.h"
-#include "ScriptMgr.h"
-#include "World.h"
-
-void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket & recv_data)
-{
-    ObjectGuid guid;
-    recv_data >> guid;
-
-    DEBUG_LOG("WORLD: Recvd CMSG_BATTLEMASTER_HELLO Message from %s", guid.GetString().c_str());
-
-    Creature *pCreature = GetPlayer()->GetMap()->GetCreature(guid);
-
-    if (!pCreature)
-        return;
-
-    if (!pCreature->isBattleMaster())                       // it's not battlemaster
-        return;
-
-    // Stop the npc if moving
-    if (!pCreature->IsStopped())
-        pCreature->StopMoving();
-
-    BattleGroundTypeId bgTypeId = sBattleGroundMgr.GetBattleMasterBG(pCreature->GetEntry());
-
-    if (bgTypeId == BATTLEGROUND_TYPE_NONE)
-        return;
-
-    if (!_player->GetBGAccessByLevel(bgTypeId))
-    {
-        // temp, must be gossip message...
-        SendNotification(LANG_YOUR_BG_LEVEL_REQ_ERROR);
-        return;
-    }
-
-    SendBattlegGroundList(guid, bgTypeId);
-}
-
-void WorldSession::SendBattlegGroundList( ObjectGuid guid, BattleGroundTypeId bgTypeId )
-{
-    WorldPacket data;
-    sBattleGroundMgr.BuildBattleGroundListPacket(&data, guid, _player, bgTypeId, 0);
-    SendPacket( &data );
-}
-
-void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data )
-{
-    ObjectGuid guid;
-    uint32 bgTypeId_;
-    uint32 instanceId;
-    uint8 joinAsGroup;
-    bool isPremade = false;
-    Group * grp;
-
-    recv_data >> guid;                                      // battlemaster guid
-    recv_data >> bgTypeId_;                                 // battleground type id (DBC id)
-    recv_data >> instanceId;                                // instance id, 0 if First Available selected
-    recv_data >> joinAsGroup;                               // join as group
-
-    if (!sBattlemasterListStore.LookupEntry(bgTypeId_))
-    {
-        sLog.outError("Battleground: invalid bgtype (%u) received. possible cheater? player guid %u",bgTypeId_,_player->GetGUIDLow());
-        return;
-    }
-
-    BattleGroundTypeId bgTypeId = BattleGroundTypeId(bgTypeId_);
-
-    DEBUG_LOG( "WORLD: Recvd CMSG_BATTLEMASTER_JOIN Message from %s", guid.GetString().c_str());
-
-    // can do this, since it's battleground, not arena
-    BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, ARENA_TYPE_NONE);
-
-    // ignore if player is already in BG
-    if (_player->InBattleGround())
-        return;
-
-    // get bg instance or bg template if instance not found
-    BattleGround *bg = NULL;
-    if (instanceId)
-        bg = sBattleGroundMgr.GetBattleGroundThroughClientInstance(instanceId, bgTypeId);
-
-    if (!bg && !(bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId)))
-    {
-        sLog.outError("Battleground: no available bg / template found");
-        return;
-    }
-
-    // expected bracket entry
-    PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),_player->getLevel());
-    if (!bracketEntry)
-        return;
-
-    GroupJoinBattlegroundResult err;
-
-    // check queue conditions
-    if (!joinAsGroup)
-    {
-        // check Deserter debuff
-        if (!_player->CanJoinToBattleground())
-        {
-            WorldPacket data;
-            sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, ERR_GROUP_JOIN_BATTLEGROUND_DESERTERS);
-            _player->GetSession()->SendPacket(&data);
-            return;
-        }
-        // check if already in queue
-        if (_player->GetBattleGroundQueueIndex(bgQueueTypeId) < PLAYER_MAX_BATTLEGROUND_QUEUES)
-            //player is already in this queue
-            return;
-        // check if has free queue slots
-        if (!_player->HasFreeBattleGroundQueueId())
-            return;
-    }
-    else
-    {
-        grp = _player->GetGroup();
-        // no group found, error
-        if (!grp)
-            return;
-        if (grp->GetLeaderGuid() != _player->GetObjectGuid())
-            return;
-        err = grp->CanJoinBattleGroundQueue(bg, bgQueueTypeId, 0, bg->GetMaxPlayersPerTeam(), false, 0);
-        isPremade = sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH) &&
-            (grp->GetMembersCount() >= bg->GetMinPlayersPerTeam());
-    }
-    // if we're here, then the conditions to join a bg are met. We can proceed in joining.
-
-    // _player->GetGroup() was already checked, grp is already initialized
-    BattleGroundQueue& bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId];
-    if (joinAsGroup)
-    {
-        GroupQueueInfo* ginfo = NULL;
-        uint32 avgTime = 0;
-
-        if(err > 0)
-        {
-            DEBUG_LOG("Battleground: the following players are joining as group:");
-            ginfo = bgQueue.AddGroup(_player, grp, bgTypeId, bracketEntry, ARENA_TYPE_NONE, false, isPremade, 0);
-            avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry->GetBracketId());
-        }
-
-        for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
-        {
-            Player *member = itr->getSource();
-            if(!member)
-                continue;                                   // this should never happen
-
-            WorldPacket data;
-
-            if(err <= 0)
-            {
-                sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, err);
-                member->GetSession()->SendPacket(&data);
-                continue;
-            }
-
-            // add to queue
-            uint32 queueSlot = member->AddBattleGroundQueueId(bgQueueTypeId);
-
-            // send status packet (in queue)
-            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, ginfo->arenaType);
-            member->GetSession()->SendPacket(&data);
-            sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, err);
-            member->GetSession()->SendPacket(&data);
-            DEBUG_LOG("Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s",bgQueueTypeId,bgTypeId,member->GetGUIDLow(), member->GetName());
-        }
-        DEBUG_LOG("Battleground: group end");
-    }
-    else
-    {
-        GroupQueueInfo * ginfo = bgQueue.AddGroup(_player, NULL, bgTypeId, bracketEntry, ARENA_TYPE_NONE, false, isPremade, 0);
-        uint32 avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry->GetBracketId());
-        // already checked if queueSlot is valid, now just get it
-        uint32 queueSlot = _player->AddBattleGroundQueueId(bgQueueTypeId);
-
-        WorldPacket data;
-                                                            // send status packet (in queue)
-        sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, ginfo->arenaType);
-        SendPacket(&data);
-        DEBUG_LOG("Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s",bgQueueTypeId,bgTypeId,_player->GetGUIDLow(), _player->GetName());
-    }
-    sBattleGroundMgr.ScheduleQueueUpdate(0, ARENA_TYPE_NONE, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId());
-}
-
-void WorldSession::HandleBattleGroundPlayerPositionsOpcode( WorldPacket & /*recv_data*/ )
-{
-                                                            // empty opcode
-    DEBUG_LOG("WORLD: Recvd MSG_BATTLEGROUND_PLAYER_POSITIONS Message");
-
-    BattleGround *bg = _player->GetBattleGround();
-    if(!bg)                                                 // can't be received if player not in battleground
-        return;
-
-    switch( bg->GetTypeID() )
-    {
-        case BATTLEGROUND_WS:
-            {
-                uint32 count1 = 0;                          // always constant zero?
-                uint32 count2 = 0;                          // count of next fields
-
-                Player *ali_plr = sObjectMgr.GetPlayer(((BattleGroundWS*)bg)->GetAllianceFlagPickerGuid());
-                if (ali_plr)
-                    ++count2;
-
-                Player *horde_plr = sObjectMgr.GetPlayer(((BattleGroundWS*)bg)->GetHordeFlagPickerGuid());
-                if (horde_plr)
-                    ++count2;
-
-                WorldPacket data(MSG_BATTLEGROUND_PLAYER_POSITIONS, (4+4+16*count1+16*count2));
-                data << count1;                             // alliance flag holders count - obsolete, now always 0
-                /*for(uint8 i = 0; i < count1; ++i)
-                {
-                    data << ObjectGuid(0);                  // guid
-                    data << (float)0;                       // x
-                    data << (float)0;                       // y
-                }*/
-                data << count2;                             // horde flag holders count - obsolete, now count of next fields
-                if (ali_plr)
-                {
-                    data << ObjectGuid(ali_plr->GetObjectGuid());
-                    data << float(ali_plr->GetPositionX());
-                    data << float(ali_plr->GetPositionY());
-                }
-                if (horde_plr)
-                {
-                    data << ObjectGuid(horde_plr->GetObjectGuid());
-                    data << float(horde_plr->GetPositionX());
-                    data << float(horde_plr->GetPositionY());
-                }
-
-                SendPacket(&data);
-            }
-            break;
-        case BATTLEGROUND_EY:
-            //TODO : fix me!
-            break;
-        case BATTLEGROUND_AB:
-        case BATTLEGROUND_AV:
-            {
-                //for other BG types - send default
-                WorldPacket data(MSG_BATTLEGROUND_PLAYER_POSITIONS, (4+4));
-                data << uint32(0);
-                data << uint32(0);
-                SendPacket(&data);
-            }
-            break;
-        default:
-            //maybe it is sent also in arena - do nothing
-            break;
-    }
-}
-
-void WorldSession::HandlePVPLogDataOpcode( WorldPacket & /*recv_data*/ )
-{
-    DEBUG_LOG( "WORLD: Recvd MSG_PVP_LOG_DATA Message");
-
-    BattleGround *bg = _player->GetBattleGround();
-    if (!bg)
-        return;
-
-    // arena finish version will send in BattleGround::EndBattleGround directly
-    if (bg->isArena())
-        return;
-
-    WorldPacket data;
-    sBattleGroundMgr.BuildPvpLogDataPacket(&data, bg);
-    SendPacket(&data);
-
-    DEBUG_LOG( "WORLD: Sent MSG_PVP_LOG_DATA Message");
-}
-
-void WorldSession::HandleBattlefieldListOpcode( WorldPacket &recv_data )
-{
-    DEBUG_LOG( "WORLD: Recvd CMSG_BATTLEFIELD_LIST Message");
-
-    uint32 bgTypeId;
-    recv_data >> bgTypeId;                                  // id from DBC
-
-    uint8 fromWhere;
-    recv_data >> fromWhere;                                 // 0 - battlemaster (lua: ShowBattlefieldList), 1 - UI (lua: RequestBattlegroundInstanceInfo)
-
-    uint8 unk1;
-    recv_data >> unk1;                                      // unknown 3.2.2
-
-    BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(bgTypeId);
-    if (!bl)
-    {
-        sLog.outError("Battleground: invalid bgtype received.");
-        return;
-    }
-
-    WorldPacket data;
-    sBattleGroundMgr.BuildBattleGroundListPacket(&data, ObjectGuid(), _player, BattleGroundTypeId(bgTypeId), fromWhere);
-    SendPacket( &data );
-}
-
-void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
-{
-    DEBUG_LOG( "WORLD: Recvd CMSG_BATTLEFIELD_PORT Message");
-
-    uint8 type;                                             // arenatype if arena
-    uint8 unk2;                                             // unk, can be 0x0 (may be if was invited?) and 0x1
-    uint32 bgTypeId_;                                       // type id from dbc
-    uint16 unk;                                             // 0x1F90 constant?
-    uint8 action;                                           // enter battle 0x1, leave queue 0x0
-
-    recv_data >> type >> unk2 >> bgTypeId_ >> unk >> action;
-
-    if (!sBattlemasterListStore.LookupEntry(bgTypeId_))
-    {
-        sLog.outError("BattlegroundHandler: invalid bgtype (%u) received.", bgTypeId_);
-        return;
-    }
-
-    if (type && !IsArenaTypeValid(ArenaType(type)))
-    {
-        sLog.outError("BattlegroundHandler: Invalid CMSG_BATTLEFIELD_PORT received from player (%u), arena type wrong: %u.", _player->GetGUIDLow(), type);
-        return;
-    }
-
-    if (!_player->InBattleGroundQueue())
-    {
-        sLog.outError("BattlegroundHandler: Invalid CMSG_BATTLEFIELD_PORT received from player (%u), he is not in bg_queue.", _player->GetGUIDLow());
-        return;
-    }
-
-    //get GroupQueueInfo from BattleGroundQueue
-    BattleGroundTypeId bgTypeId = BattleGroundTypeId(bgTypeId_);
-    BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, ArenaType(type));
-    BattleGroundQueue& bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId];
-    //we must use temporary variable, because GroupQueueInfo pointer can be deleted in BattleGroundQueue::RemovePlayer() function
-    GroupQueueInfo ginfo;
-    if (!bgQueue.GetPlayerGroupInfoData(_player->GetObjectGuid(), &ginfo))
-    {
-        sLog.outError("BattlegroundHandler: itrplayerstatus not found.");
-        return;
-    }
-    // if action == 1, then instanceId is required
-    if (!ginfo.IsInvitedToBGInstanceGUID && action == 1)
-    {
-        sLog.outError("BattlegroundHandler: instance not found.");
-        return;
-    }
-
-    BattleGround *bg = sBattleGroundMgr.GetBattleGround(ginfo.IsInvitedToBGInstanceGUID, bgTypeId);
-
-    // bg template might and must be used in case of leaving queue, when instance is not created yet
-    if (!bg && action == 0)
-        bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
-    if (!bg)
-    {
-        sLog.outError("BattlegroundHandler: bg_template not found for type id %u.", bgTypeId);
-        return;
-    }
-
-    // expected bracket entry
-    PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),_player->getLevel());
-    if (!bracketEntry)
-        return;
-
-    //some checks if player isn't cheating - it is not exactly cheating, but we cannot allow it
-    if (action == 1 && ginfo.arenaType == ARENA_TYPE_NONE)
-    {
-        //if player is trying to enter battleground (not arena!) and he has deserter debuff, we must just remove him from queue
-        if (!_player->CanJoinToBattleground())
-        {
-            //send bg command result to show nice message
-            WorldPacket data2;
-            sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data2, ERR_GROUP_JOIN_BATTLEGROUND_DESERTERS);
-            _player->GetSession()->SendPacket(&data2);
-            action = 0;
-            DEBUG_LOG("Battleground: player %s (%u) has a deserter debuff, do not port him to battleground!", _player->GetName(), _player->GetGUIDLow());
-        }
-        //if player don't match battleground max level, then do not allow him to enter! (this might happen when player leveled up during his waiting in queue
-        if (_player->getLevel() > bg->GetMaxLevel())
-        {
-            sLog.outError("Battleground: Player %s (%u) has level (%u) higher than maxlevel (%u) of battleground (%u)! Do not port him to battleground!",
-                _player->GetName(), _player->GetGUIDLow(), _player->getLevel(), bg->GetMaxLevel(), bg->GetTypeID());
-            action = 0;
-        }
-    }
-    uint32 queueSlot = _player->GetBattleGroundQueueIndex(bgQueueTypeId);
-    WorldPacket data;
-    switch( action )
-    {
-        case 1:                                         // port to battleground
-            if (!_player->IsInvitedForBattleGroundQueueType(bgQueueTypeId))
-                return;                                 // cheating?
-
-            if (!_player->InBattleGround())
-                _player->SetBattleGroundEntryPoint();
-
-            // resurrect the player
-            if (!_player->isAlive())
-            {
-                _player->ResurrectPlayer(1.0f);
-                _player->SpawnCorpseBones();
-            }
-            // stop taxi flight at port
-            if (_player->IsTaxiFlying())
-            {
-                _player->GetMotionMaster()->MovementExpired();
-                _player->m_taxi.ClearTaxiDestinations();
-            }
-
-            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_IN_PROGRESS, 0, bg->GetStartTime(), bg->GetArenaType());
-            _player->GetSession()->SendPacket(&data);
-            // remove battleground queue status from BGmgr
-            bgQueue.RemovePlayer(_player->GetObjectGuid(), false);
-            // this is still needed here if battleground "jumping" shouldn't add deserter debuff
-            // also this is required to prevent stuck at old battleground after SetBattleGroundId set to new
-            if (BattleGround *currentBg = _player->GetBattleGround())
-                currentBg->RemovePlayerAtLeave(_player->GetObjectGuid(), false, true);
-
-            // set the destination instance id
-            _player->SetBattleGroundId(bg->GetInstanceID(), bgTypeId);
-            // set the destination team
-            _player->SetBGTeam(ginfo.GroupTeam);
-            // bg->HandleBeforeTeleportToBattleGround(_player);
-            sBattleGroundMgr.SendToBattleGround(_player, ginfo.IsInvitedToBGInstanceGUID, bgTypeId);
-            // add only in HandleMoveWorldPortAck()
-            // bg->AddPlayer(_player,team);
-            DEBUG_LOG("Battleground: player %s (%u) joined battle for bg %u, bgtype %u, queue type %u.", _player->GetName(), _player->GetGUIDLow(), bg->GetInstanceID(), bg->GetTypeID(), bgQueueTypeId);
-            break;
-        case 0:                                         // leave queue
-            // if player leaves rated arena match before match start, it is counted as he played but he lost
-            if (ginfo.IsRated && ginfo.IsInvitedToBGInstanceGUID)
-            {
-                ArenaTeam * at = sObjectMgr.GetArenaTeamById(ginfo.ArenaTeamId);
-                if (at)
-                {
-                    DEBUG_LOG("UPDATING memberLost's personal arena rating for %s by opponents rating: %u, because he has left queue!", _player->GetGuidStr().c_str(), ginfo.OpponentsTeamRating);
-                    at->MemberLost(_player, ginfo.OpponentsTeamRating);
-                    at->SaveToDB();
-                }
-            }
-            _player->RemoveBattleGroundQueueId(bgQueueTypeId);  // must be called this way, because if you move this call to queue->removeplayer, it causes bugs
-            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_NONE, 0, 0, ARENA_TYPE_NONE);
-            bgQueue.RemovePlayer(_player->GetObjectGuid(), true);
-            // player left queue, we should update it - do not update Arena Queue
-            if (ginfo.arenaType == ARENA_TYPE_NONE)
-                sBattleGroundMgr.ScheduleQueueUpdate(ginfo.ArenaTeamRating, ginfo.arenaType, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId());
-            SendPacket(&data);
-            DEBUG_LOG("Battleground: player %s (%u) left queue for bgtype %u, queue type %u.", _player->GetName(), _player->GetGUIDLow(), bg->GetTypeID(), bgQueueTypeId);
-            break;
-        default:
-            sLog.outError("Battleground port: unknown action %u", action);
-            break;
-    }
-}
-
-void WorldSession::HandleLeaveBattlefieldOpcode( WorldPacket& recv_data )
-{
-    DEBUG_LOG( "WORLD: Recvd CMSG_LEAVE_BATTLEFIELD Message");
-
-    recv_data.read_skip<uint8>();                           // unk1
-    recv_data.read_skip<uint8>();                           // unk2
-    recv_data.read_skip<uint32>();                          // BattleGroundTypeId
-    recv_data.read_skip<uint16>();                          // unk3
-
-    //if(bgTypeId >= MAX_BATTLEGROUND_TYPES)                  // cheating? but not important in this case
-    //    return;
-
-    // not allow leave battleground in combat
-    if (_player->isInCombat())
-        if (BattleGround* bg = _player->GetBattleGround())
-            if (bg->GetStatus() != STATUS_WAIT_LEAVE)
-                return;
-
-    _player->LeaveBattleground();
-}
-
-void WorldSession::HandleBattlefieldStatusOpcode( WorldPacket & /*recv_data*/ )
-{
-    // empty opcode
-    DEBUG_LOG( "WORLD: Battleground status" );
-
-    WorldPacket data;
-    // we must update all queues here
-    BattleGround *bg = NULL;
-    for (uint8 i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
-    {
-        BattleGroundQueueTypeId bgQueueTypeId = _player->GetBattleGroundQueueTypeId(i);
-        if (!bgQueueTypeId)
-            continue;
-
-        BattleGroundTypeId bgTypeId = BattleGroundMgr::BGTemplateId(bgQueueTypeId);
-        ArenaType arenaType = BattleGroundMgr::BGArenaType(bgQueueTypeId);
-        if (bgTypeId == _player->GetBattleGroundTypeId())
-        {
-            bg = _player->GetBattleGround();
-            //i cannot check any variable from player class because player class doesn't know if player is in 2v2 / 3v3 or 5v5 arena
-            //so i must use bg pointer to get that information
-            if (bg && bg->GetArenaType() == arenaType)
-            {
-                // this line is checked, i only don't know if GetStartTime is changing itself after bg end!
-                // send status in BattleGround
-                sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, i, STATUS_IN_PROGRESS, bg->GetEndTime(), bg->GetStartTime(), arenaType);
-                SendPacket(&data);
-                continue;
-            }
-        }
-        //we are sending update to player about queue - he can be invited there!
-        //get GroupQueueInfo for queue status
-        BattleGroundQueue& bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId];
-        GroupQueueInfo ginfo;
-        if (!bgQueue.GetPlayerGroupInfoData(_player->GetObjectGuid(), &ginfo))
-            continue;
-        if (ginfo.IsInvitedToBGInstanceGUID)
-        {
-            bg = sBattleGroundMgr.GetBattleGround(ginfo.IsInvitedToBGInstanceGUID, bgTypeId);
-            if (!bg)
-                continue;
-            uint32 remainingTime = WorldTimer::getMSTimeDiff(WorldTimer::getMSTime(), ginfo.RemoveInviteTime);
-            // send status invited to BattleGround
-            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, i, STATUS_WAIT_JOIN, remainingTime, 0, arenaType);
-            SendPacket(&data);
-        }
-        else
-        {
-            bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
-            if (!bg)
-                continue;
-
-            // expected bracket entry
-            PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),_player->getLevel());
-            if (!bracketEntry)
-                continue;
-
-            uint32 avgTime = bgQueue.GetAverageQueueWaitTime(&ginfo, bracketEntry->GetBracketId());
-            // send status in BattleGround Queue
-            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, i, STATUS_WAIT_QUEUE, avgTime, WorldTimer::getMSTimeDiff(ginfo.JoinTime, WorldTimer::getMSTime()), arenaType);
-            SendPacket(&data);
-        }
-    }
-}
-
-void WorldSession::HandleAreaSpiritHealerQueryOpcode( WorldPacket & recv_data )
-{
-    DEBUG_LOG("WORLD: CMSG_AREA_SPIRIT_HEALER_QUERY");
-
-    BattleGround *bg = _player->GetBattleGround();
-    if (!bg)
-        return;
-
-    ObjectGuid guid;
-    recv_data >> guid;
-
-    Creature *unit = GetPlayer()->GetMap()->GetCreature(guid);
-    if (!unit)
-        return;
-
-    if(!unit->isSpiritService())                            // it's not spirit service
-        return;
-
-    unit->SendAreaSpiritHealerQueryOpcode(GetPlayer());
-}
-
-void WorldSession::HandleAreaSpiritHealerQueueOpcode( WorldPacket & recv_data )
-{
-    DEBUG_LOG("WORLD: CMSG_AREA_SPIRIT_HEALER_QUEUE");
-
-    BattleGround *bg = _player->GetBattleGround();
-    if (!bg)
-        return;
-
-    ObjectGuid guid;
-    recv_data >> guid;
-
-    Creature *unit = GetPlayer()->GetMap()->GetCreature(guid);
-    if (!unit)
-        return;
-
-    if(!unit->isSpiritService())                            // it's not spirit service
-        return;
-
-    sScriptMgr.OnGossipHello(GetPlayer(), unit);
-}
-
-void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data )
-{
-    DEBUG_LOG("WORLD: CMSG_BATTLEMASTER_JOIN_ARENA");
-    //recv_data.hexlike();
-
-    ObjectGuid guid;                                        // arena Battlemaster guid
-    uint8 arenaslot;                                        // 2v2, 3v3 or 5v5
-    uint8 asGroup;                                          // asGroup
-    uint8 isRated;                                          // isRated
-
-    recv_data >> guid >> arenaslot >> asGroup >> isRated;
-
-    // ignore if we already in BG or BG queue
-    if (_player->InBattleGround())
-        return;
-
-    Creature *unit = GetPlayer()->GetMap()->GetCreature(guid);
-    if (!unit)
-        return;
-
-    if(!unit->isBattleMaster())                             // it's not battle master
-        return;
-
-    ArenaType arenatype;
-    uint32 arenaRating = 0;
-
-    switch(arenaslot)
-    {
-        case 0:
-            arenatype = ARENA_TYPE_2v2;
-            break;
-        case 1:
-            arenatype = ARENA_TYPE_3v3;
-            break;
-        case 2:
-            arenatype = ARENA_TYPE_5v5;
-            break;
-        default:
-            sLog.outError("Unknown arena slot %u at HandleBattlemasterJoinArena()", arenaslot);
-            return;
-    }
-
-    // check existence
-    BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(BATTLEGROUND_AA);
-    if (!bg)
-    {
-        sLog.outError("Battleground: template bg (all arenas) not found");
-        return;
-    }
-
-    BattleGroundTypeId bgTypeId = bg->GetTypeID();
-    BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, arenatype);
-    PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),_player->getLevel());
-    if (!bracketEntry)
-        return;
-
-    GroupJoinBattlegroundResult err;
-
-    Group * grp = NULL;
-
-    // check queue conditions
-    if (!asGroup)
-    {
-        // you can't join in this way by client
-        if (isRated)
-            return;
-
-        // check if already in queue
-        if (_player->GetBattleGroundQueueIndex(bgQueueTypeId) < PLAYER_MAX_BATTLEGROUND_QUEUES)
-            //player is already in this queue
-            return;
-        // check if has free queue slots
-        if (!_player->HasFreeBattleGroundQueueId())
-            return;
-    }
-    else
-    {
-        grp = _player->GetGroup();
-        // no group found, error
-        if (!grp)
-            return;
-        if (grp->GetLeaderGuid() != _player->GetObjectGuid())
-            return;
-        // may be Group::CanJoinBattleGroundQueue should be moved to player class...
-        err = grp->CanJoinBattleGroundQueue(bg, bgQueueTypeId, arenatype, arenatype, (bool)isRated, arenaslot);
-    }
-
-    uint32 ateamId = 0;
-
-    if (isRated)
-    {
-        ateamId = _player->GetArenaTeamId(arenaslot);
-        // check real arena team existence only here (if it was moved to group->CanJoin .. () then we would have to get it twice)
-        ArenaTeam * at = sObjectMgr.GetArenaTeamById(ateamId);
-        if (!at)
-        {
-            _player->GetSession()->SendNotInArenaTeamPacket(arenatype);
-            return;
-        }
-        // get the team rating for queue
-        arenaRating = at->GetRating();
-        // the arena team id must match for everyone in the group
-        // get the personal ratings for queue
-        uint32 avg_pers_rating = 0;
-
-        for(Group::member_citerator citr = grp->GetMemberSlots().begin(); citr != grp->GetMemberSlots().end(); ++citr)
-        {
-            ArenaTeamMember const* at_member = at->GetMember(citr->guid);
-            if (!at_member)                                 // group member joining to arena must be in leader arena team
-                return;
-
-            // calc avg personal rating
-            avg_pers_rating += at_member->personal_rating;
-        }
-
-        avg_pers_rating /= grp->GetMembersCount();
-
-        // if avg personal rating is more than 150 points below the teams rating, the team will be queued against an opponent matching or similar to the average personal rating
-        if (avg_pers_rating + 150 < arenaRating)
-            arenaRating = avg_pers_rating;
-    }
-
-    BattleGroundQueue &bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId];
-    if (asGroup)
-    {
-        uint32 avgTime = 0;
-
-        if(err > 0)
-        {
-            DEBUG_LOG("Battleground: arena join as group start");
-            if (isRated)
-                DEBUG_LOG("Battleground: arena team id %u, leader %s queued with rating %u for type %u",_player->GetArenaTeamId(arenaslot),_player->GetName(),arenaRating,arenatype);
-
-            GroupQueueInfo * ginfo = bgQueue.AddGroup(_player, grp, bgTypeId, bracketEntry, arenatype, isRated, false, arenaRating, ateamId);
-            avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry->GetBracketId());
-        }
-
-        for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
-        {
-            Player *member = itr->getSource();
-            if(!member)
-                continue;
-
-            WorldPacket data;
-
-            if(err <= 0)
-            {
-                sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, err);
-                member->GetSession()->SendPacket(&data);
-                continue;
-            }
-
-            // add to queue
-            uint32 queueSlot = member->AddBattleGroundQueueId(bgQueueTypeId);
-
-            // send status packet (in queue)
-            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, arenatype);
-            member->GetSession()->SendPacket(&data);
-            sBattleGroundMgr.BuildGroupJoinedBattlegroundPacket(&data, err);
-            member->GetSession()->SendPacket(&data);
-            DEBUG_LOG("Battleground: player joined queue for arena as group bg queue type %u bg type %u: GUID %u, NAME %s", bgQueueTypeId, bgTypeId, member->GetGUIDLow(), member->GetName());
-        }
-        DEBUG_LOG("Battleground: arena join as group end");
-    }
-    else
-    {
-        GroupQueueInfo * ginfo = bgQueue.AddGroup(_player, NULL, bgTypeId, bracketEntry, arenatype, isRated, false, arenaRating, ateamId);
-        uint32 avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry->GetBracketId());
-        uint32 queueSlot = _player->AddBattleGroundQueueId(bgQueueTypeId);
-
-        WorldPacket data;
-        // send status packet (in queue)
-        sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, arenatype);
-        SendPacket(&data);
-        DEBUG_LOG("Battleground: player joined queue for arena, skirmish, bg queue type %u bg type %u: GUID %u, NAME %s",bgQueueTypeId,bgTypeId,_player->GetGUIDLow(), _player->GetName());
-    }
-    sBattleGroundMgr.ScheduleQueueUpdate(arenaRating, arenatype, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId());
-}
-
-void WorldSession::HandleReportPvPAFK( WorldPacket & recv_data )
-{
-    ObjectGuid playerGuid;
-    recv_data >> playerGuid;
-    Player *reportedPlayer = sObjectMgr.GetPlayer(playerGuid);
-
-    if (!reportedPlayer)
-    {
-        DEBUG_LOG("WorldSession::HandleReportPvPAFK: player not found");
-        return;
-    }
-
-    DEBUG_LOG("WorldSession::HandleReportPvPAFK: %s reported %s", _player->GetName(), reportedPlayer->GetName());
-
-    reportedPlayer->ReportedAfkBy(_player);
-}
diff --git a/src/game/BattleGroundIC.cpp b/src/game/BattleGroundIC.cpp
deleted file mode 100644
index d84e7a9ee47..00000000000
--- a/src/game/BattleGroundIC.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Player.h"
-#include "BattleGround.h"
-#include "BattleGroundIC.h"
-#include "Language.h"
-
-BattleGroundIC::BattleGroundIC()
-{
-    //TODO FIX ME!
-    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
-    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_WS_START_ONE_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_WS_START_HALF_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_WS_HAS_BEGUN;
-}
-
-BattleGroundIC::~BattleGroundIC()
-{
-
-}
-
-void BattleGroundIC::Update(uint32 diff)
-{
-    BattleGround::Update(diff);
-}
-
-void BattleGroundIC::StartingEventCloseDoors()
-{
-}
-
-void BattleGroundIC::StartingEventOpenDoors()
-{
-}
-
-void BattleGroundIC::AddPlayer(Player *plr)
-{
-    BattleGround::AddPlayer(plr);
-    //create score and add it to map, default values are set in constructor
-    BattleGroundICScore* sc = new BattleGroundICScore;
-
-    m_PlayerScores[plr->GetObjectGuid()] = sc;
-}
-
-void BattleGroundIC::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
-{
-
-}
-
-void BattleGroundIC::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
-{
-    // this is wrong way to implement these things. On official it done by gameobject spell cast.
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-}
-
-void BattleGroundIC::UpdatePlayerScore(Player* Source, uint32 type, uint32 value)
-{
-
-    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetObjectGuid());
-
-    if(itr == m_PlayerScores.end())                         // player not found...
-        return;
-
-    BattleGround::UpdatePlayerScore(Source,type,value);
-}
diff --git a/src/game/BattleGroundIC.h b/src/game/BattleGroundIC.h
deleted file mode 100644
index 4fbb7fc4970..00000000000
--- a/src/game/BattleGroundIC.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __BATTLEGROUNDIC_H
-#define __BATTLEGROUNDIC_H
-
-class BattleGround;
-
-class BattleGroundICScore : public BattleGroundScore
-{
-    public:
-        BattleGroundICScore() {};
-        virtual ~BattleGroundICScore() {};
-};
-
-class BattleGroundIC : public BattleGround
-{
-    friend class BattleGroundMgr;
-
-    public:
-        BattleGroundIC();
-        ~BattleGroundIC();
-        void Update(uint32 diff);
-
-        /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
-        virtual void StartingEventCloseDoors();
-        virtual void StartingEventOpenDoors();
-
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
-        //bool SetupBattleGround();
-
-        /* Scorekeeping */
-        void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
-
-    private:
-};
-#endif
diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp
deleted file mode 100644
index 4862883132d..00000000000
--- a/src/game/BattleGroundMgr.cpp
+++ /dev/null
@@ -1,2207 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Common.h"
-#include "SharedDefines.h"
-#include "Player.h"
-#include "BattleGroundMgr.h"
-#include "BattleGroundAV.h"
-#include "BattleGroundAB.h"
-#include "BattleGroundEY.h"
-#include "BattleGroundWS.h"
-#include "BattleGroundNA.h"
-#include "BattleGroundBE.h"
-#include "BattleGroundAA.h"
-#include "BattleGroundRL.h"
-#include "BattleGroundSA.h"
-#include "BattleGroundDS.h"
-#include "BattleGroundRV.h"
-#include "BattleGroundIC.h"
-#include "BattleGroundRB.h"
-#include "MapManager.h"
-#include "Map.h"
-#include "ObjectMgr.h"
-#include "ProgressBar.h"
-#include "Chat.h"
-#include "ArenaTeam.h"
-#include "World.h"
-#include "WorldPacket.h"
-#include "GameEventMgr.h"
-
-#include "Policies/SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1( BattleGroundMgr );
-
-/*********************************************************/
-/***            BATTLEGROUND QUEUE SYSTEM              ***/
-/*********************************************************/
-
-BattleGroundQueue::BattleGroundQueue()
-{
-    for(uint32 i = 0; i < BG_TEAMS_COUNT; ++i)
-    {
-        for(uint32 j = 0; j < MAX_BATTLEGROUND_BRACKETS; ++j)
-        {
-            m_SumOfWaitTimes[i][j] = 0;
-            m_WaitTimeLastPlayer[i][j] = 0;
-            for(uint32 k = 0; k < COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME; ++k)
-                m_WaitTimes[i][j][k] = 0;
-        }
-    }
-}
-
-BattleGroundQueue::~BattleGroundQueue()
-{
-    m_QueuedPlayers.clear();
-    for (int i = 0; i < MAX_BATTLEGROUND_BRACKETS; ++i)
-    {
-        for(uint32 j = 0; j < BG_QUEUE_GROUP_TYPES_COUNT; ++j)
-        {
-            for(GroupsQueueType::iterator itr = m_QueuedGroups[i][j].begin(); itr!= m_QueuedGroups[i][j].end(); ++itr)
-                delete (*itr);
-            m_QueuedGroups[i][j].clear();
-        }
-    }
-}
-
-/*********************************************************/
-/***      BATTLEGROUND QUEUE SELECTION POOLS           ***/
-/*********************************************************/
-
-// selection pool initialization, used to clean up from prev selection
-void BattleGroundQueue::SelectionPool::Init()
-{
-    SelectedGroups.clear();
-    PlayerCount = 0;
-}
-
-// remove group info from selection pool
-// returns true when we need to try to add new group to selection pool
-// returns false when selection pool is ok or when we kicked smaller group than we need to kick
-// sometimes it can be called on empty selection pool
-bool BattleGroundQueue::SelectionPool::KickGroup(uint32 size)
-{
-    //find maxgroup or LAST group with size == size and kick it
-    bool found = false;
-    GroupsQueueType::iterator groupToKick = SelectedGroups.begin();
-    for (GroupsQueueType::iterator itr = groupToKick; itr != SelectedGroups.end(); ++itr)
-    {
-        if (abs((int32)((*itr)->Players.size() - size)) <= 1)
-        {
-            groupToKick = itr;
-            found = true;
-        }
-        else if (!found && (*itr)->Players.size() >= (*groupToKick)->Players.size())
-            groupToKick = itr;
-    }
-    //if pool is empty, do nothing
-    if (GetPlayerCount())
-    {
-        //update player count
-        GroupQueueInfo* ginfo = (*groupToKick);
-        SelectedGroups.erase(groupToKick);
-        PlayerCount -= ginfo->Players.size();
-        //return false if we kicked smaller group or there are enough players in selection pool
-        if (ginfo->Players.size() <= size + 1)
-            return false;
-    }
-    return true;
-}
-
-// add group to selection pool
-// used when building selection pools
-// returns true if we can invite more players, or when we added group to selection pool
-// returns false when selection pool is full
-bool BattleGroundQueue::SelectionPool::AddGroup(GroupQueueInfo *ginfo, uint32 desiredCount)
-{
-    //if group is larger than desired count - don't allow to add it to pool
-    if (!ginfo->IsInvitedToBGInstanceGUID && desiredCount >= PlayerCount + ginfo->Players.size())
-    {
-        SelectedGroups.push_back(ginfo);
-        // increase selected players count
-        PlayerCount += ginfo->Players.size();
-        return true;
-    }
-    if (PlayerCount < desiredCount)
-        return true;
-    return false;
-}
-
-/*********************************************************/
-/***               BATTLEGROUND QUEUES                 ***/
-/*********************************************************/
-
-// add group or player (grp == NULL) to bg queue with the given leader and bg specifications
-GroupQueueInfo * BattleGroundQueue::AddGroup(Player *leader, Group* grp, BattleGroundTypeId BgTypeId, PvPDifficultyEntry const*  bracketEntry, ArenaType arenaType, bool isRated, bool isPremade, uint32 arenaRating, uint32 arenateamid)
-{
-    BattleGroundBracketId bracketId =  bracketEntry->GetBracketId();
-
-    // create new ginfo
-    GroupQueueInfo* ginfo = new GroupQueueInfo;
-    ginfo->BgTypeId                  = BgTypeId;
-    ginfo->arenaType                 = arenaType;
-    ginfo->ArenaTeamId               = arenateamid;
-    ginfo->IsRated                   = isRated;
-    ginfo->IsInvitedToBGInstanceGUID = 0;
-    ginfo->JoinTime                  = WorldTimer::getMSTime();
-    ginfo->RemoveInviteTime          = 0;
-    ginfo->GroupTeam                 = leader->GetTeam();
-    ginfo->ArenaTeamRating           = arenaRating;
-    ginfo->OpponentsTeamRating       = 0;
-
-    ginfo->Players.clear();
-
-    //compute index (if group is premade or joined a rated match) to queues
-    uint32 index = 0;
-    if (!isRated && !isPremade)
-        index += BG_TEAMS_COUNT;                            // BG_QUEUE_PREMADE_* -> BG_QUEUE_NORMAL_*
-
-    if (ginfo->GroupTeam == HORDE)
-        index++;                                            // BG_QUEUE_*_ALLIANCE -> BG_QUEUE_*_HORDE
-
-    DEBUG_LOG("Adding Group to BattleGroundQueue bgTypeId : %u, bracket_id : %u, index : %u", BgTypeId, bracketId, index);
-
-    uint32 lastOnlineTime = WorldTimer::getMSTime();
-
-    //announce world (this don't need mutex)
-    if (isRated && sWorld.getConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_JOIN))
-    {
-        sWorld.SendWorldText(LANG_ARENA_QUEUE_ANNOUNCE_WORLD_JOIN, ginfo->arenaType, ginfo->arenaType, ginfo->ArenaTeamRating);
-    }
-
-    //add players from group to ginfo
-    {
-        //ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_Lock);
-        if (grp)
-        {
-            for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
-            {
-                Player *member = itr->getSource();
-                if(!member)
-                    continue;   // this should never happen
-                PlayerQueueInfo& pl_info = m_QueuedPlayers[member->GetObjectGuid()];
-                pl_info.LastOnlineTime   = lastOnlineTime;
-                pl_info.GroupInfo        = ginfo;
-                // add the pinfo to ginfo's list
-                ginfo->Players[member->GetObjectGuid()]  = &pl_info;
-            }
-        }
-        else
-        {
-            PlayerQueueInfo& pl_info = m_QueuedPlayers[leader->GetObjectGuid()];
-            pl_info.LastOnlineTime   = lastOnlineTime;
-            pl_info.GroupInfo        = ginfo;
-            ginfo->Players[leader->GetObjectGuid()]  = &pl_info;
-        }
-
-        //add GroupInfo to m_QueuedGroups
-        m_QueuedGroups[bracketId][index].push_back(ginfo);
-
-        //announce to world, this code needs mutex
-        if (arenaType == ARENA_TYPE_NONE && !isRated && !isPremade && sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_QUEUE_ANNOUNCER_JOIN))
-        {
-            if (BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(ginfo->BgTypeId))
-            {
-                char const* bgName = bg->GetName();
-                uint32 MinPlayers = bg->GetMinPlayersPerTeam();
-                uint32 qHorde = 0;
-                uint32 qAlliance = 0;
-                uint32 q_min_level = bracketEntry->minLevel;
-                uint32 q_max_level = bracketEntry->maxLevel;
-                GroupsQueueType::const_iterator itr;
-                for(itr = m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_ALLIANCE].begin(); itr != m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_ALLIANCE].end(); ++itr)
-                    if (!(*itr)->IsInvitedToBGInstanceGUID)
-                        qAlliance += (*itr)->Players.size();
-                for(itr = m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_HORDE].begin(); itr != m_QueuedGroups[bracketId][BG_QUEUE_NORMAL_HORDE].end(); ++itr)
-                    if (!(*itr)->IsInvitedToBGInstanceGUID)
-                        qHorde += (*itr)->Players.size();
-
-                // Show queue status to player only (when joining queue)
-                if (sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_QUEUE_ANNOUNCER_JOIN)==1)
-                {
-                    ChatHandler(leader).PSendSysMessage(LANG_BG_QUEUE_ANNOUNCE_SELF, bgName, q_min_level, q_max_level,
-                        qAlliance, (MinPlayers > qAlliance) ? MinPlayers - qAlliance : (uint32)0, qHorde, (MinPlayers > qHorde) ? MinPlayers - qHorde : (uint32)0);
-                }
-                // System message
-                else
-                {
-                    sWorld.SendWorldText(LANG_BG_QUEUE_ANNOUNCE_WORLD, bgName, q_min_level, q_max_level,
-                        qAlliance, (MinPlayers > qAlliance) ? MinPlayers - qAlliance : (uint32)0, qHorde, (MinPlayers > qHorde) ? MinPlayers - qHorde : (uint32)0);
-                }
-            }
-        }
-        //release mutex
-    }
-
-    return ginfo;
-}
-
-void BattleGroundQueue::PlayerInvitedToBGUpdateAverageWaitTime(GroupQueueInfo* ginfo, BattleGroundBracketId bracket_id)
-{
-    uint32 timeInQueue = WorldTimer::getMSTimeDiff(ginfo->JoinTime, WorldTimer::getMSTime());
-    uint8 team_index = BG_TEAM_ALLIANCE;                    //default set to BG_TEAM_ALLIANCE - or non rated arenas!
-    if (ginfo->arenaType == ARENA_TYPE_NONE)
-    {
-        if (ginfo->GroupTeam == HORDE)
-            team_index = BG_TEAM_HORDE;
-    }
-    else
-    {
-        if (ginfo->IsRated)
-            team_index = BG_TEAM_HORDE;                     //for rated arenas use BG_TEAM_HORDE
-    }
-
-    //store pointer to arrayindex of player that was added first
-    uint32* lastPlayerAddedPointer = &(m_WaitTimeLastPlayer[team_index][bracket_id]);
-    //remove his time from sum
-    m_SumOfWaitTimes[team_index][bracket_id] -= m_WaitTimes[team_index][bracket_id][(*lastPlayerAddedPointer)];
-    //set average time to new
-    m_WaitTimes[team_index][bracket_id][(*lastPlayerAddedPointer)] = timeInQueue;
-    //add new time to sum
-    m_SumOfWaitTimes[team_index][bracket_id] += timeInQueue;
-    //set index of last player added to next one
-    (*lastPlayerAddedPointer)++;
-    (*lastPlayerAddedPointer) %= COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME;
-}
-
-uint32 BattleGroundQueue::GetAverageQueueWaitTime(GroupQueueInfo* ginfo, BattleGroundBracketId bracket_id)
-{
-    uint8 team_index = BG_TEAM_ALLIANCE;                    //default set to BG_TEAM_ALLIANCE - or non rated arenas!
-    if (ginfo->arenaType == ARENA_TYPE_NONE)
-    {
-        if (ginfo->GroupTeam == HORDE)
-            team_index = BG_TEAM_HORDE;
-    }
-    else
-    {
-        if (ginfo->IsRated)
-            team_index = BG_TEAM_HORDE;                     //for rated arenas use BG_TEAM_HORDE
-    }
-    //check if there is enought values(we always add values > 0)
-    if (m_WaitTimes[team_index][bracket_id][COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME - 1] )
-        return (m_SumOfWaitTimes[team_index][bracket_id] / COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME);
-    else
-        //if there aren't enough values return 0 - not available
-        return 0;
-}
-
-//remove player from queue and from group info, if group info is empty then remove it too
-void BattleGroundQueue::RemovePlayer(ObjectGuid guid, bool decreaseInvitedCount)
-{
-    //Player *plr = sObjectMgr.GetPlayer(guid);
-    //ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_Lock);
-
-    int32 bracket_id = -1;                                     // signed for proper for-loop finish
-    QueuedPlayersMap::iterator itr;
-
-    //remove player from map, if he's there
-    itr = m_QueuedPlayers.find(guid);
-    if (itr == m_QueuedPlayers.end())
-    {
-        sLog.outError("BattleGroundQueue: couldn't find for remove: %s", guid.GetString().c_str());
-        return;
-    }
-
-    GroupQueueInfo* group = itr->second.GroupInfo;
-    GroupsQueueType::iterator group_itr, group_itr_tmp;
-    // mostly people with the highest levels are in battlegrounds, thats why
-    // we count from MAX_BATTLEGROUND_QUEUES - 1 to 0
-    // variable index removes useless searching in other team's queue
-    uint32 index = BattleGround::GetTeamIndexByTeamId(group->GroupTeam);
-
-    for (int32 bracket_id_tmp = MAX_BATTLEGROUND_BRACKETS - 1; bracket_id_tmp >= 0 && bracket_id == -1; --bracket_id_tmp)
-    {
-        //we must check premade and normal team's queue - because when players from premade are joining bg,
-        //they leave groupinfo so we can't use its players size to find out index
-        for (uint32 j = index; j < BG_QUEUE_GROUP_TYPES_COUNT; j += BG_QUEUE_NORMAL_ALLIANCE)
-        {
-            for(group_itr_tmp = m_QueuedGroups[bracket_id_tmp][j].begin(); group_itr_tmp != m_QueuedGroups[bracket_id_tmp][j].end(); ++group_itr_tmp)
-            {
-                if ((*group_itr_tmp) == group)
-                {
-                    bracket_id = bracket_id_tmp;
-                    group_itr = group_itr_tmp;
-                    //we must store index to be able to erase iterator
-                    index = j;
-                    break;
-                }
-            }
-        }
-    }
-    //player can't be in queue without group, but just in case
-    if (bracket_id == -1)
-    {
-        sLog.outError("BattleGroundQueue: ERROR Cannot find groupinfo for %s", guid.GetString().c_str());
-        return;
-    }
-    DEBUG_LOG("BattleGroundQueue: Removing %s, from bracket_id %u", guid.GetString().c_str(), (uint32)bracket_id);
-
-    // ALL variables are correctly set
-    // We can ignore leveling up in queue - it should not cause crash
-    // remove player from group
-    // if only one player there, remove group
-
-    // remove player queue info from group queue info
-    GroupQueueInfoPlayers::iterator pitr = group->Players.find(guid);
-    if (pitr != group->Players.end())
-        group->Players.erase(pitr);
-
-    // if invited to bg, and should decrease invited count, then do it
-    if (decreaseInvitedCount && group->IsInvitedToBGInstanceGUID)
-    {
-        BattleGround* bg = sBattleGroundMgr.GetBattleGround(group->IsInvitedToBGInstanceGUID, group->BgTypeId);
-        if (bg)
-            bg->DecreaseInvitedCount(group->GroupTeam);
-    }
-
-    // remove player queue info
-    m_QueuedPlayers.erase(itr);
-
-    // announce to world if arena team left queue for rated match, show only once
-    if (group->arenaType != ARENA_TYPE_NONE && group->IsRated && group->Players.empty() && sWorld.getConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_EXIT))
-        sWorld.SendWorldText(LANG_ARENA_QUEUE_ANNOUNCE_WORLD_EXIT, group->arenaType, group->arenaType, group->ArenaTeamRating);
-
-    //if player leaves queue and he is invited to rated arena match, then he have to loose
-    if (group->IsInvitedToBGInstanceGUID && group->IsRated && decreaseInvitedCount)
-    {
-        ArenaTeam * at = sObjectMgr.GetArenaTeamById(group->ArenaTeamId);
-        if (at)
-        {
-            DEBUG_LOG("UPDATING memberLost's personal arena rating for %s by opponents rating: %u", guid.GetString().c_str(), group->OpponentsTeamRating);
-            Player *plr = sObjectMgr.GetPlayer(guid);
-            if (plr)
-                at->MemberLost(plr, group->OpponentsTeamRating);
-            else
-                at->OfflineMemberLost(guid, group->OpponentsTeamRating);
-            at->SaveToDB();
-        }
-    }
-
-    // remove group queue info if needed
-    if (group->Players.empty())
-    {
-        m_QueuedGroups[bracket_id][index].erase(group_itr);
-        delete group;
-    }
-    // if group wasn't empty, so it wasn't deleted, and player have left a rated
-    // queue -> everyone from the group should leave too
-    // don't remove recursively if already invited to bg!
-    else if (!group->IsInvitedToBGInstanceGUID && group->IsRated)
-    {
-        // remove next player, this is recursive
-        // first send removal information
-        if (Player *plr2 = sObjectMgr.GetPlayer(group->Players.begin()->first))
-        {
-            BattleGround * bg = sBattleGroundMgr.GetBattleGroundTemplate(group->BgTypeId);
-            BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(group->BgTypeId, group->arenaType);
-            uint32 queueSlot = plr2->GetBattleGroundQueueIndex(bgQueueTypeId);
-            plr2->RemoveBattleGroundQueueId(bgQueueTypeId); // must be called this way, because if you move this call to
-                                                            // queue->removeplayer, it causes bugs
-            WorldPacket data;
-            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_NONE, 0, 0, ARENA_TYPE_NONE);
-            plr2->GetSession()->SendPacket(&data);
-        }
-        // then actually delete, this may delete the group as well!
-        RemovePlayer(group->Players.begin()->first, decreaseInvitedCount);
-    }
-}
-
-//returns true when player pl_guid is in queue and is invited to bgInstanceGuid
-bool BattleGroundQueue::IsPlayerInvited(ObjectGuid pl_guid, const uint32 bgInstanceGuid, const uint32 removeTime)
-{
-    //ACE_Guard<ACE_Recursive_Thread_Mutex> g(m_Lock);
-    QueuedPlayersMap::const_iterator qItr = m_QueuedPlayers.find(pl_guid);
-    return ( qItr != m_QueuedPlayers.end()
-        && qItr->second.GroupInfo->IsInvitedToBGInstanceGUID == bgInstanceGuid
-        && qItr->second.GroupInfo->RemoveInviteTime == removeTime );
-}
-
-bool BattleGroundQueue::GetPlayerGroupInfoData(ObjectGuid guid, GroupQueueInfo* ginfo)
-{
-    //ACE_Guard<ACE_Recursive_Thread_Mutex> g(m_Lock);
-    QueuedPlayersMap::const_iterator qItr = m_QueuedPlayers.find(guid);
-    if (qItr == m_QueuedPlayers.end())
-        return false;
-    *ginfo = *(qItr->second.GroupInfo);
-    return true;
-}
-
-bool BattleGroundQueue::InviteGroupToBG(GroupQueueInfo * ginfo, BattleGround * bg, Team side)
-{
-    // set side if needed
-    if (side)
-        ginfo->GroupTeam = side;
-
-    if (!ginfo->IsInvitedToBGInstanceGUID)
-    {
-        // not yet invited
-        // set invitation
-        ginfo->IsInvitedToBGInstanceGUID = bg->GetInstanceID();
-        BattleGroundTypeId bgTypeId = bg->GetTypeID();
-        BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, bg->GetArenaType());
-        BattleGroundBracketId bracket_id = bg->GetBracketId();
-
-        // set ArenaTeamId for rated matches
-        if (bg->isArena() && bg->isRated())
-            bg->SetArenaTeamIdForTeam(ginfo->GroupTeam, ginfo->ArenaTeamId);
-
-        ginfo->RemoveInviteTime = WorldTimer::getMSTime() + INVITE_ACCEPT_WAIT_TIME;
-
-        // loop through the players
-        for(GroupQueueInfoPlayers::iterator itr = ginfo->Players.begin(); itr != ginfo->Players.end(); ++itr)
-        {
-            // get the player
-            Player* plr = sObjectMgr.GetPlayer(itr->first);
-            // if offline, skip him, this should not happen - player is removed from queue when he logs out
-            if (!plr)
-                continue;
-
-            // invite the player
-            PlayerInvitedToBGUpdateAverageWaitTime(ginfo, bracket_id);
-            //sBattleGroundMgr.InvitePlayer(plr, bg, ginfo->Team);
-
-            // set invited player counters
-            bg->IncreaseInvitedCount(ginfo->GroupTeam);
-
-            plr->SetInviteForBattleGroundQueueType(bgQueueTypeId, ginfo->IsInvitedToBGInstanceGUID);
-
-            // create remind invite events
-            BGQueueInviteEvent* inviteEvent = new BGQueueInviteEvent(plr->GetObjectGuid(), ginfo->IsInvitedToBGInstanceGUID, bgTypeId, ginfo->arenaType, ginfo->RemoveInviteTime);
-            plr->m_Events.AddEvent(inviteEvent, plr->m_Events.CalculateTime(INVITATION_REMIND_TIME));
-            // create automatic remove events
-            BGQueueRemoveEvent* removeEvent = new BGQueueRemoveEvent(plr->GetObjectGuid(), ginfo->IsInvitedToBGInstanceGUID, bgTypeId, bgQueueTypeId, ginfo->RemoveInviteTime);
-            plr->m_Events.AddEvent(removeEvent, plr->m_Events.CalculateTime(INVITE_ACCEPT_WAIT_TIME));
-
-            WorldPacket data;
-
-            uint32 queueSlot = plr->GetBattleGroundQueueIndex(bgQueueTypeId);
-
-            DEBUG_LOG("Battleground: invited %s to BG instance %u queueindex %u bgtype %u, I can't help it if they don't press the enter battle button.",
-                plr->GetGuidStr().c_str(), bg->GetInstanceID(), queueSlot, bg->GetTypeID());
-
-            // send status packet
-            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_JOIN, INVITE_ACCEPT_WAIT_TIME, 0, ginfo->arenaType);
-            plr->GetSession()->SendPacket(&data);
-        }
-        return true;
-    }
-
-    return false;
-}
-
-/*
-This function is inviting players to already running battlegrounds
-Invitation type is based on config file
-large groups are disadvantageous, because they will be kicked first if invitation type = 1
-*/
-void BattleGroundQueue::FillPlayersToBG(BattleGround* bg, BattleGroundBracketId bracket_id)
-{
-    int32 hordeFree = bg->GetFreeSlotsForTeam(HORDE);
-    int32 aliFree   = bg->GetFreeSlotsForTeam(ALLIANCE);
-
-    //iterator for iterating through bg queue
-    GroupsQueueType::const_iterator Ali_itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].begin();
-    //count of groups in queue - used to stop cycles
-    uint32 aliCount = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].size();
-    //index to queue which group is current
-    uint32 aliIndex = 0;
-    for (; aliIndex < aliCount && m_SelectionPools[BG_TEAM_ALLIANCE].AddGroup((*Ali_itr), aliFree); aliIndex++)
-        ++Ali_itr;
-    //the same thing for horde
-    GroupsQueueType::const_iterator Horde_itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].begin();
-    uint32 hordeCount = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].size();
-    uint32 hordeIndex = 0;
-    for (; hordeIndex < hordeCount && m_SelectionPools[BG_TEAM_HORDE].AddGroup((*Horde_itr), hordeFree); hordeIndex++)
-        ++Horde_itr;
-
-    //if ofc like BG queue invitation is set in config, then we are happy
-    if (sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_INVITATION_TYPE) == 0)
-        return;
-
-    /*
-    if we reached this code, then we have to solve NP - complete problem called Subset sum problem
-    So one solution is to check all possible invitation subgroups, or we can use these conditions:
-    1. Last time when BattleGroundQueue::Update was executed we invited all possible players - so there is only small possibility
-        that we will invite now whole queue, because only 1 change has been made to queues from the last BattleGroundQueue::Update call
-    2. Other thing we should consider is group order in queue
-    */
-
-    // At first we need to compare free space in bg and our selection pool
-    int32 diffAli   = aliFree   - int32(m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount());
-    int32 diffHorde = hordeFree - int32(m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount());
-    while( abs(diffAli - diffHorde) > 1 && (m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount() > 0 || m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount() > 0) )
-    {
-        //each cycle execution we need to kick at least 1 group
-        if (diffAli < diffHorde)
-        {
-            //kick alliance group, add to pool new group if needed
-            if (m_SelectionPools[BG_TEAM_ALLIANCE].KickGroup(diffHorde - diffAli))
-            {
-                for (; aliIndex < aliCount && m_SelectionPools[BG_TEAM_ALLIANCE].AddGroup((*Ali_itr), (aliFree >= diffHorde) ? aliFree - diffHorde : 0); aliIndex++)
-                    ++Ali_itr;
-            }
-            //if ali selection is already empty, then kick horde group, but if there are less horde than ali in bg - break;
-            if (!m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount())
-            {
-                if (aliFree <= diffHorde + 1)
-                    break;
-                m_SelectionPools[BG_TEAM_HORDE].KickGroup(diffHorde - diffAli);
-            }
-        }
-        else
-        {
-            //kick horde group, add to pool new group if needed
-            if (m_SelectionPools[BG_TEAM_HORDE].KickGroup(diffAli - diffHorde))
-            {
-                for (; hordeIndex < hordeCount && m_SelectionPools[BG_TEAM_HORDE].AddGroup((*Horde_itr), (hordeFree >= diffAli) ? hordeFree - diffAli : 0); hordeIndex++)
-                    ++Horde_itr;
-            }
-            if (!m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount())
-            {
-                if (hordeFree <= diffAli + 1)
-                    break;
-                m_SelectionPools[BG_TEAM_ALLIANCE].KickGroup(diffAli - diffHorde);
-            }
-        }
-        //count diffs after small update
-        diffAli   = aliFree   - int32(m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount());
-        diffHorde = hordeFree - int32(m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount());
-    }
-}
-
-// this method checks if premade versus premade battleground is possible
-// then after 30 mins (default) in queue it moves premade group to normal queue
-// it tries to invite as much players as it can - to MaxPlayersPerTeam, because premade groups have more than MinPlayersPerTeam players
-bool BattleGroundQueue::CheckPremadeMatch(BattleGroundBracketId bracket_id, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam)
-{
-    //check match
-    if (!m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].empty() && !m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].empty())
-    {
-        //start premade match
-        //if groups aren't invited
-        GroupsQueueType::const_iterator ali_group, horde_group;
-        for( ali_group = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].begin(); ali_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++ali_group)
-            if (!(*ali_group)->IsInvitedToBGInstanceGUID)
-                break;
-        for( horde_group = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].begin(); horde_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].end(); ++horde_group)
-            if (!(*horde_group)->IsInvitedToBGInstanceGUID)
-                break;
-
-        if (ali_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].end() && horde_group != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].end())
-        {
-            m_SelectionPools[BG_TEAM_ALLIANCE].AddGroup((*ali_group), MaxPlayersPerTeam);
-            m_SelectionPools[BG_TEAM_HORDE].AddGroup((*horde_group), MaxPlayersPerTeam);
-            //add groups/players from normal queue to size of bigger group
-            uint32 maxPlayers = std::max(m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount(), m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount());
-            GroupsQueueType::const_iterator itr;
-            for(uint32 i = 0; i < BG_TEAMS_COUNT; i++)
-            {
-                for(itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].begin(); itr != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++itr)
-                {
-                    //if itr can join BG and player count is less that maxPlayers, then add group to selectionpool
-                    if (!(*itr)->IsInvitedToBGInstanceGUID && !m_SelectionPools[i].AddGroup((*itr), maxPlayers))
-                        break;
-                }
-            }
-            //premade selection pools are set
-            return true;
-        }
-    }
-    // now check if we can move group from Premade queue to normal queue (timer has expired) or group size lowered!!
-    // this could be 2 cycles but i'm checking only first team in queue - it can cause problem -
-    // if first is invited to BG and seconds timer expired, but we can ignore it, because players have only 80 seconds to click to enter bg
-    // and when they click or after 80 seconds the queue info is removed from queue
-    uint32 time_before = WorldTimer::getMSTime() - sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH);
-    for(uint32 i = 0; i < BG_TEAMS_COUNT; i++)
-    {
-        if (!m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE + i].empty())
-        {
-            GroupsQueueType::iterator itr = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE + i].begin();
-            if (!(*itr)->IsInvitedToBGInstanceGUID && ((*itr)->JoinTime < time_before || (*itr)->Players.size() < MinPlayersPerTeam))
-            {
-                //we must insert group to normal queue and erase pointer from premade queue
-                m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].push_front((*itr));
-                m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE + i].erase(itr);
-            }
-        }
-    }
-    //selection pools are not set
-    return false;
-}
-
-// this method tries to create battleground or arena with MinPlayersPerTeam against MinPlayersPerTeam
-bool BattleGroundQueue::CheckNormalMatch(BattleGround* bg_template, BattleGroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers)
-{
-    GroupsQueueType::const_iterator itr_team[BG_TEAMS_COUNT];
-    for(uint32 i = 0; i < BG_TEAMS_COUNT; i++)
-    {
-        itr_team[i] = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].begin();
-        for(; itr_team[i] != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + i].end(); ++(itr_team[i]))
-        {
-            if (!(*(itr_team[i]))->IsInvitedToBGInstanceGUID)
-            {
-                m_SelectionPools[i].AddGroup(*(itr_team[i]), maxPlayers);
-                if (m_SelectionPools[i].GetPlayerCount() >= minPlayers)
-                    break;
-            }
-        }
-    }
-    //try to invite same number of players - this cycle may cause longer wait time even if there are enough players in queue, but we want ballanced bg
-    uint32 j = BG_TEAM_ALLIANCE;
-    if (m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount() < m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount())
-        j = BG_TEAM_HORDE;
-    if( sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_INVITATION_TYPE) != 0
-        && m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount() >= minPlayers && m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount() >= minPlayers )
-    {
-        //we will try to invite more groups to team with less players indexed by j
-        ++(itr_team[j]);                                         //this will not cause a crash, because for cycle above reached break;
-        for(; itr_team[j] != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + j].end(); ++(itr_team[j]))
-        {
-            if (!(*(itr_team[j]))->IsInvitedToBGInstanceGUID)
-                if (!m_SelectionPools[j].AddGroup(*(itr_team[j]), m_SelectionPools[(j + 1) % BG_TEAMS_COUNT].GetPlayerCount()))
-                    break;
-        }
-        // do not allow to start bg with more than 2 players more on 1 faction
-        if (abs((int32)(m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount() - m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount())) > 2)
-            return false;
-    }
-    //allow 1v0 if debug bg
-    if (sBattleGroundMgr.isTesting() && bg_template->isBattleGround() && (m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount() || m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount()))
-        return true;
-    //return true if there are enough players in selection pools - enable to work .debug bg command correctly
-    return m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount() >= minPlayers && m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount() >= minPlayers;
-}
-
-// this method will check if we can invite players to same faction skirmish match
-bool BattleGroundQueue::CheckSkirmishForSameFaction(BattleGroundBracketId bracket_id, uint32 minPlayersPerTeam)
-{
-    if (m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount() < minPlayersPerTeam && m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount() < minPlayersPerTeam)
-        return false;
-    BattleGroundTeamIndex teamIdx = BG_TEAM_ALLIANCE;
-    BattleGroundTeamIndex otherTeamIdx = BG_TEAM_HORDE;
-    Team otherTeamId = HORDE;
-    if (m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount() == minPlayersPerTeam )
-    {
-        teamIdx = BG_TEAM_HORDE;
-        otherTeamIdx = BG_TEAM_ALLIANCE;
-        otherTeamId = ALLIANCE;
-    }
-    //clear other team's selection
-    m_SelectionPools[otherTeamIdx].Init();
-    //store last ginfo pointer
-    GroupQueueInfo* ginfo = m_SelectionPools[teamIdx].SelectedGroups.back();
-    //set itr_team to group that was added to selection pool latest
-    GroupsQueueType::iterator itr_team = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].begin();
-    for(; itr_team != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].end(); ++itr_team)
-        if (ginfo == *itr_team)
-            break;
-    if (itr_team == m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].end())
-        return false;
-    GroupsQueueType::iterator itr_team2 = itr_team;
-    ++itr_team2;
-    //invite players to other selection pool
-    for(; itr_team2 != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].end(); ++itr_team2)
-    {
-        //if selection pool is full then break;
-        if (!(*itr_team2)->IsInvitedToBGInstanceGUID && !m_SelectionPools[otherTeamIdx].AddGroup(*itr_team2, minPlayersPerTeam))
-            break;
-    }
-    if (m_SelectionPools[otherTeamIdx].GetPlayerCount() != minPlayersPerTeam)
-        return false;
-
-    //here we have correct 2 selections and we need to change one teams team and move selection pool teams to other team's queue
-    for(GroupsQueueType::iterator itr = m_SelectionPools[otherTeamIdx].SelectedGroups.begin(); itr != m_SelectionPools[otherTeamIdx].SelectedGroups.end(); ++itr)
-    {
-        //set correct team
-        (*itr)->GroupTeam = otherTeamId;
-        //add team to other queue
-        m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + otherTeamIdx].push_front(*itr);
-        //remove team from old queue
-        GroupsQueueType::iterator itr2 = itr_team;
-        ++itr2;
-        for(; itr2 != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].end(); ++itr2)
-        {
-            if (*itr2 == *itr)
-            {
-                m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE + teamIdx].erase(itr2);
-                break;
-            }
-        }
-    }
-    return true;
-}
-
-/*
-this method is called when group is inserted, or player / group is removed from BG Queue - there is only one player's status changed, so we don't use while(true) cycles to invite whole queue
-it must be called after fully adding the members of a group to ensure group joining
-should be called from BattleGround::RemovePlayer function in some cases
-*/
-void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id, ArenaType arenaType, bool isRated, uint32 arenaRating)
-{
-    //ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_Lock);
-    //if no players in queue - do nothing
-    if( m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].empty() &&
-        m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].empty() &&
-        m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].empty() &&
-        m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].empty() )
-        return;
-
-    //battleground with free slot for player should be always in the beggining of the queue
-    // maybe it would be better to create bgfreeslotqueue for each bracket_id
-    BGFreeSlotQueueType::iterator itr, next;
-    for (itr = sBattleGroundMgr.BGFreeSlotQueue[bgTypeId].begin(); itr != sBattleGroundMgr.BGFreeSlotQueue[bgTypeId].end(); itr = next)
-    {
-        next = itr;
-        ++next;
-        // DO NOT allow queue manager to invite new player to arena
-        if( (*itr)->isBattleGround() && (*itr)->GetTypeID() == bgTypeId && (*itr)->GetBracketId() == bracket_id &&
-            (*itr)->GetStatus() > STATUS_WAIT_QUEUE && (*itr)->GetStatus() < STATUS_WAIT_LEAVE )
-        {
-            BattleGround* bg = *itr; //we have to store battleground pointer here, because when battleground is full, it is removed from free queue (not yet implemented!!)
-            // and iterator is invalid
-
-            // clear selection pools
-            m_SelectionPools[BG_TEAM_ALLIANCE].Init();
-            m_SelectionPools[BG_TEAM_HORDE].Init();
-
-            // call a function that does the job for us
-            FillPlayersToBG(bg, bracket_id);
-
-            // now everything is set, invite players
-            for(GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.end(); ++citr)
-                InviteGroupToBG((*citr), bg, (*citr)->GroupTeam);
-            for(GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.end(); ++citr)
-                InviteGroupToBG((*citr), bg, (*citr)->GroupTeam);
-
-            if (!bg->HasFreeSlots())
-            {
-                // remove BG from BGFreeSlotQueue
-                bg->RemoveFromBGFreeSlotQueue();
-            }
-        }
-    }
-
-    // finished iterating through the bgs with free slots, maybe we need to create a new bg
-
-    BattleGround * bg_template = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
-    if (!bg_template)
-    {
-        sLog.outError("Battleground: Update: bg template not found for %u", bgTypeId);
-        return;
-    }
-
-    PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketById(bg_template->GetMapId(),bracket_id);
-    if (!bracketEntry)
-    {
-        sLog.outError("Battleground: Update: bg bracket entry not found for map %u bracket id %u", bg_template->GetMapId(), bracket_id);
-        return;
-    }
-
-    // get the min. players per team, properly for larger arenas as well. (must have full teams for arena matches!)
-    uint32 MinPlayersPerTeam = bg_template->GetMinPlayersPerTeam();
-    uint32 MaxPlayersPerTeam = bg_template->GetMaxPlayersPerTeam();
-    if (sBattleGroundMgr.isTesting())
-        MinPlayersPerTeam = 1;
-    if (bg_template->isArena())
-    {
-        if (sBattleGroundMgr.isArenaTesting())
-        {
-            MaxPlayersPerTeam = 1;
-            MinPlayersPerTeam = 1;
-        }
-        else
-        {
-            //this switch can be much shorter
-            MaxPlayersPerTeam = arenaType;
-            MinPlayersPerTeam = arenaType;
-            /*switch(arenaType)
-            {
-            case ARENA_TYPE_2v2:
-                MaxPlayersPerTeam = 2;
-                MinPlayersPerTeam = 2;
-                break;
-            case ARENA_TYPE_3v3:
-                MaxPlayersPerTeam = 3;
-                MinPlayersPerTeam = 3;
-                break;
-            case ARENA_TYPE_5v5:
-                MaxPlayersPerTeam = 5;
-                MinPlayersPerTeam = 5;
-                break;
-            }*/
-        }
-    }
-
-    m_SelectionPools[BG_TEAM_ALLIANCE].Init();
-    m_SelectionPools[BG_TEAM_HORDE].Init();
-
-    if (bg_template->isBattleGround())
-    {
-        //check if there is premade against premade match
-        if (CheckPremadeMatch(bracket_id, MinPlayersPerTeam, MaxPlayersPerTeam))
-        {
-            //create new battleground
-            BattleGround * bg2 = sBattleGroundMgr.CreateNewBattleGround(bgTypeId, bracketEntry, ARENA_TYPE_NONE, false);
-            if (!bg2)
-            {
-                sLog.outError("BattleGroundQueue::Update - Cannot create battleground: %u", bgTypeId);
-                return;
-            }
-            //invite those selection pools
-            for(uint32 i = 0; i < BG_TEAMS_COUNT; i++)
-                for(GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.end(); ++citr)
-                    InviteGroupToBG((*citr), bg2, (*citr)->GroupTeam);
-            //start bg
-            bg2->StartBattleGround();
-            //clear structures
-            m_SelectionPools[BG_TEAM_ALLIANCE].Init();
-            m_SelectionPools[BG_TEAM_HORDE].Init();
-        }
-    }
-
-    // now check if there are in queues enough players to start new game of (normal battleground, or non-rated arena)
-    if (!isRated)
-    {
-        // if there are enough players in pools, start new battleground or non rated arena
-        if (CheckNormalMatch(bg_template, bracket_id, MinPlayersPerTeam, MaxPlayersPerTeam)
-            || (bg_template->isArena() && CheckSkirmishForSameFaction(bracket_id, MinPlayersPerTeam)) )
-        {
-            // we successfully created a pool
-            BattleGround * bg2 = sBattleGroundMgr.CreateNewBattleGround(bgTypeId, bracketEntry, arenaType, false);
-            if (!bg2)
-            {
-                sLog.outError("BattleGroundQueue::Update - Cannot create battleground: %u", bgTypeId);
-                return;
-            }
-
-            // invite those selection pools
-            for(uint32 i = 0; i < BG_TEAMS_COUNT; i++)
-                for(GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.end(); ++citr)
-                    InviteGroupToBG((*citr), bg2, (*citr)->GroupTeam);
-            // start bg
-            bg2->StartBattleGround();
-        }
-    }
-    else if (bg_template->isArena())
-    {
-        // found out the minimum and maximum ratings the newly added team should battle against
-        // arenaRating is the rating of the latest joined team, or 0
-        // 0 is on (automatic update call) and we must set it to team's with longest wait time
-        if (!arenaRating )
-        {
-            GroupQueueInfo* front1 = NULL;
-            GroupQueueInfo* front2 = NULL;
-            if (!m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].empty())
-            {
-                front1 = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].front();
-                arenaRating = front1->ArenaTeamRating;
-            }
-            if (!m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].empty())
-            {
-                front2 = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].front();
-                arenaRating = front2->ArenaTeamRating;
-            }
-            if (front1 && front2)
-            {
-                if (front1->JoinTime < front2->JoinTime)
-                    arenaRating = front1->ArenaTeamRating;
-            }
-            else if (!front1 && !front2)
-                return; //queues are empty
-        }
-
-        //set rating range
-        uint32 arenaMinRating = (arenaRating <= sBattleGroundMgr.GetMaxRatingDifference()) ? 0 : arenaRating - sBattleGroundMgr.GetMaxRatingDifference();
-        uint32 arenaMaxRating = arenaRating + sBattleGroundMgr.GetMaxRatingDifference();
-        // if max rating difference is set and the time past since server startup is greater than the rating discard time
-        // (after what time the ratings aren't taken into account when making teams) then
-        // the discard time is current_time - time_to_discard, teams that joined after that, will have their ratings taken into account
-        // else leave the discard time on 0, this way all ratings will be discarded
-        uint32 discardTime = WorldTimer::getMSTime() - sBattleGroundMgr.GetRatingDiscardTimer();
-
-        // we need to find 2 teams which will play next game
-
-        GroupsQueueType::iterator itr_team[BG_TEAMS_COUNT];
-
-        //optimalization : --- we dont need to use selection_pools - each update we select max 2 groups
-
-        for(uint32 i = BG_QUEUE_PREMADE_ALLIANCE; i < BG_QUEUE_NORMAL_ALLIANCE; i++)
-        {
-            // take the group that joined first
-            itr_team[i] = m_QueuedGroups[bracket_id][i].begin();
-            for(; itr_team[i] != m_QueuedGroups[bracket_id][i].end(); ++(itr_team[i]))
-            {
-                // if group match conditions, then add it to pool
-                if( !(*itr_team[i])->IsInvitedToBGInstanceGUID
-                    && (((*itr_team[i])->ArenaTeamRating >= arenaMinRating && (*itr_team[i])->ArenaTeamRating <= arenaMaxRating)
-                        || (*itr_team[i])->JoinTime < discardTime) )
-                {
-                    m_SelectionPools[i].AddGroup((*itr_team[i]), MaxPlayersPerTeam);
-                    // break for cycle to be able to start selecting another group from same faction queue
-                    break;
-                }
-            }
-        }
-        // now we are done if we have 2 groups - ali vs horde!
-        // if we don't have, we must try to continue search in same queue
-        // tmp variables are correctly set
-        // this code isn't much userfriendly - but it is supposed to continue search for mathing group in HORDE queue
-        if (m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount() == 0 && m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount())
-        {
-            itr_team[BG_TEAM_ALLIANCE] = itr_team[BG_TEAM_HORDE];
-            ++itr_team[BG_TEAM_ALLIANCE];
-            for(; itr_team[BG_TEAM_ALLIANCE] != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].end(); ++(itr_team[BG_TEAM_ALLIANCE]))
-            {
-                if( !(*itr_team[BG_TEAM_ALLIANCE])->IsInvitedToBGInstanceGUID
-                    && (((*itr_team[BG_TEAM_ALLIANCE])->ArenaTeamRating >= arenaMinRating && (*itr_team[BG_TEAM_ALLIANCE])->ArenaTeamRating <= arenaMaxRating)
-                        || (*itr_team[BG_TEAM_ALLIANCE])->JoinTime < discardTime) )
-                {
-                    m_SelectionPools[BG_TEAM_ALLIANCE].AddGroup((*itr_team[BG_TEAM_ALLIANCE]), MaxPlayersPerTeam);
-                    break;
-                }
-            }
-        }
-        // this code isn't much userfriendly - but it is supposed to continue search for mathing group in ALLIANCE queue
-        if (m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount() == 0 && m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount())
-        {
-            itr_team[BG_TEAM_HORDE] = itr_team[BG_TEAM_ALLIANCE];
-            ++itr_team[BG_TEAM_HORDE];
-            for(; itr_team[BG_TEAM_HORDE] != m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].end(); ++(itr_team[BG_TEAM_HORDE]))
-            {
-                if( !(*itr_team[BG_TEAM_HORDE])->IsInvitedToBGInstanceGUID
-                    && (((*itr_team[BG_TEAM_HORDE])->ArenaTeamRating >= arenaMinRating && (*itr_team[BG_TEAM_HORDE])->ArenaTeamRating <= arenaMaxRating)
-                        || (*itr_team[BG_TEAM_HORDE])->JoinTime < discardTime) )
-                {
-                    m_SelectionPools[BG_TEAM_HORDE].AddGroup((*itr_team[BG_TEAM_HORDE]), MaxPlayersPerTeam);
-                    break;
-                }
-            }
-        }
-
-        //if we have 2 teams, then start new arena and invite players!
-        if (m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount() && m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount())
-        {
-            BattleGround* arena = sBattleGroundMgr.CreateNewBattleGround(bgTypeId, bracketEntry, arenaType, true);
-            if (!arena)
-            {
-                sLog.outError("BattlegroundQueue::Update couldn't create arena instance for rated arena match!");
-                return;
-            }
-
-            (*(itr_team[BG_TEAM_ALLIANCE]))->OpponentsTeamRating = (*(itr_team[BG_TEAM_HORDE]))->ArenaTeamRating;
-            DEBUG_LOG("setting oposite teamrating for team %u to %u", (*(itr_team[BG_TEAM_ALLIANCE]))->ArenaTeamId, (*(itr_team[BG_TEAM_ALLIANCE]))->OpponentsTeamRating);
-            (*(itr_team[BG_TEAM_HORDE]))->OpponentsTeamRating = (*(itr_team[BG_TEAM_ALLIANCE]))->ArenaTeamRating;
-            DEBUG_LOG("setting oposite teamrating for team %u to %u", (*(itr_team[BG_TEAM_HORDE]))->ArenaTeamId, (*(itr_team[BG_TEAM_HORDE]))->OpponentsTeamRating);
-            // now we must move team if we changed its faction to another faction queue, because then we will spam log by errors in Queue::RemovePlayer
-            if ((*(itr_team[BG_TEAM_ALLIANCE]))->GroupTeam != ALLIANCE)
-            {
-                // add to alliance queue
-                m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].push_front(*(itr_team[BG_TEAM_ALLIANCE]));
-                // erase from horde queue
-                m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].erase(itr_team[BG_TEAM_ALLIANCE]);
-                itr_team[BG_TEAM_ALLIANCE] = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].begin();
-            }
-            if ((*(itr_team[BG_TEAM_HORDE]))->GroupTeam != HORDE)
-            {
-                m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].push_front(*(itr_team[BG_TEAM_HORDE]));
-                m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_ALLIANCE].erase(itr_team[BG_TEAM_HORDE]);
-                itr_team[BG_TEAM_HORDE] = m_QueuedGroups[bracket_id][BG_QUEUE_PREMADE_HORDE].begin();
-            }
-
-            InviteGroupToBG(*(itr_team[BG_TEAM_ALLIANCE]), arena, ALLIANCE);
-            InviteGroupToBG(*(itr_team[BG_TEAM_HORDE]), arena, HORDE);
-
-            DEBUG_LOG("Starting rated arena match!");
-
-            arena->StartBattleGround();
-        }
-    }
-}
-
-/*********************************************************/
-/***            BATTLEGROUND QUEUE EVENTS              ***/
-/*********************************************************/
-
-bool BGQueueInviteEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
-{
-    Player* plr = sObjectMgr.GetPlayer( m_PlayerGuid );
-    // player logged off (we should do nothing, he is correctly removed from queue in another procedure)
-    if (!plr)
-        return true;
-
-    BattleGround* bg = sBattleGroundMgr.GetBattleGround(m_BgInstanceGUID, m_BgTypeId);
-    //if battleground ended and its instance deleted - do nothing
-    if (!bg)
-        return true;
-
-    BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bg->GetTypeID(), bg->GetArenaType());
-    uint32 queueSlot = plr->GetBattleGroundQueueIndex(bgQueueTypeId);
-    if (queueSlot < PLAYER_MAX_BATTLEGROUND_QUEUES)         // player is in queue or in battleground
-    {
-        // check if player is invited to this bg
-        BattleGroundQueue &bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId];
-        if (bgQueue.IsPlayerInvited(m_PlayerGuid, m_BgInstanceGUID, m_RemoveTime))
-        {
-            WorldPacket data;
-            //we must send remaining time in queue
-            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_JOIN, INVITE_ACCEPT_WAIT_TIME - INVITATION_REMIND_TIME, 0, m_ArenaType);
-            plr->GetSession()->SendPacket(&data);
-        }
-    }
-    return true;                                            //event will be deleted
-}
-
-void BGQueueInviteEvent::Abort(uint64 /*e_time*/)
-{
-    //do nothing
-}
-
-/*
-    this event has many possibilities when it is executed:
-    1. player is in battleground ( he clicked enter on invitation window )
-    2. player left battleground queue and he isn't there any more
-    3. player left battleground queue and he joined it again and IsInvitedToBGInstanceGUID = 0
-    4. player left queue and he joined again and he has been invited to same battleground again -> we should not remove him from queue yet
-    5. player is invited to bg and he didn't choose what to do and timer expired - only in this condition we should call queue::RemovePlayer
-    we must remove player in the 5. case even if battleground object doesn't exist!
-*/
-bool BGQueueRemoveEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
-{
-    Player* plr = sObjectMgr.GetPlayer( m_PlayerGuid );
-    if (!plr)
-        // player logged off (we should do nothing, he is correctly removed from queue in another procedure)
-        return true;
-
-    BattleGround* bg = sBattleGroundMgr.GetBattleGround(m_BgInstanceGUID, m_BgTypeId);
-    //battleground can be deleted already when we are removing queue info
-    //bg pointer can be NULL! so use it carefully!
-
-    uint32 queueSlot = plr->GetBattleGroundQueueIndex(m_BgQueueTypeId);
-    if (queueSlot < PLAYER_MAX_BATTLEGROUND_QUEUES)         // player is in queue, or in Battleground
-    {
-        // check if player is in queue for this BG and if we are removing his invite event
-        BattleGroundQueue &bgQueue = sBattleGroundMgr.m_BattleGroundQueues[m_BgQueueTypeId];
-        if (bgQueue.IsPlayerInvited(m_PlayerGuid, m_BgInstanceGUID, m_RemoveTime))
-        {
-            DEBUG_LOG("Battleground: removing player %u from bg queue for instance %u because of not pressing enter battle in time.",plr->GetGUIDLow(),m_BgInstanceGUID);
-
-            plr->RemoveBattleGroundQueueId(m_BgQueueTypeId);
-            bgQueue.RemovePlayer(m_PlayerGuid, true);
-            //update queues if battleground isn't ended
-            if (bg && bg->isBattleGround() && bg->GetStatus() != STATUS_WAIT_LEAVE)
-                sBattleGroundMgr.ScheduleQueueUpdate(0, ARENA_TYPE_NONE, m_BgQueueTypeId, m_BgTypeId, bg->GetBracketId());
-
-            WorldPacket data;
-            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_NONE, 0, 0, ARENA_TYPE_NONE);
-            plr->GetSession()->SendPacket(&data);
-        }
-    }
-
-    //event will be deleted
-    return true;
-}
-
-void BGQueueRemoveEvent::Abort(uint64 /*e_time*/)
-{
-    //do nothing
-}
-
-/*********************************************************/
-/***            BATTLEGROUND MANAGER                   ***/
-/*********************************************************/
-
-BattleGroundMgr::BattleGroundMgr() : m_AutoDistributionTimeChecker(0), m_ArenaTesting(false)
-{
-    for(uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; i++)
-        m_BattleGrounds[i].clear();
-    m_NextRatingDiscardUpdate = sWorld.getConfig(CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER);
-    m_Testing=false;
-}
-
-BattleGroundMgr::~BattleGroundMgr()
-{
-    DeleteAllBattleGrounds();
-}
-
-void BattleGroundMgr::DeleteAllBattleGrounds()
-{
-    // will also delete template bgs:
-    for(uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; ++i)
-    {
-        for(BattleGroundSet::iterator itr = m_BattleGrounds[i].begin(); itr != m_BattleGrounds[i].end();)
-        {
-            BattleGround * bg = itr->second;
-            ++itr;                                          // step from invalidate iterator pos in result element remove in ~BattleGround call
-            delete bg;
-        }
-    }
-}
-
-// used to update running battlegrounds, and delete finished ones
-void BattleGroundMgr::Update(uint32 diff)
-{
-    // update scheduled queues
-    if (!m_QueueUpdateScheduler.empty())
-    {
-        std::vector<uint64> scheduled;
-        {
-            //create mutex
-            //ACE_Guard<ACE_Thread_Mutex> guard(SchedulerLock);
-            //copy vector and clear the other
-            scheduled = std::vector<uint64>(m_QueueUpdateScheduler);
-            m_QueueUpdateScheduler.clear();
-            //release lock
-        }
-
-        for (uint8 i = 0; i < scheduled.size(); i++)
-        {
-            uint32 arenaRating = scheduled[i] >> 32;
-            ArenaType arenaType = ArenaType(scheduled[i] >> 24 & 255);
-            BattleGroundQueueTypeId bgQueueTypeId = BattleGroundQueueTypeId(scheduled[i] >> 16 & 255);
-            BattleGroundTypeId bgTypeId = BattleGroundTypeId((scheduled[i] >> 8) & 255);
-            BattleGroundBracketId bracket_id = BattleGroundBracketId(scheduled[i] & 255);
-            m_BattleGroundQueues[bgQueueTypeId].Update(bgTypeId, bracket_id, arenaType, arenaRating > 0, arenaRating);
-        }
-    }
-
-    // if rating difference counts, maybe force-update queues
-    if (sWorld.getConfig(CONFIG_UINT32_ARENA_MAX_RATING_DIFFERENCE) && sWorld.getConfig(CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER))
-    {
-        // it's time to force update
-        if (m_NextRatingDiscardUpdate < diff)
-        {
-            // forced update for rated arenas (scan all, but skipped non rated)
-            DEBUG_LOG("BattleGroundMgr: UPDATING ARENA QUEUES");
-            for(int qtype = BATTLEGROUND_QUEUE_2v2; qtype <= BATTLEGROUND_QUEUE_5v5; ++qtype)
-                for(int bracket = BG_BRACKET_ID_FIRST; bracket < MAX_BATTLEGROUND_BRACKETS; ++bracket)
-                    m_BattleGroundQueues[qtype].Update(
-                        BATTLEGROUND_AA, BattleGroundBracketId(bracket),
-                        BattleGroundMgr::BGArenaType(BattleGroundQueueTypeId(qtype)), true, 0);
-
-            m_NextRatingDiscardUpdate = sWorld.getConfig(CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER);
-        }
-        else
-            m_NextRatingDiscardUpdate -= diff;
-    }
-    if (sWorld.getConfig(CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS))
-    {
-        if (m_AutoDistributionTimeChecker < diff)
-        {
-            if (sWorld.GetGameTime() > m_NextAutoDistributionTime)
-            {
-                DistributeArenaPoints();
-                m_NextAutoDistributionTime = time_t(m_NextAutoDistributionTime + BATTLEGROUND_ARENA_POINT_DISTRIBUTION_DAY * sWorld.getConfig(CONFIG_UINT32_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS));
-                CharacterDatabase.PExecute("UPDATE saved_variables SET NextArenaPointDistributionTime = '"UI64FMTD"'", uint64(m_NextAutoDistributionTime));
-            }
-            m_AutoDistributionTimeChecker = 600000; // check 10 minutes
-        }
-        else
-            m_AutoDistributionTimeChecker -= diff;
-    }
-}
-
-void BattleGroundMgr::BuildBattleGroundStatusPacket(WorldPacket *data, BattleGround *bg, uint8 QueueSlot, uint8 StatusID, uint32 Time1, uint32 Time2, ArenaType arenatype)
-{
-    // we can be in 2 queues in same time...
-
-    if (StatusID == 0 || !bg)
-    {
-        data->Initialize(SMSG_BATTLEFIELD_STATUS, 4+8);
-        *data << uint32(QueueSlot);                         // queue id (0...1)
-        *data << uint64(0);
-        return;
-    }
-
-    data->Initialize(SMSG_BATTLEFIELD_STATUS, (4+8+1+1+4+1+4+4+4));
-    *data << uint32(QueueSlot);                             // queue id (0...1) - player can be in 2 queues in time
-    // uint64 in client
-    *data << uint64( uint64(arenatype) | (uint64(0x0D) << 8) | (uint64(bg->GetTypeID()) << 16) | (uint64(0x1F90) << 48) );
-    *data << uint8(0);                                      // 3.3.0, some level, only saw 80...
-    *data << uint8(0);                                      // 3.3.0, some level, only saw 80...
-    *data << uint32(bg->GetClientInstanceID());
-    // alliance/horde for BG and skirmish/rated for Arenas
-    // following displays the minimap-icon 0 = faction icon 1 = arenaicon
-    *data << uint8(bg->isRated());
-    *data << uint32(StatusID);                              // status
-    switch(StatusID)
-    {
-        case STATUS_WAIT_QUEUE:                             // status_in_queue
-            *data << uint32(Time1);                         // average wait time, milliseconds
-            *data << uint32(Time2);                         // time in queue, updated every minute!, milliseconds
-            break;
-        case STATUS_WAIT_JOIN:                              // status_invite
-            *data << uint32(bg->GetMapId());                // map id
-            *data << uint64(0);                             // 3.3.5, unknown
-            *data << uint32(Time1);                         // time to remove from queue, milliseconds
-            break;
-        case STATUS_IN_PROGRESS:                            // status_in_progress
-            *data << uint32(bg->GetMapId());                // map id
-            *data << uint64(0);                             // 3.3.5, unknown
-            *data << uint32(Time1);                         // time to bg auto leave, 0 at bg start, 120000 after bg end, milliseconds
-            *data << uint32(Time2);                         // time from bg start, milliseconds
-            *data << uint8(0x1);                            // Lua_GetBattlefieldArenaFaction (bool)
-            break;
-        default:
-            sLog.outError("Unknown BG status!");
-            break;
-    }
-}
-
-void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg)
-{
-    uint8 type = (bg->isArena() ? 1 : 0);
-                                                            // last check on 3.0.3
-    data->Initialize(MSG_PVP_LOG_DATA, (1+1+4+40*bg->GetPlayerScoresSize()));
-    *data << uint8(type);                                   // type (battleground=0/arena=1)
-
-    if(type)                                                // arena
-    {
-        // it seems this must be according to BG_WINNER_A/H and _NOT_ BG_TEAM_A/H
-        for(int i = 1; i >= 0; --i)
-        {
-            uint32 pointsLost = bg->m_ArenaTeamRatingChanges[i] < 0 ? abs(bg->m_ArenaTeamRatingChanges[i]) : 0;
-            uint32 pointsGained = bg->m_ArenaTeamRatingChanges[i] > 0 ? bg->m_ArenaTeamRatingChanges[i] : 0;
-
-            *data << uint32(pointsLost);                        // Rating Lost
-            *data << uint32(pointsGained);                      // Rating gained
-            *data << uint32(0);                                 // Matchmaking Value
-            DEBUG_LOG("rating change: %d", bg->m_ArenaTeamRatingChanges[i]);
-        }
-        for(int i = 1; i >= 0; --i)
-        {
-            uint32 at_id = bg->m_ArenaTeamIds[i];
-            ArenaTeam * at = sObjectMgr.GetArenaTeamById(at_id);
-            if (at)
-                *data << at->GetName();
-            else
-                *data << (uint8)0;
-        }
-    }
-
-    if (bg->GetStatus() != STATUS_WAIT_LEAVE)
-    {
-        *data << uint8(0);                                  // bg not ended
-    }
-    else
-    {
-        *data << uint8(1);                                  // bg ended
-        *data << uint8(bg->GetWinner());                    // who win
-    }
-
-    *data << (int32)(bg->GetPlayerScoresSize());
-
-    for(BattleGround::BattleGroundScoreMap::const_iterator itr = bg->GetPlayerScoresBegin(); itr != bg->GetPlayerScoresEnd(); ++itr)
-    {
-        *data << ObjectGuid(itr->first);
-        *data << (int32)itr->second->KillingBlows;
-        if (type == 0)
-        {
-            *data << (int32)itr->second->HonorableKills;
-            *data << (int32)itr->second->Deaths;
-            *data << (int32)(itr->second->BonusHonor);
-        }
-        else
-        {
-            Team team = bg->GetPlayerTeam(itr->first);
-            if (!team)
-                if (Player* player = sObjectMgr.GetPlayer(itr->first))
-                    team = player->GetTeam();
-
-            if (bg->GetWinner() == team && team != TEAM_NONE)
-                *data << uint8(1);
-            else
-                *data << uint8(0);
-        }
-        *data << (int32)itr->second->DamageDone;             // damage done
-        *data << (int32)itr->second->HealingDone;            // healing done
-        switch(bg->GetTypeID())                              // battleground specific things
-        {
-            case BATTLEGROUND_AV:
-                *data << (uint32)0x00000005;                // count of next fields
-                *data << (uint32)((BattleGroundAVScore*)itr->second)->GraveyardsAssaulted;  // GraveyardsAssaulted
-                *data << (uint32)((BattleGroundAVScore*)itr->second)->GraveyardsDefended;   // GraveyardsDefended
-                *data << (uint32)((BattleGroundAVScore*)itr->second)->TowersAssaulted;      // TowersAssaulted
-                *data << (uint32)((BattleGroundAVScore*)itr->second)->TowersDefended;       // TowersDefended
-                *data << (uint32)((BattleGroundAVScore*)itr->second)->SecondaryObjectives;  // SecondaryObjectives - free some of the Lieutnants
-                break;
-            case BATTLEGROUND_WS:
-                *data << (uint32)0x00000002;                // count of next fields
-                *data << (uint32)((BattleGroundWGScore*)itr->second)->FlagCaptures;         // flag captures
-                *data << (uint32)((BattleGroundWGScore*)itr->second)->FlagReturns;          // flag returns
-                break;
-            case BATTLEGROUND_AB:
-                *data << (uint32)0x00000002;                // count of next fields
-                *data << (uint32)((BattleGroundABScore*)itr->second)->BasesAssaulted;       // bases asssulted
-                *data << (uint32)((BattleGroundABScore*)itr->second)->BasesDefended;        // bases defended
-                break;
-            case BATTLEGROUND_EY:
-                *data << (uint32)0x00000001;                // count of next fields
-                *data << (uint32)((BattleGroundEYScore*)itr->second)->FlagCaptures;         // flag captures
-                break;
-            case BATTLEGROUND_NA:
-            case BATTLEGROUND_BE:
-            case BATTLEGROUND_AA:
-            case BATTLEGROUND_RL:
-            case BATTLEGROUND_SA:                           // wotlk
-            case BATTLEGROUND_DS:                           // wotlk
-            case BATTLEGROUND_RV:                           // wotlk
-            case BATTLEGROUND_IC:                           // wotlk
-            case BATTLEGROUND_RB:                           // wotlk
-                *data << (int32)0;                          // 0
-                break;
-            default:
-                DEBUG_LOG("Unhandled MSG_PVP_LOG_DATA for BG id %u", bg->GetTypeID());
-                *data << (int32)0;
-                break;
-        }
-    }
-}
-
-void BattleGroundMgr::BuildGroupJoinedBattlegroundPacket(WorldPacket *data, GroupJoinBattlegroundResult result)
-{
-    data->Initialize(SMSG_GROUP_JOINED_BATTLEGROUND, 4);
-    *data << int32(result);
-    if(result == ERR_BATTLEGROUND_JOIN_TIMED_OUT || result == ERR_BATTLEGROUND_JOIN_FAILED)
-        *data << uint64(0);                                 // player guid
-}
-
-void BattleGroundMgr::BuildUpdateWorldStatePacket(WorldPacket *data, uint32 field, uint32 value)
-{
-    data->Initialize(SMSG_UPDATE_WORLD_STATE, 4+4);
-    *data << uint32(field);
-    *data << uint32(value);
-}
-
-void BattleGroundMgr::BuildPlaySoundPacket(WorldPacket *data, uint32 soundid)
-{
-    data->Initialize(SMSG_PLAY_SOUND, 4);
-    *data << uint32(soundid);
-}
-
-void BattleGroundMgr::BuildPlayerLeftBattleGroundPacket(WorldPacket *data, ObjectGuid guid)
-{
-    data->Initialize(SMSG_BATTLEGROUND_PLAYER_LEFT, 8);
-    *data << ObjectGuid(guid);
-}
-
-void BattleGroundMgr::BuildPlayerJoinedBattleGroundPacket(WorldPacket *data, Player *plr)
-{
-    data->Initialize(SMSG_BATTLEGROUND_PLAYER_JOINED, 8);
-    *data << plr->GetObjectGuid();
-}
-
-BattleGround * BattleGroundMgr::GetBattleGroundThroughClientInstance(uint32 instanceId, BattleGroundTypeId bgTypeId)
-{
-    //cause at HandleBattleGroundJoinOpcode the clients sends the instanceid he gets from
-    //SMSG_BATTLEFIELD_LIST we need to find the battleground with this clientinstance-id
-    BattleGround* bg = GetBattleGroundTemplate(bgTypeId);
-    if (!bg)
-        return NULL;
-
-    if (bg->isArena())
-        return GetBattleGround(instanceId, bgTypeId);
-
-    for(BattleGroundSet::iterator itr = m_BattleGrounds[bgTypeId].begin(); itr != m_BattleGrounds[bgTypeId].end(); ++itr)
-    {
-        if (itr->second->GetClientInstanceID() == instanceId)
-            return itr->second;
-    }
-    return NULL;
-}
-
-BattleGround * BattleGroundMgr::GetBattleGround(uint32 InstanceID, BattleGroundTypeId bgTypeId)
-{
-    //search if needed
-    BattleGroundSet::iterator itr;
-    if (bgTypeId == BATTLEGROUND_TYPE_NONE)
-    {
-        for(uint32 i = BATTLEGROUND_AV; i < MAX_BATTLEGROUND_TYPE_ID; i++)
-        {
-            itr = m_BattleGrounds[i].find(InstanceID);
-            if (itr != m_BattleGrounds[i].end())
-                return itr->second;
-        }
-        return NULL;
-    }
-    itr = m_BattleGrounds[bgTypeId].find(InstanceID);
-    return ( (itr != m_BattleGrounds[bgTypeId].end()) ? itr->second : NULL );
-}
-
-BattleGround * BattleGroundMgr::GetBattleGroundTemplate(BattleGroundTypeId bgTypeId)
-{
-    //map is sorted and we can be sure that lowest instance id has only BG template
-    return m_BattleGrounds[bgTypeId].empty() ? NULL : m_BattleGrounds[bgTypeId].begin()->second;
-}
-
-uint32 BattleGroundMgr::CreateClientVisibleInstanceId(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id)
-{
-    if (IsArenaType(bgTypeId))
-        return 0;                                           //arenas don't have client-instanceids
-
-    // we create here an instanceid, which is just for
-    // displaying this to the client and without any other use..
-    // the client-instanceIds are unique for each battleground-type
-    // the instance-id just needs to be as low as possible, beginning with 1
-    // the following works, because std::set is default ordered with "<"
-    // the optimalization would be to use as bitmask std::vector<uint32> - but that would only make code unreadable
-    uint32 lastId = 0;
-    ClientBattleGroundIdSet& ids = m_ClientBattleGroundIds[bgTypeId][bracket_id];
-    for(ClientBattleGroundIdSet::const_iterator itr = ids.begin(); itr != ids.end();)
-    {
-        if( (++lastId) != *itr)                             //if there is a gap between the ids, we will break..
-            break;
-        lastId = *itr;
-    }
-    ids.insert(lastId + 1);
-    return lastId + 1;
-}
-
-// create a new battleground that will really be used to play
-BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeId, PvPDifficultyEntry const* bracketEntry, ArenaType arenaType, bool isRated)
-{
-    // get the template BG
-    BattleGround *bg_template = GetBattleGroundTemplate(bgTypeId);
-    if (!bg_template)
-    {
-        sLog.outError("BattleGround: CreateNewBattleGround - bg template not found for %u", bgTypeId);
-        return NULL;
-    }
-
-    //for arenas there is random map used
-    if (bg_template->isArena())
-    {
-        BattleGroundTypeId arenas[] = { BATTLEGROUND_NA, BATTLEGROUND_BE, BATTLEGROUND_RL/*, BATTLEGROUND_DS, BATTLEGROUND_RV*/ };
-        bgTypeId = arenas[urand(0, countof(arenas)-1)];
-        bg_template = GetBattleGroundTemplate(bgTypeId);
-        if (!bg_template)
-        {
-            sLog.outError("BattleGround: CreateNewBattleGround - bg template not found for %u", bgTypeId);
-            return NULL;
-        }
-    }
-
-    BattleGround *bg = NULL;
-    // create a copy of the BG template
-    switch(bgTypeId)
-    {
-        case BATTLEGROUND_AV:
-            bg = new BattleGroundAV(*(BattleGroundAV*)bg_template);
-            break;
-        case BATTLEGROUND_WS:
-            bg = new BattleGroundWS(*(BattleGroundWS*)bg_template);
-            break;
-        case BATTLEGROUND_AB:
-            bg = new BattleGroundAB(*(BattleGroundAB*)bg_template);
-            break;
-        case BATTLEGROUND_NA:
-            bg = new BattleGroundNA(*(BattleGroundNA*)bg_template);
-            break;
-        case BATTLEGROUND_BE:
-            bg = new BattleGroundBE(*(BattleGroundBE*)bg_template);
-            break;
-        case BATTLEGROUND_AA:
-            bg = new BattleGroundAA(*(BattleGroundAA*)bg_template);
-            break;
-        case BATTLEGROUND_EY:
-            bg = new BattleGroundEY(*(BattleGroundEY*)bg_template);
-            break;
-        case BATTLEGROUND_RL:
-            bg = new BattleGroundRL(*(BattleGroundRL*)bg_template);
-            break;
-        case BATTLEGROUND_SA:
-            bg = new BattleGroundSA(*(BattleGroundSA*)bg_template);
-            break;
-        case BATTLEGROUND_DS:
-            bg = new BattleGroundDS(*(BattleGroundDS*)bg_template);
-            break;
-        case BATTLEGROUND_RV:
-            bg = new BattleGroundRV(*(BattleGroundRV*)bg_template);
-            break;
-        case BATTLEGROUND_IC:
-            bg = new BattleGroundIC(*(BattleGroundIC*)bg_template);
-            break;
-        case BATTLEGROUND_RB:
-            bg = new BattleGroundRB(*(BattleGroundRB*)bg_template);
-            break;
-        default:
-            //error, but it is handled few lines above
-            return 0;
-    }
-
-    // set before Map creating for let use proper difficulty
-    bg->SetBracket(bracketEntry);
-
-    // will also set m_bgMap, instanceid
-    sMapMgr.CreateBgMap(bg->GetMapId(), bg);
-
-    bg->SetClientInstanceID(CreateClientVisibleInstanceId(bgTypeId, bracketEntry->GetBracketId()));
-
-    // reset the new bg (set status to status_wait_queue from status_none)
-    bg->Reset();
-
-    // start the joining of the bg
-    bg->SetStatus(STATUS_WAIT_JOIN);
-    bg->SetArenaType(arenaType);
-    bg->SetRated(isRated);
-
-    return bg;
-}
-
-// used to create the BG templates
-uint32 BattleGroundMgr::CreateBattleGround(BattleGroundTypeId bgTypeId, bool IsArena, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam, uint32 LevelMin, uint32 LevelMax, char const* BattleGroundName, uint32 MapID, float Team1StartLocX, float Team1StartLocY, float Team1StartLocZ, float Team1StartLocO, float Team2StartLocX, float Team2StartLocY, float Team2StartLocZ, float Team2StartLocO)
-{
-    // Create the BG
-    BattleGround *bg = NULL;
-    switch(bgTypeId)
-    {
-        case BATTLEGROUND_AV: bg = new BattleGroundAV; break;
-        case BATTLEGROUND_WS: bg = new BattleGroundWS; break;
-        case BATTLEGROUND_AB: bg = new BattleGroundAB; break;
-        case BATTLEGROUND_NA: bg = new BattleGroundNA; break;
-        case BATTLEGROUND_BE: bg = new BattleGroundBE; break;
-        case BATTLEGROUND_AA: bg = new BattleGroundAA; break;
-        case BATTLEGROUND_EY: bg = new BattleGroundEY; break;
-        case BATTLEGROUND_RL: bg = new BattleGroundRL; break;
-        case BATTLEGROUND_SA: bg = new BattleGroundSA; break;
-        case BATTLEGROUND_DS: bg = new BattleGroundDS; break;
-        case BATTLEGROUND_RV: bg = new BattleGroundRV; break;
-        case BATTLEGROUND_IC: bg = new BattleGroundIC; break;
-        case BATTLEGROUND_RB: bg = new BattleGroundRB; break;
-        default:              bg = new BattleGround;   break;                           // placeholder for non implemented BG
-    }
-
-    bg->SetMapId(MapID);
-    bg->SetTypeID(bgTypeId);
-    bg->SetArenaorBGType(IsArena);
-    bg->SetMinPlayersPerTeam(MinPlayersPerTeam);
-    bg->SetMaxPlayersPerTeam(MaxPlayersPerTeam);
-    bg->SetMinPlayers(MinPlayersPerTeam * 2);
-    bg->SetMaxPlayers(MaxPlayersPerTeam * 2);
-    bg->SetName(BattleGroundName);
-    bg->SetTeamStartLoc(ALLIANCE, Team1StartLocX, Team1StartLocY, Team1StartLocZ, Team1StartLocO);
-    bg->SetTeamStartLoc(HORDE,    Team2StartLocX, Team2StartLocY, Team2StartLocZ, Team2StartLocO);
-    bg->SetLevelRange(LevelMin, LevelMax);
-
-    // add bg to update list
-    AddBattleGround(bg->GetInstanceID(), bg->GetTypeID(), bg);
-
-    // return some not-null value, bgTypeId is good enough for me
-    return bgTypeId;
-}
-
-void BattleGroundMgr::CreateInitialBattleGrounds()
-{
-    uint32 count = 0;
-
-    //                                                0   1                 2                 3                4              5             6
-    QueryResult *result = WorldDatabase.Query("SELECT id, MinPlayersPerTeam,MaxPlayersPerTeam,AllianceStartLoc,AllianceStartO,HordeStartLoc,HordeStartO FROM battleground_template");
-
-    if (!result)
-    {
-        BarGoLink bar(1);
-
-        bar.step();
-
-        sLog.outString();
-        sLog.outErrorDb(">> Loaded 0 battlegrounds. DB table `battleground_template` is empty.");
-        return;
-    }
-
-    BarGoLink bar(result->GetRowCount());
-
-    do
-    {
-        Field *fields = result->Fetch();
-        bar.step();
-
-        uint32 bgTypeID_ = fields[0].GetUInt32();
-
-        // can be overwrite by values from DB
-        BattlemasterListEntry const *bl = sBattlemasterListStore.LookupEntry(bgTypeID_);
-        if (!bl)
-        {
-            sLog.outError("Battleground ID %u not found in BattlemasterList.dbc. Battleground not created.", bgTypeID_);
-            continue;
-        }
-
-        BattleGroundTypeId bgTypeID = BattleGroundTypeId(bgTypeID_);
-
-        bool IsArena = (bl->type == TYPE_ARENA);
-        uint32 MinPlayersPerTeam = fields[1].GetUInt32();
-        uint32 MaxPlayersPerTeam = fields[2].GetUInt32();
-
-        //check values from DB
-        if (MaxPlayersPerTeam == 0 || MinPlayersPerTeam == 0)
-        {
-            sLog.outErrorDb("Table `battleground_template` for id %u have wrong min/max players per team settings. BG not created.", bgTypeID);
-            continue;
-        }
-
-        if (MinPlayersPerTeam > MaxPlayersPerTeam)
-            MinPlayersPerTeam = MaxPlayersPerTeam;
-
-        float AStartLoc[4];
-        float HStartLoc[4];
-
-        uint32 start1 = fields[3].GetUInt32();
-
-        WorldSafeLocsEntry const *start = sWorldSafeLocsStore.LookupEntry(start1);
-        if (start)
-        {
-            AStartLoc[0] = start->x;
-            AStartLoc[1] = start->y;
-            AStartLoc[2] = start->z;
-            AStartLoc[3] = fields[4].GetFloat();
-        }
-        else if (bgTypeID == BATTLEGROUND_AA || bgTypeID == BATTLEGROUND_RB)
-        {
-            AStartLoc[0] = 0;
-            AStartLoc[1] = 0;
-            AStartLoc[2] = 0;
-            AStartLoc[3] = fields[4].GetFloat();
-        }
-        else
-        {
-            sLog.outErrorDb("Table `battleground_template` for id %u have nonexistent WorldSafeLocs.dbc id %u in field `AllianceStartLoc`. BG not created.", bgTypeID, start1);
-            continue;
-        }
-
-        uint32 start2 = fields[5].GetUInt32();
-
-        start = sWorldSafeLocsStore.LookupEntry(start2);
-        if (start)
-        {
-            HStartLoc[0] = start->x;
-            HStartLoc[1] = start->y;
-            HStartLoc[2] = start->z;
-            HStartLoc[3] = fields[6].GetFloat();
-        }
-        else if (bgTypeID == BATTLEGROUND_AA || bgTypeID == BATTLEGROUND_RB)
-        {
-            HStartLoc[0] = 0;
-            HStartLoc[1] = 0;
-            HStartLoc[2] = 0;
-            HStartLoc[3] = fields[6].GetFloat();
-        }
-        else
-        {
-            sLog.outErrorDb("Table `battleground_template` for id %u have nonexistent WorldSafeLocs.dbc id %u in field `HordeStartLoc`. BG not created.", bgTypeID, start2);
-            continue;
-        }
-
-        //sLog.outDetail("Creating battleground %s, %u-%u", bl->name[sWorld.GetDBClang()], MinLvl, MaxLvl);
-        if (!CreateBattleGround(bgTypeID, IsArena, MinPlayersPerTeam, MaxPlayersPerTeam, bl->minLevel, bl->maxLevel, bl->name[sWorld.GetDefaultDbcLocale()], bl->mapid[0], AStartLoc[0], AStartLoc[1], AStartLoc[2], AStartLoc[3], HStartLoc[0], HStartLoc[1], HStartLoc[2], HStartLoc[3]))
-            continue;
-
-        ++count;
-    } while (result->NextRow());
-
-    delete result;
-
-    sLog.outString();
-    sLog.outString( ">> Loaded %u battlegrounds", count );
-}
-
-void BattleGroundMgr::InitAutomaticArenaPointDistribution()
-{
-    if (sWorld.getConfig(CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS))
-    {
-        DEBUG_LOG("Initializing Automatic Arena Point Distribution");
-        QueryResult * result = CharacterDatabase.Query("SELECT NextArenaPointDistributionTime FROM saved_variables");
-        if (!result)
-        {
-            DEBUG_LOG("Battleground: Next arena point distribution time not found in SavedVariables, reseting it now.");
-            m_NextAutoDistributionTime = time_t(sWorld.GetGameTime() + BATTLEGROUND_ARENA_POINT_DISTRIBUTION_DAY * sWorld.getConfig(CONFIG_UINT32_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS));
-            CharacterDatabase.PExecute("INSERT INTO saved_variables (NextArenaPointDistributionTime) VALUES ('"UI64FMTD"')", uint64(m_NextAutoDistributionTime));
-        }
-        else
-        {
-            m_NextAutoDistributionTime = time_t((*result)[0].GetUInt64());
-            delete result;
-        }
-        DEBUG_LOG("Automatic Arena Point Distribution initialized.");
-    }
-}
-
-void BattleGroundMgr::DistributeArenaPoints()
-{
-    // used to distribute arena points based on last week's stats
-    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_START);
-
-    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_ONLINE_START);
-
-    //temporary structure for storing maximum points to add values for all players
-    std::map<uint32, uint32> PlayerPoints;
-
-    //at first update all points for all team members
-    for(ObjectMgr::ArenaTeamMap::iterator team_itr = sObjectMgr.GetArenaTeamMapBegin(); team_itr != sObjectMgr.GetArenaTeamMapEnd(); ++team_itr)
-    {
-        if (ArenaTeam * at = team_itr->second)
-        {
-            at->UpdateArenaPointsHelper(PlayerPoints);
-        }
-    }
-
-    //cycle that gives points to all players
-    for (std::map<uint32, uint32>::iterator plr_itr = PlayerPoints.begin(); plr_itr != PlayerPoints.end(); ++plr_itr)
-    {
-        //update to database
-        CharacterDatabase.PExecute("UPDATE characters SET arenaPoints = arenaPoints + '%u' WHERE guid = '%u'", plr_itr->second, plr_itr->first);
-        //add points if player is online
-        if (Player* pl = sObjectMgr.GetPlayer(ObjectGuid(HIGHGUID_PLAYER, plr_itr->first)))
-            pl->ModifyArenaPoints(plr_itr->second);
-    }
-
-    PlayerPoints.clear();
-
-    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_ONLINE_END);
-
-    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_TEAM_START);
-    for(ObjectMgr::ArenaTeamMap::iterator titr = sObjectMgr.GetArenaTeamMapBegin(); titr != sObjectMgr.GetArenaTeamMapEnd(); ++titr)
-    {
-        if (ArenaTeam * at = titr->second)
-        {
-            at->FinishWeek();                              // set played this week etc values to 0 in memory, too
-            at->SaveToDB();                                // save changes
-            at->NotifyStatsChanged();                      // notify the players of the changes
-        }
-    }
-
-    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_TEAM_END);
-
-    sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_END);
-}
-
-void BattleGroundMgr::BuildBattleGroundListPacket(WorldPacket *data, ObjectGuid guid, Player* plr, BattleGroundTypeId bgTypeId, uint8 fromWhere)
-{
-    if (!plr)
-        return;
-
-    data->Initialize(SMSG_BATTLEFIELD_LIST);
-    *data << guid;                                          // battlemaster guid
-    *data << uint8(fromWhere);                              // from where you joined
-    *data << uint32(bgTypeId);                              // battleground id
-    *data << uint8(0);                                      // unk
-    *data << uint8(0);                                      // unk
-
-    // Rewards
-    *data << uint8(0);                                      // 3.3.3 hasWin
-    *data << uint32(0);                                     // 3.3.3 winHonor
-    *data << uint32(0);                                     // 3.3.3 winArena
-    *data << uint32(0);                                     // 3.3.3 lossHonor
-
-    uint8 isRandom = 0;
-    *data << uint8(isRandom);                               // 3.3.3 isRandom
-    if(isRandom)
-    {
-        // Rewards (random)
-        *data << uint8(0);                                  // 3.3.3 hasWin_Random
-        *data << uint32(0);                                 // 3.3.3 winHonor_Random
-        *data << uint32(0);                                 // 3.3.3 winArena_Random
-        *data << uint32(0);                                 // 3.3.3 lossHonor_Random
-    }
-
-    if(bgTypeId == BATTLEGROUND_AA)                         // arena
-    {
-        *data << uint32(0);                                 // arena - no instances showed
-    }
-    else                                                    // battleground
-    {
-        size_t count_pos = data->wpos();
-        uint32 count = 0;
-        *data << uint32(0);                                 // number of bg instances
-
-        if(BattleGround* bgTemplate = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId))
-        {
-            // expected bracket entry
-            if(PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bgTemplate->GetMapId(),plr->getLevel()))
-            {
-                BattleGroundBracketId bracketId = bracketEntry->GetBracketId();
-                ClientBattleGroundIdSet const& ids = m_ClientBattleGroundIds[bgTypeId][bracketId];
-                for(ClientBattleGroundIdSet::const_iterator itr = ids.begin(); itr != ids.end();++itr)
-                {
-                    *data << uint32(*itr);
-                    ++count;
-                }
-                data->put<uint32>( count_pos , count);
-            }
-        }
-    }
-}
-
-void BattleGroundMgr::SendToBattleGround(Player *pl, uint32 instanceId, BattleGroundTypeId bgTypeId)
-{
-    BattleGround *bg = GetBattleGround(instanceId, bgTypeId);
-    if (bg)
-    {
-        uint32 mapid = bg->GetMapId();
-        float x, y, z, O;
-        Team team = pl->GetBGTeam();
-        if (team==0)
-            team = pl->GetTeam();
-        bg->GetTeamStartLoc(team, x, y, z, O);
-
-        DETAIL_LOG("BATTLEGROUND: Sending %s to map %u, X %f, Y %f, Z %f, O %f", pl->GetName(), mapid, x, y, z, O);
-        pl->TeleportTo(mapid, x, y, z, O);
-    }
-    else
-    {
-        sLog.outError("player %u trying to port to nonexistent bg instance %u",pl->GetGUIDLow(), instanceId);
-    }
-}
-
-bool BattleGroundMgr::IsArenaType(BattleGroundTypeId bgTypeId)
-{
-    switch(bgTypeId)
-    {
-        case BATTLEGROUND_NA:
-        case BATTLEGROUND_BE:
-        case BATTLEGROUND_RL:
-        case BATTLEGROUND_DS:
-        case BATTLEGROUND_RV:
-        case BATTLEGROUND_AA:
-            return true;
-        default:
-            return false;
-    };
-}
-
-BattleGroundQueueTypeId BattleGroundMgr::BGQueueTypeId(BattleGroundTypeId bgTypeId, ArenaType arenaType)
-{
-    switch(bgTypeId)
-    {
-        case BATTLEGROUND_WS:
-            return BATTLEGROUND_QUEUE_WS;
-        case BATTLEGROUND_AB:
-            return BATTLEGROUND_QUEUE_AB;
-        case BATTLEGROUND_AV:
-            return BATTLEGROUND_QUEUE_AV;
-        case BATTLEGROUND_EY:
-            return BATTLEGROUND_QUEUE_EY;
-        case BATTLEGROUND_SA:
-            return BATTLEGROUND_QUEUE_SA;
-        case BATTLEGROUND_IC:
-            return BATTLEGROUND_QUEUE_IC;
-        case BATTLEGROUND_RB:
-            return BATTLEGROUND_QUEUE_NONE;
-        case BATTLEGROUND_AA:
-        case BATTLEGROUND_NA:
-        case BATTLEGROUND_RL:
-        case BATTLEGROUND_BE:
-        case BATTLEGROUND_DS:
-        case BATTLEGROUND_RV:
-            switch(arenaType)
-            {
-                case ARENA_TYPE_2v2:
-                    return BATTLEGROUND_QUEUE_2v2;
-                case ARENA_TYPE_3v3:
-                    return BATTLEGROUND_QUEUE_3v3;
-                case ARENA_TYPE_5v5:
-                    return BATTLEGROUND_QUEUE_5v5;
-                default:
-                    return BATTLEGROUND_QUEUE_NONE;
-            }
-        default:
-            return BATTLEGROUND_QUEUE_NONE;
-    }
-}
-
-BattleGroundTypeId BattleGroundMgr::BGTemplateId(BattleGroundQueueTypeId bgQueueTypeId)
-{
-    switch(bgQueueTypeId)
-    {
-        case BATTLEGROUND_QUEUE_WS:
-            return BATTLEGROUND_WS;
-        case BATTLEGROUND_QUEUE_AB:
-            return BATTLEGROUND_AB;
-        case BATTLEGROUND_QUEUE_AV:
-            return BATTLEGROUND_AV;
-        case BATTLEGROUND_QUEUE_EY:
-            return BATTLEGROUND_EY;
-        case BATTLEGROUND_QUEUE_SA:
-            return BATTLEGROUND_SA;
-        case BATTLEGROUND_QUEUE_IC:
-            return BATTLEGROUND_IC;
-        case BATTLEGROUND_QUEUE_2v2:
-        case BATTLEGROUND_QUEUE_3v3:
-        case BATTLEGROUND_QUEUE_5v5:
-            return BATTLEGROUND_AA;
-        default:
-            return BattleGroundTypeId(0);                   // used for unknown template (it exist and do nothing)
-    }
-}
-
-ArenaType BattleGroundMgr::BGArenaType(BattleGroundQueueTypeId bgQueueTypeId)
-{
-    switch(bgQueueTypeId)
-    {
-        case BATTLEGROUND_QUEUE_2v2:
-            return ARENA_TYPE_2v2;
-        case BATTLEGROUND_QUEUE_3v3:
-            return ARENA_TYPE_3v3;
-        case BATTLEGROUND_QUEUE_5v5:
-            return ARENA_TYPE_5v5;
-        default:
-            return ARENA_TYPE_NONE;
-    }
-}
-
-void BattleGroundMgr::ToggleTesting()
-{
-    m_Testing = !m_Testing;
-    if (m_Testing)
-        sWorld.SendWorldText(LANG_DEBUG_BG_ON);
-    else
-        sWorld.SendWorldText(LANG_DEBUG_BG_OFF);
-}
-
-void BattleGroundMgr::ToggleArenaTesting()
-{
-    m_ArenaTesting = !m_ArenaTesting;
-    if (m_ArenaTesting)
-        sWorld.SendWorldText(LANG_DEBUG_ARENA_ON);
-    else
-        sWorld.SendWorldText(LANG_DEBUG_ARENA_OFF);
-}
-
-void BattleGroundMgr::ScheduleQueueUpdate(uint32 arenaRating, ArenaType arenaType, BattleGroundQueueTypeId bgQueueTypeId, BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id)
-{
-    //ACE_Guard<ACE_Thread_Mutex> guard(SchedulerLock);
-    //we will use only 1 number created of bgTypeId and bracket_id
-    uint64 schedule_id = ((uint64)arenaRating << 32) | (arenaType << 24) | (bgQueueTypeId << 16) | (bgTypeId << 8) | bracket_id;
-    bool found = false;
-    for (uint8 i = 0; i < m_QueueUpdateScheduler.size(); i++)
-    {
-        if (m_QueueUpdateScheduler[i] == schedule_id)
-        {
-            found = true;
-            break;
-        }
-    }
-    if (!found)
-        m_QueueUpdateScheduler.push_back(schedule_id);
-}
-
-uint32 BattleGroundMgr::GetMaxRatingDifference() const
-{
-    // this is for stupid people who can't use brain and set max rating difference to 0
-    uint32 diff = sWorld.getConfig(CONFIG_UINT32_ARENA_MAX_RATING_DIFFERENCE);
-    if (diff == 0)
-        diff = 5000;
-    return diff;
-}
-
-uint32 BattleGroundMgr::GetRatingDiscardTimer() const
-{
-    return sWorld.getConfig(CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER);
-}
-
-uint32 BattleGroundMgr::GetPrematureFinishTime() const
-{
-    return sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_PREMATURE_FINISH_TIMER);
-}
-
-void BattleGroundMgr::LoadBattleMastersEntry()
-{
-    mBattleMastersMap.clear();                              // need for reload case
-
-    QueryResult *result = WorldDatabase.Query( "SELECT entry,bg_template FROM battlemaster_entry" );
-
-    uint32 count = 0;
-
-    if (!result)
-    {
-        BarGoLink bar(1);
-        bar.step();
-
-        sLog.outString();
-        sLog.outString(">> Loaded 0 battlemaster entries - table is empty!");
-        return;
-    }
-
-    BarGoLink bar(result->GetRowCount());
-
-    do
-    {
-        ++count;
-        bar.step();
-
-        Field *fields = result->Fetch();
-
-        uint32 entry = fields[0].GetUInt32();
-        uint32 bgTypeId  = fields[1].GetUInt32();
-        if (!sBattlemasterListStore.LookupEntry(bgTypeId))
-        {
-            sLog.outErrorDb("Table `battlemaster_entry` contain entry %u for nonexistent battleground type %u, ignored.", entry, bgTypeId);
-            continue;
-        }
-
-        mBattleMastersMap[entry] = BattleGroundTypeId(bgTypeId);
-
-    } while(result->NextRow());
-
-    delete result;
-
-    sLog.outString();
-    sLog.outString( ">> Loaded %u battlemaster entries", count );
-}
-
-HolidayIds BattleGroundMgr::BGTypeToWeekendHolidayId(BattleGroundTypeId bgTypeId)
-{
-    switch (bgTypeId)
-    {
-        case BATTLEGROUND_AV: return HOLIDAY_CALL_TO_ARMS_AV;
-        case BATTLEGROUND_EY: return HOLIDAY_CALL_TO_ARMS_EY;
-        case BATTLEGROUND_WS: return HOLIDAY_CALL_TO_ARMS_WS;
-        case BATTLEGROUND_SA: return HOLIDAY_CALL_TO_ARMS_SA;
-        case BATTLEGROUND_AB: return HOLIDAY_CALL_TO_ARMS_AB;
-        default: return HOLIDAY_NONE;
-    }
-}
-
-BattleGroundTypeId BattleGroundMgr::WeekendHolidayIdToBGType(HolidayIds holiday)
-{
-    switch (holiday)
-    {
-        case HOLIDAY_CALL_TO_ARMS_AV: return BATTLEGROUND_AV;
-        case HOLIDAY_CALL_TO_ARMS_EY: return BATTLEGROUND_EY;
-        case HOLIDAY_CALL_TO_ARMS_WS: return BATTLEGROUND_WS;
-        case HOLIDAY_CALL_TO_ARMS_SA: return BATTLEGROUND_SA;
-        case HOLIDAY_CALL_TO_ARMS_AB: return BATTLEGROUND_AB;
-        default: return BATTLEGROUND_TYPE_NONE;
-    }
-}
-
-bool BattleGroundMgr::IsBGWeekend(BattleGroundTypeId bgTypeId)
-{
-    return sGameEventMgr.IsActiveHoliday(BGTypeToWeekendHolidayId(bgTypeId));
-}
-
-void BattleGroundMgr::LoadBattleEventIndexes()
-{
-    BattleGroundEventIdx events;
-    events.event1 = BG_EVENT_NONE;
-    events.event2 = BG_EVENT_NONE;
-    m_GameObjectBattleEventIndexMap.clear();             // need for reload case
-    m_GameObjectBattleEventIndexMap[-1] = events;
-    m_CreatureBattleEventIndexMap.clear();               // need for reload case
-    m_CreatureBattleEventIndexMap[-1] = events;
-
-    uint32 count = 0;
-
-    QueryResult *result =
-        //                           0         1           2                3                4              5           6
-        WorldDatabase.Query( "SELECT data.typ, data.guid1, data.ev1 AS ev1, data.ev2 AS ev2, data.map AS m, data.guid2, description.map, "
-        //                              7                  8                   9
-                                      "description.event1, description.event2, description.description "
-                                 "FROM "
-                                    "(SELECT '1' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
-                                        "FROM gameobject_battleground AS a "
-                                        "LEFT OUTER JOIN gameobject AS b ON a.guid = b.guid "
-                                     "UNION "
-                                     "SELECT '2' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
-                                        "FROM creature_battleground AS a "
-                                        "LEFT OUTER JOIN creature AS b ON a.guid = b.guid "
-                                    ") data "
-                                    "RIGHT OUTER JOIN battleground_events AS description ON data.map = description.map "
-                                        "AND data.ev1 = description.event1 AND data.ev2 = description.event2 "
-        // full outer join doesn't work in mysql :-/ so just UNION-select the same again and add a left outer join
-                              "UNION "
-                              "SELECT data.typ, data.guid1, data.ev1, data.ev2, data.map, data.guid2, description.map, "
-                                      "description.event1, description.event2, description.description "
-                                 "FROM "
-                                    "(SELECT '1' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
-                                        "FROM gameobject_battleground AS a "
-                                        "LEFT OUTER JOIN gameobject AS b ON a.guid = b.guid "
-                                     "UNION "
-                                     "SELECT '2' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
-                                        "FROM creature_battleground AS a "
-                                        "LEFT OUTER JOIN creature AS b ON a.guid = b.guid "
-                                    ") data "
-                                    "LEFT OUTER JOIN battleground_events AS description ON data.map = description.map "
-                                        "AND data.ev1 = description.event1 AND data.ev2 = description.event2 "
-                              "ORDER BY m, ev1, ev2" );
-    if (!result)
-    {
-        BarGoLink bar(1);
-        bar.step();
-
-        sLog.outString();
-        sLog.outErrorDb(">> Loaded 0 battleground eventindexes.");
-        return;
-    }
-
-    BarGoLink bar(result->GetRowCount());
-
-    do
-    {
-        bar.step();
-        Field *fields = result->Fetch();
-        if (fields[2].GetUInt8() == BG_EVENT_NONE || fields[3].GetUInt8() == BG_EVENT_NONE)
-            continue;                                       // we don't need to add those to the eventmap
-
-        bool gameobject         = (fields[0].GetUInt8() == 1);
-        uint32 dbTableGuidLow   = fields[1].GetUInt32();
-        events.event1           = fields[2].GetUInt8();
-        events.event2           = fields[3].GetUInt8();
-        uint32 map              = fields[4].GetUInt32();
-
-        uint32 desc_map = fields[6].GetUInt32();
-        uint8 desc_event1 = fields[7].GetUInt8();
-        uint8 desc_event2 = fields[8].GetUInt8();
-        const char *description = fields[9].GetString();
-
-        // checking for NULL - through right outer join this will mean following:
-        if (fields[5].GetUInt32() != dbTableGuidLow)
-        {
-            sLog.outErrorDb("BattleGroundEvent: %s with nonexistent guid %u for event: map:%u, event1:%u, event2:%u (\"%s\")",
-                (gameobject) ? "gameobject" : "creature", dbTableGuidLow, map, events.event1, events.event2, description);
-            continue;
-        }
-
-        // checking for NULL - through full outer join this can mean 2 things:
-        if (desc_map != map)
-        {
-            // there is an event missing
-            if (dbTableGuidLow == 0)
-            {
-                sLog.outErrorDb("BattleGroundEvent: missing db-data for map:%u, event1:%u, event2:%u (\"%s\")", desc_map, desc_event1, desc_event2, description);
-                continue;
-            }
-            // we have an event which shouldn't exist
-            else
-            {
-                sLog.outErrorDb("BattleGroundEvent: %s with guid %u is registered, for a nonexistent event: map:%u, event1:%u, event2:%u",
-                    (gameobject) ? "gameobject" : "creature", dbTableGuidLow, map, events.event1, events.event2);
-                continue;
-            }
-        }
-
-        if (gameobject)
-            m_GameObjectBattleEventIndexMap[dbTableGuidLow] = events;
-        else
-            m_CreatureBattleEventIndexMap[dbTableGuidLow] = events;
-
-        ++count;
-
-    } while(result->NextRow());
-
-    sLog.outString();
-    sLog.outString( ">> Loaded %u battleground eventindexes", count);
-    delete result;
-}
diff --git a/src/game/BattleGroundMgr.h b/src/game/BattleGroundMgr.h
deleted file mode 100644
index 9a3bc01e267..00000000000
--- a/src/game/BattleGroundMgr.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __BATTLEGROUNDMGR_H
-#define __BATTLEGROUNDMGR_H
-
-#include "Common.h"
-#include "Policies/Singleton.h"
-#include "Utilities/EventProcessor.h"
-#include "SharedDefines.h"
-#include "DBCEnums.h"
-#include "BattleGround.h"
-#include "ace/Recursive_Thread_Mutex.h"
-
-typedef std::map<uint32, BattleGround*> BattleGroundSet;
-
-//this container can't be deque, because deque doesn't like removing the last element - if you remove it, it invalidates next iterator and crash appears
-typedef std::list<BattleGround*> BGFreeSlotQueueType;
-
-typedef UNORDERED_MAP<uint32, BattleGroundTypeId> BattleMastersMap;
-typedef UNORDERED_MAP<uint32, BattleGroundEventIdx> CreatureBattleEventIndexesMap;
-typedef UNORDERED_MAP<uint32, BattleGroundEventIdx> GameObjectBattleEventIndexesMap;
-
-#define BATTLEGROUND_ARENA_POINT_DISTRIBUTION_DAY 86400     // seconds in a day
-#define COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME 10
-
-struct GroupQueueInfo;                                      // type predefinition
-struct PlayerQueueInfo                                      // stores information for players in queue
-{
-    uint32  LastOnlineTime;                                 // for tracking and removing offline players from queue after 5 minutes
-    GroupQueueInfo * GroupInfo;                             // pointer to the associated groupqueueinfo
-};
-
-typedef std::map<ObjectGuid, PlayerQueueInfo*> GroupQueueInfoPlayers;
-
-struct GroupQueueInfo                                       // stores information about the group in queue (also used when joined as solo!)
-{
-    GroupQueueInfoPlayers Players;                          // player queue info map
-    Team  GroupTeam;                                        // Player team (ALLIANCE/HORDE)
-    BattleGroundTypeId BgTypeId;                            // battleground type id
-    bool    IsRated;                                        // rated
-    ArenaType arenaType;                                    // 2v2, 3v3, 5v5 or 0 when BG
-    uint32  ArenaTeamId;                                    // team id if rated match
-    uint32  JoinTime;                                       // time when group was added
-    uint32  RemoveInviteTime;                               // time when we will remove invite for players in group
-    uint32  IsInvitedToBGInstanceGUID;                      // was invited to certain BG
-    uint32  ArenaTeamRating;                                // if rated match, inited to the rating of the team
-    uint32  OpponentsTeamRating;                            // for rated arena matches
-};
-
-enum BattleGroundQueueGroupTypes
-{
-    BG_QUEUE_PREMADE_ALLIANCE   = 0,
-    BG_QUEUE_PREMADE_HORDE      = 1,
-    BG_QUEUE_NORMAL_ALLIANCE    = 2,
-    BG_QUEUE_NORMAL_HORDE       = 3
-};
-#define BG_QUEUE_GROUP_TYPES_COUNT 4
-
-class BattleGround;
-class BattleGroundQueue
-{
-    public:
-        BattleGroundQueue();
-        ~BattleGroundQueue();
-
-        void Update(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id, ArenaType arenaType = ARENA_TYPE_NONE, bool isRated = false, uint32 minRating = 0);
-
-        void FillPlayersToBG(BattleGround* bg, BattleGroundBracketId bracket_id);
-        bool CheckPremadeMatch(BattleGroundBracketId bracket_id, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam);
-        bool CheckNormalMatch(BattleGround* bg_template, BattleGroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers);
-        bool CheckSkirmishForSameFaction(BattleGroundBracketId bracket_id, uint32 minPlayersPerTeam);
-        GroupQueueInfo * AddGroup(Player* leader, Group* group, BattleGroundTypeId bgTypeId, PvPDifficultyEntry const*  bracketEntry, ArenaType arenaType, bool isRated, bool isPremade, uint32 ArenaRating, uint32 ArenaTeamId = 0);
-        void RemovePlayer(ObjectGuid guid, bool decreaseInvitedCount);
-        bool IsPlayerInvited(ObjectGuid pl_guid, const uint32 bgInstanceGuid, const uint32 removeTime);
-        bool GetPlayerGroupInfoData(ObjectGuid guid, GroupQueueInfo* ginfo);
-        void PlayerInvitedToBGUpdateAverageWaitTime(GroupQueueInfo* ginfo, BattleGroundBracketId bracket_id);
-        uint32 GetAverageQueueWaitTime(GroupQueueInfo* ginfo, BattleGroundBracketId bracket_id);
-
-    private:
-        //mutex that should not allow changing private data, nor allowing to update Queue during private data change.
-        ACE_Recursive_Thread_Mutex  m_Lock;
-
-
-        typedef std::map<ObjectGuid, PlayerQueueInfo> QueuedPlayersMap;
-        QueuedPlayersMap m_QueuedPlayers;
-
-        //we need constant add to begin and constant remove / add from the end, therefore deque suits our problem well
-        typedef std::list<GroupQueueInfo*> GroupsQueueType;
-
-        /*
-        This two dimensional array is used to store All queued groups
-        First dimension specifies the bgTypeId
-        Second dimension specifies the player's group types -
-             BG_QUEUE_PREMADE_ALLIANCE  is used for premade alliance groups and alliance rated arena teams
-             BG_QUEUE_PREMADE_HORDE     is used for premade horde groups and horde rated arena teams
-             BG_QUEUE_NORMAL_ALLIANCE   is used for normal (or small) alliance groups or non-rated arena matches
-             BG_QUEUE_NORMAL_HORDE      is used for normal (or small) horde groups or non-rated arena matches
-        */
-        GroupsQueueType m_QueuedGroups[MAX_BATTLEGROUND_BRACKETS][BG_QUEUE_GROUP_TYPES_COUNT];
-
-        // class to select and invite groups to bg
-        class SelectionPool
-        {
-        public:
-            void Init();
-            bool AddGroup(GroupQueueInfo *ginfo, uint32 desiredCount);
-            bool KickGroup(uint32 size);
-            uint32 GetPlayerCount() const {return PlayerCount;}
-        public:
-            GroupsQueueType SelectedGroups;
-        private:
-            uint32 PlayerCount;
-        };
-
-        //one selection pool for horde, other one for alliance
-        SelectionPool m_SelectionPools[BG_TEAMS_COUNT];
-
-        bool InviteGroupToBG(GroupQueueInfo * ginfo, BattleGround * bg, Team side);
-        uint32 m_WaitTimes[BG_TEAMS_COUNT][MAX_BATTLEGROUND_BRACKETS][COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME];
-        uint32 m_WaitTimeLastPlayer[BG_TEAMS_COUNT][MAX_BATTLEGROUND_BRACKETS];
-        uint32 m_SumOfWaitTimes[BG_TEAMS_COUNT][MAX_BATTLEGROUND_BRACKETS];
-};
-
-/*
-    This class is used to invite player to BG again, when minute lasts from his first invitation
-    it is capable to solve all possibilities
-*/
-class BGQueueInviteEvent : public BasicEvent
-{
-    public:
-        BGQueueInviteEvent(ObjectGuid pl_guid, uint32 BgInstanceGUID, BattleGroundTypeId BgTypeId, ArenaType arenaType, uint32 removeTime) :
-          m_PlayerGuid(pl_guid), m_BgInstanceGUID(BgInstanceGUID), m_BgTypeId(BgTypeId), m_ArenaType(arenaType), m_RemoveTime(removeTime)
-          {
-          };
-        virtual ~BGQueueInviteEvent() {};
-
-        virtual bool Execute(uint64 e_time, uint32 p_time);
-        virtual void Abort(uint64 e_time);
-    private:
-        ObjectGuid m_PlayerGuid;
-        uint32 m_BgInstanceGUID;
-        BattleGroundTypeId m_BgTypeId;
-        ArenaType m_ArenaType;
-        uint32 m_RemoveTime;
-};
-
-/*
-    This class is used to remove player from BG queue after 1 minute 20 seconds from first invitation
-    We must store removeInvite time in case player left queue and joined and is invited again
-    We must store bgQueueTypeId, because battleground can be deleted already, when player entered it
-*/
-class BGQueueRemoveEvent : public BasicEvent
-{
-    public:
-        BGQueueRemoveEvent(ObjectGuid plGuid, uint32 bgInstanceGUID, BattleGroundTypeId BgTypeId, BattleGroundQueueTypeId bgQueueTypeId, uint32 removeTime)
-            : m_PlayerGuid(plGuid), m_BgInstanceGUID(bgInstanceGUID), m_RemoveTime(removeTime), m_BgTypeId(BgTypeId), m_BgQueueTypeId(bgQueueTypeId)
-        {}
-
-        virtual ~BGQueueRemoveEvent() {}
-
-        virtual bool Execute(uint64 e_time, uint32 p_time);
-        virtual void Abort(uint64 e_time);
-    private:
-        ObjectGuid m_PlayerGuid;
-        uint32 m_BgInstanceGUID;
-        uint32 m_RemoveTime;
-        BattleGroundTypeId m_BgTypeId;
-        BattleGroundQueueTypeId m_BgQueueTypeId;
-};
-
-class BattleGroundMgr
-{
-    public:
-        /* Construction */
-        BattleGroundMgr();
-        ~BattleGroundMgr();
-        void Update(uint32 diff);
-
-        /* Packet Building */
-        void BuildPlayerJoinedBattleGroundPacket(WorldPacket *data, Player *plr);
-        void BuildPlayerLeftBattleGroundPacket(WorldPacket *data, ObjectGuid guid);
-        void BuildBattleGroundListPacket(WorldPacket *data, ObjectGuid guid, Player *plr, BattleGroundTypeId bgTypeId, uint8 fromWhere);
-        void BuildGroupJoinedBattlegroundPacket(WorldPacket *data, GroupJoinBattlegroundResult result);
-        void BuildUpdateWorldStatePacket(WorldPacket *data, uint32 field, uint32 value);
-        void BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg);
-        void BuildBattleGroundStatusPacket(WorldPacket *data, BattleGround *bg, uint8 QueueSlot, uint8 StatusID, uint32 Time1, uint32 Time2, ArenaType arenatype);
-        void BuildPlaySoundPacket(WorldPacket *data, uint32 soundid);
-
-        /* Battlegrounds */
-        BattleGround* GetBattleGroundThroughClientInstance(uint32 instanceId, BattleGroundTypeId bgTypeId);
-        BattleGround* GetBattleGround(uint32 InstanceID, BattleGroundTypeId bgTypeId); //there must be uint32 because MAX_BATTLEGROUND_TYPE_ID means unknown
-
-        BattleGround* GetBattleGroundTemplate(BattleGroundTypeId bgTypeId);
-        BattleGround* CreateNewBattleGround(BattleGroundTypeId bgTypeId, PvPDifficultyEntry const* bracketEntry, ArenaType arenaType, bool isRated);
-
-        uint32 CreateBattleGround(BattleGroundTypeId bgTypeId, bool IsArena, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam, uint32 LevelMin, uint32 LevelMax, char const* BattleGroundName, uint32 MapID, float Team1StartLocX, float Team1StartLocY, float Team1StartLocZ, float Team1StartLocO, float Team2StartLocX, float Team2StartLocY, float Team2StartLocZ, float Team2StartLocO);
-
-        void AddBattleGround(uint32 InstanceID, BattleGroundTypeId bgTypeId, BattleGround* BG) { m_BattleGrounds[bgTypeId][InstanceID] = BG; };
-        void RemoveBattleGround(uint32 instanceID, BattleGroundTypeId bgTypeId) { m_BattleGrounds[bgTypeId].erase(instanceID); }
-        uint32 CreateClientVisibleInstanceId(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id);
-        void DeleteClientVisibleInstanceId(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id, uint32 clientInstanceID)
-        {
-            m_ClientBattleGroundIds[bgTypeId][bracket_id].erase(clientInstanceID);
-        }
-
-        void CreateInitialBattleGrounds();
-        void DeleteAllBattleGrounds();
-
-        void SendToBattleGround(Player *pl, uint32 InstanceID, BattleGroundTypeId bgTypeId);
-
-        /* Battleground queues */
-        //these queues are instantiated when creating BattlegroundMrg
-        BattleGroundQueue m_BattleGroundQueues[MAX_BATTLEGROUND_QUEUE_TYPES]; // public, because we need to access them in BG handler code
-
-        BGFreeSlotQueueType BGFreeSlotQueue[MAX_BATTLEGROUND_TYPE_ID];
-
-        void ScheduleQueueUpdate(uint32 arenaRating, ArenaType arenaType, BattleGroundQueueTypeId bgQueueTypeId, BattleGroundTypeId bgTypeId, BattleGroundBracketId bracket_id);
-        uint32 GetMaxRatingDifference() const;
-        uint32 GetRatingDiscardTimer()  const;
-        uint32 GetPrematureFinishTime() const;
-
-        void InitAutomaticArenaPointDistribution();
-        void DistributeArenaPoints();
-        void ToggleArenaTesting();
-        void ToggleTesting();
-
-        void LoadBattleMastersEntry();
-        BattleGroundTypeId GetBattleMasterBG(uint32 entry) const
-        {
-            BattleMastersMap::const_iterator itr = mBattleMastersMap.find(entry);
-            if (itr != mBattleMastersMap.end())
-                return itr->second;
-            return BATTLEGROUND_TYPE_NONE;
-        }
-
-        void LoadBattleEventIndexes();
-        const BattleGroundEventIdx GetCreatureEventIndex(uint32 dbTableGuidLow) const
-        {
-            CreatureBattleEventIndexesMap::const_iterator itr = m_CreatureBattleEventIndexMap.find(dbTableGuidLow);
-            if(itr != m_CreatureBattleEventIndexMap.end())
-                return itr->second;
-            return m_CreatureBattleEventIndexMap.find(-1)->second;
-        }
-        const BattleGroundEventIdx GetGameObjectEventIndex(uint32 dbTableGuidLow) const
-        {
-            GameObjectBattleEventIndexesMap::const_iterator itr = m_GameObjectBattleEventIndexMap.find(dbTableGuidLow);
-            if(itr != m_GameObjectBattleEventIndexMap.end())
-                return itr->second;
-            return m_GameObjectBattleEventIndexMap.find(-1)->second;
-        }
-
-        bool isArenaTesting() const { return m_ArenaTesting; }
-        bool isTesting() const { return m_Testing; }
-
-        static bool IsArenaType(BattleGroundTypeId bgTypeId);
-        static bool IsBattleGroundType(BattleGroundTypeId bgTypeId) { return !BattleGroundMgr::IsArenaType(bgTypeId); }
-        static BattleGroundQueueTypeId BGQueueTypeId(BattleGroundTypeId bgTypeId, ArenaType arenaType);
-        static BattleGroundTypeId BGTemplateId(BattleGroundQueueTypeId bgQueueTypeId);
-        static ArenaType BGArenaType(BattleGroundQueueTypeId bgQueueTypeId);
-
-        static HolidayIds BGTypeToWeekendHolidayId(BattleGroundTypeId bgTypeId);
-        static BattleGroundTypeId WeekendHolidayIdToBGType(HolidayIds holiday);
-        static bool IsBGWeekend(BattleGroundTypeId bgTypeId);
-    private:
-        ACE_Thread_Mutex    SchedulerLock;
-        BattleMastersMap    mBattleMastersMap;
-        CreatureBattleEventIndexesMap m_CreatureBattleEventIndexMap;
-        GameObjectBattleEventIndexesMap m_GameObjectBattleEventIndexMap;
-
-        /* Battlegrounds */
-        BattleGroundSet m_BattleGrounds[MAX_BATTLEGROUND_TYPE_ID];
-        std::vector<uint64> m_QueueUpdateScheduler;
-        typedef std::set<uint32> ClientBattleGroundIdSet;
-        ClientBattleGroundIdSet m_ClientBattleGroundIds[MAX_BATTLEGROUND_TYPE_ID][MAX_BATTLEGROUND_BRACKETS]; //the instanceids just visible for the client
-        uint32 m_NextRatingDiscardUpdate;
-        time_t m_NextAutoDistributionTime;
-        uint32 m_AutoDistributionTimeChecker;
-        bool   m_ArenaTesting;
-        bool   m_Testing;
-};
-
-#define sBattleGroundMgr MaNGOS::Singleton<BattleGroundMgr>::Instance()
-#endif
diff --git a/src/game/BattleGroundRV.cpp b/src/game/BattleGroundRV.cpp
deleted file mode 100644
index d968bd40a82..00000000000
--- a/src/game/BattleGroundRV.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Player.h"
-#include "BattleGround.h"
-#include "BattleGroundRV.h"
-#include "Language.h"
-
-BattleGroundRV::BattleGroundRV()
-{
-
-    m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
-    m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
-    m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
-    m_StartDelayTimes[BG_STARTING_EVENT_FOURTH] = BG_START_DELAY_NONE;
-    //we must set messageIds
-    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_ARENA_ONE_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_ARENA_THIRTY_SECONDS;
-    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
-    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
-}
-
-BattleGroundRV::~BattleGroundRV()
-{
-
-}
-
-void BattleGroundRV::Update(uint32 diff)
-{
-    BattleGround::Update(diff);
-}
-
-void BattleGroundRV::StartingEventCloseDoors()
-{
-}
-
-void BattleGroundRV::StartingEventOpenDoors()
-{
-}
-
-void BattleGroundRV::AddPlayer(Player *plr)
-{
-    BattleGround::AddPlayer(plr);
-    //create score and add it to map, default values are set in constructor
-    BattleGroundRVScore* sc = new BattleGroundRVScore;
-
-    m_PlayerScores[plr->GetObjectGuid()] = sc;
-}
-
-void BattleGroundRV::RemovePlayer(Player * /*plr*/, ObjectGuid /*guid*/)
-{
-}
-
-void BattleGroundRV::HandleKillPlayer(Player* player, Player* killer)
-{
-    BattleGround::HandleKillPlayer(player, killer);
-}
-
-void BattleGroundRV::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
-{
-}
-
-bool BattleGroundRV::SetupBattleGround()
-{
-    return true;
-}
diff --git a/src/game/BattleGroundRV.h b/src/game/BattleGroundRV.h
deleted file mode 100644
index 2159b35af7b..00000000000
--- a/src/game/BattleGroundRV.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef __BATTLEGROUNDRV_H
-#define __BATTLEGROUNDRV_H
-
-class BattleGround;
-
-class BattleGroundRVScore : public BattleGroundScore
-{
-    public:
-        BattleGroundRVScore() {};
-        virtual ~BattleGroundRVScore() {};
-        //TODO fix me
-};
-
-class BattleGroundRV : public BattleGround
-{
-    friend class BattleGroundMgr;
-
-    public:
-        BattleGroundRV();
-        ~BattleGroundRV();
-        void Update(uint32 diff);
-
-        /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
-        virtual void StartingEventCloseDoors();
-        virtual void StartingEventOpenDoors();
-
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
-        bool SetupBattleGround();
-        void HandleKillPlayer(Player* player, Player *killer);
-};
-#endif
diff --git a/src/game/BattleGroundSA.cpp b/src/game/BattleGroundSA.cpp
deleted file mode 100644
index 49948ec9d08..00000000000
--- a/src/game/BattleGroundSA.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Player.h"
-#include "BattleGround.h"
-#include "BattleGroundSA.h"
-#include "Language.h"
-
-BattleGroundSA::BattleGroundSA()
-{
-    //TODO FIX ME!
-    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
-    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_WS_START_ONE_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_WS_START_HALF_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_WS_HAS_BEGUN;
-}
-
-BattleGroundSA::~BattleGroundSA()
-{
-
-}
-
-void BattleGroundSA::Update(uint32 diff)
-{
-    BattleGround::Update(diff);
-}
-
-void BattleGroundSA::StartingEventCloseDoors()
-{
-}
-
-void BattleGroundSA::StartingEventOpenDoors()
-{
-}
-
-void BattleGroundSA::AddPlayer(Player *plr)
-{
-    BattleGround::AddPlayer(plr);
-    //create score and add it to map, default values are set in constructor
-    BattleGroundSAScore* sc = new BattleGroundSAScore;
-
-    m_PlayerScores[plr->GetObjectGuid()] = sc;
-}
-
-void BattleGroundSA::RemovePlayer(Player* /*plr*/, ObjectGuid /*guid*/)
-{
-
-}
-
-void BattleGroundSA::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
-{
-    // this is wrong way to implement these things. On official it done by gameobject spell cast.
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-}
-
-void BattleGroundSA::UpdatePlayerScore(Player* Source, uint32 type, uint32 value)
-{
-
-    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetObjectGuid());
-    if(itr == m_PlayerScores.end())                         // player not found...
-        return;
-
-    BattleGround::UpdatePlayerScore(Source,type,value);
-}
diff --git a/src/game/BattleGroundSA.h b/src/game/BattleGroundSA.h
deleted file mode 100644
index b3382561df4..00000000000
--- a/src/game/BattleGroundSA.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __BATTLEGROUNDSA_H
-#define __BATTLEGROUNDSA_H
-
-class BattleGround;
-
-#define BG_SA_EVENT_START_BATTLE_1      23748       // Ally / Horde likely
-#define BG_SA_EVENT_START_BATTLE_2      21702
-
-class BattleGroundSAScore : public BattleGroundScore
-{
-    public:
-        BattleGroundSAScore() {};
-        virtual ~BattleGroundSAScore() {};
-};
-
-class BattleGroundSA : public BattleGround
-{
-    friend class BattleGroundMgr;
-
-    public:
-        BattleGroundSA();
-        ~BattleGroundSA();
-        void Update(uint32 diff);
-
-        /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
-        virtual void StartingEventCloseDoors();
-        virtual void StartingEventOpenDoors();
-
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
-        //bool SetupBattleGround();
-
-        /* Scorekeeping */
-        void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
-
-    private:
-};
-#endif
diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp
deleted file mode 100644
index f900fb1f395..00000000000
--- a/src/game/BattleGroundWS.cpp
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Object.h"
-#include "Player.h"
-#include "BattleGround.h"
-#include "BattleGroundWS.h"
-#include "Creature.h"
-#include "GameObject.h"
-#include "ObjectMgr.h"
-#include "BattleGroundMgr.h"
-#include "WorldPacket.h"
-#include "Language.h"
-#include "MapManager.h"
-
-BattleGroundWS::BattleGroundWS()
-{
-    m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = 0;
-    m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_WS_START_ONE_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_WS_START_HALF_MINUTE;
-    m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_WS_HAS_BEGUN;
-}
-
-BattleGroundWS::~BattleGroundWS()
-{
-}
-
-void BattleGroundWS::Update(uint32 diff)
-{
-    BattleGround::Update(diff);
-
-    if (GetStatus() == STATUS_IN_PROGRESS)
-    {
-        if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_WAIT_RESPAWN)
-        {
-            m_FlagsTimer[BG_TEAM_ALLIANCE] -= diff;
-
-            if (m_FlagsTimer[BG_TEAM_ALLIANCE] < 0)
-            {
-                m_FlagsTimer[BG_TEAM_ALLIANCE] = 0;
-                RespawnFlag(ALLIANCE, true);
-            }
-        }
-        if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_ON_GROUND)
-        {
-            m_FlagsDropTimer[BG_TEAM_ALLIANCE] -= diff;
-
-            if (m_FlagsDropTimer[BG_TEAM_ALLIANCE] < 0)
-            {
-                m_FlagsDropTimer[BG_TEAM_ALLIANCE] = 0;
-                RespawnFlagAfterDrop(ALLIANCE);
-            }
-        }
-        if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_WAIT_RESPAWN)
-        {
-            m_FlagsTimer[BG_TEAM_HORDE] -= diff;
-
-            if (m_FlagsTimer[BG_TEAM_HORDE] < 0)
-            {
-                m_FlagsTimer[BG_TEAM_HORDE] = 0;
-                RespawnFlag(HORDE, true);
-            }
-        }
-        if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_ON_GROUND)
-        {
-            m_FlagsDropTimer[BG_TEAM_HORDE] -= diff;
-
-            if (m_FlagsDropTimer[BG_TEAM_HORDE] < 0)
-            {
-                m_FlagsDropTimer[BG_TEAM_HORDE] = 0;
-                RespawnFlagAfterDrop(HORDE);
-            }
-        }
-
-        if (m_EndTimer <= diff)
-        {
-            uint32 allianceScore = GetTeamScore(ALLIANCE);
-            uint32 hordeScore    = GetTeamScore(HORDE);
-
-            if (allianceScore > hordeScore)
-                EndBattleGround(ALLIANCE);
-            else if (allianceScore < hordeScore)
-                EndBattleGround(HORDE);
-            else
-            {
-                // if 0 => tie
-                EndBattleGround(m_LastCapturedFlagTeam);
-            }
-        }
-        else
-        {
-            uint32 minutesLeftPrev = GetRemainingTimeInMinutes();
-            m_EndTimer -= diff;
-            uint32 minutesLeft = GetRemainingTimeInMinutes();
-
-            if (minutesLeft != minutesLeftPrev)
-                UpdateWorldState(BG_WS_TIME_REMAINING, minutesLeft);
-        }
-    }
-}
-
-void BattleGroundWS::StartingEventCloseDoors()
-{
-}
-
-void BattleGroundWS::StartingEventOpenDoors()
-{
-    OpenDoorEvent(BG_EVENT_DOOR);
-
-    // TODO implement timer to despawn doors after a short while
-
-    SpawnEvent(WS_EVENT_SPIRITGUIDES_SPAWN, 0, true);
-    SpawnEvent(WS_EVENT_FLAG_A, 0, true);
-    SpawnEvent(WS_EVENT_FLAG_H, 0, true);
-
-    // Players that join battleground after start are not eligible to get achievement.
-    StartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, BG_WS_EVENT_START_BATTLE);
-}
-
-void BattleGroundWS::AddPlayer(Player *plr)
-{
-    BattleGround::AddPlayer(plr);
-    //create score and add it to map, default values are set in constructor
-    BattleGroundWGScore* sc = new BattleGroundWGScore;
-
-    m_PlayerScores[plr->GetObjectGuid()] = sc;
-}
-
-void BattleGroundWS::RespawnFlag(Team team, bool captured)
-{
-    if (team == ALLIANCE)
-    {
-        DEBUG_LOG("Respawn Alliance flag");
-        m_FlagState[BG_TEAM_ALLIANCE] = BG_WS_FLAG_STATE_ON_BASE;
-        SpawnEvent(WS_EVENT_FLAG_A, 0, true);
-    }
-    else
-    {
-        DEBUG_LOG("Respawn Horde flag");
-        m_FlagState[BG_TEAM_HORDE] = BG_WS_FLAG_STATE_ON_BASE;
-        SpawnEvent(WS_EVENT_FLAG_H, 0, true);
-    }
-
-    if (captured)
-    {
-        //when map_update will be allowed for battlegrounds this code will be useless
-        SpawnEvent(WS_EVENT_FLAG_A, 0, true);
-        SpawnEvent(WS_EVENT_FLAG_H, 0, true);
-        SendMessageToAll(LANG_BG_WS_F_PLACED, CHAT_MSG_BG_SYSTEM_NEUTRAL);
-        PlaySoundToAll(BG_WS_SOUND_FLAGS_RESPAWNED);        // flag respawned sound...
-    }
-}
-
-void BattleGroundWS::RespawnFlagAfterDrop(Team team)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    RespawnFlag(team, false);
-    if (team == ALLIANCE)
-        SendMessageToAll(LANG_BG_WS_ALLIANCE_FLAG_RESPAWNED, CHAT_MSG_BG_SYSTEM_NEUTRAL);
-    else
-        SendMessageToAll(LANG_BG_WS_HORDE_FLAG_RESPAWNED, CHAT_MSG_BG_SYSTEM_NEUTRAL);
-
-    PlaySoundToAll(BG_WS_SOUND_FLAGS_RESPAWNED);
-
-    GameObject *obj = GetBgMap()->GetGameObject(GetDroppedFlagGuid(team));
-    if (obj)
-        obj->Delete();
-    else
-        sLog.outError("Unknown dropped flag bg: %s", GetDroppedFlagGuid(team).GetString().c_str());
-
-    ClearDroppedFlagGuid(team);
-}
-
-void BattleGroundWS::EventPlayerCapturedFlag(Player *Source)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    m_LastCapturedFlagTeam = Source->GetTeam();
-
-    Team winner = TEAM_NONE;
-
-    Source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
-    if (Source->GetTeam() == ALLIANCE)
-    {
-        if (!IsHordeFlagPickedup())
-            return;
-        ClearHordeFlagPicker();                             // must be before aura remove to prevent 2 events (drop+capture) at the same time
-                                                            // horde flag in base (but not respawned yet)
-        m_FlagState[BG_TEAM_HORDE] = BG_WS_FLAG_STATE_WAIT_RESPAWN;
-                                                            // Drop Horde Flag from Player
-        Source->RemoveAurasDueToSpell(BG_WS_SPELL_WARSONG_FLAG);
-        if (GetTeamScore(ALLIANCE) < BG_WS_MAX_TEAM_SCORE)
-            AddPoint(ALLIANCE, 1);
-        PlaySoundToAll(BG_WS_SOUND_FLAG_CAPTURED_ALLIANCE);
-        RewardReputationToTeam(890, m_ReputationCapture, ALLIANCE);
-    }
-    else
-    {
-        if (!IsAllianceFlagPickedup())
-            return;
-        ClearAllianceFlagPicker();                          // must be before aura remove to prevent 2 events (drop+capture) at the same time
-                                                            // alliance flag in base (but not respawned yet)
-        m_FlagState[BG_TEAM_ALLIANCE] = BG_WS_FLAG_STATE_WAIT_RESPAWN;
-                                                            // Drop Alliance Flag from Player
-        Source->RemoveAurasDueToSpell(BG_WS_SPELL_SILVERWING_FLAG);
-        if (GetTeamScore(HORDE) < BG_WS_MAX_TEAM_SCORE)
-            AddPoint(HORDE, 1);
-        PlaySoundToAll(BG_WS_SOUND_FLAG_CAPTURED_HORDE);
-        RewardReputationToTeam(889, m_ReputationCapture, HORDE);
-    }
-    //for flag capture is reward 2 honorable kills
-    RewardHonorToTeam(GetBonusHonorFromKill(2), Source->GetTeam());
-
-    // despawn flags
-    SpawnEvent(WS_EVENT_FLAG_A, 0, false);
-    SpawnEvent(WS_EVENT_FLAG_H, 0, false);
-
-    if (Source->GetTeam() == ALLIANCE)
-        SendMessageToAll(LANG_BG_WS_CAPTURED_HF, CHAT_MSG_BG_SYSTEM_ALLIANCE, Source);
-    else
-        SendMessageToAll(LANG_BG_WS_CAPTURED_AF, CHAT_MSG_BG_SYSTEM_HORDE, Source);
-
-    UpdateFlagState(Source->GetTeam(), 1);                  // flag state none
-    UpdateTeamScore(Source->GetTeam());
-    // only flag capture should be updated
-    UpdatePlayerScore(Source, SCORE_FLAG_CAPTURES, 1);      // +1 flag captures
-
-    if (GetTeamScore(ALLIANCE) == BG_WS_MAX_TEAM_SCORE)
-        winner = ALLIANCE;
-
-    if (GetTeamScore(HORDE) == BG_WS_MAX_TEAM_SCORE)
-        winner = HORDE;
-
-    if (winner)
-    {
-        UpdateWorldState(BG_WS_FLAG_UNK_ALLIANCE, 0);
-        UpdateWorldState(BG_WS_FLAG_UNK_HORDE, 0);
-        UpdateWorldState(BG_WS_FLAG_STATE_ALLIANCE, 1);
-        UpdateWorldState(BG_WS_FLAG_STATE_HORDE, 1);
-
-        EndBattleGround(winner);
-    }
-    else
-    {
-        m_FlagsTimer[GetOtherTeamIndex(GetTeamIndexByTeamId(Source->GetTeam()))] = BG_WS_FLAG_RESPAWN_TIME;
-    }
-}
-
-void BattleGroundWS::EventPlayerDroppedFlag(Player *Source)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-    {
-        // if not running, do not cast things at the dropper player (prevent spawning the "dropped" flag), neither send unnecessary messages
-        // just take off the aura
-        if (Source->GetTeam() == ALLIANCE)
-        {
-            if (!IsHordeFlagPickedup())
-                return;
-            if (GetHordeFlagPickerGuid() == Source->GetObjectGuid())
-            {
-                ClearHordeFlagPicker();
-                Source->RemoveAurasDueToSpell(BG_WS_SPELL_WARSONG_FLAG);
-            }
-        }
-        else
-        {
-            if (!IsAllianceFlagPickedup())
-                return;
-            if (GetAllianceFlagPickerGuid() == Source->GetObjectGuid())
-            {
-                ClearAllianceFlagPicker();
-                Source->RemoveAurasDueToSpell(BG_WS_SPELL_SILVERWING_FLAG);
-            }
-        }
-        return;
-    }
-
-    bool set = false;
-
-    if (Source->GetTeam() == ALLIANCE)
-    {
-        if (!IsHordeFlagPickedup())
-            return;
-        if (GetHordeFlagPickerGuid() == Source->GetObjectGuid())
-        {
-            ClearHordeFlagPicker();
-            Source->RemoveAurasDueToSpell(BG_WS_SPELL_WARSONG_FLAG);
-            m_FlagState[BG_TEAM_HORDE] = BG_WS_FLAG_STATE_ON_GROUND;
-            Source->CastSpell(Source, BG_WS_SPELL_WARSONG_FLAG_DROPPED, true);
-            set = true;
-        }
-    }
-    else
-    {
-        if (!IsAllianceFlagPickedup())
-            return;
-        if (GetAllianceFlagPickerGuid() == Source->GetObjectGuid())
-        {
-            ClearAllianceFlagPicker();
-            Source->RemoveAurasDueToSpell(BG_WS_SPELL_SILVERWING_FLAG);
-            m_FlagState[BG_TEAM_ALLIANCE] = BG_WS_FLAG_STATE_ON_GROUND;
-            Source->CastSpell(Source, BG_WS_SPELL_SILVERWING_FLAG_DROPPED, true);
-            set = true;
-        }
-    }
-
-    if (set)
-    {
-        Source->CastSpell(Source, SPELL_RECENTLY_DROPPED_FLAG, true);
-        UpdateFlagState(Source->GetTeam(), 1);
-
-        if (Source->GetTeam() == ALLIANCE)
-        {
-            SendMessageToAll(LANG_BG_WS_DROPPED_HF, CHAT_MSG_BG_SYSTEM_HORDE, Source);
-            UpdateWorldState(BG_WS_FLAG_UNK_HORDE, uint32(-1));
-        }
-        else
-        {
-            SendMessageToAll(LANG_BG_WS_DROPPED_AF, CHAT_MSG_BG_SYSTEM_ALLIANCE, Source);
-            UpdateWorldState(BG_WS_FLAG_UNK_ALLIANCE, uint32(-1));
-        }
-
-        m_FlagsDropTimer[GetOtherTeamIndex(GetTeamIndexByTeamId(Source->GetTeam()))] = BG_WS_FLAG_DROP_TIME;
-    }
-}
-
-void BattleGroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target_obj)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    int32 message_id = 0;
-    ChatMsg type;
-
-    uint8 event = (sBattleGroundMgr.GetGameObjectEventIndex(target_obj->GetGUIDLow())).event1;
-
-    //alliance flag picked up from base
-    if(Source->GetTeam() == HORDE && GetFlagState(ALLIANCE) == BG_WS_FLAG_STATE_ON_BASE
-        && event == WS_EVENT_FLAG_A)
-    {
-        message_id = LANG_BG_WS_PICKEDUP_AF;
-        type = CHAT_MSG_BG_SYSTEM_HORDE;
-        PlaySoundToAll(BG_WS_SOUND_ALLIANCE_FLAG_PICKED_UP);
-        SpawnEvent(WS_EVENT_FLAG_A, 0, false);
-        SetAllianceFlagPicker(Source->GetObjectGuid());
-        m_FlagState[BG_TEAM_ALLIANCE] = BG_WS_FLAG_STATE_ON_PLAYER;
-        //update world state to show correct flag carrier
-        UpdateFlagState(HORDE, BG_WS_FLAG_STATE_ON_PLAYER);
-        UpdateWorldState(BG_WS_FLAG_UNK_ALLIANCE, 1);
-        Source->CastSpell(Source, BG_WS_SPELL_SILVERWING_FLAG, true);
-    }
-
-    //horde flag picked up from base
-    if (Source->GetTeam() == ALLIANCE && GetFlagState(HORDE) == BG_WS_FLAG_STATE_ON_BASE
-        && event == WS_EVENT_FLAG_H)
-    {
-        message_id = LANG_BG_WS_PICKEDUP_HF;
-        type = CHAT_MSG_BG_SYSTEM_ALLIANCE;
-        PlaySoundToAll(BG_WS_SOUND_HORDE_FLAG_PICKED_UP);
-        SpawnEvent(WS_EVENT_FLAG_H, 0, false);
-        SetHordeFlagPicker(Source->GetObjectGuid());
-        m_FlagState[BG_TEAM_HORDE] = BG_WS_FLAG_STATE_ON_PLAYER;
-        //update world state to show correct flag carrier
-        UpdateFlagState(ALLIANCE, BG_WS_FLAG_STATE_ON_PLAYER);
-        UpdateWorldState(BG_WS_FLAG_UNK_HORDE, 1);
-        Source->CastSpell(Source, BG_WS_SPELL_WARSONG_FLAG, true);
-    }
-
-    //Alliance flag on ground(not in base) (returned or picked up again from ground!)
-    if (GetFlagState(ALLIANCE) == BG_WS_FLAG_STATE_ON_GROUND && Source->IsWithinDistInMap(target_obj, 10))
-    {
-        if (Source->GetTeam() == ALLIANCE)
-        {
-            message_id = LANG_BG_WS_RETURNED_AF;
-            type = CHAT_MSG_BG_SYSTEM_ALLIANCE;
-            UpdateFlagState(HORDE, BG_WS_FLAG_STATE_WAIT_RESPAWN);
-            RespawnFlag(ALLIANCE, false);
-            PlaySoundToAll(BG_WS_SOUND_FLAG_RETURNED);
-            UpdatePlayerScore(Source, SCORE_FLAG_RETURNS, 1);
-        }
-        else
-        {
-            message_id = LANG_BG_WS_PICKEDUP_AF;
-            type = CHAT_MSG_BG_SYSTEM_HORDE;
-            PlaySoundToAll(BG_WS_SOUND_ALLIANCE_FLAG_PICKED_UP);
-            SpawnEvent(WS_EVENT_FLAG_A, 0, false);
-            SetAllianceFlagPicker(Source->GetObjectGuid());
-            Source->CastSpell(Source, BG_WS_SPELL_SILVERWING_FLAG, true);
-            m_FlagState[BG_TEAM_ALLIANCE] = BG_WS_FLAG_STATE_ON_PLAYER;
-            UpdateFlagState(HORDE, BG_WS_FLAG_STATE_ON_PLAYER);
-            UpdateWorldState(BG_WS_FLAG_UNK_ALLIANCE, 1);
-        }
-        //called in HandleGameObjectUseOpcode:
-        //target_obj->Delete();
-    }
-
-    //Horde flag on ground(not in base) (returned or picked up again)
-    if (GetFlagState(HORDE) == BG_WS_FLAG_STATE_ON_GROUND && Source->IsWithinDistInMap(target_obj, 10))
-    {
-        if (Source->GetTeam() == HORDE)
-        {
-            message_id = LANG_BG_WS_RETURNED_HF;
-            type = CHAT_MSG_BG_SYSTEM_HORDE;
-            UpdateFlagState(ALLIANCE, BG_WS_FLAG_STATE_WAIT_RESPAWN);
-            RespawnFlag(HORDE, false);
-            PlaySoundToAll(BG_WS_SOUND_FLAG_RETURNED);
-            UpdatePlayerScore(Source, SCORE_FLAG_RETURNS, 1);
-        }
-        else
-        {
-            message_id = LANG_BG_WS_PICKEDUP_HF;
-            type = CHAT_MSG_BG_SYSTEM_ALLIANCE;
-            PlaySoundToAll(BG_WS_SOUND_HORDE_FLAG_PICKED_UP);
-            SpawnEvent(WS_EVENT_FLAG_H, 0, false);
-            SetHordeFlagPicker(Source->GetObjectGuid());
-            Source->CastSpell(Source, BG_WS_SPELL_WARSONG_FLAG, true);
-            m_FlagState[BG_TEAM_HORDE] = BG_WS_FLAG_STATE_ON_PLAYER;
-            UpdateFlagState(ALLIANCE, BG_WS_FLAG_STATE_ON_PLAYER);
-            UpdateWorldState(BG_WS_FLAG_UNK_HORDE, 1);
-        }
-        //called in HandleGameObjectUseOpcode:
-        //target_obj->Delete();
-    }
-
-    if (!message_id)
-        return;
-
-    SendMessageToAll(message_id, type, Source);
-    Source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
-}
-
-void BattleGroundWS::RemovePlayer(Player *plr, ObjectGuid guid)
-{
-    // sometimes flag aura not removed :(
-    if (IsAllianceFlagPickedup() && m_FlagKeepers[BG_TEAM_ALLIANCE] == guid)
-    {
-        if (!plr)
-        {
-            sLog.outError("BattleGroundWS: Removing offline player who has the FLAG!!");
-            ClearAllianceFlagPicker();
-            RespawnFlag(ALLIANCE, false);
-        }
-        else
-            EventPlayerDroppedFlag(plr);
-    }
-    if (IsHordeFlagPickedup() && m_FlagKeepers[BG_TEAM_HORDE] == guid)
-    {
-        if (!plr)
-        {
-            sLog.outError("BattleGroundWS: Removing offline player who has the FLAG!!");
-            ClearHordeFlagPicker();
-            RespawnFlag(HORDE, false);
-        }
-        else
-            EventPlayerDroppedFlag(plr);
-    }
-}
-
-void BattleGroundWS::UpdateFlagState(Team team, uint32 value)
-{
-    if (team == ALLIANCE)
-        UpdateWorldState(BG_WS_FLAG_STATE_ALLIANCE, value);
-    else
-        UpdateWorldState(BG_WS_FLAG_STATE_HORDE, value);
-}
-
-void BattleGroundWS::UpdateTeamScore(Team team)
-{
-    if (team == ALLIANCE)
-        UpdateWorldState(BG_WS_FLAG_CAPTURES_ALLIANCE, GetTeamScore(team));
-    else
-        UpdateWorldState(BG_WS_FLAG_CAPTURES_HORDE, GetTeamScore(team));
-}
-
-void BattleGroundWS::HandleAreaTrigger(Player *Source, uint32 Trigger)
-{
-    // this is wrong way to implement these things. On official it done by gameobject spell cast.
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    //uint32 SpellId = 0;
-    //uint64 buff_guid = 0;
-    switch(Trigger)
-    {
-        case 3686:                                          // Alliance elixir of speed spawn. Trigger not working, because located inside other areatrigger, can be replaced by IsWithinDist(object, dist) in BattleGround::Update().
-        case 3687:                                          // Horde elixir of speed spawn. Trigger not working, because located inside other areatrigger, can be replaced by IsWithinDist(object, dist) in BattleGround::Update().
-        case 3706:                                          // Alliance elixir of regeneration spawn
-        case 3708:                                          // Horde elixir of regeneration spawn
-        case 3707:                                          // Alliance elixir of berserk spawn
-        case 3709:                                          // Horde elixir of berserk spawn
-            break;
-        case 3646:                                          // Alliance Flag spawn
-            if (m_FlagState[BG_TEAM_HORDE] && !m_FlagState[BG_TEAM_ALLIANCE])
-                if (GetHordeFlagPickerGuid() == Source->GetObjectGuid())
-                    EventPlayerCapturedFlag(Source);
-            break;
-        case 3647:                                          // Horde Flag spawn
-            if (m_FlagState[BG_TEAM_ALLIANCE] && !m_FlagState[BG_TEAM_HORDE])
-                if (GetAllianceFlagPickerGuid() == Source->GetObjectGuid())
-                    EventPlayerCapturedFlag(Source);
-            break;
-        case 3649:                                          // unk1
-        case 3688:                                          // unk2
-        case 4628:                                          // unk3
-        case 4629:                                          // unk4
-            break;
-        default:
-            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", Trigger);
-            Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
-            break;
-    }
-}
-
-bool BattleGroundWS::SetupBattleGround()
-{
-    return true;
-}
-
-void BattleGroundWS::Reset()
-{
-    //call parent's class reset
-    BattleGround::Reset();
-
-    // spiritguides and flags not spawned at beginning
-    m_ActiveEvents[WS_EVENT_SPIRITGUIDES_SPAWN] = BG_EVENT_NONE;
-    m_ActiveEvents[WS_EVENT_FLAG_A] = BG_EVENT_NONE;
-    m_ActiveEvents[WS_EVENT_FLAG_H] = BG_EVENT_NONE;
-
-    for(uint32 i = 0; i < BG_TEAMS_COUNT; ++i)
-    {
-        m_DroppedFlagGuid[i].Clear();
-        m_FlagKeepers[i].Clear();
-        m_FlagState[i]       = BG_WS_FLAG_STATE_ON_BASE;
-        m_TeamScores[i]      = 0;
-    }
-    bool isBGWeekend = BattleGroundMgr::IsBGWeekend(GetTypeID());
-    m_ReputationCapture = (isBGWeekend) ? 45 : 35;
-    m_HonorWinKills = (isBGWeekend) ? 3 : 1;
-    m_HonorEndKills = (isBGWeekend) ? 4 : 2;
-
-    m_EndTimer = BG_WS_TIME_LIMIT;
-    m_LastCapturedFlagTeam = TEAM_NONE;
-}
-
-void BattleGroundWS::EndBattleGround(Team winner)
-{
-    //win reward
-    if (winner == ALLIANCE)
-        RewardHonorToTeam(GetBonusHonorFromKill(m_HonorWinKills), ALLIANCE);
-    if (winner == HORDE)
-        RewardHonorToTeam(GetBonusHonorFromKill(m_HonorWinKills), HORDE);
-    //complete map_end rewards (even if no team wins)
-    RewardHonorToTeam(GetBonusHonorFromKill(m_HonorEndKills), ALLIANCE);
-    RewardHonorToTeam(GetBonusHonorFromKill(m_HonorEndKills), HORDE);
-
-    BattleGround::EndBattleGround(winner);
-}
-
-void BattleGroundWS::HandleKillPlayer(Player *player, Player *killer)
-{
-    if (GetStatus() != STATUS_IN_PROGRESS)
-        return;
-
-    EventPlayerDroppedFlag(player);
-
-    BattleGround::HandleKillPlayer(player, killer);
-}
-
-void BattleGroundWS::UpdatePlayerScore(Player *Source, uint32 type, uint32 value)
-{
-
-    BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetObjectGuid());
-    if(itr == m_PlayerScores.end())                         // player not found
-        return;
-
-    switch(type)
-    {
-        case SCORE_FLAG_CAPTURES:                           // flags captured
-            ((BattleGroundWGScore*)itr->second)->FlagCaptures += value;
-            break;
-        case SCORE_FLAG_RETURNS:                            // flags returned
-            ((BattleGroundWGScore*)itr->second)->FlagReturns += value;
-            break;
-        default:
-            BattleGround::UpdatePlayerScore(Source, type, value);
-            break;
-    }
-}
-
-WorldSafeLocsEntry const* BattleGroundWS::GetClosestGraveYard(Player* player)
-{
-    //if status in progress, it returns main graveyards with spiritguides
-    //else it will return the graveyard in the flagroom - this is especially good
-    //if a player dies in preparation phase - then the player can't cheat
-    //and teleport to the graveyard outside the flagroom
-    //and start running around, while the doors are still closed
-    if (player->GetTeam() == ALLIANCE)
-    {
-        if (GetStatus() == STATUS_IN_PROGRESS)
-            return sWorldSafeLocsStore.LookupEntry(WS_GRAVEYARD_MAIN_ALLIANCE);
-        else
-            return sWorldSafeLocsStore.LookupEntry(WS_GRAVEYARD_FLAGROOM_ALLIANCE);
-    }
-    else
-    {
-        if (GetStatus() == STATUS_IN_PROGRESS)
-            return sWorldSafeLocsStore.LookupEntry(WS_GRAVEYARD_MAIN_HORDE);
-        else
-            return sWorldSafeLocsStore.LookupEntry(WS_GRAVEYARD_FLAGROOM_HORDE);
-    }
-}
-
-void BattleGroundWS::FillInitialWorldStates(WorldPacket& data, uint32& count)
-{
-    FillInitialWorldState(data, count, BG_WS_FLAG_CAPTURES_ALLIANCE, GetTeamScore(ALLIANCE));
-    FillInitialWorldState(data, count, BG_WS_FLAG_CAPTURES_HORDE, GetTeamScore(HORDE));
-
-    if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_ON_GROUND)
-        FillInitialWorldState(data, count, BG_WS_FLAG_UNK_ALLIANCE, -1);
-    else if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_ON_PLAYER)
-        FillInitialWorldState(data, count, BG_WS_FLAG_UNK_ALLIANCE, 1);
-    else
-        FillInitialWorldState(data, count, BG_WS_FLAG_UNK_ALLIANCE, 0);
-
-    if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_ON_GROUND)
-        FillInitialWorldState(data, count, BG_WS_FLAG_UNK_HORDE, -1);
-    else if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_ON_PLAYER)
-        FillInitialWorldState(data, count, BG_WS_FLAG_UNK_HORDE, 1);
-    else
-        FillInitialWorldState(data, count, BG_WS_FLAG_UNK_HORDE, 0);
-
-    FillInitialWorldState(data, count, BG_WS_FLAG_CAPTURES_MAX, BG_WS_MAX_TEAM_SCORE);
-
-    if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_ON_PLAYER)
-        FillInitialWorldState(data, count, BG_WS_FLAG_STATE_HORDE, 2);
-    else
-        FillInitialWorldState(data, count, BG_WS_FLAG_STATE_HORDE, 1);
-
-    if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_ON_PLAYER)
-        FillInitialWorldState(data, count, BG_WS_FLAG_STATE_ALLIANCE, 2);
-    else
-        FillInitialWorldState(data, count, BG_WS_FLAG_STATE_ALLIANCE, 1);
-
-    FillInitialWorldState(data, count, BG_WS_TIME_ENABLED, 1);
-    FillInitialWorldState(data, count, BG_WS_TIME_REMAINING, GetRemainingTimeInMinutes());
-}
diff --git a/src/game/BattleGroundWS.h b/src/game/BattleGroundWS.h
deleted file mode 100644
index 86f6e1c1e32..00000000000
--- a/src/game/BattleGroundWS.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __BATTLEGROUNDWS_H
-#define __BATTLEGROUNDWS_H
-
-#include "BattleGround.h"
-
-#define BG_WS_MAX_TEAM_SCORE      3
-#define BG_WS_FLAG_RESPAWN_TIME   (23*IN_MILLISECONDS)
-#define BG_WS_FLAG_DROP_TIME      (10*IN_MILLISECONDS)
-#define BG_WS_TIME_LIMIT          (25*MINUTE*IN_MILLISECONDS)
-#define BG_WS_EVENT_START_BATTLE  8563
-
-enum BG_WS_Sound
-{
-    BG_WS_SOUND_FLAG_CAPTURED_ALLIANCE  = 8173,
-    BG_WS_SOUND_FLAG_CAPTURED_HORDE     = 8213,
-    BG_WS_SOUND_FLAG_PLACED             = 8232,
-    BG_WS_SOUND_FLAG_RETURNED           = 8192,
-    BG_WS_SOUND_HORDE_FLAG_PICKED_UP    = 8212,
-    BG_WS_SOUND_ALLIANCE_FLAG_PICKED_UP = 8174,
-    BG_WS_SOUND_FLAGS_RESPAWNED         = 8232
-};
-
-enum BG_WS_SpellId
-{
-    BG_WS_SPELL_WARSONG_FLAG            = 23333,
-    BG_WS_SPELL_WARSONG_FLAG_DROPPED    = 23334,
-    BG_WS_SPELL_SILVERWING_FLAG         = 23335,
-    BG_WS_SPELL_SILVERWING_FLAG_DROPPED = 23336
-};
-
-enum BG_WS_WorldStates
-{
-    BG_WS_FLAG_UNK_ALLIANCE       = 1545,
-    BG_WS_FLAG_UNK_HORDE          = 1546,
-//    FLAG_UNK                      = 1547,
-    BG_WS_FLAG_CAPTURES_ALLIANCE  = 1581,
-    BG_WS_FLAG_CAPTURES_HORDE     = 1582,
-    BG_WS_FLAG_CAPTURES_MAX       = 1601,
-    BG_WS_FLAG_STATE_HORDE        = 2338,
-    BG_WS_FLAG_STATE_ALLIANCE     = 2339,
-    BG_WS_TIME_ENABLED            = 4247,
-    BG_WS_TIME_REMAINING          = 4248
-};
-
-enum BG_WS_FlagState
-{
-    BG_WS_FLAG_STATE_ON_BASE      = 0,
-    BG_WS_FLAG_STATE_WAIT_RESPAWN = 1,
-    BG_WS_FLAG_STATE_ON_PLAYER    = 2,
-    BG_WS_FLAG_STATE_ON_GROUND    = 3
-};
-
-enum BG_WS_Graveyards
-{
-    WS_GRAVEYARD_FLAGROOM_ALLIANCE = 769,
-    WS_GRAVEYARD_FLAGROOM_HORDE    = 770,
-    WS_GRAVEYARD_MAIN_ALLIANCE     = 771,
-    WS_GRAVEYARD_MAIN_HORDE        = 772
-};
-
-class BattleGroundWGScore : public BattleGroundScore
-{
-    public:
-        BattleGroundWGScore() : FlagCaptures(0), FlagReturns(0) {};
-        virtual ~BattleGroundWGScore() {};
-        uint32 FlagCaptures;
-        uint32 FlagReturns;
-};
-
-
-enum BG_WS_Events
-{
-    WS_EVENT_FLAG_A               = 0,
-    WS_EVENT_FLAG_H               = 1,
-    // spiritguides will spawn (same moment, like WS_EVENT_DOOR_OPEN)
-    WS_EVENT_SPIRITGUIDES_SPAWN   = 2
-};
-
-class BattleGroundWS : public BattleGround
-{
-    friend class BattleGroundMgr;
-
-    public:
-        /* Construction */
-        BattleGroundWS();
-        ~BattleGroundWS();
-        void Update(uint32 diff);
-
-        /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
-        virtual void StartingEventCloseDoors();
-        virtual void StartingEventOpenDoors();
-
-        /* BG Flags */
-        ObjectGuid GetAllianceFlagPickerGuid() const{ return m_FlagKeepers[BG_TEAM_ALLIANCE]; }
-        ObjectGuid GetHordeFlagPickerGuid() const   { return m_FlagKeepers[BG_TEAM_HORDE]; }
-        void SetAllianceFlagPicker(ObjectGuid guid) { m_FlagKeepers[BG_TEAM_ALLIANCE] = guid; }
-        void SetHordeFlagPicker(ObjectGuid guid)    { m_FlagKeepers[BG_TEAM_HORDE] = guid; }
-        void ClearAllianceFlagPicker()              { m_FlagKeepers[BG_TEAM_ALLIANCE].Clear(); }
-        void ClearHordeFlagPicker()                 { m_FlagKeepers[BG_TEAM_HORDE].Clear(); }
-        bool IsAllianceFlagPickedup() const         { return !m_FlagKeepers[BG_TEAM_ALLIANCE].IsEmpty(); }
-        bool IsHordeFlagPickedup() const            { return !m_FlagKeepers[BG_TEAM_HORDE].IsEmpty(); }
-        void RespawnFlag(Team team, bool captured);
-        void RespawnFlagAfterDrop(Team team);
-        uint8 GetFlagState(Team team)             { return m_FlagState[GetTeamIndexByTeamId(team)]; }
-
-        /* Battleground Events */
-        virtual void EventPlayerDroppedFlag(Player *Source);
-        virtual void EventPlayerClickedOnFlag(Player *Source, GameObject* target_obj);
-        virtual void EventPlayerCapturedFlag(Player *Source);
-
-        void RemovePlayer(Player *plr, ObjectGuid guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
-        void HandleKillPlayer(Player *player, Player *killer);
-        bool SetupBattleGround();
-        virtual void Reset();
-        void EndBattleGround(Team winner);
-        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
-        uint32 GetRemainingTimeInMinutes() { return m_EndTimer ? (m_EndTimer-1) / (MINUTE * IN_MILLISECONDS) + 1 : 0; }
-
-        void UpdateFlagState(Team team, uint32 value);
-        void UpdateTeamScore(Team team);
-        void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
-        void SetDroppedFlagGuid(ObjectGuid guid, Team team)  { m_DroppedFlagGuid[GetTeamIndexByTeamId(team)] = guid;}
-        void ClearDroppedFlagGuid(Team team)  { m_DroppedFlagGuid[GetTeamIndexByTeamId(team)].Clear();}
-        ObjectGuid const& GetDroppedFlagGuid(Team team) const { return m_DroppedFlagGuid[GetTeamIndexByTeamId(team)];}
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count);
-
-        /* Scorekeeping */
-        uint32 GetTeamScore(Team team) const            { return m_TeamScores[GetTeamIndexByTeamId(team)]; }
-        void AddPoint(Team team, uint32 Points = 1)     { m_TeamScores[GetTeamIndexByTeamId(team)] += Points; }
-        void SetTeamPoint(Team team, uint32 Points = 0) { m_TeamScores[GetTeamIndexByTeamId(team)] = Points; }
-        void RemovePoint(Team team, uint32 Points = 1)  { m_TeamScores[GetTeamIndexByTeamId(team)] -= Points; }
-    private:
-        ObjectGuid m_FlagKeepers[BG_TEAMS_COUNT];
-
-        ObjectGuid m_DroppedFlagGuid[BG_TEAMS_COUNT];
-        uint8 m_FlagState[BG_TEAMS_COUNT];
-        int32 m_FlagsTimer[BG_TEAMS_COUNT];
-        int32 m_FlagsDropTimer[BG_TEAMS_COUNT];
-
-        uint32 m_ReputationCapture;
-        uint32 m_HonorWinKills;
-        uint32 m_HonorEndKills;
-        uint32 m_EndTimer;
-        Team   m_LastCapturedFlagTeam;
-};
-#endif
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index c3a83bb82f5..2441ea9f25d 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -16,12 +16,972 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-file(GLOB_RECURSE game_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h)
+set(LIBRARY_NAME game)
+
+set(LIBRARY_SRCS
+AccountMgr.cpp
+AccountMgr.h
+AchievementMgr.cpp
+AchievementMgr.h
+AggressorAI.cpp
+AggressorAI.h
+AntiCheat.cpp
+AntiCheat.h
+ArenaTeam.cpp
+ArenaTeam.h
+ArenaTeamHandler.cpp
+AuctionHouseHandler.cpp
+AuctionHouseMgr.cpp
+AuctionHouseMgr.h
+Bag.cpp
+Bag.h
+Calendar.cpp
+Calendar.h
+CalendarHandler.cpp
+Camera.cpp
+Camera.h
+Cell.h
+CellImpl.h
+Channel.cpp
+Channel.h
+ChannelHandler.cpp
+ChannelMgr.cpp
+ChannelMgr.h
+CharacterDatabaseCleaner.cpp
+CharacterDatabaseCleaner.h
+CharacterHandler.cpp
+Chat.cpp
+Chat.h
+ChatHandler.cpp
+ChatLexicsCutter.cpp
+ChatLexicsCutter.h
+ChatLog.cpp
+ChatLog.h
+CombatHandler.cpp
+Corpse.cpp
+Corpse.h
+CreatureAI.cpp
+CreatureAI.h
+CreatureAIImpl.h
+CreatureAIRegistry.cpp
+CreatureAIRegistry.h
+CreatureAISelector.cpp
+CreatureAISelector.h
+Creature.cpp
+CreatureEventAI.cpp
+CreatureEventAI.h
+CreatureEventAIMgr.cpp
+CreatureEventAIMgr.h
+Creature.h
+CreatureLinkingMgr.cpp
+CreatureLinkingMgr.h
+DBCEnums.h
+DBCfmt.h
+DBCStores.cpp
+DBCStores.h
+DBCStructure.cpp
+DBCStructure.h
+debugcmds.cpp
+DuelHandler.cpp
+DynamicObject.cpp
+DynamicObject.h
+FollowerReference.cpp
+FollowerReference.h
+FollowerRefManager.h
+Formulas.h
+GameEventMgr.cpp
+GameEventMgr.h
+GameObject.cpp
+GameObject.h
+GMTicketHandler.cpp
+GMTicketMgr.cpp
+GMTicketMgr.h
+GossipDef.cpp
+GossipDef.h
+GridDefines.h
+GridMap.cpp
+GridMap.h
+GridNotifiers.cpp
+GridNotifiers.h
+GridNotifiersImpl.h
+Group.cpp
+Group.h
+GroupHandler.cpp
+GroupReference.cpp
+GroupReference.h
+GroupRefManager.h
+GuardAI.cpp
+GuardAI.h
+Guild.cpp
+Guild.h
+GuildHandler.cpp
+GuildMgr.cpp
+GuildMgr.h
+HostileRefManager.cpp
+HostileRefManager.h
+InstanceData.cpp
+InstanceData.h
+Item.cpp
+ItemEnchantmentMgr.cpp
+ItemEnchantmentMgr.h
+Item.h
+ItemHandler.cpp
+ItemPrototype.h
+Language.h
+Level0.cpp
+Level1.cpp
+Level2.cpp
+Level3.cpp
+LFG.cpp
+LFG.h
+LFGHandler.cpp
+LFGMgr.cpp
+LFGMgr.h
+LootHandler.cpp
+LootMgr.cpp
+LootMgr.h
+Mail.cpp
+Mail.h
+MailHandler.cpp
+Map.cpp
+Map.h
+MapManager.cpp
+MapManager.h
+MapPersistentStateMgr.cpp
+MapPersistentStateMgr.h
+MapReference.h
+MapRefManager.h
+MapUpdater.cpp
+MapUpdater.h
+MassMailMgr.cpp
+MassMailMgr.h
+MiscHandler.cpp
+MotionMaster.cpp
+MotionMaster.h
+MoveMap.cpp
+MoveMap.h
+MoveMapSharedDefines.h
+MovementHandler.cpp
+NPCHandler.cpp
+NPCHandler.h
+NullCreatureAI.cpp
+NullCreatureAI.h
+ObjectAccessor.cpp
+ObjectAccessor.h
+Object.cpp
+ObjectGridLoader.cpp
+ObjectGridLoader.h
+ObjectGuid.cpp
+ObjectGuid.h
+Object.h
+ObjectLock.h
+ObjectMgr.cpp
+ObjectMgr.h
+ObjectPosSelector.cpp
+ObjectPosSelector.h
+Opcodes.cpp
+Opcodes.h
+PathFinder.cpp
+PathFinder.h
+Path.h
+pchdef.cpp
+pchdef.h
+PetAI.cpp
+PetAI.h
+Pet.cpp
+Pet.h
+PetHandler.cpp
+PetitionsHandler.cpp
+Player.cpp
+PlayerDump.cpp
+PlayerDump.h
+Player.h
+PoolManager.cpp
+PoolManager.h
+QueryHandler.cpp
+QuestDef.cpp
+QuestDef.h
+QuestHandler.cpp
+ReactorAI.cpp
+ReactorAI.h
+ReputationMgr.cpp
+ReputationMgr.h
+ScriptMgr.cpp
+ScriptMgr.h
+SharedDefines.h
+SkillHandler.cpp
+SocialMgr.cpp
+SocialMgr.h
+SpellAuraDefines.h
+SpellAuras.cpp
+SpellAuras.h
+SpellClassMask.h
+Spell.cpp
+SpellEffects.cpp
+Spell.h
+SpellHandler.cpp
+SpellMgr.cpp
+SpellMgr.h
+SQLStorages.cpp
+SQLStorages.h
+StateMgr.cpp
+StateMgr.h
+StateMgrImpl.h
+StatSystem.cpp
+TaxiHandler.cpp
+TemporarySummon.cpp
+TemporarySummon.h
+ThreatManager.cpp
+ThreatManager.h
+TotemAI.cpp
+TotemAI.h
+Totem.cpp
+Totem.h
+TradeHandler.cpp
+Transports.cpp
+Transports.h
+TransportSystem.cpp
+TransportSystem.h
+UnitAuraProcHandler.cpp
+Unit.cpp
+UnitEvents.h
+Unit.h
+UpdateData.cpp
+UpdateData.h
+UpdateFieldFlags.cpp
+UpdateFieldFlags.h
+UpdateFields.h
+UpdateMask.h
+Vehicle.cpp
+Vehicle.h
+VehicleHandler.cpp
+VoiceChatHandler.cpp
+WaypointManager.cpp
+WaypointManager.h
+Weather.cpp
+Weather.h
+World.cpp
+World.h
+WorldLocation.cpp
+WorldLocation.h
+WorldObjectEvents.cpp
+WorldObjectEvents.h
+WorldSession.cpp
+WorldSession.h
+WorldSocket.cpp
+WorldSocket.h
+WorldSocketMgr.cpp
+WorldSocketMgr.h
+WorldStateMgr.cpp
+WorldStateMgr.h
+
+AuctionHouseBot/AuctionHouseBot.cpp
+AuctionHouseBot/AuctionHouseBot.h
+
+BattleField/BattleField.cpp
+BattleField/BattleField.h
+
+BattleGround/BattleGroundAA.cpp
+BattleGround/BattleGroundAA.h
+BattleGround/BattleGroundAB.cpp
+BattleGround/BattleGroundAB.h
+BattleGround/BattleGroundAV.cpp
+BattleGround/BattleGroundAV.h
+BattleGround/BattleGroundBE.cpp
+BattleGround/BattleGroundBE.h
+BattleGround/BattleGround.cpp
+BattleGround/BattleGroundDS.cpp
+BattleGround/BattleGroundDS.h
+BattleGround/BattleGroundEY.cpp
+BattleGround/BattleGroundEY.h
+BattleGround/BattleGround.h
+BattleGround/BattleGroundHandler.cpp
+BattleGround/BattleGroundIC.cpp
+BattleGround/BattleGroundIC.h
+BattleGround/BattleGroundMgr.cpp
+BattleGround/BattleGroundMgr.h
+BattleGround/BattleGroundNA.cpp
+BattleGround/BattleGroundNA.h
+BattleGround/BattleGroundRB.cpp
+BattleGround/BattleGroundRB.h
+BattleGround/BattleGroundRL.cpp
+BattleGround/BattleGroundRL.h
+BattleGround/BattleGroundRV.cpp
+BattleGround/BattleGroundRV.h
+BattleGround/BattleGroundSA.cpp
+BattleGround/BattleGroundSA.h
+BattleGround/BattleGroundWS.cpp
+BattleGround/BattleGroundWS.h
+
+OutdoorPvP/OutdoorPvP.cpp
+OutdoorPvP/OutdoorPvPEP.cpp
+OutdoorPvP/OutdoorPvPEP.h
+OutdoorPvP/OutdoorPvPGH.cpp
+OutdoorPvP/OutdoorPvPGH.h
+OutdoorPvP/OutdoorPvP.h
+OutdoorPvP/OutdoorPvPHP.cpp
+OutdoorPvP/OutdoorPvPHP.h
+OutdoorPvP/OutdoorPvPMgr.cpp
+OutdoorPvP/OutdoorPvPMgr.h
+OutdoorPvP/OutdoorPvPNA.cpp
+OutdoorPvP/OutdoorPvPNA.h
+OutdoorPvP/OutdoorPvPSI.cpp
+OutdoorPvP/OutdoorPvPSI.h
+OutdoorPvP/OutdoorPvPTF.cpp
+OutdoorPvP/OutdoorPvPTF.h
+OutdoorPvP/OutdoorPvPZM.cpp
+OutdoorPvP/OutdoorPvPZM.h
+
+movement/MoveSpline.cpp
+movement/MoveSplineFlag.h
+movement/MoveSpline.h
+movement/MoveSplineInitArgs.h
+movement/MoveSplineInit.cpp
+movement/MoveSplineInit.h
+movement/packet_builder.cpp
+movement/packet_builder.h
+movement/spline.cpp
+movement/spline.h
+movement/spline.impl.h
+movement/typedefs.h
+movement/util.cpp
+
+movementGenerators/ConfusedMovementGenerator.cpp
+movementGenerators/ConfusedMovementGenerator.h
+movementGenerators/FleeingMovementGenerator.cpp
+movementGenerators/FleeingMovementGenerator.h
+movementGenerators/HomeMovementGenerator.cpp
+movementGenerators/HomeMovementGenerator.h
+movementGenerators/IdleMovementGenerator.cpp
+movementGenerators/IdleMovementGenerator.h
+movementGenerators/MovementGenerator.cpp
+movementGenerators/MovementGenerator.h
+movementGenerators/MovementGeneratorImpl.h
+movementGenerators/PointMovementGenerator.cpp
+movementGenerators/PointMovementGenerator.h
+movementGenerators/RandomMovementGenerator.cpp
+movementGenerators/RandomMovementGenerator.h
+movementGenerators/TargetedMovementGenerator.cpp
+movementGenerators/TargetedMovementGenerator.h
+movementGenerators/WaypointMovementGenerator.cpp
+movementGenerators/WaypointMovementGenerator.h
+
+vmap/BIH.cpp
+vmap/BIH.h
+vmap/BIHWrap.h
+vmap/DynamicTree.cpp
+vmap/DynamicTree.h
+vmap/GameObjectModel.cpp
+vmap/GameObjectModel.h
+vmap/IVMapManager.h
+vmap/MapTree.cpp
+vmap/MapTree.h
+vmap/ModelInstance.cpp
+vmap/ModelInstance.h
+vmap/RegularGrid.h
+vmap/TileAssembler.cpp
+vmap/TileAssembler.h
+vmap/VMapDefinitions.h
+vmap/VMapFactory.cpp
+vmap/VMapFactory.h
+vmap/VMapManager2.cpp
+vmap/VMapManager2.h
+vmap/VMapTools.h
+vmap/WorldModel.cpp
+vmap/WorldModel.h
+
+warden/WardenBase.cpp
+warden/WardenBase.h
+warden/WardenDataStorage.cpp
+warden/WardenDataStorage.h
+warden/WardenMac.cpp
+warden/WardenMac.h
+warden/WardenModuleMac.h
+warden/WardenModuleWin.h
+warden/WardenWin.cpp
+warden/WardenWin.h
+
+playerbot/AiFactory.cpp
+playerbot/AiFactory.h
+playerbot/ChatFilter.cpp
+playerbot/ChatFilter.h
+playerbot/ChatHelper.cpp
+playerbot/ChatHelper.h
+playerbot/FleeManager.cpp
+playerbot/FleeManager.h
+playerbot/Helpers.cpp
+playerbot/LazyCalculatedValue.h
+playerbot/LootObjectStack.cpp
+playerbot/LootObjectStack.h
+playerbot/PlayerbotAI.cpp
+playerbot/PlayerbotAI.h
+playerbot/PlayerbotAIAware.h
+playerbot/PlayerbotAIBase.cpp
+playerbot/PlayerbotAIBase.h
+playerbot/PlayerbotAIConfig.cpp
+playerbot/PlayerbotAIConfig.h
+playerbot/PlayerbotFactory.cpp
+playerbot/PlayerbotFactory.h
+playerbot/PlayerbotMgr.cpp
+playerbot/PlayerbotMgr.h
+playerbot/PlayerbotSecurity.cpp
+playerbot/PlayerbotSecurity.h
+playerbot/RandomPlayerbotFactory.cpp
+playerbot/RandomPlayerbotFactory.h
+playerbot/RandomPlayerbotMgr.cpp
+playerbot/RandomPlayerbotMgr.h
+playerbot/playerbot.h
+playerbot/playerbotDefs.h
+playerbot/strategy/Action.cpp
+playerbot/strategy/Action.h
+playerbot/strategy/ActionBasket.cpp
+playerbot/strategy/ActionBasket.h
+playerbot/strategy/AiObject.cpp
+playerbot/strategy/AiObject.h
+playerbot/strategy/AiObjectContext.cpp
+playerbot/strategy/AiObjectContext.h
+playerbot/strategy/Engine.cpp
+playerbot/strategy/Engine.h
+playerbot/strategy/Event.cpp
+playerbot/strategy/Event.h
+playerbot/strategy/ExternalEventHelper.h
+playerbot/strategy/ItemVisitors.h
+playerbot/strategy/Multiplier.cpp
+playerbot/strategy/Multiplier.h
+playerbot/strategy/NamedObjectContext.h
+playerbot/strategy/PassiveMultiplier.cpp
+playerbot/strategy/PassiveMultiplier.h
+playerbot/strategy/Queue.cpp
+playerbot/strategy/Queue.h
+playerbot/strategy/Strategy.cpp
+playerbot/strategy/Strategy.h
+playerbot/strategy/StrategyContext.h
+playerbot/strategy/Trigger.cpp
+playerbot/strategy/Trigger.h
+playerbot/strategy/Value.cpp
+playerbot/strategy/Value.h
+playerbot/strategy/actions/AcceptDuelAction.h
+playerbot/strategy/actions/AcceptInvitationAction.h
+playerbot/strategy/actions/AcceptQuestAction.cpp
+playerbot/strategy/actions/AcceptQuestAction.h
+playerbot/strategy/actions/AcceptResurrectAction.h
+playerbot/strategy/actions/ActionContext.h
+playerbot/strategy/actions/AddLootAction.cpp
+playerbot/strategy/actions/AddLootAction.h
+playerbot/strategy/actions/AreaTriggerAction.cpp
+playerbot/strategy/actions/AreaTriggerAction.h
+playerbot/strategy/actions/AttackAction.cpp
+playerbot/strategy/actions/AttackAction.h
+playerbot/strategy/actions/BankAction.cpp
+playerbot/strategy/actions/BankAction.h
+playerbot/strategy/actions/BuffAction.cpp
+playerbot/strategy/actions/BuffAction.h
+playerbot/strategy/actions/BuyAction.cpp
+playerbot/strategy/actions/BuyAction.h
+playerbot/strategy/actions/CastCustomSpellAction.cpp
+playerbot/strategy/actions/CastCustomSpellAction.h
+playerbot/strategy/actions/ChangeChatAction.cpp
+playerbot/strategy/actions/ChangeChatAction.h
+playerbot/strategy/actions/ChangeStrategyAction.cpp
+playerbot/strategy/actions/ChangeStrategyAction.h
+playerbot/strategy/actions/ChangeTalentsAction.cpp
+playerbot/strategy/actions/ChangeTalentsAction.h
+playerbot/strategy/actions/ChatActionContext.h
+playerbot/strategy/actions/ChatShortcutActions.cpp
+playerbot/strategy/actions/ChatShortcutActions.h
+playerbot/strategy/actions/CheckMountStateAction.cpp
+playerbot/strategy/actions/CheckMountStateAction.h
+playerbot/strategy/actions/ChooseTargetActions.h
+playerbot/strategy/actions/DestroyItemAction.cpp
+playerbot/strategy/actions/DestroyItemAction.h
+playerbot/strategy/actions/DropQuestAction.cpp
+playerbot/strategy/actions/DropQuestAction.h
+playerbot/strategy/actions/EmoteAction.cpp
+playerbot/strategy/actions/EmoteAction.h
+playerbot/strategy/actions/EquipAction.cpp
+playerbot/strategy/actions/EquipAction.h
+playerbot/strategy/actions/FollowActions.cpp
+playerbot/strategy/actions/FollowActions.h
+playerbot/strategy/actions/GenericActions.cpp
+playerbot/strategy/actions/GenericActions.h
+playerbot/strategy/actions/GenericSpellActions.cpp
+playerbot/strategy/actions/GenericSpellActions.h
+playerbot/strategy/actions/GossipHelloAction.cpp
+playerbot/strategy/actions/GossipHelloAction.h
+playerbot/strategy/actions/GuildBankAction.cpp
+playerbot/strategy/actions/GuildBankAction.h
+playerbot/strategy/actions/HelpAction.cpp
+playerbot/strategy/actions/HelpAction.h
+playerbot/strategy/actions/InventoryAction.cpp
+playerbot/strategy/actions/InventoryAction.h
+playerbot/strategy/actions/InventoryChangeFailureAction.cpp
+playerbot/strategy/actions/InventoryChangeFailureAction.h
+playerbot/strategy/actions/InviteToGroupAction.h
+playerbot/strategy/actions/LeaveGroupAction.h
+playerbot/strategy/actions/LfgActions.cpp
+playerbot/strategy/actions/LfgActions.h
+playerbot/strategy/actions/ListQuestsActions.cpp
+playerbot/strategy/actions/ListQuestsActions.h
+playerbot/strategy/actions/ListSpellsAction.cpp
+playerbot/strategy/actions/ListSpellsAction.h
+playerbot/strategy/actions/LogLevelAction.cpp
+playerbot/strategy/actions/LogLevelAction.h
+playerbot/strategy/actions/LootAction.cpp
+playerbot/strategy/actions/LootAction.h
+playerbot/strategy/actions/LootRollAction.cpp
+playerbot/strategy/actions/LootRollAction.h
+playerbot/strategy/actions/LootStrategyAction.cpp
+playerbot/strategy/actions/LootStrategyAction.h
+playerbot/strategy/actions/MovementActions.cpp
+playerbot/strategy/actions/MovementActions.h
+playerbot/strategy/actions/NonCombatActions.cpp
+playerbot/strategy/actions/NonCombatActions.h
+playerbot/strategy/actions/PassLeadershipToMasterAction.h
+playerbot/strategy/actions/PositionAction.cpp
+playerbot/strategy/actions/PositionAction.h
+playerbot/strategy/actions/QueryItemUsageAction.cpp
+playerbot/strategy/actions/QueryItemUsageAction.h
+playerbot/strategy/actions/QueryQuestAction.cpp
+playerbot/strategy/actions/QueryQuestAction.h
+playerbot/strategy/actions/QuestAction.cpp
+playerbot/strategy/actions/QuestAction.h
+playerbot/strategy/actions/ReachTargetActions.h
+playerbot/strategy/actions/ReadyCheckAction.cpp
+playerbot/strategy/actions/ReadyCheckAction.h
+playerbot/strategy/actions/ReleaseSpiritAction.h
+playerbot/strategy/actions/RememberTaxiAction.cpp
+playerbot/strategy/actions/RememberTaxiAction.h
+playerbot/strategy/actions/RepairAllAction.cpp
+playerbot/strategy/actions/RepairAllAction.h
+playerbot/strategy/actions/ResetAiAction.cpp
+playerbot/strategy/actions/ResetAiAction.h
+playerbot/strategy/actions/ReviveFromCorpseAction.cpp
+playerbot/strategy/actions/ReviveFromCorpseAction.h
+playerbot/strategy/actions/RewardAction.cpp
+playerbot/strategy/actions/RewardAction.h
+playerbot/strategy/actions/RtiAction.h
+playerbot/strategy/actions/SellAction.cpp
+playerbot/strategy/actions/SellAction.h
+playerbot/strategy/actions/SetHomeAction.cpp
+playerbot/strategy/actions/SetHomeAction.h
+playerbot/strategy/actions/StatsAction.cpp
+playerbot/strategy/actions/StatsAction.h
+playerbot/strategy/actions/StayActions.cpp
+playerbot/strategy/actions/StayActions.h
+playerbot/strategy/actions/SuggestWhatToDoAction.cpp
+playerbot/strategy/actions/SuggestWhatToDoAction.h
+playerbot/strategy/actions/TalkToQuestGiverAction.cpp
+playerbot/strategy/actions/TalkToQuestGiverAction.h
+playerbot/strategy/actions/TaxiAction.cpp
+playerbot/strategy/actions/TaxiAction.h
+playerbot/strategy/actions/TeleportAction.cpp
+playerbot/strategy/actions/TeleportAction.h
+playerbot/strategy/actions/TellCastFailedAction.cpp
+playerbot/strategy/actions/TellCastFailedAction.h
+playerbot/strategy/actions/TellItemCountAction.cpp
+playerbot/strategy/actions/TellItemCountAction.h
+playerbot/strategy/actions/TellLosAction.cpp
+playerbot/strategy/actions/TellLosAction.h
+playerbot/strategy/actions/TellMasterAction.h
+playerbot/strategy/actions/TellReputationAction.cpp
+playerbot/strategy/actions/TellReputationAction.h
+playerbot/strategy/actions/TellTargetAction.cpp
+playerbot/strategy/actions/TellTargetAction.h
+playerbot/strategy/actions/TradeAction.cpp
+playerbot/strategy/actions/TradeAction.h
+playerbot/strategy/actions/TradeStatusAction.cpp
+playerbot/strategy/actions/TradeStatusAction.h
+playerbot/strategy/actions/TrainerAction.cpp
+playerbot/strategy/actions/TrainerAction.h
+playerbot/strategy/actions/UnequipAction.cpp
+playerbot/strategy/actions/UnequipAction.h
+playerbot/strategy/actions/UseItemAction.cpp
+playerbot/strategy/actions/UseItemAction.h
+playerbot/strategy/actions/UseMeetingStoneAction.cpp
+playerbot/strategy/actions/UseMeetingStoneAction.h
+playerbot/strategy/actions/WhoAction.cpp
+playerbot/strategy/actions/WhoAction.h
+playerbot/strategy/actions/WorldPacketActionContext.h
+playerbot/strategy/actions/SaveManaAction.h
+playerbot/strategy/actions/SaveManaAction.cpp
+playerbot/strategy/actions/SecurityCheckAction.h
+playerbot/strategy/actions/SecurityCheckAction.cpp
+playerbot/strategy/actions/GuildAcceptAction.h
+playerbot/strategy/actions/GuildAcceptAction.cpp
+playerbot/strategy/druid/BearTankDruidStrategy.cpp
+playerbot/strategy/druid/BearTankDruidStrategy.h
+playerbot/strategy/druid/CasterDruidStrategy.cpp
+playerbot/strategy/druid/CasterDruidStrategy.h
+playerbot/strategy/druid/CatDpsDruidStrategy.cpp
+playerbot/strategy/druid/CatDpsDruidStrategy.h
+playerbot/strategy/druid/DruidActions.cpp
+playerbot/strategy/druid/DruidActions.h
+playerbot/strategy/druid/DruidAiObjectContext.cpp
+playerbot/strategy/druid/DruidAiObjectContext.h
+playerbot/strategy/druid/DruidBearActions.h
+playerbot/strategy/druid/DruidCatActions.h
+playerbot/strategy/druid/DruidMultipliers.cpp
+playerbot/strategy/druid/DruidMultipliers.h
+playerbot/strategy/druid/DruidShapeshiftActions.h
+playerbot/strategy/druid/DruidTriggers.cpp
+playerbot/strategy/druid/DruidTriggers.h
+playerbot/strategy/druid/FeralDruidStrategy.cpp
+playerbot/strategy/druid/FeralDruidStrategy.h
+playerbot/strategy/druid/GenericDruidNonCombatStrategy.cpp
+playerbot/strategy/druid/GenericDruidNonCombatStrategy.h
+playerbot/strategy/druid/GenericDruidStrategy.cpp
+playerbot/strategy/druid/GenericDruidStrategy.h
+playerbot/strategy/druid/HealDruidStrategy.cpp
+playerbot/strategy/druid/HealDruidStrategy.h
+playerbot/strategy/generic/AttackEnemyPlayersStrategy.cpp
+playerbot/strategy/generic/AttackEnemyPlayersStrategy.h
+playerbot/strategy/generic/AttackRtiStrategy.cpp
+playerbot/strategy/generic/AttackRtiStrategy.h
+playerbot/strategy/generic/AttackWeakStrategy.cpp
+playerbot/strategy/generic/AttackWeakStrategy.h
+playerbot/strategy/generic/CastTimeStrategy.cpp
+playerbot/strategy/generic/CastTimeStrategy.h
+playerbot/strategy/generic/ChatCommandHandlerStrategy.cpp
+playerbot/strategy/generic/ChatCommandHandlerStrategy.h
+playerbot/strategy/generic/CombatStrategy.cpp
+playerbot/strategy/generic/CombatStrategy.h
+playerbot/strategy/generic/ConserveManaStrategy.cpp
+playerbot/strategy/generic/ConserveManaStrategy.h
+playerbot/strategy/generic/DeadStrategy.cpp
+playerbot/strategy/generic/DeadStrategy.h
+playerbot/strategy/generic/DpsAoeStrategy.cpp
+playerbot/strategy/generic/DpsAoeStrategy.h
+playerbot/strategy/generic/DpsAssistStrategy.cpp
+playerbot/strategy/generic/DpsAssistStrategy.h
+playerbot/strategy/generic/DuelStrategy.cpp
+playerbot/strategy/generic/DuelStrategy.h
+playerbot/strategy/generic/EmoteStrategy.cpp
+playerbot/strategy/generic/EmoteStrategy.h
+playerbot/strategy/generic/FleeStrategy.cpp
+playerbot/strategy/generic/FleeStrategy.h
+playerbot/strategy/generic/FollowMasterStrategy.cpp
+playerbot/strategy/generic/FollowMasterStrategy.h
+playerbot/strategy/generic/GrindingStrategy.cpp
+playerbot/strategy/generic/GrindingStrategy.h
+playerbot/strategy/generic/GuardStrategy.cpp
+playerbot/strategy/generic/GuardStrategy.h
+playerbot/strategy/generic/KiteStrategy.cpp
+playerbot/strategy/generic/KiteStrategy.h
+playerbot/strategy/generic/LootNonCombatStrategy.cpp
+playerbot/strategy/generic/LootNonCombatStrategy.h
+playerbot/strategy/generic/MeleeCombatStrategy.cpp
+playerbot/strategy/generic/MeleeCombatStrategy.h
+playerbot/strategy/generic/NonCombatStrategy.cpp
+playerbot/strategy/generic/NonCombatStrategy.h
+playerbot/strategy/generic/PassTroughStrategy.h
+playerbot/strategy/generic/PassiveStrategy.cpp
+playerbot/strategy/generic/PassiveStrategy.h
+playerbot/strategy/generic/PullStrategy.cpp
+playerbot/strategy/generic/PullStrategy.h
+playerbot/strategy/generic/QuestStrategies.cpp
+playerbot/strategy/generic/QuestStrategies.h
+playerbot/strategy/generic/RacialsStrategy.cpp
+playerbot/strategy/generic/RacialsStrategy.h
+playerbot/strategy/generic/RangedCombatStrategy.cpp
+playerbot/strategy/generic/RangedCombatStrategy.h
+playerbot/strategy/generic/RunawayStrategy.cpp
+playerbot/strategy/generic/RunawayStrategy.h
+playerbot/strategy/generic/StayStrategy.cpp
+playerbot/strategy/generic/StayStrategy.h
+playerbot/strategy/generic/TankAoeStrategy.cpp
+playerbot/strategy/generic/TankAoeStrategy.h
+playerbot/strategy/generic/TankAssistStrategy.cpp
+playerbot/strategy/generic/TankAssistStrategy.h
+playerbot/strategy/generic/TellTargetStrategy.cpp
+playerbot/strategy/generic/TellTargetStrategy.h
+playerbot/strategy/generic/ThreatStrategy.cpp
+playerbot/strategy/generic/ThreatStrategy.h
+playerbot/strategy/generic/UseFoodStrategy.cpp
+playerbot/strategy/generic/UseFoodStrategy.h
+playerbot/strategy/generic/UsePotionsStrategy.cpp
+playerbot/strategy/generic/UsePotionsStrategy.h
+playerbot/strategy/generic/WorldPacketHandlerStrategy.cpp
+playerbot/strategy/generic/WorldPacketHandlerStrategy.h
+playerbot/strategy/hunter/DpsHunterStrategy.cpp
+playerbot/strategy/hunter/DpsHunterStrategy.h
+playerbot/strategy/hunter/GenericHunterNonCombatStrategy.cpp
+playerbot/strategy/hunter/GenericHunterNonCombatStrategy.h
+playerbot/strategy/hunter/GenericHunterStrategy.cpp
+playerbot/strategy/hunter/GenericHunterStrategy.h
+playerbot/strategy/hunter/HunterActions.cpp
+playerbot/strategy/hunter/HunterActions.h
+playerbot/strategy/hunter/HunterAiObjectContext.cpp
+playerbot/strategy/hunter/HunterAiObjectContext.h
+playerbot/strategy/hunter/HunterBuffStrategies.cpp
+playerbot/strategy/hunter/HunterBuffStrategies.h
+playerbot/strategy/hunter/HunterMultipliers.cpp
+playerbot/strategy/hunter/HunterMultipliers.h
+playerbot/strategy/hunter/HunterTriggers.cpp
+playerbot/strategy/hunter/HunterTriggers.h
+playerbot/strategy/mage/ArcaneMageStrategy.cpp
+playerbot/strategy/mage/ArcaneMageStrategy.h
+playerbot/strategy/mage/FireMageStrategy.cpp
+playerbot/strategy/mage/FireMageStrategy.h
+playerbot/strategy/mage/FrostMageStrategy.cpp
+playerbot/strategy/mage/FrostMageStrategy.h
+playerbot/strategy/mage/GenericMageNonCombatStrategy.cpp
+playerbot/strategy/mage/GenericMageNonCombatStrategy.h
+playerbot/strategy/mage/GenericMageStrategy.cpp
+playerbot/strategy/mage/GenericMageStrategy.h
+playerbot/strategy/mage/MageActions.cpp
+playerbot/strategy/mage/MageActions.h
+playerbot/strategy/mage/MageAiObjectContext.cpp
+playerbot/strategy/mage/MageAiObjectContext.h
+playerbot/strategy/mage/MageMultipliers.cpp
+playerbot/strategy/mage/MageMultipliers.h
+playerbot/strategy/mage/MageTriggers.cpp
+playerbot/strategy/mage/MageTriggers.h
+playerbot/strategy/paladin/DpsPaladinStrategy.cpp
+playerbot/strategy/paladin/DpsPaladinStrategy.h
+playerbot/strategy/paladin/GenericPaladinNonCombatStrategy.cpp
+playerbot/strategy/paladin/GenericPaladinNonCombatStrategy.h
+playerbot/strategy/paladin/GenericPaladinStrategy.cpp
+playerbot/strategy/paladin/GenericPaladinStrategy.h
+playerbot/strategy/paladin/GenericPaladinStrategyActionNodeFactory.h
+playerbot/strategy/paladin/PaladinActions.cpp
+playerbot/strategy/paladin/PaladinActions.h
+playerbot/strategy/paladin/PaladinAiObjectContext.cpp
+playerbot/strategy/paladin/PaladinAiObjectContext.h
+playerbot/strategy/paladin/PaladinBuffStrategies.cpp
+playerbot/strategy/paladin/PaladinBuffStrategies.h
+playerbot/strategy/paladin/PaladinMultipliers.cpp
+playerbot/strategy/paladin/PaladinMultipliers.h
+playerbot/strategy/paladin/PaladinTriggers.cpp
+playerbot/strategy/paladin/PaladinTriggers.h
+playerbot/strategy/paladin/TankPaladinStrategy.cpp
+playerbot/strategy/paladin/TankPaladinStrategy.h
+playerbot/strategy/priest/GenericPriestStrategy.cpp
+playerbot/strategy/priest/GenericPriestStrategy.h
+playerbot/strategy/priest/GenericPriestStrategyActionNodeFactory.h
+playerbot/strategy/priest/HealPriestStrategy.cpp
+playerbot/strategy/priest/HealPriestStrategy.h
+playerbot/strategy/priest/HolyPriestStrategy.cpp
+playerbot/strategy/priest/HolyPriestStrategy.h
+playerbot/strategy/priest/PriestActions.cpp
+playerbot/strategy/priest/PriestActions.h
+playerbot/strategy/priest/PriestAiObjectContext.cpp
+playerbot/strategy/priest/PriestAiObjectContext.h
+playerbot/strategy/priest/PriestMultipliers.cpp
+playerbot/strategy/priest/PriestMultipliers.h
+playerbot/strategy/priest/PriestNonCombatStrategy.cpp
+playerbot/strategy/priest/PriestNonCombatStrategy.h
+playerbot/strategy/priest/PriestNonCombatStrategyActionNodeFactory.h
+playerbot/strategy/priest/PriestTriggers.cpp
+playerbot/strategy/priest/PriestTriggers.h
+playerbot/strategy/priest/ShadowPriestStrategy.cpp
+playerbot/strategy/priest/ShadowPriestStrategy.h
+playerbot/strategy/priest/ShadowPriestStrategyActionNodeFactory.h
+playerbot/strategy/rogue/DpsRogueStrategy.cpp
+playerbot/strategy/rogue/DpsRogueStrategy.h
+playerbot/strategy/rogue/GenericRogueNonCombatStrategy.cpp
+playerbot/strategy/rogue/GenericRogueNonCombatStrategy.h
+playerbot/strategy/rogue/RogueActions.cpp
+playerbot/strategy/rogue/RogueActions.h
+playerbot/strategy/rogue/RogueAiObjectContext.cpp
+playerbot/strategy/rogue/RogueAiObjectContext.h
+playerbot/strategy/rogue/RogueComboActions.h
+playerbot/strategy/rogue/RogueFinishingActions.h
+playerbot/strategy/rogue/RogueMultipliers.cpp
+playerbot/strategy/rogue/RogueMultipliers.h
+playerbot/strategy/rogue/RogueOpeningActions.h
+playerbot/strategy/rogue/RogueTriggers.cpp
+playerbot/strategy/rogue/RogueTriggers.h
+playerbot/strategy/shaman/CasterShamanStrategy.cpp
+playerbot/strategy/shaman/CasterShamanStrategy.h
+playerbot/strategy/shaman/GenericShamanStrategy.cpp
+playerbot/strategy/shaman/GenericShamanStrategy.h
+playerbot/strategy/shaman/HealShamanStrategy.cpp
+playerbot/strategy/shaman/HealShamanStrategy.h
+playerbot/strategy/shaman/MeleeShamanStrategy.cpp
+playerbot/strategy/shaman/MeleeShamanStrategy.h
+playerbot/strategy/shaman/ShamanActions.cpp
+playerbot/strategy/shaman/ShamanActions.h
+playerbot/strategy/shaman/ShamanAiObjectContext.cpp
+playerbot/strategy/shaman/ShamanAiObjectContext.h
+playerbot/strategy/shaman/ShamanMultipliers.cpp
+playerbot/strategy/shaman/ShamanMultipliers.h
+playerbot/strategy/shaman/ShamanNonCombatStrategy.cpp
+playerbot/strategy/shaman/ShamanNonCombatStrategy.h
+playerbot/strategy/shaman/ShamanTriggers.cpp
+playerbot/strategy/shaman/ShamanTriggers.h
+playerbot/strategy/shaman/TotemsShamanStrategy.cpp
+playerbot/strategy/shaman/TotemsShamanStrategy.h
+playerbot/strategy/triggers/ChatCommandTrigger.h
+playerbot/strategy/triggers/ChatTriggerContext.h
+playerbot/strategy/triggers/CureTriggers.cpp
+playerbot/strategy/triggers/CureTriggers.h
+playerbot/strategy/triggers/GenericTriggers.cpp
+playerbot/strategy/triggers/GenericTriggers.h
+playerbot/strategy/triggers/HealthTriggers.cpp
+playerbot/strategy/triggers/HealthTriggers.h
+playerbot/strategy/triggers/LootTriggers.cpp
+playerbot/strategy/triggers/LootTriggers.h
+playerbot/strategy/triggers/RangeTriggers.h
+playerbot/strategy/triggers/TriggerContext.h
+playerbot/strategy/triggers/WithinAreaTrigger.h
+playerbot/strategy/triggers/WorldPacketTrigger.h
+playerbot/strategy/triggers/WorldPacketTriggerContext.h
+playerbot/strategy/triggers/LfgTriggers.h
+playerbot/strategy/values/AlwaysLootListValue.h
+playerbot/strategy/values/AoeHealValues.cpp
+playerbot/strategy/values/AoeHealValues.h
+playerbot/strategy/values/AttackerCountValues.cpp
+playerbot/strategy/values/AttackerCountValues.h
+playerbot/strategy/values/AttackerWithoutAuraTargetValue.cpp
+playerbot/strategy/values/AttackerWithoutAuraTargetValue.h
+playerbot/strategy/values/AttackersValue.cpp
+playerbot/strategy/values/AttackersValue.h
+playerbot/strategy/values/AvailableLootValue.h
+playerbot/strategy/values/CcTargetValue.cpp
+playerbot/strategy/values/CcTargetValue.h
+playerbot/strategy/values/ChatValue.h
+playerbot/strategy/values/CurrentCcTargetValue.cpp
+playerbot/strategy/values/CurrentCcTargetValue.h
+playerbot/strategy/values/CurrentTargetValue.cpp
+playerbot/strategy/values/CurrentTargetValue.h
+playerbot/strategy/values/DistanceValue.h
+playerbot/strategy/values/DpsTargetValue.cpp
+playerbot/strategy/values/DpsTargetValue.h
+playerbot/strategy/values/DuelTargetValue.cpp
+playerbot/strategy/values/DuelTargetValue.h
+playerbot/strategy/values/EnemyPlayerValue.cpp
+playerbot/strategy/values/EnemyPlayerValue.h
+playerbot/strategy/values/GrindTargetValue.cpp
+playerbot/strategy/values/GrindTargetValue.h
+playerbot/strategy/values/HasAvailableLootValue.h
+playerbot/strategy/values/HasTotemValue.h
+playerbot/strategy/values/InvalidTargetValue.cpp
+playerbot/strategy/values/InvalidTargetValue.h
+playerbot/strategy/values/IsBehindValue.h
+playerbot/strategy/values/IsFacingValue.h
+playerbot/strategy/values/IsMovingValue.h
+playerbot/strategy/values/ItemCountValue.cpp
+playerbot/strategy/values/ItemCountValue.h
+playerbot/strategy/values/ItemForSpellValue.cpp
+playerbot/strategy/values/ItemForSpellValue.h
+playerbot/strategy/values/LastMovementValue.h
+playerbot/strategy/values/LastSpellCastValue.h
+playerbot/strategy/values/LeastHpTargetValue.cpp
+playerbot/strategy/values/LeastHpTargetValue.h
+playerbot/strategy/values/LineTargetValue.cpp
+playerbot/strategy/values/LineTargetValue.h
+playerbot/strategy/values/LogLevelValue.h
+playerbot/strategy/values/LootStrategyValue.h
+playerbot/strategy/values/MasterTargetValue.h
+playerbot/strategy/values/NearestAdsValue.cpp
+playerbot/strategy/values/NearestAdsValue.h
+playerbot/strategy/values/NearestCorpsesValue.cpp
+playerbot/strategy/values/NearestCorpsesValue.h
+playerbot/strategy/values/NearestGameObjects.cpp
+playerbot/strategy/values/NearestGameObjects.h
+playerbot/strategy/values/NearestNpcsValue.cpp
+playerbot/strategy/values/NearestNpcsValue.h
+playerbot/strategy/values/NearestUnitsValue.h
+playerbot/strategy/values/PartyMemberToDispel.cpp
+playerbot/strategy/values/PartyMemberToDispel.h
+playerbot/strategy/values/PartyMemberToHeal.cpp
+playerbot/strategy/values/PartyMemberToHeal.h
+playerbot/strategy/values/PartyMemberToResurrect.cpp
+playerbot/strategy/values/PartyMemberToResurrect.h
+playerbot/strategy/values/PartyMemberValue.cpp
+playerbot/strategy/values/PartyMemberValue.h
+playerbot/strategy/values/PartyMemberWithoutAuraValue.cpp
+playerbot/strategy/values/PartyMemberWithoutAuraValue.h
+playerbot/strategy/values/PetTargetValue.h
+playerbot/strategy/values/PositionValue.cpp
+playerbot/strategy/values/PositionValue.h
+playerbot/strategy/values/PossibleTargetsValue.cpp
+playerbot/strategy/values/PossibleTargetsValue.h
+playerbot/strategy/values/RtiTargetValue.h
+playerbot/strategy/values/RtiValue.cpp
+playerbot/strategy/values/RtiValue.h
+playerbot/strategy/values/SelfTargetValue.h
+playerbot/strategy/values/SpellCastUsefulValue.cpp
+playerbot/strategy/values/SpellCastUsefulValue.h
+playerbot/strategy/values/SpellIdValue.cpp
+playerbot/strategy/values/SpellIdValue.h
+playerbot/strategy/values/StatsValues.cpp
+playerbot/strategy/values/StatsValues.h
+playerbot/strategy/values/TankTargetValue.cpp
+playerbot/strategy/values/TankTargetValue.h
+playerbot/strategy/values/TargetValue.cpp
+playerbot/strategy/values/TargetValue.h
+playerbot/strategy/values/ThreatValues.cpp
+playerbot/strategy/values/ThreatValues.h
+playerbot/strategy/values/ValueContext.h
+playerbot/strategy/values/LastSpellCastTimeValue.h
+playerbot/strategy/values/ManaSaveLevelValue.h
+playerbot/strategy/values/LfgValues.h
+playerbot/strategy/values/EnemyHealerTargetValue.cpp
+playerbot/strategy/values/EnemyHealerTargetValue.h
+playerbot/strategy/values/Formations.cpp
+playerbot/strategy/values/Formations.h
+playerbot/strategy/values/formations/Arrow.cpp
+playerbot/strategy/values/formations/Arrow.h
+playerbot/strategy/warlock/DpsWarlockStrategy.cpp
+playerbot/strategy/warlock/DpsWarlockStrategy.h
+playerbot/strategy/warlock/GenericWarlockNonCombatStrategy.cpp
+playerbot/strategy/warlock/GenericWarlockNonCombatStrategy.h
+playerbot/strategy/warlock/GenericWarlockStrategy.cpp
+playerbot/strategy/warlock/GenericWarlockStrategy.h
+playerbot/strategy/warlock/TankWarlockStrategy.cpp
+playerbot/strategy/warlock/TankWarlockStrategy.h
+playerbot/strategy/warlock/WarlockActions.cpp
+playerbot/strategy/warlock/WarlockActions.h
+playerbot/strategy/warlock/WarlockAiObjectContext.cpp
+playerbot/strategy/warlock/WarlockAiObjectContext.h
+playerbot/strategy/warlock/WarlockMultipliers.cpp
+playerbot/strategy/warlock/WarlockMultipliers.h
+playerbot/strategy/warlock/WarlockTriggers.cpp
+playerbot/strategy/warlock/WarlockTriggers.h
+playerbot/strategy/warrior/DpsWarriorStrategy.cpp
+playerbot/strategy/warrior/DpsWarriorStrategy.h
+playerbot/strategy/warrior/GenericWarriorNonCombatStrategy.cpp
+playerbot/strategy/warrior/GenericWarriorNonCombatStrategy.h
+playerbot/strategy/warrior/GenericWarriorStrategy.cpp
+playerbot/strategy/warrior/GenericWarriorStrategy.h
+playerbot/strategy/warrior/TankWarriorStrategy.cpp
+playerbot/strategy/warrior/TankWarriorStrategy.h
+playerbot/strategy/warrior/WarriorActions.cpp
+playerbot/strategy/warrior/WarriorActions.h
+playerbot/strategy/warrior/WarriorAiObjectContext.cpp
+playerbot/strategy/warrior/WarriorAiObjectContext.h
+playerbot/strategy/warrior/WarriorMultipliers.cpp
+playerbot/strategy/warrior/WarriorMultipliers.h
+playerbot/strategy/warrior/WarriorTriggers.cpp
+playerbot/strategy/warrior/WarriorTriggers.h
+
+ahbot/AhBot.cpp
+ahbot/AhBot.h
+ahbot/AhBotConfig.cpp
+ahbot/AhBotConfig.h
+ahbot/Category.cpp
+ahbot/Category.h
+ahbot/ConsumableCategory.cpp
+ahbot/ConsumableCategory.h
+ahbot/ItemBag.cpp
+ahbot/ItemBag.h
+ahbot/PricingStrategy.cpp
+ahbot/PricingStrategy.h
+ahbot/TradeCategory.cpp
+ahbot/TradeCategory.h
+
+)
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/vmap
+  ${CMAKE_CURRENT_SOURCE_DIR}/playerbot
   ${CMAKE_CURRENT_SOURCE_DIR}/AuctionHouseBot
+  ${CMAKE_CURRENT_SOURCE_DIR}/warden
+  ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP
+  ${CMAKE_CURRENT_SOURCE_DIR}/BattleGround
+  ${CMAKE_CURRENT_SOURCE_DIR}/movementGenerators
   ${CMAKE_SOURCE_DIR}/dep/include/g3dlite
   ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour
   ${CMAKE_SOURCE_DIR}/dep/recastnavigation/
@@ -74,15 +1034,67 @@ source_group("Movement"
     movement/util.cpp
 )
 
+source_group("AhBot"
+  REGULAR_EXPRESSION ahbot/.*
+)
+
+source_group("playerbot"
+  REGULAR_EXPRESSION playerbot/.*
+)
+
+source_group("playerbot_strategy"
+  REGULAR_EXPRESSION playerbot/strategy/.*
+)
+
+source_group("playerbot_strategy_actions"
+  REGULAR_EXPRESSION playerbot/strategy/actions/.*
+)
+
+source_group("playerbot_strategy_triggers"
+  REGULAR_EXPRESSION playerbot/strategy/triggers/.*
+)
+
+source_group("playerbot_strategy_values"
+  REGULAR_EXPRESSION playerbot/strategy/values/.*
+)
+
+source_group("playerbot_strategy_druid"
+  REGULAR_EXPRESSION playerbot/strategy/druid/.*
+)
+source_group("playerbot_strategy_hunter"
+  REGULAR_EXPRESSION playerbot/strategy/hunter/.*
+)
+source_group("playerbot_strategy_mage"
+  REGULAR_EXPRESSION playerbot/strategy/mage/.*
+)
+source_group("playerbot_strategy_paladin"
+  REGULAR_EXPRESSION playerbot/strategy/paladin/.*
+)
+source_group("playerbot_strategy_priest"
+  REGULAR_EXPRESSION playerbot/strategy/priest/.*
+)
+source_group("playerbot_strategy_rogue"
+  REGULAR_EXPRESSION playerbot/strategy/rogue/.*
+)
+source_group("playerbot_strategy_shaman"
+  REGULAR_EXPRESSION playerbot/strategy/shaman/.*
+)
+source_group("playerbot_strategy_warlock"
+  REGULAR_EXPRESSION playerbot/strategy/warlock/.*
+)
+source_group("playerbot_strategy_warrior"
+  REGULAR_EXPRESSION playerbot/strategy/warrior/.*
+)
+
 if(PCH)
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
 endif()
 
-add_library(game STATIC
-  ${game_SRCS}
+add_library(${LIBRARY_NAME} STATIC
+  ${LIBRARY_SRCS}
 )
 
-target_link_libraries(game
+target_link_libraries(${LIBRARY_NAME}
   shared
   detour
 )
@@ -90,30 +1102,31 @@ target_link_libraries(game
 if(UNIX)
   # Both systems don't have libdl and don't need them
   if (NOT (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD"))
-    target_link_libraries(game
+    target_link_libraries(${LIBRARY_NAME}
       dl
     )
   endif()
 endif()
 
-add_dependencies(game revision.h)
+add_dependencies(${LIBRARY_NAME} revision.h)
 if(NOT ACE_USE_EXTERNAL)
-  add_dependencies(game ACE_Project)
-# add_dependencies(game ace)
+  add_dependencies(${LIBRARY_NAME} ACE_Project)
 endif()
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/AuctionHouseBot/ahbot.conf.dist.in ${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist DESTINATION ${CONF_DIR})
+
 # Generate precompiled header
 if(PCH)
   if(MSVC OR XCODE)
     if(MSVC)
       set(game_pch "${CMAKE_CURRENT_SOURCE_DIR}/pchdef.cpp")
     endif()
-    add_native_precompiled_header(game ${CMAKE_CURRENT_SOURCE_DIR}/pchdef.h)
+    add_native_precompiled_header(${LIBRARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/pchdef.h)
   elseif(CMAKE_COMPILER_IS_GNUCXX)
-    add_precompiled_header(game ${CMAKE_CURRENT_SOURCE_DIR}/pchdef.h)
+    add_precompiled_header(${LIBRARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/pchdef.h)
     if(NOT ACE_USE_EXTERNAL)
       add_dependencies(game_pch_dephelp ACE_Project)
-    # add_dependencies(game_pch_dephelp ace)
     endif()
   endif()
 endif()
diff --git a/src/game/Calendar.cpp b/src/game/Calendar.cpp
index d2dba885400..a8017a04d20 100644
--- a/src/game/Calendar.cpp
+++ b/src/game/Calendar.cpp
@@ -15,3 +15,1197 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include "Calendar.h"
+#include "Guild.h"
+#include "GuildMgr.h"
+#include "ObjectMgr.h"
+#include "Mail.h"
+#include "MapPersistentStateMgr.h"
+#include "ProgressBar.h"
+
+INSTANTIATE_SINGLETON_1(CalendarMgr);
+
+//////////////////////////////////////////////////////////////////////////
+// CalendarEvent Class
+//////////////////////////////////////////////////////////////////////////
+
+CalendarEvent::~CalendarEvent()
+{
+    RemoveAllInvite();
+}
+
+// Add an invite to internal invite set return true if success
+bool CalendarEvent::AddInvite(CalendarInvite* invite)
+{
+    if (!invite)
+        return false;
+
+    if (m_Invitee.find(invite->GetObjectGuid()) != m_Invitee.end())
+        return false;
+
+    m_Invitee.insert(invite->GetObjectGuid());
+    return true;
+}
+
+CalendarInvite* CalendarEvent::GetInviteById(ObjectGuid const& inviteId)
+{
+    if (m_Invitee.find(inviteId) != m_Invitee.end())
+        return sCalendarMgr.GetInviteById(inviteId);
+
+    return NULL;
+}
+
+CalendarInvite* CalendarEvent::GetInviteByGuid(ObjectGuid const& guid)
+{
+    if (guid.IsEmpty() || !guid.IsPlayer())
+        return NULL;
+
+    for (GuidSet::const_iterator itr = m_Invitee.begin(); itr != m_Invitee.end(); ++itr)
+    {
+        CalendarInvite* invite = sCalendarMgr.GetInviteById(*itr);
+        if (!invite)
+            continue;
+
+        if (invite->InviteeGuid == guid)
+            return invite;
+    }
+    return NULL;
+}
+
+void CalendarEvent::RemoveInviteById(ObjectGuid const& inviteId)
+{
+    CalendarInvite* invite = sCalendarMgr.GetInviteById(inviteId);
+    if (!invite)
+        return;
+
+    // TODO: check why only send alert if its not guild event
+    if (!IsGuildEvent())
+        sCalendarMgr.SendCalendarEventInviteRemoveAlert(invite->InviteeGuid, this, CALENDAR_STATUS_REMOVED);
+
+    sCalendarMgr.SendCalendarEventInviteRemove(invite, this, Flags);
+
+    invite->AddFlag(CALENDAR_STATE_FLAG_DELETED);
+}
+
+void CalendarEvent::RemoveInviteByGuid(ObjectGuid const& playerGuid)
+{
+    if (playerGuid.IsEmpty() || !playerGuid.IsPlayer())
+        return;
+
+    for (GuidSet::const_iterator itr = m_Invitee.begin(); itr != m_Invitee.end(); ++itr)
+    {
+        CalendarInvite* invite = sCalendarMgr.GetInviteById(*itr);
+        if (!invite)
+            continue;
+
+        if (invite->InviteeGuid == playerGuid)
+            RemoveInviteById(*itr);
+    }
+}
+
+bool CalendarEvent::RemoveInviteById(ObjectGuid inviteId, ObjectGuid const& removerGuid)
+{
+    CalendarInvite* invite = GetInviteById(inviteId);
+    if (!invite)
+    {
+        // invite not found
+        sCalendarMgr.SendCalendarCommandResult(removerGuid, CALENDAR_ERROR_NO_INVITE);
+        return false;
+    }
+
+    if (invite->InviteeGuid != removerGuid)
+    {
+        // check if remover is an invitee
+        CalendarInvite* removerInvite = GetInviteByGuid(removerGuid);
+        if (removerInvite == NULL)
+        {
+            // remover is not invitee cheat???
+            sCalendarMgr.SendCalendarCommandResult(removerGuid, CALENDAR_ERROR_NOT_INVITED);
+            return false;
+        }
+
+        if (removerInvite->Rank != CALENDAR_RANK_MODERATOR && removerInvite->Rank != CALENDAR_RANK_OWNER)
+        {
+            // remover have not enough right to remove invite
+            sCalendarMgr.SendCalendarCommandResult(removerGuid, CALENDAR_ERROR_PERMISSIONS);
+            return false;
+        }
+    }
+
+    if (CreatorGuid == invite->InviteeGuid)
+    {
+        sCalendarMgr.SendCalendarCommandResult(removerGuid, CALENDAR_ERROR_DELETE_CREATOR_FAILED);
+        return false;
+    }
+
+    // TODO: Send mail to invitee if needed
+
+    RemoveInviteById(inviteId);
+    return true;
+}
+
+void CalendarEvent::RemoveAllInvite()
+{
+    for (GuidSet::const_iterator itr = m_Invitee.begin(); itr != m_Invitee.end(); ++itr)
+    {
+        CalendarInvite* invite = sCalendarMgr.GetInviteById(*itr);
+        if (!invite)
+            continue;
+        RemoveInviteById(*itr);
+    }
+}
+
+void CalendarEvent::SendMailOnRemoveEvent(ObjectGuid const& removerGuid)
+{
+    // only event creator in list
+    if (m_Invitee.size() <= 1)
+        return;
+
+    // build mail title
+    std::ostringstream title;
+    title << removerGuid << ':' << Title;
+
+    // build mail body
+    std::ostringstream body;
+    body << secsToTimeBitFields(time(NULL));
+
+    // creating mail draft
+    MailDraft draft(title.str(), body.str());
+
+    for (GuidSet::const_iterator itr = m_Invitee.begin(); itr != m_Invitee.end(); ++itr)
+    {
+        CalendarInvite* invite = sCalendarMgr.GetInviteById(*itr);
+        if (invite && invite->InviteeGuid != removerGuid)
+            draft.SendMailTo(MailReceiver(invite->InviteeGuid), this, MAIL_CHECK_MASK_COPIED);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CalendarInvite Classes
+//////////////////////////////////////////////////////////////////////////
+
+CalendarInvite::CalendarInvite(CalendarEvent* event, ObjectGuid inviteId, ObjectGuid senderGuid, ObjectGuid inviteeGuid, time_t statusTime, CalendarInviteStatus status, CalendarModerationRank rank, std::string text) :
+    InviteId(inviteId), InviteeGuid(inviteeGuid), SenderGuid(senderGuid), LastUpdateTime(statusTime), Status(status), Rank(rank), Text(text), m_flags(0)
+{
+    // only for pre invite case
+    if (!event)
+    {
+        InviteId.Clear();
+        m_calendarEventId.Clear();
+    }
+    else
+        m_calendarEventId = event->GetObjectGuid();
+}
+
+CalendarEvent const* CalendarInvite::GetCalendarEvent() const
+{
+    return sCalendarMgr.GetEventById(m_calendarEventId);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// CalendarMgr Classes
+//////////////////////////////////////////////////////////////////////////
+
+CalendarMgr::CalendarMgr()
+{
+}
+
+CalendarMgr::~CalendarMgr()
+{
+   m_InviteStore.clear();
+   m_EventStore.clear();
+}
+
+CalendarEvent* CalendarMgr::GetEventById(ObjectGuid const& eventId)
+{
+    CalendarEventStore::iterator iter = m_EventStore.find(eventId);
+    return IsValidEvent(iter) ? &iter->second : NULL;
+}
+
+CalendarInvite* CalendarMgr::GetInviteById(ObjectGuid const& inviteId)
+{
+    CalendarInviteStore::iterator iter = m_InviteStore.find(inviteId);
+    return IsValidInvite(iter) ? &iter->second : NULL;
+}
+
+CalendarEventsList* CalendarMgr::GetPlayerEventsList(ObjectGuid const& guid)
+{
+    CalendarEventsList* events = new CalendarEventsList;
+
+    uint32 guildId = 0;
+    Player* player = sObjectMgr.GetPlayer(guid);
+    guildId = (player) ? player->GetGuildId() : Player::GetGuildIdFromDB(guid);
+
+    for (CalendarEventStore::iterator iter = m_EventStore.begin(); iter != m_EventStore.end(); ++iter)
+    {
+        if (IsDeletedEvent(iter))
+            continue;
+
+        CalendarEvent& event = iter->second;
+
+        // add own event and same guild event or announcement
+        if ((event.CreatorGuid == guid) || ((event.IsGuildAnnouncement() || event.IsGuildEvent()) && event.GuildId == guildId))
+        {
+            events->insert(&event);
+            continue;
+        }
+
+        // add all event where player is invited
+        if (event.GetInviteByGuid(guid))
+            events->insert(&event);
+    }
+    return events;
+}
+
+CalendarInvitesList* CalendarMgr::GetPlayerInvitesList(ObjectGuid const& guid)
+{
+    CalendarInvitesList* invites = new CalendarInvitesList;
+
+    uint32 guildId = 0;
+    Player* player = sObjectMgr.GetPlayer(guid);
+    guildId = (player) ? player->GetGuildId() : Player::GetGuildIdFromDB(guid);
+
+    // FIXME - need use main invites list instead of
+
+    for (CalendarEventStore::iterator iter = m_EventStore.begin(); iter != m_EventStore.end(); ++iter)
+    {
+        CalendarEvent& event = iter->second;
+
+        if (event.HasFlag(CALENDAR_STATE_FLAG_DELETED))
+            continue;
+
+        if (event.IsGuildAnnouncement())
+            continue;
+
+        GuidSet const* cInvMap = event.GetInvites();
+
+        for (GuidSet::const_iterator itr = cInvMap->begin(); itr != cInvMap->end(); ++itr)
+        {
+            CalendarInvite* invite = sCalendarMgr.GetInviteById(*itr);
+            if (!invite)
+                continue;
+
+            if (invite->InviteeGuid == guid)
+            {
+                invites->insert(invite);
+                break;
+            }
+        }
+    }
+    return invites;
+}
+
+CalendarEvent* CalendarMgr::AddEvent(ObjectGuid const& guid, std::string title, std::string description, uint32 type, uint32 repeatable,
+    uint32 maxInvites, int32 dungeonId, time_t eventTime, time_t unkTime, uint32 flags)
+{
+    Player* player = sObjectMgr.GetPlayer(guid);
+    if (!player)
+        return NULL;
+
+    if (title.empty())
+    {
+        SendCalendarCommandResult(guid, CALENDAR_ERROR_NEEDS_TITLE);
+        return NULL;
+    }
+
+    if (eventTime < time(NULL))
+    {
+        SendCalendarCommandResult(guid, CALENDAR_ERROR_INVALID_DATE);
+        return NULL;
+    }
+
+    ObjectGuid eventGuid = ObjectGuid(HIGHGUID_CALENDAR_EVENT, GenerateEventLowGuid());
+
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "CalendarMgr::AddEvent %u, '%s', Desc > '%s', type=%u, repeat=%u, maxInvites=%u, dungeonId=%d, flags=%u",
+        eventGuid.GetCounter(), title.c_str(), description.c_str(), type, repeatable, maxInvites, dungeonId, flags);
+
+    uint32 guild = ((flags & CALENDAR_FLAG_GUILD_EVENT) || (flags && CALENDAR_FLAG_GUILD_ANNOUNCEMENT)) ? player->GetGuildId() : 0;
+
+    {
+        m_EventStore.insert(CalendarEventStore::value_type(eventGuid,
+            CalendarEvent(eventGuid, guid, guild, CalendarEventType(type), dungeonId, eventTime, flags, unkTime, title, description)));
+    }
+
+    return &m_EventStore[eventGuid];
+}
+
+void CalendarMgr::RemoveEvent(ObjectGuid const& eventId, ObjectGuid const& remover)
+{
+    CalendarEvent* event = GetEventById(eventId);
+    if (!event)
+    {
+        SendCalendarCommandResult(remover, CALENDAR_ERROR_EVENT_INVALID);
+        return;
+    }
+
+    if (remover != event->CreatorGuid)
+    {
+        // only creator can remove his event
+        SendCalendarCommandResult(remover, CALENDAR_ERROR_PERMISSIONS);
+        return;
+    }
+
+    SendCalendarEventRemovedAlert(event);
+
+    event->SendMailOnRemoveEvent(remover);
+    event->AddFlag(CALENDAR_STATE_FLAG_DELETED);
+}
+
+// Add invit to an event and inform client
+CalendarInvite* CalendarMgr::AddInvite(CalendarEvent* event, ObjectGuid const& senderGuid, ObjectGuid const& inviteeGuid, CalendarInviteStatus status, CalendarModerationRank rank, std::string text, time_t statusTime)
+{
+    if (!event)
+        return NULL;
+
+//    CalendarInvite* calendarInvite = new CalendarInvite(event, GetNewInviteId(), senderGuid, inviteeGuid, statusTime, status, rank, text);
+    ObjectGuid inviteGuid = ObjectGuid(HIGHGUID_INVITE, GenerateInviteLowGuid());
+    {
+        m_InviteStore.insert(CalendarInviteStore::value_type(inviteGuid, CalendarInvite(event, inviteGuid, senderGuid, inviteeGuid, statusTime, status, rank, text)));
+    }
+
+    CalendarInvite& calendarInvite = m_InviteStore[inviteGuid];
+
+    if (!event->IsGuildAnnouncement())
+        SendCalendarEventInvite(&calendarInvite);
+
+    if (!event->IsGuildEvent() || calendarInvite.InviteeGuid == event->CreatorGuid)
+        SendCalendarEventInviteAlert(&calendarInvite);
+
+    if (event->IsGuildAnnouncement())
+    {
+        calendarInvite.AddFlag(CALENDAR_STATE_FLAG_DELETED);
+        return NULL;
+    }
+
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "CalendarMgr::AddInvite eventId[%u], senderGuid[%u], inviteGuid[%u], Status[%u], rank[%u], text[%s], time[%u]", (uint32)event->EventId, senderGuid.GetCounter(), inviteeGuid.GetCounter(), status, rank, text.c_str(), (uint32)statusTime);
+
+    if (!event->AddInvite(&calendarInvite))
+    {
+        sLog.outError("CalendarEvent::AddInvite Fail adding invite!");
+        calendarInvite.AddFlag(CALENDAR_STATE_FLAG_DELETED);
+        return NULL;
+    }
+
+    calendarInvite.RemoveFlag(CALENDAR_STATE_FLAG_SAVED);
+    calendarInvite.AddFlag(CALENDAR_STATE_FLAG_UPDATED);
+
+    return &calendarInvite;
+}
+
+bool CalendarMgr::RemoveInvite(ObjectGuid const& eventId, ObjectGuid const& inviteId, ObjectGuid const& removerGuid)
+{
+    CalendarEvent* event = GetEventById(eventId);
+    if (!event)
+    {
+        SendCalendarCommandResult(removerGuid, CALENDAR_ERROR_EVENT_INVALID);
+        return false;
+    }
+    return event->RemoveInviteById(inviteId, removerGuid);
+}
+
+uint32 CalendarMgr::GetPlayerNumPending(ObjectGuid const& guid)
+{
+    CalendarInvitesList* inviteList = GetPlayerInvitesList(guid);
+
+    uint32 pendingNum = 0;
+    for (CalendarInvitesList::const_iterator itr = inviteList->begin(); itr != inviteList->end(); ++itr)
+    {
+        CalendarEvent const* cal = (*itr)->GetCalendarEvent();
+        if (cal && (cal->Flags & CALENDAR_FLAG_INVITES_LOCKED))
+            continue;
+
+        if ((*itr)->Status == CALENDAR_STATUS_INVITED || (*itr)->Status == CALENDAR_STATUS_TENTATIVE || (*itr)->Status == CALENDAR_STATUS_NOT_SIGNED_UP)
+            ++pendingNum;
+    }
+
+    delete inviteList;
+    return pendingNum;
+}
+
+void CalendarMgr::CopyEvent(ObjectGuid const& eventId, time_t newTime, ObjectGuid const& guid)
+{
+    CalendarEvent* event = GetEventById(eventId);
+    if (!event)
+    {
+        SendCalendarCommandResult(guid, CALENDAR_ERROR_EVENT_INVALID);
+        return;
+    }
+
+    CalendarEvent* newEvent = AddEvent(guid, event->Title, event->Description, event->Type, event->Repeatable,
+        CALENDAR_MAX_INVITES, event->DungeonId, newTime, event->UnknownTime, event->Flags);
+
+    if (!newEvent)
+    {
+        SendCalendarCommandResult(guid, CALENDAR_ERROR_INTERNAL);
+        return;
+    }
+
+    if (newEvent->IsGuildAnnouncement())
+        AddInvite(newEvent, guid, guid,  CALENDAR_STATUS_CONFIRMED, CALENDAR_RANK_OWNER, "", time(NULL));
+    else
+    {
+        // copy all invitees, set new owner as the one who make the copy, set invitees status to invited
+
+        GuidSet const* cInvMap = event->GetInvites();
+        for (GuidSet::const_iterator itr = cInvMap->begin(); itr != cInvMap->end(); ++itr)
+        {
+            CalendarInvite* invite = sCalendarMgr.GetInviteById(*itr);
+            if (!invite)
+                continue;
+
+            if (invite->InviteeGuid == guid)
+            {
+                AddInvite(newEvent, guid, invite->InviteeGuid,  CALENDAR_STATUS_CONFIRMED, CALENDAR_RANK_OWNER, "", time(NULL));
+            }
+            else
+            {
+                CalendarModerationRank rank = CALENDAR_RANK_PLAYER;
+                // copy moderator rank
+                if (invite->Rank == CALENDAR_RANK_MODERATOR)
+                    rank = CALENDAR_RANK_MODERATOR;
+
+                AddInvite(newEvent, guid, invite->InviteeGuid,  CALENDAR_STATUS_INVITED, rank, "", time(NULL));
+            }
+        }
+    }
+    newEvent->AddFlag(CALENDAR_STATE_FLAG_UPDATED);
+    newEvent->RemoveFlag(CALENDAR_STATE_FLAG_SAVED);
+
+    SendCalendarEvent(guid, newEvent, CALENDAR_SENDTYPE_COPY);
+}
+
+void CalendarMgr::RemovePlayerCalendar(ObjectGuid const& playerGuid)
+{
+    for (CalendarEventStore::iterator iter = m_EventStore.begin(); iter != m_EventStore.end(); ++iter)
+    {
+        CalendarEvent& event = iter->second;
+        if (event.CreatorGuid == playerGuid && !IsDeletedEvent(iter))
+        {
+            event.RemoveInviteByGuid(playerGuid);
+            event.AddFlag(CALENDAR_STATE_FLAG_DELETED);
+        }
+    }
+}
+
+void CalendarMgr::RemoveGuildCalendar(ObjectGuid const& playerGuid, uint32 GuildId)
+{
+    for (CalendarEventStore::iterator iter = m_EventStore.begin(); iter != m_EventStore.end(); ++iter)
+    {
+        CalendarEvent& event = iter->second;
+        if (event.CreatorGuid == playerGuid && (event.IsGuildEvent() || event.IsGuildAnnouncement()) && !IsDeletedEvent(iter))
+        {
+            event.RemoveInviteByGuid(playerGuid);
+            event.AddFlag(CALENDAR_STATE_FLAG_DELETED);
+        }
+    }
+}
+
+void CalendarMgr::DBRemap(TRemapAction remapAction, TRemapData& remapData, bool& dbTransactionUsed)
+{
+    // use not static SqlStatementID because this function
+    // used only on core start and not needed after
+    SqlStatementID stmtEventID;
+    SqlStatementID stmtInviteID;
+
+    if (!dbTransactionUsed)
+    {
+        dbTransactionUsed = true;
+        CharacterDatabase.BeginTransaction();
+    }
+
+    switch (remapAction)
+    {
+        case RA_DEL_EXPIRED:
+        {
+            SqlStatement delEventStmt = CharacterDatabase.CreateStatement(stmtEventID, "DELETE FROM calendar_events WHERE eventId = ?");
+            SqlStatement delInviteStmt = CharacterDatabase.CreateStatement(stmtInviteID, "DELETE FROM calendar_invites WHERE eventId = ?");
+            for (TRemapData::const_iterator itr = remapData.begin(); itr != remapData.end(); ++itr)
+            {
+                if (itr->second != DELETED_ID)
+                    continue;
+                delEventStmt.PExecute(itr->first);
+                delInviteStmt.PExecute(itr->first);
+            }
+            break;
+        }
+        case RA_REMAP_EVENTS:
+        {
+            SqlStatement updEventStmt = CharacterDatabase.CreateStatement(stmtEventID, "UPDATE calendar_events SET eventId = ? WHERE eventId = ?");
+            SqlStatement updInviteStmt = CharacterDatabase.CreateStatement(stmtInviteID, "UPDATE calendar_invites SET eventId = ? WHERE eventId = ?");
+            for (TRemapData::const_iterator itr = remapData.begin(); itr != remapData.end(); ++itr)
+            {
+                updEventStmt.PExecute(itr->second, itr->first);
+                updInviteStmt.PExecute(itr->second, itr->first);
+            }
+            break;
+        }
+        case RA_REMAP_INVITES:
+        {
+            SqlStatement updInviteStmt = CharacterDatabase.CreateStatement(stmtInviteID, "UPDATE calendar_invites SET inviteId = ? WHERE inviteId = ?");
+            for (TRemapData::const_iterator itr = remapData.begin(); itr != remapData.end(); ++itr)
+                updInviteStmt.PExecute(itr->second, itr->first);
+            break;
+        }
+    }
+}
+
+void CalendarMgr::DBRemoveExpiredEventsAndRemapData()
+{
+    QueryResult* result = CharacterDatabase.Query("SELECT eventTime, eventId FROM calendar_events ORDER BY eventId");
+    if (!result)
+        return;
+
+    // prepare data
+    uint32 remapId = 1;
+    TRemapData remapData;
+    do
+    {
+        Field* field = result->Fetch();
+        bool removeEvent = IsEventReadyForRemove(time_t(field[0].GetUInt32()));
+        remapData.push_back(TRemapGee(field[1].GetUInt32(), removeEvent ? DELETED_ID : remapId++));
+    }
+    while (result->NextRow());
+    delete result;
+
+    bool dbTransactionUsed = false;
+
+    // delete expired events (and related invites)
+    if (remapId <= remapData.size())
+        DBRemap(RA_DEL_EXPIRED, remapData, dbTransactionUsed);
+
+    // remap eventId
+    remapData.remove_if(IsNotRemap());
+    if (!remapData.empty())
+        DBRemap(RA_REMAP_EVENTS, remapData, dbTransactionUsed);
+
+    // remap inviteId
+    if (result = CharacterDatabase.Query("SELECT inviteId FROM calendar_invites ORDER BY inviteId"))
+    {
+        remapId = 1;
+        remapData.clear();
+        do
+        {
+            uint32 inviteId = result->Fetch()[0].GetUInt32();
+            if (inviteId != remapId)
+                remapData.push_back(TRemapGee(inviteId, remapId));
+            ++remapId;
+        }
+        while (result->NextRow());
+        delete result;
+
+        if (!remapData.empty())
+            DBRemap(RA_REMAP_INVITES, remapData, dbTransactionUsed);
+    }
+
+    if (dbTransactionUsed)
+        CharacterDatabase.CommitTransaction();
+}
+
+void CalendarMgr::LoadFromDB()
+{
+    uint32 maxInviteId = 0;
+    uint32 maxEventId = 0;
+
+    // For reload case
+    m_EventStore.clear();
+    m_InviteStore.clear();
+
+    // before fill
+    DBRemoveExpiredEventsAndRemapData();
+
+    sLog.outString("Loading Calendar Events...");
+    //                                                          0        1            2        3     4      5          6          7      8
+    bool someEventExist = false;
+    QueryResult* eventsQuery = CharacterDatabase.Query("SELECT eventId, creatorGuid, guildId, type, flags, dungeonId, eventTime, title, description FROM calendar_events ORDER BY eventId");
+    if (!eventsQuery)
+    {
+        BarGoLink bar(1);
+        bar.step();
+        sLog.outString();
+        sLog.outString(">> calendar_events table is empty!");
+    }
+    else
+    {
+        BarGoLink bar(eventsQuery->GetRowCount());
+        do
+        {
+            Field* field = eventsQuery->Fetch();
+            bar.step();
+
+            uint32 eventId = field[0].GetUInt32();
+            ObjectGuid eventGuid = ObjectGuid(HIGHGUID_CALENDAR_EVENT, eventId);
+
+            m_EventStore.insert(CalendarEventStore::value_type(eventGuid,
+                CalendarEvent(eventGuid,
+                    ObjectGuid(HIGHGUID_PLAYER, field[1].GetUInt32()),
+                    field[2].GetUInt32(),
+                    CalendarEventType(field[3].GetUInt8()),
+                    field[5].GetInt32(),
+                    time_t(field[6].GetUInt32()),
+                    field[4].GetUInt32(),
+                    time_t(time(NULL)),
+                    field[7].GetString(),
+                    field[8].GetString())));
+
+            maxEventId = (maxEventId < eventId) ? eventId : maxEventId;
+            CalendarEvent& event = m_EventStore[eventGuid];
+
+            event.RemoveFlag(CALENDAR_STATE_FLAG_UPDATED);
+            event.AddFlag(CALENDAR_STATE_FLAG_SAVED);
+        }
+        while (eventsQuery->NextRow());
+
+        sLog.outString();
+        sLog.outString(">> Loaded %u events!", uint32(eventsQuery->GetRowCount()));
+        someEventExist = true;
+
+        delete eventsQuery;
+    }
+
+    m_EventGuids.Set(maxEventId + 1);
+
+    sLog.outString("Loading Calendar invites...");
+    //                                                           0         1        2            3           4       5               6    7
+    QueryResult* invitesQuery = CharacterDatabase.Query("SELECT inviteId, eventId, inviteeGuid, senderGuid, status, lastUpdateTime, rank, description FROM calendar_invites ORDER BY inviteId");
+    if (!invitesQuery)
+    {
+        BarGoLink bar(1);
+        bar.step();
+        sLog.outString();
+        sLog.outString(">> calendar_invite table is empty!");
+    }
+    else
+    {
+        if (someEventExist)
+        {
+            BarGoLink bar(invitesQuery->GetRowCount());
+            do
+            {
+                Field* field = invitesQuery->Fetch();
+                bar.step();
+
+                uint32 eventId = field[1].GetUInt32();
+                ObjectGuid eventGuid = ObjectGuid(HIGHGUID_CALENDAR_EVENT, eventId);
+
+                CalendarEvent* event = GetEventById(eventGuid); // may be NULL!
+
+                ObjectGuid inviteGuid       = ObjectGuid(HIGHGUID_INVITE, field[0].GetUInt32());
+                ObjectGuid inviteeGuid      = ObjectGuid(HIGHGUID_PLAYER, field[2].GetUInt32());
+                ObjectGuid senderGuid       = ObjectGuid(HIGHGUID_PLAYER, field[3].GetUInt32());
+                CalendarInviteStatus status = CalendarInviteStatus(field[4].GetUInt8());
+                time_t lastUpdateTime       = time_t(field[5].GetUInt32());
+                CalendarModerationRank rank = CalendarModerationRank(field[6].GetUInt8());
+                std::string _text           = field[7].GetString();
+
+                m_InviteStore.insert(CalendarInviteStore::value_type(inviteGuid, CalendarInvite(event, inviteGuid, senderGuid, inviteeGuid, lastUpdateTime, status, rank, _text)));
+                CalendarInvite& invite = m_InviteStore[inviteGuid];
+
+                invite.RemoveFlag(CALENDAR_STATE_FLAG_UPDATED);
+                invite.AddFlag(CALENDAR_STATE_FLAG_SAVED);
+
+                if (!event)
+                {
+                    // delete invite
+                    invite.AddFlag(CALENDAR_STATE_FLAG_DELETED);
+                }
+                else
+                    event->AddInvite(&invite);
+
+                maxInviteId = (maxInviteId < inviteGuid.GetCounter()) ? inviteGuid.GetCounter() : maxEventId;
+
+            }
+            while (invitesQuery->NextRow());
+
+            sLog.outString();
+            sLog.outString(">> Loaded %u invites!", uint32(invitesQuery->GetRowCount()));
+        }
+        else
+        {
+            // delete all invites (no invites exist without events)
+            CharacterDatabase.DirectExecute("TRUNCATE TABLE calendar_invites");
+            sLog.outString(">> calendar_invites table is cleared! (invites without events found)");
+        }
+        delete invitesQuery;
+    }
+
+    m_InviteGuids.Set(maxInviteId + 1);
+
+    sLog.outString();
+}
+
+void CalendarMgr::SaveToDB()
+{
+    bool dataSaved = false;
+
+    for (CalendarEventStore::iterator iter = m_EventStore.begin(); iter != m_EventStore.end();)
+    {
+        if (!iter->second.HasFlag(CALENDAR_STATE_FLAG_SAVED))
+        {
+            if (!dataSaved)
+            {
+                dataSaved = true;
+                CharacterDatabase.BeginTransaction();
+            }
+            SaveEventToDB(&iter->second);
+            iter->second.AddFlag(CALENDAR_STATE_FLAG_SAVED);
+            ++iter;
+        }
+        else if (iter->second.HasFlag(CALENDAR_STATE_FLAG_DELETED))
+        {
+            if (!dataSaved)
+            {
+                dataSaved = true;
+                CharacterDatabase.BeginTransaction();
+            }
+            DeleteEventFromDB(iter->first);
+            m_EventStore.erase(iter++);
+        }
+        else
+            ++iter;
+    }
+
+    for (CalendarInviteStore::iterator iter = m_InviteStore.begin(); iter != m_InviteStore.end();)
+    {
+        if (!iter->second.HasFlag(CALENDAR_STATE_FLAG_SAVED))
+        {
+            if (!dataSaved)
+            {
+                dataSaved = true;
+                CharacterDatabase.BeginTransaction();
+            }
+            SaveInviteToDB(&iter->second);
+            iter->second.AddFlag(CALENDAR_STATE_FLAG_SAVED);
+            ++iter;
+        }
+        else if (iter->second.HasFlag(CALENDAR_STATE_FLAG_DELETED))
+        {
+            if (!dataSaved)
+            {
+                dataSaved = true;
+                CharacterDatabase.BeginTransaction();
+            }
+            DeleteInviteFromDB(iter->first);
+            m_InviteStore.erase(iter++);
+        }
+        else
+            ++iter;
+    }
+
+    if (dataSaved)
+        CharacterDatabase.CommitTransaction();
+}
+
+void CalendarMgr::SaveEventToDB(CalendarEvent const* event)
+{
+    if (!event || event->GetObjectGuid().IsEmpty())
+        return;
+
+    DeleteEventFromDB(event->GetObjectGuid());
+
+    static SqlStatementID insEvent;
+    SqlStatement uberInsert = CharacterDatabase.CreateStatement(insEvent, "INSERT INTO calendar_events (eventId, creatorGuid, guildId, type, flags, dungeonId, eventTime, title, description)"
+        " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)" );
+
+    uberInsert.addUInt32(event->GetObjectGuid().GetCounter());
+    uberInsert.addUInt32(event->CreatorGuid.GetCounter());
+    uberInsert.addUInt32(event->GuildId);
+    uberInsert.addUInt32(event->Type);
+    uberInsert.addUInt32(event->Flags);
+    uberInsert.addInt32(event->DungeonId);
+    uberInsert.addUInt32(event->EventTime);
+    uberInsert.addString(event->Title.c_str());
+    uberInsert.addString(event->Description.c_str());
+
+    uberInsert.Execute();
+}
+
+void CalendarMgr::SaveInviteToDB(CalendarInvite const* invite)
+{
+    if (!invite || invite->GetObjectGuid().IsEmpty())
+        return;
+
+    DeleteInviteFromDB(invite->GetObjectGuid());
+
+    static SqlStatementID insEvent;
+    SqlStatement uberInsert = CharacterDatabase.CreateStatement(insEvent, "INSERT INTO calendar_invites (inviteId, eventId, inviteeGuid, senderGuid, status, lastUpdateTime, rank, description)"
+        " VALUES (?, ?, ?, ?, ?, ?, ?, ?)" );
+
+    uberInsert.addUInt32(invite->GetObjectGuid().GetCounter());
+    uberInsert.addUInt32(invite->GetEventGuid().GetCounter());
+    uberInsert.addUInt32(invite->InviteeGuid.GetCounter());
+    uberInsert.addUInt32(invite->SenderGuid.GetCounter());
+    uberInsert.addUInt32(invite->Status);
+    uberInsert.addUInt32(invite->LastUpdateTime);
+    uberInsert.addUInt32(invite->Rank);
+    uberInsert.addString(invite->Text.c_str());
+
+    uberInsert.Execute();
+}
+
+void CalendarMgr::DeleteEventFromDB(ObjectGuid const& eventGuid)
+{
+    if (eventGuid.IsEmpty())
+        return;
+
+    static SqlStatementID delEvent;
+    SqlStatement stmt = CharacterDatabase.CreateStatement(delEvent, "DELETE FROM calendar_events WHERE eventId = ?");
+    stmt.PExecute(eventGuid.GetCounter());
+}
+
+void CalendarMgr::DeleteInviteFromDB(ObjectGuid const& inviteGuid)
+{
+    if (inviteGuid.IsEmpty())
+        return;
+
+    static SqlStatementID delInvite;
+    SqlStatement stmt = CharacterDatabase.CreateStatement(delInvite, "DELETE FROM calendar_invites WHERE inviteId = ?");
+    stmt.PExecute(inviteGuid.GetCounter());
+}
+
+void CalendarMgr::Update()
+{
+    {
+        // Update part 1 - calculating (and mark for cleanup)
+        for (CalendarEventStore::iterator itr = m_EventStore.begin(); itr != m_EventStore.end(); ++itr)
+        {
+            CalendarEvent* event = &itr->second;
+            if (!event || event->HasFlag(CALENDAR_STATE_FLAG_DELETED))
+                continue;
+
+            // Event expired or empty, remove it
+            if (IsEventReadyForRemove(event->EventTime) ||
+                event->GetInvites()->empty())
+                event->AddFlag(CALENDAR_STATE_FLAG_DELETED);
+        }
+
+        for (CalendarInviteStore::iterator itr = m_InviteStore.begin(); itr != m_InviteStore.end(); ++itr)
+        {
+            CalendarInvite* invite = &itr->second;
+            if (!invite || invite->HasFlag(CALENDAR_STATE_FLAG_DELETED))
+                continue;
+
+            if (invite->GetEventGuid().IsEmpty() || !invite->GetCalendarEvent())
+                invite->AddFlag(CALENDAR_STATE_FLAG_DELETED);
+            // Place check for expireable here
+        }
+    }
+
+    // Saving data (and DB/storage cleanup)
+    SaveToDB();
+}
+
+void CalendarMgr::SendCalendarEventInviteAlert(CalendarInvite const* invite)
+{
+    DEBUG_LOG("WORLD: SMSG_CALENDAR_EVENT_INVITE_ALERT");
+
+    CalendarEvent const* event = invite->GetCalendarEvent();
+    if (!event || event->HasFlag(CALENDAR_STATE_FLAG_DELETED))
+        return;
+
+    WorldPacket data(SMSG_CALENDAR_EVENT_INVITE_ALERT);
+    data << event->EventId;
+    data << event->Title;
+    data.AppendPackedTime(event->EventTime);
+    data << uint32(event->Flags);
+    data << uint32(event->Type);
+    data << int32(event->DungeonId);
+    data << uint64(invite->InviteId);
+    data << uint8(invite->Status);
+    data << uint8(invite->Rank);
+    data << event->CreatorGuid.WriteAsPacked();
+    data << invite->SenderGuid.WriteAsPacked();
+    //data.hexlike();
+
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "CalendarMgr::SendCalendarEventInviteAlert senderGuid[%u], inviteeGuid[%u], EventId[%lu], Status[%u], InviteId[%u]",
+        invite->SenderGuid.GetCounter(), invite->InviteeGuid.GetCounter(), uint32(event->EventId), uint32(invite->Status), uint32(invite->InviteId));
+
+    if (event->IsGuildEvent() || event->IsGuildAnnouncement())
+    {
+        if (Guild* guild = sGuildMgr.GetGuildById(event->GuildId))
+            guild->BroadcastPacket(&data);
+    }
+    else if (Player* player = sObjectMgr.GetPlayer(invite->InviteeGuid))
+        player->SendDirectMessage(&data);
+}
+
+void CalendarMgr::SendCalendarEventInvite(CalendarInvite const* invite)
+{
+    CalendarEvent const* event = invite->GetCalendarEvent();
+
+    time_t statusTime = invite->LastUpdateTime;
+    bool preInvite = true;
+    uint64 eventId = 0;
+    if (event != NULL)
+    {
+       preInvite = false;
+       eventId = event->EventId;
+    }
+
+    Player* player = sObjectMgr.GetPlayer(invite->InviteeGuid);
+
+    uint8 level = player ? player->getLevel() : Player::GetLevelFromDB(invite->InviteeGuid);
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SMSG_CALENDAR_EVENT_INVITE");
+    WorldPacket data(SMSG_CALENDAR_EVENT_INVITE, 8 + 8 + 8 + 1 + 1 + 1 + (preInvite ? 0 : 4) + 1);
+    data << invite->InviteeGuid.WriteAsPacked();
+    data << uint64(eventId);
+    data << uint64(invite->InviteId);
+    data << uint8(level);
+    data << uint8(invite->Status);
+    data << uint8(!preInvite);
+    if (!preInvite)
+        data.AppendPackedTime(statusTime);
+    data << uint8(invite->SenderGuid != invite->InviteeGuid); // false only if the invite is sign-up
+
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "CalendarMgr::SendCalendarEventInvite %s senderGuid[%u], inviteeGuid[%u], EventId[%lu], Status[%u], InviteId[%u]",
+        preInvite ? "is PreInvite," : "", invite->SenderGuid.GetCounter(), invite->InviteeGuid.GetCounter(), uint32(eventId), uint32(invite->Status), uint32(invite->InviteId));
+
+    //data.hexlike();
+    if (preInvite)
+    {
+        if (Player* sender = sObjectMgr.GetPlayer(invite->SenderGuid))
+            sender->SendDirectMessage(&data);
+    }
+    else
+        SendPacketToAllEventRelatives(data, event);
+}
+
+void CalendarMgr::SendCalendarCommandResult(ObjectGuid const& guid, CalendarResponseResult err, char const* param /*= NULL*/)
+{
+    if (Player* player = sObjectMgr.GetPlayer(guid))
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SMSG_CALENDAR_COMMAND_RESULT (%u)", err);
+        WorldPacket data(SMSG_CALENDAR_COMMAND_RESULT, 0);
+        data << uint32(0);
+        data << uint8(0);
+        switch (err)
+        {
+        case CALENDAR_ERROR_OTHER_INVITES_EXCEEDED:
+        case CALENDAR_ERROR_ALREADY_INVITED_TO_EVENT_S:
+        case CALENDAR_ERROR_IGNORING_YOU_S:
+            data << param;
+            break;
+        default:
+            data << uint8(0);
+            break;
+        }
+
+        data << uint32(err);
+        //data.hexlike();
+        player->SendDirectMessage(&data);
+    }
+}
+
+void CalendarMgr::SendCalendarEventRemovedAlert(CalendarEvent const* event)
+{
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SMSG_CALENDAR_EVENT_REMOVED_ALERT");
+    WorldPacket data(SMSG_CALENDAR_EVENT_REMOVED_ALERT, 1 + 8 + 1);
+    data << uint8(1);       // show pending alert?
+    data << uint64(event->EventId);
+    data.AppendPackedTime(event->EventTime);
+    //data.hexlike();
+    SendPacketToAllEventRelatives(data, event);
+}
+
+void CalendarMgr::SendCalendarEvent(ObjectGuid const& guid, CalendarEvent const* event, uint32 sendType)
+{
+    Player* player = sObjectMgr.GetPlayer(guid);
+    if (!player || !event)
+        return;
+
+    std::string timeStr = TimeToTimestampStr(event->EventTime);
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "CalendarMgr::SendCalendarEvent sendType[%u], CreatorGuid[%u], EventId[%u], Type[%u], Flags[%u], Time[%s]",
+        sendType, event->CreatorGuid.GetCounter(), uint32(event->EventId), uint32(event->Type), event->Flags, event->Title.c_str());
+
+    WorldPacket data(SMSG_CALENDAR_SEND_EVENT);
+    data << uint8(sendType);
+    data << event->CreatorGuid.WriteAsPacked();
+    data << uint64(event->EventId);
+    data << event->Title;
+    data << event->Description;
+    data << uint8(event->Type);
+    data << uint8(event->Repeatable);
+    data << uint32(CALENDAR_MAX_INVITES);
+    data << event->DungeonId;
+    data << event->Flags;
+    data.AppendPackedTime(event->EventTime);
+    data.AppendPackedTime(event->UnknownTime);
+    data << event->GuildId;
+
+    GuidSet const* cInvMap = event->GetInvites();
+    size_t pos = data.wpos();
+    data << uint32(0);                                  // size of list, placeholder
+    uint32 _count = 0;
+    for (GuidSet::const_iterator itr = cInvMap->begin(); itr != cInvMap->end(); ++itr)
+    {
+        CalendarInvite const* calendarInvite = sCalendarMgr.GetInviteById(*itr);
+        if (!calendarInvite)
+            continue;
+
+        ObjectGuid inviteeGuid = calendarInvite->InviteeGuid;
+        Player* invitee = sObjectMgr.GetPlayer(inviteeGuid);
+
+        uint8 inviteeLevel = invitee ? invitee->getLevel() : Player::GetLevelFromDB(inviteeGuid);
+        uint32 inviteeGuildId = invitee ? invitee->GetGuildId() : Player::GetGuildIdFromDB(inviteeGuid);
+
+        data << inviteeGuid.WriteAsPacked();
+        data << uint8(inviteeLevel);
+        data << uint8(calendarInvite->Status);
+        data << uint8(calendarInvite->Rank);
+        data << uint8(event->IsGuildEvent() && event->GuildId == inviteeGuildId);
+        data << calendarInvite->GetObjectGuid();
+        data.AppendPackedTime(calendarInvite->LastUpdateTime);
+        data << calendarInvite->Text;
+
+        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "CalendarMgr::SendCalendarEvent InviteId[%u], InviteLvl[%u], Status[%u], Rank[%u],  GuildEvent[%s], Text[%s]",
+            uint32(calendarInvite->InviteId), uint32(inviteeLevel), uint32(calendarInvite->Status), uint32(calendarInvite->Rank),
+            (event->IsGuildEvent() && event->GuildId == inviteeGuildId) ? "true" : "false", calendarInvite->Text.c_str());
+        ++_count;
+    }
+    data.put<uint32>(pos, _count);
+    //data.hexlike();
+    player->SendDirectMessage(&data);
+}
+
+void CalendarMgr::SendCalendarEventInviteRemove(CalendarInvite const* invite, CalendarEvent const* event, uint32 flags)
+{
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SMSG_CALENDAR_EVENT_INVITE_REMOVED");
+
+    WorldPacket data(SMSG_CALENDAR_EVENT_INVITE_REMOVED, 8 + 4 + 4 + 1);
+    data.appendPackGUID(invite->InviteeGuid);
+    data << uint64(event->EventId);
+    data << uint32(flags);
+    data << uint8(1);       // show pending alert?
+    //data.hexlike();
+    SendPacketToAllEventRelatives(data, event);
+}
+
+void CalendarMgr::SendCalendarEventInviteRemoveAlert(ObjectGuid const& guid, CalendarEvent const* event, CalendarInviteStatus status)
+{
+    if (Player* player = sObjectMgr.GetPlayer(guid))
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT");
+        WorldPacket data(SMSG_CALENDAR_EVENT_INVITE_REMOVED_ALERT, 8 + 4 + 4 + 1);
+        data << uint64(event->EventId);
+        data.AppendPackedTime(event->EventTime);
+        data << uint32(event->Flags);
+        data << uint8(status);
+        //data.hexlike();
+        player->SendDirectMessage(&data);
+    }
+}
+
+void CalendarMgr::SendCalendarEventStatus(CalendarInvite const* invite)
+{
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SMSG_CALENDAR_EVENT_STATUS");
+    WorldPacket data(SMSG_CALENDAR_EVENT_STATUS, 8 + 8 + 4 + 4 + 1 + 1 + 4);
+    CalendarEvent const* event = invite->GetCalendarEvent();
+
+    data << invite->InviteeGuid.WriteAsPacked();
+    data << uint64(event->EventId);
+    data.AppendPackedTime(event->EventTime);
+    data << uint32(event->Flags);
+    data << uint8(invite->Status);
+    data << uint8(invite->Rank);
+    data.AppendPackedTime(invite->LastUpdateTime);
+    //data.hexlike();
+    SendPacketToAllEventRelatives(data, event);
+}
+
+void CalendarMgr::SendCalendarClearPendingAction(ObjectGuid const& guid)
+{
+    if (Player* player = sObjectMgr.GetPlayer(guid))
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SMSG_CALENDAR_CLEAR_PENDING_ACTION TO [%u]", guid.GetCounter());
+        WorldPacket data(SMSG_CALENDAR_CLEAR_PENDING_ACTION, 0);
+        player->SendDirectMessage(&data);
+    }
+}
+
+void CalendarMgr::SendCalendarEventModeratorStatusAlert(CalendarInvite const* invite)
+{
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SMSG_CALENDAR_EVENT_MODERATOR_STATUS_ALERT");
+    CalendarEvent const* event = invite->GetCalendarEvent();
+    WorldPacket data(SMSG_CALENDAR_EVENT_MODERATOR_STATUS_ALERT, 8 + 8 + 1 + 1);
+    data << invite->InviteeGuid.WriteAsPacked();
+    data << uint64(event->EventId);
+    data << uint8(invite->Rank);
+    data << uint8(1); // Display pending action to client?
+    //data.hexlike();
+    SendPacketToAllEventRelatives(data, event);
+}
+
+void CalendarMgr::SendCalendarEventUpdateAlert(CalendarEvent const* event, time_t oldEventTime)
+{
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SMSG_CALENDAR_EVENT_UPDATED_ALERT");
+    WorldPacket data(SMSG_CALENDAR_EVENT_UPDATED_ALERT, 1 + 8 + 4 + 4 + 4 + 1 + 4 +
+        event->Title.size() + event->Description.size() + 1 + 4 + 4);
+    data << uint8(1);       // show pending alert?
+    data << uint64(event->EventId);
+    data.AppendPackedTime(oldEventTime);
+    data << uint32(event->Flags);
+    data.AppendPackedTime(event->EventTime);
+    data << uint8(event->Type);
+    data << int32(event->DungeonId);
+    data << event->Title;
+    data << event->Description;
+    data << uint8(event->Repeatable);
+    data << uint32(CALENDAR_MAX_INVITES);
+    data << uint32(0);      // title updated? (string type)
+    //data.hexlike();
+
+    SendPacketToAllEventRelatives(data, event);
+}
+
+void CalendarMgr::SendPacketToAllEventRelatives(WorldPacket packet, CalendarEvent const* event)
+{
+    // Send packet to all guild members
+    if (event->IsGuildEvent() || event->IsGuildAnnouncement())
+        if (Guild* guild = sGuildMgr.GetGuildById(event->GuildId))
+            guild->BroadcastPacket(&packet);
+
+    // Send packet to all invitees if event is non-guild, in other case only to non-guild invitees (packet was broadcasted for them)
+    GuidSet const* cInvMap = event->GetInvites();
+    for (GuidSet::const_iterator itr = cInvMap->begin(); itr != cInvMap->end(); ++itr)
+        if (CalendarInvite const* calendarInvite = sCalendarMgr.GetInviteById(*itr))
+            if (Player* player = sObjectMgr.GetPlayer(calendarInvite->InviteeGuid))
+                if (!event->IsGuildEvent() || (event->IsGuildEvent() && player->GetGuildId() != event->GuildId))
+                    player->SendDirectMessage(&packet);
+}
+
+void CalendarMgr::SendCalendarRaidLockoutRemove(ObjectGuid const& guid, DungeonPersistentState const* save)
+{
+    Player* player = sObjectMgr.GetPlayer(guid);
+    if (!save || !player)
+        return;
+
+    DEBUG_LOG("SMSG_CALENDAR_RAID_LOCKOUT_REMOVED [%u]", guid.GetCounter());
+    time_t currTime = time(NULL);
+
+    WorldPacket data(SMSG_CALENDAR_RAID_LOCKOUT_REMOVED, 4 + 4 + 4 + 8);
+    data << uint32(save->GetMapId());
+    data << uint32(save->GetDifficulty());
+    data << uint32(save->GetResetTime() - currTime);
+    data << uint64(save->GetInstanceId());
+    //data.hexlike();
+    player->SendDirectMessage(&data);
+}
+
+void CalendarMgr::SendCalendarRaidLockoutAdd(ObjectGuid const& guid, DungeonPersistentState const* save)
+{
+    Player* player = sObjectMgr.GetPlayer(guid);
+    if (!save || !player)
+        return;
+
+    DEBUG_LOG("SMSG_CALENDAR_RAID_LOCKOUT_ADDED [%u]", guid.GetCounter());
+    time_t currTime = time(NULL);
+
+    WorldPacket data(SMSG_CALENDAR_RAID_LOCKOUT_ADDED, 4 + 4 + 4 + 4 + 8);
+    data.AppendPackedTime(currTime);
+    data << uint32(save->GetMapId());
+    data << uint32(save->GetDifficulty());
+    data << uint32(save->GetResetTime() - currTime);
+    data << uint64(save->GetInstanceId());
+    //data.hexlike();
+    player->SendDirectMessage(&data);
+}
diff --git a/src/game/Calendar.h b/src/game/Calendar.h
index 719f868a5fe..9dc9f5a3e74 100644
--- a/src/game/Calendar.h
+++ b/src/game/Calendar.h
@@ -19,8 +19,290 @@
 #ifndef MANGOS_CALENDAR_H
 #define MANGOS_CALENDAR_H
 
-class Calendar
+#include "Policies/Singleton.h"
+#include "Common.h"
+#include "ObjectGuid.h"
+#include "SharedDefines.h"
+#include "World.h"
+
+enum CalendarEventType
+{
+    CALENDAR_TYPE_RAID              = 0,
+    CALENDAR_TYPE_DUNGEON           = 1,
+    CALENDAR_TYPE_PVP               = 2,
+    CALENDAR_TYPE_MEETING           = 3,
+    CALENDAR_TYPE_OTHER             = 4
+};
+
+enum CalendarInviteStatus
+{
+    CALENDAR_STATUS_INVITED         = 0,
+    CALENDAR_STATUS_ACCEPTED        = 1,
+    CALENDAR_STATUS_DECLINED        = 2,
+    CALENDAR_STATUS_CONFIRMED       = 3,
+    CALENDAR_STATUS_OUT             = 4,
+    CALENDAR_STATUS_STANDBY         = 5,
+    CALENDAR_STATUS_SIGNED_UP       = 6,
+    CALENDAR_STATUS_NOT_SIGNED_UP   = 7,
+    CALENDAR_STATUS_TENTATIVE       = 8,
+    CALENDAR_STATUS_REMOVED         = 9     // correct name?
+};
+
+// commented flag never showed in sniff but handled by client
+enum CalendarFlags
+{
+    CALENDAR_FLAG_ALL_ALLOWED       = 0x001,
+    //CALENDAR_FLAG_SYSTEM            = 0x004,
+    //CALENDAR_FLAG_HOLLIDAY          = 0x008,
+    CALENDAR_FLAG_INVITES_LOCKED    = 0x010,
+    CALENDAR_FLAG_GUILD_ANNOUNCEMENT = 0x040,
+    //CALENDAR_FLAG_RAID_LOCKOUT      = 0x080,
+    //CALENDAR_FLAG_UNK_PLAYER        = 0x102,
+    //CALENDAR_FLAG_RAID_RESET        = 0x200,
+    CALENDAR_FLAG_GUILD_EVENT       = 0x400
+};
+
+enum CalendarRepeatType
+{
+    CALENDAR_REPEAT_NEVER           = 0,
+    CALENDAR_REPEAT_WEEKLY          = 1,
+    CALENDAR_REPEAT_BIWEEKLY        = 2,
+    CALENDAR_REPEAT_MONTHLY         = 3
+};
+
+enum CalendarSendEventType
+{
+    CALENDAR_SENDTYPE_GET           = 0,
+    CALENDAR_SENDTYPE_ADD           = 1,
+    CALENDAR_SENDTYPE_COPY          = 2
+};
+
+enum CalendarModerationRank
+{
+    CALENDAR_RANK_PLAYER            = 0,
+    CALENDAR_RANK_MODERATOR         = 1,
+    CALENDAR_RANK_OWNER             = 2
+};
+
+#define CALENDAR_MAX_INVITES        100
+
+enum CalendarStateFlags
+{
+    CALENDAR_STATE_FLAG_INITIALIZED                = 0,
+    CALENDAR_STATE_FLAG_ACTIVE                     = 1,
+    CALENDAR_STATE_FLAG_SAVED                      = 2,
+    CALENDAR_STATE_FLAG_EXPIRED                    = 3,
+    CALENDAR_STATE_FLAG_UPDATED                    = 4,
+    CALENDAR_STATE_FLAG_DELETED                    = 7,
+};
+
+// forward declaration
+class WorldPacket;
+class DungeonPersistentState;
+
+class CalendarEvent;
+class CalendarInvite;
+class CalendarMgr;
+
+typedef UNORDERED_SET<CalendarInvite*> CalendarInvitesList;
+typedef UNORDERED_SET<CalendarEvent*> CalendarEventsList;
+
+class CalendarInvite
+{
+public:
+
+    CalendarInvite() : InviteId(ObjectGuid()), InviteeGuid(ObjectGuid()), SenderGuid(ObjectGuid()), LastUpdateTime(time(NULL)),
+        Status(CALENDAR_STATUS_INVITED), Rank(CALENDAR_RANK_PLAYER), Text(), m_calendarEventId(ObjectGuid()), m_flags(0)
+        {}
+
+    CalendarInvite(CalendarEvent* calendarEvent, ObjectGuid inviteId, ObjectGuid senderGuid, ObjectGuid inviteeGuid, time_t statusTime,
+        CalendarInviteStatus status, CalendarModerationRank rank, std::string text);
+
+    ~CalendarInvite() {}
+
+    ObjectGuid const& GetObjectGuid() const { return InviteId; }
+    ObjectGuid const& GetEventGuid() const { return  m_calendarEventId; }
+
+    CalendarEvent const* GetCalendarEvent() const;
+
+    ObjectGuid InviteId;
+    ObjectGuid InviteeGuid;
+    ObjectGuid SenderGuid;
+    time_t LastUpdateTime;
+    CalendarInviteStatus Status;
+    CalendarModerationRank Rank;
+    std::string Text;
+
+    // service flags
+    void AddFlag(CalendarStateFlags flag)         { m_flags |= (1 << flag); };
+    void RemoveFlag(CalendarStateFlags flag)      { m_flags &= ~(1 << flag); };
+    bool HasFlag(CalendarStateFlags flag) const   { return bool(m_flags & (1 << flag)); };
+
+private:
+    ObjectGuid m_calendarEventId;
+    uint32 m_flags;
+};
+
+class CalendarEvent
+{
+public:
+
+    CalendarEvent(ObjectGuid eventId, ObjectGuid creatorGUID, uint32 guildId, CalendarEventType type, int32 dungeonId,
+        time_t eventTime, uint32 flags, time_t unknownTime, std::string title, std::string description) :
+        EventId(eventId), CreatorGuid(creatorGUID), GuildId(guildId), Type(type), DungeonId(dungeonId),
+        EventTime(eventTime), Flags(flags), UnknownTime(unknownTime), Title(title),
+        Description(description), m_flags(0)
+        {
+            m_Invitee.clear();
+        }
+
+    CalendarEvent() : EventId(ObjectGuid()), CreatorGuid(ObjectGuid()), GuildId(0), Type(CALENDAR_TYPE_OTHER), DungeonId(-1), EventTime(0),
+        Flags(0), UnknownTime(0), Title(), Description(), m_flags(0)
+        {
+            m_Invitee.clear();
+        }
+
+    ~CalendarEvent();
+
+    ObjectGuid const& GetObjectGuid() const { return EventId; }
+
+    bool IsGuildEvent() const { return Flags & CALENDAR_FLAG_GUILD_EVENT; }
+    bool IsGuildAnnouncement() const { return Flags & CALENDAR_FLAG_GUILD_ANNOUNCEMENT; }
+
+    bool AddInvite(CalendarInvite* invite);
+
+    GuidSet const* GetInvites() const { return &m_Invitee; }
+
+    CalendarInvite* GetInviteById(ObjectGuid const& inviteId);
+    CalendarInvite* GetInviteByGuid(ObjectGuid const& guid);
+
+    bool RemoveInviteById(ObjectGuid inviteId, ObjectGuid const& removerGuid);
+    void RemoveInviteByGuid(ObjectGuid const& playerGuid);
+    void RemoveInviteById(ObjectGuid const& inviteId);
+
+    void SendMailOnRemoveEvent(ObjectGuid const& removerGuid);
+
+    ObjectGuid EventId;
+    ObjectGuid CreatorGuid;
+    uint32     GuildId;
+    CalendarEventType Type;
+    CalendarRepeatType Repeatable;
+    int32 DungeonId;
+    time_t EventTime;
+    uint32 Flags;
+    time_t UnknownTime;
+    std::string Title;
+    std::string Description;
+
+    // service flags
+    void AddFlag(CalendarStateFlags flag)         { m_flags |= (1 << flag); };
+    void RemoveFlag(CalendarStateFlags flag)      { m_flags &= ~(1 << flag); };
+    bool HasFlag(CalendarStateFlags flag) const   { return bool(m_flags & (1 << flag)); };
+
+private:
+    GuidSet m_Invitee;
+    void RemoveAllInvite();
+    uint32 m_flags;
+};
+
+typedef UNORDERED_MAP<ObjectGuid, CalendarInvite> CalendarInviteStore;
+typedef UNORDERED_MAP<ObjectGuid, CalendarEvent> CalendarEventStore;
+
+class CalendarMgr : public MaNGOS::Singleton<CalendarMgr, MaNGOS::ClassLevelLockable<CalendarMgr, MANGOSR2_MUTEX_MODEL_2> >
 {
+    public:
+        CalendarMgr();
+        ~CalendarMgr();
 
+    private:
+        CalendarEventStore  m_EventStore;
+        CalendarInviteStore m_InviteStore;
+
+        // first free low guid for selected guid type
+        ObjectGuidGenerator<HIGHGUID_CALENDAR_EVENT>     m_EventGuids;
+        ObjectGuidGenerator<HIGHGUID_INVITE>             m_InviteGuids;
+        uint32 GenerateEventLowGuid()                    { return m_EventGuids.Generate();  }
+        uint32 GenerateInviteLowGuid()                   { return m_InviteGuids.Generate(); }
+
+        // remapping DB ids
+        #define DELETED_ID UINT32_MAX
+        enum TRemapAction
+        {
+            RA_DEL_EXPIRED,
+            RA_REMAP_EVENTS,
+            RA_REMAP_INVITES
+        };
+        typedef std::pair<uint32, uint32> TRemapGee;
+        typedef std::list<TRemapGee> TRemapData;
+
+        struct IsNotRemap { bool operator() (const TRemapGee& gee) { return gee.first == gee.second || gee.second == DELETED_ID; } };
+
+        bool IsEventReadyForRemove(time_t eventTime)
+        {
+            int32 delaySec = sWorld.getConfig(CONFIG_INT32_CALENDAR_REMOVE_EXPIRED_EVENTS_DELAY);
+            return delaySec < 0 ? false : eventTime + time_t(delaySec) <= time(NULL);
+        }
+        void DBRemap(TRemapAction remapAction, TRemapData& remapData, bool& dbTransactionUsed);
+        void DBRemoveExpiredEventsAndRemapData();
+
+        // utils
+        inline bool IsDeletedEvent(CalendarEventStore::const_iterator iter) { return iter->second.HasFlag(CALENDAR_STATE_FLAG_DELETED); }
+        inline bool IsValidEvent(CalendarEventStore::const_iterator iter) { return iter != m_EventStore.end() && !IsDeletedEvent(iter); }
+
+        inline bool IsDeletedInvite(CalendarInviteStore::const_iterator iter) { return iter->second.HasFlag(CALENDAR_STATE_FLAG_DELETED); }
+        inline bool IsValidInvite(CalendarInviteStore::const_iterator iter) { return iter != m_InviteStore.end() && !IsDeletedInvite(iter); }
+
+    public:
+        CalendarEventsList* GetPlayerEventsList(ObjectGuid const& guid);
+        CalendarInvitesList* GetPlayerInvitesList(ObjectGuid const& guid);
+        CalendarEvent* AddEvent(ObjectGuid const& guid, std::string title, std::string description, uint32 type, uint32 repeatable, uint32 maxInvites,
+            int32 dungeonId, time_t eventTime, time_t unkTime, uint32 flags);
+
+        CalendarInvite* AddInvite(CalendarEvent* event, ObjectGuid const& senderGuid, ObjectGuid const& inviteeGuid, CalendarInviteStatus status, CalendarModerationRank rank, std::string text, time_t statusTime);
+
+        void RemoveEvent(ObjectGuid const& eventId, ObjectGuid const& remover);
+        bool RemoveInvite(ObjectGuid const& eventId, ObjectGuid const& invitId, ObjectGuid const& removerGuid);
+        void RemovePlayerCalendar(ObjectGuid const& playerGuid);
+        void RemoveGuildCalendar(ObjectGuid const& playerGuid, uint32 GuildId);
+
+        void CopyEvent(ObjectGuid const& eventId, time_t newTime, ObjectGuid const& guid);
+        uint32 GetPlayerNumPending(ObjectGuid const& guid);
+
+        // Main calendar search methods.
+        CalendarEvent* GetEventById(ObjectGuid const& eventId);
+        CalendarInvite* GetInviteById(ObjectGuid const& inviteId);
+
+        // World thread update system
+        void Update();
+
+        // Save/load system
+        void LoadFromDB();
+        void SaveToDB();
+        void SaveEventToDB(CalendarEvent const* event);
+        void SaveInviteToDB(CalendarInvite const* invite);
+        void DeleteEventFromDB(ObjectGuid const& eventGuid);
+        void DeleteInviteFromDB(ObjectGuid const& inviteGuid);
+
+        // send data to client function
+        void SendCalendarEventInvite(CalendarInvite const* invite);
+        void SendCalendarEventInviteAlert(CalendarInvite const* invite);
+        void SendCalendarCommandResult(ObjectGuid const& guid, CalendarResponseResult err, char const* param = NULL);
+        void SendCalendarEventRemovedAlert(CalendarEvent const* event);
+        void SendCalendarEvent(ObjectGuid const& guid, CalendarEvent const* event, uint32 sendType);
+        void SendCalendarEventInviteRemoveAlert(ObjectGuid const& guid, CalendarEvent const* event, CalendarInviteStatus status);
+        void SendCalendarEventInviteRemove(CalendarInvite const* invite, CalendarEvent const* event, uint32 flags);
+        void SendCalendarEventStatus(CalendarInvite const* invite);
+        void SendCalendarClearPendingAction(ObjectGuid const& guid);
+        void SendCalendarEventModeratorStatusAlert(CalendarInvite const* invite);
+        void SendCalendarEventUpdateAlert(CalendarEvent const* event, time_t oldEventTime);
+        void SendCalendarRaidLockoutRemove(ObjectGuid const& guid, DungeonPersistentState const* save);
+        void SendCalendarRaidLockoutAdd(ObjectGuid const& guid, DungeonPersistentState const* save);
+
+        void SendPacketToAllEventRelatives(WorldPacket packet, CalendarEvent const* event);
+
+    private:
 };
+
+#define sCalendarMgr MaNGOS::Singleton<CalendarMgr>::Instance()
+
 #endif
diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp
index f298f2f91cb..f3de43987c6 100644
--- a/src/game/CalendarHandler.cpp
+++ b/src/game/CalendarHandler.cpp
@@ -22,255 +22,720 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
+#include "World.h"
 #include "MapPersistentStateMgr.h"
-
-void WorldSession::HandleCalendarGetCalendar(WorldPacket &/*recv_data*/)
+#include "Calendar.h"
+#include "SocialMgr.h"
+#include "World.h"
+#include "Guild.h"
+#include "GuildMgr.h"
+#include "ArenaTeam.h"
+#include "ObjectMgr.h"
+
+void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recv_data*/)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_GET_CALENDAR");         // empty
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "CMSG_CALENDAR_GET_CALENDAR [%u]", guid.GetCounter());
+
+    time_t currTime = time(NULL);
+
+    WorldPacket data(SMSG_CALENDAR_SEND_CALENDAR);
 
-    time_t cur_time = time(NULL);
+    CalendarInvitesList* invites = NULL;
+    invites = sCalendarMgr.GetPlayerInvitesList(guid);
 
-    WorldPacket data(SMSG_CALENDAR_SEND_CALENDAR, 4+4*0+4+4*0+4+4);
+    data << uint32(invites->size());
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarGetCalendar Sending %u invites", invites->size());
+
+    for (CalendarInvitesList::const_iterator itr = invites->begin(); itr != invites->end(); ++itr)
+    {
+        CalendarEvent const* calendarEvent = (*itr)->GetCalendarEvent();
+        if (!calendarEvent)
+            continue;
+
+        data << uint64(calendarEvent->EventId);
+        data << uint64((*itr)->InviteId);
+        data << uint8((*itr)->Status);
+        data << uint8((*itr)->Rank);
+
+        data << uint8(calendarEvent->IsGuildEvent());
+        data << calendarEvent->CreatorGuid.WriteAsPacked();
+        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarGetCalendar EventId[%u], InviteId[%u], status[%u], rank[%u]",
+            uint32((*itr)->GetCalendarEvent()->EventId), uint32((*itr)->InviteId), uint32((*itr)->Status), uint32((*itr)->Rank));
+    }
+    delete invites;
 
-    // TODO: calendar invite event output
-    data << (uint32) 0;                                     // invite node count
-    // TODO: calendar event output
-    data << (uint32) 0;                                     // event count
+    CalendarEventsList* events = sCalendarMgr.GetPlayerEventsList(guid);
+    data << uint32(events->size());
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarGetCalendar Sending %u events", events->size());
 
-    data << (uint32) 0;                                     // Current Unix Time?
-    data << (uint32) secsToTimeBitFields(cur_time);         // current packed time
+    for (CalendarEventsList::const_iterator itr = events->begin(); itr != events->end(); ++itr)
+    {
+        CalendarEvent const* calendarEvent = *itr;
+
+        data << uint64(calendarEvent->EventId);
+        data << calendarEvent->Title;
+        data << uint32(calendarEvent->Type);
+        data.AppendPackedTime(calendarEvent->EventTime);
+        data << uint32(calendarEvent->Flags);
+        data << int32(calendarEvent->DungeonId);
+        data << calendarEvent->CreatorGuid.WriteAsPacked();
+
+        std::string timeStr = TimeToTimestampStr(calendarEvent->EventTime);
+        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarGetCalendar  EventId[%u], Title[%s], Time[%s], Type[%u],  Flag[%u], DungeonId[%d], CreatorGuid[%u]",
+                         uint32(calendarEvent->EventId), calendarEvent->Title.c_str(), timeStr.c_str(), uint32(calendarEvent->Type),
+                         uint32(calendarEvent->Flags), calendarEvent->DungeonId, calendarEvent->CreatorGuid.GetCounter());
+    }
+    delete events;
 
-    uint32 counter = 0;
-    size_t p_counter = data.wpos();
-    data << uint32(counter);                                // instance state count
+    data << uint32(currTime);                             // server time
+    data.AppendPackedTime(currTime);                      // zone time ??
 
-    for(int i = 0; i < MAX_DIFFICULTY; ++i)
+    ByteBuffer dataBuffer;
+    uint32 boundCounter = 0;
+    for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
     {
-        for (Player::BoundInstancesMap::const_iterator itr = _player->m_boundInstances[i].begin(); itr != _player->m_boundInstances[i].end(); ++itr)
+        Player::BoundInstancesMap boundInstances = GetPlayer()->GetBoundInstances(Difficulty(i));
+        for (Player::BoundInstancesMap::const_iterator itr = boundInstances.begin(); itr != boundInstances.end(); ++itr)
         {
-            if(itr->second.perm)
+            if (itr->second.perm)
             {
-                DungeonPersistentState *state = itr->second.state;
-                data << uint32(state->GetMapId());
-                data << uint32(state->GetDifficulty());
-                data << uint32(state->GetResetTime() - cur_time);
-                data << ObjectGuid(state->GetInstanceGuid());
-                ++counter;
+                DungeonPersistentState const* state = itr->second.state;
+                dataBuffer << uint32(state->GetMapId());
+                dataBuffer << uint32(state->GetDifficulty());
+                dataBuffer << uint32(state->GetResetTime() - currTime);
+                dataBuffer << uint64(state->GetInstanceId());   // instance save id as unique instance copy id
+                ++boundCounter;
             }
         }
     }
-    data.put<uint32>(p_counter,counter);
 
-    data << (uint32) 1135753200;                            // base date (28.12.2005 12:00)
-    data << (uint32) 0;                                     // raid reset count
-    data << (uint32) 0;                                     // holidays count
-/*
-    for(uint32 i = 0; i < holidays_count; ++i)
+    data << uint32(boundCounter);
+    data.append(dataBuffer);
+
+    data << uint32(1135753200);                                 // Constant date, unk (28.12.2005 07:00)
+
+    // Reuse variables
+    boundCounter = 0;
+    std::set<uint32> sentMaps;
+    dataBuffer.clear();
+
+    for (MapDifficultyMap::const_iterator itr = sMapDifficultyMap.begin(); itr != sMapDifficultyMap.end(); ++itr)
     {
-        data << uint32(0);                                  // Holidays.dbc ID
-        data << uint32(0);                                  // Holidays.dbc region
-        data << uint32(0);                                  // Holidays.dbc looping
-        data << uint32(0);                                  // Holidays.dbc priority
-        data << uint32(0);                                  // Holidays.dbc calendarFilterType
+        uint32 map_diff_pair = itr->first;
+        uint32 mapId = PAIR32_LOPART(map_diff_pair);
+        Difficulty difficulty = Difficulty(PAIR32_HIPART(map_diff_pair));
+        MapDifficultyEntry const* mapDiff = itr->second;
+
+        // skip mapDiff without global reset time
+        if (!mapDiff->resetTime)
+            continue;
 
-        for(uint32 j = 0; j < 26; j++)
-            data << uint32(0);                              // Holidays.dbc date
+        // skip non raid map
+        MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
+        if (!mapEntry || !mapEntry->IsRaid())
+            continue;
 
-        for(uint32 j = 0; j < 10; j++)
-            data << uint32(0);                              // Holidays.dbc duration
+        // skip already sent map (not same difficulty?)
+        if (sentMaps.find(mapId) != sentMaps.end())
+            continue;
 
-        for(uint32 j = 0; j < 10; j++)
-            data << uint32(0);                              // Holidays.dbc calendarFlags
+        uint32 resetTime = sMapPersistentStateMgr.GetScheduler().GetMaxResetTimeFor(mapDiff);
 
-        data << "";                                         // Holidays.dbc textureFilename
+        sentMaps.insert(mapId);
+        dataBuffer << mapId;
+        dataBuffer << resetTime;
+
+        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR,"WorldSession::HandleCalendarGetCalendar MapId [%u] -> Reset Time: %u", mapId, resetTime);
+        dataBuffer << int32(0); // showed 68400 on map 509 must investigate more
+        ++boundCounter;
     }
-*/
-    //DEBUG_LOG("Sending calendar");
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR,"Map sent [%u]", boundCounter);
+
+    data << uint32(boundCounter);
+    data.append(dataBuffer);
+
+    // TODO: Fix this, how we do know how many and what holidays to send?
+    uint32 holidayCount = 0;
+    data << uint32(holidayCount);
+    /*for (uint32 i = 0; i < holidayCount; ++i)
+    {
+        HolidaysEntry const* holiday = sHolidaysStore.LookupEntry(666);
+
+        data << uint32(holiday->Id);                        // m_ID
+        data << uint32(holiday->Region);                    // m_region, might be looping
+        data << uint32(holiday->Looping);                   // m_looping, might be region
+        data << uint32(holiday->Priority);                  // m_priority
+        data << uint32(holiday->CalendarFilterType);        // m_calendarFilterType
+
+        for (uint8 j = 0; j < MAX_HOLIDAY_DATES; ++j)
+            data << uint32(holiday->Date[j]);               // 26 * m_date -- WritePackedTime ?
+
+        for (uint8 j = 0; j < MAX_HOLIDAY_DURATIONS; ++j)
+            data << uint32(holiday->Duration[j]);           // 10 * m_duration
+
+        for (uint8 j = 0; j < MAX_HOLIDAY_FLAGS; ++j)
+            data << uint32(holiday->CalendarFlags[j]);      // 10 * m_calendarFlags
+
+        data << holiday->TextureFilename;                   // m_textureFilename (holiday name)
+    }*/
+
     //data.hexlike();
     SendPacket(&data);
 }
 
-void WorldSession::HandleCalendarGetEvent(WorldPacket &recv_data)
+void WorldSession::HandleCalendarGetEvent(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_GET_EVENT");
-    recv_data.hexlike();
-    recv_data.read_skip<uint64>();                          // unk
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_GET_EVENT [%u]", guid.GetCounter());
+
+    ObjectGuid eventId;
+    recv_data >> eventId;
+
+    if (CalendarEvent* calendarEvent = sCalendarMgr.GetEventById(eventId))
+        sCalendarMgr.SendCalendarEvent(GetPlayer()->GetObjectGuid(), calendarEvent, CALENDAR_SENDTYPE_GET);
+    else
+        sCalendarMgr.SendCalendarCommandResult(GetPlayer()->GetObjectGuid(), CALENDAR_ERROR_EVENT_INVALID);
 }
 
-void WorldSession::HandleCalendarGuildFilter(WorldPacket &recv_data)
+void WorldSession::HandleCalendarGuildFilter(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_GUILD_FILTER");
-    recv_data.hexlike();
-    recv_data.read_skip<uint32>();                          // unk1
-    recv_data.read_skip<uint32>();                          // unk2
-    recv_data.read_skip<uint32>();                          // unk3
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "CMSG_CALENDAR_GUILD_FILTER [%u]", GetPlayer()->GetObjectGuid().GetCounter());
+
+    uint32 minLevel;
+    uint32 maxLevel;
+    uint32 minRank;
+
+    recv_data >> minLevel >> maxLevel >> minRank;
+
+    if (Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId()))
+        guild->MassInviteToEvent(this, minLevel, maxLevel, minRank);
+
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarGuildFilter Min level [%u], Max level [%u], Min rank [%u]", minLevel, maxLevel, minRank);
 }
 
-void WorldSession::HandleCalendarArenaTeam(WorldPacket &recv_data)
+void WorldSession::HandleCalendarEventSignup(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_ARENA_TEAM");
-    recv_data.hexlike();
-    recv_data.read_skip<uint32>();                          // unk
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_EVENT_SIGNUP [%u]", guid.GetCounter());
+
+    ObjectGuid eventId;
+    bool tentative;
+
+    recv_data >> eventId;
+    recv_data >> tentative; // uint8 == bool size in all compilator???
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarEventSignup [%u] EventId [%u] Tentative %u", guid.GetCounter(), uint32(eventId), tentative);
+
+    if (CalendarEvent* calendarEvent = sCalendarMgr.GetEventById(eventId))
+    {
+        if (calendarEvent->IsGuildEvent() && calendarEvent->GuildId != GetPlayer()->GetGuildId())
+        {
+            sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_GUILD_PLAYER_NOT_IN_GUILD);
+            return;
+        }
+
+        CalendarInviteStatus status = tentative ? CALENDAR_STATUS_TENTATIVE : CALENDAR_STATUS_SIGNED_UP;
+        sCalendarMgr.AddInvite(calendarEvent, guid, guid, CalendarInviteStatus(status), CALENDAR_RANK_PLAYER, "", time(NULL));
+        sCalendarMgr.SendCalendarClearPendingAction(guid);
+    }
+    else
+        sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_EVENT_INVALID);
 }
 
-void WorldSession::HandleCalendarAddEvent(WorldPacket &recv_data)
+void WorldSession::HandleCalendarArenaTeam(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_ADD_EVENT");
-    recv_data.hexlike();
-    recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
-    //std::string unk1, unk2;
-    //recv_data >> (std::string)unk1;
-    //recv_data >> (std::string)unk2;
-
-    //uint8   unk3, unk4;
-    //uint32  unk5, unk6, unk7, unk8, unk9, count = 0;
-    //recv_data >> (uint8)unk3;
-    //recv_data >> (uint8)unk4;
-    //recv_data >> (uint32)unk5;
-    //recv_data >> (uint32)unk6;
-    //recv_data >> (uint32)unk7;
-    //recv_data >> (uint32)unk8;
-    //recv_data >> (uint32)unk9;
-    //if (!((unk9 >> 6) & 1))
-    //{
-    //    recv_data >> (uint32)count;
-    //    if (count)
-    //    {
-    //        uint8 unk12,unk13;
-    //        ObjectGuid guid;
-    //        for (int i=0;i<count;i++)
-    //        {
-    //            recv_data >> guid.ReadAsPacked();
-    //            recv_data >> (uint8)unk12;
-    //            recv_data >> (uint8)unk13;
-    //        }
-    //    }
-    //}
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_ARENA_TEAM [%u]", GetPlayer()->GetObjectGuid().GetCounter());
+    uint32 areanTeamId;
+    recv_data >> areanTeamId;
+
+    if (ArenaTeam* team = sObjectMgr.GetArenaTeamById(areanTeamId))
+        team->MassInviteToEvent(this);
 }
 
-void WorldSession::HandleCalendarUpdateEvent(WorldPacket &recv_data)
+void WorldSession::HandleCalendarAddEvent(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_UPDATE_EVENT");
-    recv_data.hexlike();
-    recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
-    //recv_data >> uint64
-    //recv_data >> uint64
-    //recv_data >> std::string
-    //recv_data >> std::string
-    //recv_data >> uint8
-    //recv_data >> uint8
-    //recv_data >> uint32
-    //recv_data >> uint32
-    //recv_data >> uint32
-    //recv_data >> uint32
-    //recv_data >> uint32
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_ADD_EVENT [%u]", guid.GetCounter());
+
+    std::string title;
+    std::string description;
+    uint8 type;
+    uint8 repeatable;
+    uint32 maxInvites;
+    int32 dungeonId;
+    uint32 eventPackedTime;
+    uint32 unkPackedTime;
+    uint32 flags;
+
+    recv_data >> title;
+    recv_data >> description;
+    recv_data >> type;
+    recv_data >> repeatable;
+    recv_data >> maxInvites;
+    recv_data >> dungeonId;
+    eventPackedTime = recv_data.ReadPackedTime();
+    unkPackedTime   = recv_data.ReadPackedTime();
+    recv_data >> flags;
+
+    // 946684800 is 01/01/2000 00:00:00 - default response time
+    CalendarEvent* cal = sCalendarMgr.AddEvent(GetPlayer()->GetObjectGuid(), title, description, type, repeatable, maxInvites, dungeonId, eventPackedTime, unkPackedTime, flags);
+    if (cal)
+    {
+        if (cal->IsGuildAnnouncement())
+        {
+            sCalendarMgr.AddInvite(cal, guid, ObjectGuid(uint64(0)), CALENDAR_STATUS_NOT_SIGNED_UP, CALENDAR_RANK_PLAYER, "", time(NULL));
+        }
+        else
+        {
+            uint32 inviteCount;
+            recv_data >> inviteCount;
+
+            for (uint32 i = 0; i < inviteCount; ++i)
+            {
+                ObjectGuid invitee;
+                uint8 status = 0;
+                uint8 rank = 0;
+                recv_data >> invitee.ReadAsPacked();
+                recv_data >> status;
+                recv_data >> rank;
+
+                sCalendarMgr.AddInvite(cal, guid, invitee, CalendarInviteStatus(status), CalendarModerationRank(rank), "", time(NULL));
+            }
+        }
+        sCalendarMgr.SendCalendarEvent(GetPlayer()->GetObjectGuid(), cal, CALENDAR_SENDTYPE_ADD);
+    }
 }
 
-void WorldSession::HandleCalendarRemoveEvent(WorldPacket &recv_data)
+void WorldSession::HandleCalendarUpdateEvent(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_REMOVE_EVENT");
-    recv_data.hexlike();
-    recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_UPDATE_EVENT [%u]", guid.GetCounter());
+
+    time_t oldEventTime;
+    ObjectGuid eventId;
+    ObjectGuid inviteId;
+    std::string title;
+    std::string description;
+    uint8 type;
+    uint8 repetitionType;
+    uint32 maxInvites;
+    int32 dungeonId;
+    uint32 eventPackedTime;
+    uint32 UnknownPackedTime;
+    uint32 flags;
+
+    recv_data >> eventId >> inviteId >> title >> description >> type >> repetitionType >> maxInvites >> dungeonId;
+    eventPackedTime   = recv_data.ReadPackedTime();
+    UnknownPackedTime = recv_data.ReadPackedTime();
+    recv_data >> flags;
+
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarUpdateEvent [%u] EventId [%u], InviteId [%u] Title %s, Description %s, type %u "
+        "Repeatable %u, MaxInvites %u, Dungeon ID %d, Flags %u", guid.GetCounter(), uint32(eventId), uint32(inviteId), title.c_str(),
+        description.c_str(), uint32(type), uint32(repetitionType), maxInvites, dungeonId, flags);
+
+    if (CalendarEvent* calendarEvent = sCalendarMgr.GetEventById(eventId))
+    {
+        if (guid != calendarEvent->CreatorGuid)
+        {
+            CalendarInvite* updaterInvite = calendarEvent->GetInviteByGuid(guid);
+            if (updaterInvite == NULL)
+            {
+                sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_NOT_INVITED);
+                return ;
+            }
+
+            if (updaterInvite->Rank != CALENDAR_RANK_MODERATOR)
+            {
+                // remover have not enough right to change invite status
+                sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_PERMISSIONS);
+                return;
+            }
+        }
+
+        oldEventTime = calendarEvent->EventTime;
+
+        calendarEvent->Type = CalendarEventType(type);
+        calendarEvent->Flags = flags;
+        calendarEvent->EventTime = eventPackedTime;
+        calendarEvent->UnknownTime = UnknownPackedTime;
+        calendarEvent->DungeonId = dungeonId;
+        calendarEvent->Title = title;
+        calendarEvent->Description = description;
 
-    //recv_data >> uint64
-    //recv_data >> uint64
-    //recv_data >> uint32
+        calendarEvent->RemoveFlag(CALENDAR_STATE_FLAG_SAVED);
+        calendarEvent->AddFlag(CALENDAR_STATE_FLAG_UPDATED);
 
+        sCalendarMgr.SendCalendarEventUpdateAlert(calendarEvent, oldEventTime);
+
+    }
+    else
+        sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_EVENT_INVALID);
+}
+
+void WorldSession::HandleCalendarRemoveEvent(WorldPacket& recv_data)
+{
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_REMOVE_EVENT [%u]", guid.GetCounter());
+
+    ObjectGuid eventId;
+    ObjectGuid inviteGuid;
+    uint32 Flags;
+
+    recv_data >> eventId;
+    recv_data >> inviteGuid;
+    recv_data >> Flags;
+
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarRemoveEvent event %u, invite %u, flags %u, remover %s",
+        guid.GetCounter(), inviteGuid.GetCounter(), Flags, guid.GetString().c_str());
+
+    sCalendarMgr.RemoveEvent(eventId, guid);
 }
 
-void WorldSession::HandleCalendarCopyEvent(WorldPacket &recv_data)
+void WorldSession::HandleCalendarCopyEvent(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_COPY_EVENT");
-    recv_data.hexlike();
-    recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_COPY_EVENT [%u]", guid.GetCounter());
 
-    //recv_data >> uint64
-    //recv_data >> uint64
-    //recv_data >> uint32
+    ObjectGuid eventId;
+    ObjectGuid inviteId;
+    uint32 packedTime;
 
+    recv_data >> eventId;
+    recv_data >> inviteId;
+    packedTime = recv_data.ReadPackedTime();
+
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarCopyEvent [%u], EventId [%u] inviteId [%u]",
+        guid.GetCounter(), uint32(eventId), uint32(inviteId));
+
+    sCalendarMgr.CopyEvent(eventId, packedTime, guid);
 }
 
-void WorldSession::HandleCalendarEventInvite(WorldPacket &recv_data)
+void WorldSession::HandleCalendarEventInvite(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_EVENT_INVITE");
-    recv_data.hexlike();
-    recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
+    ObjectGuid playerGuid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_EVENT_INVITE [%u]", playerGuid.GetCounter());
+
+    ObjectGuid eventId;
+
+    // TODO it seem its not inviteID but event->CreatorGuid
+    ObjectGuid inviteId;
+    std::string name;
+    bool isPreInvite;
+    bool isGuildEvent;
+
+    ObjectGuid inviteeGuid = ObjectGuid();
+    uint32 inviteeTeam = 0;
+    uint32 inviteeGuildId = 0;
+    bool inviteeIgnoringYou = false;
+
+    recv_data >> eventId >> inviteId >> name >> isPreInvite >> isGuildEvent;
+
+    if (Player* player = sObjectAccessor.FindPlayerByName(name.c_str()))
+    {
+        // Invitee is online
+        inviteeGuid = player->GetObjectGuid();
+        inviteeTeam = player->GetTeam();
+        inviteeGuildId = player->GetGuildId();
+        inviteeIgnoringYou = player->GetSocial()->HasIgnore(playerGuid);
+    }
+    else
+    {
+        // Invitee offline, get data from database
+        PlayerDataCache const* data = sAccountMgr.GetPlayerDataCache(name);
+        if (data)
+        {
+            inviteeGuid = ObjectGuid(HIGHGUID_PLAYER, data->lowguid);
+            inviteeTeam = Player::TeamForRace(data->race);
+            inviteeGuildId = Player::GetGuildIdFromDB(inviteeGuid);
+
+            // TODO: move this to SocialMgr
+            if (QueryResult* result = CharacterDatabase.PQuery("SELECT flags FROM character_social WHERE guid = %u AND friend = %u", inviteeGuid.GetCounter(), playerGuid.GetCounter()))
+            {
+                inviteeIgnoringYou = (result->Fetch()[0].GetUInt8() & SOCIAL_FLAG_IGNORED);
+                delete result;
+            }
+        }
+    }
+
+    if (inviteeGuid.IsEmpty() || !inviteeGuid.IsPlayer())
+    {
+        sCalendarMgr.SendCalendarCommandResult(playerGuid, CALENDAR_ERROR_PLAYER_NOT_FOUND);
+        return;
+    }
+
+    if (GetPlayer()->GetTeam() != inviteeTeam && !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CALENDAR))
+    {
+        sCalendarMgr.SendCalendarCommandResult(playerGuid, CALENDAR_ERROR_NOT_ALLIED);
+        return;
+    }
+
+    if (inviteeIgnoringYou)
+    {
+        sCalendarMgr.SendCalendarCommandResult(playerGuid, CALENDAR_ERROR_IGNORING_YOU_S, name.c_str());
+        return;
+    }
+
+    if (!isPreInvite)
+    {
+        if (CalendarEvent* calendarEvent = sCalendarMgr.GetEventById(eventId))
+        {
+            if (calendarEvent->IsGuildEvent() && calendarEvent->GuildId == inviteeGuildId)
+            {
+                // we can't invite guild members to guild events
+                sCalendarMgr.SendCalendarCommandResult(playerGuid, CALENDAR_ERROR_NO_GUILD_INVITES);
+                return;
+            }
+
+            sCalendarMgr.AddInvite(calendarEvent, playerGuid, inviteeGuid, CALENDAR_STATUS_INVITED, CALENDAR_RANK_PLAYER, "", time(NULL));
+        }
+        else
+            sCalendarMgr.SendCalendarCommandResult(playerGuid, CALENDAR_ERROR_EVENT_INVALID);
+    }
+    else
+    {
+        if (isGuildEvent && inviteeGuildId == GetPlayer()->GetGuildId())
+        {
+            sCalendarMgr.SendCalendarCommandResult(playerGuid, CALENDAR_ERROR_NO_GUILD_INVITES);
+            return;
+        }
 
-    //recv_data >> uint64
-    //recv_data >> uint64
-    //recv_data >> std::string
-    //recv_data >> uint8
-    //recv_data >> uint8
+        // create a temp invite to send it back to client
+        CalendarInvite calendarInvite;
+        calendarInvite.SenderGuid = playerGuid;
+        calendarInvite.InviteeGuid = inviteeGuid;
+        calendarInvite.Status = CALENDAR_STATUS_INVITED;
+        calendarInvite.Rank = CALENDAR_RANK_PLAYER;
+        calendarInvite.LastUpdateTime = time(NULL);
 
+        sCalendarMgr.SendCalendarEventInvite(&calendarInvite);
+        DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarEventInvite PREINVITE sender[%u], Invitee[%u]", playerGuid.GetCounter(), inviteeGuid.GetCounter());
+    }
 }
 
-void WorldSession::HandleCalendarEventRsvp(WorldPacket &recv_data)
+void WorldSession::HandleCalendarEventRsvp(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_EVENT_RSVP");
-    recv_data.hexlike();
-    recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_EVENT_RSVP [%u]", guid.GetCounter());
+
+    ObjectGuid eventId;
+    ObjectGuid inviteId;
+    uint32 status;
+
+    recv_data >> eventId >> inviteId >> status;
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarEventRsvp %s EventId %u InviteId %u status %u", guid.GetString().c_str(), eventId.GetCounter(),
+        inviteId.GetCounter(), status);
+
+    if (CalendarEvent* calendarEvent = sCalendarMgr.GetEventById(eventId))
+    {
+        // i think we still should be able to remove self from locked events
+        if (status != CALENDAR_STATUS_REMOVED && calendarEvent->Flags & CALENDAR_FLAG_INVITES_LOCKED)
+        {
+            sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_EVENT_LOCKED);
+            return;
+        }
+
+        if (CalendarInvite* invite = calendarEvent->GetInviteById(inviteId))
+        {
+            if (invite->InviteeGuid != guid)
+            {
+                CalendarInvite* updaterInvite = calendarEvent->GetInviteByGuid(guid);
+                if (updaterInvite == NULL)
+                {
+                    sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_NOT_INVITED);
+                    return ;
+                }
+
+                if (updaterInvite->Rank != CALENDAR_RANK_MODERATOR && updaterInvite->Rank != CALENDAR_RANK_OWNER)
+                {
+                    // remover have not enough right to change invite status
+                    sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_PERMISSIONS);
+                    return;
+                }
+            }
+            invite->Status = CalendarInviteStatus(status);
+            invite->LastUpdateTime = time(NULL);
 
-    //recv_data >> uint64
-    //recv_data >> uint64
-    //recv_data >> uint32
+            sCalendarMgr.SendCalendarEventStatus(invite);
+            sCalendarMgr.SendCalendarClearPendingAction(guid);
+
+            invite->RemoveFlag(CALENDAR_STATE_FLAG_SAVED);
+            invite->AddFlag(CALENDAR_STATE_FLAG_UPDATED);
+
+        }
+        else
+            sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_NO_INVITE); // correct?
+    }
+    else
+        sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_EVENT_INVALID);
 }
 
-void WorldSession::HandleCalendarEventRemoveInvite(WorldPacket &recv_data)
+void WorldSession::HandleCalendarEventRemoveInvite(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_EVENT_REMOVE_INVITE");
-    recv_data.hexlike();
-    recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
-    //recv_data.readPackGUID(guid)
-    //recv_data >> uint64
-    //recv_data >> uint64
-    //recv_data >> uint64
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_EVENT_REMOVE_INVITE [%u]", guid.GetCounter());
+
+    ObjectGuid invitee;
+    ObjectGuid eventId;
+    ObjectGuid ownerInviteId; // isn't it sender's inviteId? TODO: need more test to see what we can do with that value
+    ObjectGuid inviteId;
+
+    recv_data >> invitee.ReadAsPacked();
+    recv_data >> inviteId >> ownerInviteId >> eventId;
+
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarEventRemoveInvite %u EventId %u, ownerInviteId %u, Invitee %u id: %u",
+        guid.GetCounter(), eventId.GetCounter(), ownerInviteId.GetCounter(), invitee.GetCounter(), inviteId.GetCounter());
+
+    if (CalendarEvent* calendarEvent = sCalendarMgr.GetEventById(eventId))
+        sCalendarMgr.RemoveInvite(eventId, inviteId, guid);
+    else
+        sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_EVENT_INVALID);
 }
 
-void WorldSession::HandleCalendarEventStatus(WorldPacket &recv_data)
+void WorldSession::HandleCalendarEventStatus(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_EVENT_STATUS");
-    recv_data.hexlike();
-    recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
-    //recv_data.readPackGUID(guid)
-    //recv_data >> uint64
-    //recv_data >> uint64
-    //recv_data >> uint64
-    //recv_data >> uint32
+    ObjectGuid updaterGuid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_EVENT_STATUS [%u]", updaterGuid.GetCounter());
+    //recv_data.hexlike();
+
+    ObjectGuid invitee;
+    ObjectGuid eventId;
+    ObjectGuid inviteId;
+    ObjectGuid ownerInviteId; // isn't it sender's inviteId?
+    uint32 status;
+
+    recv_data >> invitee.ReadAsPacked();
+    recv_data >> eventId >> inviteId >> ownerInviteId >> status;
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarEventStatus Updater: %u EventId %u ownerInviteId %u, Invitee %u id: %u, status %u",
+        updaterGuid.GetCounter(), eventId.GetCounter(), ownerInviteId.GetCounter(), invitee.GetCounter(), inviteId.GetCounter(), status);
+
+    if (CalendarEvent* calendarEvent = sCalendarMgr.GetEventById(eventId))
+    {
+        if (CalendarInvite* invite = calendarEvent->GetInviteById(inviteId))
+        {
+            if (invite->InviteeGuid != updaterGuid)
+            {
+                CalendarInvite* updaterInvite = calendarEvent->GetInviteByGuid(updaterGuid);
+                if (updaterInvite == NULL)
+                {
+                    sCalendarMgr.SendCalendarCommandResult(updaterGuid, CALENDAR_ERROR_NOT_INVITED);
+                    return ;
+                }
+
+                if (updaterInvite->Rank != CALENDAR_RANK_MODERATOR && updaterInvite->Rank != CALENDAR_RANK_OWNER)
+                {
+                    // remover have not enough right to change invite status
+                    sCalendarMgr.SendCalendarCommandResult(updaterGuid, CALENDAR_ERROR_PERMISSIONS);
+                    return;
+                }
+            }
+            invite->Status = (CalendarInviteStatus)status;
+            invite->LastUpdateTime = time(NULL);                                        // not sure if we should set response time when moderator changes invite status
+
+            //sCalendarMgr.UpdateInvite(invite);
+            sCalendarMgr.SendCalendarEventStatus(invite);
+            sCalendarMgr.SendCalendarClearPendingAction(invitee);
+
+            invite->RemoveFlag(CALENDAR_STATE_FLAG_SAVED);
+            invite->AddFlag(CALENDAR_STATE_FLAG_UPDATED);
+
+        }
+        else
+            sCalendarMgr.SendCalendarCommandResult(updaterGuid, CALENDAR_ERROR_NO_INVITE);
+    }
+    else
+        sCalendarMgr.SendCalendarCommandResult(updaterGuid, CALENDAR_ERROR_EVENT_INVALID);
 }
 
-void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket &recv_data)
+void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_EVENT_MODERATOR_STATUS");
-    recv_data.hexlike();
-    recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
-    //recv_data.readPackGUID(guid)
-    //recv_data >> uint64
-    //recv_data >> uint64
-    //recv_data >> uint64
-    //recv_data >> uint32
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_EVENT_MODERATOR_STATUS [%u]", guid.GetCounter());
+
+    ObjectGuid invitee;
+    ObjectGuid eventId;
+    ObjectGuid inviteId;
+    ObjectGuid ownerInviteId; // isn't it sender's inviteId?
+    uint32 rank;
+
+    recv_data >> invitee.ReadAsPacked();
+    recv_data >> eventId >>  inviteId >> ownerInviteId >> rank;
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarEventModeratorStatus [%u] EventId [%u] ownerInviteId [%u], Invitee ([%u] id: [%u], rank %u",
+        guid.GetCounter(), eventId.GetCounter(), ownerInviteId.GetCounter(), invitee.GetCounter(), inviteId.GetCounter(), rank);
+
+    if (CalendarEvent* calendarEvent = sCalendarMgr.GetEventById(eventId))
+    {
+        if (CalendarInvite* invite = calendarEvent->GetInviteById(inviteId))
+        {
+            if (invite->InviteeGuid != guid)
+            {
+                CalendarInvite* updaterInvite = calendarEvent->GetInviteByGuid(guid);
+                if (updaterInvite == NULL)
+                {
+                    sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_NOT_INVITED);
+                    return ;
+                }
+                if (updaterInvite->Rank != CALENDAR_RANK_MODERATOR && updaterInvite->Rank != CALENDAR_RANK_OWNER)
+                {
+                    // remover have not enough right to change invite status
+                    sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_PERMISSIONS);
+                    return;
+                }
+            }
+
+            if (CalendarModerationRank(rank) == CALENDAR_RANK_OWNER)
+            {
+                 // cannot set owner
+                 sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_PERMISSIONS);
+                 return;
+            }
+
+            invite->RemoveFlag(CALENDAR_STATE_FLAG_SAVED);
+            invite->AddFlag(CALENDAR_STATE_FLAG_UPDATED);
+
+            invite->Rank = CalendarModerationRank(rank);
+            sCalendarMgr.SendCalendarEventModeratorStatusAlert(invite);
+        }
+        else
+            sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_NO_INVITE);
+    }
+    else
+        sCalendarMgr.SendCalendarCommandResult(guid, CALENDAR_ERROR_EVENT_INVALID);
 }
 
-void WorldSession::HandleCalendarComplain(WorldPacket &recv_data)
+void WorldSession::HandleCalendarComplain(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_COMPLAIN");
-    recv_data.hexlike();
-    recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_COMPLAIN [%u]", guid.GetCounter());
+
+    ObjectGuid badGuyGuid;
+    ObjectGuid eventId;
+    ObjectGuid inviteId;
+
+    recv_data >> badGuyGuid;
+    recv_data >> eventId >>  inviteId;
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarComplain %u EventId %u, Invitee %u id: %u",
+        guid.GetCounter(), eventId.GetCounter(), badGuyGuid.GetCounter(), inviteId.GetCounter());
 
-    //recv_data >> uint64
-    //recv_data >> uint64
-    //recv_data >> uint64
+    // Remove the invite
+    if (sCalendarMgr.RemoveInvite(eventId, inviteId, guid))
+    {
+        WorldPacket data(SMSG_COMPLAIN_RESULT, 1 + 1);
+        data << uint8(0);
+        data << uint8(0); // show complain saved. We can send 0x0C to show windows with ok button
+        SendPacket(&data);
+    }
 }
 
-void WorldSession::HandleCalendarGetNumPending(WorldPacket & /*recv_data*/)
+void WorldSession::HandleCalendarGetNumPending(WorldPacket& /*recv_data*/)
 {
-    DEBUG_LOG("WORLD: CMSG_CALENDAR_GET_NUM_PENDING");      // empty
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    DEBUG_LOG("WORLD: CMSG_CALENDAR_GET_NUM_PENDING [%u]", guid.GetCounter());
+
+    uint32 pending = sCalendarMgr.GetPlayerNumPending(guid);
+
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "WorldSession::HandleCalendarGetNumPending %s Pending: %u", guid.GetString().c_str(), pending);
 
     WorldPacket data(SMSG_CALENDAR_SEND_NUM_PENDING, 4);
-    data << uint32(0);                                      // 0 - no pending invites, 1 - some pending invites
+    data << uint32(pending);
     SendPacket(&data);
 }
diff --git a/src/game/Camera.cpp b/src/game/Camera.cpp
index 4383b8edefd..89d3df940d2 100644
--- a/src/game/Camera.cpp
+++ b/src/game/Camera.cpp
@@ -22,22 +22,39 @@
 #include "Log.h"
 #include "Errors.h"
 #include "Player.h"
+#include "ObjectMgr.h"
 
-Camera::Camera(Player* pl) : m_owner(*pl), m_source(pl)
+Camera::Camera(Player& player) : m_owner(player), m_sourceGuid(ObjectGuid())
 {
-    m_source->GetViewPoint().Attach(this);
 }
 
 Camera::~Camera()
 {
+    // Don't cleanup/log for not fully created Player object.
+    if (!GetOwner()->IsInitialized())
+        return;
+
     // view of camera should be already reseted to owner (RemoveFromWorld -> Event_RemovedFromWorld -> ResetView)
-    MANGOS_ASSERT(m_source == &m_owner);
+    if (!m_sourceGuid.IsEmpty() && m_sourceGuid != GetOwner()->GetObjectGuid())
+        sLog.outError("Camera destuctor called: camera for %s not reseted (setted to %s)",
+            GetOwner()->GetObjectGuid().GetString().c_str(), m_sourceGuid.IsEmpty() ? "<none>" : m_sourceGuid.GetString().c_str());
 
     // for symmetry with constructor and way to make viewpoint's list empty
-    m_source->GetViewPoint().Detach(this);
+    GetBody()->GetViewPoint().Detach(GetOwner()->GetObjectGuid());
+}
+
+void Camera::Initialize()
+{
+    ResetView();
 }
 
-void Camera::ReceivePacket(WorldPacket *data)
+void Camera::Reset()
+{
+    GetBody()->GetViewPoint().Detach(GetOwner()->GetObjectGuid());
+    m_sourceGuid.Clear();
+}
+
+void Camera::ReceivePacket(WorldPacket* data)
 {
     m_owner.SendDirectMessage(data);
 }
@@ -46,63 +63,81 @@ void Camera::UpdateForCurrentViewPoint()
 {
     m_gridRef.unlink();
 
-    if (GridType* grid = m_source->GetViewPoint().m_grid)
+    if (GridType* grid = GetBody()->GetViewPoint().m_grid)
         grid->AddWorldObject(this);
 
     UpdateVisibilityForOwner();
 }
 
-void Camera::SetView(WorldObject *obj, bool update_far_sight_field /*= true*/)
+void Camera::SetView(WorldObject* obj, bool update_far_sight_field /*= true*/)
 {
     MANGOS_ASSERT(obj);
 
-    if (m_source == obj)
+    if (obj->GetObjectGuid() == m_sourceGuid)
         return;
 
-    if (!m_owner.IsInMap(obj))
+    WorldObject* m_source = IsInitialized() ? GetBody() : NULL;
+
+    if (IsInitialized() && !m_owner.IsInMap(obj))
     {
         sLog.outError("Camera::SetView, viewpoint is not in map with camera's owner");
+        Reset();
         return;
     }
 
     if (!obj->isType(TypeMask(TYPEMASK_DYNAMICOBJECT | TYPEMASK_UNIT)))
     {
         sLog.outError("Camera::SetView, viewpoint type is not available for client");
+        Reset();
         return;
     }
 
     // detach and deregister from active objects if there are no more reasons to be active
-    m_source->GetViewPoint().Detach(this);
-    if (!m_source->isActiveObject())
-        m_source->GetMap()->RemoveFromActive(m_source);
+    if (m_source)
+    {
+        m_source->GetViewPoint().Detach(GetOwner()->GetObjectGuid());
+        if (!m_source->isActiveObject() && m_source->GetMap())
+            m_source->GetMap()->RemoveFromActive(m_source);
+    }
+
+    DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "Camera::SetView %s changed camera base from %s to %s",
+        GetOwner()->GetObjectGuid().GetString().c_str(),
+        IsInitialized() ? m_sourceGuid.GetString().c_str() : "<none>",
+        obj->GetObjectGuid().GetString().c_str());
 
-    m_source = obj;
+    m_sourceGuid = obj->GetObjectGuid();
 
-    if (!m_source->isActiveObject())
-        m_source->GetMap()->AddToActive(m_source);
+    if (!obj->isActiveObject() && obj->GetMap())
+        obj->GetMap()->AddToActive(obj);
 
-    m_source->GetViewPoint().Attach(this);
+    obj->GetViewPoint().Attach(GetOwner()->GetObjectGuid());
 
     if (update_far_sight_field)
-        m_owner.SetGuidValue(PLAYER_FARSIGHT, (m_source == &m_owner ? ObjectGuid() : m_source->GetObjectGuid()));
+        m_owner.SetGuidValue(PLAYER_FARSIGHT, (m_sourceGuid == m_owner.GetObjectGuid() ? ObjectGuid() : m_sourceGuid));
 
     UpdateForCurrentViewPoint();
 }
 
 void Camera::Event_ViewPointVisibilityChanged()
 {
-    if (!m_owner.HaveAtClient(m_source))
+    if (!m_owner.HaveAtClient(GetBody()->GetObjectGuid()))
         ResetView();
 }
 
 void Camera::ResetView(bool update_far_sight_field /*= true*/)
 {
+    if (IsInitialized() && GetOwner()->GetObjectGuid() == m_sourceGuid)
+        return;
+
     SetView(&m_owner, update_far_sight_field);
 }
 
 void Camera::Event_AddedToWorld()
 {
-    GridType* grid = m_source->GetViewPoint().m_grid;
+    if (!IsInitialized())
+        ResetView();
+
+    GridType* grid = GetBody()->GetViewPoint().m_grid;
     MANGOS_ASSERT(grid);
     grid->AddWorldObject(this);
 
@@ -111,51 +146,107 @@ void Camera::Event_AddedToWorld()
 
 void Camera::Event_RemovedFromWorld()
 {
-    if (m_source == &m_owner)
+    if (GetOwner()->GetObjectGuid() == m_sourceGuid)
     {
         m_gridRef.unlink();
         return;
     }
 
-    ResetView();
+    if (IsInitialized())
+        ResetView();
 }
 
 void Camera::Event_Moved()
 {
     m_gridRef.unlink();
-    m_source->GetViewPoint().m_grid->AddWorldObject(this);
+    GetBody()->GetViewPoint().m_grid->AddWorldObject(this);
 }
 
 void Camera::UpdateVisibilityOf(WorldObject* target)
 {
-    m_owner.UpdateVisibilityOf(m_source, target);
+    m_owner.UpdateVisibilityOf(GetBody(), target);
 }
 
-template<class T>
-void Camera::UpdateVisibilityOf(T * target, UpdateData &data, std::set<WorldObject*>& vis)
+void Camera::UpdateVisibilityOf(WorldObject* target, UpdateData& data, WorldObjectSet& vis)
 {
-    m_owner.template UpdateVisibilityOf<T>(m_source, target,data,vis);
+    m_owner.UpdateVisibilityOf(GetBody(), target, data, vis);
 }
 
-template void Camera::UpdateVisibilityOf(Player*        , UpdateData& , std::set<WorldObject*>& );
-template void Camera::UpdateVisibilityOf(Creature*      , UpdateData& , std::set<WorldObject*>& );
-template void Camera::UpdateVisibilityOf(Corpse*        , UpdateData& , std::set<WorldObject*>& );
-template void Camera::UpdateVisibilityOf(GameObject*    , UpdateData& , std::set<WorldObject*>& );
-template void Camera::UpdateVisibilityOf(DynamicObject* , UpdateData& , std::set<WorldObject*>& );
-
 void Camera::UpdateVisibilityForOwner()
 {
+    WorldObject* m_source = GetBody();
+    if (!m_source->GetMap())
+        return;
+
     MaNGOS::VisibleNotifier notifier(*this);
-    Cell::VisitAllObjects(m_source, notifier, m_source->GetMap()->GetVisibilityDistance(), false);
+    Cell::VisitAllObjects(m_source, notifier, m_source->GetMap()->GetVisibilityDistance(m_source), false);
     notifier.Notify();
 }
 
+WorldObject* Camera::GetBody()
+{
+    if (m_sourceGuid.IsEmpty() 
+        || GetOwner()->GetObjectGuid() == m_sourceGuid
+        || !m_owner.IsInWorld() 
+        || !m_owner.GetMap())
+        return &m_owner;
+
+    WorldObject* m_source = m_owner.GetMap()->GetWorldObject(m_sourceGuid);
+
+    return m_source ? m_source : &m_owner;
+}
+
 //////////////////
 
 ViewPoint::~ViewPoint()
 {
     if (!m_cameras.empty())
     {
-        sLog.outError("ViewPoint destructor called, but some cameras referenced to it");
+        sLog.outError("ViewPoint destructor for %s called, but %u camera(s) referenced to it",
+            m_body.IsInitialized() ? m_body.GetObjectGuid().GetString().c_str() : "<uninitialized>", m_cameras.size());
+    }
+}
+
+void ViewPoint::Attach(ObjectGuid const& cameraOwnerGuid) 
+{
+    m_cameras.insert(cameraOwnerGuid);
+}
+
+void ViewPoint::Detach(ObjectGuid const& cameraOwnerGuid) 
+{
+    m_cameras.erase(cameraOwnerGuid);
+}
+
+void ViewPoint::CameraCall(void (Camera::*handler)())
+{
+    if (!m_cameras.empty())
+    {
+
+        for (CameraList::iterator itr = m_cameras.begin(), next; itr != m_cameras.end(); itr = next)
+        {
+            next = itr;
+            ++next;
+            ObjectGuid guid = *itr;
+
+            if (m_body.GetTypeId() == TYPEID_PLAYER && guid == m_body.GetObjectGuid())
+            {
+                if (Camera* camera = ((Player*)&m_body)->GetCamera())
+                    if (camera->IsInitialized())
+                        (camera->*handler)();
+            }
+            else if (m_body.GetMap() && guid.IsPlayer())
+            {
+                if (Player* player = m_body.GetMap()->GetPlayer(guid))
+                {
+                    if (Camera* camera = player->GetCamera())
+                        if (camera->IsInitialized())
+                            (camera->*handler)();
+                }
+                else
+                    m_cameras.erase(guid);
+            }
+            else
+                m_cameras.erase(guid);
+        }
     }
 }
diff --git a/src/game/Camera.h b/src/game/Camera.h
index b1c3331fddd..62f6bf36e65 100644
--- a/src/game/Camera.h
+++ b/src/game/Camera.h
@@ -21,6 +21,7 @@
 
 #include "Common.h"
 #include "GridDefines.h"
+#include "ObjectGuid.h"
 
 class ViewPoint;
 class WorldObject;
@@ -31,28 +32,32 @@ class Player;
 /// Camera - object-receiver. Receives broadcast packets from nearby worldobjects, object visibility changes and sends them to client
 class MANGOS_DLL_SPEC Camera
 {
-    friend class ViewPoint;
+        friend class ViewPoint;
     public:
 
-        explicit Camera(Player* pl);
+        explicit Camera(Player& player);
         ~Camera();
 
-        WorldObject* GetBody() { return m_source;}
+        WorldObject* GetBody();
         Player* GetOwner() { return &m_owner;}
 
+        // helper functions for detect/set initial state for camera
+        void Initialize();
+        void Reset();
+        bool IsInitialized() const { return !m_sourceGuid.IsEmpty(); };
+
         // set camera's view to any worldobject
         // Note: this worldobject must be in same map, in same phase with camera's owner(player)
         // client supports only unit and dynamic objects as farsight objects
-        void SetView(WorldObject *obj, bool update_far_sight_field = true);
+        void SetView(WorldObject* obj, bool update_far_sight_field = true);
 
         // set view to camera's owner
         void ResetView(bool update_far_sight_field = true);
 
-        template<class T>
-        void UpdateVisibilityOf(T * obj, UpdateData &d, std::set<WorldObject*>& vis);
+        void UpdateVisibilityOf(WorldObject* obj, UpdateData& d, WorldObjectSet& vis);
         void UpdateVisibilityOf(WorldObject* obj);
 
-        void ReceivePacket(WorldPacket *data);
+        void ReceivePacket(WorldPacket* data);
 
         // updates visibility of worldobjects around viewpoint for camera's owner
         void UpdateVisibilityForOwner();
@@ -65,7 +70,7 @@ class MANGOS_DLL_SPEC Camera
         void Event_ViewPointVisibilityChanged();
 
         Player& m_owner;
-        WorldObject* m_source;
+        ObjectGuid m_sourceGuid;
 
         void UpdateForCurrentViewPoint();
 
@@ -79,63 +84,58 @@ class MANGOS_DLL_SPEC Camera
 /// Object-observer, notifies farsight object state to cameras that attached to it
 class MANGOS_DLL_SPEC ViewPoint
 {
-    friend class Camera;
+        friend class Camera;
+
+        typedef GuidSet CameraList;
+
+        CameraList          m_cameras;
+        GridType*           m_grid;
+        WorldObject&        m_body;
+
+        void Attach(ObjectGuid const& cameraOwnerGuid);
+        void Detach(ObjectGuid const& cameraOwnerGuid);
+
+        void CameraCall(void (Camera::*handler)());
+
+    public:
+
+        ViewPoint(WorldObject& object) : m_grid(NULL), m_body(object), m_cameras(CameraList())
+        {}
+
+        ~ViewPoint();
+
+        WorldObject* GetBody() { return &m_body;}
 
-    typedef std::list<Camera*> CameraList;
+        bool hasViewers() const { return !m_cameras.empty(); }
 
-    CameraList m_cameras;
-    GridType * m_grid;
+        // these events are called when viewpoint changes visibility state
+        void Event_AddedToWorld(GridType* grid)
+        {
+            m_grid = grid;
+            CameraCall(&Camera::Event_AddedToWorld);
+        }
+
+        void Event_RemovedFromWorld()
+        {
+            m_grid = NULL;
+            CameraCall(&Camera::Event_RemovedFromWorld);
+        }
 
-    void Attach(Camera* c) { m_cameras.push_back(c); }
-    void Detach(Camera* c) { m_cameras.remove(c); }
+        void Event_GridChanged(GridType* grid)
+        {
+            m_grid = grid;
+            CameraCall(&Camera::Event_Moved);
+        }
+
+        void Event_ViewPointVisibilityChanged()
+        {
+            CameraCall(&Camera::Event_ViewPointVisibilityChanged);
+        }
 
-    void CameraCall(void (Camera::*handler)())
-    {
-        if (!m_cameras.empty())
+        void Call_UpdateVisibilityForOwner()
         {
-            for(CameraList::iterator itr = m_cameras.begin(); itr != m_cameras.end();)
-            {
-                Camera *c = *(itr++);
-                (c->*handler)();
-            }
+            CameraCall(&Camera::UpdateVisibilityForOwner);
         }
-    }
-
-public:
-
-    ViewPoint() : m_grid(0) {}
-    ~ViewPoint();
-
-    bool hasViewers() const { return !m_cameras.empty(); }
-
-    // these events are called when viewpoint changes visibility state
-    void Event_AddedToWorld(GridType *grid)
-    {
-        m_grid = grid;
-        CameraCall(&Camera::Event_AddedToWorld);
-    }
-
-    void Event_RemovedFromWorld()
-    {
-        m_grid = NULL;
-        CameraCall(&Camera::Event_RemovedFromWorld);
-    }
-
-    void Event_GridChanged(GridType *grid)
-    {
-        m_grid = grid;
-        CameraCall(&Camera::Event_Moved);
-    }
-
-    void Event_ViewPointVisibilityChanged()
-    {
-        CameraCall(&Camera::Event_ViewPointVisibilityChanged);
-    }
-
-    void Call_UpdateVisibilityForOwner()
-    {
-        CameraCall(&Camera::UpdateVisibilityForOwner);
-    }
 };
 
 #endif
diff --git a/src/game/Cell.h b/src/game/Cell.h
index b681538c6a5..e593e588818 100644
--- a/src/game/Cell.h
+++ b/src/game/Cell.h
@@ -46,81 +46,81 @@ struct MANGOS_DLL_DECL CellArea
 
 struct MANGOS_DLL_DECL Cell
 {
-    Cell() { data.All = 0; }
-    Cell(const Cell &cell) { data.All = cell.data.All; }
-    explicit Cell(CellPair const& p);
+        Cell() { data.All = 0; }
+        Cell(const Cell& cell) { data.All = cell.data.All; }
+        explicit Cell(CellPair const& p);
 
-    void Compute(uint32 &x, uint32 &y) const
-    {
-        x = data.Part.grid_x*MAX_NUMBER_OF_CELLS + data.Part.cell_x;
-        y = data.Part.grid_y*MAX_NUMBER_OF_CELLS + data.Part.cell_y;
-    }
+        void Compute(uint32& x, uint32& y) const
+        {
+            x = data.Part.grid_x * MAX_NUMBER_OF_CELLS + data.Part.cell_x;
+            y = data.Part.grid_y * MAX_NUMBER_OF_CELLS + data.Part.cell_y;
+        }
 
-    bool DiffCell(const Cell &cell) const
-    {
-        return( data.Part.cell_x != cell.data.Part.cell_x ||
-            data.Part.cell_y != cell.data.Part.cell_y );
-    }
+        bool DiffCell(const Cell& cell) const
+        {
+            return (data.Part.cell_x != cell.data.Part.cell_x ||
+                    data.Part.cell_y != cell.data.Part.cell_y);
+        }
 
-    bool DiffGrid(const Cell &cell) const
-    {
-        return( data.Part.grid_x != cell.data.Part.grid_x ||
-            data.Part.grid_y != cell.data.Part.grid_y );
-    }
+        bool DiffGrid(const Cell& cell) const
+        {
+            return (data.Part.grid_x != cell.data.Part.grid_x ||
+                    data.Part.grid_y != cell.data.Part.grid_y);
+        }
 
-    uint32 CellX() const { return data.Part.cell_x; }
-    uint32 CellY() const { return data.Part.cell_y; }
-    uint32 GridX() const { return data.Part.grid_x; }
-    uint32 GridY() const { return data.Part.grid_y; }
-    bool NoCreate() const { return data.Part.nocreate; }
-    void SetNoCreate() { data.Part.nocreate = 1; }
+        uint32 CellX() const { return data.Part.cell_x; }
+        uint32 CellY() const { return data.Part.cell_y; }
+        uint32 GridX() const { return data.Part.grid_x; }
+        uint32 GridY() const { return data.Part.grid_y; }
+        bool NoCreate() const { return data.Part.nocreate; }
+        void SetNoCreate() { data.Part.nocreate = 1; }
 
-    GridPair gridPair() const { return GridPair(GridX(),GridY()); }
+        GridPair gridPair() const { return GridPair(GridX(), GridY()); }
 
-    CellPair cellPair() const
-    {
-        return CellPair(
-            data.Part.grid_x*MAX_NUMBER_OF_CELLS+data.Part.cell_x,
-            data.Part.grid_y*MAX_NUMBER_OF_CELLS+data.Part.cell_y);
-    }
+        CellPair cellPair() const
+        {
+            return CellPair(
+                       data.Part.grid_x * MAX_NUMBER_OF_CELLS + data.Part.cell_x,
+                       data.Part.grid_y * MAX_NUMBER_OF_CELLS + data.Part.cell_y);
+        }
 
-    Cell& operator=(const Cell &cell)
-    {
-        data.All = cell.data.All;
-        return *this;
-    }
+        Cell& operator=(const Cell& cell)
+        {
+            data.All = cell.data.All;
+            return *this;
+        }
 
-    bool operator==(const Cell &cell) const { return (data.All == cell.data.All); }
-    bool operator!=(const Cell &cell) const { return !operator==(cell); }
-    union
-    {
-        struct
+        bool operator==(const Cell& cell) const { return (data.All == cell.data.All); }
+        bool operator!=(const Cell& cell) const { return !operator==(cell); }
+        union
         {
-            unsigned grid_x : 6;
-            unsigned grid_y : 6;
-            unsigned cell_x : 6;
-            unsigned cell_y : 6;
-            unsigned nocreate : 1;
-            unsigned reserved : 7;
-        } Part;
-        uint32 All;
-    } data;
-
-    template<class T, class CONTAINER> void Visit(const CellPair &cellPair, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, float x, float y, float radius) const;
-    template<class T, class CONTAINER> void Visit(const CellPair &cellPair, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, const WorldObject& obj, float radius) const;
-
-    static CellArea CalculateCellArea(float x, float y, float radius);
-
-    template<class T> static void VisitGridObjects(const WorldObject *obj, T &visitor, float radius, bool dont_load = true);
-    template<class T> static void VisitWorldObjects(const WorldObject *obj, T &visitor, float radius, bool dont_load = true);
-    template<class T> static void VisitAllObjects(const WorldObject *obj, T &visitor, float radius, bool dont_load = true);
-
-    template<class T> static void VisitGridObjects(float x, float y, Map *map, T &visitor, float radius, bool dont_load = true);
-    template<class T> static void VisitWorldObjects(float x, float y, Map *map, T &visitor, float radius, bool dont_load = true);
-    template<class T> static void VisitAllObjects(float x, float y, Map *map, T &visitor, float radius, bool dont_load = true);
-
-private:
-    template<class T, class CONTAINER> void VisitCircle(TypeContainerVisitor<T, CONTAINER> &, Map &, const CellPair& , const CellPair& ) const;
+            struct
+            {
+                unsigned grid_x : 6;
+                unsigned grid_y : 6;
+                unsigned cell_x : 6;
+                unsigned cell_y : 6;
+                unsigned nocreate : 1;
+                unsigned reserved : 7;
+            } Part;
+            uint32 All;
+        } data;
+
+        template<class T, class CONTAINER> void Visit(const CellPair& cellPair, TypeContainerVisitor<T, CONTAINER>& visitor, Map& m, float x, float y, float radius) const;
+        template<class T, class CONTAINER> void Visit(const CellPair& cellPair, TypeContainerVisitor<T, CONTAINER>& visitor, Map& m, const WorldObject& obj, float radius) const;
+
+        static CellArea CalculateCellArea(float x, float y, float radius);
+
+        template<class T> static void VisitGridObjects(const WorldObject* obj, T& visitor, float radius, bool dont_load = true);
+        template<class T> static void VisitWorldObjects(const WorldObject* obj, T& visitor, float radius, bool dont_load = true);
+        template<class T> static void VisitAllObjects(const WorldObject* obj, T& visitor, float radius, bool dont_load = true);
+
+        template<class T> static void VisitGridObjects(float x, float y, Map* map, T& visitor, float radius, bool dont_load = true);
+        template<class T> static void VisitWorldObjects(float x, float y, Map* map, T& visitor, float radius, bool dont_load = true);
+        template<class T> static void VisitAllObjects(float x, float y, Map* map, T& visitor, float radius, bool dont_load = true);
+
+    private:
+        template<class T, class CONTAINER> void VisitCircle(TypeContainerVisitor<T, CONTAINER>&, Map&, const CellPair& , const CellPair&) const;
 };
 
 #endif
diff --git a/src/game/CellImpl.h b/src/game/CellImpl.h
index 2ddb523da5e..7f11adad230 100644
--- a/src/game/CellImpl.h
+++ b/src/game/CellImpl.h
@@ -43,15 +43,15 @@ inline CellArea Cell::CalculateCellArea(float x, float y, float radius)
     }
 
     return CellArea
-    (
-        MaNGOS::ComputeCellPair(x - radius, y - radius).normalize(),
-        MaNGOS::ComputeCellPair(x + radius, y + radius).normalize()
-    );
+           (
+               MaNGOS::ComputeCellPair(x - radius, y - radius).normalize(),
+               MaNGOS::ComputeCellPair(x + radius, y + radius).normalize()
+           );
 }
 
 template<class T, class CONTAINER>
 inline void
-Cell::Visit(const CellPair &standing_cell, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, const WorldObject& obj, float radius) const
+Cell::Visit(const CellPair& standing_cell, TypeContainerVisitor<T, CONTAINER>& visitor, Map& m, const WorldObject& obj, float radius) const
 {
     Cell::Visit(standing_cell, visitor, m, obj.GetPositionX(), obj.GetPositionY(), radius + obj.GetObjectBoundingRadius());
 }
@@ -59,56 +59,59 @@ Cell::Visit(const CellPair &standing_cell, TypeContainerVisitor<T, CONTAINER> &v
 
 template<class T, class CONTAINER>
 inline void
-Cell::Visit(const CellPair &standing_cell, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, float x, float y, float radius) const
+Cell::Visit(const CellPair& standing_cell, TypeContainerVisitor<T, CONTAINER>& visitor, Map& m, float x, float y, float radius) const
 {
     if (standing_cell.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || standing_cell.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP)
         return;
 
-    //no jokes here... Actually placing ASSERT() here was good idea, but
-    //we had some problems with DynamicObjects, which pass radius = 0.0f (DB issue?)
-    //maybe it is better to just return when radius <= 0.0f?
-    if(radius <= 0.0f)
+    // no jokes here... Actually placing ASSERT() here was good idea, but
+    // we had some problems with DynamicObjects, which pass radius = 0.0f (DB issue?)
+    // maybe it is better to just return when radius <= 0.0f?
+    if (radius <= 0.0f)
     {
         m.Visit(*this, visitor);
         return;
     }
-    //lets limit the upper value for search radius
-    if(radius > 333.0f)
-        radius = 333.0f;
+    // lets limit the upper value for search radius
+    if (radius > MAX_VISIBILITY_DISTANCE)
+        radius = MAX_VISIBILITY_DISTANCE;
 
-    //lets calculate object coord offsets from cell borders.
+    // lets calculate object coord offsets from cell borders.
     CellArea area = Cell::CalculateCellArea(x, y, radius);
-    //if radius fits inside standing cell
-    if(!area)
+    // if radius fits inside standing cell
+    if (!area)
     {
         m.Visit(*this, visitor);
         return;
     }
 
-    CellPair &begin_cell = area.low_bound;
-    CellPair &end_cell = area.high_bound;
-    //visit all cells, found in CalculateCellArea()
-    //if radius is known to reach cell area more than 4x4 then we should call optimized VisitCircle
-    //currently this technique works with MAX_NUMBER_OF_CELLS 16 and higher, with lower values
-    //there are nothing to optimize because SIZE_OF_GRID_CELL is too big...
-    if(((end_cell.x_coord - begin_cell.x_coord) > 4) && ((end_cell.y_coord - begin_cell.y_coord) > 4))
+    CellPair& begin_cell = area.low_bound;
+    CellPair& end_cell = area.high_bound;
+
+    if (begin_cell.x_coord > end_cell.x_coord)
+        return;
+    // visit all cells, found in CalculateCellArea()
+    // if radius is known to reach cell area more than 4x4 then we should call optimized VisitCircle
+    // currently this technique works with MAX_NUMBER_OF_CELLS 16 and higher, with lower values
+    // there are nothing to optimize because SIZE_OF_GRID_CELL is too big...
+    if ((((int)end_cell.x_coord - (int)begin_cell.x_coord) > 4) && (((int)end_cell.y_coord - (int)begin_cell.y_coord) > 4))
     {
         VisitCircle(visitor, m, begin_cell, end_cell);
         return;
     }
 
-    //ALWAYS visit standing cell first!!! Since we deal with small radiuses
-    //it is very essential to call visitor for standing cell firstly...
+    // ALWAYS visit standing cell first!!! Since we deal with small radiuses
+    // it is very essential to call visitor for standing cell firstly...
     m.Visit(*this, visitor);
 
     // loop the cell range
-    for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; x++)
+    for (uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; ++x)
     {
-        for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; y++)
+        for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y)
         {
-            CellPair cell_pair(x,y);
-            //lets skip standing cell since we already visited it
-            if(cell_pair != standing_cell)
+            CellPair cell_pair(x, y);
+            // lets skip standing cell since we already visited it
+            if (cell_pair != standing_cell)
             {
                 Cell r_zone(cell_pair);
                 r_zone.data.Part.nocreate = data.Part.nocreate;
@@ -120,49 +123,54 @@ Cell::Visit(const CellPair &standing_cell, TypeContainerVisitor<T, CONTAINER> &v
 
 template<class T, class CONTAINER>
 inline void
-Cell::VisitCircle(TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, const CellPair& begin_cell, const CellPair& end_cell) const
+Cell::VisitCircle(TypeContainerVisitor<T, CONTAINER>& visitor, Map& m, const CellPair& begin_cell, const CellPair& end_cell) const
 {
-    //here is an algorithm for 'filling' circum-squared octagon
-    uint32 x_shift = (uint32)ceilf((end_cell.x_coord - begin_cell.x_coord) * 0.3f - 0.5f);
-    //lets calculate x_start/x_end coords for central strip...
+    // here is an algorithm for 'filling' circum-squared octagon
+    int32 x_shift = (int32)ceilf((end_cell.x_coord - begin_cell.x_coord) * 0.3f - 0.5f);
+
+    // Incorrect set cells pair - do nothing
+    if (x_shift < 0)
+        return;
+
+    // lets calculate x_start/x_end coords for central strip...
     const uint32 x_start = begin_cell.x_coord + x_shift;
     const uint32 x_end = end_cell.x_coord - x_shift;
 
-    //visit central strip with constant width...
-    for(uint32 x = x_start; x <= x_end; ++x)
+    // visit central strip with constant width...
+    for (uint32 x = x_start; x <= x_end; ++x)
     {
-        for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y)
+        for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y)
         {
-            CellPair cell_pair(x,y);
+            CellPair cell_pair(x, y);
             Cell r_zone(cell_pair);
             r_zone.data.Part.nocreate = data.Part.nocreate;
             m.Visit(r_zone, visitor);
         }
     }
 
-    //if x_shift == 0 then we have too small cell area, which were already
-    //visited at previous step, so just return from procedure...
-    if(x_shift == 0)
+    // if x_shift == 0 then we have too small cell area, which were already
+    // visited at previous step, so just return from procedure...
+    if (x_shift == 0)
         return;
 
     uint32 y_start = end_cell.y_coord;
     uint32 y_end = begin_cell.y_coord;
-    //now we are visiting borders of an octagon...
+    // now we are visiting borders of an octagon...
     for (uint32 step = 1; step <= (x_start - begin_cell.x_coord); ++step)
     {
-        //each step reduces strip height by 2 cells...
+        // each step reduces strip height by 2 cells...
         y_end += 1;
         y_start -= 1;
         for (uint32 y = y_start; y >= y_end; --y)
         {
-            //we visit cells symmetrically from both sides, heading from center to sides and from up to bottom
-            //e.g. filling 2 trapezoids after filling central cell strip...
+            // we visit cells symmetrically from both sides, heading from center to sides and from up to bottom
+            // e.g. filling 2 trapezoids after filling central cell strip...
             CellPair cell_pair_left(x_start - step, y);
             Cell r_zone_left(cell_pair_left);
             r_zone_left.data.Part.nocreate = data.Part.nocreate;
             m.Visit(r_zone_left, visitor);
 
-            //right trapezoid cell visit
+            // right trapezoid cell visit
             CellPair cell_pair_right(x_end + step, y);
             Cell r_zone_right(cell_pair_right);
             r_zone_right.data.Part.nocreate = data.Part.nocreate;
@@ -172,7 +180,7 @@ Cell::VisitCircle(TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, const Cel
 }
 
 template<class T>
-inline void Cell::VisitGridObjects(const WorldObject *center_obj, T &visitor, float radius, bool dont_load)
+inline void Cell::VisitGridObjects(const WorldObject* center_obj, T& visitor, float radius, bool dont_load)
 {
     CellPair p(MaNGOS::ComputeCellPair(center_obj->GetPositionX(), center_obj->GetPositionY()));
     Cell cell(p);
@@ -183,7 +191,7 @@ inline void Cell::VisitGridObjects(const WorldObject *center_obj, T &visitor, fl
 }
 
 template<class T>
-inline void Cell::VisitWorldObjects(const WorldObject *center_obj, T &visitor, float radius, bool dont_load)
+inline void Cell::VisitWorldObjects(const WorldObject* center_obj, T& visitor, float radius, bool dont_load)
 {
     CellPair p(MaNGOS::ComputeCellPair(center_obj->GetPositionX(), center_obj->GetPositionY()));
     Cell cell(p);
@@ -194,7 +202,7 @@ inline void Cell::VisitWorldObjects(const WorldObject *center_obj, T &visitor, f
 }
 
 template<class T>
-inline void Cell::VisitAllObjects(const WorldObject *center_obj, T &visitor, float radius, bool dont_load)
+inline void Cell::VisitAllObjects(const WorldObject* center_obj, T& visitor, float radius, bool dont_load)
 {
     CellPair p(MaNGOS::ComputeCellPair(center_obj->GetPositionX(), center_obj->GetPositionY()));
     Cell cell(p);
@@ -207,7 +215,7 @@ inline void Cell::VisitAllObjects(const WorldObject *center_obj, T &visitor, flo
 }
 
 template<class T>
-inline void Cell::VisitGridObjects(float x, float y, Map *map, T &visitor, float radius, bool dont_load)
+inline void Cell::VisitGridObjects(float x, float y, Map* map, T& visitor, float radius, bool dont_load)
 {
     CellPair p(MaNGOS::ComputeCellPair(x, y));
     Cell cell(p);
@@ -218,18 +226,18 @@ inline void Cell::VisitGridObjects(float x, float y, Map *map, T &visitor, float
 }
 
 template<class T>
-inline void Cell::VisitWorldObjects(float x, float y, Map *map, T &visitor, float radius, bool dont_load)
+inline void Cell::VisitWorldObjects(float x, float y, Map* map, T& visitor, float radius, bool dont_load)
 {
     CellPair p(MaNGOS::ComputeCellPair(x, y));
     Cell cell(p);
     if (dont_load)
         cell.SetNoCreate();
     TypeContainerVisitor<T, WorldTypeMapContainer > gnotifier(visitor);
-    cell.Visit(p ,gnotifier, *map, x, y, radius);
+    cell.Visit(p , gnotifier, *map, x, y, radius);
 }
 
 template<class T>
-inline void Cell::VisitAllObjects(float x, float y, Map *map, T &visitor, float radius, bool dont_load)
+inline void Cell::VisitAllObjects(float x, float y, Map* map, T& visitor, float radius, bool dont_load)
 {
     CellPair p(MaNGOS::ComputeCellPair(x, y));
     Cell cell(p);
diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp
index dafb2bf966c..f782a9ba4d1 100644
--- a/src/game/Channel.cpp
+++ b/src/game/Channel.cpp
@@ -16,30 +16,32 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "AccountMgr.h"
 #include "Channel.h"
 #include "ObjectMgr.h"
 #include "World.h"
 #include "SocialMgr.h"
+#include "Chat.h"
 
 Channel::Channel(const std::string& name, uint32 channel_id)
-: m_announce(true), m_moderate(false), m_name(name), m_flags(0), m_channelId(channel_id)
+    : m_announce(true), m_moderate(false), m_name(name), m_flags(0), m_channelId(channel_id)
 {
     // set special flags if built-in channel
     ChatChannelsEntry const* ch = GetChannelEntryFor(channel_id);
-    if(ch)                                                  // it's built-in channel
+    if (ch)                                                 // it's built-in channel
     {
         channel_id = ch->ChannelID;                         // built-in channel
         m_announce = false;                                 // no join/leave announces
 
         m_flags |= CHANNEL_FLAG_GENERAL;                    // for all built-in channels
 
-        if(ch->flags & CHANNEL_DBC_FLAG_TRADE)              // for trade channel
+        if (ch->flags & CHANNEL_DBC_FLAG_TRADE)             // for trade channel
             m_flags |= CHANNEL_FLAG_TRADE;
 
-        if(ch->flags & CHANNEL_DBC_FLAG_CITY_ONLY2)         // for city only channels
+        if (ch->flags & CHANNEL_DBC_FLAG_CITY_ONLY2)        // for city only channels
             m_flags |= CHANNEL_FLAG_CITY;
 
-        if(ch->flags & CHANNEL_DBC_FLAG_LFG)                // for LFG channel
+        if (ch->flags & CHANNEL_DBC_FLAG_LFG)               // for LFG channel
             m_flags |= CHANNEL_FLAG_LFG;
         else                                                // for all other channels
             m_flags |= CHANNEL_FLAG_NOT_LFG;
@@ -50,584 +52,602 @@ Channel::Channel(const std::string& name, uint32 channel_id)
     }
 }
 
-void Channel::Join(ObjectGuid p, const char *pass)
+void Channel::Join(Player* player, const char* password)
 {
+    ObjectGuid guid = player->GetObjectGuid();
+
     WorldPacket data;
-    if (IsOn(p))
+    if (IsOn(guid))
     {
-        if(!IsConstant())                                   // non send error message for built-in channels
+        if (!IsConstant())                                  // non send error message for built-in channels
         {
-            MakePlayerAlreadyMember(&data, p);
-            SendToOne(&data, p);
+            MakePlayerAlreadyMember(&data, guid);
+            SendToOne(&data, guid);
         }
         return;
     }
 
-    if (IsBanned(p))
+    if (IsBanned(guid))
     {
         MakeBanned(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
         return;
     }
 
-    if(m_password.length() > 0 && strcmp(pass, m_password.c_str()))
+    if (m_password.length() > 0 && strcmp(password, m_password.c_str()))
     {
         MakeWrongPassword(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
         return;
     }
 
-    Player *plr = sObjectMgr.GetPlayer(p);
-
-    if(plr)
+    if (HasFlag(CHANNEL_FLAG_LFG) && sWorld.getConfig(CONFIG_BOOL_RESTRICTED_LFG_CHANNEL) && player->GetSession()->GetSecurity() == SEC_PLAYER)
     {
-        if(HasFlag(CHANNEL_FLAG_LFG) && sWorld.getConfig(CONFIG_BOOL_RESTRICTED_LFG_CHANNEL) && plr->GetSession()->GetSecurity() == SEC_PLAYER )
-        {
-            MakeNotInLfg(&data);
-            SendToOne(&data, p);
-            return;
-        }
+        MakeNotInLfg(&data);
+        SendToOne(&data, guid);
+        return;
+    }
 
-        if(plr->GetGuildId() && (GetFlags() == 0x38))
-            return;
+    if (player->GetGuildId() && (GetFlags() == 0x38))
+        return;
 
-        plr->JoinedChannel(this);
-    }
+    // join channel
+    player->JoinedChannel(this);
 
-    if(m_announce && (!plr || plr->GetSession()->GetSecurity() < SEC_GAMEMASTER || !sWorld.getConfig(CONFIG_BOOL_SILENTLY_GM_JOIN_TO_CHANNEL) ))
+    if (m_announce && (player->GetSession()->GetSecurity() < SEC_GAMEMASTER || !sWorld.getConfig(CONFIG_BOOL_SILENTLY_GM_JOIN_TO_CHANNEL)))
     {
-        MakeJoined(&data, p);
+        MakeJoined(&data, guid);
         SendToAll(&data);
     }
 
     data.clear();
 
-    PlayerInfo& pinfo = m_players[p];
-    pinfo.player = p;
-    pinfo.flags = 0;
+    PlayerInfo& pinfo = m_players[guid];
+    pinfo.player = guid;
+    pinfo.flags = MEMBER_FLAG_NONE;
 
     MakeYouJoined(&data);
-    SendToOne(&data, p);
+    SendToOne(&data, guid);
 
-    JoinNotify(p);
+    JoinNotify(guid);
 
     // if no owner first logged will become
-    if(!IsConstant() && !m_ownerGuid)
+    if (!IsConstant() && !m_ownerGuid)
     {
-        SetOwner(p, (m_players.size() > 1 ? true : false));
-        m_players[p].SetModerator(true);
+        SetOwner(guid, (m_players.size() > 1 ? true : false));
+        m_players[guid].SetModerator(true);
     }
 }
 
-void Channel::Leave(ObjectGuid p, bool send)
+void Channel::Leave(Player* player, bool send)
 {
-    if (!IsOn(p))
+    ObjectGuid guid = player->GetObjectGuid();
+
+    if (!IsOn(guid))
     {
-        if(send)
+        if (send)
         {
             WorldPacket data;
             MakeNotMember(&data);
-            SendToOne(&data, p);
+            SendToOne(&data, guid);
         }
+        return;
     }
-    else
-    {
-        Player *plr = sObjectMgr.GetPlayer(p);
 
-        if(send)
-        {
-            WorldPacket data;
-            MakeYouLeft(&data);
-            SendToOne(&data, p);
-            if(plr)
-                plr->LeftChannel(this);
-            data.clear();
-        }
+    // leave channel
+    if (send)
+    {
+        WorldPacket data;
+        MakeYouLeft(&data);
+        SendToOne(&data, guid);
+        player->LeftChannel(this);
+        data.clear();
+    }
 
-        bool changeowner = m_players[p].IsOwner();
+    bool changeowner = m_players[guid].IsOwner();
 
-        m_players.erase(p);
-        if(m_announce && (!plr || plr->GetSession()->GetSecurity() < SEC_GAMEMASTER || !sWorld.getConfig(CONFIG_BOOL_SILENTLY_GM_JOIN_TO_CHANNEL) ))
-        {
-            WorldPacket data;
-            MakeLeft(&data, p);
-            SendToAll(&data);
-        }
+    m_players.erase(guid);
+    if (m_announce && (player->GetSession()->GetSecurity() < SEC_GAMEMASTER || !sWorld.getConfig(CONFIG_BOOL_SILENTLY_GM_JOIN_TO_CHANNEL)))
+    {
+        WorldPacket data;
+        MakeLeft(&data, guid);
+        SendToAll(&data);
+    }
 
-        LeaveNotify(p);
+    LeaveNotify(guid);
 
-        if(changeowner)
-        {
-            ObjectGuid newowner = !m_players.empty() ? m_players.begin()->second.player : ObjectGuid();
-            SetOwner(newowner);
-        }
+    if (changeowner)
+    {
+        ObjectGuid newowner = !m_players.empty() ? m_players.begin()->second.player : ObjectGuid();
+        SetOwner(newowner);
     }
 }
 
-void Channel::KickOrBan(ObjectGuid good, const char *badname, bool ban)
+void Channel::KickOrBan(Player* player, const char* targetName, bool ban)
 {
-    AccountTypes sec = SEC_PLAYER;
-    Player *gplr = sObjectMgr.GetPlayer(good);
-    if (gplr)
-        sec = gplr->GetSession()->GetSecurity();
+    ObjectGuid guid = player->GetObjectGuid();
 
-    if (!IsOn(good))
+    if (!IsOn(guid))
     {
         WorldPacket data;
         MakeNotMember(&data);
-        SendToOne(&data, good);
+        SendToOne(&data, guid);
+        return;
     }
-    else if (!m_players[good].IsModerator() && sec < SEC_GAMEMASTER)
+
+    if (!m_players[guid].IsModerator() && player->GetSession()->GetSecurity() < SEC_GAMEMASTER)
     {
         WorldPacket data;
         MakeNotModerator(&data);
-        SendToOne(&data, good);
+        SendToOne(&data, guid);
+        return;
     }
-    else
+
+    Player* target = sObjectMgr.GetPlayer(targetName);
+    if (!target)
     {
-        Player *bad = sObjectMgr.GetPlayer(badname);
-        if (bad == NULL || !IsOn(bad->GetObjectGuid()))
-        {
-            WorldPacket data;
-            MakePlayerNotFound(&data, badname);
-            SendToOne(&data, good);
-        }
-        else if (sec < SEC_GAMEMASTER && bad->GetObjectGuid() == m_ownerGuid && good != m_ownerGuid)
-        {
-            WorldPacket data;
-            MakeNotOwner(&data);
-            SendToOne(&data, good);
-        }
-        else
-        {
-            bool changeowner = (m_ownerGuid == bad->GetObjectGuid());
+        WorldPacket data;
+        MakePlayerNotFound(&data, targetName);
+        SendToOne(&data, guid);
+        return;
+    }
 
-            WorldPacket data;
+    ObjectGuid targetGuid = target->GetObjectGuid();
+    if (!IsOn(targetGuid))
+    {
+        WorldPacket data;
+        MakePlayerNotFound(&data, targetName);
+        SendToOne(&data, guid);
+        return;
+    }
 
-            if(ban && !IsBanned(bad->GetObjectGuid()))
-            {
-                m_banned.insert(bad->GetObjectGuid());
-                MakePlayerBanned(&data, bad->GetObjectGuid(), good);
-            }
-            else
-                MakePlayerKicked(&data, bad->GetObjectGuid(), good);
+    bool changeowner = m_ownerGuid == targetGuid;
 
-            SendToAll(&data);
-            m_players.erase(bad->GetObjectGuid());
-            bad->LeftChannel(this);
-
-            if(changeowner)
-            {
-                ObjectGuid newowner = !m_players.empty() ? good : ObjectGuid();
-                SetOwner(newowner);
-            }
-        }
+    if (player->GetSession()->GetSecurity() < SEC_GAMEMASTER && changeowner && guid != m_ownerGuid)
+    {
+        WorldPacket data;
+        MakeNotOwner(&data);
+        SendToOne(&data, guid);
+        return;
+    }
+
+    // kick or ban player
+    WorldPacket data;
+
+    if (ban && !IsBanned(targetGuid))
+    {
+        m_banned.insert(targetGuid);
+        MakePlayerBanned(&data, targetGuid, guid);
+    }
+    else
+        MakePlayerKicked(&data, targetGuid, guid);
+
+    SendToAll(&data);
+    m_players.erase(targetGuid);
+    target->LeftChannel(this);
+
+    if (changeowner)
+    {
+        ObjectGuid newowner = !m_players.empty() ? guid : ObjectGuid();
+        SetOwner(newowner);
     }
 }
 
-void Channel::UnBan(ObjectGuid good, const char *badname)
+void Channel::UnBan(Player* player, const char* targetName)
 {
-    uint32 sec = 0;
-    Player *gplr = sObjectMgr.GetPlayer(good);
-    if(gplr)
-        sec = gplr->GetSession()->GetSecurity();
+    ObjectGuid guid = player->GetObjectGuid();
 
-    if (!IsOn(good))
+    if (!IsOn(guid))
     {
         WorldPacket data;
         MakeNotMember(&data);
-        SendToOne(&data, good);
+        SendToOne(&data, guid);
+        return;
     }
-    else if(!m_players[good].IsModerator() && sec < SEC_GAMEMASTER)
+
+    if (!m_players[guid].IsModerator() && player->GetSession()->GetSecurity() < SEC_GAMEMASTER)
     {
         WorldPacket data;
         MakeNotModerator(&data);
-        SendToOne(&data, good);
+        SendToOne(&data, guid);
+        return;
     }
-    else
+
+    Player* target = sObjectMgr.GetPlayer(targetName);
+    if (!target)
     {
-        Player *bad = sObjectMgr.GetPlayer(badname);
-        if(bad == NULL || !IsBanned(bad->GetObjectGuid()))
-        {
-            WorldPacket data;
-            MakePlayerNotFound(&data, badname);
-            SendToOne(&data, good);
-        }
-        else
-        {
-            m_banned.erase(bad->GetObjectGuid());
+        WorldPacket data;
+        MakePlayerNotFound(&data, targetName);
+        SendToOne(&data, guid);
+        return;
+    }
 
-            WorldPacket data;
-            MakePlayerUnbanned(&data, bad->GetObjectGuid(), good);
-            SendToAll(&data);
-        }
+    ObjectGuid targetGuid = target->GetObjectGuid();
+    if (!IsBanned(targetGuid))
+    {
+        WorldPacket data;
+        MakePlayerNotBanned(&data, targetName);
+        SendToOne(&data, guid);
+        return;
     }
+
+    // unban player
+    m_banned.erase(targetGuid);
+
+    WorldPacket data;
+    MakePlayerUnbanned(&data, targetGuid, guid);
+    SendToAll(&data);
 }
 
-void Channel::Password(ObjectGuid p, const char *pass)
+void Channel::Password(Player* player, const char* password)
 {
-    uint32 sec = 0;
-    Player *plr = sObjectMgr.GetPlayer(p);
-    if (plr)
-        sec = plr->GetSession()->GetSecurity();
+    ObjectGuid guid = player->GetObjectGuid();
 
-    if (!IsOn(p))
+    if (!IsOn(guid))
     {
         WorldPacket data;
         MakeNotMember(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
-    else if(!m_players[p].IsModerator() && sec < SEC_GAMEMASTER)
+
+    if (!m_players[guid].IsModerator() && player->GetSession()->GetSecurity() < SEC_GAMEMASTER)
     {
         WorldPacket data;
         MakeNotModerator(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
-    else
-    {
-        m_password = pass;
 
-        WorldPacket data;
-        MakePasswordChanged(&data, p);
-        SendToAll(&data);
-    }
+    // set channel password
+    m_password = password;
+
+    WorldPacket data;
+    MakePasswordChanged(&data, guid);
+    SendToAll(&data);
 }
 
-void Channel::SetMode(ObjectGuid p, const char *p2n, bool mod, bool set)
+void Channel::SetMode(Player* player, const char* targetName, bool moderator, bool set)
 {
-    Player *plr = sObjectMgr.GetPlayer(p);
-    if (!plr)
-        return;
-
-    uint32 sec = plr->GetSession()->GetSecurity();
+    ObjectGuid guid = player->GetObjectGuid();
 
-    if (!IsOn(p))
+    if (!IsOn(guid))
     {
         WorldPacket data;
         MakeNotMember(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
-    else if(!m_players[p].IsModerator() && sec < SEC_GAMEMASTER)
+
+    if (!m_players[guid].IsModerator() && player->GetSession()->GetSecurity() < SEC_GAMEMASTER)
     {
         WorldPacket data;
         MakeNotModerator(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
-    else
-    {
-        Player *newp = sObjectMgr.GetPlayer(p2n);
-        if(!newp)
-        {
-            WorldPacket data;
-            MakePlayerNotFound(&data, p2n);
-            SendToOne(&data, p);
-            return;
-        }
 
-        PlayerInfo inf = m_players[newp->GetObjectGuid()];
-        if(p == m_ownerGuid && newp->GetObjectGuid() == m_ownerGuid && mod)
-            return;
+    Player* target = sObjectMgr.GetPlayer(targetName);
+    if (!target)
+    {
+        WorldPacket data;
+        MakePlayerNotFound(&data, targetName);
+        SendToOne(&data, guid);
+        return;
+    }
 
-        if (!IsOn(newp->GetObjectGuid()))
-        {
-            WorldPacket data;
-            MakePlayerNotFound(&data, p2n);
-            SendToOne(&data, p);
-            return;
-        }
+    ObjectGuid targetGuid = target->GetObjectGuid();
+    if (moderator && guid == m_ownerGuid && targetGuid == m_ownerGuid)
+        return;
 
-        // allow make moderator from another team only if both is GMs
-        // at this moment this only way to show channel post for GM from another team
-        if( (plr->GetSession()->GetSecurity() < SEC_GAMEMASTER || newp->GetSession()->GetSecurity() < SEC_GAMEMASTER) &&
-            plr->GetTeam() != newp->GetTeam() && !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL) )
-        {
-            WorldPacket data;
-            MakePlayerNotFound(&data, p2n);
-            SendToOne(&data, p);
-            return;
-        }
+    if (!IsOn(targetGuid))
+    {
+        WorldPacket data;
+        MakePlayerNotFound(&data, targetName);
+        SendToOne(&data, guid);
+        return;
+    }
 
-        if(m_ownerGuid == newp->GetObjectGuid() && m_ownerGuid != p)
-        {
-            WorldPacket data;
-            MakeNotOwner(&data);
-            SendToOne(&data, p);
-            return;
-        }
+    // allow make moderator from another team only if both is GMs
+    // at this moment this only way to show channel post for GM from another team
+    if ((player->GetSession()->GetSecurity() < SEC_GAMEMASTER || target->GetSession()->GetSecurity() < SEC_GAMEMASTER) &&
+            player->GetTeam() != target->GetTeam() && !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
+    {
+        WorldPacket data;
+        MakePlayerNotFound(&data, targetName);
+        SendToOne(&data, guid);
+        return;
+    }
 
-        if(mod)
-            SetModerator(newp->GetObjectGuid(), set);
-        else
-            SetMute(newp->GetObjectGuid(), set);
+    if (m_ownerGuid == targetGuid && m_ownerGuid != guid)
+    {
+        WorldPacket data;
+        MakeNotOwner(&data);
+        SendToOne(&data, guid);
+        return;
     }
+
+    // set channel moderator
+    if (moderator)
+        SetModerator(targetGuid, set);
+    else
+        SetMute(targetGuid, set);
 }
 
-void Channel::SetOwner(ObjectGuid p, const char *newname)
+void Channel::SetOwner(Player* player, const char* targetName)
 {
-    Player *plr = sObjectMgr.GetPlayer(p);
-    if (!plr)
-        return;
+    ObjectGuid guid = player->GetObjectGuid();
 
-    uint32 sec = plr->GetSession()->GetSecurity();
-
-    if (!IsOn(p))
+    if (!IsOn(guid))
     {
         WorldPacket data;
         MakeNotMember(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
         return;
     }
 
-    if(sec < SEC_GAMEMASTER && p != m_ownerGuid)
+    if (player->GetSession()->GetSecurity() < SEC_GAMEMASTER && guid != m_ownerGuid)
     {
         WorldPacket data;
         MakeNotOwner(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
+    }
+
+    Player* target = sObjectMgr.GetPlayer(targetName);
+    if (!target)
+    {
+        WorldPacket data;
+        MakePlayerNotFound(&data, targetName);
+        SendToOne(&data, guid);
         return;
     }
 
-    Player *newp = sObjectMgr.GetPlayer(newname);
-    if (newp == NULL || !IsOn(newp->GetObjectGuid()))
+    ObjectGuid targetGuid = target->GetObjectGuid();
+    if (!IsOn(targetGuid))
     {
         WorldPacket data;
-        MakePlayerNotFound(&data, newname);
-        SendToOne(&data, p);
+        MakePlayerNotFound(&data, targetName);
+        SendToOne(&data, guid);
         return;
     }
 
-    if(newp->GetTeam() != plr->GetTeam() && !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
+    if (target->GetTeam() != player->GetTeam() && !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
     {
         WorldPacket data;
-        MakePlayerNotFound(&data, newname);
-        SendToOne(&data, p);
+        MakePlayerNotFound(&data, targetName);
+        SendToOne(&data, guid);
         return;
     }
 
-    m_players[newp->GetObjectGuid()].SetModerator(true);
-    SetOwner(newp->GetObjectGuid());
+    // set channel owner
+    m_players[targetGuid].SetModerator(true);
+    SetOwner(targetGuid);
 }
 
-void Channel::SendWhoOwner(ObjectGuid p)
+void Channel::SendWhoOwner(Player* player)
 {
-    if (!IsOn(p))
+    ObjectGuid guid = player->GetObjectGuid();
+
+    if (!IsOn(guid))
     {
         WorldPacket data;
         MakeNotMember(&data);
-        SendToOne(&data, p);
-    }
-    else
-    {
-        WorldPacket data;
-        MakeChannelOwner(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
+
+    // send channel owner
+    WorldPacket data;
+    MakeChannelOwner(&data);
+    SendToOne(&data, guid);
 }
 
 void Channel::List(Player* player)
 {
-    ObjectGuid p = player->GetObjectGuid();
+    ObjectGuid guid = player->GetObjectGuid();
 
-    if (!IsOn(p))
+    if (!IsOn(guid))
     {
         WorldPacket data;
         MakeNotMember(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
-    else
-    {
-        WorldPacket data(SMSG_CHANNEL_LIST, 1+(GetName().size()+1)+1+4+m_players.size()*(8+1));
-        data << uint8(1);                                   // channel type?
-        data << GetName();                                  // channel name
-        data << uint8(GetFlags());                          // channel flags?
 
-        size_t pos = data.wpos();
-        data << uint32(0);                                  // size of list, placeholder
+    // list players in channel
+    WorldPacket data(SMSG_CHANNEL_LIST, 1 + (GetName().size() + 1) + 1 + 4 + m_players.size() * (8 + 1));
+    data << uint8(1);                                       // channel type?
+    data << GetName();                                      // channel name
+    data << uint8(GetFlags());                              // channel flags?
+
+    size_t pos = data.wpos();
+    data << uint32(0);                                      // size of list, placeholder
 
-        AccountTypes gmLevelInWhoList = (AccountTypes)sWorld.getConfig(CONFIG_UINT32_GM_LEVEL_IN_WHO_LIST);
+    AccountTypes gmLevelInWhoList = (AccountTypes)sWorld.getConfig(CONFIG_UINT32_GM_LEVEL_IN_WHO_LIST);
+
+    uint32 count  = 0;
+    for (PlayerList::const_iterator i = m_players.begin(); i != m_players.end(); ++i)
+    {
+        Player* plr = sObjectMgr.GetPlayer(i->first);
 
-        uint32 count  = 0;
-        for(PlayerList::const_iterator i = m_players.begin(); i != m_players.end(); ++i)
+        // PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
+        // MODERATOR, GAME MASTER, ADMINISTRATOR can see all
+        if (plr && (player->GetSession()->GetSecurity() > SEC_PLAYER || plr->GetSession()->GetSecurity() <= gmLevelInWhoList) &&
+               (plr->GetSession()->GetSecurity() <= player->GetSession()->GetSecurity() ||
+                plr->IsVisibleGloballyFor(player)))
         {
-            Player *plr = sObjectMgr.GetPlayer(i->first);
-
-            // PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
-            // MODERATOR, GAME MASTER, ADMINISTRATOR can see all
-            if (plr && (player->GetSession()->GetSecurity() > SEC_PLAYER || plr->GetSession()->GetSecurity() <= gmLevelInWhoList) &&
-                plr->IsVisibleGloballyFor(player))
-            {
-                data << ObjectGuid(i->first);
-                data << uint8(i->second.flags);             // flags seems to be changed...
-                ++count;
-            }
+            data << ObjectGuid(i->first);
+            data << uint8(i->second.flags);                 // flags seems to be changed...
+            ++count;
         }
+    }
 
-        data.put<uint32>(pos,count);
+    data.put<uint32>(pos, count);
 
-        SendToOne(&data, p);
-    }
+    SendToOne(&data, guid);
 }
 
-void Channel::Announce(ObjectGuid p)
+void Channel::Announce(Player* player)
 {
-    uint32 sec = 0;
-    Player *plr = sObjectMgr.GetPlayer(p);
-    if(plr)
-        sec = plr->GetSession()->GetSecurity();
+    ObjectGuid guid = player->GetObjectGuid();
 
-    if (!IsOn(p))
+    if (!IsOn(guid))
     {
         WorldPacket data;
         MakeNotMember(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
-    else if (!m_players[p].IsModerator() && sec < SEC_GAMEMASTER)
+
+    if (!m_players[guid].IsModerator() && player->GetSession()->GetSecurity() < SEC_GAMEMASTER)
     {
         WorldPacket data;
         MakeNotModerator(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
+
+    // toggle channel announcement
+    m_announce = !m_announce;
+
+    WorldPacket data;
+    if (m_announce)
+        MakeAnnouncementsOn(&data, guid);
     else
-    {
-        m_announce = !m_announce;
+        MakeAnnouncementsOff(&data, guid);
 
-        WorldPacket data;
-        if(m_announce)
-            MakeAnnouncementsOn(&data, p);
-        else
-            MakeAnnouncementsOff(&data, p);
-        SendToAll(&data);
-    }
+    SendToAll(&data);
 }
 
-void Channel::Moderate(ObjectGuid p)
+void Channel::Moderate(Player* player)
 {
-    uint32 sec = 0;
-    Player *plr = sObjectMgr.GetPlayer(p);
-    if(plr)
-        sec = plr->GetSession()->GetSecurity();
+    ObjectGuid guid = player->GetObjectGuid();
 
-    if (!IsOn(p))
+    if (!IsOn(guid))
     {
         WorldPacket data;
         MakeNotMember(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
-    else if (!m_players[p].IsModerator() && sec < SEC_GAMEMASTER)
+
+    if (!m_players[guid].IsModerator() && player->GetSession()->GetSecurity() < SEC_GAMEMASTER)
     {
         WorldPacket data;
         MakeNotModerator(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
+
+    // toggle channel moderation
+    m_moderate = !m_moderate;
+
+    WorldPacket data;
+    if (m_moderate)
+        MakeModerationOn(&data, guid);
     else
-    {
-        m_moderate = !m_moderate;
+        MakeModerationOff(&data, guid);
 
-        WorldPacket data;
-        if(m_moderate)
-            MakeModerationOn(&data, p);
-        else
-            MakeModerationOff(&data, p);
-        SendToAll(&data);
-    }
+    SendToAll(&data);
 }
 
-void Channel::Say(ObjectGuid p, const char *what, uint32 lang)
+void Channel::Say(Player* player, const char* text, uint32 lang)
 {
-    if (!what)
+    if (!text)
         return;
-    if (sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
-        lang = LANG_UNIVERSAL;
 
-    uint32 sec = 0;
-    Player *plr = sObjectMgr.GetPlayer(p);
-    if(plr)
-        sec = plr->GetSession()->GetSecurity();
+    ObjectGuid guid = player->GetObjectGuid();
 
-    if (!IsOn(p))
+    if (!IsOn(guid))
     {
         WorldPacket data;
         MakeNotMember(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
-    else if (m_players[p].IsMuted())
+
+    if (m_players[guid].IsMuted())
     {
         WorldPacket data;
         MakeMuted(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
-    else if (m_moderate && !m_players[p].IsModerator() && sec < SEC_GAMEMASTER)
+
+    if (m_moderate && !m_players[guid].IsModerator() && player->GetSession()->GetSecurity() < SEC_GAMEMASTER)
     {
         WorldPacket data;
         MakeNotModerator(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
+        return;
     }
-    else
-    {
-        uint32 messageLength = strlen(what) + 1;
-
-        WorldPacket data(SMSG_MESSAGECHAT, 1+4+8+4+m_name.size()+1+8+4+messageLength+1);
-        data << uint8(CHAT_MSG_CHANNEL);
-        data << uint32(lang);
-        data << ObjectGuid(p);                              // 2.1.0
-        data << uint32(0);                                  // 2.1.0
-        data << m_name;
-        data << ObjectGuid(p);
-        data << uint32(messageLength);
-        data << what;
-        data << uint8(plr ? plr->chatTag() : 0);
 
-        SendToAll(&data, !m_players[p].IsModerator() ? p : ObjectGuid());
-    }
+    // send channel message
+    if (sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
+        lang = LANG_UNIVERSAL;
+    WorldPacket data;
+    ChatHandler::BuildChatPacket(data, CHAT_MSG_CHANNEL, text, Language(lang), player->GetChatTag(), guid, player->GetName(), ObjectGuid(), "", m_name.c_str());
+    SendToAll(&data, !m_players[guid].IsModerator() ? guid : ObjectGuid());
 }
 
-void Channel::Invite(ObjectGuid p, const char *newname)
+void Channel::Invite(Player* player, const char* targetName)
 {
-    if (!IsOn(p))
+    ObjectGuid guid = player->GetObjectGuid();
+
+    if (!IsOn(guid))
     {
         WorldPacket data;
         MakeNotMember(&data);
-        SendToOne(&data, p);
+        SendToOne(&data, guid);
         return;
     }
 
-    Player *newp = sObjectMgr.GetPlayer(newname);
-    if(!newp)
+    Player* target = sObjectMgr.GetPlayer(targetName);
+    if (!target)
     {
         WorldPacket data;
-        MakePlayerNotFound(&data, newname);
-        SendToOne(&data, p);
+        MakePlayerNotFound(&data, targetName);
+        SendToOne(&data, guid);
         return;
     }
 
-    Player *plr = sObjectMgr.GetPlayer(p);
-    if (!plr)
+    ObjectGuid targetGuid = target->GetObjectGuid();
+    if (IsOn(targetGuid))
+    {
+        WorldPacket data;
+        MakePlayerAlreadyMember(&data, targetGuid);
+        SendToOne(&data, guid);
         return;
+    }
 
-    if (newp->GetTeam() != plr->GetTeam() && !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
+    if (IsBanned(targetGuid))
     {
         WorldPacket data;
-        MakeInviteWrongFaction(&data);
-        SendToOne(&data, p);
+        MakePlayerInviteBanned(&data, targetName);
+        SendToOne(&data, guid);
         return;
     }
 
-    if (IsOn(newp->GetObjectGuid()))
+    if (target->GetTeam() != player->GetTeam() && !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
     {
         WorldPacket data;
-        MakePlayerAlreadyMember(&data, newp->GetObjectGuid());
-        SendToOne(&data, p);
+        MakeInviteWrongFaction(&data);
+        SendToOne(&data, guid);
         return;
     }
 
+    // invite player
     WorldPacket data;
-    if (!newp->GetSocial()->HasIgnore(p))
+    if (!target->GetSocial()->HasIgnore(guid))
     {
-        MakeInvite(&data, p);
-        SendToOne(&data, newp->GetObjectGuid());
+        MakeInvite(&data, guid);
+        SendToOne(&data, targetGuid);
         data.clear();
     }
-    MakePlayerInvited(&data, newp->GetName());
-    SendToOne(&data, p);
+
+    MakePlayerInvited(&data, targetName);
+    SendToOne(&data, guid);
 }
 
 void Channel::SetOwner(ObjectGuid guid, bool exclaim)
@@ -651,7 +671,7 @@ void Channel::SetOwner(ObjectGuid guid, bool exclaim)
         MakeModeChange(&data, m_ownerGuid, oldFlag);
         SendToAll(&data);
 
-        if(exclaim)
+        if (exclaim)
         {
             MakeOwnerChanged(&data, m_ownerGuid);
             SendToAll(&data);
@@ -659,17 +679,17 @@ void Channel::SetOwner(ObjectGuid guid, bool exclaim)
     }
 }
 
-void Channel::SendToAll(WorldPacket *data, ObjectGuid p)
+void Channel::SendToAll(WorldPacket* data, ObjectGuid guid)
 {
-    for(PlayerList::const_iterator i = m_players.begin(); i != m_players.end(); ++i)
-        if (Player *plr = sObjectMgr.GetPlayer(i->first))
-            if (!p || !plr->GetSocial()->HasIgnore(p))
+    for (PlayerList::const_iterator i = m_players.begin(); i != m_players.end(); ++i)
+        if (Player* plr = sObjectMgr.GetPlayer(i->first))
+            if (!guid || !plr->GetSocial()->HasIgnore(guid))
                 plr->GetSession()->SendPacket(data);
 }
 
-void Channel::SendToOne(WorldPacket *data, ObjectGuid who)
+void Channel::SendToOne(WorldPacket* data, ObjectGuid who)
 {
-    if (Player *plr = ObjectMgr::GetPlayer(who))
+    if (Player* plr = ObjectMgr::GetPlayer(who))
         plr->GetSession()->SendPacket(data);
 }
 
@@ -683,30 +703,26 @@ void Channel::DeVoice(ObjectGuid /*guid1*/, ObjectGuid /*guid2*/)
 
 }
 
-// done
-void Channel::MakeNotifyPacket(WorldPacket *data, uint8 notify_type)
+void Channel::MakeNotifyPacket(WorldPacket* data, uint8 notify_type)
 {
-    data->Initialize(SMSG_CHANNEL_NOTIFY, 1+m_name.size()+1);
+    data->Initialize(SMSG_CHANNEL_NOTIFY, 1 + m_name.size() + 1);
     *data << uint8(notify_type);
     *data << m_name;
 }
 
-// done 0x00
-void Channel::MakeJoined(WorldPacket *data, ObjectGuid guid)
+void Channel::MakeJoined(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_JOINED_NOTICE);
     *data << ObjectGuid(guid);
 }
 
-// done 0x01
-void Channel::MakeLeft(WorldPacket *data, ObjectGuid guid)
+void Channel::MakeLeft(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_LEFT_NOTICE);
     *data << ObjectGuid(guid);
 }
 
-// done 0x02
-void Channel::MakeYouJoined(WorldPacket *data)
+void Channel::MakeYouJoined(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_YOU_JOINED_NOTICE);
     *data << uint8(GetFlags());
@@ -714,73 +730,63 @@ void Channel::MakeYouJoined(WorldPacket *data)
     *data << uint32(0);
 }
 
-// done 0x03
-void Channel::MakeYouLeft(WorldPacket *data)
+void Channel::MakeYouLeft(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_YOU_LEFT_NOTICE);
     *data << uint32(GetChannelId());
     *data << uint8(0);                                      // can be 0x00 and 0x01
 }
 
-// done 0x04
-void Channel::MakeWrongPassword(WorldPacket *data)
+void Channel::MakeWrongPassword(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_WRONG_PASSWORD_NOTICE);
 }
 
-// done 0x05
-void Channel::MakeNotMember(WorldPacket *data)
+void Channel::MakeNotMember(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_NOT_MEMBER_NOTICE);
 }
 
-// done 0x06
-void Channel::MakeNotModerator(WorldPacket *data)
+void Channel::MakeNotModerator(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_NOT_MODERATOR_NOTICE);
 }
 
-// done 0x07
-void Channel::MakePasswordChanged(WorldPacket *data, ObjectGuid guid)
+void Channel::MakePasswordChanged(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_PASSWORD_CHANGED_NOTICE);
     *data << ObjectGuid(guid);
 }
 
-// done 0x08
-void Channel::MakeOwnerChanged(WorldPacket *data, ObjectGuid guid)
+void Channel::MakeOwnerChanged(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_OWNER_CHANGED_NOTICE);
     *data << ObjectGuid(guid);
 }
 
-// done 0x09
-void Channel::MakePlayerNotFound(WorldPacket *data, const std::string& name)
+void Channel::MakePlayerNotFound(WorldPacket* data, const std::string& name)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_NOT_FOUND_NOTICE);
     *data << name;
 }
 
-// done 0x0A
-void Channel::MakeNotOwner(WorldPacket *data)
+void Channel::MakeNotOwner(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_NOT_OWNER_NOTICE);
 }
 
-// done 0x0B
-void Channel::MakeChannelOwner(WorldPacket *data)
+void Channel::MakeChannelOwner(WorldPacket* data)
 {
     std::string name = "";
 
-    if (!sObjectMgr.GetPlayerNameByGUID(m_ownerGuid, name) || name.empty())
+    if (!sAccountMgr.GetPlayerNameByGUID(m_ownerGuid, name) || name.empty())
         name = "PLAYER_NOT_FOUND";
 
     MakeNotifyPacket(data, CHAT_CHANNEL_OWNER_NOTICE);
     *data << ((IsConstant() || !m_ownerGuid) ? "Nobody" : name);
 }
 
-// done 0x0C
-void Channel::MakeModeChange(WorldPacket *data, ObjectGuid guid, uint8 oldflags)
+void Channel::MakeModeChange(WorldPacket* data, ObjectGuid guid, uint8 oldflags)
 {
     MakeNotifyPacket(data, CHAT_MODE_CHANGE_NOTICE);
     *data << ObjectGuid(guid);
@@ -788,156 +794,133 @@ void Channel::MakeModeChange(WorldPacket *data, ObjectGuid guid, uint8 oldflags)
     *data << uint8(GetPlayerFlags(guid));
 }
 
-// done 0x0D
-void Channel::MakeAnnouncementsOn(WorldPacket *data, ObjectGuid guid)
+void Channel::MakeAnnouncementsOn(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_ANNOUNCEMENTS_ON_NOTICE);
     *data << ObjectGuid(guid);
 }
 
-// done 0x0E
-void Channel::MakeAnnouncementsOff(WorldPacket *data, ObjectGuid guid)
+void Channel::MakeAnnouncementsOff(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_ANNOUNCEMENTS_OFF_NOTICE);
     *data << ObjectGuid(guid);
 }
 
-// done 0x0F
-void Channel::MakeModerationOn(WorldPacket *data, ObjectGuid guid)
+void Channel::MakeModerationOn(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_MODERATION_ON_NOTICE);
     *data << ObjectGuid(guid);
 }
 
-// done 0x10
-void Channel::MakeModerationOff(WorldPacket *data, ObjectGuid guid)
+void Channel::MakeModerationOff(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_MODERATION_OFF_NOTICE);
     *data << ObjectGuid(guid);
 }
 
-// done 0x11
-void Channel::MakeMuted(WorldPacket *data)
+void Channel::MakeMuted(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_MUTED_NOTICE);
 }
 
-// done 0x12
-void Channel::MakePlayerKicked(WorldPacket *data, ObjectGuid bad, ObjectGuid good)
+void Channel::MakePlayerKicked(WorldPacket* data, ObjectGuid target, ObjectGuid source)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_KICKED_NOTICE);
-    *data << ObjectGuid(bad);
-    *data << ObjectGuid(good);
+    *data << ObjectGuid(target);
+    *data << ObjectGuid(source);
 }
 
-// done 0x13
-void Channel::MakeBanned(WorldPacket *data)
+void Channel::MakeBanned(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_BANNED_NOTICE);
 }
 
-// done 0x14
-void Channel::MakePlayerBanned(WorldPacket *data, ObjectGuid bad, ObjectGuid good)
+void Channel::MakePlayerBanned(WorldPacket* data, ObjectGuid target, ObjectGuid source)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_BANNED_NOTICE);
-    *data << ObjectGuid(bad);
-    *data << ObjectGuid(good);
+    *data << ObjectGuid(target);
+    *data << ObjectGuid(source);
 }
 
-// done 0x15
-void Channel::MakePlayerUnbanned(WorldPacket *data, ObjectGuid bad, ObjectGuid good)
+void Channel::MakePlayerUnbanned(WorldPacket* data, ObjectGuid target, ObjectGuid source)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_UNBANNED_NOTICE);
-    *data << ObjectGuid(bad);
-    *data << ObjectGuid(good);
+    *data << ObjectGuid(target);
+    *data << ObjectGuid(source);
 }
 
-// done 0x16
-void Channel::MakePlayerNotBanned(WorldPacket *data, ObjectGuid guid)
+void Channel::MakePlayerNotBanned(WorldPacket* data, const std::string& name)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_NOT_BANNED_NOTICE);
-    *data << ObjectGuid(guid);                              // should be string!!
+    *data << name;
 }
 
-// done 0x17
-void Channel::MakePlayerAlreadyMember(WorldPacket *data, ObjectGuid guid)
+void Channel::MakePlayerAlreadyMember(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_ALREADY_MEMBER_NOTICE);
     *data << ObjectGuid(guid);
 }
 
-// done 0x18
-void Channel::MakeInvite(WorldPacket *data, ObjectGuid guid)
+void Channel::MakeInvite(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_INVITE_NOTICE);
     *data << ObjectGuid(guid);
 }
 
-// done 0x19
-void Channel::MakeInviteWrongFaction(WorldPacket *data)
+void Channel::MakeInviteWrongFaction(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_INVITE_WRONG_FACTION_NOTICE);
 }
 
-// done 0x1A
-void Channel::MakeWrongFaction(WorldPacket *data)
+void Channel::MakeWrongFaction(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_WRONG_FACTION_NOTICE);
 }
 
-// done 0x1B
-void Channel::MakeInvalidName(WorldPacket *data)
+void Channel::MakeInvalidName(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_INVALID_NAME_NOTICE);
 }
 
-// done 0x1C
-void Channel::MakeNotModerated(WorldPacket *data)
+void Channel::MakeNotModerated(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_NOT_MODERATED_NOTICE);
 }
 
-// done 0x1D
-void Channel::MakePlayerInvited(WorldPacket *data, const std::string& name)
+void Channel::MakePlayerInvited(WorldPacket* data, const std::string& name)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_INVITED_NOTICE);
     *data << name;
 }
 
-// done 0x1E
-void Channel::MakePlayerInviteBanned(WorldPacket *data, ObjectGuid guid)
+void Channel::MakePlayerInviteBanned(WorldPacket* data, const std::string& name)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_INVITE_BANNED_NOTICE);
-    *data << ObjectGuid(guid);                              // should be string!!
+    *data << name;
 }
 
-// done 0x1F
-void Channel::MakeThrottled(WorldPacket *data)
+void Channel::MakeThrottled(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_THROTTLED_NOTICE);
 }
 
-// done 0x20
-void Channel::MakeNotInArea(WorldPacket *data)
+void Channel::MakeNotInArea(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_NOT_IN_AREA_NOTICE);
 }
 
-// done 0x21
-void Channel::MakeNotInLfg(WorldPacket *data)
+void Channel::MakeNotInLfg(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_NOT_IN_LFG_NOTICE);
 }
 
-// done 0x22
-void Channel::MakeVoiceOn(WorldPacket *data, ObjectGuid guid)
+void Channel::MakeVoiceOn(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_VOICE_ON_NOTICE);
     *data << ObjectGuid(guid);
 }
 
-// done 0x23
-void Channel::MakeVoiceOff(WorldPacket *data, ObjectGuid guid)
+void Channel::MakeVoiceOff(WorldPacket* data, ObjectGuid guid)
 {
     MakeNotifyPacket(data, CHAT_VOICE_OFF_NOTICE);
     *data << ObjectGuid(guid);
@@ -948,9 +931,9 @@ void Channel::JoinNotify(ObjectGuid guid)
     WorldPacket data;
 
     if (IsConstant())
-        data.Initialize(SMSG_USERLIST_ADD, 8+1+1+4+GetName().size()+1);
+        data.Initialize(SMSG_USERLIST_ADD, 8 + 1 + 1 + 4 + GetName().size() + 1);
     else
-        data.Initialize(SMSG_USERLIST_UPDATE, 8+1+1+4+GetName().size()+1);
+        data.Initialize(SMSG_USERLIST_UPDATE, 8 + 1 + 1 + 4 + GetName().size() + 1);
 
     data << ObjectGuid(guid);
     data << uint8(GetPlayerFlags(guid));
@@ -962,7 +945,7 @@ void Channel::JoinNotify(ObjectGuid guid)
 
 void Channel::LeaveNotify(ObjectGuid guid)
 {
-    WorldPacket data(SMSG_USERLIST_REMOVE, 8+1+4+GetName().size()+1);
+    WorldPacket data(SMSG_USERLIST_REMOVE, 8 + 1 + 4 + GetName().size() + 1);
     data << ObjectGuid(guid);
     data << uint8(GetFlags());
     data << uint32(GetNumPlayers());
diff --git a/src/game/Channel.h b/src/game/Channel.h
index 3833c1b2169..71a5b47c6cd 100644
--- a/src/game/Channel.h
+++ b/src/game/Channel.h
@@ -33,9 +33,9 @@ enum ChatNotify
 {
     CHAT_JOINED_NOTICE                = 0x00,               //+ "%s joined channel.";
     CHAT_LEFT_NOTICE                  = 0x01,               //+ "%s left channel.";
-    //CHAT_SUSPENDED_NOTICE             = 0x01,             // "%s left channel.";
+    // CHAT_SUSPENDED_NOTICE             = 0x01,            // "%s left channel.";
     CHAT_YOU_JOINED_NOTICE            = 0x02,               //+ "Joined Channel: [%s]"; -- You joined
-    //CHAT_YOU_CHANGED_NOTICE           = 0x02,             // "Changed Channel: [%s]";
+    // CHAT_YOU_CHANGED_NOTICE           = 0x02,            // "Changed Channel: [%s]";
     CHAT_YOU_LEFT_NOTICE              = 0x03,               //+ "Left Channel: [%s]"; -- You left
     CHAT_WRONG_PASSWORD_NOTICE        = 0x04,               //+ "Wrong password for %s.";
     CHAT_NOT_MEMBER_NOTICE            = 0x05,               //+ "Not on channel %s.";
@@ -74,77 +74,77 @@ enum ChatNotify
 
 class Channel
 {
-    enum ChannelFlags
-    {
-        CHANNEL_FLAG_NONE       = 0x00,
-        CHANNEL_FLAG_CUSTOM     = 0x01,
-        // 0x02
-        CHANNEL_FLAG_TRADE      = 0x04,
-        CHANNEL_FLAG_NOT_LFG    = 0x08,
-        CHANNEL_FLAG_GENERAL    = 0x10,
-        CHANNEL_FLAG_CITY       = 0x20,
-        CHANNEL_FLAG_LFG        = 0x40,
-        CHANNEL_FLAG_VOICE      = 0x80
-        // General                  0x18 = 0x10 | 0x08
-        // Trade                    0x3C = 0x20 | 0x10 | 0x08 | 0x04
-        // LocalDefence             0x18 = 0x10 | 0x08
-        // GuildRecruitment         0x38 = 0x20 | 0x10 | 0x08
-        // LookingForGroup          0x50 = 0x40 | 0x10
-    };
-
-    enum ChannelDBCFlags
-    {
-        CHANNEL_DBC_FLAG_NONE       = 0x00000,
-        CHANNEL_DBC_FLAG_INITIAL    = 0x00001,              // General, Trade, LocalDefense, LFG
-        CHANNEL_DBC_FLAG_ZONE_DEP   = 0x00002,              // General, Trade, LocalDefense, GuildRecruitment
-        CHANNEL_DBC_FLAG_GLOBAL     = 0x00004,              // WorldDefense
-        CHANNEL_DBC_FLAG_TRADE      = 0x00008,              // Trade
-        CHANNEL_DBC_FLAG_CITY_ONLY  = 0x00010,              // Trade, GuildRecruitment
-        CHANNEL_DBC_FLAG_CITY_ONLY2 = 0x00020,              // Trade, GuildRecruitment
-        CHANNEL_DBC_FLAG_DEFENSE    = 0x10000,              // LocalDefense, WorldDefense
-        CHANNEL_DBC_FLAG_GUILD_REQ  = 0x20000,              // GuildRecruitment
-        CHANNEL_DBC_FLAG_LFG        = 0x40000               // LookingForGroup
-    };
-
-    enum ChannelMemberFlags
-    {
-        MEMBER_FLAG_NONE        = 0x00,
-        MEMBER_FLAG_OWNER       = 0x01,
-        MEMBER_FLAG_MODERATOR   = 0x02,
-        MEMBER_FLAG_VOICED      = 0x04,
-        MEMBER_FLAG_MUTED       = 0x08,
-        MEMBER_FLAG_CUSTOM      = 0x10,
-        MEMBER_FLAG_MIC_MUTED   = 0x20,
-        // 0x40
-        // 0x80
-    };
-
-    struct PlayerInfo
-    {
-        ObjectGuid player;
-        uint8 flags;
+        enum ChannelFlags
+        {
+            CHANNEL_FLAG_NONE       = 0x00,
+            CHANNEL_FLAG_CUSTOM     = 0x01,
+            // 0x02
+            CHANNEL_FLAG_TRADE      = 0x04,
+            CHANNEL_FLAG_NOT_LFG    = 0x08,
+            CHANNEL_FLAG_GENERAL    = 0x10,
+            CHANNEL_FLAG_CITY       = 0x20,
+            CHANNEL_FLAG_LFG        = 0x40,
+            CHANNEL_FLAG_VOICE      = 0x80
+            // General                  0x18 = 0x10 | 0x08
+            // Trade                    0x3C = 0x20 | 0x10 | 0x08 | 0x04
+            // LocalDefence             0x18 = 0x10 | 0x08
+            // GuildRecruitment         0x38 = 0x20 | 0x10 | 0x08
+            // LookingForGroup          0x50 = 0x40 | 0x10
+        };
 
-        bool HasFlag(uint8 flag) { return flags & flag; }
-        void SetFlag(uint8 flag) { if(!HasFlag(flag)) flags |= flag; }
-        bool IsOwner() { return flags & MEMBER_FLAG_OWNER; }
-        void SetOwner(bool state)
+        enum ChannelDBCFlags
         {
-            if(state) flags |= MEMBER_FLAG_OWNER;
-            else flags &= ~MEMBER_FLAG_OWNER;
-        }
-        bool IsModerator() { return flags & MEMBER_FLAG_MODERATOR; }
-        void SetModerator(bool state)
+            CHANNEL_DBC_FLAG_NONE       = 0x00000,
+            CHANNEL_DBC_FLAG_INITIAL    = 0x00001,          // General, Trade, LocalDefense, LFG
+            CHANNEL_DBC_FLAG_ZONE_DEP   = 0x00002,          // General, Trade, LocalDefense, GuildRecruitment
+            CHANNEL_DBC_FLAG_GLOBAL     = 0x00004,          // WorldDefense
+            CHANNEL_DBC_FLAG_TRADE      = 0x00008,          // Trade
+            CHANNEL_DBC_FLAG_CITY_ONLY  = 0x00010,          // Trade, GuildRecruitment
+            CHANNEL_DBC_FLAG_CITY_ONLY2 = 0x00020,          // Trade, GuildRecruitment
+            CHANNEL_DBC_FLAG_DEFENSE    = 0x10000,          // LocalDefense, WorldDefense
+            CHANNEL_DBC_FLAG_GUILD_REQ  = 0x20000,          // GuildRecruitment
+            CHANNEL_DBC_FLAG_LFG        = 0x40000           // LookingForGroup
+        };
+
+        enum ChannelMemberFlags
         {
-            if(state) flags |= MEMBER_FLAG_MODERATOR;
-            else flags &= ~MEMBER_FLAG_MODERATOR;
-        }
-        bool IsMuted() { return flags & MEMBER_FLAG_MUTED; }
-        void SetMuted(bool state)
+            MEMBER_FLAG_NONE        = 0x00,
+            MEMBER_FLAG_OWNER       = 0x01,
+            MEMBER_FLAG_MODERATOR   = 0x02,
+            MEMBER_FLAG_VOICED      = 0x04,
+            MEMBER_FLAG_MUTED       = 0x08,
+            MEMBER_FLAG_CUSTOM      = 0x10,
+            MEMBER_FLAG_MIC_MUTED   = 0x20,
+            // 0x40
+            // 0x80
+        };
+
+        struct PlayerInfo
         {
-            if(state) flags |= MEMBER_FLAG_MUTED;
-            else flags &= ~MEMBER_FLAG_MUTED;
-        }
-    };
+            ObjectGuid player;
+            uint8 flags;
+
+            bool HasFlag(uint8 flag) { return flags & flag; }
+            void SetFlag(uint8 flag) { if (!HasFlag(flag)) flags |= flag; }
+            bool IsOwner() { return flags & MEMBER_FLAG_OWNER; }
+            void SetOwner(bool state)
+            {
+                if (state) flags |= MEMBER_FLAG_OWNER;
+                else flags &= ~MEMBER_FLAG_OWNER;
+            }
+            bool IsModerator() { return flags & MEMBER_FLAG_MODERATOR; }
+            void SetModerator(bool state)
+            {
+                if (state) flags |= MEMBER_FLAG_MODERATOR;
+                else flags &= ~MEMBER_FLAG_MODERATOR;
+            }
+            bool IsMuted() { return flags & MEMBER_FLAG_MUTED; }
+            void SetMuted(bool state)
+            {
+                if (state) flags |= MEMBER_FLAG_MUTED;
+                else flags &= ~MEMBER_FLAG_MUTED;
+            }
+        };
 
     public:
         Channel(const std::string& name, uint32 channel_id);
@@ -160,109 +160,109 @@ class Channel
         uint8 GetFlags() const { return m_flags; }
         bool HasFlag(uint8 flag) { return m_flags & flag; }
 
-        void Join(ObjectGuid p, const char *pass);
-        void Leave(ObjectGuid p, bool send = true);
-        void KickOrBan(ObjectGuid good, const char *badname, bool ban);
-        void Kick(ObjectGuid good, const char *badname) { KickOrBan(good, badname, false); }
-        void Ban(ObjectGuid good, const char *badname) { KickOrBan(good, badname, true); }
-        void UnBan(ObjectGuid good, const char *badname);
-        void Password(ObjectGuid p, const char *pass);
-        void SetMode(ObjectGuid p, const char *p2n, bool mod, bool set);
-        void SetOwner(ObjectGuid p, bool exclaim = true);
-        void SetOwner(ObjectGuid p, const char *newname);
-        void SendWhoOwner(ObjectGuid p);
-        void SetModerator(ObjectGuid p, const char *newname) { SetMode(p, newname, true, true); }
-        void UnsetModerator(ObjectGuid p, const char *newname) { SetMode(p, newname, true, false); }
-        void SetMute(ObjectGuid p, const char *newname) { SetMode(p, newname, false, true); }
-        void UnsetMute(ObjectGuid p, const char *newname) { SetMode(p, newname, false, false); }
-        void List(Player* p);
-        void Announce(ObjectGuid p);
-        void Moderate(ObjectGuid p);
-        void Say(ObjectGuid p, const char *what, uint32 lang);
-        void Invite(ObjectGuid p, const char *newp);
+        void Join(Player* player, const char* password);
+        void Leave(Player* player, bool send = true);
+        void KickOrBan(Player* player, const char* targetName, bool ban);
+        void Kick(Player* player, const char* targetName) { KickOrBan(player, targetName, false); }
+        void Ban(Player* player, const char* targetName) { KickOrBan(player, targetName, true); }
+        void UnBan(Player* player, const char* targetName);
+        void Password(Player* player, const char* password);
+        void SetMode(Player* player, const char* targetName, bool moderator, bool set);
+        void SetOwner(ObjectGuid guid, bool exclaim = true);
+        void SetOwner(Player* player, const char* targetName);
+        void SendWhoOwner(Player* player);
+        void SetModerator(Player* player, const char* targetName) { SetMode(player, targetName, true, true); }
+        void UnsetModerator(Player* player, const char* targetName) { SetMode(player, targetName, true, false); }
+        void SetMute(Player* player, const char* targetName) { SetMode(player, targetName, false, true); }
+        void UnsetMute(Player* player, const char* targetName) { SetMode(player, targetName, false, false); }
+        void List(Player* player);
+        void Announce(Player* player);
+        void Moderate(Player* player);
+        void Say(Player* player, const char* text, uint32 lang);
+        void Invite(Player* player, const char* targetName);
         void Voice(ObjectGuid guid1, ObjectGuid guid2);
         void DeVoice(ObjectGuid guid1, ObjectGuid guid2);
-        void JoinNotify(ObjectGuid guid);                                       // invisible notify
-        void LeaveNotify(ObjectGuid guid);                                      // invisible notify
+        void JoinNotify(ObjectGuid guid);                   // invisible notify
+        void LeaveNotify(ObjectGuid guid);                  // invisible notify
 
     private:
         // initial packet data (notify type and channel name)
-        void MakeNotifyPacket(WorldPacket *data, uint8 notify_type);
+        void MakeNotifyPacket(WorldPacket* data, uint8 notify_type);
         // type specific packet data
-        void MakeJoined(WorldPacket *data, ObjectGuid guid);                    //+ 0x00
-        void MakeLeft(WorldPacket *data, ObjectGuid guid);                      //+ 0x01
-        void MakeYouJoined(WorldPacket *data);                                  //+ 0x02
-        void MakeYouLeft(WorldPacket *data);                                    //+ 0x03
-        void MakeWrongPassword(WorldPacket *data);                              //? 0x04
-        void MakeNotMember(WorldPacket *data);                                  //? 0x05
-        void MakeNotModerator(WorldPacket *data);                               //? 0x06
-        void MakePasswordChanged(WorldPacket *data, ObjectGuid guid);           //+ 0x07
-        void MakeOwnerChanged(WorldPacket *data, ObjectGuid guid);              //? 0x08
-        void MakePlayerNotFound(WorldPacket *data, const std::string& name);    //+ 0x09
-        void MakeNotOwner(WorldPacket *data);                                   //? 0x0A
-        void MakeChannelOwner(WorldPacket *data);                               //? 0x0B
-        void MakeModeChange(WorldPacket *data, ObjectGuid guid, uint8 oldflags);//+ 0x0C
-        void MakeAnnouncementsOn(WorldPacket *data, ObjectGuid guid);           //+ 0x0D
-        void MakeAnnouncementsOff(WorldPacket *data, ObjectGuid guid);          //+ 0x0E
-        void MakeModerationOn(WorldPacket *data, ObjectGuid guid);              //+ 0x0F
-        void MakeModerationOff(WorldPacket *data, ObjectGuid guid);             //+ 0x10
-        void MakeMuted(WorldPacket *data);                                      //? 0x11
-        void MakePlayerKicked(WorldPacket *data, ObjectGuid bad, ObjectGuid good);//? 0x12
-        void MakeBanned(WorldPacket *data);                                     //? 0x13
-        void MakePlayerBanned(WorldPacket *data, ObjectGuid bad, ObjectGuid good);//? 0x14
-        void MakePlayerUnbanned(WorldPacket *data, ObjectGuid bad, ObjectGuid good);//? 0x15
-        void MakePlayerNotBanned(WorldPacket *data, ObjectGuid guid);           //? 0x16
-        void MakePlayerAlreadyMember(WorldPacket *data, ObjectGuid guid);       //+ 0x17
-        void MakeInvite(WorldPacket *data, ObjectGuid guid);                    //? 0x18
-        void MakeInviteWrongFaction(WorldPacket *data);                         //? 0x19
-        void MakeWrongFaction(WorldPacket *data);                               //? 0x1A
-        void MakeInvalidName(WorldPacket *data);                                //? 0x1B
-        void MakeNotModerated(WorldPacket *data);                               //? 0x1C
-        void MakePlayerInvited(WorldPacket *data, const std::string& name);     //+ 0x1D
-        void MakePlayerInviteBanned(WorldPacket *data, ObjectGuid guid);        //? 0x1E
-        void MakeThrottled(WorldPacket *data);                                  //? 0x1F
-        void MakeNotInArea(WorldPacket *data);                                  //? 0x20
-        void MakeNotInLfg(WorldPacket *data);                                   //? 0x21
-        void MakeVoiceOn(WorldPacket *data, ObjectGuid guid);                   //+ 0x22
-        void MakeVoiceOff(WorldPacket *data, ObjectGuid guid);                  //+ 0x23
+        void MakeJoined(WorldPacket* data, ObjectGuid guid);                    //+ 0x00
+        void MakeLeft(WorldPacket* data, ObjectGuid guid);                      //+ 0x01
+        void MakeYouJoined(WorldPacket* data);                                  //+ 0x02
+        void MakeYouLeft(WorldPacket* data);                                    //+ 0x03
+        void MakeWrongPassword(WorldPacket* data);                              //? 0x04
+        void MakeNotMember(WorldPacket* data);                                  //? 0x05
+        void MakeNotModerator(WorldPacket* data);                               //? 0x06
+        void MakePasswordChanged(WorldPacket* data, ObjectGuid guid);           //+ 0x07
+        void MakeOwnerChanged(WorldPacket* data, ObjectGuid guid);              //? 0x08
+        void MakePlayerNotFound(WorldPacket* data, const std::string& name);    //+ 0x09
+        void MakeNotOwner(WorldPacket* data);                                   //? 0x0A
+        void MakeChannelOwner(WorldPacket* data);                               //? 0x0B
+        void MakeModeChange(WorldPacket* data, ObjectGuid guid, uint8 oldflags);//+ 0x0C
+        void MakeAnnouncementsOn(WorldPacket* data, ObjectGuid guid);           //+ 0x0D
+        void MakeAnnouncementsOff(WorldPacket* data, ObjectGuid guid);          //+ 0x0E
+        void MakeModerationOn(WorldPacket* data, ObjectGuid guid);              //+ 0x0F
+        void MakeModerationOff(WorldPacket* data, ObjectGuid guid);             //+ 0x10
+        void MakeMuted(WorldPacket* data);                                      //? 0x11
+        void MakePlayerKicked(WorldPacket* data, ObjectGuid target, ObjectGuid source);//? 0x12
+        void MakeBanned(WorldPacket* data);                                     //? 0x13
+        void MakePlayerBanned(WorldPacket* data, ObjectGuid target, ObjectGuid source);//? 0x14
+        void MakePlayerUnbanned(WorldPacket* data, ObjectGuid target, ObjectGuid source);//? 0x15
+        void MakePlayerNotBanned(WorldPacket* data, const std::string& name);   //? 0x16
+        void MakePlayerAlreadyMember(WorldPacket* data, ObjectGuid guid);       //+ 0x17
+        void MakeInvite(WorldPacket* data, ObjectGuid guid);                    //? 0x18
+        void MakeInviteWrongFaction(WorldPacket* data);                         //? 0x19
+        void MakeWrongFaction(WorldPacket* data);                               //? 0x1A
+        void MakeInvalidName(WorldPacket* data);                                //? 0x1B
+        void MakeNotModerated(WorldPacket* data);                               //? 0x1C
+        void MakePlayerInvited(WorldPacket* data, const std::string& name);     //+ 0x1D
+        void MakePlayerInviteBanned(WorldPacket* data, const std::string& name);//? 0x1E
+        void MakeThrottled(WorldPacket* data);                                  //? 0x1F
+        void MakeNotInArea(WorldPacket* data);                                  //? 0x20
+        void MakeNotInLfg(WorldPacket* data);                                   //? 0x21
+        void MakeVoiceOn(WorldPacket* data, ObjectGuid guid);                   //+ 0x22
+        void MakeVoiceOff(WorldPacket* data, ObjectGuid guid);                  //+ 0x23
 
-        void SendToAll(WorldPacket *data, ObjectGuid p = ObjectGuid());
-        void SendToOne(WorldPacket *data, ObjectGuid who);
+        void SendToAll(WorldPacket* data, ObjectGuid guid = ObjectGuid());
+        void SendToOne(WorldPacket* data, ObjectGuid who);
 
         bool IsOn(ObjectGuid who) const { return m_players.find(who) != m_players.end(); }
         bool IsBanned(ObjectGuid guid) const { return m_banned.find(guid) != m_banned.end(); }
 
-        uint8 GetPlayerFlags(ObjectGuid p) const
+        uint8 GetPlayerFlags(ObjectGuid guid) const
         {
-            PlayerList::const_iterator p_itr = m_players.find(p);
+            PlayerList::const_iterator p_itr = m_players.find(guid);
             if (p_itr == m_players.end())
                 return 0;
 
             return p_itr->second.flags;
         }
 
-        void SetModerator(ObjectGuid p, bool set)
+        void SetModerator(ObjectGuid guid, bool set)
         {
-            if (m_players[p].IsModerator() != set)
+            if (m_players[guid].IsModerator() != set)
             {
-                uint8 oldFlag = GetPlayerFlags(p);
-                m_players[p].SetModerator(set);
+                uint8 oldFlag = GetPlayerFlags(guid);
+                m_players[guid].SetModerator(set);
 
                 WorldPacket data;
-                MakeModeChange(&data, p, oldFlag);
+                MakeModeChange(&data, guid, oldFlag);
                 SendToAll(&data);
             }
         }
 
-        void SetMute(ObjectGuid p, bool set)
+        void SetMute(ObjectGuid guid, bool set)
         {
-            if (m_players[p].IsMuted() != set)
+            if (m_players[guid].IsMuted() != set)
             {
-                uint8 oldFlag = GetPlayerFlags(p);
-                m_players[p].SetMuted(set);
+                uint8 oldFlag = GetPlayerFlags(guid);
+                m_players[guid].SetMuted(set);
 
                 WorldPacket data;
-                MakeModeChange(&data, p, oldFlag);
+                MakeModeChange(&data, guid, oldFlag);
                 SendToAll(&data);
             }
         }
@@ -278,7 +278,6 @@ class Channel
 
         typedef     std::map<ObjectGuid, PlayerInfo> PlayerList;
         PlayerList  m_players;
-        typedef     std::set<ObjectGuid> BannedList;
-        BannedList  m_banned;
+        GuidSet m_banned;
 };
 #endif
diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp
index 94d2948cef8..0203ff5dd22 100644
--- a/src/game/ChannelHandler.cpp
+++ b/src/game/ChannelHandler.cpp
@@ -30,32 +30,42 @@ void WorldSession::HandleJoinChannelOpcode(WorldPacket& recvPacket)
     recvPacket >> channel_id >> unknown1 >> unknown2;
     recvPacket >> channelname;
 
-    if(channelname.empty())
+    if (channelname.empty())
         return;
 
     recvPacket >> pass;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetJoinChannel(channelname, channel_id))
-            chn->Join(_player->GetObjectGuid(), pass.c_str());
+    // don't allow creating channels starting with a number (triggers a client-side bug)
+    if (isdigit((unsigned char)channelname[0]))
+    {
+        WorldPacket data(SMSG_CHANNEL_NOTIFY, 1+channelname.size()+1);
+        data << uint8(CHAT_INVALID_NAME_NOTICE);
+        data << channelname;
+        SendPacket(&data);
+        return;
+    }
+
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetJoinChannel(channelname, channel_id))
+            chn->Join(_player, pass.c_str());
 }
 
 void WorldSession::HandleLeaveChannelOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
 
     uint32 unk;
     std::string channelname;
     recvPacket >> unk;                                      // channel id?
     recvPacket >> channelname;
 
-    if(channelname.empty())
+    if (channelname.empty())
         return;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
     {
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->Leave(_player->GetObjectGuid(), true);
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->Leave(_player, true);
         cMgr->LeftChannel(channelname);
     }
 }
@@ -63,239 +73,239 @@ void WorldSession::HandleLeaveChannelOpcode(WorldPacket& recvPacket)
 void WorldSession::HandleChannelListOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname;
     recvPacket >> channelname;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
             chn->List(_player);
 }
 
 void WorldSession::HandleChannelPasswordOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname, pass;
     recvPacket >> channelname;
 
     recvPacket >> pass;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->Password(_player->GetObjectGuid(), pass.c_str());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->Password(_player, pass.c_str());
 }
 
 void WorldSession::HandleChannelSetOwnerOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
 
     std::string channelname, newp;
     recvPacket >> channelname;
 
     recvPacket >> newp;
 
-    if(!normalizePlayerName(newp))
+    if (!normalizePlayerName(newp))
         return;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->SetOwner(_player->GetObjectGuid(), newp.c_str());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->SetOwner(_player, newp.c_str());
 }
 
 void WorldSession::HandleChannelOwnerOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname;
     recvPacket >> channelname;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->SendWhoOwner(_player->GetObjectGuid());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->SendWhoOwner(_player);
 }
 
 void WorldSession::HandleChannelModeratorOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
 
     recvPacket >> otp;
 
-    if(!normalizePlayerName(otp))
+    if (!normalizePlayerName(otp))
         return;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->SetModerator(_player->GetObjectGuid(), otp.c_str());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->SetModerator(_player, otp.c_str());
 }
 
 void WorldSession::HandleChannelUnmoderatorOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
 
     recvPacket >> otp;
 
-    if(!normalizePlayerName(otp))
+    if (!normalizePlayerName(otp))
         return;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->UnsetModerator(_player->GetObjectGuid(), otp.c_str());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->UnsetModerator(_player, otp.c_str());
 }
 
 void WorldSession::HandleChannelMuteOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
 
     recvPacket >> otp;
 
-    if(!normalizePlayerName(otp))
+    if (!normalizePlayerName(otp))
         return;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->SetMute(_player->GetObjectGuid(), otp.c_str());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->SetMute(_player, otp.c_str());
 }
 
 void WorldSession::HandleChannelUnmuteOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
 
     std::string channelname, otp;
     recvPacket >> channelname;
 
     recvPacket >> otp;
 
-    if(!normalizePlayerName(otp))
+    if (!normalizePlayerName(otp))
         return;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->UnsetMute(_player->GetObjectGuid(), otp.c_str());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->UnsetMute(_player, otp.c_str());
 }
 
 void WorldSession::HandleChannelInviteOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
 
     recvPacket >> otp;
 
-    if(!normalizePlayerName(otp))
+    if (!normalizePlayerName(otp))
         return;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->Invite(_player->GetObjectGuid(), otp.c_str());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->Invite(_player, otp.c_str());
 }
 
 void WorldSession::HandleChannelKickOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
 
     recvPacket >> otp;
-    if(!normalizePlayerName(otp))
+    if (!normalizePlayerName(otp))
         return;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->Kick(_player->GetObjectGuid(), otp.c_str());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->Kick(_player, otp.c_str());
 }
 
 void WorldSession::HandleChannelBanOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
 
     recvPacket >> otp;
 
-    if(!normalizePlayerName(otp))
+    if (!normalizePlayerName(otp))
         return;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->Ban(_player->GetObjectGuid(), otp.c_str());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->Ban(_player, otp.c_str());
 }
 
 void WorldSession::HandleChannelUnbanOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
 
     std::string channelname, otp;
     recvPacket >> channelname;
 
     recvPacket >> otp;
 
-    if(!normalizePlayerName(otp))
+    if (!normalizePlayerName(otp))
         return;
 
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->UnBan(_player->GetObjectGuid(), otp.c_str());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->UnBan(_player, otp.c_str());
 }
 
 void WorldSession::HandleChannelAnnouncementsOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname;
     recvPacket >> channelname;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->Announce(_player->GetObjectGuid());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->Announce(_player);
 }
 
 void WorldSession::HandleChannelModerateOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname;
     recvPacket >> channelname;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->Moderate(_player->GetObjectGuid());
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
+            chn->Moderate(_player);
 }
 
-void WorldSession::HandleChannelDisplayListQueryOpcode(WorldPacket &recvPacket)
+void WorldSession::HandleChannelDisplayListQueryOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname;
     recvPacket >> channelname;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
             chn->List(_player);
 }
 
-void WorldSession::HandleGetChannelMemberCountOpcode(WorldPacket &recvPacket)
+void WorldSession::HandleGetChannelMemberCountOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname;
     recvPacket >> channelname;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
     {
-        if(Channel *chn = cMgr->GetChannel(channelname, _player))
+        if (Channel* chn = cMgr->GetChannel(channelname, _player))
         {
-            WorldPacket data(SMSG_CHANNEL_MEMBER_COUNT, chn->GetName().size()+1+1+4);
+            WorldPacket data(SMSG_CHANNEL_MEMBER_COUNT, chn->GetName().size() + 1 + 1 + 4);
             data << chn->GetName();
             data << uint8(chn->GetFlags());
             data << uint32(chn->GetNumPlayers());
@@ -304,13 +314,13 @@ void WorldSession::HandleGetChannelMemberCountOpcode(WorldPacket &recvPacket)
     }
 }
 
-void WorldSession::HandleSetChannelWatchOpcode(WorldPacket &recvPacket)
+void WorldSession::HandleSetChannelWatchOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("Opcode %u", recvPacket.GetOpcode());
-    //recvPacket.hexlike();
+    // recvPacket.hexlike();
     std::string channelname;
     recvPacket >> channelname;
     /*if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
-            chn->JoinNotify(_player->GetGUID());*/
+            chn->JoinNotify(_player->GetObjectGuid());*/
 }
diff --git a/src/game/ChannelMgr.cpp b/src/game/ChannelMgr.cpp
index 0afe9f894b0..4bd156ea34f 100644
--- a/src/game/ChannelMgr.cpp
+++ b/src/game/ChannelMgr.cpp
@@ -17,20 +17,20 @@
  */
 
 #include "ChannelMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "World.h"
 
-INSTANTIATE_SINGLETON_1( AllianceChannelMgr );
-INSTANTIATE_SINGLETON_1( HordeChannelMgr );
+INSTANTIATE_SINGLETON_1(AllianceChannelMgr);
+INSTANTIATE_SINGLETON_1(HordeChannelMgr);
 
 ChannelMgr* channelMgr(Team team)
 {
     if (sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
         return &MaNGOS::Singleton<AllianceChannelMgr>::Instance();        // cross-faction
 
-    if(team == ALLIANCE)
+    if (team == ALLIANCE)
         return &MaNGOS::Singleton<AllianceChannelMgr>::Instance();
-    if(team == HORDE)
+    if (team == HORDE)
         return &MaNGOS::Singleton<HordeChannelMgr>::Instance();
 
     return NULL;
@@ -38,21 +38,21 @@ ChannelMgr* channelMgr(Team team)
 
 ChannelMgr::~ChannelMgr()
 {
-    for(ChannelMap::iterator itr = channels.begin();itr!=channels.end(); ++itr)
+    for (ChannelMap::iterator itr = channels.begin(); itr != channels.end(); ++itr)
         delete itr->second;
 
     channels.clear();
 }
 
-Channel *ChannelMgr::GetJoinChannel(std::string name, uint32 channel_id)
+Channel* ChannelMgr::GetJoinChannel(std::string name, uint32 channel_id)
 {
     std::wstring wname;
-    Utf8toWStr(name,wname);
+    Utf8toWStr(name, wname);
     wstrToLower(wname);
 
     if (channels.find(wname) == channels.end())
     {
-        Channel *nchan = new Channel(name,channel_id);
+        Channel* nchan = new Channel(name, channel_id);
         channels[wname] = nchan;
         return nchan;
     }
@@ -60,20 +60,20 @@ Channel *ChannelMgr::GetJoinChannel(std::string name, uint32 channel_id)
     return channels[wname];
 }
 
-Channel *ChannelMgr::GetChannel(std::string name, Player *p, bool pkt)
+Channel* ChannelMgr::GetChannel(std::string name, Player* p, bool pkt)
 {
     std::wstring wname;
-    Utf8toWStr(name,wname);
+    Utf8toWStr(name, wname);
     wstrToLower(wname);
 
     ChannelMap::const_iterator i = channels.find(wname);
 
-    if(i == channels.end())
+    if (i == channels.end())
     {
-        if(pkt)
+        if (pkt)
         {
             WorldPacket data;
-            MakeNotOnPacket(&data,name);
+            MakeNotOnPacket(&data, name);
             p->GetSession()->SendPacket(&data);
         }
 
@@ -86,25 +86,25 @@ Channel *ChannelMgr::GetChannel(std::string name, Player *p, bool pkt)
 void ChannelMgr::LeftChannel(std::string name)
 {
     std::wstring wname;
-    Utf8toWStr(name,wname);
+    Utf8toWStr(name, wname);
     wstrToLower(wname);
 
     ChannelMap::const_iterator i = channels.find(wname);
 
-    if(i == channels.end())
+    if (i == channels.end())
         return;
 
     Channel* channel = i->second;
 
-    if(channel->GetNumPlayers() == 0 && !channel->IsConstant())
+    if (channel->GetNumPlayers() == 0 && !channel->IsConstant())
     {
         channels.erase(wname);
         delete channel;
     }
 }
 
-void ChannelMgr::MakeNotOnPacket(WorldPacket *data, std::string name)
+void ChannelMgr::MakeNotOnPacket(WorldPacket* data, std::string name)
 {
-    data->Initialize(SMSG_CHANNEL_NOTIFY, (1+10));  // we guess size
+    data->Initialize(SMSG_CHANNEL_NOTIFY, (1 + 10)); // we guess size
     (*data) << (uint8)CHAT_NOT_MEMBER_NOTICE << name;
 }
diff --git a/src/game/ChannelMgr.h b/src/game/ChannelMgr.h
index 3732596de98..c5fae9fed71 100644
--- a/src/game/ChannelMgr.h
+++ b/src/game/ChannelMgr.h
@@ -28,16 +28,15 @@
 class ChannelMgr
 {
     public:
-        typedef std::map<std::wstring,Channel*> ChannelMap;
+        typedef UNORDERED_MAP<std::wstring, Channel*> ChannelMap;
         ChannelMgr() {}
         ~ChannelMgr();
 
-        Channel *GetJoinChannel(std::string name, uint32 channel_id);
-        Channel *GetChannel(std::string name, Player *p, bool pkt = true);
+        Channel* GetJoinChannel(std::string name, uint32 channel_id);
+        Channel* GetChannel(std::string name, Player* p, bool pkt = true);
         void LeftChannel(std::string name);
-    private:
         ChannelMap channels;
-        void MakeNotOnPacket(WorldPacket *data, std::string name);
+        void MakeNotOnPacket(WorldPacket* data, std::string name);
 };
 
 class AllianceChannelMgr : public ChannelMgr {};
diff --git a/src/game/CharacterDatabaseCleaner.cpp b/src/game/CharacterDatabaseCleaner.cpp
index 8bb13ce3819..1ea9f715c75 100644
--- a/src/game/CharacterDatabaseCleaner.cpp
+++ b/src/game/CharacterDatabaseCleaner.cpp
@@ -26,26 +26,26 @@
 void CharacterDatabaseCleaner::CleanDatabase()
 {
     // config to disable
-    if(!sWorld.getConfig(CONFIG_BOOL_CLEAN_CHARACTER_DB))
+    if (!sWorld.getConfig(CONFIG_BOOL_CLEAN_CHARACTER_DB))
         return;
 
     sLog.outString("Cleaning character database...");
 
     // check flags which clean ups are necessary
     QueryResult* result = CharacterDatabase.PQuery("SELECT cleaning_flags FROM saved_variables");
-    if(!result)
+    if (!result)
         return;
     uint32 flags = (*result)[0].GetUInt32();
     delete result;
 
     // clean up
-    if(flags & CLEANING_FLAG_ACHIEVEMENT_PROGRESS)
+    if (flags & CLEANING_FLAG_ACHIEVEMENT_PROGRESS)
         CleanCharacterAchievementProgress();
-    if(flags & CLEANING_FLAG_SKILLS)
+    if (flags & CLEANING_FLAG_SKILLS)
         CleanCharacterSkills();
-    if(flags & CLEANING_FLAG_SPELLS)
+    if (flags & CLEANING_FLAG_SPELLS)
         CleanCharacterSpell();
-    if(flags & CLEANING_FLAG_TALENTS)
+    if (flags & CLEANING_FLAG_TALENTS)
         CleanCharacterTalent();
     CharacterDatabase.Execute("UPDATE saved_variables SET cleaning_flags = 0");
 }
@@ -53,9 +53,9 @@ void CharacterDatabaseCleaner::CleanDatabase()
 void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table, bool (*check)(uint32))
 {
     QueryResult* result = CharacterDatabase.PQuery("SELECT DISTINCT %s FROM %s", column, table);
-    if(!result)
+    if (!result)
     {
-        sLog.outString( "Table %s is empty.", table );
+        sLog.outString("Table %s is empty.", table);
         return;
     }
 
@@ -66,7 +66,7 @@ void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table
     {
         bar.step();
 
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
 
         uint32 id = fields[0].GetUInt32();
 
@@ -88,7 +88,7 @@ void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table
     if (found)
     {
         ss << ")";
-        CharacterDatabase.Execute( ss.str().c_str() );
+        CharacterDatabase.Execute(ss.str().c_str());
     }
 }
 
@@ -124,11 +124,11 @@ void CharacterDatabaseCleaner::CleanCharacterSpell()
 
 bool CharacterDatabaseCleaner::TalentCheck(uint32 talent_id)
 {
-    TalentEntry const *talentInfo = sTalentStore.LookupEntry( talent_id );
-    if(!talentInfo)
+    TalentEntry const* talentInfo = sTalentStore.LookupEntry(talent_id);
+    if (!talentInfo)
         return false;
 
-    return sTalentTabStore.LookupEntry( talentInfo->TalentTab );
+    return sTalentTabStore.LookupEntry(talentInfo->TalentTab);
 }
 
 void CharacterDatabaseCleaner::CleanCharacterTalent()
diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index e9d76591916..22e60c02706 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "AccountMgr.h"
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
@@ -38,6 +39,12 @@
 #include "Util.h"
 #include "ArenaTeam.h"
 #include "Language.h"
+#include "SpellMgr.h"
+#include "Calendar.h"
+
+// Playerbot mod:
+#include "playerbot/playerbot.h"
+#include "playerbot/PlayerbotAIConfig.h"
 
 // config option SkipCinematics supported values
 enum CinematicsSkipMode
@@ -60,6 +67,21 @@ class LoginQueryHolder : public SqlQueryHolder
         bool Initialize();
 };
 
+class PlayerbotLoginQueryHolder : public LoginQueryHolder
+{
+private:
+    uint32 masterAccountId;
+    PlayerbotHolder* playerbotHolder;
+
+public:
+    PlayerbotLoginQueryHolder(PlayerbotHolder* playerbotHolder, uint32 masterAccount, uint32 accountId, ObjectGuid guid)
+        : LoginQueryHolder(accountId, guid), masterAccountId(masterAccount), playerbotHolder(playerbotHolder) { }
+
+public:
+    uint32 GetMasterAccountId() const { return masterAccountId; }
+    PlayerbotHolder* GetPlayerbotHolder() { return playerbotHolder; }
+};
+
 bool LoginQueryHolder::Initialize()
 {
     SetSize(MAX_PLAYER_LOGIN_QUERY);
@@ -72,15 +94,15 @@ bool LoginQueryHolder::Initialize()
         "position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost,"
         "resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, dungeon_difficulty,"
         "arenaPoints, totalHonorPoints, todayHonorPoints, yesterdayHonorPoints, totalKills, todayKills, yesterdayKills, chosenTitle, knownCurrencies, watchedFaction, drunk,"
-        "health, power1, power2, power3, power4, power5, power6, power7, specCount, activeSpec, exploredZones, equipmentCache, ammoId, knownTitles, actionBars FROM characters WHERE guid = '%u'", m_guid.GetCounter());
+        "health, power1, power2, power3, power4, power5, power6, power7, specCount, activeSpec, exploredZones, equipmentCache, ammoId, knownTitles, actionBars, grantableLevels FROM characters WHERE guid = '%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADGROUP,           "SELECT groupId FROM group_member WHERE memberGuid ='%u'", m_guid.GetCounter());
-    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADBOUNDINSTANCES,  "SELECT id, permanent, map, difficulty, resettime FROM character_instance LEFT JOIN instance ON instance = id WHERE guid = '%u'", m_guid.GetCounter());
+    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADBOUNDINSTANCES,  "SELECT id, permanent, map, difficulty, extend, resettime FROM character_instance LEFT JOIN instance ON instance = id WHERE guid = '%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADAURAS,           "SELECT caster_guid,item_guid,spell,stackcount,remaincharges,basepoints0,basepoints1,basepoints2,periodictime0,periodictime1,periodictime2,maxduration,remaintime,effIndexMask FROM character_aura WHERE guid = '%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADSPELLS,          "SELECT spell,active,disabled FROM character_spell WHERE guid = '%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADQUESTSTATUS,     "SELECT quest,status,rewarded,explored,timer,mobcount1,mobcount2,mobcount3,mobcount4,itemcount1,itemcount2,itemcount3,itemcount4,itemcount5,itemcount6 FROM character_queststatus WHERE guid = '%u'", m_guid.GetCounter());
-    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADDAILYQUESTSTATUS,"SELECT quest FROM character_queststatus_daily WHERE guid = '%u'", m_guid.GetCounter());
-    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADWEEKLYQUESTSTATUS,"SELECT quest FROM character_queststatus_weekly WHERE guid = '%u'", m_guid.GetCounter());
-    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADMONTHLYQUESTSTATUS,"SELECT quest FROM character_queststatus_monthly WHERE guid = '%u'", m_guid.GetCounter());
+    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADDAILYQUESTSTATUS, "SELECT quest FROM character_queststatus_daily WHERE guid = '%u'", m_guid.GetCounter());
+    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADWEEKLYQUESTSTATUS, "SELECT quest FROM character_queststatus_weekly WHERE guid = '%u'", m_guid.GetCounter());
+    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADMONTHLYQUESTSTATUS, "SELECT quest FROM character_queststatus_monthly WHERE guid = '%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADREPUTATION,      "SELECT faction,standing,flags FROM character_reputation WHERE guid = '%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADINVENTORY,       "SELECT data,text,bag,slot,item,item_template FROM character_inventory JOIN item_instance ON character_inventory.item = item_instance.guid WHERE character_inventory.guid = '%u' ORDER BY bag,slot", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADITEMLOOT,        "SELECT guid,itemid,amount,suffix,property FROM item_loot WHERE owner_guid = '%u'", m_guid.GetCounter());
@@ -88,13 +110,13 @@ bool LoginQueryHolder::Initialize()
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADSOCIALLIST,      "SELECT friend,flags,note FROM character_social WHERE guid = '%u' LIMIT 255", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADHOMEBIND,        "SELECT map,zone,position_x,position_y,position_z FROM character_homebind WHERE guid = '%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADSPELLCOOLDOWNS,  "SELECT spell,item,time FROM character_spell_cooldown WHERE guid = '%u'", m_guid.GetCounter());
-    if(sWorld.getConfig(CONFIG_BOOL_DECLINED_NAMES_USED))
+    if (sWorld.getConfig(CONFIG_BOOL_DECLINED_NAMES_USED))
         res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADDECLINEDNAMES,   "SELECT genitive, dative, accusative, instrumental, prepositional FROM character_declinedname WHERE guid = '%u'", m_guid.GetCounter());
     // in other case still be dummy query
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADGUILD,           "SELECT guildid,rank FROM guild_member WHERE guid = '%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADARENAINFO,       "SELECT arenateamid, played_week, played_season, wons_season, personal_rating FROM arena_team_member WHERE guid='%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADACHIEVEMENTS,    "SELECT achievement, date FROM character_achievement WHERE guid = '%u'", m_guid.GetCounter());
-    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADCRITERIAPROGRESS,"SELECT criteria, counter, date FROM character_achievement_progress WHERE guid = '%u'", m_guid.GetCounter());
+    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADCRITERIAPROGRESS, "SELECT criteria, counter, date FROM character_achievement_progress WHERE guid = '%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADEQUIPMENTSETS,   "SELECT setguid, setindex, name, iconname, ignore_mask, item0, item1, item2, item3, item4, item5, item6, item7, item8, item9, item10, item11, item12, item13, item14, item15, item16, item17, item18 FROM character_equipmentsets WHERE guid = '%u' ORDER BY setindex", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADBGDATA,          "SELECT instance_id, team, join_x, join_y, join_z, join_o, join_map, taxi_start, taxi_end, mount_spell FROM character_battleground_data WHERE guid = '%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADACCOUNTDATA,     "SELECT type, time, data FROM character_account_data WHERE guid='%u'", m_guid.GetCounter());
@@ -103,6 +125,7 @@ bool LoginQueryHolder::Initialize()
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADGLYPHS,          "SELECT spec, slot, glyph FROM character_glyphs WHERE guid='%u'", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADMAILS,           "SELECT id,messageType,sender,receiver,subject,body,expire_time,deliver_time,money,cod,checked,stationery,mailTemplateId,has_items FROM mail WHERE receiver = '%u' ORDER BY id DESC", m_guid.GetCounter());
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADMAILEDITEMS,     "SELECT data, text, mail_id, item_guid, item_template FROM mail_items JOIN item_instance ON item_guid = guid WHERE receiver = '%u'", m_guid.GetCounter());
+    res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADRANDOMBG,        "SELECT guid FROM character_battleground_random WHERE guid = '%u'", m_guid.GetCounter());
 
     return res;
 }
@@ -113,30 +136,109 @@ bool LoginQueryHolder::Initialize()
 class CharacterHandler
 {
     public:
-        void HandleCharEnumCallback(QueryResult * result, uint32 account)
+        void HandleCharEnumCallback(QueryResult* result, uint32 account)
         {
-            WorldSession * session = sWorld.FindSession(account);
-            if(!session)
+            WorldSession* session = sWorld.FindSession(account);
+            if (!session)
             {
                 delete result;
                 return;
             }
             session->HandleCharEnum(result);
         }
-        void HandlePlayerLoginCallback(QueryResult * /*dummy*/, SqlQueryHolder * holder)
+        void HandlePlayerLoginCallback(QueryResult* /*dummy*/, SqlQueryHolder* holder)
         {
             if (!holder) return;
-            WorldSession *session = sWorld.FindSession(((LoginQueryHolder*)holder)->GetAccountId());
-            if(!session)
+            WorldSession* session = sWorld.FindSession(((LoginQueryHolder*)holder)->GetAccountId());
+            if (!session)
+            {
+                delete holder;
+                return;
+            }
+
+            // playerbot mod
+            ObjectGuid guid = ((LoginQueryHolder*)holder)->GetGuid();
+
+            session->HandlePlayerLogin((LoginQueryHolder*)holder); // this deletes holder
+
+            Player* player = sObjectMgr.GetPlayer(guid, true);
+            if (player && !player->GetPlayerbotAI())
+            {
+                player->SetPlayerbotMgr(new PlayerbotMgr(player));
+                sRandomPlayerbotMgr.OnPlayerLogin(player);
+            }
+            // end of playerbot mod
+        }
+		// Playerbot mod: is different from the normal HandlePlayerLoginCallback in that it
+        // sets up the bot's world session and also stores the pointer to the bot player in the master's
+        // world session m_playerBots map
+        void HandlePlayerBotLoginCallback(QueryResult * dummy, SqlQueryHolder * holder)
+        {
+            if (!holder)
+                return;
+
+            PlayerbotLoginQueryHolder* lqh = (PlayerbotLoginQueryHolder*) holder;
+            if (sObjectMgr.GetPlayer(lqh->GetGuid()))
             {
                 delete holder;
                 return;
             }
-            session->HandlePlayerLogin((LoginQueryHolder*)holder);
+
+            PlayerbotHolder* playerbotHolder = lqh->GetPlayerbotHolder();
+            uint32 masterAccount = lqh->GetMasterAccountId();
+            WorldSession* masterSession = masterAccount ? sWorld.FindSession(masterAccount) : NULL;
+
+            // The bot's WorldSession is owned by the bot's Player object
+            // The bot's WorldSession is deleted by PlayerbotMgr::LogoutPlayerBot
+            uint32 botAccountId = lqh->GetAccountId();
+            WorldSession *botSession = new WorldSession(botAccountId, NULL, SEC_PLAYER, 2, 0, LOCALE_enUS);
+            botSession->m_Address = "bot";
+            botSession->HandlePlayerLogin(lqh); // will delete lqh
+            Player* bot = botSession->GetPlayer();
+            if (!bot)
+                return;
+
+            bool allowed = false;
+            if (botAccountId == masterAccount)
+                allowed = true;
+            else if (masterSession && sPlayerbotAIConfig.allowGuildBots && bot->GetGuildId() == masterSession->GetPlayer()->GetGuildId())
+                allowed = true;
+            else if (sPlayerbotAIConfig.IsInRandomAccountList(botAccountId))
+                allowed = true;
+
+            if (allowed)
+                playerbotHolder->OnBotLogin(bot);
+            else if (masterSession)
+            {
+                ChatHandler ch(masterSession);
+                ch.PSendSysMessage("You are not allowed to control bot %s...", bot->GetName());
+                playerbotHolder->LogoutPlayerBot(bot->GetObjectGuid().GetRawValue());
+            }
         }
 } chrHandler;
 
-void WorldSession::HandleCharEnum(QueryResult * result)
+// Playerbot mod. Can't easily reuse HandlePlayerLoginOpcode for logging in bots because it assumes
+// a WorldSession exists for the bot. The WorldSession for a bot is created after the character is loaded.
+void PlayerbotHolder::AddPlayerBot(uint64 playerGuid, uint32 masterAccountId)
+{
+    // has bot already been added?
+    if (sObjectMgr.GetPlayer(ObjectGuid(playerGuid)))
+        return;
+
+    uint32 accountId = sObjectMgr.GetPlayerAccountIdByGUID(ObjectGuid(playerGuid));
+    if (accountId == 0)
+        return;
+
+    PlayerbotLoginQueryHolder *holder = new PlayerbotLoginQueryHolder(this, masterAccountId, accountId, ObjectGuid(playerGuid));
+    if(!holder->Initialize())
+    {
+        delete holder;                                      // delete all unprocessed queries
+        return;
+    }
+    CharacterDatabase.DelayQueryHolder(&chrHandler, &CharacterHandler::HandlePlayerBotLoginCallback, holder);
+}
+
+void WorldSession::HandleCharEnum(QueryResult* result)
 {
     WorldPacket data(SMSG_CHAR_ENUM, 100);                  // we guess size
 
@@ -144,26 +246,26 @@ void WorldSession::HandleCharEnum(QueryResult * result)
 
     data << num;
 
-    if( result )
+    if (result)
     {
         do
         {
             uint32 guidlow = (*result)[0].GetUInt32();
             DETAIL_LOG("Build enum data for char guid %u from account %u.", guidlow, GetAccountId());
-            if(Player::BuildEnumData(result, &data))
+            if (Player::BuildEnumData(result, &data))
                 ++num;
         }
-        while( result->NextRow() );
+        while (result->NextRow());
 
         delete result;
     }
 
     data.put<uint8>(0, num);
 
-    SendPacket( &data );
+    SendPacket(&data);
 }
 
-void WorldSession::HandleCharEnumOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleCharEnumOpcode(WorldPacket& /*recv_data*/)
 {
     /// get all the data necessary for loading all characters (along with their pets) on the account
     CharacterDatabase.AsyncPQuery(&chrHandler, &CharacterHandler::HandleCharEnumCallback, GetAccountId(),
@@ -193,7 +295,7 @@ void WorldSession::HandleCharEnumOpcode( WorldPacket & /*recv_data*/ )
         PET_SAVE_AS_CURRENT, GetAccountId());
 }
 
-void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
+void WorldSession::HandleCharCreateOpcode(WorldPacket& recv_data)
 {
     std::string name;
     uint8 race_, class_;
@@ -210,23 +312,24 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
 
     WorldPacket data(SMSG_CHAR_CREATE, 1);                  // returned with diff.values in all cases
 
-    if(GetSecurity() == SEC_PLAYER)
+    if (GetSecurity() == SEC_PLAYER)
     {
-        if(uint32 mask = sWorld.getConfig(CONFIG_UINT32_CHARACTERS_CREATING_DISABLED))
+        if (uint32 mask = sWorld.getConfig(CONFIG_UINT32_CHARACTERS_CREATING_DISABLED))
         {
             bool disabled = false;
 
             Team team = Player::TeamForRace(race_);
-            switch(team)
+            switch (team)
             {
                 case ALLIANCE: disabled = mask & (1 << 0); break;
                 case HORDE:    disabled = mask & (1 << 1); break;
+                default: break;
             }
 
-            if(disabled)
+            if (disabled)
             {
-                data << (uint8)CHAR_CREATE_DISABLED;
-                SendPacket( &data );
+                data << uint8(CHAR_CREATE_DISABLED);
+                SendPacket(&data);
                 return;
             }
         }
@@ -235,38 +338,47 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
     ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(class_);
     ChrRacesEntry const* raceEntry = sChrRacesStore.LookupEntry(race_);
 
-    if( !classEntry || !raceEntry )
+    if (!classEntry || !raceEntry)
     {
-        data << (uint8)CHAR_CREATE_FAILED;
-        SendPacket( &data );
-        sLog.outError("Class: %u or Race %u not found in DBC (Wrong DBC files?) or Cheater?", class_, race_);
+        data << uint8(CHAR_CREATE_FAILED);
+        SendPacket(&data);
+        sLog.outError("WorldSession::HandleCharCreateOpcode: Account: (%u) tried to create character with class: %u or race %u not found in DBC (Wrong DBC files?) or Cheater?", GetAccountId(), class_, race_);
+        return;
+    }
+
+    // prevent character creating with incorrect race / class pair
+    if (!sObjectMgr.GetPlayerInfo(race_, class_))
+    {
+        data << uint8(CHAR_CREATE_RESTRICTED_RACECLASS);
+        SendPacket(&data);
+        sLog.outError("WorldSession::HandleCharCreateOpcode: Account: (%u) tried to create character with incorrect race %u and class: %u pair. Cheater?", GetAccountId(), race_, class_);
         return;
     }
 
     // prevent character creating Expansion race without Expansion account
     if (raceEntry->expansion > Expansion())
     {
-        data << (uint8)CHAR_CREATE_EXPANSION;
-        sLog.outError("Expansion %u account:[%d] tried to Create character with expansion %u race (%u)", Expansion(), GetAccountId(), raceEntry->expansion, race_);
-        SendPacket( &data );
+        data << uint8(CHAR_CREATE_EXPANSION);
+        SendPacket(&data);
+        sLog.outError("WorldSession::HandleCharCreateOpcode: expansion %u, account: (%u) tried to create character with expansion %u, race (%u)", Expansion(), GetAccountId(), raceEntry->expansion, race_);
         return;
     }
 
     // prevent character creating Expansion class without Expansion account
     if (classEntry->expansion > Expansion())
     {
-        data << (uint8)CHAR_CREATE_EXPANSION_CLASS;
-        sLog.outError("Expansion %u account:[%d] tried to Create character with expansion %u class (%u)", Expansion(), GetAccountId(), classEntry->expansion, class_);
-        SendPacket( &data );
+        data << uint8(CHAR_CREATE_EXPANSION_CLASS);
+        SendPacket(&data);
+        sLog.outError("WorldSession::HandleCharCreateOpcode: expansion %u account: (%u) tried to create character with expansion %u class (%u)", Expansion(), GetAccountId(), classEntry->expansion, class_);
         return;
     }
 
     // prevent character creating with invalid name
     if (!normalizePlayerName(name))
     {
-        data << (uint8)CHAR_NAME_NO_NAME;
-        SendPacket( &data );
-        sLog.outError("Account:[%d] but tried to Create character with empty [name]", GetAccountId());
+        data << uint8(CHAR_NAME_NO_NAME);
+        SendPacket(&data);
+        sLog.outError("WorldSession::HandleCharCreateOpcode: Account: (%u) tried to create character with empty [name]", GetAccountId());
         return;
     }
 
@@ -275,70 +387,54 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
     if (res != CHAR_NAME_SUCCESS)
     {
         data << uint8(res);
-        SendPacket( &data );
+        SendPacket(&data);
         return;
     }
 
     if (GetSecurity() == SEC_PLAYER && sObjectMgr.IsReservedName(name))
     {
-        data << (uint8)CHAR_NAME_RESERVED;
-        SendPacket( &data );
+        data << uint8(CHAR_NAME_RESERVED);
+        SendPacket(&data);
         return;
     }
 
-    if (sObjectMgr.GetPlayerGuidByName(name))
+    if (sAccountMgr.GetPlayerGuidByName(name))
     {
-        data << (uint8)CHAR_CREATE_NAME_IN_USE;
-        SendPacket( &data );
+        data << uint8(CHAR_CREATE_NAME_IN_USE);
+        SendPacket(&data);
         return;
     }
 
-    QueryResult *resultacct = LoginDatabase.PQuery("SELECT SUM(numchars) FROM realmcharacters WHERE acctid = '%u'", GetAccountId());
-    if (resultacct)
-    {
-        Field *fields=resultacct->Fetch();
-        uint32 acctcharcount = fields[0].GetUInt32();
-        delete resultacct;
 
-        if (acctcharcount >= sWorld.getConfig(CONFIG_UINT32_CHARACTERS_PER_ACCOUNT))
-        {
-            data << (uint8)CHAR_CREATE_ACCOUNT_LIMIT;
-            SendPacket( &data );
-            return;
-        }
+    if (sAccountMgr.GetCharactersCount(GetAccountId(), true) >= sWorld.getConfig(CONFIG_UINT32_CHARACTERS_PER_ACCOUNT))
+    {
+        data << uint8(CHAR_CREATE_ACCOUNT_LIMIT);
+        SendPacket(&data);
+        return;
     }
 
-    QueryResult *result = CharacterDatabase.PQuery("SELECT COUNT(guid) FROM characters WHERE account = '%u'", GetAccountId());
-    uint8 charcount = 0;
-    if ( result )
+    if (sAccountMgr.GetCharactersCount(GetAccountId(), false) >= sWorld.getConfig(CONFIG_UINT32_CHARACTERS_PER_REALM))
     {
-        Field *fields = result->Fetch();
-        charcount = fields[0].GetUInt8();
-        delete result;
-
-        if (charcount >= sWorld.getConfig(CONFIG_UINT32_CHARACTERS_PER_REALM))
-        {
-            data << (uint8)CHAR_CREATE_SERVER_LIMIT;
-            SendPacket( &data );
-            return;
-        }
+        data << uint8(CHAR_CREATE_SERVER_LIMIT);
+        SendPacket(&data);
+        return;
     }
 
     // speedup check for heroic class disabled case
     uint32 heroic_free_slots = sWorld.getConfig(CONFIG_UINT32_HEROIC_CHARACTERS_PER_REALM);
-    if(heroic_free_slots == 0 && GetSecurity() == SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT)
+    if (heroic_free_slots == 0 && GetSecurity() == SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT)
     {
-        data << (uint8)CHAR_CREATE_UNIQUE_CLASS_LIMIT;
-        SendPacket( &data );
+        data << uint8(CHAR_CREATE_UNIQUE_CLASS_LIMIT);
+        SendPacket(&data);
         return;
     }
 
     // speedup check for heroic class disabled case
     uint32 req_level_for_heroic = sWorld.getConfig(CONFIG_UINT32_MIN_LEVEL_FOR_HEROIC_CHARACTER_CREATING);
-    if(GetSecurity() == SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT && req_level_for_heroic > sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
+    if (GetSecurity() == SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT && req_level_for_heroic > sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
     {
-        data << (uint8)CHAR_CREATE_LEVEL_REQUIREMENT;
-        SendPacket( &data );
+        data << uint8(CHAR_CREATE_LEVEL_REQUIREMENT);
+        SendPacket(&data);
         return;
     }
 
@@ -348,40 +444,40 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
     bool have_same_race = false;
 
     // if 0 then allowed creating without any characters
-    bool have_req_level_for_heroic = (req_level_for_heroic==0);
+    bool have_req_level_for_heroic = (req_level_for_heroic == 0);
 
-    if(!AllowTwoSideAccounts || skipCinematics == CINEMATICS_SKIP_SAME_RACE || class_ == CLASS_DEATH_KNIGHT)
+    if (!AllowTwoSideAccounts || skipCinematics == CINEMATICS_SKIP_SAME_RACE || class_ == CLASS_DEATH_KNIGHT)
     {
-        QueryResult *result2 = CharacterDatabase.PQuery("SELECT level,race,class FROM characters WHERE account = '%u' %s",
-            GetAccountId(), (skipCinematics == CINEMATICS_SKIP_SAME_RACE || class_ == CLASS_DEATH_KNIGHT) ? "" : "LIMIT 1");
-        if(result2)
+        QueryResult* result2 = CharacterDatabase.PQuery("SELECT level,race,class FROM characters WHERE account = '%u' %s",
+                               GetAccountId(), (skipCinematics == CINEMATICS_SKIP_SAME_RACE || class_ == CLASS_DEATH_KNIGHT) ? "" : "LIMIT 1");
+        if (result2)
         {
-            Team team_= Player::TeamForRace(race_);
+            Team team_ = Player::TeamForRace(race_);
 
             Field* field = result2->Fetch();
-            uint8 acc_race  = field[1].GetUInt32();
+            uint8 acc_race = field[1].GetUInt32();
 
-            if(GetSecurity() == SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT)
+            if (GetSecurity() == SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT)
             {
                 uint8 acc_class = field[2].GetUInt32();
-                if(acc_class == CLASS_DEATH_KNIGHT)
+                if (acc_class == CLASS_DEATH_KNIGHT)
                 {
-                    if(heroic_free_slots > 0)
+                    if (heroic_free_slots > 0)
                         --heroic_free_slots;
 
-                    if(heroic_free_slots == 0)
+                    if (heroic_free_slots == 0)
                     {
                         data << (uint8)CHAR_CREATE_UNIQUE_CLASS_LIMIT;
-                        SendPacket( &data );
+                        SendPacket(&data);
                         delete result2;
                         return;
                     }
                 }
 
-                if(!have_req_level_for_heroic)
+                if (!have_req_level_for_heroic)
                 {
                     uint32 acc_level = field[0].GetUInt32();
-                    if(acc_level >= req_level_for_heroic)
+                    if (acc_level >= req_level_for_heroic)
                         have_req_level_for_heroic = true;
                 }
             }
@@ -392,8 +488,8 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
             {
                 if (acc_race == 0 || Player::TeamForRace(acc_race) != team_)
                 {
-                    data << (uint8)CHAR_CREATE_PVP_TEAMS_VIOLATION;
-                    SendPacket( &data );
+                    data << uint8(CHAR_CREATE_PVP_TEAMS_VIOLATION);
+                    SendPacket(&data);
                     delete result2;
                     return;
                 }
@@ -403,36 +499,36 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
             // TODO: check if cinematic already shown? (already logged in?; cinematic field)
             while ((skipCinematics == CINEMATICS_SKIP_SAME_RACE && !have_same_race) || class_ == CLASS_DEATH_KNIGHT)
             {
-                if(!result2->NextRow())
+                if (!result2->NextRow())
                     break;
 
                 field = result2->Fetch();
                 acc_race = field[1].GetUInt32();
 
-                if(!have_same_race)
+                if (!have_same_race)
                     have_same_race = race_ == acc_race;
 
-                if(GetSecurity() == SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT)
+                if (GetSecurity() == SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT)
                 {
                     uint8 acc_class = field[2].GetUInt32();
-                    if(acc_class == CLASS_DEATH_KNIGHT)
+                    if (acc_class == CLASS_DEATH_KNIGHT)
                     {
-                        if(heroic_free_slots > 0)
+                        if (heroic_free_slots > 0)
                             --heroic_free_slots;
 
-                        if(heroic_free_slots == 0)
+                        if (heroic_free_slots == 0)
                         {
-                            data << (uint8)CHAR_CREATE_UNIQUE_CLASS_LIMIT;
-                            SendPacket( &data );
+                            data << uint8(CHAR_CREATE_UNIQUE_CLASS_LIMIT);
+                            SendPacket(&data);
                             delete result2;
                             return;
                         }
                     }
 
-                    if(!have_req_level_for_heroic)
+                    if (!have_req_level_for_heroic)
                     {
                         uint32 acc_level = field[0].GetUInt32();
-                        if(acc_level >= req_level_for_heroic)
+                        if (acc_level >= req_level_for_heroic)
                             have_req_level_for_heroic = true;
                     }
                 }
@@ -441,54 +537,48 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
         }
     }
 
-    if(GetSecurity() == SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT && !have_req_level_for_heroic)
+    if (GetSecurity() == SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT && !have_req_level_for_heroic)
     {
-        data << (uint8)CHAR_CREATE_LEVEL_REQUIREMENT;
-        SendPacket( &data );
+        data << uint8(CHAR_CREATE_LEVEL_REQUIREMENT);
+        SendPacket(&data);
         return;
     }
 
-    Player *pNewChar = new Player(this);
-    if (!pNewChar->Create(sObjectMgr.GeneratePlayerLowGuid(), name, race_, class_, gender, skin, face, hairStyle, hairColor, facialHair, outfitId))
+    Player pNewChar(this);
+    if (!pNewChar.Create(sObjectMgr.GeneratePlayerLowGuid(), name, race_, class_, gender, skin, face, hairStyle, hairColor, facialHair, outfitId))
     {
         // Player not create (race/class problem?)
-        delete pNewChar;
-
-        data << (uint8)CHAR_CREATE_ERROR;
-        SendPacket( &data );
+        data << uint8(CHAR_CREATE_ERROR);
+        SendPacket(&data);
 
         return;
     }
 
     if ((have_same_race && skipCinematics == CINEMATICS_SKIP_SAME_RACE) || skipCinematics == CINEMATICS_SKIP_ALL)
-        pNewChar->setCinematic(1);                          // not show intro
+        pNewChar.setCinematic(1);                          // not show intro
 
-    pNewChar->SetAtLoginFlag(AT_LOGIN_FIRST);               // First login
+    pNewChar.SetAtLoginFlag(AT_LOGIN_FIRST);               // First login
 
     // Player created, save it now
-    pNewChar->SaveToDB();
-    charcount += 1;
+    pNewChar.SaveToDB();
 
-    LoginDatabase.PExecute("DELETE FROM realmcharacters WHERE acctid= '%u' AND realmid = '%u'", GetAccountId(), realmID);
-    LoginDatabase.PExecute("INSERT INTO realmcharacters (numchars, acctid, realmid) VALUES (%u, %u, %u)",  charcount, GetAccountId(), realmID);
+    sAccountMgr.UpdateCharactersCount(GetAccountId(), sWorld.getConfig(CONFIG_UINT32_REALMID));
 
-    data << (uint8)CHAR_CREATE_SUCCESS;
-    SendPacket( &data );
+    data << uint8(CHAR_CREATE_SUCCESS);
+    SendPacket(&data);
 
     std::string IP_str = GetRemoteAddress();
-    BASIC_LOG("Account: %d (IP: %s) Create Character:[%s] (guid: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), pNewChar->GetGUIDLow());
-    sLog.outChar("Account: %d (IP: %s) Create Character:[%s] (guid: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), pNewChar->GetGUIDLow());
-
-    delete pNewChar;                                        // created only to call SaveToDB()
+    BASIC_LOG("Account: %d (IP: %s) Create Character:[%s] (guid: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), pNewChar.GetGUIDLow());
+    sLog.outChar("Account: %d (IP: %s) Create Character:[%s] (guid: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), pNewChar.GetGUIDLow());
 }
 
-void WorldSession::HandleCharDeleteOpcode( WorldPacket & recv_data )
+void WorldSession::HandleCharDeleteOpcode(WorldPacket& recv_data)
 {
     ObjectGuid guid;
     recv_data >> guid;
 
     // can't delete loaded character
-    if(sObjectMgr.GetPlayer(guid))
+    if (sObjectMgr.GetPlayer(guid))
         return;
 
     uint32 accountId = 0;
@@ -499,57 +589,59 @@ void WorldSession::HandleCharDeleteOpcode( WorldPacket & recv_data )
     {
         WorldPacket data(SMSG_CHAR_DELETE, 1);
         data << (uint8)CHAR_DELETE_FAILED_GUILD_LEADER;
-        SendPacket( &data );
+        SendPacket(&data);
         return;
     }
 
     // is arena team captain
-    if(sObjectMgr.GetArenaTeamByCaptain(guid))
+    if (sObjectMgr.GetArenaTeamByCaptain(guid))
     {
         WorldPacket data(SMSG_CHAR_DELETE, 1);
         data << (uint8)CHAR_DELETE_FAILED_ARENA_CAPTAIN;
-        SendPacket( &data );
+        SendPacket(&data);
         return;
     }
 
     uint32 lowguid = guid.GetCounter();
 
-    QueryResult *result = CharacterDatabase.PQuery("SELECT account,name FROM characters WHERE guid='%u'", lowguid);
-    if(result)
+    QueryResult* result = CharacterDatabase.PQuery("SELECT account,name FROM characters WHERE guid='%u'", lowguid);
+    if (result)
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         accountId = fields[0].GetUInt32();
         name = fields[1].GetCppString();
         delete result;
     }
 
     // prevent deleting other players' characters using cheating tools
-    if(accountId != GetAccountId())
+    if (accountId != GetAccountId())
         return;
 
     std::string IP_str = GetRemoteAddress();
     BASIC_LOG("Account: %d (IP: %s) Delete Character:[%s] (guid: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), lowguid);
     sLog.outChar("Account: %d (IP: %s) Delete Character:[%s] (guid: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), lowguid);
 
-    if(sLog.IsOutCharDump())                                // optimize GetPlayerDump call
+    if (sLog.IsOutCharDump())                               // optimize GetPlayerDump call
     {
         std::string dump = PlayerDumpWriter().GetDump(lowguid);
         sLog.outCharDump(dump.c_str(), GetAccountId(), lowguid, name.c_str());
     }
 
+    sCalendarMgr.RemovePlayerCalendar(guid);
+
     Player::DeleteFromDB(guid, GetAccountId());
 
     WorldPacket data(SMSG_CHAR_DELETE, 1);
     data << (uint8)CHAR_DELETE_SUCCESS;
-    SendPacket( &data );
+    SendPacket(&data);
 }
 
-void WorldSession::HandlePlayerLoginOpcode( WorldPacket & recv_data )
+void WorldSession::HandlePlayerLoginOpcode(WorldPacket& recv_data)
 {
     ObjectGuid playerGuid;
     recv_data >> playerGuid;
 
-    if(PlayerLoading() || GetPlayer() != NULL)
+    if (PlayerLoading() || GetPlayer() != NULL)
     {
         sLog.outError("Player tryes to login again, AccountId = %d", GetAccountId());
         return;
@@ -557,9 +649,9 @@ void WorldSession::HandlePlayerLoginOpcode( WorldPacket & recv_data )
 
     m_playerLoading = true;
 
-    DEBUG_LOG( "WORLD: Recvd Player Logon Message" );
+    DEBUG_LOG("WORLD: Recvd Player Logon Message");
 
-    LoginQueryHolder *holder = new LoginQueryHolder(GetAccountId(), playerGuid);
+    LoginQueryHolder* holder = new LoginQueryHolder(GetAccountId(), playerGuid);
     if (!holder->Initialize())
     {
         delete holder;                                      // delete all unprocessed queries
@@ -570,15 +662,15 @@ void WorldSession::HandlePlayerLoginOpcode( WorldPacket & recv_data )
     CharacterDatabase.DelayQueryHolder(&chrHandler, &CharacterHandler::HandlePlayerLoginCallback, holder);
 }
 
-void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
+void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
 {
     ObjectGuid playerGuid = holder->GetGuid();
 
-    Player *pCurrChar = new Player(this);
+    Player* pCurrChar = new Player(this);
     pCurrChar->GetMotionMaster()->Initialize();
 
     // "GetAccountId()==db stored account id" checked in LoadFromDB (prevent login not own character using cheating tools)
-    if(!pCurrChar->LoadFromDB(playerGuid, holder))
+    if (!pCurrChar->LoadFromDB(playerGuid, holder))
     {
         KickPlayer();                                       // disconnect client, player no set to session and it will not deleted or saved at kick
         delete pCurrChar;                                   // delete it manually
@@ -591,7 +683,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
 
     pCurrChar->SendDungeonDifficulty(false);
 
-    WorldPacket data( SMSG_LOGIN_VERIFY_WORLD, 20 );
+    WorldPacket data(SMSG_LOGIN_VERIFY_WORLD, 20);
     data << pCurrChar->GetMapId();
     data << pCurrChar->GetPositionX();
     data << pCurrChar->GetPositionY();
@@ -600,7 +692,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
     SendPacket(&data);
 
     // load player specific part before send times
-    LoadAccountData(holder->GetResult(PLAYER_LOGIN_QUERY_LOADACCOUNTDATA),PER_CHARACTER_CACHE_MASK);
+    LoadAccountData(holder->GetResult(PLAYER_LOGIN_QUERY_LOADACCOUNTDATA), PER_CHARACTER_CACHE_MASK);
     SendAccountDataTimes(PER_CHARACTER_CACHE_MASK);
 
     data.Initialize(SMSG_FEATURE_SYSTEM_STATUS, 2);         // added in 2.2.0
@@ -613,16 +705,16 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
         data.Initialize(SMSG_MOTD, 50);                     // new in 2.0.1
         data << (uint32)0;
 
-        uint32 linecount=0;
+        uint32 linecount = 0;
         std::string str_motd = sWorld.GetMotd();
         std::string::size_type pos, nextpos;
 
         pos = 0;
-        while ( (nextpos= str_motd.find('@',pos)) != std::string::npos )
+        while ((nextpos = str_motd.find('@', pos)) != std::string::npos)
         {
             if (nextpos != pos)
             {
-                data << str_motd.substr(pos, nextpos-pos);
+                data << str_motd.substr(pos, nextpos - pos);
                 ++linecount;
             }
             pos = nextpos + 1;
@@ -636,63 +728,62 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
 
         data.put(0, linecount);
 
-        SendPacket( &data );
-        DEBUG_LOG( "WORLD: Sent motd (SMSG_MOTD)" );
+        SendPacket(&data);
+        DEBUG_LOG("WORLD: Sent motd (SMSG_MOTD)");
     }
 
-    //QueryResult *result = CharacterDatabase.PQuery("SELECT guildid,rank FROM guild_member WHERE guid = '%u'",pCurrChar->GetGUIDLow());
-    QueryResult *resultGuild = holder->GetResult(PLAYER_LOGIN_QUERY_LOADGUILD);
+    // QueryResult *result = CharacterDatabase.PQuery("SELECT guildid,rank FROM guild_member WHERE guid = '%u'",pCurrChar->GetGUIDLow());
+    QueryResult* resultGuild = holder->GetResult(PLAYER_LOGIN_QUERY_LOADGUILD);
 
-    if(resultGuild)
+    if (resultGuild)
     {
-        Field *fields = resultGuild->Fetch();
+        Field* fields = resultGuild->Fetch();
         pCurrChar->SetInGuild(fields[0].GetUInt32());
         pCurrChar->SetRank(fields[1].GetUInt32());
         delete resultGuild;
     }
-    else if(pCurrChar->GetGuildId())                        // clear guild related fields in case wrong data about nonexistent membership
+    else if (pCurrChar->GetGuildId())                       // clear guild related fields in case wrong data about nonexistent membership
     {
         pCurrChar->SetInGuild(0);
         pCurrChar->SetRank(0);
     }
 
-    if(pCurrChar->GetGuildId() != 0)
+    if (pCurrChar->GetGuildId() != 0)
     {
         Guild* guild = sGuildMgr.GetGuildById(pCurrChar->GetGuildId());
-        if(guild)
+        if (guild)
         {
-            data.Initialize(SMSG_GUILD_EVENT, (1+1+guild->GetMOTD().size()+1));
+            data.Initialize(SMSG_GUILD_EVENT, (1 + 1 + guild->GetMOTD().size() + 1));
             data << uint8(GE_MOTD);
             data << uint8(1);
             data << guild->GetMOTD();
             SendPacket(&data);
-            DEBUG_LOG( "WORLD: Sent guild-motd (SMSG_GUILD_EVENT)" );
-
-            guild->DisplayGuildBankTabsInfo(this);
+            DEBUG_LOG("WORLD: Sent guild-motd (SMSG_GUILD_EVENT)");
 
+            guild->OnMemberLogin();
             guild->BroadcastEvent(GE_SIGNED_ON, pCurrChar->GetObjectGuid(), pCurrChar->GetName());
         }
         else
         {
             // remove wrong guild data
-            sLog.outError("Player %s (GUID: %u) marked as member of nonexistent guild (id: %u), removing guild membership for player.",pCurrChar->GetName(),pCurrChar->GetGUIDLow(),pCurrChar->GetGuildId());
+            sLog.outError("Player %s (GUID: %u) marked as member of nonexistent guild (id: %u), removing guild membership for player.", pCurrChar->GetName(), pCurrChar->GetGUIDLow(), pCurrChar->GetGuildId());
             pCurrChar->SetInGuild(0);
         }
     }
 
-    data.Initialize(SMSG_LEARNED_DANCE_MOVES, 4+4);
+    data.Initialize(SMSG_LEARNED_DANCE_MOVES, 4 + 4);
     data << uint32(0);
     data << uint32(0);
     SendPacket(&data);
 
     pCurrChar->SendInitialPacketsBeforeAddToMap();
 
-    //Show cinematic at the first time that player login
-    if( !pCurrChar->getCinematic() )
+    // Show cinematic at the first time that player login
+    if (!pCurrChar->getCinematic())
     {
         pCurrChar->setCinematic(1);
 
-        if(ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(pCurrChar->getClass()))
+        if (ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(pCurrChar->getClass()))
         {
             if (cEntry->CinematicSequence)
                 pCurrChar->SendCinematicStart(cEntry->CinematicSequence);
@@ -701,35 +792,40 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
         }
     }
 
-    if (!pCurrChar->GetMap()->Add(pCurrChar))
+    if (pCurrChar->NeedEjectFromThisMap() || !pCurrChar->GetMap()->Add(pCurrChar))
     {
-        // normal delayed teleport protection not applied (and this correct) for this case (Player object just created)
         AreaTrigger const* at = sObjectMgr.GetGoBackTrigger(pCurrChar->GetMapId());
-        if(at)
-            pCurrChar->TeleportTo(at->target_mapId, at->target_X, at->target_Y, at->target_Z, pCurrChar->GetOrientation());
-        else
+        if (!at || !pCurrChar->TeleportTo(at->loc))
             pCurrChar->TeleportToHomebind();
     }
 
     sObjectAccessor.AddObject(pCurrChar);
-    //DEBUG_LOG("Player %s added to Map.",pCurrChar->GetName());
+    // DEBUG_LOG("Player %s added to Map.",pCurrChar->GetName());
 
     pCurrChar->SendInitialPacketsAfterAddToMap();
 
     static SqlStatementID updChars;
-    static SqlStatementID updAccount;
 
     SqlStatement stmt = CharacterDatabase.CreateStatement(updChars, "UPDATE characters SET online = 1 WHERE guid = ?");
     stmt.PExecute(pCurrChar->GetGUIDLow());
 
-    stmt = LoginDatabase.CreateStatement(updAccount, "UPDATE account SET active_realm_id = ? WHERE id = ?");
-    stmt.PExecute(realmID, GetAccountId());
+    // don't update active realm if is playerbot
+    if (pCurrChar->GetSession()->GetRemoteAddress() != "bot")
+    {
+        static SqlStatementID updAccount;
 
-    pCurrChar->SetInGameTime( WorldTimer::getMSTime() );
+        stmt = LoginDatabase.CreateStatement(updAccount, "UPDATE account SET active_realm_id = ? WHERE id = ?");
+        stmt.PExecute(sWorld.getConfig(CONFIG_UINT32_REALMID), GetAccountId());
+    }
+
+    pCurrChar->SetInGameTime(WorldTimer::getMSTime());
 
     // announce group about member online (must be after add to player list to receive announce to self)
-    if (Group *group = pCurrChar->GetGroup())
+    if (Group* group = pCurrChar->GetGroup())
+    {
+        group->CheckLeader(pCurrChar->GetObjectGuid(), false); // check leader login
         group->SendUpdate();
+    }
 
     // friend status
     sSocialMgr.SendFriendStatus(pCurrChar, FRIEND_ONLINE, pCurrChar->GetObjectGuid(), true);
@@ -741,39 +837,39 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
     if (pCurrChar->m_deathState != ALIVE)
     {
         // not blizz like, we must correctly save and load player instead...
-        if(pCurrChar->getRace() == RACE_NIGHTELF)
+        if (pCurrChar->getRace() == RACE_NIGHTELF)
             pCurrChar->CastSpell(pCurrChar, 20584, true);   // auras SPELL_AURA_INCREASE_SPEED(+speed in wisp form), SPELL_AURA_INCREASE_SWIM_SPEED(+swim speed in wisp form), SPELL_AURA_TRANSFORM (to wisp form)
         pCurrChar->CastSpell(pCurrChar, 8326, true);        // auras SPELL_AURA_GHOST, SPELL_AURA_INCREASE_SPEED(why?), SPELL_AURA_INCREASE_SWIM_SPEED(why?)
 
-        pCurrChar->SetMovement(MOVE_WATER_WALK);
+        pCurrChar->SetWaterWalk(true);
     }
 
     pCurrChar->ContinueTaxiFlight();
 
     // reset for all pets before pet loading
-    if(pCurrChar->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS))
+    if (pCurrChar->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS))
         Pet::resetTalentsForAllPetsOf(pCurrChar);
 
     // Load pet if any (if player not alive and in taxi flight or another then pet will remember as temporary unsummoned)
     pCurrChar->LoadPet();
 
     // Set FFA PvP for non GM in non-rest mode
-    if(sWorld.IsFFAPvPRealm() && !pCurrChar->isGameMaster() && !pCurrChar->HasFlag(PLAYER_FLAGS,PLAYER_FLAGS_RESTING) )
+    if (sWorld.IsFFAPvPRealm() && !pCurrChar->isGameMaster() && !pCurrChar->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING))
         pCurrChar->SetFFAPvP(true);
 
-    if(pCurrChar->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_CONTESTED_PVP))
+    if (pCurrChar->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_CONTESTED_PVP))
         pCurrChar->SetContestedPvP();
 
     // Apply at_login requests
-    if(pCurrChar->HasAtLoginFlag(AT_LOGIN_RESET_SPELLS))
+    if (pCurrChar->HasAtLoginFlag(AT_LOGIN_RESET_SPELLS))
     {
         pCurrChar->resetSpells();
         SendNotification(LANG_RESET_SPELLS);
     }
 
-    if(pCurrChar->HasAtLoginFlag(AT_LOGIN_RESET_TALENTS))
+    if (pCurrChar->HasAtLoginFlag(AT_LOGIN_RESET_TALENTS))
     {
-        pCurrChar->resetTalents(true,true);
+        pCurrChar->resetTalents(true, true);
         pCurrChar->SendTalentsInfoData(false);              // original talents send already in to SendInitialPacketsBeforeAddToMap, resend reset state
         SendNotification(LANG_RESET_TALENTS);               // we can use SMSG_TALENTS_INVOLUNTARILY_RESET here
     }
@@ -783,7 +879,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
 
     // show time before shutdown if shutdown planned.
     if (sWorld.IsShutdowning())
-        sWorld.ShutdownMsg(true,pCurrChar);
+        sWorld.ShutdownMsg(true, pCurrChar);
 
     if (sWorld.getConfig(CONFIG_BOOL_ALL_TAXI_PATHS))
         pCurrChar->SetTaxiCheater(true);
@@ -792,13 +888,18 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
         SendNotification(LANG_GM_ON);
 
     if (!pCurrChar->isGMVisible())
+    {
         SendNotification(LANG_INVISIBLE_INVISIBLE);
+        SpellEntry const* invisibleAuraInfo = sSpellStore.LookupEntry(sWorld.getConfig(CONFIG_UINT32_GM_INVISIBLE_AURA));
+        if (invisibleAuraInfo && IsSpellAppliesAura(invisibleAuraInfo))
+            pCurrChar->CastSpell(pCurrChar, invisibleAuraInfo, true);
+    }
 
     std::string IP_str = GetRemoteAddress();
     sLog.outChar("Account: %d (IP: %s) Login Character:[%s] (guid: %u)",
-        GetAccountId(), IP_str.c_str(), pCurrChar->GetName(), pCurrChar->GetGUIDLow());
+                 GetAccountId(), IP_str.c_str(), pCurrChar->GetName(), pCurrChar->GetGUIDLow());
 
-    if(!pCurrChar->IsStandState() && !pCurrChar->hasUnitState(UNIT_STAT_STUNNED))
+    if (!pCurrChar->IsStandState() && !pCurrChar->hasUnitState(UNIT_STAT_STUNNED))
         pCurrChar->SetStandState(UNIT_STAND_STATE_STAND);
 
     m_playerLoading = false;
@@ -806,12 +907,42 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
     // Handle Login-Achievements (should be handled after loading)
     pCurrChar->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ON_LOGIN, 1);
 
+    // Titles check
+    if (pCurrChar->HasAtLoginFlag(AT_LOGIN_CHECK_TITLES))
+    {
+        Team team = pCurrChar->GetTeam();
+        if (QueryResult *result = WorldDatabase.Query("SELECT alliance_id, horde_id FROM player_factionchange_titles"))
+        {
+            do
+            {
+                Field *fields = result->Fetch();
+                uint32 title_alliance = fields[0].GetUInt32();
+                uint32 title_horde = fields[1].GetUInt32();
+
+                CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(team == HORDE ? title_alliance : title_horde);
+                uint32 fieldIndexOffset = titleEntry->bit_index / 32;
+                uint32 flag = 1 << (titleEntry->bit_index % 32);
+                if (pCurrChar->HasFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag))
+                {
+                    pCurrChar->SetTitle(titleEntry, true);
+                    if (CharTitlesEntry const* titleNewEntry = sCharTitlesStore.LookupEntry(team == HORDE ? title_horde : title_alliance))
+                    {
+                        pCurrChar->SetTitle(titleNewEntry);
+                        pCurrChar->SetUInt32Value(PLAYER_CHOSEN_TITLE, 0);
+                    }
+                }
+            }
+            while(result->NextRow());
+        }
+        pCurrChar->RemoveAtLoginFlag(AT_LOGIN_CHECK_TITLES);
+    }
+
     delete holder;
 }
 
-void WorldSession::HandleSetFactionAtWarOpcode( WorldPacket & recv_data )
+void WorldSession::HandleSetFactionAtWarOpcode(WorldPacket& recv_data)
 {
-    DEBUG_LOG( "WORLD: Received CMSG_SET_FACTION_ATWAR" );
+    DEBUG_LOG("WORLD: Received CMSG_SET_FACTION_ATWAR");
 
     uint32 repListID;
     uint8  flag;
@@ -822,7 +953,7 @@ void WorldSession::HandleSetFactionAtWarOpcode( WorldPacket & recv_data )
     GetPlayer()->GetReputationMgr().SetAtWar(repListID, flag);
 }
 
-void WorldSession::HandleTutorialFlagOpcode( WorldPacket & recv_data )
+void WorldSession::HandleTutorialFlagOpcode(WorldPacket& recv_data)
 {
     uint32 iFlag;
     recv_data >> iFlag;
@@ -830,31 +961,31 @@ void WorldSession::HandleTutorialFlagOpcode( WorldPacket & recv_data )
     uint32 wInt = (iFlag / 32);
     if (wInt >= 8)
     {
-        //sLog.outError("CHEATER? Account:[%d] Guid[%u] tried to send wrong CMSG_TUTORIAL_FLAG", GetAccountId(),GetGUID());
+        // sLog.outError("CHEATER? Account:[%d] Guid[%u] tried to send wrong CMSG_TUTORIAL_FLAG", GetAccountId(),GetGUID());
         return;
     }
     uint32 rInt = (iFlag % 32);
 
-    uint32 tutflag = GetTutorialInt( wInt );
+    uint32 tutflag = GetTutorialInt(wInt);
     tutflag |= (1 << rInt);
-    SetTutorialInt( wInt, tutflag );
+    SetTutorialInt(wInt, tutflag);
 
-    //DEBUG_LOG("Received Tutorial Flag Set {%u}.", iFlag);
+    // DEBUG_LOG("Received Tutorial Flag Set {%u}.", iFlag);
 }
 
-void WorldSession::HandleTutorialClearOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleTutorialClearOpcode(WorldPacket& /*recv_data*/)
 {
     for (int i = 0; i < 8; ++i)
-        SetTutorialInt( i, 0xFFFFFFFF );
+        SetTutorialInt(i, 0xFFFFFFFF);
 }
 
-void WorldSession::HandleTutorialResetOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleTutorialResetOpcode(WorldPacket& /*recv_data*/)
 {
     for (int i = 0; i < 8; ++i)
-        SetTutorialInt( i, 0x00000000 );
+        SetTutorialInt(i, 0x00000000);
 }
 
-void WorldSession::HandleSetWatchedFactionOpcode(WorldPacket & recv_data)
+void WorldSession::HandleSetWatchedFactionOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received CMSG_SET_WATCHED_FACTION");
     int32 repId;
@@ -862,7 +993,7 @@ void WorldSession::HandleSetWatchedFactionOpcode(WorldPacket & recv_data)
     GetPlayer()->SetInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, repId);
 }
 
-void WorldSession::HandleSetFactionInactiveOpcode(WorldPacket & recv_data)
+void WorldSession::HandleSetFactionInactiveOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received CMSG_SET_FACTION_INACTIVE");
     uint32 replistid;
@@ -872,13 +1003,13 @@ void WorldSession::HandleSetFactionInactiveOpcode(WorldPacket & recv_data)
     _player->GetReputationMgr().SetInactive(replistid, inactive);
 }
 
-void WorldSession::HandleShowingHelmOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleShowingHelmOpcode(WorldPacket& /*recv_data*/)
 {
     DEBUG_LOG("CMSG_SHOWING_HELM for %s", _player->GetName());
     _player->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_HELM);
 }
 
-void WorldSession::HandleShowingCloakOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleShowingCloakOpcode(WorldPacket& /*recv_data*/)
 {
     DEBUG_LOG("CMSG_SHOWING_CLOAK for %s", _player->GetName());
     _player->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_CLOAK);
@@ -897,16 +1028,16 @@ void WorldSession::HandleCharRenameOpcode(WorldPacket& recv_data)
     {
         WorldPacket data(SMSG_CHAR_RENAME, 1);
         data << uint8(CHAR_NAME_NO_NAME);
-        SendPacket( &data );
+        SendPacket(&data);
         return;
     }
 
-    uint8 res = ObjectMgr::CheckPlayerName(newname,true);
+    uint8 res = ObjectMgr::CheckPlayerName(newname, true);
     if (res != CHAR_NAME_SUCCESS)
     {
         WorldPacket data(SMSG_CHAR_RENAME, 1);
         data << uint8(res);
-        SendPacket( &data );
+        SendPacket(&data);
         return;
     }
 
@@ -915,7 +1046,7 @@ void WorldSession::HandleCharRenameOpcode(WorldPacket& recv_data)
     {
         WorldPacket data(SMSG_CHAR_RENAME, 1);
         data << uint8(CHAR_NAME_RESERVED);
-        SendPacket( &data );
+        SendPacket(&data);
         return;
     }
 
@@ -925,18 +1056,19 @@ void WorldSession::HandleCharRenameOpcode(WorldPacket& recv_data)
     // make sure that the character belongs to the current account, that rename at login is enabled
     // and that there is no character with the desired new name
     CharacterDatabase.AsyncPQuery(&WorldSession::HandleChangePlayerNameOpcodeCallBack,
-        GetAccountId(), newname,
-        "SELECT guid, name FROM characters WHERE guid = %u AND account = %u AND (at_login & %u) = %u AND NOT EXISTS (SELECT NULL FROM characters WHERE name = '%s')",
-        guid.GetCounter(), GetAccountId(), AT_LOGIN_RENAME, AT_LOGIN_RENAME, escaped_newname.c_str()
-    );
+                                  GetAccountId(), newname,
+                                  "SELECT guid, name FROM characters WHERE guid = %u AND account = %u AND (at_login & %u) = %u AND NOT EXISTS (SELECT NULL FROM characters WHERE name = '%s')",
+                                  guid.GetCounter(), GetAccountId(), AT_LOGIN_RENAME, AT_LOGIN_RENAME, escaped_newname.c_str()
+                                 );
 }
 
-void WorldSession::HandleChangePlayerNameOpcodeCallBack(QueryResult *result, uint32 accountId, std::string newname)
+void WorldSession::HandleChangePlayerNameOpcodeCallBack(QueryResult* result, uint32 accountId, std::string newname)
 {
-    WorldSession * session = sWorld.FindSession(accountId);
-    if(!session)
+    WorldSession* session = sWorld.FindSession(accountId);
+    if (!session)
     {
-        if(result) delete result;
+        if (result)
+            delete result;
         return;
     }
 
@@ -944,7 +1076,7 @@ void WorldSession::HandleChangePlayerNameOpcodeCallBack(QueryResult *result, uin
     {
         WorldPacket data(SMSG_CHAR_RENAME, 1);
         data << uint8(CHAR_CREATE_ERROR);
-        session->SendPacket( &data );
+        session->SendPacket(&data);
         return;
     }
 
@@ -961,11 +1093,14 @@ void WorldSession::HandleChangePlayerNameOpcodeCallBack(QueryResult *result, uin
 
     sLog.outChar("Account: %d (IP: %s) Character:[%s] (guid:%u) Changed name to: %s", session->GetAccountId(), session->GetRemoteAddress().c_str(), oldname.c_str(), guidLow, newname.c_str());
 
-    WorldPacket data(SMSG_CHAR_RENAME, 1+8+(newname.size()+1));
+    WorldPacket data(SMSG_CHAR_RENAME, 1 + 8 + (newname.size() + 1));
     data << uint8(RESPONSE_SUCCESS);
     data << guid;
     data << newname;
     session->SendPacket(&data);
+
+    sWorld.InvalidatePlayer(guid);
+	sAccountMgr.ClearPlayerDataCache(guid);
 }
 
 void WorldSession::HandleSetPlayerDeclinedNamesOpcode(WorldPacket& recv_data)
@@ -976,9 +1111,9 @@ void WorldSession::HandleSetPlayerDeclinedNamesOpcode(WorldPacket& recv_data)
 
     // not accept declined names for unsupported languages
     std::string name;
-    if(!sObjectMgr.GetPlayerNameByGUID(guid, name))
+    if (!sAccountMgr.GetPlayerNameByGUID(guid, name))
     {
-        WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
+        WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4 + 8);
         data << uint32(1);
         data << ObjectGuid(guid);
         SendPacket(&data);
@@ -986,18 +1121,18 @@ void WorldSession::HandleSetPlayerDeclinedNamesOpcode(WorldPacket& recv_data)
     }
 
     std::wstring wname;
-    if(!Utf8toWStr(name, wname))
+    if (!Utf8toWStr(name, wname))
     {
-        WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
+        WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4 + 8);
         data << uint32(1);
         data << ObjectGuid(guid);
         SendPacket(&data);
         return;
     }
 
-    if(!isCyrillicCharacter(wname[0]))                      // name already stored as only single alphabet using
+    if (!isCyrillicCharacter(wname[0]))                     // name already stored as only single alphabet using
     {
-        WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
+        WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4 + 8);
         data << uint32(1);
         data << ObjectGuid(guid);
         SendPacket(&data);
@@ -1009,21 +1144,21 @@ void WorldSession::HandleSetPlayerDeclinedNamesOpcode(WorldPacket& recv_data)
 
     recv_data >> name2;
 
-    if(name2 != name)                                       // character have different name
+    if (name2 != name)                                      // character have different name
     {
-        WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
+        WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4 + 8);
         data << uint32(1);
         data << ObjectGuid(guid);
         SendPacket(&data);
         return;
     }
 
-    for(int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
+    for (int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
     {
         recv_data >> declinedname.name[i];
-        if(!normalizePlayerName(declinedname.name[i]))
+        if (!normalizePlayerName(declinedname.name[i]))
         {
-            WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
+            WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4 + 8);
             data << uint32(1);
             data << ObjectGuid(guid);
             SendPacket(&data);
@@ -1031,53 +1166,63 @@ void WorldSession::HandleSetPlayerDeclinedNamesOpcode(WorldPacket& recv_data)
         }
     }
 
-    if(!ObjectMgr::CheckDeclinedNames(GetMainPartOfName(wname, 0), declinedname))
+    if (!ObjectMgr::CheckDeclinedNames(wname, declinedname))
     {
-        WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
+        WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4 + 8);
         data << uint32(1);
         data << ObjectGuid(guid);
         SendPacket(&data);
         return;
     }
 
-    for(int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
+    for (int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
         CharacterDatabase.escape_string(declinedname.name[i]);
 
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid = '%u'", guid.GetCounter());
     CharacterDatabase.PExecute("INSERT INTO character_declinedname (guid, genitive, dative, accusative, instrumental, prepositional) VALUES ('%u','%s','%s','%s','%s','%s')",
-        guid.GetCounter(), declinedname.name[0].c_str(), declinedname.name[1].c_str(), declinedname.name[2].c_str(), declinedname.name[3].c_str(), declinedname.name[4].c_str());
+                               guid.GetCounter(), declinedname.name[0].c_str(), declinedname.name[1].c_str(), declinedname.name[2].c_str(), declinedname.name[3].c_str(), declinedname.name[4].c_str());
     CharacterDatabase.CommitTransaction();
 
-    WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
+    WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4 + 8);
     data << uint32(0);                                      // OK
     data << ObjectGuid(guid);
     SendPacket(&data);
 }
 
-void WorldSession::HandleAlterAppearanceOpcode( WorldPacket & recv_data )
+void WorldSession::HandleAlterAppearanceOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_ALTER_APPEARANCE");
 
-    uint32 Hair, Color, FacialHair;
-    recv_data >> Hair >> Color >> FacialHair;
+    uint32 skinTone_id = -1;
+
+    uint32 Hair, Color, FacialHair, SkinTone;
+    if(_player->getRace() != RACE_TAUREN) recv_data >> Hair >> Color >> FacialHair;
+    else
+    {
+        recv_data >> Hair >> Color >> FacialHair >> SkinTone;
+        BarberShopStyleEntry const* bs_skinTone = sBarberShopStyleStore.LookupEntry(SkinTone);
+        if (!bs_skinTone || bs_skinTone->type != 3 || bs_skinTone->race != _player->getRace() || bs_skinTone->gender != _player->getGender())
+            return;
+        skinTone_id = bs_skinTone->hair_id;
+    }
 
     BarberShopStyleEntry const* bs_hair = sBarberShopStyleStore.LookupEntry(Hair);
 
-    if(!bs_hair || bs_hair->type != 0 || bs_hair->race != _player->getRace() || bs_hair->gender != _player->getGender())
+    if (!bs_hair || bs_hair->type != 0 || bs_hair->race != _player->getRace() || bs_hair->gender != _player->getGender())
         return;
 
     BarberShopStyleEntry const* bs_facialHair = sBarberShopStyleStore.LookupEntry(FacialHair);
 
-    if(!bs_facialHair || bs_facialHair->type != 2 || bs_facialHair->race != _player->getRace() || bs_facialHair->gender != _player->getGender())
+    if (!bs_facialHair || bs_facialHair->type != 2 || bs_facialHair->race != _player->getRace() || bs_facialHair->gender != _player->getGender())
         return;
 
-    uint32 Cost = _player->GetBarberShopCost(bs_hair->hair_id, Color, bs_facialHair->hair_id);
+    uint32 Cost = _player->GetBarberShopCost(bs_hair->hair_id, Color, bs_facialHair->hair_id, skinTone_id);
 
     // 0 - ok
     // 1,3 - not enough money
     // 2 - you have to seat on barber chair
-    if(_player->GetMoney() < Cost)
+    if (_player->GetMoney() < Cost)
     {
         WorldPacket data(SMSG_BARBER_SHOP_RESULT, 4);
         data << uint32(1);                                  // no money
@@ -1097,24 +1242,26 @@ void WorldSession::HandleAlterAppearanceOpcode( WorldPacket & recv_data )
     _player->SetByteValue(PLAYER_BYTES, 2, uint8(bs_hair->hair_id));
     _player->SetByteValue(PLAYER_BYTES, 3, uint8(Color));
     _player->SetByteValue(PLAYER_BYTES_2, 0, uint8(bs_facialHair->hair_id));
+    if (_player->getRace() == RACE_TAUREN)
+        _player->SetByteValue(PLAYER_BYTES, 0, uint8(skinTone_id));
 
     _player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_VISIT_BARBER_SHOP, 1);
 
     _player->SetStandState(0);                              // stand up
 }
 
-void WorldSession::HandleRemoveGlyphOpcode( WorldPacket & recv_data )
+void WorldSession::HandleRemoveGlyphOpcode(WorldPacket& recv_data)
 {
     uint32 slot;
     recv_data >> slot;
 
-    if(slot >= MAX_GLYPH_SLOT_INDEX)
+    if (slot >= MAX_GLYPH_SLOT_INDEX)
     {
         DEBUG_LOG("Client sent wrong glyph slot number in opcode CMSG_REMOVE_GLYPH %u", slot);
         return;
     }
 
-    if(_player->GetGlyph(slot))
+    if (_player->GetGlyph(slot))
     {
         _player->ApplyGlyph(slot, false);
         _player->SetGlyph(slot, 0);
@@ -1122,6 +1269,290 @@ void WorldSession::HandleRemoveGlyphOpcode( WorldPacket & recv_data )
     }
 }
 
+void WorldSession::HandleCharFactionOrRaceChangeOpcode(WorldPacket& recv_data)
+{
+    ObjectGuid guid;
+    std::string newname;
+    uint8 gender, skin, face, hairStyle, hairColor, facialHair, newRace;
+    recv_data >> guid;
+    recv_data >> newname;
+    recv_data >> gender >> skin >> hairColor >> hairStyle >> facialHair >> face >> newRace;
+
+    QueryResult* result = CharacterDatabase.PQuery("SELECT at_login, name, race FROM characters WHERE guid ='%u'", guid.GetCounter());
+    if (!result)
+    {
+        WorldPacket data(SMSG_CHAR_FACTION_CHANGE, 1);
+        data << uint8(CHAR_CREATE_ERROR);
+        SendPacket(&data);
+        return;
+    }
+
+    Field* fields = result->Fetch();
+    uint32 at_loginFlags = fields[0].GetUInt32();
+    std::string oldname = fields[1].GetCppString();
+    uint8 oldRace = fields[2].GetUInt8();
+    AtLoginFlags used_loginFlag = recv_data.GetOpcode() == CMSG_CHAR_FACTION_CHANGE ? AT_LOGIN_CHANGE_FACTION : AT_LOGIN_CHANGE_RACE;
+    delete result;
+
+    if (!(at_loginFlags & used_loginFlag))
+    {
+        WorldPacket data(SMSG_CHAR_FACTION_CHANGE, 1);
+        data << uint8(CHAR_CREATE_ERROR);
+        SendPacket(&data);
+        return;
+    }
+
+    if (sWorld.getConfig(CONFIG_BOOL_FACTION_AND_RACE_CHANGE_WITHOUT_RENAMING))
+        newname = oldname;
+    else
+    {
+        // prevent character rename to invalid name
+        if (!normalizePlayerName(newname))
+        {
+            WorldPacket data(SMSG_CHAR_FACTION_CHANGE, 1);
+            data << uint8(CHAR_NAME_NO_NAME);
+            SendPacket(&data);
+            return;
+        }
+
+        uint8 res = ObjectMgr::CheckPlayerName(newname,true);
+        if (res != CHAR_NAME_SUCCESS)
+        {
+            WorldPacket data(SMSG_CHAR_FACTION_CHANGE, 1);
+            data << uint8(res);
+            SendPacket(&data);
+            return;
+        }
+
+        // check name limitations
+        if (GetSecurity() == SEC_PLAYER && sObjectMgr.IsReservedName(newname))
+        {
+            WorldPacket data(SMSG_CHAR_FACTION_CHANGE, 1);
+            data << uint8(CHAR_NAME_RESERVED);
+            SendPacket(&data);
+            return;
+        }
+
+        // character with this name already exist
+        if (sAccountMgr.GetPlayerGuidByName(newname))
+        {
+            ObjectGuid newguid = sAccountMgr.GetPlayerGuidByName(newname);
+            if (newguid != guid)
+            {
+                WorldPacket data(SMSG_CHAR_FACTION_CHANGE, 1);
+                data << uint8(CHAR_CREATE_NAME_IN_USE);
+                SendPacket(&data);
+                return;
+            }
+        }
+    }
+
+    // The player was uninvited already on logout so just remove from group
+    // immediately remove from group before start change process
+    QueryResult* resultGroup = CharacterDatabase.PQuery("SELECT groupId FROM group_member WHERE memberGuid='%u'", guid.GetCounter());
+    if (resultGroup)
+    {
+        uint32 groupId = (*resultGroup)[0].GetUInt32();
+        delete resultGroup;
+
+        ObjectGuid groupGuid = ObjectGuid(HIGHGUID_GROUP, groupId);
+        Group* group = sObjectMgr.GetGroup(groupGuid);
+
+        if (group)
+            group->RemoveMember(guid, 0);
+    }
+
+    CharacterDatabase.escape_string(newname);
+    Player::Customize(guid, gender, skin, face, hairStyle, hairColor, facialHair);
+    CharacterDatabase.BeginTransaction();
+    CharacterDatabase.PExecute("UPDATE characters SET name = '%s', race = '%u', at_login = at_login & ~ %u WHERE guid ='%u'", newname.c_str(), newRace, uint32(used_loginFlag), guid.GetCounter());
+    CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid ='%u'", guid.GetCounter());
+    uint32 deletedGuild = 0;
+
+    // Search old faction.
+    TeamIndex oldTeam = ((1 << (oldRace - 1)) & RACEMASK_ALLIANCE) ? TEAM_INDEX_ALLIANCE : TEAM_INDEX_HORDE;
+
+    // Search each faction is targeted
+    TeamIndex newTeam = ((1 << (newRace - 1)) & RACEMASK_ALLIANCE) ? TEAM_INDEX_ALLIANCE : TEAM_INDEX_HORDE;
+
+    if (used_loginFlag == AT_LOGIN_CHANGE_FACTION && newTeam != oldTeam)
+    {
+        // Delete all Flypaths
+        CharacterDatabase.PExecute("UPDATE characters SET taxi_path = '' WHERE guid ='%u'", guid.GetCounter());
+        // Delete all current quests
+        CharacterDatabase.PExecute("DELETE FROM `character_queststatus` WHERE `status` = 3 AND guid ='%u'", guid.GetCounter());
+        // Reset guild
+        if (uint32 guildId = Player::GetGuildIdFromDB(guid))
+        {
+            Guild* guild = sGuildMgr.GetGuildById(guildId);
+            if (guild)
+                if (guild->DelMember(guid))
+                    deletedGuild = guildId;
+        }
+
+        // Delete Friend List
+        // Cleanup friends for online players
+        if (QueryResult* resultFriend = CharacterDatabase.PQuery("SELECT DISTINCT guid FROM character_social WHERE friend = '%u'", guid.GetCounter()))
+        {
+            do
+            {
+                Field* fieldsFriend = resultFriend->Fetch();
+                if (Player* sFriend = sObjectAccessor.FindPlayer(ObjectGuid(HIGHGUID_PLAYER, fieldsFriend[0].GetUInt32())))
+                {
+                    if (sFriend->IsInWorld())
+                    {
+                        sFriend->GetSocial()->RemoveFromSocialList(guid, false, true);
+                        sSocialMgr.SendFriendStatus(sFriend, FRIEND_REMOVED, guid, false);
+                    }
+                }
+            }
+            while (resultFriend->NextRow());
+            delete resultFriend;
+        }
+        // Cleanup friends for offline players
+        CharacterDatabase.PExecute("DELETE FROM character_social WHERE guid = '%u' OR friend='%u'", guid.GetCounter(), guid.GetCounter());
+        // Leave Arena Teams
+        Player::LeaveAllArenaTeams(guid);
+        // Remove signs from petitions (also remove petitions if owner)
+        // NOTE: This is the same as call Player::RemovePetitionsAndSigns(guid, 10); but this can't be called in a Transaction because it initialize another one!!
+        if (QueryResult *result = CharacterDatabase.PQuery("SELECT ownerguid,petitionguid FROM petition_sign WHERE playerguid = '%u'", guid.GetCounter()))
+        {
+            do // this part effectively does nothing, since the deletion / modification only takes place _after_ the PetitionQuery. Though I don't know if the result remains intact if I execute the delete query beforehand.
+            { // and SendPetitionQueryOpcode reads data from the DB
+                Field *fields = result->Fetch();
+                ObjectGuid ownerguid = ObjectGuid(HIGHGUID_PLAYER, fields[0].GetUInt32());
+                ObjectGuid petitionguid = ObjectGuid(HIGHGUID_ITEM, fields[1].GetUInt32());
+
+                // send update if charter owner in game
+                Player* owner = sObjectMgr.GetPlayer(ownerguid);
+                if (owner)
+                    owner->GetSession()->SendPetitionQueryOpcode(petitionguid);
+            }
+            while (result->NextRow());
+
+            delete result;
+
+            CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE playerguid = '%u'", guid.GetCounter());
+        }
+        CharacterDatabase.PExecute("DELETE FROM petition WHERE ownerguid = '%u'", guid.GetCounter());
+        CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE ownerguid = '%u'", guid.GetCounter());
+        // Reset Language (will be added automatically after faction change)
+        CharacterDatabase.PExecute("DELETE FROM `character_spell` WHERE `spell` IN (668, 7340, 671, 672, 814, 29932, 17737, 816, 7341, 669, 813, 670) AND guid ='%u'", guid.GetCounter());
+
+        // Reset homebind
+        CharacterDatabase.PExecute("DELETE FROM `character_homebind` WHERE guid = '%u'", guid.GetCounter());
+        if (newTeam == TEAM_INDEX_ALLIANCE)
+            CharacterDatabase.PExecute("INSERT INTO `character_homebind` VALUES ('%u','0','1519','-8867.68','673.373','97.9034')", guid.GetCounter());
+        else
+            CharacterDatabase.PExecute("INSERT INTO `character_homebind` VALUES ('%u','1','1637','1633.33','-4439.11','15.7588')", guid.GetCounter());
+
+        // Achievement conversion
+        if (QueryResult *result2 = WorldDatabase.Query("SELECT alliance_id, horde_id FROM player_factionchange_achievements"))
+        {
+            do
+            {
+                Field *fields2 = result2->Fetch();
+                uint32 achiev_alliance = fields2[0].GetUInt32();
+                uint32 achiev_horde = fields2[1].GetUInt32();
+                CharacterDatabase.PExecute("UPDATE IGNORE `character_achievement` set achievement = '%u' where achievement = '%u' AND guid = '%u'",
+                    newTeam == TEAM_INDEX_ALLIANCE ? achiev_alliance : achiev_horde, newTeam == TEAM_INDEX_ALLIANCE ? achiev_horde : achiev_alliance, guid.GetCounter());
+            }
+            while (result2->NextRow());
+        }
+
+        // Item conversion
+        if (QueryResult *result2 = WorldDatabase.Query("SELECT alliance_id, horde_id FROM player_factionchange_items"))
+        {
+            do
+            {
+                Field *fields2 = result2->Fetch();
+                uint32 item_alliance = fields2[0].GetUInt32();
+                uint32 item_horde = fields2[1].GetUInt32();
+                CharacterDatabase.PExecute("UPDATE IGNORE `character_inventory` set item = '%u' where item = '%u' AND guid = '%u'",
+                    newTeam == TEAM_INDEX_ALLIANCE ? item_alliance : item_horde, newTeam == TEAM_INDEX_ALLIANCE ? item_horde : item_alliance, guid.GetCounter());
+
+                CharacterDatabase.PExecute("UPDATE IGNORE `item_instance` SET `data`=CONCAT(CAST(SUBSTRING_INDEX(`data`, ' ', 3) AS CHAR), ' ', '%u', ' ', CAST(SUBSTRING_INDEX(TRIM(`data`), ' ', (4-64))AS CHAR)) WHERE CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 4), ' ', '-1') AS UNSIGNED) = '%u' AND owner_guid = '%u'",
+                        newTeam == TEAM_INDEX_ALLIANCE ? item_alliance : item_horde, newTeam == TEAM_INDEX_ALLIANCE ? item_horde : item_alliance, guid.GetCounter());
+            }
+            while (result2->NextRow());
+        }
+
+        // Spell conversion
+        if (QueryResult *result2 = WorldDatabase.Query("SELECT alliance_id, horde_id FROM player_factionchange_spells"))
+        {
+            do
+            {
+                Field *fields2 = result2->Fetch();
+                uint32 spell_alliance = fields2[0].GetUInt32();
+                uint32 spell_horde = fields2[1].GetUInt32();
+                CharacterDatabase.PExecute("UPDATE IGNORE `character_spell` set spell = '%u' where spell = '%u' AND guid = '%u'",
+                    newTeam == TEAM_INDEX_ALLIANCE ? spell_alliance : spell_horde, newTeam == TEAM_INDEX_ALLIANCE ? spell_horde : spell_alliance, guid.GetCounter());
+            }
+            while (result2->NextRow());
+        }
+
+        // Reputation conversion
+        if (QueryResult *result2 = WorldDatabase.Query("SELECT alliance_id, horde_id FROM player_factionchange_reputations"))
+        {
+            do
+            {
+                Field *fields2 = result2->Fetch();
+                uint32 reputation_alliance = fields2[0].GetUInt32();
+                uint32 reputation_horde = fields2[1].GetUInt32();
+                CharacterDatabase.PExecute("DELETE FROM character_reputation WHERE faction = '%u' AND guid = '%u'", newTeam == TEAM_INDEX_ALLIANCE ? reputation_alliance : reputation_horde, guid.GetCounter());
+                CharacterDatabase.PExecute("UPDATE IGNORE `character_reputation` set faction = '%u' where faction = '%u' AND guid = '%u'",
+                    newTeam == TEAM_INDEX_ALLIANCE ? reputation_alliance : reputation_horde, newTeam == TEAM_INDEX_ALLIANCE ? reputation_horde : reputation_alliance, guid.GetCounter());
+            }
+            while (result2->NextRow());
+        }
+
+        // Quest conversion
+        if (QueryResult *result2 = WorldDatabase.Query("SELECT alliance_id, horde_id FROM player_factionchange_quests"))
+        {
+            do
+            {
+                Field *fields2 = result2->Fetch();
+                uint32 quest_alliance = fields2[0].GetUInt32();
+                uint32 quest_horde = fields2[1].GetUInt32();
+                CharacterDatabase.PExecute("UPDATE IGNORE `character_queststatus` SET quest = '%u' WHERE quest = '%u' AND guid = '%u'",
+                    newTeam == TEAM_INDEX_ALLIANCE ? quest_alliance : quest_horde, newTeam == TEAM_INDEX_ALLIANCE ? quest_horde : quest_alliance, guid.GetCounter());
+            }
+            while (result2->NextRow());
+        }
+    }
+    CharacterDatabase.CommitTransaction();
+
+    if (deletedGuild)
+    {
+        Guild* guild = sGuildMgr.GetGuildById(deletedGuild);
+        if (guild)
+        {
+            guild->Disband();
+            delete guild;
+        }
+    }
+
+    std::string IP_str = GetRemoteAddress();
+    sLog.outChar("Account: %d (IP: %s), Character guid: %u Change Race/Faction to: %s", GetAccountId(), IP_str.c_str(), guid.GetCounter(), newname.c_str());
+
+    sWorld.InvalidatePlayer(guid);
+
+    WorldPacket data(SMSG_CHAR_FACTION_CHANGE, 1 + 8 + (newname.size() + 1) + 7);
+    data << uint8(RESPONSE_SUCCESS);
+    data << ObjectGuid(guid);
+    data << newname;
+    data << uint8(gender);
+    data << uint8(skin);
+    data << uint8(face);
+    data << uint8(hairStyle);
+    data << uint8(hairColor);
+    data << uint8(facialHair);
+    data << uint8(newRace);
+    SendPacket(&data);
+
+	sAccountMgr.ClearPlayerDataCache(guid);
+}
+
 void WorldSession::HandleCharCustomizeOpcode(WorldPacket& recv_data)
 {
     ObjectGuid guid;
@@ -1177,12 +1608,12 @@ void WorldSession::HandleCharCustomizeOpcode(WorldPacket& recv_data)
     {
         WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1);
         data << uint8(CHAR_NAME_RESERVED);
-        SendPacket( &data );
+        SendPacket(&data);
         return;
     }
 
     // character with this name already exist
-    ObjectGuid newguid = sObjectMgr.GetPlayerGuidByName(newname);
+    ObjectGuid newguid = sAccountMgr.GetPlayerGuidByName(newname);
     if (newguid && newguid != guid)
     {
         WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1);
@@ -1199,7 +1630,9 @@ void WorldSession::HandleCharCustomizeOpcode(WorldPacket& recv_data)
     std::string IP_str = GetRemoteAddress();
     sLog.outChar("Account: %d (IP: %s), Character %s customized to: %s", GetAccountId(), IP_str.c_str(), guid.GetString().c_str(), newname.c_str());
 
-    WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1+8+(newname.size()+1)+6);
+    sWorld.InvalidatePlayer(guid);
+
+    WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1 + 8 + (newname.size() + 1) + 6);
     data << uint8(RESPONSE_SUCCESS);
     data << ObjectGuid(guid);
     data << newname;
@@ -1210,9 +1643,11 @@ void WorldSession::HandleCharCustomizeOpcode(WorldPacket& recv_data)
     data << uint8(hairColor);
     data << uint8(facialHair);
     SendPacket(&data);
+
+	sAccountMgr.ClearPlayerDataCache(guid);
 }
 
-void WorldSession::HandleEquipmentSetSaveOpcode(WorldPacket &recv_data)
+void WorldSession::HandleEquipmentSetSaveOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_EQUIPMENT_SET_SAVE");
 
@@ -1226,7 +1661,7 @@ void WorldSession::HandleEquipmentSetSaveOpcode(WorldPacket &recv_data)
     recv_data >> name;
     recv_data >> iconName;
 
-    if(index >= MAX_EQUIPMENT_SET_INDEX)                    // client set slots amount
+    if (index >= MAX_EQUIPMENT_SET_INDEX)                   // client set slots amount
         return;
 
     EquipmentSet eqSet;
@@ -1236,7 +1671,7 @@ void WorldSession::HandleEquipmentSetSaveOpcode(WorldPacket &recv_data)
     eqSet.IconName  = iconName;
     eqSet.state     = EQUIPMENT_SET_NEW;
 
-    for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
+    for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
     {
         ObjectGuid itemGuid;
 
@@ -1250,12 +1685,12 @@ void WorldSession::HandleEquipmentSetSaveOpcode(WorldPacket &recv_data)
             continue;
         }
 
-        Item *item = _player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+        Item* item = _player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
 
-        if(!item && itemGuid)                               // cheating check 1
+        if (!item && itemGuid)                              // cheating check 1
             return;
 
-        if(item && item->GetObjectGuid() != itemGuid)       // cheating check 2
+        if (item && item->GetObjectGuid() != itemGuid)      // cheating check 2
             return;
 
         eqSet.Items[i] = itemGuid.GetCounter();
@@ -1264,7 +1699,7 @@ void WorldSession::HandleEquipmentSetSaveOpcode(WorldPacket &recv_data)
     _player->SetEquipmentSet(index, eqSet);
 }
 
-void WorldSession::HandleEquipmentSetDeleteOpcode(WorldPacket &recv_data)
+void WorldSession::HandleEquipmentSetDeleteOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_EQUIPMENT_SET_DELETE");
 
@@ -1275,12 +1710,12 @@ void WorldSession::HandleEquipmentSetDeleteOpcode(WorldPacket &recv_data)
     _player->DeleteEquipmentSet(setGuid.GetRawValue());
 }
 
-void WorldSession::HandleEquipmentSetUseOpcode(WorldPacket &recv_data)
+void WorldSession::HandleEquipmentSetUseOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_EQUIPMENT_SET_USE");
     recv_data.hexlike();
 
-    for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
+    for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
     {
         ObjectGuid itemGuid;
         uint8 srcbag, srcslot;
@@ -1294,22 +1729,22 @@ void WorldSession::HandleEquipmentSetUseOpcode(WorldPacket &recv_data)
         if (itemGuid.GetRawValue() == 1)
             continue;
 
-        Item *item = _player->GetItemByGuid(itemGuid);
+        Item* item = _player->GetItemByGuid(itemGuid);
 
         uint16 dstpos = i | (INVENTORY_SLOT_BAG_0 << 8);
 
-        if(!item)
+        if (!item)
         {
-            Item *uItem = _player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
-            if(!uItem)
+            Item* uItem = _player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+            if (!uItem)
                 continue;
 
             ItemPosCountVec sDest;
-            InventoryResult msg = _player->CanStoreItem( NULL_BAG, NULL_SLOT, sDest, uItem, false );
-            if(msg == EQUIP_ERR_OK)
+            InventoryResult msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, sDest, uItem, false);
+            if (msg == EQUIP_ERR_OK)
             {
                 _player->RemoveItem(INVENTORY_SLOT_BAG_0, i, true);
-                _player->StoreItem( sDest, uItem, true );
+                _player->StoreItem(sDest, uItem, true);
             }
             else
                 _player->SendEquipError(msg, uItem, NULL);
@@ -1317,7 +1752,7 @@ void WorldSession::HandleEquipmentSetUseOpcode(WorldPacket &recv_data)
             continue;
         }
 
-        if(item->GetPos() == dstpos)
+        if (item->GetPos() == dstpos)
             continue;
 
         _player->SwapItem(item->GetPos(), dstpos);
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index 01459ff788c..bd5684c69f1 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -66,7 +66,7 @@
 
 bool ChatHandler::load_command_table = true;
 
-ChatCommand * ChatHandler::getCommandTable()
+ChatCommand* ChatHandler::getCommandTable()
 {
     static ChatCommand accountSetCommandTable[] =
     {
@@ -76,6 +76,14 @@ ChatCommand * ChatHandler::getCommandTable()
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
 
+    static ChatCommand accountFriendCommandTable[] =
+    {
+        { "add"  ,          SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAccountFriendAddCommand,    "", NULL },
+        { "delete",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAccountFriendDeleteCommand, "", NULL },
+        { "list",           SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAccountFriendListCommand,   "", NULL },
+        { NULL,             0,                  false, NULL,                                           "", NULL }
+    };
+
     static ChatCommand accountCommandTable[] =
     {
         { "characters",     SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAccountCharactersCommand,   "", NULL },
@@ -84,6 +92,7 @@ ChatCommand * ChatHandler::getCommandTable()
         { "onlinelist",     SEC_CONSOLE,        true,  &ChatHandler::HandleAccountOnlineListCommand,   "", NULL },
         { "lock",           SEC_PLAYER,         true,  &ChatHandler::HandleAccountLockCommand,         "", NULL },
         { "set",            SEC_ADMINISTRATOR,  true,  NULL,                                           "", accountSetCommandTable },
+        { "friend",         SEC_ADMINISTRATOR,  true,  NULL,                                           "", accountFriendCommandTable },
         { "password",       SEC_PLAYER,         true,  &ChatHandler::HandleAccountPasswordCommand,     "", NULL },
         { "",               SEC_PLAYER,         true,  &ChatHandler::HandleAccountCommand,             "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
@@ -92,7 +101,7 @@ ChatCommand * ChatHandler::getCommandTable()
     static ChatCommand achievementCriteriaCommandTable[] =
     {
         { "add",            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAchievementCriteriaAddCommand,   "", NULL },
-        { "remove",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAchievementCriteriaRemoveCommand,"", NULL },
+        { "remove",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAchievementCriteriaRemoveCommand, "", NULL },
         { NULL,             0,                  true,  NULL,                                                "", NULL }
     };
 
@@ -111,9 +120,9 @@ ChatCommand * ChatHandler::getCommandTable()
         { "white",          SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_WHITE>, "", NULL },
         { "green",          SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_GREEN>, "", NULL },
         { "blue",           SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_BLUE>,  "", NULL },
-        { "purple",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_PURPLE>,"", NULL },
-        { "orange",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_ORANGE>,"", NULL },
-        { "yellow",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_YELLOW>,"", NULL },
+        { "purple",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_PURPLE>, "", NULL },
+        { "orange",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_ORANGE>, "", NULL },
+        { "yellow",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_YELLOW>, "", NULL },
         { "",               SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleAHBotItemsAmountCommand,      "", NULL },
         { NULL,             0,                  true,  NULL,                                             "", NULL }
     };
@@ -190,18 +199,20 @@ ChatCommand * ChatHandler::getCommandTable()
     static ChatCommand characterDeletedCommandTable[] =
     {
         { "delete",         SEC_CONSOLE,        true,  &ChatHandler::HandleCharacterDeletedDeleteCommand, "", NULL },
-        { "list",           SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleCharacterDeletedListCommand,"", NULL },
-        { "restore",        SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleCharacterDeletedRestoreCommand,"", NULL },
+        { "list",           SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleCharacterDeletedListCommand, "", NULL },
+        { "restore",        SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleCharacterDeletedRestoreCommand, "", NULL },
         { "old",            SEC_CONSOLE,        true,  &ChatHandler::HandleCharacterDeletedOldCommand, "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
 
     static ChatCommand characterCommandTable[] =
     {
-        { "achievements",   SEC_GAMEMASTER,     true,  &ChatHandler::HandleCharacterAchievementsCommand,"",NULL },
+        { "achievements",   SEC_GAMEMASTER,     true,  &ChatHandler::HandleCharacterAchievementsCommand, "", NULL },
         { "customize",      SEC_GAMEMASTER,     true,  &ChatHandler::HandleCharacterCustomizeCommand,  "", NULL },
         { "deleted",        SEC_GAMEMASTER,     true,  NULL,                                           "", characterDeletedCommandTable},
         { "erase",          SEC_CONSOLE,        true,  &ChatHandler::HandleCharacterEraseCommand,      "", NULL },
+        { "changefaction",  SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleCharacterChangeFactionCommand, "", NULL },
+        { "changerace",     SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleCharacterChangeRaceCommand, "", NULL },
         { "level",          SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleCharacterLevelCommand,      "", NULL },
         { "rename",         SEC_GAMEMASTER,     true,  &ChatHandler::HandleCharacterRenameCommand,     "", NULL },
         { "reputation",     SEC_GAMEMASTER,     true,  &ChatHandler::HandleCharacterReputationCommand, "", NULL },
@@ -231,6 +242,7 @@ ChatCommand * ChatHandler::getCommandTable()
         { "sellerror",      SEC_ADMINISTRATOR,  false, &ChatHandler::HandleDebugSendSellErrorCommand,       "", NULL },
         { "setphaseshift",  SEC_ADMINISTRATOR,  false, &ChatHandler::HandleDebugSendSetPhaseShiftCommand,   "", NULL },
         { "spellfail",      SEC_ADMINISTRATOR,  false, &ChatHandler::HandleDebugSendSpellFailCommand,       "", NULL },
+        { "calendarresult", SEC_ADMINISTRATOR,  false, &ChatHandler::HandleDebugSendCalendarResultCommand,  "", NULL },
         { NULL,             0,                  false, NULL,                                                "", NULL }
     };
 
@@ -253,7 +265,7 @@ ChatCommand * ChatHandler::getCommandTable()
         { "spellcheck",     SEC_CONSOLE,        true,  &ChatHandler::HandleDebugSpellCheckCommand,          "", NULL },
         { "spellcoefs",     SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleDebugSpellCoefsCommand,          "", NULL },
         { "spellmods",      SEC_ADMINISTRATOR,  false, &ChatHandler::HandleDebugSpellModsCommand,           "", NULL },
-        { "uws",            SEC_ADMINISTRATOR,  false, &ChatHandler::HandleDebugUpdateWorldStateCommand,    "", NULL },
+        { "entervehicle",   SEC_GAMEMASTER,     false, &ChatHandler::HandleDebugEnterVehicleCommand,        "", NULL },
         { NULL,             0,                  false, NULL,                                                "", NULL }
     };
 
@@ -340,7 +352,7 @@ ChatCommand * ChatHandler::getCommandTable()
         { "all_default",    SEC_MODERATOR,      false, &ChatHandler::HandleLearnAllDefaultCommand,     "", NULL },
         { "all_lang",       SEC_MODERATOR,      false, &ChatHandler::HandleLearnAllLangCommand,        "", NULL },
         { "all_myclass",    SEC_ADMINISTRATOR,  false, &ChatHandler::HandleLearnAllMyClassCommand,     "", NULL },
-        { "all_mypettalents",SEC_ADMINISTRATOR, false, &ChatHandler::HandleLearnAllMyPetTalentsCommand,"", NULL },
+        { "all_mypettalents", SEC_ADMINISTRATOR, false, &ChatHandler::HandleLearnAllMyPetTalentsCommand, "", NULL },
         { "all_myspells",   SEC_ADMINISTRATOR,  false, &ChatHandler::HandleLearnAllMySpellsCommand,    "", NULL },
         { "all_mytalents",  SEC_ADMINISTRATOR,  false, &ChatHandler::HandleLearnAllMyTalentsCommand,   "", NULL },
         { "all_recipes",    SEC_GAMEMASTER,     false, &ChatHandler::HandleLearnAllRecipesCommand,     "", NULL },
@@ -403,7 +415,31 @@ ChatCommand * ChatHandler::getCommandTable()
         { "loadedtiles",    SEC_GAMEMASTER,     false, &ChatHandler::HandleMmapLoadedTilesCommand,     "", NULL },
         { "stats",          SEC_GAMEMASTER,     false, &ChatHandler::HandleMmapStatsCommand,           "", NULL },
         { "testarea",       SEC_GAMEMASTER,     false, &ChatHandler::HandleMmapTestArea,               "", NULL },
-        { "",               SEC_ADMINISTRATOR,  false, &ChatHandler::HandleMmap,                       "", NULL },
+        { "on",             SEC_ADMINISTRATOR,  false, &ChatHandler::HandleMmapOn,                     "", NULL },
+        { "off",            SEC_ADMINISTRATOR,  false, &ChatHandler::HandleMmapOff,                    "", NULL },
+        { NULL,             0,                  false, NULL,                                           "", NULL }
+    };
+
+    static ChatCommand WSCommandTable[] =
+    {
+        { "list",           SEC_GAMEMASTER,     false, &ChatHandler::HandleWorldStateListCommand,      "", NULL },
+        { "global",         SEC_GAMEMASTER,     false, &ChatHandler::HandleWorldStateListAllCommand,   "", NULL },
+        { "add",            SEC_ADMINISTRATOR,  false, &ChatHandler::HandleWorldStateAddCommand,       "", NULL },
+        { "update",         SEC_ADMINISTRATOR,  false, &ChatHandler::HandleWorldStateUpdateCommand,    "", NULL },
+        { "reload",         SEC_ADMINISTRATOR,  false, &ChatHandler::HandleWorldStateReloadCommand,    "", NULL },
+        { "",               SEC_GAMEMASTER,     false, &ChatHandler::HandleWorldStateCommand,          "", NULL },
+        { NULL,             0,                  false, NULL,                                           "", NULL }
+    };
+
+    static ChatCommand transportCommandTable[] =
+    {
+        { "list",           SEC_ADMINISTRATOR,  false, &ChatHandler::HandleTransportListCommand,       "", NULL },
+        { "current",        SEC_ADMINISTRATOR,  false, &ChatHandler::HandleTransportCurrentCommand,    "", NULL },
+        { "path",           SEC_ADMINISTRATOR,  false, &ChatHandler::HandleTransportPathCommand,       "", NULL },
+        { "go",             SEC_ADMINISTRATOR,  false, &ChatHandler::HandleTransportGoCommand,         "", NULL },
+        { "start",          SEC_ADMINISTRATOR,  false, &ChatHandler::HandleTransportStartCommand,      "", NULL },
+        { "stop",           SEC_ADMINISTRATOR,  false, &ChatHandler::HandleTransportStopCommand,       "", NULL },
+        { "",               SEC_ADMINISTRATOR,  false, &ChatHandler::HandleTransportCommand,           "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
 
@@ -414,6 +450,7 @@ ChatCommand * ChatHandler::getCommandTable()
         { "rage",           SEC_MODERATOR,      false, &ChatHandler::HandleModifyRageCommand,          "", NULL },
         { "runicpower",     SEC_MODERATOR,      false, &ChatHandler::HandleModifyRunicPowerCommand,    "", NULL },
         { "energy",         SEC_MODERATOR,      false, &ChatHandler::HandleModifyEnergyCommand,        "", NULL },
+        { "powertype",      SEC_ADMINISTRATOR,  false, &ChatHandler::HandleModifyPowerTypeCommand,     "", NULL },
         { "money",          SEC_MODERATOR,      false, &ChatHandler::HandleModifyMoneyCommand,         "", NULL },
         { "speed",          SEC_MODERATOR,      false, &ChatHandler::HandleModifySpeedCommand,         "", NULL },
         { "swim",           SEC_MODERATOR,      false, &ChatHandler::HandleModifySwimCommand,          "", NULL },
@@ -500,7 +537,7 @@ ChatCommand * ChatHandler::getCommandTable()
     static ChatCommand reloadCommandTable[] =
     {
         { "all",            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadAllCommand,           "", NULL },
-        { "all_achievement",SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadAllAchievementCommand,"", NULL },
+        { "all_achievement", SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadAllAchievementCommand, "", NULL },
         { "all_area",       SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadAllAreaCommand,       "", NULL },
         { "all_eventai",    SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadAllEventAICommand,    "", NULL },
         { "all_gossips",    SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadAllGossipsCommand,    "", NULL },
@@ -513,10 +550,11 @@ ChatCommand * ChatHandler::getCommandTable()
         { "all_spell",      SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadAllSpellCommand,      "", NULL },
 
         { "config",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadConfigCommand,        "", NULL },
+        { "opcodes",        SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadOpcodesCommand,       "", NULL },
 
-        { "achievement_criteria_requirement",SEC_ADMINISTRATOR,true,&ChatHandler::HandleReloadAchievementCriteriaRequirementCommand,"",NULL },
+        { "achievement_criteria_requirement", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadAchievementCriteriaRequirementCommand, "", NULL },
         { "achievement_reward",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadAchievementRewardCommand,       "", NULL },
-        { "areatrigger_involvedrelation",SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadQuestAreaTriggersCommand,       "", NULL },
+        { "areatrigger_involvedrelation", SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadQuestAreaTriggersCommand,       "", NULL },
         { "areatrigger_tavern",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadAreaTriggerTavernCommand,       "", NULL },
         { "areatrigger_teleport",        SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadAreaTriggerTeleportCommand,     "", NULL },
         { "command",                     SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadCommandCommand,                 "", NULL },
@@ -525,28 +563,33 @@ ChatCommand * ChatHandler::getCommandTable()
         { "creature_ai_summons",         SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadEventAISummonsCommand,          "", NULL },
         { "creature_ai_texts",           SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadEventAITextsCommand,            "", NULL },
         { "creature_battleground",       SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadBattleEventCommand,             "", NULL },
-        { "creature_involvedrelation",   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadCreatureQuestInvRelationsCommand,"",NULL },
+        { "creature_template_classlevelstats", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadCreaturesStatsCommand,     "", NULL },
+        { "creature_involvedrelation",   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadCreatureQuestInvRelationsCommand, "", NULL },
         { "creature_loot_template",      SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesCreatureCommand,   "", NULL },
         { "creature_questrelation",      SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadCreatureQuestRelationsCommand,  "", NULL },
         { "db_script_string",            SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadDbScriptStringCommand,          "", NULL },
+        { "dbscripts_on_creature_death", SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadDBScriptsOnCreatureDeathCommand,"", NULL },
+        { "dbscripts_on_event",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadDBScriptsOnEventCommand,        "", NULL },
+        { "dbscripts_on_gossip",         SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadDBScriptsOnGossipCommand,       "", NULL },
+        { "dbscripts_on_go_use",         SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadDBScriptsOnGoUseCommand,        "", NULL },
+        { "dbscripts_on_quest_end",      SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadDBScriptsOnQuestEndCommand,     "", NULL },
+        { "dbscripts_on_quest_start",    SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadDBScriptsOnQuestStartCommand,   "", NULL },
+        { "dbscripts_on_spell",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadDBScriptsOnSpellCommand,        "", NULL },
         { "disenchant_loot_template",    SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesDisenchantCommand, "", NULL },
-        { "event_scripts",               SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadEventScriptsCommand,            "", NULL },
         { "fishing_loot_template",       SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesFishingCommand,    "", NULL },
         { "game_graveyard_zone",         SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadGameGraveyardZoneCommand,       "", NULL },
         { "game_tele",                   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadGameTeleCommand,                "", NULL },
         { "gameobject_involvedrelation", SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadGOQuestInvRelationsCommand,     "", NULL },
         { "gameobject_loot_template",    SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesGameobjectCommand, "", NULL },
         { "gameobject_questrelation",    SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadGOQuestRelationsCommand,        "", NULL },
-        { "gameobject_scripts",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadGameObjectScriptsCommand,       "", NULL },
         { "gameobject_battleground",     SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadBattleEventCommand,             "", NULL },
         { "gossip_menu",                 SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadGossipMenuCommand,              "", NULL },
         { "gossip_menu_option",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadGossipMenuCommand,              "", NULL },
-        { "gossip_scripts",              SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadGossipScriptsCommand,           "", NULL },
         { "item_convert",                SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadItemConvertCommand,             "", NULL },
         { "item_enchantment_template",   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadItemEnchantementsCommand,       "", NULL },
         { "item_loot_template",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesItemCommand,       "", NULL },
         { "item_required_target",        SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadItemRequiredTragetCommand,      "", NULL },
-        { "locales_achievement_reward",  SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesAchievementRewardCommand,"", NULL },
+        { "locales_achievement_reward",  SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesAchievementRewardCommand, "", NULL },
         { "locales_creature",            SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesCreatureCommand,         "", NULL },
         { "locales_gameobject",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesGameobjectCommand,       "", NULL },
         { "locales_gossip_menu_option",  SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesGossipMenuOptionCommand, "", NULL },
@@ -559,23 +602,20 @@ ChatCommand * ChatHandler::getCommandTable()
         { "mail_loot_template",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesMailCommand,       "", NULL },
         { "mangos_string",               SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadMangosStringCommand,            "", NULL },
         { "milling_loot_template",       SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesMillingCommand,    "", NULL },
-        { "npc_gossip",                  SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadNpcGossipCommand,               "", NULL },
         { "npc_text",                    SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadNpcTextCommand,                 "", NULL },
         { "npc_spellclick_spells",       SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSpellClickSpellsCommand,        "", NULL },
         { "npc_trainer",                 SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadNpcTrainerCommand,              "", NULL },
         { "npc_vendor",                  SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadNpcVendorCommand,               "", NULL },
         { "page_text",                   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadPageTextsCommand,               "", NULL },
-        { "pickpocketing_loot_template", SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesPickpocketingCommand,"",NULL},
+        { "pickpocketing_loot_template", SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesPickpocketingCommand, "", NULL},
         { "points_of_interest",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadPointsOfInterestCommand,        "", NULL },
-        { "prospecting_loot_template",   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesProspectingCommand,"", NULL },
-        { "quest_end_scripts",           SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadQuestEndScriptsCommand,         "", NULL },
+        { "prospecting_loot_template",   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesProspectingCommand, "", NULL },
         { "quest_poi",                   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadQuestPOICommand,                "", NULL },
-        { "quest_start_scripts",         SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadQuestStartScriptsCommand,       "", NULL },
         { "quest_template",              SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadQuestTemplateCommand,           "", NULL },
         { "reference_loot_template",     SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesReferenceCommand,  "", NULL },
         { "reserved_name",               SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadReservedNameCommand,            "", NULL },
         { "reputation_reward_rate",      SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadReputationRewardRateCommand,    "", NULL },
-        { "reputation_spillover_template",SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadReputationSpilloverTemplateCommand,"", NULL },
+        { "reputation_spillover_template", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadReputationSpilloverTemplateCommand, "", NULL },
         { "skill_discovery_template",    SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSkillDiscoveryTemplateCommand,  "", NULL },
         { "skill_extra_item_template",   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSkillExtraItemTemplateCommand,  "", NULL },
         { "skill_fishing_base_level",    SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSkillFishingBaseLevelCommand,   "", NULL },
@@ -590,9 +630,13 @@ ChatCommand * ChatHandler::getCommandTable()
         { "spell_proc_event",            SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSpellProcEventCommand,          "", NULL },
         { "spell_proc_item_enchant",     SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSpellProcItemEnchantCommand,    "", NULL },
         { "spell_script_target",         SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSpellScriptTargetCommand,       "", NULL },
-        { "spell_scripts",               SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSpellScriptsCommand,            "", NULL },
         { "spell_target_position",       SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSpellTargetPositionCommand,     "", NULL },
         { "spell_threats",               SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSpellThreatsCommand,            "", NULL },
+        { "spell_disabled",              SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSpellDisabledCommand,           "", NULL },
+        { "spell_linked",                SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSpellLinkedCommand,             "", NULL },
+        { "anticheat",                   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadAntiCheatCommand,               "", NULL },
+        { "worldstate",                  SEC_ADMINISTRATOR, true,  &ChatHandler::HandleWorldStateReloadCommand,              "", NULL },
+        { "spell_dbc",                   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadSpellDbcCommand,                "", NULL },
 
         { NULL,                          0,                 false, NULL,                                                     "", NULL }
     };
@@ -631,28 +675,28 @@ ChatCommand * ChatHandler::getCommandTable()
 
     static ChatCommand serverIdleRestartCommandTable[] =
     {
-        { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand,"", NULL },
+        { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand, "", NULL },
         { ""   ,            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerIdleRestartCommand,   "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
 
     static ChatCommand serverIdleShutdownCommandTable[] =
     {
-        { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand,"", NULL },
+        { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand, "", NULL },
         { ""   ,            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerIdleShutDownCommand,  "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
 
     static ChatCommand serverRestartCommandTable[] =
     {
-        { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand,"", NULL },
+        { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand, "", NULL },
         { ""   ,            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerRestartCommand,       "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
 
     static ChatCommand serverShutdownCommandTable[] =
     {
-        { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand,"", NULL },
+        { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand, "", NULL },
         { ""   ,            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCommand,      "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
@@ -736,7 +780,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "account",        SEC_PLAYER,         true,  NULL,                                           "", accountCommandTable  },
         { "achievement",    SEC_ADMINISTRATOR,  true,  NULL,                                           "", achievementCommandTable },
         { "auction",        SEC_ADMINISTRATOR,  false, NULL,                                           "", auctionCommandTable  },
-        { "ahbot",          SEC_ADMINISTRATOR,  true,  NULL,                                           "", ahbotCommandTable    },
         { "cast",           SEC_ADMINISTRATOR,  false, NULL,                                           "", castCommandTable     },
         { "character",      SEC_GAMEMASTER,     true,  NULL,                                           "", characterCommandTable},
         { "debug",          SEC_MODERATOR,      true,  NULL,                                           "", debugCommandTable    },
@@ -769,6 +812,7 @@ ChatCommand * ChatHandler::getCommandTable()
         { "notify",         SEC_MODERATOR,      true,  &ChatHandler::HandleNotifyCommand,              "", NULL },
         { "goname",         SEC_MODERATOR,      false, &ChatHandler::HandleGonameCommand,              "", NULL },
         { "namego",         SEC_MODERATOR,      false, &ChatHandler::HandleNamegoCommand,              "", NULL },
+        { "nameannounce",   SEC_MODERATOR,      false, &ChatHandler::HandleNameAnnounceCommand,        "", NULL },
         { "groupgo",        SEC_MODERATOR,      false, &ChatHandler::HandleGroupgoCommand,             "", NULL },
         { "commands",       SEC_PLAYER,         true,  &ChatHandler::HandleCommandsCommand,            "", NULL },
         { "demorph",        SEC_GAMEMASTER,     false, &ChatHandler::HandleDeMorphCommand,             "", NULL },
@@ -818,35 +862,42 @@ ChatCommand * ChatHandler::getCommandTable()
         { "cometome",       SEC_ADMINISTRATOR,  false, &ChatHandler::HandleComeToMeCommand,            "", NULL },
         { "damage",         SEC_ADMINISTRATOR,  false, &ChatHandler::HandleDamageCommand,              "", NULL },
         { "combatstop",     SEC_GAMEMASTER,     false, &ChatHandler::HandleCombatStopCommand,          "", NULL },
-        { "flusharenapoints",SEC_ADMINISTRATOR, false, &ChatHandler::HandleFlushArenaPointsCommand,    "", NULL },
+        { "flusharenapoints", SEC_ADMINISTRATOR, false, &ChatHandler::HandleFlushArenaPointsCommand,    "", NULL },
         { "repairitems",    SEC_GAMEMASTER,     true,  &ChatHandler::HandleRepairitemsCommand,         "", NULL },
         { "stable",         SEC_ADMINISTRATOR,  false, &ChatHandler::HandleStableCommand,              "", NULL },
         { "waterwalk",      SEC_GAMEMASTER,     false, &ChatHandler::HandleWaterwalkCommand,           "", NULL },
         { "quit",           SEC_CONSOLE,        true,  &ChatHandler::HandleQuitCommand,                "", NULL },
         { "gearscore",      SEC_ADMINISTRATOR,  false, &ChatHandler::HandleShowGearScoreCommand,       "", NULL },
         { "mmap",           SEC_GAMEMASTER,     false, NULL,                                           "", mmapCommandTable },
+        { "ws",             SEC_GAMEMASTER,     false, NULL,                                           "", WSCommandTable },
+        { "transport",      SEC_ADMINISTRATOR,  false, NULL,                                           "", transportCommandTable },
+        // Playerbot mod
+        { "bot",            SEC_PLAYER,         false, &ChatHandler::HandlePlayerbotCommand,           "", NULL },
+        { "rndbot",         SEC_CONSOLE,        true, &ChatHandler::HandlePlayerbotConsoleCommand,     "", NULL },
+        { "ahbot",          SEC_GAMEMASTER,     true, &ChatHandler::HandleAhBotCommand,                "", NULL },
 
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
 
-    if(load_command_table)
+    if (load_command_table)
     {
         load_command_table = false;
 
         // check hardcoded part integrity
         CheckIntegrity(commandTable, NULL);
 
-        QueryResult *result = WorldDatabase.Query("SELECT name,security,help FROM command");
+        QueryResult* result = WorldDatabase.Query("SELECT name,security,help FROM command");
         if (result)
         {
             do
             {
-                Field *fields = result->Fetch();
+                Field* fields = result->Fetch();
                 std::string name = fields[0].GetCppString();
 
                 SetDataForCommandInTable(commandTable, name.c_str(), fields[1].GetUInt16(), fields[2].GetCppString());
 
-            } while(result->NextRow());
+            }
+            while (result->NextRow());
             delete result;
         }
     }
@@ -860,12 +911,12 @@ ChatHandler::ChatHandler(Player* player) : m_session(player->GetSession()) {}
 
 ChatHandler::~ChatHandler() {}
 
-const char *ChatHandler::GetMangosString(int32 entry) const
+const char* ChatHandler::GetMangosString(int32 entry) const
 {
     return m_session->GetMangosString(entry);
 }
 
-const char *ChatHandler::GetOnOffStr(bool value) const
+const char* ChatHandler::GetOnOffStr(bool value) const
 {
     return value ?  GetMangosString(LANG_ON) : GetMangosString(LANG_OFF);
 }
@@ -899,16 +950,16 @@ bool ChatHandler::HasLowerSecurity(Player* target, ObjectGuid guid, bool strong)
     if (target)
         target_session = target->GetSession();
     else
-        target_account = sObjectMgr.GetPlayerAccountIdByGUID(guid);
+        target_account = sAccountMgr.GetPlayerAccountIdByGUID(guid);
 
-    if(!target_session && !target_account)
+    if (!target_session && !target_account)
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
         SetSentErrorMessage(true);
         return true;
     }
 
-    return HasLowerSecurityAccount(target_session,target_account,strong);
+    return HasLowerSecurityAccount(target_session, target_account, strong);
 }
 
 bool ChatHandler::HasLowerSecurityAccount(WorldSession* target, uint32 target_account, bool strong)
@@ -939,19 +990,19 @@ bool ChatHandler::HasLowerSecurityAccount(WorldSession* target, uint32 target_ac
 bool ChatHandler::hasStringAbbr(const char* name, const char* part)
 {
     // non "" command
-    if( *name )
+    if (*name)
     {
         // "" part from non-"" command
-        if( !*part )
+        if (!*part)
             return false;
 
-        for(;;)
+        for (;;)
         {
-            if( !*part )
+            if (!*part)
                 return true;
-            else if( !*name )
+            else if (!*name)
                 return false;
-            else if( tolower( *name ) != tolower( *part ) )
+            else if (tolower(*name) != tolower(*part))
                 return false;
             ++name; ++part;
         }
@@ -961,7 +1012,7 @@ bool ChatHandler::hasStringAbbr(const char* name, const char* part)
     return true;
 }
 
-void ChatHandler::SendSysMessage(const char *str)
+void ChatHandler::SendSysMessage(const char* str)
 {
     WorldPacket data;
 
@@ -969,16 +1020,16 @@ void ChatHandler::SendSysMessage(const char *str)
     char* buf = mangos_strdup(str);
     char* pos = buf;
 
-    while(char* line = LineFromMessage(pos))
+    while (char* line = LineFromMessage(pos))
     {
-        FillSystemMessageData(&data, line);
+        ChatHandler::BuildChatPacket(data, CHAT_MSG_SYSTEM, line, LANG_UNIVERSAL, CHAT_TAG_NONE, m_session->GetPlayer()->GetObjectGuid());
         m_session->SendPacket(&data);
     }
 
-    delete [] buf;
+    delete[] buf;
 }
 
-void ChatHandler::SendGlobalSysMessage(const char *str)
+void ChatHandler::SendGlobalSysMessage(const char* str)
 {
     // Chat output
     WorldPacket data;
@@ -986,14 +1037,36 @@ void ChatHandler::SendGlobalSysMessage(const char *str)
     // need copy to prevent corruption by strtok call in LineFromMessage original string
     char* buf = mangos_strdup(str);
     char* pos = buf;
+    ObjectGuid guid = m_session ? m_session->GetPlayer()->GetObjectGuid() : ObjectGuid();
 
-    while(char* line = LineFromMessage(pos))
+    while (char* line = LineFromMessage(pos))
     {
-        FillSystemMessageData(&data, line);
+        ChatHandler::BuildChatPacket(data, CHAT_MSG_SYSTEM, line, LANG_UNIVERSAL, CHAT_TAG_NONE, guid);
         sWorld.SendGlobalMessage(&data);
     }
 
-    delete [] buf;
+    delete[] buf;
+}
+
+void ChatHandler::PSendGlobalSysMessage(int32 entry, ...)
+{
+    const char *format = GetMangosString(entry);
+    va_list ap;
+    char str [2048];
+    va_start(ap, entry);
+    vsnprintf(str, 2048, format, ap);
+    va_end(ap);
+    SendGlobalSysMessage(str);
+}
+
+void ChatHandler::PSendGlobalSysMessage(const char *format, ...)
+{
+    va_list ap;
+    char str [2048];
+    va_start(ap, format);
+    vsnprintf(str, 2048, format, ap);
+    va_end(ap);
+    SendGlobalSysMessage(str);
 }
 
 void ChatHandler::SendSysMessage(int32 entry)
@@ -1003,7 +1076,7 @@ void ChatHandler::SendSysMessage(int32 entry)
 
 void ChatHandler::PSendSysMessage(int32 entry, ...)
 {
-    const char *format = GetMangosString(entry);
+    const char* format = GetMangosString(entry);
     va_list ap;
     char str [2048];
     va_start(ap, entry);
@@ -1012,7 +1085,7 @@ void ChatHandler::PSendSysMessage(int32 entry, ...)
     SendSysMessage(str);
 }
 
-void ChatHandler::PSendSysMessage(const char *format, ...)
+void ChatHandler::PSendSysMessage(const char* format, ...)
 {
     va_list ap;
     char str [2048];
@@ -1022,17 +1095,17 @@ void ChatHandler::PSendSysMessage(const char *format, ...)
     SendSysMessage(str);
 }
 
-void ChatHandler::CheckIntegrity( ChatCommand *table, ChatCommand *parentCommand )
+void ChatHandler::CheckIntegrity(ChatCommand* table, ChatCommand* parentCommand)
 {
-    for(uint32 i = 0; table[i].Name != NULL; ++i)
+    for (uint32 i = 0; table[i].Name != NULL; ++i)
     {
         ChatCommand* command = &table[i];
 
         if (parentCommand && command->SecurityLevel < parentCommand->SecurityLevel)
             sLog.outError("Subcommand '%s' of command '%s' have less access level (%u) that parent (%u)",
-                command->Name, parentCommand->Name, command->SecurityLevel, parentCommand->SecurityLevel);
+                          command->Name, parentCommand->Name, command->SecurityLevel, parentCommand->SecurityLevel);
 
-        if (!parentCommand && strlen(command->Name)==0)
+        if (!parentCommand && strlen(command->Name) == 0)
             sLog.outError("Subcommand '' at top level");
 
         if (command->ChildCommands)
@@ -1041,13 +1114,13 @@ void ChatHandler::CheckIntegrity( ChatCommand *table, ChatCommand *parentCommand
             {
                 if (parentCommand)
                     sLog.outError("Subcommand '%s' of command '%s' have handler and subcommands in same time, must be used '' subcommand for handler instead.",
-                        command->Name, parentCommand->Name);
+                                  command->Name, parentCommand->Name);
                 else
                     sLog.outError("First level command '%s' have handler and subcommands in same time, must be used '' subcommand for handler instead.",
-                        command->Name);
+                                  command->Name);
             }
 
-            if (parentCommand && strlen(command->Name)==0)
+            if (parentCommand && strlen(command->Name) == 0)
                 sLog.outError("Subcommand '' of command '%s' have subcommands", parentCommand->Name);
 
             CheckIntegrity(command->ChildCommands, command);
@@ -1056,10 +1129,10 @@ void ChatHandler::CheckIntegrity( ChatCommand *table, ChatCommand *parentCommand
         {
             if (parentCommand)
                 sLog.outError("Subcommand '%s' of command '%s' not have handler and subcommands in same time. Must have some from its!",
-                    command->Name, parentCommand->Name);
+                              command->Name, parentCommand->Name);
             else
                 sLog.outError("First level command '%s' not have handler and subcommands in same time. Must have some from its!",
-                    command->Name);
+                              command->Name);
         }
     }
 }
@@ -1109,7 +1182,7 @@ ChatCommand const* ChatHandler::FindCommand(char const* text)
  *                              parentCommand have parent of command in command arg or NULL
  *                              cmdNamePtr store command name that not found as it extracted from command line
  */
-ChatCommandSearchResult ChatHandler::FindCommand(ChatCommand* table, char const* &text, ChatCommand*& command, ChatCommand** parentCommand /*= NULL*/, std::string* cmdNamePtr /*= NULL*/, bool allAvailable /*= false*/, bool exactlyName /*= false*/)
+ChatCommandSearchResult ChatHandler::FindCommand(ChatCommand* table, char const*& text, ChatCommand*& command, ChatCommand** parentCommand /*= NULL*/, std::string* cmdNamePtr /*= NULL*/, bool allAvailable /*= false*/, bool exactlyName /*= false*/)
 {
     std::string cmd = "";
 
@@ -1123,12 +1196,12 @@ ChatCommandSearchResult ChatHandler::FindCommand(ChatCommand* table, char const*
     while (*text == ' ') ++text;
 
     // search first level command in table
-    for(uint32 i = 0; table[i].Name != NULL; ++i)
+    for (uint32 i = 0; table[i].Name != NULL; ++i)
     {
         if (exactlyName)
         {
             size_t len = strlen(table[i].Name);
-            if (strncmp(table[i].Name, cmd.c_str(), len+1) != 0)
+            if (strncmp(table[i].Name, cmd.c_str(), len + 1) != 0)
                 continue;
         }
         else
@@ -1143,7 +1216,7 @@ ChatCommandSearchResult ChatHandler::FindCommand(ChatCommand* table, char const*
             ChatCommand* parentSubcommand = NULL;
             ChatCommandSearchResult res = FindCommand(table[i].ChildCommands, text, command, &parentSubcommand, cmdNamePtr, allAvailable, exactlyName);
 
-            switch(res)
+            switch (res)
             {
                 case CHAT_COMMAND_OK:
                 {
@@ -1152,7 +1225,7 @@ ChatCommandSearchResult ChatHandler::FindCommand(ChatCommand* table, char const*
                         *parentCommand = parentSubcommand ? parentSubcommand : &table[i];
 
                     // Name == "" is special case: restore original command text for next level "" (where parentSubcommand==NULL)
-                    if (strlen(command->Name)==0 && !parentSubcommand)
+                    if (strlen(command->Name) == 0 && !parentSubcommand)
                         text = oldchildtext;
 
                     return CHAT_COMMAND_OK;
@@ -1228,7 +1301,7 @@ void ChatHandler::ExecuteCommand(const char* text)
 
     ChatCommandSearchResult res = FindCommand(getCommandTable(), text, command, &parentCommand);
 
-    switch(res)
+    switch (res)
     {
         case CHAT_COMMAND_OK:
         {
@@ -1246,7 +1319,7 @@ void ChatHandler::ExecuteCommand(const char* text)
                 else
                     SendSysMessage(LANG_CMD_SYNTAX);
 
-                if (ChatCommand* showCommand = (strlen(command->Name)==0 && parentCommand ? parentCommand : command))
+                if (ChatCommand* showCommand = (strlen(command->Name) == 0 && parentCommand ? parentCommand : command))
                     if (ChatCommand* childs = showCommand->ChildCommands)
                         ShowHelpForSubCommands(childs, showCommand->Name);
 
@@ -1257,7 +1330,7 @@ void ChatHandler::ExecuteCommand(const char* text)
         case CHAT_COMMAND_UNKNOWN_SUBCOMMAND:
         {
             SendSysMessage(LANG_NO_SUBCMD);
-            ShowHelpForCommand(command->ChildCommands,text);
+            ShowHelpForCommand(command->ChildCommands, text);
             SetSentErrorMessage(true);
             break;
         }
@@ -1282,7 +1355,7 @@ void ChatHandler::ExecuteCommand(const char* text)
  *
  * All problems found while command search and updated output as to DB errors log
  */
-bool ChatHandler::SetDataForCommandInTable(ChatCommand *commandTable, const char* text, uint32 security, std::string const& help)
+bool ChatHandler::SetDataForCommandInTable(ChatCommand* commandTable, const char* text, uint32 security, std::string const& help)
 {
     std::string fullcommand = text;                         // original `text` can't be used. It content destroyed in command code processing.
 
@@ -1291,13 +1364,13 @@ bool ChatHandler::SetDataForCommandInTable(ChatCommand *commandTable, const char
 
     ChatCommandSearchResult res = FindCommand(commandTable, text, command, NULL, &cmdName, true, true);
 
-    switch(res)
+    switch (res)
     {
         case CHAT_COMMAND_OK:
         {
             if (command->SecurityLevel != security)
                 DETAIL_LOG("Table `command` overwrite for command '%s' default security (%u) by %u",
-                    fullcommand.c_str(),command->SecurityLevel,security);
+                           fullcommand.c_str(), command->SecurityLevel, security);
 
             command->SecurityLevel = security;
             command->Help          = help;
@@ -1327,13 +1400,13 @@ bool ChatHandler::ParseCommands(const char* text)
     MANGOS_ASSERT(text);
     MANGOS_ASSERT(*text);
 
-    //if(m_session->GetSecurity() == SEC_PLAYER)
-    //    return false;
-
     /// chat case (.command or !command format)
     if (m_session)
     {
-        if(text[0] != '!' && text[0] != '.')
+        if (m_session->GetSecurity() == SEC_PLAYER && !sWorld.getConfig(CONFIG_BOOL_PLAYER_COMMANDS))
+            return false;
+
+        if (text[0] != '!' && text[0] != '.')
             return false;
 
         /// ignore single . and ! in line
@@ -1354,7 +1427,7 @@ bool ChatHandler::ParseCommands(const char* text)
     return true;
 }
 
-bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd)
+bool ChatHandler::ShowHelpForSubCommands(ChatCommand* table, char const* cmd)
 {
     std::string list;
     for (uint32 i = 0; table[i].Name != NULL; ++i)
@@ -1390,7 +1463,7 @@ bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd)
     return true;
 }
 
-bool ChatHandler::ShowHelpForCommand(ChatCommand *table, const char* cmd)
+bool ChatHandler::ShowHelpForCommand(ChatCommand* table, const char* cmd)
 {
     char const* oldCmd = cmd;
     ChatCommand* command = NULL;
@@ -1401,7 +1474,7 @@ bool ChatHandler::ShowHelpForCommand(ChatCommand *table, const char* cmd)
 
     ChatCommandSearchResult res = FindCommand(table, cmd, command, &parentCommand);
 
-    switch(res)
+    switch (res)
     {
         case CHAT_COMMAND_OK:
         {
@@ -1443,22 +1516,22 @@ bool ChatHandler::ShowHelpForCommand(ChatCommand *table, const char* cmd)
 
 bool ChatHandler::isValidChatMessage(const char* message)
 {
-/*
+    /*
 
-valid examples:
-|cffa335ee|Hitem:812:0:0:0:0:0:0:0:70|h[Glowing Brightwood Staff]|h|r
-|cff808080|Hquest:2278:47|h[The Platinum Discs]|h|r
-|cffffd000|Htrade:4037:1:150:1:6AAAAAAAAAAAAAAAAAAAAAAOAADAAAAAAAAAAAAAAAAIAAAAAAAAA|h[Engineering]|h|r
-|cff4e96f7|Htalent:2232:-1|h[Taste for Blood]|h|r
-|cff71d5ff|Hspell:21563|h[Command]|h|r
-|cffffd000|Henchant:3919|h[Engineering: Rough Dynamite]|h|r
-|cffffff00|Hachievement:546:0000000000000001:0:0:0:-1:0:0:0:0|h[Safe Deposit]|h|r
-|cff66bbff|Hglyph:21:762|h[Glyph of Bladestorm]|h|r
+    valid examples:
+    |cffa335ee|Hitem:812:0:0:0:0:0:0:0:70|h[Glowing Brightwood Staff]|h|r
+    |cff808080|Hquest:2278:47|h[The Platinum Discs]|h|r
+    |cffffd000|Htrade:4037:1:150:1:6AAAAAAAAAAAAAAAAAAAAAAOAADAAAAAAAAAAAAAAAAIAAAAAAAAA|h[Engineering]|h|r
+    |cff4e96f7|Htalent:2232:-1|h[Taste for Blood]|h|r
+    |cff71d5ff|Hspell:21563|h[Command]|h|r
+    |cffffd000|Henchant:3919|h[Engineering: Rough Dynamite]|h|r
+    |cffffff00|Hachievement:546:0000000000000001:0:0:0:-1:0:0:0:0|h[Safe Deposit]|h|r
+    |cff66bbff|Hglyph:21:762|h[Glyph of Bladestorm]|h|r
 
-| will be escaped to ||
-*/
+    | will be escaped to ||
+    */
 
-    if(strlen(message) > 255)
+    if (strlen(message) > 255)
         return false;
 
     const char validSequence[6] = "cHhhr";
@@ -1469,31 +1542,31 @@ valid examples:
     {
         const std::string validCommands = "cHhr|";
 
-        while(*message)
+        while (*message)
         {
             // find next pipe command
             message = strchr(message, '|');
 
-            if(!message)
+            if (!message)
                 return true;
 
             ++message;
             char commandChar = *message;
-            if(validCommands.find(commandChar) == std::string::npos)
+            if (validCommands.find(commandChar) == std::string::npos)
                 return false;
 
             ++message;
             // validate sequence
-            if(sWorld.getConfig(CONFIG_UINT32_CHAT_STRICT_LINK_CHECKING_SEVERITY) == 2)
+            if (sWorld.getConfig(CONFIG_UINT32_CHAT_STRICT_LINK_CHECKING_SEVERITY) == 2)
             {
-                if(commandChar == *validSequenceIterator)
+                if (commandChar == *validSequenceIterator)
                 {
-                    if (validSequenceIterator == validSequence+4)
+                    if (validSequenceIterator == validSequence + 4)
                         validSequenceIterator = validSequence;
                     else
                         ++validSequenceIterator;
                 }
-                else if(commandChar != '|')
+                else if (commandChar != '|')
                     return false;
             }
         }
@@ -1507,12 +1580,12 @@ valid examples:
 
     ItemPrototype const* linkedItem = NULL;
     Quest const* linkedQuest = NULL;
-    SpellEntry const *linkedSpell= NULL;
+    SpellEntry const* linkedSpell = NULL;
     AchievementEntry const* linkedAchievement = NULL;
     ItemRandomPropertiesEntry const* itemProperty = NULL;
     ItemRandomSuffixEntry const* itemSuffix = NULL;
 
-    while(!reader.eof())
+    while (!reader.eof())
     {
         if (validSequence == validSequenceIterator)
         {
@@ -1525,14 +1598,14 @@ valid examples:
 
             reader.ignore(255, '|');
         }
-        else if(reader.get() != '|')
+        else if (reader.get() != '|')
         {
             DEBUG_LOG("ChatHandler::isValidChatMessage sequence aborted unexpectedly");
             return false;
         }
 
         // pipe has always to be followed by at least one char
-        if ( reader.peek() == '\0')
+        if (reader.peek() == '\0')
         {
             DEBUG_LOG("ChatHandler::isValidChatMessage pipe followed by \\0");
             return false;
@@ -1548,9 +1621,9 @@ valid examples:
         // | in normal messages is escaped by ||
         if (commandChar != '|')
         {
-            if(commandChar == *validSequenceIterator)
+            if (commandChar == *validSequenceIterator)
             {
-                if (validSequenceIterator == validSequence+4)
+                if (validSequenceIterator == validSequence + 4)
                     validSequenceIterator = validSequence;
                 else
                     ++validSequenceIterator;
@@ -1561,7 +1634,7 @@ valid examples:
                 return false;
             }
         }
-        else if(validSequence != validSequenceIterator)
+        else if (validSequence != validSequenceIterator)
         {
             // no escaped pipes in sequences
             DEBUG_LOG("ChatHandler::isValidChatMessage got escaped pipe in sequence");
@@ -1573,7 +1646,7 @@ valid examples:
             case 'c':
                 color = 0;
                 // validate color, expect 8 hex chars
-                for(int i=0; i<8; i++)
+                for (int i = 0; i < 8; ++i)
                 {
                     char c;
                     reader >> c;
@@ -1585,14 +1658,14 @@ valid examples:
 
                     color <<= 4;
                     // check for hex char
-                    if (c >= '0' && c <='9')
+                    if (c >= '0' && c <= '9')
                     {
-                        color |= c-'0';
+                        color |= c - '0';
                         continue;
                     }
-                    if (c >= 'a' && c <='f')
+                    if (c >= 'a' && c <= 'f')
                     {
-                        color |= 10+c-'a';
+                        color |= 10 + c - 'a';
                         continue;
                     }
                     DEBUG_LOG("ChatHandler::isValidChatMessage got non hex char '%c' while reading color", c);
@@ -1613,7 +1686,7 @@ valid examples:
                         return false;
 
                     linkedItem = ObjectMgr::GetItemPrototype(atoi(buffer));
-                    if(!linkedItem)
+                    if (!linkedItem)
                     {
                         DEBUG_LOG("ChatHandler::isValidChatMessage got invalid itemID %u in |item command", atoi(buffer));
                         return false;
@@ -1622,7 +1695,7 @@ valid examples:
                     if (color != ItemQualityColors[linkedItem->Quality])
                     {
                         DEBUG_LOG("ChatHandler::isValidChatMessage linked item has color %u, but user claims %u", ItemQualityColors[linkedItem->Quality],
-                                color);
+                                  color);
                         return false;
                     }
 
@@ -1634,17 +1707,18 @@ valid examples:
                     int32 propertyId = 0;
                     bool negativeNumber = false;
                     char c;
-                    for(uint8 i=0; i < randomPropertyPosition; ++i)
+                    for (uint8 i = 0; i < randomPropertyPosition; ++i)
                     {
                         propertyId = 0;
                         negativeNumber = false;
-                        while((c = reader.get()) != ':')
+                        while ((c = reader.get()) != ':')
                         {
-                            if (c >='0' && c<='9')
+                            if (c >= '0' && c <= '9')
                             {
-                                propertyId*=10;
-                                propertyId += c-'0';
-                            } else if(c == '-')
+                                propertyId *= 10;
+                                propertyId += c - '0';
+                            }
+                            else if (c == '-')
                                 negativeNumber = true;
                             else
                                 return false;
@@ -1667,7 +1741,7 @@ valid examples:
                     }
 
                     // ignore other integers
-                    while ((c >= '0' && c <= '9') || c== ':')
+                    while ((c >= '0' && c <= '9') || c == ':')
                     {
                         reader.ignore(1);
                         c = reader.peek();
@@ -1676,14 +1750,14 @@ valid examples:
                 else if (strcmp(buffer, "quest") == 0)
                 {
                     // no color check for questlinks, each client will adapt it anyway
-                    uint32 questid= 0;
+                    uint32 questid = 0;
                     // read questid
                     char c = reader.peek();
-                    while(c >='0' && c<='9')
+                    while (c >= '0' && c <= '9')
                     {
                         reader.ignore(1);
                         questid *= 10;
-                        questid += c-'0';
+                        questid += c - '0';
                         c = reader.peek();
                     }
 
@@ -1695,7 +1769,7 @@ valid examples:
                         return false;
                     }
 
-                    if (c !=':')
+                    if (c != ':')
                     {
                         DEBUG_LOG("ChatHandler::isValidChatMessage Invalid quest link structure");
                         return false;
@@ -1705,11 +1779,11 @@ valid examples:
                     c = reader.peek();
                     // level
                     uint32 questlevel = 0;
-                    while(c >='0' && c<='9')
+                    while (c >= '0' && c <= '9')
                     {
                         reader.ignore(1);
                         questlevel *= 10;
-                        questlevel += c-'0';
+                        questlevel += c - '0';
                         c = reader.peek();
                     }
 
@@ -1719,15 +1793,15 @@ valid examples:
                         return false;
                     }
 
-                    if (c !='|')
+                    if (c != '|')
                     {
                         DEBUG_LOG("ChatHandler::isValidChatMessage Invalid quest link structure");
                         return false;
                     }
                 }
-                else if(strcmp(buffer, "trade") == 0)
+                else if (strcmp(buffer, "trade") == 0)
                 {
-                    if(color != CHAT_LINK_COLOR_TRADE)
+                    if (color != CHAT_LINK_COLOR_TRADE)
                         return false;
 
                     // read spell entry
@@ -1741,16 +1815,16 @@ valid examples:
 
                     char c = reader.peek();
                     // base64 encoded stuff
-                    while(c !='|' && c!='\0')
+                    while (c != '|' && c != '\0')
                     {
                         reader.ignore(1);
                         c = reader.peek();
                     }
                 }
-                else if(strcmp(buffer, "talent") == 0)
+                else if (strcmp(buffer, "talent") == 0)
                 {
                     // talent links are always supposed to be blue
-                    if(color != CHAT_LINK_COLOR_TALENT)
+                    if (color != CHAT_LINK_COLOR_TALENT)
                         return false;
 
                     // read talent entry
@@ -1758,7 +1832,7 @@ valid examples:
                     if (reader.eof())                       // : must be
                         return false;
 
-                    TalentEntry const *talentInfo = sTalentStore.LookupEntry(atoi(buffer));
+                    TalentEntry const* talentInfo = sTalentStore.LookupEntry(atoi(buffer));
                     if (!talentInfo)
                         return false;
 
@@ -1768,13 +1842,13 @@ valid examples:
 
                     char c = reader.peek();
                     // skillpoints? whatever, drop it
-                    while(c !='|' && c!='\0')
+                    while (c != '|' && c != '\0')
                     {
                         reader.ignore(1);
                         c = reader.peek();
                     }
                 }
-                else if(strcmp(buffer, "spell") == 0)
+                else if (strcmp(buffer, "spell") == 0)
                 {
                     if (color != CHAT_LINK_COLOR_SPELL)
                         return false;
@@ -1782,18 +1856,18 @@ valid examples:
                     uint32 spellid = 0;
                     // read spell entry
                     char c = reader.peek();
-                    while(c >='0' && c<='9')
+                    while (c >= '0' && c <= '9')
                     {
                         reader.ignore(1);
                         spellid *= 10;
-                        spellid += c-'0';
+                        spellid += c - '0';
                         c = reader.peek();
                     }
                     linkedSpell = sSpellStore.LookupEntry(spellid);
                     if (!linkedSpell)
                         return false;
                 }
-                else if(strcmp(buffer, "enchant") == 0)
+                else if (strcmp(buffer, "enchant") == 0)
                 {
                     if (color != CHAT_LINK_COLOR_ENCHANT)
                         return false;
@@ -1801,18 +1875,18 @@ valid examples:
                     uint32 spellid = 0;
                     // read spell entry
                     char c = reader.peek();
-                    while(c >='0' && c<='9')
+                    while (c >= '0' && c <= '9')
                     {
                         reader.ignore(1);
                         spellid *= 10;
-                        spellid += c-'0';
+                        spellid += c - '0';
                         c = reader.peek();
                     }
                     linkedSpell = sSpellStore.LookupEntry(spellid);
                     if (!linkedSpell)
                         return false;
                 }
-                else if(strcmp(buffer, "achievement") == 0)
+                else if (strcmp(buffer, "achievement") == 0)
                 {
                     if (color != CHAT_LINK_COLOR_ACHIEVEMENT)
                         return false;
@@ -1829,15 +1903,15 @@ valid examples:
 
                     char c = reader.peek();
                     // skip progress
-                    while(c !='|' && c != '\0')
+                    while (c != '|' && c != '\0')
                     {
                         reader.ignore(1);
                         c = reader.peek();
                     }
                 }
-                else if(strcmp(buffer, "glyph") == 0)
+                else if (strcmp(buffer, "glyph") == 0)
                 {
-                    if(color != CHAT_LINK_COLOR_GLYPH)
+                    if (color != CHAT_LINK_COLOR_GLYPH)
                         return false;
 
                     // first id is slot, drop it
@@ -1847,10 +1921,10 @@ valid examples:
 
                     uint32 glyphId = 0;
                     char c = reader.peek();
-                    while(c>='0' && c <='9')
+                    while (c >= '0' && c <= '9')
                     {
                         glyphId *= 10;
-                        glyphId += c-'0';
+                        glyphId += c - '0';
                         reader.ignore(1);
                         c = reader.peek();
                     }
@@ -1896,33 +1970,33 @@ valid examples:
                                 return false;
                             }
 
-                            SkillLineAbilityEntry const *skillInfo = bounds.first->second;
+                            SkillLineAbilityEntry const* skillInfo = bounds.first->second;
 
                             if (!skillInfo)
                             {
                                 return false;
                             }
 
-                            SkillLineEntry const *skillLine = sSkillLineStore.LookupEntry(skillInfo->skillId);
+                            SkillLineEntry const* skillLine = sSkillLineStore.LookupEntry(skillInfo->skillId);
                             if (!skillLine)
                             {
                                 return false;
                             }
 
-                            for(uint8 i=0; i < MAX_LOCALE; ++i)
+                            for (uint8 i = 0; i < MAX_LOCALE; ++i)
                             {
                                 uint32 skillLineNameLength = strlen(skillLine->name[i]);
                                 if (skillLineNameLength > 0 && strncmp(skillLine->name[i], buffer, skillLineNameLength) == 0)
                                 {
                                     // found the prefix, remove it to perform spellname validation below
                                     // -2 = strlen(": ")
-                                    uint32 spellNameLength = strlen(buffer)-skillLineNameLength-2;
-                                    memmove(buffer, buffer+skillLineNameLength+2, spellNameLength+1);
+                                    uint32 spellNameLength = strlen(buffer) - skillLineNameLength - 2;
+                                    memmove(buffer, buffer + skillLineNameLength + 2, spellNameLength + 1);
                                 }
                             }
                         }
                         bool foundName = false;
-                        for(uint8 i=0; i<MAX_LOCALE; ++i)
+                        for (uint8 i = 0; i < MAX_LOCALE; ++i)
                         {
                             if (*linkedSpell->SpellName[i] && strcmp(linkedSpell->SpellName[i], buffer) == 0)
                             {
@@ -1937,7 +2011,7 @@ valid examples:
                     {
                         if (linkedQuest->GetTitle() != buffer)
                         {
-                            QuestLocale const *ql = sObjectMgr.GetQuestLocale(linkedQuest->GetQuestId());
+                            QuestLocale const* ql = sObjectMgr.GetQuestLocale(linkedQuest->GetQuestId());
 
                             if (!ql)
                             {
@@ -1946,7 +2020,7 @@ valid examples:
                             }
 
                             bool foundName = false;
-                            for(uint8 i=0; i < ql->Title.size(); ++i)
+                            for (uint8 i = 0; i < ql->Title.size(); ++i)
                             {
                                 if (ql->Title[i] == buffer)
                                 {
@@ -1961,9 +2035,9 @@ valid examples:
                             }
                         }
                     }
-                    else if(linkedItem)
+                    else if (linkedItem)
                     {
-                        char* const* suffix = itemSuffix?itemSuffix->nameSuffix:(itemProperty?itemProperty->nameSuffix:NULL);
+                        char* const* suffix = itemSuffix ? itemSuffix->nameSuffix : (itemProperty ? itemProperty->nameSuffix : NULL);
 
                         std::string expectedName = std::string(linkedItem->Name1);
                         if (suffix)
@@ -1974,10 +2048,10 @@ valid examples:
 
                         if (expectedName != buffer)
                         {
-                            ItemLocale const *il = sObjectMgr.GetItemLocale(linkedItem->ItemId);
+                            ItemLocale const* il = sObjectMgr.GetItemLocale(linkedItem->ItemId);
 
                             bool foundName = false;
-                            for(uint8 i=LOCALE_koKR; i<MAX_LOCALE; ++i)
+                            for (uint8 i = LOCALE_koKR; i < MAX_LOCALE; ++i)
                             {
                                 int8 dbIndex = sObjectMgr.GetIndexForLocale(LocaleConstant(i));
                                 if (dbIndex == -1 || il == NULL || (size_t)dbIndex >= il->Name.size())
@@ -1990,7 +2064,7 @@ valid examples:
                                     expectedName += " ";
                                     expectedName += suffix[i];
                                 }
-                                if ( expectedName == buffer)
+                                if (expectedName == buffer)
                                 {
                                     foundName = true;
                                     break;
@@ -2006,7 +2080,7 @@ valid examples:
                     else if (linkedAchievement)
                     {
                         bool foundName = false;
-                        for(uint8 i=0; i<MAX_LOCALE; ++i)
+                        for (uint8 i = 0; i < MAX_LOCALE; ++i)
                         {
                             if (*linkedAchievement->name[i] && strcmp(linkedAchievement->name[i], buffer) == 0)
                             {
@@ -2034,96 +2108,15 @@ valid examples:
     }
 
     // check if every opened sequence was also closed properly
-    if(validSequence != validSequenceIterator)
+    if (validSequence != validSequenceIterator)
         DEBUG_LOG("ChatHandler::isValidChatMessage EOF in active sequence");
 
     return validSequence == validSequenceIterator;
 }
 
-//Note: target_guid used only in CHAT_MSG_WHISPER_INFORM mode (in this case channelName ignored)
-void ChatHandler::FillMessageData( WorldPacket *data, WorldSession* session, uint8 type, uint32 language, const char *channelName, ObjectGuid targetGuid, const char *message, Unit *speaker)
+Player* ChatHandler::getSelectedPlayer()
 {
-    uint32 messageLength = (message ? strlen(message) : 0) + 1;
-
-    data->Initialize(SMSG_MESSAGECHAT, 100);                // guess size
-    *data << uint8(type);
-    if ((type != CHAT_MSG_CHANNEL && type != CHAT_MSG_WHISPER) || language == LANG_ADDON)
-        *data << uint32(language);
-    else
-        *data << uint32(LANG_UNIVERSAL);
-
-    switch(type)
-    {
-        case CHAT_MSG_SAY:
-        case CHAT_MSG_PARTY:
-        case CHAT_MSG_PARTY_LEADER:
-        case CHAT_MSG_RAID:
-        case CHAT_MSG_GUILD:
-        case CHAT_MSG_OFFICER:
-        case CHAT_MSG_YELL:
-        case CHAT_MSG_WHISPER:
-        case CHAT_MSG_CHANNEL:
-        case CHAT_MSG_RAID_LEADER:
-        case CHAT_MSG_RAID_WARNING:
-        case CHAT_MSG_BG_SYSTEM_NEUTRAL:
-        case CHAT_MSG_BG_SYSTEM_ALLIANCE:
-        case CHAT_MSG_BG_SYSTEM_HORDE:
-        case CHAT_MSG_BATTLEGROUND:
-        case CHAT_MSG_BATTLEGROUND_LEADER:
-            targetGuid = session ? session->GetPlayer()->GetObjectGuid() : ObjectGuid();
-            break;
-        case CHAT_MSG_MONSTER_SAY:
-        case CHAT_MSG_MONSTER_PARTY:
-        case CHAT_MSG_MONSTER_YELL:
-        case CHAT_MSG_MONSTER_WHISPER:
-        case CHAT_MSG_MONSTER_EMOTE:
-        case CHAT_MSG_RAID_BOSS_WHISPER:
-        case CHAT_MSG_RAID_BOSS_EMOTE:
-        case CHAT_MSG_BATTLENET:
-        {
-            *data << ObjectGuid(speaker->GetObjectGuid());
-            *data << uint32(0);                             // 2.1.0
-            *data << uint32(strlen(speaker->GetName()) + 1);
-            *data << speaker->GetName();
-            ObjectGuid listener_guid;
-            *data << listener_guid;
-            if (listener_guid && !listener_guid.IsPlayer())
-            {
-                *data << uint32(1);                         // string listener_name_length
-                *data << uint8(0);                          // string listener_name
-            }
-            *data << uint32(messageLength);
-            *data << message;
-            *data << uint8(0);
-            return;
-        }
-        default:
-            if (type != CHAT_MSG_WHISPER_INFORM && type != CHAT_MSG_IGNORED && type != CHAT_MSG_DND && type != CHAT_MSG_AFK)
-                targetGuid.Clear();                         // only for CHAT_MSG_WHISPER_INFORM used original value target_guid
-            break;
-    }
-
-    *data << ObjectGuid(targetGuid);                        // there 0 for BG messages
-    *data << uint32(0);                                     // can be chat msg group or something
-
-    if (type == CHAT_MSG_CHANNEL)
-    {
-        MANGOS_ASSERT(channelName);
-        *data << channelName;
-    }
-
-    *data << ObjectGuid(targetGuid);
-    *data << uint32(messageLength);
-    *data << message;
-    if(session != 0 && type != CHAT_MSG_WHISPER_INFORM && type != CHAT_MSG_DND && type != CHAT_MSG_AFK)
-        *data << uint8(session->GetPlayer()->chatTag());
-    else
-        *data << uint8(0);
-}
-
-Player * ChatHandler::getSelectedPlayer()
-{
-    if(!m_session)
+    if (!m_session)
         return NULL;
 
     ObjectGuid guid  = m_session->GetPlayer()->GetSelectionGuid();
@@ -2136,7 +2129,7 @@ Player * ChatHandler::getSelectedPlayer()
 
 Unit* ChatHandler::getSelectedUnit()
 {
-    if(!m_session)
+    if (!m_session)
         return NULL;
 
     ObjectGuid guid = m_session->GetPlayer()->GetSelectionGuid();
@@ -2150,7 +2143,7 @@ Unit* ChatHandler::getSelectedUnit()
 
 Creature* ChatHandler::getSelectedCreature()
 {
-    if(!m_session)
+    if (!m_session)
         return NULL;
 
     return m_session->GetPlayer()->GetMap()->GetAnyTypeCreature(m_session->GetPlayer()->GetSelectionGuid());
@@ -2164,10 +2157,10 @@ Creature* ChatHandler::getSelectedCreature()
  */
 void ChatHandler::SkipWhiteSpaces(char** args)
 {
-    if(!*args)
+    if (!*args)
         return;
 
-    while(isWhiteSpace(**args))
+    while (isWhiteSpace(**args))
         ++(*args);
 }
 
@@ -2180,7 +2173,7 @@ void ChatHandler::SkipWhiteSpaces(char** args)
  */
 bool  ChatHandler::ExtractInt32(char** args, int32& val)
 {
-    if (!*args || !**args)
+    if (!*args || !** args)
         return false;
 
     char* tail = *args;
@@ -2211,7 +2204,7 @@ bool  ChatHandler::ExtractInt32(char** args, int32& val)
  */
 bool  ChatHandler::ExtractOptInt32(char** args, int32& val, int32 defVal)
 {
-    if (!*args || !**args)
+    if (!*args || !** args)
     {
         val = defVal;
         return true;
@@ -2230,7 +2223,7 @@ bool  ChatHandler::ExtractOptInt32(char** args, int32& val, int32 defVal)
  */
 bool  ChatHandler::ExtractUInt32Base(char** args, uint32& val, uint32 base)
 {
-    if (!*args || !**args)
+    if (!*args || !** args)
         return false;
 
     char* tail = *args;
@@ -2263,7 +2256,7 @@ bool  ChatHandler::ExtractUInt32Base(char** args, uint32& val, uint32 base)
  */
 bool  ChatHandler::ExtractOptUInt32(char** args, uint32& val, uint32 defVal)
 {
-    if (!*args || !**args)
+    if (!*args || !** args)
     {
         val = defVal;
         return true;
@@ -2281,7 +2274,7 @@ bool  ChatHandler::ExtractOptUInt32(char** args, uint32& val, uint32 defVal)
  */
 bool  ChatHandler::ExtractFloat(char** args, float& val)
 {
-    if (!*args || !**args)
+    if (!*args || !** args)
         return false;
 
     char* tail = *args;
@@ -2311,7 +2304,7 @@ bool  ChatHandler::ExtractFloat(char** args, float& val)
  */
 bool  ChatHandler::ExtractOptFloat(char** args, float& val, float defVal)
 {
-    if (!*args || !**args)
+    if (!*args || !** args)
     {
         val = defVal;
         return true;
@@ -2330,7 +2323,7 @@ bool  ChatHandler::ExtractOptFloat(char** args, float& val, float defVal)
  */
 char* ChatHandler::ExtractLiteralArg(char** args, char const* lit /*= NULL*/)
 {
-    if (!*args || !**args)
+    if (!*args || !** args)
         return NULL;
 
     char* head = *args;
@@ -2338,10 +2331,10 @@ char* ChatHandler::ExtractLiteralArg(char** args, char const* lit /*= NULL*/)
     // reject quoted string or link (|-started text)
     switch (head[0])
     {
-        // reject quoted string
+            // reject quoted string
         case '[': case '\'': case '"':
             return NULL;
-        // reject link (|-started text)
+            // reject link (|-started text)
         case '|':
             // client replace all | by || in raw text
             if (head[1] != '|')
@@ -2356,7 +2349,7 @@ char* ChatHandler::ExtractLiteralArg(char** args, char const* lit /*= NULL*/)
         int l = strlen(lit);
 
         int largs = 0;
-        while(head[largs] && !isWhiteSpace(head[largs]))
+        while (head[largs] && !isWhiteSpace(head[largs]))
             ++largs;
 
         if (largs < l)
@@ -2405,12 +2398,12 @@ char* ChatHandler::ExtractLiteralArg(char** args, char const* lit /*= NULL*/)
  * @param asis control save quote string wrappers
  * @return     quote-like string, or NULL if args empty or not appropriate content.
  */
-char* ChatHandler::ExtractQuotedArg( char** args, bool asis /*= false*/ )
+char* ChatHandler::ExtractQuotedArg(char** args, bool asis /*= false*/)
 {
-    if (!*args || !**args)
+    if (!*args || !** args)
         return NULL;
 
-    if (**args != '\'' && **args != '"' && **args != '[')
+    if (**args != '\'' &&** args != '"' &&** args != '[')
         return NULL;
 
     char guard = (*args)[0];
@@ -2418,7 +2411,7 @@ char* ChatHandler::ExtractQuotedArg( char** args, bool asis /*= false*/ )
     if (guard == '[')
         guard = ']';
 
-    char* tail = (*args)+1;                                 // start scan after first quote symbol
+    char* tail = (*args) + 1;                               // start scan after first quote symbol
     char* head = asis ? *args : tail;                       // start arg
 
     while (*tail && *tail != guard)
@@ -2440,7 +2433,7 @@ char* ChatHandler::ExtractQuotedArg( char** args, bool asis /*= false*/ )
         *tail = '\0';
     }
 
-    *args = tail+1;
+    *args = tail + 1;
 
     SkipWhiteSpaces(args);
 
@@ -2456,7 +2449,7 @@ char* ChatHandler::ExtractQuotedArg( char** args, bool asis /*= false*/ )
  */
 char* ChatHandler::ExtractQuotedOrLiteralArg(char** args, bool asis /*= false*/)
 {
-    char *arg = ExtractQuotedArg(args, asis);
+    char* arg = ExtractQuotedArg(args, asis);
     if (!arg)
         arg = ExtractLiteralArg(args);
     return arg;
@@ -2504,7 +2497,7 @@ bool  ChatHandler::ExtractOnOff(char** args, bool& value)
  */
 char* ChatHandler::ExtractLinkArg(char** args, char const* const* linkTypes /*= NULL*/, int* foundIdx /*= NULL*/, char** keyPair /*= NULL*/, char** somethingPair /*= NULL*/)
 {
-    if (!*args || !**args)
+    if (!*args || !** args)
         return NULL;
 
     // skip if not linked started or encoded single | (doubled by client)
@@ -2523,7 +2516,7 @@ char* ChatHandler::ExtractLinkArg(char** args, char const* const* linkTypes /*=
 
     // |color|Hlinktype:key:data...|h[name]|h|r
 
-    char* tail = (*args)+1;                                 // skip |
+    char* tail = (*args) + 1;                               // skip |
 
     if (*tail != 'H')                                       // skip color part, some links can not have color part
     {
@@ -2553,7 +2546,7 @@ char* ChatHandler::ExtractLinkArg(char** args, char const* const* linkTypes /*=
             // exactly string with follow : or |
             int l = strlen(linkTypes[linktype_idx]);
             if (strncmp(tail, linkTypes[linktype_idx], l) == 0 &&
-                (tail[l] == ':' || tail[l] == '|'))
+                    (tail[l] == ':' || tail[l] == '|'))
                 break;
         }
 
@@ -2593,8 +2586,8 @@ char* ChatHandler::ExtractLinkArg(char** args, char const* const* linkTypes /*=
 
     // |h[name]|h|r or :something...|h[name]|h|r
 
-    char* somethingStart = tail+1;
-    char* somethingEnd   = tail+1;                          // will updated later if need
+    char* somethingStart = tail + 1;
+    char* somethingEnd   = tail + 1;                        // will updated later if need
 
     if (*tail == ':' && somethingPair)                      // optional data extraction
     {
@@ -2616,7 +2609,7 @@ char* ChatHandler::ExtractLinkArg(char** args, char const* const* linkTypes /*=
 
     // |h[name]|h|r or :something2...|h[name]|h|r
 
-    while (*tail && (*tail != '|' || *(tail+1) != 'h'))     // skip ... part if exist
+    while (*tail && (*tail != '|' || *(tail + 1) != 'h'))   // skip ... part if exist
         ++tail;
 
     if (!*tail)
@@ -2630,19 +2623,19 @@ char* ChatHandler::ExtractLinkArg(char** args, char const* const* linkTypes /*=
     if (!*tail || *tail != '[')
         return NULL;
 
-    while (*tail && (*tail != ']' || *(tail+1) != '|'))     // skip name part
+    while (*tail && (*tail != ']' || *(tail + 1) != '|'))   // skip name part
         ++tail;
 
     tail += 2;                                              // skip ]|
 
     // h|r
-    if (!*tail || *tail != 'h'  || *(tail+1) != '|')
+    if (!*tail || *tail != 'h'  || *(tail + 1) != '|')
         return NULL;
 
     tail += 2;                                              // skip h|
 
     // r
-    if (!*tail || *tail != 'r' || (*(tail+1) && !isWhiteSpace(*(tail+1))))
+    if (!*tail || *tail != 'r' || (*(tail + 1) && !isWhiteSpace(*(tail + 1))))
         return NULL;
 
     ++tail;                                                 // skip r
@@ -2681,9 +2674,9 @@ char* ChatHandler::ExtractLinkArg(char** args, char const* const* linkTypes /*=
  * @param asis control save quote string wrappers
  * @return     extracted arg string, or NULL if args empty or not appropriate content.
  */
-char* ChatHandler::ExtractArg( char** args, bool asis /*= false*/ )
+char* ChatHandler::ExtractArg(char** args, bool asis /*= false*/)
 {
-    if (!*args || !**args)
+    if (!*args || !** args)
         return NULL;
 
     char* arg = ExtractQuotedOrLiteralArg(args, asis);
@@ -2705,7 +2698,7 @@ char* ChatHandler::ExtractOptNotLastArg(char** args)
     char* arg = ExtractArg(args, true);
 
     // have more data
-    if (*args && **args)
+    if (*args &&** args)
         return arg;
 
     // optional name not found
@@ -2759,7 +2752,7 @@ char* ChatHandler::ExtractKeyFromLink(char** text, char const* linkType, char**
 char* ChatHandler::ExtractKeyFromLink(char** text, char const* const* linkTypes, int* found_idx, char** something1 /*= NULL*/)
 {
     // skip empty
-    if (!*text || !**text)
+    if (!*text || !** text)
         return NULL;
 
     // return non link case
@@ -2812,7 +2805,7 @@ bool ChatHandler::ExtractUint32KeyFromLink(char** text, char const* linkType, ui
     return ExtractUInt32(&arg, value);
 }
 
-GameObject* ChatHandler::GetGameObjectWithGuid(uint32 lowguid,uint32 entry)
+GameObject* ChatHandler::GetGameObjectWithGuid(uint32 lowguid, uint32 entry)
 {
     if (!m_session)
         return NULL;
@@ -2824,7 +2817,7 @@ GameObject* ChatHandler::GetGameObjectWithGuid(uint32 lowguid,uint32 entry)
 
 enum SpellLinkType
 {
-    SPELL_LINK_RAW     =-1,                                 // non-link case
+    SPELL_LINK_RAW     = -1,                                // non-link case
     SPELL_LINK_SPELL   = 0,
     SPELL_LINK_TALENT  = 1,
     SPELL_LINK_ENCHANT = 2,
@@ -2859,7 +2852,7 @@ uint32 ChatHandler::ExtractSpellIdFromLink(char** text)
     if (!ExtractUInt32(&idS, id))
         return 0;
 
-    switch(type)
+    switch (type)
     {
         case SPELL_LINK_RAW:
         case SPELL_LINK_SPELL:
@@ -2870,7 +2863,7 @@ uint32 ChatHandler::ExtractSpellIdFromLink(char** text)
         {
             // talent
             TalentEntry const* talentEntry = sTalentStore.LookupEntry(id);
-            if(!talentEntry)
+            if (!talentEntry)
                 return 0;
 
             int32 rank;
@@ -2901,7 +2894,7 @@ uint32 ChatHandler::ExtractSpellIdFromLink(char** text)
 GameTele const* ChatHandler::ExtractGameTeleFromLink(char** text)
 {
     // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
-    char* cId = ExtractKeyFromLink(text,"Htele");
+    char* cId = ExtractKeyFromLink(text, "Htele");
     if (!cId)
         return NULL;
 
@@ -2915,7 +2908,7 @@ GameTele const* ChatHandler::ExtractGameTeleFromLink(char** text)
 
 enum GuidLinkType
 {
-    GUID_LINK_RAW        =-1,                               // non-link case
+    GUID_LINK_RAW        = -1,                              // non-link case
     GUID_LINK_PLAYER     = 0,
     GUID_LINK_CREATURE   = 1,
     GUID_LINK_GAMEOBJECT = 2,
@@ -2940,7 +2933,7 @@ ObjectGuid ChatHandler::ExtractGuidFromLink(char** text)
     if (!idS)
         return ObjectGuid();
 
-    switch(type)
+    switch (type)
     {
         case GUID_LINK_RAW:
         case GUID_LINK_PLAYER:
@@ -2949,10 +2942,11 @@ ObjectGuid ChatHandler::ExtractGuidFromLink(char** text)
             if (!normalizePlayerName(name))
                 return ObjectGuid();
 
-            if (Player* player = sObjectMgr.GetPlayer(name.c_str()))
+            Player* player = sObjectMgr.GetPlayer(name.c_str());
+            if (player)
                 return player->GetObjectGuid();
 
-            return sObjectMgr.GetPlayerGuidByName(name);
+            return sAccountMgr.GetPlayerGuidByName(name);
         }
         case GUID_LINK_CREATURE:
         {
@@ -2971,7 +2965,7 @@ ObjectGuid ChatHandler::ExtractGuidFromLink(char** text)
             if (!ExtractUInt32(&idS, lowguid))
                 return ObjectGuid();
 
-            if(GameObjectData const* data = sObjectMgr.GetGOData(lowguid) )
+            if (GameObjectData const* data = sObjectMgr.GetGOData(lowguid))
                 return ObjectGuid(HIGHGUID_GAMEOBJECT, data->id, lowguid);
             else
                 return ObjectGuid();
@@ -2984,7 +2978,7 @@ ObjectGuid ChatHandler::ExtractGuidFromLink(char** text)
 
 enum LocationLinkType
 {
-    LOCATION_LINK_RAW               =-1,                    // non-link case
+    LOCATION_LINK_RAW               = -1,                   // non-link case
     LOCATION_LINK_PLAYER            = 0,
     LOCATION_LINK_TELE              = 1,
     LOCATION_LINK_TAXINODE          = 2,
@@ -2993,7 +2987,7 @@ enum LocationLinkType
     LOCATION_LINK_CREATURE_ENTRY    = 5,
     LOCATION_LINK_GAMEOBJECT_ENTRY  = 6,
     LOCATION_LINK_AREATRIGGER       = 7,
-    LOCATION_LINK_AREATRIGGER_TARGET= 8,
+    LOCATION_LINK_AREATRIGGER_TARGET = 8,
 };
 
 static char const* const locationKeys[] =
@@ -3027,7 +3021,7 @@ bool ChatHandler::ExtractLocationFromLink(char** text, uint32& mapid, float& x,
     if (!idS)
         return false;
 
-    switch(type)
+    switch (type)
     {
         case LOCATION_LINK_RAW:
         case LOCATION_LINK_PLAYER:
@@ -3036,7 +3030,8 @@ bool ChatHandler::ExtractLocationFromLink(char** text, uint32& mapid, float& x,
             if (!normalizePlayerName(name))
                 return false;
 
-            if (Player* player = sObjectMgr.GetPlayer(name.c_str()))
+            Player* player = sObjectMgr.GetPlayer(name.c_str());
+            if (player)
             {
                 mapid = player->GetMapId();
                 x = player->GetPositionX();
@@ -3045,7 +3040,7 @@ bool ChatHandler::ExtractLocationFromLink(char** text, uint32& mapid, float& x,
                 return true;
             }
 
-            if (ObjectGuid guid = sObjectMgr.GetPlayerGuidByName(name))
+            if (ObjectGuid guid = sAccountMgr.GetPlayerGuidByName(name))
             {
                 // to point where player stay (if loaded)
                 float o;
@@ -3064,10 +3059,10 @@ bool ChatHandler::ExtractLocationFromLink(char** text, uint32& mapid, float& x,
             GameTele const* tele = sObjectMgr.GetGameTele(id);
             if (!tele)
                 return false;
-            mapid = tele->mapId;
-            x = tele->position_x;
-            y = tele->position_y;
-            z = tele->position_z;
+            mapid = tele->loc.GetMapId();
+            x = tele->loc.x;
+            y = tele->loc.y;
+            z = tele->loc.z;
             return true;
         }
         case LOCATION_LINK_TAXINODE:
@@ -3091,7 +3086,7 @@ bool ChatHandler::ExtractLocationFromLink(char** text, uint32& mapid, float& x,
             if (!ExtractUInt32(&idS, lowguid))
                 return false;
 
-            if(CreatureData const* data = sObjectMgr.GetCreatureData(lowguid) )
+            if (CreatureData const* data = sObjectMgr.GetCreatureData(lowguid))
             {
                 mapid = data->mapid;
                 x = data->posX;
@@ -3108,7 +3103,7 @@ bool ChatHandler::ExtractLocationFromLink(char** text, uint32& mapid, float& x,
             if (!ExtractUInt32(&idS, lowguid))
                 return false;
 
-            if(GameObjectData const* data = sObjectMgr.GetGOData(lowguid) )
+            if (GameObjectData const* data = sObjectMgr.GetGOData(lowguid))
             {
                 mapid = data->mapid;
                 x = data->posX;
@@ -3205,17 +3200,17 @@ bool ChatHandler::ExtractLocationFromLink(char** text, uint32& mapid, float& x,
             }
 
             AreaTrigger const* at = sObjectMgr.GetAreaTrigger(id);
-            if(!at)
+            if (!at)
             {
                 PSendSysMessage(LANG_AREATRIGER_NOT_HAS_TARGET, id);
                 SetSentErrorMessage(true);
                 return false;
             }
 
-            mapid = at->target_mapId;
-            x = at->target_X;
-            y = at->target_Y;
-            z = at->target_Z;
+            mapid = at->loc.GetMapId();
+            x = at->loc.x;
+            y = at->loc.y;
+            z = at->loc.z;
             return true;
         }
     }
@@ -3228,11 +3223,11 @@ std::string ChatHandler::ExtractPlayerNameFromLink(char** text)
 {
     // |color|Hplayer:name|h[name]|h|r
     char* name_str = ExtractKeyFromLink(text, "Hplayer");
-    if(!name_str)
+    if (!name_str)
         return "";
 
     std::string name = name_str;
-    if(!normalizePlayerName(name))
+    if (!normalizePlayerName(name))
         return "";
 
     return name;
@@ -3251,9 +3246,9 @@ std::string ChatHandler::ExtractPlayerNameFromLink(char** text)
  *
  * @return           true if extraction successful
  */
-bool ChatHandler::ExtractPlayerTarget(char** args, Player** player /*= NULL*/, ObjectGuid* player_guid /*= NULL*/,std::string* player_name /*= NULL*/)
+bool ChatHandler::ExtractPlayerTarget(char** args, Player** player /*= NULL*/, ObjectGuid* player_guid /*= NULL*/, std::string* player_name /*= NULL*/)
 {
-    if (*args && **args)
+    if (*args &&** args)
     {
         std::string name = ExtractPlayerNameFromLink(args);
         if (name.empty())
@@ -3266,35 +3261,35 @@ bool ChatHandler::ExtractPlayerTarget(char** args, Player** player /*= NULL*/, O
         Player* pl = sObjectMgr.GetPlayer(name.c_str());
 
         // if allowed player pointer
-        if(player)
+        if (player)
             *player = pl;
 
         // if need guid value from DB (in name case for check player existence)
-        ObjectGuid guid = !pl && (player_guid || player_name) ? sObjectMgr.GetPlayerGuidByName(name) : ObjectGuid();
+        ObjectGuid guid = !pl && (player_guid || player_name) ? sAccountMgr.GetPlayerGuidByName(name) : ObjectGuid();
 
         // if allowed player guid (if no then only online players allowed)
-        if(player_guid)
+        if (player_guid)
             *player_guid = pl ? pl->GetObjectGuid() : guid;
 
-        if(player_name)
+        if (player_name)
             *player_name = pl || guid ? name : "";
     }
     else
     {
         Player* pl = getSelectedPlayer();
         // if allowed player pointer
-        if(player)
+        if (player)
             *player = pl;
         // if allowed player guid (if no then only online players allowed)
-        if(player_guid)
+        if (player_guid)
             *player_guid = pl ? pl->GetObjectGuid() : ObjectGuid();
 
-        if(player_name)
+        if (player_name)
             *player_name = pl ? pl->GetName() : "";
     }
 
     // some from req. data must be provided (note: name is empty if player not exist)
-    if((!player || !*player) && (!player_guid || !*player_guid) && (!player_name || player_name->empty()))
+    if ((!player || !*player) && (!player_guid || !*player_guid) && (!player_name || player_name->empty()))
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
         SetSentErrorMessage(true);
@@ -3338,7 +3333,7 @@ uint32 ChatHandler::ExtractAccountId(char** args, std::string* accountName /*= N
     {
         if (!sAccountMgr.GetName(account_id, account_name))
         {
-            PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_str);
+            PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_str);
             SetSentErrorMessage(true);
             return 0;
         }
@@ -3348,7 +3343,7 @@ uint32 ChatHandler::ExtractAccountId(char** args, std::string* accountName /*= N
         account_name = account_str;
         if (!AccountMgr::normalizeString(account_name))
         {
-            PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
+            PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str());
             SetSentErrorMessage(true);
             return 0;
         }
@@ -3356,7 +3351,7 @@ uint32 ChatHandler::ExtractAccountId(char** args, std::string* accountName /*= N
         account_id = sAccountMgr.GetId(account_name);
         if (!account_id)
         {
-            PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
+            PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str());
             SetSentErrorMessage(true);
             return 0;
         }
@@ -3380,16 +3375,16 @@ struct RaceMaskName
 static RaceMaskName const raceMaskNames[] =
 {
     // races
-    { "human",    (1<<(RACE_HUMAN-1))   },
-    { "orc",      (1<<(RACE_ORC-1))     },
-    { "dwarf",    (1<<(RACE_DWARF-1))   },
-    { "nightelf", (1<<(RACE_NIGHTELF-1))},
-    { "undead",   (1<<(RACE_UNDEAD-1))  },
-    { "tauren",   (1<<(RACE_TAUREN-1))  },
-    { "gnome",    (1<<(RACE_GNOME-1))   },
-    { "troll",    (1<<(RACE_TROLL-1))   },
-    { "bloodelf", (1<<(RACE_BLOODELF-1))},
-    { "draenei",  (1<<(RACE_DRAENEI-1)) },
+    { "human",    (1 << (RACE_HUMAN - 1))   },
+    { "orc",      (1 << (RACE_ORC - 1))     },
+    { "dwarf",    (1 << (RACE_DWARF - 1))   },
+    { "nightelf", (1 << (RACE_NIGHTELF - 1))},
+    { "undead",   (1 << (RACE_UNDEAD - 1))  },
+    { "tauren",   (1 << (RACE_TAUREN - 1))  },
+    { "gnome",    (1 << (RACE_GNOME - 1))   },
+    { "troll",    (1 << (RACE_TROLL - 1))   },
+    { "bloodelf", (1 << (RACE_BLOODELF - 1))},
+    { "draenei",  (1 << (RACE_DRAENEI - 1)) },
 
     // masks
     { "alliance", RACEMASK_ALLIANCE },
@@ -3428,6 +3423,18 @@ bool ChatHandler::ExtractRaceMask(char** text, uint32& raceMask, char const** ma
     return true;
 }
 
+bool ChatHandler::ExtractGender(char** text, Gender& gender)
+{
+    if (ExtractLiteralArg(text, "male"))
+        gender = GENDER_MALE;
+    else if (ExtractLiteralArg(text, "female"))
+        gender = GENDER_FEMALE;
+    else
+        gender = GENDER_NONE;
+
+    return gender != GENDER_NONE;
+}
+
 std::string ChatHandler::GetNameLink(Player* chr) const
 {
     return playerLink(chr->GetName());
@@ -3449,7 +3456,7 @@ int ChatHandler::GetSessionDbLocaleIndex() const
     return m_session->GetSessionDbLocaleIndex();
 }
 
-const char *CliHandler::GetMangosString(int32 entry) const
+const char* CliHandler::GetMangosString(int32 entry) const
 {
     return sObjectMgr.GetMangosStringForDBCLocale(entry);
 }
@@ -3474,7 +3481,7 @@ bool CliHandler::isAvailable(ChatCommand const& cmd) const
     return GetAccessLevel() >= (AccountTypes)cmd.SecurityLevel;
 }
 
-void CliHandler::SendSysMessage(const char *str)
+void CliHandler::SendSysMessage(const char* str)
 {
     m_print(m_callbackArg, str);
     m_print(m_callbackArg, "\r\n");
@@ -3576,17 +3583,94 @@ void ChatHandler::LogCommand(char const* fullcmd)
     {
         Player* p = m_session->GetPlayer();
         ObjectGuid sel_guid = p->GetSelectionGuid();
-        sLog.outCommand(GetAccountId(),"Command: %s [Player: %s (Account: %u) X: %f Y: %f Z: %f Map: %u Selected: %s]",
-            fullcmd, p->GetName(), GetAccountId(), p->GetPositionX(), p->GetPositionY(), p->GetPositionZ(), p->GetMapId(),
-            sel_guid.GetString().c_str());
+        sLog.outCommand(GetAccountId(), "Command: %s [Player: %s (Account: %u) X: %f Y: %f Z: %f Map: %u Selected: %s]",
+                        fullcmd, p->GetName(), GetAccountId(), p->GetPositionX(), p->GetPositionY(), p->GetPositionZ(), p->GetMapId(),
+                        sel_guid.GetString().c_str());
     }
     else                                        // 0 account -> console
     {
-        sLog.outCommand(GetAccountId(),"Command: %s [Account: %u from %s]",
-            fullcmd, GetAccountId(), GetAccountId() ? "RA-connection" : "Console");
+        sLog.outCommand(GetAccountId(), "Command: %s [Account: %u from %s]",
+                        fullcmd, GetAccountId(), GetAccountId() ? "RA-connection" : "Console");
     }
 }
 
+void ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg msgtype, char const* message, Language language /*= LANG_UNIVERSAL*/, ChatTagFlags chatTag /*= CHAT_TAG_NONE*/,
+                                  ObjectGuid const& senderGuid /*= ObjectGuid()*/, char const* senderName /*= NULL*/,
+                                  ObjectGuid const& targetGuid /*= ObjectGuid()*/, char const* targetName /*= NULL*/,
+                                  char const* channelName /*= NULL*/, uint32 achievementId /*= 0*/)
+{
+    bool isGM = chatTag & CHAT_TAG_GM;
+    bool isAchievement = false;
+
+    data.Initialize(isGM ? SMSG_GM_MESSAGECHAT : SMSG_MESSAGECHAT);
+    data << uint8(msgtype);
+    data << uint32(language);
+    data << ObjectGuid(senderGuid);
+    data << uint32(0);                                              // 2.1.0
+
+    switch (msgtype)
+    {
+        case CHAT_MSG_MONSTER_SAY:
+        case CHAT_MSG_MONSTER_PARTY:
+        case CHAT_MSG_MONSTER_YELL:
+        case CHAT_MSG_MONSTER_WHISPER:
+        case CHAT_MSG_MONSTER_EMOTE:
+        case CHAT_MSG_RAID_BOSS_WHISPER:
+        case CHAT_MSG_RAID_BOSS_EMOTE:
+        case CHAT_MSG_BATTLENET:
+        case CHAT_MSG_WHISPER_FOREIGN:
+            MANGOS_ASSERT(senderName);
+            MANGOS_ASSERT(targetName);
+            data << uint32(strlen(senderName) + 1);
+            data << senderName;
+            data << ObjectGuid(targetGuid);                         // Unit Target
+            if (targetGuid && !targetGuid.IsPlayer() && !targetGuid.IsPet() && (msgtype != CHAT_MSG_WHISPER_FOREIGN))
+            {
+                data << uint32(strlen(targetName) + 1);             // target name length
+                data << targetName;                                 // target name
+            }
+            break;
+        case CHAT_MSG_BG_SYSTEM_NEUTRAL:
+        case CHAT_MSG_BG_SYSTEM_ALLIANCE:
+        case CHAT_MSG_BG_SYSTEM_HORDE:
+            data << ObjectGuid(targetGuid);                         // Unit Target
+            if (targetGuid && !targetGuid.IsPlayer())
+            {
+                MANGOS_ASSERT(targetName);
+                data << uint32(strlen(targetName) + 1);             // target name length
+                data << targetName;                                 // target name
+            }
+            break;
+        case CHAT_MSG_ACHIEVEMENT:
+        case CHAT_MSG_GUILD_ACHIEVEMENT:
+            data << ObjectGuid(targetGuid);                         // Unit Target
+            isAchievement = true;
+            break;
+        default:
+            if (isGM && senderName)
+            {
+                data << uint32(strlen(senderName) + 1);
+                data << senderName;
+            }
+
+            if (msgtype == CHAT_MSG_CHANNEL)
+            {
+                MANGOS_ASSERT(channelName);
+                data << channelName;
+            }
+            data << ObjectGuid(targetGuid);
+            break;
+    }
+    MANGOS_ASSERT(message);
+    data << uint32(strlen(message) + 1);
+    data << message;
+    data << uint8(chatTag);
+
+    if (isAchievement)
+        data << uint32(achievementId);
+}
+
+
 // Instantiate template for helper function
 template void ChatHandler::ShowNpcOrGoSpawnInformation<Creature>(uint32 guid);
 template void ChatHandler::ShowNpcOrGoSpawnInformation<GameObject>(uint32 guid);
diff --git a/src/game/Chat.h b/src/game/Chat.h
index ffa529e13d4..0f8251e6081 100644
--- a/src/game/Chat.h
+++ b/src/game/Chat.h
@@ -47,12 +47,12 @@ class Unit;
 class ChatCommand
 {
     public:
-        const char *       Name;
+        const char*        Name;
         uint32             SecurityLevel;                   // function pointer required correct align (use uint32)
         bool               AllowConsole;
         bool (ChatHandler::*Handler)(char* args);
         std::string        Help;
-        ChatCommand *      ChildCommands;
+        ChatCommand*       ChildCommands;
 };
 
 enum ChatCommandSearchResult
@@ -62,47 +62,72 @@ enum ChatCommandSearchResult
     CHAT_COMMAND_UNKNOWN_SUBCOMMAND,                        // command found but some level subcommand not find in subcommand list
 };
 
+enum PlayerChatTag
+{
+    CHAT_TAG_NONE               = 0x00,
+    CHAT_TAG_AFK                = 0x01,
+    CHAT_TAG_DND                = 0x02,
+    CHAT_TAG_GM                 = 0x04,
+    CHAT_TAG_COM                = 0x08,                     // Commentator
+    CHAT_TAG_DEV                = 0x10,                     // Developer
+};
+
+typedef uint32 ChatTagFlags;
+
 class MANGOS_DLL_SPEC ChatHandler
 {
     public:
         explicit ChatHandler(WorldSession* session);
         explicit ChatHandler(Player* player);
-        ~ChatHandler();
-
-        static void FillMessageData( WorldPacket *data, WorldSession* session, uint8 type, uint32 language, const char *channelName, ObjectGuid targetGuid, const char *message, Unit *speaker);
-
-        static void FillMessageData( WorldPacket *data, WorldSession* session, uint8 type, uint32 language, ObjectGuid targetGuid, const char* message)
-        {
-            FillMessageData( data, session, type, language, NULL, targetGuid, message, NULL);
-        }
-
-        static void FillMessageData( WorldPacket *data, WorldSession* session, uint8 type, uint32 language, const char* message)
-        {
-            FillMessageData( data, session, type, language, NULL, ObjectGuid(), message, NULL);
-        }
-
-        void FillSystemMessageData( WorldPacket *data, const char* message )
-        {
-            FillMessageData( data, m_session, CHAT_MSG_SYSTEM, LANG_UNIVERSAL, ObjectGuid(), message );
-        }
+        virtual ~ChatHandler();
 
-        static char* LineFromMessage(char*& pos) { char* start = strtok(pos,"\n"); pos = NULL; return start; }
+        static char* LineFromMessage(char*& pos) { char* start = strtok(pos, "\n"); pos = NULL; return start; }
 
         // function with different implementation for chat/console
-        virtual const char *GetMangosString(int32 entry) const;
-        const char *GetOnOffStr(bool value) const;
+        virtual const char* GetMangosString(int32 entry) const;
+        const char* GetOnOffStr(bool value) const;
 
-        virtual void SendSysMessage(  const char *str);
+        virtual void SendSysMessage(const char* str);
 
-        void SendSysMessage(          int32     entry);
-        void PSendSysMessage(         const char *format, ...) ATTR_PRINTF(2,3);
-        void PSendSysMessage(         int32     entry, ...  );
+        void SendSysMessage(int32     entry);
+        void PSendSysMessage(const char* format, ...) ATTR_PRINTF(2, 3);
+        void PSendSysMessage(int32     entry, ...);
+
+        void SendGlobalSysMessage(const char *str);
+        void PSendGlobalSysMessage(const char *format, ...) ATTR_PRINTF(2,3);
+        void PSendGlobalSysMessage(int32 entry, ...  );
 
         bool ParseCommands(const char* text);
         ChatCommand const* FindCommand(char const* text);
 
         bool isValidChatMessage(const char* msg);
         bool HasSentErrorMessage() { return sentErrorMessage;}
+
+        /**
+        * \brief Prepare SMSG_GM_MESSAGECHAT/SMSG_MESSAGECHAT
+        *
+        * Method:    BuildChatPacket build message chat packet generic way
+        * FullName:  ChatHandler::BuildChatPacket
+        * Access:    public static 
+        * Returns:   void
+        *
+        * \param WorldPacket& data             : Provided packet will be filled with requested info
+        * \param ChatMsg msgtype               : Message type from ChatMsg enum from SharedDefines.h
+        * \param ChatTagFlags chatTag          : Chat tag from PlayerChatTag in Chat.h
+        * \param char const* message           : Message to send
+        * \param Language language             : Language from Language enum in SharedDefines.h
+        * \param ObjectGuid const& senderGuid  : May be null in some case but often required for ignore list
+        * \param char const* senderName        : Required for type *MONSTER* or *BATTLENET, but also if GM is true
+        * \param ObjectGuid const& targetGuid  : Often null, but needed for type *MONSTER* or *BATTLENET or *BATTLEGROUND* or *ACHIEVEMENT
+        * \param char const* targetName        : Often null, but needed for type *MONSTER* or *BATTLENET or *BATTLEGROUND*
+        * \param char const* channelName       : Required only for CHAT_MSG_CHANNEL
+        * \param uint32 achievementId          : Required only for *ACHIEVEMENT
+        **/
+        static void BuildChatPacket(
+            WorldPacket& data, ChatMsg msgtype, char const* message, Language language = LANG_UNIVERSAL, ChatTagFlags chatTag = CHAT_TAG_NONE,
+            ObjectGuid const& senderGuid = ObjectGuid(), char const* senderName = NULL,
+            ObjectGuid const& targetGuid = ObjectGuid(), char const* targetName = NULL,
+            char const* channelName = NULL, uint32 achievementId = 0);
     protected:
         explicit ChatHandler() : m_session(NULL) {}      // for CLI subclass
 
@@ -120,17 +145,15 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HasLowerSecurity(Player* target, ObjectGuid guid = ObjectGuid(), bool strong = false);
         bool HasLowerSecurityAccount(WorldSession* target, uint32 account, bool strong = false);
 
-        void SendGlobalSysMessage(const char *str);
-
-        bool SetDataForCommandInTable(ChatCommand *table, const char* text, uint32 security, std::string const& help);
+        bool SetDataForCommandInTable(ChatCommand* table, const char* text, uint32 security, std::string const& help);
         void ExecuteCommand(const char* text);
         void LogCommand(char const* fullcmd);
 
-        bool ShowHelpForCommand(ChatCommand *table, const char* cmd);
-        bool ShowHelpForSubCommands(ChatCommand *table, char const* cmd);
+        bool ShowHelpForCommand(ChatCommand* table, const char* cmd);
+        bool ShowHelpForSubCommands(ChatCommand* table, char const* cmd);
         ChatCommandSearchResult FindCommand(ChatCommand* table, char const*& text, ChatCommand*& command, ChatCommand** parentCommand = NULL, std::string* cmdNamePtr = NULL, bool allAvailable = false, bool exactlyName = false);
 
-        void CheckIntegrity(ChatCommand *table, ChatCommand *parentCommand);
+        void CheckIntegrity(ChatCommand* table, ChatCommand* parentCommand);
         ChatCommand* getCommandTable();
 
         bool HandleAccountCommand(char* args);
@@ -143,6 +166,11 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleAccountSetAddonCommand(char* args);
         bool HandleAccountSetGmLevelCommand(char* args);
         bool HandleAccountSetPasswordCommand(char* args);
+        bool HandleAHBotOptionsCommand(char* args);
+
+        bool HandleAccountFriendAddCommand(char* args);
+        bool HandleAccountFriendDeleteCommand(char* args);
+        bool HandleAccountFriendListCommand(char* args);
 
         bool HandleAHBotItemsAmountCommand(char* args);
         template <int Q>
@@ -184,6 +212,8 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleCastTargetCommand(char* args);
 
         bool HandleCharacterAchievementsCommand(char* args);
+        bool HandleCharacterChangeFactionCommand(char* args);
+        bool HandleCharacterChangeRaceCommand(char* args);
         bool HandleCharacterCustomizeCommand(char* args);
         bool HandleCharacterDeletedDeleteCommand(char* args);
         bool HandleCharacterDeletedListCommand(char* args);
@@ -210,7 +240,8 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleDebugSpellCheckCommand(char* args);
         bool HandleDebugSpellCoefsCommand(char* args);
         bool HandleDebugSpellModsCommand(char* args);
-        bool HandleDebugUpdateWorldStateCommand(char* args);
+        bool HandleDebugEnterVehicleCommand(char* args);
+        bool HandleDebugSendCalendarResultCommand(char* args);
 
         bool HandleDebugPlayCinematicCommand(char* args);
         bool HandleDebugPlayMovieCommand(char* args);
@@ -335,6 +366,7 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleModifyArenaCommand(char* args);
         bool HandleModifyPhaseCommand(char* args);
         bool HandleModifyGenderCommand(char* args);
+        bool HandleModifyPowerTypeCommand(char* args);
 
         //-----------------------Npc Commands-----------------------
         bool HandleNpcAddCommand(char* args);
@@ -365,7 +397,7 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleNpcWhisperCommand(char* args);
         bool HandleNpcYellCommand(char* args);
 
-        //TODO: NpcCommands that needs to be fixed :
+        // TODO: NpcCommands that needs to be fixed :
         bool HandleNpcAddWeaponCommand(char* args);
         bool HandleNpcNameCommand(char* args);
         bool HandleNpcSubNameCommand(char* args);
@@ -396,26 +428,33 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleReloadAllLocalesCommand(char* args);
 
         bool HandleReloadConfigCommand(char* args);
+        bool HandleReloadOpcodesCommand(char* args);
 
         bool HandleReloadAchievementCriteriaRequirementCommand(char* args);
         bool HandleReloadAchievementRewardCommand(char* args);
         bool HandleReloadAreaTriggerTavernCommand(char* args);
         bool HandleReloadAreaTriggerTeleportCommand(char* args);
         bool HandleReloadBattleEventCommand(char* args);
+        bool HandleReloadCreaturesStatsCommand(char* args);
         bool HandleReloadCommandCommand(char* args);
         bool HandleReloadConditionsCommand(char* args);
         bool HandleReloadCreatureQuestRelationsCommand(char* args);
         bool HandleReloadCreatureQuestInvRelationsCommand(char* args);
         bool HandleReloadDbScriptStringCommand(char* args);
-        bool HandleReloadEventScriptsCommand(char* args);
+        bool HandleReloadDBScriptsOnCreatureDeathCommand(char* args);
+        bool HandleReloadDBScriptsOnEventCommand(char* args);
+        bool HandleReloadDBScriptsOnGossipCommand(char* args);
+        bool HandleReloadDBScriptsOnGoUseCommand(char* args);
+        bool HandleReloadDBScriptsOnQuestEndCommand(char* args);
+        bool HandleReloadDBScriptsOnQuestStartCommand(char* args);
+        bool HandleReloadDBScriptsOnSpellCommand(char* args);
+
         bool HandleReloadEventAITextsCommand(char* args);
         bool HandleReloadEventAISummonsCommand(char* args);
         bool HandleReloadEventAIScriptsCommand(char* args);
         bool HandleReloadGameGraveyardZoneCommand(char* args);
-        bool HandleReloadGameObjectScriptsCommand(char* args);
         bool HandleReloadGameTeleCommand(char* args);
         bool HandleReloadGossipMenuCommand(char* args);
-        bool HandleReloadGossipScriptsCommand(char* args);
         bool HandleReloadGOQuestRelationsCommand(char* args);
         bool HandleReloadGOQuestInvRelationsCommand(char* args);
         bool HandleReloadItemConvertCommand(char* args);
@@ -444,7 +483,6 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleReloadLootTemplatesSpellCommand(char* args);
         bool HandleReloadMailLevelRewardCommand(char* args);
         bool HandleReloadMangosStringCommand(char* args);
-        bool HandleReloadNpcGossipCommand(char* args);
         bool HandleReloadNpcTextCommand(char* args);
         bool HandleReloadNpcTrainerCommand(char* args);
         bool HandleReloadNpcVendorCommand(char* args);
@@ -452,9 +490,7 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleReloadPointsOfInterestCommand(char* args);
         bool HandleReloadSpellClickSpellsCommand(char* args);
         bool HandleReloadQuestAreaTriggersCommand(char* args);
-        bool HandleReloadQuestEndScriptsCommand(char* args);
         bool HandleReloadQuestPOICommand(char* args);
-        bool HandleReloadQuestStartScriptsCommand(char* args);
         bool HandleReloadQuestTemplateCommand(char* args);
         bool HandleReloadReservedNameCommand(char* args);
         bool HandleReloadReputationRewardRateCommand(char* args);
@@ -470,10 +506,14 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleReloadSpellProcItemEnchantCommand(char* args);
         bool HandleReloadSpellBonusesCommand(char* args);
         bool HandleReloadSpellScriptTargetCommand(char* args);
-        bool HandleReloadSpellScriptsCommand(char* args);
         bool HandleReloadSpellTargetPositionCommand(char* args);
         bool HandleReloadSpellThreatsCommand(char* args);
         bool HandleReloadSpellPetAurasCommand(char* args);
+        bool HandleReloadSpellDbcCommand(char* args);
+
+        bool HandleReloadSpellLinkedCommand(char* args);
+        bool HandleReloadSpellDisabledCommand(char* args);
+        bool HandleReloadAntiCheatCommand(char* args);
 
         bool HandleResetAchievementsCommand(char* args);
         bool HandleResetAllCommand(char* args);
@@ -543,6 +583,7 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleGroupgoCommand(char* args);
         bool HandleRecallCommand(char* args);
         bool HandleAnnounceCommand(char* args);
+        bool HandleNameAnnounceCommand(char* args);
         bool HandleNotifyCommand(char* args);
         bool HandleGPSCommand(char* args);
         bool HandleTaxiCheatCommand(char* args);
@@ -591,6 +632,9 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleRespawnCommand(char* args);
         bool HandleComeToMeCommand(char* args);
         bool HandleCombatStopCommand(char* args);
+        bool HandlePlayerbotCommand(char* args);
+        bool HandlePlayerbotConsoleCommand(char* args);
+        bool HandleAhBotCommand(char* args);
         bool HandleFlushArenaPointsCommand(char* args);
         bool HandleRepairitemsCommand(char* args);
         bool HandleStableCommand(char* args);
@@ -602,9 +646,27 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleMmapLocCommand(char* args);
         bool HandleMmapLoadedTilesCommand(char* args);
         bool HandleMmapStatsCommand(char* args);
-        bool HandleMmap(char* args);
+        bool HandleMmapOn(char* args);
+        bool HandleMmapOff(char* args);
         bool HandleMmapTestArea(char* args);
 
+        // WorldState operations
+        bool HandleWorldStateCommand(char* args);
+        bool HandleWorldStateListCommand(char* args);
+        bool HandleWorldStateListAllCommand(char* args);
+        bool HandleWorldStateAddCommand(char* args);
+        bool HandleWorldStateUpdateCommand(char* args);
+        bool HandleWorldStateReloadCommand(char* args);
+
+        // Transport debugging commands
+        bool HandleTransportListCommand(char* args);
+        bool HandleTransportCurrentCommand(char* args);
+        bool HandleTransportPathCommand(char* args);
+        bool HandleTransportGoCommand(char* args);
+        bool HandleTransportStartCommand(char* args);
+        bool HandleTransportStopCommand(char* args);
+        bool HandleTransportCommand(char* args);
+
         //! Development Commands
         bool HandleSaveAllCommand(char* args);
 
@@ -617,18 +679,18 @@ class MANGOS_DLL_SPEC ChatHandler
         bool  ExtractInt32(char** args, int32& val);
         bool  ExtractOptInt32(char** args, int32& val, int32 defVal);
         bool  ExtractUInt32Base(char** args, uint32& val, uint32 base);
-        bool  ExtractUInt32(char** args, uint32& val) { return ExtractUInt32Base(args,val, 10); }
+        bool  ExtractUInt32(char** args, uint32& val) { return ExtractUInt32Base(args, val, 10); }
         bool  ExtractOptUInt32(char** args, uint32& val, uint32 defVal);
         bool  ExtractFloat(char** args, float& val);
         bool  ExtractOptFloat(char** args, float& val, float defVal);
         char* ExtractQuotedArg(char** args, bool asis = false);
-                                                            // string with " or [] or ' around
+        // string with " or [] or ' around
         char* ExtractLiteralArg(char** args, char const* lit = NULL);
-                                                            // literal string (until whitespace and not started from "['|), any or 'lit' if provided
+        // literal string (until whitespace and not started from "['|), any or 'lit' if provided
         char* ExtractQuotedOrLiteralArg(char** args, bool asis = false);
         bool  ExtractOnOff(char** args, bool& value);
         char* ExtractLinkArg(char** args, char const* const* linkTypes = NULL, int* foundIdx = NULL, char** keyPair = NULL, char** somethingPair = NULL);
-                                                            // shift-link like arg (with aditional info if need)
+        // shift-link like arg (with aditional info if need)
         char* ExtractArg(char** args, bool asis = false);   // any name/number/quote/shift-link strings
         char* ExtractOptNotLastArg(char** args);            // extract name/number/quote/shift-link arg only if more data in args for parse
 
@@ -642,27 +704,28 @@ class MANGOS_DLL_SPEC ChatHandler
         GameTele const* ExtractGameTeleFromLink(char** text);
         bool   ExtractLocationFromLink(char** text, uint32& mapid, float& x, float& y, float& z);
         bool   ExtractRaceMask(char** text, uint32& raceMask, char const** maskName = NULL);
+        bool   ExtractGender(char** text, Gender& gender);
         std::string ExtractPlayerNameFromLink(char** text);
         bool ExtractPlayerTarget(char** args, Player** player, ObjectGuid* player_guid = NULL, std::string* player_name = NULL);
-                                                            // select by arg (name/link) or in-game selection online/offline player
+        // select by arg (name/link) or in-game selection online/offline player
 
-        std::string playerLink(std::string const& name) const { return m_session ? "|cffffffff|Hplayer:"+name+"|h["+name+"]|h|r" : name; }
+        std::string playerLink(std::string const& name) const { return m_session ? "|cffffffff|Hplayer:" + name + "|h[" + name + "]|h|r" : name; }
         std::string GetNameLink(Player* chr) const;
 
-        GameObject* GetGameObjectWithGuid(uint32 lowguid,uint32 entry);
+        GameObject* GetGameObjectWithGuid(uint32 lowguid, uint32 entry);
 
         // Utility methods for commands
         bool ShowAccountListHelper(QueryResult* result, uint32* limit = NULL, bool title = true, bool error = true);
-        void ShowAchievementListHelper(AchievementEntry const * achEntry, LocaleConstant loc, time_t const* date = NULL, Player* target = NULL);
-        void ShowAchievementCriteriaListHelper(AchievementCriteriaEntry const* criEntry, AchievementEntry const * achEntry, LocaleConstant loc, Player* target = NULL);
-        void ShowFactionListHelper(FactionEntry const * factionEntry, LocaleConstant loc, FactionState const* repState = NULL, Player * target = NULL );
+        void ShowAchievementListHelper(AchievementEntry const* achEntry, LocaleConstant loc, time_t const* date = NULL, Player* target = NULL);
+        void ShowAchievementCriteriaListHelper(AchievementCriteriaEntry const* criEntry, AchievementEntry const* achEntry, LocaleConstant loc, Player* target = NULL);
+        void ShowFactionListHelper(FactionEntry const* factionEntry, LocaleConstant loc, FactionState const* repState = NULL, Player* target = NULL);
         void ShowItemListHelper(uint32 itemId, int loc_idx, Player* target = NULL);
         void ShowQuestListHelper(uint32 questId, int32 loc_idx, Player* target = NULL);
         bool ShowPlayerListHelper(QueryResult* result, uint32* limit = NULL, bool title = true, bool error = true);
         void ShowSpellListHelper(Player* target, SpellEntry const* spellInfo, LocaleConstant loc);
         void ShowPoolListHelper(uint16 pool_id);
         void ShowTicket(GMTicket const* ticket);
-        void ShowTriggerListHelper(AreaTriggerEntry const * atEntry);
+        void ShowTriggerListHelper(AreaTriggerEntry const* atEntry);
         void ShowTriggerTargetListHelper(uint32 id, AreaTrigger const* at, bool subpart = false);
         bool LookupPlayerSearchCommand(QueryResult* result, uint32* limit = NULL);
         bool HandleBanListHelper(QueryResult* result);
@@ -670,7 +733,7 @@ class MANGOS_DLL_SPEC ChatHandler
         bool HandleBanInfoHelper(uint32 accountid, char const* accountname);
         bool HandleUnBanHelper(BanMode mode, char* args);
         void HandleCharacterLevel(Player* player, ObjectGuid player_guid, uint32 oldlevel, uint32 newlevel);
-        void HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id);
+        void HandleLearnSkillRecipesHelper(Player* player, uint32 skill_id);
         bool HandleGoHelper(Player* _player, uint32 mapid, float x, float y, float const* zPtr = NULL, float const* ortPtr = NULL);
         bool HandleGetValueHelper(Object* target, uint32 field, char* typeStr);
         bool HandlerDebugModValueHelper(Object* target, uint32 field, char* typeStr, char* valStr);
@@ -703,9 +766,9 @@ class MANGOS_DLL_SPEC ChatHandler
         void HandleCharacterDeletedListHelper(DeletedInfoList const& foundList);
         void HandleCharacterDeletedRestoreHelper(DeletedInfo const& delInfo);
 
-        void SetSentErrorMessage(bool val){ sentErrorMessage = val;};
+        void SetSentErrorMessage(bool val) { sentErrorMessage = val;};
     private:
-        WorldSession * m_session;                           // != NULL for chat command call and NULL for CLI command
+        WorldSession* m_session;                            // != NULL for chat command call and NULL for CLI command
 
         // common global flag
         static bool load_command_table;
@@ -720,11 +783,11 @@ class CliHandler : public ChatHandler
             : m_accountId(accountId), m_loginAccessLevel(accessLevel), m_callbackArg(callbackArg), m_print(zprint) {}
 
         // overwrite functions
-        const char *GetMangosString(int32 entry) const;
+        const char* GetMangosString(int32 entry) const;
         uint32 GetAccountId() const;
         AccountTypes GetAccessLevel() const;
         bool isAvailable(ChatCommand const& cmd) const;
-        void SendSysMessage(const char *str);
+        void SendSysMessage(const char* str);
         std::string GetNameLink() const;
         bool needReportToTarget(Player* chr) const;
         LocaleConstant GetSessionDbcLocale() const;
diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp
index 671c4f52125..411bf6cf5c1 100644
--- a/src/game/ChatHandler.cpp
+++ b/src/game/ChatHandler.cpp
@@ -18,6 +18,7 @@
 
 #include "Common.h"
 #include "Log.h"
+#include "ChatLog.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "World.h"
@@ -36,19 +37,22 @@
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 
+// Playerbot mod
+#include "playerbot/playerbot.h"
+
 bool WorldSession::processChatmessageFurtherAfterSecurityChecks(std::string& msg, uint32 lang)
 {
     if (lang != LANG_ADDON)
     {
         // strip invisible characters for non-addon messages
-        if(sWorld.getConfig(CONFIG_BOOL_CHAT_FAKE_MESSAGE_PREVENTING))
+        if (sWorld.getConfig(CONFIG_BOOL_CHAT_FAKE_MESSAGE_PREVENTING))
             stripLineInvisibleChars(msg);
 
         if (sWorld.getConfig(CONFIG_UINT32_CHAT_STRICT_LINK_CHECKING_SEVERITY) && GetSecurity() < SEC_MODERATOR
                 && !ChatHandler(this).isValidChatMessage(msg.c_str()))
         {
             sLog.outError("Player %s (GUID: %u) sent a chatmessage with an invalid link: %s", GetPlayer()->GetName(),
-                    GetPlayer()->GetGUIDLow(), msg.c_str());
+                          GetPlayer()->GetGUIDLow(), msg.c_str());
             if (sWorld.getConfig(CONFIG_UINT32_CHAT_STRICT_LINK_CHECKING_KICK))
                 KickPlayer();
             return false;
@@ -58,7 +62,7 @@ bool WorldSession::processChatmessageFurtherAfterSecurityChecks(std::string& msg
     return true;
 }
 
-void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
+void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
 {
     uint32 type;
     uint32 lang;
@@ -66,45 +70,45 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
     recv_data >> type;
     recv_data >> lang;
 
-    if(type >= MAX_CHAT_MSG_TYPE)
+    if (type >= MAX_CHAT_MSG_TYPE)
     {
         sLog.outError("CHAT: Wrong message type received: %u", type);
         return;
     }
 
-    DEBUG_LOG("CHAT: packet received. type %u, lang %u", type, lang );
+    DEBUG_LOG("CHAT: packet received. type %u, lang %u", type, lang);
 
     // prevent talking at unknown language (cheating)
     LanguageDesc const* langDesc = GetLanguageDescByID(lang);
-    if(!langDesc)
+    if (!langDesc)
     {
         SendNotification(LANG_UNKNOWN_LANGUAGE);
         return;
     }
-    if(langDesc->skill_id != 0 && !_player->HasSkill(langDesc->skill_id))
+    if (langDesc->skill_id != 0 && !_player->HasSkill(langDesc->skill_id))
     {
         // also check SPELL_AURA_COMPREHEND_LANGUAGE (client offers option to speak in that language)
         Unit::AuraList const& langAuras = _player->GetAurasByType(SPELL_AURA_COMPREHEND_LANGUAGE);
         bool foundAura = false;
-        for(Unit::AuraList::const_iterator i = langAuras.begin(); i != langAuras.end(); ++i)
+        for (Unit::AuraList::const_iterator i = langAuras.begin(); i != langAuras.end(); ++i)
         {
-            if((*i)->GetModifier()->m_miscvalue == int32(lang))
+            if ((*i)->GetModifier()->m_miscvalue == int32(lang))
             {
                 foundAura = true;
                 break;
             }
         }
-        if(!foundAura)
+        if (!foundAura)
         {
             SendNotification(LANG_NOT_LEARNED_LANGUAGE);
             return;
         }
     }
 
-    if(lang == LANG_ADDON)
+    if (lang == LANG_ADDON)
     {
         // Disabled addon channel?
-        if(!sWorld.getConfig(CONFIG_BOOL_ADDON_CHANNEL))
+        if (!sWorld.getConfig(CONFIG_BOOL_ADDON_CHANNEL))
             return;
     }
     // LANG_ADDON should not be changed nor be affected by flood control
@@ -120,20 +124,20 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                 lang = LANG_UNIVERSAL;
             else
             {
-                switch(type)
+                switch (type)
                 {
                     case CHAT_MSG_PARTY:
                     case CHAT_MSG_RAID:
                     case CHAT_MSG_RAID_LEADER:
                     case CHAT_MSG_RAID_WARNING:
                         // allow two side chat at group channel if two side group allowed
-                        if(sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GROUP))
+                        if (sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GROUP))
                             lang = LANG_UNIVERSAL;
                         break;
                     case CHAT_MSG_GUILD:
                     case CHAT_MSG_OFFICER:
                         // allow two side chat at guild channel if two side guild allowed
-                        if(sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GUILD))
+                        if (sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GUILD))
                             lang = LANG_UNIVERSAL;
                         break;
                 }
@@ -141,7 +145,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
 
             // but overwrite it by SPELL_AURA_MOD_LANGUAGE auras (only single case used)
             Unit::AuraList const& ModLangAuras = _player->GetAurasByType(SPELL_AURA_MOD_LANGUAGE);
-            if(!ModLangAuras.empty())
+            if (!ModLangAuras.empty())
                 lang = ModLangAuras.front()->GetModifier()->m_miscvalue;
         }
 
@@ -158,7 +162,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
         }
     }
 
-    switch(type)
+    switch (type)
     {
         case CHAT_MSG_SAY:
         case CHAT_MSG_EMOTE:
@@ -167,7 +171,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             std::string msg;
             recv_data >> msg;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
             if (ChatHandler(this).ParseCommands(msg.c_str()))
@@ -176,15 +180,24 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
-            if(type == CHAT_MSG_SAY)
+            if (type == CHAT_MSG_SAY)
+            {
+                sChatLog.ChatMsg(GetPlayer(), msg, type);
                 GetPlayer()->Say(msg, lang);
-            else if(type == CHAT_MSG_EMOTE)
+            }
+            else if (type == CHAT_MSG_EMOTE)
+            {
+                sChatLog.ChatMsg(GetPlayer(), msg, type);
                 GetPlayer()->TextEmote(msg);
-            else if(type == CHAT_MSG_YELL)
+            }
+            else if (type == CHAT_MSG_YELL)
+            {
+                sChatLog.ChatMsg(GetPlayer(), msg, type);
                 GetPlayer()->Yell(msg, lang);
+            }
         } break;
 
         case CHAT_MSG_WHISPER:
@@ -193,19 +206,24 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             recv_data >> to;
             recv_data >> msg;
 
+            if (ChatHandler(this).ParseCommands(msg.c_str()))
+                break;
+
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
-            if(!normalizePlayerName(to))
+            sChatLog.WhisperMsg(GetPlayer(), to, msg);
+
+            if (!normalizePlayerName(to))
             {
                 SendPlayerNotFoundNotice(to);
                 break;
             }
 
-            Player *player = sObjectMgr.GetPlayer(to.c_str());
+            Player* player = sObjectMgr.GetPlayer(to.c_str());
             uint32 tSecurity = GetSecurity();
             uint32 pSecurity = player ? player->GetSession()->GetSecurity() : SEC_PLAYER;
             if (!player || (tSecurity == SEC_PLAYER && pSecurity > SEC_PLAYER && !player->isAcceptWhispers()))
@@ -214,7 +232,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                 return;
             }
 
-            if (!sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHAT) && tSecurity == SEC_PLAYER && pSecurity == SEC_PLAYER )
+            if (!sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHAT) && tSecurity == SEC_PLAYER && pSecurity == SEC_PLAYER)
             {
                 if (GetPlayer()->GetTeam() != player->GetTeam())
                 {
@@ -223,7 +241,16 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                 }
             }
 
-            GetPlayer()->Whisper(msg, lang, player->GetObjectGuid());
+            // Playerbot mod: handle whispered command to bot
+            if (player->GetPlayerbotAI())
+            {
+                player->GetPlayerbotAI()->HandleCommand(type, msg, *GetPlayer());
+                GetPlayer()->m_speakTime = 0;
+                GetPlayer()->m_speakCount = 0;
+            }
+            else
+            // END Playerbot mod
+                GetPlayer()->Whisper(msg, lang, player->GetObjectGuid());
         } break;
 
         case CHAT_MSG_PARTY:
@@ -232,7 +259,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             std::string msg;
             recv_data >> msg;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
             if (ChatHandler(this).ParseCommands(msg.c_str()))
@@ -241,23 +268,38 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
+            sChatLog.PartyMsg(GetPlayer(), msg);
+
             // if player is in battleground, he cannot say to battleground members by /p
-            Group *group = GetPlayer()->GetOriginalGroup();
-            if(!group)
+            Group* group = GetPlayer()->GetOriginalGroup();
+            if (!group)
             {
                 group = _player->GetGroup();
-                if(!group || group->isBGGroup())
+                if (!group || group->isBGGroup())
                     return;
             }
 
             if ((type == CHAT_MSG_PARTY_LEADER) && !group->IsLeader(_player->GetObjectGuid()))
                 return;
 
+            // Playerbot mod: broadcast message to bot members
+            for(GroupReference* itr = group->GetFirstMember(); itr != NULL; itr=itr->next())
+            {
+                Player* player = itr->getSource();
+                if (player && player->GetPlayerbotAI())
+                {
+                    player->GetPlayerbotAI()->HandleCommand(type, msg, *GetPlayer());
+                    GetPlayer()->m_speakTime = 0;
+                    GetPlayer()->m_speakCount = 0;
+                }
+            }
+            // END Playerbot mod
+
             WorldPacket data;
-            ChatHandler::FillMessageData(&data, this, type, lang, msg.c_str());
+            ChatHandler::BuildChatPacket(data, ChatMsg(type), msg.c_str(), Language(lang), _player->GetChatTag(), _player->GetObjectGuid(), _player->GetName());
             group->BroadcastPacket(&data, false, group->GetMemberGroup(GetPlayer()->GetObjectGuid()));
 
             break;
@@ -267,7 +309,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             std::string msg;
             recv_data >> msg;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
             if (ChatHandler(this).ParseCommands(msg.c_str()))
@@ -276,12 +318,29 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
+            sChatLog.GuildMsg(GetPlayer(), msg, false);
+
             if (GetPlayer()->GetGuildId())
-                if (Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId()))
+            {
+                Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId());
+                if (guild)
                     guild->BroadcastToGuild(this, msg, lang == LANG_ADDON ? LANG_ADDON : LANG_UNIVERSAL);
+            }
+            // Playerbot mod: broadcast message to bot members
+            PlayerbotMgr *mgr = GetPlayer()->GetPlayerbotMgr();
+            if (mgr)
+            {
+                for (PlayerBotMap::const_iterator it = mgr->GetPlayerBotsBegin(); it != mgr->GetPlayerBotsEnd(); ++it)
+                {
+                    Player* const bot = it->second;
+                    if (bot->GetGuildId() == GetPlayer()->GetGuildId())
+                        bot->GetPlayerbotAI()->HandleCommand(type, msg, *GetPlayer());
+                }
+            }
+            // END Playerbot mod
 
             break;
         }
@@ -290,7 +349,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             std::string msg;
             recv_data >> msg;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
             if (ChatHandler(this).ParseCommands(msg.c_str()))
@@ -299,12 +358,17 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
+            sChatLog.GuildMsg(GetPlayer(), msg, true);
+
             if (GetPlayer()->GetGuildId())
-                if (Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId()))
+            {
+                Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId());
+                if (guild)
                     guild->BroadcastToOfficers(this, msg, lang == LANG_ADDON ? LANG_ADDON : LANG_UNIVERSAL);
+            }
 
             break;
         }
@@ -313,7 +377,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             std::string msg;
             recv_data >> msg;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
             if (ChatHandler(this).ParseCommands(msg.c_str()))
@@ -322,20 +386,35 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
+            sChatLog.RaidMsg(GetPlayer(), msg, type);
+
             // if player is in battleground, he cannot say to battleground members by /ra
-            Group *group = GetPlayer()->GetOriginalGroup();
-            if(!group)
+            Group* group = GetPlayer()->GetOriginalGroup();
+            if (!group)
             {
                 group = GetPlayer()->GetGroup();
-                if(!group || group->isBGGroup() || !group->isRaidGroup())
+                if (!group || group->isBGGroup() || !group->isRaidGroup())
                     return;
             }
 
+            // Playerbot mod: broadcast message to bot members
+            for(GroupReference* itr = group->GetFirstMember(); itr != NULL; itr=itr->next())
+            {
+                Player* player = itr->getSource();
+                if (player && player->GetPlayerbotAI())
+                {
+                    player->GetPlayerbotAI()->HandleCommand(type, msg, *GetPlayer());
+                    GetPlayer()->m_speakTime = 0;
+                    GetPlayer()->m_speakCount = 0;
+                }
+            }
+            // END Playerbot mod
+
             WorldPacket data;
-            ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID, lang, msg.c_str());
+            ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID, msg.c_str(), Language(lang), _player->GetChatTag(), _player->GetObjectGuid(), _player->GetName());
             group->BroadcastPacket(&data, false);
         } break;
         case CHAT_MSG_RAID_LEADER:
@@ -343,7 +422,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             std::string msg;
             recv_data >> msg;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
             if (ChatHandler(this).ParseCommands(msg.c_str()))
@@ -352,11 +431,13 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
+            sChatLog.RaidMsg(GetPlayer(), msg, type);
+
             // if player is in battleground, he cannot say to battleground members by /ra
-            Group *group = GetPlayer()->GetOriginalGroup();
+            Group* group = GetPlayer()->GetOriginalGroup();
             if (!group)
             {
                 group = GetPlayer()->GetGroup();
@@ -364,8 +445,21 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                     return;
             }
 
+            // Playerbot mod: broadcast message to bot members
+            for(GroupReference* itr = group->GetFirstMember(); itr != NULL; itr=itr->next())
+            {
+                Player* player = itr->getSource();
+                if (player && player->GetPlayerbotAI())
+                {
+                    player->GetPlayerbotAI()->HandleCommand(type, msg, *GetPlayer());
+                    GetPlayer()->m_speakTime = 0;
+                    GetPlayer()->m_speakCount = 0;
+                }
+            }
+            // END Playerbot mod
+
             WorldPacket data;
-            ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID_LEADER, lang, msg.c_str());
+            ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_LEADER, msg.c_str(), Language(lang), _player->GetChatTag(), _player->GetObjectGuid(), _player->GetName());
             group->BroadcastPacket(&data, false);
         } break;
 
@@ -377,17 +471,32 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
-            Group *group = GetPlayer()->GetGroup();
+            sChatLog.RaidMsg(GetPlayer(), msg, type);
+
+            Group* group = GetPlayer()->GetGroup();
             if (!group || !group->isRaidGroup() ||
-                !(group->IsLeader(GetPlayer()->GetObjectGuid()) || group->IsAssistant(GetPlayer()->GetObjectGuid())))
+                    !(group->IsLeader(GetPlayer()->GetObjectGuid()) || group->IsAssistant(GetPlayer()->GetObjectGuid())))
                 return;
 
+            // Playerbot mod: broadcast message to bot members
+            for(GroupReference* itr = group->GetFirstMember(); itr != NULL; itr=itr->next())
+            {
+                Player* player = itr->getSource();
+                if (player && player->GetPlayerbotAI())
+                {
+                    player->GetPlayerbotAI()->HandleCommand(type, msg, *GetPlayer());
+                    GetPlayer()->m_speakTime = 0;
+                    GetPlayer()->m_speakCount = 0;
+                }
+            }
+            // END Playerbot mod
+
             WorldPacket data;
-            //in battleground, raid warning is sent only to players in battleground - code is ok
-            ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID_WARNING, lang, msg.c_str());
+            // in battleground, raid warning is sent only to players in battleground - code is ok
+            ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_WARNING, msg.c_str(), Language(lang), _player->GetChatTag(), _player->GetObjectGuid(), _player->GetName());
             group->BroadcastPacket(&data, false);
         } break;
 
@@ -396,19 +505,24 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             std::string msg;
             recv_data >> msg;
 
+            if (ChatHandler(this).ParseCommands(msg.c_str()))
+                break;
+
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
+            sChatLog.BattleGroundMsg(GetPlayer(), msg, type);
+
             // battleground raid is always in Player->GetGroup(), never in GetOriginalGroup()
-            Group *group = GetPlayer()->GetGroup();
-            if(!group || !group->isBGGroup())
+            Group* group = GetPlayer()->GetGroup();
+            if (!group || !group->isBGGroup())
                 return;
 
             WorldPacket data;
-            ChatHandler::FillMessageData(&data, this, CHAT_MSG_BATTLEGROUND, lang, msg.c_str());
+            ChatHandler::BuildChatPacket(data, CHAT_MSG_BATTLEGROUND, msg.c_str(), Language(lang), _player->GetChatTag(), _player->GetObjectGuid(), _player->GetName());
             group->BroadcastPacket(&data, false);
         } break;
 
@@ -420,16 +534,18 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
+            sChatLog.BattleGroundMsg(GetPlayer(), msg, type);
+
             // battleground raid is always in Player->GetGroup(), never in GetOriginalGroup()
-            Group *group = GetPlayer()->GetGroup();
+            Group* group = GetPlayer()->GetGroup();
             if (!group || !group->isBGGroup() || !group->IsLeader(GetPlayer()->GetObjectGuid()))
                 return;
 
             WorldPacket data;
-            ChatHandler::FillMessageData(&data, this, CHAT_MSG_BATTLEGROUND_LEADER, lang, msg.c_str());
+            ChatHandler::BuildChatPacket(data, CHAT_MSG_BATTLEGROUND_LEADER, msg.c_str(), Language(lang), _player->GetChatTag(), _player->GetObjectGuid(), _player->GetName());
             group->BroadcastPacket(&data, false);
         } break;
 
@@ -439,15 +555,32 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             recv_data >> channel;
             recv_data >> msg;
 
+            if (ChatHandler(this).ParseCommands(msg.c_str()))
+                break;
+
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
 
-            if(msg.empty())
+            if (msg.empty())
                 break;
 
-            if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
-                if(Channel *chn = cMgr->GetChannel(channel, _player))
-                    chn->Say(_player->GetObjectGuid(), msg.c_str(), lang);
+            sChatLog.ChannelMsg(GetPlayer(), channel, msg);
+
+
+            // Playerbot mod: broadcast message to bot members
+            if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+            {
+                if (Channel* chn = cMgr->GetChannel(channel, _player))
+                {
+                    if (_player->GetPlayerbotMgr() && chn->GetFlags() & 0x18)
+                    {
+                        _player->GetPlayerbotMgr()->HandleCommand(type, msg);
+                    }
+                    sRandomPlayerbotMgr.HandleCommand(type, msg, *_player);
+                    chn->Say(_player, msg.c_str(), lang);
+                }
+            }
+            // END Playerbot mod
         } break;
 
         case CHAT_MSG_AFK:
@@ -506,9 +639,9 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
     }
 }
 
-void WorldSession::HandleEmoteOpcode( WorldPacket & recv_data )
+void WorldSession::HandleEmoteOpcode(WorldPacket& recv_data)
 {
-    if(!GetPlayer()->isAlive() || GetPlayer()->hasUnitState(UNIT_STAT_DIED))
+    if (!GetPlayer()->isAlive() || GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         return;
 
     uint32 emote;
@@ -529,7 +662,7 @@ namespace MaNGOS
                 char const* nam = i_target ? i_target->GetNameForLocaleIdx(loc_idx) : NULL;
                 uint32 namlen = (nam ? strlen(nam) : 0) + 1;
 
-                data.Initialize(SMSG_TEXT_EMOTE, (20+namlen));
+                data.Initialize(SMSG_TEXT_EMOTE, (20 + namlen));
                 data << ObjectGuid(i_player.GetObjectGuid());
                 data << uint32(i_text_emote);
                 data << uint32(i_emote_num);
@@ -548,9 +681,9 @@ namespace MaNGOS
     };
 }                                                           // namespace MaNGOS
 
-void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data )
+void WorldSession::HandleTextEmoteOpcode(WorldPacket& recv_data)
 {
-    if(!GetPlayer()->isAlive())
+    if (!GetPlayer()->isAlive())
         return;
 
     if (!GetPlayer()->CanSpeak())
@@ -567,13 +700,13 @@ void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data )
     recv_data >> emoteNum;
     recv_data >> guid;
 
-    EmotesTextEntry const *em = sEmotesTextStore.LookupEntry(text_emote);
+    EmotesTextEntry const* em = sEmotesTextStore.LookupEntry(text_emote);
     if (!em)
         return;
 
     uint32 emote_id = em->textid;
 
-    switch(emote_id)
+    switch (emote_id)
     {
         case EMOTE_STATE_SLEEP:
         case EMOTE_STATE_SIT:
@@ -600,39 +733,39 @@ void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data )
 
     GetPlayer()->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE, text_emote, 0, unit);
 
-    //Send scripted event call
+    // Send scripted event call
     if (unit && unit->GetTypeId() == TYPEID_UNIT && ((Creature*)unit)->AI())
         ((Creature*)unit)->AI()->ReceiveEmote(GetPlayer(), text_emote);
 }
 
-void WorldSession::HandleChatIgnoredOpcode(WorldPacket& recv_data )
+void WorldSession::HandleChatIgnoredOpcode(WorldPacket& recv_data)
 {
     ObjectGuid iguid;
     uint8 unk;
-    //DEBUG_LOG("WORLD: Received CMSG_CHAT_IGNORED");
+    // DEBUG_LOG("WORLD: Received CMSG_CHAT_IGNORED");
 
     recv_data >> iguid;
     recv_data >> unk;                                       // probably related to spam reporting
 
-    Player *player = sObjectMgr.GetPlayer(iguid);
-    if(!player || !player->GetSession())
+    Player* player = sObjectMgr.GetPlayer(iguid);
+    if (!player || !player->GetSession())
         return;
 
     WorldPacket data;
-    ChatHandler::FillMessageData(&data, this, CHAT_MSG_IGNORED, LANG_UNIVERSAL, NULL, GetPlayer()->GetObjectGuid(), GetPlayer()->GetName(), NULL);
+    ChatHandler::BuildChatPacket(data, CHAT_MSG_IGNORED, _player->GetName(), LANG_UNIVERSAL, CHAT_TAG_NONE, _player->GetObjectGuid());
     player->GetSession()->SendPacket(&data);
 }
 
 void WorldSession::SendPlayerNotFoundNotice(std::string name)
 {
-    WorldPacket data(SMSG_CHAT_PLAYER_NOT_FOUND, name.size()+1);
+    WorldPacket data(SMSG_CHAT_PLAYER_NOT_FOUND, name.size() + 1);
     data << name;
     SendPacket(&data);
 }
 
 void WorldSession::SendPlayerAmbiguousNotice(std::string name)
 {
-    WorldPacket data(SMSG_CHAT_PLAYER_AMBIGUOUS, name.size()+1);
+    WorldPacket data(SMSG_CHAT_PLAYER_AMBIGUOUS, name.size() + 1);
     data << name;
     SendPacket(&data);
 }
diff --git a/src/game/ChatLexicsCutter.cpp b/src/game/ChatLexicsCutter.cpp
new file mode 100644
index 00000000000..8890dd5e5c1
--- /dev/null
+++ b/src/game/ChatLexicsCutter.cpp
@@ -0,0 +1,307 @@
+/*
+ * Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Common.h"
+#include "ChatLexicsCutter.h"
+#include "Log.h"
+
+static const uint8 trailingBytesForUTF8[256] = {
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+};
+
+LexicsCutter::LexicsCutter()
+{
+    InvalidChars = "~`!@#$%^&*()-_+=[{]}|\\;:'\",<.>/?";
+}
+
+bool LexicsCutter::ReadUTF8(std::string& in, std::string& out, uint32& pos)
+{
+    if (pos >= in.length())
+        return false;
+
+    out = "";
+    unsigned char c = in[pos++];
+    out += c;
+    uint8 toread = trailingBytesForUTF8[(uint8)c];
+    while ((pos < in.length()) && (toread > 0))
+    {
+        out += in[pos++];
+        toread--;
+    }
+
+    return true;
+}
+
+std::string LexicsCutter::trim(std::string& s, const std::string& drop)
+{
+    std::string r = s.erase(s.find_last_not_of(drop) + 1);
+    return r.erase(0, r.find_first_not_of(drop));
+}
+
+bool LexicsCutter::Read_Letter_Analogs(std::string& FileName)
+{
+    FILE* ma_file;
+    char line[1024];
+    uint32 pos;
+    std::string line_s;
+    std::string lchar;
+    std::string lanalog;
+
+    ma_file = fopen(FileName.c_str(), "rb");
+
+    if (!ma_file)
+    {
+        sLog.outError("Chat lexics cutter disabled. Reason: LexicsCutterAnalogsFile file does not exist in the server directory.");
+        return false;
+    }
+
+    while (!feof(ma_file))
+    {
+        line[0] = 0x0;
+        fgets(line, 1020, ma_file);
+
+        // check for UTF8 prefix and comments
+        if (strlen(line) >= 3)
+        {
+            if (line[0] == '\xEF' && line[1] == '\xBB' && line[2] == '\xBF')
+            {
+                strncpy(&line[0], &line[3], strlen(line) - 3);
+            }
+        }
+
+        if (strlen(line) >= 2)
+        {
+            if (line[0] == '/' && line[1] == '/')
+                continue;
+        }
+
+        // check for empty string
+        line_s = line;
+        line_s = trim(line_s, "\x0A\x0D\x20");
+        if (line_s == "")
+            continue;
+
+        // process line without CR/LF
+        line_s = line;
+        line_s = trim(line_s, "\x0A\x0D");
+
+        pos = 0;
+        if (ReadUTF8(line_s, lchar, pos))
+        {
+            // create analogs vector
+            LC_AnalogVector av;
+            while (ReadUTF8(line_s, lanalog, pos))
+            {
+                av.push_back(lanalog);
+            }
+
+            // store vector in hash map
+            AnalogMap[lchar] = av;
+        }
+    }
+
+    fclose(ma_file);
+
+    return true;
+}
+
+bool LexicsCutter::Read_Innormative_Words(std::string& FileName)
+{
+    FILE* ma_file;
+    char line[1024];
+    uint32 pos;
+    std::string line_s;
+    std::string lchar;
+
+    ma_file = fopen(FileName.c_str(), "rb");
+
+    if (!ma_file)
+    {
+        sLog.outError("Chat lexics cutter disabled. Reason: LexicsCutterWordsFile file does not exist in the server directory.");
+        return false;
+    }
+
+    while (!feof(ma_file))
+    {
+        line[0] = 0x0;
+        fgets(line, 1020, ma_file);
+
+        // check for UTF8 prefix and comment
+        if (strlen(line) >= 3)
+        {
+            if (line[0] == '\xEF' && line[1] == '\xBB' && line[2] == '\xBF')
+            {
+                strncpy(&line[0], &line[3], strlen(line) - 3);
+            }
+        }
+
+        if (strlen(line) >= 2)
+        {
+            if (line[0] == '/' && line[1] == '/')
+                continue;
+        }
+
+        // check for empty string
+        line_s = line;
+        line_s = trim(line_s, "\x0A\x0D\x20");
+        if (line_s == "")
+            continue;
+
+        // process line without CR/LF
+        line_s = line;
+        line_s = trim(line_s, "\x0A\x0D");
+
+        // create word vector of vectors
+        LC_WordVector vw;
+        pos = 0;
+        while (ReadUTF8(line_s, lchar, pos))
+        {
+            // create letter set
+            LC_LetterSet vl;
+
+            // initialize letter set with letter read
+            vl.insert(lchar);
+
+            // find letter analogs and push them onto the vector
+            LC_AnalogMap::iterator itr = AnalogMap.find(lchar);
+            if (itr != AnalogMap.end())
+            {
+                // analogs present, iterate
+                for (LC_AnalogVector::iterator itr2 = itr->second.begin(); itr2 != itr->second.end(); itr2++)
+                {
+                    vl.insert(*itr2);
+                }
+            }
+
+            // add letter vector to word vector
+            vw.push_back(vl);
+        }
+
+        // push new word to words list
+        WordList.push_back(vw);
+    }
+
+    fclose(ma_file);
+
+    return true;
+}
+
+void LexicsCutter::Map_Innormative_Words()
+{
+    // process all the words in the vector
+    for (uint32 i = 0; i < WordList.size(); ++i)
+    {
+        // parse all analogs in the first word letter
+        for (LC_LetterSet::iterator itr = (*WordList[i].begin()).begin(); itr != (*WordList[i].begin()).end(); itr++)
+        {
+            // map the word to its first letter variants
+            WordMap.insert(std::pair< std::string, uint32 >(*itr, i));
+        }
+    }
+}
+
+bool LexicsCutter::Compare_Word(std::string& str, uint32 pos, LC_WordVector word)
+{
+    std::string lchar_prev;
+    std::string lchar;
+
+    // read first letter of the word into lchar_prev
+    ReadUTF8(str, lchar, pos);
+
+    // okay, here we go, comparing word
+    // first letter is already okay, we do begin from second and go on
+    LC_WordVector::iterator i = word.begin();
+    i++;
+    while (i != word.end())
+    {
+        // get letter from word, return false if the string is shorter
+        if (!ReadUTF8(str, lchar, pos))
+            return false;
+        // check, if the letter is in the set
+        LC_LetterSet ls = *i;
+        if (ls.count(lchar) == 0)
+        {
+            // letter is not in set, but we must check, if it is not space or repeat
+            if ( (!(IgnoreMiddleSpaces && (lchar == " "))) &&
+                (!(IgnoreLetterRepeat && (lchar == lchar_prev))) )
+            {
+                // no checks viable
+                return false;
+            }
+        }
+        else
+        {
+            // next word letter
+            i++;
+        }
+        // set previous string letter to compare if needed (this check can really conserve time)
+        if (IgnoreLetterRepeat)
+            lchar_prev = lchar;
+    }
+
+    return true;
+}
+
+bool LexicsCutter::Check_Lexics(std::string& Phrase)
+{
+    std::string lchar;
+    LC_WordMap::iterator i;
+    std::pair< LC_WordMap::iterator, LC_WordMap::iterator > ii;
+
+    if (Phrase.size() == 0)
+        return false;
+
+    // first, convert the string, adding spaces and removing invalid characters
+    // also create fast position vector for the new positions
+    std::string str = " ";
+    uint32 pos = 0;
+    while (ReadUTF8(Phrase, lchar, pos))
+    {
+        if (InvalidChars.find(lchar) == std::string::npos)
+        {
+            str.append(lchar);
+        }
+    }
+
+    // string prepared, now parse it and scan for all the words
+    uint32 pos_prev = 0;
+    pos = 0;
+    while (ReadUTF8(str, lchar, pos))
+    {
+        // got character, now try to find wordmap for it
+        ii = WordMap.equal_range(lchar);
+        // iterate over all found words
+        for (i = ii.first; i != ii.second; i++)
+        {
+            // compare word at initial position
+            if (Compare_Word(str, pos_prev, WordList[i->second]))
+                return true;
+        }
+       // set initial position to the current position
+       pos_prev = pos;
+    }
+
+    return false;
+}
diff --git a/src/game/ChatLexicsCutter.h b/src/game/ChatLexicsCutter.h
new file mode 100644
index 00000000000..8710f94cc8a
--- /dev/null
+++ b/src/game/ChatLexicsCutter.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOSSERVER_CHATLEXICSCUTTER_H
+#define MANGOSSERVER_CHATLEXICSCUTTER_H
+
+typedef std::vector< std::string > LC_AnalogVector;
+typedef std::map< std::string, LC_AnalogVector > LC_AnalogMap;
+typedef std::set< std::string > LC_LetterSet;
+typedef std::vector< LC_LetterSet > LC_WordVector;
+typedef std::vector< LC_WordVector > LC_WordList;
+typedef std::multimap< std::string, uint32 > LC_WordMap;
+
+class LexicsCutter
+{
+    protected:
+        LC_AnalogMap AnalogMap;
+        LC_WordList WordList;
+        LC_WordMap WordMap;
+
+        std::string InvalidChars;
+
+    public:
+        LexicsCutter();
+
+        static bool ReadUTF8(std::string& in, std::string& out, uint32& pos);
+
+        std::string trim(std::string& s, const std::string& drop = " ");
+        bool Read_Letter_Analogs(std::string& FileName);
+        bool Read_Innormative_Words(std::string& FileName);
+        void Map_Innormative_Words();
+        bool Compare_Word(std::string& str, uint32 pos, LC_WordVector word);
+        bool Check_Lexics(std::string& Phrase);
+
+        std::vector< std::pair< uint32, uint32 > > Found;
+        bool IgnoreMiddleSpaces;
+        bool IgnoreLetterRepeat;
+};
+
+#endif
diff --git a/src/game/ChatLog.cpp b/src/game/ChatLog.cpp
new file mode 100644
index 00000000000..f9e625c6ac1
--- /dev/null
+++ b/src/game/ChatLog.cpp
@@ -0,0 +1,964 @@
+/*
+ * Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
+ * Copyright (C) 2010-2013 MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Common.h"
+#include "ChatLexicsCutter.h"
+#include "ChatLog.h"
+#include "Chat.h"
+#include "Group.h"
+#include "Guild.h"
+#include "GuildMgr.h"
+#include "ObjectMgr.h"
+#include "SpellAuras.h"
+#include "Policies/Singleton.h"
+
+INSTANTIATE_SINGLETON_1( ChatLog );
+
+ChatLog::ChatLog()
+{
+    for (uint8 i = 0; i < CHATLOG_CHAT_TYPES_COUNT; ++i)
+    {
+        m_sLogFileNames[i] = "";
+        files[i] = NULL;
+    }
+
+    Lexics = NULL;
+    m_sInnormativeFileName = "";
+    f_innormative = NULL;
+}
+
+ChatLog::~ChatLog()
+{
+    Uninitialize();
+}
+
+void ChatLog::Initialize()
+{
+    if (m_sAnalogsFileName == "" || m_sWordsFileName == "")
+        m_bLexicsCutterEnable = false;
+
+    if (m_bLexicsCutterEnable)
+    {
+        // initialize lexics cutter
+        Lexics = new LexicsCutter;
+        if (Lexics && Lexics->Read_Letter_Analogs(m_sAnalogsFileName) && Lexics->Read_Innormative_Words(m_sWordsFileName))
+        {
+            Lexics->Map_Innormative_Words();
+            // read additional parameters
+            Lexics->IgnoreLetterRepeat = m_bLexicsCutterIgnoreLetterRepeat;
+            Lexics->IgnoreMiddleSpaces = m_bLexicsCutterIgnoreMiddleSpaces;
+        }
+        else
+        {
+            m_bLexicsCutterEnable = false;
+            if (Lexics)
+            {
+                delete Lexics;
+                Lexics = NULL;
+            }
+        }
+    }
+
+    if (m_bLexicsCutterEnable || m_uiChatLogMethod == CHAT_LOG_METHOD_FILE)
+    {
+        // open all files (with aliasing)
+        OpenAllFiles();
+
+        // write timestamps (init)
+        WriteInitStamps();
+    }
+}
+
+void ChatLog::Uninitialize()
+{
+    // close all files (avoiding double-close)
+    CloseAllFiles();
+
+    if (Lexics)
+    {
+        delete Lexics;
+        Lexics = NULL;
+    }
+}
+
+bool ChatLog::_ChatCommon(ChatLogFiles ChatType, Player* player, std::string& msg)
+{
+    if (m_bLexicsCutterEnable && Lexics && m_bCutFlag[ChatType] && Lexics->Check_Lexics(msg))
+        ChatBadLexicsAction(player, msg);
+
+    if (m_uiChatLogMethod == CHAT_LOG_METHOD_NONE)
+        return false;
+
+    if (m_bChatLogIgnoreUnprintable)
+    {
+        // have to ignore unprintables, verify string by UTF8 here
+        uint32 pos = 0;
+        std::string lchar;
+        while (LexicsCutter::ReadUTF8(msg, lchar, pos))
+        {
+            if (lchar.size() == 1 && lchar[0] < ' ')
+                return false; // unprintable detected
+        }
+    }
+
+    return true;
+}
+
+void ChatLog::ChatMsg(Player* player, std::string& msg, uint32 type)
+{
+    if (!_ChatCommon(CHAT_LOG_CHAT, player, msg))
+        return;
+
+    if (m_uiChatLogMethod == CHAT_LOG_METHOD_SQL)
+    {
+        static SqlStatementID insChat;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(insChat, "INSERT INTO `chat_log_chat` (`date_time`,`type`,`pname`,`msg`,`level`,`account_id`) VALUES (NOW(), ?, ?, ?, ?, ?)");
+        stmt.addUInt32(type);
+        stmt.addString(player->GetName());
+        stmt.addString(msg.c_str());
+        stmt.addUInt32(player->getLevel());
+        stmt.addUInt32(player->GetSession()->GetAccountId());
+        stmt.Execute();
+        return;
+    }
+
+    CheckDateSwitch();
+
+    std::string log_str = "";
+
+    switch (type)
+    {
+        case CHAT_MSG_EMOTE:
+            log_str.append("{EMOTE} ");
+            break;
+
+        case CHAT_MSG_YELL:
+            log_str.append("{YELL} ");
+            break;
+    }
+
+    log_str.append("[");
+    log_str.append(player->GetName());
+    log_str.append("] ");
+
+    log_str.append(msg);
+
+    log_str.append("\n");
+
+    if (m_bScreenFlag[CHAT_LOG_CHAT])
+        printf("%s", log_str.c_str());
+
+    if (files[CHAT_LOG_CHAT])
+    {
+        OutTimestamp(files[CHAT_LOG_CHAT]);
+        fprintf(files[CHAT_LOG_CHAT], "%s", log_str.c_str());
+        fflush(files[CHAT_LOG_CHAT]);
+    }
+}
+
+void ChatLog::PartyMsg(Player* player, std::string& msg)
+{
+    if (!_ChatCommon(CHAT_LOG_PARTY, player, msg))
+        return;
+
+    if (m_uiChatLogMethod == CHAT_LOG_METHOD_SQL)
+    {
+        std::string group_str = "";
+        Group* group = player->GetGroup();
+        if (!group)
+            group_str.append("[unknown party]");
+        else
+        {
+            Player* gm_member;
+            Group::MemberSlotList g_members = group->GetMemberSlots();
+            for (Group::member_citerator itr = g_members.begin(); itr != g_members.end(); itr++)
+            {
+                gm_member = sObjectMgr.GetPlayer(itr->guid);
+                if (gm_member)
+                {
+                    group_str.append(itr->name);
+                    group_str.append(",");
+                }
+            }
+            if (group_str.length() > 1)
+                group_str.erase(group_str.length() - 1);
+        }
+
+        static SqlStatementID insChat;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(insChat, "INSERT INTO `chat_log_party` (`date_time`,`pname`,`msg`,`level`,`account_id`,`members`) VALUES (NOW(), ?, ?, ?, ?, ?)");
+        stmt.addString(player->GetName());
+        stmt.addString(msg.c_str());
+        stmt.addUInt32(player->getLevel());
+        stmt.addUInt32(player->GetSession()->GetAccountId());
+        stmt.addString(group_str.c_str());
+        stmt.Execute();
+        return;
+    }
+
+    CheckDateSwitch();
+
+    std::string log_str = "";
+
+    log_str.append("[");
+    log_str.append(player->GetName());
+    log_str.append("]->GROUP:");
+
+    Group* group = player->GetGroup();
+    if (!group)
+    {
+        log_str.append("[unknown group] ");
+    }
+    else
+    {
+        // obtain group information
+        log_str.append("[");
+
+        ObjectGuid gm_leader_GUID = group->GetLeaderGuid();
+
+        Player* gm_member = sObjectMgr.GetPlayer(gm_leader_GUID);
+        if (gm_member)
+        {
+            log_str.append(gm_member->GetName());
+            log_str.append(",");
+        }
+
+        Group::MemberSlotList g_members = group->GetMemberSlots();
+
+        for (Group::member_citerator itr = g_members.begin(); itr != g_members.end(); itr++)
+        {
+            if (itr->guid == gm_leader_GUID)
+                continue;
+
+            gm_member = sObjectMgr.GetPlayer(itr->guid);
+            if (gm_member)
+            {
+                log_str.append(itr->name);
+                log_str.append(",");
+            }
+        }
+
+        log_str.erase(log_str.length() - 1);
+        log_str.append("] ");
+    }
+
+    log_str.append(msg);
+
+    log_str.append("\n");
+
+    if (m_bScreenFlag[CHAT_LOG_PARTY])
+        printf("%s", log_str.c_str());
+
+    if (files[CHAT_LOG_PARTY])
+    {
+        OutTimestamp(files[CHAT_LOG_PARTY]);
+        fprintf(files[CHAT_LOG_PARTY], "%s", log_str.c_str());
+        fflush(files[CHAT_LOG_PARTY]);
+    }
+}
+
+void ChatLog::GuildMsg(Player* player, std::string& msg, bool officer)
+{
+    if (!_ChatCommon(CHAT_LOG_GUILD, player, msg))
+        return;
+
+    if (m_uiChatLogMethod == CHAT_LOG_METHOD_SQL)
+    {
+        std::string guild_str = "";
+        if (!player->GetGuildId())
+            guild_str.append("[unknown guild]");
+        else
+        {
+            Guild* guild = sGuildMgr.GetGuildById(player->GetGuildId());
+            if (!guild)
+                guild_str.append("[unknown guild]");
+            else
+                guild_str.append(guild->GetName());
+            if (officer)
+                guild_str.append("(officer)");
+        }
+
+        static SqlStatementID insChat;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(insChat, "INSERT INTO `chat_log_guild` (`date_time`,`pname`,`msg`,`level`,`account_id`,`guild`) VALUES (NOW(), ?, ?, ?, ?, ?)");
+        stmt.addString(player->GetName());
+        stmt.addString(msg.c_str());
+        stmt.addUInt32(player->getLevel());
+        stmt.addUInt32(player->GetSession()->GetAccountId());
+        stmt.addString(guild_str.c_str());
+        stmt.Execute();
+        return;
+    }
+
+    CheckDateSwitch();
+
+    std::string log_str = "";
+
+    log_str.append("[");
+    log_str.append(player->GetName());
+    log_str.append((officer ? "]->GUILD_OFF:" : "]->GUILD:"));
+
+    if (!player->GetGuildId())
+    {
+        log_str.append("[unknown guild] ");
+    }
+    else
+    {
+        Guild* guild = sGuildMgr.GetGuildById(player->GetGuildId());
+        if (!guild)
+        {
+            log_str.append("[unknown guild] ");
+        }
+        else
+        {
+            // obtain guild information
+            log_str.append("(");
+            log_str.append(guild->GetName());
+            log_str.append(") ");
+        }
+    }
+
+    log_str.append(msg);
+
+    log_str.append("\n");
+
+    if (m_bScreenFlag[CHAT_LOG_GUILD])
+        printf("%s", log_str.c_str());
+    if (files[CHAT_LOG_GUILD])
+    {
+        OutTimestamp(files[CHAT_LOG_GUILD]);
+        fprintf(files[CHAT_LOG_GUILD], "%s", log_str.c_str());
+        fflush(files[CHAT_LOG_GUILD]);
+    }
+}
+
+void ChatLog::WhisperMsg(Player* player, std::string& to, std::string& msg)
+{
+    if (!_ChatCommon(CHAT_LOG_WHISPER, player, msg))
+        return;
+
+    if (m_uiChatLogMethod == CHAT_LOG_METHOD_SQL)
+    {
+        static SqlStatementID insChat;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(insChat, "INSERT INTO `chat_log_whisper` (`date_time`,`pname`,`msg`,`level`,`account_id`,`to`) VALUES (NOW(), ?, ?, ?, ?, ?)");
+        stmt.addString(player->GetName());
+        stmt.addString(msg.c_str());
+        stmt.addUInt32(player->getLevel());
+        stmt.addUInt32(player->GetSession()->GetAccountId());
+        stmt.addString(to.c_str());
+        stmt.Execute();
+        return;
+    }
+
+    CheckDateSwitch();
+
+    std::string log_str = "";
+
+    log_str.append("[");
+    log_str.append(player->GetName());
+    log_str.append("]->");
+
+    if (to.size() == 0)
+    {
+        log_str.append("[???] ");
+    }
+    else
+    {
+        normalizePlayerName(to);
+        log_str.append("[");
+        log_str.append(to);
+        log_str.append("] ");
+    }
+
+    log_str.append(msg);
+
+    log_str.append("\n");
+
+    if (m_bScreenFlag[CHAT_LOG_WHISPER])
+        printf("%s", log_str.c_str());
+    if (files[CHAT_LOG_WHISPER])
+    {
+        OutTimestamp(files[CHAT_LOG_WHISPER]);
+        fprintf(files[CHAT_LOG_WHISPER], "%s", log_str.c_str());
+        fflush(files[CHAT_LOG_WHISPER]);
+    }
+}
+
+void ChatLog::ChannelMsg(Player* player, std::string& channel, std::string& msg)
+{
+    if (!_ChatCommon(CHAT_LOG_CHANNEL, player, msg))
+        return;
+
+    if (m_uiChatLogMethod == CHAT_LOG_METHOD_SQL)
+    {
+        std::string channel_str = "";
+        if (channel.size() == 0)
+            channel_str.append("[unknown channel]");
+        else
+            channel_str.append(channel);
+
+        static SqlStatementID insChat;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(insChat, "INSERT INTO `chat_log_channel` (`date_time`,`pname`,`msg`,`level`,`account_id`,`channel`) VALUES (NOW(), ?, ?, ?, ?, ?)");
+        stmt.addString(player->GetName());
+        stmt.addString(msg.c_str());
+        stmt.addUInt32(player->getLevel());
+        stmt.addUInt32(player->GetSession()->GetAccountId());
+        stmt.addString(channel_str.c_str());
+        stmt.Execute();
+        return;
+    }
+
+    CheckDateSwitch();
+
+    std::string log_str = "";
+
+    log_str.append("[");
+    log_str.append(player->GetName());
+    log_str.append("]->CHANNEL:");
+
+    if (channel.size() == 0)
+    {
+        log_str.append("[unknown channel] ");
+    }
+    else
+    {
+        log_str.append("[");
+        log_str.append(channel);
+        log_str.append("] ");
+    }
+
+    log_str.append(msg);
+
+    log_str.append("\n");
+
+    if (m_bScreenFlag[CHAT_LOG_CHANNEL])
+        printf("%s", log_str.c_str());
+
+    if (files[CHAT_LOG_CHANNEL])
+    {
+        OutTimestamp(files[CHAT_LOG_CHANNEL]);
+        fprintf(files[CHAT_LOG_CHANNEL], "%s", log_str.c_str());
+        fflush(files[CHAT_LOG_CHANNEL]);
+    }
+}
+
+void ChatLog::RaidMsg(Player* player, std::string& msg, uint32 type)
+{
+    if (!_ChatCommon(CHAT_LOG_RAID, player, msg))
+        return;
+
+    if (m_uiChatLogMethod == CHAT_LOG_METHOD_SQL)
+    {
+        std::string group_str = "";
+        Group* group = player->GetGroup();
+        if (!group)
+            group_str.append("[unknown raid]");
+        else
+        {
+            Player* gm_member;
+            Group::MemberSlotList g_members = group->GetMemberSlots();
+            for (Group::member_citerator itr = g_members.begin(); itr != g_members.end(); itr++)
+            {
+                gm_member = sObjectMgr.GetPlayer(itr->guid);
+                if (gm_member)
+                {
+                    group_str.append(itr->name);
+                    group_str.append(",");
+                }
+            }
+            if (group_str.length() > 1)
+                group_str.erase(group_str.length() - 1);
+        }
+
+        static SqlStatementID insChat;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(insChat, "INSERT INTO `chat_log_raid` (`date_time`,`type`,`pname`,`msg`,`level`,`account_id`,`members`) VALUES (NOW(), ?, ?, ?, ?, ?, ?)");
+        stmt.addUInt32(type);
+        stmt.addString(player->GetName());
+        stmt.addString(msg.c_str());
+        stmt.addUInt32(player->getLevel());
+        stmt.addUInt32(player->GetSession()->GetAccountId());
+        stmt.addString(group_str.c_str());
+        stmt.Execute();
+        return;
+    }
+
+    CheckDateSwitch();
+
+    std::string log_str = "";
+
+    log_str.append("[");
+    log_str.append(player->GetName());
+
+    switch (type)
+    {
+        case CHAT_MSG_RAID:
+            log_str.append("]->RAID:");
+            break;
+
+        case CHAT_MSG_RAID_LEADER:
+            log_str.append("]->RAID_LEADER:");
+            break;
+
+        case CHAT_MSG_RAID_WARNING:
+            log_str.append("]->RAID_WARN:");
+            break;
+
+        default:
+            log_str.append("]->RAID_UNKNOWN:");
+            break;
+    }
+
+    Group* group = player->GetGroup();
+    if (!group)
+    {
+        log_str.append("[unknown raid] ");
+    }
+    else
+    {
+        // obtain group information
+        log_str.append("[");
+
+        ObjectGuid gm_leader_GUID = group->GetLeaderGuid();
+        Player* gm_member;
+
+        gm_member = sObjectMgr.GetPlayer(gm_leader_GUID);
+        if (gm_member)
+        {
+            log_str.append(gm_member->GetName());
+            log_str.append(",");
+        }
+
+        Group::MemberSlotList g_members = group->GetMemberSlots();
+
+        for (Group::member_citerator itr = g_members.begin(); itr != g_members.end(); itr++)
+        {
+            if (itr->guid == gm_leader_GUID)
+                continue;
+
+            gm_member = sObjectMgr.GetPlayer(itr->guid);
+            if (gm_member)
+            {
+                log_str.append(itr->name);
+                log_str.append(",");
+            }
+        }
+
+        log_str.erase(log_str.length() - 1);
+        log_str.append("] ");
+    }
+
+    log_str.append(msg);
+
+    log_str.append("\n");
+
+    if (m_bScreenFlag[CHAT_LOG_RAID])
+        printf("%s", log_str.c_str());
+
+    if (files[CHAT_LOG_RAID])
+    {
+        OutTimestamp(files[CHAT_LOG_RAID]);
+        fprintf(files[CHAT_LOG_RAID], "%s", log_str.c_str());
+        fflush(files[CHAT_LOG_RAID]);
+    }
+}
+
+void ChatLog::BattleGroundMsg(Player* player, std::string& msg, uint32 type)
+{
+    if (!_ChatCommon(CHAT_LOG_BATTLEGROUND, player, msg))
+        return;
+
+    if (m_uiChatLogMethod == CHAT_LOG_METHOD_SQL)
+    {
+        std::string group_str = "";
+        Group* group = player->GetGroup();
+        if (!group)
+            group_str.append("[unknown group]");
+        else
+        {
+            Player* gm_member;
+            Group::MemberSlotList g_members = group->GetMemberSlots();
+            for (Group::member_citerator itr = g_members.begin(); itr != g_members.end(); itr++)
+            {
+                gm_member = sObjectMgr.GetPlayer(itr->guid);
+                if (gm_member)
+                {
+                    group_str.append(itr->name);
+                    group_str.append(",");
+                }
+            }
+            if (group_str.length() > 1)
+                group_str.erase(group_str.length() - 1);
+        }
+
+        static SqlStatementID insChat;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(insChat, "INSERT INTO `chat_log_bg` (`date_time`,`type`,`pname`,`msg`,`level`,`account_id`,`members`) VALUES (NOW(), ?, ?, ?, ?, ?, ?)");
+        stmt.addUInt32(type);
+        stmt.addString(player->GetName());
+        stmt.addString(msg.c_str());
+        stmt.addUInt32(player->getLevel());
+        stmt.addUInt32(player->GetSession()->GetAccountId());
+        stmt.addString(group_str.c_str());
+        stmt.Execute();
+        return;
+    }
+
+    CheckDateSwitch();
+
+    std::string log_str = "";
+
+    log_str.append("[");
+    log_str.append(player->GetName());
+
+    switch (type)
+    {
+        case CHAT_MSG_BATTLEGROUND:
+            log_str.append("]->BG:");
+            break;
+
+        case CHAT_MSG_BATTLEGROUND_LEADER:
+            log_str.append("]->BG_LEADER:");
+            break;
+
+        default:
+            log_str.append("]->BG_UNKNOWN:");
+            break;
+    }
+
+    Group* group = player->GetGroup();
+    if (!group)
+    {
+        log_str.append("[unknown group] ");
+    }
+    else
+    {
+        // obtain group information
+        log_str.append("[");
+
+        ObjectGuid gm_leader_GUID = group->GetLeaderGuid();
+        Player* gm_member;
+
+        gm_member = sObjectMgr.GetPlayer(gm_leader_GUID);
+        if (gm_member)
+        {
+            log_str.append(gm_member->GetName());
+            log_str.append(",");
+        }
+
+        Group::MemberSlotList g_members = group->GetMemberSlots();
+
+        for (Group::member_citerator itr = g_members.begin(); itr != g_members.end(); itr++)
+        {
+            if (itr->guid == gm_leader_GUID)
+                continue;
+
+            gm_member = sObjectMgr.GetPlayer(itr->guid);
+            if (gm_member)
+            {
+                log_str.append(itr->name);
+                log_str.append(",");
+            }
+        }
+
+        log_str.erase(log_str.length() - 1);
+        log_str.append("] ");
+    }
+
+    log_str.append(msg);
+
+    log_str.append("\n");
+
+    if (m_bScreenFlag[CHAT_LOG_BATTLEGROUND])
+        printf("%s", log_str.c_str());
+
+    if (files[CHAT_LOG_BATTLEGROUND])
+    {
+        OutTimestamp(files[CHAT_LOG_BATTLEGROUND]);
+        fprintf(files[CHAT_LOG_BATTLEGROUND], "%s", log_str.c_str());
+        fflush(files[CHAT_LOG_BATTLEGROUND]);
+    }
+}
+
+void ChatLog::OpenAllFiles()
+{
+    if (!m_bLexicsCutterEnable && m_uiChatLogMethod != CHAT_LOG_METHOD_FILE)
+        return;
+
+    std::string tempname;
+    char dstr[12];
+
+    if (m_bChatLogDateSplit)
+    {
+        time_t t = time(NULL);
+        tm* aTm = localtime(&t);
+        sprintf(dstr, "%-4d-%02d-%02d", aTm->tm_year + 1900, aTm->tm_mon + 1, aTm->tm_mday);
+    }
+
+    if (!m_sLogsDir.empty())
+    {
+        switch (m_sLogsDir[m_sLogsDir.size() - 1])
+        {
+            case '/':
+            case '\\':
+                break;
+            default:
+                m_sLogsDir.append("/");
+        }
+    }
+
+    if (m_uiChatLogMethod == CHAT_LOG_METHOD_FILE)
+    {
+        for (int8 i = 0; i < CHATLOG_CHAT_TYPES_COUNT; ++i)
+        {
+            if (m_sLogFileNames[i] != "")
+            {
+                for (int8 j = i - 1; j >= 0; --j)
+                {
+                    if (m_sLogFileNames[i] == m_sLogFileNames[j])
+                    {
+                        files[i] = files[j];
+                        break;
+                    }
+                }
+                if (!files[i])
+                {
+                    tempname = m_sLogFileNames[i];
+                    if (m_bChatLogDateSplit)
+                    {
+                        // append date instead of $d if applicable
+                        size_t dpos = tempname.find("$d");
+                        if (dpos != tempname.npos)
+                        {
+                            tempname.replace(dpos, 2, &dstr[0], 10);
+                        }
+                    }
+                    files[i] = fopen((m_sLogsDir + tempname).c_str(), "a+b");
+                    if (m_bChatLogUTFHeader && files[i] && ftell(files[i]) == 0)
+                        fputs("\xEF\xBB\xBF", files[i]);
+                }
+            }
+        }
+    }
+
+    // initialize innormative log
+    if (m_bLexicsCutterEnable)
+    {
+        if (m_sInnormativeFileName != "")
+        {
+            tempname = m_sInnormativeFileName;
+            if (m_bChatLogDateSplit)
+            {
+                // append date instead of $d if applicable
+                size_t dpos = tempname.find("$d");
+                if (dpos != tempname.npos)
+                {
+                    tempname.replace(dpos, 2, &dstr[0], 10);
+                }
+            }
+            f_innormative = fopen((m_sLogsDir + tempname).c_str(), "a+b");
+            if (m_bChatLogUTFHeader && f_innormative && (ftell(f_innormative) == 0))
+                fputs("\xEF\xBB\xBF", f_innormative);
+        }
+    }
+}
+
+void ChatLog::CloseAllFiles()
+{
+    for (uint8 i = 0; i < CHATLOG_CHAT_TYPES_COUNT; ++i)
+    {
+        if (files[i])
+        {
+            for (uint8 j = i + 1; j < CHATLOG_CHAT_TYPES_COUNT; ++j)
+            {
+                if (files[j] == files[i])
+                    files[j] = NULL;
+            }
+
+            fclose(files[i]);
+            files[i] = NULL;
+        }
+    }
+
+    if (f_innormative)
+    {
+        fclose(f_innormative);
+        f_innormative = NULL;
+    }
+}
+
+void ChatLog::CheckDateSwitch()
+{
+    if (m_bChatLogDateSplit)
+    {
+        time_t t = time(NULL);
+        tm* aTm = localtime(&t);
+        if (lastday != aTm->tm_mday)
+        {
+            // date switched
+            CloseAllFiles();
+            OpenAllFiles();
+            WriteInitStamps();
+        }
+    }
+}
+
+void ChatLog::WriteInitStamps()
+{
+    if (!m_bLexicsCutterEnable && m_uiChatLogMethod != CHAT_LOG_METHOD_FILE)
+        return;
+
+    // remember date
+    time_t t = time(NULL);
+    tm* aTm = localtime(&t);
+    lastday = aTm->tm_mday;
+
+    if (files[CHAT_LOG_CHAT])
+    {
+        OutTimestamp(files[CHAT_LOG_CHAT]);
+        fprintf(files[CHAT_LOG_CHAT], "%s", "[SYSTEM] Chat Log Initialized\n");
+    }
+    if (files[CHAT_LOG_PARTY])
+    {
+        OutTimestamp(files[CHAT_LOG_PARTY]);
+        fprintf(files[CHAT_LOG_PARTY], "%s", "[SYSTEM] Party Chat Log Initialized\n");
+    }
+    if (files[CHAT_LOG_GUILD])
+    {
+        OutTimestamp(files[CHAT_LOG_GUILD]);
+        fprintf(files[CHAT_LOG_GUILD], "%s", "[SYSTEM] Guild Chat Log Initialized\n");
+    }
+    if (files[CHAT_LOG_WHISPER])
+    {
+        OutTimestamp(files[CHAT_LOG_WHISPER]);
+        fprintf(files[CHAT_LOG_WHISPER], "%s", "[SYSTEM] Whisper Log Initialized\n");
+    }
+    if (files[CHAT_LOG_CHANNEL])
+    {
+        OutTimestamp(files[CHAT_LOG_CHANNEL]);
+        fprintf(files[CHAT_LOG_CHANNEL], "%s", "[SYSTEM] Chat Channels Log Initialized\n");
+    }
+    if (files[CHAT_LOG_RAID])
+    {
+        OutTimestamp(files[CHAT_LOG_RAID]);
+        fprintf(files[CHAT_LOG_RAID], "%s", "[SYSTEM] Raid Party Chat Log Initialized\n");
+    }
+
+    if (f_innormative)
+    {
+        OutTimestamp(f_innormative);
+        fprintf(f_innormative, "%s", "[SYSTEM] Innormative Lexics Log Initialized\n");
+    }
+}
+
+void ChatLog::OutTimestamp(FILE* file)
+{
+    time_t t = time(NULL);
+    tm* aTm = localtime(&t);
+    fprintf(file, "%-4d-%02d-%02d %02d:%02d:%02d ", aTm->tm_year + 1900, aTm->tm_mon + 1, aTm->tm_mday, aTm->tm_hour, aTm->tm_min, aTm->tm_sec);
+}
+
+void ChatLog::ChatBadLexicsAction(Player* player, std::string& msg)
+{
+    // logging
+    std::string log_str = "";
+
+    log_str.append("[");
+    log_str.append(player->GetName());
+    log_str.append("] ");
+
+    log_str.append(msg);
+
+    log_str.append("\n");
+
+    if (m_bLexicsCutterScreenLog)
+        printf("<INNORMATIVE!> %s", log_str.c_str());
+
+    if (f_innormative)
+    {
+        OutTimestamp(f_innormative);
+        fprintf(f_innormative, "%s", log_str.c_str());
+        fflush(f_innormative);
+    }
+
+    // cutting innormative lexics
+    if (m_bLexicsCutterInnormativeCut)
+    {
+        msg = m_sLexicsCutterCutReplacement;
+    }
+
+    if (!player || !player->GetSession())
+        return;
+
+    if (m_bLexicsCutterNoActionOnGM && player->GetSession()->GetSecurity())
+        return;
+
+    switch (m_iLexicsCutterAction)
+    {
+        case LEXICS_ACTION_SHEEP:
+        {
+            // sheep me, yeah, yeah, sheep me
+            player->_AddAura(118, m_iLexicsCutterActionDuration);
+            break;
+        }
+        case LEXICS_ACTION_STUN:
+        {
+            // stunned surprised
+            player->_AddAura(13005, m_iLexicsCutterActionDuration);
+            break;
+        }
+        case LEXICS_ACTION_DIE:
+        {
+            // oops, kicked the bucket
+            player->KillSelf();
+            break;
+        }
+        case LEXICS_ACTION_DRAIN:
+        {
+            // living corpse :)
+            player->KillSelf(5);
+            break;
+        }
+        case LEXICS_ACTION_SILENCE:
+        {
+            // glue the mouth
+            time_t mutetime = time(NULL) + (int) (m_iLexicsCutterActionDuration / 1000);
+            player->GetSession()->m_muteTime = mutetime;
+            break;
+        }
+        case LEXICS_ACTION_STUCK:
+        {
+            // yo, the Matrix has had you :) [by KAPATEJIb]
+            player->_AddAura(23312, m_iLexicsCutterActionDuration);
+            break;
+        }
+        case LEXICS_ACTION_SICKNESS:
+        {
+            // for absence of censorship, there is punishment [by Koshei]
+            player->_AddAura(15007, m_iLexicsCutterActionDuration);
+            break;
+        }
+        case LEXICS_ACTION_SHEAR:
+        {
+            // Lord Illidan to watch you [by Koshei]
+            player->_AddAura(41032, m_iLexicsCutterActionDuration);
+            break;
+        }
+        case LEXICS_ACTION_LOG:
+        default:
+            // no action except logging
+            break;
+    }
+}
diff --git a/src/game/ChatLog.h b/src/game/ChatLog.h
new file mode 100644
index 00000000000..feca7107c56
--- /dev/null
+++ b/src/game/ChatLog.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOSSERVER_CHATLOG_H
+#define MANGOSSERVER_CHATLOG_H
+
+#include "SharedDefines.h"
+#include "ChatLexicsCutter.h"
+#include "ObjectMgr.h"
+#include "Policies/Singleton.h"
+
+enum ChatLogMethod
+{
+    CHAT_LOG_METHOD_NONE = 0,
+    CHAT_LOG_METHOD_FILE = 1,
+    CHAT_LOG_METHOD_SQL  = 2
+};
+
+enum ChatLogFiles
+{
+    CHAT_LOG_CHAT = 0,
+    CHAT_LOG_PARTY,
+    CHAT_LOG_GUILD,
+    CHAT_LOG_WHISPER,
+    CHAT_LOG_CHANNEL,
+    CHAT_LOG_RAID,
+    CHAT_LOG_BATTLEGROUND,
+    CHATLOG_CHAT_TYPES_COUNT
+};
+
+enum LexicsActions
+{
+    LEXICS_ACTION_LOG      = 0,
+    LEXICS_ACTION_SHEEP    = 1,
+    LEXICS_ACTION_STUN     = 2,
+    LEXICS_ACTION_DIE      = 3,
+    LEXICS_ACTION_DRAIN    = 4,
+    LEXICS_ACTION_SILENCE  = 5,
+    LEXICS_ACTION_STUCK    = 6,
+    LEXICS_ACTION_SICKNESS = 7,
+    LEXICS_ACTION_SHEAR    = 8,
+};
+
+class ChatLog : public MaNGOS::Singleton<ChatLog, MaNGOS::ClassLevelLockable<ChatLog, MANGOSR2_MUTEX_MODEL_2> >
+{
+    public:
+        ChatLog();
+        ~ChatLog();
+
+        void Initialize();
+        void Uninitialize();
+
+        void ChatMsg(Player* player, std::string& msg, uint32 type);
+        void PartyMsg(Player* player, std::string& msg);
+        void GuildMsg(Player* player, std::string& msg, bool officer);
+        void WhisperMsg(Player* player, std::string& to, std::string& msg);
+        void ChannelMsg(Player* player, std::string& channel, std::string& msg);
+        void RaidMsg(Player* player, std::string& msg, uint32 type);
+        void BattleGroundMsg(Player* player, std::string& msg, uint32 type);
+
+        void ChatBadLexicsAction(Player* player, std::string& msg);
+
+        std::string m_sLogsDir;
+
+        ChatLogMethod m_uiChatLogMethod;
+
+        bool m_bChatLogDateSplit;
+        bool m_bChatLogUTFHeader;
+        bool m_bChatLogIgnoreUnprintable;
+
+        std::string m_sLogFileNames[CHATLOG_CHAT_TYPES_COUNT];
+        bool m_bScreenFlag[CHATLOG_CHAT_TYPES_COUNT];
+        bool m_bCutFlag[CHATLOG_CHAT_TYPES_COUNT];
+
+        bool m_bLexicsCutterEnable;
+        bool m_bLexicsCutterInnormativeCut;
+        bool m_bLexicsCutterNoActionOnGM;
+        bool m_bLexicsCutterScreenLog;
+        std::string m_sLexicsCutterCutReplacement;
+        int32 m_iLexicsCutterAction;
+        int32 m_iLexicsCutterActionDuration;
+        bool m_bLexicsCutterIgnoreMiddleSpaces;
+        bool m_bLexicsCutterIgnoreLetterRepeat;
+
+        std::string m_sAnalogsFileName;
+        std::string m_sWordsFileName;
+        std::string m_sInnormativeFileName;
+
+    private:
+        bool _ChatCommon(ChatLogFiles ChatType, Player* player, std::string& msg);
+
+        FILE* files[CHATLOG_CHAT_TYPES_COUNT];
+
+        int lastday;
+
+        LexicsCutter* Lexics;
+
+        FILE* f_innormative;
+
+        void OpenAllFiles();
+        void CloseAllFiles();
+        void CheckDateSwitch();
+
+        void WriteInitStamps();
+        void OutTimestamp(FILE* file);
+};
+
+#define sChatLog MaNGOS::Singleton<ChatLog>::Instance()
+
+#endif
diff --git a/src/game/CombatHandler.cpp b/src/game/CombatHandler.cpp
index 821b76bbb6f..82245be23fa 100644
--- a/src/game/CombatHandler.cpp
+++ b/src/game/CombatHandler.cpp
@@ -24,76 +24,68 @@
 #include "ObjectGuid.h"
 #include "Player.h"
 
-void WorldSession::HandleAttackSwingOpcode( WorldPacket & recv_data )
+void WorldSession::HandleAttackSwingOpcode(WorldPacket& recv_data)
 {
     ObjectGuid guid;
     recv_data >> guid;
 
     DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "WORLD: Recvd CMSG_ATTACKSWING Message %s", guid.GetString().c_str());
 
-    if(!guid.IsUnit())
+    if (!guid.IsUnit())
     {
         sLog.outError("WORLD: %s isn't unit", guid.GetString().c_str());
         return;
     }
 
-    Unit *pEnemy = _player->GetMap()->GetUnit(guid);
+    Unit* pEnemy = _player->GetMap()->GetUnit(guid);
 
-    if(!pEnemy)
+    if (!pEnemy)
     {
-        sLog.outError( "WORLD: Enemy %s not found", guid.GetString().c_str());
+        sLog.outError("WORLD: Enemy %s not found", guid.GetString().c_str());
 
         // stop attack state at client
-        SendAttackStop(NULL);
+        GetPlayer()->SendMeleeAttackStop(NULL);
         return;
     }
 
-    if(_player->IsFriendlyTo(pEnemy) || pEnemy->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE))
+    if (_player->IsFriendlyTo(pEnemy) || pEnemy->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE))
     {
-        sLog.outError( "WORLD: Enemy %s is friendly",guid.GetString().c_str());
+        sLog.outError("WORLD: Enemy %s is friendly", guid.GetString().c_str());
 
         // stop attack state at client
-        SendAttackStop(pEnemy);
+        GetPlayer()->SendMeleeAttackStop(pEnemy);
         return;
     }
 
-    if(!pEnemy->isAlive())
+    if (!pEnemy->isAlive())
     {
         // client can generate swing to known dead target if autoswitch between autoshot and autohit is enabled in client options
         // stop attack state at client
-        SendAttackStop(pEnemy);
+        GetPlayer()->SendMeleeAttackStop(pEnemy);
         return;
     }
 
-    _player->Attack(pEnemy,true);
+    _player->Attack(pEnemy, true);
 }
 
-void WorldSession::HandleAttackStopOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleAttackStopOpcode(WorldPacket& /*recv_data*/)
 {
     GetPlayer()->AttackStop();
 }
 
-void WorldSession::HandleSetSheathedOpcode( WorldPacket & recv_data )
+void WorldSession::HandleSetSheathedOpcode(WorldPacket& recv_data)
 {
     uint32 sheathed;
     recv_data >> sheathed;
 
-    //DEBUG_LOG( "WORLD: Recvd CMSG_SETSHEATHED Message guidlow:%u value1:%u", GetPlayer()->GetGUIDLow(), sheathed );
+    // DEBUG_LOG( "WORLD: Recvd CMSG_SETSHEATHED Message guidlow:%u value1:%u", GetPlayer()->GetGUIDLow(), sheathed );
 
-    if(sheathed >= MAX_SHEATH_STATE)
+    if (sheathed >= MAX_SHEATH_STATE)
     {
-        sLog.outError("Unknown sheath state %u ??",sheathed);
+        sLog.outError("Unknown sheath state %u ??", sheathed);
         return;
     }
 
     GetPlayer()->SetSheath(SheathState(sheathed));
 }
 
-void WorldSession::SendAttackStop(Unit const* enemy)
-{
-    WorldPacket data( SMSG_ATTACKSTOP, (4+20) );            // we guess size
-    data << GetPlayer()->GetPackGUID();
-    data << (enemy ? enemy->GetPackGUID() : PackedGuid());  // must be packed guid
-    data << uint32(0);                                      // unk, can be 1 also
-    SendPacket(&data);
-}
diff --git a/src/game/ConfusedMovementGenerator.cpp b/src/game/ConfusedMovementGenerator.cpp
deleted file mode 100644
index 01d4a5ac472..00000000000
--- a/src/game/ConfusedMovementGenerator.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "ConfusedMovementGenerator.h"
-#include "MapManager.h"
-#include "Creature.h"
-#include "Player.h"
-#include "movement/MoveSplineInit.h"
-#include "movement/MoveSpline.h"
-#include "PathFinder.h"
-
-template<class T>
-void ConfusedMovementGenerator<T>::Initialize(T &unit)
-{
-    // set initial position
-    unit.GetPosition(i_x, i_y, i_z);
-
-    unit.StopMoving();
-    unit.addUnitState(UNIT_STAT_CONFUSED|UNIT_STAT_CONFUSED_MOVE);
-}
-
-template<class T>
-void ConfusedMovementGenerator<T>::Interrupt(T &unit)
-{
-    // confused state still applied while movegen disabled
-    unit.clearUnitState(UNIT_STAT_CONFUSED_MOVE);
-}
-
-template<class T>
-void ConfusedMovementGenerator<T>::Reset(T &unit)
-{
-    i_nextMoveTime.Reset(0);
-    unit.StopMoving();
-    unit.addUnitState(UNIT_STAT_CONFUSED|UNIT_STAT_CONFUSED_MOVE);
-}
-
-template<class T>
-bool ConfusedMovementGenerator<T>::Update(T &unit, const uint32 &diff)
-{
-    // ignore in case other no reaction state
-    if (unit.hasUnitState(UNIT_STAT_CAN_NOT_REACT & ~UNIT_STAT_CONFUSED))
-        return true;
-
-    if (i_nextMoveTime.Passed())
-    {
-        // currently moving, update location
-        unit.addUnitState(UNIT_STAT_CONFUSED_MOVE);
-
-        if (unit.movespline->Finalized())
-            i_nextMoveTime.Reset(urand(800, 1500));
-    }
-    else
-    {
-        // waiting for next move
-        i_nextMoveTime.Update(diff);
-        if(i_nextMoveTime.Passed() )
-        {
-            // start moving
-            unit.addUnitState(UNIT_STAT_CONFUSED_MOVE);
-
-            float x = i_x + 10.0f*(rand_norm_f() - 0.5f);
-            float y = i_y + 10.0f*(rand_norm_f() - 0.5f);
-            float z = i_z;
-
-            unit.UpdateAllowedPositionZ(x, y, z);
-
-            PathFinder path(&unit);
-            path.setPathLengthLimit(30.0f);
-            path.calculate(x, y, z);
-            if(path.getPathType() & PATHFIND_NOPATH)
-            {
-                i_nextMoveTime.Reset(urand(800, 1000));
-                return true;
-            }
-
-            Movement::MoveSplineInit init(unit);
-            init.MovebyPath(path.getPath());
-            init.SetWalk(true);
-            init.Launch();
-        }
-    }
-
-    return true;
-}
-
-template<>
-void ConfusedMovementGenerator<Player>::Finalize(Player &unit)
-{
-    unit.clearUnitState(UNIT_STAT_CONFUSED|UNIT_STAT_CONFUSED_MOVE);
-    unit.StopMoving();
-}
-
-template<>
-void ConfusedMovementGenerator<Creature>::Finalize(Creature &unit)
-{
-    unit.clearUnitState(UNIT_STAT_CONFUSED|UNIT_STAT_CONFUSED_MOVE);
-}
-
-template void ConfusedMovementGenerator<Player>::Initialize(Player &player);
-template void ConfusedMovementGenerator<Creature>::Initialize(Creature &creature);
-template void ConfusedMovementGenerator<Player>::Interrupt(Player &player);
-template void ConfusedMovementGenerator<Creature>::Interrupt(Creature &creature);
-template void ConfusedMovementGenerator<Player>::Reset(Player &player);
-template void ConfusedMovementGenerator<Creature>::Reset(Creature &creature);
-template bool ConfusedMovementGenerator<Player>::Update(Player &player, const uint32 &diff);
-template bool ConfusedMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff);
diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp
index 4a9a664fd01..da870bdc340 100644
--- a/src/game/Corpse.cpp
+++ b/src/game/Corpse.cpp
@@ -27,7 +27,10 @@
 #include "World.h"
 #include "ObjectMgr.h"
 
-Corpse::Corpse(CorpseType type) : WorldObject()
+Corpse::Corpse(CorpseType type) : WorldObject(),
+    loot(this),
+    lootRecipient(NULL),
+    lootForBody(false)
 {
     m_objectType |= TYPEMASK_CORPSE;
     m_objectTypeId = TYPEID_CORPSE;
@@ -39,8 +42,6 @@ Corpse::Corpse(CorpseType type) : WorldObject()
     m_type = type;
 
     m_time = time(NULL);
-
-    lootForBody = false;
 }
 
 Corpse::~Corpse()
@@ -50,42 +51,42 @@ Corpse::~Corpse()
 void Corpse::AddToWorld()
 {
     ///- Register the corpse for guid lookup
-    if(!IsInWorld())
+    if (!IsInWorld())
         sObjectAccessor.AddObject(this);
 
     Object::AddToWorld();
 }
 
-void Corpse::RemoveFromWorld()
+void Corpse::RemoveFromWorld(bool remove)
 {
     ///- Remove the corpse from the accessor
-    if(IsInWorld())
+    if (IsInWorld())
         sObjectAccessor.RemoveObject(this);
 
-    Object::RemoveFromWorld();
+    Object::RemoveFromWorld(remove);
 }
 
-bool Corpse::Create( uint32 guidlow )
+bool Corpse::Create(uint32 guidlow)
 {
-    Object::_Create(guidlow, 0, HIGHGUID_CORPSE);
+    Object::_Create(ObjectGuid(HIGHGUID_CORPSE, guidlow));
     return true;
 }
 
-bool Corpse::Create( uint32 guidlow, Player *owner)
+bool Corpse::Create(uint32 guidlow, Player* owner)
 {
     MANGOS_ASSERT(owner);
 
-    WorldObject::_Create(guidlow, HIGHGUID_CORPSE, owner->GetPhaseMask());
-    Relocate(owner->GetPositionX(), owner->GetPositionY(), owner->GetPositionZ(), owner->GetOrientation());
+    WorldObject::_Create(ObjectGuid(HIGHGUID_CORPSE, guidlow), owner->GetPhaseMask());
+    Relocate(owner->GetPosition());
 
-    //we need to assign owner's map for corpse
-    //in other way we will get a crash in Corpse::SaveToDB()
+    // we need to assign owner's map for corpse
+    // in other way we will get a crash in Corpse::SaveToDB()
     SetMap(owner->GetMap());
 
-    if(!IsPositionValid())
+    if (!IsPositionValid())
     {
         sLog.outError("Corpse (guidlow %d, owner %s) not created. Suggested coordinates isn't valid (X: %f Y: %f)",
-            guidlow, owner->GetName(), owner->GetPositionX(), owner->GetPositionY());
+                      guidlow, owner->GetName(), owner->GetPositionX(), owner->GetPositionY());
         return false;
     }
 
@@ -115,11 +116,11 @@ void Corpse::SaveToDB()
         << GetPositionZ() << ", "
         << GetOrientation() << ", "
         << GetMapId() << ", "
-        << uint64(m_time) <<", "
+        << uint64(m_time) << ", "
         << uint32(GetType()) << ", "
         << int(GetInstanceId()) << ", "
         << uint16(GetPhaseMask()) << ")";           // prevent out of range error
-    CharacterDatabase.Execute( ss.str().c_str() );
+    CharacterDatabase.Execute(ss.str().c_str());
     CharacterDatabase.CommitTransaction();
 }
 
@@ -149,32 +150,32 @@ void Corpse::DeleteFromDB()
     stmt.PExecute(GetOwnerGuid().GetCounter());
 }
 
-bool Corpse::LoadFromDB(uint32 lowguid, Field *fields)
+bool Corpse::LoadFromDB(uint32 lowguid, Field* fields)
 {
     ////                                                    0            1       2                  3                  4                  5                   6
-    //QueryResult *result = CharacterDatabase.Query("SELECT corpse.guid, player, corpse.position_x, corpse.position_y, corpse.position_z, corpse.orientation, corpse.map,"
+    // QueryResult *result = CharacterDatabase.Query("SELECT corpse.guid, player, corpse.position_x, corpse.position_y, corpse.position_z, corpse.orientation, corpse.map,"
     ////   7     8            9         10         11      12    13     14           15            16              17       18
     //    "time, corpse_type, instance, phaseMask, gender, race, class, playerBytes, playerBytes2, equipmentCache, guildId, playerFlags FROM corpse"
-    uint32 playerLowGuid= fields[1].GetUInt32();
-    float positionX     = fields[2].GetFloat();
-    float positionY     = fields[3].GetFloat();
-    float positionZ     = fields[4].GetFloat();
-    float orientation   = fields[5].GetFloat();
-    uint32 mapid        = fields[6].GetUInt32();
+    uint32 playerLowGuid = fields[1].GetUInt32();
+    WorldLocation position( fields[6].GetUInt32(),   //MapId
+                            fields[2].GetFloat(),    // x
+                            fields[3].GetFloat(),    // y
+                            fields[4].GetFloat(),    // z
+                            fields[5].GetFloat(),    // orientation
+                            fields[10].GetUInt32(),  // PhaseMask
+                            fields[9].GetUInt32());  // InstanceId
 
-    Object::_Create(lowguid, 0, HIGHGUID_CORPSE);
+    Object::_Create(ObjectGuid(HIGHGUID_CORPSE, lowguid));
 
     m_time = time_t(fields[7].GetUInt64());
     m_type = CorpseType(fields[8].GetUInt32());
 
-    if(m_type >= MAX_CORPSE_TYPE)
+    if (m_type >= MAX_CORPSE_TYPE)
     {
         sLog.outError("%s Owner %s have wrong corpse type (%i), not load.", GetGuidStr().c_str(), GetOwnerGuid().GetString().c_str(), m_type);
         return false;
     }
 
-    uint32 instanceid   = fields[9].GetUInt32();
-    uint32 phaseMask    = fields[10].GetUInt32();
     uint8 gender        = fields[11].GetUInt8();
     uint8 race          = fields[12].GetUInt8();
     uint8 _class        = fields[13].GetUInt8();
@@ -192,8 +193,8 @@ bool Corpse::LoadFromDB(uint32 lowguid, Field *fields)
 
     SetObjectScale(DEFAULT_OBJECT_SCALE);
 
-    PlayerInfo const *info = sObjectMgr.GetPlayerInfo(race, _class);
-    if(!info)
+    PlayerInfo const* info = sObjectMgr.GetPlayerInfo(race, _class);
+    if (!info)
     {
         sLog.outError("Player %u has incorrect race/class pair.", GetGUIDLow());
         return false;
@@ -201,13 +202,13 @@ bool Corpse::LoadFromDB(uint32 lowguid, Field *fields)
     SetUInt32Value(CORPSE_FIELD_DISPLAY_ID, gender == GENDER_FEMALE ? info->displayId_f : info->displayId_m);
 
     // Load equipment
-    Tokens data = StrSplit(fields[16].GetCppString(), " ");
-    for (uint8 slot = 0; slot < EQUIPMENT_SLOT_END; slot++)
+    Tokens data(fields[16].GetCppString(), ' ');
+    for (uint8 slot = 0; slot < EQUIPMENT_SLOT_END; ++slot)
     {
         uint32 visualbase = slot * 2;
-        uint32 item_id = GetUInt32ValueFromArray(data, visualbase);
-        const ItemPrototype * proto = ObjectMgr::GetItemPrototype(item_id);
-        if(!proto)
+        uint32 item_id = atoi(data[visualbase]);
+        const ItemPrototype* proto = ObjectMgr::GetItemPrototype(item_id);
+        if (!proto)
         {
             SetUInt32Value(CORPSE_FIELD_ITEM + slot, 0);
             continue;
@@ -221,30 +222,26 @@ bool Corpse::LoadFromDB(uint32 lowguid, Field *fields)
     uint8 hairstyle  = (uint8)(playerBytes >> 16);
     uint8 haircolor  = (uint8)(playerBytes >> 24);
     uint8 facialhair = (uint8)(playerBytes2);
-    SetUInt32Value( CORPSE_FIELD_BYTES_1, ((0x00) | (race << 8) | (gender << 16) | (skin << 24)) );
-    SetUInt32Value( CORPSE_FIELD_BYTES_2, ((face) | (hairstyle << 8) | (haircolor << 16) | (facialhair << 24)) );
+    SetUInt32Value(CORPSE_FIELD_BYTES_1, ((0x00) | (race << 8) | (gender << 16) | (skin << 24)));
+    SetUInt32Value(CORPSE_FIELD_BYTES_2, ((face) | (hairstyle << 8) | (haircolor << 16) | (facialhair << 24)));
 
     SetUInt32Value(CORPSE_FIELD_GUILD, guildId);
 
     uint32 flags = CORPSE_FLAG_UNK2;
-    if(playerFlags & PLAYER_FLAGS_HIDE_HELM)
+    if (playerFlags & PLAYER_FLAGS_HIDE_HELM)
         flags |= CORPSE_FLAG_HIDE_HELM;
-    if(playerFlags & PLAYER_FLAGS_HIDE_CLOAK)
+    if (playerFlags & PLAYER_FLAGS_HIDE_CLOAK)
         flags |= CORPSE_FLAG_HIDE_CLOAK;
-    SetUInt32Value( CORPSE_FIELD_FLAGS, flags );
+    SetUInt32Value(CORPSE_FIELD_FLAGS, flags);
 
     // no need to mark corpse as lootable, because corpses are not saved in battle grounds
 
-    // place
-    SetLocationInstanceId(instanceid);
-    SetLocationMapId(mapid);
-    SetPhaseMask(phaseMask, false);
-    Relocate(positionX, positionY, positionZ, orientation);
+    Relocate(position);
 
-    if(!IsPositionValid())
+    if (!IsPositionValid())
     {
         sLog.outError("%s Owner %s not created. Suggested coordinates isn't valid (X: %f Y: %f)",
-            GetGuidStr().c_str(), GetOwnerGuid().GetString().c_str(), GetPositionX(), GetPositionY());
+                      GetGuidStr().c_str(), GetOwnerGuid().GetString().c_str(), GetPositionX(), GetPositionY());
         return false;
     }
 
@@ -258,17 +255,19 @@ bool Corpse::isVisibleForInState(Player const* u, WorldObject const* viewPoint,
     return IsInWorld() && u->IsInWorld() && IsWithinDistInMap(viewPoint, GetMap()->GetVisibilityDistance() + (inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false);
 }
 
-bool Corpse::IsHostileTo( Unit const* unit ) const
+bool Corpse::IsHostileTo(Unit const* unit) const
 {
-    if (Player* owner = sObjectMgr.GetPlayer(GetOwnerGuid()))
+    Player* owner = sObjectMgr.GetPlayer(GetOwnerGuid());
+    if (owner)
         return owner->IsHostileTo(unit);
     else
         return false;
 }
 
-bool Corpse::IsFriendlyTo( Unit const* unit ) const
+bool Corpse::IsFriendlyTo(Unit const* unit) const
 {
-    if (Player* owner = sObjectMgr.GetPlayer(GetOwnerGuid()))
+    Player* owner = sObjectMgr.GetPlayer(GetOwnerGuid());
+    if (owner)
         return owner->IsFriendlyTo(unit);
     else
         return true;
@@ -276,8 +275,8 @@ bool Corpse::IsFriendlyTo( Unit const* unit ) const
 
 bool Corpse::IsExpired(time_t t) const
 {
-    if(m_type == CORPSE_BONES)
-        return m_time < t - 60*MINUTE;
+    if (m_type == CORPSE_BONES)
+        return m_time < t - 60 * MINUTE;
     else
-        return m_time < t - 3*DAY;
+        return m_time < t - 3 * DAY;
 }
diff --git a/src/game/Corpse.h b/src/game/Corpse.h
index 44eb4172887..6f0e9806776 100644
--- a/src/game/Corpse.h
+++ b/src/game/Corpse.h
@@ -50,17 +50,17 @@ enum CorpseFlags
 class Corpse : public WorldObject
 {
     public:
-        explicit Corpse( CorpseType type = CORPSE_BONES );
-        ~Corpse( );
+        explicit Corpse(CorpseType type = CORPSE_BONES);
+        ~Corpse();
 
         void AddToWorld();
-        void RemoveFromWorld();
+        virtual void RemoveFromWorld(bool remove) override;
 
-        bool Create( uint32 guidlow );
-        bool Create( uint32 guidlow, Player *owner );
+        bool Create(uint32 guidlow);
+        bool Create(uint32 guidlow, Player* owner);
 
         void SaveToDB();
-        bool LoadFromDB(uint32 guid, Field *fields);
+        bool LoadFromDB(uint32 guid, Field* fields);
 
         void DeleteBonesFromWorld();
         void DeleteFromDB();
@@ -71,8 +71,8 @@ class Corpse : public WorldObject
         void ResetGhostTime() { m_time = time(NULL); }
         CorpseType GetType() const { return m_type; }
 
-        bool IsHostileTo(Unit const* unit) const;
-        bool IsFriendlyTo(Unit const* unit) const;
+        virtual bool IsHostileTo(Unit const* unit) const override;
+        virtual bool IsFriendlyTo(Unit const* unit) const override;
 
         GridPair const& GetGrid() const { return m_grid; }
         void SetGrid(GridPair const& grid) { m_grid = grid; }
@@ -83,7 +83,7 @@ class Corpse : public WorldObject
         Player* lootRecipient;
         bool lootForBody;
 
-        GridReference<Corpse> &GetGridRef() { return m_gridRef; }
+        GridReference<Corpse>& GetGridRef() { return m_gridRef; }
 
         bool IsExpired(time_t t) const;
     private:
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index c70367fea3f..7a09be23224 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -35,22 +35,25 @@
 #include "MapManager.h"
 #include "CreatureAI.h"
 #include "CreatureAISelector.h"
+#include "CreatureEventAI.h"
+#include "PetAI.h"
 #include "Formulas.h"
-#include "WaypointMovementGenerator.h"
+#include "movementGenerators/WaypointMovementGenerator.h"
 #include "InstanceData.h"
 #include "MapPersistentStateMgr.h"
-#include "BattleGroundMgr.h"
+#include "BattleGround/BattleGroundMgr.h"
+#include "OutdoorPvP/OutdoorPvP.h"
 #include "Spell.h"
 #include "Util.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
+#include "TemporarySummon.h"
 #include "movement/MoveSplineInit.h"
 #include "CreatureLinkingMgr.h"
 
 // apply implementation of the singletons
-#include "Policies/SingletonImp.h"
-
+#include "Policies/Singleton.h"
 
 ObjectGuid CreatureData::GetObjectGuid(uint32 lowguid) const
 {
@@ -67,13 +70,13 @@ TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const
     return NULL;
 }
 
-bool VendorItemData::RemoveItem( uint32 item_id )
+bool VendorItemData::RemoveItem(uint32 item_id)
 {
     bool found = false;
-    for(VendorItemList::iterator i = m_items.begin(); i != m_items.end(); )
+    for (VendorItemList::iterator i = m_items.begin(); i != m_items.end();)
     {
         // can have many examples
-        if((*i)->item == item_id)
+        if ((*i)->item == item_id)
         {
             i = m_items.erase(i);
             found = true;
@@ -87,65 +90,42 @@ bool VendorItemData::RemoveItem( uint32 item_id )
 
 VendorItem const* VendorItemData::FindItemCostPair(uint32 item_id, uint32 extendedCost) const
 {
-    for(VendorItemList::const_iterator i = m_items.begin(); i != m_items.end(); ++i )
-        if((*i)->item == item_id && (*i)->ExtendedCost == extendedCost)
-            return *i;
-    return NULL;
-}
-
-bool AssistDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
-{
-    if (Unit* victim = m_owner.GetMap()->GetUnit(m_victimGuid))
+    for (VendorItemList::const_iterator i = m_items.begin(); i != m_items.end(); ++i)
     {
-        while (!m_assistantGuids.empty())
-        {
-            Creature* assistant = m_owner.GetMap()->GetAnyTypeCreature(*m_assistantGuids.rbegin());
-            m_assistantGuids.pop_back();
-
-            if (assistant && assistant->CanAssistTo(&m_owner, victim))
-            {
-                assistant->SetNoCallAssistance(true);
-                if(assistant->AI())
-                    assistant->AI()->AttackStart(victim);
-            }
-        }
+        // Skip checking for conditions, condition system is powerfull enough to not require additional entries only for the conditions
+        if ((*i)->item == item_id && (*i)->ExtendedCost == extendedCost)
+            return *i;
     }
-    return true;
-}
-
-AssistDelayEvent::AssistDelayEvent( ObjectGuid victim, Unit& owner, std::list<Creature*> const& assistants ) : BasicEvent(), m_victimGuid(victim), m_owner(owner)
-{
-    // Pushing guids because in delay can happen some creature gets despawned => invalid pointer
-    m_assistantGuids.reserve(assistants.size());
-    for (std::list<Creature*>::const_iterator itr = assistants.begin(); itr != assistants.end(); ++itr)
-        m_assistantGuids.push_back((*itr)->GetObjectGuid());
-}
-
-bool ForcedDespawnDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
-{
-    m_owner.ForcedDespawn();
-    return true;
+    return NULL;
 }
 
-void CreatureCreatePos::SelectFinalPoint(Creature* cr)
+void CreatureCreatePos::SelectFinalPoint(Creature* cr, bool checkLOS)
 {
     // if object provided then selected point at specific dist/angle from object forward look
     if (m_closeObject)
     {
-        if (m_dist == 0.0f)
+        if (fabs(m_dist) < M_NULL_F)
         {
-            m_pos.x = m_closeObject->GetPositionX();
-            m_pos.y = m_closeObject->GetPositionY();
-            m_pos.z = m_closeObject->GetPositionZ();
+            m_pos = m_closeObject->GetPosition();
+        }
+        else if (checkLOS)
+        {
+            m_closeObject->GetClosePoint(m_pos.x, m_pos.y, m_pos.z, cr->GetObjectBoundingRadius(), m_dist, m_angle);
+            float ox, oy, oz;
+            m_closeObject->GetPosition(ox, oy, oz);
+            m_closeObject->UpdateAllowedPositionZ(ox, oy, oz);
+            m_map->GetHitPosition(ox, oy, oz, m_pos.x, m_pos.y, m_pos.z, GetPhaseMask(), -0.5f);
         }
         else
             m_closeObject->GetClosePoint(m_pos.x, m_pos.y, m_pos.z, cr->GetObjectBoundingRadius(), m_dist, m_angle);
+
+        m_closeObject->UpdateAllowedPositionZ(m_pos.x, m_pos.y, m_pos.z);
     }
 }
 
 bool CreatureCreatePos::Relocate(Creature* cr) const
 {
-    cr->Relocate(m_pos.x, m_pos.y, m_pos.z, m_pos.o);
+    cr->Relocate(m_pos);
 
     if (!cr->IsPositionValid())
     {
@@ -156,27 +136,23 @@ bool CreatureCreatePos::Relocate(Creature* cr) const
     return true;
 }
 
-Creature::Creature(CreatureSubtype subtype) :
-Unit(), i_AI(NULL),
-lootForPickPocketed(false), lootForBody(false), lootForSkin(false), m_groupLootTimer(0), m_groupLootId(0),
-m_lootMoney(0), m_lootGroupRecipientId(0),
-m_corpseDecayTimer(0), m_respawnTime(0), m_respawnDelay(25), m_corpseDelay(60), m_respawnradius(5.0f),
-m_subtype(subtype), m_defaultMovementType(IDLE_MOTION_TYPE), m_equipmentId(0),
-m_AlreadyCallAssistance(false), m_AlreadySearchedAssistance(false),
-m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false),
-m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_originalEntry(0), m_temporaryFactionFlags(TEMPFACTION_NONE),
-m_creatureInfo(NULL)
+Creature::Creature(CreatureSubtype subtype) : Unit(),
+    i_AI(NULL),
+    loot(this),
+    lootForPickPocketed(false), lootForBody(false), lootForSkin(false),
+    m_lootMoney(0),
+    m_corpseDecayTimer(0), m_respawnTime(0), m_respawnDelay(25), m_corpseDelay(60), m_respawnradius(5.0f), m_aggroDelay(0),
+    m_subtype(subtype), m_defaultMovementType(IDLE_MOTION_TYPE), m_equipmentId(0),
+    m_AlreadyCallAssistance(false), m_AlreadySearchedAssistance(false),
+    m_AI_locked(false), m_isDeadByDefault(false), m_temporaryFactionFlags(TEMPFACTION_NONE),
+    m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_originalEntry(0),
+    m_creatureInfo(NULL),
+    m_modelInhabitType(-1)
 {
     m_regenTimer = 200;
     m_valuesCount = UNIT_END;
 
-    for(int i = 0; i < CREATURE_MAX_SPELLS; ++i)
-        m_spells[i] = 0;
-
-    m_CreatureSpellCooldowns.clear();
-    m_CreatureCategoryCooldowns.clear();
-
-    SetWalk(true);
+    SetWalk(true, true);
 }
 
 Creature::~Creature()
@@ -191,27 +167,32 @@ Creature::~Creature()
 
 void Creature::AddToWorld()
 {
-    ///- Register the creature for guid lookup
-    if (!IsInWorld() && GetObjectGuid().IsCreatureOrVehicle())
-        GetMap()->GetObjectsStore().insert<Creature>(GetObjectGuid(), (Creature*)this);
-
     Unit::AddToWorld();
+
+    // Not one time call this "added to world" creatures, spawned with negative spawn time (BG events mostly)
+    if (GetVehicleKit())
+        GetVehicleKit()->Reset();
 }
 
-void Creature::RemoveFromWorld()
+void Creature::RemoveFromWorld(bool remove)
 {
-    ///- Remove the creature from the accessor
-    if (IsInWorld() && GetObjectGuid().IsCreatureOrVehicle())
-        GetMap()->GetObjectsStore().erase<Creature>(GetObjectGuid(), (Creature*)NULL);
-
-    Unit::RemoveFromWorld();
+    Unit::RemoveFromWorld(remove);
 }
 
 void Creature::RemoveCorpse()
 {
-    if ((getDeathState() != CORPSE && !m_isDeadByDefault) || (getDeathState() != ALIVE && m_isDeadByDefault))
+    // since pool system can fail to roll unspawned object, this one can remain spawned, so must set respawn nevertheless
+    if (uint16 poolid = sPoolMgr.IsPartOfAPool<Creature>(GetGUIDLow()))
+        sPoolMgr.UpdatePool<Creature>(*GetMap()->GetPersistentState(), poolid, GetGUIDLow());
+
+    if (!IsInWorld())                                       // can be despawned by update pool
         return;
 
+    if (((getDeathState() != CORPSE && getDeathState() != GHOULED) && !m_isDeadByDefault) || (getDeathState() != ALIVE && m_isDeadByDefault))
+        return;
+
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Removing corpse of %s ", GetGuidStr().c_str());
+
     m_corpseDecayTimer = 0;
     SetDeathState(DEAD);
     UpdateObjectVisibility();
@@ -229,28 +210,35 @@ void Creature::RemoveCorpse()
     if (respawnDelay)
         m_respawnTime = time(NULL) + respawnDelay;
 
-    float x, y, z, o;
-    GetRespawnCoord(x, y, z, &o);
-    GetMap()->CreatureRelocation(this, x, y, z, o);
+    WorldLocation loc = GetRespawnCoord();
+    GetMap()->Relocation(this, loc);
+    DisableSpline();
+
+    // forced recreate creature object at clients
+    UnitVisibility currentVis = GetVisibility();
+    SetVisibility(VISIBILITY_REMOVE_CORPSE);
+    UpdateObjectVisibility();
+    SetVisibility(currentVis);                              // restore visibility state
+    UpdateObjectVisibility();
 }
 
 /**
  * change the entry of creature until respawn
  */
-bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameEventCreatureData const* eventData /*=NULL*/ )
+bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameEventCreatureData const* eventData /*=NULL*/)
 {
     // use game event entry if any instead default suggested
     if (eventData && eventData->entry_id)
         Entry = eventData->entry_id;
 
-    CreatureInfo const *normalInfo = ObjectMgr::GetCreatureTemplate(Entry);
-    if(!normalInfo)
+    CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(Entry);
+    if (!normalInfo)
     {
         sLog.outErrorDb("Creature::UpdateEntry creature entry %u does not exist.", Entry);
         return false;
     }
 
-    CreatureInfo const *cinfo = normalInfo;
+    CreatureInfo const* cinfo = normalInfo;
     for (Difficulty diff = GetMap()->GetDifficulty(); diff > REGULAR_DIFFICULTY; diff = GetPrevDifficulty(diff, GetMap()->IsRaid()))
     {
         // we already have valid Map pointer for current creature!
@@ -268,13 +256,13 @@ bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameE
     SetEntry(Entry);                                        // normal entry always
     m_creatureInfo = cinfo;                                 // map mode related always
 
-    SetObjectScale(cinfo->scale);
+    SetObjectScale(cinfo->Scale);
 
     // equal to player Race field, but creature does not have race
     SetByteValue(UNIT_FIELD_BYTES_0, 0, 0);
 
     // known valid are: CLASS_WARRIOR,CLASS_PALADIN,CLASS_ROGUE,CLASS_MAGE
-    SetByteValue(UNIT_FIELD_BYTES_0, 1, uint8(cinfo->unit_class));
+    SetByteValue(UNIT_FIELD_BYTES_0, 1, uint8(cinfo->UnitClass));
 
     uint32 display_id = ChooseDisplayId(GetCreatureInfo(), data, eventData);
     if (!display_id)                                        // Cancel load if no display id
@@ -283,7 +271,7 @@ bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameE
         return false;
     }
 
-    CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelRandomGender(display_id);
+    CreatureModelInfo const* minfo = sObjectMgr.GetCreatureModelRandomGender(display_id);
     if (!minfo)                                             // Cancel load if no model defined
     {
         sLog.outErrorDb("Creature (Entry: %u) has no model info defined in table `creature_model_info`, can't load.", Entry);
@@ -299,6 +287,24 @@ bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameE
 
     SetByteValue(UNIT_FIELD_BYTES_0, 2, minfo->gender);
 
+    // set PowerType based on unit class
+    switch (cinfo->UnitClass)
+    {
+        case CLASS_WARRIOR:
+            SetPowerType(POWER_RAGE);
+            break;
+        case CLASS_PALADIN:
+        case CLASS_MAGE:
+            SetPowerType(POWER_MANA);
+            break;
+        case CLASS_ROGUE:
+            SetPowerType(POWER_ENERGY);
+            break;
+        default:
+            sLog.outErrorDb("Creature (Entry: %u) has unhandled unit class. Power type will not be set!", Entry);
+            break;
+    }
+
     // Load creature equipment
     if (eventData && eventData->equipment_id)
     {
@@ -306,13 +312,14 @@ bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameE
     }
     else if (!data || data->equipmentId == 0)
     {
-        if (cinfo->equipmentId == 0)
-            LoadEquipment(normalInfo->equipmentId);         // use default from normal template if diff does not have any
+        if (cinfo->EquipmentTemplateId == 0)
+            LoadEquipment(normalInfo->EquipmentTemplateId); // use default from normal template if diff does not have any
         else
-            LoadEquipment(cinfo->equipmentId);              // else use from diff template
+            LoadEquipment(cinfo->EquipmentTemplateId);      // else use from diff template
     }
     else if (data && data->equipmentId != -1)
-    {                                                       // override, -1 means no equipment
+    {
+        // override, -1 means no equipment
         LoadEquipment(data->equipmentId);
     }
 
@@ -324,7 +331,10 @@ bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameE
     UpdateSpeed(MOVE_WALK, false);
     UpdateSpeed(MOVE_RUN,  false);
 
-    SetLevitate(CanFly());
+    SetLevitate(cinfo->InhabitType & INHABIT_AIR, GetObjectGuid().IsPet() ? 2.0f : 4.0f);
+
+    if (CanSwim())
+        SetSwim(IsInWater());
 
     // checked at loading
     m_defaultMovementType = MovementGeneratorType(cinfo->MovementType);
@@ -332,32 +342,30 @@ bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameE
     return true;
 }
 
-bool Creature::UpdateEntry(uint32 Entry, Team team, const CreatureData *data /*=NULL*/, GameEventCreatureData const* eventData /*=NULL*/, bool preserveHPAndPower /*=true*/)
+bool Creature::UpdateEntry(uint32 Entry, Team team, const CreatureData* data /*=NULL*/, GameEventCreatureData const* eventData /*=NULL*/, bool preserveHPAndPower /*=true*/)
 {
     if (!InitEntry(Entry, data, eventData))
         return false;
 
-    m_regenHealth = GetCreatureInfo()->RegenHealth;
-
     // creatures always have melee weapon ready if any
     SetSheath(SHEATH_STATE_MELEE);
 
     SelectLevel(GetCreatureInfo(), preserveHPAndPower ? GetHealthPercent() : 100.0f, 100.0f);
 
     if (team == HORDE)
-        setFaction(GetCreatureInfo()->faction_H);
+        setFaction(GetCreatureInfo()->FactionHorde);
     else
-        setFaction(GetCreatureInfo()->faction_A);
+        setFaction(GetCreatureInfo()->FactionAlliance);
 
-    SetUInt32Value(UNIT_NPC_FLAGS,GetCreatureInfo()->npcflag);
+    SetUInt32Value(UNIT_NPC_FLAGS, GetCreatureInfo()->NpcFlags);
 
-    uint32 attackTimer = GetCreatureInfo()->baseattacktime;
+    uint32 attackTimer = GetCreatureInfo()->MeleeBaseAttackTime;
 
     SetAttackTime(BASE_ATTACK,  attackTimer);
-    SetAttackTime(OFF_ATTACK,   attackTimer - attackTimer/4);
-    SetAttackTime(RANGED_ATTACK,GetCreatureInfo()->rangeattacktime);
+    SetAttackTime(OFF_ATTACK,   attackTimer - attackTimer / 4);
+    SetAttackTime(RANGED_ATTACK, GetCreatureInfo()->RangedBaseAttackTime);
 
-    uint32 unitFlags = GetCreatureInfo()->unit_flags;
+    uint32 unitFlags = GetCreatureInfo()->UnitFlags;
 
     // we may need to append or remove additional flags
     if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT))
@@ -367,21 +375,21 @@ bool Creature::UpdateEntry(uint32 Entry, Team team, const CreatureData *data /*=
 
     // preserve all current dynamic flags if exist
     uint32 dynFlags = GetUInt32Value(UNIT_DYNAMIC_FLAGS);
-    SetUInt32Value(UNIT_DYNAMIC_FLAGS, dynFlags ? dynFlags : GetCreatureInfo()->dynamicflags);
+    SetUInt32Value(UNIT_DYNAMIC_FLAGS, dynFlags ? dynFlags : GetCreatureInfo()->DynamicFlags);
 
-    SetModifierValue(UNIT_MOD_ARMOR,             BASE_VALUE, float(GetCreatureInfo()->armor));
-    SetModifierValue(UNIT_MOD_RESISTANCE_HOLY,   BASE_VALUE, float(GetCreatureInfo()->resistance1));
-    SetModifierValue(UNIT_MOD_RESISTANCE_FIRE,   BASE_VALUE, float(GetCreatureInfo()->resistance2));
-    SetModifierValue(UNIT_MOD_RESISTANCE_NATURE, BASE_VALUE, float(GetCreatureInfo()->resistance3));
-    SetModifierValue(UNIT_MOD_RESISTANCE_FROST,  BASE_VALUE, float(GetCreatureInfo()->resistance4));
-    SetModifierValue(UNIT_MOD_RESISTANCE_SHADOW, BASE_VALUE, float(GetCreatureInfo()->resistance5));
-    SetModifierValue(UNIT_MOD_RESISTANCE_ARCANE, BASE_VALUE, float(GetCreatureInfo()->resistance6));
+    SetModifierValue(UNIT_MOD_ARMOR,             BASE_VALUE, float(GetCreatureInfo()->Armor));
+    SetModifierValue(UNIT_MOD_RESISTANCE_HOLY,   BASE_VALUE, float(GetCreatureInfo()->ResistanceHoly));
+    SetModifierValue(UNIT_MOD_RESISTANCE_FIRE,   BASE_VALUE, float(GetCreatureInfo()->ResistanceFire));
+    SetModifierValue(UNIT_MOD_RESISTANCE_NATURE, BASE_VALUE, float(GetCreatureInfo()->ResistanceNature));
+    SetModifierValue(UNIT_MOD_RESISTANCE_FROST,  BASE_VALUE, float(GetCreatureInfo()->ResistanceFrost));
+    SetModifierValue(UNIT_MOD_RESISTANCE_SHADOW, BASE_VALUE, float(GetCreatureInfo()->ResistanceShadow));
+    SetModifierValue(UNIT_MOD_RESISTANCE_ARCANE, BASE_VALUE, float(GetCreatureInfo()->ResistanceArcane));
 
     SetCanModifyStats(true);
     UpdateAllStats();
 
     // checked and error show at loading templates
-    if (FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(GetCreatureInfo()->faction_A))
+    if (FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(GetCreatureInfo()->FactionAlliance))
     {
         if (factionTemplate->factionFlags & FACTION_TEMPLATE_FLAG_PVP)
             SetPvP(true);
@@ -389,10 +397,7 @@ bool Creature::UpdateEntry(uint32 Entry, Team team, const CreatureData *data /*=
             SetPvP(false);
     }
 
-    for(int i = 0; i < CREATURE_MAX_SPELLS; ++i)
-        m_spells[i] = GetCreatureInfo()->spells[i];
-
-    SetVehicleId(GetCreatureInfo()->vehicleId);
+    SetVehicleId(GetCreatureInfo()->VehicleTemplateId);
 
     // if eventData set then event active and need apply spell_start
     if (eventData)
@@ -401,7 +406,7 @@ bool Creature::UpdateEntry(uint32 Entry, Team team, const CreatureData *data /*=
     return true;
 }
 
-uint32 Creature::ChooseDisplayId(const CreatureInfo *cinfo, const CreatureData *data /*= NULL*/, GameEventCreatureData const* eventData /*=NULL*/)
+uint32 Creature::ChooseDisplayId(const CreatureInfo* cinfo, const CreatureData* data /*= NULL*/, GameEventCreatureData const* eventData /*=NULL*/)
 {
     // Use creature event model explicit, override any other static models
     if (eventData && eventData->modelid)
@@ -424,12 +429,12 @@ uint32 Creature::ChooseDisplayId(const CreatureInfo *cinfo, const CreatureData *
 
     if (cinfo->ModelId[3] && cinfo->ModelId[2] && cinfo->ModelId[1] && cinfo->ModelId[0])
     {
-        display_id = cinfo->ModelId[urand(0,3)];
+        display_id = cinfo->ModelId[urand(0, 3)];
     }
     else if (cinfo->ModelId[2] && cinfo->ModelId[1] && cinfo->ModelId[0])
     {
         uint32 modelid_tmp = sObjectMgr.GetCreatureModelAlternativeModel(cinfo->ModelId[1]);
-        display_id = modelid_tmp ? cinfo->ModelId[urand(0,2)] : cinfo->ModelId[2];
+        display_id = modelid_tmp ? cinfo->ModelId[urand(0, 2)] : cinfo->ModelId[2];
     }
     else if (cinfo->ModelId[1])
     {
@@ -437,7 +442,7 @@ uint32 Creature::ChooseDisplayId(const CreatureInfo *cinfo, const CreatureData *
         // Where it's expected to select one of two, model must have a alternative model defined (alternative model is normally the same as defined in ModelId1).
         // Same pattern is used in the above model selection, but the result may be ModelId3 and not ModelId2 as here.
         uint32 modelid_tmp = sObjectMgr.GetCreatureModelAlternativeModel(cinfo->ModelId[1]);
-        display_id = modelid_tmp ? modelid_tmp : cinfo->ModelId[1];
+        display_id = modelid_tmp ? cinfo->ModelId[urand(0, 1)] : cinfo->ModelId[1];
     }
     else if (cinfo->ModelId[0])
     {
@@ -449,7 +454,7 @@ uint32 Creature::ChooseDisplayId(const CreatureInfo *cinfo, const CreatureData *
     {
         sLog.outErrorDb("Call customer support, ChooseDisplayId can not select native model for creature entry %u, model from creature entry 1 will be used instead.", cinfo->Entry);
 
-        if (const CreatureInfo *creatureDefault = ObjectMgr::GetCreatureTemplate(1))
+        if (const CreatureInfo* creatureDefault = ObjectMgr::GetCreatureTemplate(1))
             display_id = creatureDefault->ModelId[0];
     }
 
@@ -458,15 +463,18 @@ uint32 Creature::ChooseDisplayId(const CreatureInfo *cinfo, const CreatureData *
 
 void Creature::Update(uint32 update_diff, uint32 diff)
 {
-    switch( m_deathState )
+    if (CanSwim())
+        SetSwim(IsInWater());
+
+    switch (m_deathState)
     {
         case JUST_ALIVED:
             // Don't must be called, see Creature::SetDeathState JUST_ALIVED -> ALIVE promoting.
-            sLog.outError("Creature (GUIDLow: %u Entry: %u ) in wrong state: JUST_ALIVED (4)",GetGUIDLow(),GetEntry());
+            sLog.outError("Creature (GUIDLow: %u Entry: %u ) in wrong state: JUST_ALIVED (4)", GetGUIDLow(), GetEntry());
             break;
         case JUST_DIED:
             // Don't must be called, see Creature::SetDeathState JUST_DIED -> CORPSE promoting.
-            sLog.outError("Creature (GUIDLow: %u Entry: %u ) in wrong state: JUST_DEAD (1)",GetGUIDLow(),GetEntry());
+            sLog.outError("Creature (GUIDLow: %u Entry: %u ) in wrong state: JUST_DEAD (1)", GetGUIDLow(), GetEntry());
             break;
         case DEAD:
         {
@@ -474,6 +482,7 @@ void Creature::Update(uint32 update_diff, uint32 diff)
             {
                 DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Respawning...");
                 m_respawnTime = 0;
+                m_aggroDelay = sWorld.getConfig(CONFIG_UINT32_CREATURE_RESPAWN_AGGRO_DELAY);
                 lootForPickPocketed = false;
                 lootForBody         = false;
                 lootForSkin         = false;
@@ -481,32 +490,39 @@ void Creature::Update(uint32 update_diff, uint32 diff)
                 // Clear possible auras having IsDeathPersistent() attribute
                 RemoveAllAuras();
 
-                if(m_originalEntry != GetEntry())
+                if (m_originalEntry != GetEntry())
                 {
                     // need preserver gameevent state
                     GameEventCreatureData const* eventData = sGameEventMgr.GetCreatureUpdateDataForActiveEvent(GetGUIDLow());
                     UpdateEntry(m_originalEntry, TEAM_NONE, NULL, eventData);
                 }
 
-                CreatureInfo const *cinfo = GetCreatureInfo();
+                if (GetDisplayId() != GetNativeDisplayId() )
+                    SetDisplayId(GetNativeDisplayId() );
+
+                CreatureInfo const* cinfo = GetCreatureInfo();
 
                 SelectLevel(cinfo);
+                UpdateAllStats();  // to be sure stats is correct regarding level of the creature
                 SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE);
                 if (m_isDeadByDefault)
                 {
                     SetDeathState(JUST_DIED);
                     SetHealth(0);
-                    i_motionMaster.Clear();
+                    GetUnitStateMgr().InitDefaults(true);
                     clearUnitState(UNIT_STAT_ALL_STATE);
                     LoadCreatureAddon(true);
                 }
                 else
-                    SetDeathState( JUST_ALIVED );
+                    SetDeathState(JUST_ALIVED);
 
-                //Call AI respawn virtual function
+                // Call AI respawn virtual function
                 if (AI())
                     AI()->JustRespawned();
 
+                if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetZoneId()))
+                    outdoorPvP->HandleCreatureRespawn(this);
+
                 if (m_isCreatureLinkingTrigger)
                     GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_RESPAWN, this);
 
@@ -523,76 +539,69 @@ void Creature::Update(uint32 update_diff, uint32 diff)
 
             if (m_corpseDecayTimer <= update_diff)
             {
-                // since pool system can fail to roll unspawned object, this one can remain spawned, so must set respawn nevertheless
-                if (uint16 poolid = sPoolMgr.IsPartOfAPool<Creature>(GetGUIDLow()))
-                    sPoolMgr.UpdatePool<Creature>(*GetMap()->GetPersistentState(), poolid, GetGUIDLow());
-
-                if (IsInWorld())                            // can be despawned by update pool
-                {
-                    RemoveCorpse();
-                    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Removing corpse... %u ", GetEntry());
-                }
+                RemoveCorpse();
+                break;
             }
             else
-            {
                 m_corpseDecayTimer -= update_diff;
-                if (m_groupLootId)
-                {
-                    if (m_groupLootTimer <= update_diff)
-                        StopGroupLoot();
-                    else
-                        m_groupLootTimer -= update_diff;
-                }
+
+            if (m_groupLootId)                              // Loot is stopped already if corpse got removed.
+            {
+                if (m_groupLootTimer <= update_diff)
+                    StopGroupLoot();
+                else
+                    m_groupLootTimer -= update_diff;
             }
 
             break;
         }
         case ALIVE:
         {
+            if (m_aggroDelay)
+            {
+                if (m_aggroDelay <= update_diff)
+                    m_aggroDelay = 0;
+                else
+                    m_aggroDelay -= update_diff;
+            }
+
             if (m_isDeadByDefault)
             {
                 if (m_corpseDecayTimer <= update_diff)
                 {
-                    // since pool system can fail to roll unspawned object, this one can remain spawned, so must set respawn nevertheless
-                    if (uint16 poolid = sPoolMgr.IsPartOfAPool<Creature>(GetGUIDLow()))
-                        sPoolMgr.UpdatePool<Creature>(*GetMap()->GetPersistentState(), poolid, GetGUIDLow());
-
-                    if (IsInWorld())                        // can be despawned by update pool
-                    {
-                        RemoveCorpse();
-                        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Removing alive corpse... %u ", GetEntry());
-                    }
-                    else
-                        return;
+                    RemoveCorpse();
+                    break;
                 }
                 else
-                {
                     m_corpseDecayTimer -= update_diff;
-                }
             }
 
-            Unit::Update( update_diff, diff );
+            Unit::Update(update_diff, diff);
 
             // creature can be dead after Unit::Update call
             // CORPSE/DEAD state will processed at next tick (in other case death timer will be updated unexpectedly)
-            if(!isAlive())
+            if (!isAlive())
                 break;
 
-            if(!IsInEvadeMode())
+            if (!IsInEvadeMode())
             {
                 if (AI())
                 {
                     // do not allow the AI to be changed during update
-                    m_AI_locked = true;
-                    AI()->UpdateAI(diff);   // AI not react good at real update delays (while freeze in non-active part of map)
-                    m_AI_locked = false;
+                    LockAI(true);
+                    AI()->UpdateAI((update_diff > 5 * diff) ? diff : update_diff);   // AI not react good at real update delays (while freeze in non-active part of map)
+                    LockAI(false);
                 }
             }
 
             // creature can be dead after UpdateAI call
             // CORPSE/DEAD state will processed at next tick (in other case death timer will be updated unexpectedly)
-            if(!isAlive())
+            if (!isAlive())
+                break;
+
+            if (IsPet())                           // Regenerated before
                 break;
+
             RegenerateAll(update_diff);
             break;
         }
@@ -601,69 +610,93 @@ void Creature::Update(uint32 update_diff, uint32 diff)
     }
 }
 
-void Creature::StartGroupLoot( Group* group, uint32 timer )
-{
-    m_groupLootId = group->GetId();
-    m_groupLootTimer = timer;
-}
-
-void Creature::StopGroupLoot()
-{
-    if (!m_groupLootId)
-        return;
-
-    if (Group* group = sObjectMgr.GetGroupById(m_groupLootId))
-        group->EndRoll();
-
-    m_groupLootTimer = 0;
-    m_groupLootId = 0;
-}
-
 void Creature::RegenerateAll(uint32 update_diff)
 {
-    if (m_regenTimer > 0)
+    if (m_regenTimer > update_diff)
     {
-        if(update_diff >= m_regenTimer)
-            m_regenTimer = 0;
-        else
-            m_regenTimer -= update_diff;
-    }
-    if (m_regenTimer != 0)
+        m_regenTimer -= update_diff;
         return;
+    }
+    m_regenTimer = REGEN_TIME_FULL;
 
-    if (!isInCombat() || IsPolymorphed())
+    if ((!isInCombat() && !IsInEvadeMode()) || IsPolymorphed())
         RegenerateHealth();
 
-    RegenerateMana();
-
-    m_regenTimer = REGEN_TIME_FULL;
+    RegeneratePower();
 }
 
-void Creature::RegenerateMana()
+void Creature::RegeneratePower()
 {
-    uint32 curValue = GetPower(POWER_MANA);
-    uint32 maxValue = GetMaxPower(POWER_MANA);
+    Powers powerType = GetPowerType();
+    uint32 curValue = GetPower(powerType);
+    uint32 maxValue = GetMaxPower(powerType);
+
 
     if (curValue >= maxValue)
         return;
 
-    uint32 addvalue = 0;
+    float addValue = 0.0f;
 
-    // Combat and any controlled creature
-    if (isInCombat() || GetCharmerOrOwnerGuid())
+    switch (powerType)
     {
-        if(!IsUnderLastManaUseEffect())
+        case POWER_MANA:
         {
-            float ManaIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_MANA);
-            float Spirit = GetStat(STAT_SPIRIT);
+            // Combat and any controlled creature
+            if (isInCombat() || GetCharmerOrOwnerGuid())
+            {
+                if (!IsUnderLastManaUseEffect())
+                {
+                    float ManaIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_MANA);
+                    float Spirit = GetStat(STAT_SPIRIT);
 
-            addvalue = uint32((Spirit / 5.0f + 17.0f) * ManaIncreaseRate);
+                    addValue = (Spirit / 5.0f + 17.0f) * ManaIncreaseRate;
+                }
+            }
+            else
+                addValue = maxValue / 3;
+            break;
+        }
+        case POWER_ENERGY:
+        {
+            float rate = sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_ENERGY);
+
+            if (IsVehicle())
+            {
+                switch (GetVehicleInfo()->m_powerDisplayID)
+                {
+                    case ENERGY_TYPE_PYRITE:
+                    case ENERGY_TYPE_BLOOD:
+                    case ENERGY_TYPE_OOZE:
+                        break;
+                    case ENERGY_TYPE_STEAM:
+                    default:
+                        addValue = 10.0f * rate;
+                        break;
+                }
+            }
+            else
+                addValue = 20.0f * rate;
+            break;
         }
+        case POWER_FOCUS:
+            addValue = 24.0f * sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_FOCUS);
+            break;
+        default:
+            return;
     }
-    else
-        addvalue = maxValue / 3;
 
-    ModifyPower(POWER_MANA, addvalue);
+    // Apply modifiers (if any)
+    AuraList const& ModPowerRegenAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN);
+    for (AuraList::const_iterator i = ModPowerRegenAuras.begin(); i != ModPowerRegenAuras.end(); ++i)
+        if ((*i)->GetModifier()->m_miscvalue == int32(powerType))
+            addValue += (*i)->GetModifier()->m_amount;
+
+    AuraList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT);
+    for (AuraList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
+        if ((*i)->GetModifier()->m_miscvalue == int32(powerType))
+            addValue *= ((*i)->GetModifier()->m_amount + 100) / 100.0f;
+
+    ModifyPower(powerType, int32(addValue));
 }
 
 void Creature::RegenerateHealth()
@@ -671,13 +704,12 @@ void Creature::RegenerateHealth()
     if (!IsRegeneratingHealth())
         return;
 
-    uint32 curValue = GetHealth();
-    uint32 maxValue = GetMaxHealth();
+    uint32 maxvalue = GetMaxHealth();
 
-    if (curValue >= maxValue)
+    if (GetHealth() >= maxvalue)
         return;
 
-    uint32 addvalue = 0;
+    float addvalue = 0.0f;
 
     // Not only pet, but any controlled creature
     if (GetCharmerOrOwnerGuid())
@@ -685,59 +717,89 @@ void Creature::RegenerateHealth()
         float HealthIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_HEALTH);
         float Spirit = GetStat(STAT_SPIRIT);
 
-        if( GetPower(POWER_MANA) > 0 )
-            addvalue = uint32(Spirit * 0.25 * HealthIncreaseRate);
+        if (GetPower(POWER_MANA) > 0)
+            addvalue = Spirit * 0.25f * HealthIncreaseRate;
         else
-            addvalue = uint32(Spirit * 0.80 * HealthIncreaseRate);
+            addvalue = Spirit * 0.80f * HealthIncreaseRate;
     }
     else
-        addvalue = maxValue/3;
+        addvalue = maxvalue / 3.0f;
+
+    // Currenly creatures regenerate health only out of combat, but i'm think, that it's wrong /dev/rsa
+    if (!isInCombat())
+    {
+        AuraList const& mModHealthRegenPct = GetAurasByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT);
+        if (!mModHealthRegenPct.empty())
+        {
+            for (AuraList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i)
+                addvalue *= (100.0f + (*i)->GetModifier()->m_amount) * 0.01f;
+        }
+    }
+    else if (HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT))
+        addvalue *= GetTotalAuraModifier(SPELL_AURA_MOD_REGEN_DURING_COMBAT) * 0.01f;
 
-    ModifyHealth(addvalue);
+    if (addvalue > M_NULL_F)
+        ModifyHealth(uint32(addvalue));
 }
 
 void Creature::DoFleeToGetAssistance()
 {
-    if (!getVictim())
-        return;
-
     float radius = sWorld.getConfig(CONFIG_FLOAT_CREATURE_FAMILY_FLEE_ASSISTANCE_RADIUS);
-    if (radius >0)
+    if (radius > 0.0f)
     {
+        Unit* pVictim = getVictim();
+        if (!pVictim)
+            return;
+
         Creature* pCreature = NULL;
 
-        MaNGOS::NearestAssistCreatureInCreatureRangeCheck u_check(this, getVictim(), radius);
+        MaNGOS::NearestAssistCreatureInCreatureRangeCheck u_check(this, pVictim, radius);
         MaNGOS::CreatureLastSearcher<MaNGOS::NearestAssistCreatureInCreatureRangeCheck> searcher(pCreature, u_check);
         Cell::VisitGridObjects(this, searcher, radius);
 
         SetNoSearchAssistance(true);
         UpdateSpeed(MOVE_RUN, false);
 
-        if(!pCreature)
-            SetFeared(true, getVictim()->GetObjectGuid(), 0 ,sWorld.getConfig(CONFIG_UINT32_CREATURE_FAMILY_FLEE_DELAY));
+        // Interrupt spells cause of flee movement
+        if (IsNonMeleeSpellCasted(false))
+            InterruptNonMeleeSpells(false);
+
+        if (!pCreature)
+            SetFeared(true, pVictim->GetObjectGuid(), 0, sWorld.getConfig(CONFIG_UINT32_CREATURE_FAMILY_FLEE_DELAY));
         else
+        {
+            SetTargetGuid(ObjectGuid());        // creature flee loose its target
             GetMotionMaster()->MoveSeekAssistance(pCreature->GetPositionX(), pCreature->GetPositionY(), pCreature->GetPositionZ());
+        }
     }
 }
 
 bool Creature::AIM_Initialize()
 {
     // make sure nothing can change the AI during AI update
-    if(m_AI_locked)
+    if (IsAILocked())
     {
         DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "AIM_Initialize: failed to init, locked.");
         return false;
     }
 
-    CreatureAI * oldAI = i_AI;
-    i_motionMaster.Initialize();
+    LockAI(true);
+    CreatureAI* oldAI = i_AI;
+
+    GetMotionMaster()->Initialize();
+
     i_AI = FactorySelector::selectAI(this);
-    if (oldAI)
+    if (oldAI && oldAI != i_AI)
+    {
+        GetEvents()->CleanupEventList();
         delete oldAI;
+    }
+
+    LockAI(false);
     return true;
 }
 
-bool Creature::Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo const* cinfo, Team team /*= TEAM_NONE*/, const CreatureData *data /*= NULL*/, GameEventCreatureData const* eventData /*= NULL*/)
+bool Creature::Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo const* cinfo, Team team /*= TEAM_NONE*/, const CreatureData* data /*= NULL*/, GameEventCreatureData const* eventData /*= NULL*/)
 {
     SetMap(cPos.GetMap());
     SetPhaseMask(cPos.GetPhaseMask(), false);
@@ -750,13 +812,17 @@ bool Creature::Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo cons
     if (!cPos.Relocate(this))
         return false;
 
-    //Notify the map's instance data.
-    //Only works if you create the object in it, not if it is moves to that map.
-    //Normally non-players do not teleport to other maps.
+    // Notify the outdoor pvp script
+    if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetZoneId()))
+        outdoorPvP->HandleCreatureCreate(this);
+
+    // Notify the map's instance data.
+    // Only works if you create the object in it, not if it is moves to that map.
+    // Normally non-players do not teleport to other maps.
     if (InstanceData* iData = GetMap()->GetInstanceData())
         iData->OnCreatureCreate(this);
 
-    switch (GetCreatureInfo()->rank)
+    switch (GetCreatureInfo()->Rank)
     {
         case CREATURE_ELITE_RARE:
             m_corpseDelay = sWorld.getConfig(CONFIG_UINT32_CORPSE_DECAY_RARE);
@@ -778,6 +844,7 @@ bool Creature::Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo cons
     // Add to CreatureLinkingHolder if needed
     if (sCreatureLinkingMgr.GetLinkedTriggerInformation(this))
         cPos.GetMap()->GetCreatureLinkingHolder()->AddSlaveToHolder(this);
+
     if (sCreatureLinkingMgr.IsLinkedEventTrigger(this))
     {
         m_isCreatureLinkingTrigger = true;
@@ -795,7 +862,7 @@ bool Creature::IsTrainerOf(Player* pPlayer, bool msg) const
         return false;
 
     // pet trainers not have spells in fact now
-    if (GetCreatureInfo()->trainer_type != TRAINER_TYPE_PETS)
+    if (GetCreatureInfo()->TrainerType != TRAINER_TYPE_PETS)
     {
         TrainerSpellData const* cSpells = GetTrainerSpells();
         TrainerSpellData const* tSpells = GetTrainerTemplateSpells();
@@ -804,30 +871,30 @@ bool Creature::IsTrainerOf(Player* pPlayer, bool msg) const
         if ((!cSpells || cSpells->spellList.empty()) && (!tSpells || tSpells->spellList.empty()))
         {
             sLog.outErrorDb("Creature %u (Entry: %u) have UNIT_NPC_FLAG_TRAINER but have empty trainer spell list.",
-                GetGUIDLow(),GetEntry());
+                GetGUIDLow(), GetEntry());
             return false;
         }
     }
 
-    switch(GetCreatureInfo()->trainer_type)
+    switch (GetCreatureInfo()->TrainerType)
     {
         case TRAINER_TYPE_CLASS:
-            if (pPlayer->getClass() != GetCreatureInfo()->trainer_class)
+            if (pPlayer->getClass() != GetCreatureInfo()->TrainerClass)
             {
                 if (msg)
                 {
                     pPlayer->PlayerTalkClass->ClearMenus();
-                    switch(GetCreatureInfo()->trainer_class)
+                    switch (GetCreatureInfo()->TrainerClass)
                     {
-                        case CLASS_DRUID:  pPlayer->PlayerTalkClass->SendGossipMenu( 4913, GetObjectGuid()); break;
+                        case CLASS_DRUID:  pPlayer->PlayerTalkClass->SendGossipMenu(4913, GetObjectGuid()); break;
                         case CLASS_HUNTER: pPlayer->PlayerTalkClass->SendGossipMenu(10090, GetObjectGuid()); break;
-                        case CLASS_MAGE:   pPlayer->PlayerTalkClass->SendGossipMenu(  328, GetObjectGuid()); break;
-                        case CLASS_PALADIN:pPlayer->PlayerTalkClass->SendGossipMenu( 1635, GetObjectGuid()); break;
-                        case CLASS_PRIEST: pPlayer->PlayerTalkClass->SendGossipMenu( 4436, GetObjectGuid()); break;
-                        case CLASS_ROGUE:  pPlayer->PlayerTalkClass->SendGossipMenu( 4797, GetObjectGuid()); break;
-                        case CLASS_SHAMAN: pPlayer->PlayerTalkClass->SendGossipMenu( 5003, GetObjectGuid()); break;
-                        case CLASS_WARLOCK:pPlayer->PlayerTalkClass->SendGossipMenu( 5836, GetObjectGuid()); break;
-                        case CLASS_WARRIOR:pPlayer->PlayerTalkClass->SendGossipMenu( 4985, GetObjectGuid()); break;
+                        case CLASS_MAGE:   pPlayer->PlayerTalkClass->SendGossipMenu(328, GetObjectGuid()); break;
+                        case CLASS_PALADIN:pPlayer->PlayerTalkClass->SendGossipMenu(1635, GetObjectGuid()); break;
+                        case CLASS_PRIEST: pPlayer->PlayerTalkClass->SendGossipMenu(4436, GetObjectGuid()); break;
+                        case CLASS_ROGUE:  pPlayer->PlayerTalkClass->SendGossipMenu(4797, GetObjectGuid()); break;
+                        case CLASS_SHAMAN: pPlayer->PlayerTalkClass->SendGossipMenu(5003, GetObjectGuid()); break;
+                        case CLASS_WARLOCK:pPlayer->PlayerTalkClass->SendGossipMenu(5836, GetObjectGuid()); break;
+                        case CLASS_WARRIOR:pPlayer->PlayerTalkClass->SendGossipMenu(4985, GetObjectGuid()); break;
                     }
                 }
                 return false;
@@ -845,7 +912,7 @@ bool Creature::IsTrainerOf(Player* pPlayer, bool msg) const
             }
             break;
         case TRAINER_TYPE_MOUNTS:
-            if (GetCreatureInfo()->trainer_race && pPlayer->getRace() != GetCreatureInfo()->trainer_race)
+            if (GetCreatureInfo()->TrainerRace && pPlayer->getRace() != GetCreatureInfo()->TrainerRace)
             {
                 // Allowed to train if exalted
                 if (FactionTemplateEntry const* faction_template = getFactionTemplateEntry())
@@ -857,7 +924,7 @@ bool Creature::IsTrainerOf(Player* pPlayer, bool msg) const
                 if (msg)
                 {
                     pPlayer->PlayerTalkClass->ClearMenus();
-                    switch(GetCreatureInfo()->trainer_class)
+                    switch (GetCreatureInfo()->TrainerRace)
                     {
                         case RACE_DWARF:        pPlayer->PlayerTalkClass->SendGossipMenu(5865, GetObjectGuid()); break;
                         case RACE_GNOME:        pPlayer->PlayerTalkClass->SendGossipMenu(4881, GetObjectGuid()); break;
@@ -866,7 +933,7 @@ bool Creature::IsTrainerOf(Player* pPlayer, bool msg) const
                         case RACE_ORC:          pPlayer->PlayerTalkClass->SendGossipMenu(5863, GetObjectGuid()); break;
                         case RACE_TAUREN:       pPlayer->PlayerTalkClass->SendGossipMenu(5864, GetObjectGuid()); break;
                         case RACE_TROLL:        pPlayer->PlayerTalkClass->SendGossipMenu(5816, GetObjectGuid()); break;
-                        case RACE_UNDEAD:       pPlayer->PlayerTalkClass->SendGossipMenu( 624, GetObjectGuid()); break;
+                        case RACE_UNDEAD:       pPlayer->PlayerTalkClass->SendGossipMenu(624, GetObjectGuid()); break;
                         case RACE_BLOODELF:     pPlayer->PlayerTalkClass->SendGossipMenu(5862, GetObjectGuid()); break;
                         case RACE_DRAENEI:      pPlayer->PlayerTalkClass->SendGossipMenu(5864, GetObjectGuid()); break;
                     }
@@ -875,7 +942,7 @@ bool Creature::IsTrainerOf(Player* pPlayer, bool msg) const
             }
             break;
         case TRAINER_TYPE_TRADESKILLS:
-            if (GetCreatureInfo()->trainer_spell && !pPlayer->HasSpell(GetCreatureInfo()->trainer_spell))
+            if (GetCreatureInfo()->TrainerSpell && !pPlayer->HasSpell(GetCreatureInfo()->TrainerSpell))
             {
                 if (msg)
                 {
@@ -893,20 +960,20 @@ bool Creature::IsTrainerOf(Player* pPlayer, bool msg) const
 
 bool Creature::CanInteractWithBattleMaster(Player* pPlayer, bool msg) const
 {
-    if(!isBattleMaster())
+    if (!isBattleMaster())
         return false;
 
     BattleGroundTypeId bgTypeId = sBattleGroundMgr.GetBattleMasterBG(GetEntry());
     if (bgTypeId == BATTLEGROUND_TYPE_NONE)
         return false;
 
-    if(!msg)
+    if (!msg)
         return pPlayer->GetBGAccessByLevel(bgTypeId);
 
-    if(!pPlayer->GetBGAccessByLevel(bgTypeId))
+    if (!pPlayer->GetBGAccessByLevel(bgTypeId))
     {
         pPlayer->PlayerTalkClass->ClearMenus();
-        switch(bgTypeId)
+        switch (bgTypeId)
         {
             case BATTLEGROUND_AV:  pPlayer->PlayerTalkClass->SendGossipMenu(7616, GetObjectGuid()); break;
             case BATTLEGROUND_WS:  pPlayer->PlayerTalkClass->SendGossipMenu(7599, GetObjectGuid()); break;
@@ -929,99 +996,45 @@ bool Creature::CanInteractWithBattleMaster(Player* pPlayer, bool msg) const
 bool Creature::CanTrainAndResetTalentsOf(Player* pPlayer) const
 {
     return pPlayer->getLevel() >= 10
-        && GetCreatureInfo()->trainer_type == TRAINER_TYPE_CLASS
-        && pPlayer->getClass() == GetCreatureInfo()->trainer_class;
+           && GetCreatureInfo()->TrainerType == TRAINER_TYPE_CLASS
+           && pPlayer->getClass() == GetCreatureInfo()->TrainerClass;
 }
 
 void Creature::PrepareBodyLootState()
 {
     loot.clear();
 
-    // only dead
-    if (!isAlive())
+    // if have normal loot then prepare it access
+    if (!lootForBody)
     {
-        // if have normal loot then prepare it access
-        if (!lootForBody)
-        {
-            // have normal loot
-            if (GetCreatureInfo()->maxgold > 0 || GetCreatureInfo()->lootid ||
+        // have normal loot
+        if (GetCreatureInfo()->MaxLootGold > 0 || GetCreatureInfo()->LootId ||
                 // ... or can have skinning after
-                (GetCreatureInfo()->SkinLootId && sWorld.getConfig(CONFIG_BOOL_CORPSE_EMPTY_LOOT_SHOW)))
-            {
-                SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
-                return;
-            }
-        }
-
-        lootForBody = true;                                 // pass this loot mode
-
-        // if not have normal loot allow skinning if need
-        if (!lootForSkin && GetCreatureInfo()->SkinLootId)
+                (GetCreatureInfo()->SkinningLootId && sWorld.getConfig(CONFIG_BOOL_CORPSE_EMPTY_LOOT_SHOW)))
         {
-            RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
-            SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
+            SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
             return;
         }
     }
 
-    RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
-    RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
-}
-
-/**
- * Return original player who tap creature, it can be different from player/group allowed to loot so not use it for loot code
- */
-Player* Creature::GetOriginalLootRecipient() const
-{
-    return m_lootRecipientGuid ? ObjectAccessor::FindPlayer(m_lootRecipientGuid) : NULL;
-}
-
-/**
- * Return group if player tap creature as group member, independent is player after leave group or stil be group member
- */
-Group* Creature::GetGroupLootRecipient() const
-{
-    // original recipient group if set and not disbanded
-    return m_lootGroupRecipientId ? sObjectMgr.GetGroupById(m_lootGroupRecipientId) : NULL;
-}
-
-/**
- * Return player who can loot tapped creature (member of group or single player)
- *
- * In case when original player tap creature as group member then group tap prefered.
- * This is for example important if player after tap leave group.
- * If group not exist or disbanded or player tap creature not as group member return player
- */
-Player* Creature::GetLootRecipient() const
-{
-    // original recipient group if set and not disbanded
-    Group* group = GetGroupLootRecipient();
-
-    // original recipient player if online
-    Player* player = GetOriginalLootRecipient();
-
-    // if group not set or disbanded return original recipient player if any
-    if (!group)
-        return player;
+    lootForBody = true;                                     // pass this loot mode
 
-    // group case
-
-    // return player if it still be in original recipient group
-    if (player && player->GetGroup() == group)
-        return player;
-
-    // find any in group
-    for(GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
-        if (Player *p = itr->getSource())
-            return p;
+    // if not have normal loot allow skinning if need
+    if (!lootForSkin && GetCreatureInfo()->SkinningLootId)
+    {
+        RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
+        return;
+    }
 
-    return NULL;
+    RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+    RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
 }
 
 /**
  * Set player and group (if player group member) who tap creature
  */
-void Creature::SetLootRecipient(Unit *unit)
+void Creature::SetLootRecipient(Unit* unit)
 {
     // set the player whose group should receive the right
     // to loot the creature after it dies
@@ -1037,7 +1050,7 @@ void Creature::SetLootRecipient(Unit *unit)
     }
 
     Player* player = unit->GetCharmerOrOwnerPlayerOrPlayerItself();
-    if(!player)                                             // normal creature, no player involved
+    if (!player)                                            // normal creature, no player involved
         return;
 
     // set player for non group case or if group will disbanded
@@ -1055,14 +1068,14 @@ void Creature::SaveToDB()
 {
     // this should only be used when the creature has already been loaded
     // preferably after adding to map, because mapid may not be valid otherwise
-    CreatureData const *data = sObjectMgr.GetCreatureData(GetGUIDLow());
-    if(!data)
+    CreatureData const* data = sObjectMgr.GetCreatureData(GetGUIDLow());
+    if (!data)
     {
         sLog.outError("Creature::SaveToDB failed, cannot get creature data!");
         return;
     }
 
-    SaveToDB(GetMapId(), data->spawnMask,GetPhaseMask());
+    SaveToDB(GetMapId(), data->spawnMask, GetPhaseMask());
 }
 
 void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
@@ -1073,15 +1086,15 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
     uint32 displayId = GetNativeDisplayId();
 
     // check if it's a custom model and if not, use 0 for displayId
-    CreatureInfo const *cinfo = GetCreatureInfo();
+    CreatureInfo const* cinfo = GetCreatureInfo();
     if (cinfo)
     {
         if (displayId != cinfo->ModelId[0] && displayId != cinfo->ModelId[1] &&
             displayId != cinfo->ModelId[2] && displayId != cinfo->ModelId[3])
         {
-            for(int i = 0; i < MAX_CREATURE_MODEL && displayId; ++i)
+            for (int i = 0; i < MAX_CREATURE_MODEL && displayId; ++i)
                 if (cinfo->ModelId[i])
-                    if (CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[i]))
+                    if (CreatureModelInfo const* minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[i]))
                         if (displayId == minfo->modelid_other_gender)
                             displayId = 0;
         }
@@ -1092,8 +1105,8 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
     // data->guid = guid don't must be update at save
     data.id = GetEntry();
     data.mapid = mapid;
-    data.spawnMask = spawnMask;
     data.phaseMask = phaseMask;
+    data.spawnMask = spawnMask;
     data.modelid_override = displayId;
     data.equipmentId = GetEquipmentId();
     data.posX = GetPositionX();
@@ -1102,14 +1115,14 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
     data.orientation = GetOrientation();
     data.spawntimesecs = m_respawnDelay;
     // prevent add data integrity problems
-    data.spawndist = GetDefaultMovementType()==IDLE_MOTION_TYPE ? 0 : m_respawnradius;
+    data.spawndist = GetDefaultMovementType() == IDLE_MOTION_TYPE ? 0 : m_respawnradius;
     data.currentwaypoint = 0;
     data.curhealth = GetHealth();
     data.curmana = GetPower(POWER_MANA);
     data.is_dead = m_isDeadByDefault;
     // prevent add data integrity problems
-    data.movementType = !m_respawnradius && GetDefaultMovementType()==RANDOM_MOTION_TYPE
-        ? IDLE_MOTION_TYPE : GetDefaultMovementType();
+    data.movementType = !m_respawnradius && GetDefaultMovementType() == RANDOM_MOTION_TYPE
+                        ? IDLE_MOTION_TYPE : GetDefaultMovementType();
 
     // updated in DB
     WorldDatabase.BeginTransaction();
@@ -1118,49 +1131,79 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
 
     std::ostringstream ss;
     ss << "INSERT INTO creature VALUES ("
-        << GetGUIDLow() << ","
-        << data.id << ","
-        << data.mapid <<","
-        << uint32(data.spawnMask) << ","                    // cast to prevent save as symbol
-        << uint16(data.phaseMask) << ","                    // prevent out of range error
-        << data.modelid_override <<","
-        << data.equipmentId <<","
-        << data.posX << ","
-        << data.posY << ","
-        << data.posZ << ","
-        << data.orientation << ","
-        << data.spawntimesecs << ","                        //respawn time
-        << (float) data.spawndist << ","                    //spawn distance (float)
-        << data.currentwaypoint << ","                      //currentwaypoint
-        << data.curhealth << ","                            //curhealth
-        << data.curmana << ","                              //curmana
-        << (data.is_dead  ? 1 : 0) << ","                   //is_dead
-        << uint32(data.movementType) << ")";                //default movement generator type, cast to prevent save as symbol
+       << GetGUIDLow() << ","
+       << data.id << ","
+       << data.mapid << ","
+       << uint32(data.spawnMask) << ","                    // cast to prevent save as symbol
+       << uint16(data.phaseMask) << ","                    // prevent out of range error
+       << data.modelid_override << ","
+       << data.equipmentId << ","
+       << data.posX << ","
+       << data.posY << ","
+       << data.posZ << ","
+       << data.orientation << ","
+       << data.spawntimesecs << ","                        // respawn time
+       << (float) data.spawndist << ","                    // spawn distance (float)
+       << data.currentwaypoint << ","                      // currentwaypoint
+       << data.curhealth << ","                            // curhealth
+       << data.curmana << ","                              // curmana
+       << (data.is_dead  ? 1 : 0) << ","                   // is_dead
+       << uint32(data.movementType) << ")";                // default movement generator type, cast to prevent save as symbol
 
     WorldDatabase.PExecuteLog("%s", ss.str().c_str());
 
     WorldDatabase.CommitTransaction();
 }
 
-void Creature::SelectLevel(const CreatureInfo *cinfo, float percentHealth, float percentMana)
+void Creature::SelectLevel(const CreatureInfo* cinfo, float percentHealth, float percentMana)
 {
-    uint32 rank = IsPet()? 0 : cinfo->rank;
+    uint32 rank = IsPet() ? 0 : cinfo->Rank;    // TODO :: IsPet probably not needed here
 
     // level
-    uint32 minlevel = std::min(cinfo->maxlevel, cinfo->minlevel);
-    uint32 maxlevel = std::max(cinfo->maxlevel, cinfo->minlevel);
+    uint32 minlevel = std::min(cinfo->MaxLevel, cinfo->MinLevel);
+    uint32 maxlevel = std::max(cinfo->MaxLevel, cinfo->MinLevel);
     uint32 level = minlevel == maxlevel ? minlevel : urand(minlevel, maxlevel);
+
     SetLevel(level);
 
-    float rellevel = maxlevel == minlevel ? 0 : (float(level - minlevel))/(maxlevel - minlevel);
+    uint32 health = 0;
+    uint32 mana = 0;
 
-    // health
-    float healthmod = _GetHealthMod(rank);
+    CreatureClassLvlStats const* cCLS = sObjectMgr.GetCreatureClassLvlStats(level, cinfo->UnitClass, cinfo->Expansion);
+    if (!cCLS)
+    {
+        // Use old style to calculate stat values
+        float rellevel = maxlevel == minlevel ? 0 : (float(level - minlevel)) / (maxlevel - minlevel);
+
+        // health
+        uint32 minhealth = std::min(cinfo->MaxLevelHealth, cinfo->MinLevelHealth);
+        uint32 maxhealth = std::max(cinfo->MaxLevelHealth, cinfo->MinLevelHealth);
+        health = uint32(minhealth + uint32(rellevel * (maxhealth - minhealth)));
 
-    uint32 minhealth = std::min(cinfo->maxhealth, cinfo->minhealth);
-    uint32 maxhealth = std::max(cinfo->maxhealth, cinfo->minhealth);
-    uint32 health = uint32(healthmod * (minhealth + uint32(rellevel*(maxhealth - minhealth))));
+        // mana
+        uint32 minmana = std::min(cinfo->MaxLevelMana, cinfo->MinLevelMana);
+        uint32 maxmana = std::max(cinfo->MaxLevelMana, cinfo->MinLevelMana);
+        mana = minmana + uint32(rellevel * (maxmana - minmana));
+    }
+    else
+    {
+        // using new way to compute stats
+        // health
+        health = cCLS->BaseHealth * cinfo->HealthMultiplier;
+
+        // mana
+        mana = cCLS->BaseMana * cinfo->PowerMultiplier;
+    }
 
+    health *= _GetHealthMod(rank); // Apply custom config settting
+    if (health < 1)
+        health = 1;
+
+    //////////////////////////////////////////////////////////////////////////
+    // Set values
+    //////////////////////////////////////////////////////////////////////////
+
+    // health
     SetCreateHealth(health);
     SetMaxHealth(health);
 
@@ -1169,33 +1212,54 @@ void Creature::SelectLevel(const CreatureInfo *cinfo, float percentHealth, float
     else
         SetHealthPercent(percentHealth);
 
-    // mana
-    uint32 minmana = std::min(cinfo->maxmana, cinfo->minmana);
-    uint32 maxmana = std::max(cinfo->maxmana, cinfo->minmana);
-    uint32 mana = minmana + uint32(rellevel * (maxmana - minmana));
+    SetModifierValue(UNIT_MOD_HEALTH, BASE_VALUE, float(health));
+
+    // all power types
+    for (int i = POWER_MANA; i <= POWER_RUNIC_POWER; ++i)
+    {
+        uint32 maxValue;
+
+        switch (i)
+        {
+            case POWER_MANA:        maxValue = mana; break;
+            case POWER_RAGE:        maxValue = 0; break;
+            case POWER_FOCUS:       maxValue = POWER_FOCUS_DEFAULT; break;
+            case POWER_ENERGY:      maxValue = POWER_ENERGY_DEFAULT * cinfo->PowerMultiplier; break;
+            case POWER_HAPPINESS:   maxValue = POWER_HAPPINESS_DEFAULT; break;
+            case POWER_RUNE:        maxValue = 0; break;
+            case POWER_RUNIC_POWER: maxValue = 0; break;
+        }
 
-    SetCreateMana(mana);
-    SetMaxPower(POWER_MANA, mana);                          //MAX Mana
-    SetPower(POWER_MANA, mana);
+        uint32 value = maxValue;
 
-    // TODO: set UNIT_FIELD_POWER*, for some creature class case (energy, etc)
+        // For non regenerating powers set 0
+        if ((i == POWER_ENERGY || i == POWER_MANA) && !IsRegeneratingPower())
+            value = 0;
 
-    SetModifierValue(UNIT_MOD_HEALTH, BASE_VALUE, float(health));
-    SetModifierValue(UNIT_MOD_MANA, BASE_VALUE, float(mana));
+        // Mana requires an extra field to be set
+        if (i == POWER_MANA)
+            SetCreateMana(value);
+
+        // Do not use the wrappers for setting power, to avoid side-effects
+        SetStatInt32Value(UNIT_FIELD_MAXPOWER1 + i , maxValue);
+        SetStatInt32Value(UNIT_FIELD_POWER1 +i, value);
+        SetModifierValue(UnitMods(UNIT_MOD_POWER_START + i), BASE_VALUE, float(value));
+    }
 
     // damage
     float damagemod = _GetDamageMod(rank);
 
-    SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, cinfo->mindmg * damagemod);
-    SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, cinfo->maxdmg * damagemod);
+    SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, cinfo->MinMeleeDmg * damagemod);
+    SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, cinfo->MaxMeleeDmg * damagemod);
 
-    SetBaseWeaponDamage(OFF_ATTACK, MINDAMAGE, cinfo->mindmg * damagemod);
-    SetBaseWeaponDamage(OFF_ATTACK, MAXDAMAGE, cinfo->maxdmg * damagemod);
+    SetBaseWeaponDamage(OFF_ATTACK, MINDAMAGE, cinfo->MinMeleeDmg * damagemod);
+    SetBaseWeaponDamage(OFF_ATTACK, MAXDAMAGE, cinfo->MaxMeleeDmg * damagemod);
 
-    SetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, cinfo->minrangedmg * damagemod);
-    SetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, cinfo->maxrangedmg * damagemod);
+    SetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, cinfo->MinRangedDmg * damagemod);
+    SetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, cinfo->MaxRangedDmg * damagemod);
 
-    SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, cinfo->attackpower * damagemod);
+    SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, cinfo->MeleeAttackPower * damagemod);
+    SetModifierValue(UNIT_MOD_ATTACK_POWER_RANGED, BASE_VALUE, cinfo->RangedAttackPower * damagemod);
 }
 
 float Creature::_GetHealthMod(int32 Rank)
@@ -1236,7 +1300,7 @@ float Creature::_GetDamageMod(int32 Rank)
     }
 }
 
-float Creature::GetSpellDamageMod(int32 Rank)
+float Creature::_GetSpellDamageMod(int32 Rank)
 {
     switch (Rank)                                           // define rates for each elite rank
     {
@@ -1255,30 +1319,26 @@ float Creature::GetSpellDamageMod(int32 Rank)
     }
 }
 
-bool Creature::CreateFromProto(uint32 guidlow, CreatureInfo const* cinfo, Team team, const CreatureData *data /*=NULL*/, GameEventCreatureData const* eventData /*=NULL*/)
+bool Creature::CreateFromProto(uint32 guidlow, CreatureInfo const* cinfo, Team team, const CreatureData* data /*=NULL*/, GameEventCreatureData const* eventData /*=NULL*/)
 {
     m_originalEntry = cinfo->Entry;
 
     Object::_Create(guidlow, cinfo->Entry, cinfo->GetHighGuid());
 
-    if (!UpdateEntry(cinfo->Entry, team, data, eventData, false))
-        return false;
-
-    return true;
+    return UpdateEntry(cinfo->Entry, team, data, eventData, false);
 }
 
-bool Creature::LoadFromDB(uint32 guidlow, Map *map)
+bool Creature::LoadFromDB(uint32 guidlow, Map* map)
 {
     CreatureData const* data = sObjectMgr.GetCreatureData(guidlow);
-
-    if(!data)
+    if (!data)
     {
         sLog.outErrorDb("Creature (GUID: %u) not found in table `creature`, can't load. ", guidlow);
         return false;
     }
 
-    CreatureInfo const *cinfo = ObjectMgr::GetCreatureTemplate(data->id);
-    if(!cinfo)
+    CreatureInfo const* cinfo = ObjectMgr::GetCreatureTemplate(data->id);
+    if (!cinfo)
     {
         sLog.outErrorDb("Creature (Entry: %u) not found in table `creature_template`, can't load. ", data->id);
         return false;
@@ -1295,6 +1355,7 @@ bool Creature::LoadFromDB(uint32 guidlow, Map *map)
     if (!Create(guidlow, pos, cinfo, TEAM_NONE, data, eventData))
         return false;
 
+    SetRespawnCoord(pos);
     m_respawnradius = data->spawndist;
 
     m_respawnDelay = data->spawntimesecs;
@@ -1303,28 +1364,32 @@ bool Creature::LoadFromDB(uint32 guidlow, Map *map)
 
     m_respawnTime  = map->GetPersistentState()->GetCreatureRespawnTime(GetGUIDLow());
 
-    if(m_respawnTime > time(NULL))                          // not ready to respawn
+    if (m_respawnTime > time(NULL))                          // not ready to respawn
     {
         m_deathState = DEAD;
-        if(CanFly())
+        if (CanFly())
         {
-            float tz = GetTerrain()->GetHeight(data->posX, data->posY, data->posZ, false);
-            if(data->posZ - tz > 0.1)
-                Relocate(data->posX, data->posY, tz);
+            Position loc = pos.m_pos;
+            float tz = GetMap()->GetHeight(GetPhaseMask(), loc.x, loc.y, loc.z);
+            if (loc.z - tz > 0.1)
+            {
+                loc.z = tz;
+                Relocate(loc);
+            }
         }
     }
-    else if(m_respawnTime)                                  // respawn time set but expired
+    else if (m_respawnTime)                                 // respawn time set but expired
     {
         m_respawnTime = 0;
-
-        GetMap()->GetPersistentState()->SaveCreatureRespawnTime(GetGUIDLow(), 0);
+        if (GetMap()->GetPersistentState())
+            GetMap()->GetPersistentState()->SaveCreatureRespawnTime(GetGUIDLow(), 0);
     }
 
     uint32 curhealth = data->curhealth;
     if (curhealth)
     {
-        curhealth = uint32(curhealth*_GetHealthMod(GetCreatureInfo()->rank));
-        if(curhealth < 1)
+        curhealth = uint32(curhealth * _GetHealthMod(GetCreatureInfo()->Rank));
+        if (curhealth < 1)
             curhealth = 1;
     }
 
@@ -1338,9 +1403,13 @@ bool Creature::LoadFromDB(uint32 guidlow, Map *map)
             // Just set to dead, so need to relocate like above
             if (CanFly())
             {
-                float tz = GetTerrain()->GetHeight(data->posX, data->posY, data->posZ, false);
-                if (data->posZ - tz > 0.1)
-                    Relocate(data->posX, data->posY, tz);
+                Position loc = pos.m_pos;
+                float tz = GetMap()->GetHeight(GetPhaseMask(), loc.x, loc.y, loc.z);
+                if (loc.z - tz > 0.1)
+                {
+                    loc.z = tz;
+                    Relocate(loc);
+                }
             }
         }
     }
@@ -1348,7 +1417,7 @@ bool Creature::LoadFromDB(uint32 guidlow, Map *map)
     SetHealth(m_deathState == ALIVE ? curhealth : 0);
     SetPower(POWER_MANA, data->curmana);
 
-    SetMeleeDamageSchool(SpellSchools(GetCreatureInfo()->dmgschool));
+    SetMeleeDamageSchool(SpellSchools(GetCreatureInfo()->DamageSchool));
 
     // checked at creature_template loading
     m_defaultMovementType = MovementGeneratorType(data->movementType);
@@ -1359,12 +1428,23 @@ bool Creature::LoadFromDB(uint32 guidlow, Map *map)
     if (m_isCreatureLinkingTrigger && isAlive())
         GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_RESPAWN, this);
 
+    // check if it is rabbit day
+    if (isAlive() && sWorld.getConfig(CONFIG_UINT32_RABBIT_DAY))
+    {
+        time_t rabbit_day = time_t(sWorld.getConfig(CONFIG_UINT32_RABBIT_DAY));
+        tm rabbit_day_tm = *localtime(&rabbit_day);
+        tm now_tm = *localtime(&sWorld.GetGameTime());
+
+        if (now_tm.tm_mon == rabbit_day_tm.tm_mon && now_tm.tm_mday == rabbit_day_tm.tm_mday)
+            CastSpell(this, 10710 + urand(0, 2), true);
+    }
+
     return true;
 }
 
 void Creature::LoadEquipment(uint32 equip_entry, bool force)
 {
-    if(equip_entry == 0)
+    if (equip_entry == 0)
     {
         if (force)
         {
@@ -1375,7 +1455,7 @@ void Creature::LoadEquipment(uint32 equip_entry, bool force)
         return;
     }
 
-    EquipmentInfo const *einfo = sObjectMgr.GetEquipmentInfo(equip_entry);
+    EquipmentInfo const* einfo = sObjectMgr.GetEquipmentInfo(equip_entry);
     if (!einfo)
         return;
 
@@ -1387,7 +1467,7 @@ void Creature::LoadEquipment(uint32 equip_entry, bool force)
 bool Creature::HasQuest(uint32 quest_id) const
 {
     QuestRelationsMapBounds bounds = sObjectMgr.GetCreatureQuestRelationsMapBounds(GetEntry());
-    for(QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+    for (QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
     {
         if (itr->second == quest_id)
             return true;
@@ -1398,7 +1478,7 @@ bool Creature::HasQuest(uint32 quest_id) const
 bool Creature::HasInvolvedQuest(uint32 quest_id) const
 {
     QuestRelationsMapBounds bounds = sObjectMgr.GetCreatureQuestInvolvedRelationsMapBounds(GetEntry());
-    for(QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+    for (QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
     {
         if (itr->second == quest_id)
             return true;
@@ -1411,7 +1491,7 @@ struct CreatureRespawnDeleteWorker
 {
     explicit CreatureRespawnDeleteWorker(uint32 guid) : i_guid(guid) {}
 
-    void operator() (MapPersistentState* state)
+    void operator()(MapPersistentState* state)
     {
         state->SaveCreatureRespawnTime(i_guid, 0);
     }
@@ -1433,7 +1513,7 @@ void Creature::DeleteFromDB()
 
 void Creature::DeleteFromDB(uint32 lowguid, CreatureData const* data)
 {
-    CreatureRespawnDeleteWorker worker (lowguid);
+    CreatureRespawnDeleteWorker worker(lowguid);
     sMapPersistentStateMgr.DoForAllStatesWithMapId(data->mapid, worker);
 
     sObjectMgr.DeleteCreatureData(lowguid);
@@ -1445,52 +1525,59 @@ void Creature::DeleteFromDB(uint32 lowguid, CreatureData const* data)
     WorldDatabase.PExecuteLog("DELETE FROM game_event_creature WHERE guid=%u", lowguid);
     WorldDatabase.PExecuteLog("DELETE FROM game_event_creature_data WHERE guid=%u", lowguid);
     WorldDatabase.PExecuteLog("DELETE FROM creature_battleground WHERE guid=%u", lowguid);
+    WorldDatabase.PExecuteLog("DELETE FROM creature_linking WHERE guid=%u OR master_guid=%u", lowguid, lowguid);
     WorldDatabase.CommitTransaction();
 }
 
-float Creature::GetAttackDistance(Unit const* pl) const
+float Creature::GetAttackDistance(Unit const* pPlayer) const
 {
-    float aggroRate = sWorld.getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO);
-    if(aggroRate == 0)
+    float aggroRate = sWorld.GetCreatureAggroRate(this);
+    if (aggroRate < M_NULL_F)
         return 0.0f;
 
-    uint32 playerlevel   = pl->GetLevelForTarget(this);
-    uint32 creaturelevel = GetLevelForTarget(pl);
-
-    int32 leveldif       = int32(playerlevel) - int32(creaturelevel);
+    uint32 playerLevel = pPlayer->GetLevelForTarget(this);
+    uint32 creatureLevel = GetLevelForTarget(pPlayer);
+    int32 levelDiff = int32(playerLevel) - int32(creatureLevel);
 
-    // "The maximum Aggro Radius has a cap of 25 levels under. Example: A level 30 char has the same Aggro Radius of a level 5 char on a level 60 mob."
-    if ( leveldif < - 25)
-        leveldif = -25;
+    // "The maximum Aggro Radius has a cap of 25 levels under. 
+    // Example: A level 30 char has the same Aggro Radius of a level 5 char on a level 60 mob."
+    if (levelDiff < -25)
+        levelDiff = -25;
 
     // "The aggro radius of a mob having the same level as the player is roughly 20 yards"
-    float RetDistance = 20;
+    float retDistance = 20.0f;
 
     // "Aggro Radius varies with level difference at a rate of roughly 1 yard/level"
-    // radius grow if playlevel < creaturelevel
-    RetDistance -= (float)leveldif;
+    // radius grow if playerLevel < creatureLevel
+    retDistance -= float(levelDiff);
 
-    if(creaturelevel+5 <= sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
+    if (creatureLevel + 5 <= sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
     {
         // detect range auras
-        RetDistance += GetTotalAuraModifier(SPELL_AURA_MOD_DETECT_RANGE);
+        retDistance += GetTotalAuraModifier(SPELL_AURA_MOD_DETECT_RANGE);
 
         // detected range auras
-        RetDistance += pl->GetTotalAuraModifier(SPELL_AURA_MOD_DETECTED_RANGE);
+        retDistance += pPlayer->GetTotalAuraModifier(SPELL_AURA_MOD_DETECTED_RANGE);
     }
 
     // "Minimum Aggro Radius for a mob seems to be combat range (5 yards)"
-    if(RetDistance < 5)
-        RetDistance = 5;
+    if (retDistance < 5.0f)
+        retDistance = 5.0f;
+
+    return (retDistance * aggroRate);
+}
 
-    return (RetDistance*aggroRate);
+float Creature::GetReachDistance(Unit const* unit) const
+{
+    //require realization of creature strategy (melee/spellcaster diffirent).
+    return GetAttackDistance(unit);
 }
 
 void Creature::SetDeathState(DeathState s)
 {
     if ((s == JUST_DIED && !m_isDeadByDefault) || (s == JUST_ALIVED && m_isDeadByDefault))
     {
-        m_corpseDecayTimer = m_corpseDelay*IN_MILLISECONDS; // the max/default time for corpse decay (before creature is looted/AllLootRemovedFromCorpse() is called)
+        m_corpseDecayTimer = m_corpseDelay * IN_MILLISECONDS; // the max/default time for corpse decay (before creature is looted/AllLootRemovedFromCorpse() is called)
         m_respawnTime = time(NULL) + m_respawnDelay;        // respawn delay (spawntimesecs)
 
         // always save boss respawn time at death to prevent crash cheating
@@ -1511,29 +1598,26 @@ void Creature::SetDeathState(DeathState s)
             UpdateSpeed(MOVE_RUN, false);
         }
 
+        GetUnitStateMgr().InitDefaults(true);
+
         if (CanFly())
-            i_motionMaster.MoveFall();
+            GetMotionMaster()->MoveFall();
 
         Unit::SetDeathState(CORPSE);
     }
 
     if (s == JUST_ALIVED)
     {
-        CreatureInfo const *cinfo = GetCreatureInfo();
+        clearUnitState(UNIT_STAT_ALL_STATE);
+
+        Unit::SetDeathState(ALIVE);
 
         SetHealth(GetMaxHealth());
         SetLootRecipient(NULL);
-        SetWalk(true);
-
         if (GetTemporaryFactionFlags() & TEMPFACTION_RESTORE_RESPAWN)
             ClearTemporaryFaction();
 
-        Unit::SetDeathState(ALIVE);
-
-        clearUnitState(UNIT_STAT_ALL_STATE);
-        i_motionMaster.Initialize();
-
-        SetMeleeDamageSchool(SpellSchools(cinfo->dmgschool));
+        SetMeleeDamageSchool(SpellSchools(GetCreatureInfo()->DamageSchool));
 
         // Dynamic flags may be adjusted by spells. Clear them
         // first and let spell from *addon apply where needed.
@@ -1542,26 +1626,29 @@ void Creature::SetDeathState(DeathState s)
 
         // Flags after LoadCreatureAddon. Any spell in *addon
         // will not be able to adjust these.
-        SetUInt32Value(UNIT_NPC_FLAGS, cinfo->npcflag);
+        SetUInt32Value(UNIT_NPC_FLAGS, GetCreatureInfo()->NpcFlags);
         RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
+
+        SetWalk(true, true);
+
+        if (CanSwim())
+            SetSwim(IsInWater());
+
+        GetMotionMaster()->Initialize();
     }
 }
 
 void Creature::Respawn()
 {
     RemoveCorpse();
-
-    // forced recreate creature object at clients
-    UnitVisibility currentVis = GetVisibility();
-    SetVisibility(VISIBILITY_RESPAWN);
-    UpdateObjectVisibility();
-    SetVisibility(currentVis);                              // restore visibility state
-    UpdateObjectVisibility();
+    if (!IsInWorld())                                       // Could be removed as part of a pool (in which case respawn-time is handled with pool-system)
+        return;
 
     if (IsDespawned())
     {
         if (HasStaticDBSpawnData())
-            GetMap()->GetPersistentState()->SaveCreatureRespawnTime(GetGUIDLow(), 0);
+            if (GetMap()->GetPersistentState())
+                GetMap()->GetPersistentState()->SaveCreatureRespawnTime(GetGUIDLow(), 0);
         m_respawnTime = time(NULL);                         // respawn at next tick
     }
 }
@@ -1570,20 +1657,26 @@ void Creature::ForcedDespawn(uint32 timeMSToDespawn)
 {
     if (timeMSToDespawn)
     {
-        ForcedDespawnDelayEvent *pEvent = new ForcedDespawnDelayEvent(*this);
+        ForcedDespawnDelayEvent* pEvent = new ForcedDespawnDelayEvent(*this);
 
-        m_Events.AddEvent(pEvent, m_Events.CalculateTime(timeMSToDespawn));
+        AddEvent(pEvent, timeMSToDespawn);
         return;
     }
 
-    if (isAlive())
+    if (IsInWorld() && isAlive())
         SetDeathState(JUST_DIED);
 
-    RemoveCorpse();
-    SetHealth(0);                                           // just for nice GM-mode view
+    m_corpseDecayTimer = 1;                                 // Properly remove corpse on next tick (also pool system requires Creature::Update call with CORPSE state
+
+    if (IsInWorld())
+        SetHealth(0);                                           // just for nice GM-mode view
+
+    if (IsTemporarySummon())
+         ((TemporarySummon*)this)->UnSummon();
+
 }
 
-bool Creature::IsImmuneToSpell(SpellEntry const* spellInfo)
+bool Creature::IsImmuneToSpell(SpellEntry const* spellInfo, bool isFriendly) const
 {
     if (!spellInfo)
         return false;
@@ -1591,7 +1684,7 @@ bool Creature::IsImmuneToSpell(SpellEntry const* spellInfo)
     if (GetCreatureInfo()->MechanicImmuneMask & (1 << (spellInfo->Mechanic - 1)))
         return true;
 
-    return Unit::IsImmuneToSpell(spellInfo);
+    return Unit::IsImmuneToSpell(spellInfo, isFriendly);
 }
 
 bool Creature::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex index) const
@@ -1600,7 +1693,7 @@ bool Creature::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectInd
         return true;
 
     // Taunt immunity special flag check
-    if (GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NOT_TAUNTABLE)
+    if (GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NOT_TAUNTABLE)
     {
         // Taunt aura apply check
         if (spellInfo->Effect[index] == SPELL_EFFECT_APPLY_AURA)
@@ -1616,101 +1709,105 @@ bool Creature::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectInd
     return Unit::IsImmuneToSpellEffect(spellInfo, index);
 }
 
-SpellEntry const *Creature::ReachWithSpellAttack(Unit *pVictim)
+SpellEntry const* Creature::ReachWithSpellAttack(Unit* pVictim)
 {
-    if(!pVictim)
+    if (!pVictim)
         return NULL;
 
-    for(uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i)
+    for (uint32 i = 0; i <= GetSpellMaxIndex(); ++i)
     {
-        if(!m_spells[i])
+        uint32 spellID = GetSpell(i);
+        if(!spellID)
             continue;
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(m_spells[i] );
-        if(!spellInfo)
+
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellID);
+        if (!spellInfo)
         {
-            sLog.outError("WORLD: unknown spell id %i", m_spells[i]);
+            sLog.outError("WORLD: unknown spell id %i", spellID);
             continue;
         }
 
         bool bcontinue = true;
-        for(int j = 0; j < MAX_EFFECT_INDEX; ++j)
+        for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
         {
-            if( (spellInfo->Effect[j] == SPELL_EFFECT_SCHOOL_DAMAGE )       ||
-                (spellInfo->Effect[j] == SPELL_EFFECT_INSTAKILL)            ||
-                (spellInfo->Effect[j] == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE) ||
-                (spellInfo->Effect[j] == SPELL_EFFECT_HEALTH_LEECH )
-                )
+            if ((spellInfo->Effect[j] == SPELL_EFFECT_SCHOOL_DAMAGE)       ||
+                    (spellInfo->Effect[j] == SPELL_EFFECT_INSTAKILL)            ||
+                    (spellInfo->Effect[j] == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE) ||
+                    (spellInfo->Effect[j] == SPELL_EFFECT_HEALTH_LEECH)
+               )
             {
                 bcontinue = false;
                 break;
             }
         }
-        if(bcontinue) continue;
+        if (bcontinue) continue;
 
-        if(spellInfo->manaCost > GetPower(POWER_MANA))
+        if (spellInfo->manaCost > GetPower(POWER_MANA))
             continue;
-        SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->rangeIndex);
+        SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->GetRangeIndex());
         float range = GetSpellMaxRange(srange);
         float minrange = GetSpellMinRange(srange);
 
-        float dist = GetCombatDistance(pVictim);
+        float dist = GetCombatDistance(pVictim, spellInfo->rangeIndex == SPELL_RANGE_IDX_COMBAT);
 
-        //if(!isInFront( pVictim, range ) && spellInfo->AttributesEx )
+        // if(!isInFront( pVictim, range ) && spellInfo->GetAttributesEx() )
         //    continue;
-        if( dist > range || dist < minrange )
+        if (dist > range || dist < minrange)
             continue;
-        if(spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
+        if (spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
             continue;
-        if(spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
+        if (spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
             continue;
         return spellInfo;
     }
     return NULL;
 }
 
-SpellEntry const *Creature::ReachWithSpellCure(Unit *pVictim)
+SpellEntry const* Creature::ReachWithSpellCure(Unit* pVictim)
 {
-    if(!pVictim)
+    if (!pVictim)
         return NULL;
 
-    for(uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i)
+    for (uint32 i = 0; i <= GetSpellMaxIndex(); ++i)
     {
-        if(!m_spells[i])
+        uint32 spellID = GetSpell(i);
+        if (!spellID)
             continue;
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(m_spells[i] );
-        if(!spellInfo)
+
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellID);
+        if (!spellInfo)
         {
-            sLog.outError("WORLD: unknown spell id %i", m_spells[i]);
+            sLog.outError("WORLD: unknown spell id %i", spellID);
             continue;
         }
 
         bool bcontinue = true;
-        for(int j = 0; j < MAX_EFFECT_INDEX; ++j)
+        for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
         {
-            if( (spellInfo->Effect[j] == SPELL_EFFECT_HEAL ) )
+            if ((spellInfo->Effect[j] == SPELL_EFFECT_HEAL))
             {
                 bcontinue = false;
                 break;
             }
         }
-        if(bcontinue)
+        if (bcontinue)
             continue;
 
-        if(spellInfo->manaCost > GetPower(POWER_MANA))
+        if (spellInfo->manaCost > GetPower(POWER_MANA))
             continue;
-        SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->rangeIndex);
+        SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->GetRangeIndex());
         float range = GetSpellMaxRange(srange);
         float minrange = GetSpellMinRange(srange);
 
-        float dist = GetCombatDistance(pVictim);
+        float dist = GetCombatDistance(pVictim, spellInfo->rangeIndex == SPELL_RANGE_IDX_COMBAT);
 
-        //if(!isInFront( pVictim, range ) && spellInfo->AttributesEx )
+        // if(!isInFront( pVictim, range ) && spellInfo->GetAttributesEx() )
         //    continue;
-        if( dist > range || dist < minrange )
+        if (dist > range || dist < minrange)
             continue;
-        if(spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
+        if (spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
             continue;
-        if(spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
+        if (spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
             continue;
         return spellInfo;
     }
@@ -1720,32 +1817,31 @@ SpellEntry const *Creature::ReachWithSpellCure(Unit *pVictim)
 bool Creature::IsVisibleInGridForPlayer(Player* pl) const
 {
     // gamemaster in GM mode see all, including ghosts
-    if(pl->isGameMaster())
+    if (pl->isGameMaster())
         return true;
 
-    if (GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_INVISIBLE)
+    if (GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_INVISIBLE)
         return false;
 
     // Live player (or with not release body see live creatures or death creatures with corpse disappearing time > 0
-    if(pl->isAlive() || pl->GetDeathTimer() > 0)
+    if (pl->isAlive() || pl->GetDeathTimer() > 0)
     {
         return (isAlive() || m_corpseDecayTimer > 0 || (m_isDeadByDefault && m_deathState == CORPSE));
     }
 
     // Dead player see live creatures near own corpse
-    if(isAlive())
+    if (isAlive())
     {
-        Corpse *corpse = pl->GetCorpse();
-        if(corpse)
+        if (Corpse* corpse = pl->GetCorpse())
         {
             // 20 - aggro distance for same level, 25 - max additional distance if player level less that creature level
-            if(corpse->IsWithinDistInMap(this,(20+25)*sWorld.getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO)))
+            if (corpse->IsWithinDistInMap(this, (20.0f + 25.0f) * sWorld.GetCreatureAggroRate(this)))
                 return true;
         }
     }
 
     // Dead player can see ghosts
-    if (GetCreatureInfo()->type_flags & CREATURE_TYPEFLAGS_GHOST_VISIBLE)
+    if (GetCreatureInfo()->CreatureTypeFlags & CREATURE_TYPEFLAGS_GHOST_VISIBLE)
         return true;
 
     // and not see any other
@@ -1767,40 +1863,34 @@ void Creature::SendAIReaction(AiReaction reactionType)
 void Creature::CallAssistance()
 {
     // FIXME: should player pets call for assistance?
-    if (!m_AlreadyCallAssistance && getVictim() && !isCharmed())
+    if (m_AlreadyCallAssistance || isCharmed())
+        return;
+
+    if (Unit* pVictim = getVictim())
     {
         SetNoCallAssistance(true);
 
-        float radius = sWorld.getConfig(CONFIG_FLOAT_CREATURE_FAMILY_ASSISTANCE_RADIUS);
-        if(radius > 0)
-        {
-            std::list<Creature*> assistList;
-
-            {
-                MaNGOS::AnyAssistCreatureInRangeCheck u_check(this, getVictim(), radius);
-                MaNGOS::CreatureListSearcher<MaNGOS::AnyAssistCreatureInRangeCheck> searcher(assistList, u_check);
-                Cell::VisitGridObjects(this,searcher, radius);
-            }
+        if (GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_CALL_ASSIST)
+            return;
 
-            if (!assistList.empty())
-            {
-                AssistDelayEvent *e = new AssistDelayEvent(getVictim()->GetObjectGuid(), *this, assistList);
-                m_Events.AddEvent(e, m_Events.CalculateTime(sWorld.getConfig(CONFIG_UINT32_CREATURE_FAMILY_ASSISTANCE_DELAY)));
-            }
-        }
+        AI()->SendAIEventAround(AI_EVENT_CALL_ASSISTANCE, pVictim, sWorld.getConfig(CONFIG_UINT32_CREATURE_FAMILY_ASSISTANCE_DELAY), sWorld.getConfig(CONFIG_FLOAT_CREATURE_FAMILY_ASSISTANCE_RADIUS));
     }
 }
 
 void Creature::CallForHelp(float fRadius)
 {
-    if (fRadius <= 0.0f || !getVictim() || IsPet() || isCharmed())
+    if (fRadius <= 0.0f || IsPet() || isCharmed())
         return;
 
-    MaNGOS::CallOfHelpCreatureInRangeDo u_do(this, getVictim(), fRadius);
-    MaNGOS::CreatureWorker<MaNGOS::CallOfHelpCreatureInRangeDo> worker(this, u_do);
-    Cell::VisitGridObjects(this,worker, fRadius);
+    if (Unit* pVictim = getVictim())
+    {
+        MaNGOS::CallOfHelpCreatureInRangeDo u_do(this, pVictim, fRadius);
+        MaNGOS::CreatureWorker<MaNGOS::CallOfHelpCreatureInRangeDo> worker(this, u_do);
+        Cell::VisitGridObjects(this, worker, fRadius);
+    }
 }
 
+/// if enemy provided, check for initial combat help against enemy
 bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /*= true*/) const
 {
     // we don't need help from zombies :)
@@ -1815,7 +1905,7 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /
         return false;
 
     // skip fighting creature
-    if (isInCombat())
+    if (enemy && isInCombat())
         return false;
 
     // only free creature
@@ -1835,7 +1925,7 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /
     }
 
     // skip non hostile to caster enemy creatures
-    if (!IsHostileTo(enemy))
+    if (enemy && !IsHostileTo(enemy))
         return false;
 
     return true;
@@ -1852,18 +1942,27 @@ bool Creature::CanInitiateAttack()
     if (isPassiveToHostile())
         return false;
 
+    if (m_aggroDelay)
+        return false;
+
     return true;
 }
 
 void Creature::SaveRespawnTime()
 {
-    if(IsPet() || !HasStaticDBSpawnData())
+    if (IsPet() || !HasStaticDBSpawnData())
         return;
 
-    if(m_respawnTime > time(NULL))                          // dead (no corpse)
-        GetMap()->GetPersistentState()->SaveCreatureRespawnTime(GetGUIDLow(), m_respawnTime);
+    if (m_respawnTime > time(NULL))                         // dead (no corpse)
+    {
+        if (GetMap()->GetPersistentState())
+            GetMap()->GetPersistentState()->SaveCreatureRespawnTime(GetGUIDLow(), m_respawnTime);
+    }
     else if (m_corpseDecayTimer > 0)                        // dead (corpse)
-        GetMap()->GetPersistentState()->SaveCreatureRespawnTime(GetGUIDLow(), time(NULL) + m_respawnDelay + m_corpseDecayTimer / IN_MILLISECONDS);
+    {
+        if (GetMap()->GetPersistentState())
+            GetMap()->GetPersistentState()->SaveCreatureRespawnTime(GetGUIDLow(), time(NULL) + m_respawnDelay + m_corpseDecayTimer / IN_MILLISECONDS);
+    }
 }
 
 bool Creature::IsOutOfThreatArea(Unit* pVictim) const
@@ -1880,18 +1979,18 @@ bool Creature::IsOutOfThreatArea(Unit* pVictim) const
     if (!pVictim->isInAccessablePlaceFor(this))
         return true;
 
-    if (!pVictim->isVisibleForOrDetect(this,this,false))
+    if (!pVictim->isVisibleForOrDetect(this, this, false))
         return true;
 
-    if(sMapStore.LookupEntry(GetMapId())->IsDungeon())
+    if (sMapStore.LookupEntry(GetMapId())->IsDungeon())
         return false;
 
     float AttackDist = GetAttackDistance(pVictim);
     float ThreatRadius = sWorld.getConfig(CONFIG_FLOAT_THREAT_RADIUS);
 
-    //Use AttackDistance in distance check if threat radius is lower. This prevents creature bounce in and out of combat every update tick.
-    return !pVictim->IsWithinDist3d(m_combatStartX, m_combatStartY, m_combatStartZ,
-        ThreatRadius > AttackDist ? ThreatRadius : AttackDist);
+    // Use AttackDistance in distance check if threat radius is lower. This prevents creature bounce in and out of combat every update tick.
+    return !pVictim->IsWithinDist3d(m_combatStart.x, m_combatStart.y, m_combatStart.z,
+                                    ThreatRadius > AttackDist ? ThreatRadius : AttackDist);
 }
 
 CreatureDataAddon const* Creature::GetCreatureAddon() const
@@ -1911,11 +2010,11 @@ CreatureDataAddon const* Creature::GetCreatureAddon() const
     return ObjectMgr::GetCreatureTemplateAddon(GetEntry());
 }
 
-//creature_addon table
+// creature_addon table
 bool Creature::LoadCreatureAddon(bool reload)
 {
-    CreatureDataAddon const *cainfo = GetCreatureAddon();
-    if(!cainfo)
+    CreatureDataAddon const* cainfo = GetCreatureAddon();
+    if (!cainfo)
         return false;
 
     if (cainfo->mount != 0)
@@ -1929,7 +2028,7 @@ bool Creature::LoadCreatureAddon(bool reload)
         // 3 StandMiscFlags
 
         SetByteValue(UNIT_FIELD_BYTES_1, 0, uint8(cainfo->bytes1 & 0xFF));
-        //SetByteValue(UNIT_FIELD_BYTES_1, 1, uint8((cainfo->bytes1 >> 8) & 0xFF));
+        // SetByteValue(UNIT_FIELD_BYTES_1, 1, uint8((cainfo->bytes1 >> 8) & 0xFF));
         SetByteValue(UNIT_FIELD_BYTES_1, 1, 0);
         SetByteValue(UNIT_FIELD_BYTES_1, 2, uint8((cainfo->bytes1 >> 16) & 0xFF));
         SetByteValue(UNIT_FIELD_BYTES_1, 3, uint8((cainfo->bytes1 >> 24) & 0xFF));
@@ -1945,14 +2044,14 @@ bool Creature::LoadCreatureAddon(bool reload)
     if (cainfo->pvp_state != 0)
         SetByteValue(UNIT_FIELD_BYTES_2, 1, cainfo->pvp_state);
 
-    //SetByteValue(UNIT_FIELD_BYTES_2, 2, 0);
-    //SetByteValue(UNIT_FIELD_BYTES_2, 3, 0);
+    // SetByteValue(UNIT_FIELD_BYTES_2, 2, 0);
+    // SetByteValue(UNIT_FIELD_BYTES_2, 3, 0);
 
     if (cainfo->emote != 0)
         SetUInt32Value(UNIT_NPC_EMOTESTATE, cainfo->emote);
 
     if (cainfo->splineFlags & SPLINEFLAG_FLYING)
-        SetLevitate(true);
+        SetLevitate(true, GetObjectGuid().IsPet() ? 2.0f : 4.0f);
 
     if (cainfo->auras)
     {
@@ -1979,14 +2078,10 @@ bool Creature::LoadCreatureAddon(bool reload)
     return true;
 }
 
-/// Send a message to LocalDefense channel for players opposition team in the zone
+/// Sends a message to LocalDefense and WorldDefense channels for players of the other team
 void Creature::SendZoneUnderAttackMessage(Player* attacker)
 {
-    Team enemy_team = attacker->GetTeam();
-
-    WorldPacket data(SMSG_ZONE_UNDER_ATTACK, 4);
-    data << uint32(GetZoneId());
-    sWorld.SendGlobalMessage(&data, NULL, (enemy_team == ALLIANCE ? HORDE : ALLIANCE));
+    sWorld.SendZoneUnderAttackMessage(GetZoneId(), attacker->GetTeam() == ALLIANCE ? HORDE : ALLIANCE);
 }
 
 void Creature::SetInCombatWithZone()
@@ -2005,12 +2100,12 @@ void Creature::SetInCombatWithZone()
         return;
     }
 
-    Map::PlayerList const &PlList = pMap->GetPlayers();
+    Map::PlayerList const& PlList = pMap->GetPlayers();
 
     if (PlList.isEmpty())
         return;
 
-    for(Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i)
+    for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i)
     {
         if (Player* pPlayer = i->getSource())
         {
@@ -2028,39 +2123,39 @@ void Creature::SetInCombatWithZone()
 
 bool Creature::MeetsSelectAttackingRequirement(Unit* pTarget, SpellEntry const* pSpellInfo, uint32 selectFlags) const
 {
-    if (selectFlags & SELECT_FLAG_PLAYER && pTarget->GetTypeId() != TYPEID_PLAYER)
+    if ((selectFlags & SELECT_FLAG_PLAYER) && pTarget->GetTypeId() != TYPEID_PLAYER)
         return false;
 
-    if (selectFlags & SELECT_FLAG_POWER_MANA && pTarget->getPowerType() != POWER_MANA)
+    if (selectFlags & SELECT_FLAG_POWER_MANA && pTarget->GetPowerType() != POWER_MANA)
         return false;
-    else if (selectFlags & SELECT_FLAG_POWER_RAGE && pTarget->getPowerType() != POWER_RAGE)
+    else if (selectFlags & SELECT_FLAG_POWER_RAGE && pTarget->GetPowerType() != POWER_RAGE)
         return false;
-    else if (selectFlags & SELECT_FLAG_POWER_ENERGY && pTarget->getPowerType() != POWER_ENERGY)
+    else if (selectFlags & SELECT_FLAG_POWER_ENERGY && pTarget->GetPowerType() != POWER_ENERGY)
         return false;
-    else if (selectFlags & SELECT_FLAG_POWER_RUNIC && pTarget->getPowerType() != POWER_RUNIC_POWER)
+    else if (selectFlags & SELECT_FLAG_POWER_RUNIC && pTarget->GetPowerType() != POWER_RUNIC_POWER)
         return false;
 
-    if (selectFlags & SELECT_FLAG_IN_MELEE_RANGE && !CanReachWithMeleeAttack(pTarget))
+    if ((selectFlags & SELECT_FLAG_IN_MELEE_RANGE) && !CanReachWithMeleeAttack(pTarget))
         return false;
-    if (selectFlags & SELECT_FLAG_NOT_IN_MELEE_RANGE && CanReachWithMeleeAttack(pTarget))
+    if ((selectFlags & SELECT_FLAG_NOT_IN_MELEE_RANGE) && CanReachWithMeleeAttack(pTarget))
         return false;
 
-    if (selectFlags & SELECT_FLAG_IN_LOS && !IsWithinLOSInMap(pTarget))
+    if ((selectFlags & SELECT_FLAG_IN_LOS) && !IsWithinLOSInMap(pTarget))
         return false;
 
     if (pSpellInfo)
     {
-        switch (pSpellInfo->rangeIndex)
+        switch (pSpellInfo->GetRangeIndex())
         {
             case SPELL_RANGE_IDX_SELF_ONLY: return false;
             case SPELL_RANGE_IDX_ANYWHERE:  return true;
             case SPELL_RANGE_IDX_COMBAT:    return CanReachWithMeleeAttack(pTarget);
         }
 
-        SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(pSpellInfo->rangeIndex);
+        SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(pSpellInfo->GetRangeIndex());
         float max_range = GetSpellMaxRange(srange);
         float min_range = GetSpellMinRange(srange);
-        float dist = GetCombatDistance(pTarget);
+        float dist = GetCombatDistance(pTarget, false);
 
         return dist < max_range && dist >= min_range;
     }
@@ -2093,20 +2188,20 @@ Unit* Creature::SelectAttackingTarget(AttackingTarget target, uint32 position, S
             std::vector<Unit*> suitableUnits;
             suitableUnits.reserve(threatlist.size() - position);
             advance(itr, position);
-            for (itr; itr != threatlist.end(); ++itr)
+            for (; itr != threatlist.end(); ++itr)
                 if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid()))
                     if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags))
                         suitableUnits.push_back(pTarget);
 
             if (!suitableUnits.empty())
-                return suitableUnits[urand(0, suitableUnits.size()-1)];
+                return suitableUnits[urand(0, suitableUnits.size() - 1)];
 
             break;
         }
         case ATTACKING_TARGET_TOPAGGRO:
         {
             advance(itr, position);
-            for (itr; itr != threatlist.end(); ++itr)
+            for (; itr != threatlist.end(); ++itr)
                 if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid()))
                     if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags))
                         return pTarget;
@@ -2116,7 +2211,7 @@ Unit* Creature::SelectAttackingTarget(AttackingTarget target, uint32 position, S
         case ATTACKING_TARGET_BOTTOMAGGRO:
         {
             advance(ritr, position);
-            for (ritr; ritr != threatlist.rend(); ++ritr)
+            for (; ritr != threatlist.rend(); ++ritr)
                 if (Unit* pTarget = GetMap()->GetUnit((*itr)->getUnitGuid()))
                     if (!selectFlags || MeetsSelectAttackingRequirement(pTarget, pSpellInfo, selectFlags))
                         return pTarget;
@@ -2128,46 +2223,6 @@ Unit* Creature::SelectAttackingTarget(AttackingTarget target, uint32 position, S
     return NULL;
 }
 
-void Creature::_AddCreatureSpellCooldown(uint32 spell_id, time_t end_time)
-{
-    m_CreatureSpellCooldowns[spell_id] = end_time;
-}
-
-void Creature::_AddCreatureCategoryCooldown(uint32 category, time_t apply_time)
-{
-    m_CreatureCategoryCooldowns[category] = apply_time;
-}
-
-void Creature::AddCreatureSpellCooldown(uint32 spellid)
-{
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid);
-    if(!spellInfo)
-        return;
-
-    uint32 cooldown = GetSpellRecoveryTime(spellInfo);
-    if(cooldown)
-        _AddCreatureSpellCooldown(spellid, time(NULL) + cooldown/IN_MILLISECONDS);
-
-    if(spellInfo->Category)
-        _AddCreatureCategoryCooldown(spellInfo->Category, time(NULL));
-}
-
-bool Creature::HasCategoryCooldown(uint32 spell_id) const
-{
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
-    if(!spellInfo)
-        return false;
-
-    CreatureSpellCooldowns::const_iterator itr = m_CreatureCategoryCooldowns.find(spellInfo->Category);
-    return (itr != m_CreatureCategoryCooldowns.end() && time_t(itr->second + (spellInfo->CategoryRecoveryTime / IN_MILLISECONDS)) > time(NULL));
-}
-
-bool Creature::HasSpellCooldown(uint32 spell_id) const
-{
-    CreatureSpellCooldowns::const_iterator itr = m_CreatureSpellCooldowns.find(spell_id);
-    return (itr != m_CreatureSpellCooldowns.end() && itr->second > time(NULL)) || HasCategoryCooldown(spell_id);
-}
-
 uint8 Creature::getRace() const
 {
     uint8 race = Unit::getRace();
@@ -2176,22 +2231,21 @@ uint8 Creature::getRace() const
 
 bool Creature::IsInEvadeMode() const
 {
-    return !i_motionMaster.empty() && i_motionMaster.GetCurrentMovementGeneratorType() == HOME_MOTION_TYPE;
+    return IsInUnitState(UNIT_ACTION_HOME) || hasUnitState(UNIT_STAT_DELAYED_EVADE);
 }
 
-bool Creature::HasSpell(uint32 spellID) const
+bool Creature::HasSpell(uint32 spellID)
 {
-    uint8 i;
-    for(i = 0; i < CREATURE_MAX_SPELLS; ++i)
-        if(spellID == m_spells[i])
-            break;
-    return i < CREATURE_MAX_SPELLS;                         // break before end of iteration of known spells
+    for (uint8 i = 0; i <= GetSpellMaxIndex(); ++i)
+        if (spellID == GetSpell(i))
+            return true;
+    return false;
 }
 
 time_t Creature::GetRespawnTimeEx() const
 {
     time_t now = time(NULL);
-    if(m_respawnTime > now)                                 // dead (no corpse)
+    if (m_respawnTime > now)                                // dead (no corpse)
         return m_respawnTime;
     else if (m_corpseDecayTimer > 0)                        // dead (corpse)
         return now + m_respawnDelay + m_corpseDecayTimer / IN_MILLISECONDS;
@@ -2199,34 +2253,29 @@ time_t Creature::GetRespawnTimeEx() const
         return now;
 }
 
-void Creature::GetRespawnCoord( float &x, float &y, float &z, float* ori, float* dist ) const
+void Creature::GetRespawnCoord(float& x, float& y, float& z, float* ori, float* dist) const
 {
-    if (CreatureData const* data = sObjectMgr.GetCreatureData(GetGUIDLow()))
-    {
-        x = data->posX;
-        y = data->posY;
-        z = data->posZ;
-        if (ori)
-            *ori = data->orientation;
-        if (dist)
-            *dist = GetRespawnRadius();
-    }
-    else
-    {
-        float orient;
+    x = m_respawnPos.x;
+    y = m_respawnPos.y;
+    z = m_respawnPos.z;
+    if (ori)
+        *ori = m_respawnPos.o;
+    if (dist)
+        *dist = GetRespawnRadius();
 
-        GetSummonPoint(x, y, z, orient);
+    if (IsLevitating())
+        z += GetFloatValue(UNIT_FIELD_HOVERHEIGHT);
 
-        if (ori)
-            *ori = orient;
-        if (dist)
-            *dist = GetRespawnRadius();
-    }
-
-    //lets check if our creatures have valid spawn coordinates
+    // lets check if our creatures have valid spawn coordinates
     MANGOS_ASSERT(MaNGOS::IsValidMapCoord(x, y, z) || PrintCoordinatesError(x, y, z, "respawn"));
 }
 
+void Creature::ResetRespawnCoord()
+{
+    if (CreatureData const* data = sObjectMgr.GetCreatureData(GetGUIDLow()))
+        m_respawnPos = WorldLocation(data->mapid, data->posX, data->posY, data->posZ, data->orientation, data->phaseMask);
+}
+
 void Creature::AllLootRemovedFromCorpse()
 {
     if (lootForBody && !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE))
@@ -2241,7 +2290,7 @@ void Creature::AllLootRemovedFromCorpse()
             if (sWorld.getConfig(CONFIG_FLOAT_RATE_CORPSE_DECAY_LOOTED) > 0.0f)
                 corpseLootedDelay = (uint32)((m_corpseDelay * IN_MILLISECONDS) * sWorld.getConfig(CONFIG_FLOAT_RATE_CORPSE_DECAY_LOOTED));
             else
-                corpseLootedDelay = (m_respawnDelay*IN_MILLISECONDS) /3;
+                corpseLootedDelay = (m_respawnDelay * IN_MILLISECONDS) / 3;
         }
         else                                                // corpse was skinned, corpse will despawn next update
             corpseLootedDelay = 0;
@@ -2276,15 +2325,15 @@ void Creature::AllLootRemovedFromCorpse()
     }
 }
 
-uint32 Creature::GetLevelForTarget( Unit const* target ) const
+uint32 Creature::GetLevelForTarget(Unit const* target) const
 {
-    if(!IsWorldBoss())
+    if (!IsWorldBoss())
         return Unit::GetLevelForTarget(target);
 
-    uint32 level = target->getLevel()+sWorld.getConfig(CONFIG_UINT32_WORLD_BOSS_LEVEL_DIFF);
-    if(level < 1)
+    uint32 level = target->getLevel() + sWorld.getConfig(CONFIG_UINT32_WORLD_BOSS_LEVEL_DIFF);
+    if (level < 1)
         return 1;
-    if(level > 255)
+    if (level > 255)
         return 255;
     return level;
 }
@@ -2311,33 +2360,33 @@ VendorItemData const* Creature::GetVendorItems() const
 
 VendorItemData const* Creature::GetVendorTemplateItems() const
 {
-    uint32 vendorId = GetCreatureInfo()->vendorId;
+    uint32 vendorId = GetCreatureInfo()->VendorTemplateId;
     return vendorId ? sObjectMgr.GetNpcVendorTemplateItemList(vendorId) : NULL;
 }
 
 uint32 Creature::GetVendorItemCurrentCount(VendorItem const* vItem)
 {
-    if(!vItem->maxcount)
+    if (!vItem->maxcount)
         return vItem->maxcount;
 
     VendorItemCounts::iterator itr = m_vendorItemCounts.begin();
-    for(; itr != m_vendorItemCounts.end(); ++itr)
-        if(itr->itemId==vItem->item)
+    for (; itr != m_vendorItemCounts.end(); ++itr)
+        if (itr->itemId == vItem->item)
             break;
 
-    if(itr == m_vendorItemCounts.end())
+    if (itr == m_vendorItemCounts.end())
         return vItem->maxcount;
 
     VendorItemCount* vCount = &*itr;
 
     time_t ptime = time(NULL);
 
-    if( vCount->lastIncrementTime + vItem->incrtime <= ptime )
+    if (vCount->lastIncrementTime + (int32)vItem->incrtime <= ptime)
     {
         ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(vItem->item);
 
-        uint32 diff = uint32((ptime - vCount->lastIncrementTime)/vItem->incrtime);
-        if((vCount->count + diff * pProto->BuyCount) >= vItem->maxcount )
+        uint32 diff = uint32((ptime - vCount->lastIncrementTime) / vItem->incrtime);
+        if ((vCount->count + diff * pProto->BuyCount) >= vItem->maxcount)
         {
             m_vendorItemCounts.erase(itr);
             return vItem->maxcount;
@@ -2352,18 +2401,18 @@ uint32 Creature::GetVendorItemCurrentCount(VendorItem const* vItem)
 
 uint32 Creature::UpdateVendorItemCurrentCount(VendorItem const* vItem, uint32 used_count)
 {
-    if(!vItem->maxcount)
+    if (!vItem->maxcount)
         return 0;
 
     VendorItemCounts::iterator itr = m_vendorItemCounts.begin();
-    for(; itr != m_vendorItemCounts.end(); ++itr)
-        if(itr->itemId==vItem->item)
+    for (; itr != m_vendorItemCounts.end(); ++itr)
+        if (itr->itemId == vItem->item)
             break;
 
-    if(itr == m_vendorItemCounts.end())
+    if (itr == m_vendorItemCounts.end())
     {
-        uint32 new_count = vItem->maxcount > used_count ? vItem->maxcount-used_count : 0;
-        m_vendorItemCounts.push_back(VendorItemCount(vItem->item,new_count));
+        uint32 new_count = vItem->maxcount > used_count ? vItem->maxcount - used_count : 0;
+        m_vendorItemCounts.push_back(VendorItemCount(vItem->item, new_count));
         return new_count;
     }
 
@@ -2371,25 +2420,25 @@ uint32 Creature::UpdateVendorItemCurrentCount(VendorItem const* vItem, uint32 us
 
     time_t ptime = time(NULL);
 
-    if( vCount->lastIncrementTime + vItem->incrtime <= ptime )
+    if (vCount->lastIncrementTime + (int32)vItem->incrtime <= ptime)
     {
         ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(vItem->item);
 
-        uint32 diff = uint32((ptime - vCount->lastIncrementTime)/vItem->incrtime);
-        if((vCount->count + diff * pProto->BuyCount) < vItem->maxcount )
+        uint32 diff = uint32((ptime - vCount->lastIncrementTime) / vItem->incrtime);
+        if ((vCount->count + diff * pProto->BuyCount) < vItem->maxcount)
             vCount->count += diff * pProto->BuyCount;
         else
             vCount->count = vItem->maxcount;
     }
 
-    vCount->count = vCount->count > used_count ? vCount->count-used_count : 0;
+    vCount->count = vCount->count > used_count ? vCount->count - used_count : 0;
     vCount->lastIncrementTime = ptime;
     return vCount->count;
 }
 
 TrainerSpellData const* Creature::GetTrainerTemplateSpells() const
 {
-    uint32 trainerId = GetCreatureInfo()->trainerId;
+    uint32 trainerId = GetCreatureInfo()->TrainerTemplateId;
     return trainerId ? sObjectMgr.GetNpcTrainerTemplateSpells(trainerId) : NULL;
 }
 
@@ -2410,6 +2459,13 @@ void Creature::SetFactionTemporary(uint32 factionId, uint32 tempFactionFlags)
 {
     m_temporaryFactionFlags = tempFactionFlags;
     setFaction(factionId);
+
+    if (m_temporaryFactionFlags & TEMPFACTION_TOGGLE_NON_ATTACKABLE)
+        RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+    if (m_temporaryFactionFlags & TEMPFACTION_TOGGLE_OOC_NOT_ATTACK)
+        RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+    if (m_temporaryFactionFlags & TEMPFACTION_TOGGLE_PASSIVE)
+        RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
 }
 
 void Creature::ClearTemporaryFaction()
@@ -2420,11 +2476,20 @@ void Creature::ClearTemporaryFaction()
     if (isCharmed())
         return;
 
+    // Reset to original faction
+    setFaction(GetCreatureInfo()->FactionAlliance);
+    // Reset UNIT_FLAG_NON_ATTACKABLE, UNIT_FLAG_OOC_NOT_ATTACKABLE or UNIT_FLAG_PASSIVE flags
+    if (m_temporaryFactionFlags & TEMPFACTION_TOGGLE_NON_ATTACKABLE && GetCreatureInfo()->UnitFlags & UNIT_FLAG_NON_ATTACKABLE)
+        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+    if (m_temporaryFactionFlags & TEMPFACTION_TOGGLE_OOC_NOT_ATTACK && GetCreatureInfo()->UnitFlags & UNIT_FLAG_OOC_NOT_ATTACKABLE && !isInCombat())
+        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+    if (m_temporaryFactionFlags & TEMPFACTION_TOGGLE_PASSIVE && GetCreatureInfo()->UnitFlags & UNIT_FLAG_PASSIVE)
+        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+
     m_temporaryFactionFlags = TEMPFACTION_NONE;
-    setFaction(GetCreatureInfo()->faction_A);
 }
 
-void Creature::SendAreaSpiritHealerQueryOpcode(Player *pl)
+void Creature::SendAreaSpiritHealerQueryOpcode(Player* pl)
 {
     uint32 next_resurrect = 0;
     if (Spell* pcurSpell = GetCurrentSpell(CURRENT_CHANNELED_SPELL))
@@ -2449,14 +2514,14 @@ void Creature::ApplyGameEventSpells(GameEventCreatureData const* eventData, bool
         CastSpell(this, cast_spell, true);
 }
 
-void Creature::FillGuidsListFromThreatList( std::vector<ObjectGuid>& guids, uint32 maxamount /*= 0*/ )
+void Creature::FillGuidsListFromThreatList(GuidVector& guids, uint32 maxamount /*= 0*/)
 {
     if (!CanHaveThreatList())
         return;
 
     ThreatList const& threats = getThreatManager().getThreatList();
 
-    maxamount = maxamount > 0 ? std::min(maxamount,uint32(threats.size())) : threats.size();
+    maxamount = maxamount > 0 ? std::min(maxamount, uint32(threats.size())) : threats.size();
 
     guids.reserve(guids.size() + maxamount);
 
@@ -2468,7 +2533,7 @@ struct AddCreatureToRemoveListInMapsWorker
 {
     AddCreatureToRemoveListInMapsWorker(ObjectGuid guid) : i_guid(guid) {}
 
-    void operator() (Map* map)
+    void operator()(Map* map)
     {
         if (Creature* pCreature = map->GetCreature(i_guid))
             pCreature->AddObjectToRemoveList();
@@ -2488,13 +2553,13 @@ struct SpawnCreatureInMapsWorker
     SpawnCreatureInMapsWorker(uint32 guid, CreatureData const* data)
         : i_guid(guid), i_data(data) {}
 
-    void operator() (Map* map)
+    void operator()(Map* map)
     {
         // We use spawn coords to spawn
         if (map->IsLoaded(i_data->posX, i_data->posY))
         {
             Creature* pCreature = new Creature;
-            //DEBUG_LOG("Spawning creature %u",*itr);
+            // DEBUG_LOG("Spawning creature %u",*itr);
             if (!pCreature->LoadFromDB(i_guid, map))
             {
                 delete pCreature;
@@ -2521,24 +2586,277 @@ bool Creature::HasStaticDBSpawnData() const
     return sObjectMgr.GetCreatureData(GetGUIDLow()) != NULL;
 }
 
-void Creature::SetWalk(bool enable)
+uint32 Creature::GetSpell(uint8 index, uint8 activeState)
 {
+    if (index > GetSpellMaxIndex(activeState))
+        return 0;
+
+    CreatureSpellsList const* spellList = sObjectMgr.GetCreatureSpells(GetEntry(), activeState);
+    if (!spellList)
+        return 0;
+
+    CreatureSpellsList::const_iterator itr = spellList->find(index);
+
+    if (itr == spellList->end())
+        return 0;
+
+    CreatureSpellEntry const* spellEntry = &itr->second;
+
+    if (!spellEntry)
+        return 0;
+
+    if (spellEntry->disabled)
+        return 0;
+
+    // other checks there
+
+    return spellEntry->spell;
+}
+
+uint8 Creature::GetSpellMaxIndex(uint8 activeState)
+{
+    CreatureSpellsList const* spellList = sObjectMgr.GetCreatureSpells(GetEntry(),activeState);
+    if (!spellList)
+        return 0;
+
+    return (spellList ? spellList->rbegin()->first : 0);
+}
+
+void Creature::SetWalk(bool enable, bool asDefault)
+{
+    if (asDefault)
+    {
+        if (enable)
+            clearUnitState(UNIT_STAT_RUNNING);
+        else
+            addUnitState(UNIT_STAT_RUNNING);
+    }
+
+    // Nothing changed?
+    if (enable == m_movementInfo.HasMovementFlag(MOVEFLAG_WALK_MODE))
+        return;
+
     if (enable)
         m_movementInfo.AddMovementFlag(MOVEFLAG_WALK_MODE);
     else
         m_movementInfo.RemoveMovementFlag(MOVEFLAG_WALK_MODE);
-    WorldPacket data(enable ? SMSG_SPLINE_MOVE_SET_WALK_MODE : SMSG_SPLINE_MOVE_SET_RUN_MODE, 9);
+
+    WorldPacket data(enable ? SMSG_SPLINE_MOVE_SET_WALK_MODE : SMSG_SPLINE_MOVE_SET_RUN_MODE, GetPackGUID().size());
     data << GetPackGUID();
     SendMessageToSet(&data, true);
 }
 
-void Creature::SetLevitate(bool enable)
+void Creature::SetLevitate(bool enable, float altitude)
 {
     if (enable)
+    {
         m_movementInfo.AddMovementFlag(MOVEFLAG_LEVITATING);
+        SetFloatValue(UNIT_FIELD_HOVERHEIGHT, altitude);            // Used for storing altitude of levitated creature
+    }
     else
+    {
         m_movementInfo.RemoveMovementFlag(MOVEFLAG_LEVITATING);
-    WorldPacket data(enable ? SMSG_SPLINE_MOVE_GRAVITY_DISABLE : SMSG_SPLINE_MOVE_GRAVITY_ENABLE, 9);
+        SetFloatValue(UNIT_FIELD_HOVERHEIGHT, 0.0f);
+    }
+
+    WorldPacket data(enable ? SMSG_SPLINE_MOVE_GRAVITY_DISABLE : SMSG_SPLINE_MOVE_GRAVITY_ENABLE, GetPackGUID().size());
     data << GetPackGUID();
     SendMessageToSet(&data, true);
 }
+
+void Creature::SetSwim(bool enable)
+{
+    if (enable)
+        m_movementInfo.AddMovementFlag(MOVEFLAG_SWIMMING);
+    else
+        m_movementInfo.RemoveMovementFlag(MOVEFLAG_SWIMMING);
+
+//    WorldPacket data(enable ? SMSG_SPLINE_MOVE_START_SWIM : SMSG_SPLINE_MOVE_STOP_SWIM, 8);
+//    data << GetPackGUID();
+//    SendMessageToSet(&data, true);
+}
+
+Unit* Creature::SelectPreferredTargetForSpell(SpellEntry const* spellInfo)
+{
+    Unit* target = NULL;
+
+    if (spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
+        return NULL;
+    if (spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
+        return NULL;
+
+    SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->GetRangeIndex());
+    float max_range = GetSpellMaxRange(srange);
+    if (Player* modOwner = GetSpellModOwner())
+        modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_RANGE, max_range);
+
+    switch (GetPreferredTargetForSpell(spellInfo))
+    {
+        case SPELL_PREFERRED_TARGET_SELF:
+            target = this;
+            break;
+
+        case SPELL_PREFERRED_TARGET_VICTIM:
+            if (Unit* pVictim = getVictim())
+                target = pVictim;
+            else
+                target = SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0, spellInfo, 0);
+            break;
+
+        case SPELL_PREFERRED_TARGET_ENEMY:
+                target = SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0, spellInfo, 0);
+            break;
+
+        case SPELL_PREFERRED_TARGET_OWNER:
+            if (GetCharmerOrOwner())
+                target = GetCharmerOrOwner();
+            else
+                target = this;
+            break;
+
+        case SPELL_PREFERRED_TARGET_FRIEND:
+            target = SelectRandomFriendlyTarget(this,max_range);
+            break;
+
+        case SPELL_PREFERRED_TARGET_AREA:
+        case SPELL_PREFERRED_TARGET_MAX:
+        default:
+            break;
+    }
+
+    if (!target)
+        return NULL;
+
+    if (target && target != this)
+    {
+        float dist = GetDistance(target);
+        if (dist > max_range || dist < GetSpellMinRange(srange))
+            target = NULL;
+    }
+
+    if (target && IsSpellAppliesAura(spellInfo))
+    {
+        for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
+        {
+            if (target && spellInfo->Effect[j] == SPELL_EFFECT_APPLY_AURA)
+            {
+                if (spellInfo->StackAmount <= 1)
+                {
+                    if (target->HasAura(spellInfo->Id, SpellEffectIndex(j)) )
+                        target = NULL;
+                }
+                else
+                {
+                    if (Aura* aura = target->GetAura(spellInfo->Id, SpellEffectIndex(j)))
+                        if (aura->GetStackAmount() >= spellInfo->StackAmount)
+                            target = NULL;
+                }
+            }
+            else if (IsAreaAuraEffect(spellInfo->Effect[j]))
+            {
+                if (target->HasAura(spellInfo->Id, SpellEffectIndex(j)) )
+                    target = NULL;
+            }
+        }
+    }
+
+    return target;
+}
+
+void Creature::SetRoot(bool enable)
+{
+    if (enable)
+        m_movementInfo.AddMovementFlag(MOVEFLAG_ROOT);
+    else
+        m_movementInfo.RemoveMovementFlag(MOVEFLAG_ROOT);
+
+    WorldPacket data(enable ? SMSG_SPLINE_MOVE_ROOT : SMSG_SPLINE_MOVE_UNROOT, GetPackGUID().size());
+    data << GetPackGUID();
+    SendMessageToSet(&data, true);
+}
+
+void Creature::SetWaterWalk(bool enable)
+{
+    if (enable)
+        m_movementInfo.AddMovementFlag(MOVEFLAG_WATERWALKING);
+    else
+        m_movementInfo.RemoveMovementFlag(MOVEFLAG_WATERWALKING);
+
+    WorldPacket data(enable ? SMSG_SPLINE_MOVE_WATER_WALK : SMSG_SPLINE_MOVE_LAND_WALK, GetPackGUID().size());
+    data << GetPackGUID();
+    SendMessageToSet(&data, true);
+}
+
+// TODO
+//void Creature::SetCanFly(bool enable)
+//{
+//    if (enable)
+//        m_movementInfo.AddMovementFlag(MOVEFLAG_CAN_FLY);
+//    else
+//        m_movementInfo.RemoveMovementFlag(MOVEFLAG_CAN_FLY);
+//
+//    Unit::SetCanFly(enable);
+//}
+
+void Creature::SetDisplayId(uint32 modelId)
+{
+    m_modelInhabitType = -1;
+    Unit::SetDisplayId(modelId);
+}
+
+uint32 Creature::GetModelInhabitType()
+{
+    if (m_modelInhabitType < 0)
+    {
+        uint32 miType = MODEL_INHABIT_ONLY_GROUND;
+        if (CreatureDisplayInfoEntry const* displayInfo = sCreatureDisplayInfoStore.LookupEntry(GetDisplayId()))
+        {
+            if (CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelId))
+                miType = modelData->modInhabitType;
+        }
+        m_modelInhabitType = miType;
+    }
+
+    return m_modelInhabitType;
+}
+
+bool Creature::CanWalk()
+{
+    if (!(m_creatureInfo->InhabitType & INHABIT_GROUND))
+        return false;
+
+    /*int32 modelInhabitType = GetModelInhabitType();
+    if ((modelInhabitType == MODEL_INHABIT_ONLY_SWIM) ||
+        (modelInhabitType == MODEL_INHABIT_ONLY_FLY))
+        return false;*/
+
+    return true;
+}
+
+bool Creature::CanSwim()
+{
+    if (!(m_creatureInfo->InhabitType & INHABIT_WATER))
+        return false;
+
+    int32 modelInhabitType = GetModelInhabitType();
+    if ((modelInhabitType == MODEL_INHABIT_ONLY_GROUND) ||
+        (modelInhabitType == MODEL_INHABIT_ONLY_FLY) ||
+        (modelInhabitType == MODEL_INHABIT_ONLY_UNDERWATER))
+        return false;
+
+    return true;
+}
+
+bool Creature::CanFly()
+{
+    if (!(m_creatureInfo->InhabitType & INHABIT_AIR) && !(GetByteValue(UNIT_FIELD_BYTES_1, 3) & UNIT_BYTE1_FLAG_HOVER) && !HasAuraType(SPELL_AURA_FLY))
+        return false;
+
+    int32 modelInhabitType = GetModelInhabitType();
+    if ((modelInhabitType == MODEL_INHABIT_ONLY_GROUND) ||
+        (modelInhabitType == MODEL_INHABIT_ONLY_SWIM) ||
+        (modelInhabitType == MODEL_INHABIT_ONLY_UNDERWATER))
+        return false;
+
+    return true;
+}
diff --git a/src/game/Creature.h b/src/game/Creature.h
index c724ea20f70..a97091f882c 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -34,7 +34,6 @@
 struct SpellEntry;
 
 class CreatureAI;
-class Group;
 class Quest;
 class Player;
 class WorldSession;
@@ -54,7 +53,9 @@ enum CreatureFlagsExtra
     CREATURE_FLAG_EXTRA_NOT_TAUNTABLE   = 0x00000100,       // creature is immune to taunt auras and effect attack me
     CREATURE_FLAG_EXTRA_AGGRO_ZONE      = 0x00000200,       // creature sets itself in combat with zone on aggro
     CREATURE_FLAG_EXTRA_GUARD           = 0x00000400,       // creature is a guard
-    CREATURE_FLAG_EXTRA_NO_TALKTO_CREDIT= 0x00000800,       // creature doesn't give quest-credits when talked to (temporarily flag)
+    CREATURE_FLAG_EXTRA_NO_CALL_ASSIST  = 0x00000800,       // creature shouldn't call for assistance on aggro
+    CREATURE_FLAG_EXTRA_KEEP_AI         = 0x00001000,       // creature keeps ScriptedAI even after being charmed / controlled (instead of getting PetAI)
+    CREATURE_FLAG_EXTRA_TAUNT_DIMINISHING = 0x00002000,     // creature will only have Taunt diminishing returns if they have been specifically flagged (http://eu.battle.net/wow/en/game/patch-notes/3-3-0)
 };
 
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
@@ -71,92 +72,95 @@ enum CreatureFlagsExtra
 struct CreatureInfo
 {
     uint32  Entry;
-    uint32  DifficultyEntry[MAX_DIFFICULTY - 1];
-    uint32  KillCredit[MAX_KILL_CREDIT];
-    uint32  ModelId[MAX_CREATURE_MODEL];
     char*   Name;
     char*   SubName;
     char*   IconName;
-    uint32  GossipMenuId;
-    uint32  minlevel;
-    uint32  maxlevel;
-    uint32  minhealth;
-    uint32  maxhealth;
-    uint32  minmana;
-    uint32  maxmana;
-    uint32  armor;
-    uint32  faction_A;
-    uint32  faction_H;
-    uint32  npcflag;
-    float   speed_walk;
-    float   speed_run;
-    float   scale;
-    uint32  rank;
-    float   mindmg;
-    float   maxdmg;
-    uint32  dmgschool;
-    uint32  attackpower;
-    float   dmg_multiplier;
-    uint32  baseattacktime;
-    uint32  rangeattacktime;
-    uint32  unit_class;                                     // enum Classes. Note only 4 classes are known for creatures.
-    uint32  unit_flags;                                     // enum UnitFlags mask values
-    uint32  dynamicflags;
-    uint32  family;                                         // enum CreatureFamily values (optional)
-    uint32  trainer_type;
-    uint32  trainer_spell;
-    uint32  trainer_class;
-    uint32  trainer_race;
-    float   minrangedmg;
-    float   maxrangedmg;
-    uint32  rangedattackpower;
-    uint32  type;                                           // enum CreatureType values
-    uint32  type_flags;                                     // enum CreatureTypeFlags mask values
-    uint32  lootid;
-    uint32  pickpocketLootId;
-    uint32  SkinLootId;
-    int32   resistance1;
-    int32   resistance2;
-    int32   resistance3;
-    int32   resistance4;
-    int32   resistance5;
-    int32   resistance6;
-    uint32  spells[CREATURE_MAX_SPELLS];
-    uint32  PetSpellDataId;
-    uint32  mingold;
-    uint32  maxgold;
-    char const* AIName;
-    uint32  MovementType;
+    uint32  MinLevel;
+    uint32  MaxLevel;
+    uint32  DifficultyEntry[MAX_DIFFICULTY - 1];
+    uint32  ModelId[MAX_CREATURE_MODEL];
+    uint32  FactionAlliance;
+    uint32  FactionHorde;
+    float   Scale;
+    uint32  Family;                                         // enum CreatureFamily values (optional)
+    uint32  CreatureType;                                   // enum CreatureType values
     uint32  InhabitType;
-    float   unk16;
-    float   unk17;
+    uint32  RegenerateStats;
     bool    RacialLeader;
-    uint32  questItems[6];
-    uint32  movementId;
-    bool    RegenHealth;
-    uint32  vehicleId;
-    uint32  equipmentId;
-    uint32  trainerId;
-    uint32  vendorId;
+    uint32  NpcFlags;
+    uint32  UnitFlags;                                      // enum UnitFlags mask values
+    uint32  DynamicFlags;
+    uint32  ExtraFlags;
+    uint32  CreatureTypeFlags;                              // enum CreatureTypeFlags mask values
+    float   SpeedWalk;
+    float   SpeedRun;
+    uint32  UnitClass;                                      // enum Classes. Note only 4 classes are known for creatures.
+    uint32  Rank;
+    int32   Expansion;                                      // creature expansion, important for stats
+    float   HealthMultiplier;
+    float   PowerMultiplier;
+    float   DamageMultiplier;
+    float   DamageVariance;
+    float   ArmorMultiplier;
+    float   ExperienceMultiplier;
+    uint32  MinLevelHealth;
+    uint32  MaxLevelHealth;
+    uint32  MinLevelMana;
+    uint32  MaxLevelMana;
+    float   MinMeleeDmg;
+    float   MaxMeleeDmg;
+    float   MinRangedDmg;
+    float   MaxRangedDmg;
+    uint32  Armor;
+    uint32  MeleeAttackPower;
+    uint32  RangedAttackPower;
+    uint32  MeleeBaseAttackTime;
+    uint32  RangedBaseAttackTime;
+    uint32  DamageSchool;
+    uint32  MinLootGold;
+    uint32  MaxLootGold;
+    uint32  LootId;
+    uint32  PickpocketLootId;
+    uint32  SkinningLootId;
+    uint32  KillCredit[MAX_KILL_CREDIT];
+    uint32  QuestItems[6];
     uint32  MechanicImmuneMask;
-    uint32  flags_extra;
+    int32   ResistanceHoly;
+    int32   ResistanceFire;
+    int32   ResistanceNature;
+    int32   ResistanceFrost;
+    int32   ResistanceShadow;
+    int32   ResistanceArcane;
+    uint32  PetSpellDataId;
+    uint32  MovementType;
+    uint32  MovementTemplateId;
+    uint32  TrainerType;
+    uint32  TrainerSpell;
+    uint32  TrainerClass;
+    uint32  TrainerRace;
+    uint32  TrainerTemplateId;
+    uint32  VendorTemplateId;
+    uint32  EquipmentTemplateId;
+    uint32  VehicleTemplateId;
+    uint32  GossipMenuId;
+    char const* AIName;
     uint32  ScriptID;
 
     // helpers
     HighGuid GetHighGuid() const
     {
-        return vehicleId ? HIGHGUID_VEHICLE : HIGHGUID_UNIT;
+        return VehicleTemplateId ? HIGHGUID_VEHICLE : HIGHGUID_UNIT;
     }
 
     ObjectGuid GetObjectGuid(uint32 lowguid) const { return ObjectGuid(GetHighGuid(), Entry, lowguid); }
 
     SkillType GetRequiredLootSkill() const
     {
-        if(type_flags & CREATURE_TYPEFLAGS_HERBLOOT)
+        if (CreatureTypeFlags & CREATURE_TYPEFLAGS_HERBLOOT)
             return SKILL_HERBALISM;
-        else if(type_flags & CREATURE_TYPEFLAGS_MININGLOOT)
+        else if (CreatureTypeFlags & CREATURE_TYPEFLAGS_MININGLOOT)
             return SKILL_MINING;
-        else if(type_flags & CREATURE_TYPEFLAGS_ENGINEERLOOT)
+        else if (CreatureTypeFlags & CREATURE_TYPEFLAGS_ENGINEERLOOT)
             return SKILL_ENGINEERING;
         else
             return SKILL_SKINNING;                          // normal case
@@ -164,15 +168,15 @@ struct CreatureInfo
 
     bool IsExotic() const
     {
-        return (type_flags & CREATURE_TYPEFLAGS_EXOTIC);
+        return (CreatureTypeFlags & CREATURE_TYPEFLAGS_EXOTIC);
     }
 
     bool isTameable(bool exotic) const
     {
-        if(type != CREATURE_TYPE_BEAST || family == 0 || (type_flags & CREATURE_TYPEFLAGS_TAMEABLE) == 0)
+        if (CreatureType != CREATURE_TYPE_BEAST || Family == 0 || (CreatureTypeFlags & CREATURE_TYPEFLAGS_TAMEABLE) == 0)
             return false;
 
-        // if can tame exotic then can tame any temable
+        // if can tame exotic then can tame any tameable
         return exotic || !IsExotic();
     }
 };
@@ -208,12 +212,6 @@ struct CreatureData
     ObjectGuid GetObjectGuid(uint32 lowguid) const;
 };
 
-enum SplineFlags
-{
-    SPLINEFLAG_WALKMODE     = 0x00001000,
-    SPLINEFLAG_FLYING       = 0x00002000,
-};
-
 // from `creature_addon` and `creature_template_addon`tables
 struct CreatureDataAddon
 {
@@ -227,6 +225,17 @@ struct CreatureDataAddon
     uint32 const* auras;                                    // loaded as char* "spell1 spell2 ... "
 };
 
+// Bases values for given Level and UnitClass
+struct CreatureClassLvlStats
+{
+    uint32  BaseHealth;
+    uint32  BaseMana;
+    float   BaseDamage;
+    float   BaseMeleeAttackPower;
+    float   BaseRangedAttackPower;
+    uint32  BaseArmor;
+};
+
 struct CreatureModelInfo
 {
     uint32 modelid;
@@ -245,6 +254,20 @@ struct CreatureModelRace
     uint32 modelid_racial;                                  // Explicit modelid. Used if creature_template entry is not defined
 };
 
+struct CreatureSpellEntry
+{
+    CreatureSpellEntry() : spell(0), flags(0), disabled(0) {};
+
+    uint32 spell;
+    int32  flags;
+    bool   disabled;
+};
+
+#define MAX_CREATURE_SPELL_LISTS 8
+
+typedef std::map<uint8 /* index */,     CreatureSpellEntry> CreatureSpellsList;
+typedef UNORDERED_MAP<uint32 /*creature_id*/,CreatureSpellsList> CreatureSpellStorage;
+
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack()
@@ -277,6 +300,15 @@ enum InhabitTypeValues
     INHABIT_ANYWHERE = INHABIT_GROUND | INHABIT_WATER | INHABIT_AIR
 };
 
+enum ModelInhabitTypeValues
+{
+    MODEL_INHABIT_ONLY_GROUND         = 0,
+    MODEL_INHABIT_ONLY_SWIM           = 1,
+    MODEL_INHABIT_ONLY_FLY            = 2,
+    MODEL_INHABIT_ONLY_GROUND_AND_FLY = 3,
+    MODEL_INHABIT_ONLY_UNDERWATER     = 4,
+};
+
 // Enums used by StringTextData::Type (CreatureEventAI)
 enum ChatType
 {
@@ -286,15 +318,17 @@ enum ChatType
     CHAT_TYPE_BOSS_EMOTE        = 3,
     CHAT_TYPE_WHISPER           = 4,
     CHAT_TYPE_BOSS_WHISPER      = 5,
-    CHAT_TYPE_ZONE_YELL         = 6
+    CHAT_TYPE_ZONE_YELL         = 6,
+    CHAT_TYPE_NOTHING_SAY       = 7,                        // use for nothing say, for emote/sound only
+    CHAT_TYPE_MAX
 };
 
 // Selection method used by SelectAttackingTarget
 enum AttackingTarget
 {
-    ATTACKING_TARGET_RANDOM = 0,                            //Just selects a random target
-    ATTACKING_TARGET_TOPAGGRO,                              //Selects targes from top aggro to bottom
-    ATTACKING_TARGET_BOTTOMAGGRO,                           //Selects targets from bottom aggro to top
+    ATTACKING_TARGET_RANDOM = 0,                            // Just selects a random target
+    ATTACKING_TARGET_TOPAGGRO,                              // Selects targes from top aggro to bottom
+    ATTACKING_TARGET_BOTTOMAGGRO,                           // Selects targets from bottom aggro to top
 };
 
 enum SelectFlags
@@ -309,16 +343,23 @@ enum SelectFlags
     SELECT_FLAG_NOT_IN_MELEE_RANGE  = 0x080,
 };
 
+enum RegenStatsFlags
+{
+    REGEN_FLAG_HEALTH               = 0x001,
+    REGEN_FLAG_POWER                = 0x002,
+};
+
 // Vendors
 struct VendorItem
 {
-    VendorItem(uint32 _item, uint32 _maxcount, uint32 _incrtime, uint32 _ExtendedCost)
-        : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost) {}
+    VendorItem(uint32 _item, uint32 _maxcount, uint32 _incrtime, uint32 _ExtendedCost, uint16 _conditionId)
+        : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost), conditionId(_conditionId) {}
 
     uint32 item;
     uint32 maxcount;                                        // 0 for infinity item amount
     uint32 incrtime;                                        // time for restore items amount if maxcount != 0
     uint32 ExtendedCost;                                    // index in ItemExtendedCost.dbc
+    uint16 conditionId;                                     // condition to check for this item
 };
 typedef std::vector<VendorItem*> VendorItemList;
 
@@ -328,22 +369,22 @@ struct VendorItemData
 
     VendorItem* GetItem(uint32 slot) const
     {
-        if(slot>=m_items.size()) return NULL;
+        if (slot >= m_items.size()) return NULL;
         return m_items[slot];
     }
     bool Empty() const { return m_items.empty(); }
     uint8 GetItemCount() const { return m_items.size(); }
-    void AddItem( uint32 item, uint32 maxcount, uint32 ptime, uint32 ExtendedCost)
+    void AddItem(uint32 item, uint32 maxcount, uint32 ptime, uint32 ExtendedCost, uint16 conditonId)
     {
-        m_items.push_back(new VendorItem(item, maxcount, ptime, ExtendedCost));
+        m_items.push_back(new VendorItem(item, maxcount, ptime, ExtendedCost, conditonId));
     }
-    bool RemoveItem( uint32 item_id );
+    bool RemoveItem(uint32 item_id);
     VendorItem const* FindItemCostPair(uint32 item_id, uint32 extendedCost) const;
 
     void Clear()
     {
         for (VendorItemList::const_iterator itr = m_items.begin(); itr != m_items.end(); ++itr)
-            delete (*itr);
+            delete(*itr);
         m_items.clear();
     }
 };
@@ -380,7 +421,7 @@ struct TrainerSpell
     bool IsCastable() const { return learnedSpell != spell; }
 };
 
-typedef UNORDERED_MAP<uint32 /*spellid*/, TrainerSpell> TrainerSpellMap;
+typedef UNORDERED_MAP < uint32 /*spellid*/, TrainerSpell > TrainerSpellMap;
 
 struct TrainerSpellData
 {
@@ -388,13 +429,11 @@ struct TrainerSpellData
 
     TrainerSpellMap spellList;
     uint32 trainerType;                                     // trainer type based at trainer spells, can be different from creature_template value.
-                                                            // req. for correct show non-prof. trainers like weaponmaster, allowed values 0 and 2.
+    // req. for correct show non-prof. trainers like weaponmaster, allowed values 0 and 2.
     TrainerSpell const* Find(uint32 spell_id) const;
     void Clear() { spellList.clear(); }
 };
 
-typedef std::map<uint32,time_t> CreatureSpellCooldowns;
-
 // max different by z coordinate for creature aggro reaction
 #define CREATURE_Z_ATTACK_RANGE 3
 
@@ -414,22 +453,32 @@ struct CreatureCreatePos
     public:
         // exactly coordinates used
         CreatureCreatePos(Map* map, float x, float y, float z, float o, uint32 phaseMask)
-            : m_map(map), m_phaseMask(phaseMask), m_closeObject(NULL), m_angle(0.0f), m_dist(0.0f) { m_pos.x = x; m_pos.y = y; m_pos.z = z; m_pos.o = o; }
+            : m_pos(map->GetId(), x, y, z, o, phaseMask, map->GetInstanceId()), m_map(map),
+                m_closeObject(NULL), m_angle(0.0f), m_dist(0.0f)
+            {
+            }
         // if dist == 0.0f -> exactly object coordinates used, in other case close point to object (CONTACT_DIST can be used as minimal distances)
         CreatureCreatePos(WorldObject* closeObject, float ori, float dist = 0.0f, float angle = 0.0f)
-            : m_map(closeObject->GetMap()), m_phaseMask(closeObject->GetPhaseMask()),
-            m_closeObject(closeObject), m_angle(angle), m_dist(dist) { m_pos.o = ori; }
+            : m_pos(closeObject->GetPosition()), m_map(closeObject->GetMap()), m_closeObject(closeObject),
+                m_angle(angle), m_dist(dist)
+            {
+                m_pos.o = ori;
+            }
+        // Constructor for use with casttarget
+        CreatureCreatePos(Map* map, WorldLocation const& loc)
+            : m_pos(loc), m_map(map), m_closeObject(NULL), m_angle(0.0f), m_dist(0.0f)
+            {
+            }
     public:
         Map* GetMap() const { return m_map; }
-        uint32 GetPhaseMask() const { return m_phaseMask; }
-        void SelectFinalPoint(Creature* cr);
+        uint32 GetPhaseMask() const { return m_pos.GetPhaseMask(); }
+        void SelectFinalPoint(Creature* cr, bool checkLOS = false);
         bool Relocate(Creature* cr) const;
 
         // read only after SelectFinalPoint
-        Position m_pos;
+        WorldLocation m_pos;
     private:
         Map* m_map;
-        uint32 m_phaseMask;
         WorldObject* m_closeObject;
         float m_angle;
         float m_dist;
@@ -449,12 +498,15 @@ enum TemporaryFactionFlags                                  // Used at real fact
     TEMPFACTION_RESTORE_RESPAWN         = 0x01,             // Default faction will be restored at respawn
     TEMPFACTION_RESTORE_COMBAT_STOP     = 0x02,             // ... at CombatStop() (happens at creature death, at evade or custom scripte among others)
     TEMPFACTION_RESTORE_REACH_HOME      = 0x04,             // ... at reaching home in home movement (evade), if not already done at CombatStop()
+    TEMPFACTION_TOGGLE_NON_ATTACKABLE   = 0x08,             // Remove UNIT_FLAG_NON_ATTACKABLE(0x02) when faction is changed (reapply when temp-faction is removed)
+    TEMPFACTION_TOGGLE_OOC_NOT_ATTACK   = 0x10,             // Remove UNIT_FLAG_OOC_NOT_ATTACKABLE(0x100) when faction is changed (reapply when temp-faction is removed)
+    TEMPFACTION_TOGGLE_PASSIVE          = 0x20,             // Remove UNIT_FLAG_PASSIVE(0x200) when faction is changed (reapply when temp-faction is removed)
     TEMPFACTION_ALL,
 };
 
 class MANGOS_DLL_SPEC Creature : public Unit
 {
-    CreatureAI *i_AI;
+        CreatureAI* i_AI;
 
     public:
 
@@ -462,21 +514,29 @@ class MANGOS_DLL_SPEC Creature : public Unit
         virtual ~Creature();
 
         void AddToWorld();
-        void RemoveFromWorld();
+        virtual void RemoveFromWorld(bool remove) override;
 
-        bool Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo const* cinfo, Team team = TEAM_NONE, const CreatureData *data = NULL, GameEventCreatureData const* eventData = NULL);
-        bool LoadCreatureAddon(bool reload);
-        void SelectLevel(const CreatureInfo *cinfo, float percentHealth = 100.0f, float percentMana = 100.0f);
-        void LoadEquipment(uint32 equip_entry, bool force=false);
+        bool Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo const* cinfo, Team team = TEAM_NONE, const CreatureData* data = NULL, GameEventCreatureData const* eventData = NULL);
+        bool LoadCreatureAddon(bool reload = false);
+        void SelectLevel(const CreatureInfo* cinfo, float percentHealth = 100.0f, float percentMana = 100.0f);
+        void LoadEquipment(uint32 equip_entry, bool force = false);
 
         bool HasStaticDBSpawnData() const;                  // listed in `creature` table and have fixed in DB guid
 
-        char const* GetSubName() const { return GetCreatureInfo()->SubName; }
+        char const* GetSubName() const { return m_creatureInfo->SubName; }
 
-        void Update(uint32 update_diff, uint32 time) override;  // overwrite Unit::Update
+        virtual void Update(uint32 update_diff, uint32 time) override;  // overwrite Unit::Update
 
         virtual void RegenerateAll(uint32 update_diff);
-        void GetRespawnCoord(float &x, float &y, float &z, float* ori = NULL, float* dist =NULL) const;
+
+        void GetRespawnCoord(float& x, float& y, float& z, float* ori = NULL, float* dist = NULL) const;
+        void SetSummonPoint(CreatureCreatePos const& pos) { m_respawnPos = pos.m_pos; }
+        void SetRespawnCoord(float x, float y, float z, float ori) { m_respawnPos.x = x; m_respawnPos.y = y; m_respawnPos.z = z; m_respawnPos.o = ori; }
+        void SetRespawnCoord(CreatureCreatePos const& pos) { m_respawnPos = pos.m_pos; }
+        void ResetRespawnCoord();
+        WorldLocation const& GetRespawnCoord() const { return m_respawnPos; };
+        void SetRespawnCoord(WorldLocation const& loc) { m_respawnPos = loc; }
+
         uint32 GetEquipmentId() const { return m_equipmentId; }
 
         CreatureSubtype GetSubtype() const { return m_subtype; }
@@ -485,86 +545,89 @@ class MANGOS_DLL_SPEC Creature : public Unit
         bool IsTemporarySummon() const { return m_subtype == CREATURE_SUBTYPE_TEMPORARY_SUMMON; }
 
         bool IsCorpse() const { return getDeathState() ==  CORPSE; }
-        bool IsDespawned() const { return getDeathState() ==  DEAD; }
+        virtual bool IsDespawned() const { return getDeathState() ==  DEAD; }
         void SetCorpseDelay(uint32 delay) { m_corpseDelay = delay; }
         bool IsRacialLeader() const { return GetCreatureInfo()->RacialLeader; }
-        bool IsCivilian() const { return GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_CIVILIAN; }
-        bool IsGuard() const { return GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_GUARD; }
+        bool IsCivilian() const { return GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_CIVILIAN; }
+        bool IsGuard() const { return GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_GUARD; }
 
-        bool CanWalk() const { return GetCreatureInfo()->InhabitType & INHABIT_GROUND; }
-        bool CanSwim() const { return GetCreatureInfo()->InhabitType & INHABIT_WATER; }
-        bool CanFly()  const { return GetCreatureInfo()->InhabitType & INHABIT_AIR; }
+        uint32 GetModelInhabitType();
+
+        bool CanWalk();
+        bool CanSwim();
+        bool CanFly();
 
         bool IsTrainerOf(Player* player, bool msg) const;
         bool CanInteractWithBattleMaster(Player* player, bool msg) const;
         bool CanTrainAndResetTalentsOf(Player* pPlayer) const;
 
         bool IsOutOfThreatArea(Unit* pVictim) const;
-        void FillGuidsListFromThreatList(std::vector<ObjectGuid>& guids, uint32 maxamount = 0);
+        void FillGuidsListFromThreatList(GuidVector& guids, uint32 maxamount = 0);
 
-        bool IsImmuneToSpell(SpellEntry const* spellInfo);
-                                                            // redefine Unit::IsImmuneToSpell
+        bool IsImmuneToSpell(SpellEntry const* spellInfo, bool isFriendly) const;
+        // redefine Unit::IsImmuneToSpell
         bool IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex index) const;
-                                                            // redefine Unit::IsImmuneToSpellEffect
+        // redefine Unit::IsImmuneToSpellEffect
         bool IsElite() const
         {
-            if(IsPet())
+            if (IsPet())
                 return false;
 
-            uint32 rank = GetCreatureInfo()->rank;
+            uint32 rank = GetCreatureInfo()->Rank;
             return rank != CREATURE_ELITE_NORMAL && rank != CREATURE_ELITE_RARE;
         }
 
         bool IsWorldBoss() const
         {
-            if(IsPet())
+            if (IsPet())
                 return false;
 
-            return GetCreatureInfo()->rank == CREATURE_ELITE_WORLDBOSS;
+            return GetCreatureInfo()->Rank == CREATURE_ELITE_WORLDBOSS;
         }
 
         uint32 GetLevelForTarget(Unit const* target) const; // overwrite Unit::GetLevelForTarget for boss level support
 
-        uint8 getRace() const override;
+        uint8 getRace() const;
 
-        bool IsInEvadeMode() const;
+        bool IsInEvadeMode() const override;
 
         bool AIM_Initialize();
 
         CreatureAI* AI() { return i_AI; }
 
-        void SetWalk(bool enable);
-        void SetLevitate(bool enable);
+        void SetWalk(bool enable, bool asDefault = true);
+        void SetLevitate(bool enable, float altitude = 1.0f);
+        void SetSwim(bool enable);
+        void SetRoot(bool enable) override;
+        void SetWaterWalk(bool enable) override;
 
         uint32 GetShieldBlockValue() const                  // dunno mob block value
         {
             return (getLevel() / 2 + uint32(GetStat(STAT_STRENGTH) / 20));
         }
 
-        SpellSchoolMask GetMeleeDamageSchoolMask() const { return m_meleeDamageSchoolMask; }
+        SpellSchoolMask GetMeleeDamageSchoolMask() const override { return m_meleeDamageSchoolMask; }
         void SetMeleeDamageSchool(SpellSchools school) { m_meleeDamageSchoolMask = SpellSchoolMask(1 << school); }
 
-        void _AddCreatureSpellCooldown(uint32 spell_id, time_t end_time);
-        void _AddCreatureCategoryCooldown(uint32 category, time_t apply_time);
-        void AddCreatureSpellCooldown(uint32 spellid);
-        bool HasSpellCooldown(uint32 spell_id) const;
-        bool HasCategoryCooldown(uint32 spell_id) const;
-
-        bool HasSpell(uint32 spellID) const;
+        bool HasSpell(uint32 spellID);
 
         bool UpdateEntry(uint32 entry, Team team = ALLIANCE, const CreatureData* data = NULL, GameEventCreatureData const* eventData = NULL, bool preserveHPAndPower = true);
 
         void ApplyGameEventSpells(GameEventCreatureData const* eventData, bool activated);
-        bool UpdateStats(Stats stat);
-        bool UpdateAllStats();
-        void UpdateResistances(uint32 school);
-        void UpdateArmor();
-        void UpdateMaxHealth();
-        void UpdateMaxPower(Powers power);
-        void UpdateAttackPowerAndDamage(bool ranged = false);
-        void UpdateDamagePhysical(WeaponAttackType attType);
-        uint32 GetCurrentEquipmentId() { return m_equipmentId; }
-        float GetSpellDamageMod(int32 Rank);
+
+        bool UpdateStats(Stats stat) override;
+        bool UpdateAllStats() override;
+        void UpdateResistances(uint32 school) override;
+        void UpdateArmor() override;
+        void UpdateMaxHealth() override;
+        void UpdateMaxPower(Powers power) override;
+        void UpdateAttackPowerAndDamage(bool ranged = false) override;
+        void UpdateDamagePhysical(WeaponAttackType attType) override;
+        uint32 GetCurrentEquipmentId() const { return m_equipmentId; }
+
+        static float _GetHealthMod(int32 Rank);             ///< Get custom factor to scale health (default 1, CONFIG_FLOAT_RATE_CREATURE_*_HP)
+        static float _GetDamageMod(int32 Rank);             ///< Get custom factor to scale damage (default 1, CONFIG_FLOAT_RATE_*_DAMAGE)
+        static float _GetSpellDamageMod(int32 Rank);        ///< Get custom factor to scale spell damage (default 1, CONFIG_FLOAT_RATE_*_SPELLDAMAGE)
 
         VendorItemData const* GetVendorItems() const;
         VendorItemData const* GetVendorTemplateItems() const;
@@ -574,23 +637,27 @@ class MANGOS_DLL_SPEC Creature : public Unit
         TrainerSpellData const* GetTrainerTemplateSpells() const;
         TrainerSpellData const* GetTrainerSpells() const;
 
-        CreatureInfo const *GetCreatureInfo() const { return m_creatureInfo; }
+        CreatureInfo const* GetCreatureInfo() const { return m_creatureInfo; }
         CreatureDataAddon const* GetCreatureAddon() const;
 
-        static uint32 ChooseDisplayId(const CreatureInfo *cinfo, const CreatureData *data = NULL, GameEventCreatureData const* eventData = NULL);
+        static uint32 ChooseDisplayId(const CreatureInfo* cinfo, const CreatureData* data = NULL, GameEventCreatureData const* eventData = NULL);
+        void SetDisplayId(uint32 modelId);
 
         std::string GetAIName() const;
         std::string GetScriptName() const;
         uint32 GetScriptId() const;
 
+        bool SD2AIName() const { return !GetScriptName().empty(); }
+        bool HasAIName() const { return !GetAIName().empty(); }
+
         // overwrite WorldObject function for proper name localization
         const char* GetNameForLocaleIdx(int32 locale_idx) const;
 
         void SetDeathState(DeathState s);                   // overwrite virtual Unit::SetDeathState
 
-        bool LoadFromDB(uint32 guid, Map *map);
+        bool LoadFromDB(uint32 guid, Map* map);
         void SaveToDB();
-                                                            // overwrited in Pet
+        // overwrited in Pet
         virtual void SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask);
         virtual void DeleteFromDB();                        // overwrited in Pet
         static void DeleteFromDB(uint32 lowguid, CreatureData const* data);
@@ -601,25 +668,19 @@ class MANGOS_DLL_SPEC Creature : public Unit
         bool lootForSkin;
 
         void PrepareBodyLootState();
-        ObjectGuid GetLootRecipientGuid() const { return m_lootRecipientGuid; }
-        uint32 GetLootGroupRecipientId() const { return m_lootGroupRecipientId; }
-        Player* GetLootRecipient() const;                   // use group cases as prefered
-        Group* GetGroupLootRecipient() const;
-        bool HasLootRecipient() const { return m_lootGroupRecipientId || m_lootRecipientGuid; }
-        bool IsGroupLootRecipient() const { return m_lootGroupRecipientId; }
         void SetLootRecipient(Unit* unit);
         void AllLootRemovedFromCorpse();
-        Player* GetOriginalLootRecipient() const;           // ignore group changes/etc, not for looting
 
-        SpellEntry const *ReachWithSpellAttack(Unit *pVictim);
-        SpellEntry const *ReachWithSpellCure(Unit *pVictim);
+        SpellEntry const* ReachWithSpellAttack(Unit* pVictim);
+        SpellEntry const* ReachWithSpellCure(Unit* pVictim);
 
-        uint32 m_spells[CREATURE_MAX_SPELLS];
-        CreatureSpellCooldowns m_CreatureSpellCooldowns;
-        CreatureSpellCooldowns m_CreatureCategoryCooldowns;
+        uint32 GetSpell(uint8 index, uint8 activeState = 0);
+        uint8  GetSpellMaxIndex(uint8 activeState = 0);
 
         float GetAttackDistance(Unit const* pl) const;
 
+        float GetReachDistance(Unit const* pl) const;
+
         void SendAIReaction(AiReaction reactionType);
 
         void DoFleeToGetAssistance();
@@ -631,6 +692,11 @@ class MANGOS_DLL_SPEC Creature : public Unit
         bool CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction = true) const;
         bool CanInitiateAttack();
 
+        bool isPassiveToHostile()
+        {
+            return (IsCivilian() || Unit::isPassiveToHostile());
+        }
+
         MovementGeneratorType GetDefaultMovementType() const { return m_defaultMovementType; }
         void SetDefaultMovementType(MovementGeneratorType mgt) { m_defaultMovementType = mgt; }
 
@@ -661,8 +727,6 @@ class MANGOS_DLL_SPEC Creature : public Unit
         static void AddToRemoveListInMaps(uint32 db_guid, CreatureData const* data);
         static void SpawnInMaps(uint32 db_guid, CreatureData const* data);
 
-        void StartGroupLoot(Group* group, uint32 timer);
-
         void SendZoneUnderAttackMessage(Player* attacker);
 
         void SetInCombatWithZone();
@@ -670,67 +734,63 @@ class MANGOS_DLL_SPEC Creature : public Unit
         Unit* SelectAttackingTarget(AttackingTarget target, uint32 position, uint32 uiSpellEntry, uint32 selectFlags = 0) const;
         Unit* SelectAttackingTarget(AttackingTarget target, uint32 position, SpellEntry const* pSpellInfo = NULL, uint32 selectFlags = 0) const;
 
+        virtual Unit* SelectPreferredTargetForSpell(SpellEntry const* spellInfo);
+
         bool HasQuest(uint32 quest_id) const;
         bool HasInvolvedQuest(uint32 quest_id)  const;
 
-        GridReference<Creature> &GetGridRef() { return m_gridRef; }
-        bool IsRegeneratingHealth() { return m_regenHealth; }
+        GridReference<Creature>& GetGridRef() { return m_gridRef; }
+        bool IsRegeneratingHealth() { return GetCreatureInfo()->RegenerateStats & REGEN_FLAG_HEALTH; }
+        bool IsRegeneratingPower() { return GetCreatureInfo()->RegenerateStats & REGEN_FLAG_POWER; }
         virtual uint8 GetPetAutoSpellSize() const { return CREATURE_MAX_SPELLS; }
         virtual uint32 GetPetAutoSpellOnPos(uint8 pos) const
         {
-            if (pos >= CREATURE_MAX_SPELLS || m_charmInfo->GetCharmSpell(pos)->GetType() != ACT_ENABLED)
+            if (pos >= CREATURE_MAX_SPELLS || !m_charmInfo->GetCharmSpell(pos) || m_charmInfo->GetCharmSpell(pos)->GetType() != ACT_ENABLED)
                 return 0;
             else
                 return m_charmInfo->GetCharmSpell(pos)->GetAction();
         }
 
-        void SetCombatStartPosition(float x, float y, float z) { m_combatStartX = x; m_combatStartY = y; m_combatStartZ = z; }
-        void GetCombatStartPosition(float &x, float &y, float &z) { x = m_combatStartX; y = m_combatStartY; z = m_combatStartZ; }
-
-        void SetSummonPoint(CreatureCreatePos const& pos) { m_summonPos = pos.m_pos; }
-        void GetSummonPoint(float &fX, float &fY, float &fZ, float &fOrient) const { fX = m_summonPos.x; fY = m_summonPos.y; fZ = m_summonPos.z; fOrient = m_summonPos.o; }
+        void SetCombatStartPosition(float x, float y, float z) { m_combatStart = WorldLocation(GetMapId(), x, y, z); }
+        void GetCombatStartPosition(float& x, float& y, float& z) { x = m_combatStart.x; y = m_combatStart.y; z = m_combatStart.z; }
+        WorldLocation const& GetCombatStartPosition() const { return m_combatStart; };
 
-        void SetDeadByDefault (bool death_state) { m_isDeadByDefault = death_state; }
+        void SetDeadByDefault(bool death_state) { m_isDeadByDefault = death_state; }
 
         void SetFactionTemporary(uint32 factionId, uint32 tempFactionFlags = TEMPFACTION_ALL);
         void ClearTemporaryFaction();
         uint32 GetTemporaryFactionFlags() { return m_temporaryFactionFlags; }
 
-        void SendAreaSpiritHealerQueryOpcode(Player *pl);
+        void SendAreaSpiritHealerQueryOpcode(Player* pl);
+
+        void LockAI(bool lock) { m_AI_locked = lock; };
+        bool IsAILocked() const { return m_AI_locked; };
 
         void SetVirtualItem(VirtualItemSlot slot, uint32 item_id) { SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + slot, item_id); }
 
     protected:
         bool MeetsSelectAttackingRequirement(Unit* pTarget, SpellEntry const* pSpellInfo, uint32 selectFlags) const;
 
-        bool CreateFromProto(uint32 guidlow, CreatureInfo const* cinfo, Team team, const CreatureData *data = NULL, GameEventCreatureData const* eventData =NULL);
+        bool CreateFromProto(uint32 guidlow, CreatureInfo const* cinfo, Team team, const CreatureData* data = NULL, GameEventCreatureData const* eventData = NULL);
         bool InitEntry(uint32 entry, const CreatureData* data = NULL, GameEventCreatureData const* eventData = NULL);
 
-        uint32 m_groupLootTimer;                            // (msecs)timer used for group loot
-        uint32 m_groupLootId;                               // used to find group which is looting corpse
-        void StopGroupLoot();
-
         // vendor items
         VendorItemCounts m_vendorItemCounts;
 
         void _RealtimeSetCreatureInfo();
 
-        static float _GetHealthMod(int32 Rank);
-        static float _GetDamageMod(int32 Rank);
-
         uint32 m_lootMoney;
-        ObjectGuid m_lootRecipientGuid;                     // player who will have rights for looting if m_lootGroupRecipient==0 or group disbanded
-        uint32 m_lootGroupRecipientId;                      // group who will have rights for looting if set and exist
 
         /// Timers
         uint32 m_corpseDecayTimer;                          // (msecs)timer for death or corpse disappearance
         time_t m_respawnTime;                               // (secs) time of next respawn
         uint32 m_respawnDelay;                              // (secs) delay between corpse disappearance and respawning
         uint32 m_corpseDelay;                               // (secs) delay between death and corpse disappearance
+        uint32 m_aggroDelay;                                // (msecs)delay between respawn and aggro due to movement
         float m_respawnradius;
 
         CreatureSubtype m_subtype;                          // set in Creatures subclasses for fast it detect without dynamic_cast use
-        void RegenerateMana();
+        void RegeneratePower();
         void RegenerateHealth();
         MovementGeneratorType m_defaultMovementType;
         Cell m_currentCell;                                 // store current cell where creature listed
@@ -739,7 +799,6 @@ class MANGOS_DLL_SPEC Creature : public Unit
         // below fields has potential for optimization
         bool m_AlreadyCallAssistance;
         bool m_AlreadySearchedAssistance;
-        bool m_regenHealth;
         bool m_AI_locked;
         bool m_isDeadByDefault;
         uint32 m_temporaryFactionFlags;                     // used for real faction changes (not auras etc)
@@ -747,39 +806,16 @@ class MANGOS_DLL_SPEC Creature : public Unit
         SpellSchoolMask m_meleeDamageSchoolMask;
         uint32 m_originalEntry;
 
-        float m_combatStartX;
-        float m_combatStartY;
-        float m_combatStartZ;
+        WorldLocation m_combatStart;
+        WorldLocation m_respawnPos;
 
-        Position m_summonPos;
+        CreatureSpellsList m_spellOverride;
 
     private:
         GridReference<Creature> m_gridRef;
         CreatureInfo const* m_creatureInfo;                 // in difficulty mode > 0 can different from ObjMgr::GetCreatureTemplate(GetEntry())
-};
 
-class AssistDelayEvent : public BasicEvent
-{
-    public:
-        AssistDelayEvent(ObjectGuid victim, Unit& owner, std::list<Creature*> const& assistants);
-
-        bool Execute(uint64 e_time, uint32 p_time);
-    private:
-        AssistDelayEvent();
-
-        ObjectGuid              m_victimGuid;
-        std::vector<ObjectGuid> m_assistantGuids;
-        Unit&                   m_owner;
-};
-
-class ForcedDespawnDelayEvent : public BasicEvent
-{
-    public:
-        ForcedDespawnDelayEvent(Creature& owner) : BasicEvent(), m_owner(owner) { }
-        bool Execute(uint64 e_time, uint32 p_time);
-
-    private:
-        Creature& m_owner;
+        int32 m_modelInhabitType;                           // cached value
 };
 
 #endif
diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp
index 3cce6cda87d..c7d3aad62ed 100644
--- a/src/game/CreatureAI.cpp
+++ b/src/game/CreatureAI.cpp
@@ -20,19 +20,27 @@
 #include "Creature.h"
 #include "DBCStores.h"
 #include "Spell.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "CellImpl.h"
+
+static_assert(MAXIMAL_AI_EVENT_EVENTAI <= 32, "Maximal 32 AI_EVENTs supported with EventAI");
 
 CreatureAI::~CreatureAI()
 {
 }
 
-void CreatureAI::AttackedBy( Unit* attacker )
+void CreatureAI::AttackedBy(Unit* attacker)
 {
-    if(!m_creature->getVictim())
+    if (!m_creature->getVictim())
         AttackStart(attacker);
 }
 
-CanCastResult CreatureAI::CanCastSpell(Unit* pTarget, const SpellEntry *pSpell, bool isTriggered)
+CanCastResult CreatureAI::CanCastSpell(Unit* pTarget, const SpellEntry* pSpell, bool isTriggered)
 {
+    if (!pTarget)
+        return CAST_FAIL_OTHER;
+
     // If not triggered, we check
     if (!isTriggered)
     {
@@ -47,16 +55,19 @@ CanCastResult CreatureAI::CanCastSpell(Unit* pTarget, const SpellEntry *pSpell,
             return CAST_FAIL_STATE;
 
         // Check for power (also done by Spell::CheckCast())
-        if (m_creature->GetPower((Powers)pSpell->powerType) < Spell::CalculatePowerCost(pSpell, m_creature))
+        if ((int32)m_creature->GetPower((Powers)pSpell->GetPowerType()) < Spell::CalculatePowerCost(pSpell, m_creature))
             return CAST_FAIL_POWER;
+
+        if (m_creature->HasSpellCooldown(pSpell))
+            return CAST_FAIL_SPELL_COOLDOWN;
     }
 
-    if (const SpellRangeEntry *pSpellRange = sSpellRangeStore.LookupEntry(pSpell->rangeIndex))
+    if (SpellRangeEntry const* pSpellRange = sSpellRangeStore.LookupEntry(pSpell->GetRangeIndex()))
     {
         if (pTarget != m_creature)
         {
             // pTarget is out of range of this spell (also done by Spell::CheckCast())
-            float fDistance = m_creature->GetCombatDistance(pTarget);
+            float fDistance = m_creature->GetCombatDistance(pTarget, pSpell->rangeIndex == SPELL_RANGE_IDX_COMBAT);
 
             if (fDistance > (m_creature->IsHostileTo(pTarget) ? pSpellRange->maxRange : pSpellRange->maxRangeFriendly))
                 return CAST_FAIL_TOO_FAR;
@@ -75,6 +86,9 @@ CanCastResult CreatureAI::CanCastSpell(Unit* pTarget, const SpellEntry *pSpell,
 
 CanCastResult CreatureAI::DoCastSpellIfCan(Unit* pTarget, uint32 uiSpell, uint32 uiCastFlags, ObjectGuid uiOriginalCasterGUID)
 {
+    if (!pTarget)
+        return CAST_FAIL_OTHER;
+
     Unit* pCaster = m_creature;
 
     if (uiCastFlags & CAST_FORCE_TARGET_SELF)
@@ -102,7 +116,7 @@ CanCastResult CreatureAI::DoCastSpellIfCan(Unit* pTarget, uint32 uiSpell, uint32
             }
 
             // Interrupt any previous spell
-            if (uiCastFlags & CAST_INTERRUPT_PREVIOUS && pCaster->IsNonMeleeSpellCasted(false))
+            if ((uiCastFlags & CAST_INTERRUPT_PREVIOUS) && pCaster->IsNonMeleeSpellCasted(false))
                 pCaster->InterruptNonMeleeSpells(false);
 
             pCaster->CastSpell(pTarget, pSpell, uiCastFlags & CAST_TRIGGERED, NULL, NULL, uiOriginalCasterGUID);
@@ -118,7 +132,97 @@ CanCastResult CreatureAI::DoCastSpellIfCan(Unit* pTarget, uint32 uiSpell, uint32
         return CAST_FAIL_IS_CASTING;
 }
 
+bool CreatureAI::AttackByType(WeaponAttackType attType)
+{
+    // Make sure our attack is ready before checking distance
+    if (!m_creature->isAttackReady(attType))
+        return false;
+
+    Unit* pVictim = m_creature->getVictim();
+    if (!pVictim || !m_creature->CanReachWithMeleeAttack(pVictim))
+        return false;
+
+    m_creature->AttackerStateUpdate(pVictim, attType);
+    m_creature->resetAttackTimer(attType);
+    WeaponAttackType attTypeTwo = (attType == BASE_ATTACK ? OFF_ATTACK : BASE_ATTACK);
+    if (m_creature->getAttackTimer(attTypeTwo) < 500)
+        m_creature->setAttackTimer(attTypeTwo, 500);
+
+    return true;
+}
+
 bool CreatureAI::DoMeleeAttackIfReady()
 {
     return m_creature->UpdateMeleeAttackingState();
 }
+
+void CreatureAI::SetCombatMovement(bool enable, bool stopOrStartMovement /*=false*/)
+{
+    m_isCombatMovement = enable;
+
+    if (enable)
+        m_creature->clearUnitState(UNIT_STAT_NO_COMBAT_MOVEMENT);
+    else
+        m_creature->addUnitState(UNIT_STAT_NO_COMBAT_MOVEMENT);
+
+    if (!stopOrStartMovement)
+        return;
+
+    if (Unit* pVictim = m_creature->getVictim()) // Only change current movement while in combat
+    {
+        if (enable)
+            m_creature->GetMotionMaster()->MoveChase(pVictim, m_attackDistance, m_attackAngle);
+        else if (m_creature->IsInUnitState(UNIT_ACTION_CHASE))
+            m_creature->StopMoving();
+    }
+}
+
+void CreatureAI::HandleMovementOnAttackStart(Unit* victim)
+{
+    if (m_isCombatMovement)
+        m_creature->GetMotionMaster()->MoveChase(victim, m_attackDistance, m_attackAngle);
+    else if (m_creature->IsInUnitState(UNIT_ACTION_CHASE))
+    {
+        m_creature->GetUnitStateMgr().DropAction(UNIT_ACTION_CHASE);
+        m_creature->StopMoving();
+    }
+}
+
+// ////////////////////////////////////////////////////////////////////////////////////////////////
+//                                      Event system
+// ////////////////////////////////////////////////////////////////////////////////////////////////
+
+void CreatureAI::SendAIEventAround(AIEventType eventType, Unit* pInvoker, uint32 uiDelay, float fRadius, uint32 miscValue /*=0*/) const
+{
+    if (fRadius > 0)
+    {
+        std::list<Creature*> receiverList;
+
+        // Allow sending custom AI events to all units in range
+        if (eventType == AI_EVENT_CUSTOM_EVENTAI_A || eventType == AI_EVENT_CUSTOM_EVENTAI_B)
+        {
+            MaNGOS::AnyUnitInObjectRangeCheck u_check(m_creature, fRadius);
+            MaNGOS::CreatureListSearcher<MaNGOS::AnyUnitInObjectRangeCheck> searcher(receiverList, u_check);
+            Cell::VisitGridObjects(m_creature, searcher, fRadius);
+        }
+        else
+        {
+            // Use this check here to collect only assitable creatures in case of CALL_ASSISTANCE, else be less strict
+            MaNGOS::AnyAssistCreatureInRangeCheck u_check(m_creature, eventType == AI_EVENT_CALL_ASSISTANCE ? pInvoker : NULL, fRadius);
+            MaNGOS::CreatureListSearcher<MaNGOS::AnyAssistCreatureInRangeCheck> searcher(receiverList, u_check);
+            Cell::VisitGridObjects(m_creature, searcher, fRadius);
+        }
+
+        if (!receiverList.empty())
+        {
+            AiDelayEventAround* e = new AiDelayEventAround(eventType, pInvoker ? pInvoker->GetObjectGuid() : ObjectGuid(), *m_creature, receiverList, miscValue);
+            m_creature->AddEvent(e, uiDelay);
+        }
+    }
+}
+
+void CreatureAI::SendAIEvent(AIEventType eventType, Unit* pInvoker, Creature* pReceiver, uint32 miscValue /*=0*/) const
+{
+    MANGOS_ASSERT(pReceiver);
+    pReceiver->AI()->ReceiveAIEvent(eventType, m_creature, pInvoker, miscValue);
+}
diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h
index 8e7e9f68be2..8d9386b7042 100644
--- a/src/game/CreatureAI.h
+++ b/src/game/CreatureAI.h
@@ -25,6 +25,7 @@
 #include "Dynamic/ObjectRegistry.h"
 #include "Dynamic/FactoryHolder.h"
 #include "ObjectGuid.h"
+#include "Unit.h"
 
 class WorldObject;
 class GameObject;
@@ -46,23 +47,29 @@ enum CanCastResult
     CAST_FAIL_TOO_CLOSE         = 4,
     CAST_FAIL_POWER             = 5,
     CAST_FAIL_STATE             = 6,
-    CAST_FAIL_TARGET_AURA       = 7
+    CAST_FAIL_TARGET_AURA       = 7,
+    CAST_FAIL_SPELL_COOLDOWN    = 8,
 };
 
 enum CastFlags
 {
-    CAST_INTERRUPT_PREVIOUS     = 0x01,                     //Interrupt any spell casting
-    CAST_TRIGGERED              = 0x02,                     //Triggered (this makes spell cost zero mana and have no cast time)
-    CAST_FORCE_CAST             = 0x04,                     //Forces cast even if creature is out of mana or out of range
-    CAST_NO_MELEE_IF_OOM        = 0x08,                     //Prevents creature from entering melee if out of mana or out of range
-    CAST_FORCE_TARGET_SELF      = 0x10,                     //Forces the target to cast this spell on itself
-    CAST_AURA_NOT_PRESENT       = 0x20,                     //Only casts the spell if the target does not have an aura from the spell
+    CAST_INTERRUPT_PREVIOUS     = 0x01,                     // Interrupt any spell casting
+    CAST_TRIGGERED              = 0x02,                     // Triggered (this makes spell cost zero mana and have no cast time)
+    CAST_FORCE_CAST             = 0x04,                     // Forces cast even if creature is out of mana or out of range
+    CAST_NO_MELEE_IF_OOM        = 0x08,                     // Prevents creature from entering melee if out of mana or out of range
+    CAST_FORCE_TARGET_SELF      = 0x10,                     // Forces the target to cast this spell on itself
+    CAST_AURA_NOT_PRESENT       = 0x20,                     // Only casts the spell if the target does not have an aura from the spell
 };
 
 class MANGOS_DLL_SPEC CreatureAI
 {
     public:
-        explicit CreatureAI(Creature* creature) : m_creature(creature) {}
+        explicit CreatureAI(Creature* creature) :
+            m_creature(creature),
+            m_isCombatMovement(true),
+            m_attackDistance(0.0f),
+            m_attackAngle(0.0f)
+        {}
 
         virtual ~CreatureAI();
 
@@ -73,7 +80,7 @@ class MANGOS_DLL_SPEC CreatureAI
          * Use this for on-the-fly debugging
          * @param reader is a ChatHandler to send messages to.
          */
-        virtual void GetAIInformation(ChatHandler& reader) {}
+        virtual void GetAIInformation(ChatHandler& /*reader*/) {}
 
         ///== Reactions At =================================
 
@@ -83,13 +90,13 @@ class MANGOS_DLL_SPEC CreatureAI
          * Note: This function is not called for creatures who are in evade mode
          * @param pWho Unit* who moved in the visibility range and is visisble
          */
-        virtual void MoveInLineOfSight(Unit* pWho) {}
+        virtual void MoveInLineOfSight(Unit* /*pWho*/) {}
 
         /**
          * Called for reaction at enter to combat if not in combat yet
          * @param pEnemy Unit* of whom the Creature enters combat with, can be NULL
          */
-        virtual void EnterCombat(Unit* pEnemy) {}
+        virtual void EnterCombat(Unit* /*pEnemy*/) {}
 
         /**
          * Called for reaction at stopping attack at no attackers or targets
@@ -102,15 +109,19 @@ class MANGOS_DLL_SPEC CreatureAI
          */
         virtual void JustReachedHome() {}
 
-        // Called at any heal cast/item used (call non implemented)
-        // virtual void HealBy(Unit * /*healer*/, uint32 /*amount_healed*/) {}
+        /**
+         * Called at any Heal received from any Unit
+         * @param pHealer Unit* which deals the heal
+         * @param uiHealedAmount Amount of healing received
+         */
+        virtual void HealedBy(Unit* /*pHealer*/, uint32& /*uiHealedAmount*/) {}
 
         /**
          * Called at any Damage to any victim (before damage apply)
          * @param pDoneTo Unit* to whom Damage of amount uiDamage will be dealt
          * @param uiDamage Amount of Damage that will be dealt, can be changed here
          */
-        virtual void DamageDeal(Unit* pDoneTo, uint32& uiDamage) {}
+        virtual void DamageDeal(Unit* /*pDoneTo*/, uint32& /*uiDamage*/) {}
 
         /**
          * Called at any Damage from any attacker (before damage apply)
@@ -119,69 +130,69 @@ class MANGOS_DLL_SPEC CreatureAI
          * @param pDealer Unit* who will deal Damage to the creature
          * @param uiDamage Amount of Damage that will be dealt, can be changed here
          */
-        virtual void DamageTaken(Unit* pDealer, uint32& uiDamage) {}
+        virtual void DamageTaken(Unit* /*pDealer*/, uint32& /*uiDamage*/) {}
 
         /**
          * Called when the creature is killed
          * @param pKiller Unit* who killed the creature
          */
-        virtual void JustDied(Unit* pKiller) {}
+        virtual void JustDied(Unit* /*pKiller*/) {}
 
         /**
          * Called when the corpse of this creature gets removed
          * @param uiRespawnDelay Delay (in seconds). If != 0, then this is the time after which the creature will respawn, if = 0 the default respawn-delay will be used
          */
-        virtual void CorpseRemoved(uint32& uiRespawnDelay) {}
+        virtual void CorpseRemoved(uint32& /*uiRespawnDelay*/) {}
 
         /**
          * Called when a summoned creature is killed
          * @param pSummoned Summoned Creature* that got killed
          */
-        virtual void SummonedCreatureJustDied(Creature* pSummoned) {}
+        virtual void SummonedCreatureJustDied(Creature* /*pSummoned*/) {}
 
         /**
          * Called when the creature kills a unit
          * @param pVictim Victim that got killed
          */
-        virtual void KilledUnit(Unit* pVictim) {}
+        virtual void KilledUnit(Unit* /*pVictim*/) {}
 
         /**
          * Called when owner of m_creature (if m_creature is PROTECTOR_PET) kills a unit
          * @param pVictim Victim that got killed (by owner of creature)
          */
-        virtual void OwnerKilledUnit(Unit* pVictim) {}
+        virtual void OwnerKilledUnit(Unit* /*pVictim*/) {}
 
         /**
          * Called when the creature summon successfully other creature
          * @param pSummoned Creature that got summoned
          */
-        virtual void JustSummoned(Creature* pSummoned) {}
+        virtual void JustSummoned(Creature* /*pSummoned*/) {}
 
         /**
          * Called when the creature summon successfully a gameobject
          * @param pGo GameObject that was summoned
          */
-        virtual void JustSummoned(GameObject* pGo) {}
+        virtual void JustSummoned(GameObject* /*pGo*/) {}
 
         /**
          * Called when a summoned creature gets TemporarySummon::UnSummon ed
          * @param pSummoned Summoned creature that despawned
          */
-        virtual void SummonedCreatureDespawn(Creature* pSummoned) {}
+        virtual void SummonedCreatureDespawn(Creature* /*pSummoned*/) {}
 
         /**
          * Called when hit by a spell
          * @param pCaster Caster who casted the spell
          * @param pSpell The spell that hit the creature
          */
-        virtual void SpellHit(Unit* pCaster, const SpellEntry* pSpell) {}
+        virtual void SpellHit(Unit* /*pCaster*/, const SpellEntry* /*pSpell*/) {}
 
         /**
          * Called when spell hits creature's target
          * @param pTarget Target that we hit with the spell
          * @param pSpell Spell with which we hit pTarget
          */
-        virtual void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) {}
+        virtual void SpellHitTarget(Unit* /*pTarget*/, const SpellEntry* /*pSpell*/) {}
 
         /**
          * Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc)
@@ -199,7 +210,7 @@ class MANGOS_DLL_SPEC CreatureAI
          * @param uiMovementType Type of the movement (enum MovementGeneratorType)
          * @param uiData Data related to the finished movement (ie point-id)
          */
-        virtual void MovementInform(uint32 uiMovementType, uint32 uiData) {}
+        virtual void MovementInform(uint32 /*uiMovementType*/, uint32 /*uiData*/) {}
 
         /**
          * Called if a temporary summoned of m_creature reach a move point
@@ -207,14 +218,20 @@ class MANGOS_DLL_SPEC CreatureAI
          * @param uiMotionType Type of the movement (enum MovementGeneratorType)
          * @param uiData Data related to the finished movement (ie point-id)
          */
-        virtual void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiData) {}
+        virtual void SummonedMovementInform(Creature* /*pSummoned*/, uint32 /*uiMotionType*/, uint32 /*uiData*/) {}
 
         /**
          * Called at text emote receive from player
          * @param pPlayer Player* who sent the emote
          * @param uiEmote ID of the emote the player used with the creature as target
          */
-        virtual void ReceiveEmote(Player* pPlayer, uint32 uiEmote) {}
+        virtual void ReceiveEmote(Player* /*pPlayer*/, uint32 /*uiEmote*/) {}
+
+        // Called when Unit get/remove a passenger
+        virtual void PassengerBoarded(Unit * /*pWho*/, int8 /*seatId*/, bool /*apply*/) {}
+
+        // Called when Unit enter/remove a Vehicle
+        virtual void EnteredVehicle(Unit* /*pWho*/, int8 /*seatId*/, bool /*apply*/) {}
 
         ///== Triggered Actions Requested ==================
 
@@ -224,7 +241,7 @@ class MANGOS_DLL_SPEC CreatureAI
          * Note: Usually called by MoveInLineOfSight, in Unit::SelectHostileTarget or when the AI is forced to attack an enemy
          * @param pWho Unit* who is possible target
          */
-        virtual void AttackStart(Unit* pWho) {}
+        virtual void AttackStart(Unit* /*pWho*/) {}
 
         /**
          * Called at World update tick, by default every 100ms
@@ -232,7 +249,7 @@ class MANGOS_DLL_SPEC CreatureAI
          * Note: Use this function to handle Timers, Threat-Management and MeleeAttacking
          * @param uiDiff Passed time since last call
          */
-        virtual void UpdateAI(const uint32 uiDiff) {}
+        virtual void UpdateAI(const uint32 /*uiDiff*/) {}
 
         ///== State checks =================================
 
@@ -241,13 +258,14 @@ class MANGOS_DLL_SPEC CreatureAI
          * Note: This check is by default only the state-depending (visibility, range), NOT LineOfSight
          * @param pWho Unit* who is checked if it is visisble for the creature
          */
-        virtual bool IsVisible(Unit* pWho) const { return false; }
+        virtual bool IsVisible(Unit* /*pWho*/) const { return false; }
 
         // Called when victim entered water and creature can not enter water
         // TODO: rather unused
         virtual bool canReachByRangeAttack(Unit*) { return false; }
 
         ///== Helper functions =============================
+        bool AttackByType(WeaponAttackType attType = BASE_ATTACK);
 
         /// This function is used to do the actual melee damage (if possible)
         bool DoMeleeAttackIfReady();
@@ -264,25 +282,74 @@ class MANGOS_DLL_SPEC CreatureAI
          */
         CanCastResult DoCastSpellIfCan(Unit* pTarget, uint32 uiSpell, uint32 uiCastFlags = 0, ObjectGuid OriginalCasterGuid = ObjectGuid());
 
+        /// Set combat movement (on/off), also sets UNIT_STAT_NO_COMBAT_MOVEMENT
+        void SetCombatMovement(bool enable, bool stopOrStartMovement = false);
+        bool IsCombatMovement() const { return m_isCombatMovement; }
+
+        ///== Event Handling ===============================
+
+        /**
+         * Send an AI Event to nearby Creatures around
+         * @param uiType number to specify the event, default cases listed in enum AIEventType
+         * @param pInvoker Unit that triggered this event (like an attacker)
+         * @param uiDelay  delay time until the Event will be triggered
+         * @param fRadius  range in which for receiver is searched
+         */
+        void SendAIEventAround(AIEventType eventType, Unit* pInvoker, uint32 uiDelay, float fRadius, uint32 miscValue = 0) const;
+
+        /**
+         * Send an AI Event to a Creature
+         * @param eventType to specify the event, default cases listed in enum AIEventType
+         * @param pInvoker Unit that triggered this event (like an attacker)
+         * @param pReceiver Creature to receive this event
+         */
+        void SendAIEvent(AIEventType eventType, Unit* pInvoker, Creature* pReceiver, uint32 miscValue = 0) const;
+
+        /**
+         * Called when an AI Event is received
+         * @param eventType to specify the event, default cases listed in enum AIEventType
+         * @param pSender Creature that sent this event
+         * @param pInvoker Unit that triggered this event (like an attacker)
+         */
+        virtual void ReceiveAIEvent(AIEventType /*eventType*/, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*miscValue*/) {}
+
+        /// called when creature is about to despawn
+        virtual void BeforeDespawn() {}
+
+        /// method to pass actions between AI's
+        virtual void DoAction(int32 action) {}
+
+        virtual void SetData(uint32 type, uint32 data) { }
+        virtual uint32 GetData (uint32 id) { return 0; }
+
+    protected:
+        void HandleMovementOnAttackStart(Unit* victim);
+
         ///== Fields =======================================
 
         /// Pointer to the Creature controlled by this AI
         Creature* const m_creature;
+
+        /// Combat movement currently enabled
+        bool m_isCombatMovement;
+        /// How should an enemy be chased
+        float m_attackDistance;
+        float m_attackAngle;
 };
 
 struct SelectableAI : public FactoryHolder<CreatureAI>, public Permissible<Creature>
 {
-    SelectableAI(const char *id) : FactoryHolder<CreatureAI>(id) {}
+    SelectableAI(const char* id) : FactoryHolder<CreatureAI>(id) {}
 };
 
 template<class REAL_AI>
 struct CreatureAIFactory : public SelectableAI
 {
-    CreatureAIFactory(const char *name) : SelectableAI(name) {}
+    CreatureAIFactory(const char* name) : SelectableAI(name) {}
 
-    CreatureAI* Create(void *) const;
+    CreatureAI* Create(void*) const;
 
-    int Permit(const Creature *c) const { return REAL_AI::Permissible(c); }
+    int Permit(const Creature* c) const { return REAL_AI::Permissible(c); }
 };
 
 enum Permitions
diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h
index 5ea972fe08b..29eff6901f9 100644
--- a/src/game/CreatureAIImpl.h
+++ b/src/game/CreatureAIImpl.h
@@ -22,9 +22,9 @@
 
 template<class REAL_AI>
 inline CreatureAI*
-CreatureAIFactory<REAL_AI>::Create(void *data) const
+CreatureAIFactory<REAL_AI>::Create(void* data) const
 {
-    Creature* creature = reinterpret_cast<Creature *>(data);
+    Creature* creature = reinterpret_cast<Creature*>(data);
     return (new REAL_AI(creature));
 }
 #endif
diff --git a/src/game/CreatureAIRegistry.cpp b/src/game/CreatureAIRegistry.cpp
index f425372310d..6376efe106c 100644
--- a/src/game/CreatureAIRegistry.cpp
+++ b/src/game/CreatureAIRegistry.cpp
@@ -23,11 +23,11 @@
 #include "PetAI.h"
 #include "TotemAI.h"
 #include "CreatureEventAI.h"
-#include "RandomMovementGenerator.h"
 #include "CreatureAIImpl.h"
-#include "MovementGeneratorImpl.h"
 #include "CreatureAIRegistry.h"
-#include "WaypointMovementGenerator.h"
+#include "movementGenerators/MovementGeneratorImpl.h"
+#include "movementGenerators/RandomMovementGenerator.h"
+#include "movementGenerators/WaypointMovementGenerator.h"
 
 namespace AIRegistry
 {
diff --git a/src/game/CreatureAIRegistry.h b/src/game/CreatureAIRegistry.h
index fbff134f6fe..65f46b6ca1b 100644
--- a/src/game/CreatureAIRegistry.h
+++ b/src/game/CreatureAIRegistry.h
@@ -23,4 +23,5 @@ namespace AIRegistry
 {
     void Initialize(void);
 }
+
 #endif
diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp
index a3f4a977c9f..75b6b521494 100644
--- a/src/game/CreatureAISelector.cpp
+++ b/src/game/CreatureAISelector.cpp
@@ -20,8 +20,8 @@
 #include "Creature.h"
 #include "CreatureAIImpl.h"
 #include "NullCreatureAI.h"
-#include "Policies/SingletonImp.h"
-#include "MovementGenerator.h"
+#include "Policies/Singleton.h"
+#include "movementGenerators/MovementGenerator.h"
 #include "ScriptMgr.h"
 #include "Pet.h"
 
@@ -30,31 +30,37 @@ INSTANTIATE_SINGLETON_1(MovementGeneratorRegistry);
 
 namespace FactorySelector
 {
-    CreatureAI* selectAI(Creature *creature)
+    CreatureAI* selectAI(Creature* creature)
     {
         // Allow scripting AI for normal creatures and not controlled pets (guardians and mini-pets)
         if ((!creature->IsPet() || !((Pet*)creature)->isControlled()) && !creature->isCharmed())
-            if (CreatureAI* scriptedAI = sScriptMgr.GetCreatureAI(creature))
+        {
+            CreatureAI* scriptedAI = sScriptMgr.GetCreatureAI(creature);
+            if (scriptedAI)
                 return scriptedAI;
+        }
+
+        if (creature->IsVehicle() && creature->isCharmed() && creature->GetCharmer() && creature->GetCharmer()->GetTypeId() == TYPEID_PLAYER)
+            return (new NullCreatureAI(creature));
 
-        CreatureAIRegistry &ai_registry(CreatureAIRepository::Instance());
+        CreatureAIRegistry& ai_registry(CreatureAIRepository::Instance());
 
-        const CreatureAICreator *ai_factory = NULL;
+        const CreatureAICreator* ai_factory = NULL;
 
-        std::string ainame=creature->GetAIName();
+        std::string ainame = creature->GetAIName();
 
         // select by NPC flags _first_ - otherwise EventAI might be choosen for pets/totems
         // excplicit check for isControlled() and owner type to allow guardian, mini-pets and pets controlled by NPCs to be scripted by EventAI
-        Unit *owner=NULL;
+        Unit* owner = NULL;
         if ((creature->IsPet() && ((Pet*)creature)->isControlled() &&
-            ((owner=creature->GetOwner()) && owner->GetTypeId()==TYPEID_PLAYER)) || creature->isCharmed())
+                ((owner = creature->GetOwner()) && owner->GetTypeId() == TYPEID_PLAYER)) || creature->isCharmed())
             ai_factory = ai_registry.GetRegistryItem("PetAI");
         else if (creature->IsTotem())
             ai_factory = ai_registry.GetRegistryItem("TotemAI");
 
         // select by script name
         if (!ai_factory && !ainame.empty())
-            ai_factory = ai_registry.GetRegistryItem( ainame.c_str() );
+            ai_factory = ai_registry.GetRegistryItem(ainame.c_str());
 
         if (!ai_factory && creature->IsGuard())
             ai_factory = ai_registry.GetRegistryItem("GuardAI");
@@ -64,14 +70,14 @@ namespace FactorySelector
         {
             int best_val = PERMIT_BASE_NO;
             typedef CreatureAIRegistry::RegistryMapType RMT;
-            RMT const &l = ai_registry.GetRegisteredItems();
-            for( RMT::const_iterator iter = l.begin(); iter != l.end(); ++iter)
+            RMT const& l = ai_registry.GetRegisteredItems();
+            for (RMT::const_iterator iter = l.begin(); iter != l.end(); ++iter)
             {
-                const CreatureAICreator *factory = iter->second;
-                const SelectableAI *p = dynamic_cast<const SelectableAI *>(factory);
-                MANGOS_ASSERT( p != NULL );
+                const CreatureAICreator* factory = iter->second;
+                const SelectableAI* p = dynamic_cast<const SelectableAI*>(factory);
+                MANGOS_ASSERT(p != NULL);
                 int val = p->Permit(creature);
-                if( val > best_val )
+                if (val > best_val)
                 {
                     best_val = val;
                     ai_factory = p;
@@ -82,16 +88,16 @@ namespace FactorySelector
         // select NullCreatureAI if not another cases
         ainame = (ai_factory == NULL) ? "NullCreatureAI" : ai_factory->key();
 
-        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Creature %u used AI is %s.", creature->GetGUIDLow(), ainame.c_str() );
-        return ( ai_factory == NULL ? new NullCreatureAI(creature) : ai_factory->Create(creature) );
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Creature %u used AI is %s.", creature->GetGUIDLow(), ainame.c_str());
+        return (ai_factory == NULL ? new NullCreatureAI(creature) : ai_factory->Create(creature));
     }
 
-    MovementGenerator* selectMovementGenerator(Creature *creature)
+    MovementGenerator* selectMovementGenerator(Creature* creature)
     {
-        MovementGeneratorRegistry &mv_registry(MovementGeneratorRepository::Instance());
-        MANGOS_ASSERT( creature->GetCreatureInfo() != NULL );
-        MovementGeneratorCreator const * mv_factory = mv_registry.GetRegistryItem(
-            creature->GetOwnerGuid().IsPlayer() ? FOLLOW_MOTION_TYPE : creature->GetDefaultMovementType());
+        MovementGeneratorRegistry& mv_registry(MovementGeneratorRepository::Instance());
+        MANGOS_ASSERT(creature->GetCreatureInfo() != NULL);
+        MovementGeneratorCreator const* mv_factory = mv_registry.GetRegistryItem(
+                    creature->GetOwnerGuid().IsPlayer() ? FOLLOW_MOTION_TYPE : creature->GetDefaultMovementType());
 
         /* if( mv_factory == NULL  )
         {
@@ -112,7 +118,7 @@ namespace FactorySelector
             }
         }*/
 
-        return ( mv_factory == NULL ? NULL : mv_factory->Create(creature) );
+        return (mv_factory == NULL ? NULL : mv_factory->Create(creature));
 
     }
 }
diff --git a/src/game/CreatureAISelector.h b/src/game/CreatureAISelector.h
index e8068559281..077902e0437 100644
--- a/src/game/CreatureAISelector.h
+++ b/src/game/CreatureAISelector.h
@@ -25,7 +25,7 @@ class MovementGenerator;
 
 namespace FactorySelector
 {
-    CreatureAI* selectAI(Creature *);
-    MovementGenerator* selectMovementGenerator(Creature *);
+    CreatureAI* selectAI(Creature*);
+    MovementGenerator* selectMovementGenerator(Creature*);
 }
 #endif
diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp
index c08d5edbc36..78243441823 100644
--- a/src/game/CreatureEventAI.cpp
+++ b/src/game/CreatureEventAI.cpp
@@ -31,7 +31,7 @@
 #include "Chat.h"
 #include "Language.h"
 
-bool CreatureEventAIHolder::UpdateRepeatTimer( Creature* creature, uint32 repeatMin, uint32 repeatMax )
+bool CreatureEventAIHolder::UpdateRepeatTimer(Creature* creature, uint32 repeatMin, uint32 repeatMax)
 {
     if (repeatMin == repeatMax)
         Time = repeatMin;
@@ -39,7 +39,7 @@ bool CreatureEventAIHolder::UpdateRepeatTimer( Creature* creature, uint32 repeat
         Time = urand(repeatMin, repeatMax);
     else
     {
-        sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", creature->GetEntry(), Event.event_id, Event.event_type);
+        sLog.outErrorEventAI("Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", creature->GetEntry(), Event.event_id, Event.event_type);
         Enabled = false;
         return false;
     }
@@ -47,9 +47,9 @@ bool CreatureEventAIHolder::UpdateRepeatTimer( Creature* creature, uint32 repeat
     return true;
 }
 
-int CreatureEventAI::Permissible(const Creature *creature)
+int CreatureEventAI::Permissible(const Creature* creature)
 {
-    if( creature->GetAIName() == "EventAI" )
+    if (creature->GetAIName() == "EventAI")
         return PERMIT_BASE_SPECIAL;
     return PERMIT_BASE_NO;
 }
@@ -57,123 +57,177 @@ int CreatureEventAI::Permissible(const Creature *creature)
 void CreatureEventAI::GetAIInformation(ChatHandler& reader)
 {
     reader.PSendSysMessage(LANG_NPC_EVENTAI_PHASE, (uint32)m_Phase);
-    reader.PSendSysMessage(LANG_NPC_EVENTAI_MOVE, reader.GetOnOffStr(m_CombatMovementEnabled));
+    reader.PSendSysMessage(LANG_NPC_EVENTAI_MOVE, reader.GetOnOffStr(m_isCombatMovement));
     reader.PSendSysMessage(LANG_NPC_EVENTAI_COMBAT, reader.GetOnOffStr(m_MeleeEnabled));
+
+    if (sLog.HasLogFilter(LOG_FILTER_EVENT_AI_DEV))         // Give some more details if in EventAI Dev Mode
+        return;
+
+    reader.PSendSysMessage("Current events of this creature:");
+    for (CreatureEventAIList::const_iterator itr = m_CreatureEventAIList.begin(); itr != m_CreatureEventAIList.end(); ++itr)
+    {
+        if (itr->Event.action[2].type != ACTION_T_NONE)
+            reader.PSendSysMessage("%u Type%3u (%s) Timer(%3us) actions[type(param1)]: %2u(%5u)  --  %2u(%u)  --  %2u(%5u)", itr->Event.event_id, itr->Event.event_type, itr->Enabled ? "On" : "Off", itr->Time/1000, itr->Event.action[0].type, itr->Event.action[0].raw.param1, itr->Event.action[1].type, itr->Event.action[1].raw.param1, itr->Event.action[2].type, itr->Event.action[2].raw.param1);
+        else if (itr->Event.action[1].type != ACTION_T_NONE)
+            reader.PSendSysMessage("%u Type%3u (%s) Timer(%3us) actions[type(param1)]: %2u(%5u)  --  %2u(%5u)", itr->Event.event_id, itr->Event.event_type, itr->Enabled ? "On" : "Off", itr->Time/1000, itr->Event.action[0].type, itr->Event.action[0].raw.param1, itr->Event.action[1].type, itr->Event.action[1].raw.param1);
+        else
+            reader.PSendSysMessage("%u Type%3u (%s) Timer(%3us) action[type(param1)]:  %2u(%5u)", itr->Event.event_id, itr->Event.event_type, itr->Enabled ? "On" : "Off", itr->Time/1000, itr->Event.action[0].type, itr->Event.action[0].raw.param1);
+    }
+}
+
+// For Non Dungeon map only allow non-difficulty flags or EFLAG_DIFFICULTY_0 mode
+inline bool IsEventFlagsFitForNormalMap(uint8 eFlags)
+{
+    return !(eFlags & (EFLAG_DIFFICULTY_0 | EFLAG_DIFFICULTY_1 | EFLAG_DIFFICULTY_2 | EFLAG_DIFFICULTY_3)) ||
+            (eFlags & EFLAG_DIFFICULTY_0);
 }
 
-CreatureEventAI::CreatureEventAI(Creature *c ) : CreatureAI(c)
+CreatureEventAI::CreatureEventAI(Creature* c) : CreatureAI(c),
+    m_EventUpdateTime(EVENT_UPDATE_TIME),
+    m_Phase(0),
+    m_MeleeEnabled(true),
+    m_InvinceabilityHpLevel(0),
+    m_throwAIEventMask(0),
+    m_throwAIEventStep(0)
 {
     // Need make copy for filter unneeded steps and safe in case table reload
     CreatureEventAI_Event_Map::const_iterator creatureEventsItr = sEventAIMgr.GetCreatureEventAIMap().find(m_creature->GetEntry());
     if (creatureEventsItr != sEventAIMgr.GetCreatureEventAIMap().end())
     {
         uint32 events_count = 0;
-        for (CreatureEventAI_Event_Vec::const_iterator i = (*creatureEventsItr).second.begin(); i != (*creatureEventsItr).second.end(); ++i)
+        for (CreatureEventAI_Event_Vec::const_iterator i = creatureEventsItr->second.begin(); i != creatureEventsItr->second.end(); ++i)
         {
-            //Debug check
-            #ifndef MANGOS_DEBUG
-            if ((*i).event_flags & EFLAG_DEBUG_ONLY)
+            // Debug check
+#ifndef MANGOS_DEBUG
+            if (i->event_flags & EFLAG_DEBUG_ONLY)
                 continue;
-            #endif
+#endif
             if (m_creature->GetMap()->IsDungeon())
             {
-                if ((1 << (m_creature->GetMap()->GetSpawnMode()+1)) & (*i).event_flags)
+                if ((1 << (m_creature->GetMap()->GetSpawnMode() + 1)) & i->event_flags)
                 {
                     ++events_count;
                 }
             }
-            else
+            else if (IsEventFlagsFitForNormalMap(i->event_flags))
                 ++events_count;
         }
-        //EventMap had events but they were not added because they must be for instance
+        // EventMap had events but they were not added because they must be for instance
         if (events_count == 0)
-            sLog.outError("CreatureEventAI: Creature %u has events but no events added to list because of instance flags.", m_creature->GetEntry());
+            sLog.outErrorEventAI("Creature %u has events but no events added to list because of instance flags (spawned in map %u, difficulty %u).", m_creature->GetEntry(), m_creature->GetMapId(), m_creature->GetMap()->GetDifficulty());
         else
         {
             m_CreatureEventAIList.reserve(events_count);
-            for (CreatureEventAI_Event_Vec::const_iterator i = (*creatureEventsItr).second.begin(); i != (*creatureEventsItr).second.end(); ++i)
+            for (CreatureEventAI_Event_Vec::const_iterator i = creatureEventsItr->second.begin(); i != creatureEventsItr->second.end(); ++i)
             {
 
-                //Debug check
-                #ifndef MANGOS_DEBUG
-                if ((*i).event_flags & EFLAG_DEBUG_ONLY)
+                // Debug check
+#ifndef MANGOS_DEBUG
+                if (i->event_flags & EFLAG_DEBUG_ONLY)
                     continue;
-                #endif
+#endif
                 if (m_creature->GetMap()->IsDungeon())
                 {
-                    if ((1 << (m_creature->GetMap()->GetSpawnMode()+1)) & (*i).event_flags)
+                    if ((1 << (m_creature->GetMap()->GetSpawnMode() + 1)) & i->event_flags)
                     {
-                        //event flagged for instance mode
+                        // event flagged for instance mode
                         m_CreatureEventAIList.push_back(CreatureEventAIHolder(*i));
                     }
                 }
-                else
+                else if (IsEventFlagsFitForNormalMap(i->event_flags))
                     m_CreatureEventAIList.push_back(CreatureEventAIHolder(*i));
             }
         }
     }
     else
-        sLog.outError("CreatureEventAI: EventMap for Creature %u is empty but creature is using CreatureEventAI.", m_creature->GetEntry());
+        sLog.outErrorEventAI("EventMap for Creature %u is empty but creature is using CreatureEventAI.", m_creature->GetEntry());
 
-    m_bEmptyList = m_CreatureEventAIList.empty();
-    m_Phase = 0;
-    m_CombatMovementEnabled = true;
-    m_MeleeEnabled = true;
-    m_AttackDistance = 0.0f;
-    m_AttackAngle = 0.0f;
+    // Handle Spawned Events, also calls Reset()
+    JustRespawned();
+}
 
-    m_InvinceabilityHpLevel = 0;
+#define LOG_PROCESS_EVENT                                                                                                       \
+    DEBUG_FILTER_LOG(LOG_FILTER_EVENT_AI_DEV, "CreatureEventAI: Event type %u (script %u) triggered for %s (invoked by %s)",    \
+                     pHolder.Event.event_type, pHolder.Event.event_id, m_creature->GetGuidStr().c_str(), pActionInvoker ? pActionInvoker->GetGuidStr().c_str() : "<no invoker>")
 
-    //Handle Spawned Events
-    if (!m_bEmptyList)
+inline bool IsTimerBasedEvent(EventAI_Type type)
+{
+    switch (type)
     {
-        for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
-            if (SpawnedEventConditionsCheck((*i).Event))
-                ProcessEvent(*i);
+        case EVENT_T_TIMER_IN_COMBAT:
+        case EVENT_T_TIMER_OOC:
+        case EVENT_T_TIMER_GENERIC:
+        case EVENT_T_MANA:
+        case EVENT_T_HP:
+        case EVENT_T_TARGET_HP:
+        case EVENT_T_TARGET_CASTING:
+        case EVENT_T_FRIENDLY_HP:
+        case EVENT_T_AURA:
+        case EVENT_T_TARGET_AURA:
+        case EVENT_T_MISSING_AURA:
+        case EVENT_T_TARGET_MISSING_AURA:
+        case EVENT_T_RANGE:
+            return true;
+        default:
+            return false;
     }
-    Reset();
 }
 
-bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pActionInvoker)
+bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pActionInvoker, Creature* pAIEventSender /*=NULL*/)
 {
     if (!pHolder.Enabled || pHolder.Time)
         return false;
 
-    //Check the inverse phase mask (event doesn't trigger if current phase bit is set in mask)
+    // Check the inverse phase mask (event doesn't trigger if current phase bit is set in mask)
     if (pHolder.Event.event_inverse_phase_mask & (1 << m_Phase))
+    {
+        if (!IsTimerBasedEvent(pHolder.Event.event_type))
+            DEBUG_FILTER_LOG(LOG_FILTER_EVENT_AI_DEV, "CreatureEventAI: Event %u skipped because of phasemask %u. Current phase %u", pHolder.Event.event_id, pHolder.Event.event_inverse_phase_mask, m_Phase);
         return false;
+    }
+
+    if (!IsTimerBasedEvent(pHolder.Event.event_type))
+        LOG_PROCESS_EVENT;
 
     CreatureEventAI_Event const& event = pHolder.Event;
 
-    //Check event conditions based on the event type, also reset events
+    // Check event conditions based on the event type, also reset events
     switch (event.event_type)
     {
-        case EVENT_T_TIMER:
+        case EVENT_T_TIMER_IN_COMBAT:
             if (!m_creature->isInCombat())
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.timer.repeatMin,event.timer.repeatMax);
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.timer.repeatMin, event.timer.repeatMax);
             break;
         case EVENT_T_TIMER_OOC:
             if (m_creature->isInCombat() || m_creature->IsInEvadeMode())
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.timer.repeatMin,event.timer.repeatMax);
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.timer.repeatMin, event.timer.repeatMax);
+            break;
+        case EVENT_T_TIMER_GENERIC:
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.timer.repeatMin, event.timer.repeatMax);
             break;
         case EVENT_T_HP:
         {
             if (!m_creature->isInCombat() || !m_creature->GetMaxHealth())
                 return false;
 
-            uint32 perc = (m_creature->GetHealth()*100) / m_creature->GetMaxHealth();
+            uint32 perc = (m_creature->GetHealth() * 100) / m_creature->GetMaxHealth();
 
             if (perc > event.percent_range.percentMax || perc < event.percent_range.percentMin)
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.percent_range.repeatMin,event.percent_range.repeatMax);
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.percent_range.repeatMin, event.percent_range.repeatMax);
             break;
         }
         case EVENT_T_MANA:
@@ -181,61 +235,74 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
             if (!m_creature->isInCombat() || !m_creature->GetMaxPower(POWER_MANA))
                 return false;
 
-            uint32 perc = (m_creature->GetPower(POWER_MANA)*100) / m_creature->GetMaxPower(POWER_MANA);
+            uint32 perc = (m_creature->GetPower(POWER_MANA) * 100) / m_creature->GetMaxPower(POWER_MANA);
 
             if (perc > event.percent_range.percentMax || perc < event.percent_range.percentMin)
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.percent_range.repeatMin,event.percent_range.repeatMax);
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.percent_range.repeatMin, event.percent_range.repeatMax);
             break;
         }
         case EVENT_T_AGGRO:
             break;
         case EVENT_T_KILL:
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.kill.repeatMin,event.kill.repeatMax);
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.kill.repeatMin, event.kill.repeatMax);
             break;
         case EVENT_T_DEATH:
         case EVENT_T_EVADE:
             break;
         case EVENT_T_SPELLHIT:
-            //Spell hit is special case, param1 and param2 handled within CreatureEventAI::SpellHit
+            // Spell hit is special case, param1 and param2 handled within CreatureEventAI::SpellHit
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.spell_hit.repeatMin,event.spell_hit.repeatMax);
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.spell_hit.repeatMin, event.spell_hit.repeatMax);
             break;
         case EVENT_T_RANGE:
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.range.repeatMin,event.range.repeatMax);
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.range.repeatMin, event.range.repeatMax);
             break;
         case EVENT_T_OOC_LOS:
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.ooc_los.repeatMin,event.ooc_los.repeatMax);
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.ooc_los.repeatMin, event.ooc_los.repeatMax);
             break;
         case EVENT_T_SPAWNED:
             break;
         case EVENT_T_TARGET_HP:
         {
-            if (!m_creature->isInCombat() || !m_creature->getVictim() || !m_creature->getVictim()->GetMaxHealth())
+            if (!m_creature->isInCombat())
+                return false;
+
+            Unit* pVictim = m_creature->getVictim();
+            if (!pVictim || !pVictim->GetMaxHealth())
                 return false;
 
-            uint32 perc = (m_creature->getVictim()->GetHealth()*100) / m_creature->getVictim()->GetMaxHealth();
+            uint32 perc = (pVictim->GetHealth() * 100) / pVictim->GetMaxHealth();
 
             if (perc > event.percent_range.percentMax || perc < event.percent_range.percentMin)
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.percent_range.repeatMin,event.percent_range.repeatMax);
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.percent_range.repeatMin, event.percent_range.repeatMax);
             break;
         }
         case EVENT_T_TARGET_CASTING:
-            if (!m_creature->isInCombat() || !m_creature->getVictim() || !m_creature->getVictim()->IsNonMeleeSpellCasted(false, false, true))
+        {
+            if (!m_creature->isInCombat())
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.target_casting.repeatMin,event.target_casting.repeatMax);
+            Unit* pVictim = m_creature->getVictim();
+            if (!pVictim || !pVictim->IsNonMeleeSpellCasted(false, false, true))
+                return false;
+
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.target_casting.repeatMin, event.target_casting.repeatMax);
             break;
+        }
         case EVENT_T_FRIENDLY_HP:
         {
             if (!m_creature->isInCombat())
@@ -247,8 +314,9 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
 
             pActionInvoker = pUnit;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.friendly_hp.repeatMin,event.friendly_hp.repeatMax);
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.friendly_hp.repeatMin, event.friendly_hp.repeatMax);
             break;
         }
         case EVENT_T_FRIENDLY_IS_CC:
@@ -259,15 +327,15 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
             std::list<Creature*> pList;
             DoFindFriendlyCC(pList, (float)event.friendly_is_cc.radius);
 
-            //List is empty
+            // List is empty
             if (pList.empty())
                 return false;
 
-            //We don't really care about the whole list, just return first available
+            // We don't really care about the whole list, just return first available
             pActionInvoker = *(pList.begin());
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.friendly_is_cc.repeatMin,event.friendly_is_cc.repeatMax);
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.friendly_is_cc.repeatMin, event.friendly_is_cc.repeatMax);
             break;
         }
         case EVENT_T_FRIENDLY_MISSING_BUFF:
@@ -275,45 +343,49 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
             std::list<Creature*> pList;
             DoFindFriendlyMissingBuff(pList, (float)event.friendly_buff.radius, event.friendly_buff.spellId);
 
-            //List is empty
+            // List is empty
             if (pList.empty())
                 return false;
 
-            //We don't really care about the whole list, just return first available
+            // We don't really care about the whole list, just return first available
             pActionInvoker = *(pList.begin());
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.friendly_buff.repeatMin,event.friendly_buff.repeatMax);
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.friendly_buff.repeatMin, event.friendly_buff.repeatMax);
             break;
         }
         case EVENT_T_SUMMONED_UNIT:
         case EVENT_T_SUMMONED_JUST_DIED:
         case EVENT_T_SUMMONED_JUST_DESPAWN:
         {
-            //Prevent event from occuring on no unit or non creatures
-            if (!pActionInvoker || pActionInvoker->GetTypeId()!=TYPEID_UNIT)
+            // Prevent event from occuring on no unit or non creatures
+            if (!pActionInvoker || pActionInvoker->GetTypeId() != TYPEID_UNIT)
                 return false;
 
-            //Creature id doesn't match up
+            // Creature id doesn't match up
             if (((Creature*)pActionInvoker)->GetEntry() != event.summoned.creatureId)
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.summoned.repeatMin,event.summoned.repeatMax);
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.summoned.repeatMin, event.summoned.repeatMax);
             break;
         }
         case EVENT_T_TARGET_MANA:
         {
-            if (!m_creature->isInCombat() || !m_creature->getVictim() || !m_creature->getVictim()->GetMaxPower(POWER_MANA))
+            if (!m_creature->isInCombat())
                 return false;
 
-            uint32 perc = (m_creature->getVictim()->GetPower(POWER_MANA)*100) / m_creature->getVictim()->GetMaxPower(POWER_MANA);
+            Unit* pVictim = m_creature->getVictim();
+            if (!pVictim || !pVictim->GetMaxPower(POWER_MANA))
+                return false;
+
+            uint32 perc = (pVictim->GetPower(POWER_MANA) * 100) / pVictim->GetMaxPower(POWER_MANA);
 
             if (perc > event.percent_range.percentMax || perc < event.percent_range.percentMin)
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.percent_range.repeatMin,event.percent_range.repeatMax);
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.percent_range.repeatMin, event.percent_range.repeatMax);
             break;
         }
         case EVENT_T_REACHED_HOME:
@@ -321,85 +393,104 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
             break;
         case EVENT_T_AURA:
         {
-            SpellAuraHolder* holder = m_creature->GetSpellAuraHolder(event.buffed.spellId);
+            SpellAuraHolderPtr holder = m_creature->GetSpellAuraHolder(event.buffed.spellId);
             if (!holder || holder->GetStackAmount() < event.buffed.amount)
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.buffed.repeatMin,event.buffed.repeatMax);
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.buffed.repeatMin, event.buffed.repeatMax);
             break;
         }
         case EVENT_T_TARGET_AURA:
         {
-            if (!m_creature->isInCombat() || !m_creature->getVictim())
+            if (!m_creature->isInCombat())
+                return false;
+
+            Unit* pVictim = m_creature->getVictim();
+            if (!pVictim)
                 return false;
 
-            SpellAuraHolder* holder = m_creature->getVictim()->GetSpellAuraHolder(event.buffed.spellId);
-            if(!holder || holder->GetStackAmount() < event.buffed.amount)
+            SpellAuraHolderPtr holder = pVictim->GetSpellAuraHolder(event.buffed.spellId);
+            if (!holder || holder->GetStackAmount() < event.buffed.amount)
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.buffed.repeatMin,event.buffed.repeatMax);
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.buffed.repeatMin, event.buffed.repeatMax);
             break;
         }
         case EVENT_T_MISSING_AURA:
         {
-            SpellAuraHolder* holder = m_creature->GetSpellAuraHolder(event.buffed.spellId);
+            SpellAuraHolderPtr holder = m_creature->GetSpellAuraHolder(event.buffed.spellId);
             if (holder && holder->GetStackAmount() >= event.buffed.amount)
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.buffed.repeatMin,event.buffed.repeatMax);
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.buffed.repeatMin, event.buffed.repeatMax);
             break;
         }
         case EVENT_T_TARGET_MISSING_AURA:
         {
-            if (!m_creature->isInCombat() || !m_creature->getVictim())
+            if (!m_creature->isInCombat())
+                return false;
+
+            Unit* pVictim = m_creature->getVictim();
+            if (!pVictim)
                 return false;
 
-            SpellAuraHolder* holder = m_creature->getVictim()->GetSpellAuraHolder(event.buffed.spellId);
+            SpellAuraHolderPtr holder = pVictim->GetSpellAuraHolder(event.buffed.spellId);
             if (holder && holder->GetStackAmount() >= event.buffed.amount)
                 return false;
 
-            //Repeat Timers
-            pHolder.UpdateRepeatTimer(m_creature,event.buffed.repeatMin,event.buffed.repeatMax);
+            LOG_PROCESS_EVENT;
+            // Repeat Timers
+            pHolder.UpdateRepeatTimer(m_creature, event.buffed.repeatMin, event.buffed.repeatMax);
             break;
         }
+        case EVENT_T_RECEIVE_AI_EVENT:
+            break;
         default:
-            sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u has invalid Event Type(%u), missing from ProcessEvent() Switch.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
+            sLog.outErrorEventAI("Creature %u using Event %u has invalid Event Type(%u), missing from ProcessEvent() Switch.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
             break;
     }
 
-    //Disable non-repeatable events
+    // Disable non-repeatable events
     if (!(pHolder.Event.event_flags & EFLAG_REPEATABLE))
         pHolder.Enabled = false;
 
-    //Store random here so that all random actions match up
+    // Store random here so that all random actions match up
     uint32 rnd = rand();
 
-    //Return if chance for event is not met
+    // Return if chance for event is not met
     if (pHolder.Event.event_chance <= rnd % 100)
         return false;
 
-    //Process actions, normal case
+    // Process actions, normal case
     if (!(pHolder.Event.event_flags & EFLAG_RANDOM_ACTION))
     {
         for (uint32 j = 0; j < MAX_ACTIONS; ++j)
-            ProcessAction(pHolder.Event.action[j], rnd, pHolder.Event.event_id, pActionInvoker);
+        {
+            if (pHolder.Event.action[j].type != ACTION_T_NONE)
+                ProcessAction(pHolder.Event.action[j], rnd, pHolder.Event.event_id, pActionInvoker, pAIEventSender);
+        }
     }
-    //Process actions, random case
+    // Process actions, random case
     else
     {
         // amount of real actions
         uint32 count = 0;
-        for (uint32 j = 0; j < MAX_ACTIONS; j++)
+        for (uint32 j = 0; j < MAX_ACTIONS; ++j)
+        {
             if (pHolder.Event.action[j].type != ACTION_T_NONE)
                 ++count;
+        }
 
         if (count)
         {
             // select action number from found amount
-            uint32 idx = urand(0,count-1);
+            uint32 idx = urand(0, count - 1);
 
             // find selected action, skipping not used
             uint32 j = 0;
@@ -413,31 +504,50 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
                 }
             }
 
-            ProcessAction(pHolder.Event.action[j], rnd, pHolder.Event.event_id, pActionInvoker);
+            ProcessAction(pHolder.Event.action[j], rnd, pHolder.Event.event_id, pActionInvoker, pAIEventSender);
         }
     }
     return true;
 }
 
-void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 rnd, uint32 EventId, Unit* pActionInvoker)
+void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 rnd, uint32 EventId, Unit* pActionInvoker, Creature* pAIEventSender)
 {
+    if (action.type == ACTION_T_NONE)
+        return;
+
+    DEBUG_FILTER_LOG(LOG_FILTER_EVENT_AI_DEV, "CreatureEventAI: Process action %u (script %u) triggered for %s (invoked by %s)",
+                     action.type, EventId, m_creature->GetGuidStr().c_str(), pActionInvoker ? pActionInvoker->GetGuidStr().c_str() : "<no invoker>");
+
+    bool reportTargetError = false;
     switch (action.type)
     {
         case ACTION_T_TEXT:
+        case ACTION_T_CHANCED_TEXT:
         {
             if (!action.text.TextId[0])
                 return;
 
-            int32 temp = 0;
+            int32 textId = 0;
 
-            if (action.text.TextId[1] && action.text.TextId[2])
-                temp = action.text.TextId[rand()%3];
-            else if (action.text.TextId[1] && urand(0,1))
-                temp = action.text.TextId[1];
-            else
-                temp = action.text.TextId[0];
+            if (action.type == ACTION_T_TEXT)
+            {
+                if (action.text.TextId[1] && action.text.TextId[2])
+                    textId = action.text.TextId[urand(0, 2)];
+                else if (action.text.TextId[1] && urand(0, 1))
+                    textId = action.text.TextId[1];
+                else
+                    textId = action.text.TextId[0];
+            }
+            // ACTION_T_CHANCED_TEXT, chance hits
+            else if (urand(0, 99) < action.chanced_text.chance)
+            {
+                if (action.chanced_text.TextId[0] && action.chanced_text.TextId[1])
+                    textId = action.chanced_text.TextId[urand(0, 1)];
+                else
+                    textId = action.chanced_text.TextId[0];
+            }
 
-            if (temp)
+            if (textId)
             {
                 Unit* target = NULL;
 
@@ -459,7 +569,8 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                                 target = owner;
                 }
 
-                DoScriptText(temp, m_creature, target);
+                if (!DoDisplayText(m_creature, textId, target))
+                    sLog.outErrorEventAI("Error attempting to display text %i, used by script %u", textId, EventId);
             }
             break;
         }
@@ -476,7 +587,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         {
             if (action.morph.creatureId || action.morph.modelId)
             {
-                //set model based on entry from creature_template
+                // set model based on entry from creature_template
                 if (action.morph.creatureId)
                 {
                     if (CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(action.morph.creatureId))
@@ -485,7 +596,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                         m_creature->SetDisplayId(display_id);
                     }
                 }
-                //if no param1, then use value from param2 (modelId)
+                // if no param1, then use value from param2 (modelId)
                 else
                     m_creature->SetDisplayId(action.morph.modelId);
             }
@@ -515,17 +626,25 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         }
         case ACTION_T_CAST:
         {
-            Unit* target = GetTargetByType(action.cast.target, pActionInvoker);
+            uint32 selectFlags = 0;
+            uint32 spellId = 0;
+            if (!(action.cast.castFlags & (CAST_TRIGGERED | CAST_FORCE_CAST | CAST_FORCE_TARGET_SELF)))
+            {
+                spellId = action.cast.spellId;
+                selectFlags = SELECT_FLAG_IN_LOS;
+            }
 
+            Unit* target = GetTargetByType(action.cast.target, pActionInvoker, pAIEventSender, reportTargetError, spellId, selectFlags);
             if (!target)
             {
-                sLog.outDebug("CreatureEventAI: NULL target for ACTION_T_CAST creature entry %u casting spell id %u", m_creature->GetEntry(), action.cast.spellId);
+                if (reportTargetError)
+                    sLog.outErrorEventAI("NULL target for ACTION_T_CAST creature entry %u casting spell id %u", m_creature->GetEntry(), action.cast.spellId);
                 return;
             }
 
             CanCastResult castResult = DoCastSpellIfCan(target, action.cast.spellId, action.cast.castFlags);
 
-            switch(castResult)
+            switch (castResult)
             {
                 case CAST_FAIL_POWER:
                 case CAST_FAIL_TOO_FAR:
@@ -533,15 +652,15 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                     // Melee current victim if flag not set
                     if (!(action.cast.castFlags & CAST_NO_MELEE_IF_OOM))
                     {
-                        switch(m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType())
+                        switch (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType())
                         {
                             case CHASE_MOTION_TYPE:
                             case FOLLOW_MOTION_TYPE:
-                                m_AttackDistance = 0.0f;
-                                m_AttackAngle = 0.0f;
+                                m_attackDistance = 0.0f;
+                                m_attackAngle = 0.0f;
 
                                 m_creature->GetMotionMaster()->Clear(false);
-                                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), m_AttackDistance, m_AttackAngle);
+                                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), m_attackDistance, m_attackAngle);
                                 break;
                             default:
                                 break;
@@ -557,46 +676,58 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         }
         case ACTION_T_SUMMON:
         {
-            Unit* target = GetTargetByType(action.summon.target, pActionInvoker);
+            Unit* target = GetTargetByType(action.summon.target, pActionInvoker, pAIEventSender, reportTargetError);
+            if (!target && reportTargetError)
+                sLog.outErrorEventAI("Event %u - NULL target for ACTION_T_SUMMON(%u), target-type %u", EventId, action.type, action.summon.target);
 
             Creature* pCreature = NULL;
 
             if (action.summon.duration)
-                pCreature = m_creature->SummonCreature(action.summon.creatureId, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, action.summon.duration);
+                pCreature = m_creature->SummonCreature(action.summon.creatureId, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, action.summon.duration);
             else
-                pCreature = m_creature->SummonCreature(action.summon.creatureId, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0);
+                pCreature = m_creature->SummonCreature(action.summon.creatureId, TEMPSUMMON_TIMED_OOC_DESPAWN, 0);
 
             if (!pCreature)
-                sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. Spawn event %d is on creature %d", action.summon.creatureId, EventId, m_creature->GetEntry());
+                sLog.outErrorEventAI("failed to spawn creature %u. Spawn event %d is on creature %d", action.summon.creatureId, EventId, m_creature->GetEntry());
             else if (action.summon.target != TARGET_T_SELF && target)
                 pCreature->AI()->AttackStart(target);
             break;
         }
         case ACTION_T_THREAT_SINGLE_PCT:
-            if (Unit* target = GetTargetByType(action.threat_single_pct.target, pActionInvoker))
+            if (Unit* target = GetTargetByType(action.threat_single_pct.target, pActionInvoker, pAIEventSender, reportTargetError))
                 m_creature->getThreatManager().modifyThreatPercent(target, action.threat_single_pct.percent);
+            else if (reportTargetError)
+                sLog.outErrorEventAI("Event %u - NULL target for ACTION_T_THREAT_SINGLE_PCT(%u), target-type %u", EventId, action.type, action.threat_single_pct.target);
             break;
         case ACTION_T_THREAT_ALL_PCT:
         {
             ThreatList const& threatList = m_creature->getThreatManager().getThreatList();
             for (ThreatList::const_iterator i = threatList.begin(); i != threatList.end(); ++i)
-                if(Unit* Temp = m_creature->GetMap()->GetUnit((*i)->getUnitGuid()))
+                if (Unit* Temp = m_creature->GetMap()->GetUnit((*i)->getUnitGuid()))
                     m_creature->getThreatManager().modifyThreatPercent(Temp, action.threat_all_pct.percent);
             break;
         }
         case ACTION_T_QUEST_EVENT:
-            if (Unit* target = GetTargetByType(action.quest_event.target, pActionInvoker))
+            if (Unit* target = GetTargetByType(action.quest_event.target, pActionInvoker, pAIEventSender, reportTargetError))
+            {
                 if (target->GetTypeId() == TYPEID_PLAYER)
                     ((Player*)target)->AreaExploredOrEventHappens(action.quest_event.questId);
+            }
+            else if (reportTargetError)
+                sLog.outErrorEventAI("Event %u - NULL target for ACTION_T_QUEST_EVENT(%u), target-type %u", EventId, action.type, action.quest_event.target);
             break;
         case ACTION_T_CAST_EVENT:
-            if (Unit* target = GetTargetByType(action.cast_event.target, pActionInvoker))
+            if (Unit* target = GetTargetByType(action.cast_event.target, pActionInvoker, pAIEventSender, reportTargetError, 0, SELECT_FLAG_PLAYER))
+            {
                 if (target->GetTypeId() == TYPEID_PLAYER)
                     ((Player*)target)->CastedCreatureOrGO(action.cast_event.creatureId, m_creature->GetObjectGuid(), action.cast_event.spellId);
+            }
+            else if (reportTargetError)
+                sLog.outErrorEventAI("Event %u - NULL target for ACTION_T_CST_EVENT(%u), target-type %u", EventId, action.type, action.cast_event.target);
             break;
         case ACTION_T_SET_UNIT_FIELD:
         {
-            Unit* target = GetTargetByType(action.set_unit_field.target, pActionInvoker);
+            Unit* target = GetTargetByType(action.set_unit_field.target, pActionInvoker, pAIEventSender, reportTargetError);
 
             // not allow modify important for integrity object fields
             if (action.set_unit_field.field < OBJECT_END || action.set_unit_field.field >= UNIT_END)
@@ -604,73 +735,62 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
 
             if (target)
                 target->SetUInt32Value(action.set_unit_field.field, action.set_unit_field.value);
+            else if (reportTargetError)
+                sLog.outErrorEventAI("Event %u - NULL target for ACTION_T_SET_UNIT_FIELD(%u), target-type %u", EventId, action.type, action.set_unit_field.target);
 
             break;
         }
         case ACTION_T_SET_UNIT_FLAG:
-            if (Unit* target = GetTargetByType(action.unit_flag.target, pActionInvoker))
+            if (Unit* target = GetTargetByType(action.unit_flag.target, pActionInvoker, pAIEventSender, reportTargetError))
                 target->SetFlag(UNIT_FIELD_FLAGS, action.unit_flag.value);
+            else if (reportTargetError)
+                sLog.outErrorEventAI("Event %u - NULL target for ACTION_T_SET_UNIT_FLAG(%u), target-type %u", EventId, action.type, action.unit_flag.target);
             break;
         case ACTION_T_REMOVE_UNIT_FLAG:
-            if (Unit* target = GetTargetByType(action.unit_flag.target, pActionInvoker))
+            if (Unit* target = GetTargetByType(action.unit_flag.target, pActionInvoker, pAIEventSender, reportTargetError))
                 target->RemoveFlag(UNIT_FIELD_FLAGS, action.unit_flag.value);
+            else if (reportTargetError)
+                sLog.outErrorEventAI("Event %u - NULL target for ACTION_T_REMOVE_UNIT_FLAG(%u), target-type %u", EventId, action.type, action.unit_flag.target);
             break;
         case ACTION_T_AUTO_ATTACK:
             m_MeleeEnabled = action.auto_attack.state != 0;
             break;
         case ACTION_T_COMBAT_MOVEMENT:
+        {
             // ignore no affect case
-            if(m_CombatMovementEnabled==(action.combat_movement.state!=0))
+            if (m_isCombatMovement == (action.combat_movement.state != 0) || m_creature->IsNonMeleeSpellCasted(false))
                 return;
 
-            m_CombatMovementEnabled = action.combat_movement.state != 0;
-
-            //Allow movement (create new targeted movement gen only if idle)
-            if (m_CombatMovementEnabled)
-            {
-                if(action.combat_movement.melee && m_creature->isInCombat())
-                    if(Unit* victim = m_creature->getVictim())
-                        m_creature->SendMeleeAttackStart(victim);
-
-                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == IDLE_MOTION_TYPE)
-                {
-                    m_creature->GetMotionMaster()->Clear(false);
-                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), m_AttackDistance, m_AttackAngle);
-                }
-            }
-            else
-            {
-                if(action.combat_movement.melee && m_creature->isInCombat())
-                    if(Unit* victim = m_creature->getVictim())
-                        m_creature->SendMeleeAttackStop(victim);
+            SetCombatMovement(action.combat_movement.state != 0, true);
 
-                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
-                {
-                    m_creature->GetMotionMaster()->Clear(false);
-                    m_creature->GetMotionMaster()->MoveIdle();
-                    m_creature->StopMoving();
-                }
-            }
+            Unit* pVictim = m_creature->getVictim();
+            if (m_isCombatMovement && action.combat_movement.melee && m_creature->isInCombat() && pVictim)
+                m_creature->SendMeleeAttackStart(pVictim);
+            else if (action.combat_movement.melee && m_creature->isInCombat() && pVictim)
+                m_creature->SendMeleeAttackStop(pVictim);
             break;
+        }
         case ACTION_T_SET_PHASE:
             m_Phase = action.set_phase.phase;
+            DEBUG_FILTER_LOG(LOG_FILTER_EVENT_AI_DEV, "CreatureEventAI: ACTION_T_SET_PHASE - script %u for %s, phase is now %u", EventId, m_creature->GetGuidStr().c_str(), m_Phase);
             break;
         case ACTION_T_INC_PHASE:
         {
-            int32 new_phase = int32(m_Phase)+action.set_inc_phase.step;
+            int32 new_phase = int32(m_Phase) + action.set_inc_phase.step;
             if (new_phase < 0)
             {
-                sLog.outErrorDb( "CreatureEventAI: Event %d decrease Phase under 0. CreatureEntry = %d", EventId, m_creature->GetEntry());
+                sLog.outErrorEventAI("Event %d decrease Phase under 0. CreatureEntry = %d", EventId, m_creature->GetEntry());
                 m_Phase = 0;
             }
             else if (new_phase >= MAX_PHASE)
             {
-                sLog.outErrorDb( "CreatureEventAI: Event %d incremented Phase above %u. Phase mask cannot be used with phases past %u. CreatureEntry = %d", EventId, MAX_PHASE-1, MAX_PHASE-1, m_creature->GetEntry());
-                m_Phase = MAX_PHASE-1;
+                sLog.outErrorEventAI("Event %d incremented Phase above %u. Phase mask cannot be used with phases past %u. CreatureEntry = %d", EventId, MAX_PHASE - 1, MAX_PHASE - 1, m_creature->GetEntry());
+                m_Phase = MAX_PHASE - 1;
             }
             else
                 m_Phase = new_phase;
 
+            DEBUG_FILTER_LOG(LOG_FILTER_EVENT_AI_DEV, "CreatureEventAI: ACTION_T_INC_PHASE - script %u for %s, phase is now %u", EventId, m_creature->GetGuidStr().c_str(), m_Phase);
             break;
         }
         case ACTION_T_EVADE:
@@ -681,77 +801,84 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
             break;
         case ACTION_T_QUEST_EVENT_ALL:
             if (pActionInvoker && pActionInvoker->GetTypeId() == TYPEID_PLAYER)
-                ((Player*)pActionInvoker)->GroupEventHappens(action.quest_event_all.questId,m_creature);
+                ((Player*)pActionInvoker)->GroupEventHappens(action.quest_event_all.questId, m_creature);
             break;
         case ACTION_T_CAST_EVENT_ALL:
         {
             ThreatList const& threatList = m_creature->getThreatManager().getThreatList();
             for (ThreatList::const_iterator i = threatList.begin(); i != threatList.end(); ++i)
                 if (Player* temp = m_creature->GetMap()->GetPlayer((*i)->getUnitGuid()))
-                        temp->CastedCreatureOrGO(action.cast_event_all.creatureId, m_creature->GetObjectGuid(), action.cast_event_all.spellId);
+                    temp->CastedCreatureOrGO(action.cast_event_all.creatureId, m_creature->GetObjectGuid(), action.cast_event_all.spellId);
             break;
         }
         case ACTION_T_REMOVEAURASFROMSPELL:
-            if (Unit* target = GetTargetByType(action.remove_aura.target, pActionInvoker))
+            if (Unit* target = GetTargetByType(action.remove_aura.target, pActionInvoker, pAIEventSender, reportTargetError))
                 target->RemoveAurasDueToSpell(action.remove_aura.spellId);
+            else if (reportTargetError)
+                sLog.outErrorEventAI("Event %u - NULL target for ACTION_T_REMOVEAURASFROMSPELL(%u), target-type %u", EventId, action.type, action.remove_aura.target);
             break;
         case ACTION_T_RANGED_MOVEMENT:
-            m_AttackDistance = (float)action.ranged_movement.distance;
-            m_AttackAngle = action.ranged_movement.angle/180.0f*M_PI_F;
+            m_attackDistance = (float)action.ranged_movement.distance;
+            m_attackAngle = action.ranged_movement.angle / 180.0f * M_PI_F;
 
-            if (m_CombatMovementEnabled)
+            if (m_isCombatMovement)
             {
                 if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
                 {
-                    //Drop current movement gen
-                    m_creature->GetMotionMaster()->Clear(false);
-                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), m_AttackDistance, m_AttackAngle);
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), m_attackDistance, m_attackAngle);
                 }
             }
             break;
         case ACTION_T_RANDOM_PHASE:
             m_Phase = GetRandActionParam(rnd, action.random_phase.phase1, action.random_phase.phase2, action.random_phase.phase3);
+            DEBUG_FILTER_LOG(LOG_FILTER_EVENT_AI_DEV, "CreatureEventAI: ACTION_T_RANDOM_PHASE - script %u for %s, phase is now %u", EventId, m_creature->GetGuidStr().c_str(), m_Phase);
             break;
         case ACTION_T_RANDOM_PHASE_RANGE:
             if (action.random_phase_range.phaseMax > action.random_phase_range.phaseMin)
                 m_Phase = action.random_phase_range.phaseMin + (rnd % (action.random_phase_range.phaseMax - action.random_phase_range.phaseMin));
             else
-                sLog.outErrorDb( "CreatureEventAI: ACTION_T_RANDOM_PHASE_RANGE cannot have Param2 <= Param1. Divide by Zero. Event = %d. CreatureEntry = %d", EventId, m_creature->GetEntry());
+                sLog.outErrorEventAI("ACTION_T_RANDOM_PHASE_RANGE cannot have Param2 <= Param1. Divide by Zero. Event = %d. CreatureEntry = %d", EventId, m_creature->GetEntry());
             break;
         case ACTION_T_SUMMON_ID:
         {
-            Unit* target = GetTargetByType(action.summon_id.target, pActionInvoker);
+            Unit* target = GetTargetByType(action.summon_id.target, pActionInvoker, pAIEventSender, reportTargetError);
+            if (!target && reportTargetError)
+                sLog.outErrorEventAI("Event %u - NULL target for ACTION_T_SUMMON_ID(%u), target-type %u", EventId, action.type, action.summon_id.target);
 
             CreatureEventAI_Summon_Map::const_iterator i = sEventAIMgr.GetCreatureEventAISummonMap().find(action.summon_id.spawnId);
             if (i == sEventAIMgr.GetCreatureEventAISummonMap().end())
             {
-                sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. Summon map index %u does not exist. EventID %d. CreatureID %d", action.summon_id.creatureId, action.summon_id.spawnId, EventId, m_creature->GetEntry());
+                sLog.outErrorEventAI("failed to spawn creature %u. Summon map index %u does not exist. EventID %d. CreatureID %d", action.summon_id.creatureId, action.summon_id.spawnId, EventId, m_creature->GetEntry());
                 return;
             }
 
             Creature* pCreature = NULL;
             if ((*i).second.SpawnTimeSecs)
-                pCreature = m_creature->SummonCreature(action.summon_id.creatureId, (*i).second.position_x, (*i).second.position_y, (*i).second.position_z, (*i).second.orientation, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, (*i).second.SpawnTimeSecs);
+                pCreature = m_creature->SummonCreature(action.summon_id.creatureId, (*i).second.position_x, (*i).second.position_y, (*i).second.position_z, (*i).second.orientation, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, (*i).second.SpawnTimeSecs);
             else
-                pCreature = m_creature->SummonCreature(action.summon_id.creatureId, (*i).second.position_x, (*i).second.position_y, (*i).second.position_z, (*i).second.orientation, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0);
+                pCreature = m_creature->SummonCreature(action.summon_id.creatureId, (*i).second.position_x, (*i).second.position_y, (*i).second.position_z, (*i).second.orientation, TEMPSUMMON_TIMED_OOC_DESPAWN, 0);
 
             if (!pCreature)
-                sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. EventId %d.Creature %d", action.summon_id.creatureId, EventId, m_creature->GetEntry());
+                sLog.outErrorEventAI("failed to spawn creature %u. EventId %d.Creature %d", action.summon_id.creatureId, EventId, m_creature->GetEntry());
             else if (action.summon_id.target != TARGET_T_SELF && target)
                 pCreature->AI()->AttackStart(target);
 
             break;
         }
         case ACTION_T_KILLED_MONSTER:
-            //first attempt player/group who tapped creature
+            // first attempt player/group who tapped creature
             if (Player* pPlayer = m_creature->GetLootRecipient())
                 pPlayer->RewardPlayerAndGroupAtEvent(action.killed_monster.creatureId, m_creature);
             else
             {
-                //if not available, use pActionInvoker
-                if (Unit* pTarget = GetTargetByType(action.killed_monster.target, pActionInvoker))
+                // if not available, use pActionInvoker
+                if (Unit* pTarget = GetTargetByType(action.killed_monster.target, pActionInvoker, pAIEventSender, reportTargetError, 0, SELECT_FLAG_PLAYER))
+                {
                     if (Player* pPlayer2 = pTarget->GetCharmerOrOwnerPlayerOrPlayerItself())
                         pPlayer2->RewardPlayerAndGroupAtEvent(action.killed_monster.creatureId, m_creature);
+                }
+                else if (reportTargetError)
+                    sLog.outErrorEventAI("Event %u - NULL target for ACTION_T_KILLED_MONSTER(%u), target-type %u", EventId, action.type, action.killed_monster.target);
             }
             break;
         case ACTION_T_SET_INST_DATA:
@@ -759,7 +886,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
             InstanceData* pInst = m_creature->GetInstanceData();
             if (!pInst)
             {
-                sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data without instance script. Creature %d", EventId, m_creature->GetEntry());
+                sLog.outErrorEventAI("Event %d attempt to set instance data without instance script. Creature %d", EventId, m_creature->GetEntry());
                 return;
             }
 
@@ -768,17 +895,18 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         }
         case ACTION_T_SET_INST_DATA64:
         {
-            Unit* target = GetTargetByType(action.set_inst_data64.target, pActionInvoker);
+            Unit* target = GetTargetByType(action.set_inst_data64.target, pActionInvoker, pAIEventSender, reportTargetError);
             if (!target)
             {
-                sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data64 but Target == NULL. Creature %d", EventId, m_creature->GetEntry());
+                if (reportTargetError)
+                    sLog.outErrorEventAI("Event %d attempt to set instance data64 but Target == NULL. Creature %d", EventId, m_creature->GetEntry());
                 return;
             }
 
             InstanceData* pInst = m_creature->GetInstanceData();
             if (!pInst)
             {
-                sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data64 without instance script. Creature %d", EventId, m_creature->GetEntry());
+                sLog.outErrorEventAI("Event %d attempt to set instance data64 without instance script. Creature %d", EventId, m_creature->GetEntry());
                 return;
             }
 
@@ -788,8 +916,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         case ACTION_T_UPDATE_TEMPLATE:
             if (m_creature->GetEntry() == action.update_template.creatureId)
             {
-
-                sLog.outErrorDb("CreatureEventAI: Event %d ACTION_T_UPDATE_TEMPLATE call with param1 == current entry. Creature %d", EventId, m_creature->GetEntry());
+                sLog.outErrorEventAI("Event %d ACTION_T_UPDATE_TEMPLATE call with param1 == current entry. Creature %d", EventId, m_creature->GetEntry());
                 return;
             }
 
@@ -798,11 +925,10 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         case ACTION_T_DIE:
             if (m_creature->isDead())
             {
-
-                sLog.outErrorDb("CreatureEventAI: Event %d ACTION_T_DIE on dead creature. Creature %d", EventId, m_creature->GetEntry());
+                sLog.outErrorEventAI("Event %d ACTION_T_DIE on dead creature. Creature %d", EventId, m_creature->GetEntry());
                 return;
             }
-            m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            m_creature->KillSelf();
             break;
         case ACTION_T_ZONE_COMBAT_PULSE:
         {
@@ -821,13 +947,15 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         }
         case ACTION_T_FORCE_DESPAWN:
         {
-            m_creature->ForcedDespawn(action.forced_despawn.msDelay);
+            m_creature->ForcedDespawn(action.forced_despawn.msDelay > 500
+                ? action.forced_despawn.msDelay
+                : 500);
             break;
         }
         case ACTION_T_SET_INVINCIBILITY_HP_LEVEL:
         {
-            if(action.invincibility_hp_level.is_percent)
-                m_InvinceabilityHpLevel = m_creature->GetMaxHealth()*action.invincibility_hp_level.hp_level/100;
+            if (action.invincibility_hp_level.is_percent)
+                m_InvinceabilityHpLevel = m_creature->GetMaxHealth() * action.invincibility_hp_level.hp_level / 100;
             else
                 m_InvinceabilityHpLevel = action.invincibility_hp_level.hp_level;
             break;
@@ -845,7 +973,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                         m_creature->Mount(display_id);
                     }
                 }
-                //if no param1, then use value from param2 (modelId)
+                // if no param1, then use value from param2 (modelId)
                 else
                     m_creature->Mount(action.mount.modelId);
             }
@@ -854,61 +982,77 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
 
             break;
         }
+        case ACTION_T_THROW_AI_EVENT:
+        {
+            SendAIEventAround(AIEventType(action.throwEvent.eventType), pActionInvoker, 0, action.throwEvent.radius);
+            break;
+        }
+        case ACTION_T_SET_THROW_MASK:
+        {
+            m_throwAIEventMask = action.setThrowMask.eventTypeMask;
+            break;
+        }
+        case ACTION_T_SET_STAND_STATE:
+        {
+            m_creature->SetStandState(action.setStandState.standState);
+            break;
+        }
     }
 }
 
-void CreatureEventAI::JustRespawned()
+void CreatureEventAI::JustRespawned()                       // NOTE that this is called from the AI's constructor as well
 {
     Reset();
 
-    if (m_bEmptyList)
-        return;
-
-    //Handle Spawned Events
     for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
-        if (SpawnedEventConditionsCheck((*i).Event))
+    {
+        // Reset generic timer
+        if (i->Event.event_type == EVENT_T_TIMER_GENERIC)
+        {
+            if (i->UpdateRepeatTimer(m_creature, i->Event.timer.initialMin, i->Event.timer.initialMax))
+                i->Enabled = true;
+        }
+        // Handle Spawned Events
+        else if (SpawnedEventConditionsCheck((*i).Event))
             ProcessEvent(*i);
+    }
 }
 
 void CreatureEventAI::Reset()
 {
     m_EventUpdateTime = EVENT_UPDATE_TIME;
     m_EventDiff = 0;
+    m_MeleeEnabled = true;
+    m_throwAIEventStep = 0;
 
-    if (m_bEmptyList)
-        return;
-
-    //Reset all events to enabled
+    // Reset all events to enabled
     for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
     {
         CreatureEventAI_Event const& event = (*i).Event;
         switch (event.event_type)
         {
-            //Reset all out of combat timers
+                // Reset all out of combat timers
             case EVENT_T_TIMER_OOC:
             {
-                if ((*i).UpdateRepeatTimer(m_creature,event.timer.initialMin,event.timer.initialMax))
+                if ((*i).UpdateRepeatTimer(m_creature, event.timer.initialMin, event.timer.initialMax))
                     (*i).Enabled = true;
                 break;
             }
-            //default:
-            //TODO: enable below code line / verify this is correct to enable events previously disabled (ex. aggro yell), instead of enable this in void Aggro()
+            // default:
+            // TODO: enable below code line / verify this is correct to enable events previously disabled (ex. aggro yell), instead of enable this in void Aggro()
             //(*i).Enabled = true;
             //(*i).Time = 0;
-            //break;
+            // break;
         }
     }
 }
 
 void CreatureEventAI::JustReachedHome()
 {
-    if (!m_bEmptyList)
+    for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
     {
-        for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
-        {
-            if ((*i).Event.event_type == EVENT_T_REACHED_HOME)
-                ProcessEvent(*i);
-        }
+        if ((*i).Event.event_type == EVENT_T_REACHED_HOME)
+            ProcessEvent(*i);
     }
 
     Reset();
@@ -916,7 +1060,8 @@ void CreatureEventAI::JustReachedHome()
 
 void CreatureEventAI::EnterEvadeMode()
 {
-    m_creature->RemoveAllAuras();
+    m_creature->ExitVehicle();
+    m_creature->RemoveAllAurasOnEvade();
     m_creature->DeleteThreatList();
     m_creature->CombatStop(true);
 
@@ -925,10 +1070,7 @@ void CreatureEventAI::EnterEvadeMode()
 
     m_creature->SetLootRecipient(NULL);
 
-    if (m_bEmptyList)
-        return;
-
-    //Handle Evade events
+    // Handle Evade events
     for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
     {
         if ((*i).Event.event_type == EVENT_T_EVADE)
@@ -942,15 +1084,15 @@ void CreatureEventAI::JustDied(Unit* killer)
 
     if (m_creature->IsGuard())
     {
-        //Send Zone Under Attack message to the LocalDefense and WorldDefense Channels
+        // Send Zone Under Attack message to the LocalDefense and WorldDefense Channels
         if (Player* pKiller = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
             m_creature->SendZoneUnderAttackMessage(pKiller);
     }
 
-    if (m_bEmptyList)
-        return;
+    if (m_throwAIEventMask & (1 << AI_EVENT_JUST_DIED))
+        SendAIEventAround(AI_EVENT_JUST_DIED, killer, 0, AIEVENT_DEFAULT_THROW_RADIUS);
 
-    //Handle Evade events
+    // Handle On Death events
     for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
     {
         if ((*i).Event.event_type == EVENT_T_DEATH)
@@ -963,7 +1105,7 @@ void CreatureEventAI::JustDied(Unit* killer)
 
 void CreatureEventAI::KilledUnit(Unit* victim)
 {
-    if (m_bEmptyList || victim->GetTypeId() != TYPEID_PLAYER)
+    if (victim->GetTypeId() != TYPEID_PLAYER)
         return;
 
     for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
@@ -975,9 +1117,6 @@ void CreatureEventAI::KilledUnit(Unit* victim)
 
 void CreatureEventAI::JustSummoned(Creature* pUnit)
 {
-    if (m_bEmptyList || !pUnit)
-        return;
-
     for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
     {
         if ((*i).Event.event_type == EVENT_T_SUMMONED_UNIT)
@@ -987,9 +1126,6 @@ void CreatureEventAI::JustSummoned(Creature* pUnit)
 
 void CreatureEventAI::SummonedCreatureJustDied(Creature* pUnit)
 {
-    if (m_bEmptyList || !pUnit)
-        return;
-
     for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
     {
         if ((*i).Event.event_type == EVENT_T_SUMMONED_JUST_DIED)
@@ -999,9 +1135,6 @@ void CreatureEventAI::SummonedCreatureJustDied(Creature* pUnit)
 
 void CreatureEventAI::SummonedCreatureDespawn(Creature* pUnit)
 {
-    if (m_bEmptyList || !pUnit)
-        return;
-
     for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
     {
         if ((*i).Event.event_type == EVENT_T_SUMMONED_JUST_DESPAWN)
@@ -1009,31 +1142,40 @@ void CreatureEventAI::SummonedCreatureDespawn(Creature* pUnit)
     }
 }
 
-void CreatureEventAI::EnterCombat(Unit *enemy)
+void CreatureEventAI::ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*miscValue*/)
 {
-    //Check for on combat start events
-    if (!m_bEmptyList)
+    MANGOS_ASSERT(pSender);
+
+    for (CreatureEventAIList::iterator itr = m_CreatureEventAIList.begin(); itr != m_CreatureEventAIList.end(); ++itr)
     {
-        for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
+        if (itr->Event.event_type == EVENT_T_RECEIVE_AI_EVENT &&
+                itr->Event.receiveAIEvent.eventType == eventType && (!itr->Event.receiveAIEvent.senderEntry || itr->Event.receiveAIEvent.senderEntry == pSender->GetEntry()))
+            ProcessEvent(*itr, pInvoker, pSender);
+    }
+}
+
+void CreatureEventAI::EnterCombat(Unit* enemy)
+{
+    // Check for on combat start events
+    for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
+    {
+        CreatureEventAI_Event const& event = (*i).Event;
+        switch (event.event_type)
         {
-            CreatureEventAI_Event const& event = (*i).Event;
-            switch (event.event_type)
-            {
-                case EVENT_T_AGGRO:
-                    (*i).Enabled = true;
-                    ProcessEvent(*i, enemy);
-                    break;
-                    //Reset all in combat timers
-                case EVENT_T_TIMER:
-                    if ((*i).UpdateRepeatTimer(m_creature,event.timer.initialMin,event.timer.initialMax))
-                        (*i).Enabled = true;
-                    break;
-                    //All normal events need to be re-enabled and their time set to 0
-                default:
+            case EVENT_T_AGGRO:
+                (*i).Enabled = true;
+                ProcessEvent(*i, enemy);
+                break;
+                // Reset all in combat timers
+            case EVENT_T_TIMER_IN_COMBAT:
+                if ((*i).UpdateRepeatTimer(m_creature, event.timer.initialMin, event.timer.initialMax))
                     (*i).Enabled = true;
-                    (*i).Time = 0;
-                    break;
-            }
+                break;
+                // All normal events need to be re-enabled and their time set to 0
+            default:
+                (*i).Enabled = true;
+                (*i).Time = 0;
+                break;
         }
     }
 
@@ -1041,7 +1183,7 @@ void CreatureEventAI::EnterCombat(Unit *enemy)
     m_EventDiff = 0;
 }
 
-void CreatureEventAI::AttackStart(Unit *who)
+void CreatureEventAI::AttackStart(Unit* who)
 {
     if (!who)
         return;
@@ -1052,39 +1194,31 @@ void CreatureEventAI::AttackStart(Unit *who)
         m_creature->SetInCombatWith(who);
         who->SetInCombatWith(m_creature);
 
-        if (m_CombatMovementEnabled)
-        {
-            m_creature->GetMotionMaster()->MoveChase(who, m_AttackDistance, m_AttackAngle);
-        }
-        else
-        {
-            m_creature->GetMotionMaster()->MoveIdle();
-            m_creature->StopMoving();
-        }
+        HandleMovementOnAttackStart(who);
     }
 }
 
-void CreatureEventAI::MoveInLineOfSight(Unit *who)
+void CreatureEventAI::MoveInLineOfSight(Unit* who)
 {
     if (!who)
         return;
 
-    //Check for OOC LOS Event
-    if (!m_bEmptyList && !m_creature->getVictim())
+    // Check for OOC LOS Event
+    if (!m_creature->getVictim())
     {
         for (CreatureEventAIList::iterator itr = m_CreatureEventAIList.begin(); itr != m_CreatureEventAIList.end(); ++itr)
         {
             if ((*itr).Event.event_type == EVENT_T_OOC_LOS)
             {
-                //can trigger if closer than fMaxAllowedRange
+                // can trigger if closer than fMaxAllowedRange
                 float fMaxAllowedRange = (float)(*itr).Event.ooc_los.maxRange;
 
-                //if range is ok and we are actually in LOS
+                // if range is ok and we are actually in LOS
                 if (m_creature->IsWithinDistInMap(who, fMaxAllowedRange) && m_creature->IsWithinLOSInMap(who))
                 {
-                    //if friendly event&&who is not hostile OR hostile event&&who is hostile
+                    // if friendly event&&who is not hostile OR hostile event&&who is hostile
                     if (((*itr).Event.ooc_los.noHostile && !m_creature->IsHostileTo(who)) ||
-                        ((!(*itr).Event.ooc_los.noHostile) && m_creature->IsHostileTo(who)))
+                            ((!(*itr).Event.ooc_los.noHostile) && m_creature->IsHostileTo(who)))
                         ProcessEvent(*itr, who);
                 }
             }
@@ -1095,7 +1229,7 @@ void CreatureEventAI::MoveInLineOfSight(Unit *who)
         return;
 
     if (m_creature->CanInitiateAttack() && who->isTargetableForAttack() &&
-        m_creature->IsHostileTo(who) && who->isInAccessablePlaceFor(m_creature))
+            m_creature->IsHostileTo(who) && who->isInAccessablePlaceFor(m_creature))
     {
         if (!m_creature->CanFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
             return;
@@ -1119,97 +1253,94 @@ void CreatureEventAI::MoveInLineOfSight(Unit *who)
 
 void CreatureEventAI::SpellHit(Unit* pUnit, const SpellEntry* pSpell)
 {
-
-    if (m_bEmptyList)
-        return;
-
     for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
         if ((*i).Event.event_type == EVENT_T_SPELLHIT)
-            //If spell id matches (or no spell id) & if spell school matches (or no spell school)
+            // If spell id matches (or no spell id) & if spell school matches (or no spell school)
             if (!(*i).Event.spell_hit.spellId || pSpell->Id == (*i).Event.spell_hit.spellId)
-                if (pSpell->SchoolMask & (*i).Event.spell_hit.schoolMask)
+                if (pSpell->GetSchoolMask() & (*i).Event.spell_hit.schoolMask)
                     ProcessEvent(*i, pUnit);
 }
 
 void CreatureEventAI::UpdateAI(const uint32 diff)
 {
-    //Check if we are in combat (also updates calls threat update code)
+    // Check if we are in combat (also updates calls threat update code)
     bool Combat = m_creature->SelectHostileTarget() && m_creature->getVictim();
 
-    if (!m_bEmptyList)
+    // Events are only updated once every EVENT_UPDATE_TIME ms to prevent lag with large amount of events
+    if (m_EventUpdateTime < diff)
     {
-        //Events are only updated once every EVENT_UPDATE_TIME ms to prevent lag with large amount of events
-        if (m_EventUpdateTime < diff)
-        {
-            m_EventDiff += diff;
+        m_EventDiff += diff;
 
-            //Check for time based events
-            for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
+        // Check for time based events
+        for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
+        {
+            // Decrement Timers
+            if ((*i).Time)
             {
-                //Decrement Timers
-                if ((*i).Time)
+                if ((*i).Time > m_EventDiff)
                 {
-                    if ((*i).Time > m_EventDiff)
-                    {
-                        //Do not decrement timers if event cannot trigger in this phase
-                        if (!((*i).Event.event_inverse_phase_mask & (1 << m_Phase)))
-                            (*i).Time -= m_EventDiff;
+                    // Do not decrement timers if event cannot trigger in this phase
+                    if (!((*i).Event.event_inverse_phase_mask & (1 << m_Phase)))
+                        (*i).Time -= m_EventDiff;
 
-                        //Skip processing of events that have time remaining
-                        continue;
-                    }
-                    else (*i).Time = 0;
+                    // Skip processing of events that have time remaining
+                    continue;
                 }
+                else (*i).Time = 0;
+            }
 
-                //Events that are updated every EVENT_UPDATE_TIME
-                switch ((*i).Event.event_type)
-                {
-                    case EVENT_T_TIMER_OOC:
+            // Events that are updated every EVENT_UPDATE_TIME
+            switch ((*i).Event.event_type)
+            {
+                case EVENT_T_TIMER_OOC:
+                case EVENT_T_TIMER_GENERIC:
+                    ProcessEvent(*i);
+                    break;
+                case EVENT_T_TIMER_IN_COMBAT:
+                case EVENT_T_MANA:
+                case EVENT_T_HP:
+                case EVENT_T_TARGET_HP:
+                case EVENT_T_TARGET_CASTING:
+                case EVENT_T_FRIENDLY_HP:
+                case EVENT_T_AURA:
+                case EVENT_T_TARGET_AURA:
+                case EVENT_T_MISSING_AURA:
+                case EVENT_T_TARGET_MISSING_AURA:
+                    if (Combat)
                         ProcessEvent(*i);
-                        break;
-                    case EVENT_T_TIMER:
-                    case EVENT_T_MANA:
-                    case EVENT_T_HP:
-                    case EVENT_T_TARGET_HP:
-                    case EVENT_T_TARGET_CASTING:
-                    case EVENT_T_FRIENDLY_HP:
-                    case EVENT_T_AURA:
-                    case EVENT_T_TARGET_AURA:
-                    case EVENT_T_MISSING_AURA:
-                    case EVENT_T_TARGET_MISSING_AURA:
-                        if (Combat)
-                            ProcessEvent(*i);
-                        break;
-                    case EVENT_T_RANGE:
-                        if (Combat)
+                    break;
+                case EVENT_T_RANGE:
+                    if (Combat)
+                    {
+					    Unit* pVictim = m_creature->getVictim();
+                        if (pVictim && m_creature->IsInMap(pVictim))
                         {
-                            if (m_creature->getVictim() && m_creature->IsInMap(m_creature->getVictim()))
-                                if (m_creature->IsInRange(m_creature->getVictim(), (float)(*i).Event.range.minDist, (float)(*i).Event.range.maxDist))
-                                    ProcessEvent(*i);
+                            if (m_creature->IsInRange(pVictim, (float)(*i).Event.range.minDist, (float)(*i).Event.range.maxDist))
+                                ProcessEvent(*i);
                         }
-                        break;
-                }
+                    }
+                    break;
             }
-
-            m_EventDiff = 0;
-            m_EventUpdateTime = EVENT_UPDATE_TIME;
-        }
-        else
-        {
-            m_EventDiff += diff;
-            m_EventUpdateTime -= diff;
         }
+
+        m_EventDiff = 0;
+        m_EventUpdateTime = EVENT_UPDATE_TIME;
+    }
+    else
+    {
+        m_EventDiff += diff;
+        m_EventUpdateTime -= diff;
     }
 
-    //Melee Auto-Attack
-    if (Combat && m_MeleeEnabled)
+    // Melee Auto-Attack (recheck m_creature->getVictim in case of combat state was changed while processing events)
+    if (Combat && m_MeleeEnabled && m_creature->getVictim())
         DoMeleeAttackIfReady();
 }
 
-bool CreatureEventAI::IsVisible(Unit *pl) const
+bool CreatureEventAI::IsVisible(Unit* pl) const
 {
-    return m_creature->IsWithinDist(pl,sWorld.getConfig(CONFIG_FLOAT_SIGHT_MONSTER))
-        && pl->isVisibleForOrDetect(m_creature,m_creature,true);
+    return m_creature->IsWithinDist(pl, sWorld.getConfig(CONFIG_FLOAT_SIGHT_MONSTER))
+           && pl->isVisibleForOrDetect(m_creature, m_creature, true);
 }
 
 inline uint32 CreatureEventAI::GetRandActionParam(uint32 rnd, uint32 param1, uint32 param2, uint32 param3)
@@ -1234,27 +1365,108 @@ inline int32 CreatureEventAI::GetRandActionParam(uint32 rnd, int32 param1, int32
     return 0;
 }
 
-inline Unit* CreatureEventAI::GetTargetByType(uint32 Target, Unit* pActionInvoker)
+inline Unit* CreatureEventAI::GetTargetByType(uint32 Target, Unit* pActionInvoker, Creature* pAIEventSender, bool& isError, uint32 forSpellId, uint32 selectFlags)
 {
+    Unit* resTarget = NULL;
     switch (Target)
     {
         case TARGET_T_SELF:
             return m_creature;
         case TARGET_T_HOSTILE:
-            return m_creature->getVictim();
+            resTarget = m_creature->getVictim();
+            if (!resTarget)
+                isError = true;
+            return resTarget;
         case TARGET_T_HOSTILE_SECOND_AGGRO:
-            return m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 1);
+            resTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 1, forSpellId, selectFlags);
+            if (!resTarget && ((forSpellId == 0 && selectFlags == 0 && m_creature->getThreatManager().getThreatList().size() > 1) || m_creature->getThreatManager().getThreatList().empty()))
+                isError = true;
+            return resTarget;
         case TARGET_T_HOSTILE_LAST_AGGRO:
-            return m_creature->SelectAttackingTarget(ATTACKING_TARGET_BOTTOMAGGRO, 0);
+            resTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_BOTTOMAGGRO, 0, forSpellId, selectFlags);
+            if (!resTarget && m_creature->getThreatManager().getThreatList().empty())
+                isError = true;
+            return resTarget;
         case TARGET_T_HOSTILE_RANDOM:
-            return m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+            resTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, forSpellId, selectFlags);
+            if (!resTarget && m_creature->getThreatManager().getThreatList().empty())
+                isError = true;
+            return resTarget;
         case TARGET_T_HOSTILE_RANDOM_NOT_TOP:
-            return m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+            resTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, forSpellId, selectFlags);
+            if (!resTarget && ((forSpellId == 0 && selectFlags == 0 && m_creature->getThreatManager().getThreatList().size() > 1) || m_creature->getThreatManager().getThreatList().empty()))
+                isError = true;
+            return resTarget;
+        case TARGET_T_HOSTILE_RANDOM_PLAYER:
+            resTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, forSpellId, SELECT_FLAG_PLAYER | selectFlags);
+            if (!resTarget)
+                isError = true;
+            return resTarget;
+        case TARGET_T_HOSTILE_RANDOM_NOT_TOP_PLAYER:
+            resTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, forSpellId, SELECT_FLAG_PLAYER | selectFlags);
+            if (!resTarget && ((forSpellId == 0 && selectFlags == 0 && m_creature->getThreatManager().getThreatList().size() > 1) || m_creature->getThreatManager().getThreatList().empty()))
+                isError = true;
+            return resTarget;
         case TARGET_T_ACTION_INVOKER:
+            if (!pActionInvoker)
+                isError = true;
             return pActionInvoker;
+        case TARGET_T_ACTION_INVOKER_OWNER:
+            resTarget = pActionInvoker ? pActionInvoker->GetCharmerOrOwnerOrSelf() : NULL;
+            if (!resTarget)
+                isError = true;
+            return resTarget;
+        case TARGET_T_VEHICLE_PASSENGER:
+        {
+            if (m_creature->IsVehicle())
+            {
+                for (int8 seatId = 0; seatId < MAX_VEHICLE_SEAT; ++seatId)
+                {
+                    resTarget = m_creature->GetVehicleKit()->GetPassenger(seatId);
+                    if (resTarget)
+                        break;
+                }
+            }
+            if (!resTarget)
+                isError = true;
+            return resTarget;
+        }
+        case TARGET_T_VEHICLE_PASSENGER_0:
+        case TARGET_T_VEHICLE_PASSENGER_1:
+        case TARGET_T_VEHICLE_PASSENGER_2:
+        case TARGET_T_VEHICLE_PASSENGER_3:
+        case TARGET_T_VEHICLE_PASSENGER_4:
+        case TARGET_T_VEHICLE_PASSENGER_5:
+        case TARGET_T_VEHICLE_PASSENGER_6:
+        case TARGET_T_VEHICLE_PASSENGER_7:
+        {
+            if (m_creature->IsVehicle())
+                resTarget = m_creature->GetVehicleKit()->GetPassenger(Target - TARGET_T_VEHICLE_PASSENGER_0);
+
+            if (!resTarget)
+                isError = true;
+            return resTarget;
+        }
+
+        case TARGET_T_CURRENT_VEHICLE:
+        {
+            if (VehicleKitPtr vehicle = m_creature->GetVehicle())
+                resTarget = vehicle->GetBase();
+
+            if (!resTarget)
+                isError = true;
+            return resTarget;
+        }
+
+        case TARGET_T_EVENT_SENDER:
+            if (!pAIEventSender)
+                isError = true;
+            return pAIEventSender;
         default:
+            isError = true;
             return NULL;
     };
+    return NULL;
 }
 
 Unit* CreatureEventAI::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff)
@@ -1283,121 +1495,14 @@ void CreatureEventAI::DoFindFriendlyMissingBuff(std::list<Creature*>& _list, flo
 {
     MaNGOS::FriendlyMissingBuffInRangeCheck u_check(m_creature, range, spellid);
     MaNGOS::CreatureListSearcher<MaNGOS::FriendlyMissingBuffInRangeCheck> searcher(_list, u_check);
-    Cell::VisitGridObjects(m_creature,searcher, range);
+    Cell::VisitGridObjects(m_creature, searcher, range);
 }
 
 //*********************************
 //*** Functions used globally ***
 
-void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target)
-{
-    if (!pSource)
-    {
-        sLog.outErrorDb("CreatureEventAI: DoScriptText entry %i, invalid Source pointer.",textEntry);
-        return;
-    }
-
-    if (textEntry >= 0)
-    {
-        sLog.outErrorDb("CreatureEventAI: DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.",pSource->GetEntry(),pSource->GetTypeId(),pSource->GetGUIDLow(),textEntry);
-        return;
-    }
-
-    CreatureEventAI_TextMap::const_iterator i = sEventAIMgr.GetCreatureEventAITextMap().find(textEntry);
-
-    if (i == sEventAIMgr.GetCreatureEventAITextMap().end())
-    {
-        sLog.outErrorDb("CreatureEventAI: DoScriptText with source entry %u (TypeId=%u, guid=%u) could not find text entry %i.",pSource->GetEntry(),pSource->GetTypeId(),pSource->GetGUIDLow(),textEntry);
-        return;
-    }
-
-    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "CreatureEventAI: DoScriptText: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u",textEntry,(*i).second.SoundId,(*i).second.Type,(*i).second.Language,(*i).second.Emote);
-
-    if((*i).second.SoundId)
-    {
-        if (GetSoundEntriesStore()->LookupEntry((*i).second.SoundId))
-            pSource->PlayDirectSound((*i).second.SoundId);
-        else
-            sLog.outErrorDb("CreatureEventAI: DoScriptText entry %i tried to process invalid sound id %u.",textEntry,(*i).second.SoundId);
-    }
-
-    if((*i).second.Emote)
-    {
-        if (pSource->GetTypeId() == TYPEID_UNIT || pSource->GetTypeId() == TYPEID_PLAYER)
-        {
-            ((Unit*)pSource)->HandleEmote((*i).second.Emote);
-        }
-        else
-            sLog.outErrorDb("CreatureEventAI: DoScriptText entry %i tried to process emote for invalid TypeId (%u).",textEntry,pSource->GetTypeId());
-    }
-
-    switch((*i).second.Type)
-    {
-        case CHAT_TYPE_SAY:
-            pSource->MonsterSay(textEntry, (*i).second.Language, target);
-            break;
-        case CHAT_TYPE_YELL:
-            pSource->MonsterYell(textEntry, (*i).second.Language, target);
-            break;
-        case CHAT_TYPE_TEXT_EMOTE:
-            pSource->MonsterTextEmote(textEntry, target);
-            break;
-        case CHAT_TYPE_BOSS_EMOTE:
-            pSource->MonsterTextEmote(textEntry, target, true);
-            break;
-        case CHAT_TYPE_WHISPER:
-        {
-            if (target && target->GetTypeId() == TYPEID_PLAYER)
-                pSource->MonsterWhisper(textEntry, target);
-            else sLog.outErrorDb("CreatureEventAI: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", textEntry);
-        }break;
-        case CHAT_TYPE_BOSS_WHISPER:
-        {
-            if (target && target->GetTypeId() == TYPEID_PLAYER)
-                pSource->MonsterWhisper(textEntry, target, true);
-            else sLog.outErrorDb("CreatureEventAI: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", textEntry);
-        }break;
-        case CHAT_TYPE_ZONE_YELL:
-            pSource->MonsterYellToZone(textEntry, (*i).second.Language, target);
-            break;
-    }
-}
-
-bool CreatureEventAI::CanCast(Unit* Target, SpellEntry const *Spell, bool Triggered)
-{
-    //No target so we can't cast
-    if (!Target || !Spell)
-        return false;
-
-    //Silenced so we can't cast
-    if (!Triggered && (m_creature->hasUnitState(UNIT_STAT_CAN_NOT_REACT_OR_LOST_CONTROL) ||
-        m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED)))
-        return false;
-
-    //Check for power
-    if (!Triggered && m_creature->GetPower((Powers)Spell->powerType) < Spell::CalculatePowerCost(Spell, m_creature))
-        return false;
-
-    SpellRangeEntry const *TempRange = NULL;
-
-    TempRange = GetSpellRangeStore()->LookupEntry(Spell->rangeIndex);
-
-    //Spell has invalid range store so we can't use it
-    if (!TempRange)
-        return false;
-
-    //Unit is out of range of this spell
-    if (!m_creature->IsInRange(Target,TempRange->minRange,TempRange->maxRange))
-        return false;
-
-    return true;
-}
-
 void CreatureEventAI::ReceiveEmote(Player* pPlayer, uint32 text_emote)
 {
-    if (m_bEmptyList)
-        return;
-
     for (CreatureEventAIList::iterator itr = m_CreatureEventAIList.begin(); itr != m_CreatureEventAIList.end(); ++itr)
     {
         if ((*itr).Event.event_type == EVENT_T_RECEIVE_EMOTE)
@@ -1405,8 +1510,8 @@ void CreatureEventAI::ReceiveEmote(Player* pPlayer, uint32 text_emote)
             if ((*itr).Event.receive_emote.emoteId != text_emote)
                 return;
 
-            PlayerCondition pcon(0, (*itr).Event.receive_emote.condition,(*itr).Event.receive_emote.conditionValue1,(*itr).Event.receive_emote.conditionValue2);
-            if (pcon.Meets(pPlayer))
+            PlayerCondition pcon(0, (*itr).Event.receive_emote.condition, (*itr).Event.receive_emote.conditionValue1, (*itr).Event.receive_emote.conditionValue2);
+            if (pcon.Meets(pPlayer, m_creature->GetMap(), m_creature, CONDITION_FROM_EVENTAI))
             {
                 DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "CreatureEventAI: ReceiveEmote CreatureEventAI: Condition ok, processing");
                 ProcessEvent(*itr, pPlayer);
@@ -1415,20 +1520,62 @@ void CreatureEventAI::ReceiveEmote(Player* pPlayer, uint32 text_emote)
     }
 }
 
-void CreatureEventAI::DamageTaken( Unit* /*done_by*/, uint32& damage )
+#define HEALTH_STEPS            3
+
+void CreatureEventAI::DamageTaken(Unit* dealer, uint32& damage)
 {
-    if(m_InvinceabilityHpLevel > 0 && m_creature->GetHealth() < m_InvinceabilityHpLevel+damage)
+    if (m_InvinceabilityHpLevel > 0 && m_creature->GetHealth() < m_InvinceabilityHpLevel + damage)
     {
-        if(m_creature->GetHealth() <= m_InvinceabilityHpLevel)
+        if (m_creature->GetHealth() <= m_InvinceabilityHpLevel)
             damage = 0;
         else
             damage = m_creature->GetHealth() - m_InvinceabilityHpLevel;
     }
+
+    uint32 step = m_throwAIEventStep != 100 ? m_throwAIEventStep : 0;
+    if (step < HEALTH_STEPS)
+    {
+        // Throw at 90%, 50% and 10% health
+        float healthSteps[HEALTH_STEPS] = { 90.0f, 50.0f, 10.0f };
+        float newHealthPercent = (m_creature->GetHealth() - damage) * 100.0f / m_creature->GetMaxHealth();
+        AIEventType sendEvent[HEALTH_STEPS] = { AI_EVENT_LOST_SOME_HEALTH, AI_EVENT_LOST_HEALTH, AI_EVENT_CRITICAL_HEALTH };
+
+        if (newHealthPercent > healthSteps[step])
+            return;                                         // Not reached the next mark
+
+        // search for highest reached mark (with actual event attached)
+        for (uint32 i = HEALTH_STEPS - 1; i > step; --i)
+        {
+            if (newHealthPercent < healthSteps[i] && (m_throwAIEventMask & (1 << sendEvent[i])))
+            {
+                step = i;
+                break;
+            }
+        }
+
+        if (m_throwAIEventMask & (1 << sendEvent[step]))
+            SendAIEventAround(sendEvent[step], dealer, 0, AIEVENT_DEFAULT_THROW_RADIUS);
+
+        m_throwAIEventStep = step + 1;
+    }
+}
+
+void CreatureEventAI::HealedBy(Unit* healer, uint32& healedAmount)
+{
+    if (m_throwAIEventStep == 100)
+        return;
+
+    if (m_creature->GetHealth() + healedAmount >= m_creature->GetMaxHealth())
+    {
+        if (m_throwAIEventMask & (1 << AI_EVENT_GOT_FULL_HEALTH))
+            SendAIEventAround(AI_EVENT_GOT_FULL_HEALTH, healer, 0, AIEVENT_DEFAULT_THROW_RADIUS);
+        m_throwAIEventStep = 100;
+    }
 }
 
 bool CreatureEventAI::SpawnedEventConditionsCheck(CreatureEventAI_Event const& event)
 {
-    if(event.event_type != EVENT_T_SPAWNED)
+    if (event.event_type != EVENT_T_SPAWNED)
         return false;
 
     switch (event.spawned.condition)
@@ -1443,7 +1590,7 @@ bool CreatureEventAI::SpawnedEventConditionsCheck(CreatureEventAI_Event const& e
         {
             // zone ID check
             uint32 zone, area;
-            m_creature->GetZoneAndAreaId(zone,area);
+            m_creature->GetZoneAndAreaId(zone, area);
             return zone == event.spawned.conditionValue1 || area == event.spawned.conditionValue1;
         }
         default:
diff --git a/src/game/CreatureEventAI.h b/src/game/CreatureEventAI.h
index e54244f5552..90dc6a8d8f5 100644
--- a/src/game/CreatureEventAI.h
+++ b/src/game/CreatureEventAI.h
@@ -33,7 +33,7 @@ class WorldObject;
 
 enum EventAI_Type
 {
-    EVENT_T_TIMER                   = 0,                    // InitialMin, InitialMax, RepeatMin, RepeatMax
+    EVENT_T_TIMER_IN_COMBAT         = 0,                    // InitialMin, InitialMax, RepeatMin, RepeatMax
     EVENT_T_TIMER_OOC               = 1,                    // InitialMin, InitialMax, RepeatMin, RepeatMax
     EVENT_T_HP                      = 2,                    // HPMax%, HPMin%, RepeatMin, RepeatMax
     EVENT_T_MANA                    = 3,                    // ManaMax%,ManaMin% RepeatMin, RepeatMax
@@ -62,6 +62,8 @@ enum EventAI_Type
     EVENT_T_SUMMONED_JUST_DESPAWN   = 26,                   // CreatureId, RepeatMin, RepeatMax
     EVENT_T_MISSING_AURA            = 27,                   // Param1 = SpellID, Param2 = Number of time stacked expected, Param3/4 Repeat Min/Max
     EVENT_T_TARGET_MISSING_AURA     = 28,                   // Param1 = SpellID, Param2 = Number of time stacked expected, Param3/4 Repeat Min/Max
+    EVENT_T_TIMER_GENERIC           = 29,                   // InitialMin, InitialMax, RepeatMin, RepeatMax
+    EVENT_T_RECEIVE_AI_EVENT        = 30,                   // AIEventType, Sender-Entry, unused, unused
 
     EVENT_T_END,
 };
@@ -112,48 +114,65 @@ enum EventAI_ActionType
     ACTION_T_FORCE_DESPAWN              = 41,               // Delay (0-instant despawn)
     ACTION_T_SET_INVINCIBILITY_HP_LEVEL = 42,               // MinHpValue, format(0-flat,1-percent from max health)
     ACTION_T_MOUNT_TO_ENTRY_OR_MODEL    = 43,               // Creature_template entry(param1) OR ModelId (param2) (or 0 for both to unmount)
+    ACTION_T_CHANCED_TEXT               = 44,               // Chance to display the text, TextId1, optionally TextId2. If more than just -TextId1 is defined, randomize. Negative values.
+    ACTION_T_THROW_AI_EVENT             = 45,               // EventType, Radius, unused
+    ACTION_T_SET_THROW_MASK             = 46,               // EventTypeMask, unused, unused
+    ACTION_T_SET_STAND_STATE            = 47,               // StandState, unused, unused
+
     ACTION_T_END,
 };
 
 enum Target
 {
-    //Self (m_creature)
-    TARGET_T_SELF = 0,                                      //Self cast
-
-    //Hostile targets (if pet then returns pet owner)
-    TARGET_T_HOSTILE,                                       //Our current target (ie: highest aggro)
-    TARGET_T_HOSTILE_SECOND_AGGRO,                          //Second highest aggro (generaly used for cleaves and some special attacks)
-    TARGET_T_HOSTILE_LAST_AGGRO,                            //Dead last on aggro (no idea what this could be used for)
-    TARGET_T_HOSTILE_RANDOM,                                //Just any random target on our threat list
-    TARGET_T_HOSTILE_RANDOM_NOT_TOP,                        //Any random target except top threat
-
-    //Invoker targets (if pet then returns pet owner)
-    TARGET_T_ACTION_INVOKER,                                //Unit who caused this Event to occur (only works for EVENT_T_AGGRO, EVENT_T_KILL, EVENT_T_DEATH, EVENT_T_SPELLHIT, EVENT_T_OOC_LOS, EVENT_T_FRIENDLY_HP, EVENT_T_FRIENDLY_IS_CC, EVENT_T_FRIENDLY_MISSING_BUFF)
-
-    //Hostile targets (including pets)
-    TARGET_T_HOSTILE_WPET,                                  //Current target (can be a pet)
-    TARGET_T_HOSTILE_WPET_SECOND_AGGRO,                     //Second highest aggro (generaly used for cleaves and some special attacks)
-    TARGET_T_HOSTILE_WPET_LAST_AGGRO,                       //Dead last on aggro (no idea what this could be used for)
-    TARGET_T_HOSTILE_WPET_RANDOM,                           //Just any random target on our threat list
-    TARGET_T_HOSTILE_WPET_RANDOM_NOT_TOP,                   //Any random target except top threat
-
-    TARGET_T_ACTION_INVOKER_WPET,
-
-    TARGET_T_END
+    // Self (m_creature)
+    TARGET_T_SELF                           = 0,            // Self cast
+
+    // Hostile targets
+    TARGET_T_HOSTILE                        = 1,            // Our current target (ie: highest aggro)
+    TARGET_T_HOSTILE_SECOND_AGGRO           = 2,            // Second highest aggro (generaly used for cleaves and some special attacks)
+    TARGET_T_HOSTILE_LAST_AGGRO             = 3,            // Dead last on aggro (no idea what this could be used for)
+    TARGET_T_HOSTILE_RANDOM                 = 4,            // Just any random target on our threat list
+    TARGET_T_HOSTILE_RANDOM_NOT_TOP         = 5,            // Any random target except top threat
+
+    // Invoker targets
+    TARGET_T_ACTION_INVOKER                 = 6,            // Unit who caused this Event to occur (only works for EVENT_T_AGGRO, EVENT_T_KILL, EVENT_T_DEATH, EVENT_T_SPELLHIT, EVENT_T_OOC_LOS, EVENT_T_FRIENDLY_HP, EVENT_T_FRIENDLY_IS_CC, EVENT_T_FRIENDLY_MISSING_BUFF, EVENT_T_RECEIVE_EMOTE, EVENT_T_RECEIVE_AI_EVENT)
+    TARGET_T_ACTION_INVOKER_OWNER           = 7,            // Unit who is responsible for Event to occur (only works for EVENT_T_AGGRO, EVENT_T_KILL, EVENT_T_DEATH, EVENT_T_SPELLHIT, EVENT_T_OOC_LOS, EVENT_T_FRIENDLY_HP, EVENT_T_FRIENDLY_IS_CC, EVENT_T_FRIENDLY_MISSING_BUFF, EVENT_T_RECEIVE_EMOTE, EVENT_T_RECEIVE_AI_EVENT)
+    TARGET_T_EVENT_SENDER                   = 10,           // Unit who sent an AIEvent that was received with EVENT_T_RECEIVE_AI_EVENT
+
+    // Hostile players
+    TARGET_T_HOSTILE_RANDOM_PLAYER          = 8,            // Just any random player on our threat list
+    TARGET_T_HOSTILE_RANDOM_NOT_TOP_PLAYER  = 9,            // Any random player from threat list except top threat
+
+    TARGET_T_END,
+
+    //Vehicle-based targets (NULL if owner/target vehicle)
+    TARGET_T_VEHICLE_PASSENGER = 50,                        // First current passenger (NULL if not vehicle or not passenger)
+    TARGET_T_VEHICLE_PASSENGER_0,                           // Passenger on seat 0 (NULL if not vehicle or not passenger)
+    TARGET_T_VEHICLE_PASSENGER_1,                           // Passenger on seat 1 (NULL if not vehicle or not passenger)
+    TARGET_T_VEHICLE_PASSENGER_2,                           // Passenger on seat 2 (NULL if not vehicle or not passenger)
+    TARGET_T_VEHICLE_PASSENGER_3,                           // Passenger on seat 3 (NULL if not vehicle or not passenger)
+    TARGET_T_VEHICLE_PASSENGER_4,                           // Passenger on seat 4 (NULL if not vehicle or not passenger)
+    TARGET_T_VEHICLE_PASSENGER_5,                           // Passenger on seat 5 (NULL if not vehicle or not passenger)
+    TARGET_T_VEHICLE_PASSENGER_6,                           // Passenger on seat 6 (NULL if not vehicle or not passenger)
+    TARGET_T_VEHICLE_PASSENGER_7,                           // Passenger on seat 7 (NULL if not vehicle or not passenger)
+
+    TARGET_T_CURRENT_VEHICLE,                               // Current owned vehicle (NULL if m_creature not seat on vehicle)
+
+    TARGET_T_VEHICLE_END
 };
 
 enum EventFlags
 {
-    EFLAG_REPEATABLE            = 0x01,                     //Event repeats
-    EFLAG_DIFFICULTY_0          = 0x02,                     //Event only occurs in instance difficulty 0
-    EFLAG_DIFFICULTY_1          = 0x04,                     //Event only occurs in instance difficulty 1
-    EFLAG_DIFFICULTY_2          = 0x08,                     //Event only occurs in instance difficulty 2
-    EFLAG_DIFFICULTY_3          = 0x10,                     //Event only occurs in instance difficulty 3
-    EFLAG_RANDOM_ACTION         = 0x20,                     //Event only execute one from existed actions instead each action.
+    EFLAG_REPEATABLE            = 0x01,                     // Event repeats
+    EFLAG_DIFFICULTY_0          = 0x02,                     // Event only occurs in instance difficulty 0
+    EFLAG_DIFFICULTY_1          = 0x04,                     // Event only occurs in instance difficulty 1
+    EFLAG_DIFFICULTY_2          = 0x08,                     // Event only occurs in instance difficulty 2
+    EFLAG_DIFFICULTY_3          = 0x10,                     // Event only occurs in instance difficulty 3
+    EFLAG_RANDOM_ACTION         = 0x20,                     // Event only execute one from existed actions instead each action.
     EFLAG_RESERVED_6            = 0x40,
-    EFLAG_DEBUG_ONLY            = 0x80,                     //Event only occurs in debug build
+    EFLAG_DEBUG_ONLY            = 0x80,                     // Event only occurs in debug build
     // no free bits, uint8 field
-    EFLAG_DIFFICULTY_ALL        = (EFLAG_DIFFICULTY_0|EFLAG_DIFFICULTY_1|EFLAG_DIFFICULTY_2|EFLAG_DIFFICULTY_3)
+    EFLAG_DIFFICULTY_ALL        = (EFLAG_DIFFICULTY_0 | EFLAG_DIFFICULTY_1 | EFLAG_DIFFICULTY_2 | EFLAG_DIFFICULTY_3)
 };
 
 enum SpawnedEventMode
@@ -163,17 +182,6 @@ enum SpawnedEventMode
     SPAWNED_EVENT_ZONE  = 2
 };
 
-// String text additional data, used in (CreatureEventAI)
-struct StringTextData
-{
-    uint32 SoundId;
-    uint8  Type;
-    uint32 Language;
-    uint32 Emote;
-};
-// Text Maps
-typedef UNORDERED_MAP<int32, StringTextData> CreatureEventAI_TextMap;
-
 struct CreatureEventAI_Action
 {
     EventAI_ActionType type: 16;
@@ -387,6 +395,33 @@ struct CreatureEventAI_Action
             uint32 creatureId;                              // set one from fields (or 0 for both to dismount)
             uint32 modelId;
         } mount;
+        // ACTION_T_CHANCED_TEXT                            = 44
+        struct
+        {
+            uint32 chance;
+            int32 TextId[2];
+        } chanced_text;
+        // ACTION_T_THROW_AI_EVENT                          = 45
+        struct
+        {
+            uint32 eventType;
+            uint32 radius;
+            uint32 unused;
+        } throwEvent;
+        // ACTION_T_SET_THROW_MASK                          = 46
+        struct
+        {
+            uint32 eventTypeMask;
+            uint32 unused1;
+            uint32 unused2;
+        } setThrowMask;
+        // ACTION_T_SET_STAND_STATE                         = 47
+        struct
+        {
+            uint32 standState;
+            uint32 unused1;
+            uint32 unused2;
+        } setStandState;
         // RAW
         struct
         {
@@ -411,8 +446,9 @@ struct CreatureEventAI_Event
 
     union
     {
-        // EVENT_T_TIMER                                    = 0
+        // EVENT_T_TIMER_IN_COMBAT                          = 0
         // EVENT_T_TIMER_OOC                                = 1
+        // EVENT_T_TIMER_GENERIC                            = 29
         struct
         {
             uint32 initialMin;
@@ -498,8 +534,8 @@ struct CreatureEventAI_Event
             uint32 repeatMax;
         } friendly_buff;
         // EVENT_T_SUMMONED_UNIT                            = 17
-        //EVENT_T_SUMMONED_JUST_DIED                        = 25
-        //EVENT_T_SUMMONED_JUST_DESPAWN                     = 26
+        // EVENT_T_SUMMONED_JUST_DIED                       = 25
+        // EVENT_T_SUMMONED_JUST_DESPAWN                    = 26
         struct
         {
             uint32 creatureId;
@@ -531,6 +567,14 @@ struct CreatureEventAI_Event
             uint32 repeatMin;
             uint32 repeatMax;
         } buffed;
+        // EVENT_T_RECEIVE_AI_EVENT                         = 30
+        struct
+        {
+            uint32 eventType;                               // See CreatureAI.h enum AIEventType - Receive only events of this type
+            uint32 senderEntry;                             // Optional npc from only whom this event can be received
+            uint32 unused1;
+            uint32 unused2;
+        } receiveAIEvent;
         // RAW
         struct
         {
@@ -543,7 +587,10 @@ struct CreatureEventAI_Event
 
     CreatureEventAI_Action action[MAX_ACTIONS];
 };
-//Event_Map
+
+#define AIEVENT_DEFAULT_THROW_RADIUS    30.0f
+
+// Event_Map
 typedef std::vector<CreatureEventAI_Event> CreatureEventAI_Event_Vec;
 typedef UNORDERED_MAP<uint32, CreatureEventAI_Event_Vec > CreatureEventAI_Event_Map;
 
@@ -558,12 +605,12 @@ struct CreatureEventAI_Summon
     uint32 SpawnTimeSecs;
 };
 
-//EventSummon_Map
+// EventSummon_Map
 typedef UNORDERED_MAP<uint32, CreatureEventAI_Summon> CreatureEventAI_Summon_Map;
 
 struct CreatureEventAIHolder
 {
-    CreatureEventAIHolder(CreatureEventAI_Event p) : Event(p), Time(0), Enabled(true){}
+    CreatureEventAIHolder(CreatureEventAI_Event p) : Event(p), Time(0), Enabled(true) {}
 
     CreatureEventAI_Event Event;
     uint32 Time;
@@ -576,7 +623,7 @@ struct CreatureEventAIHolder
 class MANGOS_DLL_SPEC CreatureEventAI : public CreatureAI
 {
     public:
-        explicit CreatureEventAI(Creature *c);
+        explicit CreatureEventAI(Creature* c);
         ~CreatureEventAI()
         {
             m_CreatureEventAIList.clear();
@@ -586,32 +633,32 @@ class MANGOS_DLL_SPEC CreatureEventAI : public CreatureAI
 
         void JustRespawned();
         void Reset();
-        void JustReachedHome();
-        void EnterCombat(Unit *enemy);
-        void EnterEvadeMode();
-        void JustDied(Unit* killer);
-        void KilledUnit(Unit* victim);
-        void JustSummoned(Creature* pUnit);
-        void AttackStart(Unit *who);
-        void MoveInLineOfSight(Unit *who);
-        void SpellHit(Unit* pUnit, const SpellEntry* pSpell);
-        void DamageTaken(Unit* done_by, uint32& damage);
-        void UpdateAI(const uint32 diff);
-        bool IsVisible(Unit *) const;
-        void ReceiveEmote(Player* pPlayer, uint32 text_emote);
-        void SummonedCreatureJustDied(Creature* unit);
-        void SummonedCreatureDespawn(Creature* unit);
-
-        static int Permissible(const Creature *);
-
-        bool ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pActionInvoker = NULL);
-        void ProcessAction(CreatureEventAI_Action const& action, uint32 rnd, uint32 EventId, Unit* pActionInvoker);
+        void JustReachedHome() override;
+        void EnterCombat(Unit* enemy) override;
+        void EnterEvadeMode() override;
+        void JustDied(Unit* killer) override;
+        void KilledUnit(Unit* victim) override;
+        void JustSummoned(Creature* pUnit) override;
+        void AttackStart(Unit* who) override;
+        void MoveInLineOfSight(Unit* who) override;
+        void SpellHit(Unit* pUnit, const SpellEntry* pSpell) override;
+        void DamageTaken(Unit* done_by, uint32& damage) override;
+        void HealedBy(Unit* healer, uint32& healedAmount) override;
+        void UpdateAI(const uint32 diff) override;
+        bool IsVisible(Unit*) const override;
+        void ReceiveEmote(Player* pPlayer, uint32 text_emote) override;
+        void SummonedCreatureJustDied(Creature* unit) override;
+        void SummonedCreatureDespawn(Creature* unit) override;
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 miscValue) override;
+
+        static int Permissible(const Creature*);
+
+        bool ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pActionInvoker = NULL, Creature* pAIEventSender = NULL);
+        void ProcessAction(CreatureEventAI_Action const& action, uint32 rnd, uint32 EventId, Unit* pActionInvoker, Creature* pAIEventSender);
         inline uint32 GetRandActionParam(uint32 rnd, uint32 param1, uint32 param2, uint32 param3);
         inline int32 GetRandActionParam(uint32 rnd, int32 param1, int32 param2, int32 param3);
-        inline Unit* GetTargetByType(uint32 Target, Unit* pActionInvoker);
-
-        void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target);
-        bool CanCast(Unit* Target, SpellEntry const *Spell, bool Triggered);
+        /// If the bool& param is true, an error should be reported
+        inline Unit* GetTargetByType(uint32 Target, Unit* pActionInvoker, Creature* pAIEventSender, bool& isError, uint32 forSpellId = 0, uint32 selectFlags = 0);
 
         bool SpawnedEventConditionsCheck(CreatureEventAI_Event const& event);
 
@@ -620,20 +667,21 @@ class MANGOS_DLL_SPEC CreatureEventAI : public CreatureAI
         void DoFindFriendlyCC(std::list<Creature*>& _list, float range);
 
     protected:
-        uint32 m_EventUpdateTime;                           //Time between event updates
-        uint32 m_EventDiff;                                 //Time between the last event call
-        bool   m_bEmptyList;
+        uint32 m_EventUpdateTime;                           // Time between event updates
+        uint32 m_EventDiff;                                 // Time between the last event call
 
-        //Variables used by Events themselves
+        // Variables used by Events themselves
         typedef std::vector<CreatureEventAIHolder> CreatureEventAIList;
-        CreatureEventAIList m_CreatureEventAIList;          //Holder for events (stores enabled, time, and eventid)
+        CreatureEventAIList m_CreatureEventAIList;          // Holder for events (stores enabled, time, and eventid)
 
         uint8  m_Phase;                                     // Current phase, max 32 phases
-        bool   m_CombatMovementEnabled;                     // If we allow targeted movment gen (movement twoards top threat)
         bool   m_MeleeEnabled;                              // If we allow melee auto attack
-        float  m_AttackDistance;                            // Distance to attack from
-        float  m_AttackAngle;                               // Angle of attack
         uint32 m_InvinceabilityHpLevel;                     // Minimal health level allowed at damage apply
+
+        uint32 m_throwAIEventMask;                          // Automatically throw AIEvents that are encoded into this mask
+        // Note that Step 100 means that AI_EVENT_GOT_FULL_HEALTH was sent
+        // Steps 0..2 correspond to AI_EVENT_LOST_SOME_HEALTH(90%), AI_EVENT_LOST_HEALTH(50%), AI_EVENT_CRITICAL_HEALTH(10%)
+        uint32 m_throwAIEventStep;                          // Used for damage taken/ received heal
 };
 
 #endif
diff --git a/src/game/CreatureEventAIMgr.cpp b/src/game/CreatureEventAIMgr.cpp
index 50ec9863744..dde87d29fe4 100644
--- a/src/game/CreatureEventAIMgr.cpp
+++ b/src/game/CreatureEventAIMgr.cpp
@@ -23,136 +23,71 @@
 #include "CreatureEventAIMgr.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "ObjectGuid.h"
 #include "GridDefines.h"
+#include "SpellMgr.h"
+#include "World.h"
 
 INSTANTIATE_SINGLETON_1(CreatureEventAIMgr);
 
 // -------------------
 void CreatureEventAIMgr::LoadCreatureEventAI_Texts(bool check_entry_use)
 {
-    // Drop Existing Text Map, only done once and we are ready to add data from multiple sources.
-    m_CreatureEventAI_TextMap.clear();
-
     // Load EventAI Text
-    sObjectMgr.LoadMangosStrings(WorldDatabase,"creature_ai_texts",MIN_CREATURE_AI_TEXT_STRING_ID,MAX_CREATURE_AI_TEXT_STRING_ID);
-
-    // Gather Additional data from EventAI Texts
-    QueryResult *result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM creature_ai_texts");
-
-    sLog.outString("Loading EventAI Texts additional data...");
-    if (result)
-    {
-        BarGoLink bar(result->GetRowCount());
-        uint32 count = 0;
-
-        do
-        {
-            bar.step();
-            Field* fields = result->Fetch();
-            StringTextData temp;
-
-            int32 i             = fields[0].GetInt32();
-            temp.SoundId        = fields[1].GetInt32();
-            temp.Type           = fields[2].GetInt32();
-            temp.Language       = fields[3].GetInt32();
-            temp.Emote          = fields[4].GetInt32();
-
-            // range negative
-            if (i > MIN_CREATURE_AI_TEXT_STRING_ID || i <= MAX_CREATURE_AI_TEXT_STRING_ID)
-            {
-                sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` is not in valid range(%d-%d)",i,MIN_CREATURE_AI_TEXT_STRING_ID,MAX_CREATURE_AI_TEXT_STRING_ID);
-                continue;
-            }
-
-            // range negative (don't must be happen, loaded from same table)
-            if (!sObjectMgr.GetMangosStringLocale(i))
-            {
-                sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` not found",i);
-                continue;
-            }
-
-            if (temp.SoundId)
-            {
-                if (!sSoundEntriesStore.LookupEntry(temp.SoundId))
-                    sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` has Sound %u but sound does not exist.",i,temp.SoundId);
-            }
-
-            if (!GetLanguageDescByID(temp.Language))
-                sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` using Language %u but Language does not exist.",i,temp.Language);
-
-            if (temp.Type > CHAT_TYPE_ZONE_YELL)
-                sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` has Type %u but this Chat Type does not exist.",i,temp.Type);
-
-            if (temp.Emote)
-            {
-                if (!sEmotesStore.LookupEntry(temp.Emote))
-                    sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` has Emote %u but emote does not exist.",i,temp.Emote);
-            }
-
-            m_CreatureEventAI_TextMap[i] = temp;
-            ++count;
-        } while (result->NextRow());
-
-        delete result;
-
-        if(check_entry_use)
-            CheckUnusedAITexts();
+    sObjectMgr.LoadMangosStrings(WorldDatabase, "creature_ai_texts", MIN_CREATURE_AI_TEXT_STRING_ID, MAX_CREATURE_AI_TEXT_STRING_ID, true);
 
-        sLog.outString();
-        sLog.outString(">> Loaded %u additional CreatureEventAI Texts data.", count);
-    }
-    else
-    {
-        BarGoLink bar(1);
-        bar.step();
-        sLog.outString();
-        sLog.outString(">> Loaded 0 additional CreatureEventAI Texts data. DB table `creature_ai_texts` is empty.");
-    }
+    if (check_entry_use)
+        CheckUnusedAITexts();
 }
 
 void CreatureEventAIMgr::CheckUnusedAITexts()
 {
+    if (m_usedTextsAmount == sObjectMgr.GetLoadedStringsCount(MIN_CREATURE_AI_TEXT_STRING_ID))
+        return;
+
+    sLog.outString("Checking EventAI for unused texts, this might take a while");
+
     std::set<int32> idx_set;
-    // check not used strings this is negative range
-    for(CreatureEventAI_TextMap::const_iterator itr = m_CreatureEventAI_TextMap.begin(); itr != m_CreatureEventAI_TextMap.end(); ++itr)
-        idx_set.insert(itr->first);
+    for (int32 i = MAX_CREATURE_AI_TEXT_STRING_ID + 1; i <= MIN_CREATURE_AI_TEXT_STRING_ID; ++i)
+        if (sObjectMgr.GetMangosStringLocale(i))
+            idx_set.insert(i);
 
-    for(CreatureEventAI_Event_Map::const_iterator itr = m_CreatureEventAI_Event_Map.begin(); itr != m_CreatureEventAI_Event_Map.end(); ++itr)
+    for (CreatureEventAI_Event_Map::const_iterator itr = m_CreatureEventAI_Event_Map.begin(); itr != m_CreatureEventAI_Event_Map.end(); ++itr)
     {
-        for(size_t i = 0; i < itr->second.size(); ++i)
+        for (size_t i = 0; i < itr->second.size(); ++i)
         {
             CreatureEventAI_Event const& event = itr->second[i];
 
-            for(int j = 0; j < MAX_ACTIONS; ++j)
+            for (int j = 0; j < MAX_ACTIONS; ++j)
             {
                 CreatureEventAI_Action const& action = event.action[j];
-                switch(action.type)
+                switch (action.type)
                 {
                     case ACTION_T_TEXT:
+                    case ACTION_T_CHANCED_TEXT:
                     {
-                        for(int k = 0; k < 3; ++k)
+                        // ACTION_T_CHANCED_TEXT contains a chance value in first param
+                        int k = action.type == ACTION_T_TEXT ? 0 : 1;
+                        for (; k < 3; ++k)
                             if (action.text.TextId[k])
                                 idx_set.erase(action.text.TextId[k]);
                         break;
                     }
                     default: break;
                 }
-
             }
         }
     }
 
-    for(std::set<int32>::const_iterator itr = idx_set.begin(); itr != idx_set.end(); ++itr)
-        sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` but not used in EventAI scripts.",*itr);
+    for (std::set<int32>::const_iterator itr = idx_set.begin(); itr != idx_set.end(); ++itr)
+        sLog.outErrorEventAI("Entry %i in table `creature_ai_texts` but not used in EventAI scripts.", *itr);
 }
 
 // -------------------
 void CreatureEventAIMgr::LoadCreatureEventAI_Summons(bool check_entry_use)
 {
-
-    //Drop Existing EventSummon Map
+    // Drop Existing EventSummon Map
     m_CreatureEventAI_Summon_Map.clear();
 
     // Gather additional data for EventAI
@@ -165,7 +100,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Summons(bool check_entry_use)
         do
         {
             bar.step();
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             CreatureEventAI_Summon temp;
 
@@ -178,23 +113,25 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Summons(bool check_entry_use)
 
             if (!MaNGOS::IsValidMapCoord(temp.position_x, temp.position_y, temp.position_z, temp.orientation))
             {
-                sLog.outErrorDb("CreatureEventAI:  Summon id %u have wrong coordinates (%f, %f, %f, %f), skipping.", temp.id, temp.position_x, temp.position_y, temp.position_z, temp.orientation);
+                sLog.outErrorEventAI("Summon id %u have wrong coordinates (%f, %f, %f, %f), skipping.", temp.id, temp.position_x, temp.position_y, temp.position_z, temp.orientation);
                 continue;
             }
 
-            //Add to map
+            // Add to map
             m_CreatureEventAI_Summon_Map[temp.id] = temp;
             ++Count;
-        }while (result->NextRow());
+        }
+        while (result->NextRow());
 
         delete result;
 
-        if(check_entry_use)
+        if (check_entry_use)
             CheckUnusedAISummons();
 
         sLog.outString();
         sLog.outString(">> Loaded %u CreatureEventAI summon definitions", Count);
-    }else
+    }
+    else
     {
         BarGoLink bar(1);
         bar.step();
@@ -207,19 +144,19 @@ void CreatureEventAIMgr::CheckUnusedAISummons()
 {
     std::set<int32> idx_set;
     // check not used strings this is negative range
-    for(CreatureEventAI_Summon_Map::const_iterator itr = m_CreatureEventAI_Summon_Map.begin(); itr != m_CreatureEventAI_Summon_Map.end(); ++itr)
+    for (CreatureEventAI_Summon_Map::const_iterator itr = m_CreatureEventAI_Summon_Map.begin(); itr != m_CreatureEventAI_Summon_Map.end(); ++itr)
         idx_set.insert(itr->first);
 
-    for(CreatureEventAI_Event_Map::const_iterator itr = m_CreatureEventAI_Event_Map.begin(); itr != m_CreatureEventAI_Event_Map.end(); ++itr)
+    for (CreatureEventAI_Event_Map::const_iterator itr = m_CreatureEventAI_Event_Map.begin(); itr != m_CreatureEventAI_Event_Map.end(); ++itr)
     {
-        for(size_t i = 0; i < itr->second.size(); ++i)
+        for (size_t i = 0; i < itr->second.size(); ++i)
         {
             CreatureEventAI_Event const& event = itr->second[i];
 
-            for(int j = 0; j < MAX_ACTIONS; ++j)
+            for (int j = 0; j < MAX_ACTIONS; ++j)
             {
                 CreatureEventAI_Action const& action = event.action[j];
-                switch(action.type)
+                switch (action.type)
                 {
                     case ACTION_T_SUMMON_ID:
                     {
@@ -229,28 +166,95 @@ void CreatureEventAIMgr::CheckUnusedAISummons()
                     }
                     default: break;
                 }
-
             }
         }
     }
 
-    for(std::set<int32>::const_iterator itr = idx_set.begin(); itr != idx_set.end(); ++itr)
-        sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_summons` but not used in EventAI scripts.",*itr);
+    for (std::set<int32>::const_iterator itr = idx_set.begin(); itr != idx_set.end(); ++itr)
+        sLog.outErrorEventAI("Entry %i in table `creature_ai_summons` but not used in EventAI scripts.", *itr);
+}
+
+/// Helper function to check if a target-suite is suitable for the event-type
+bool IsValidTargetType(EventAI_Type eventType, EventAI_ActionType actionType, uint32 targetType, uint32 eventId, uint8 action)
+{
+    switch (targetType)
+    {
+        case TARGET_T_SELF:
+            if (actionType == ACTION_T_QUEST_EVENT || actionType == ACTION_T_CAST_EVENT || actionType == ACTION_T_QUEST_EVENT_ALL || actionType == ACTION_T_KILLED_MONSTER)
+            {
+                sLog.outErrorEventAI("Event %u Action%u uses incorrect Target type %u for event-type %u (must target player)", eventId, action, targetType, eventType);
+                return false;
+            }
+            return true;                                    // Can always be used
+        case TARGET_T_HOSTILE_RANDOM:
+        case TARGET_T_HOSTILE_RANDOM_NOT_TOP:
+            if (actionType == ACTION_T_QUEST_EVENT || actionType == ACTION_T_CAST_EVENT || actionType == ACTION_T_QUEST_EVENT_ALL || actionType == ACTION_T_KILLED_MONSTER)
+                sLog.outErrorEventAI("Event %u Action%u uses LIKELY bad Target type %u for event-type %u (must target player)", eventId, action, targetType, eventType);
+            // no break, check if valid at all
+        case TARGET_T_HOSTILE:
+        case TARGET_T_HOSTILE_SECOND_AGGRO:
+        case TARGET_T_HOSTILE_LAST_AGGRO:
+        case TARGET_T_HOSTILE_RANDOM_PLAYER:
+        case TARGET_T_HOSTILE_RANDOM_NOT_TOP_PLAYER:
+            switch (eventType)
+            {
+                case EVENT_T_TIMER_OOC:
+                case EVENT_T_OOC_LOS:
+                case EVENT_T_REACHED_HOME:
+                    sLog.outErrorEventAI("Event %u Action%u uses incorrect Target type %u for event-type %u (cannot be used OOC)", eventId, action, targetType, eventType);
+                    return false;
+                case EVENT_T_TIMER_GENERIC:
+                    sLog.outErrorEventAI("Event %u Action%u uses LIKELY incorrect Target type %u for event-type %u (cannot be used OOC)", eventId, action, targetType, eventType);
+                    return true;                            // Does not need to be an error
+                default:
+                    return true;
+            }
+        case TARGET_T_ACTION_INVOKER:                       // Unit who caused this Event to occur (only works for EVENT_T_AGGRO, EVENT_T_KILL, EVENT_T_DEATH, EVENT_T_SPELLHIT, EVENT_T_OOC_LOS, EVENT_T_FRIENDLY_HP, EVENT_T_FRIENDLY_IS_CC, EVENT_T_FRIENDLY_MISSING_BUFF, EVENT_T_RECEIVE_EMOTE, EVENT_T_RECEIVE_AI_EVENT)
+        case TARGET_T_ACTION_INVOKER_OWNER:                 // Unit who is responsible for Event to occur (only works for EVENT_T_AGGRO, EVENT_T_KILL, EVENT_T_DEATH, EVENT_T_SPELLHIT, EVENT_T_OOC_LOS, EVENT_T_FRIENDLY_HP, EVENT_T_FRIENDLY_IS_CC, EVENT_T_FRIENDLY_MISSING_BUFF, EVENT_T_RECEIVE_EMOTE, EVENT_T_RECEIVE_AI_EVENT)
+            switch (eventType)
+            {
+                case EVENT_T_AGGRO:
+                case EVENT_T_KILL:
+                case EVENT_T_DEATH:
+                case EVENT_T_SPELLHIT:
+                case EVENT_T_OOC_LOS:
+                case EVENT_T_FRIENDLY_HP:
+                case EVENT_T_FRIENDLY_IS_CC:
+                case EVENT_T_FRIENDLY_MISSING_BUFF:
+                case EVENT_T_RECEIVE_EMOTE:
+                case EVENT_T_RECEIVE_AI_EVENT:
+                    return true;
+                default:
+                    sLog.outErrorEventAI("Event %u Action%u uses incorrect Target type %u for event-type %u", eventId, action, targetType, eventType);
+                    return false;
+            }
+        case TARGET_T_EVENT_SENDER:                         // Unit who sent an AIEvent that was received with EVENT_T_RECEIVE_AI_EVENT
+            if (eventType != EVENT_T_RECEIVE_AI_EVENT)
+            {
+                sLog.outErrorEventAI("Event %u Action%u uses incorrect Target type %u for event-type %u", eventId, action, targetType, eventType);
+                return false;
+            }
+            return true;
+        default:
+            sLog.outErrorEventAI("Event %u Action%u uses incorrect Target type", eventId, action);
+            return false;
+    }
 }
 
 // -------------------
 void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
 {
-    //Drop Existing EventAI List
+    // Drop Existing EventAI List
     m_CreatureEventAI_Event_Map.clear();
+    std::set<int32> usedTextIds;
 
     // Gather event data
-    QueryResult *result = WorldDatabase.Query("SELECT id, creature_id, event_type, event_inverse_phase_mask, event_chance, event_flags, "
-        "event_param1, event_param2, event_param3, event_param4, "
-        "action1_type, action1_param1, action1_param2, action1_param3, "
-        "action2_type, action2_param1, action2_param2, action2_param3, "
-        "action3_type, action3_param1, action3_param2, action3_param3 "
-        "FROM creature_ai_scripts");
+    QueryResult* result = WorldDatabase.Query("SELECT id, creature_id, event_type, event_inverse_phase_mask, event_chance, event_flags, "
+                          "event_param1, event_param2, event_param3, event_param4, "
+                          "action1_type, action1_param1, action1_param2, action1_param3, "
+                          "action2_type, action2_param1, action2_param2, action2_param3, "
+                          "action3_type, action3_param1, action3_param2, action3_param3 "
+                          "FROM creature_ai_scripts");
     if (result)
     {
         BarGoLink bar(result->GetRowCount());
@@ -259,7 +263,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
         do
         {
             bar.step();
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             CreatureEventAI_Event temp;
             temp.event_id = EventAI_Type(fields[0].GetUInt32());
@@ -269,10 +273,10 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
             uint32 creature_id = temp.creature_id;
 
             uint32 e_type = fields[2].GetUInt32();
-            //Report any errors in event
+            // Report any errors in event
             if (e_type >= EVENT_T_END)
             {
-                sLog.outErrorDb("CreatureEventAI:  Event %u have wrong type (%u), skipping.", i,e_type);
+                sLog.outErrorEventAI("Event %u have wrong type (%u), skipping.", i, e_type);
                 continue;
             }
             temp.event_type = EventAI_Type(e_type);
@@ -285,46 +289,47 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
             temp.raw.param3 = fields[8].GetUInt32();
             temp.raw.param4 = fields[9].GetUInt32();
 
-            //Creature does not exist in database
+            // Creature does not exist in database
             if (!sCreatureStorage.LookupEntry<CreatureInfo>(temp.creature_id))
             {
-                sLog.outErrorDb("CreatureEventAI:  Event %u has script for non-existing creature entry (%u), skipping.", i, temp.creature_id);
+                sLog.outErrorEventAI("Event %u has script for non-existing creature entry (%u), skipping.", i, temp.creature_id);
                 continue;
             }
 
-            //No chance of this event occuring
+            // No chance of this event occuring
             if (temp.event_chance == 0)
-                sLog.outErrorDb("CreatureEventAI:  Event %u has 0 percent chance. Event will never trigger!", i);
-            //Chance above 100, force it to be 100
+                sLog.outErrorEventAI("Event %u has 0 percent chance. Event will never trigger!", i);
+            // Chance above 100, force it to be 100
             else if (temp.event_chance > 100)
             {
-                sLog.outErrorDb("CreatureEventAI:  Creature %u are using event %u with more than 100 percent chance. Adjusting to 100 percent.", temp.creature_id, i);
+                sLog.outErrorEventAI("Creature %u are using event %u with more than 100 percent chance. Adjusting to 100 percent.", temp.creature_id, i);
                 temp.event_chance = 100;
             }
 
-            //Individual event checks
+            // Individual event checks
             switch (temp.event_type)
             {
-                case EVENT_T_TIMER:
+                case EVENT_T_TIMER_IN_COMBAT:
                 case EVENT_T_TIMER_OOC:
+                case EVENT_T_TIMER_GENERIC:
                     if (temp.timer.initialMax < temp.timer.initialMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using timed event(%u) with param2 < param1 (InitialMax < InitialMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using timed event(%u) with param2 < param1 (InitialMax < InitialMin). Event will never repeat.", temp.creature_id, i);
                     if (temp.timer.repeatMax < temp.timer.repeatMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
                 case EVENT_T_HP:
                 case EVENT_T_MANA:
                 case EVENT_T_TARGET_HP:
                 case EVENT_T_TARGET_MANA:
                     if (temp.percent_range.percentMax > 100)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using percentage event(%u) with param2 (MinPercent) > 100. Event will never trigger! ", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using percentage event(%u) with param2 (MinPercent) > 100. Event will never trigger! ", temp.creature_id, i);
 
                     if (temp.percent_range.percentMax <= temp.percent_range.percentMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using percentage event(%u) with param1 <= param2 (MaxPercent <= MinPercent). Event will never trigger! ", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using percentage event(%u) with param1 <= param2 (MaxPercent <= MinPercent). Event will never trigger! ", temp.creature_id, i);
 
-                    if (temp.event_flags & EFLAG_REPEATABLE && !temp.percent_range.repeatMin && !temp.percent_range.repeatMax)
+                    if ((temp.event_flags & EFLAG_REPEATABLE) && !temp.percent_range.repeatMin && !temp.percent_range.repeatMax)
                     {
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u has param3 and param4=0 (RepeatMin/RepeatMax) but cannot be repeatable without timers. Removing EFLAG_REPEATABLE for event %u.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u has param3 and param4=0 (RepeatMin/RepeatMax) but cannot be repeatable without timers. Removing EFLAG_REPEATABLE for event %u.", temp.creature_id, i);
                         temp.event_flags &= ~EFLAG_REPEATABLE;
                     }
                     break;
@@ -334,93 +339,94 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                         SpellEntry const* pSpell = sSpellStore.LookupEntry(temp.spell_hit.spellId);
                         if (!pSpell)
                         {
-                            sLog.outErrorDb("CreatureEventAI:  Creature %u has nonexistent SpellID(%u) defined in event %u.", temp.creature_id, temp.spell_hit.spellId, i);
+                            sLog.outErrorEventAI("Creature %u has nonexistent SpellID(%u) defined in event %u.", temp.creature_id, temp.spell_hit.spellId, i);
                             continue;
                         }
 
-                        if ((temp.spell_hit.schoolMask & pSpell->SchoolMask) != pSpell->SchoolMask)
-                            sLog.outErrorDb("CreatureEventAI:  Creature %u has param1(spellId %u) but param2 is not -1 and not equal to spell's school mask. Event %u can never trigger.", temp.creature_id, temp.spell_hit.schoolMask, i);
+                        if ((temp.spell_hit.schoolMask & pSpell->GetSchoolMask()) != pSpell->GetSchoolMask())
+                            sLog.outErrorEventAI("Creature %u has param1(spellId %u) but param2 is not -1 and not equal to spell's school mask. Event %u can never trigger.", temp.creature_id, temp.spell_hit.schoolMask, i);
                     }
 
                     if (!temp.spell_hit.schoolMask)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u is using invalid SpellSchoolMask(%u) defined in event %u.", temp.creature_id, temp.spell_hit.schoolMask, i);
+                        sLog.outErrorEventAI("Creature %u is using invalid SpellSchoolMask(%u) defined in event %u.", temp.creature_id, temp.spell_hit.schoolMask, i);
 
                     if (temp.spell_hit.repeatMax < temp.spell_hit.repeatMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
                 case EVENT_T_RANGE:
                     if (temp.range.maxDist < temp.range.minDist)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using event(%u) with param2 < param1 (MaxDist < MinDist). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using event(%u) with param2 < param1 (MaxDist < MinDist). Event will never repeat.", temp.creature_id, i);
                     if (temp.range.repeatMax < temp.range.repeatMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
                 case EVENT_T_OOC_LOS:
                     if (temp.ooc_los.repeatMax < temp.ooc_los.repeatMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
                 case EVENT_T_SPAWNED:
-                    switch(temp.spawned.condition)
+                    switch (temp.spawned.condition)
                     {
                         case SPAWNED_EVENT_ALWAY:
                             break;
                         case SPAWNED_EVENT_MAP:
-                            if(!sMapStore.LookupEntry(temp.spawned.conditionValue1))
-                                sLog.outErrorDb("CreatureEventAI:  Creature %u are using spawned event(%u) with param1 = %u 'map specific' but map (param2: %u) does not exist. Event will never repeat.", temp.creature_id, i, temp.spawned.condition, temp.spawned.conditionValue1);
+                            if (!sMapStore.LookupEntry(temp.spawned.conditionValue1))
+                                sLog.outErrorEventAI("Creature %u are using spawned event(%u) with param1 = %u 'map specific' but map (param2: %u) does not exist. Event will never repeat.", temp.creature_id, i, temp.spawned.condition, temp.spawned.conditionValue1);
                             break;
                         case SPAWNED_EVENT_ZONE:
-                            if(!GetAreaEntryByAreaID(temp.spawned.conditionValue1))
-                                sLog.outErrorDb("CreatureEventAI:  Creature %u are using spawned event(%u) with param1 = %u 'area specific' but area (param2: %u) does not exist. Event will never repeat.", temp.creature_id, i, temp.spawned.condition, temp.spawned.conditionValue1);
+                            if (!GetAreaEntryByAreaID(temp.spawned.conditionValue1))
+                                sLog.outErrorEventAI("Creature %u are using spawned event(%u) with param1 = %u 'area specific' but area (param2: %u) does not exist. Event will never repeat.", temp.creature_id, i, temp.spawned.condition, temp.spawned.conditionValue1);
+                            break;
                         default:
-                            sLog.outErrorDb("CreatureEventAI:  Creature %u are using invalid spawned event %u mode (%u) in param1", temp.creature_id, i, temp.spawned.condition);
+                            sLog.outErrorEventAI("Creature %u are using invalid spawned event %u mode (%u) in param1", temp.creature_id, i, temp.spawned.condition);
                             break;
                     }
                     break;
                 case EVENT_T_FRIENDLY_HP:
                     if (temp.friendly_hp.repeatMax < temp.friendly_hp.repeatMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
                 case EVENT_T_FRIENDLY_IS_CC:
                     if (temp.friendly_is_cc.repeatMax < temp.friendly_is_cc.repeatMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
                 case EVENT_T_FRIENDLY_MISSING_BUFF:
                 {
                     SpellEntry const* pSpell = sSpellStore.LookupEntry(temp.friendly_buff.spellId);
                     if (!pSpell)
                     {
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u has nonexistent SpellID(%u) defined in event %u.", temp.creature_id, temp.friendly_buff.spellId, i);
+                        sLog.outErrorEventAI("Creature %u has nonexistent SpellID(%u) defined in event %u.", temp.creature_id, temp.friendly_buff.spellId, i);
                         continue;
                     }
                     if (temp.friendly_buff.radius <= 0)
                     {
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u has wrong radius (%u) for EVENT_T_FRIENDLY_MISSING_BUFF defined in event %u.", temp.creature_id, temp.friendly_buff.radius, i);
+                        sLog.outErrorEventAI("Creature %u has wrong radius (%u) for EVENT_T_FRIENDLY_MISSING_BUFF defined in event %u.", temp.creature_id, temp.friendly_buff.radius, i);
                         continue;
                     }
                     if (temp.friendly_buff.repeatMax < temp.friendly_buff.repeatMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
                 }
                 case EVENT_T_KILL:
                     if (temp.kill.repeatMax < temp.kill.repeatMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using event(%u) with param2 < param1 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using event(%u) with param2 < param1 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
                 case EVENT_T_TARGET_CASTING:
                     if (temp.target_casting.repeatMax < temp.target_casting.repeatMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using event(%u) with param2 < param1 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using event(%u) with param2 < param1 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
                 case EVENT_T_SUMMONED_UNIT:
                 case EVENT_T_SUMMONED_JUST_DIED:
                 case EVENT_T_SUMMONED_JUST_DESPAWN:
                     if (!sCreatureStorage.LookupEntry<CreatureInfo>(temp.summoned.creatureId))
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using event(%u) with nonexistent creature template id (%u) in param1, skipped.", temp.creature_id, i, temp.summoned.creatureId);
+                        sLog.outErrorEventAI("Creature %u are using event(%u) with nonexistent creature template id (%u) in param1, skipped.", temp.creature_id, i, temp.summoned.creatureId);
                     if (temp.summoned.repeatMax < temp.summoned.repeatMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using event(%u) with param2 < param1 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using event(%u) with param2 < param1 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
                 case EVENT_T_QUEST_ACCEPT:
                 case EVENT_T_QUEST_COMPLETE:
                     if (!sObjectMgr.GetQuestTemplate(temp.quest.questId))
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using event(%u) with nonexistent quest id (%u) in param1, skipped.", temp.creature_id, i, temp.quest.questId);
-                    sLog.outErrorDb("CreatureEventAI: Creature %u using not implemented event (%u) in event %u.", temp.creature_id, temp.event_id, i);
+                        sLog.outErrorEventAI("Creature %u are using event(%u) with nonexistent quest id (%u) in param1, skipped.", temp.creature_id, i, temp.quest.questId);
+                    sLog.outErrorEventAI("Creature %u using not implemented event (%u) in event %u.", temp.creature_id, temp.event_id, i);
                     continue;
 
                 case EVENT_T_AGGRO:
@@ -430,7 +436,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                 {
                     if (temp.event_flags & EFLAG_REPEATABLE)
                     {
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u has EFLAG_REPEATABLE set. Event can never be repeatable. Removing flag for event %u.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u has EFLAG_REPEATABLE set. Event can never be repeatable. Removing flag for event %u.", temp.creature_id, i);
                         temp.event_flags &= ~EFLAG_REPEATABLE;
                     }
 
@@ -441,19 +447,19 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                 {
                     if (!sEmotesTextStore.LookupEntry(temp.receive_emote.emoteId))
                     {
-                        sLog.outErrorDb("CreatureEventAI: Creature %u using event %u: param1 (EmoteTextId: %u) are not valid.",temp.creature_id, i, temp.receive_emote.emoteId);
+                        sLog.outErrorEventAI("Creature %u using event %u: param1 (EmoteTextId: %u) are not valid.", temp.creature_id, i, temp.receive_emote.emoteId);
                         continue;
                     }
 
                     if (!PlayerCondition::IsValid(0, ConditionType(temp.receive_emote.condition), temp.receive_emote.conditionValue1, temp.receive_emote.conditionValue2))
                     {
-                        sLog.outErrorDb("CreatureEventAI: Creature %u using event %u: param2 (Condition: %u) are not valid.",temp.creature_id, i, temp.receive_emote.condition);
+                        sLog.outErrorEventAI("Creature %u using event %u: param2 (Condition: %u) are not valid.", temp.creature_id, i, temp.receive_emote.condition);
                         continue;
                     }
 
                     if (!(temp.event_flags & EFLAG_REPEATABLE))
                     {
-                        sLog.outErrorDb("CreatureEventAI: Creature %u using event %u: EFLAG_REPEATABLE not set. Event must always be repeatable. Flag applied.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u using event %u: EFLAG_REPEATABLE not set. Event must always be repeatable. Flag applied.", temp.creature_id, i);
                         temp.event_flags |= EFLAG_REPEATABLE;
                     }
 
@@ -468,30 +474,45 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                     SpellEntry const* pSpell = sSpellStore.LookupEntry(temp.buffed.spellId);
                     if (!pSpell)
                     {
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u has nonexistent SpellID(%u) defined in event %u.", temp.creature_id, temp.buffed.spellId, i);
+                        sLog.outErrorEventAI("Creature %u has nonexistent SpellID(%u) defined in event %u.", temp.creature_id, temp.buffed.spellId, i);
                         continue;
                     }
                     if (temp.buffed.amount < 1)
                     {
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u has wrong spell stack size (%u) defined in event %u.", temp.creature_id, temp.buffed.amount, i);
+                        sLog.outErrorEventAI("Creature %u has wrong spell stack size (%u) defined in event %u.", temp.creature_id, temp.buffed.amount, i);
                         continue;
                     }
                     if (temp.buffed.repeatMax < temp.buffed.repeatMin)
-                        sLog.outErrorDb("CreatureEventAI:  Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                        sLog.outErrorEventAI("Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
+                    break;
+                }
+                case EVENT_T_RECEIVE_AI_EVENT:
+                {
+                    // Sender-Creature does not exist in database
+                    if (temp.receiveAIEvent.senderEntry && !sCreatureStorage.LookupEntry<CreatureInfo>(temp.receiveAIEvent.senderEntry))
+                    {
+                        sLog.outErrorEventAI("Event %u has nonexisting creature (%u) defined for event RECEIVE_AI_EVENT, skipping.", i, temp.receiveAIEvent.senderEntry);
+                        continue;
+                    }
+                    // Event-Type is not defined
+                    if (temp.receiveAIEvent.eventType >= MAXIMAL_AI_EVENT_EVENTAI)
+                    {
+                        sLog.outErrorEventAI("Event %u has unfitting event-type (%u) defined for event RECEIVE_AI_EVENT (must be less than %u), skipping.", i, temp.receiveAIEvent.eventType, MAXIMAL_AI_EVENT_EVENTAI);
+                        continue;
+                    }
                     break;
                 }
-
                 default:
-                    sLog.outErrorDb("CreatureEventAI: Creature %u using not checked at load event (%u) in event %u. Need check code update?", temp.creature_id, temp.event_id, i);
+                    sLog.outErrorEventAI("Creature %u using not checked at load event (%u) in event %u. Need check code update?", temp.creature_id, temp.event_id, i);
                     break;
             }
 
-            for (uint32 j = 0; j < MAX_ACTIONS; j++)
+            for (uint32 j = 0; j < MAX_ACTIONS; ++j)
             {
-                uint16 action_type = fields[10+(j*4)].GetUInt16();
+                uint16 action_type = fields[10 + (j * 4)].GetUInt16();
                 if (action_type >= ACTION_T_END)
                 {
-                    sLog.outErrorDb("CreatureEventAI:  Event %u Action %u has incorrect action type (%u), replace by ACTION_T_NONE.", i, j+1, action_type);
+                    sLog.outErrorEventAI("Event %u Action %u has incorrect action type (%u), replace by ACTION_T_NONE.", i, j + 1, action_type);
                     temp.action[j].type = ACTION_T_NONE;
                     continue;
                 }
@@ -499,55 +520,65 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                 CreatureEventAI_Action& action = temp.action[j];
 
                 action.type = EventAI_ActionType(action_type);
-                action.raw.param1 = fields[11+(j*4)].GetUInt32();
-                action.raw.param2 = fields[12+(j*4)].GetUInt32();
-                action.raw.param3 = fields[13+(j*4)].GetUInt32();
+                action.raw.param1 = fields[11 + (j * 4)].GetUInt32();
+                action.raw.param2 = fields[12 + (j * 4)].GetUInt32();
+                action.raw.param3 = fields[13 + (j * 4)].GetUInt32();
 
-                //Report any errors in actions
+                // Report any errors in actions
                 switch (action.type)
                 {
                     case ACTION_T_NONE:
                         break;
+                    case ACTION_T_CHANCED_TEXT:
+                        // Check first param as chance
+                        if (!action.chanced_text.chance)
+                            sLog.outErrorEventAI("Event %u Action %u has not set chance param1. Text will not be displayed", i, j + 1);
+                        else if (action.chanced_text.chance >= 100)
+                            sLog.outErrorEventAI("Event %u Action %u has set chance param1 >= 100. Text will always be displayed", i, j + 1);
+                        // no break here to check texts
                     case ACTION_T_TEXT:
                     {
                         bool not_set = false;
-                        for(int k = 0; k < 3; ++k)
+                        int firstTextParam = action.type == ACTION_T_TEXT ? 0 : 1;
+                        for (int k = firstTextParam; k < 3; ++k)
                         {
                             if (action.text.TextId[k])
                             {
-                                if (k > 0 && not_set)
-                                    sLog.outErrorDb("CreatureEventAI:  Event %u Action %u has param%d, but it follow after not set param. Required for randomized text.", i, j+1, k+1);
+                                if (k > firstTextParam && not_set)
+                                    sLog.outErrorEventAI("Event %u Action %u has param%d, but it follow after not set param. Required for randomized text.", i, j + 1, k + 1);
 
-                                if(!action.text.TextId[k])
+                                if (!action.text.TextId[k])
                                     not_set = true;
                                 // range negative
-                                else if(action.text.TextId[k] > MIN_CREATURE_AI_TEXT_STRING_ID || action.text.TextId[k] <= MAX_CREATURE_AI_TEXT_STRING_ID)
+                                else if (action.text.TextId[k] > MIN_CREATURE_AI_TEXT_STRING_ID || action.text.TextId[k] <= MAX_CREATURE_AI_TEXT_STRING_ID)
                                 {
-                                    sLog.outErrorDb("CreatureEventAI:  Event %u Action %u param%d references out-of-range entry (%i) in texts table.", i, j+1, k+1, action.text.TextId[k]);
+                                    sLog.outErrorEventAI("Event %u Action %u param%d references out-of-range entry (%i) in texts table.", i, j + 1, k + 1, action.text.TextId[k]);
                                     action.text.TextId[k] = 0;
                                 }
-                                else if (m_CreatureEventAI_TextMap.find(action.text.TextId[k]) == m_CreatureEventAI_TextMap.end())
+                                else if (!sObjectMgr.GetMangosStringLocale(action.text.TextId[k]))
                                 {
-                                    sLog.outErrorDb("CreatureEventAI:  Event %u Action %u param%d references non-existing entry (%i) in texts table.", i, j+1, k+1, action.text.TextId[k]);
+                                    sLog.outErrorEventAI("Event %u Action %u param%d references non-existing entry (%i) in texts table.", i, j + 1, k + 1, action.text.TextId[k]);
                                     action.text.TextId[k] = 0;
                                 }
+                                else
+                                    usedTextIds.insert(action.text.TextId[k]);
                             }
                         }
                         break;
                     }
                     case ACTION_T_SET_FACTION:
-                        if (action.set_faction.factionId !=0 && !sFactionTemplateStore.LookupEntry(action.set_faction.factionId))
+                        if (action.set_faction.factionId != 0 && !sFactionTemplateStore.LookupEntry(action.set_faction.factionId))
                         {
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent FactionId %u.", i, j+1, action.set_faction.factionId);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent FactionId %u.", i, j + 1, action.set_faction.factionId);
                             action.set_faction.factionId = 0;
                         }
                         break;
                     case ACTION_T_MORPH_TO_ENTRY_OR_MODEL:
-                        if (action.morph.creatureId !=0 || action.morph.modelId !=0)
+                        if (action.morph.creatureId != 0 || action.morph.modelId != 0)
                         {
                             if (action.morph.creatureId && !sCreatureStorage.LookupEntry<CreatureInfo>(action.morph.creatureId))
                             {
-                                sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent Creature entry %u.", i, j+1, action.morph.creatureId);
+                                sLog.outErrorEventAI("Event %u Action %u uses nonexistent Creature entry %u.", i, j + 1, action.morph.creatureId);
                                 action.morph.creatureId = 0;
                             }
 
@@ -555,12 +586,12 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                             {
                                 if (action.morph.creatureId)
                                 {
-                                    sLog.outErrorDb("CreatureEventAI:  Event %u Action %u have unused ModelId %u with also set creature id %u.", i, j+1, action.morph.modelId,action.morph.creatureId);
+                                    sLog.outErrorEventAI("Event %u Action %u have unused ModelId %u with also set creature id %u.", i, j + 1, action.morph.modelId, action.morph.creatureId);
                                     action.morph.modelId = 0;
                                 }
                                 else if (!sCreatureDisplayInfoStore.LookupEntry(action.morph.modelId))
                                 {
-                                    sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent ModelId %u.", i, j+1, action.morph.modelId);
+                                    sLog.outErrorEventAI("Event %u Action %u uses nonexistent ModelId %u.", i, j + 1, action.morph.modelId);
                                     action.morph.modelId = 0;
                                 }
                             }
@@ -568,196 +599,205 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                         break;
                     case ACTION_T_SOUND:
                         if (!sSoundEntriesStore.LookupEntry(action.sound.soundId))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent SoundID %u.", i, j+1, action.sound.soundId);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent SoundID %u.", i, j + 1, action.sound.soundId);
                         break;
                     case ACTION_T_EMOTE:
                         if (!sEmotesStore.LookupEntry(action.emote.emoteId))
-                            sLog.outErrorDb("CreatureEventAI: Event %u Action %u param1 (EmoteId: %u) are not valid.", i, j+1, action.emote.emoteId);
+                            sLog.outErrorEventAI("Event %u Action %u param1 (EmoteId: %u) are not valid.", i, j + 1, action.emote.emoteId);
                         break;
                     case ACTION_T_RANDOM_SOUND:
                         if (!sSoundEntriesStore.LookupEntry(action.random_sound.soundId1))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u param1 uses nonexistent SoundID %u.", i, j+1, action.random_sound.soundId1);
+                            sLog.outErrorEventAI("Event %u Action %u param1 uses nonexistent SoundID %u.", i, j + 1, action.random_sound.soundId1);
                         if (action.random_sound.soundId2 >= 0 && !sSoundEntriesStore.LookupEntry(action.random_sound.soundId2))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u param2 uses nonexistent SoundID %u.", i, j+1, action.random_sound.soundId2);
+                            sLog.outErrorEventAI("Event %u Action %u param2 uses nonexistent SoundID %u.", i, j + 1, action.random_sound.soundId2);
                         if (action.random_sound.soundId3 >= 0 && !sSoundEntriesStore.LookupEntry(action.random_sound.soundId3))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u param3 uses nonexistent SoundID %u.", i, j+1, action.random_sound.soundId3);
+                            sLog.outErrorEventAI("Event %u Action %u param3 uses nonexistent SoundID %u.", i, j + 1, action.random_sound.soundId3);
                         break;
                     case ACTION_T_RANDOM_EMOTE:
                         if (!sEmotesStore.LookupEntry(action.random_emote.emoteId1))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u param1 (EmoteId: %u) are not valid.", i, j+1, action.random_emote.emoteId1);
+                            sLog.outErrorEventAI("Event %u Action %u param1 (EmoteId: %u) are not valid.", i, j + 1, action.random_emote.emoteId1);
                         if (action.random_emote.emoteId2 >= 0 && !sEmotesStore.LookupEntry(action.random_emote.emoteId2))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u param2 (EmoteId: %u) are not valid.", i, j+1, action.random_emote.emoteId2);
+                            sLog.outErrorEventAI("Event %u Action %u param2 (EmoteId: %u) are not valid.", i, j + 1, action.random_emote.emoteId2);
                         if (action.random_emote.emoteId3 >= 0 && !sEmotesStore.LookupEntry(action.random_emote.emoteId3))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u param3 (EmoteId: %u) are not valid.", i, j+1, action.random_emote.emoteId3);
+                            sLog.outErrorEventAI("Event %u Action %u param3 (EmoteId: %u) are not valid.", i, j + 1, action.random_emote.emoteId3);
                         break;
                     case ACTION_T_CAST:
                     {
-                        const SpellEntry *spell = sSpellStore.LookupEntry(action.cast.spellId);
+                        const SpellEntry* spell = sSpellStore.LookupEntry(action.cast.spellId);
                         if (!spell)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent SpellID %u.", i, j+1, action.cast.spellId);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent SpellID %u.", i, j + 1, action.cast.spellId);
                         /* FIXME: temp.raw.param3 not have event tipes with recovery time in it....
                         else
                         {
                             if (spell->RecoveryTime > 0 && temp.event_flags & EFLAG_REPEATABLE)
                             {
-                                //output as debug for now, also because there's no general rule all spells have RecoveryTime
+                                // output as debug for now, also because there's no general rule all spells have RecoveryTime
                                 if (temp.event_param3 < spell->RecoveryTime)
                                     DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "CreatureEventAI:  Event %u Action %u uses SpellID %u but cooldown is longer(%u) than minumum defined in event param3(%u).", i, j+1,action.cast.spellId, spell->RecoveryTime, temp.event_param3);
                             }
                         }
                         */
 
-                        //Cast is always triggered if target is forced to cast on self
+                        // Cast is always triggered if target is forced to cast on self
                         if (action.cast.castFlags & CAST_FORCE_TARGET_SELF)
                             action.cast.castFlags |= CAST_TRIGGERED;
 
-                        if (action.cast.target >= TARGET_T_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
+                        IsValidTargetType(temp.event_type, action.type, action.cast.target, i, j + 1);
+
+                        // Some Advanced target type checks - Can have false positives
+                        if (!sLog.HasLogFilter(LOG_FILTER_EVENT_AI_DEV) && spell)
+                        {
+                            // spell must be cast on self, but is not
+                            if ((IsOnlySelfTargeting(spell) || spell->rangeIndex == SPELL_RANGE_IDX_SELF_ONLY) && action.cast.target != TARGET_T_SELF && !(action.cast.castFlags & CAST_FORCE_TARGET_SELF))
+                                sLog.outErrorEventAI("Event %u Action %u uses SpellID %u that must be self cast (target is %u)", i, j + 1, action.cast.spellId, action.cast.target);
+
+                            // TODO: spell must be cast on enemy, but is not
+
+                            // used TARGET_T_ACTION_INVOKER, but likely should be _INVOKER_OWNER instead
+                            if (action.cast.target == TARGET_T_ACTION_INVOKER &&
+                                    (IsSpellHaveEffect(spell, SPELL_EFFECT_QUEST_COMPLETE) || IsSpellHaveEffect(spell, SPELL_EFFECT_CREATE_RANDOM_ITEM) || IsSpellHaveEffect(spell, SPELL_EFFECT_DUMMY)
+                                     || IsSpellHaveEffect(spell, SPELL_EFFECT_KILL_CREDIT_PERSONAL) || IsSpellHaveEffect(spell, SPELL_EFFECT_KILL_CREDIT_GROUP)))
+                                sLog.outErrorEventAI("Event %u Action %u has TARGET_T_ACTION_INVOKER(%u) target type, but should have TARGET_T_ACTION_INVOKER_OWNER(%u).", i, j + 1, TARGET_T_ACTION_INVOKER, TARGET_T_ACTION_INVOKER_OWNER);
+
+                            // Spell that should only target players, but could get any
+                            if (spell->HasAttribute(SPELL_ATTR_EX3_TARGET_ONLY_PLAYER) &&
+                                  (action.cast.target == TARGET_T_ACTION_INVOKER || action.cast.target == TARGET_T_HOSTILE_RANDOM || action.cast.target == TARGET_T_HOSTILE_RANDOM_NOT_TOP))
+                                sLog.outErrorEventAI("Event %u Action %u uses Target type %u for a spell (%u) that should only target players. This could be wrong.", i, j + 1, action.cast.target, action.cast.spellId);
+                        }
                         break;
                     }
                     case ACTION_T_SUMMON:
                         if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.summon.creatureId))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.summon.creatureId);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent creature entry %u.", i, j + 1, action.summon.creatureId);
 
-                        if (action.summon.target >= TARGET_T_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
+                        IsValidTargetType(temp.event_type, action.type, action.summon.target, i, j + 1);
                         break;
                     case ACTION_T_THREAT_SINGLE_PCT:
                         if (std::abs(action.threat_single_pct.percent) > 100)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses invalid percent value %u.", i, j+1, action.threat_single_pct.percent);
-                        if (action.threat_single_pct.target >= TARGET_T_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
+                            sLog.outErrorEventAI("Event %u Action %u uses invalid percent value %u.", i, j + 1, action.threat_single_pct.percent);
+                        IsValidTargetType(temp.event_type, action.type, action.threat_single_pct.target, i, j + 1);
                         break;
                     case ACTION_T_THREAT_ALL_PCT:
                         if (std::abs(action.threat_all_pct.percent) > 100)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses invalid percent value %u.", i, j+1, action.threat_all_pct.percent);
+                            sLog.outErrorEventAI("Event %u Action %u uses invalid percent value %u.", i, j + 1, action.threat_all_pct.percent);
                         break;
                     case ACTION_T_QUEST_EVENT:
                         if (Quest const* qid = sObjectMgr.GetQuestTemplate(action.quest_event.questId))
                         {
                             if (!qid->HasSpecialFlag(QUEST_SPECIAL_FLAG_EXPLORATION_OR_EVENT))
-                                sLog.outErrorDb("CreatureEventAI:  Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j+1, action.quest_event.questId);
+                                sLog.outErrorEventAI("Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j + 1, action.quest_event.questId);
                         }
                         else
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent Quest entry %u.", i, j+1, action.quest_event.questId);
-
-                        if (action.quest_event.target >= TARGET_T_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent Quest entry %u.", i, j + 1, action.quest_event.questId);
 
+                        IsValidTargetType(temp.event_type, action.type, action.quest_event.target, i, j + 1);
                         break;
                     case ACTION_T_CAST_EVENT:
                         if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.cast_event.creatureId))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.cast_event.creatureId);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent creature entry %u.", i, j + 1, action.cast_event.creatureId);
                         if (!sSpellStore.LookupEntry(action.cast_event.spellId))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent SpellID %u.", i, j+1, action.cast_event.spellId);
-                        if (action.cast_event.target >= TARGET_T_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent SpellID %u.", i, j + 1, action.cast_event.spellId);
+                        IsValidTargetType(temp.event_type, action.type, action.cast_event.target, i, j + 1);
                         break;
                     case ACTION_T_SET_UNIT_FIELD:
                         if (action.set_unit_field.field < OBJECT_END || action.set_unit_field.field >= UNIT_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u param1 (UNIT_FIELD*). Index out of range for intended use.", i, j+1);
-                        if (action.set_unit_field.target >= TARGET_T_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
+                            sLog.outErrorEventAI("Event %u Action %u param1 (UNIT_FIELD*). Index out of range for intended use.", i, j + 1);
+                        IsValidTargetType(temp.event_type, action.type, action.set_unit_field.target, i, j + 1);
                         break;
                     case ACTION_T_SET_UNIT_FLAG:
                     case ACTION_T_REMOVE_UNIT_FLAG:
-                        if (action.unit_flag.target >= TARGET_T_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
+                        IsValidTargetType(temp.event_type, action.type, action.unit_flag.target, i, j + 1);
                         break;
                     case ACTION_T_SET_PHASE:
                         if (action.set_phase.phase >= MAX_PHASE)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u attempts to set phase >= %u. Phase mask cannot be used past phase %u.", i, j+1, MAX_PHASE, MAX_PHASE-1);
+                            sLog.outErrorEventAI("Event %u Action %u attempts to set phase >= %u. Phase mask cannot be used past phase %u.", i, j + 1, MAX_PHASE, MAX_PHASE - 1);
                         break;
                     case ACTION_T_INC_PHASE:
                         if (action.set_inc_phase.step == 0)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u is incrementing phase by 0. Was this intended?", i, j+1);
-                        else if (std::abs(action.set_inc_phase.step) > MAX_PHASE-1)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u is change phase by too large for any use %i.", i, j+1, action.set_inc_phase.step);
+                            sLog.outErrorEventAI("Event %u Action %u is incrementing phase by 0. Was this intended?", i, j + 1);
+                        else if (std::abs(action.set_inc_phase.step) > MAX_PHASE - 1)
+                            sLog.outErrorEventAI("Event %u Action %u is change phase by too large for any use %i.", i, j + 1, action.set_inc_phase.step);
                         break;
                     case ACTION_T_QUEST_EVENT_ALL:
                         if (Quest const* qid = sObjectMgr.GetQuestTemplate(action.quest_event_all.questId))
                         {
                             if (!qid->HasSpecialFlag(QUEST_SPECIAL_FLAG_EXPLORATION_OR_EVENT))
-                                sLog.outErrorDb("CreatureEventAI:  Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j+1, action.quest_event_all.questId);
+                                sLog.outErrorEventAI("Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j + 1, action.quest_event_all.questId);
                         }
                         else
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent Quest entry %u.", i, j+1, action.quest_event_all.questId);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent Quest entry %u.", i, j + 1, action.quest_event_all.questId);
                         break;
                     case ACTION_T_CAST_EVENT_ALL:
                         if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.cast_event_all.creatureId))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.cast_event_all.creatureId);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent creature entry %u.", i, j + 1, action.cast_event_all.creatureId);
                         if (!sSpellStore.LookupEntry(action.cast_event_all.spellId))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent SpellID %u.", i, j+1, action.cast_event_all.spellId);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent SpellID %u.", i, j + 1, action.cast_event_all.spellId);
                         break;
                     case ACTION_T_REMOVEAURASFROMSPELL:
                         if (!sSpellStore.LookupEntry(action.remove_aura.spellId))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent SpellID %u.", i, j+1, action.remove_aura.spellId);
-                        if (action.remove_aura.target >= TARGET_T_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent SpellID %u.", i, j + 1, action.remove_aura.spellId);
+                        IsValidTargetType(temp.event_type, action.type, action.remove_aura.target, i, j + 1);
                         break;
-                    case ACTION_T_RANDOM_PHASE:             //PhaseId1, PhaseId2, PhaseId3
+                    case ACTION_T_RANDOM_PHASE:             // PhaseId1, PhaseId2, PhaseId3
                         if (action.random_phase.phase1 >= MAX_PHASE)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u attempts to set phase1 >= %u. Phase mask cannot be used past phase %u.", i, j+1, MAX_PHASE, MAX_PHASE-1);
+                            sLog.outErrorEventAI("Event %u Action %u attempts to set phase1 >= %u. Phase mask cannot be used past phase %u.", i, j + 1, MAX_PHASE, MAX_PHASE - 1);
                         if (action.random_phase.phase2 >= MAX_PHASE)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u attempts to set phase2 >= %u. Phase mask cannot be used past phase %u.", i, j+1, MAX_PHASE, MAX_PHASE-1);
+                            sLog.outErrorEventAI("Event %u Action %u attempts to set phase2 >= %u. Phase mask cannot be used past phase %u.", i, j + 1, MAX_PHASE, MAX_PHASE - 1);
                         if (action.random_phase.phase3 >= MAX_PHASE)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u attempts to set phase3 >= %u. Phase mask cannot be used past phase %u.", i, j+1, MAX_PHASE, MAX_PHASE-1);
+                            sLog.outErrorEventAI("Event %u Action %u attempts to set phase3 >= %u. Phase mask cannot be used past phase %u.", i, j + 1, MAX_PHASE, MAX_PHASE - 1);
                         break;
-                    case ACTION_T_RANDOM_PHASE_RANGE:       //PhaseMin, PhaseMax
+                    case ACTION_T_RANDOM_PHASE_RANGE:       // PhaseMin, PhaseMax
                         if (action.random_phase_range.phaseMin >= MAX_PHASE)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u attempts to set phaseMin >= %u. Phase mask cannot be used past phase %u.", i, j+1, MAX_PHASE, MAX_PHASE-1);
+                            sLog.outErrorEventAI("Event %u Action %u attempts to set phaseMin >= %u. Phase mask cannot be used past phase %u.", i, j + 1, MAX_PHASE, MAX_PHASE - 1);
                         if (action.random_phase_range.phaseMin >= MAX_PHASE)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u attempts to set phaseMax >= %u. Phase mask cannot be used past phase %u.", i, j+1, MAX_PHASE, MAX_PHASE-1);
+                            sLog.outErrorEventAI("Event %u Action %u attempts to set phaseMax >= %u. Phase mask cannot be used past phase %u.", i, j + 1, MAX_PHASE, MAX_PHASE - 1);
                         if (action.random_phase_range.phaseMin >= action.random_phase_range.phaseMax)
                         {
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u attempts to set phaseMax <= phaseMin.", i, j+1);
-                            std::swap(action.random_phase_range.phaseMin,action.random_phase_range.phaseMax);
+                            sLog.outErrorEventAI("Event %u Action %u attempts to set phaseMax <= phaseMin.", i, j + 1);
+                            std::swap(action.random_phase_range.phaseMin, action.random_phase_range.phaseMax);
                             // equal case processed at call
                         }
                         break;
                     case ACTION_T_SUMMON_ID:
                         if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.summon_id.creatureId))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.summon_id.creatureId);
-                        if (action.summon_id.target >= TARGET_T_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent creature entry %u.", i, j + 1, action.summon_id.creatureId);
+                        IsValidTargetType(temp.event_type, action.type, action.summon_id.target, i, j + 1);
                         if (m_CreatureEventAI_Summon_Map.find(action.summon_id.spawnId) == m_CreatureEventAI_Summon_Map.end())
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u summons missing CreatureEventAI_Summon %u", i, j+1, action.summon_id.spawnId);
+                            sLog.outErrorEventAI("Event %u Action %u summons missing CreatureEventAI_Summon %u", i, j + 1, action.summon_id.spawnId);
                         break;
                     case ACTION_T_KILLED_MONSTER:
                         if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.killed_monster.creatureId))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.killed_monster.creatureId);
-                        if (action.killed_monster.target >= TARGET_T_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent creature entry %u.", i, j + 1, action.killed_monster.creatureId);
+                        IsValidTargetType(temp.event_type, action.type, action.killed_monster.target, i, j + 1);
                         break;
                     case ACTION_T_SET_INST_DATA:
                         if (!(temp.event_flags & EFLAG_DIFFICULTY_ALL))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u. Cannot set instance data without difficulty event flags.", i, j+1);
+                            sLog.outErrorEventAI("Event %u Action %u. Cannot set instance data without difficulty event flags.", i, j + 1);
                         if (action.set_inst_data.value > 4/*SPECIAL*/)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u attempts to set instance data above encounter state 4. Custom case?", i, j+1);
+                            sLog.outErrorEventAI("Event %u Action %u attempts to set instance data above encounter state 4. Custom case?", i, j + 1);
                         break;
                     case ACTION_T_SET_INST_DATA64:
                         if (!(temp.event_flags & EFLAG_DIFFICULTY_ALL))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u. Cannot set instance data without difficulty event flags.", i, j+1);
-                        if (action.set_inst_data64.target >= TARGET_T_END)
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
+                            sLog.outErrorEventAI("Event %u Action %u. Cannot set instance data without difficulty event flags.", i, j + 1);
+                        IsValidTargetType(temp.event_type, action.type, action.set_inst_data64.target, i, j + 1);
                         break;
                     case ACTION_T_UPDATE_TEMPLATE:
                         if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.update_template.creatureId))
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.update_template.creatureId);
+                            sLog.outErrorEventAI("Event %u Action %u uses nonexistent creature entry %u.", i, j + 1, action.update_template.creatureId);
                         break;
                     case ACTION_T_SET_SHEATH:
                         if (action.set_sheath.sheath >= MAX_SHEATH_STATE)
                         {
-                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses wrong sheath state %u.", i, j+1, action.set_sheath.sheath);
+                            sLog.outErrorEventAI("Event %u Action %u uses wrong sheath state %u.", i, j + 1, action.set_sheath.sheath);
                             action.set_sheath.sheath = SHEATH_STATE_UNARMED;
                         }
                         break;
                     case ACTION_T_SET_INVINCIBILITY_HP_LEVEL:
-                        if(action.invincibility_hp_level.is_percent)
+                        if (action.invincibility_hp_level.is_percent)
                         {
-                            if(action.invincibility_hp_level.hp_level > 100)
+                            if (action.invincibility_hp_level.hp_level > 100)
                             {
-                                sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses wrong percent value %u.", i, j+1, action.invincibility_hp_level.hp_level);
+                                sLog.outErrorEventAI("Event %u Action %u uses wrong percent value %u.", i, j + 1, action.invincibility_hp_level.hp_level);
                                 action.invincibility_hp_level.hp_level = 100;
                             }
                         }
@@ -767,7 +807,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                         {
                             if (action.mount.creatureId && !sCreatureStorage.LookupEntry<CreatureInfo>(action.mount.creatureId))
                             {
-                                sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent Creature entry %u.", i, j+1, action.mount.creatureId);
+                                sLog.outErrorEventAI("Event %u Action %u uses nonexistent Creature entry %u.", i, j + 1, action.mount.creatureId);
                                 action.morph.creatureId = 0;
                             }
 
@@ -775,57 +815,96 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                             {
                                 if (action.mount.creatureId)
                                 {
-                                    sLog.outErrorDb("CreatureEventAI:  Event %u Action %u have unused ModelId %u with also set creature id %u.", i, j+1, action.mount.modelId, action.mount.creatureId);
+                                    sLog.outErrorEventAI("Event %u Action %u have unused ModelId %u with also set creature id %u.", i, j + 1, action.mount.modelId, action.mount.creatureId);
                                     action.mount.modelId = 0;
                                 }
                                 else if (!sCreatureDisplayInfoStore.LookupEntry(action.mount.modelId))
                                 {
-                                    sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses nonexistent ModelId %u.", i, j+1, action.mount.modelId);
+                                    sLog.outErrorEventAI("Event %u Action %u uses nonexistent ModelId %u.", i, j + 1, action.mount.modelId);
                                     action.mount.modelId = 0;
                                 }
                             }
                         }
                         break;
-                    case ACTION_T_EVADE:                    //No Params
-                    case ACTION_T_FLEE_FOR_ASSIST:          //No Params
-                    case ACTION_T_DIE:                      //No Params
-                    case ACTION_T_ZONE_COMBAT_PULSE:        //No Params
-                    case ACTION_T_FORCE_DESPAWN:            //Delay
-                    case ACTION_T_AUTO_ATTACK:              //AllowAttackState (0 = stop attack, anything else means continue attacking)
-                    case ACTION_T_COMBAT_MOVEMENT:          //AllowCombatMovement (0 = stop combat based movement, anything else continue attacking)
-                    case ACTION_T_RANGED_MOVEMENT:          //Distance, Angle
-                    case ACTION_T_CALL_FOR_HELP:            //Distance
+                    case ACTION_T_EVADE:                    // No Params
+                    case ACTION_T_FLEE_FOR_ASSIST:          // No Params
+                    case ACTION_T_DIE:                      // No Params
+                    case ACTION_T_ZONE_COMBAT_PULSE:        // No Params
+                    case ACTION_T_FORCE_DESPAWN:            // Delay
+                    case ACTION_T_AUTO_ATTACK:              // AllowAttackState (0 = stop attack, anything else means continue attacking)
+                    case ACTION_T_COMBAT_MOVEMENT:          // AllowCombatMovement (0 = stop combat based movement, anything else continue attacking)
+                    case ACTION_T_RANGED_MOVEMENT:          // Distance, Angle
+                    case ACTION_T_CALL_FOR_HELP:            // Distance
                         break;
 
                     case ACTION_T_RANDOM_SAY:
                     case ACTION_T_RANDOM_YELL:
                     case ACTION_T_RANDOM_TEXTEMOTE:
-                        sLog.outErrorDb("CreatureEventAI:  Event %u Action %u currently unused ACTION type. Did you forget to update database?", i, j+1);
+                        sLog.outErrorEventAI("Event %u Action %u currently unused ACTION type. Did you forget to update database?", i, j + 1);
+                        break;
+
+                    case ACTION_T_THROW_AI_EVENT:
+                        if (action.throwEvent.eventType >= MAXIMAL_AI_EVENT_EVENTAI)
+                        {
+                            sLog.outErrorEventAI("Event %u Action %u uses invalid event type %u (must be less than %u), skipping", i, j + 1, action.throwEvent.eventType, MAXIMAL_AI_EVENT_EVENTAI);
+                            continue;
+                        }
+                        if (action.throwEvent.radius > SIZE_OF_GRIDS)
+                            sLog.outErrorEventAI("Event %u Action %u uses unexpectedly huge radius %u (expected to be less than %f)", i, j + 1, action.throwEvent.radius, SIZE_OF_GRIDS);
+
+                        if (action.throwEvent.radius == 0)
+                        {
+                            sLog.outErrorEventAI("Event %u Action %u uses unexpected radius 0 (set to %f of CONFIG_FLOAT_CREATURE_FAMILY_ASSISTANCE_RADIUS)", i, j + 1, sWorld.getConfig(CONFIG_FLOAT_CREATURE_FAMILY_ASSISTANCE_RADIUS));
+                            action.throwEvent.radius = uint32(sWorld.getConfig(CONFIG_FLOAT_CREATURE_FAMILY_ASSISTANCE_RADIUS));
+                        }
+
+                        break;
+                    case ACTION_T_SET_THROW_MASK:
+                        if (action.setThrowMask.eventTypeMask & ~((1 << MAXIMAL_AI_EVENT_EVENTAI) - 1))
+                        {
+                            sLog.outErrorEventAI("Event %u Action %u uses invalid AIEvent-typemask %u (must be smaller than %u)", i, j + 1, action.setThrowMask.eventTypeMask, MAXIMAL_AI_EVENT_EVENTAI << 1);
+                            continue;
+                        }
                         break;
+                    case ACTION_T_SET_STAND_STATE:
+                        if (action.setStandState.standState >= MAX_UNIT_STAND_STATE)
+                        {
+                            sLog.outErrorEventAI("Event %u Action %u uses invalid unit stand state %u (must be smaller than %u)", i, j + 1, action.setStandState.standState, MAX_UNIT_STAND_STATE);
+                            continue;
+                        }
+                        break;
+
                     default:
-                        sLog.outErrorDb("CreatureEventAI:  Event %u Action %u have currently not checked at load action type (%u). Need check code update?", i, j+1, temp.action[j].type);
+                        sLog.outErrorEventAI("Event %u Action %u have currently not checked at load action type (%u). Need check code update?", i, j + 1, temp.action[j].type);
                         break;
                 }
             }
 
-            //Add to list
+            // Add to list
             m_CreatureEventAI_Event_Map[creature_id].push_back(temp);
             ++Count;
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
 
         delete result;
+        m_usedTextsAmount = usedTextIds.size();
 
         // post check
-        for (uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i)
+        for (uint32 i = 1; i < sCreatureStorage.GetMaxEntry(); ++i)
         {
             if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
             {
                 bool ainame = strcmp(cInfo->AIName, "EventAI") == 0;
                 bool hasevent = m_CreatureEventAI_Event_Map.find(i) != m_CreatureEventAI_Event_Map.end();
                 if (ainame && !hasevent)
-                    sLog.outErrorDb("CreatureEventAI: EventAI not has script for creature entry (%u), but AIName = '%s'.", i, cInfo->AIName);
+                    sLog.outErrorEventAI("EventAI not has script for creature entry (%u), but AIName = '%s'.", i, cInfo->AIName);
                 else if (!ainame && hasevent)
-                    sLog.outErrorDb("CreatureEventAI: EventAI has script for creature entry (%u), but AIName = '%s' instead 'EventAI'.", i, cInfo->AIName);
+                {
+                    if (cInfo->ScriptID)
+                        sLog.outErrorEventAI("EventAI has script for creature entry (%u), but AIName = '%s' instead 'EventAI'. ScriptName = '%s'", i, cInfo->AIName, sScriptMgr.GetScriptName(cInfo->ScriptID));
+                    else
+                        sLog.outErrorEventAI("EventAI has script for creature entry (%u), but AIName = '%s' instead 'EventAI'.", i, cInfo->AIName);
+                }
             }
         }
 
@@ -834,7 +913,8 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
 
         sLog.outString();
         sLog.outString(">> Loaded %u CreatureEventAI scripts", Count);
-    }else
+    }
+    else
     {
         BarGoLink bar(1);
         bar.step();
diff --git a/src/game/CreatureEventAIMgr.h b/src/game/CreatureEventAIMgr.h
index 533f1a30f95..dd9a385ab9f 100644
--- a/src/game/CreatureEventAIMgr.h
+++ b/src/game/CreatureEventAIMgr.h
@@ -25,8 +25,8 @@
 class CreatureEventAIMgr
 {
     public:
-        CreatureEventAIMgr(){};
-        ~CreatureEventAIMgr(){};
+        CreatureEventAIMgr() : m_usedTextsAmount(0) {};
+        ~CreatureEventAIMgr() {};
 
         void LoadCreatureEventAI_Texts(bool check_entry_use);
         void LoadCreatureEventAI_Summons(bool check_entry_use);
@@ -34,7 +34,6 @@ class CreatureEventAIMgr
 
         CreatureEventAI_Event_Map  const& GetCreatureEventAIMap()       const { return m_CreatureEventAI_Event_Map; }
         CreatureEventAI_Summon_Map const& GetCreatureEventAISummonMap() const { return m_CreatureEventAI_Summon_Map; }
-        CreatureEventAI_TextMap    const& GetCreatureEventAITextMap()   const { return m_CreatureEventAI_TextMap; }
 
     private:
         void CheckUnusedAITexts();
@@ -42,7 +41,8 @@ class CreatureEventAIMgr
 
         CreatureEventAI_Event_Map  m_CreatureEventAI_Event_Map;
         CreatureEventAI_Summon_Map m_CreatureEventAI_Summon_Map;
-        CreatureEventAI_TextMap    m_CreatureEventAI_TextMap;
+
+        uint32 m_usedTextsAmount;
 };
 
 #define sEventAIMgr MaNGOS::Singleton<CreatureEventAIMgr>::Instance()
diff --git a/src/game/CreatureLinkingMgr.cpp b/src/game/CreatureLinkingMgr.cpp
index 9b68dd4632c..4e28a2b4402 100644
--- a/src/game/CreatureLinkingMgr.cpp
+++ b/src/game/CreatureLinkingMgr.cpp
@@ -33,7 +33,7 @@
  */
 
 #include "CreatureLinkingMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "ProgressBar.h"
 #include "Database/DatabaseEnv.h"
 #include "ObjectMgr.h"
@@ -68,10 +68,9 @@ void CreatureLinkingMgr::LoadFromDB()
     m_eventTriggers.clear();                              // master
     m_eventGuidTriggers.clear();
 
-    QueryResult* result = WorldDatabase.Query("SELECT entry, map, master_entry, flag, search_range FROM creature_linking_template");
-
+    // Load `creature_linking_template`
     uint32 count = 0;
-
+    QueryResult* result = WorldDatabase.Query("SELECT entry, map, master_entry, flag, search_range FROM creature_linking_template");
     if (!result)
     {
         BarGoLink bar(1);
@@ -79,58 +78,57 @@ void CreatureLinkingMgr::LoadFromDB()
 
         sLog.outString(">> Table creature_linking_template is empty.");
         sLog.outString();
-
-        return;
     }
-
-    BarGoLink bar((int)result->GetRowCount());
-    do
+    else
     {
-        bar.step();
+        BarGoLink bar((int)result->GetRowCount());
+        do
+        {
+            bar.step();
 
-        Field* fields = result->Fetch();
-        CreatureLinkingInfo tmp;
+            Field* fields = result->Fetch();
+            CreatureLinkingInfo tmp;
 
-        uint32 entry            = fields[0].GetUInt32();
-        tmp.mapId               = fields[1].GetUInt32();
-        tmp.masterId            = fields[2].GetUInt32();
-        tmp.linkingFlag         = fields[3].GetUInt16();
-        tmp.searchRange         = fields[4].GetUInt16();
-        tmp.masterDBGuid        = 0;                        // Will be initialized for unique mobs later (only for spawning dependend)
+            uint32 entry            = fields[0].GetUInt32();
+            tmp.mapId               = fields[1].GetUInt32();
+            tmp.masterId            = fields[2].GetUInt32();
+            tmp.linkingFlag         = fields[3].GetUInt16();
+            tmp.searchRange         = fields[4].GetUInt16();
+            tmp.masterDBGuid        = 0;                        // Will be initialized for unique mobs later (only for spawning dependend)
 
-        if (!IsLinkingEntryValid(entry, &tmp, true))
-            continue;
+            if (!IsLinkingEntryValid(entry, &tmp, true))
+                continue;
 
-        // Store db-guid for master of whom pTmp is spawn dependend (only non-local bosses)
-        if (tmp.searchRange == 0 && tmp.linkingFlag & (FLAG_CANT_SPAWN_IF_BOSS_DEAD | FLAG_CANT_SPAWN_IF_BOSS_ALIVE))
-        {
-            if (QueryResult* guid_result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE id=%u AND map=%u LIMIT 1", tmp.masterId, tmp.mapId))
+            // Store db-guid for master of whom pTmp is spawn dependend (only non-local bosses)
+            if (tmp.searchRange == 0 && tmp.linkingFlag & (FLAG_CANT_SPAWN_IF_BOSS_DEAD | FLAG_CANT_SPAWN_IF_BOSS_ALIVE))
             {
-                tmp.masterDBGuid = (*guid_result)[0].GetUInt32();
+                if (QueryResult* guid_result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE id=%u AND map=%u LIMIT 1", tmp.masterId, tmp.mapId))
+                {
+                    tmp.masterDBGuid = (*guid_result)[0].GetUInt32();
 
-                delete guid_result;
+                    delete guid_result;
+                }
             }
-        }
 
-        ++count;
+            ++count;
 
-        // Add it to the map
-        m_creatureLinkingMap.insert(CreatureLinkingMap::value_type(entry, tmp));
+            // Add it to the map
+            m_creatureLinkingMap.insert(CreatureLinkingMap::value_type(entry, tmp));
 
-        // Store master_entry
-        m_eventTriggers.insert(tmp.masterId);
-    }
-    while (result->NextRow());
-
-    sLog.outString();
-    sLog.outString(">> Loaded creature linking for %u creature-entries", count);
+            // Store master_entry
+            m_eventTriggers.insert(tmp.masterId);
+        }
+        while (result->NextRow());
 
-    delete result;
+        sLog.outString();
+        sLog.outString(">> Loaded creature linking for %u creature-entries", count);
 
-    result = WorldDatabase.Query("SELECT guid, master_guid, flag FROM creature_linking");
+        delete result;
+    }
 
+    // Load `creature_linking`
     count = 0;
-
+    result = WorldDatabase.Query("SELECT guid, master_guid, flag FROM creature_linking");
     if (!result)
     {
         BarGoLink bar(1);
@@ -223,14 +221,14 @@ bool CreatureLinkingMgr::IsLinkingEntryValid(uint32 slaveEntry, CreatureLinkingI
         }
     }
 
-    if (pTmp->linkingFlag & ~(LINKING_FLAG_INVALID - 1)  || pTmp->linkingFlag == 0)
+    if ((pTmp->linkingFlag & ~(LINKING_FLAG_INVALID - 1))  || pTmp->linkingFlag == 0)
     {
         sLog.outErrorDb("`creature_linking%s` has invalid flag, (entry: %u, map: %u, flags: %u), skipped", byEntry ? "_template" : "", slaveEntry, pTmp->mapId, pTmp->linkingFlag);
         return false;
     }
 
     // Additional checks, depending on flags
-    if (pTmp->linkingFlag & FLAG_DESPAWN_ON_RESPAWN && slaveEntry == pTmp->masterId)
+    if ((pTmp->linkingFlag & FLAG_DESPAWN_ON_RESPAWN) && slaveEntry == pTmp->masterId)
     {
         sLog.outErrorDb("`creature_linking%s` has pointless FLAG_DESPAWN_ON_RESPAWN for self, (entry: %u, map: %u), skipped", byEntry ? "_template" : "", slaveEntry, pTmp->mapId);
         return false;
@@ -239,10 +237,10 @@ bool CreatureLinkingMgr::IsLinkingEntryValid(uint32 slaveEntry, CreatureLinkingI
     if (byEntry)
     {
         // Check for uniqueness of mob whom is followed, on whom spawning is dependend
-        if (pTmp->searchRange == 0 && pTmp->linkingFlag & (FLAG_FOLLOW | FLAG_CANT_SPAWN_IF_BOSS_DEAD | FLAG_CANT_SPAWN_IF_BOSS_ALIVE))
+        if (pTmp->searchRange == 0 && (pTmp->linkingFlag & (FLAG_FOLLOW | FLAG_CANT_SPAWN_IF_BOSS_DEAD | FLAG_CANT_SPAWN_IF_BOSS_ALIVE)))
         {
             // Painfully slow, needs better idea
-            QueryResult *result = WorldDatabase.PQuery("SELECT COUNT(guid) FROM creature WHERE id=%u AND map=%u", pTmp->masterId, pTmp->mapId);
+            QueryResult* result = WorldDatabase.PQuery("SELECT COUNT(guid) FROM creature WHERE id=%u AND map=%u", pTmp->masterId, pTmp->mapId);
             if (result)
             {
                 if ((*result)[0].GetUInt32() > 1)
@@ -296,7 +294,7 @@ bool CreatureLinkingMgr::IsSpawnedByLinkedMob(Creature* pCreature)
 {
     CreatureLinkingInfo const* pInfo = CreatureLinkingMgr::GetLinkedTriggerInformation(pCreature);
 
-    return pInfo && pInfo->linkingFlag & (FLAG_CANT_SPAWN_IF_BOSS_DEAD | FLAG_CANT_SPAWN_IF_BOSS_ALIVE) && (pInfo->masterDBGuid || pInfo->searchRange);
+    return pInfo && (pInfo->linkingFlag & (FLAG_CANT_SPAWN_IF_BOSS_DEAD | FLAG_CANT_SPAWN_IF_BOSS_ALIVE)) && (pInfo->masterDBGuid || pInfo->searchRange);
 }
 
 // This gives the information of a linked NPC (describes action when its ActionTrigger triggers)
@@ -334,7 +332,7 @@ void CreatureLinkingHolder::AddSlaveToHolder(Creature* pCreature)
             if (itr->second.linkingFlag == pInfo->linkingFlag)
             {
                 itr->second.linkedGuids.push_back(pCreature->GetObjectGuid());
-                pCreature = NULL;                               // Store that is was handled
+                pCreature = NULL;                           // Store that is was handled
                 break;
             }
         }
@@ -471,6 +469,11 @@ void CreatureLinkingHolder::DoCreatureLinkingEvent(CreatureLinkingEvent eventTyp
                     case LINKING_EVENT_RESPAWN:
                         if (pMaster->isAlive())
                             SetFollowing(pSource, pMaster);
+                        break;
+                    case LINKING_EVENT_DIE:                 // Nothing linked for this case
+                        break;
+                    default:
+                        break;
                 }
             }
         }
@@ -483,25 +486,26 @@ void CreatureLinkingHolder::ProcessSlaveGuidList(CreatureLinkingEvent eventType,
     if (!flag)
         return;
 
-    for (GuidList::iterator slave_itr = slaveGuidList.begin(); slave_itr != slaveGuidList.end();)
+    GuidList::iterator slave_itr = slaveGuidList.begin();
+    while (slave_itr != slaveGuidList.end())
     {
-        Creature* pSlave = pSource->GetMap()->GetCreature(*slave_itr);
-        if (!pSlave)
+        if (Creature* pSlave = pSource->GetMap()->GetCreature(*slave_itr))
         {
-            // Remove old guid first
-            slaveGuidList.erase(slave_itr++);
-            continue;
-        }
-
-        ++slave_itr;
+            ++slave_itr;
+            // Ignore Pets
+            if (pSlave->IsPet())
+                continue;
 
-        // Ignore Pets
-        if (pSlave->IsPet())
-            continue;
+            // Handle single slave
+            if (IsSlaveInRangeOfBoss(pSlave, pSource, searchRange))
+                ProcessSlave(eventType, pSource, flag, pSlave, pEnemy);
 
-        // Handle single slave
-        if (IsSlaveInRangeOfBoss(pSlave, pSource, searchRange))
-            ProcessSlave(eventType, pSource, flag, pSlave, pEnemy);
+        }
+        else
+        {
+            // Remove old guid
+            slave_itr = slaveGuidList.erase(slave_itr);
+        }
     }
 }
 
@@ -523,17 +527,17 @@ void CreatureLinkingHolder::ProcessSlave(CreatureLinkingEvent eventType, Creatur
             }
             break;
         case LINKING_EVENT_EVADE:
-            if (flag & FLAG_DESPAWN_ON_EVADE && pSlave->isAlive())
+            if ((flag & FLAG_DESPAWN_ON_EVADE) && pSlave->isAlive())
                 pSlave->ForcedDespawn();
-            if (flag & FLAG_RESPAWN_ON_EVADE && !pSlave->isAlive())
+            if ((flag & FLAG_RESPAWN_ON_EVADE) && !pSlave->isAlive())
                 pSlave->Respawn();
             break;
         case LINKING_EVENT_DIE:
-            if (flag & FLAG_SELFKILL_ON_DEATH && pSlave->isAlive())
-                pSlave->DealDamage(pSlave, pSlave->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
-            if (flag & FLAG_DESPAWN_ON_DEATH && pSlave->isAlive())
+            if ((flag & FLAG_SELFKILL_ON_DEATH) && pSlave->isAlive())
+                pSlave->KillSelf();
+            if ((flag & FLAG_DESPAWN_ON_DEATH) && pSlave->isAlive())
                 pSlave->ForcedDespawn();
-            if (flag & FLAG_RESPAWN_ON_DEATH && !pSlave->isAlive())
+            if ((flag & FLAG_RESPAWN_ON_DEATH) && !pSlave->isAlive())
                 pSlave->Respawn();
             break;
         case LINKING_EVENT_RESPAWN:
@@ -543,10 +547,10 @@ void CreatureLinkingHolder::ProcessSlave(CreatureLinkingEvent eventType, Creatur
                 if (!pSlave->isAlive() && pSlave->GetRespawnTime() > time(NULL))
                     pSlave->Respawn();
             }
-            else if (flag & FLAG_DESPAWN_ON_RESPAWN && pSlave->isAlive())
+            else if ((flag & FLAG_DESPAWN_ON_RESPAWN) && pSlave->isAlive())
                 pSlave->ForcedDespawn();
 
-            if (flag & FLAG_FOLLOW && pSlave->isAlive() && !pSlave->isInCombat())
+            if ((flag & FLAG_FOLLOW) && pSlave->isAlive() && !pSlave->isInCombat())
                 SetFollowing(pSlave, pSource);
 
             break;
@@ -566,7 +570,7 @@ void CreatureLinkingHolder::SetFollowing(Creature* pWho, Creature* pWhom)
     dy = sY - mY;
     dz = sZ - mZ;
 
-    float dist = sqrt(dx*dx + dy*dy + dz*dz);
+    float dist = sqrt(dx * dx + dy * dy + dz * dz);
     // REMARK: This code needs the same distance calculation that is used for following
     // Atm this means we have to subtract the bounding radiuses
     dist = dist - pWho->GetObjectBoundingRadius() - pWhom->GetObjectBoundingRadius();
@@ -595,7 +599,7 @@ bool CreatureLinkingHolder::IsSlaveInRangeOfBoss(Creature* pSlave, Creature* pBo
     dx = sX - mX;
     dy = sY - mY;
 
-    return dx*dx + dy*dy < searchRange*searchRange;
+    return dx * dx + dy * dy < searchRange * searchRange;
 }
 
 // Function to check if a passive spawning condition is met
diff --git a/src/game/CreatureLinkingMgr.h b/src/game/CreatureLinkingMgr.h
index 7c55f91d1f6..13082788d79 100644
--- a/src/game/CreatureLinkingMgr.h
+++ b/src/game/CreatureLinkingMgr.h
@@ -85,8 +85,8 @@ struct CreatureLinkingInfo
     uint32 mapId;
     uint32 masterId;
     uint32 masterDBGuid;
-    uint16 linkingFlag:16;
-    uint16 searchRange:16;
+    uint16 linkingFlag: 16;
+    uint16 searchRange: 16;
 };
 
 /**
@@ -160,12 +160,11 @@ class CreatureLinkingHolder
         bool TryFollowMaster(Creature* pCreature);
 
     private:
-        typedef std::list<ObjectGuid> GuidList;
         // Structure associated to a master (entry case)
         struct InfoAndGuids
         {
-            uint16 linkingFlag:16;
-            uint16 searchRange:16;
+            uint16 linkingFlag: 16;
+            uint16 searchRange: 16;
             GuidList linkedGuids;
         };
         // Structure associated to a master (guid case)
diff --git a/src/game/DBCEnums.h b/src/game/DBCEnums.h
index 48782c6795f..a33a541b523 100644
--- a/src/game/DBCEnums.h
+++ b/src/game/DBCEnums.h
@@ -57,25 +57,25 @@ enum AchievementFactionFlags
 
 enum AchievementFlags
 {
-    ACHIEVEMENT_FLAG_NONE                   = 0x00000000,
-    ACHIEVEMENT_FLAG_COUNTER                = 0x00000001,   // ACHIEVEMENT_FLAG_STATISTIC Just count statistic (never stop and complete)
-    ACHIEVEMENT_FLAG_UNK2                   = 0x00000002,   // ACHIEVEMENT_FLAG_HIDDEN not used
-    ACHIEVEMENT_FLAG_STORE_MAX_VALUE        = 0x00000004,   // ACHIEVEMENT_FLAG_HIDDEN_TILL_AWARDED Store only max value? used only in "Reach level xx"
-    ACHIEVEMENT_FLAG_SUMM                   = 0x00000008,   // ACHIEVEMENT_FLAG_CUMULATIVE Use summ criteria value from all requirements (and calculate max value)
-    ACHIEVEMENT_FLAG_MAX_USED               = 0x00000010,   // ACHIEVEMENT_FLAG_DISPLAY_HIGHEST Show max criteria (and calculate max value ??)
-    ACHIEVEMENT_FLAG_REQ_COUNT              = 0x00000020,   // ACHIEVEMENT_FLAG_CRITERIA_COUNT Use not zero req count (and calculate max value)
-    ACHIEVEMENT_FLAG_AVERAGE                = 0x00000040,   // ACHIEVEMENT_FLAG_AVG_PER_DAY Show as average value (value / time_in_days) depend from other flag (by def use last criteria value)
-    ACHIEVEMENT_FLAG_BAR                    = 0x00000080,   // ACHIEVEMENT_FLAG_HAS_PROGRESS_BAR Show as progress bar (value / max vale) depend from other flag (by def use last criteria value)
-    ACHIEVEMENT_FLAG_REALM_FIRST_REACH      = 0x00000100,   // ACHIEVEMENT_FLAG_SERVER_FIRST
-    ACHIEVEMENT_FLAG_REALM_FIRST_KILL       = 0x00000200,   //
-
+    ACHIEVEMENT_FLAG_NONE                    = 0x00000000,
+    ACHIEVEMENT_FLAG_COUNTER                 = 0x00000001,   // ACHIEVEMENT_FLAG_STATISTIC Just count statistic (never stop and complete)
+    ACHIEVEMENT_FLAG_HIDDEN                  = 0x00000002,   // ACHIEVEMENT_FLAG_HIDDEN Not show in client
+    ACHIEVEMENT_FLAG_STORE_MAX_VALUE         = 0x00000004,   // ACHIEVEMENT_FLAG_HIDDEN_TILL_AWARDED Store only max value? used only in "Reach level xx"
+    ACHIEVEMENT_FLAG_SUMM                    = 0x00000008,   // ACHIEVEMENT_FLAG_CUMULATIVE Use summ criteria value from all requirements (and calculate max value)
+    ACHIEVEMENT_FLAG_MAX_USED                = 0x00000010,   // ACHIEVEMENT_FLAG_DISPLAY_HIGHEST Show max criteria (and calculate max value ??)
+    ACHIEVEMENT_FLAG_REQ_COUNT               = 0x00000020,   // ACHIEVEMENT_FLAG_CRITERIA_COUNT Use not zero req count (and calculate max value)
+    ACHIEVEMENT_FLAG_AVERAGE                 = 0x00000040,   // ACHIEVEMENT_FLAG_AVG_PER_DAY Show as average value (value / time_in_days) depend from other flag (by def use last criteria value)
+    ACHIEVEMENT_FLAG_BAR                     = 0x00000080,   // ACHIEVEMENT_FLAG_HAS_PROGRESS_BAR Show as progress bar (value / max vale) depend from other flag (by def use last criteria value)
+    ACHIEVEMENT_FLAG_REALM_FIRST_REACH       = 0x00000100,   // ACHIEVEMENT_FLAG_SERVER_FIRST
+    ACHIEVEMENT_FLAG_REALM_FIRST_KILL        = 0x00000200,   //
+    ACHIEVEMENT_FLAG_REALM_FIRST_RAID_REACH  = 0x00000300,   // ACHIEVEMENT_FLAG_SERVER_FIRST_RAID
 };
 
 enum AchievementCriteriaCondition
 {
     ACHIEVEMENT_CRITERIA_CONDITION_NONE      = 0,
     ACHIEVEMENT_CRITERIA_CONDITION_NO_DEATH  = 1,
-    ACHIEVEMENT_CRITERIA_CONDITION_UNK1      = 2,           // only used in "Complete a daily quest every day for five consecutive days"
+    ACHIEVEMENT_CRITERIA_CONDITION_DAILY     = 2,           // only used in "Complete a daily quest every day for five consecutive days"
     ACHIEVEMENT_CRITERIA_CONDITION_MAP       = 3,           // requires you to be on specific map
     ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE  = 4,           // only used in "Win 10 arenas without losing"
     ACHIEVEMENT_CRITERIA_CONDITION_UNK2      = 9,           // unk
@@ -106,9 +106,9 @@ enum AchievementCriteriaTypes
     ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_IN_ZONE = 11,
     ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE = 13,
     ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST = 14,
-    ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND= 15,
-    ACHIEVEMENT_CRITERIA_TYPE_DEATH_AT_MAP= 16,
-    ACHIEVEMENT_CRITERIA_TYPE_DEATH= 17,
+    ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND = 15,
+    ACHIEVEMENT_CRITERIA_TYPE_DEATH_AT_MAP = 16,
+    ACHIEVEMENT_CRITERIA_TYPE_DEATH = 17,
     ACHIEVEMENT_CRITERIA_TYPE_DEATH_IN_DUNGEON = 18,
     ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_RAID = 19,
     ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_CREATURE = 20,
@@ -117,7 +117,7 @@ enum AchievementCriteriaTypes
     ACHIEVEMENT_CRITERIA_TYPE_DEATHS_FROM = 26,
     ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST = 27,
     ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET = 28,
-    ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL= 29,
+    ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL = 29,
     ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE = 30,
     ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA = 31,
     ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA = 32,
@@ -132,18 +132,18 @@ enum AchievementCriteriaTypes
     ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_PERSONAL_RATING = 39,
     ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL = 40,
     ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM = 41,
-    ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM= 42,
+    ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM = 42,
     ACHIEVEMENT_CRITERIA_TYPE_EXPLORE_AREA = 43,
-    ACHIEVEMENT_CRITERIA_TYPE_OWN_RANK= 44,
-    ACHIEVEMENT_CRITERIA_TYPE_BUY_BANK_SLOT= 45,
-    ACHIEVEMENT_CRITERIA_TYPE_GAIN_REPUTATION= 46,
-    ACHIEVEMENT_CRITERIA_TYPE_GAIN_EXALTED_REPUTATION= 47,
+    ACHIEVEMENT_CRITERIA_TYPE_OWN_RANK = 44,
+    ACHIEVEMENT_CRITERIA_TYPE_BUY_BANK_SLOT = 45,
+    ACHIEVEMENT_CRITERIA_TYPE_GAIN_REPUTATION = 46,
+    ACHIEVEMENT_CRITERIA_TYPE_GAIN_EXALTED_REPUTATION = 47,
     // noted: rewarded as soon as the player payed, not at taking place at the seat
-    ACHIEVEMENT_CRITERIA_TYPE_VISIT_BARBER_SHOP= 48,
+    ACHIEVEMENT_CRITERIA_TYPE_VISIT_BARBER_SHOP = 48,
     ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM = 49,
     // TODO: itemlevel is mentioned in text but not present in dbc
     ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED_ON_LOOT = 50,
-    ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT= 51,
+    ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT = 51,
     ACHIEVEMENT_CRITERIA_TYPE_HK_CLASS = 52,
     ACHIEVEMENT_CRITERIA_TYPE_HK_RACE = 53,
     ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE = 54,
@@ -160,20 +160,19 @@ enum AchievementCriteriaTypes
     ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_FOR_MAIL = 66,
     ACHIEVEMENT_CRITERIA_TYPE_LOOT_MONEY = 67,
     ACHIEVEMENT_CRITERIA_TYPE_USE_GAMEOBJECT = 68,
-    ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2= 69,
-    ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL= 70,
+    ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2 = 69,
+    ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL = 70,
     ACHIEVEMENT_CRITERIA_TYPE_FISH_IN_GAMEOBJECT = 72,
     // TODO: title id is not mentioned in dbc
     ACHIEVEMENT_CRITERIA_TYPE_ON_LOGIN = 74,
-    ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILLLINE_SPELLS= 75,
+    ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILLLINE_SPELLS = 75,
     ACHIEVEMENT_CRITERIA_TYPE_WIN_DUEL = 76,
     ACHIEVEMENT_CRITERIA_TYPE_LOSE_DUEL = 77,
-    // TODO: creature type (demon, undead etc.) is not stored in dbc
     ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE = 78,
-    ACHIEVEMENT_CRITERIA_TYPE_GOLD_EARNED_BY_AUCTIONS= 80,
-    ACHIEVEMENT_CRITERIA_TYPE_CREATE_AUCTION= 82,
-    ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_BID= 83,
-    ACHIEVEMENT_CRITERIA_TYPE_WON_AUCTIONS= 84,
+    ACHIEVEMENT_CRITERIA_TYPE_GOLD_EARNED_BY_AUCTIONS = 80,
+    ACHIEVEMENT_CRITERIA_TYPE_CREATE_AUCTION = 82,
+    ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_BID = 83,
+    ACHIEVEMENT_CRITERIA_TYPE_WON_AUCTIONS = 84,
     ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_SOLD = 85,
     ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_GOLD_VALUE_OWNED = 86,
     ACHIEVEMENT_CRITERIA_TYPE_GAIN_REVERED_REPUTATION = 87,
@@ -200,7 +199,7 @@ enum AchievementCriteriaTypes
     ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE = 109,
     // TODO: target entry is missing
     ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL2 = 110,
-    ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LINE= 112,
+    ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LINE = 112,
     ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL = 113,
     ACHIEVEMENT_CRITERIA_TYPE_ACCEPTED_SUMMONINGS = 114,
     ACHIEVEMENT_CRITERIA_TYPE_EARN_ACHIEVEMENT_POINTS = 115,
@@ -238,8 +237,8 @@ enum AreaFlags
     AREA_FLAG_UNK6                  = 0x00080000,           // Valgarde and Acherus: The Ebon Hold
     AREA_FLAG_LOWLEVEL              = 0x00100000,           // used for some starting areas with area_level <=15
     AREA_FLAG_TOWN                  = 0x00200000,           // small towns with Inn
-    AREA_FLAG_UNK7                  = 0x00400000,           // Warsong Hold, Acherus: The Ebon Hold, New Agamand Inn, Vengeance Landing Inn
-    AREA_FLAG_UNK8                  = 0x00800000,           // Westguard Inn, Acherus: The Ebon Hold, Valgarde
+    AREA_FLAG_REST_ZONE_HORDE       = 0x00400000,           // Warsong Hold, Acherus: The Ebon Hold, New Agamand Inn, Vengeance Landing Inn, Sunreaver Pavilion (Something to do with team?)
+    AREA_FLAG_REST_ZONE_ALLIANCE    = 0x00800000,           // Westguard Inn, Acherus: The Ebon Hold, Valgarde, Silver Covenant Pavilion (Something to do with team?)
     AREA_FLAG_OUTDOOR_PVP           = 0x01000000,           // Wintergrasp and it's subzones
     AREA_FLAG_INSIDE                = 0x02000000,           // used for determinating spell related inside/outside questions in Map::IsOutdoors
     AREA_FLAG_OUTSIDE               = 0x04000000,           // used for determinating spell related inside/outside questions in Map::IsOutdoors
@@ -253,7 +252,7 @@ enum Difficulty
 
     DUNGEON_DIFFICULTY_NORMAL    = 0,
     DUNGEON_DIFFICULTY_HEROIC    = 1,
-    //DUNGEON_DIFFICULTY_EPIC    = 2,                       // not used, but exists
+    // DUNGEON_DIFFICULTY_EPIC    = 2,                      // not used, but exists
 
     RAID_DIFFICULTY_10MAN_NORMAL = 0,
     RAID_DIFFICULTY_25MAN_NORMAL = 1,
@@ -296,7 +295,7 @@ enum FactionMasks
     FACTION_MASK_ALLIANCE = 2,                              // player or creature from alliance team
     FACTION_MASK_HORDE    = 4,                              // player or creature from horde team
     FACTION_MASK_MONSTER  = 8                               // aggressive creature from monster team
-    // if none flags set then non-aggressive creature
+                            // if none flags set then non-aggressive creature
 };
 
 enum MapTypes                                               // Lua_IsInInstance
@@ -308,6 +307,20 @@ enum MapTypes                                               // Lua_IsInInstance
     MAP_ARENA           = 4                                 // arena
 };
 
+enum MapFlags                                               // Map flags (need more research)
+{
+    MAP_FLAG_NONE                = 0x00000000,              // none specific
+    MAP_FLAG_INSTANCEABLE        = 0x00000001,              // or possible splittable for continent maps
+    MAP_FLAG_DEVELOPMENT         = 0x00000002,              // testing or development maps only
+    MAP_FLAG_UNK3                = 0x00000004,              //
+    MAP_FLAG_UNK4                = 0x00000008,              //
+    MAP_FLAG_UNK5                = 0x00000010,              //
+    MAP_FLAG_UNK6                = 0x00000020,              //
+    MAP_FLAG_UNK7                = 0x00000040,              //
+    MAP_FLAG_UNK8                = 0x00000080,              //
+    MAP_FLAG_VARIABLE_DIFFICULTY = 0x00000100,              // maps, where has changeable difficulty
+};
+
 enum AbilytyLearnType
 {
     ABILITY_LEARNED_ON_GET_PROFESSION_SKILL     = 1,
@@ -334,8 +347,8 @@ enum ItemEnchantmentType
 
 enum ItemLimitCategoryMode
 {
-    ITEM_LIMIT_CATEGORY_MODE_HAVE  = 0,                      // limit applied to amount items in inventory/bank
-    ITEM_LIMIT_CATEGORY_MODE_EQUIP = 1,                      // limit applied to amount equipped items (including used gems)
+    ITEM_LIMIT_CATEGORY_MODE_HAVE  = 0,                     // limit applied to amount items in inventory/bank
+    ITEM_LIMIT_CATEGORY_MODE_EQUIP = 1,                     // limit applied to amount equipped items (including used gems)
 };
 
 // some used in code cases
@@ -355,52 +368,56 @@ enum TotemCategoryType
     TOTEM_CATEGORY_TYPE_SPANNER = 24
 };
 
-// SummonProperties.dbc, col 1
+// SummonProperties.dbc, col 0          == Id               (m_id)
+// SummonProperties.dbc, col 1          == Group            (m_control)
 enum SummonPropGroup
 {
-    SUMMON_PROP_GROUP_WILD           = 0,
-    SUMMON_PROP_GROUP_FRIENDLY       = 1,
-    SUMMON_PROP_GROUP_PETS           = 2,
-    SUMMON_PROP_GROUP_CONTROLLABLE   = 3,
-    SUMMON_PROP_GROUP_VEHICLE        = 4
+    SUMMON_PROP_GROUP_WILD              = 0,
+    SUMMON_PROP_GROUP_FRIENDLY          = 1,
+    SUMMON_PROP_GROUP_PETS              = 2,
+    SUMMON_PROP_GROUP_CONTROLLABLE      = 3,
+    SUMMON_PROP_GROUP_VEHICLE           = 4,
+    SUMMON_PROP_GROUP_UNCONTROLLABLE_VEHICLE        = 5
 };
 
-// SummonProperties.dbc, col 3
+// SummonProperties.dbc, col 2          == FactionId        (m_faction)
+// SummonProperties.dbc, col 3          == Title            (m_title)
 enum UnitNameSummonTitle
 {
-    UNITNAME_SUMMON_TITLE_NONE         = 0,                 // no default title, different summons, 1330 spells in 3.0.3
-    UNITNAME_SUMMON_TITLE_PET          = 1,                 // 's Pet,           generic summons, 49 spells in 3.0.3
-    UNITNAME_SUMMON_TITLE_GUARDIAN     = 2,                 // 's Guardian,      summon guardian, 393 spells in 3.0.3
-    UNITNAME_SUMMON_TITLE_MINION       = 3,                 // 's Minion,        summon army, 5 spells in 3.0.3
-    UNITNAME_SUMMON_TITLE_TOTEM        = 4,                 // 's Totem,         summon totem, 169 spells in 3.0.3
-    UNITNAME_SUMMON_TITLE_COMPANION    = 5,                 // 's Companion,     critter/minipet, 195 spells in 3.0.3
-    UNITNAME_SUMMON_TITLE_RUNEBLADE    = 6,                 // 's Runeblade,     summon DRW/Ghoul, 2 spells in 3.0.3"
-    UNITNAME_SUMMON_TITLE_CONSTRUCT    = 7,                 // 's Construct,     summon bot/bomb, 4 spells in 3.0.3
-    UNITNAME_SUMMON_TITLE_OPPONENT     = 8,                 // 's Opponent,      something todo with DK prequest line, 2 spells in 3.0.3
-    UNITNAME_SUMMON_TITLE_VEHICLE      = 9,                 // 's Vehicle,       summon different vehicles, 14 spells in 3.0.3
-    UNITNAME_SUMMON_TITLE_MOUNT        = 10,                // 's Mount,         summon drake (vehicle), 3 spells
-    UNITNAME_SUMMON_TITLE_LIGHTWELL    = 11,                // 's Lightwell,     summon lightwell, 6 spells in 3.0.3
-    UNITNAME_SUMMON_TITLE_BUTLER       = 12                 // 's Butler,        summon repair bot, 1 spells in 3.2.2a
+    UNITNAME_SUMMON_TITLE_NONE          = 0,                // no default title, different summons, 1330 spells in 3.0.3
+    UNITNAME_SUMMON_TITLE_PET           = 1,                // 's Pet,           generic summons, 49 spells in 3.0.3
+    UNITNAME_SUMMON_TITLE_GUARDIAN      = 2,                // 's Guardian,      summon guardian, 393 spells in 3.0.3
+    UNITNAME_SUMMON_TITLE_MINION        = 3,                // 's Minion,        summon army, 5 spells in 3.0.3
+    UNITNAME_SUMMON_TITLE_TOTEM         = 4,                // 's Totem,         summon totem, 169 spells in 3.0.3
+    UNITNAME_SUMMON_TITLE_COMPANION     = 5,                // 's Companion,     critter/minipet, 195 spells in 3.0.3
+    UNITNAME_SUMMON_TITLE_RUNEBLADE     = 6,                // 's Runeblade,     summon DRW/Ghoul, 2 spells in 3.0.3"
+    UNITNAME_SUMMON_TITLE_CONSTRUCT     = 7,                // 's Construct,     summon bot/bomb, 4 spells in 3.0.3
+    UNITNAME_SUMMON_TITLE_OPPONENT      = 8,                // 's Opponent,      something todo with DK prequest line, 2 spells in 3.0.3
+    UNITNAME_SUMMON_TITLE_VEHICLE       = 9,                // 's Vehicle,       summon different vehicles, 14 spells in 3.0.3
+    UNITNAME_SUMMON_TITLE_MOUNT         = 10,               // 's Mount,         summon drake (vehicle), 3 spells
+    UNITNAME_SUMMON_TITLE_LIGHTWELL     = 11,               // 's Lightwell,     summon lightwell, 6 spells in 3.0.3
+    UNITNAME_SUMMON_TITLE_BUTLER        = 12                // 's Butler,        summon repair bot, 1 spells in 3.2.2a
 };
 
-// SummonProperties.dbc, col 5
+// SummonProperties.dbc, col 4          == Slot             (m_slot)
+// SummonProperties.dbc, col 5          == Flags            (m_flags)
 enum SummonPropFlags
 {
-    SUMMON_PROP_FLAG_NONE              = 0x0000,            // 1342 spells in 3.0.3
-    SUMMON_PROP_FLAG_UNK1              = 0x0001,            // 75 spells in 3.0.3, something unfriendly
-    SUMMON_PROP_FLAG_UNK2              = 0x0002,            // 616 spells in 3.0.3, something friendly
-    SUMMON_PROP_FLAG_UNK3              = 0x0004,            // 22 spells in 3.0.3, no idea...
-    SUMMON_PROP_FLAG_UNK4              = 0x0008,            // 49 spells in 3.0.3, some mounts
-    SUMMON_PROP_FLAG_UNK5              = 0x0010,            // 25 spells in 3.0.3, quest related?
-    SUMMON_PROP_FLAG_CANT_BE_DISMISSED = 0x0020,            // 0 spells in 3.0.3, unused
-    SUMMON_PROP_FLAG_UNK7              = 0x0040,            // 12 spells in 3.0.3, no idea
-    SUMMON_PROP_FLAG_UNK8              = 0x0080,            // 4 spells in 3.0.3, no idea
-    SUMMON_PROP_FLAG_UNK9              = 0x0100,            // 51 spells in 3.0.3, no idea, many quest related
-    SUMMON_PROP_FLAG_UNK10             = 0x0200,            // 51 spells in 3.0.3, something defensive
-    SUMMON_PROP_FLAG_UNK11             = 0x0400,            // 3 spells, requires something near?
-    SUMMON_PROP_FLAG_UNK12             = 0x0800,            // 30 spells in 3.0.3, no idea
-    SUMMON_PROP_FLAG_UNK13             = 0x1000,            // 8 spells in 3.0.3, siege vehicle
-    SUMMON_PROP_FLAG_UNK14             = 0x2000,            // 2 spells in 3.0.3, escort?
+    SUMMON_PROP_FLAG_NONE                     = 0x0000,           // 1342 spells in 3.0.3
+    SUMMON_PROP_FLAG_UNK1                     = 0x0001,           // 75 spells in 3.0.3, something unfriendly
+    SUMMON_PROP_FLAG_UNK2                     = 0x0002,           // 616 spells in 3.0.3, something friendly
+    SUMMON_PROP_FLAG_UNK3                     = 0x0004,           // 22 spells in 3.0.3, no idea...
+    SUMMON_PROP_FLAG_UNK4                     = 0x0008,           // 49 spells in 3.0.3, some mounts
+    SUMMON_PROP_FLAG_UNK5                     = 0x0010,           // 25 spells in 3.0.3, quest related?
+    SUMMON_PROP_FLAG_CANT_BE_DISMISSED        = 0x0020,           // 0 spells in 3.0.3, unused
+    SUMMON_PROP_FLAG_NOT_DESPAWN_IN_COMBAT    = 0x0040,           // 12 spells in 3.0.3, do not despawn in combat
+    SUMMON_PROP_FLAG_UNK8                     = 0x0080,           // 4 spells in 3.0.3, no idea
+    SUMMON_PROP_FLAG_UNK9                     = 0x0100,           // 51 spells in 3.0.3, no idea, many quest related
+    SUMMON_PROP_FLAG_INHERIT_FACTION          = 0x0200,           // 51 spells in 3.0.3, something defensive (Faction inheriting is much guesswork)
+    SUMMON_PROP_FLAG_UNK11                    = 0x0400,           // 3 spells, requires something near?
+    SUMMON_PROP_FLAG_UNK12                    = 0x0800,           // 30 spells in 3.0.3, no idea
+    SUMMON_PROP_FLAG_UNK13                    = 0x1000,           // 8 spells in 3.0.3, siege vehicle
+    SUMMON_PROP_FLAG_UNK14                    = 0x2000,           // 2 spells in 3.0.3, escort?
 };
 
 // SpellEntry::Targets
@@ -433,11 +450,10 @@ enum SpellEffectIndex
 {
     EFFECT_INDEX_0     = 0,
     EFFECT_INDEX_1     = 1,
-    EFFECT_INDEX_2     = 2
+    EFFECT_INDEX_2     = 2,
+    MAX_EFFECT_INDEX,
 };
 
-#define MAX_EFFECT_INDEX 3
-
 enum SpellFamily
 {
     SPELLFAMILY_GENERIC     = 0,
@@ -468,18 +484,72 @@ enum VehicleFlags
     VEHICLE_FLAG_ALLOW_PITCHING     = 0x00000010,           // Sets MOVEFLAG2_ALLOW_PITCHING
     VEHICLE_FLAG_FULLSPEEDPITCHING  = 0x00000020,           // Sets MOVEFLAG2_FULLSPEEDPITCHING
     VEHICLE_FLAG_CUSTOM_PITCH       = 0x00000040,           // If set use pitchMin and pitchMax from DBC, otherwise pitchMin = -pi/2, pitchMax = pi/2
+    VEHICLE_FLAG_ACCESSORY          = 0x00000200,           // Vehicle is accessory? Need additional check!
     VEHICLE_FLAG_ADJUST_AIM_ANGLE   = 0x00000400,           // Lua_IsVehicleAimAngleAdjustable
     VEHICLE_FLAG_ADJUST_AIM_POWER   = 0x00000800,           // Lua_IsVehicleAimPowerAdjustable
+    VEHICLE_FLAG_DISABLE_SWITCH     = 0x00400000,           // Can't change seats, VEHICLE_ID = 335 chopper
+    VEHICLE_FLAG_NOT_DISMISS        = 0x10000000,           // Vehicle not dismissed after eject passenger?
 };
 
 enum VehicleSeatFlags
 {
+    SEAT_FLAG_NONE                  = 0x00000000,           //
+    SEAT_FLAG_UNK1                  = 0x00000001,           // "HasLowerAnimForEnter"
+    SEAT_FLAG_UNK2                  = 0x00000002,           // "HasLowerAnimForRide"
+    SEAT_FLAG_UNK3                  = 0x00000004,
+    SEAT_FLAG_UNK4                  = 0x00000008,           // "ShouldUseVehicleSeatExitAnimationOnVoluntaryExit"
+    SEAT_FLAG_UNK5                  = 0x00000010,
+    SEAT_FLAG_UNK6                  = 0x00000020,
+    SEAT_FLAG_UNK7                  = 0x00000040,
+    SEAT_FLAG_UNK8                  = 0x00000080,
+    SEAT_FLAG_UNK9                  = 0x00000100,
     SEAT_FLAG_HIDE_PASSENGER        = 0x00000200,           // Passenger is hidden
+    SEAT_FLAG_FREE_ACTION           = 0x00000400,           // "AllowsTurning"
     SEAT_FLAG_CAN_CONTROL           = 0x00000800,           // Lua_UnitInVehicleControlSeat
+    SEAT_FLAG_UNK11                 = 0x00001000,           // "Can Cast Mount Spell"
+    SEAT_FLAG_UNCONTROLLED          = 0x00002000,           // Seat uncontrolled for passenger
     SEAT_FLAG_CAN_ATTACK            = 0x00004000,           // Can attack, cast spells and use items from vehicle?
+    SEAT_FLAG_UNATTACKABLE          = 0x00008000,           // "ShouldUseVehicleSeatExitAnimationOnForcedExit"
+    SEAT_FLAG_UNK14                 = 0x00010000,
+    SEAT_FLAG_UNK15                 = 0x00020000,
+    SEAT_FLAG_UNK16                 = 0x00040000,           // "HasVehicleExitAnimForVoluntaryExit"
+    SEAT_FLAG_UNK17                 = 0x00080000,           // "HasVehicleExitAnimForForcedExit"
+    SEAT_FLAG_UNK18                 = 0x00100000,
+    SEAT_FLAG_UNK19                 = 0x00200000,
+    SEAT_FLAG_UNK20                 = 0x00400000,           // "RecHasVehicleEnterAnim"
+    SEAT_FLAG_UNK21                 = 0x00800000,
+    SEAT_FLAG_UNK22                 = 0x01000000,           // "EnableVehicleZoom"
     SEAT_FLAG_USABLE                = 0x02000000,           // Lua_CanExitVehicle
     SEAT_FLAG_CAN_SWITCH            = 0x04000000,           // Lua_CanSwitchVehicleSeats
+    SEAT_FLAG_UNK23                 = 0x08000000,           // "HasStartWaitingForVehicleTransitionAnimEnter"
+    SEAT_FLAG_UNK24                 = 0x10000000,           // "HasStartWaitingForVehicleTransitionAnimExit"
     SEAT_FLAG_CAN_CAST              = 0x20000000,           // Lua_UnitHasVehicleUI
+    SEAT_FLAG_UNK25                 = 0x40000000,
+    SEAT_FLAG_UNK26                 = 0x80000000,           // "AllowsInteraction"
+};
+
+enum VehicleSeatFlagsB
+{
+    VEHICLE_SEAT_FLAG_B_NONE                     = 0x00000000,
+    VEHICLE_SEAT_FLAG_B_UNK1                     = 0x00000001,
+    VEHICLE_SEAT_FLAG_B_USABLE_FORCED            = 0x00000002,
+    VEHICLE_SEAT_FLAG_B_UNK2                     = 0x00000004,
+    VEHICLE_SEAT_FLAG_B_TARGETS_IN_RAIDUI        = 0x00000008,           // Lua_UnitTargetsVehicleInRaidUI
+    VEHICLE_SEAT_FLAG_B_UNK3                     = 0x00000010,
+    VEHICLE_SEAT_FLAG_B_EJECTABLE                = 0x00000020,           // ejectable
+    VEHICLE_SEAT_FLAG_B_USABLE_FORCED_2          = 0x00000040,
+    VEHICLE_SEAT_FLAG_B_UNK6                     = 0x00000080,
+    VEHICLE_SEAT_FLAG_B_USABLE_FORCED_3          = 0x00000100,
+    VEHICLE_SEAT_FLAG_B_EJECTABLE_FORCED         = 0x00200000,           // seats for forced eject? 27 seats at 3.3.5a
+    VEHICLE_SEAT_FLAG_B_USABLE_FORCED_4          = 0x02000000,
+    VEHICLE_SEAT_FLAG_B_CANSWITCH                = 0x04000000,           // can switch seats
+    VEHICLE_SEAT_FLAG_B_VEHICLE_PLAYERFRAME_UI   = 0x80000000,           // Lua_UnitHasVehiclePlayerFrameUI - actually checked for flagsb &~ 0x80000000
+};
+
+enum MapDifficultyFlags
+{
+    MAP_DIFFICULTY_FLAG_NONE        = 0x00000001,           // Not used in 3.3.5
+    MAP_DIFFICULTY_FLAG_CONDITION   = 0x00000002,           // This map difficulty has condition
 };
 
 #endif
diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp
index 20e699392ea..8d263afe838 100644
--- a/src/game/DBCStores.cpp
+++ b/src/game/DBCStores.cpp
@@ -16,8 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "SystemConfig.h"
 #include "DBCStores.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Log.h"
 #include "ProgressBar.h"
 #include "SharedDefines.h"
@@ -27,8 +28,8 @@
 
 #include <map>
 
-typedef std::map<uint16,uint32> AreaFlagByAreaID;
-typedef std::map<uint32,uint32> AreaFlagByMapID;
+typedef UNORDERED_MAP<uint16, uint32> AreaFlagByAreaID;
+typedef UNORDERED_MAP<uint32, uint32> AreaFlagByMapID;
 
 struct WMOAreaTableTripple
 {
@@ -36,9 +37,14 @@ struct WMOAreaTableTripple
     {
     }
 
-    bool operator <(const WMOAreaTableTripple& b) const
+    bool operator <(WMOAreaTableTripple const& b) const
     {
-        return memcmp(this, &b, sizeof(WMOAreaTableTripple))<0;
+        return memcmp(this, &b, sizeof(WMOAreaTableTripple)) < 0;
+    }
+
+    bool operator == (WMOAreaTableTripple const& b) const
+    {
+        return (groupId == b.groupId && rootId == b.rootId && adtId == b.adtId);
     }
 
     // ordered by entropy; that way memcmp will have a minimal medium runtime
@@ -47,7 +53,14 @@ struct WMOAreaTableTripple
     int32 adtId;
 };
 
-typedef std::map<WMOAreaTableTripple, WMOAreaTableEntry const *> WMOAreaInfoByTripple;
+HASH_NAMESPACE_START
+template<> class hash <WMOAreaTableTripple>
+{
+    public: size_t operator()(const WMOAreaTableTripple& __x) const { return (size_t)((__x.groupId << 24) | (__x.rootId << 16) | __x.adtId); }
+};
+HASH_NAMESPACE_END
+
+typedef UNORDERED_MAP<WMOAreaTableTripple, WMOAreaTableEntry const*> WMOAreaInfoByTripple;
 
 DBCStorage <AreaTableEntry> sAreaStore(AreaTableEntryfmt);
 DBCStorage <AreaGroupEntry> sAreaGroupStore(AreaGroupEntryfmt);
@@ -72,10 +85,12 @@ DBCStorage <CinematicSequencesEntry> sCinematicSequencesStore(CinematicSequences
 DBCStorage <CreatureDisplayInfoEntry> sCreatureDisplayInfoStore(CreatureDisplayInfofmt);
 DBCStorage <CreatureDisplayInfoExtraEntry> sCreatureDisplayInfoExtraStore(CreatureDisplayInfoExtrafmt);
 DBCStorage <CreatureFamilyEntry> sCreatureFamilyStore(CreatureFamilyfmt);
+DBCStorage <CreatureModelDataEntry> sCreatureModelDataStore(CreatureModelDatafmt);
 DBCStorage <CreatureSpellDataEntry> sCreatureSpellDataStore(CreatureSpellDatafmt);
 DBCStorage <CreatureTypeEntry> sCreatureTypeStore(CreatureTypefmt);
 DBCStorage <CurrencyTypesEntry> sCurrencyTypesStore(CurrencyTypesfmt);
 
+DBCStorage <DestructibleModelDataEntry> sDestructibleModelDataStore(DestructibleModelDataFmt);
 DBCStorage <DungeonEncounterEntry> sDungeonEncounterStore(DungeonEncounterfmt);
 DBCStorage <DurabilityQualityEntry> sDurabilityQualityStore(DurabilityQualityfmt);
 DBCStorage <DurabilityCostsEntry> sDurabilityCostsStore(DurabilityCostsfmt);
@@ -83,7 +98,7 @@ DBCStorage <DurabilityCostsEntry> sDurabilityCostsStore(DurabilityCostsfmt);
 DBCStorage <EmotesEntry> sEmotesStore(EmotesEntryfmt);
 DBCStorage <EmotesTextEntry> sEmotesTextStore(EmotesTextEntryfmt);
 
-typedef std::map<uint32,SimpleFactionsList> FactionTeamMap;
+typedef std::map<uint32, SimpleFactionsList> FactionTeamMap;
 static FactionTeamMap sFactionTeamMap;
 DBCStorage <FactionEntry> sFactionStore(FactionEntryfmt);
 DBCStorage <FactionTemplateEntry> sFactionTemplateStore(FactionTemplateEntryfmt);
@@ -101,7 +116,7 @@ DBCStorage <GtChanceToSpellCritBaseEntry> sGtChanceToSpellCritBaseStore(GtChance
 DBCStorage <GtChanceToSpellCritEntry>     sGtChanceToSpellCritStore(GtChanceToSpellCritfmt);
 DBCStorage <GtOCTClassCombatRatingScalarEntry> sGtOCTClassCombatRatingScalarStore(GtOCTClassCombatRatingScalarfmt);
 DBCStorage <GtOCTRegenHPEntry>            sGtOCTRegenHPStore(GtOCTRegenHPfmt);
-//DBCStorage <GtOCTRegenMPEntry>            sGtOCTRegenMPStore(GtOCTRegenMPfmt);  -- not used currently
+// DBCStorage <GtOCTRegenMPEntry>            sGtOCTRegenMPStore(GtOCTRegenMPfmt);  -- not used currently
 DBCStorage <GtRegenHPPerSptEntry>         sGtRegenHPPerSptStore(GtRegenHPPerSptfmt);
 DBCStorage <GtRegenMPPerSptEntry>         sGtRegenMPPerSptStore(GtRegenMPPerSptfmt);
 
@@ -110,21 +125,26 @@ DBCStorage <HolidaysEntry>                sHolidaysStore(Holidaysfmt);
 DBCStorage <ItemEntry>                    sItemStore(Itemfmt);
 DBCStorage <ItemBagFamilyEntry>           sItemBagFamilyStore(ItemBagFamilyfmt);
 DBCStorage <ItemClassEntry>               sItemClassStore(ItemClassfmt);
-//DBCStorage <ItemCondExtCostsEntry> sItemCondExtCostsStore(ItemCondExtCostsEntryfmt);
-//DBCStorage <ItemDisplayInfoEntry> sItemDisplayInfoStore(ItemDisplayTemplateEntryfmt); -- not used currently
+// DBCStorage <ItemCondExtCostsEntry> sItemCondExtCostsStore(ItemCondExtCostsEntryfmt);
+// DBCStorage <ItemDisplayInfoEntry> sItemDisplayInfoStore(ItemDisplayTemplateEntryfmt); -- not used currently
 DBCStorage <ItemExtendedCostEntry> sItemExtendedCostStore(ItemExtendedCostEntryfmt);
 DBCStorage <ItemLimitCategoryEntry> sItemLimitCategoryStore(ItemLimitCategoryEntryfmt);
 DBCStorage <ItemRandomPropertiesEntry> sItemRandomPropertiesStore(ItemRandomPropertiesfmt);
 DBCStorage <ItemRandomSuffixEntry> sItemRandomSuffixStore(ItemRandomSuffixfmt);
 DBCStorage <ItemSetEntry> sItemSetStore(ItemSetEntryfmt);
 
+DBCStorage <LFGDungeonEntry> sLFGDungeonStore(LFGDungeonEntryfmt);
+DBCStorage <LFGDungeonExpansionEntry> sLFGDungeonExpansionStore(LFGDungeonExpansionEntryfmt);
+LFGDungeonExpansionMap sLFGDungeonExpansionMap;
+
+DBCStorage <LiquidTypeEntry> sLiquidTypeStore(LiquidTypefmt);
+
 DBCStorage <LockEntry> sLockStore(LockEntryfmt);
 
 DBCStorage <MailTemplateEntry> sMailTemplateStore(MailTemplateEntryfmt);
 DBCStorage <MapEntry> sMapStore(MapEntryfmt);
 
-// DBC used only for initialization sMapDifficultyMap at startup.
-DBCStorage <MapDifficultyEntry> sMapDifficultyStore(MapDifficultyEntryfmt); // only for loading
+DBCStorage <MapDifficultyEntry> sMapDifficultyStore(MapDifficultyEntryfmt);
 MapDifficultyMap sMapDifficultyMap;
 
 DBCStorage <MovieEntry> sMovieStore(MovieEntryfmt);
@@ -134,6 +154,7 @@ DBCStorage <QuestFactionRewardEntry> sQuestFactionRewardStore(QuestFactionReward
 DBCStorage <QuestSortEntry> sQuestSortStore(QuestSortEntryfmt);
 DBCStorage <QuestXPLevel> sQuestXPLevelStore(QuestXPLevelfmt);
 
+DBCStorage <PowerDisplayEntry> sPowerDisplayStore(PowerDisplayfmt);
 DBCStorage <PvPDifficultyEntry> sPvPDifficultyStore(PvPDifficultyfmt);
 
 DBCStorage <RandomPropertiesPointsEntry> sRandomPropertiesPointsStore(RandomPropertiesPointsfmt);
@@ -152,6 +173,8 @@ DBCStorage <SpellEntry> sSpellStore(SpellEntryfmt);
 SpellCategoryStore sSpellCategoryStore;
 PetFamilySpellsStore sPetFamilySpellsStore;
 
+SpellEffectMap sSpellEffectMap;
+
 DBCStorage <SpellCastTimesEntry> sSpellCastTimesStore(SpellCastTimefmt);
 DBCStorage <SpellDifficultyEntry> sSpellDifficultyStore(SpellDifficultyfmt);
 DBCStorage <SpellDurationEntry> sSpellDurationStore(SpellDurationfmt);
@@ -183,20 +206,26 @@ static DBCStorage <TaxiPathNodeEntry> sTaxiPathNodeStore(TaxiPathNodeEntryfmt);
 
 DBCStorage <TeamContributionPoints> sTeamContributionPoints(TeamContributionPointsfmt);
 DBCStorage <TotemCategoryEntry> sTotemCategoryStore(TotemCategoryEntryfmt);
+
+TransportAnimationsByEntry sTransportAnimationsByEntry;
+DBCStorage <TransportAnimationEntry> sTransportAnimationStore(TransportAnimationEntryfmt);
+
 DBCStorage <VehicleEntry> sVehicleStore(VehicleEntryfmt);
 DBCStorage <VehicleSeatEntry> sVehicleSeatStore(VehicleSeatEntryfmt);
 DBCStorage <WMOAreaTableEntry>  sWMOAreaTableStore(WMOAreaTableEntryfmt);
 DBCStorage <WorldMapAreaEntry>  sWorldMapAreaStore(WorldMapAreaEntryfmt);
+WorldMapAreaMap sWorldMapAreaMap;
 DBCStorage <WorldMapOverlayEntry> sWorldMapOverlayStore(WorldMapOverlayEntryfmt);
 DBCStorage <WorldSafeLocsEntry> sWorldSafeLocsStore(WorldSafeLocsEntryfmt);
+DBCStorage <WorldStateEntry> sWorldStateStore(WorldStateEntryfmt);
 
 typedef std::list<std::string> StoreProblemList;
 
 bool IsAcceptableClientBuild(uint32 build)
 {
     int accepted_versions[] = EXPECTED_MANGOSD_CLIENT_BUILD;
-    for(int i = 0; accepted_versions[i]; ++i)
-        if(int(build) == accepted_versions[i])
+    for (int i = 0; accepted_versions[i]; ++i)
+        if (int(build) == accepted_versions[i])
             return true;
 
     return false;
@@ -206,7 +235,7 @@ std::string AcceptableClientBuildsListStr()
 {
     std::ostringstream data;
     int accepted_versions[] = EXPECTED_MANGOSD_CLIENT_BUILD;
-    for(int i = 0; accepted_versions[i]; ++i)
+    for (int i = 0; accepted_versions[i]; ++i)
         data << accepted_versions[i] << " ";
     return data.str();
 }
@@ -215,13 +244,13 @@ static bool ReadDBCBuildFileText(const std::string& dbc_path, char const* locale
 {
     std::string filename  = dbc_path + "component.wow-" + localeName + ".txt";
 
-    if(FILE* file = fopen(filename.c_str(),"rb"))
+    if (FILE* file = fopen(filename.c_str(), "rb"))
     {
         char buf[100];
-        fread(buf,1,100-1,file);
+        fread(buf, 1, 100 - 1, file);
         fclose(file);
-
-        text = &buf[0];
+        text.clear();
+        text.append(buf);
         return true;
     }
     else
@@ -234,9 +263,9 @@ static uint32 ReadDBCBuild(const std::string& dbc_path, LocaleNameStr const* loc
 
     if (!localeNameStr)
     {
-        for(LocaleNameStr const* itr = &fullLocaleNameList[0]; itr->name; ++itr)
+        for (LocaleNameStr const* itr = &fullLocaleNameList[0]; itr->name; ++itr)
         {
-            if (ReadDBCBuildFileText(dbc_path,itr->name,text))
+            if (ReadDBCBuildFileText(dbc_path, itr->name, text))
             {
                 localeNameStr = itr;
                 break;
@@ -244,18 +273,18 @@ static uint32 ReadDBCBuild(const std::string& dbc_path, LocaleNameStr const* loc
         }
     }
     else
-        ReadDBCBuildFileText(dbc_path,localeNameStr->name,text);
+        ReadDBCBuildFileText(dbc_path, localeNameStr->name, text);
 
     if (text.empty())
         return 0;
 
     size_t pos = text.find("version=\"");
     size_t pos1 = pos + strlen("version=\"");
-    size_t pos2 = text.find("\"",pos1);
+    size_t pos2 = text.find("\"", pos1);
     if (pos == text.npos || pos2 == text.npos || pos1 >= pos2)
         return 0;
 
-    std::string build_str = text.substr(pos1,pos2-pos1);
+    std::string build_str = text.substr(pos1, pos2 - pos1);
 
     int build = atoi(build_str.c_str());
     if (build <= 0)
@@ -264,9 +293,9 @@ static uint32 ReadDBCBuild(const std::string& dbc_path, LocaleNameStr const* loc
     return build;
 }
 
-static bool LoadDBC_assert_print(uint32 fsize,uint32 rsize, const std::string& filename)
+static bool LoadDBC_assert_print(uint32 fsize, uint32 rsize, const std::string& filename)
 {
-    sLog.outError("Size of '%s' setted by format string (%u) not equal size of C++ structure (%u).",filename.c_str(),fsize,rsize);
+    sLog.outError("Size of '%s' setted by format string (%u) not equal size of C++ structure (%u).", filename.c_str(), fsize, rsize);
 
     // ASSERT must fail after function call
     return false;
@@ -275,7 +304,7 @@ static bool LoadDBC_assert_print(uint32 fsize,uint32 rsize, const std::string& f
 struct LocalData
 {
     LocalData(uint32 build)
-        : main_build(build), availableDbcLocales(0xFFFFFFFF),checkedDbcLocaleBuilds(0) {}
+        : main_build(build), availableDbcLocales(0xFFFFFFFF), checkedDbcLocaleBuilds(0) {}
 
     uint32 main_build;
 
@@ -288,13 +317,13 @@ template<class T>
 inline void LoadDBC(LocalData& localeData, BarGoLink& bar, StoreProblemList& errlist, DBCStorage<T>& storage, const std::string& dbc_path, const std::string& filename)
 {
     // compatibility format and C++ structure sizes
-    MANGOS_ASSERT(DBCFileLoader::GetFormatRecordSize(storage.GetFormat()) == sizeof(T) || LoadDBC_assert_print(DBCFileLoader::GetFormatRecordSize(storage.GetFormat()),sizeof(T),filename));
+    MANGOS_ASSERT(DBCFileLoader::GetFormatRecordSize(storage.GetFormat()) == sizeof(T) || LoadDBC_assert_print(DBCFileLoader::GetFormatRecordSize(storage.GetFormat()), sizeof(T), filename));
 
     std::string dbc_filename = dbc_path + filename;
-    if(storage.Load(dbc_filename.c_str()))
+    if (storage.Load(dbc_filename.c_str()))
     {
         bar.step();
-        for(uint8 i = 0; fullLocaleNameList[i].name; ++i)
+        for (uint8 i = 0; fullLocaleNameList[i].name; ++i)
         {
             if (!(localeData.availableDbcLocales & (1 << i)))
                 continue;
@@ -305,20 +334,20 @@ inline void LoadDBC(LocalData& localeData, BarGoLink& bar, StoreProblemList& err
 
             if (!(localeData.checkedDbcLocaleBuilds & (1 << i)))
             {
-                localeData.checkedDbcLocaleBuilds |= (1<<i);// mark as checked for speedup next checks
+                localeData.checkedDbcLocaleBuilds |= (1 << i); // mark as checked for speedup next checks
 
 
-                uint32 build_loc = ReadDBCBuild(dbc_dir_loc,localStr);
-                if(localeData.main_build != build_loc)
+                uint32 build_loc = ReadDBCBuild(dbc_dir_loc, localStr);
+                if (localeData.main_build != build_loc)
                 {
-                    localeData.availableDbcLocales &= ~(1<<i);  // mark as not available for speedup next checks
+                    localeData.availableDbcLocales &= ~(1 << i); // mark as not available for speedup next checks
 
                     // exist but wrong build
                     if (build_loc)
                     {
                         std::string dbc_filename_loc = dbc_path + localStr->name + "/" + filename;
                         char buf[200];
-                        snprintf(buf,200," (exist, but DBC locale subdir %s have DBCs for build %u instead expected build %u, it and other DBC from subdir skipped)",localStr->name,build_loc,localeData.main_build);
+                        snprintf(buf, 200, " (exist, but DBC locale subdir %s have DBCs for build %u instead expected build %u, it and other DBC from subdir skipped)", localStr->name, build_loc, localeData.main_build);
                         errlist.push_back(dbc_filename_loc + buf);
                     }
 
@@ -327,15 +356,15 @@ inline void LoadDBC(LocalData& localeData, BarGoLink& bar, StoreProblemList& err
             }
 
             std::string dbc_filename_loc = dbc_path + localStr->name + "/" + filename;
-            if(!storage.LoadStringsFrom(dbc_filename_loc.c_str()))
-                localeData.availableDbcLocales &= ~(1<<i);  // mark as not available for speedup next checks
+            if (!storage.LoadStringsFrom(dbc_filename_loc.c_str()))
+                localeData.availableDbcLocales &= ~(1 << i);// mark as not available for speedup next checks
         }
     }
     else
     {
         // sort problematic dbc to (1) non compatible and (2) nonexistent
-        FILE * f=fopen(dbc_filename.c_str(),"rb");
-        if(f)
+        FILE* f = fopen(dbc_filename.c_str(), "rb");
+        if (f)
         {
             char buf[100];
             snprintf(buf, 100, " (exist, but have %u fields instead " SIZEFMTD ") Wrong client version DBC file?", storage.GetFieldCount(), strlen(storage.GetFormat()));
@@ -349,7 +378,7 @@ inline void LoadDBC(LocalData& localeData, BarGoLink& bar, StoreProblemList& err
 
 void LoadDBCStores(const std::string& dataPath)
 {
-    std::string dbcPath = dataPath+"dbc/";
+    std::string dbcPath = dataPath + "dbc/";
 
     uint32 build = ReadDBCBuild(dbcPath);
 
@@ -359,12 +388,12 @@ void LoadDBCStores(const std::string& dataPath)
         if (build)
             sLog.outError("Found DBC files for build %u but mangosd expected DBC for one from builds: %s Please extract correct DBC files.", build, AcceptableClientBuildsListStr().c_str());
         else
-            sLog.outError("Incorrect DataDir value in mangosd.conf or not found build info (outdated DBC files). Required one from builds: %s Please extract correct DBC files.",AcceptableClientBuildsListStr().c_str());
+            sLog.outError("Incorrect DataDir value in mangosd.conf or not found build info (outdated DBC files). Required one from builds: %s Please extract correct DBC files.", AcceptableClientBuildsListStr().c_str());
         Log::WaitBeforeContinueIfNeed();
         exit(1);
     }
 
-    const uint32 DBCFilesCount = 94;
+    const uint32 DBCFilesCount = 97;
 
     BarGoLink bar(DBCFilesCount);
 
@@ -372,7 +401,7 @@ void LoadDBCStores(const std::string& dataPath)
 
     LocalData availableDbcLocales(build);
 
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAreaStore,                dbcPath,"AreaTable.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sAreaStore,                dbcPath, "AreaTable.dbc");
 
     // must be after sAreaStore loading
     for (uint32 i = 0; i < sAreaStore.GetNumRows(); ++i)    // areaflag numbered from 0
@@ -380,141 +409,175 @@ void LoadDBCStores(const std::string& dataPath)
         if (AreaTableEntry const* area = sAreaStore.LookupEntry(i))
         {
             // fill AreaId->DBC records
-            sAreaFlagByAreaID.insert(AreaFlagByAreaID::value_type(uint16(area->ID),area->exploreFlag));
+            sAreaFlagByAreaID.insert(AreaFlagByAreaID::value_type(uint16(area->ID), area->exploreFlag));
 
             // fill MapId->DBC records ( skip sub zones and continents )
-            if(area->zone==0 && area->mapid != 0 && area->mapid != 1 && area->mapid != 530 && area->mapid != 571 )
-                sAreaFlagByMapID.insert(AreaFlagByMapID::value_type(area->mapid,area->exploreFlag));
+            if (area->zone == 0 && area->mapid != 0 && area->mapid != 1 && area->mapid != 530 && area->mapid != 571)
+                sAreaFlagByMapID.insert(AreaFlagByMapID::value_type(area->mapid, area->exploreFlag));
         }
     }
 
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAchievementStore,         dbcPath,"Achievement.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAchievementCriteriaStore, dbcPath,"Achievement_Criteria.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAreaTriggerStore,         dbcPath,"AreaTrigger.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAreaGroupStore,           dbcPath,"AreaGroup.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAuctionHouseStore,        dbcPath,"AuctionHouse.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sBankBagSlotPricesStore,   dbcPath,"BankBagSlotPrices.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sBattlemasterListStore,    dbcPath,"BattlemasterList.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sBarberShopStyleStore,     dbcPath,"BarberShopStyle.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCharStartOutfitStore,     dbcPath,"CharStartOutfit.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCharTitlesStore,          dbcPath,"CharTitles.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sChatChannelsStore,        dbcPath,"ChatChannels.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sChrClassesStore,          dbcPath,"ChrClasses.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sChrRacesStore,            dbcPath,"ChrRaces.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCinematicSequencesStore,  dbcPath,"CinematicSequences.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCreatureDisplayInfoStore, dbcPath,"CreatureDisplayInfo.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCreatureDisplayInfoExtraStore,dbcPath,"CreatureDisplayInfoExtra.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCreatureFamilyStore,      dbcPath,"CreatureFamily.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCreatureSpellDataStore,   dbcPath,"CreatureSpellData.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCreatureTypeStore,        dbcPath,"CreatureType.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCurrencyTypesStore,       dbcPath,"CurrencyTypes.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sDungeonEncounterStore,    dbcPath,"DungeonEncounter.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sDurabilityCostsStore,     dbcPath,"DurabilityCosts.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sDurabilityQualityStore,   dbcPath,"DurabilityQuality.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sEmotesStore,              dbcPath,"Emotes.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sEmotesTextStore,          dbcPath,"EmotesText.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sFactionStore,             dbcPath,"Faction.dbc");
-    for (uint32 i=0;i<sFactionStore.GetNumRows(); ++i)
-    {
-        FactionEntry const * faction = sFactionStore.LookupEntry(i);
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sAchievementStore,         dbcPath, "Achievement.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sAchievementCriteriaStore, dbcPath, "Achievement_Criteria.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sAreaTriggerStore,         dbcPath, "AreaTrigger.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sAreaGroupStore,           dbcPath, "AreaGroup.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sAuctionHouseStore,        dbcPath, "AuctionHouse.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sBankBagSlotPricesStore,   dbcPath, "BankBagSlotPrices.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sBattlemasterListStore,    dbcPath, "BattlemasterList.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sBarberShopStyleStore,     dbcPath, "BarberShopStyle.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCharStartOutfitStore,     dbcPath, "CharStartOutfit.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCharTitlesStore,          dbcPath, "CharTitles.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sChatChannelsStore,        dbcPath, "ChatChannels.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sChrClassesStore,          dbcPath, "ChrClasses.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sChrRacesStore,            dbcPath, "ChrRaces.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCinematicSequencesStore,  dbcPath, "CinematicSequences.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCreatureDisplayInfoStore, dbcPath, "CreatureDisplayInfo.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCreatureDisplayInfoExtraStore, dbcPath, "CreatureDisplayInfoExtra.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCreatureFamilyStore,      dbcPath, "CreatureFamily.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCreatureModelDataStore,   dbcPath, "CreatureModelData.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCreatureSpellDataStore,   dbcPath, "CreatureSpellData.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCreatureTypeStore,        dbcPath, "CreatureType.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCurrencyTypesStore,       dbcPath, "CurrencyTypes.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sDestructibleModelDataStore, dbcPath, "DestructibleModelData.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sDungeonEncounterStore,    dbcPath, "DungeonEncounter.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sDurabilityCostsStore,     dbcPath, "DurabilityCosts.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sDurabilityQualityStore,   dbcPath, "DurabilityQuality.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sEmotesStore,              dbcPath, "Emotes.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sEmotesTextStore,          dbcPath, "EmotesText.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sFactionStore,             dbcPath, "Faction.dbc");
+    for (uint32 i = 0; i < sFactionStore.GetNumRows(); ++i)
+    {
+        FactionEntry const* faction = sFactionStore.LookupEntry(i);
         if (faction && faction->team)
         {
-            SimpleFactionsList &flist = sFactionTeamMap[faction->team];
+            SimpleFactionsList& flist = sFactionTeamMap[faction->team];
             flist.push_back(i);
         }
     }
 
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sFactionTemplateStore,     dbcPath,"FactionTemplate.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGameObjectDisplayInfoStore,dbcPath,"GameObjectDisplayInfo.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGemPropertiesStore,       dbcPath,"GemProperties.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGlyphPropertiesStore,     dbcPath,"GlyphProperties.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGlyphSlotStore,           dbcPath,"GlyphSlot.dbc");
-
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtBarberShopCostBaseStore,dbcPath,"gtBarberShopCostBase.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtCombatRatingsStore,     dbcPath,"gtCombatRatings.dbc");
-
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtChanceToMeleeCritBaseStore, dbcPath,"gtChanceToMeleeCritBase.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtChanceToMeleeCritStore, dbcPath,"gtChanceToMeleeCrit.dbc");
-
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtChanceToSpellCritBaseStore, dbcPath,"gtChanceToSpellCritBase.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtChanceToSpellCritStore, dbcPath,"gtChanceToSpellCrit.dbc");
-
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtOCTClassCombatRatingScalarStore,dbcPath,"gtOCTClassCombatRatingScalar.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtOCTRegenHPStore,        dbcPath,"gtOCTRegenHP.dbc");
-    //LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtOCTRegenMPStore,        dbcPath,"gtOCTRegenMP.dbc");       -- not used currently
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtRegenHPPerSptStore,     dbcPath,"gtRegenHPPerSpt.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtRegenMPPerSptStore,     dbcPath,"gtRegenMPPerSpt.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sHolidaysStore,            dbcPath,"Holidays.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemStore,                dbcPath,"Item.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemBagFamilyStore,       dbcPath,"ItemBagFamily.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemClassStore,           dbcPath,"ItemClass.dbc");
-    //LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemDisplayInfoStore,     dbcPath,"ItemDisplayInfo.dbc");     -- not used currently
-    //LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemCondExtCostsStore,    dbcPath,"ItemCondExtCosts.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemExtendedCostStore,    dbcPath,"ItemExtendedCost.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemLimitCategoryStore,   dbcPath,"ItemLimitCategory.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemRandomPropertiesStore,dbcPath,"ItemRandomProperties.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemRandomSuffixStore,    dbcPath,"ItemRandomSuffix.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemSetStore,             dbcPath,"ItemSet.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sLockStore,                dbcPath,"Lock.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sMailTemplateStore,        dbcPath,"MailTemplate.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sMapStore,                 dbcPath,"Map.dbc");
-
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sMapDifficultyStore,       dbcPath,"MapDifficulty.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sFactionTemplateStore,     dbcPath, "FactionTemplate.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGameObjectDisplayInfoStore, dbcPath, "GameObjectDisplayInfo.dbc");
+    for (uint32 i = 0; i < sGameObjectDisplayInfoStore.GetNumRows(); ++i)
+    {
+        if (GameObjectDisplayInfoEntry *info = const_cast<GameObjectDisplayInfoEntry*>(sGameObjectDisplayInfoStore.LookupEntry(i)))
+        {
+            if (info->maxX < info->minX)
+                std::swap(info->maxX, info->minX);
+            if (info->maxY < info->minY)
+                std::swap(info->maxY, info->minY);
+            if (info->maxZ < info->minZ)
+                std::swap(info->maxZ, info->minZ);
+        }
+    }
+
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGemPropertiesStore,       dbcPath, "GemProperties.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGlyphPropertiesStore,     dbcPath, "GlyphProperties.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGlyphSlotStore,           dbcPath, "GlyphSlot.dbc");
+
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGtBarberShopCostBaseStore, dbcPath, "gtBarberShopCostBase.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGtCombatRatingsStore,     dbcPath, "gtCombatRatings.dbc");
+
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGtChanceToMeleeCritBaseStore, dbcPath, "gtChanceToMeleeCritBase.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGtChanceToMeleeCritStore, dbcPath, "gtChanceToMeleeCrit.dbc");
+
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGtChanceToSpellCritBaseStore, dbcPath, "gtChanceToSpellCritBase.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGtChanceToSpellCritStore, dbcPath, "gtChanceToSpellCrit.dbc");
+
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGtOCTClassCombatRatingScalarStore, dbcPath, "gtOCTClassCombatRatingScalar.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGtOCTRegenHPStore,        dbcPath, "gtOCTRegenHP.dbc");
+    // LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtOCTRegenMPStore,        dbcPath,"gtOCTRegenMP.dbc");       -- not used currently
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGtRegenHPPerSptStore,     dbcPath, "gtRegenHPPerSpt.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sGtRegenMPPerSptStore,     dbcPath, "gtRegenMPPerSpt.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sHolidaysStore,            dbcPath, "Holidays.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sItemStore,                dbcPath, "Item.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sItemBagFamilyStore,       dbcPath, "ItemBagFamily.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sLFGDungeonStore,          dbcPath, "LFGDungeons.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sLFGDungeonExpansionStore, dbcPath, "LFGDungeonExpansion.dbc");
     // fill data
-    for(uint32 i = 1; i < sMapDifficultyStore.GetNumRows(); ++i)
-        if(MapDifficultyEntry const* entry = sMapDifficultyStore.LookupEntry(i))
-            sMapDifficultyMap[MAKE_PAIR32(entry->MapId,entry->Difficulty)] = MapDifficulty(entry->resetTime,entry->maxPlayers);
-    sMapDifficultyStore.Clear();
-
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sMovieStore,               dbcPath,"Movie.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sOverrideSpellDataStore,   dbcPath,"OverrideSpellData.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sQuestFactionRewardStore,  dbcPath,"QuestFactionReward.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sQuestSortStore,           dbcPath,"QuestSort.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sQuestXPLevelStore,        dbcPath,"QuestXP.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sPvPDifficultyStore,       dbcPath,"PvpDifficulty.dbc");
-    for(uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i)
+    for(uint32 i = 1; i < sLFGDungeonExpansionStore.GetNumRows(); ++i)
+    {
+        if(LFGDungeonExpansionEntry const* entry = sLFGDungeonExpansionStore.LookupEntry(i))
+            sLFGDungeonExpansionMap[MAKE_PAIR32(entry->dungeonID,entry->expansion)] = entry;
+    }
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sItemClassStore,           dbcPath, "ItemClass.dbc");
+    // LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemDisplayInfoStore,     dbcPath,"ItemDisplayInfo.dbc");     -- not used currently
+    // LoadDBC(availableDbcLocales,bar,bad_dbc_files,sItemCondExtCostsStore,    dbcPath,"ItemCondExtCosts.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sItemExtendedCostStore,    dbcPath, "ItemExtendedCost.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sItemLimitCategoryStore,   dbcPath, "ItemLimitCategory.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sItemRandomPropertiesStore, dbcPath, "ItemRandomProperties.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sItemRandomSuffixStore,    dbcPath, "ItemRandomSuffix.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sItemSetStore,             dbcPath, "ItemSet.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sLiquidTypeStore,          dbcPath, "LiquidType.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sLockStore,                dbcPath, "Lock.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sMailTemplateStore,        dbcPath, "MailTemplate.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sMapStore,                 dbcPath, "Map.dbc");
+
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sMapDifficultyStore,       dbcPath, "MapDifficulty.dbc");
+    // fill data
+    for (uint32 i = 1; i < sMapDifficultyStore.GetNumRows(); ++i)
+    {
+        if (MapDifficultyEntry const* entry = sMapDifficultyStore.LookupEntry(i))
+        {
+            sMapDifficultyMap[MAKE_PAIR32(entry->MapId, entry->Difficulty)] = entry;
+        }
+    }
+
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sMovieStore,               dbcPath, "Movie.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sOverrideSpellDataStore,   dbcPath, "OverrideSpellData.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sQuestFactionRewardStore,  dbcPath, "QuestFactionReward.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sQuestSortStore,           dbcPath, "QuestSort.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sQuestXPLevelStore,        dbcPath, "QuestXP.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sPowerDisplayStore,        dbcPath, "PowerDisplay.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sPvPDifficultyStore,       dbcPath, "PvpDifficulty.dbc");
+    for (uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i)
         if (PvPDifficultyEntry const* entry = sPvPDifficultyStore.LookupEntry(i))
             if (entry->bracketId > MAX_BATTLEGROUND_BRACKETS)
                 MANGOS_ASSERT(false && "Need update MAX_BATTLEGROUND_BRACKETS by DBC data");
 
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sRandomPropertiesPointsStore, dbcPath,"RandPropPoints.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sScalingStatDistributionStore, dbcPath,"ScalingStatDistribution.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sScalingStatValuesStore,   dbcPath,"ScalingStatValues.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSkillLineStore,           dbcPath,"SkillLine.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSkillLineAbilityStore,    dbcPath,"SkillLineAbility.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSkillRaceClassInfoStore,  dbcPath,"SkillRaceClassInfo.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSoundEntriesStore,        dbcPath,"SoundEntries.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellStore,               dbcPath,"Spell.dbc");
-    for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
-    {
-        SpellEntry const * spell = sSpellStore.LookupEntry(i);
-        if(spell && spell->Category)
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sRandomPropertiesPointsStore, dbcPath, "RandPropPoints.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sScalingStatDistributionStore, dbcPath, "ScalingStatDistribution.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sScalingStatValuesStore,   dbcPath, "ScalingStatValues.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSkillLineStore,           dbcPath, "SkillLine.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSkillLineAbilityStore,    dbcPath, "SkillLineAbility.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSkillRaceClassInfoStore,  dbcPath, "SkillRaceClassInfo.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSoundEntriesStore,        dbcPath, "SoundEntries.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSpellStore,               dbcPath, "Spell.dbc");
+    for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
+    {
+        SpellEntry const* spell = sSpellStore.LookupEntry(i);
+        if (spell && spell->Category)
             sSpellCategoryStore[spell->Category].insert(i);
 
         // DBC not support uint64 fields but SpellEntry have SpellFamilyFlags mapped at 2 uint32 fields
         // uint32 field already converted to bigendian if need, but must be swapped for correct uint64 bigendian view
-        #if MANGOS_ENDIAN == MANGOS_BIGENDIAN
-        std::swap(*((uint32*)(&spell->SpellFamilyFlags)),*(((uint32*)(&spell->SpellFamilyFlags))+1));
-        #endif
+#if MANGOS_ENDIAN == MANGOS_BIGENDIAN
+        std::swap(*((uint32*)(&spell->SpellFamilyFlags)), *(((uint32*)(&spell->SpellFamilyFlags)) + 1));
+#endif
+
+        for (uint8 j = 0; j < MAX_EFFECT_INDEX; ++j)
+        {
+            if (spell)
+                sSpellEffectMap[spell->Id].effects[SpellEffectIndex(j)] = SpellEffectEntry(spell, SpellEffectIndex(j));
+        }
     }
 
     for (uint32 j = 0; j < sSkillLineAbilityStore.GetNumRows(); ++j)
     {
-        SkillLineAbilityEntry const *skillLine = sSkillLineAbilityStore.LookupEntry(j);
+        SkillLineAbilityEntry const* skillLine = sSkillLineAbilityStore.LookupEntry(j);
 
-        if(!skillLine)
+        if (!skillLine)
             continue;
 
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(skillLine->spellId);
-        if (spellInfo && (spellInfo->Attributes & (SPELL_ATTR_UNK4 | SPELL_ATTR_PASSIVE | SPELL_ATTR_UNK7 | SPELL_ATTR_UNK8)) == (SPELL_ATTR_UNK4 | SPELL_ATTR_PASSIVE | SPELL_ATTR_UNK7 | SPELL_ATTR_UNK8))
+        if (spellInfo && (spellInfo->GetAttributes() & (SPELL_ATTR_ABILITY | SPELL_ATTR_PASSIVE | SPELL_ATTR_HIDDEN_CLIENTSIDE | SPELL_ATTR_HIDE_IN_COMBAT_LOG)) == (SPELL_ATTR_ABILITY | SPELL_ATTR_PASSIVE | SPELL_ATTR_HIDDEN_CLIENTSIDE | SPELL_ATTR_HIDE_IN_COMBAT_LOG))
         {
             for (unsigned int i = 1; i < sCreatureFamilyStore.GetNumRows(); ++i)
             {
                 CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(i);
-                if(!cFamily)
+                if (!cFamily)
                     continue;
 
-                if(skillLine->skillId != cFamily->skillLine[0] && skillLine->skillId != cFamily->skillLine[1])
+                if (skillLine->skillId != cFamily->skillLine[0] && skillLine->skillId != cFamily->skillLine[1])
                     continue;
 
                 sPetFamilySpellsStore[i].insert(spellInfo->Id);
@@ -522,207 +585,235 @@ void LoadDBCStores(const std::string& dataPath)
         }
     }
 
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellCastTimesStore,      dbcPath,"SpellCastTimes.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellDurationStore,       dbcPath,"SpellDuration.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellDifficultyStore,     dbcPath,"SpellDifficulty.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellFocusObjectStore,    dbcPath,"SpellFocusObject.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellItemEnchantmentStore,dbcPath,"SpellItemEnchantment.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellItemEnchantmentConditionStore,dbcPath,"SpellItemEnchantmentCondition.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellRadiusStore,         dbcPath,"SpellRadius.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellRangeStore,          dbcPath,"SpellRange.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellRuneCostStore,       dbcPath,"SpellRuneCost.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellShapeshiftFormStore, dbcPath,"SpellShapeshiftForm.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sStableSlotPricesStore,    dbcPath,"StableSlotPrices.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSummonPropertiesStore,    dbcPath,"SummonProperties.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTalentStore,              dbcPath,"Talent.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSpellCastTimesStore,      dbcPath, "SpellCastTimes.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSpellDurationStore,       dbcPath, "SpellDuration.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSpellDifficultyStore,     dbcPath, "SpellDifficulty.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSpellFocusObjectStore,    dbcPath, "SpellFocusObject.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSpellItemEnchantmentStore, dbcPath, "SpellItemEnchantment.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSpellItemEnchantmentConditionStore, dbcPath, "SpellItemEnchantmentCondition.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSpellRadiusStore,         dbcPath, "SpellRadius.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSpellRangeStore,          dbcPath, "SpellRange.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSpellRuneCostStore,       dbcPath, "SpellRuneCost.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSpellShapeshiftFormStore, dbcPath, "SpellShapeshiftForm.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sStableSlotPricesStore,    dbcPath, "StableSlotPrices.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sSummonPropertiesStore,    dbcPath, "SummonProperties.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sTalentStore,              dbcPath, "Talent.dbc");
 
     // create talent spells set
     for (unsigned int i = 0; i < sTalentStore.GetNumRows(); ++i)
     {
-        TalentEntry const *talentInfo = sTalentStore.LookupEntry(i);
+        TalentEntry const* talentInfo = sTalentStore.LookupEntry(i);
         if (!talentInfo) continue;
-        for (int j = 0; j < MAX_TALENT_RANK; j++)
-            if(talentInfo->RankID[j])
-                sTalentSpellPosMap[talentInfo->RankID[j]] = TalentSpellPos(i,j);
+        for (int j = 0; j < MAX_TALENT_RANK; ++j)
+            if (talentInfo->RankID[j])
+                sTalentSpellPosMap[talentInfo->RankID[j]] = TalentSpellPos(i, j);
     }
 
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTalentTabStore,           dbcPath,"TalentTab.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sTalentTabStore,           dbcPath, "TalentTab.dbc");
 
     // prepare fast data access to bit pos of talent ranks for use at inspecting
     {
         // now have all max ranks (and then bit amount used for store talent ranks in inspect)
-        for(uint32 talentTabId = 1; talentTabId < sTalentTabStore.GetNumRows(); ++talentTabId)
+        for (uint32 talentTabId = 1; talentTabId < sTalentTabStore.GetNumRows(); ++talentTabId)
         {
-            TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentTabId );
-            if(!talentTabInfo)
+            TalentTabEntry const* talentTabInfo = sTalentTabStore.LookupEntry(talentTabId);
+            if (!talentTabInfo)
                 continue;
 
             // prevent memory corruption; otherwise cls will become 12 below
-            if ((talentTabInfo->ClassMask & CLASSMASK_ALL_PLAYABLE)==0)
+            if ((talentTabInfo->ClassMask & CLASSMASK_ALL_PLAYABLE) == 0)
                 continue;
 
             // store class talent tab pages
             uint32 cls = 1;
-            for(uint32 m=1;!(m & talentTabInfo->ClassMask) && cls < MAX_CLASSES;m <<=1, ++cls) {}
+            for (uint32 m = 1; !(m & talentTabInfo->ClassMask) && cls < MAX_CLASSES; m <<= 1, ++cls) {}
 
-            sTalentTabPages[cls][talentTabInfo->tabpage]=talentTabId;
+            sTalentTabPages[cls][talentTabInfo->tabpage] = talentTabId;
         }
     }
 
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTaxiNodesStore,           dbcPath,"TaxiNodes.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sTaxiNodesStore,           dbcPath, "TaxiNodes.dbc");
 
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTaxiPathStore,            dbcPath,"TaxiPath.dbc");
-    for(uint32 i = 1; i < sTaxiPathStore.GetNumRows(); ++i)
-        if(TaxiPathEntry const* entry = sTaxiPathStore.LookupEntry(i))
-            sTaxiPathSetBySource[entry->from][entry->to] = TaxiPathBySourceAndDestination(entry->ID,entry->price);
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sTaxiPathStore,            dbcPath, "TaxiPath.dbc");
+    for (uint32 i = 1; i < sTaxiPathStore.GetNumRows(); ++i)
+        if (TaxiPathEntry const* entry = sTaxiPathStore.LookupEntry(i))
+            sTaxiPathSetBySource[entry->from][entry->to] = TaxiPathBySourceAndDestination(entry->ID, entry->price);
     uint32 pathCount = sTaxiPathStore.GetNumRows();
 
     //## TaxiPathNode.dbc ## Loaded only for initialization different structures
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTaxiPathNodeStore,        dbcPath,"TaxiPathNode.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sTaxiPathNodeStore,        dbcPath, "TaxiPathNode.dbc");
     // Calculate path nodes count
     std::vector<uint32> pathLength;
     pathLength.resize(pathCount);                           // 0 and some other indexes not used
-    for(uint32 i = 1; i < sTaxiPathNodeStore.GetNumRows(); ++i)
-        if(TaxiPathNodeEntry const* entry = sTaxiPathNodeStore.LookupEntry(i))
+    for (uint32 i = 1; i < sTaxiPathNodeStore.GetNumRows(); ++i)
+        if (TaxiPathNodeEntry const* entry = sTaxiPathNodeStore.LookupEntry(i))
         {
             if (pathLength[entry->path] < entry->index + 1)
                 pathLength[entry->path] = entry->index + 1;
         }
     // Set path length
     sTaxiPathNodesByPath.resize(pathCount);                 // 0 and some other indexes not used
-    for(uint32 i = 1; i < sTaxiPathNodesByPath.size(); ++i)
+    for (uint32 i = 1; i < sTaxiPathNodesByPath.size(); ++i)
         sTaxiPathNodesByPath[i].resize(pathLength[i]);
     // fill data (pointers to sTaxiPathNodeStore elements
-    for(uint32 i = 1; i < sTaxiPathNodeStore.GetNumRows(); ++i)
-        if(TaxiPathNodeEntry const* entry = sTaxiPathNodeStore.LookupEntry(i))
+    for (uint32 i = 1; i < sTaxiPathNodeStore.GetNumRows(); ++i)
+        if (TaxiPathNodeEntry const* entry = sTaxiPathNodeStore.LookupEntry(i))
             sTaxiPathNodesByPath[entry->path].set(entry->index, entry);
 
     // Initialize global taxinodes mask
     // include existing nodes that have at least single not spell base (scripted) path
     {
         std::set<uint32> spellPaths;
-        for(uint32 i = 1; i < sSpellStore.GetNumRows (); ++i)
-            if(SpellEntry const* sInfo = sSpellStore.LookupEntry (i))
-                for(int j=0; j < MAX_EFFECT_INDEX; ++j)
-                    if(sInfo->Effect[j]==123 /*SPELL_EFFECT_SEND_TAXI*/)
+        for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
+            if (SpellEntry const* sInfo = sSpellStore.LookupEntry(i))
+                for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
+                    if (sInfo->Effect[j] == 123 /*SPELL_EFFECT_SEND_TAXI*/)
                         spellPaths.insert(sInfo->EffectMiscValue[j]);
 
-        memset(sTaxiNodesMask,0,sizeof(sTaxiNodesMask));
-        memset(sOldContinentsNodesMask,0,sizeof(sTaxiNodesMask));
-        for(uint32 i = 1; i < sTaxiNodesStore.GetNumRows(); ++i)
+        memset(sTaxiNodesMask, 0, sizeof(sTaxiNodesMask));
+        memset(sOldContinentsNodesMask, 0, sizeof(sTaxiNodesMask));
+        for (uint32 i = 1; i < sTaxiNodesStore.GetNumRows(); ++i)
         {
             TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(i);
-            if(!node)
+            if (!node)
                 continue;
 
             TaxiPathSetBySource::const_iterator src_i = sTaxiPathSetBySource.find(i);
-            if(src_i!=sTaxiPathSetBySource.end() && !src_i->second.empty())
+            if (src_i != sTaxiPathSetBySource.end() && !src_i->second.empty())
             {
                 bool ok = false;
-                for(TaxiPathSetForSource::const_iterator dest_i = src_i->second.begin();dest_i != src_i->second.end(); ++dest_i)
+                for (TaxiPathSetForSource::const_iterator dest_i = src_i->second.begin(); dest_i != src_i->second.end(); ++dest_i)
                 {
                     // not spell path
-                    if(spellPaths.find(dest_i->second.ID)==spellPaths.end())
+                    if (spellPaths.find(dest_i->second.ID) == spellPaths.end())
                     {
                         ok = true;
                         break;
                     }
                 }
 
-                if(!ok)
+                if (!ok)
                     continue;
             }
 
             // valid taxi network node
             uint8  field   = (uint8)((i - 1) / 32);
-            uint32 submask = 1<<((i-1)%32);
+            uint32 submask = 1 << ((i - 1) % 32);
             sTaxiNodesMask[field] |= submask;
 
             // old continent node (+ nodes virtually at old continents, check explicitly to avoid loading map files for zone info)
             if (node->map_id < 2 || i == 82 || i == 83 || i == 93 || i == 94)
                 sOldContinentsNodesMask[field] |= submask;
+
+            // Hack DK node at Ebon Hold (unclear if bad dbc data or we need to revisit our checks in ObjectMgr::GetNearestTaxiNode )
+            if (i == 315)
+               (const_cast<TaxiNodesEntry*>(node))->MountCreatureID[1] = node->MountCreatureID[0];
         }
     }
 
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTeamContributionPoints,   dbcPath,"TeamContributionPoints.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTotemCategoryStore,       dbcPath,"TotemCategory.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sVehicleStore,             dbcPath,"Vehicle.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sVehicleSeatStore,         dbcPath,"VehicleSeat.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sWorldMapAreaStore,        dbcPath,"WorldMapArea.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sWMOAreaTableStore,        dbcPath,"WMOAreaTable.dbc");
-    for(uint32 i = 0; i < sWMOAreaTableStore.GetNumRows(); ++i)
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sTeamContributionPoints,   dbcPath, "TeamContributionPoints.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sTotemCategoryStore,       dbcPath, "TotemCategory.dbc");
+    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTransportAnimationStore,     dbcPath,"TransportAnimation.dbc");
+    for (uint32 i = 0; i < sTransportAnimationStore.GetNumRows(); ++i)
+        if (TransportAnimationEntry const* entry = sTransportAnimationStore.LookupEntry(i))
+            sTransportAnimationsByEntry[entry->transportEntry][entry->timeFrame] = entry;
+
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sVehicleStore,             dbcPath, "Vehicle.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sVehicleSeatStore,         dbcPath, "VehicleSeat.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sWorldMapAreaStore,        dbcPath, "WorldMapArea.dbc");
+    for (uint32 i = 0; i < sWorldMapAreaStore.GetNumRows(); ++i)
+    {
+        if (WorldMapAreaEntry const* entry = sWorldMapAreaStore.LookupEntry(i))
+        {
+            if (entry->zone_id != 0) // Strip overall continent definition
+                sWorldMapAreaMap.insert(WorldMapAreaMap::value_type(entry->zone_id, entry));
+        }
+    }
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sWMOAreaTableStore,        dbcPath, "WMOAreaTable.dbc");
+    for (uint32 i = 0; i < sWMOAreaTableStore.GetNumRows(); ++i)
     {
-        if(WMOAreaTableEntry const* entry = sWMOAreaTableStore.LookupEntry(i))
+        if (WMOAreaTableEntry const* entry = sWMOAreaTableStore.LookupEntry(i))
         {
             sWMOAreaInfoByTripple.insert(WMOAreaInfoByTripple::value_type(WMOAreaTableTripple(entry->rootId, entry->adtId, entry->groupId), entry));
         }
     }
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sWorldMapOverlayStore,     dbcPath,"WorldMapOverlay.dbc");
-    LoadDBC(availableDbcLocales,bar,bad_dbc_files,sWorldSafeLocsStore,       dbcPath,"WorldSafeLocs.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sWorldMapOverlayStore,     dbcPath, "WorldMapOverlay.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sWorldSafeLocsStore,       dbcPath, "WorldSafeLocs.dbc");
+    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sWorldStateStore,          dbcPath, "WorldStateUI.dbc");
 
     // error checks
-    if (bad_dbc_files.size() >= DBCFilesCount )
+    if (bad_dbc_files.size() >= DBCFilesCount)
     {
-        sLog.outError("\nIncorrect DataDir value in mangosd.conf or ALL required *.dbc files (%d) not found by path: %sdbc",DBCFilesCount,dataPath.c_str());
+        sLog.outError("\nIncorrect DataDir value in mangosd.conf or ALL required *.dbc files (%d) not found by path: %sdbc", DBCFilesCount, dataPath.c_str());
         Log::WaitBeforeContinueIfNeed();
         exit(1);
     }
-    else if (!bad_dbc_files.empty() )
+    else if (!bad_dbc_files.empty())
     {
         std::string str;
-        for(std::list<std::string>::iterator i = bad_dbc_files.begin(); i != bad_dbc_files.end(); ++i)
+        for (std::list<std::string>::iterator i = bad_dbc_files.begin(); i != bad_dbc_files.end(); ++i)
             str += *i + "\n";
 
-        sLog.outError("\nSome required *.dbc files (%u from %d) not found or not compatible:\n%s",(uint32)bad_dbc_files.size(),DBCFilesCount,str.c_str());
+        sLog.outError("\nSome required *.dbc files (%u from %d) not found or not compatible:\n%s", (uint32)bad_dbc_files.size(), DBCFilesCount, str.c_str());
         Log::WaitBeforeContinueIfNeed();
         exit(1);
     }
 
     // Check loaded DBC files proper version
     if (!sAreaStore.LookupEntry(3617)              ||       // last area (areaflag) added in 3.3.5a
-        !sCharTitlesStore.LookupEntry(177)         ||       // last char title added in 3.3.5a
-        !sGemPropertiesStore.LookupEntry(1629)     ||       // last gem property added in 3.3.5a
-        !sItemStore.LookupEntry(56806)             ||       // last client known item added in 3.3.5a
-        !sItemExtendedCostStore.LookupEntry(2997)  ||       // last item extended cost added in 3.3.5a
-        !sMapStore.LookupEntry(724)                ||       // last map added in 3.3.5a
-        !sSpellStore.LookupEntry(80864)            )        // last added spell in 3.3.5a
-    {
-        sLog.outError("\nYou have mixed version DBC files. Please re-extract DBC files for one from client build: %s",AcceptableClientBuildsListStr().c_str());
+            !sCharTitlesStore.LookupEntry(177)         ||   // last char title added in 3.3.5a
+            !sGemPropertiesStore.LookupEntry(1629)     ||   // last gem property added in 3.3.5a
+            !sItemStore.LookupEntry(56806)             ||   // last client known item added in 3.3.5a
+            !sItemExtendedCostStore.LookupEntry(2997)  ||   // last item extended cost added in 3.3.5a
+            !sMapStore.LookupEntry(724)                ||   // last map added in 3.3.5a
+            !sSpellStore.LookupEntry(80864))                // last added spell in 3.3.5a
+    {
+        sLog.outError("\nYou have mixed version DBC files. Please re-extract DBC files for one from client build: %s", AcceptableClientBuildsListStr().c_str());
         Log::WaitBeforeContinueIfNeed();
         exit(1);
     }
 
     sLog.outString();
-    sLog.outString( ">> Initialized %d data stores", DBCFilesCount );
+    sLog.outString(">> Initialized %d data stores", DBCFilesCount);
 }
 
 SimpleFactionsList const* GetFactionTeamList(uint32 faction)
 {
     FactionTeamMap::const_iterator itr = sFactionTeamMap.find(faction);
-    if(itr==sFactionTeamMap.end())
+    if (itr == sFactionTeamMap.end())
         return NULL;
     return &itr->second;
 }
 
 char const* GetPetName(uint32 petfamily, uint32 dbclang)
 {
-    if(!petfamily)
+    if (!petfamily)
         return NULL;
-    CreatureFamilyEntry const *pet_family = sCreatureFamilyStore.LookupEntry(petfamily);
-    if(!pet_family)
+    CreatureFamilyEntry const* pet_family = sCreatureFamilyStore.LookupEntry(petfamily);
+    if (!pet_family)
         return NULL;
-    return pet_family->Name[dbclang]?pet_family->Name[dbclang]:NULL;
+    return pet_family->Name[dbclang] ? pet_family->Name[dbclang] : NULL;
 }
 
 TalentSpellPos const* GetTalentSpellPos(uint32 spellId)
 {
     TalentSpellPosMap::const_iterator itr = sTalentSpellPosMap.find(spellId);
-    if(itr==sTalentSpellPosMap.end())
+    if (itr == sTalentSpellPosMap.end())
         return NULL;
 
     return &itr->second;
 }
 
+SpellEffectEntry const* GetSpellEffectEntry(uint32 spellId, SpellEffectIndex effect)
+{
+    SpellEffectMap::const_iterator itr = sSpellEffectMap.find(spellId);
+    if(itr == sSpellEffectMap.end())
+        return NULL;
+
+    return &itr->second.effects[effect];
+}
+
+
 uint32 GetTalentSpellCost(TalentSpellPos const* pos)
 {
     if (pos)
@@ -747,28 +838,25 @@ int32 GetAreaFlagByAreaID(uint32 area_id)
 
 WMOAreaTableEntry const* GetWMOAreaTableEntryByTripple(int32 rootid, int32 adtid, int32 groupid)
 {
-        WMOAreaInfoByTripple::iterator i = sWMOAreaInfoByTripple.find(WMOAreaTableTripple(rootid, adtid, groupid));
-            if(i == sWMOAreaInfoByTripple.end())
-                        return NULL;
-                return i->second;
-
+    WMOAreaInfoByTripple::const_iterator i = sWMOAreaInfoByTripple.find(WMOAreaTableTripple(rootid, adtid, groupid));
+    return (i == sWMOAreaInfoByTripple.end()) ? NULL : i->second;
 }
 
 AreaTableEntry const* GetAreaEntryByAreaID(uint32 area_id)
 {
     int32 areaflag = GetAreaFlagByAreaID(area_id);
-    if(areaflag < 0)
+    if (areaflag < 0)
         return NULL;
 
-    return sAreaStore.LookupEntry(areaflag );
+    return sAreaStore.LookupEntry(areaflag);
 }
 
-AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag,uint32 map_id)
+AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag, uint32 map_id)
 {
-    if(area_flag)
+    if (area_flag)
         return sAreaStore.LookupEntry(area_flag);
 
-    if(MapEntry const* mapEntry = sMapStore.LookupEntry(map_id))
+    if (MapEntry const* mapEntry = sMapStore.LookupEntry(map_id))
         return GetAreaEntryByAreaID(mapEntry->linked_zone);
 
     return NULL;
@@ -777,7 +865,7 @@ AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag,uint32 map_i
 uint32 GetAreaFlagByMapId(uint32 mapid)
 {
     AreaFlagByMapID::iterator i = sAreaFlagByMapID.find(mapid);
-    if(i == sAreaFlagByMapID.end())
+    if (i == sAreaFlagByMapID.end())
         return 0;
     else
         return i->second;
@@ -785,26 +873,24 @@ uint32 GetAreaFlagByMapId(uint32 mapid)
 
 uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId)
 {
-    if(mapid != 530 && mapid != 571)                        // speed for most cases
-        return mapid;
-
-    if(WorldMapAreaEntry const* wma = sWorldMapAreaStore.LookupEntry(zoneId))
-        return wma->virtual_map_id >= 0 ? wma->virtual_map_id : wma->map_id;
+    WorldMapAreaMap::const_iterator itr = sWorldMapAreaMap.find(zoneId);
+    if (itr != sWorldMapAreaMap.end())
+        return itr->second->virtual_map_id >= 0 ? itr->second->virtual_map_id : itr->second->map_id;
 
     return mapid;
 }
 
 ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId)
 {
-    mapid = GetVirtualMapForMapAndZone(mapid,zoneId);
-    if(mapid < 2)
+    mapid = GetVirtualMapForMapAndZone(mapid, zoneId);
+    if (mapid < 2)
         return CONTENT_1_60;
 
     MapEntry const* mapEntry = sMapStore.LookupEntry(mapid);
-    if(!mapEntry)
+    if (!mapEntry)
         return CONTENT_1_60;
 
-    switch(mapEntry->Expansion())
+    switch (mapEntry->Expansion())
     {
         default: return CONTENT_1_60;
         case 1:  return CONTENT_61_70;
@@ -812,13 +898,85 @@ ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId)
     }
 }
 
+WorldMapAreaEntry const* GetWorldMapAreaByAreaID(uint32 area_id)
+{
+    int32 areaflag = GetAreaFlagByAreaID(area_id);
+
+    if (areaflag < 0)
+        return NULL;
+
+    AreaTableEntry const* entry = sAreaStore.LookupEntry(areaflag);
+
+    if (!entry)
+        return NULL;
+
+    WorldMapAreaMap::const_iterator itr = sWorldMapAreaMap.find((entry->zone == 0) ? entry->ID : entry->zone);
+    if (itr != sWorldMapAreaMap.end())
+        return itr->second;
+
+    return NULL;
+}
+
+WorldMapAreaEntry const* GetWorldMapAreaByMapID(uint32 map_id)
+{
+    MapEntry const* targetMapEntry = sMapStore.LookupEntry(map_id);
+    if (!targetMapEntry)
+        return NULL;
+
+    for (uint32 i = 0; i < sWorldMapAreaStore.GetNumRows(); ++i)
+    {
+        if (WorldMapAreaEntry const* entry = sWorldMapAreaStore.LookupEntry(i))
+        {
+            if (entry->map_id == map_id && (!targetMapEntry->IsContinent() || (entry->zone_id == 0)))
+                return entry;
+        }
+    }
+    return NULL;
+}
+
+std::vector<uint32> GetWorldMapAreaSetByMapID(uint32 map_id)
+{
+    std::vector<uint32> maps;
+    for (uint32 i = 0; i < sWorldMapAreaStore.GetNumRows(); ++i)
+    {
+        if (WorldMapAreaEntry const* entry = sWorldMapAreaStore.LookupEntry(i))
+        {
+            if (entry->map_id == map_id && !(entry->zone_id == 0)) // scip continents main area
+                maps.push_back(entry->zone_id);
+        }
+    }
+
+    for (uint32 i = 0; i < sAreaStore.GetNumRows(); ++i)
+    {
+        if (AreaTableEntry const* area = sAreaStore.LookupEntry(i))
+        {
+            if (area->mapid == map_id  && area->zone == 0)
+                maps.push_back(area->ID);
+        }
+    }
+
+    if (maps.size() > 1)
+    {
+        std::sort(maps.begin(), maps.end());
+        std::vector<uint32>::iterator itr = std::unique(maps.begin(), maps.end());
+        maps.resize(std::distance(maps.begin(),itr));
+        // for multizoned maps push special 0 zone - for "non-zoned" objects.
+        maps.push_back(0);
+    }
+    else if (maps.empty())
+        // If no zones in map (arenas, transport, etc) push special 0 zone - for all map.
+        maps.push_back(0);
+
+    return maps;
+}
+
 ChatChannelsEntry const* GetChannelEntryFor(uint32 channel_id)
 {
     // not sorted, numbering index from 0
-    for(uint32 i = 0; i < sChatChannelsStore.GetNumRows(); ++i)
+    for (uint32 i = 0; i < sChatChannelsStore.GetNumRows(); ++i)
     {
         ChatChannelsEntry const* ch = sChatChannelsStore.LookupEntry(i);
-        if(ch && ch->ChannelID == channel_id)
+        if (ch && ch->ChannelID == channel_id)
             return ch;
     }
     return NULL;
@@ -826,25 +984,25 @@ ChatChannelsEntry const* GetChannelEntryFor(uint32 channel_id)
 
 bool IsTotemCategoryCompatiableWith(uint32 itemTotemCategoryId, uint32 requiredTotemCategoryId)
 {
-    if(requiredTotemCategoryId==0)
+    if (requiredTotemCategoryId == 0)
         return true;
-    if(itemTotemCategoryId==0)
+    if (itemTotemCategoryId == 0)
         return false;
 
     TotemCategoryEntry const* itemEntry = sTotemCategoryStore.LookupEntry(itemTotemCategoryId);
-    if(!itemEntry)
+    if (!itemEntry)
         return false;
     TotemCategoryEntry const* reqEntry = sTotemCategoryStore.LookupEntry(requiredTotemCategoryId);
-    if(!reqEntry)
+    if (!reqEntry)
         return false;
 
-    if(itemEntry->categoryType!=reqEntry->categoryType)
+    if (itemEntry->categoryType != reqEntry->categoryType)
         return false;
 
-    return (itemEntry->categoryMask & reqEntry->categoryMask)==reqEntry->categoryMask;
+    return (itemEntry->categoryMask & reqEntry->categoryMask) == reqEntry->categoryMask;
 }
 
-bool Zone2MapCoordinates(float& x,float& y,uint32 zone)
+bool Zone2MapCoordinates(float& x, float& y, uint32 zone)
 {
     WorldMapAreaEntry const* maEntry = sWorldMapAreaStore.LookupEntry(zone);
 
@@ -852,14 +1010,14 @@ bool Zone2MapCoordinates(float& x,float& y,uint32 zone)
     if (!maEntry || maEntry->x2 == maEntry->x1 || maEntry->y2 == maEntry->y1)
         return false;
 
-    std::swap(x,y);                                         // at client map coords swapped
-    x = x*((maEntry->x2-maEntry->x1)/100)+maEntry->x1;
-    y = y*((maEntry->y2-maEntry->y1)/100)+maEntry->y1;      // client y coord from top to down
+    std::swap(x, y);                                        // at client map coords swapped
+    x = x * ((maEntry->x2 - maEntry->x1) / 100) + maEntry->x1;
+    y = y * ((maEntry->y2 - maEntry->y1) / 100) + maEntry->y1; // client y coord from top to down
 
     return true;
 }
 
-bool Map2ZoneCoordinates(float& x,float& y,uint32 zone)
+bool Map2ZoneCoordinates(float& x, float& y, uint32 zone)
 {
     WorldMapAreaEntry const* maEntry = sWorldMapAreaStore.LookupEntry(zone);
 
@@ -867,23 +1025,29 @@ bool Map2ZoneCoordinates(float& x,float& y,uint32 zone)
     if (!maEntry || maEntry->x2 == maEntry->x1 || maEntry->y2 == maEntry->y1)
         return false;
 
-    x = (x-maEntry->x1)/((maEntry->x2-maEntry->x1)/100);
-    y = (y-maEntry->y1)/((maEntry->y2-maEntry->y1)/100);    // client y coord from top to down
-    std::swap(x,y);                                         // client have map coords swapped
+    x = (x - maEntry->x1) / ((maEntry->x2 - maEntry->x1) / 100);
+    y = (y - maEntry->y1) / ((maEntry->y2 - maEntry->y1) / 100); // client y coord from top to down
+    std::swap(x, y);                                        // client have map coords swapped
 
     return true;
 }
 
-MapDifficulty const* GetMapDifficultyData(uint32 mapId, Difficulty difficulty)
+MapDifficultyEntry const* GetMapDifficultyData(uint32 mapId, Difficulty difficulty)
+{
+    MapDifficultyMap::const_iterator itr = sMapDifficultyMap.find(MAKE_PAIR32(mapId, difficulty));
+    return itr != sMapDifficultyMap.end() ? itr->second : NULL;
+}
+
+LFGDungeonExpansionEntry const* GetLFGExpansionEntry(uint32 dungeonId, uint32 expansion)
 {
-    MapDifficultyMap::const_iterator itr = sMapDifficultyMap.find(MAKE_PAIR32(mapId,difficulty));
-    return itr != sMapDifficultyMap.end() ? &itr->second : NULL;
+    LFGDungeonExpansionMap::const_iterator itr = sLFGDungeonExpansionMap.find(MAKE_PAIR32(dungeonId,expansion));
+    return itr != sLFGDungeonExpansionMap.end() ? itr->second : NULL;
 }
 
-PvPDifficultyEntry const* GetBattlegroundBracketByLevel( uint32 mapid, uint32 level )
+PvPDifficultyEntry const* GetBattlegroundBracketByLevel(uint32 mapid, uint32 level)
 {
     PvPDifficultyEntry const* maxEntry = NULL;              // used for level > max listed level case
-    for(uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i)
+    for (uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i)
     {
         if (PvPDifficultyEntry const* entry = sPvPDifficultyStore.LookupEntry(i))
         {
@@ -906,7 +1070,7 @@ PvPDifficultyEntry const* GetBattlegroundBracketByLevel( uint32 mapid, uint32 le
 
 PvPDifficultyEntry const* GetBattlegroundBracketById(uint32 mapid, BattleGroundBracketId id)
 {
-    for(uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i)
+    for (uint32 i = 0; i < sPvPDifficultyStore.GetNumRows(); ++i)
         if (PvPDifficultyEntry const* entry = sPvPDifficultyStore.LookupEntry(i))
             if (entry->mapId == mapid && entry->GetBracketId() == id)
                 return entry;
@@ -927,8 +1091,8 @@ bool IsPointInAreaTriggerZone(AreaTriggerEntry const* atEntry, uint32 mapid, flo
     if (atEntry->radius > 0)
     {
         // if we have radius check it
-        float dist2 = (x-atEntry->x)*(x-atEntry->x) + (y-atEntry->y)*(y-atEntry->y) + (z-atEntry->z)*(z-atEntry->z);
-        if(dist2 > (atEntry->radius + delta)*(atEntry->radius + delta))
+        float dist2 = (x - atEntry->x) * (x - atEntry->x) + (y - atEntry->y) * (y - atEntry->y) + (z - atEntry->z) * (z - atEntry->z);
+        if (dist2 > (atEntry->radius + delta) * (atEntry->radius + delta))
             return false;
     }
     else
@@ -939,23 +1103,23 @@ bool IsPointInAreaTriggerZone(AreaTriggerEntry const* atEntry, uint32 mapid, flo
         // is-in-cube check and we have to calculate only one point instead of 4
 
         // 2PI = 360, keep in mind that ingame orientation is counter-clockwise
-        double rotation = 2*M_PI-atEntry->box_orientation;
+        double rotation = 2 * M_PI - atEntry->box_orientation;
         double sinVal = sin(rotation);
         double cosVal = cos(rotation);
 
         float playerBoxDistX = x - atEntry->x;
         float playerBoxDistY = y - atEntry->y;
 
-        float rotPlayerX = float(atEntry->x + playerBoxDistX * cosVal - playerBoxDistY*sinVal);
-        float rotPlayerY = float(atEntry->y + playerBoxDistY * cosVal + playerBoxDistX*sinVal);
+        float rotPlayerX = float(atEntry->x + playerBoxDistX * cosVal - playerBoxDistY * sinVal);
+        float rotPlayerY = float(atEntry->y + playerBoxDistY * cosVal + playerBoxDistX * sinVal);
 
         // box edges are parallel to coordiante axis, so we can treat every dimension independently :D
         float dz = z - atEntry->z;
         float dx = rotPlayerX - atEntry->x;
         float dy = rotPlayerY - atEntry->y;
-        if( (fabs(dx) > atEntry->box_x/2 + delta) ||
-            (fabs(dy) > atEntry->box_y/2 + delta) ||
-            (fabs(dz) > atEntry->box_z/2 + delta) )
+        if ((fabs(dx) > atEntry->box_x / 2 + delta) ||
+                (fabs(dy) > atEntry->box_y / 2 + delta) ||
+                (fabs(dz) > atEntry->box_z / 2 + delta))
         {
             return false;
         }
@@ -981,4 +1145,5 @@ MANGOS_DLL_SPEC DBCStorage <FactionEntry>       const* GetFactionStore()
 MANGOS_DLL_SPEC DBCStorage <ItemEntry>          const* GetItemDisplayStore()    { return &sItemStore;           }
 MANGOS_DLL_SPEC DBCStorage <CreatureDisplayInfoEntry> const* GetCreatureDisplayStore() { return &sCreatureDisplayInfoStore; }
 MANGOS_DLL_SPEC DBCStorage <EmotesEntry>        const* GetEmotesStore()         { return &sEmotesStore;         }
+MANGOS_DLL_SPEC DBCStorage <AchievementEntry>   const* GetAchievementStore()    { return &sAchievementStore;    }
 MANGOS_DLL_SPEC DBCStorage <EmotesTextEntry>    const* GetEmotesTextStore()     { return &sEmotesTextStore;     }
diff --git a/src/game/DBCStores.h b/src/game/DBCStores.h
index 6a79f2737e0..d3f9a0217fd 100644
--- a/src/game/DBCStores.h
+++ b/src/game/DBCStores.h
@@ -36,13 +36,15 @@ uint32 GetTalentSpellCost(uint32 spellId);
 uint32 GetTalentSpellCost(TalentSpellPos const* pos);
 TalentSpellPos const* GetTalentSpellPos(uint32 spellId);
 
+SpellEffectEntry const* GetSpellEffectEntry(uint32 spellId, SpellEffectIndex effect);
+
 int32 GetAreaFlagByAreaID(uint32 area_id);                  // -1 if not found
 uint32 GetAreaFlagByMapId(uint32 mapid);
 
 WMOAreaTableEntry const* GetWMOAreaTableEntryByTripple(int32 rootid, int32 adtid, int32 groupid);
 
 MANGOS_DLL_SPEC AreaTableEntry const* GetAreaEntryByAreaID(uint32 area_id);
-MANGOS_DLL_SPEC AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag,uint32 map_id);
+MANGOS_DLL_SPEC AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag, uint32 map_id);
 
 uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId);
 
@@ -58,11 +60,23 @@ ChatChannelsEntry const* GetChannelEntryFor(uint32 channel_id);
 
 bool IsTotemCategoryCompatiableWith(uint32 itemTotemCategoryId, uint32 requiredTotemCategoryId);
 
-bool Zone2MapCoordinates(float& x,float& y,uint32 zone);
-bool Map2ZoneCoordinates(float& x,float& y,uint32 zone);
+bool Zone2MapCoordinates(float& x, float& y, uint32 zone);
+bool Map2ZoneCoordinates(float& x, float& y, uint32 zone);
+
+typedef UNORDERED_MAP<uint32/* pair32(dungeonId,expansion) */,LFGDungeonExpansionEntry const*> LFGDungeonExpansionMap;
+LFGDungeonExpansionEntry const* GetLFGExpansionEntry(uint32 dungeonId, uint32 expansion);
+
+typedef UNORDERED_MAP<uint32/*pair32(map,diff)*/,MapDifficultyEntry const*> MapDifficultyMap;
+MapDifficultyEntry const* GetMapDifficultyData(uint32 mapId, Difficulty difficulty);
 
-typedef std::map<uint32/*pair32(map,diff)*/,MapDifficulty> MapDifficultyMap;
-MapDifficulty const* GetMapDifficultyData(uint32 mapId, Difficulty difficulty);
+typedef UNORDERED_MAP<uint32 /*zone_id*/, WorldMapAreaEntry const*> WorldMapAreaMap;
+WorldMapAreaEntry const* GetWorldMapAreaByAreaId(uint32 area_id);
+
+// returns main WorldMapArea for all maps, overall WorldMapArea (zone_id = 0) for continents
+WorldMapAreaEntry const* GetWorldMapAreaByMapID(uint32 map_id);
+
+// returns set of all zones in given map (1 zone mostly)
+std::vector<uint32> GetWorldMapAreaSetByMapID(uint32 map_id);
 
 // natural order for difficulties up-down iteration
 // difficulties for dungeons/battleground ordered in normal way
@@ -104,7 +118,7 @@ extern DBCStorage <AuctionHouseEntry>            sAuctionHouseStore;
 extern DBCStorage <BankBagSlotPricesEntry>       sBankBagSlotPricesStore;
 extern DBCStorage <BarberShopStyleEntry>         sBarberShopStyleStore;
 extern DBCStorage <BattlemasterListEntry>        sBattlemasterListStore;
-//extern DBCStorage <ChatChannelsEntry>           sChatChannelsStore; -- accessed using function, no usable index
+// extern DBCStorage <ChatChannelsEntry>           sChatChannelsStore; -- accessed using function, no usable index
 extern DBCStorage <CharStartOutfitEntry>         sCharStartOutfitStore;
 extern DBCStorage <CharTitlesEntry>              sCharTitlesStore;
 extern DBCStorage <ChrClassesEntry>              sChrClassesStore;
@@ -113,9 +127,11 @@ extern DBCStorage <CinematicSequencesEntry>      sCinematicSequencesStore;
 extern DBCStorage <CreatureDisplayInfoEntry>     sCreatureDisplayInfoStore;
 extern DBCStorage <CreatureDisplayInfoExtraEntry>sCreatureDisplayInfoExtraStore;
 extern DBCStorage <CreatureFamilyEntry>          sCreatureFamilyStore;
+extern DBCStorage <CreatureModelDataEntry>       sCreatureModelDataStore;
 extern DBCStorage <CreatureSpellDataEntry>       sCreatureSpellDataStore;
 extern DBCStorage <CreatureTypeEntry>            sCreatureTypeStore;
 extern DBCStorage <CurrencyTypesEntry>           sCurrencyTypesStore;
+extern DBCStorage <DestructibleModelDataEntry>   sDestructibleModelDataStore;
 extern DBCStorage <DungeonEncounterEntry>        sDungeonEncounterStore;
 extern DBCStorage <DurabilityCostsEntry>         sDurabilityCostsStore;
 extern DBCStorage <DurabilityQualityEntry>       sDurabilityQualityStore;
@@ -136,30 +152,35 @@ extern DBCStorage <GtChanceToSpellCritBaseEntry> sGtChanceToSpellCritBaseStore;
 extern DBCStorage <GtChanceToSpellCritEntry>     sGtChanceToSpellCritStore;
 extern DBCStorage <GtOCTClassCombatRatingScalarEntry> sGtOCTClassCombatRatingScalarStore;
 extern DBCStorage <GtOCTRegenHPEntry>            sGtOCTRegenHPStore;
-//extern DBCStorage <GtOCTRegenMPEntry>            sGtOCTRegenMPStore; -- not used currently
+// extern DBCStorage <GtOCTRegenMPEntry>            sGtOCTRegenMPStore; -- not used currently
 extern DBCStorage <GtRegenHPPerSptEntry>         sGtRegenHPPerSptStore;
 extern DBCStorage <GtRegenMPPerSptEntry>         sGtRegenMPPerSptStore;
 extern DBCStorage <HolidaysEntry>                sHolidaysStore;
 extern DBCStorage <ItemEntry>                    sItemStore;
 extern DBCStorage <ItemBagFamilyEntry>           sItemBagFamilyStore;
 extern DBCStorage <ItemClassEntry>               sItemClassStore;
-//extern DBCStorage <ItemDisplayInfoEntry>      sItemDisplayInfoStore; -- not used currently
+// extern DBCStorage <ItemDisplayInfoEntry>      sItemDisplayInfoStore; -- not used currently
 extern DBCStorage <ItemExtendedCostEntry>        sItemExtendedCostStore;
 extern DBCStorage <ItemLimitCategoryEntry>       sItemLimitCategoryStore;
 extern DBCStorage <ItemRandomPropertiesEntry>    sItemRandomPropertiesStore;
 extern DBCStorage <ItemRandomSuffixEntry>        sItemRandomSuffixStore;
 extern DBCStorage <ItemSetEntry>                 sItemSetStore;
+extern DBCStorage <LFGDungeonEntry>              sLFGDungeonStore;
+extern DBCStorage <LFGDungeonExpansionEntry>     sLFGDungeonExpansionStore;
+extern LFGDungeonExpansionMap                    sLFGDungeonExpansionMap;
+extern DBCStorage <LiquidTypeEntry>              sLiquidTypeStore;
 extern DBCStorage <LockEntry>                    sLockStore;
 extern DBCStorage <MailTemplateEntry>            sMailTemplateStore;
 extern DBCStorage <MapEntry>                     sMapStore;
-//extern DBCStorage <MapDifficultyEntry>           sMapDifficultyStore; -- use GetMapDifficultyData insteed
+extern DBCStorage <MapDifficultyEntry>           sMapDifficultyStore;
 extern MapDifficultyMap                          sMapDifficultyMap;
 extern DBCStorage <MovieEntry>                   sMovieStore;
 extern DBCStorage <OverrideSpellDataEntry>       sOverrideSpellDataStore;
 extern DBCStorage <QuestFactionRewardEntry>      sQuestFactionRewardStore;
 extern DBCStorage <QuestSortEntry>               sQuestSortStore;
 extern DBCStorage <QuestXPLevel>                 sQuestXPLevelStore;
-//extern DBCStorage <PvPDifficultyEntry>           sPvPDifficultyStore; -- use GetBattlegroundSlotByLevel for access
+extern DBCStorage <PowerDisplayEntry>            sPowerDisplayStore;
+// extern DBCStorage <PvPDifficultyEntry>           sPvPDifficultyStore; -- use GetBattlegroundSlotByLevel for access
 extern DBCStorage <RandomPropertiesPointsEntry>  sRandomPropertiesPointsStore;
 extern DBCStorage <ScalingStatDistributionEntry> sScalingStatDistributionStore;
 extern DBCStorage <ScalingStatValuesEntry>       sScalingStatValuesStore;
@@ -192,12 +213,15 @@ extern TaxiPathSetBySource                       sTaxiPathSetBySource;
 extern TaxiPathNodesByPath                       sTaxiPathNodesByPath;
 extern DBCStorage <TeamContributionPoints>       sTeamContributionPoints;
 extern DBCStorage <TotemCategoryEntry>           sTotemCategoryStore;
+extern TransportAnimationsByEntry                sTransportAnimationsByEntry;
+extern DBCStorage <TransportAnimationEntry>      sTransportAnimationStore;
 extern DBCStorage <VehicleEntry>                 sVehicleStore;
 extern DBCStorage <VehicleSeatEntry>             sVehicleSeatStore;
 extern DBCStorage <WMOAreaTableEntry>            sWMOAreaTableStore;
-//extern DBCStorage <WorldMapAreaEntry>           sWorldMapAreaStore; -- use Zone2MapCoordinates and Map2ZoneCoordinates
+extern DBCStorage <WorldMapAreaEntry>            sWorldMapAreaStore;
 extern DBCStorage <WorldMapOverlayEntry>         sWorldMapOverlayStore;
 extern DBCStorage <WorldSafeLocsEntry>           sWorldSafeLocsStore;
+extern DBCStorage <WorldStateEntry>              sWorldStateStore;
 
 void LoadDBCStores(const std::string& dataPath);
 
@@ -209,5 +233,7 @@ MANGOS_DLL_SPEC DBCStorage <FactionEntry>               const* GetFactionStore()
 MANGOS_DLL_SPEC DBCStorage <ItemEntry>                  const* GetItemDisplayStore();
 MANGOS_DLL_SPEC DBCStorage <CreatureDisplayInfoEntry>   const* GetCreatureDisplayStore();
 MANGOS_DLL_SPEC DBCStorage <EmotesEntry>                const* GetEmotesStore();
+MANGOS_DLL_SPEC DBCStorage <AchievementEntry>           const* GetAchievementStore();
 MANGOS_DLL_SPEC DBCStorage <EmotesTextEntry>            const* GetEmotesTextStore();
+
 #endif
diff --git a/src/game/DBCStructure.cpp b/src/game/DBCStructure.cpp
new file mode 100644
index 00000000000..3eb861833e9
--- /dev/null
+++ b/src/game/DBCStructure.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Common.h"
+#include "DBCStructure.h"
+#include "DBCStores.h"
+#include "SharedDefines.h"
+
+SpellEffectEntry::SpellEffectEntry(const SpellEntry* spellEntry, SpellEffectIndex i)
+{
+    Effect                      = spellEntry->Effect[i];
+    EffectMultipleValue         = spellEntry->EffectMultipleValue[i];
+    EffectApplyAuraName         = spellEntry->EffectApplyAuraName[i];
+    EffectAmplitude             = spellEntry->EffectAmplitude[i];
+    EffectBasePoints            = spellEntry->EffectBasePoints[i] + int32(1);
+    DmgMultiplier               = spellEntry->DmgMultiplier[i];
+    EffectChainTarget           = spellEntry->EffectChainTarget[i];
+    EffectDieSides              = spellEntry->EffectDieSides[i];
+    EffectItemType              = spellEntry->EffectItemType[i];
+    EffectMechanic              = spellEntry->EffectMechanic[i];
+    EffectMiscValue             = spellEntry->EffectMiscValue[i];
+    EffectMiscValueB            = spellEntry->EffectMiscValueB[i];
+    EffectPointsPerComboPoint   = spellEntry->EffectPointsPerComboPoint[i];
+    EffectRadiusIndex           = spellEntry->EffectRadiusIndex[i];
+    EffectRealPointsPerLevel    = spellEntry->EffectRealPointsPerLevel[i];
+    EffectSpellClassMask        = spellEntry->GetEffectSpellClassMask(i);
+    EffectTriggerSpell          = spellEntry->EffectTriggerSpell[i];
+    EffectImplicitTargetA       = spellEntry->EffectImplicitTargetA[i];
+    EffectImplicitTargetB       = spellEntry->EffectImplicitTargetB[i];
+    EffectSpellId               = spellEntry->Id;
+    EffectIndex                 = i;
+};
+
+SpellEffectEntry::SpellEffectEntry(SpellEffectEntry const& effect)
+{
+    Effect                      = effect.Effect;
+    EffectMultipleValue         = effect.EffectMultipleValue;
+    EffectApplyAuraName         = effect.EffectApplyAuraName;
+    EffectAmplitude             = effect.EffectAmplitude;
+    EffectBasePoints            = effect.EffectBasePoints;
+    DmgMultiplier               = effect.DmgMultiplier;
+    EffectChainTarget           = effect.EffectChainTarget;
+    EffectDieSides              = effect.EffectDieSides;
+    EffectItemType              = effect.EffectItemType;
+    EffectMechanic              = effect.EffectMechanic;
+    EffectMiscValue             = effect.EffectMiscValue;
+    EffectMiscValueB            = effect.EffectMiscValueB;
+    EffectPointsPerComboPoint   = effect.EffectPointsPerComboPoint;
+    EffectRadiusIndex           = effect.EffectRadiusIndex;
+    EffectRealPointsPerLevel    = effect.EffectRealPointsPerLevel;
+    EffectSpellClassMask        = effect.EffectSpellClassMask;
+    EffectTriggerSpell          = effect.EffectTriggerSpell;
+    EffectImplicitTargetA       = effect.EffectImplicitTargetA;
+    EffectImplicitTargetB       = effect.EffectImplicitTargetB;
+    EffectSpellId               = effect.EffectSpellId;
+    EffectIndex                 = effect.EffectIndex;
+};
+
+SpellEffectEntry const* SpellEntry::GetSpellEffect(SpellEffectIndex eff) const
+{
+    return GetSpellEffectEntry(Id, eff);
+}
diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h
index 66e5f3ff62f..b576b7bb8dd 100644
--- a/src/game/DBCStructure.h
+++ b/src/game/DBCStructure.h
@@ -23,6 +23,7 @@
 #include "DBCEnums.h"
 #include "Path.h"
 #include "Platform/Define.h"
+#include "SpellClassMask.h"
 #include "SharedDefines.h"
 
 #include <map>
@@ -43,11 +44,11 @@ struct AchievementEntry
     uint32    ID;                                           // 0        m_ID
     uint32    factionFlag;                                  // 1        m_faction -1=all, 0=horde, 1=alliance
     uint32    mapID;                                        // 2        m_instance_id -1=none
-    //uint32 parentAchievement;                             // 3        m_supercedes its Achievement parent (can`t start while parent uncomplete, use its Criteria if don`t have own, use its progress on begin)
-    char *name[16];                                         // 4-19     m_title_lang
-    //uint32 name_flags;                                    // 20 string flags
-    //char *description[16];                                // 21-36    m_description_lang
-    //uint32 desc_flags;                                    // 37 string flags
+    // uint32 parentAchievement;                            // 3        m_supercedes its Achievement parent (can`t start while parent uncomplete, use its Criteria if don`t have own, use its progress on begin)
+    char* name[16];                                         // 4-19     m_title_lang
+    // uint32 name_flags;                                   // 20 string flags
+    // char *description[16];                               // 21-36    m_description_lang
+    // uint32 desc_flags;                                   // 37 string flags
     uint32    categoryId;                                   // 38       m_category
     uint32    points;                                       // 39       m_points
     //uint32 OrderInCategory;                               // 40       m_ui_order
@@ -208,6 +209,13 @@ struct AchievementCriteriaEntry
             uint32  castCount;                              // 4
         } cast_spell;
 
+        // ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE = 30
+        struct
+        {
+            uint32 captureID;                               // 3
+            uint32 captureCount;                            // 4
+        } objective_capture;
+
         // ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA = 31
         struct
         {
@@ -219,6 +227,7 @@ struct AchievementCriteriaEntry
         struct
         {
             uint32  mapID;                                  // 3 Reference to Map.dbc
+            uint32  count;                                  // 4
         } win_arena;
 
         // ACHIEVEMENT_CRITERIA_TYPE_PLAY_ARENA             = 33
@@ -480,6 +489,13 @@ struct AchievementCriteriaEntry
             uint32  killCount;                              // 4
         } honorable_kill;
 
+        // ACHIEVEMENT_CRITERIA_TYPE_USE_LFD_TO_GROUP_WITH_PLAYERS    = 119
+        struct
+        {
+            uint32  unused;                                 // 3
+            uint32  dungeonsComplete;                       // 4
+        } use_lfg;
+
         struct
         {
             uint32  value;                                  // 3        m_asset_id
@@ -525,7 +541,7 @@ struct AreaTableEntry
     char*   area_name[16];                                  // 11-26    m_AreaName_lang
                                                             // 27 string flags
     uint32  team;                                           // 28       m_factionGroupMask
-                                                            // 29-32    m_liquidTypeID[4]
+    uint32  LiquidTypeOverride[4];                          // 29-32    m_liquidTypeID[4]
                                                             // 33       m_minElevation
                                                             // 34       m_ambient_multiplier
                                                             // 35       m_lightid
@@ -717,7 +733,7 @@ struct CinematicSequencesEntry
 struct CreatureDisplayInfoEntry
 {
     uint32      Displayid;                                  // 0        m_ID
-                                                            // 1        m_modelID
+    uint32      ModelId;                                    // 1        m_modelID
                                                             // 2        m_soundID
     uint32      ExtendedDisplayInfoID;                      // 3        m_extendedDisplayInfoID -> CreatureDisplayInfoExtraEntry::DisplayExtraId
     float       scale;                                      // 4        m_creatureModelScale
@@ -763,6 +779,28 @@ struct CreatureFamilyEntry
                                                             // 27       m_iconFile
 };
 
+struct CreatureModelDataEntry
+{
+    uint32 Id;                                              // 1
+    //uint32 Flags;                                         // 2
+    //char* ModelPath[16]                                   // 3
+    uint32 modInhabitType;                                  // 4 model inhabit type
+    float Scale;                                            // 5 Used in calculation of unit collision data
+    //int32 Unk2                                            // 6
+    //int32 Unk3                                            // 7
+    //uint32 Unk4                                           // 8
+    //uint32 Unk5                                           // 9
+    //float Unk6                                            // 10
+    //uint32 Unk7                                           // 11
+    //float Unk8                                            // 12
+    //uint32 Unk9                                           // 13
+    //uint32 Unk10                                          // 14
+    //float CollisionWidth;                                 // 15
+    float CollisionHeight;                                  // 16
+    float MountHeight;                                      // 17 Used in calculation of unit collision data when mounted
+    //float Unks[11]                                        // 18-28
+};
+
 #define MAX_CREATURE_SPELL_DATA_SLOT 4
 
 struct CreatureSpellDataEntry
@@ -798,6 +836,29 @@ struct CurrencyTypesEntry
     uint32    BitIndex;                                     // 3        m_bitIndex bit index in PLAYER_FIELD_KNOWN_CURRENCIES (1 << (index-1))
 };
 
+struct DestructibleModelDataEntry
+{
+    uint32 m_ID;                                            // 0        m_ID
+    // uint32 unk1;                                         // 1
+    // uint32 unk2;                                         // 2
+    uint32 damagedDisplayId;                                // 3
+    // uint32 unk4;                                         // 4
+    // uint32 unk5;                                         // 5
+    // uint32 unk6;                                         // 6
+    uint32 destroyedDisplayId;                              // 7
+    // uint32 unk8;                                         // 8
+    // uint32 unk9;                                         // 9
+    // uint32 unk10;                                        // 10
+    uint32 rebuildingDisplayId;                             // 11       // Maybe rebuildingDisplayIdWhileDestroyed
+    // uint32 unk12;                                        // 12
+    // uint32 unk13;                                        // 13
+    // uint32 unk14;                                        // 14
+    // uint32 unk15;                                        // 15
+    // uint32 unk16;                                        // 16
+    // uint32 unk17;                                        // 17
+    // uint32 unk18;                                        // 18
+};
+
 struct DungeonEncounterEntry
 {
     uint32 Id;                                              // 0        m_ID
@@ -927,15 +988,15 @@ struct FactionTemplateEntry
 struct GameObjectDisplayInfoEntry
 {
     uint32      Displayid;                                  // 0        m_ID
-    // char* filename;                                      // 1        m_modelName
-                                                            // 2-11     m_Sound
-    float  unknown12;                                       // 12       m_geoBoxMinX (use first value as interact dist, mostly in hacks way)
-                                                            // 13       m_geoBoxMinY
-                                                            // 14       m_geoBoxMinZ
-                                                            // 15       m_geoBoxMaxX
-                                                            // 16       m_geoBoxMaxY
-                                                            // 17       m_geoBoxMaxZ
-                                                            // 18       m_objectEffectPackageID
+    char* filename;                                         // 1        m_modelName
+    // uint32 unknown2[10];                                 // 2-11     m_Sound
+    float       minX;                                       // 12       m_geoBoxMinX (use first value as interact dist, mostly in hacks way)
+    float       minY;                                       // 13       m_geoBoxMinY
+    float       minZ;                                       // 14       m_geoBoxMinZ
+    float       maxX;                                       // 15       m_geoBoxMaxX
+    float       maxY;                                       // 16       m_geoBoxMaxY
+    float       maxZ;                                       // 17       m_geoBoxMaxZ
+    // uint32 unknown18;                                    // 18       m_objectEffectPackageID
 };
 
 struct GemPropertiesEntry
@@ -1113,8 +1174,8 @@ struct ItemExtendedCostEntry
     uint32      ID;                                         // 0        m_ID
     uint32      reqhonorpoints;                             // 1        m_honorPoints
     uint32      reqarenapoints;                             // 2        m_arenaPoints
-    uint32      reqarenaslot;                               // 4        m_arenaBracket
-    uint32      reqitem[MAX_EXTENDED_COST_ITEMS];           // 5-8      m_itemID
+    uint32      reqarenaslot;                               // 3        m_arenaBracket
+    uint32      reqitem[MAX_EXTENDED_COST_ITEMS];           // 4-8      m_itemID
     uint32      reqitemcount[MAX_EXTENDED_COST_ITEMS];      // 9-13     m_itemCount
     uint32      reqpersonalarenarating;                     // 14       m_requiredArenaRating
                                                             // 15       m_itemPurchaseGroup
@@ -1160,6 +1221,44 @@ struct ItemSetEntry
     uint32    required_skill_value;                         // 52       m_requiredSkillRank
 };
 
+struct LFGDungeonEntry
+{
+    uint32  ID;                                             // 0     m_ID
+    //char*   name[16];                                     // 1-17  m_name_lang
+    uint32  minlevel;                                       // 18    m_minLevel
+    uint32  maxlevel;                                       // 19    m_maxLevel
+    uint32  reclevel;                                       // 20    m_target_level
+    uint32  recminlevel;                                    // 21    m_target_level_min
+    uint32  recmaxlevel;                                    // 22    m_target_level_max
+    uint32  map;                                            // 23    m_mapID
+    uint32  difficulty;                                     // 24    m_difficulty
+    uint32  flags;                                          // 25    m_flags
+    uint32  type;                                           // 26    m_typeID
+    uint32  faction;                                        // 27    m_faction
+    //char*   unk3;                                         // 28    m_textureFilename
+    uint32  expansion;                                      // 29    m_expansionLevel
+    uint32  index;                                          // 30    m_order_index
+    uint32  grouptype;                                      // 31    m_group_id
+    //char*   desc[16];                                     // 32-47 m_description_lang
+    //uint32 unk5                                           // 48 language flags?
+    // Helpers
+    uint32 Entry() const { return ID + (type << 24); }
+};
+
+struct LFGDungeonExpansionEntry
+{
+    uint32  ID;                                             // 0    m_ID
+    uint32  dungeonID;                                      // 1    m_lfg_id
+    uint32  expansion;                                      // 2    m_expansion_level
+    uint32  randomEntry;                                    // 3    m_random_id, inside of which is used this record
+    uint32  minlevelHard;                                   // 4    m_hard_level_min
+    uint32  maxlevelHard;                                   // 5    m_hard_level_max
+    uint32  minlevel;                                       // 6    m_target_level_min
+    uint32  maxlevel;                                       // 7    m_target_level_max
+    // Helpers
+    bool IsRandom() const { return randomEntry == 0; }
+};
+
 /*struct LfgDungeonsEntry
 {
     m_ID
@@ -1202,6 +1301,29 @@ struct ItemSetEntry
     m_target_level_max
 };*/
 
+struct LiquidTypeEntry
+{
+    uint32 Id;                                              // 0
+    //char*  Name;                                          // 1
+    //uint32 Flags;                                         // 2            Water: 1|2|4|8, Magma: 8|16|32|64, Slime: 2|64|256, WMO Ocean: 1|2|4|8|512
+    uint32 Type;                                            // 3            0: Water, 1: Ocean, 2: Magma, 3: Slime
+    //uint32 SoundId;                                       // 4            Reference to SoundEntries.dbc
+    uint32 SpellId;                                         // 5            Reference to Spell.dbc
+    //float MaxDarkenDepth;                                 // 6            Only oceans got values here!
+    //float FogDarkenIntensity;                             // 7            Only oceans got values here!
+    //float AmbDarkenIntensity;                             // 8            Only oceans got values here!
+    //float DirDarkenIntensity;                             // 9            Only oceans got values here!
+    //uint32 LightID;                                       // 10           Only Slime (6) and Magma (7)
+    //float ParticleScale;                                  // 11           0: Slime, 1: Water/Ocean, 4: Magma
+    //uint32 ParticleMovement;                              // 12
+    //uint32 ParticleTexSlots;                              // 13
+    //uint32 LiquidMaterialID;                              // 14
+    //char* Texture[6];                                     // 15-20
+    //uint32 Color[2];                                      // 21-22
+    //float Unk1[18];                                       // 23-40    Most likely these are attributes for the shaders. Water: (23, TextureTilesPerBlock),(24, Rotation) Magma: (23, AnimationX),(24, AnimationY)
+    //uint32 Unk2[4];                                       // 41-44
+};
+
 #define MAX_LOCK_CASE 8
 
 struct LockEntry
@@ -1226,7 +1348,7 @@ struct MapEntry
     uint32  MapID;                                          // 0        m_ID
     //char*       internalname;                             // 1        m_Directory
     uint32  map_type;                                       // 2        m_InstanceType
-    //uint32 mapFlags;                                      // 3        m_Flags (0x100 - CAN_CHANGE_PLAYER_DIFFICULTY)
+    uint32 mapFlags;                                        // 3        m_Flags (0x100 - CAN_CHANGE_PLAYER_DIFFICULTY)
     //uint32 isPvP;                                         // 4        m_PVP 0 or 1 for battlegrounds (not arenas)
     char*   name[16];                                       // 5-20     m_MapName_lang
                                                             // 21 string flags
@@ -1242,7 +1364,7 @@ struct MapEntry
     float   ghost_entrance_y;                               // 61       m_corpseY entrance y coordinate in ghost mode  (in most cases = normal entrance)
     //uint32  timeOfDayOverride;                            // 62       m_timeOfDayOverride
     uint32  addon;                                          // 63       m_expansionID
-                                                            // 64       m_raidOffset
+    uint32  instanceResetOffset;                            // 64       m_raidOffset
     //uint32 maxPlayers;                                    // 65       m_maxPlayers
 
     // Helpers
@@ -1262,13 +1384,21 @@ struct MapEntry
             MapID==209 || MapID==269 || MapID==309 ||       // TanarisInstance, CavernsOfTime, Zul'gurub
             MapID==509 || MapID==534 || MapID==560 ||       // AhnQiraj, HyjalPast, HillsbradPast
             MapID==568 || MapID==580 || MapID==595 ||       // ZulAman, Sunwell Plateau, Culling of Stratholme
-            MapID==603 || MapID==615 || MapID==616;         // Ulduar, The Obsidian Sanctum, The Eye Of Eternity
+            MapID==603 || MapID==615 || MapID==616 ||       // Ulduar, The Obsidian Sanctum, The Eye Of Eternity
+            MapID==658;                                     // Pit of Saron
     }
 
     bool IsContinent() const
     {
         return MapID == 0 || MapID == 1 || MapID == 530 || MapID == 571;
     }
+
+    bool IsTransport() const
+    {
+        if (IsContinent())
+            return false;
+        return map_type == MAP_COMMON && mapFlags == MAP_FLAG_INSTANCEABLE && linked_zone == 0;
+    }
 };
 
 struct MapDifficultyEntry
@@ -1276,8 +1406,8 @@ struct MapDifficultyEntry
     //uint32      Id;                                       // 0        m_ID
     uint32      MapId;                                      // 1        m_mapID
     uint32      Difficulty;                                 // 2        m_difficulty (for arenas: arena slot)
-    //char*       areaTriggerText[16];                      // 3-18     m_message_lang (text showed when transfer to map failed)
-    //uint32      textFlags;                                // 19
+    char*       areaTriggerText[16];                        // 3-18     m_message_lang (text showed when transfer to map failed)
+    uint32      mapDifficultyFlags;                         // 19
     uint32      resetTime;                                  // 20       m_raidDuration in secs, 0 if no fixed reset time
     uint32      maxPlayers;                                 // 21       m_maxPlayers some heroic versions have 0 when expected same amount as in normal version
     //char*       difficultyString;                         // 22       m_difficultystring
@@ -1299,6 +1429,16 @@ struct OverrideSpellDataEntry
     //uint32      unk2;                                     // 11       m_flags
 };
 
+struct PowerDisplayEntry
+{
+    uint32      id;                                         // 0        m_ID
+    uint32      power;                                      // 1        m_power
+    // uint32   unk1                                        // 2
+    // float    unk2                                        // 3
+    // float    unk3                                        // 4
+    // float    unk4                                        // 5
+};
+
 struct PvPDifficultyEntry
 {
     //uint32      id;                                       // 0        m_ID
@@ -1522,6 +1662,30 @@ struct SoundEntriesEntry
                                                             // 29       m_soundEntriesAdvancedID
 };
 
+// template arguments for declaration
+#define CFM_ARGS_1  ClassFlag N1
+#define CFM_ARGS_2  CFM_ARGS_1, ClassFlag N2
+#define CFM_ARGS_3  CFM_ARGS_2, ClassFlag N3
+#define CFM_ARGS_4  CFM_ARGS_3, ClassFlag N4
+#define CFM_ARGS_5  CFM_ARGS_4, ClassFlag N5
+#define CFM_ARGS_6  CFM_ARGS_5, ClassFlag N6
+#define CFM_ARGS_7  CFM_ARGS_6, ClassFlag N7
+#define CFM_ARGS_8  CFM_ARGS_7, ClassFlag N8
+#define CFM_ARGS_9  CFM_ARGS_8, ClassFlag N9
+#define CFM_ARGS_10 CFM_ARGS_9, ClassFlag N10
+
+// template values for function calls
+#define CFM_VALUES_1  N1
+#define CFM_VALUES_2  CFM_VALUES_1, N2
+#define CFM_VALUES_3  CFM_VALUES_2, N3
+#define CFM_VALUES_4  CFM_VALUES_3, N4
+#define CFM_VALUES_5  CFM_VALUES_4, N5
+#define CFM_VALUES_6  CFM_VALUES_5, N6
+#define CFM_VALUES_7  CFM_VALUES_6, N7
+#define CFM_VALUES_8  CFM_VALUES_7, N8
+#define CFM_VALUES_9  CFM_VALUES_8, N9
+#define CFM_VALUES_10 CFM_VALUES_9, N10
+
 struct ClassFamilyMask
 {
     uint64 Flags;
@@ -1529,6 +1693,10 @@ struct ClassFamilyMask
 
     ClassFamilyMask() : Flags(0), Flags2(0) {}
     explicit ClassFamilyMask(uint64 familyFlags, uint32 familyFlags2 = 0) : Flags(familyFlags), Flags2(familyFlags2) {}
+    ClassFamilyMask(uint32 f0, uint32 f1, uint32 f2): Flags(uint64(f0) | (uint64(f1) << 32)), Flags2(f2) {}
+
+    // predefined empty object for safe return by reference
+    static ClassFamilyMask const Null;
 
     bool Empty() const { return Flags == 0 && Flags2 == 0; }
     bool operator! () const { return Empty(); }
@@ -1549,12 +1717,295 @@ struct ClassFamilyMask
         return Flags & mask;
     }
 
-    ClassFamilyMask& operator|= (ClassFamilyMask const& mask)
+    // test if specified bits are set (run-time)
+    bool test(size_t offset) const
+    {
+        return reinterpret_cast<uint8 const*>(this)[offset >> 3] & (uint8(1) << (offset & 7));
+    }
+
+    // test if specified bits are set (compile-time)
+    template <CFM_ARGS_1>
+    bool test() const
+    {
+        return (Flags  & BitMask<uint64, true,  CFM_VALUES_1>::value) ||
+               (Flags2 & BitMask<uint32, false, CFM_VALUES_1>::value);
+    }
+
+    template <CFM_ARGS_2>
+    bool test() const
+    {
+        return (Flags  & BitMask<uint64, true,  CFM_VALUES_2>::value) ||
+               (Flags2 & BitMask<uint32, false, CFM_VALUES_2>::value);
+    }
+
+    template <CFM_ARGS_3>
+    bool test() const
+    {
+        return (Flags  & BitMask<uint64, true,  CFM_VALUES_3>::value) ||
+               (Flags2 & BitMask<uint32, false, CFM_VALUES_3>::value);
+    }
+
+    template <CFM_ARGS_4>
+    bool test() const
+    {
+        return (Flags  & BitMask<uint64, true,  CFM_VALUES_4>::value) ||
+               (Flags2 & BitMask<uint32, false, CFM_VALUES_4>::value);
+    }
+
+    template <CFM_ARGS_5>
+    bool test() const
+    {
+        return (Flags  & BitMask<uint64, true,  CFM_VALUES_5>::value) ||
+               (Flags2 & BitMask<uint32, false, CFM_VALUES_5>::value);
+    }
+
+    template <CFM_ARGS_6>
+    bool test() const
+    {
+        return (Flags  & BitMask<uint64, true,  CFM_VALUES_6>::value) ||
+               (Flags2 & BitMask<uint32, false, CFM_VALUES_6>::value);
+    }
+
+    template <CFM_ARGS_7>
+    bool test() const
+    {
+        return (Flags  & BitMask<uint64, true,  CFM_VALUES_7>::value) ||
+               (Flags2 & BitMask<uint32, false, CFM_VALUES_7>::value);
+    }
+
+    template <CFM_ARGS_8>
+    bool test() const
+    {
+        return (Flags  & BitMask<uint64, true,  CFM_VALUES_8>::value) ||
+               (Flags2 & BitMask<uint32, false, CFM_VALUES_8>::value);
+    }
+
+    template <CFM_ARGS_9>
+    bool test() const
+    {
+        return (Flags  & BitMask<uint64, true,  CFM_VALUES_9>::value) ||
+               (Flags2 & BitMask<uint32, false, CFM_VALUES_9>::value);
+    }
+
+    template <CFM_ARGS_10>
+    bool test() const
+    {
+        return (Flags  & BitMask<uint64, true,  CFM_VALUES_10>::value) ||
+               (Flags2 & BitMask<uint32, false, CFM_VALUES_10>::value);
+    }
+
+    // named constructors (compile-time)
+    template <CFM_ARGS_1>
+    static ClassFamilyMask create()
+    {
+        return ClassFamilyMask(BitMask<uint64, true,  CFM_VALUES_1>::value,
+                               BitMask<uint32, false, CFM_VALUES_1>::value);
+    }
+
+    template <CFM_ARGS_2>
+    static ClassFamilyMask create()
+    {
+        return ClassFamilyMask(BitMask<uint64, true,  CFM_VALUES_2>::value,
+                               BitMask<uint32, false, CFM_VALUES_2>::value);
+    }
+
+    template <CFM_ARGS_3>
+    static ClassFamilyMask create()
+    {
+        return ClassFamilyMask(BitMask<uint64, true,  CFM_VALUES_3>::value,
+                               BitMask<uint32, false, CFM_VALUES_3>::value);
+    }
+
+    template <CFM_ARGS_4>
+    static ClassFamilyMask create()
+    {
+        return ClassFamilyMask(BitMask<uint64, true,  CFM_VALUES_4>::value,
+                               BitMask<uint32, false, CFM_VALUES_4>::value);
+    }
+
+    template <CFM_ARGS_5>
+    static ClassFamilyMask create()
+    {
+        return ClassFamilyMask(BitMask<uint64, true,  CFM_VALUES_5>::value,
+                               BitMask<uint32, false, CFM_VALUES_5>::value);
+    }
+
+    template <CFM_ARGS_6>
+    static ClassFamilyMask create()
+    {
+        return ClassFamilyMask(BitMask<uint64, true,  CFM_VALUES_6>::value,
+                               BitMask<uint32, false, CFM_VALUES_6>::value);
+    }
+
+    template <CFM_ARGS_7>
+    static ClassFamilyMask create()
+    {
+        return ClassFamilyMask(BitMask<uint64, true,  CFM_VALUES_7>::value,
+                               BitMask<uint32, false, CFM_VALUES_7>::value);
+    }
+
+    template <CFM_ARGS_8>
+    static ClassFamilyMask create()
+    {
+        return ClassFamilyMask(BitMask<uint64, true,  CFM_VALUES_8>::value,
+                               BitMask<uint32, false, CFM_VALUES_8>::value);
+    }
+
+    template <CFM_ARGS_9>
+    static ClassFamilyMask create()
+    {
+        return ClassFamilyMask(BitMask<uint64, true,  CFM_VALUES_9>::value,
+                               BitMask<uint32, false, CFM_VALUES_9>::value);
+    }
+
+    template <CFM_ARGS_10>
+    static ClassFamilyMask create()
+    {
+        return ClassFamilyMask(BitMask<uint64, true,  CFM_VALUES_10>::value,
+                               BitMask<uint32, false, CFM_VALUES_10>::value);
+    }
+
+    // comparison operators
+    bool operator== (ClassFamilyMask const& rhs) const
+    {
+        return Flags == rhs.Flags && Flags2 == rhs.Flags2;
+    }
+
+    bool operator!= (ClassFamilyMask const& rhs) const
+    {
+        return Flags != rhs.Flags || Flags2 != rhs.Flags2;
+    }
+
+    // bitwise operators
+    ClassFamilyMask operator& (ClassFamilyMask const& rhs) const
+    {
+        return ClassFamilyMask(Flags & rhs.Flags, Flags2 & rhs.Flags2);
+    }
+
+    ClassFamilyMask operator| (ClassFamilyMask const& rhs) const
     {
-        Flags |= mask.Flags;
-        Flags2 |= mask.Flags2;
+        return ClassFamilyMask(Flags | rhs.Flags, Flags2 | rhs.Flags2);
+    }
+
+    ClassFamilyMask operator^ (ClassFamilyMask const& rhs) const
+    {
+        return ClassFamilyMask(Flags ^ rhs.Flags, Flags2 ^ rhs.Flags2);
+    }
+
+    ClassFamilyMask operator~ () const
+    {
+        return ClassFamilyMask(~Flags, ~Flags2);
+    }
+
+    // assignation operators
+    ClassFamilyMask& operator= (ClassFamilyMask const& rhs)
+    {
+        Flags  = rhs.Flags;
+        Flags2 = rhs.Flags2;
+        return *this;
+    }
+
+    ClassFamilyMask& operator&= (ClassFamilyMask const& rhs)
+    {
+        Flags  &= rhs.Flags;
+        Flags2 &= rhs.Flags2;
         return *this;
     }
+
+    ClassFamilyMask& operator|= (ClassFamilyMask const& rhs)
+    {
+        Flags  |= rhs.Flags;
+        Flags2 |= rhs.Flags2;
+        return *this;
+    }
+
+    ClassFamilyMask& operator^= (ClassFamilyMask const& rhs)
+    {
+        Flags  ^= rhs.Flags;
+        Flags2 ^= rhs.Flags2;
+        return *this;
+    }
+
+    // templates used for compile-time mask calculation
+private:
+    enum { LOW_WORD_SIZE = 64 };
+
+    template <typename T, int Val, bool IsLow, bool InRange>
+    struct DoShift
+    {
+        static T const value = T(1) << Val;
+    };
+
+    template <typename T, int Val>
+    struct DoShift<T, Val, false, true>
+    {
+        static T const value = T(1) << (Val - LOW_WORD_SIZE);
+    };
+
+    template <typename T, int Val, bool IsLow>
+    struct DoShift<T, Val, IsLow, false>
+    {
+        static T const value = 0;
+    };
+
+    template <int N, bool IsLow>
+    struct IsInRange
+    {
+        static bool const value = IsLow ? N < LOW_WORD_SIZE : N >= LOW_WORD_SIZE;
+    };
+
+    template <typename T, bool IsLow, int N1, int N2 = -1, int N3 = -1, int N4 = -1, int N5 = -1, int N6 = -1, int N7 = -1, int N8 = -1, int N9 = -1, int N10 = -1>
+    struct BitMask
+    {
+        static T const value = DoShift<T, N1, IsLow, IsInRange<N1, IsLow>::value>::value | BitMask<T, IsLow, N2, N3, N4, N5, N6, N7, N8, N9, N10, -1>::value;
+    };
+
+    template <typename T, bool IsLow>
+    struct BitMask<T, IsLow, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1>
+    {
+        static T const value = 0;
+    };
+};
+
+struct MANGOS_DLL_SPEC SpellEntry;
+
+struct SpellEffectEntry
+{
+    SpellEffectEntry(SpellEntry const* spellEntry, SpellEffectIndex i);
+    SpellEffectEntry() {};
+    SpellEffectEntry(SpellEffectEntry const& effect);
+
+    //uint32        Id;                                         // 0        m_ID
+    uint32        Effect;                                       // 73-75    m_effect
+    float         EffectMultipleValue;                          // 106-108  m_effectAmplitude
+    uint32        EffectApplyAuraName;                          // 100-102  m_effectAura
+    uint32        EffectAmplitude;                              // 103-105  m_effectAuraPeriod
+    int32         EffectBasePoints;                             // 82-84    m_effectBasePoints (don't must be used in spell/auras explicitly, must be used cached Spell::m_currentBasePoints)
+    //float         unk_320_4;                                  // 169-171  3.2.0
+    float         DmgMultiplier;                                // 156-158  m_effectChainAmplitude
+    uint32        EffectChainTarget;                            // 109-111  m_effectChainTargets
+    int32         EffectDieSides;                               // 76-78    m_effectDieSides
+    uint32        EffectItemType;                               // 112-114  m_effectItemType
+    uint32        EffectMechanic;                               // 85-87    m_effectMechanic
+    int32         EffectMiscValue;                              // 115-117  m_effectMiscValue
+    int32         EffectMiscValueB;                             // 118-120  m_effectMiscValueB
+    float         EffectPointsPerComboPoint;                    // 124-126  m_effectPointsPerCombo
+    uint32        EffectRadiusIndex;                            // 94-96    m_effectRadiusIndex - spellradius.dbc
+    //uint32        EffectRadiusMaxIndex;                       // 97-99    4.0.0
+    float         EffectRealPointsPerLevel;                     // 79-81    m_effectRealPointsPerLevel
+    ClassFamilyMask EffectSpellClassMask;                       // 127-129  m_effectSpellClassMask
+    uint32        EffectTriggerSpell;                           // 121-123  m_effectTriggerSpell
+    uint32        EffectImplicitTargetA;                        // 88-90    m_implicitTargetA
+    uint32        EffectImplicitTargetB;                        // 91-93    m_implicitTargetB
+    uint32        EffectSpellId;                                // new 4.0.0
+    uint32        EffectIndex;                                  // new 4.0.0
+    //uint32        unk;                                        // 24 - 4.2.0
+    // helpers
+
+    int32 CalculateSimpleValue() const { return EffectBasePoints; };
+
+    void Initialize(const SpellEntry* spellEntry, SpellEffectIndex i);
+
 };
 
 #define MAX_SPELL_REAGENTS 8
@@ -1669,7 +2120,7 @@ struct SpellEntry
     uint32    runeCostID;                                   // 226      m_runeCostID
     //uint32    spellMissileID;                             // 227      m_spellMissileID
     //uint32  PowerDisplayId;                               // 228      m_powerDisplayID (PowerDisplay.dbc)
-    //float   effectBonusCoefficient[3];                    // 229-231  m_effectBonusCoefficient
+    float     EffectCoeffs[MAX_EFFECT_INDEX];               // 229-231  3.2.0
     //uint32  spellDescriptionVariableID;                   // 232      m_descriptionVariablesID
     uint32  SpellDifficultyId;                              // 233      m_difficulty (SpellDifficulty.dbc)
 
@@ -1682,7 +2133,7 @@ struct SpellEntry
 
     bool IsFitToFamilyMask(uint64 familyFlags, uint32 familyFlags2 = 0) const
     {
-        return SpellFamilyFlags.IsFitToFamilyMask(familyFlags, familyFlags2);
+        return GetSpellFamilyFlags().IsFitToFamilyMask(familyFlags, familyFlags2);
     }
 
     bool IsFitToFamily(SpellFamily family, uint64 familyFlags, uint32 familyFlags2 = 0) const
@@ -1692,7 +2143,7 @@ struct SpellEntry
 
     bool IsFitToFamilyMask(ClassFamilyMask const& mask) const
     {
-        return SpellFamilyFlags.IsFitToFamilyMask(mask);
+        return GetSpellFamilyFlags().IsFitToFamilyMask(mask);
     }
 
     bool IsFitToFamily(SpellFamily family, ClassFamilyMask const& mask) const
@@ -1700,14 +2151,118 @@ struct SpellEntry
         return SpellFamily(SpellFamilyName) == family && IsFitToFamilyMask(mask);
     }
 
-    inline bool HasAttribute(SpellAttributes attribute) const { return Attributes & attribute; }
-    inline bool HasAttribute(SpellAttributesEx attribute) const { return AttributesEx & attribute; }
-    inline bool HasAttribute(SpellAttributesEx2 attribute) const { return AttributesEx2 & attribute; }
-    inline bool HasAttribute(SpellAttributesEx3 attribute) const { return AttributesEx3 & attribute; }
-    inline bool HasAttribute(SpellAttributesEx4 attribute) const { return AttributesEx4 & attribute; }
-    inline bool HasAttribute(SpellAttributesEx5 attribute) const { return AttributesEx5 & attribute; }
-    inline bool HasAttribute(SpellAttributesEx6 attribute) const { return AttributesEx6 & attribute; }
-    inline bool HasAttribute(SpellAttributesEx7 attribute) const { return AttributesEx7 & attribute; }
+    // compile time version
+    template <SpellFamily family, CFM_ARGS_1>
+    bool IsFitToFamily() const
+    {
+        return SpellFamily(SpellFamilyName) == family && GetSpellFamilyFlags().test<CFM_VALUES_1>();
+    }
+
+    template <SpellFamily family, CFM_ARGS_2>
+    bool IsFitToFamily() const
+    {
+        return SpellFamily(SpellFamilyName) == family && GetSpellFamilyFlags().test<CFM_VALUES_2>();
+    }
+
+    template <SpellFamily family, CFM_ARGS_3>
+    bool IsFitToFamily() const
+    {
+        return SpellFamily(SpellFamilyName) == family && GetSpellFamilyFlags().test<CFM_VALUES_3>();
+    }
+
+    template <SpellFamily family, CFM_ARGS_4>
+    bool IsFitToFamily() const
+    {
+        return SpellFamily(SpellFamilyName) == family && GetSpellFamilyFlags().test<CFM_VALUES_4>();
+    }
+
+    template <SpellFamily family, CFM_ARGS_5>
+    bool IsFitToFamily() const
+    {
+        return SpellFamily(SpellFamilyName) == family && GetSpellFamilyFlags().test<CFM_VALUES_5>();
+    }
+
+    template <SpellFamily family, CFM_ARGS_6>
+    bool IsFitToFamily() const
+    {
+        return SpellFamily(SpellFamilyName) == family && GetSpellFamilyFlags().test<CFM_VALUES_6>();
+    }
+
+    template <SpellFamily family, CFM_ARGS_7>
+    bool IsFitToFamily() const
+    {
+        return SpellFamily(SpellFamilyName) == family && GetSpellFamilyFlags().test<CFM_VALUES_7>();
+    }
+
+    template <SpellFamily family, CFM_ARGS_8>
+    bool IsFitToFamily() const
+    {
+        return SpellFamily(SpellFamilyName) == family && GetSpellFamilyFlags().test<CFM_VALUES_8>();
+    }
+
+    template <SpellFamily family, CFM_ARGS_9>
+    bool IsFitToFamily() const
+    {
+        return SpellFamily(SpellFamilyName) == family && GetSpellFamilyFlags().test<CFM_VALUES_9>();
+    }
+
+    template <SpellFamily family, CFM_ARGS_10>
+    bool IsFitToFamily() const
+    {
+        return SpellFamily(SpellFamilyName) == family && GetSpellFamilyFlags().test<CFM_VALUES_10>();
+    }
+
+    inline uint32 GetAttributes() const        { return Attributes; };
+    inline uint32 GetAttributesEx() const      { return AttributesEx; };
+    inline uint32 GetAttributesEx2() const     { return AttributesEx2; };
+    inline uint32 GetAttributesEx3() const     { return AttributesEx3; };
+    inline uint32 GetAttributesEx4() const     { return AttributesEx4; };
+    inline uint32 GetAttributesEx5() const     { return AttributesEx5; };
+    inline uint32 GetAttributesEx6() const     { return AttributesEx6; };
+    inline uint32 GetAttributesEx7() const     { return AttributesEx7; };
+    //inline uint32 GetAttributesEx8() const     { return AttributesEx8; };
+    //inline uint32 GetAttributesEx9() const     { return AttributesEx9; };
+    //inline uint32 GetAttributesEx10() const     { return AttributesEx10; };
+    //inline uint32 GetAttributesEx11() const     { return AttributesEx11; };
+
+    inline bool HasAttribute(SpellAttributes attribute) const { return GetAttributes() & attribute; } 
+    inline bool HasAttribute(SpellAttributesEx attribute) const { return GetAttributesEx() & attribute; } 
+    inline bool HasAttribute(SpellAttributesEx2 attribute) const { return GetAttributesEx2() & attribute; } 
+    inline bool HasAttribute(SpellAttributesEx3 attribute) const { return GetAttributesEx3() & attribute; } 
+    inline bool HasAttribute(SpellAttributesEx4 attribute) const { return GetAttributesEx4() & attribute; } 
+    inline bool HasAttribute(SpellAttributesEx5 attribute) const { return GetAttributesEx5() & attribute; } 
+    inline bool HasAttribute(SpellAttributesEx6 attribute) const { return GetAttributesEx6() & attribute; } 
+    inline bool HasAttribute(SpellAttributesEx7 attribute) const { return GetAttributesEx7() & attribute; } 
+    //inline bool HasAttribute(SpellAttributesEx8 attribute) const { return GetAttributesEx8() & attribute; } 
+    //inline bool HasAttribute(SpellAttributesEx9 attribute) const { return GetAttributesEx9() & attribute; } 
+    //inline bool HasAttribute(SpellAttributesEx10 attribute) const { return GetAttributesEx10() & attribute; }
+    //inline bool HasAttribute(SpellAttributesEx11 attribute) const { return GetAttributesEx11() & attribute; }
+
+    inline uint32 GetMechanic() const { return Mechanic; };
+    inline uint32 GetManaCost() const { return manaCost; };
+    inline uint32 GetSpellFamilyName() const { return SpellFamilyName; };
+    inline uint32 GetRecoveryTime() const { return RecoveryTime; };
+    inline uint32 GetCategoryRecoveryTime() const { return CategoryRecoveryTime; };
+    inline uint32 GetAuraInterruptFlags() const { return AuraInterruptFlags; };
+    inline uint32 GetStackAmount() const { return StackAmount; };
+    inline uint32 GetEffectImplicitTargetAByIndex(SpellEffectIndex j) const { return EffectImplicitTargetA[j];};
+    inline uint32 GetEffectImplicitTargetBByIndex(SpellEffectIndex j) const { return EffectImplicitTargetB[j];};
+    inline uint32 GetEffectApplyAuraNameByIndex(SpellEffectIndex j) const   { return EffectApplyAuraName[j];};
+    inline uint32 GetEffectMiscValue(SpellEffectIndex j) const              { return EffectMiscValue[j];};
+    inline uint32 GetEffectMiscValueB(SpellEffectIndex j) const              { return EffectMiscValueB[j];};
+    inline ClassFamilyMask GetSpellFamilyFlags() const                      { return SpellFamilyFlags; };
+
+    inline uint32 GetCastingTimeIndex() const        { return CastingTimeIndex; };
+    inline uint32 GetDurationIndex() const           { return DurationIndex; };
+    inline SpellRangeIndex GetRangeIndex() const     { return SpellRangeIndex(rangeIndex); };
+    inline float  GetSpeed() const                   { return speed; };
+    inline uint32 GetSpellVisual(uint8 idx = 0) const { return SpellVisual[idx]; };
+    inline uint32 GetSpellIconID() const             { return SpellIconID; };
+    inline uint32 GetActiveIconID() const            { return activeIconID; };
+    inline SpellSchoolMask GetSchoolMask() const     { return SpellSchoolMask(SchoolMask); };
+    inline Powers GetPowerType() const               { return Powers(powerType); };
+
+    SpellEffectEntry const* GetSpellEffect(SpellEffectIndex j) const;
 
     private:
         // prevent creating custom entries (copy data from original in fact)
@@ -1718,6 +2273,11 @@ struct SpellEntry
         bool IsFitToFamilyMask(SpellFamily family, T t) const;
 };
 
+// A few fields which are required for automated convertion
+// NOTE that these fields are count by _skipping_ the fields that are unused!
+#define LOADED_SPELLDBC_FIELD_POS_EQUIPPED_ITEM_CLASS  65   // Must be converted to -1
+#define LOADED_SPELLDBC_FIELD_POS_SPELLNAME_0          132  // Links to "MaNGOS server-side spell"
+
 struct SpellCastTimesEntry
 {
     uint32    ID;                                           // 0        m_ID
@@ -1808,9 +2368,9 @@ struct SpellItemEnchantmentEntry
     uint32      slot;                                       // 32       m_flags
     uint32      GemID;                                      // 33       m_src_itemID
     uint32      EnchantmentCondition;                       // 34       m_condition_id
-    //uint32      requiredSkill;                            // 35       m_requiredSkillID
-    //uint32      requiredSkillValue;                       // 36       m_requiredSkillRank
-                                                            // 37       m_minLevel
+    uint32      requiredSkill;                              // 35       m_requiredSkillID
+    uint32      requiredSkillValue;                         // 36       m_requiredSkillRank
+    uint32      requiredLevel;                              // 37       m_requiredLevel
 };
 
 struct SpellItemEnchantmentConditionEntry
@@ -1840,6 +2400,8 @@ struct SummonPropertiesEntry
                                                             //      if title = UNITNAME_SUMMON_TITLE_COMPANION, slot=6 -> defensive guardian, in other cases criter/minipet
                                                             //      Slot may have other uses, selection of pet type in some cases?
     uint32  Flags;                                          // 5        m_flags (enum SummonPropFlags)
+
+    bool HasFlag(uint32 flag) const { return bool(Flags & flag); }
 };
 
 #define MAX_TALENT_RANK 5
@@ -1925,6 +2487,29 @@ struct TotemCategoryEntry
     uint32    categoryMask;                                 // 19       m_totemCategoryMask (compatibility mask for same type: different for totems, compatible from high to low for rods)
 };
 
+struct TransportAnimationEntry
+{
+    //uint32    id;                                         // 0       m_ID
+    uint32    transportEntry;                               // 1       transport GO entry
+    uint32    timeFrame;                                    // 2       linked time frame
+    float     x;                                            // 3       transport offset X
+    float     y;                                            // 4       transport offset Y
+    float     z;                                            // 5       transport offset Z
+    uint32    animId;                                       // 6       animation ID
+};
+
+struct TransportRotationEntry
+{
+    //uint32    id;                                         // 0       m_ID
+    uint32    transportEntry;                               // 1       transport GO entry
+    uint32    timeFrame;                                    // 2       linked time frame
+    //float     qx;                                         // 3       rotation quaternion x
+    //float     qy;                                         // 4       rotation quaternion y
+    //float     qz;                                         // 5       rotation quaternion z
+    //float     qw;                                         // 6       rotation quaternion w
+};
+
+
 #define MAX_VEHICLE_SEAT 8
 
 struct VehicleEntry
@@ -1957,9 +2542,9 @@ struct VehicleEntry
     uint32  m_uiLocomotionType;                             // 34
     float   m_msslTrgtImpactTexRadius;                      // 35
     uint32  m_uiSeatIndicatorType;                          // 36       m_vehicleUIIndicatorID
-                                                            // 37       m_powerDisplayID
-                                                            // 38 new in 3.1
-                                                            // 39 new in 3.1
+    uint32  m_powerDisplayID;                               // 37, new in 3.1 - powerType
+                                                            // 38, new in 3.1
+                                                            // 39, new in 3.1
 };
 
 struct VehicleSeatEntry
@@ -2022,6 +2607,14 @@ struct VehicleSeatEntry
                                                             // 55       m_cameraEnteringZoom"
                                                             // 56       m_cameraSeatZoomMin
                                                             // 57       m_cameraSeatZoomMax
+    bool IsUsable() const { return
+        (m_flags & SEAT_FLAG_USABLE) ||
+        (m_flags & SEAT_FLAG_CAN_CONTROL) ||
+        (m_flags & SEAT_FLAG_UNCONTROLLED) ||
+        (m_flagsB & VEHICLE_SEAT_FLAG_B_USABLE_FORCED) ||
+        (m_flagsB & VEHICLE_SEAT_FLAG_B_USABLE_FORCED_2) ||
+        (m_flagsB & VEHICLE_SEAT_FLAG_B_USABLE_FORCED_3) ||
+        (m_flagsB & VEHICLE_SEAT_FLAG_B_USABLE_FORCED_4); }
 };
 
 struct WMOAreaTableEntry
@@ -2039,13 +2632,14 @@ struct WMOAreaTableEntry
     uint32 areaId;                                          // 10       m_AreaTableID (AreaTable.dbc)
     //char *Name[16];                                       //          m_AreaName_lang
     //uint32 nameFlags;
+
 };
 
 struct WorldMapAreaEntry
 {
-    //uint32  ID;                                           // 0        m_ID
+    uint32  ID;                                             // 0        m_ID
     uint32  map_id;                                         // 1        m_mapID
-    uint32  area_id;                                        // 2        m_areaID index (continent 0 areas ignored)
+    uint32  zone_id;                                        // 2        m_areaID index (0 areas contains oveall continent definition)
     //char* internal_name                                   // 3        m_areaName
     float   y1;                                             // 4        m_locLeft
     float   y2;                                             // 5        m_locRight
@@ -2087,6 +2681,28 @@ struct WorldSafeLocsEntry
                                                             // 21 string flags
 };
 
+struct WorldStateEntry
+{
+    uint32    ID;                                           // 0        m_ID
+    uint32    map_id;                                       // 1        WorldState bind map
+    uint32    m_zone;                                       // 2        WorldState bind zone (0 - on battlegrounds)
+    uint32    m_flags;                                      // 3
+//    char*     m_uiIcon;                                   // 4
+    char*     m_uiMessage1[16];                             // 5-20
+//    uint32    m_flags1;                                   // 21       string flags
+//    char*     m_uiMessage2[16]                            // 22-37
+//    uint32    m_flags2;                                   // 38       string flags
+    uint32    m_state;                                      // 39       WorldState ID (not unique!) 0 - for battleground states.
+//    char*     m_uiIcon1;                                  // 40
+//    char*     m_uiIcon2;                                  // 41
+//    char*     m_uiMessage3[16]                            // 42-57
+//    uint32    m_flags3;                                   // 58       string flags
+    char*     m_uiType;                                     // 59       only CAPTUREPOINT type, or NULL
+    uint32    m_linked1;                                    // 60
+    uint32    m_linked2;                                    // 61
+//    uint32    m_unk62;                                    // 62       only 0
+};
+
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack()
@@ -2120,6 +2736,21 @@ struct TalentSpellPos
 
 typedef std::map<uint32,TalentSpellPos> TalentSpellPosMap;
 
+struct SpellEffect
+{
+    SpellEffectEntry effects[MAX_EFFECT_INDEX];
+
+    SpellEffect()
+    {
+    }
+
+    ~SpellEffect()
+    {
+    }
+};
+
+typedef std::map<uint32, SpellEffect> SpellEffectMap;
+
 struct TaxiPathBySourceAndDestination
 {
     TaxiPathBySourceAndDestination() : ID(0),price(0) {}
@@ -2144,6 +2775,9 @@ struct TaxiPathNodePtr
 typedef Path<TaxiPathNodePtr,TaxiPathNodeEntry const> TaxiPathNodeList;
 typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath;
 
+typedef UNORDERED_MAP<uint32 /*frame*/, TransportAnimationEntry const*> TransportAnimationEntryMap;
+typedef UNORDERED_MAP<uint32, TransportAnimationEntryMap> TransportAnimationsByEntry;
+
 #define TaxiMaskSize 14
 typedef uint32 TaxiMask[TaxiMaskSize];
 #endif
diff --git a/src/game/DBCfmt.h b/src/game/DBCfmt.h
index 00ac60d0031..84faafa08da 100644
--- a/src/game/DBCfmt.h
+++ b/src/game/DBCfmt.h
@@ -19,103 +19,111 @@
 #ifndef MANGOS_DBCSFRM_H
 #define MANGOS_DBCSFRM_H
 
-const char Achievementfmt[]="niixssssssssssssssssxxxxxxxxxxxxxxxxxxiixixxxxxxxxxxxxxxxxxxii";
-const char AchievementCriteriafmt[]="niiiiiiiissssssssssssssssxixiii";
-const char AreaTableEntryfmt[]="iiinixxxxxissssssssssssssssxixxxxxxx";
-const char AreaGroupEntryfmt[]="niiiiiii";
-const char AreaTriggerEntryfmt[]="niffffffff";
-const char AuctionHouseEntryfmt[]="niiixxxxxxxxxxxxxxxxx";
-const char BankBagSlotPricesEntryfmt[]="ni";
-const char BarberShopStyleEntryfmt[]="nixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiii";
-const char BattlemasterListEntryfmt[]="niiiiiiiiixssssssssssssssssxiiii";
-const char CharStartOutfitEntryfmt[]="diiiiiiiiiiiiiiiiiiiiiiiiixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-const char CharTitlesEntryfmt[]="nxssssssssssssssssxxxxxxxxxxxxxxxxxxi";
-const char ChatChannelsEntryfmt[]="iixssssssssssssssssxxxxxxxxxxxxxxxxxx";
-                                                            // ChatChannelsEntryfmt, index not used (more compact store)
-const char ChrClassesEntryfmt[]="nxixssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxixii";
-const char ChrRacesEntryfmt[]="nxixiixixxxxixssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxi";
-const char CinematicSequencesEntryfmt[]="nxxxxxxxxx";
-const char CreatureDisplayInfofmt[]="nxxifxxxxxxxxxxx";
-const char CreatureDisplayInfoExtrafmt[]="nixxxxxxxxxxxxxxxxxxx";
-const char CreatureFamilyfmt[]="nfifiiiiixssssssssssssssssxx";
-const char CreatureSpellDatafmt[]="niiiixxxx";
-const char CreatureTypefmt[]="nxxxxxxxxxxxxxxxxxx";
-const char CurrencyTypesfmt[]="xnxi";
-const char DungeonEncounterfmt[]="niiiissssssssssssssssxx";
-const char DurabilityCostsfmt[]="niiiiiiiiiiiiiiiiiiiiiiiiiiiii";
-const char DurabilityQualityfmt[]="nf";
-const char EmotesEntryfmt[]="nxxiiix";
-const char EmotesTextEntryfmt[]="nxixxxxxxxxxxxxxxxx";
-const char FactionEntryfmt[]="niiiiiiiiiiiiiiiiiiffixssssssssssssssssxxxxxxxxxxxxxxxxxx";
-const char FactionTemplateEntryfmt[]="niiiiiiiiiiiii";
-const char GameObjectDisplayInfofmt[]="nxxxxxxxxxxxfxxxxxx";
-const char GemPropertiesEntryfmt[]="nixxi";
-const char GlyphPropertiesfmt[]="niii";
-const char GlyphSlotfmt[]="nii";
-const char GtBarberShopCostBasefmt[]="f";
-const char GtCombatRatingsfmt[]="f";
-const char GtChanceToMeleeCritBasefmt[]="f";
-const char GtChanceToMeleeCritfmt[]="f";
-const char GtChanceToSpellCritBasefmt[]="f";
-const char GtChanceToSpellCritfmt[]="f";
-const char GtOCTClassCombatRatingScalarfmt[]="df";
-const char GtOCTRegenHPfmt[]="f";
-//const char GtOCTRegenMPfmt[]="f";
-const char GtRegenHPPerSptfmt[]="f";
-const char GtRegenMPPerSptfmt[]="f";
-const char Holidaysfmt[]="nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-const char Itemfmt[]="niiiiiii";
-const char ItemBagFamilyfmt[]="nxxxxxxxxxxxxxxxxx";
-const char ItemClassfmt[]="nxxssssssssssssssssx";
-//const char ItemDisplayTemplateEntryfmt[]="nxxxxxxxxxxixxxxxxxxxxx";
-//const char ItemCondExtCostsEntryfmt[]="xiii";
-const char ItemExtendedCostEntryfmt[]="niiiiiiiiiiiiiix";
-const char ItemLimitCategoryEntryfmt[]="nxxxxxxxxxxxxxxxxxii";
-const char ItemRandomPropertiesfmt[]="nxiiiiissssssssssssssssx";
-const char ItemRandomSuffixfmt[]="nssssssssssssssssxxiiiiiiiiii";
-const char ItemSetEntryfmt[]="dssssssssssssssssxxxxxxxxxxxxxxxxxxiiiiiiiiiiiiiiiiii";
-const char LockEntryfmt[]="niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx";
-const char MailTemplateEntryfmt[]="nxxxxxxxxxxxxxxxxxssssssssssssssssx";
-const char MapEntryfmt[]="nxixxssssssssssssssssxixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxixiffxixx";
-const char MapDifficultyEntryfmt[]="diixxxxxxxxxxxxxxxxxiix";
-const char MovieEntryfmt[]="nxx";
-const char OverrideSpellDatafmt[]="niiiiiiiiiix";
-const char QuestFactionRewardfmt[]="niiiiiiiiii";
-const char QuestSortEntryfmt[]="nxxxxxxxxxxxxxxxxx";
-const char QuestXPLevelfmt[]="niiiiiiiiii";
-const char PvPDifficultyfmt[]="diiiii";
-const char RandomPropertiesPointsfmt[]="niiiiiiiiiiiiiii";
-const char ScalingStatDistributionfmt[]="niiiiiiiiiiiiiiiiiiiii";
-const char ScalingStatValuesfmt[]="iniiiiiiiiiiiiiiiiixiiii";
-const char SkillLinefmt[]="nixssssssssssssssssxxxxxxxxxxxxxxxxxxixxxxxxxxxxxxxxxxxi";
-const char SkillLineAbilityfmt[]="niiiixxiiiiixx";
-const char SkillRaceClassInfofmt[]="diiiiixx";
-const char SoundEntriesfmt[]="nxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-const char SpellCastTimefmt[]="nixx";
-const char SpellDurationfmt[]="niii";
-const char SpellDifficultyfmt[]="niiii";
-const char SpellEntryfmt[]="niiiiiiiiiiiixixiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifxiiiiiiiiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiifffiiiiiiiiiiiiixssssssssssssssssxssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiiiiiiiiiiixfffxxxiiiiixxxxxxi";
-const char SpellFocusObjectfmt[]="nxxxxxxxxxxxxxxxxx";
-const char SpellItemEnchantmentfmt[]="nxiiiiiixxxiiissssssssssssssssxiiiixxx";
-const char SpellItemEnchantmentConditionfmt[]="nbbbbbxxxxxbbbbbbbbbbiiiiiXXXXX";
-const char SpellRadiusfmt[]="nfxx";
-const char SpellRangefmt[]="nffffxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-const char SpellRuneCostfmt[]="niiii";
-const char SpellShapeshiftFormfmt[]="nxxxxxxxxxxxxxxxxxxiixiiixxiiiiiiii";
+const char Achievementfmt[] = "niixssssssssssssssssxxxxxxxxxxxxxxxxxxiixixxxxxxxxxxxxxxxxxxii";
+const char AchievementCriteriafmt[] = "niiiiiiiissssssssssssssssxixiii";
+const char AreaTableEntryfmt[] = "iiinixxxxxissssssssssssssssxiiiiixxx";
+const char AreaGroupEntryfmt[] = "niiiiiii";
+const char AreaTriggerEntryfmt[] = "niffffffff";
+const char AuctionHouseEntryfmt[] = "niiixxxxxxxxxxxxxxxxx";
+const char BankBagSlotPricesEntryfmt[] = "ni";
+const char BarberShopStyleEntryfmt[] = "nixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiii";
+const char BattlemasterListEntryfmt[] = "niiiiiiiiixssssssssssssssssxiiii";
+const char CharStartOutfitEntryfmt[] = "diiiiiiiiiiiiiiiiiiiiiiiiixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+const char CharTitlesEntryfmt[] = "nxssssssssssssssssxxxxxxxxxxxxxxxxxxi";
+const char ChatChannelsEntryfmt[] = "iixssssssssssssssssxxxxxxxxxxxxxxxxxx";
+// ChatChannelsEntryfmt, index not used (more compact store)
+const char ChrClassesEntryfmt[] = "nxixssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxixii";
+const char ChrRacesEntryfmt[] = "nxixiixixxxxixssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxi";
+const char CinematicSequencesEntryfmt[] = "nxxxxxxxxx";
+const char CreatureDisplayInfofmt[] = "nixifxxxxxxxxxxx";
+const char CreatureDisplayInfoExtrafmt[] = "nixxxxxxxxxxxxxxxxxxx";
+const char CreatureFamilyfmt[] = "nfifiiiiixssssssssssssssssxx";
+const char CreatureModelDatafmt[] = "nxxifxxxxxxxxxxffxxxxxxxxxxx";
+const char CreatureSpellDatafmt[] = "niiiixxxx";
+const char CreatureTypefmt[] = "nxxxxxxxxxxxxxxxxxx";
+const char CurrencyTypesfmt[] = "xnxi";
+const char DestructibleModelDataFmt[] = "nxxixxxixxxixxxxxxx";
+const char DungeonEncounterfmt[] = "niiiissssssssssssssssxx";
+const char DurabilityCostsfmt[] = "niiiiiiiiiiiiiiiiiiiiiiiiiiiii";
+const char DurabilityQualityfmt[] = "nf";
+const char EmotesEntryfmt[] = "nxxiiix";
+const char EmotesTextEntryfmt[] = "nxixxxxxxxxxxxxxxxx";
+const char FactionEntryfmt[] = "niiiiiiiiiiiiiiiiiiffixssssssssssssssssxxxxxxxxxxxxxxxxxx";
+const char FactionTemplateEntryfmt[] = "niiiiiiiiiiiii";
+const char GameObjectDisplayInfofmt[] = "nsxxxxxxxxxxffffffx";
+const char GemPropertiesEntryfmt[] = "nixxi";
+const char GlyphPropertiesfmt[] = "niii";
+const char GlyphSlotfmt[] = "nii";
+const char GtBarberShopCostBasefmt[] = "f";
+const char GtCombatRatingsfmt[] = "f";
+const char GtChanceToMeleeCritBasefmt[] = "f";
+const char GtChanceToMeleeCritfmt[] = "f";
+const char GtChanceToSpellCritBasefmt[] = "f";
+const char GtChanceToSpellCritfmt[] = "f";
+const char GtOCTClassCombatRatingScalarfmt[] = "df";
+const char GtOCTRegenHPfmt[] = "f";
+// const char GtOCTRegenMPfmt[]="f";
+const char GtRegenHPPerSptfmt[] = "f";
+const char GtRegenMPPerSptfmt[] = "f";
+const char Holidaysfmt[] = "nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+const char Itemfmt[] = "niiiiiii";
+const char ItemBagFamilyfmt[] = "nxxxxxxxxxxxxxxxxx";
+const char ItemClassfmt[] = "nxxssssssssssssssssx";
+// const char ItemDisplayTemplateEntryfmt[]="nxxxxxxxxxxixxxxxxxxxxx";
+// const char ItemCondExtCostsEntryfmt[]="xiii";
+const char ItemExtendedCostEntryfmt[] = "niiiiiiiiiiiiiix";
+const char ItemLimitCategoryEntryfmt[] = "nxxxxxxxxxxxxxxxxxii";
+const char ItemRandomPropertiesfmt[] = "nxiiiiissssssssssssssssx";
+const char ItemRandomSuffixfmt[] = "nssssssssssssssssxxiiiiiiiiii";
+const char ItemSetEntryfmt[] = "dssssssssssssssssxxxxxxxxxxxxxxxxxxiiiiiiiiiiiiiiiiii";
+const char LFGDungeonEntryfmt[] = "nxxxxxxxxxxxxxxxxxiiiiiiiiiixiiixxxxxxxxxxxxxxxxx";
+const char LFGDungeonExpansionEntryfmt[] = "niiiiiii";
+const char LiquidTypefmt[] = "nxxixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+const char LockEntryfmt[] = "niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx";
+const char MailTemplateEntryfmt[] = "nxxxxxxxxxxxxxxxxxssssssssssssssssx";
+const char MapEntryfmt[] = "nxiixssssssssssssssssxixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxixiffxiix";
+const char MapDifficultyEntryfmt[] = "diissssssssssssssssiiix";
+const char MovieEntryfmt[] = "nxx";
+const char OverrideSpellDatafmt[] = "niiiiiiiiiix";
+const char QuestFactionRewardfmt[] = "niiiiiiiiii";
+const char QuestSortEntryfmt[] = "nxxxxxxxxxxxxxxxxx";
+const char QuestXPLevelfmt[] = "niiiiiiiiii";
+const char PowerDisplayfmt[] = "nixxxx";
+const char PvPDifficultyfmt[] = "diiiii";
+const char RandomPropertiesPointsfmt[] = "niiiiiiiiiiiiiii";
+const char ScalingStatDistributionfmt[] = "niiiiiiiiiiiiiiiiiiiii";
+const char ScalingStatValuesfmt[] = "iniiiiiiiiiiiiiiiiixiiii";
+const char SkillLinefmt[] = "nixssssssssssssssssxxxxxxxxxxxxxxxxxxixxxxxxxxxxxxxxxxxi";
+const char SkillLineAbilityfmt[] = "niiiixxiiiiixx";
+const char SkillRaceClassInfofmt[] = "diiiiixx";
+const char SoundEntriesfmt[] = "nxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+const char SpellCastTimefmt[] = "nixx";
+const char SpellDurationfmt[] = "niii";
+const char SpellDifficultyfmt[] = "niiii";
+const char SpellEntryfmt[] = "niiiiiiiiiiiixixiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifxiiiiiiiiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiifffiiiiiiiiiiiiixssssssssssssssssxssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiiiiiiiiiiixfffxxxiiiiixxfffxi";
+const char SpellFocusObjectfmt[] = "nxxxxxxxxxxxxxxxxx";
+const char SpellItemEnchantmentfmt[] = "nxiiiiiixxxiiissssssssssssssssxiiiiiii";
+const char SpellItemEnchantmentConditionfmt[] = "nbbbbbxxxxxbbbbbbbbbbiiiiiXXXXX";
+const char SpellRadiusfmt[] = "nfxx";
+const char SpellRangefmt[] = "nffffxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+const char SpellRuneCostfmt[] = "niiii";
+const char SpellShapeshiftFormfmt[] = "nxxxxxxxxxxxxxxxxxxiixiiixxiiiiiiii";
 const char StableSlotPricesfmt[] = "ni";
 const char SummonPropertiesfmt[] = "niiiii";
-const char TalentEntryfmt[]="niiiiiiiixxxxixxixxxxxx";
-const char TalentTabEntryfmt[]="nxxxxxxxxxxxxxxxxxxxiiix";
-const char TaxiNodesEntryfmt[]="nifffssssssssssssssssxii";
-const char TaxiPathEntryfmt[]="niii";
-const char TaxiPathNodeEntryfmt[]="diiifffiiii";
-const char TeamContributionPointsfmt[]="df";
-const char TotemCategoryEntryfmt[]="nxxxxxxxxxxxxxxxxxii";
-const char VehicleEntryfmt[]="niffffiiiiiiiifffffffffffffffssssfifixxx";
-const char VehicleSeatEntryfmt[]="niiffffffffffiiiiiifffffffiiifffiiiiiiiffiiiiixxxxxxxxxxxx";
-const char WMOAreaTableEntryfmt[]="niiixxxxxiixxxxxxxxxxxxxxxxx";
-const char WorldMapAreaEntryfmt[]="xinxffffixx";
-const char WorldMapOverlayEntryfmt[]="nxiiiixxxxxxxxxxx";
-const char WorldSafeLocsEntryfmt[]="nifffxxxxxxxxxxxxxxxxx";
+const char TalentEntryfmt[] = "niiiiiiiixxxxixxixxxxxx";
+const char TalentTabEntryfmt[] = "nxxxxxxxxxxxxxxxxxxxiiix";
+const char TaxiNodesEntryfmt[] = "nifffssssssssssssssssxii";
+const char TaxiPathEntryfmt[] = "niii";
+const char TaxiPathNodeEntryfmt[] = "diiifffiiii";
+const char TeamContributionPointsfmt[] = "df";
+const char TotemCategoryEntryfmt[] = "nxxxxxxxxxxxxxxxxxii";
+const char TransportAnimationEntryfmt[] = "diifffi";
+const char VehicleEntryfmt[] = "niffffiiiiiiiifffffffffffffffssssfifiixx";
+const char VehicleSeatEntryfmt[] = "niiffffffffffiiiiiifffffffiiifffiiiiiiiffiiiiixxxxxxxxxxxx";
+const char WMOAreaTableEntryfmt[] = "niiixxxxxiixxxxxxxxxxxxxxxxx";
+const char WorldMapAreaEntryfmt[] = "niixffffixx";
+const char WorldMapOverlayEntryfmt[] = "nxiiiixxxxxxxxxxx";
+const char WorldSafeLocsEntryfmt[] = "nifffxxxxxxxxxxxxxxxxx";
+const char WorldStateEntryfmt[]="niiixssssssssssssssssxxxxxxxxxxxxxxxxxxixxxxxxxxxxxxxxxxxxxsiix";
 
 #endif
diff --git a/src/game/DuelHandler.cpp b/src/game/DuelHandler.cpp
index 34415f4544f..1b313b6d9e3 100644
--- a/src/game/DuelHandler.cpp
+++ b/src/game/DuelHandler.cpp
@@ -23,22 +23,23 @@
 #include "Opcodes.h"
 #include "UpdateData.h"
 #include "Player.h"
+#include "World.h"
 
 void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
 {
     ObjectGuid guid;
     recvPacket >> guid;
 
-    if(!GetPlayer()->duel)                                  // ignore accept from duel-sender
+    if (!GetPlayer()->duel)                                 // ignore accept from duel-sender
         return;
 
-    Player *pl       = GetPlayer();
-    Player *plTarget = pl->duel->opponent;
+    Player* pl       = GetPlayer();
+    Player* plTarget = pl->duel->opponent;
 
-    if(pl == pl->duel->initiator || !plTarget || pl == plTarget || pl->duel->startTime != 0 || plTarget->duel->startTime != 0)
+    if (pl == pl->duel->initiator || !plTarget || pl == plTarget || pl->duel->startTime != 0 || plTarget->duel->startTime != 0)
         return;
 
-    DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "WORLD: received CMSG_DUEL_ACCEPTED" );
+    DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "WORLD: received CMSG_DUEL_ACCEPTED");
     DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "Player 1 is: %u (%s)", pl->GetGUIDLow(), pl->GetName());
     DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "Player 2 is: %u (%s)", plTarget->GetGUIDLow(), plTarget->GetName());
 
@@ -48,21 +49,77 @@ void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
 
     pl->SendDuelCountdown(3000);
     plTarget->SendDuelCountdown(3000);
+
+    /**
+    * Duel reset script
+    *
+    */
+
+    uint32 areaId = pl->GetAreaId();
+
+    if(sWorld.getConfig(CONFIG_BOOL_RESET_DUEL_AREA_ENABLED) && sWorld.IsAreaIdEnabledDuelReset(areaId)){
+        //remove arena cds
+        pl->RemoveArenaSpellCooldowns();
+        plTarget->RemoveArenaSpellCooldowns();
+
+        //remove negative arena auras
+        pl->RemoveArenaAuras(true);
+        plTarget->RemoveArenaAuras(true);
+
+        //set max mana and hp
+        pl->SetHealth(pl->GetMaxHealth());
+        pl->SetPower(POWER_MANA, pl->GetMaxPower(POWER_MANA));
+        plTarget->SetHealth(plTarget->GetMaxHealth());
+        plTarget->SetPower(POWER_MANA,  plTarget->GetMaxPower(POWER_MANA));
+
+        // set max hp, mana and remove buffs of players' pet if they have
+        Pet* plPet = pl->GetPet();
+        if(plPet != NULL)
+        {
+            plPet->SetHealth(plPet->GetMaxHealth());
+            plPet->SetPower(plPet->GetPowerType(), plPet->GetMaxPower(plPet->GetPowerType()));
+            plPet->RemoveArenaAuras(true);
+        }
+        Pet* plPetTarget = plTarget->GetPet();
+        if(plPetTarget != NULL)
+        {
+            plPetTarget->SetHealth(plPetTarget->GetMaxHealth());
+            plPetTarget->SetPower(plPetTarget->GetPowerType(), plPetTarget->GetMaxPower(plPetTarget->GetPowerType()));
+            plPetTarget->RemoveArenaAuras(true);
+        }
+    }
 }
 
 void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket)
 {
-    //DEBUG_LOG( "WORLD: received CMSG_DUEL_CANCELLED" );
+
+    // player either discarded the duel using the "discard button"
+    // or used "/forfeit" before countdown reached 0
+    ObjectGuid guid;
+    recvPacket >> guid;    // GO PLAYER_DUEL_ARBITER
+
+    DEBUG_FILTER_LOG(LOG_FILTER_COMBAT,"WORLD: received CMSG_DUEL_CANCELLED player %s arbiter %s", GetPlayer()->GetObjectGuid().GetString().c_str(),guid.GetString().c_str());
 
     // no duel requested
-    if(!GetPlayer()->duel)
+    if (!GetPlayer()->duel)
         return;
 
+    if (GetPlayer()->duel->opponent)
+    {
+        if (GetPlayer()->GetGuidValue(PLAYER_DUEL_ARBITER) != guid ||
+            GetPlayer()->duel->opponent->GetGuidValue(PLAYER_DUEL_ARBITER) != guid)
+        {
+            sLog.outError("WorldSession::HandleDuelCancelledOpcode player %s try cancel duel with %s, but his different arbiters! Possible exploit use.",GetPlayer()->GetObjectGuid().GetString().c_str(),GetPlayer()->duel->opponent->GetObjectGuid().GetString().c_str());
+            GetPlayer()->DuelComplete(DUEL_INTERRUPTED);
+            return;
+        }
+    }
+
     // player surrendered in a duel using /forfeit
-    if(GetPlayer()->duel->startTime != 0)
+    if (GetPlayer()->duel->startTime != 0)
     {
         GetPlayer()->CombatStopWithPets(true);
-        if(GetPlayer()->duel->opponent)
+        if (GetPlayer()->duel->opponent)
             GetPlayer()->duel->opponent->CombatStopWithPets(true);
 
         GetPlayer()->CastSpell(GetPlayer(), 7267, true);    // beg
@@ -70,10 +127,5 @@ void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket)
         return;
     }
 
-    // player either discarded the duel using the "discard button"
-    // or used "/forfeit" before countdown reached 0
-    ObjectGuid guid;
-    recvPacket >> guid;
-
-    GetPlayer()->DuelComplete(DUEL_INTERUPTED);
+    GetPlayer()->DuelComplete(DUEL_INTERRUPTED);
 }
diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp
index 9f718dcdc14..74d4a801ec2 100644
--- a/src/game/DynamicObject.cpp
+++ b/src/game/DynamicObject.cpp
@@ -26,6 +26,7 @@
 #include "CellImpl.h"
 #include "GridNotifiersImpl.h"
 #include "SpellMgr.h"
+#include "DBCStores.h"
 
 DynamicObject::DynamicObject() : WorldObject()
 {
@@ -39,34 +40,24 @@ DynamicObject::DynamicObject() : WorldObject()
 
 void DynamicObject::AddToWorld()
 {
-    ///- Register the dynamicObject for guid lookup
-    if(!IsInWorld())
-        GetMap()->GetObjectsStore().insert<DynamicObject>(GetObjectGuid(), (DynamicObject*)this);
-
-    Object::AddToWorld();
+    WorldObject::AddToWorld();
 }
 
-void DynamicObject::RemoveFromWorld()
+void DynamicObject::RemoveFromWorld(bool remove)
 {
-    ///- Remove the dynamicObject from the accessor
-    if(IsInWorld())
-    {
-        GetMap()->GetObjectsStore().erase<DynamicObject>(GetObjectGuid(), (DynamicObject*)NULL);
-        GetViewPoint().Event_RemovedFromWorld();
-    }
-
-    Object::RemoveFromWorld();
+    WorldObject::RemoveFromWorld(remove);
 }
 
-bool DynamicObject::Create(uint32 guidlow, Unit *caster, uint32 spellId, SpellEffectIndex effIndex, float x, float y, float z, int32 duration, float radius, DynamicObjectType type)
+bool DynamicObject::Create(uint32 guidlow, Unit* caster, uint32 spellId, SpellEffectIndex effIndex, float x, float y, float z, int32 duration, float radius, DynamicObjectType type)
 {
-    WorldObject::_Create(guidlow, HIGHGUID_DYNAMICOBJECT, caster->GetPhaseMask());
+    WorldObject::_Create(ObjectGuid(HIGHGUID_DYNAMICOBJECT, guidlow), caster->GetPhaseMask());
+
+    Relocate(WorldLocation(caster->GetMapId(), x, y, z, 0.0f, caster->GetPhaseMask(), caster->GetInstanceId()));
     SetMap(caster->GetMap());
-    Relocate(x, y, z, 0);
 
-    if(!IsPositionValid())
+    if (!IsPositionValid())
     {
-        sLog.outError("DynamicObject (spell %u eff %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)",spellId,effIndex,GetPositionX(),GetPositionY());
+        sLog.outError("DynamicObject (spell %u eff %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)", spellId, effIndex, GetPositionX(), GetPositionY());
         return false;
     }
 
@@ -114,11 +105,11 @@ Unit* DynamicObject::GetCaster() const
     return ObjectAccessor::GetUnit(*this, GetCasterGuid());
 }
 
-void DynamicObject::Update(uint32 update_diff, uint32 p_time)
+void DynamicObject::Update(uint32 /*update_diff*/, uint32 p_time)
 {
     // caster can be not in world at time dynamic object update, but dynamic object not yet deleted in Unit destructor
     Unit* caster = GetCaster();
-    if(!caster)
+    if (!caster)
     {
         Delete();
         return;
@@ -126,22 +117,22 @@ void DynamicObject::Update(uint32 update_diff, uint32 p_time)
 
     bool deleteThis = false;
 
-    if(m_aliveDuration > int32(p_time))
+    if (m_aliveDuration > int32(p_time))
         m_aliveDuration -= p_time;
     else
         deleteThis = true;
 
     // have radius and work as persistent effect
-    if(m_radius)
+    if (m_radius)
     {
         // TODO: make a timer and update this in larger intervals
         MaNGOS::DynamicObjectUpdater notifier(*this, caster, m_positive);
         Cell::VisitAllObjects(this, notifier, m_radius);
     }
 
-    if(deleteThis)
+    if (deleteThis)
     {
-        caster->RemoveDynObjectWithGUID(GetObjectGuid());
+        caster->RemoveDynObjectWithGuid(GetObjectGuid());
         Delete();
     }
 }
@@ -155,13 +146,13 @@ void DynamicObject::Delete()
 void DynamicObject::Delay(int32 delaytime)
 {
     m_aliveDuration -= delaytime;
-    for(AffectedSet::iterator iter = m_affected.begin(); iter != m_affected.end(); )
+    for (GuidSet::iterator iter = m_affected.begin(); iter != m_affected.end();)
     {
-        Unit *target = GetMap()->GetUnit((*iter));
+        Unit* target = GetMap()->GetUnit((*iter));
         if (target)
         {
-            SpellAuraHolder *holder = target->GetSpellAuraHolder(m_spellId, GetCasterGuid());
-            if (!holder)
+            SpellAuraHolderPtr holder = target->GetSpellAuraHolder(m_spellId, GetCasterGuid());
+            if (!holder || holder->IsDeleted())
             {
                 ++iter;
                 continue;
@@ -170,7 +161,7 @@ void DynamicObject::Delay(int32 delaytime)
             bool foundAura = false;
             for (int32 i = m_effIndex + 1; i < MAX_EFFECT_INDEX; ++i)
             {
-                if ((holder->GetSpellProto()->Effect[i] == SPELL_EFFECT_PERSISTENT_AREA_AURA || holder->GetSpellProto()->Effect[i] == SPELL_EFFECT_ADD_FARSIGHT) && holder->m_auras[i])
+                if ((holder->GetSpellProto()->Effect[i] == SPELL_EFFECT_PERSISTENT_AREA_AURA || holder->GetSpellProto()->Effect[i] == SPELL_EFFECT_ADD_FARSIGHT) && holder->GetAuraByEffectIndex(SpellEffectIndex(i)))
                 {
                     foundAura = true;
                     break;
@@ -204,7 +195,7 @@ bool DynamicObject::isVisibleForInState(Player const* u, WorldObject const* view
     return IsWithinDistInMap(viewPoint, GetMap()->GetVisibilityDistance() + (inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false);
 }
 
-bool DynamicObject::IsHostileTo( Unit const* unit ) const
+bool DynamicObject::IsHostileTo(Unit const* unit) const
 {
     if (Unit* owner = GetCaster())
         return owner->IsHostileTo(unit);
@@ -212,7 +203,7 @@ bool DynamicObject::IsHostileTo( Unit const* unit ) const
         return false;
 }
 
-bool DynamicObject::IsFriendlyTo( Unit const* unit ) const
+bool DynamicObject::IsFriendlyTo(Unit const* unit) const
 {
     if (Unit* owner = GetCaster())
         return owner->IsFriendlyTo(unit);
diff --git a/src/game/DynamicObject.h b/src/game/DynamicObject.h
index 3300c3e822b..e3029b5fb0b 100644
--- a/src/game/DynamicObject.h
+++ b/src/game/DynamicObject.h
@@ -35,13 +35,12 @@ struct SpellEntry;
 class DynamicObject : public WorldObject
 {
     public:
-        typedef std::set<ObjectGuid> AffectedSet;
         explicit DynamicObject();
 
         void AddToWorld();
-        void RemoveFromWorld();
+        virtual void RemoveFromWorld(bool remove) override;
 
-        bool Create(uint32 guidlow, Unit *caster, uint32 spellId, SpellEffectIndex effIndex, float x, float y, float z, int32 duration, float radius, DynamicObjectType type);
+        bool Create(uint32 guidlow, Unit* caster, uint32 spellId, SpellEffectIndex effIndex, float x, float y, float z, int32 duration, float radius, DynamicObjectType type);
         void Update(uint32 update_diff, uint32 p_time) override;
         void Delete();
         uint32 GetSpellId() const { return m_spellId; }
@@ -50,14 +49,14 @@ class DynamicObject : public WorldObject
         ObjectGuid const& GetCasterGuid() const { return GetGuidValue(DYNAMICOBJECT_CASTER); }
         Unit* GetCaster() const;
         float GetRadius() const { return m_radius; }
-        DynamicObjectType GetType() const { return (DynamicObjectType)GetByteValue(DYNAMICOBJECT_BYTES,0); }
-        bool IsAffecting(Unit *unit) const { return m_affected.find(unit->GetObjectGuid()) != m_affected.end(); }
-        void AddAffected(Unit *unit) { m_affected.insert(unit->GetObjectGuid()); }
-        void RemoveAffected(Unit *unit) { m_affected.erase(unit->GetObjectGuid()); }
+        DynamicObjectType GetType() const { return (DynamicObjectType)GetByteValue(DYNAMICOBJECT_BYTES, 0); }
+        bool IsAffecting(Unit* unit) const { return m_affected.find(unit->GetObjectGuid()) != m_affected.end(); }
+        void AddAffected(Unit* unit) { m_affected.insert(unit->GetObjectGuid()); }
+        void RemoveAffected(Unit* unit) { m_affected.erase(unit->GetObjectGuid()); }
         void Delay(int32 delaytime);
 
-        bool IsHostileTo(Unit const* unit) const;
-        bool IsFriendlyTo(Unit const* unit) const;
+        virtual bool IsHostileTo(Unit const* unit) const override;
+        virtual bool IsFriendlyTo(Unit const* unit) const override;
 
         float GetObjectBoundingRadius() const               // overwrite WorldObject version
         {
@@ -66,7 +65,7 @@ class DynamicObject : public WorldObject
 
         bool isVisibleForInState(Player const* u, WorldObject const* viewPoint, bool inVisibleList) const;
 
-        GridReference<DynamicObject> &GetGridRef() { return m_gridRef; }
+        GridReference<DynamicObject>& GetGridRef() { return m_gridRef; }
 
     protected:
         uint32 m_spellId;
@@ -74,7 +73,7 @@ class DynamicObject : public WorldObject
         int32 m_aliveDuration;
         float m_radius;                                     // radius apply persistent effect, 0 = no persistent effect
         bool m_positive;
-        AffectedSet m_affected;
+        GuidSet m_affected;
     private:
         GridReference<DynamicObject> m_gridRef;
 };
diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/FleeingMovementGenerator.cpp
deleted file mode 100644
index 72346425ebb..00000000000
--- a/src/game/FleeingMovementGenerator.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Creature.h"
-#include "CreatureAI.h"
-#include "MapManager.h"
-#include "FleeingMovementGenerator.h"
-#include "ObjectAccessor.h"
-#include "movement/MoveSplineInit.h"
-#include "movement/MoveSpline.h"
-#include "PathFinder.h"
-
-#define MIN_QUIET_DISTANCE 28.0f
-#define MAX_QUIET_DISTANCE 43.0f
-
-template<class T>
-void FleeingMovementGenerator<T>::_setTargetLocation(T &owner)
-{
-    if(!&owner)
-        return;
-
-    // ignore in case other no reaction state
-    if (owner.hasUnitState(UNIT_STAT_CAN_NOT_REACT & ~UNIT_STAT_FLEEING))
-        return;
-
-    float x, y, z;
-    if(!_getPoint(owner, x, y, z))
-        return;
-
-    owner.addUnitState(UNIT_STAT_FLEEING_MOVE);
-
-    PathFinder path(&owner);
-    path.setPathLengthLimit(30.0f);
-    path.calculate(x, y, z);
-    if(path.getPathType() & PATHFIND_NOPATH)
-    {
-        i_nextCheckTime.Reset(urand(1000, 1500));
-        return;
-    }
-
-    Movement::MoveSplineInit init(owner);
-    init.MovebyPath(path.getPath());
-    init.SetWalk(false);
-    int32 traveltime = init.Launch();
-    i_nextCheckTime.Reset(traveltime + urand(800, 1500));
-}
-
-template<class T>
-bool FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z)
-{
-    if(!&owner)
-        return false;
-
-    float dist_from_caster, angle_to_caster;
-    if(Unit* fright = ObjectAccessor::GetUnit(owner, i_frightGuid))
-    {
-        dist_from_caster = fright->GetDistance(&owner);
-        if(dist_from_caster > 0.2f)
-            angle_to_caster = fright->GetAngle(&owner);
-        else
-            angle_to_caster = frand(0, 2*M_PI_F);
-    }
-    else
-    {
-        dist_from_caster = 0.0f;
-        angle_to_caster = frand(0, 2*M_PI_F);
-    }
-
-    float dist, angle;
-    if(dist_from_caster < MIN_QUIET_DISTANCE)
-    {
-        dist = frand(0.4f, 1.3f)*(MIN_QUIET_DISTANCE - dist_from_caster);
-        angle = angle_to_caster + frand(-M_PI_F/8, M_PI_F/8);
-    }
-    else if(dist_from_caster > MAX_QUIET_DISTANCE)
-    {
-        dist = frand(0.4f, 1.0f)*(MAX_QUIET_DISTANCE - MIN_QUIET_DISTANCE);
-        angle = -angle_to_caster + frand(-M_PI_F/4, M_PI_F/4);
-    }
-    else    // we are inside quiet range
-    {
-        dist = frand(0.6f, 1.2f)*(MAX_QUIET_DISTANCE - MIN_QUIET_DISTANCE);
-        angle = frand(0, 2*M_PI_F);
-    }
-
-    float curr_x, curr_y, curr_z;
-    owner.GetPosition(curr_x, curr_y, curr_z);
-
-    x = curr_x + dist*cos(angle);
-    y = curr_y + dist*sin(angle);
-    z = curr_z;
-
-    owner.UpdateAllowedPositionZ(x, y, z);
-
-    return true;
-}
-
-template<class T>
-void FleeingMovementGenerator<T>::Initialize(T &owner)
-{
-    owner.addUnitState(UNIT_STAT_FLEEING|UNIT_STAT_FLEEING_MOVE);
-    owner.StopMoving();
-
-    if(owner.GetTypeId() == TYPEID_UNIT)
-        owner.SetTargetGuid(ObjectGuid());
-
-    _setTargetLocation(owner);
-}
-
-template<>
-void FleeingMovementGenerator<Player>::Finalize(Player &owner)
-{
-    owner.clearUnitState(UNIT_STAT_FLEEING|UNIT_STAT_FLEEING_MOVE);
-    owner.StopMoving();
-}
-
-template<>
-void FleeingMovementGenerator<Creature>::Finalize(Creature &owner)
-{
-    owner.clearUnitState(UNIT_STAT_FLEEING|UNIT_STAT_FLEEING_MOVE);
-}
-
-template<class T>
-void FleeingMovementGenerator<T>::Interrupt(T &owner)
-{
-    // flee state still applied while movegen disabled
-    owner.clearUnitState(UNIT_STAT_FLEEING_MOVE);
-}
-
-template<class T>
-void FleeingMovementGenerator<T>::Reset(T &owner)
-{
-    Initialize(owner);
-}
-
-template<class T>
-bool FleeingMovementGenerator<T>::Update(T &owner, const uint32 & time_diff)
-{
-    if( !&owner || !owner.isAlive() )
-        return false;
-
-    // ignore in case other no reaction state
-    if (owner.hasUnitState(UNIT_STAT_CAN_NOT_REACT & ~UNIT_STAT_FLEEING))
-    {
-        owner.clearUnitState(UNIT_STAT_FLEEING_MOVE);
-        return true;
-    }
-
-    i_nextCheckTime.Update(time_diff);
-    if (i_nextCheckTime.Passed() && owner.movespline->Finalized())
-        _setTargetLocation(owner);
-
-    return true;
-}
-
-template void FleeingMovementGenerator<Player>::Initialize(Player &);
-template void FleeingMovementGenerator<Creature>::Initialize(Creature &);
-template bool FleeingMovementGenerator<Player>::_getPoint(Player &, float &, float &, float &);
-template bool FleeingMovementGenerator<Creature>::_getPoint(Creature &, float &, float &, float &);
-template void FleeingMovementGenerator<Player>::_setTargetLocation(Player &);
-template void FleeingMovementGenerator<Creature>::_setTargetLocation(Creature &);
-template void FleeingMovementGenerator<Player>::Interrupt(Player &);
-template void FleeingMovementGenerator<Creature>::Interrupt(Creature &);
-template void FleeingMovementGenerator<Player>::Reset(Player &);
-template void FleeingMovementGenerator<Creature>::Reset(Creature &);
-template bool FleeingMovementGenerator<Player>::Update(Player &, const uint32 &);
-template bool FleeingMovementGenerator<Creature>::Update(Creature &, const uint32 &);
-
-void TimedFleeingMovementGenerator::Finalize(Unit &owner)
-{
-    owner.clearUnitState(UNIT_STAT_FLEEING|UNIT_STAT_FLEEING_MOVE);
-    if (Unit* victim = owner.getVictim())
-    {
-        if (owner.isAlive())
-        {
-            owner.AttackStop(true);
-            ((Creature*)&owner)->AI()->AttackStart(victim);
-        }
-    }
-}
-
-bool TimedFleeingMovementGenerator::Update(Unit & owner, const uint32 & time_diff)
-{
-    if( !owner.isAlive() )
-        return false;
-
-    // ignore in case other no reaction state
-    if (owner.hasUnitState(UNIT_STAT_CAN_NOT_REACT & ~UNIT_STAT_FLEEING))
-    {
-        owner.clearUnitState(UNIT_STAT_FLEEING_MOVE);
-        return true;
-    }
-
-    i_totalFleeTime.Update(time_diff);
-    if (i_totalFleeTime.Passed())
-        return false;
-
-    // This calls grant-parent Update method hiden by FleeingMovementGenerator::Update(Creature &, const uint32 &) version
-    // This is done instead of casting Unit& to Creature& and call parent method, then we can use Unit directly
-    return MovementGeneratorMedium< Creature, FleeingMovementGenerator<Creature> >::Update(owner, time_diff);
-}
diff --git a/src/game/FleeingMovementGenerator.h b/src/game/FleeingMovementGenerator.h
deleted file mode 100644
index bda63481e0e..00000000000
--- a/src/game/FleeingMovementGenerator.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef MANGOS_FLEEINGMOVEMENTGENERATOR_H
-#define MANGOS_FLEEINGMOVEMENTGENERATOR_H
-
-#include "MovementGenerator.h"
-#include "ObjectGuid.h"
-
-template<class T>
-class MANGOS_DLL_SPEC FleeingMovementGenerator
-: public MovementGeneratorMedium< T, FleeingMovementGenerator<T> >
-{
-    public:
-        FleeingMovementGenerator(ObjectGuid fright) : i_frightGuid(fright), i_nextCheckTime(0) {}
-
-        void Initialize(T &);
-        void Finalize(T &);
-        void Interrupt(T &);
-        void Reset(T &);
-        bool Update(T &, const uint32 &);
-
-        MovementGeneratorType GetMovementGeneratorType() const { return FLEEING_MOTION_TYPE; }
-
-    private:
-        void _setTargetLocation(T &owner);
-        bool _getPoint(T &owner, float &x, float &y, float &z);
-
-        ObjectGuid i_frightGuid;
-        TimeTracker i_nextCheckTime;
-};
-
-class MANGOS_DLL_SPEC TimedFleeingMovementGenerator
-: public FleeingMovementGenerator<Creature>
-{
-    public:
-        TimedFleeingMovementGenerator(ObjectGuid fright, uint32 time) :
-            FleeingMovementGenerator<Creature>(fright),
-            i_totalFleeTime(time) {}
-
-        MovementGeneratorType GetMovementGeneratorType() const { return TIMED_FLEEING_MOTION_TYPE; }
-        bool Update(Unit &, const uint32 &);
-        void Finalize(Unit &);
-
-    private:
-        TimeTracker i_totalFleeTime;
-};
-
-#endif
diff --git a/src/game/FollowerReference.cpp b/src/game/FollowerReference.cpp
index 3335b0aa859..97c8274cc12 100644
--- a/src/game/FollowerReference.cpp
+++ b/src/game/FollowerReference.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Unit.h"
-#include "TargetedMovementGenerator.h"
+#include "movementGenerators/TargetedMovementGenerator.h"
 #include "FollowerReference.h"
 
 void FollowerReference::targetObjectBuildLink()
diff --git a/src/game/Formulas.h b/src/game/Formulas.h
index 5e89b37d237..197ae441c4c 100644
--- a/src/game/Formulas.h
+++ b/src/game/Formulas.h
@@ -25,9 +25,9 @@ namespace MaNGOS
 {
     namespace Honor
     {
-        inline float hk_honor_at_level(uint32 level, uint32 count=1)
+        inline float hk_honor_at_level(uint32 level, uint32 count = 1)
         {
-            return (float)ceil(count*(-0.53177f + 0.59357f * exp((level +23.54042f) / 26.07859f )));
+            return (float)ceil(count * (-0.53177f + 0.59357f * exp((level + 23.54042f) / 26.07859f)));
         }
     }
     namespace XP
@@ -36,25 +36,25 @@ namespace MaNGOS
 
         inline uint32 GetGrayLevel(uint32 pl_level)
         {
-            if( pl_level <= 5 )
+            if (pl_level <= 5)
                 return 0;
-            else if( pl_level <= 39 )
-                return pl_level - 5 - pl_level/10;
-            else if( pl_level <= 59 )
-                return pl_level - 1 - pl_level/5;
+            else if (pl_level <= 39)
+                return pl_level - 5 - pl_level / 10;
+            else if (pl_level <= 59)
+                return pl_level - 1 - pl_level / 5;
             else
                 return pl_level - 9;
         }
 
         inline XPColorChar GetColorCode(uint32 pl_level, uint32 mob_level)
         {
-            if( mob_level >= pl_level + 5 )
+            if (mob_level >= pl_level + 5)
                 return RED;
-            else if( mob_level >= pl_level + 3 )
+            else if (mob_level >= pl_level + 3)
                 return ORANGE;
-            else if( mob_level >= pl_level - 2 )
+            else if (mob_level >= pl_level - 2)
                 return YELLOW;
-            else if( mob_level > GetGrayLevel(pl_level) )
+            else if (mob_level > GetGrayLevel(pl_level))
                 return GREEN;
             else
                 return GRAY;
@@ -62,79 +62,79 @@ namespace MaNGOS
 
         inline uint32 GetZeroDifference(uint32 pl_level)
         {
-            if( pl_level < 8 )  return 5;
-            if( pl_level < 10 ) return 6;
-            if( pl_level < 12 ) return 7;
-            if( pl_level < 16 ) return 8;
-            if( pl_level < 20 ) return 9;
-            if( pl_level < 30 ) return 11;
-            if( pl_level < 40 ) return 12;
-            if( pl_level < 45 ) return 13;
-            if( pl_level < 50 ) return 14;
-            if( pl_level < 55 ) return 15;
-            if( pl_level < 60 ) return 16;
+            if (pl_level < 8)  return 5;
+            if (pl_level < 10) return 6;
+            if (pl_level < 12) return 7;
+            if (pl_level < 16) return 8;
+            if (pl_level < 20) return 9;
+            if (pl_level < 30) return 11;
+            if (pl_level < 40) return 12;
+            if (pl_level < 45) return 13;
+            if (pl_level < 50) return 14;
+            if (pl_level < 55) return 15;
+            if (pl_level < 60) return 16;
             return 17;
         }
 
         inline uint32 BaseGain(uint32 pl_level, uint32 mob_level, ContentLevels content)
         {
             uint32 nBaseExp;
-            switch(content)
+            switch (content)
             {
                 case CONTENT_1_60:  nBaseExp = 45;  break;
                 case CONTENT_61_70: nBaseExp = 235; break;
                 case CONTENT_71_80: nBaseExp = 580; break;
                 default:
-                    sLog.outError("BaseGain: Unsupported content level %u",content);
+                    sLog.outError("BaseGain: Unsupported content level %u", content);
                     nBaseExp = 45;  break;
             }
 
-            if( mob_level >= pl_level )
+            if (mob_level >= pl_level)
             {
                 uint32 nLevelDiff = mob_level - pl_level;
                 if (nLevelDiff > 4)
                     nLevelDiff = 4;
-                return ((pl_level*5 + nBaseExp) * (20 + nLevelDiff)/10 + 1)/2;
+                return ((pl_level * 5 + nBaseExp) * (20 + nLevelDiff) / 10 + 1) / 2;
             }
             else
             {
                 uint32 gray_level = GetGrayLevel(pl_level);
-                if( mob_level > gray_level )
+                if (mob_level > gray_level)
                 {
                     uint32 ZD = GetZeroDifference(pl_level);
-                    return (pl_level*5 + nBaseExp) * (ZD + mob_level - pl_level)/ZD;
+                    return (pl_level * 5 + nBaseExp) * (ZD + mob_level - pl_level) / ZD;
                 }
                 return 0;
             }
         }
 
-        inline uint32 Gain(Player *pl, Unit *u)
+        inline uint32 Gain(Player* pl, Unit* u)
         {
-            if(u->GetTypeId()==TYPEID_UNIT && (
-                ((Creature*)u)->IsTotem() || ((Creature*)u)->IsPet() ||
-                (((Creature*)u)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL) ))
+            if (u->GetTypeId() == TYPEID_UNIT && (
+                        ((Creature*)u)->IsTotem() || ((Creature*)u)->IsPet() ||
+                        (((Creature*)u)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL)))
                 return 0;
 
-            uint32 xp_gain= BaseGain(pl->getLevel(), u->getLevel(), GetContentLevelsForMapAndZone(pl->GetMapId(),pl->GetZoneId()));
-            if( xp_gain == 0 )
+            uint32 xp_gain = BaseGain(pl->getLevel(), u->getLevel(), GetContentLevelsForMapAndZone(pl->GetMapId(), pl->GetZoneId()));
+            if (xp_gain == 0)
                 return 0;
 
-            if(u->GetTypeId()==TYPEID_UNIT && ((Creature*)u)->IsElite())
+            if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->IsElite())
                 xp_gain *= 2;
 
-            return (uint32)(xp_gain*sWorld.getConfig(CONFIG_FLOAT_RATE_XP_KILL));
+            return (uint32)(xp_gain * sWorld.getConfig(CONFIG_FLOAT_RATE_XP_KILL));
         }
 
         inline float xp_in_group_rate(uint32 count, bool isRaid)
         {
-            if(isRaid)
+            if (isRaid)
             {
                 // FIX ME: must apply decrease modifiers dependent from raid size
                 return 1.0f;
             }
             else
             {
-                switch(count)
+                switch (count)
                 {
                     case 0:
                     case 1:
diff --git a/src/game/GMTicketHandler.cpp b/src/game/GMTicketHandler.cpp
index d71b2971e27..ab81117cb3e 100644
--- a/src/game/GMTicketHandler.cpp
+++ b/src/game/GMTicketHandler.cpp
@@ -25,10 +25,10 @@
 #include "Player.h"
 #include "Chat.h"
 
-void WorldSession::SendGMTicketGetTicket(uint32 status, GMTicket *ticket /*= NULL*/)
+void WorldSession::SendGMTicketGetTicket(uint32 status, GMTicket* ticket /*= NULL*/)
 {
     int len = ticket ? strlen(ticket->GetText()) : 0;
-    WorldPacket data( SMSG_GMTICKET_GETTICKET, (4+len+1+4+2+4+4) );
+    WorldPacket data(SMSG_GMTICKET_GETTICKET, (4 + len + 1 + 4 + 2 + 4 + 4));
     data << uint32(status);                                 // standard 0x0A, 0x06 if text present
     if (status == 6)
     {
@@ -44,10 +44,10 @@ void WorldSession::SendGMTicketGetTicket(uint32 status, GMTicket *ticket /*= NUL
     SendPacket(&data);
 }
 
-void WorldSession::SendGMResponse(GMTicket *ticket)
+void WorldSession::SendGMResponse(GMTicket* ticket)
 {
-    int len = strlen(ticket->GetText())+1+strlen(ticket->GetResponse())+1;
-    WorldPacket data(SMSG_GMTICKET_GET_RESPONSE, 4+4+len+1+1+1);
+    int len = strlen(ticket->GetText()) + 1 + strlen(ticket->GetResponse()) + 1;
+    WorldPacket data(SMSG_GMTICKET_GET_RESPONSE, 4 + 4 + len + 1 + 1 + 1);
     data << uint32(123);
     data << uint32(456);
     data << ticket->GetText();                              // issue text
@@ -58,14 +58,14 @@ void WorldSession::SendGMResponse(GMTicket *ticket)
     SendPacket(&data);
 }
 
-void WorldSession::HandleGMTicketGetTicketOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleGMTicketGetTicketOpcode(WorldPacket& /*recv_data*/)
 {
     SendQueryTimeResponse();
 
     GMTicket* ticket = sTicketMgr.GetGMTicket(GetPlayer()->GetObjectGuid());
-    if(ticket)
+    if (ticket)
     {
-        if(ticket->HasResponse())
+        if (ticket->HasResponse())
             SendGMResponse(ticket);
         else
             SendGMTicketGetTicket(0x06, ticket);
@@ -74,29 +74,30 @@ void WorldSession::HandleGMTicketGetTicketOpcode( WorldPacket & /*recv_data*/ )
         SendGMTicketGetTicket(0x0A);
 }
 
-void WorldSession::HandleGMTicketUpdateTextOpcode( WorldPacket & recv_data )
+void WorldSession::HandleGMTicketUpdateTextOpcode(WorldPacket& recv_data)
 {
     std::string ticketText;
     recv_data >> ticketText;
 
-    if(GMTicket* ticket = sTicketMgr.GetGMTicket(GetPlayer()->GetObjectGuid()))
+    GMTicket* ticket = sTicketMgr.GetGMTicket(GetPlayer()->GetObjectGuid());
+    if (ticket)
         ticket->SetText(ticketText.c_str());
     else
         sLog.outError("Ticket update: Player %s (GUID: %u) doesn't have active ticket", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow());
 }
 
-void WorldSession::HandleGMTicketDeleteTicketOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleGMTicketDeleteTicketOpcode(WorldPacket& /*recv_data*/)
 {
     sTicketMgr.Delete(GetPlayer()->GetObjectGuid());
 
-    WorldPacket data( SMSG_GMTICKET_DELETETICKET, 4 );
+    WorldPacket data(SMSG_GMTICKET_DELETETICKET, 4);
     data << uint32(9);
-    SendPacket( &data );
+    SendPacket(&data);
 
     SendGMTicketGetTicket(0x0A);
 }
 
-void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data )
+void WorldSession::HandleGMTicketCreateOpcode(WorldPacket& recv_data)
 {
     uint32 map;
     float x, y, z;
@@ -113,43 +114,43 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data )
 
     DEBUG_LOG("TicketCreate: map %u, x %f, y %f, z %f, text %s", map, x, y, z, ticketText.c_str());
 
-    if(sTicketMgr.GetGMTicket(GetPlayer()->GetObjectGuid()) && !isFollowup)
+    if (sTicketMgr.GetGMTicket(GetPlayer()->GetObjectGuid()) && !isFollowup)
     {
-        WorldPacket data( SMSG_GMTICKET_CREATE, 4 );
+        WorldPacket data(SMSG_GMTICKET_CREATE, 4);
         data << uint32(1);                                  // 1 - You already have GM ticket
-        SendPacket( &data );
+        SendPacket(&data);
         return;
     }
 
-    if(isFollowup)
+    if (isFollowup)
         sTicketMgr.Delete(_player->GetObjectGuid());
 
     sTicketMgr.Create(_player->GetObjectGuid(), ticketText.c_str());
 
     SendQueryTimeResponse();
 
-    WorldPacket data( SMSG_GMTICKET_CREATE, 4 );
+    WorldPacket data(SMSG_GMTICKET_CREATE, 4);
     data << uint32(2);                                      // 2 - nothing appears (3-error creating, 5-error updating)
-    SendPacket( &data );
+    SendPacket(&data);
 
-    //TODO: Guard player map
-    HashMapHolder<Player>::MapType &m = sObjectAccessor.GetPlayers();
+    // TODO: Guard player map
+    HashMapHolder<Player>::MapType& m = sObjectAccessor.GetPlayers();
     for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (itr->second->GetSession()->GetSecurity() >= SEC_GAMEMASTER && itr->second->isAcceptTickets())
-            ChatHandler(itr->second).PSendSysMessage(LANG_COMMAND_TICKETNEW,GetPlayer()->GetName());
+            ChatHandler(itr->second).PSendSysMessage(LANG_COMMAND_TICKETNEW, GetPlayer()->GetName());
     }
 }
 
-void WorldSession::HandleGMTicketSystemStatusOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleGMTicketSystemStatusOpcode(WorldPacket& /*recv_data*/)
 {
-    WorldPacket data( SMSG_GMTICKET_SYSTEMSTATUS, 4 );
+    WorldPacket data(SMSG_GMTICKET_SYSTEMSTATUS, 4);
     data << uint32(1);                                      // we can also disable ticket system by sending 0 value
 
-    SendPacket( &data );
+    SendPacket(&data);
 }
 
-void WorldSession::HandleGMSurveySubmitOpcode( WorldPacket & recv_data)
+void WorldSession::HandleGMSurveySubmitOpcode(WorldPacket& recv_data)
 {
     // GM survey is shown after SMSG_GM_TICKET_STATUS_UPDATE with status = 3
     uint32 x;
@@ -158,7 +159,7 @@ void WorldSession::HandleGMSurveySubmitOpcode( WorldPacket & recv_data)
 
     uint8 result[10];
     memset(result, 0, sizeof(result));
-    for( int i = 0; i < 10; ++i)
+    for (int i = 0; i < 10; ++i)
     {
         uint32 questionID;
         recv_data >> questionID;                            // GMSurveyQuestions.dbc
@@ -181,7 +182,7 @@ void WorldSession::HandleGMSurveySubmitOpcode( WorldPacket & recv_data)
     // TODO: chart this data in some way
 }
 
-void WorldSession::HandleGMResponseResolveOpcode(WorldPacket & recv_data)
+void WorldSession::HandleGMResponseResolveOpcode(WorldPacket& recv_data)
 {
     // empty opcode
     DEBUG_LOG("WORLD: %s", LookupOpcodeName(recv_data.GetOpcode()));
diff --git a/src/game/GMTicketMgr.cpp b/src/game/GMTicketMgr.cpp
index ddc71c06695..08cdbf9d0d5 100644
--- a/src/game/GMTicketMgr.cpp
+++ b/src/game/GMTicketMgr.cpp
@@ -23,7 +23,7 @@
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Player.h"
 
 INSTANTIATE_SINGLETON_1(GMTicketMgr);
@@ -32,11 +32,11 @@ void GMTicketMgr::LoadGMTickets()
 {
     m_GMTicketMap.clear();                                  // For reload case
 
-    QueryResult *result = CharacterDatabase.Query(
-        //      0     1            2              3                                  4
-        "SELECT guid, ticket_text, response_text, UNIX_TIMESTAMP(ticket_lastchange), ticket_id FROM character_ticket ORDER BY ticket_id ASC");
+    QueryResult* result = CharacterDatabase.Query(
+                              //      0     1            2              3                                  4
+                              "SELECT guid, ticket_text, response_text, UNIX_TIMESTAMP(ticket_lastchange), ticket_id FROM character_ticket ORDER BY ticket_id ASC");
 
-    if( !result )
+    if (!result)
     {
         BarGoLink bar(1);
 
@@ -72,7 +72,8 @@ void GMTicketMgr::LoadGMTickets()
         ticket.Init(guid, fields[1].GetCppString(), fields[2].GetCppString(), time_t(fields[3].GetUInt64()));
         m_GMTicketListByCreatingOrder.push_back(&ticket);
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 
     sLog.outString();
@@ -81,9 +82,10 @@ void GMTicketMgr::LoadGMTickets()
 
 void GMTicketMgr::DeleteAll()
 {
-    for(GMTicketMap::const_iterator itr = m_GMTicketMap.begin(); itr != m_GMTicketMap.end(); ++itr)
+    for (GMTicketMap::const_iterator itr = m_GMTicketMap.begin(); itr != m_GMTicketMap.end(); ++itr)
     {
-        if(Player* owner = sObjectMgr.GetPlayer(itr->first))
+        Player* owner = sObjectMgr.GetPlayer(itr->first);
+        if (owner)
             owner->GetSession()->SendGMTicketGetTicket(0x0A);
     }
     CharacterDatabase.Execute("DELETE FROM character_ticket");
diff --git a/src/game/GMTicketMgr.h b/src/game/GMTicketMgr.h
index 9644a57d888..a06d47c580b 100644
--- a/src/game/GMTicketMgr.h
+++ b/src/game/GMTicketMgr.h
@@ -37,7 +37,7 @@ class GMTicket
             m_guid = guid;
             m_text = text;
             m_responseText = responsetext;
-            m_lastUpdate =update;
+            m_lastUpdate = update;
         }
 
         ObjectGuid const& GetPlayerGuid() const
@@ -121,7 +121,7 @@ class GMTicketMgr
         GMTicket* GetGMTicket(ObjectGuid guid)
         {
             GMTicketMap::iterator itr = m_GMTicketMap.find(guid);
-            if(itr == m_GMTicketMap.end())
+            if (itr == m_GMTicketMap.end())
                 return NULL;
             return &(itr->second);
         }
@@ -138,7 +138,7 @@ class GMTicketMgr
 
             GMTicketList::iterator itr = m_GMTicketListByCreatingOrder.begin();
             std::advance(itr, pos);
-            if(itr == m_GMTicketListByCreatingOrder.end())
+            if (itr == m_GMTicketListByCreatingOrder.end())
                 return NULL;
             return *itr;
         }
@@ -147,7 +147,7 @@ class GMTicketMgr
         void Delete(ObjectGuid guid)
         {
             GMTicketMap::iterator itr = m_GMTicketMap.find(guid);
-            if(itr == m_GMTicketMap.end())
+            if (itr == m_GMTicketMap.end())
                 return;
             itr->second.DeleteFromDB();
             m_GMTicketListByCreatingOrder.remove(&itr->second);
diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
index d8f4cde68e7..3bbe8e5fc03 100644
--- a/src/game/GameEventMgr.cpp
+++ b/src/game/GameEventMgr.cpp
@@ -25,18 +25,18 @@
 #include "Language.h"
 #include "Log.h"
 #include "MapManager.h"
-#include "BattleGroundMgr.h"
+#include "BattleGround/BattleGroundMgr.h"
 #include "MassMailMgr.h"
 #include "SpellMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 INSTANTIATE_SINGLETON_1(GameEventMgr);
 
 bool GameEventMgr::CheckOneGameEvent(uint16 entry, time_t currenttime) const
 {
     // Get the event information
-    if( mGameEvent[entry].start < currenttime && currenttime < mGameEvent[entry].end &&
-        ((currenttime - mGameEvent[entry].start) % (mGameEvent[entry].occurence * MINUTE)) < (mGameEvent[entry].length * MINUTE) )
+    if (mGameEvent[entry].start < currenttime && currenttime < mGameEvent[entry].end &&
+            ((currenttime - mGameEvent[entry].start) % (mGameEvent[entry].occurence * MINUTE)) < (mGameEvent[entry].length * MINUTE))
         return true;
     else
         return false;
@@ -68,48 +68,48 @@ uint32 GameEventMgr::NextCheck(uint16 entry) const
         return delay;
 }
 
-void GameEventMgr::StartEvent( uint16 event_id, bool overwrite /*=false*/, bool resume /*=false*/)
+void GameEventMgr::StartEvent(uint16 event_id, bool overwrite /*=false*/, bool resume /*=false*/)
 {
     ApplyNewEvent(event_id, resume);
-    if(overwrite)
+    if (overwrite)
     {
         mGameEvent[event_id].start = time(NULL);
-        if(mGameEvent[event_id].end <= mGameEvent[event_id].start)
-            mGameEvent[event_id].end = mGameEvent[event_id].start+mGameEvent[event_id].length;
+        if (mGameEvent[event_id].end <= mGameEvent[event_id].start)
+            mGameEvent[event_id].end = mGameEvent[event_id].start + mGameEvent[event_id].length;
     }
 }
 
-void GameEventMgr::StopEvent( uint16 event_id, bool overwrite )
+void GameEventMgr::StopEvent(uint16 event_id, bool overwrite)
 {
     UnApplyEvent(event_id);
-    if(overwrite)
+    if (overwrite)
     {
         mGameEvent[event_id].start = time(NULL) - mGameEvent[event_id].length * MINUTE;
-        if(mGameEvent[event_id].end <= mGameEvent[event_id].start)
-            mGameEvent[event_id].end = mGameEvent[event_id].start+mGameEvent[event_id].length;
+        if (mGameEvent[event_id].end <= mGameEvent[event_id].start)
+            mGameEvent[event_id].end = mGameEvent[event_id].start + mGameEvent[event_id].length;
     }
 }
 
 void GameEventMgr::LoadFromDB()
 {
     {
-        QueryResult *result = WorldDatabase.Query("SELECT MAX(entry) FROM game_event");
-        if( !result )
+        QueryResult* result = WorldDatabase.Query("SELECT MAX(entry) FROM game_event");
+        if (!result)
         {
             sLog.outString(">> Table game_event is empty.");
             sLog.outString();
             return;
         }
 
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
 
         uint32 max_event_id = fields[0].GetUInt16();
         delete result;
 
-        mGameEvent.resize(max_event_id+1);
+        mGameEvent.resize(max_event_id + 1);
     }
 
-    QueryResult *result = WorldDatabase.Query("SELECT entry,UNIX_TIMESTAMP(start_time),UNIX_TIMESTAMP(end_time),occurence,length,holiday,description FROM game_event");
+    QueryResult* result = WorldDatabase.Query("SELECT entry,UNIX_TIMESTAMP(start_time),UNIX_TIMESTAMP(end_time),occurence,length,holiday,description FROM game_event");
     if (!result)
     {
         mGameEvent.clear();
@@ -125,7 +125,7 @@ void GameEventMgr::LoadFromDB()
         do
         {
             ++count;
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             bar.step();
 
@@ -168,24 +168,25 @@ void GameEventMgr::LoadFromDB()
 
             pGameEvent.description  = fields[6].GetCppString();
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
         sLog.outString(">> Loaded %u game events", count);
     }
 
-    std::map<uint16,int16> pool2event;                      // for check unique spawn event associated with pool
-    std::map<uint32,int16> creature2event;                  // for check unique spawn event associated with creature
-    std::map<uint32,int16> go2event;                        // for check unique spawn event associated with gameobject
+    std::map<uint16, int16> pool2event;                     // for check unique spawn event associated with pool
+    std::map<uint32, int16> creature2event;                 // for check unique spawn event associated with creature
+    std::map<uint32, int16> go2event;                       // for check unique spawn event associated with gameobject
 
     // list only positive event top pools, filled at creature/gameobject loading
     mGameEventSpawnPoolIds.resize(mGameEvent.size());
 
-    mGameEventCreatureGuids.resize(mGameEvent.size()*2-1);
+    mGameEventCreatureGuids.resize(mGameEvent.size() * 2 - 1);
     //                                   1              2
     result = WorldDatabase.Query("SELECT creature.guid, game_event_creature.event "
-        "FROM creature JOIN game_event_creature ON creature.guid = game_event_creature.guid");
+                                 "FROM creature JOIN game_event_creature ON creature.guid = game_event_creature.guid");
 
     count = 0;
     if (!result)
@@ -194,7 +195,7 @@ void GameEventMgr::LoadFromDB()
         bar.step();
 
         sLog.outString();
-        sLog.outString(">> Loaded %u creatures in game events", count );
+        sLog.outString(">> Loaded %u creatures in game events", count);
     }
     else
     {
@@ -202,7 +203,7 @@ void GameEventMgr::LoadFromDB()
         BarGoLink bar(result->GetRowCount());
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             bar.step();
 
@@ -253,17 +254,18 @@ void GameEventMgr::LoadFromDB()
             GuidList& crelist = mGameEventCreatureGuids[internal_event_id];
             crelist.push_back(guid);
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
-        sLog.outString( ">> Loaded %u creatures in game events", count );
+        sLog.outString(">> Loaded %u creatures in game events", count);
     }
 
-    mGameEventGameobjectGuids.resize(mGameEvent.size()*2-1);
+    mGameEventGameobjectGuids.resize(mGameEvent.size() * 2 - 1);
     //                                   1                2
     result = WorldDatabase.Query("SELECT gameobject.guid, game_event_gameobject.event "
-        "FROM gameobject JOIN game_event_gameobject ON gameobject.guid=game_event_gameobject.guid");
+                                 "FROM gameobject JOIN game_event_gameobject ON gameobject.guid=game_event_gameobject.guid");
 
     count = 0;
     if (!result)
@@ -272,7 +274,7 @@ void GameEventMgr::LoadFromDB()
         bar.step();
 
         sLog.outString();
-        sLog.outString(">> Loaded %u gameobjects in game events", count );
+        sLog.outString(">> Loaded %u gameobjects in game events", count);
     }
     else
     {
@@ -280,7 +282,7 @@ void GameEventMgr::LoadFromDB()
         BarGoLink bar(result->GetRowCount());
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             bar.step();
 
@@ -331,15 +333,16 @@ void GameEventMgr::LoadFromDB()
             GuidList& golist = mGameEventGameobjectGuids[internal_event_id];
             golist.push_back(guid);
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
-        sLog.outString( ">> Loaded %u gameobjects in game events", count );
+        sLog.outString(">> Loaded %u gameobjects in game events", count);
     }
 
     // now recheck that all eventPools linked with events after our skip pools with parents
-    for(std::map<uint16,int16>::const_iterator itr = pool2event.begin(); itr != pool2event.end();  ++itr)
+    for (std::map<uint16, int16>::const_iterator itr = pool2event.begin(); itr != pool2event.end();  ++itr)
     {
         uint16 pool_id = itr->first;
         int16 event_id = itr->second;
@@ -350,11 +353,11 @@ void GameEventMgr::LoadFromDB()
     mGameEventCreatureData.resize(mGameEvent.size());
     //                                   0              1                             2
     result = WorldDatabase.Query("SELECT creature.guid, game_event_creature_data.event, game_event_creature_data.modelid,"
-    //   3                                      4
-        "game_event_creature_data.equipment_id, game_event_creature_data.entry_id, "
-    //   5                                     6
-        "game_event_creature_data.spell_start, game_event_creature_data.spell_end "
-        "FROM creature JOIN game_event_creature_data ON creature.guid=game_event_creature_data.guid");
+                                 //   3                                      4
+                                 "game_event_creature_data.equipment_id, game_event_creature_data.entry_id, "
+                                 //   5                                     6
+                                 "game_event_creature_data.spell_start, game_event_creature_data.spell_end "
+                                 "FROM creature JOIN game_event_creature_data ON creature.guid=game_event_creature_data.guid");
 
     count = 0;
     if (!result)
@@ -363,7 +366,7 @@ void GameEventMgr::LoadFromDB()
         bar.step();
 
         sLog.outString();
-        sLog.outString(">> Loaded %u creature reactions at game events", count );
+        sLog.outString(">> Loaded %u creature reactions at game events", count);
     }
     else
     {
@@ -371,7 +374,7 @@ void GameEventMgr::LoadFromDB()
         BarGoLink bar(result->GetRowCount());
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             bar.step();
             uint32 guid     = fields[0].GetUInt32();
@@ -379,7 +382,7 @@ void GameEventMgr::LoadFromDB()
 
             if (event_id == 0)
             {
-                sLog.outErrorDb("`game_event_creature_data` game event id (%i) is reserved and can't be used." ,event_id);
+                sLog.outErrorDb("`game_event_creature_data` game event id (%i) is reserved and can't be used." , event_id);
                 continue;
             }
 
@@ -425,11 +428,12 @@ void GameEventMgr::LoadFromDB()
             equiplist.push_back(GameEventCreatureDataPair(guid, newData));
             mGameEventCreatureDataPerGuid.insert(GameEventCreatureDataPerGuidMap::value_type(guid, event_id));
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
-        sLog.outString(">> Loaded %u creature reactions at game events", count );
+        sLog.outString(">> Loaded %u creature reactions at game events", count);
     }
 
     mGameEventQuests.resize(mGameEvent.size());
@@ -443,7 +447,7 @@ void GameEventMgr::LoadFromDB()
         bar.step();
 
         sLog.outString();
-        sLog.outString(">> Loaded %u quests additions in game events", count );
+        sLog.outString(">> Loaded %u quests additions in game events", count);
     }
     else
     {
@@ -451,7 +455,7 @@ void GameEventMgr::LoadFromDB()
         BarGoLink bar(result->GetRowCount());
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             bar.step();
             uint32 quest    = fields[0].GetUInt32();
@@ -485,14 +489,15 @@ void GameEventMgr::LoadFromDB()
             QuestList& questlist = mGameEventQuests[event_id];
             questlist.push_back(quest);
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
-        sLog.outString( ">> Loaded %u quest additions in game events", count );
+        sLog.outString(">> Loaded %u quest additions in game events", count);
     }
 
-    mGameEventMails.resize(mGameEvent.size()*2-1);
+    mGameEventMails.resize(mGameEvent.size() * 2 - 1);
 
     result = WorldDatabase.Query("SELECT event, raceMask, quest, mailTemplateId, senderEntry FROM game_event_mail");
 
@@ -503,7 +508,7 @@ void GameEventMgr::LoadFromDB()
         bar.step();
 
         sLog.outString();
-        sLog.outString(">> Loaded %u start/end game event mails", count );
+        sLog.outString(">> Loaded %u start/end game event mails", count);
     }
     else
     {
@@ -511,7 +516,7 @@ void GameEventMgr::LoadFromDB()
         BarGoLink bar(result->GetRowCount());
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             bar.step();
             uint16 event_id = fields[0].GetUInt16();
@@ -565,11 +570,12 @@ void GameEventMgr::LoadFromDB()
             MailList& maillist = mGameEventMails[internal_event_id];
             maillist.push_back(mail);
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
-        sLog.outString(">> Loaded %u start/end game event mails", count );
+        sLog.outString(">> Loaded %u start/end game event mails", count);
     }
 }
 
@@ -579,30 +585,31 @@ uint32 GameEventMgr::Initialize()                           // return the next e
 
     ActiveEvents activeAtShutdown;
 
-    if (QueryResult *result = CharacterDatabase.Query("SELECT event FROM game_event_status"))
+    if (QueryResult* result = CharacterDatabase.Query("SELECT event FROM game_event_status"))
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint16 event_id = fields[0].GetUInt16();
             activeAtShutdown.insert(event_id);
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         CharacterDatabase.Execute("TRUNCATE game_event_status");
     }
 
     uint32 delay = Update(&activeAtShutdown);
-    BASIC_LOG("Game Event system initialized." );
+    BASIC_LOG("Game Event system initialized.");
     m_IsGameEventsInit = true;
     return delay;
 }
 
-void GameEventMgr::Initialize( MapPersistentState* state )
+void GameEventMgr::Initialize(MapPersistentState* state)
 {
     // At map persistent state creating need only apply pool spawn modifications
     // other data is global and will be auto-apply
-    for(GameEventMgr::ActiveEvents::const_iterator event_itr = m_ActiveEvents.begin(); event_itr != m_ActiveEvents.end(); ++event_itr)
+    for (GameEventMgr::ActiveEvents::const_iterator event_itr = m_ActiveEvents.begin(); event_itr != m_ActiveEvents.end(); ++event_itr)
         for (IdList::iterator pool_itr = mGameEventSpawnPoolIds[*event_itr].begin(); pool_itr != mGameEventSpawnPoolIds[*event_itr].end(); ++pool_itr)
             sPoolMgr.InitSpawnPool(*state, *pool_itr);
 }
@@ -616,10 +623,10 @@ uint32 GameEventMgr::Update(ActiveEvents const* activeAtShutdown /*= NULL*/)
     uint32 calcDelay;
     for (uint16 itr = 1; itr < mGameEvent.size(); ++itr)
     {
-        //sLog.outErrorDb("Checking event %u",itr);
+        // sLog.outErrorDb("Checking event %u",itr);
         if (CheckOneGameEvent(itr, currenttime))
         {
-            //DEBUG_LOG("GameEvent %u is active",itr->first);
+            // DEBUG_LOG("GameEvent %u is active",itr->first);
             if (!IsActiveEvent(itr))
             {
                 bool resume = activeAtShutdown && (activeAtShutdown->find(itr) != activeAtShutdown->end());
@@ -628,7 +635,7 @@ uint32 GameEventMgr::Update(ActiveEvents const* activeAtShutdown /*= NULL*/)
         }
         else
         {
-            //DEBUG_LOG("GameEvent %u is not active",itr->first);
+            // DEBUG_LOG("GameEvent %u is not active",itr->first);
             if (IsActiveEvent(itr))
                 StopEvent(itr);
             else
@@ -647,7 +654,7 @@ uint32 GameEventMgr::Update(ActiveEvents const* activeAtShutdown /*= NULL*/)
             nextEventDelay = calcDelay;
     }
     BASIC_LOG("Next game event check in %u seconds.", nextEventDelay + 1);
-    return (nextEventDelay + 1) * IN_MILLISECONDS;           // Add 1 second to be sure event has started/stopped at next call
+    return (nextEventDelay + 1) * IN_MILLISECONDS;          // Add 1 second to be sure event has started/stopped at next call
 }
 
 void GameEventMgr::UnApplyEvent(uint16 event_id)
@@ -672,7 +679,7 @@ void GameEventMgr::UnApplyEvent(uint16 event_id)
 void GameEventMgr::ApplyNewEvent(uint16 event_id, bool resume)
 {
     m_ActiveEvents.insert(event_id);
-    CharacterDatabase.PExecute("INSERT INTO game_event_status (event) VALUES (%u)", event_id);
+    CharacterDatabase.PExecute("REPLACE INTO game_event_status (event) VALUES (%u)", event_id);
 
     if (sWorld.getConfig(CONFIG_BOOL_EVENT_ANNOUNCE))
         sWorld.SendWorldText(LANG_EVENTMESSAGE, mGameEvent[event_id].description.c_str());
@@ -700,11 +707,11 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
 
     if (internal_event_id < 0 || (size_t)internal_event_id >= mGameEventCreatureGuids.size())
     {
-        sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventCreatureGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventCreatureGuids.size());
+        sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventCreatureGuids element %i (size: " SIZEFMTD ")", internal_event_id, mGameEventCreatureGuids.size());
         return;
     }
 
-    for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin();itr != mGameEventCreatureGuids[internal_event_id].end();++itr)
+    for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin(); itr != mGameEventCreatureGuids[internal_event_id].end(); ++itr)
     {
         // Add to correct cell
         CreatureData const* data = sObjectMgr.GetCreatureData(*itr);
@@ -730,11 +737,11 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
 
     if (internal_event_id < 0 || (size_t)internal_event_id >= mGameEventGameobjectGuids.size())
     {
-        sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventGameobjectGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventGameobjectGuids.size());
+        sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventGameobjectGuids element %i (size: " SIZEFMTD ")", internal_event_id, mGameEventGameobjectGuids.size());
         return;
     }
 
-    for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin();itr != mGameEventGameobjectGuids[internal_event_id].end();++itr)
+    for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin(); itr != mGameEventGameobjectGuids[internal_event_id].end(); ++itr)
     {
         // Add to correct cell
         GameObjectData const* data = sObjectMgr.GetGOData(*itr);
@@ -760,13 +767,13 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
 
     if (event_id > 0)
     {
-        if((size_t)event_id >= mGameEventSpawnPoolIds.size())
+        if ((size_t)event_id >= mGameEventSpawnPoolIds.size())
         {
             sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventSpawnPoolIds element %i (size: " SIZEFMTD ")", event_id, mGameEventSpawnPoolIds.size());
             return;
         }
 
-        for (IdList::iterator itr = mGameEventSpawnPoolIds[event_id].begin();itr != mGameEventSpawnPoolIds[event_id].end();++itr)
+        for (IdList::iterator itr = mGameEventSpawnPoolIds[event_id].begin(); itr != mGameEventSpawnPoolIds[event_id].end(); ++itr)
             sPoolMgr.SpawnPoolInMaps(*itr, true);
     }
 }
@@ -777,14 +784,14 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
 
     if (internal_event_id < 0 || (size_t)internal_event_id >= mGameEventCreatureGuids.size())
     {
-        sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventCreatureGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventCreatureGuids.size());
+        sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventCreatureGuids element %i (size: " SIZEFMTD ")", internal_event_id, mGameEventCreatureGuids.size());
         return;
     }
 
-    for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin();itr != mGameEventCreatureGuids[internal_event_id].end();++itr)
+    for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin(); itr != mGameEventCreatureGuids[internal_event_id].end(); ++itr)
     {
         // Remove the creature from grid
-        if( CreatureData const* data = sObjectMgr.GetCreatureData(*itr) )
+        if (CreatureData const* data = sObjectMgr.GetCreatureData(*itr))
         {
             // negative event id for pool element meaning unspawn in pool and exclude for next spawns
             if (event_id < 0)
@@ -807,14 +814,14 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
 
     if (internal_event_id < 0 || (size_t)internal_event_id >= mGameEventGameobjectGuids.size())
     {
-        sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventGameobjectGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventGameobjectGuids.size());
+        sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventGameobjectGuids element %i (size: " SIZEFMTD ")", internal_event_id, mGameEventGameobjectGuids.size());
         return;
     }
 
-    for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin();itr != mGameEventGameobjectGuids[internal_event_id].end();++itr)
+    for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin(); itr != mGameEventGameobjectGuids[internal_event_id].end(); ++itr)
     {
         // Remove the gameobject from grid
-        if(GameObjectData const* data = sObjectMgr.GetGOData(*itr))
+        if (GameObjectData const* data = sObjectMgr.GetGOData(*itr))
         {
             // negative event id for pool element meaning unspawn in pool and exclude for next spawns
             if (event_id < 0)
@@ -843,7 +850,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
             return;
         }
 
-        for (IdList::iterator itr = mGameEventSpawnPoolIds[event_id].begin();itr != mGameEventSpawnPoolIds[event_id].end();++itr)
+        for (IdList::iterator itr = mGameEventSpawnPoolIds[event_id].begin(); itr != mGameEventSpawnPoolIds[event_id].end(); ++itr)
         {
             sPoolMgr.DespawnPoolInMaps(*itr);
         }
@@ -855,7 +862,7 @@ GameEventCreatureData const* GameEventMgr::GetCreatureUpdateDataForActiveEvent(u
     // only for active event, creature can be listed for many so search all
     uint32 event_id = 0;
     GameEventCreatureDataPerGuidBounds bounds = mGameEventCreatureDataPerGuid.equal_range(lowguid);
-    for(GameEventCreatureDataPerGuidMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+    for (GameEventCreatureDataPerGuidMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
     {
         if (IsActiveEvent(itr->second))
         {
@@ -867,7 +874,7 @@ GameEventCreatureData const* GameEventMgr::GetCreatureUpdateDataForActiveEvent(u
     if (!event_id)
         return NULL;
 
-    for(GameEventCreatureDataList::const_iterator itr = mGameEventCreatureData[event_id].begin();itr != mGameEventCreatureData[event_id].end();++itr)
+    for (GameEventCreatureDataList::const_iterator itr = mGameEventCreatureData[event_id].begin(); itr != mGameEventCreatureData[event_id].end(); ++itr)
         if (itr->first == lowguid)
             return &itr->second;
 
@@ -879,7 +886,7 @@ struct GameEventUpdateCreatureDataInMapsWorker
     GameEventUpdateCreatureDataInMapsWorker(ObjectGuid guid, CreatureData const* data, GameEventCreatureData* event_data, bool activate)
         : i_guid(guid), i_data(data), i_event_data(event_data), i_activate(activate) {}
 
-    void operator() (Map* map)
+    void operator()(Map* map)
     {
         if (Creature* pCreature = map->GetCreature(i_guid))
         {
@@ -899,11 +906,11 @@ struct GameEventUpdateCreatureDataInMapsWorker
 
 void GameEventMgr::UpdateCreatureData(int16 event_id, bool activate)
 {
-    for(GameEventCreatureDataList::iterator itr = mGameEventCreatureData[event_id].begin();itr != mGameEventCreatureData[event_id].end();++itr)
+    for (GameEventCreatureDataList::iterator itr = mGameEventCreatureData[event_id].begin(); itr != mGameEventCreatureData[event_id].end(); ++itr)
     {
         // Remove the creature from grid
         CreatureData const* data = sObjectMgr.GetCreatureData(itr->first);
-        if(!data)
+        if (!data)
             continue;
 
         // Update if spawned
@@ -917,11 +924,11 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate)
     QuestList::iterator itr;
     for (itr = mGameEventQuests[event_id].begin(); itr != mGameEventQuests[event_id].end(); ++itr)
     {
-        const Quest *pQuest = sObjectMgr.GetQuestTemplate(*itr);
+        const Quest* pQuest = sObjectMgr.GetQuestTemplate(*itr);
 
-        //if (Activate)
+        // if (Activate)
         //{
-            // TODO: implement way to reset quests when event begin.
+        // TODO: implement way to reset quests when event begin.
         //}
 
         const_cast<Quest*>(pQuest)->SetQuestActiveState(Activate);
@@ -936,7 +943,7 @@ void GameEventMgr::UpdateWorldStates(uint16 event_id, bool Activate)
         BattleGroundTypeId bgTypeId = BattleGroundMgr::WeekendHolidayIdToBGType(event.holiday_id);
         if (bgTypeId != BATTLEGROUND_TYPE_NONE)
         {
-            BattlemasterListEntry const * bl = sBattlemasterListStore.LookupEntry(bgTypeId);
+            BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(bgTypeId);
             if (bl && bl->HolidayWorldStateId)
             {
                 WorldPacket data;
@@ -976,10 +983,10 @@ void GameEventMgr::SendEventMails(int16 event_id)
 template <>
 int16 GameEventMgr::GetGameEventId<Creature>(uint32 guid_or_poolid)
 {
-    for (uint16 i = 0; i < mGameEventCreatureGuids.size(); i++) // 0 <= i <= 2*(S := mGameEvent.size()) - 2
+    for (uint16 i = 0; i < mGameEventCreatureGuids.size(); ++i) // 0 <= i <= 2*(S := mGameEvent.size()) - 2
         for (GuidList::const_iterator itr = mGameEventCreatureGuids[i].begin(); itr != mGameEventCreatureGuids[i].end(); ++itr)
             if (*itr == guid_or_poolid)
-                    return i + 1 - mGameEvent.size();       // -S *1 + 1 <= . <= 1*S - 1
+                return i + 1 - mGameEvent.size();       // -S *1 + 1 <= . <= 1*S - 1
     return 0;
 }
 
@@ -987,7 +994,7 @@ int16 GameEventMgr::GetGameEventId<Creature>(uint32 guid_or_poolid)
 template <>
 int16 GameEventMgr::GetGameEventId<GameObject>(uint32 guid_or_poolid)
 {
-    for (uint16 i = 0; i < mGameEventGameobjectGuids.size(); i++)
+    for (uint16 i = 0; i < mGameEventGameobjectGuids.size(); ++i)
         for (GuidList::const_iterator itr = mGameEventGameobjectGuids[i].begin(); itr != mGameEventGameobjectGuids[i].end(); ++itr)
             if (*itr == guid_or_poolid)
                 return i + 1 - mGameEvent.size();       // -S *1 + 1 <= . <= 1*S - 1
@@ -998,7 +1005,7 @@ int16 GameEventMgr::GetGameEventId<GameObject>(uint32 guid_or_poolid)
 template <>
 int16 GameEventMgr::GetGameEventId<Pool>(uint32 guid_or_poolid)
 {
-    for (uint16 i = 0; i < mGameEventSpawnPoolIds.size(); i++)
+    for (uint16 i = 0; i < mGameEventSpawnPoolIds.size(); ++i)
         for (IdList::const_iterator itr = mGameEventSpawnPoolIds[i].begin(); itr != mGameEventSpawnPoolIds[i].end(); ++itr)
             if (*itr == guid_or_poolid)
                 return i;
@@ -1010,19 +1017,19 @@ GameEventMgr::GameEventMgr()
     m_IsGameEventsInit = false;
 }
 
-bool GameEventMgr::IsActiveHoliday( HolidayIds id )
+bool GameEventMgr::IsActiveHoliday(HolidayIds id)
 {
     if (id == HOLIDAY_NONE)
         return false;
 
-    for(GameEventMgr::ActiveEvents::const_iterator itr = m_ActiveEvents.begin(); itr != m_ActiveEvents.end(); ++itr)
+    for (GameEventMgr::ActiveEvents::const_iterator itr = m_ActiveEvents.begin(); itr != m_ActiveEvents.end(); ++itr)
         if (mGameEvent[*itr].holiday_id == id)
             return true;
 
     return false;
 }
 
-MANGOS_DLL_SPEC bool IsHolidayActive( HolidayIds id )
+MANGOS_DLL_SPEC bool IsHolidayActive(HolidayIds id)
 {
     return sGameEventMgr.IsActiveHoliday(id);
 }
diff --git a/src/game/GameEventMgr.h b/src/game/GameEventMgr.h
index 148afd7ae5c..fd075ff7499 100644
--- a/src/game/GameEventMgr.h
+++ b/src/game/GameEventMgr.h
@@ -32,7 +32,7 @@ class MapPersistentState;
 
 struct GameEventData
 {
-    GameEventData() : start(1),end(0),occurence(0),length(0), holiday_id(HOLIDAY_NONE) {}
+    GameEventData() : start(1), end(0), occurence(0), length(0), holiday_id(HOLIDAY_NONE) {}
     time_t start;
     time_t end;
     uint32 occurence;                                       // Delay in minutes between occurences of the event
@@ -71,7 +71,7 @@ class GameEventMgr
     public:
         GameEventMgr();
         ~GameEventMgr() {};
-        typedef std::set<uint16> ActiveEvents;
+        typedef UNORDERED_SET<uint16> ActiveEvents;
         typedef std::vector<GameEventData> GameEventDataMap;
         ActiveEvents const& GetActiveEventList() const { return m_ActiveEvents; }
         GameEventDataMap const& GetEventMap() const { return mGameEvent; }
@@ -81,7 +81,7 @@ class GameEventMgr
         void Initialize(MapPersistentState* state);         // called at new MapPersistentState object create
         uint32 Update(ActiveEvents const* activeAtShutdown = NULL);
         bool IsValidEvent(uint16 event_id) const { return event_id < mGameEvent.size() && mGameEvent[event_id].isValid(); }
-        bool IsActiveEvent(uint16 event_id) const { return ( m_ActiveEvents.find(event_id)!=m_ActiveEvents.end()); }
+        bool IsActiveEvent(uint16 event_id) const { return (m_ActiveEvents.find(event_id) != m_ActiveEvents.end()); }
         bool IsActiveHoliday(HolidayIds id);
         uint32 Initialize();
         void StartEvent(uint16 event_id, bool overwrite = false, bool resume = false);
@@ -107,7 +107,7 @@ class GameEventMgr
         typedef std::list<GameEventCreatureDataPair> GameEventCreatureDataList;
         typedef std::vector<GameEventCreatureDataList> GameEventCreatureDataMap;
         typedef std::multimap<uint32, uint32> GameEventCreatureDataPerGuidMap;
-        typedef std::pair<GameEventCreatureDataPerGuidMap::const_iterator,GameEventCreatureDataPerGuidMap::const_iterator> GameEventCreatureDataPerGuidBounds;
+        typedef std::pair<GameEventCreatureDataPerGuidMap::const_iterator, GameEventCreatureDataPerGuidMap::const_iterator> GameEventCreatureDataPerGuidBounds;
 
         typedef std::list<uint32> QuestList;
         typedef std::vector<QuestList> GameEventQuestMap;
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index b1b7b102a24..cefc8b525cd 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -34,13 +34,23 @@
 #include "InstanceData.h"
 #include "MapManager.h"
 #include "MapPersistentStateMgr.h"
-#include "BattleGround.h"
-#include "BattleGroundAV.h"
+#include "BattleGround/BattleGround.h"
+#include "BattleGround/BattleGroundAV.h"
+#include "OutdoorPvP/OutdoorPvPMgr.h"
+#include "OutdoorPvP/OutdoorPvP.h"
 #include "Util.h"
 #include "ScriptMgr.h"
+#include "Transports.h"
+#include "vmap/GameObjectModel.h"
+#include "vmap/DynamicTree.h"
+#include "SQLStorages.h"
 #include <G3D/Quat.h>
+#include "movement/MoveSplineInit.h"
+#include "movement/MoveSpline.h"
+
 
 GameObject::GameObject() : WorldObject(),
+    m_model(NULL),
     m_goInfo(NULL),
     m_displayInfo(NULL)
 {
@@ -52,141 +62,206 @@ GameObject::GameObject() : WorldObject(),
     m_valuesCount = GAMEOBJECT_END;
     m_respawnTime = 0;
     m_respawnDelayTime = 25;
-    m_lootState = GO_NOT_READY;
+    m_lootState = GO_READY;
     m_spawnedByDefault = true;
     m_useTimes = 0;
     m_spellId = 0;
     m_cooldownTime = 0;
 
+    m_health = 0;
+
+    m_captureTimer = 0;
+
     m_packedRotation = 0;
-    m_groupLootTimer = 0;
-    m_groupLootId = 0;
-    m_lootGroupRecipientId = 0;
 }
 
 GameObject::~GameObject()
 {
+    GameObjectInfo const* goInfo = GetGOInfo();
+    if (goInfo && goInfo->type == GAMEOBJECT_TYPE_CAPTURE_POINT && goInfo->capturePoint.radius && m_lootState == GO_ACTIVATED)
+        sOutdoorPvPMgr.SetCapturePointSlider(GetEntry(), m_captureSlider);
+
+    delete m_model;
 }
 
 void GameObject::AddToWorld()
 {
-    ///- Register the gameobject for guid lookup
-    if(!IsInWorld())
-        GetMap()->GetObjectsStore().insert<GameObject>(GetObjectGuid(), (GameObject*)this);
+    WorldObject::AddToWorld();
+
+    if (m_model)
+        GetMap()->InsertGameObjectModel(*m_model);
+
+    EnableCollision(CalculateCurrentCollisionState());
 
-    Object::AddToWorld();
 }
 
-void GameObject::RemoveFromWorld()
+void GameObject::RemoveFromWorld(bool remove)
 {
+    // store the slider value for non instance, non locked capture points
+    if (GetMap() && !GetMap()->IsBattleGroundOrArena())
+    {
+        if (GetGOInfo()->type == GAMEOBJECT_TYPE_CAPTURE_POINT && m_lootState == GO_ACTIVATED)
+            sOutdoorPvPMgr.SetCapturePointSlider(GetEntry(), m_captureSlider);
+    }
+
     ///- Remove the gameobject from the accessor
-    if(IsInWorld())
+    if (IsInWorld())
     {
         // Remove GO from owner
         if (ObjectGuid owner_guid = GetOwnerGuid())
         {
-            if (Unit* owner = ObjectAccessor::GetUnit(*this,owner_guid))
-                owner->RemoveGameObject(this,false);
+            if (Unit* owner = ObjectAccessor::GetUnit(*this, owner_guid))
+                owner->RemoveGameObject(this, false);
             else
             {
                 sLog.outError("Delete %s with SpellId %u LinkedGO %u that lost references to owner %s GO list. Crash possible later.",
-                    GetGuidStr().c_str(), m_spellId, GetGOInfo()->GetLinkedGameObjectEntry(), owner_guid.GetString().c_str());
+                              GetGuidStr().c_str(), m_spellId, GetGOInfo()->GetLinkedGameObjectEntry(), owner_guid.GetString().c_str());
             }
         }
-
-        GetMap()->GetObjectsStore().erase<GameObject>(GetObjectGuid(), (GameObject*)NULL);
+        EnableCollision(false);
     }
 
-    Object::RemoveFromWorld();
+    if (m_model && GetMap())
+        if (GetMap()->ContainsGameObjectModel(*m_model))
+            GetMap()->RemoveGameObjectModel(*m_model);
+
+    WorldObject::RemoveFromWorld(remove);
 }
 
-bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMask, float x, float y, float z, float ang, QuaternionData rotation, uint8 animprogress, GOState go_state)
+bool GameObject::Create(uint32 guidlow, uint32 name_id, Map* map, uint32 phaseMask, float x, float y, float z, float ang, QuaternionData rotation, uint8 animprogress, GOState go_state)
 {
     MANGOS_ASSERT(map);
-    Relocate(x,y,z,ang);
+
+    Relocate(WorldLocation(map->GetId(), x, y, z, ang, phaseMask, map->GetInstanceId()));
     SetMap(map);
-    SetPhaseMask(phaseMask,false);
 
-    if(!IsPositionValid())
+    if (!IsPositionValid())
     {
-        sLog.outError("Gameobject (GUID: %u Entry: %u ) not created. Suggested coordinates are invalid (X: %f Y: %f)",guidlow,name_id,x,y);
+        sLog.outError("Gameobject (GUID: %u Entry: %u ) not created. Suggested coordinates are invalid (X: %f Y: %f)", guidlow, name_id, x, y);
         return false;
     }
 
     GameObjectInfo const* goinfo = ObjectMgr::GetGameObjectInfo(name_id);
     if (!goinfo)
     {
-        sLog.outErrorDb("Gameobject (GUID: %u) not created: Entry %u does not exist in `gameobject_template`. Map: %u  (X: %f Y: %f Z: %f) ang: %f",guidlow, name_id, map->GetId(), x, y, z, ang);
+        sLog.outErrorDb("Gameobject (GUID: %u) not created: Entry %u does not exist in `gameobject_template`. Map: %u  (X: %f Y: %f Z: %f) ang: %f", guidlow, name_id, map->GetId(), x, y, z, ang);
         return false;
     }
 
-    Object::_Create(guidlow, goinfo->id, HIGHGUID_GAMEOBJECT);
+    Object::_Create(ObjectGuid(HIGHGUID_GAMEOBJECT, goinfo->id, guidlow));
 
     m_goInfo = goinfo;
 
     if (goinfo->type >= MAX_GAMEOBJECT_TYPE)
     {
-        sLog.outErrorDb("Gameobject (GUID: %u) not created: Entry %u has invalid type %u in `gameobject_template`. It may crash client if created.",guidlow,name_id,goinfo->type);
+        sLog.outErrorDb("Gameobject (GUID: %u) not created: Entry %u has invalid type %u in `gameobject_template`. It may crash client if created.", guidlow, name_id, goinfo->type);
         return false;
     }
 
     SetObjectScale(goinfo->size);
 
-    SetWorldRotation(rotation.x,rotation.y,rotation.z,rotation.w);
+    SetWorldRotation(rotation.x, rotation.y, rotation.z, rotation.w);
     // For most of gameobjects is (0, 0, 0, 1) quaternion, only some transports has not standart rotation
-    if (const GameObjectDataAddon * addon = sGameObjectDataAddonStorage.LookupEntry<GameObjectDataAddon>(guidlow))
+    if (const GameObjectDataAddon* addon = sGameObjectDataAddonStorage.LookupEntry<GameObjectDataAddon>(guidlow))
         SetTransportPathRotation(addon->path_rotation);
     else
-        SetTransportPathRotation(QuaternionData(0,0,0,1));
+        SetTransportPathRotation(QuaternionData(0, 0, 0, 1));
 
     SetUInt32Value(GAMEOBJECT_FACTION, goinfo->faction);
     SetUInt32Value(GAMEOBJECT_FLAGS, goinfo->flags);
 
-    if (goinfo->type == GAMEOBJECT_TYPE_TRANSPORT)
-        SetFlag(GAMEOBJECT_FLAGS, (GO_FLAG_TRANSPORT | GO_FLAG_NODESPAWN));
-
     SetEntry(goinfo->id);
     SetDisplayId(goinfo->displayId);
 
+    m_model = GameObjectModel::construct(this);
     // GAMEOBJECT_BYTES_1, index at 0, 1, 2 and 3
     SetGoState(go_state);
     SetGoType(GameobjectTypes(goinfo->type));
     SetGoArtKit(0);                                         // unknown what this is
     SetGoAnimProgress(animprogress);
 
-    //Notify the map's instance data.
-    //Only works if you create the object in it, not if it is moves to that map.
-    //Normally non-players do not teleport to other maps.
+    switch (goinfo->type)
+    {
+        case GAMEOBJECT_TYPE_TRAP:
+        case GAMEOBJECT_TYPE_FISHINGNODE:
+        {
+            m_lootState = GO_NOT_READY;
+            break;
+        }
+        case GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING:
+        {
+            m_health = GetMaxHealth();
+            // destructible GO's show their "HP" as their animprogress
+            SetGoAnimProgress(255);
+            if (WorldStateMgr::CheckWorldState(goinfo->destructibleBuilding.linkedWorldState))
+                sWorldStateMgr.CreateLinkedWorldStatesIfNeed(this);
+            break;
+        }
+        case GAMEOBJECT_TYPE_TRANSPORT:
+        {
+            SetFlag(GAMEOBJECT_FLAGS, (GO_FLAG_TRANSPORT | GO_FLAG_NODESPAWN));
+            SetUInt32Value(GAMEOBJECT_LEVEL, goinfo->transport.pause);
+            if (goinfo->transport.startOpen)
+                SetGoState(GO_STATE_ACTIVE);
+            break;
+        }
+        case GAMEOBJECT_TYPE_CAPTURE_POINT:
+        {
+            if (goinfo->capturePoint.radius)
+            {
+                sWorldStateMgr.CreateLinkedWorldStatesIfNeed(this);
+                SetCapturePointSlider(CAPTURE_SLIDER_GET_VALUE);
+
+                // set initial data and activate non visual-only capture points
+                // FIXME - need make over WorldStateMgr
+                SetCapturePointSlider(sOutdoorPvPMgr.GetCapturePointSliderValue(goinfo->id));
+            }
+            break;
+        }
+        default:
+            break;
+    }
+
+    // Notify the map's instance data.
+    // Only works if you create the object in it, not if it is moves to that map.
+    // Normally non-players do not teleport to other maps.
     if (InstanceData* iData = map->GetInstanceData())
         iData->OnObjectCreate(this);
 
+    // Notify the battleground/OPvP scripts
+    if (map->IsBattleGroundOrArena())
+        ((BattleGroundMap*)map)->GetBG()->HandleGameObjectCreate(this);
+    // Notify the outdoor pvp script
+    else if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetZoneId()))
+        outdoorPvP->HandleGameObjectCreate(this);
+
     return true;
 }
 
-void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
+void GameObject::Update(uint32 update_diff, uint32 p_time)
 {
-    if (GetObjectGuid().IsMOTransport())
-    {
-        //((Transport*)this)->Update(p_time);
-        return;
-    }
+    UpdateSplineMovement(p_time);
 
-    switch (m_lootState)
+    switch (getLootState())
     {
         case GO_NOT_READY:
         {
-            switch(GetGoType())
+            switch (GetGoType())
             {
-                case GAMEOBJECT_TYPE_TRAP:
+                case GAMEOBJECT_TYPE_TRAP:                  // Initialized delayed to be able to use GetOwner()
                 {
                     // Arming Time for GAMEOBJECT_TYPE_TRAP (6)
                     Unit* owner = GetOwner();
-                    if (owner && ((Player*)owner)->isInCombat())
+                    if ((owner && owner->isInCombat())
+                                                     // FIXME - need remove this hacks on some objects
+                        || GetEntry() == 190752      // SoTA Seaforium Charges
+                        || GetEntry() == 195331      // IoC Huge Seaforium Charges
+                        || GetEntry() == 195235)     // IoC Seaforium Charges
                         m_cooldownTime = time(NULL) + GetGOInfo()->trap.startDelay;
                     m_lootState = GO_READY;
                     break;
                 }
-                case GAMEOBJECT_TYPE_FISHINGNODE:
+                case GAMEOBJECT_TYPE_FISHINGNODE:           // Keep not ready for some delay
                 {
                     // fishing code (bobber ready)
                     if (time(NULL) > m_respawnTime - FISHING_BOBBER_READY_TIME)
@@ -200,19 +275,19 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
 
                             SendForcedObjectUpdate();
 
-                            SendGameObjectCustomAnim(GetObjectGuid());
+                            SendGameObjectCustomAnim(GetObjectGuid(),0);
                         }
 
                         m_lootState = GO_READY;             // can be successfully open with some chance
                     }
-                    return;
+                    break;
                 }
                 default:
-                    m_lootState = GO_READY;                 // for other GO is same switched without delay to GO_READY
                     break;
             }
-            // NO BREAK for switch (m_lootState)
+            break;
         }
+        /* no break */
         case GO_READY:
         {
             if (m_respawnTime > 0)                          // timer on
@@ -231,7 +306,7 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
                             {
                                 caster->FinishSpell(CURRENT_CHANNELED_SPELL);
 
-                                WorldPacket data(SMSG_FISH_NOT_HOOKED,0);
+                                WorldPacket data(SMSG_FISH_NOT_HOOKED, 0);
                                 ((Player*)caster)->GetSession()->SendPacket(&data);
                             }
                             // can be deleted
@@ -240,15 +315,22 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
                         }
                         case GAMEOBJECT_TYPE_DOOR:
                         case GAMEOBJECT_TYPE_BUTTON:
-                            //we need to open doors if they are closed (add there another condition if this code breaks some usage, but it need to be here for battlegrounds)
+                            // we need to open doors if they are closed (add there another condition if this code breaks some usage, but it need to be here for battlegrounds)
                             if (GetGoState() != GO_STATE_READY)
                                 ResetDoorOrButton();
-                            //flags in AB are type_button and we need to add them here so no break!
+                            // flags in AB are type_button and we need to add them here so no break!
                         default:
                             if (!m_spawnedByDefault)        // despawn timer
                             {
                                 // can be despawned or destroyed
                                 SetLootState(GO_JUST_DEACTIVATED);
+                                // Remove Wild-Summoned GO on timer expire
+                                if (!HasStaticDBSpawnData())
+                                {
+                                    if (Unit* owner = GetOwner())
+                                        owner->RemoveGameObject(this, false);
+                                    Delete();
+                                }
                                 return;
                             }
 
@@ -263,18 +345,13 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
             {
                 // traps can have time and can not have
                 GameObjectInfo const* goInfo = GetGOInfo();
-                if (goInfo->type == GAMEOBJECT_TYPE_TRAP)
+                if (goInfo->type == GAMEOBJECT_TYPE_TRAP)   // traps
                 {
                     if (m_cooldownTime >= time(NULL))
                         return;
 
-                    // traps
-                    Unit* owner = GetOwner();
-                    Unit* ok = NULL;                        // pointer to appropriate target if found any
-
-                    bool IsBattleGroundTrap = false;
-                    //FIXME: this is activation radius (in different casting radius that must be selected from spell data)
-                    //TODO: move activated state code (cast itself) to GO_ACTIVATED, in this place only check activating and set state
+                    // FIXME: this is activation radius (in different casting radius that must be selected from spell data)
+                    // TODO: move activated state code (cast itself) to GO_ACTIVATED, in this place only check activating and set state
                     float radius = float(goInfo->trap.radius);
                     if (!radius)
                     {
@@ -287,52 +364,26 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
 
                             // battlegrounds gameobjects has data2 == 0 && data5 == 3
                             radius = float(goInfo->trap.cooldown);
-                            IsBattleGroundTrap = true;
                         }
                     }
 
                     // Note: this hack with search required until GO casting not implemented
                     // search unfriendly creature
-                    if (owner && goInfo->trap.charges > 0)  // hunter trap
-                    {
-                        MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, owner, radius);
-                        MaNGOS::UnitSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck> checker(ok, u_check);
-                        Cell::VisitGridObjects(this,checker, radius);
-                        if (!ok)
-                            Cell::VisitWorldObjects(this,checker, radius);
-                    }
-                    else                                    // environmental trap
-                    {
-                        // environmental damage spells already have around enemies targeting but this not help in case nonexistent GO casting support
-
-                        // affect only players
-                        Player* p_ok = NULL;
-                        MaNGOS::AnyPlayerInObjectRangeCheck p_check(this, radius);
-                        MaNGOS::PlayerSearcher<MaNGOS::AnyPlayerInObjectRangeCheck>  checker(p_ok, p_check);
-                        Cell::VisitWorldObjects(this,checker, radius);
-                        ok = p_ok;
-                    }
+                    // Should trap trigger?
+                    Unit* enemy = NULL;                     // pointer to appropriate target if found any
 
-                    if (ok)
+                    // FIXME - need remove hacks fot this GO
+                    // SoTA Seaforium Charge || IoC Seaforium Charge
+                    if (GetEntry() == 190752 || GetEntry() == 195331 || GetEntry() == 195235)
                     {
-                        Unit *caster =  owner ? owner : ok;
-
-                        caster->CastSpell(ok, goInfo->trap.spellId, true, NULL, NULL, GetObjectGuid());
-                        // use template cooldown if provided
-                        m_cooldownTime = time(NULL) + (goInfo->trap.cooldown ? goInfo->trap.cooldown : uint32(4));
-
-                        // count charges
-                        if (goInfo->trap.charges > 0)
-                            AddUse();
-
-                        if (IsBattleGroundTrap && ok->GetTypeId() == TYPEID_PLAYER)
-                        {
-                            //BattleGround gameobjects case
-                            if (((Player*)ok)->InBattleGround())
-                                if (BattleGround *bg = ((Player*)ok)->GetBattleGround())
-                                    bg->HandleTriggerBuff(GetObjectGuid());
-                        }
+                        enemy = GetOwner();
                     }
+
+                    MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, radius);
+                    MaNGOS::UnitSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck> checker(enemy, u_check);
+                    Cell::VisitAllObjects(this, checker, radius);
+                    if (enemy)
+                        Use(enemy);
                 }
 
                 if (uint32 max_charges = goInfo->GetCharges())
@@ -348,7 +399,7 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
         }
         case GO_ACTIVATED:
         {
-            switch(GetGoType())
+            switch (GetGoType())
             {
                 case GAMEOBJECT_TYPE_DOOR:
                 case GAMEOBJECT_TYPE_BUTTON:
@@ -373,6 +424,30 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
                         m_cooldownTime = 0;
                     }
                     break;
+                case GAMEOBJECT_TYPE_CAPTURE_POINT:
+                    m_captureTimer += p_time;
+                    if (m_captureTimer >= 5000)
+                    {
+                        TickCapturePoint();
+                        m_captureTimer -= 5000;
+                    }
+                    break;
+                case GAMEOBJECT_TYPE_TRANSPORT:
+                case GAMEOBJECT_TYPE_MO_TRANSPORT:
+                {
+                    if (IsTransport() && dynamic_cast<Transport*>(this))
+                    {
+                        if (TransportKit* tKit = dynamic_cast<Transport*>(this)->GetTransportKit())
+                        {
+                            if (!tKit->IsInitialized())
+                                tKit->Initialize();
+                            else
+                                // Update passenger positions
+                                tKit->Update(p_time);
+                        }
+                    }
+                    return;
+                }
                 default:
                     break;
             }
@@ -380,33 +455,55 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
         }
         case GO_JUST_DEACTIVATED:
         {
-            // if Gameobject should cast spell, then this, but some GOs (type = 10) should be destroyed
-            if (GetGoType() == GAMEOBJECT_TYPE_GOOBER)
+            switch (GetGoType())
             {
-                uint32 spellId = GetGOInfo()->goober.spellId;
-
-                if (spellId)
-                {
-                    for (GuidsSet::const_iterator itr = m_UniqueUsers.begin(); itr != m_UniqueUsers.end(); ++itr)
+                case GAMEOBJECT_TYPE_GOOBER:
+                    // if gameobject should cast spell, then this, but some GOs (type = 10) should be destroyed
+                    if (uint32 spellId = GetGOInfo()->goober.spellId)
                     {
-                        if (Player* owner = GetMap()->GetPlayer(*itr))
-                            owner->CastSpell(owner, spellId, false, NULL, NULL, GetObjectGuid());
+                        for (GuidSet::const_iterator itr = m_UniqueUsers.begin(); itr != m_UniqueUsers.end(); ++itr)
+                        {
+                            if (Player* owner = GetMap()->GetPlayer(*itr))
+                                owner->CastSpell(owner, spellId, false, NULL, NULL, GetObjectGuid());
+                        }
+
+                        ClearAllUsesData();
                     }
 
-                    ClearAllUsesData();
-                }
+                    SetGoState(GO_STATE_READY);
 
-                SetGoState(GO_STATE_READY);
+                    // any return here in case battleground traps
+                    break;
+                case GAMEOBJECT_TYPE_CAPTURE_POINT:
+                    // remove capturing players because slider wont be displayed if capture point is being locked
+                    for (GuidSet::const_iterator itr = m_UniqueUsers.begin(); itr != m_UniqueUsers.end(); ++itr)
+                    {
+                        if (Player* owner = ObjectMgr::GetPlayer(*itr))
+                            sWorldStateMgr.RemoveWorldStateFor(owner,GetGOInfo()->capturePoint.worldState1, GetObjectGuid().GetCounter());
+                    }
 
-                //any return here in case battleground traps
+                    m_UniqueUsers.clear();
+                    SetLootState(GO_READY);
+                    return; // SetLootState and return because go is treated as "burning flag" due to GetGoAnimProgress() being 100 and would be removed on the client
+                case GAMEOBJECT_TYPE_TRANSPORT:
+                case GAMEOBJECT_TYPE_MO_TRANSPORT:
+                    return;
+                default:
+                    break;
             }
 
-            if (!HasStaticDBSpawnData())                    // Remove wild summoned after use
+            // Remove wild summoned after use
+            if (!HasStaticDBSpawnData() && (!GetSpellId() || GetGOInfo()->GetDespawnPossibility()))
             {
-                if (GetOwnerGuid())
-                    if (Unit* owner = GetOwner())
-                        owner->RemoveGameObject(this, false);
+                if (Unit* owner = GetOwner())
+                    owner->RemoveGameObject(this, false);
+                Delete();
+                return;
+            }
 
+            // Wild Summoned GOs also should be deleted
+            if (IsWildSummoned())
+            {
                 SetRespawnTime(0);
                 Delete();
                 return;
@@ -419,9 +516,9 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
                 // reset flags
                 if (GetMap()->Instanceable())
                 {
-                    // In Instances GO_FLAG_LOCKED or GO_FLAG_NO_INTERACT are not changed
-                    uint32 currentLockOrInteractFlags = GetUInt32Value(GAMEOBJECT_FLAGS) & (GO_FLAG_LOCKED | GO_FLAG_NO_INTERACT);
-                    SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags & ~(GO_FLAG_LOCKED | GO_FLAG_NO_INTERACT) | currentLockOrInteractFlags);
+                    // In Instances GO_FLAG_LOCKED, GO_FLAG_INTERACT_COND or GO_FLAG_NO_INTERACT are not changed
+                    uint32 currentLockOrInteractFlags = GetUInt32Value(GAMEOBJECT_FLAGS) & (GO_FLAG_LOCKED | GO_FLAG_INTERACT_COND | GO_FLAG_NO_INTERACT);
+                    SetUInt32Value(GAMEOBJECT_FLAGS, (GetGOInfo()->flags & ~(GO_FLAG_LOCKED | GO_FLAG_INTERACT_COND | GO_FLAG_NO_INTERACT)) | currentLockOrInteractFlags);
                 }
                 else
                     SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags);
@@ -454,13 +551,40 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
     }
 }
 
+void GameObject::UpdateSplineMovement(uint32 t_diff)
+{
+    if (movespline->Finalized())
+        return;
+
+    movespline->updateState(t_diff);
+    bool arrived = movespline->Finalized();
+/*
+    TODO: DB script support instead of direct in Transport class
+    if (arrived)
+        Script run on_arrived;
+*/
+    m_movesplineTimer.Update(t_diff);
+
+    if (m_movesplineTimer.Passed() || arrived)
+    {
+        m_movesplineTimer.Reset(sWorld.getConfig(CONFIG_UINT32_POSITION_UPDATE_DELAY));
+
+        Position pos = movespline->ComputePosition();
+
+        if (IsBoarded())
+            GetTransportInfo()->SetLocalPosition(pos);
+        else
+            GetMap()->Relocation(this, pos);
+    }
+}
+
 void GameObject::Refresh()
 {
     // not refresh despawned not casted GO (despawned casted GO destroyed in all cases anyway)
-    if(m_respawnTime > 0 && m_spawnedByDefault)
+    if (m_respawnTime > 0 && m_spawnedByDefault)
         return;
 
-    if(isSpawned())
+    if (isSpawned())
         GetMap()->Add(this);
 }
 
@@ -488,25 +612,12 @@ void GameObject::Delete()
         AddObjectToRemoveList();
 }
 
-void GameObject::getFishLoot(Loot *fishloot, Player* loot_owner)
-{
-    fishloot->clear();
-
-    uint32 zone, subzone;
-    GetZoneAndAreaId(zone,subzone);
-
-    // if subzone loot exist use it
-    if (!fishloot->FillLoot(subzone, LootTemplates_Fishing, loot_owner, true, (subzone != zone)) && subzone != zone)
-        // else use zone loot (if zone diff. from subzone, must exist in like case)
-        fishloot->FillLoot(zone, LootTemplates_Fishing, loot_owner, true);
-}
-
 void GameObject::SaveToDB()
 {
     // this should only be used when the gameobject has already been loaded
     // preferably after adding to map, because mapid may not be valid otherwise
-    GameObjectData const *data = sObjectMgr.GetGOData(GetGUIDLow());
-    if(!data)
+    GameObjectData const* data = sObjectMgr.GetGOData(GetGUIDLow());
+    if (!data)
     {
         sLog.outError("GameObject::SaveToDB failed, cannot get gameobject data!");
         return;
@@ -517,7 +628,7 @@ void GameObject::SaveToDB()
 
 void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
 {
-    const GameObjectInfo *goI = GetGOInfo();
+    const GameObjectInfo* goI = GetGOInfo();
 
     if (!goI)
         return;
@@ -545,22 +656,22 @@ void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
     // updated in DB
     std::ostringstream ss;
     ss << "INSERT INTO gameobject VALUES ( "
-        << GetGUIDLow() << ", "
-        << GetEntry() << ", "
-        << mapid << ", "
-        << uint32(spawnMask) << ","                         // cast to prevent save as symbol
-        << uint16(GetPhaseMask()) << ","                    // prevent out of range error
-        << GetPositionX() << ", "
-        << GetPositionY() << ", "
-        << GetPositionZ() << ", "
-        << GetOrientation() << ", "
-        << m_worldRotation.x << ", "
-        << m_worldRotation.y << ", "
-        << m_worldRotation.z << ", "
-        << m_worldRotation.w << ", "
-        << m_respawnDelayTime << ", "
-        << uint32(GetGoAnimProgress()) << ", "
-        << uint32(GetGoState()) << ")";
+       << GetGUIDLow() << ", "
+       << GetEntry() << ", "
+       << mapid << ", "
+       << uint32(spawnMask) << ","                         // cast to prevent save as symbol
+       << uint16(GetPhaseMask()) << ","                    // prevent out of range error
+       << GetPositionX() << ", "
+       << GetPositionY() << ", "
+       << GetPositionZ() << ", "
+       << GetOrientation() << ", "
+       << m_worldRotation.x << ", "
+       << m_worldRotation.y << ", "
+       << m_worldRotation.z << ", "
+       << m_worldRotation.w << ", "
+       << m_respawnDelayTime << ", "
+       << uint32(GetGoAnimProgress()) << ", "
+       << uint32(GetGoState()) << ")";
 
     WorldDatabase.BeginTransaction();
     WorldDatabase.PExecuteLog("DELETE FROM gameobject WHERE guid = '%u'", GetGUIDLow());
@@ -568,18 +679,18 @@ void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
     WorldDatabase.CommitTransaction();
 }
 
-bool GameObject::LoadFromDB(uint32 guid, Map *map)
+bool GameObject::LoadFromDB(uint32 guid, Map* map)
 {
     GameObjectData const* data = sObjectMgr.GetGOData(guid);
 
-    if( !data )
+    if (!data)
     {
-        sLog.outErrorDb("Gameobject (GUID: %u) not found in table `gameobject`, can't load. ",guid);
+        sLog.outErrorDb("Gameobject (GUID: %u) not found in table `gameobject`, can't load. ", guid);
         return false;
     }
 
     uint32 entry = data->id;
-    //uint32 map_id = data->mapid;                          // already used before call
+    // uint32 map_id = data->mapid;                         // already used before call
     uint32 phaseMask = data->phaseMask;
     float x = data->posX;
     float y = data->posY;
@@ -589,7 +700,7 @@ bool GameObject::LoadFromDB(uint32 guid, Map *map)
     uint8 animprogress = data->animprogress;
     GOState go_state = data->go_state;
 
-    if (!Create(guid,entry, map, phaseMask, x, y, z, ang, data->rotation, animprogress, go_state))
+    if (!Create(guid, entry, map, phaseMask, x, y, z, ang, data->rotation, animprogress, go_state))
         return false;
 
     if (!GetGOInfo()->GetDespawnPossibility() && !GetGOInfo()->IsDespawnAtAction() && data->spawntimesecs >= 0)
@@ -601,7 +712,7 @@ bool GameObject::LoadFromDB(uint32 guid, Map *map)
     }
     else
     {
-        if(data->spawntimesecs >= 0)
+        if (data->spawntimesecs >= 0)
         {
             m_spawnedByDefault = true;
             m_respawnDelayTime = data->spawntimesecs;
@@ -630,7 +741,7 @@ struct GameObjectRespawnDeleteWorker
 {
     explicit GameObjectRespawnDeleteWorker(uint32 guid) : i_guid(guid) {}
 
-    void operator() (MapPersistentState* state)
+    void operator()(MapPersistentState* state)
     {
         state->SaveGORespawnTime(i_guid, 0);
     }
@@ -656,7 +767,7 @@ void GameObject::DeleteFromDB()
     WorldDatabase.PExecuteLog("DELETE FROM gameobject_battleground WHERE guid = '%u'", GetGUIDLow());
 }
 
-GameObjectInfo const *GameObject::GetGOInfo() const
+GameObjectInfo const* GameObject::GetGOInfo() const
 {
     return m_goInfo;
 }
@@ -667,7 +778,7 @@ GameObjectInfo const *GameObject::GetGOInfo() const
 bool GameObject::HasQuest(uint32 quest_id) const
 {
     QuestRelationsMapBounds bounds = sObjectMgr.GetGOQuestRelationsMapBounds(GetEntry());
-    for(QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+    for (QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
     {
         if (itr->second == quest_id)
             return true;
@@ -678,7 +789,7 @@ bool GameObject::HasQuest(uint32 quest_id) const
 bool GameObject::HasInvolvedQuest(uint32 quest_id) const
 {
     QuestRelationsMapBounds bounds = sObjectMgr.GetGOQuestInvolvedRelationsMapBounds(GetEntry());
-    for(QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+    for (QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
     {
         if (itr->second == quest_id)
             return true;
@@ -687,11 +798,32 @@ bool GameObject::HasInvolvedQuest(uint32 quest_id) const
 }
 
 bool GameObject::IsTransport() const
+{
+    // If something is marked as a transport, don't transmit an out of range packet for it.
+    GameObjectInfo const* gInfo = GetGOInfo();
+    if (!gInfo)
+        return false;
+    //FIXME - temporary GAMEOBJECT_TYPE_TRANSPORT disabled, awaiting finish code implementing
+    return /*gInfo->type == GAMEOBJECT_TYPE_TRANSPORT ||*/ gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT;
+}
+
+bool GameObject::IsMOTransport() const
+{
+    // If something is marked as a transport, don't transmit an out of range packet for it.
+    GameObjectInfo const* gInfo = GetGOInfo();
+    if (!gInfo)
+        return false;
+    return gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT;
+}
+
+// is Dynamic transport = non-stop Transport
+bool GameObject::IsDynTransport() const
 {
     // If something is marked as a transport, don't transmit an out of range packet for it.
     GameObjectInfo const * gInfo = GetGOInfo();
-    if(!gInfo) return false;
-    return gInfo->type == GAMEOBJECT_TYPE_TRANSPORT || gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT;
+    if(!gInfo)
+        return false;
+    return gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT || (gInfo->type == GAMEOBJECT_TYPE_TRANSPORT && !gInfo->transport.pause);
 }
 
 Unit* GameObject::GetOwner() const
@@ -701,55 +833,85 @@ Unit* GameObject::GetOwner() const
 
 void GameObject::SaveRespawnTime()
 {
-    if(m_respawnTime > time(NULL) && m_spawnedByDefault)
-        GetMap()->GetPersistentState()->SaveGORespawnTime(GetGUIDLow(), m_respawnTime);
+    if (m_respawnTime > time(NULL) && m_spawnedByDefault)
+        if (GetMap()->GetPersistentState())
+            GetMap()->GetPersistentState()->SaveGORespawnTime(GetGUIDLow(), m_respawnTime);
 }
 
 bool GameObject::isVisibleForInState(Player const* u, WorldObject const* viewPoint, bool inVisibleList) const
 {
     // Not in world
-    if(!IsInWorld() || !u->IsInWorld())
+    if (!IsInWorld() || !u->IsInWorld())
         return false;
 
     // invisible at client always
-    if(!GetGOInfo()->displayId)
+    if (!GetGOInfo()->displayId)
         return false;
 
     // Transport always visible at this step implementation
-    if(IsTransport() && IsInMap(u))
+    if (IsTransport() && IsInMap(u) && isActiveObject())
         return true;
 
     // quick check visibility false cases for non-GM-mode
-    if(!u->isGameMaster())
+    if (!u->isGameMaster())
     {
         // despawned and then not visible for non-GM in GM-mode
-        if(!isSpawned())
+        if (!isSpawned())
             return false;
 
         // special invisibility cases
-        /* TODO: implement trap stealth, take look at spell 2836
-        if(GetGOInfo()->type == GAMEOBJECT_TYPE_TRAP && GetGOInfo()->trap.stealthed && u->IsHostileTo(GetOwner()))
+        if (GetGOInfo()->type == GAMEOBJECT_TYPE_TRAP && GetGOInfo()->trap.stealthed)
         {
-            if(check stuff here)
+            bool trapNotVisible = false;
+
+            if (Unit* owner = GetOwner())
+            {
+                if (owner->GetTypeId() == TYPEID_PLAYER)
+                {
+                    Player* oPlayer = (Player*)owner;
+                    if ((GetMap()->IsBattleGroundOrArena() && oPlayer->GetBGTeam() != u->GetBGTeam()) ||
+                        (oPlayer->IsInDuelWith(u)) ||
+                        (oPlayer->GetTeam() != u->GetTeam()))
+                        trapNotVisible = true;
+                }
+                else
+                {
+                    if (u->IsFriendlyTo(owner))
+                        return true;
+                }
+            }
+
+            // only rogue have skill for traps detection
+            if (Aura* aura = ((Player*)u)->GetAura(2836, EFFECT_INDEX_0))
+            {
+                if (roll_chance_i(aura->GetModifier()->m_amount) && u->isInFront(this, 15.0f))
+                    return true;
+            }
+
+            if (trapNotVisible)
+                return false;
+
+            if (m_lootState == GO_READY)
                 return false;
-        }*/
+        }
     }
 
     // check distance
-    return IsWithinDistInMap(viewPoint, GetMap()->GetVisibilityDistance() +
-        (inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false);
+    return IsWithinDistInMap(viewPoint, GetMap()->GetVisibilityDistance(const_cast<GameObject*>(this)) +
+                             (inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false);
 }
 
 void GameObject::Respawn()
 {
-    if(m_spawnedByDefault && m_respawnTime > 0)
+    if (m_spawnedByDefault && m_respawnTime > 0)
     {
         m_respawnTime = time(NULL);
-        GetMap()->GetPersistentState()->SaveGORespawnTime(GetGUIDLow(), 0);
+        if (GetMap()->GetPersistentState())
+            GetMap()->GetPersistentState()->SaveGORespawnTime(GetGUIDLow(), 0);
     }
 }
 
-bool GameObject::ActivateToQuest(Player *pTarget) const
+bool GameObject::ActivateToQuest(Player* pTarget) const
 {
     // if GO is ReqCreatureOrGoN for quest
     if (pTarget->HasQuestForGO(GetEntry()))
@@ -758,7 +920,7 @@ bool GameObject::ActivateToQuest(Player *pTarget) const
     if (!sObjectMgr.IsGameObjectForQuests(GetEntry()))
         return false;
 
-    switch(GetGoType())
+    switch (GetGoType())
     {
         case GAMEOBJECT_TYPE_QUESTGIVER:
         {
@@ -769,9 +931,9 @@ bool GameObject::ActivateToQuest(Player *pTarget) const
 
             QuestRelationsMapBounds bounds = sObjectMgr.GetGOQuestRelationsMapBounds(GetEntry());
 
-            for(QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+            for (QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
             {
-                const Quest *qInfo = sObjectMgr.GetQuestTemplate(itr->second);
+                const Quest* qInfo = sObjectMgr.GetQuestTemplate(itr->second);
 
                 if (pTarget->CanTakeQuest(qInfo, false))
                     return true;
@@ -779,10 +941,10 @@ bool GameObject::ActivateToQuest(Player *pTarget) const
 
             bounds = sObjectMgr.GetGOQuestInvolvedRelationsMapBounds(GetEntry());
 
-            for(QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+            for (QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
             {
                 if ((pTarget->GetQuestStatus(itr->second) == QUEST_STATUS_INCOMPLETE || pTarget->GetQuestStatus(itr->second) == QUEST_STATUS_COMPLETE)
-                    && !pTarget->GetQuestRewardStatus(itr->second))
+                        && !pTarget->GetQuestRewardStatus(itr->second))
                     return true;
             }
 
@@ -796,10 +958,10 @@ bool GameObject::ActivateToQuest(Player *pTarget) const
 
             if (LootTemplates_Gameobject.HaveQuestLootForPlayer(GetGOInfo()->GetLootId(), pTarget))
             {
-                //look for battlegroundAV for some objects which are only activated after mine gots captured by own team
+                // look for battlegroundAV for some objects which are only activated after mine gots captured by own team
                 if (GetEntry() == BG_AV_OBJECTID_MINE_N || GetEntry() == BG_AV_OBJECTID_MINE_S)
-                    if (BattleGround *bg = pTarget->GetBattleGround())
-                        if (bg->GetTypeID() == BATTLEGROUND_AV && !(((BattleGroundAV*)bg)->PlayerCanDoMineQuest(GetEntry(),pTarget->GetTeam())))
+                    if (BattleGround* bg = pTarget->GetBattleGround())
+                        if (bg->GetTypeID(true) == BATTLEGROUND_AV && !(((BattleGroundAV*)bg)->PlayerCanDoMineQuest(GetEntry(), pTarget->GetTeam())))
                             return false;
                 return true;
             }
@@ -838,7 +1000,7 @@ void GameObject::SummonLinkedTrapIfAny()
 
     GameObject* linkedGO = new GameObject;
     if (!linkedGO->Create(GetMap()->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), linkedEntry, GetMap(),
-         GetPhaseMask(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()))
+                          GetPhaseMask(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()))
     {
         delete linkedGO;
         return;
@@ -875,7 +1037,7 @@ void GameObject::TriggerLinkedGameObject(Unit* target)
     float range = 0.5f;
 
     if (trapSpell)                                          // checked at load already
-        range = GetSpellMaxRange(sSpellRangeStore.LookupEntry(trapSpell->rangeIndex));
+        range = GetSpellMaxRange(sSpellRangeStore.LookupEntry(trapSpell->GetRangeIndex()));
 
     // search nearest linked GO
     GameObject* trapGO = NULL;
@@ -899,7 +1061,7 @@ GameObject* GameObject::LookupFishingHoleAround(float range)
 
     MaNGOS::NearestGameObjectFishingHoleCheck u_check(*this, range);
     MaNGOS::GameObjectSearcher<MaNGOS::NearestGameObjectFishingHoleCheck> checker(ok, u_check);
-    Cell::VisitGridObjects(this,checker, range);
+    Cell::VisitGridObjects(this, checker, range);
 
     return ok;
 }
@@ -914,15 +1076,29 @@ void GameObject::ResetDoorOrButton()
     m_cooldownTime = 0;
 }
 
+void GameObject::ResetCapturePoint()
+{
+    GameObjectInfo const* info = GetGOInfo();
+    if (!info)
+        return;
+
+    // don't use for other types
+    if (info->type != GAMEOBJECT_TYPE_CAPTURE_POINT)
+        return;
+
+    m_captureTicks = CAPTURE_SLIDER_NEUTRAL;
+    m_captureState = CAPTURE_STATE_NEUTRAL;
+}
+
 void GameObject::UseDoorOrButton(uint32 time_to_restore, bool alternative /* = false */)
 {
-    if(m_lootState != GO_READY)
+    if (m_lootState != GO_READY)
         return;
 
-    if(!time_to_restore)
+    if (!time_to_restore)
         time_to_restore = GetGOInfo()->GetAutoCloseTime();
 
-    SwitchDoorOrButton(true,alternative);
+    SwitchDoorOrButton(true, alternative);
     SetLootState(GO_ACTIVATED);
 
     m_cooldownTime = time(NULL) + time_to_restore;
@@ -930,19 +1106,22 @@ void GameObject::UseDoorOrButton(uint32 time_to_restore, bool alternative /* = f
 
 void GameObject::SwitchDoorOrButton(bool activate, bool alternative /* = false */)
 {
-    if(activate)
+    if (activate)
         SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
     else
         RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
 
-    if(GetGoState() == GO_STATE_READY)                      //if closed -> open
+    if (GetGoState() == GO_STATE_READY)                     // if closed -> open
         SetGoState(alternative ? GO_STATE_ACTIVE_ALTERNATIVE : GO_STATE_ACTIVE);
-    else                                                    //if open -> close
+    else                                                    // if open -> close
         SetGoState(GO_STATE_READY);
 }
 
 void GameObject::Use(Unit* user)
 {
+    if (!user)
+        return;
+
     // user must be provided
     MANGOS_ASSERT(user || PrintEntryError("GameObject::Use (without user)"));
 
@@ -968,7 +1147,7 @@ void GameObject::Use(Unit* user)
     {
         case GAMEOBJECT_TYPE_DOOR:                          // 0
         {
-            //doors never really despawn, only reset to default state/flags
+            // doors never really despawn, only reset to default state/flags
             UseDoorOrButton();
 
             // activate script
@@ -978,7 +1157,7 @@ void GameObject::Use(Unit* user)
         }
         case GAMEOBJECT_TYPE_BUTTON:                        // 1
         {
-            //buttons never really despawn, only reset to default state/flags
+            // buttons never really despawn, only reset to default state/flags
             UseDoorOrButton();
 
             TriggerLinkedGameObject(user);
@@ -1014,10 +1193,8 @@ void GameObject::Use(Unit* user)
             // TODO: possible must be moved to loot release (in different from linked triggering)
             if (GetGOInfo()->chest.eventId)
             {
-                DEBUG_LOG("Chest ScriptStart id %u for GO %u", GetGOInfo()->chest.eventId, GetGUIDLow());
-
-                if (!sScriptMgr.OnProcessEvent(GetGOInfo()->chest.eventId, user, this, true))
-                    GetMap()->ScriptsStart(sEventScripts, GetGOInfo()->chest.eventId, user, this);
+                DEBUG_LOG("Chest ScriptStart id %u for %s (opened by %s)", GetGOInfo()->chest.eventId, GetGuidStr().c_str(), user->GetGuidStr().c_str());
+                StartEvents_Event(GetMap(), GetGOInfo()->chest.eventId, user, this);
             }
 
             return;
@@ -1033,23 +1210,41 @@ void GameObject::Use(Unit* user)
         }
         case GAMEOBJECT_TYPE_TRAP:                          // 6
         {
-            // Currently we do not expect trap code below to be Use()
-            // directly (except from spell effect). Code here will be called by TriggerLinkedGameObject.
-
             if (scriptReturnValue)
                 return;
 
+            Unit* owner = GetOwner();
+            Unit* caster = owner ? owner : user;
+
+            GameObjectInfo const* goInfo = GetGOInfo();
+            float radius = float(goInfo->trap.radius);
+            bool IsBattleGroundTrap = !radius && goInfo->trap.cooldown == 3 && m_respawnTime == 0;
+
             // FIXME: when GO casting will be implemented trap must cast spell to target
-            if (spellId = GetGOInfo()->trap.spellId)
-                user->CastSpell(user, spellId, true, NULL, NULL, GetObjectGuid());
+            if (spellId = goInfo->trap.spellId)
+                caster->CastSpell(user, spellId, true, NULL, NULL, GetObjectGuid());
+            // use template cooldown if provided
+            m_cooldownTime = time(NULL) + (goInfo->trap.cooldown ? goInfo->trap.cooldown : uint32(4));
+
+            // count charges
+            if (goInfo->trap.charges > 0)
+                AddUse();
+
+            if (IsBattleGroundTrap && user->GetTypeId() == TYPEID_PLAYER)
+            {
+                // BattleGround gameobjects case
+                if (BattleGround* bg = ((Player*)user)->GetBattleGround())
+                    bg->HandleTriggerBuff(GetObjectGuid());
+            }
 
             // TODO: all traps can be activated, also those without spell.
             // Some may have have animation and/or are expected to despawn.
 
-            // TODO: Improve this when more information is available, currently these traps are known that must send the anim (Onyxia/ Heigan Fissures)
-            if (GetDisplayId() == 4392 || GetDisplayId() == 4472 || GetDisplayId() == 6785)
-                SendGameObjectCustomAnim(GetObjectGuid());
+            // TODO: Improve this when more information is available, currently these traps are known that must send the anim (Onyxia/ Heigan Fissures/ Trap in DireMaul)
+            if (GetDisplayId() == 4392 || GetDisplayId() == 4472 || GetDisplayId() == 6785 || GetDisplayId() == 3073)
+                SendGameObjectCustomAnim(GetObjectGuid(), 0);
 
+            // TODO: Despawning of traps? (Also related to code in ::Update)
             return;
         }
         case GAMEOBJECT_TYPE_CHAIR:                         // 7 Sitting: Wooden bench, chairs
@@ -1077,10 +1272,10 @@ void GameObject::Use(Unit* user)
                 // every slot will be on that straight line
                 float orthogonalOrientation = GetOrientation() + M_PI_F * 0.5f;
                 // find nearest slot
-                for(uint32 i=0; i<info->chair.slots; ++i)
+                for (uint32 i = 0; i < info->chair.slots; ++i)
                 {
                     // the distance between this slot and the center of the go - imagine a 1D space
-                    float relativeDistance = (info->size*i)-(info->size*(info->chair.slots-1)/2.0f);
+                    float relativeDistance = (info->size * i) - (info->size * (info->chair.slots - 1) / 2.0f);
 
                     float x_i = GetPositionX() + relativeDistance * cos(orthogonalOrientation);
                     float y_i = GetPositionY() + relativeDistance * sin(orthogonalOrientation);
@@ -1121,6 +1316,15 @@ void GameObject::Use(Unit* user)
         }
         case GAMEOBJECT_TYPE_GOOBER:                        // 10
         {
+            // Handle OutdoorPvP use cases
+            // Note: this may be also handled by DB spell scripts in the future, when the world state manager is implemented
+            if (user->GetTypeId() == TYPEID_PLAYER)
+            {
+                Player* player = (Player*)user;
+                if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(player->GetCachedZoneId()))
+                    outdoorPvP->HandleGameObjectUse(player, this);
+            }
+
             GameObjectInfo const* info = GetGOInfo();
 
             TriggerLinkedGameObject(user);
@@ -1130,7 +1334,7 @@ void GameObject::Use(Unit* user)
 
             // this appear to be ok, however others exist in addition to this that should have custom (ex: 190510, 188692, 187389)
             if (info->goober.customAnim)
-                SendGameObjectCustomAnim(GetObjectGuid());
+                SendGameObjectCustomAnim(GetObjectGuid(), info->goober.customAnim);
             else
                 SetGoState(GO_STATE_ACTIVE);
 
@@ -1157,16 +1361,24 @@ void GameObject::Use(Unit* user)
 
                 if (info->goober.eventId)
                 {
-                    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Goober ScriptStart id %u for GO entry %u (GUID %u).", info->goober.eventId, GetEntry(), GetGUIDLow());
+                    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Goober ScriptStart id %u for %s (Used by %s).", info->goober.eventId, GetGuidStr().c_str(), player->GetGuidStr().c_str());
+                    StartEvents_Event(GetMap(), info->goober.eventId, player, this);
 
-                    if (!sScriptMgr.OnProcessEvent(info->goober.eventId, player, this, true))
-                        GetMap()->ScriptsStart(sEventScripts, info->goober.eventId, player, this);
+                    // FIXME: hack for SOTA, need use regular scripts.
+                    if (player->CanUseBattleGroundObject())
+                    {
+                        if (BattleGround *bg = player->GetBattleGround())
+                        {
+                            if (bg->GetTypeID(true) == BATTLEGROUND_SA)
+                                bg->EventPlayerDamageGO(player, this, info->goober.eventId, 0);
+                        }
+                    }
                 }
 
                 // possible quest objective for active quests
                 if (info->goober.questId && sObjectMgr.GetQuestTemplate(info->goober.questId))
                 {
-                    //Quest require to be active for GO using
+                    // Quest require to be active for GO using
                     if (player->GetQuestStatus(info->goober.questId) != QUEST_STATUS_INCOMPLETE)
                         break;
                 }
@@ -1181,13 +1393,27 @@ void GameObject::Use(Unit* user)
             spellId = info->goober.spellId;
 
             // database may contain a dummy spell, so it need replacement by actually existing
-            switch(spellId)
+            switch (spellId)
             {
                 case 34448: spellId = 26566; break;
                 case 34452: spellId = 26572; break;
                 case 37639: spellId = 36326; break;
                 case 45367: spellId = 45371; break;
                 case 45370: spellId = 45368; break;
+
+                // custom taxi flights
+                case 32059:             // south
+                    ((Player*)user)->ActivateTaxiPathTo(520,0);
+                    break;
+                case 32068:             // west
+                    ((Player*)user)->ActivateTaxiPathTo(523,0);
+                    break;
+                case 32075:             // north
+                    ((Player*)user)->ActivateTaxiPathTo(522,0);
+                    break;
+                case 32081:             // east
+                    ((Player*)user)->ActivateTaxiPathTo(524,0);
+                    break;
             }
 
             break;
@@ -1207,9 +1433,21 @@ void GameObject::Use(Unit* user)
                 player->SendCinematicStart(info->camera.cinematicId);
 
             if (info->camera.eventID)
+                StartEvents_Event(GetMap(), info->camera.eventID, player, this);
+
+            return;
+        }
+        case GAMEOBJECT_TYPE_MO_TRANSPORT:                   // 15
+        {
+            if (GetGoState() == GO_STATE_READY)
+            {
+                SetGoState(GO_STATE_ACTIVE);
+                SetActiveObjectState(false);
+            }
+            else
             {
-                if (!sScriptMgr.OnProcessEvent(info->camera.eventID, player, this, true))
-                    GetMap()->ScriptsStart(sEventScripts, info->camera.eventID, player, this);
+                SetGoState(GO_STATE_READY);
+                SetActiveObjectState(true);
             }
 
             return;
@@ -1239,7 +1477,7 @@ void GameObject::Use(Unit* user)
                     if (!zone_skill)
                         zone_skill = sObjectMgr.GetFishingBaseSkillLevel(zone);
 
-                    //provide error, no fishable zone or area should be 0
+                    // provide error, no fishable zone or area should be 0
                     if (!zone_skill)
                         sLog.outErrorDb("Fishable areaId %u are not properly defined in `skill_fishing_base_level`.", subzone);
 
@@ -1258,7 +1496,7 @@ void GameObject::Use(Unit* user)
                     {
                         if (!sWorld.getConfig(CONFIG_BOOL_SKILL_FAIL_POSSIBLE_FISHINGPOOL))
                         {
-                            //TODO: find reasonable value for fishing hole search
+                            // TODO: find reasonable value for fishing hole search
                             fishingHole = LookupFishingHoleAround(20.0f + CONTACT_DISTANCE);
                             if (fishingHole)
                                 success = true;
@@ -1266,7 +1504,7 @@ void GameObject::Use(Unit* user)
                     }
                     // just search fishhole for success case
                     else
-                        //TODO: find reasonable value for fishing hole search
+                        // TODO: find reasonable value for fishing hole search
                         fishingHole = LookupFishingHoleAround(20.0f + CONTACT_DISTANCE);
 
                     if (success || sWorld.getConfig(CONFIG_BOOL_SKILL_FAIL_GAIN_FISHING))
@@ -1329,7 +1567,7 @@ void GameObject::Use(Unit* user)
                     return;
 
                 // accept only use by player from same group as owner, excluding owner itself (unique use already added in spell effect)
-                if (player == (Player*)owner || (info->summoningRitual.castersGrouped && !player->IsInSameRaidWith(((Player*)owner))))
+                if ((player == (Player*)owner && !player->isGameMaster()) || (info->summoningRitual.castersGrouped && !player->IsInSameRaidWith(((Player*)owner))))
                     return;
 
                 // expect owner to already be channeling, so if not...
@@ -1366,7 +1604,7 @@ void GameObject::Use(Unit* user)
             }
 
             // full amount unique participants including original summoner, need more
-            if (GetUniqueUseCount() < info->summoningRitual.reqParticipants)
+            if (GetUniqueUseCount() < info->summoningRitual.reqParticipants && !player->isGameMaster())
                 return;
 
             // owner is first user for non-wild GO objects, if it offline value already set to current user
@@ -1417,6 +1655,10 @@ void GameObject::Use(Unit* user)
 
             spellId = info->spellcaster.spellId;
 
+            // dismount players
+            if (user && user->IsMounted())
+                user->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+
             AddUse();
             break;
         }
@@ -1435,7 +1677,7 @@ void GameObject::Use(Unit* user)
             if (!targetPlayer || targetPlayer == player || !targetPlayer->IsInSameGroupWith(player))
                 return;
 
-            //required lvl checks!
+            // required lvl checks!
             uint8 level = player->getLevel();
             if (level < info->meetingstone.minLevel || level > info->meetingstone.maxLevel)
                 return;
@@ -1464,6 +1706,8 @@ void GameObject::Use(Unit* user)
                 BattleGround* bg = player->GetBattleGround();
                 if (!bg)
                     return;
+                if (player->GetVehicle())
+                    return;
                 // BG flag click
                 // AB:
                 // 15001
@@ -1472,7 +1716,7 @@ void GameObject::Use(Unit* user)
                 // 15004
                 // 15005
                 bg->EventPlayerClickedOnFlag(player, this);
-                return;                                     //we don't need to delete flag ... it is despawned!
+                return;                                     // we don't need to delete flag ... it is despawned!
             }
             break;
         }
@@ -1497,9 +1741,11 @@ void GameObject::Use(Unit* user)
             if (player->CanUseBattleGroundObject())
             {
                 // in battleground check
-                BattleGround *bg = player->GetBattleGround();
+                BattleGround* bg = player->GetBattleGround();
                 if (!bg)
                     return;
+                if (player->GetVehicle())
+                    return;
                 // BG flag dropped
                 // WS:
                 // 179785 - Silverwing Flag
@@ -1509,99 +1755,26 @@ void GameObject::Use(Unit* user)
                 GameObjectInfo const* info = GetGOInfo();
                 if (info)
                 {
-                    switch(info->id)
+                    switch (info->id)
                     {
                         case 179785:                        // Silverwing Flag
                         case 179786:                        // Warsong Flag
                             // check if it's correct bg
-                            if (bg->GetTypeID() == BATTLEGROUND_WS)
+                            if (bg->GetTypeID(true) == BATTLEGROUND_WS)
                                 bg->EventPlayerClickedOnFlag(player, this);
                             break;
                         case 184142:                        // Netherstorm Flag
-                            if (bg->GetTypeID() == BATTLEGROUND_EY)
+                            if (bg->GetTypeID(true) == BATTLEGROUND_EY)
                                 bg->EventPlayerClickedOnFlag(player, this);
                             break;
                     }
                 }
-                //this cause to call return, all flags must be deleted here!!
+                // this cause to call return, all flags must be deleted here!!
                 spellId = 0;
                 Delete();
             }
             break;
         }
-        case GAMEOBJECT_TYPE_CAPTURE_POINT:                 // 29
-        {
-            // Code here is not even halfway complete, and only added for further development.
-            // Computer may very well blow up after stealing your bank accounts and wreck your car.
-            // Use() object at own risk.
-
-            GameObjectInfo const* info = GetGOInfo();
-
-            if (!info)
-                return;
-
-            // Can we expect that only player object are able to trigger a capture point or
-            // could dummy creatures be involved?
-            //if (user->GetTypeId() != TYPEID_PLAYER)
-                //return;
-
-            //Player* player = (Player*)user;
-
-            // ID1 vs ID2 are possibly related to team. The world states should probably
-            // control which event to be used. For this to work, we need a far better system for
-            // sWorldStateMgr (system to store and keep track of states) so that we at all times
-            // know the state of every part of the world.
-
-            // Call every event, which is obviously wrong, but can help in further development. For
-            // the time being script side can process events and determine which one to use. It
-            // require of course that some object call go->Use()
-            if (info->capturePoint.winEventID1)
-            {
-                if (!sScriptMgr.OnProcessEvent(info->capturePoint.winEventID1, user, this, true))
-                    GetMap()->ScriptsStart(sEventScripts, info->capturePoint.winEventID1, user, this);
-            }
-            if (info->capturePoint.winEventID2)
-            {
-                if (!sScriptMgr.OnProcessEvent(info->capturePoint.winEventID2, user, this, true))
-                    GetMap()->ScriptsStart(sEventScripts, info->capturePoint.winEventID2, user, this);
-            }
-
-            if (info->capturePoint.contestedEventID1)
-            {
-                if (!sScriptMgr.OnProcessEvent(info->capturePoint.contestedEventID1, user, this, true))
-                    GetMap()->ScriptsStart(sEventScripts, info->capturePoint.contestedEventID1, user, this);
-            }
-            if (info->capturePoint.contestedEventID2)
-            {
-                if (!sScriptMgr.OnProcessEvent(info->capturePoint.contestedEventID2, user, this, true))
-                    GetMap()->ScriptsStart(sEventScripts, info->capturePoint.contestedEventID2, user, this);
-            }
-
-            if (info->capturePoint.progressEventID1)
-            {
-                if (!sScriptMgr.OnProcessEvent(info->capturePoint.progressEventID1, user, this, true))
-                    GetMap()->ScriptsStart(sEventScripts, info->capturePoint.progressEventID1, user, this);
-            }
-            if (info->capturePoint.progressEventID2)
-            {
-                if (!sScriptMgr.OnProcessEvent(info->capturePoint.progressEventID2, user, this, true))
-                    GetMap()->ScriptsStart(sEventScripts, info->capturePoint.progressEventID2, user, this);
-            }
-
-            if (info->capturePoint.neutralEventID1)
-            {
-                if (!sScriptMgr.OnProcessEvent(info->capturePoint.neutralEventID1, user, this, true))
-                    GetMap()->ScriptsStart(sEventScripts, info->capturePoint.neutralEventID1, user, this);
-            }
-            if (info->capturePoint.neutralEventID2)
-            {
-                if (!sScriptMgr.OnProcessEvent(info->capturePoint.neutralEventID2, user, this, true))
-                    GetMap()->ScriptsStart(sEventScripts, info->capturePoint.neutralEventID2, user, this);
-            }
-
-            // Some has spell, need to process those further.
-            return;
-        }
         case GAMEOBJECT_TYPE_BARBER_CHAIR:                  // 32
         {
             GameObjectInfo const* info = GetGOInfo();
@@ -1614,7 +1787,7 @@ void GameObject::Use(Unit* user)
             Player* player = (Player*)user;
 
             // fallback, will always work
-            player->TeleportTo(GetMapId(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation(),TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET);
+            player->TeleportTo(GetMapId(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation(), TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET);
 
             WorldPacket data(SMSG_ENABLE_BARBER_SHOP, 0);
             player->GetSession()->SendPacket(&data);
@@ -1630,14 +1803,14 @@ void GameObject::Use(Unit* user)
     if (!spellId)
         return;
 
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
     if (!spellInfo)
     {
         sLog.outError("WORLD: unknown spell id %u at use action for gameobject (Entry: %u GoType: %u )", spellId, GetEntry(), GetGoType());
         return;
     }
 
-    Spell *spell = new Spell(spellCaster, spellInfo, triggered, GetObjectGuid());
+    Spell* spell = new Spell(spellCaster, spellInfo, triggered, GetObjectGuid());
 
     // spell target is user of GO
     SpellCastTargets targets;
@@ -1646,64 +1819,288 @@ void GameObject::Use(Unit* user)
     spell->prepare(&targets);
 }
 
-// overwrite WorldObject function for proper name localization
-const char* GameObject::GetNameForLocaleIdx(int32 loc_idx) const
+bool GameObject::IsInRange(float x, float y, float z, float radius) const
 {
-    if (loc_idx >= 0)
-    {
-        GameObjectLocale const *cl = sObjectMgr.GetGameObjectLocale(GetEntry());
-        if (cl)
-        {
-            if (cl->Name.size() > (size_t)loc_idx && !cl->Name[loc_idx].empty())
-                return cl->Name[loc_idx].c_str();
-        }
-    }
+    GameObjectDisplayInfoEntry const *info = sGameObjectDisplayInfoStore.LookupEntry(GetUInt32Value(GAMEOBJECT_DISPLAYID));
+    if (!info)
+        return IsWithinDist3d(x, y, z, radius);
 
-    return GetName();
-}
+    float dx = x - GetPositionX();
+    float dy = y - GetPositionY();
+    float dz = z - GetPositionZ();
+    float dist = sqrt(dx*dx + dy*dy);
 
-using G3D::Quat;
-struct QuaternionCompressed
-{
-    QuaternionCompressed() : m_raw(0) {}
-    QuaternionCompressed(int64 val) : m_raw(val) {}
-    QuaternionCompressed(const Quat& quat) { Set(quat); }
+    if (dist <= CONTACT_DISTANCE)   // prevent division by 0
+        return true;
 
-    enum{
-        PACK_COEFF_YZ = 1 << 20,
-        PACK_COEFF_X = 1 << 21,
-    };
+    float sinA = sin(GetOrientation());
+    float cosA = cos(GetOrientation());
+    float sinB = dx / dist;
+    float cosB = dy / dist;
 
-    void Set(const Quat& quat)
+    dx = dist * (cosA * cosB + sinA * sinB);
+    dy = dist * (cosA * sinB - sinA * cosB);
+
+    return dx < info->maxX + radius && dx > info->minX - radius
+        && dy < info->maxY + radius && dy > info->minY - radius
+        && dz < info->maxZ + radius && dz > info->minZ - radius;
+}
+
+// ////////////////////////////////////////////////////////////////////////////////////////////////
+//                              Destructible GO handling
+// ////////////////////////////////////////////////////////////////////////////////////////////////
+
+void GameObject::DealGameObjectDamage(uint32 damage, uint32 spellId, Unit* caster)
+{
+    if (GetGoType() != GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING
+        || !caster
+        || !sSpellStore.LookupEntry(spellId))
     {
-        int8 w_sign = (quat.w >= 0 ? 1 : -1);
-        int64 X = int32(quat.x * PACK_COEFF_X) * w_sign & ((1 << 22) - 1);
-        int64 Y = int32(quat.y * PACK_COEFF_YZ) * w_sign & ((1 << 21) - 1);
-        int64 Z = int32(quat.z * PACK_COEFF_YZ) * w_sign & ((1 << 21) - 1);
-        m_raw = Z | (Y << 21) | (X << 42);
+        sLog.outError("GameObject::DealGameObjectDamage not valid damage method for %s, spell %u, damage %u, caster %s",
+            GetObjectGuid().GetString().c_str(),spellId, damage, caster ? caster->GetObjectGuid().GetString().c_str() : "<none>");
+        return;
     }
 
-    Quat Unpack() const
-    {
-        double x = (double)(m_raw >> 42) / (double)PACK_COEFF_X;
-        double y = (double)(m_raw << 22 >> 43) / (double)PACK_COEFF_YZ;
-        double z = (double)(m_raw << 43 >> 43) / (double)PACK_COEFF_YZ;
-        double w = 1 - (x * x + y * y + z * z);
-        MANGOS_ASSERT(w >= 0);
-        w = sqrt(w);
+    DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "GameObject::DealGameObjectDamage, spell ID %u, object %s, damage %u", spellId, GetObjectGuid().GetString().c_str(), damage);
 
-        return Quat(x,y,z,w);
-    }
+    if (!damage)
+        return;
 
-    int64 m_raw;
-};
+    WorldPacket data(SMSG_DESTRUCTIBLE_BUILDING_DAMAGE, GetPackGUID().size() + caster->GetPackGUID().size() + 9 + 4 + 4);
+    data << GetPackGUID();
+    data << caster->GetPackGUID();
+    data << caster->GetCharmerOrOwnerOrSelf()->GetPackGUID();
+    data << uint32(damage);
+    data << uint32(spellId);
+    SendMessageToSet(&data, false);
+}
 
-void GameObject::SetWorldRotation(float qx, float qy, float qz, float qw)
+void GameObject::DamageTaken(Unit* pDoneBy, int32 damage, uint32 spellId)
 {
-    Quat rotation(qx, qy, qz, qw);
-    // Temporary solution for gameobjects that has no rotation data in DB:
-    if (qz == 0.f && qw == 0.f)
-        rotation = Quat::fromAxisAngleRotation(G3D::Vector3::unitZ(), GetOrientation());
+    if (GetGoType() != GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING || (GetHealth() == 0 && damage > 0))
+        return;
+
+    if (damage > 0 && IsFriendlyTo(pDoneBy))
+        return;
+
+    Player* pWho = pDoneBy ? pDoneBy->GetCharmerOrOwnerPlayerOrPlayerItself() : NULL;
+
+    DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "GameObject::DamageTaken  damage taken: %i to health %u", damage, m_health);
+
+    uint32 realDamage = 0;
+
+    if (damage > 0)
+    {
+        if (GetHealth() > (uint32)damage)
+        {
+            m_health -= damage;
+            realDamage = damage;
+            if (pWho)
+            {
+                if (BattleGround* bg = pWho->GetBattleGround())
+                    bg->EventPlayerDamageGO(pWho, this, GetGOInfo()->destructibleBuilding.damageEvent, spellId);
+                else if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(pWho->GetCachedZoneId()))
+                    outdoorPvP->EventPlayerDamageGO(pWho,this,GetGOInfo()->destructibleBuilding.damageEvent, spellId);
+            }
+        }
+        else
+        {
+            realDamage = GetHealth();
+            m_health = 0;
+        }
+    }
+    else
+    {
+        if ((GetHealth() - damage) < GetMaxHealth())
+            m_health -= damage;
+        else
+            m_health = GetMaxHealth();
+    }
+
+    uint32 newDisplayId = 0;
+    DestructibleModelDataEntry const* destructibleInfo = sDestructibleModelDataStore.LookupEntry(m_goInfo->destructibleBuilding.destructibleData);
+
+    if (HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED) && m_health == GetMaxHealth())                  // intact event (from damaged to intact)
+    {
+        RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK_9 | GO_FLAG_DAMAGED | GO_FLAG_DESTROYED);
+        newDisplayId = GetGOInfo()->displayId;
+
+        // Start Event if exist
+        if (pWho && GetGOInfo()->destructibleBuilding.intactEvent)
+            StartEvents_Event(GetMap(), GetGOInfo()->destructibleBuilding.intactEvent, this, pWho);
+
+        SetLinkedWorldState(OBJECT_STATE_LAST_INDEX - (GetTeamIndex(GetTeam()) + 1)*OBJECT_STATE_PERIOD + OBJECT_STATE_INTACT);
+        DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "GameObject::DamageTaken %s gain INTACT state, team %u", GetObjectGuid().GetString().c_str(),GetTeam());
+    }
+    else if (HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED))               // from damaged to destroyed
+    {
+        // Destroyed
+        if (GetHealth() == 0)
+        {
+            RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK_9 |GO_FLAG_DAMAGED);
+            SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED);
+
+            // Get destroyed DisplayId
+            if ((!GetGOInfo()->destructibleBuilding.destroyedDisplayId || GetGOInfo()->destructibleBuilding.destroyedDisplayId == 1) && destructibleInfo)
+                newDisplayId = destructibleInfo->destroyedDisplayId;
+            else
+                newDisplayId = GetGOInfo()->destructibleBuilding.destroyedDisplayId;
+            if (!newDisplayId)                              // No proper destroyed display ID exists, fetch damaged
+            {
+                if ((!GetGOInfo()->destructibleBuilding.damagedDisplayId || GetGOInfo()->destructibleBuilding.damagedDisplayId == 1) && destructibleInfo)
+                    newDisplayId = destructibleInfo->damagedDisplayId;
+                else
+                    newDisplayId = GetGOInfo()->destructibleBuilding.damagedDisplayId;
+            }
+
+            if (pWho && GetGOInfo()->destructibleBuilding.destroyedEvent)
+                StartEvents_Event(GetMap(), GetGOInfo()->destructibleBuilding.destroyedEvent, this, pWho);
+
+            if (pWho)
+            {
+                if (BattleGround* bg = pWho->GetBattleGround())
+                    bg->EventPlayerDamageGO(pWho, this, GetGOInfo()->destructibleBuilding.destroyedEvent, spellId);
+                else if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(pWho->GetCachedZoneId()))
+                    outdoorPvP->EventPlayerDamageGO(pWho,this,GetGOInfo()->destructibleBuilding.destroyedEvent, spellId);
+            }
+            SetLinkedWorldState(OBJECT_STATE_LAST_INDEX - (GetTeamIndex(GetTeam()) + 1)*OBJECT_STATE_PERIOD + OBJECT_STATE_DESTROY);
+            DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "GameObject::DamageTaken %s gain DESTROY state, team %u", GetObjectGuid().GetString().c_str(),GetTeam());
+        }
+        DealGameObjectDamage(realDamage, spellId, pDoneBy);
+    }
+    else if (!HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED))                // from intact to damaged
+    {
+        if (GetHealth() <= GetGOInfo()->destructibleBuilding.damagedNumHits)
+        {
+            SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED);
+
+            if ((!GetGOInfo()->destructibleBuilding.damagedDisplayId || GetGOInfo()->destructibleBuilding.damagedDisplayId == 1) && destructibleInfo)
+                newDisplayId = destructibleInfo->damagedDisplayId;
+            else
+                newDisplayId = GetGOInfo()->destructibleBuilding.damagedDisplayId;
+
+            if (pWho && GetGOInfo()->destructibleBuilding.damageEvent)
+                StartEvents_Event(GetMap(), GetGOInfo()->destructibleBuilding.damageEvent, this, pWho);
+
+            // if we have a "dead" display we can "kill" the building after its damaged
+            if (GetGOInfo()->destructibleBuilding.destroyedDisplayId)
+            {
+                m_health = GetGOInfo()->destructibleBuilding.damagedNumHits;
+                if (GetHealth() == 0)
+                    m_health = 1;
+            }
+            // otherwise we just handle it as "destroyed"
+            else
+                m_health = 0;
+
+            if (pWho)
+            {
+                if (BattleGround* bg = pWho->GetBattleGround())
+                    bg->EventPlayerDamageGO(pWho, this, GetGOInfo()->destructibleBuilding.damagedEvent, spellId);
+                else if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(pWho->GetCachedZoneId()))
+                    outdoorPvP->EventPlayerDamageGO(pWho,this,GetGOInfo()->destructibleBuilding.damagedEvent, spellId);
+            }
+            SetLinkedWorldState(OBJECT_STATE_LAST_INDEX - (GetTeamIndex(GetTeam()) + 1)*OBJECT_STATE_PERIOD + OBJECT_STATE_DAMAGE);
+            DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "GameObject::DamageTaken %s gain DAMAGED state, team %u", GetObjectGuid().GetString().c_str(),GetTeam());
+         }
+        DealGameObjectDamage(realDamage, spellId, pDoneBy);
+    }
+    // Set display Id
+    if (newDisplayId && newDisplayId != GetDisplayId())
+        SetDisplayId(newDisplayId);
+
+    SetGoAnimProgress(GetHealth() * 255 / GetMaxHealth());
+}
+
+void GameObject::Rebuild(Unit* pCaster, uint32 spellId)
+{
+    if (GetGoType() != GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING)
+        return;
+
+    RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED | GO_FLAG_DESTROYED);
+    SetDisplayId(GetGOInfo()->displayId);
+    m_health = GetMaxHealth();
+
+    if (pCaster && GetGOInfo()->destructibleBuilding.rebuildingEvent)
+        StartEvents_Event(GetMap(), GetGOInfo()->destructibleBuilding.rebuildingEvent, this, pCaster->GetCharmerOrOwnerOrSelf());
+
+    if (pCaster)
+    {
+        if (Player* ppWho = pCaster->GetCharmerOrOwnerPlayerOrPlayerItself())
+        {
+            if (BattleGround* bg = ppWho->GetBattleGround())
+                bg->EventPlayerDamageGO(ppWho, this, GetGOInfo()->destructibleBuilding.rebuildingEvent, spellId);
+            else if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetZoneId()))
+                outdoorPvP->EventPlayerDamageGO(ppWho,this,GetGOInfo()->destructibleBuilding.rebuildingEvent, spellId);
+        }
+    }
+
+    SetLinkedWorldState(OBJECT_STATE_LAST_INDEX - (GetTeamIndex(GetTeam()) + 1)*OBJECT_STATE_PERIOD + OBJECT_STATE_INTACT);
+
+    DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "GameObject::Rebuild %s gain INTACT state, team %u", GetObjectGuid().GetString().c_str(),GetTeam());
+
+    SetGoAnimProgress(255);
+}
+
+// overwrite WorldObject function for proper name localization
+const char* GameObject::GetNameForLocaleIdx(int32 loc_idx) const
+{
+    if (loc_idx >= 0)
+    {
+        GameObjectLocale const* cl = sObjectMgr.GetGameObjectLocale(GetEntry());
+        if (cl)
+        {
+            if (cl->Name.size() > (size_t)loc_idx && !cl->Name[loc_idx].empty())
+                return cl->Name[loc_idx].c_str();
+        }
+    }
+
+    return GetName();
+}
+
+using G3D::Quat;
+struct QuaternionCompressed
+{
+    QuaternionCompressed() : m_raw(0) {}
+    QuaternionCompressed(int64 val) : m_raw(val) {}
+    QuaternionCompressed(const Quat& quat) { Set(quat); }
+
+    enum
+    {
+        PACK_COEFF_YZ = 1 << 20,
+        PACK_COEFF_X = 1 << 21,
+    };
+
+    void Set(const Quat& quat)
+    {
+        int8 w_sign = (quat.w >= 0 ? 1 : -1);
+        int64 X = int32(quat.x * PACK_COEFF_X) * w_sign & ((1 << 22) - 1);
+        int64 Y = int32(quat.y * PACK_COEFF_YZ) * w_sign & ((1 << 21) - 1);
+        int64 Z = int32(quat.z * PACK_COEFF_YZ) * w_sign & ((1 << 21) - 1);
+        m_raw = Z | (Y << 21) | (X << 42);
+    }
+
+    Quat Unpack() const
+    {
+        double x = (double)(m_raw >> 42) / (double)PACK_COEFF_X;
+        double y = (double)(m_raw << 22 >> 43) / (double)PACK_COEFF_YZ;
+        double z = (double)(m_raw << 43 >> 43) / (double)PACK_COEFF_YZ;
+        double w = 1 - (x * x + y * y + z * z);
+        MANGOS_ASSERT(w >= 0);
+        w = sqrt(w);
+
+        return Quat(x, y, z, w);
+    }
+
+    int64 m_raw;
+};
+
+void GameObject::SetWorldRotation(float qx, float qy, float qz, float qw)
+{
+    Quat rotation(qx, qy, qz, qw);
+    // Temporary solution for gameobjects that has no rotation data in DB:
+    if (fabs(qz) < M_NULL_F && fabs(qw) < M_NULL_F)
+        rotation = Quat::fromAxisAngleRotation(G3D::Vector3::unitZ(), GetOrientation());
 
     rotation.unitize();
     m_packedRotation = QuaternionCompressed(rotation).m_raw;
@@ -1715,22 +2112,22 @@ void GameObject::SetWorldRotation(float qx, float qy, float qz, float qw)
 
 void GameObject::SetTransportPathRotation(QuaternionData rotation)
 {
-    SetFloatValue(GAMEOBJECT_PARENTROTATION+0, rotation.x);
-    SetFloatValue(GAMEOBJECT_PARENTROTATION+1, rotation.y);
-    SetFloatValue(GAMEOBJECT_PARENTROTATION+2, rotation.z);
-    SetFloatValue(GAMEOBJECT_PARENTROTATION+3, rotation.w);
+    SetFloatValue(GAMEOBJECT_PARENTROTATION + 0, rotation.x);
+    SetFloatValue(GAMEOBJECT_PARENTROTATION + 1, rotation.y);
+    SetFloatValue(GAMEOBJECT_PARENTROTATION + 2, rotation.z);
+    SetFloatValue(GAMEOBJECT_PARENTROTATION + 3, rotation.w);
 }
 
 void GameObject::SetWorldRotationAngles(float z_rot, float y_rot, float x_rot)
 {
-    Quat quat( G3D::Matrix3::fromEulerAnglesZYX(z_rot, y_rot, x_rot) );
+    Quat quat(G3D::Matrix3::fromEulerAnglesZYX(z_rot, y_rot, x_rot));
     SetWorldRotation(quat.x, quat.y, quat.z, quat.w);
 }
 
 bool GameObject::IsHostileTo(Unit const* unit) const
 {
     // always non-hostile to GM in GM mode
-    if (unit->GetTypeId()==TYPEID_PLAYER && ((Player const*)unit)->isGameMaster())
+    if (unit->GetTypeId() == TYPEID_PLAYER && ((Player const*)unit)->isGameMaster())
         return false;
 
     // test owner instead if have
@@ -1740,13 +2137,20 @@ bool GameObject::IsHostileTo(Unit const* unit) const
     if (Unit const* targetOwner = unit->GetCharmerOrOwner())
         return IsHostileTo(targetOwner);
 
-    // for not set faction case (wild object) use hostile case
+    if (Player const* pPlayer = unit->GetCharmerOrOwnerPlayerOrPlayerItself())
+    {
+        Team team = GetTeam();
+        if (team != TEAM_NONE && team != pPlayer->GetTeam())
+            return true;
+    }
+
+    // for not set faction case: be hostile towards player, not hostile towards not-players
     if (!GetGOInfo()->faction)
-        return true;
+        return unit->IsControlledByPlayer();
 
     // faction base cases
-    FactionTemplateEntry const*tester_faction = sFactionTemplateStore.LookupEntry(GetGOInfo()->faction);
-    FactionTemplateEntry const*target_faction = unit->getFactionTemplateEntry();
+    FactionTemplateEntry const* tester_faction = sFactionTemplateStore.LookupEntry(GetGOInfo()->faction);
+    FactionTemplateEntry const* target_faction = unit->getFactionTemplateEntry();
     if (!tester_faction || !target_faction)
         return false;
 
@@ -1772,8 +2176,11 @@ bool GameObject::IsHostileTo(Unit const* unit) const
 
 bool GameObject::IsFriendlyTo(Unit const* unit) const
 {
+    if (!unit)
+        return true;
+
     // always friendly to GM in GM mode
-    if (unit->GetTypeId()==TYPEID_PLAYER && ((Player const*)unit)->isGameMaster())
+    if (unit->GetTypeId() == TYPEID_PLAYER && ((Player const*)unit)->isGameMaster())
         return true;
 
     // test owner instead if have
@@ -1783,13 +2190,19 @@ bool GameObject::IsFriendlyTo(Unit const* unit) const
     if (Unit const* targetOwner = unit->GetCharmerOrOwner())
         return IsFriendlyTo(targetOwner);
 
+    if (Player const* pPlayer = unit->GetCharmerOrOwnerPlayerOrPlayerItself())
+    {
+        if (GetTeam() == pPlayer->GetTeam())
+            return true;
+    }
+
     // for not set faction case (wild object) use hostile case
     if (!GetGOInfo()->faction)
         return false;
 
     // faction base cases
-    FactionTemplateEntry const*tester_faction = sFactionTemplateStore.LookupEntry(GetGOInfo()->faction);
-    FactionTemplateEntry const*target_faction = unit->getFactionTemplateEntry();
+    FactionTemplateEntry const* tester_faction = sFactionTemplateStore.LookupEntry(GetGOInfo()->faction);
+    FactionTemplateEntry const* target_faction = unit->getFactionTemplateEntry();
     if (!tester_faction || !target_faction)
         return false;
 
@@ -1799,7 +2212,7 @@ bool GameObject::IsFriendlyTo(Unit const* unit) const
         if (tester_faction->faction)
         {
             // forced reaction
-            if (ReputationRank const* force =((Player*)unit)->GetReputationMgr().GetForcedRankIfAny(tester_faction))
+            if (ReputationRank const* force = ((Player*)unit)->GetReputationMgr().GetForcedRankIfAny(tester_faction))
                 return *force >= REP_FRIENDLY;
 
             // apply reputation state
@@ -1813,90 +2226,91 @@ bool GameObject::IsFriendlyTo(Unit const* unit) const
     return tester_faction->IsFriendlyTo(*target_faction);
 }
 
-void GameObject::SetDisplayId(uint32 modelId)
-{
-    SetUInt32Value(GAMEOBJECT_DISPLAYID, modelId);
-    m_displayInfo = sGameObjectDisplayInfoStore.LookupEntry(modelId);
-}
-
-void GameObject::StartGroupLoot(Group* group, uint32 timer)
+void GameObject::SetLootState(LootState state)
 {
-    m_groupLootId = group->GetId();
-    m_groupLootTimer = timer;
+    m_lootState = state;
+    if (m_model)
+        EnableCollision(CalculateCurrentCollisionState());
 }
 
-void GameObject::StopGroupLoot()
+void GameObject::SetGoState(GOState state)
 {
-    if (!m_groupLootId)
-        return;
-
-    if (Group* group = sObjectMgr.GetGroupById(m_groupLootId))
-        group->EndRoll();
-
-    m_groupLootTimer = 0;
-    m_groupLootId = 0;
+    SetByteValue(GAMEOBJECT_BYTES_1, 0, state);
+    if (m_model)
+    {
+        if (!IsInWorld())
+            return;
+        EnableCollision(CalculateCurrentCollisionState());
+    }
 }
 
-Player* GameObject::GetOriginalLootRecipient() const
+void GameObject::SetDisplayId(uint32 modelId)
 {
-    return m_lootRecipientGuid ? ObjectAccessor::FindPlayer(m_lootRecipientGuid) : NULL;
+    SetUInt32Value(GAMEOBJECT_DISPLAYID, modelId);
+    m_displayInfo = sGameObjectDisplayInfoStore.LookupEntry(modelId);
+    UpdateModel();
 }
 
-Group* GameObject::GetGroupLootRecipient() const
+void GameObject::SetPhaseMask(uint32 newPhaseMask, bool update)
 {
-    // original recipient group if set and not disbanded
-    return m_lootGroupRecipientId ? sObjectMgr.GetGroupById(m_lootGroupRecipientId) : NULL;
+    WorldObject::SetPhaseMask(newPhaseMask, update);
+    EnableCollision(CalculateCurrentCollisionState());
 }
 
-Player* GameObject::GetLootRecipient() const
+void GameObject::EnableCollision(bool enable)
 {
-    // original recipient group if set and not disbanded
-    Group* group = GetGroupLootRecipient();
-
-    // original recipient player if online
-    Player* player = GetOriginalLootRecipient();
-
-    // if group not set or disbanded return original recipient player if any
-    if (!group)
-        return player;
-
-    // group case
-
-    // return player if it still be in original recipient group
-    if (player && player->GetGroup() == group)
-        return player;
+    if (!m_model)
+        return;
 
-    // find any in group
-    for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
-        if (Player* newPlayer = itr->getSource())
-            return newPlayer;
+    /*if (enable && !GetMap()->Contains(*m_model))
+        GetMap()->Insert(*m_model);*/
 
-    return NULL;
+    m_model->enable(enable ? GetPhaseMask() : 0);
 }
 
-void GameObject::SetLootRecipient(Unit* pUnit)
+bool GameObject::CalculateCurrentCollisionState() const
 {
-    // set the player whose group should receive the right
-    // to loot the gameobject after its used
-    // should be set to NULL after the loot disappears
+    if (!m_model || !isSpawned())
+        return false;
+
+    bool startOpen;
+    bool result = false;
 
-    if (!pUnit)
+    switch (GetGoType())
     {
-        m_lootRecipientGuid.Clear();
-        m_lootGroupRecipientId = 0;
-        return;
+        case GAMEOBJECT_TYPE_DOOR:
+        case GAMEOBJECT_TYPE_BUTTON:
+            startOpen = GetGOInfo()->door.startOpen;
+            break;
+            // place custom collision rules here
+        default:
+            startOpen = false;
+            break;
     }
 
-    Player* player = pUnit->GetCharmerOrOwnerPlayerOrPlayerItself();
-    if (!player)                                            // normal creature, no player involved
-        return;
+    if ((GetGoState() == GO_STATE_ACTIVE || GetGoState() == GO_STATE_ACTIVE_ALTERNATIVE) ||
+        (getLootState()  == GO_ACTIVATED || getLootState()  == GO_JUST_DEACTIVATED))
+        result = startOpen;
+    else if (GetGoState() == GO_STATE_READY ||
+            getLootState()  == GO_READY)
+        result = !startOpen;
 
-    // set player for non group case or if group will disbanded
-    m_lootRecipientGuid = player->GetObjectGuid();
+    return result;
+}
 
-    // set group for group existed case including if player will leave group at loot time
-    if (Group* group = player->GetGroup())
-        m_lootGroupRecipientId = group->GetId();
+void GameObject::UpdateModel()
+{
+    if (!IsInWorld())
+        return;
+    if (m_model)
+        if (GetMap()->ContainsGameObjectModel(*m_model))
+            GetMap()->RemoveGameObjectModel(*m_model);
+    delete m_model;
+    m_model = GameObjectModel::construct(this);
+    if (m_model)
+        GetMap()->InsertGameObjectModel(*m_model);
+
+    EnableCollision(CalculateCurrentCollisionState());
 }
 
 float GameObject::GetObjectBoundingRadius() const
@@ -1905,7 +2319,8 @@ float GameObject::GetObjectBoundingRadius() const
     // 1. This is clearly hack way because GameObjectDisplayInfoEntry have 6 floats related to GO sizes, but better that use DEFAULT_WORLD_OBJECT_SIZE
     // 2. In some cases this must be only interactive size, not GO size, current way can affect creature target point auto-selection in strange ways for big underground/virtual GOs
     if (m_displayInfo)
-        return fabs(m_displayInfo->unknown12) * GetObjectScale();
+//        return fabs(m_displayInfo->minX) * GetObjectScale();
+        return GetDeterminativeSize(false) * GetObjectScale();
 
     return DEFAULT_WORLD_OBJECT_SIZE;
 }
@@ -1924,7 +2339,7 @@ struct AddGameObjectToRemoveListInMapsWorker
 {
     AddGameObjectToRemoveListInMapsWorker(ObjectGuid guid) : i_guid(guid) {}
 
-    void operator() (Map* map)
+    void operator()(Map* map)
     {
         if (GameObject* pGameobject = map->GetGameObject(i_guid))
             pGameobject->AddObjectToRemoveList();
@@ -1944,13 +2359,13 @@ struct SpawnGameObjectInMapsWorker
     SpawnGameObjectInMapsWorker(uint32 guid, GameObjectData const* data)
         : i_guid(guid), i_data(data) {}
 
-    void operator() (Map* map)
+    void operator()(Map* map)
     {
         // Spawn if necessary (loaded grids only)
         if (map->IsLoaded(i_data->posX, i_data->posY))
         {
             GameObject* pGameobject = new GameObject;
-            //DEBUG_LOG("Spawning gameobject %u", *itr);
+            // DEBUG_LOG("Spawning gameobject %u", *itr);
             if (!pGameobject->LoadFromDB(i_guid, map))
             {
                 delete pGameobject;
@@ -1977,3 +2392,439 @@ bool GameObject::HasStaticDBSpawnData() const
 {
     return sObjectMgr.GetGOData(GetGUIDLow()) != NULL;
 }
+
+bool GameObject::IsWildSummoned() const
+{
+    // All Wild GOs are summoned by a spell and have no owner entry
+    if (!GetSpellId() || !GetOwnerGuid().IsEmpty())
+        return false;
+
+    // This check is likely not needed
+    if (SpellEntry const* spellInfo = sSpellStore.LookupEntry(GetSpellId()))
+    {
+        for (int eff_idx = 0; eff_idx < MAX_EFFECT_INDEX; ++eff_idx)
+        {
+            if (spellInfo->Effect[eff_idx] == SPELL_EFFECT_SUMMON_OBJECT_WILD && GetEntry() == (uint32)spellInfo->EffectMiscValue[eff_idx])
+                return true;
+        }
+    }
+
+    // Also possible add MANGOS_ASSERT(false) or weaker bug-report to note this unexpected case.
+    return false;
+}
+
+float GameObject::GetDeterminativeSize(bool b_priorityZ) const
+{
+    if (!IsInWorld())
+        return 0.0f;
+
+    GameObjectDisplayInfoEntry const *info = sGameObjectDisplayInfoStore.LookupEntry(GetUInt32Value(GAMEOBJECT_DISPLAYID));
+    if (!info)
+        return 0.0f;
+
+    if (b_priorityZ)
+        return info->maxZ - info->minZ;
+
+    return Location(info->maxX, info->maxY, info->maxZ).GetDistance(Location(info->minX, info->minY, info->minZ));
+}
+
+void GameObject::SetCapturePointSlider(int8 value)
+{
+    GameObjectInfo const* info = GetGOInfo();
+
+    if (!info || info->type != GAMEOBJECT_TYPE_CAPTURE_POINT)
+        return;
+
+    switch (value)
+    {
+        case CAPTURE_SLIDER_ALLIANCE_LOCKED:
+            m_captureSlider = CAPTURE_SLIDER_ALLIANCE;
+            SetLootState(GO_JUST_DEACTIVATED);
+            break;
+        case CAPTURE_SLIDER_HORDE_LOCKED:
+            m_captureSlider = CAPTURE_SLIDER_HORDE;
+            SetLootState(GO_JUST_DEACTIVATED);
+            break;
+        case CAPTURE_SLIDER_GET_VALUE:
+            m_captureSlider = (float)sWorldStateMgr.GetWorldStateValueFor(this,info->capturePoint.worldState2);
+            SetLootState(GO_ACTIVATED);
+            break;
+        default:
+            m_captureSlider = value;
+            SetLootState(GO_ACTIVATED);
+            break;
+    }
+
+    // set the state of the capture point based on the slider value
+    if (m_captureSlider == CAPTURE_SLIDER_ALLIANCE)
+        m_captureState = CAPTURE_STATE_WIN_ALLIANCE;
+    else if (m_captureSlider == CAPTURE_SLIDER_HORDE)
+        m_captureState = CAPTURE_STATE_WIN_HORDE;
+    else if (m_captureSlider > CAPTURE_SLIDER_NEUTRAL + info->capturePoint.neutralPercent * 0.5f)
+        m_captureState = CAPTURE_STATE_PROGRESS_ALLIANCE;
+    else if (m_captureSlider < CAPTURE_SLIDER_NEUTRAL - info->capturePoint.neutralPercent * 0.5f)
+        m_captureState = CAPTURE_STATE_PROGRESS_HORDE;
+    else
+        m_captureState = CAPTURE_STATE_NEUTRAL;
+}
+
+void GameObject::TickCapturePoint()
+{
+    // TODO: On retail: Ticks every 5.2 seconds. slider value increase when new player enters on tick
+
+    GameObjectInfo const* goInfo = GetGOInfo();
+
+    if (!goInfo || goInfo->type != GAMEOBJECT_TYPE_CAPTURE_POINT)
+        return;
+
+    float  radius   = goInfo->capturePoint.radius;
+    uint32 oldValue = sWorldStateMgr.GetWorldStateValueFor(this,goInfo->capturePoint.worldState2);
+    uint32 neutralPercent = goInfo->capturePoint.neutralPercent;
+
+    // search for players in radius
+    std::list<Player*> capturingPlayers;
+    MaNGOS::AnyPlayerInCapturePointRange u_check(this, radius);
+    MaNGOS::PlayerListSearcher<MaNGOS::AnyPlayerInCapturePointRange> checker(capturingPlayers, u_check);
+    Cell::VisitWorldObjects(this, checker, radius);
+
+    GuidSet tempUsers(m_UniqueUsers);
+    int rangePlayers = 0;
+
+    for (std::list<Player*>::iterator itr = capturingPlayers.begin(); itr != capturingPlayers.end(); ++itr)
+    {
+        Player* player = *itr;
+        if (!player)
+            continue;
+
+        if (player->GetTeam() == ALLIANCE)
+            ++rangePlayers;
+        else
+            --rangePlayers;
+
+        ObjectGuid guid = player->GetObjectGuid();
+        if (!tempUsers.erase(guid))
+        {
+            // new player entered capture point zone
+            m_UniqueUsers.insert(guid);
+            sWorldStateMgr.AddWorldStateFor(player, goInfo->capturePoint.worldState1, GetObjectGuid().GetCounter());
+        }
+    }
+
+    for (GuidSet::iterator itr = tempUsers.begin(); itr != tempUsers.end(); ++itr)
+    {
+        // send capture point leave packet
+        sWorldStateMgr.RemoveWorldStateFor(ObjectMgr::GetPlayer(*itr), goInfo->capturePoint.worldState1, GetObjectGuid().GetCounter());
+        // player left capture point zone
+        m_UniqueUsers.erase(*itr);
+    }
+
+    // return if there are not enough players capturing the point (works because minSuperiority is always 1)
+    if (rangePlayers == 0)
+    {
+        // set to inactive if all players left capture point zone
+        if (m_UniqueUsers.empty())
+            SetActiveObjectState(false);
+        return;
+    }
+
+    // prevents unloading gameobject before all players left capture point zone (to prevent m_UniqueUsers not being cleared if grid is set to idle)
+    SetActiveObjectState(true);
+
+    // cap speed
+    int maxSuperiority = goInfo->capturePoint.maxSuperiority;
+    if (rangePlayers > maxSuperiority)
+        rangePlayers = maxSuperiority;
+    else if (rangePlayers < -maxSuperiority)
+        rangePlayers = -maxSuperiority;
+
+    // time to capture from 0% to 100% is maxTime for minSuperiority amount of players and minTime for maxSuperiority amount of players (linear function: y = dy/dx*x+d)
+    float deltaSlider = goInfo->capturePoint.minTime;
+
+    if (int deltaSuperiority = maxSuperiority - goInfo->capturePoint.minSuperiority)
+        deltaSlider += (float)(maxSuperiority - abs(rangePlayers)) / deltaSuperiority * (goInfo->capturePoint.maxTime - goInfo->capturePoint.minTime);
+
+    // calculate changed slider value for a duration of 5 seconds (5 * 100%)
+    deltaSlider = 500.0f / deltaSlider;
+
+    Team progressFaction;
+    if (rangePlayers > 0)
+    {
+        progressFaction = ALLIANCE;
+        m_captureSlider += deltaSlider;
+        if (m_captureSlider > CAPTURE_SLIDER_ALLIANCE)
+            m_captureSlider = CAPTURE_SLIDER_ALLIANCE;
+    }
+    else
+    {
+        progressFaction = HORDE;
+        m_captureSlider -= deltaSlider;
+        if (m_captureSlider < CAPTURE_SLIDER_HORDE)
+            m_captureSlider = CAPTURE_SLIDER_HORDE;
+    }
+
+    // return if slider did not move a whole percent
+    if ((uint32)m_captureSlider == oldValue)
+        return;
+
+    // on retail this is also sent to newly added players even though they already received a slider value
+    sWorldStateMgr.SetWorldStateValueFor(this, goInfo->capturePoint.worldState2, (uint32)m_captureSlider);
+
+    // send capture point events
+    uint32 eventId = 0;
+
+    /* WIN EVENTS */
+    // alliance wins tower with max points
+    if (m_captureState != CAPTURE_STATE_WIN_ALLIANCE && (uint32)m_captureSlider == CAPTURE_SLIDER_ALLIANCE)
+    {
+        eventId = goInfo->capturePoint.winEventID1;
+        m_captureState = CAPTURE_STATE_WIN_ALLIANCE;
+    }
+    // horde wins tower with max points
+    else if (m_captureState != CAPTURE_STATE_WIN_HORDE && (uint32)m_captureSlider == CAPTURE_SLIDER_HORDE)
+    {
+        eventId = goInfo->capturePoint.winEventID2;
+        m_captureState = CAPTURE_STATE_WIN_HORDE;
+    }
+    /* PROGRESS EVENTS */
+    // alliance takes the tower from neutral, contested or horde (if there is no neutral area) to alliance
+    else if (m_captureState != CAPTURE_STATE_PROGRESS_ALLIANCE && m_captureSlider > CAPTURE_SLIDER_NEUTRAL + neutralPercent * 0.5f && progressFaction == ALLIANCE)
+    {
+        eventId = goInfo->capturePoint.progressEventID1;
+
+        // handle objective complete
+        if (m_captureState == CAPTURE_STATE_NEUTRAL)
+            if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript((*capturingPlayers.begin())->GetCachedZoneId()))
+                outdoorPvP->HandleObjectiveComplete(eventId, capturingPlayers, progressFaction);
+
+        // set capture state to alliance
+        m_captureState = CAPTURE_STATE_PROGRESS_ALLIANCE;
+    }
+    // horde takes the tower from neutral, contested or alliance (if there is no neutral area) to horde
+    else if (m_captureState != CAPTURE_STATE_PROGRESS_HORDE && m_captureSlider < CAPTURE_SLIDER_NEUTRAL - neutralPercent * 0.5f && progressFaction == HORDE)
+    {
+        eventId = goInfo->capturePoint.progressEventID2;
+
+        // handle objective complete
+        if (m_captureState == CAPTURE_STATE_NEUTRAL)
+            if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript((*capturingPlayers.begin())->GetCachedZoneId()))
+                outdoorPvP->HandleObjectiveComplete(eventId, capturingPlayers, progressFaction);
+
+        // set capture state to horde
+        m_captureState = CAPTURE_STATE_PROGRESS_HORDE;
+    }
+
+    /* NEUTRAL EVENTS */
+    // alliance takes the tower from horde to neutral
+    else if (m_captureState != CAPTURE_STATE_NEUTRAL && m_captureSlider >= CAPTURE_SLIDER_NEUTRAL - neutralPercent * 0.5f && m_captureSlider <= CAPTURE_SLIDER_NEUTRAL + neutralPercent * 0.5f && progressFaction == ALLIANCE)
+    {
+        eventId = goInfo->capturePoint.neutralEventID1;
+        m_captureState = CAPTURE_STATE_NEUTRAL;
+    }
+    // horde takes the tower from alliance to neutral
+    else if (m_captureState != CAPTURE_STATE_NEUTRAL && m_captureSlider >= CAPTURE_SLIDER_NEUTRAL - neutralPercent * 0.5f && m_captureSlider <= CAPTURE_SLIDER_NEUTRAL + neutralPercent * 0.5f && progressFaction == HORDE)
+    {
+        eventId = goInfo->capturePoint.neutralEventID2;
+        m_captureState = CAPTURE_STATE_NEUTRAL;
+    }
+
+    /* CONTESTED EVENTS */
+    // alliance attacks tower which is in control or progress by horde (except if alliance also gains control in that case)
+    else if ((m_captureState == CAPTURE_STATE_WIN_HORDE || m_captureState == CAPTURE_STATE_PROGRESS_HORDE) && progressFaction == ALLIANCE)
+    {
+        eventId = goInfo->capturePoint.contestedEventID1;
+        m_captureState = CAPTURE_STATE_CONTEST_HORDE;
+    }
+    // horde attacks tower which is in control or progress by alliance (except if horde also gains control in that case)
+    else if ((m_captureState == CAPTURE_STATE_WIN_ALLIANCE || m_captureState == CAPTURE_STATE_PROGRESS_ALLIANCE) && progressFaction == HORDE)
+    {
+        eventId = goInfo->capturePoint.contestedEventID2;
+        m_captureState = CAPTURE_STATE_CONTEST_ALLIANCE;
+    }
+
+    if (eventId)
+    {
+        GuidSet players;
+        for (GuidSet::iterator itr = m_UniqueUsers.begin(); itr != m_UniqueUsers.end(); ++itr)
+        {
+            Player* player = ObjectMgr::GetPlayer(*itr);
+            if (player && player->GetTeam() == progressFaction)
+                players.insert(*itr);
+        }
+
+
+        DEBUG_LOG("GameObject::TickCapturePoint gameobject %s send event %u to faction %u, players group size %u, new state %u",
+            GetObjectGuid().GetString().c_str(),
+            eventId, progressFaction, players.size(), m_captureState);
+
+        StartEvents_Event(GetMap(), eventId, this, this, true, *capturingPlayers.begin());
+    }
+}
+
+uint32 GameObject::GetLinkedWorldState(bool stateId)
+{
+    switch (GetGOInfo()->type)
+    {
+        case GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING:
+        {
+            if (WorldStateMgr::CheckWorldState(GetGOInfo()->destructibleBuilding.linkedWorldState))
+                return stateId ?
+                    GetGOInfo()->destructibleBuilding.linkedWorldState :
+                    sWorldStateMgr.GetWorldStateValueFor(this,GetGOInfo()->destructibleBuilding.linkedWorldState);
+            break;
+        }
+        case GAMEOBJECT_TYPE_CAPTURE_POINT:
+        {
+            if (GetGOInfo()->capturePoint.worldState2)
+                return stateId ?
+                    GetGOInfo()->capturePoint.worldState2 :
+                    sWorldStateMgr.GetWorldStateValueFor(this,GetGOInfo()->capturePoint.worldState2);
+            break;
+        }
+        default:
+            break;
+    }
+    return UINT32_MAX;
+}
+
+void GameObject::SetLinkedWorldState(uint32 value)
+{
+    uint32 stateId = 0;
+
+    switch (GetGOInfo()->type)
+    {
+        case GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING:
+        {
+            stateId = GetGOInfo()->destructibleBuilding.linkedWorldState > WORLDSTATES_BEGIN ? GetGOInfo()->destructibleBuilding.linkedWorldState : 0;
+            break;
+        }
+        case GAMEOBJECT_TYPE_CAPTURE_POINT:
+        {
+            stateId = GetGOInfo()->capturePoint.worldState2;
+            break;
+        }
+        default:
+            break;
+    }
+
+    if (stateId)
+        sWorldStateMgr.SetWorldStateValueFor(this, stateId, value);
+}
+
+Team GameObject::GetTeam() const
+{
+    if (!GetGOInfo())
+        return TEAM_NONE;
+
+    uint32 wsValue = const_cast<GameObject*>(this)->GetLinkedWorldState();
+
+    if (wsValue == UINT32_MAX)
+        return TEAM_NONE;
+
+    switch (GetGOInfo()->type)
+    {
+        case GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING:
+        {
+            switch (wsValue)
+            {
+                case OBJECT_STATE_HORDE_INTACT:
+                case OBJECT_STATE_HORDE_DAMAGE:
+                case OBJECT_STATE_HORDE_DESTROY:
+                    return HORDE;
+                case OBJECT_STATE_ALLIANCE_INTACT:
+                case OBJECT_STATE_ALLIANCE_DAMAGE:
+                case OBJECT_STATE_ALLIANCE_DESTROY:
+                    return ALLIANCE;
+                case OBJECT_STATE_NONE:
+                case OBJECT_STATE_NEUTRAL_INTACT:
+                case OBJECT_STATE_NEUTRAL_DAMAGE:
+                case OBJECT_STATE_NEUTRAL_DESTROY:
+                default:
+                    break;
+            }
+            break;
+        }
+        case GAMEOBJECT_TYPE_CAPTURE_POINT:
+        {
+            switch (wsValue)
+            {
+                case CAPTURE_SLIDER_HORDE:
+                    return HORDE;
+                case CAPTURE_SLIDER_ALLIANCE:
+                    return ALLIANCE;
+                case CAPTURE_SLIDER_NEUTRAL:
+                    break;
+                default:
+                // in this point need calculation from WS
+                {
+                    switch (m_captureState)
+                    {
+                        case CAPTURE_STATE_PROGRESS_ALLIANCE:
+                        case CAPTURE_STATE_WIN_ALLIANCE:
+                            return ALLIANCE;
+                        case CAPTURE_STATE_PROGRESS_HORDE:
+                        case CAPTURE_STATE_WIN_HORDE:
+                            return HORDE;
+                        case CAPTURE_STATE_CONTEST_ALLIANCE:
+                        case CAPTURE_STATE_CONTEST_HORDE:
+                        case CAPTURE_STATE_NEUTRAL:
+                        default:
+                            break;
+                    }
+                    break;
+                }
+            }
+            break;
+        }
+        default:
+            break;
+    }
+    return TEAM_NONE;
+}
+
+bool GameObject::SetTeam(Team team)
+{
+    //currently only for GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING, if need for other - make in this method
+
+    if (!GetGOInfo())
+        return false;
+
+    uint32 wsValue = GetLinkedWorldState();
+
+    if (wsValue == UINT32_MAX)
+        return false;
+
+    switch (GetGOInfo()->type)
+    {
+        case GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING:
+        {
+            switch (wsValue)
+            {
+                case OBJECT_STATE_NONE:
+                case OBJECT_STATE_NEUTRAL_INTACT:
+                case OBJECT_STATE_HORDE_INTACT:
+                case OBJECT_STATE_ALLIANCE_INTACT:
+                    SetLinkedWorldState(OBJECT_STATE_LAST_INDEX - (GetTeamIndex(GetTeam()) + 1)*OBJECT_STATE_PERIOD + OBJECT_STATE_INTACT);
+                    return true;
+
+                case OBJECT_STATE_HORDE_DAMAGE:
+                case OBJECT_STATE_ALLIANCE_DAMAGE:
+                case OBJECT_STATE_NEUTRAL_DAMAGE:
+                    SetLinkedWorldState(OBJECT_STATE_LAST_INDEX - (GetTeamIndex(GetTeam()) + 1)*OBJECT_STATE_PERIOD + OBJECT_STATE_DAMAGE);
+                    return true;
+
+                case OBJECT_STATE_HORDE_DESTROY:
+                case OBJECT_STATE_ALLIANCE_DESTROY:
+                case OBJECT_STATE_NEUTRAL_DESTROY:
+                    SetLinkedWorldState(OBJECT_STATE_LAST_INDEX - (GetTeamIndex(GetTeam()) + 1)*OBJECT_STATE_PERIOD + OBJECT_STATE_DESTROY);
+                    return true;
+
+                default:
+                    break;
+            }
+            break;
+        }
+        default:
+            break;
+    }
+    return false;
+}
diff --git a/src/game/GameObject.h b/src/game/GameObject.h
index ed01d522403..25812964858 100644
--- a/src/game/GameObject.h
+++ b/src/game/GameObject.h
@@ -22,7 +22,6 @@
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Object.h"
-#include "LootMgr.h"
 #include "Database/DatabaseEnv.h"
 
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
@@ -38,10 +37,10 @@ struct GameObjectInfo
     uint32  id;
     uint32  type;
     uint32  displayId;
-    char   *name;
-    char   *IconName;
-    char   *castBarCaption;
-    char   *unk1;
+    char*   name;
+    char*   IconName;
+    char*   castBarCaption;
+    char*   unk1;
     uint32  faction;
     uint32  flags;
     float   size;
@@ -230,6 +229,8 @@ struct GameObjectInfo
             uint32 transportPhysics;                        //5
             uint32 mapID;                                   //6
             uint32 worldState1;                             //7
+            uint32 defaultState;                            //8
+            uint32 difficultyMask;                          //9 custom data, not be found in cache.
         } moTransport;
         //16 GAMEOBJECT_TYPE_DUELFLAG - empty
         //17 GAMEOBJECT_TYPE_FISHINGNODE - empty
@@ -310,7 +311,7 @@ struct GameObjectInfo
             uint32 radius;                                  //0
             uint32 spell;                                   //1
             uint32 worldState1;                             //2
-            uint32 worldstate2;                             //3
+            uint32 worldState2;                             //3
             uint32 winEventID1;                             //4
             uint32 winEventID2;                             //5
             uint32 contestedEventID1;                       //6
@@ -320,7 +321,7 @@ struct GameObjectInfo
             uint32 neutralEventID1;                         //10
             uint32 neutralEventID2;                         //11
             uint32 neutralPercent;                          //12
-            uint32 worldstate3;                             //13
+            uint32 worldState3;                             //13
             uint32 minSuperiority;                          //14
             uint32 maxSuperiority;                          //15
             uint32 minTime;                                 //16
@@ -360,26 +361,26 @@ struct GameObjectInfo
             uint32 creditProxyCreature;                     //1
             uint32 empty1;                                  //2
             uint32 intactEvent;                             //3
-            uint32 empty2;                                  //4
+            uint32 damagedDisplayId;                        //4
             uint32 damagedNumHits;                          //5
-            uint32 empty3;                                  //6
-            uint32 empty4;                                  //7
-            uint32 empty5;                                  //8
+            uint32 empty2;                                  //6
+            uint32 empty3;                                  //7
+            uint32 empty4;                                  //8
             uint32 damagedEvent;                            //9
-            uint32 empty6;                                  //10
-            uint32 empty7;                                  //11
-            uint32 empty8;                                  //12
-            uint32 empty9;                                  //13
+            uint32 destroyedDisplayId;                      //10
+            uint32 empty5;                                  //11
+            uint32 empty6;                                  //12
+            uint32 empty7;                                  //13
             uint32 destroyedEvent;                          //14
-            uint32 empty10;                                 //15
+            uint32 empty8;                                  //15
             uint32 debuildingTimeSecs;                      //16
-            uint32 empty11;                                 //17
+            uint32 empty9;                                  //17
             uint32 destructibleData;                        //18
             uint32 rebuildingEvent;                         //19
-            uint32 empty12;                                 //20
-            uint32 empty13;                                 //21
+            uint32 empty10;                                 //20
+            uint32 empty11;                                 //21
             uint32 damageEvent;                             //22
-            uint32 empty14;                                 //23
+            uint32 linkedWorldState;                        //23 Custom value - set linked WorldState for this object
         } destructibleBuilding;
         //34 GAMEOBJECT_TYPE_GUILDBANK - empty
         //35 GAMEOBJECT_TYPE_TRAPDOOR
@@ -404,7 +405,7 @@ struct GameObjectInfo
     // helpers
     bool IsDespawnAtAction() const
     {
-        switch(type)
+        switch (type)
         {
             case GAMEOBJECT_TYPE_CHEST:  return chest.consumable;
             case GAMEOBJECT_TYPE_GOOBER: return goober.consumable;
@@ -414,7 +415,7 @@ struct GameObjectInfo
 
     uint32 GetLockId() const
     {
-        switch(type)
+        switch (type)
         {
             case GAMEOBJECT_TYPE_DOOR:       return door.lockId;
             case GAMEOBJECT_TYPE_BUTTON:     return button.lockId;
@@ -425,7 +426,7 @@ struct GameObjectInfo
             case GAMEOBJECT_TYPE_AREADAMAGE: return areadamage.lockId;
             case GAMEOBJECT_TYPE_CAMERA:     return camera.lockId;
             case GAMEOBJECT_TYPE_FLAGSTAND:  return flagstand.lockId;
-            case GAMEOBJECT_TYPE_FISHINGHOLE:return fishinghole.lockId;
+            case GAMEOBJECT_TYPE_FISHINGHOLE: return fishinghole.lockId;
             case GAMEOBJECT_TYPE_FLAGDROP:   return flagdrop.lockId;
             default: return 0;
         }
@@ -433,7 +434,7 @@ struct GameObjectInfo
 
     bool GetDespawnPossibility() const                      // despawn at targeting of cast?
     {
-        switch(type)
+        switch (type)
         {
             case GAMEOBJECT_TYPE_DOOR:       return door.noDamageImmune;
             case GAMEOBJECT_TYPE_BUTTON:     return button.noDamageImmune;
@@ -447,7 +448,7 @@ struct GameObjectInfo
 
     uint32 GetCharges() const                               // despawn at uses amount
     {
-        switch(type)
+        switch (type)
         {
             case GAMEOBJECT_TYPE_TRAP:        return trap.charges;
             case GAMEOBJECT_TYPE_GUARDPOST:   return guardpost.charges;
@@ -458,7 +459,7 @@ struct GameObjectInfo
 
     uint32 GetCooldown() const                              // not triggering at detection target or use until coolodwn expire
     {
-        switch(type)
+        switch (type)
         {
             case GAMEOBJECT_TYPE_TRAP:        return trap.cooldown;
             case GAMEOBJECT_TYPE_GOOBER:      return goober.cooldown;
@@ -468,7 +469,7 @@ struct GameObjectInfo
 
     uint32 GetLinkedGameObjectEntry() const
     {
-        switch(type)
+        switch (type)
         {
             case GAMEOBJECT_TYPE_BUTTON:      return button.linkedTrapId;
             case GAMEOBJECT_TYPE_CHEST:       return chest.linkedTrapId;
@@ -481,7 +482,7 @@ struct GameObjectInfo
     uint32 GetAutoCloseTime() const
     {
         uint32 autoCloseTime = 0;
-        switch(type)
+        switch (type)
         {
             case GAMEOBJECT_TYPE_DOOR:          autoCloseTime = door.autoCloseTime; break;
             case GAMEOBJECT_TYPE_BUTTON:        autoCloseTime = button.autoCloseTime; break;
@@ -491,12 +492,12 @@ struct GameObjectInfo
             case GAMEOBJECT_TYPE_AREADAMAGE:    autoCloseTime = areadamage.autoCloseTime; break;
             default: break;
         }
-        return autoCloseTime / IN_MILLISECONDS;              // prior to 3.0.3, conversion was / 0x10000;
+        return autoCloseTime / IN_MILLISECONDS;             // prior to 3.0.3, conversion was / 0x10000;
     }
 
     uint32 GetLootId() const
     {
-        switch(type)
+        switch (type)
         {
             case GAMEOBJECT_TYPE_CHEST:       return chest.lootId;
             case GAMEOBJECT_TYPE_FISHINGHOLE: return fishinghole.lootId;
@@ -506,24 +507,13 @@ struct GameObjectInfo
 
     uint32 GetGossipMenuId() const
     {
-        switch(type)
+        switch (type)
         {
             case GAMEOBJECT_TYPE_QUESTGIVER:    return questgiver.gossipID;
             case GAMEOBJECT_TYPE_GOOBER:        return goober.gossipID;
             default: return 0;
         }
     }
-
-    uint32 GetEventScriptId() const
-    {
-        switch(type)
-        {
-            case GAMEOBJECT_TYPE_GOOBER:        return goober.eventId;
-            case GAMEOBJECT_TYPE_CHEST:         return chest.eventId;
-            case GAMEOBJECT_TYPE_CAMERA:        return camera.eventID;
-            default: return 0;
-        }
-    }
 };
 
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
@@ -556,7 +546,7 @@ struct QuaternionData
     QuaternionData() : x(0.f), y(0.f), z(0.f), w(0.f) {}
     QuaternionData(float X, float Y, float Z, float W) : x(X), y(Y), z(Z), w(W) {}
 
-    bool isUnit() const { return fabs(x*x + y*y + z*z + w*w - 1.f) < 1e-5;}
+    bool isUnit() const { return fabs(x * x + y * y + z * z + w * w - 1.f) < 1e-5;}
 };
 
 // from `gameobject`
@@ -595,7 +585,31 @@ enum LootState
     GO_JUST_DEACTIVATED
 };
 
+enum CapturePointState
+{
+    CAPTURE_STATE_NEUTRAL = 0,
+    CAPTURE_STATE_PROGRESS_ALLIANCE,
+    CAPTURE_STATE_PROGRESS_HORDE,
+    CAPTURE_STATE_CONTEST_ALLIANCE,
+    CAPTURE_STATE_CONTEST_HORDE,
+    CAPTURE_STATE_WIN_ALLIANCE,
+    CAPTURE_STATE_WIN_HORDE
+};
+
+enum CapturePointSlider
+{
+    CAPTURE_SLIDER_ALLIANCE         = 100,                  // full alliance
+    CAPTURE_SLIDER_HORDE            = 0,                    // full horde
+    CAPTURE_SLIDER_NEUTRAL          = 50,                   // middle
+
+    CAPTURE_SLIDER_ALLIANCE_LOCKED  = -1,                   // used to store additional information
+    CAPTURE_SLIDER_HORDE_LOCKED     = -2,
+
+    CAPTURE_SLIDER_GET_VALUE        = INT8_MAX,             // used for get value from linked WorldState (or still intact)
+};
+
 class Unit;
+class GameObjectModel;
 struct GameObjectDisplayInfoEntry;
 
 // 5 sec for bobber catch
@@ -607,17 +621,21 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
 {
     public:
         explicit GameObject();
-        ~GameObject();
+        virtual ~GameObject();
 
         void AddToWorld();
-        void RemoveFromWorld();
+        virtual void RemoveFromWorld(bool remove) override;
+
+        virtual bool Create(uint32 guidlow, uint32 name_id, Map* map, uint32 phaseMask, float x, float y, float z, float ang,
+                    QuaternionData rotation = QuaternionData(), uint8 animprogress = GO_ANIMPROGRESS_DEFAULT, GOState go_state = GO_STATE_READY);
 
-        bool Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMask, float x, float y, float z, float ang,
-            QuaternionData rotation = QuaternionData(), uint8 animprogress = GO_ANIMPROGRESS_DEFAULT, GOState go_state = GO_STATE_READY);
-        void Update(uint32 update_diff, uint32 p_time) override;
+        virtual void Update(uint32 update_diff, uint32 p_time) override;
         GameObjectInfo const* GetGOInfo() const;
 
-        bool IsTransport() const;
+        virtual bool IsTransport() const override;
+        virtual bool IsMOTransport() const override;
+        bool IsDynTransport() const;
+        virtual TransportKit* GetTransportKit() override { return NULL; };
 
         bool HasStaticDBSpawnData() const;                  // listed in `gameobject` table and have fixed in DB guid
 
@@ -632,7 +650,7 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
 
         void SaveToDB();
         void SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask);
-        bool LoadFromDB(uint32 guid, Map *map);
+        bool LoadFromDB(uint32 guid, Map* map);
         void DeleteFromDB();
 
         void SetOwnerGuid(ObjectGuid ownerGuid)
@@ -650,11 +668,13 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
         }
         uint32 GetSpellId() const { return m_spellId;}
 
+        bool IsWildSummoned() const;
+
         time_t GetRespawnTime() const { return m_respawnTime; }
         time_t GetRespawnTimeEx() const
         {
             time_t now = time(NULL);
-            if(m_respawnTime > now)
+            if (m_respawnTime > now)
                 return m_respawnTime;
             else
                 return now;
@@ -664,15 +684,18 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
         {
             m_respawnTime = respawn > 0 ? time(NULL) + respawn : 0;
             m_respawnDelayTime = respawn > 0 ? uint32(respawn) : 0;
+            EnableCollision(CalculateCurrentCollisionState());
         }
         void Respawn();
         bool isSpawned() const
         {
             return m_respawnDelayTime == 0 ||
-                (m_respawnTime > 0 && !m_spawnedByDefault) ||
-                (m_respawnTime == 0 && m_spawnedByDefault);
+                   (m_respawnTime > 0 && !m_spawnedByDefault) ||
+                   (m_respawnTime == 0 && m_spawnedByDefault);
         }
         bool isSpawnedByDefault() const { return m_spawnedByDefault; }
+        void SetSpawnedByDefault(bool SpawnedByDefault) { m_spawnedByDefault = SpawnedByDefault; } // set summoned object spawning/despawning after delay
+        void SetRespawnDelay(uint32 delay) { m_respawnDelayTime = delay; };
         uint32 GetRespawnDelay() const { return m_respawnDelayTime; }
         void Refresh();
         void Delete();
@@ -684,20 +707,23 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
         GameobjectTypes GetGoType() const { return GameobjectTypes(GetByteValue(GAMEOBJECT_BYTES_1, 1)); }
         void SetGoType(GameobjectTypes type) { SetByteValue(GAMEOBJECT_BYTES_1, 1, type); }
         GOState GetGoState() const { return GOState(GetByteValue(GAMEOBJECT_BYTES_1, 0)); }
-        void SetGoState(GOState state) { SetByteValue(GAMEOBJECT_BYTES_1, 0, state); }
+        void SetGoState(GOState state);
         uint8 GetGoArtKit() const { return GetByteValue(GAMEOBJECT_BYTES_1, 2); }
         void SetGoArtKit(uint8 artkit) { SetByteValue(GAMEOBJECT_BYTES_1, 2, artkit); }
         uint8 GetGoAnimProgress() const { return GetByteValue(GAMEOBJECT_BYTES_1, 3); }
         void SetGoAnimProgress(uint8 animprogress) { SetByteValue(GAMEOBJECT_BYTES_1, 3, animprogress); }
         uint32 GetDisplayId() const { return GetUInt32Value(GAMEOBJECT_DISPLAYID); }
         void SetDisplayId(uint32 modelId);
+        void SetPhaseMask(uint32 newPhaseMask, bool update);
+        void EnableCollision(bool enable);
+        bool CalculateCurrentCollisionState() const;
 
         float GetObjectBoundingRadius() const;              // overwrite WorldObject version
 
         void Use(Unit* user);
 
         LootState getLootState() const { return m_lootState; }
-        void SetLootState(LootState s) { m_lootState = s; }
+        void SetLootState(LootState s);
 
         void AddToSkillupList(Player* player);
         bool IsInSkillupList(Player* player) const;
@@ -715,32 +741,20 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
 
         uint32 GetUseCount() const { return m_useTimes; }
         uint32 GetUniqueUseCount() const { return m_UniqueUsers.size(); }
+        uint32 GetCapturePointTicks() const { return m_captureTicks; }
 
         void SaveRespawnTime();
 
-        // Loot System
-        Loot loot;
-        void getFishLoot(Loot* loot, Player* loot_owner);
-        void StartGroupLoot(Group* group, uint32 timer);
-
-        ObjectGuid GetLootRecipientGuid() const { return m_lootRecipientGuid; }
-        uint32 GetLootGroupRecipientId() const { return m_lootGroupRecipientId; }
-        Player* GetLootRecipient() const;                   // use group cases as prefered
-        Group* GetGroupLootRecipient() const;
-        bool HasLootRecipient() const { return m_lootGroupRecipientId || !m_lootRecipientGuid.IsEmpty(); }
-        bool IsGroupLootRecipient() const { return m_lootGroupRecipientId; }
-        void SetLootRecipient(Unit* pUnit);
-        Player* GetOriginalLootRecipient() const;           // ignore group changes/etc, not for looting
-
         bool HasQuest(uint32 quest_id) const;
         bool HasInvolvedQuest(uint32 quest_id) const;
-        bool ActivateToQuest(Player *pTarget) const;
+        bool ActivateToQuest(Player* pTarget) const;
         void UseDoorOrButton(uint32 time_to_restore = 0, bool alternative = false);
-                                                            // 0 = use `gameobject`.`spawntimesecs`
+        // 0 = use `gameobject`.`spawntimesecs`
         void ResetDoorOrButton();
+        void ResetCapturePoint();
 
-        bool IsHostileTo(Unit const* unit) const;
-        bool IsFriendlyTo(Unit const* unit) const;
+        virtual bool IsHostileTo(Unit const* unit) const override;
+        virtual bool IsFriendlyTo(Unit const* unit) const override;
 
         void SummonLinkedTrapIfAny();
         void TriggerLinkedGameObject(Unit* target);
@@ -749,41 +763,61 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
 
         GameObject* LookupFishingHoleAround(float range);
 
-        GridReference<GameObject> &GetGridRef() { return m_gridRef; }
+        void SetCapturePointSlider(int8 value);
+
+        GridReference<GameObject>& GetGridRef() { return m_gridRef; }
+
+        bool IsInRange(float x, float y, float z, float radius) const;
+
+        void DealGameObjectDamage(uint32 damage, uint32 spell, Unit* caster);
+        void DamageTaken(Unit* pWho, int32 uiDamage, uint32 spellId = 0);
+        void Rebuild(Unit* pWho, uint32 spellId = 0);
+        uint32 GetHealth() const { return m_health; }
+        uint32 GetMaxHealth() const { return m_goInfo->destructibleBuilding.intactNumHits + m_goInfo->destructibleBuilding.damagedNumHits; }
+
+        float GetDeterminativeSize(bool b_priorityZ = false) const;
+        uint32 GetLinkedWorldState(bool stateId = false);
+        void SetLinkedWorldState(uint32 value);
+        Team GetTeam() const;
+        bool SetTeam(Team team);
+
+        void UpdateSplineMovement(uint32 t_diff);
+
+        GameObjectModel* m_model;
 
     protected:
+        uint32      m_captureTime;
+        float       m_captureTicks;
         uint32      m_spellId;
         time_t      m_respawnTime;                          // (secs) time of next respawn (or despawn if GO have owner()),
         uint32      m_respawnDelayTime;                     // (secs) if 0 then current GO state no dependent from timer
         LootState   m_lootState;
         bool        m_spawnedByDefault;
         time_t      m_cooldownTime;                         // used as internal reaction delay time store (not state change reaction).
-                                                            // For traps/goober this: spell casting cooldown, for doors/buttons: reset time.
+        uint32      m_health;
+        // For traps/goober this: spell casting cooldown, for doors/buttons: reset time.
 
-        typedef std::set<ObjectGuid> GuidsSet;
+        uint32      m_captureTimer;                         // (msecs) timer used for capture points
+        float       m_captureSlider;
+        CapturePointState m_captureState;
 
-        GuidsSet m_SkillupSet;                              // players that already have skill-up at GO use
+        GuidSet m_SkillupSet;                               // players that already have skill-up at GO use
 
         uint32 m_useTimes;                                  // amount uses/charges triggered
 
         // collected only for GAMEOBJECT_TYPE_SUMMONING_RITUAL
         ObjectGuid m_firstUser;                             // first GO user, in most used cases owner, but in some cases no, for example non-summoned multi-use GAMEOBJECT_TYPE_SUMMONING_RITUAL
-        GuidsSet m_UniqueUsers;                             // all players who use item, some items activated after specific amount unique uses
+        GuidSet m_UniqueUsers;                              // all players who use item, some items activated after specific amount unique uses
 
         GameObjectInfo const* m_goInfo;
         GameObjectDisplayInfoEntry const* m_displayInfo;
         int64 m_packedRotation;
         QuaternionData m_worldRotation;
 
-        // Loot System
-        uint32 m_groupLootTimer;                            // (msecs)timer used for group loot
-        uint32 m_groupLootId;                               // used to find group which is looting
-        void StopGroupLoot();
-        ObjectGuid m_lootRecipientGuid;                     // player who will have rights for looting if m_lootGroupRecipient==0 or group disbanded
-        uint32 m_lootGroupRecipientId;                      // group who will have rights for looting if set and exist
-
     private:
         void SwitchDoorOrButton(bool activate, bool alternative = false);
+        void UpdateModel();                                 // updates model in case displayId were changed
+        void TickCapturePoint();
 
         GridReference<GameObject> m_gridRef;
 };
diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp
index 5a19f1e9cff..65be59cb220 100644
--- a/src/game/GossipDef.cpp
+++ b/src/game/GossipDef.cpp
@@ -37,6 +37,8 @@ GossipMenu::~GossipMenu()
 
 void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, uint32 dtSender, uint32 dtAction, const std::string& BoxMessage, uint32 BoxMoney, bool Coded)
 {
+    if (m_gItems.size() <= GOSSIP_MAX_MENU_ITEMS)
+    {
     MANGOS_ASSERT( m_gItems.size() <= GOSSIP_MAX_MENU_ITEMS  );
 
     GossipMenuItem gItem;
@@ -50,6 +52,11 @@ void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, uint32 dtSe
     gItem.m_gBoxMoney   = BoxMoney;
 
     m_gItems.push_back(gItem);
+    }
+    else
+    {
+        sLog.outError("Gossip menu item list overflow! Skipping adding item.");
+    }
 }
 
 void GossipMenu::AddGossipMenuItemData(int32 action_menu, uint32 action_poi, uint32 action_script)
@@ -65,7 +72,7 @@ void GossipMenu::AddGossipMenuItemData(int32 action_menu, uint32 action_poi, uin
 
 void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, bool Coded)
 {
-    AddMenuItem( Icon, Message, 0, 0, "", 0, Coded);
+    AddMenuItem(Icon, Message, 0, 0, "", 0, Coded);
 }
 
 void GossipMenu::AddMenuItem(uint8 Icon, char const* Message, bool Coded)
@@ -88,25 +95,25 @@ void GossipMenu::AddMenuItem(uint8 Icon, int32 itemText, uint32 dtSender, uint32
     AddMenuItem(Icon, std::string(item_text), dtSender, dtAction, std::string(box_text), BoxMoney, Coded);
 }
 
-uint32 GossipMenu::MenuItemSender( unsigned int ItemId )
+uint32 GossipMenu::MenuItemSender(unsigned int ItemId)
 {
-    if ( ItemId >= m_gItems.size() )
+    if (ItemId >= m_gItems.size())
         return 0;
 
     return m_gItems[ ItemId ].m_gSender;
 }
 
-uint32 GossipMenu::MenuItemAction( unsigned int ItemId )
+uint32 GossipMenu::MenuItemAction(unsigned int ItemId)
 {
-    if ( ItemId >= m_gItems.size() )
+    if (ItemId >= m_gItems.size())
         return 0;
 
     return m_gItems[ ItemId ].m_gOptionId;
 }
 
-bool GossipMenu::MenuItemCoded( unsigned int ItemId )
+bool GossipMenu::MenuItemCoded(unsigned int ItemId)
 {
-    if ( ItemId >= m_gItems.size() )
+    if (ItemId >= m_gItems.size())
         return 0;
 
     return m_gItems[ ItemId ].m_gCoded;
@@ -119,7 +126,7 @@ void GossipMenu::ClearMenu()
     m_gMenuId = 0;
 }
 
-PlayerMenu::PlayerMenu(WorldSession *session) : mGossipMenu(session)
+PlayerMenu::PlayerMenu(WorldSession* session) : mGossipMenu(session)
 {
 }
 
@@ -134,19 +141,19 @@ void PlayerMenu::ClearMenus()
     mQuestMenu.ClearMenu();
 }
 
-uint32 PlayerMenu::GossipOptionSender( unsigned int Selection )
+uint32 PlayerMenu::GossipOptionSender(unsigned int Selection)
 {
-    return mGossipMenu.MenuItemSender( Selection );
+    return mGossipMenu.MenuItemSender(Selection);
 }
 
-uint32 PlayerMenu::GossipOptionAction( unsigned int Selection )
+uint32 PlayerMenu::GossipOptionAction(unsigned int Selection)
 {
-    return mGossipMenu.MenuItemAction( Selection );
+    return mGossipMenu.MenuItemAction(Selection);
 }
 
-bool PlayerMenu::GossipOptionCoded( unsigned int Selection )
+bool PlayerMenu::GossipOptionCoded(unsigned int Selection)
 {
-    return mGossipMenu.MenuItemCoded( Selection );
+    return mGossipMenu.MenuItemCoded(Selection);
 }
 
 void PlayerMenu::SendGossipMenu(uint32 TitleTextId, ObjectGuid objectGuid)
@@ -157,7 +164,7 @@ void PlayerMenu::SendGossipMenu(uint32 TitleTextId, ObjectGuid objectGuid)
     data << uint32(TitleTextId);
     data << uint32(mGossipMenu.MenuItemCount());            // max count 0x20
 
-    for (uint32 iI = 0; iI < mGossipMenu.MenuItemCount(); ++iI )
+    for (uint32 iI = 0; iI < mGossipMenu.MenuItemCount(); ++iI)
     {
         GossipMenuItem const& gItem = mGossipMenu.GetItem(iI);
         data << uint32(iI);
@@ -189,22 +196,22 @@ void PlayerMenu::SendGossipMenu(uint32 TitleTextId, ObjectGuid objectGuid)
         data << title;                                      // max 0x200
     }
 
-    GetMenuSession()->SendPacket( &data );
-    //DEBUG_LOG( "WORLD: Sent SMSG_GOSSIP_MESSAGE NPCGuid=%u",GUID_LOPART(npcGUID) );
+    GetMenuSession()->SendPacket(&data);
+    // DEBUG_LOG( "WORLD: Sent SMSG_GOSSIP_MESSAGE NPCGuid=%u",GUID_LOPART(npcGUID) );
 }
 
 void PlayerMenu::CloseGossip()
 {
-    WorldPacket data( SMSG_GOSSIP_COMPLETE, 0 );
-    GetMenuSession()->SendPacket( &data );
+    WorldPacket data(SMSG_GOSSIP_COMPLETE, 0);
+    GetMenuSession()->SendPacket(&data);
 
-    //DEBUG_LOG( "WORLD: Sent SMSG_GOSSIP_COMPLETE" );
+    // DEBUG_LOG( "WORLD: Sent SMSG_GOSSIP_COMPLETE" );
 }
 
 // Outdated
-void PlayerMenu::SendPointOfInterest( float X, float Y, uint32 Icon, uint32 Flags, uint32 Data, char const * locName )
+void PlayerMenu::SendPointOfInterest(float X, float Y, uint32 Icon, uint32 Flags, uint32 Data, char const* locName)
 {
-    WorldPacket data( SMSG_GOSSIP_POI, (4+4+4+4+4+10) );    // guess size
+    WorldPacket data(SMSG_GOSSIP_POI, (4 + 4 + 4 + 4 + 4 + 10)); // guess size
     data << uint32(Flags);
     data << float(X);
     data << float(Y);
@@ -212,16 +219,16 @@ void PlayerMenu::SendPointOfInterest( float X, float Y, uint32 Icon, uint32 Flag
     data << uint32(Data);
     data << locName;
 
-    GetMenuSession()->SendPacket( &data );
-    //DEBUG_LOG("WORLD: Sent SMSG_GOSSIP_POI");
+    GetMenuSession()->SendPacket(&data);
+    // DEBUG_LOG("WORLD: Sent SMSG_GOSSIP_POI");
 }
 
-void PlayerMenu::SendPointOfInterest( uint32 poi_id )
+void PlayerMenu::SendPointOfInterest(uint32 poi_id)
 {
     PointOfInterest const* poi = sObjectMgr.GetPointOfInterest(poi_id);
-    if(!poi)
+    if (!poi)
     {
-        sLog.outErrorDb("Requested send nonexistent POI (Id: %u), ignore.",poi_id);
+        sLog.outErrorDb("Requested send nonexistent POI (Id: %u), ignore.", poi_id);
         return;
     }
 
@@ -229,11 +236,11 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
 
     int loc_idx = GetMenuSession()->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
-        if (PointOfInterestLocale const *pl = sObjectMgr.GetPointOfInterestLocale(poi_id))
+        if (PointOfInterestLocale const* pl = sObjectMgr.GetPointOfInterestLocale(poi_id))
             if (pl->IconName.size() > size_t(loc_idx) && !pl->IconName[loc_idx].empty())
                 icon_name = pl->IconName[loc_idx];
 
-    WorldPacket data( SMSG_GOSSIP_POI, (4+4+4+4+4+10) );    // guess size
+    WorldPacket data(SMSG_GOSSIP_POI, (4 + 4 + 4 + 4 + 4 + 10)); // guess size
     data << uint32(poi->flags);
     data << float(poi->x);
     data << float(poi->y);
@@ -241,20 +248,20 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
     data << uint32(poi->data);
     data << icon_name;
 
-    GetMenuSession()->SendPacket( &data );
-    //DEBUG_LOG("WORLD: Sent SMSG_GOSSIP_POI");
+    GetMenuSession()->SendPacket(&data);
+    // DEBUG_LOG("WORLD: Sent SMSG_GOSSIP_POI");
 }
 
-void PlayerMenu::SendTalking( uint32 textID )
+void PlayerMenu::SendTalking(uint32 textID)
 {
     GossipText const* pGossip = sObjectMgr.GetGossipText(textID);
 
-    WorldPacket data( SMSG_NPC_TEXT_UPDATE, 100 );          // guess size
+    WorldPacket data(SMSG_NPC_TEXT_UPDATE, 100);            // guess size
     data << textID;                                         // can be < 0
 
     if (!pGossip)
     {
-        for(uint32 i = 0; i < 8; ++i)
+        for (uint32 i = 0; i < 8; ++i)
         {
             data << float(0);
             data << "Greetings $N";
@@ -297,23 +304,23 @@ void PlayerMenu::SendTalking( uint32 textID )
 
             data << pGossip->Options[i].Language;
 
-            for(int j = 0; j < 3; ++j)
+            for (int j = 0; j < 3; ++j)
             {
                 data << pGossip->Options[i].Emotes[j]._Delay;
                 data << pGossip->Options[i].Emotes[j]._Emote;
             }
         }
     }
-    GetMenuSession()->SendPacket( &data );
+    GetMenuSession()->SendPacket(&data);
 
-    DEBUG_LOG(  "WORLD: Sent SMSG_NPC_TEXT_UPDATE " );
+    DEBUG_LOG("WORLD: Sent SMSG_NPC_TEXT_UPDATE ");
 }
 
-void PlayerMenu::SendTalking( char const * title, char const * text )
+void PlayerMenu::SendTalking(char const* title, char const* text)
 {
-    WorldPacket data( SMSG_NPC_TEXT_UPDATE, 50 );           // guess size
+    WorldPacket data(SMSG_NPC_TEXT_UPDATE, 50);             // guess size
     data << uint32(0);
-    for(uint32 i = 0; i < 8; ++i)
+    for (uint32 i = 0; i < 8; ++i)
     {
         data << float(0);
         data << title;
@@ -327,9 +334,9 @@ void PlayerMenu::SendTalking( char const * title, char const * text )
         data << uint32(0);
     }
 
-    GetMenuSession()->SendPacket( &data );
+    GetMenuSession()->SendPacket(&data);
 
-    DEBUG_LOG( "WORLD: Sent SMSG_NPC_TEXT_UPDATE " );
+    DEBUG_LOG("WORLD: Sent SMSG_NPC_TEXT_UPDATE ");
 }
 
 /*********************************************************/
@@ -346,13 +353,13 @@ QuestMenu::~QuestMenu()
     ClearMenu();
 }
 
-void QuestMenu::AddMenuItem( uint32 QuestId, uint8 Icon)
+void QuestMenu::AddMenuItem(uint32 QuestId, uint8 Icon)
 {
     Quest const* qinfo = sObjectMgr.GetQuestTemplate(QuestId);
     if (!qinfo)
         return;
 
-    MANGOS_ASSERT( m_qItems.size() <= GOSSIP_MAX_MENU_ITEMS  );
+    MANGOS_ASSERT(m_qItems.size() <= GOSSIP_MAX_MENU_ITEMS);
 
     QuestMenuItem qItem;
 
@@ -362,10 +369,10 @@ void QuestMenu::AddMenuItem( uint32 QuestId, uint8 Icon)
     m_qItems.push_back(qItem);
 }
 
-bool QuestMenu::HasItem( uint32 questid )
+bool QuestMenu::HasItem(uint32 questid)
 {
     for (QuestMenuItemList::const_iterator i = m_qItems.begin(); i != m_qItems.end(); ++i)
-        if(i->m_qId == questid)
+        if (i->m_qId == questid)
             return true;
     return false;
 }
@@ -377,22 +384,22 @@ void QuestMenu::ClearMenu()
 
 void PlayerMenu::SendQuestGiverQuestList(QEmote eEmote, const std::string& Title, ObjectGuid npcGUID)
 {
-    WorldPacket data( SMSG_QUESTGIVER_QUEST_LIST, 100 );    // guess size
+    WorldPacket data(SMSG_QUESTGIVER_QUEST_LIST, 100);      // guess size
     data << ObjectGuid(npcGUID);
     data << Title;
-    data << uint32(eEmote._Delay );                         // player emote
-    data << uint32(eEmote._Emote );                         // NPC emote
+    data << uint32(eEmote._Delay);                          // player emote
+    data << uint32(eEmote._Emote);                          // NPC emote
 
     size_t count_pos = data.wpos();
-    data << uint8 ( mQuestMenu.MenuItemCount() );
+    data << uint8(mQuestMenu.MenuItemCount());
     uint32 count = 0;
-    for (; count < mQuestMenu.MenuItemCount(); ++count )
+    for (; count < mQuestMenu.MenuItemCount(); ++count)
     {
         QuestMenuItem const& qmi = mQuestMenu.GetItem(count);
 
         uint32 questID = qmi.m_qId;
 
-        if(Quest const *pQuest = sObjectMgr.GetQuestTemplate(questID))
+        if (Quest const* pQuest = sObjectMgr.GetQuestTemplate(questID))
         {
             int loc_idx = GetMenuSession()->GetSessionDbLocaleIndex();
             std::string title = pQuest->GetTitle();
@@ -407,18 +414,18 @@ void PlayerMenu::SendQuestGiverQuestList(QEmote eEmote, const std::string& Title
         }
     }
     data.put<uint8>(count_pos, count);
-    GetMenuSession()->SendPacket( &data );
+    GetMenuSession()->SendPacket(&data);
     DEBUG_LOG("WORLD: Sent SMSG_QUESTGIVER_QUEST_LIST NPC Guid = %s", npcGUID.GetString().c_str());
 }
 
-void PlayerMenu::SendQuestGiverStatus( uint8 questStatus, ObjectGuid npcGUID )
+void PlayerMenu::SendQuestGiverStatus(uint8 questStatus, ObjectGuid npcGUID)
 {
-    WorldPacket data( SMSG_QUESTGIVER_STATUS, 9 );
+    WorldPacket data(SMSG_QUESTGIVER_STATUS, 9);
     data << npcGUID;
     data << uint8(questStatus);
 
-    GetMenuSession()->SendPacket( &data );
-    DEBUG_LOG( "WORLD: Sent SMSG_QUESTGIVER_STATUS for %s", npcGUID.GetString().c_str());
+    GetMenuSession()->SendPacket(&data);
+    DEBUG_LOG("WORLD: Sent SMSG_QUESTGIVER_STATUS for %s", npcGUID.GetString().c_str());
 }
 
 void PlayerMenu::SendQuestGiverQuestDetails(Quest const* pQuest, ObjectGuid guid, bool ActivateAccept)
@@ -430,7 +437,7 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* pQuest, ObjectGuid guid
     int loc_idx = GetMenuSession()->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
-        if (QuestLocale const *ql = sObjectMgr.GetQuestLocale(pQuest->GetQuestId()))
+        if (QuestLocale const* ql = sObjectMgr.GetQuestLocale(pQuest->GetQuestId()))
         {
             if (ql->Title.size() > (size_t)loc_idx && !ql->Title[loc_idx].empty())
                 Title = ql->Title[loc_idx];
@@ -520,15 +527,15 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* pQuest, ObjectGuid guid
     data << uint32(0);                                      // bonus arena points
     data << uint32(0);                                      // rep reward show mask?
 
-    for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)        // reward factions ids
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)       // reward factions ids
         data << uint32(pQuest->RewRepFaction[i]);
 
-    for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)        // columnid in QuestFactionReward.dbc (if negative, from second row)
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)       // columnid in QuestFactionReward.dbc (if negative, from second row)
         data << int32(pQuest->RewRepValueId[i]);
 
-    for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)        // reward reputation override. No bonus is expected given
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)       // reward reputation override. No bonus is expected given
         data << int32(0);
-        //data << int32(pQuest->RewRepValue[i]);            // current field for store of rep value, can be reused to implement "override value"
+    // data << int32(pQuest->RewRepValue[i]);            // current field for store of rep value, can be reused to implement "override value"
 
     data << uint32(QUEST_EMOTE_COUNT);
 
@@ -538,13 +545,13 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* pQuest, ObjectGuid guid
         data << uint32(pQuest->DetailsEmoteDelay[i]);       // DetailsEmoteDelay (in ms)
     }
 
-    GetMenuSession()->SendPacket( &data );
+    GetMenuSession()->SendPacket(&data);
 
     DEBUG_LOG("WORLD: Sent SMSG_QUESTGIVER_QUEST_DETAILS - for %s of %s, questid = %u", GetMenuSession()->GetPlayer()->GetGuidStr().c_str(), guid.GetString().c_str(), pQuest->GetQuestId());
 }
 
 // send only static data in this packet!
-void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
+void PlayerMenu::SendQuestQueryResponse(Quest const* pQuest)
 {
     std::string Title, Details, Objectives, EndText, CompletedText;
     std::string ObjectiveText[QUEST_OBJECTIVES_COUNT];
@@ -560,7 +567,7 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
     int loc_idx = GetMenuSession()->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
-        if (QuestLocale const *ql = sObjectMgr.GetQuestLocale(pQuest->GetQuestId()))
+        if (QuestLocale const* ql = sObjectMgr.GetQuestLocale(pQuest->GetQuestId()))
         {
             if (ql->Title.size() > (size_t)loc_idx && !ql->Title[loc_idx].empty())
                 Title = ql->Title[loc_idx];
@@ -573,13 +580,13 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
             if (ql->CompletedText.size() > (size_t)loc_idx && !ql->CompletedText[loc_idx].empty())
                 CompletedText = ql->CompletedText[loc_idx];
 
-            for (int i = 0;i < QUEST_OBJECTIVES_COUNT; ++i)
+            for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
                 if (ql->ObjectiveText[i].size() > (size_t)loc_idx && !ql->ObjectiveText[i][loc_idx].empty())
                     ObjectiveText[i] = ql->ObjectiveText[i][loc_idx];
         }
     }
 
-    WorldPacket data( SMSG_QUEST_QUERY_RESPONSE, 100 );     // guess size
+    WorldPacket data(SMSG_QUEST_QUERY_RESPONSE, 100);       // guess size
 
     data << uint32(pQuest->GetQuestId());                   // quest id
     data << uint32(pQuest->GetQuestMethod());               // Accepted values: 0, 1 or 2. 0==IsAutoComplete() (skip objectives/details)
@@ -643,15 +650,15 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
         }
     }
 
-    for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)        // reward factions ids
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)       // reward factions ids
         data << uint32(pQuest->RewRepFaction[i]);
 
-    for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)        // columnid in QuestFactionReward.dbc (if negative, from second row)
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)       // columnid in QuestFactionReward.dbc (if negative, from second row)
         data << int32(pQuest->RewRepValueId[i]);
 
-    for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)        // reward reputation override. No bonus is expected given
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)       // reward reputation override. No bonus is expected given
         data << int32(0);
-        //data << int32(pQuest->RewRepValue[i]);            // current field for store of rep value, can be reused to implement "override value"
+    // data << int32(pQuest->RewRepValue[i]);            // current field for store of rep value, can be reused to implement "override value"
 
     data << pQuest->GetPointMapId();
     data << pQuest->GetPointX();
@@ -669,7 +676,7 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
         if (pQuest->ReqCreatureOrGOId[iI] < 0)
         {
             // client expected gameobject template id in form (id|0x80000000)
-            data << uint32((pQuest->ReqCreatureOrGOId[iI]*(-1))|0x80000000);
+            data << uint32((pQuest->ReqCreatureOrGOId[iI] * (-1)) | 0x80000000);
         }
         else
         {
@@ -689,9 +696,9 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
     for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; ++iI)
         data << ObjectiveText[iI];
 
-    GetMenuSession()->SendPacket( &data );
+    GetMenuSession()->SendPacket(&data);
 
-    DEBUG_LOG( "WORLD: Sent SMSG_QUEST_QUERY_RESPONSE questid=%u", pQuest->GetQuestId() );
+    DEBUG_LOG("WORLD: Sent SMSG_QUEST_QUERY_RESPONSE questid=%u", pQuest->GetQuestId());
 }
 
 void PlayerMenu::SendQuestGiverOfferReward(Quest const* pQuest, ObjectGuid npcGUID, bool EnableNext)
@@ -702,7 +709,7 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* pQuest, ObjectGuid npcGU
     int loc_idx = GetMenuSession()->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
-        if (QuestLocale const *ql = sObjectMgr.GetQuestLocale(pQuest->GetQuestId()))
+        if (QuestLocale const* ql = sObjectMgr.GetQuestLocale(pQuest->GetQuestId()))
         {
             if (ql->Title.size() > (size_t)loc_idx && !ql->Title[loc_idx].empty())
                 Title = ql->Title[loc_idx];
@@ -711,7 +718,7 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* pQuest, ObjectGuid npcGU
         }
     }
 
-    WorldPacket data( SMSG_QUESTGIVER_OFFER_REWARD, 50 );   // guess size
+    WorldPacket data(SMSG_QUESTGIVER_OFFER_REWARD, 50);     // guess size
 
     data << ObjectGuid(npcGUID);
     data << uint32(pQuest->GetQuestId());
@@ -725,7 +732,7 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* pQuest, ObjectGuid npcGU
     uint32 EmoteCount = 0;
     for (uint32 i = 0; i < QUEST_EMOTE_COUNT; ++i)
     {
-        if(pQuest->OfferRewardEmote[i] <= 0)
+        if (pQuest->OfferRewardEmote[i] <= 0)
             break;
         ++EmoteCount;
     }
@@ -737,17 +744,17 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* pQuest, ObjectGuid npcGU
         data << uint32(pQuest->OfferRewardEmote[i]);
     }
 
-    ItemPrototype const *pItem;
+    ItemPrototype const* pItem;
 
     data << uint32(pQuest->GetRewChoiceItemsCount());
     for (uint32 i = 0; i < pQuest->GetRewChoiceItemsCount(); ++i)
     {
-        pItem = ObjectMgr::GetItemPrototype( pQuest->RewChoiceItemId[i] );
+        pItem = ObjectMgr::GetItemPrototype(pQuest->RewChoiceItemId[i]);
 
         data << uint32(pQuest->RewChoiceItemId[i]);
         data << uint32(pQuest->RewChoiceItemCount[i]);
 
-        if ( pItem )
+        if (pItem)
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
@@ -760,7 +767,7 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* pQuest, ObjectGuid npcGU
         data << uint32(pQuest->RewItemId[i]);
         data << uint32(pQuest->RewItemCount[i]);
 
-        if ( pItem )
+        if (pItem)
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
@@ -776,7 +783,7 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* pQuest, ObjectGuid npcGU
     data << uint32(pQuest->XPValue(GetMenuSession()->GetPlayer()));
 
     // TODO: fixme. rewarded honor points. Multiply with 10 to satisfy client
-    data << uint32(10*MaNGOS::Honor::hk_honor_at_level(GetMenuSession()->GetPlayer()->getLevel(), pQuest->GetRewHonorAddition()));
+    data << uint32(10 * MaNGOS::Honor::hk_honor_at_level(GetMenuSession()->GetPlayer()->getLevel(), pQuest->GetRewHonorAddition()));
     data << float(pQuest->GetRewHonorMultiplier());
 
     data << uint32(0x08);                                   // unused by client?
@@ -787,21 +794,21 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* pQuest, ObjectGuid npcGU
     data << uint32(0);                                      // bonus arena points
     data << uint32(0);                                      // rew rep show mask?
 
-    for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)        // reward factions ids
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)       // reward factions ids
         data << uint32(pQuest->RewRepFaction[i]);
 
-    for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)        // columnid in QuestFactionReward.dbc (if negative, from second row)
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)       // columnid in QuestFactionReward.dbc (if negative, from second row)
         data << int32(pQuest->RewRepValueId[i]);
 
-    for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)        // reward reputation override. No diplomacy bonus is expected given, reward also does not display in chat window
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)       // reward reputation override. No diplomacy bonus is expected given, reward also does not display in chat window
         data << int32(0);
-        //data << int32(pQuest->RewRepValue[i]);
+    // data << int32(pQuest->RewRepValue[i]);
 
     GetMenuSession()->SendPacket(&data);
     DEBUG_LOG("WORLD: Sent SMSG_QUESTGIVER_OFFER_REWARD NPCGuid = %s, questid = %u", npcGUID.GetString().c_str(), pQuest->GetQuestId());
 }
 
-void PlayerMenu::SendQuestGiverRequestItems(Quest const *pQuest, ObjectGuid npcGUID, bool Completable, bool CloseOnCancel)
+void PlayerMenu::SendQuestGiverRequestItems(Quest const* pQuest, ObjectGuid npcGUID, bool Completable, bool CloseOnCancel)
 {
     // We can always call to RequestItems, but this packet only goes out if there are actually
     // items.  Otherwise, we'll skip straight to the OfferReward
@@ -812,7 +819,7 @@ void PlayerMenu::SendQuestGiverRequestItems(Quest const *pQuest, ObjectGuid npcG
     int loc_idx = GetMenuSession()->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
-        if (QuestLocale const *ql = sObjectMgr.GetQuestLocale(pQuest->GetQuestId()))
+        if (QuestLocale const* ql = sObjectMgr.GetQuestLocale(pQuest->GetQuestId()))
         {
             if (ql->Title.size() > (size_t)loc_idx && !ql->Title[loc_idx].empty())
                 Title = ql->Title[loc_idx];
@@ -827,7 +834,7 @@ void PlayerMenu::SendQuestGiverRequestItems(Quest const *pQuest, ObjectGuid npcG
         return;
     }
 
-    WorldPacket data( SMSG_QUESTGIVER_REQUEST_ITEMS, 50 );  // guess size
+    WorldPacket data(SMSG_QUESTGIVER_REQUEST_ITEMS, 50);    // guess size
     data << ObjectGuid(npcGUID);
     data << uint32(pQuest->GetQuestId());
     data << Title;
@@ -835,7 +842,7 @@ void PlayerMenu::SendQuestGiverRequestItems(Quest const *pQuest, ObjectGuid npcG
 
     data << uint32(0x00);                                   // emote delay
 
-    if(Completable)
+    if (Completable)
         data << pQuest->GetCompleteEmote();                 // emote id
     else
         data << pQuest->GetIncompleteEmote();
@@ -852,23 +859,23 @@ void PlayerMenu::SendQuestGiverRequestItems(Quest const *pQuest, ObjectGuid npcG
     // Required Money
     data << uint32(pQuest->GetRewOrReqMoney() < 0 ? -pQuest->GetRewOrReqMoney() : 0);
 
-    data << uint32( pQuest->GetReqItemsCount() );
-    ItemPrototype const *pItem;
+    data << uint32(pQuest->GetReqItemsCount());
+    ItemPrototype const* pItem;
     for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
     {
-        if ( !pQuest->ReqItemId[i] )
+        if (!pQuest->ReqItemId[i])
             continue;
         pItem = ObjectMgr::GetItemPrototype(pQuest->ReqItemId[i]);
         data << uint32(pQuest->ReqItemId[i]);
         data << uint32(pQuest->ReqItemCount[i]);
 
-        if ( pItem )
+        if (pItem)
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
     }
 
-    if ( !Completable )                                     // Completable = flags1 && flags2 && flags3 && flags4
+    if (!Completable)                                       // Completable = flags1 && flags2 && flags3 && flags4
         data << uint32(0x00);                               // flags1
     else
         data << uint32(0x03);
@@ -877,6 +884,6 @@ void PlayerMenu::SendQuestGiverRequestItems(Quest const *pQuest, ObjectGuid npcG
     data << uint32(0x08);                                   // flags3
     data << uint32(0x10);                                   // flags4
 
-    GetMenuSession()->SendPacket( &data );
+    GetMenuSession()->SendPacket(&data);
     DEBUG_LOG("WORLD: Sent SMSG_QUESTGIVER_REQUEST_ITEMS NPCGuid = %s, questid = %u", npcGUID.GetString().c_str(), pQuest->GetQuestId());
 }
diff --git a/src/game/GossipDef.h b/src/game/GossipDef.h
index 4381aa54d20..2b6d4f70752 100644
--- a/src/game/GossipDef.h
+++ b/src/game/GossipDef.h
@@ -26,8 +26,8 @@
 
 class WorldSession;
 
-#define GOSSIP_MAX_MENU_ITEMS 64                            // client supported items unknown, but provided number must be enough
-#define DEFAULT_GOSSIP_MESSAGE              0xffffff
+#define GOSSIP_MAX_MENU_ITEMS       32                      // client supports showing max 32 items
+#define DEFAULT_GOSSIP_MESSAGE      0xffffff
 
 enum Gossip_Option
 {
@@ -55,19 +55,19 @@ enum Gossip_Option
 
 enum GossipOptionIcon
 {
-    GOSSIP_ICON_CHAT                = 0,                    //white chat bubble
-    GOSSIP_ICON_VENDOR              = 1,                    //brown bag
-    GOSSIP_ICON_TAXI                = 2,                    //flight
-    GOSSIP_ICON_TRAINER             = 3,                    //book
-    GOSSIP_ICON_INTERACT_1          = 4,                    //interaction wheel
-    GOSSIP_ICON_INTERACT_2          = 5,                    //interaction wheel
-    GOSSIP_ICON_MONEY_BAG           = 6,                    //brown bag with yellow dot
-    GOSSIP_ICON_TALK                = 7,                    //white chat bubble with black dots
-    GOSSIP_ICON_TABARD              = 8,                    //tabard
-    GOSSIP_ICON_BATTLE              = 9,                    //two swords
-    GOSSIP_ICON_DOT                 = 10,                   //yellow dot
-    GOSSIP_ICON_CHAT_11             = 11,                   //This and below are most the same visual as GOSSIP_ICON_CHAT
-    GOSSIP_ICON_CHAT_12             = 12,                   //but are still used for unknown reasons.
+    GOSSIP_ICON_CHAT                = 0,                    // white chat bubble
+    GOSSIP_ICON_VENDOR              = 1,                    // brown bag
+    GOSSIP_ICON_TAXI                = 2,                    // flight
+    GOSSIP_ICON_TRAINER             = 3,                    // book
+    GOSSIP_ICON_INTERACT_1          = 4,                    // interaction wheel
+    GOSSIP_ICON_INTERACT_2          = 5,                    // interaction wheel
+    GOSSIP_ICON_MONEY_BAG           = 6,                    // brown bag with yellow dot
+    GOSSIP_ICON_TALK                = 7,                    // white chat bubble with black dots
+    GOSSIP_ICON_TABARD              = 8,                    // tabard
+    GOSSIP_ICON_BATTLE              = 9,                    // two swords
+    GOSSIP_ICON_DOT                 = 10,                   // yellow dot
+    GOSSIP_ICON_CHAT_11             = 11,                   // This and below are most the same visual as GOSSIP_ICON_CHAT
+    GOSSIP_ICON_CHAT_12             = 12,                   // but are still used for unknown reasons.
     GOSSIP_ICON_CHAT_13             = 13,
     GOSSIP_ICON_CHAT_14             = 14,                   // probably invalid
     GOSSIP_ICON_CHAT_15             = 15,                   // probably invalid
@@ -79,7 +79,7 @@ enum GossipOptionIcon
     GOSSIP_ICON_MAX
 };
 
-//POI icons. Many more exist, list not complete.
+// POI icons. Many more exist, list not complete.
 enum Poi_Icon
 {
     ICON_POI_BLANK              =   0,                      // Blank (not visible), in 2.4.3 have value 15 with 1..15 values in 0..14 range
@@ -185,7 +185,7 @@ class MANGOS_DLL_SPEC GossipMenu
             return m_gItems.empty();
         }
 
-        GossipMenuItem const& GetItem( unsigned int Id )
+        GossipMenuItem const& GetItem(unsigned int Id)
         {
             return m_gItems[ Id ];
         }
@@ -195,9 +195,9 @@ class MANGOS_DLL_SPEC GossipMenu
             return m_gItemsData[indexId];
         }
 
-        uint32 MenuItemSender( unsigned int ItemId );
-        uint32 MenuItemAction( unsigned int ItemId );
-        bool MenuItemCoded( unsigned int ItemId );
+        uint32 MenuItemSender(unsigned int ItemId);
+        uint32 MenuItemAction(unsigned int ItemId);
+        bool MenuItemCoded(unsigned int ItemId);
 
         void ClearMenu();
 
@@ -219,7 +219,7 @@ class QuestMenu
         QuestMenu();
         ~QuestMenu();
 
-        void AddMenuItem( uint32 QuestId, uint8 Icon);
+        void AddMenuItem(uint32 QuestId, uint8 Icon);
         void ClearMenu();
 
         uint8 MenuItemCount() const
@@ -232,9 +232,9 @@ class QuestMenu
             return m_qItems.empty();
         }
 
-        bool HasItem( uint32 questid );
+        bool HasItem(uint32 questid);
 
-        QuestMenuItem const& GetItem( uint16 Id )
+        QuestMenuItem const& GetItem(uint16 Id)
         {
             return m_qItems[ Id ];
         }
@@ -250,7 +250,7 @@ class MANGOS_DLL_SPEC PlayerMenu
         QuestMenu  mQuestMenu;
 
     public:
-        explicit PlayerMenu(WorldSession *Session);
+        explicit PlayerMenu(WorldSession* Session);
         ~PlayerMenu();
 
         GossipMenu& GetGossipMenu() { return mGossipMenu; }
@@ -261,16 +261,16 @@ class MANGOS_DLL_SPEC PlayerMenu
         bool Empty() const { return mGossipMenu.Empty() && mQuestMenu.Empty(); }
 
         void ClearMenus();
-        uint32 GossipOptionSender( unsigned int Selection );
-        uint32 GossipOptionAction( unsigned int Selection );
-        bool GossipOptionCoded( unsigned int Selection );
+        uint32 GossipOptionSender(unsigned int Selection);
+        uint32 GossipOptionAction(unsigned int Selection);
+        bool GossipOptionCoded(unsigned int Selection);
 
         void SendGossipMenu(uint32 titleTextId, ObjectGuid objectGuid);
         void CloseGossip();
-        void SendPointOfInterest( float X, float Y, uint32 Icon, uint32 Flags, uint32 Data, const char * locName );
-        void SendPointOfInterest( uint32 poi_id );
-        void SendTalking( uint32 textID );
-        void SendTalking( char const * title, char const * text );
+        void SendPointOfInterest(float X, float Y, uint32 Icon, uint32 Flags, uint32 Data, const char* locName);
+        void SendPointOfInterest(uint32 poi_id);
+        void SendTalking(uint32 textID);
+        void SendTalking(char const* title, char const* text);
 
         /*********************************************************/
         /***                    QUEST SYSTEM                   ***/
@@ -279,10 +279,10 @@ class MANGOS_DLL_SPEC PlayerMenu
 
         void SendQuestGiverQuestList(QEmote eEmote, const std::string& Title, ObjectGuid npcGUID);
 
-        void SendQuestQueryResponse(Quest const *pQuest);
-        void SendQuestGiverQuestDetails(Quest const *pQuest, ObjectGuid npcGUID, bool ActivateAccept);
+        void SendQuestQueryResponse(Quest const* pQuest);
+        void SendQuestGiverQuestDetails(Quest const* pQuest, ObjectGuid npcGUID, bool ActivateAccept);
 
         void SendQuestGiverOfferReward(Quest const* pQuest, ObjectGuid npcGUID, bool EnbleNext);
-        void SendQuestGiverRequestItems(Quest const *pQuest, ObjectGuid npcGUID, bool Completable, bool CloseOnCancel);
+        void SendQuestGiverRequestItems(Quest const* pQuest, ObjectGuid npcGUID, bool Completable, bool CloseOnCancel);
 };
 #endif
diff --git a/src/game/GridDefines.h b/src/game/GridDefines.h
index 9e55d3149db..d14a7624e15 100644
--- a/src/game/GridDefines.h
+++ b/src/game/GridDefines.h
@@ -22,12 +22,14 @@
 #include "Common.h"
 #include "GameSystem/NGrid.h"
 #include <cmath>
+#include "ObjectHandler.h"
 
 // Forward class definitions
 class Corpse;
 class Creature;
 class DynamicObject;
 class GameObject;
+class WorldObject;
 class Pet;
 class Player;
 class Camera;
@@ -55,6 +57,13 @@ class Camera;
 #define MAP_SIZE                (SIZE_OF_GRIDS*MAX_NUMBER_OF_GRIDS)
 #define MAP_HALFSIZE            (MAP_SIZE/2)
 
+#define MAX_HEIGHT            100000.0f                     // can be use for find ground height at surface
+#define INVALID_HEIGHT       -100000.0f                     // for check, must be equal to VMAP_INVALID_HEIGHT, real value for unknown height is VMAP_INVALID_HEIGHT_VALUE
+#define INVALID_HEIGHT_VALUE -200000.0f                     // for return, must be equal to VMAP_INVALID_HEIGHT_VALUE, check value for unknown height is VMAP_INVALID_HEIGHT
+#define MAX_FALL_DISTANCE     250000.0f                     // "unlimited fall" to find VMap ground if it is available, just larger than MAX_HEIGHT - INVALID_HEIGHT
+#define DEFAULT_HEIGHT_SEARCH     10.0f                     // default search distance to find height at nearby locations
+#define DEFAULT_WATER_SEARCH      50.0f                     // default search distance to case detection water level
+
 // Creature used instead pet to simplify *::Visit templates (not required duplicate code for Creature->Pet case)
 // Cameras in world list just because linked with Player objects
 typedef TYPELIST_4(Player, Creature/*pets*/, Corpse/*resurrectable*/, Camera)           AllWorldObjectTypes;
@@ -68,20 +77,23 @@ typedef GridRefManager<DynamicObject>   DynamicObjectMapType;
 typedef GridRefManager<GameObject>      GameObjectMapType;
 typedef GridRefManager<Player>          PlayerMapType;
 
-typedef Grid<Player, AllWorldObjectTypes,AllGridObjectTypes> GridType;
+typedef Grid<Player, AllWorldObjectTypes, AllGridObjectTypes> GridType;
 typedef NGrid<MAX_NUMBER_OF_CELLS, Player, AllWorldObjectTypes, AllGridObjectTypes> NGridType;
+OBJECT_HANDLER(NGridType,GridPtr);
 
 typedef TypeMapContainer<AllGridObjectTypes> GridTypeMapContainer;
 typedef TypeMapContainer<AllWorldObjectTypes> WorldTypeMapContainer;
 
+typedef UNORDERED_SET<WorldObject*>     WorldObjectSet;
+
 template<const unsigned int LIMIT>
 struct MANGOS_DLL_DECL CoordPair
 {
-    CoordPair(uint32 x=0, uint32 y=0) : x_coord(x), y_coord(y) {}
-    CoordPair(const CoordPair<LIMIT> &obj) : x_coord(obj.x_coord), y_coord(obj.y_coord) {}
-    bool operator==(const CoordPair<LIMIT> &obj) const { return (obj.x_coord == x_coord && obj.y_coord == y_coord); }
-    bool operator!=(const CoordPair<LIMIT> &obj) const { return !operator==(obj); }
-    CoordPair<LIMIT>& operator=(const CoordPair<LIMIT> &obj)
+    CoordPair(uint32 x = 0, uint32 y = 0) : x_coord(x), y_coord(y) {}
+    CoordPair(const CoordPair<LIMIT>& obj) : x_coord(obj.x_coord), y_coord(obj.y_coord) {}
+    bool operator==(const CoordPair<LIMIT>& obj) const { return (obj.x_coord == x_coord && obj.y_coord == y_coord); }
+    bool operator!=(const CoordPair<LIMIT>& obj) const { return !operator==(obj); }
+    CoordPair<LIMIT>& operator=(const CoordPair<LIMIT>& obj)
     {
         x_coord = obj.x_coord;
         y_coord = obj.y_coord;
@@ -90,7 +102,7 @@ struct MANGOS_DLL_DECL CoordPair
 
     void operator<<(const uint32 val)
     {
-        if( x_coord > val )
+        if (x_coord > val)
             x_coord -= val;
         else
             x_coord = 0;
@@ -98,7 +110,7 @@ struct MANGOS_DLL_DECL CoordPair
 
     void operator>>(const uint32 val)
     {
-        if( x_coord+val < LIMIT )
+        if (x_coord + val < LIMIT)
             x_coord += val;
         else
             x_coord = LIMIT - 1;
@@ -106,7 +118,7 @@ struct MANGOS_DLL_DECL CoordPair
 
     void operator-=(const uint32 val)
     {
-        if( y_coord > val )
+        if (y_coord > val)
             y_coord -= val;
         else
             y_coord = 0;
@@ -114,7 +126,7 @@ struct MANGOS_DLL_DECL CoordPair
 
     void operator+=(const uint32 val)
     {
-        if( y_coord+val < LIMIT )
+        if (y_coord + val < LIMIT)
             y_coord += val;
         else
             y_coord = LIMIT - 1;
@@ -122,8 +134,8 @@ struct MANGOS_DLL_DECL CoordPair
 
     CoordPair& normalize()
     {
-        x_coord = std::min(x_coord, LIMIT-1);
-        y_coord = std::min(y_coord, LIMIT-1);
+        x_coord = std::min(x_coord, LIMIT - 1);
+        y_coord = std::min(y_coord, LIMIT - 1);
         return *this;
     }
 
@@ -137,14 +149,14 @@ typedef CoordPair<TOTAL_NUMBER_OF_CELLS_PER_MAP> CellPair;
 namespace MaNGOS
 {
     template<class RET_TYPE, int CENTER_VAL>
-        inline RET_TYPE Compute(float x, float y, float center_offset, float size)
+    inline RET_TYPE Compute(float x, float y, float center_offset, float size)
     {
         // calculate and store temporary values in double format for having same result as same mySQL calculations
-        double x_offset = (double(x) - center_offset)/size;
-        double y_offset = (double(y) - center_offset)/size;
+        double x_offset = (double(x) - center_offset) / size;
+        double y_offset = (double(y) - center_offset) / size;
 
-        int x_val = int(x_offset+CENTER_VAL + 0.5);
-        int y_val = int(y_offset+CENTER_VAL + 0.5);
+        int x_val = int(x_offset + CENTER_VAL + 0.5);
+        int y_val = int(y_offset + CENTER_VAL + 0.5);
         return RET_TYPE(x_val, y_val);
     }
 
@@ -158,11 +170,11 @@ namespace MaNGOS
         return Compute<CellPair, CENTER_GRID_CELL_ID>(x, y, CENTER_GRID_CELL_OFFSET, SIZE_OF_GRID_CELL);
     }
 
-    inline void NormalizeMapCoord(float &c)
+    inline void NormalizeMapCoord(float& c)
     {
-        if(c > MAP_HALFSIZE - 0.5)
+        if (c > MAP_HALFSIZE - 0.5)
             c = MAP_HALFSIZE - 0.5;
-        else if(c < -(MAP_HALFSIZE - 0.5))
+        else if (c < -(MAP_HALFSIZE - 0.5))
             c = -(MAP_HALFSIZE - 0.5);
     }
 
@@ -178,12 +190,12 @@ namespace MaNGOS
 
     inline bool IsValidMapCoord(float x, float y, float z)
     {
-        return IsValidMapCoord(x,y) && finite(z);
+        return IsValidMapCoord(x, y) && finite(z);
     }
 
     inline bool IsValidMapCoord(float x, float y, float z, float o)
     {
-        return IsValidMapCoord(x,y,z) && finite(o);
+        return IsValidMapCoord(x, y, z) && finite(o);
     }
 }
 #endif
diff --git a/src/game/GridMap.cpp b/src/game/GridMap.cpp
index ce35f0d5b76..dbdc11c297f 100644
--- a/src/game/GridMap.cpp
+++ b/src/game/GridMap.cpp
@@ -18,7 +18,8 @@
 
 #include "MapManager.h"
 #include "Log.h"
-#include "GridStates.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "Map.h"
 #include "DBCEnums.h"
@@ -27,11 +28,11 @@
 #include "VMapFactory.h"
 #include "MoveMap.h"
 #include "World.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Util.h"
 
 char const* MAP_MAGIC         = "MAPS";
-char const* MAP_VERSION_MAGIC = "v1.2";
+char const* MAP_VERSION_MAGIC = "v1.3";
 char const* MAP_AREA_MAGIC    = "AREA";
 char const* MAP_HEIGHT_MAGIC  = "MHGT";
 char const* MAP_LIQUID_MAGIC  = "MLIQ";
@@ -57,7 +58,8 @@ GridMap::GridMap()
     m_liquid_width  = 0;
     m_liquid_height = 0;
     m_liquidLevel = INVALID_HEIGHT_VALUE;
-    m_liquid_type = NULL;
+    m_liquidEntry = NULL;
+    m_liquidFlags = NULL;
     m_liquid_map  = NULL;
 }
 
@@ -66,21 +68,21 @@ GridMap::~GridMap()
     unloadData();
 }
 
-bool GridMap::loadData(char *filename)
+bool GridMap::loadData(char* filename)
 {
     // Unload old data if exist
     unloadData();
 
     GridMapFileHeader header;
     // Not return error if file not found
-    FILE *in = fopen(filename, "rb");
+    FILE* in = fopen(filename, "rb");
     if (!in)
         return true;
 
-    fread(&header, sizeof(header),1,in);
+    fread(&header, sizeof(header), 1, in);
     if (header.mapMagic     == *((uint32 const*)(MAP_MAGIC)) &&
-        header.versionMagic == *((uint32 const*)(MAP_VERSION_MAGIC)) &&
-        IsAcceptableClientBuild(header.buildMagic))
+            header.versionMagic == *((uint32 const*)(MAP_VERSION_MAGIC)) &&
+            IsAcceptableClientBuild(header.buildMagic))
     {
         // loadup area data
         if (header.areaMapOffset && !loadAreaData(in, header.areaMapOffset, header.areaMapSize))
@@ -126,8 +128,11 @@ void GridMap::unloadData()
     if (m_V8)
         delete[] m_V8;
 
-    if (m_liquid_type)
-        delete[] m_liquid_type;
+    if (m_liquidEntry)
+        delete[] m_liquidEntry;
+
+    if (m_liquidFlags)
+        delete[] m_liquidFlags;
 
     if (m_liquid_map)
         delete[] m_liquid_map;
@@ -135,12 +140,13 @@ void GridMap::unloadData()
     m_area_map = NULL;
     m_V9 = NULL;
     m_V8 = NULL;
-    m_liquid_type = NULL;
+    m_liquidEntry = NULL;
+    m_liquidFlags = NULL;
     m_liquid_map  = NULL;
     m_gridGetHeight = &GridMap::getHeightFromFlat;
 }
 
-bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 /*size*/)
+bool GridMap::loadAreaData(FILE* in, uint32 offset, uint32 /*size*/)
 {
     GridMapAreaHeader header;
     fseek(in, offset, SEEK_SET);
@@ -151,14 +157,14 @@ bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 /*size*/)
     m_gridArea = header.gridArea;
     if (!(header.flags & MAP_AREA_NO_AREA))
     {
-        m_area_map = new uint16 [16*16];
-        fread(m_area_map, sizeof(uint16), 16*16, in);
+        m_area_map = new uint16 [16 * 16];
+        fread(m_area_map, sizeof(uint16), 16 * 16, in);
     }
 
     return true;
 }
 
-bool GridMap::loadHeightData(FILE *in, uint32 offset, uint32 /*size*/)
+bool GridMap::loadHeightData(FILE* in, uint32 offset, uint32 /*size*/)
 {
     GridMapHeightHeader header;
     fseek(in, offset, SEEK_SET);
@@ -171,28 +177,28 @@ bool GridMap::loadHeightData(FILE *in, uint32 offset, uint32 /*size*/)
     {
         if ((header.flags & MAP_HEIGHT_AS_INT16))
         {
-            m_uint16_V9 = new uint16 [129*129];
-            m_uint16_V8 = new uint16 [128*128];
-            fread(m_uint16_V9, sizeof(uint16), 129*129, in);
-            fread(m_uint16_V8, sizeof(uint16), 128*128, in);
+            m_uint16_V9 = new uint16 [129 * 129];
+            m_uint16_V8 = new uint16 [128 * 128];
+            fread(m_uint16_V9, sizeof(uint16), 129 * 129, in);
+            fread(m_uint16_V8, sizeof(uint16), 128 * 128, in);
             m_gridIntHeightMultiplier = (header.gridMaxHeight - header.gridHeight) / 65535;
             m_gridGetHeight = &GridMap::getHeightFromUint16;
         }
         else if ((header.flags & MAP_HEIGHT_AS_INT8))
         {
-            m_uint8_V9 = new uint8 [129*129];
-            m_uint8_V8 = new uint8 [128*128];
-            fread(m_uint8_V9, sizeof(uint8), 129*129, in);
-            fread(m_uint8_V8, sizeof(uint8), 128*128, in);
+            m_uint8_V9 = new uint8 [129 * 129];
+            m_uint8_V8 = new uint8 [128 * 128];
+            fread(m_uint8_V9, sizeof(uint8), 129 * 129, in);
+            fread(m_uint8_V8, sizeof(uint8), 128 * 128, in);
             m_gridIntHeightMultiplier = (header.gridMaxHeight - header.gridHeight) / 255;
             m_gridGetHeight = &GridMap::getHeightFromUint8;
         }
         else
         {
-            m_V9 = new float [129*129];
-            m_V8 = new float [128*128];
-            fread(m_V9, sizeof(float), 129*129, in);
-            fread(m_V8, sizeof(float), 128*128, in);
+            m_V9 = new float [129 * 129];
+            m_V8 = new float [128 * 128];
+            fread(m_V9, sizeof(float), 129 * 129, in);
+            fread(m_V8, sizeof(float), 128 * 128, in);
             m_gridGetHeight = &GridMap::getHeightFromFloat;
         }
     }
@@ -202,7 +208,7 @@ bool GridMap::loadHeightData(FILE *in, uint32 offset, uint32 /*size*/)
     return true;
 }
 
-bool GridMap::loadGridMapLiquidData(FILE *in, uint32 offset, uint32 /*size*/)
+bool GridMap::loadGridMapLiquidData(FILE* in, uint32 offset, uint32 /*size*/)
 {
     GridMapLiquidHeader header;
     fseek(in, offset, SEEK_SET);
@@ -219,14 +225,17 @@ bool GridMap::loadGridMapLiquidData(FILE *in, uint32 offset, uint32 /*size*/)
 
     if (!(header.flags & MAP_LIQUID_NO_TYPE))
     {
-        m_liquid_type = new uint8 [16*16];
-        fread(m_liquid_type, sizeof(uint8), 16*16, in);
+        m_liquidEntry = new uint16[16*16];
+        fread(m_liquidEntry, sizeof(uint16), 16*16, in);
+
+        m_liquidFlags = new uint8[16*16];
+        fread(m_liquidFlags, sizeof(uint8), 16*16, in);
     }
 
     if (!(header.flags & MAP_LIQUID_NO_HEIGHT))
     {
-        m_liquid_map = new float [m_liquid_width*m_liquid_height];
-        fread(m_liquid_map, sizeof(float), m_liquid_width*m_liquid_height, in);
+        m_liquid_map = new float [m_liquid_width * m_liquid_height];
+        fread(m_liquid_map, sizeof(float), m_liquid_width * m_liquid_height, in);
     }
 
     return true;
@@ -237,11 +246,11 @@ uint16 GridMap::getArea(float x, float y)
     if (!m_area_map)
         return m_gridArea;
 
-    x = 16 * (32 - x/SIZE_OF_GRIDS);
-    y = 16 * (32 - y/SIZE_OF_GRIDS);
+    x = 16 * (32 - x / SIZE_OF_GRIDS);
+    y = 16 * (32 - y / SIZE_OF_GRIDS);
     int lx = (int)x & 15;
     int ly = (int)y & 15;
-    return m_area_map[lx*16 + ly];
+    return m_area_map[lx * 16 + ly];
 }
 
 float GridMap::getHeightFromFlat(float /*x*/, float /*y*/) const
@@ -254,8 +263,8 @@ float GridMap::getHeightFromFloat(float x, float y) const
     if (!m_V8 || !m_V9)
         return m_gridHeight;
 
-    x = MAP_RESOLUTION * (32 - x/SIZE_OF_GRIDS);
-    y = MAP_RESOLUTION * (32 - y/SIZE_OF_GRIDS);
+    x = MAP_RESOLUTION * (32 - x / SIZE_OF_GRIDS);
+    y = MAP_RESOLUTION * (32 - y / SIZE_OF_GRIDS);
 
     int x_int = (int)x;
     int y_int = (int)y;
@@ -279,26 +288,26 @@ float GridMap::getHeightFromFloat(float x, float y) const
     // 2 - solve linear equation from triangle points
     // Calculate coefficients for solve h = a*x + b*y + c
 
-    float a,b,c;
+    float a, b, c;
     // Select triangle:
-    if (x+y < 1)
+    if (x + y < 1)
     {
         if (x > y)
         {
             // 1 triangle (h1, h2, h5 points)
-            float h1 = m_V9[(x_int  )*129 + y_int];
-            float h2 = m_V9[(x_int+1)*129 + y_int];
-            float h5 = 2 * m_V8[x_int*128 + y_int];
-            a = h2-h1;
-            b = h5-h1-h2;
+            float h1 = m_V9[(x_int) * 129 + y_int];
+            float h2 = m_V9[(x_int + 1) * 129 + y_int];
+            float h5 = 2 * m_V8[x_int * 128 + y_int];
+            a = h2 - h1;
+            b = h5 - h1 - h2;
             c = h1;
         }
         else
         {
             // 2 triangle (h1, h3, h5 points)
-            float h1 = m_V9[x_int*129 + y_int  ];
-            float h3 = m_V9[x_int*129 + y_int+1];
-            float h5 = 2 * m_V8[x_int*128 + y_int];
+            float h1 = m_V9[x_int * 129 + y_int  ];
+            float h3 = m_V9[x_int * 129 + y_int + 1];
+            float h5 = 2 * m_V8[x_int * 128 + y_int];
             a = h5 - h1 - h3;
             b = h3 - h1;
             c = h1;
@@ -309,9 +318,9 @@ float GridMap::getHeightFromFloat(float x, float y) const
         if (x > y)
         {
             // 3 triangle (h2, h4, h5 points)
-            float h2 = m_V9[(x_int+1)*129 + y_int  ];
-            float h4 = m_V9[(x_int+1)*129 + y_int+1];
-            float h5 = 2 * m_V8[x_int*128 + y_int];
+            float h2 = m_V9[(x_int + 1) * 129 + y_int  ];
+            float h4 = m_V9[(x_int + 1) * 129 + y_int + 1];
+            float h5 = 2 * m_V8[x_int * 128 + y_int];
             a = h2 + h4 - h5;
             b = h4 - h2;
             c = h5 - h4;
@@ -319,9 +328,9 @@ float GridMap::getHeightFromFloat(float x, float y) const
         else
         {
             // 4 triangle (h3, h4, h5 points)
-            float h3 = m_V9[(x_int  )*129 + y_int+1];
-            float h4 = m_V9[(x_int+1)*129 + y_int+1];
-            float h5 = 2 * m_V8[x_int*128 + y_int];
+            float h3 = m_V9[(x_int) * 129 + y_int + 1];
+            float h4 = m_V9[(x_int + 1) * 129 + y_int + 1];
+            float h5 = 2 * m_V8[x_int * 128 + y_int];
             a = h4 - h3;
             b = h3 + h4 - h5;
             c = h5 - h4;
@@ -336,8 +345,8 @@ float GridMap::getHeightFromUint8(float x, float y) const
     if (!m_uint8_V8 || !m_uint8_V9)
         return m_gridHeight;
 
-    x = MAP_RESOLUTION * (32 - x/SIZE_OF_GRIDS);
-    y = MAP_RESOLUTION * (32 - y/SIZE_OF_GRIDS);
+    x = MAP_RESOLUTION * (32 - x / SIZE_OF_GRIDS);
+    y = MAP_RESOLUTION * (32 - y / SIZE_OF_GRIDS);
 
     int x_int = (int)x;
     int y_int = (int)y;
@@ -347,17 +356,17 @@ float GridMap::getHeightFromUint8(float x, float y) const
     y_int &= (MAP_RESOLUTION - 1);
 
     int32 a, b, c;
-    uint8 *V9_h1_ptr = &m_uint8_V9[x_int*128 + x_int + y_int];
-    if (x+y < 1)
+    uint8* V9_h1_ptr = &m_uint8_V9[x_int * 128 + x_int + y_int];
+    if (x + y < 1)
     {
         if (x > y)
         {
             // 1 triangle (h1, h2, h5 points)
             int32 h1 = V9_h1_ptr[  0];
             int32 h2 = V9_h1_ptr[129];
-            int32 h5 = 2 * m_uint8_V8[x_int*128 + y_int];
-            a = h2-h1;
-            b = h5-h1-h2;
+            int32 h5 = 2 * m_uint8_V8[x_int * 128 + y_int];
+            a = h2 - h1;
+            b = h5 - h1 - h2;
             c = h1;
         }
         else
@@ -365,7 +374,7 @@ float GridMap::getHeightFromUint8(float x, float y) const
             // 2 triangle (h1, h3, h5 points)
             int32 h1 = V9_h1_ptr[0];
             int32 h3 = V9_h1_ptr[1];
-            int32 h5 = 2 * m_uint8_V8[x_int*128 + y_int];
+            int32 h5 = 2 * m_uint8_V8[x_int * 128 + y_int];
             a = h5 - h1 - h3;
             b = h3 - h1;
             c = h1;
@@ -378,7 +387,7 @@ float GridMap::getHeightFromUint8(float x, float y) const
             // 3 triangle (h2, h4, h5 points)
             int32 h2 = V9_h1_ptr[129];
             int32 h4 = V9_h1_ptr[130];
-            int32 h5 = 2 * m_uint8_V8[x_int*128 + y_int];
+            int32 h5 = 2 * m_uint8_V8[x_int * 128 + y_int];
             a = h2 + h4 - h5;
             b = h4 - h2;
             c = h5 - h4;
@@ -388,7 +397,7 @@ float GridMap::getHeightFromUint8(float x, float y) const
             // 4 triangle (h3, h4, h5 points)
             int32 h3 = V9_h1_ptr[  1];
             int32 h4 = V9_h1_ptr[130];
-            int32 h5 = 2 * m_uint8_V8[x_int*128 + y_int];
+            int32 h5 = 2 * m_uint8_V8[x_int * 128 + y_int];
             a = h4 - h3;
             b = h3 + h4 - h5;
             c = h5 - h4;
@@ -396,7 +405,7 @@ float GridMap::getHeightFromUint8(float x, float y) const
     }
 
     // Calculate height
-    return (float)((a * x) + (b * y) + c)*m_gridIntHeightMultiplier + m_gridHeight;
+    return (float)((a * x) + (b * y) + c) * m_gridIntHeightMultiplier + m_gridHeight;
 }
 
 float GridMap::getHeightFromUint16(float x, float y) const
@@ -404,8 +413,8 @@ float GridMap::getHeightFromUint16(float x, float y) const
     if (!m_uint16_V8 || !m_uint16_V9)
         return m_gridHeight;
 
-    x = MAP_RESOLUTION * (32 - x/SIZE_OF_GRIDS);
-    y = MAP_RESOLUTION * (32 - y/SIZE_OF_GRIDS);
+    x = MAP_RESOLUTION * (32 - x / SIZE_OF_GRIDS);
+    y = MAP_RESOLUTION * (32 - y / SIZE_OF_GRIDS);
 
     int x_int = (int)x;
     int y_int = (int)y;
@@ -415,17 +424,17 @@ float GridMap::getHeightFromUint16(float x, float y) const
     y_int &= (MAP_RESOLUTION - 1);
 
     int32 a, b, c;
-    uint16 *V9_h1_ptr = &m_uint16_V9[x_int*128 + x_int + y_int];
-    if (x+y < 1)
+    uint16* V9_h1_ptr = &m_uint16_V9[x_int * 128 + x_int + y_int];
+    if (x + y < 1)
     {
         if (x > y)
         {
             // 1 triangle (h1, h2, h5 points)
             int32 h1 = V9_h1_ptr[  0];
             int32 h2 = V9_h1_ptr[129];
-            int32 h5 = 2 * m_uint16_V8[x_int*128 + y_int];
-            a = h2-h1;
-            b = h5-h1-h2;
+            int32 h5 = 2 * m_uint16_V8[x_int * 128 + y_int];
+            a = h2 - h1;
+            b = h5 - h1 - h2;
             c = h1;
         }
         else
@@ -433,7 +442,7 @@ float GridMap::getHeightFromUint16(float x, float y) const
             // 2 triangle (h1, h3, h5 points)
             int32 h1 = V9_h1_ptr[0];
             int32 h3 = V9_h1_ptr[1];
-            int32 h5 = 2 * m_uint16_V8[x_int*128 + y_int];
+            int32 h5 = 2 * m_uint16_V8[x_int * 128 + y_int];
             a = h5 - h1 - h3;
             b = h3 - h1;
             c = h1;
@@ -446,7 +455,7 @@ float GridMap::getHeightFromUint16(float x, float y) const
             // 3 triangle (h2, h4, h5 points)
             int32 h2 = V9_h1_ptr[129];
             int32 h4 = V9_h1_ptr[130];
-            int32 h5 = 2 * m_uint16_V8[x_int*128 + y_int];
+            int32 h5 = 2 * m_uint16_V8[x_int * 128 + y_int];
             a = h2 + h4 - h5;
             b = h4 - h2;
             c = h5 - h4;
@@ -456,7 +465,7 @@ float GridMap::getHeightFromUint16(float x, float y) const
             // 4 triangle (h3, h4, h5 points)
             int32 h3 = V9_h1_ptr[  1];
             int32 h4 = V9_h1_ptr[130];
-            int32 h5 = 2 * m_uint16_V8[x_int*128 + y_int];
+            int32 h5 = 2 * m_uint16_V8[x_int * 128 + y_int];
             a = h4 - h3;
             b = h3 + h4 - h5;
             c = h5 - h4;
@@ -464,7 +473,7 @@ float GridMap::getHeightFromUint16(float x, float y) const
     }
 
     // Calculate height
-    return (float)((a * x) + (b * y) + c)*m_gridIntHeightMultiplier + m_gridHeight;
+    return (float)((a * x) + (b * y) + c) * m_gridIntHeightMultiplier + m_gridHeight;
 }
 
 float GridMap::getLiquidLevel(float x, float y)
@@ -472,68 +481,101 @@ float GridMap::getLiquidLevel(float x, float y)
     if (!m_liquid_map)
         return m_liquidLevel;
 
-    x = MAP_RESOLUTION * (32 - x/SIZE_OF_GRIDS);
-    y = MAP_RESOLUTION * (32 - y/SIZE_OF_GRIDS);
+    x = MAP_RESOLUTION * (32 - x / SIZE_OF_GRIDS);
+    y = MAP_RESOLUTION * (32 - y / SIZE_OF_GRIDS);
 
-    int cx_int = ((int)x & (MAP_RESOLUTION-1)) - m_liquid_offY;
-    int cy_int = ((int)y & (MAP_RESOLUTION-1)) - m_liquid_offX;
+    int cx_int = ((int)x & (MAP_RESOLUTION - 1)) - m_liquid_offY;
+    int cy_int = ((int)y & (MAP_RESOLUTION - 1)) - m_liquid_offX;
 
-    if (cx_int < 0 || cx_int >=m_liquid_height)
+    if (cx_int < 0 || cx_int >= m_liquid_height)
         return INVALID_HEIGHT_VALUE;
 
-    if (cy_int < 0 || cy_int >=m_liquid_width )
+    if (cy_int < 0 || cy_int >= m_liquid_width)
         return INVALID_HEIGHT_VALUE;
 
-    return m_liquid_map[cx_int*m_liquid_width + cy_int];
+    return m_liquid_map[cx_int * m_liquid_width + cy_int];
 }
 
 uint8 GridMap::getTerrainType(float x, float y)
 {
-    if (!m_liquid_type)
+    if (!m_liquidFlags)
         return (uint8)m_liquidType;
 
-    x = 16 * (32 - x/SIZE_OF_GRIDS);
-    y = 16 * (32 - y/SIZE_OF_GRIDS);
+    x = 16 * (32 - x / SIZE_OF_GRIDS);
+    y = 16 * (32 - y / SIZE_OF_GRIDS);
     int lx = (int)x & 15;
     int ly = (int)y & 15;
-    return m_liquid_type[lx*16 + ly];
+    return m_liquidFlags[lx*16 + ly];
 }
 
 // Get water state on map
 GridMapLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidType, GridMapLiquidData *data)
 {
     // Check water type (if no water return)
-    if (!m_liquid_type && !m_liquidType)
+    if (!m_liquidFlags && !m_liquidType)
         return LIQUID_MAP_NO_WATER;
 
     // Get cell
-    float cx = MAP_RESOLUTION * (32 - x/SIZE_OF_GRIDS);
-    float cy = MAP_RESOLUTION * (32 - y/SIZE_OF_GRIDS);
+    float cx = MAP_RESOLUTION * (32 - x / SIZE_OF_GRIDS);
+    float cy = MAP_RESOLUTION * (32 - y / SIZE_OF_GRIDS);
 
-    int x_int = (int)cx & (MAP_RESOLUTION-1);
-    int y_int = (int)cy & (MAP_RESOLUTION-1);
+    int x_int = (int)cx & (MAP_RESOLUTION - 1);
+    int y_int = (int)cy & (MAP_RESOLUTION - 1);
 
     // Check water type in cell
-    uint8 type = m_liquid_type ? m_liquid_type[(x_int>>3)*16 + (y_int>>3)] : m_liquidType;
+    int idx = (x_int>>3)*16 + (y_int>>3);
+    uint8 type = m_liquidFlags ? m_liquidFlags[idx] : m_liquidType;
+    uint32 entry = 0;
+    if (m_liquidEntry)
+    {
+        if (LiquidTypeEntry const* liquidEntry = sLiquidTypeStore.LookupEntry(m_liquidEntry[idx]))
+        {
+            entry = liquidEntry->Id;
+            type &= MAP_LIQUID_TYPE_DARK_WATER;
+            uint32 liqTypeIdx = liquidEntry->Type;
+            if (entry < 21)
+            {
+                if (AreaTableEntry const* area = sAreaStore.LookupEntry(getArea(x, y)))
+                {
+                    uint32 overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type];
+                    if (!overrideLiquid && area->zone)
+                    {
+                        area = GetAreaEntryByAreaID(area->zone);
+                        if (area)
+                            overrideLiquid = area->LiquidTypeOverride[liquidEntry->Type];
+                    }
+
+                    if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid))
+                    {
+                        entry = overrideLiquid;
+                        liqTypeIdx = liq->Type;
+                    }
+                }
+            }
+
+            type |= 1 << liqTypeIdx;
+        }
+    }
+
     if (type == 0)
         return LIQUID_MAP_NO_WATER;
 
     // Check req liquid type mask
-    if (ReqLiquidType && !(ReqLiquidType&type))
+    if (ReqLiquidType && !(ReqLiquidType & type))
         return LIQUID_MAP_NO_WATER;
 
     // Check water level:
     // Check water height map
     int lx_int = x_int - m_liquid_offY;
-    if (lx_int < 0 || lx_int >=m_liquid_height)
+    if (lx_int < 0 || lx_int >= m_liquid_height)
         return LIQUID_MAP_NO_WATER;
 
     int ly_int = y_int - m_liquid_offX;
-    if (ly_int < 0 || ly_int >=m_liquid_width )
+    if (ly_int < 0 || ly_int >= m_liquid_width)
         return LIQUID_MAP_NO_WATER;
 
     // Get water level
-    float liquid_level = m_liquid_map ? m_liquid_map[lx_int*m_liquid_width + ly_int] : m_liquidLevel;
+    float liquid_level = m_liquid_map ? m_liquid_map[lx_int * m_liquid_width + ly_int] : m_liquidLevel;
 
     // Get ground level (sub 0.2 for fix some errors)
     float ground_level = getHeight(x, y);
@@ -545,7 +587,8 @@ GridMapLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 Re
     // All ok in water -> store data
     if (data)
     {
-        data->type  = type;
+        data->entry = entry;
+        data->type_flags = type;
         data->level = liquid_level;
         data->depth_level = ground_level;
     }
@@ -557,26 +600,26 @@ GridMapLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 Re
     if (delta > 20)                                         // Under water
         return LIQUID_MAP_UNDER_WATER;
 
-    if (delta > 0 )                                         // In water
+    if (delta > 0)                                          // In water
         return LIQUID_MAP_IN_WATER;
 
     if (delta > -1)                                         // Walk on water
         return LIQUID_MAP_WATER_WALK;
-                                                            // Above water
+    // Above water
     return LIQUID_MAP_ABOVE_WATER;
 }
 
-bool GridMap::ExistMap(uint32 mapid,int gx,int gy)
+bool GridMap::ExistMap(uint32 mapid, int gx, int gy)
 {
-    int len = sWorld.GetDataPath().length()+strlen("maps/%03u%02u%02u.map")+1;
+    int len = sWorld.GetDataPath().length() + strlen("maps/%03u%02u%02u.map") + 1;
     char* tmp = new char[len];
-    snprintf(tmp, len, (char *)(sWorld.GetDataPath()+"maps/%03u%02u%02u.map").c_str(),mapid,gx,gy);
+    snprintf(tmp, len, (char*)(sWorld.GetDataPath() + "maps/%03u%02u%02u.map").c_str(), mapid, gx, gy);
 
-    FILE *pf=fopen(tmp,"rb");
+    FILE* pf = fopen(tmp, "rb");
 
-    if(!pf)
+    if (!pf)
     {
-        sLog.outError("Check existing of map file '%s': not exist!",tmp);
+        sLog.outError("Check existing of map file '%s': not exist!", tmp);
         delete[] tmp;
         return false;
     }
@@ -584,32 +627,32 @@ bool GridMap::ExistMap(uint32 mapid,int gx,int gy)
     GridMapFileHeader header;
     fread(&header, sizeof(header), 1, pf);
     if (header.mapMagic     != *((uint32 const*)(MAP_MAGIC)) ||
-        header.versionMagic != *((uint32 const*)(MAP_VERSION_MAGIC)) ||
-        !IsAcceptableClientBuild(header.buildMagic))
+            header.versionMagic != *((uint32 const*)(MAP_VERSION_MAGIC)) ||
+            !IsAcceptableClientBuild(header.buildMagic))
     {
-        sLog.outError("Map file '%s' is non-compatible version (outdated?). Please, create new using ad.exe program.",tmp);
-        delete [] tmp;
-        fclose(pf);                                         //close file before return
+        sLog.outError("Map file '%s' is non-compatible version (outdated?). Please, create new using ad.exe program.", tmp);
+        delete[] tmp;
+        fclose(pf);                                         // close file before return
         return false;
     }
 
-    delete [] tmp;
+    delete[] tmp;
     fclose(pf);
     return true;
 }
 
-bool GridMap::ExistVMap(uint32 mapid,int gx,int gy)
+bool GridMap::ExistVMap(uint32 mapid, int gx, int gy)
 {
-    if(VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager())
+    if (VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager())
     {
-        if(vmgr->isMapLoadingEnabled())
+        if (vmgr->isMapLoadingEnabled())
         {
-                                                            // x and y are swapped !! => fixed now
-            bool exists = vmgr->existsMap((sWorld.GetDataPath()+ "vmaps").c_str(),  mapid, gx,gy);
-            if(!exists)
+            // x and y are swapped !! => fixed now
+            bool exists = vmgr->existsMap((sWorld.GetDataPath() + "vmaps").c_str(),  mapid, gx, gy);
+            if (!exists)
             {
-                std::string name = vmgr->getDirFileName(mapid,gx,gy);
-                sLog.outError("VMap file '%s' is missing or point to wrong version vmap file, redo vmaps with latest vmap_assembler.exe program", (sWorld.GetDataPath()+"vmaps/"+name).c_str());
+                std::string name = vmgr->getDirFileName(mapid, gx, gy);
+                sLog.outError("VMap file '%s' is missing or point to wrong version vmap file, redo vmaps with latest vmap_assembler.exe program", (sWorld.GetDataPath() + "vmaps/" + name).c_str());
                 return false;
             }
         }
@@ -625,144 +668,87 @@ TerrainInfo::TerrainInfo(uint32 mapid) : m_mapId(mapid)
     {
         for (int i = 0; i < MAX_NUMBER_OF_GRIDS; ++i)
         {
-            m_GridMaps[i][k] = NULL;
-            m_GridRef[i][k] = 0;
+            m_GridMaps[i][k] = GridMapPtr();
         }
     }
-
-    //clean up GridMap objects every minute
-    const uint32 iCleanUpInterval = 60;
-    //schedule start randlomly
-    const uint32 iRandomStart = urand(20, 40);
-
-    i_timer.SetInterval(iCleanUpInterval * 1000);
-    i_timer.SetCurrent(iRandomStart * 1000);
 }
 
 TerrainInfo::~TerrainInfo()
 {
+    /*
     for (int k = 0; k < MAX_NUMBER_OF_GRIDS; ++k)
         for (int i = 0; i < MAX_NUMBER_OF_GRIDS; ++i)
-            delete m_GridMaps[i][k];
+            m_GridMaps[i][k] = GridMapPtr();
+    */
 
     VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(m_mapId);
     MMAP::MMapFactory::createOrGetMMapManager()->unloadMap(m_mapId);
 }
 
-GridMap * TerrainInfo::Load(const uint32 x, const uint32 y)
+GridMapPtr TerrainInfo::Load(uint32 const& x, uint32 const& y)
 {
     MANGOS_ASSERT(x < MAX_NUMBER_OF_GRIDS);
     MANGOS_ASSERT(y < MAX_NUMBER_OF_GRIDS);
 
-    //reference grid as a first step
-    RefGrid(x, y);
-
-    //quick check if GridMap already loaded
-    GridMap * pMap = m_GridMaps[x][y];
-    if(!pMap)
+    // quick check if GridMap already loaded
+    GridMapPtr pMap = GetGridMap(x, y);
+    if (!pMap)
         pMap = LoadMapAndVMap(x, y);
 
     return pMap;
 }
 
-//schedule lazy GridMap object cleanup
-void TerrainInfo::Unload(const uint32 x, const uint32 y)
+// schedule lazy GridMap object cleanup
+void TerrainInfo::Unload(uint32 const& x, uint32 const& y)
 {
     MANGOS_ASSERT(x < MAX_NUMBER_OF_GRIDS);
     MANGOS_ASSERT(y < MAX_NUMBER_OF_GRIDS);
-
-    if(m_GridMaps[x][y])
-    {
-        //decrease grid reference count...
-        if(UnrefGrid(x, y) == 0)
-        {
-            //TODO: add your additional logic here
-
-        }
-    }
+    // Currently method has no sence - grids cleaned up automatically.
 }
 
-
-//call this method only
-void TerrainInfo::CleanUpGrids(const uint32 diff)
+// call this method only
+void TerrainInfo::CleanUpGrids(uint32 const diff)
 {
-    i_timer.Update(diff);
-    if( !i_timer.Passed() )
-        return;
-
     for (int y = 0; y < MAX_NUMBER_OF_GRIDS; ++y)
     {
         for (int x = 0; x < MAX_NUMBER_OF_GRIDS; ++x)
         {
-            const int16& iRef = m_GridRef[x][y];
-            GridMap * pMap = m_GridMaps[x][y];
-
-            //delete those GridMap objects which have refcount = 0
-            if(pMap && iRef == 0 )
+            // delete those GridMap objects which have refcount == 0
+            if (m_GridMaps[x][y] && m_GridMaps[x][y].count() == 0)
             {
-                m_GridMaps[x][y] = NULL;
-                //delete grid data if reference count == 0
-                pMap->unloadData();
-                delete pMap;
+                DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING,"TerrainInfo::CleanUpGrids unload grid map:%u x:%d y:%d", GetMapId(), x, y);
+                WriteGuard Guard(GetLock(), true);
 
-                //unload VMAPS...
+                GridMapPtr tmpPtr = m_GridMaps[x][y];
+                m_GridMaps[x][y] = GridMapPtr();
+
+                // unload VMAPS...
                 VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(m_mapId, x, y);
 
-                //unload mmap...
+                // unload mmap...
                 MMAP::MMapFactory::createOrGetMMapManager()->unloadMap(m_mapId, x, y);
+
+                // tmpPtr be auto-erased after cycle end
             }
         }
     }
-
-    i_timer.Reset();
-}
-
-int TerrainInfo::RefGrid(const uint32& x, const uint32& y)
-{
-    MANGOS_ASSERT(x < MAX_NUMBER_OF_GRIDS);
-    MANGOS_ASSERT(y < MAX_NUMBER_OF_GRIDS);
-
-    LOCK_GUARD _lock(m_refMutex);
-    return (m_GridRef[x][y] += 1);
 }
 
-int TerrainInfo::UnrefGrid(const uint32& x, const uint32& y)
+float TerrainInfo::GetHeightStatic(float x, float y, float z, bool useVmaps/*=true*/, float maxSearchDist/*=DEFAULT_HEIGHT_SEARCH*/) const
 {
-    MANGOS_ASSERT(x < MAX_NUMBER_OF_GRIDS);
-    MANGOS_ASSERT(y < MAX_NUMBER_OF_GRIDS);
-
-    int16& iRef = m_GridRef[x][y];
+    float mapHeight = VMAP_INVALID_HEIGHT_VALUE;            // Store Height obtained by maps
+    float vmapHeight = VMAP_INVALID_HEIGHT_VALUE;           // Store Height obtained by vmaps (in "corridor" of z (or slightly above z)
 
-    LOCK_GUARD _lock(m_refMutex);
-    if(iRef > 0)
-        return (iRef -= 1);
-
-    return 0;
-}
-
-float TerrainInfo::GetHeight(float x, float y, float z, bool pUseVmaps, float maxSearchDist) const
-{
-    // find raw .map surface under Z coordinates
-    float mapHeight;
     float z2 = z + 2.f;
-    if (GridMap *gmap = const_cast<TerrainInfo*>(this)->GetGrid(x, y))
-    {
-        float _mapheight = gmap->getHeight(x,y);
 
-        // look from a bit higher pos to find the floor, ignore under surface case
-        if (z2 > _mapheight)
-            mapHeight = _mapheight;
-        else
-            mapHeight = VMAP_INVALID_HEIGHT_VALUE;
-    }
-    else
-        mapHeight = VMAP_INVALID_HEIGHT_VALUE;
+    // find raw .map surface under Z coordinates (or well-defined above)
+    if (GridMapPtr gmap = const_cast<TerrainInfo*>(this)->GetGrid(x, y))
+        mapHeight = gmap->getHeight(x, y);
 
-    float vmapHeight;
-    if (pUseVmaps)
+    if (useVmaps)
     {
         VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager();
-        if (vmgr->isHeightCalcEnabled())
+        if (vmgr && vmgr->isHeightCalcEnabled())
         {
             // if mapHeight has been found search vmap height at least until mapHeight point
             // this prevent case when original Z "too high above ground and vmap height search fail"
@@ -772,16 +758,19 @@ float TerrainInfo::GetHeight(float x, float y, float z, bool pUseVmaps, float ma
 
             // look from a bit higher pos to find the floor
             vmapHeight = vmgr->getHeight(GetMapId(), x, y, z2, maxSearchDist);
+
+            // if not found in expected range, look for infinity range (case of far above floor, but below terrain-height)
+            if (vmapHeight <= INVALID_HEIGHT)
+                vmapHeight = vmgr->getHeight(GetMapId(), x, y, z2, 10000.0f);
+
+            // still not found, look near terrain height
+            if (vmapHeight <= INVALID_HEIGHT && mapHeight > INVALID_HEIGHT && z2 < mapHeight)
+                vmapHeight = vmgr->getHeight(GetMapId(), x, y, mapHeight + 2.0f, DEFAULT_HEIGHT_SEARCH);
         }
-        else
-            vmapHeight = VMAP_INVALID_HEIGHT_VALUE;
     }
-    else
-        vmapHeight = VMAP_INVALID_HEIGHT_VALUE;
 
     // mapHeight set for any above raw ground Z or <= INVALID_HEIGHT
     // vmapheight set for any under Z value or <= INVALID_HEIGHT
-
     if (vmapHeight > INVALID_HEIGHT)
     {
         if (mapHeight > INVALID_HEIGHT)
@@ -789,12 +778,10 @@ float TerrainInfo::GetHeight(float x, float y, float z, bool pUseVmaps, float ma
             // we have mapheight and vmapheight and must select more appropriate
 
             // we are already under the surface or vmap height above map heigt
-            // or if the distance of the vmap height is less the land height distance
-            if (z < mapHeight || vmapHeight > mapHeight || fabs(mapHeight-z) > fabs(vmapHeight-z))
+            if (z < mapHeight || vmapHeight > mapHeight)
                 return vmapHeight;
             else
                 return mapHeight;                           // better use .map surface height
-
         }
         else
             return vmapHeight;                              // we have only vmapHeight (if have)
@@ -804,26 +791,26 @@ float TerrainInfo::GetHeight(float x, float y, float z, bool pUseVmaps, float ma
 }
 
 inline bool IsOutdoorWMO(uint32 mogpFlags, int32 adtId, int32 rootId, int32 groupId,
-                              WMOAreaTableEntry const* wmoEntry, AreaTableEntry const* atEntry)
+                         WMOAreaTableEntry const* wmoEntry, AreaTableEntry const* atEntry)
 {
     bool outdoor = true;
 
-    if(wmoEntry && atEntry)
+    if (wmoEntry && atEntry)
     {
-        if(atEntry->flags & AREA_FLAG_OUTSIDE)
+        if (atEntry->flags & AREA_FLAG_OUTSIDE)
             return true;
-        if(atEntry->flags & AREA_FLAG_INSIDE)
+        if (atEntry->flags & AREA_FLAG_INSIDE)
             return false;
     }
 
-    outdoor = mogpFlags&0x8;
+    outdoor = mogpFlags & 0x8;
 
-    if(wmoEntry)
+    if (wmoEntry)
     {
-        if(wmoEntry->Flags & 4)
+        if (wmoEntry->Flags & 4)
             return true;
 
-        if((wmoEntry->Flags & 2)!=0)
+        if ((wmoEntry->Flags & 2) != 0)
             outdoor = false;
     }
     return outdoor;
@@ -835,12 +822,12 @@ bool TerrainInfo::IsOutdoors(float x, float y, float z) const
     int32 adtId, rootId, groupId;
 
     // no wmo found? -> outside by default
-    if(!GetAreaInfo(x, y, z, mogpFlags, adtId, rootId, groupId))
+    if (!GetAreaInfo(x, y, z, mogpFlags, adtId, rootId, groupId))
         return true;
 
     AreaTableEntry const* atEntry = 0;
-    WMOAreaTableEntry const* wmoEntry= GetWMOAreaTableEntryByTripple(rootId, adtId, groupId);
-    if(wmoEntry)
+    WMOAreaTableEntry const* wmoEntry = GetWMOAreaTableEntryByTripple(rootId, adtId, groupId);
+    if (wmoEntry)
     {
         DEBUG_LOG("Got WMOAreaTableEntry! flag %u, areaid %u", wmoEntry->Flags, wmoEntry->areaId);
 
@@ -850,18 +837,18 @@ bool TerrainInfo::IsOutdoors(float x, float y, float z) const
     return IsOutdoorWMO(mogpFlags, adtId, rootId, groupId, wmoEntry, atEntry);
 }
 
-bool TerrainInfo::GetAreaInfo(float x, float y, float z, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const
+bool TerrainInfo::GetAreaInfo(float x, float y, float z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const
 {
     float vmap_z = z;
     VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager();
     if (vmgr->getAreaInfo(GetMapId(), x, y, vmap_z, flags, adtId, rootId, groupId))
     {
         // check if there's terrain between player height and object height
-        if(GridMap *gmap = const_cast<TerrainInfo*>(this)->GetGrid(x, y))
+        if (GridMapPtr gmap = const_cast<TerrainInfo*>(this)->GetGrid(x, y))
         {
-            float _mapheight = gmap->getHeight(x,y);
-            // z + 2.0f condition taken from GetHeight(), not sure if it's such a great choice...
-            if(z + 2.0f > _mapheight &&  _mapheight > vmap_z)
+            float _mapheight = gmap->getHeight(x, y);
+            // z + 2.0f condition taken from GetHeightStatic(), not sure if it's such a great choice...
+            if (z + 2.0f > _mapheight &&  _mapheight > vmap_z)
                 return false;
         }
         return true;
@@ -869,7 +856,7 @@ bool TerrainInfo::GetAreaInfo(float x, float y, float z, uint32 &flags, int32 &a
     return false;
 }
 
-uint16 TerrainInfo::GetAreaFlag(float x, float y, float z, bool *isOutdoors) const
+uint16 TerrainInfo::GetAreaFlag(float x, float y, float z, bool* isOutdoors) const
 {
     uint32 mogpFlags;
     int32 adtId, rootId, groupId;
@@ -877,11 +864,11 @@ uint16 TerrainInfo::GetAreaFlag(float x, float y, float z, bool *isOutdoors) con
     AreaTableEntry const* atEntry = 0;
     bool haveAreaInfo = false;
 
-    if(GetAreaInfo(x, y, z, mogpFlags, adtId, rootId, groupId))
+    if (GetAreaInfo(x, y, z, mogpFlags, adtId, rootId, groupId))
     {
         haveAreaInfo = true;
         wmoEntry = GetWMOAreaTableEntryByTripple(rootId, adtId, groupId);
-        if(wmoEntry)
+        if (wmoEntry)
             atEntry = GetAreaEntryByAreaID(wmoEntry->areaId);
     }
 
@@ -890,7 +877,7 @@ uint16 TerrainInfo::GetAreaFlag(float x, float y, float z, bool *isOutdoors) con
         areaflag = atEntry->exploreFlag;
     else
     {
-        if(GridMap *gmap = const_cast<TerrainInfo*>(this)->GetGrid(x, y))
+        if (GridMapPtr gmap = const_cast<TerrainInfo*>(this)->GetGrid(x, y))
             areaflag = gmap->getArea(x, y);
         // this used while not all *.map files generated (instances)
         else
@@ -907,9 +894,9 @@ uint16 TerrainInfo::GetAreaFlag(float x, float y, float z, bool *isOutdoors) con
     return areaflag;
 }
 
-uint8 TerrainInfo::GetTerrainType(float x, float y ) const
+uint8 TerrainInfo::GetTerrainType(float x, float y) const
 {
-    if(GridMap *gmap = const_cast<TerrainInfo*>(this)->GetGrid(x, y))
+    if (GridMapPtr gmap = const_cast<TerrainInfo*>(this)->GetGrid(x, y))
         return gmap->getTerrainType(x, y);
     else
         return 0;
@@ -917,38 +904,81 @@ uint8 TerrainInfo::GetTerrainType(float x, float y ) const
 
 uint32 TerrainInfo::GetAreaId(float x, float y, float z) const
 {
-    return TerrainManager::GetAreaIdByAreaFlag(GetAreaFlag(x,y,z),m_mapId);
+    return TerrainManager::GetAreaIdByAreaFlag(GetAreaFlag(x, y, z), m_mapId);
 }
 
 uint32 TerrainInfo::GetZoneId(float x, float y, float z) const
 {
-    return TerrainManager::GetZoneIdByAreaFlag(GetAreaFlag(x,y,z),m_mapId);
+    return TerrainManager::GetZoneIdByAreaFlag(GetAreaFlag(x, y, z), m_mapId);
 }
 
 void TerrainInfo::GetZoneAndAreaId(uint32& zoneid, uint32& areaid, float x, float y, float z) const
 {
-    TerrainManager::GetZoneAndAreaIdByAreaFlag(zoneid,areaid,GetAreaFlag(x,y,z),m_mapId);
+    TerrainManager::GetZoneAndAreaIdByAreaFlag(zoneid, areaid, GetAreaFlag(x, y, z), m_mapId);
+}
+
+uint32 TerrainInfo::GetZoneId(Cell const& cell) const
+{
+    return GetZoneId(cell.gridPair());
 }
 
+uint32 TerrainInfo::GetZoneId(GridPair const& gridPair) const
+{
+    float x = ((float)gridPair.x_coord - CENTER_GRID_ID - 0.5) * SIZE_OF_GRIDS + CENTER_GRID_OFFSET;
+    float y = ((float)gridPair.y_coord - CENTER_GRID_ID - 0.5) * SIZE_OF_GRIDS + CENTER_GRID_OFFSET;
+    return GetZoneId(x, y, 0.0f);
+}
 
-GridMapLiquidStatus TerrainInfo::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidType, GridMapLiquidData *data) const
+GridMapLiquidStatus TerrainInfo::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidType, GridMapLiquidData* data) const
 {
     GridMapLiquidStatus result = LIQUID_MAP_NO_WATER;
     VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager();
-    float liquid_level, ground_level = INVALID_HEIGHT_VALUE;
-    uint32 liquid_type;
+    uint32 liquid_type = 0;
+    float liquid_level = INVALID_HEIGHT_VALUE;
+    float ground_level = GetHeightStatic(x, y, z, true, DEFAULT_WATER_SEARCH);
+
     if (vmgr->GetLiquidLevel(GetMapId(), x, y, z, ReqLiquidType, liquid_level, ground_level, liquid_type))
     {
-        DEBUG_LOG("getLiquidStatus(): vmap liquid level: %f ground: %f type: %u", liquid_level, ground_level, liquid_type);
+        // DEBUG_LOG("getLiquidStatus(): vmap liquid level: %f ground: %f type: %u", liquid_level, ground_level, liquid_type);
         // Check water level and ground level
         if (liquid_level > ground_level && z > ground_level - 2)
         {
             // All ok in water -> store data
             if (data)
             {
-                data->type  = liquid_type;
+                // hardcoded in client like this
+                if (GetMapId() == 530 && liquid_type == 2)
+                    liquid_type = 15;
+
+                uint32 liquidFlagType = 0;
+                if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(liquid_type))
+                    liquidFlagType = liq->Type;
+
+                if (liquid_type && liquid_type < 21)
+                {
+                    if (AreaTableEntry const* area = GetAreaEntryByAreaFlagAndMap(GetAreaFlag(x, y, z), GetMapId()))
+                    {
+                        uint32 overrideLiquid = area->LiquidTypeOverride[liquidFlagType];
+                        if (!overrideLiquid && area->zone)
+                        {
+                            area = GetAreaEntryByAreaID(area->zone);
+                            if (area)
+                                overrideLiquid = area->LiquidTypeOverride[liquidFlagType];
+                        }
+
+                        if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(overrideLiquid))
+                        {
+                            liquid_type = overrideLiquid;
+                            liquidFlagType = liq->Type;
+                        }
+                    }
+                }
+
                 data->level = liquid_level;
                 data->depth_level = ground_level;
+
+                data->entry = liquid_type;
+                data->type_flags = 1 << liquidFlagType;
             }
 
             // For speed check as int values
@@ -957,14 +987,14 @@ GridMapLiquidStatus TerrainInfo::getLiquidStatus(float x, float y, float z, uint
             // Get position delta
             if (delta > 20)                   // Under water
                 return LIQUID_MAP_UNDER_WATER;
-            if (delta > 0 )                   // In water
+            if (delta > 0)                    // In water
                 return LIQUID_MAP_IN_WATER;
             if (delta > -1)                   // Walk on water
                 return LIQUID_MAP_WATER_WALK;
             result = LIQUID_MAP_ABOVE_WATER;
         }
     }
-    if(GridMap* gmap = const_cast<TerrainInfo*>(this)->GetGrid(x, y))
+    else if (GridMapPtr gmap = const_cast<TerrainInfo*>(this)->GetGrid(x, y))
     {
         GridMapLiquidData map_data;
         GridMapLiquidStatus map_result = gmap->getLiquidStatus(x, y, z, ReqLiquidType, &map_data);
@@ -972,35 +1002,74 @@ GridMapLiquidStatus TerrainInfo::getLiquidStatus(float x, float y, float z, uint
         if (map_result != LIQUID_MAP_NO_WATER && (map_data.level > ground_level))
         {
             if (data)
+            {
+                // hardcoded in client like this
+                if (GetMapId() == 530 && map_data.entry == 2)
+                    map_data.entry = 15;
                 *data = map_data;
+            }
             return map_result;
         }
     }
     return result;
 }
 
-bool TerrainInfo::IsInWater(float x, float y, float pZ, GridMapLiquidData *data) const
+bool TerrainInfo::IsInWater(float x, float y, float pZ, GridMapLiquidData* data, float min_depth) const
 {
     // Check surface in x, y point for liquid
     if (const_cast<TerrainInfo*>(this)->GetGrid(x, y))
     {
         GridMapLiquidData liquid_status;
         GridMapLiquidData *liquid_ptr = data ? data : &liquid_status;
-        if (getLiquidStatus(x, y, pZ, MAP_ALL_LIQUIDS, liquid_ptr))
+        GridMapLiquidStatus status = getLiquidStatus(x, y, pZ, MAP_ALL_LIQUIDS, liquid_ptr);
+        if (status == LIQUID_MAP_NO_WATER)
+            return false;
+        else if (status & LIQUID_MAP_ABOVE_WATER)
+            return false;
+        else if (status & LIQUID_MAP_WATER_WALK)
+            return false;
+        else if ((status & LIQUID_MAP_IN_WATER) ||
+                 (status & LIQUID_MAP_UNDER_WATER))
+            {
+                if (liquid_ptr && (liquid_ptr->level - liquid_ptr->depth_level > min_depth)) // avoid water with depth < 2
+                    return true;
+                else
+                    return false;
+            };
+    }
+    return false;
+}
+
+bool TerrainInfo::IsAboveWater(float x, float y, float z, float* pWaterZ/*= NULL*/) const
+{
+    if (const_cast<TerrainInfo*>(this)->GetGrid(x, y))
+    {
+        GridMapLiquidData mapData;
+
+        if (getLiquidStatus(x, y, z, MAP_LIQUID_TYPE_WATER|MAP_LIQUID_TYPE_OCEAN, &mapData) & LIQUID_MAP_ABOVE_WATER)
         {
-            //if (liquid_prt->level - liquid_prt->depth_level > 2) //???
-                return true;
+            if (pWaterZ)
+                *pWaterZ = mapData.level;
+
+            return true;
         }
     }
     return false;
 }
 
-bool TerrainInfo::IsUnderWater(float x, float y, float z) const
+bool TerrainInfo::IsUnderWater(float x, float y, float z, float* pWaterZ/*= NULL*/) const
 {
     if (const_cast<TerrainInfo*>(this)->GetGrid(x, y))
     {
-        if (getLiquidStatus(x, y, z, MAP_LIQUID_TYPE_WATER|MAP_LIQUID_TYPE_OCEAN)&LIQUID_MAP_UNDER_WATER)
+        GridMapLiquidData mapData;
+
+        if (getLiquidStatus(x, y, z, MAP_LIQUID_TYPE_WATER|MAP_LIQUID_TYPE_OCEAN, &mapData) & LIQUID_MAP_UNDER_WATER)
+        {
+            if (pWaterZ)
+                *pWaterZ = mapData.level;
+
             return true;
+        }
     }
     return false;
 }
@@ -1022,84 +1091,87 @@ float TerrainInfo::GetWaterOrGroundLevel(float x, float y, float z, float* pGrou
     if (const_cast<TerrainInfo*>(this)->GetGrid(x, y))
     {
         // we need ground level (including grid height version) for proper return water level in point
-        float ground_z = GetHeight(x, y, z, true, DEFAULT_WATER_SEARCH);
+        float ground_z = GetHeightStatic(x, y, z, true, DEFAULT_WATER_SEARCH) + 0.05f;
         if (pGround)
             *pGround = ground_z;
 
         GridMapLiquidData liquid_status;
 
-        GridMapLiquidStatus res = getLiquidStatus(x, y, ground_z, MAP_ALL_LIQUIDS, &liquid_status);
-        return res ? ( swim ? liquid_status.level - 2.0f : liquid_status.level) : ground_z;
+        if (!IsInWater(x, y, z, &liquid_status))
+            return ground_z;
+        else
+            return swim ? liquid_status.level - 2.0f : liquid_status.level;
     }
 
     return VMAP_INVALID_HEIGHT_VALUE;
 }
 
-GridMap * TerrainInfo::GetGrid( const float x, const float y )
+GridMapPtr TerrainInfo::GetGrid(float const& x, float const& y)
 {
     // half opt method
-    int gx=(int)(32-x/SIZE_OF_GRIDS);                       //grid x
-    int gy=(int)(32-y/SIZE_OF_GRIDS);                       //grid y
+    int gx = (int)(32 - x / SIZE_OF_GRIDS);                 // grid x
+    int gy = (int)(32 - y / SIZE_OF_GRIDS);                 // grid y
+
+    if (gx >= MAX_NUMBER_OF_GRIDS || gy >= MAX_NUMBER_OF_GRIDS ||
+        gx < 0 || gy < 0)
+        return GridMapPtr();
 
-    //quick check if GridMap already loaded
-    GridMap * pMap = m_GridMaps[gx][gy];
-    if(!pMap)
-         pMap = LoadMapAndVMap(gx, gy);
+    // quick check if GridMap already loaded
+    GridMapPtr pMap = GetGridMap(gx,gy);
+    if (!pMap)
+        pMap = LoadMapAndVMap(gx, gy);
 
     return pMap;
 }
 
-GridMap * TerrainInfo::LoadMapAndVMap( const uint32 x, const uint32 y )
+GridMapPtr TerrainInfo::LoadMapAndVMap(uint32 const& x, uint32 const& y)
 {
-    //double checked lock pattern
-    if(!m_GridMaps[x][y])
+    // double checked lock pattern
+    if (!GetGridMap(x, y))
     {
-        LOCK_GUARD lock(m_mutex);
-
-        if(!m_GridMaps[x][y])
+        WriteGuard Guard(GetLock(), true);
+        if (!m_GridMaps[x][y])
         {
-            GridMap * map = new GridMap();
+            GridMapPtr map = GridMapPtr(new GridMap());
 
             // map file name
-            char *tmp=NULL;
-            int len = sWorld.GetDataPath().length()+strlen("maps/%03u%02u%02u.map")+1;
-            tmp = new char[len];
-            snprintf(tmp, len, (char *)(sWorld.GetDataPath()+"maps/%03u%02u%02u.map").c_str(),m_mapId, x, y);
-            sLog.outDetail("Loading map %s",tmp);
+            int len = sWorld.GetDataPath().length() + strlen("maps/%03u%02u%02u.map") + 1;
+            char* tmp = new char[len];
+            snprintf(tmp, len, (char*)(sWorld.GetDataPath() + "maps/%03u%02u%02u.map").c_str(), m_mapId, x, y);
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "Loading map %s", tmp);
 
-            if(!map->loadData(tmp))
+            if (!map->loadData(tmp))
             {
                 sLog.outError("Error load map file: \n %s\n", tmp);
-                //ASSERT(false);
+                return GridMapPtr();
             }
 
-            delete [] tmp;
+            delete[] tmp;
             m_GridMaps[x][y] = map;
 
-            //load VMAPs for current map/grid...
-            const MapEntry * i_mapEntry = sMapStore.LookupEntry(m_mapId);
+            // load VMAPs for current map/grid...
+            const MapEntry* i_mapEntry = sMapStore.LookupEntry(m_mapId);
             const char* mapName = i_mapEntry ? i_mapEntry->name[sWorld.GetDefaultDbcLocale()] : "UNNAMEDMAP\x0";
 
-            int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld.GetDataPath()+ "vmaps").c_str(),  m_mapId, x, y);
-            switch(vmapLoadResult)
+            int vmapLoadResult = i_mapEntry->IsTransport() ? VMAP::VMAP_LOAD_RESULT_IGNORED : VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld.GetDataPath()+ "vmaps").c_str(),  m_mapId, x, y);
+            switch (vmapLoadResult)
             {
-            case VMAP::VMAP_LOAD_RESULT_OK:
-                sLog.outDetail("VMAP loaded name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", mapName, m_mapId, x,y,x,y);
-                break;
-            case VMAP::VMAP_LOAD_RESULT_ERROR:
-                sLog.outDetail("Could not load VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", mapName, m_mapId, x,y,x,y);
-                break;
-            case VMAP::VMAP_LOAD_RESULT_IGNORED:
-                DEBUG_LOG("Ignored VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", mapName, m_mapId, x,y,x,y);
-                break;
+                case VMAP::VMAP_LOAD_RESULT_OK:
+                    DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "VMAP loaded name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", mapName, m_mapId, x, y, x, y);
+                    break;
+                case VMAP::VMAP_LOAD_RESULT_ERROR:
+                    DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "Could not load VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", mapName, m_mapId, x, y, x, y);
+                    break;
+                case VMAP::VMAP_LOAD_RESULT_IGNORED:
+                    DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "Ignored VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", mapName, m_mapId, x, y, x, y);
+                    break;
             }
 
             // load navmesh
             MMAP::MMapFactory::createOrGetMMapManager()->loadMap(m_mapId, x, y);
         }
     }
-
-    return  m_GridMaps[x][y];
+    return GetGridMap(x, y);
 }
 
 float TerrainInfo::GetWaterLevel(float x, float y, float z, float* pGround /*= NULL*/) const
@@ -1107,7 +1179,7 @@ float TerrainInfo::GetWaterLevel(float x, float y, float z, float* pGround /*= N
     if (const_cast<TerrainInfo*>(this)->GetGrid(x, y))
     {
         // we need ground level (including grid height version) for proper return water level in point
-        float ground_z = GetHeight(x, y, z, true, DEFAULT_WATER_SEARCH);
+        float ground_z = GetHeightStatic(x, y, z, true, DEFAULT_WATER_SEARCH);
         if (pGround)
             *pGround = ground_z;
 
@@ -1123,11 +1195,22 @@ float TerrainInfo::GetWaterLevel(float x, float y, float z, float* pGround /*= N
     return VMAP_INVALID_HEIGHT_VALUE;
 }
 
-//////////////////////////////////////////////////////////////////////////
+bool TerrainInfo::IsNextZcoordOK(float x, float y, float oldZ, float maxDiff) const
+{
+    return ((fabs(GetHeightStatic(x, y, oldZ, true) - oldZ) < maxDiff ) || (fabs(GetHeightStatic(x, y, oldZ, false) - oldZ) < maxDiff ));
+}
+
+GridMapPtr TerrainInfo::GetGridMap(uint32 const& x, uint32 const& y)
+{
+    if (x >= MAX_NUMBER_OF_GRIDS || y >= MAX_NUMBER_OF_GRIDS)
+        return GridMapPtr();
+
+    ReadGuard Guard(GetLock(), true);
+    return m_GridMaps[x][y];
+}
 
-#define CLASS_LOCK MaNGOS::ClassLevelLockable<TerrainManager, ACE_Thread_Mutex>
-INSTANTIATE_SINGLETON_2(TerrainManager, CLASS_LOCK);
-INSTANTIATE_CLASS_MUTEX(TerrainManager, ACE_Thread_Mutex);
+//////////////////////////////////////////////////////////////////////////
+INSTANTIATE_SINGLETON_1(TerrainManager);
 
 TerrainManager::TerrainManager()
 {
@@ -1135,65 +1218,56 @@ TerrainManager::TerrainManager()
 
 TerrainManager::~TerrainManager()
 {
-    for (TerrainDataMap::iterator it = i_TerrainMap.begin(); it != i_TerrainMap.end(); ++it)
-        delete it->second;
+    i_TerrainMap.clear();
 }
 
-TerrainInfo * TerrainManager::LoadTerrain(const uint32 mapId)
+TerrainInfoPtr TerrainManager::LoadTerrain(uint32 const& mapId)
 {
-    Guard _guard(*this);
-
-    TerrainInfo * ptr = NULL;
+    TerrainInfoPtr ptr = TerrainInfoPtr();
     TerrainDataMap::const_iterator iter = i_TerrainMap.find(mapId);
-    if(iter == i_TerrainMap.end())
+    if (iter == i_TerrainMap.end())
     {
-        ptr = new TerrainInfo(mapId);
-        i_TerrainMap[mapId] = ptr;
+        ptr = TerrainInfoPtr(new TerrainInfo(mapId));
+        i_TerrainMap.insert(TerrainDataMap::value_type(mapId,ptr));
     }
     else
-        ptr = (*iter).second;
+        ptr = iter->second;
 
     return ptr;
 }
 
-void TerrainManager::UnloadTerrain(const uint32 mapId)
+void TerrainManager::UnloadTerrain(uint32 const& mapId)
 {
-    if(sWorld.getConfig(CONFIG_BOOL_GRID_UNLOAD) == 0)
+    if (sWorld.getConfig(CONFIG_BOOL_GRID_UNLOAD) == 0)
         return;
 
-    Guard _guard(*this);
-
     TerrainDataMap::iterator iter = i_TerrainMap.find(mapId);
-    if(iter != i_TerrainMap.end())
+    if (iter != i_TerrainMap.end())
     {
-        TerrainInfo * ptr = (*iter).second;
-        //lets check if this object can be actually freed
-        if(ptr->IsReferenced() == false)
+        // lets check if this object can be actually freed (1 count SmartPtr in container, 1 count in map, from there called UnloadTerrain()
+        if (iter->second.count() < 3)
         {
             i_TerrainMap.erase(iter);
-            delete ptr;
+            // TerrainInfo data be auto-deleted if last link to smartPtr erased (in Map destructor).
         }
     }
 }
 
-void TerrainManager::Update(const uint32 diff)
+void TerrainManager::Update(uint32 const& diff)
 {
-    //global garbage collection for GridMap objects and VMaps
+    // global garbage collection for GridMap objects and VMaps
     for (TerrainDataMap::iterator iter = i_TerrainMap.begin(); iter != i_TerrainMap.end(); ++iter)
         iter->second->CleanUpGrids(diff);
 }
 
 void TerrainManager::UnloadAll()
 {
-    for (TerrainDataMap::iterator it = i_TerrainMap.begin(); it != i_TerrainMap.end(); ++it)
-        delete it->second;
-
     i_TerrainMap.clear();
 }
 
-uint32 TerrainManager::GetAreaIdByAreaFlag(uint16 areaflag,uint32 map_id)
+uint32 TerrainManager::GetAreaIdByAreaFlag(uint16 areaflag, uint32 map_id)
 {
-    AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag,map_id);
+    AreaTableEntry const* entry = GetAreaEntryByAreaFlagAndMap(areaflag, map_id);
 
     if (entry)
         return entry->ID;
@@ -1201,20 +1275,20 @@ uint32 TerrainManager::GetAreaIdByAreaFlag(uint16 areaflag,uint32 map_id)
         return 0;
 }
 
-uint32 TerrainManager::GetZoneIdByAreaFlag(uint16 areaflag,uint32 map_id)
+uint32 TerrainManager::GetZoneIdByAreaFlag(uint16 areaflag, uint32 map_id)
 {
-    AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag,map_id);
+    AreaTableEntry const* entry = GetAreaEntryByAreaFlagAndMap(areaflag, map_id);
 
-    if( entry )
-        return ( entry->zone != 0 ) ? entry->zone : entry->ID;
+    if (entry)
+        return (entry->zone != 0) ? entry->zone : entry->ID;
     else
         return 0;
 }
 
-void TerrainManager::GetZoneAndAreaIdByAreaFlag(uint32& zoneid, uint32& areaid, uint16 areaflag,uint32 map_id)
+void TerrainManager::GetZoneAndAreaIdByAreaFlag(uint32& zoneid, uint32& areaid, uint16 areaflag, uint32 map_id)
 {
-    AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag,map_id);
+    AreaTableEntry const* entry = GetAreaEntryByAreaFlagAndMap(areaflag, map_id);
 
     areaid = entry ? entry->ID : 0;
-    zoneid = entry ? (( entry->zone != 0 ) ? entry->zone : entry->ID) : 0;
+    zoneid = entry ? ((entry->zone != 0) ? entry->zone : entry->ID) : 0;
 }
diff --git a/src/game/GridMap.h b/src/game/GridMap.h
index 12693ad21cd..94403bbe7be 100644
--- a/src/game/GridMap.h
+++ b/src/game/GridMap.h
@@ -21,6 +21,7 @@
 
 #include "Platform/Define.h"
 #include "Policies/Singleton.h"
+#include "Cell.h"
 #include "DBCStructure.h"
 #include "GridDefines.h"
 #include "Object.h"
@@ -110,7 +111,8 @@ enum GridMapLiquidStatus
 
 struct GridMapLiquidData
 {
-    uint32 type;
+    uint32 type_flags;
+    uint32 entry;
     float level;
     float depth_level;
 };
@@ -148,7 +150,8 @@ class GridMap
         uint8 m_liquid_width;
         uint8 m_liquid_height;
         float m_liquidLevel;
-        uint8 *m_liquid_type;
+        uint16* m_liquidEntry;
+        uint8* m_liquidFlags;
         float *m_liquid_map;
 
         bool loadAreaData(FILE *in, uint32 offset, uint32 size);
@@ -181,48 +184,23 @@ class GridMap
         GridMapLiquidStatus getLiquidStatus(float x, float y, float z, uint8 ReqLiquidType, GridMapLiquidData *data = 0);
 };
 
-template<typename Countable>
-class MANGOS_DLL_SPEC Referencable
-{
-public:
-    Referencable() { m_count = 0; }
-
-    void AddRef() { ++m_count; }
-    bool Release() { return (--m_count < 1); }
-    bool IsReferenced() const { return (m_count > 0); }
-
-private:
-    Referencable(const Referencable&);
-    Referencable& operator=(const Referencable&);
-
-    Countable m_count;
-};
-
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, long> AtomicLong;
-
-#define MAX_HEIGHT            100000.0f                     // can be use for find ground height at surface
-#define INVALID_HEIGHT       -100000.0f                     // for check, must be equal to VMAP_INVALID_HEIGHT, real value for unknown height is VMAP_INVALID_HEIGHT_VALUE
-#define INVALID_HEIGHT_VALUE -200000.0f                     // for return, must be equal to VMAP_INVALID_HEIGHT_VALUE, check value for unknown height is VMAP_INVALID_HEIGHT
-#define MAX_FALL_DISTANCE     250000.0f                     // "unlimited fall" to find VMap ground if it is available, just larger than MAX_HEIGHT - INVALID_HEIGHT
-#define DEFAULT_HEIGHT_SEARCH     10.0f                     // default search distance to find height at nearby locations
-#define DEFAULT_WATER_SEARCH      50.0f                     // default search distance to case detection water level
-
 //class for sharing and managin GridMap objects
-class MANGOS_DLL_SPEC TerrainInfo : public Referencable<AtomicLong>
+class MANGOS_DLL_SPEC TerrainInfo
 {
 public:
     TerrainInfo(uint32 mapid);
     ~TerrainInfo();
 
-    uint32 GetMapId() const { return m_mapId; }
+    uint32 const& GetMapId() const { return m_mapId; }
 
-    //TODO: move all terrain/vmaps data info query functions
-    //from 'Map' class into this class
-    float GetHeight(float x, float y, float z, bool pCheckVMap=true, float maxSearchDist=DEFAULT_HEIGHT_SEARCH) const;
+    // TODO: move all terrain/vmaps data info query functions
+    // from 'Map' class into this class
+    float GetHeightStatic(float x, float y, float z, bool pCheckVMap = true, float maxSearchDist = DEFAULT_HEIGHT_SEARCH) const;
     float GetWaterLevel(float x, float y, float z, float* pGround = NULL) const;
     float GetWaterOrGroundLevel(float x, float y, float z, float* pGround = NULL, bool swim = false) const;
-    bool IsInWater(float x, float y, float z, GridMapLiquidData *data = 0) const;
-    bool IsUnderWater(float x, float y, float z) const;
+    bool IsInWater(float x, float y, float z, GridMapLiquidData* data = 0, float min_depth = 2.0f) const;
+    bool IsAboveWater(float x, float y, float z, float* pWaterZ = NULL) const;
+    bool IsUnderWater(float x, float y, float z, float* pWaterZ = NULL) const;
 
     GridMapLiquidStatus getLiquidStatus(float x, float y, float z, uint8 ReqLiquidType, GridMapLiquidData *data = 0) const;
 
@@ -232,63 +210,62 @@ class MANGOS_DLL_SPEC TerrainInfo : public Referencable<AtomicLong>
     uint32 GetAreaId(float x, float y, float z) const;
     uint32 GetZoneId(float x, float y, float z) const;
     void GetZoneAndAreaId(uint32& zoneid, uint32& areaid, float x, float y, float z) const;
+    uint32 GetZoneId(Cell const& cell) const;
+    uint32 GetZoneId(GridPair const& gridPair) const;
 
     bool GetAreaInfo(float x, float y, float z, uint32 &mogpflags, int32 &adtId, int32 &rootId, int32 &groupId) const;
     bool IsOutdoors(float x, float y, float z) const;
 
+    bool IsNextZcoordOK(float x, float y, float oldZ, float maxDiff = 5.0f) const;
 
     //this method should be used only by TerrainManager
     //to cleanup unreferenced GridMap objects - they are too heavy
     //to destroy them dynamically, especially on highly populated servers
     //THIS METHOD IS NOT THREAD-SAFE!!!! AND IT SHOULDN'T BE THREAD-SAFE!!!!
-    void CleanUpGrids(const uint32 diff);
+    void CleanUpGrids(uint32 const diff);
 
 protected:
     friend class Map;
     //load/unload terrain data
-    GridMap * Load(const uint32 x, const uint32 y);
-    void Unload(const uint32 x, const uint32 y);
+    GridMapPtr  Load(uint32 const& x, uint32 const& y);
+    void Unload(uint32 const& x, uint32 const& y);
 
 private:
     TerrainInfo(const TerrainInfo&);
-    TerrainInfo& operator=(const TerrainInfo&);
-
-    GridMap * GetGrid( const float x, const float y );
-    GridMap * LoadMapAndVMap(const uint32 x, const uint32 y );
+    TerrainInfo& operator = (TerrainInfo const&);
 
-    int RefGrid(const uint32& x, const uint32& y);
-    int UnrefGrid(const uint32& x, const uint32& y);
+    GridMapPtr GetGrid(float const& x, float const& y );
+    GridMapPtr LoadMapAndVMap(uint32 const& x, uint32 const& y);
+    GridMapPtr GetGridMap(uint32 const& x, uint32 const& y);
 
-    const uint32 m_mapId;
+    uint32 const m_mapId;
 
-    GridMap *m_GridMaps[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS];
-    int16 m_GridRef[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS];
+    GridMapPtr m_GridMaps[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS];
 
-    //global garbage collection timer
-    ShortIntervalTimer i_timer;
+    typedef MANGOSR2_MUTEX_MODEL         LockType;
+    typedef ACE_Read_Guard<LockType>     ReadGuard;
+    typedef ACE_Write_Guard<LockType>    WriteGuard;
+    mutable LockType                     i_lock;
+    LockType&                            GetLock() { return i_lock; }
 
-    typedef ACE_Thread_Mutex LOCK_TYPE;
-    typedef ACE_Guard<LOCK_TYPE> LOCK_GUARD;
-    LOCK_TYPE m_mutex;
-    LOCK_TYPE m_refMutex;
 };
 
 //class for managing TerrainData object and all sort of geometry querying operations
-class MANGOS_DLL_DECL TerrainManager : public MaNGOS::Singleton<TerrainManager, MaNGOS::ClassLevelLockable<TerrainManager, ACE_Thread_Mutex> >
+class MANGOS_DLL_DECL TerrainManager : public MaNGOS::Singleton<TerrainManager, MaNGOS::ClassLevelLockable<TerrainManager, MANGOSR2_MUTEX_MODEL_2> >
 {
-    typedef UNORDERED_MAP<uint32,  TerrainInfo *> TerrainDataMap;
+    typedef UNORDERED_MAP<uint32,  TerrainInfoPtr> TerrainDataMap;
     friend class MaNGOS::OperatorNew<TerrainManager>;
 
 public:
-    TerrainInfo * LoadTerrain(const uint32 mapId);
-    void UnloadTerrain(const uint32 mapId);
+    TerrainInfoPtr LoadTerrain(uint32 const& mapId);
+    void UnloadTerrain(uint32 const& mapId);
 
-    void Update(const uint32 diff);
+    void Update(uint32 const& diff);
     void UnloadAll();
 
     uint16 GetAreaFlag(uint32 mapid, float x, float y, float z) const
     {
-        TerrainInfo *pData = const_cast<TerrainManager*>(this)->LoadTerrain(mapid);
+        TerrainInfoPtr pData = const_cast<TerrainManager*>(this)->LoadTerrain(mapid);
         return pData->GetAreaFlag(x, y, z);
     }
     uint32 GetAreaId(uint32 mapid, float x, float y, float z) const
@@ -315,7 +292,6 @@ class MANGOS_DLL_DECL TerrainManager : public MaNGOS::Singleton<TerrainManager,
     TerrainManager(const TerrainManager &);
     TerrainManager& operator=(const TerrainManager &);
 
-    typedef MaNGOS::ClassLevelLockable<TerrainManager, ACE_Thread_Mutex>::Lock Guard;
     TerrainDataMap i_TerrainMap;
 };
 
diff --git a/src/game/GridNotifiers.cpp b/src/game/GridNotifiers.cpp
index 315825b65c4..d103bf10009 100644
--- a/src/game/GridNotifiers.cpp
+++ b/src/game/GridNotifiers.cpp
@@ -24,47 +24,52 @@
 #include "Map.h"
 #include "Transports.h"
 #include "ObjectAccessor.h"
-#include "BattleGroundMgr.h"
+#include "BattleGround/BattleGroundMgr.h"
+#include "CreatureAI.h"
 
 using namespace MaNGOS;
 
-void
-VisibleChangesNotifier::Visit(CameraMapType &m)
+void VisibleChangesNotifier::Visit(CameraMapType& m)
 {
-    for(CameraMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
+    for (CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
         iter->getSource()->UpdateVisibilityOf(&i_object);
     }
 }
 
-void
-VisibleNotifier::Notify()
+void VisibleNotifier::Notify()
 {
     Player& player = *i_camera.GetOwner();
-    // at this moment i_clientGUIDs have guids that not iterate at grid level checks
+    // at this moment i_clientGuids have guids that not iterate at grid level checks
     // but exist one case when this possible and object not out of range: transports
-    if(Transport* transport = player.GetTransport())
+    // FIXME - need remove this hack after full repair per-grid visibility on transport!
+    if (Transport* transport = player.GetTransport())
+        transport->GetTransportBase()->CallForAllPassengers(UpdateVisibilityOfWithHelper(player, i_clientGuids, i_data, i_visibleNow));
+
+    // generate outOfRange for not iterate objects
+    for (GuidSet::iterator itr = i_clientGuids.begin(); itr != i_clientGuids.end(); ++itr)
     {
-        for(Transport::PlayerSet::const_iterator itr = transport->GetPassengers().begin();itr!=transport->GetPassengers().end();++itr)
+        ObjectGuid guid = *itr;
+        if (!player.GetMap()->IsVisibleGlobally(guid))
+        {
+            i_data.AddOutOfRangeGuid(guid);
+            player.RemoveClientGuid(guid);
+            DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "VisibleNotifier::Notify %s is out of range (no in active cells set) now for %s",
+                guid.GetString().c_str(), player.GetGuidStr().c_str());
+        }
+        else
         {
-            if (i_clientGUIDs.find((*itr)->GetObjectGuid()) != i_clientGUIDs.end())
+            if (WorldObject* object = player.GetMap()->GetWorldObject(guid))
             {
-                // ignore far sight case
-                (*itr)->UpdateVisibilityOf(*itr, &player);
-                player.UpdateVisibilityOf(&player, *itr, i_data, i_visibleNow);
-                i_clientGUIDs.erase((*itr)->GetObjectGuid());
+                object->AddNotifiedClient(player.GetObjectGuid());
+                DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "VisibleNotifier::Notify try make %s is out of range for %s, but his visible globally (distance %f). Need check movement trajectory.",
+                    guid.GetString().c_str(), player.GetGuidStr().c_str(), player.GetDistance(object));
             }
-        }
-    }
-
-    // generate outOfRange for not iterate objects
-    i_data.AddOutOfRangeGUID(i_clientGUIDs);
-    for(ObjectGuidSet::iterator itr = i_clientGUIDs.begin();itr!=i_clientGUIDs.end();++itr)
-    {
-        player.m_clientGUIDs.erase(*itr);
+            else
+                i_data.AddOutOfRangeGuid(guid);
 
-        DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "%s is out of range (no in active cells set) now for %s",
-            itr->GetString().c_str(), player.GetGuidStr().c_str());
+            player.RemoveClientGuid(guid);
+        }
     }
 
     if (i_data.HasData())
@@ -75,21 +80,21 @@ VisibleNotifier::Notify()
         player.GetSession()->SendPacket(&packet);
 
         // send out of range to other players if need
-        ObjectGuidSet const& oor = i_data.GetOutOfRangeGUIDs();
-        for(ObjectGuidSet::const_iterator iter = oor.begin(); iter != oor.end(); ++iter)
+        GuidSet const& oor = i_data.GetOutOfRangeGuids();
+        for (GuidSet::const_iterator iter = oor.begin(); iter != oor.end(); ++iter)
         {
             if (!iter->IsPlayer())
                 continue;
 
             if (Player* plr = ObjectAccessor::FindPlayer(*iter))
-                plr->UpdateVisibilityOf(plr->GetCamera().GetBody(), &player);
+                plr->UpdateVisibilityOf(plr->GetCamera()->GetBody(), &player);
         }
     }
 
     // Now do operations that required done at object visibility change to visible
 
     // send data at target visibility change (adding to client)
-    for(std::set<WorldObject*>::const_iterator vItr = i_visibleNow.begin(); vItr != i_visibleNow.end(); ++vItr)
+    for (WorldObjectSet::const_iterator vItr = i_visibleNow.begin(); vItr != i_visibleNow.end(); ++vItr)
     {
         // target aura duration for caster show only if target exist at caster client
         if ((*vItr) != &player && (*vItr)->isType(TYPEMASK_UNIT))
@@ -97,10 +102,9 @@ VisibleNotifier::Notify()
     }
 }
 
-void
-MessageDeliverer::Visit(CameraMapType &m)
+void MessageDeliverer::Visit(CameraMapType& m)
 {
-    for(CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
+    for (CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
         Player* owner = iter->getSource()->GetOwner();
 
@@ -115,9 +119,9 @@ MessageDeliverer::Visit(CameraMapType &m)
     }
 }
 
-void MessageDelivererExcept::Visit(CameraMapType &m)
+void MessageDelivererExcept::Visit(CameraMapType& m)
 {
-    for(CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
+    for (CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
         Player* owner = iter->getSource()->GetOwner();
 
@@ -129,30 +133,27 @@ void MessageDelivererExcept::Visit(CameraMapType &m)
     }
 }
 
-
-void
-ObjectMessageDeliverer::Visit(CameraMapType &m)
+void ObjectMessageDeliverer::Visit(CameraMapType& m)
 {
-    for(CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
+    for (CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
-        if(!iter->getSource()->GetBody()->InSamePhase(i_phaseMask))
+        if (!iter->getSource()->GetBody()->InSamePhase(i_phaseMask))
             continue;
 
-        if(WorldSession* session = iter->getSource()->GetOwner()->GetSession())
+        if (WorldSession* session = iter->getSource()->GetOwner()->GetSession())
             session->SendPacket(i_message);
     }
 }
 
-void
-MessageDistDeliverer::Visit(CameraMapType &m)
+void MessageDistDeliverer::Visit(CameraMapType& m)
 {
-    for(CameraMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
+    for (CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
-        Player * owner = iter->getSource()->GetOwner();
+        Player* owner = iter->getSource()->GetOwner();
 
         if ((i_toSelf || owner != &i_player) &&
-            (!i_ownTeamOnly || owner->GetTeam() == i_player.GetTeam()) &&
-            (!i_dist || iter->getSource()->GetBody()->IsWithinDist(&i_player,i_dist)))
+                (!i_ownTeamOnly || owner->GetTeam() == i_player.GetTeam()) &&
+                (!i_dist || iter->getSource()->GetBody()->IsWithinDist(&i_player, i_dist)))
         {
             if (!i_player.InSamePhase(iter->getSource()->GetBody()))
                 continue;
@@ -163,12 +164,11 @@ MessageDistDeliverer::Visit(CameraMapType &m)
     }
 }
 
-void
-ObjectMessageDistDeliverer::Visit(CameraMapType &m)
+void ObjectMessageDistDeliverer::Visit(CameraMapType& m)
 {
-    for(CameraMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
+    for (CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
-        if (!i_dist || iter->getSource()->GetBody()->IsWithinDist(&i_object,i_dist))
+        if (!i_dist || iter->getSource()->GetBody()->IsWithinDist(&i_object, i_dist))
         {
             if (!i_object.InSamePhase(iter->getSource()->GetBody()))
                 continue;
@@ -179,34 +179,66 @@ ObjectMessageDistDeliverer::Visit(CameraMapType &m)
     }
 }
 
-template<class T> void
-ObjectUpdater::Visit(GridRefManager<T> &m)
+template<class T>
+void ObjectUpdater::Visit(GridRefManager<T>& m)
 {
-    for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter)
+    for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
-        WorldObject::UpdateHelper helper(iter->getSource());
+        WorldObject::UpdateHelper helper(*iter->getSource());
         helper.Update(i_timeDiff);
     }
 }
 
-bool CannibalizeObjectCheck::operator()(Corpse* u)
+bool RaiseDeadObjectCheck::operator()(Corpse* u)
 {
     // ignore bones
-    if(u->GetType()==CORPSE_BONES)
+    if (u->GetType() == CORPSE_BONES || !u->IsInWorld())
         return false;
 
     Player* owner = ObjectAccessor::FindPlayer(u->GetOwnerGuid());
 
-    if( !owner || i_fobj->IsFriendlyTo(owner))
+    if (!owner || !owner->IsInWorld())
         return false;
 
-    if(i_fobj->IsWithinDistInMap(u, i_range) )
+    return i_fobj->IsWithinDistInMap(u, i_range);
+}
+
+bool NearestCorpseInObjectRangeCheck::operator()(Corpse* u)
+{
+    // ignore bones
+    if (u->GetType() == CORPSE_BONES)
+        return false;
+
+    Player* owner = ObjectAccessor::FindPlayer(u->GetOwnerGuid());
+
+    if (owner && i_obj.IsWithinDistInMap(owner, i_range))
+    {
+        i_range = i_obj.GetDistance(owner);         // use found unit range as new range limit for next check
         return true;
+    }
+    return false;
+}
+
+bool CannibalizeObjectCheck::operator()(Corpse* u)
+{
+    // ignore bones
+    if (!u->IsInWorld() || u->GetType() == CORPSE_BONES)
+        return false;
+
+    Player* owner = ObjectAccessor::FindPlayer(u->GetOwnerGuid());
+
+    if (!owner || !owner->IsInWorld() || i_fobj->IsFriendlyTo(owner))
+        return false;
 
+    if (i_fobj->IsWithinDistInMap(u, i_range))
+    {
+        i_range = i_fobj->GetDistance(u);         // use found unit range as new range limit for next check
+        return true;
+    }
     return false;
 }
 
-void MaNGOS::RespawnDo::operator()( Creature* u ) const
+void MaNGOS::RespawnDo::operator()(Creature* u) const
 {
     // prevent respawn creatures for not active BG event
     Map* map = u->GetMap();
@@ -220,7 +252,7 @@ void MaNGOS::RespawnDo::operator()( Creature* u ) const
     u->Respawn();
 }
 
-void MaNGOS::RespawnDo::operator()( GameObject* u ) const
+void MaNGOS::RespawnDo::operator()(GameObject* u) const
 {
     // prevent respawn gameobject for not active BG event
     Map* map = u->GetMap();
@@ -234,6 +266,43 @@ void MaNGOS::RespawnDo::operator()( GameObject* u ) const
     u->Respawn();
 }
 
+void MaNGOS::CallOfHelpCreatureInRangeDo::operator()(Creature* u)
+{
+    if (u == i_funit)
+        return;
+
+    if (!u->CanAssistTo(i_funit, i_enemy, false))
+        return;
+
+    // too far
+    if (!i_funit->IsWithinDistInMap(u, i_range))
+        return;
+
+    // only if see assisted creature
+    if (!i_funit->IsWithinLOSInMap(u))
+        return;
+
+    if (u->AI())
+        u->AI()->AttackStart(i_enemy);
+}
+
+bool MaNGOS::AnyAssistCreatureInRangeCheck::operator()(Creature* u)
+{
+    if (u == i_funit)
+        return false;
+
+    if (!u->CanAssistTo(i_funit, i_enemy))
+        return false;
+
+    // too far
+    if (!i_funit->IsWithinDistInMap(u, i_range))
+        return false;
+
+    // only if see assisted creature
+    if (!i_funit->IsWithinLOSInMap(u))
+        return false;
+
+    return true;
+}
 
-template void ObjectUpdater::Visit<GameObject>(GameObjectMapType &);
-template void ObjectUpdater::Visit<DynamicObject>(DynamicObjectMapType &);
+template void ObjectUpdater::Visit<DynamicObject>(DynamicObjectMapType&);
diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h
index 1bf7976cc7c..1a20e39f092 100644
--- a/src/game/GridNotifiers.h
+++ b/src/game/GridNotifiers.h
@@ -29,10 +29,6 @@
 #include "GameObject.h"
 #include "Player.h"
 #include "Unit.h"
-#include "CreatureAI.h"
-
-class Player;
-//class Map;
 
 namespace MaNGOS
 {
@@ -40,32 +36,32 @@ namespace MaNGOS
     {
         Camera& i_camera;
         UpdateData i_data;
-        ObjectGuidSet i_clientGUIDs;
-        std::set<WorldObject*> i_visibleNow;
+        GuidSet i_clientGuids;
+        WorldObjectSet i_visibleNow;
 
-        explicit VisibleNotifier(Camera &c) : i_camera(c), i_clientGUIDs(c.GetOwner()->m_clientGUIDs) {}
-        template<class T> void Visit(GridRefManager<T> &m);
-        void Visit(CameraMapType &m) {}
+        explicit VisibleNotifier(Camera& c) : i_camera(c), i_clientGuids(c.GetOwner()->GetClientGuids()) {}
+        template<class T> void Visit(GridRefManager<T>& m);
+        void Visit(CameraMapType& /*m*/) {}
         void Notify(void);
     };
 
     struct MANGOS_DLL_DECL VisibleChangesNotifier
     {
-        WorldObject &i_object;
+        WorldObject& i_object;
 
-        explicit VisibleChangesNotifier(WorldObject &object) : i_object(object) {}
-        template<class T> void Visit(GridRefManager<T> &) {}
-        void Visit(CameraMapType &);
+        explicit VisibleChangesNotifier(WorldObject& object) : i_object(object) {}
+        template<class T> void Visit(GridRefManager<T>&) {}
+        void Visit(CameraMapType&);
     };
 
     struct MANGOS_DLL_DECL MessageDeliverer
     {
-        Player &i_player;
-        WorldPacket *i_message;
+        Player const& i_player;
+        WorldPacket* i_message;
         bool i_toSelf;
-        MessageDeliverer(Player &pl, WorldPacket *msg, bool to_self) : i_player(pl), i_message(msg), i_toSelf(to_self) {}
-        void Visit(CameraMapType &m);
-        template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
+        MessageDeliverer(Player const& pl, WorldPacket* msg, bool to_self) : i_player(pl), i_message(msg), i_toSelf(to_self) {}
+        void Visit(CameraMapType& m);
+        template<class SKIP> void Visit(GridRefManager<SKIP>&) {}
     };
 
     struct MessageDelivererExcept
@@ -74,94 +70,95 @@ namespace MaNGOS
         WorldPacket*  i_message;
         Player const* i_skipped_receiver;
 
-        MessageDelivererExcept(WorldObject const* obj, WorldPacket *msg, Player const* skipped)
+        MessageDelivererExcept(WorldObject const* obj, WorldPacket* msg, Player const* skipped)
             : i_phaseMask(obj->GetPhaseMask()), i_message(msg), i_skipped_receiver(skipped) {}
 
-        void Visit(CameraMapType &m);
-        template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
+        void Visit(CameraMapType& m);
+        template<class SKIP> void Visit(GridRefManager<SKIP>&) {}
     };
 
     struct MANGOS_DLL_DECL ObjectMessageDeliverer
     {
         uint32 i_phaseMask;
-        WorldPacket *i_message;
-        explicit ObjectMessageDeliverer(WorldObject& obj, WorldPacket *msg)
+        WorldPacket* i_message;
+        explicit ObjectMessageDeliverer(WorldObject const& obj, WorldPacket* msg)
             : i_phaseMask(obj.GetPhaseMask()), i_message(msg) {}
-        void Visit(CameraMapType &m);
-        template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
+        void Visit(CameraMapType& m);
+        template<class SKIP> void Visit(GridRefManager<SKIP>&) {}
     };
 
     struct MANGOS_DLL_DECL MessageDistDeliverer
     {
-        Player &i_player;
-        WorldPacket *i_message;
+        Player const& i_player;
+        WorldPacket* i_message;
         bool i_toSelf;
         bool i_ownTeamOnly;
         float i_dist;
 
-        MessageDistDeliverer(Player &pl, WorldPacket *msg, float dist, bool to_self, bool ownTeamOnly)
+        MessageDistDeliverer(Player const& pl, WorldPacket* msg, float dist, bool to_self, bool ownTeamOnly)
             : i_player(pl), i_message(msg), i_toSelf(to_self), i_ownTeamOnly(ownTeamOnly), i_dist(dist) {}
-        void Visit(CameraMapType &m);
-        template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
+        void Visit(CameraMapType& m);
+        template<class SKIP> void Visit(GridRefManager<SKIP>&) {}
     };
 
     struct MANGOS_DLL_DECL ObjectMessageDistDeliverer
     {
-        WorldObject &i_object;
-        WorldPacket *i_message;
+        WorldObject const& i_object;
+        WorldPacket* i_message;
         float i_dist;
-        ObjectMessageDistDeliverer(WorldObject &obj, WorldPacket *msg, float dist) : i_object(obj), i_message(msg), i_dist(dist) {}
-        void Visit(CameraMapType &m);
-        template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
+        ObjectMessageDistDeliverer(WorldObject const& obj, WorldPacket* msg, float dist) : i_object(obj), i_message(msg), i_dist(dist) {}
+        void Visit(CameraMapType& m);
+        template<class SKIP> void Visit(GridRefManager<SKIP>&) {}
     };
 
     struct MANGOS_DLL_DECL ObjectUpdater
     {
         uint32 i_timeDiff;
-        explicit ObjectUpdater(const uint32 &diff) : i_timeDiff(diff) {}
-        template<class T> void Visit(GridRefManager<T> &m);
-        void Visit(PlayerMapType &) {}
-        void Visit(CorpseMapType &) {}
-        void Visit(CameraMapType &) {}
-        void Visit(CreatureMapType &);
+        explicit ObjectUpdater(const uint32& diff) : i_timeDiff(diff) {}
+        template<class T> void Visit(GridRefManager<T>& m);
+        void Visit(PlayerMapType&) {}
+        void Visit(CorpseMapType&) {}
+        void Visit(CameraMapType&) {}
+        void Visit(CreatureMapType&);
+        void Visit(GameObjectMapType&);
     };
 
     struct MANGOS_DLL_DECL PlayerRelocationNotifier
     {
-        Player &i_player;
-        PlayerRelocationNotifier(Player &pl) : i_player(pl) {}
-        template<class T> void Visit(GridRefManager<T> &) {}
-        void Visit(CreatureMapType &);
+        Player& i_player;
+        PlayerRelocationNotifier(Player& pl) : i_player(pl) {}
+        template<class T> void Visit(GridRefManager<T>&) {}
+        void Visit(CreatureMapType&);
     };
 
     struct MANGOS_DLL_DECL CreatureRelocationNotifier
     {
-        Creature &i_creature;
-        CreatureRelocationNotifier(Creature &c) : i_creature(c) {}
-        template<class T> void Visit(GridRefManager<T> &) {}
-        #ifdef WIN32
-        template<> void Visit(PlayerMapType &);
-        #endif
+        Creature& i_creature;
+        CreatureRelocationNotifier(Creature& c) : i_creature(c) {}
+        template<class T> void Visit(GridRefManager<T>&) {}
+#ifdef WIN32
+        template<> void Visit(PlayerMapType&);
+#endif
     };
 
     struct MANGOS_DLL_DECL DynamicObjectUpdater
     {
-        DynamicObject &i_dynobject;
+        DynamicObject& i_dynobject;
         Unit* i_check;
         bool i_positive;
-        DynamicObjectUpdater(DynamicObject &dynobject, Unit* caster, bool positive) : i_dynobject(dynobject), i_positive(positive)
+        DynamicObjectUpdater(DynamicObject& dynobject, Unit* caster, bool positive) : i_dynobject(dynobject), i_positive(positive)
         {
             i_check = caster;
             Unit* owner = i_check->GetOwner();
-            if(owner)
+            if (owner)
                 i_check = owner;
         }
 
-        template<class T> inline void Visit(GridRefManager<T>  &) {}
-        #ifdef WIN32
-        template<> inline void Visit<Player>(PlayerMapType &);
-        template<> inline void Visit<Creature>(CreatureMapType &);
-        #endif
+        template<class T> inline void Visit(GridRefManager<T>&) {}
+#ifdef WIN32
+        template<> inline void Visit<Player>(PlayerMapType&);
+        template<> inline void Visit<Creature>(CreatureMapType&);
+#endif
 
         void VisitHelper(Unit* target);
     };
@@ -201,45 +198,45 @@ namespace MaNGOS
     // WorldObject searchers & workers
 
     template<class Check>
-        struct MANGOS_DLL_DECL WorldObjectSearcher
+    struct MANGOS_DLL_DECL WorldObjectSearcher
     {
         uint32 i_phaseMask;
-        WorldObject* &i_object;
-        Check &i_check;
+        WorldObject*& i_object;
+        Check& i_check;
 
-        WorldObjectSearcher(WorldObject* & result, Check& check)
-            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result),i_check(check) {}
+        WorldObjectSearcher(WorldObject*& result, Check& check)
+            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result), i_check(check) {}
 
-        void Visit(GameObjectMapType &m);
-        void Visit(PlayerMapType &m);
-        void Visit(CreatureMapType &m);
-        void Visit(CorpseMapType &m);
-        void Visit(DynamicObjectMapType &m);
+        void Visit(GameObjectMapType& m);
+        void Visit(PlayerMapType& m);
+        void Visit(CreatureMapType& m);
+        void Visit(CorpseMapType& m);
+        void Visit(DynamicObjectMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     template<class Check>
-        struct MANGOS_DLL_DECL WorldObjectListSearcher
+    struct MANGOS_DLL_DECL WorldObjectListSearcher
     {
         uint32 i_phaseMask;
-        std::list<WorldObject*> &i_objects;
+        std::list<WorldObject*>& i_objects;
         Check& i_check;
 
-        WorldObjectListSearcher(std::list<WorldObject*> &objects, Check & check)
-            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_objects(objects),i_check(check) {}
+        WorldObjectListSearcher(std::list<WorldObject*>& objects, Check& check)
+            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_objects(objects), i_check(check) {}
 
-        void Visit(PlayerMapType &m);
-        void Visit(CreatureMapType &m);
-        void Visit(CorpseMapType &m);
-        void Visit(GameObjectMapType &m);
-        void Visit(DynamicObjectMapType &m);
+        void Visit(PlayerMapType& m);
+        void Visit(CreatureMapType& m);
+        void Visit(CorpseMapType& m);
+        void Visit(GameObjectMapType& m);
+        void Visit(DynamicObjectMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     template<class Do>
-        struct MANGOS_DLL_DECL WorldObjectWorker
+    struct MANGOS_DLL_DECL WorldObjectWorker
     {
         uint32 i_phaseMask;
         Do const& i_do;
@@ -247,190 +244,190 @@ namespace MaNGOS
         WorldObjectWorker(WorldObject const* searcher, Do const& _do)
             : i_phaseMask(searcher->GetPhaseMask()), i_do(_do) {}
 
-        void Visit(GameObjectMapType &m)
+        void Visit(GameObjectMapType& m)
         {
-            for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
-                if(itr->getSource()->InSamePhase(i_phaseMask))
+            for (GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+                if (itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
 
-        void Visit(PlayerMapType &m)
+        void Visit(PlayerMapType& m)
         {
-            for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
-                if(itr->getSource()->InSamePhase(i_phaseMask))
+            for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+                if (itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
-        void Visit(CreatureMapType &m)
+        void Visit(CreatureMapType& m)
         {
-            for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
-                if(itr->getSource()->InSamePhase(i_phaseMask))
+            for (CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+                if (itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
 
-        void Visit(CorpseMapType &m)
+        void Visit(CorpseMapType& m)
         {
-            for(CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
-                if(itr->getSource()->InSamePhase(i_phaseMask))
+            for (CorpseMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+                if (itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
 
-        void Visit(DynamicObjectMapType &m)
+        void Visit(DynamicObjectMapType& m)
         {
-            for(DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
-                if(itr->getSource()->InSamePhase(i_phaseMask))
+            for (DynamicObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+                if (itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     // Gameobject searchers
 
     template<class Check>
-        struct MANGOS_DLL_DECL GameObjectSearcher
+    struct MANGOS_DLL_DECL GameObjectSearcher
     {
         uint32 i_phaseMask;
-        GameObject* &i_object;
-        Check &i_check;
+        GameObject*& i_object;
+        Check& i_check;
 
-        GameObjectSearcher(GameObject* & result, Check& check)
-            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result),i_check(check) {}
+        GameObjectSearcher(GameObject*& result, Check& check)
+            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result), i_check(check) {}
 
-        void Visit(GameObjectMapType &m);
+        void Visit(GameObjectMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     // Last accepted by Check GO if any (Check can change requirements at each call)
     template<class Check>
-        struct MANGOS_DLL_DECL GameObjectLastSearcher
+    struct MANGOS_DLL_DECL GameObjectLastSearcher
     {
         uint32 i_phaseMask;
-        GameObject* &i_object;
+        GameObject*& i_object;
         Check& i_check;
 
-        GameObjectLastSearcher(GameObject* & result, Check& check)
+        GameObjectLastSearcher(GameObject*& result, Check& check)
             : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result), i_check(check) {}
 
-        void Visit(GameObjectMapType &m);
+        void Visit(GameObjectMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     template<class Check>
-        struct MANGOS_DLL_DECL GameObjectListSearcher
+    struct MANGOS_DLL_DECL GameObjectListSearcher
     {
         uint32 i_phaseMask;
-        std::list<GameObject*> &i_objects;
+        std::list<GameObject*>& i_objects;
         Check& i_check;
 
-        GameObjectListSearcher(std::list<GameObject*> &objects, Check & check)
+        GameObjectListSearcher(std::list<GameObject*>& objects, Check& check)
             : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_objects(objects), i_check(check) {}
 
-        void Visit(GameObjectMapType &m);
+        void Visit(GameObjectMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     // Unit searchers
 
     // First accepted by Check Unit if any
     template<class Check>
-        struct MANGOS_DLL_DECL UnitSearcher
+    struct MANGOS_DLL_DECL UnitSearcher
     {
         uint32 i_phaseMask;
-        Unit* &i_object;
-        Check & i_check;
+        Unit*& i_object;
+        Check& i_check;
 
-        UnitSearcher(Unit* & result, Check & check)
-            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result),i_check(check) {}
+        UnitSearcher(Unit*& result, Check& check)
+            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result), i_check(check) {}
 
-        void Visit(CreatureMapType &m);
-        void Visit(PlayerMapType &m);
+        void Visit(CreatureMapType& m);
+        void Visit(PlayerMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     // Last accepted by Check Unit if any (Check can change requirements at each call)
     template<class Check>
-        struct MANGOS_DLL_DECL UnitLastSearcher
+    struct MANGOS_DLL_DECL UnitLastSearcher
     {
         uint32 i_phaseMask;
-        Unit* &i_object;
-        Check & i_check;
+        Unit*& i_object;
+        Check& i_check;
 
-        UnitLastSearcher(Unit* & result, Check & check)
-            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result),i_check(check) {}
+        UnitLastSearcher(Unit*& result, Check& check)
+            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result), i_check(check) {}
 
-        void Visit(CreatureMapType &m);
-        void Visit(PlayerMapType &m);
+        void Visit(CreatureMapType& m);
+        void Visit(PlayerMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     // All accepted by Check units if any
     template<class Check>
-        struct MANGOS_DLL_DECL UnitListSearcher
+    struct MANGOS_DLL_DECL UnitListSearcher
     {
         uint32 i_phaseMask;
-        std::list<Unit*> &i_objects;
+        std::list<Unit*>& i_objects;
         Check& i_check;
 
-        UnitListSearcher(std::list<Unit*> &objects, Check & check)
-            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_objects(objects),i_check(check) {}
+        UnitListSearcher(std::list<Unit*>& objects, Check& check)
+            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_objects(objects), i_check(check) {}
 
-        void Visit(PlayerMapType &m);
-        void Visit(CreatureMapType &m);
+        void Visit(PlayerMapType& m);
+        void Visit(CreatureMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     // Creature searchers
 
     template<class Check>
-        struct MANGOS_DLL_DECL CreatureSearcher
+    struct MANGOS_DLL_DECL CreatureSearcher
     {
         uint32 i_phaseMask;
-        Creature* &i_object;
-        Check & i_check;
+        Creature*& i_object;
+        Check& i_check;
 
-        CreatureSearcher(Creature* & result, Check & check)
-            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result),i_check(check) {}
+        CreatureSearcher(Creature*& result, Check& check)
+            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result), i_check(check) {}
 
-        void Visit(CreatureMapType &m);
+        void Visit(CreatureMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     // Last accepted by Check Creature if any (Check can change requirements at each call)
     template<class Check>
-        struct MANGOS_DLL_DECL CreatureLastSearcher
+    struct MANGOS_DLL_DECL CreatureLastSearcher
     {
         uint32 i_phaseMask;
-        Creature* &i_object;
-        Check & i_check;
+        Creature*& i_object;
+        Check& i_check;
 
-        CreatureLastSearcher(Creature* & result, Check & check)
-            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result),i_check(check) {}
+        CreatureLastSearcher(Creature*& result, Check& check)
+            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result), i_check(check) {}
 
-        void Visit(CreatureMapType &m);
+        void Visit(CreatureMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     template<class Check>
-        struct MANGOS_DLL_DECL CreatureListSearcher
+    struct MANGOS_DLL_DECL CreatureListSearcher
     {
         uint32 i_phaseMask;
-        std::list<Creature*> &i_objects;
+        std::list<Creature*>& i_objects;
         Check& i_check;
 
-        CreatureListSearcher(std::list<Creature*> &objects, Check & check)
-            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_objects(objects),i_check(check) {}
+        CreatureListSearcher(std::list<Creature*>& objects, Check& check)
+            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_objects(objects), i_check(check) {}
 
-        void Visit(CreatureMapType &m);
+        void Visit(CreatureMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     template<class Do>
@@ -442,14 +439,14 @@ namespace MaNGOS
         CreatureWorker(WorldObject const* searcher, Do& _do)
             : i_phaseMask(searcher->GetPhaseMask()), i_do(_do) {}
 
-        void Visit(CreatureMapType &m)
+        void Visit(CreatureMapType& m)
         {
-            for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
-                if(itr->getSource()->InSamePhase(i_phaseMask))
+            for (CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+                if (itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     // Player searchers
@@ -458,30 +455,30 @@ namespace MaNGOS
     struct MANGOS_DLL_DECL PlayerSearcher
     {
         uint32 i_phaseMask;
-        Player* &i_object;
-        Check & i_check;
+        Player*& i_object;
+        Check& i_check;
 
-        PlayerSearcher(Player* & result, Check & check)
-            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result),i_check(check) {}
+        PlayerSearcher(Player*& result, Check& check)
+            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_object(result), i_check(check) {}
 
-        void Visit(PlayerMapType &m);
+        void Visit(PlayerMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     template<class Check>
     struct MANGOS_DLL_DECL PlayerListSearcher
     {
         uint32 i_phaseMask;
-        std::list<Player*> &i_objects;
+        std::list<Player*>& i_objects;
         Check& i_check;
 
-        PlayerListSearcher(std::list<Player*> &objects, Check & check)
-            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_objects(objects),i_check(check) {}
+        PlayerListSearcher(std::list<Player*>& objects, Check& check)
+            : i_phaseMask(check.GetFocusObject().GetPhaseMask()), i_objects(objects), i_check(check) {}
 
-        void Visit(PlayerMapType &m);
+        void Visit(PlayerMapType& m);
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     template<class Do>
@@ -493,14 +490,14 @@ namespace MaNGOS
         PlayerWorker(WorldObject const* searcher, Do& _do)
             : i_phaseMask(searcher->GetPhaseMask()), i_do(_do) {}
 
-        void Visit(PlayerMapType &m)
+        void Visit(PlayerMapType& m)
         {
-            for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
-                if(itr->getSource()->InSamePhase(i_phaseMask))
+            for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+                if (itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
 
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     template<class Do>
@@ -513,13 +510,13 @@ namespace MaNGOS
         CameraDistWorker(WorldObject const* searcher, float _dist, Do& _do)
             : i_searcher(searcher), i_dist(_dist), i_do(_do) {}
 
-        void Visit(CameraMapType &m)
+        void Visit(CameraMapType& m)
         {
-            for(CameraMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
-                if (itr->getSource()->GetBody()->InSamePhase(i_searcher) && itr->getSource()->GetBody()->IsWithinDist(i_searcher,i_dist))
+            for (CameraMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+                if (itr->getSource()->GetBody()->InSamePhase(i_searcher) && itr->getSource()->GetBody()->IsWithinDist(i_searcher, i_dist))
                     i_do(itr->getSource()->GetOwner());
         }
-        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
+        template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED>&) {}
     };
 
     // CHECKS && DO classes
@@ -545,42 +542,50 @@ namespace MaNGOS
     class RaiseDeadObjectCheck
     {
         public:
-            RaiseDeadObjectCheck(Player const* fobj, float range) : i_fobj(fobj), i_range(range) {}
+            RaiseDeadObjectCheck(WorldObject const* fobj, float range, uint32 corpseTypeMask) : i_fobj(fobj), i_range(range), i_typeMask(corpseTypeMask) {}
             WorldObject const& GetFocusObject() const { return *i_fobj; }
+            bool operator()(Player* u)
+            {
+                if (!u->IsInWorld() || u->isAlive() || u->IsTaxiFlying())
+                    return false;
+
+                if (i_fobj->IsWithinDistInMap(u, i_range))
+                {
+                    i_range = i_fobj->GetDistance(u);         // use found unit range as new range limit for next check
+                    return true;
+                }
+                return false;
+            }
+            bool operator()(Corpse* u);
             bool operator()(Creature* u)
             {
-                if (i_fobj->isHonorOrXPTarget(u) ||
-                    u->getDeathState() != CORPSE || u->IsDeadByDefault() || u->IsTaxiFlying() ||
-                    ( u->GetCreatureTypeMask() & (1 << (CREATURE_TYPE_HUMANOID-1)) )==0 ||
-                    (u->GetDisplayId() != u->GetNativeDisplayId()))
+                if (!u->IsInWorld() || u->isAlive() || u->IsDeadByDefault() ||
+                   ((i_typeMask && !(u->GetCreatureTypeMask() & i_typeMask)) ||
+                   (i_typeMask == CREATURE_TYPEMASK_NONE && !(u->GetCreatureTypeMask() & CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD))))
                     return false;
 
-                return i_fobj->IsWithinDistInMap(u, i_range);
+                if (i_fobj->IsWithinDistInMap(u, i_range))
+                {
+                    i_range = i_fobj->GetDistance(u);         // use found unit range as new range limit for next check
+                    return true;
+                }
+                return false;
             }
             template<class NOT_INTERESTED> bool operator()(NOT_INTERESTED*) { return false; }
         private:
-            Player const* i_fobj;
+            WorldObject const* i_fobj;
             float i_range;
+            uint32 i_typeMask;
     };
 
-    class ExplodeCorpseObjectCheck
+    class RaiseAllyObjectCheck
     {
         public:
-            ExplodeCorpseObjectCheck(WorldObject const* fobj, float range) : i_fobj(fobj), i_range(range) {}
+            RaiseAllyObjectCheck(WorldObject const* fobj, float range, uint32 corpseTypeMask = 0) : i_fobj(fobj), i_range(range) {}
             WorldObject const& GetFocusObject() const { return *i_fobj; }
             bool operator()(Player* u)
             {
-                if (u->getDeathState()!=CORPSE || u->IsTaxiFlying() ||
-                    u->HasAuraType(SPELL_AURA_GHOST) || (u->GetDisplayId() != u->GetNativeDisplayId()))
-                    return false;
-
-                return i_fobj->IsWithinDistInMap(u, i_range);
-            }
-            bool operator()(Creature* u)
-            {
-                if (u->getDeathState()!=CORPSE || u->IsTaxiFlying() || u->IsDeadByDefault() ||
-                    (u->GetDisplayId() != u->GetNativeDisplayId()) ||
-                    (u->GetCreatureTypeMask() & CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL)!=0)
+                if (u->isAlive() || u->IsTaxiFlying() || !i_fobj->IsFriendlyTo(u))
                     return false;
 
                 return i_fobj->IsWithinDistInMap(u, i_range);
@@ -594,28 +599,40 @@ namespace MaNGOS
     class CannibalizeObjectCheck
     {
         public:
-            CannibalizeObjectCheck(WorldObject const* fobj, float range) : i_fobj(fobj), i_range(range) {}
+            CannibalizeObjectCheck(WorldObject const* fobj, float range, uint32 corpseTypeMask) : i_fobj(fobj), i_range(range), i_typeMask(corpseTypeMask) {}
             WorldObject const& GetFocusObject() const { return *i_fobj; }
             bool operator()(Player* u)
             {
-                if( i_fobj->IsFriendlyTo(u) || u->isAlive() || u->IsTaxiFlying() )
+                if (!u->IsInWorld() || i_fobj->IsFriendlyTo(u) || u->isAlive() || u->IsTaxiFlying() ||
+                    u->GetObjectGuid() == i_fobj->GetObjectGuid())
                     return false;
 
-                return i_fobj->IsWithinDistInMap(u, i_range);
+                if (i_fobj->IsWithinDistInMap(u, i_range))
+                {
+                    i_range = i_fobj->GetDistance(u);         // use found unit range as new range limit for next check
+                    return true;
+                }
+                return false;
             }
             bool operator()(Corpse* u);
             bool operator()(Creature* u)
             {
-                if (i_fobj->IsFriendlyTo(u) || u->isAlive() || u->IsTaxiFlying() ||
-                    (u->GetCreatureTypeMask() & CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD)==0)
+                if (!u->IsInWorld() || i_fobj->IsFriendlyTo(u) || u->isAlive() || u->GetObjectGuid() == i_fobj->GetObjectGuid() ||
+                        !(u->GetCreatureTypeMask() & i_typeMask))
                     return false;
 
-                return i_fobj->IsWithinDistInMap(u, i_range);
+                if (i_fobj->IsWithinDistInMap(u, i_range))
+                {
+                    i_range = i_fobj->GetDistance(u);         // use found unit range as new range limit for next check
+                    return true;
+                }
+                return false;
             }
             template<class NOT_INTERESTED> bool operator()(NOT_INTERESTED*) { return false; }
         private:
             WorldObject const* i_fobj;
             float i_range;
+            uint32 i_typeMask;
     };
 
     // WorldObject do classes
@@ -635,14 +652,14 @@ namespace MaNGOS
     class GameObjectFocusCheck
     {
         public:
-            GameObjectFocusCheck(Unit const* unit,uint32 focusId) : i_unit(unit), i_focusId(focusId) {}
+            GameObjectFocusCheck(Unit const* unit, uint32 focusId) : i_unit(unit), i_focusId(focusId) {}
             WorldObject const& GetFocusObject() const { return *i_unit; }
             bool operator()(GameObject* go) const
             {
-                if(go->GetGOInfo()->type != GAMEOBJECT_TYPE_SPELL_FOCUS)
+                if (go->GetGOInfo()->type != GAMEOBJECT_TYPE_SPELL_FOCUS)
                     return false;
 
-                if(go->GetGOInfo()->spellFocus.focusId != i_focusId)
+                if (go->GetGOInfo()->spellFocus.focusId != i_focusId)
                     return false;
 
                 float dist = (float)go->GetGOInfo()->spellFocus.dist;
@@ -662,7 +679,7 @@ namespace MaNGOS
             WorldObject const& GetFocusObject() const { return i_obj; }
             bool operator()(GameObject* go)
             {
-                if(go->GetGOInfo()->type == GAMEOBJECT_TYPE_FISHINGHOLE && go->isSpawned() && i_obj.IsWithinDistInMap(go, i_range) && i_obj.IsWithinDistInMap(go, (float)go->GetGOInfo()->fishinghole.radius))
+                if (go->GetGOInfo()->type == GAMEOBJECT_TYPE_FISHINGHOLE && go->isSpawned() && i_obj.IsWithinDistInMap(go, i_range) && i_obj.IsWithinDistInMap(go, (float)go->GetGOInfo()->fishinghole.radius))
                 {
                     i_range = i_obj.GetDistance(go);
                     return true;
@@ -682,11 +699,11 @@ namespace MaNGOS
     class NearestGameObjectEntryInObjectRangeCheck
     {
         public:
-            NearestGameObjectEntryInObjectRangeCheck(WorldObject const& obj,uint32 entry, float range) : i_obj(obj), i_entry(entry), i_range(range) {}
+            NearestGameObjectEntryInObjectRangeCheck(WorldObject const& obj, uint32 entry, float range) : i_obj(obj), i_entry(entry), i_range(range) {}
             WorldObject const& GetFocusObject() const { return i_obj; }
             bool operator()(GameObject* go)
             {
-                if(go->GetEntry() == i_entry && i_obj.IsWithinDistInMap(go, i_range))
+                if (go->GetEntry() == i_entry && i_obj.IsWithinDistInMap(go, i_range))
                 {
                     i_range = i_obj.GetDistance(go);        // use found GO range as new range limit for next check
                     return true;
@@ -708,7 +725,7 @@ namespace MaNGOS
     {
         public:
             NearestGameObjectEntryInPosRangeCheck(WorldObject const& obj, uint32 entry, float x, float y, float z, float range)
-                : i_obj(obj), i_x(x), i_y(y), i_z(z), i_entry(entry), i_range(range) {}
+                : i_obj(obj), i_entry(entry), i_x(x), i_y(y), i_z(z), i_range(range) {}
 
             WorldObject const& GetFocusObject() const { return i_obj; }
 
@@ -717,7 +734,7 @@ namespace MaNGOS
                 if (go->GetEntry() == i_entry && go->IsWithinDist3d(i_x, i_y, i_z, i_range))
                 {
                     // use found GO range as new range limit for next check
-                    i_range = go->GetDistance(i_x,i_y,i_z);
+                    i_range = go->GetDistance(i_x, i_y, i_z);
                     return true;
                 }
 
@@ -741,7 +758,7 @@ namespace MaNGOS
     {
         public:
             GameObjectEntryInPosRangeCheck(WorldObject const& obj, uint32 entry, float x, float y, float z, float range)
-                : i_obj(obj), i_x(x), i_y(y), i_z(z), i_entry(entry), i_range(range) {}
+                : i_obj(obj), i_entry(entry), i_x(x), i_y(y), i_z(z), i_range(range) {}
 
             WorldObject const& GetFocusObject() const { return i_obj; }
 
@@ -774,7 +791,7 @@ namespace MaNGOS
             WorldObject const& GetFocusObject() const { return *i_obj; }
             bool operator()(Unit* u)
             {
-                if(u->isAlive() && u->isInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) && u->GetMaxHealth() - u->GetHealth() > i_hp)
+                if (u->isAlive() && u->isInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) && u->GetMaxHealth() - u->GetHealth() > i_hp)
                 {
                     i_hp = u->GetMaxHealth() - u->GetHealth();
                     return true;
@@ -794,8 +811,8 @@ namespace MaNGOS
             WorldObject const& GetFocusObject() const { return *i_obj; }
             bool operator()(Unit* u)
             {
-                if(u->isAlive() && u->isInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) &&
-                    (u->isCharmed() || u->isFrozen() || u->hasUnitState(UNIT_STAT_CAN_NOT_REACT)))
+                if (u->isAlive() && u->isInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) &&
+                        (u->isCharmed() || u->isFrozen() || u->hasUnitState(UNIT_STAT_CAN_NOT_REACT)))
                 {
                     return true;
                 }
@@ -813,8 +830,8 @@ namespace MaNGOS
             WorldObject const& GetFocusObject() const { return *i_obj; }
             bool operator()(Unit* u)
             {
-                if(u->isAlive() && u->isInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) &&
-                    !(u->HasAura(i_spell, EFFECT_INDEX_0) || u->HasAura(i_spell, EFFECT_INDEX_1) || u->HasAura(i_spell, EFFECT_INDEX_2)))
+                if (u->isAlive() && u->isInCombat() && !i_obj->IsHostileTo(u) && i_obj->IsWithinDistInMap(u, i_range) &&
+                        !(u->HasAura(i_spell, EFFECT_INDEX_0) || u->HasAura(i_spell, EFFECT_INDEX_1) || u->HasAura(i_spell, EFFECT_INDEX_2)))
                 {
                     return true;
                 }
@@ -829,18 +846,21 @@ namespace MaNGOS
     class AnyUnfriendlyUnitInObjectRangeCheck
     {
         public:
-            AnyUnfriendlyUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {}
+            AnyUnfriendlyUnitInObjectRangeCheck(WorldObject const* obj, float range) : i_obj(obj), i_range(range)
+            {
+                i_controlledByPlayer = obj->IsControlledByPlayer();
+            }
             WorldObject const& GetFocusObject() const { return *i_obj; }
             bool operator()(Unit* u)
             {
-                if(u->isAlive() && i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u))
+                if (u->isAlive() && i_obj->IsWithinDistInMap(u, i_range) && (i_controlledByPlayer ? !i_obj->IsFriendlyTo(u) : i_obj->IsHostileTo(u)))
                     return true;
                 else
                     return false;
             }
         private:
             WorldObject const* i_obj;
-            Unit const* i_funit;
+            bool i_controlledByPlayer;
             float i_range;
     };
 
@@ -853,9 +873,9 @@ namespace MaNGOS
             bool operator()(Unit* u)
             {
                 return u->isAlive()
-                    && i_obj->IsWithinDistInMap(u, i_range)
-                    && !i_funit->IsFriendlyTo(u)
-                    && u->isVisibleForOrDetect(i_funit,i_funit,false);
+                       && i_obj->IsWithinDistInMap(u, i_range)
+                       && !i_funit->IsFriendlyTo(u)
+                       && u->isVisibleForOrDetect(i_funit, i_funit, false);
             }
         private:
             WorldObject const* i_obj;
@@ -870,7 +890,7 @@ namespace MaNGOS
             WorldObject const& GetFocusObject() const { return *i_obj; }
             bool operator()(Unit* u)
             {
-                if(u->isAlive() && i_obj->IsWithinDistInMap(u, i_range) && i_obj->IsFriendlyTo(u))
+                if (u->isAlive() && i_obj->IsWithinDistInMap(u, i_range) && i_obj->IsFriendlyTo(u))
                     return true;
                 else
                     return false;
@@ -887,7 +907,7 @@ namespace MaNGOS
             WorldObject const& GetFocusObject() const { return *i_obj; }
             bool operator()(Unit* u)
             {
-                if(u->isAlive() && i_obj->IsWithinDistInMap(u, i_range))
+                if (u->isAlive() && i_obj->IsWithinDistInMap(u, i_range))
                     return true;
 
                 return false;
@@ -901,12 +921,17 @@ namespace MaNGOS
     class NearestAttackableUnitInObjectRangeCheck
     {
         public:
-            NearestAttackableUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {}
+            NearestAttackableUnitInObjectRangeCheck(WorldObject const* obj, float range) : i_obj(obj), i_range(range)
+            {
+                i_targetForPlayer = i_obj->IsControlledByPlayer();
+            }
             WorldObject const& GetFocusObject() const { return *i_obj; }
             bool operator()(Unit* u)
             {
-                if( u->isTargetableForAttack() && i_obj->IsWithinDistInMap(u, i_range) &&
-                    !i_funit->IsFriendlyTo(u) && u->isVisibleForOrDetect(i_funit,i_funit,false)  )
+                if (u->isTargetableForAttack()
+                    && i_obj->IsWithinDistInMap(u, i_range)
+                    && (i_targetForPlayer ? !i_obj->IsFriendlyTo(u) : i_obj->IsHostileTo(u))
+                    && (i_obj->GetTypeId() != TYPEID_UNIT || u->isVisibleForOrDetect((Unit*)i_obj, (Unit*)i_obj, false)))
                 {
                     i_range = i_obj->GetDistance(u);        // use found unit range as new range limit for next check
                     return true;
@@ -916,8 +941,8 @@ namespace MaNGOS
             }
         private:
             WorldObject const* i_obj;
-            Unit const* i_funit;
-            float i_range;
+            bool               i_targetForPlayer;
+            float              i_range;
 
             // prevent clone this object
             NearestAttackableUnitInObjectRangeCheck(NearestAttackableUnitInObjectRangeCheck const&);
@@ -930,7 +955,7 @@ namespace MaNGOS
                 : i_obj(obj), i_originalCaster(originalCaster), i_range(range)
             {
                 i_targetForUnit = i_originalCaster->isType(TYPEMASK_UNIT);
-                i_targetForPlayer = (i_originalCaster->GetTypeId() == TYPEID_PLAYER);
+                i_targetForPlayer = (i_originalCaster->IsVehicle() ? ((Unit*)i_originalCaster)->GetCharmerOrOwnerOrSelf()->GetTypeId() == TYPEID_PLAYER : i_originalCaster->GetTypeId() == TYPEID_PLAYER);
             }
             WorldObject const& GetFocusObject() const { return *i_obj; }
             bool operator()(Unit* u)
@@ -940,7 +965,7 @@ namespace MaNGOS
                     return false;
 
                 // ignore totems as AoE targets
-                if(u->GetTypeId()==TYPEID_UNIT && ((Creature*)u)->IsTotem())
+                if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->IsTotem())
                     return false;
 
                 // check visibility only for unit-like original casters
@@ -975,10 +1000,10 @@ namespace MaNGOS
                 if (!u->isTargetableForAttack())
                     return false;
 
-                if(u->GetTypeId()==TYPEID_UNIT && ((Creature*)u)->IsTotem())
+                if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->IsTotem())
                     return false;
 
-                if(( i_targetForPlayer ? !i_obj->IsFriendlyTo(u) : i_obj->IsHostileTo(u) )&& i_obj->IsWithinDistInMap(u, i_range))
+                if ((i_targetForPlayer ? !i_obj->IsFriendlyTo(u) : i_obj->IsHostileTo(u)) && i_obj->IsWithinDistInMap(u, i_range))
                     return true;
 
                 return false;
@@ -997,25 +1022,7 @@ namespace MaNGOS
             CallOfHelpCreatureInRangeDo(Unit* funit, Unit* enemy, float range)
                 : i_funit(funit), i_enemy(enemy), i_range(range)
             {}
-            void operator()(Creature* u)
-            {
-                if (u == i_funit)
-                    return;
-
-                if (!u->CanAssistTo(i_funit, i_enemy, false))
-                    return;
-
-                // too far
-                if (!i_funit->IsWithinDistInMap(u, i_range))
-                    return;
-
-                // only if see assisted creature
-                if (!i_funit->IsWithinLOSInMap(u))
-                    return;
-
-                if (u->AI())
-                    u->AI()->AttackStart(i_enemy);
-            }
+            void operator()(Creature* u);
 
         private:
             Unit* const i_funit;
@@ -1038,7 +1045,7 @@ namespace MaNGOS
         public:
             explicit AnyStealthedCheck(WorldObject const* fobj) : i_fobj(fobj) {}
             WorldObject const& GetFocusObject() const { return *i_fobj; }
-            bool operator()(Unit* u) { return u->GetVisibility()==VISIBILITY_GROUP_STEALTH; }
+            bool operator()(Unit* u) { return u->GetVisibility() == VISIBILITY_GROUP_STEALTH; }
         private:
             WorldObject const* i_fobj;
     };
@@ -1052,7 +1059,7 @@ namespace MaNGOS
             WorldObject const& GetFocusObject() const { return *i_funit; }
             bool operator()(Creature* u)
             {
-                if(u->isAlive() && u->IsHostileTo(i_funit) && i_funit->IsWithinDistInMap(u, u->GetAttackDistance(i_funit)))
+                if (u->isAlive() && u->IsHostileTo(i_funit) && i_funit->IsWithinDistInMap(u, u->GetAttackDistance(i_funit)))
                     return true;
 
                 return false;
@@ -1069,24 +1076,8 @@ namespace MaNGOS
             {
             }
             WorldObject const& GetFocusObject() const { return *i_funit; }
-            bool operator()(Creature* u)
-            {
-                if(u == i_funit)
-                    return false;
+            bool operator()(Creature* u);
 
-                if ( !u->CanAssistTo(i_funit, i_enemy) )
-                    return false;
-
-                // too far
-                if( !i_funit->IsWithinDistInMap(u, i_range) )
-                    return false;
-
-                // only if see assisted creature
-                if( !i_funit->IsWithinLOSInMap(u) )
-                    return false;
-
-                return true;
-            }
         private:
             Unit* const i_funit;
             Unit* const i_enemy;
@@ -1101,15 +1092,15 @@ namespace MaNGOS
             WorldObject const& GetFocusObject() const { return *i_obj; }
             bool operator()(Creature* u)
             {
-                if(u == i_obj)
+                if (u == i_obj)
                     return false;
-                if(!u->CanAssistTo(i_obj,i_enemy))
+                if (!u->CanAssistTo(i_obj, i_enemy))
                     return false;
 
-                if(!i_obj->IsWithinDistInMap(u, i_range))
+                if (!i_obj->IsWithinDistInMap(u, i_range))
                     return false;
 
-                if(!i_obj->IsWithinLOSInMap(u))
+                if (!i_obj->IsWithinLOSInMap(u))
                     return false;
 
                 i_range = i_obj->GetDistance(u);            // use found unit range as new range limit for next check
@@ -1129,12 +1120,13 @@ namespace MaNGOS
     class NearestCreatureEntryWithLiveStateInObjectRangeCheck
     {
         public:
-            NearestCreatureEntryWithLiveStateInObjectRangeCheck(WorldObject const& obj,uint32 entry, bool onlyAlive, bool onlyDead, float range)
-                : i_obj(obj), i_entry(entry), i_onlyAlive(onlyAlive), i_onlyDead(onlyDead), i_range(range) {}
+            NearestCreatureEntryWithLiveStateInObjectRangeCheck(WorldObject const& obj, uint32 entry, bool onlyAlive, bool onlyDead, float range, bool excludeSelf = true)
+                : i_obj(obj), i_entry(entry), i_onlyAlive(onlyAlive), i_onlyDead(onlyDead), i_excludeSelf(excludeSelf), i_range(range) {}
             WorldObject const& GetFocusObject() const { return i_obj; }
             bool operator()(Creature* u)
             {
-                if (u->GetEntry() == i_entry && (i_onlyAlive && u->isAlive() || i_onlyDead && u->IsCorpse() || !i_onlyAlive && !i_onlyDead) && i_obj.IsWithinDistInMap(u, i_range))
+                if (u->GetEntry() == i_entry && ((i_onlyAlive && u->isAlive()) || (i_onlyDead && u->IsCorpse()) || (!i_onlyAlive && !i_onlyDead))
+                        && (!i_excludeSelf || (u->GetObjectGuid() != i_obj.GetObjectGuid())) && i_obj.IsWithinDistInMap(u, i_range))
                 {
                     i_range = i_obj.GetDistance(u);         // use found unit range as new range limit for next check
                     return true;
@@ -1147,20 +1139,101 @@ namespace MaNGOS
             uint32 i_entry;
             bool   i_onlyAlive;
             bool   i_onlyDead;
+            bool   i_excludeSelf;
             float  i_range;
 
             // prevent clone this object
             NearestCreatureEntryWithLiveStateInObjectRangeCheck(NearestCreatureEntryWithLiveStateInObjectRangeCheck const&);
     };
 
+    class NearestCorpseInObjectRangeCheck
+    {
+        public:
+            NearestCorpseInObjectRangeCheck(WorldObject const& obj, float range)
+                : i_obj(obj), i_range(range) {}
+            WorldObject const& GetFocusObject() const { return i_obj; }
+            bool operator()(Creature* u)
+            {
+                if (u->GetObjectGuid() != i_obj.GetObjectGuid() &&
+                    (!u->isAlive() || u->IsCorpse()) &&
+                    !u->IsDeadByDefault() &&
+                    (u->GetCreatureTypeMask() & CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL) == 0 &&
+                    i_obj.IsWithinDistInMap(u, i_range))
+                {
+                    i_range = i_obj.GetDistance(u);         // use found unit range as new range limit for next check
+                    return true;
+                }
+                return false;
+            }
+            bool operator()(Player* u)
+            {
+                if (!u->isAlive() && !u->IsTaxiFlying() && i_obj.IsWithinDistInMap(u, i_range))
+                {
+                    i_range = i_obj.GetDistance(u);         // use found unit range as new range limit for next check
+                    return true;
+                }
+                return false;
+            }
+            bool operator()(Corpse* u);
+            float GetLastRange() const { return i_range; }
+        private:
+            WorldObject const& i_obj;
+            float  i_range;
+
+            // prevent clone this object
+            NearestCorpseInObjectRangeCheck(NearestCorpseInObjectRangeCheck const&);
+    };
+
+    class GameObjectInRangeCheck
+    {
+        public:
+            GameObjectInRangeCheck(WorldObject const* _obj, float _x, float _y, float _z, float _range):
+              i_obj(_obj), x(_x), y(_y), z(_z), range(_range) {}
+
+            WorldObject const& GetFocusObject() const { return *i_obj; }
+
+            bool operator() (GameObject* go)
+            {
+                return go->IsInRange(x, y, z, range);
+            }
+
+        private:
+            WorldObject const* i_obj;
+            float x, y, z, range;
+
+            // prevent cloning this object
+            GameObjectInRangeCheck(GameObjectInRangeCheck const&);
+    };
+
+    class AllGameObjectsWithEntryInRange
+    {
+        public:
+            AllGameObjectsWithEntryInRange(const WorldObject* pObject, uint32 uiEntry, float fMaxRange) : m_pObject(pObject), m_uiEntry(uiEntry), m_fRange(fMaxRange) {}
+            WorldObject const& GetFocusObject() const { return *m_pObject; }
+            bool operator() (GameObject* pGo)
+            {
+                if (pGo->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pGo,m_fRange,false))
+                    return true;
+
+                return false;
+            }
+        private:
+            const WorldObject* m_pObject;
+            uint32 m_uiEntry;
+            float m_fRange;
+
+            // prevent clone this object
+            AllGameObjectsWithEntryInRange(AllGameObjectsWithEntryInRange const&);
+    };
+
     class AllCreaturesOfEntryInRangeCheck
     {
         public:
             AllCreaturesOfEntryInRangeCheck(const WorldObject* pObject, uint32 uiEntry, float fMaxRange) : m_pObject(pObject), m_uiEntry(uiEntry), m_fRange(fMaxRange) {}
             WorldObject const& GetFocusObject() const { return *m_pObject; }
-            bool operator() (Unit* pUnit)
+            bool operator()(Unit* pUnit)
             {
-                if (pUnit->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pUnit,m_fRange,false))
+                if (pUnit->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pUnit, m_fRange, false))
                     return true;
 
                 return false;
@@ -1175,6 +1248,37 @@ namespace MaNGOS
             AllCreaturesOfEntryInRangeCheck(AllCreaturesOfEntryInRangeCheck const&);
     };
 
+    class AllIdenticalObjectsInRangeCheck
+    {
+        public:
+            AllIdenticalObjectsInRangeCheck(const WorldObject* pObject, float fMaxRange) : m_pObject(pObject), m_fRange(fMaxRange) {}
+            WorldObject const& GetFocusObject() const { return *m_pObject; }
+            bool operator() (WorldObject* pObject)
+            {
+                if (pObject->GetObjectGuid() == m_pObject->GetObjectGuid())
+                    return false;
+
+                if (!pObject->GetObjectGuid().HasEntry() || !m_pObject->GetObjectGuid().HasEntry())
+                    return false;
+
+                if (pObject->GetObjectGuid().GetEntry() != m_pObject->GetObjectGuid().GetEntry())
+                    return false;
+
+                if (m_pObject->IsWithinDist(pObject,m_fRange,false))
+                    return true;
+
+                return false;
+            }
+
+        private:
+            const WorldObject* m_pObject;
+            float m_fRange;
+
+            // prevent clone this object
+            AllIdenticalObjectsInRangeCheck(AllIdenticalObjectsInRangeCheck const&);
+    };
+
+
     // Player checks and do
 
     class AnyPlayerInObjectRangeCheck
@@ -1184,7 +1288,7 @@ namespace MaNGOS
             WorldObject const& GetFocusObject() const { return *i_obj; }
             bool operator()(Player* u)
             {
-                if(u->isAlive() && i_obj->IsWithinDistInMap(u, i_range))
+                if (u->isAlive() && i_obj->IsWithinDistInMap(u, i_range))
                     return true;
 
                 return false;
@@ -1203,8 +1307,8 @@ namespace MaNGOS
             bool operator()(Player* u)
             {
                 return u->isAlive()
-                    && i_obj->IsWithinDistInMap(u, i_range)
-                    && u->HasAura(i_spellId);
+                       && i_obj->IsWithinDistInMap(u, i_range)
+                       && u->HasAura(i_spellId);
             }
         private:
             WorldObject const* i_obj;
@@ -1212,6 +1316,22 @@ namespace MaNGOS
             uint32 i_spellId;
     };
 
+    class AnyPlayerInCapturePointRange
+    {
+        public:
+            AnyPlayerInCapturePointRange(WorldObject const* obj, float range)
+                : i_obj(obj), i_range(range) {}
+            WorldObject const& GetFocusObject() const { return *i_obj; }
+            bool operator()(Player* u)
+            {
+                return u->CanUseCapturePoint() &&
+                       i_obj->IsWithinDistInMap(u, i_range);
+            }
+        private:
+            WorldObject const* i_obj;
+            float i_range;
+    };
+
     // Prepare using Builder localized packets with caching and send to player
     template<class Builder>
     class LocalizedPacketDo
@@ -1221,10 +1341,10 @@ namespace MaNGOS
 
             ~LocalizedPacketDo()
             {
-                for(size_t i = 0; i < i_data_cache.size(); ++i)
+                for (size_t i = 0; i < i_data_cache.size(); ++i)
                     delete i_data_cache[i];
             }
-            void operator()( Player* p );
+            void operator()(Player* p);
 
         private:
             Builder& i_builder;
@@ -1241,24 +1361,24 @@ namespace MaNGOS
 
             ~LocalizedPacketListDo()
             {
-                for(size_t i = 0; i < i_data_cache.size(); ++i)
-                    for(size_t j = 0; j < i_data_cache[i].size(); ++j)
+                for (size_t i = 0; i < i_data_cache.size(); ++i)
+                    for (size_t j = 0; j < i_data_cache[i].size(); ++j)
                         delete i_data_cache[i][j];
             }
-            void operator()( Player* p );
+            void operator()(Player* p);
 
         private:
             Builder& i_builder;
             std::vector<WorldPacketList> i_data_cache;
-                                                            // 0 = default, i => i-1 locale index
+            // 0 = default, i => i-1 locale index
     };
 
-    #ifndef WIN32
-    template<> void PlayerRelocationNotifier::Visit<Creature>(CreatureMapType &);
-    template<> void CreatureRelocationNotifier::Visit<Player>(PlayerMapType &);
-    template<> void CreatureRelocationNotifier::Visit<Creature>(CreatureMapType &);
-    template<> inline void DynamicObjectUpdater::Visit<Creature>(CreatureMapType &);
-    template<> inline void DynamicObjectUpdater::Visit<Player>(PlayerMapType &);
-    #endif
+#ifndef WIN32
+    template<> void PlayerRelocationNotifier::Visit<Creature>(CreatureMapType&);
+    template<> void CreatureRelocationNotifier::Visit<Player>(PlayerMapType&);
+    template<> void CreatureRelocationNotifier::Visit<Creature>(CreatureMapType&);
+    template<> inline void DynamicObjectUpdater::Visit<Creature>(CreatureMapType&);
+    template<> inline void DynamicObjectUpdater::Visit<Player>(PlayerMapType&);
+#endif
 }
 #endif
diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h
index 967650cbd65..d836f03f179 100644
--- a/src/game/GridNotifiersImpl.h
+++ b/src/game/GridNotifiersImpl.h
@@ -24,25 +24,92 @@
 #include "Corpse.h"
 #include "Player.h"
 #include "UpdateData.h"
+#include "World.h"
 #include "CreatureAI.h"
 #include "SpellAuras.h"
 #include "DBCEnums.h"
+#include "DBCStores.h"
 
 template<class T>
-inline void MaNGOS::VisibleNotifier::Visit(GridRefManager<T> &m)
+inline void MaNGOS::VisibleNotifier::Visit(GridRefManager<T>& m)
 {
-    for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter)
+    for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
         i_camera.UpdateVisibilityOf(iter->getSource(), i_data, i_visibleNow);
-        i_clientGUIDs.erase(iter->getSource()->GetObjectGuid());
+        i_clientGuids.erase(iter->getSource()->GetObjectGuid());
     }
 }
 
-inline void MaNGOS::ObjectUpdater::Visit(CreatureMapType &m)
+inline void MaNGOS::ObjectUpdater::Visit(CreatureMapType& m)
 {
-    for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
+    uint32  lastUpdateTime;
+    uint32  diffTime;
+    uint32  minUpdateTime = 0;
+    uint32  visitorsCount = 0;
+    uint8   visitCount = 1;
+    std::vector<uint32> lastUpdateTimeList;
+    lastUpdateTimeList.clear();
+
+    for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
+    {
+        ++visitorsCount;
+        lastUpdateTime = iter->getSource()->GetLastUpdateTime();
+        if (lastUpdateTime == 0)
+        {
+            iter->getSource()->SetLastUpdateTime();
+            lastUpdateTime = iter->getSource()->GetLastUpdateTime();
+        }
+        lastUpdateTimeList.push_back(lastUpdateTime);
+    }
+
+    if (visitorsCount == 0)
+        return;
+
+    std::unique(lastUpdateTimeList.begin(), lastUpdateTimeList.end());
+    std::sort(lastUpdateTimeList.begin(), lastUpdateTimeList.end());
+
+    if (lastUpdateTimeList.empty())
+        return;
+
+    if (visitorsCount > sWorld.getConfig(CONFIG_UINT32_MAPUPDATE_MAXVISITORS))
+        minUpdateTime = lastUpdateTimeList.at(sWorld.getConfig(CONFIG_UINT32_MAPUPDATE_MAXVISITORS));
+    else
+        minUpdateTime = lastUpdateTimeList.at(visitorsCount-1);
+
+    /*if (visitorsCount > 50)
+        for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
+        {
+            DEBUG_LOG("Entry: %u, GUID: %u, VisitorCount: %u", iter->getSource()->GetEntry(),iter->getSource()->GetGUIDLow(), VisitorCount);
+        }*/
+
+    for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
-        WorldObject::UpdateHelper helper(iter->getSource());
+        lastUpdateTime = iter->getSource()->GetLastUpdateTime();
+        diffTime = WorldTimer::getMSTimeDiff(lastUpdateTime, WorldTimer::getMSTime());
+
+        if (diffTime < (iter->getSource()->IsInCombat() ?
+            sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE) : 5 * sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE)) ||
+            lastUpdateTime > minUpdateTime)
+            continue;
+
+        WorldObject::UpdateHelper helper(*iter->getSource());
+        helper.Update(diffTime);
+        visitCount++;
+        if (visitCount > sWorld.getConfig(CONFIG_UINT32_MAPUPDATE_MAXVISITS))
+            break;
+    }
+}
+
+inline void MaNGOS::ObjectUpdater::Visit(GameObjectMapType& m)
+{
+    for (GameObjectMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
+    {
+        uint32 diffTime = WorldTimer::getMSTimeDiff(iter->getSource()->GetLastUpdateTime(), WorldTimer::getMSTime());
+        if (diffTime < sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE)/2)
+            continue;
+
+        iter->getSource()->SetLastUpdateTime();
+        WorldObject::UpdateHelper helper(*iter->getSource());
         helper.Update(i_timeDiff);
     }
 }
@@ -72,12 +139,12 @@ inline void CreatureCreatureRelocationWorker(Creature* c1, Creature* c2)
     }
 }
 
-inline void MaNGOS::PlayerRelocationNotifier::Visit(CreatureMapType &m)
+inline void MaNGOS::PlayerRelocationNotifier::Visit(CreatureMapType& m)
 {
     if (!i_player.isAlive() || i_player.IsTaxiFlying())
         return;
 
-    for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
+    for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
         Creature* c = iter->getSource();
         if (c->isAlive())
@@ -86,12 +153,12 @@ inline void MaNGOS::PlayerRelocationNotifier::Visit(CreatureMapType &m)
 }
 
 template<>
-inline void MaNGOS::CreatureRelocationNotifier::Visit(PlayerMapType &m)
+inline void MaNGOS::CreatureRelocationNotifier::Visit(PlayerMapType& m)
 {
     if (!i_creature.isAlive())
         return;
 
-    for(PlayerMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
+    for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
         Player* player = iter->getSource();
         if (player->isAlive() && !player->IsTaxiFlying())
@@ -100,12 +167,12 @@ inline void MaNGOS::CreatureRelocationNotifier::Visit(PlayerMapType &m)
 }
 
 template<>
-inline void MaNGOS::CreatureRelocationNotifier::Visit(CreatureMapType &m)
+inline void MaNGOS::CreatureRelocationNotifier::Visit(CreatureMapType& m)
 {
     if (!i_creature.isAlive())
         return;
 
-    for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
+    for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
         Creature* c = iter->getSource();
         if (c != &i_creature && c->isAlive())
@@ -115,7 +182,7 @@ inline void MaNGOS::CreatureRelocationNotifier::Visit(CreatureMapType &m)
 
 inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
 {
-    if (!target->isAlive() || target->IsTaxiFlying() )
+    if (!target->isAlive() || target->IsTaxiFlying())
         return;
 
     if (target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->IsTotem())
@@ -124,54 +191,51 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
     if (!i_dynobject.IsWithinDistInMap(target, i_dynobject.GetRadius()))
         return;
 
-    //Check targets for not_selectable unit flag and remove
+    // Check targets for not_selectable unit flag and remove
     if (target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE))
         return;
 
     // Evade target
-    if (target->GetTypeId()==TYPEID_UNIT && ((Creature*)target)->IsInEvadeMode())
+    if (target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->IsInEvadeMode())
         return;
 
-    //Check player targets and remove if in GM mode or GM invisibility (for not self casting case)
+    // Check player targets and remove if in GM mode or GM invisibility (for not self casting case)
     if (target->GetTypeId() == TYPEID_PLAYER && target != i_check && (((Player*)target)->isGameMaster() || ((Player*)target)->GetVisibility() == VISIBILITY_OFF))
         return;
 
     // for player casts use less strict negative and more stricted positive targeting
-    if (i_check->GetTypeId() == TYPEID_PLAYER )
+    if (i_check->GetTypeId() == TYPEID_PLAYER)
     {
-        if (i_check->IsFriendlyTo( target ) != i_positive)
-                return;
+        if (i_check->IsFriendlyTo(target) != i_positive)
+            return;
     }
     else
     {
-        if (i_check->IsHostileTo( target ) == i_positive)
+        if (i_check->IsHostileTo(target) == i_positive)
             return;
     }
 
-    if (i_dynobject.IsAffecting(target))
+    if (target->HasAura(i_dynobject.GetSpellId(), i_dynobject.GetEffIndex()))
         return;
 
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry(i_dynobject.GetSpellId());
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(i_dynobject.GetSpellId());
     SpellEffectIndex eff_index  = i_dynobject.GetEffIndex();
 
     // Check target immune to spell or aura
-    if (target->IsImmuneToSpell(spellInfo) || target->IsImmuneToSpellEffect(spellInfo, eff_index))
+    if (target->IsImmuneToSpell(spellInfo, true) || target->IsImmuneToSpellEffect(spellInfo, eff_index))
         return;
 
     // Apply PersistentAreaAura on target
     // in case 2 dynobject overlap areas for same spell, same holder is selected, so dynobjects share holder
-    SpellAuraHolder *holder = target->GetSpellAuraHolder(spellInfo->Id, i_dynobject.GetCasterGuid());
+    SpellAuraHolderPtr holder = target->GetSpellAuraHolder(spellInfo->Id, i_dynobject.GetCasterGuid());
 
     if (holder)
     {
         if (!holder->GetAuraByEffectIndex(eff_index))
         {
-            PersistentAreaAura* Aur = new PersistentAreaAura(spellInfo, eff_index, NULL, holder, target, i_dynobject.GetCaster());
-            holder->AddAura(Aur, eff_index);
+            Aura* Aur = holder->CreateAura(AURA_CLASS_PERSISTENT_AREA_AURA, eff_index, NULL, holder, target, i_dynobject.GetCaster(), NULL);
             target->AddAuraToModList(Aur);
-            holder->SetInUse(true);
             Aur->ApplyModifier(true,true);
-            holder->SetInUse(false);
         }
         else if (holder->GetAuraDuration() >= 0 && uint32(holder->GetAuraDuration()) < i_dynobject.GetDuration())
         {
@@ -182,8 +246,7 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
     else
     {
         holder = CreateSpellAuraHolder(spellInfo, target, i_dynobject.GetCaster());
-        PersistentAreaAura* Aur = new PersistentAreaAura(spellInfo, eff_index, NULL, holder, target, i_dynobject.GetCaster());
-        holder->AddAura(Aur, eff_index);
+        holder->CreateAura(AURA_CLASS_PERSISTENT_AREA_AURA, eff_index, NULL, holder, target, i_dynobject.GetCaster(),NULL);
         target->AddSpellAuraHolder(holder);
     }
 
@@ -191,16 +254,16 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
 }
 
 template<>
-inline void MaNGOS::DynamicObjectUpdater::Visit(CreatureMapType  &m)
+inline void MaNGOS::DynamicObjectUpdater::Visit(CreatureMapType& m)
 {
-    for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
+    for (CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         VisitHelper(itr->getSource());
 }
 
 template<>
-inline void MaNGOS::DynamicObjectUpdater::Visit(PlayerMapType  &m)
+inline void MaNGOS::DynamicObjectUpdater::Visit(PlayerMapType& m)
 {
-    for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         VisitHelper(itr->getSource());
 }
 
@@ -209,13 +272,13 @@ inline void MaNGOS::DynamicObjectUpdater::Visit(PlayerMapType  &m)
 // WorldObject searchers & workers
 
 template<class Check>
-void MaNGOS::WorldObjectSearcher<Check>::Visit(GameObjectMapType &m)
+void MaNGOS::WorldObjectSearcher<Check>::Visit(GameObjectMapType& m)
 {
     // already found
     if (i_object)
         return;
 
-    for(GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -229,13 +292,13 @@ void MaNGOS::WorldObjectSearcher<Check>::Visit(GameObjectMapType &m)
 }
 
 template<class Check>
-void MaNGOS::WorldObjectSearcher<Check>::Visit(PlayerMapType &m)
+void MaNGOS::WorldObjectSearcher<Check>::Visit(PlayerMapType& m)
 {
     // already found
     if (i_object)
         return;
 
-    for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -249,13 +312,13 @@ void MaNGOS::WorldObjectSearcher<Check>::Visit(PlayerMapType &m)
 }
 
 template<class Check>
-void MaNGOS::WorldObjectSearcher<Check>::Visit(CreatureMapType &m)
+void MaNGOS::WorldObjectSearcher<Check>::Visit(CreatureMapType& m)
 {
     // already found
     if (i_object)
         return;
 
-    for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -269,13 +332,13 @@ void MaNGOS::WorldObjectSearcher<Check>::Visit(CreatureMapType &m)
 }
 
 template<class Check>
-void MaNGOS::WorldObjectSearcher<Check>::Visit(CorpseMapType &m)
+void MaNGOS::WorldObjectSearcher<Check>::Visit(CorpseMapType& m)
 {
     // already found
     if (i_object)
         return;
 
-    for(CorpseMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (CorpseMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -289,13 +352,13 @@ void MaNGOS::WorldObjectSearcher<Check>::Visit(CorpseMapType &m)
 }
 
 template<class Check>
-void MaNGOS::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m)
+void MaNGOS::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType& m)
 {
     // already found
     if (i_object)
         return;
 
-    for(DynamicObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (DynamicObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -309,45 +372,45 @@ void MaNGOS::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m)
 }
 
 template<class Check>
-void MaNGOS::WorldObjectListSearcher<Check>::Visit(PlayerMapType &m)
+void MaNGOS::WorldObjectListSearcher<Check>::Visit(PlayerMapType& m)
 {
-    for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         if (itr->getSource()->InSamePhase(i_phaseMask))
             if (i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
 
 template<class Check>
-void MaNGOS::WorldObjectListSearcher<Check>::Visit(CreatureMapType &m)
+void MaNGOS::WorldObjectListSearcher<Check>::Visit(CreatureMapType& m)
 {
-    for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         if (itr->getSource()->InSamePhase(i_phaseMask))
             if (i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
 
 template<class Check>
-void MaNGOS::WorldObjectListSearcher<Check>::Visit(CorpseMapType &m)
+void MaNGOS::WorldObjectListSearcher<Check>::Visit(CorpseMapType& m)
 {
-    for(CorpseMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (CorpseMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         if (itr->getSource()->InSamePhase(i_phaseMask))
             if (i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
 
 template<class Check>
-void MaNGOS::WorldObjectListSearcher<Check>::Visit(GameObjectMapType &m)
+void MaNGOS::WorldObjectListSearcher<Check>::Visit(GameObjectMapType& m)
 {
-    for(GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         if (itr->getSource()->InSamePhase(i_phaseMask))
             if (i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
 
 template<class Check>
-void MaNGOS::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType &m)
+void MaNGOS::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType& m)
 {
-    for(DynamicObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (DynamicObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         if (itr->getSource()->InSamePhase(i_phaseMask))
             if (i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
@@ -356,13 +419,13 @@ void MaNGOS::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType &m)
 // Gameobject searchers
 
 template<class Check>
-void MaNGOS::GameObjectSearcher<Check>::Visit(GameObjectMapType &m)
+void MaNGOS::GameObjectSearcher<Check>::Visit(GameObjectMapType& m)
 {
     // already found
     if (i_object)
         return;
 
-    for(GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -376,9 +439,9 @@ void MaNGOS::GameObjectSearcher<Check>::Visit(GameObjectMapType &m)
 }
 
 template<class Check>
-void MaNGOS::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m)
+void MaNGOS::GameObjectLastSearcher<Check>::Visit(GameObjectMapType& m)
 {
-    for(GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -389,9 +452,9 @@ void MaNGOS::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m)
 }
 
 template<class Check>
-void MaNGOS::GameObjectListSearcher<Check>::Visit(GameObjectMapType &m)
+void MaNGOS::GameObjectListSearcher<Check>::Visit(GameObjectMapType& m)
 {
-    for(GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         if (itr->getSource()->InSamePhase(i_phaseMask))
             if (i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
@@ -400,13 +463,13 @@ void MaNGOS::GameObjectListSearcher<Check>::Visit(GameObjectMapType &m)
 // Unit searchers
 
 template<class Check>
-void MaNGOS::UnitSearcher<Check>::Visit(CreatureMapType &m)
+void MaNGOS::UnitSearcher<Check>::Visit(CreatureMapType& m)
 {
     // already found
     if (i_object)
         return;
 
-    for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -420,13 +483,13 @@ void MaNGOS::UnitSearcher<Check>::Visit(CreatureMapType &m)
 }
 
 template<class Check>
-void MaNGOS::UnitSearcher<Check>::Visit(PlayerMapType &m)
+void MaNGOS::UnitSearcher<Check>::Visit(PlayerMapType& m)
 {
     // already found
     if (i_object)
         return;
 
-    for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -440,9 +503,9 @@ void MaNGOS::UnitSearcher<Check>::Visit(PlayerMapType &m)
 }
 
 template<class Check>
-void MaNGOS::UnitLastSearcher<Check>::Visit(CreatureMapType &m)
+void MaNGOS::UnitLastSearcher<Check>::Visit(CreatureMapType& m)
 {
-    for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -453,9 +516,9 @@ void MaNGOS::UnitLastSearcher<Check>::Visit(CreatureMapType &m)
 }
 
 template<class Check>
-void MaNGOS::UnitLastSearcher<Check>::Visit(PlayerMapType &m)
+void MaNGOS::UnitLastSearcher<Check>::Visit(PlayerMapType& m)
 {
-    for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -466,18 +529,18 @@ void MaNGOS::UnitLastSearcher<Check>::Visit(PlayerMapType &m)
 }
 
 template<class Check>
-void MaNGOS::UnitListSearcher<Check>::Visit(PlayerMapType &m)
+void MaNGOS::UnitListSearcher<Check>::Visit(PlayerMapType& m)
 {
-    for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         if (itr->getSource()->InSamePhase(i_phaseMask))
             if (i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
 
 template<class Check>
-void MaNGOS::UnitListSearcher<Check>::Visit(CreatureMapType &m)
+void MaNGOS::UnitListSearcher<Check>::Visit(CreatureMapType& m)
 {
-    for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         if (itr->getSource()->InSamePhase(i_phaseMask))
             if (i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
@@ -486,13 +549,13 @@ void MaNGOS::UnitListSearcher<Check>::Visit(CreatureMapType &m)
 // Creature searchers
 
 template<class Check>
-void MaNGOS::CreatureSearcher<Check>::Visit(CreatureMapType &m)
+void MaNGOS::CreatureSearcher<Check>::Visit(CreatureMapType& m)
 {
     // already found
     if (i_object)
         return;
 
-    for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -506,9 +569,9 @@ void MaNGOS::CreatureSearcher<Check>::Visit(CreatureMapType &m)
 }
 
 template<class Check>
-void MaNGOS::CreatureLastSearcher<Check>::Visit(CreatureMapType &m)
+void MaNGOS::CreatureLastSearcher<Check>::Visit(CreatureMapType& m)
 {
-    for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -519,22 +582,22 @@ void MaNGOS::CreatureLastSearcher<Check>::Visit(CreatureMapType &m)
 }
 
 template<class Check>
-void MaNGOS::CreatureListSearcher<Check>::Visit(CreatureMapType &m)
+void MaNGOS::CreatureListSearcher<Check>::Visit(CreatureMapType& m)
 {
-    for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         if (itr->getSource()->InSamePhase(i_phaseMask))
             if (i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
 
 template<class Check>
-void MaNGOS::PlayerSearcher<Check>::Visit(PlayerMapType &m)
+void MaNGOS::PlayerSearcher<Check>::Visit(PlayerMapType& m)
 {
     // already found
     if (i_object)
         return;
 
-    for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
@@ -548,28 +611,28 @@ void MaNGOS::PlayerSearcher<Check>::Visit(PlayerMapType &m)
 }
 
 template<class Check>
-void MaNGOS::PlayerListSearcher<Check>::Visit(PlayerMapType &m)
+void MaNGOS::PlayerListSearcher<Check>::Visit(PlayerMapType& m)
 {
-    for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
+    for (PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         if (itr->getSource()->InSamePhase(i_phaseMask))
             if (i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
 
 template<class Builder>
-void MaNGOS::LocalizedPacketDo<Builder>::operator()( Player* p )
+void MaNGOS::LocalizedPacketDo<Builder>::operator()(Player* p)
 {
     int32 loc_idx = p->GetSession()->GetSessionDbLocaleIndex();
-    uint32 cache_idx = loc_idx+1;
+    uint32 cache_idx = loc_idx + 1;
     WorldPacket* data;
 
     // create if not cached yet
-    if (i_data_cache.size() < cache_idx+1 || !i_data_cache[cache_idx])
+    if (i_data_cache.size() < cache_idx + 1 || !i_data_cache[cache_idx])
     {
-        if (i_data_cache.size() < cache_idx+1)
-            i_data_cache.resize(cache_idx+1);
+        if (i_data_cache.size() < cache_idx + 1)
+            i_data_cache.resize(cache_idx + 1);
 
-        data = new WorldPacket(SMSG_MESSAGECHAT, 200);
+        data = new WorldPacket();
 
         i_builder(*data, loc_idx);
 
@@ -582,17 +645,17 @@ void MaNGOS::LocalizedPacketDo<Builder>::operator()( Player* p )
 }
 
 template<class Builder>
-void MaNGOS::LocalizedPacketListDo<Builder>::operator()( Player* p )
+void MaNGOS::LocalizedPacketListDo<Builder>::operator()(Player* p)
 {
     int32 loc_idx = p->GetSession()->GetSessionDbLocaleIndex();
-    uint32 cache_idx = loc_idx+1;
+    uint32 cache_idx = loc_idx + 1;
     WorldPacketList* data_list;
 
     // create if not cached yet
-    if (i_data_cache.size() < cache_idx+1 || i_data_cache[cache_idx].empty())
+    if (i_data_cache.size() < cache_idx + 1 || i_data_cache[cache_idx].empty())
     {
-        if (i_data_cache.size() < cache_idx+1)
-            i_data_cache.resize(cache_idx+1);
+        if (i_data_cache.size() < cache_idx + 1)
+            i_data_cache.resize(cache_idx + 1);
 
         data_list = &i_data_cache[cache_idx];
 
@@ -601,7 +664,7 @@ void MaNGOS::LocalizedPacketListDo<Builder>::operator()( Player* p )
     else
         data_list = &i_data_cache[cache_idx];
 
-    for(size_t i = 0; i < data_list->size(); ++i)
+    for (size_t i = 0; i < data_list->size(); ++i)
         p->SendDirectMessage((*data_list)[i]);
 }
 
diff --git a/src/game/GridStates.cpp b/src/game/GridStates.cpp
deleted file mode 100644
index 05f208b4bd2..00000000000
--- a/src/game/GridStates.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "GridStates.h"
-#include "GridNotifiers.h"
-#include "GameSystem/Grid.h"
-#include "Log.h"
-
-void
-InvalidState::Update(Map &, NGridType &, GridInfo &, const uint32 &/*x*/, const uint32 &/*y*/, const uint32 &) const
-{
-}
-
-void
-ActiveState::Update(Map &m, NGridType &grid, GridInfo & info, const uint32 &x, const uint32 &y, const uint32 &t_diff) const
-{
-    // Only check grid activity every (grid_expiry/10) ms, because it's really useless to do it every cycle
-    info.UpdateTimeTracker(t_diff);
-    if( info.getTimeTracker().Passed() )
-    {
-        if( grid.ActiveObjectsInGrid() == 0 && !m.ActiveObjectsNearGrid(x, y) )
-        {
-            ObjectGridStoper stoper(grid);
-            stoper.StopN();
-            grid.SetGridState(GRID_STATE_IDLE);
-        }
-        else
-        {
-            m.ResetGridExpiry(grid, 0.1f);
-        }
-    }
-}
-
-void
-IdleState::Update(Map &m, NGridType &grid, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &) const
-{
-    m.ResetGridExpiry(grid);
-    grid.SetGridState(GRID_STATE_REMOVAL);
-    DEBUG_LOG("Grid[%u,%u] on map %u moved to IDLE state", x, y, m.GetId());
-}
-
-void
-RemovalState::Update(Map &m, NGridType &grid, GridInfo &info, const uint32 &x, const uint32 &y, const uint32 &t_diff) const
-{
-    if(!info.getUnloadLock())
-    {
-        info.UpdateTimeTracker(t_diff);
-        if( info.getTimeTracker().Passed() )
-        {
-            if( !m.UnloadGrid(x, y, false) )
-            {
-                DEBUG_LOG("Grid[%u,%u] for map %u differed unloading due to players or active objects nearby", x, y, m.GetId());
-                m.ResetGridExpiry(grid);
-            }
-        }
-    }
-}
diff --git a/src/game/GridStates.h b/src/game/GridStates.h
deleted file mode 100644
index 94d1fd67bc0..00000000000
--- a/src/game/GridStates.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef MANGOS_GRIDSTATES_H
-#define MANGOS_GRIDSTATES_H
-
-#include "Map.h"
-
-class MANGOS_DLL_DECL GridState
-{
-    public:
-
-        virtual void Update(Map &, NGridType&, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const = 0;
-};
-
-class MANGOS_DLL_DECL InvalidState : public GridState
-{
-    public:
-
-        void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
-};
-
-class MANGOS_DLL_DECL ActiveState : public GridState
-{
-    public:
-
-        void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
-};
-
-class MANGOS_DLL_DECL IdleState : public GridState
-{
-    public:
-
-        void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
-};
-
-class MANGOS_DLL_DECL RemovalState : public GridState
-{
-    public:
-
-        void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
-};
-
-#endif
diff --git a/src/game/Group.cpp b/src/game/Group.cpp
index 93f3e463d5a..f3cafd69441 100644
--- a/src/game/Group.cpp
+++ b/src/game/Group.cpp
@@ -22,16 +22,23 @@
 #include "WorldSession.h"
 #include "Player.h"
 #include "World.h"
+#include "AccountMgr.h"
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "Group.h"
 #include "Formulas.h"
 #include "ObjectAccessor.h"
-#include "BattleGround.h"
+#include "BattleGround/BattleGround.h"
+#include "BattleGround/BattleGroundMgr.h"
 #include "MapManager.h"
 #include "MapPersistentStateMgr.h"
 #include "Util.h"
 #include "LootMgr.h"
+#include "LFGMgr.h"
+#include "UpdateFieldFlags.h"
+
+// Playerbot
+#include "playerbot/PlayerbotMgr.h"
 
 #define LOOT_ROLL_TIMEOUT  (1*MINUTE*IN_MILLISECONDS)
 
@@ -73,51 +80,77 @@ RollVoteMask Roll::GetVoteMaskFor(Player* player) const
 //============== Group ==============================
 //===================================================
 
-Group::Group() : m_Id(0), m_groupType(GROUPTYPE_NORMAL),
-    m_dungeonDifficulty(REGULAR_DIFFICULTY), m_raidDifficulty(REGULAR_DIFFICULTY),
-    m_bgGroup(NULL), m_lootMethod(FREE_FOR_ALL), m_lootThreshold(ITEM_QUALITY_UNCOMMON),
-    m_subGroupsCounts(NULL)
+Group::Group(GroupType type) :
+    m_Guid(ObjectGuid()),
+    m_groupType(type),
+    m_Difficulty(0),
+    m_bgGroup(NULL),
+    m_lootMethod(FREE_FOR_ALL),
+    m_lootThreshold(ITEM_QUALITY_UNCOMMON),
+    m_looterGuid(ObjectGuid()),
+    m_rollIds(NULL),
+    m_subGroupsCounts(NULL),
+    m_waitLeaderTimer(0)
 {
+    m_rollIds = new TRolls();
 }
 
 Group::~Group()
 {
-    if(m_bgGroup)
+    if (m_bgGroup)
     {
-        DEBUG_LOG("Group::~Group: battleground group being deleted.");
-        if(m_bgGroup->GetBgRaid(ALLIANCE) == this)
+        if (m_bgGroup->GetBgRaid(ALLIANCE) == this)
             m_bgGroup->SetBgRaid(ALLIANCE, NULL);
-        else if(m_bgGroup->GetBgRaid(HORDE) == this)
+        else if (m_bgGroup->GetBgRaid(HORDE) == this)
             m_bgGroup->SetBgRaid(HORDE, NULL);
         else
             sLog.outError("Group::~Group: battleground group is not linked to the correct battleground.");
     }
-    Rolls::iterator itr;
-    while(!RollId.empty())
+
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        itr = RollId.begin();
-        Roll *r = *itr;
-        RollId.erase(itr);
-        delete(r);
+        if (Player* pMember = itr->getSource())
+        {
+            if (ObjectGuid const& lootGuid = pMember->GetLootGuid())
+                pMember->SendLootRelease(lootGuid);
+        }
     }
 
-    // it is undefined whether objectmgr (which stores the groups) or instancesavemgr
-    // will be unloaded first so we must be prepared for both cases
-    // this may unload some dungeon persistent state
-    for(uint8 i = 0; i < MAX_DIFFICULTY; ++i)
-        for(BoundInstancesMap::iterator itr2 = m_boundInstances[i].begin(); itr2 != m_boundInstances[i].end(); ++itr2)
-            itr2->second.state->RemoveGroup(this);
+    if (m_rollIds)
+    {
+        if (!m_rollIds->empty())
+        {
+            for (TRolls::const_reverse_iterator itr = m_rollIds->rbegin(); itr != m_rollIds->rend(); ++itr)
+                delete *itr;
+        }
+        delete m_rollIds;
+    }
+
+    if (GetObjectGuid())
+    {
+        DEBUG_LOG("Group::~Group: %s type %u has ben deleted.", GetObjectGuid().GetString().c_str(), m_groupType);
+        // it is undefined whether objectmgr (which stores the groups) or instancesavemgr
+        // will be unloaded first so we must be prepared for both cases
+        // this may unload some dungeon persistent state
+        sMapPersistentStateMgr.AddToUnbindQueue(GetObjectGuid());
+
+        if (isLFDGroup())
+            sLFGMgr.RemoveLFGState(GetObjectGuid());
+
+        // recheck deletion in ObjectMgr (must be deleted while disband, but additional check not be bad)
+        sObjectMgr.RemoveGroup(this);
+    }
+    else sLog.outError("Group::~Group: not fully created group type %u has ben deleted.", m_groupType);
 
     // Sub group counters clean up
     if (m_subGroupsCounts)
         delete[] m_subGroupsCounts;
 }
 
-bool Group::Create(ObjectGuid guid, const char * name)
+bool Group::Create(ObjectGuid guid, const char* name)
 {
     m_leaderGuid = guid;
     m_leaderName = name;
-
     m_groupType  = isBGGroup() ? GROUPTYPE_BGRAID : GROUPTYPE_NORMAL;
 
     if (m_groupType & GROUPTYPE_RAID)
@@ -127,100 +160,133 @@ bool Group::Create(ObjectGuid guid, const char * name)
     m_lootThreshold = ITEM_QUALITY_UNCOMMON;
     m_looterGuid = guid;
 
-    m_dungeonDifficulty = DUNGEON_DIFFICULTY_NORMAL;
-    m_raidDifficulty = RAID_DIFFICULTY_10MAN_NORMAL;
+    SetDungeonDifficulty(DUNGEON_DIFFICULTY_NORMAL);
+    SetRaidDifficulty(RAID_DIFFICULTY_10MAN_NORMAL);
+
+    if (!GetObjectGuid())
+        m_Guid = ObjectGuid(HIGHGUID_GROUP, sObjectMgr.GenerateGroupLowGuid());
+
+    sObjectMgr.AddGroup(this);
+    
+    Player* leader = sObjectMgr.GetPlayer(guid);
+    if (leader)
+        leader->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GROUP_LEADER);
+
     if (!isBGGroup())
     {
-        m_Id = sObjectMgr.GenerateGroupLowGuid();
-
-        Player *leader = sObjectMgr.GetPlayer(guid);
-        if(leader)
+        if (leader)
         {
-            m_dungeonDifficulty = leader->GetDungeonDifficulty();
-            m_raidDifficulty = leader->GetRaidDifficulty();
+            SetDungeonDifficulty(leader->GetDungeonDifficulty());
+            SetRaidDifficulty(leader->GetRaidDifficulty());
         }
 
         Player::ConvertInstancesToGroup(leader, this, guid);
+    }
 
+    if (IsNeedSave())
+    {
         // store group in database
         CharacterDatabase.BeginTransaction();
-        CharacterDatabase.PExecute("DELETE FROM groups WHERE groupId ='%u'", m_Id);
-        CharacterDatabase.PExecute("DELETE FROM group_member WHERE groupId ='%u'", m_Id);
 
-        CharacterDatabase.PExecute("INSERT INTO groups (groupId,leaderGuid,mainTank,mainAssistant,lootMethod,looterGuid,lootThreshold,icon1,icon2,icon3,icon4,icon5,icon6,icon7,icon8,groupType,difficulty,raiddifficulty) "
-            "VALUES ('%u','%u','%u','%u','%u','%u','%u','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','%u','%u','%u')",
-            m_Id, m_leaderGuid.GetCounter(), m_mainTankGuid.GetCounter(), m_mainAssistantGuid.GetCounter(), uint32(m_lootMethod),
-            m_looterGuid.GetCounter(), uint32(m_lootThreshold),
-            m_targetIcons[0].GetRawValue(), m_targetIcons[1].GetRawValue(),
-            m_targetIcons[2].GetRawValue(), m_targetIcons[3].GetRawValue(),
-            m_targetIcons[4].GetRawValue(), m_targetIcons[5].GetRawValue(),
-            m_targetIcons[6].GetRawValue(), m_targetIcons[7].GetRawValue(),
-            uint8(m_groupType), uint32(m_dungeonDifficulty), uint32(m_raidDifficulty));
+        static SqlStatementID delGroup;
+        CharacterDatabase.CreateStatement(delGroup, "DELETE FROM groups WHERE groupId = ?")
+            .PExecute(m_Guid.GetCounter());
+
+        static SqlStatementID delGroupMemb;
+        CharacterDatabase.CreateStatement(delGroupMemb, "DELETE FROM group_member WHERE groupId = ?")
+            .PExecute(m_Guid.GetCounter());
+
+        static SqlStatementID insGroup;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(insGroup,
+            "INSERT INTO groups "
+            "(groupId,leaderGuid,lootMethod,looterGuid,lootThreshold,icon1,icon2,icon3,icon4,icon5,icon6,icon7,icon8,groupType,difficulty,raiddifficulty) "
+            "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+
+        stmt.addUInt32(m_Guid.GetCounter());
+        stmt.addUInt32(m_leaderGuid.GetCounter());
+        stmt.addUInt8(uint8(m_lootMethod));
+        stmt.addUInt32(m_looterGuid.GetCounter());
+        stmt.addUInt8(uint8(m_lootThreshold));
+
+        for (uint8 i = 0; i < TARGET_ICON_COUNT; ++i)
+            stmt.addUInt64(m_targetIcons[i].GetRawValue());
+
+        stmt.addUInt8(uint8(m_groupType));
+        stmt.addUInt8(uint8(GetDungeonDifficulty()));
+        stmt.addUInt32(uint32(GetRaidDifficulty()));
+        stmt.Execute();
     }
 
-    if (!AddMember(guid, name))
-        return false;
+    bool retResult = AddMember(guid, name);
 
-    if (!isBGGroup())
+    if (IsNeedSave())
         CharacterDatabase.CommitTransaction();
 
-    return true;
+    return retResult;
 }
 
 bool Group::LoadGroupFromDB(Field* fields)
 {
-    //                                          0         1              2           3           4              5      6      7      8      9      10     11     12     13         14          15              16          17
-    // result = CharacterDatabase.Query("SELECT mainTank, mainAssistant, lootMethod, looterGuid, lootThreshold, icon1, icon2, icon3, icon4, icon5, icon6, icon7, icon8, groupType, difficulty, raiddifficulty, leaderGuid, groupId FROM groups");
+    //                                          0           1           2              3      4      5      6      7      8      9      10     11         12          13              14          15              16          17
+    // result = CharacterDatabase.Query("SELECT lootMethod, looterGuid, lootThreshold, icon1, icon2, icon3, icon4, icon5, icon6, icon7, icon8, groupType, difficulty, raiddifficulty, leaderGuid, groupId FROM groups");
 
-    m_Id = fields[17].GetUInt32();
-    m_leaderGuid = ObjectGuid(HIGHGUID_PLAYER, fields[16].GetUInt32());
+    m_Guid = ObjectGuid(HIGHGUID_GROUP,fields[15].GetUInt32());
+    m_leaderGuid = ObjectGuid(HIGHGUID_PLAYER, fields[14].GetUInt32());
 
     // group leader not exist
-    if (!sObjectMgr.GetPlayerNameByGUID(m_leaderGuid, m_leaderName))
+    if (!sAccountMgr.GetPlayerNameByGUID(m_leaderGuid, m_leaderName))
         return false;
 
-    m_groupType  = GroupType(fields[13].GetUInt8());
+    m_groupType  = GroupType(fields[11].GetUInt8());
 
     if (m_groupType & GROUPTYPE_RAID)
         _initRaidSubGroupsCounter();
 
-    uint32 diff = fields[14].GetUInt8();
+    uint32 diff = fields[12].GetUInt8();
     if (diff >= MAX_DUNGEON_DIFFICULTY)
         diff = DUNGEON_DIFFICULTY_NORMAL;
-    m_dungeonDifficulty = Difficulty(diff);
+    SetDungeonDifficulty(Difficulty(diff));
 
-    uint32 r_diff = fields[15].GetUInt8();
+    uint32 r_diff = fields[13].GetUInt8();
     if (r_diff >= MAX_RAID_DIFFICULTY)
         r_diff = RAID_DIFFICULTY_10MAN_NORMAL;
-    m_raidDifficulty = Difficulty(r_diff);
+    SetRaidDifficulty(Difficulty(r_diff));
+
+    m_lootMethod = LootMethod(fields[0].GetUInt8());
+    m_looterGuid = ObjectGuid(HIGHGUID_PLAYER, fields[1].GetUInt32());
+    m_lootThreshold = ItemQualities(fields[2].GetUInt16());
 
-    m_mainTankGuid = ObjectGuid(HIGHGUID_PLAYER, fields[0].GetUInt32());
-    m_mainAssistantGuid = ObjectGuid(HIGHGUID_PLAYER, fields[1].GetUInt32());
-    m_lootMethod = LootMethod(fields[2].GetUInt8());
-    m_looterGuid = ObjectGuid(HIGHGUID_PLAYER, fields[3].GetUInt32());
-    m_lootThreshold = ItemQualities(fields[4].GetUInt16());
+    for (int i = 0; i < TARGET_ICON_COUNT; ++i)
+        m_targetIcons[i] = ObjectGuid(fields[3+i].GetUInt64());
 
-    for(int i = 0; i < TARGET_ICON_COUNT; ++i)
-        m_targetIcons[i] = ObjectGuid(fields[5+i].GetUInt64());
+    if (isLFDGroup())
+        sLFGMgr.CreateLFGState(GetObjectGuid());
 
     return true;
 }
 
-bool Group::LoadMemberFromDB(uint32 guidLow, uint8 subgroup, bool assistant)
+bool Group::LoadMemberFromDB(uint32 guidLow, uint8 subgroup, GroupFlagMask flags, LFGRoleMask roles)
 {
     MemberSlot member;
-    member.guid      = ObjectGuid(HIGHGUID_PLAYER, guidLow);
+    member.guid = ObjectGuid(HIGHGUID_PLAYER, guidLow);
 
     // skip nonexistent member
-    if (!sObjectMgr.GetPlayerNameByGUID(member.guid, member.name))
+    if (!sAccountMgr.GetPlayerNameByGUID(member.guid, member.name))
         return false;
 
-    member.group     = subgroup;
-    member.assistant = assistant;
+    member.group = subgroup;
+    member.flags = flags;
+    member.roles = roles;
     m_memberSlots.push_back(member);
 
     SubGroupCounterIncrease(subgroup);
 
+    if (Player* player = sObjectMgr.GetPlayer(member.guid))
+    {
+        if (player->IsInWorld())
+            sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->SetRoles(roles);
+    }
+
     return true;
 }
 
@@ -230,42 +296,60 @@ void Group::ConvertToRaid()
 
     _initRaidSubGroupsCounter();
 
-    if(!isBGGroup())
-        CharacterDatabase.PExecute("UPDATE groups SET groupType = %u WHERE groupId='%u'", uint8(m_groupType), m_Id);
+    if (IsNeedSave())
+    {
+        static SqlStatementID updGroup;
+        CharacterDatabase.CreateStatement(updGroup, "UPDATE groups SET groupType = ? WHERE groupId = ?")
+            .PExecute(uint8(GetGroupType()), m_Guid.GetCounter());
+    }
+
     SendUpdate();
 
     // update quest related GO states (quest activity dependent from raid membership)
-    for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
-        if(Player* player = sObjectMgr.GetPlayer(citr->guid))
+    for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
+    {
+        if (Player* player = sObjectMgr.GetPlayer(citr->guid))
             player->UpdateForQuestWorldObjects();
+    }
 }
 
-bool Group::AddInvite(Player *player)
+bool Group::AddInvite(Player* player)
 {
-    if( !player || player->GetGroupInvite() )
+    if (!player || player->GetGroupInvite())
         return false;
+
     Group* group = player->GetGroup();
-    if( group && group->isBGGroup() )
+    if (group && group->isBGGroup())
         group = player->GetOriginalGroup();
-    if( group )
+
+    if (group)
         return false;
 
     RemoveInvite(player);
 
     m_invitees.insert(player);
 
-    player->SetGroupInvite(this);
+    player->SetGroupInvite(GetObjectGuid());
 
     return true;
 }
 
-bool Group::AddLeaderInvite(Player *player)
+bool Group::AddLeaderInvite(Player* player)
 {
-    if(!AddInvite(player))
+    if (!AddInvite(player))
         return false;
 
+    // Group may be added without Create() call - need make ObjectGuid manually
+    if (!GetObjectGuid())
+        m_Guid = ObjectGuid(HIGHGUID_GROUP, sObjectMgr.GenerateGroupLowGuid());
+
+    sObjectMgr.AddGroup(this);
+
     m_leaderGuid = player->GetObjectGuid();
     m_leaderName = player->GetName();
+    if (Player* newLeader = ObjectAccessor::FindPlayer(m_leaderGuid))
+        newLeader->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GROUP_LEADER);
+
     return true;
 }
 
@@ -273,32 +357,34 @@ uint32 Group::RemoveInvite(Player *player)
 {
     m_invitees.erase(player);
 
-    player->SetGroupInvite(NULL);
+    player->SetGroupInvite(ObjectGuid());
     return GetMembersCount();
 }
 
 void Group::RemoveAllInvites()
 {
-    for(InvitesList::iterator itr = m_invitees.begin(); itr!=m_invitees.end(); ++itr)
-        (*itr)->SetGroupInvite(NULL);
+    for (InvitesList::iterator itr = m_invitees.begin(); itr!=m_invitees.end(); ++itr)
+        (*itr)->SetGroupInvite(ObjectGuid());
 
     m_invitees.clear();
 }
 
 Player* Group::GetInvited(ObjectGuid guid) const
 {
-    for(InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr)
+    for (InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr)
+    {
         if ((*itr)->GetObjectGuid() == guid)
             return (*itr);
+    }
 
     return NULL;
 }
 
 Player* Group::GetInvited(const std::string& name) const
 {
-    for(InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr)
+    for (InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr)
     {
-        if((*itr)->GetName() == name)
+        if ((*itr)->GetName() == name)
             return (*itr);
     }
     return NULL;
@@ -306,19 +392,30 @@ Player* Group::GetInvited(const std::string& name) const
 
 bool Group::AddMember(ObjectGuid guid, const char* name)
 {
+    // not add again if player already in this group
+    if (IsMember(guid))
+    {
+        sLog.outError("Group::AddMember: attempt to add %s into %s. Player already in this group.",
+            guid.GetString().c_str(), GetObjectGuid().GetString().c_str());
+        return false;
+    }
+
     if (!_addMember(guid, name))
         return false;
 
     SendUpdate();
 
+    if (isLFDGroup())
+        sLFGMgr.AddMemberToLFDGroup(guid);
+
     if (Player* player = sObjectMgr.GetPlayer(guid))
     {
-        if (!IsLeader(player->GetObjectGuid()) && !isBGGroup())
+        if (!IsLeader(guid) && !isBGGroup())
         {
             // reset the new member's instances, unless he is currently in one of them
             // including raid/heroic instances that they are not permanently bound to!
-            player->ResetInstances(INSTANCE_RESET_GROUP_JOIN,false);
-            player->ResetInstances(INSTANCE_RESET_GROUP_JOIN,true);
+            player->ResetInstances(INSTANCE_RESET_GROUP_JOIN, false);
+            player->ResetInstances(INSTANCE_RESET_GROUP_JOIN, true);
 
             if (player->getLevel() >= LEVELREQUIREMENT_HEROIC)
             {
@@ -334,57 +431,114 @@ bool Group::AddMember(ObjectGuid guid, const char* name)
                 }
             }
         }
+
         player->SetGroupUpdateFlag(GROUP_UPDATE_FULL);
         UpdatePlayerOutOfRange(player);
 
         // quest related GO state dependent from raid membership
-        if(isRaidGroup())
+        if (isRaidGroup())
             player->UpdateForQuestWorldObjects();
+
+        // Broadcast new player group member fields to rest of the group
+        player->SetFieldNotifyFlag(UF_FLAG_PARTY_MEMBER);
+
+        UpdateData data;
+
+        // Broadcast group members' fields to player
+        for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+//            if (itr->getSource() == player)
+//                continue;
+
+            if (Player* pMember = itr->getSource())
+            {
+                if (player->HaveAtClient(pMember->GetObjectGuid()))
+                {
+                    pMember->SetFieldNotifyFlag(UF_FLAG_PARTY_MEMBER);
+                    pMember->BuildValuesUpdateBlockForPlayer(&data, player);
+                    pMember->RemoveFieldNotifyFlag(UF_FLAG_PARTY_MEMBER);
+                }
+
+                if (pMember->HaveAtClient(player->GetObjectGuid()))
+                {
+                    UpdateData membData;
+                    player->BuildValuesUpdateBlockForPlayer(&membData, pMember);
+
+                    if (membData.HasData())
+                    {
+                        WorldPacket packet;
+                        membData.BuildPacket(&packet);
+                        pMember->SendDirectMessage(&packet);
+                    }
+                }
+            }
+        }
+
+        if (data.HasData())
+        {
+            WorldPacket packet;
+            data.BuildPacket(&packet);
+            player->SendDirectMessage(&packet);
+        }
+
+        player->RemoveFieldNotifyFlag(UF_FLAG_PARTY_MEMBER);
     }
 
     return true;
 }
 
-uint32 Group::RemoveMember(ObjectGuid guid, uint8 method)
+uint32 Group::RemoveMember(ObjectGuid guid, uint8 method, bool logout /*=false*/)
 {
+    // Frozen Mod
+    BroadcastGroupUpdate();
+    // Frozen Mod
+
+    RemoveGroupBuffsOnMemberRemove(guid);
+
+    // wait to leader reconnect
+    if (logout && IsLeader(guid))
+        return m_memberSlots.size();
+
     // remove member and change leader (if need) only if strong more 2 members _before_ member remove
     if (GetMembersCount() > uint32(isBGGroup() ? 1 : 2))    // in BG group case allow 1 members group
     {
         bool leaderChanged = _removeMember(guid);
 
-        if (Player *player = sObjectMgr.GetPlayer( guid ))
+        if (Player* player = sObjectMgr.GetPlayer(guid))
         {
             // quest related GO state dependent from raid membership
             if (isRaidGroup())
                 player->UpdateForQuestWorldObjects();
 
-            WorldPacket data;
-
             if (method == 1)
             {
-                data.Initialize( SMSG_GROUP_UNINVITE, 0 );
-                player->GetSession()->SendPacket( &data );
+                WorldPacket data(SMSG_GROUP_UNINVITE, 0);
+                player->GetSession()->SendPacket(&data);
             }
 
-            //we already removed player from group and in player->GetGroup() is his original group!
+            // we already removed player from group and in player->GetGroup() is his original group!
             if (Group* group = player->GetGroup())
-            {
                 group->SendUpdate();
-            }
             else
             {
-                data.Initialize(SMSG_GROUP_LIST, 1+1+1+1+8+4+4+8);
+                WorldPacket data(SMSG_GROUP_LIST, 1 + 1 + 1 + 1 + 8 + 4 + 4 + 8);
                 data << uint8(0x10) << uint8(0) << uint8(0) << uint8(0);
                 data << uint64(0) << uint32(0) << uint32(0) << uint64(0);
                 player->GetSession()->SendPacket(&data);
             }
 
             _homebindIfInstance(player);
+
+            if (isLFDGroup())
+                sLFGMgr.RemoveMemberFromLFDGroup(this, guid);
         }
 
         if (leaderChanged)
         {
-            WorldPacket data(SMSG_GROUP_SET_LEADER, (m_memberSlots.front().name.size()+1));
+            if (Player* oldLeader = sObjectMgr.GetPlayer(guid))
+                oldLeader->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_GROUP_LEADER);
+
+            WorldPacket data(SMSG_GROUP_SET_LEADER, m_memberSlots.front().name.size() + 1);
             data << m_memberSlots.front().name;
             BroadcastPacket(&data, true);
         }
@@ -398,65 +552,172 @@ uint32 Group::RemoveMember(ObjectGuid guid, uint8 method)
     return m_memberSlots.size();
 }
 
+void Group::RemoveGroupBuffsOnMemberRemove(ObjectGuid guid)
+{
+    // Attention! player may be NULL (offline)
+    Player* pLeaver = sObjectMgr.GetPlayer(guid);
+
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        if (Player* pGroupGuy = itr->getSource())
+        {
+            // dont remove my auras from myself, also skip offlined
+            if (pGroupGuy->GetObjectGuid() == guid)
+                continue;
+
+            // remove all buffs cast by me from group members before leaving
+            pGroupGuy->RemoveAllGroupBuffsFromCaster(guid);
+
+            // remove from me all buffs cast by group members
+            if (pLeaver)
+                pLeaver->RemoveAllGroupBuffsFromCaster(pGroupGuy->GetObjectGuid());
+        }
+    }
+}
+
 void Group::ChangeLeader(ObjectGuid guid)
 {
     member_citerator slot = _getMemberCSlot(guid);
     if (slot == m_memberSlots.end())
         return;
 
+    sLFGMgr.Leave(this);
+
     _setLeader(guid);
 
-    WorldPacket data(SMSG_GROUP_SET_LEADER, slot->name.size()+1);
+    WorldPacket data(SMSG_GROUP_SET_LEADER, slot->name.size() + 1);
     data << slot->name;
     BroadcastPacket(&data, true);
     SendUpdate();
 }
 
+void Group::CheckLeader(ObjectGuid const& guid, bool logout)
+{
+    if (IsLeader(guid))
+    {
+        if (logout)
+            m_waitLeaderTimer = sWorld.getConfig(CONFIG_UINT32_GROUPLEADER_RECONNECT_PERIOD) * IN_MILLISECONDS;
+        else
+            m_waitLeaderTimer = 0;
+        return;
+    }
+
+    // normal member logins
+    if (logout || m_waitLeaderTimer)
+        return;
+
+    Player* pLeader = NULL;
+
+    // find the leader from group members
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        if (itr->getSource()->GetObjectGuid() == m_leaderGuid)
+        {
+            pLeader = itr->getSource();
+            break;
+        }
+    }
+
+    if (!pLeader || !pLeader->IsInWorld())
+        m_waitLeaderTimer = sWorld.getConfig(CONFIG_UINT32_GROUPLEADER_RECONNECT_PERIOD) * IN_MILLISECONDS;
+}
+
+Player* Group::GetMemberWithRole(GroupFlagMask role)
+{
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        Player* player = itr->getSource();
+        if (player && player->IsInWorld() &&
+            player->GetObjectGuid() != m_leaderGuid &&
+            IsGroupRole(player->GetObjectGuid(), role) &&
+            !player->GetPlayerbotAI() /* don't give leader to bots */)
+        {
+            return player;
+        }
+    }
+    return NULL;
+}
+
+bool Group::ChangeLeaderToFirstSuitableMember(bool onlySet/*= false*/)
+{
+    Player* newLeader = NULL;
+
+    // first find asistants
+    if (isRaidGroup())
+    {
+        // Assistant
+        newLeader = GetMemberWithRole(GROUP_ASSISTANT);
+        // Main Tank
+        if (!newLeader)
+            newLeader = GetMemberWithRole(GROUP_MAIN_TANK);
+        // Main Assistant
+        if (!newLeader)
+            newLeader = GetMemberWithRole(GROUP_MAIN_ASSISTANT);
+    }
+
+    // then any member
+    if (!newLeader)
+        newLeader = GetMemberWithRole(GROUP_MEMBER);
+
+    if (newLeader)
+    {
+        if (onlySet)
+            _setLeader(newLeader->GetObjectGuid());
+        else
+            ChangeLeader(newLeader->GetObjectGuid());
+
+        newLeader->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GROUP_LEADER);
+        return true;
+    }
+
+    return false;
+}
+
 void Group::Disband(bool hideDestroy)
 {
-    Player *player;
+    Player* player;
 
-    for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
+    for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
     {
         player = sObjectMgr.GetPlayer(citr->guid);
-        if(!player)
+        if (!player)
             continue;
 
-        //we cannot call _removeMember because it would invalidate member iterator
-        //if we are removing player from battleground raid
-        if( isBGGroup() )
+        // we cannot call _removeMember because it would invalidate member iterator
+        // if we are removing player from battleground raid
+        if (isBGGroup())
             player->RemoveFromBattleGroundRaid();
         else
         {
-            //we can remove player who is in battleground from his original group
-            if( player->GetOriginalGroup() == this )
-                player->SetOriginalGroup(NULL);
+            // we can remove player who is in battleground from his original group
+            if (player->GetOriginalGroupGuid() == GetObjectGuid())
+                player->SetOriginalGroup(ObjectGuid());
             else
-                player->SetGroup(NULL);
+                player->SetGroup(ObjectGuid());
         }
 
         // quest related GO state dependent from raid membership
-        if(isRaidGroup())
+        if (isRaidGroup())
             player->UpdateForQuestWorldObjects();
 
-        if(!player->GetSession())
+        if (!player->GetSession())
             continue;
 
-        WorldPacket data;
-        if(!hideDestroy)
+        if (isLFDGroup())
+            sLFGMgr.RemoveMemberFromLFDGroup(this, player->GetObjectGuid());
+
+        if (!hideDestroy)
         {
-            data.Initialize(SMSG_GROUP_DESTROYED, 0);
+            WorldPacket data(SMSG_GROUP_DESTROYED, 0);
             player->GetSession()->SendPacket(&data);
         }
 
-        //we already removed player from group and in player->GetGroup() is his original group, send update
-        if( Group* group = player->GetGroup() )
-        {
+        // we already removed player from group and in player->GetGroup() is his original group, send update
+        if (Group* group = player->GetGroup())
             group->SendUpdate();
-        }
         else
         {
-            data.Initialize(SMSG_GROUP_LIST, 1+1+1+1+8+4+4+8);
+            WorldPacket data(SMSG_GROUP_LIST, 1 + 1 + 1 + 1 + 8 + 4 + 4 + 8);
             data << uint8(0x10) << uint8(0) << uint8(0) << uint8(0);
             data << uint64(0) << uint32(0) << uint32(0) << uint64(0);
             player->GetSession()->SendPacket(&data);
@@ -464,21 +725,33 @@ void Group::Disband(bool hideDestroy)
 
         _homebindIfInstance(player);
     }
-    RollId.clear();
+
+    m_rollIds->clear();
     m_memberSlots.clear();
 
     RemoveAllInvites();
 
-    if(!isBGGroup())
+    if (IsNeedSave())
     {
         CharacterDatabase.BeginTransaction();
-        CharacterDatabase.PExecute("DELETE FROM groups WHERE groupId='%u'", m_Id);
-        CharacterDatabase.PExecute("DELETE FROM group_member WHERE groupId='%u'", m_Id);
+
+        static SqlStatementID delGroup;
+        CharacterDatabase.CreateStatement(delGroup, "DELETE FROM groups WHERE groupId = ?")
+            .PExecute(m_Guid.GetCounter());
+
+        static SqlStatementID delMemb;
+        CharacterDatabase.CreateStatement(delMemb, "DELETE FROM group_member WHERE groupId = ?")
+            .PExecute(m_Guid.GetCounter());
+
         CharacterDatabase.CommitTransaction();
+
         ResetInstances(INSTANCE_RESET_GROUP_DISBAND, false, NULL);
         ResetInstances(INSTANCE_RESET_GROUP_DISBAND, true, NULL);
     }
 
+    if (GetObjectGuid())
+        sObjectMgr.RemoveGroup(this);
+
     m_leaderGuid.Clear();
     m_leaderName = "";
 }
@@ -504,18 +777,18 @@ void Group::SendLootStartRoll(uint32 CountDown, uint32 mapid, const Roll &r)
 
     for (Roll::PlayerVote::const_iterator itr = r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
     {
-        Player *p = sObjectMgr.GetPlayer(itr->first);
-        if(!p || !p->GetSession())
+        Player* p = sObjectMgr.GetPlayer(itr->first);
+        if (!p || !p->GetSession())
             continue;
 
-        if(itr->second == ROLL_NOT_VALID)
+        if (itr->second == ROLL_NOT_VALID)
             continue;
 
         // dependent from player
         RollVoteMask mask = r.GetVoteMaskFor(p);
         data.put<uint8>(voteMaskPos,uint8(mask));
 
-        p->GetSession()->SendPacket( &data );
+        p->GetSession()->SendPacket(&data);
     }
 }
 
@@ -532,14 +805,14 @@ void Group::SendLootRoll(ObjectGuid const& targetGuid, uint8 rollNumber, uint8 r
     data << uint8(rollType);                                // 0: "Need for: [item name]" 0: "You have selected need for [item name] 1: need roll 2: greed roll
     data << uint8(0);                                       // auto pass on loot
 
-    for( Roll::PlayerVote::const_iterator itr = r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
+    for (Roll::PlayerVote::const_iterator itr = r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
     {
-        Player *p = sObjectMgr.GetPlayer(itr->first);
-        if(!p || !p->GetSession())
+        Player* p = sObjectMgr.GetPlayer(itr->first);
+        if (!p || !p->GetSession())
             continue;
 
-        if(itr->second != ROLL_NOT_VALID)
-            p->GetSession()->SendPacket( &data );
+        if (itr->second != ROLL_NOT_VALID)
+            p->GetSession()->SendPacket(&data);
     }
 }
 
@@ -555,14 +828,14 @@ void Group::SendLootRollWon(ObjectGuid const& targetGuid, uint8 rollNumber, Roll
     data << uint8(rollNumber);                              // rollnumber related to SMSG_LOOT_ROLL
     data << uint8(rollType);                                // Rolltype related to SMSG_LOOT_ROLL
 
-    for( Roll::PlayerVote::const_iterator itr = r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
+    for (Roll::PlayerVote::const_iterator itr = r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
     {
-        Player *p = sObjectMgr.GetPlayer(itr->first);
-        if(!p || !p->GetSession())
+        Player* p = sObjectMgr.GetPlayer(itr->first);
+        if (!p || !p->GetSession())
             continue;
 
-        if(itr->second != ROLL_NOT_VALID)
-            p->GetSession()->SendPacket( &data );
+        if (itr->second != ROLL_NOT_VALID)
+            p->GetSession()->SendPacket(&data);
     }
 }
 
@@ -575,14 +848,14 @@ void Group::SendLootAllPassed(Roll const& r)
     data << uint32(r.itemRandomPropId);                     // Item random property ID
     data << uint32(r.itemRandomSuffix);                     // Item random suffix ID
 
-    for( Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr)
+    for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr)
     {
-        Player *p = sObjectMgr.GetPlayer(itr->first);
-        if(!p || !p->GetSession())
+        Player* p = sObjectMgr.GetPlayer(itr->first);
+        if (!p || !p->GetSession())
             continue;
 
-        if(itr->second != ROLL_NOT_VALID)
-            p->GetSession()->SendPacket( &data );
+        if (itr->second != ROLL_NOT_VALID)
+            p->GetSession()->SendPacket(&data);
     }
 }
 
@@ -590,10 +863,10 @@ void Group::GroupLoot(WorldObject* pSource, Loot* loot)
 {
     uint32 maxEnchantingSkill = GetMaxSkillValueForGroup(SKILL_ENCHANTING);
 
-    for(uint8 itemSlot = 0; itemSlot < loot->items.size(); ++itemSlot)
+    for (uint8 itemSlot = 0; itemSlot < loot->items.size(); ++itemSlot)
     {
         LootItem& lootItem = loot->items[itemSlot];
-        ItemPrototype const *itemProto = ObjectMgr::GetItemPrototype(lootItem.itemid);
+        ItemPrototype const* itemProto = ObjectMgr::GetItemPrototype(lootItem.itemid);
         if (!itemProto)
         {
             DEBUG_LOG("Group::GroupLoot: missing item prototype for item with id: %d", lootItem.itemid);
@@ -612,17 +885,17 @@ void Group::NeedBeforeGreed(WorldObject* pSource, Loot* loot)
 {
     uint32 maxEnchantingSkill = GetMaxSkillValueForGroup(SKILL_ENCHANTING);
 
-    for(uint8 itemSlot = 0; itemSlot < loot->items.size(); ++itemSlot)
+    for (uint8 itemSlot = 0; itemSlot < loot->items.size(); ++itemSlot)
     {
         LootItem& lootItem = loot->items[itemSlot];
-        ItemPrototype const *itemProto = ObjectMgr::GetItemPrototype(lootItem.itemid);
+        ItemPrototype const* itemProto = ObjectMgr::GetItemPrototype(lootItem.itemid);
         if (!itemProto)
         {
             DEBUG_LOG("Group::NeedBeforeGreed: missing item prototype for item with id: %d", lootItem.itemid);
             continue;
         }
 
-        //only roll for one-player items, not for ones everyone can get
+        // only roll for one-player items, not for ones everyone can get
         if (itemProto->Quality >= uint32(m_lootThreshold) && !lootItem.freeforall)
             StartLootRoll(pSource, NEED_BEFORE_GREED, loot, itemSlot, maxEnchantingSkill);
         else
@@ -637,6 +910,7 @@ void Group::MasterLoot(WorldObject* pSource, Loot* loot)
         ItemPrototype const *item = ObjectMgr::GetItemPrototype(i->itemid);
         if (!item)
             continue;
+
         if (item->Quality < uint32(m_lootThreshold))
             i->is_underthreshold = 1;
     }
@@ -646,9 +920,9 @@ void Group::MasterLoot(WorldObject* pSource, Loot* loot)
     WorldPacket data(SMSG_LOOT_MASTER_LIST, 330);
     data << uint8(GetMembersCount());
 
-    for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player *looter = itr->getSource();
+        Player* looter = itr->getSource();
         if (!looter->IsInWorld())
             continue;
 
@@ -661,9 +935,9 @@ void Group::MasterLoot(WorldObject* pSource, Loot* loot)
 
     data.put<uint8>(0, real_count);
 
-    for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player *looter = itr->getSource();
+        Player* looter = itr->getSource();
         if (looter->IsWithinDist(pSource, sWorld.getConfig(CONFIG_FLOAT_GROUP_XP_DISTANCE), false))
             looter->GetSession()->SendPacket(&data);
     }
@@ -671,12 +945,14 @@ void Group::MasterLoot(WorldObject* pSource, Loot* loot)
 
 bool Group::CountRollVote(Player* player, ObjectGuid const& lootedTarget, uint32 itemSlot, RollVote vote)
 {
-    Rolls::iterator rollI = RollId.begin();
-    for (; rollI != RollId.end(); ++rollI)
+    TRolls::iterator rollI = m_rollIds->begin();
+    for (; rollI != m_rollIds->end(); ++rollI)
+    {
         if ((*rollI)->isValid() && (*rollI)->lootedTargetGUID == lootedTarget && (*rollI)->itemSlot == itemSlot)
             break;
+    }
 
-    if (rollI == RollId.end())
+    if (rollI == m_rollIds->end())
         return false;
 
     // possible cheating
@@ -688,7 +964,7 @@ bool Group::CountRollVote(Player* player, ObjectGuid const& lootedTarget, uint32
     return true;
 }
 
-bool Group::CountRollVote(ObjectGuid const& playerGUID, Rolls::iterator& rollI, RollVote vote)
+bool Group::CountRollVote(ObjectGuid const& playerGUID, TRolls::iterator& rollI, RollVote vote)
 {
     Roll* roll = *rollI;
 
@@ -698,8 +974,10 @@ bool Group::CountRollVote(ObjectGuid const& playerGUID, Rolls::iterator& rollI,
         return true;                                        // result used for need iterator ++, so avoid for end of list
 
     if (roll->getLoot())
+    {
         if (roll->getLoot()->items.empty())
             return false;
+    }
 
     switch (vote)
     {
@@ -753,14 +1031,14 @@ void Group::StartLootRoll(WorldObject* lootTarget, LootMethod method, Loot* loot
 
     Roll* r = new Roll(lootTarget->GetObjectGuid(), method, lootItem);
 
-    //a vector is filled with only near party members
+    // a vector is filled with only near party members
     for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
         Player* playerToRoll = itr->getSource();
         if (!playerToRoll || !playerToRoll->GetSession())
             continue;
 
-        if (lootItem.AllowedForPlayer(playerToRoll))
+        if (lootItem.AllowedForPlayer(playerToRoll, lootTarget))
         {
             if (playerToRoll->IsWithinDistInMap(lootTarget, sWorld.getConfig(CONFIG_FLOAT_GROUP_XP_DISTANCE), false))
             {
@@ -790,7 +1068,7 @@ void Group::StartLootRoll(WorldObject* lootTarget, LootMethod method, Loot* loot
             lootTarget->StartGroupLoot(this, LOOT_ROLL_TIMEOUT);
         }
 
-        RollId.push_back(r);
+        m_rollIds->push_back(r);
     }
     else                                            // no looters??
         delete r;
@@ -799,34 +1077,34 @@ void Group::StartLootRoll(WorldObject* lootTarget, LootMethod method, Loot* loot
 // called when roll timer expires
 void Group::EndRoll()
 {
-    while(!RollId.empty())
+    while (!m_rollIds->empty())
     {
-        //need more testing here, if rolls disappear
-        Rolls::iterator itr = RollId.begin();
+        // need more testing here, if rolls disappear
+        TRolls::iterator itr = m_rollIds->begin();
         CountTheRoll(itr);                                  //i don't have to edit player votes, who didn't vote ... he will pass
     }
 }
 
-void Group::CountTheRoll(Rolls::iterator& rollI)
+void Group::CountTheRoll(TRolls::iterator& rollI)
 {
     Roll* roll = *rollI;
-    if(!roll->isValid())                                    // is loot already deleted ?
+    if (!roll->isValid())                                    // is loot already deleted ?
     {
-        rollI = RollId.erase(rollI);
+        rollI = m_rollIds->erase(rollI);
         delete roll;
         return;
     }
 
-    //end of the roll
+    // end of the roll
     if (roll->totalNeed > 0)
     {
-        if(!roll->playerVote.empty())
+        if (!roll->playerVote.empty())
         {
             uint8 maxresul = 0;
             ObjectGuid maxguid  = (*roll->playerVote.begin()).first;
-            Player *player;
+            Player* player;
 
-            for(Roll::PlayerVote::const_iterator itr = roll->playerVote.begin(); itr != roll->playerVote.end(); ++itr)
+            for (Roll::PlayerVote::const_iterator itr = roll->playerVote.begin(); itr != roll->playerVote.end(); ++itr)
             {
                 if (itr->second != ROLL_NEED)
                     continue;
@@ -842,19 +1120,20 @@ void Group::CountTheRoll(Rolls::iterator& rollI)
             SendLootRollWon(maxguid, maxresul, ROLL_NEED, *roll);
             player = sObjectMgr.GetPlayer(maxguid);
 
-            if(player && player->GetSession())
+            if (player && player->GetSession())
             {
                 player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED_ON_LOOT, roll->itemid, maxresul);
 
                 ItemPosCountVec dest;
-                LootItem *item = &(roll->getLoot()->items[roll->itemSlot]);
-                InventoryResult msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, roll->itemid, item->count );
-                if ( msg == EQUIP_ERR_OK )
+                LootItem* item = &(roll->getLoot()->items[roll->itemSlot]);
+                InventoryResult msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, roll->itemid, item->count);
+                if (msg == EQUIP_ERR_OK)
                 {
                     item->is_looted = true;
                     roll->getLoot()->NotifyItemRemoved(roll->itemSlot);
                     --roll->getLoot()->unlootedCount;
-                    player->StoreNewItem( dest, roll->itemid, true, item->randomPropertyId);
+
+                    player->StoreNewItem(dest, roll->itemid, true, item->randomPropertyId, item->GetAllowedLooters());
                     player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM, roll->itemid, item->count);
                     player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE, roll->getLoot()->loot_type, item->count);
                     player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_EPIC_ITEM, roll->itemid, item->count);
@@ -862,18 +1141,18 @@ void Group::CountTheRoll(Rolls::iterator& rollI)
                 else
                 {
                     item->is_blocked = false;
-                    player->SendEquipError( msg, NULL, NULL, roll->itemid );
+                    player->SendEquipError(msg, NULL, NULL, roll->itemid);
                 }
             }
         }
     }
     else if (roll->totalGreed > 0)
     {
-        if(!roll->playerVote.empty())
+        if (!roll->playerVote.empty())
         {
             uint8 maxresul = 0;
             ObjectGuid maxguid = (*roll->playerVote.begin()).first;
-            Player *player;
+            Player* player;
             RollVote rollvote = ROLL_PASS;                  //Fixed: Using uninitialized memory 'rollvote'
 
             Roll::PlayerVote::iterator itr;
@@ -894,22 +1173,23 @@ void Group::CountTheRoll(Rolls::iterator& rollI)
             SendLootRollWon(maxguid, maxresul, rollvote, *roll);
             player = sObjectMgr.GetPlayer(maxguid);
 
-            if(player && player->GetSession())
+            if (player && player->GetSession())
             {
                 player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT, roll->itemid, maxresul);
 
-                LootItem *item = &(roll->getLoot()->items[roll->itemSlot]);
+                LootItem* item = &(roll->getLoot()->items[roll->itemSlot]);
 
-                if(rollvote == ROLL_GREED)
+                if (rollvote == ROLL_GREED)
                 {
                     ItemPosCountVec dest;
-                    InventoryResult msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, roll->itemid, item->count );
-                    if ( msg == EQUIP_ERR_OK )
+                    InventoryResult msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, roll->itemid, item->count);
+                    if (msg == EQUIP_ERR_OK)
                     {
                         item->is_looted = true;
                         roll->getLoot()->NotifyItemRemoved(roll->itemSlot);
                         --roll->getLoot()->unlootedCount;
-                        player->StoreNewItem( dest, roll->itemid, true, item->randomPropertyId);
+
+                        player->StoreNewItem(dest, roll->itemid, true, item->randomPropertyId, item->GetAllowedLooters());
                         player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM, roll->itemid, item->count);
                         player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE, roll->getLoot()->loot_type, item->count);
                         player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_EPIC_ITEM, roll->itemid, item->count);
@@ -917,17 +1197,17 @@ void Group::CountTheRoll(Rolls::iterator& rollI)
                     else
                     {
                         item->is_blocked = false;
-                        player->SendEquipError( msg, NULL, NULL, roll->itemid );
+                        player->SendEquipError(msg, NULL, NULL, roll->itemid);
                     }
                 }
-                else if(rollvote == ROLL_DISENCHANT)
+                else if (rollvote == ROLL_DISENCHANT)
                 {
                     item->is_looted = true;
                     roll->getLoot()->NotifyItemRemoved(roll->itemSlot);
                     --roll->getLoot()->unlootedCount;
 
-                    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(roll->itemid);
-                    player->AutoStoreLoot(pProto->DisenchantID, LootTemplates_Disenchant, true);
+                    ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(roll->itemid);
+                    player->AutoStoreLoot(roll->getLoot()->GetLootTarget(), pProto->DisenchantID, LootTemplates_Disenchant, true);
                 }
             }
         }
@@ -936,9 +1216,9 @@ void Group::CountTheRoll(Rolls::iterator& rollI)
     {
         SendLootAllPassed(*roll);
         LootItem *item = &(roll->getLoot()->items[roll->itemSlot]);
-        if(item) item->is_blocked = false;
+        if (item) item->is_blocked = false;
     }
-    rollI = RollId.erase(rollI);
+    rollI = m_rollIds->erase(rollI);
     delete roll;
 }
 
@@ -949,13 +1229,17 @@ void Group::SetTargetIcon(uint8 id, ObjectGuid whoGuid, ObjectGuid targetGuid)
 
     // clean other icons
     if (targetGuid)
-        for(int i = 0; i < TARGET_ICON_COUNT; ++i)
+    {
+        for (int i = 0; i < TARGET_ICON_COUNT; ++i)
+        {
             if (m_targetIcons[i] == targetGuid)
                 SetTargetIcon(i, ObjectGuid(), ObjectGuid());
+        }
+    }
 
     m_targetIcons[id] = targetGuid;
 
-    WorldPacket data(MSG_RAID_TARGET_UPDATE, (1+8+1+8));
+    WorldPacket data(MSG_RAID_TARGET_UPDATE, 1 + 8 + 1 + 8);
     data << uint8(0);                                       // set targets
     data << whoGuid;
     data << uint8(id);
@@ -966,18 +1250,18 @@ void Group::SetTargetIcon(uint8 id, ObjectGuid whoGuid, ObjectGuid targetGuid)
 static void GetDataForXPAtKill_helper(Player* player, Unit const* victim, uint32& sum_level, Player* & member_with_max_level, Player* & not_gray_member_with_max_level)
 {
     sum_level += player->getLevel();
-    if(!member_with_max_level || member_with_max_level->getLevel() < player->getLevel())
+    if (!member_with_max_level || member_with_max_level->getLevel() < player->getLevel())
         member_with_max_level = player;
 
     uint32 gray_level = MaNGOS::XP::GetGrayLevel(player->getLevel());
-    if( victim->getLevel() > gray_level && (!not_gray_member_with_max_level
+    if (victim->getLevel() > gray_level && (!not_gray_member_with_max_level
         || not_gray_member_with_max_level->getLevel() < player->getLevel()))
         not_gray_member_with_max_level = player;
 }
 
 void Group::GetDataForXPAtKill(Unit const* victim, uint32& count,uint32& sum_level, Player* & member_with_max_level, Player* & not_gray_member_with_max_level, Player* additional)
 {
-    for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
         Player* member = itr->getSource();
         if (!member || !member->isAlive())                  // only for alive
@@ -1006,13 +1290,13 @@ void Group::GetDataForXPAtKill(Unit const* victim, uint32& count,uint32& sum_lev
 
 void Group::SendTargetIconList(WorldSession *session)
 {
-    if(!session)
+    if (!session)
         return;
 
-    WorldPacket data(MSG_RAID_TARGET_UPDATE, (1+TARGET_ICON_COUNT*9));
+    WorldPacket data(MSG_RAID_TARGET_UPDATE, 1 + TARGET_ICON_COUNT * (1 + 8));
     data << uint8(1);                                       // list targets
 
-    for(int i = 0; i < TARGET_ICON_COUNT; ++i)
+    for (int i = 0; i < TARGET_ICON_COUNT; ++i)
     {
         if (!m_targetIcons[i])
             continue;
@@ -1026,58 +1310,87 @@ void Group::SendTargetIconList(WorldSession *session)
 
 void Group::SendUpdate()
 {
-    for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
+    for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
     {
         Player* player = sObjectMgr.GetPlayer(citr->guid);
-        if(!player || !player->GetSession() || player->GetGroup() != this )
+        if (!player || !player->GetSession() || player->GetGroupGuid() != GetObjectGuid())
             continue;
                                                             // guess size
         WorldPacket data(SMSG_GROUP_LIST, (1+1+1+1+8+4+GetMembersCount()*20));
         data << uint8(m_groupType);                         // group type (flags in 3.3)
         data << uint8(citr->group);                         // groupid
-        data << uint8(GetFlags(*citr));                     // group flags
-        data << uint8(isBGGroup() ? 1 : 0);                 // 2.0.x, isBattleGroundGroup?
-        if(m_groupType & GROUPTYPE_LFD)
+        data << uint8(citr->flags);                         // group flags
+        data << (isLFGGroup() ? uint8(citr->roles) : uint8(0)); // roles mask
+        if (isLFGGroup())
         {
-            data << uint8(0);
-            data << uint32(0);
+            uint32 dungeonID = sLFGMgr.GetLFGGroupState(GetObjectGuid())->GetDungeonId();
+            data << uint8(sLFGMgr.GetLFGGroupState(GetObjectGuid())->GetState() == LFG_STATE_FINISHED_DUNGEON ? 2 : 0);
+            data << uint32(dungeonID);
         }
         data << GetObjectGuid();                            // group guid
         data << uint32(0);                                  // 3.3, this value increments every time SMSG_GROUP_LIST is sent
-        data << uint32(GetMembersCount()-1);
-        for(member_citerator citr2 = m_memberSlots.begin(); citr2 != m_memberSlots.end(); ++citr2)
+        data << uint32(GetMembersCount() - 1);
+        for (member_citerator citr2 = m_memberSlots.begin(); citr2 != m_memberSlots.end(); ++citr2)
         {
-            if(citr->guid == citr2->guid)
+            if (citr->guid == citr2->guid)
                 continue;
+
             Player* member = sObjectMgr.GetPlayer(citr2->guid);
-            uint8 onlineState = (member) ? MEMBER_STATUS_ONLINE : MEMBER_STATUS_OFFLINE;
-            onlineState = onlineState | ((isBGGroup()) ? MEMBER_STATUS_PVP : 0);
+            uint8 onlineState = (member && !member->GetSession()->PlayerLogout()) ? MEMBER_STATUS_ONLINE : MEMBER_STATUS_OFFLINE;
+            onlineState |= isBGGroup() ? MEMBER_STATUS_PVP : 0;
 
             data << citr2->name;
             data << citr2->guid;
             data << uint8(onlineState);                     // online-state
             data << uint8(citr2->group);                    // groupid
-            data << uint8(GetFlags(*citr2));                // group flags
-            data << uint8(0);                               // 3.3, role?
+            data << uint8(citr2->flags);                    // group flags
+            data << (isLFGGroup() ? uint8(citr2->roles) : uint8(0));  // 3.3, role?
         }
 
         data << m_leaderGuid;                               // leader guid
-        if(GetMembersCount()-1)
+        if (GetMembersCount() - 1)
         {
             data << uint8(m_lootMethod);                    // loot method
             data << m_looterGuid;                           // looter guid
             data << uint8(m_lootThreshold);                 // loot threshold
-            data << uint8(m_dungeonDifficulty);             // Dungeon Difficulty
-            data << uint8(m_raidDifficulty);                // Raid Difficulty
+            data << uint8(GetDungeonDifficulty());          // Dungeon Difficulty
+            data << uint8(GetRaidDifficulty());             // Raid Difficulty
             data << uint8(0);                               // 3.3, dynamic difficulty?
         }
-        player->GetSession()->SendPacket( &data );
+        player->GetSession()->SendPacket(&data);
+
+        // when player is loading we need a stats update
+        if (player->GetSession()->PlayerLoading())
+        {
+            player->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_MAX_HP | GROUP_UPDATE_FLAG_MAX_POWER | GROUP_UPDATE_FLAG_LEVEL);
+            UpdatePlayerOutOfRange(player);
+        }
+    }
+}
+
+void Group::Update(uint32 diff)
+{
+    if (!m_waitLeaderTimer)
+        return;
+
+    if (m_waitLeaderTimer > diff)
+    {
+        m_waitLeaderTimer -= diff;
+        return;
+    }
+
+    m_waitLeaderTimer = 0;
+
+    if (!ChangeLeaderToFirstSuitableMember())
+    {
+        if (RemoveMember(m_leaderGuid, 0) <= 1)
+            delete this;
     }
 }
 
 void Group::UpdatePlayerOutOfRange(Player* pPlayer)
 {
-    if(!pPlayer || !pPlayer->IsInWorld())
+    if (!pPlayer || !pPlayer->IsInWorld())
         return;
 
     if (pPlayer->GetGroupUpdateFlag() == GROUP_UPDATE_FLAG_NONE)
@@ -1086,18 +1399,22 @@ void Group::UpdatePlayerOutOfRange(Player* pPlayer)
     WorldPacket data;
     pPlayer->GetSession()->BuildPartyMemberStatsChangedPacket(pPlayer, &data);
 
-    for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
-        if (Player *player = itr->getSource())
-            if (player != pPlayer && !player->HaveAtClient(pPlayer))
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        if (Player* player = itr->getSource())
+        {
+            if (player != pPlayer && !player->HaveAtClient(pPlayer->GetObjectGuid()))
                 player->GetSession()->SendPacket(&data);
+        }
+    }
 }
 
-void Group::BroadcastPacket(WorldPacket *packet, bool ignorePlayersInBGRaid, int group, ObjectGuid ignore)
+void Group::BroadcastPacket(WorldPacket* packet, bool ignorePlayersInBGRaid, int group, ObjectGuid ignore)
 {
-    for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player *pl = itr->getSource();
-        if (!pl || (ignore && pl->GetObjectGuid() == ignore) || (ignorePlayersInBGRaid && pl->GetGroup() != this) )
+        Player* pl = itr->getSource();
+        if (!pl || (ignore && pl->GetObjectGuid() == ignore) || (ignorePlayersInBGRaid && pl->GetGroup() != this) || !pl->IsInWorld())
             continue;
 
         if (pl->GetSession() && (group == -1 || itr->getSubGroup() == group))
@@ -1105,25 +1422,27 @@ void Group::BroadcastPacket(WorldPacket *packet, bool ignorePlayersInBGRaid, int
     }
 }
 
-void Group::BroadcastReadyCheck(WorldPacket *packet)
+void Group::BroadcastReadyCheck(WorldPacket* packet)
 {
-    for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player *pl = itr->getSource();
-        if (pl && pl->GetSession())
+        Player* pl = itr->getSource();
+        if (pl && pl->GetSession() && pl->IsInWorld())
+        {
             if (IsLeader(pl->GetObjectGuid()) || IsAssistant(pl->GetObjectGuid()))
                 pl->GetSession()->SendPacket(packet);
+        }
     }
 }
 
 void Group::OfflineReadyCheck()
 {
-    for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
+    for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
     {
-        Player *pl = sObjectMgr.GetPlayer(citr->guid);
+        Player* pl = sObjectMgr.GetPlayer(citr->guid);
         if (!pl || !pl->GetSession())
         {
-            WorldPacket data(MSG_RAID_READY_CHECK_CONFIRM, 9);
+            WorldPacket data(MSG_RAID_READY_CHECK_CONFIRM, 8 + 1);
             data << citr->guid;
             data << uint8(0);
             BroadcastReadyCheck(&data);
@@ -1131,10 +1450,16 @@ void Group::OfflineReadyCheck()
     }
 }
 
-bool Group::_addMember(ObjectGuid guid, const char* name, bool isAssistant)
+bool Group::_addMember(ObjectGuid guid, const char* name)
 {
     // get first not-full group
     uint8 groupid = 0;
+    GroupFlagMask flags = GROUP_MEMBER;
+    LFGRoleMask roles = LFG_ROLE_MASK_NONE;
+
+    if (isLFGGroup() && sObjectMgr.GetPlayer(guid))
+        roles = sLFGMgr.GetLFGPlayerState(guid)->GetRoles();
+
     if (m_subGroupsCounts)
     {
         bool groupFound = false;
@@ -1151,15 +1476,15 @@ bool Group::_addMember(ObjectGuid guid, const char* name, bool isAssistant)
             return false;
     }
 
-    return _addMember(guid, name, isAssistant, groupid);
+    return _addMember(guid, name, groupid, flags, roles);
 }
 
-bool Group::_addMember(ObjectGuid guid, const char* name, bool isAssistant, uint8 group)
+bool Group::_addMember(ObjectGuid guid, const char* name, uint8 group, GroupFlagMask flags, LFGRoleMask roles)
 {
     if (IsFull())
         return false;
 
-    if (!guid)
+    if (!guid || !guid.IsPlayer())
         return false;
 
     Player* player = sObjectMgr.GetPlayer(guid, false);
@@ -1168,13 +1493,14 @@ bool Group::_addMember(ObjectGuid guid, const char* name, bool isAssistant, uint
     if (player && player->IsInWorld())
         lastMap = player->GetMapId();
     else if (player && player->IsBeingTeleported())
-        lastMap = player->GetTeleportDest().mapid;
+        lastMap = player->GetTeleportDest().GetMapId();
 
     MemberSlot member;
     member.guid      = guid;
     member.name      = name;
     member.group     = group;
-    member.assistant = isAssistant;
+    member.flags     = flags;
+    member.roles     = roles;
     member.lastMap   = lastMap;
     m_memberSlots.push_back(member);
 
@@ -1182,37 +1508,46 @@ bool Group::_addMember(ObjectGuid guid, const char* name, bool isAssistant, uint
 
     if (player)
     {
-        player->SetGroupInvite(NULL);
+        player->SetGroupInvite(ObjectGuid());
         //if player is in group and he is being added to BG raid group, then call SetBattleGroundRaid()
         if (player->GetGroup() && isBGGroup())
-            player->SetBattleGroundRaid(this, group);
+            player->SetBattleGroundRaid(GetObjectGuid(), group);
         //if player is in bg raid and we are adding him to normal group, then call SetOriginalGroup()
         else if (player->GetGroup())
-            player->SetOriginalGroup(this, group);
+            player->SetOriginalGroup(GetObjectGuid(), group);
         //if player is not in group, then call set group
         else
-            player->SetGroup(this, group);
+            player->SetGroup(GetObjectGuid(), group);
 
         if (player->IsInWorld())
         {
             // if the same group invites the player back, cancel the homebind timer
             if (InstanceGroupBind* bind = GetBoundInstance(player->GetMapId(), player))
+            {
                 if (bind->state->GetInstanceId() == player->GetInstanceId())
                     player->m_InstanceValid = true;
+            }
         }
     }
 
-    if (!isRaidGroup())                                     // reset targetIcons for non-raid-groups
+    if (!isRaidGroup())                                      // reset targetIcons for non-raid-groups
     {
-        for(int i = 0; i < TARGET_ICON_COUNT; ++i)
+        for (int i = 0; i < TARGET_ICON_COUNT; ++i)
             m_targetIcons[i].Clear();
     }
 
-    if (!isBGGroup())
+    if (IsNeedSave())
     {
         // insert into group table
-        CharacterDatabase.PExecute("INSERT INTO group_member(groupId,memberGuid,assistant,subgroup) VALUES('%u','%u','%u','%u')",
-            m_Id, member.guid.GetCounter(), ((member.assistant==1)?1:0), member.group);
+        static SqlStatementID insMemb;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(insMemb, "INSERT INTO group_member (groupId, memberGuid, memberFlags, subgroup, roles) VALUES (?, ?, ?, ?, ?)");
+
+        stmt.addUInt32(m_Guid.GetCounter());
+        stmt.addUInt32(member.guid.GetCounter());
+        stmt.addUInt8(uint8(member.flags));
+        stmt.addUInt8(uint8(member.group));
+        stmt.addUInt8(uint8(member.roles));
+        stmt.Execute();
     }
 
     return true;
@@ -1220,19 +1555,19 @@ bool Group::_addMember(ObjectGuid guid, const char* name, bool isAssistant, uint
 
 bool Group::_removeMember(ObjectGuid guid)
 {
-    Player *player = sObjectMgr.GetPlayer(guid);
+    Player* player = sObjectMgr.GetPlayer(guid);
     if (player)
     {
-        //if we are removing player from battleground raid
+        // if we are removing player from battleground raid
         if (isBGGroup())
             player->RemoveFromBattleGroundRaid();
         else
         {
-            //we can remove player who is in battleground from his original group
-            if (player->GetOriginalGroup() == this)
-                player->SetOriginalGroup(NULL);
+            // we can remove player who is in battleground from his original group
+            if (player->GetOriginalGroupGuid() == GetObjectGuid())
+                player->SetOriginalGroup(ObjectGuid());
             else
-                player->SetGroup(NULL);
+                player->SetGroup(ObjectGuid());
         }
     }
 
@@ -1246,13 +1581,17 @@ bool Group::_removeMember(ObjectGuid guid)
         m_memberSlots.erase(slot);
     }
 
-    if (!isBGGroup())
-        CharacterDatabase.PExecute("DELETE FROM group_member WHERE memberGuid='%u'", guid.GetCounter());
+    if (IsNeedSave())
+    {
+        static SqlStatementID delMemb;
+        CharacterDatabase.CreateStatement(delMemb, "DELETE FROM group_member WHERE memberGuid = ?")
+            .PExecute(guid.GetCounter());
+    }
 
     if (m_leaderGuid == guid)                               // leader was removed
     {
         if (GetMembersCount() > 0)
-            _setLeader(m_memberSlots.front().guid);
+            ChangeLeaderToFirstSuitableMember(true);
         return true;
     }
 
@@ -1265,55 +1604,63 @@ void Group::_setLeader(ObjectGuid guid)
     if (slot == m_memberSlots.end())
         return;
 
-    if (!isBGGroup())
-    {
-        uint32 slot_lowguid = slot->guid.GetCounter();
-
-        uint32 leader_lowguid = m_leaderGuid.GetCounter();
+    Player* player = sObjectMgr.GetPlayer(slot->guid);
 
+    if (IsNeedSave())
         // TODO: set a time limit to have this function run rarely cause it can be slow
         CharacterDatabase.BeginTransaction();
 
+    if (!isBGGroup())
+    {
         // update the group's bound instances when changing leaders
-
         // remove all permanent binds from the group
         // in the DB also remove solo binds that will be replaced with permbinds
         // from the new leader
-        CharacterDatabase.PExecute(
-            "DELETE FROM group_instance WHERE leaderguid='%u' AND (permanent = 1 OR "
-            "instance IN (SELECT instance FROM character_instance WHERE guid = '%u')"
-            ")", leader_lowguid, slot_lowguid);
-
-        Player *player = sObjectMgr.GetPlayer(slot->guid);
+        if (IsNeedSave())
+        {
+            static SqlStatementID delGroupIns;
+            CharacterDatabase.CreateStatement(delGroupIns,
+                "DELETE FROM group_instance WHERE leaderguid = ? AND (permanent = 1 OR "
+                "instance IN (SELECT instance FROM character_instance WHERE guid = ?))")
+                .PExecute(m_leaderGuid.GetCounter(), slot->guid.GetCounter());
+        }
 
         if (player)
         {
-            for(uint8 i = 0; i < MAX_DIFFICULTY; ++i)
+            for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
             {
-                for(BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end();)
+                for (BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end();)
                 {
-                    if(itr->second.perm)
+                    if (itr->second.perm)
                     {
-                        itr->second.state->RemoveGroup(this);
-                        m_boundInstances[i].erase(itr++);
+                        itr->second.state->RemoveFromBindList(GetObjectGuid());
+                        itr = m_boundInstances[i].erase(itr);
                     }
                     else
                         ++itr;
                 }
             }
         }
+    }
 
+    if (IsNeedSave())
+    {
         // update the group's solo binds to the new leader
-        CharacterDatabase.PExecute("UPDATE group_instance SET leaderGuid='%u' WHERE leaderGuid = '%u'",
-            slot_lowguid, leader_lowguid);
+        static SqlStatementID updGroupIns;
+        CharacterDatabase.CreateStatement(updGroupIns, "UPDATE group_instance SET leaderGuid = ? WHERE leaderGuid = ?")
+            .PExecute(slot->guid.GetCounter(), m_leaderGuid.GetCounter());
 
         // copy the permanent binds from the new leader to the group
         // overwriting the solo binds with permanent ones if necessary
         // in the DB those have been deleted already
-        Player::ConvertInstancesToGroup(player, this, slot->guid);
+        if (player && !isBGGroup())
+            Player::ConvertInstancesToGroup(player, this, slot->guid);
 
         // update the group leader
-        CharacterDatabase.PExecute("UPDATE groups SET leaderGuid='%u' WHERE groupId='%u'", slot_lowguid, m_Id);
+        static SqlStatementID updGroup;
+        CharacterDatabase.CreateStatement(updGroup, "UPDATE groups SET leaderGuid = ? WHERE groupId = ?")
+            .PExecute(slot->guid.GetCounter(), m_Guid.GetCounter());
+
         CharacterDatabase.CommitTransaction();
     }
 
@@ -1323,11 +1670,11 @@ void Group::_setLeader(ObjectGuid guid)
 
 void Group::_removeRolls(ObjectGuid guid)
 {
-    for (Rolls::iterator it = RollId.begin(); it != RollId.end(); )
+    for (TRolls::iterator it = m_rollIds->begin(); it != m_rollIds->end();)
     {
         Roll* roll = *it;
         Roll::PlayerVote::iterator itr2 = roll->playerVote.find(guid);
-        if(itr2 == roll->playerVote.end())
+        if (itr2 == roll->playerVote.end())
         {
             ++it;
             continue;
@@ -1359,75 +1706,88 @@ bool Group::_setMembersGroup(ObjectGuid guid, uint8 group)
 
     SubGroupCounterIncrease(group);
 
-    if (!isBGGroup())
-        CharacterDatabase.PExecute("UPDATE group_member SET subgroup='%u' WHERE memberGuid='%u'", group, guid.GetCounter());
-
-    return true;
-}
-
-bool Group::_setAssistantFlag(ObjectGuid guid, const bool &state)
-{
-    member_witerator slot = _getMemberWSlot(guid);
-    if (slot == m_memberSlots.end())
-        return false;
-
-    slot->assistant = state;
-    if (!isBGGroup())
-        CharacterDatabase.PExecute("UPDATE group_member SET assistant='%u' WHERE memberGuid='%u'", (state==true)?1:0, guid.GetCounter());
-    return true;
-}
-
-bool Group::_setMainTank(ObjectGuid guid)
-{
-    if (m_mainTankGuid == guid)
-        return false;
-
-    if (guid)
+    if (IsNeedSave())
     {
-        member_citerator slot = _getMemberCSlot(guid);
-        if (slot == m_memberSlots.end())
-            return false;
-
-        if (m_mainAssistantGuid == guid)
-            _setMainAssistant(ObjectGuid());
+        static SqlStatementID updMemb;
+        CharacterDatabase.CreateStatement(updMemb, "UPDATE group_member SET subgroup = ? WHERE memberGuid = ?")
+            .PExecute(uint8(group), guid.GetCounter());
     }
 
-    m_mainTankGuid = guid;
-
-    if (!isBGGroup())
-        CharacterDatabase.PExecute("UPDATE groups SET mainTank='%u' WHERE groupId='%u'", m_mainTankGuid.GetCounter(), m_Id);
-
     return true;
 }
 
-bool Group::_setMainAssistant(ObjectGuid guid)
+void Group::SetGroupUniqueFlag(ObjectGuid guid, GroupFlagsAssignment assignment, uint8 apply)
 {
-    if (m_mainAssistantGuid == guid)
-        return false;
+    GroupFlagMask mask        = GROUP_MEMBER;
+    GroupFlagMask excludeMask = GROUP_MEMBER;
 
-    if (guid)
+    switch (assignment)
     {
-        member_witerator slot = _getMemberWSlot(guid);
-        if (slot == m_memberSlots.end())
-            return false;
-
-        if (m_mainTankGuid == guid)
-            _setMainTank(ObjectGuid());
+        case GROUP_ASSIGN_MAINTANK:
+            mask = GROUP_MAIN_TANK;
+            excludeMask = GROUP_MAIN_ASSISTANT;
+            break;
+        case GROUP_ASSIGN_MAINASSIST:
+            mask = GROUP_MAIN_ASSISTANT;
+            excludeMask = GROUP_MAIN_TANK;
+            break;
+        case GROUP_ASSIGN_ASSISTANT:
+            mask = GROUP_ASSISTANT;
+            break;
+        default:
+            sLog.outError("Group::SetGroupUniqueFlag unknown assignment %u on %s", assignment, guid.GetString().c_str());
+            return;
     }
 
-    m_mainAssistantGuid = guid;
+    if (guid)
+    {
+        static SqlStatementID updGroupMemb;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(updGroupMemb, "UPDATE group_member SET memberFlags = ? WHERE memberGuid = ?");
 
-    if (!isBGGroup())
-        CharacterDatabase.PExecute("UPDATE groups SET mainAssistant='%u' WHERE groupId='%u'",
-            m_mainAssistantGuid.GetCounter(), m_Id);
+        if (apply)
+        {
+            for (member_witerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
+            {
+                if (itr->guid != guid)
+                {
+                    if ((itr->flags & mask) && sWorld.getConfig(CONFIG_BOOL_RAID_FLAGS_UNIQUE))
+                    {
+                        GroupFlagMask oldMask = itr->flags;
+                        itr->flags = GroupFlagMask(oldMask & ~mask);
+                        if (itr->flags != oldMask && IsNeedSave())
+                            stmt.PExecute(uint8(itr->flags), itr->guid.GetCounter());
+                    }
+                }
+                else
+                {
+                    GroupFlagMask oldMask = itr->flags;
+                    itr->flags = GroupFlagMask((oldMask | mask) & ~excludeMask);
+                    if (itr->flags != oldMask && IsNeedSave())
+                        stmt.PExecute(uint8(itr->flags), itr->guid.GetCounter());
+                }
+            }
+        }
+        else
+        {
+            member_witerator slot = _getMemberWSlot(guid);
+            if (slot != m_memberSlots.end())
+            {
+                GroupFlagMask oldMask = slot->flags;
+                slot->flags = GroupFlagMask(oldMask & ~mask);
+                if (slot->flags != oldMask && IsNeedSave())
+                    stmt.PExecute(uint8(slot->flags), slot->guid.GetCounter());
+            }
+        }
 
-    return true;
+        SendUpdate();
+    }
 }
 
 bool Group::SameSubGroup(Player const* member1, Player const* member2) const
 {
-    if(!member1 || !member2)
+    if (!member1 || !member2)
         return false;
+
     if (member1->GetGroup() != this || member2->GetGroup() != this)
         return false;
     else
@@ -1440,8 +1800,7 @@ void Group::ChangeMembersGroup(ObjectGuid guid, uint8 group)
     if (!isRaidGroup())
         return;
 
-    Player *player = sObjectMgr.GetPlayer(guid);
-
+    Player* player = sObjectMgr.GetPlayer(guid);
     if (!player)
     {
         uint8 prevSubGroup = GetMemberGroup(guid);
@@ -1460,7 +1819,7 @@ void Group::ChangeMembersGroup(ObjectGuid guid, uint8 group)
 }
 
 // only for online members
-void Group::ChangeMembersGroup(Player *player, uint8 group)
+void Group::ChangeMembersGroup(Player* player, uint8 group)
 {
     if (!player || !isRaidGroup())
         return;
@@ -1471,9 +1830,9 @@ void Group::ChangeMembersGroup(Player *player, uint8 group)
 
     if (_setMembersGroup(player->GetObjectGuid(), group))
     {
-        if (player->GetGroup() == this)
+        if (player->GetGroupGuid() == GetObjectGuid())
             player->GetGroupRef().setSubGroup(group);
-        //if player is in BG raid, it is possible that he is also in normal raid - and that normal raid is stored in m_originalGroup reference
+        // if player is in BG raid, it is possible that he is also in normal raid - and that normal raid is stored in m_originalGroup reference
         else
         {
             prevSubGroup = player->GetOriginalSubGroup();
@@ -1485,13 +1844,13 @@ void Group::ChangeMembersGroup(Player *player, uint8 group)
     }
 }
 
-uint32 Group::GetMaxSkillValueForGroup( SkillType skill )
+uint32 Group::GetMaxSkillValueForGroup(SkillType skill)
 {
     uint32 maxvalue = 0;
 
-    for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player *member = itr->getSource();
+        Player* member = itr->getSource();
         if (!member)
             continue;
 
@@ -1532,7 +1891,7 @@ void Group::UpdateLooterGuid(WorldObject* pSource, bool ifneed)
     // search next after current
     if (guid_itr != m_memberSlots.end())
     {
-        for(member_citerator itr = guid_itr; itr != m_memberSlots.end(); ++itr)
+        for (member_citerator itr = guid_itr; itr != m_memberSlots.end(); ++itr)
         {
             if (Player* pl = ObjectAccessor::FindPlayer(itr->guid))
             {
@@ -1540,7 +1899,7 @@ void Group::UpdateLooterGuid(WorldObject* pSource, bool ifneed)
                 {
                     bool refresh = pl->GetLootGuid() == pSource->GetObjectGuid();
 
-                    //if(refresh)                           // update loot for new looter
+                    // if(refresh)                           // update loot for new looter
                     //    pl->GetSession()->DoLootRelease(pl->GetLootGUID());
                     SetLooterGuid(pl->GetObjectGuid());
                     SendUpdate();
@@ -1553,7 +1912,7 @@ void Group::UpdateLooterGuid(WorldObject* pSource, bool ifneed)
     }
 
     // search from start
-    for(member_citerator itr = m_memberSlots.begin(); itr != guid_itr; ++itr)
+    for (member_citerator itr = m_memberSlots.begin(); itr != guid_itr; ++itr)
     {
         if (Player* pl = ObjectAccessor::FindPlayer(itr->guid))
         {
@@ -1561,7 +1920,7 @@ void Group::UpdateLooterGuid(WorldObject* pSource, bool ifneed)
             {
                 bool refresh = pl->GetLootGuid() == pSource->GetObjectGuid();
 
-                //if(refresh)                               // update loot for new looter
+                // if(refresh)                               // update loot for new looter
                 //    pl->GetSession()->DoLootRelease(pl->GetLootGUID());
                 SetLooterGuid(pl->GetObjectGuid());
                 SendUpdate();
@@ -1579,73 +1938,95 @@ void Group::UpdateLooterGuid(WorldObject* pSource, bool ifneed)
 GroupJoinBattlegroundResult Group::CanJoinBattleGroundQueue(BattleGround const* bgOrTemplate, BattleGroundQueueTypeId bgQueueTypeId, uint32 MinPlayerCount, uint32 MaxPlayerCount, bool isRated, uint32 arenaSlot)
 {
     BattlemasterListEntry const* bgEntry = sBattlemasterListStore.LookupEntry(bgOrTemplate->GetTypeID());
-    if(!bgEntry)
+    if (!bgEntry)
         return ERR_GROUP_JOIN_BATTLEGROUND_FAIL;            // shouldn't happen
 
     // check for min / max count
     uint32 memberscount = GetMembersCount();
 
     // only check for MinPlayerCount since MinPlayerCount == MaxPlayerCount for arenas...
-    if(bgOrTemplate->isArena() && memberscount != MinPlayerCount)
+    if (bgOrTemplate->isArena() && memberscount != MinPlayerCount)
         return ERR_ARENA_TEAM_PARTY_SIZE;
 
-    if(memberscount > bgEntry->maxGroupSize)                // no MinPlayerCount for battlegrounds
+    if (memberscount > bgEntry->maxGroupSize)                // no MinPlayerCount for battlegrounds
         return ERR_BATTLEGROUND_NONE;                       // ERR_GROUP_JOIN_BATTLEGROUND_TOO_MANY handled on client side
 
     // get a player as reference, to compare other players' stats to (arena team id, queue id based on level, etc.)
-    Player * reference = GetFirstMember()->getSource();
+    Player* reference = GetFirstMember()->getSource();
     // no reference found, can't join this way
-    if(!reference)
+    if (!reference)
         return ERR_BATTLEGROUND_JOIN_FAILED;
 
     PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bgOrTemplate->GetMapId(), reference->getLevel());
-    if(!bracketEntry)
+    if (!bracketEntry)
         return ERR_BATTLEGROUND_JOIN_FAILED;
 
     uint32 arenaTeamId = reference->GetArenaTeamId(arenaSlot);
     Team team = reference->GetTeam();
 
+    uint32 allowedPlayerCount = 0;
+
+    BattleGroundQueueTypeId bgQueueTypeIdRandom = BattleGroundMgr::BGQueueTypeId(BATTLEGROUND_RB, ARENA_TYPE_NONE);
+
     // check every member of the group to be able to join
-    for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player *member = itr->getSource();
+        Player* member = itr->getSource();
         // offline member? don't let join
-        if(!member)
+        if (!member)
             return ERR_BATTLEGROUND_JOIN_FAILED;
         // don't allow cross-faction join as group
-        if(member->GetTeam() != team)
+        if (member->GetTeam() != team)
             return ERR_BATTLEGROUND_JOIN_TIMED_OUT;
         // not in the same battleground level bracket, don't let join
         PvPDifficultyEntry const* memberBracketEntry = GetBattlegroundBracketByLevel(bracketEntry->mapId, member->getLevel());
-        if(memberBracketEntry != bracketEntry)
+        if (memberBracketEntry != bracketEntry)
             return ERR_BATTLEGROUND_JOIN_RANGE_INDEX;
         // don't let join rated matches if the arena team id doesn't match
-        if(isRated && member->GetArenaTeamId(arenaSlot) != arenaTeamId)
+        if (isRated && member->GetArenaTeamId(arenaSlot) != arenaTeamId)
             return ERR_BATTLEGROUND_JOIN_FAILED;
         // don't let join if someone from the group is already in that bg queue
-        if(member->InBattleGroundQueueForBattleGroundQueueType(bgQueueTypeId))
+        if (member->InBattleGroundQueueForBattleGroundQueueType(bgQueueTypeId))
             return ERR_BATTLEGROUND_JOIN_FAILED;            // not blizz-like
+        // don't let join if someone from the group is in bg queue random
+        if (member->InBattleGroundQueueForBattleGroundQueueType(bgQueueTypeIdRandom))
+            return ERR_IN_RANDOM_BG;
+        // don't let join to bg queue random if someone from the group is already in bg queue
+        if (bgOrTemplate->GetTypeID() == BATTLEGROUND_RB && member->InBattleGroundQueue())
+            return ERR_IN_NON_RANDOM_BG;
         // check for deserter debuff in case not arena queue
-        if(bgOrTemplate->GetTypeID() != BATTLEGROUND_AA && !member->CanJoinToBattleground())
+        if (bgOrTemplate->GetTypeID() != BATTLEGROUND_AA && !member->CanJoinToBattleground())
             return ERR_GROUP_JOIN_BATTLEGROUND_DESERTERS;
         // check if member can join any more battleground queues
-        if(!member->HasFreeBattleGroundQueueId())
+        if (!member->HasFreeBattleGroundQueueId())
             return ERR_BATTLEGROUND_TOO_MANY_QUEUES;        // not blizz-like
+
+        ++allowedPlayerCount;
     }
+
+    if (bgOrTemplate->isArena() && (allowedPlayerCount < MinPlayerCount || allowedPlayerCount > MaxPlayerCount))
+        return ERR_ARENA_TEAM_PARTY_SIZE;
+
     return GroupJoinBattlegroundResult(bgOrTemplate->GetTypeID());
 }
 
 void Group::SetDungeonDifficulty(Difficulty difficulty)
 {
-    m_dungeonDifficulty = difficulty;
-    if(!isBGGroup())
-        CharacterDatabase.PExecute("UPDATE groups SET difficulty = %u WHERE groupId='%u'", m_dungeonDifficulty, m_Id);
+    m_Difficulty = (m_Difficulty & 0xFF00) | uint32(difficulty);
+
+    if (IsNeedSave())
+    {
+        static SqlStatementID updDiff;
+        CharacterDatabase.CreateStatement(updDiff, "UPDATE groups SET difficulty = ? WHERE groupId = ?")
+            .PExecute(uint8(GetDungeonDifficulty()), m_Guid.GetCounter());
+    }
 
-    for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player *player = itr->getSource();
-        if(!player->GetSession() || player->getLevel() < LEVELREQUIREMENT_HEROIC)
+        Player* player = itr->getSource();
+        if (!player->GetSession() || player->getLevel() < LEVELREQUIREMENT_HEROIC)
             continue;
+
         player->SetDungeonDifficulty(difficulty);
         player->SendDungeonDifficulty(true);
     }
@@ -1653,15 +2034,21 @@ void Group::SetDungeonDifficulty(Difficulty difficulty)
 
 void Group::SetRaidDifficulty(Difficulty difficulty)
 {
-    m_raidDifficulty = difficulty;
-    if(!isBGGroup())
-        CharacterDatabase.PExecute("UPDATE groups SET raiddifficulty = %u WHERE groupId='%u'", m_raidDifficulty, m_Id);
+    m_Difficulty = (m_Difficulty & 0x00FF) | (uint32(difficulty) << 8);
+
+    if (IsNeedSave())
+    {
+        static SqlStatementID updDiff;
+        CharacterDatabase.CreateStatement(updDiff, "UPDATE groups SET raiddifficulty = ? WHERE groupId = ?")
+            .PExecute(uint32(GetRaidDifficulty()), m_Guid.GetCounter());
+    }
 
-    for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player *player = itr->getSource();
-        if(!player->GetSession() || player->getLevel() < LEVELREQUIREMENT_HEROIC)
+        Player* player = itr->getSource();
+        if (!player->GetSession() || player->getLevel() < LEVELREQUIREMENT_HEROIC)
             continue;
+
         player->SetRaidDifficulty(difficulty);
         player->SendRaidDifficulty(true);
     }
@@ -1669,10 +2056,13 @@ void Group::SetRaidDifficulty(Difficulty difficulty)
 
 bool Group::InCombatToInstance(uint32 instanceId)
 {
-    for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player *pPlayer = itr->getSource();
-        if(pPlayer->getAttackers().size() && pPlayer->GetInstanceId() == instanceId)
+        Player* pPlayer = itr->getSource();
+        if (!pPlayer || !pPlayer->IsInWorld())
+            continue;
+
+        if (pPlayer->GetMap() && pPlayer->GetInstanceId() == instanceId && pPlayer->IsInCombat())
             return true;
     }
     return false;
@@ -1734,6 +2124,7 @@ void Group::ResetInstances(InstanceResetMethod method, bool isRaid, Player* Send
         }
 
         bool isEmpty = true;
+
         // check if there are offline members on the map
         if (method != INSTANCE_RESET_GROUP_DISBAND && mapsWithOfflinePlayer.find(state->GetMapId()) != mapsWithOfflinePlayer.end())
             isEmpty = false;
@@ -1745,10 +2136,28 @@ void Group::ResetInstances(InstanceResetMethod method, bool isRaid, Player* Send
 
         if (SendMsgTo)
         {
-            if (isEmpty)
-                SendMsgTo->SendResetInstanceSuccess(state->GetMapId());
+            uint32 mapId = state->GetMapId();
+
+            if (!isEmpty)
+                SendMsgTo->SendResetInstanceFailed(0, mapId);
             else
-                SendMsgTo->SendResetInstanceFailed(0, state->GetMapId());
+            {
+                SendMsgTo->SendResetInstanceSuccess(mapId);
+
+                if (sWorld.getConfig(CONFIG_BOOL_INSTANCES_RESET_GROUP_ANNOUNCE))
+                {
+                    if (Group* group = SendMsgTo->GetGroup())
+                    {
+                        for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+                        {
+                            Player* pMember = itr->getSource();
+                            if (pMember && pMember != SendMsgTo &&
+                                pMember->GetSession() && pMember->IsInWorld())
+                                pMember->SendResetInstanceSuccess(mapId);
+                        }
+                    }
+                }
+            }
         }
 
         // TODO - Adapt here when clear how difficulty changes must be handled
@@ -1758,13 +2167,18 @@ void Group::ResetInstances(InstanceResetMethod method, bool isRaid, Player* Send
             if (state->CanReset())
                 state->DeleteFromDB();
             else
-                CharacterDatabase.PExecute("DELETE FROM group_instance WHERE instance = '%u'", state->GetInstanceId());
+            {
+                static SqlStatementID delGroupInst;
+                CharacterDatabase.CreateStatement(delGroupInst, "DELETE FROM group_instance WHERE instance = ?")
+                    .PExecute(state->GetInstanceId());
+            }
+
             // i don't know for sure if hash_map iterators
             m_boundInstances[diff].erase(itr);
             itr = m_boundInstances[diff].begin();
             // this unloads the instance save unless online players are bound to it
             // (eg. permanent binds or GM solo binds)
-            state->RemoveGroup(this);
+            state->RemoveFromBindList(GetObjectGuid());
         }
         else
             ++itr;
@@ -1780,7 +2194,7 @@ InstanceGroupBind* Group::GetBoundInstance(uint32 mapid, Player* player)
     Difficulty difficulty = player->GetDifficulty(mapEntry->IsRaid());
 
     // some instances only have one difficulty
-    MapDifficulty const* mapDiff = GetMapDifficultyData(mapid,difficulty);
+    MapDifficultyEntry const* mapDiff = GetMapDifficultyData(mapid, difficulty);
     if (!mapDiff)
         difficulty = DUNGEON_DIFFICULTY_NORMAL;
 
@@ -1794,7 +2208,7 @@ InstanceGroupBind* Group::GetBoundInstance(uint32 mapid, Player* player)
 InstanceGroupBind* Group::GetBoundInstance(Map* aMap, Difficulty difficulty)
 {
     // some instances only have one difficulty
-    MapDifficulty const* mapDiff = GetMapDifficultyData(aMap->GetId(),difficulty);
+    MapDifficultyEntry const* mapDiff = GetMapDifficultyData(aMap->GetId(),difficulty);
     if (!mapDiff)
         return NULL;
 
@@ -1807,33 +2221,46 @@ InstanceGroupBind* Group::GetBoundInstance(Map* aMap, Difficulty difficulty)
 
 InstanceGroupBind* Group::BindToInstance(DungeonPersistentState *state, bool permanent, bool load)
 {
-    if (state && !isBGGroup())
+    if (state && IsNeedSave())
     {
         InstanceGroupBind& bind = m_boundInstances[state->GetDifficulty()][state->GetMapId()];
         if (bind.state)
         {
             // when a boss is killed or when copying the players's binds to the group
             if (permanent != bind.perm || state != bind.state)
+            {
                 if (!load)
-                    CharacterDatabase.PExecute("UPDATE group_instance SET instance = '%u', permanent = '%u' WHERE leaderGuid = '%u' AND instance = '%u'",
-                        state->GetInstanceId(), permanent, GetLeaderGuid().GetCounter(), bind.state->GetInstanceId());
+                {
+                    static SqlStatementID updGroup;
+                    CharacterDatabase.CreateStatement(updGroup, "UPDATE group_instance SET instance = ?, permanent = ? WHERE leaderGuid = ? AND instance = ?")
+                        .PExecute(state->GetInstanceId(), permanent, GetLeaderGuid().GetCounter(), bind.state->GetInstanceId());
+                }
+            }
         }
         else if (!load)
-            CharacterDatabase.PExecute("INSERT INTO group_instance (leaderGuid, instance, permanent) VALUES ('%u', '%u', '%u')",
-                GetLeaderGuid().GetCounter(), state->GetInstanceId(), permanent);
+        {
+            static SqlStatementID insGroup;
+            CharacterDatabase.CreateStatement(insGroup, "INSERT INTO group_instance (leaderGuid, instance, permanent) VALUES (?, ?, ?)")
+                .PExecute(GetLeaderGuid().GetCounter(), state->GetInstanceId(), permanent);
+        }
 
         if (bind.state != state)
         {
             if (bind.state)
-                bind.state->RemoveGroup(this);
-            state->AddGroup(this);
+                bind.state->RemoveFromBindList(GetObjectGuid());
+
+            state->AddToBindList(GetObjectGuid());
         }
 
         bind.state = state;
         bind.perm = permanent;
+
         if (!load)
+        {
             DEBUG_LOG("Group::BindToInstance: Group (Id: %d) is now bound to map %d, instance %d, difficulty %d",
                 GetId(), state->GetMapId(), state->GetInstanceId(), state->GetDifficulty());
+        }
+
         return &bind;
     }
     else
@@ -1845,63 +2272,111 @@ void Group::UnbindInstance(uint32 mapid, uint8 difficulty, bool unload)
     BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(mapid);
     if (itr != m_boundInstances[difficulty].end())
     {
-        if (!unload)
-            CharacterDatabase.PExecute("DELETE FROM group_instance WHERE leaderGuid = '%u' AND instance = '%u'",
-                GetLeaderGuid().GetCounter(), itr->second.state->GetInstanceId());
-        itr->second.state->RemoveGroup(this);                // state can become invalid
+        if (!unload && IsNeedSave())
+        {
+            static SqlStatementID delGroupInst;
+            CharacterDatabase.CreateStatement(delGroupInst, "DELETE FROM group_instance WHERE leaderGuid = ? AND instance = ?")
+                .PExecute(GetLeaderGuid().GetCounter(), itr->second.state->GetInstanceId());
+        }
+
+        itr->second.state->RemoveFromBindList(GetObjectGuid());  // state can become invalid
         m_boundInstances[difficulty].erase(itr);
     }
 }
 
-void Group::_homebindIfInstance(Player *player)
+void Group::_homebindIfInstance(Player* player)
 {
     if (player && !player->isGameMaster())
     {
         Map* map = player->GetMap();
-        if (map->IsDungeon())
+        if (map && map->IsDungeon())
         {
             // leaving the group in an instance, the homebind timer is started
             // unless the player is permanently saved to the instance
-            InstancePlayerBind *playerBind = player->GetBoundInstance(map->GetId(), map->GetDifficulty());
-            if(!playerBind || !playerBind->perm)
+            InstancePlayerBind* playerBind = player->GetBoundInstance(map->GetId(), map->GetDifficulty());
+            if (!playerBind || !playerBind->perm)
                 player->m_InstanceValid = false;
         }
     }
 }
+//Frozen Mod
+void Group::BroadcastGroupUpdate(void)
+{
+    for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
+    {
+        Player* pp = sObjectMgr.GetPlayer(citr->guid);
+        if (pp && pp->IsInWorld())
+        {
+            pp->ForceValuesUpdateAtIndex(UNIT_FIELD_BYTES_2);
+            pp->ForceValuesUpdateAtIndex(UNIT_FIELD_FACTIONTEMPLATE);
+            DEBUG_LOG("-- Forced group value update for '%s'", pp->GetName());
+
+            if (pp->GetPet())
+            {
+                GuidSet const& groupPets = pp->GetPets();
+                if (!groupPets.empty())
+                {
+                     for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                     {
+                         if (Pet* _pet = pp->GetMap()->GetPet(*itr))
+                         {
+                             _pet->ForceValuesUpdateAtIndex(UNIT_FIELD_BYTES_2);
+                             _pet->ForceValuesUpdateAtIndex(UNIT_FIELD_FACTIONTEMPLATE);
+                         }
+                     }
+                }
+                DEBUG_LOG("-- Forced group value update for '%s' pet '%s'", pp->GetName(), pp->GetPet()->GetName());
+            }
+
+            for (uint32 i = 0; i < MAX_TOTEM_SLOT; ++i)
+            {
+                if (Unit* totem = pp->GetMap()->GetUnit(pp->GetTotemGuid(TotemSlot(i))))
+                {
+                    totem->ForceValuesUpdateAtIndex(UNIT_FIELD_BYTES_2);
+                    totem->ForceValuesUpdateAtIndex(UNIT_FIELD_FACTIONTEMPLATE);
+                    DEBUG_LOG("-- Forced group value update for '%s' totem #%u", pp->GetName(), i);
+                }
+            }
+        }
+    }
+}
+// Frozen Mod
 
-static void RewardGroupAtKill_helper(Player* pGroupGuy, Unit* pVictim, uint32 count, bool PvP, float group_rate, uint32 sum_level, bool is_dungeon, Player* not_gray_member_with_max_level, Player* member_with_max_level, uint32 xp )
+static void RewardGroupAtKill_helper(Player* pGroupGuy, Unit* pVictim, uint32 count, bool PvP, float group_rate, uint32 sum_level, bool is_dungeon, Player* not_gray_member_with_max_level, Player* member_with_max_level, uint32 xp)
 {
     // honor can be in PvP and !PvP (racial leader) cases (for alive)
     if (pGroupGuy->isAlive())
         pGroupGuy->RewardHonor(pVictim,count);
 
     // xp and reputation only in !PvP case
-    if(!PvP)
+    if (!PvP)
     {
         float rate = group_rate * float(pGroupGuy->getLevel()) / sum_level;
 
         // if is in dungeon then all receive full reputation at kill
         // rewarded any alive/dead/near_corpse group member
-        pGroupGuy->RewardReputation(pVictim,is_dungeon ? 1.0f : rate);
+        pGroupGuy->RewardReputation(pVictim, is_dungeon ? 1.0f : rate);
 
         // XP updated only for alive group member
-        if(pGroupGuy->isAlive() && not_gray_member_with_max_level &&
+        if (pGroupGuy->isAlive() && not_gray_member_with_max_level &&
             pGroupGuy->getLevel() <= not_gray_member_with_max_level->getLevel())
         {
             uint32 itr_xp = (member_with_max_level == not_gray_member_with_max_level) ? uint32(xp*rate) : uint32((xp*rate/2)+1);
 
             pGroupGuy->GiveXP(itr_xp, pVictim);
-            if(Pet* pet = pGroupGuy->GetPet())
-                pet->GivePetXP(itr_xp/2);
+            if (Pet* pet = pGroupGuy->GetPet())
+                pet->GivePetXP(itr_xp / 2);
         }
 
         // quest objectives updated only for alive group member or dead but with not released body
-        if(pGroupGuy->isAlive()|| !pGroupGuy->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
+        if (pGroupGuy->isAlive()|| !pGroupGuy->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
         {
             // normal creature (not pet/etc) can be only in !PvP case
-            if(pVictim->GetTypeId()==TYPEID_UNIT)
-                if(CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(pVictim->GetEntry()))
+            if (pVictim->GetTypeId() == TYPEID_UNIT)
+            {
+                if (CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(pVictim->GetEntry()))
                     pGroupGuy->KilledMonster(normalInfo, pVictim->GetObjectGuid());
+            }
         }
     }
 }
@@ -1927,7 +2402,7 @@ void Group::RewardGroupAtKill(Unit* pVictim, Player* player_tap)
 
     GetDataForXPAtKill(pVictim,count,sum_level,member_with_max_level,not_gray_member_with_max_level,player_tap);
 
-    if(member_with_max_level)
+    if (member_with_max_level)
     {
         /// not get Xp in PvP or no not gray players in group
         xp = (PvP || !not_gray_member_with_max_level) ? 0 : MaNGOS::XP::Gain(not_gray_member_with_max_level, pVictim);
@@ -1937,27 +2412,126 @@ void Group::RewardGroupAtKill(Unit* pVictim, Player* player_tap)
         bool is_dungeon = PvP ? false : sMapStore.LookupEntry(pVictim->GetMapId())->IsDungeon();
         float group_rate = MaNGOS::XP::xp_in_group_rate(count,is_raid);
 
-        for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
+        for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player* pGroupGuy = itr->getSource();
-            if(!pGroupGuy)
+            if (!pGroupGuy)
                 continue;
 
             // will proccessed later
-            if(pGroupGuy==player_tap)
+            if (pGroupGuy == player_tap)
                 continue;
 
-            if(!pGroupGuy->IsAtGroupRewardDistance(pVictim))
+            if (!pGroupGuy->IsAtGroupRewardDistance(pVictim))
                 continue;                               // member (alive or dead) or his corpse at req. distance
 
+            if (pVictim->GetTypeId() == TYPEID_UNIT)
+            {
+                if (CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(pVictim->GetEntry()))
+                {
+                    if (uint32 normalType = normalInfo->CreatureType)
+                        pGroupGuy->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE, normalType, xp);
+                }
+            }
+
             RewardGroupAtKill_helper(pGroupGuy, pVictim, count, PvP, group_rate, sum_level, is_dungeon, not_gray_member_with_max_level, member_with_max_level, xp);
         }
 
-        if(player_tap)
+        if (player_tap)
         {
             // member (alive or dead) or his corpse at req. distance
-            if(player_tap->IsAtGroupRewardDistance(pVictim))
+            if (player_tap->IsAtGroupRewardDistance(pVictim))
                 RewardGroupAtKill_helper(player_tap, pVictim, count, PvP, group_rate, sum_level, is_dungeon, not_gray_member_with_max_level, member_with_max_level, xp);
+
+            if (pVictim->GetTypeId() == TYPEID_UNIT)
+            {
+                if (CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(pVictim->GetEntry()))
+                {
+                    if (uint32 normalType = normalInfo->CreatureType)
+                        player_tap->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE, normalType, xp);
+                }
+            }
+            player_tap->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, 1, 0, pVictim);
+        }
+    }
+}
+
+bool Group::ConvertToLFG(LFGType type)
+{
+    if (isBGGroup())
+        return false;
+
+    switch (type)
+    {
+        case LFG_TYPE_DUNGEON:
+        case LFG_TYPE_QUEST:
+        case LFG_TYPE_ZONE:
+        case LFG_TYPE_HEROIC_DUNGEON:
+            if (isRaidGroup())
+                return false;
+            m_groupType = GroupType(m_groupType | GROUPTYPE_LFD);
+            break;
+        case LFG_TYPE_RANDOM_DUNGEON:
+            if (isRaidGroup())
+                return false;
+            m_groupType = GroupType(m_groupType | GROUPTYPE_LFD | GROUPTYPE_UNK1);
+            break;
+        case LFG_TYPE_RAID:
+            if (!isRaidGroup())
+                ConvertToRaid();
+            m_groupType = GroupType(m_groupType | GROUPTYPE_LFD);
+            break;
+        default:
+            return false;
+    }
+
+    m_lootMethod = NEED_BEFORE_GREED;
+    SendUpdate();
+
+    if (IsNeedSave())
+    {
+        static SqlStatementID updGroup;
+        CharacterDatabase.CreateStatement(updGroup, "UPDATE groups SET groupType = ? WHERE groupId = ?")
+            .PExecute(uint8(m_groupType), GetObjectGuid().GetCounter());
+    }
+    return true;
+}
+
+void Group::SetGroupRoles(ObjectGuid guid, LFGRoleMask roles)
+{
+    for (member_witerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
+    {
+        if (itr->guid == guid)
+        {
+            itr->roles = roles;
+
+            if (IsNeedSave())
+            {
+                static SqlStatementID updGroupMember;
+                CharacterDatabase.CreateStatement(updGroupMember, "UPDATE group_member SET roles = ? WHERE memberGuid = ?")
+                    .PExecute(uint8(itr->roles), itr->guid.GetCounter());
+            }
+
+            SendUpdate();
+            return;
         }
     }
 }
+
+LFGRoleMask Group::GetGroupRoles(ObjectGuid guid)
+{
+    for (member_witerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
+    {
+        if (itr->guid == guid)
+            return itr->roles;
+    }
+    return LFG_ROLE_MASK_NONE;
+}
+
+bool Group::IsNeedSave() const
+{
+    if (GetGroupType() & GROUPTYPE_BG)
+        return false;
+
+    return m_bgGroup == NULL;
+}
diff --git a/src/game/Group.h b/src/game/Group.h
index e916ab18e11..ba26122e234 100644
--- a/src/game/Group.h
+++ b/src/game/Group.h
@@ -23,10 +23,11 @@
 #include "ObjectGuid.h"
 #include "GroupReference.h"
 #include "GroupRefManager.h"
-#include "BattleGround.h"
+#include "BattleGround/BattleGround.h"
 #include "LootMgr.h"
 #include "DBCEnums.h"
 #include "SharedDefines.h"
+#include "LFG.h"
 
 #include <map>
 #include <vector>
@@ -35,6 +36,7 @@ struct ItemPrototype;
 
 class WorldSession;
 class Map;
+class BattleField;
 class BattleGround;
 class DungeonPersistentState;
 class Field;
@@ -91,6 +93,8 @@ enum GroupMemberFlags
     MEMBER_STATUS_UNK3      = 0x0020,                       // used in calls from Lua_GetPlayerMapPosition/Lua_GetBattlefieldFlagPosition
     MEMBER_STATUS_AFK       = 0x0040,                       // Lua_UnitIsAFK
     MEMBER_STATUS_DND       = 0x0080,                       // Lua_UnitIsDND
+    MEMBER_STATUS_RAF       = 0x0100,                       // RAF status in party/raid
+    MEMBER_STATUS_UNK4      = 0x0200,                       // something to do with vehicles
 };
 
 enum GroupType                                              // group type flags?
@@ -99,16 +103,47 @@ enum GroupType                                              // group type flags?
     GROUPTYPE_BG     = 0x01,
     GROUPTYPE_RAID   = 0x02,
     GROUPTYPE_BGRAID = GROUPTYPE_BG | GROUPTYPE_RAID,       // mask
-    // 0x04?
+    GROUPTYPE_UNK1   = 0x04,                                // 0x04?
     GROUPTYPE_LFD    = 0x08,
+    GROUPTYPE_UNK2   = 0x10,
     // 0x10, leave/change group?, I saw this flag when leaving group and after leaving BG while in group
 };
 
+enum GroupFlags
+{
+    GROUP_FLAG_ASSISTANT      = 0,
+    GROUP_FLAG_MAIN_ASSISTANT = 1,
+    GROUP_FLAG_MAIN_TANK      = 2,
+};
+
 enum GroupFlagMask
 {
-    GROUP_ASSISTANT      = 0x01,
-    GROUP_MAIN_ASSISTANT = 0x02,
-    GROUP_MAIN_TANK      = 0x04,
+    GROUP_MEMBER         = 0x00,
+    GROUP_ASSISTANT      = (1 << GROUP_FLAG_ASSISTANT),
+    GROUP_MAIN_ASSISTANT = (1 << GROUP_FLAG_MAIN_ASSISTANT),
+    GROUP_MAIN_TANK      = (1 << GROUP_FLAG_MAIN_TANK),
+
+    // unions
+    GROUP_MEMBER_AMT     = (GROUP_ASSISTANT |
+                            GROUP_MAIN_ASSISTANT |
+                            GROUP_MAIN_TANK),
+
+    GROUP_MEMBER_AT      = (GROUP_ASSISTANT |
+                            GROUP_MAIN_TANK),
+
+    GROUP_MEMBER_AM      = (GROUP_ASSISTANT |
+                            GROUP_MAIN_ASSISTANT),
+
+    GROUP_MEMBER_MT      = (GROUP_MAIN_ASSISTANT |
+                            GROUP_MAIN_TANK),
+
+};
+
+enum GroupFlagsAssignment
+{
+    GROUP_ASSIGN_MAINASSIST = 0,
+    GROUP_ASSIGN_MAINTANK   = 1,
+    GROUP_ASSIGN_ASSISTANT  = 2,
 };
 
 enum GroupUpdateFlags
@@ -149,9 +184,9 @@ class Roll : public LootValidatorRef
             : lootedTargetGUID(_lootedTragetGuid), itemid(li.itemid), itemRandomPropId(li.randomPropertyId), itemRandomSuffix(li.randomSuffix),
             itemCount(li.count), totalPlayersRolling(0), totalNeed(0), totalGreed(0), totalPass(0), itemSlot(0),
             m_method(method), m_commonVoteMask(ROLL_VOTE_MASK_ALL) {}
-        ~Roll() { }
+        ~Roll() {}
         void setLoot(Loot *pLoot) { link(pLoot, this); }
-        Loot *getLoot() { return getTarget(); }
+        Loot* getLoot() { return getTarget(); }
         void targetObjectBuildLink();
 
         void CalculateCommonVoteMask(uint32 max_enchanting_skill);
@@ -194,33 +229,38 @@ class MANGOS_DLL_SPEC Group
             ObjectGuid  guid;
             std::string name;
             uint8       group;
-            bool        assistant;
+            GroupFlagMask  flags;
+            LFGRoleMask roles;
             uint32      lastMap;
         };
         typedef std::list<MemberSlot> MemberSlotList;
         typedef MemberSlotList::const_iterator member_citerator;
+        typedef MemberSlotList::iterator       member_witerator;
+
+        typedef UNORDERED_MAP<uint32 /*mapId*/, InstanceGroupBind> BoundInstancesMap;
 
-        typedef UNORDERED_MAP< uint32 /*mapId*/, InstanceGroupBind> BoundInstancesMap;
     protected:
-        typedef MemberSlotList::iterator member_witerator;
-        typedef std::set<Player*> InvitesList;
-        typedef std::vector<Roll*> Rolls;
+        typedef UNORDERED_SET<Player*> InvitesList;
+        typedef std::vector<Roll*> TRolls;
 
     public:
-        Group();
+        Group(GroupType type);
         ~Group();
 
         // group manipulation methods
         bool   Create(ObjectGuid guid, const char * name);
         bool   LoadGroupFromDB(Field *fields);
-        bool   LoadMemberFromDB(uint32 guidLow, uint8 subgroup, bool assistant);
+        bool   LoadMemberFromDB(uint32 guidLow, uint8 subgroup, GroupFlagMask flags, LFGRoleMask roles);
         bool   AddInvite(Player *player);
         uint32 RemoveInvite(Player *player);
         void   RemoveAllInvites();
         bool   AddLeaderInvite(Player *player);
         bool   AddMember(ObjectGuid guid, const char* name);
-        uint32 RemoveMember(ObjectGuid guid, uint8 method); // method: 0=just remove, 1=kick
+        uint32 RemoveMember(ObjectGuid guid, uint8 method, bool logout = false); // method: 0=just remove, 1=kick
+        void   RemoveGroupBuffsOnMemberRemove(ObjectGuid guid);
         void   ChangeLeader(ObjectGuid guid);
+        void CheckLeader(ObjectGuid const& guid, bool logout);
+        bool ChangeLeaderToFirstSuitableMember(bool onlySet = false);
         void   SetLootMethod(LootMethod method) { m_lootMethod = method; }
         void   SetLooterGuid(ObjectGuid guid) { m_looterGuid = guid; }
         void   UpdateLooterGuid(WorldObject* pSource, bool ifneed = false);
@@ -228,9 +268,9 @@ class MANGOS_DLL_SPEC Group
         void   Disband(bool hideDestroy=false);
 
         // properties accessories
-        uint32 GetId() const { return m_Id; }
-        ObjectGuid GetObjectGuid() const { return ObjectGuid(HIGHGUID_GROUP, GetId()); }
-        bool IsFull() const { return (m_groupType == GROUPTYPE_NORMAL) ? (m_memberSlots.size() >= MAX_GROUP_SIZE) : (m_memberSlots.size() >= MAX_RAID_SIZE); }
+        ObjectGuid GetObjectGuid() const { return m_Guid; }
+        uint32 GetId() const { return m_Guid.GetCounter(); }
+        bool IsFull() const { return (m_groupType == GROUPTYPE_NORMAL || isLFGGroup()) ? (m_memberSlots.size() >= MAX_GROUP_SIZE) : (m_memberSlots.size() >= MAX_RAID_SIZE); }
         bool isRaidGroup() const { return m_groupType & GROUPTYPE_RAID; }
         bool isBGGroup()   const { return m_bgGroup != NULL; }
         bool IsCreated()   const { return GetMembersCount() > 0; }
@@ -239,26 +279,37 @@ class MANGOS_DLL_SPEC Group
         LootMethod    GetLootMethod() const { return m_lootMethod; }
         ObjectGuid GetLooterGuid() const { return m_looterGuid; }
         ItemQualities GetLootThreshold() const { return m_lootThreshold; }
+        GroupType GetGroupType() const { return m_groupType; };
+        bool IsNeedSave() const;
 
         // member manipulation methods
         bool IsMember(ObjectGuid guid) const { return _getMemberCSlot(guid) != m_memberSlots.end(); }
         bool IsLeader(ObjectGuid guid) const { return GetLeaderGuid() == guid; }
         ObjectGuid GetMemberGuid(const std::string& name)
         {
-            for(member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
+            for (member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
+            {
                 if (itr->name == name)
                     return itr->guid;
-
+            }
             return ObjectGuid();
         }
-        bool IsAssistant(ObjectGuid guid) const
+        bool IsGroupRole(ObjectGuid const& guid, GroupFlagMask role) const
         {
             member_citerator mslot = _getMemberCSlot(guid);
-            if (mslot==m_memberSlots.end())
+            if (mslot == m_memberSlots.end())
                 return false;
 
-            return mslot->assistant;
+            if (role == GROUP_MEMBER)
+                return true;
+            else
+                return mslot->flags & role;
         }
+        bool IsMainAssistant(ObjectGuid const& guid) const { return IsGroupRole(guid, GROUP_MAIN_ASSISTANT); }
+        bool IsMainTank(ObjectGuid const& guid) const { return IsGroupRole(guid, GROUP_MAIN_TANK); }
+        bool IsAssistant(ObjectGuid const& guid) const { return IsGroupRole(guid, GROUP_ASSISTANT); }
+        Player* GetMemberWithRole(GroupFlagMask role);
+
         Player* GetInvited(ObjectGuid guid) const;
         Player* GetInvited(const std::string& name) const;
 
@@ -271,6 +322,7 @@ class MANGOS_DLL_SPEC Group
 
         MemberSlotList const& GetMemberSlots() const { return m_memberSlots; }
         GroupReference* GetFirstMember() { return m_memberMgr.getFirst(); }
+        GroupReference const* GetFirstMember() const { return m_memberMgr.getFirst(); }
         uint32 GetMembersCount() const { return m_memberSlots.size(); }
         void GetDataForXPAtKill(Unit const* victim, uint32& count,uint32& sum_level, Player* & member_with_max_level, Player* & not_gray_member_with_max_level, Player* additional = NULL);
         uint8 GetMemberGroup(ObjectGuid guid) const
@@ -286,43 +338,20 @@ class MANGOS_DLL_SPEC Group
         void ConvertToRaid();
 
         void SetBattlegroundGroup(BattleGround *bg) { m_bgGroup = bg; }
+        void SetBattlefieldGroup(BattleField *bf) { m_bfGroup = bf; }
         GroupJoinBattlegroundResult CanJoinBattleGroundQueue(BattleGround const* bgOrTemplate, BattleGroundQueueTypeId bgQueueTypeId, uint32 MinPlayerCount, uint32 MaxPlayerCount, bool isRated, uint32 arenaSlot);
 
         void ChangeMembersGroup(ObjectGuid guid, uint8 group);
         void ChangeMembersGroup(Player *player, uint8 group);
 
-        ObjectGuid GetMainTankGuid() const { return m_mainTankGuid; }
-        ObjectGuid GetMainAssistantGuid() const { return m_mainAssistantGuid; }
-
-        void SetAssistant(ObjectGuid guid, bool state)
-        {
-            if (!isRaidGroup())
-                return;
-            if (_setAssistantFlag(guid, state))
-                SendUpdate();
-        }
-        void SetMainTank(ObjectGuid guid)
-        {
-            if (!isRaidGroup())
-                return;
-
-            if (_setMainTank(guid))
-                SendUpdate();
-        }
-        void SetMainAssistant(ObjectGuid guid)
-        {
-            if (!isRaidGroup())
-                return;
-
-            if (_setMainAssistant(guid))
-                SendUpdate();
-        }
+        void SetGroupUniqueFlag(ObjectGuid guid, GroupFlagsAssignment assignment, uint8 apply);
 
         void SetTargetIcon(uint8 id, ObjectGuid whoGuid, ObjectGuid targetGuid);
 
-        Difficulty GetDifficulty(bool isRaid) const { return isRaid ? m_raidDifficulty : m_dungeonDifficulty; }
-        Difficulty GetDungeonDifficulty() const { return m_dungeonDifficulty; }
-        Difficulty GetRaidDifficulty() const { return m_raidDifficulty; }
+        Difficulty GetDifficulty(bool isRaid) const { return isRaid ? GetRaidDifficulty() : GetDungeonDifficulty(); }
+        uint32 GetDifficulty() const { return m_Difficulty; }
+        Difficulty GetDungeonDifficulty() const { return Difficulty(m_Difficulty & 0x00FF); }
+        Difficulty GetRaidDifficulty() const { return Difficulty((m_Difficulty & 0xFF00) >> 8);}
         void SetDungeonDifficulty(Difficulty difficulty);
         void SetRaidDifficulty(Difficulty difficulty);
         uint16 InInstance();
@@ -331,6 +360,7 @@ class MANGOS_DLL_SPEC Group
 
         void SendTargetIconList(WorldSession *session);
         void SendUpdate();
+        void Update(uint32 diff);
         void UpdatePlayerOutOfRange(Player* pPlayer);
                                                             // ignore: GUID of player that will be ignored
         void BroadcastPacket(WorldPacket *packet, bool ignorePlayersInBGRaid, int group=-1, ObjectGuid ignore = ObjectGuid());
@@ -365,18 +395,32 @@ class MANGOS_DLL_SPEC Group
         InstanceGroupBind* GetBoundInstance(Map* aMap, Difficulty difficulty);
         BoundInstancesMap& GetBoundInstances(Difficulty difficulty) { return m_boundInstances[difficulty]; }
 
+        // LFG
+        bool ConvertToLFG(LFGType type);
+        bool isLFDGroup()  const { return m_groupType & GROUPTYPE_LFD; }
+        bool isLFGGroup()  const { return ((m_groupType & GROUPTYPE_LFD) && !(m_groupType & GROUPTYPE_RAID)) ; }
+        bool isLFRGroup()  const { return ((m_groupType & GROUPTYPE_LFD) && (m_groupType & GROUPTYPE_RAID)) ; }
+        void SetGroupRoles(ObjectGuid guid, LFGRoleMask roles);
+        LFGRoleMask GetGroupRoles(ObjectGuid guid);
+
+        // Frozen Mod
+        void BroadcastGroupUpdate(void);
+        // Frozen Mod
+
+        // ai playerbot mod
+        ObjectGuid GetTargetIcon(int index) { return m_targetIcons[index]; }
+        TRolls* GetRolls() { return m_rollIds; }
+        // end
+
     protected:
-        bool _addMember(ObjectGuid guid, const char* name, bool isAssistant=false);
-        bool _addMember(ObjectGuid guid, const char* name, bool isAssistant, uint8 group);
+        bool _addMember(ObjectGuid guid, const char* name);
+        bool _addMember(ObjectGuid guid, const char* name, uint8 group, GroupFlagMask flags = GROUP_MEMBER, LFGRoleMask roles = LFG_ROLE_MASK_NONE);
         bool _removeMember(ObjectGuid guid);                // returns true if leader has changed
         void _setLeader(ObjectGuid guid);
 
         void _removeRolls(ObjectGuid guid);
 
         bool _setMembersGroup(ObjectGuid guid, uint8 group);
-        bool _setAssistantFlag(ObjectGuid guid, const bool &state);
-        bool _setMainTank(ObjectGuid guid);
-        bool _setMainAssistant(ObjectGuid guid);
 
         void _homebindIfInstance(Player *player);
 
@@ -424,39 +468,29 @@ class MANGOS_DLL_SPEC Group
 
         uint32 GetMaxSkillValueForGroup(SkillType skill);
 
-        void CountTheRoll(Rolls::iterator& roll);           // iterator update to next, in CountRollVote if true
-        bool CountRollVote(ObjectGuid const& playerGUID, Rolls::iterator& roll, RollVote vote);
-
-        GroupFlagMask GetFlags(MemberSlot const& slot) const
-        {
-            uint8 flags = 0;
-            if (slot.assistant)
-                flags |= GROUP_ASSISTANT;
-            if (slot.guid == m_mainAssistantGuid)
-                flags |= GROUP_MAIN_ASSISTANT;
-            if (slot.guid == m_mainTankGuid)
-                flags |= GROUP_MAIN_TANK;
-            return GroupFlagMask(flags);
-        }
+        void CountTheRoll(TRolls::iterator& roll);                    // iterator update to next, in CountRollVote if true
+        bool CountRollVote(ObjectGuid const& playerGUID, TRolls::iterator& roll, RollVote vote);
 
-        uint32              m_Id;                           // 0 for not created or BG groups
+        ObjectGuid          m_Guid;
         MemberSlotList      m_memberSlots;
         GroupRefManager     m_memberMgr;
         InvitesList         m_invitees;
         ObjectGuid          m_leaderGuid;
         std::string         m_leaderName;
-        ObjectGuid          m_mainTankGuid;
-        ObjectGuid          m_mainAssistantGuid;
         GroupType           m_groupType;
-        Difficulty          m_dungeonDifficulty;
-        Difficulty          m_raidDifficulty;
+
+        uint32              m_Difficulty;                             // contains both dungeon (first byte) and raid (second byte) difficultyes of player. bytes 2,3 not used.
+
         BattleGround*       m_bgGroup;
+        BattleField*        m_bfGroup;
         ObjectGuid          m_targetIcons[TARGET_ICON_COUNT];
         LootMethod          m_lootMethod;
         ItemQualities       m_lootThreshold;
         ObjectGuid          m_looterGuid;
-        Rolls               RollId;
+        TRolls*             m_rollIds;
         BoundInstancesMap   m_boundInstances[MAX_DIFFICULTY];
         uint8*              m_subGroupsCounts;
+        uint32              m_waitLeaderTimer;
+
 };
 #endif
diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp
index e75052be84a..db3858d7434 100644
--- a/src/game/GroupHandler.cpp
+++ b/src/game/GroupHandler.cpp
@@ -23,6 +23,7 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "World.h"
+#include "AccountMgr.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "Group.h"
@@ -48,10 +49,24 @@ void WorldSession::SendPartyResult(PartyOperation operation, const std::string&
     data << uint32(res);
     data << uint32(0);                                      // LFD cooldown related (used with ERR_PARTY_LFG_BOOT_COOLDOWN_S and ERR_PARTY_LFG_BOOT_NOT_ELIGIBLE_S)
 
-    SendPacket( &data );
+    SendPacket(&data);
+}
+
+void WorldSession::SendGroupInvite(Player* player, bool alreadyInGroup /*= false*/)
+{
+    WorldPacket data(SMSG_GROUP_INVITE, 58);                // guess size
+    data << uint8(alreadyInGroup ? 0 : 1);                  // invited/already in group flag
+    data << GetPlayer()->GetName();                         // max len 48
+    data << uint32(0);                                      // unk
+    data << uint8(0);                                       // count
+    // for(int i = 0; i < count; ++i)
+    //    data << uint32(0);
+    data << uint32(0);                                      // unk
+
+    player->GetSession()->SendPacket(&data);
 }
 
-void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data )
+void WorldSession::HandleGroupInviteOpcode(WorldPacket& recv_data)
 {
     std::string membername;
     recv_data >> membername;
@@ -60,62 +75,73 @@ void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data )
     // attempt add selected player
 
     // cheating
-    if(!normalizePlayerName(membername))
+    if (!normalizePlayerName(membername))
     {
         SendPartyResult(PARTY_OP_INVITE, membername, ERR_BAD_PLAYER_NAME_S);
         return;
     }
 
-    Player *player = sObjectMgr.GetPlayer(membername.c_str());
+    Player* player = sObjectMgr.GetPlayer(membername.c_str());
 
     // no player
-    if(!player)
+    if (!player)
     {
         SendPartyResult(PARTY_OP_INVITE, membername, ERR_BAD_PLAYER_NAME_S);
         return;
     }
 
     // can't group with
-    if(!sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GROUP) && GetPlayer()->GetTeam() != player->GetTeam())
+    if (!GetPlayer()->isGameMaster() && !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GROUP) && GetPlayer()->GetTeam() != player->GetTeam())
     {
         SendPartyResult(PARTY_OP_INVITE, membername, ERR_PLAYER_WRONG_FACTION);
         return;
     }
 
-    if(GetPlayer()->GetInstanceId() != 0 && player->GetInstanceId() != 0 && GetPlayer()->GetInstanceId() != player->GetInstanceId() && GetPlayer()->GetMapId() == player->GetMapId())
+    if (GetPlayer()->GetInstanceId() != 0 && player->GetInstanceId() != 0 && GetPlayer()->GetInstanceId() != player->GetInstanceId() && GetPlayer()->GetMapId() == player->GetMapId())
     {
         SendPartyResult(PARTY_OP_INVITE, membername, ERR_TARGET_NOT_IN_INSTANCE_S);
         return;
     }
 
     // just ignore us
-    if(player->GetSocial()->HasIgnore(GetPlayer()->GetObjectGuid()))
+    if (player->GetSocial()->HasIgnore(GetPlayer()->GetObjectGuid()))
     {
         SendPartyResult(PARTY_OP_INVITE, membername, ERR_IGNORING_YOU_S);
         return;
     }
 
-    Group *group = GetPlayer()->GetGroup();
-    if( group && group->isBGGroup() )
+    Group* group = GetPlayer()->GetGroup();
+    if (group && group->isBGGroup())
         group = GetPlayer()->GetOriginalGroup();
 
-    if(group && group->isRaidGroup() && !player->GetAllowLowLevelRaid() && (player->getLevel() < sWorld.getConfig(CONFIG_UINT32_MIN_LEVEL_FOR_RAID)))
+    if (group && group->isRaidGroup() && !player->GetAllowLowLevelRaid() && (player->getLevel() < sWorld.getConfig(CONFIG_UINT32_MIN_LEVEL_FOR_RAID)))
     {
         SendPartyResult(PARTY_OP_INVITE, "", ERR_RAID_DISALLOWED_BY_LEVEL);
         return;
     }
 
-    Group *group2 = player->GetGroup();
-    if( group2 && group2->isBGGroup() )
+    // player already invited
+    if (player->GetGroupInvite())
+    {
+        SendPartyResult(PARTY_OP_INVITE, membername, ERR_ALREADY_IN_GROUP_S);
+        return;
+    }
+
+    Group* group2 = player->GetGroup();
+    if (group2 && group2->isBGGroup())
         group2 = player->GetOriginalGroup();
+
     // player already in another group or invited
-    if( group2 || player->GetGroupInvite() )
+    if (group2)
     {
         SendPartyResult(PARTY_OP_INVITE, membername, ERR_ALREADY_IN_GROUP_S);
+
+        // tell the player that they were invited but it failed as they were already in a group
+        SendGroupInvite(player, true);
         return;
     }
 
-    if(group)
+    if (group)
     {
         // not have permissions for invite
         if (!group->IsLeader(GetPlayer()->GetObjectGuid()) && !group->IsAssistant(GetPlayer()->GetObjectGuid()))
@@ -124,7 +150,7 @@ void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data )
             return;
         }
         // not have place
-        if(group->IsFull())
+        if (group->IsFull())
         {
             SendPartyResult(PARTY_OP_INVITE, "", ERR_GROUP_FULL);
             return;
@@ -134,49 +160,43 @@ void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data )
     // ok, but group not exist, start a new group
     // but don't create and save the group to the DB until
     // at least one person joins
-    if(!group)
+    if (!group)
     {
-        group = new Group;
+        group = new Group(GROUPTYPE_NORMAL);
         // new group: if can't add then delete
-        if(!group->AddLeaderInvite(GetPlayer()))
+        if (!group->AddLeaderInvite(GetPlayer()))
         {
             delete group;
             return;
         }
-        if(!group->AddInvite(player))
+
+        if (!group->AddInvite(player))
         {
             delete group;
             return;
         }
+        DEBUG_LOG("WorldSession::HandleGroupInviteOpcode %s send invite to %s, try create %s.",GetPlayer()->GetObjectGuid().GetString().c_str(), player->GetObjectGuid().GetString().c_str(),group->GetObjectGuid().GetString().c_str());
     }
     else
     {
         // already existing group: if can't add then just leave
-        if(!group->AddInvite(player))
+        if (!group->AddInvite(player))
         {
             return;
         }
+        DEBUG_LOG("WorldSession::HandleGroupInviteOpcode %s send invite to %s",GetPlayer()->GetObjectGuid().GetString().c_str(), player->GetObjectGuid().GetString().c_str());
     }
 
-    // ok, we do it
-    WorldPacket data(SMSG_GROUP_INVITE, 10);                // guess size
-    data << uint8(1);                                       // invited/already in group flag
-    data << GetPlayer()->GetName();                         // max len 48
-    data << uint32(0);                                      // unk
-    data << uint8(0);                                       // count
-    //for(int i = 0; i < count; ++i)
-    //    data << uint32(0);
-    data << uint32(0);                                      // unk
-    player->GetSession()->SendPacket(&data);
-
+    SendGroupInvite(player);
     SendPartyResult(PARTY_OP_INVITE, membername, ERR_PARTY_RESULT_OK);
 }
 
-void WorldSession::HandleGroupAcceptOpcode( WorldPacket & recv_data )
+void WorldSession::HandleGroupAcceptOpcode(WorldPacket& recv_data)
 {
-    recv_data.read_skip<uint32>();                          // roles mask?
+    if (!GetPlayer()->GetPlayerbotAI())
+        recv_data.read_skip<uint32>();                          // roles mask?
 
-    Group *group = GetPlayer()->GetGroupInvite();
+    Group* group = sObjectMgr.GetGroup(GetPlayer()->GetGroupInvite());
     if (!group)
         return;
 
@@ -194,7 +214,7 @@ void WorldSession::HandleGroupAcceptOpcode( WorldPacket & recv_data )
     /********************/
 
     // not have place
-    if(group->IsFull())
+    if (group->IsFull())
     {
         SendPartyResult(PARTY_OP_INVITE, "", ERR_GROUP_FULL);
         return;
@@ -207,25 +227,37 @@ void WorldSession::HandleGroupAcceptOpcode( WorldPacket & recv_data )
     {
         if (leader)
             group->RemoveInvite(leader);
-        if (group->Create(group->GetLeaderGuid(), group->GetLeaderName()))
-            sObjectMgr.AddGroup(group);
-        else
+
+        if (!group->Create(group->GetLeaderGuid(), group->GetLeaderName()))
             return;
+
+        DEBUG_LOG("WorldSession::HandleGroupAcceptOpcode %s accept group invite, %s created.",GetPlayer()->GetObjectGuid().GetString().c_str(), group->GetObjectGuid().GetString().c_str());
     }
+    else
+        DEBUG_LOG("WorldSession::HandleGroupAcceptOpcode %s accept %s invite.",GetPlayer()->GetObjectGuid().GetString().c_str(), group->GetObjectGuid().GetString().c_str());
 
     // everything is fine, do it, PLAYER'S GROUP IS SET IN ADDMEMBER!!!
-    if(!group->AddMember(GetPlayer()->GetObjectGuid(), GetPlayer()->GetName()))
+    if (!group->AddMember(GetPlayer()->GetObjectGuid(), GetPlayer()->GetName()))
         return;
+
+    // Frozen Mod
+    group->BroadcastGroupUpdate();
+    // Frozen Mod
 }
 
-void WorldSession::HandleGroupDeclineOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleGroupDeclineOpcode(WorldPacket& /*recv_data*/ )
 {
-    Group  *group  = GetPlayer()->GetGroupInvite();
+    Group* group  = sObjectMgr.GetGroup(GetPlayer()->GetGroupInvite());
     if (!group)
+    {
+        GetPlayer()->SetGroupInvite(ObjectGuid());
         return;
+    }
 
     // remember leader if online
-    Player *leader = sObjectMgr.GetPlayer(group->GetLeaderGuid());
+    Player* leader = sObjectMgr.GetPlayer(group->GetLeaderGuid());
+
+    DEBUG_LOG("WorldSession::HandleGroupDeclineOpcode %s tried to decline %s invite",GetPlayer()->GetObjectGuid().GetString().c_str(), group->GetObjectGuid().GetString().c_str());
 
     // uninvite, group can be deleted
     GetPlayer()->UninviteFromGroup();
@@ -234,16 +266,18 @@ void WorldSession::HandleGroupDeclineOpcode( WorldPacket & /*recv_data*/ )
         return;
 
     // report
-    WorldPacket data( SMSG_GROUP_DECLINE, 10 );             // guess size
+    WorldPacket data(SMSG_GROUP_DECLINE, 10);             // guess size
     data << GetPlayer()->GetName();
-    leader->GetSession()->SendPacket( &data );
+    leader->GetSession()->SendPacket(&data);
 }
 
 void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket & recv_data)
 {
     ObjectGuid guid;
+    std::string reason;
+
     recv_data >> guid;
-    recv_data.read_skip<std::string>();                     // reason
+    recv_data >> reason;                     // reason
 
     // can't uninvite yourself
     if (guid == GetPlayer()->GetObjectGuid())
@@ -252,6 +286,18 @@ void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket & recv_data)
         return;
     }
 
+    Group* grp = GetPlayer()->GetGroup();
+    if (!grp)
+        return;
+
+    DEBUG_LOG("WorldSession::HandleGroupUninviteGuidOpcode %s tried to be uninvited from  %s",guid.GetString().c_str(), grp->GetObjectGuid().GetString().c_str());
+
+    if (grp->IsMember(guid) && grp->isLFGGroup())
+    {
+        sLFGMgr.InitBoot(GetPlayer(), guid, reason);
+        return;
+    }
+
     PartyResult res = GetPlayer()->CanUninviteFromGroup();
     if (res != ERR_PARTY_RESULT_OK)
     {
@@ -259,13 +305,9 @@ void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket & recv_data)
         return;
     }
 
-    Group* grp = GetPlayer()->GetGroup();
-    if(!grp)
-        return;
-
     if (grp->IsMember(guid))
     {
-        Player::RemoveFromGroup(grp, guid);
+        grp->RemoveMember(guid, 0);
         return;
     }
 
@@ -294,6 +336,21 @@ void WorldSession::HandleGroupUninviteOpcode(WorldPacket & recv_data)
         return;
     }
 
+
+    Group* grp = GetPlayer()->GetGroup();
+    if (!grp)
+        return;
+
+    ObjectGuid guid = grp->GetMemberGuid(membername);
+
+    DEBUG_LOG("WorldSession::HandleGroupUninviteOpcode %s tried to be uninvited from  %s",guid.GetString().c_str(), grp->GetObjectGuid().GetString().c_str());
+
+    if (grp->IsMember(guid) && grp->isLFGGroup())
+    {
+        sLFGMgr.InitBoot(GetPlayer(), guid, "");
+        return;
+    }
+
     PartyResult res = GetPlayer()->CanUninviteFromGroup();
     if (res != ERR_PARTY_RESULT_OK)
     {
@@ -301,13 +358,9 @@ void WorldSession::HandleGroupUninviteOpcode(WorldPacket & recv_data)
         return;
     }
 
-    Group* grp = GetPlayer()->GetGroup();
-    if (!grp)
-        return;
-
-    if (ObjectGuid guid = grp->GetMemberGuid(membername))
+    if (!guid.IsEmpty())
     {
-        Player::RemoveFromGroup(grp, guid);
+        grp->RemoveMember(guid, 0);
         return;
     }
 
@@ -320,7 +373,7 @@ void WorldSession::HandleGroupUninviteOpcode(WorldPacket & recv_data)
     SendPartyResult(PARTY_OP_LEAVE, membername, ERR_TARGET_NOT_IN_GROUP_S);
 }
 
-void WorldSession::HandleGroupSetLeaderOpcode( WorldPacket & recv_data )
+void WorldSession::HandleGroupSetLeaderOpcode(WorldPacket& recv_data)
 {
     ObjectGuid guid;
     recv_data >> guid;
@@ -329,7 +382,9 @@ void WorldSession::HandleGroupSetLeaderOpcode( WorldPacket & recv_data )
     if (!group)
         return;
 
-    Player *player = sObjectMgr.GetPlayer(guid);
+    Player* player = sObjectMgr.GetPlayer(guid);
+
+    DEBUG_LOG("WorldSession::HandleGroupSetLeaderOpcode: %s tried to be setted as leader of %s",guid.GetString().c_str(), group->GetObjectGuid().GetString().c_str());
 
     /** error handling **/
     if (!player || !group->IsLeader(GetPlayer()->GetObjectGuid()) || player->GetGroup() != group)
@@ -337,22 +392,22 @@ void WorldSession::HandleGroupSetLeaderOpcode( WorldPacket & recv_data )
     /********************/
 
     // everything is fine, do it
+    sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->RemoveRole(ROLE_LEADER);
     group->ChangeLeader(guid);
 }
 
-void WorldSession::HandleGroupDisbandOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleGroupDisbandOpcode(WorldPacket& /*recv_data*/)
 {
-    if(!GetPlayer()->GetGroup())
+    if (!GetPlayer()->GetGroupGuid())
         return;
 
-    if(_player->InBattleGround())
+    if (_player->InBattleGround())
     {
         SendPartyResult(PARTY_OP_INVITE, "", ERR_INVITE_RESTRICTED);
         return;
     }
 
-    /** error handling **/
-    /********************/
+    DEBUG_LOG("WorldSession::HandleGroupDisbandOpcode: %s tried to disband group",GetPlayer()->GetObjectGuid().GetString().c_str());
 
     // everything is fine, do it
     SendPartyResult(PARTY_OP_LEAVE, GetPlayer()->GetName(), ERR_PARTY_RESULT_OK);
@@ -360,7 +415,7 @@ void WorldSession::HandleGroupDisbandOpcode( WorldPacket & /*recv_data*/ )
     GetPlayer()->RemoveFromGroup();
 }
 
-void WorldSession::HandleLootMethodOpcode( WorldPacket & recv_data )
+void WorldSession::HandleLootMethodOpcode(WorldPacket& recv_data)
 {
     uint32 lootMethod;
     ObjectGuid lootMaster;
@@ -383,12 +438,12 @@ void WorldSession::HandleLootMethodOpcode( WorldPacket & recv_data )
     group->SendUpdate();
 }
 
-void WorldSession::HandleLootRoll( WorldPacket &recv_data )
+void WorldSession::HandleLootRoll(WorldPacket& recv_data)
 {
     ObjectGuid lootedTarget;
     uint32 itemSlot;
     uint8  rollType;
-    recv_data >> lootedTarget;                              //guid of the item rolled
+    recv_data >> lootedTarget;                                  //guid of the item rolled
     recv_data >> itemSlot;
     recv_data >> rollType;
 
@@ -402,7 +457,7 @@ void WorldSession::HandleLootRoll( WorldPacket &recv_data )
         return;
 
     // everything is fine, do it, if false then some cheating problem found
-    if(!group->CountRollVote(GetPlayer(), lootedTarget, itemSlot, RollVote(rollType)))
+    if (!group->CountRollVote(GetPlayer(), lootedTarget, itemSlot, RollVote(rollType)))
         return;
 
     switch (rollType)
@@ -423,7 +478,7 @@ void WorldSession::HandleMinimapPingOpcode(WorldPacket& recv_data)
     recv_data >> x;
     recv_data >> y;
 
-    if(!GetPlayer()->GetGroup())
+    if (!GetPlayer()->GetGroup())
         return;
 
     //DEBUG_LOG("Received opcode MSG_MINIMAP_PING X: %f, Y: %f", x, y);
@@ -446,7 +501,7 @@ void WorldSession::HandleRandomRollOpcode(WorldPacket& recv_data)
     recv_data >> maximum;
 
     /** error handling **/
-    if(minimum > maximum || maximum > 10000)                // < 32768 for urand call
+    if (minimum > maximum || maximum > 10000)                // < 32768 for urand call
         return;
     /********************/
 
@@ -460,26 +515,26 @@ void WorldSession::HandleRandomRollOpcode(WorldPacket& recv_data)
     data << uint32(maximum);
     data << uint32(roll);
     data << GetPlayer()->GetObjectGuid();
-    if(GetPlayer()->GetGroup())
+    if (GetPlayer()->GetGroup())
         GetPlayer()->GetGroup()->BroadcastPacket(&data, false);
     else
         SendPacket(&data);
 }
 
-void WorldSession::HandleRaidTargetUpdateOpcode( WorldPacket & recv_data )
+void WorldSession::HandleRaidTargetUpdateOpcode(WorldPacket& recv_data)
 {
     uint8  x;
     recv_data >> x;
 
     Group *group = GetPlayer()->GetGroup();
-    if(!group)
+    if (!group)
         return;
 
     /** error handling **/
     /********************/
 
     // everything is fine, do it
-    if(x == 0xFF)                                           // target icon request
+    if (x == 0xFF)                                           // target icon request
     {
         group->SendTargetIconList(this);
     }
@@ -496,13 +551,13 @@ void WorldSession::HandleRaidTargetUpdateOpcode( WorldPacket & recv_data )
     }
 }
 
-void WorldSession::HandleGroupRaidConvertOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleGroupRaidConvertOpcode(WorldPacket& /*recv_data*/)
 {
-    Group *group = GetPlayer()->GetGroup();
-    if(!group)
+    Group* group = GetPlayer()->GetGroup();
+    if (!group)
         return;
 
-    if(_player->InBattleGround())
+    if (_player->InBattleGround())
         return;
 
     /** error handling **/
@@ -510,12 +565,15 @@ void WorldSession::HandleGroupRaidConvertOpcode( WorldPacket & /*recv_data*/ )
         return;
     /********************/
 
+    if (group->isLFDGroup())
+        return;
+
     // everything is fine, do it (is it 0 (PARTY_OP_INVITE) correct code)
     SendPartyResult(PARTY_OP_INVITE, "", ERR_PARTY_RESULT_OK);
     group->ConvertToRaid();
 }
 
-void WorldSession::HandleGroupChangeSubGroupOpcode( WorldPacket & recv_data )
+void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket& recv_data)
 {
     std::string name;
     uint8 groupNr;
@@ -527,8 +585,8 @@ void WorldSession::HandleGroupChangeSubGroupOpcode( WorldPacket & recv_data )
         return;
 
     // we will get correct pointer for group here, so we don't have to check if group is BG raid
-    Group *group = GetPlayer()->GetGroup();
-    if(!group)
+    Group* group = GetPlayer()->GetGroup();
+    if (!group)
         return;
 
     /** error handling **/
@@ -545,20 +603,23 @@ void WorldSession::HandleGroupChangeSubGroupOpcode( WorldPacket & recv_data )
         group->ChangeMembersGroup(player, groupNr);
     else
     {
-        if (ObjectGuid guid = sObjectMgr.GetPlayerGuidByName(name.c_str()))
+        if (ObjectGuid guid = sAccountMgr.GetPlayerGuidByName(name.c_str()))
             group->ChangeMembersGroup(guid, groupNr);
     }
 }
 
-void WorldSession::HandleGroupAssistantLeaderOpcode( WorldPacket & recv_data )
+void WorldSession::HandleGroupAssistantLeaderOpcode(WorldPacket& recv_data)
 {
     ObjectGuid guid;
-    uint8 flag;
+    uint8 apply;
     recv_data >> guid;
-    recv_data >> flag;
+    recv_data >> apply;
+
+    DEBUG_LOG("CMSG_GROUP_ASSISTANT_LEADER: guid %u, apply %u",guid.GetCounter(),apply);
 
     Group *group = GetPlayer()->GetGroup();
-    if (!group)
+
+    if (!group || !group->isRaidGroup())                    // Only raid groups may have assistant
         return;
 
     /** error handling **/
@@ -567,10 +628,10 @@ void WorldSession::HandleGroupAssistantLeaderOpcode( WorldPacket & recv_data )
     /********************/
 
     // everything is fine, do it
-    group->SetAssistant(guid, (flag==0?false:true));
+    group->SetGroupUniqueFlag(guid, GROUP_ASSIGN_ASSISTANT, apply);
 }
 
-void WorldSession::HandlePartyAssignmentOpcode( WorldPacket & recv_data )
+void WorldSession::HandlePartyAssignmentOpcode(WorldPacket& recv_data)
 {
     uint8 role;
     uint8 apply;
@@ -578,42 +639,27 @@ void WorldSession::HandlePartyAssignmentOpcode( WorldPacket & recv_data )
     recv_data >> role >> apply;                             // role 0 = Main Tank, 1 = Main Assistant
     recv_data >> guid;
 
-    DEBUG_LOG("MSG_PARTY_ASSIGNMENT");
+    DEBUG_LOG("MSG_PARTY_ASSIGNMENT: guid %u, role %u, apply %u",guid.GetCounter(),role,apply);
 
-    Group *group = GetPlayer()->GetGroup();
-    if (!group)
+    Group* group = GetPlayer()->GetGroup();
+
+    if (!group || !group->isRaidGroup())                    // Only raid groups may have mainassistant/maintank
         return;
 
     /** error handling **/
-    if (!group->IsLeader(GetPlayer()->GetObjectGuid()))
+    if (!group->IsLeader(GetPlayer()->GetObjectGuid()) && !group->IsAssistant(GetPlayer()->GetObjectGuid()))
         return;
     /********************/
 
-    // everything is fine, do it
-    if (apply)
-    {
-        switch(role)
-        {
-            case 0: group->SetMainTank(guid); break;
-            case 1: group->SetMainAssistant(guid); break;
-            default: break;
-        }
-    }
-    else
-    {
-        if (group->GetMainTankGuid() == guid)
-            group->SetMainTank(ObjectGuid());
-        if (group->GetMainAssistantGuid() == guid)
-            group->SetMainAssistant(ObjectGuid());
-    }
+    group->SetGroupUniqueFlag(guid, GroupFlagsAssignment(role), apply);
 }
 
-void WorldSession::HandleRaidReadyCheckOpcode( WorldPacket & recv_data )
+void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket& recv_data)
 {
-    if(recv_data.empty())                                   // request
+    if (recv_data.empty())                                   // request
     {
         Group *group = GetPlayer()->GetGroup();
-        if(!group)
+        if (!group)
             return;
 
         /** error handling **/
@@ -635,7 +681,7 @@ void WorldSession::HandleRaidReadyCheckOpcode( WorldPacket & recv_data )
         recv_data >> state;
 
         Group *group = GetPlayer()->GetGroup();
-        if(!group)
+        if (!group)
             return;
 
         // everything is fine, do it
@@ -646,19 +692,19 @@ void WorldSession::HandleRaidReadyCheckOpcode( WorldPacket & recv_data )
     }
 }
 
-void WorldSession::HandleRaidReadyCheckFinishedOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleRaidReadyCheckFinishedOpcode(WorldPacket& /*recv_data*/)
 {
     //Group* group = GetPlayer()->GetGroup();
-    //if(!group)
+    //if (!group)
     //    return;
 
-    //if(!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID()))
+    //if (!group->IsLeader(GetPlayer()->GetObjectGuid()) && !group->IsAssistant(GetPlayer()->GetObjectGuid()))
     //    return;
 
     // Is any reaction need?
 }
 
-void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacket *data)
+void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacket* data)
 {
     uint32 mask = player->GetGroupUpdateFlag();
 
@@ -670,19 +716,40 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
 
     uint32 byteCount = 0;
     for (int i = 1; i < GROUP_UPDATE_FLAGS_COUNT; ++i)
+    {
         if (mask & (1 << i))
             byteCount += GroupUpdateLength[i];
+    }
 
-    data->Initialize(SMSG_PARTY_MEMBER_STATS, 8 + 4 + byteCount);
+    data->Initialize(SMSG_PARTY_MEMBER_STATS, player->GetPackGUID().size() + 4 + byteCount);
     *data << player->GetPackGUID();
     *data << uint32(mask);
 
     if (mask & GROUP_UPDATE_FLAG_STATUS)
     {
+        uint16 playerStatus = MEMBER_STATUS_ONLINE;
+
         if (player->IsPvP())
-            *data << uint16(MEMBER_STATUS_ONLINE | MEMBER_STATUS_PVP);
-        else
-            *data << uint16(MEMBER_STATUS_ONLINE);
+            playerStatus |= MEMBER_STATUS_PVP;
+
+        if (!player->isAlive())
+        {
+            if (player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
+                playerStatus |= MEMBER_STATUS_GHOST;
+            else
+                playerStatus |= MEMBER_STATUS_DEAD;
+        }
+
+        if (player->IsFFAPvP())
+            playerStatus |= MEMBER_STATUS_PVP_FFA;
+
+        if (player->isAFK())
+            playerStatus |= MEMBER_STATUS_AFK;
+
+        if (player->isDND())
+            playerStatus |= MEMBER_STATUS_DND;
+
+        *data << uint16(playerStatus);
     }
 
     if (mask & GROUP_UPDATE_FLAG_CUR_HP)
@@ -691,7 +758,8 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
     if (mask & GROUP_UPDATE_FLAG_MAX_HP)
         *data << uint32(player->GetMaxHealth());
 
-    Powers powerType = player->getPowerType();
+    Powers powerType = player->GetPowerType();
+
     if (mask & GROUP_UPDATE_FLAG_POWER_TYPE)
         *data << uint8(powerType);
 
@@ -712,100 +780,72 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
 
     if (mask & GROUP_UPDATE_FLAG_AURAS)
     {
-        const uint64& auramask = player->GetAuraUpdateMask();
-        *data << uint64(auramask);
-        for(uint32 i = 0; i < MAX_AURAS; ++i)
+        const uint64& auraMask = player->GetAuraUpdateMask();
+        *data << uint64(auraMask);
+        for (uint32 i = 0; i < MAX_AURAS; ++i)
         {
-            if(auramask & (uint64(1) << i))
+            if (auraMask & (uint64(1) << i))
             {
-                *data << uint32(player->GetVisibleAura(i));
-                *data << uint8(1);
+                SpellAuraHolderPtr holder = player->GetVisibleAura(i);
+                *data << uint32(holder ? holder->GetId() : 0);
+                *data << uint8(holder ? holder->GetAuraFlags() : 0);
             }
         }
     }
 
-    Pet *pet = player->GetPet();
+    Pet* pet = player->GetPet();
+
     if (mask & GROUP_UPDATE_FLAG_PET_GUID)
         *data << (pet ? pet->GetObjectGuid() : ObjectGuid());
 
     if (mask & GROUP_UPDATE_FLAG_PET_NAME)
-    {
-        if(pet)
-            *data << pet->GetName();
-        else
-            *data << uint8(0);
-    }
+        *data << (pet ? pet->GetName() : uint8(0));
 
     if (mask & GROUP_UPDATE_FLAG_PET_MODEL_ID)
-    {
-        if(pet)
-            *data << uint16(pet->GetDisplayId());
-        else
-            *data << uint16(0);
-    }
+        *data << uint16(pet ? pet->GetDisplayId() : 0);
 
     if (mask & GROUP_UPDATE_FLAG_PET_CUR_HP)
-    {
-        if(pet)
-            *data << uint32(pet->GetHealth());
-        else
-            *data << uint32(0);
-    }
+        *data << uint32(pet ? pet->GetHealth() : 0);
 
     if (mask & GROUP_UPDATE_FLAG_PET_MAX_HP)
-    {
-        if(pet)
-            *data << uint32(pet->GetMaxHealth());
-        else
-            *data << uint32(0);
-    }
+        *data << uint32(pet ? pet->GetMaxHealth() : 0);
 
     if (mask & GROUP_UPDATE_FLAG_PET_POWER_TYPE)
-    {
-        if(pet)
-            *data << uint8(pet->getPowerType());
-        else
-            *data << uint8(0);
-    }
+        *data << uint8(pet ? pet->GetPowerType() : 0);
 
     if (mask & GROUP_UPDATE_FLAG_PET_CUR_POWER)
-    {
-        if(pet)
-            *data << uint16(pet->GetPower(pet->getPowerType()));
-        else
-            *data << uint16(0);
-    }
+        *data << uint16(pet ? pet->GetPower(pet->GetPowerType()) : 0);
 
     if (mask & GROUP_UPDATE_FLAG_PET_MAX_POWER)
-    {
-        if(pet)
-            *data << uint16(pet->GetMaxPower(pet->getPowerType()));
-        else
-            *data << uint16(0);
-    }
+        *data << uint16(pet ? pet->GetMaxPower(pet->GetPowerType()) : 0);
 
     if (mask & GROUP_UPDATE_FLAG_PET_AURAS)
     {
-        if(pet)
+        if (pet)
         {
+            MAPLOCK_READ(pet, MAP_LOCK_TYPE_AURAS);
             const uint64& auramask = pet->GetAuraUpdateMask();
             *data << uint64(auramask);
-            for(uint32 i = 0; i < MAX_AURAS; ++i)
+            for (uint32 i = 0; i < MAX_AURAS; ++i)
             {
-                if(auramask & (uint64(1) << i))
+                if (auramask & (uint64(1) << i))
                 {
-                    *data << uint32(pet->GetVisibleAura(i));
-                    *data << uint8(1);
+                    SpellAuraHolderPtr holder = pet->GetVisibleAura(i);
+                    *data << uint32(holder ? holder->GetId() : 0);
+                    *data << uint8(holder ? holder->GetAuraFlags() : 0);
                 }
             }
         }
         else
             *data << uint64(0);
     }
+
+    if (mask & GROUP_UPDATE_FLAG_VEHICLE_SEAT)
+        *data << uint32(player->m_movementInfo.GetTransportDBCSeat());
 }
 
-/*this procedure handles clients CMSG_REQUEST_PARTY_MEMBER_STATS request*/
-void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
+// this procedure handles clients CMSG_REQUEST_PARTY_MEMBER_STATS request
+void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received CMSG_REQUEST_PARTY_MEMBER_STATS");
     ObjectGuid guid;
@@ -814,7 +854,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
     Player* player = ObjectAccessor::FindPlayer(guid, false);
     if (!player)
     {
-        WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 3+4+2);
+        WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 1 + 8 + 4 + 2);
         data << uint8(0);                                   // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related
         data << guid.WriteAsPacked();
         data << uint32(GROUP_UPDATE_FLAG_STATUS);
@@ -823,27 +863,60 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
         return;
     }
 
-    Pet *pet = player->GetPet();
+    Powers powerType = player->GetPowerType();
 
-    WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 4+2+2+2+1+2*6+8+1+8);
-    data << uint8(0);                                       // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related
-    data << player->GetPackGUID();
+    uint32 updateFlags = GROUP_UPDATE_FLAG_STATUS | GROUP_UPDATE_FLAG_CUR_HP | GROUP_UPDATE_FLAG_MAX_HP |
+        GROUP_UPDATE_FLAG_CUR_POWER | GROUP_UPDATE_FLAG_MAX_POWER | GROUP_UPDATE_FLAG_LEVEL |
+        GROUP_UPDATE_FLAG_ZONE | GROUP_UPDATE_FLAG_POSITION | GROUP_UPDATE_FLAG_AURAS |
+        GROUP_UPDATE_FLAG_PET_NAME | GROUP_UPDATE_FLAG_PET_MODEL_ID | GROUP_UPDATE_FLAG_PET_AURAS;
 
-    uint32 mask1 = 0x00040BFF;                              // common mask, real flags used 0x000040BFF
-    if(pet)
-        mask1 = 0x7FFFFFFF;                                 // for hunters and other classes with pets
+    if (powerType != POWER_MANA)
+        updateFlags |= GROUP_UPDATE_FLAG_POWER_TYPE;
+
+    Pet* pet = player->GetPet();
+    if (pet)
+        updateFlags |= GROUP_UPDATE_FLAG_PET_GUID | GROUP_UPDATE_FLAG_PET_CUR_HP | GROUP_UPDATE_FLAG_PET_MAX_HP |
+            GROUP_UPDATE_FLAG_PET_POWER_TYPE | GROUP_UPDATE_FLAG_PET_CUR_POWER | GROUP_UPDATE_FLAG_PET_MAX_POWER;
+
+    if (player->GetVehicle())
+        updateFlags |= GROUP_UPDATE_FLAG_VEHICLE_SEAT;
+
+    uint16 playerStatus = player->IsReferAFriendLinked(player) ? (MEMBER_STATUS_ONLINE | MEMBER_STATUS_RAF) : MEMBER_STATUS_ONLINE;
+
+    if (player->IsPvP())
+        playerStatus |= MEMBER_STATUS_PVP;
+
+    if (!player->isAlive())
+    {
+        if (player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
+            playerStatus |= MEMBER_STATUS_GHOST;
+        else
+            playerStatus |= MEMBER_STATUS_DEAD;
+    }
 
-    Powers powerType = player->getPowerType();
-    data << uint32(mask1);                                  // group update mask
-    data << uint16(MEMBER_STATUS_ONLINE);                   // member's online status
+    if (player->IsFFAPvP())
+        playerStatus |= MEMBER_STATUS_PVP_FFA;
+
+    if (player->isAFK())
+        playerStatus |= MEMBER_STATUS_AFK;
+
+    if (player->isDND())
+        playerStatus |= MEMBER_STATUS_DND;
+
+    WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 255);
+    data << uint8(0);                                       // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related
+    data << player->GetPackGUID();
+    data << uint32(updateFlags);
+    data << uint16(playerStatus);                           // GROUP_UPDATE_FLAG_STATUS
     data << uint32(player->GetHealth());                    // GROUP_UPDATE_FLAG_CUR_HP
     data << uint32(player->GetMaxHealth());                 // GROUP_UPDATE_FLAG_MAX_HP
-    data << uint8(powerType);                               // GROUP_UPDATE_FLAG_POWER_TYPE
+    if (updateFlags & GROUP_UPDATE_FLAG_POWER_TYPE)
+        data << uint8(powerType);
     data << uint16(player->GetPower(powerType));            // GROUP_UPDATE_FLAG_CUR_POWER
     data << uint16(player->GetMaxPower(powerType));         // GROUP_UPDATE_FLAG_MAX_POWER
     data << uint16(player->getLevel());                     // GROUP_UPDATE_FLAG_LEVEL
 
-    //verify player coordinates and zoneid to send to teammates
+    // verify player coordinates and zoneid to send to teammates
     uint16 iZoneId = 0;
     uint16 iCoordX = 0;
     uint16 iCoordY = 0;
@@ -857,13 +930,9 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
     else if (player->IsBeingTeleported())               // Player is in teleportation
     {
         WorldLocation& loc = player->GetTeleportDest(); // So take teleportation destination
-        iZoneId = sTerrainMgr.GetZoneId(loc.mapid, loc.coord_x, loc.coord_y, loc.coord_z);
-        iCoordX = loc.coord_x;
-        iCoordY = loc.coord_y;
-    }
-    else
-    {
-        //unknown player status.
+        iZoneId = sTerrainMgr.GetZoneId(loc.GetMapId(), loc.x, loc.y, loc.z);
+        iCoordX = loc.x;
+        iCoordY = loc.y;
     }
 
     data << uint16(iZoneId);                              // GROUP_UPDATE_FLAG_ZONE
@@ -873,59 +942,63 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
     uint64 auramask = 0;
     size_t maskPos = data.wpos();
     data << uint64(auramask);                               // placeholder
-    for(uint8 i = 0; i < MAX_AURAS; ++i)
+    for (uint8 i = 0; i < MAX_AURAS; ++i)
     {
-        if(uint32 aura = player->GetVisibleAura(i))
+        if (SpellAuraHolderPtr holder = player->GetVisibleAura(i))
         {
             auramask |= (uint64(1) << i);
-            data << uint32(aura);
-            data << uint8(1);
+            data << uint32(holder->GetId());
+            data << uint8(holder->GetAuraFlags());
         }
     }
     data.put<uint64>(maskPos, auramask);                    // GROUP_UPDATE_FLAG_AURAS
 
     if(pet)
     {
-        Powers petpowertype = pet->getPowerType();
+        Powers petPowerType = pet->GetPowerType();
         data << pet->GetObjectGuid();                       // GROUP_UPDATE_FLAG_PET_GUID
         data << pet->GetName();                             // GROUP_UPDATE_FLAG_PET_NAME
         data << uint16(pet->GetDisplayId());                // GROUP_UPDATE_FLAG_PET_MODEL_ID
         data << uint32(pet->GetHealth());                   // GROUP_UPDATE_FLAG_PET_CUR_HP
         data << uint32(pet->GetMaxHealth());                // GROUP_UPDATE_FLAG_PET_MAX_HP
-        data << uint8(petpowertype);                        // GROUP_UPDATE_FLAG_PET_POWER_TYPE
-        data << uint16(pet->GetPower(petpowertype));        // GROUP_UPDATE_FLAG_PET_CUR_POWER
-        data << uint16(pet->GetMaxPower(petpowertype));     // GROUP_UPDATE_FLAG_PET_MAX_POWER
+        data << uint8(petPowerType);                        // GROUP_UPDATE_FLAG_PET_POWER_TYPE
+        data << uint16(pet->GetPower(petPowerType));        // GROUP_UPDATE_FLAG_PET_CUR_POWER
+        data << uint16(pet->GetMaxPower(petPowerType));     // GROUP_UPDATE_FLAG_PET_MAX_POWER
 
-        uint64 petauramask = 0;
+        uint64 petAuraMask = 0;
         size_t petMaskPos = data.wpos();
-        data << uint64(petauramask);                        // placeholder
-        for(uint8 i = 0; i < MAX_AURAS; ++i)
+        data << uint64(petAuraMask);                        // placeholder
+        for (uint8 i = 0; i < MAX_AURAS; ++i)
         {
-            if(uint32 petaura = pet->GetVisibleAura(i))
+            if (SpellAuraHolderPtr holder = pet->GetVisibleAura(i))
             {
-                petauramask |= (uint64(1) << i);
-                data << uint32(petaura);
-                data << uint8(1);
+                petAuraMask |= (uint64(1) << i);
+                data << uint32(holder->GetId());
+                data << uint8(holder->GetAuraFlags());
             }
         }
-        data.put<uint64>(petMaskPos, petauramask);          // GROUP_UPDATE_FLAG_PET_AURAS
+        data.put<uint64>(petMaskPos, petAuraMask);          // GROUP_UPDATE_FLAG_PET_AURAS
     }
     else
     {
         data << uint8(0);                                   // GROUP_UPDATE_FLAG_PET_NAME
+        data << uint16(0);                                  // GROUP_UPDATE_FLAG_PET_MODEL_ID
         data << uint64(0);                                  // GROUP_UPDATE_FLAG_PET_AURAS
     }
 
+    if (updateFlags & GROUP_UPDATE_FLAG_VEHICLE_SEAT)
+        data << uint32(player->m_movementInfo.GetTransportDBCSeat());
+
     SendPacket(&data);
 }
 
-void WorldSession::HandleRequestRaidInfoOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleRequestRaidInfoOpcode(WorldPacket& /*recv_data*/)
 {
     // every time the player checks the character screen
     _player->SendRaidInfo();
 }
 
-void WorldSession::HandleOptOutOfLootOpcode( WorldPacket & recv_data )
+void WorldSession::HandleOptOutOfLootOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received CMSG_OPT_OUT_OF_LOOT");
 
@@ -933,7 +1006,7 @@ void WorldSession::HandleOptOutOfLootOpcode( WorldPacket & recv_data )
     recv_data >> unkn;
 
     // ignore if player not loaded
-    if(!GetPlayer())                                        // needed because STATUS_AUTHED
+    if (!GetPlayer())                                        // needed because STATUS_AUTHED
     {
         if(unkn != 0)
             sLog.outError("CMSG_GROUP_PASS_ON_LOOT value<>0 for not-loaded character!");
@@ -944,7 +1017,7 @@ void WorldSession::HandleOptOutOfLootOpcode( WorldPacket & recv_data )
         sLog.outError("CMSG_GROUP_PASS_ON_LOOT: activation not implemented!");
 }
 
-void WorldSession::HandleSetAllowLowLevelRaidOpcode( WorldPacket & recv_data )
+void WorldSession::HandleSetAllowLowLevelRaidOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received CMSG_SET_ALLOW_LOW_LEVEL_RAID: %4X", recv_data.GetOpcode());
 
diff --git a/src/game/GroupRefManager.h b/src/game/GroupRefManager.h
index f7456653ef9..162612c4f6c 100644
--- a/src/game/GroupRefManager.h
+++ b/src/game/GroupRefManager.h
@@ -28,6 +28,7 @@ class GroupReference;
 class GroupRefManager : public RefManager<Group, Player>
 {
     public:
-        GroupReference* getFirst() { return ((GroupReference* ) RefManager<Group, Player>::getFirst()); }
+        GroupReference* getFirst() { return ((GroupReference*) RefManager<Group, Player>::getFirst()); }
+        GroupReference const* getFirst() const { return ((GroupReference const*) RefManager<Group, Player>::getFirst()); }
 };
 #endif
diff --git a/src/game/GroupReference.h b/src/game/GroupReference.h
index 6c3a7e73823..f8f0df97e6c 100644
--- a/src/game/GroupReference.h
+++ b/src/game/GroupReference.h
@@ -34,7 +34,8 @@ class MANGOS_DLL_SPEC GroupReference : public Reference<Group, Player>
     public:
         GroupReference() : Reference<Group, Player>(), iSubGroup(0) {}
         ~GroupReference() { unlink(); }
-        GroupReference *next() { return (GroupReference*)Reference<Group, Player>::next(); }
+        GroupReference* next() { return (GroupReference*)Reference<Group, Player>::next(); }
+        GroupReference const* next() const { return (GroupReference const*)Reference<Group, Player>::next(); }
         uint8 getSubGroup() const { return iSubGroup; }
         void setSubGroup(uint8 pSubGroup) { iSubGroup = pSubGroup; }
 };
diff --git a/src/game/GuardAI.cpp b/src/game/GuardAI.cpp
index 92258c05682..3aba31bf4dc 100644
--- a/src/game/GuardAI.cpp
+++ b/src/game/GuardAI.cpp
@@ -22,7 +22,7 @@
 #include "Player.h"
 #include "World.h"
 
-int GuardAI::Permissible(const Creature *creature)
+int GuardAI::Permissible(const Creature* creature)
 {
     if (creature->IsGuard())
         return PERMIT_BASE_SPECIAL;
@@ -30,26 +30,25 @@ int GuardAI::Permissible(const Creature *creature)
     return PERMIT_BASE_NO;
 }
 
-GuardAI::GuardAI(Creature *c) : CreatureAI(c), i_state(STATE_NORMAL), i_tracker(TIME_INTERVAL_LOOK)
+GuardAI::GuardAI(Creature* c) : CreatureAI(c), i_state(STATE_NORMAL), i_tracker(TIME_INTERVAL_LOOK)
 {
 }
 
-void GuardAI::MoveInLineOfSight(Unit *u)
+void GuardAI::MoveInLineOfSight(Unit* u)
 {
     // Ignore Z for flying creatures
     if (!m_creature->CanFly() && m_creature->GetDistanceZ(u) > CREATURE_Z_ATTACK_RANGE)
         return;
 
     if (!m_creature->getVictim() && u->isTargetableForAttack() &&
-        ( u->IsHostileToPlayers() || m_creature->IsHostileTo(u) /*|| u->getVictim() && m_creature->IsFriendlyTo(u->getVictim())*/ ) &&
-        u->isInAccessablePlaceFor(m_creature))
+            (u->IsHostileToPlayers() || m_creature->IsHostileTo(u) /*|| u->getVictim() && m_creature->IsFriendlyTo(u->getVictim())*/) &&
+            u->isInAccessablePlaceFor(m_creature))
     {
         float attackRadius = m_creature->GetAttackDistance(u);
-        if (m_creature->IsWithinDistInMap(u,attackRadius))
+        if (m_creature->IsWithinDistInMap(u, attackRadius))
         {
-            //Need add code to let guard support player
+            // Need add code to let guard support player
             AttackStart(u);
-            u->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
         }
     }
 }
@@ -93,15 +92,11 @@ void GuardAI::EnterEvadeMode()
         DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Creature stopped attacking, victim out run him [guid=%u]", m_creature->GetGUIDLow());
     }
 
-    m_creature->RemoveAllAuras();
+    m_creature->RemoveAllAurasOnEvade();
     m_creature->DeleteThreatList();
     i_victimGuid.Clear();
     m_creature->CombatStop(true);
     i_state = STATE_NORMAL;
-
-    // Remove ChaseMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead
-    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
-        m_creature->GetMotionMaster()->MoveTargetedHome();
 }
 
 void GuardAI::UpdateAI(const uint32 /*diff*/)
@@ -115,30 +110,30 @@ void GuardAI::UpdateAI(const uint32 /*diff*/)
     DoMeleeAttackIfReady();
 }
 
-bool GuardAI::IsVisible(Unit *pl) const
+bool GuardAI::IsVisible(Unit* pl) const
 {
-    return m_creature->IsWithinDist(pl,sWorld.getConfig(CONFIG_FLOAT_SIGHT_GUARDER))
-        && pl->isVisibleForOrDetect(m_creature,m_creature,true);
+    return m_creature->IsWithinDist(pl, sWorld.getConfig(CONFIG_FLOAT_SIGHT_GUARDER))
+           && pl->isVisibleForOrDetect(m_creature, m_creature, true);
 }
 
-void GuardAI::AttackStart(Unit *u)
+void GuardAI::AttackStart(Unit* u)
 {
-    if( !u )
+    if (!u)
         return;
 
-    if(m_creature->Attack(u,true))
+    if (m_creature->Attack(u, true))
     {
         i_victimGuid = u->GetObjectGuid();
         m_creature->AddThreat(u);
         m_creature->SetInCombatWith(u);
         u->SetInCombatWith(m_creature);
 
-        m_creature->GetMotionMaster()->MoveChase(u);
+        HandleMovementOnAttackStart(u);
     }
 }
 
-void GuardAI::JustDied(Unit *killer)
+void GuardAI::JustDied(Unit* killer)
 {
-    if(Player* pkiller = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
+    if (Player* pkiller = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
         m_creature->SendZoneUnderAttackMessage(pkiller);
 }
diff --git a/src/game/GuardAI.h b/src/game/GuardAI.h
index 1bec3119988..b109a5c7581 100644
--- a/src/game/GuardAI.h
+++ b/src/game/GuardAI.h
@@ -27,24 +27,24 @@ class Creature;
 
 class MANGOS_DLL_DECL GuardAI : public CreatureAI
 {
-    enum GuardState
-    {
-        STATE_NORMAL = 1,
-        STATE_LOOK_AT_VICTIM = 2
-    };
+        enum GuardState
+        {
+            STATE_NORMAL = 1,
+            STATE_LOOK_AT_VICTIM = 2
+        };
 
     public:
 
-        explicit GuardAI(Creature *c);
+        explicit GuardAI(Creature* c);
 
-        void MoveInLineOfSight(Unit *);
-        void AttackStart(Unit *);
+        void MoveInLineOfSight(Unit*);
+        void AttackStart(Unit*);
         void EnterEvadeMode();
-        void JustDied(Unit *);
-        bool IsVisible(Unit *) const;
+        void JustDied(Unit*);
+        bool IsVisible(Unit*) const;
 
         void UpdateAI(const uint32);
-        static int Permissible(const Creature *);
+        static int Permissible(const Creature*);
 
     private:
         ObjectGuid i_victimGuid;
diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp
index f845f0f816c..5a7ff0569b0 100644
--- a/src/game/Guild.cpp
+++ b/src/game/Guild.cpp
@@ -29,6 +29,7 @@
 #include "Util.h"
 #include "Language.h"
 #include "World.h"
+#include "Calendar.h"
 
 //// MemberSlot ////////////////////////////////////////////
 void MemberSlot::SetMemberStats(Player* player)
@@ -66,7 +67,7 @@ void MemberSlot::ChangeRank(uint32 newRank)
 {
     RankId = newRank;
 
-    Player *player = sObjectMgr.GetPlayer(guid);
+    Player* player = sObjectMgr.GetPlayer(guid);
     // If player not online data in data field will be loaded from guild tabs no need to update it !!
     if (player)
         player->SetRank(newRank);
@@ -91,16 +92,20 @@ Guild::Guild()
     m_CreatedDate = 0;
 
     m_GuildBankMoney = 0;
+    m_PurchasedTabs = 0;
 
     m_GuildEventLogNextGuid = 0;
     m_GuildBankEventLogNextGuid_Money = 0;
     for (uint8 i = 0; i < GUILD_BANK_MAX_TABS; ++i)
         m_GuildBankEventLogNextGuid_Item[i] = 0;
+
+    m_loadState = GBLS_NOT_LOADED;
+    m_onlineMembers = 0;
 }
 
 Guild::~Guild()
 {
-    DeleteGuildBankItems();
+    UnloadGuildBank();
 }
 
 bool Guild::Create(Player* leader, std::string gname)
@@ -117,6 +122,7 @@ bool Guild::Create(Player* leader, std::string gname)
     GINFO = "";
     MOTD = "No message set.";
     m_GuildBankMoney = 0;
+    m_PurchasedTabs = 0;
     m_Id = sObjectMgr.GenerateGuildId();
     m_CreatedDate = time(0);
 
@@ -134,8 +140,8 @@ bool Guild::Create(Player* leader, std::string gname)
     // CharacterDatabase.PExecute("DELETE FROM guild WHERE guildid='%u'", Id); - MAX(guildid)+1 not exist
     CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guildid='%u'", m_Id);
     CharacterDatabase.PExecute("INSERT INTO guild (guildid,name,leaderguid,info,motd,createdate,EmblemStyle,EmblemColor,BorderStyle,BorderColor,BackgroundColor,BankMoney) "
-        "VALUES('%u','%s','%u', '%s', '%s','" UI64FMTD "','%u','%u','%u','%u','%u','" UI64FMTD "')",
-        m_Id, gname.c_str(), m_LeaderGuid.GetCounter(), dbGINFO.c_str(), dbMOTD.c_str(), uint64(m_CreatedDate), m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor, m_BackgroundColor, m_GuildBankMoney);
+                               "VALUES('%u','%s','%u', '%s', '%s','" UI64FMTD "','%u','%u','%u','%u','%u','" UI64FMTD "')",
+                               m_Id, gname.c_str(), m_LeaderGuid.GetCounter(), dbGINFO.c_str(), dbMOTD.c_str(), uint64(m_CreatedDate), m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor, m_BackgroundColor, m_GuildBankMoney);
     CharacterDatabase.CommitTransaction();
 
     CreateDefaultGuildRanks(lSession->GetSessionDbLocaleIndex());
@@ -193,19 +199,20 @@ bool Guild::AddMember(ObjectGuid plGuid, uint32 plRank)
     else
     {
         //                                                     0    1     2     3    4
-        QueryResult *result = CharacterDatabase.PQuery("SELECT name,level,class,zone,account FROM characters WHERE guid = '%u'", lowguid);
+        QueryResult* result = CharacterDatabase.PQuery("SELECT name,level,class,zone,account FROM characters WHERE guid = '%u'", lowguid);
         if (!result)
             return false;                                   // player doesn't exist
 
-        Field *fields    = result->Fetch();
+        Field* fields    = result->Fetch();
         newmember.Name   = fields[0].GetCppString();
         newmember.Level  = fields[1].GetUInt8();
         newmember.Class  = fields[2].GetUInt8();
         newmember.ZoneId = fields[3].GetUInt32();
         newmember.accountId = fields[4].GetInt32();
         delete result;
+
         if (newmember.Level < 1 || newmember.Level > STRONG_MAX_LEVEL ||
-            !((1 << (newmember.Class-1)) & CLASSMASK_ALL_PLAYABLE))
+                !((1 << (newmember.Class - 1)) & CLASSMASK_ALL_PLAYABLE))
         {
             sLog.outError("%s has a broken data in field `characters` table, cannot add him to guild.", plGuid.GetString().c_str());
             return false;
@@ -227,7 +234,7 @@ bool Guild::AddMember(ObjectGuid plGuid, uint32 plRank)
     CharacterDatabase.escape_string(dbOFFnote);
 
     CharacterDatabase.PExecute("INSERT INTO guild_member (guildid,guid,rank,pnote,offnote) VALUES ('%u', '%u', '%u','%s','%s')",
-        m_Id, lowguid, newmember.RankId, dbPnote.c_str(), dbOFFnote.c_str());
+                               m_Id, lowguid, newmember.RankId, dbPnote.c_str(), dbOFFnote.c_str());
 
     // If player not in game data in data field will be loaded from guild tables, no need to update it!!
     if (pl)
@@ -260,12 +267,12 @@ void Guild::SetGINFO(std::string ginfo)
     CharacterDatabase.PExecute("UPDATE guild SET info='%s' WHERE guildid='%u'", ginfo.c_str(), m_Id);
 }
 
-bool Guild::LoadGuildFromDB(QueryResult *guildDataResult)
+bool Guild::LoadGuildFromDB(QueryResult* guildDataResult)
 {
     if (!guildDataResult)
         return false;
 
-    Field *fields = guildDataResult->Fetch();
+    Field* fields = guildDataResult->Fetch();
 
     m_Id              = fields[0].GetUInt32();
     m_Name            = fields[1].GetCppString();
@@ -279,16 +286,10 @@ bool Guild::LoadGuildFromDB(QueryResult *guildDataResult)
     MOTD              = fields[9].GetCppString();
     m_CreatedDate     = time_t(fields[10].GetUInt64());
     m_GuildBankMoney  = fields[11].GetUInt64();
+    m_PurchasedTabs   = fields[12].GetUInt32();
 
-    uint32 purchasedTabs   = fields[12].GetUInt32();
-
-    if (purchasedTabs > GUILD_BANK_MAX_TABS)
-        purchasedTabs = GUILD_BANK_MAX_TABS;
-
-    m_TabListMap.resize(purchasedTabs);
-
-    for (uint8 i = 0; i < purchasedTabs; ++i)
-        m_TabListMap[i] = new GuildBankTab;
+    if (m_PurchasedTabs > GUILD_BANK_MAX_TABS)
+        m_PurchasedTabs = GUILD_BANK_MAX_TABS;
 
     return true;
 }
@@ -315,16 +316,16 @@ bool Guild::CheckGuildStructure()
     return true;
 }
 
-bool Guild::LoadRanksFromDB(QueryResult *guildRanksResult)
+bool Guild::LoadRanksFromDB(QueryResult* guildRanksResult)
 {
     if (!guildRanksResult)
     {
-        sLog.outError("Guild %u has broken `guild_rank` data, creating new...",m_Id);
+        sLog.outError("Guild %u has broken `guild_rank` data, creating new...", m_Id);
         CreateDefaultGuildRanks(0);
         return true;
     }
 
-    Field *fields;
+    Field* fields;
     bool broken_ranks = false;
 
     // GUILD RANKS are sequence starting from 0 = GUILD_MASTER (ALL PRIVILEGES) to max 9 (lowest privileges)
@@ -335,20 +336,20 @@ bool Guild::LoadRanksFromDB(QueryResult *guildRanksResult)
     do
     {
         fields = guildRanksResult->Fetch();
-        //condition that would be true when all ranks in QueryResult will be processed and guild without ranks is being processed
+        // condition that would be true when all ranks in QueryResult will be processed and guild without ranks is being processed
         if (!fields)
             break;
 
         uint32 guildId       = fields[0].GetUInt32();
         if (guildId < m_Id)
         {
-            //there is in table guild_rank record which doesn't have guildid in guild table, report error
+            // there is in table guild_rank record which doesn't have guildid in guild table, report error
             sLog.outErrorDb("Guild %u does not exist but it has a record in guild_rank table, deleting it!", guildId);
             CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid = '%u'", guildId);
             continue;
         }
 
-        if (guildId > m_Id)                                 //we loaded all ranks for this guild already, break cycle
+        if (guildId > m_Id)                                 // we loaded all ranks for this guild already, break cycle
             break;
 
         uint32 rankID        = fields[1].GetUInt32();
@@ -364,7 +365,8 @@ bool Guild::LoadRanksFromDB(QueryResult *guildRanksResult)
             rankRights |= GR_RIGHT_ALL;
 
         AddRank(rankName, rankRights, rankMoney);
-    } while( guildRanksResult->NextRow() );
+    }
+    while (guildRanksResult->NextRow());
 
     if (m_Ranks.size() < GUILD_RANKS_MIN_COUNT)             // if too few ranks, renew them
     {
@@ -379,12 +381,12 @@ bool Guild::LoadRanksFromDB(QueryResult *guildRanksResult)
         sLog.outError("Guild %u has broken `guild_rank` data, repairing...", m_Id);
         CharacterDatabase.BeginTransaction();
         CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid='%u'", m_Id);
-        for(size_t i = 0; i < m_Ranks.size(); ++i)
+        for (size_t i = 0; i < m_Ranks.size(); ++i)
         {
             std::string name = m_Ranks[i].Name;
             uint32 rights = m_Ranks[i].Rights;
             CharacterDatabase.escape_string(name);
-            CharacterDatabase.PExecute( "INSERT INTO guild_rank (guildid,rid,rname,rights) VALUES ('%u', '%u', '%s', '%u')", m_Id, uint32(i), name.c_str(), rights);
+            CharacterDatabase.PExecute("INSERT INTO guild_rank (guildid,rid,rname,rights) VALUES ('%u', '%u', '%s', '%u')", m_Id, uint32(i), name.c_str(), rights);
         }
         CharacterDatabase.CommitTransaction();
     }
@@ -392,18 +394,19 @@ bool Guild::LoadRanksFromDB(QueryResult *guildRanksResult)
     return true;
 }
 
-bool Guild::LoadMembersFromDB(QueryResult *guildMembersResult)
+bool Guild::LoadMembersFromDB(QueryResult* guildMembersResult)
 {
     if (!guildMembersResult)
         return false;
 
     do
     {
-        Field *fields = guildMembersResult->Fetch();
+        Field* fields = guildMembersResult->Fetch();
         // this condition will be true when all rows in QueryResult are processed and new guild without members is going to be loaded - prevent crash
         if (!fields)
             break;
-        uint32 guildId       = fields[0].GetUInt32();
+
+        uint32 guildId = fields[0].GetUInt32();
         if (guildId < m_Id)
         {
             // there is in table guild_member record which doesn't have guildid in guild table, report error
@@ -430,8 +433,8 @@ bool Guild::LoadMembersFromDB(QueryResult *guildMembersResult)
         newmember.BankRemMoney          = fields[6].GetUInt32();
         for (int i = 0; i < GUILD_BANK_MAX_TABS; ++i)
         {
-            newmember.BankResetTimeTab[i] = fields[7+(2*i)].GetUInt32();
-            newmember.BankRemSlotsTab[i]  = fields[8+(2*i)].GetUInt32();
+            newmember.BankResetTimeTab[i] = fields[7 + (2 * i)].GetUInt32();
+            newmember.BankRemSlotsTab[i]  = fields[8 + (2 * i)].GetUInt32();
         }
 
         newmember.Name                  = fields[19].GetCppString();
@@ -455,7 +458,7 @@ bool Guild::LoadMembersFromDB(QueryResult *guildMembersResult)
             // the zone through xy coords .. this is a bit redundant, but shouldn't be called often
             newmember.ZoneId = Player::GetZoneIdFromDB(newmember.guid);
         }
-        if (!((1 << (newmember.Class-1)) & CLASSMASK_ALL_PLAYABLE)) // can be at broken `class` field
+        if (!((1 << (newmember.Class - 1)) & CLASSMASK_ALL_PLAYABLE)) // can be at broken `class` field
         {
             sLog.outError("%s has a broken data in field `characters`.`class`, deleting him from guild!", newmember.guid.GetString().c_str());
             CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guid = '%u'", lowguid);
@@ -464,7 +467,8 @@ bool Guild::LoadMembersFromDB(QueryResult *guildMembersResult)
 
         members[lowguid]      = newmember;
 
-    } while (guildMembersResult->NextRow());
+    }
+    while (guildMembersResult->NextRow());
 
     if (members.empty())
         return false;
@@ -526,7 +530,7 @@ bool Guild::DelMember(ObjectGuid guid, bool isDisbanding)
         SetLeader(newLeaderGUID);
 
         // If player not online data in data field will be loaded from guild tabs no need to update it !!
-        if (Player *newLeader = sObjectMgr.GetPlayer(newLeaderGUID))
+        if (Player* newLeader = sObjectMgr.GetPlayer(newLeaderGUID))
             newLeader->SetRank(GR_GUILDMASTER);
 
         // when leader non-exist (at guild load with deleted leader only) not send broadcasts
@@ -539,7 +543,7 @@ bool Guild::DelMember(ObjectGuid guid, bool isDisbanding)
 
     members.erase(lowguid);
 
-    Player *player = sObjectMgr.GetPlayer(guid);
+    Player* player = sObjectMgr.GetPlayer(guid);
     // If player not online data in data field will be loaded from guild tabs no need to update it !!
     if (player)
     {
@@ -555,64 +559,102 @@ bool Guild::DelMember(ObjectGuid guid, bool isDisbanding)
     return members.empty();
 }
 
-void Guild::BroadcastToGuild(WorldSession *session, const std::string& msg, uint32 language)
+void Guild::BroadcastToGuild(WorldSession* session, const std::string& msg, uint32 language)
 {
-    if (session && session->GetPlayer() && HasRankRight(session->GetPlayer()->GetRank(),GR_RIGHT_GCHATSPEAK))
+    if (session && session->GetPlayer() && HasRankRight(session->GetPlayer()->GetRank(), GR_RIGHT_GCHATSPEAK))
     {
         WorldPacket data;
-        ChatHandler::FillMessageData(&data, session, CHAT_MSG_GUILD, language, msg.c_str());
+        ChatHandler::BuildChatPacket(data, CHAT_MSG_GUILD, msg.c_str(), Language(language), session->GetPlayer()->GetChatTag(), session->GetPlayer()->GetObjectGuid(), session->GetPlayer()->GetName());
 
         for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
         {
-            Player *pl = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
+            Player* pl = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
 
-            if (pl && pl->GetSession() && HasRankRight(pl->GetRank(),GR_RIGHT_GCHATLISTEN) && !pl->GetSocial()->HasIgnore(session->GetPlayer()->GetObjectGuid()) )
+            if (pl && pl->GetSession() && HasRankRight(pl->GetRank(), GR_RIGHT_GCHATLISTEN) && !pl->GetSocial()->HasIgnore(session->GetPlayer()->GetObjectGuid()))
                 pl->GetSession()->SendPacket(&data);
         }
     }
 }
 
-void Guild::BroadcastToOfficers(WorldSession *session, const std::string& msg, uint32 language)
+void Guild::BroadcastToOfficers(WorldSession* session, const std::string& msg, uint32 language)
 {
     if (session && session->GetPlayer() && HasRankRight(session->GetPlayer()->GetRank(), GR_RIGHT_OFFCHATSPEAK))
     {
-        for(MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
+        for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
         {
             WorldPacket data;
-            ChatHandler::FillMessageData(&data, session, CHAT_MSG_OFFICER, language, msg.c_str());
+            ChatHandler::BuildChatPacket(data, CHAT_MSG_OFFICER, msg.c_str(), Language(language), session->GetPlayer()->GetChatTag(), session->GetPlayer()->GetObjectGuid());
 
-            Player *pl = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
+            Player* pl = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
 
-            if (pl && pl->GetSession() && HasRankRight(pl->GetRank(),GR_RIGHT_OFFCHATLISTEN) && !pl->GetSocial()->HasIgnore(session->GetPlayer()->GetObjectGuid()))
+            if (pl && pl->GetSession() && HasRankRight(pl->GetRank(), GR_RIGHT_OFFCHATLISTEN) && !pl->GetSocial()->HasIgnore(session->GetPlayer()->GetObjectGuid()))
                 pl->GetSession()->SendPacket(&data);
         }
     }
 }
 
-void Guild::BroadcastPacket(WorldPacket *packet)
+void Guild::BroadcastPacket(WorldPacket* packet)
 {
-    for(MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
+    for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
     {
-        Player *player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
+        Player* player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
         if (player)
             player->GetSession()->SendPacket(packet);
     }
 }
 
-void Guild::BroadcastPacketToRank(WorldPacket *packet, uint32 rankId)
+void Guild::BroadcastPacketToRank(WorldPacket* packet, uint32 rankId)
 {
-    for(MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
+    for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
     {
         if (itr->second.RankId == rankId)
         {
-            Player *player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
+            Player* player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
             if (player)
                 player->GetSession()->SendPacket(packet);
         }
     }
 }
 
-void Guild::CreateRank(std::string name_,uint32 rights)
+// add new event to all already connected guild memebers
+void Guild::MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 maxLevel, uint32 minRank)
+{
+    uint32 count = 0;
+
+    WorldPacket data(SMSG_CALENDAR_FILTER_GUILD);
+    data << uint32(count); // count placeholder
+
+    for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
+    {
+        // not sure if needed, maybe client checks it as well
+        if (count >= CALENDAR_MAX_INVITES)
+        {
+            if (Player* player = session->GetPlayer())
+                sCalendarMgr.SendCalendarCommandResult(player->GetObjectGuid(), CALENDAR_ERROR_INVITES_EXCEEDED);
+            return;
+        }
+
+        MemberSlot const* member = &itr->second;
+        if (member->guid != session->GetPlayer()->GetObjectGuid())
+        {
+            Player* pPlayer = sObjectMgr.GetPlayer(member->guid);
+            uint32 level = pPlayer ? pPlayer->getLevel() : Player::GetLevelFromDB(member->guid);
+
+            if (level >= minLevel && level <= maxLevel && member->RankId <= minRank)
+            {
+                data << member->guid.WriteAsPacked();
+                data << uint8(level);
+                ++count;
+            }
+        }
+    }
+
+    data.put<uint32>(0, count);
+
+    session->SendPacket(&data);
+}
+
+void Guild::CreateRank(std::string name_, uint32 rights)
 {
     if (m_Ranks.size() >= GUILD_RANKS_MAX_COUNT)
         return;
@@ -631,12 +673,12 @@ void Guild::CreateRank(std::string name_,uint32 rights)
     }
     // name now can be used for encoding to DB
     CharacterDatabase.escape_string(name_);
-    CharacterDatabase.PExecute( "INSERT INTO guild_rank (guildid,rid,rname,rights) VALUES ('%u', '%u', '%s', '%u')", m_Id, new_rank_id, name_.c_str(), rights );
+    CharacterDatabase.PExecute("INSERT INTO guild_rank (guildid,rid,rname,rights) VALUES ('%u', '%u', '%s', '%u')", m_Id, new_rank_id, name_.c_str(), rights);
 }
 
-void Guild::AddRank(const std::string& name_,uint32 rights, uint32 money)
+void Guild::AddRank(const std::string& name_, uint32 rights, uint32 money)
 {
-    m_Ranks.push_back(RankInfo(name_,rights,money));
+    m_Ranks.push_back(RankInfo(name_, rights, money));
 }
 
 void Guild::DelRank()
@@ -711,8 +753,8 @@ void Guild::Disband()
     CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid = '%u'", m_Id);
     CharacterDatabase.PExecute("DELETE FROM guild_bank_tab WHERE guildid = '%u'", m_Id);
 
-    //Free bank tab used memory and delete items stored in them
-    DeleteGuildBankItems(true);
+    // Free bank tab used memory and delete items stored in them
+    UnloadGuildBank(true);
 
     CharacterDatabase.PExecute("DELETE FROM guild_bank_item WHERE guildid = '%u'", m_Id);
     CharacterDatabase.PExecute("DELETE FROM guild_bank_right WHERE guildid = '%u'", m_Id);
@@ -722,10 +764,10 @@ void Guild::Disband()
     sGuildMgr.RemoveGuild(m_Id);
 }
 
-void Guild::Roster(WorldSession *session /*= NULL*/)
+void Guild::Roster(WorldSession* session /*= NULL*/)
 {
-                                                            // we can only guess size
-    WorldPacket data(SMSG_GUILD_ROSTER, (4+MOTD.length()+1+GINFO.length()+1+4+m_Ranks.size()*(4+4+GUILD_BANK_MAX_TABS*(4+4))+members.size()*50));
+    // we can only guess size
+    WorldPacket data(SMSG_GUILD_ROSTER, (4 + MOTD.length() + 1 + GINFO.length() + 1 + 4 + m_Ranks.size() * (4 + 4 + GUILD_BANK_MAX_TABS * (4 + 4)) + members.size() * 50));
     data << uint32(members.size());
     data << MOTD;
     data << GINFO;
@@ -743,7 +785,7 @@ void Guild::Roster(WorldSession *session /*= NULL*/)
     }
     for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
     {
-        if (Player *pl = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first)))
+        if (Player* pl = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first)))
         {
             data << pl->GetObjectGuid();
             data << uint8(1);
@@ -766,7 +808,7 @@ void Guild::Roster(WorldSession *session /*= NULL*/)
             data << uint8(itr->second.Class);
             data << uint8(0);                               // new 2.4.0
             data << uint32(itr->second.ZoneId);
-            data << float(float(time(NULL)-itr->second.LogoutTime) / DAY);
+            data << float(float(time(NULL) - itr->second.LogoutTime) / DAY);
             data << itr->second.Pnote;
             data << itr->second.OFFnote;
         }
@@ -775,12 +817,12 @@ void Guild::Roster(WorldSession *session /*= NULL*/)
         session->SendPacket(&data);
     else
         BroadcastPacket(&data);
-    DEBUG_LOG( "WORLD: Sent (SMSG_GUILD_ROSTER)" );
+    DEBUG_LOG("WORLD: Sent (SMSG_GUILD_ROSTER)");
 }
 
-void Guild::Query(WorldSession *session)
+void Guild::Query(WorldSession* session)
 {
-    WorldPacket data(SMSG_GUILD_QUERY_RESPONSE, (8*32+200));// we can only guess size
+    WorldPacket data(SMSG_GUILD_QUERY_RESPONSE, (8 * 32 + 200)); // we can only guess size
 
     data << uint32(m_Id);
     data << m_Name;
@@ -800,8 +842,8 @@ void Guild::Query(WorldSession *session)
     data << uint32(m_BackgroundColor);
     data << uint32(0);                                      // probably real ranks count
 
-    session->SendPacket( &data );
-    DEBUG_LOG( "WORLD: Sent (SMSG_GUILD_QUERY_RESPONSE)" );
+    session->SendPacket(&data);
+    DEBUG_LOG("WORLD: Sent (SMSG_GUILD_QUERY_RESPONSE)");
 }
 
 void Guild::SetEmblem(uint32 emblemStyle, uint32 emblemColor, uint32 borderStyle, uint32 borderColor, uint32 backgroundColor)
@@ -825,7 +867,7 @@ uint32 Guild::GetAccountsNumber()
     if (m_accountsNumber)
         return m_accountsNumber;
 
-    //We use a set to be sure each element will be unique
+    // We use a set to be sure each element will be unique
     std::set<uint32> accountsIdSet;
     for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
         accountsIdSet.insert(itr->second.accountId);
@@ -835,12 +877,37 @@ uint32 Guild::GetAccountsNumber()
     return m_accountsNumber;
 }
 
+void Guild::OnMemberLogout(Player* pPlayer)
+{
+    if (!pPlayer)
+        return;
+
+    MemberSlot* slot = GetMemberSlot(pPlayer->GetObjectGuid());
+    if (!slot)
+        return;
+
+    slot->SetMemberStats(pPlayer);
+    slot->UpdateLogoutTime();
+
+    if (m_onlineMembers > 0)
+        --m_onlineMembers;
+
+    if (!m_onlineMembers)
+    {
+        UnloadGuildBank();
+        UnloadGuildEventLog();
+    }
+}
+
 // *************************************************
 // Guild Eventlog part
 // *************************************************
 // Display guild eventlog
-void Guild::DisplayGuildEventLog(WorldSession *session)
+void Guild::DisplayGuildEventLog(WorldSession* session)
 {
+    if (!IsEventLogLoaded())
+        LoadGuildEventLogFromDB();
+
     // Sending result
     WorldPacket data(MSG_GUILD_EVENT_LOG_QUERY, 0);
     // count, max count == 100
@@ -858,7 +925,7 @@ void Guild::DisplayGuildEventLog(WorldSession *session)
         if (itr->EventType == GUILD_EVENT_LOG_PROMOTE_PLAYER || itr->EventType == GUILD_EVENT_LOG_DEMOTE_PLAYER)
             data << uint8(itr->NewRank);
         // Event timestamp
-        data << uint32(time(NULL)-itr->TimeStamp);
+        data << uint32(time(NULL) - itr->TimeStamp);
     }
     session->SendPacket(&data);
     DEBUG_LOG("WORLD: Sent (MSG_GUILD_EVENT_LOG_QUERY)");
@@ -867,16 +934,20 @@ void Guild::DisplayGuildEventLog(WorldSession *session)
 // Load guild eventlog from DB
 void Guild::LoadGuildEventLogFromDB()
 {
+    if (IsEventLogLoaded())
+        return;
+    SetEventLogLoaded(true);
+
     //                                                     0        1          2            3            4        5
-    QueryResult *result = CharacterDatabase.PQuery("SELECT LogGuid, EventType, PlayerGuid1, PlayerGuid2, NewRank, TimeStamp FROM guild_eventlog WHERE guildid=%u ORDER BY TimeStamp DESC,LogGuid DESC LIMIT %u", m_Id, GUILD_EVENTLOG_MAX_RECORDS);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT LogGuid, EventType, PlayerGuid1, PlayerGuid2, NewRank, TimeStamp FROM guild_eventlog WHERE guildid=%u ORDER BY TimeStamp DESC,LogGuid DESC LIMIT %u", m_Id, GUILD_EVENTLOG_MAX_RECORDS);
     if (!result)
         return;
     bool isNextLogGuidSet = false;
-    //uint32 configCount = sWorld.getConfig(CONFIG_UINT32_GUILD_EVENT_LOG_COUNT);
+    // uint32 configCount = sWorld.getConfig(CONFIG_UINT32_GUILD_EVENT_LOG_COUNT);
     // First event in list will be the oldest and the latest event is last event in list
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         if (!isNextLogGuidSet)
         {
             m_GuildEventLogNextGuid = fields[0].GetUInt32();
@@ -897,10 +968,20 @@ void Guild::LoadGuildEventLogFromDB()
         // Add entry to list
         m_GuildEventLog.push_front(NewEvent);
 
-    } while( result->NextRow() );
+    }
+    while (result->NextRow());
     delete result;
 }
 
+void Guild::UnloadGuildEventLog()
+{
+    if (!IsEventLogLoaded())
+        return;
+
+    m_GuildEventLog.clear();
+    SetEventLogLoaded(false);
+}
+
 // Add entry to guild eventlog
 void Guild::LogGuildEvent(uint8 EventType, ObjectGuid playerGuid1, ObjectGuid playerGuid2, uint8 newRank)
 {
@@ -921,14 +1002,14 @@ void Guild::LogGuildEvent(uint8 EventType, ObjectGuid playerGuid1, ObjectGuid pl
     // Save event to DB
     CharacterDatabase.PExecute("DELETE FROM guild_eventlog WHERE guildid='%u' AND LogGuid='%u'", m_Id, m_GuildEventLogNextGuid);
     CharacterDatabase.PExecute("INSERT INTO guild_eventlog (guildid, LogGuid, EventType, PlayerGuid1, PlayerGuid2, NewRank, TimeStamp) VALUES ('%u','%u','%u','%u','%u','%u','" UI64FMTD "')",
-        m_Id, m_GuildEventLogNextGuid, uint32(NewEvent.EventType), NewEvent.PlayerGuid1, NewEvent.PlayerGuid2, uint32(NewEvent.NewRank), NewEvent.TimeStamp);
+                               m_Id, m_GuildEventLogNextGuid, uint32(NewEvent.EventType), NewEvent.PlayerGuid1, NewEvent.PlayerGuid2, uint32(NewEvent.NewRank), NewEvent.TimeStamp);
 }
 
 // *************************************************
 // Guild Bank part
 // *************************************************
 // Bank content related
-void Guild::DisplayGuildBankContent(WorldSession *session, uint8 TabId)
+void Guild::DisplayGuildBankContent(WorldSession* session, uint8 TabId)
 {
     GuildBankTab const* tab = m_TabListMap[TabId];
 
@@ -939,7 +1020,7 @@ void Guild::DisplayGuildBankContent(WorldSession *session, uint8 TabId)
 
     data << uint64(GetGuildBankMoney());
     data << uint8(TabId);
-                                                            // remaining slots for today
+    // remaining slots for today
     data << uint32(GetMemberSlotWithdrawRem(session->GetPlayer()->GetGUIDLow(), TabId));
     data << uint8(0);                                       // Tell client that there's no tab info in this packet
 
@@ -953,9 +1034,12 @@ void Guild::DisplayGuildBankContent(WorldSession *session, uint8 TabId)
     DEBUG_LOG("WORLD: Sent (SMSG_GUILD_BANK_LIST)");
 }
 
-void Guild::DisplayGuildBankMoneyUpdate(WorldSession *session)
+void Guild::DisplayGuildBankMoneyUpdate(WorldSession* session)
 {
-    WorldPacket data(SMSG_GUILD_BANK_LIST, 8+1+4+1+1);
+    if (!IsGuildBankLoaded())
+        LoadGuildBankFromDB();
+
+    WorldPacket data(SMSG_GUILD_BANK_LIST, 8 + 1 + 4 + 1 + 1);
 
     data << uint64(GetGuildBankMoney());
     data << uint8(0);                                       // TabId, default 0
@@ -999,11 +1083,11 @@ void Guild::DisplayGuildBankContentUpdate(uint8 TabId, int32 slot1, int32 slot2)
 
     for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
     {
-        Player *player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
+        Player* player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
         if (!player)
             continue;
 
-        if (!IsMemberHaveRights(itr->first,TabId,GUILD_BANK_RIGHT_VIEW_TAB))
+        if (!IsMemberHaveRights(itr->first, TabId, GUILD_BANK_RIGHT_VIEW_TAB))
             continue;
 
         data.put<uint32>(rempos, uint32(GetMemberSlotWithdrawRem(player->GetGUIDLow(), TabId)));
@@ -1034,14 +1118,14 @@ void Guild::DisplayGuildBankContentUpdate(uint8 TabId, GuildItemPosCountVec cons
 
     for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
     {
-        Player *player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
+        Player* player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
         if (!player)
             continue;
 
-        if (!IsMemberHaveRights(itr->first,TabId,GUILD_BANK_RIGHT_VIEW_TAB))
+        if (!IsMemberHaveRights(itr->first, TabId, GUILD_BANK_RIGHT_VIEW_TAB))
             continue;
 
-        data.put<uint32>(rempos,uint32(GetMemberSlotWithdrawRem(player->GetGUIDLow(), TabId)));
+        data.put<uint32>(rempos, uint32(GetMemberSlotWithdrawRem(player->GetGUIDLow(), TabId)));
 
         player->GetSession()->SendPacket(&data);
     }
@@ -1059,8 +1143,11 @@ Item* Guild::GetItem(uint8 TabId, uint8 SlotId)
 // *************************************************
 // Tab related
 
-void Guild::DisplayGuildBankTabsInfo(WorldSession *session)
+void Guild::DisplayGuildBankTabsInfo(WorldSession* session)
 {
+    if (!IsGuildBankLoaded())
+        LoadGuildBankFromDB();
+
     WorldPacket data(SMSG_GUILD_BANK_LIST, 500);
 
     data << uint64(GetGuildBankMoney());
@@ -1088,6 +1175,7 @@ void Guild::CreateNewBankTab()
 
     uint32 tabId = GetPurchasedTabs();                      // next free id
     m_TabListMap.push_back(new GuildBankTab);
+    ++m_PurchasedTabs;
 
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("DELETE FROM guild_bank_tab WHERE guildid='%u' AND TabId='%u'", m_Id, tabId);
@@ -1122,17 +1210,24 @@ uint32 Guild::GetBankRights(uint32 rankId, uint8 TabId) const
 // This load should be called on startup only
 void Guild::LoadGuildBankFromDB()
 {
+    if (IsGuildBankLoaded())
+        return;
+
+    SetGuildBankLoaded(true);
+    LoadGuildBankEventLogFromDB();
+
     //                                                     0      1        2        3
-    QueryResult *result = CharacterDatabase.PQuery("SELECT TabId, TabName, TabIcon, TabText FROM guild_bank_tab WHERE guildid='%u' ORDER BY TabId", m_Id);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT TabId, TabName, TabIcon, TabText FROM guild_bank_tab WHERE guildid='%u' ORDER BY TabId", m_Id);
     if (!result)
     {
-        m_TabListMap.clear();
+        m_PurchasedTabs = 0;
         return;
     }
 
+    m_TabListMap.resize(GetPurchasedTabs());
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         uint8 tabId = fields[0].GetUInt8();
         if (tabId >= GetPurchasedTabs())
         {
@@ -1140,14 +1235,15 @@ void Guild::LoadGuildBankFromDB()
             continue;
         }
 
-        GuildBankTab *NewTab = new GuildBankTab;
+        GuildBankTab* NewTab = new GuildBankTab;
 
         NewTab->Name = fields[1].GetCppString();
         NewTab->Icon = fields[2].GetCppString();
         NewTab->Text = fields[3].GetCppString();
 
         m_TabListMap[tabId] = NewTab;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -1159,7 +1255,7 @@ void Guild::LoadGuildBankFromDB()
 
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         uint8 TabId = fields[2].GetUInt8();
         uint8 SlotId = fields[3].GetUInt8();
         uint32 ItemGuid = fields[4].GetUInt32();
@@ -1167,25 +1263,25 @@ void Guild::LoadGuildBankFromDB()
 
         if (TabId >= GetPurchasedTabs())
         {
-            sLog.outError( "Guild::LoadGuildBankFromDB: Invalid tab for item (GUID: %u id: #%u) in guild bank, skipped.", ItemGuid,ItemEntry);
+            sLog.outError("Guild::LoadGuildBankFromDB: Invalid tab for item (GUID: %u id: #%u) in guild bank, skipped.", ItemGuid, ItemEntry);
             continue;
         }
 
         if (SlotId >= GUILD_BANK_MAX_SLOTS)
         {
-            sLog.outError( "Guild::LoadGuildBankFromDB: Invalid slot for item (GUID: %u id: #%u) in guild bank, skipped.", ItemGuid,ItemEntry);
+            sLog.outError("Guild::LoadGuildBankFromDB: Invalid slot for item (GUID: %u id: #%u) in guild bank, skipped.", ItemGuid, ItemEntry);
             continue;
         }
 
-        ItemPrototype const *proto = ObjectMgr::GetItemPrototype(ItemEntry);
+        ItemPrototype const* proto = ObjectMgr::GetItemPrototype(ItemEntry);
 
         if (!proto)
         {
-            sLog.outError( "Guild::LoadGuildBankFromDB: Unknown item (GUID: %u id: #%u) in guild bank, skipped.", ItemGuid,ItemEntry);
+            sLog.outError("Guild::LoadGuildBankFromDB: Unknown item (GUID: %u id: #%u) in guild bank, skipped.", ItemGuid, ItemEntry);
             continue;
         }
 
-        Item *pItem = NewItemOrBag(proto);
+        Item* pItem = NewItemOrBag(proto);
         if (!pItem->LoadFromDB(ItemGuid, fields))
         {
             CharacterDatabase.PExecute("DELETE FROM guild_bank_item WHERE guildid='%u' AND TabId='%u' AND SlotId='%u'", m_Id, uint32(TabId), uint32(SlotId));
@@ -1196,15 +1292,48 @@ void Guild::LoadGuildBankFromDB()
 
         pItem->AddToWorld();
         m_TabListMap[TabId]->Slots[SlotId] = pItem;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 }
 
+void Guild::UnloadGuildBank(bool deleteItemsInDB /*=false*/)
+{
+    if (!IsGuildBankLoaded())
+    {
+        if (!deleteItemsInDB)
+            return;
+        // if disband - first load items for DeleteFromDB();
+        LoadGuildBankFromDB();
+    }
+
+    for (int8 i = m_TabListMap.size() - 1; i >= 0; --i)
+    {
+        for (int8 j = GUILD_BANK_MAX_SLOTS - 1 ; j >= 0; --j)
+        {
+            if (Item* pItem = m_TabListMap[i]->Slots[j])
+            {
+                pItem->RemoveFromWorld(true);
+
+                if (deleteItemsInDB)
+                    pItem->DeleteFromDB();
+
+                delete pItem;
+            }
+        }
+        delete m_TabListMap[i];
+    }
+    m_TabListMap.clear();
+
+    UnloadGuildBankEventLog();
+    SetGuildBankLoaded(false);
+}
+
 // *************************************************
 // Money deposit/withdraw related
 
-void Guild::SendMoneyInfo(WorldSession *session, uint32 LowGuid)
+void Guild::SendMoneyInfo(WorldSession* session, uint32 LowGuid)
 {
     WorldPacket data(MSG_GUILD_BANK_MONEY_WITHDRAWN, 4);
     data << uint32(GetMemberMoneyWithdrawRem(LowGuid));
@@ -1219,16 +1348,16 @@ bool Guild::MemberMoneyWithdraw(uint32 amount, uint32 LowGuid)
     if (MoneyWithDrawRight < amount || GetGuildBankMoney() < amount)
         return false;
 
-    SetBankMoney(GetGuildBankMoney()-amount);
+    SetBankMoney(GetGuildBankMoney() - amount);
 
     if (MoneyWithDrawRight < WITHDRAW_MONEY_UNLIMITED)
     {
         MemberList::iterator itr = members.find(LowGuid);
-        if (itr == members.end() )
+        if (itr == members.end())
             return false;
         itr->second.BankRemMoney -= amount;
         CharacterDatabase.PExecute("UPDATE guild_member SET BankRemMoney='%u' WHERE guildid='%u' AND guid='%u'",
-            itr->second.BankRemMoney, m_Id, LowGuid);
+                                   itr->second.BankRemMoney, m_Id, LowGuid);
     }
     return true;
 }
@@ -1255,11 +1384,11 @@ bool Guild::MemberItemWithdraw(uint8 TabId, uint32 LowGuid)
     if (SlotsWithDrawRight < WITHDRAW_SLOT_UNLIMITED)
     {
         MemberList::iterator itr = members.find(LowGuid);
-        if (itr == members.end() )
+        if (itr == members.end())
             return false;
         --itr->second.BankRemSlotsTab[TabId];
         CharacterDatabase.PExecute("UPDATE guild_member SET BankRemSlotsTab%u='%u' WHERE guildid='%u' AND guid='%u'",
-            uint32(TabId), itr->second.BankRemSlotsTab[TabId], m_Id, LowGuid);
+                                   uint32(TabId), itr->second.BankRemSlotsTab[TabId], m_Id, LowGuid);
     }
     return true;
 }
@@ -1267,7 +1396,7 @@ bool Guild::MemberItemWithdraw(uint8 TabId, uint32 LowGuid)
 bool Guild::IsMemberHaveRights(uint32 LowGuid, uint8 TabId, uint32 rights) const
 {
     MemberList::const_iterator itr = members.find(LowGuid);
-    if (itr == members.end() )
+    if (itr == members.end())
         return false;
 
     if (itr->second.RankId == GR_GUILDMASTER)
@@ -1279,22 +1408,22 @@ bool Guild::IsMemberHaveRights(uint32 LowGuid, uint8 TabId, uint32 rights) const
 uint32 Guild::GetMemberSlotWithdrawRem(uint32 LowGuid, uint8 TabId)
 {
     MemberList::iterator itr = members.find(LowGuid);
-    if (itr == members.end() )
+    if (itr == members.end())
         return 0;
 
     if (itr->second.RankId == GR_GUILDMASTER)
         return WITHDRAW_SLOT_UNLIMITED;
 
-    if ((GetBankRights(itr->second.RankId,TabId) & GUILD_BANK_RIGHT_VIEW_TAB) != GUILD_BANK_RIGHT_VIEW_TAB)
+    if ((GetBankRights(itr->second.RankId, TabId) & GUILD_BANK_RIGHT_VIEW_TAB) != GUILD_BANK_RIGHT_VIEW_TAB)
         return 0;
 
-    uint32 curTime = uint32(time(NULL)/MINUTE);
-    if (curTime - itr->second.BankResetTimeTab[TabId] >= 24*HOUR/MINUTE)
+    uint32 curTime = uint32(time(NULL) / MINUTE);
+    if (curTime - itr->second.BankResetTimeTab[TabId] >= 24 * HOUR / MINUTE)
     {
         itr->second.BankResetTimeTab[TabId] = curTime;
         itr->second.BankRemSlotsTab[TabId] = GetBankSlotPerDay(itr->second.RankId, TabId);
         CharacterDatabase.PExecute("UPDATE guild_member SET BankResetTimeTab%u='%u', BankRemSlotsTab%u='%u' WHERE guildid='%u' AND guid='%u'",
-            uint32(TabId), itr->second.BankResetTimeTab[TabId], uint32(TabId), itr->second.BankRemSlotsTab[TabId], m_Id, LowGuid);
+                                   uint32(TabId), itr->second.BankResetTimeTab[TabId], uint32(TabId), itr->second.BankRemSlotsTab[TabId], m_Id, LowGuid);
     }
     return itr->second.BankRemSlotsTab[TabId];
 }
@@ -1302,20 +1431,20 @@ uint32 Guild::GetMemberSlotWithdrawRem(uint32 LowGuid, uint8 TabId)
 uint32 Guild::GetMemberMoneyWithdrawRem(uint32 LowGuid)
 {
     MemberList::iterator itr = members.find(LowGuid);
-    if (itr == members.end() )
+    if (itr == members.end())
         return 0;
 
     if (itr->second.RankId == GR_GUILDMASTER)
         return WITHDRAW_MONEY_UNLIMITED;
 
-    uint32 curTime = uint32(time(NULL)/MINUTE);             // minutes
-                                                            // 24 hours
-    if (curTime > itr->second.BankResetTimeMoney + 24*HOUR/MINUTE)
+    uint32 curTime = uint32(time(NULL) / MINUTE);           // minutes
+    // 24 hours
+    if (curTime > itr->second.BankResetTimeMoney + 24 * HOUR / MINUTE)
     {
         itr->second.BankResetTimeMoney = curTime;
         itr->second.BankRemMoney = GetBankMoneyPerDay(itr->second.RankId);
         CharacterDatabase.PExecute("UPDATE guild_member SET BankResetTimeMoney='%u', BankRemMoney='%u' WHERE guildid='%u' AND guid='%u'",
-            itr->second.BankResetTimeMoney, itr->second.BankRemMoney, m_Id, LowGuid);
+                                   itr->second.BankResetTimeMoney, itr->second.BankRemMoney, m_Id, LowGuid);
     }
     return itr->second.BankRemMoney;
 }
@@ -1365,7 +1494,7 @@ void Guild::SetBankRightsAndSlots(uint32 rankId, uint8 TabId, uint32 right, uint
 
         CharacterDatabase.PExecute("DELETE FROM guild_bank_right WHERE guildid='%u' AND TabId='%u' AND rid='%u'", m_Id, uint32(TabId), rankId);
         CharacterDatabase.PExecute("INSERT INTO guild_bank_right (guildid,TabId,rid,gbright,SlotPerDay) VALUES "
-            "('%u','%u','%u','%u','%u')", m_Id, uint32(TabId), rankId, m_Ranks[rankId].TabRight[TabId], m_Ranks[rankId].TabSlotPerDay[TabId]);
+                                   "('%u','%u','%u','%u','%u')", m_Id, uint32(TabId), rankId, m_Ranks[rankId].TabRight[TabId], m_Ranks[rankId].TabSlotPerDay[TabId]);
         CharacterDatabase.PExecute("UPDATE guild_member SET BankResetTimeTab%u='0' WHERE guildid='%u' AND rank='%u'", uint32(TabId), m_Id, rankId);
     }
 }
@@ -1393,14 +1522,14 @@ uint32 Guild::GetBankSlotPerDay(uint32 rankId, uint8 TabId)
 // *************************************************
 // Rights per day related
 
-bool Guild::LoadBankRightsFromDB(QueryResult *guildBankTabRightsResult)
+bool Guild::LoadBankRightsFromDB(QueryResult* guildBankTabRightsResult)
 {
     if (!guildBankTabRightsResult)
         return true;
 
     do
     {
-        Field *fields      = guildBankTabRightsResult->Fetch();
+        Field* fields      = guildBankTabRightsResult->Fetch();
         // prevent crash when all rights in result are already processed
         if (!fields)
             break;
@@ -1423,7 +1552,8 @@ bool Guild::LoadBankRightsFromDB(QueryResult *guildBankTabRightsResult)
 
         SetBankRightsAndSlots(rankId, TabId, right, SlotPerDay, false);
 
-    } while (guildBankTabRightsResult->NextRow());
+    }
+    while (guildBankTabRightsResult->NextRow());
 
     return true;
 }
@@ -1440,14 +1570,14 @@ void Guild::LoadGuildBankEventLogFromDB()
     for (uint32 tabId = 0; tabId < uint32(GetPurchasedTabs()); ++tabId)
     {
         //                                                     0        1          2           3            4               5          6
-        QueryResult *result = CharacterDatabase.PQuery("SELECT LogGuid, EventType, PlayerGuid, ItemOrMoney, ItemStackCount, DestTabId, TimeStamp FROM guild_bank_eventlog WHERE guildid='%u' AND TabId='%u' ORDER BY TimeStamp DESC,LogGuid DESC LIMIT %u", m_Id, tabId, GUILD_BANK_MAX_LOGS);
+        QueryResult* result = CharacterDatabase.PQuery("SELECT LogGuid, EventType, PlayerGuid, ItemOrMoney, ItemStackCount, DestTabId, TimeStamp FROM guild_bank_eventlog WHERE guildid='%u' AND TabId='%u' ORDER BY TimeStamp DESC,LogGuid DESC LIMIT %u", m_Id, tabId, GUILD_BANK_MAX_LOGS);
         if (!result)
             continue;
 
         bool isNextLogGuidSet = false;
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             GuildBankEventLogEntry NewEvent;
             NewEvent.EventType = fields[1].GetUInt8();
@@ -1476,20 +1606,21 @@ void Guild::LoadGuildBankEventLogFromDB()
                 // we don't have to do m_GuildBankEventLogNextGuid_Item[tabId] %= configCount; - it will be done when creating new record
                 isNextLogGuidSet = true;
             }
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
         delete result;
     }
 
     // special handle for guild bank money log
     //                                                     0        1          2           3            4               5          6
-    QueryResult *result = CharacterDatabase.PQuery("SELECT LogGuid, EventType, PlayerGuid, ItemOrMoney, ItemStackCount, DestTabId, TimeStamp FROM guild_bank_eventlog WHERE guildid='%u' AND TabId='%u' ORDER BY TimeStamp DESC,LogGuid DESC LIMIT %u", m_Id, GUILD_BANK_MONEY_LOGS_TAB, GUILD_BANK_MAX_LOGS);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT LogGuid, EventType, PlayerGuid, ItemOrMoney, ItemStackCount, DestTabId, TimeStamp FROM guild_bank_eventlog WHERE guildid='%u' AND TabId='%u' ORDER BY TimeStamp DESC,LogGuid DESC LIMIT %u", m_Id, GUILD_BANK_MONEY_LOGS_TAB, GUILD_BANK_MAX_LOGS);
     if (!result)
         return;
 
     bool isNextMoneyLogGuidSet = false;
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         if (!isNextMoneyLogGuidSet)
         {
             m_GuildBankEventLogNextGuid_Money = fields[0].GetUInt32();
@@ -1513,11 +1644,20 @@ void Guild::LoadGuildBankEventLogFromDB()
             // events are ordered from oldest (in beginning) to latest (in the end)
             m_GuildBankEventLog_Money.push_front(NewEvent);
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 }
 
-void Guild::DisplayGuildBankLogs(WorldSession *session, uint8 TabId)
+void Guild::UnloadGuildBankEventLog()
+{
+    m_GuildBankEventLog_Money.clear();
+
+    for (int8 i = GUILD_BANK_MAX_TABS - 1; i >= 0; --i)
+        m_GuildBankEventLog_Item[i].clear();
+}
+
+void Guild::DisplayGuildBankLogs(WorldSession* session, uint8 TabId)
 {
     if (TabId > GUILD_BANK_MAX_TABS)
         return;
@@ -1525,7 +1665,7 @@ void Guild::DisplayGuildBankLogs(WorldSession *session, uint8 TabId)
     if (TabId == GUILD_BANK_MAX_TABS)
     {
         // Here we display money logs
-        WorldPacket data(MSG_GUILD_BANK_LOG_QUERY, m_GuildBankEventLog_Money.size()*(4*4+1)+1+1);
+        WorldPacket data(MSG_GUILD_BANK_LOG_QUERY, m_GuildBankEventLog_Money.size() * (4 * 4 + 1) + 1 + 1);
         data << uint8(TabId);                               // Here GUILD_BANK_MAX_TABS
         data << uint8(m_GuildBankEventLog_Money.size());    // number of log entries
         for (GuildBankEventLog::const_iterator itr = m_GuildBankEventLog_Money.begin(); itr != m_GuildBankEventLog_Money.end(); ++itr)
@@ -1533,10 +1673,10 @@ void Guild::DisplayGuildBankLogs(WorldSession *session, uint8 TabId)
             data << uint8(itr->EventType);
             data << ObjectGuid(HIGHGUID_PLAYER, itr->PlayerGuid);
             if (itr->EventType == GUILD_BANK_LOG_DEPOSIT_MONEY ||
-                itr->EventType == GUILD_BANK_LOG_WITHDRAW_MONEY ||
-                itr->EventType == GUILD_BANK_LOG_REPAIR_MONEY ||
-                itr->EventType == GUILD_BANK_LOG_UNK1 ||
-                itr->EventType == GUILD_BANK_LOG_UNK2)
+                    itr->EventType == GUILD_BANK_LOG_WITHDRAW_MONEY ||
+                    itr->EventType == GUILD_BANK_LOG_REPAIR_MONEY ||
+                    itr->EventType == GUILD_BANK_LOG_UNK1 ||
+                    itr->EventType == GUILD_BANK_LOG_UNK2)
             {
                 data << uint32(itr->ItemOrMoney);
             }
@@ -1554,19 +1694,19 @@ void Guild::DisplayGuildBankLogs(WorldSession *session, uint8 TabId)
     else
     {
         // here we display current tab logs
-        WorldPacket data(MSG_GUILD_BANK_LOG_QUERY, m_GuildBankEventLog_Item[TabId].size()*(4*4+1+1)+1+1);
+        WorldPacket data(MSG_GUILD_BANK_LOG_QUERY, m_GuildBankEventLog_Item[TabId].size() * (4 * 4 + 1 + 1) + 1 + 1);
         data << uint8(TabId);                               // Here a real Tab Id
-                                                            // number of log entries
+        // number of log entries
         data << uint8(m_GuildBankEventLog_Item[TabId].size());
         for (GuildBankEventLog::const_iterator itr = m_GuildBankEventLog_Item[TabId].begin(); itr != m_GuildBankEventLog_Item[TabId].end(); ++itr)
         {
             data << uint8(itr->EventType);
             data << ObjectGuid(HIGHGUID_PLAYER, itr->PlayerGuid);
             if (itr->EventType == GUILD_BANK_LOG_DEPOSIT_MONEY ||
-                itr->EventType == GUILD_BANK_LOG_WITHDRAW_MONEY ||
-                itr->EventType == GUILD_BANK_LOG_REPAIR_MONEY ||
-                itr->EventType == GUILD_BANK_LOG_UNK1 ||
-                itr->EventType == GUILD_BANK_LOG_UNK2)
+                    itr->EventType == GUILD_BANK_LOG_WITHDRAW_MONEY ||
+                    itr->EventType == GUILD_BANK_LOG_REPAIR_MONEY ||
+                    itr->EventType == GUILD_BANK_LOG_UNK1 ||
+                    itr->EventType == GUILD_BANK_LOG_UNK2)
             {
                 data << uint32(itr->ItemOrMoney);
             }
@@ -1622,20 +1762,20 @@ void Guild::LogBankEvent(uint8 EventType, uint8 TabId, uint32 PlayerGuidLow, uin
     CharacterDatabase.PExecute("DELETE FROM guild_bank_eventlog WHERE guildid='%u' AND LogGuid='%u' AND TabId='%u'", m_Id, currentLogGuid, currentTabId);
 
     CharacterDatabase.PExecute("INSERT INTO guild_bank_eventlog (guildid,LogGuid,TabId,EventType,PlayerGuid,ItemOrMoney,ItemStackCount,DestTabId,TimeStamp) VALUES ('%u','%u','%u','%u','%u','%u','%u','%u','" UI64FMTD "')",
-        m_Id, currentLogGuid, currentTabId, uint32(NewEvent.EventType), NewEvent.PlayerGuid, NewEvent.ItemOrMoney, uint32(NewEvent.ItemStackCount), uint32(NewEvent.DestTabId), NewEvent.TimeStamp);
+                               m_Id, currentLogGuid, currentTabId, uint32(NewEvent.EventType), NewEvent.PlayerGuid, NewEvent.ItemOrMoney, uint32(NewEvent.ItemStackCount), uint32(NewEvent.DestTabId), NewEvent.TimeStamp);
 }
 
-bool Guild::AddGBankItemToDB(uint32 GuildId, uint32 BankTab , uint32 BankTabSlot , uint32 GUIDLow, uint32 Entry )
+bool Guild::AddGBankItemToDB(uint32 GuildId, uint32 BankTab , uint32 BankTabSlot , uint32 GUIDLow, uint32 Entry)
 {
     CharacterDatabase.PExecute("DELETE FROM guild_bank_item WHERE guildid = '%u' AND TabId = '%u'AND SlotId = '%u'", GuildId, BankTab, BankTabSlot);
     CharacterDatabase.PExecute("INSERT INTO guild_bank_item (guildid,TabId,SlotId,item_guid,item_entry) "
-        "VALUES ('%u', '%u', '%u', '%u', '%u')", GuildId, BankTab, BankTabSlot, GUIDLow, Entry);
+                               "VALUES ('%u', '%u', '%u', '%u', '%u')", GuildId, BankTab, BankTabSlot, GUIDLow, Entry);
     return true;
 }
 
-void Guild::AppendDisplayGuildBankSlot( WorldPacket& data, GuildBankTab const *tab, int slot )
+void Guild::AppendDisplayGuildBankSlot(WorldPacket& data, GuildBankTab const* tab, int slot)
 {
-    Item *pItem = tab->Slots[slot];
+    Item* pItem = tab->Slots[slot];
     uint32 entry = pItem ? pItem->GetEntry() : 0;
 
     data << uint8(slot);
@@ -1656,9 +1796,9 @@ void Guild::AppendDisplayGuildBankSlot( WorldPacket& data, GuildBankTab const *t
         size_t enchCountPos = data.wpos();
 
         data << uint8(enchCount);                           // number of enchantments
-        for(uint32 i = PERM_ENCHANTMENT_SLOT; i < MAX_ENCHANTMENT_SLOT; ++i)
+        for (uint32 i = PERM_ENCHANTMENT_SLOT; i < MAX_ENCHANTMENT_SLOT; ++i)
         {
-            if(uint32 enchId = pItem->GetEnchantmentId(EnchantmentSlot(i)))
+            if (uint32 enchId = pItem->GetEnchantmentId(EnchantmentSlot(i)))
             {
                 data << uint8(i);
                 data << uint32(enchId);
@@ -1669,14 +1809,14 @@ void Guild::AppendDisplayGuildBankSlot( WorldPacket& data, GuildBankTab const *t
     }
 }
 
-Item* Guild::StoreItem(uint8 tabId, GuildItemPosCountVec const& dest, Item* pItem )
+Item* Guild::StoreItem(uint8 tabId, GuildItemPosCountVec const& dest, Item* pItem)
 {
     if (!pItem)
         return NULL;
 
     Item* lastItem = pItem;
 
-    for (GuildItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); )
+    for (GuildItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end();)
     {
         uint8 slot = itr->Slot;
         uint32 count = itr->Count;
@@ -1696,12 +1836,12 @@ Item* Guild::StoreItem(uint8 tabId, GuildItemPosCountVec const& dest, Item* pIte
 }
 
 // Return stored item (if stored to stack, it can diff. from pItem). And pItem ca be deleted in this case.
-Item* Guild::_StoreItem( uint8 tab, uint8 slot, Item *pItem, uint32 count, bool clone )
+Item* Guild::_StoreItem(uint8 tab, uint8 slot, Item* pItem, uint32 count, bool clone)
 {
     if (!pItem)
         return NULL;
 
-    DEBUG_LOG( "GUILD STORAGE: StoreItem tab = %u, slot = %u, item = %u, count = %u", tab, slot, pItem->GetEntry(), count);
+    DEBUG_LOG("GUILD STORAGE: StoreItem tab = %u, slot = %u, item = %u, count = %u", tab, slot, pItem->GetEntry(), count);
 
     Item* pItem2 = m_TabListMap[tab]->Slots[slot];
 
@@ -1727,13 +1867,13 @@ Item* Guild::_StoreItem( uint8 tab, uint8 slot, Item *pItem, uint32 count, bool
     }
     else
     {
-        pItem2->SetCount( pItem2->GetCount() + count );
+        pItem2->SetCount(pItem2->GetCount() + count);
         pItem2->FSetState(ITEM_CHANGED);
         pItem2->SaveToDB();                                 // not in inventory and can be save standalone
 
         if (!clone)
         {
-            pItem->RemoveFromWorld();
+            pItem->RemoveFromWorld(true);
             pItem->DeleteFromDB();
             delete pItem;
         }
@@ -1742,14 +1882,14 @@ Item* Guild::_StoreItem( uint8 tab, uint8 slot, Item *pItem, uint32 count, bool
     }
 }
 
-void Guild::RemoveItem(uint8 tab, uint8 slot )
+void Guild::RemoveItem(uint8 tab, uint8 slot)
 {
     m_TabListMap[tab]->Slots[slot] = NULL;
     CharacterDatabase.PExecute("DELETE FROM guild_bank_item WHERE guildid='%u' AND TabId='%u' AND SlotId='%u'",
-        GetId(), uint32(tab), uint32(slot));
+                               GetId(), uint32(tab), uint32(slot));
 }
 
-InventoryResult Guild::_CanStoreItem_InSpecificSlot( uint8 tab, uint8 slot, GuildItemPosCountVec &dest, uint32& count, bool swap, Item* pSrcItem ) const
+InventoryResult Guild::_CanStoreItem_InSpecificSlot(uint8 tab, uint8 slot, GuildItemPosCountVec& dest, uint32& count, bool swap, Item* pSrcItem) const
 {
     Item* pItem2 = m_TabListMap[tab]->Slots[slot];
 
@@ -1792,7 +1932,7 @@ InventoryResult Guild::_CanStoreItem_InSpecificSlot( uint8 tab, uint8 slot, Guil
     return EQUIP_ERR_OK;
 }
 
-InventoryResult Guild::_CanStoreItem_InTab( uint8 tab, GuildItemPosCountVec &dest, uint32& count, bool merge, Item* pSrcItem, uint8 skip_slot ) const
+InventoryResult Guild::_CanStoreItem_InTab(uint8 tab, GuildItemPosCountVec& dest, uint32& count, bool merge, Item* pSrcItem, uint8 skip_slot) const
 {
     for (uint32 j = 0; j < GUILD_BANK_MAX_SLOTS; ++j)
     {
@@ -1849,9 +1989,9 @@ InventoryResult Guild::_CanStoreItem_InTab( uint8 tab, GuildItemPosCountVec &des
     return EQUIP_ERR_OK;
 }
 
-InventoryResult Guild::CanStoreItem( uint8 tab, uint8 slot, GuildItemPosCountVec &dest, uint32 count, Item *pItem, bool swap ) const
+InventoryResult Guild::CanStoreItem(uint8 tab, uint8 slot, GuildItemPosCountVec& dest, uint32 count, Item* pItem, bool swap) const
 {
-    DEBUG_LOG( "GUILD STORAGE: CanStoreItem tab = %u, slot = %u, item = %u, count = %u", tab, slot, pItem->GetEntry(), count);
+    DEBUG_LOG("GUILD STORAGE: CanStoreItem tab = %u, slot = %u, item = %u, count = %u", tab, slot, pItem->GetEntry(), count);
 
     if (count > pItem->GetCount())
         return EQUIP_ERR_COULDNT_SPLIT_ITEMS;
@@ -1862,7 +2002,7 @@ InventoryResult Guild::CanStoreItem( uint8 tab, uint8 slot, GuildItemPosCountVec
     // in specific slot
     if (slot != NULL_SLOT)
     {
-        InventoryResult res = _CanStoreItem_InSpecificSlot(tab,slot,dest,count,swap,pItem);
+        InventoryResult res = _CanStoreItem_InSpecificSlot(tab, slot, dest, count, swap, pItem);
         if (res != EQUIP_ERR_OK)
             return res;
 
@@ -1913,14 +2053,14 @@ void Guild::SetGuildBankTabText(uint8 TabId, std::string text)
     CharacterDatabase.PExecute("UPDATE guild_bank_tab SET TabText='%s' WHERE guildid='%u' AND TabId='%u'", text.c_str(), m_Id, uint32(TabId));
 
     // announce
-    SendGuildBankTabText(NULL,TabId);
+    SendGuildBankTabText(NULL, TabId);
 }
 
-void Guild::SendGuildBankTabText(WorldSession *session, uint8 TabId)
+void Guild::SendGuildBankTabText(WorldSession* session, uint8 TabId)
 {
     GuildBankTab const* tab = m_TabListMap[TabId];
 
-    WorldPacket data(MSG_QUERY_GUILD_BANK_TEXT, 1+tab->Text.size()+1);
+    WorldPacket data(MSG_QUERY_GUILD_BANK_TEXT, 1 + tab->Text.size() + 1);
     data << uint8(TabId);
     data << tab->Text;
 
@@ -1930,13 +2070,13 @@ void Guild::SendGuildBankTabText(WorldSession *session, uint8 TabId)
         BroadcastPacket(&data);
 }
 
-void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankTabDst, uint8 BankTabSlotDst, uint32 SplitedAmount )
+void Guild::SwapItems(Player* pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankTabDst, uint8 BankTabSlotDst, uint32 SplitedAmount)
 {
     // empty operation
     if (BankTab == BankTabDst && BankTabSlot == BankTabSlotDst)
         return;
 
-    Item *pItemSrc = GetItem(BankTab, BankTabSlot);
+    Item* pItemSrc = GetItem(BankTab, BankTabSlot);
     if (!pItemSrc)                                      // may prevent crash
         return;
 
@@ -1945,7 +2085,7 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
     else if (SplitedAmount == pItemSrc->GetCount())
         SplitedAmount = 0;                              // no split
 
-    Item *pItemDst = GetItem(BankTabDst, BankTabSlotDst);
+    Item* pItemDst = GetItem(BankTabDst, BankTabSlotDst);
 
     if (BankTab != BankTabDst)
     {
@@ -1960,19 +2100,20 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
     }
 
     if (SplitedAmount)
-    {                                                   // Bank -> Bank item split (in empty or non empty slot
+    {
+        // Bank -> Bank item split (in empty or non empty slot
         GuildItemPosCountVec dest;
         InventoryResult msg = CanStoreItem(BankTabDst, BankTabSlotDst, dest, SplitedAmount, pItemSrc, false);
         if (msg != EQUIP_ERR_OK)
         {
-            pl->SendEquipError( msg, pItemSrc, NULL );
+            pl->SendEquipError(msg, pItemSrc, NULL);
             return;
         }
 
-        Item *pNewItem = pItemSrc->CloneItem( SplitedAmount );
+        Item* pNewItem = pItemSrc->CloneItem(SplitedAmount);
         if (!pNewItem)
         {
-            pl->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, pItemSrc, NULL );
+            pl->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, pItemSrc, NULL);
             return;
         }
 
@@ -1981,8 +2122,8 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
         if (BankTab != BankTabDst)
             LogBankEvent(GUILD_BANK_LOG_MOVE_ITEM, BankTab, pl->GetGUIDLow(), pItemSrc->GetEntry(), SplitedAmount, BankTabDst);
 
-        pl->ItemRemovedQuestCheck( pItemSrc->GetEntry(), SplitedAmount );
-        pItemSrc->SetCount( pItemSrc->GetCount() - SplitedAmount );
+        pl->ItemRemovedQuestCheck(pItemSrc->GetEntry(), SplitedAmount);
+        pItemSrc->SetCount(pItemSrc->GetCount() - SplitedAmount);
         pItemSrc->FSetState(ITEM_CHANGED);
         pItemSrc->SaveToDB();                               // not in inventory and can be save standalone
         StoreItem(BankTabDst, dest, pNewItem);
@@ -1991,7 +2132,7 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
     else                                                    // non split
     {
         GuildItemPosCountVec gDest;
-        InventoryResult msg = CanStoreItem(BankTabDst,BankTabSlotDst,gDest,pItemSrc->GetCount(), pItemSrc, false);
+        InventoryResult msg = CanStoreItem(BankTabDst, BankTabSlotDst, gDest, pItemSrc->GetCount(), pItemSrc, false);
         if (msg == EQUIP_ERR_OK)                            // merge to
         {
             CharacterDatabase.BeginTransaction();
@@ -2009,7 +2150,7 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
             msg = CanStoreItem(BankTabDst, BankTabSlotDst, gDest, pItemSrc->GetCount(), pItemSrc, true);
             if (msg != EQUIP_ERR_OK)
             {
-                pl->SendEquipError( msg, pItemSrc, NULL );
+                pl->SendEquipError(msg, pItemSrc, NULL);
                 return;
             }
 
@@ -2017,7 +2158,7 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
             msg = CanStoreItem(BankTab, BankTabSlot, gSrc, pItemDst->GetCount(), pItemDst, true);
             if (msg != EQUIP_ERR_OK)
             {
-                pl->SendEquipError( msg, pItemDst, NULL );
+                pl->SendEquipError(msg, pItemDst, NULL);
                 return;
             }
 
@@ -2054,10 +2195,10 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
 }
 
 
-void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 PlayerBag, uint8 PlayerSlot, uint32 SplitedAmount)
+void Guild::MoveFromBankToChar(Player* pl, uint8 BankTab, uint8 BankTabSlot, uint8 PlayerBag, uint8 PlayerSlot, uint32 SplitedAmount)
 {
-    Item *pItemBank = GetItem(BankTab, BankTabSlot);
-    Item *pItemChar = pl->GetItemByPos(PlayerBag, PlayerSlot);
+    Item* pItemBank = GetItem(BankTab, BankTabSlot);
+    Item* pItemChar = pl->GetItemByPos(PlayerBag, PlayerSlot);
 
     if (!pItemBank)                                     // Problem to get bank item
         return;
@@ -2068,11 +2209,12 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
         SplitedAmount = 0;                              // no split
 
     if (SplitedAmount)
-    {                                                   // Bank -> Char split to slot (patly move)
-        Item *pNewItem = pItemBank->CloneItem( SplitedAmount );
+    {
+        // Bank -> Char split to slot (patly move)
+        Item* pNewItem = pItemBank->CloneItem(SplitedAmount);
         if (!pNewItem)
         {
-            pl->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, pItemBank, NULL );
+            pl->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, pItemBank, NULL);
             return;
         }
 
@@ -2080,7 +2222,7 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
         InventoryResult msg = pl->CanStoreItem(PlayerBag, PlayerSlot, dest, pNewItem, false);
         if (msg != EQUIP_ERR_OK)
         {
-            pl->SendEquipError( msg, pNewItem, NULL );
+            pl->SendEquipError(msg, pNewItem, NULL);
             delete pNewItem;
             return;
         }
@@ -2096,7 +2238,7 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
         CharacterDatabase.BeginTransaction();
         LogBankEvent(GUILD_BANK_LOG_WITHDRAW_ITEM, BankTab, pl->GetGUIDLow(), pItemBank->GetEntry(), SplitedAmount);
 
-        pItemBank->SetCount(pItemBank->GetCount()-SplitedAmount);
+        pItemBank->SetCount(pItemBank->GetCount() - SplitedAmount);
         pItemBank->FSetState(ITEM_CHANGED);
         pItemBank->SaveToDB();                              // not in inventory and can be save standalone
         pl->MoveItemToInventory(dest, pNewItem, true);
@@ -2136,7 +2278,7 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
             {
                 if (!pItemChar->CanBeTraded())
                 {
-                    pl->SendEquipError( EQUIP_ERR_ITEMS_CANT_BE_SWAPPED, pItemChar, NULL );
+                    pl->SendEquipError(EQUIP_ERR_ITEMS_CANT_BE_SWAPPED, pItemChar, NULL);
                     return;
                 }
             }
@@ -2145,17 +2287,17 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
             msg = pl->CanStoreItem(PlayerBag, PlayerSlot, iDest, pItemBank, true);
             if (msg != EQUIP_ERR_OK)
             {
-                pl->SendEquipError( msg, pItemBank, NULL );
+                pl->SendEquipError(msg, pItemBank, NULL);
                 return;
             }
 
             GuildItemPosCountVec gDest;
             if (pItemChar)
             {
-                msg = CanStoreItem(BankTab,BankTabSlot,gDest,pItemChar->GetCount(),pItemChar,true);
+                msg = CanStoreItem(BankTab, BankTabSlot, gDest, pItemChar->GetCount(), pItemChar, true);
                 if (msg != EQUIP_ERR_OK)
                 {
-                    pl->SendEquipError( msg, pItemChar, NULL );
+                    pl->SendEquipError(msg, pItemChar, NULL);
                     return;
                 }
             }
@@ -2170,10 +2312,10 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
                 // logging item move to bank
                 if (pl->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE))
                 {
-                    sLog.outCommand(pl->GetSession()->GetAccountId(),"GM %s (Account: %u) deposit item: %s (Entry: %d Count: %u) to guild bank (Guild ID: %u )",
-                        pl->GetName(),pl->GetSession()->GetAccountId(),
-                        pItemChar->GetProto()->Name1, pItemChar->GetEntry(), pItemChar->GetCount(),
-                        m_Id);
+                    sLog.outCommand(pl->GetSession()->GetAccountId(), "GM %s (Account: %u) deposit item: %s (Entry: %d Count: %u) to guild bank (Guild ID: %u )",
+                                    pl->GetName(), pl->GetSession()->GetAccountId(),
+                                    pItemChar->GetProto()->Name1, pItemChar->GetEntry(), pItemChar->GetCount(),
+                                    m_Id);
                 }
             }
 
@@ -2202,17 +2344,17 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
 }
 
 
-void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot, uint8 BankTab, uint8 BankTabSlot, uint32 SplitedAmount )
+void Guild::MoveFromCharToBank(Player* pl, uint8 PlayerBag, uint8 PlayerSlot, uint8 BankTab, uint8 BankTabSlot, uint32 SplitedAmount)
 {
-    Item *pItemBank = GetItem(BankTab, BankTabSlot);
-    Item *pItemChar = pl->GetItemByPos(PlayerBag, PlayerSlot);
+    Item* pItemBank = GetItem(BankTab, BankTabSlot);
+    Item* pItemChar = pl->GetItemByPos(PlayerBag, PlayerSlot);
 
     if (!pItemChar)                                         // Problem to get item from player
         return;
 
     if (!pItemChar->CanBeTraded())
     {
-        pl->SendEquipError( EQUIP_ERR_ITEMS_CANT_BE_SWAPPED, pItemChar, NULL );
+        pl->SendEquipError(EQUIP_ERR_ITEMS_CANT_BE_SWAPPED, pItemChar, NULL);
         return;
     }
 
@@ -2226,35 +2368,36 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
         SplitedAmount = 0;                                  // no split
 
     if (SplitedAmount)
-    {                                                       // Char -> Bank split to empty or non-empty slot (partly move)
+    {
+        // Char -> Bank split to empty or non-empty slot (partly move)
         GuildItemPosCountVec dest;
         InventoryResult msg = CanStoreItem(BankTab, BankTabSlot, dest, SplitedAmount, pItemChar, false);
         if (msg != EQUIP_ERR_OK)
         {
-            pl->SendEquipError( msg, pItemChar, NULL );
+            pl->SendEquipError(msg, pItemChar, NULL);
             return;
         }
 
-        Item *pNewItem = pItemChar->CloneItem( SplitedAmount );
+        Item* pNewItem = pItemChar->CloneItem(SplitedAmount);
         if (!pNewItem)
         {
-            pl->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, pItemChar, NULL );
+            pl->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, pItemChar, NULL);
             return;
         }
 
         // logging item move to bank (before items merge
         if (pl->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE))
         {
-            sLog.outCommand(pl->GetSession()->GetAccountId(),"GM %s (Account: %u) deposit item: %s (Entry: %d Count: %u) to guild bank (Guild ID: %u )",
-                pl->GetName(),pl->GetSession()->GetAccountId(),
-                pItemChar->GetProto()->Name1, pItemChar->GetEntry(), SplitedAmount, m_Id);
+            sLog.outCommand(pl->GetSession()->GetAccountId(), "GM %s (Account: %u) deposit item: %s (Entry: %d Count: %u) to guild bank (Guild ID: %u )",
+                            pl->GetName(), pl->GetSession()->GetAccountId(),
+                            pItemChar->GetProto()->Name1, pItemChar->GetEntry(), SplitedAmount, m_Id);
         }
 
         CharacterDatabase.BeginTransaction();
         LogBankEvent(GUILD_BANK_LOG_DEPOSIT_ITEM, BankTab, pl->GetGUIDLow(), pItemChar->GetEntry(), SplitedAmount);
 
-        pl->ItemRemovedQuestCheck( pItemChar->GetEntry(), SplitedAmount );
-        pItemChar->SetCount(pItemChar->GetCount()-SplitedAmount);
+        pl->ItemRemovedQuestCheck(pItemChar->GetEntry(), SplitedAmount);
+        pItemChar->SetCount(pItemChar->GetCount() - SplitedAmount);
         pItemChar->SetState(ITEM_CHANGED);
         pl->SaveInventoryAndGoldToDB();
         StoreItem(BankTab, dest, pNewItem);
@@ -2271,10 +2414,10 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
             // logging item move to bank
             if (pl->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE))
             {
-                sLog.outCommand(pl->GetSession()->GetAccountId(),"GM %s (Account: %u) deposit item: %s (Entry: %d Count: %u) to guild bank (Guild ID: %u )",
-                    pl->GetName(),pl->GetSession()->GetAccountId(),
-                    pItemChar->GetProto()->Name1, pItemChar->GetEntry(), pItemChar->GetCount(),
-                    m_Id);
+                sLog.outCommand(pl->GetSession()->GetAccountId(), "GM %s (Account: %u) deposit item: %s (Entry: %d Count: %u) to guild bank (Guild ID: %u )",
+                                pl->GetName(), pl->GetSession()->GetAccountId(),
+                                pItemChar->GetProto()->Name1, pItemChar->GetEntry(), pItemChar->GetCount(),
+                                m_Id);
             }
 
             CharacterDatabase.BeginTransaction();
@@ -2297,7 +2440,7 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
                 msg = pl->CanStoreItem(PlayerBag, PlayerSlot, iDest, pItemBank, true);
                 if (msg != EQUIP_ERR_OK)
                 {
-                    pl->SendEquipError( msg, pItemBank, NULL );
+                    pl->SendEquipError(msg, pItemBank, NULL);
                     return;
                 }
             }
@@ -2306,7 +2449,7 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
             msg = CanStoreItem(BankTab, BankTabSlot, gDest, pItemChar->GetCount(), pItemChar, true);
             if (msg != EQUIP_ERR_OK)
             {
-                pl->SendEquipError( msg, pItemChar, NULL );
+                pl->SendEquipError(msg, pItemChar, NULL);
                 return;
             }
 
@@ -2322,9 +2465,9 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
             if (pl->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE))
             {
                 sLog.outCommand(pl->GetSession()->GetAccountId(), "GM %s (Account: %u) deposit item: %s (Entry: %d Count: %u) to guild bank (Guild ID: %u )",
-                    pl->GetName(), pl->GetSession()->GetAccountId(),
-                    pItemChar->GetProto()->Name1, pItemChar->GetEntry(), pItemChar->GetCount(),
-                    m_Id);
+                                pl->GetName(), pl->GetSession()->GetAccountId(),
+                                pItemChar->GetProto()->Name1, pItemChar->GetEntry(), pItemChar->GetCount(),
+                                m_Id);
             }
 
             CharacterDatabase.BeginTransaction();
@@ -2354,7 +2497,7 @@ void Guild::BroadcastEvent(GuildEvents event, ObjectGuid guid, char const* str1
 {
     uint8 strCount = !str1 ? 0 : (!str2 ? 1 : (!str3 ? 2 : 3));
 
-    WorldPacket data(SMSG_GUILD_EVENT, 1 + 1 + 1*strCount + (!guid ? 0 : 8));
+    WorldPacket data(SMSG_GUILD_EVENT, 1 + 1 + 1 * strCount + (!guid ? 0 : 8));
     data << uint8(event);
     data << uint8(strCount);
 
@@ -2380,30 +2523,9 @@ void Guild::BroadcastEvent(GuildEvents event, ObjectGuid guid, char const* str1
     DEBUG_LOG("WORLD: Sent SMSG_GUILD_EVENT");
 }
 
-void Guild::DeleteGuildBankItems( bool alsoInDB /*= false*/ )
-{
-    for (size_t i = 0; i < m_TabListMap.size(); ++i)
-    {
-        for (uint8 j = 0; j < GUILD_BANK_MAX_SLOTS; ++j)
-        {
-            if (Item* pItem = m_TabListMap[i]->Slots[j])
-            {
-                pItem->RemoveFromWorld();
-
-                if (alsoInDB)
-                    pItem->DeleteFromDB();
-
-                delete pItem;
-            }
-        }
-        delete m_TabListMap[i];
-    }
-    m_TabListMap.clear();
-}
-
-bool GuildItemPosCount::isContainedIn(GuildItemPosCountVec const &vec) const
+bool GuildItemPosCount::isContainedIn(GuildItemPosCountVec const& vec) const
 {
-    for(GuildItemPosCountVec::const_iterator itr = vec.begin(); itr != vec.end(); ++itr)
+    for (GuildItemPosCountVec::const_iterator itr = vec.begin(); itr != vec.end(); ++itr)
         if (itr->Slot == this->Slot)
             return true;
 
diff --git a/src/game/Guild.h b/src/game/Guild.h
index 4b4aef1244a..582b9a5c356 100644
--- a/src/game/Guild.h
+++ b/src/game/Guild.h
@@ -34,14 +34,14 @@ class Item;
 
 enum GuildDefaultRanks
 {
-    //these ranks can be modified, but they cannot be deleted
+    // these ranks can be modified, but they cannot be deleted
     GR_GUILDMASTER  = 0,
     GR_OFFICER      = 1,
     GR_VETERAN      = 2,
     GR_MEMBER       = 3,
     GR_INITIATE     = 4,
-    //When promoting member server does: rank--;!
-    //When demoting member server does: rank++;!
+    // When promoting member server does: rank--;!
+    // When demoting member server does: rank++;!
 };
 
 enum GuildRankRights
@@ -191,7 +191,7 @@ enum GuildEmblem
 
 inline uint32 GetGuildBankTabPrice(uint8 Index)
 {
-    switch(Index)
+    switch (Index)
     {
         case 0: return 100;
         case 1: return 250;
@@ -225,8 +225,8 @@ struct GuildBankEventLogEntry
     bool isMoneyEvent() const
     {
         return EventType == GUILD_BANK_LOG_DEPOSIT_MONEY ||
-            EventType == GUILD_BANK_LOG_WITHDRAW_MONEY ||
-            EventType == GUILD_BANK_LOG_REPAIR_MONEY;
+               EventType == GUILD_BANK_LOG_WITHDRAW_MONEY ||
+               EventType == GUILD_BANK_LOG_REPAIR_MONEY;
     }
 };
 
@@ -279,7 +279,7 @@ struct RankInfo
 {
     RankInfo(const std::string& _name, uint32 _rights, uint32 _money) : Name(_name), Rights(_rights), BankMoneyPerDay(_money)
     {
-        for(uint8 i = 0; i < GUILD_BANK_MAX_TABS; ++i)
+        for (uint8 i = 0; i < GUILD_BANK_MAX_TABS; ++i)
         {
             TabRight[i] = 0;
             TabSlotPerDay[i] = 0;
@@ -303,11 +303,10 @@ class Guild
         void CreateDefaultGuildRanks(int locale_idx);
         void Disband();
 
-        void DeleteGuildBankItems(bool alsoInDB = false);
         typedef UNORDERED_MAP<uint32, MemberSlot> MemberList;
         typedef std::vector<RankInfo> RankList;
 
-        uint32 GetId(){ return m_Id; }
+        uint32 GetId() { return m_Id; }
         ObjectGuid GetLeaderGuid() const { return m_LeaderGuid; }
         std::string const& GetName() const { return m_Name; }
         std::string const& GetMOTD() const { return MOTD; }
@@ -324,7 +323,7 @@ class Guild
         void SetLeader(ObjectGuid guid);
         bool AddMember(ObjectGuid plGuid, uint32 plRank);
         bool DelMember(ObjectGuid guid, bool isDisbanding = false);
-        //lowest rank is the count of ranks - 1 (the highest rank_id in table)
+        // lowest rank is the count of ranks - 1 (the highest rank_id in table)
         uint32 GetLowestRank() const { return m_Ranks.size() - 1; }
 
         void SetMOTD(std::string motd);
@@ -334,15 +333,17 @@ class Guild
         uint32 GetMemberSize() const { return members.size(); }
         uint32 GetAccountsNumber();
 
-        bool LoadGuildFromDB(QueryResult *guildDataResult);
+        bool LoadGuildFromDB(QueryResult* guildDataResult);
         bool CheckGuildStructure();
-        bool LoadRanksFromDB(QueryResult *guildRanksResult);
-        bool LoadMembersFromDB(QueryResult *guildMembersResult);
+        bool LoadRanksFromDB(QueryResult* guildRanksResult);
+        bool LoadMembersFromDB(QueryResult* guildMembersResult);
 
-        void BroadcastToGuild(WorldSession *session, const std::string& msg, uint32 language = LANG_UNIVERSAL);
-        void BroadcastToOfficers(WorldSession *session, const std::string& msg, uint32 language = LANG_UNIVERSAL);
-        void BroadcastPacketToRank(WorldPacket *packet, uint32 rankId);
-        void BroadcastPacket(WorldPacket *packet);
+        void BroadcastToGuild(WorldSession* session, const std::string& msg, uint32 language = LANG_UNIVERSAL);
+        void BroadcastToOfficers(WorldSession* session, const std::string& msg, uint32 language = LANG_UNIVERSAL);
+        void BroadcastPacketToRank(WorldPacket* packet, uint32 rankId);
+        void BroadcastPacket(WorldPacket* packet);
+        // for calendar
+        void MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 maxLevel, uint32 minRank);
 
         void BroadcastEvent(GuildEvents event, ObjectGuid guid, char const* str1 = NULL, char const* str2 = NULL, char const* str3 = NULL);
         void BroadcastEvent(GuildEvents event, char const* str1 = NULL, char const* str2 = NULL, char const* str3 = NULL)
@@ -353,13 +354,13 @@ class Guild
         template<class Do>
         void BroadcastWorker(Do& _do, Player* except = NULL)
         {
-            for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr)
-                if(Player *player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first)))
-                    if(player != except)
+            for (MemberList::iterator itr = members.begin(); itr != members.end(); ++itr)
+                if (Player* player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first)))
+                    if (player != except)
                         _do(player);
         }
 
-        void CreateRank(std::string name,uint32 rights);
+        void CreateRank(std::string name, uint32 rights);
         void DelRank();
         std::string GetRankName(uint32 rankId);
         uint32 GetRankRights(uint32 rankId);
@@ -386,65 +387,66 @@ class Guild
 
         MemberSlot* GetMemberSlot(const std::string& name)
         {
-            for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr)
-                if(itr->second.Name == name)
+            for (MemberList::iterator itr = members.begin(); itr != members.end(); ++itr)
+                if (itr->second.Name == name)
                     return &itr->second;
 
             return NULL;
         }
 
-        void Roster(WorldSession *session = NULL);          // NULL = broadcast
-        void Query(WorldSession *session);
+        void Roster(WorldSession* session = NULL);          // NULL = broadcast
+        void Query(WorldSession* session);
+
+        void OnMemberLogin() { ++m_onlineMembers; }
+        void OnMemberLogout(Player* pPlayer);
 
         // Guild EventLog
-        void   LoadGuildEventLogFromDB();
-        void   DisplayGuildEventLog(WorldSession *session);
-        void   LogGuildEvent(uint8 EventType, ObjectGuid playerGuid1, ObjectGuid playerGuid2 = ObjectGuid(), uint8 newRank = 0);
+        void DisplayGuildEventLog(WorldSession* session);
+        void LogGuildEvent(uint8 EventType, ObjectGuid playerGuid1, ObjectGuid playerGuid2 = ObjectGuid(), uint8 newRank = 0);
 
         // ** Guild bank **
+        bool IsGuildBankLoaded() const { return m_loadState & GBLS_GUILD_BANK_LOADED; }
+
         // Content & item deposit/withdraw
-        void   DisplayGuildBankContent(WorldSession *session, uint8 TabId);
-        void   DisplayGuildBankMoneyUpdate(WorldSession *session);
+        void DisplayGuildBankContent(WorldSession* session, uint8 TabId);
+        void DisplayGuildBankMoneyUpdate(WorldSession* session);
 
-        void   SwapItems( Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankTabDst, uint8 BankTabSlotDst, uint32 SplitedAmount);
-        void   MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 PlayerBag, uint8 PlayerSlot, uint32 SplitedAmount);
-        void   MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot, uint8 BankTab, uint8 BankTabSlot, uint32 SplitedAmount);
+        void SwapItems(Player* pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankTabDst, uint8 BankTabSlotDst, uint32 SplitedAmount);
+        void MoveFromBankToChar(Player* pl, uint8 BankTab, uint8 BankTabSlot, uint8 PlayerBag, uint8 PlayerSlot, uint32 SplitedAmount);
+        void MoveFromCharToBank(Player* pl, uint8 PlayerBag, uint8 PlayerSlot, uint8 BankTab, uint8 BankTabSlot, uint32 SplitedAmount);
 
         // Tabs
-        void   DisplayGuildBankTabsInfo(WorldSession *session);
-        void   CreateNewBankTab();
-        void   SetGuildBankTabText(uint8 TabId, std::string text);
-        void   SendGuildBankTabText(WorldSession *session, uint8 TabId);
-        void   SetGuildBankTabInfo(uint8 TabId, std::string name, std::string icon);
-        uint8  GetPurchasedTabs() const { return m_TabListMap.size(); }
+        void DisplayGuildBankTabsInfo(WorldSession* session);
+        void CreateNewBankTab();
+        void SetGuildBankTabText(uint8 TabId, std::string text);
+        void SendGuildBankTabText(WorldSession* session, uint8 TabId);
+        void SetGuildBankTabInfo(uint8 TabId, std::string name, std::string icon);
+        uint8  GetPurchasedTabs() const { return m_PurchasedTabs; }
         uint32 GetBankRights(uint32 rankId, uint8 TabId) const;
-        bool   IsMemberHaveRights(uint32 LowGuid, uint8 TabId,uint32 rights) const;
-        bool   CanMemberViewTab(uint32 LowGuid, uint8 TabId) const;
-        // Load
-        void   LoadGuildBankFromDB();
+        bool IsMemberHaveRights(uint32 LowGuid, uint8 TabId, uint32 rights) const;
+        bool CanMemberViewTab(uint32 LowGuid, uint8 TabId) const;
         // Money deposit/withdraw
-        void   SendMoneyInfo(WorldSession *session, uint32 LowGuid);
-        bool   MemberMoneyWithdraw(uint32 amount, uint32 LowGuid);
+        void SendMoneyInfo(WorldSession* session, uint32 LowGuid);
+        bool MemberMoneyWithdraw(uint32 amount, uint32 LowGuid);
         uint64 GetGuildBankMoney() { return m_GuildBankMoney; }
-        void   SetBankMoney(int64 money);
+        void SetBankMoney(int64 money);
         // per days
-        bool   MemberItemWithdraw(uint8 TabId, uint32 LowGuid);
+        bool MemberItemWithdraw(uint8 TabId, uint32 LowGuid);
         uint32 GetMemberSlotWithdrawRem(uint32 LowGuid, uint8 TabId);
         uint32 GetMemberMoneyWithdrawRem(uint32 LowGuid);
-        void   SetBankMoneyPerDay(uint32 rankId, uint32 money);
-        void   SetBankRightsAndSlots(uint32 rankId, uint8 TabId, uint32 right, uint32 SlotPerDay, bool db);
+        void SetBankMoneyPerDay(uint32 rankId, uint32 money);
+        void SetBankRightsAndSlots(uint32 rankId, uint8 TabId, uint32 right, uint32 SlotPerDay, bool db);
         uint32 GetBankMoneyPerDay(uint32 rankId);
         uint32 GetBankSlotPerDay(uint32 rankId, uint8 TabId);
         // rights per day
-        bool   LoadBankRightsFromDB(QueryResult *guildBankTabRightsResult);
+        bool LoadBankRightsFromDB(QueryResult* guildBankTabRightsResult);
         // Guild Bank Event Logs
-        void   LoadGuildBankEventLogFromDB();
-        void   DisplayGuildBankLogs(WorldSession *session, uint8 TabId);
-        void   LogBankEvent(uint8 EventType, uint8 TabId, uint32 PlayerGuidLow, uint32 ItemOrMoney, uint8 ItemStackCount=0, uint8 DestTabId=0);
-        bool   AddGBankItemToDB(uint32 GuildId, uint32 BankTab , uint32 BankTabSlot , uint32 GUIDLow, uint32 Entry );
+        void DisplayGuildBankLogs(WorldSession* session, uint8 TabId);
+        void LogBankEvent(uint8 EventType, uint8 TabId, uint32 PlayerGuidLow, uint32 ItemOrMoney, uint8 ItemStackCount = 0, uint8 DestTabId = 0);
+        bool AddGBankItemToDB(uint32 GuildId, uint32 BankTab , uint32 BankTabSlot , uint32 GUIDLow, uint32 Entry);
 
     protected:
-        void AddRank(const std::string& name,uint32 rights,uint32 money);
+        void AddRank(const std::string& name, uint32 rights, uint32 money);
 
         uint32 m_Id;
         std::string m_Name;
@@ -479,23 +481,46 @@ class Guild
         uint32 m_GuildBankEventLogNextGuid_Item[GUILD_BANK_MAX_TABS];
 
         uint64 m_GuildBankMoney;
-
+        uint8 m_PurchasedTabs;
     private:
         void UpdateAccountsNumber() { m_accountsNumber = 0;}// mark for lazy calculation at request in GetAccountsNumber
         void _ChangeRank(ObjectGuid guid, MemberSlot* slot, uint32 newRank);
 
         // used only from high level Swap/Move functions
         Item*  GetItem(uint8 TabId, uint8 SlotId);
-        InventoryResult CanStoreItem( uint8 tab, uint8 slot, GuildItemPosCountVec& dest, uint32 count, Item *pItem, bool swap = false) const;
-        Item*  StoreItem( uint8 tab, GuildItemPosCountVec const& pos, Item *pItem );
-        void   RemoveItem(uint8 tab, uint8 slot );
+        InventoryResult CanStoreItem(uint8 tab, uint8 slot, GuildItemPosCountVec& dest, uint32 count, Item* pItem, bool swap = false) const;
+        Item*  StoreItem(uint8 tab, GuildItemPosCountVec const& pos, Item* pItem);
+        void   RemoveItem(uint8 tab, uint8 slot);
         void   DisplayGuildBankContentUpdate(uint8 TabId, int32 slot1, int32 slot2 = -1);
         void   DisplayGuildBankContentUpdate(uint8 TabId, GuildItemPosCountVec const& slots);
 
         // internal common parts for CanStore/StoreItem functions
-        void AppendDisplayGuildBankSlot( WorldPacket& data, GuildBankTab const *tab, int32 slot );
-        InventoryResult _CanStoreItem_InSpecificSlot( uint8 tab, uint8 slot, GuildItemPosCountVec& dest, uint32& count, bool swap, Item *pSrcItem ) const;
-        InventoryResult _CanStoreItem_InTab( uint8 tab, GuildItemPosCountVec& dest, uint32& count, bool merge, Item *pSrcItem, uint8 skip_slot ) const;
-        Item* _StoreItem( uint8 tab, uint8 slot, Item *pItem, uint32 count, bool clone );
+        void AppendDisplayGuildBankSlot(WorldPacket& data, GuildBankTab const* tab, int32 slot);
+        InventoryResult _CanStoreItem_InSpecificSlot(uint8 tab, uint8 slot, GuildItemPosCountVec& dest, uint32& count, bool swap, Item* pSrcItem) const;
+        InventoryResult _CanStoreItem_InTab(uint8 tab, GuildItemPosCountVec& dest, uint32& count, bool merge, Item* pSrcItem, uint8 skip_slot) const;
+        Item* _StoreItem(uint8 tab, uint8 slot, Item* pItem, uint32 count, bool clone);
+
+        enum GBLoadState
+        {
+            GBLS_NOT_LOADED        = 0,
+            GBLS_GUILD_BANK_LOADED = 1,
+            GBLS_EVENT_LOG_LOADED  = 2
+        };
+
+        void LoadGuildBankFromDB();
+        void UnloadGuildBank(bool deleteItemsInDB = false);
+
+        void LoadGuildBankEventLogFromDB();
+        void UnloadGuildBankEventLog();
+
+        void LoadGuildEventLogFromDB();
+        void UnloadGuildEventLog();
+
+        bool IsEventLogLoaded() const { return m_loadState & GBLS_EVENT_LOG_LOADED; }
+        void SetGuildBankLoaded(bool loaded) { loaded ? m_loadState |= GBLS_GUILD_BANK_LOADED : m_loadState &= ~GBLS_GUILD_BANK_LOADED; }
+        void SetEventLogLoaded(bool loaded) { loaded ? m_loadState |= GBLS_EVENT_LOG_LOADED : m_loadState &= ~GBLS_EVENT_LOG_LOADED; }
+
+        uint32 m_onlineMembers;
+        uint8  m_loadState;
 };
 #endif
diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp
index 47f95a77874..e58188b8c09 100644
--- a/src/game/GuildHandler.cpp
+++ b/src/game/GuildHandler.cpp
@@ -20,6 +20,7 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "World.h"
+#include "AccountMgr.h"
 #include "ObjectMgr.h"
 #include "Log.h"
 #include "Opcodes.h"
@@ -27,6 +28,7 @@
 #include "GuildMgr.h"
 #include "GossipDef.h"
 #include "SocialMgr.h"
+#include "Calendar.h"
 
 void WorldSession::HandleGuildQueryOpcode(WorldPacket& recvPacket)
 {
@@ -51,11 +53,17 @@ void WorldSession::HandleGuildCreateOpcode(WorldPacket& recvPacket)
     std::string gname;
     recvPacket >> gname;
 
-    if(GetPlayer()->GetGuildId())                           // already in guild
+    if (!GetPlayer()->isGameMaster())
+    {
+        sLog.outError("WorldSession::HandleGuildCreateOpcode Possible hacking-attempt: %s tried to create a guild [Name: %s] using cheats!", GetPlayer()->GetObjectGuid().GetString().c_str(), gname.c_str());
+        return;
+    }
+
+    if (GetPlayer()->GetGuildId())                          // already in guild
         return;
 
-    Guild *guild = new Guild;
-    if(!guild->Create(GetPlayer(), gname))
+    Guild* guild = new Guild;
+    if (!guild->Create(GetPlayer(), gname))
     {
         delete guild;
         return;
@@ -69,28 +77,28 @@ void WorldSession::HandleGuildInviteOpcode(WorldPacket& recvPacket)
     DEBUG_LOG("WORLD: Received CMSG_GUILD_INVITE");
 
     std::string Invitedname, plname;
-    Player * player = NULL;
+    Player* player = NULL;
 
     recvPacket >> Invitedname;
 
-    if(normalizePlayerName(Invitedname))
+    if (normalizePlayerName(Invitedname))
         player = ObjectAccessor::FindPlayerByName(Invitedname.c_str());
 
-    if(!player)
+    if (!player)
     {
         SendGuildCommandResult(GUILD_INVITE_S, Invitedname, ERR_GUILD_PLAYER_NOT_FOUND_S);
         return;
     }
 
     Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId());
-    if(!guild)
+    if (!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", ERR_GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
 
     // OK result but not send invite
-    if(player->GetSocial()->HasIgnore(GetPlayer()->GetObjectGuid()))
+    if (player->GetSocial()->HasIgnore(GetPlayer()->GetObjectGuid()))
         return;
 
     // not let enemies sign guild charter
@@ -100,21 +108,21 @@ void WorldSession::HandleGuildInviteOpcode(WorldPacket& recvPacket)
         return;
     }
 
-    if(player->GetGuildId())
+    if (player->GetGuildId())
     {
         plname = player->GetName();
         SendGuildCommandResult(GUILD_INVITE_S, plname, ERR_ALREADY_IN_GUILD_S);
         return;
     }
 
-    if(player->GetGuildIdInvited())
+    if (player->GetGuildIdInvited())
     {
         plname = player->GetName();
         SendGuildCommandResult(GUILD_INVITE_S, plname, ERR_ALREADY_INVITED_TO_GUILD_S);
         return;
     }
 
-    if(!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_INVITE))
+    if (!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_INVITE))
     {
         SendGuildCommandResult(GUILD_INVITE_S, "", ERR_GUILD_PERMISSIONS);
         return;
@@ -126,7 +134,7 @@ void WorldSession::HandleGuildInviteOpcode(WorldPacket& recvPacket)
     // Put record into guildlog
     guild->LogGuildEvent(GUILD_EVENT_LOG_INVITE_PLAYER, GetPlayer()->GetObjectGuid(), player->GetObjectGuid());
 
-    WorldPacket data(SMSG_GUILD_INVITE, (8+10));            // guess size
+    WorldPacket data(SMSG_GUILD_INVITE, (8 + 10));          // guess size
     data << GetPlayer()->GetName();
     data << guild->GetName();
     player->GetSession()->SendPacket(&data);
@@ -177,8 +185,9 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
         return;
     }
 
+    ObjectGuid memberGuid = slot->guid;
     // possible last member removed, do cleanup, and no need events
-    if (guild->DelMember(slot->guid))
+    if (guild->DelMember(memberGuid))
     {
         guild->Disband();
         delete guild;
@@ -186,15 +195,15 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
     }
 
     // Put record into guild log
-    guild->LogGuildEvent(GUILD_EVENT_LOG_UNINVITE_PLAYER, GetPlayer()->GetObjectGuid(), slot->guid);
+    guild->LogGuildEvent(GUILD_EVENT_LOG_UNINVITE_PLAYER, GetPlayer()->GetObjectGuid(), memberGuid);
 
     guild->BroadcastEvent(GE_REMOVED, plName.c_str(), _player->GetName());
 }
 
 void WorldSession::HandleGuildAcceptOpcode(WorldPacket& /*recvPacket*/)
 {
-    Guild *guild;
-    Player *player = GetPlayer();
+    Guild* guild;
+    Player* player = GetPlayer();
 
     DEBUG_LOG("WORLD: Received CMSG_GUILD_ACCEPT");
 
@@ -203,10 +212,10 @@ void WorldSession::HandleGuildAcceptOpcode(WorldPacket& /*recvPacket*/)
         return;
 
     // not let enemies sign guild charter
-    if (!sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GUILD) && player->GetTeam() != sObjectMgr.GetPlayerTeamByGUID(guild->GetLeaderGuid()))
+    if (!sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GUILD) && player->GetTeam() != sAccountMgr.GetPlayerTeamByGUID(guild->GetLeaderGuid()))
         return;
 
-    if (!guild->AddMember(GetPlayer()->GetObjectGuid(),guild->GetLowestRank()))
+    if (!guild->AddMember(GetPlayer()->GetObjectGuid(), guild->GetLowestRank()))
         return;
     // Put record into guild log
     guild->LogGuildEvent(GUILD_EVENT_LOG_JOIN_GUILD, GetPlayer()->GetObjectGuid());
@@ -227,7 +236,7 @@ void WorldSession::HandleGuildInfoOpcode(WorldPacket& /*recvPacket*/)
     DEBUG_LOG("WORLD: Received CMSG_GUILD_INFO");
 
     Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId());
-    if(!guild)
+    if (!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", ERR_GUILD_PLAYER_NOT_IN_GUILD);
         return;
@@ -235,7 +244,7 @@ void WorldSession::HandleGuildInfoOpcode(WorldPacket& /*recvPacket*/)
 
     WorldPacket data(SMSG_GUILD_INFO, (guild->GetName().size() + 4 + 4 + 4));
     data << guild->GetName();
-    data << uint32(secsToTimeBitFields(guild->GetCreatedDate())); // 3.x (prev. day + month + year)
+    data.AppendPackedTime(guild->GetCreatedDate());         // 3.x (prev. day + month + year)
     data << uint32(guild->GetMemberSize());                 // amount of chars
     data << uint32(guild->GetAccountsNumber());             // amount of accounts
     SendPacket(&data);
@@ -256,7 +265,7 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket)
     std::string plName;
     recvPacket >> plName;
 
-    if(!normalizePlayerName(plName))
+    if (!normalizePlayerName(plName))
         return;
 
     Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId());
@@ -293,7 +302,7 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket)
         return;
     }
 
-    uint32 newRankId = slot->RankId - 1;                    //when promoting player, rank is decreased
+    uint32 newRankId = slot->RankId - 1;                    // when promoting player, rank is decreased
 
     slot->ChangeRank(newRankId);
     // Put record into guild log
@@ -309,18 +318,18 @@ void WorldSession::HandleGuildDemoteOpcode(WorldPacket& recvPacket)
     std::string plName;
     recvPacket >> plName;
 
-    if(!normalizePlayerName(plName))
+    if (!normalizePlayerName(plName))
         return;
 
     Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId());
 
-    if(!guild)
+    if (!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", ERR_GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
 
-    if(!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_DEMOTE))
+    if (!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_DEMOTE))
     {
         SendGuildCommandResult(GUILD_INVITE_S, "", ERR_GUILD_PERMISSIONS);
         return;
@@ -354,7 +363,7 @@ void WorldSession::HandleGuildDemoteOpcode(WorldPacket& recvPacket)
         return;
     }
 
-    uint32 newRankId = slot->RankId + 1;                    //when demoting player, rank is increased
+    uint32 newRankId = slot->RankId + 1;                    // when demoting player, rank is increased
 
     slot->ChangeRank(newRankId);
     // Put record into guild log
@@ -380,6 +389,8 @@ void WorldSession::HandleGuildLeaveOpcode(WorldPacket& /*recvPacket*/)
         return;
     }
 
+    sCalendarMgr.RemoveGuildCalendar(_player->GetObjectGuid(), guild->GetId());
+
     if (_player->GetObjectGuid() == guild->GetLeaderGuid())
     {
         guild->Disband();
@@ -432,9 +443,9 @@ void WorldSession::HandleGuildLeaderOpcode(WorldPacket& recvPacket)
     std::string name;
     recvPacket >> name;
 
-    Player *oldLeader = GetPlayer();
+    Player* oldLeader = GetPlayer();
 
-    if(!normalizePlayerName(name))
+    if (!normalizePlayerName(name))
         return;
 
     Guild* guild = sGuildMgr.GetGuildById(oldLeader->GetGuildId());
@@ -503,10 +514,10 @@ void WorldSession::HandleGuildSetPublicNoteOpcode(WorldPacket& recvPacket)
 {
     DEBUG_LOG("WORLD: Received CMSG_GUILD_SET_PUBLIC_NOTE");
 
-    std::string name,PNOTE;
+    std::string name, PNOTE;
     recvPacket >> name;
 
-    if(!normalizePlayerName(name))
+    if (!normalizePlayerName(name))
         return;
 
     Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId());
@@ -678,9 +689,9 @@ void WorldSession::HandleGuildDelRankOpcode(WorldPacket& /*recvPacket*/)
     guild->Roster();                                        // broadcast for tab rights update
 }
 
-void WorldSession::SendGuildCommandResult(uint32 typecmd, const std::string& str,uint32 cmdresult)
+void WorldSession::SendGuildCommandResult(uint32 typecmd, const std::string& str, uint32 cmdresult)
 {
-    WorldPacket data(SMSG_GUILD_COMMAND_RESULT, (8+str.size()+1));
+    WorldPacket data(SMSG_GUILD_COMMAND_RESULT, (8 + str.size() + 1));
     data << typecmd;
     data << str;
     data << cmdresult;
@@ -697,13 +708,13 @@ void WorldSession::HandleGuildChangeInfoTextOpcode(WorldPacket& recvPacket)
     recvPacket >> GINFO;
 
     Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId());
-    if(!guild)
+    if (!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", ERR_GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
 
-    if(!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_MODIFY_GUILD_INFO))
+    if (!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_MODIFY_GUILD_INFO))
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", ERR_GUILD_PERMISSIONS);
         return;
@@ -722,7 +733,7 @@ void WorldSession::HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket)
     recvPacket >> vendorGuid;
     recvPacket >> EmblemStyle >> EmblemColor >> BorderStyle >> BorderColor >> BackgroundColor;
 
-    Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorGuid, UNIT_NPC_FLAG_TABARDDESIGNER);
+    Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorGuid, UNIT_NPC_FLAG_TABARDDESIGNER);
     if (!pCreature)
     {
         //"That's not an emblem vendor!"
@@ -750,14 +761,14 @@ void WorldSession::HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket)
         return;
     }
 
-    if (GetPlayer()->GetMoney() < 10*GOLD)
+    if (GetPlayer()->GetMoney() < 10 * GOLD)
     {
         //"You can't afford to do that."
         SendSaveGuildEmblem(ERR_GUILDEMBLEM_NOTENOUGHMONEY);
         return;
     }
 
-    GetPlayer()->ModifyMoney(-10*GOLD);
+    GetPlayer()->ModifyMoney(-10 * GOLD);
     guild->SetEmblem(EmblemStyle, EmblemColor, BorderStyle, BorderColor, BackgroundColor);
 
     //"Guild Emblem saved."
@@ -768,43 +779,47 @@ void WorldSession::HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket)
 
 void WorldSession::HandleGuildEventLogQueryOpcode(WorldPacket& /* recvPacket */)
 {
-                                                            // empty
+    // empty
     DEBUG_LOG("WORLD: Received (MSG_GUILD_EVENT_LOG_QUERY)");
 
-    if(uint32 GuildId = GetPlayer()->GetGuildId())
+    if (uint32 GuildId = GetPlayer()->GetGuildId())
+    {
         if (Guild* pGuild = sGuildMgr.GetGuildById(GuildId))
             pGuild->DisplayGuildEventLog(this);
+    }
 }
 
 /******  GUILD BANK  *******/
 
-void WorldSession::HandleGuildBankMoneyWithdrawn( WorldPacket & /* recv_data */ )
+void WorldSession::HandleGuildBankMoneyWithdrawn(WorldPacket& /* recv_data */)
 {
     DEBUG_LOG("WORLD: Received (MSG_GUILD_BANK_MONEY_WITHDRAWN)");
 
-    if(uint32 GuildId = GetPlayer()->GetGuildId())
+    if (uint32 GuildId = GetPlayer()->GetGuildId())
+    {
         if (Guild* pGuild = sGuildMgr.GetGuildById(GuildId))
             pGuild->SendMoneyInfo(this, GetPlayer()->GetGUIDLow());
+    }
 }
 
-void WorldSession::HandleGuildPermissions( WorldPacket& /* recv_data */ )
+void WorldSession::HandleGuildPermissions(WorldPacket& /* recv_data */)
 {
     DEBUG_LOG("WORLD: Received (MSG_GUILD_PERMISSIONS)");
 
-    if(uint32 GuildId = GetPlayer()->GetGuildId())
+    if (uint32 GuildId = GetPlayer()->GetGuildId())
     {
         if (Guild* pGuild = sGuildMgr.GetGuildById(GuildId))
         {
             uint32 rankId = GetPlayer()->GetRank();
 
-            WorldPacket data(MSG_GUILD_PERMISSIONS, 4*15+1);
-            data << uint32(rankId);                                 // guild rank id
-            data << uint32(pGuild->GetRankRights(rankId));          // rank rights
+            WorldPacket data(MSG_GUILD_PERMISSIONS, 4 * 15 + 1);
+            data << uint32(rankId);                         // guild rank id
+            data << uint32(pGuild->GetRankRights(rankId));  // rank rights
             // money per day left
             data << uint32(pGuild->GetMemberMoneyWithdrawRem(GetPlayer()->GetGUIDLow()));
-            data << uint8(pGuild->GetPurchasedTabs());              // tabs count
+            data << uint8(pGuild->GetPurchasedTabs());      // tabs count
             // why sending all info when not all tabs are purchased???
-            for(int i = 0; i < GUILD_BANK_MAX_TABS; ++i)
+            for (int i = 0; i < GUILD_BANK_MAX_TABS; ++i)
             {
                 data << uint32(pGuild->GetBankRights(rankId, uint8(i)));
                 data << uint32(pGuild->GetMemberSlotWithdrawRem(GetPlayer()->GetGUIDLow(), uint8(i)));
@@ -816,7 +831,7 @@ void WorldSession::HandleGuildPermissions( WorldPacket& /* recv_data */ )
 }
 
 /* Called when clicking on Guild bank gameobject */
-void WorldSession::HandleGuildBankerActivate( WorldPacket & recv_data )
+void WorldSession::HandleGuildBankerActivate(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANKER_ACTIVATE)");
 
@@ -840,7 +855,7 @@ void WorldSession::HandleGuildBankerActivate( WorldPacket & recv_data )
 }
 
 /* Called when opening guild bank tab only (first one) */
-void WorldSession::HandleGuildBankQueryTab( WorldPacket & recv_data )
+void WorldSession::HandleGuildBankQueryTab(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_QUERY_TAB)");
 
@@ -859,7 +874,7 @@ void WorldSession::HandleGuildBankQueryTab( WorldPacket & recv_data )
     if (!pGuild)
         return;
 
-    if (TabId >= pGuild->GetPurchasedTabs())
+    if (!pGuild->IsGuildBankLoaded() || TabId >= pGuild->GetPurchasedTabs())
         return;
 
     // Let's update the amount of gold the player can withdraw before displaying the content
@@ -868,7 +883,7 @@ void WorldSession::HandleGuildBankQueryTab( WorldPacket & recv_data )
     pGuild->DisplayGuildBankContent(this, TabId);
 }
 
-void WorldSession::HandleGuildBankDepositMoney( WorldPacket & recv_data )
+void WorldSession::HandleGuildBankDepositMoney(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_DEPOSIT_MONEY)");
 
@@ -893,22 +908,22 @@ void WorldSession::HandleGuildBankDepositMoney( WorldPacket & recv_data )
     if (!pGuild)
         return;
 
-    if (!pGuild->GetPurchasedTabs())
+    if (!pGuild->IsGuildBankLoaded() || !pGuild->GetPurchasedTabs())
         return;
 
     CharacterDatabase.BeginTransaction();
 
-    pGuild->SetBankMoney(pGuild->GetGuildBankMoney()+money);
+    pGuild->SetBankMoney(pGuild->GetGuildBankMoney() + money);
     GetPlayer()->ModifyMoney(-int(money));
     GetPlayer()->SaveGoldToDB();
 
     CharacterDatabase.CommitTransaction();
 
     // logging money
-    if(_player->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE))
+    if (_player->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE))
     {
-        sLog.outCommand(_player->GetSession()->GetAccountId(),"GM %s (Account: %u) deposit money (Amount: %u) to guild bank (Guild ID %u)",
-            _player->GetName(),_player->GetSession()->GetAccountId(),money,GuildId);
+        sLog.outCommand(_player->GetSession()->GetAccountId(), "GM %s (Account: %u) deposit money (Amount: %u) to guild bank (Guild ID %u)",
+                        _player->GetName(), _player->GetSession()->GetAccountId(), money, GuildId);
     }
 
     // log
@@ -919,7 +934,7 @@ void WorldSession::HandleGuildBankDepositMoney( WorldPacket & recv_data )
     pGuild->DisplayGuildBankMoneyUpdate(this);
 }
 
-void WorldSession::HandleGuildBankWithdrawMoney( WorldPacket & recv_data )
+void WorldSession::HandleGuildBankWithdrawMoney(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_WITHDRAW_MONEY)");
 
@@ -938,13 +953,13 @@ void WorldSession::HandleGuildBankWithdrawMoney( WorldPacket & recv_data )
         return;
 
     Guild* pGuild = sGuildMgr.GetGuildById(GuildId);
-    if(!pGuild)
+    if (!pGuild)
         return;
 
-    if (!pGuild->GetPurchasedTabs())
+    if (!pGuild->IsGuildBankLoaded() || !pGuild->GetPurchasedTabs())
         return;
 
-    if (pGuild->GetGuildBankMoney()<money)                  // not enough money in bank
+    if (pGuild->GetGuildBankMoney() < money)                // not enough money in bank
         return;
 
     if (!pGuild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_WITHDRAW_GOLD))
@@ -972,7 +987,7 @@ void WorldSession::HandleGuildBankWithdrawMoney( WorldPacket & recv_data )
     pGuild->DisplayGuildBankMoneyUpdate(this);
 }
 
-void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
+void WorldSession::HandleGuildBankSwapItems(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_SWAP_ITEMS)");
 
@@ -998,7 +1013,7 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
     }
 
     Guild* pGuild = sGuildMgr.GetGuildById(GuildId);
-    if (!pGuild)
+    if (!pGuild || !pGuild->IsGuildBankLoaded())
     {
         recv_data.rpos(recv_data.wpos());                   // prevent additional spam at rejected packet
         return;
@@ -1016,9 +1031,9 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
         recv_data >> SplitedAmount;
 
         if (BankTabSlotDst >= GUILD_BANK_MAX_SLOTS ||
-            (BankTabDst == BankTab && BankTabSlotDst == BankTabSlot) ||
-            BankTab >= pGuild->GetPurchasedTabs() ||
-            BankTabDst >= pGuild->GetPurchasedTabs())
+                (BankTabDst == BankTab && BankTabSlotDst == BankTabSlot) ||
+                BankTab >= pGuild->GetPurchasedTabs() ||
+                BankTabDst >= pGuild->GetPurchasedTabs())
         {
             recv_data.rpos(recv_data.wpos());               // prevent additional spam at rejected packet
             return;
@@ -1045,7 +1060,7 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
         }
 
         if ((BankTabSlot >= GUILD_BANK_MAX_SLOTS && BankTabSlot != 0xFF) ||
-            BankTab >= pGuild->GetPurchasedTabs())
+                BankTab >= pGuild->GetPurchasedTabs())
         {
             recv_data.rpos(recv_data.wpos());               // prevent additional spam at rejected packet
             return;
@@ -1065,9 +1080,9 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
     // Player <-> Bank
 
     // allow work with inventory only
-    if(!Player::IsInventoryPos(PlayerBag, PlayerSlot) && !(PlayerBag == NULL_BAG && PlayerSlot == NULL_SLOT) )
+    if (!Player::IsInventoryPos(PlayerBag, PlayerSlot) && !(PlayerBag == NULL_BAG && PlayerSlot == NULL_SLOT))
     {
-        _player->SendEquipError( EQUIP_ERR_NONE, NULL, NULL );
+        _player->SendEquipError(EQUIP_ERR_NONE, NULL, NULL);
         return;
     }
 
@@ -1078,7 +1093,7 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
         pGuild->MoveFromCharToBank(_player, PlayerBag, PlayerSlot, BankTab, BankTabSlot, SplitedAmount);
 }
 
-void WorldSession::HandleGuildBankBuyTab( WorldPacket & recv_data )
+void WorldSession::HandleGuildBankBuyTab(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_BUY_TAB)");
 
@@ -1096,11 +1111,11 @@ void WorldSession::HandleGuildBankBuyTab( WorldPacket & recv_data )
         return;
 
     Guild* pGuild = sGuildMgr.GetGuildById(GuildId);
-    if(!pGuild)
+    if (!pGuild)
         return;
 
     // m_PurchasedTabs = 0 when buying Tab 0, that is why this check can be made
-    if (TabId != pGuild->GetPurchasedTabs())
+    if (!pGuild->IsGuildBankLoaded() || TabId != pGuild->GetPurchasedTabs())
         return;
 
     uint32 TabCost = GetGuildBankTabPrice(TabId) * GOLD;
@@ -1118,7 +1133,7 @@ void WorldSession::HandleGuildBankBuyTab( WorldPacket & recv_data )
     pGuild->DisplayGuildBankTabsInfo(this);
 }
 
-void WorldSession::HandleGuildBankUpdateTab( WorldPacket & recv_data )
+void WorldSession::HandleGuildBankUpdateTab(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_UPDATE_TAB)");
 
@@ -1149,7 +1164,7 @@ void WorldSession::HandleGuildBankUpdateTab( WorldPacket & recv_data )
     if (!pGuild)
         return;
 
-    if (TabId >= pGuild->GetPurchasedTabs())
+    if (!pGuild->IsGuildBankLoaded() || TabId >= pGuild->GetPurchasedTabs())
         return;
 
     pGuild->SetGuildBankTabInfo(TabId, Name, IconIndex);
@@ -1157,7 +1172,7 @@ void WorldSession::HandleGuildBankUpdateTab( WorldPacket & recv_data )
     pGuild->DisplayGuildBankContent(this, TabId);
 }
 
-void WorldSession::HandleGuildBankLogQuery( WorldPacket & recv_data )
+void WorldSession::HandleGuildBankLogQuery(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received (MSG_GUILD_BANK_LOG_QUERY)");
 
@@ -1172,6 +1187,9 @@ void WorldSession::HandleGuildBankLogQuery( WorldPacket & recv_data )
     if (!pGuild)
         return;
 
+    if (!pGuild->IsGuildBankLoaded())
+        return;
+
     // GUILD_BANK_MAX_TABS send by client for money log
     if (TabId >= pGuild->GetPurchasedTabs() && TabId != GUILD_BANK_MAX_TABS)
         return;
@@ -1179,7 +1197,7 @@ void WorldSession::HandleGuildBankLogQuery( WorldPacket & recv_data )
     pGuild->DisplayGuildBankLogs(this, TabId);
 }
 
-void WorldSession::HandleQueryGuildBankTabText(WorldPacket &recv_data)
+void WorldSession::HandleQueryGuildBankTabText(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received MSG_QUERY_GUILD_BANK_TEXT");
 
@@ -1194,13 +1212,13 @@ void WorldSession::HandleQueryGuildBankTabText(WorldPacket &recv_data)
     if (!pGuild)
         return;
 
-    if (TabId >= pGuild->GetPurchasedTabs())
+    if (!pGuild->IsGuildBankLoaded() || TabId >= pGuild->GetPurchasedTabs())
         return;
 
     pGuild->SendGuildBankTabText(this, TabId);
 }
 
-void WorldSession::HandleSetGuildBankTabText(WorldPacket &recv_data)
+void WorldSession::HandleSetGuildBankTabText(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Received CMSG_SET_GUILD_BANK_TEXT");
 
@@ -1217,15 +1235,15 @@ void WorldSession::HandleSetGuildBankTabText(WorldPacket &recv_data)
     if (!pGuild)
         return;
 
-    if (TabId >= pGuild->GetPurchasedTabs())
+    if (!pGuild->IsGuildBankLoaded() || TabId >= pGuild->GetPurchasedTabs())
         return;
 
     pGuild->SetGuildBankTabText(TabId, Text);
 }
 
-void WorldSession::SendSaveGuildEmblem( uint32 msg )
+void WorldSession::SendSaveGuildEmblem(uint32 msg)
 {
     WorldPacket data(MSG_SAVE_GUILD_EMBLEM, 4);
     data << uint32(msg);                                    // not part of guild
-    SendPacket( &data );
+    SendPacket(&data);
 }
diff --git a/src/game/GuildMgr.cpp b/src/game/GuildMgr.cpp
index b1626f32bef..f29a12e5a2e 100644
--- a/src/game/GuildMgr.cpp
+++ b/src/game/GuildMgr.cpp
@@ -21,7 +21,7 @@
 #include "Log.h"
 #include "ObjectGuid.h"
 #include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "ProgressBar.h"
 #include "World.h"
 
@@ -58,7 +58,7 @@ Guild* GuildMgr::GetGuildById(uint32 guildId) const
 
 Guild* GuildMgr::GetGuildByName(std::string const& name) const
 {
-    for(GuildMap::const_iterator itr = m_GuildMap.begin(); itr != m_GuildMap.end(); ++itr)
+    for (GuildMap::const_iterator itr = m_GuildMap.begin(); itr != m_GuildMap.end(); ++itr)
         if (itr->second->GetName() == name)
             return itr->second;
 
@@ -67,7 +67,7 @@ Guild* GuildMgr::GetGuildByName(std::string const& name) const
 
 Guild* GuildMgr::GetGuildByLeader(ObjectGuid const& guid) const
 {
-    for(GuildMap::const_iterator itr = m_GuildMap.begin(); itr != m_GuildMap.end(); ++itr)
+    for (GuildMap::const_iterator itr = m_GuildMap.begin(); itr != m_GuildMap.end(); ++itr)
         if (itr->second->GetLeaderGuid() == guid)
             return itr->second;
 
@@ -89,9 +89,9 @@ void GuildMgr::LoadGuilds()
 
     //                                                    0             1          2          3           4           5           6
     QueryResult* result = CharacterDatabase.Query("SELECT guild.guildid,guild.name,leaderguid,EmblemStyle,EmblemColor,BorderStyle,BorderColor,"
-    //   7               8    9    10         11        12
-        "BackgroundColor,info,motd,createdate,BankMoney,(SELECT COUNT(guild_bank_tab.guildid) FROM guild_bank_tab WHERE guild_bank_tab.guildid = guild.guildid) "
-        "FROM guild ORDER BY guildid ASC");
+                          //   7               8    9    10         11        12
+                          "BackgroundColor,info,motd,createdate,BankMoney,(SELECT COUNT(guild_bank_tab.guildid) FROM guild_bank_tab WHERE guild_bank_tab.guildid = guild.guildid) "
+                          "FROM guild ORDER BY guildid ASC");
 
     if (!result)
     {
@@ -111,13 +111,13 @@ void GuildMgr::LoadGuilds()
     // load guild members
     //                                                                0       1                 2    3     4       5                  6
     QueryResult* guildMembersResult = CharacterDatabase.Query("SELECT guildid,guild_member.guid,rank,pnote,offnote,BankResetTimeMoney,BankRemMoney,"
-    //   7                 8                9                 10               11                12
-        "BankResetTimeTab0,BankRemSlotsTab0,BankResetTimeTab1,BankRemSlotsTab1,BankResetTimeTab2,BankRemSlotsTab2,"
-    //   13                14               15                16               17                18
-        "BankResetTimeTab3,BankRemSlotsTab3,BankResetTimeTab4,BankRemSlotsTab4,BankResetTimeTab5,BankRemSlotsTab5,"
-    //   19               20                21                22               23                      24
-        "characters.name, characters.level, characters.class, characters.zone, characters.logout_time, characters.account "
-        "FROM guild_member LEFT JOIN characters ON characters.guid = guild_member.guid ORDER BY guildid ASC");
+                                      //   7                 8                9                 10               11                12
+                                      "BankResetTimeTab0,BankRemSlotsTab0,BankResetTimeTab1,BankRemSlotsTab1,BankResetTimeTab2,BankRemSlotsTab2,"
+                                      //   13                14               15                16               17                18
+                                      "BankResetTimeTab3,BankRemSlotsTab3,BankResetTimeTab4,BankRemSlotsTab4,BankResetTimeTab5,BankRemSlotsTab5,"
+                                      //   19               20                21                22               23                      24
+                                      "characters.name, characters.level, characters.class, characters.zone, characters.logout_time, characters.account "
+                                      "FROM guild_member LEFT JOIN characters ON characters.guid = guild_member.guid ORDER BY guildid ASC");
 
     // load guild bank tab rights
     //                                                                      0       1     2   3       4
@@ -127,37 +127,35 @@ void GuildMgr::LoadGuilds()
 
     do
     {
-        //Field *fields = result->Fetch();
+        // Field *fields = result->Fetch();
 
         bar.step();
         ++count;
 
         Guild* newGuild = new Guild;
         if (!newGuild->LoadGuildFromDB(result) ||
-            !newGuild->LoadRanksFromDB(guildRanksResult) ||
-            !newGuild->LoadMembersFromDB(guildMembersResult) ||
-            !newGuild->LoadBankRightsFromDB(guildBankTabRightsResult) ||
-            !newGuild->CheckGuildStructure()
-            )
+                !newGuild->LoadRanksFromDB(guildRanksResult) ||
+                !newGuild->LoadMembersFromDB(guildMembersResult) ||
+                !newGuild->LoadBankRightsFromDB(guildBankTabRightsResult) ||
+                !newGuild->CheckGuildStructure()
+           )
         {
             newGuild->Disband();
             delete newGuild;
             continue;
         }
 
-        newGuild->LoadGuildEventLogFromDB();
-        newGuild->LoadGuildBankEventLogFromDB();
-        newGuild->LoadGuildBankFromDB();
         AddGuild(newGuild);
-    } while(result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
     delete guildRanksResult;
     delete guildMembersResult;
     delete guildBankTabRightsResult;
 
-    //delete unused LogGuid records in guild_eventlog and guild_bank_eventlog table
-    //you can comment these lines if you don't plan to change CONFIG_UINT32_GUILD_EVENT_LOG_COUNT and CONFIG_UINT32_GUILD_BANK_EVENT_LOG_COUNT
+    // delete unused LogGuid records in guild_eventlog and guild_bank_eventlog table
+    // you can comment these lines if you don't plan to change CONFIG_UINT32_GUILD_EVENT_LOG_COUNT and CONFIG_UINT32_GUILD_BANK_EVENT_LOG_COUNT
     CharacterDatabase.PExecute("DELETE FROM guild_eventlog WHERE LogGuid > '%u'", sWorld.getConfig(CONFIG_UINT32_GUILD_EVENT_LOG_COUNT));
     CharacterDatabase.PExecute("DELETE FROM guild_bank_eventlog WHERE LogGuid > '%u'", sWorld.getConfig(CONFIG_UINT32_GUILD_BANK_EVENT_LOG_COUNT));
 
diff --git a/src/game/HostileRefManager.cpp b/src/game/HostileRefManager.cpp
index ee8af4582d8..2f4d36a5c04 100644
--- a/src/game/HostileRefManager.cpp
+++ b/src/game/HostileRefManager.cpp
@@ -23,7 +23,7 @@
 #include "SpellMgr.h"
 #include "Map.h"
 
-HostileRefManager::HostileRefManager( Unit *pOwner ) : iOwner(pOwner), m_redirectionMod(0.0f)
+HostileRefManager::HostileRefManager(Unit* pOwner) : iOwner(pOwner), m_redirectionMod(0.0f)
 {
 
 }
@@ -38,10 +38,10 @@ HostileRefManager::~HostileRefManager()
 // The pVictim is hated than by them as well
 // use for buffs and healing threat functionality
 
-void HostileRefManager::threatAssist(Unit *pVictim, float pThreat, SpellEntry const *pThreatSpell, bool pSingleTarget)
+void HostileRefManager::threatAssist(Unit* pVictim, float pThreat, SpellEntry const* pThreatSpell, bool pSingleTarget)
 {
     uint32 size = pSingleTarget ? 1 : getSize();            // if pSingleTarget do not devide threat
-    float threat = pThreat/size;
+    float threat = pThreat / size;
     HostileReference* ref = getFirst();
     while (ref)
     {
@@ -58,7 +58,7 @@ void HostileRefManager::addThreatPercent(int32 pValue)
     HostileReference* ref;
 
     ref = getFirst();
-    while(ref != NULL)
+    while (ref != NULL)
     {
         ref->addThreatPercent(pValue);
         ref = ref->next();
@@ -73,7 +73,7 @@ void HostileRefManager::setOnlineOfflineState(bool pIsOnline)
     HostileReference* ref;
 
     ref = getFirst();
-    while(ref != NULL)
+    while (ref != NULL)
     {
         ref->setOnlineOfflineState(pIsOnline);
         ref = ref->next();
@@ -86,7 +86,7 @@ void HostileRefManager::setOnlineOfflineState(bool pIsOnline)
 void HostileRefManager::updateThreatTables()
 {
     HostileReference* ref = getFirst();
-    while(ref)
+    while (ref)
     {
         ref->updateOnlineStatus();
         ref = ref->next();
@@ -100,7 +100,7 @@ void HostileRefManager::updateThreatTables()
 void HostileRefManager::deleteReferences()
 {
     HostileReference* ref = getFirst();
-    while(ref)
+    while (ref)
     {
         HostileReference* nextRef = ref->next();
         ref->removeReference();
@@ -115,10 +115,10 @@ void HostileRefManager::deleteReferences()
 void HostileRefManager::deleteReferencesForFaction(uint32 faction)
 {
     HostileReference* ref = getFirst();
-    while(ref)
+    while (ref)
     {
         HostileReference* nextRef = ref->next();
-        if(ref->getSource()->getOwner()->getFactionTemplateEntry()->faction == faction)
+        if (ref->getSource()->getOwner()->getFactionTemplateEntry()->faction == faction)
         {
             ref->removeReference();
             delete ref;
@@ -130,13 +130,13 @@ void HostileRefManager::deleteReferencesForFaction(uint32 faction)
 //=================================================
 // delete one reference, defined by Unit
 
-void HostileRefManager::deleteReference(Unit *pCreature)
+void HostileRefManager::deleteReference(Unit* pCreature)
 {
     HostileReference* ref = getFirst();
-    while(ref)
+    while (ref)
     {
         HostileReference* nextRef = ref->next();
-        if(ref->getSource()->getOwner() == pCreature)
+        if (ref->getSource()->getOwner() == pCreature)
         {
             ref->removeReference();
             delete ref;
@@ -149,13 +149,13 @@ void HostileRefManager::deleteReference(Unit *pCreature)
 //=================================================
 // set state for one reference, defined by Unit
 
-void HostileRefManager::setOnlineOfflineState(Unit *pCreature,bool pIsOnline)
+void HostileRefManager::setOnlineOfflineState(Unit* pCreature, bool pIsOnline)
 {
     HostileReference* ref = getFirst();
-    while(ref)
+    while (ref)
     {
         HostileReference* nextRef = ref->next();
-        if(ref->getSource()->getOwner() == pCreature)
+        if (ref->getSource()->getOwner() == pCreature)
         {
             ref->setOnlineOfflineState(pIsOnline);
             break;
diff --git a/src/game/HostileRefManager.h b/src/game/HostileRefManager.h
index 77f10695260..1228e5296c1 100644
--- a/src/game/HostileRefManager.h
+++ b/src/game/HostileRefManager.h
@@ -33,7 +33,7 @@ struct SpellEntry;
 class HostileRefManager : public RefManager<Unit, ThreatManager>
 {
     public:
-        explicit HostileRefManager(Unit *pOwner);
+        explicit HostileRefManager(Unit* pOwner);
         ~HostileRefManager();
 
         Unit* getOwner() { return iOwner; }
@@ -41,7 +41,7 @@ class HostileRefManager : public RefManager<Unit, ThreatManager>
         // send threat to all my hateres for the pVictim
         // The pVictim is hated than by them as well
         // use for buffs and healing threat functionality
-        void threatAssist(Unit *pVictim, float threat, SpellEntry const *threatSpell = 0, bool pSingleTarget=false);
+        void threatAssist(Unit* pVictim, float threat, SpellEntry const* threatSpell = 0, bool pSingleTarget = false);
 
         void addThreatPercent(int32 pValue);
 
@@ -52,23 +52,24 @@ class HostileRefManager : public RefManager<Unit, ThreatManager>
         // Remove specific faction references
         void deleteReferencesForFaction(uint32 faction);
 
-        HostileReference* getFirst() { return ((HostileReference* ) RefManager<Unit, ThreatManager>::getFirst()); }
+        HostileReference* getFirst() { return ((HostileReference*) RefManager<Unit, ThreatManager>::getFirst()); }
+        HostileReference const* getFirst() const { return ((HostileReference const*) RefManager<Unit, ThreatManager>::getFirst()); }
 
         void updateThreatTables();
 
         void setOnlineOfflineState(bool pIsOnline);
 
         // set state for one reference, defined by Unit
-        void setOnlineOfflineState(Unit *pCreature,bool pIsOnline);
+        void setOnlineOfflineState(Unit* pCreature, bool pIsOnline);
 
         // delete one reference, defined by Unit
-        void deleteReference(Unit *pCreature);
+        void deleteReference(Unit* pCreature);
 
         // redirection threat data
         void SetThreatRedirection(ObjectGuid guid, uint32 pct)
         {
             m_redirectionTargetGuid = guid;
-            m_redirectionMod = pct/100.0f;
+            m_redirectionMod = pct / 100.0f;
         }
 
         void ResetThreatRedirection()
diff --git a/src/game/InstanceData.cpp b/src/game/InstanceData.cpp
index 0dd0e883a64..1d961b1caac 100644
--- a/src/game/InstanceData.cpp
+++ b/src/game/InstanceData.cpp
@@ -19,6 +19,7 @@
 #include "InstanceData.h"
 #include "Database/DatabaseEnv.h"
 #include "Map.h"
+#include "MapPersistentStateMgr.h"
 #include "Log.h"
 
 void InstanceData::SaveToDB()
@@ -39,16 +40,34 @@ void InstanceData::SaveToDB()
         CharacterDatabase.PExecute("UPDATE world SET data = '%s' WHERE map = '%u'", data.c_str(), instance->GetId());
 }
 
-bool InstanceData::CheckAchievementCriteriaMeet( uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/ /*= NULL*/, uint32 /*miscvalue1*/ /*= 0*/ )
+bool InstanceData::CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/ /*= NULL*/, uint32 /*miscvalue1*/ /*= 0*/) const
 {
     sLog.outError("Achievement system call InstanceData::CheckAchievementCriteriaMeet but instance script for map %u not have implementation for achievement criteria %u",
-        instance->GetId(),criteria_id);
+                  instance->GetId(), criteria_id);
     return false;
 }
 
-bool InstanceData::CheckConditionCriteriaMeet(Player const* /*source*/, uint32 map_id, uint32 instance_condition_id)
+bool InstanceData::CheckConditionCriteriaMeet(Player const* /*source*/, uint32 instance_condition_id, WorldObject const* /*conditionSource*/, ConditionSource conditionSourceType) const
 {
-    sLog.outError("Condition system call InstanceData::CheckConditionCriteriaMeet but instance script for map %u not have implementation for player condition criteria with internal id %u for map %u",
-        instance->GetId(), instance_condition_id, map_id);
+    sLog.outError("Condition system call InstanceData::CheckConditionCriteriaMeet but instance script for map %u not have implementation for player condition criteria with internal id %u (called from %u)",
+                  instance->GetId(), instance_condition_id, uint32(conditionSourceType));
     return false;
 }
+
+void InstanceData::UpdateSpecialEncounterState(EncounterFrameCommand command, ObjectGuid linkedGuid, uint8 data1, uint8 data2)
+{
+    DungeonPersistentState* state = ((DungeonMap*)instance)->GetPersistanceState();
+    if (!state)
+        return;
+
+    state->UpdateSpecialEncounterState(command, linkedGuid, data1, data2);
+}
+
+void InstanceData::SendSpecialEncounterState(ObjectGuid linkedGuid)
+{
+    DungeonPersistentState* state = ((DungeonMap*)instance)->GetPersistanceState();
+    if (!state)
+        return;
+
+    state->SendSpecialEncounterState(linkedGuid);
+}
diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h
index 03de896d100..1979c09191b 100644
--- a/src/game/InstanceData.h
+++ b/src/game/InstanceData.h
@@ -20,6 +20,7 @@
 #define MANGOS_INSTANCE_DATA_H
 
 #include "Common.h"
+#include "SharedDefines.h"
 #include "ObjectGuid.h"
 
 class Map;
@@ -27,76 +28,114 @@ class Unit;
 class Player;
 class GameObject;
 class Creature;
+class WorldObject;
+
+enum InstanceConditionIDs                                   // Suggested values used with CONDITION_INSTANCE_SCRIPT for some generic uses
+{
+    // for hard-mode loot (0 normal; 1,2... hard,harder... mode)
+    INSTANCE_CONDITION_ID_NORMAL_MODE       = 0,
+    INSTANCE_CONDITION_ID_HARD_MODE         = 1,
+    INSTANCE_CONDITION_ID_HARD_MODE_2       = 2,
+    INSTANCE_CONDITION_ID_HARD_MODE_3       = 3,
+    INSTANCE_CONDITION_ID_HARD_MODE_4       = 4,
+
+    // to check for which team the instance is doing scripts
+    INSTANCE_CONDITION_ID_TEAM_HORDE        = 67,
+    INSTANCE_CONDITION_ID_TEAM_ALLIANCE     = 469,
+
+    // to check water event in SSC
+    INSTANCE_CONDITION_ID_LURKER            = 21217,
+    INSTANCE_CONDITION_ID_SCALDING_WATER    = 37284,
+    // to check vehicles in Ulduar
+    INSTANCE_CONDITION_ID_ULDUAR            = 33113,
+};
 
 class MANGOS_DLL_SPEC InstanceData
 {
     public:
 
-        explicit InstanceData(Map *map) : instance(map) {}
+        explicit InstanceData(Map* map) : instance(map) {}
         virtual ~InstanceData() {}
 
-        Map *instance;
+        Map* instance;
 
-        //On creation, NOT load.
+        // On creation, NOT load.
         virtual void Initialize() {}
 
-        //On load
+        // On load
         virtual void Load(const char* /*data*/) {}
 
-        //When save is needed, this function generates the data
-        virtual const char* Save() { return ""; }
+        // When save is needed, this function generates the data
+        virtual const char* Save() const { return ""; }
 
         void SaveToDB();
 
-        //Called every map update
+        // Called every map update
         virtual void Update(uint32 /*diff*/) {}
 
-        //Used by the map's CanEnter function.
-        //This is to prevent players from entering during boss encounters.
+        // Used by the map's CanEnter function.
+        // This is to prevent players from entering during boss encounters.
         virtual bool IsEncounterInProgress() const { return false; };
 
-        //Called when a player successfully enters the instance (after really added to map)
-        virtual void OnPlayerEnter(Player *) {}
+        // Called when a player successfully enters the instance (after really added to map)
+        virtual void OnPlayerEnter(Player*) {}
+
+        // Called when a player dies inside instance
+        virtual void OnPlayerDeath(Player*) {}
+
+        // Called when a player leaves the instance (before really removed from map (or possibly world))
+        virtual void OnPlayerLeave(Player*) {}
 
-        //Called when a player dies inside instance
-        virtual void OnPlayerDeath(Player *) {}
+        // Called when a player successfully enters the other area
+        virtual void OnPlayerEnterArea(Player*, uint32 /*uiNewAreaId*/,  uint32 /*uiOldAreaId*/) {}
 
-        //Called when a player leaves the instance (before really removed from map (or possibly world))
-        virtual void OnPlayerLeave(Player *) {}
+        // Called when a player successfully enters the other zone
+        virtual void OnPlayerEnterZone(Player*, uint32 /*uiNewZoneId*/, uint32 /*uiNewAreaId*/) {}
 
-        //Called when a gameobject is created
-        virtual void OnObjectCreate(GameObject *) {}
+        // Called when a player leave zone
+        virtual void OnPlayerLeaveZone(Player*, uint32 /*uiOldZoneId*/) {}
 
-        //called on creature creation
-        virtual void OnCreatureCreate(Creature * /*creature*/) {}
+        // Called when a player drops a flag in outdoor pvp
+        virtual void OnPlayerDroppedFlag(Player*, uint32 /* uiSpellId*/) {}
 
-        //called on creature enter combat
-        virtual void OnCreatureEnterCombat(Creature * /*creature*/) {}
+        // Called when a gameobject is created
+        virtual void OnObjectCreate(GameObject*) {}
 
-        //called on creature evade
-        virtual void OnCreatureEvade(Creature * /*creature*/) {}
+        // called on creature creation
+        virtual void OnCreatureCreate(Creature* /*creature*/) {}
 
-        //called on creature death
-        virtual void OnCreatureDeath(Creature * /*creature*/) {}
+        // called on creature enter combat
+        virtual void OnCreatureEnterCombat(Creature* /*creature*/) {}
 
-        //All-purpose data storage 64 bit
-        virtual uint64 GetData64(uint32 /*Data*/) { return 0; }
+        // called on creature evade
+        virtual void OnCreatureEvade(Creature* /*creature*/) {}
+
+        // called on creature death
+        virtual void OnCreatureDeath(Creature* /*creature*/) {}
+
+        // All-purpose data storage 64 bit
+        virtual uint64 GetData64(uint32 /*Data*/) const { return 0; }
         virtual void SetData64(uint32 /*Data*/, uint64 /*Value*/) { }
 
-        //Guid data storage (wrapper for set/get from uint64 storage
-        ObjectGuid GetGuid(uint32 dataIdx) { return ObjectGuid(GetData64(dataIdx)); }
+        // Guid data storage (wrapper for set/get from uint64 storage
+        ObjectGuid GetGuid(uint32 dataIdx) const { return ObjectGuid(GetData64(dataIdx)); }
         void SetGuid(uint32 dataIdx, ObjectGuid value) { SetData64(dataIdx, value.GetRawValue()); }
 
-        //All-purpose data storage 32 bit
-        virtual uint32 GetData(uint32 /*Type*/) { return 0; }
+        // All-purpose data storage 32 bit
+        virtual uint32 GetData(uint32 /*Type*/) const { return 0; }
         virtual void SetData(uint32 /*Type*/, uint32 /*Data*/) {}
 
         // Achievement criteria additional requirements check
         // NOTE: not use this if same can be checked existing requirement types from AchievementCriteriaRequirementType
-        virtual bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0);
+        virtual bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0) const;
 
         // Condition criteria additional requirements check
         // This is used for such things are heroic loot
-        virtual bool CheckConditionCriteriaMeet(Player const* source, uint32 map_id, uint32 instance_condition_id);
+        virtual bool CheckConditionCriteriaMeet(Player const* source, uint32 instance_condition_id, WorldObject const* conditionSource, ConditionSource conditionSourceType) const;
+
+        // Set and send special encounter frame state (currently - from scripts)
+        virtual void UpdateSpecialEncounterState(EncounterFrameCommand command, ObjectGuid linkedGuid, uint8 data1 = 0, uint8 data2 = 0);
+        virtual void SendSpecialEncounterState(ObjectGuid linkedGuid);
+
 };
 #endif
diff --git a/src/game/Item.cpp b/src/game/Item.cpp
index 25ebd35a20c..58d2d70b505 100644
--- a/src/game/Item.cpp
+++ b/src/game/Item.cpp
@@ -17,11 +17,13 @@
  */
 
 #include "Item.h"
+#include "AccountMgr.h"
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "WorldPacket.h"
 #include "Database/DatabaseEnv.h"
 #include "ItemEnchantmentMgr.h"
+#include "SQLStorages.h"
 
 void AddItemsSetItem(Player* player, Item* item)
 {
@@ -29,10 +31,9 @@ void AddItemsSetItem(Player* player, Item* item)
     uint32 setid = proto->ItemSet;
 
     ItemSetEntry const* set = sItemSetStore.LookupEntry(setid);
-
     if (!set)
     {
-        sLog.outErrorDb("Item set %u for item (id %u) not found, mods not applied.", setid,proto->ItemId);
+        sLog.outErrorDb("Item set %u for item (id %u) not found, mods not applied.", setid, proto->ItemId);
         return;
     }
 
@@ -57,43 +58,48 @@ void AddItemsSetItem(Player* player, Item* item)
         eff->setid = setid;
 
         size_t x = 0;
-        for (; x < player->ItemSetEff.size(); x++)
+        for (; x < player->ItemSetEff.size(); ++x)
+        {
             if (!player->ItemSetEff[x])
                 break;
+        }
 
         if (x < player->ItemSetEff.size())
-            player->ItemSetEff[x]=eff;
+            player->ItemSetEff[x] = eff;
         else
             player->ItemSetEff.push_back(eff);
     }
 
     ++eff->item_count;
 
-    for (uint32 x = 0; x < 8; x++)
+    for (uint32 x = 0; x < 8; ++x)
     {
         if (!set->spells[x])
             continue;
+
         // not enough for  spell
         if (set->items_to_triggerspell[x] > eff->item_count)
             continue;
 
         uint32 z = 0;
-        for (; z < 8; z++)
+        for (; z < 8; ++z)
+        {
             if (eff->spells[z] && eff->spells[z]->Id == set->spells[x])
                 break;
+        }
 
         if (z < 8)
             continue;
 
         // new spell
-        for (uint32 y = 0; y < 8; y++)
+        for (uint32 y = 0; y < 8; ++y)
         {
             if (!eff->spells[y])                             // free slot
             {
                 SpellEntry const* spellInfo = sSpellStore.LookupEntry(set->spells[x]);
                 if (!spellInfo)
                 {
-                    sLog.outError("WORLD: unknown spell id %u in items set %u effects", set->spells[x],setid);
+                    sLog.outError("WORLD: unknown spell id %u in items set %u effects", set->spells[x], setid);
                     break;
                 }
 
@@ -111,16 +117,16 @@ void RemoveItemsSetItem(Player* player, ItemPrototype const* proto)
     uint32 setid = proto->ItemSet;
 
     ItemSetEntry const* set = sItemSetStore.LookupEntry(setid);
-
     if (!set)
     {
-        sLog.outErrorDb("Item set #%u for item #%u not found, mods not removed.", setid,proto->ItemId);
+        sLog.outErrorDb("Item set #%u for item #%u not found, mods not removed.", setid, proto->ItemId);
         return;
     }
 
     ItemSetEffect* eff = NULL;
     size_t setindex = 0;
-    for (; setindex < player->ItemSetEff.size(); setindex++)
+
+    for (; setindex < player->ItemSetEff.size(); ++setindex)
     {
         if (player->ItemSetEff[setindex] && player->ItemSetEff[setindex]->setid == setid)
         {
@@ -135,7 +141,7 @@ void RemoveItemsSetItem(Player* player, ItemPrototype const* proto)
 
     --eff->item_count;
 
-    for (uint32 x = 0; x < 8; x++)
+    for (uint32 x = 0; x < 8; ++x)
     {
         if (!set->spells[x])
             continue;
@@ -144,7 +150,7 @@ void RemoveItemsSetItem(Player* player, ItemPrototype const* proto)
         if (set->items_to_triggerspell[x] <= eff->item_count)
             continue;
 
-        for (uint32 z = 0; z < 8; z++)
+        for (uint32 z = 0; z < 8; ++z)
         {
             if (eff->spells[z] && eff->spells[z]->Id == set->spells[x])
             {
@@ -156,7 +162,7 @@ void RemoveItemsSetItem(Player* player, ItemPrototype const* proto)
         }
     }
 
-    if (!eff->item_count)                                    // all items of a set were removed
+    if (!eff->item_count)                                   // all items of a set were removed
     {
         MANGOS_ASSERT(eff == player->ItemSetEff[setindex]);
         delete eff;
@@ -172,6 +178,7 @@ bool ItemCanGoIntoBag(ItemPrototype const* pProto, ItemPrototype const* pBagProt
     switch (pBagProto->Class)
     {
         case ITEM_CLASS_CONTAINER:
+        {
             switch (pBagProto->SubClass)
             {
                 case ITEM_SUBCLASS_CONTAINER:
@@ -209,9 +216,12 @@ bool ItemCanGoIntoBag(ItemPrototype const* pProto, ItemPrototype const* pBagProt
                         return false;
                     return true;
                 default:
-                    return false;
+                    break;
             }
+            break;
+        }
         case ITEM_CLASS_QUIVER:
+        {
             switch (pBagProto->SubClass)
             {
                 case ITEM_SUBCLASS_QUIVER:
@@ -225,37 +235,44 @@ bool ItemCanGoIntoBag(ItemPrototype const* pProto, ItemPrototype const* pBagProt
                 default:
                     return false;
             }
+            break;
+        }
+        default:
+            break;
     }
     return false;
 }
 
-Item::Item()
+Item::Item() : loot(NULL)
 {
-    m_objectType |= TYPEMASK_ITEM;
+    m_objectType  |= TYPEMASK_ITEM;
     m_objectTypeId = TYPEID_ITEM;
 
-    m_updateFlag = UPDATEFLAG_HIGHGUID;
+    m_updateFlag   = UPDATEFLAG_HIGHGUID;
+    m_valuesCount  = ITEM_END;
+
+    m_slot         = 0;
+    m_state        = ITEM_NEW;
+    m_queuePos     = -1;
+    m_container    = NULL;
+    m_lootState    = ITEM_LOOT_NONE;
+    mb_in_trade    = false;
 
-    m_valuesCount = ITEM_END;
-    m_slot = 0;
-    uState = ITEM_NEW;
-    uQueuePos = -1;
-    m_container = NULL;
-    mb_in_trade = false;
-    m_lootState = ITEM_LOOT_NONE;
+    m_paidCost     = 0;
+    m_paidExtCost  = 0;
 }
 
-bool Item::Create(uint32 guidlow, uint32 itemid, Player const* owner)
+bool Item::Create(uint32 guidlow, uint32 itemId, Player const* owner)
 {
     Object::_Create(guidlow, 0, HIGHGUID_ITEM);
 
-    SetEntry(itemid);
+    SetEntry(itemId);
     SetObjectScale(DEFAULT_OBJECT_SCALE);
 
     SetGuidValue(ITEM_FIELD_OWNER, owner ? owner->GetObjectGuid() : ObjectGuid());
     SetGuidValue(ITEM_FIELD_CONTAINED, ObjectGuid());
 
-    ItemPrototype const* itemProto = ObjectMgr::GetItemPrototype(itemid);
+    ItemPrototype const* itemProto = ObjectMgr::GetItemPrototype(itemId);
     if (!itemProto)
         return false;
 
@@ -263,20 +280,38 @@ bool Item::Create(uint32 guidlow, uint32 itemid, Player const* owner)
     SetUInt32Value(ITEM_FIELD_MAXDURABILITY, itemProto->MaxDurability);
     SetUInt32Value(ITEM_FIELD_DURABILITY, itemProto->MaxDurability);
 
-    for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
-        SetSpellCharges(i,itemProto->Spells[i].SpellCharges);
+    for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
+        SetSpellCharges(i, itemProto->Spells[i].SpellCharges);
 
     SetUInt32Value(ITEM_FIELD_DURATION, itemProto->Duration);
 
+    // wow armory begin
+    if (itemProto->Quality > 2 && itemProto->Flags != 2048 && (itemProto->Class == ITEM_CLASS_WEAPON || itemProto->Class == ITEM_CLASS_ARMOR))
+    {
+        if (!GetOwner() || GetOwner()->GetPlayerbotAI())
+            return true;
+		GetOwner()->CreateWowarmoryFeed(2, itemProto->ItemId, guidlow, itemProto->Quality);
+    }
+    // wow armory end
     return true;
 }
 
+void Item::GetDataValuesStr(std::ostringstream& ss)
+{
+    if (!m_valuesCount)
+        return;
+
+    ss << GetUInt32Value(0);
+    for (uint16 i = 1; i < m_valuesCount; ++i)
+        ss << ' ' << GetUInt32Value(i);
+}
+
 void Item::UpdateDuration(Player* owner, uint32 diff)
 {
     if (!GetUInt32Value(ITEM_FIELD_DURATION))
         return;
 
-    //DEBUG_LOG("Item::UpdateDuration Item (Entry: %u Duration %u Diff %u)", GetEntry(), GetUInt32Value(ITEM_FIELD_DURATION), diff);
+    // DEBUG_LOG("Item::UpdateDuration Item (Entry: %u Duration %u Diff %u)", GetEntry(), GetUInt32Value(ITEM_FIELD_DURATION), diff);
 
     if (GetUInt32Value(ITEM_FIELD_DURATION) <= diff)
     {
@@ -294,62 +329,55 @@ void Item::UpdateDuration(Player* owner, uint32 diff)
 void Item::SaveToDB()
 {
     uint32 guid = GetGUIDLow();
-    switch (uState)
+
+    switch (m_state)
     {
         case ITEM_NEW:
         {
-            static SqlStatementID delItem ;
-            static SqlStatementID insItem ;
-
-            SqlStatement stmt = CharacterDatabase.CreateStatement(delItem, "DELETE FROM item_instance WHERE guid = ?");
-            stmt.PExecute(guid);
+            DeleteFromDB(guid);
 
             std::ostringstream ss;
-            for (uint16 i = 0; i < m_valuesCount; ++i)
-                ss << GetUInt32Value(i) << " ";
+            GetDataValuesStr(ss);
+
+            static SqlStatementID insItem;
+            CharacterDatabase.CreateStatement(insItem, "INSERT INTO item_instance (guid, owner_guid, data, text) VALUES (?, ?, ?, ?)")
+                .PExecute(guid, GetOwnerGuid().GetCounter(), ss.str().c_str(), m_text.c_str());
 
-            stmt = CharacterDatabase.CreateStatement(insItem, "INSERT INTO item_instance (guid,owner_guid,data,text) VALUES (?, ?, ?, ?)");
-            stmt.PExecute(guid, GetOwnerGuid().GetCounter(), ss.str().c_str(), m_text.c_str());
-        } break;
+            break;
+        }
         case ITEM_CHANGED:
         {
-            static SqlStatementID updInstance ;
-            static SqlStatementID updGifts ;
-
-            SqlStatement stmt = CharacterDatabase.CreateStatement(updInstance, "UPDATE item_instance SET data = ?, owner_guid = ?, text = ? WHERE guid = ?");
-
             std::ostringstream ss;
-            for (uint16 i = 0; i < m_valuesCount; ++i)
-                ss << GetUInt32Value(i) << " ";
+            GetDataValuesStr(ss);
 
-            stmt.PExecute(ss.str().c_str(), GetOwnerGuid().GetCounter(), m_text.c_str(), guid);
+            static SqlStatementID updInstance;
+            CharacterDatabase.CreateStatement(updInstance, "UPDATE item_instance SET data = ?, owner_guid = ?, text = ? WHERE guid = ?")
+                .PExecute(ss.str().c_str(), GetOwnerGuid().GetCounter(), m_text.c_str(), guid);
 
             if (HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_WRAPPED))
             {
-                stmt = CharacterDatabase.CreateStatement(updGifts, "UPDATE character_gifts SET guid = ? WHERE item_guid = ?");
-                stmt.PExecute(GetOwnerGuid().GetCounter(), GetGUIDLow());
+                static SqlStatementID updGifts;
+                CharacterDatabase.CreateStatement(updGifts, "UPDATE character_gifts SET guid = ? WHERE item_guid = ?")
+                    .PExecute(GetOwnerGuid().GetCounter(), GetGUIDLow());
             }
-        } break;
+
+            break;
+        }
         case ITEM_REMOVED:
         {
-            static SqlStatementID delInst ;
-            static SqlStatementID delGifts ;
-            static SqlStatementID delLoot ;
-
-            SqlStatement stmt = CharacterDatabase.CreateStatement(delInst, "DELETE FROM item_instance WHERE guid = ?");
-            stmt.PExecute(guid);
+            DeleteFromDB(guid);
 
             if (HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_WRAPPED))
-            {
-                stmt = CharacterDatabase.CreateStatement(delGifts, "DELETE FROM character_gifts WHERE item_guid = ?");
-                stmt.PExecute(GetGUIDLow());
-            }
+                DeleteGiftsFromDB();
 
             if (HasSavedLoot())
-            {
-                stmt = CharacterDatabase.CreateStatement(delLoot, "DELETE FROM item_loot WHERE guid = ?");
-                stmt.PExecute(GetGUIDLow());
-            }
+                DeleteLootFromDB();
+
+            if (HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE))
+                DeleteRefundDataFromDB();
+
+            if (HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE))
+                DeleteSoulboundTradeableFromDB();
 
             delete this;
             return;
@@ -359,53 +387,48 @@ void Item::SaveToDB()
     }
 
     if (m_lootState == ITEM_LOOT_CHANGED || m_lootState == ITEM_LOOT_REMOVED)
-    {
-        static SqlStatementID delLoot ;
-
-        SqlStatement stmt = CharacterDatabase.CreateStatement(delLoot, "DELETE FROM item_loot WHERE guid = ?");
-        stmt.PExecute(GetGUIDLow());
-    }
+        DeleteLootFromDB();
 
     if (m_lootState == ITEM_LOOT_NEW || m_lootState == ITEM_LOOT_CHANGED)
     {
         if (Player* owner = GetOwner())
         {
-            static SqlStatementID saveGold ;
-            static SqlStatementID saveLoot ;
-
             // save money as 0 itemid data
             if (loot.gold)
             {
-                SqlStatement stmt = CharacterDatabase.CreateStatement(saveGold, "INSERT INTO item_loot (guid,owner_guid,itemid,amount,suffix,property) VALUES (?, ?, 0, ?, 0, 0)");
-                stmt.PExecute(GetGUIDLow(), owner->GetGUIDLow(), loot.gold);
+                static SqlStatementID saveGold;
+                CharacterDatabase.CreateStatement(saveGold, "INSERT INTO item_loot (guid, owner_guid, itemid, amount, suffix, property) VALUES (?, ?, 0, ?, 0, 0)")
+                    .PExecute(GetGUIDLow(), owner->GetGUIDLow(), loot.gold);
             }
 
-            SqlStatement stmt = CharacterDatabase.CreateStatement(saveLoot, "INSERT INTO item_loot (guid,owner_guid,itemid,amount,suffix,property) VALUES (?, ?, ?, ?, ?, ?)");
-
             // save items and quest items (at load its all will added as normal, but this not important for item loot case)
-            for (size_t i = 0; i < loot.GetMaxSlotInLootFor(owner); ++i)
+            if (uint32 lootItemCount = loot.GetMaxSlotInLootFor(owner))
             {
-                QuestItem* qitem = NULL;
-
-                LootItem* item = loot.LootItemInSlot(i, owner, &qitem);
-                if (!item)
-                    continue;
+                static SqlStatementID saveLoot;
+                SqlStatement stmt = CharacterDatabase.CreateStatement(saveLoot, "INSERT INTO item_loot (guid, owner_guid, itemid, amount, suffix, property) VALUES (?, ?, ?, ?, ?, ?)");
 
-                // questitems use the blocked field for other purposes
-                if (!qitem && item->is_blocked)
-                    continue;
-
-                stmt.addUInt32(GetGUIDLow());
-                stmt.addUInt32(owner->GetGUIDLow());
-                stmt.addUInt32(item->itemid);
-                stmt.addUInt8(item->count);
-                stmt.addUInt32(item->randomSuffix);
-                stmt.addInt32(item->randomPropertyId);
-
-                stmt.Execute();
+                for (uint32 i = 0; i < lootItemCount; ++i)
+                {
+                    QuestItem* qitem = NULL;
+
+                    LootItem* item = loot.LootItemInSlot(i, owner, &qitem);
+                    if (!item)
+                        continue;
+
+                    // questitems use the blocked field for other purposes
+                    if (!qitem && item->is_blocked)
+                        continue;
+
+                    stmt.addUInt32(GetGUIDLow());
+                    stmt.addUInt32(owner->GetGUIDLow());
+                    stmt.addUInt32(item->itemid);
+                    stmt.addUInt8(item->count);
+                    stmt.addUInt32(item->randomSuffix);
+                    stmt.addInt32(item->randomPropertyId);
+                    stmt.Execute();
+                }
             }
         }
-
     }
 
     if (m_lootState != ITEM_LOOT_NONE && m_lootState != ITEM_LOOT_TEMPORARY)
@@ -418,24 +441,24 @@ bool Item::LoadFromDB(uint32 guidLow, Field* fields, ObjectGuid ownerGuid)
 {
     // create item before any checks for store correct guid
     // and allow use "FSetState(ITEM_REMOVED); SaveToDB();" for deleting item from DB
-    Object::_Create(guidLow, 0, HIGHGUID_ITEM);
+    Object::_Create(ObjectGuid(HIGHGUID_ITEM, guidLow));
 
     if (!LoadValues(fields[0].GetString()))
     {
-        sLog.outError("Item #%d have broken data in `data` field. Can't be loaded.", guidLow);
+        sLog.outError("Item::LoadFromDB: %s have broken data in `data` field. Can't be loaded.", GetGuidStr().c_str());
         return false;
     }
 
     SetText(fields[1].GetCppString());
 
-    bool need_save = false;                                 // need explicit save data at load fixes
+    bool needSave = false;                                  // need explicit save data at load fixes
 
     // overwrite possible wrong/corrupted guid
     ObjectGuid new_item_guid = ObjectGuid(HIGHGUID_ITEM, guidLow);
     if (GetGuidValue(OBJECT_FIELD_GUID) != new_item_guid)
     {
         SetGuidValue(OBJECT_FIELD_GUID, new_item_guid);
-        need_save = true;
+        needSave = true;
     }
 
     ItemPrototype const* proto = GetProto();
@@ -443,41 +466,41 @@ bool Item::LoadFromDB(uint32 guidLow, Field* fields, ObjectGuid ownerGuid)
         return false;
 
     // update max durability (and durability) if need
-    if (proto->MaxDurability!= GetUInt32Value(ITEM_FIELD_MAXDURABILITY))
+    if (proto->MaxDurability != GetUInt32Value(ITEM_FIELD_MAXDURABILITY))
     {
         SetUInt32Value(ITEM_FIELD_MAXDURABILITY, proto->MaxDurability);
         if (GetUInt32Value(ITEM_FIELD_DURABILITY) > proto->MaxDurability)
             SetUInt32Value(ITEM_FIELD_DURABILITY, proto->MaxDurability);
 
-        need_save = true;
+        needSave = true;
     }
 
     // recalculate suffix factor
     if (GetItemRandomPropertyId() < 0)
     {
         if (UpdateItemSuffixFactor())
-            need_save = true;
+            needSave = true;
     }
 
     // Remove bind flag for items vs NO_BIND set
     if (IsSoulBound() && proto->Bonding == NO_BIND)
     {
         ApplyModFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BINDED, false);
-        need_save = true;
+        needSave = true;
     }
 
     // update duration if need, and remove if not need
     if ((proto->Duration == 0) != (GetUInt32Value(ITEM_FIELD_DURATION) == 0))
     {
         SetUInt32Value(ITEM_FIELD_DURATION, proto->Duration);
-        need_save = true;
+        needSave = true;
     }
 
     // set correct owner
     if (ownerGuid && GetOwnerGuid() != ownerGuid)
     {
         SetOwnerGuid(ownerGuid);
-        need_save = true;
+        needSave = true;
     }
 
     // set correct wrapped state
@@ -487,30 +510,21 @@ bool Item::LoadFromDB(uint32 guidLow, Field* fields, ObjectGuid ownerGuid)
         if (!(proto->Flags & ITEM_FLAG_WRAPPER) || GetMaxStackCount() > 1)
         {
             RemoveFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_WRAPPED);
-            need_save = true;
-
-            static SqlStatementID delGifts ;
+            needSave = true;
 
             // also cleanup for sure gift table
-            SqlStatement stmt = CharacterDatabase.CreateStatement(delGifts, "DELETE FROM character_gifts WHERE item_guid = ?");
-            stmt.PExecute(GetGUIDLow());
+            DeleteGiftsFromDB();
         }
     }
 
-    if (need_save)                                          // normal item changed state set not work at loading
+    if (needSave)                                          // normal item changed state set not work at loading
     {
-        static SqlStatementID updItem ;
-
-        SqlStatement stmt = CharacterDatabase.CreateStatement(updItem, "UPDATE item_instance SET data = ?, owner_guid = ? WHERE guid = ?");
-
         std::ostringstream ss;
-        for (uint16 i = 0; i < m_valuesCount; ++i)
-            ss << GetUInt32Value(i) << " ";
+        GetDataValuesStr(ss);
 
-        stmt.addString(ss);
-        stmt.addUInt32(GetOwnerGuid().GetCounter());
-        stmt.addUInt32(guidLow);
-        stmt.Execute();
+        static SqlStatementID updItem;
+        CharacterDatabase.CreateStatement(updItem, "UPDATE item_instance SET owner_guid = ?, data = ? WHERE guid = ?")
+            .PExecute(GetOwnerGuid().GetCounter(), ss.str().c_str(), guidLow);
     }
 
     return true;
@@ -518,49 +532,85 @@ bool Item::LoadFromDB(uint32 guidLow, Field* fields, ObjectGuid ownerGuid)
 
 void Item::LoadLootFromDB(Field* fields)
 {
-    uint32 item_id     = fields[1].GetUInt32();
-    uint32 item_amount = fields[2].GetUInt32();
-    uint32 item_suffix = fields[3].GetUInt32();
-    int32  item_propid = fields[4].GetInt32();
+    uint32 itemId     = fields[1].GetUInt32();
+    uint32 itemAmount = fields[2].GetUInt32();
 
     // money value special case
-    if (item_id == 0)
+    if (!itemId)
     {
-        loot.gold = item_amount;
+        loot.gold = itemAmount;
         SetLootState(ITEM_LOOT_UNCHANGED);
         return;
     }
 
     // normal item case
-    ItemPrototype const* proto = ObjectMgr::GetItemPrototype(item_id);
-
+    ItemPrototype const* proto = ObjectMgr::GetItemPrototype(itemId);
     if (!proto)
     {
-        CharacterDatabase.PExecute("DELETE FROM item_loot WHERE guid = '%u' AND itemid = '%u'", GetGUIDLow(), item_id);
-        sLog.outError("Item::LoadLootFromDB: %s has an unknown item (id: #%u) in item_loot, deleted.", GetOwnerGuid().GetString().c_str(), item_id);
+        DeleteLootFromDB(GetGUIDLow(), itemId);
+        sLog.outError("Item::LoadLootFromDB: %s has an unknown item (id: %u) in item_loot, deleted.", GetGuidStr().c_str(), itemId);
         return;
     }
 
-    loot.items.push_back(LootItem(item_id, item_amount, item_suffix, item_propid));
+    uint32 itemSuffix = fields[3].GetUInt32();
+    int32  itemPropId = fields[4].GetInt32();
+
+    loot.items.push_back(LootItem(itemId, itemAmount, itemSuffix, itemPropId));
     ++loot.unlootedCount;
 
     SetLootState(ITEM_LOOT_UNCHANGED);
 }
 
+void Item::DeleteFromDB(uint32 guidLow)
+{
+    static SqlStatementID delItem;
+    CharacterDatabase.CreateStatement(delItem, "DELETE FROM item_instance WHERE guid = ?")
+        .PExecute(guidLow);
+}
+
 void Item::DeleteFromDB()
 {
-    static SqlStatementID delItem ;
+    DeleteFromDB(GetGUIDLow());
+}
 
-    SqlStatement stmt = CharacterDatabase.CreateStatement(delItem, "DELETE FROM item_instance WHERE guid = ?");
-    stmt.PExecute(GetGUIDLow());
+void Item::DeleteFromInventoryDB(uint32 guidLow)
+{
+    static SqlStatementID delInv;
+    CharacterDatabase.CreateStatement(delInv, "DELETE FROM character_inventory WHERE item = ?")
+        .PExecute(guidLow);
 }
 
 void Item::DeleteFromInventoryDB()
 {
-    static SqlStatementID delInv ;
+    DeleteFromInventoryDB(GetGUIDLow());
+}
 
-    SqlStatement stmt = CharacterDatabase.CreateStatement(delInv, "DELETE FROM character_inventory WHERE item = ?");
-    stmt.PExecute(GetGUIDLow());
+void Item::DeleteGiftsFromDB()
+{
+    static SqlStatementID delGifts;
+    CharacterDatabase.CreateStatement(delGifts, "DELETE FROM character_gifts WHERE item_guid = ?")
+        .PExecute(GetGUIDLow());
+}
+
+void Item::DeleteLootFromDB(uint32 guidLow, uint32 itemId/*=0*/)
+{
+    if (itemId)
+    {
+        static SqlStatementID delLoot;
+        CharacterDatabase.CreateStatement(delLoot, "DELETE FROM item_loot WHERE guid = ? AND itemid = ?")
+            .PExecute(guidLow, itemId);
+    }
+    else
+    {
+        static SqlStatementID delLoot;
+        CharacterDatabase.CreateStatement(delLoot, "DELETE FROM item_loot WHERE guid = ?")
+            .PExecute(guidLow);
+    }
+}
+
+void Item::DeleteLootFromDB()
+{
+    DeleteLootFromDB(GetGUIDLow());
 }
 
 ItemPrototype const* Item::GetProto() const
@@ -568,9 +618,9 @@ ItemPrototype const* Item::GetProto() const
     return ObjectMgr::GetItemPrototype(GetEntry());
 }
 
-Player* Item::GetOwner()const
+Player* Item::GetOwner() const
 {
-    return sObjectMgr.GetPlayer(GetOwnerGuid());
+    return sObjectMgr.GetPlayer(GetOwnerGuid(), false);
 }
 
 uint32 Item::GetSkill()
@@ -594,17 +644,19 @@ uint32 Item::GetSkill()
     switch (proto->Class)
     {
         case ITEM_CLASS_WEAPON:
+        {
             if (proto->SubClass >= MAX_ITEM_SUBCLASS_WEAPON)
                 return 0;
             else
                 return item_weapon_skills[proto->SubClass];
-
+        }
         case ITEM_CLASS_ARMOR:
+        {
             if (proto->SubClass >= MAX_ITEM_SUBCLASS_ARMOR)
                 return 0;
             else
                 return item_armor_skills[proto->SubClass];
-
+        }
         default:
             return 0;
     }
@@ -632,10 +684,11 @@ uint32 Item::GetSpell()
                 case ITEM_SUBCLASS_WEAPON_DAGGER:  return 1180;
                 case ITEM_SUBCLASS_WEAPON_THROWN:  return 2567;
                 case ITEM_SUBCLASS_WEAPON_SPEAR:   return 3386;
-                case ITEM_SUBCLASS_WEAPON_CROSSBOW:return 5011;
+                case ITEM_SUBCLASS_WEAPON_CROSSBOW: return 5011;
                 case ITEM_SUBCLASS_WEAPON_WAND:    return 5009;
                 default: return 0;
             }
+            break;
         case ITEM_CLASS_ARMOR:
             switch (proto->SubClass)
             {
@@ -646,6 +699,9 @@ uint32 Item::GetSpell()
                 case ITEM_SUBCLASS_ARMOR_SHIELD:   return 9116;
                 default: return 0;
             }
+            break;
+        default:
+            break;
     }
     return 0;
 }
@@ -653,7 +709,6 @@ uint32 Item::GetSpell()
 int32 Item::GenerateItemRandomPropertyId(uint32 item_id)
 {
     ItemPrototype const* itemProto = sItemStorage.LookupEntry<ItemPrototype>(item_id);
-
     if (!itemProto)
         return 0;
 
@@ -701,7 +756,7 @@ void Item::SetItemRandomProperties(int32 randomPropId)
         {
             if (GetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID) != int32(item_rand->ID))
             {
-                SetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID,item_rand->ID);
+                SetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID, item_rand->ID);
                 SetState(ITEM_CHANGED);
             }
             for (uint32 i = PROP_ENCHANTMENT_SLOT_2; i < PROP_ENCHANTMENT_SLOT_2 + 3; ++i)
@@ -732,17 +787,22 @@ bool Item::UpdateItemSuffixFactor()
     uint32 suffixFactor = GenerateEnchSuffixFactor(GetEntry());
     if (GetItemSuffixFactor() == suffixFactor)
         return false;
-    SetUInt32Value(ITEM_FIELD_PROPERTY_SEED,suffixFactor);
+
+    SetUInt32Value(ITEM_FIELD_PROPERTY_SEED, suffixFactor);
     return true;
 }
 
-void Item::SetState(ItemUpdateState state, Player* forplayer)
+void Item::SetState(ItemUpdateState state, Player* forPlayer)
 {
-    if (uState == ITEM_NEW && state == ITEM_REMOVED)
+    if (m_state == ITEM_NEW && state == ITEM_REMOVED)
     {
         // pretend the item never existed
-        if (forplayer || GetOwnerGuid())
-            RemoveFromUpdateQueueOf(forplayer);
+        if (forPlayer || GetOwnerGuid())
+            RemoveFromUpdateQueueOf(forPlayer);
+
+        if (forPlayer)
+            forPlayer->RemoveItemWithTimeCheck(GetGUIDLow());
+
         delete this;
         return;
     }
@@ -750,17 +810,18 @@ void Item::SetState(ItemUpdateState state, Player* forplayer)
     if (state != ITEM_UNCHANGED)
     {
         // new items must stay in new state until saved
-        if (uState != ITEM_NEW) uState = state;
+        if (m_state != ITEM_NEW)
+            m_state = state;
 
-        if (forplayer || GetOwnerGuid())
-            AddToUpdateQueueOf(forplayer);
+        if (forPlayer || GetOwnerGuid())
+            AddToUpdateQueueOf(forPlayer);
     }
     else
     {
         // unset in queue
         // the item must be removed from the queue manually
-        uQueuePos = -1;
-        uState = ITEM_UNCHANGED;
+        m_queuePos = -1;
+        m_state = ITEM_UNCHANGED;
     }
 }
 
@@ -774,6 +835,9 @@ void Item::AddToUpdateQueueOf(Player* player)
         player = GetOwner();
         if (!player)
         {
+            DeleteFromInventoryDB();
+            DeleteFromDB();
+
             sLog.outError("Item::AddToUpdateQueueOf - %s current owner (%s) not in world!",
                 GetGuidStr().c_str(), GetOwnerGuid().GetString().c_str());
             return;
@@ -791,7 +855,7 @@ void Item::AddToUpdateQueueOf(Player* player)
         return;
 
     player->m_itemUpdateQueue.push_back(this);
-    uQueuePos = player->m_itemUpdateQueue.size() -1;
+    m_queuePos = player->m_itemUpdateQueue.size() - 1;
 }
 
 void Item::RemoveFromUpdateQueueOf(Player* player)
@@ -820,8 +884,8 @@ void Item::RemoveFromUpdateQueueOf(Player* player)
     if (player->m_itemUpdateQueueBlocked)
         return;
 
-    player->m_itemUpdateQueue[uQueuePos] = NULL;
-    uQueuePos = -1;
+    player->m_itemUpdateQueue[m_queuePos] = NULL;
+    m_queuePos = -1;
 }
 
 uint8 Item::GetBagSlot() const
@@ -834,18 +898,19 @@ bool Item::IsEquipped() const
     return !IsInBag() && m_slot < EQUIPMENT_SLOT_END;
 }
 
-bool Item::CanBeTraded(bool mail) const
+bool Item::CanBeTraded(bool mail, bool trade) const
 {
-    if ((!mail || !IsBoundAccountWide()) && IsSoulBound())
+    if ((!mail || !IsBoundAccountWide()) && (IsSoulBound() && (!HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE) || !trade)))
         return false;
 
-    if (IsBag() && (Player::IsBagPos(GetPos()) || !((Bag const*)this)->IsEmpty()) )
+    if (IsBag() && (Player::IsBagPos(GetPos()) || !((Bag const*)this)->IsEmpty()))
         return false;
 
     if (Player* owner = GetOwner())
     {
-        if (owner->CanUnequipItem(GetPos(), false) !=  EQUIP_ERR_OK )
+        if (owner->CanUnequipItem(GetPos(), false) != EQUIP_ERR_OK)
             return false;
+
         if (owner->GetLootGuid() == GetObjectGuid())
             return false;
     }
@@ -898,7 +963,7 @@ bool Item::IsFitToSpellRequirements(SpellEntry const* spellInfo) const
         if (spellInfo->EquippedItemClass != int32(proto->Class))
             return false;                                   //  wrong item class
 
-        if (spellInfo->EquippedItemSubClassMask != 0)        // 0 == any subclass
+        if (spellInfo->EquippedItemSubClassMask != 0)       // 0 == any subclass
         {
             if ((spellInfo->EquippedItemSubClassMask & (1 << proto->SubClass)) == 0)
                 return false;                               // subclass not present in mask
@@ -928,8 +993,10 @@ bool Item::IsTargetValidForItemUse(Unit* pUnitTarget)
         return false;
 
     for (ItemRequiredTargetMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+    {
         if (itr->second.IsFitToRequirements(pUnitTarget))
             return true;
+    }
 
     return false;
 }
@@ -979,7 +1046,10 @@ bool Item::GemsFitSockets() const
     bool fits = true;
     for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT + MAX_GEM_SOCKETS; ++enchant_slot)
     {
-        uint8 SocketColor = GetProto()->Socket[enchant_slot-SOCK_ENCHANTMENT_SLOT].Color;
+        uint8 SocketColor = GetProto()->Socket[enchant_slot - SOCK_ENCHANTMENT_SLOT].Color;
+
+        if (!SocketColor) //prismatic socket
+            continue;
 
         uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot));
         if (!enchant_id)
@@ -1056,6 +1126,29 @@ uint8 Item::GetGemCountWithLimitCategory(uint32 limitCategory) const
     return count;
 }
 
+uint8 Item::GetJewelcraftingGemCount() const
+{
+    uint8 count = 0;
+    for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT + MAX_GEM_SOCKETS; ++enchant_slot)
+    {
+        uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot));
+        if (!enchant_id)
+            continue;
+
+        SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+        if (!enchantEntry)
+            continue;
+
+        ItemPrototype const* gemProto = ObjectMgr::GetItemPrototype(enchantEntry->GemID);
+        if (!gemProto)
+            continue;
+
+        if (gemProto->RequiredSkill == SKILL_JEWELCRAFTING)
+            ++count;
+    }
+    return count;
+}
+
 bool Item::IsLimitedToAnotherMapOrZone(uint32 cur_mapId, uint32 cur_zoneId) const
 {
     ItemPrototype const* proto = GetProto();
@@ -1067,20 +1160,23 @@ bool Item::IsLimitedToAnotherMapOrZone(uint32 cur_mapId, uint32 cur_zoneId) cons
 // time.
 void Item::SendTimeUpdate(Player* owner)
 {
+    if (!owner || !owner->IsInWorld() || owner->GetPlayerbotAI())
+        return;
+
     uint32 duration = GetUInt32Value(ITEM_FIELD_DURATION);
     if (!duration)
         return;
 
-    WorldPacket data(SMSG_ITEM_TIME_UPDATE, (8 + 4));
+    WorldPacket data(SMSG_ITEM_TIME_UPDATE, 8 + 4);
     data << ObjectGuid(GetObjectGuid());
     data << uint32(duration);
     owner->GetSession()->SendPacket(&data);
 }
 
-Item* Item::CreateItem( uint32 item, uint32 count, Player const* player, uint32 randomPropertyId)
+Item* Item::CreateItem(uint32 item, uint32 count, Player const* player, uint32 randomPropertyId)
 {
     if (count < 1)
-        return NULL;                                        //don't create item at zero count
+        return NULL;                                        // don't create item at zero count
 
     if (ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(item))
     {
@@ -1123,6 +1219,12 @@ bool Item::IsBindedNotWith(Player const* player) const
     if (GetOwnerGuid() == player->GetObjectGuid())
         return false;
 
+    if (HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE))
+    {
+        if (m_allowedLooterGuids.find(player->GetObjectGuid().GetCounter()) != m_allowedLooterGuids.end())
+            return false;
+    }
+
     // has loot with diff owner
     if (HasGeneratedLoot())
         return true;
@@ -1143,20 +1245,20 @@ bool Item::IsBindedNotWith(Player const* player) const
     // offline slow case
     else
     {
-        return sObjectMgr.GetPlayerAccountIdByGUID(GetOwnerGuid()) != player->GetSession()->GetAccountId();
+        return sAccountMgr.GetPlayerAccountIdByGUID(GetOwnerGuid()) != player->GetSession()->GetAccountId();
     }
 }
 
 void Item::AddToClientUpdateList()
 {
-    if (Player* pl = GetOwner())
-        pl->GetMap()->AddUpdateObject(this);
+    if (Player* pPlayer = GetOwner()) 
+        pPlayer->AddUpdateObject(GetObjectGuid());
 }
 
 void Item::RemoveFromClientUpdateList()
 {
-    if (Player* pl = GetOwner())
-        pl->GetMap()->RemoveUpdateObject(this);
+    if (Player* pPlayer = GetOwner()) 
+        pPlayer->RemoveUpdateObject(GetObjectGuid());
 }
 
 void Item::BuildUpdateData(UpdateDataMapType& update_players)
@@ -1208,8 +1310,10 @@ bool Item::HasMaxCharges() const
     ItemPrototype const* itemProto = GetProto();
 
     for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
+    {
         if (GetSpellCharges(i) != itemProto->Spells[i].SpellCharges)
             return false;
+    }
 
     return true;
 }
@@ -1218,7 +1322,7 @@ void Item::RestoreCharges()
 {
     ItemPrototype const* itemProto = GetProto();
 
-    for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
+    for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
     {
         if (GetSpellCharges(i) != itemProto->Spells[i].SpellCharges)
         {
@@ -1237,8 +1341,8 @@ void Item::SetLootState(ItemLootUpdateState state)
     {
         case ITEM_LOOT_NONE:
         case ITEM_LOOT_NEW:
-             assert(false);                                 // not used in state change calls
-             return;
+            assert(false);                                 // not used in state change calls
+            return;
         case ITEM_LOOT_TEMPORARY:
             assert(m_lootState == ITEM_LOOT_NONE);          // called only for not generated yet loot case
             m_lootState = ITEM_LOOT_TEMPORARY;
@@ -1271,3 +1375,288 @@ void Item::SetLootState(ItemLootUpdateState state)
     if (m_lootState != ITEM_LOOT_NONE && m_lootState != ITEM_LOOT_UNCHANGED && m_lootState != ITEM_LOOT_TEMPORARY)
         SetState(ITEM_CHANGED);
 }
+
+bool Item::HasTriggeredByAuraSpell(SpellEntry const* spellInfo) const
+{
+    if (!spellInfo)
+        return false;
+
+    ItemPrototype const* proto = GetProto();
+    if (!proto)
+        return false;
+
+    for (uint32 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
+    {
+        _Spell const& spellData = proto->Spells[i];
+
+        // no spell
+        if (!spellData.SpellId)
+            continue;
+
+        // wrong triggering type
+        if (spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_EQUIP)
+            continue;
+
+        // check if it is valid spell
+        SpellEntry const* spellproto = sSpellStore.LookupEntry(spellData.SpellId);
+        if (!spellproto)
+            continue;
+
+        for (uint32 j = 0; j < MAX_EFFECT_INDEX; ++j)
+        {
+            if (spellproto->EffectTriggerSpell[j] == spellInfo->Id)
+                return true;
+        }
+    }
+    return false;
+}
+
+bool Item::IsRefundOrSoulboundTradeExpired(Player* owner) const
+{
+    return GetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME) + (2 * HOUR) < owner->GetTotalPlayedTime();
+}
+
+// Item Refund
+
+bool Item::IsEligibleForRefund() const
+{
+    ItemPrototype const* proto = GetProto();
+    if (!proto || !(proto->Flags & ITEM_FLAG_REFUNDABLE) || (proto->GetMaxStackSize() != 1))
+        return false;
+
+    for (uint32 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
+    {
+        _Spell const& spellData = proto->Spells[i];
+
+        if (spellData.SpellCharges > 0)
+            return false;
+    }
+
+    return true;
+}
+
+void Item::SetRefundable(Player* owner, uint32 paidCost, uint16 paidExtendedCost, bool load/*=false*/)
+{
+    SetFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE);
+
+    m_paidCost = paidCost;
+    m_paidExtCost = paidExtendedCost;
+
+    if (!load)
+    {
+        SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, owner->GetTotalPlayedTime());
+        SaveRefundDataToDB();
+    }
+
+    owner->AddItemWithTimeCheck(GetGUIDLow());
+}
+
+void Item::SetNotRefundable(Player* owner, bool changeState/*=true*/)
+{
+    if (!HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE))
+        return;
+
+    RemoveFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE);
+    SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, 0);
+
+    if (changeState)
+        SetState(ITEM_CHANGED, owner);
+
+    m_paidCost = 0;
+    m_paidExtCost = 0;
+
+    DeleteRefundDataFromDB();
+    owner->RemoveItemWithTimeCheck(GetGUIDLow());
+}
+
+void Item::DeleteRefundDataFromDB()
+{
+    static SqlStatementID delRefund;
+    CharacterDatabase.CreateStatement(delRefund, "DELETE FROM item_refund_instance WHERE itemGuid = ?")
+        .PExecute(GetGUIDLow());
+}
+
+void Item::SaveRefundDataToDB()
+{
+    Player* owner = GetOwner();
+    if (!owner)
+        return;
+
+    static SqlStatementID saveRefund;
+    CharacterDatabase.CreateStatement(saveRefund, "REPLACE INTO item_refund_instance (itemGuid, playerGuid, paidMoney, paidExtendedCost) VALUES (?, ?, ?, ?)")
+        .PExecute(GetGUIDLow(), owner->GetGUIDLow(), m_paidCost, m_paidExtCost);
+}
+
+bool Item::LoadRefundDataFromDB(Player* owner)
+{
+    bool failed = true;
+
+    if (!IsRefundOrSoulboundTradeExpired(owner))
+    {
+        QueryResult* result = CharacterDatabase.PQuery("SELECT paidMoney, paidExtendedCost FROM item_refund_instance WHERE itemGuid = %u AND playerGuid = %u", GetGUIDLow(), owner->GetGUIDLow());
+        if (result)
+        {
+            Field* fields = result->Fetch();
+            SetRefundable(owner, fields[0].GetUInt32(), fields[1].GetUInt16(), true);
+            delete result;
+            failed = false;
+        }
+    }
+    else
+        DeleteRefundDataFromDB();
+
+    if (failed)
+    {
+        RemoveFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE);
+        SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, 0);
+        return false;
+    }
+
+    return true;
+}
+
+bool Item::CheckRefundExpired(Player* owner)
+{
+    if (!HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE))
+        return true;
+
+    if (IsRefundOrSoulboundTradeExpired(owner))
+    {
+        SetNotRefundable(owner);
+        return true;
+    }
+
+    return false;
+}
+
+// SoulboundTrade
+
+bool Item::IsEligibleForSoulboundTrade(AllowedLooterSet* allowedLooters) const
+{
+    if (!allowedLooters || allowedLooters->size() < 2)
+        return false;
+
+    ItemPrototype const* proto = GetProto();
+    if (!proto || (proto->Flags & ITEM_FLAG_LOOTABLE) || (proto->GetMaxStackSize() != 1) || !IsSoulBound())
+        return false;
+
+    uint32 ownerGuid = GetOwnerGuid().GetCounter();
+    for (AllowedLooterSet::const_iterator itr = allowedLooters->begin(); itr != allowedLooters->end(); ++itr)
+    {
+        if (*itr != ownerGuid) // own
+            return true;
+    }
+
+    return false;
+}
+
+void Item::SetSoulboundTradeable(Player* owner, AllowedLooterSet* allowedLooters, bool load/*=false*/)
+{
+    if (!allowedLooters || allowedLooters->empty())
+        return;
+
+    m_allowedLooterGuids = *allowedLooters;
+    SetFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE);
+
+    if (!load)
+    {
+        SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, owner->GetTotalPlayedTime());
+        SaveSoulboundTradeableToDB();
+    }
+
+    owner->AddItemWithTimeCheck(GetGUIDLow());
+}
+
+void Item::SetNotSoulboundTradeable(Player* owner, bool load/*=false*/)
+{
+    if (!HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE))
+        return;
+
+    m_allowedLooterGuids.clear();
+    DeleteSoulboundTradeableFromDB();
+
+    RemoveFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE);
+    SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, 0);
+
+    if (!load)
+    {
+        SetState(ITEM_CHANGED, owner);
+        owner->RemoveItemWithTimeCheck(GetGUIDLow());
+    }
+}
+
+void Item::DeleteSoulboundTradeableFromDB()
+{
+    static SqlStatementID delData;
+    CharacterDatabase.CreateStatement(delData, "DELETE FROM item_soulbound_trade_data WHERE itemGuid = ?")
+        .PExecute(GetGUIDLow());
+}
+
+void Item::SaveSoulboundTradeableToDB()
+{
+    std::ostringstream ss;
+    if (!m_allowedLooterGuids.empty())
+    {
+        AllowedLooterSet::const_iterator itr = m_allowedLooterGuids.begin();
+        ss << *itr;
+        for (++itr; itr != m_allowedLooterGuids.end(); ++itr)
+            ss << ' ' << *itr;
+    }
+
+    static SqlStatementID saveData;
+    CharacterDatabase.CreateStatement(saveData, "REPLACE INTO item_soulbound_trade_data (itemGuid, allowedPlayers) VALUES (?, ?)")
+        .PExecute(GetGUIDLow(), ss.str().c_str());
+}
+
+bool Item::LoadSoulboundTradeableDataFromDB(Player* owner)
+{
+    QueryResult* result = CharacterDatabase.PQuery("SELECT allowedPlayers FROM item_soulbound_trade_data WHERE itemGuid = %u", GetGUIDLow());
+    if (result)
+    {
+        Field* fields = result->Fetch();
+        std::string guidsStr = fields[0].GetCppString();
+        delete result;
+
+        Tokens guidList(guidsStr, ' ');
+
+        AllowedLooterSet looters;
+        for (Tokens::iterator itr = guidList.begin(); itr != guidList.end(); ++itr)
+            looters.insert(atol(*itr));
+
+        if (!looters.empty())
+            SetSoulboundTradeable(owner, &looters, true);
+        else
+            SetNotSoulboundTradeable(owner, true);
+
+        return !looters.empty();
+    }
+    else
+    {
+        SetNotSoulboundTradeable(owner, true);
+        return false;
+    }
+}
+
+bool Item::CheckSoulboundTradeExpire(Player* owner)
+{
+    if (!HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE))
+        return true;
+
+    if (IsRefundOrSoulboundTradeExpired(owner))
+    {
+        SetNotSoulboundTradeable(owner);
+        return true;
+    }
+
+    return false;
+}
+
+void Item::AddToWorld()
+{
+    Object::AddToWorld();
+}
+
+void Item::RemoveFromWorld(bool remove)
+{
+    Object::RemoveFromWorld(remove);
+}
diff --git a/src/game/Item.h b/src/game/Item.h
index 671176549cb..f5dc2902b56 100644
--- a/src/game/Item.h
+++ b/src/game/Item.h
@@ -177,6 +177,7 @@ enum EnchantmentSlot
 #define MAX_VISIBLE_ITEM_OFFSET       2                     // 2 fields per visible item (entry+enchantment)
 
 #define MAX_GEM_SOCKETS               MAX_ITEM_PROTO_SOCKETS// (BONUS_ENCHANTMENT_SLOT-SOCK_ENCHANTMENT_SLOT) and item proto size, equal value expected
+#define MAX_JEWELCRAFTING_GEMS        3
 
 enum EnchantmentOffset
 {
@@ -224,11 +225,11 @@ enum ItemDynFlags
     ITEM_DYNFLAG_UNK5                         = 0x00000020,
     ITEM_DYNFLAG_UNK6                         = 0x00000040, // ? old note: usable
     ITEM_DYNFLAG_UNK7                         = 0x00000080,
-    ITEM_DYNFLAG_UNK8                         = 0x00000100,
+    ITEM_DYNFLAG_BOP_TRADEABLE                = 0x00000100, // Allows trading soulbound items
     ITEM_DYNFLAG_READABLE                     = 0x00000200, // can be open for read, it or item proto pagetText make show "Right click to read"
     ITEM_DYNFLAG_UNK10                        = 0x00000400,
     ITEM_DYNFLAG_UNK11                        = 0x00000800,
-    ITEM_DYNFLAG_UNK12                        = 0x00001000,
+    ITEM_DYNFLAG_REFUNDABLE                   = 0x00001000, // Item can be returned to vendor for its original cost (extended cost)
     ITEM_DYNFLAG_UNK13                        = 0x00002000,
     ITEM_DYNFLAG_UNK14                        = 0x00004000,
     ITEM_DYNFLAG_UNK15                        = 0x00008000,
@@ -268,17 +269,20 @@ struct ItemRequiredTarget
     bool IsFitToRequirements(Unit* pUnitTarget) const;
 };
 
-bool ItemCanGoIntoBag(ItemPrototype const *proto, ItemPrototype const *pBagProto);
+bool ItemCanGoIntoBag(ItemPrototype const* proto, ItemPrototype const* pBagProto);
 
 class MANGOS_DLL_SPEC Item : public Object
 {
     public:
         static Item* CreateItem(uint32 item, uint32 count, Player const* player = NULL, uint32 randomPropertyId = 0);
-        Item* CloneItem( uint32 count, Player const* player = NULL ) const;
+        Item* CloneItem(uint32 count, Player const* player = NULL) const;
 
         Item();
 
-        virtual bool Create( uint32 guidlow, uint32 itemid, Player const* owner);
+        virtual bool Create(uint32 guidlow, uint32 itemid, Player const* owner);
+
+        void AddToWorld();
+        virtual void RemoveFromWorld(bool remove);
 
         ItemPrototype const* GetProto() const;
 
@@ -286,33 +290,42 @@ class MANGOS_DLL_SPEC Item : public Object
         void SetOwnerGuid(ObjectGuid guid) { SetGuidValue(ITEM_FIELD_OWNER, guid); }
         Player* GetOwner()const;
 
-        void SetBinding(bool val) { ApplyModFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BINDED,val); }
+        void SetBinding(bool val) { ApplyModFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BINDED, val); }
         bool IsSoulBound() const { return HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BINDED); }
         bool IsBoundAccountWide() const { return GetProto()->Flags & ITEM_FLAG_BOA; }
         bool IsBindedNotWith(Player const* player) const;
         bool IsBoundByEnchant() const;
-        virtual void SaveToDB();
+
         virtual bool LoadFromDB(uint32 guidLow, Field* fields, ObjectGuid ownerGuid = ObjectGuid());
+        virtual void SaveToDB();
+
+        void LoadLootFromDB(Field* fields);
+        static void DeleteLootFromDB(uint32 guidLow, uint32 itemId = 0);
+
         virtual void DeleteFromDB();
         void DeleteFromInventoryDB();
-        void LoadLootFromDB(Field* fields);
+        static void DeleteFromDB(uint32 guidLow);
+        static void DeleteFromInventoryDB(uint32 guidLow);
+        void DeleteGiftsFromDB();
 
         bool IsBag() const { return GetProto()->InventoryType == INVTYPE_BAG; }
         bool IsBroken() const { return GetUInt32Value(ITEM_FIELD_MAXDURABILITY) > 0 && GetUInt32Value(ITEM_FIELD_DURABILITY) == 0; }
-        bool CanBeTraded(bool mail = false) const;
+        bool CanBeTraded(bool mail = false, bool trade = false) const;
         void SetInTrade(bool b = true) { mb_in_trade = b; }
         bool IsInTrade() const { return mb_in_trade; }
 
         bool IsFitToSpellRequirements(SpellEntry const* spellInfo) const;
+        bool HasTriggeredByAuraSpell(SpellEntry const* spellInfo) const;
         bool IsTargetValidForItemUse(Unit* pUnitTarget);
         bool IsLimitedToAnotherMapOrZone(uint32 cur_mapId, uint32 cur_zoneId) const;
         bool GemsFitSockets() const;
 
-        uint32 GetCount() const { return GetUInt32Value (ITEM_FIELD_STACK_COUNT); }
-        void SetCount(uint32 value) { SetUInt32Value (ITEM_FIELD_STACK_COUNT, value); }
+        uint32 GetCount() const { return GetUInt32Value(ITEM_FIELD_STACK_COUNT); }
+        void SetCount(uint32 value) { SetUInt32Value(ITEM_FIELD_STACK_COUNT, value); }
         uint32 GetMaxStackCount() const { return GetProto()->GetMaxStackSize(); }
         uint8 GetGemCountWithID(uint32 GemID) const;
         uint8 GetGemCountWithLimitCategory(uint32 limitCategory) const;
+        uint8 GetJewelcraftingGemCount() const;
         InventoryResult CanBeMergedPartlyWith(ItemPrototype const* proto) const;
 
         uint8 GetSlot() const {return m_slot;}
@@ -320,7 +333,7 @@ class MANGOS_DLL_SPEC Item : public Object
         uint8 GetBagSlot() const;
         void SetSlot(uint8 slot) {m_slot = slot;}
         uint16 GetPos() const { return uint16(GetBagSlot()) << 8 | GetSlot(); }
-        void SetContainer(Bag *container) { m_container = container; }
+        void SetContainer(Bag* container) { m_container = container; }
 
         bool IsInBag() const { return m_container != NULL; }
         bool IsEquipped() const;
@@ -350,7 +363,7 @@ class MANGOS_DLL_SPEC Item : public Object
 
         // spell charges (signed but stored as unsigned)
         int32 GetSpellCharges(uint8 index/*0..5*/ = 0) const { return GetInt32Value(ITEM_FIELD_SPELL_CHARGES + index); }
-        void SetSpellCharges(uint8 index/*0..5*/, int32 value) { SetInt32Value(ITEM_FIELD_SPELL_CHARGES + index,value); }
+        void SetSpellCharges(uint8 index/*0..5*/, int32 value) { SetInt32Value(ITEM_FIELD_SPELL_CHARGES + index, value); }
         bool HasMaxCharges() const;
         void RestoreCharges();
 
@@ -363,33 +376,65 @@ class MANGOS_DLL_SPEC Item : public Object
         bool HasSavedLoot() const { return m_lootState != ITEM_LOOT_NONE && m_lootState != ITEM_LOOT_NEW && m_lootState != ITEM_LOOT_TEMPORARY; }
 
         // Update States
-        ItemUpdateState GetState() const { return uState; }
+        ItemUpdateState GetState() const { return m_state; }
         void SetState(ItemUpdateState state, Player* forplayer = NULL);
         void AddToUpdateQueueOf(Player* player);
         void RemoveFromUpdateQueueOf(Player* player);
-        bool IsInUpdateQueue() const { return uQueuePos != -1; }
-        uint16 GetQueuePos() const { return uQueuePos; }
-        void FSetState(ItemUpdateState state)               // forced
-        {
-            uState = state;
-        }
+        bool IsInUpdateQueue() const { return m_queuePos != -1; }
+        uint16 GetQueuePos() const { return m_queuePos; }
+        void FSetState(ItemUpdateState state) { m_state = state; } // forced
 
         bool HasQuest(uint32 quest_id) const { return GetProto()->StartQuest == quest_id; }
         bool HasInvolvedQuest(uint32 /*quest_id*/) const { return false; }
         bool IsPotion() const { return GetProto()->IsPotion(); }
         bool IsConjuredConsumable() const { return GetProto()->IsConjuredConsumable(); }
 
-        void AddToClientUpdateList();
-        void RemoveFromClientUpdateList();
-        void BuildUpdateData(UpdateDataMapType& update_players);
+        void AddToClientUpdateList() override;
+        void RemoveFromClientUpdateList() override;
+        void BuildUpdateData(UpdateDataMapType& update_players) override;
+
+        // Item Refunding system
+        bool IsEligibleForRefund() const;
+        void SetRefundable(Player* owner, uint32 paidCost, uint16 paidExtendedCost, bool load = false);
+        void SetNotRefundable(Player* owner, bool changeState = true);
+
+        bool LoadRefundDataFromDB(Player* owner);
+        bool CheckRefundExpired(Player* owner);
+
+        uint32 GetPaidMoney() const { return m_paidCost; }
+        uint32 GetPaidExtendedCost() const { return m_paidExtCost; }
+        // Soulbound trade system
+        bool IsEligibleForSoulboundTrade(AllowedLooterSet* allowedLooters) const;
+        void SetSoulboundTradeable(Player* owner, AllowedLooterSet* allowedLooters, bool load = false);
+        void SetNotSoulboundTradeable(Player* owner, bool load = false);
+
+        bool LoadSoulboundTradeableDataFromDB(Player* owner);
+        bool CheckSoulboundTradeExpire(Player* owner);
     private:
+        void GetDataValuesStr(std::ostringstream& ss);
+
+        bool IsRefundOrSoulboundTradeExpired(Player* owner) const;
+
+        void DeleteLootFromDB();
+
+        void DeleteRefundDataFromDB();
+        void SaveRefundDataToDB();
+
+        void DeleteSoulboundTradeableFromDB();
+        void SaveSoulboundTradeableToDB();
+
         std::string m_text;
-        uint8 m_slot;
         Bag* m_container;
-        ItemUpdateState uState;
-        int16 uQueuePos;
-        bool mb_in_trade;                                   // true if item is currently in trade-window
+        uint8 m_slot;
+        ItemUpdateState m_state;
+        int16 m_queuePos;
         ItemLootUpdateState m_lootState;
+        bool mb_in_trade;                                   // true if item is currently in trade-window
+
+        uint32 m_paidCost;
+        uint16 m_paidExtCost;
+
+        AllowedLooterSet m_allowedLooterGuids;
 };
 
 #endif
diff --git a/src/game/ItemEnchantmentMgr.cpp b/src/game/ItemEnchantmentMgr.cpp
index cf8b33f3977..8b68b4ae4c6 100644
--- a/src/game/ItemEnchantmentMgr.cpp
+++ b/src/game/ItemEnchantmentMgr.cpp
@@ -48,12 +48,8 @@ void LoadRandomEnchantmentsTable()
 {
     RandomItemEnch.clear();                                 // for reload case
 
-    EnchantmentStore::const_iterator tab;
-    uint32 entry, ench;
-    float chance;
     uint32 count = 0;
-
-    QueryResult *result = WorldDatabase.Query("SELECT entry, ench, chance FROM item_enchantment_template");
+    QueryResult* result = WorldDatabase.Query("SELECT entry, ench, chance FROM item_enchantment_template");
 
     if (result)
     {
@@ -61,28 +57,29 @@ void LoadRandomEnchantmentsTable()
 
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             bar.step();
 
-            entry = fields[0].GetUInt32();
-            ench = fields[1].GetUInt32();
-            chance = fields[2].GetFloat();
+            uint32 entry = fields[0].GetUInt32();
+            uint32 ench = fields[1].GetUInt32();
+            float chance = fields[2].GetFloat();
 
             if (chance > 0.000001f && chance <= 100.0f)
-                RandomItemEnch[entry].push_back( EnchStoreItem(ench, chance) );
+                RandomItemEnch[entry].push_back(EnchStoreItem(ench, chance));
 
             ++count;
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
 
         delete result;
 
         sLog.outString();
-        sLog.outString( ">> Loaded %u Item Enchantment definitions", count );
+        sLog.outString(">> Loaded %u Item Enchantment definitions", count);
     }
     else
     {
         sLog.outString();
-        sLog.outErrorDb( ">> Loaded 0 Item Enchantment definitions. DB table `item_enchantment_template` is empty.");
+        sLog.outErrorDb(">> Loaded 0 Item Enchantment definitions. DB table `item_enchantment_template` is empty.");
     }
 }
 
@@ -94,25 +91,25 @@ uint32 GetItemEnchantMod(uint32 entry)
 
     if (tab == RandomItemEnch.end())
     {
-        sLog.outErrorDb("Item RandomProperty / RandomSuffix id #%u used in `item_template` but it doesn't have records in `item_enchantment_template` table.",entry);
+        sLog.outErrorDb("Item RandomProperty / RandomSuffix id #%u used in `item_template` but it doesn't have records in `item_enchantment_template` table.", entry);
         return 0;
     }
 
     double dRoll = rand_chance();
     float fCount = 0;
 
-    for(EnchStoreList::const_iterator ench_iter = tab->second.begin(); ench_iter != tab->second.end(); ++ench_iter)
+    for (EnchStoreList::const_iterator ench_iter = tab->second.begin(); ench_iter != tab->second.end(); ++ench_iter)
     {
         fCount += ench_iter->chance;
 
         if (fCount > dRoll) return ench_iter->ench;
     }
 
-    //we could get here only if sum of all enchantment chances is lower than 100%
-    dRoll =  (irand(0, (int)floor(fCount * 100) + 1)) / 100;
+    // we could get here only if sum of all enchantment chances is lower than 100%
+    dRoll = (irand(0, (int)floor(fCount * 100) + 1)) / 100;
     fCount = 0;
 
-    for(EnchStoreList::const_iterator ench_iter = tab->second.begin(); ench_iter != tab->second.end(); ++ench_iter)
+    for (EnchStoreList::const_iterator ench_iter = tab->second.begin(); ench_iter != tab->second.end(); ++ench_iter)
     {
         fCount += ench_iter->chance;
 
@@ -124,21 +121,21 @@ uint32 GetItemEnchantMod(uint32 entry)
 
 uint32 GenerateEnchSuffixFactor(uint32 item_id)
 {
-    ItemPrototype const *itemProto = ObjectMgr::GetItemPrototype(item_id);
+    ItemPrototype const* itemProto = ObjectMgr::GetItemPrototype(item_id);
 
-    if(!itemProto)
+    if (!itemProto)
         return 0;
-    if(!itemProto->RandomSuffix)
+    if (!itemProto->RandomSuffix)
         return 0;
 
-    RandomPropertiesPointsEntry const *randomProperty = sRandomPropertiesPointsStore.LookupEntry(itemProto->ItemLevel);
-    if(!randomProperty)
+    RandomPropertiesPointsEntry const* randomProperty = sRandomPropertiesPointsStore.LookupEntry(itemProto->ItemLevel);
+    if (!randomProperty)
         return 0;
 
     uint32 suffixFactor;
-    switch(itemProto->InventoryType)
+    switch (itemProto->InventoryType)
     {
-        // Items of that type don`t have points
+            // Items of that type don`t have points
         case INVTYPE_NON_EQUIP:
         case INVTYPE_BAG:
         case INVTYPE_TABARD:
diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp
index 20a233ff6bc..1eac7f422a4 100644
--- a/src/game/ItemHandler.cpp
+++ b/src/game/ItemHandler.cpp
@@ -27,147 +27,147 @@
 #include "UpdateData.h"
 #include "Chat.h"
 
-void WorldSession::HandleSplitItemOpcode( WorldPacket & recv_data )
+void WorldSession::HandleSplitItemOpcode(WorldPacket& recv_data)
 {
-    //DEBUG_LOG("WORLD: CMSG_SPLIT_ITEM");
+    // DEBUG_LOG("WORLD: CMSG_SPLIT_ITEM");
     uint8 srcbag, srcslot, dstbag, dstslot;
     uint32 count;
 
     recv_data >> srcbag >> srcslot >> dstbag >> dstslot >> count;
-    //DEBUG_LOG("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u, dstslot = %u, count = %u", srcbag, srcslot, dstbag, dstslot, count);
+    // DEBUG_LOG("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u, dstslot = %u, count = %u", srcbag, srcslot, dstbag, dstslot, count);
 
-    uint16 src = ( (srcbag << 8) | srcslot );
-    uint16 dst = ( (dstbag << 8) | dstslot );
+    uint16 src = ((srcbag << 8) | srcslot);
+    uint16 dst = ((dstbag << 8) | dstslot);
 
-    if(src == dst)
+    if (src == dst)
         return;
 
     if (count == 0)
-        return;                                             //check count - if zero it's fake packet
+        return;                                             // check count - if zero it's fake packet
 
-    if(!_player->IsValidPos(srcbag, srcslot, true))
+    if (!_player->IsValidPos(srcbag, srcslot, true))
     {
-        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL);
         return;
     }
 
-    if(!_player->IsValidPos(dstbag, dstslot, false))        // can be autostore pos
+    if (!_player->IsValidPos(dstbag, dstslot, false))       // can be autostore pos
     {
-        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL);
         return;
     }
 
-    _player->SplitItem( src, dst, count );
+    _player->SplitItem(src, dst, count);
 }
 
-void WorldSession::HandleSwapInvItemOpcode( WorldPacket & recv_data )
+void WorldSession::HandleSwapInvItemOpcode(WorldPacket& recv_data)
 {
-    //DEBUG_LOG("WORLD: CMSG_SWAP_INV_ITEM");
+    // DEBUG_LOG("WORLD: CMSG_SWAP_INV_ITEM");
     uint8 srcslot, dstslot;
 
     recv_data >> dstslot >> srcslot;
-    //DEBUG_LOG("STORAGE: receive srcslot = %u, dstslot = %u", srcslot, dstslot);
+    // DEBUG_LOG("STORAGE: receive srcslot = %u, dstslot = %u", srcslot, dstslot);
 
     // prevent attempt swap same item to current position generated by client at special cheating sequence
-    if(srcslot == dstslot)
+    if (srcslot == dstslot)
         return;
 
-    if(!_player->IsValidPos(INVENTORY_SLOT_BAG_0, srcslot, true))
+    if (!_player->IsValidPos(INVENTORY_SLOT_BAG_0, srcslot, true))
     {
-        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL);
         return;
     }
 
-    if(!_player->IsValidPos(INVENTORY_SLOT_BAG_0, dstslot, true))
+    if (!_player->IsValidPos(INVENTORY_SLOT_BAG_0, dstslot, true))
     {
-        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL);
         return;
     }
 
-    uint16 src = ( (INVENTORY_SLOT_BAG_0 << 8) | srcslot );
-    uint16 dst = ( (INVENTORY_SLOT_BAG_0 << 8) | dstslot );
+    uint16 src = ((INVENTORY_SLOT_BAG_0 << 8) | srcslot);
+    uint16 dst = ((INVENTORY_SLOT_BAG_0 << 8) | dstslot);
 
-    _player->SwapItem( src, dst );
+    _player->SwapItem(src, dst);
 }
 
-void WorldSession::HandleAutoEquipItemSlotOpcode( WorldPacket & recv_data )
+void WorldSession::HandleAutoEquipItemSlotOpcode(WorldPacket& recv_data)
 {
     ObjectGuid itemGuid;
     uint8 dstslot;
     recv_data >> itemGuid >> dstslot;
 
     // cheating attempt, client should never send opcode in that case
-    if(!Player::IsEquipmentPos(INVENTORY_SLOT_BAG_0, dstslot))
+    if (!Player::IsEquipmentPos(INVENTORY_SLOT_BAG_0, dstslot))
         return;
 
     Item* item = _player->GetItemByGuid(itemGuid);
     uint16 dstpos = dstslot | (INVENTORY_SLOT_BAG_0 << 8);
 
-    if(!item || item->GetPos() == dstpos)
+    if (!item || item->GetPos() == dstpos)
         return;
 
     _player->SwapItem(item->GetPos(), dstpos);
 }
 
-void WorldSession::HandleSwapItem( WorldPacket & recv_data )
+void WorldSession::HandleSwapItem(WorldPacket& recv_data)
 {
-    //DEBUG_LOG("WORLD: CMSG_SWAP_ITEM");
+    // DEBUG_LOG("WORLD: CMSG_SWAP_ITEM");
     uint8 dstbag, dstslot, srcbag, srcslot;
 
     recv_data >> dstbag >> dstslot >> srcbag >> srcslot ;
-    //DEBUG_LOG("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u, dstslot = %u", srcbag, srcslot, dstbag, dstslot);
+    // DEBUG_LOG("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u, dstslot = %u", srcbag, srcslot, dstbag, dstslot);
 
-    uint16 src = ( (srcbag << 8) | srcslot );
-    uint16 dst = ( (dstbag << 8) | dstslot );
+    uint16 src = ((srcbag << 8) | srcslot);
+    uint16 dst = ((dstbag << 8) | dstslot);
 
     // prevent attempt swap same item to current position generated by client at special cheating sequence
-    if(src == dst)
+    if (src == dst)
         return;
 
-    if(!_player->IsValidPos(srcbag, srcslot, true))
+    if (!_player->IsValidPos(srcbag, srcslot, true))
     {
-        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL);
         return;
     }
 
-    if(!_player->IsValidPos(dstbag, dstslot, true))
+    if (!_player->IsValidPos(dstbag, dstslot, true))
     {
-        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL);
         return;
     }
 
-    _player->SwapItem( src, dst );
+    _player->SwapItem(src, dst);
 }
 
-void WorldSession::HandleAutoEquipItemOpcode( WorldPacket & recv_data )
+void WorldSession::HandleAutoEquipItemOpcode(WorldPacket& recv_data)
 {
-    //DEBUG_LOG("WORLD: CMSG_AUTOEQUIP_ITEM");
+    // DEBUG_LOG("WORLD: CMSG_AUTOEQUIP_ITEM");
     uint8 srcbag, srcslot;
 
     recv_data >> srcbag >> srcslot;
-    //DEBUG_LOG("STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot);
+    // DEBUG_LOG("STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot);
 
-    Item *pSrcItem  = _player->GetItemByPos( srcbag, srcslot );
-    if( !pSrcItem )
+    Item* pSrcItem  = _player->GetItemByPos(srcbag, srcslot);
+    if (!pSrcItem)
         return;                                             // only at cheat
 
     uint16 dest;
-    InventoryResult msg = _player->CanEquipItem( NULL_SLOT, dest, pSrcItem, !pSrcItem->IsBag() );
-    if( msg != EQUIP_ERR_OK )
+    InventoryResult msg = _player->CanEquipItem(NULL_SLOT, dest, pSrcItem, !pSrcItem->IsBag());
+    if (msg != EQUIP_ERR_OK)
     {
-        _player->SendEquipError( msg, pSrcItem, NULL );
+        _player->SendEquipError(msg, pSrcItem, NULL);
         return;
     }
 
     uint16 src = pSrcItem->GetPos();
-    if(dest == src)                                         // prevent equip in same slot, only at cheat
+    if (dest == src)                                        // prevent equip in same slot, only at cheat
         return;
 
-    Item *pDstItem = _player->GetItemByPos( dest );
-    if( !pDstItem )                                         // empty slot, simple case
+    Item* pDstItem = _player->GetItemByPos(dest);
+    if (!pDstItem)                                          // empty slot, simple case
     {
-        _player->RemoveItem( srcbag, srcslot, true );
-        _player->EquipItem( dest, pSrcItem, true );
+        _player->RemoveItem(srcbag, srcslot, true);
+        _player->EquipItem(dest, pSrcItem, true);
         _player->AutoUnequipOffhandIfNeed();
     }
     else                                                    // have currently equipped item, not simple case
@@ -175,42 +175,42 @@ void WorldSession::HandleAutoEquipItemOpcode( WorldPacket & recv_data )
         uint8 dstbag = pDstItem->GetBagSlot();
         uint8 dstslot = pDstItem->GetSlot();
 
-        msg = _player->CanUnequipItem( dest, !pSrcItem->IsBag() );
-        if( msg != EQUIP_ERR_OK )
+        msg = _player->CanUnequipItem(dest, !pSrcItem->IsBag());
+        if (msg != EQUIP_ERR_OK)
         {
-            _player->SendEquipError( msg, pDstItem, NULL );
+            _player->SendEquipError(msg, pDstItem, NULL);
             return;
         }
 
         // check dest->src move possibility
         ItemPosCountVec sSrc;
         uint16 eSrc = 0;
-        if( _player->IsInventoryPos( src ) )
+        if (_player->IsInventoryPos(src))
         {
-            msg = _player->CanStoreItem( srcbag, srcslot, sSrc, pDstItem, true );
-            if( msg != EQUIP_ERR_OK )
-                msg = _player->CanStoreItem( srcbag, NULL_SLOT, sSrc, pDstItem, true );
-            if( msg != EQUIP_ERR_OK )
-                msg = _player->CanStoreItem( NULL_BAG, NULL_SLOT, sSrc, pDstItem, true );
+            msg = _player->CanStoreItem(srcbag, srcslot, sSrc, pDstItem, true);
+            if (msg != EQUIP_ERR_OK)
+                msg = _player->CanStoreItem(srcbag, NULL_SLOT, sSrc, pDstItem, true);
+            if (msg != EQUIP_ERR_OK)
+                msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, sSrc, pDstItem, true);
         }
-        else if( _player->IsBankPos( src ) )
+        else if (_player->IsBankPos(src))
         {
-            msg = _player->CanBankItem( srcbag, srcslot, sSrc, pDstItem, true );
-            if( msg != EQUIP_ERR_OK )
-                msg = _player->CanBankItem( srcbag, NULL_SLOT, sSrc, pDstItem, true );
-            if( msg != EQUIP_ERR_OK )
-                msg = _player->CanBankItem( NULL_BAG, NULL_SLOT, sSrc, pDstItem, true );
+            msg = _player->CanBankItem(srcbag, srcslot, sSrc, pDstItem, true);
+            if (msg != EQUIP_ERR_OK)
+                msg = _player->CanBankItem(srcbag, NULL_SLOT, sSrc, pDstItem, true);
+            if (msg != EQUIP_ERR_OK)
+                msg = _player->CanBankItem(NULL_BAG, NULL_SLOT, sSrc, pDstItem, true);
         }
-        else if( _player->IsEquipmentPos( src ) )
+        else if (_player->IsEquipmentPos(src))
         {
-            msg = _player->CanEquipItem( srcslot, eSrc, pDstItem, true);
-            if( msg == EQUIP_ERR_OK )
-                msg = _player->CanUnequipItem( eSrc, true);
+            msg = _player->CanEquipItem(srcslot, eSrc, pDstItem, true);
+            if (msg == EQUIP_ERR_OK)
+                msg = _player->CanUnequipItem(eSrc, true);
         }
 
-        if( msg != EQUIP_ERR_OK )
+        if (msg != EQUIP_ERR_OK)
         {
-            _player->SendEquipError( msg, pDstItem, pSrcItem );
+            _player->SendEquipError(msg, pDstItem, pSrcItem);
             return;
         }
 
@@ -222,71 +222,71 @@ void WorldSession::HandleAutoEquipItemOpcode( WorldPacket & recv_data )
         _player->EquipItem(dest, pSrcItem, true);
 
         // add to src
-        if( _player->IsInventoryPos( src ) )
+        if (_player->IsInventoryPos(src))
             _player->StoreItem(sSrc, pDstItem, true);
-        else if( _player->IsBankPos( src ) )
+        else if (_player->IsBankPos(src))
             _player->BankItem(sSrc, pDstItem, true);
-        else if( _player->IsEquipmentPos( src ) )
+        else if (_player->IsEquipmentPos(src))
             _player->EquipItem(eSrc, pDstItem, true);
 
         _player->AutoUnequipOffhandIfNeed();
     }
 }
 
-void WorldSession::HandleDestroyItemOpcode( WorldPacket & recv_data )
+void WorldSession::HandleDestroyItemOpcode(WorldPacket& recv_data)
 {
-    //DEBUG_LOG("WORLD: CMSG_DESTROYITEM");
+    // DEBUG_LOG("WORLD: CMSG_DESTROYITEM");
     uint8 bag, slot, count, data1, data2, data3;
 
     recv_data >> bag >> slot >> count >> data1 >> data2 >> data3;
-    //DEBUG_LOG("STORAGE: receive bag = %u, slot = %u, count = %u", bag, slot, count);
+    // DEBUG_LOG("STORAGE: receive bag = %u, slot = %u, count = %u", bag, slot, count);
 
     uint16 pos = (bag << 8) | slot;
 
     // prevent drop unequipable items (in combat, for example) and non-empty bags
-    if(_player->IsEquipmentPos(pos) || _player->IsBagPos(pos))
+    if (_player->IsEquipmentPos(pos) || _player->IsBagPos(pos))
     {
-        InventoryResult msg = _player->CanUnequipItem( pos, false );
-        if( msg != EQUIP_ERR_OK )
+        InventoryResult msg = _player->CanUnequipItem(pos, false);
+        if (msg != EQUIP_ERR_OK)
         {
-            _player->SendEquipError( msg, _player->GetItemByPos(pos), NULL );
+            _player->SendEquipError(msg, _player->GetItemByPos(pos), NULL);
             return;
         }
     }
 
-    Item *pItem  = _player->GetItemByPos( bag, slot );
-    if(!pItem)
+    Item* pItem  = _player->GetItemByPos(bag, slot);
+    if (!pItem)
     {
-        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL);
         return;
     }
 
     // checked at client side and not have server side appropriate error output
     if (pItem->GetProto()->Flags & ITEM_FLAG_INDESTRUCTIBLE)
     {
-        _player->SendEquipError( EQUIP_ERR_CANT_DROP_SOULBOUND, NULL, NULL );
+        _player->SendEquipError(EQUIP_ERR_CANT_DROP_SOULBOUND, NULL, NULL);
         return;
     }
 
-    if(count)
+    if (count)
     {
         uint32 i_count = count;
-        _player->DestroyItemCount( pItem, i_count, true );
+        _player->DestroyItemCount(pItem, i_count, true);
     }
     else
-        _player->DestroyItem( bag, slot, true );
+        _player->DestroyItem(bag, slot, true);
 }
 
 // Only _static_ data send in this packet !!!
-void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
+void WorldSession::HandleItemQuerySingleOpcode(WorldPacket& recv_data)
 {
-    //DEBUG_LOG("WORLD: CMSG_ITEM_QUERY_SINGLE");
+    // DEBUG_LOG("WORLD: CMSG_ITEM_QUERY_SINGLE");
     uint32 item;
     recv_data >> item;
 
     DETAIL_LOG("STORAGE: Item Query = %u", item);
 
-    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(item);
+    ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(item);
     if (pProto)
     {
         int loc_idx = GetSessionDbLocaleIndex();
@@ -295,16 +295,16 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
         std::string description = pProto->Description;
         sObjectMgr.GetItemLocaleStrings(pProto->ItemId, loc_idx, &name, &description);
 
-                                                            // guess size
-        WorldPacket data( SMSG_ITEM_QUERY_SINGLE_RESPONSE, 600);
+        // guess size
+        WorldPacket data(SMSG_ITEM_QUERY_SINGLE_RESPONSE, 600);
         data << pProto->ItemId;
         data << pProto->Class;
         data << pProto->SubClass;
         data << int32(pProto->Unk0);                        // new 2.0.3, not exist in wdb cache?
         data << name;
-        data << uint8(0x00);                                //pProto->Name2; // blizz not send name there, just uint8(0x00); <-- \0 = empty string = empty name...
-        data << uint8(0x00);                                //pProto->Name3; // blizz not send name there, just uint8(0x00);
-        data << uint8(0x00);                                //pProto->Name4; // blizz not send name there, just uint8(0x00);
+        data << uint8(0x00);                                // pProto->Name2; // blizz not send name there, just uint8(0x00); <-- \0 = empty string = empty name...
+        data << uint8(0x00);                                // pProto->Name3; // blizz not send name there, just uint8(0x00);
+        data << uint8(0x00);                                // pProto->Name4; // blizz not send name there, just uint8(0x00);
         data << pProto->DisplayInfoID;
         data << pProto->Quality;
         data << pProto->Flags;
@@ -327,14 +327,14 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
         data << int32(pProto->Stackable);
         data << pProto->ContainerSlots;
         data << pProto->StatsCount;                         // item stats count
-        for(uint32 i = 0; i < pProto->StatsCount; ++i)
+        for (uint32 i = 0; i < pProto->StatsCount; ++i)
         {
             data << pProto->ItemStat[i].ItemStatType;
             data << pProto->ItemStat[i].ItemStatValue;
         }
         data << pProto->ScalingStatDistribution;            // scaling stats distribution
         data << pProto->ScalingStatValue;                   // some kind of flags used to determine stat values column
-        for(int i = 0; i < MAX_ITEM_PROTO_DAMAGES; ++i)
+        for (int i = 0; i < MAX_ITEM_PROTO_DAMAGES; ++i)
         {
             data << pProto->Damage[i].DamageMin;
             data << pProto->Damage[i].DamageMax;
@@ -354,12 +354,12 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
         data << pProto->AmmoType;
         data << pProto->RangedModRange;
 
-        for(int s = 0; s < MAX_ITEM_PROTO_SPELLS; ++s)
+        for (int s = 0; s < MAX_ITEM_PROTO_SPELLS; ++s)
         {
             // send DBC data for cooldowns in same way as it used in Spell::SendSpellCooldown
             // use `item_template` or if not set then only use spell cooldowns
             SpellEntry const* spell = sSpellStore.LookupEntry(pProto->Spells[s].SpellId);
-            if(spell)
+            if (spell)
             {
                 bool db_data = pProto->Spells[s].SpellCooldown >= 0 || pProto->Spells[s].SpellCategoryCooldown >= 0;
 
@@ -367,7 +367,7 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
                 data << pProto->Spells[s].SpellTrigger;
                 data << uint32(-abs(pProto->Spells[s].SpellCharges));
 
-                if(db_data)
+                if (db_data)
                 {
                     data << uint32(pProto->Spells[s].SpellCooldown);
                     data << uint32(pProto->Spells[s].SpellCategory);
@@ -408,7 +408,7 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
         data << pProto->Map;                                // Added in 1.12.x & 2.0.1 client branch
         data << pProto->BagFamily;
         data << pProto->TotemCategory;
-        for(int s = 0; s < MAX_ITEM_PROTO_SOCKETS; ++s)
+        for (int s = 0; s < MAX_ITEM_PROTO_SOCKETS; ++s)
         {
             data << pProto->Socket[s].Color;
             data << pProto->Socket[s].Content;
@@ -420,53 +420,53 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
         data << uint32(pProto->Duration);                   // added in 2.4.2.8209, duration (seconds)
         data << uint32(pProto->ItemLimitCategory);          // WotLK, ItemLimitCategory
         data << uint32(pProto->HolidayId);                  // Holiday.dbc?
-        SendPacket( &data );
+        SendPacket(&data);
     }
     else
     {
-        DEBUG_LOG( "WORLD: CMSG_ITEM_QUERY_SINGLE - NO item INFO! (ENTRY: %u)", item );
-        WorldPacket data( SMSG_ITEM_QUERY_SINGLE_RESPONSE, 4);
+        DEBUG_LOG("WORLD: CMSG_ITEM_QUERY_SINGLE - NO item INFO! (ENTRY: %u)", item);
+        WorldPacket data(SMSG_ITEM_QUERY_SINGLE_RESPONSE, 4);
         data << uint32(item | 0x80000000);
-        SendPacket( &data );
+        SendPacket(&data);
     }
 }
 
-void WorldSession::HandleReadItemOpcode( WorldPacket & recv_data )
+void WorldSession::HandleReadItemOpcode(WorldPacket& recv_data)
 {
-    //DEBUG_LOG( "WORLD: CMSG_READ_ITEM");
+    // DEBUG_LOG( "WORLD: CMSG_READ_ITEM");
 
     uint8 bag, slot;
     recv_data >> bag >> slot;
 
-    //sLog.outDetail("STORAGE: Read bag = %u, slot = %u", bag, slot);
-    Item *pItem = _player->GetItemByPos( bag, slot );
+    // sLog.outDetail("STORAGE: Read bag = %u, slot = %u", bag, slot);
+    Item* pItem = _player->GetItemByPos(bag, slot);
 
-    if( pItem && pItem->GetProto()->PageText )
+    if (pItem && pItem->GetProto()->PageText)
     {
         WorldPacket data;
 
-        InventoryResult msg = _player->CanUseItem( pItem );
-        if( msg == EQUIP_ERR_OK )
+        InventoryResult msg = _player->CanUseItem(pItem);
+        if (msg == EQUIP_ERR_OK)
         {
-            data.Initialize (SMSG_READ_ITEM_OK, 8);
+            data.Initialize(SMSG_READ_ITEM_OK, 8);
             DETAIL_LOG("STORAGE: Item page sent");
         }
         else
         {
-            data.Initialize( SMSG_READ_ITEM_FAILED, 8 );
+            data.Initialize(SMSG_READ_ITEM_FAILED, 8);
             DETAIL_LOG("STORAGE: Unable to read item");
-            _player->SendEquipError( msg, pItem, NULL );
+            _player->SendEquipError(msg, pItem, NULL);
         }
         data << ObjectGuid(pItem->GetObjectGuid());
         SendPacket(&data);
     }
     else
-        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL);
 }
 
-void WorldSession::HandlePageQuerySkippedOpcode( WorldPacket & recv_data )
+void WorldSession::HandlePageQuerySkippedOpcode(WorldPacket& recv_data)
 {
-    DEBUG_LOG( "WORLD: Received CMSG_PAGE_TEXT_QUERY" );
+    DEBUG_LOG("WORLD: Received CMSG_PAGE_TEXT_QUERY");
 
     uint32 itemid;
     ObjectGuid guid;
@@ -476,9 +476,9 @@ void WorldSession::HandlePageQuerySkippedOpcode( WorldPacket & recv_data )
     DETAIL_LOG("Packet Info: itemid: %u guid: %s", itemid, guid.GetString().c_str());
 }
 
-void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
+void WorldSession::HandleSellItemOpcode(WorldPacket& recv_data)
 {
-    DEBUG_LOG(  "WORLD: Received CMSG_SELL_ITEM" );
+    DEBUG_LOG("WORLD: Received CMSG_SELL_ITEM");
 
     ObjectGuid vendorGuid;
     ObjectGuid itemGuid;
@@ -491,7 +491,7 @@ void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
     if (!itemGuid)
         return;
 
-    Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorGuid, UNIT_NPC_FLAG_VENDOR);
+    Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorGuid, UNIT_NPC_FLAG_VENDOR);
     if (!pCreature)
     {
         DEBUG_LOG("WORLD: HandleSellItemOpcode - %s not found or you can't interact with him.", vendorGuid.GetString().c_str());
@@ -503,7 +503,7 @@ void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
 
-    Item *pItem = _player->GetItemByGuid(itemGuid);
+    Item* pItem = _player->GetItemByGuid(itemGuid);
     if (pItem)
     {
         // prevent sell not owner item
@@ -527,6 +527,12 @@ void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
             return;
         }
 
+        // prevent selling item for sellprice when the item is still refundable
+        // this probably happens when right clicking a refundable item, the client sends both
+        // CMSG_SELL_ITEM and CMSG_REFUND_ITEM
+        if (pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE))
+            return; // Therefore, no feedback to client
+
         // special case at auto sell (sell all)
         if (count == 0)
         {
@@ -542,17 +548,17 @@ void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
             }
         }
 
-        ItemPrototype const *pProto = pItem->GetProto();
+        ItemPrototype const* pProto = pItem->GetProto();
         if (pProto)
         {
             if (pProto->SellPrice > 0)
             {
                 if (count < pItem->GetCount())              // need split items
                 {
-                    Item *pNewItem = pItem->CloneItem( count, _player );
+                    Item* pNewItem = pItem->CloneItem(count, _player);
                     if (!pNewItem)
                     {
-                        sLog.outError("WORLD: HandleSellItemOpcode - could not create clone of item %u; count = %u", pItem->GetEntry(), count );
+                        sLog.outError("WORLD: HandleSellItemOpcode - could not create clone of item %u; count = %u", pItem->GetEntry(), count);
                         _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, pCreature, itemGuid, 0);
                         return;
                     }
@@ -589,57 +595,57 @@ void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
     return;
 }
 
-void WorldSession::HandleBuybackItem(WorldPacket & recv_data)
+void WorldSession::HandleBuybackItem(WorldPacket& recv_data)
 {
-    DEBUG_LOG( "WORLD: Received CMSG_BUYBACK_ITEM" );
+    DEBUG_LOG("WORLD: Received CMSG_BUYBACK_ITEM");
     ObjectGuid vendorGuid;
     uint32 slot;
 
     recv_data >> vendorGuid >> slot;
 
-    Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorGuid, UNIT_NPC_FLAG_VENDOR);
+    Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorGuid, UNIT_NPC_FLAG_VENDOR);
     if (!pCreature)
     {
         DEBUG_LOG("WORLD: HandleBuybackItem - %s not found or you can't interact with him.", vendorGuid.GetString().c_str());
-        _player->SendSellError( SELL_ERR_CANT_FIND_VENDOR, NULL, ObjectGuid(), 0);
+        _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, ObjectGuid(), 0);
         return;
     }
 
     // remove fake death
-    if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
+    if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
 
-    Item *pItem = _player->GetItemFromBuyBackSlot( slot );
+    Item* pItem = _player->GetItemFromBuyBackSlot(slot);
     if (pItem)
     {
-        uint32 price = _player->GetUInt32Value( PLAYER_FIELD_BUYBACK_PRICE_1 + slot - BUYBACK_SLOT_START );
+        uint32 price = _player->GetUInt32Value(PLAYER_FIELD_BUYBACK_PRICE_1 + slot - BUYBACK_SLOT_START);
         if (_player->GetMoney() < price)
         {
-            _player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, pItem->GetEntry(), 0);
+            _player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, pItem->GetEntry(), 0);
             return;
         }
 
         ItemPosCountVec dest;
-        InventoryResult msg = _player->CanStoreItem( NULL_BAG, NULL_SLOT, dest, pItem, false );
+        InventoryResult msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, dest, pItem, false);
         if (msg == EQUIP_ERR_OK)
         {
-            _player->ModifyMoney( -(int32)price );
-            _player->RemoveItemFromBuyBackSlot( slot, false );
-            _player->ItemAddedQuestCheck( pItem->GetEntry(), pItem->GetCount());
+            _player->ModifyMoney(-(int32)price);
+            _player->RemoveItemFromBuyBackSlot(slot, false);
+            _player->ItemAddedQuestCheck(pItem->GetEntry(), pItem->GetCount());
             _player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_RECEIVE_EPIC_ITEM, pItem->GetEntry(), pItem->GetCount());
-            _player->StoreItem( dest, pItem, true );
+            _player->StoreItem(dest, pItem, true);
         }
         else
-            _player->SendEquipError( msg, pItem, NULL );
+            _player->SendEquipError(msg, pItem, NULL);
         return;
     }
     else
         _player->SendBuyError(BUY_ERR_CANT_FIND_ITEM, pCreature, 0, 0);
 }
 
-void WorldSession::HandleBuyItemInSlotOpcode( WorldPacket & recv_data )
+void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket& recv_data)
 {
-    DEBUG_LOG( "WORLD: Received CMSG_BUY_ITEM_IN_SLOT" );
+    DEBUG_LOG("WORLD: Received CMSG_BUY_ITEM_IN_SLOT");
     ObjectGuid vendorGuid;
     ObjectGuid bagGuid;
     uint32 item, slot, count;
@@ -660,9 +666,9 @@ void WorldSession::HandleBuyItemInSlotOpcode( WorldPacket & recv_data )
         bag = INVENTORY_SLOT_BAG_0;
     else
     {
-        for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END;++i)
+        for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
         {
-            if (Bag *pBag = (Bag*)_player->GetItemByPos(INVENTORY_SLOT_BAG_0,i))
+            if (Bag* pBag = (Bag*)_player->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             {
                 if (bagGuid == pBag->GetObjectGuid())
                 {
@@ -680,9 +686,9 @@ void WorldSession::HandleBuyItemInSlotOpcode( WorldPacket & recv_data )
     GetPlayer()->BuyItemFromVendorSlot(vendorGuid, slot, item, count, bag, bagslot);
 }
 
-void WorldSession::HandleBuyItemOpcode( WorldPacket & recv_data )
+void WorldSession::HandleBuyItemOpcode(WorldPacket& recv_data)
 {
-    DEBUG_LOG( "WORLD: Received CMSG_BUY_ITEM" );
+    DEBUG_LOG("WORLD: Received CMSG_BUY_ITEM");
     ObjectGuid vendorGuid;
     uint32 item, slot, count;
     uint8 unk1;
@@ -698,7 +704,7 @@ void WorldSession::HandleBuyItemOpcode( WorldPacket & recv_data )
     GetPlayer()->BuyItemFromVendorSlot(vendorGuid, slot, item, count, NULL_BAG, NULL_SLOT);
 }
 
-void WorldSession::HandleListInventoryOpcode( WorldPacket & recv_data )
+void WorldSession::HandleListInventoryOpcode(WorldPacket& recv_data)
 {
     ObjectGuid guid;
 
@@ -709,14 +715,14 @@ void WorldSession::HandleListInventoryOpcode( WorldPacket & recv_data )
 
     DEBUG_LOG("WORLD: Recvd CMSG_LIST_INVENTORY");
 
-    SendListInventory( guid );
+    SendListInventory(guid);
 }
 
 void WorldSession::SendListInventory(ObjectGuid vendorguid)
 {
     DEBUG_LOG("WORLD: Sent SMSG_LIST_INVENTORY");
 
-    Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR);
+    Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR);
 
     if (!pCreature)
     {
@@ -730,15 +736,14 @@ void WorldSession::SendListInventory(ObjectGuid vendorguid)
         GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
 
     // Stop the npc if moving
-    if (!pCreature->IsStopped())
-        pCreature->StopMoving();
+    pCreature->StopMoving();
 
     VendorItemData const* vItems = pCreature->GetVendorItems();
     VendorItemData const* tItems = pCreature->GetVendorTemplateItems();
 
     if (!vItems && !tItems)
     {
-        WorldPacket data( SMSG_LIST_INVENTORY, (8+1+1) );
+        WorldPacket data(SMSG_LIST_INVENTORY, (8 + 1 + 1));
         data << ObjectGuid(vendorguid);
         data << uint8(0);                                   // count==0, next will be error code
         data << uint8(0);                                   // "Vendor has no inventory"
@@ -751,7 +756,7 @@ void WorldSession::SendListInventory(ObjectGuid vendorguid)
 
     uint8 count = 0;
 
-    WorldPacket data( SMSG_LIST_INVENTORY, (8+1+numitems*8*4) );
+    WorldPacket data(SMSG_LIST_INVENTORY, (8 + 1 + numitems * 8 * 4));
     data << ObjectGuid(vendorguid);
 
     size_t count_pos = data.wpos();
@@ -759,14 +764,14 @@ void WorldSession::SendListInventory(ObjectGuid vendorguid)
 
     float discountMod = _player->GetReputationPriceDiscount(pCreature);
 
-    for(uint8 vendorslot = 0; vendorslot < numitems; ++vendorslot )
+    for (uint8 vendorslot = 0; vendorslot < numitems; ++vendorslot)
     {
         VendorItem const* crItem = vendorslot < customitems ? vItems->GetItem(vendorslot) : tItems->GetItem(vendorslot - customitems);
 
         if (crItem)
         {
             uint32 itemId = crItem->item;
-            ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(itemId);
+            ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemId);
             if (pProto)
             {
                 if (!_player->isGameMaster())
@@ -784,6 +789,9 @@ void WorldSession::SendListInventory(ObjectGuid vendorguid)
 
                     if ((pProto->AllowableRace & _player->getRaceMask()) == 0)
                         continue;
+
+                    if (crItem->conditionId && !sObjectMgr.IsPlayerMeetToCondition(crItem->conditionId, _player, pCreature->GetMap(), pCreature, CONDITION_FROM_VENDOR))
+                        continue;
                 }
 
                 // possible item coverting for BoA case
@@ -801,9 +809,9 @@ void WorldSession::SendListInventory(ObjectGuid vendorguid)
                 ++count;
 
                 // reputation discount
-                uint32 price = (crItem->ExtendedCost == 0 || pProto->Flags2 & ITEM_FLAG2_EXT_COST_REQUIRES_GOLD) ? uint32(floor(pProto->BuyPrice * discountMod)) : 0;
+                uint32 price = (crItem->ExtendedCost == 0 || (pProto->Flags2 & ITEM_FLAG2_EXT_COST_REQUIRES_GOLD)) ? uint32(floor(pProto->BuyPrice * discountMod)) : 0;
 
-                data << uint32(vendorslot +1);              // client size expected counting from 1
+                data << uint32(vendorslot + 1);             // client size expected counting from 1
                 data << uint32(pProto->ItemId);
                 data << uint32(pProto->DisplayInfoID);
                 data << uint32(crItem->maxcount <= 0 ? 0xFFFFFFFF : pCreature->GetVendorItemCurrentCount(crItem));
@@ -826,55 +834,55 @@ void WorldSession::SendListInventory(ObjectGuid vendorguid)
     SendPacket(&data);
 }
 
-void WorldSession::HandleAutoStoreBagItemOpcode( WorldPacket & recv_data )
+void WorldSession::HandleAutoStoreBagItemOpcode(WorldPacket& recv_data)
 {
-    //DEBUG_LOG("WORLD: CMSG_AUTOSTORE_BAG_ITEM");
+    // DEBUG_LOG("WORLD: CMSG_AUTOSTORE_BAG_ITEM");
     uint8 srcbag, srcslot, dstbag;
 
     recv_data >> srcbag >> srcslot >> dstbag;
-    //DEBUG_LOG("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u", srcbag, srcslot, dstbag);
+    // DEBUG_LOG("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u", srcbag, srcslot, dstbag);
 
-    Item *pItem = _player->GetItemByPos( srcbag, srcslot );
-    if( !pItem )
+    Item* pItem = _player->GetItemByPos(srcbag, srcslot);
+    if (!pItem)
         return;
 
-    if(!_player->IsValidPos(dstbag, NULL_SLOT, false))      // can be autostore pos
+    if (!_player->IsValidPos(dstbag, NULL_SLOT, false))     // can be autostore pos
     {
-        _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL);
         return;
     }
 
     uint16 src = pItem->GetPos();
 
     // check unequip potability for equipped items and bank bags
-    if(_player->IsEquipmentPos ( src ) || _player->IsBagPos ( src ))
+    if (_player->IsEquipmentPos(src) || _player->IsBagPos(src))
     {
-        InventoryResult msg = _player->CanUnequipItem( src, !_player->IsBagPos ( src ));
-        if(msg != EQUIP_ERR_OK)
+        InventoryResult msg = _player->CanUnequipItem(src, !_player->IsBagPos(src));
+        if (msg != EQUIP_ERR_OK)
         {
-            _player->SendEquipError( msg, pItem, NULL );
+            _player->SendEquipError(msg, pItem, NULL);
             return;
         }
     }
 
     ItemPosCountVec dest;
-    InventoryResult msg = _player->CanStoreItem( dstbag, NULL_SLOT, dest, pItem, false );
-    if( msg != EQUIP_ERR_OK )
+    InventoryResult msg = _player->CanStoreItem(dstbag, NULL_SLOT, dest, pItem, false);
+    if (msg != EQUIP_ERR_OK)
     {
-        _player->SendEquipError( msg, pItem, NULL );
+        _player->SendEquipError(msg, pItem, NULL);
         return;
     }
 
     // no-op: placed in same slot
-    if(dest.size() == 1 && dest[0].pos == src)
+    if (dest.size() == 1 && dest[0].pos == src)
     {
         // just remove gray item state
-        _player->SendEquipError( EQUIP_ERR_NONE, pItem, NULL );
+        _player->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
         return;
     }
 
-    _player->RemoveItem(srcbag, srcslot, true );
-    _player->StoreItem( dest, pItem, true );
+    _player->RemoveItem(srcbag, srcslot, true);
+    _player->StoreItem(dest, pItem, true);
 }
 
 
@@ -924,7 +932,7 @@ void WorldSession::HandleBuyBankSlotOpcode(WorldPacket& recvPacket)
 
     WorldPacket data(SMSG_BUY_BANK_SLOT_RESULT, 4);
 
-    if(!slotEntry)
+    if (!slotEntry)
     {
         data << uint32(ERR_BANKSLOT_FAILED_TOO_MANY);
         SendPacket(&data);
@@ -943,8 +951,8 @@ void WorldSession::HandleBuyBankSlotOpcode(WorldPacket& recvPacket)
     _player->SetBankBagSlotCount(slot);
     _player->ModifyMoney(-int32(price));
 
-     data << uint32(ERR_BANKSLOT_OK);
-     SendPacket(&data);
+    data << uint32(ERR_BANKSLOT_OK);
+    SendPacket(&data);
 
     _player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BUY_BANK_SLOT);
 }
@@ -957,28 +965,28 @@ void WorldSession::HandleAutoBankItemOpcode(WorldPacket& recvPacket)
     recvPacket >> srcbag >> srcslot;
     DEBUG_LOG("STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot);
 
-    Item *pItem = _player->GetItemByPos( srcbag, srcslot );
-    if( !pItem )
+    Item* pItem = _player->GetItemByPos(srcbag, srcslot);
+    if (!pItem)
         return;
 
     ItemPosCountVec dest;
-    InventoryResult msg = _player->CanBankItem( NULL_BAG, NULL_SLOT, dest, pItem, false );
-    if( msg != EQUIP_ERR_OK )
+    InventoryResult msg = _player->CanBankItem(NULL_BAG, NULL_SLOT, dest, pItem, false);
+    if (msg != EQUIP_ERR_OK)
     {
-        _player->SendEquipError( msg, pItem, NULL );
+        _player->SendEquipError(msg, pItem, NULL);
         return;
     }
 
     // no-op: placed in same slot
-    if(dest.size() == 1 && dest[0].pos == pItem->GetPos())
+    if (dest.size() == 1 && dest[0].pos == pItem->GetPos())
     {
         // just remove gray item state
-        _player->SendEquipError( EQUIP_ERR_NONE, pItem, NULL );
+        _player->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
         return;
     }
 
     _player->RemoveItem(srcbag, srcslot, true);
-    _player->BankItem( dest, pItem, true );
+    _player->BankItem(dest, pItem, true);
 }
 
 void WorldSession::HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket)
@@ -989,43 +997,43 @@ void WorldSession::HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket)
     recvPacket >> srcbag >> srcslot;
     DEBUG_LOG("STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot);
 
-    Item *pItem = _player->GetItemByPos( srcbag, srcslot );
-    if( !pItem )
+    Item* pItem = _player->GetItemByPos(srcbag, srcslot);
+    if (!pItem)
         return;
 
-    if(_player->IsBankPos(srcbag, srcslot))                 // moving from bank to inventory
+    if (_player->IsBankPos(srcbag, srcslot))                // moving from bank to inventory
     {
         ItemPosCountVec dest;
-        InventoryResult msg = _player->CanStoreItem( NULL_BAG, NULL_SLOT, dest, pItem, false );
-        if( msg != EQUIP_ERR_OK )
+        InventoryResult msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, dest, pItem, false);
+        if (msg != EQUIP_ERR_OK)
         {
-            _player->SendEquipError( msg, pItem, NULL );
+            _player->SendEquipError(msg, pItem, NULL);
             return;
         }
 
         _player->RemoveItem(srcbag, srcslot, true);
-        _player->StoreItem( dest, pItem, true );
+        _player->StoreItem(dest, pItem, true);
     }
     else                                                    // moving from inventory to bank
     {
         ItemPosCountVec dest;
-        InventoryResult msg = _player->CanBankItem( NULL_BAG, NULL_SLOT, dest, pItem, false );
-        if( msg != EQUIP_ERR_OK )
+        InventoryResult msg = _player->CanBankItem(NULL_BAG, NULL_SLOT, dest, pItem, false);
+        if (msg != EQUIP_ERR_OK)
         {
-            _player->SendEquipError( msg, pItem, NULL );
+            _player->SendEquipError(msg, pItem, NULL);
             return;
         }
 
         _player->RemoveItem(srcbag, srcslot, true);
-        _player->BankItem( dest, pItem, true );
+        _player->BankItem(dest, pItem, true);
     }
 }
 
-void WorldSession::HandleSetAmmoOpcode(WorldPacket & recv_data)
+void WorldSession::HandleSetAmmoOpcode(WorldPacket& recv_data)
 {
-    if(!GetPlayer()->isAlive())
+    if (!GetPlayer()->isAlive())
     {
-        GetPlayer()->SendEquipError( EQUIP_ERR_YOU_ARE_DEAD, NULL, NULL );
+        GetPlayer()->SendEquipError(EQUIP_ERR_YOU_ARE_DEAD, NULL, NULL);
         return;
     }
 
@@ -1034,7 +1042,7 @@ void WorldSession::HandleSetAmmoOpcode(WorldPacket & recv_data)
 
     recv_data >> item;
 
-    if(!item)
+    if (!item)
         GetPlayer()->RemoveAmmo();
     else
         GetPlayer()->SetAmmo(item);
@@ -1042,7 +1050,7 @@ void WorldSession::HandleSetAmmoOpcode(WorldPacket & recv_data)
 
 void WorldSession::SendEnchantmentLog(ObjectGuid targetGuid, ObjectGuid casterGuid, uint32 itemId, uint32 spellId)
 {
-    WorldPacket data(SMSG_ENCHANTMENTLOG, (8+8+4+4+1));     // last check 2.0.10
+    WorldPacket data(SMSG_ENCHANTMENTLOG, (8 + 8 + 4 + 4 + 1)); // last check 2.0.10
     data << ObjectGuid(targetGuid);
     data << ObjectGuid(casterGuid);
     data << uint32(itemId);
@@ -1053,8 +1061,8 @@ void WorldSession::SendEnchantmentLog(ObjectGuid targetGuid, ObjectGuid casterGu
 
 void WorldSession::SendItemEnchantTimeUpdate(ObjectGuid playerGuid, ObjectGuid itemGuid, uint32 slot, uint32 duration)
 {
-                                                            // last check 2.0.10
-    WorldPacket data(SMSG_ITEM_ENCHANT_TIME_UPDATE, (8+4+4+8));
+    // last check 2.0.10
+    WorldPacket data(SMSG_ITEM_ENCHANT_TIME_UPDATE, (8 + 4 + 4 + 8));
     data << ObjectGuid(itemGuid);
     data << uint32(slot);
     data << uint32(duration);
@@ -1062,21 +1070,21 @@ void WorldSession::SendItemEnchantTimeUpdate(ObjectGuid playerGuid, ObjectGuid i
     SendPacket(&data);
 }
 
-void WorldSession::HandleItemNameQueryOpcode(WorldPacket & recv_data)
+void WorldSession::HandleItemNameQueryOpcode(WorldPacket& recv_data)
 {
     uint32 itemid;
     recv_data >> itemid;
     recv_data.read_skip<uint64>();                          // guid
 
     DEBUG_LOG("WORLD: CMSG_ITEM_NAME_QUERY %u", itemid);
-    if (ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(itemid))
+    if (ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemid))
     {
         int loc_idx = GetSessionDbLocaleIndex();
 
         std::string name = pProto->Name1;
         sObjectMgr.GetItemLocaleStrings(pProto->ItemId, loc_idx, &name);
-                                                            // guess size
-        WorldPacket data(SMSG_ITEM_NAME_QUERY_RESPONSE, (4+10));
+        // guess size
+        WorldPacket data(SMSG_ITEM_NAME_QUERY_RESPONSE, (4 + 10));
         data << uint32(pProto->ItemId);
         data << name;
         data << uint32(pProto->InventoryType);
@@ -1086,7 +1094,7 @@ void WorldSession::HandleItemNameQueryOpcode(WorldPacket & recv_data)
     else
     {
         // listed in dbc or not expected to exist unknown item
-        if(sItemStore.LookupEntry(itemid))
+        if (sItemStore.LookupEntry(itemid))
             sLog.outErrorDb("WORLD: CMSG_ITEM_NAME_QUERY for item %u failed (item listed in Item.dbc but not exist in DB)", itemid);
         else
             sLog.outError("WORLD: CMSG_ITEM_NAME_QUERY for item %u failed (unknown item, not listed in Item.dbc)", itemid);
@@ -1098,75 +1106,75 @@ void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data)
     DEBUG_LOG("Received opcode CMSG_WRAP_ITEM");
 
     uint8 gift_bag, gift_slot, item_bag, item_slot;
-    //recv_data.hexlike();
+    // recv_data.hexlike();
 
     recv_data >> gift_bag >> gift_slot;                     // paper
     recv_data >> item_bag >> item_slot;                     // item
 
     DEBUG_LOG("WRAP: receive gift_bag = %u, gift_slot = %u, item_bag = %u, item_slot = %u", gift_bag, gift_slot, item_bag, item_slot);
 
-    Item *gift = _player->GetItemByPos( gift_bag, gift_slot );
+    Item* gift = _player->GetItemByPos(gift_bag, gift_slot);
     if (!gift)
     {
-        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, gift, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, gift, NULL);
         return;
     }
 
     // cheating: non-wrapper wrapper (all empty wrappers is stackable)
     if (!(gift->GetProto()->Flags & ITEM_FLAG_WRAPPER) || gift->GetMaxStackCount() == 1)
     {
-        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, gift, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, gift, NULL);
         return;
     }
 
-    Item *item = _player->GetItemByPos( item_bag, item_slot );
+    Item* item = _player->GetItemByPos(item_bag, item_slot);
 
     if (!item)
     {
-        _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, item, NULL );
+        _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, item, NULL);
         return;
     }
 
     if (item == gift)                                       // not possible with packet from real client
     {
-        _player->SendEquipError( EQUIP_ERR_WRAPPED_CANT_BE_WRAPPED, item, NULL );
+        _player->SendEquipError(EQUIP_ERR_WRAPPED_CANT_BE_WRAPPED, item, NULL);
         return;
     }
 
     if (item->IsEquipped())
     {
-        _player->SendEquipError( EQUIP_ERR_EQUIPPED_CANT_BE_WRAPPED, item, NULL );
+        _player->SendEquipError(EQUIP_ERR_EQUIPPED_CANT_BE_WRAPPED, item, NULL);
         return;
     }
 
     if (item->GetGuidValue(ITEM_FIELD_GIFTCREATOR))         // HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_WRAPPED);
     {
-        _player->SendEquipError( EQUIP_ERR_WRAPPED_CANT_BE_WRAPPED, item, NULL );
+        _player->SendEquipError(EQUIP_ERR_WRAPPED_CANT_BE_WRAPPED, item, NULL);
         return;
     }
 
     if (item->IsBag())
     {
-        _player->SendEquipError( EQUIP_ERR_BAGS_CANT_BE_WRAPPED, item, NULL );
+        _player->SendEquipError(EQUIP_ERR_BAGS_CANT_BE_WRAPPED, item, NULL);
         return;
     }
 
     if (item->IsSoulBound())
     {
-        _player->SendEquipError( EQUIP_ERR_BOUND_CANT_BE_WRAPPED, item, NULL );
+        _player->SendEquipError(EQUIP_ERR_BOUND_CANT_BE_WRAPPED, item, NULL);
         return;
     }
 
     if (item->GetMaxStackCount() != 1)
     {
-        _player->SendEquipError( EQUIP_ERR_STACKABLE_CANT_BE_WRAPPED, item, NULL );
+        _player->SendEquipError(EQUIP_ERR_STACKABLE_CANT_BE_WRAPPED, item, NULL);
         return;
     }
 
     // maybe not correct check  (it is better than nothing)
     if (item->GetProto()->MaxCount > 0)
     {
-        _player->SendEquipError( EQUIP_ERR_UNIQUE_CANT_BE_WRAPPED, item, NULL );
+        _player->SendEquipError(EQUIP_ERR_UNIQUE_CANT_BE_WRAPPED, item, NULL);
         return;
     }
 
@@ -1176,8 +1184,8 @@ void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data)
 
     switch (item->GetEntry())
     {
-        case 5042:  item->SetEntry( 5043); break;
-        case 5048:  item->SetEntry( 5044); break;
+        case 5042:  item->SetEntry(5043); break;
+        case 5048:  item->SetEntry(5044); break;
         case 17303: item->SetEntry(17302); break;
         case 17304: item->SetEntry(17305); break;
         case 17307: item->SetEntry(17308); break;
@@ -1187,7 +1195,7 @@ void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data)
     item->SetUInt32Value(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_WRAPPED);
     item->SetState(ITEM_CHANGED, _player);
 
-    if(item->GetState() == ITEM_NEW)                        // save new item, to have alway for `character_gifts` record in `item_instance`
+    if (item->GetState() == ITEM_NEW)                       // save new item, to have alway for `character_gifts` record in `item_instance`
     {
         // after save it will be impossible to remove the item from the queue
         item->RemoveFromUpdateQueueOf(_player);
@@ -1210,11 +1218,11 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
     if (!itemGuid.IsItem())
         return;
 
-    for(int i = 0; i < MAX_GEM_SOCKETS; ++i)
+    for (int i = 0; i < MAX_GEM_SOCKETS; ++i)
         recv_data >> gemGuids[i];
 
-    //cheat -> tried to socket same gem multiple times
-    for(int i = 0; i < MAX_GEM_SOCKETS; ++i)
+    // cheat -> tried to socket same gem multiple times
+    for (int i = 0; i < MAX_GEM_SOCKETS; ++i)
     {
         ObjectGuid gemGuid = gemGuids[i];
         if (!gemGuid)
@@ -1223,31 +1231,31 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
         if (!gemGuid.IsItem())
             return;
 
-        for(int j = i+1; j < MAX_GEM_SOCKETS; ++j)
+        for (int j = i + 1; j < MAX_GEM_SOCKETS; ++j)
             if (gemGuids[j] == gemGuid)
                 return;
     }
 
-    Item *itemTarget = _player->GetItemByGuid(itemGuid);
-    if(!itemTarget)                                         //missing item to socket
+    Item* itemTarget = _player->GetItemByGuid(itemGuid);
+    if (!itemTarget)                                        // missing item to socket
         return;
 
     ItemPrototype const* itemProto = itemTarget->GetProto();
-    if(!itemProto)
+    if (!itemProto)
         return;
 
-    //this slot is excepted when applying / removing meta gem bonus
+    // this slot is excepted when applying / removing meta gem bonus
     uint8 slot = itemTarget->IsEquipped() ? itemTarget->GetSlot() : uint8(NULL_SLOT);
 
-    Item *Gems[MAX_GEM_SOCKETS];
-    for(int i = 0; i < MAX_GEM_SOCKETS; ++i)
+    Item* Gems[MAX_GEM_SOCKETS];
+    for (int i = 0; i < MAX_GEM_SOCKETS; ++i)
         Gems[i] = gemGuids[i] ? _player->GetItemByGuid(gemGuids[i]) : NULL;
 
-    GemPropertiesEntry const *GemProps[MAX_GEM_SOCKETS];
-    for(int i = 0; i < MAX_GEM_SOCKETS; ++i)                //get geminfo from dbc storage
+    GemPropertiesEntry const* GemProps[MAX_GEM_SOCKETS];
+    for (int i = 0; i < MAX_GEM_SOCKETS; ++i)               // get geminfo from dbc storage
         GemProps[i] = (Gems[i]) ? sGemPropertiesStore.LookupEntry(Gems[i]->GetProto()->GemProperties) : NULL;
 
-    for(int i = 0; i < MAX_GEM_SOCKETS; ++i)                //check for hack maybe
+    for (int i = 0; i < MAX_GEM_SOCKETS; ++i)               // check for hack maybe
     {
         if (!GemProps[i])
             continue;
@@ -1256,11 +1264,11 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
         if (!itemProto->Socket[i].Color)
         {
             // no prismatic socket
-            if(!itemTarget->GetEnchantmentId(PRISMATIC_ENCHANTMENT_SLOT))
+            if (!itemTarget->GetEnchantmentId(PRISMATIC_ENCHANTMENT_SLOT))
                 return;
 
             // not first not-colored (not normally used) socket
-            if(i != 0 && !itemProto->Socket[i - 1].Color && (i + 1 >= MAX_GEM_SOCKETS || itemProto->Socket[i + 1].Color))
+            if (i != 0 && !itemProto->Socket[i - 1].Color && (i + 1 >= MAX_GEM_SOCKETS || itemProto->Socket[i + 1].Color))
                 return;
 
             // ok, this is first not colored socket for item with prismatic socket
@@ -1277,16 +1285,16 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
 
     uint32 GemEnchants[MAX_GEM_SOCKETS];
     uint32 OldEnchants[MAX_GEM_SOCKETS];
-    for(int i = 0; i < MAX_GEM_SOCKETS; ++i)                //get new and old enchantments
+    for (int i = 0; i < MAX_GEM_SOCKETS; ++i)               // get new and old enchantments
     {
         GemEnchants[i] = (GemProps[i]) ? GemProps[i]->spellitemenchantement : 0;
         OldEnchants[i] = itemTarget->GetEnchantmentId(EnchantmentSlot(SOCK_ENCHANTMENT_SLOT + i));
     }
 
     // check unique-equipped conditions
-    for(int i = 0; i < MAX_GEM_SOCKETS; ++i)
+    for (int i = 0; i < MAX_GEM_SOCKETS; ++i)
     {
-        if(!Gems[i])
+        if (!Gems[i])
             continue;
 
         // continue check for case when attempt add 2 similar unique equipped gems in one item.
@@ -1297,24 +1305,24 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
         {
             for (int j = 0; j < MAX_GEM_SOCKETS; ++j)
             {
-                if(i == j)                                  // skip self
+                if (i == j)                                 // skip self
                     continue;
 
                 if (Gems[j])
                 {
                     if (iGemProto->ItemId == Gems[j]->GetEntry())
                     {
-                        _player->SendEquipError( EQUIP_ERR_ITEM_UNIQUE_EQUIPPABLE_SOCKETED, itemTarget, NULL );
+                        _player->SendEquipError(EQUIP_ERR_ITEM_UNIQUE_EQUIPPABLE_SOCKETED, itemTarget, NULL);
                         return;
                     }
                 }
-                else if(OldEnchants[j])
+                else if (OldEnchants[j])
                 {
-                    if(SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(OldEnchants[j]))
+                    if (SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(OldEnchants[j]))
                     {
                         if (iGemProto->ItemId == enchantEntry->GemID)
                         {
-                            _player->SendEquipError( EQUIP_ERR_ITEM_UNIQUE_EQUIPPABLE_SOCKETED, itemTarget, NULL );
+                            _player->SendEquipError(EQUIP_ERR_ITEM_UNIQUE_EQUIPPABLE_SOCKETED, itemTarget, NULL);
                             return;
                         }
                     }
@@ -1327,7 +1335,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
         int32 limit_newcount = 0;
         if (iGemProto->ItemLimitCategory)
         {
-            if(ItemLimitCategoryEntry const* limitEntry = sItemLimitCategoryStore.LookupEntry(iGemProto->ItemLimitCategory))
+            if (ItemLimitCategoryEntry const* limitEntry = sItemLimitCategoryStore.LookupEntry(iGemProto->ItemLimitCategory))
             {
                 // NOTE: limitEntry->mode not checked because if item have have-limit then it applied and to equip case
 
@@ -1338,8 +1346,8 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
                         // destroyed gem
                         if (OldEnchants[j])
                         {
-                            if(SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(OldEnchants[j]))
-                                if(ItemPrototype const* jProto = ObjectMgr::GetItemPrototype(enchantEntry->GemID))
+                            if (SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(OldEnchants[j]))
+                                if (ItemPrototype const* jProto = ObjectMgr::GetItemPrototype(enchantEntry->GemID))
                                     if (iGemProto->ItemLimitCategory == jProto->ItemLimitCategory)
                                         --limit_newcount;
                         }
@@ -1349,40 +1357,89 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
                             ++limit_newcount;
                     }
                     // existing gem
-                    else if(OldEnchants[j])
+                    else if (OldEnchants[j])
                     {
-                        if(SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(OldEnchants[j]))
-                            if(ItemPrototype const* jProto = ObjectMgr::GetItemPrototype(enchantEntry->GemID))
+                        if (SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(OldEnchants[j]))
+                            if (ItemPrototype const* jProto = ObjectMgr::GetItemPrototype(enchantEntry->GemID))
                                 if (iGemProto->ItemLimitCategory == jProto->ItemLimitCategory)
                                     ++limit_newcount;
                     }
                 }
 
-                if(limit_newcount > 0 && uint32(limit_newcount) > limitEntry->maxCount)
+                if (limit_newcount > 0 && uint32(limit_newcount) > limitEntry->maxCount)
+                {
+                    _player->SendEquipError(EQUIP_ERR_ITEM_UNIQUE_EQUIPPABLE_SOCKETED, itemTarget, NULL);
+                    return;
+                }
+            }
+        }
+
+        // check for jewelcrafting gems
+        int32 jc_newcount = 0;
+        if (iGemProto->RequiredSkill == SKILL_JEWELCRAFTING)
+        {
+            for (int j = 0; j < MAX_GEM_SOCKETS; ++j)
+            {
+                if (Gems[j])
+                {
+                    // gem getting replaced
+                    if (OldEnchants[j])
+                    {
+                        if (SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(OldEnchants[j]))
+                            if (ItemPrototype const* jProto = ObjectMgr::GetItemPrototype(enchantEntry->GemID))
+                                if (jProto->RequiredSkill == SKILL_JEWELCRAFTING)
+                                    --jc_newcount;
+                    }
+
+                    // new gem
+                    if (Gems[j]->GetProto()->RequiredSkill == SKILL_JEWELCRAFTING)
+                        ++jc_newcount;
+                }
+                // existing gems
+                else if (OldEnchants[j])
+                {
+                    if (SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(OldEnchants[j]))
+                        if (ItemPrototype const* jProto = ObjectMgr::GetItemPrototype(enchantEntry->GemID))
+                            if (jProto->RequiredSkill == SKILL_JEWELCRAFTING)
+                                ++jc_newcount;
+                }
+            }
+
+            // more jewelcrafting gems than allowed in this item
+            if (jc_newcount > 0 && uint32(jc_newcount) > MAX_JEWELCRAFTING_GEMS)
+            {
+                _player->SendEquipError(EQUIP_ERR_ITEM_MAX_COUNT_EQUIPPED_SOCKETED, itemTarget, NULL);
+                return;
+            }
+
+            // need to check rest of the equipped items here to prevent client crash
+            if (itemTarget->IsEquipped())
+            {
+                if (InventoryResult res = _player->CanEquipMoreJewelcraftingGems(jc_newcount >= 0 ? jc_newcount : 0, slot))
                 {
-                    _player->SendEquipError( EQUIP_ERR_ITEM_UNIQUE_EQUIPPABLE_SOCKETED, itemTarget, NULL );
+                    _player->SendEquipError(res, itemTarget, NULL);
                     return;
                 }
             }
         }
 
         // for equipped item check all equipment for duplicate equipped gems
-        if(itemTarget->IsEquipped())
+        if (itemTarget->IsEquipped())
         {
-            if(InventoryResult res = _player->CanEquipUniqueItem(Gems[i], slot, limit_newcount >= 0 ? limit_newcount : 0))
+            if (InventoryResult res = _player->CanEquipUniqueItem(Gems[i], slot, limit_newcount >= 0 ? limit_newcount : 0))
             {
-                _player->SendEquipError( res, itemTarget, NULL );
+                _player->SendEquipError(res, itemTarget, NULL);
                 return;
             }
         }
     }
 
-    bool SocketBonusActivated = itemTarget->GemsFitSockets();    //save state of socketbonus
-    _player->ToggleMetaGemsActive(slot, false);             //turn off all metagems (except for the target item)
+    bool SocketBonusActivated = itemTarget->GemsFitSockets();    // save state of socketbonus
+    _player->ToggleMetaGemsActive(slot, false);             // turn off all metagems (except for the target item)
 
-    //if a meta gem is being equipped, all information has to be written to the item before testing if the conditions for the gem are met
+    // if a meta gem is being equipped, all information has to be written to the item before testing if the conditions for the gem are met
 
-    //remove ALL enchants
+    // remove ALL enchants
     for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT + MAX_GEM_SOCKETS; ++enchant_slot)
         _player->ApplyEnchantment(itemTarget, EnchantmentSlot(enchant_slot), false);
 
@@ -1392,23 +1449,25 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
         {
             itemTarget->SetEnchantment(EnchantmentSlot(SOCK_ENCHANTMENT_SLOT + i), GemEnchants[i], 0, 0);
             if (Item* guidItem = gemGuids[i] ? _player->GetItemByGuid(gemGuids[i]) : NULL)
-                _player->DestroyItem(guidItem->GetBagSlot(), guidItem->GetSlot(), true );
+                _player->DestroyItem(guidItem->GetBagSlot(), guidItem->GetSlot(), true);
         }
     }
 
-    for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT + MAX_GEM_SOCKETS; ++enchant_slot)
+    for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT + MAX_GEM_SOCKETS; ++enchant_slot)
         _player->ApplyEnchantment(itemTarget, EnchantmentSlot(enchant_slot), true);
 
     bool SocketBonusToBeActivated = itemTarget->GemsFitSockets();// current socketbonus state
-    if(SocketBonusActivated != SocketBonusToBeActivated)    // if there was a change...
+    if (SocketBonusActivated != SocketBonusToBeActivated)   // if there was a change...
     {
-        _player->ApplyEnchantment(itemTarget,BONUS_ENCHANTMENT_SLOT, false);
+        _player->ApplyEnchantment(itemTarget, BONUS_ENCHANTMENT_SLOT, false);
         itemTarget->SetEnchantment(BONUS_ENCHANTMENT_SLOT, (SocketBonusToBeActivated ? itemTarget->GetProto()->socketBonus : 0), 0, 0);
         _player->ApplyEnchantment(itemTarget, BONUS_ENCHANTMENT_SLOT, true);
-        //it is not displayed, client has an inbuilt system to determine if the bonus is activated
+        // it is not displayed, client has an inbuilt system to determine if the bonus is activated
     }
 
     _player->ToggleMetaGemsActive(slot, true);              // turn on all metagems (except for target item)
+
+    itemTarget->SetNotSoulboundTradeable(_player);          // clear tradeable flag
 }
 
 void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recv_data)
@@ -1420,15 +1479,15 @@ void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recv_data)
     recv_data >> eslot;
 
     // apply only to equipped item
-    if(!Player::IsEquipmentPos(INVENTORY_SLOT_BAG_0, eslot))
+    if (!Player::IsEquipmentPos(INVENTORY_SLOT_BAG_0, eslot))
         return;
 
     Item* item = GetPlayer()->GetItemByPos(INVENTORY_SLOT_BAG_0, eslot);
 
-    if(!item)
+    if (!item)
         return;
 
-    if(!item->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT))
+    if (!item->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT))
         return;
 
     GetPlayer()->ApplyEnchantment(item, TEMP_ENCHANTMENT_SLOT, false);
@@ -1437,43 +1496,55 @@ void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recv_data)
 
 void WorldSession::HandleItemRefundInfoRequest(WorldPacket& recv_data)
 {
-    DEBUG_LOG("WORLD: CMSG_ITEM_REFUND_INFO_REQUEST");
+    DEBUG_LOG("WORLD: CMSG_GET_ITEM_REFUND_INFO");
 
     ObjectGuid itemGuid;
     recv_data >> itemGuid;
 
-    Item *item = _player->GetItemByGuid(itemGuid);
-
-    if(!item)
+    Item* item = GetPlayer()->GetItemByGuid(itemGuid);
+    if (!item)
     {
         DEBUG_LOG("Item refund: item not found!");
         return;
     }
 
-    if(!(item->GetProto()->Flags & ITEM_FLAG_REFUNDABLE))
+    GetPlayer()->SendRefundInfo(item);
+}
+
+void WorldSession::HandleItemRefund(WorldPacket &recv_data)
+{
+    DEBUG_LOG("WORLD: CMSG_ITEM_REFUND");
+
+    ObjectGuid itemGuid;
+    recv_data >> itemGuid;
+
+    Item* item = GetPlayer()->GetItemByGuid(itemGuid);
+    if (!item)
     {
-        DEBUG_LOG("Item refund: item not refundable!");
+        DEBUG_LOG("Item refund: item not found!");
         return;
     }
 
-    // item refund system not implemented yet
+    GetPlayer()->RefundItem(item);
 }
 
 /**
  * Handles the packet sent by the client when requesting information about item text.
  *
- * This function is called when player clicks on item which has some flag set
+ * This function is called when client needs mail message body,
+ * SetFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_READABLE | ITEM_DYNFLAG_UNK15 | ITEM_DYNFLAG_UNK16);
+ * or when player clicks on item which has ITEM_FIELD_ITEM_TEXT_ID > 0
  */
-void WorldSession::HandleItemTextQuery(WorldPacket & recv_data )
+void WorldSession::HandleItemTextQuery(WorldPacket& recv_data)
 {
     ObjectGuid itemGuid;
     recv_data >> itemGuid;
 
     DEBUG_LOG("CMSG_ITEM_TEXT_QUERY item guid: %u", itemGuid.GetCounter());
 
-    WorldPacket data(SMSG_ITEM_TEXT_QUERY_RESPONSE, (4+10));// guess size
+    WorldPacket data(SMSG_ITEM_TEXT_QUERY_RESPONSE, (4 + 10)); // guess size
 
-    if(Item *item = _player->GetItemByGuid(itemGuid))
+    if (Item* item = _player->GetItemByGuid(itemGuid))
     {
         data << uint8(0);                                   // has text
         data << ObjectGuid(itemGuid);                       // item guid
diff --git a/src/game/ItemPrototype.h b/src/game/ItemPrototype.h
index 150883be960..278dc469684 100644
--- a/src/game/ItemPrototype.h
+++ b/src/game/ItemPrototype.h
@@ -477,7 +477,7 @@ const uint32 MaxItemSubclassValues[MAX_ITEM_CLASS] =
 
 inline uint8 ItemSubClassToDurabilityMultiplierId(uint32 ItemClass, uint32 ItemSubClass)
 {
-    switch(ItemClass)
+    switch (ItemClass)
     {
         case ITEM_CLASS_WEAPON: return ItemSubClass;
         case ITEM_CLASS_ARMOR:  return ItemSubClass + 21;
@@ -615,7 +615,7 @@ struct ItemPrototype
     // helpers
     bool CanChangeEquipStateInCombat() const
     {
-        switch(InventoryType)
+        switch (InventoryType)
         {
             case INVTYPE_RELIC:
             case INVTYPE_SHIELD:
@@ -623,7 +623,7 @@ struct ItemPrototype
                 return true;
         }
 
-        switch(Class)
+        switch (Class)
         {
             case ITEM_CLASS_WEAPON:
             case ITEM_CLASS_PROJECTILE:
@@ -633,7 +633,7 @@ struct ItemPrototype
         return false;
     }
 
-    uint32 GetMaxStackSize() const { return Stackable > 0 ? uint32(Stackable) : uint32(0x7FFFFFFF-1); }
+    uint32 GetMaxStackSize() const { return Stackable > 0 ? uint32(Stackable) : uint32(0x7FFFFFFF - 1); }
 
     float getDPS() const
     {
@@ -641,16 +641,16 @@ struct ItemPrototype
             return 0;
         float temp = 0;
         for (int i = 0; i < MAX_ITEM_PROTO_DAMAGES; ++i)
-            temp+=Damage[i].DamageMin + Damage[i].DamageMax;
-        return temp*500/Delay;
+            temp += Damage[i].DamageMin + Damage[i].DamageMax;
+        return temp * 500 / Delay;
     }
 
     int32 getFeralBonus(int32 extraDPS = 0) const
     {
         // 0x02A5F3 - is mask for Melee weapon from ItemSubClassMask.dbc
-        if (Class == ITEM_CLASS_WEAPON && (1<<SubClass)&0x02A5F3)
+        if (Class == ITEM_CLASS_WEAPON && ((1 << SubClass) & 0x02A5F3))
         {
-            int32 bonus = int32((extraDPS + getDPS())*14.0f) - 767;
+            int32 bonus = int32((extraDPS + getDPS()) * 14.0f) - 767;
             if (bonus < 0)
                 return 0;
             return bonus;
@@ -658,11 +658,11 @@ struct ItemPrototype
         return 0;
     }
 
-    bool IsPotion() const { return Class==ITEM_CLASS_CONSUMABLE && SubClass==ITEM_SUBCLASS_POTION; }
+    bool IsPotion() const { return Class == ITEM_CLASS_CONSUMABLE && SubClass == ITEM_SUBCLASS_POTION; }
     bool IsConjuredConsumable() const { return Class == ITEM_CLASS_CONSUMABLE && (Flags & ITEM_FLAG_CONJURED); }
     bool IsVellum() const
     {
-        return (Class == ITEM_CLASS_TRADE_GOODS && (1 << SubClass) & (1 << ITEM_SUBCLASS_ARMOR_ENCHANTMENT | 1 << ITEM_SUBCLASS_WEAPON_ENCHANTMENT));
+        return (Class == ITEM_CLASS_TRADE_GOODS && ((1 << SubClass) & (1 << ITEM_SUBCLASS_ARMOR_ENCHANTMENT | 1 << ITEM_SUBCLASS_WEAPON_ENCHANTMENT)));
     }
 };
 
diff --git a/src/game/LFG.cpp b/src/game/LFG.cpp
new file mode 100644
index 00000000000..d51795d4216
--- /dev/null
+++ b/src/game/LFG.cpp
@@ -0,0 +1,395 @@
+/*
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Common.h"
+#include "SharedDefines.h"
+#include "ObjectMgr.h"
+#include "LFG.h"
+#include "LFGMgr.h"
+#include "Group.h"
+#include "Player.h"
+#include "World.h"
+
+void LFGStateStructure::SetDungeons(LFGDungeonSet dungeons)
+{
+    m_DungeonsList = dungeons;
+    if (m_DungeonsList.empty())
+        SetType(LFG_TYPE_NONE);
+    else
+    {
+        if (LFGDungeonEntry const* entry = *m_DungeonsList.begin())
+            SetType(LFGType(entry->type));
+        else
+            SetType(LFG_TYPE_NONE);
+    }
+}
+
+void LFGStateStructure::RemoveDungeon(LFGDungeonEntry const* dungeon)
+{
+    m_DungeonsList.erase(dungeon);
+    if (m_DungeonsList.empty())
+        SetType(LFG_TYPE_NONE);
+    else
+    {
+        if (LFGDungeonEntry const* entry = *m_DungeonsList.begin())
+            SetType(LFGType(entry->type));
+        else
+            SetType(LFG_TYPE_NONE);
+    }
+}
+
+void LFGStateStructure::AddDungeon(LFGDungeonEntry const* dungeon)
+{
+    m_DungeonsList.insert(dungeon);
+}
+
+
+void LFGPlayerState::Clear()
+{
+    m_rolesMask = LFG_ROLE_MASK_NONE;
+    m_bUpdate = true;
+    m_state = LFG_STATE_NONE;
+    AddFlags( LFG_MEMBER_FLAG_NONE |
+              LFG_MEMBER_FLAG_CHARINFO |
+              LFG_MEMBER_FLAG_COMMENT |
+              LFG_MEMBER_FLAG_GROUPLEADER |
+              LFG_MEMBER_FLAG_GROUPGUID |
+              LFG_MEMBER_FLAG_AREA  |
+              LFG_MEMBER_FLAG_STATUS  |
+              LFG_MEMBER_FLAG_BIND);
+
+    m_type = LFG_TYPE_NONE;
+    m_DungeonsList.clear();
+    m_LockMap.clear();
+    m_comment.clear();
+    m_answer = LFG_ANSWER_PENDING;
+    m_proposal = NULL;
+    SetState(LFG_STATE_NONE);
+    m_bTeleported = false;
+}
+
+LFGLockStatusMap const* LFGPlayerState::GetLockMap()
+{
+    if (m_bUpdate || m_LockMap.empty())
+    {
+        m_LockMap.clear();
+        m_LockMap = sLFGMgr.GetPlayerLockMap(GetOwnerGuid());
+        m_bUpdate = false;
+    }
+    return &m_LockMap;
+}
+
+void LFGPlayerState::SetRoles(LFGRoleMask roles)
+{
+    m_rolesMask = roles;
+
+    Player* pPlayer = sObjectMgr.GetPlayer(GetOwnerGuid());
+    if (Group* group = pPlayer->GetGroup())
+    {
+        if (group->GetLeaderGuid() == GetOwnerGuid())
+            AddRole(ROLE_LEADER);
+        else
+            RemoveRole(ROLE_LEADER);
+    }
+    else
+        RemoveRole(ROLE_LEADER);
+
+    GetRoles() != LFG_ROLE_MASK_NONE ? AddFlags(LFG_MEMBER_FLAG_ROLES) : RemoveFlags(LFG_MEMBER_FLAG_ROLES);
+
+}
+
+LFGRoleMask LFGPlayerState::GetRoles()
+{
+    return m_rolesMask;
+}
+
+void LFGPlayerState::SetJoined()
+{
+    m_jointime = time_t(time(NULL));
+    m_bTeleported = false;
+}
+
+bool LFGPlayerState::IsSingleRole()
+{
+    if (   LFGRoleMask(m_rolesMask & ~LFG_ROLE_MASK_TANK   & ~LFG_ROLE_MASK_LEADER) == LFG_ROLE_MASK_NONE
+        || LFGRoleMask(m_rolesMask & ~LFG_ROLE_MASK_HEALER & ~LFG_ROLE_MASK_LEADER) == LFG_ROLE_MASK_NONE
+        || LFGRoleMask(m_rolesMask & ~LFG_ROLE_MASK_TANK   & ~LFG_ROLE_MASK_LEADER) == LFG_ROLE_MASK_NONE)
+        return true;
+    return false;
+}
+
+void LFGPlayerState::SetComment(std::string comment)
+{
+    m_comment.clear();
+    if (!comment.empty())
+    {
+        AddFlags(LFG_MEMBER_FLAG_COMMENT);
+        m_comment.append(comment);
+    }
+
+}
+
+void LFGGroupState::Clear()
+{
+    m_bQueued = false;
+    m_bUpdate = true;
+    m_status = LFG_STATUS_NOT_SAVED;
+    m_uiVotesNeeded = 3;
+    m_uiKicksLeft = sWorld.getConfig(CONFIG_UINT32_LFG_MAXKICKS);
+    m_uiFlags = LFG_MEMBER_FLAG_NONE | LFG_MEMBER_FLAG_COMMENT | LFG_MEMBER_FLAG_ROLES | LFG_MEMBER_FLAG_BIND;
+    m_proposal = NULL;
+    m_roleCheckCancelTime = 0;
+    m_roleCheckState      = LFG_ROLECHECK_NONE;
+    m_type = LFG_TYPE_NONE;
+    m_DungeonsList.clear();
+    m_LockMap.clear();
+    SetDungeon(NULL);
+    SetState(LFG_STATE_NONE);
+    SaveState();
+    StopBoot();
+    SetRandomPlayersCount(0);
+}
+
+uint8 LFGGroupState::GetVotesNeeded() const
+{
+    return m_uiVotesNeeded;
+}
+
+void LFGGroupState::SetVotesNeeded(uint8 votes)
+{
+    m_uiVotesNeeded = votes;
+}
+
+uint8 const LFGGroupState::GetKicksLeft() const
+{
+    return m_uiKicksLeft;
+}
+
+void LFGGroupState::StartRoleCheck()
+{
+    m_roleCheckCancelTime = time_t(time(NULL) + LFG_TIME_ROLECHECK);
+    SetRoleCheckState(LFG_ROLECHECK_INITIALITING);
+    SetState(LFG_STATE_ROLECHECK);
+}
+
+bool LFGGroupState::IsRoleCheckActive()
+{
+    if (GetRoleCheckState() != LFG_ROLECHECK_NONE && m_roleCheckCancelTime)
+        return true;
+    return false;
+}
+
+bool LFGGroupState::IsBootActive()
+{
+    if (GetState() != LFG_STATE_BOOT)
+        return false;
+    return (time(NULL) < m_bootCancelTime);
+}
+
+void LFGGroupState::StartBoot(ObjectGuid kicker, ObjectGuid victim, std::string reason)
+{
+    SaveState();
+    m_bootVotes.clear();
+
+    m_bootReason = reason;
+    m_bootVictim = victim;
+    m_bootCancelTime = time_t(time(NULL) + LFG_TIME_BOOT);
+    if (Group* pGroup = sObjectMgr.GetGroup(GetOwnerGuid()))
+    {
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            if (Player* pGroupMember = itr->getSource())
+            {
+                ObjectGuid guid = pGroupMember->GetObjectGuid();
+                LFGAnswer vote = LFG_ANSWER_PENDING;
+
+                if (guid == victim)
+                    vote = LFG_ANSWER_DENY;
+                else if (guid == kicker)
+                    vote = LFG_ANSWER_AGREE;
+                m_bootVotes.insert(std::make_pair(guid, vote));
+            }
+        }
+    }
+    SetState(LFG_STATE_BOOT);
+}
+
+void LFGGroupState::UpdateBoot(ObjectGuid kicker, LFGAnswer answer)
+{
+    LFGAnswerMap::iterator itr = m_bootVotes.find(kicker);
+
+    if ((*itr).second == LFG_ANSWER_PENDING)
+        (*itr).second = answer;
+}
+
+void LFGGroupState::StopBoot()
+{
+    m_bootVotes.clear();
+    m_bootVictim.Clear();
+    m_bootReason.clear();
+    m_bootCancelTime = 0;
+    RestoreState();
+}
+
+LFGAnswer LFGGroupState::GetBootResult()
+{
+    uint8 votesNum = 0;
+    uint8 agreeNum = 0;
+    uint8 denyNum  = 0;
+
+    for (LFGAnswerMap::const_iterator itr = m_bootVotes.begin(); itr != m_bootVotes.end(); ++itr)
+    {
+        switch (itr->second)
+        {
+            case LFG_ANSWER_AGREE:
+                ++votesNum;
+                ++agreeNum;
+                break;
+            case LFG_ANSWER_DENY:
+                ++votesNum;
+                ++denyNum;
+                break;
+            case LFG_ANSWER_PENDING:
+                break;
+            default:
+                break;
+        }
+    }
+    if (agreeNum >= GetVotesNeeded())
+        return LFG_ANSWER_AGREE;
+    else if (denyNum > m_bootVotes.size() - GetVotesNeeded())
+        return LFG_ANSWER_DENY;
+    else if (votesNum < m_bootVotes.size())
+        return LFG_ANSWER_PENDING;
+
+    return LFG_ANSWER_PENDING;
+}
+
+void  LFGGroupState::DecreaseKicksLeft()
+{
+    if (m_uiKicksLeft > 0)
+        --m_uiKicksLeft;
+}
+
+uint32 LFGGroupState::GetDungeonId()
+{
+    return GetDungeon() ? GetDungeon()->ID : 0;
+};
+
+LFGQueueInfo::LFGQueueInfo(ObjectGuid _guid, LFGType type, uint32 _queueID)
+    : guid(_guid), m_type(type), queueID(_queueID)
+{
+    MANGOS_ASSERT(!guid.IsEmpty());
+    tanks = LFG_TANKS_NEEDED;
+    healers = LFG_HEALERS_NEEDED;
+    dps = LFG_DPS_NEEDED;
+    joinTime = time_t(time(NULL));
+}
+
+LFGProposal::LFGProposal(LFGDungeonEntry const* _dungeon)
+    : m_dungeon(_dungeon), m_state(LFG_PROPOSAL_INITIATING), m_cancelTime(0)
+{
+    declinerGuids.clear();
+    playerGuids.clear();
+    m_bDeleted = false;
+}
+
+void LFGProposal::Start()
+{
+    m_cancelTime = time_t(time(NULL) + LFG_TIME_PROPOSAL);
+}
+
+void LFGProposal::RemoveDecliner(ObjectGuid guid)
+{
+    if (guid.IsEmpty())
+        return;
+
+    RemoveMember(guid);
+
+    declinerGuids.insert(guid);
+}
+
+void LFGProposal::RemoveMember(ObjectGuid guid)
+{
+    if (guid.IsEmpty())
+        return;
+
+    GuidSet::iterator itr = playerGuids.find(guid);
+    if (itr != playerGuids.end())
+        playerGuids.erase(itr);
+}
+
+void LFGProposal::AddMember(ObjectGuid guid)
+{
+    playerGuids.insert(guid);
+}
+
+bool LFGProposal::IsMember(ObjectGuid guid)
+{
+    GuidSet::const_iterator itr = playerGuids.find(guid);
+    if (itr == playerGuids.end())
+        return false;
+    else
+        return true;
+}
+
+GuidSet const LFGProposal::GetMembers()
+{
+    GuidSet tmpGuids = playerGuids;
+    return tmpGuids;
+}
+
+bool LFGProposal::IsDecliner(ObjectGuid guid)
+{
+    if (declinerGuids.empty())
+        return false;
+
+    GuidSet::iterator itr = declinerGuids.find(guid);
+    if (itr != declinerGuids.end())
+        return true;
+
+    return false;
+}
+
+LFGType LFGProposal::GetType()
+{
+    return (m_dungeon ? LFGType(m_dungeon->type) : LFG_TYPE_NONE);
+}
+
+Group* LFGProposal::GetGroup()
+{
+    if (m_groupGuid.IsEmpty())
+        return NULL;
+
+    return sObjectMgr.GetGroup(m_groupGuid);
+}
+
+void LFGProposal::SetGroup(Group* group)
+{
+    if (!group)
+    {
+        m_groupGuid.Clear();
+        return;
+    }
+    m_groupGuid = group->GetObjectGuid();
+}
+
+uint32 LFGProposal::GetDungeonId()
+{
+    return GetDungeon() ? GetDungeon()->ID : 0;
+};
diff --git a/src/game/LFG.h b/src/game/LFG.h
new file mode 100644
index 00000000000..846c693ace8
--- /dev/null
+++ b/src/game/LFG.h
@@ -0,0 +1,419 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2010-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _LFG_H
+#define _LFG_H
+
+struct LFGDungeonEntry;
+class Player;
+class Group;
+
+enum LFGRoles
+{
+    ROLE_LEADER = 0,
+    ROLE_TANK   = 1,
+    ROLE_HEALER = 2,
+    ROLE_DAMAGE = 3,
+    ROLE_MAX,
+};
+
+enum LFGRoleMask
+{
+    LFG_ROLE_MASK_NONE    = 0x00,
+    LFG_ROLE_MASK_LEADER  = (1 << ROLE_LEADER),
+    LFG_ROLE_MASK_TANK    = (1 << ROLE_TANK),
+    LFG_ROLE_MASK_HEALER  = (1 << ROLE_HEALER),
+    LFG_ROLE_MASK_DAMAGE  = (1 << ROLE_DAMAGE),
+
+    // unions
+    LFG_ROLE_MASK_TANK_HEALER_DAMAGE = ( LFG_ROLE_MASK_TANK   |
+                                         LFG_ROLE_MASK_HEALER |
+                                         LFG_ROLE_MASK_DAMAGE ),
+
+    LFG_ROLE_MASK_TANK_HEALER   = ( LFG_ROLE_MASK_TANK |
+                                    LFG_ROLE_MASK_HEALER ),
+
+    LFG_ROLE_MASK_TANK_DAMAGE   = ( LFG_ROLE_MASK_TANK |
+                                    LFG_ROLE_MASK_DAMAGE ),
+
+    LFG_ROLE_MASK_HEALER_DAMAGE = ( LFG_ROLE_MASK_DAMAGE |
+                                    LFG_ROLE_MASK_HEALER ),
+
+    LFG_ROLE_MASK_LEADER_TANK_HEALER_DAMAGE = ( LFG_ROLE_MASK_TANK_HEALER_DAMAGE |
+                                                LFG_ROLE_MASK_LEADER ),
+    LFG_ROLE_MASK_LEADER_TANK_HEALER        = ( LFG_ROLE_MASK_TANK_HEALER |
+                                                LFG_ROLE_MASK_LEADER ),
+    LFG_ROLE_MASK_LEADER_TANK_DAMAGE        = ( LFG_ROLE_MASK_TANK_DAMAGE |
+                                                LFG_ROLE_MASK_LEADER ),
+    LFG_ROLE_MASK_LEADER_HEALER_DAMAGE      = ( LFG_ROLE_MASK_HEALER_DAMAGE |
+                                                LFG_ROLE_MASK_LEADER ),
+};
+
+enum LFGMemberFlags
+{
+    LFG_MEMBER_FLAG_NONE         = 0x00,
+    LFG_MEMBER_FLAG_CHARINFO     = 0x01,      // have charinfo
+    LFG_MEMBER_FLAG_COMMENT      = 0x02,      // have comment
+    LFG_MEMBER_FLAG_GROUPLEADER  = 0x04,      // IsInGroup
+    LFG_MEMBER_FLAG_GROUPGUID    = 0x08,      // Have group guid
+    LFG_MEMBER_FLAG_ROLES        = 0x10,      // have roles
+    LFG_MEMBER_FLAG_AREA         = 0x20,      // have areaid
+    LFG_MEMBER_FLAG_STATUS       = 0x40,      // have status (unknown bool)
+    LFG_MEMBER_FLAG_BIND         = 0x80,      // have bind and completed encounter on this dungeon
+    LFG_MEMBER_FLAG_UPDATE       = 0x1000,    // special custom flag for clear client cache
+};
+
+enum LFGState
+{
+    LFG_STATE_NONE               = 0,                  // Not using LFG / LFR
+    LFG_STATE_LFR                = 1,                  // Using Raid finder
+    LFG_STATE_LFG                = 2,                  // Using Dungeon finder
+    LFG_STATE_ROLECHECK          = 3,                  // Rolecheck active
+    LFG_STATE_QUEUED             = 4,                  // Queued
+    LFG_STATE_PROPOSAL           = 5,                  // Proposal active
+    LFG_STATE_BOOT               = 6,                  // Vote kick active
+    LFG_STATE_DUNGEON            = 7,                  // In LFG Group, in a Dungeon
+    LFG_STATE_FINISHED_DUNGEON   = 8,                  // In LFG Group, in a finished Dungeon
+    LFG_STATE_MAX
+};
+
+enum LFGUpdateType
+{
+    LFG_UPDATETYPE_LEADER               = 1,
+    LFG_UPDATETYPE_ROLECHECK_ABORTED    = 4,
+    LFG_UPDATETYPE_JOIN_PROPOSAL        = 5,
+    LFG_UPDATETYPE_ROLECHECK_FAILED     = 6,
+    LFG_UPDATETYPE_REMOVED_FROM_QUEUE   = 7,
+    LFG_UPDATETYPE_PROPOSAL_FAILED      = 8,
+    LFG_UPDATETYPE_PROPOSAL_DECLINED    = 9,
+    LFG_UPDATETYPE_GROUP_FOUND          = 10,
+    LFG_UPDATETYPE_ADDED_TO_QUEUE       = 12,
+    LFG_UPDATETYPE_PROPOSAL_BEGIN       = 13,
+    LFG_UPDATETYPE_CLEAR_LOCK_LIST      = 14,
+    LFG_UPDATETYPE_GROUP_MEMBER_OFFLINE = 15,
+    LFG_UPDATETYPE_GROUP_DISBAND        = 16,
+};
+
+enum LFGType
+{
+    LFG_TYPE_NONE                 = 0,
+    LFG_TYPE_DUNGEON              = 1,
+    LFG_TYPE_RAID                 = 2,
+    LFG_TYPE_QUEST                = 3,
+    LFG_TYPE_ZONE                 = 4,
+    LFG_TYPE_HEROIC_DUNGEON       = 5,
+    LFG_TYPE_RANDOM_DUNGEON       = 6,
+    LFG_TYPE_MAX
+};
+
+enum LFGGroupType
+{
+    LFG_GROUP_TYPE_DUNGEON_CLASSIC          = 1,
+    LFG_GROUP_TYPE_NORMAL_DUNGEONS_TBC      = 2,
+    LFG_GROUP_TYPE_HEROIC_DUNGEONS_TBC      = 3,
+    LFG_GROUP_TYPE_NORMAL_DUNGEONS_WOTLK    = 4,
+    LFG_GROUP_TYPE_HEROIC_DUNGEONS_WOTLK    = 5,
+    LFG_GROUP_TYPE_RAID_CLASSIC             = 6,
+    LFG_GROUP_TYPE_RAID_TBC                 = 7,
+    LFG_GROUP_TYPE_RAID_10_WOTLK            = 8,
+    LFG_GROUP_TYPE_RAID_25_WOTLK            = 9,
+    LFG_GROUP_TYPE_WORLD_EVENTS             = 11,
+};
+
+enum LFGProposalState
+{
+    LFG_PROPOSAL_INITIATING = 0,
+    LFG_PROPOSAL_FAILED     = 1,
+    LFG_PROPOSAL_SUCCESS    = 2,
+};
+
+enum LFGLockStatusType
+{
+    LFG_LOCKSTATUS_OK                        = 0,           // Internal use only
+    LFG_LOCKSTATUS_INSUFFICIENT_EXPANSION    = 1,
+    LFG_LOCKSTATUS_TOO_LOW_LEVEL             = 2,
+    LFG_LOCKSTATUS_TOO_HIGH_LEVEL            = 3,
+    LFG_LOCKSTATUS_TOO_LOW_GEAR_SCORE        = 4,
+    LFG_LOCKSTATUS_TOO_HIGH_GEAR_SCORE       = 5,
+    LFG_LOCKSTATUS_RAID_LOCKED               = 6,
+    LFG_LOCKSTATUS_ATTUNEMENT_TOO_LOW_LEVEL  = 1001,
+    LFG_LOCKSTATUS_ATTUNEMENT_TOO_HIGH_LEVEL = 1002,
+    LFG_LOCKSTATUS_QUEST_NOT_COMPLETED       = 1022,
+    LFG_LOCKSTATUS_MISSING_ITEM              = 1025,
+    LFG_LOCKSTATUS_NOT_IN_SEASON             = 1031,
+};
+
+enum LFGTeleportError
+{
+    LFG_TELEPORTERROR_OK               = 0,                 // Internal use
+    LFG_TELEPORTERROR_PLAYER_DEAD      = 1,
+    LFG_TELEPORTERROR_FALLING          = 2,
+    LFG_TELEPORTERROR_UNK2             = 3,                 // You can't do that right now
+    LFG_TELEPORTERROR_FATIGUE          = 4,
+    LFG_TELEPORTERROR_UNK3             = 5,                 // No reaction
+    LFG_TELEPORTERROR_INVALID_LOCATION = 6,
+    LFG_TELEPORTERROR_UNK4             = 7,                 // You can't do that right now
+    LFG_TELEPORTERROR_UNK5             = 8,                 // You can't do that right now
+};
+
+enum LFGJoinResult
+{
+    ERR_LFG_OK                                  = 0x00,                    // Joined (no client msg)
+    ERR_LFG_ROLE_CHECK_FAILED                   = 0x01,                    // RoleCheck Failed
+    ERR_LFG_GROUP_FULL                          = 0x02,                    // Your group is full
+    ERR_LFG_UNK3                                = 0x03,                    // No client reaction
+    ERR_LFG_NO_LFG_OBJECT                       = 0x04,                    // Internal LFG Error
+    ERR_LFG_NO_SLOTS_PLAYER                     = 0x05,                    // You do not meet the requirements for the chosen dungeons
+    ERR_LFG_NO_SLOTS_PARTY                      = 0x06,                    // One or more party members do not meet the requirements for the chosen dungeons
+    ERR_LFG_MISMATCHED_SLOTS                    = 0x07,                    // You cannot mix dungeons, raids, and random when picking dungeons
+    ERR_LFG_PARTY_PLAYERS_FROM_DIFFERENT_REALMS = 0x08,                    // The dungeon you chose does not support players from multiple realms
+    ERR_LFG_MEMBERS_NOT_PRESENT                 = 0x09,                    // One or more party members are pending invites or disconnected
+    ERR_LFG_GET_INFO_TIMEOUT                    = 0x0A,                    // Could not retrieve information about some party members
+    ERR_LFG_INVALID_SLOT                        = 0x0B,                    // One or more dungeons was not valid
+    ERR_LFG_DESERTER_PLAYER                     = 0x0C,                    // You can not queue for dungeons until your deserter debuff wears off
+    ERR_LFG_DESERTER_PARTY                      = 0x0D,                    // One or more party members has a deserter debuff
+    ERR_LFG_RANDOM_COOLDOWN_PLAYER              = 0x0E,                    // You can not queue for random dungeons while on random dungeon cooldown
+    ERR_LFG_RANDOM_COOLDOWN_PARTY               = 0x0F,                    // One or more party members are on random dungeon cooldown
+    ERR_LFG_TOO_MANY_MEMBERS                    = 0x10,                    // You can not enter dungeons with more that 5 party members
+    ERR_LFG_CANT_USE_DUNGEONS                   = 0x11,                    // You can not use the dungeon system while in BG or arenas
+    ERR_LFG_ROLE_CHECK_FAILED2                  = 0x12,                    // RoleCheck Failed
+};
+
+enum LFGRoleCheckState
+{
+    LFG_ROLECHECK_NONE                           = 0,      // Internal use = Not initialized.
+    LFG_ROLECHECK_FINISHED                       = 1,      // Role check finished
+    LFG_ROLECHECK_INITIALITING                   = 2,      // Role check begins
+    LFG_ROLECHECK_MISSING_ROLE                   = 3,      // Someone didn't selected a role after 2 mins
+    LFG_ROLECHECK_WRONG_ROLES                    = 4,      // Can't form a group with that role selection
+    LFG_ROLECHECK_ABORTED                        = 5,      // Someone leave the group
+    LFG_ROLECHECK_NO_ROLE                        = 6       // Someone selected no role
+};
+
+enum LFGAnswer
+{
+    LFG_ANSWER_PENDING         = -1,
+    LFG_ANSWER_DENY            = 0,
+    LFG_ANSWER_AGREE           = 1,
+};
+
+enum LFGDungeonStatus
+{
+    LFG_STATUS_SAVED                 = 0,
+    LFG_STATUS_NOT_SAVED             = 1,
+    LFG_STATUS_OFFER_CONTINUE        = 2,
+    LFG_STATUS_COMPLETE              = 3,
+};
+
+typedef std::set<LFGDungeonEntry const*> LFGDungeonSet;    // Must be ORDERED! FIXME - use set of dungeon numbers instead this.
+typedef UNORDERED_MAP<LFGDungeonEntry const*, LFGLockStatusType> LFGLockStatusMap;    //FIXME - use set of dungeon numbers instead this.
+
+/// Stores group data related to proposal to join
+struct LFGProposal
+{
+    LFGProposal(LFGDungeonEntry const* _dungeon);
+    public:
+    uint32 m_uiID;                                               // Proposal id
+
+    // helpers
+    Group* GetGroup();
+    void SetGroup(Group* group);
+    void AddMember(ObjectGuid guid);
+    void RemoveMember(ObjectGuid guid);
+    bool IsMember(ObjectGuid guid);
+    GuidSet const GetMembers();
+
+    void RemoveDecliner(ObjectGuid guid);
+    bool IsDecliner(ObjectGuid guid);
+
+    LFGProposalState GetState() {return m_state;};
+    void SetState(LFGProposalState _state ) { m_state = _state;};
+
+    LFGDungeonEntry const* GetDungeon() { return m_dungeon;};
+    LFGType GetType();
+
+    uint32 GetDungeonId();
+
+    void Start();
+
+    void SetDeleted() { m_bDeleted = true; };
+    bool const IsDeleted() const { return m_bDeleted; };
+
+    bool IsExpired() { return ( m_cancelTime > 0 && m_cancelTime < time_t(time(NULL)));};
+
+    private:
+    LFGDungeonEntry const* m_dungeon;                    // Dungeon
+    LFGProposalState m_state;                            // State of the proposal
+    ObjectGuid m_groupGuid;                              // Proposal group (empty if not created)
+    time_t m_cancelTime;                                 // Time when we will cancel this proposal
+    GuidSet playerGuids;                                 // Players in this proposal
+    GuidSet declinerGuids;                               // Decliners in this proposal
+    bool m_bDeleted;                                     // avoid double-deleting proposal
+};
+
+
+struct LFGStateStructure
+{
+public:
+    virtual ~LFGStateStructure() {};
+    virtual void Clear() {};
+
+    void Update(bool update = true) { m_bUpdate = update; };
+    LFGDungeonSet const* GetDungeons() const  { return &m_DungeonsList; };
+    void SetDungeons(LFGDungeonSet dungeons);
+    void RemoveDungeon(LFGDungeonEntry const* dungeon);
+    void AddDungeon(LFGDungeonEntry const* dungeon);
+
+    void SetType(LFGType type) { m_type = type; };
+    LFGType GetType() { return m_type;};
+
+    void SetState(LFGState state) { m_state = state; };
+    LFGState GetState() { return m_state; };
+
+    ObjectGuid const& GetOwnerGuid() { return m_guid; };
+
+    LFGProposal*   GetProposal()   { return m_proposal; };
+    void           SetProposal(LFGProposal* proposal)   { m_proposal = proposal; };
+
+    uint32         GetFlags()                { return m_uiFlags;};
+    void           AddFlags(uint32 flags)    { m_uiFlags = m_uiFlags | flags;};
+    void           RemoveFlags(uint32 flags) { m_uiFlags = m_uiFlags & ~flags;};
+
+protected:
+    LFGStateStructure(ObjectGuid const& guid)
+        : m_guid(guid), m_type(LFG_TYPE_NONE), m_uiFlags(0), m_bUpdate(false), m_state(LFG_STATE_NONE), m_proposal(NULL) {};
+    LFGType          m_type;
+    uint32           m_uiFlags;
+    bool             m_bUpdate;
+    LFGState         m_state;
+    LFGDungeonSet    m_DungeonsList;                   // Dungeons the player have applied for
+    LFGLockStatusMap m_LockMap;                        // Dungeons lock map
+    LFGProposal*     m_proposal;
+    ObjectGuid const m_guid;                           // guid of object
+
+};
+
+
+struct MANGOS_DLL_SPEC LFGPlayerState : public LFGStateStructure
+{
+public:
+    explicit LFGPlayerState(ObjectGuid const& playerGuid) : LFGStateStructure(playerGuid)
+    {
+        Clear();
+    };
+    virtual ~LFGPlayerState() {};
+
+    void Clear() override;
+    LFGLockStatusMap const* GetLockMap();
+    std::string const&  GetComment()    { return m_comment; };
+    void           SetComment(std::string comment);
+
+    LFGRoleMask    GetRoles();
+    void           SetRoles(LFGRoleMask roles);
+    void           AddRole(LFGRoles role) { m_rolesMask = LFGRoleMask( m_rolesMask | (1 << role)); };
+    void           RemoveRole(LFGRoles role) { m_rolesMask = LFGRoleMask( m_rolesMask & ~(1 << role)); };
+    bool           IsSingleRole();
+    bool           HasRole(LFGRoles role) { return (1 << role) & m_rolesMask; };
+
+    void           SetJoined();
+    time_t         GetJoinTime() { return m_jointime;};
+
+    void           SetTeleported() {m_bTeleported = true;};
+    bool           IsTeleported() { return m_bTeleported;};
+
+    void           SetAnswer(LFGAnswer _accept) { m_answer = _accept;};
+    LFGAnswer      GetAnswer() { return m_answer;};
+
+private:
+    LFGRoleMask    m_rolesMask;
+    bool           m_bTeleported;
+    time_t         m_jointime;
+    std::string    m_comment;
+    LFGAnswer      m_answer;                           ///< Accept status (-1 not answer | 0 Not agree | 1 agree)
+
+};
+
+typedef UNORDERED_MAP<ObjectGuid, LFGAnswer> LFGAnswerMap;
+
+struct MANGOS_DLL_SPEC LFGGroupState : public LFGStateStructure
+{
+
+public:
+    explicit LFGGroupState(ObjectGuid const& groupGuid) : LFGStateStructure(groupGuid)
+    {
+        Clear();
+    };
+    virtual ~LFGGroupState() {};
+
+    void Clear() override;
+    LFGDungeonEntry const* GetDungeon()   { return m_realdungeon; };
+    void SetDungeon(LFGDungeonEntry const* dungeon)   { m_realdungeon = dungeon; };
+    uint32 GetDungeonId();
+
+    // Current state operations
+    void SaveState() { m_savedstate = m_state; };
+    void RestoreState() { m_state = m_savedstate; };
+
+    // Group status
+    void SetStatus(LFGDungeonStatus status) { m_status = status; };
+    LFGDungeonStatus GetStatus() { return m_status; };
+
+    // Boot system
+    LFGAnswerMap* GetBootMap() { return &m_bootVotes;};
+    void  StartBoot(ObjectGuid kicker, ObjectGuid victim, std::string reason);
+    void  StopBoot();
+    ObjectGuid GetBootVictim() { return m_bootVictim; };
+    void  UpdateBoot(ObjectGuid kicker, LFGAnswer vote);
+    LFGAnswer  GetBootResult();
+    std::string GetBootReason() { return m_bootReason; };
+    bool  IsBootActive();
+    time_t GetBootCancelTime() { return m_bootCancelTime; };
+    uint8 GetVotesNeeded() const;
+    void  SetVotesNeeded(uint8 votes);
+    uint8 const GetKicksLeft() const;
+    void  DecreaseKicksLeft();
+
+    // Role checks
+    LFGRoleCheckState GetRoleCheckState() const { return m_roleCheckState;};
+    void SetRoleCheckState( LFGRoleCheckState _state) { m_roleCheckState = _state; };
+    void StartRoleCheck();
+    bool QueryRoleCheckTime() {return (time_t(time(NULL)) < m_roleCheckCancelTime);};
+    bool IsRoleCheckActive();
+
+    uint8 GetRandomPlayersCount() const { return m_uiRandomPlayersCount; };
+    void  SetRandomPlayersCount(uint8 _count) { m_uiRandomPlayersCount = _count; };
+
+private:
+    bool           m_bQueued;
+    LFGState       m_savedstate;
+    LFGDungeonStatus     m_status;
+    LFGDungeonEntry const* m_realdungeon;                       // real dungeon entry (if random or list)
+    // Role check
+    time_t         m_roleCheckCancelTime;                       // Time when the rolecheck will fail
+    LFGRoleCheckState m_roleCheckState;                         // State of the rolecheck
+    // Boot
+    time_t         m_bootCancelTime;                            // Time left to vote
+    uint8          m_uiVotesNeeded;                             // Votes need to kick success
+    uint8          m_uiKicksLeft;                               // Number of kicks left
+    uint8          m_uiRandomPlayersCount;                      // Count of random players in this group
+    LFGAnswerMap   m_bootVotes;                                 // Player votes (-1 not answer | 0 Not agree | 1 agree)
+    ObjectGuid     m_bootVictim;                                // Player guid to be kicked (can't vote)
+    std::string    m_bootReason;                                // kick reason
+};
+
+#endif
diff --git a/src/game/LFGHandler.cpp b/src/game/LFGHandler.cpp
index e1069f61e83..fc591059ff8 100644
--- a/src/game/LFGHandler.cpp
+++ b/src/game/LFGHandler.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,255 +19,1212 @@
 
 #include "WorldSession.h"
 #include "Log.h"
+#include "Database/DatabaseEnv.h"
 #include "Player.h"
 #include "WorldPacket.h"
 #include "ObjectMgr.h"
 #include "World.h"
+#include "LFGMgr.h"
 
 void WorldSession::HandleLfgJoinOpcode( WorldPacket & recv_data )
 {
-    DEBUG_LOG("CMSG_LFG_JOIN");
+    if (!GetPlayer())
+        return;
 
-    uint8 dungeonsCount, counter2;
+    if (!sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE) && !sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE))
+    {
+        recv_data.rpos(recv_data.wpos());
+        DEBUG_LOG("CMSG_LFG_JOIN %u failed - Dungeon finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+    else
+        DEBUG_LOG("CMSG_LFG_JOIN %u processing...", GetPlayer()->GetObjectGuid().GetCounter());
+
+    uint8  numDungeons;
+    uint32 dungeonID;
+    uint32 roles;
     std::string comment;
-    std::vector<uint32> dungeons;
+    LFGDungeonSet newDungeons;
+    newDungeons.clear();
 
-    recv_data >> Unused<uint32>();                          // lfg roles
-    recv_data >> Unused<uint8>();                           // lua: GetLFGInfoLocal
-    recv_data >> Unused<uint8>();                           // lua: GetLFGInfoLocal
+    recv_data >> roles;                                     // lfg roles
+    recv_data >> Unused<uint8>();                           // unk1 (unused?)
+    recv_data >> Unused<uint8>();                           // unk2 (unused?)
 
-    recv_data >> dungeonsCount;
+    recv_data >> numDungeons;
+    if (!numDungeons)
+    {
+        DEBUG_LOG("CMSG_LFG_JOIN %u no dungeons selected", GetPlayer()->GetObjectGuid().GetCounter());
+        recv_data.rpos(recv_data.wpos());
+        return;
+    }
 
-    dungeons.resize(dungeonsCount);
+    for (int8 i = 0 ; i < numDungeons; ++i)
+    {
+        recv_data >> dungeonID;
+        LFGDungeonEntry const* dungeon = sLFGMgr.GetDungeon(dungeonID & 0x00FFFFFF);    // remove the type from the dungeon entry
+        if (dungeon)
+            newDungeons.insert(dungeon);
+    }
 
-    for (uint8 i = 0; i < dungeonsCount; ++i)
-        recv_data >> dungeons[i];                           // dungeons id/type
+    uint8 counter2;                                         // unk - always 3
+    recv_data >> counter2;
+    for (uint8 i = 0; i < counter2; i++)
+        recv_data >> Unused<uint8>();                       // unk (unused?)
+    recv_data >> comment;                                   // lfg comment
 
-    recv_data >> counter2;                                  // const count = 3, lua: GetLFGInfoLocal
+    sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->SetDungeons(newDungeons);
+    if (GetPlayer()->GetGroup())
+        if (GetPlayer()->GetObjectGuid() == GetPlayer()->GetGroup()->GetLeaderGuid())
+            sLFGMgr.GetLFGGroupState(GetPlayer()->GetGroup()->GetObjectGuid())->SetDungeons(newDungeons);
 
-    for (uint8 i = 0; i < counter2; ++i)
-        recv_data >> Unused<uint8>();                       // lua: GetLFGInfoLocal
+    sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->SetRoles(LFGRoleMask(roles));
+    sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->SetComment(comment);
+    DEBUG_LOG("CMSG_LFG_JOIN %u as group: %u  Dungeons: %u", GetPlayer()->GetObjectGuid().GetCounter(), GetPlayer()->GetGroup() ? 1 : 0, uint8(newDungeons.size()));
+    sLFGMgr.Join(GetPlayer());
+}
 
-    recv_data >> comment;                                   // lfg comment
+void WorldSession::HandleLfgLeaveOpcode( WorldPacket & /*recv_data*/ )
+{
+    Group* group = GetPlayer()->GetGroup();
+
+    DEBUG_LOG("CMSG_LFG_LEAVE %u in group: %u", GetPlayer()->GetObjectGuid().GetCounter(), group ? 1 : 0);
+
+    // Check cheating - only leader can leave the queue
+    if (!group || group->GetLeaderGuid() == GetPlayer()->GetObjectGuid())
+        sLFGMgr.Leave(GetPlayer());
 
-    //SendLfgJoinResult(ERR_LFG_OK);
-    //SendLfgUpdate(false, LFG_UPDATE_JOIN, dungeons[0]);
 }
 
-void WorldSession::HandleLfgLeaveOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleLfgGetStatus(WorldPacket & /*recv_data*/)
 {
-    DEBUG_LOG("CMSG_LFG_LEAVE");
+    Group* group = GetPlayer()->GetGroup();
 
-    //SendLfgUpdate(false, LFG_UPDATE_LEAVE, 0);
+    DEBUG_LOG("CMSG_LFG_GET_STATUS %u in group: %u", GetPlayer()->GetObjectGuid().GetCounter(), group ? 1 : 0);
+    // Need implement
+}
+
+void WorldSession::HandleLfrSearchOpcode( WorldPacket & recv_data )
+{
+    uint32 entry;                                           // Raid id to search
+    recv_data >> entry;
+    DEBUG_LOG("CMSG_SEARCH_LFG_JOIN %u dungeon entry: %u", GetPlayer()->GetObjectGuid().GetCounter(), entry);
+    if (!sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE))
+    {
+        DEBUG_LOG("CMSG_SEARCH_LFG_JOIN %u failed - Raid finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+    SendLfgUpdateList(entry & 0x00FFFFFF);
 }
 
-void WorldSession::HandleSearchLfgJoinOpcode( WorldPacket & recv_data )
+void WorldSession::HandleLfrLeaveOpcode( WorldPacket & recv_data )
 {
-    DEBUG_LOG("CMSG_LFG_SEARCH_JOIN");
+    uint32 entry;                                          // Raid id queue to leave
+    recv_data >> entry;
+
+    if (!sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE))
+    {
+        DEBUG_LOG("CMSG_SEARCH_LFG_LEAVE %u failed - Raid finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    DEBUG_LOG("CMSG_SEARCH_LFG_LEAVE %u dungeon entry: %u", GetPlayer()->GetObjectGuid().GetCounter(), entry);
 
-    uint32 temp, entry;
-    recv_data >> temp;
+    Group* group = GetPlayer()->GetGroup();
 
-    entry = (temp & 0x00FFFFFF);
-    LfgType type = LfgType((temp >> 24) & 0x000000FF);
+//    if (!group || group->GetLeaderGuid() == GetPlayer()->GetObjectGuid())
+    if (!group)
+    {
+        sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->RemoveDungeon(sLFGMgr.GetDungeon(entry & 0x00FFFFFF));
 
-    //SendLfgSearchResults(type, entry);
+        if (sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->GetDungeons()->empty())
+            sLFGMgr.Leave(GetPlayer());
+    }
 }
 
-void WorldSession::HandleSearchLfgLeaveOpcode( WorldPacket & recv_data )
+void WorldSession::HandleLfgClearOpcode( WorldPacket & /*recv_data */ )
 {
-    DEBUG_LOG("CMSG_LFG_SEARCH_LEAVE");
+    // empty packet
+    DEBUG_LOG("CMSG_CLEAR_LOOKING_FOR_GROUP %u ", GetPlayer()->GetObjectGuid().GetCounter());
+
+    sLFGMgr.ClearLFRList(GetPlayer());
+
+    if(sWorld.getConfig(CONFIG_BOOL_RESTRICTED_LFG_CHANNEL) && _player->GetSession()->GetSecurity() == SEC_PLAYER )
+        GetPlayer()->LeaveLFGChannel();
 
-    recv_data >> Unused<uint32>();                          // join id?
 }
 
 void WorldSession::HandleSetLfgCommentOpcode( WorldPacket & recv_data )
 {
-    DEBUG_LOG("CMSG_SET_LFG_COMMENT");
-
     std::string comment;
     recv_data >> comment;
-    DEBUG_LOG("LFG comment \"%s\"", comment.c_str());
+
+    DEBUG_LOG("CMSG_SET_LFG_COMMENT: [%s]", comment.c_str());
+
+    sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->SetComment(comment);
+}
+
+void WorldSession::HandleLfgSetRolesOpcode(WorldPacket &recv_data)
+{
+    uint8 roles;
+    recv_data >> roles;
+
+    Group* group = GetPlayer()->GetGroup();
+    if (group)
+    {
+        bool isChanged = sLFGMgr.RoleChanged(GetPlayer(), LFGRoleMask(roles));
+        DEBUG_LOG("CMSG_LFG_SET_ROLES: Group %u, Player %u, Roles: %u %s", group->GetObjectGuid().GetCounter(), GetPlayer()->GetObjectGuid().GetCounter(), roles, isChanged ? "changed" : "not changed");
+        sLFGMgr.UpdateRoleCheck(group);
+    }
+    else
+    {
+        sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->SetRoles(LFGRoleMask(roles));
+        DEBUG_LOG("CMSG_LFG_SET_ROLES (not in group) Player %u roles %u", GetPlayer()->GetObjectGuid().GetCounter(), roles);
+    }
+}
+
+void WorldSession::HandleLfgSetBootVoteOpcode(WorldPacket &recv_data)
+{
+    bool agree;                                             // Agree to kick player
+    recv_data >> agree;
+
+    DEBUG_LOG("CMSG_LFG_SET_BOOT_VOTE %u agree: %u", GetPlayer()->GetObjectGuid().GetCounter(), agree ? 1 : 0);
+    sLFGMgr.UpdateBoot(GetPlayer(), LFGAnswer(agree));
+}
+
+void WorldSession::HandleLfgTeleportOpcode(WorldPacket &recv_data)
+{
+    bool agree;
+    recv_data >> agree;
+
+    DEBUG_LOG("CMSG_LFG_TELEPORT  %u teleport: %u", GetPlayer()->GetObjectGuid().GetCounter(), agree ? 1 : 0);
+    sLFGMgr.Teleport(GetPlayer(), agree, true);
+}
+
+void WorldSession::HandleLfgPlayerLockInfoRequestOpcode(WorldPacket &/*recv_data*/)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE) && !sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE))
+    {
+        DEBUG_LOG("CMSG_LFD_PLAYER_LOCK_INFO_REQUEST %u failed - Dungeon finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    DEBUG_LOG("CMSG_LFD_PLAYER_LOCK_INFO_REQUEST %u ", GetPlayer()->GetObjectGuid().GetCounter());
+
+    LFGDungeonSet    randomlist = sLFGMgr.GetRandomDungeonsForPlayer(GetPlayer());
+    LFGLockStatusMap const lockSet = *sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->GetLockMap();
+
+    uint32 rsize = randomlist.size();
+    uint32 lsize = lockSet.size();
+
+    WorldPacket data(SMSG_LFG_PLAYER_INFO, 1 + rsize * (4 + 1 + 4 + 4 + 4 + 4 + 1 + 4 + 4 + 4) + 4 + lsize * (1 + 4 + 4 + 4 + 4 + 1 + 4 + 4 + 4));
+
+    if (rsize == 0)
+    {
+        data << uint8(0);
+    }
+    else
+    {
+        data << uint8(rsize);                               // Random Dungeon count
+        for (LFGDungeonSet::const_iterator itr = randomlist.begin(); itr != randomlist.end(); ++itr)
+        {
+            uint8 done = 0;
+            data << uint32((*itr)->Entry());                     // Entry
+            LFGReward const* reward = sLFGMgr.GetRandomDungeonReward(*itr,GetPlayer());
+            Quest const* qRew = NULL;
+            if (reward)
+            {
+                Quest const* pQuest = sObjectMgr.GetQuestTemplate(reward->reward[0].questId);
+
+                if (!GetPlayer()->CanTakeQuest(pQuest, false))
+                    done = 1;
+
+                qRew = sObjectMgr.GetQuestTemplate(reward->reward[done].questId);
+            }
+            if (qRew)
+            {
+                data << uint8(done);
+                data << uint32(qRew->GetRewOrReqMoney());
+                data << uint32(qRew->XPValue(GetPlayer()));
+                data << uint32(reward->reward[done].variableMoney);
+                data << uint32(reward->reward[done].variableXP);
+                data << uint8(qRew->GetRewItemsCount());
+                if (qRew->GetRewItemsCount())
+                {
+                    ItemPrototype const* iProto = NULL;
+                    for (uint8 i = 0; i < QUEST_REWARDS_COUNT; ++i)
+                    {
+                        if (!qRew->RewItemId[i])
+                            continue;
+
+                        iProto = ObjectMgr::GetItemPrototype(qRew->RewItemId[i]);
+
+                        data << uint32(qRew->RewItemId[i]);
+                        data << uint32(iProto ? iProto->DisplayInfoID : 0);
+                        data << uint32(qRew->RewItemCount[i]);
+                    }
+                }
+            }
+            else
+            {
+                data << uint8(0);
+                data << uint32(0);
+                data << uint32(0);
+                data << uint32(0);
+                data << uint32(0);
+                data << uint8(0);
+            }
+        }
+    }
+
+    if (lsize == 0)
+    {
+        data << uint8(0);
+    }
+    else
+    {
+        data << uint32(lockSet.size());                             // Size of lock dungeons
+        for (LFGLockStatusMap::const_iterator itr = lockSet.begin(); itr != lockSet.end(); ++itr)
+        {
+            data << uint32((*itr->first).Entry());                   // Dungeon entry + type
+            data << uint32(itr->second);                             // Lock status
+        }
+    }
+    SendPacket(&data);
 }
 
-void WorldSession::SendLfgSearchResults(LfgType type, uint32 entry)
+void WorldSession::HandleLfgPartyLockInfoRequestOpcode(WorldPacket & /*recv_data*/)
 {
-    WorldPacket data(SMSG_LFG_SEARCH_RESULTS);
-    data << uint32(type);                                   // type
-    data << uint32(entry);                                  // entry from LFGDungeons.dbc
+    if (!sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE) && !sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE))
+    {
+        DEBUG_LOG("CMSG_LFD_PARTY_LOCK_INFO_REQUEST %u failed - Dungeon finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
 
-    uint8 isGuidsPresent = 0;
-    data << uint8(isGuidsPresent);
-    if(isGuidsPresent)
+    DEBUG_LOG("CMSG_LFD_PARTY_LOCK_INFO_REQUEST %u", GetPlayer()->GetObjectGuid().GetCounter());
+    uint32 size = 0;
+
+    Group* group = GetPlayer()->GetGroup();
+    if (!group)
+    {
+        WorldPacket data(SMSG_LFG_PARTY_INFO, 1 + size);
+        data << uint8(0);
+        SendPacket(&data);
+    }
+    else
     {
-        uint32 guids_count = 0;
-        data << uint32(guids_count);
-        for(uint32 i = 0; i < guids_count; ++i)
+        std::map<ObjectGuid,LFGLockStatusMap const> lockMap;
+        lockMap.clear();
+        uint8 membersCount = 0;
+
+        for (GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* player = itr->getSource();
+
+            if (!player || !player->IsInWorld())
+                continue;
+
+            LFGLockStatusMap const lockSet = *sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->GetLockMap();
+
+            size += 8 + 4 + lockSet.size() * (4 + 4);
+
+            lockMap.insert(std::make_pair(player->GetObjectGuid(), lockSet));
+            membersCount++;
+        }
+
+        WorldPacket data(SMSG_LFG_PARTY_INFO, 1 + size);
+
+        data << membersCount;
+
+        for (std::map<ObjectGuid,LFGLockStatusMap const>::const_iterator  itr1 = lockMap.begin(); itr1 != lockMap.end(); ++itr1)
         {
-            data << uint64(0);                              // player/group guid
+
+            data << itr1->first;
+            for (LFGLockStatusMap::const_iterator itr2 = itr1->second.begin(); itr2 != itr1->second.end(); ++itr2)
+            {
+                data << uint32(itr2->first->Entry());                   // Dungeon entry + type
+                data << uint32(itr2->second);                          // Lock status
+            }
         }
+
+        SendPacket(&data);
+    }
+}
+
+void WorldSession::HandleLfgProposalResultOpcode(WorldPacket &recv_data)
+{
+    uint32 ID;                                              // Internal proposal ID
+    bool   accept;                                          // Accept to join?
+    recv_data >> ID;
+    recv_data >> accept;
+
+    DEBUG_LOG("CMSG_LFG_PROPOSAL_RESULT %u proposal: %u accept: %u", GetPlayer()->GetObjectGuid().GetCounter(), ID, accept ? 1 : 0);
+    sLFGMgr.UpdateProposal(ID, GetPlayer()->GetObjectGuid(), accept);
+}
+
+void WorldSession::SendLfgJoinResult(LFGJoinResult checkResult, uint8 checkValue, bool withLockMap)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE) && !sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE))
+    {
+        DEBUG_LOG("SendLfgJoinResult %u failed - Dungeon finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
     }
 
-    uint32 groups_count = 1;
-    data << uint32(groups_count);                           // groups count
-    data << uint32(groups_count);                           // groups count (total?)
+    uint32 size = 0;
 
-    for(uint32 i = 0; i < groups_count; ++i)
+    Group* pGroup = GetPlayer()->GetGroup();
+    uint8 membersCount = 0;
+    std::map<ObjectGuid,LFGLockStatusMap const*> lockMap;
+    lockMap.clear();
+
+    if (pGroup && withLockMap)
     {
-        data << uint64(1);                                  // group guid
+        size +=1;
+        for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* player = itr->getSource();
+
+            if (!player->IsInWorld())
+                continue;
+
+            LFGLockStatusMap const* lockSet = sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->GetLockMap();
+
+            size += 8 + 4 + lockSet->size() * (4 + 4);
+
+            lockMap.insert(std::make_pair(player->GetObjectGuid(), lockSet));
+            membersCount++;
+        }
+    }
+
+    DEBUG_LOG("SMSG_LFG_JOIN_RESULT checkResult: %u checkValue: %u", checkResult, checkValue);
 
-        uint32 flags = 0x92;
-        data << uint32(flags);                              // flags
+    WorldPacket data(SMSG_LFG_JOIN_RESULT, 4 + 4 + size);
+
+    data << uint32(checkResult);                            // Check Result
+    data << uint32(checkValue);                             // Check Value
+
+    if (pGroup && withLockMap)
+    {
+        data << membersCount;
 
-        if(flags & 0x2)
+        for (std::map<ObjectGuid,LFGLockStatusMap const*>::const_iterator  itr1 = lockMap.begin(); itr1 != lockMap.end(); ++itr1)
         {
-            data << uint8(0);                               // comment string, max len 256
+
+            data << itr1->first;
+            for (LFGLockStatusMap::const_iterator itr2 = itr1->second->begin(); itr2 != itr1->second->end(); ++itr2)
+            {
+                data << uint32((*itr2->first).Entry());                   // Dungeon entry + type
+                data << uint32(itr2->second);                             // Lock status
+            }
         }
+    }
+
+    SendPacket(&data);
+}
+
+void WorldSession::SendLfgUpdateParty(LFGUpdateType updateType, LFGType type)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE) && !sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE))
+    {
+        DEBUG_LOG("SendLfgUpdateParty %u failed - Dungeon finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    bool join = false;
+    bool extrainfo = false;
+    bool queued = false;
+
+    switch(updateType)
+    {
+        case LFG_UPDATETYPE_JOIN_PROPOSAL:
+            extrainfo = true;
+            if (type != LFG_TYPE_RAID)
+                queued = true;
+            else
+                join = true;
+            break;
+        case LFG_UPDATETYPE_ADDED_TO_QUEUE:
+            extrainfo = true;
+            join = true;
+            queued = true;
+            break;
+        case LFG_UPDATETYPE_CLEAR_LOCK_LIST:
+            // join = true;
+            // TODO: Sometimes queued and extrainfo - Check ocurrences...
+            queued = true;
+            extrainfo = false;
+            break;
+        case LFG_UPDATETYPE_PROPOSAL_BEGIN:
+            extrainfo = true;
+            join = true;
+            break;
+        default:
+            break;
+    }
+
+    LFGDungeonSet const* dungeons = sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->GetDungeons();
+    uint8 size = dungeons->size();
+    std::string comment = sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->GetComment();
+
+    DEBUG_LOG("SMSG_LFG_UPDATE_PARTY updatetype: %u", updateType);
+
+    WorldPacket data(SMSG_LFG_UPDATE_PARTY, 1 + 1 + (extrainfo ? 1 : 0) * (1 + 1 + 1 + 1 + 1 + size * 4 + comment.length()));
+    data << uint8(updateType);                              // lfg join type
+    data << uint8(extrainfo);                               // Extra info
+    if (extrainfo)
+    {
+        data << uint8(join);                                // LFG Join
+        data << uint8(queued);                              // Join the queue
+        for (uint8 i = 0; i < 5; ++i)
+            data << uint8(0);                               // unk - Always 0
+
+        data << uint8(size);
 
-        if(flags & 0x10)
+        for (LFGDungeonSet::const_iterator itr = dungeons->begin(); itr != dungeons->end(); ++itr)
         {
-            for(uint32 j = 0; j < 3; ++j)
-                data << uint8(0);                           // roles
+            if (!*itr)
+                continue;
+
+            LFGDungeonEntry const* dungeon = *itr;
+            if (!dungeon)
+                data << uint32(0);
+            else
+                data << uint32(dungeon->Entry());
         }
 
-        if(flags & 0x80)
+        data << comment.c_str();
+    }
+    SendPacket(&data);
+}
+
+void WorldSession::SendLfgUpdatePlayer(LFGUpdateType updateType, LFGType type)
+{
+
+    if (!sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE) && !sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE))
+    {
+        DEBUG_LOG("SendLfgUpdatePlayer %u failed - Dungeon finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    bool queued = false;
+    bool extrainfo = false;
+
+    switch(updateType)
+    {
+        case LFG_UPDATETYPE_JOIN_PROPOSAL:
+            extrainfo = true;
+            if (type != LFG_TYPE_RAID)
+                queued = true;
+            break;
+        case LFG_UPDATETYPE_ADDED_TO_QUEUE:
+            queued = true;
+            break;
+        //case LFG_UPDATETYPE_CLEAR_LOCK_LIST: // TODO: Sometimes has extrainfo - Check ocurrences...
+        case LFG_UPDATETYPE_PROPOSAL_BEGIN:
+            extrainfo = true;
+            break;
+        default:
+            break;
+    }
+    LFGDungeonSet const* dungeons = sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->GetDungeons();
+    uint8 size = dungeons->size();
+    std::string comment = sLFGMgr.GetLFGPlayerState(GetPlayer()->GetObjectGuid())->GetComment();
+
+    DEBUG_LOG("SMSG_LFG_UPDATE_PLAYER %u updatetype: %u", GetPlayer()->GetObjectGuid().GetCounter(), updateType);
+
+    WorldPacket data(SMSG_LFG_UPDATE_PLAYER, 1 + 1 + (extrainfo ? 1 : 0) * (1 + 1 + 1 + 1 + size * 4 + comment.length()));
+    data << uint8(updateType);                              // lfg join type
+    data << uint8(extrainfo);                               // Extra info
+    if (extrainfo)
+    {
+        data << uint8(queued);                              // Join the queue
+        data << uint8(0);                                   // unk - Always 0
+        data << uint8(0);                                   // unk - Always 0
+
+        data << uint8(size);
+
+        for (LFGDungeonSet::const_iterator itr = dungeons->begin(); itr != dungeons->end(); ++itr)
         {
-            data << uint64(0);                              // instance guid
-            data << uint32(0);                              // completed encounters
+            if (!*itr)
+                continue;
+
+            LFGDungeonEntry const* dungeon = *itr;
+            if (!dungeon)
+                data << uint32(0);
+            else
+                data << uint32(dungeon->Entry());
         }
+
+        data << comment.c_str();
+    }
+    SendPacket(&data);
+}
+
+
+void WorldSession::SendLfgUpdateList(uint32 dungeonID)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE))
+    {
+        DEBUG_LOG("SendLfgUpdateList %u failed - Raid finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
     }
 
-    //TODO: Guard Player map
-    HashMapHolder<Player>::MapType const& players = sObjectAccessor.GetPlayers();
-    uint32 playersSize = players.size();
-    data << uint32(playersSize);                            // players count
-    data << uint32(playersSize);                            // players count (total?)
+    DEBUG_LOG("SMSG_LFG_SEARCH_RESULTS %u dungeonentry: %u ", GetPlayer()->GetObjectGuid().GetCounter(), dungeonID);
+
+    LFGDungeonEntry const* dungeon = sLFGMgr.GetDungeon(dungeonID);
 
-    for (HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter)
+    if (!dungeon)
+        return;
+
+    Team team = sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GROUP) ? TEAM_NONE : GetPlayer()->GetTeam();
+
+    GuidSet   groups = sLFGMgr.GetDungeonGroupQueue(dungeon, team);
+    GuidSet   players = sLFGMgr.GetDungeonPlayerQueue(dungeon, team);
+
+    uint32 groupCount = groups.size();
+    uint32 groupSize = 4+4;
+
+    for (GuidSet::const_iterator itr = groups.begin(); itr != groups.end(); ++itr)
     {
-        Player *plr = iter->second;
+        Group* pGroup   = sObjectMgr.GetGroup(*itr);
+        if (!pGroup)
+            continue;
 
-        if (!plr || plr->GetTeam() != _player->GetTeam())
+        Player* pLeader = sObjectMgr.GetPlayer(pGroup->GetLeaderGuid());
+        if (!pLeader)
             continue;
 
-        if (!plr->IsInWorld())
+        sLFGMgr.GetLFGPlayerState(pLeader->GetObjectGuid())->AddFlags(LFG_MEMBER_FLAG_CHARINFO |
+                                        LFG_MEMBER_FLAG_COMMENT |
+                                        LFG_MEMBER_FLAG_GROUPLEADER |
+                                        LFG_MEMBER_FLAG_GROUPGUID |
+                                        LFG_MEMBER_FLAG_ROLES |
+                                        LFG_MEMBER_FLAG_AREA  |
+                                        LFG_MEMBER_FLAG_STATUS  |
+                                        LFG_MEMBER_FLAG_BIND);
+
+        uint32 flags = sLFGMgr.GetLFGPlayerState(pLeader->GetObjectGuid())->GetFlags();
+
+        if (flags & LFG_MEMBER_FLAG_COMMENT)
+            groupSize += sLFGMgr.GetLFGPlayerState(pLeader->GetObjectGuid())->GetComment().size()+1;
+        if (flags & LFG_MEMBER_FLAG_ROLES)
+            groupSize +=3;
+        if (flags & LFG_MEMBER_FLAG_BIND)
+            groupSize += (8+4);
+
+        players.insert(*itr);
+
+        for (GroupReference *itr2 = pGroup->GetFirstMember(); itr2 != NULL; itr2 = itr2->next())
+        {
+            Player* player = itr2->getSource();
+
+            if (!player || player == pLeader)
+                continue;
+
+            sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->AddFlags(LFG_MEMBER_FLAG_GROUPLEADER |
+                                        LFG_MEMBER_FLAG_GROUPGUID |
+                                        LFG_MEMBER_FLAG_STATUS);
+
+            sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->RemoveFlags(LFG_MEMBER_FLAG_CHARINFO |
+                                        LFG_MEMBER_FLAG_COMMENT |
+                                        LFG_MEMBER_FLAG_ROLES |
+                                        LFG_MEMBER_FLAG_AREA  |
+                                        LFG_MEMBER_FLAG_BIND);
+            players.insert(player->GetObjectGuid());
+        }
+
+    }
+
+    uint32 playerCount = players.size();
+    uint32 playerSize = 4+4;
+
+    uint32 guidsSize = 0;
+    GuidSet playersUpdated;
+    playersUpdated.clear();
+
+    for(GuidSet::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+    {
+        Player* player   = sObjectMgr.GetPlayer(*itr);
+
+        if (!player || !player->IsInWorld())
             continue;
 
-        data << plr->GetObjectGuid();                       // guid
+        uint32 flags = sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->GetFlags();
+
+        playerSize += (8+4);
+
+        if (flags &  LFG_MEMBER_FLAG_CHARINFO)
+            playerSize += (1+1+1+3+4+4+4+4+4+4+4+4+4+4+4+4+4+4+4+4+4+4+4+4);
+
+        if (flags & LFG_MEMBER_FLAG_COMMENT)
+            playerSize += sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->GetComment().size()+1;         // comment
+
+        if (flags & LFG_MEMBER_FLAG_GROUPLEADER)
+            playerSize += 1;
+
+        if (flags & LFG_MEMBER_FLAG_GROUPGUID)
+            playerSize += 8;
+
+        if (flags & LFG_MEMBER_FLAG_ROLES)
+            playerSize += 1;
+
+        if (flags & LFG_MEMBER_FLAG_AREA)
+            playerSize += 4;
+
+        if (flags & LFG_MEMBER_FLAG_STATUS)
+            playerSize += 1;
+
+        if (flags & LFG_MEMBER_FLAG_BIND)
+            playerSize += (8+4);
+
+        if (flags & LFG_MEMBER_FLAG_UPDATE)
+        {
+            sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->RemoveFlags(LFG_MEMBER_FLAG_UPDATE);
+            playersUpdated.insert(player->GetObjectGuid());
+            guidsSize += 8;
+        }
+
+    }
+
+    WorldPacket data(SMSG_LFG_SEARCH_RESULTS, 4 + 4 + 1 + groupSize + playerSize + guidsSize);
+
+    data << uint32(dungeon->type);                           // type
+    data << uint32(dungeon->Entry());                        // entry from LFGDungeons.dbc
+
+    if (!playersUpdated.empty())
+    {
+        data << uint8(playersUpdated.size());
+        for (GuidSet::const_iterator itr = playersUpdated.begin(); itr != playersUpdated.end(); ++itr)
+        {
+            data << *itr;                                 // player guid
+        }
+    }
+    else
+        data << uint8(0);
+
+
+    if (!groups.empty())
+    {
+        data << uint32(groupCount);                          // groups count
+        data << uint32(groupCount);                          // groups count2
+
+        for (GuidSet::const_iterator itr = groups.begin(); itr != groups.end(); ++itr)
+        {
+            Group* group   = sObjectMgr.GetGroup(*itr);
+            if (!group)
+                continue;
+
+            Player* leader = sObjectMgr.GetPlayer(group->GetLeaderGuid());
+
+            uint32 flags = sLFGMgr.GetLFGPlayerState(leader->GetObjectGuid())->GetFlags();
+
+            data << group->GetObjectGuid();
+
+            data << flags;
+
+            if (flags & LFG_MEMBER_FLAG_COMMENT)
+            {
+                data << sLFGMgr.GetLFGPlayerState(leader->GetObjectGuid())->GetComment().c_str();
+            }
+
+            if (flags & LFG_MEMBER_FLAG_ROLES)
+            {
+                for (int i = 0; i < 3; ++i)
+                {
+                // need implement function for roles count calculation. or not need?
+                    data << uint8(0);
+                }
+            }
+
+            if (flags & LFG_MEMBER_FLAG_BIND)
+            {
+                ObjectGuid instanceGuid;
+                uint32 encounters = 0;
+                if (InstancePlayerBind* bind = leader->GetBoundInstance(dungeon->map, Difficulty(dungeon->difficulty)))
+                {
+                    if (DungeonPersistentState* state = bind->state)
+                    {
+                        instanceGuid = state->GetInstanceGuid();
+                        encounters = state->GetCompletedEncountersMask();
+                    }
+                }
+                data << instanceGuid;
+                data << encounters;
+            }
+        }
+    }
+    else
+    {
+        data << uint32(0);
+        data << uint32(0);                                       // groups count2
+    }
+
+
+    if (!players.empty())
+    {
+        data << uint32(playerCount);                           // players count
+        data << uint32(playerCount);                           // players count 2
+
+        for(GuidSet::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+        {
+            Player* player   = sObjectMgr.GetPlayer(*itr);
+
+            if (!player || !player->IsInWorld())
+                continue;
+
+            uint32 flags = sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->GetFlags();
+
+            data << *itr;                                         // guid
+
+            data << flags;                                        // flags
+
+            if (flags &  LFG_MEMBER_FLAG_CHARINFO)                // charinfo
+            {
+                data << uint8(player->getLevel());
+                data << uint8(player->getClass());
+                data << uint8(player->getRace());
+
+                for(int i = 0; i < 3; ++i)
+                    data << uint8(player->GetTalentsCount(i));                                      // spent talents count in specific tab
+
+                data << uint32(player->GetArmor());                                                 // armor
+                data << uint32(player->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_SPELL));          // spd
+                data << uint32(player->SpellBaseHealingBonusDone(SPELL_SCHOOL_MASK_SPELL));         // heal
+                data << uint32(player->GetRatingBonusValue(CR_CRIT_MELEE));                         // crit rating melee
+                data << uint32(player->GetRatingBonusValue(CR_CRIT_RANGED));                        // crit rating ranged
+                data << uint32(player->GetRatingBonusValue(CR_CRIT_SPELL));                         // crit rating spell
+                data << float(player->GetFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER)*5);                             // mp5
+                data << float(player->GetFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER)*5);                 // unk
+                data << uint32(player->GetTotalAttackPowerValue(BASE_ATTACK));                      // attack power
+                data << uint32(player->GetTotalStatValue(STAT_AGILITY));                            // agility
+                data << uint32(player->GetMaxHealth());                                             // health
+                data << uint32(player->GetMaxPower(player->GetPowerType()));                        // power
+                data << uint32(player->GetFreeTalentPoints());                                      // free talent points (TOM_RUS)
+                data << float(0);                                                                   // unk
+                data << uint32(player->GetRatingBonusValue(CR_DEFENSE_SKILL));                      // defence rating
+                data << uint32(player->GetRatingBonusValue(CR_DODGE));                              // dodge rating
+                data << uint32(player->GetRatingBonusValue(CR_BLOCK));                              // block rating
+                data << uint32(player->GetRatingBonusValue(CR_PARRY));                              // parry rating
+                data << uint32(player->GetRatingBonusValue(CR_HASTE_MELEE));                        // crit rating
+                data << uint32(player->GetRatingBonusValue(CR_EXPERTISE));                          // expertize
+            }
+
+            if (flags & LFG_MEMBER_FLAG_COMMENT)
+                data << sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->GetComment().c_str();         // comment
+
+            if (flags & LFG_MEMBER_FLAG_GROUPLEADER)                         // Group leader flag
+            {
+                bool isLeader = false;
+                if (Group* group = player->GetGroup())
+                    if (player->GetObjectGuid() == group->GetLeaderGuid())
+                        isLeader = true;
+
+                data << uint8(isLeader);
+            }
+
+            if (flags & LFG_MEMBER_FLAG_GROUPGUID)                          // Group guid
+            {
+                ObjectGuid groupGuid = ObjectGuid();
+                if (Group* group = player->GetGroup())
+                    groupGuid = group->GetObjectGuid();
+
+                data << groupGuid;
+            }
+
+            if (flags & LFG_MEMBER_FLAG_ROLES)                              // rolesMask
+                data << uint8(sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->GetRoles());
+
+            if (flags & LFG_MEMBER_FLAG_AREA)                               // Area
+                data << uint32(player->GetAreaId());
+
+            if (flags & LFG_MEMBER_FLAG_STATUS)                             // status
+                data << uint8(0);
+
+            if (flags & LFG_MEMBER_FLAG_BIND)
+            {
+                ObjectGuid instanceGuid;
+                uint32 encounters = 0;
+                if (InstancePlayerBind* bind = player->GetBoundInstance(dungeon->map, Difficulty(dungeon->difficulty)))
+                {
+                    if (DungeonPersistentState* state = bind->state)
+                    {
+                        instanceGuid = state->GetInstanceGuid();
+                        encounters = state->GetCompletedEncountersMask();
+                    }
+                }
+                data << instanceGuid;
+                data << encounters;
+            }
+
+        }
+    }
+    else
+    {
+        data << uint32(0);                                          // players count
+        data << uint32(0);                                          // unk
+    }
+    SendPacket(&data);
+}
+
+void WorldSession::SendLfgUpdateSearch(bool update)
+{
+    DEBUG_LOG("SMSG_LFG_UPDATE_SEARCH %u update: %u",GetPlayer()->GetObjectGuid().GetCounter(), update ? 1 : 0);
+    WorldPacket data(SMSG_LFG_UPDATE_SEARCH, 1);
+    data << uint8(update);                                  // In Lfg Queue?
+    SendPacket(&data);
+}
+
+void WorldSession::SendLfgDisabled()
+{
+    DEBUG_LOG("SMSG_LFG_DISABLED %u", GetPlayer()->GetObjectGuid().GetCounter());
+    WorldPacket data(SMSG_LFG_DISABLED, 0);
+    SendPacket(&data);
+}
+
+void WorldSession::SendLfgOfferContinue(LFGDungeonEntry const* dungeon)
+{
+    if (!dungeon)
+        return;
+
+    Group* group = GetPlayer()->GetGroup();
+    if (!group)
+        return;
+
+    DEBUG_LOG("SMSG_LFG_OFFER_CONTINUE %u dungeon entry: %u", GetPlayer()->GetObjectGuid().GetCounter(), dungeon->ID);
+    WorldPacket data(SMSG_LFG_OFFER_CONTINUE, 4);
+    data << uint32(dungeon->Entry());
+    SendPacket(&data);
+}
+
+void WorldSession::SendLfgTeleportError(LFGTeleportError msg)
+{
+    DEBUG_LOG("SMSG_LFG_TELEPORT_DENIED %u reason: %u", GetPlayer()->GetObjectGuid().GetCounter(), msg);
+    WorldPacket data(SMSG_LFG_TELEPORT_DENIED, 4);
+    data << uint32(msg);
+    SendPacket(&data);
+}
+
+void WorldSession::SendLfgPlayerReward(LFGDungeonEntry const* dungeon, const LFGReward* reward, const Quest* qRew, bool isSecond)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE))
+    {
+        DEBUG_LOG("SendLfgPlayerReward %u failed - Dungeon finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    LFGDungeonEntry const* realdungeon = NULL;
+    if (GetPlayer()->GetGroup())
+        realdungeon = sLFGMgr.GetLFGGroupState(GetPlayer()->GetGroup()->GetObjectGuid())->GetDungeon();
+    else
+    {
+        DEBUG_LOG("SendLfgPlayerReward %u failed - no Group", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    if (!dungeon || !realdungeon || !reward || !qRew)
+        return;
+
+    uint8 itemNum = uint8(qRew ? qRew->GetRewItemsCount() : 0);
+    uint8 done = uint8(isSecond);
 
-        uint32 flags = 0xFF;
-        data << uint32(flags);                              // flags
+    DEBUG_LOG("SMSG_LFG_PLAYER_REWARD %u dungeonEntry: %u ", GetPlayer()->GetObjectGuid().GetCounter(), dungeon->ID);
 
-        if (flags & 0x1)
+    WorldPacket data(SMSG_LFG_PLAYER_REWARD, 4 + 4 + 1 + 4 + 4 + 4 + 4 + 4 + 1 + itemNum * (4 + 4 + 4));
+    data << uint32(dungeon->Entry());                                            // Random Dungeon Finished
+    data << uint32(realdungeon->Entry());                                        // Dungeon Finished
+    data << uint8(done);
+    data << uint32(1);
+    data << uint32(qRew->GetRewOrReqMoney());
+    data << uint32(qRew->XPValue(GetPlayer()));
+    data << uint32(reward->reward[done].variableMoney);
+    data << uint32(reward->reward[done].variableXP);
+    data << uint8(itemNum);
+    if (itemNum)
+    {
+        ItemPrototype const* iProto = NULL;
+        for (uint8 i = 0; i < QUEST_REWARDS_COUNT; ++i)
         {
-            data << uint8(plr->getLevel());
-            data << uint8(plr->getClass());
-            data << uint8(plr->getRace());
-
-            for(uint32 i = 0; i < 3; ++i)
-                data << uint8(0);                           // talent spec x/x/x
-
-            data << uint32(0);                              // armor
-            data << uint32(0);                              // spd/heal
-            data << uint32(0);                              // spd/heal
-            data << uint32(0);                              // HasteMelee
-            data << uint32(0);                              // HasteRanged
-            data << uint32(0);                              // HasteSpell
-            data << float(0);                               // MP5
-            data << float(0);                               // MP5 Combat
-            data << uint32(0);                              // AttackPower
-            data << uint32(0);                              // Agility
-            data << uint32(0);                              // Health
-            data << uint32(0);                              // Mana
-            data << uint32(0);                              // Unk1
-            data << float(0);                               // Unk2
-            data << uint32(0);                              // Defence
-            data << uint32(0);                              // Dodge
-            data << uint32(0);                              // Block
-            data << uint32(0);                              // Parry
-            data << uint32(0);                              // Crit
-            data << uint32(0);                              // Expertise
+            if (!qRew->RewItemId[i])
+                continue;
+
+            iProto = ObjectMgr::GetItemPrototype(qRew->RewItemId[i]);
+
+            data << uint32(qRew->RewItemId[i]);
+            data << uint32(iProto ? iProto->DisplayInfoID : 0);
+            data << uint32(qRew->RewItemCount[i]);
         }
+    }
+    SendPacket(&data);
+}
+
+void WorldSession::SendLfgQueueStatus(LFGDungeonEntry const* dungeon, LFGQueueStatus* status)
+{
+    DEBUG_LOG("SMSG_LFG_QUEUE_STATUS %u dungeonEntry: %u ", GetPlayer()->GetObjectGuid().GetCounter(), dungeon->ID);
+
+    LFGQueueInfo* pqInfo = sLFGMgr.GetQueueInfo(GetPlayer()->GetObjectGuid());
 
-        if (flags & 0x2)
-            data << "";                                     // comment
+    if (GetPlayer()->GetGroup() && GetPlayer()->GetGroup()->isLFGGroup())
+        pqInfo = sLFGMgr.GetQueueInfo(GetPlayer()->GetGroup()->GetObjectGuid());
 
-        if (flags & 0x4)
-            data << uint8(0);                               // group leader
+    if (!pqInfo)
+        return;
 
-        if (flags & 0x8)
-            data << uint64(1);                              // group guid
+    WorldPacket data(SMSG_LFG_QUEUE_STATUS, 4 + 4 + 4 + 4 + 4 +4 + 1 + 1 + 1 + 4);
+    data << uint32(dungeon->ID);                                   // Dungeon
+    data << int32(status->avgWaitTime);                            // Average Wait time
+    data << int32(status->waitTime);                               // Wait Time
+    data << int32(status->waitTimeTanks);                          // Wait Tanks
+    data << int32(status->waitTimeHealer);                         // Wait Healers
+    data << int32(status->waitTimeDps);                            // Wait Dps
+    data << uint8(pqInfo->tanks);                                  // Tanks needed
+    data << uint8(pqInfo->healers);                                // Healers needed
+    data << uint8(pqInfo->dps);                                    // Dps needed
+    data << uint32(time(NULL) - pqInfo->joinTime);
+                                                                   // Player/group wait time in queue
+    SendPacket(&data);
+}
+
+void WorldSession::SendLfgRoleChosen(ObjectGuid guid, uint8 roles)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE))
+    {
+        DEBUG_LOG("SendLfgRoleChosen %u failed - Dungeon finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    DEBUG_LOG("SMSG_ROLE_CHOSEN %u guid: %u roles: %u", GetPlayer()->GetObjectGuid().GetCounter(), guid.GetCounter(), roles);
+
+    WorldPacket data(SMSG_ROLE_CHOSEN, 8 + 1 + 4);
+    data << guid;                                  // Guid
+    data << uint8(roles != LFG_ROLE_MASK_NONE);    // Ready
+    data << uint32(roles);                         // Roles
+
+    SendPacket(&data);
+}
+
+void WorldSession::SendLfgBootPlayer()
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE))
+    {
+        DEBUG_LOG("SendLfgBootPlayer %u failed - Dungeon finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+    Group* pGroup = GetPlayer()->GetGroup();
+
+    if (!pGroup)
+    {
+        sLog.outError("ERROR:SendLfgBootPlayer %s failed - player not in group!", GetPlayer()->GetObjectGuid().GetString().c_str());
+        return;
+    }
 
-        if (flags & 0x10)
-            data << uint8(0);                               // roles
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+    LFGAnswerMap* votes = sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetBootMap();
+
+    if (votes->empty())
+    {
+        sLog.outError("ERROR:SendLfgBootPlayer %s failed - votes map is empty!", GetPlayer()->GetObjectGuid().GetString().c_str());
+        return;
+    }
+
+    LFGAnswerMap::const_iterator votesitr = votes->find(guid);
+    if (votesitr == votes->end())
+    {
+        sLog.outError("ERROR:SendLfgBootPlayer %s failed - votes map not contain this player! Possible cheating.", GetPlayer()->GetObjectGuid().GetString().c_str());
+        return;
+    }
 
-        if (flags & 0x20)
-            data << uint32(plr->GetZoneId());               // areaid
+    LFGAnswer playerVote = votesitr->second;
+    uint8 votesNum = 0;
+    uint8 agreeNum = 0;
+    uint32 secsleft = uint8(sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetBootCancelTime() - time(NULL));
 
-        if (flags & 0x40)
-            data << uint8(0);                               // status
+    bool isBootContinued = (sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetBootResult() == LFG_ANSWER_PENDING);
 
-        if (flags & 0x80)
+    for (LFGAnswerMap::const_iterator itr = votes->begin(); itr != votes->end(); ++itr)
+    {
+        if (itr->second != LFG_ANSWER_PENDING)
         {
-            data << uint64(0);                              // instance guid
-            data << uint32(0);                              // completed encounters
+            ++votesNum;
+            if (itr->second == LFG_ANSWER_AGREE)
+                ++agreeNum;
         }
     }
 
+    DEBUG_LOG("SMSG_LFG_BOOT_PLAYER %u   didVote: %u - agree: %u - victim: %u votes: %u - agrees: %u - left: %u - needed: %u - reason %s",
+    GetPlayer()->GetObjectGuid().GetCounter(), uint8(playerVote != LFG_ANSWER_PENDING), uint8(playerVote == LFG_ANSWER_AGREE), sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetBootVictim().GetCounter(), votesNum, agreeNum, secsleft, sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetVotesNeeded(), sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetBootReason().c_str());
+    WorldPacket data(SMSG_LFG_BOOT_PLAYER, 1 + 1 + 1 + 8 + 4 + 4 + 4 + 4 + sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetBootReason().length()+1);
+    data << uint8(isBootContinued);                           // Vote in progress
+    data << uint8(playerVote != LFG_ANSWER_PENDING);          // Did Vote
+    data << uint8(playerVote == LFG_ANSWER_AGREE);            // Agree
+    data << sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetBootVictim();      // Victim GUID
+    data << uint32(votesNum);                                 // Total Votes
+    data << uint32(agreeNum);                                 // Agree Count
+    data << uint32(secsleft);                                 // Time Left
+    data << uint32(sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetVotesNeeded());   // Needed Votes
+    data << sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetBootReason().c_str();    // Kick reason
     SendPacket(&data);
 }
 
-void WorldSession::SendLfgJoinResult(LfgJoinResult result)
+void WorldSession::SendLfgUpdateProposal(LFGProposal* pProposal)
 {
-    WorldPacket data(SMSG_LFG_JOIN_RESULT, 0);
-    data << uint32(result);
-    data << uint32(0); // ERR_LFG_ROLE_CHECK_FAILED_TIMEOUT = 3, ERR_LFG_ROLE_CHECK_FAILED_NOT_VIABLE = (value - 3 == result)
+    if (!sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE))
+    {
+        DEBUG_LOG("SendLfgUpdateProposal %u failed - Dungeon finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    if (!pProposal)
+        return;
+
+    LFGDungeonEntry const* dungeon = pProposal->GetDungeon();
+    if (!dungeon)
+    {
+        DEBUG_LOG("SMSG_LFG_PROPOSAL_UPDATE: no dungeon in proposal %u, returning.", pProposal->m_uiID);
+        return;
+    }
+
+    ObjectGuid guid = GetPlayer()->GetObjectGuid();
+
+    bool isSameDungeon = false;
+    bool isSameGroup   = false;
 
-    if(result == ERR_LFG_NO_SLOTS_PARTY)
+    uint32 completedEncounters = 0;
+    LFGRolesMap rolesMap;
+
+    if (Group* group = pProposal->GetGroup())
     {
-        uint8 count1 = 0;
-        data << uint8(count1);                              // players count?
-        for(uint32 i = 0; i < count1; ++i)
+        for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
         {
-            data << uint64(0);                              // player guid?
-            uint32 count2 = 0;
-            for(uint32 j = 0; j < count2; ++j)
+            Player* pGroupMember = itr->getSource();
+            if (pGroupMember && pGroupMember->IsInWorld())
             {
-                data << uint32(0);                          // dungeon id/type
-                data << uint32(0);                          // lock status?
+                rolesMap.insert(std::make_pair(pGroupMember->GetObjectGuid(), sLFGMgr.GetLFGPlayerState( pGroupMember->GetObjectGuid())->GetRoles()));
+
+                if (InstancePlayerBind* bind = pGroupMember->GetBoundInstance(dungeon->map, Difficulty(dungeon->difficulty)))
+                {
+                    if (DungeonPersistentState* state = bind->state)
+                        completedEncounters |= state->GetCompletedEncountersMask();
+                }
             }
         }
+
+        // isContinue = group->isLFGGroup() && sLFGMgr->GetState(gguid) != LFG_STATE_FINISHED_DUNGEON;
+        isSameDungeon =  dungeon->map == GetPlayer()->GetMapId();
+        isSameGroup   =  GetPlayer()->GetGroup() == group;
+    }
+
+    GuidSet const proposalGuids = pProposal->GetMembers();
+    if (!proposalGuids.empty())
+    {
+        for (GuidSet::const_iterator itr = proposalGuids.begin(); itr != proposalGuids.end(); ++itr)
+        {
+            Player* player = sObjectMgr.GetPlayer(*itr);
+            if (player && player->IsInWorld())
+                rolesMap.insert(std::make_pair(player->GetObjectGuid(), sLFGMgr.GetLFGPlayerState(player->GetObjectGuid())->GetRoles()));
+        }
     }
 
+    uint32 size = rolesMap.size();
+
+    DEBUG_LOG("SMSG_LFG_PROPOSAL_UPDATE proposal %u, player %u, state: %u", pProposal->m_uiID, GetPlayer()->GetObjectGuid().GetCounter(), pProposal->GetState());
+
+
+    WorldPacket data(SMSG_LFG_PROPOSAL_UPDATE, 4 + 1 + 4 + 4 + 1 + 1 + size * (4 + 1 + 1 + 1 + 1 +1));
+
+    data << uint32(dungeon->Entry());                          // Dungeon
+    data << uint8(pProposal->GetState());                      // Result state
+    data << uint32(pProposal->m_uiID);                         // Internal Proposal ID
+    data << uint32(completedEncounters);                       // Bosses killed
+    data << uint8(isSameDungeon);                              // Silent (show client window)
+    data << uint8(size);                                       // Group size
+
+    for (LFGRolesMap::const_iterator itr = rolesMap.begin(); itr != rolesMap.end(); ++itr)
+    {
+        Player* pPlayer = sObjectMgr.GetPlayer(itr->first);
+        if (!pPlayer)
+            continue;
+
+        isSameDungeon =  dungeon->map == pPlayer->GetMapId();
+        isSameGroup   =  pPlayer->GetGroup() == pProposal->GetGroup();
+
+        data << uint32(itr->second);                              // Role
+        data << uint8(pPlayer->GetObjectGuid() == guid);          // Self player
+        data << uint8(isSameDungeon);                             // Not in dungeon
+        data << uint8(isSameGroup);                               // Not same group
+        data << uint8(sLFGMgr.GetLFGPlayerState(pPlayer->GetObjectGuid())->GetAnswer() != LFG_ANSWER_PENDING); // Answered
+        data << uint8(sLFGMgr.GetLFGPlayerState(pPlayer->GetObjectGuid())->GetAnswer() == LFG_ANSWER_AGREE); // Accepted
+    }
     SendPacket(&data);
 }
 
-void WorldSession::SendLfgUpdate(bool isGroup, LfgUpdateType updateType, uint32 id)
+void WorldSession::SendLfgRoleCheckUpdate()
 {
-    WorldPacket data(isGroup ? SMSG_LFG_UPDATE_PARTY : SMSG_LFG_UPDATE_PLAYER, 0);
-    data << uint8(updateType);
+    if (!sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE))
+    {
+        DEBUG_LOG("SendLfgRoleCheckUpdate %u failed - Dungeon finder disabled", GetPlayer()->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    Group* pGroup = GetPlayer()->GetGroup();
 
-    uint8 extra = updateType == LFG_UPDATE_JOIN ? 1 : 0;
-    data << uint8(extra);
+    if (!pGroup)
+        return;
 
-    if(extra)
+    LFGDungeonSet const* dungeons = sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeons();
+
+    if (!dungeons)
+        return;
+
+    DEBUG_LOG("SMSG_LFG_ROLE_CHECK_UPDATE %u, dugeons size " SIZEFMTD, GetPlayer()->GetObjectGuid().GetCounter(), dungeons->size());
+
+    WorldPacket data(SMSG_LFG_ROLE_CHECK_UPDATE, 4 + 1 + 1 + dungeons->size() * 4 + 1 + pGroup->GetMembersCount() * (8 + 1 + 4 + 1));
+
+    data << uint32(sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetRoleCheckState());                     // Check result
+    data << uint8(sLFGMgr.GetLFGGroupState(pGroup->GetObjectGuid())->GetRoleCheckState() == LFG_ROLECHECK_INITIALITING);
+    data << uint8(dungeons->size());                                               // Number of dungeons
+
+    if (dungeons->size())
     {
-        data << uint8(0);
-        data << uint8(0);
-        data << uint8(0);
+        for (LFGDungeonSet::const_iterator itr = dungeons->begin(); itr != dungeons->end(); ++itr)
+        {
+            data << uint32(*itr ? (*itr)->Entry() : 0); // Dungeon Entry
+        }
+    }
 
-        if(isGroup)
+    data << uint8(pGroup->GetMembersCount());               // Players in group
+    if (pGroup->GetMembersCount())
+    {
+        // Leader info MUST be sent 1st :S
+        ObjectGuid leaderguid = pGroup->GetLeaderGuid();
+        Player* pLeader = sObjectMgr.GetPlayer(leaderguid);
+        LFGRoleMask roles = LFG_ROLE_MASK_NONE;
+        uint8 leaderLevel = 1;
+        if (pLeader)
         {
-            data << uint8(0);
-            for(uint32 i = 0; i < 3; ++i)
-                data << uint8(0);
+            roles = sLFGMgr.GetLFGPlayerState(pLeader->GetObjectGuid())->GetRoles();
+            leaderLevel = pLeader->getLevel();
         }
+        data << leaderguid;                                                  // Guid
+        data << uint8(roles != LFG_ROLE_MASK_NONE);                          // Ready
+        data << uint32(roles);                                               // Roles
+        data << uint8(leaderLevel);                                          // Level
+
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            if (Player* pGroupMember = itr->getSource())
+            {
+                ObjectGuid guid = pGroupMember->GetObjectGuid();
+                // Leader data handle first
+                if (guid == leaderguid)
+                    continue;
 
-        uint8 count = 1;
-        data << uint8(count);
-        for(uint32 i = 0; i < count; ++i)
-            data << uint32(id);
-        data << "";
+                roles = sLFGMgr.GetLFGPlayerState( pGroupMember->GetObjectGuid())->GetRoles();
+                data << guid;                                                    // Guid
+                data << uint8(roles != LFG_ROLE_MASK_NONE);                      // Ready
+                data << uint32(roles);                                           // Roles
+                data << uint8(pGroupMember->getLevel());                         // Level
+            }
+        }
     }
     SendPacket(&data);
 }
diff --git a/src/game/LFGMgr.cpp b/src/game/LFGMgr.cpp
new file mode 100644
index 00000000000..a81cd38f74e
--- /dev/null
+++ b/src/game/LFGMgr.cpp
@@ -0,0 +1,3262 @@
+/*
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Common.h"
+#include "Policies/Singleton.h"
+#include "SharedDefines.h"
+#include "ObjectMgr.h"
+#include "ProgressBar.h"
+#include "SocialMgr.h"
+#include "LFGMgr.h"
+#include "World.h"
+#include "Group.h"
+#include "Player.h"
+#include "GameEventMgr.h"
+
+#include <limits>
+
+INSTANTIATE_SINGLETON_1(LFGMgr);
+
+LFGMgr::LFGMgr()
+{
+    for (uint32 i = 0; i < sLFGDungeonStore.GetNumRows(); ++i)
+    {
+        if (LFGDungeonEntry const* dungeon = sLFGDungeonStore.LookupEntry(i))
+        {
+            m_dungeonMap.insert(std::make_pair(dungeon->ID, dungeon));
+        }
+    }
+
+    m_proposalID   = 1;
+    m_queueID      = 1;
+    m_LFGupdateTimer.SetInterval(LFG_UPDATE_INTERVAL);
+    m_LFGupdateTimer.Reset();
+    m_LFRupdateTimer.SetInterval(LFR_UPDATE_INTERVAL);
+    m_LFRupdateTimer.Reset();
+    m_LFGQueueUpdateTimer.SetInterval(LFG_QUEUEUPDATE_INTERVAL);
+    m_LFGQueueUpdateTimer.Reset();
+}
+
+LFGMgr::~LFGMgr()
+{
+    m_RewardMap.clear();
+    for (uint8 i = LFG_TYPE_NONE; i < LFG_TYPE_MAX; ++i)
+    {
+        m_playerQueue[i].clear();
+        m_groupQueue[i].clear();
+    }
+    m_queueInfoMap.clear();
+    m_dungeonMap.clear();
+    m_proposalMap.clear();
+    m_searchMatrix.clear();
+    m_eventList.clear();
+
+    for (LFGStatesMap::iterator itr = m_statesMap.begin(); itr != m_statesMap.end(); ++itr)
+        delete itr->second;
+}
+
+void LFGMgr::Update(uint32 uiDiff)
+{
+    SheduleEvent();
+
+    if (m_queueInfoMap.empty())
+        return;
+
+    bool isFullUpdate = false;
+    bool isLFRUpdate  = false;
+    bool isStatUpdate = false;
+
+    m_LFGupdateTimer.Update(uiDiff);
+    m_LFRupdateTimer.Update(uiDiff);
+    m_LFGQueueUpdateTimer.Update(uiDiff);
+
+    if (m_LFGupdateTimer.Passed())
+    {
+        isFullUpdate = true;
+        m_LFGupdateTimer.Reset();
+    }
+
+    if (m_LFRupdateTimer.Passed())
+    {
+        isLFRUpdate = true;
+        m_LFRupdateTimer.Reset();
+    }
+
+    if (m_LFGQueueUpdateTimer.Passed())
+    {
+        isStatUpdate = true;
+        m_LFGQueueUpdateTimer.Reset();
+    }
+
+    if (isFullUpdate)
+    {
+        CleanupSearchMatrix();
+    }
+
+    for (uint8 i = LFG_TYPE_NONE; i < LFG_TYPE_MAX; ++i)
+    {
+
+//        DEBUG_LOG("LFGMgr::Update type %u, player queue %u group queue %u",i,m_playerQueue[i].size(), m_groupQueue[i].size());
+        if (m_playerQueue[i].empty() && m_groupQueue[i].empty())
+            continue;
+
+        LFGType type = LFGType(i);
+        switch (type)
+        {
+            case LFG_TYPE_DUNGEON:
+            case LFG_TYPE_QUEST:
+            case LFG_TYPE_ZONE:
+            case LFG_TYPE_HEROIC_DUNGEON:
+            case LFG_TYPE_RANDOM_DUNGEON:
+            {
+                TryCompleteGroups(type);
+                TryCreateGroup(type);
+                if (isFullUpdate)
+                {
+                    CleanupProposals(type);
+                    CleanupRoleChecks(type);
+                    CleanupBoots(type);
+                    UpdateQueueStatus(type);
+                }
+                if (isStatUpdate)
+                {
+                    SendStatistic(type);
+                }
+                break;
+            }
+            case LFG_TYPE_RAID:
+            {
+                if (sWorld.getConfig(CONFIG_BOOL_LFR_EXTEND) && isLFRUpdate)
+                {
+                    UpdateLFRGroups();
+                }
+                break;
+            }
+            case LFG_TYPE_NONE:
+            case LFG_TYPE_MAX:
+            default:
+                sLog.outError("LFGMgr: impossible dungeon type in queue!");
+                break;
+        }
+    }
+}
+
+void LFGMgr::LoadRewards()
+{
+   // (c) TrinityCore, 2010. Rewrited for MaNGOS by /dev/rsa
+
+    m_RewardMap.clear();
+
+    uint32 count = 0;
+    // ORDER BY is very important for GetRandomDungeonReward!
+    QueryResult* result = WorldDatabase.Query("SELECT dungeonId, maxLevel, firstQuestId, firstMoneyVar, firstXPVar, otherQuestId, otherMoneyVar, otherXPVar FROM lfg_dungeon_rewards ORDER BY dungeonId, maxLevel ASC");
+
+    if (!result)
+    {
+        BarGoLink bar(1);
+        bar.step();
+
+        sLog.outString();
+        sLog.outErrorDb(">> Loaded 0 LFG dungeon rewards. DB table `lfg_dungeon_rewards` is empty!");
+        return;
+    }
+
+    BarGoLink bar(result->GetRowCount());
+
+    Field* fields = NULL;
+    do
+    {
+        bar.step();
+        fields = result->Fetch();
+        uint32 dungeonId = fields[0].GetUInt32();
+        uint32 maxLevel = fields[1].GetUInt8();
+        uint32 firstQuestId = fields[2].GetUInt32();
+        uint32 firstMoneyVar = fields[3].GetUInt32();
+        uint32 firstXPVar = fields[4].GetUInt32();
+        uint32 otherQuestId = fields[5].GetUInt32();
+        uint32 otherMoneyVar = fields[6].GetUInt32();
+        uint32 otherXPVar = fields[7].GetUInt32();
+
+        if (!sLFGDungeonStore.LookupEntry(dungeonId))
+        {
+            sLog.outErrorDb("LFGMgr: Dungeon %u specified in table `lfg_dungeon_rewards` does not exist!", dungeonId);
+            continue;
+        }
+
+        if (!maxLevel || maxLevel > sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
+        {
+            sLog.outErrorDb("LFGMgr: Level %u specified for dungeon %u in table `lfg_dungeon_rewards` can never be reached!", maxLevel, dungeonId);
+            maxLevel = sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL);
+        }
+
+        if (firstQuestId && !sObjectMgr.GetQuestTemplate(firstQuestId))
+        {
+            sLog.outErrorDb("LFGMgr: First quest %u specified for dungeon %u in table `lfg_dungeon_rewards` does not exist!", firstQuestId, dungeonId);
+            firstQuestId = 0;
+        }
+
+        if (otherQuestId && !sObjectMgr.GetQuestTemplate(otherQuestId))
+        {
+            sLog.outErrorDb("LFGMgr: Other quest %u specified for dungeon %u in table `lfg_dungeon_rewards` does not exist!", otherQuestId, dungeonId);
+            otherQuestId = 0;
+        }
+        LFGReward reward = LFGReward(maxLevel, firstQuestId, firstMoneyVar, firstXPVar, otherQuestId, otherMoneyVar, otherXPVar);
+        m_RewardMap.insert(LFGRewardMap::value_type(dungeonId, reward));
+        ++count;
+    }
+    while (result->NextRow());
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u LFG dungeon rewards.", count);
+}
+
+LFGReward const* LFGMgr::GetRandomDungeonReward(LFGDungeonEntry const* dungeon, Player* pPlayer)
+{
+    LFGReward const* rew = NULL;
+    if (pPlayer)
+    {
+        LFGRewardMapBounds bounds = m_RewardMap.equal_range(dungeon->ID);
+        for (LFGRewardMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+        {
+            // Difficulty check TODO
+            rew = &itr->second;
+            // ordered properly at loading
+            if (itr->second.maxLevel >= pPlayer->getLevel())
+                break;
+        }
+    }
+    return rew;
+}
+
+bool LFGMgr::IsRandomDungeon(LFGDungeonEntry const*  dungeon)
+{
+    if (!dungeon)
+        return false;
+
+    return dungeon->type == LFG_TYPE_RANDOM_DUNGEON;
+}
+
+bool LFGMgr::CheckWorldEvent(LFGDungeonEntry const* dungeon)
+{
+    switch (dungeon->ID)
+    {
+        case 288:                   // Apothecary Hummel <Crown Chemical Co.>
+            return sGameEventMgr.IsActiveHoliday(HOLIDAY_LOVE_IS_IN_THE_AIR);
+        case 287:                   // Coren Direbrew
+            return sGameEventMgr.IsActiveHoliday(HOLIDAY_BREWFEST);
+        case 286:                   // Ahune <The Frost Lord>
+            return sGameEventMgr.IsActiveHoliday(HOLIDAY_FIRE_FESTIVAL);
+        case 285:                   // Headless Horseman
+            return sGameEventMgr.IsActiveHoliday(HOLIDAY_HALLOWS_END);
+        default:
+            break;
+    }
+    return false;
+}
+
+void LFGMgr::Join(Player* pPlayer)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE) && !sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE))
+        return;
+
+    ObjectGuid guid = pPlayer->GetObjectGuid();;
+    Group* group = pPlayer->GetGroup();
+
+    if (group)
+    {
+        if (pPlayer->GetObjectGuid() != group->GetLeaderGuid() && GetLFGGroupState(group->GetObjectGuid())->GetStatus() != LFG_STATUS_OFFER_CONTINUE)
+        {
+            DEBUG_LOG("LFGMgr::Join: %u trying to join in group, but not group leader, and not in OfferContinue. Aborting.", guid.GetCounter());
+            pPlayer->GetSession()->SendLfgJoinResult(ERR_LFG_NO_SLOTS_PLAYER);
+            return;
+        }
+        else
+            guid = group->GetObjectGuid();
+    }
+
+    if (guid.IsEmpty())
+        return;
+
+    LFGType type = GetLFGPlayerState(pPlayer->GetObjectGuid())->GetType();
+
+    if (type == LFG_TYPE_NONE)
+    {
+        DEBUG_LOG("LFGMgr::Join: %u trying to join without dungeon type. Aborting.", guid.GetCounter());
+        pPlayer->GetSession()->SendLfgJoinResult(ERR_LFG_INVALID_SLOT);
+        return;
+    }
+
+    LFGQueueInfo* queue = GetQueueInfo(guid);
+
+    if (queue)
+    {
+        DEBUG_LOG("LFGMgr::Join: %u trying to join but is already in queue! May be OfferContinue?", guid.GetCounter());
+        if (group && GetLFGGroupState(group->GetObjectGuid())->GetState() == LFG_STATE_DUNGEON)
+        {
+            RemoveFromQueue(guid);
+        }
+        else
+        {
+            pPlayer->GetSession()->SendLfgJoinResult(ERR_LFG_NO_LFG_OBJECT);
+            RemoveFromQueue(guid);
+            return;
+        }
+    }
+
+    LFGJoinResult result = guid.IsGroup() ? GetGroupJoinResult(group) : GetPlayerJoinResult(pPlayer);
+
+    if (result != ERR_LFG_OK)                              // Someone can't join. Clear all stuf
+    {
+        DEBUG_LOG("LFGMgr::Join: %s %u joining with %u members. result: %u", guid.IsGroup() ? "Group" : "Player", guid.GetCounter(), group ? group->GetMembersCount() : 1, result);
+        GetLFGPlayerState(pPlayer->GetObjectGuid())->Clear();
+        pPlayer->GetSession()->SendLfgJoinResult(result);
+        if (pPlayer->GetGroup())
+            pPlayer->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_ROLECHECK_FAILED, type);
+        return;
+    }
+
+    if (!guid.IsGroup() && GetLFGPlayerState(pPlayer->GetObjectGuid())->GetRoles() == LFG_ROLE_MASK_NONE)
+    {
+        DEBUG_LOG("LFGMgr::Join:Error: %u has no roles! continued...", guid.GetCounter());
+    }
+
+
+    // Joining process
+    GetLFGPlayerState(pPlayer->GetObjectGuid())->SetJoined();
+
+    if (guid.IsGroup())
+    {
+        switch (GetLFGGroupState(group->GetObjectGuid())->GetState())
+        {
+            case LFG_STATE_NONE:
+            case LFG_STATE_FINISHED_DUNGEON:
+            {
+                RemoveFromQueue(guid);
+                AddToQueue(guid, type, false);
+                GetLFGGroupState(group->GetObjectGuid())->SetState((type == LFG_TYPE_RAID) ? LFG_STATE_LFR : LFG_STATE_LFG);
+                GetLFGGroupState(group->GetObjectGuid())->SetStatus(LFG_STATUS_NOT_SAVED);
+
+                for (GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+                {
+                    Player* pGroupMember = itr->getSource();
+                    if (pGroupMember && pGroupMember->IsInWorld())
+                    {
+                        RemoveFromQueue(pGroupMember->GetObjectGuid());
+                        if (sWorld.getConfig(CONFIG_BOOL_RESTRICTED_LFG_CHANNEL))
+                            pGroupMember->JoinLFGChannel();
+                        pGroupMember->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_JOIN_PROPOSAL, type);
+                        GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetState((type == LFG_TYPE_RAID) ? LFG_STATE_LFR : LFG_STATE_LFG);
+                    }
+                }
+                if (type == LFG_TYPE_RAID && sWorld.getConfig(CONFIG_BOOL_LFR_EXTEND))
+                {
+                    group->ConvertToLFG(type);
+                }
+                else
+                {
+                    StartRoleCheck(group);
+                }
+                break;
+            }
+            // re-adding to queue
+            case LFG_STATE_DUNGEON:
+            {
+                AddToQueue(guid, type, true);
+                if (type == LFG_TYPE_RAID)
+                    break;
+                for (GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+                {
+                    Player* pGroupMember = itr->getSource();
+                    if (pGroupMember && pGroupMember->IsInWorld())
+                    {
+                        if (sWorld.getConfig(CONFIG_BOOL_RESTRICTED_LFG_CHANNEL))
+                            pGroupMember->JoinLFGChannel();
+                        pGroupMember->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_JOIN_PROPOSAL, type);
+                        GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetState(LFG_STATE_LFG);
+                    }
+                }
+                GetLFGGroupState(group->GetObjectGuid())->SetStatus(LFG_STATUS_NOT_SAVED);
+                StartRoleCheck(group);
+                break;
+            }
+            default:
+                DEBUG_LOG("LFGMgr::Join:Error: group %u in impossible state %u for join.", guid.GetCounter(), GetLFGGroupState(group->GetObjectGuid())->GetState());
+                return;
+        }
+    }
+    else
+    {
+        RemoveFromQueue(guid);
+        AddToQueue(guid, type, false);
+        AddToSearchMatrix(guid);
+        GetLFGPlayerState(pPlayer->GetObjectGuid())->SetState((type == LFG_TYPE_RAID) ? LFG_STATE_LFR : LFG_STATE_QUEUED);
+        pPlayer->GetSession()->SendLfgJoinResult(result, LFG_ROLECHECK_NONE);
+        pPlayer->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_JOIN_PROPOSAL,type);
+        pPlayer->GetSession()->SendLfgUpdateSearch(true);
+    }
+    pPlayer->GetSession()->SendLfgUpdateSearch(true);
+}
+
+void LFGMgr::Leave(Group* group)
+{
+    if (!group)
+        return;
+
+    Player* leader = sObjectMgr.GetPlayer(group->GetLeaderGuid());
+
+    if (!leader)
+        return;
+
+    Leave(leader);
+}
+
+void LFGMgr::Leave(Player* pPlayer)
+{
+
+    if (!sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE) && !sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE))
+        return;
+
+    ObjectGuid guid;
+    Group* group = pPlayer->GetGroup();
+
+    LFGType type;
+    if (group)
+    {
+        if (pPlayer->GetObjectGuid() != group->GetLeaderGuid())
+            return;
+        else
+            guid = group->GetObjectGuid();
+    }
+    else
+        guid = pPlayer->GetObjectGuid();
+
+    if (guid.IsEmpty())
+        return;
+
+    RemoveFromQueue(guid);
+    RemoveFromSearchMatrix(guid);
+
+    if (group)
+    {
+        if (GetLFGGroupState(group->GetObjectGuid())->GetState() == LFG_STATE_ROLECHECK)
+        {
+            GetLFGGroupState(group->GetObjectGuid())->SetRoleCheckState(LFG_ROLECHECK_ABORTED);
+            for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+            {
+                Player* pGroupMember = itr->getSource();
+                if (pGroupMember && pGroupMember->IsInWorld())
+                {
+                    pGroupMember->GetSession()->SendLfgRoleCheckUpdate();
+                }
+            }
+        }
+        else if (GetLFGGroupState(group->GetObjectGuid())->GetState() == LFG_STATE_PROPOSAL)
+        {
+            LFGProposal* pProposal = GetLFGGroupState(group->GetObjectGuid())->GetProposal();
+            if (pProposal)
+                pProposal->SetDeleted();
+        }
+
+        type = GetLFGGroupState(group->GetObjectGuid())->GetType();
+        for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* pGroupMember = itr->getSource();
+            if (pGroupMember && pGroupMember->IsInWorld())
+            {
+                    pGroupMember->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_REMOVED_FROM_QUEUE, type);
+                    RemoveFromQueue(pGroupMember->GetObjectGuid());
+                    RemoveFromSearchMatrix(pGroupMember->GetObjectGuid());
+                    if (sWorld.getConfig(CONFIG_BOOL_RESTRICTED_LFG_CHANNEL) && pGroupMember->GetSession()->GetSecurity() == SEC_PLAYER)
+                        pGroupMember->LeaveLFGChannel();
+                    GetLFGPlayerState(pGroupMember->GetObjectGuid())->Clear();
+            }
+        }
+        GetLFGGroupState(group->GetObjectGuid())->Clear();
+    }
+    else
+    {
+        type = GetLFGPlayerState(pPlayer->GetObjectGuid())->GetType();
+        pPlayer->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_REMOVED_FROM_QUEUE, type);
+        GetLFGPlayerState(pPlayer->GetObjectGuid())->Clear();
+        if (sWorld.getConfig(CONFIG_BOOL_RESTRICTED_LFG_CHANNEL) && pPlayer->GetSession()->GetSecurity() == SEC_PLAYER)
+            pPlayer->LeaveLFGChannel();
+    }
+    pPlayer->GetSession()->SendLfgUpdateSearch(false);
+}
+
+LFGQueueInfo* LFGMgr::GetQueueInfo(ObjectGuid guid)
+{
+    LFGQueueInfoMap::iterator queue = m_queueInfoMap.find(guid);
+    if (queue == m_queueInfoMap.end())
+        return NULL;
+    else
+        return &queue->second;
+}
+
+void LFGMgr::AddToQueue(ObjectGuid guid, LFGType type, bool inBegin)
+{
+    // we need a guid (group or player)
+    if (guid.IsEmpty())
+        return;
+
+    // we doesn't add something without a valid type
+    if (type == LFG_TYPE_NONE)
+        return;
+
+    // Delete old LFGQueueInfo
+    RemoveFromQueue(guid);
+
+    // Joining process
+    {
+        m_queueInfoMap.insert(std::make_pair(guid, LFGQueueInfo(guid, type, GenerateQueueID())));
+    }
+    // we must be save, that we add this info in Queue
+    LFGQueueInfo* pqInfo = GetQueueInfo(guid);
+    MANGOS_ASSERT(pqInfo);
+
+    pqInfo->tanks   = LFG_TANKS_NEEDED;
+    pqInfo->healers = LFG_HEALERS_NEEDED ;
+    pqInfo->dps     = LFG_DPS_NEEDED ;
+
+    if (guid.IsGroup())
+    {
+        Group* pGroup = sObjectMgr.GetGroup(guid);
+        MANGOS_ASSERT(pGroup);
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* pGroupMember = itr->getSource();
+            if (pGroupMember && pGroupMember->IsInWorld())
+            {
+                LFGPlayerState* pGroupMemberState = GetLFGPlayerState(pGroupMember->GetObjectGuid());
+                if (pGroupMemberState->HasRole(ROLE_TANK) && pqInfo->tanks > 0)
+                    pqInfo->tanks -= 1;
+                else if (pGroupMemberState->HasRole(ROLE_HEALER) && pqInfo->healers > 0)
+                    pqInfo->healers -= 1;
+                else if (pGroupMemberState->HasRole(ROLE_DAMAGE) && pqInfo->dps > 0)
+                    pqInfo->dps -= 1;
+            }
+        }
+        m_groupQueue[type].insert((inBegin ? m_groupQueue[type].begin() : m_groupQueue[type].end()), pqInfo);
+    }
+    else
+    {
+        Player* pPlayer = sObjectMgr.GetPlayer(guid);
+        MANGOS_ASSERT(pPlayer);
+        LFGPlayerState* pPlayerState = GetLFGPlayerState(pPlayer->GetObjectGuid());
+        if (pPlayerState->HasRole(ROLE_TANK) && pqInfo->tanks > 0)
+            pqInfo->tanks -= 1;
+        else if (pPlayerState->HasRole(ROLE_HEALER) && pqInfo->healers > 0)
+            pqInfo->healers -= 1;
+        else if (pPlayerState->HasRole(ROLE_DAMAGE) && pqInfo->dps > 0)
+            pqInfo->dps -= 1;
+
+        m_playerQueue[type].insert((inBegin ? m_playerQueue[type].begin() : m_playerQueue[type].end()), pqInfo);
+    }
+    DEBUG_LOG("LFGMgr::AddToQueue: %s %u joined, type %u",(guid.IsGroup() ? "group" : "player"), guid.GetCounter(), type);
+}
+
+void LFGMgr::RemoveFromQueue(ObjectGuid guid)
+{
+    if (LFGQueueInfo* pqInfo = GetQueueInfo(guid))
+    {
+        LFGType type = pqInfo->GetDungeonType();
+
+        DEBUG_LOG("LFGMgr::RemoveFromQueue: %s %u removed, type %u",(guid.IsGroup() ? "group" : "player"), guid.GetCounter(), type);
+
+        if (guid.IsGroup())
+        {
+            if (m_groupQueue[type].find(pqInfo) != m_groupQueue[type].end())
+                m_groupQueue[type].erase(pqInfo);
+        }
+        else
+        {
+            if (m_playerQueue[type].find(pqInfo) != m_playerQueue[type].end())
+                m_playerQueue[type].erase(pqInfo);
+        }
+        m_queueInfoMap.erase(guid);
+    }
+}
+
+LFGJoinResult LFGMgr::GetPlayerJoinResult(Player* pPlayer)
+{
+
+   if (pPlayer->InBattleGround() || pPlayer->InArena() || pPlayer->InBattleGroundQueue())
+        return ERR_LFG_CANT_USE_DUNGEONS;
+
+   if (pPlayer->HasAura(LFG_SPELL_DUNGEON_DESERTER))
+        return  ERR_LFG_DESERTER_PLAYER;
+
+    if (pPlayer->HasAura(LFG_SPELL_DUNGEON_COOLDOWN)
+        && (!pPlayer->GetGroup() || GetLFGGroupState(pPlayer->GetGroup()->GetObjectGuid())->GetStatus() != LFG_STATUS_OFFER_CONTINUE))
+        return ERR_LFG_RANDOM_COOLDOWN_PLAYER;
+
+    LFGDungeonSet const* dungeons = GetLFGPlayerState(pPlayer->GetObjectGuid())->GetDungeons();
+
+    // TODO - Check if all dungeons are valid
+
+    // must be last check - ignored in party
+    if (!dungeons || !dungeons->size())
+        return ERR_LFG_INVALID_SLOT;
+
+    return ERR_LFG_OK;
+}
+
+LFGJoinResult LFGMgr::GetGroupJoinResult(Group* group)
+{
+    if (!group)
+        return ERR_LFG_GET_INFO_TIMEOUT;
+
+    if (!group->isRaidGroup() && (group->GetMembersCount() > MAX_GROUP_SIZE))
+        return ERR_LFG_TOO_MANY_MEMBERS;
+
+    if (group->isRaidGroup() && GetLFGGroupState(group->GetObjectGuid())->GetType() != LFG_TYPE_RAID)
+    {
+        DEBUG_LOG("LFGMgr::GetGroupJoinResult: Group %u trying to join as raid, but not to raid finder. Aborting.", group->GetObjectGuid().GetCounter());
+        return ERR_LFG_MISMATCHED_SLOTS;
+    }
+
+    for (GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        Player* pGroupMember = itr->getSource();
+
+        if (!pGroupMember->IsInWorld())
+            return ERR_LFG_MEMBERS_NOT_PRESENT;
+
+        LFGJoinResult result = GetPlayerJoinResult(pGroupMember);
+
+        if (result == ERR_LFG_INVALID_SLOT)
+            continue;
+
+        if (result != ERR_LFG_OK)
+            return result;
+    }
+
+    return ERR_LFG_OK;
+}
+
+LFGLockStatusMap LFGMgr::GetPlayerLockMap(Player* pPlayer)
+{
+    LFGLockStatusMap tmpMap;
+    tmpMap.clear();
+
+    if (!pPlayer)
+        return tmpMap;
+
+    for (uint32 i = 1; i < sLFGDungeonStore.GetNumRows(); ++i)
+    {
+        if (LFGDungeonEntry const* entry = sLFGDungeonStore.LookupEntry(i))
+            if (LFGLockStatusType status = GetPlayerLockStatus(pPlayer, entry))
+                if (status != LFG_LOCKSTATUS_OK)
+                    tmpMap.insert(std::make_pair(entry,status));
+    }
+
+    return tmpMap;
+}
+
+LFGLockStatusMap LFGMgr::GetPlayerLockMap(ObjectGuid const& guid)
+{
+    return GetPlayerLockMap(sObjectMgr.GetPlayer(guid));
+}
+
+LFGLockStatusType LFGMgr::GetPlayerLockStatus(Player* pPlayer, LFGDungeonEntry const* dungeon)
+{
+    if (!pPlayer || !pPlayer->IsInWorld())
+        return LFG_LOCKSTATUS_RAID_LOCKED;
+
+    bool isRandom = (GetLFGPlayerState(pPlayer->GetObjectGuid())->GetType() == LFG_TYPE_RANDOM_DUNGEON);
+
+    // check if player in this dungeon. not need other checks
+    //
+    if (pPlayer->GetGroup() && pPlayer->GetGroup()->isLFDGroup())
+    {
+        if (GetLFGGroupState(pPlayer->GetGroup()->GetObjectGuid())->GetDungeon())
+        {
+            if (GetLFGGroupState(pPlayer->GetGroup()->GetObjectGuid())->GetDungeon()->map == pPlayer->GetMapId())
+                return LFG_LOCKSTATUS_OK;
+            else if (GetLFGGroupState(pPlayer->GetGroup()->GetObjectGuid())->GetType() == LFG_TYPE_RANDOM_DUNGEON)
+                isRandom = true;
+        }
+    }
+
+    if (isRandom && sWorld.IsDungeonMapIdDisable(dungeon->map))
+        return LFG_LOCKSTATUS_NOT_IN_SEASON;
+
+    if (dungeon->expansion > pPlayer->GetSession()->Expansion())
+        return LFG_LOCKSTATUS_INSUFFICIENT_EXPANSION;
+
+    if (dungeon->difficulty > DUNGEON_DIFFICULTY_NORMAL
+        && pPlayer->GetBoundInstance(dungeon->map, Difficulty(dungeon->difficulty)))
+        return  LFG_LOCKSTATUS_RAID_LOCKED;
+
+    if (dungeon->minlevel > pPlayer->getLevel())
+        return  LFG_LOCKSTATUS_TOO_LOW_LEVEL;
+
+    if (dungeon->maxlevel < pPlayer->getLevel())
+        return LFG_LOCKSTATUS_TOO_HIGH_LEVEL;
+
+    switch (pPlayer->GetAreaLockStatus(dungeon->map, Difficulty(dungeon->difficulty)))
+    {
+        case AREA_LOCKSTATUS_OK:
+            break;
+        case AREA_LOCKSTATUS_TOO_LOW_LEVEL:
+            return  LFG_LOCKSTATUS_TOO_LOW_LEVEL;
+        case AREA_LOCKSTATUS_QUEST_NOT_COMPLETED:
+            return LFG_LOCKSTATUS_QUEST_NOT_COMPLETED;
+        case AREA_LOCKSTATUS_MISSING_ITEM:
+            return LFG_LOCKSTATUS_MISSING_ITEM;
+        case AREA_LOCKSTATUS_MISSING_DIFFICULTY:
+            return LFG_LOCKSTATUS_RAID_LOCKED;
+        case AREA_LOCKSTATUS_INSUFFICIENT_EXPANSION:
+            return LFG_LOCKSTATUS_INSUFFICIENT_EXPANSION;
+        case AREA_LOCKSTATUS_NOT_ALLOWED:
+            return LFG_LOCKSTATUS_RAID_LOCKED;
+        case AREA_LOCKSTATUS_RAID_LOCKED:
+        case AREA_LOCKSTATUS_UNKNOWN_ERROR:
+        default:
+            return LFG_LOCKSTATUS_RAID_LOCKED;
+    }
+
+    if (dungeon->difficulty > DUNGEON_DIFFICULTY_NORMAL)
+    {
+        if (AreaTrigger const* at = sObjectMgr.GetMapEntranceTrigger(dungeon->map))
+        {
+            uint32 gs = pPlayer->GetEquipGearScore(true,true);
+
+            if (at->minGS > 0 && gs < at->minGS)
+                return LFG_LOCKSTATUS_TOO_LOW_GEAR_SCORE;
+            else if (at->maxGS > 0 && gs > at->maxGS)
+                return LFG_LOCKSTATUS_TOO_HIGH_GEAR_SCORE;
+        }
+        else
+            return LFG_LOCKSTATUS_RAID_LOCKED;
+    }
+
+    if (InstancePlayerBind* bind = pPlayer->GetBoundInstance(dungeon->map, Difficulty(dungeon->difficulty)))
+    {
+        if (DungeonPersistentState* state = bind->state)
+            if (state->IsCompleted())
+                return LFG_LOCKSTATUS_RAID_LOCKED;
+    }
+
+        /* TODO
+            LFG_LOCKSTATUS_ATTUNEMENT_TOO_LOW_LEVEL;
+            LFG_LOCKSTATUS_ATTUNEMENT_TOO_HIGH_LEVEL;
+            LFG_LOCKSTATUS_NOT_IN_SEASON;
+        */
+
+    return LFG_LOCKSTATUS_OK;
+}
+
+LFGLockStatusType LFGMgr::GetPlayerExpansionLockStatus(Player* pPlayer, LFGDungeonEntry const* dungeon)
+{
+    if (!pPlayer || !pPlayer->IsInWorld() || !dungeon)
+        return LFG_LOCKSTATUS_RAID_LOCKED;
+
+    uint32 randomEntry = 0;
+    if (pPlayer->GetGroup() && pPlayer->GetGroup()->isLFDGroup())
+    {
+        if (GetLFGGroupState(pPlayer->GetGroup()->GetObjectGuid())->GetDungeon())
+        {
+            if (GetLFGGroupState(pPlayer->GetGroup()->GetObjectGuid())->GetType() == LFG_TYPE_RANDOM_DUNGEON)
+                randomEntry = (*GetLFGGroupState(pPlayer->GetGroup()->GetObjectGuid())->GetDungeons()->begin())->ID;
+        }
+    }
+
+    LFGDungeonExpansionEntry const* dungeonExpansion = NULL;
+
+    for (uint32 i = 0; i < sLFGDungeonExpansionStore.GetNumRows(); ++i)
+    {
+        if (LFGDungeonExpansionEntry const* dungeonEx = sLFGDungeonExpansionStore.LookupEntry(i))
+        {
+            if (dungeonEx->dungeonID == dungeon->ID
+                && dungeonEx->expansion == pPlayer->GetSession()->Expansion()
+                && (randomEntry && randomEntry == dungeonEx->randomEntry))
+                dungeonExpansion = dungeonEx;
+        }
+    }
+
+    if (!dungeonExpansion)
+        return LFG_LOCKSTATUS_OK;
+
+    if (dungeonExpansion->minlevelHard > pPlayer->getLevel())
+        return  LFG_LOCKSTATUS_TOO_LOW_LEVEL;
+
+    if (dungeonExpansion->maxlevelHard < pPlayer->getLevel())
+        return LFG_LOCKSTATUS_TOO_HIGH_LEVEL;
+
+/*
+    // need special case for handle attunement
+    if (dungeonExpansion->minlevel > player->getLevel())
+        return  LFG_LOCKSTATUS_ATTUNEMENT_TOO_LOW_LEVEL;
+
+    if (dungeonExpansion->maxlevel < player->getLevel())
+        return LFG_LOCKSTATUS_ATTUNEMENT_TOO_HIGH_LEVEL;
+*/
+        return LFG_LOCKSTATUS_OK;
+}
+
+LFGLockStatusType LFGMgr::GetGroupLockStatus(Group* group, LFGDungeonEntry const* dungeon)
+{
+    if (!group)
+        return LFG_LOCKSTATUS_RAID_LOCKED;
+
+    for (GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        Player* pGroupMember = itr->getSource();
+
+        LFGLockStatusType result = GetPlayerLockStatus(pGroupMember, dungeon);
+
+        if (result != LFG_LOCKSTATUS_OK)
+            return result;
+    }
+    return LFG_LOCKSTATUS_OK;
+}
+
+LFGDungeonSet LFGMgr::GetRandomDungeonsForPlayer(Player* pPlayer)
+{
+    LFGDungeonSet list;
+
+    for (uint32 i = 0; i < sLFGDungeonStore.GetNumRows(); ++i)
+    {
+        if (LFGDungeonEntry const* dungeon = sLFGDungeonStore.LookupEntry(i))
+        {
+            if (dungeon &&
+                LFGMgr::IsRandomDungeon(dungeon) &&
+                GetPlayerLockStatus(pPlayer, dungeon) == LFG_LOCKSTATUS_OK)
+                list.insert(dungeon);
+            else if (dungeon &&
+                dungeon->grouptype == LFG_GROUP_TYPE_WORLD_EVENTS  &&
+                GetPlayerLockStatus(pPlayer, dungeon) == LFG_LOCKSTATUS_OK &&
+                LFGMgr::CheckWorldEvent(dungeon))
+                list.insert(dungeon);
+        }
+    }
+    return list;
+}
+
+LFGDungeonSet LFGMgr::ExpandRandomDungeonsForGroup(LFGDungeonEntry const* randomDungeon, GuidSet playerGuids)
+{
+    LFGDungeonSet list;
+    for (uint32 i = 0; i < sLFGDungeonStore.GetNumRows(); ++i)
+    {
+        if (LFGDungeonEntry const* dungeonEx = sLFGDungeonStore.LookupEntry(i))
+        {
+            if ((dungeonEx->type == LFG_TYPE_DUNGEON ||
+                 dungeonEx->type == LFG_TYPE_HEROIC_DUNGEON)
+                 && dungeonEx->difficulty == randomDungeon->difficulty)
+            {
+                bool checkPassed = true;
+                for (GuidSet::const_iterator itr =  playerGuids.begin(); itr !=  playerGuids.end(); ++itr)
+                {
+                    Player* pPlayer = sObjectMgr.GetPlayer(*itr);
+
+                    // Additional checks for expansion there!
+
+                    if (!dungeonEx || GetPlayerLockStatus(pPlayer, dungeonEx) != LFG_LOCKSTATUS_OK)
+                       checkPassed = false;
+                }
+                if (checkPassed)
+                    list.insert(dungeonEx);
+            }
+        }
+    }
+    return list;
+}
+
+LFGDungeonEntry const* SelectDungeonFromList(LFGDungeonSet* dungeons)
+{
+    if (!dungeons || dungeons->empty())
+        return NULL;
+    if (dungeons->size() == 1)
+        return *dungeons->begin();
+
+    return NULL;
+}
+
+LFGDungeonEntry const* LFGMgr::GetDungeon(uint32 dungeonID)
+{
+    LFGDungeonMap::const_iterator itr = m_dungeonMap.find(dungeonID);
+    return itr != m_dungeonMap.end() ? itr->second : NULL;
+}
+
+void LFGMgr::ClearLFRList(Player* pPlayer)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE) && !sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE))
+        return;
+
+    if (!pPlayer)
+        return;
+
+    LFGDungeonSet dungeons;
+    dungeons.clear();
+    GetLFGPlayerState(pPlayer->GetObjectGuid())->SetDungeons(dungeons);
+    DEBUG_LOG("LFGMgr::LFR List cleared, player %u leaving LFG queue", pPlayer->GetObjectGuid().GetCounter());
+    RemoveFromQueue(pPlayer->GetObjectGuid());
+}
+
+GuidSet LFGMgr::GetDungeonPlayerQueue(LFGDungeonEntry const* dungeon, Team team)
+{
+    GuidSet tmpSet;
+
+    if (!dungeon)
+        return tmpSet;
+
+    GuidSet* players = GetPlayersForDungeon(dungeon);
+    if (!players || players->empty())
+        return tmpSet;
+
+    for (GuidSet::const_iterator itr = players->begin(); itr != players->end(); ++itr)
+    {
+        ObjectGuid guid = (*itr);
+        Player* pPlayer = sObjectMgr.GetPlayer(guid);
+        if (!pPlayer)
+            continue;
+
+        if (team && pPlayer->GetTeam() != team)
+            continue;
+
+        if (GetLFGPlayerState(pPlayer->GetObjectGuid())->GetState() < LFG_STATE_LFR ||
+            GetLFGPlayerState(pPlayer->GetObjectGuid())->GetState() > LFG_STATE_PROPOSAL)
+            continue;
+
+        tmpSet.insert(guid);
+    }
+    return tmpSet;
+}
+
+GuidSet LFGMgr::GetDungeonPlayerQueue(LFGType type)
+{
+    GuidSet tmpSet;
+
+    for (LFGQueue::const_iterator itr = m_playerQueue[type].begin(); itr != m_playerQueue[type].end(); ++itr)
+    {
+        ObjectGuid guid = (*itr)->guid;
+        Player* pPlayer = sObjectMgr.GetPlayer(guid);
+        if (!pPlayer)
+            continue;
+
+        if (GetLFGPlayerState(pPlayer->GetObjectGuid())->GetState() < LFG_STATE_LFR ||
+            GetLFGPlayerState(pPlayer->GetObjectGuid())->GetState() > LFG_STATE_PROPOSAL)
+            continue;
+
+        tmpSet.insert(guid);
+    }
+    return tmpSet;
+}
+
+GuidSet LFGMgr::GetDungeonGroupQueue(LFGType type)
+{
+    GuidSet tmpSet;
+
+    for (LFGQueue::const_iterator itr = m_groupQueue[type].begin(); itr != m_groupQueue[type].end(); ++itr)
+    {
+        ObjectGuid guid = (*itr)->guid;
+        Group* pGroup = sObjectMgr.GetGroup(guid);
+        if (!pGroup)
+            continue;
+
+        if (GetLFGGroupState(pGroup->GetObjectGuid())->GetState() < LFG_STATE_LFR ||
+            GetLFGGroupState(pGroup->GetObjectGuid())->GetState() > LFG_STATE_PROPOSAL)
+            continue;
+
+        tmpSet.insert(guid);
+    }
+    return tmpSet;
+}
+
+GuidSet LFGMgr::GetDungeonGroupQueue(LFGDungeonEntry const* dungeon, Team team)
+{
+    GuidSet tmpSet;
+    tmpSet.clear();
+    LFGType type = LFG_TYPE_NONE;
+    uint32 dungeonID = 0;
+    uint8 searchEnd = LFG_TYPE_MAX;
+    if (dungeon)
+    {
+        type = LFGType(dungeon->type);
+        dungeonID = dungeon->ID;
+        searchEnd = type+1;
+    }
+
+    for (uint8 i = type; i < searchEnd; ++i)
+    {
+        for (LFGQueue::const_iterator itr = m_groupQueue[i].begin(); itr != m_groupQueue[i].end(); ++itr)
+        {
+            ObjectGuid guid = (*itr)->guid;
+            Group* pGroup = sObjectMgr.GetGroup(guid);
+            if (!pGroup)
+                continue;
+
+            if (GetLFGGroupState(pGroup->GetObjectGuid())->GetState() < LFG_STATE_LFR ||
+                GetLFGGroupState(pGroup->GetObjectGuid())->GetState() > LFG_STATE_PROPOSAL)
+                continue;
+
+            Player* pPlayer = sObjectMgr.GetPlayer(pGroup->GetLeaderGuid());
+            if (!pPlayer)
+                continue;
+
+            if (team && pPlayer->GetTeam() != team)
+                continue;
+
+            if (GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeons()->find(dungeon) == GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeons()->end())
+                continue;
+
+            tmpSet.insert(guid);
+        }
+    }
+    return tmpSet;
+}
+
+void LFGMgr::SendLFGRewards(Group* pGroup)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE) && !sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE))
+        return;
+
+    if (!pGroup || !pGroup->isLFGGroup())
+    {
+        DEBUG_LOG("LFGMgr::SendLFGReward: not group or not a LFGGroup. Ignoring");
+        return;
+    }
+
+    if (GetLFGGroupState(pGroup->GetObjectGuid())->GetState() == LFG_STATE_FINISHED_DUNGEON)
+    {
+        DEBUG_LOG("LFGMgr::SendLFGReward: group %u already rewarded!", pGroup->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    GetLFGGroupState(pGroup->GetObjectGuid())->SetState(LFG_STATE_FINISHED_DUNGEON);
+    GetLFGGroupState(pGroup->GetObjectGuid())->SetStatus(LFG_STATUS_SAVED);
+
+    LFGDungeonEntry const* dungeon = *GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeons()->begin();
+    if (!dungeon)
+    {
+        DEBUG_LOG("LFGMgr::SendLFGReward: group %u - but no realdungeon", pGroup->GetObjectGuid().GetCounter());
+        return;
+    }
+    else if (dungeon->type != LFG_TYPE_RANDOM_DUNGEON)
+    {
+        DEBUG_LOG("LFGMgr::SendLFGReward: group %u dungeon %u is not random (%u)", pGroup->GetObjectGuid().GetCounter(), dungeon->ID, dungeon->type);
+        return;
+    }
+
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        Player* pGroupMember = itr->getSource();
+        if (pGroupMember && pGroupMember->IsInWorld())
+            SendLFGReward(pGroupMember, dungeon);
+    }
+}
+
+void LFGMgr::SendLFGReward(Player* pPlayer, LFGDungeonEntry const* pRandomDungeon)
+{
+    if (!pPlayer || !pRandomDungeon)
+        return;
+
+    if (GetLFGPlayerState(pPlayer->GetObjectGuid())->GetState() == LFG_STATE_FINISHED_DUNGEON)
+    {
+        DEBUG_LOG("LFGMgr::SendLFGReward: player %u already rewarded!", pPlayer->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    // Update achievements
+    if (pRandomDungeon->difficulty == DUNGEON_DIFFICULTY_HEROIC)
+    {
+        if (Group* pGroup = pPlayer->GetGroup())
+        {
+            if (GetLFGGroupState(pGroup->GetObjectGuid())->GetRandomPlayersCount())
+                pPlayer->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_USE_LFD_TO_GROUP_WITH_PLAYERS, GetLFGGroupState(pGroup->GetObjectGuid())->GetRandomPlayersCount());
+        }
+    }
+
+    GetLFGPlayerState(pPlayer->GetObjectGuid())->SetState(LFG_STATE_FINISHED_DUNGEON);
+
+    LFGReward const* reward = GetRandomDungeonReward(pRandomDungeon, pPlayer);
+    if (!reward)
+        return;
+
+    uint8 index = 0;
+
+    // if we can take the quest, means that we haven't done this kind of "run", IE: First Heroic Random of Day.
+    Quest const* pQuest = sObjectMgr.GetQuestTemplate(reward->reward[0].questId);
+
+    if (!pPlayer->CanTakeQuest(pQuest, false))
+        index = 1;
+
+    Quest const* qReward = sObjectMgr.GetQuestTemplate(reward->reward[index].questId);
+    if (!qReward)
+    {
+        sLog.outError("LFGMgr::RewardDungeonDone quest %u is absent in DB.", reward->reward[index].questId);
+        return;
+    }
+
+    // we give reward without informing client (retail does this)
+    pPlayer->RewardQuest(qReward, 0, NULL, false);
+
+    // Give rewards
+    DEBUG_LOG("LFGMgr::RewardDungeonDoneFor: %u done dungeon %u, %s previously done.", pPlayer->GetObjectGuid().GetCounter(), pRandomDungeon->ID, index > 0 ? " " : " not");
+    pPlayer->GetSession()->SendLfgPlayerReward(pRandomDungeon, reward, qReward, index != 0);
+}
+
+uint32 LFGMgr::CreateProposal(LFGDungeonEntry const* dungeon, Group* pGroup, GuidSet* guids)
+{
+    if (!dungeon)
+        return false;
+
+    uint32 ID = 0;
+    if (pGroup)
+    {
+        if (LFGProposal* pProposal = GetLFGGroupState(pGroup->GetObjectGuid())->GetProposal())
+        {
+            ID = pProposal->m_uiID;
+        }
+    }
+
+    LFGProposal proposal = LFGProposal(dungeon);
+    proposal.SetState(LFG_PROPOSAL_INITIATING);
+    proposal.SetGroup(pGroup);
+    if (ID)
+    {
+        m_proposalMap.erase(ID);
+        proposal.m_uiID = ID;
+        m_proposalMap.insert(std::make_pair(ID, proposal));
+    }
+    else
+    {
+        ID = GenerateProposalID();
+        proposal.m_uiID = ID;
+        m_proposalMap.insert(std::make_pair(ID, proposal));
+    }
+
+    LFGProposal* pProposal = GetProposal(ID);
+    MANGOS_ASSERT(pProposal);
+    pProposal->Start();
+
+    if (pGroup)
+    {
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetProposal(GetProposal(ID));
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetState(LFG_STATE_PROPOSAL);
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* pGroupMember = itr->getSource();
+            if (pGroupMember && pGroupMember->IsInWorld())
+            {
+                pGroupMember->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_PROPOSAL_BEGIN, LFGType(dungeon->type));
+                pGroupMember->GetSession()->SendLfgUpdateProposal(GetProposal(ID));
+                GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetState(LFG_STATE_PROPOSAL);
+                GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetAnswer(LFG_ANSWER_PENDING);
+            }
+        }
+        if (guids && !guids->empty())
+            GetLFGGroupState(pGroup->GetObjectGuid())->SetRandomPlayersCount(uint8(guids->size()));
+    }
+    if (guids && !guids->empty())
+    {
+        for (GuidSet::const_iterator itr2 = guids->begin(); itr2 != guids->end(); ++itr2)
+        {
+            if (!SendProposal(ID,*itr2))
+                DEBUG_LOG("LFGMgr::CreateProposal: cannot send proposal %u, dungeon %u, %s to player %u", ID, dungeon->ID, pGroup ? " in pGroup" : " not in pGroup", (*itr2).GetCounter());
+        }
+    }
+    DEBUG_LOG("LFGMgr::CreateProposal: %u, dungeon %u, %s", ID, dungeon->ID, pGroup ? " in pGroup" : " not in pGroup");
+    return ID;
+}
+
+bool LFGMgr::SendProposal(uint32 ID, ObjectGuid guid)
+{
+    if (guid.IsEmpty() || !ID)
+        return false;
+
+    LFGProposal* pProposal = GetProposal(ID);
+
+    Player* pPlayer = sObjectMgr.GetPlayer(guid);
+
+    if (!pProposal || !pPlayer)
+        return false;
+
+    pProposal->AddMember(guid);
+    pProposal->Start();
+    GetLFGPlayerState(pPlayer->GetObjectGuid())->SetState(LFG_STATE_PROPOSAL);
+    GetLFGPlayerState(pPlayer->GetObjectGuid())->SetAnswer(LFG_ANSWER_PENDING);
+    GetLFGPlayerState(pPlayer->GetObjectGuid())->SetProposal(pProposal);
+    RemoveFromSearchMatrix(guid);
+    if (pPlayer->GetGroup())
+        pPlayer->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_PROPOSAL_BEGIN, LFGType(pProposal->GetDungeon()->type));
+    else
+    {
+        pPlayer->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_GROUP_FOUND, LFGType(pProposal->GetDungeon()->type));
+        pPlayer->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_PROPOSAL_BEGIN, LFGType(pProposal->GetDungeon()->type));
+    }
+
+    pPlayer->GetSession()->SendLfgUpdateProposal(pProposal);
+
+    if (pProposal->GetGroup())
+    {
+        GetLFGGroupState(pProposal->GetGroup()->GetObjectGuid())->SetState(LFG_STATE_PROPOSAL);
+    }
+
+    DEBUG_LOG("LFGMgr::SendProposal: proposal %u, dungeon %u, %s", ID, pProposal->GetDungeonId(), pProposal->GetGroup() ? " in group" : " not in group");
+    return true;
+}
+
+LFGProposal* LFGMgr::GetProposal(uint32 ID)
+{
+    LFGProposalMap::iterator itr = m_proposalMap.find(ID);
+    return itr != m_proposalMap.end() ? &itr->second : NULL;
+}
+
+
+uint32 LFGMgr::GenerateProposalID()
+{
+    return ++m_proposalID;
+}
+
+uint32 LFGMgr::GenerateQueueID()
+{
+    return ++m_queueID;
+}
+
+void LFGMgr::UpdateProposal(uint32 ID, ObjectGuid guid, bool accept)
+{
+    // Check if the proposal exists
+    LFGProposal* pProposal = GetProposal(ID);
+    if (!pProposal)
+        return;
+
+    Player* pPlayer = sObjectMgr.GetPlayer(guid);
+    if (!pPlayer)
+        return;
+
+    // check player in proposal
+    if (!pProposal->IsMember(guid) && pProposal->GetGroup() && (pProposal->GetGroup() != pPlayer->GetGroup()))
+        return;
+
+    GetLFGPlayerState(pPlayer->GetObjectGuid())->SetAnswer(LFGAnswer(accept));
+
+    // Remove member that didn't accept
+    if (accept == LFG_ANSWER_DENY)
+    {
+        if (!sWorld.getConfig(CONFIG_BOOL_LFG_DEBUG_ENABLE))
+            pPlayer->CastSpell(pPlayer,LFG_SPELL_DUNGEON_COOLDOWN,true);
+        RemoveProposal(pPlayer, ID);
+        return;
+    }
+
+    // check if all have answered and reorder players (leader first)
+    bool allAnswered = true;
+    GuidSet const proposalGuids = pProposal->GetMembers();
+    for (GuidSet::const_iterator itr = proposalGuids.begin(); itr != proposalGuids.end(); ++itr)
+    {
+        Player* pPlayer = sObjectMgr.GetPlayer(*itr);
+        if (pPlayer && pPlayer->IsInWorld())
+        {
+            if (GetLFGPlayerState(pPlayer->GetObjectGuid())->GetAnswer() != LFG_ANSWER_AGREE)   // No answer (-1) or not accepted (0)
+                allAnswered = false;
+            pPlayer->GetSession()->SendLfgUpdateProposal(pProposal);
+        }
+    }
+
+    if (Group* pGroup = pProposal->GetGroup())
+    {
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* pGroupMember = itr->getSource();
+            if (pGroupMember && pGroupMember->IsInWorld())
+            {
+                if (GetLFGPlayerState(pGroupMember->GetObjectGuid())->GetAnswer() != LFG_ANSWER_AGREE)   // No answer (-1) or not accepted (0)
+                    allAnswered = false;
+                pGroupMember->GetSession()->SendLfgUpdateProposal(pProposal);
+            }
+        }
+    }
+
+    if (!allAnswered)
+        return;
+
+    DEBUG_LOG("LFGMgr::UpdateProposal: all players in proposal %u answered, make pGroup/teleport group", pProposal->m_uiID);
+    // save waittime (group maked, save statistic)
+
+    // Set the real dungeon (for random) or set old dungeon if OfferContinue
+
+    LFGDungeonEntry const* realdungeon = NULL;
+    MANGOS_ASSERT(pProposal->GetDungeon());
+
+    // Create a new group (if needed)
+    Group* pGroup = pProposal->GetGroup();
+
+    if (pGroup && GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeon())
+        realdungeon = GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeon();
+    else
+    {
+        if (IsRandomDungeon(pProposal->GetDungeon()))
+        {
+            GuidSet tmpSet;
+            if (pGroup)
+            {
+                for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+                {
+                    if (Player* pGroupMember = itr->getSource())
+                        if (pGroupMember->IsInWorld())
+                            tmpSet.insert(pGroupMember->GetObjectGuid());
+                }
+            }
+
+            GuidSet const proposalGuids = pProposal->GetMembers();
+            for (GuidSet::const_iterator itr = proposalGuids.begin(); itr != proposalGuids.end(); ++itr)
+            {
+                 Player* pPlayer = sObjectMgr.GetPlayer(*itr);
+                    if (pPlayer && pPlayer->IsInWorld())
+                        tmpSet.insert(pPlayer->GetObjectGuid());
+            }
+
+            LFGDungeonSet randomList = ExpandRandomDungeonsForGroup(pProposal->GetDungeon(), tmpSet);
+            realdungeon = SelectRandomDungeonFromList(randomList);
+            if (!realdungeon)
+            {
+                DEBUG_LOG("LFGMgr::UpdateProposal:%u cannot set real dungeon! no compatible list.", pProposal->m_uiID);
+                pProposal->SetDeleted();
+                return;
+            }
+        }
+        else
+            realdungeon = pProposal->GetDungeon();
+    }
+
+    if (!pGroup)
+    {
+        GuidSet proposalGuidsTmp = pProposal->GetMembers();
+        if (proposalGuidsTmp.empty())
+        {
+            DEBUG_LOG("LFGMgr::UpdateProposal:%u cannot make pGroup, guid set is empty!", pProposal->m_uiID);
+            pProposal->SetDeleted();
+            return;
+        }
+        Player* leader = LeaderElection(&proposalGuidsTmp);
+        if (!leader)
+        {
+            DEBUG_LOG("LFGMgr::UpdateProposal:%u cannot make pGroup, cannot set leader!", pProposal->m_uiID);
+            pProposal->SetDeleted();
+            return;
+        }
+
+        if (leader->GetGroup())
+            leader->RemoveFromGroup();
+
+        leader->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_GROUP_FOUND, GetLFGPlayerState(leader->GetObjectGuid())->GetType());
+        GetLFGPlayerState(leader->GetObjectGuid())->AddRole(ROLE_LEADER);
+
+        pGroup = new Group(GROUPTYPE_LFD);
+        pGroup->Create(leader->GetObjectGuid(), leader->GetName());
+        pGroup->ConvertToLFG(pProposal->GetType());
+
+        // LFG settings
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetProposal(pProposal);
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetState(LFG_STATE_PROPOSAL);
+        GetLFGGroupState(pGroup->GetObjectGuid())->AddDungeon(pProposal->GetDungeon());
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetDungeon(realdungeon);
+
+        // Special case to add leader to LFD pGroup:
+        AddMemberToLFDGroup(leader->GetObjectGuid());
+        pProposal->RemoveMember(leader->GetObjectGuid());
+        GetLFGPlayerState(leader->GetObjectGuid())->SetProposal(NULL);
+        DEBUG_LOG("LFGMgr::UpdateProposal: in proposal %u created pGroup %u", pProposal->m_uiID, pGroup->GetObjectGuid().GetCounter());
+    }
+    else
+    {
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetDungeon(realdungeon);
+        if (!pGroup->isLFGGroup())
+        {
+            pGroup->ConvertToLFG(pProposal->GetType());
+            for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+            {
+                if (Player* pGroupMember = itr->getSource())
+                {
+                    if (pGroupMember->IsInWorld())
+                    {
+                        AddMemberToLFDGroup(pGroupMember->GetObjectGuid());
+                        pGroupMember->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_GROUP_FOUND, GetLFGGroupState(pGroup->GetObjectGuid())->GetType());
+                        if (!sWorld.getConfig(CONFIG_BOOL_LFG_DEBUG_ENABLE))
+                            pGroupMember->CastSpell(pGroupMember,LFG_SPELL_DUNGEON_COOLDOWN,true);
+                    }
+                }
+            }
+        }
+    }
+
+    MANGOS_ASSERT(pGroup);
+    pProposal->SetGroup(pGroup);
+    pGroup->SendUpdate();
+
+    // move players from proposal to pGroup
+    for (GuidSet::const_iterator itr = proposalGuids.begin(); itr != proposalGuids.end(); ++itr)
+    {
+        Player* pPlayer = sObjectMgr.GetPlayer(*itr);
+        if (pPlayer && pPlayer->IsInWorld() && pPlayer->GetMap())
+        {
+            if (pPlayer->GetGroup() != pGroup /*&& pPlayer->GetGroup() == NULL*/)
+            {
+                if (pPlayer->GetGroup())
+                {
+                    pPlayer->RemoveFromGroup();
+                    pPlayer->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_GROUP_FOUND, GetLFGPlayerState(pPlayer->GetObjectGuid())->GetType());
+                }
+                else
+                    pPlayer->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_GROUP_FOUND, GetLFGPlayerState(pPlayer->GetObjectGuid())->GetType());
+
+                pGroup->AddMember(pPlayer->GetObjectGuid(), pPlayer->GetName());
+            }
+            else
+                pPlayer->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_GROUP_FOUND, GetLFGPlayerState(pPlayer->GetObjectGuid())->GetType());
+
+            pProposal->RemoveMember(*itr);
+//            player->GetSession()->SendLfgUpdateProposal(pProposal);
+            GetLFGPlayerState(pPlayer->GetObjectGuid())->SetProposal(NULL);
+            if (!sWorld.getConfig(CONFIG_BOOL_LFG_DEBUG_ENABLE))
+                pPlayer->CastSpell(pPlayer,LFG_SPELL_DUNGEON_COOLDOWN,true);
+        }
+        else
+        {
+            pProposal->RemoveMember(*itr);
+        }
+    }
+
+    // Update statistics for dungeon/roles/etc
+
+    MANGOS_ASSERT(GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeon());
+    pGroup->SetDungeonDifficulty(Difficulty(GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeon()->difficulty));
+    GetLFGGroupState(pGroup->GetObjectGuid())->SetStatus(LFG_STATUS_NOT_SAVED);
+    pGroup->SendUpdate();
+
+    // Teleport pGroup
+    //    Teleport(pGroup, false);
+    AddEvent(pGroup->GetObjectGuid(),LFG_EVENT_TELEPORT_GROUP);
+
+    RemoveProposal(ID, true);
+    GetLFGGroupState(pGroup->GetObjectGuid())->SetState(LFG_STATE_DUNGEON);
+    RemoveFromQueue(pGroup->GetObjectGuid());
+}
+
+void LFGMgr::RemoveProposal(Player* decliner, uint32 ID)
+{
+    if (!decliner)
+        return;
+
+    LFGProposal* pProposal = GetProposal(ID);
+
+    if (!pProposal || pProposal->IsDeleted())
+        return;
+
+    pProposal->SetDeleted();
+
+    decliner->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_PROPOSAL_DECLINED, LFGType(pProposal->GetDungeon()->type));
+
+    if (pProposal->GetGroup() && pProposal->GetGroup() == decliner->GetGroup())
+    {
+        Leave(decliner->GetGroup());
+    }
+    else
+    {
+        pProposal->RemoveDecliner(decliner->GetObjectGuid());
+        Leave(decliner);
+    }
+
+    DEBUG_LOG("LFGMgr::UpdateProposal: %u didn't accept. Removing from queue", decliner->GetObjectGuid().GetCounter());
+
+    if (Group* pGroup = pProposal->GetGroup())
+    {
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+            if (Player* pGroupMember = itr->getSource())
+                if (pGroupMember->IsInWorld())
+                    pGroupMember->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_PROPOSAL_DECLINED, LFGType(pProposal->GetDungeon()->type));
+    }
+
+    {
+        GuidSet const playersSet = pProposal->GetMembers();
+        if (!playersSet.empty())
+        {
+            for (GuidSet::const_iterator itr = playersSet.begin(); itr != playersSet.end(); ++itr)
+            {
+                ObjectGuid guid = *itr;
+
+                if (guid.IsEmpty())
+                    continue;
+
+                Player* pPlayer = sObjectMgr.GetPlayer(guid);
+                if (pPlayer)
+                    pPlayer->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_PROPOSAL_DECLINED, LFGType(pProposal->GetDungeon()->type));
+            }
+        }
+    }
+}
+
+void LFGMgr::RemoveProposal(uint32 ID, bool success)
+{
+
+    LFGProposal* pProposal = GetProposal(ID);
+
+    if (!pProposal)
+        return;
+
+    pProposal->SetDeleted();
+
+    if (!success)
+    {
+        GuidSet const proposalGuids = pProposal->GetMembers();
+        for (GuidSet::const_iterator itr2 = proposalGuids.begin(); itr2 != proposalGuids.end(); ++itr2)
+        {
+            Player* pPlayer = sObjectMgr.GetPlayer(*itr2);
+            if (pPlayer)
+            {
+                pPlayer->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_PROPOSAL_FAILED, LFGType(pProposal->GetDungeon()->type));
+                GetLFGPlayerState(pPlayer->GetObjectGuid())->SetProposal(NULL);
+
+                // re-adding players to queue. decliner already removed
+                if (GetLFGPlayerState(pPlayer->GetObjectGuid())->GetAnswer() == LFG_ANSWER_AGREE)
+                {
+                    pPlayer->RemoveAurasDueToSpell(LFG_SPELL_DUNGEON_COOLDOWN);
+                    AddToQueue(pPlayer->GetObjectGuid(),LFGType(pProposal->GetDungeon()->type), true);
+                    GetLFGPlayerState(pPlayer->GetObjectGuid())->SetState(LFG_STATE_QUEUED);
+                    pPlayer->GetSession()->SendLfgJoinResult(ERR_LFG_OK, LFG_ROLECHECK_NONE);
+                    pPlayer->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_JOIN_PROPOSAL, LFGType(pProposal->GetDungeon()->type));
+                    pPlayer->GetSession()->SendLfgUpdateSearch(true);
+//                    player->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_ADDED_TO_QUEUE, LFGType(pProposal->GetDungeon()->type));
+                    DEBUG_LOG("LFGMgr::RemoveProposal: %u re-adding to queue", pPlayer->GetObjectGuid().GetCounter());
+                }
+                else
+                    RemoveFromQueue(pPlayer->GetObjectGuid());
+            }
+        }
+
+        if (Group* pGroup = pProposal->GetGroup())
+        {
+            // re-adding to queue (only client! in server we are in queue)
+            GetLFGGroupState(pGroup->GetObjectGuid())->SetProposal(NULL);
+            GetLFGGroupState(pGroup->GetObjectGuid())->SetState(LFG_STATE_QUEUED);
+            if (GetQueueInfo(pGroup->GetObjectGuid()))
+            {
+                DEBUG_LOG("LFGMgr::RemoveProposal: standart way - group %u re-adding to queue.", pGroup->GetObjectGuid().GetCounter());
+            }
+            else
+            {
+                // re-adding group to queue. dont must call, but who know...
+                AddToQueue(pGroup->GetObjectGuid(),LFGType(pProposal->GetDungeon()->type), true);
+                DEBUG_LOG("LFGMgr::RemoveProposal: ERROR! group %u re-adding to queue not standart way.", pGroup->GetObjectGuid().GetCounter());
+            }
+
+            for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+            {
+                if (Player* pGroupMember = itr->getSource())
+                {
+                    if (pGroupMember->IsInWorld())
+                    {
+                        pGroupMember->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_PROPOSAL_FAILED, LFGType(pProposal->GetDungeon()->type));
+                        pGroupMember->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_ADDED_TO_QUEUE, LFGType(pProposal->GetDungeon()->type));
+                        pGroupMember->GetSession()->SendLfgUpdateSearch(true);
+                    }
+                }
+            }
+        }
+    }
+
+    LFGProposalMap::iterator itr = m_proposalMap.find(ID);
+    if (itr != m_proposalMap.end())
+        m_proposalMap.erase(itr);
+}
+
+void LFGMgr::CleanupProposals(LFGType type)
+{
+    std::set<uint32> expiredProposals;
+    for (LFGProposalMap::iterator itr = m_proposalMap.begin(); itr != m_proposalMap.end(); ++itr)
+    {
+        if (LFGType(itr->second.GetDungeon()->type) != type)
+            continue;
+
+        if (itr->second.IsExpired())
+            expiredProposals.insert(itr->second.m_uiID);
+        else if (itr->second.IsDeleted())
+            expiredProposals.insert(itr->second.m_uiID);
+    }
+
+    if (!expiredProposals.empty())
+    {
+        for(std::set<uint32>::const_iterator itr = expiredProposals.begin(); itr != expiredProposals.end(); ++itr)
+        {
+            DEBUG_LOG("LFGMgr::CleanupProposals: remove expired proposal %u", *itr);
+            RemoveProposal(*itr);
+        }
+    }
+}
+
+void LFGMgr::OfferContinue(Group* pGroup)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_LFG_ENABLE))
+        return;
+
+    if (pGroup)
+    {
+        LFGDungeonEntry const* dungeon = GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeon();
+        if (!dungeon ||  GetLFGGroupState(pGroup->GetObjectGuid())->GetStatus() > LFG_STATUS_NOT_SAVED)
+        {
+            DEBUG_LOG("LFGMgr::OfferContinue: group %u not have required attributes!", pGroup->GetObjectGuid().GetCounter());
+            return;
+        }
+        Player* leader = sObjectMgr.GetPlayer(pGroup->GetLeaderGuid());
+        if (leader)
+            leader->GetSession()->SendLfgOfferContinue(dungeon);
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetStatus(LFG_STATUS_OFFER_CONTINUE);
+    }
+    else
+        sLog.outError("LFGMgr::OfferContinue: no group!");
+}
+
+void LFGMgr::InitBoot(Player* kicker, ObjectGuid victimGuid, std::string reason)
+{
+    Group*  pGroup = kicker->GetGroup();
+    Player* victim = sObjectMgr.GetPlayer(victimGuid);
+
+    if (!kicker || !pGroup || !victim)
+        return;
+
+    DEBUG_LOG("LFGMgr::InitBoot: group %u kicker %u victim %u reason %s", pGroup->GetObjectGuid().GetCounter(), kicker->GetObjectGuid().GetCounter(), victimGuid.GetCounter(), reason.c_str());
+
+    if (!GetLFGGroupState(pGroup->GetObjectGuid())->IsBootActive())
+    {
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetVotesNeeded(ceil(float(pGroup->GetMembersCount())/2.0));
+        GetLFGGroupState(pGroup->GetObjectGuid())->StartBoot(kicker->GetObjectGuid(), victimGuid, reason);
+    }
+    else
+    {
+    // send error to player
+    //    return;
+    }
+
+    if (GetLFGGroupState(pGroup->GetObjectGuid())->GetKicksLeft() == 0)
+    {
+        pGroup->Disband();
+    }
+
+    // Notify players
+    for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        Player* pGroupMember = itr->getSource();
+
+        if (pGroupMember && pGroupMember->IsInWorld())
+            pGroupMember->GetSession()->SendLfgBootPlayer();
+    }
+}
+
+void LFGMgr::CleanupBoots(LFGType type)
+{
+    for (LFGQueue::const_iterator itr = m_groupQueue[type].begin(); itr != m_groupQueue[type].end(); ++itr)
+    {
+        ObjectGuid guid = (*itr)->guid;
+        Group* pGroup = sObjectMgr.GetGroup(guid);
+        if (!pGroup)
+            continue;
+
+        if (GetLFGGroupState(pGroup->GetObjectGuid())->GetState() != LFG_STATE_BOOT)
+            continue;
+
+        if (GetLFGGroupState(pGroup->GetObjectGuid())->IsBootActive())
+            continue;
+
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            if (Player* pGroupMember = itr->getSource())
+            {
+                if (pGroupMember->IsInWorld())
+                {
+                    pGroupMember->GetSession()->SendLfgBootPlayer();
+                }
+            }
+        }
+        GetLFGGroupState(pGroup->GetObjectGuid())->StopBoot();
+    }
+}
+
+void LFGMgr::UpdateBoot(Player* pPlayer, LFGAnswer answer)
+{
+    Group* pGroup = pPlayer->GetGroup();
+    if (!pGroup)
+        return;
+
+    if (!GetLFGGroupState(pGroup->GetObjectGuid())->IsBootActive())
+        return;
+
+    DEBUG_LOG("LFGMgr::UpdateBoot: group %u kicker %u answer %u", pGroup->GetObjectGuid().GetCounter(), pPlayer->GetObjectGuid().GetCounter(), accept);
+
+    GetLFGGroupState(pGroup->GetObjectGuid())->UpdateBoot(pPlayer->GetObjectGuid(),answer);
+
+    // Send update info to all players
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        if (Player* pGroupMember = itr->getSource())
+        {
+            if (pGroupMember->IsInWorld())
+            {
+                pGroupMember->GetSession()->SendLfgBootPlayer();
+            }
+        }
+    }
+
+    switch (GetLFGGroupState(pGroup->GetObjectGuid())->GetBootResult())
+    {
+        case LFG_ANSWER_AGREE:
+        {
+            Player* victim = sObjectMgr.GetPlayer(GetLFGGroupState(pGroup->GetObjectGuid())->GetBootVictim());
+            if (!victim)
+            {
+                GetLFGGroupState(pGroup->GetObjectGuid())->StopBoot();
+                return;
+            }
+
+            pGroup->RemoveMember(victim->GetObjectGuid(), 1);
+            GetLFGPlayerState(victim->GetObjectGuid())->Clear();
+
+            // group may be disbanded after Player::RemoveFromGroup!
+            pGroup = pPlayer->GetGroup();
+            if (!pGroup)
+                return;
+            if (!GetLFGGroupState(pGroup->GetObjectGuid())->IsBootActive())
+                return;
+
+            GetLFGGroupState(pGroup->GetObjectGuid())->DecreaseKicksLeft();
+            GetLFGGroupState(pGroup->GetObjectGuid())->StopBoot();
+            OfferContinue(pGroup);
+            break;
+        }
+        case LFG_ANSWER_DENY:
+            GetLFGGroupState(pGroup->GetObjectGuid())->StopBoot();
+            break;
+        case LFG_ANSWER_PENDING:
+            break;
+        default:
+            break;
+    }
+}
+
+void LFGMgr::Teleport(Group* pGroup, bool out)
+{
+    if (!pGroup)
+        return;
+
+    DEBUG_LOG("LFGMgr::TeleportGroup %u in dungeon!", pGroup->GetObjectGuid().GetCounter());
+
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        if (Player* pGroupMember = itr->getSource())
+        {
+            if (pGroupMember->IsInWorld())
+            {
+                if (!GetLFGPlayerState(pGroupMember->GetObjectGuid())->IsTeleported() && !out)
+                    AddEvent(pGroupMember->GetObjectGuid(),LFG_EVENT_TELEPORT_PLAYER, LONG_LFG_DELAY, uint8(out));
+                else if (out)
+                    Teleport(pGroupMember, out);
+            }
+        }
+    }
+    if (GetLFGGroupState(pGroup->GetObjectGuid())->GetState() == LFG_STATE_LFG
+        || GetLFGGroupState(pGroup->GetObjectGuid())->GetState() == LFG_STATE_LFR)
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetState(LFG_STATE_DUNGEON);
+
+    pGroup->SendUpdate();
+}
+
+void LFGMgr::Teleport(Player* pPlayer, bool out, bool fromOpcode /*= false*/)
+{
+    if (!pPlayer || pPlayer->IsInCombat())
+        return;
+
+    DEBUG_LOG("LFGMgr::TeleportPlayer: %u is being teleported %s", pPlayer->GetObjectGuid().GetCounter(), out ? "from dungeon." : "in dungeon.");
+
+    if (out)
+    {
+        pPlayer->RemoveAurasDueToSpell(LFG_SPELL_LUCK_OF_THE_DRAW);
+        pPlayer->TeleportToBGEntryPoint();
+        return;
+    }
+
+    // TODO Add support for LFG_TELEPORTERROR_FATIGUE
+    LFGTeleportError error = LFG_TELEPORTERROR_OK;
+
+    Group* pGroup = pPlayer->GetGroup();
+
+    if (!pGroup)
+        error = LFG_TELEPORTERROR_UNK4;
+    else if (!pPlayer->isAlive())
+        error = LFG_TELEPORTERROR_PLAYER_DEAD;
+    else if (pPlayer->IsFalling())
+        error = LFG_TELEPORTERROR_FALLING;
+
+    uint32 mapid = 0;
+    float x = 0;
+    float y = 0;
+    float z = 0;
+    float orientation = 0;
+    Difficulty difficulty;
+
+    LFGDungeonEntry const* dungeon = NULL;
+
+    if (error == LFG_TELEPORTERROR_OK)
+    {
+        dungeon = GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeon();
+        if (!dungeon)
+        {
+            error = LFG_TELEPORTERROR_INVALID_LOCATION;
+            DEBUG_LOG("LFGMgr::TeleportPlayer %u error %u, no dungeon!", pPlayer->GetObjectGuid().GetCounter(), error);
+        }
+    }
+
+    if (error == LFG_TELEPORTERROR_OK)
+    {
+        difficulty = Difficulty(dungeon->difficulty);
+        bool leaderInDungeon = false;
+        Player* leader = sObjectMgr.GetPlayer(pGroup->GetLeaderGuid());
+        if (leader && pPlayer != leader && leader->GetMapId() == uint32(dungeon->map))
+            leaderInDungeon = true;
+
+        if (pGroup->GetDungeonDifficulty() != Difficulty(dungeon->difficulty))
+        {
+            error = LFG_TELEPORTERROR_UNK4;
+            DEBUG_LOG("LFGMgr::TeleportPlayer %u error %u, difficulty not match!", pPlayer->GetObjectGuid().GetCounter(), error);
+        }
+        else if (GetPlayerLockStatus(pPlayer,dungeon) != LFG_LOCKSTATUS_OK)
+        {
+            error = LFG_TELEPORTERROR_INVALID_LOCATION;
+            DEBUG_LOG("LFGMgr::TeleportPlayer %u error %u, player not enter to this instance!", pPlayer->GetObjectGuid().GetCounter(), error);
+        }
+        else if (leaderInDungeon && GetLFGGroupState(pGroup->GetObjectGuid())->GetState() == LFG_STATE_DUNGEON)
+        {
+            mapid = leader->GetMapId();
+            x = leader->GetPositionX();
+            y = leader->GetPositionY();
+            z = leader->GetPositionZ();
+            orientation = leader->GetOrientation();
+        }
+        else if (AreaTrigger const* at = sObjectMgr.GetMapEntranceTrigger(dungeon->map))
+        {
+            mapid = at->loc.GetMapId();
+            x = at->loc.x;
+            y = at->loc.y;
+            z = at->loc.z;
+            orientation = at->loc.o;
+        }
+        else
+        {
+            error = LFG_TELEPORTERROR_INVALID_LOCATION;
+            DEBUG_LOG("LFGMgr::TeleportPlayer %u error %u, no areatrigger to map %u!", pPlayer->GetObjectGuid().GetCounter(), error, dungeon->map);
+        }
+    }
+
+    if (error == LFG_TELEPORTERROR_OK)
+    {
+
+        if (pPlayer->GetMap() && !pPlayer->GetMap()->IsDungeon() && !pPlayer->GetMap()->IsRaid() && !pPlayer->InBattleGround())
+            pPlayer->SetBattleGroundEntryPoint(true);
+
+        // stop taxi flight at port
+        if (pPlayer->IsTaxiFlying())
+            pPlayer->InterruptTaxiFlying();
+
+        pPlayer->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+        pPlayer->RemoveSpellsCausingAura(SPELL_AURA_FLY);
+
+        DETAIL_LOG("LFGMgr: Sending %s to map %u, difficulty %u X %f, Y %f, Z %f, O %f", pPlayer->GetName(), uint8(difficulty), mapid, x, y, z, orientation);
+
+        pPlayer->TeleportTo(mapid, x, y, z, orientation);
+        GetLFGPlayerState(pPlayer->GetObjectGuid())->SetState(LFG_STATE_DUNGEON);
+        GetLFGPlayerState(pPlayer->GetObjectGuid())->SetTeleported();
+    }
+    else
+        pPlayer->GetSession()->SendLfgTeleportError(error);
+}
+
+void LFGMgr::CleanupRoleChecks(LFGType type)
+{
+
+    for (LFGQueue::const_iterator itr = m_groupQueue[type].begin(); itr != m_groupQueue[type].end(); ++itr)
+    {
+        ObjectGuid guid = (*itr)->guid;
+        Group* pGroup = sObjectMgr.GetGroup(guid);
+        if (!pGroup)
+            continue;
+
+        if (GetLFGGroupState(pGroup->GetObjectGuid())->GetState() != LFG_STATE_ROLECHECK)
+            continue;
+
+        if (GetLFGGroupState(pGroup->GetObjectGuid())->GetRoleCheckState() == LFG_ROLECHECK_FINISHED)
+            continue;
+
+        if (GetLFGGroupState(pGroup->GetObjectGuid())->QueryRoleCheckTime())
+            continue;
+
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetRoleCheckState(LFG_ROLECHECK_MISSING_ROLE);
+
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            if (Player* pGroupMember = itr->getSource())
+            {
+                if (pGroupMember->IsInWorld())
+                {
+                    pGroupMember->GetSession()->SendLfgRoleCheckUpdate();
+                    pGroupMember->GetSession()->SendLfgJoinResult(ERR_LFG_ROLE_CHECK_FAILED, LFG_ROLECHECK_MISSING_ROLE);
+                }
+            }
+        }
+        GetLFGGroupState(pGroup->GetObjectGuid())->Clear();
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetRoleCheckState(LFG_ROLECHECK_NONE);
+        RemoveFromQueue(pGroup->GetObjectGuid());
+    }
+}
+
+void LFGMgr::StartRoleCheck(Group* pGroup)
+{
+    if (!pGroup)
+        return;
+
+    GetLFGGroupState(pGroup->GetObjectGuid())->StartRoleCheck();
+    GetLFGGroupState(pGroup->GetObjectGuid())->SetRoleCheckState(LFG_ROLECHECK_INITIALITING);
+    GetLFGGroupState(pGroup->GetObjectGuid())->SetState(LFG_STATE_ROLECHECK);
+
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        Player* pGroupMember = itr->getSource();
+        if (pGroupMember && pGroupMember->IsInWorld())
+        {
+            if (pGroupMember->GetObjectGuid() != pGroup->GetLeaderGuid())
+            {
+                GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetRoles(LFG_ROLE_MASK_NONE);
+                GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetState(LFG_STATE_ROLECHECK);
+            }
+            else
+            {
+                GetLFGPlayerState(pGroupMember->GetObjectGuid())->AddRole(ROLE_LEADER);
+                GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetState(LFG_STATE_QUEUED);
+            }
+            pGroupMember->GetSession()->SendLfgRoleCheckUpdate();
+        }
+    }
+}
+
+void LFGMgr::UpdateRoleCheck(Group* pGroup)
+{
+    if (!pGroup)
+        return;
+
+    if (GetLFGGroupState(pGroup->GetObjectGuid())->GetState() != LFG_STATE_ROLECHECK)
+        return;
+
+    bool isFinished = true;
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        if (Player* pGroupMember = itr->getSource())
+        {
+            if (pGroupMember->IsInWorld())
+            {
+                if (GetLFGPlayerState(pGroupMember->GetObjectGuid())->GetState() == LFG_STATE_QUEUED)
+                    continue;
+
+                LFGRoleCheckState newstate = LFG_ROLECHECK_NONE;
+
+                if (uint8(GetLFGPlayerState(pGroupMember->GetObjectGuid())->GetRoles()) < LFG_ROLE_MASK_TANK)
+                    newstate = LFG_ROLECHECK_INITIALITING;
+                else
+                {
+                    newstate = LFG_ROLECHECK_FINISHED;
+                    GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetState(LFG_STATE_QUEUED);
+                }
+
+                if (newstate != LFG_ROLECHECK_FINISHED)
+                    isFinished = false;
+            }
+        }
+    }
+
+
+    if (!isFinished)
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetRoleCheckState(LFG_ROLECHECK_INITIALITING);
+    else if (!CheckRoles(pGroup))
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetRoleCheckState(LFG_ROLECHECK_WRONG_ROLES);
+    else
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetRoleCheckState(LFG_ROLECHECK_FINISHED);
+
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        if (Player* pGroupMember = itr->getSource())
+        {
+            if (pGroupMember->IsInWorld())
+            {
+                pGroupMember->GetSession()->SendLfgRoleCheckUpdate();
+            }
+        }
+    }
+
+    DEBUG_LOG("LFGMgr::UpdateRoleCheck group %u %s result %u", pGroup->GetObjectGuid().GetCounter(),isFinished ? "completed" : "not finished", GetLFGGroupState(pGroup->GetObjectGuid())->GetRoleCheckState());
+
+    // temporary - only all answer accept
+    if (GetLFGGroupState(pGroup->GetObjectGuid())->GetRoleCheckState() != LFG_ROLECHECK_FINISHED)
+        return;
+
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        Player* pGroupMember = itr->getSource();
+
+        if (pGroupMember && pGroupMember->IsInWorld())
+        {
+            pGroupMember->GetSession()->SendLfgRoleCheckUpdate();
+
+            if (GetLFGGroupState(pGroup->GetObjectGuid())->GetRoleCheckState() == LFG_ROLECHECK_FINISHED)
+            {
+                GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetJoined();
+                GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetState(LFG_STATE_QUEUED);
+
+                if (pGroupMember->GetObjectGuid() == pGroup->GetLeaderGuid())
+                    pGroupMember->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_ADDED_TO_QUEUE, GetLFGGroupState(pGroup->GetObjectGuid())->GetType());
+                else
+                {
+//                    member->GetSession()->SendLfgJoinResult(ERR_LFG_OK, LFG_ROLECHECK_NONE, true);
+                    pGroupMember->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_JOIN_PROPOSAL, GetLFGGroupState(pGroup->GetObjectGuid())->GetType());
+                }
+            }
+            else
+            {
+                GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetState(LFG_STATE_NONE);
+                pGroupMember->GetSession()->SendLfgJoinResult(ERR_LFG_ROLE_CHECK_FAILED, LFG_ROLECHECK_MISSING_ROLE);
+                pGroupMember->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_ROLECHECK_FAILED, GetLFGGroupState(pGroup->GetObjectGuid())->GetType());
+            }
+        }
+    }
+
+    DEBUG_LOG("LFGMgr::UpdateRoleCheck finished, group %u result %u", pGroup->GetObjectGuid().GetCounter(), GetLFGGroupState(pGroup->GetObjectGuid())->GetRoleCheckState());
+
+    if (GetLFGGroupState(pGroup->GetObjectGuid())->GetRoleCheckState() == LFG_ROLECHECK_FINISHED)
+    {
+        GetLFGGroupState(pGroup->GetObjectGuid())->SetState(LFG_STATE_QUEUED);
+    }
+    else
+    {
+        RemoveFromQueue(pGroup->GetObjectGuid());
+    }
+}
+
+bool LFGMgr::CheckRoles(Group* pGroup, Player* pPlayer /*=NULL*/)
+{
+    if (!pGroup)
+        return false;
+
+    if (pGroup->isRaidGroup())
+        return true;
+
+
+    LFGRolesMap rolesMap;
+
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        if (Player* pGroupMember = itr->getSource())
+            if (pGroupMember->IsInWorld())
+                rolesMap.insert(std::make_pair(pGroupMember->GetObjectGuid(), GetLFGPlayerState(pGroupMember->GetObjectGuid())->GetRoles()));
+    }
+
+    if (pPlayer && pPlayer->IsInWorld())
+        rolesMap.insert(std::make_pair(pPlayer->GetObjectGuid(), GetLFGPlayerState(pPlayer->GetObjectGuid())->GetRoles()));
+
+    bool retcode = CheckRoles(rolesMap);
+
+    return retcode;
+}
+
+bool LFGMgr::CheckRoles(LFGRolesMap& rolesMap)
+{
+    if (rolesMap.empty())
+        return false;
+
+    if (rolesMap.size() > MAX_GROUP_SIZE)
+        return false;
+
+    uint8 tanks   = LFG_TANKS_NEEDED;
+    uint8 healers = LFG_HEALERS_NEEDED;
+    uint8 dps     = LFG_DPS_NEEDED;
+    std::vector<LFGRoleMask> rolesVector;
+
+    for (LFGRolesMap::const_iterator itr = rolesMap.begin(); itr != rolesMap.end(); ++itr)
+        rolesVector.push_back(LFGRoleMask(itr->second & ~LFG_ROLE_MASK_LEADER));
+
+    std::sort(rolesVector.begin(),rolesVector.end());
+
+    for (std::vector<LFGRoleMask>::const_iterator itr = rolesVector.begin(); itr != rolesVector.end(); ++itr)
+    {
+        if ((*itr & LFG_ROLE_MASK_TANK) && tanks > 0)
+            --tanks;
+        else if ((*itr & LFG_ROLE_MASK_HEALER) && healers > 0)
+            --healers;
+        else if ((*itr & LFG_ROLE_MASK_DAMAGE) && dps > 0)
+            --dps;
+    }
+
+    DEBUG_LOG("LFGMgr::CheckRoles healers %u tanks %u dps %u map size " SIZEFMTD, healers, tanks, dps, rolesMap.size());
+
+//    if (sWorld.getConfig(CONFIG_BOOL_LFG_DEBUG_ENABLE))
+//        return true;
+
+    if ((healers + tanks + dps) > int8(MAX_GROUP_SIZE - rolesMap.size()))
+        return false;
+
+    return true;
+}
+
+bool LFGMgr::RoleChanged(Player* pPlayer, LFGRoleMask roles)
+{
+    uint8 oldRoles = GetLFGPlayerState(pPlayer->GetObjectGuid())->GetRoles();
+    GetLFGPlayerState(pPlayer->GetObjectGuid())->SetRoles(roles);
+
+    if (Group* pGroup = pPlayer->GetGroup())
+    {
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* pGroupMember = itr->getSource();
+            if (pGroupMember && pGroupMember->IsInWorld())
+                pGroupMember->GetSession()->SendLfgRoleChosen(pPlayer->GetObjectGuid(), roles);
+        }
+    }
+    else
+        pPlayer->GetSession()->SendLfgRoleChosen(pPlayer->GetObjectGuid(), roles);
+
+    if (oldRoles != GetLFGPlayerState(pPlayer->GetObjectGuid())->GetRoles())
+        return true;
+
+    return false;
+}
+
+Player* LFGMgr::LeaderElection(GuidSet* playerGuids)
+{
+    std::set<Player*> leaders;
+    Player* leader = NULL;
+    uint32 GS = 0;
+
+    for (GuidSet::const_iterator itr = playerGuids->begin(); itr != playerGuids->end(); ++itr)
+    {
+        Player* member  = sObjectMgr.GetPlayer(*itr);
+        if (member && member->IsInWorld())
+        {
+            if (GetLFGPlayerState(member->GetObjectGuid())->GetRoles() & LFG_ROLE_MASK_LEADER)
+                leaders.insert(member);
+
+            GetLFGPlayerState(member->GetObjectGuid())->RemoveRole(ROLE_LEADER);
+
+            if (member->GetEquipGearScore() > GS)
+            {
+                GS = member->GetEquipGearScore();
+                leader = member;
+            }
+        }
+    }
+
+    GS = 0;
+    if (!leaders.empty())
+    {
+        for (std::set<Player*>::const_iterator itr = leaders.begin(); itr != leaders.end(); ++itr)
+        {
+            if ((*itr)->GetEquipGearScore() > GS)
+            {
+                GS = (*itr)->GetEquipGearScore();
+                leader = (*itr);
+            }
+        }
+    }
+
+    if (!leader)
+    {
+        for (GuidSet::const_iterator itr = playerGuids->begin(); itr != playerGuids->end(); ++itr)
+        {
+            Player* member  = sObjectMgr.GetPlayer(*itr);
+            if (member && member->IsInWorld())
+            {
+                leader = member;
+                break;
+            }
+        }
+    }
+    // leader may be NULL!
+    return leader;
+}
+
+bool LFGMgr::SetRoles(LFGRolesMap& rolesMap)
+{
+    if (rolesMap.empty())
+        return false;
+
+    DEBUG_LOG("LFGMgr::SetRoles set roles for rolesmap size = %u",uint8(rolesMap.size()));
+
+    LFGRoleMask oldRoles = LFG_ROLE_MASK_NONE;
+    LFGRoleMask newRole = LFG_ROLE_MASK_NONE;
+    ObjectGuid  tankGuid;
+    ObjectGuid  healGuid;
+
+    LFGRolesMap tmpMap;
+
+    // strip double/triple roles
+    for (LFGRolesMap::const_iterator itr = rolesMap.begin(); itr != rolesMap.end(); ++itr)
+    {
+        if (itr->second & LFG_ROLE_MASK_TANK)
+            tmpMap.insert(*itr);
+    }
+
+    if (tmpMap.size() == 1)
+    {
+        tankGuid = tmpMap.begin()->first;
+        newRole  = LFGRoleMask(tmpMap.begin()->second & ~LFG_ROLE_MASK_HEALER_DAMAGE);
+    }
+    else
+    {
+        for (LFGRolesMap::iterator itr = tmpMap.begin(); itr != tmpMap.end(); ++itr)
+        {
+            tankGuid = itr->first;
+            LFGRolesMap::iterator itr2 = rolesMap.find(tankGuid);
+            oldRoles = itr2->second;
+            newRole    = LFGRoleMask(itr->second & ~LFG_ROLE_MASK_HEALER_DAMAGE);
+
+            itr2->second = LFGRoleMask(newRole);
+
+            if (CheckRoles(rolesMap))
+                break;
+            else
+                itr2->second = oldRoles;
+        }
+    }
+    LFGRolesMap::iterator currentRolesItr = rolesMap.find(tankGuid);
+    if (currentRolesItr == rolesMap.end())
+    {
+        sLog.outError("LFGMgr::SetRoles player %s removed from roles map (TANK role) while SetRoles() processing! SetRoles failed.", tankGuid.GetString().c_str());
+        return false;
+    }
+    currentRolesItr->second = newRole;
+    tmpMap.clear();
+
+    for (LFGRolesMap::const_iterator itr = rolesMap.begin(); itr != rolesMap.end(); ++itr)
+    {
+        if (itr->second & LFG_ROLE_MASK_HEALER)
+            tmpMap.insert(*itr);
+    }
+
+    if (tmpMap.size() == 1)
+    {
+        healGuid = tmpMap.begin()->first;
+        newRole    = LFGRoleMask(tmpMap.begin()->second & ~LFG_ROLE_MASK_TANK_DAMAGE);
+    }
+    else
+    {
+        for (LFGRolesMap::iterator itr = tmpMap.begin(); itr != tmpMap.end(); ++itr)
+        {
+            healGuid = itr->first;
+            LFGRolesMap::iterator itr2 = rolesMap.find(healGuid);
+            oldRoles = itr2->second;
+            newRole    = LFGRoleMask(itr->second & ~LFG_ROLE_MASK_TANK_DAMAGE);
+
+            itr2->second = LFGRoleMask(newRole);
+
+            if (CheckRoles(rolesMap))
+                break;
+            else
+                itr2->second = oldRoles;
+        }
+    }
+    currentRolesItr = rolesMap.find(healGuid);
+    if (currentRolesItr == rolesMap.end())
+    {
+        sLog.outError("LFGMgr::SetRoles player %s removed from roles map (HEALER role) while SetRoles() processing! SetRoles failed.", healGuid.GetString().c_str());
+        return false;
+    }
+    currentRolesItr->second = newRole;
+    tmpMap.clear();
+
+    for (LFGRolesMap::iterator itr = rolesMap.begin(); itr != rolesMap.end(); ++itr)
+    {
+        if (itr->first != tankGuid && itr->first != healGuid)
+        {
+            newRole      = LFGRoleMask(itr->second & ~LFG_ROLE_MASK_TANK_HEALER);
+            itr->second  = LFGRoleMask(newRole);
+        }
+    }
+
+    for (LFGRolesMap::const_iterator itr = rolesMap.begin(); itr != rolesMap.end(); ++itr)
+    {
+        Player* pPlayer = sObjectMgr.GetPlayer(itr->first);
+        if (pPlayer && pPlayer->IsInWorld())
+        {
+            GetLFGPlayerState(pPlayer->GetObjectGuid())->SetRoles(itr->second);
+            DEBUG_LOG("LFGMgr::SetRoles role for player %s set to %u",pPlayer->GetObjectGuid().GetString().c_str(), uint8(itr->second));
+        }
+    }
+    return true;
+}
+
+void LFGMgr::SetGroupRoles(Group* pGroup, GuidSet* players)
+{
+    if (!pGroup)
+        return;
+
+    LFGRolesMap rolesMap;
+    bool hasMultiRoles = false;
+
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        Player* pGroupMember = itr->getSource();
+        if (pGroupMember && pGroupMember->IsInWorld())
+        {
+            rolesMap.insert(std::make_pair(pGroupMember->GetObjectGuid(), GetLFGPlayerState(pGroupMember->GetObjectGuid())->GetRoles()));
+            if (!GetLFGPlayerState(pGroupMember->GetObjectGuid())->IsSingleRole())
+                hasMultiRoles = true;
+        }
+    }
+
+    if (players && !players->empty())
+    {
+        for (GuidSet::const_iterator itr = players->begin(); itr != players->end(); ++itr)
+        {
+            Player* pPlayer = sObjectMgr.GetPlayer(*itr);
+            if (pPlayer && pPlayer->IsInWorld())
+            {
+                rolesMap.insert(std::make_pair(pPlayer->GetObjectGuid(), GetLFGPlayerState(pPlayer->GetObjectGuid())->GetRoles()));
+                if (!GetLFGPlayerState(pPlayer->GetObjectGuid())->IsSingleRole())
+                    hasMultiRoles = true;
+            }
+        }
+    }
+
+    if (!hasMultiRoles)
+        return;
+
+    SetRoles(rolesMap);
+}
+
+void LFGMgr::TryCompleteGroups(LFGType type)
+{
+
+    if (m_groupQueue[type].empty())
+        return;
+
+    bool isGroupCompleted = false;  // we make only one group for iterations! not more!
+
+    for (LFGQueue::iterator itr = m_groupQueue[type].begin(); itr != m_groupQueue[type].end(); ++itr)
+    {
+        Group* pGroup = sObjectMgr.GetGroup((*itr)->guid);
+        if (!pGroup)
+            continue;
+
+//            DEBUG_LOG("LFGMgr:TryCompleteGroups: Try complete group %u  type %u state %u", group->GetObjectGuid().GetCounter(), type, group->GetLFGState()->GetState());
+        if (GetLFGGroupState(pGroup->GetObjectGuid())->GetState() != LFG_STATE_QUEUED
+            && !(GetLFGGroupState(pGroup->GetObjectGuid())->GetState() == LFG_STATE_QUEUED && GetLFGGroupState(pGroup->GetObjectGuid())->GetStatus() == LFG_STATUS_NOT_SAVED))
+            continue;
+
+        if (IsGroupCompleted(pGroup))
+        {
+            DEBUG_LOG("LFGMgr:TryCompleteGroups: Try complete group %u  type %u, but his already completed!", pGroup->GetObjectGuid().GetCounter(), type);
+            CompleteGroup(pGroup,NULL);
+            isGroupCompleted = true;
+            break;
+        }
+        GuidSet applicants;
+
+        for (LFGQueue::iterator itr2 = m_playerQueue[type].begin(); itr2 != m_playerQueue[type].end(); ++itr2)
+        {
+            Player* pPlayer = sObjectMgr.GetPlayer((*itr2)->guid);
+            if (!pPlayer)
+                continue;
+
+            if (GetLFGPlayerState(pPlayer->GetObjectGuid())->GetState() != LFG_STATE_QUEUED)
+                continue;
+
+//            DEBUG_LOG("LFGMgr:TryCompleteGroups: Try complete group %u with player %u, type %u state %u", group->GetObjectGuid().GetCounter(),player->GetObjectGuid().GetCounter(), type, group->GetLFGState()->GetState());
+
+            switch (type)
+            {
+                case LFG_TYPE_DUNGEON:
+                case LFG_TYPE_QUEST:
+                case LFG_TYPE_ZONE:
+                case LFG_TYPE_HEROIC_DUNGEON:
+                case LFG_TYPE_RANDOM_DUNGEON:
+                {
+                    applicants.insert((*itr2)->guid);
+                    if (TryAddMembersToGroup(pGroup,&applicants))
+                    {
+                        if (IsGroupCompleted(pGroup, applicants.size()))
+                        {
+                            CompleteGroup(pGroup,&applicants);
+                            isGroupCompleted = true;
+                        }
+                    }
+                    else
+                        applicants.erase((*itr2)->guid);
+
+                    break;
+                }
+                case LFG_TYPE_RAID:
+                default:
+                    break;
+            }
+            if (isGroupCompleted)
+                break;
+        }
+        if (isGroupCompleted)
+            break;
+        applicants.clear();
+    }
+}
+
+bool LFGMgr::TryAddMembersToGroup(Group* pGroup, GuidSet* players)
+{
+    if (!pGroup || players->empty())
+        return false;
+
+    LFGRolesMap rolesMap;
+    LFGDungeonSet const* groupDungeons = GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeons();
+    LFGDungeonSet intersection  = *groupDungeons;
+
+    for (GuidSet::const_iterator itr = players->begin(); itr != players->end(); ++itr)
+    {
+        Player* pPlayer = sObjectMgr.GetPlayer(*itr);
+        if (!pPlayer || !pPlayer->IsInWorld())
+            return false;
+
+        if (!CheckTeam(pGroup, pPlayer))
+           return false;
+
+        if (HasIgnoreState(pGroup, pPlayer->GetObjectGuid()))
+           return false;
+        /*
+        if (LFGProposal* pProposal = group->GetLFGState()->GetProposal())
+        {
+            if (pProposal->IsDecliner(player->GetObjectGuid()))
+               return false;
+        }
+        */
+        if (!CheckRoles(pGroup, pPlayer))
+           return false;
+
+        rolesMap.insert(std::make_pair(pPlayer->GetObjectGuid(), GetLFGPlayerState(pPlayer->GetObjectGuid())->GetRoles()));
+        if (!CheckRoles(rolesMap))
+           return false;
+
+        LFGDungeonSet const* playerDungeons = GetLFGPlayerState(pPlayer->GetObjectGuid())->GetDungeons();
+        LFGDungeonSet  tmpIntersection;
+        std::set_intersection(intersection.begin(),intersection.end(), playerDungeons->begin(),playerDungeons->end(),std::inserter(tmpIntersection,tmpIntersection.end()));
+        if (tmpIntersection.empty())
+            return false;
+        intersection = tmpIntersection;
+    }
+    return true;
+}
+
+void LFGMgr::CompleteGroup(Group* pGroup, GuidSet* players)
+{
+
+    DEBUG_LOG("LFGMgr:CompleteGroup: Try complete group %u with %lu players", pGroup->GetObjectGuid().GetCounter(), players ? players->size() : 0);
+
+    LFGDungeonSet const* groupDungeons = GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeons();
+    LFGDungeonSet  intersection  = *groupDungeons;
+    if (players)
+    {
+        for (GuidSet::const_iterator itr = players->begin(); itr != players->end(); ++itr)
+        {
+            Player* pPlayer = sObjectMgr.GetPlayer(*itr);
+            if (!pPlayer || !pPlayer->IsInWorld())
+                return;
+
+            LFGDungeonSet const* playerDungeons = GetLFGPlayerState(pPlayer->GetObjectGuid())->GetDungeons();
+            LFGDungeonSet  tmpIntersection;
+            std::set_intersection(intersection.begin(),intersection.end(), playerDungeons->begin(),playerDungeons->end(),std::inserter(tmpIntersection,tmpIntersection.end()));
+            intersection = tmpIntersection;
+        }
+    }
+
+    if (intersection.empty())
+    {
+        DEBUG_LOG("LFGMgr:CompleteGroup: Try complete group %u but dungeon list is empty!", pGroup->GetObjectGuid().GetCounter());
+        return;
+    }
+
+    SetGroupRoles(pGroup, players);
+    LFGDungeonEntry const* dungeon = SelectRandomDungeonFromList(intersection);
+    uint32 ID = CreateProposal(dungeon,pGroup,players);
+    DEBUG_LOG("LFGMgr:CompleteGroup: dungeons for group %u with %lu players found, created proposal %u", pGroup->GetObjectGuid().GetCounter(), players ? players->size() : 0, ID);
+}
+
+bool LFGMgr::TryCreateGroup(LFGType type)
+{
+    bool groupCreated = false;
+    for (LFGSearchMap::const_iterator itr = m_searchMatrix.begin(); itr != m_searchMatrix.end(); ++itr)
+    {
+        if (itr->first->type != type)
+            continue;
+
+        if (itr->second.empty())
+            continue;
+
+//        DEBUG_LOG("LFGMgr:TryCreateGroup: Try create group  with %u players", itr->second.size());
+
+        if (!IsGroupCompleted(NULL,itr->second.size()))
+            continue;
+
+        LFGDungeonSet intersection;
+        GuidSet newGroup;
+        GuidSet const* applicants = &itr->second;
+        // playerbot mod
+        for (int pass = 0; pass < 2; ++pass)
+        {
+        // end of playerbot mod
+
+        for (GuidSet::const_iterator itr1 = applicants->begin(); itr1 != applicants->end(); ++itr1)
+        {
+            ObjectGuid guid = *itr1;
+            bool checkPassed = true;
+            LFGRolesMap rolesMap;
+            for (GuidSet::const_iterator itr2 = newGroup.begin(); itr2 != newGroup.end(); ++itr2)
+            {
+                ObjectGuid guid2 = *itr2;
+                if (guid != guid2 && (!CheckTeam(guid, guid2) || HasIgnoreState(guid, guid2)))
+                    checkPassed = false;
+                else
+                {
+                    Player* pPlayer = sObjectMgr.GetPlayer(guid2);
+                    if (pPlayer && pPlayer->IsInWorld())
+                    {
+                        rolesMap.insert(std::make_pair(pPlayer->GetObjectGuid(), GetLFGPlayerState(pPlayer->GetObjectGuid())->GetRoles()));
+                    }
+                }
+            }
+            if (!checkPassed)
+                continue;
+
+            Player* player1 = sObjectMgr.GetPlayer(guid);
+            if (player1 && player1->IsInWorld() &&
+                    // playerbot mod
+                    ((!pass && !player1->GetPlayerbotAI()) || pass)
+                    // end of playerbot mod
+                    )
+            {
+                rolesMap.insert(std::make_pair(player1->GetObjectGuid(), GetLFGPlayerState(player1->GetObjectGuid())->GetRoles()));
+
+                if (!CheckRoles(rolesMap))
+                   continue;
+
+                newGroup.insert(guid);
+                if (newGroup.size() == 1)
+                   intersection = *GetLFGPlayerState(player1->GetObjectGuid())->GetDungeons();
+                else
+                {
+                   LFGDungeonSet groupDungeons = intersection;
+                   intersection.clear();
+                   LFGDungeonSet const* playerDungeons = GetLFGPlayerState(player1->GetObjectGuid())->GetDungeons();
+                   std::set_intersection(groupDungeons.begin(),groupDungeons.end(), playerDungeons->begin(),playerDungeons->end(),std::inserter(intersection,intersection.end()));
+                }
+
+                if (IsGroupCompleted(NULL, newGroup.size()))
+                   groupCreated = true;
+
+                if (!groupCreated)
+                   continue;
+
+                if (!SetRoles(rolesMap))
+                    continue;
+
+                break;
+            }
+        }
+
+        // playerbot mod
+        if (!pass && newGroup.empty())
+            break;
+        }
+        // end of playerbot mod
+
+        DEBUG_LOG("LFGMgr:TryCreateGroup: Try create group to dungeon %u from " SIZEFMTD " players. result is %u", itr->first->ID, itr->second.size(), uint8(groupCreated));
+        if (groupCreated)
+        {
+            LFGDungeonEntry const* dungeon = SelectRandomDungeonFromList(intersection);
+            CreateProposal(dungeon, NULL, &newGroup);
+            return true;
+        }
+    }
+    return false;
+}
+
+LFGQueueStatus* LFGMgr::GetDungeonQueueStatus(LFGType type)
+{
+    return &m_queueStatus[type];
+}
+
+void LFGMgr::UpdateQueueStatus(Player* pPlayer)
+{
+}
+
+void LFGMgr::UpdateQueueStatus(Group* pGroup)
+{
+}
+
+void LFGMgr::UpdateQueueStatus(LFGType type)
+{
+    if (m_playerQueue[type].empty() && m_groupQueue[type].empty())
+        return;
+
+    uint32 damagers = 0;
+    uint64 damagersTime = 0;
+
+    uint32 healers = 0;
+    uint64 healersTime = 0;
+
+    uint32 tanks = 0;
+    uint64 tanksTime = 0;
+
+    uint64 fullTime = 0;
+
+    uint32 fullCount = 0;
+
+    for (LFGQueueInfoMap::const_iterator itr = m_queueInfoMap.begin(); itr != m_queueInfoMap.end(); ++itr)
+    {
+        LFGQueueInfo const& pqInfo = itr->second;
+        ObjectGuid   const& guid   = itr->first;       // Player or Group guid
+
+        if (pqInfo.GetDungeonType() != type)
+            continue;
+
+        tanks += (LFG_TANKS_NEEDED - pqInfo.tanks);
+        if (LFG_TANKS_NEEDED - pqInfo.tanks)
+            tanksTime += uint64(time(NULL) - pqInfo.joinTime);
+        healers  += (LFG_HEALERS_NEEDED - pqInfo.healers);
+        if (LFG_HEALERS_NEEDED - pqInfo.healers)
+            healersTime += uint64(time(NULL) - pqInfo.joinTime);
+        damagers += (LFG_DPS_NEEDED - pqInfo.dps);
+        if (LFG_DPS_NEEDED - pqInfo.dps)
+            damagersTime += uint64(time(NULL) - pqInfo.joinTime);
+        if (guid.IsGroup())
+        {
+            Group* pGroup = sObjectMgr.GetGroup(itr->first);
+            if (pGroup)
+            {
+                fullTime  += uint64(time(NULL) - pqInfo.joinTime) * pGroup->GetMembersCount();
+                fullCount += pGroup->GetMembersCount();
+            }
+        }
+        else
+        {
+            fullTime  += uint64(time(NULL) - pqInfo.joinTime);
+            fullCount +=1;
+        }
+    }
+
+    LFGQueueStatus& status = m_queueStatus[type];
+
+    status.dps     = damagers;
+    status.tanks   = tanks;
+    status.healers = healers;
+
+    status.waitTimeTanks  = tanks     ? time_t(tanksTime/tanks)       : 0;
+    status.waitTimeHealer = healers   ? time_t(healersTime/healers)   : 0;
+    status.waitTimeDps    = damagers  ? time_t(damagersTime/damagers) : 0;
+
+    status.avgWaitTime    = fullCount ? time_t(fullTime/fullCount)    : 0;
+
+}
+
+void LFGMgr::SendStatistic(LFGType type)
+{
+    GuidSet fullSet = GetDungeonPlayerQueue(type);
+
+
+    LFGQueueStatus* status = GetDungeonQueueStatus(type);
+
+    for (GuidSet::iterator itr = fullSet.begin(); itr != fullSet.end(); ++itr)
+    {
+        ObjectGuid guid = *itr;
+        if (guid.IsEmpty())
+            continue;
+
+        Player* pPlayer = sObjectMgr.GetPlayer(guid);
+
+        if (!pPlayer || !pPlayer->IsInWorld())
+            continue;
+
+        uint8 statIndex = 0;
+        if (!sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GROUP))
+        {
+            if (pPlayer->GetTeam() == HORDE)
+                statIndex = 2;
+            else if (pPlayer->GetTeam() == ALLIANCE)
+                statIndex = 1;
+        }
+
+        LFGDungeonEntry const* dungeon = *GetLFGPlayerState(pPlayer->GetObjectGuid())->GetDungeons()->begin();
+
+        if (!dungeon)
+            continue;
+        pPlayer->GetSession()->SendLfgQueueStatus(dungeon, status);
+    }
+
+    GuidSet groupSet = GetDungeonGroupQueue(type);
+
+    for (GuidSet::iterator itr = groupSet.begin(); itr != groupSet.end(); ++itr)
+    {
+        ObjectGuid guid = *itr;
+        if (guid.IsEmpty())
+            continue;
+
+        Group* pGroup = sObjectMgr.GetGroup(guid);
+
+        if (!pGroup)
+            continue;
+
+        LFGDungeonEntry const* dungeon = *GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeons()->begin();
+
+        if (!dungeon)
+            continue;
+
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* pGroupMember = itr->getSource();
+            if (pGroupMember && pGroupMember->IsInWorld())
+                pGroupMember->GetSession()->SendLfgQueueStatus(dungeon, status);
+        }
+    }
+}
+
+LFGQueueStatus* LFGMgr::GetOverallQueueStatus()
+{
+    return GetDungeonQueueStatus(LFG_TYPE_NONE);
+}
+
+void LFGMgr::AddToSearchMatrix(ObjectGuid guid, bool inBegin)
+{
+    if (!guid.IsPlayer())
+        return;
+
+    Player* pPlayer = sObjectMgr.GetPlayer(guid);
+    if (!pPlayer)
+        return;
+
+    LFGDungeonSet const* dungeons = GetLFGPlayerState(guid)->GetDungeons();
+
+    DEBUG_LOG("LFGMgr::AddToSearchMatrix %u added, dungeons size " SIZEFMTD, guid.GetCounter(),dungeons->size());
+
+    if (dungeons->empty())
+        return;
+
+    for (LFGDungeonSet::const_iterator itr = dungeons->begin(); itr != dungeons->end(); ++itr)
+    {
+        LFGDungeonEntry const* dungeon = *itr;
+
+        if (!dungeon)
+            continue;
+
+        GuidSet* players = GetPlayersForDungeon(dungeon);
+        if (!players || players->empty())
+        {
+            GuidSet _players;
+            _players.insert(guid);
+            m_searchMatrix.insert(std::make_pair(dungeon,_players));
+        }
+        else
+        {
+            players->insert((inBegin ? players->begin() : players->end()), guid);
+        }
+    }
+}
+
+void LFGMgr::RemoveFromSearchMatrix(ObjectGuid guid)
+{
+    if (!guid.IsPlayer())
+        return;
+
+    Player* pPlayer = sObjectMgr.GetPlayer(guid);
+    if (!pPlayer)
+        return;
+
+
+    LFGDungeonSet const* dungeons = GetLFGPlayerState(pPlayer->GetObjectGuid())->GetDungeons();
+
+    DEBUG_LOG("LFGMgr::RemoveFromSearchMatrix %u removed, dungeons size " SIZEFMTD, guid.GetCounter(),dungeons->size());
+
+    if (dungeons->empty())
+        return;
+
+    for (LFGDungeonSet::const_iterator itr = dungeons->begin(); itr != dungeons->end(); ++itr)
+    {
+        LFGDungeonEntry const* dungeon = *itr;
+
+        if (!dungeon)
+            continue;
+
+        GuidSet* players = GetPlayersForDungeon(dungeon);
+        if (players && !players->empty())
+        {
+            GuidSet _players;
+            players->erase(guid);
+            if (players->empty())
+                m_searchMatrix.erase(dungeon);
+        }
+    }
+}
+
+GuidSet* LFGMgr::GetPlayersForDungeon(LFGDungeonEntry const* dungeon)
+{
+    LFGSearchMap::iterator itr = m_searchMatrix.find(dungeon);
+    return itr != m_searchMatrix.end() ? &itr->second : NULL;
+}
+
+bool LFGMgr::IsInSearchFor(LFGDungeonEntry const* dungeon, ObjectGuid guid)
+{
+    GuidSet* players = GetPlayersForDungeon(dungeon);
+    if (!dungeon)
+        return false;
+
+    if (players->find(guid) != players->end())
+        return true;
+
+    else return false;
+}
+
+void LFGMgr::CleanupSearchMatrix()
+{
+    for (LFGSearchMap::iterator itr = m_searchMatrix.begin(); itr != m_searchMatrix.end(); itr++)
+    {
+        GuidSet players = itr->second;
+        for (GuidSet::iterator itr2 = players.begin(); itr2 != players.end(); ++itr2)
+        {
+            ObjectGuid guid = *itr2;
+            if (guid.IsEmpty())
+                continue;
+
+            Player* pPlayer = sObjectMgr.GetPlayer(guid);
+
+            if (!pPlayer || !pPlayer->IsInWorld())
+            {
+                itr->second.erase(guid);
+            }
+        }
+    }
+}
+
+bool LFGMgr::HasIgnoreState(ObjectGuid guid1, ObjectGuid guid2)
+{
+    Player* pPlayer = sObjectMgr.GetPlayer(guid1);
+    if (!pPlayer || !pPlayer->IsInWorld())
+        return false;
+
+    if (pPlayer->GetSocial()->HasIgnore(guid2))
+        return true;
+
+    return false;
+}
+
+bool LFGMgr::HasIgnoreState(Group* pGroup, ObjectGuid guid)
+{
+    if (!pGroup)
+        return false;
+
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        if (Player* pGroupMember = itr->getSource())
+            if (HasIgnoreState(pGroupMember->GetObjectGuid(), guid))
+                return true;
+    }
+
+    return false;
+}
+
+bool LFGMgr::CheckTeam(ObjectGuid guid1, ObjectGuid guid2)
+{
+
+    if (guid1.IsEmpty() || guid2.IsEmpty())
+        return true;
+
+    Player* pPlayer1 = sObjectMgr.GetPlayer(guid1);
+    Player* pPlayer2 = sObjectMgr.GetPlayer(guid2);
+
+    if (!pPlayer1 || !pPlayer2)
+        return true;
+
+    if (sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GROUP))
+        return true;
+
+    if (pPlayer1->GetTeam() == pPlayer2->GetTeam())
+        return true;
+
+    return false;
+}
+
+bool LFGMgr::CheckTeam(Group* pGroup, Player* pPlayer)
+{
+    if (!pGroup || !pPlayer)
+        return true;
+
+    if (sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GROUP))
+        return true;
+
+    Player* pLeader = sObjectMgr.GetPlayer(pGroup->GetLeaderGuid());
+    if (pLeader)
+    {
+        if (pLeader->GetTeam() == pPlayer->GetTeam())
+            return true;
+    }
+
+    return false;
+}
+
+LFGDungeonEntry const* LFGMgr::SelectRandomDungeonFromList(LFGDungeonSet dungeons)
+{
+    if (dungeons.empty())
+    {
+        DEBUG_LOG("LFGMgr::SelectRandomDungeonFromList cannot select dungeons from empty list!");
+        return NULL;
+    }
+
+    if (dungeons.size() == 1)
+        return *dungeons.begin();
+    else
+    {
+        uint32 rand = urand(0, dungeons.size() - 1);
+        uint32 _key = 0;
+        for (LFGDungeonSet::const_iterator itr = dungeons.begin(); itr != dungeons.end(); ++itr)
+        {
+            LFGDungeonEntry const* dungeon = *itr;
+            if (!dungeon)
+                continue;
+            if (_key == rand)
+                return dungeon;
+            else ++_key;
+        }
+    }
+    return NULL;
+}
+
+void LFGMgr::UpdateLFRGroups()
+{
+    LFGType type = LFG_TYPE_RAID;
+
+    LFGQueue tmpQueue = m_groupQueue[type];
+
+    for (LFGQueue::const_iterator itr = tmpQueue.begin(); itr != tmpQueue.end(); ++itr)
+    {
+        ObjectGuid guid = (*itr)->guid;
+        Group* pGroup = sObjectMgr.GetGroup(guid);
+        if (!pGroup || !pGroup->isLFRGroup())
+            continue;
+
+        if (GetLFGGroupState(pGroup->GetObjectGuid())->GetState() != LFG_STATE_LFR)
+            continue;
+
+        if (!IsGroupCompleted(pGroup))
+            continue;
+
+        if (!GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeon())
+        {
+            LFGDungeonEntry const* realdungeon = SelectRandomDungeonFromList(*GetLFGGroupState(pGroup->GetObjectGuid())->GetDungeons());
+            MANGOS_ASSERT(realdungeon);
+            GetLFGGroupState(pGroup->GetObjectGuid())->SetDungeon(realdungeon);
+            DEBUG_LOG("LFGMgr::UpdateLFRGroup: %u set real dungeon to %u.", pGroup->GetObjectGuid().GetCounter(), realdungeon->ID);
+
+            Player* leader = sObjectMgr.GetPlayer(pGroup->GetLeaderGuid());
+            if (leader && leader->GetMapId() != uint32(realdungeon->map))
+            {
+                pGroup->SetDungeonDifficulty(Difficulty(realdungeon->difficulty));
+                GetLFGGroupState(pGroup->GetObjectGuid())->SetStatus(LFG_STATUS_NOT_SAVED);
+                pGroup->SendUpdate();
+            }
+        }
+
+        uint8 tpnum = 0;
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* pGroupMember = itr->getSource();
+            if (pGroupMember && pGroupMember->IsInWorld())
+            {
+                if (GetLFGPlayerState(pGroupMember->GetObjectGuid())->GetState() < LFG_STATE_DUNGEON)
+                {
+                    AddMemberToLFDGroup(pGroupMember->GetObjectGuid());
+                    GetLFGPlayerState(pGroupMember->GetObjectGuid())->SetState(LFG_STATE_DUNGEON);
+                    ++tpnum;
+                }
+            }
+        }
+        if (tpnum)
+            Teleport(pGroup, false);
+        RemoveFromQueue(pGroup->GetObjectGuid());
+    }
+}
+
+bool LFGMgr::IsGroupCompleted(Group* pGroup, uint8 uiAddMembers)
+{
+    if (!pGroup)
+    {
+        if (sWorld.getConfig(CONFIG_BOOL_LFG_DEBUG_ENABLE) && uiAddMembers > 2)
+            return true;
+        else if (uiAddMembers >= MAX_GROUP_SIZE)
+            return true;
+        else
+            return false;
+    }
+
+    if (sWorld.getConfig(CONFIG_BOOL_LFG_DEBUG_ENABLE) && (pGroup->GetMembersCount() + uiAddMembers > 2))
+        return true;
+
+    if (pGroup->isRaidGroup())
+    {
+        switch (pGroup->GetDifficulty(true))
+        {
+            case RAID_DIFFICULTY_10MAN_NORMAL:
+            case RAID_DIFFICULTY_10MAN_HEROIC:
+                if (pGroup->GetMembersCount() + uiAddMembers >= 10)
+                    return true;
+                break;
+            case RAID_DIFFICULTY_25MAN_NORMAL:
+            case RAID_DIFFICULTY_25MAN_HEROIC:
+                if (pGroup->GetMembersCount() + uiAddMembers >= 25)
+                    return true;
+                break;
+            default:
+                return false;
+                break;
+        }
+    }
+    else if (pGroup->GetMembersCount() + uiAddMembers >= MAX_GROUP_SIZE)
+        return true;
+
+    return false;
+}
+
+void LFGMgr::AddMemberToLFDGroup(ObjectGuid guid)
+{
+    Player* pPlayer = sObjectMgr.GetPlayer(guid);
+
+    if (!pPlayer || !pPlayer->IsInWorld())
+        return;
+
+    Group* pGroup = pPlayer->GetGroup();
+
+    if (!pGroup)
+        return;
+
+    pGroup->SetGroupRoles(guid, GetLFGPlayerState(pPlayer->GetObjectGuid())->GetRoles());
+    RemoveFromQueue(pPlayer->GetObjectGuid());
+    RemoveFromSearchMatrix(pPlayer->GetObjectGuid());
+
+    GetLFGPlayerState(pPlayer->GetObjectGuid())->SetState(GetLFGGroupState(pGroup->GetObjectGuid())->GetState());
+}
+
+void LFGMgr::RemoveMemberFromLFDGroup(Group* pGroup, ObjectGuid guid)
+{
+    Player* pPlayer = sObjectMgr.GetPlayer(guid);
+
+    if (!pPlayer || !pPlayer->IsInWorld())
+        return;
+
+    if (pPlayer->HasAura(LFG_SPELL_DUNGEON_COOLDOWN) && !sWorld.getConfig(CONFIG_BOOL_LFG_DEBUG_ENABLE))
+        pPlayer->CastSpell(pPlayer,LFG_SPELL_DUNGEON_DESERTER,true);
+
+
+    if (!pGroup || !pGroup->isLFDGroup())
+    {
+        GetLFGPlayerState(pPlayer->GetObjectGuid())->Clear();
+        return;
+    }
+
+    if (GetLFGPlayerState(pPlayer->GetObjectGuid())->GetState() > LFG_STATE_QUEUED)
+        Teleport(pPlayer, true);
+    else if (pGroup && GetLFGGroupState(pGroup->GetObjectGuid())->GetState() > LFG_STATE_QUEUED)
+        Teleport(pPlayer, true);
+
+    if (pGroup && pGroup->isLFGGroup() && pGroup->GetMembersCount() > 1)
+    {
+        if (GetLFGGroupState(pGroup->GetObjectGuid())->GetState() > LFG_STATE_LFG
+            && GetLFGGroupState(pGroup->GetObjectGuid())->GetState() < LFG_STATE_FINISHED_DUNGEON)
+        {
+            OfferContinue(pGroup);
+        }
+    }
+
+    Leave(pPlayer);
+    GetLFGPlayerState(pPlayer->GetObjectGuid())->Clear();
+}
+
+void LFGMgr::DungeonEncounterReached(Group* pGroup)
+{
+    if (!pGroup)
+        return;
+
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    {
+        Player* pGroupMember = itr->getSource();
+        if (pGroupMember && pGroupMember->IsInWorld())
+        {
+            if (pGroupMember->HasAura(LFG_SPELL_DUNGEON_COOLDOWN))
+                pGroupMember->RemoveAurasDueToSpell(LFG_SPELL_DUNGEON_COOLDOWN);
+        }
+    }
+}
+
+void LFGMgr::SheduleEvent()
+{
+    if (m_eventList.empty())
+        return;
+
+    for (LFGEventList::iterator itr = m_eventList.begin(); itr != m_eventList.end(); ++itr)
+    {
+        // we run only one event for tick!!!
+        if (!itr->IsActive())
+            continue;
+        else
+        {
+            DEBUG_LOG("LFGMgr::SheduleEvent guid %u type %u",itr->guid.GetCounter(), itr->type);
+            switch (itr->type)
+            {
+                case LFG_EVENT_TELEPORT_PLAYER:
+                    {
+                        Player* pPlayer = sObjectMgr.GetPlayer(itr->guid);
+                        if (pPlayer)
+                            Teleport(pPlayer, bool(itr->eventParm));
+                    }
+                    break;
+                case LFG_EVENT_TELEPORT_GROUP:
+                    {
+                        Group* pGroup = sObjectMgr.GetGroup(itr->guid);
+                        if (pGroup)
+                            Teleport(pGroup, bool(itr->eventParm));
+                    }
+                    break;
+                case LFG_EVENT_NONE:
+                default:
+                    break;
+            }
+            m_eventList.erase(itr);
+            break;
+        }
+    }
+}
+
+void LFGMgr::AddEvent(ObjectGuid guid, LFGEventType type, time_t delay, uint8 param)
+{
+    DEBUG_LOG("LFGMgr::AddEvent guid %u type %u",guid.GetCounter(), type);
+    LFGEvent event = LFGEvent(type,guid,param);
+    m_eventList.push_back(event);
+    m_eventList.rbegin()->Start(delay);
+}
+
+void LFGMgr::LoadLFDGroupPropertiesForPlayer(Player* pPlayer)
+{
+    if (!pPlayer || !pPlayer->IsInWorld())
+        return;
+
+    Group* pGroup = pPlayer->GetGroup();
+    if (!pGroup)
+        return;
+
+    GetLFGPlayerState(pPlayer->GetObjectGuid())->SetRoles(pGroup->GetGroupRoles(pPlayer->GetObjectGuid()));
+    if (sWorld.getConfig(CONFIG_BOOL_RESTRICTED_LFG_CHANNEL))
+        pPlayer->JoinLFGChannel();
+
+    switch (GetLFGGroupState(pGroup->GetObjectGuid())->GetState())
+    {
+        case LFG_STATE_NONE:
+        case LFG_STATE_FINISHED_DUNGEON:
+        {
+            pPlayer->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_JOIN_PROPOSAL, GetLFGGroupState(pGroup->GetObjectGuid())->GetType());
+            break;
+        }
+        case LFG_STATE_DUNGEON:
+        {
+            if (GetLFGGroupState(pGroup->GetObjectGuid())->GetType() == LFG_TYPE_RAID)
+                break;
+            pPlayer->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_GROUP_FOUND, GetLFGGroupState(pGroup->GetObjectGuid())->GetType());
+            break;
+        }
+        default:
+           break;
+    }
+}
+
+void LFGMgr::OnPlayerEnterMap(Player* pPlayer, Map* pMap)
+{
+    if (!pPlayer || !pPlayer->IsInWorld() || !pMap)
+        return;
+
+    Group* pGroup = pPlayer->GetGroup();
+
+    if (!pGroup || !pGroup->isLFDGroup())
+        return;
+
+    if (pMap->IsDungeon() && pGroup->isLFGGroup())
+        pPlayer->CastSpell(pPlayer,LFG_SPELL_LUCK_OF_THE_DRAW,true);
+    else if (pMap->IsRaid() && pGroup->isLFRGroup() && sWorld.getConfig(CONFIG_BOOL_LFR_ENABLE))
+        pPlayer->CastSpell(pPlayer,LFG_SPELL_LUCK_OF_THE_DRAW,true);
+    else
+        pPlayer->RemoveAurasDueToSpell(LFG_SPELL_LUCK_OF_THE_DRAW);
+}
+
+void LFGMgr::OnPlayerLeaveMap(Player* pPlayer, Map* pMap)
+{
+    if (!pPlayer || !pPlayer->IsInWorld() || !pMap)
+        return;
+
+    Group* pGroup = pPlayer->GetGroup();
+
+    if (pPlayer->HasAura(LFG_SPELL_LUCK_OF_THE_DRAW))
+    {
+        if (!pGroup || !pGroup->isLFDGroup())
+            pPlayer->RemoveAurasDueToSpell(LFG_SPELL_LUCK_OF_THE_DRAW);
+    }
+}
+
+LFGPlayerState* LFGMgr::GetLFGPlayerState(ObjectGuid const& guid)
+{
+    if (!guid || !guid.IsPlayer())
+        return NULL;
+    LFGStatesMap::const_iterator itr = m_statesMap.find(guid);
+    return itr == m_statesMap.end() ? (LFGPlayerState*)CreateLFGState(guid) : (LFGPlayerState*)itr->second;
+}
+
+LFGGroupState* LFGMgr::GetLFGGroupState(ObjectGuid const& guid)
+{
+    if (!guid || !guid.IsGroup())
+        return NULL;
+    LFGStatesMap::iterator itr = m_statesMap.find(guid);
+    return itr == m_statesMap.end() ? (LFGGroupState*)CreateLFGState(guid) : (LFGGroupState*)itr->second;
+}
+
+LFGStateStructure* LFGMgr::CreateLFGState(ObjectGuid const& guid)
+{
+    if (!guid)
+        return NULL;
+    LFGStateStructure*& state =  m_statesMap[guid];
+    state = guid.IsGroup() ?  (LFGStateStructure*)(new LFGGroupState(guid)) :
+                              (LFGStateStructure*)( new LFGPlayerState(guid));
+
+    return state;
+}
+
+void LFGMgr::RemoveLFGState(ObjectGuid const& guid)
+{
+    if (!guid)
+        return;
+
+    LFGStatesMap::iterator itr = m_statesMap.find(guid);
+    if (itr != m_statesMap.end())
+    {
+        delete itr->second;
+        m_statesMap.erase(guid);
+    }
+}
diff --git a/src/game/LFGMgr.h b/src/game/LFGMgr.h
new file mode 100644
index 00000000000..e4e043d5171
--- /dev/null
+++ b/src/game/LFGMgr.h
@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _LFGMGR_H
+#define _LFGMGR_H
+
+#include "Common.h"
+#include "ObjectGuid.h"
+#include "Policies/Singleton.h"
+#include <ace/RW_Thread_Mutex.h>
+#include "LFG.h"
+#include "Timer.h"
+
+enum LFGenum
+{
+    LFG_TIME_ROLECHECK         = 2*MINUTE,
+    LFG_TIME_BOOT              = 2*MINUTE,
+    LFG_TIME_PROPOSAL          = 2*MINUTE,
+    LFG_TIME_JOIN_WARNING      = 1*IN_MILLISECONDS,
+    LFG_TANKS_NEEDED           = 1,
+    LFG_HEALERS_NEEDED         = 1,
+    LFG_DPS_NEEDED             = 3,
+    LFG_QUEUEUPDATE_INTERVAL   = 35*IN_MILLISECONDS,
+    LFG_UPDATE_INTERVAL        = 1*IN_MILLISECONDS,
+    LFR_UPDATE_INTERVAL        = 3*IN_MILLISECONDS,
+    DEFAULT_LFG_DELAY          = 1,
+    SHORT_LFG_DELAY            = 3,
+    LONG_LFG_DELAY             = 10,
+    LFG_SPELL_DUNGEON_COOLDOWN = 71328,
+    LFG_SPELL_DUNGEON_DESERTER = 71041,
+    LFG_SPELL_LUCK_OF_THE_DRAW = 72221,
+};
+
+enum LFGEventType
+{
+    LFG_EVENT_NONE                        = 0,
+    LFG_EVENT_TELEPORT_PLAYER             = 1,
+    LFG_EVENT_TELEPORT_GROUP              = 2,
+};
+
+class Group;
+class Player;
+class Map;
+struct LFGDungeonExpansionEntry;
+struct LFGProposal;
+
+// Reward info
+struct LFGReward
+{
+    uint32 maxLevel;
+    struct
+    {
+        uint32 questId;
+        uint32 variableMoney;
+        uint32 variableXP;
+    } reward[2];
+
+    LFGReward(uint32 _maxLevel, uint32 firstQuest, uint32 firstVarMoney, uint32 firstVarXp, uint32 otherQuest, uint32 otherVarMoney, uint32 otherVarXp)
+        : maxLevel(_maxLevel)
+    {
+        reward[0].questId = firstQuest;
+        reward[0].variableMoney = firstVarMoney;
+        reward[0].variableXP = firstVarXp;
+        reward[1].questId = otherQuest;
+        reward[1].variableMoney = otherVarMoney;
+        reward[1].variableXP = otherVarXp;
+    }
+};
+
+// Stores player or group queue info
+struct LFGQueueInfo
+{
+    LFGQueueInfo(ObjectGuid _guid, LFGType type, uint32 _queueID);
+    ObjectGuid const guid;                                  // guid (player or group) of queue owner
+    time_t     joinTime;                                    // Player/group queue join time (to calculate wait times)
+    uint8      tanks;                                       // Tanks needed
+    uint8      healers;                                     // Healers needed
+    uint8      dps;                                         // Dps needed
+    uint32 const queueID;                                   // Queue id
+
+    // helpers
+    LFGType const& GetDungeonType() const {return m_type;};
+    private:
+    LFGType const   m_type;
+};
+
+struct LFGQueueStatus
+{
+    LFGQueueStatus(): avgWaitTime(0), waitTime(0), waitTimeTanks(0), waitTimeDps(0),
+                      tanks(0), healers(0), dps(0), playersWaited(0) {};
+
+    time_t                 avgWaitTime;                      // Average Wait time
+    time_t                 waitTime;                         // Wait Time
+    time_t                 waitTimeTanks;                    // Wait Tanks
+    time_t                 waitTimeHealer;                   // Wait Healers
+    time_t                 waitTimeDps;                      // Wait Dps
+    uint32                 tanks;                            // Tanks
+    uint32                 healers;                          // Healers
+    uint32                 dps;                              // Dps
+    uint32                 playersWaited;                    // players summ
+};
+
+// Event manager
+struct LFGEvent
+{
+    LFGEvent(LFGEventType _type, ObjectGuid _guid, uint8 _parm) :
+            type(_type), guid(_guid), eventParm(_parm), executeTime(0) {};
+    LFGEventType  type;
+    ObjectGuid    guid;
+    uint8         eventParm;
+    time_t        executeTime;
+    // helpers
+    void          Start(uint32 delay) { executeTime = time_t(time(NULL) + delay); };
+    bool          IsActive() { return ((executeTime > 0) && (time_t(time(NULL)) >= executeTime)); };
+};
+
+typedef UNORDERED_MULTIMAP<uint32 /*dungeonId*/, LFGReward /*reward*/> LFGRewardMap;
+typedef std::pair<LFGRewardMap::const_iterator, LFGRewardMap::const_iterator> LFGRewardMapBounds;
+typedef UNORDERED_MAP<ObjectGuid /*group or player guid*/, LFGQueueInfo> LFGQueueInfoMap;
+typedef UNORDERED_MAP<uint32/*dungeonID*/, LFGDungeonEntry const*> LFGDungeonMap;
+typedef UNORDERED_MAP<uint32/*ID*/, LFGProposal> LFGProposalMap;
+
+typedef UNORDERED_MAP<LFGDungeonEntry const*, LFGQueueStatus> LFGQueueStatusMap;
+typedef UNORDERED_MAP<ObjectGuid, LFGRoleMask>  LFGRolesMap;
+typedef UNORDERED_SET<LFGQueueInfo*> LFGQueue;
+typedef UNORDERED_MAP<LFGDungeonEntry const*, GuidSet> LFGSearchMap;
+typedef std::list<LFGEvent> LFGEventList;
+
+typedef UNORDERED_MAP<ObjectGuid /*group or player guid*/, LFGStateStructure*> LFGStatesMap;
+
+class LFGMgr : public MaNGOS::Singleton<LFGMgr, MaNGOS::ClassLevelLockable<LFGMgr, MANGOSR2_MUTEX_MODEL_2> >
+{
+    public:
+        LFGMgr();
+        ~LFGMgr();
+
+        // Update system
+        void Update(uint32 diff);
+
+        void TryCompleteGroups(LFGType type);
+        bool TryAddMembersToGroup(Group* pGroup, GuidSet* players);
+        void CompleteGroup(Group* pGroup, GuidSet* players);
+        bool TryCreateGroup(LFGType type);
+
+        // Join system
+        void Join(Player* pPlayer);
+        void Leave(Player* pPlayer);
+        void Leave(Group* pGroup);
+        void ClearLFRList(Player* pPlayer);
+
+        // Queue system
+        void AddToQueue(ObjectGuid guid, LFGType type, bool inBegin = false);
+        void RemoveFromQueue(ObjectGuid guid);
+        LFGQueueInfo* GetQueueInfo(ObjectGuid guid);
+        GuidSet GetDungeonPlayerQueue(LFGDungeonEntry const* pDungeon, Team team = TEAM_NONE);
+        GuidSet GetDungeonGroupQueue(LFGDungeonEntry const* pDungeon, Team team = TEAM_NONE);
+        GuidSet GetDungeonPlayerQueue(LFGType type);
+        GuidSet GetDungeonGroupQueue(LFGType type);
+
+        // reward system
+        void LoadRewards();
+        LFGReward const* GetRandomDungeonReward(LFGDungeonEntry const* pDungeon, Player* pPlayer);
+        void SendLFGRewards(Group* pGroup);
+        void SendLFGReward(Player* pPlayer, LFGDungeonEntry const* pDungeon);
+        void DungeonEncounterReached(Group* pGroup);
+
+        // Proposal system
+        uint32 CreateProposal(LFGDungeonEntry const* pDungeon, Group* pGroup = NULL, GuidSet* playerGuids = NULL);
+        bool SendProposal(uint32 uiID, ObjectGuid guid);
+        LFGProposal* GetProposal(uint32 uiID);
+        void RemoveProposal(Player* pDecliner, uint32 uiID);
+        void RemoveProposal(uint32 uiID, bool bSuccess = false);
+        void UpdateProposal(uint32 uiID, ObjectGuid guid, bool bAccept);
+        void CleanupProposals(LFGType type);
+        Player* LeaderElection(GuidSet* playerGuids);
+
+        // boot vote system
+        void OfferContinue(Group* pGroup);
+        void InitBoot(Player* pKicker, ObjectGuid victimGuid, std::string reason);
+        void UpdateBoot(Player* pPlayer, LFGAnswer answer);
+        void CleanupBoots(LFGType type);
+
+        // teleport system
+        void Teleport(Group* pGroup, bool bOut = false);
+        void Teleport(Player* pPlayer, bool bOut = false, bool bFromOpcode = false);
+
+        // LFR extend system
+        void UpdateLFRGroups();
+        bool IsGroupCompleted(Group* pGroup, uint8 uiAddMembers = 0);
+
+        // Statistic system
+        LFGQueueStatus* GetDungeonQueueStatus(LFGType type);
+        void UpdateQueueStatus(Player* pPlayer);
+        void UpdateQueueStatus(Group* pGroup);
+        void UpdateQueueStatus(LFGType type);
+        void SendStatistic(LFGType type);
+        LFGQueueStatus* GetOverallQueueStatus();
+
+        // Role check system
+        void CleanupRoleChecks(LFGType type);
+        void StartRoleCheck(Group* pGroup);
+        void UpdateRoleCheck(Group* pGroup);
+        bool CheckRoles(Group* pGroup, Player* pPlayer = NULL);
+        bool CheckRoles(LFGRolesMap& roleMap);
+        bool RoleChanged(Player* pPlayer, LFGRoleMask roles);
+        void SetGroupRoles(Group* pGroup, GuidSet* = NULL);
+        bool SetRoles(LFGRolesMap& roleMap);
+
+        // Social check system
+        bool HasIgnoreState(ObjectGuid guid1, ObjectGuid guid2);
+        bool HasIgnoreState(Group* pGroup, ObjectGuid guid);
+        bool CheckTeam(Group* pGroup, Player* pPlayer = NULL);
+        bool CheckTeam(ObjectGuid guid1, ObjectGuid guid2);
+
+        // Dungeon operations
+        LFGDungeonEntry const* GetDungeon(uint32 dungeonID);
+        LFGDungeonSet GetRandomDungeonsForPlayer(Player* pPlayer);
+        static bool IsRandomDungeon(LFGDungeonEntry const* dungeon);
+        static bool CheckWorldEvent(LFGDungeonEntry const* dungeon);
+
+        // Group operations
+        void AddMemberToLFDGroup(ObjectGuid guid);
+        void RemoveMemberFromLFDGroup(Group* pGroup, ObjectGuid guid);
+        void LoadLFDGroupPropertiesForPlayer(Player* pPlayer);
+
+        // Dungeon expand operations
+        LFGDungeonSet ExpandRandomDungeonsForGroup(LFGDungeonEntry const* randomDungeon, GuidSet playerGuids);
+        LFGDungeonEntry const* SelectRandomDungeonFromList(LFGDungeonSet dugeons);
+
+        // Checks
+        LFGJoinResult GetPlayerJoinResult(Player* pPlayer);
+        LFGJoinResult GetGroupJoinResult(Group* pGroup);
+
+        // Player status
+        LFGLockStatusType GetPlayerLockStatus(Player* pPlayer, LFGDungeonEntry const* pDungeon);
+        LFGLockStatusType GetPlayerExpansionLockStatus(Player* pPlayer, LFGDungeonEntry const* pDungeon);
+        LFGLockStatusType GetGroupLockStatus(Group* pGroup, LFGDungeonEntry const* pDungeon);
+        LFGLockStatusMap GetPlayerLockMap(Player* pPlayer);
+        LFGLockStatusMap GetPlayerLockMap(ObjectGuid const& guid);
+
+        // Search matrix
+        void AddToSearchMatrix(ObjectGuid guid, bool inBegin = false);
+        void RemoveFromSearchMatrix(ObjectGuid guid);
+        GuidSet* GetPlayersForDungeon(LFGDungeonEntry const* pDungeon);
+        bool IsInSearchFor(LFGDungeonEntry const* pDungeon, ObjectGuid guid);
+        void CleanupSearchMatrix();
+
+        // LFG states operations
+        LFGPlayerState* GetLFGPlayerState(ObjectGuid const& guid);
+        LFGGroupState*  GetLFGGroupState(ObjectGuid const& guid);
+        LFGStateStructure* CreateLFGState(ObjectGuid const& guid);
+        void RemoveLFGState(ObjectGuid const& guid);
+
+        // Sheduler
+        void SheduleEvent();
+        void AddEvent(ObjectGuid guid, LFGEventType type, time_t delay = DEFAULT_LFG_DELAY, uint8 param = 0);
+
+        // Scripts
+        void OnPlayerEnterMap(Player* pPlayer, Map* pMap);
+        void OnPlayerLeaveMap(Player* pPlayer, Map* pMap);
+
+    private:
+        uint32 GenerateProposalID();
+        uint32          m_proposalID;
+        uint32 GenerateQueueID();
+        uint32          m_queueID;
+
+        LFGRewardMap    m_RewardMap;                        // Stores rewards for random dungeons
+        LFGQueueInfoMap m_queueInfoMap;                     // Storage for queues
+        LFGQueue        m_playerQueue[LFG_TYPE_MAX];        // Queue's for players
+        LFGQueue        m_groupQueue[LFG_TYPE_MAX];         // Queue's for groups
+        LFGDungeonMap   m_dungeonMap;                       // sorted dungeon map
+        LFGQueueStatus  m_queueStatus[LFG_TYPE_MAX];        // Queue statisic
+        LFGProposalMap  m_proposalMap;                      // Proposal store
+        LFGSearchMap    m_searchMatrix;                     // Search matrix
+        LFGEventList    m_eventList;                        // events storage
+        LFGStatesMap    m_statesMap;                        // LFG states storage (for players or groups)
+
+        IntervalTimer   m_LFGupdateTimer;                   // update timer for cleanup/statistic
+        IntervalTimer   m_LFRupdateTimer;                   // update timer for LFR extend system
+        IntervalTimer   m_LFGQueueUpdateTimer;              // update timer for statistic send
+
+};
+
+#define sLFGMgr MaNGOS::Singleton<LFGMgr>::Instance()
+#endif
diff --git a/src/game/Language.h b/src/game/Language.h
index 582d37dd02f..d7c5bcffb15 100644
--- a/src/game/Language.h
+++ b/src/game/Language.h
@@ -42,8 +42,8 @@ enum MangosStrings
     LANG_GMS_ON_SRV                     = 16,
     LANG_GMS_NOT_LOGGED                 = 17,
     LANG_YOU_IN_FLIGHT                  = 18,
-    //LANG_YOU_IN_BATTLEGROUND            = 19, not used
-    //LANG_TARGET_IN_FLIGHT               = 20, not used
+    // LANG_YOU_IN_BATTLEGROUND            = 19, not used
+    // LANG_TARGET_IN_FLIGHT               = 20, not used
     LANG_CHAR_IN_FLIGHT                 = 21,
     LANG_CHAR_NON_MOUNTED               = 22,
     LANG_YOU_IN_COMBAT                  = 23,
@@ -83,7 +83,7 @@ enum MangosStrings
     LANG_USING_WORLD_DB                 = 57,
     LANG_USING_SCRIPT_LIB               = 58,
     LANG_USING_EVENT_AI                 = 59,
-    //LANG_RA_BUSY                      = 60, not used
+    // LANG_RA_BUSY                      = 60, not used
     LANG_RA_USER                        = 61,
     LANG_RA_PASS                        = 62,
     LANG_GM_ACCEPTS_WHISPER             = 63,
@@ -119,7 +119,7 @@ enum MangosStrings
     LANG_YOU_CHANGE_ENERGY              = 122,
     LANG_YOURS_ENERGY_CHANGED           = 123,
 
-    LANG_CURRENT_ENERGY                 = 124,              //log
+    LANG_CURRENT_ENERGY                 = 124,              // log
     LANG_YOU_CHANGE_RAGE                = 125,
     LANG_YOURS_RAGE_CHANGED             = 126,
     LANG_YOU_CHANGE_LVL                 = 127,
@@ -501,8 +501,8 @@ enum MangosStrings
     LANG_REMOVEALL_COOLDOWN             = 492,
     LANG_REMOVE_COOLDOWN                = 493,
 
-    LANG_ADDITEM                        = 494,              //log
-    LANG_ADDITEMSET                     = 495,              //log
+    LANG_ADDITEM                        = 494,              // log
+    LANG_ADDITEMSET                     = 495,              // log
     LANG_REMOVEITEM                     = 496,
     LANG_ITEM_CANNOT_CREATE             = 497,
     LANG_INSERT_GUILD_NAME              = 498,
@@ -535,22 +535,22 @@ enum MangosStrings
 
     LANG_GAMEOBJECT_NOT_EXIST           = 522,
 
-    LANG_GAMEOBJECT_CURRENT             = 523,              //log
+    LANG_GAMEOBJECT_CURRENT             = 523,              // log
     LANG_GAMEOBJECT_DETAIL              = 524,
     LANG_GAMEOBJECT_ADD                 = 525,
 
     LANG_MOVEGENS_LIST                  = 526,
-    LANG_MOVEGENS_IDLE                  = 527,
-    LANG_MOVEGENS_RANDOM                = 528,
-    LANG_MOVEGENS_WAYPOINT              = 529,
-    LANG_MOVEGENS_ANIMAL_RANDOM         = 530,
+    LANG_MOVEGENS_DEFAULT               = 527,
+//    LANG_MOVEGENS_RANDOM                = 528,
+//    LANG_MOVEGENS_WAYPOINT              = 529,
+//    LANG_MOVEGENS_ANIMAL_RANDOM         = 530,
     LANG_MOVEGENS_CONFUSED              = 531,
-    LANG_MOVEGENS_CHASE_PLAYER          = 532,
-    LANG_MOVEGENS_CHASE_CREATURE        = 533,
-    LANG_MOVEGENS_CHASE_NULL            = 534,
+    LANG_MOVEGENS_CHASE_TARGET          = 532,
+//    LANG_MOVEGENS_CHASE_CREATURE        = 533,
+//    LANG_MOVEGENS_CHASE_NULL            = 534,
     LANG_MOVEGENS_HOME_CREATURE         = 535,
     LANG_MOVEGENS_HOME_PLAYER           = 536,
-    LANG_MOVEGENS_FLIGHT                = 537,
+//    LANG_MOVEGENS_FLIGHT                = 537,
     LANG_MOVEGENS_UNKNOWN               = 538,
 
     LANG_NPCINFO_CHAR                   = 539,
@@ -583,17 +583,17 @@ enum MangosStrings
     //                                    562,              // not used
     //                                    563,              // not used
     LANG_TOO_BIG_INDEX                  = 564,
-    LANG_SET_UINT                       = 565,              //log
+    LANG_SET_UINT                       = 565,              // log
     LANG_SET_UINT_FIELD                 = 566,
-    LANG_SET_FLOAT                      = 567,              //log
+    LANG_SET_FLOAT                      = 567,              // log
     LANG_SET_FLOAT_FIELD                = 568,
-    LANG_GET_UINT                       = 569,              //log
+    LANG_GET_UINT                       = 569,              // log
     LANG_GET_UINT_FIELD                 = 570,
-    LANG_GET_FLOAT                      = 571,              //log
+    LANG_GET_FLOAT                      = 571,              // log
     LANG_GET_FLOAT_FIELD                = 572,
-    //                                    573,              //not used
-    //                                    574,              //not used
-    LANG_CHANGE_INT32                   = 575,              //log
+    //                                    573,              // not used
+    //                                    574,              // not used
+    LANG_CHANGE_INT32                   = 575,              // log
     LANG_CHANGE_INT32_FIELD             = 576,
 
     LANG_INVISIBLE_INVISIBLE            = 577,
@@ -711,8 +711,8 @@ enum MangosStrings
     LANG_YOUR_BG_LEVEL_REQ_ERROR        = 715,
 //                                      = 716, not used
     LANG_BG_STARTED_ANNOUNCE_WORLD      = 717,
-    LANG_ARENA_QUEUE_ANNOUNCE_WORLD_JOIN= 718,
-    LANG_ARENA_QUEUE_ANNOUNCE_WORLD_EXIT= 719,
+    LANG_ARENA_QUEUE_ANNOUNCE_WORLD_JOIN = 718,
+    LANG_ARENA_QUEUE_ANNOUNCE_WORLD_EXIT = 719,
 
     LANG_BG_GROUP_TOO_LARGE             = 720,              // "Your group is too large for this battleground. Please regroup to join."
     LANG_ARENA_GROUP_TOO_LARGE          = 721,              // "Your group is too large for this arena. Please regroup to join."
@@ -809,7 +809,8 @@ enum MangosStrings
     LANG_GUILD_INITIATE                 = 815,
     LANG_FAIL_ENTER_SPECTRAL_REALM      = 816,
     LANG_NO_FLY_ZONE                    = 817,
-    // Room for in-game strings           818-999 not used
+    LANG_TELEREQ_QUEST_BLACK_MORASS     = 818,
+    // Room for in-game strings           819-999 not used
 
     // Level 4 (CLI only commands)
     LANG_COMMAND_EXIT                   = 1000,
@@ -877,9 +878,9 @@ enum MangosStrings
     LANG_TAXINODE_ENTRY_LIST_CONSOLE    = 1129,
     LANG_EVENT_STARTED                  = 1130,
     LANG_EVENT_STOPPED                  = 1131,
-    LANG_MOVEGENS_FOLLOW_PLAYER         = 1132,
-    LANG_MOVEGENS_FOLLOW_CREATURE       = 1133,
-    LANG_MOVEGENS_FOLLOW_NULL           = 1134,
+    LANG_MOVEGENS_FOLLOW_TARGET         = 1132,
+//    LANG_MOVEGENS_FOLLOW_CREATURE       = 1133,
+//    LANG_MOVEGENS_FOLLOW_NULL           = 1134,
     LANG_LIST_TALENTS_TITLE             = 1135,
     LANG_LIST_TALENTS_COUNT             = 1136,
     LANG_GO_LIST_CHAT                   = 1137,
@@ -898,13 +899,13 @@ enum MangosStrings
     LANG_NPC_GO_INFO_EVENT_STRING       = 1150,
     LANG_NPC_GO_INFO_POOL_EVENT_STRING  = 1151,
     LANG_COMMAND_ITEM_USABLE            = 1152,
-    LANG_GET_BITSTR                     = 1153,             //log
+    LANG_GET_BITSTR                     = 1153,             // log
     LANG_GET_BITSTR_FIELD               = 1154,
-    LANG_GET_HEX                        = 1155,             //log
+    LANG_GET_HEX                        = 1155,             // log
     LANG_GET_HEX_FIELD                  = 1156,
-    LANG_CHANGE_HEX                     = 1157,             //log
+    LANG_CHANGE_HEX                     = 1157,             // log
     LANG_CHANGE_HEX_FIELD               = 1158,
-    LANG_CHANGE_FLOAT                   = 1159,             //log
+    LANG_CHANGE_FLOAT                   = 1159,             // log
     LANG_CHANGE_FLOAT_FIELD             = 1160,
     LANG_COMMAND_ACHIEVEMENT_CRITERIA   = 1161,
     LANG_COUNTER                        = 1162,
@@ -939,7 +940,9 @@ enum MangosStrings
     LANG_AHBOT_ITEMS_RATIO              = 1191,
     LANG_MOVEGENS_EFFECT                = 1192,
     LANG_GEARSCORE                      = 1193,
-    // Room for more level 3              1194-1199 not used
+    LANG_COMMAND_GO_STATUS              = 1194,
+    LANG_COMMAND_GO_STATUS_DOOR         = 1195,
+    // Room for more level 3              1196-1199 not used
 
     // Debug commands
     LANG_CINEMATIC_NOT_EXIST            = 1200,
@@ -951,6 +954,9 @@ enum MangosStrings
     LANG_DOT_DAMAGE                     = 1206,
     // Room for more debug                1207-1299 not used
 
+    // Broadcaster
+    LANG_AUTO_BROADCAST                 = 1300,
+
     // Reserved for old client release branches specific strings
     // Room for old clients 2.x           1300-1399 not used
     // Room for old clients 1.x           1400-1499 not used
@@ -965,17 +971,171 @@ enum MangosStrings
     LANG_NPC_EVENTAI_PHASE              = 1506,
     LANG_NPC_EVENTAI_MOVE               = 1507,
     LANG_NPC_EVENTAI_COMBAT             = 1508,
-    // Room for more Level 2              1509-1599 not used
-
-    // FREE IDS                           1600-9999
-
-    // Use for not-in-offcial-sources patches
-    //                                    10000-10999
+    LANG_POOL_ENTRY_LOWER_MAX_POOL      = 1509,
+    // Room for more Level 2              1510-1599 not used
+
+    // Level 2 (worldstate operations)
+    LANG_WORLDSTATE_LIST                = 1550,
+    LANG_WORLDSTATE_LIST_FULL           = 1551,
+    LANG_WORLDSTATE_SET                 = 1552,
+    LANG_WORLDSTATE_UPDATE              = 1553,
+    LANG_WORLDSTATE_UPDATE_FULL         = 1554,
+    LANG_WORLDSTATE_RELOAD              = 1555,
+    LANG_WORLDSTATE_ERROR               = 1556,
+    LANG_WORLDSTATE_SETTINGS            = 1557,
+    // Room for more Level 2              1559-1599 not used
+
+    // Outdoor PvP
+    LANG_OPVP_EP_CAPTURE_NPT_H          = 1600,
+    LANG_OPVP_EP_CAPTURE_NPT_A          = 1601,
+    LANG_OPVP_EP_CAPTURE_CGT_H          = 1602,
+    LANG_OPVP_EP_CAPTURE_CGT_A          = 1603,
+    LANG_OPVP_EP_CAPTURE_EWT_H          = 1604,
+    LANG_OPVP_EP_CAPTURE_EWT_A          = 1605,
+    LANG_OPVP_EP_CAPTURE_PWT_H          = 1606,
+    LANG_OPVP_EP_CAPTURE_PWT_A          = 1607,
+
+    LANG_OPVP_HP_CAPTURE_OVERLOOK_H     = 1608,
+    LANG_OPVP_HP_CAPTURE_OVERLOOK_A     = 1609,
+    LANG_OPVP_HP_CAPTURE_STADIUM_H      = 1610,
+    LANG_OPVP_HP_CAPTURE_STADIUM_A      = 1611,
+    LANG_OPVP_HP_CAPTURE_BROKENHILL_H   = 1612,
+    LANG_OPVP_HP_CAPTURE_BROKENHILL_A   = 1613,
+
+    LANG_OPVP_ZM_CAPTURE_EAST_BEACON_H  = 1614,
+    LANG_OPVP_ZM_CAPTURE_EAST_BEACON_A  = 1615,
+    LANG_OPVP_ZM_CAPTURE_WEST_BEACON_H  = 1616,
+    LANG_OPVP_ZM_CAPTURE_WEST_BEACON_A  = 1617,
+    LANG_OPVP_ZM_CAPTURE_BOTH_BEACONS_H = 1618,
+    LANG_OPVP_ZM_CAPTURE_BOTH_BEACONS_A = 1619,
+    LANG_OPVP_ZM_SPAWN_FIELD_SCOUT_H    = 1620,
+    LANG_OPVP_ZM_SPAWN_FIELD_SCOUT_A    = 1621,
+    LANG_OPVP_ZM_CAPTURE_GRAVEYARD_H    = 1622,
+    LANG_OPVP_ZM_CAPTURE_GRAVEYARD_A    = 1623,
+
+    LANG_OPVP_TF_CAPTURE_TOWER_H        = 1624,
+    LANG_OPVP_TF_CAPTURE_TOWER_A        = 1625,
+    LANG_OPVP_TF_LOSE_TOWER_H           = 1626,
+    LANG_OPVP_TF_LOSE_TOWER_A           = 1627,
+    LANG_OPVP_TF_CAPTURE_ALL_TOWERS_H   = 1628,
+    LANG_OPVP_TF_CAPTURE_ALL_TOWERS_A   = 1629,
+
+    LANG_OPVP_NA_PROGRESS_H             = 1630,
+    LANG_OPVP_NA_PROGRESS_A             = 1631,
+    LANG_OPVP_NA_CAPTURE_H              = 1632,
+    LANG_OPVP_NA_CAPTURE_A              = 1633,
+    LANG_OPVP_NA_DEFENSELESS            = 1634,
+
+    LANG_OPVP_SI_CAPTURE_H              = 1635,
+    LANG_OPVP_SI_CAPTURE_A              = 1636,
+
+    // FREE IDS                           1700-9999
+
+    // Use for not-in-official-sources patches
 
     // Use for custom patches             11000-11999
+    LANG_INVALID_REALMID                = 11001,
+
+    LANG_COMMAND_FRIEND                 = 11133,
+    LANG_COMMAND_FRIEND_ERROR           = 11134,
+    LANG_SYSTEMMESSAGE_MODERATOR        = 12000,
+    LANG_SYSTEMMESSAGE_GAMEMASTER       = 12001,
+    LANG_SYSTEMMESSAGE_ADMINISTRATOR    = 12002,
+    LANG_BAN_ACCOUNT_ANNOUNCE           = 17890,
+    LANG_PERMBAN_ACCOUNT_ANNOUNCE       = 17891,
+    LANG_BAN_CHARACTER_ANNOUNCE         = 17892,
+    LANG_PERMBAN_CHARACTER_ANNOUNCE     = 17893,
+    LANG_BAN_IP_ANNOUNCE                = 17894,
+    LANG_PERMBAN_IP_ANNOUNCE            = 17895,
+    LANG_MUTE_ANNOUNCE                  = 17896,
+    LANG_ARENA_STARTED_ANNOUNCE_WORLD   = 17898,
+
+    // SOTA
+    LANG_BG_SA_START_TWO_MINUTE             = 20000,
+    LANG_BG_SA_START_ONE_MINUTE             = 20001,
+    LANG_BG_SA_START_HALF_MINUTE            = 20002,
+    LANG_BG_SA_HAS_BEGUN                    = 20003,
+
+    LANG_BG_SA_GATE_ATTACK                  = 20004,
+    LANG_BG_SA_GATE_DAMAGE                  = 20005,
+    LANG_BG_SA_GATE_DETROYED                = 20006,
+
+    LANG_BG_SA_GATE_GREEN_EMERALD           = 20007,
+    LANG_BG_SA_GATE_BLUE_SAPHIRE            = 20008,
+    LANG_BG_SA_GATE_MAUVE_AMETHYST          = 20009,
+    LANG_BG_SA_GATE_RED_SUN_                = 20010,
+    LANG_BG_SA_GATE_YELLOW_MOON             = 20011,
+    LANG_BG_SA_GATE_ROOM_ANCIENT_SHRINE     = 20012,
+
+    LANG_BG_SA_EAST_GRAVEYARD               = 20013,
+    LANG_BG_SA_WEST_GRAVEYARD               = 20014,
+    LANG_BG_SA_SOUTH_GRAVEYARD              = 20015,
+
+    LANG_BG_SA_INSTALL_BOMB                 = 20016,
+
+    LANG_BG_SA_ALLIANCE_END_1ROUND          = 20017,
+    LANG_BG_SA_HORDE_END_1ROUND             = 20018,
+    LANG_BG_SA_ALLIANCE_END_2ROUND          = 20019,
+    LANG_BG_SA_HORDE_END_2ROUND             = 20020,
+    /*##############################################
+    #          Strings for SendWarningToAll        #
+    ##############################################*/
+    LANG_BG_SA_HORDE_EAST_CONQUESTED        = 20021,
+    LANG_BG_SA_HORDE_WEST_CONQUESTED        = 20022,
+    LANG_BG_SA_HORDE_SOUTH_CONQUESTED       = 20023,
+    LANG_BG_SA_ALLIANCE_EAST_CONQUESTED     = 20024,
+    LANG_BG_SA_ALLIANCE_WEST_CONQUESTED     = 20025,
+    LANG_BG_SA_ALLIANCE_SOUTH_CONQUESTED    = 20026,
+
+    LANG_BG_SA_GATE_ROOM_ANCIENT_SHRINE_DESTROYED = 20027,
+    LANG_BG_SA_GATE_GREEN_EMERALD_DESTROYED       = 20028,
+    LANG_BG_SA_GATE_BLUE_SAPHIRE_DESTROYED        = 20029,
+    LANG_BG_SA_GATE_MAUVE_AMETHYST_DESTROYED      = 20030,
+    LANG_BG_SA_GATE_RED_SUN_DESTROYED             = 20031,
+    LANG_BG_SA_GATE_YELLOW_MOON_DESTROYED         = 20032,
+    LANG_BG_SA_GATE_ROOM_ANCIENT_SHRINE_DAMAGED   = 20033,
+    LANG_BG_SA_GATE_GREEN_EMERALD_DAMAGED         = 20034,
+    LANG_BG_SA_GATE_BLUE_SAPHIRE_DAMAGED          = 20035,
+    LANG_BG_SA_GATE_MAUVE_AMETHYST_DAMAGED        = 20036,
+    LANG_BG_SA_GATE_RED_SUN_DAMAGED               = 20037,
+    LANG_BG_SA_GATE_YELLOW_MOON_DAMAGED           = 20038,
+
+    LANG_BG_SA_HORDE_TIMEOUT_END_1ROUND           = 20039,
+    LANG_BG_SA_ALLIANCE_TIMEOUT_END_1ROUND        = 20040,
+
+    LANG_BG_SA_HORDE_TIMEOUT_END_2ROUND           = 20041,
+    LANG_BG_SA_ALLIANCE_TIMEOUT_END_2ROUND        = 20042,
+
+    LANG_BG_SA_END_1ROUND                         = 20043,
+    LANG_BG_WIN_NONE                              = 20044,
+
+    // Isle of Conquest
+    LANG_BG_IC_START_TWO_MINUTES        = 20080,
+    LANG_BG_IC_START_ONE_MINUTE         = 20081,
+    LANG_BG_IC_START_HALF_MINUTE        = 20082,
+    LANG_BG_IC_HAS_BEGUN                = 20083,
+    LANG_BG_IC_ALLIANCE_KEEP            = 20084,
+    LANG_BG_IC_HORDE_KEEP               = 20085,
+    LANG_BG_IC_ALLIANCE_WINS            = 20086,
+    LANG_BG_IC_HORDE_WINS               = 20087,
+    LANG_BG_IC_A_WEST_GATE_DESTROYED    = 20088,
+    LANG_BG_IC_A_EAST_GATE_DESTROYED    = 20089,
+    LANG_BG_IC_A_FRONT_GATE_DESTROYED   = 20090,
+    LANG_BG_IC_H_WEST_GATE_DESTROYED    = 20091,
+    LANG_BG_IC_H_EAST_GATE_DESTROYED    = 20092,
+    LANG_BG_IC_H_FRONT_GATE_DESTROYED   = 20093,
+    LANG_BG_IC_NODE_ASSAULTED           = 20094,
+    LANG_BG_IC_NODE_DEFENDED            = 20095,
+    LANG_BG_IC_NODE_CLAIMED             = 20096,
+    LANG_BG_IC_NODE_TAKEN               = 20097,
+    LANG_BG_IC_NODE_WORKSHOP            = 20098,
+    LANG_BG_IC_NODE_DOCKS               = 20099,
+    LANG_BG_IC_NODE_REFINERY            = 20100,
+    LANG_BG_IC_NODE_QUARRY              = 20101,
+    LANG_BG_IC_NODE_HANGAR              = 20102,
 
     // NOT RESERVED IDS                   12000-1999999999
-    // `db_script_string` table index     2000000000-2000009999 (MIN_DB_SCRIPT_STRING_ID-MAX_DB_SCRIPT_STRING_ID)
-    // For other tables maybe             2000010000-2147483647 (max index)
+    // `db_script_string` table index     2000000000-2000999999 (MIN_DB_SCRIPT_STRING_ID-MAX_DB_SCRIPT_STRING_ID)
+    // For other tables maybe             2001000000-2147483647 (max index)
 };
 #endif
diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp
index 77b38a97ae8..edaefcedbc7 100644
--- a/src/game/Level0.cpp
+++ b/src/game/Level0.cpp
@@ -29,11 +29,12 @@
 #include "SystemConfig.h"
 #include "revision.h"
 #include "revision_nr.h"
+#include "revision_R2.h"
 #include "Util.h"
 
 bool ChatHandler::HandleHelpCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
     {
         ShowHelpForCommand(getCommandTable(), "help");
         ShowHelpForCommand(getCommandTable(), "");
@@ -66,16 +67,16 @@ bool ChatHandler::HandleAccountCommand(char* args)
 
 bool ChatHandler::HandleStartCommand(char* /*args*/)
 {
-    Player *chr = m_session->GetPlayer();
+    Player* chr = m_session->GetPlayer();
 
-    if(chr->IsTaxiFlying())
+    if (chr->IsTaxiFlying())
     {
         SendSysMessage(LANG_YOU_IN_FLIGHT);
         SetSentErrorMessage(true);
         return false;
     }
 
-    if(chr->isInCombat())
+    if (chr->isInCombat())
     {
         SendSysMessage(LANG_YOU_IN_COMBAT);
         SetSentErrorMessage(true);
@@ -83,7 +84,7 @@ bool ChatHandler::HandleStartCommand(char* /*args*/)
     }
 
     // cast spell Stuck
-    chr->CastSpell(chr,7355,false);
+    chr->CastSpell(chr, 7355, false);
     return true;
 }
 
@@ -94,13 +95,22 @@ bool ChatHandler::HandleServerInfoCommand(char* /*args*/)
     uint32 maxActiveClientsNum = sWorld.GetMaxActiveSessionCount();
     uint32 maxQueuedClientsNum = sWorld.GetMaxQueuedSessionCount();
     std::string str = secsToTimeString(sWorld.GetUptime());
+    uint32 updateTime = sWorld.GetUpdateTime();
 
     char const* full;
-    if(m_session)
-        full = _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,"|cffffffff|Hurl:" REVISION_ID "|h" REVISION_ID "|h|r");
+    char const* fullR2;
+    if (m_session)
+    {
+        full = _FULLVERSION(REVISION_NR);
+        fullR2 = _R2FULLVERSION(REVISION_DATE, REVISION_TIME,REVISION_R2, "|cffffffff|Hurl:" REVISION_ID "|h" REVISION_ID "|h|r");
+    }
     else
-        full = _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,REVISION_ID);
+    {
+        full = _FULLVERSION(REVISION_NR);
+        fullR2 = _R2FULLVERSION(REVISION_DATE, REVISION_TIME,REVISION_R2, REVISION_ID);
+    }
     SendSysMessage(full);
+    SendSysMessage(fullR2);
 
     if (sScriptMgr.IsScriptLibraryLoaded())
     {
@@ -113,25 +123,32 @@ bool ChatHandler::HandleServerInfoCommand(char* /*args*/)
     else
         SendSysMessage(LANG_USING_SCRIPT_LIB_NONE);
 
-    PSendSysMessage(LANG_USING_WORLD_DB,sWorld.GetDBVersion());
-    PSendSysMessage(LANG_USING_EVENT_AI,sWorld.GetCreatureEventAIVersion());
+    PSendSysMessage(LANG_USING_WORLD_DB, sWorld.GetDBVersion());
+    PSendSysMessage(LANG_USING_EVENT_AI, sWorld.GetCreatureEventAIVersion());
     PSendSysMessage(LANG_CONNECTED_USERS, activeClientsNum, maxActiveClientsNum, queuedClientsNum, maxQueuedClientsNum);
     PSendSysMessage(LANG_UPTIME, str.c_str());
+    PSendSysMessage("Update time diff: %u", updateTime);
+
+    if (!m_session || m_session->GetSecurity() > SEC_MODERATOR)
+    {
+        SendSysMessage("");
+        PSendSysMessage("Loaded maps [id:name:count:players] (%u):%s", sMapMgr.Maps().size(), sMapMgr.GetStrMaps().c_str());
+    }
 
     return true;
 }
 
 bool ChatHandler::HandleDismountCommand(char* /*args*/)
 {
-    //If player is not mounted, so go out :)
-    if (!m_session->GetPlayer( )->IsMounted())
+    // If player is not mounted, so go out :)
+    if (!m_session->GetPlayer()->IsMounted())
     {
         SendSysMessage(LANG_CHAR_NON_MOUNTED);
         SetSentErrorMessage(true);
         return false;
     }
 
-    if(m_session->GetPlayer( )->IsTaxiFlying())
+    if (m_session->GetPlayer()->IsTaxiFlying())
     {
         SendSysMessage(LANG_YOU_IN_FLIGHT);
         SetSentErrorMessage(true);
@@ -145,10 +162,10 @@ bool ChatHandler::HandleDismountCommand(char* /*args*/)
 
 bool ChatHandler::HandleSaveCommand(char* /*args*/)
 {
-    Player *player=m_session->GetPlayer();
+    Player* player = m_session->GetPlayer();
 
     // save GM account without delay and output message (testing, etc)
-    if(GetAccessLevel() > SEC_PLAYER)
+    if (GetAccessLevel() > SEC_PLAYER)
     {
         player->SaveToDB();
         SendSysMessage(LANG_PLAYER_SAVED);
@@ -157,7 +174,7 @@ bool ChatHandler::HandleSaveCommand(char* /*args*/)
 
     // save or plan save after 20 sec (logout delay) if current next save time more this value and _not_ output any messages to prevent cheat planning
     uint32 save_interval = sWorld.getConfig(CONFIG_UINT32_INTERVAL_SAVE);
-    if (save_interval==0 || (save_interval > 20*IN_MILLISECONDS && player->GetSaveTimer() <= save_interval - 20*IN_MILLISECONDS))
+    if (save_interval == 0 || (save_interval > 20 * IN_MILLISECONDS && player->GetSaveTimer() <= save_interval - 20 * IN_MILLISECONDS))
         player->SaveToDB();
 
     return true;
@@ -169,12 +186,12 @@ bool ChatHandler::HandleGMListIngameCommand(char* /*args*/)
 
     {
         HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock());
-        HashMapHolder<Player>::MapType &m = sObjectAccessor.GetPlayers();
+        HashMapHolder<Player>::MapType& m = sObjectAccessor.GetPlayers();
         for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
         {
             AccountTypes itr_sec = itr->second->GetSession()->GetSecurity();
             if ((itr->second->isGameMaster() || (itr_sec > SEC_PLAYER && itr_sec <= (AccountTypes)sWorld.getConfig(CONFIG_UINT32_GM_LEVEL_IN_GM_LIST))) &&
-                (!m_session || itr->second->IsVisibleGloballyFor(m_session->GetPlayer())))
+                    (!m_session || itr->second->IsVisibleGloballyFor(m_session->GetPlayer())))
                 names.push_back(std::make_pair<std::string, bool>(GetNameLink(itr->second), itr->second->isAcceptWhispers()));
         }
     }
@@ -185,7 +202,7 @@ bool ChatHandler::HandleGMListIngameCommand(char* /*args*/)
 
         char const* accepts = GetMangosString(LANG_GM_ACCEPTS_WHISPER);
         char const* not_accept = GetMangosString(LANG_GM_NO_WHISPER);
-        for(std::list<std::pair< std::string, bool> >::const_iterator iter = names.begin(); iter != names.end(); ++iter)
+        for (std::list<std::pair< std::string, bool> >::const_iterator iter = names.begin(); iter != names.end(); ++iter)
             PSendSysMessage("%s - %s", iter->first.c_str(), iter->second ? accepts : not_accept);
     }
     else
@@ -199,15 +216,15 @@ bool ChatHandler::HandleAccountPasswordCommand(char* args)
     // allow use from RA, but not from console (not have associated account id)
     if (!GetAccountId())
     {
-        SendSysMessage (LANG_RA_ONLY_COMMAND);
-        SetSentErrorMessage (true);
+        SendSysMessage(LANG_RA_ONLY_COMMAND);
+        SetSentErrorMessage(true);
         return false;
     }
 
     // allow or quoted string with possible spaces or literal without spaces
-    char *old_pass = ExtractQuotedOrLiteralArg(&args);
-    char *new_pass = ExtractQuotedOrLiteralArg(&args);
-    char *new_pass_c = ExtractQuotedOrLiteralArg(&args);
+    char* old_pass = ExtractQuotedOrLiteralArg(&args);
+    char* new_pass = ExtractQuotedOrLiteralArg(&args);
+    char* new_pass_c = ExtractQuotedOrLiteralArg(&args);
 
     if (!old_pass || !new_pass || !new_pass_c)
         return false;
@@ -218,21 +235,21 @@ bool ChatHandler::HandleAccountPasswordCommand(char* args)
 
     if (password_new != password_new_c)
     {
-        SendSysMessage (LANG_NEW_PASSWORDS_NOT_MATCH);
-        SetSentErrorMessage (true);
+        SendSysMessage(LANG_NEW_PASSWORDS_NOT_MATCH);
+        SetSentErrorMessage(true);
         return false;
     }
 
-    if (!sAccountMgr.CheckPassword (GetAccountId(), password_old))
+    if (!sAccountMgr.CheckPassword(GetAccountId(), password_old))
     {
-        SendSysMessage (LANG_COMMAND_WRONGOLDPASSWORD);
-        SetSentErrorMessage (true);
+        SendSysMessage(LANG_COMMAND_WRONGOLDPASSWORD);
+        SetSentErrorMessage(true);
         return false;
     }
 
     AccountOpResult result = sAccountMgr.ChangePassword(GetAccountId(), password_new);
 
-    switch(result)
+    switch (result)
     {
         case AOR_OK:
             SendSysMessage(LANG_COMMAND_PASSWORD);
@@ -259,8 +276,8 @@ bool ChatHandler::HandleAccountLockCommand(char* args)
     // allow use from RA, but not from console (not have associated account id)
     if (!GetAccountId())
     {
-        SendSysMessage (LANG_RA_ONLY_COMMAND);
-        SetSentErrorMessage (true);
+        SendSysMessage(LANG_RA_ONLY_COMMAND);
+        SetSentErrorMessage(true);
         return false;
     }
 
@@ -272,16 +289,9 @@ bool ChatHandler::HandleAccountLockCommand(char* args)
         return false;
     }
 
-    if (value)
-    {
-        LoginDatabase.PExecute( "UPDATE account SET locked = '1' WHERE id = '%u'", GetAccountId());
-        PSendSysMessage(LANG_COMMAND_ACCLOCKLOCKED);
-    }
-    else
-    {
-        LoginDatabase.PExecute( "UPDATE account SET locked = '0' WHERE id = '%u'", GetAccountId());
-        PSendSysMessage(LANG_COMMAND_ACCLOCKUNLOCKED);
-    }
+    sAccountMgr.LockAccount(GetAccountId(), value);
+
+    PSendSysMessage(value ? LANG_COMMAND_ACCLOCKLOCKED : LANG_COMMAND_ACCLOCKUNLOCKED);
 
     return true;
 }
diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp
index fd075a1cb88..64307c05abf 100644
--- a/src/game/Level1.cpp
+++ b/src/game/Level1.cpp
@@ -32,7 +32,9 @@
 #include "CellImpl.h"
 #include "MapPersistentStateMgr.h"
 #include "Mail.h"
+#include "Transports.h"
 #include "Util.h"
+#include "SpellMgr.h"
 #ifdef _DEBUG_VMAPS
 #include "VMapFactory.h"
 #endif
@@ -40,56 +42,56 @@
 //-----------------------Npc Commands-----------------------
 bool ChatHandler::HandleNpcSayCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     Creature* pCreature = getSelectedCreature();
-    if(!pCreature)
+    if (!pCreature)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    pCreature->MonsterSay(args, LANG_UNIVERSAL);
+    pCreature->MonsterSay(args, LANG_UNIVERSAL, m_session->GetPlayer());
 
     return true;
 }
 
 bool ChatHandler::HandleNpcYellCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     Creature* pCreature = getSelectedCreature();
-    if(!pCreature)
+    if (!pCreature)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    pCreature->MonsterYell(args, LANG_UNIVERSAL);
+    pCreature->MonsterYell(args, LANG_UNIVERSAL, m_session->GetPlayer());
 
     return true;
 }
 
-//show text emote by creature in chat
+// show text emote by creature in chat
 bool ChatHandler::HandleNpcTextEmoteCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     Creature* pCreature = getSelectedCreature();
 
-    if(!pCreature)
+    if (!pCreature)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    pCreature->MonsterTextEmote(args, NULL);
+    pCreature->MonsterTextEmote(args, m_session->GetPlayer());
 
     return true;
 }
@@ -107,7 +109,7 @@ bool ChatHandler::HandleNpcWhisperCommand(char* args)
 
     Creature* pCreature = m_session->GetPlayer()->GetMap()->GetCreature(guid);
 
-    if(!pCreature || !target || !*args)
+    if (!pCreature || !target || !*args)
         return false;
 
     // check online security
@@ -123,35 +125,61 @@ bool ChatHandler::HandleNpcWhisperCommand(char* args)
 // global announce
 bool ChatHandler::HandleAnnounceCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
-    sWorld.SendWorldText(LANG_SYSTEMMESSAGE,args);
+    sWorld.SendWorldText(LANG_SYSTEMMESSAGE, args);
     return true;
 }
 
-//notification player at the screen
+// global nameannounce
+bool ChatHandler::HandleNameAnnounceCommand(char* args)
+{
+  int32 strid = 0;
+
+    if (!*args)
+        return false;
+
+    switch(m_session->GetSecurity())
+    {
+      case SEC_MODERATOR:
+        strid = LANG_SYSTEMMESSAGE_MODERATOR;
+        break;
+      case SEC_GAMEMASTER:
+        strid = LANG_SYSTEMMESSAGE_GAMEMASTER;
+        break;
+      case SEC_ADMINISTRATOR:
+        strid = LANG_SYSTEMMESSAGE_ADMINISTRATOR;
+        break;
+      default:
+        return false;
+    }
+      sWorld.SendWorldText(strid, m_session->GetPlayerName(), args);
+    return true;
+}
+
+// notification player at the screen
 bool ChatHandler::HandleNotifyCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     std::string str = GetMangosString(LANG_GLOBAL_NOTIFY);
     str += args;
 
-    WorldPacket data(SMSG_NOTIFICATION, (str.size()+1));
+    WorldPacket data(SMSG_NOTIFICATION, (str.size() + 1));
     data << str;
     sWorld.SendGlobalMessage(&data);
 
     return true;
 }
 
-//Enable\Dissable GM Mode
+// Enable\Dissable GM Mode
 bool ChatHandler::HandleGMCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
     {
-        if(m_session->GetPlayer()->isGameMaster())
+        if (m_session->GetPlayer()->isGameMaster())
             m_session->SendNotification(LANG_GM_ON);
         else
             m_session->SendNotification(LANG_GM_OFF);
@@ -183,9 +211,9 @@ bool ChatHandler::HandleGMCommand(char* args)
 // Enables or disables hiding of the staff badge
 bool ChatHandler::HandleGMChatCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
     {
-        if(m_session->GetPlayer()->isGMChat())
+        if (m_session->GetPlayer()->isGMChat())
             m_session->SendNotification(LANG_GM_CHAT_ON);
         else
             m_session->SendNotification(LANG_GM_CHAT_OFF);
@@ -214,7 +242,7 @@ bool ChatHandler::HandleGMChatCommand(char* args)
     return true;
 }
 
-//Enable\Dissable Invisible mode
+// Enable\Dissable Invisible mode
 bool ChatHandler::HandleGMVisibleCommand(char* args)
 {
     if (!*args)
@@ -231,15 +259,24 @@ bool ChatHandler::HandleGMVisibleCommand(char* args)
         return false;
     }
 
+    Player* player = m_session->GetPlayer();
+    SpellEntry const* invisibleAuraInfo = sSpellStore.LookupEntry(sWorld.getConfig(CONFIG_UINT32_GM_INVISIBLE_AURA));
+    if (!invisibleAuraInfo || !IsSpellAppliesAura(invisibleAuraInfo))
+        invisibleAuraInfo = NULL;
+
     if (value)
     {
-        m_session->GetPlayer()->SetGMVisible(true);
+        player->SetGMVisible(true);
         m_session->SendNotification(LANG_INVISIBLE_VISIBLE);
+        if (invisibleAuraInfo)
+            player->RemoveAurasDueToSpell(invisibleAuraInfo->Id);
     }
     else
     {
         m_session->SendNotification(LANG_INVISIBLE_INVISIBLE);
-        m_session->GetPlayer()->SetGMVisible(false);
+        player->SetGMVisible(false);
+        if (invisibleAuraInfo)
+            player->CastSpell(player, invisibleAuraInfo, true);
     }
 
     return true;
@@ -247,13 +284,13 @@ bool ChatHandler::HandleGMVisibleCommand(char* args)
 
 bool ChatHandler::HandleGPSCommand(char* args)
 {
-    WorldObject *obj = NULL;
+    WorldObject* obj = NULL;
     if (*args)
     {
         if (ObjectGuid guid = ExtractGuidFromLink(&args))
             obj = (WorldObject*)m_session->GetPlayer()->GetObjectByTypeMask(guid, TYPEMASK_CREATURE_OR_GAMEOBJECT);
 
-        if(!obj)
+        if (!obj)
         {
             SendSysMessage(LANG_PLAYER_NOT_FOUND);
             SetSentErrorMessage(true);
@@ -264,7 +301,7 @@ bool ChatHandler::HandleGPSCommand(char* args)
     {
         obj = getSelectedUnit();
 
-        if(!obj)
+        if (!obj)
         {
             SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
             SetSentErrorMessage(true);
@@ -275,7 +312,7 @@ bool ChatHandler::HandleGPSCommand(char* args)
     Cell cell(cell_val);
 
     uint32 zone_id, area_id;
-    obj->GetZoneAndAreaId(zone_id,area_id);
+    obj->GetZoneAndAreaId(zone_id, area_id);
 
     MapEntry const* mapEntry = sMapStore.LookupEntry(obj->GetMapId());
     AreaTableEntry const* zoneEntry = GetAreaEntryByAreaID(zone_id);
@@ -290,60 +327,85 @@ bool ChatHandler::HandleGPSCommand(char* args)
         zone_y = 0;
     }
 
-    TerrainInfo const *map = obj->GetTerrain();
-    float ground_z = map->GetHeight(obj->GetPositionX(), obj->GetPositionY(), MAX_HEIGHT);
-    float floor_z = map->GetHeight(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ());
+    Map const *map = obj->GetMap();
+    float ground_z = map->GetHeight(obj->GetPhaseMask(), obj->GetPositionX(), obj->GetPositionY(), MAX_HEIGHT);
+    float floor_z = map->GetHeight(obj->GetPhaseMask(), obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ());
 
     GridPair p = MaNGOS::ComputeGridPair(obj->GetPositionX(), obj->GetPositionY());
 
-    int gx=63-p.x_coord;
-    int gy=63-p.y_coord;
+    int gx = 63 - p.x_coord;
+    int gy = 63 - p.y_coord;
 
-    uint32 have_map = GridMap::ExistMap(obj->GetMapId(),gx,gy) ? 1 : 0;
-    uint32 have_vmap = GridMap::ExistVMap(obj->GetMapId(),gx,gy) ? 1 : 0;
+    uint32 have_map = GridMap::ExistMap(obj->GetMapId(), gx, gy) ? 1 : 0;
+    uint32 have_vmap = GridMap::ExistVMap(obj->GetMapId(), gx, gy) ? 1 : 0;
+    TerrainInfoPtr terrain = obj->GetTerrain();
 
+    PSendSysMessage(LANG_MAP_POSITION,
+                    obj->GetMapId(), (mapEntry ? mapEntry->name[GetSessionDbcLocale()] : "<unknown>"),
+                    zone_id, (zoneEntry ? zoneEntry->area_name[GetSessionDbcLocale()] : "<unknown>"),
+                    area_id, (areaEntry ? areaEntry->area_name[GetSessionDbcLocale()] : "<unknown>"),
+                    obj->GetPhaseMask(),
+                    obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation(),
+                    cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), obj->GetInstanceId(),
+                    zone_x, zone_y, ground_z, floor_z, have_map, have_vmap);
+
+    DEBUG_LOG("Player %s GPS call for %s '%s' (%s: %u):",
+              m_session ? GetNameLink().c_str() : GetMangosString(LANG_CONSOLE_COMMAND),
+              (obj->GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), obj->GetName(),
+              (obj->GetTypeId() == TYPEID_PLAYER ? "GUID" : "Entry"), (obj->GetTypeId() == TYPEID_PLAYER ? obj->GetGUIDLow() : obj->GetEntry()));
+
+    DEBUG_LOG(GetMangosString(LANG_MAP_POSITION),
+              obj->GetMapId(), (mapEntry ? mapEntry->name[sWorld.GetDefaultDbcLocale()] : "<unknown>"),
+              zone_id, (zoneEntry ? zoneEntry->area_name[sWorld.GetDefaultDbcLocale()] : "<unknown>"),
+              area_id, (areaEntry ? areaEntry->area_name[sWorld.GetDefaultDbcLocale()] : "<unknown>"),
+              obj->GetPhaseMask(),
+              obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation(),
+              cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), obj->GetInstanceId(),
+              zone_x, zone_y, ground_z, floor_z, have_map, have_vmap);
+
+    GridMapLiquidData liquid_status;
+    GridMapLiquidStatus res = terrain->getLiquidStatus(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), MAP_ALL_LIQUIDS, &liquid_status);
+    if (res)
+    {
+        PSendSysMessage(LANG_LIQUID_STATUS, liquid_status.level, liquid_status.depth_level, liquid_status.type_flags, res);
+    }
+
+    // Additional vmap debugging help
+#ifdef _DEBUG_VMAPS
     if (have_vmap)
     {
-        if(map->IsOutdoors(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ()))
+        if (terrain->IsOutdoors(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ()))
             PSendSysMessage("You are OUTdoor");
         else
             PSendSysMessage("You are INdoor");
     }
     else PSendSysMessage("no VMAP available for area info");
 
-    PSendSysMessage(LANG_MAP_POSITION,
-        obj->GetMapId(), (mapEntry ? mapEntry->name[GetSessionDbcLocale()] : "<unknown>" ),
-        zone_id, (zoneEntry ? zoneEntry->area_name[GetSessionDbcLocale()] : "<unknown>" ),
-        area_id, (areaEntry ? areaEntry->area_name[GetSessionDbcLocale()] : "<unknown>" ),
-        obj->GetPhaseMask(),
-        obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation(),
-        cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), obj->GetInstanceId(),
-        zone_x, zone_y, ground_z, floor_z, have_map, have_vmap );
-
-    DEBUG_LOG("Player %s GPS call for %s '%s' (%s: %u):",
-        m_session ? GetNameLink().c_str() : GetMangosString(LANG_CONSOLE_COMMAND),
-        (obj->GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), obj->GetName(),
-        (obj->GetTypeId() == TYPEID_PLAYER ? "GUID" : "Entry"), (obj->GetTypeId() == TYPEID_PLAYER ? obj->GetGUIDLow(): obj->GetEntry()) );
+    PSendSysMessage("Static terrain height (maps only): %f", obj->GetTerrain()->GetHeightStatic(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), false));
+    if (VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager())
+        PSendSysMessage("Vmap Terrain Height %f", vmgr->getHeight(obj->GetMapId(), obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ()+2.0f, 10000.0f));
 
-    DEBUG_LOG(GetMangosString(LANG_MAP_POSITION),
-        obj->GetMapId(), (mapEntry ? mapEntry->name[sWorld.GetDefaultDbcLocale()] : "<unknown>" ),
-        zone_id, (zoneEntry ? zoneEntry->area_name[sWorld.GetDefaultDbcLocale()] : "<unknown>" ),
-        area_id, (areaEntry ? areaEntry->area_name[sWorld.GetDefaultDbcLocale()] : "<unknown>" ),
-        obj->GetPhaseMask(),
-        obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation(),
-        cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), obj->GetInstanceId(),
-        zone_x, zone_y, ground_z, floor_z, have_map, have_vmap );
+    PSendSysMessage("Static map height (maps and vmaps): %f", obj->GetTerrain()->GetHeightStatic(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ()));
+#endif
 
-    GridMapLiquidData liquid_status;
-    GridMapLiquidStatus res = map->getLiquidStatus(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), MAP_ALL_LIQUIDS, &liquid_status);
-    if (res)
+    if (obj->IsBoarded())
     {
-        PSendSysMessage(LANG_LIQUID_STATUS, liquid_status.level, liquid_status.depth_level, liquid_status.type, res);
+        PSendSysMessage("Object on transport raw position: %f %f %f %f (transport offset %f %f %f %f)",
+                obj->GetPositionX(),
+                obj->GetPositionY(),
+                obj->GetPositionZ(),
+                obj->GetOrientation(),
+                obj->GetTransOffsetX(),
+                obj->GetTransOffsetY(),
+                obj->GetTransOffsetZ(),
+                obj->GetTransOffsetO()
+                );
     }
+
     return true;
 }
 
-//Summon Player
+// Summon Player
 bool ChatHandler::HandleNamegoCommand(char* args)
 {
     Player* target;
@@ -376,19 +438,22 @@ bool ChatHandler::HandleNamegoCommand(char* args)
 
         Map* pMap = m_session->GetPlayer()->GetMap();
 
+        if (!pMap)
+            return false;
+
         if (pMap->IsBattleGroundOrArena())
         {
             // only allow if gm mode is on
             if (!target->isGameMaster())
             {
-                PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM,nameLink.c_str());
+                PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM, nameLink.c_str());
                 SetSentErrorMessage(true);
                 return false;
             }
             // if both players are in different bgs
             else if (target->GetBattleGroundId() && m_session->GetPlayer()->GetBattleGroundId() != target->GetBattleGroundId())
             {
-                PSendSysMessage(LANG_CANNOT_GO_TO_BG_FROM_BG,nameLink.c_str());
+                PSendSysMessage(LANG_CANNOT_GO_TO_BG_FROM_BG, nameLink.c_str());
                 SetSentErrorMessage(true);
                 return false;
             }
@@ -405,41 +470,39 @@ bool ChatHandler::HandleNamegoCommand(char* args)
             if (cMap->Instanceable() && cMap->GetInstanceId() != pMap->GetInstanceId())
             {
                 // cannot summon from instance to instance
-                PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST,nameLink.c_str());
+                PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST, nameLink.c_str());
                 SetSentErrorMessage(true);
                 return false;
             }
 
             // we are in instance, and can summon only player in our group with us as lead
             if (!m_session->GetPlayer()->GetGroup() || !target->GetGroup() ||
-                (target->GetGroup()->GetLeaderGuid() != m_session->GetPlayer()->GetObjectGuid()) ||
-                (m_session->GetPlayer()->GetGroup()->GetLeaderGuid() != m_session->GetPlayer()->GetObjectGuid()))
+                    (target->GetGroup()->GetLeaderGuid() != m_session->GetPlayer()->GetObjectGuid()) ||
+                    (m_session->GetPlayer()->GetGroup()->GetLeaderGuid() != m_session->GetPlayer()->GetObjectGuid()))
                 // the last check is a bit excessive, but let it be, just in case
             {
-                PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST,nameLink.c_str());
+                PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST, nameLink.c_str());
                 SetSentErrorMessage(true);
                 return false;
             }
         }
 
-        PSendSysMessage(LANG_SUMMONING, nameLink.c_str(),"");
+        PSendSysMessage(LANG_SUMMONING, nameLink.c_str(), "");
         if (needReportToTarget(target))
             ChatHandler(target).PSendSysMessage(LANG_SUMMONED_BY, playerLink(_player->GetName()).c_str());
 
-        // stop flight if need
-        if (target->IsTaxiFlying())
+        target->InterruptTaxiFlying();
+
+        // before GM
+
+        if (m_session->GetPlayer()->IsOnTransport())
         {
-            target->GetMotionMaster()->MovementExpired();
-            target->m_taxi.ClearTaxiDestinations();
+            WorldLocation loc = m_session->GetPlayer()->GetTransport()->GetPosition();
+            target->TeleportTo(loc, TELE_TO_NODELAY);
+            m_session->GetPlayer()->GetTransport()->AddPassenger(target, loc.GetTransportPos());
         }
-        // save only in non-flight case
         else
-            target->SaveRecallPosition();
-
-        // before GM
-        float x,y,z;
-        m_session->GetPlayer()->GetClosePoint(x, y, z, target->GetObjectBoundingRadius());
-        target->TeleportTo(m_session->GetPlayer()->GetMapId(),x,y,z,target->GetOrientation());
+            target->TeleportTo(m_session->GetPlayer()->GetClosePoint(target->GetObjectBoundingRadius()), TELE_TO_NODELAY);
     }
     else
     {
@@ -449,21 +512,21 @@ bool ChatHandler::HandleNamegoCommand(char* args)
 
         std::string nameLink = playerLink(target_name);
 
-        PSendSysMessage(LANG_SUMMONING, nameLink.c_str(),GetMangosString(LANG_OFFLINE));
+        PSendSysMessage(LANG_SUMMONING, nameLink.c_str(), GetMangosString(LANG_OFFLINE));
 
         // in point where GM stay
         Player::SavePositionInDB(target_guid, m_session->GetPlayer()->GetMapId(),
-            m_session->GetPlayer()->GetPositionX(),
-            m_session->GetPlayer()->GetPositionY(),
-            m_session->GetPlayer()->GetPositionZ(),
-            m_session->GetPlayer()->GetOrientation(),
-            m_session->GetPlayer()->GetZoneId());
+                                 m_session->GetPlayer()->GetPositionX(),
+                                 m_session->GetPlayer()->GetPositionY(),
+                                 m_session->GetPlayer()->GetPositionZ(),
+                                 m_session->GetPlayer()->GetOrientation(),
+                                 m_session->GetPlayer()->GetZoneId());
     }
 
     return true;
 }
 
-//Teleport to Player
+// Teleport to Player
 bool ChatHandler::HandleGonameCommand(char* args)
 {
     Player* target;
@@ -480,7 +543,6 @@ bool ChatHandler::HandleGonameCommand(char* args)
         return false;
     }
 
-
     if (target)
     {
         // check online security
@@ -495,14 +557,14 @@ bool ChatHandler::HandleGonameCommand(char* args)
             // only allow if gm mode is on
             if (!_player->isGameMaster())
             {
-                PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM,chrNameLink.c_str());
+                PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM, chrNameLink.c_str());
                 SetSentErrorMessage(true);
                 return false;
             }
             // if both players are in different bgs
             else if (_player->GetBattleGroundId() && _player->GetBattleGroundId() != target->GetBattleGroundId())
             {
-                PSendSysMessage(LANG_CANNOT_GO_TO_BG_FROM_BG,chrNameLink.c_str());
+                PSendSysMessage(LANG_CANNOT_GO_TO_BG_FROM_BG, chrNameLink.c_str());
                 SetSentErrorMessage(true);
                 return false;
             }
@@ -513,7 +575,7 @@ bool ChatHandler::HandleGonameCommand(char* args)
             if (!_player->GetMap()->IsBattleGroundOrArena())
                 _player->SetBattleGroundEntryPoint();
         }
-        else if(cMap->IsDungeon())
+        else if (cMap->IsDungeon())
         {
             // we have to go to instance, and can go to player only if:
             //   1) we are in his group (either as leader or as member)
@@ -523,7 +585,7 @@ bool ChatHandler::HandleGonameCommand(char* args)
                 // we are in group, we can go only if we are in the player group
                 if (_player->GetGroup() != target->GetGroup())
                 {
-                    PSendSysMessage(LANG_CANNOT_GO_TO_INST_PARTY,chrNameLink.c_str());
+                    PSendSysMessage(LANG_CANNOT_GO_TO_INST_PARTY, chrNameLink.c_str());
                     SetSentErrorMessage(true);
                     return false;
                 }
@@ -533,7 +595,7 @@ bool ChatHandler::HandleGonameCommand(char* args)
                 // we are not in group, let's verify our GM mode
                 if (!_player->isGameMaster())
                 {
-                    PSendSysMessage(LANG_CANNOT_GO_TO_INST_GM,chrNameLink.c_str());
+                    PSendSysMessage(LANG_CANNOT_GO_TO_INST_GM, chrNameLink.c_str());
                     SetSentErrorMessage(true);
                     return false;
                 }
@@ -541,16 +603,16 @@ bool ChatHandler::HandleGonameCommand(char* args)
 
             // if the player or the player's group is bound to another instance
             // the player will not be bound to another one
-            InstancePlayerBind *pBind = _player->GetBoundInstance(target->GetMapId(), target->GetDifficulty(cMap->IsRaid()));
+            InstancePlayerBind* pBind = _player->GetBoundInstance(target->GetMapId(), target->GetDifficulty(cMap->IsRaid()));
             if (!pBind)
             {
-                Group *group = _player->GetGroup();
+                Group* group = _player->GetGroup();
                 // if no bind exists, create a solo bind
-                InstanceGroupBind *gBind = group ? group->GetBoundInstance(target->GetMapId(), target) : NULL;
+                InstanceGroupBind* gBind = group ? group->GetBoundInstance(target->GetMapId(), target) : NULL;
                 // if no bind exists, create a solo bind
                 if (!gBind)
                 {
-                    DungeonPersistentState *save = ((DungeonMap*)target->GetMap())->GetPersistanceState();
+                    DungeonPersistentState* save = ((DungeonMap*)target->GetMap())->GetPersistanceState();
 
                     // if player is group leader then we need add group bind
                     if (group && group->IsLeader(_player->GetObjectGuid()))
@@ -560,7 +622,7 @@ bool ChatHandler::HandleGonameCommand(char* args)
                 }
             }
 
-            if(cMap->IsRaid())
+            if (cMap->IsRaid())
                 _player->SetRaidDifficulty(target->GetRaidDifficulty());
             else
                 _player->SetDungeonDifficulty(target->GetDungeonDifficulty());
@@ -570,21 +632,17 @@ bool ChatHandler::HandleGonameCommand(char* args)
         if (needReportToTarget(target))
             ChatHandler(target).PSendSysMessage(LANG_APPEARING_TO, GetNameLink().c_str());
 
-        // stop flight if need
-        if (_player->IsTaxiFlying())
-        {
-            _player->GetMotionMaster()->MovementExpired();
-            _player->m_taxi.ClearTaxiDestinations();
-        }
-        // save only in non-flight case
-        else
-            _player->SaveRecallPosition();
+        _player->InterruptTaxiFlying();
 
         // to point to see at target with same orientation
-        float x,y,z;
-        target->GetContactPoint(_player,x,y,z);
+        float x, y, z;
 
-        _player->TeleportTo(target->GetMapId(), x, y, z, _player->GetAngle(target), TELE_TO_GM_MODE);
+        if (_player->GetMapId() == target->GetMapId())
+            target->GetContactPoint(_player, x, y, z);
+        else
+            target->GetPosition(x, y, z);
+
+        _player->TeleportTo(target->GetMapId(), x, y, z + 0.5f, _player->GetAngle(target), TELE_TO_GM_MODE);
     }
     else
     {
@@ -597,12 +655,14 @@ bool ChatHandler::HandleGonameCommand(char* args)
         PSendSysMessage(LANG_APPEARING_AT, nameLink.c_str());
 
         // to point where player stay (if loaded)
-        float x,y,z,o;
+        float x, y, z, o;
         uint32 map;
         bool in_flight;
-        if (!Player::LoadPositionFromDB(target_guid, map,x,y,z,o,in_flight))
+        if (!Player::LoadPositionFromDB(target_guid, map, x, y, z, o, in_flight))
             return false;
 
+        z += 0.5f;
+
         return HandleGoHelper(_player, map, x, y, &z);
     }
 
@@ -627,13 +687,13 @@ bool ChatHandler::HandleRecallCommand(char* args)
         return false;
     }
 
-    return HandleGoHelper(target, target->m_recallMap, target->m_recallX, target->m_recallY, &target->m_recallZ, &target->m_recallO);
+    return HandleGoHelper(target, target->m_recall.GetMapId(), target->m_recall.getX(), target->m_recall.getY(), &target->m_recall.z, &target->m_recall.o);
 }
 
-//Edit Player HP
+// Edit Player HP
 bool ChatHandler::HandleModifyHPCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     int32 hp = atoi(args);
@@ -646,32 +706,38 @@ bool ChatHandler::HandleModifyHPCommand(char* args)
         return false;
     }
 
-    Player *chr = getSelectedPlayer();
-    if (chr == NULL)
+    Unit *target = getSelectedUnit();
+    if (!target)
     {
-        SendSysMessage(LANG_NO_CHAR_SELECTED);
+        SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    // check online security
-    if (HasLowerSecurity(chr))
-        return false;
+    if (target->GetTypeId() == TYPEID_PLAYER)
+    {
+        Player* plr = (Player*)target;
 
-    PSendSysMessage(LANG_YOU_CHANGE_HP, GetNameLink(chr).c_str(), hp, hpm);
-    if (needReportToTarget(chr))
-        ChatHandler(chr).PSendSysMessage(LANG_YOURS_HP_CHANGED, GetNameLink().c_str(), hp, hpm);
+        // check online security
+        if (HasLowerSecurity(plr))
+            return false;
+
+        PSendSysMessage(LANG_YOU_CHANGE_HP, GetNameLink(plr).c_str(), hp, hpm);
 
-    chr->SetMaxHealth( hpm );
-    chr->SetHealth( hp );
+        if (needReportToTarget(plr))
+            ChatHandler(plr).PSendSysMessage(LANG_YOURS_HP_CHANGED, GetNameLink().c_str(), hp, hpm);
+    }
+
+    target->SetMaxHealth(hpm);
+    target->SetHealth(hp);
 
     return true;
 }
 
-//Edit Player Mana
+// Edit Player Mana
 bool ChatHandler::HandleModifyManaCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     int32 mana = atoi(args);
@@ -684,36 +750,42 @@ bool ChatHandler::HandleModifyManaCommand(char* args)
         return false;
     }
 
-    Player *chr = getSelectedPlayer();
-    if (chr == NULL)
+    Unit *target = getSelectedUnit();
+    if (!target)
     {
-        SendSysMessage(LANG_NO_CHAR_SELECTED);
+        SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    // check online security
-    if (HasLowerSecurity(chr))
-        return false;
+    if (target->GetTypeId() == TYPEID_PLAYER)
+    {
+        Player* plr = (Player*)target;
 
-    PSendSysMessage(LANG_YOU_CHANGE_MANA, GetNameLink(chr).c_str(), mana, manam);
-    if (needReportToTarget(chr))
-        ChatHandler(chr).PSendSysMessage(LANG_YOURS_MANA_CHANGED, GetNameLink().c_str(), mana, manam);
+        // check online security
+        if (HasLowerSecurity(plr))
+            return false;
 
-    chr->SetMaxPower(POWER_MANA,manam );
-    chr->SetPower(POWER_MANA, mana );
+        PSendSysMessage(LANG_YOU_CHANGE_MANA, GetNameLink(plr).c_str(), mana, manam);
+
+        if (needReportToTarget(plr))
+            ChatHandler(plr).PSendSysMessage(LANG_YOURS_MANA_CHANGED, GetNameLink().c_str(), mana, manam);
+    }
+
+    target->SetMaxPower(POWER_MANA,manam);
+    target->SetPower(POWER_MANA, mana);
 
     return true;
 }
 
-//Edit Player Energy
+// Edit Player Energy
 bool ChatHandler::HandleModifyEnergyCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
-    int32 energy = atoi(args)*10;
-    int32 energym = atoi(args)*10;
+    int32 energy = atoi(args) * 10;
+    int32 energym = atoi(args) * 10;
 
     if (energy <= 0 || energym <= 0 || energym < energy)
     {
@@ -722,38 +794,44 @@ bool ChatHandler::HandleModifyEnergyCommand(char* args)
         return false;
     }
 
-    Player *chr = getSelectedPlayer();
-    if (!chr)
+    Unit* target = getSelectedUnit();
+    if (!target)
     {
-        SendSysMessage(LANG_NO_CHAR_SELECTED);
+        SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    // check online security
-    if (HasLowerSecurity(chr))
-        return false;
+    if (target->GetTypeId() == TYPEID_PLAYER)
+    {
+        Player* plr = (Player*)target;
 
-    PSendSysMessage(LANG_YOU_CHANGE_ENERGY, GetNameLink(chr).c_str(), energy/10, energym/10);
-    if (needReportToTarget(chr))
-        ChatHandler(chr).PSendSysMessage(LANG_YOURS_ENERGY_CHANGED, GetNameLink().c_str(), energy/10, energym/10);
+        // check online security
+        if (HasLowerSecurity(plr))
+            return false;
+
+        PSendSysMessage(LANG_YOU_CHANGE_ENERGY, GetNameLink(plr).c_str(), energy, energym);
 
-    chr->SetMaxPower(POWER_ENERGY,energym );
-    chr->SetPower(POWER_ENERGY, energy );
+        if (needReportToTarget(plr))
+            ChatHandler(plr).PSendSysMessage(LANG_YOURS_ENERGY_CHANGED, GetNameLink().c_str(), energy, energym);
+    }
 
-    DETAIL_LOG(GetMangosString(LANG_CURRENT_ENERGY),chr->GetMaxPower(POWER_ENERGY));
+    target->SetMaxPower(POWER_ENERGY, energym);
+    target->SetPower(POWER_ENERGY, energy);
+
+    DETAIL_LOG(GetMangosString(LANG_CURRENT_ENERGY), target->GetMaxPower(POWER_ENERGY));
 
     return true;
 }
 
-//Edit Player Rage
+// Edit Player Rage
 bool ChatHandler::HandleModifyRageCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
-    int32 rage = atoi(args)*10;
-    int32 ragem = atoi(args)*10;
+    int32 rage = atoi(args) * 10;
+    int32 ragem = atoi(args) * 10;
 
     if (rage <= 0 || ragem <= 0 || ragem < rage)
     {
@@ -762,24 +840,30 @@ bool ChatHandler::HandleModifyRageCommand(char* args)
         return false;
     }
 
-    Player *chr = getSelectedPlayer();
-    if (chr == NULL)
+    Unit* target = getSelectedUnit();
+    if (!target)
     {
-        SendSysMessage(LANG_NO_CHAR_SELECTED);
+        SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    // check online security
-    if (HasLowerSecurity(chr))
-        return false;
+    if (target->GetTypeId() == TYPEID_PLAYER)
+    {
+        Player* plr = (Player*)target;
 
-    PSendSysMessage(LANG_YOU_CHANGE_RAGE, GetNameLink(chr).c_str(), rage/10, ragem/10);
-    if (needReportToTarget(chr))
-        ChatHandler(chr).PSendSysMessage(LANG_YOURS_RAGE_CHANGED, GetNameLink().c_str(), rage/10, ragem/10);
+        // check online security
+        if (HasLowerSecurity(plr))
+            return false;
+
+        PSendSysMessage(LANG_YOU_CHANGE_RAGE, GetNameLink(plr).c_str(), rage, ragem);
+
+        if (needReportToTarget(plr))
+            ChatHandler(plr).PSendSysMessage(LANG_YOURS_RAGE_CHANGED, GetNameLink().c_str(), rage, ragem);
+    }
 
-    chr->SetMaxPower(POWER_RAGE,ragem );
-    chr->SetPower(POWER_RAGE, rage );
+    target->SetMaxPower(POWER_RAGE, ragem*10);
+    target->SetPower(POWER_RAGE, rage*10);
 
     return true;
 }
@@ -787,11 +871,11 @@ bool ChatHandler::HandleModifyRageCommand(char* args)
 // Edit Player Runic Power
 bool ChatHandler::HandleModifyRunicPowerCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
-    int32 rune = atoi(args)*10;
-    int32 runem = atoi(args)*10;
+    int32 rune = atoi(args) * 10;
+    int32 runem = atoi(args) * 10;
 
     if (rune <= 0 || runem <= 0 || runem < rune)
     {
@@ -800,29 +884,39 @@ bool ChatHandler::HandleModifyRunicPowerCommand(char* args)
         return false;
     }
 
-    Player *chr = getSelectedPlayer();
-    if (chr == NULL)
+    Unit* target = getSelectedUnit();
+    if (!target)
     {
-        SendSysMessage(LANG_NO_CHAR_SELECTED);
+        SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    PSendSysMessage(LANG_YOU_CHANGE_RUNIC_POWER, GetNameLink(chr).c_str(), rune/10, runem/10);
-    if (needReportToTarget(chr))
-        ChatHandler(chr).PSendSysMessage(LANG_YOURS_RUNIC_POWER_CHANGED, GetNameLink().c_str(), rune/10, runem/10);
+    if (target->GetTypeId() == TYPEID_PLAYER)
+    {
+        Player* plr = (Player*)target;
 
-    chr->SetMaxPower(POWER_RUNIC_POWER,runem );
-    chr->SetPower(POWER_RUNIC_POWER, rune );
+        // check online security
+        if (HasLowerSecurity(plr))
+            return false;
+
+        PSendSysMessage(LANG_YOU_CHANGE_RUNIC_POWER, GetNameLink(plr).c_str(), rune, runem);
+
+        if (needReportToTarget(plr))
+            ChatHandler(plr).PSendSysMessage(LANG_YOURS_RUNIC_POWER_CHANGED, GetNameLink().c_str(), rune, runem);
+    }
+
+    target->SetMaxPower(POWER_RUNIC_POWER, runem*10);
+    target->SetPower(POWER_RUNIC_POWER, rune*10);
 
     return true;
 }
 
-//Edit Player Faction
+// Edit Player Faction
 bool ChatHandler::HandleModifyFactionCommand(char* args)
 {
     Creature* chr = getSelectedCreature();
-    if(!chr)
+    if (!chr)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
@@ -831,18 +925,18 @@ bool ChatHandler::HandleModifyFactionCommand(char* args)
 
     if (!*args)
     {
-        if(chr)
+        if (chr)
         {
             uint32 factionid = chr->getFaction();
             uint32 flag      = chr->GetUInt32Value(UNIT_FIELD_FLAGS);
             uint32 npcflag   = chr->GetUInt32Value(UNIT_NPC_FLAGS);
             uint32 dyflag    = chr->GetUInt32Value(UNIT_DYNAMIC_FLAGS);
-            PSendSysMessage(LANG_CURRENT_FACTION,chr->GetGUIDLow(),factionid,flag,npcflag,dyflag);
+            PSendSysMessage(LANG_CURRENT_FACTION, chr->GetGUIDLow(), factionid, flag, npcflag, dyflag);
         }
         return true;
     }
 
-    if( !chr )
+    if (!chr)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
         SetSentErrorMessage(true);
@@ -853,7 +947,7 @@ bool ChatHandler::HandleModifyFactionCommand(char* args)
     if (!ExtractUint32KeyFromLink(&args, "Hfaction", factionid))
         return false;
 
-    if(!sFactionTemplateStore.LookupEntry(factionid))
+    if (!sFactionTemplateStore.LookupEntry(factionid))
     {
         PSendSysMessage(LANG_WRONG_FACTION, factionid);
         SetSentErrorMessage(true);
@@ -875,15 +969,15 @@ bool ChatHandler::HandleModifyFactionCommand(char* args)
     PSendSysMessage(LANG_YOU_CHANGE_FACTION, chr->GetGUIDLow(), factionid, flag, npcflag, dyflag);
 
     chr->setFaction(factionid);
-    chr->SetUInt32Value(UNIT_FIELD_FLAGS,flag);
-    chr->SetUInt32Value(UNIT_NPC_FLAGS,npcflag);
-    chr->SetUInt32Value(UNIT_DYNAMIC_FLAGS,dyflag);
+    chr->SetUInt32Value(UNIT_FIELD_FLAGS, flag);
+    chr->SetUInt32Value(UNIT_NPC_FLAGS, npcflag);
+    chr->SetUInt32Value(UNIT_DYNAMIC_FLAGS, dyflag);
 
     return true;
 }
 
-//Edit Player TP
-bool ChatHandler::HandleModifyTalentCommand (char* args)
+// Edit Player TP
+bool ChatHandler::HandleModifyTalentCommand(char* args)
 {
     if (!*args)
         return false;
@@ -893,14 +987,14 @@ bool ChatHandler::HandleModifyTalentCommand (char* args)
         return false;
 
     Unit* target = getSelectedUnit();
-    if(!target)
+    if (!target)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
         SetSentErrorMessage(true);
         return false;
     }
 
-    if(target->GetTypeId()==TYPEID_PLAYER)
+    if (target->GetTypeId() == TYPEID_PLAYER)
     {
         // check online security
         if (HasLowerSecurity((Player*)target))
@@ -910,16 +1004,16 @@ bool ChatHandler::HandleModifyTalentCommand (char* args)
         ((Player*)target)->SendTalentsInfoData(false);
         return true;
     }
-    else if(((Creature*)target)->IsPet())
+    else if (((Creature*)target)->IsPet())
     {
-        Unit *owner = target->GetOwner();
-        if(owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet *)target)->IsPermanentPetFor((Player*)owner))
+        Unit* owner = target->GetOwner();
+        if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet*)target)->IsPermanentPetFor((Player*)owner))
         {
             // check online security
             if (HasLowerSecurity((Player*)owner))
                 return false;
 
-            ((Pet *)target)->SetFreeTalentPoints(tp);
+            ((Pet*)target)->SetFreeTalentPoints(tp);
             ((Player*)owner)->SendTalentsInfoData(true);
             return true;
         }
@@ -930,7 +1024,7 @@ bool ChatHandler::HandleModifyTalentCommand (char* args)
     return false;
 }
 
-//Enable On\OFF all taxi paths
+// Enable On\OFF all taxi paths
 bool ChatHandler::HandleTaxiCheatCommand(char* args)
 {
     bool value;
@@ -941,9 +1035,9 @@ bool ChatHandler::HandleTaxiCheatCommand(char* args)
         return false;
     }
 
-    Player *chr = getSelectedPlayer();
+    Player* chr = getSelectedPlayer();
     if (!chr)
-        chr=m_session->GetPlayer();
+        chr = m_session->GetPlayer();
     // check online security
     else if (HasLowerSecurity(chr))
         return false;
@@ -966,7 +1060,7 @@ bool ChatHandler::HandleTaxiCheatCommand(char* args)
     return true;
 }
 
-//Edit Player Aspeed
+// Edit Player Aspeed
 bool ChatHandler::HandleModifyASpeedCommand(char* args)
 {
     if (!*args)
@@ -981,7 +1075,7 @@ bool ChatHandler::HandleModifyASpeedCommand(char* args)
         return false;
     }
 
-    Player *chr = getSelectedPlayer();
+    Player* chr = getSelectedPlayer();
     if (chr == NULL)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -995,9 +1089,9 @@ bool ChatHandler::HandleModifyASpeedCommand(char* args)
 
     std::string chrNameLink = GetNameLink(chr);
 
-    if(chr->IsTaxiFlying())
+    if (chr->IsTaxiFlying())
     {
-        PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
+        PSendSysMessage(LANG_CHAR_IN_FLIGHT, chrNameLink.c_str());
         SetSentErrorMessage(true);
         return false;
     }
@@ -1009,12 +1103,12 @@ bool ChatHandler::HandleModifyASpeedCommand(char* args)
     chr->UpdateSpeed(MOVE_WALK,   true, modSpeed);
     chr->UpdateSpeed(MOVE_RUN,    true, modSpeed);
     chr->UpdateSpeed(MOVE_SWIM,   true, modSpeed);
-    //chr->UpdateSpeed(MOVE_TURN,   true, modSpeed);
+    // chr->UpdateSpeed(MOVE_TURN,   true, modSpeed);
     chr->UpdateSpeed(MOVE_FLIGHT, true, modSpeed);
     return true;
 }
 
-//Edit Player Speed
+// Edit Player Speed
 bool ChatHandler::HandleModifySpeedCommand(char* args)
 {
     if (!*args)
@@ -1029,7 +1123,7 @@ bool ChatHandler::HandleModifySpeedCommand(char* args)
         return false;
     }
 
-    Player *chr = getSelectedPlayer();
+    Player* chr = getSelectedPlayer();
     if (chr == NULL)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -1043,9 +1137,9 @@ bool ChatHandler::HandleModifySpeedCommand(char* args)
 
     std::string chrNameLink = GetNameLink(chr);
 
-    if(chr->IsTaxiFlying())
+    if (chr->IsTaxiFlying())
     {
-        PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
+        PSendSysMessage(LANG_CHAR_IN_FLIGHT, chrNameLink.c_str());
         SetSentErrorMessage(true);
         return false;
     }
@@ -1059,7 +1153,7 @@ bool ChatHandler::HandleModifySpeedCommand(char* args)
     return true;
 }
 
-//Edit Player Swim Speed
+// Edit Player Swim Speed
 bool ChatHandler::HandleModifySwimCommand(char* args)
 {
     if (!*args)
@@ -1074,7 +1168,7 @@ bool ChatHandler::HandleModifySwimCommand(char* args)
         return false;
     }
 
-    Player *chr = getSelectedPlayer();
+    Player* chr = getSelectedPlayer();
     if (chr == NULL)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -1088,9 +1182,9 @@ bool ChatHandler::HandleModifySwimCommand(char* args)
 
     std::string chrNameLink = GetNameLink(chr);
 
-    if(chr->IsTaxiFlying())
+    if (chr->IsTaxiFlying())
     {
-        PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
+        PSendSysMessage(LANG_CHAR_IN_FLIGHT, chrNameLink.c_str());
         SetSentErrorMessage(true);
         return false;
     }
@@ -1104,7 +1198,7 @@ bool ChatHandler::HandleModifySwimCommand(char* args)
     return true;
 }
 
-//Edit Player Walk Speed
+// Edit Player Walk Speed
 bool ChatHandler::HandleModifyBWalkCommand(char* args)
 {
     if (!*args)
@@ -1119,7 +1213,7 @@ bool ChatHandler::HandleModifyBWalkCommand(char* args)
         return false;
     }
 
-    Player *chr = getSelectedPlayer();
+    Player* chr = getSelectedPlayer();
     if (chr == NULL)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -1133,9 +1227,9 @@ bool ChatHandler::HandleModifyBWalkCommand(char* args)
 
     std::string chrNameLink = GetNameLink(chr);
 
-    if(chr->IsTaxiFlying())
+    if (chr->IsTaxiFlying())
     {
-        PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
+        PSendSysMessage(LANG_CHAR_IN_FLIGHT, chrNameLink.c_str());
         SetSentErrorMessage(true);
         return false;
     }
@@ -1149,7 +1243,7 @@ bool ChatHandler::HandleModifyBWalkCommand(char* args)
     return true;
 }
 
-//Edit Player Fly
+// Edit Player Fly
 bool ChatHandler::HandleModifyFlyCommand(char* args)
 {
     if (!*args)
@@ -1164,7 +1258,7 @@ bool ChatHandler::HandleModifyFlyCommand(char* args)
         return false;
     }
 
-    Player *chr = getSelectedPlayer();
+    Player* chr = getSelectedPlayer();
     if (chr == NULL)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -1185,21 +1279,21 @@ bool ChatHandler::HandleModifyFlyCommand(char* args)
     return true;
 }
 
-//Edit Player Scale
+// Edit Player Scale
 bool ChatHandler::HandleModifyScaleCommand(char* args)
 {
     if (!*args)
         return false;
 
     float Scale = (float)atof(args);
-    if (Scale > 10.0f || Scale <= 0.0f)
+    if (Scale > 15.0f || Scale <= 0.0f)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    Unit *target = getSelectedUnit();
+    Unit* target = getSelectedUnit();
     if (target == NULL)
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
@@ -1207,7 +1301,7 @@ bool ChatHandler::HandleModifyScaleCommand(char* args)
         return false;
     }
 
-    if (target->GetTypeId()==TYPEID_PLAYER)
+    if (target->GetTypeId() == TYPEID_PLAYER)
     {
         // check online security
         if (HasLowerSecurity((Player*)target))
@@ -1224,223 +1318,223 @@ bool ChatHandler::HandleModifyScaleCommand(char* args)
     return true;
 }
 
-//Enable Player mount
+// Enable Player mount
 bool ChatHandler::HandleModifyMountCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     uint16 mId = 1147;
     float speed = (float)15;
     uint32 num = atoi(args);
-    switch(num)
+    switch (num)
     {
         case 1:
-            mId=14340;
+            mId = 14340;
             break;
         case 2:
-            mId=4806;
+            mId = 4806;
             break;
         case 3:
-            mId=6471;
+            mId = 6471;
             break;
         case 4:
-            mId=12345;
+            mId = 12345;
             break;
         case 5:
-            mId=6472;
+            mId = 6472;
             break;
         case 6:
-            mId=6473;
+            mId = 6473;
             break;
         case 7:
-            mId=10670;
+            mId = 10670;
             break;
         case 8:
-            mId=10719;
+            mId = 10719;
             break;
         case 9:
-            mId=10671;
+            mId = 10671;
             break;
         case 10:
-            mId=10672;
+            mId = 10672;
             break;
         case 11:
-            mId=10720;
+            mId = 10720;
             break;
         case 12:
-            mId=14349;
+            mId = 14349;
             break;
         case 13:
-            mId=11641;
+            mId = 11641;
             break;
         case 14:
-            mId=12244;
+            mId = 12244;
             break;
         case 15:
-            mId=12242;
+            mId = 12242;
             break;
         case 16:
-            mId=14578;
+            mId = 14578;
             break;
         case 17:
-            mId=14579;
+            mId = 14579;
             break;
         case 18:
-            mId=14349;
+            mId = 14349;
             break;
         case 19:
-            mId=12245;
+            mId = 12245;
             break;
         case 20:
-            mId=14335;
+            mId = 14335;
             break;
         case 21:
-            mId=207;
+            mId = 207;
             break;
         case 22:
-            mId=2328;
+            mId = 2328;
             break;
         case 23:
-            mId=2327;
+            mId = 2327;
             break;
         case 24:
-            mId=2326;
+            mId = 2326;
             break;
         case 25:
-            mId=14573;
+            mId = 14573;
             break;
         case 26:
-            mId=14574;
+            mId = 14574;
             break;
         case 27:
-            mId=14575;
+            mId = 14575;
             break;
         case 28:
-            mId=604;
+            mId = 604;
             break;
         case 29:
-            mId=1166;
+            mId = 1166;
             break;
         case 30:
-            mId=2402;
+            mId = 2402;
             break;
         case 31:
-            mId=2410;
+            mId = 2410;
             break;
         case 32:
-            mId=2409;
+            mId = 2409;
             break;
         case 33:
-            mId=2408;
+            mId = 2408;
             break;
         case 34:
-            mId=2405;
+            mId = 2405;
             break;
         case 35:
-            mId=14337;
+            mId = 14337;
             break;
         case 36:
-            mId=6569;
+            mId = 6569;
             break;
         case 37:
-            mId=10661;
+            mId = 10661;
             break;
         case 38:
-            mId=10666;
+            mId = 10666;
             break;
         case 39:
-            mId=9473;
+            mId = 9473;
             break;
         case 40:
-            mId=9476;
+            mId = 9476;
             break;
         case 41:
-            mId=9474;
+            mId = 9474;
             break;
         case 42:
-            mId=14374;
+            mId = 14374;
             break;
         case 43:
-            mId=14376;
+            mId = 14376;
             break;
         case 44:
-            mId=14377;
+            mId = 14377;
             break;
         case 45:
-            mId=2404;
+            mId = 2404;
             break;
         case 46:
-            mId=2784;
+            mId = 2784;
             break;
         case 47:
-            mId=2787;
+            mId = 2787;
             break;
         case 48:
-            mId=2785;
+            mId = 2785;
             break;
         case 49:
-            mId=2736;
+            mId = 2736;
             break;
         case 50:
-            mId=2786;
+            mId = 2786;
             break;
         case 51:
-            mId=14347;
+            mId = 14347;
             break;
         case 52:
-            mId=14346;
+            mId = 14346;
             break;
         case 53:
-            mId=14576;
+            mId = 14576;
             break;
         case 54:
-            mId=9695;
+            mId = 9695;
             break;
         case 55:
-            mId=9991;
+            mId = 9991;
             break;
         case 56:
-            mId=6448;
+            mId = 6448;
             break;
         case 57:
-            mId=6444;
+            mId = 6444;
             break;
         case 58:
-            mId=6080;
+            mId = 6080;
             break;
         case 59:
-            mId=6447;
+            mId = 6447;
             break;
         case 60:
-            mId=4805;
+            mId = 4805;
             break;
         case 61:
-            mId=9714;
+            mId = 9714;
             break;
         case 62:
-            mId=6448;
+            mId = 6448;
             break;
         case 63:
-            mId=6442;
+            mId = 6442;
             break;
         case 64:
-            mId=14632;
+            mId = 14632;
             break;
         case 65:
-            mId=14332;
+            mId = 14332;
             break;
         case 66:
-            mId=14331;
+            mId = 14331;
             break;
         case 67:
-            mId=8469;
+            mId = 8469;
             break;
         case 68:
-            mId=2830;
+            mId = 2830;
             break;
         case 69:
-            mId=2346;
+            mId = 2346;
             break;
         default:
             SendSysMessage(LANG_NO_MOUNT);
@@ -1448,7 +1542,7 @@ bool ChatHandler::HandleModifyMountCommand(char* args)
             return false;
     }
 
-    Player *chr = getSelectedPlayer();
+    Player* chr = getSelectedPlayer();
     if (!chr)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -1467,29 +1561,29 @@ bool ChatHandler::HandleModifyMountCommand(char* args)
     chr->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP);
     chr->Mount(mId);
 
-    WorldPacket data( SMSG_FORCE_RUN_SPEED_CHANGE, (8+4+1+4) );
+    WorldPacket data(SMSG_FORCE_RUN_SPEED_CHANGE, (8 + 4 + 1 + 4));
     data << chr->GetPackGUID();
     data << (uint32)0;
-    data << (uint8)0;                                       //new 2.1.0
+    data << (uint8)0;                                       // new 2.1.0
     data << float(speed);
-    chr->SendMessageToSet( &data, true );
+    chr->SendMessageToSet(&data, true);
 
-    data.Initialize( SMSG_FORCE_SWIM_SPEED_CHANGE, (8+4+4) );
+    data.Initialize(SMSG_FORCE_SWIM_SPEED_CHANGE, (8 + 4 + 4));
     data << chr->GetPackGUID();
     data << (uint32)0;
     data << float(speed);
-    chr->SendMessageToSet( &data, true );
+    chr->SendMessageToSet(&data, true);
 
     return true;
 }
 
-//Edit Player money
+// Edit Player money
 bool ChatHandler::HandleModifyMoneyCommand(char* args)
 {
     if (!*args)
         return false;
 
-    Player *chr = getSelectedPlayer();
+    Player* chr = getSelectedPlayer();
     if (chr == NULL)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -1510,7 +1604,7 @@ bool ChatHandler::HandleModifyMoneyCommand(char* args)
         int32 newmoney = int32(moneyuser) + addmoney;
 
         DETAIL_LOG(GetMangosString(LANG_CURRENT_MONEY), moneyuser, addmoney, newmoney);
-        if (newmoney <= 0 )
+        if (newmoney <= 0)
         {
             PSendSysMessage(LANG_YOU_TAKE_ALL_MONEY, GetNameLink(chr).c_str());
             if (needReportToTarget(chr))
@@ -1526,7 +1620,7 @@ bool ChatHandler::HandleModifyMoneyCommand(char* args)
             PSendSysMessage(LANG_YOU_TAKE_MONEY, abs(addmoney), GetNameLink(chr).c_str());
             if (needReportToTarget(chr))
                 ChatHandler(chr).PSendSysMessage(LANG_YOURS_MONEY_TAKEN, GetNameLink().c_str(), abs(addmoney));
-            chr->SetMoney( newmoney );
+            chr->SetMoney(newmoney);
         }
     }
     else
@@ -1535,24 +1629,24 @@ bool ChatHandler::HandleModifyMoneyCommand(char* args)
         if (needReportToTarget(chr))
             ChatHandler(chr).PSendSysMessage(LANG_YOURS_MONEY_GIVEN, GetNameLink().c_str(), addmoney);
 
-        if (addmoney >=MAX_MONEY_AMOUNT)
+        if (addmoney >= MAX_MONEY_AMOUNT)
             chr->SetMoney(MAX_MONEY_AMOUNT);
         else
-            chr->ModifyMoney( addmoney );
+            chr->ModifyMoney(addmoney);
     }
 
-    DETAIL_LOG(GetMangosString(LANG_NEW_MONEY), moneyuser, addmoney, chr->GetMoney() );
+    DETAIL_LOG(GetMangosString(LANG_NEW_MONEY), moneyuser, addmoney, chr->GetMoney());
 
     return true;
 }
 
-bool ChatHandler::HandleModifyHonorCommand (char* args)
+bool ChatHandler::HandleModifyHonorCommand(char* args)
 {
     if (!*args)
         return false;
 
-    Player *target = getSelectedPlayer();
-    if(!target)
+    Player* target = getSelectedPlayer();
+    if (!target)
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
         SetSentErrorMessage(true);
@@ -1574,7 +1668,7 @@ bool ChatHandler::HandleModifyHonorCommand (char* args)
 
 bool ChatHandler::HandleTeleCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     Player* _player = m_session->GetPlayer();
@@ -1589,7 +1683,7 @@ bool ChatHandler::HandleTeleCommand(char* args)
         return false;
     }
 
-    return HandleGoHelper(_player, tele->mapId, tele->position_x, tele->position_y, &tele->position_z, &tele->orientation);
+    return HandleGoHelper(_player, tele->loc.GetMapId(), tele->loc.x, tele->loc.y, &tele->loc.z, &tele->loc.orientation);
 }
 
 bool ChatHandler::HandleLookupAreaCommand(char* args)
@@ -1600,38 +1694,38 @@ bool ChatHandler::HandleLookupAreaCommand(char* args)
     std::string namepart = args;
     std::wstring wnamepart;
 
-    if (!Utf8toWStr (namepart,wnamepart))
+    if (!Utf8toWStr(namepart, wnamepart))
         return false;
 
     uint32 counter = 0;                                     // Counter for figure out that we found smth.
 
     // converting string that we try to find to lower case
-    wstrToLower (wnamepart);
+    wstrToLower(wnamepart);
 
     // Search in AreaTable.dbc
-    for (uint32 areaflag = 0; areaflag < sAreaStore.GetNumRows (); ++areaflag)
+    for (uint32 areaflag = 0; areaflag < sAreaStore.GetNumRows(); ++areaflag)
     {
-        AreaTableEntry const *areaEntry = sAreaStore.LookupEntry (areaflag);
+        AreaTableEntry const* areaEntry = sAreaStore.LookupEntry(areaflag);
         if (areaEntry)
         {
-            int loc = GetSessionDbcLocale ();
+            int loc = GetSessionDbcLocale();
             std::string name = areaEntry->area_name[loc];
             if (name.empty())
                 continue;
 
-            if (!Utf8FitTo (name, wnamepart))
+            if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
-                for(; loc < MAX_LOCALE; ++loc)
+                for (; loc < MAX_LOCALE; ++loc)
                 {
-                    if (loc==GetSessionDbcLocale ())
+                    if (loc == GetSessionDbcLocale())
                         continue;
 
                     name = areaEntry->area_name[loc];
-                    if (name.empty ())
+                    if (name.empty())
                         continue;
 
-                    if (Utf8FitTo (name, wnamepart))
+                    if (Utf8FitTo(name, wnamepart))
                         break;
                 }
             }
@@ -1641,11 +1735,11 @@ bool ChatHandler::HandleLookupAreaCommand(char* args)
                 // send area in "id - [name]" format
                 std::ostringstream ss;
                 if (m_session)
-                    ss << areaEntry->ID << " - |cffffffff|Harea:" << areaEntry->ID << "|h[" << name << " " << localeNames[loc]<< "]|h|r";
+                    ss << areaEntry->ID << " - |cffffffff|Harea:" << areaEntry->ID << "|h[" << name << " " << localeNames[loc] << "]|h|r";
                 else
                     ss << areaEntry->ID << " - " << name << " " << localeNames[loc];
 
-                SendSysMessage (ss.str ().c_str());
+                SendSysMessage(ss.str().c_str());
 
                 ++counter;
             }
@@ -1653,15 +1747,15 @@ bool ChatHandler::HandleLookupAreaCommand(char* args)
     }
 
     if (counter == 0)                                      // if counter == 0 then we found nth
-        SendSysMessage (LANG_COMMAND_NOAREAFOUND);
+        SendSysMessage(LANG_COMMAND_NOAREAFOUND);
 
     return true;
 }
 
-//Find tele in game_tele order by name
-bool ChatHandler::HandleLookupTeleCommand(char * args)
+// Find tele in game_tele order by name
+bool ChatHandler::HandleLookupTeleCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
     {
         SendSysMessage(LANG_COMMAND_TELE_PARAMETER);
         SetSentErrorMessage(true);
@@ -1671,20 +1765,20 @@ bool ChatHandler::HandleLookupTeleCommand(char * args)
     std::string namepart = args;
     std::wstring wnamepart;
 
-    if(!Utf8toWStr(namepart,wnamepart))
+    if (!Utf8toWStr(namepart, wnamepart))
         return false;
 
     // converting string that we try to find to lower case
-    wstrToLower( wnamepart );
+    wstrToLower(wnamepart);
 
     std::ostringstream reply;
 
-    GameTeleMap const & teleMap = sObjectMgr.GetGameTeleMap();
-    for(GameTeleMap::const_iterator itr = teleMap.begin(); itr != teleMap.end(); ++itr)
+    GameTeleMap const& teleMap = sObjectMgr.GetGameTeleMap();
+    for (GameTeleMap::const_iterator itr = teleMap.begin(); itr != teleMap.end(); ++itr)
     {
         GameTele const* tele = &itr->second;
 
-        if(tele->wnameLow.find(wnamepart) == std::wstring::npos)
+        if (tele->wnameLow.find(wnamepart) == std::wstring::npos)
             continue;
 
         if (m_session)
@@ -1693,18 +1787,18 @@ bool ChatHandler::HandleLookupTeleCommand(char * args)
             reply << "  " << itr->first << " " << tele->name << "\n";
     }
 
-    if(reply.str().empty())
+    if (reply.str().empty())
         SendSysMessage(LANG_COMMAND_TELE_NOLOCATION);
     else
-        PSendSysMessage(LANG_COMMAND_TELE_LOCATION,reply.str().c_str());
+        PSendSysMessage(LANG_COMMAND_TELE_LOCATION, reply.str().c_str());
 
     return true;
 }
 
-//Enable\Dissable accept whispers (for GM)
+// Enable\Dissable accept whispers (for GM)
 bool ChatHandler::HandleWhispersCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
     {
         PSendSysMessage(LANG_COMMAND_WHISPERACCEPTING, GetOnOffStr(m_session->GetPlayer()->isAcceptWhispers()));
         return true;
@@ -1734,7 +1828,7 @@ bool ChatHandler::HandleWhispersCommand(char* args)
     return true;
 }
 
-//Save all players in the world
+// Save all players in the world
 bool ChatHandler::HandleSaveAllCommand(char* /*args*/)
 {
     sObjectAccessor.SaveAllPlayers();
@@ -1742,7 +1836,7 @@ bool ChatHandler::HandleSaveAllCommand(char* /*args*/)
     return true;
 }
 
-//Send mail by command
+// Send mail by command
 bool ChatHandler::HandleSendMailCommand(char* args)
 {
     // format: name "subject text" "mail text"
@@ -1761,7 +1855,7 @@ bool ChatHandler::HandleSendMailCommand(char* args)
     // from console show nonexistent sender
     MailSender sender(MAIL_NORMAL, m_session ? m_session->GetPlayer()->GetObjectGuid().GetCounter() : 0, MAIL_STATIONERY_GM);
 
-    draft.SendMailTo(MailReceiver(target, target_guid),sender);
+    draft.SendMailTo(MailReceiver(target, target_guid), sender);
 
     std::string nameLink = playerLink(target_name);
     PSendSysMessage(LANG_MAIL_SENT, nameLink.c_str());
@@ -1796,18 +1890,18 @@ bool ChatHandler::HandleTeleNameCommand(char* args)
 
         std::string chrNameLink = playerLink(target_name);
 
-        if(target->IsBeingTeleported()==true)
+        if (target->IsBeingTeleported() == true)
         {
             PSendSysMessage(LANG_IS_TELEPORTED, chrNameLink.c_str());
             SetSentErrorMessage(true);
             return false;
         }
 
-        PSendSysMessage(LANG_TELEPORTING_TO, chrNameLink.c_str(),"", tele->name.c_str());
+        PSendSysMessage(LANG_TELEPORTING_TO, chrNameLink.c_str(), "", tele->name.c_str());
         if (needReportToTarget(target))
             ChatHandler(target).PSendSysMessage(LANG_TELEPORTED_TO_BY, GetNameLink().c_str());
 
-        return HandleGoHelper(target, tele->mapId, tele->position_x, tele->position_y, &tele->position_z, &tele->orientation);
+        return HandleGoHelper(target, tele->loc.GetMapId(), tele->loc.x, tele->loc.y, &tele->loc.z, &tele->loc.orientation);
     }
     else
     {
@@ -1818,21 +1912,20 @@ bool ChatHandler::HandleTeleNameCommand(char* args)
         std::string nameLink = playerLink(target_name);
 
         PSendSysMessage(LANG_TELEPORTING_TO, nameLink.c_str(), GetMangosString(LANG_OFFLINE), tele->name.c_str());
-        Player::SavePositionInDB(target_guid, tele->mapId,
-            tele->position_x, tele->position_y, tele->position_z, tele->orientation,
-            sTerrainMgr.GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z));
+        Player::SavePositionInDB(target_guid, tele->loc.GetMapId(),
+                                 tele->loc.x, tele->loc.y, tele->loc.z, tele->loc.orientation, tele->loc.GetZoneId());
     }
 
     return true;
 }
 
-//Teleport group to given game_tele.entry
-bool ChatHandler::HandleTeleGroupCommand(char * args)
+// Teleport group to given game_tele.entry
+bool ChatHandler::HandleTeleGroupCommand(char* args)
 {
     if (!*args)
         return false;
 
-    Player *player = getSelectedPlayer();
+    Player* player = getSelectedPlayer();
     if (!player)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -1846,7 +1939,7 @@ bool ChatHandler::HandleTeleGroupCommand(char * args)
 
     // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
     GameTele const* tele = ExtractGameTeleFromLink(&args);
-    if(!tele)
+    if (!tele)
     {
         SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
         SetSentErrorMessage(true);
@@ -1855,19 +1948,19 @@ bool ChatHandler::HandleTeleGroupCommand(char * args)
 
     std::string nameLink = GetNameLink(player);
 
-    Group *grp = player->GetGroup();
-    if(!grp)
+    Group* grp = player->GetGroup();
+    if (!grp)
     {
-        PSendSysMessage(LANG_NOT_IN_GROUP,nameLink.c_str());
+        PSendSysMessage(LANG_NOT_IN_GROUP, nameLink.c_str());
         SetSentErrorMessage(true);
         return false;
     }
 
-    for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player *pl = itr->getSource();
+        Player* pl = itr->getSource();
 
-        if(!pl || !pl->GetSession() )
+        if (!pl || !pl->GetSession())
             continue;
 
         // check online security
@@ -1876,33 +1969,25 @@ bool ChatHandler::HandleTeleGroupCommand(char * args)
 
         std::string plNameLink = GetNameLink(pl);
 
-        if(pl->IsBeingTeleported())
+        if (pl->IsBeingTeleported())
         {
             PSendSysMessage(LANG_IS_TELEPORTED, plNameLink.c_str());
             continue;
         }
 
-        PSendSysMessage(LANG_TELEPORTING_TO, plNameLink.c_str(),"", tele->name.c_str());
+        PSendSysMessage(LANG_TELEPORTING_TO, plNameLink.c_str(), "", tele->name.c_str());
         if (needReportToTarget(pl))
             ChatHandler(pl).PSendSysMessage(LANG_TELEPORTED_TO_BY, nameLink.c_str());
 
-        // stop flight if need
-        if(pl->IsTaxiFlying())
-        {
-            pl->GetMotionMaster()->MovementExpired();
-            pl->m_taxi.ClearTaxiDestinations();
-        }
-        // save only in non-flight case
-        else
-            pl->SaveRecallPosition();
+        pl->InterruptTaxiFlying();
 
-        pl->TeleportTo(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation);
+        pl->TeleportTo(tele->loc.GetMapId(), tele->loc.x, tele->loc.y, tele->loc.z, tele->loc.orientation);
     }
 
     return true;
 }
 
-//Summon group of player
+// Summon group of player
 bool ChatHandler::HandleGroupgoCommand(char* args)
 {
     Player* target;
@@ -1913,13 +1998,13 @@ bool ChatHandler::HandleGroupgoCommand(char* args)
     if (HasLowerSecurity(target))
         return false;
 
-    Group *grp = target->GetGroup();
+    Group* grp = target->GetGroup();
 
     std::string nameLink = GetNameLink(target);
 
-    if(!grp)
+    if (!grp)
     {
-        PSendSysMessage(LANG_NOT_IN_GROUP,nameLink.c_str());
+        PSendSysMessage(LANG_NOT_IN_GROUP, nameLink.c_str());
         SetSentErrorMessage(true);
         return false;
     }
@@ -1928,9 +2013,9 @@ bool ChatHandler::HandleGroupgoCommand(char* args)
     bool to_instance =  gmMap->Instanceable();
 
     // we are in instance, and can summon only player in our group with us as lead
-    if ( to_instance && (
-        !m_session->GetPlayer()->GetGroup() || (grp->GetLeaderGuid() != m_session->GetPlayer()->GetObjectGuid()) ||
-        (m_session->GetPlayer()->GetGroup()->GetLeaderGuid() != m_session->GetPlayer()->GetObjectGuid()) ) )
+    if (to_instance && (
+                !m_session->GetPlayer()->GetGroup() || (grp->GetLeaderGuid() != m_session->GetPlayer()->GetObjectGuid()) ||
+                (m_session->GetPlayer()->GetGroup()->GetLeaderGuid() != m_session->GetPlayer()->GetObjectGuid())))
         // the last check is a bit excessive, but let it be, just in case
     {
         SendSysMessage(LANG_CANNOT_SUMMON_TO_INST);
@@ -1938,11 +2023,11 @@ bool ChatHandler::HandleGroupgoCommand(char* args)
         return false;
     }
 
-    for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player *pl = itr->getSource();
+        Player* pl = itr->getSource();
 
-        if(!pl || pl==m_session->GetPlayer() || !pl->GetSession() )
+        if (!pl || pl == m_session->GetPlayer() || !pl->GetSession())
             continue;
 
         // check online security
@@ -1951,7 +2036,7 @@ bool ChatHandler::HandleGroupgoCommand(char* args)
 
         std::string plNameLink = GetNameLink(pl);
 
-        if(pl->IsBeingTeleported()==true)
+        if (pl->IsBeingTeleported() == true)
         {
             PSendSysMessage(LANG_IS_TELEPORTED, plNameLink.c_str());
             SetSentErrorMessage(true);
@@ -1962,39 +2047,30 @@ bool ChatHandler::HandleGroupgoCommand(char* args)
         {
             Map* plMap = pl->GetMap();
 
-            if ( plMap->Instanceable() && plMap->GetInstanceId() != gmMap->GetInstanceId() )
+            if (plMap->Instanceable() && plMap->GetInstanceId() != gmMap->GetInstanceId())
             {
                 // cannot summon from instance to instance
-                PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST,plNameLink.c_str());
+                PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST, plNameLink.c_str());
                 SetSentErrorMessage(true);
                 return false;
             }
         }
 
-        PSendSysMessage(LANG_SUMMONING, plNameLink.c_str(),"");
+        PSendSysMessage(LANG_SUMMONING, plNameLink.c_str(), "");
         if (needReportToTarget(pl))
             ChatHandler(pl).PSendSysMessage(LANG_SUMMONED_BY, nameLink.c_str());
 
-        // stop flight if need
-        if(pl->IsTaxiFlying())
-        {
-            pl->GetMotionMaster()->MovementExpired();
-            pl->m_taxi.ClearTaxiDestinations();
-        }
-        // save only in non-flight case
-        else
-            pl->SaveRecallPosition();
-
+        pl->InterruptTaxiFlying();
         // before GM
-        float x,y,z;
+        float x, y, z;
         m_session->GetPlayer()->GetClosePoint(x, y, z, pl->GetObjectBoundingRadius());
-        pl->TeleportTo(m_session->GetPlayer()->GetMapId(),x,y,z,pl->GetOrientation());
+        pl->TeleportTo(m_session->GetPlayer()->GetMapId(), x, y, z, pl->GetOrientation());
     }
 
     return true;
 }
 
-bool ChatHandler::HandleGoHelper( Player* player, uint32 mapid, float x, float y, float const* zPtr, float const* ortPtr)
+bool ChatHandler::HandleGoHelper(Player* player, uint32 mapid, float x, float y, float const* zPtr, float const* ortPtr)
 {
     float z;
     float ort = player->GetOrientation();
@@ -2007,9 +2083,9 @@ bool ChatHandler::HandleGoHelper( Player* player, uint32 mapid, float x, float y
             ort = *ortPtr;
 
         // check full provided coordinates
-        if(!MapManager::IsValidMapCoord(mapid,x,y,z,ort))
+        if (!MapManager::IsValidMapCoord(mapid, x, y, z, ort))
         {
-            PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid);
+            PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid);
             SetSentErrorMessage(true);
             return false;
         }
@@ -2017,26 +2093,18 @@ bool ChatHandler::HandleGoHelper( Player* player, uint32 mapid, float x, float y
     else
     {
         // we need check x,y before ask Z or can crash at invalide coordinates
-        if(!MapManager::IsValidMapCoord(mapid,x,y))
+        if (!MapManager::IsValidMapCoord(mapid, x, y))
         {
-            PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid);
+            PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid);
             SetSentErrorMessage(true);
             return false;
         }
 
-        TerrainInfo const *map = sTerrainMgr.LoadTerrain(mapid);
-        z = map->GetWaterOrGroundLevel(x, y, MAX_HEIGHT);
+        TerrainInfoPtr gridMap = sTerrainMgr.LoadTerrain(mapid);
+        z = gridMap->GetWaterOrGroundLevel(x, y, MAX_HEIGHT);
     }
 
-    // stop flight if need
-    if(player->IsTaxiFlying())
-    {
-        player->GetMotionMaster()->MovementExpired();
-        player->m_taxi.ClearTaxiDestinations();
-    }
-    // save only in non-flight case
-    else
-        player->SaveRecallPosition();
+    player->InterruptTaxiFlying();
 
     player->TeleportTo(mapid, x, y, z, ort);
 
@@ -2059,9 +2127,9 @@ bool ChatHandler::HandleGoTaxinodeCommand(char* args)
         return false;
     }
 
-    if (node->x == 0.0f && node->y == 0.0f && node->z == 0.0f)
+    if (fabs(node->x) < M_NULL_F && fabs(node->y) < M_NULL_F && fabs(node->z) < M_NULL_F)
     {
-        PSendSysMessage(LANG_INVALID_TARGET_COORD,node->x,node->y,node->map_id);
+        PSendSysMessage(LANG_INVALID_TARGET_COORD, node->x, node->y, node->map_id);
         SetSentErrorMessage(true);
         return false;
     }
@@ -2071,7 +2139,7 @@ bool ChatHandler::HandleGoTaxinodeCommand(char* args)
 
 bool ChatHandler::HandleGoCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     Player* _player = m_session->GetPlayer();
@@ -2100,7 +2168,7 @@ bool ChatHandler::HandleGoCommand(char* args)
 
 
 
-//teleport at coordinates
+// teleport at coordinates
 bool ChatHandler::HandleGoXYCommand(char* args)
 {
     Player* _player = m_session->GetPlayer();
@@ -2120,7 +2188,7 @@ bool ChatHandler::HandleGoXYCommand(char* args)
     return HandleGoHelper(_player, mapid, x, y);
 }
 
-//teleport at coordinates, including Z
+// teleport at coordinates, including Z
 bool ChatHandler::HandleGoXYZCommand(char* args)
 {
     Player* _player = m_session->GetPlayer();
@@ -2144,7 +2212,7 @@ bool ChatHandler::HandleGoXYZCommand(char* args)
     return HandleGoHelper(_player, mapid, x, y, &z);
 }
 
-//teleport at coordinates
+// teleport at coordinates
 bool ChatHandler::HandleGoZoneXYCommand(char* args)
 {
     Player* _player = m_session->GetPlayer();
@@ -2178,20 +2246,20 @@ bool ChatHandler::HandleGoZoneXYCommand(char* args)
     // update to parent zone if exist (client map show only zones without parents)
     AreaTableEntry const* zoneEntry = areaEntry->zone ? GetAreaEntryByAreaID(areaEntry->zone) : areaEntry;
 
-    MapEntry const *mapEntry = sMapStore.LookupEntry(zoneEntry->mapid);
+    MapEntry const* mapEntry = sMapStore.LookupEntry(zoneEntry->mapid);
 
     if (mapEntry->Instanceable())
     {
         PSendSysMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->area_name[GetSessionDbcLocale()],
-            mapEntry->MapID, mapEntry->name[GetSessionDbcLocale()]);
+                        mapEntry->MapID, mapEntry->name[GetSessionDbcLocale()]);
         SetSentErrorMessage(true);
         return false;
     }
 
-    if (!Zone2MapCoordinates(x,y,zoneEntry->ID))
+    if (!Zone2MapCoordinates(x, y, zoneEntry->ID))
     {
         PSendSysMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->area_name[GetSessionDbcLocale()],
-            mapEntry->MapID, mapEntry->name[GetSessionDbcLocale()]);
+                        mapEntry->MapID, mapEntry->name[GetSessionDbcLocale()]);
         SetSentErrorMessage(true);
         return false;
     }
@@ -2199,7 +2267,7 @@ bool ChatHandler::HandleGoZoneXYCommand(char* args)
     return HandleGoHelper(_player, mapEntry->MapID, x, y);
 }
 
-//teleport to grid
+// teleport to grid
 bool ChatHandler::HandleGoGridCommand(char* args)
 {
     Player* _player = m_session->GetPlayer();
@@ -2217,23 +2285,23 @@ bool ChatHandler::HandleGoGridCommand(char* args)
         return false;
 
     // center of grid
-    float x = (grid_x-CENTER_GRID_ID+0.5f)*SIZE_OF_GRIDS;
-    float y = (grid_y-CENTER_GRID_ID+0.5f)*SIZE_OF_GRIDS;
+    float x = (grid_x - CENTER_GRID_ID + 0.5f) * SIZE_OF_GRIDS;
+    float y = (grid_y - CENTER_GRID_ID + 0.5f) * SIZE_OF_GRIDS;
 
     return HandleGoHelper(_player, mapid, x, y);
 }
 
 bool ChatHandler::HandleModifyDrunkCommand(char* args)
 {
-    if(!*args)    return false;
-
-    uint32 drunklevel = (uint32)atoi(args);
-    if(drunklevel > 100)
-        drunklevel = 100;
+    if (!*args)
+        return false;
 
-    uint16 drunkMod = drunklevel * 0xFFFF / 100;
+    uint8 drunkValue = (uint8)atoi(args);
+    if (drunkValue > 100)
+        drunkValue = 100;
 
-    m_session->GetPlayer()->SetDrunkValue(drunkMod);
+    if (Player* target = getSelectedPlayer())
+        target->SetDrunkValue(drunkValue);
 
     return true;
 }
@@ -2241,7 +2309,7 @@ bool ChatHandler::HandleModifyDrunkCommand(char* args)
 bool ChatHandler::HandleSetViewCommand(char* /*args*/)
 {
     if (Unit* unit = getSelectedUnit())
-        m_session->GetPlayer()->GetCamera().SetView(unit);
+        m_session->GetPlayer()->SetViewPoint(unit);
     else
     {
         PSendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index feccf9d9be8..7873543d903 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -41,6 +41,8 @@
 #include "AccountMgr.h"
 #include "GMTicketMgr.h"
 #include "WaypointManager.h"
+#include "WorldStateMgr.h"
+#include "Config/Config.h"
 #include "Util.h"
 #include <cctype>
 #include <iostream>
@@ -48,9 +50,10 @@
 #include <map>
 #include <typeinfo>
 
-#include "TargetedMovementGenerator.h"                      // for HandleNpcUnFollowCommand
+#include "movementGenerators/TargetedMovementGenerator.h"   // for HandleNpcUnFollowCommand
 #include "MoveMap.h"                                        // for mmap manager
 #include "PathFinder.h"                                     // for mmap commands
+#include "movement/MoveSplineInit.h"
 
 static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] =
 {
@@ -58,7 +61,7 @@ static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] =
     LANG_REP_FRIENDLY, LANG_REP_HONORED, LANG_REP_REVERED,    LANG_REP_EXALTED
 };
 
-//mute player for some times
+// mute player for some times
 bool ChatHandler::HandleMuteCommand(char* args)
 {
     char* nameStr = ExtractOptNotLastArg(&args);
@@ -73,12 +76,13 @@ bool ChatHandler::HandleMuteCommand(char* args)
     if (!ExtractUInt32(&args, notspeaktime))
         return false;
 
-    uint32 account_id = target ? target->GetSession()->GetAccountId() : sObjectMgr.GetPlayerAccountIdByGUID(target_guid);
+    uint32 account_id = target ? target->GetSession()->GetAccountId() : sAccountMgr.GetPlayerAccountIdByGUID(target_guid);
 
     // find only player from same account if any
     if (!target)
     {
-        if (WorldSession* session = sWorld.FindSession(account_id))
+        WorldSession* session = sWorld.FindSession(account_id);
+        if (session)
             target = session->GetPlayer();
     }
 
@@ -86,7 +90,7 @@ bool ChatHandler::HandleMuteCommand(char* args)
     if (HasLowerSecurity(target, target_guid, true))
         return false;
 
-    time_t mutetime = time(NULL) + notspeaktime*60;
+    time_t mutetime = time(NULL) + notspeaktime * 60;
 
     if (target)
         target->GetSession()->m_muteTime = mutetime;
@@ -99,10 +103,21 @@ bool ChatHandler::HandleMuteCommand(char* args)
     std::string nameLink = playerLink(target_name);
 
     PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink.c_str(), notspeaktime);
+
+    if (sWorld.getConfig(CONFIG_BOOL_GM_ANNOUNCE_BAN))
+    {
+        std::string GMnameLink;
+        if (m_session)
+            GMnameLink = playerLink(m_session->GetPlayerName());
+        else
+            GMnameLink = "";
+        PSendGlobalSysMessage(LANG_MUTE_ANNOUNCE, GMnameLink.c_str(), nameLink.c_str(), notspeaktime);
+    }
+
     return true;
 }
 
-//unmute player
+// unmute player
 bool ChatHandler::HandleUnmuteCommand(char* args)
 {
     Player* target;
@@ -111,12 +126,13 @@ bool ChatHandler::HandleUnmuteCommand(char* args)
     if (!ExtractPlayerTarget(&args, &target, &target_guid, &target_name))
         return false;
 
-    uint32 account_id = target ? target->GetSession()->GetAccountId() : sObjectMgr.GetPlayerAccountIdByGUID(target_guid);
+    uint32 account_id = target ? target->GetSession()->GetAccountId() : sAccountMgr.GetPlayerAccountIdByGUID(target_guid);
 
     // find only player from same account if any
     if (!target)
     {
-        if (WorldSession* session = sWorld.FindSession(account_id))
+        WorldSession* session = sWorld.FindSession(account_id);
+        if (session)
             target = session->GetPlayer();
     }
 
@@ -147,28 +163,28 @@ bool ChatHandler::HandleUnmuteCommand(char* args)
     return true;
 }
 
-void ChatHandler::ShowTriggerTargetListHelper( uint32 id, AreaTrigger const* at, bool subpart /*= false*/ )
+void ChatHandler::ShowTriggerTargetListHelper(uint32 id, AreaTrigger const* at, bool subpart /*= false*/)
 {
     if (m_session)
     {
         char dist_buf[50];
-        if(!subpart)
+        if (!subpart)
         {
-            float dist = m_session->GetPlayer()->GetDistance2d(at->target_X, at->target_Y);
+            float dist = m_session->GetPlayer()->GetDistance2d(at->loc.x, at->loc.y);
             snprintf(dist_buf, 50, GetMangosString(LANG_TRIGGER_DIST), dist);
         }
         else
             dist_buf[0] = '\0';
 
         PSendSysMessage(LANG_TRIGGER_TARGET_LIST_CHAT,
-            subpart ? " -> " : "", id, id, at->target_mapId, at->target_X, at->target_Y, at->target_Z, dist_buf);
+                        subpart ? " -> " : "", id, id, at->loc.GetMapId(), at->loc.x, at->loc.y, at->loc.z, dist_buf);
     }
     else
         PSendSysMessage(LANG_TRIGGER_TARGET_LIST_CONSOLE,
-            subpart ? " -> " : "", id, at->target_mapId, at->target_X, at->target_Y, at->target_Z);
+                        subpart ? " -> " : "", id, at->loc.GetMapId(), at->loc.x, at->loc.y, at->loc.z);
 }
 
-void ChatHandler::ShowTriggerListHelper( AreaTriggerEntry const * atEntry )
+void ChatHandler::ShowTriggerListHelper(AreaTriggerEntry const* atEntry)
 {
 
     char const* tavern = sObjectMgr.IsTavernAreaTrigger(atEntry->id) ? GetMangosString(LANG_TRIGGER_TAVERN) : "";
@@ -181,11 +197,11 @@ void ChatHandler::ShowTriggerListHelper( AreaTriggerEntry const * atEntry )
         snprintf(dist_buf, 50, GetMangosString(LANG_TRIGGER_DIST), dist);
 
         PSendSysMessage(LANG_TRIGGER_LIST_CHAT,
-            atEntry->id, atEntry->id, atEntry->mapid, atEntry->x, atEntry->y, atEntry->z, dist_buf, tavern, quest);
+                        atEntry->id, atEntry->id, atEntry->mapid, atEntry->x, atEntry->y, atEntry->z, dist_buf, tavern, quest);
     }
     else
         PSendSysMessage(LANG_TRIGGER_LIST_CONSOLE,
-            atEntry->id, atEntry->mapid, atEntry->x, atEntry->y, atEntry->z, tavern, quest);
+                        atEntry->id, atEntry->mapid, atEntry->x, atEntry->y, atEntry->z, tavern, quest);
 
     if (AreaTrigger const* at = sObjectMgr.GetAreaTrigger(atEntry->id))
         ShowTriggerTargetListHelper(atEntry->id, at, true);
@@ -222,14 +238,14 @@ bool ChatHandler::HandleTriggerCommand(char* args)
         if (!m_session)
             return false;
 
-        float dist2 = MAP_SIZE*MAP_SIZE;
+        float dist2 = MAP_SIZE * MAP_SIZE;
 
         Player* pl = m_session->GetPlayer();
 
         // Search triggers
-        for (uint32 id = 0; id < sAreaTriggerStore.GetNumRows (); ++id)
+        for (uint32 id = 0; id < sAreaTriggerStore.GetNumRows(); ++id)
         {
-            AreaTriggerEntry const *atTestEntry = sAreaTriggerStore.LookupEntry (id);
+            AreaTriggerEntry const* atTestEntry = sAreaTriggerStore.LookupEntry(id);
             if (!atTestEntry)
                 continue;
 
@@ -239,7 +255,7 @@ bool ChatHandler::HandleTriggerCommand(char* args)
             float dx = atTestEntry->x - pl->GetPositionX();
             float dy = atTestEntry->y - pl->GetPositionY();
 
-            float test_dist2 = dx*dx + dy*dy;
+            float test_dist2 = dx * dx + dy * dy;
 
             if (test_dist2 >= dist2)
                 continue;
@@ -282,10 +298,11 @@ bool ChatHandler::HandleTriggerCommand(char* args)
                 ShowItemListHelper(at->requiredItem2, loc_idx, pl);
         }
 
-        if (at->requiredQuest)
+        if (at->requiredQuestA || at->requiredQuestH)
         {
             SendSysMessage(LANG_TRIGGER_REQ_QUEST_NORMAL);
-            ShowQuestListHelper(at->requiredQuest, loc_idx, pl);
+            ShowQuestListHelper(at->requiredQuestA, loc_idx, pl);
+            ShowQuestListHelper(at->requiredQuestH, loc_idx, pl);
         }
 
         if (at->heroicKey || at->heroicKey2)
@@ -298,10 +315,11 @@ bool ChatHandler::HandleTriggerCommand(char* args)
                 ShowItemListHelper(at->heroicKey2, loc_idx, pl);
         }
 
-        if (at->requiredQuestHeroic)
+        if (at->requiredQuestHeroicA || at->requiredQuestHeroicH)
         {
             SendSysMessage(LANG_TRIGGER_REQ_QUEST_HEROIC);
-            ShowQuestListHelper(at->requiredQuestHeroic, loc_idx, pl);
+            ShowQuestListHelper(at->requiredQuestHeroicA, loc_idx, pl);
+            ShowQuestListHelper(at->requiredQuestHeroicH, loc_idx, pl);
         }
     }
 
@@ -315,9 +333,9 @@ bool ChatHandler::HandleTriggerActiveCommand(char* /*args*/)
     Player* pl = m_session->GetPlayer();
 
     // Search in AreaTable.dbc
-    for (uint32 id = 0; id < sAreaTriggerStore.GetNumRows (); ++id)
+    for (uint32 id = 0; id < sAreaTriggerStore.GetNumRows(); ++id)
     {
-        AreaTriggerEntry const *atEntry = sAreaTriggerStore.LookupEntry (id);
+        AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(id);
         if (!atEntry)
             continue;
 
@@ -330,7 +348,7 @@ bool ChatHandler::HandleTriggerActiveCommand(char* /*args*/)
     }
 
     if (counter == 0)                                      // if counter == 0 then we found nth
-        SendSysMessage (LANG_COMMAND_NOTRIGGERFOUND);
+        SendSysMessage(LANG_COMMAND_NOTRIGGERFOUND);
 
     return true;
 }
@@ -338,15 +356,15 @@ bool ChatHandler::HandleTriggerActiveCommand(char* /*args*/)
 bool ChatHandler::HandleTriggerNearCommand(char* args)
 {
     float distance = (!*args) ? 10.0f : (float)atof(args);
-    float dist2 =  distance*distance;
+    float dist2 =  distance * distance;
     uint32 counter = 0;                                     // Counter for figure out that we found smth.
 
     Player* pl = m_session->GetPlayer();
 
     // Search triggers
-    for (uint32 id = 0; id < sAreaTriggerStore.GetNumRows (); ++id)
+    for (uint32 id = 0; id < sAreaTriggerStore.GetNumRows(); ++id)
     {
-        AreaTriggerEntry const *atEntry = sAreaTriggerStore.LookupEntry (id);
+        AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(id);
         if (!atEntry)
             continue;
 
@@ -356,7 +374,7 @@ bool ChatHandler::HandleTriggerNearCommand(char* args)
         float dx = atEntry->x - pl->GetPositionX();
         float dy = atEntry->y - pl->GetPositionY();
 
-        if (dx*dx + dy*dy > dist2)
+        if (dx * dx + dy * dy > dist2)
             continue;
 
         ShowTriggerListHelper(atEntry);
@@ -365,9 +383,9 @@ bool ChatHandler::HandleTriggerNearCommand(char* args)
     }
 
     // Search trigger targets
-    for (uint32 id = 0; id < sAreaTriggerStore.GetNumRows (); ++id)
+    for (uint32 id = 0; id < sAreaTriggerStore.GetNumRows(); ++id)
     {
-        AreaTriggerEntry const *atEntry = sAreaTriggerStore.LookupEntry (id);
+        AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(id);
         if (!atEntry)
             continue;
 
@@ -375,13 +393,13 @@ bool ChatHandler::HandleTriggerNearCommand(char* args)
         if (!at)
             continue;
 
-        if (at->target_mapId != m_session->GetPlayer()->GetMapId())
+        if (at->loc.GetMapId() != m_session->GetPlayer()->GetMapId())
             continue;
 
-        float dx = at->target_X - pl->GetPositionX();
-        float dy = at->target_Y - pl->GetPositionY();
+        float dx = at->loc.x - pl->GetPositionX();
+        float dy = at->loc.y - pl->GetPositionY();
 
-        if (dx*dx + dy*dy > dist2)
+        if (dx * dx + dy * dy > dist2)
             continue;
 
         ShowTriggerTargetListHelper(atEntry->id, at);
@@ -390,7 +408,7 @@ bool ChatHandler::HandleTriggerNearCommand(char* args)
     }
 
     if (counter == 0)                                      // if counter == 0 then we found nth
-        SendSysMessage (LANG_COMMAND_NOTRIGGERFOUND);
+        SendSysMessage(LANG_COMMAND_NOTRIGGERFOUND);
 
     return true;
 }
@@ -409,7 +427,7 @@ bool ChatHandler::HandleGoTriggerCommand(char* args)
     if (!*args)
         return false;
 
-    char *atIdStr = ExtractKeyFromLink(&args, areatriggerKeys);
+    char* atIdStr = ExtractKeyFromLink(&args, areatriggerKeys);
     if (!atIdStr)
         return false;
 
@@ -442,7 +460,7 @@ bool ChatHandler::HandleGoTriggerCommand(char* args)
             return false;
         }
 
-        return HandleGoHelper(_player, at->target_mapId, at->target_X, at->target_Y, &at->target_Z);
+        return HandleGoHelper(_player, at->loc.GetMapId(), at->loc.x, at->loc.y, &at->loc.z);
     }
     else
         return HandleGoHelper(_player, atEntry->mapid, atEntry->x, atEntry->y, &atEntry->z);
@@ -469,7 +487,7 @@ bool ChatHandler::HandleGoGraveyardCommand(char* args)
 
 enum CreatureLinkType
 {
-    CREATURE_LINK_RAW               =-1,                    // non-link case
+    CREATURE_LINK_RAW               = -1,                   // non-link case
     CREATURE_LINK_GUID              = 0,
     CREATURE_LINK_ENTRY             = 1,
 };
@@ -491,7 +509,7 @@ static char const* const creatureKeys[] =
 *                             Warning: If there is more than one mob with this "id"
 *                                      you will be teleported to the first one that is found.
 */
-//teleport to creature
+// teleport to creature
 bool ChatHandler::HandleGoCreatureCommand(char* args)
 {
     if (!*args)
@@ -518,7 +536,7 @@ bool ChatHandler::HandleGoCreatureCommand(char* args)
 
     CreatureData const* data = NULL;
 
-    switch(crType)
+    switch (crType)
     {
         case CREATURE_LINK_ENTRY:
         {
@@ -584,7 +602,7 @@ bool ChatHandler::HandleGoCreatureCommand(char* args)
             {
                 std::string name = pParam1;
                 WorldDatabase.escape_string(name);
-                QueryResult *result = WorldDatabase.PQuery("SELECT guid FROM creature, creature_template WHERE creature.id = creature_template.entry AND creature_template.name "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), name.c_str());
+                QueryResult* result = WorldDatabase.PQuery("SELECT guid FROM creature, creature_template WHERE creature.id = creature_template.entry AND creature_template.name " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'"), name.c_str());
                 if (!result)
                 {
                     SendSysMessage(LANG_COMMAND_GOCREATNOTFOUND);
@@ -594,8 +612,9 @@ bool ChatHandler::HandleGoCreatureCommand(char* args)
 
                 FindCreatureData worker(0, m_session ? m_session->GetPlayer() : NULL);
 
-                do {
-                    Field *fields = result->Fetch();
+                do
+                {
+                    Field* fields = result->Fetch();
                     uint32 guid = fields[0].GetUInt32();
 
                     CreatureDataPair const* cr_data = sObjectMgr.GetCreatureDataPair(guid);
@@ -604,7 +623,8 @@ bool ChatHandler::HandleGoCreatureCommand(char* args)
 
                     worker(*cr_data);
 
-                } while (result->NextRow());
+                }
+                while (result->NextRow());
 
                 delete result;
 
@@ -627,7 +647,7 @@ bool ChatHandler::HandleGoCreatureCommand(char* args)
 
 enum GameobjectLinkType
 {
-    GAMEOBJECT_LINK_RAW             =-1,                    // non-link case
+    GAMEOBJECT_LINK_RAW             = -1,                   // non-link case
     GAMEOBJECT_LINK_GUID            = 0,
     GAMEOBJECT_LINK_ENTRY           = 1,
 };
@@ -639,7 +659,7 @@ static char const* const gameobjectKeys[] =
     NULL
 };
 
-//teleport to gameobject
+// teleport to gameobject
 bool ChatHandler::HandleGoObjectCommand(char* args)
 {
     Player* _player = m_session->GetPlayer();
@@ -663,7 +683,7 @@ bool ChatHandler::HandleGoObjectCommand(char* args)
 
     GameObjectData const* data = NULL;
 
-    switch(goType)
+    switch (goType)
     {
         case CREATURE_LINK_ENTRY:
         {
@@ -731,7 +751,7 @@ bool ChatHandler::HandleGoObjectCommand(char* args)
             {
                 std::string name = pParam1;
                 WorldDatabase.escape_string(name);
-                QueryResult *result = WorldDatabase.PQuery("SELECT guid FROM gameobject, gameobject_template WHERE gameobject.id = gameobject_template.entry AND gameobject_template.name "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), name.c_str());
+                QueryResult* result = WorldDatabase.PQuery("SELECT guid FROM gameobject, gameobject_template WHERE gameobject.id = gameobject_template.entry AND gameobject_template.name " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'"), name.c_str());
                 if (!result)
                 {
                     SendSysMessage(LANG_COMMAND_GOOBJNOTFOUND);
@@ -741,8 +761,9 @@ bool ChatHandler::HandleGoObjectCommand(char* args)
 
                 FindGOData worker(0, m_session ? m_session->GetPlayer() : NULL);
 
-                do {
-                    Field *fields = result->Fetch();
+                do
+                {
+                    Field* fields = result->Fetch();
                     uint32 guid = fields[0].GetUInt32();
 
                     GameObjectDataPair const* go_data = sObjectMgr.GetGODataPair(guid);
@@ -751,7 +772,8 @@ bool ChatHandler::HandleGoObjectCommand(char* args)
 
                     worker(*go_data);
 
-                } while (result->NextRow());
+                }
+                while (result->NextRow());
 
                 delete result;
 
@@ -775,7 +797,7 @@ bool ChatHandler::HandleGoObjectCommand(char* args)
 bool ChatHandler::HandleGameObjectTargetCommand(char* args)
 {
     Player* pl = m_session->GetPlayer();
-    QueryResult *result;
+    QueryResult* result;
     GameEventMgr::ActiveEvents const& activeEventsList = sGameEventMgr.GetActiveEventList();
     if (*args)
     {
@@ -788,16 +810,16 @@ bool ChatHandler::HandleGameObjectTargetCommand(char* args)
         if (ExtractUInt32(&cId, id))
         {
             result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, orientation, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE map = '%i' AND id = '%u' ORDER BY order_ ASC LIMIT 1",
-                pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(),id);
+                                          pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(), id);
         }
         else
         {
             std::string name = cId;
             WorldDatabase.escape_string(name);
             result = WorldDatabase.PQuery(
-                "SELECT guid, id, position_x, position_y, position_z, orientation, map, (POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ "
-                "FROM gameobject,gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'")" ORDER BY order_ ASC LIMIT 1",
-                pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(),name.c_str());
+                         "SELECT guid, id, position_x, position_y, position_z, orientation, map, (POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ "
+                         "FROM gameobject,gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'")" ORDER BY order_ ASC LIMIT 1",
+                         pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(), name.c_str());
         }
     }
     else
@@ -810,8 +832,8 @@ bool ChatHandler::HandleGameObjectTargetCommand(char* args)
         {
             if (initString)
             {
-                eventFilter  <<  "OR event IN (" <<*itr;
-                initString =false;
+                eventFilter  <<  "OR event IN (" << *itr;
+                initString = false;
             }
             else
                 eventFilter << "," << *itr;
@@ -823,9 +845,9 @@ bool ChatHandler::HandleGameObjectTargetCommand(char* args)
             eventFilter << ")";
 
         result = WorldDatabase.PQuery("SELECT gameobject.guid, id, position_x, position_y, position_z, orientation, map, "
-            "(POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ FROM gameobject "
-            "LEFT OUTER JOIN game_event_gameobject on gameobject.guid=game_event_gameobject.guid WHERE map = '%i' %s ORDER BY order_ ASC LIMIT 10",
-            m_session->GetPlayer()->GetPositionX(), m_session->GetPlayer()->GetPositionY(), m_session->GetPlayer()->GetPositionZ(), m_session->GetPlayer()->GetMapId(),eventFilter.str().c_str());
+                                      "(POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ FROM gameobject "
+                                      "LEFT OUTER JOIN game_event_gameobject on gameobject.guid=game_event_gameobject.guid WHERE map = '%i' %s ORDER BY order_ ASC LIMIT 10",
+                                      m_session->GetPlayer()->GetPositionX(), m_session->GetPlayer()->GetPositionY(), m_session->GetPlayer()->GetPositionZ(), m_session->GetPlayer()->GetMapId(), eventFilter.str().c_str());
     }
 
     if (!result)
@@ -841,7 +863,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(char* args)
 
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         lowguid = fields[0].GetUInt32();
         id =      fields[1].GetUInt32();
         x =       fields[2].GetFloat();
@@ -852,13 +874,14 @@ bool ChatHandler::HandleGameObjectTargetCommand(char* args)
         pool_id = sPoolMgr.IsPartOfAPool<GameObject>(lowguid);
         if (!pool_id || pl->GetMap()->GetPersistentState()->IsSpawnedPoolObject<GameObject>(lowguid))
             found = true;
-    } while (result->NextRow() && (!found));
+    }
+    while (result->NextRow() && (!found));
 
     delete result;
 
     if (!found)
     {
-        PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,id);
+        PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, id);
         return false;
     }
 
@@ -866,7 +889,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(char* args)
 
     if (!goI)
     {
-        PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,id);
+        PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, id);
         return false;
     }
 
@@ -876,21 +899,26 @@ bool ChatHandler::HandleGameObjectTargetCommand(char* args)
 
     if (target)
     {
-        time_t curRespawnDelay = target->GetRespawnTimeEx()-time(NULL);
+        time_t curRespawnDelay = target->GetRespawnTimeEx() - time(NULL);
         if (curRespawnDelay < 0)
             curRespawnDelay = 0;
 
-        std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay,true);
-        std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(),true);
+        std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay, true);
+        std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(), true);
 
-        PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(),curRespawnDelayStr.c_str());
+        PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(), curRespawnDelayStr.c_str());
 
         ShowNpcOrGoSpawnInformation<GameObject>(target->GetGUIDLow());
+
+        if (target->GetGoType() == GAMEOBJECT_TYPE_DOOR)
+            PSendSysMessage(LANG_COMMAND_GO_STATUS_DOOR, target->GetGoState(), target->getLootState(), GetOnOffStr(target->CalculateCurrentCollisionState()), goI->door.startOpen ? "open" : "closed");
+        else
+            PSendSysMessage(LANG_COMMAND_GO_STATUS, target->GetGoState(), target->getLootState(), GetOnOffStr(target->CalculateCurrentCollisionState()));
     }
     return true;
 }
 
-//delete object by selection or guid
+// delete object by selection or guid
 bool ChatHandler::HandleGameObjectDeleteCommand(char* args)
 {
     // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r
@@ -905,7 +933,7 @@ bool ChatHandler::HandleGameObjectDeleteCommand(char* args)
 
     // by DB guid
     if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
-        obj = GetGameObjectWithGuid(lowguid,go_data->id);
+        obj = GetGameObjectWithGuid(lowguid, go_data->id);
 
     if (!obj)
     {
@@ -924,7 +952,7 @@ bool ChatHandler::HandleGameObjectDeleteCommand(char* args)
             return false;
         }
 
-        owner->RemoveGameObject(obj,false);
+        owner->RemoveGameObject(obj, false);
     }
 
     obj->SetRespawnTime(0);                                 // not save respawn time
@@ -936,7 +964,7 @@ bool ChatHandler::HandleGameObjectDeleteCommand(char* args)
     return true;
 }
 
-//turn selected object
+// turn selected object
 bool ChatHandler::HandleGameObjectTurnCommand(char* args)
 {
     // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r
@@ -951,7 +979,7 @@ bool ChatHandler::HandleGameObjectTurnCommand(char* args)
 
     // by DB guid
     if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
-        obj = GetGameObjectWithGuid(lowguid,go_data->id);
+        obj = GetGameObjectWithGuid(lowguid, go_data->id);
 
     if (!obj)
     {
@@ -970,7 +998,7 @@ bool ChatHandler::HandleGameObjectTurnCommand(char* args)
     return true;
 }
 
-//move selected object
+// move selected object
 bool ChatHandler::HandleGameObjectMoveCommand(char* args)
 {
     // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r
@@ -985,7 +1013,7 @@ bool ChatHandler::HandleGameObjectMoveCommand(char* args)
 
     // by DB guid
     if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
-        obj = GetGameObjectWithGuid(lowguid,go_data->id);
+        obj = GetGameObjectWithGuid(lowguid, go_data->id);
 
     if (!obj)
     {
@@ -996,12 +1024,12 @@ bool ChatHandler::HandleGameObjectMoveCommand(char* args)
 
     if (!*args)
     {
-        Player *chr = m_session->GetPlayer();
+        Player* chr = m_session->GetPlayer();
 
         Map* map = obj->GetMap();
-        map->Remove(obj,false);
+        map->Remove(obj, false);
 
-        obj->Relocate(chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), obj->GetOrientation());
+        obj->Relocate(chr->GetPosition());
 
         map->Add(obj);
     }
@@ -1027,9 +1055,9 @@ bool ChatHandler::HandleGameObjectMoveCommand(char* args)
         }
 
         Map* map = obj->GetMap();
-        map->Remove(obj,false);
+        map->Remove(obj, false);
 
-        obj->Relocate(x, y, z, obj->GetOrientation());
+        obj->Relocate(WorldLocation(map->GetId(), x, y, z, obj->GetOrientation(), obj->GetPhaseMask(), map->GetInstanceId()));
 
         map->Add(obj);
     }
@@ -1042,7 +1070,7 @@ bool ChatHandler::HandleGameObjectMoveCommand(char* args)
     return true;
 }
 
-//spawn go
+// spawn go
 bool ChatHandler::HandleGameObjectAddCommand(char* args)
 {
     // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r
@@ -1116,11 +1144,11 @@ bool ChatHandler::HandleGameObjectAddCommand(char* args)
 
     sObjectMgr.AddGameobjectToGrid(db_lowGUID, sObjectMgr.GetGOData(db_lowGUID));
 
-    PSendSysMessage(LANG_GAMEOBJECT_ADD,id,gInfo->name,db_lowGUID,x,y,z);
+    PSendSysMessage(LANG_GAMEOBJECT_ADD, id, gInfo->name, db_lowGUID, x, y, z);
     return true;
 }
 
-//set pahsemask for selected object
+// set pahsemask for selected object
 bool ChatHandler::HandleGameObjectPhaseCommand(char* args)
 {
     // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r
@@ -1135,7 +1163,7 @@ bool ChatHandler::HandleGameObjectPhaseCommand(char* args)
 
     // by DB guid
     if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
-        obj = GetGameObjectWithGuid(lowguid,go_data->id);
+        obj = GetGameObjectWithGuid(lowguid, go_data->id);
 
     if (!obj)
     {
@@ -1152,7 +1180,7 @@ bool ChatHandler::HandleGameObjectPhaseCommand(char* args)
         return false;
     }
 
-    obj->SetPhaseMask(phasemask,true);
+    obj->SetPhaseMask(phasemask, true);
     obj->SaveToDB();
     return true;
 }
@@ -1166,17 +1194,17 @@ bool ChatHandler::HandleGameObjectNearCommand(char* args)
     uint32 count = 0;
 
     Player* pl = m_session->GetPlayer();
-    QueryResult *result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, map, "
-        "(POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ "
-        "FROM gameobject WHERE map='%u' AND (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) <= '%f' ORDER BY order_",
-        pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(),
-        pl->GetMapId(), pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(),distance*distance);
+    QueryResult* result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, map, "
+                          "(POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ "
+                          "FROM gameobject WHERE map='%u' AND (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) <= '%f' ORDER BY order_",
+                          pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(),
+                          pl->GetMapId(), pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), distance * distance);
 
     if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 guid = fields[0].GetUInt32();
             uint32 entry = fields[1].GetUInt32();
             float x = fields[2].GetFloat();
@@ -1184,7 +1212,7 @@ bool ChatHandler::HandleGameObjectNearCommand(char* args)
             float z = fields[4].GetFloat();
             int mapid = fields[5].GetUInt16();
 
-            GameObjectInfo const * gInfo = ObjectMgr::GetGameObjectInfo(entry);
+            GameObjectInfo const* gInfo = ObjectMgr::GetGameObjectInfo(entry);
 
             if (!gInfo)
                 continue;
@@ -1192,12 +1220,13 @@ bool ChatHandler::HandleGameObjectNearCommand(char* args)
             PSendSysMessage(LANG_GO_MIXED_LIST_CHAT, guid, PrepareStringNpcOrGoSpawnInformation<GameObject>(guid).c_str(), entry, guid, gInfo->name, x, y, z, mapid);
 
             ++count;
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
 
         delete result;
     }
 
-    PSendSysMessage(LANG_COMMAND_NEAROBJMESSAGE,distance,count);
+    PSendSysMessage(LANG_COMMAND_NEAROBJMESSAGE, distance, count);
     return true;
 }
 
@@ -1216,7 +1245,7 @@ bool ChatHandler::HandleGUIDCommand(char* /*args*/)
     return true;
 }
 
-void ChatHandler::ShowAchievementListHelper(AchievementEntry const * achEntry, LocaleConstant loc, time_t const* date /*= NULL*/, Player* target /*= NULL */ )
+void ChatHandler::ShowAchievementListHelper(AchievementEntry const* achEntry, LocaleConstant loc, time_t const* date /*= NULL*/, Player* target /*= NULL */)
 {
     std::string name = achEntry->name[loc];
 
@@ -1231,7 +1260,7 @@ void ChatHandler::ShowAchievementListHelper(AchievementEntry const * achEntry, L
         {
             // complete date
             tm* aTm = localtime(date);
-            ss << ":1:" << aTm->tm_mon+1 << ":" << aTm->tm_mday << ":" << (aTm->tm_year+1900-2000) << ":";
+            ss << ":1:" << aTm->tm_mon + 1 << ":" << aTm->tm_mday << ":" << (aTm->tm_year + 1900 - 2000) << ":";
 
             // complete criteria mask (all bits set)
             ss << uint32(-1) << ":" << uint32(-1) << ":" << uint32(-1) << ":" << uint32(-1) << ":";
@@ -1276,7 +1305,7 @@ bool ChatHandler::HandleLookupAchievementCommand(char* args)
         return false;
 
     // Can be NULL at console call
-    Player *target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
 
     std::string namepart = args;
     std::wstring wnamepart;
@@ -1291,7 +1320,7 @@ bool ChatHandler::HandleLookupAchievementCommand(char* args)
 
     for (uint32 id = 0; id < sAchievementStore.GetNumRows(); ++id)
     {
-        AchievementEntry const *achEntry = sAchievementStore.LookupEntry(id);
+        AchievementEntry const* achEntry = sAchievementStore.LookupEntry(id);
         if (!achEntry)
             continue;
 
@@ -1303,7 +1332,7 @@ bool ChatHandler::HandleLookupAchievementCommand(char* args)
         if (!Utf8FitTo(name, wnamepart))
         {
             loc = 0;
-            for(; loc < MAX_LOCALE; ++loc)
+            for (; loc < MAX_LOCALE; ++loc)
             {
                 if (loc == GetSessionDbcLocale())
                     continue;
@@ -1321,7 +1350,7 @@ bool ChatHandler::HandleLookupAchievementCommand(char* args)
         {
             CompletedAchievementData const* completed = target ? target->GetAchievementMgr().GetCompleteData(id) : NULL;
             ShowAchievementListHelper(achEntry, LocaleConstant(loc), completed ? &completed->date : NULL, target);
-            counter++;
+            ++counter;
         }
     }
 
@@ -1339,15 +1368,15 @@ bool ChatHandler::HandleCharacterAchievementsCommand(char* args)
     LocaleConstant loc = GetSessionDbcLocale();
 
     CompletedAchievementMap const& complitedList = target->GetAchievementMgr().GetCompletedAchievements();
-    for(CompletedAchievementMap::const_iterator itr = complitedList.begin(); itr != complitedList.end(); ++itr)
+    for (CompletedAchievementMap::const_iterator itr = complitedList.begin(); itr != complitedList.end(); ++itr)
     {
-        AchievementEntry const *achEntry = sAchievementStore.LookupEntry(itr->first);
+        AchievementEntry const* achEntry = sAchievementStore.LookupEntry(itr->first);
         ShowAchievementListHelper(achEntry, loc, &itr->second.date, target);
     }
     return true;
 }
 
-void ChatHandler::ShowFactionListHelper( FactionEntry const * factionEntry, LocaleConstant loc, FactionState const* repState /*= NULL*/, Player * target /*= NULL */ )
+void ChatHandler::ShowFactionListHelper(FactionEntry const* factionEntry, LocaleConstant loc, FactionState const* repState /*= NULL*/, Player* target /*= NULL */)
 {
     std::string name = factionEntry->name[loc];
 
@@ -1391,7 +1420,7 @@ bool ChatHandler::HandleLookupFactionCommand(char* args)
         return false;
 
     // Can be NULL at console call
-    Player *target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
 
     std::string namepart = args;
     std::wstring wnamepart;
@@ -1406,7 +1435,7 @@ bool ChatHandler::HandleLookupFactionCommand(char* args)
 
     for (uint32 id = 0; id < sFactionStore.GetNumRows(); ++id)
     {
-        FactionEntry const *factionEntry = sFactionStore.LookupEntry(id);
+        FactionEntry const* factionEntry = sFactionStore.LookupEntry(id);
         if (factionEntry)
         {
             int loc = GetSessionDbcLocale();
@@ -1417,7 +1446,7 @@ bool ChatHandler::HandleLookupFactionCommand(char* args)
             if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
-                for(; loc < MAX_LOCALE; ++loc)
+                for (; loc < MAX_LOCALE; ++loc)
                 {
                     if (loc == GetSessionDbcLocale())
                         continue;
@@ -1435,7 +1464,7 @@ bool ChatHandler::HandleLookupFactionCommand(char* args)
             {
                 FactionState const* repState = target ? target->GetReputationMgr().GetState(factionEntry) : NULL;
                 ShowFactionListHelper(factionEntry, LocaleConstant(loc), repState, target);
-                counter++;
+                ++counter;
             }
         }
     }
@@ -1445,13 +1474,39 @@ bool ChatHandler::HandleLookupFactionCommand(char* args)
     return true;
 }
 
+bool ChatHandler::HandleModifyPowerTypeCommand(char* args)
+{
+    if(!*args)
+        return false;
+
+    int32 type = atoi((char*)args);
+
+    if (type < 0 || type >= MAX_POWERS)
+    {
+        SendSysMessage(LANG_BAD_VALUE);
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    Unit* target = getSelectedUnit();
+    if (!target)
+    {
+        SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    target->SetPowerType(Powers(type));
+
+    return true;
+}
+
 bool ChatHandler::HandleModifyRepCommand(char* args)
 {
     if (!*args)
         return false;
 
-    Player* target = NULL;
-    target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
 
     if (!target)
     {
@@ -1474,7 +1529,7 @@ bool ChatHandler::HandleModifyRepCommand(char* args)
     int32 amount = 0;
     if (!ExtractInt32(&args, amount))
     {
-        char *rankTxt = ExtractLiteralArg(&args);
+        char* rankTxt = ExtractLiteralArg(&args);
         if (!rankTxt)
             return false;
 
@@ -1501,9 +1556,9 @@ bool ChatHandler::HandleModifyRepCommand(char* args)
             if (wrank.substr(0, wrankStr.size()) == wrankStr)
             {
                 int32 delta;
-                if (!ExtractOptInt32(&args, delta, 0) || (delta < 0) || (delta > ReputationMgr::PointsInRank[r] -1))
+                if (!ExtractOptInt32(&args, delta, 0) || (delta < 0) || (delta > ReputationMgr::PointsInRank[r] - 1))
                 {
-                    PSendSysMessage(LANG_COMMAND_FACTION_DELTA, (ReputationMgr::PointsInRank[r]-1));
+                    PSendSysMessage(LANG_COMMAND_FACTION_DELTA, (ReputationMgr::PointsInRank[r] - 1));
                     SetSentErrorMessage(true);
                     return false;
                 }
@@ -1520,7 +1575,7 @@ bool ChatHandler::HandleModifyRepCommand(char* args)
         }
     }
 
-    FactionEntry const *factionEntry = sFactionStore.LookupEntry(factionId);
+    FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionId);
 
     if (!factionEntry)
     {
@@ -1536,14 +1591,14 @@ bool ChatHandler::HandleModifyRepCommand(char* args)
         return false;
     }
 
-    target->GetReputationMgr().SetReputation(factionEntry,amount);
+    target->GetReputationMgr().SetReputation(factionEntry, amount);
     PSendSysMessage(LANG_COMMAND_MODIFY_REP, factionEntry->name[GetSessionDbcLocale()], factionId,
-        GetNameLink(target).c_str(), target->GetReputationMgr().GetReputation(factionEntry));
+                    GetNameLink(target).c_str(), target->GetReputationMgr().GetReputation(factionEntry));
     return true;
 }
 
 //-----------------------Npc Commands-----------------------
-//add spawn of creature
+// add spawn of creature
 bool ChatHandler::HandleNpcAddCommand(char* args)
 {
     if (!*args)
@@ -1553,7 +1608,7 @@ bool ChatHandler::HandleNpcAddCommand(char* args)
     if (!ExtractUint32KeyFromLink(&args, "Hcreature_entry", id))
         return false;
 
-    CreatureInfo const *cinfo = ObjectMgr::GetCreatureTemplate(id);
+    CreatureInfo const* cinfo = ObjectMgr::GetCreatureTemplate(id);
     if (!cinfo)
     {
         PSendSysMessage(LANG_COMMAND_INVALIDCREATUREID, id);
@@ -1561,9 +1616,9 @@ bool ChatHandler::HandleNpcAddCommand(char* args)
         return false;
     }
 
-    Player *chr = m_session->GetPlayer();
+    Player* chr = m_session->GetPlayer();
     CreatureCreatePos pos(chr, chr->GetOrientation());
-    Map *map = chr->GetMap();
+    Map* map = chr->GetMap();
 
     Creature* pCreature = new Creature;
 
@@ -1594,7 +1649,7 @@ bool ChatHandler::HandleNpcAddCommand(char* args)
     return true;
 }
 
-//add item in vendorlist
+// add item in vendorlist
 bool ChatHandler::HandleNpcAddVendorItemCommand(char* args)
 {
     uint32 itemId;
@@ -1621,21 +1676,21 @@ bool ChatHandler::HandleNpcAddVendorItemCommand(char* args)
 
     uint32 vendor_entry = vendor ? vendor->GetEntry() : 0;
 
-    if (!sObjectMgr.IsVendorItemValid(false, "npc_vendor", vendor_entry, itemId, maxcount, incrtime, extendedcost, m_session->GetPlayer()))
+    if (!sObjectMgr.IsVendorItemValid(false, "npc_vendor", vendor_entry, itemId, maxcount, incrtime, extendedcost, 0, m_session->GetPlayer()))
     {
         SetSentErrorMessage(true);
         return false;
     }
 
-    sObjectMgr.AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost);
+    sObjectMgr.AddVendorItem(vendor_entry, itemId, maxcount, incrtime, extendedcost);
 
     ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemId);
 
-    PSendSysMessage(LANG_ITEM_ADDED_TO_LIST,itemId,pProto->Name1,maxcount,incrtime,extendedcost);
+    PSendSysMessage(LANG_ITEM_ADDED_TO_LIST, itemId, pProto->Name1, maxcount, incrtime, extendedcost);
     return true;
 }
 
-//del item from vendor list
+// del item from vendor list
 bool ChatHandler::HandleNpcDelVendorItemCommand(char* args)
 {
     if (!*args)
@@ -1659,18 +1714,18 @@ bool ChatHandler::HandleNpcDelVendorItemCommand(char* args)
 
     if (!sObjectMgr.RemoveVendorItem(vendor->GetEntry(), itemId))
     {
-        PSendSysMessage(LANG_ITEM_NOT_IN_LIST,itemId);
+        PSendSysMessage(LANG_ITEM_NOT_IN_LIST, itemId);
         SetSentErrorMessage(true);
         return false;
     }
 
     ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemId);
 
-    PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST,itemId,pProto->Name1);
+    PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST, itemId, pProto->Name1);
     return true;
 }
 
-//show info about AI
+// show info about AI
 bool ChatHandler::HandleNpcAIInfoCommand(char* /*args*/)
 {
     Creature* pTarget = getSelectedCreature();
@@ -1689,9 +1744,9 @@ bool ChatHandler::HandleNpcAIInfoCommand(char* /*args*/)
     char const* cstrAIClass = pTarget->AI() ? typeid(*pTarget->AI()).name() : " - ";
 
     PSendSysMessage(LANG_NPC_AI_NAMES,
-        strAI.empty() ? " - " : strAI.c_str(),
-        cstrAIClass ? cstrAIClass : " - ",
-        strScript.empty() ? " - " : strScript.c_str());
+                    strAI.empty() ? " - " : strAI.c_str(),
+                    cstrAIClass ? cstrAIClass : " - ",
+                    strScript.empty() ? " - " : strScript.c_str());
 
     if (pTarget->AI())
         pTarget->AI()->GetAIInformation(*this);
@@ -1699,7 +1754,7 @@ bool ChatHandler::HandleNpcAIInfoCommand(char* /*args*/)
     return true;
 }
 
-//add move for creature
+// add move for creature
 bool ChatHandler::HandleNpcAddMoveCommand(char* args)
 {
     uint32 lowguid;
@@ -1732,7 +1787,7 @@ bool ChatHandler::HandleNpcAddMoveCommand(char* args)
     sWaypointMgr.AddLastNode(lowguid, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), wait, 0);
 
     // update movement type
-    WorldDatabase.PExecuteLog("UPDATE creature SET MovementType=%u WHERE guid=%u", WAYPOINT_MOTION_TYPE,lowguid);
+    WorldDatabase.PExecuteLog("UPDATE creature SET MovementType=%u WHERE guid=%u", WAYPOINT_MOTION_TYPE, lowguid);
     if (pCreature)
     {
         pCreature->SetDefaultMovementType(WAYPOINT_MOTION_TYPE);
@@ -1750,7 +1805,7 @@ bool ChatHandler::HandleNpcAddMoveCommand(char* args)
     return true;
 }
 
-//change level of creature or pet
+// change level of creature or pet
 bool ChatHandler::HandleNpcChangeLevelCommand(char* args)
 {
     if (!*args)
@@ -1776,8 +1831,8 @@ bool ChatHandler::HandleNpcChangeLevelCommand(char* args)
         ((Pet*)pCreature)->GivePetLevel(lvl);
     else
     {
-        pCreature->SetMaxHealth(100 + 30*lvl);
-        pCreature->SetHealth(100 + 30*lvl);
+        pCreature->SetMaxHealth(100 + 30 * lvl);
+        pCreature->SetHealth(100 + 30 * lvl);
         pCreature->SetLevel(lvl);
 
         if (pCreature->HasStaticDBSpawnData())
@@ -1787,7 +1842,7 @@ bool ChatHandler::HandleNpcChangeLevelCommand(char* args)
     return true;
 }
 
-//set npcflag of creature
+// set npcflag of creature
 bool ChatHandler::HandleNpcFlagCommand(char* args)
 {
     if (!*args)
@@ -1843,6 +1898,7 @@ bool ChatHandler::HandleNpcDeleteCommand(char* args)
     switch (unit->GetSubtype())
     {
         case CREATURE_SUBTYPE_GENERIC:
+//        case CREATURE_SUBTYPE_VEHICLE:
         {
             unit->CombatStop();
             if (CreatureData const* data = sObjectMgr.GetCreatureData(unit->GetGUIDLow()))
@@ -1872,7 +1928,7 @@ bool ChatHandler::HandleNpcDeleteCommand(char* args)
     return true;
 }
 
-//move selected creature
+// move selected creature
 bool ChatHandler::HandleNpcMoveCommand(char* args)
 {
     uint32 lowguid = 0;
@@ -1907,22 +1963,22 @@ bool ChatHandler::HandleNpcMoveCommand(char* args)
     else
         lowguid = pCreature->GetGUIDLow();
 
-    float x = m_session->GetPlayer()->GetPositionX();
-    float y = m_session->GetPlayer()->GetPositionY();
-    float z = m_session->GetPlayer()->GetPositionZ();
-    float o = m_session->GetPlayer()->GetOrientation();
+    WorldLocation loc = m_session->GetPlayer()->GetPosition();
 
     if (pCreature)
     {
         if (CreatureData const* data = sObjectMgr.GetCreatureData(pCreature->GetGUIDLow()))
         {
-            const_cast<CreatureData*>(data)->posX = x;
-            const_cast<CreatureData*>(data)->posY = y;
-            const_cast<CreatureData*>(data)->posZ = z;
-            const_cast<CreatureData*>(data)->orientation = o;
+            const_cast<CreatureData*>(data)->posX = loc.x;
+            const_cast<CreatureData*>(data)->posY = loc.y;
+            const_cast<CreatureData*>(data)->posZ = loc.z;
+            const_cast<CreatureData*>(data)->orientation = loc.o;
         }
-        pCreature->GetMap()->CreatureRelocation(pCreature,x, y, z,o);
+
+        pCreature->SetRespawnCoord(loc);
+        pCreature->GetMap()->Relocation(pCreature, loc);
         pCreature->GetMotionMaster()->Initialize();
+
         if (pCreature->isAlive())                           // dead creature will reset movement generator at respawn
         {
             pCreature->SetDeathState(JUST_DIED);
@@ -1930,7 +1986,7 @@ bool ChatHandler::HandleNpcMoveCommand(char* args)
         }
     }
 
-    WorldDatabase.PExecuteLog("UPDATE creature SET position_x = '%f', position_y = '%f', position_z = '%f', orientation = '%f' WHERE guid = '%u'", x, y, z, o, lowguid);
+    WorldDatabase.PExecuteLog("UPDATE creature SET position_x = '%f', position_y = '%f', position_z = '%f', orientation = '%f' WHERE guid = '%u'", loc.x, loc.y, loc.z, loc.o, lowguid);
     PSendSysMessage(LANG_COMMAND_CREATUREMOVED);
     return true;
 }
@@ -2026,14 +2082,14 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(char* args)
     }
 
     if (doNotDelete)
-        PSendSysMessage(LANG_MOVE_TYPE_SET_NODEL,type_str);
+        PSendSysMessage(LANG_MOVE_TYPE_SET_NODEL, type_str);
     else
-        PSendSysMessage(LANG_MOVE_TYPE_SET,type_str);
+        PSendSysMessage(LANG_MOVE_TYPE_SET, type_str);
 
     return true;
 }
 
-//set model of creature
+// set model of creature
 bool ChatHandler::HandleNpcSetModelCommand(char* args)
 {
     if (!*args)
@@ -2041,7 +2097,7 @@ bool ChatHandler::HandleNpcSetModelCommand(char* args)
 
     uint32 displayId = (uint32) atoi(args);
 
-    Creature *pCreature = getSelectedCreature();
+    Creature* pCreature = getSelectedCreature();
 
     if (!pCreature || pCreature->IsPet())
     {
@@ -2058,7 +2114,7 @@ bool ChatHandler::HandleNpcSetModelCommand(char* args)
 
     return true;
 }
-//set faction of creature
+// set faction of creature
 bool ChatHandler::HandleNpcFactionIdCommand(char* args)
 {
     if (!*args)
@@ -2087,10 +2143,10 @@ bool ChatHandler::HandleNpcFactionIdCommand(char* args)
     // faction is set in creature_template - not inside creature
 
     // update in memory
-    if (CreatureInfo const *cinfo = pCreature->GetCreatureInfo())
+    if (CreatureInfo const* cinfo = pCreature->GetCreatureInfo())
     {
-        const_cast<CreatureInfo*>(cinfo)->faction_A = factionId;
-        const_cast<CreatureInfo*>(cinfo)->faction_H = factionId;
+        const_cast<CreatureInfo*>(cinfo)->FactionAlliance = factionId;
+        const_cast<CreatureInfo*>(cinfo)->FactionHorde = factionId;
     }
 
     // and DB
@@ -2098,7 +2154,7 @@ bool ChatHandler::HandleNpcFactionIdCommand(char* args)
 
     return true;
 }
-//set spawn dist of creature
+// set spawn dist of creature
 bool ChatHandler::HandleNpcSpawnDistCommand(char* args)
 {
     if (!*args)
@@ -2112,10 +2168,10 @@ bool ChatHandler::HandleNpcSpawnDistCommand(char* args)
     }
 
     MovementGeneratorType mtype = IDLE_MOTION_TYPE;
-    if (option >0.0f)
+    if (option > 0.0f)
         mtype = RANDOM_MOTION_TYPE;
 
-    Creature *pCreature = getSelectedCreature();
+    Creature* pCreature = getSelectedCreature();
     uint32 u_guidlow = 0;
 
     if (pCreature)
@@ -2132,18 +2188,18 @@ bool ChatHandler::HandleNpcSpawnDistCommand(char* args)
         pCreature->Respawn();
     }
 
-    WorldDatabase.PExecuteLog("UPDATE creature SET spawndist=%f, MovementType=%i WHERE guid=%u",option,mtype,u_guidlow);
-    PSendSysMessage(LANG_COMMAND_SPAWNDIST,option);
+    WorldDatabase.PExecuteLog("UPDATE creature SET spawndist=%f, MovementType=%i WHERE guid=%u", option, mtype, u_guidlow);
+    PSendSysMessage(LANG_COMMAND_SPAWNDIST, option);
     return true;
 }
-//spawn time handling
+// spawn time handling
 bool ChatHandler::HandleNpcSpawnTimeCommand(char* args)
 {
     uint32 stime;
     if (!ExtractUInt32(&args, stime))
         return false;
 
-    Creature *pCreature = getSelectedCreature();
+    Creature* pCreature = getSelectedCreature();
     if (!pCreature)
     {
         PSendSysMessage(LANG_SELECT_CREATURE);
@@ -2159,11 +2215,11 @@ bool ChatHandler::HandleNpcSpawnTimeCommand(char* args)
 
     return true;
 }
-//npc follow handling
+// npc follow handling
 bool ChatHandler::HandleNpcFollowCommand(char* /*args*/)
 {
-    Player *player = m_session->GetPlayer();
-    Creature *creature = getSelectedCreature();
+    Player* player = m_session->GetPlayer();
+    Creature* creature = getSelectedCreature();
 
     if (!creature)
     {
@@ -2178,11 +2234,11 @@ bool ChatHandler::HandleNpcFollowCommand(char* /*args*/)
     PSendSysMessage(LANG_CREATURE_FOLLOW_YOU_NOW, creature->GetName());
     return true;
 }
-//npc unfollow handling
+// npc unfollow handling
 bool ChatHandler::HandleNpcUnFollowCommand(char* /*args*/)
 {
-    Player *player = m_session->GetPlayer();
-    Creature *creature = getSelectedCreature();
+    Player* player = m_session->GetPlayer();
+    Creature* creature = getSelectedCreature();
 
     if (!creature)
     {
@@ -2191,8 +2247,7 @@ bool ChatHandler::HandleNpcUnFollowCommand(char* /*args*/)
         return false;
     }
 
-    if (creature->GetMotionMaster()->empty() ||
-        creature->GetMotionMaster()->GetCurrentMovementGeneratorType ()!=FOLLOW_MOTION_TYPE)
+    if (creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != FOLLOW_MOTION_TYPE)
     {
         PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU);
         SetSentErrorMessage(true);
@@ -2200,25 +2255,22 @@ bool ChatHandler::HandleNpcUnFollowCommand(char* /*args*/)
     }
 
     FollowMovementGenerator<Creature> const* mgen
-        = static_cast<FollowMovementGenerator<Creature> const*>((creature->GetMotionMaster()->top()));
+        = static_cast<FollowMovementGenerator<Creature> const*>((creature->GetMotionMaster()->CurrentMovementGenerator()));
 
     if (mgen->GetTarget() != player)
-    {
         PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU);
-        SetSentErrorMessage(true);
-        return false;
-    }
+        // Need remove chase action even if chase not for your.
 
-    // reset movement
-    creature->GetMotionMaster()->MovementExpired(true);
+    // remove UNIT_ACTION_CHASE
+    creature->GetUnitStateMgr().DropAction(UNIT_ACTION_CHASE);
 
-    PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU_NOW, creature->GetName());
+    PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU_NOW, creature->GetObjectGuid().GetString().c_str());
     return true;
 }
-//npc tame handling
+// npc tame handling
 bool ChatHandler::HandleNpcTameCommand(char* /*args*/)
 {
-    Creature *creatureTarget = getSelectedCreature ();
+    Creature* creatureTarget = getSelectedCreature();
 
     if (!creatureTarget || creatureTarget->IsPet())
     {
@@ -2227,7 +2279,7 @@ bool ChatHandler::HandleNpcTameCommand(char* /*args*/)
         return false;
     }
 
-    Player *player = m_session->GetPlayer ();
+    Player* player = m_session->GetPlayer();
 
     if (player->GetPetGuid())
     {
@@ -2239,8 +2291,8 @@ bool ChatHandler::HandleNpcTameCommand(char* /*args*/)
     player->CastSpell(creatureTarget, 13481, true);         // Tame Beast, triggered effect
     return true;
 }
-//npc phasemask handling
-//change phasemask of creature or pet
+// npc phasemask handling
+// change phasemask of creature or pet
 bool ChatHandler::HandleNpcSetPhaseCommand(char* args)
 {
     if (!*args)
@@ -2262,14 +2314,14 @@ bool ChatHandler::HandleNpcSetPhaseCommand(char* args)
         return false;
     }
 
-    pCreature->SetPhaseMask(phasemask,true);
+    pCreature->SetPhaseMask(phasemask, true);
 
     if (pCreature->HasStaticDBSpawnData())
         pCreature->SaveToDB();
 
     return true;
 }
-//npc deathstate handling
+// npc deathstate handling
 bool ChatHandler::HandleNpcSetDeathStateCommand(char* args)
 {
     bool value;
@@ -2299,7 +2351,7 @@ bool ChatHandler::HandleNpcSetDeathStateCommand(char* args)
     return true;
 }
 
-//TODO: NpcCommands that need to be fixed :
+// TODO: NpcCommands that need to be fixed :
 
 bool ChatHandler::HandleNpcNameCommand(char* /*args*/)
 {
@@ -2361,7 +2413,7 @@ bool ChatHandler::HandleNpcSubNameCommand(char* /*args*/)
         return true;
     }
 
-    for (uint8 i = 0; i < strlen(args); i++)
+    for (uint8 i = 0; i < strlen(args); ++i)
     {
         if (!isalpha(args[i]) && args[i]!=' ')
         {
@@ -2393,7 +2445,7 @@ bool ChatHandler::HandleNpcSubNameCommand(char* /*args*/)
     return true;
 }
 
-//move item to other slot
+// move item to other slot
 bool ChatHandler::HandleItemMoveCommand(char* args)
 {
     if (!*args)
@@ -2429,7 +2481,7 @@ bool ChatHandler::HandleItemMoveCommand(char* args)
     return true;
 }
 
-//demorph player or unit
+// demorph player or unit
 bool ChatHandler::HandleDeMorphCommand(char* /*args*/)
 {
     Unit *target = getSelectedUnit();
@@ -2475,8 +2527,8 @@ bool ChatHandler::HandleModifyMorphCommand(char* args)
     return true;
 }
 
-//kick player
-bool ChatHandler::HandleKickPlayerCommand(char *args)
+// kick player
+bool ChatHandler::HandleKickPlayerCommand(char* args)
 {
     Player* target;
     if (!ExtractPlayerTarget(&args, &target))
@@ -2499,7 +2551,7 @@ bool ChatHandler::HandleKickPlayerCommand(char *args)
     return true;
 }
 
-//set temporary phase mask for player
+// set temporary phase mask for player
 bool ChatHandler::HandleModifyPhaseCommand(char* args)
 {
     if (!*args)
@@ -2507,7 +2559,7 @@ bool ChatHandler::HandleModifyPhaseCommand(char* args)
 
     uint32 phasemask = (uint32)atoi(args);
 
-    Unit *target = getSelectedUnit();
+    Unit* target = getSelectedUnit();
     if (!target)
         target = m_session->GetPlayer();
 
@@ -2515,12 +2567,12 @@ bool ChatHandler::HandleModifyPhaseCommand(char* args)
     else if (target->GetTypeId() == TYPEID_PLAYER && HasLowerSecurity((Player*)target))
         return false;
 
-    target->SetPhaseMask(phasemask,true);
+    target->SetPhaseMask(phasemask, true);
 
     return true;
 }
 
-//show info of player
+// show info of player
 bool ChatHandler::HandlePInfoCommand(char* args)
 {
     Player* target;
@@ -2533,6 +2585,8 @@ bool ChatHandler::HandlePInfoCommand(char* args)
     uint32 money = 0;
     uint32 total_player_time = 0;
     uint32 level = 0;
+    uint8 race = 0;
+    uint8 Class = 0;
     uint32 latency = 0;
 
     // get additional information from Player object
@@ -2547,6 +2601,8 @@ bool ChatHandler::HandlePInfoCommand(char* args)
         total_player_time = target->GetTotalPlayedTime();
         level = target->getLevel();
         latency = target->GetSession()->GetLatency();
+        race = target->getRace();
+        Class = target->getClass();
     }
     // get additional information from DB
     else
@@ -2555,40 +2611,46 @@ bool ChatHandler::HandlePInfoCommand(char* args)
         if (HasLowerSecurity(NULL, target_guid))
             return false;
 
-        //                                                     0          1      2      3
-        QueryResult *result = CharacterDatabase.PQuery("SELECT totaltime, level, money, account FROM characters WHERE guid = '%u'", target_guid.GetCounter());
+        //                                                     0          1      2      3        4     5
+        QueryResult* result = CharacterDatabase.PQuery("SELECT totaltime, level, money, account, race, class FROM characters WHERE guid = '%u'", target_guid.GetCounter());
         if (!result)
             return false;
 
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         total_player_time = fields[0].GetUInt32();
         level = fields[1].GetUInt32();
         money = fields[2].GetUInt32();
         accId = fields[3].GetUInt32();
+        race = fields[4].GetUInt8();
+        Class = fields[5].GetUInt8();
         delete result;
     }
 
     std::string username = GetMangosString(LANG_ERROR);
+    std::string email = GetMangosString(LANG_ERROR);
     std::string last_ip = GetMangosString(LANG_ERROR);
     AccountTypes security = SEC_PLAYER;
     std::string last_login = GetMangosString(LANG_ERROR);
 
-    QueryResult* result = LoginDatabase.PQuery("SELECT username,gmlevel,last_ip,last_login FROM account WHERE id = '%u'",accId);
+    QueryResult* result = LoginDatabase.PQuery("SELECT a.id, a.username, aa.gmlevel, a.last_ip, a.last_login, a.email FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE a.id = '%u'", accId);
+
     if (result)
     {
         Field* fields = result->Fetch();
-        username = fields[0].GetCppString();
-        security = (AccountTypes)fields[1].GetUInt32();
+        username = fields[1].GetCppString();
+        security = AccountTypes(fields[2].GetUInt16());
 
         if (GetAccessLevel() >= security)
         {
-            last_ip = fields[2].GetCppString();
-            last_login = fields[3].GetCppString();
+            last_ip = fields[3].GetCppString();
+            last_login = fields[4].GetCppString();
+            email = fields[5].GetCppString();
         }
         else
         {
             last_ip = "-";
             last_login = "-";
+            email = "-";
         }
 
         delete result;
@@ -2596,24 +2658,52 @@ bool ChatHandler::HandlePInfoCommand(char* args)
 
     std::string nameLink = playerLink(target_name);
 
-    PSendSysMessage(LANG_PINFO_ACCOUNT, (target?"":GetMangosString(LANG_OFFLINE)), nameLink.c_str(), target_guid.GetCounter(), username.c_str(), accId, security, last_ip.c_str(), last_login.c_str(), latency);
-
-    std::string timeStr = secsToTimeString(total_player_time,true,true);
-    uint32 gold = money /GOLD;
+    PSendSysMessage(LANG_PINFO_ACCOUNT, (target?"":GetMangosString(LANG_OFFLINE)), nameLink.c_str(), target_guid.GetCounter(), username.c_str(), accId, email.c_str(), security, last_ip.c_str(), last_login.c_str(), latency);
+
+    std::string race_s = "<unknown>", Class_s = "<unknown>";
+    switch (race)
+    {
+        case RACE_HUMAN:            race_s = "Human";       break;
+        case RACE_ORC:              race_s = "Orc";         break;
+        case RACE_DWARF:            race_s = "Dwarf";       break;
+        case RACE_NIGHTELF:         race_s = "Night Elf";   break;
+        case RACE_UNDEAD:           race_s = "Undead";      break;
+        case RACE_TAUREN:           race_s = "Tauren";      break;
+        case RACE_GNOME:            race_s = "Gnome";       break;
+        case RACE_TROLL:            race_s = "Troll";       break;
+        case RACE_BLOODELF:         race_s = "Blood Elf";   break;
+        case RACE_DRAENEI:          race_s = "Draenei";     break;
+    }
+    switch (Class)
+    {
+        case CLASS_WARRIOR:         Class_s = "Warrior";        break;
+        case CLASS_PALADIN:         Class_s = "Paladin";        break;
+        case CLASS_HUNTER:          Class_s = "Hunter";         break;
+        case CLASS_ROGUE:           Class_s = "Rogue";          break;
+        case CLASS_PRIEST:          Class_s = "Priest";         break;
+        case CLASS_DEATH_KNIGHT:    Class_s = "Death Knight";   break;
+        case CLASS_SHAMAN:          Class_s = "Shaman";         break;
+        case CLASS_MAGE:            Class_s = "Mage";           break;
+        case CLASS_WARLOCK:         Class_s = "Warlock";        break;
+        case CLASS_DRUID:           Class_s = "Druid";          break;
+    }
+
+    std::string timeStr = secsToTimeString(total_player_time, true, true);
+    uint32 gold = money / GOLD;
     uint32 silv = (money % GOLD) / SILVER;
     uint32 copp = (money % GOLD) % SILVER;
-    PSendSysMessage(LANG_PINFO_LEVEL,  timeStr.c_str(), level, gold,silv,copp);
+    PSendSysMessage(LANG_PINFO_LEVEL, race_s.c_str(), Class_s.c_str(), timeStr.c_str(), level, gold, silv, copp);
 
     return true;
 }
 
-//show tickets
+// show tickets
 void ChatHandler::ShowTicket(GMTicket const* ticket)
 {
     std::string lastupdated = TimeToTimestampStr(ticket->GetLastUpdate());
 
     std::string name;
-    if (!sObjectMgr.GetPlayerNameByGUID(ticket->GetPlayerGuid(), name))
+    if (!sAccountMgr.GetPlayerNameByGUID(ticket->GetPlayerGuid(), name))
         name = GetMangosString(LANG_UNKNOWN);
 
     std::string nameLink = playerLink(name);
@@ -2625,7 +2715,7 @@ void ChatHandler::ShowTicket(GMTicket const* ticket)
         PSendSysMessage(LANG_COMMAND_TICKETRESPONSE, ticket->GetResponse());
 }
 
-//ticket commands
+// ticket commands
 bool ChatHandler::HandleTicketCommand(char* args)
 {
     char* px = ExtractLiteralArg(&args);
@@ -2690,7 +2780,7 @@ bool ChatHandler::HandleTicketCommand(char* args)
                 return false;
 
             // mgr numbering tickets start from 0
-            ticket = sTicketMgr.GetGMTicketByOrderPos(num-1);
+            ticket = sTicketMgr.GetGMTicketByOrderPos(num - 1);
 
             if (!ticket)
             {
@@ -2723,8 +2813,9 @@ bool ChatHandler::HandleTicketCommand(char* args)
 
         ticket->SetResponseText(args);
 
-        if (Player* pl = sObjectMgr.GetPlayer(ticket->GetPlayerGuid()))
-            pl->GetSession()->SendGMResponse(ticket);
+        Player* plr = sObjectMgr.GetPlayer(ticket->GetPlayerGuid());
+        if (plr)
+            plr->GetSession()->SendGMResponse(ticket);
 
         return true;
     }
@@ -2737,7 +2828,7 @@ bool ChatHandler::HandleTicketCommand(char* args)
             return false;
 
         // mgr numbering tickets start from 0
-        GMTicket* ticket = sTicketMgr.GetGMTicketByOrderPos(num-1);
+        GMTicket* ticket = sTicketMgr.GetGMTicketByOrderPos(num - 1);
         if (!ticket)
         {
             PSendSysMessage(LANG_COMMAND_TICKETNOTEXIST, num);
@@ -2768,8 +2859,8 @@ bool ChatHandler::HandleTicketCommand(char* args)
     return true;
 }
 
-//dell all tickets
-bool ChatHandler::HandleDelTicketCommand(char *args)
+// dell all tickets
+bool ChatHandler::HandleDelTicketCommand(char* args)
 {
     char* px = ExtractLiteralArg(&args);
     if (!px)
@@ -2788,11 +2879,11 @@ bool ChatHandler::HandleDelTicketCommand(char *args)
     // delticket #num
     if (ExtractUInt32(&px, num))
     {
-        if (num ==0)
+        if (num == 0)
             return false;
 
         // mgr numbering tickets start from 0
-        GMTicket* ticket = sTicketMgr.GetGMTicketByOrderPos(num-1);
+        GMTicket* ticket = sTicketMgr.GetGMTicketByOrderPos(num - 1);
 
         if (!ticket)
         {
@@ -2805,8 +2896,9 @@ bool ChatHandler::HandleDelTicketCommand(char *args)
 
         sTicketMgr.Delete(guid);
 
-        //notify player
-        if (Player* pl = sObjectMgr.GetPlayer(guid))
+        // notify player
+        Player* pl = sObjectMgr.GetPlayer(guid);
+        if (pl)
         {
             pl->GetSession()->SendGMTicketGetTicket(0x0A);
             PSendSysMessage(LANG_COMMAND_TICKETPLAYERDEL, GetNameLink(pl).c_str());
@@ -2832,7 +2924,7 @@ bool ChatHandler::HandleDelTicketCommand(char *args)
 
     std::string nameLink = playerLink(target_name);
 
-    PSendSysMessage(LANG_COMMAND_TICKETPLAYERDEL,nameLink.c_str());
+    PSendSysMessage(LANG_COMMAND_TICKETPLAYERDEL, nameLink.c_str());
     return true;
 }
 
@@ -2891,9 +2983,9 @@ bool ChatHandler::HandleWpAddCommand(char* args)
         {
             DEBUG_LOG("DEBUG: HandleWpAddCommand - target->GetEntry() == VISUAL_WAYPOINT (1) ");
 
-            QueryResult *result =
+            QueryResult* result =
                 WorldDatabase.PQuery("SELECT id, point FROM creature_movement WHERE wpguid = %u",
-                target->GetGUIDLow());
+                                     target->GetGUIDLow());
             if (!result)
             {
                 PSendSysMessage(LANG_WAYPOINT_NOTFOUNDSEARCH, target->GetGUIDLow());
@@ -2906,7 +2998,7 @@ bool ChatHandler::HandleWpAddCommand(char* args)
                 // See also: http://dev.mysql.com/doc/refman/5.0/en/problems-with-float.html
                 const char* maxDIFF = "0.01";
                 result = WorldDatabase.PQuery("SELECT id, point FROM creature_movement WHERE (abs(position_x - %f) <= %s ) and (abs(position_y - %f) <= %s ) and (abs(position_z - %f) <= %s )",
-                    target->GetPositionX(), maxDIFF, target->GetPositionY(), maxDIFF, target->GetPositionZ(), maxDIFF);
+                                              target->GetPositionX(), maxDIFF, target->GetPositionY(), maxDIFF, target->GetPositionZ(), maxDIFF);
                 if (!result)
                 {
                     PSendSysMessage(LANG_WAYPOINT_NOTFOUNDDBPROBLEM, target->GetGUIDLow());
@@ -2916,10 +3008,11 @@ bool ChatHandler::HandleWpAddCommand(char* args)
             }
             do
             {
-                Field *fields = result->Fetch();
+                Field* fields = result->Fetch();
                 lowguid = fields[0].GetUInt32();
                 point   = fields[1].GetUInt32();
-            } while (result->NextRow());
+            }
+            while (result->NextRow());
             delete result;
 
             CreatureData const* data = sObjectMgr.GetCreatureData(lowguid);
@@ -2994,7 +3087,7 @@ bool ChatHandler::HandleWpAddCommand(char* args)
         target->SaveToDB();
     }
     else
-        WorldDatabase.PExecuteLog("UPDATE creature SET MovementType=%u WHERE guid=%u", WAYPOINT_MOTION_TYPE,lowguid);
+        WorldDatabase.PExecuteLog("UPDATE creature SET MovementType=%u WHERE guid=%u", WAYPOINT_MOTION_TYPE, lowguid);
 
     PSendSysMessage(LANG_WAYPOINT_ADDED, point, lowguid);
 
@@ -3043,9 +3136,9 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
     // Check
     // Remember: "show" must also be the name of a column!
     if ((show != "emote") && (show != "spell") && (show != "textid1") && (show != "textid2")
-        && (show != "textid3") && (show != "textid4") && (show != "textid5")
-        && (show != "waittime") && (show != "del") && (show != "move") && (show != "add")
-        && (show != "model1") && (show != "model2") && (show != "orientation"))
+            && (show != "textid3") && (show != "textid4") && (show != "textid5")
+            && (show != "waittime") && (show != "del") && (show != "move") && (show != "add")
+            && (show != "model1") && (show != "model2") && (show != "orientation"))
     {
         return false;
     }
@@ -3075,9 +3168,9 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
         wpGuid = target->GetGUIDLow();
 
         // The visual waypoint
-        QueryResult *result =
+        QueryResult* result =
             WorldDatabase.PQuery("SELECT id, point FROM creature_movement WHERE wpguid = %u LIMIT 1",
-            target->GetGUIDLow());
+                                 target->GetGUIDLow());
         if (!result)
         {
             PSendSysMessage(LANG_WAYPOINT_NOTFOUNDDBPROBLEM, wpGuid);
@@ -3086,7 +3179,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
         }
         DEBUG_LOG("DEBUG: HandleWpModifyCommand - After getting wpGuid");
 
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         lowguid = fields[0].GetUInt32();
         point   = fields[1].GetUInt32();
 
@@ -3129,7 +3222,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
         // Now we need the GUID of the visual waypoint
         // -> "del", "move", "add" command
 
-        QueryResult *result = WorldDatabase.PQuery("SELECT wpguid FROM creature_movement WHERE id = '%u' AND point = '%u' LIMIT 1", lowguid, point);
+        QueryResult* result = WorldDatabase.PQuery("SELECT wpguid FROM creature_movement WHERE id = '%u' AND point = '%u' LIMIT 1", lowguid, point);
         if (!result)
         {
             PSendSysMessage(LANG_WAYPOINT_NOTFOUNDSEARCH, lowguid, point);
@@ -3137,7 +3230,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
             return false;
         }
 
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         wpGuid  = fields[0].GetUInt32();
 
         // Free memory
@@ -3201,7 +3294,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
         DEBUG_LOG("DEBUG: HandleWpModifyCommand - add");
 
         Player* chr = m_session->GetPlayer();
-        Map *map = chr->GetMap();
+        Map* map = chr->GetMap();
 
         if (npcCreature)
         {
@@ -3237,7 +3330,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
         if (!wpGuid)
             return false;
 
-        PSendSysMessage(LANG_WAYPOINT_ADDED_NO, point+1);
+        PSendSysMessage(LANG_WAYPOINT_ADDED_NO, point + 1);
         return true;
     }                                                       // add
 
@@ -3275,7 +3368,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
         if (npcCreature)
         {
             // Any waypoints left?
-            QueryResult *result2 = WorldDatabase.PQuery("SELECT point FROM creature_movement WHERE id = '%u'",lowguid);
+            QueryResult* result2 = WorldDatabase.PQuery("SELECT point FROM creature_movement WHERE id = '%u'", lowguid);
             if (!result2)
             {
                 npcCreature->SetDefaultMovementType(RANDOM_MOTION_TYPE);
@@ -3302,8 +3395,8 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
     {
         PSendSysMessage("DEBUG: wp move, GUID: %u", lowguid);
 
-        Player *chr = m_session->GetPlayer();
-        Map *map = chr->GetMap();
+        Player* chr = m_session->GetPlayer();
+        Map* map = chr->GetMap();
         {
             // Get the creature for which we read the waypoint
             CreatureData const* data = sObjectMgr.GetCreatureData(lowguid);
@@ -3342,7 +3435,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
                 // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells();
                 wpCreature2->LoadFromDB(wpCreature2->GetGUIDLow(), map);
                 map->Add(wpCreature2);
-                //npcCreature->GetMap()->Add(wpCreature2);
+                // npcCreature->GetMap()->Add(wpCreature2);
             }
 
             sWaypointMgr.SetNodePosition(lowguid, point, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ());
@@ -3372,7 +3465,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
 
     // set in game textids not supported
     if (show == "textid1" || show == "textid2" || show == "textid3" ||
-        show == "textid4" || show == "textid5")
+            show == "textid4" || show == "textid5")
     {
         return false;
     }
@@ -3440,7 +3533,7 @@ bool ChatHandler::HandleWpShowCommand(char* args)
     // second arg: GUID (optional, if a creature is selected)
     char* guid_str = strtok((char*)NULL, " ");
     DEBUG_LOG("DEBUG: HandleWpShowCommand: show_str: %s guid_str: %s", show_str, guid_str);
-    //if (!guid_str) {
+    // if (!guid_str) {
     //    return false;
     //}
 
@@ -3513,13 +3606,13 @@ bool ChatHandler::HandleWpShowCommand(char* args)
             return false;
         }
 
-        //PSendSysMessage("wp on, GUID: %u", lowguid);
+        // PSendSysMessage("wp on, GUID: %u", lowguid);
 
-        //pCreature->GetPositionX();
+        // pCreature->GetPositionX();
 
-        QueryResult *result =
+        QueryResult* result =
             WorldDatabase.PQuery("SELECT id, point, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5, model1, model2 FROM creature_movement WHERE wpguid = %u",
-            target->GetGUIDLow());
+                                 target->GetGUIDLow());
         if (!result)
         {
             // Since we compare float values, we have to deal with
@@ -3531,7 +3624,7 @@ bool ChatHandler::HandleWpShowCommand(char* args)
             PSendSysMessage(LANG_WAYPOINT_NOTFOUNDSEARCH, target->GetObjectGuid().GetRawValue());
 
             result = WorldDatabase.PQuery("SELECT id, point, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5, model1, model2 FROM creature_movement WHERE (abs(position_x - %f) <= %s ) and (abs(position_y - %f) <= %s ) and (abs(position_z - %f) <= %s )",
-                target->GetPositionX(), maxDIFF, target->GetPositionY(), maxDIFF, target->GetPositionZ(), maxDIFF);
+                                          target->GetPositionX(), maxDIFF, target->GetPositionY(), maxDIFF, target->GetPositionZ(), maxDIFF);
             if (!result)
             {
                 PSendSysMessage(LANG_WAYPOINT_NOTFOUNDDBPROBLEM, lowguid);
@@ -3541,20 +3634,21 @@ bool ChatHandler::HandleWpShowCommand(char* args)
         }
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 wpGuid           = fields[0].GetUInt32();
             uint32 point            = fields[1].GetUInt32();
             int waittime            = fields[2].GetUInt32();
             uint32 emote            = fields[3].GetUInt32();
             uint32 spell            = fields[4].GetUInt32();
             uint32 textid[MAX_WAYPOINT_TEXT];
-            for(int i = 0;  i < MAX_WAYPOINT_TEXT; ++i)
-                textid[i]           = fields[5+i].GetUInt32();
+            for (int i = 0;  i < MAX_WAYPOINT_TEXT; ++i)
+                textid[i]           = fields[5 + i].GetUInt32();
             uint32 model1           = fields[10].GetUInt32();
             uint32 model2           = fields[11].GetUInt32();
 
             // Get the creature for which we read the waypoint
-            Creature* wpCreature = m_session->GetPlayer()->GetMap()->GetCreature(ObjectGuid(HIGHGUID_UNIT, VISUAL_WAYPOINT, wpGuid));
+            CreatureData const* data = sObjectMgr.GetCreatureData(wpGuid);
+            Creature* wpCreature = m_session->GetPlayer()->GetMap()->GetCreature(data ? data->GetObjectGuid(wpGuid) : ObjectGuid(HIGHGUID_UNIT, VISUAL_WAYPOINT, wpGuid));
 
             PSendSysMessage(LANG_WAYPOINT_INFO_TITLE, point, (wpCreature ? wpCreature->GetName() : "<not found>"), wpGuid);
             PSendSysMessage(LANG_WAYPOINT_INFO_WAITTIME, waittime);
@@ -3562,10 +3656,11 @@ bool ChatHandler::HandleWpShowCommand(char* args)
             PSendSysMessage(LANG_WAYPOINT_INFO_MODEL, 2, model2);
             PSendSysMessage(LANG_WAYPOINT_INFO_EMOTE, emote);
             PSendSysMessage(LANG_WAYPOINT_INFO_SPELL, spell);
-            for(int i = 0;  i < MAX_WAYPOINT_TEXT; ++i)
-                PSendSysMessage(LANG_WAYPOINT_INFO_TEXT, i+1, textid[i], (textid[i] ? GetMangosString(textid[i]) : ""));
+            for (int i = 0;  i < MAX_WAYPOINT_TEXT; ++i)
+                PSendSysMessage(LANG_WAYPOINT_INFO_TEXT, i + 1, textid[i], (textid[i] ? GetMangosString(textid[i]) : ""));
 
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
         // Cleanup memory
         delete result;
         return true;
@@ -3575,7 +3670,7 @@ bool ChatHandler::HandleWpShowCommand(char* args)
     {
         PSendSysMessage("DEBUG: wp on, GUID: %u", lowguid);
 
-        QueryResult *result = WorldDatabase.PQuery("SELECT point, position_x,position_y,position_z FROM creature_movement WHERE id = '%u'",lowguid);
+        QueryResult* result = WorldDatabase.PQuery("SELECT point, position_x,position_y,position_z FROM creature_movement WHERE id = '%u'", lowguid);
         if (!result)
         {
             PSendSysMessage(LANG_WAYPOINT_NOTFOUND, lowguid);
@@ -3583,13 +3678,13 @@ bool ChatHandler::HandleWpShowCommand(char* args)
             return false;
         }
         // Delete all visuals for this NPC
-        QueryResult *result2 = WorldDatabase.PQuery("SELECT wpguid FROM creature_movement WHERE id = '%u' and wpguid <> 0", lowguid);
+        QueryResult* result2 = WorldDatabase.PQuery("SELECT wpguid FROM creature_movement WHERE id = '%u' and wpguid <> 0", lowguid);
         if (result2)
         {
             bool hasError = false;
             do
             {
-                Field *fields = result2->Fetch();
+                Field* fields = result2->Fetch();
                 uint32 wpGuid = fields[0].GetUInt32();
                 Creature* pCreature = m_session->GetPlayer()->GetMap()->GetCreature(ObjectGuid(HIGHGUID_UNIT, VISUAL_WAYPOINT, wpGuid));
 
@@ -3605,7 +3700,8 @@ bool ChatHandler::HandleWpShowCommand(char* args)
                     pCreature->AddObjectToRemoveList();
                 }
 
-            } while (result2->NextRow());
+            }
+            while (result2->NextRow());
             delete result2;
             if (hasError)
             {
@@ -3617,10 +3713,10 @@ bool ChatHandler::HandleWpShowCommand(char* args)
 
         do
         {
-            Player *chr = m_session->GetPlayer();
-            Map *map = chr->GetMap();
+            Player* chr = m_session->GetPlayer();
+            Map* map = chr->GetMap();
 
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 point    = fields[0].GetUInt32();
             CreatureCreatePos pos(map, fields[1].GetFloat(), fields[2].GetFloat(), fields[3].GetFloat(), chr->GetOrientation(), chr->GetPhaseMaskForSpawn());
 
@@ -3641,10 +3737,11 @@ bool ChatHandler::HandleWpShowCommand(char* args)
 
             wpCreature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn());
             // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells();
-            wpCreature->LoadFromDB(wpCreature->GetGUIDLow(),map);
+            wpCreature->LoadFromDB(wpCreature->GetGUIDLow(), map);
             map->Add(wpCreature);
-            //wpCreature->GetMap()->Add(wpCreature);
-        } while (result->NextRow());
+            // wpCreature->GetMap()->Add(wpCreature);
+        }
+        while (result->NextRow());
 
         // Cleanup memory
         delete result;
@@ -3655,7 +3752,7 @@ bool ChatHandler::HandleWpShowCommand(char* args)
     {
         PSendSysMessage("DEBUG: wp first, GUID: %u", lowguid);
 
-        QueryResult *result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z FROM creature_movement WHERE point='1' AND id = '%u'",lowguid);
+        QueryResult* result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z FROM creature_movement WHERE point='1' AND id = '%u'", lowguid);
         if (!result)
         {
             PSendSysMessage(LANG_WAYPOINT_NOTFOUND, lowguid);
@@ -3663,10 +3760,10 @@ bool ChatHandler::HandleWpShowCommand(char* args)
             return false;
         }
 
-        Player *chr = m_session->GetPlayer();
-        Map *map = chr->GetMap();
+        Player* chr = m_session->GetPlayer();
+        Map* map = chr->GetMap();
 
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         CreatureCreatePos pos(map, fields[0].GetFloat(), fields[1].GetFloat(), fields[2].GetFloat(), chr->GetOrientation(), chr->GetPhaseMaskForSpawn());
 
         Creature* pCreature = new Creature;
@@ -3682,7 +3779,7 @@ bool ChatHandler::HandleWpShowCommand(char* args)
         pCreature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn());
         pCreature->LoadFromDB(pCreature->GetGUIDLow(), map);
         map->Add(pCreature);
-        //player->PlayerTalkClass->SendPointOfInterest(x, y, 6, 6, 0, "First Waypoint");
+        // player->PlayerTalkClass->SendPointOfInterest(x, y, 6, 6, 0, "First Waypoint");
 
         // Cleanup memory
         delete result;
@@ -3693,7 +3790,7 @@ bool ChatHandler::HandleWpShowCommand(char* args)
     {
         PSendSysMessage("DEBUG: wp last, GUID: %u", lowguid);
 
-        QueryResult *result = WorldDatabase.PQuery("SELECT MAX(point) FROM creature_movement WHERE id = '%u'", lowguid);
+        QueryResult* result = WorldDatabase.PQuery("SELECT MAX(point) FROM creature_movement WHERE id = '%u'", lowguid);
         if (result)
         {
             Maxpoint = (*result)[0].GetUInt32();
@@ -3711,10 +3808,10 @@ bool ChatHandler::HandleWpShowCommand(char* args)
             return false;
         }
 
-        Player *chr = m_session->GetPlayer();
-        Map *map = chr->GetMap();
+        Player* chr = m_session->GetPlayer();
+        Map* map = chr->GetMap();
 
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         CreatureCreatePos pos(map, fields[0].GetFloat(), fields[1].GetFloat(), fields[2].GetFloat(), chr->GetOrientation(), chr->GetPhaseMaskForSpawn());
 
         Creature* pCreature = new Creature;
@@ -3730,7 +3827,7 @@ bool ChatHandler::HandleWpShowCommand(char* args)
         pCreature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn());
         pCreature->LoadFromDB(pCreature->GetGUIDLow(), map);
         map->Add(pCreature);
-        //player->PlayerTalkClass->SendPointOfInterest(x, y, 6, 6, 0, "Last Waypoint");
+        // player->PlayerTalkClass->SendPointOfInterest(x, y, 6, 6, 0, "Last Waypoint");
         // Cleanup memory
         delete result;
         return true;
@@ -3738,7 +3835,7 @@ bool ChatHandler::HandleWpShowCommand(char* args)
 
     if (show == "off")
     {
-        QueryResult *result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE id=%u", VISUAL_WAYPOINT);
+        QueryResult* result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE id=%u", VISUAL_WAYPOINT);
         if (!result)
         {
             SendSysMessage(LANG_WAYPOINT_VP_NOTFOUND);
@@ -3748,7 +3845,7 @@ bool ChatHandler::HandleWpShowCommand(char* args)
         bool hasError = false;
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 wpGuid = fields[0].GetUInt32();
             Creature* pCreature = m_session->GetPlayer()->GetMap()->GetCreature(ObjectGuid(HIGHGUID_UNIT, VISUAL_WAYPOINT, wpGuid));
             if (!pCreature)
@@ -3762,7 +3859,8 @@ bool ChatHandler::HandleWpShowCommand(char* args)
                 pCreature->DeleteFromDB();
                 pCreature->AddObjectToRemoveList();
             }
-        }while(result->NextRow());
+        }
+        while (result->NextRow());
         // set "wpguid" column to "empty" - no visual waypoint spawned
         WorldDatabase.PExecuteLog("UPDATE creature_movement SET wpguid=0 WHERE wpguid <> 0");
 
@@ -3785,7 +3883,7 @@ bool ChatHandler::HandleWpShowCommand(char* args)
     return true;
 }                                                           // HandleWpShowCommand
 
-bool ChatHandler::HandleWpExportCommand(char *args)
+bool ChatHandler::HandleWpExportCommand(char* args)
 {
     if (!*args)
         return false;
@@ -3804,13 +3902,13 @@ bool ChatHandler::HandleWpExportCommand(char *args)
             lowguid = target->GetGUIDLow();
         else
         {
-            QueryResult *result = WorldDatabase.PQuery("SELECT id FROM creature_movement WHERE wpguid = %u LIMIT 1", target->GetGUIDLow());
+            QueryResult* result = WorldDatabase.PQuery("SELECT id FROM creature_movement WHERE wpguid = %u LIMIT 1", target->GetGUIDLow());
             if (!result)
             {
                 PSendSysMessage(LANG_WAYPOINT_NOTFOUNDDBPROBLEM, target->GetGUIDLow());
                 return true;
             }
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             lowguid = fields[0].GetUInt32();;
             delete result;
         }
@@ -3839,9 +3937,9 @@ bool ChatHandler::HandleWpExportCommand(char *args)
 
     PSendSysMessage("DEBUG: wp export, GUID: %u", lowguid);
 
-    QueryResult *result = WorldDatabase.PQuery(
-    //          0      1           2           3           4            5       6       7         8      9      10       11       12       13       14       15
-        "SELECT point, position_x, position_y, position_z, orientation, model1, model2, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5, id FROM creature_movement WHERE id = '%u' ORDER BY point", lowguid);
+    QueryResult* result = WorldDatabase.PQuery(
+                              //          0      1           2           3           4            5       6       7         8      9      10       11       12       13       14       15
+                              "SELECT point, position_x, position_y, position_z, orientation, model1, model2, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5, id FROM creature_movement WHERE id = '%u' ORDER BY point", lowguid);
 
     if (!result)
     {
@@ -3851,11 +3949,11 @@ bool ChatHandler::HandleWpExportCommand(char *args)
     }
 
     std::ofstream outfile;
-    outfile.open (arg_str);
+    outfile.open(arg_str);
 
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
 
         outfile << "INSERT INTO creature_movement ";
         outfile << "(id, point, position_x, position_y, position_z, orientation, model1, model2, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5) VALUES ";
@@ -3894,7 +3992,8 @@ bool ChatHandler::HandleWpExportCommand(char *args)
         outfile << fields[14].GetUInt32();                  // textid5
         outfile << ");\n ";
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 
     PSendSysMessage(LANG_WAYPOINT_EXPORTED);
@@ -3903,7 +4002,7 @@ bool ChatHandler::HandleWpExportCommand(char *args)
     return true;
 }
 
-bool ChatHandler::HandleWpImportCommand(char *args)
+bool ChatHandler::HandleWpImportCommand(char* args)
 {
     if (!*args)
         return false;
@@ -3913,14 +4012,14 @@ bool ChatHandler::HandleWpImportCommand(char *args)
         return false;
 
     std::string line;
-    std::ifstream infile (arg_str);
+    std::ifstream infile(arg_str);
     if (infile.is_open())
     {
         while (! infile.eof())
         {
-            getline (infile,line);
-            //cout << line << endl;
-            QueryResult *result = WorldDatabase.Query(line.c_str());
+            getline(infile, line);
+            // cout << line << endl;
+            QueryResult* result = WorldDatabase.Query(line.c_str());
             delete result;
         }
         infile.close();
@@ -3930,7 +4029,7 @@ bool ChatHandler::HandleWpImportCommand(char *args)
     return true;
 }
 
-//rename characters
+// rename characters
 bool ChatHandler::HandleCharacterRenameCommand(char* args)
 {
     Player* target;
@@ -3990,6 +4089,63 @@ bool ChatHandler::HandleCharacterCustomizeCommand(char* args)
     return true;
 }
 
+// change player faction
+bool ChatHandler::HandleCharacterChangeFactionCommand(char* args)
+{
+    Player* target;
+    ObjectGuid target_guid;
+    std::string target_name;
+    if(!ExtractPlayerTarget(&args,&target,&target_guid,&target_name))
+        return false;
+
+    if(target)
+    {
+        // TODO : add text into database
+        PSendSysMessage(LANG_CUSTOMIZE_PLAYER, GetNameLink(target).c_str());
+        target->SetAtLoginFlag(AT_LOGIN_CHANGE_FACTION);
+        target->SetAtLoginFlag(AT_LOGIN_CHECK_TITLES);
+        CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '320' WHERE guid = '%u'", target->GetGUIDLow());
+    }
+    else
+    {
+        std::string oldNameLink = playerLink(target_name);
+
+        // TODO : add text into database
+        PSendSysMessage(LANG_CUSTOMIZE_PLAYER_GUID, oldNameLink.c_str(), target_guid.GetCounter());
+        CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '320' WHERE guid = '%u'", target_guid.GetCounter());
+    }
+
+    return true;
+}
+
+// change player race
+bool ChatHandler::HandleCharacterChangeRaceCommand(char* args)
+{
+    Player* target;
+    ObjectGuid target_guid;
+    std::string target_name;
+    if(!ExtractPlayerTarget(&args,&target,&target_guid,&target_name))
+        return false;
+
+    if(target)
+    {
+        // TODO : add text into database
+        PSendSysMessage(LANG_CUSTOMIZE_PLAYER, GetNameLink(target).c_str());
+        target->SetAtLoginFlag(AT_LOGIN_CHANGE_RACE);
+        CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '128' WHERE guid = '%u'", target->GetGUIDLow());
+    }
+    else
+    {
+        std::string oldNameLink = playerLink(target_name);
+
+        // TODO : add text into database
+        PSendSysMessage(LANG_CUSTOMIZE_PLAYER_GUID, oldNameLink.c_str(), target_guid.GetCounter());
+        CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '128' WHERE guid = '%u'", target_guid.GetCounter());
+    }
+
+    return true;
+}
+
 bool ChatHandler::HandleCharacterReputationCommand(char* args)
 {
     Player* target;
@@ -3999,16 +4155,16 @@ bool ChatHandler::HandleCharacterReputationCommand(char* args)
     LocaleConstant loc = GetSessionDbcLocale();
 
     FactionStateList const& targetFSL = target->GetReputationMgr().GetStateList();
-    for(FactionStateList::const_iterator itr = targetFSL.begin(); itr != targetFSL.end(); ++itr)
+    for (FactionStateList::const_iterator itr = targetFSL.begin(); itr != targetFSL.end(); ++itr)
     {
-        FactionEntry const *factionEntry = sFactionStore.LookupEntry(itr->second.ID);
+        FactionEntry const* factionEntry = sFactionStore.LookupEntry(itr->second.ID);
 
         ShowFactionListHelper(factionEntry, loc, &itr->second, target);
     }
     return true;
 }
 
-//change standstate
+// change standstate
 bool ChatHandler::HandleModifyStandStateCommand(char* args)
 {
     uint32 anim_id;
@@ -4028,7 +4184,7 @@ bool ChatHandler::HandleHonorAddCommand(char* args)
     if (!*args)
         return false;
 
-    Player *target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
     if (!target)
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -4047,7 +4203,7 @@ bool ChatHandler::HandleHonorAddCommand(char* args)
 
 bool ChatHandler::HandleHonorAddKillCommand(char* /*args*/)
 {
-    Unit *target = getSelectedUnit();
+    Unit* target = getSelectedUnit();
     if (!target)
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -4065,7 +4221,7 @@ bool ChatHandler::HandleHonorAddKillCommand(char* /*args*/)
 
 bool ChatHandler::HandleHonorUpdateCommand(char* /*args*/)
 {
-    Player *target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
     if (!target)
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -4090,7 +4246,7 @@ bool ChatHandler::HandleLookupEventCommand(char* args)
     std::wstring wnamepart;
 
     // converting string that we try to find to lower case
-    if (!Utf8toWStr(namepart,wnamepart))
+    if (!Utf8toWStr(namepart, wnamepart))
         return false;
 
     wstrToLower(wnamepart);
@@ -4099,7 +4255,7 @@ bool ChatHandler::HandleLookupEventCommand(char* args)
 
     GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap();
 
-    for(uint32 id = 1; id < events.size(); ++id)
+    for (uint32 id = 1; id < events.size(); ++id)
     {
         if (!sGameEventMgr.IsValidEvent(id))
             continue;
@@ -4123,7 +4279,7 @@ bool ChatHandler::HandleLookupEventCommand(char* args)
         }
     }
 
-    if (counter==0)
+    if (counter == 0)
         SendSysMessage(LANG_NOEVENTFOUND);
 
     return true;
@@ -4167,7 +4323,7 @@ bool ChatHandler::HandleEventListCommand(char* args)
         ++counter;
     }
 
-    if (counter==0)
+    if (counter == 0)
         SendSysMessage(LANG_NOEVENTFOUND);
 
     return true;
@@ -4200,15 +4356,15 @@ bool ChatHandler::HandleEventInfoCommand(char* args)
     std::string endTimeStr = TimeToTimestampStr(eventData.end);
 
     uint32 delay = sGameEventMgr.NextCheck(event_id);
-    time_t nextTime = time(NULL)+delay;
-    std::string nextStr = nextTime >= eventData.start && nextTime < eventData.end ? TimeToTimestampStr(time(NULL)+delay) : "-";
+    time_t nextTime = time(NULL) + delay;
+    std::string nextStr = nextTime >= eventData.start && nextTime < eventData.end ? TimeToTimestampStr(time(NULL) + delay) : "-";
 
     std::string occurenceStr = secsToTimeString(eventData.occurence * MINUTE);
     std::string lengthStr = secsToTimeString(eventData.length * MINUTE);
 
-    PSendSysMessage(LANG_EVENT_INFO,event_id,eventData.description.c_str(),activeStr,
-        startTimeStr.c_str(),endTimeStr.c_str(),occurenceStr.c_str(),lengthStr.c_str(),
-        nextStr.c_str());
+    PSendSysMessage(LANG_EVENT_INFO, event_id, eventData.description.c_str(), activeStr,
+                    startTimeStr.c_str(), endTimeStr.c_str(), occurenceStr.c_str(), lengthStr.c_str(),
+                    nextStr.c_str());
     return true;
 }
 
@@ -4241,13 +4397,13 @@ bool ChatHandler::HandleEventStartCommand(char* args)
 
     if (sGameEventMgr.IsActiveEvent(event_id))
     {
-        PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE,event_id);
+        PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE, event_id);
         SetSentErrorMessage(true);
         return false;
     }
 
     PSendSysMessage(LANG_EVENT_STARTED, event_id, eventData.description.c_str());
-    sGameEventMgr.StartEvent(event_id,true);
+    sGameEventMgr.StartEvent(event_id, true);
     return true;
 }
 
@@ -4280,13 +4436,13 @@ bool ChatHandler::HandleEventStopCommand(char* args)
 
     if (!sGameEventMgr.IsActiveEvent(event_id))
     {
-        PSendSysMessage(LANG_EVENT_NOT_ACTIVE,event_id);
+        PSendSysMessage(LANG_EVENT_NOT_ACTIVE, event_id);
         SetSentErrorMessage(true);
         return false;
     }
 
     PSendSysMessage(LANG_EVENT_STOPPED, event_id, eventData.description.c_str());
-    sGameEventMgr.StopEvent(event_id,true);
+    sGameEventMgr.StopEvent(event_id, true);
     return true;
 }
 
@@ -4305,13 +4461,13 @@ bool ChatHandler::HandleCombatStopCommand(char* args)
     return true;
 }
 
-void ChatHandler::HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id)
+void ChatHandler::HandleLearnSkillRecipesHelper(Player* player, uint32 skill_id)
 {
     uint32 classmask = player->getClassMask();
 
     for (uint32 j = 0; j < sSkillLineAbilityStore.GetNumRows(); ++j)
     {
-        SkillLineAbilityEntry const *skillLine = sSkillLineAbilityStore.LookupEntry(j);
+        SkillLineAbilityEntry const* skillLine = sSkillLineAbilityStore.LookupEntry(j);
         if (!skillLine)
             continue;
 
@@ -4332,7 +4488,7 @@ void ChatHandler::HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id)
             continue;
 
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(skillLine->spellId);
-        if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,player,false))
+        if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, player, false))
             continue;
 
         player->learnSpell(skillLine->spellId, false);
@@ -4343,14 +4499,14 @@ bool ChatHandler::HandleLearnAllCraftsCommand(char* /*args*/)
 {
     for (uint32 i = 0; i < sSkillLineStore.GetNumRows(); ++i)
     {
-        SkillLineEntry const *skillInfo = sSkillLineStore.LookupEntry(i);
+        SkillLineEntry const* skillInfo = sSkillLineStore.LookupEntry(i);
         if (!skillInfo)
             continue;
 
         if ((skillInfo->categoryId == SKILL_CATEGORY_PROFESSION || skillInfo->categoryId == SKILL_CATEGORY_SECONDARY) &&
-            skillInfo->canLink)                             // only prof. with recipes have
+                skillInfo->canLink)                         // only prof. with recipes have
         {
-            HandleLearnSkillRecipesHelper(m_session->GetPlayer(),skillInfo->id);
+            HandleLearnSkillRecipesHelper(m_session->GetPlayer(), skillInfo->id);
         }
     }
 
@@ -4383,16 +4539,16 @@ bool ChatHandler::HandleLearnAllRecipesCommand(char* args)
 
     std::string name;
 
-    SkillLineEntry const *targetSkillInfo = NULL;
+    SkillLineEntry const* targetSkillInfo = NULL;
     for (uint32 i = 1; i < sSkillLineStore.GetNumRows(); ++i)
     {
-        SkillLineEntry const *skillInfo = sSkillLineStore.LookupEntry(i);
+        SkillLineEntry const* skillInfo = sSkillLineStore.LookupEntry(i);
         if (!skillInfo)
             continue;
 
         if ((skillInfo->categoryId != SKILL_CATEGORY_PROFESSION &&
-            skillInfo->categoryId != SKILL_CATEGORY_SECONDARY) ||
-            !skillInfo->canLink)                            // only prof with recipes have set
+                skillInfo->categoryId != SKILL_CATEGORY_SECONDARY) ||
+                !skillInfo->canLink)                        // only prof with recipes have set
             continue;
 
         int loc = GetSessionDbcLocale();
@@ -4403,9 +4559,9 @@ bool ChatHandler::HandleLearnAllRecipesCommand(char* args)
         if (!Utf8FitTo(name, wnamepart))
         {
             loc = 0;
-            for(; loc < MAX_LOCALE; ++loc)
+            for (; loc < MAX_LOCALE; ++loc)
             {
-                if (loc==GetSessionDbcLocale())
+                if (loc == GetSessionDbcLocale())
                     continue;
 
                 name = skillInfo->name[loc];
@@ -4427,7 +4583,7 @@ bool ChatHandler::HandleLearnAllRecipesCommand(char* args)
     if (!targetSkillInfo)
         return false;
 
-    HandleLearnSkillRecipesHelper(target,targetSkillInfo->id);
+    HandleLearnSkillRecipesHelper(target, targetSkillInfo->id);
 
     uint16 maxLevel = target->GetPureMaxSkillValue(targetSkillInfo->id);
     target->SetSkill(targetSkillInfo->id, maxLevel, maxLevel);
@@ -4447,8 +4603,8 @@ bool ChatHandler::HandleLookupAccountEmailCommand(char* args)
 
     std::string email = emailStr;
     LoginDatabase.escape_string(email);
-    //                                                 0   1         2        3        4
-    QueryResult *result = LoginDatabase.PQuery("SELECT id, username, last_ip, gmlevel, expansion FROM account WHERE email "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), email.c_str ());
+    //                                                 0     1           2          3           4
+    QueryResult* result = LoginDatabase.PQuery("SELECT a.id, a.username, a.last_ip, aa.gmlevel, a.expansion FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE email " _LIKE_ " " _CONCAT3_ ("'%%'", "'%s'", "'%%'"), email.c_str());
 
     return ShowAccountListHelper(result, &limit);
 }
@@ -4466,10 +4622,10 @@ bool ChatHandler::HandleLookupAccountIpCommand(char* args)
     std::string ip = ipStr;
     LoginDatabase.escape_string(ip);
 
-    //                                                 0   1         2        3        4
-    QueryResult *result = LoginDatabase.PQuery("SELECT id, username, last_ip, gmlevel, expansion FROM account WHERE last_ip "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), ip.c_str ());
+    //                                                 0     1           2          3           4
+    QueryResult* result = LoginDatabase.PQuery("SELECT a.id, a.username, a.last_ip, aa.gmlevel, a.expansion FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE last_ip " _LIKE_ " " _CONCAT3_ ("'%%'", "'%s'", "'%%'"), ip.c_str());
 
-    return ShowAccountListHelper(result,&limit);
+    return ShowAccountListHelper(result, &limit);
 }
 
 bool ChatHandler::HandleLookupAccountNameCommand(char* args)
@@ -4487,8 +4643,8 @@ bool ChatHandler::HandleLookupAccountNameCommand(char* args)
         return false;
 
     LoginDatabase.escape_string(account);
-    //                                                 0   1         2        3        4
-    QueryResult *result = LoginDatabase.PQuery("SELECT id, username, last_ip, gmlevel, expansion FROM account WHERE username "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), account.c_str ());
+    //                                                 0     1           2          3           4
+    QueryResult* result = LoginDatabase.PQuery("SELECT a.id, a.username, a.last_ip, aa.gmlevel, a.expansion FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE username " _LIKE_ " " _CONCAT3_ ("'%%'", "'%s'", "'%%'"), account.c_str());
 
     return ShowAccountListHelper(result, &limit);
 }
@@ -4521,7 +4677,7 @@ bool ChatHandler::ShowAccountListHelper(QueryResult* result, uint32* limit, bool
             --*limit;
         }
 
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         uint32 account = fields[0].GetUInt32();
 
         WorldSession* session = sWorld.FindSession(account);
@@ -4530,12 +4686,13 @@ bool ChatHandler::ShowAccountListHelper(QueryResult* result, uint32* limit, bool
 
         if (m_session)
             PSendSysMessage(LANG_ACCOUNT_LIST_LINE_CHAT,
-            account,fields[1].GetString(),char_name,fields[2].GetString(),fields[3].GetUInt32(),fields[4].GetUInt32());
+                            account, fields[1].GetString(), char_name, fields[2].GetString(), fields[3].GetUInt32(), fields[4].GetUInt32());
         else
             PSendSysMessage(LANG_ACCOUNT_LIST_LINE_CONSOLE,
-            account,fields[1].GetString(),char_name,fields[2].GetString(),fields[3].GetUInt32(),fields[4].GetUInt32());
+                            account, fields[1].GetString(), char_name, fields[2].GetString(), fields[3].GetUInt32(), fields[4].GetUInt32());
 
-    }while(result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -4558,7 +4715,7 @@ bool ChatHandler::HandleLookupPlayerIpCommand(char* args)
     std::string ip = ipStr;
     LoginDatabase.escape_string(ip);
 
-    QueryResult* result = LoginDatabase.PQuery ("SELECT id,username FROM account WHERE last_ip "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), ip.c_str ());
+    QueryResult* result = LoginDatabase.PQuery("SELECT id,username FROM account WHERE last_ip " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'"), ip.c_str());
 
     return LookupPlayerSearchCommand(result, &limit);
 }
@@ -4579,7 +4736,7 @@ bool ChatHandler::HandleLookupPlayerAccountCommand(char* args)
 
     LoginDatabase.escape_string(account);
 
-    QueryResult* result = LoginDatabase.PQuery("SELECT id,username FROM account WHERE username "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), account.c_str ());
+    QueryResult* result = LoginDatabase.PQuery("SELECT id,username FROM account WHERE username " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'"), account.c_str());
 
     return LookupPlayerSearchCommand(result, &limit);
 }
@@ -4597,7 +4754,7 @@ bool ChatHandler::HandleLookupPlayerEmailCommand(char* args)
     std::string email = emailStr;
     LoginDatabase.escape_string(email);
 
-    QueryResult* result = LoginDatabase.PQuery("SELECT id,username FROM account WHERE email "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"), email.c_str ());
+    QueryResult* result = LoginDatabase.PQuery("SELECT id,username FROM account WHERE email " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'"), email.c_str());
 
     return LookupPlayerSearchCommand(result, &limit);
 }
@@ -4628,18 +4785,19 @@ bool ChatHandler::LookupPlayerSearchCommand(QueryResult* result, uint32* limit)
         std::string acc_name = fields[1].GetCppString();
 
         ///- Get the characters for account id
-        QueryResult *chars = CharacterDatabase.PQuery("SELECT guid, name, race, class, level FROM characters WHERE account = %u", acc_id);
+        QueryResult* chars = CharacterDatabase.PQuery("SELECT guid, name, race, class, level FROM characters WHERE account = %u", acc_id);
         if (chars)
         {
             if (chars->GetRowCount())
             {
-                PSendSysMessage(LANG_LOOKUP_PLAYER_ACCOUNT,acc_name.c_str(),acc_id);
-                ShowPlayerListHelper(chars,limit,true,false);
+                PSendSysMessage(LANG_LOOKUP_PLAYER_ACCOUNT, acc_name.c_str(), acc_id);
+                ShowPlayerListHelper(chars, limit, true, false);
             }
             else
                 delete chars;
         }
-    } while(result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -4658,15 +4816,15 @@ void ChatHandler::ShowPoolListHelper(uint16 pool_id)
     PoolTemplateData const& pool_template = sPoolMgr.GetPoolTemplate(pool_id);
     if (m_session)
         PSendSysMessage(LANG_POOL_ENTRY_LIST_CHAT,
-            pool_id, pool_id, pool_template.description.c_str(), pool_template.AutoSpawn ? 1 : 0, pool_template.MaxLimit,
-            sPoolMgr.GetPoolCreatures(pool_id).size(), sPoolMgr.GetPoolGameObjects(pool_id).size(), sPoolMgr.GetPoolPools(pool_id).size());
+                        pool_id, pool_id, pool_template.description.c_str(), pool_template.AutoSpawn ? 1 : 0, pool_template.MaxLimit,
+                        sPoolMgr.GetPoolCreatures(pool_id).size(), sPoolMgr.GetPoolGameObjects(pool_id).size(), sPoolMgr.GetPoolPools(pool_id).size());
     else
         PSendSysMessage(LANG_POOL_ENTRY_LIST_CONSOLE,
-            pool_id, pool_template.description.c_str(), pool_template.AutoSpawn ? 1 : 0, pool_template.MaxLimit,
-            sPoolMgr.GetPoolCreatures(pool_id).size(), sPoolMgr.GetPoolGameObjects(pool_id).size(), sPoolMgr.GetPoolPools(pool_id).size());
+                        pool_id, pool_template.description.c_str(), pool_template.AutoSpawn ? 1 : 0, pool_template.MaxLimit,
+                        sPoolMgr.GetPoolCreatures(pool_id).size(), sPoolMgr.GetPoolGameObjects(pool_id).size(), sPoolMgr.GetPoolPools(pool_id).size());
 }
 
-bool ChatHandler::HandleLookupPoolCommand(char * args)
+bool ChatHandler::HandleLookupPoolCommand(char* args)
 {
     if (!*args)
         return false;
@@ -4677,7 +4835,7 @@ bool ChatHandler::HandleLookupPoolCommand(char * args)
     uint32 counter = 0;
 
     // spawn pools for expected map or for not initialized shared pools state for non-instanceable maps
-    for(uint16 pool_id = 0; pool_id < sPoolMgr.GetMaxPoolId(); ++pool_id)
+    for (uint16 pool_id = 0; pool_id < sPoolMgr.GetMaxPoolId(); ++pool_id)
     {
         PoolTemplateData const& pool_template = sPoolMgr.GetPoolTemplate(pool_id);
 
@@ -4691,13 +4849,13 @@ bool ChatHandler::HandleLookupPoolCommand(char * args)
         ++counter;
     }
 
-    if (counter==0)
+    if (counter == 0)
         SendSysMessage(LANG_NO_POOL);
 
     return true;
 }
 
-bool ChatHandler::HandlePoolListCommand(char* args)
+bool ChatHandler::HandlePoolListCommand(char* /*args*/)
 {
     Player* player = m_session->GetPlayer();
 
@@ -4713,7 +4871,7 @@ bool ChatHandler::HandlePoolListCommand(char* args)
     uint32 counter = 0;
 
     // spawn pools for expected map or for not initialized shared pools state for non-instanceable maps
-    for(uint16 pool_id = 0; pool_id < sPoolMgr.GetMaxPoolId(); ++pool_id)
+    for (uint16 pool_id = 0; pool_id < sPoolMgr.GetMaxPoolId(); ++pool_id)
     {
         if (sPoolMgr.GetPoolTemplate(pool_id).CanBeSpawnedAtMap(mapState->GetMapEntry()))
         {
@@ -4722,7 +4880,7 @@ bool ChatHandler::HandlePoolListCommand(char* args)
         }
     }
 
-    if (counter==0)
+    if (counter == 0)
         PSendSysMessage(LANG_NO_POOL_FOR_MAP, mapState->GetMapEntry()->name[GetSessionDbcLocale()], mapState->GetMapId());
 
     return true;
@@ -4746,20 +4904,20 @@ bool ChatHandler::HandlePoolSpawnsCommand(char* args)
     SpawnedPoolData const& spawns = mapState->GetSpawnedPoolData();
 
     SpawnedPoolObjects const& crSpawns = spawns.GetSpawnedCreatures();
-    for(SpawnedPoolObjects::const_iterator itr = crSpawns.begin(); itr != crSpawns.end(); ++itr)
+    for (SpawnedPoolObjects::const_iterator itr = crSpawns.begin(); itr != crSpawns.end(); ++itr)
         if (!pool_id || pool_id == sPoolMgr.IsPartOfAPool<Creature>(*itr))
             if (CreatureData const* data = sObjectMgr.GetCreatureData(*itr))
                 if (CreatureInfo const* info = ObjectMgr::GetCreatureTemplate(data->id))
                     PSendSysMessage(LANG_CREATURE_LIST_CHAT, *itr, PrepareStringNpcOrGoSpawnInformation<Creature>(*itr).c_str(),
-                        *itr, info->Name, data->posX, data->posY, data->posZ, data->mapid);
+                                    *itr, info->Name, data->posX, data->posY, data->posZ, data->mapid);
 
     SpawnedPoolObjects const& goSpawns = spawns.GetSpawnedGameobjects();
-    for(SpawnedPoolObjects::const_iterator itr = goSpawns.begin(); itr != goSpawns.end(); ++itr)
+    for (SpawnedPoolObjects::const_iterator itr = goSpawns.begin(); itr != goSpawns.end(); ++itr)
         if (!pool_id || pool_id == sPoolMgr.IsPartOfAPool<GameObject>(*itr))
             if (GameObjectData const* data = sObjectMgr.GetGOData(*itr))
                 if (GameObjectInfo const* info = ObjectMgr::GetGameObjectInfo(data->id))
                     PSendSysMessage(LANG_GO_LIST_CHAT, *itr, PrepareStringNpcOrGoSpawnInformation<GameObject>(*itr).c_str(),
-                    *itr, info->name, data->posX, data->posY, data->posZ, data->mapid);
+                                    *itr, info->name, data->posX, data->posY, data->posZ, data->mapid);
 
     return true;
 }
@@ -4771,6 +4929,12 @@ bool ChatHandler::HandlePoolInfoCommand(char* args)
     if (!ExtractUint32KeyFromLink(&args, "Hpool", pool_id))
         return false;
 
+    if (pool_id > sPoolMgr.GetMaxPoolId())
+    {
+        PSendSysMessage(LANG_POOL_ENTRY_LOWER_MAX_POOL, pool_id, sPoolMgr.GetMaxPoolId());
+        return true;
+    }
+
     Player* player = m_session ? m_session->GetPlayer() : NULL;
 
     MapPersistentState* mapState = player ? player->GetMap()->GetPersistentState() : NULL;
@@ -4787,10 +4951,10 @@ bool ChatHandler::HandlePoolInfoCommand(char* args)
         PoolTemplateData const& mother_template = sPoolMgr.GetPoolTemplate(mother_pool_id);
         if (m_session)
             PSendSysMessage(LANG_POOL_INFO_HEADER_CHAT, pool_id, mother_pool_id, mother_pool_id, mother_template.description.c_str(),
-                pool_template.AutoSpawn, pool_template.MaxLimit);
+                            pool_template.AutoSpawn, pool_template.MaxLimit);
         else
             PSendSysMessage(LANG_POOL_INFO_HEADER_CONSOLE, pool_id, mother_pool_id, mother_template.description.c_str(),
-                pool_template.AutoSpawn, pool_template.MaxLimit);
+                            pool_template.AutoSpawn, pool_template.MaxLimit);
     }
 
     PoolGroup<Creature> const& poolCreatures = sPoolMgr.GetPoolCreatures(pool_id);
@@ -4809,10 +4973,10 @@ bool ChatHandler::HandlePoolInfoCommand(char* args)
                     char const* active = crSpawns && crSpawns->find(itr->guid) != crSpawns->end() ? active_str.c_str() : "";
                     if (m_session)
                         PSendSysMessage(LANG_POOL_CHANCE_CREATURE_LIST_CHAT, itr->guid, PrepareStringNpcOrGoSpawnInformation<Creature>(itr->guid).c_str(),
-                            itr->guid, info->Name, data->posX, data->posY, data->posZ, data->mapid, itr->chance, active);
+                                        itr->guid, info->Name, data->posX, data->posY, data->posZ, data->mapid, itr->chance, active);
                     else
                         PSendSysMessage(LANG_POOL_CHANCE_CREATURE_LIST_CONSOLE, itr->guid, PrepareStringNpcOrGoSpawnInformation<Creature>(itr->guid).c_str(),
-                            info->Name, data->posX, data->posY, data->posZ, data->mapid, itr->chance, active);
+                                        info->Name, data->posX, data->posY, data->posZ, data->mapid, itr->chance, active);
                 }
             }
         }
@@ -4831,10 +4995,10 @@ bool ChatHandler::HandlePoolInfoCommand(char* args)
                     char const* active = crSpawns && crSpawns->find(itr->guid) != crSpawns->end() ? active_str.c_str() : "";
                     if (m_session)
                         PSendSysMessage(LANG_POOL_CREATURE_LIST_CHAT, itr->guid, PrepareStringNpcOrGoSpawnInformation<Creature>(itr->guid).c_str(),
-                            itr->guid, info->Name, data->posX, data->posY, data->posZ, data->mapid, active);
+                                        itr->guid, info->Name, data->posX, data->posY, data->posZ, data->mapid, active);
                     else
                         PSendSysMessage(LANG_POOL_CREATURE_LIST_CONSOLE, itr->guid, PrepareStringNpcOrGoSpawnInformation<Creature>(itr->guid).c_str(),
-                            info->Name, data->posX, data->posY, data->posZ, data->mapid, active);
+                                        info->Name, data->posX, data->posY, data->posZ, data->mapid, active);
                 }
             }
         }
@@ -4856,10 +5020,10 @@ bool ChatHandler::HandlePoolInfoCommand(char* args)
                     char const* active = goSpawns && goSpawns->find(itr->guid) != goSpawns->end() ? active_str.c_str() : "";
                     if (m_session)
                         PSendSysMessage(LANG_POOL_CHANCE_GO_LIST_CHAT, itr->guid, PrepareStringNpcOrGoSpawnInformation<GameObject>(itr->guid).c_str(),
-                            itr->guid, info->name, data->posX, data->posY, data->posZ, data->mapid, itr->chance, active);
+                                        itr->guid, info->name, data->posX, data->posY, data->posZ, data->mapid, itr->chance, active);
                     else
                         PSendSysMessage(LANG_POOL_CHANCE_GO_LIST_CONSOLE, itr->guid, PrepareStringNpcOrGoSpawnInformation<GameObject>(itr->guid).c_str(),
-                            info->name, data->posX, data->posY, data->posZ, data->mapid, itr->chance, active);
+                                        info->name, data->posX, data->posY, data->posZ, data->mapid, itr->chance, active);
                 }
             }
         }
@@ -4878,10 +5042,10 @@ bool ChatHandler::HandlePoolInfoCommand(char* args)
                     char const* active = goSpawns && goSpawns->find(itr->guid) != goSpawns->end() ? active_str.c_str() : "";
                     if (m_session)
                         PSendSysMessage(LANG_POOL_GO_LIST_CHAT, itr->guid, PrepareStringNpcOrGoSpawnInformation<GameObject>(itr->guid).c_str(),
-                            itr->guid, info->name, data->posX, data->posY, data->posZ, data->mapid, active);
+                                        itr->guid, info->name, data->posX, data->posY, data->posZ, data->mapid, active);
                     else
                         PSendSysMessage(LANG_POOL_GO_LIST_CONSOLE, itr->guid, PrepareStringNpcOrGoSpawnInformation<GameObject>(itr->guid).c_str(),
-                            info->name, data->posX, data->posY, data->posZ, data->mapid, active);
+                                        info->name, data->posX, data->posY, data->posZ, data->mapid, active);
                 }
             }
         }
@@ -4900,14 +5064,14 @@ bool ChatHandler::HandlePoolInfoCommand(char* args)
             char const* active = poolSpawns && poolSpawns->find(itr->guid) != poolSpawns->end() ? active_str.c_str() : "";
             if (m_session)
                 PSendSysMessage(LANG_POOL_CHANCE_POOL_LIST_CHAT, itr->guid,
-                    itr->guid, itr_template.description.c_str(), itr_template.AutoSpawn ? 1 : 0, itr_template.MaxLimit,
-                    sPoolMgr.GetPoolCreatures(itr->guid).size(), sPoolMgr.GetPoolGameObjects(itr->guid).size(), sPoolMgr.GetPoolPools(itr->guid).size(),
-                    itr->chance, active);
+                                itr->guid, itr_template.description.c_str(), itr_template.AutoSpawn ? 1 : 0, itr_template.MaxLimit,
+                                sPoolMgr.GetPoolCreatures(itr->guid).size(), sPoolMgr.GetPoolGameObjects(itr->guid).size(), sPoolMgr.GetPoolPools(itr->guid).size(),
+                                itr->chance, active);
             else
                 PSendSysMessage(LANG_POOL_CHANCE_POOL_LIST_CONSOLE, itr->guid,
-                    itr_template.description.c_str(), itr_template.AutoSpawn ? 1 : 0, itr_template.MaxLimit,
-                    sPoolMgr.GetPoolCreatures(itr->guid).size(), sPoolMgr.GetPoolGameObjects(itr->guid).size(), sPoolMgr.GetPoolPools(itr->guid).size(),
-                    itr->chance, active);
+                                itr_template.description.c_str(), itr_template.AutoSpawn ? 1 : 0, itr_template.MaxLimit,
+                                sPoolMgr.GetPoolCreatures(itr->guid).size(), sPoolMgr.GetPoolGameObjects(itr->guid).size(), sPoolMgr.GetPoolPools(itr->guid).size(),
+                                itr->chance, active);
         }
     }
 
@@ -4921,14 +5085,14 @@ bool ChatHandler::HandlePoolInfoCommand(char* args)
             char const* active = poolSpawns && poolSpawns->find(itr->guid) != poolSpawns->end() ? active_str.c_str() : "";
             if (m_session)
                 PSendSysMessage(LANG_POOL_POOL_LIST_CHAT, itr->guid,
-                    itr->guid, itr_template.description.c_str(), itr_template.AutoSpawn ? 1 : 0, itr_template.MaxLimit,
-                    sPoolMgr.GetPoolCreatures(itr->guid).size(), sPoolMgr.GetPoolGameObjects(itr->guid).size(), sPoolMgr.GetPoolPools(itr->guid).size(),
-                    active);
+                                itr->guid, itr_template.description.c_str(), itr_template.AutoSpawn ? 1 : 0, itr_template.MaxLimit,
+                                sPoolMgr.GetPoolCreatures(itr->guid).size(), sPoolMgr.GetPoolGameObjects(itr->guid).size(), sPoolMgr.GetPoolPools(itr->guid).size(),
+                                active);
             else
                 PSendSysMessage(LANG_POOL_POOL_LIST_CONSOLE, itr->guid,
-                    itr_template.description.c_str(), itr_template.AutoSpawn ? 1 : 0, itr_template.MaxLimit,
-                    sPoolMgr.GetPoolCreatures(itr->guid).size(), sPoolMgr.GetPoolGameObjects(itr->guid).size(), sPoolMgr.GetPoolPools(itr->guid).size(),
-                    active);
+                                itr_template.description.c_str(), itr_template.AutoSpawn ? 1 : 0, itr_template.MaxLimit,
+                                sPoolMgr.GetPoolCreatures(itr->guid).size(), sPoolMgr.GetPoolGameObjects(itr->guid).size(), sPoolMgr.GetPoolPools(itr->guid).size(),
+                                active);
         }
     }
     return true;
@@ -4970,7 +5134,7 @@ bool ChatHandler::HandleWaterwalkCommand(char* args)
         return false;
     }
 
-    Player *player = getSelectedPlayer();
+    Player* player = getSelectedPlayer();
 
     if (!player)
     {
@@ -4984,9 +5148,9 @@ bool ChatHandler::HandleWaterwalkCommand(char* args)
         return false;
 
     if (value)
-        player->SetMovement(MOVE_WATER_WALK);               // ON
+        player->SetWaterWalk(true);                         // ON
     else
-        player->SetMovement(MOVE_LAND_WALK);                // OFF
+        player->SetWaterWalk(false);                        // OFF
 
     PSendSysMessage(LANG_YOU_SET_WATERWALK, args, GetNameLink(player).c_str());
     if (needReportToTarget(player))
@@ -5017,9 +5181,9 @@ bool ChatHandler::HandleLookupTitleCommand(char* args)
     uint32 counter = 0;                                     // Counter for figure out that we found smth.
 
     // Search in CharTitles.dbc
-    for (uint32 id = 0; id < sCharTitlesStore.GetNumRows(); id++)
+    for (uint32 id = 0; id < sCharTitlesStore.GetNumRows(); ++id)
     {
-        CharTitlesEntry const *titleInfo = sCharTitlesStore.LookupEntry(id);
+        CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(id);
         if (titleInfo)
         {
             int loc = GetSessionDbcLocale();
@@ -5030,7 +5194,7 @@ bool ChatHandler::HandleLookupTitleCommand(char* args)
             if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
-                for(; loc < MAX_LOCALE; ++loc)
+                for (; loc < MAX_LOCALE; ++loc)
                 {
                     if (loc == GetSessionDbcLocale())
                         continue;
@@ -5048,18 +5212,18 @@ bool ChatHandler::HandleLookupTitleCommand(char* args)
             {
                 char const* knownStr = target && target->HasTitle(titleInfo) ? GetMangosString(LANG_KNOWN) : "";
 
-                char const* activeStr = target && target->GetUInt32Value(PLAYER_CHOSEN_TITLE)==titleInfo->bit_index
-                    ? GetMangosString(LANG_ACTIVE)
-                    : "";
+                char const* activeStr = target && target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->bit_index
+                                        ? GetMangosString(LANG_ACTIVE)
+                                        : "";
 
                 char titleNameStr[80];
-                snprintf(titleNameStr,80,name.c_str(),targetName);
+                snprintf(titleNameStr, 80, name.c_str(), targetName);
 
                 // send title in "id (idx:idx) - [namedlink locale]" format
                 if (m_session)
-                    PSendSysMessage(LANG_TITLE_LIST_CHAT,id,titleInfo->bit_index,id,titleNameStr,localeNames[loc],knownStr,activeStr);
+                    PSendSysMessage(LANG_TITLE_LIST_CHAT, id, titleInfo->bit_index, id, titleNameStr, localeNames[loc], knownStr, activeStr);
                 else
-                    PSendSysMessage(LANG_TITLE_LIST_CONSOLE,id,titleInfo->bit_index,titleNameStr,localeNames[loc],knownStr,activeStr);
+                    PSendSysMessage(LANG_TITLE_LIST_CONSOLE, id, titleInfo->bit_index, titleNameStr, localeNames[loc], knownStr, activeStr);
 
                 ++counter;
             }
@@ -5084,7 +5248,7 @@ bool ChatHandler::HandleTitlesAddCommand(char* args)
         return false;
     }
 
-    Player * target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
     if (!target)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -5108,7 +5272,7 @@ bool ChatHandler::HandleTitlesAddCommand(char* args)
 
     char const* targetName = target->GetName();
     char titleNameStr[80];
-    snprintf(titleNameStr,80,titleInfo->name[GetSessionDbcLocale()],targetName);
+    snprintf(titleNameStr, 80, titleInfo->name[GetSessionDbcLocale()], targetName);
 
     target->SetTitle(titleInfo);
     PSendSysMessage(LANG_TITLE_ADD_RES, id, titleNameStr, tNameLink.c_str());
@@ -5130,7 +5294,7 @@ bool ChatHandler::HandleTitlesRemoveCommand(char* args)
         return false;
     }
 
-    Player * target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
     if (!target)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -5150,26 +5314,26 @@ bool ChatHandler::HandleTitlesRemoveCommand(char* args)
         return false;
     }
 
-    target->SetTitle(titleInfo,true);
+    target->SetTitle(titleInfo, true);
 
     std::string tNameLink = GetNameLink(target);
 
     char const* targetName = target->GetName();
     char titleNameStr[80];
-    snprintf(titleNameStr,80,titleInfo->name[GetSessionDbcLocale()],targetName);
+    snprintf(titleNameStr, 80, titleInfo->name[GetSessionDbcLocale()], targetName);
 
     PSendSysMessage(LANG_TITLE_REMOVE_RES, id, titleNameStr, tNameLink.c_str());
 
     if (!target->HasTitle(target->GetInt32Value(PLAYER_CHOSEN_TITLE)))
     {
-        target->SetUInt32Value(PLAYER_CHOSEN_TITLE,0);
+        target->SetUInt32Value(PLAYER_CHOSEN_TITLE, 0);
         PSendSysMessage(LANG_CURRENT_TITLE_RESET, tNameLink.c_str());
     }
 
     return true;
 }
 
-//Edit Player KnownTitles
+// Edit Player KnownTitles
 bool ChatHandler::HandleTitlesSetMaskCommand(char* args)
 {
     if (!*args)
@@ -5179,7 +5343,7 @@ bool ChatHandler::HandleTitlesSetMaskCommand(char* args)
 
     sscanf(args, UI64FMTD, &titles);
 
-    Player *target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
     if (!target)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -5193,7 +5357,7 @@ bool ChatHandler::HandleTitlesSetMaskCommand(char* args)
 
     uint64 titles2 = titles;
 
-    for(uint32 i = 1; i < sCharTitlesStore.GetNumRows(); ++i)
+    for (uint32 i = 1; i < sCharTitlesStore.GetNumRows(); ++i)
         if (CharTitlesEntry const* tEntry = sCharTitlesStore.LookupEntry(i))
             titles2 &= ~(uint64(1) << tEntry->bit_index);
 
@@ -5222,9 +5386,9 @@ bool ChatHandler::HandleCharacterTitlesCommand(char* args)
     char const* knownStr = GetMangosString(LANG_KNOWN);
 
     // Search in CharTitles.dbc
-    for (uint32 id = 0; id < sCharTitlesStore.GetNumRows(); id++)
+    for (uint32 id = 0; id < sCharTitlesStore.GetNumRows(); ++id)
     {
-        CharTitlesEntry const *titleInfo = sCharTitlesStore.LookupEntry(id);
+        CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(id);
         if (titleInfo && target->HasTitle(titleInfo))
         {
             std::string name = titleInfo->name[loc];
@@ -5232,11 +5396,11 @@ bool ChatHandler::HandleCharacterTitlesCommand(char* args)
                 continue;
 
             char const* activeStr = target && target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->bit_index
-                ? GetMangosString(LANG_ACTIVE)
-                : "";
+                                    ? GetMangosString(LANG_ACTIVE)
+                                    : "";
 
             char titleNameStr[80];
-            snprintf(titleNameStr,80,name.c_str(),targetName);
+            snprintf(titleNameStr, 80, name.c_str(), targetName);
 
             // send title in "id (idx:idx) - [namedlink locale]" format
             if (m_session)
@@ -5262,7 +5426,7 @@ bool ChatHandler::HandleTitlesCurrentCommand(char* args)
         return false;
     }
 
-    Player * target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
     if (!target)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -5285,7 +5449,7 @@ bool ChatHandler::HandleTitlesCurrentCommand(char* args)
     std::string tNameLink = GetNameLink(target);
 
     target->SetTitle(titleInfo);                            // to be sure that title now known
-    target->SetUInt32Value(PLAYER_CHOSEN_TITLE,titleInfo->bit_index);
+    target->SetUInt32Value(PLAYER_CHOSEN_TITLE, titleInfo->bit_index);
 
     PSendSysMessage(LANG_TITLE_CURRENT_RES, id, titleInfo->name[GetSessionDbcLocale()], tNameLink.c_str());
 
@@ -5314,22 +5478,31 @@ bool ChatHandler::HandleMmapPathCommand(char* args)
     char* para = strtok(args, " ");
 
     bool useStraightPath = false;
-    if (para && strcmp(para, "true") == 0)
-        useStraightPath = true;
+    bool followPath = false;
+    if (para && strcmp(para, "go") == 0)
+    {
+        followPath = true;
+        para = strtok(NULL, " ");
+        if (para && strcmp(para, "straight") == 0)
+            useStraightPath = true;
+    }
+    else
+        if (para && strcmp(para, "straight") == 0)
+            useStraightPath = true;
 
     // unit locations
     float x, y, z;
-    player->GetPosition(x, y, z);
+    target->GetPosition(x, y, z);
 
     // path
-    PathFinder path(target);
+    PathFinder path(player);
     path.setUseStrightPath(useStraightPath);
     path.calculate(x, y, z);
 
     PointsArray pointPath = path.getPath();
     PSendSysMessage("%s's path to %s:", target->GetName(), player->GetName());
     PSendSysMessage("Building %s", useStraightPath ? "StraightPath" : "SmoothPath");
-    PSendSysMessage("length %i type %u", pointPath.size(), path.getPathType());
+    PSendSysMessage("length " SIZEFMTD " type %u", pointPath.size(), path.getPathType());
 
     Vector3 start = path.getStartPosition();
     Vector3 end = path.getEndPosition();
@@ -5351,6 +5524,14 @@ bool ChatHandler::HandleMmapPathCommand(char* args)
         // TODO: make creature not sink/fall
     }
 
+    if (followPath)
+    {
+        Movement::MoveSplineInit<Unit*> init(*player);
+        init.MovebyPath(pointPath);
+        init.SetWalk(false);
+        init.Launch();
+    }
+
     return true;
 }
 
@@ -5397,10 +5578,11 @@ bool ChatHandler::HandleMmapLocCommand(char* /*args*/)
         PSendSysMessage("Dt     [??,??] (invalid poly, probably no tile loaded)");
     else
     {
-        const dtMeshTile* tile;
-        const dtPoly* poly;
+        const dtMeshTile* tile = NULL;
+        const dtPoly* poly = NULL;
         navmesh->getTileAndPolyByRef(polyRef, &tile, &poly);
-        if (tile)
+        dtStatus dtResult = navmesh->getTileAndPolyByRef(polyRef, &tile, &poly);
+        if (( dtStatusSucceed(dtResult)) && tile)
             PSendSysMessage("Dt     [%02i,%02i]", tile->header->x, tile->header->y);
         else
             PSendSysMessage("Dt     [??,??] (no tile loaded)");
@@ -5440,7 +5622,7 @@ bool ChatHandler::HandleMmapStatsCommand(char* /*args*/)
     PSendSysMessage("mmap stats:");
     PSendSysMessage("  global mmap pathfinding is %sabled", sWorld.getConfig(CONFIG_BOOL_MMAP_ENABLED) ? "en" : "dis");
 
-    MMAP::MMapManager *manager = MMAP::MMapFactory::createOrGetMMapManager();
+    MMAP::MMapManager* manager = MMAP::MMapFactory::createOrGetMMapManager();
     PSendSysMessage(" %u maps loaded with %u tiles overall", manager->getLoadedMapsCount(), manager->getLoadedTilesCount());
 
     const dtNavMesh* navmesh = manager->GetNavMesh(m_session->GetPlayer()->GetMapId());
@@ -5481,3 +5663,97 @@ bool ChatHandler::HandleMmapStatsCommand(char* /*args*/)
 
     return true;
 }
+
+bool ChatHandler::HandleWorldStateUpdateCommand(char* args)
+{
+    uint32 Id;
+    if (!ExtractUInt32(&args, Id))
+        return false;
+
+    uint32 value;
+    if (!ExtractUInt32(&args, value))
+        return false;
+
+    WorldState const* state = sWorldStateMgr.GetWorldState(Id, m_session->GetPlayer()->GetInstanceId());
+
+    if (state)
+        PSendSysMessage(LANG_WORLDSTATE_UPDATE,Id, m_session->GetPlayer()->GetInstanceId(), state->GetValue(), value);
+    else
+        PSendSysMessage(LANG_WORLDSTATE_SET,Id, m_session->GetPlayer()->GetInstanceId(), value);
+
+    m_session->GetPlayer()->UpdateWorldState(Id, value);
+    return true;
+}
+
+bool ChatHandler::HandleWorldStateCommand(char* args)
+{
+    uint32 Id;
+    if (!ExtractUInt32(&args, Id))
+    {
+        // All WS settings here
+        PSendSysMessage(LANG_WORLDSTATE_SETTINGS," This place for your ads!");
+        return true;
+    }
+
+    WorldState const* state = sWorldStateMgr.GetWorldState(Id, m_session->GetPlayer()->GetInstanceId());
+
+    if (state)
+        PSendSysMessage(LANG_WORLDSTATE_UPDATE,Id, m_session->GetPlayer()->GetInstanceId(), state->GetValue(), state->GetValue());
+    else
+        PSendSysMessage(LANG_WORLDSTATE_ERROR);
+
+    return true;
+}
+
+bool ChatHandler::HandleWorldStateListCommand(char* args)
+{
+    WorldStateSet* wsSet = sWorldStateMgr.GetWorldStatesFor(m_session->GetPlayer());
+    if (!wsSet)
+        return false;
+
+    for (uint8 i = 0; i < wsSet->count(); ++i)
+    {
+        WorldState* ws = (*wsSet)[i];
+        PSendSysMessage(LANG_WORLDSTATE_LIST, ws->GetId(), ws->GetType(), ws->GetCondition(), ws->GetInstance(), ws->GetValue());
+    }
+    delete wsSet;
+    return true;
+}
+
+bool ChatHandler::HandleWorldStateListAllCommand(char* args)
+{
+    WorldStateSet* wsSet = sWorldStateMgr.GetWorldStates(UINT32_MAX);
+    if (!wsSet)
+        return false;
+
+    for (uint8 i = 0; i < wsSet->count(); ++i)
+    {
+        WorldState* ws = (*wsSet)[i];
+        PSendSysMessage(LANG_WORLDSTATE_LIST_FULL, ws->GetId(), ws->GetType(), ws->GetCondition(), ws->GetInstance(), ws->GetValue());
+    }
+    delete wsSet;
+    return true;
+}
+
+bool ChatHandler::HandleWorldStateAddCommand(char* args)
+{
+    uint32 Id;
+    if (!ExtractUInt32(&args, Id))
+        return false;
+
+    WorldState const* state = sWorldStateMgr.GetWorldState(Id, m_session->GetPlayer()->GetInstanceId());
+
+    if (state)
+        PSendSysMessage(LANG_WORLDSTATE_UPDATE,Id, m_session->GetPlayer()->GetInstanceId(), state->GetValue(), state->GetValue());
+    else
+        PSendSysMessage(LANG_WORLDSTATE_UPDATE_FULL,Id, m_session->GetPlayer()->GetInstanceId());
+
+    return true;
+}
+
+bool ChatHandler::HandleWorldStateReloadCommand(char* args)
+{
+    sWorldStateMgr.Initialize();
+    PSendSysMessage(LANG_WORLDSTATE_RELOAD,sWorldStateMgr.GetWorldStatesCount(),sWorldStateMgr.GetWorldStateTemplatesCount());
+    return true;
+}
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index b62aad8f136..2ec14681767 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -40,22 +40,23 @@
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "Weather.h"
-#include "PointMovementGenerator.h"
 #include "PathFinder.h"
-#include "TargetedMovementGenerator.h"
-#include "SkillDiscovery.h"
-#include "SkillExtraItems.h"
+#include "movementGenerators/PointMovementGenerator.h"
+#include "movementGenerators/TargetedMovementGenerator.h"
+#include "movementGenerators/HomeMovementGenerator.h"
 #include "SystemConfig.h"
 #include "Config/Config.h"
 #include "Mail.h"
 #include "Util.h"
+#include "Transports.h"
 #include "ItemEnchantmentMgr.h"
-#include "BattleGroundMgr.h"
+#include "BattleGround/BattleGroundMgr.h"
 #include "MapPersistentStateMgr.h"
 #include "InstanceData.h"
 #include "CreatureEventAIMgr.h"
 #include "DBCEnums.h"
 #include "AuctionHouseBot/AuctionHouseBot.h"
+#include "SQLStorages.h"
 
 static uint32 ahbotQualityIds[MAX_AUCTION_QUALITY] =
 {
@@ -88,7 +89,7 @@ bool ChatHandler::HandleAHBotItemsAmountQualityCommand(char* args)
         return false;
     sAuctionBot.SetItemsAmountForQuality(AuctionQuality(Q), qVal);
     PSendSysMessage(LANG_AHBOT_ITEMS_AMOUNT, GetMangosString(ahbotQualityIds[Q]),
-        sAuctionBotConfig.getConfigItemQualityAmount(AuctionQuality(Q)));
+                    sAuctionBotConfig.getConfigItemQualityAmount(AuctionQuality(Q)));
     return true;
 }
 
@@ -143,7 +144,7 @@ bool ChatHandler::HandleAHBotRebuildCommand(char* args)
     return true;
 }
 
-bool ChatHandler::HandleAHBotReloadCommand(char* args)
+bool ChatHandler::HandleAHBotReloadCommand(char* /*args*/)
 {
     if (sAuctionBot.ReloadAllConfig())
     {
@@ -183,22 +184,22 @@ bool ChatHandler::HandleAHBotStatusCommand(char* args)
     uint32 fmtId = m_session ? LANG_AHBOT_STATUS_FORMAT_CHAT : LANG_AHBOT_STATUS_FORMAT_CONSOLE;
 
     PSendSysMessage(fmtId, GetMangosString(LANG_AHBOT_STATUS_ITEM_COUNT),
-        statusInfo[AUCTION_HOUSE_ALLIANCE].ItemsCount,
-        statusInfo[AUCTION_HOUSE_HORDE].ItemsCount,
-        statusInfo[AUCTION_HOUSE_NEUTRAL].ItemsCount,
-        statusInfo[AUCTION_HOUSE_ALLIANCE].ItemsCount +
-        statusInfo[AUCTION_HOUSE_HORDE].ItemsCount +
-        statusInfo[AUCTION_HOUSE_NEUTRAL].ItemsCount);
+                    statusInfo[AUCTION_HOUSE_ALLIANCE].ItemsCount,
+                    statusInfo[AUCTION_HOUSE_HORDE].ItemsCount,
+                    statusInfo[AUCTION_HOUSE_NEUTRAL].ItemsCount,
+                    statusInfo[AUCTION_HOUSE_ALLIANCE].ItemsCount +
+                    statusInfo[AUCTION_HOUSE_HORDE].ItemsCount +
+                    statusInfo[AUCTION_HOUSE_NEUTRAL].ItemsCount);
 
     if (all)
     {
         PSendSysMessage(fmtId, GetMangosString(LANG_AHBOT_STATUS_ITEM_RATIO),
-            sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO),
-            sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO),
-            sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO),
-            sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO) +
-            sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO) +
-            sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO));
+                        sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO),
+                        sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO),
+                        sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO),
+                        sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO) +
+                        sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO) +
+                        sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO));
 
         if (!m_session)
         {
@@ -211,10 +212,10 @@ bool ChatHandler::HandleAHBotStatusCommand(char* args)
 
         for (int i = 0; i < MAX_AUCTION_QUALITY; ++i)
             PSendSysMessage(fmtId, GetMangosString(ahbotQualityIds[i]),
-                statusInfo[AUCTION_HOUSE_ALLIANCE].QualityInfo[i],
-                statusInfo[AUCTION_HOUSE_HORDE].QualityInfo[i],
-                statusInfo[AUCTION_HOUSE_NEUTRAL].QualityInfo[i],
-                sAuctionBotConfig.getConfigItemQualityAmount(AuctionQuality(i)));
+                            statusInfo[AUCTION_HOUSE_ALLIANCE].QualityInfo[i],
+                            statusInfo[AUCTION_HOUSE_HORDE].QualityInfo[i],
+                            statusInfo[AUCTION_HOUSE_NEUTRAL].QualityInfo[i],
+                            sAuctionBotConfig.getConfigItemQualityAmount(AuctionQuality(i)));
     }
 
     if (!m_session)
@@ -223,7 +224,7 @@ bool ChatHandler::HandleAHBotStatusCommand(char* args)
     return true;
 }
 
-//reload commands
+// reload commands
 bool ChatHandler::HandleReloadAllCommand(char* /*args*/)
 {
     HandleReloadSkillFishingBaseLevelCommand((char*)"");
@@ -256,7 +257,7 @@ bool ChatHandler::HandleReloadAllAchievementCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadAllAreaCommand(char* /*args*/)
 {
-    //HandleReloadQuestAreaTriggersCommand((char*)""); -- reloaded in HandleReloadAllQuestCommand
+    // HandleReloadQuestAreaTriggersCommand((char*)""); -- reloaded in HandleReloadAllQuestCommand
     HandleReloadAreaTriggerTeleportCommand((char*)"");
     HandleReloadAreaTriggerTavernCommand((char*)"");
     HandleReloadGameGraveyardZoneCommand((char*)"");
@@ -265,16 +266,14 @@ bool ChatHandler::HandleReloadAllAreaCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadAllLootCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables..." );
+    sLog.outString("Re-Loading Loot Tables...");
     LoadLootTables();
     SendGlobalSysMessage("DB tables `*_loot_template` reloaded.");
     return true;
 }
 
-bool ChatHandler::HandleReloadAllNpcCommand(char* args)
+bool ChatHandler::HandleReloadAllNpcCommand(char* /*args*/)
 {
-    if (*args!='a')                                         // will be reloaded from all_gossips
-        HandleReloadNpcGossipCommand((char*)"a");
     HandleReloadNpcTrainerCommand((char*)"a");
     HandleReloadNpcVendorCommand((char*)"a");
     HandleReloadPointsOfInterestCommand((char*)"a");
@@ -288,7 +287,7 @@ bool ChatHandler::HandleReloadAllQuestCommand(char* /*args*/)
     HandleReloadQuestPOICommand((char*)"a");
     HandleReloadQuestTemplateCommand((char*)"a");
 
-    sLog.outString( "Re-Loading Quests Relations..." );
+    sLog.outString("Re-Loading Quests Relations...");
     sObjectMgr.LoadQuestRelations();
     SendGlobalSysMessage("DB tables `*_questrelation` and `*_involvedrelation` reloaded.");
     return true;
@@ -303,13 +302,14 @@ bool ChatHandler::HandleReloadAllScriptsCommand(char* /*args*/)
         return false;
     }
 
-    sLog.outString( "Re-Loading Scripts..." );
-    HandleReloadGameObjectScriptsCommand((char*)"a");
-    HandleReloadGossipScriptsCommand((char*)"a");
-    HandleReloadEventScriptsCommand((char*)"a");
-    HandleReloadQuestEndScriptsCommand((char*)"a");
-    HandleReloadQuestStartScriptsCommand((char*)"a");
-    HandleReloadSpellScriptsCommand((char*)"a");
+    sLog.outString("Re-Loading Scripts...");
+    HandleReloadDBScriptsOnCreatureDeathCommand((char*)"a");
+    HandleReloadDBScriptsOnGoUseCommand((char*)"a");
+    HandleReloadDBScriptsOnGossipCommand((char*)"a");
+    HandleReloadDBScriptsOnEventCommand((char*)"a");
+    HandleReloadDBScriptsOnQuestEndCommand((char*)"a");
+    HandleReloadDBScriptsOnQuestStartCommand((char*)"a");
+    HandleReloadDBScriptsOnSpellCommand((char*)"a");
     SendGlobalSysMessage("DB tables `*_scripts` reloaded.");
     HandleReloadDbScriptStringCommand((char*)"a");
     return true;
@@ -338,15 +338,16 @@ bool ChatHandler::HandleReloadAllSpellCommand(char* /*args*/)
     HandleReloadSpellTargetPositionCommand((char*)"a");
     HandleReloadSpellThreatsCommand((char*)"a");
     HandleReloadSpellPetAurasCommand((char*)"a");
+    HandleReloadSpellDisabledCommand((char*)"a");
+    HandleReloadSpellLinkedCommand((char*)"a");
     return true;
 }
 
 bool ChatHandler::HandleReloadAllGossipsCommand(char* args)
 {
-    if (*args!='a')                                         // already reload from all_scripts
-        HandleReloadGossipScriptsCommand((char*)"a");
+    if (*args != 'a')                                       // already reload from all_scripts
+        HandleReloadDBScriptsOnGossipCommand((char*)"a");
     HandleReloadGossipMenuCommand((char*)"a");
-    HandleReloadNpcGossipCommand((char*)"a");
     HandleReloadPointsOfInterestCommand((char*)"a");
     return true;
 }
@@ -376,16 +377,24 @@ bool ChatHandler::HandleReloadAllLocalesCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadConfigCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading config settings..." );
+    sLog.outString("Re-Loading config settings...");
     sWorld.LoadConfigSettings(true);
     sMapMgr.InitializeVisibilityDistanceInfo();
     SendGlobalSysMessage("World config settings reloaded.");
     return true;
 }
 
+bool ChatHandler::HandleReloadOpcodesCommand(char* /*args*/)
+{
+    sLog.outString("Re-Loading opcodes...");
+    sObjectMgr.LoadOpcodes();
+    SendGlobalSysMessage("Opcodes reloaded.");
+    return true;
+}
+
 bool ChatHandler::HandleReloadAchievementCriteriaRequirementCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Additional Achievement Criteria Requirements Data..." );
+    sLog.outString("Re-Loading Additional Achievement Criteria Requirements Data...");
     sAchievementMgr.LoadAchievementCriteriaRequirements();
     SendGlobalSysMessage("DB table `achievement_criteria_requirement` reloaded.");
     return true;
@@ -393,7 +402,7 @@ bool ChatHandler::HandleReloadAchievementCriteriaRequirementCommand(char* /*args
 
 bool ChatHandler::HandleReloadAchievementRewardCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Achievement Reward Data..." );
+    sLog.outString("Re-Loading Achievement Reward Data...");
     sAchievementMgr.LoadRewards();
     SendGlobalSysMessage("DB table `achievement_reward` reloaded.");
     return true;
@@ -401,7 +410,7 @@ bool ChatHandler::HandleReloadAchievementRewardCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadAreaTriggerTavernCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Tavern Area Triggers..." );
+    sLog.outString("Re-Loading Tavern Area Triggers...");
     sObjectMgr.LoadTavernAreaTriggers();
     SendGlobalSysMessage("DB table `areatrigger_tavern` reloaded.");
     return true;
@@ -409,7 +418,7 @@ bool ChatHandler::HandleReloadAreaTriggerTavernCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadAreaTriggerTeleportCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading AreaTrigger teleport definitions..." );
+    sLog.outString("Re-Loading AreaTrigger teleport definitions...");
     sObjectMgr.LoadAreaTriggerTeleports();
     SendGlobalSysMessage("DB table `areatrigger_teleport` reloaded.");
     return true;
@@ -424,7 +433,7 @@ bool ChatHandler::HandleReloadCommandCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(char* /*args*/)
 {
-    sLog.outString( "Loading Quests Relations... (`creature_questrelation`)" );
+    sLog.outString("Loading Quests Relations... (`creature_questrelation`)");
     sObjectMgr.LoadCreatureQuestRelations();
     SendGlobalSysMessage("DB table `creature_questrelation` (creature quest givers) reloaded.");
     return true;
@@ -432,7 +441,7 @@ bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(char* /*args*/)
 {
-    sLog.outString( "Loading Quests Relations... (`creature_involvedrelation`)" );
+    sLog.outString("Loading Quests Relations... (`creature_involvedrelation`)");
     sObjectMgr.LoadCreatureInvolvedRelations();
     SendGlobalSysMessage("DB table `creature_involvedrelation` (creature quest takers) reloaded.");
     return true;
@@ -440,7 +449,7 @@ bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadConditionsCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading `conditions`... " );
+    sLog.outString("Re-Loading `conditions`... ");
     sObjectMgr.LoadConditions();
     SendGlobalSysMessage("DB table `conditions` reloaded.");
     return true;
@@ -453,29 +462,9 @@ bool ChatHandler::HandleReloadGossipMenuCommand(char* /*args*/)
     return true;
 }
 
-bool ChatHandler::HandleReloadGossipScriptsCommand(char* args)
-{
-    if (sScriptMgr.IsScriptScheduled())
-    {
-        SendSysMessage("DB scripts used currently, please attempt reload later.");
-        SetSentErrorMessage(true);
-        return false;
-    }
-
-    if (*args!='a')
-        sLog.outString( "Re-Loading Scripts from `gossip_scripts`...");
-
-    sScriptMgr.LoadGossipScripts();
-
-    if (*args!='a')
-        SendGlobalSysMessage("DB table `gossip_scripts` reloaded.");
-
-    return true;
-}
-
 bool ChatHandler::HandleReloadGOQuestRelationsCommand(char* /*args*/)
 {
-    sLog.outString( "Loading Quests Relations... (`gameobject_questrelation`)" );
+    sLog.outString("Loading Quests Relations... (`gameobject_questrelation`)");
     sObjectMgr.LoadGameobjectQuestRelations();
     SendGlobalSysMessage("DB table `gameobject_questrelation` (gameobject quest givers) reloaded.");
     return true;
@@ -483,7 +472,7 @@ bool ChatHandler::HandleReloadGOQuestRelationsCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadGOQuestInvRelationsCommand(char* /*args*/)
 {
-    sLog.outString( "Loading Quests Relations... (`gameobject_involvedrelation`)" );
+    sLog.outString("Loading Quests Relations... (`gameobject_involvedrelation`)");
     sObjectMgr.LoadGameobjectInvolvedRelations();
     SendGlobalSysMessage("DB table `gameobject_involvedrelation` (gameobject quest takers) reloaded.");
     return true;
@@ -491,7 +480,7 @@ bool ChatHandler::HandleReloadGOQuestInvRelationsCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadQuestAreaTriggersCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Quest Area Triggers..." );
+    sLog.outString("Re-Loading Quest Area Triggers...");
     sObjectMgr.LoadQuestAreaTriggers();
     SendGlobalSysMessage("DB table `areatrigger_involvedrelation` (quest area triggers) reloaded.");
     return true;
@@ -499,12 +488,12 @@ bool ChatHandler::HandleReloadQuestAreaTriggersCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadQuestTemplateCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Quest Templates..." );
+    sLog.outString("Re-Loading Quest Templates...");
     sObjectMgr.LoadQuests();
     SendGlobalSysMessage("DB table `quest_template` (quest definitions) reloaded.");
 
     /// dependent also from `gameobject` but this table not reloaded anyway
-    sLog.outString( "Re-Loading GameObjects for quests..." );
+    sLog.outString("Re-Loading GameObjects for quests...");
     sObjectMgr.LoadGameObjectForQuests();
     SendGlobalSysMessage("Data GameObjects for quests reloaded.");
     return true;
@@ -512,7 +501,7 @@ bool ChatHandler::HandleReloadQuestTemplateCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesCreatureCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`creature_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`creature_loot_template`)");
     LoadLootTemplates_Creature();
     LootTemplates_Creature.CheckLootRefs();
     SendGlobalSysMessage("DB table `creature_loot_template` reloaded.");
@@ -521,7 +510,7 @@ bool ChatHandler::HandleReloadLootTemplatesCreatureCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesDisenchantCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`disenchant_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`disenchant_loot_template`)");
     LoadLootTemplates_Disenchant();
     LootTemplates_Disenchant.CheckLootRefs();
     SendGlobalSysMessage("DB table `disenchant_loot_template` reloaded.");
@@ -530,7 +519,7 @@ bool ChatHandler::HandleReloadLootTemplatesDisenchantCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesFishingCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`fishing_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`fishing_loot_template`)");
     LoadLootTemplates_Fishing();
     LootTemplates_Fishing.CheckLootRefs();
     SendGlobalSysMessage("DB table `fishing_loot_template` reloaded.");
@@ -539,7 +528,7 @@ bool ChatHandler::HandleReloadLootTemplatesFishingCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesGameobjectCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`gameobject_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`gameobject_loot_template`)");
     LoadLootTemplates_Gameobject();
     LootTemplates_Gameobject.CheckLootRefs();
     SendGlobalSysMessage("DB table `gameobject_loot_template` reloaded.");
@@ -548,7 +537,7 @@ bool ChatHandler::HandleReloadLootTemplatesGameobjectCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesItemCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`item_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`item_loot_template`)");
     LoadLootTemplates_Item();
     LootTemplates_Item.CheckLootRefs();
     SendGlobalSysMessage("DB table `item_loot_template` reloaded.");
@@ -557,7 +546,7 @@ bool ChatHandler::HandleReloadLootTemplatesItemCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesMillingCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`milling_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`milling_loot_template`)");
     LoadLootTemplates_Milling();
     LootTemplates_Milling.CheckLootRefs();
     SendGlobalSysMessage("DB table `milling_loot_template` reloaded.");
@@ -566,7 +555,7 @@ bool ChatHandler::HandleReloadLootTemplatesMillingCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesPickpocketingCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`pickpocketing_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`pickpocketing_loot_template`)");
     LoadLootTemplates_Pickpocketing();
     LootTemplates_Pickpocketing.CheckLootRefs();
     SendGlobalSysMessage("DB table `pickpocketing_loot_template` reloaded.");
@@ -575,7 +564,7 @@ bool ChatHandler::HandleReloadLootTemplatesPickpocketingCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesProspectingCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`prospecting_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`prospecting_loot_template`)");
     LoadLootTemplates_Prospecting();
     LootTemplates_Prospecting.CheckLootRefs();
     SendGlobalSysMessage("DB table `prospecting_loot_template` reloaded.");
@@ -584,7 +573,7 @@ bool ChatHandler::HandleReloadLootTemplatesProspectingCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesMailCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`mail_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`mail_loot_template`)");
     LoadLootTemplates_Mail();
     LootTemplates_Mail.CheckLootRefs();
     SendGlobalSysMessage("DB table `mail_loot_template` reloaded.");
@@ -593,7 +582,7 @@ bool ChatHandler::HandleReloadLootTemplatesMailCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesReferenceCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`reference_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`reference_loot_template`)");
     LoadLootTemplates_Reference();
     SendGlobalSysMessage("DB table `reference_loot_template` reloaded.");
     return true;
@@ -601,7 +590,7 @@ bool ChatHandler::HandleReloadLootTemplatesReferenceCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesSkinningCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`skinning_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`skinning_loot_template`)");
     LoadLootTemplates_Skinning();
     LootTemplates_Skinning.CheckLootRefs();
     SendGlobalSysMessage("DB table `skinning_loot_template` reloaded.");
@@ -610,7 +599,7 @@ bool ChatHandler::HandleReloadLootTemplatesSkinningCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLootTemplatesSpellCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Loot Tables... (`spell_loot_template`)" );
+    sLog.outString("Re-Loading Loot Tables... (`spell_loot_template`)");
     LoadLootTemplates_Spell();
     LootTemplates_Spell.CheckLootRefs();
     SendGlobalSysMessage("DB table `spell_loot_template` reloaded.");
@@ -619,23 +608,15 @@ bool ChatHandler::HandleReloadLootTemplatesSpellCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadMangosStringCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading mangos_string Table!" );
+    sLog.outString("Re-Loading mangos_string Table!");
     sObjectMgr.LoadMangosStrings();
     SendGlobalSysMessage("DB table `mangos_string` reloaded.");
     return true;
 }
 
-bool ChatHandler::HandleReloadNpcGossipCommand(char* /*args*/)
-{
-    sLog.outString( "Re-Loading `npc_gossip` Table!" );
-    sObjectMgr.LoadNpcGossips();
-    SendGlobalSysMessage("DB table `npc_gossip` reloaded.");
-    return true;
-}
-
 bool ChatHandler::HandleReloadNpcTextCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading `npc_text` Table!" );
+    sLog.outString("Re-Loading `npc_text` Table!");
     sObjectMgr.LoadGossipText();
     SendGlobalSysMessage("DB table `npc_text` reloaded.");
     return true;
@@ -643,11 +624,11 @@ bool ChatHandler::HandleReloadNpcTextCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadNpcTrainerCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading `npc_trainer_template` Table!" );
+    sLog.outString("Re-Loading `npc_trainer_template` Table!");
     sObjectMgr.LoadTrainerTemplates();
     SendGlobalSysMessage("DB table `npc_trainer_template` reloaded.");
 
-    sLog.outString( "Re-Loading `npc_trainer` Table!" );
+    sLog.outString("Re-Loading `npc_trainer` Table!");
     sObjectMgr.LoadTrainers();
     SendGlobalSysMessage("DB table `npc_trainer` reloaded.");
     return true;
@@ -656,11 +637,11 @@ bool ChatHandler::HandleReloadNpcTrainerCommand(char* /*args*/)
 bool ChatHandler::HandleReloadNpcVendorCommand(char* /*args*/)
 {
     // not safe reload vendor template tables independent...
-    sLog.outString( "Re-Loading `npc_vendor_template` Table!" );
+    sLog.outString("Re-Loading `npc_vendor_template` Table!");
     sObjectMgr.LoadVendorTemplates();
     SendGlobalSysMessage("DB table `npc_vendor_template` reloaded.");
 
-    sLog.outString( "Re-Loading `npc_vendor` Table!" );
+    sLog.outString("Re-Loading `npc_vendor` Table!");
     sObjectMgr.LoadVendors();
     SendGlobalSysMessage("DB table `npc_vendor` reloaded.");
     return true;
@@ -668,7 +649,7 @@ bool ChatHandler::HandleReloadNpcVendorCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadPointsOfInterestCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading `points_of_interest` Table!" );
+    sLog.outString("Re-Loading `points_of_interest` Table!");
     sObjectMgr.LoadPointsOfInterest();
     SendGlobalSysMessage("DB table `points_of_interest` reloaded.");
     return true;
@@ -676,7 +657,7 @@ bool ChatHandler::HandleReloadPointsOfInterestCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadQuestPOICommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading `quest_poi` and `quest_poi_points` Tables!" );
+    sLog.outString("Re-Loading `quest_poi` and `quest_poi_points` Tables!");
     sObjectMgr.LoadQuestPOI();
     SendGlobalSysMessage("DB Table `quest_poi` and `quest_poi_points` reloaded.");
     return true;
@@ -684,15 +665,23 @@ bool ChatHandler::HandleReloadQuestPOICommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellClickSpellsCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading `npc_spellclick_spells` Table!" );
+    sLog.outString("Re-Loading `npc_spellclick_spells` Table!");
     sObjectMgr.LoadNPCSpellClickSpells();
     SendGlobalSysMessage("DB table `npc_spellclick_spells` reloaded.");
     return true;
 }
 
+bool ChatHandler::HandleReloadSpellDbcCommand(char* /*args*/)
+{
+    sLog.outString( "Re-Loading `spell_dbc` Table!" );
+    sSpellMgr.LoadSpellDbc();
+    SendGlobalSysMessage("DB table `spell_dbc` reloaded.");
+    return true;
+}
+
 bool ChatHandler::HandleReloadReservedNameCommand(char* /*args*/)
 {
-    sLog.outString( "Loading ReservedNames... (`reserved_name`)" );
+    sLog.outString("Loading ReservedNames... (`reserved_name`)");
     sObjectMgr.LoadReservedPlayersNames();
     SendGlobalSysMessage("DB table `reserved_name` (player reserved names) reloaded.");
     return true;
@@ -700,7 +689,7 @@ bool ChatHandler::HandleReloadReservedNameCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadReputationRewardRateCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading `reputation_reward_rate` Table!" );
+    sLog.outString("Re-Loading `reputation_reward_rate` Table!");
     sObjectMgr.LoadReputationRewardRate();
     SendGlobalSysMessage("DB table `reputation_reward_rate` reloaded.");
     return true;
@@ -708,7 +697,7 @@ bool ChatHandler::HandleReloadReputationRewardRateCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadReputationSpilloverTemplateCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading `reputation_spillover_template` Table!" );
+    sLog.outString("Re-Loading `reputation_spillover_template` Table!");
     sObjectMgr.LoadReputationSpilloverTemplate();
     SendGlobalSysMessage("DB table `reputation_spillover_template` reloaded.");
     return true;
@@ -716,23 +705,23 @@ bool ChatHandler::HandleReloadReputationSpilloverTemplateCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSkillDiscoveryTemplateCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Skill Discovery Table..." );
-    LoadSkillDiscoveryTable();
+    sLog.outString("Re-Loading Skill Discovery Table...");
+    sSpellMgr.LoadSkillDiscoveryTable();
     SendGlobalSysMessage("DB table `skill_discovery_template` (recipes discovered at crafting) reloaded.");
     return true;
 }
 
 bool ChatHandler::HandleReloadSkillExtraItemTemplateCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Skill Extra Item Table..." );
-    LoadSkillExtraItemTable();
+    sLog.outString("Re-Loading Skill Extra Item Table...");
+    sSpellMgr.LoadSkillExtraItemTable();
     SendGlobalSysMessage("DB table `skill_extra_item_template` (extra item creation when crafting) reloaded.");
     return true;
 }
 
 bool ChatHandler::HandleReloadSkillFishingBaseLevelCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Skill Fishing base level requirements..." );
+    sLog.outString("Re-Loading Skill Fishing base level requirements...");
     sObjectMgr.LoadFishingBaseSkillLevel();
     SendGlobalSysMessage("DB table `skill_fishing_base_level` (fishing base level for zone/subzone) reloaded.");
     return true;
@@ -740,7 +729,7 @@ bool ChatHandler::HandleReloadSkillFishingBaseLevelCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellAreaCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading SpellArea Data..." );
+    sLog.outString("Re-Loading SpellArea Data...");
     sSpellMgr.LoadSpellAreas();
     SendGlobalSysMessage("DB table `spell_area` (spell dependences from area/quest/auras state) reloaded.");
     return true;
@@ -748,7 +737,7 @@ bool ChatHandler::HandleReloadSpellAreaCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellBonusesCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Spell Bonus Data..." );
+    sLog.outString("Re-Loading Spell Bonus Data...");
     sSpellMgr.LoadSpellBonuses();
     SendGlobalSysMessage("DB table `spell_bonus_data` (spell damage/healing coefficients) reloaded.");
     return true;
@@ -756,7 +745,7 @@ bool ChatHandler::HandleReloadSpellBonusesCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellChainCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Spell Chain Data... " );
+    sLog.outString("Re-Loading Spell Chain Data... ");
     sSpellMgr.LoadSpellChains();
     SendGlobalSysMessage("DB table `spell_chain` (spell ranks) reloaded.");
     return true;
@@ -764,7 +753,7 @@ bool ChatHandler::HandleReloadSpellChainCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellElixirCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Spell Elixir types..." );
+    sLog.outString("Re-Loading Spell Elixir types...");
     sSpellMgr.LoadSpellElixirs();
     SendGlobalSysMessage("DB table `spell_elixir` (spell elixir types) reloaded.");
     return true;
@@ -772,7 +761,7 @@ bool ChatHandler::HandleReloadSpellElixirCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellLearnSpellCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Spell Learn Spells..." );
+    sLog.outString("Re-Loading Spell Learn Spells...");
     sSpellMgr.LoadSpellLearnSpells();
     SendGlobalSysMessage("DB table `spell_learn_spell` reloaded.");
     return true;
@@ -780,7 +769,7 @@ bool ChatHandler::HandleReloadSpellLearnSpellCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellProcEventCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Spell Proc Event conditions..." );
+    sLog.outString("Re-Loading Spell Proc Event conditions...");
     sSpellMgr.LoadSpellProcEvents();
     SendGlobalSysMessage("DB table `spell_proc_event` (spell proc trigger requirements) reloaded.");
     return true;
@@ -788,7 +777,7 @@ bool ChatHandler::HandleReloadSpellProcEventCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellProcItemEnchantCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Spell Proc Item Enchant..." );
+    sLog.outString("Re-Loading Spell Proc Item Enchant...");
     sSpellMgr.LoadSpellProcItemEnchant();
     SendGlobalSysMessage("DB table `spell_proc_item_enchant` (item enchantment ppm) reloaded.");
     return true;
@@ -796,7 +785,7 @@ bool ChatHandler::HandleReloadSpellProcItemEnchantCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellScriptTargetCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading SpellsScriptTarget..." );
+    sLog.outString("Re-Loading SpellsScriptTarget...");
     sSpellMgr.LoadSpellScriptTarget();
     SendGlobalSysMessage("DB table `spell_script_target` (spell targets selection in case specific creature/GO requirements) reloaded.");
     return true;
@@ -804,7 +793,7 @@ bool ChatHandler::HandleReloadSpellScriptTargetCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellTargetPositionCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading spell target destination coordinates..." );
+    sLog.outString("Re-Loading spell target destination coordinates...");
     sSpellMgr.LoadSpellTargetPositions();
     SendGlobalSysMessage("DB table `spell_target_position` (destination coordinates for spell targets) reloaded.");
     return true;
@@ -812,7 +801,7 @@ bool ChatHandler::HandleReloadSpellTargetPositionCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellThreatsCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Aggro Spells Definitions...");
+    sLog.outString("Re-Loading Aggro Spells Definitions...");
     sSpellMgr.LoadSpellThreats();
     SendGlobalSysMessage("DB table `spell_threat` (spell aggro definitions) reloaded.");
     return true;
@@ -820,7 +809,7 @@ bool ChatHandler::HandleReloadSpellThreatsCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadSpellPetAurasCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Spell pet auras...");
+    sLog.outString("Re-Loading Spell pet auras...");
     sSpellMgr.LoadSpellPetAuras();
     SendGlobalSysMessage("DB table `spell_pet_auras` reloaded.");
     return true;
@@ -828,7 +817,7 @@ bool ChatHandler::HandleReloadSpellPetAurasCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadPageTextsCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Page Texts..." );
+    sLog.outString("Re-Loading Page Texts...");
     sObjectMgr.LoadPageTexts();
     SendGlobalSysMessage("DB table `page_texts` reloaded.");
     return true;
@@ -836,7 +825,7 @@ bool ChatHandler::HandleReloadPageTextsCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadItemEnchantementsCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Item Random Enchantments Table..." );
+    sLog.outString("Re-Loading Item Random Enchantments Table...");
     LoadRandomEnchantmentsTable();
     SendGlobalSysMessage("DB table `item_enchantment_template` reloaded.");
     return true;
@@ -844,7 +833,7 @@ bool ChatHandler::HandleReloadItemEnchantementsCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadItemConvertCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Item Converts Table..." );
+    sLog.outString("Re-Loading Item Converts Table...");
     sObjectMgr.LoadItemConverts();
     SendGlobalSysMessage("DB table `item_convert` reloaded.");
     return true;
@@ -852,7 +841,7 @@ bool ChatHandler::HandleReloadItemConvertCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadItemRequiredTragetCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Item Required Targets Table..." );
+    sLog.outString("Re-Loading Item Required Targets Table...");
     sObjectMgr.LoadItemRequiredTarget();
     SendGlobalSysMessage("DB table `item_required_target` reloaded.");
     return true;
@@ -860,13 +849,46 @@ bool ChatHandler::HandleReloadItemRequiredTragetCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadBattleEventCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading BattleGround Eventindexes..." );
+    sLog.outString("Re-Loading BattleGround Eventindexes...");
     sBattleGroundMgr.LoadBattleEventIndexes();
     SendGlobalSysMessage("DB table `gameobject_battleground` and `creature_battleground` reloaded.");
     return true;
 }
 
-bool ChatHandler::HandleReloadGameObjectScriptsCommand(char* args)
+bool ChatHandler::HandleReloadEventAITextsCommand(char* /*args*/)
+{
+
+    sLog.outString("Re-Loading Texts from `creature_ai_texts`...");
+    sEventAIMgr.LoadCreatureEventAI_Texts(true);
+    SendGlobalSysMessage("DB table `creature_ai_texts` reloaded.");
+    return true;
+}
+
+bool ChatHandler::HandleReloadEventAISummonsCommand(char* /*args*/)
+{
+    sLog.outString("Re-Loading Summons from `creature_ai_summons`...");
+    sEventAIMgr.LoadCreatureEventAI_Summons(true);
+    SendGlobalSysMessage("DB table `creature_ai_summons` reloaded.");
+    return true;
+}
+
+bool ChatHandler::HandleReloadEventAIScriptsCommand(char* /*args*/)
+{
+    sLog.outString("Re-Loading Scripts from `creature_ai_scripts`...");
+    sEventAIMgr.LoadCreatureEventAI_Scripts();
+    SendGlobalSysMessage("DB table `creature_ai_scripts` reloaded.");
+    return true;
+}
+
+bool ChatHandler::HandleReloadDbScriptStringCommand(char* /*args*/)
+{
+    sLog.outString("Re-Loading Script strings from `db_script_string`...");
+    sScriptMgr.LoadDbScriptStrings();
+    SendGlobalSysMessage("DB table `db_script_string` reloaded.");
+    return true;
+}
+
+bool ChatHandler::HandleReloadDBScriptsOnGossipCommand(char* args)
 {
     if (sScriptMgr.IsScriptScheduled())
     {
@@ -875,19 +897,18 @@ bool ChatHandler::HandleReloadGameObjectScriptsCommand(char* args)
         return false;
     }
 
-    if (*args!='a')
-        sLog.outString( "Re-Loading Scripts from `gameobject_[template]_scripts`...");
+    if (*args != 'a')
+        sLog.outString("Re-Loading Scripts from `dbscripts_on_gossip`...");
 
-    sScriptMgr.LoadGameObjectScripts();
-    sScriptMgr.LoadGameObjectTemplateScripts();
+    sScriptMgr.LoadGossipScripts();
 
-    if (*args!='a')
-        SendGlobalSysMessage("DB table `gameobject_[template]_scripts` reloaded.");
+    if (*args != 'a')
+        SendGlobalSysMessage("DB table `dbscripts_on_gossip` reloaded.");
 
     return true;
 }
 
-bool ChatHandler::HandleReloadEventScriptsCommand(char* args)
+bool ChatHandler::HandleReloadDBScriptsOnSpellCommand(char* args)
 {
     if (sScriptMgr.IsScriptScheduled())
     {
@@ -896,43 +917,38 @@ bool ChatHandler::HandleReloadEventScriptsCommand(char* args)
         return false;
     }
 
-    if (*args!='a')
-        sLog.outString( "Re-Loading Scripts from `event_scripts`...");
+    if (*args != 'a')
+        sLog.outString("Re-Loading Scripts from `dbscripts_on_spell`...");
 
-    sScriptMgr.LoadEventScripts();
+    sScriptMgr.LoadSpellScripts();
 
-    if (*args!='a')
-        SendGlobalSysMessage("DB table `event_scripts` reloaded.");
+    if (*args != 'a')
+        SendGlobalSysMessage("DB table `dbscripts_on_spell` reloaded.");
 
     return true;
 }
 
-bool ChatHandler::HandleReloadEventAITextsCommand(char* /*args*/)
+bool ChatHandler::HandleReloadDBScriptsOnQuestStartCommand(char* args)
 {
+    if (sScriptMgr.IsScriptScheduled())
+    {
+        SendSysMessage("DB scripts used currently, please attempt reload later.");
+        SetSentErrorMessage(true);
+        return false;
+    }
 
-    sLog.outString( "Re-Loading Texts from `creature_ai_texts`...");
-    sEventAIMgr.LoadCreatureEventAI_Texts(true);
-    SendGlobalSysMessage("DB table `creature_ai_texts` reloaded.");
-    return true;
-}
+    if (*args != 'a')
+        sLog.outString("Re-Loading Scripts from `dbscripts_on_quest_start`...");
 
-bool ChatHandler::HandleReloadEventAISummonsCommand(char* /*args*/)
-{
-    sLog.outString( "Re-Loading Summons from `creature_ai_summons`...");
-    sEventAIMgr.LoadCreatureEventAI_Summons(true);
-    SendGlobalSysMessage("DB table `creature_ai_summons` reloaded.");
-    return true;
-}
+    sScriptMgr.LoadQuestStartScripts();
+
+    if (*args != 'a')
+        SendGlobalSysMessage("DB table `dbscripts_on_quest_start` reloaded.");
 
-bool ChatHandler::HandleReloadEventAIScriptsCommand(char* /*args*/)
-{
-    sLog.outString( "Re-Loading Scripts from `creature_ai_scripts`...");
-    sEventAIMgr.LoadCreatureEventAI_Scripts();
-    SendGlobalSysMessage("DB table `creature_ai_scripts` reloaded.");
     return true;
 }
 
-bool ChatHandler::HandleReloadQuestEndScriptsCommand(char* args)
+bool ChatHandler::HandleReloadDBScriptsOnQuestEndCommand(char* args)
 {
     if (sScriptMgr.IsScriptScheduled())
     {
@@ -942,17 +958,17 @@ bool ChatHandler::HandleReloadQuestEndScriptsCommand(char* args)
     }
 
     if (*args != 'a')
-        sLog.outString( "Re-Loading Scripts from `quest_end_scripts`...");
+        sLog.outString("Re-Loading Scripts from `dbscripts_on_quest_end`...");
 
     sScriptMgr.LoadQuestEndScripts();
 
     if (*args != 'a')
-        SendGlobalSysMessage("DB table `quest_end_scripts` reloaded.");
+        SendGlobalSysMessage("DB table `dbscripts_on_quest_end` reloaded.");
 
     return true;
 }
 
-bool ChatHandler::HandleReloadQuestStartScriptsCommand(char* args)
+bool ChatHandler::HandleReloadDBScriptsOnEventCommand(char* args)
 {
     if (sScriptMgr.IsScriptScheduled())
     {
@@ -962,17 +978,17 @@ bool ChatHandler::HandleReloadQuestStartScriptsCommand(char* args)
     }
 
     if (*args != 'a')
-        sLog.outString( "Re-Loading Scripts from `quest_start_scripts`...");
+        sLog.outString("Re-Loading Scripts from `dbscripts_on_event`...");
 
-    sScriptMgr.LoadQuestStartScripts();
+    sScriptMgr.LoadEventScripts();
 
     if (*args != 'a')
-        SendGlobalSysMessage("DB table `quest_start_scripts` reloaded.");
+        SendGlobalSysMessage("DB table `dbscripts_on_event` reloaded.");
 
     return true;
 }
 
-bool ChatHandler::HandleReloadSpellScriptsCommand(char* args)
+bool ChatHandler::HandleReloadDBScriptsOnGoUseCommand(char* args)
 {
     if (sScriptMgr.IsScriptScheduled())
     {
@@ -982,27 +998,40 @@ bool ChatHandler::HandleReloadSpellScriptsCommand(char* args)
     }
 
     if (*args != 'a')
-        sLog.outString( "Re-Loading Scripts from `spell_scripts`...");
+        sLog.outString("Re-Loading Scripts from `dbscripts_on_go[_template]_use`...");
 
-    sScriptMgr.LoadSpellScripts();
+    sScriptMgr.LoadGameObjectScripts();
+    sScriptMgr.LoadGameObjectTemplateScripts();
 
     if (*args != 'a')
-        SendGlobalSysMessage("DB table `spell_scripts` reloaded.");
+        SendGlobalSysMessage("DB table `dbscripts_on_go[_template]_use` reloaded.");
 
     return true;
 }
 
-bool ChatHandler::HandleReloadDbScriptStringCommand(char* /*args*/)
+bool ChatHandler::HandleReloadDBScriptsOnCreatureDeathCommand(char* args)
 {
-    sLog.outString( "Re-Loading Script strings from `db_script_string`...");
-    sScriptMgr.LoadDbScriptStrings();
-    SendGlobalSysMessage("DB table `db_script_string` reloaded.");
+    if (sScriptMgr.IsScriptScheduled())
+    {
+        SendSysMessage("DB scripts used currently, please attempt reload later.");
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    if (*args != 'a')
+        sLog.outString("Re-Loading Scripts from `dbscripts_on_creature_death`...");
+
+    sScriptMgr.LoadCreatureDeathScripts();
+
+    if (*args != 'a')
+        SendGlobalSysMessage("DB table `dbscripts_on_creature_death` reloaded.");
+
     return true;
 }
 
 bool ChatHandler::HandleReloadGameGraveyardZoneCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Graveyard-zone links...");
+    sLog.outString("Re-Loading Graveyard-zone links...");
 
     sObjectMgr.LoadGraveyardZones();
 
@@ -1013,7 +1042,7 @@ bool ChatHandler::HandleReloadGameGraveyardZoneCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadGameTeleCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Game Tele coordinates...");
+    sLog.outString("Re-Loading Game Tele coordinates...");
 
     sObjectMgr.LoadGameTele();
 
@@ -1024,7 +1053,7 @@ bool ChatHandler::HandleReloadGameTeleCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLocalesAchievementRewardCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Locales Achievement Reward Data..." );
+    sLog.outString("Re-Loading Locales Achievement Reward Data...");
     sAchievementMgr.LoadRewardLocales();
     SendGlobalSysMessage("DB table `locales_achievement_reward` reloaded.");
     return true;
@@ -1032,7 +1061,7 @@ bool ChatHandler::HandleReloadLocalesAchievementRewardCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLocalesCreatureCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Locales Creature ...");
+    sLog.outString("Re-Loading Locales Creature ...");
     sObjectMgr.LoadCreatureLocales();
     SendGlobalSysMessage("DB table `locales_creature` reloaded.");
     return true;
@@ -1040,7 +1069,7 @@ bool ChatHandler::HandleReloadLocalesCreatureCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLocalesGameobjectCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Locales Gameobject ... ");
+    sLog.outString("Re-Loading Locales Gameobject ... ");
     sObjectMgr.LoadGameObjectLocales();
     SendGlobalSysMessage("DB table `locales_gameobject` reloaded.");
     return true;
@@ -1048,7 +1077,7 @@ bool ChatHandler::HandleReloadLocalesGameobjectCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLocalesGossipMenuOptionCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Locales Gossip Menu Option ... ");
+    sLog.outString("Re-Loading Locales Gossip Menu Option ... ");
     sObjectMgr.LoadGossipMenuItemsLocales();
     SendGlobalSysMessage("DB table `locales_gossip_menu_option` reloaded.");
     return true;
@@ -1056,7 +1085,7 @@ bool ChatHandler::HandleReloadLocalesGossipMenuOptionCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLocalesItemCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Locales Item ... ");
+    sLog.outString("Re-Loading Locales Item ... ");
     sObjectMgr.LoadItemLocales();
     SendGlobalSysMessage("DB table `locales_item` reloaded.");
     return true;
@@ -1064,7 +1093,7 @@ bool ChatHandler::HandleReloadLocalesItemCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLocalesNpcTextCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Locales NPC Text ... ");
+    sLog.outString("Re-Loading Locales NPC Text ... ");
     sObjectMgr.LoadGossipTextLocales();
     SendGlobalSysMessage("DB table `locales_npc_text` reloaded.");
     return true;
@@ -1072,7 +1101,7 @@ bool ChatHandler::HandleReloadLocalesNpcTextCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLocalesPageTextCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Locales Page Text ... ");
+    sLog.outString("Re-Loading Locales Page Text ... ");
     sObjectMgr.LoadPageTextLocales();
     SendGlobalSysMessage("DB table `locales_page_text` reloaded.");
     return true;
@@ -1080,7 +1109,7 @@ bool ChatHandler::HandleReloadLocalesPageTextCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLocalesPointsOfInterestCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Locales Points Of Interest ... ");
+    sLog.outString("Re-Loading Locales Points Of Interest ... ");
     sObjectMgr.LoadPointOfInterestLocales();
     SendGlobalSysMessage("DB table `locales_points_of_interest` reloaded.");
     return true;
@@ -1088,7 +1117,7 @@ bool ChatHandler::HandleReloadLocalesPointsOfInterestCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadLocalesQuestCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Locales Quest ... ");
+    sLog.outString("Re-Loading Locales Quest ... ");
     sObjectMgr.LoadQuestLocales();
     SendGlobalSysMessage("DB table `locales_quest` reloaded.");
     return true;
@@ -1096,18 +1125,58 @@ bool ChatHandler::HandleReloadLocalesQuestCommand(char* /*args*/)
 
 bool ChatHandler::HandleReloadMailLevelRewardCommand(char* /*args*/)
 {
-    sLog.outString( "Re-Loading Player level dependent mail rewards..." );
+    sLog.outString("Re-Loading Player level dependent mail rewards...");
     sObjectMgr.LoadMailLevelRewards();
     SendGlobalSysMessage("DB table `mail_level_reward` reloaded.");
     return true;
 }
 
+bool ChatHandler::HandleReloadSpellDisabledCommand(char* /*arg*/)
+{
+    sLog.outString( "Re-Loading spell disabled table...");
+
+    sObjectMgr.LoadSpellDisabledEntrys();
+
+    SendGlobalSysMessage("DB table `spell_disabled` reloaded.");
+
+    return true;
+}
+
+bool ChatHandler::HandleReloadSpellLinkedCommand(char* /*arg*/)
+{
+    sLog.outString( "Re-Loading spell linked table...");
+
+    sSpellMgr.LoadSpellLinked();
+
+    SendGlobalSysMessage("DB table `spell_linked` reloaded.");
+
+    return true;
+}
+
+bool ChatHandler::HandleReloadAntiCheatCommand(char* /*arg*/)
+{
+    sLog.outString( "Re-Loading anticheat config table...");
+
+    sObjectMgr.LoadAntiCheatConfig();
+
+    SendGlobalSysMessage("Anticheat config reloaded.");
+    return true;
+}
+
+bool ChatHandler::HandleReloadCreaturesStatsCommand(char* /*args*/)
+{
+    sLog.outString("Re-Loading stats data...");
+    sObjectMgr.LoadCreatureClassLvlStats();
+    SendGlobalSysMessage("DB table `creature_template_classlevelstats` reloaded.");
+    return true;
+}
+
 bool ChatHandler::HandleLoadScriptsCommand(char* args)
 {
     if (!*args)
         return false;
 
-    switch(sScriptMgr.LoadScriptLibrary(args))
+    switch (sScriptMgr.LoadScriptLibrary(args))
     {
         case SCRIPT_LOAD_OK:
             sWorld.SendWorldText(LANG_SCRIPTS_RELOADED_ANNOUNCE);
@@ -1145,7 +1214,9 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(char* args)
     if (!ExtractInt32(&args, gm))
         return false;
 
-    if ( gm < SEC_PLAYER || gm > SEC_ADMINISTRATOR )
+    uint32 gmRealmID = sWorld.getConfig(CONFIG_UINT32_REALMID);
+
+    if (gm < SEC_PLAYER || gm > SEC_ADMINISTRATOR)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
@@ -1154,26 +1225,48 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(char* args)
 
     /// can set security level only for target with less security and to less security that we have
     /// This will reject self apply by specify account name
-    if(HasLowerSecurityAccount(NULL,targetAccountId,true))
+    if (HasLowerSecurityAccount(NULL, targetAccountId, true))
         return false;
 
     /// account can't set security to same or grater level, need more power GM or console
     AccountTypes plSecurity = GetAccessLevel();
-    if (AccountTypes(gm) >= plSecurity )
+    if (AccountTypes(gm) >= plSecurity || (gmRealmID != sWorld.getConfig(CONFIG_UINT32_REALMID) && plSecurity < SEC_CONSOLE))
     {
         SendSysMessage(LANG_YOURS_SECURITY_IS_LOW);
         SetSentErrorMessage(true);
         return false;
     }
 
+    /*
+    // Check if provided realmID is not current realmID, or isn't -1
+    if (gmRealmID != realmID && gmRealmID != -1)
+    {
+        SendSysMessage(LANG_INVALID_REALMID);
+        SetSentErrorMessage(true);
+        return false;
+    }
+    */
+
     if (targetPlayer)
     {
-        ChatHandler(targetPlayer).PSendSysMessage(LANG_YOURS_SECURITY_CHANGED,GetNameLink().c_str(), gm);
+        ChatHandler(targetPlayer).PSendSysMessage(LANG_YOURS_SECURITY_CHANGED, GetNameLink().c_str(), gm);
         targetPlayer->GetSession()->SetSecurity(AccountTypes(gm));
     }
 
     PSendSysMessage(LANG_YOU_CHANGE_SECURITY, targetAccountName.c_str(), gm);
-    LoginDatabase.PExecute("UPDATE account SET gmlevel = '%i' WHERE id = '%u'", gm, targetAccountId);
+
+    // If gmRealmID is -1, delete all values for the account id, else, insert values for the specific realmID
+    if (int32(gmRealmID) == -1)
+    {
+        LoginDatabase.PExecute("DELETE FROM account_access WHERE id = '%u'", targetAccountId);
+        LoginDatabase.PExecute("INSERT INTO account_access VALUES ('%u', '%d', -1)", targetAccountId, gm);
+    }
+    else
+    {
+        LoginDatabase.PExecute("DELETE FROM account_access WHERE id = '%u' AND RealmID = '%d'", targetAccountId, sWorld.getConfig(CONFIG_UINT32_REALMID));
+        LoginDatabase.PExecute("INSERT INTO account_access VALUES ('%u','%d','%d')", targetAccountId, gm, sWorld.getConfig(CONFIG_UINT32_REALMID));
+    }
+    //LoginDatabase.PExecute("UPDATE account SET gmlevel = '%i' WHERE id = '%u'", gm, targetAccountId);
 
     return true;
 }
@@ -1188,32 +1281,32 @@ bool ChatHandler::HandleAccountSetPasswordCommand(char* args)
         return false;
 
     // allow or quoted string with possible spaces or literal without spaces
-    char *szPassword1 = ExtractQuotedOrLiteralArg(&args);
-    char *szPassword2 = ExtractQuotedOrLiteralArg(&args);
+    char* szPassword1 = ExtractQuotedOrLiteralArg(&args);
+    char* szPassword2 = ExtractQuotedOrLiteralArg(&args);
     if (!szPassword1 || !szPassword2)
         return false;
 
     /// can set password only for target with less security
     /// This is also reject self apply in fact
-    if(HasLowerSecurityAccount (NULL,targetAccountId,true))
+    if (HasLowerSecurityAccount(NULL, targetAccountId, true))
         return false;
 
-    if (strcmp(szPassword1,szPassword2))
+    if (strcmp(szPassword1, szPassword2))
     {
-        SendSysMessage (LANG_NEW_PASSWORDS_NOT_MATCH);
-        SetSentErrorMessage (true);
+        SendSysMessage(LANG_NEW_PASSWORDS_NOT_MATCH);
+        SetSentErrorMessage(true);
         return false;
     }
 
     AccountOpResult result = sAccountMgr.ChangePassword(targetAccountId, szPassword1);
 
-    switch(result)
+    switch (result)
     {
         case AOR_OK:
             SendSysMessage(LANG_COMMAND_PASSWORD);
             break;
         case AOR_NAME_NOT_EXIST:
-            PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
+            PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str());
             SetSentErrorMessage(true);
             return false;
         case AOR_PASS_TOO_LONG:
@@ -1228,14 +1321,14 @@ bool ChatHandler::HandleAccountSetPasswordCommand(char* args)
 
     // OK, but avoid normal report for hide passwords, but log use command for anyone
     char msg[100];
-    snprintf( msg, 100, ".account set password %s *** ***", account_name.c_str());
+    snprintf(msg, 100, ".account set password %s *** ***", account_name.c_str());
     LogCommand(msg);
     SetSentErrorMessage(true);
     return false;
 }
 
 
-void ChatHandler::ShowAchievementCriteriaListHelper(AchievementCriteriaEntry const* criEntry, AchievementEntry const * achEntry, LocaleConstant loc, Player* target /*= NULL*/)
+void ChatHandler::ShowAchievementCriteriaListHelper(AchievementCriteriaEntry const* criEntry, AchievementEntry const* achEntry, LocaleConstant loc, Player* target /*= NULL*/)
 {
     std::ostringstream ss;
     if (m_session)
@@ -1279,7 +1372,7 @@ bool ChatHandler::HandleAchievementCommand(char* args)
     if (!ExtractUint32KeyFromLink(&args, "Hachievement", achId))
         return false;
 
-    AchievementEntry const *achEntry = sAchievementStore.LookupEntry(achId);
+    AchievementEntry const* achEntry = sAchievementStore.LookupEntry(achId);
     if (!achEntry)
     {
         PSendSysMessage(LANG_ACHIEVEMENT_NOT_EXIST, achId);
@@ -1315,8 +1408,8 @@ bool ChatHandler::HandleAchievementAddCommand(char* args)
     if (!ExtractUint32KeyFromLink(&args, "Hachievement", achId))
         return false;
 
-    AchievementEntry const *achEntry = sAchievementStore.LookupEntry(achId);
-    if (!achEntry || achEntry->flags & ACHIEVEMENT_FLAG_COUNTER)
+    AchievementEntry const* achEntry = sAchievementStore.LookupEntry(achId);
+    if (!achEntry || (achEntry->flags & ACHIEVEMENT_FLAG_COUNTER))
     {
         PSendSysMessage(LANG_ACHIEVEMENT_NOT_EXIST, achId);
         SetSentErrorMessage(true);
@@ -1357,7 +1450,7 @@ bool ChatHandler::HandleAchievementRemoveCommand(char* args)
     if (!ExtractUint32KeyFromLink(&args, "Hachievement", achId))
         return false;
 
-    AchievementEntry const *achEntry = sAchievementStore.LookupEntry(achId);
+    AchievementEntry const* achEntry = sAchievementStore.LookupEntry(achId);
     if (!achEntry)
     {
         PSendSysMessage(LANG_ACHIEVEMENT_NOT_EXIST, achId);
@@ -1395,7 +1488,7 @@ bool ChatHandler::HandleAchievementCriteriaAddCommand(char* args)
     else
         target = getSelectedPlayer();
 
-    AchievementCriteriaEntry const *criEntry = sAchievementCriteriaStore.LookupEntry(criId);
+    AchievementCriteriaEntry const* criEntry = sAchievementCriteriaStore.LookupEntry(criId);
     if (!criEntry)
     {
         PSendSysMessage(LANG_ACHIEVEMENT_CRITERIA_NOT_EXIST, criId);
@@ -1403,7 +1496,7 @@ bool ChatHandler::HandleAchievementCriteriaAddCommand(char* args)
         return false;
     }
 
-    AchievementEntry const *achEntry = sAchievementStore.LookupEntry(criEntry->referredAchievement);
+    AchievementEntry const* achEntry = sAchievementStore.LookupEntry(criEntry->referredAchievement);
     if (!achEntry)
         return false;
 
@@ -1462,7 +1555,7 @@ bool ChatHandler::HandleAchievementCriteriaRemoveCommand(char* args)
     else
         target = getSelectedPlayer();
 
-    AchievementCriteriaEntry const *criEntry = sAchievementCriteriaStore.LookupEntry(criId);
+    AchievementCriteriaEntry const* criEntry = sAchievementCriteriaStore.LookupEntry(criId);
     if (!criEntry)
     {
         PSendSysMessage(LANG_ACHIEVEMENT_CRITERIA_NOT_EXIST, criId);
@@ -1470,7 +1563,7 @@ bool ChatHandler::HandleAchievementCriteriaRemoveCommand(char* args)
         return false;
     }
 
-    AchievementEntry const *achEntry = sAchievementStore.LookupEntry(criEntry->referredAchievement);
+    AchievementEntry const* achEntry = sAchievementStore.LookupEntry(criEntry->referredAchievement);
     if (!achEntry)
         return false;
 
@@ -1506,7 +1599,7 @@ bool ChatHandler::HandleAchievementCriteriaRemoveCommand(char* args)
 bool ChatHandler::HandleMaxSkillCommand(char* /*args*/)
 {
     Player* SelectedPlayer = getSelectedPlayer();
-    if(!SelectedPlayer)
+    if (!SelectedPlayer)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
         SetSentErrorMessage(true);
@@ -1520,7 +1613,7 @@ bool ChatHandler::HandleMaxSkillCommand(char* /*args*/)
 
 bool ChatHandler::HandleSetSkillCommand(char* args)
 {
-    Player * target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
     if (!target)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -1593,22 +1686,22 @@ bool ChatHandler::HandleUnLearnCommand(char* args)
         return false;
 
     Player* target = getSelectedPlayer();
-    if(!target)
+    if (!target)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
         SetSentErrorMessage(true);
         return false;
     }
 
-    if(allRanks)
-        spell_id = sSpellMgr.GetFirstSpellInChain (spell_id);
+    if (allRanks)
+        spell_id = sSpellMgr.GetFirstSpellInChain(spell_id);
 
     if (target->HasSpell(spell_id))
-        target->removeSpell(spell_id,false,!allRanks);
+        target->removeSpell(spell_id, false, !allRanks);
     else
         SendSysMessage(LANG_FORGET_SPELL);
 
-    if(GetTalentSpellCost(spell_id))
+    if (GetTalentSpellCost(spell_id))
         target->SendTalentsInfoData(false);
 
     return true;
@@ -1617,7 +1710,7 @@ bool ChatHandler::HandleUnLearnCommand(char* args)
 bool ChatHandler::HandleCooldownCommand(char* args)
 {
     Player* target = getSelectedPlayer();
-    if(!target)
+    if (!target)
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
         SetSentErrorMessage(true);
@@ -1640,20 +1733,20 @@ bool ChatHandler::HandleCooldownCommand(char* args)
 
         if (!sSpellStore.LookupEntry(spell_id))
         {
-            PSendSysMessage(LANG_UNKNOWN_SPELL, target==m_session->GetPlayer() ? GetMangosString(LANG_YOU) : tNameLink.c_str());
+            PSendSysMessage(LANG_UNKNOWN_SPELL, target == m_session->GetPlayer() ? GetMangosString(LANG_YOU) : tNameLink.c_str());
             SetSentErrorMessage(true);
             return false;
         }
 
-        target->RemoveSpellCooldown(spell_id,true);
-        PSendSysMessage(LANG_REMOVE_COOLDOWN, spell_id, target==m_session->GetPlayer() ? GetMangosString(LANG_YOU) : tNameLink.c_str());
+        target->RemoveSpellCooldown(spell_id, true);
+        PSendSysMessage(LANG_REMOVE_COOLDOWN, spell_id, target == m_session->GetPlayer() ? GetMangosString(LANG_YOU) : tNameLink.c_str());
     }
     return true;
 }
 
 bool ChatHandler::HandleLearnAllCommand(char* /*args*/)
 {
-    static const char *allSpellList[] =
+    static const char* allSpellList[] =
     {
         "3365",
         "6233",
@@ -2258,7 +2351,7 @@ bool ChatHandler::HandleLearnAllCommand(char* /*args*/)
     };
 
     int loop = 0;
-    while(strcmp(allSpellList[loop], "0"))
+    while (strcmp(allSpellList[loop], "0"))
     {
         uint32 spell = atol((char*)allSpellList[loop++]);
 
@@ -2266,9 +2359,9 @@ bool ChatHandler::HandleLearnAllCommand(char* /*args*/)
             continue;
 
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell);
-        if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
+        if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer()))
         {
-            PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell);
+            PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell);
             continue;
         }
 
@@ -2282,7 +2375,7 @@ bool ChatHandler::HandleLearnAllCommand(char* /*args*/)
 
 bool ChatHandler::HandleLearnAllGMCommand(char* /*args*/)
 {
-    static const char *gmSpellList[] =
+    static const char* gmSpellList[] =
     {
         "24347",                                            // Become A Fish, No Breath Bar
         "35132",                                            // Visual Boom
@@ -2295,20 +2388,20 @@ bool ChatHandler::HandleLearnAllGMCommand(char* /*args*/)
         "29878",                                            // Kill My Self
         "26644",                                            // More Kill
 
-        "28550",                                            //Invisible 24
-        "23452",                                            //Invisible + Target
+        "28550",                                            // Invisible 24
+        "23452",                                            // Invisible + Target
         "0"
     };
 
     uint16 gmSpellIter = 0;
-    while( strcmp(gmSpellList[gmSpellIter], "0") )
+    while (strcmp(gmSpellList[gmSpellIter], "0"))
     {
         uint32 spell = atol((char*)gmSpellList[gmSpellIter++]);
 
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell);
-        if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
+        if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer()))
         {
-            PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell);
+            PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell);
             continue;
         }
 
@@ -2329,39 +2422,39 @@ bool ChatHandler::HandleLearnAllMyClassCommand(char* /*args*/)
 bool ChatHandler::HandleLearnAllMySpellsCommand(char* /*args*/)
 {
     ChrClassesEntry const* clsEntry = sChrClassesStore.LookupEntry(m_session->GetPlayer()->getClass());
-    if(!clsEntry)
+    if (!clsEntry)
         return true;
     uint32 family = clsEntry->spellfamily;
 
     for (uint32 i = 0; i < sSkillLineAbilityStore.GetNumRows(); ++i)
     {
-        SkillLineAbilityEntry const *entry = sSkillLineAbilityStore.LookupEntry(i);
+        SkillLineAbilityEntry const* entry = sSkillLineAbilityStore.LookupEntry(i);
         if (!entry)
             continue;
 
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(entry->spellId);
-        if(!spellInfo)
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(entry->spellId);
+        if (!spellInfo)
             continue;
 
         // skip server-side/triggered spells
-        if(spellInfo->spellLevel==0)
+        if (spellInfo->spellLevel == 0)
             continue;
 
         // skip wrong class/race skills
-        if(!m_session->GetPlayer()->IsSpellFitByClassAndRace(spellInfo->Id))
+        if (!m_session->GetPlayer()->IsSpellFitByClassAndRace(spellInfo->Id))
             continue;
 
         // skip other spell families
-        if( spellInfo->SpellFamilyName != family)
+        if (spellInfo->SpellFamilyName != family)
             continue;
 
         // skip spells with first rank learned as talent (and all talents then also)
         uint32 first_rank = sSpellMgr.GetFirstSpellInChain(spellInfo->Id);
-        if(GetTalentSpellCost(first_rank) > 0 )
+        if (GetTalentSpellCost(first_rank) > 0)
             continue;
 
         // skip broken spells
-        if(!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false))
+        if (!SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer(), false))
             continue;
 
         m_session->GetPlayer()->learnSpell(spellInfo->Id, false);
@@ -2378,34 +2471,34 @@ bool ChatHandler::HandleLearnAllMyTalentsCommand(char* /*args*/)
 
     for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i)
     {
-        TalentEntry const *talentInfo = sTalentStore.LookupEntry(i);
-        if(!talentInfo)
+        TalentEntry const* talentInfo = sTalentStore.LookupEntry(i);
+        if (!talentInfo)
             continue;
 
-        TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab );
-        if(!talentTabInfo)
+        TalentTabEntry const* talentTabInfo = sTalentTabStore.LookupEntry(talentInfo->TalentTab);
+        if (!talentTabInfo)
             continue;
 
-        if( (classMask & talentTabInfo->ClassMask) == 0 )
+        if ((classMask & talentTabInfo->ClassMask) == 0)
             continue;
 
         // search highest talent rank
         uint32 spellid = 0;
 
-        for(int rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
+        for (int rank = MAX_TALENT_RANK - 1; rank >= 0; --rank)
         {
-            if(talentInfo->RankID[rank]!=0)
+            if (talentInfo->RankID[rank] != 0)
             {
                 spellid = talentInfo->RankID[rank];
                 break;
             }
         }
 
-        if(!spellid)                                        // ??? none spells in talent
+        if (!spellid)                                       // ??? none spells in talent
             continue;
 
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid);
-        if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false))
+        if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer(), false))
             continue;
 
         // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree)
@@ -2423,30 +2516,30 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(char* /*args*/)
     Player* player = m_session->GetPlayer();
 
     Pet* pet = player->GetPet();
-    if(!pet)
+    if (!pet)
     {
         SendSysMessage(LANG_NO_PET_FOUND);
         SetSentErrorMessage(true);
         return false;
     }
 
-    CreatureInfo const *ci = pet->GetCreatureInfo();
-    if(!ci)
+    CreatureInfo const* ci = pet->GetCreatureInfo();
+    if (!ci)
     {
         SendSysMessage(LANG_WRONG_PET_TYPE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    CreatureFamilyEntry const *pet_family = sCreatureFamilyStore.LookupEntry(ci->family);
-    if(!pet_family)
+    CreatureFamilyEntry const* pet_family = sCreatureFamilyStore.LookupEntry(ci->Family);
+    if (!pet_family)
     {
         SendSysMessage(LANG_WRONG_PET_TYPE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    if(pet_family->petTalentType < 0)                       // not hunter pet
+    if (pet_family->petTalentType < 0)                      // not hunter pet
     {
         SendSysMessage(LANG_WRONG_PET_TYPE);
         SetSentErrorMessage(true);
@@ -2455,35 +2548,35 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(char* /*args*/)
 
     for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i)
     {
-        TalentEntry const *talentInfo = sTalentStore.LookupEntry(i);
-        if(!talentInfo)
+        TalentEntry const* talentInfo = sTalentStore.LookupEntry(i);
+        if (!talentInfo)
             continue;
 
-        TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab );
-        if(!talentTabInfo)
+        TalentTabEntry const* talentTabInfo = sTalentTabStore.LookupEntry(talentInfo->TalentTab);
+        if (!talentTabInfo)
             continue;
 
         // prevent learn talent for different family (cheating)
-        if(((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask)==0)
+        if (((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask) == 0)
             continue;
 
         // search highest talent rank
         uint32 spellid = 0;
 
-        for(int rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
+        for (int rank = MAX_TALENT_RANK - 1; rank >= 0; --rank)
         {
-            if(talentInfo->RankID[rank]!=0)
+            if (talentInfo->RankID[rank] != 0)
             {
                 spellid = talentInfo->RankID[rank];
                 break;
             }
         }
 
-        if(!spellid)                                        // ??? none spells in talent
+        if (!spellid)                                       // ??? none spells in talent
             continue;
 
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid);
-        if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false))
+        if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer(), false))
             continue;
 
         // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree)
@@ -2499,7 +2592,7 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(char* /*args*/)
 bool ChatHandler::HandleLearnAllLangCommand(char* /*args*/)
 {
     // skipping UNIVERSAL language (0)
-    for(int i = 1; i < LANGUAGES_COUNT; ++i)
+    for (int i = 1; i < LANGUAGES_COUNT; ++i)
         m_session->GetPlayer()->learnSpell(lang_description[i].spell_id, false);
 
     SendSysMessage(LANG_COMMAND_LEARN_ALL_LANG);
@@ -2515,7 +2608,7 @@ bool ChatHandler::HandleLearnAllDefaultCommand(char* args)
     target->learnDefaultSpells();
     target->learnQuestRewardedSpells();
 
-    PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST,GetNameLink(target).c_str());
+    PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST, GetNameLink(target).c_str());
     return true;
 }
 
@@ -2523,7 +2616,7 @@ bool ChatHandler::HandleLearnCommand(char* args)
 {
     Player* targetPlayer = getSelectedPlayer();
 
-    if(!targetPlayer)
+    if (!targetPlayer)
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
         SetSentErrorMessage(true);
@@ -2540,9 +2633,9 @@ bool ChatHandler::HandleLearnCommand(char* args)
         return false;
 
     SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell);
-    if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
+    if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer()))
     {
-        PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell);
+        PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell);
         SetSentErrorMessage(true);
         return false;
     }
@@ -2552,7 +2645,7 @@ bool ChatHandler::HandleLearnCommand(char* args)
         if (targetPlayer == m_session->GetPlayer())
             SendSysMessage(LANG_YOU_KNOWN_SPELL);
         else
-            PSendSysMessage(LANG_TARGET_KNOWN_SPELL,GetNameLink(targetPlayer).c_str());
+            PSendSysMessage(LANG_TARGET_KNOWN_SPELL, GetNameLink(targetPlayer).c_str());
         SetSentErrorMessage(true);
         return false;
     }
@@ -2572,7 +2665,7 @@ bool ChatHandler::HandleLearnCommand(char* args)
 bool ChatHandler::HandleAddItemCommand(char* args)
 {
     char* cId = ExtractKeyFromLink(&args, "Hitem");
-    if(!cId)
+    if (!cId)
         return false;
 
     uint32 itemId = 0;
@@ -2580,7 +2673,7 @@ bool ChatHandler::HandleAddItemCommand(char* args)
     {
         std::string itemName = cId;
         WorldDatabase.escape_string(itemName);
-        QueryResult *result = WorldDatabase.PQuery("SELECT entry FROM item_template WHERE name = '%s'", itemName.c_str());
+        QueryResult* result = WorldDatabase.PQuery("SELECT entry FROM item_template WHERE name = '%s'", itemName.c_str());
         if (!result)
         {
             PSendSysMessage(LANG_COMMAND_COULDNOTFIND, cId);
@@ -2597,20 +2690,20 @@ bool ChatHandler::HandleAddItemCommand(char* args)
 
     Player* pl = m_session->GetPlayer();
     Player* plTarget = getSelectedPlayer();
-    if(!plTarget)
+    if (!plTarget)
         plTarget = pl;
 
     DETAIL_LOG(GetMangosString(LANG_ADDITEM), itemId, count);
 
-    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(itemId);
-    if(!pProto)
+    ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemId);
+    if (!pProto)
     {
         PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, itemId);
         SetSentErrorMessage(true);
         return false;
     }
 
-    //Subtract
+    // Subtract
     if (count < 0)
     {
         plTarget->DestroyItemCount(itemId, -count, true, false);
@@ -2618,38 +2711,38 @@ bool ChatHandler::HandleAddItemCommand(char* args)
         return true;
     }
 
-    //Adding items
+    // Adding items
     uint32 noSpaceForCount = 0;
 
     // check space and find places
     ItemPosCountVec dest;
-    uint8 msg = plTarget->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, itemId, count, &noSpaceForCount );
-    if( msg != EQUIP_ERR_OK )                               // convert to possible store amount
+    uint8 msg = plTarget->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, count, &noSpaceForCount);
+    if (msg != EQUIP_ERR_OK)                                // convert to possible store amount
         count -= noSpaceForCount;
 
-    if( count == 0 || dest.empty())                         // can't add any
+    if (count == 0 || dest.empty())                         // can't add any
     {
-        PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemId, noSpaceForCount );
+        PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemId, noSpaceForCount);
         SetSentErrorMessage(true);
         return false;
     }
 
-    Item* item = plTarget->StoreNewItem( dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId));
+    Item* item = plTarget->StoreNewItem(dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId));
 
     // remove binding (let GM give it to another player later)
-    if(pl==plTarget)
-        for(ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr)
-            if(Item* item1 = pl->GetItemByPos(itr->pos))
-                item1->SetBinding( false );
+    if (pl == plTarget)
+        for (ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr)
+            if (Item* item1 = pl->GetItemByPos(itr->pos))
+                item1->SetBinding(false);
 
-    if(count > 0 && item)
+    if (count > 0 && item)
     {
-        pl->SendNewItem(item,count,false,true);
-        if(pl!=plTarget)
-            plTarget->SendNewItem(item,count,true,false);
+        pl->SendNewItem(item, count, false, true);
+        if (pl != plTarget)
+            plTarget->SendNewItem(item, count, true, false);
     }
 
-    if(noSpaceForCount > 0)
+    if (noSpaceForCount > 0)
         PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemId, noSpaceForCount);
 
     return true;
@@ -2664,22 +2757,22 @@ bool ChatHandler::HandleAddItemSetCommand(char* args)
     // prevent generation all items with itemset field value '0'
     if (itemsetId == 0)
     {
-        PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND,itemsetId);
+        PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND, itemsetId);
         SetSentErrorMessage(true);
         return false;
     }
 
     Player* pl = m_session->GetPlayer();
     Player* plTarget = getSelectedPlayer();
-    if(!plTarget)
+    if (!plTarget)
         plTarget = pl;
 
     DETAIL_LOG(GetMangosString(LANG_ADDITEMSET), itemsetId);
 
     bool found = false;
-    for (uint32 id = 0; id < sItemStorage.MaxEntry; id++)
+    for (uint32 id = 0; id < sItemStorage.GetMaxEntry(); ++id)
     {
-        ItemPrototype const *pProto = sItemStorage.LookupEntry<ItemPrototype>(id);
+        ItemPrototype const* pProto = sItemStorage.LookupEntry<ItemPrototype>(id);
         if (!pProto)
             continue;
 
@@ -2687,22 +2780,22 @@ bool ChatHandler::HandleAddItemSetCommand(char* args)
         {
             found = true;
             ItemPosCountVec dest;
-            InventoryResult msg = plTarget->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, pProto->ItemId, 1 );
+            InventoryResult msg = plTarget->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, pProto->ItemId, 1);
             if (msg == EQUIP_ERR_OK)
             {
-                Item* item = plTarget->StoreNewItem( dest, pProto->ItemId, true);
+                Item* item = plTarget->StoreNewItem(dest, pProto->ItemId, true);
 
                 // remove binding (let GM give it to another player later)
-                if (pl==plTarget)
-                    item->SetBinding( false );
+                if (pl == plTarget)
+                    item->SetBinding(false);
 
-                pl->SendNewItem(item,1,false,true);
-                if (pl!=plTarget)
-                    plTarget->SendNewItem(item,1,true,false);
+                pl->SendNewItem(item, 1, false, true);
+                if (pl != plTarget)
+                    plTarget->SendNewItem(item, 1, true, false);
             }
             else
             {
-                pl->SendEquipError( msg, NULL, NULL, pProto->ItemId );
+                pl->SendEquipError(msg, NULL, NULL, pProto->ItemId);
                 PSendSysMessage(LANG_ITEM_CANNOT_CREATE, pProto->ItemId, 1);
             }
         }
@@ -2710,7 +2803,7 @@ bool ChatHandler::HandleAddItemSetCommand(char* args)
 
     if (!found)
     {
-        PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND,itemsetId);
+        PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND, itemsetId);
 
         SetSentErrorMessage(true);
         return false;
@@ -2733,7 +2826,7 @@ bool ChatHandler::HandleListItemCommand(char* args)
     }
 
     ItemPrototype const* itemProto = ObjectMgr::GetItemPrototype(item_id);
-    if(!itemProto)
+    if (!itemProto)
     {
         PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, item_id);
         SetSentErrorMessage(true);
@@ -2744,29 +2837,29 @@ bool ChatHandler::HandleListItemCommand(char* args)
     if (!ExtractOptUInt32(&args, count, 10))
         return false;
 
-    QueryResult *result;
+    QueryResult* result;
 
     // inventory case
     uint32 inv_count = 0;
-    result=CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM character_inventory WHERE item_template='%u'",item_id);
-    if(result)
+    result = CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM character_inventory WHERE item_template='%u'", item_id);
+    if (result)
     {
         inv_count = (*result)[0].GetUInt32();
         delete result;
     }
 
-    result=CharacterDatabase.PQuery(
-    //          0        1             2             3        4                  5
-        "SELECT ci.item, cibag.slot AS bag, ci.slot, ci.guid, characters.account,characters.name "
-        "FROM character_inventory AS ci LEFT JOIN character_inventory AS cibag ON (cibag.item=ci.bag),characters "
-        "WHERE ci.item_template='%u' AND ci.guid = characters.guid LIMIT %u ",
-        item_id,uint32(count));
+    result = CharacterDatabase.PQuery(
+                 //          0        1             2             3        4                  5
+                 "SELECT ci.item, cibag.slot AS bag, ci.slot, ci.guid, characters.account,characters.name "
+                 "FROM character_inventory AS ci LEFT JOIN character_inventory AS cibag ON (cibag.item=ci.bag),characters "
+                 "WHERE ci.item_template='%u' AND ci.guid = characters.guid LIMIT %u ",
+                 item_id, uint32(count));
 
-    if(result)
+    if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 item_guid = fields[0].GetUInt32();
             uint32 item_bag = fields[1].GetUInt32();
             uint32 item_slot = fields[2].GetUInt32();
@@ -2775,55 +2868,56 @@ bool ChatHandler::HandleListItemCommand(char* args)
             std::string owner_name = fields[5].GetCppString();
 
             char const* item_pos = 0;
-            if(Player::IsEquipmentPos(item_bag,item_slot))
+            if (Player::IsEquipmentPos(item_bag, item_slot))
                 item_pos = "[equipped]";
-            else if(Player::IsInventoryPos(item_bag,item_slot))
+            else if (Player::IsInventoryPos(item_bag, item_slot))
                 item_pos = "[in inventory]";
-            else if(Player::IsBankPos(item_bag,item_slot))
+            else if (Player::IsBankPos(item_bag, item_slot))
                 item_pos = "[in bank]";
             else
                 item_pos = "";
 
             PSendSysMessage(LANG_ITEMLIST_SLOT,
-                item_guid,owner_name.c_str(),owner_guid,owner_acc,item_pos);
-        } while (result->NextRow());
+                            item_guid, owner_name.c_str(), owner_guid, owner_acc, item_pos);
+        }
+        while (result->NextRow());
 
         uint32 res_count = uint32(result->GetRowCount());
 
         delete result;
 
-        if(count > res_count)
-            count-=res_count;
-        else if(count)
+        if (count > res_count)
+            count -= res_count;
+        else if (count)
             count = 0;
     }
 
     // mail case
     uint32 mail_count = 0;
-    result=CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM mail_items WHERE item_template='%u'", item_id);
-    if(result)
+    result = CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM mail_items WHERE item_template='%u'", item_id);
+    if (result)
     {
         mail_count = (*result)[0].GetUInt32();
         delete result;
     }
 
-    if(count > 0)
+    if (count > 0)
     {
-        result=CharacterDatabase.PQuery(
-        //          0                     1            2              3               4            5               6
-            "SELECT mail_items.item_guid, mail.sender, mail.receiver, char_s.account, char_s.name, char_r.account, char_r.name "
-            "FROM mail,mail_items,characters as char_s,characters as char_r "
-            "WHERE mail_items.item_template='%u' AND char_s.guid = mail.sender AND char_r.guid = mail.receiver AND mail.id=mail_items.mail_id LIMIT %u",
-            item_id,uint32(count));
+        result = CharacterDatabase.PQuery(
+                     //          0                     1            2              3               4            5               6
+                     "SELECT mail_items.item_guid, mail.sender, mail.receiver, char_s.account, char_s.name, char_r.account, char_r.name "
+                     "FROM mail,mail_items,characters as char_s,characters as char_r "
+                     "WHERE mail_items.item_template='%u' AND char_s.guid = mail.sender AND char_r.guid = mail.receiver AND mail.id=mail_items.mail_id LIMIT %u",
+                     item_id, uint32(count));
     }
     else
         result = NULL;
 
-    if(result)
+    if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 item_guid        = fields[0].GetUInt32();
             uint32 item_s           = fields[1].GetUInt32();
             uint32 item_r           = fields[2].GetUInt32();
@@ -2835,44 +2929,45 @@ bool ChatHandler::HandleListItemCommand(char* args)
             char const* item_pos = "[in mail]";
 
             PSendSysMessage(LANG_ITEMLIST_MAIL,
-                item_guid,item_s_name.c_str(),item_s,item_s_acc,item_r_name.c_str(),item_r,item_r_acc,item_pos);
-        } while (result->NextRow());
+                            item_guid, item_s_name.c_str(), item_s, item_s_acc, item_r_name.c_str(), item_r, item_r_acc, item_pos);
+        }
+        while (result->NextRow());
 
         uint32 res_count = uint32(result->GetRowCount());
 
         delete result;
 
-        if(count > res_count)
-            count-=res_count;
-        else if(count)
+        if (count > res_count)
+            count -= res_count;
+        else if (count)
             count = 0;
     }
 
     // auction case
     uint32 auc_count = 0;
-    result=CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM auction WHERE item_template='%u'",item_id);
-    if(result)
+    result = CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM auction WHERE item_template='%u'", item_id);
+    if (result)
     {
         auc_count = (*result)[0].GetUInt32();
         delete result;
     }
 
-    if(count > 0)
+    if (count > 0)
     {
-        result=CharacterDatabase.PQuery(
-        //           0                      1                       2                   3
-            "SELECT  auction.itemguid, auction.itemowner, characters.account, characters.name "
-            "FROM auction,characters WHERE auction.item_template='%u' AND characters.guid = auction.itemowner LIMIT %u",
-            item_id,uint32(count));
+        result = CharacterDatabase.PQuery(
+                     //           0                      1                       2                   3
+                     "SELECT  auction.itemguid, auction.itemowner, characters.account, characters.name "
+                     "FROM auction,characters WHERE auction.item_template='%u' AND characters.guid = auction.itemowner LIMIT %u",
+                     item_id, uint32(count));
     }
     else
         result = NULL;
 
-    if(result)
+    if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 item_guid       = fields[0].GetUInt32();
             uint32 owner           = fields[1].GetUInt32();
             uint32 owner_acc       = fields[2].GetUInt32();
@@ -2880,59 +2975,61 @@ bool ChatHandler::HandleListItemCommand(char* args)
 
             char const* item_pos = "[in auction]";
 
-            PSendSysMessage(LANG_ITEMLIST_AUCTION, item_guid, owner_name.c_str(), owner, owner_acc,item_pos);
-        } while (result->NextRow());
+            PSendSysMessage(LANG_ITEMLIST_AUCTION, item_guid, owner_name.c_str(), owner, owner_acc, item_pos);
+        }
+        while (result->NextRow());
 
         delete result;
     }
 
     // guild bank case
     uint32 guild_count = 0;
-    result=CharacterDatabase.PQuery("SELECT COUNT(item_entry) FROM guild_bank_item WHERE item_entry='%u'",item_id);
-    if(result)
+    result = CharacterDatabase.PQuery("SELECT COUNT(item_entry) FROM guild_bank_item WHERE item_entry='%u'", item_id);
+    if (result)
     {
         guild_count = (*result)[0].GetUInt32();
         delete result;
     }
 
-    result=CharacterDatabase.PQuery(
-        //      0             1           2
-        "SELECT gi.item_guid, gi.guildid, guild.name "
-        "FROM guild_bank_item AS gi, guild WHERE gi.item_entry='%u' AND gi.guildid = guild.guildid LIMIT %u ",
-        item_id,uint32(count));
+    result = CharacterDatabase.PQuery(
+                 //      0             1           2
+                 "SELECT gi.item_guid, gi.guildid, guild.name "
+                 "FROM guild_bank_item AS gi, guild WHERE gi.item_entry='%u' AND gi.guildid = guild.guildid LIMIT %u ",
+                 item_id, uint32(count));
 
-    if(result)
+    if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 item_guid = fields[0].GetUInt32();
             uint32 guild_guid = fields[1].GetUInt32();
             std::string guild_name = fields[2].GetCppString();
 
             char const* item_pos = "[in guild bank]";
 
-            PSendSysMessage(LANG_ITEMLIST_GUILD,item_guid,guild_name.c_str(),guild_guid,item_pos);
-        } while (result->NextRow());
+            PSendSysMessage(LANG_ITEMLIST_GUILD, item_guid, guild_name.c_str(), guild_guid, item_pos);
+        }
+        while (result->NextRow());
 
         uint32 res_count = uint32(result->GetRowCount());
 
         delete result;
 
-        if(count > res_count)
-            count-=res_count;
-        else if(count)
+        if (count > res_count)
+            count -= res_count;
+        else if (count)
             count = 0;
     }
 
-    if(inv_count+mail_count+auc_count+guild_count == 0)
+    if (inv_count + mail_count + auc_count + guild_count == 0)
     {
         SendSysMessage(LANG_COMMAND_NOITEMFOUND);
         SetSentErrorMessage(true);
         return false;
     }
 
-    PSendSysMessage(LANG_COMMAND_LISTITEMMESSAGE,item_id,inv_count+mail_count+auc_count+guild_count,inv_count,mail_count,auc_count,guild_count);
+    PSendSysMessage(LANG_COMMAND_LISTITEMMESSAGE, item_id, inv_count + mail_count + auc_count + guild_count, inv_count, mail_count, auc_count, guild_count);
 
     return true;
 }
@@ -2951,7 +3048,7 @@ bool ChatHandler::HandleListObjectCommand(char* args)
         return false;
     }
 
-    GameObjectInfo const * gInfo = ObjectMgr::GetGameObjectInfo(go_id);
+    GameObjectInfo const* gInfo = ObjectMgr::GetGameObjectInfo(go_id);
     if (!gInfo)
     {
         PSendSysMessage(LANG_COMMAND_LISTOBJINVALIDID, go_id);
@@ -2963,7 +3060,7 @@ bool ChatHandler::HandleListObjectCommand(char* args)
     if (!ExtractOptUInt32(&args, count, 10))
         return false;
 
-    QueryResult *result;
+    QueryResult* result;
 
     uint32 obj_count = 0;
     result = WorldDatabase.PQuery("SELECT COUNT(guid) FROM gameobject WHERE id='%u'", go_id);
@@ -2977,17 +3074,17 @@ bool ChatHandler::HandleListObjectCommand(char* args)
     {
         Player* pl = m_session->GetPlayer();
         result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE id = '%u' ORDER BY order_ ASC LIMIT %u",
-            pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(),go_id,uint32(count));
+                                      pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), go_id, uint32(count));
     }
     else
         result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map FROM gameobject WHERE id = '%u' LIMIT %u",
-            go_id,uint32(count));
+                                      go_id, uint32(count));
 
     if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 guid = fields[0].GetUInt32();
             float x = fields[1].GetFloat();
             float y = fields[2].GetFloat();
@@ -2998,7 +3095,8 @@ bool ChatHandler::HandleListObjectCommand(char* args)
                 PSendSysMessage(LANG_GO_LIST_CHAT, guid, PrepareStringNpcOrGoSpawnInformation<GameObject>(guid).c_str(), guid, gInfo->name, x, y, z, mapid);
             else
                 PSendSysMessage(LANG_GO_LIST_CONSOLE, guid, PrepareStringNpcOrGoSpawnInformation<GameObject>(guid).c_str(), gInfo->name, x, y, z, mapid);
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
 
         delete result;
     }
@@ -3033,10 +3131,10 @@ bool ChatHandler::HandleListCreatureCommand(char* args)
     if (!ExtractOptUInt32(&args, count, 10))
         return false;
 
-    QueryResult *result;
+    QueryResult* result;
 
     uint32 cr_count = 0;
-    result = WorldDatabase.PQuery("SELECT COUNT(guid) FROM creature WHERE id='%u'",cr_id);
+    result = WorldDatabase.PQuery("SELECT COUNT(guid) FROM creature WHERE id='%u'", cr_id);
     if (result)
     {
         cr_count = (*result)[0].GetUInt32();
@@ -3047,17 +3145,17 @@ bool ChatHandler::HandleListCreatureCommand(char* args)
     {
         Player* pl = m_session->GetPlayer();
         result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM creature WHERE id = '%u' ORDER BY order_ ASC LIMIT %u",
-            pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), cr_id,uint32(count));
+                                      pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), cr_id, uint32(count));
     }
     else
         result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map FROM creature WHERE id = '%u' LIMIT %u",
-            cr_id,uint32(count));
+                                      cr_id, uint32(count));
 
     if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 guid = fields[0].GetUInt32();
             float x = fields[1].GetFloat();
             float y = fields[2].GetFloat();
@@ -3068,7 +3166,8 @@ bool ChatHandler::HandleListCreatureCommand(char* args)
                 PSendSysMessage(LANG_CREATURE_LIST_CHAT, guid, PrepareStringNpcOrGoSpawnInformation<Creature>(guid).c_str(), guid, cInfo->Name, x, y, z, mapid);
             else
                 PSendSysMessage(LANG_CREATURE_LIST_CONSOLE, guid, PrepareStringNpcOrGoSpawnInformation<Creature>(guid).c_str(), cInfo->Name, x, y, z, mapid);
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
 
         delete result;
     }
@@ -3078,10 +3177,10 @@ bool ChatHandler::HandleListCreatureCommand(char* args)
 }
 
 
-void ChatHandler::ShowItemListHelper( uint32 itemId, int loc_idx, Player* target /*=NULL*/ )
+void ChatHandler::ShowItemListHelper(uint32 itemId, int loc_idx, Player* target /*=NULL*/)
 {
-    ItemPrototype const *itemProto = sItemStorage.LookupEntry<ItemPrototype >(itemId);
-    if(!itemProto)
+    ItemPrototype const* itemProto = sItemStorage.LookupEntry<ItemPrototype >(itemId);
+    if (!itemProto)
         return;
 
     std::string name = itemProto->Name1;
@@ -3103,14 +3202,14 @@ void ChatHandler::ShowItemListHelper( uint32 itemId, int loc_idx, Player* target
 
 bool ChatHandler::HandleLookupItemCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     std::string namepart = args;
     std::wstring wnamepart;
 
     // converting string that we try to find to lower case
-    if(!Utf8toWStr(namepart,wnamepart))
+    if (!Utf8toWStr(namepart, wnamepart))
         return false;
 
     wstrToLower(wnamepart);
@@ -3120,10 +3219,10 @@ bool ChatHandler::HandleLookupItemCommand(char* args)
     uint32 counter = 0;
 
     // Search in `item_template`
-    for (uint32 id = 0; id < sItemStorage.MaxEntry; ++id)
+    for (uint32 id = 0; id < sItemStorage.GetMaxEntry(); ++id)
     {
-        ItemPrototype const *pProto = sItemStorage.LookupEntry<ItemPrototype >(id);
-        if(!pProto)
+        ItemPrototype const* pProto = sItemStorage.LookupEntry<ItemPrototype >(id);
+        if (!pProto)
             continue;
 
         int loc_idx = GetSessionDbLocaleIndex();
@@ -3137,7 +3236,7 @@ bool ChatHandler::HandleLookupItemCommand(char* args)
         ++counter;
     }
 
-    if (counter==0)
+    if (counter == 0)
         SendSysMessage(LANG_COMMAND_NOITEMFOUND);
 
     return true;
@@ -3145,41 +3244,41 @@ bool ChatHandler::HandleLookupItemCommand(char* args)
 
 bool ChatHandler::HandleLookupItemSetCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     std::string namepart = args;
     std::wstring wnamepart;
 
-    if(!Utf8toWStr(namepart,wnamepart))
+    if (!Utf8toWStr(namepart, wnamepart))
         return false;
 
     // converting string that we try to find to lower case
-    wstrToLower( wnamepart );
+    wstrToLower(wnamepart);
 
     uint32 counter = 0;                                     // Counter for figure out that we found smth.
 
     // Search in ItemSet.dbc
-    for (uint32 id = 0; id < sItemSetStore.GetNumRows(); id++)
+    for (uint32 id = 0; id < sItemSetStore.GetNumRows(); ++id)
     {
-        ItemSetEntry const *set = sItemSetStore.LookupEntry(id);
-        if(set)
+        ItemSetEntry const* set = sItemSetStore.LookupEntry(id);
+        if (set)
         {
             int loc = GetSessionDbcLocale();
             std::string name = set->name[loc];
-            if(name.empty())
+            if (name.empty())
                 continue;
 
             if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
-                for(; loc < MAX_LOCALE; ++loc)
+                for (; loc < MAX_LOCALE; ++loc)
                 {
-                    if(loc==GetSessionDbcLocale())
+                    if (loc == GetSessionDbcLocale())
                         continue;
 
                     name = set->name[loc];
-                    if(name.empty())
+                    if (name.empty())
                         continue;
 
                     if (Utf8FitTo(name, wnamepart))
@@ -3187,13 +3286,13 @@ bool ChatHandler::HandleLookupItemSetCommand(char* args)
                 }
             }
 
-            if(loc < MAX_LOCALE)
+            if (loc < MAX_LOCALE)
             {
                 // send item set in "id - [namedlink locale]" format
                 if (m_session)
-                    PSendSysMessage(LANG_ITEMSET_LIST_CHAT,id,id,name.c_str(),localeNames[loc]);
+                    PSendSysMessage(LANG_ITEMSET_LIST_CHAT, id, id, name.c_str(), localeNames[loc]);
                 else
-                    PSendSysMessage(LANG_ITEMSET_LIST_CONSOLE,id,name.c_str(),localeNames[loc]);
+                    PSendSysMessage(LANG_ITEMSET_LIST_CONSOLE, id, name.c_str(), localeNames[loc]);
                 ++counter;
             }
         }
@@ -3205,7 +3304,7 @@ bool ChatHandler::HandleLookupItemSetCommand(char* args)
 
 bool ChatHandler::HandleLookupSkillCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     // can be NULL in console call
@@ -3214,35 +3313,35 @@ bool ChatHandler::HandleLookupSkillCommand(char* args)
     std::string namepart = args;
     std::wstring wnamepart;
 
-    if(!Utf8toWStr(namepart,wnamepart))
+    if (!Utf8toWStr(namepart, wnamepart))
         return false;
 
     // converting string that we try to find to lower case
-    wstrToLower( wnamepart );
+    wstrToLower(wnamepart);
 
     uint32 counter = 0;                                     // Counter for figure out that we found smth.
 
     // Search in SkillLine.dbc
-    for (uint32 id = 0; id < sSkillLineStore.GetNumRows(); id++)
+    for (uint32 id = 0; id < sSkillLineStore.GetNumRows(); ++id)
     {
-        SkillLineEntry const *skillInfo = sSkillLineStore.LookupEntry(id);
-        if(skillInfo)
+        SkillLineEntry const* skillInfo = sSkillLineStore.LookupEntry(id);
+        if (skillInfo)
         {
             int loc = GetSessionDbcLocale();
             std::string name = skillInfo->name[loc];
-            if(name.empty())
+            if (name.empty())
                 continue;
 
             if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
-                for(; loc < MAX_LOCALE; ++loc)
+                for (; loc < MAX_LOCALE; ++loc)
                 {
-                    if(loc==GetSessionDbcLocale())
+                    if (loc == GetSessionDbcLocale())
                         continue;
 
                     name = skillInfo->name[loc];
-                    if(name.empty())
+                    if (name.empty())
                         continue;
 
                     if (Utf8FitTo(name, wnamepart))
@@ -3250,11 +3349,11 @@ bool ChatHandler::HandleLookupSkillCommand(char* args)
                 }
             }
 
-            if(loc < MAX_LOCALE)
+            if (loc < MAX_LOCALE)
             {
                 char valStr[50] = "";
                 char const* knownStr = "";
-                if(target && target->HasSkill(id))
+                if (target && target->HasSkill(id))
                 {
                     knownStr = GetMangosString(LANG_KNOWN);
                     uint32 curValue = target->GetPureSkillValue(id);
@@ -3263,14 +3362,14 @@ bool ChatHandler::HandleLookupSkillCommand(char* args)
                     uint32 tempValue = target->GetSkillTempBonusValue(id);
 
                     char const* valFormat = GetMangosString(LANG_SKILL_VALUES);
-                    snprintf(valStr,50,valFormat,curValue,maxValue,permValue,tempValue);
+                    snprintf(valStr, 50, valFormat, curValue, maxValue, permValue, tempValue);
                 }
 
                 // send skill in "id - [namedlink locale]" format
                 if (m_session)
-                    PSendSysMessage(LANG_SKILL_LIST_CHAT,id,id,name.c_str(),localeNames[loc],knownStr,valStr);
+                    PSendSysMessage(LANG_SKILL_LIST_CHAT, id, id, name.c_str(), localeNames[loc], knownStr, valStr);
                 else
-                    PSendSysMessage(LANG_SKILL_LIST_CONSOLE,id,name.c_str(),localeNames[loc],knownStr,valStr);
+                    PSendSysMessage(LANG_SKILL_LIST_CONSOLE, id, name.c_str(), localeNames[loc], knownStr, valStr);
 
                 ++counter;
             }
@@ -3306,7 +3405,7 @@ void ChatHandler::ShowSpellListHelper(Player* target, SpellEntry const* spellInf
         ss << id << " - " << spellInfo->SpellName[loc];
 
     // include rank in link name
-    if(rank)
+    if (rank)
         ss << GetMangosString(LANG_SPELL_RANK) << rank;
 
     if (m_session)
@@ -3314,15 +3413,15 @@ void ChatHandler::ShowSpellListHelper(Player* target, SpellEntry const* spellInf
     else
         ss << " " << localeNames[loc];
 
-    if(talent)
+    if (talent)
         ss << GetMangosString(LANG_TALENT);
-    if(passive)
+    if (passive)
         ss << GetMangosString(LANG_PASSIVE);
-    if(learn)
+    if (learn)
         ss << GetMangosString(LANG_LEARN);
-    if(known)
+    if (known)
         ss << GetMangosString(LANG_KNOWN);
-    if(active)
+    if (active)
         ss << GetMangosString(LANG_ACTIVE);
 
     SendSysMessage(ss.str().c_str());
@@ -3330,7 +3429,7 @@ void ChatHandler::ShowSpellListHelper(Player* target, SpellEntry const* spellInf
 
 bool ChatHandler::HandleLookupSpellCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     // can be NULL at console call
@@ -3339,35 +3438,35 @@ bool ChatHandler::HandleLookupSpellCommand(char* args)
     std::string namepart = args;
     std::wstring wnamepart;
 
-    if(!Utf8toWStr(namepart,wnamepart))
+    if (!Utf8toWStr(namepart, wnamepart))
         return false;
 
     // converting string that we try to find to lower case
-    wstrToLower( wnamepart );
+    wstrToLower(wnamepart);
 
     uint32 counter = 0;                                     // Counter for figure out that we found smth.
 
     // Search in Spell.dbc
-    for (uint32 id = 0; id < sSpellStore.GetNumRows(); id++)
+    for (uint32 id = 0; id < sSpellStore.GetNumRows(); ++id)
     {
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(id);
-        if(spellInfo)
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(id);
+        if (spellInfo)
         {
             int loc = GetSessionDbcLocale();
             std::string name = spellInfo->SpellName[loc];
-            if(name.empty())
+            if (name.empty())
                 continue;
 
             if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
-                for(; loc < MAX_LOCALE; ++loc)
+                for (; loc < MAX_LOCALE; ++loc)
                 {
-                    if(loc==GetSessionDbcLocale())
+                    if (loc == GetSessionDbcLocale())
                         continue;
 
                     name = spellInfo->SpellName[loc];
-                    if(name.empty())
+                    if (name.empty())
                         continue;
 
                     if (Utf8FitTo(name, wnamepart))
@@ -3375,7 +3474,7 @@ bool ChatHandler::HandleLookupSpellCommand(char* args)
                 }
             }
 
-            if(loc < MAX_LOCALE)
+            if (loc < MAX_LOCALE)
             {
                 ShowSpellListHelper(target, spellInfo, LocaleConstant(loc));
                 ++counter;
@@ -3388,7 +3487,7 @@ bool ChatHandler::HandleLookupSpellCommand(char* args)
 }
 
 
-void ChatHandler::ShowQuestListHelper( uint32 questId, int32 loc_idx, Player* target /*= NULL*/ )
+void ChatHandler::ShowQuestListHelper(uint32 questId, int32 loc_idx, Player* target /*= NULL*/)
 {
     Quest const* qinfo = sObjectMgr.GetQuestTemplate(questId);
     if (!qinfo)
@@ -3422,7 +3521,7 @@ void ChatHandler::ShowQuestListHelper( uint32 questId, int32 loc_idx, Player* ta
 
 bool ChatHandler::HandleLookupQuestCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     // can be NULL at console call
@@ -3432,7 +3531,7 @@ bool ChatHandler::HandleLookupQuestCommand(char* args)
     std::wstring wnamepart;
 
     // converting string that we try to find to lower case
-    if(!Utf8toWStr(namepart,wnamepart))
+    if (!Utf8toWStr(namepart, wnamepart))
         return false;
 
     wstrToLower(wnamepart);
@@ -3444,7 +3543,7 @@ bool ChatHandler::HandleLookupQuestCommand(char* args)
     ObjectMgr::QuestMap const& qTemplates = sObjectMgr.GetQuestTemplates();
     for (ObjectMgr::QuestMap::const_iterator iter = qTemplates.begin(); iter != qTemplates.end(); ++iter)
     {
-        Quest * qinfo = iter->second;
+        Quest* qinfo = iter->second;
 
         std::string title;                                  // "" for avoid repeating check default locale
         sObjectMgr.GetQuestLocaleStrings(qinfo->GetQuestId(), loc_idx, &title);
@@ -3456,7 +3555,7 @@ bool ChatHandler::HandleLookupQuestCommand(char* args)
         ++counter;
     }
 
-    if (counter==0)
+    if (counter == 0)
         SendSysMessage(LANG_COMMAND_NOQUESTFOUND);
 
     return true;
@@ -3471,17 +3570,17 @@ bool ChatHandler::HandleLookupCreatureCommand(char* args)
     std::wstring wnamepart;
 
     // converting string that we try to find to lower case
-    if (!Utf8toWStr (namepart,wnamepart))
+    if (!Utf8toWStr(namepart, wnamepart))
         return false;
 
-    wstrToLower (wnamepart);
+    wstrToLower(wnamepart);
 
     uint32 counter = 0;
 
-    for (uint32 id = 0; id< sCreatureStorage.MaxEntry; ++id)
+    for (uint32 id = 0; id < sCreatureStorage.GetMaxEntry(); ++id)
     {
         CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo> (id);
-        if(!cInfo)
+        if (!cInfo)
             continue;
 
         int loc_idx = GetSessionDbLocaleIndex();
@@ -3496,45 +3595,41 @@ bool ChatHandler::HandleLookupCreatureCommand(char* args)
         }
 
         if (m_session)
-            PSendSysMessage (LANG_CREATURE_ENTRY_LIST_CHAT, id, id, name);
+            PSendSysMessage(LANG_CREATURE_ENTRY_LIST_CHAT, id, id, name);
         else
-            PSendSysMessage (LANG_CREATURE_ENTRY_LIST_CONSOLE, id, name);
+            PSendSysMessage(LANG_CREATURE_ENTRY_LIST_CONSOLE, id, name);
 
         ++counter;
     }
 
-    if (counter==0)
-        SendSysMessage (LANG_COMMAND_NOCREATUREFOUND);
+    if (counter == 0)
+        SendSysMessage(LANG_COMMAND_NOCREATUREFOUND);
 
     return true;
 }
 
 bool ChatHandler::HandleLookupObjectCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     std::string namepart = args;
     std::wstring wnamepart;
 
     // converting string that we try to find to lower case
-    if(!Utf8toWStr(namepart,wnamepart))
+    if (!Utf8toWStr(namepart, wnamepart))
         return false;
 
     wstrToLower(wnamepart);
 
     uint32 counter = 0;
 
-    for (uint32 id = 0; id< sGOStorage.MaxEntry; id++ )
+    for (SQLStorageBase::SQLSIterator<GameObjectInfo> itr = sGOStorage.getDataBegin<GameObjectInfo>(); itr < sGOStorage.getDataEnd<GameObjectInfo>(); ++itr)
     {
-        GameObjectInfo const* gInfo = sGOStorage.LookupEntry<GameObjectInfo>(id);
-        if(!gInfo)
-            continue;
-
         int loc_idx = GetSessionDbLocaleIndex();
-        if ( loc_idx >= 0 )
+        if (loc_idx >= 0)
         {
-            GameObjectLocale const *gl = sObjectMgr.GetGameObjectLocale(id);
+            GameObjectLocale const* gl = sObjectMgr.GetGameObjectLocale(itr->id);
             if (gl)
             {
                 if ((int32)gl->Name.size() > loc_idx && !gl->Name[loc_idx].empty())
@@ -3544,9 +3639,9 @@ bool ChatHandler::HandleLookupObjectCommand(char* args)
                     if (Utf8FitTo(name, wnamepart))
                     {
                         if (m_session)
-                            PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, id, id, name.c_str());
+                            PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, itr->id, itr->id, name.c_str());
                         else
-                            PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, id, name.c_str());
+                            PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, itr->id, name.c_str());
                         ++counter;
                         continue;
                     }
@@ -3554,63 +3649,63 @@ bool ChatHandler::HandleLookupObjectCommand(char* args)
             }
         }
 
-        std::string name = gInfo->name;
-        if(name.empty())
+        std::string name = itr->name;
+        if (name.empty())
             continue;
 
-        if(Utf8FitTo(name, wnamepart))
+        if (Utf8FitTo(name, wnamepart))
         {
             if (m_session)
-                PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, id, id, name.c_str());
+                PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, itr->id, itr->id, name.c_str());
             else
-                PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, id, name.c_str());
+                PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, itr->id, name.c_str());
             ++counter;
         }
     }
 
-    if(counter==0)
+    if (counter == 0)
         SendSysMessage(LANG_COMMAND_NOGAMEOBJECTFOUND);
 
     return true;
 }
 
-bool ChatHandler::HandleLookupTaxiNodeCommand(char * args)
+bool ChatHandler::HandleLookupTaxiNodeCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
     std::string namepart = args;
     std::wstring wnamepart;
 
-    if(!Utf8toWStr(namepart,wnamepart))
+    if (!Utf8toWStr(namepart, wnamepart))
         return false;
 
     // converting string that we try to find to lower case
-    wstrToLower( wnamepart );
+    wstrToLower(wnamepart);
 
     uint32 counter = 0;                                     // Counter for figure out that we found smth.
 
     // Search in TaxiNodes.dbc
-    for (uint32 id = 0; id < sTaxiNodesStore.GetNumRows(); id++)
+    for (uint32 id = 0; id < sTaxiNodesStore.GetNumRows(); ++id)
     {
-        TaxiNodesEntry const *nodeEntry = sTaxiNodesStore.LookupEntry(id);
-        if(nodeEntry)
+        TaxiNodesEntry const* nodeEntry = sTaxiNodesStore.LookupEntry(id);
+        if (nodeEntry)
         {
             int loc = GetSessionDbcLocale();
             std::string name = nodeEntry->name[loc];
-            if(name.empty())
+            if (name.empty())
                 continue;
 
             if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
-                for(; loc < MAX_LOCALE; ++loc)
+                for (; loc < MAX_LOCALE; ++loc)
                 {
-                    if(loc==GetSessionDbcLocale())
+                    if (loc == GetSessionDbcLocale())
                         continue;
 
                     name = nodeEntry->name[loc];
-                    if(name.empty())
+                    if (name.empty())
                         continue;
 
                     if (Utf8FitTo(name, wnamepart))
@@ -3618,15 +3713,15 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(char * args)
                 }
             }
 
-            if(loc < MAX_LOCALE)
+            if (loc < MAX_LOCALE)
             {
                 // send taxinode in "id - [name] (Map:m X:x Y:y Z:z)" format
                 if (m_session)
-                    PSendSysMessage (LANG_TAXINODE_ENTRY_LIST_CHAT, id, id, name.c_str(),localeNames[loc],
-                        nodeEntry->map_id,nodeEntry->x,nodeEntry->y,nodeEntry->z);
+                    PSendSysMessage(LANG_TAXINODE_ENTRY_LIST_CHAT, id, id, name.c_str(), localeNames[loc],
+                                    nodeEntry->map_id, nodeEntry->x, nodeEntry->y, nodeEntry->z);
                 else
-                    PSendSysMessage (LANG_TAXINODE_ENTRY_LIST_CONSOLE, id, name.c_str(), localeNames[loc],
-                        nodeEntry->map_id,nodeEntry->x,nodeEntry->y,nodeEntry->z);
+                    PSendSysMessage(LANG_TAXINODE_ENTRY_LIST_CONSOLE, id, name.c_str(), localeNames[loc],
+                                    nodeEntry->map_id, nodeEntry->x, nodeEntry->y, nodeEntry->z);
                 ++counter;
             }
         }
@@ -3654,14 +3749,14 @@ bool ChatHandler::HandleGuildCreateCommand(char* args)
         return false;
 
     char* guildStr = ExtractQuotedArg(&args);
-    if(!guildStr)
+    if (!guildStr)
         return false;
 
     std::string guildname = guildStr;
 
     if (target->GetGuildId())
     {
-        SendSysMessage (LANG_PLAYER_IN_GUILD);
+        SendSysMessage(LANG_PLAYER_IN_GUILD);
         return true;
     }
 
@@ -3678,7 +3773,7 @@ bool ChatHandler::HandleGuildCreateCommand(char* args)
     return true;
 }
 
-bool ChatHandler::HandleGuildInviteCommand(char *args)
+bool ChatHandler::HandleGuildInviteCommand(char* args)
 {
     // player name optional
     char* nameStr = ExtractOptNotLastArg(&args);
@@ -3689,7 +3784,7 @@ bool ChatHandler::HandleGuildInviteCommand(char *args)
         return false;
 
     char* guildStr = ExtractQuotedArg(&args);
-    if(!guildStr)
+    if (!guildStr)
         return false;
 
     std::string glName = guildStr;
@@ -3698,20 +3793,20 @@ bool ChatHandler::HandleGuildInviteCommand(char *args)
         return false;
 
     // player's guild membership checked in AddMember before add
-    if (!targetGuild->AddMember (target_guid,targetGuild->GetLowestRank ()))
+    if (!targetGuild->AddMember(target_guid, targetGuild->GetLowestRank()))
         return false;
 
     return true;
 }
 
-bool ChatHandler::HandleGuildUninviteCommand(char *args)
+bool ChatHandler::HandleGuildUninviteCommand(char* args)
 {
     Player* target;
     ObjectGuid target_guid;
     if (!ExtractPlayerTarget(&args, &target, &target_guid))
         return false;
 
-    uint32 glId   = target ? target->GetGuildId () : Player::GetGuildIdFromDB (target_guid);
+    uint32 glId   = target ? target->GetGuildId() : Player::GetGuildIdFromDB(target_guid);
     if (!glId)
         return false;
 
@@ -3728,7 +3823,7 @@ bool ChatHandler::HandleGuildUninviteCommand(char *args)
     return true;
 }
 
-bool ChatHandler::HandleGuildRankCommand(char *args)
+bool ChatHandler::HandleGuildRankCommand(char* args)
 {
     char* nameStr = ExtractOptNotLastArg(&args);
 
@@ -3738,7 +3833,7 @@ bool ChatHandler::HandleGuildRankCommand(char *args)
     if (!ExtractPlayerTarget(&nameStr, &target, &target_guid, &target_name))
         return false;
 
-    uint32 glId   = target ? target->GetGuildId () : Player::GetGuildIdFromDB (target_guid);
+    uint32 glId   = target ? target->GetGuildId() : Player::GetGuildIdFromDB(target_guid);
     if (!glId)
         return false;
 
@@ -3750,7 +3845,7 @@ bool ChatHandler::HandleGuildRankCommand(char *args)
     if (!ExtractUInt32(&args, newrank))
         return false;
 
-    if (newrank > targetGuild->GetLowestRank ())
+    if (newrank > targetGuild->GetLowestRank())
         return false;
 
     MemberSlot* slot = targetGuild->GetMemberSlot(target_guid);
@@ -3791,7 +3886,7 @@ bool ChatHandler::HandleGetDistanceCommand(char* args)
         if (ObjectGuid guid = ExtractGuidFromLink(&args))
             obj = (WorldObject*)m_session->GetPlayer()->GetObjectByTypeMask(guid, TYPEMASK_CREATURE_OR_GAMEOBJECT);
 
-        if(!obj)
+        if (!obj)
         {
             SendSysMessage(LANG_PLAYER_NOT_FOUND);
             SetSentErrorMessage(true);
@@ -3802,7 +3897,7 @@ bool ChatHandler::HandleGetDistanceCommand(char* args)
     {
         obj = getSelectedUnit();
 
-        if(!obj)
+        if (!obj)
         {
             SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
             SetSentErrorMessage(true);
@@ -3817,7 +3912,7 @@ bool ChatHandler::HandleGetDistanceCommand(char* args)
     dy = player->GetPositionY() - obj->GetPositionY();
     dz = player->GetPositionZ() - obj->GetPositionZ();
 
-    PSendSysMessage(LANG_DISTANCE, player->GetDistance(obj), player->GetDistance2d(obj), sqrt(dx*dx + dy*dy + dz*dz));
+    PSendSysMessage(LANG_DISTANCE, player->GetDistance(obj), player->GetDistance2d(obj), sqrt(dx * dx + dy * dy + dz * dz));
 
     return true;
 }
@@ -3833,7 +3928,7 @@ bool ChatHandler::HandleDieCommand(char* /*args*/)
         return false;
     }
 
-    if (target->GetTypeId()==TYPEID_PLAYER)
+    if (target->GetTypeId() == TYPEID_PLAYER)
     {
         if (HasLowerSecurity((Player*)target, ObjectGuid(), false))
             return false;
@@ -3868,7 +3963,7 @@ bool ChatHandler::HandleDamageCommand(char* args)
     if (!ExtractInt32(&args, damage_int))
         return false;
 
-    if(damage_int <=0)
+    if (damage_int <= 0)
         return true;
 
     uint32 damage = damage_int;
@@ -3878,7 +3973,12 @@ bool ChatHandler::HandleDamageCommand(char* args)
     {
         m_session->GetPlayer()->DealDamage(target, damage, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
         if (target != m_session->GetPlayer())
-            m_session->GetPlayer()->SendAttackStateUpdate (HITINFO_NORMALSWING2, target, 1, SPELL_SCHOOL_MASK_NORMAL, damage, 0, 0, VICTIMSTATE_NORMAL, 0);
+        {
+            DamageInfo damageInfo  = DamageInfo(m_session->GetPlayer(), target, uint32(0), damage);
+            damageInfo.HitInfo     = HITINFO_AFFECTS_VICTIM;
+            damageInfo.TargetState = VICTIMSTATE_NORMAL;
+            m_session->GetPlayer()->SendAttackStateUpdate(&damageInfo);
+        }
         return true;
     }
 
@@ -3886,9 +3986,14 @@ bool ChatHandler::HandleDamageCommand(char* args)
     if (!ExtractUInt32(&args, school))
         return false;
 
-    if(school >= MAX_SPELL_SCHOOL)
+    if (school >= MAX_SPELL_SCHOOL)
         return false;
 
+    // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
+    uint32 spellid = ExtractSpellIdFromLink(&args);
+    if (!spellid || !sSpellStore.LookupEntry(spellid))
+        spellid = 0;
+
     SpellSchoolMask schoolmask = SpellSchoolMask(1 << school);
 
     if ( schoolmask & SPELL_SCHOOL_MASK_NORMAL )
@@ -3897,29 +4002,20 @@ bool ChatHandler::HandleDamageCommand(char* args)
     // melee damage by specific school
     if (!*args)
     {
-        uint32 absorb = 0;
-        uint32 resist = 0;
-
-        target->CalculateDamageAbsorbAndResist(m_session->GetPlayer(),schoolmask, SPELL_DIRECT_DAMAGE, damage, &absorb, &resist);
-
-        if (damage <= absorb + resist)
-            return true;
+        DamageInfo damageInfo  = DamageInfo(m_session->GetPlayer(), target, spellid, damage);
+        damageInfo.HitInfo     = HITINFO_AFFECTS_VICTIM;
+        damageInfo.TargetState = VICTIMSTATE_NORMAL;
 
-        damage -= absorb + resist;
+        target->CalculateDamageAbsorbAndResist(m_session->GetPlayer(),&damageInfo, false);
 
-        m_session->GetPlayer()->DealDamageMods(target,damage,&absorb);
-        m_session->GetPlayer()->DealDamage(target, damage, NULL, DIRECT_DAMAGE, schoolmask, NULL, false);
-        m_session->GetPlayer()->SendAttackStateUpdate (HITINFO_NORMALSWING2, target, 1, schoolmask, damage, absorb, resist, VICTIMSTATE_NORMAL, 0);
+        m_session->GetPlayer()->DealDamageMods(&damageInfo);
+        m_session->GetPlayer()->DealDamage(target,&damageInfo,false);
+        m_session->GetPlayer()->SendAttackStateUpdate(&damageInfo);
         return true;
     }
 
     // non-melee damage
 
-    // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
-    uint32 spellid = ExtractSpellIdFromLink(&args);
-    if (!spellid || !sSpellStore.LookupEntry(spellid))
-        return false;
-
     m_session->GetPlayer()->SpellNonMeleeDamageLog(target, spellid, damage);
     return true;
 }
@@ -3929,7 +4025,7 @@ bool ChatHandler::HandleModifyArenaCommand(char* args)
     if (!*args)
         return false;
 
-    Player *target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
     if (!target)
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -3955,7 +4051,7 @@ bool ChatHandler::HandleReviveCommand(char* args)
 
     if (target)
     {
-        target->ResurrectPlayer(0.5f);
+        target->ResurrectPlayer(100);
         target->SpawnCorpseBones();
     }
     else
@@ -3967,7 +4063,7 @@ bool ChatHandler::HandleReviveCommand(char* args)
 
 bool ChatHandler::HandleAuraCommand(char* args)
 {
-    Unit *target = getSelectedUnit();
+    Unit* target = getSelectedUnit();
     if (!target)
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
@@ -3978,31 +4074,30 @@ bool ChatHandler::HandleAuraCommand(char* args)
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
     uint32 spellID = ExtractSpellIdFromLink(&args);
 
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID);
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellID);
     if (!spellInfo)
         return false;
 
     if (!IsSpellAppliesAura(spellInfo) &&
-        !IsSpellHaveEffect(spellInfo, SPELL_EFFECT_PERSISTENT_AREA_AURA))
+            !IsSpellHaveEffect(spellInfo, SPELL_EFFECT_PERSISTENT_AREA_AURA))
     {
         PSendSysMessage(LANG_SPELL_NO_HAVE_AURAS, spellID);
         SetSentErrorMessage(true);
         return false;
     }
 
-    SpellAuraHolder *holder = CreateSpellAuraHolder(spellInfo, target, m_session->GetPlayer());
+    SpellAuraHolderPtr holder = CreateSpellAuraHolder(spellInfo, target, m_session->GetPlayer());
 
-    for(uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
     {
         uint8 eff = spellInfo->Effect[i];
-        if (eff>=TOTAL_SPELL_EFFECTS)
+        if (eff >= TOTAL_SPELL_EFFECTS)
             continue;
         if (IsAreaAuraEffect(eff)           ||
-            eff == SPELL_EFFECT_APPLY_AURA  ||
-            eff == SPELL_EFFECT_PERSISTENT_AREA_AURA)
+                eff == SPELL_EFFECT_APPLY_AURA  ||
+                eff == SPELL_EFFECT_PERSISTENT_AREA_AURA)
         {
-            Aura *aur = CreateAura(spellInfo, SpellEffectIndex(i), NULL, holder, target);
-            holder->AddAura(aur, SpellEffectIndex(i));
+            holder->CreateAura(spellInfo, SpellEffectIndex(i), NULL, holder, target, NULL, NULL);
         }
     }
     target->AddSpellAuraHolder(holder);
@@ -4012,8 +4107,8 @@ bool ChatHandler::HandleAuraCommand(char* args)
 
 bool ChatHandler::HandleUnAuraCommand(char* args)
 {
-    Unit *target = getSelectedUnit();
-    if(!target)
+    Unit* target = getSelectedUnit();
+    if (!target)
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
@@ -4047,17 +4142,16 @@ bool ChatHandler::HandleLinkGraveCommand(char* args)
 
     Team g_team;
     if (!teamStr)
-        g_team = TEAM_NONE;
-    else if (strncmp(teamStr, "horde", strlen(teamStr))==0)
+        g_team = TEAM_BOTH_ALLOWED;
+    else if (strncmp(teamStr, "horde", strlen(teamStr)) == 0)
         g_team = HORDE;
-    else if (strncmp(teamStr, "alliance", strlen(teamStr))==0)
+    else if (strncmp(teamStr, "alliance", strlen(teamStr)) == 0)
         g_team = ALLIANCE;
     else
         return false;
 
-    WorldSafeLocsEntry const* graveyard =  sWorldSafeLocsStore.LookupEntry(g_id);
-
-    if (!graveyard )
+    WorldSafeLocsEntry const* graveyard = sWorldSafeLocsStore.LookupEntry(g_id);
+    if (!graveyard)
     {
         PSendSysMessage(LANG_COMMAND_GRAVEYARDNOEXIST, g_id);
         SetSentErrorMessage(true);
@@ -4068,10 +4162,10 @@ bool ChatHandler::HandleLinkGraveCommand(char* args)
 
     uint32 zoneId = player->GetZoneId();
 
-    AreaTableEntry const *areaEntry = GetAreaEntryByAreaID(zoneId);
-    if (!areaEntry || areaEntry->zone !=0)
+    AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(zoneId);
+    if (!areaEntry || areaEntry->zone != 0)
     {
-        PSendSysMessage(LANG_COMMAND_GRAVEYARDWRONGZONE, g_id,zoneId);
+        PSendSysMessage(LANG_COMMAND_GRAVEYARDWRONGZONE, g_id, zoneId);
         SetSentErrorMessage(true);
         return false;
     }
@@ -4090,8 +4184,8 @@ bool ChatHandler::HandleNearGraveCommand(char* args)
 
     size_t argslen = strlen(args);
 
-    if(!*args)
-        g_team = TEAM_NONE;
+    if (!*args)
+        g_team = TEAM_BOTH_ALLOWED;
     else if (strncmp(args, "horde", argslen) == 0)
         g_team = HORDE;
     else if (strncmp(args, "alliance", argslen) == 0)
@@ -4102,49 +4196,48 @@ bool ChatHandler::HandleNearGraveCommand(char* args)
     Player* player = m_session->GetPlayer();
     uint32 zone_id = player->GetZoneId();
 
-    WorldSafeLocsEntry const* graveyard = sObjectMgr.GetClosestGraveYard(
-        player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), g_team);
+    WorldSafeLocsEntry const* graveyard = sObjectMgr.GetClosestGraveYard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), g_team);
 
-    if(graveyard)
+    if (graveyard)
     {
         uint32 g_id = graveyard->ID;
 
-        GraveYardData const* data = sObjectMgr.FindGraveYardData(g_id,zone_id);
+        GraveYardData const* data = sObjectMgr.FindGraveYardData(g_id, zone_id);
         if (!data)
         {
-            PSendSysMessage(LANG_COMMAND_GRAVEYARDERROR,g_id);
+            PSendSysMessage(LANG_COMMAND_GRAVEYARDERROR, g_id);
             SetSentErrorMessage(true);
             return false;
         }
 
-        g_team = data->team;
-
-        std::string team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_NOTEAM);
+        std::string team_name;
 
-        if(g_team == 0)
+        if (data->team == TEAM_BOTH_ALLOWED)
             team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_ANY);
-        else if(g_team == HORDE)
+        else if (data->team == HORDE)
             team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_HORDE);
-        else if(g_team == ALLIANCE)
+        else if (data->team == ALLIANCE)
             team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_ALLIANCE);
+        else                                                // Actually, this case cannot happen
+            team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_NOTEAM);
 
-        PSendSysMessage(LANG_COMMAND_GRAVEYARDNEAREST, g_id,team_name.c_str(),zone_id);
+        PSendSysMessage(LANG_COMMAND_GRAVEYARDNEAREST, g_id, team_name.c_str(), zone_id);
     }
     else
     {
         std::string team_name;
 
-        if(g_team == 0)
+        if (g_team == TEAM_BOTH_ALLOWED)
             team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_ANY);
-        else if(g_team == HORDE)
+        else if (g_team == HORDE)
             team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_HORDE);
-        else if(g_team == ALLIANCE)
+        else if (g_team == ALLIANCE)
             team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_ALLIANCE);
 
-        if(g_team == ~uint32(0))
+        if (g_team == TEAM_BOTH_ALLOWED)
             PSendSysMessage(LANG_COMMAND_ZONENOGRAVEYARDS, zone_id);
         else
-            PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id,team_name.c_str());
+            PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id, team_name.c_str());
     }
 
     return true;
@@ -4153,7 +4246,7 @@ bool ChatHandler::HandleNearGraveCommand(char* args)
 //-----------------------Npc Commands-----------------------
 bool ChatHandler::HandleNpcAllowMovementCommand(char* /*args*/)
 {
-    if(sWorld.getAllowMovement())
+    if (sWorld.getAllowMovement())
     {
         sWorld.SetAllowMovement(false);
         SendSysMessage(LANG_CREATURE_MOVE_DISABLED);
@@ -4166,24 +4259,24 @@ bool ChatHandler::HandleNpcAllowMovementCommand(char* /*args*/)
     return true;
 }
 
-bool ChatHandler::HandleNpcChangeEntryCommand(char *args)
+bool ChatHandler::HandleNpcChangeEntryCommand(char* args)
 {
     if (!*args)
         return false;
 
     uint32 newEntryNum = atoi(args);
-    if(!newEntryNum)
+    if (!newEntryNum)
         return false;
 
     Unit* unit = getSelectedUnit();
-    if(!unit || unit->GetTypeId() != TYPEID_UNIT)
+    if (!unit || unit->GetTypeId() != TYPEID_UNIT)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
     Creature* creature = (Creature*)unit;
-    if(creature->UpdateEntry(newEntryNum))
+    if (creature->UpdateEntry(newEntryNum))
         SendSysMessage(LANG_DONE);
     else
         SendSysMessage(LANG_ERROR);
@@ -4194,7 +4287,7 @@ bool ChatHandler::HandleNpcInfoCommand(char* /*args*/)
 {
     Creature* target = getSelectedCreature();
 
-    if(!target)
+    if (!target)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
@@ -4205,42 +4298,61 @@ bool ChatHandler::HandleNpcInfoCommand(char* /*args*/)
     uint32 npcflags = target->GetUInt32Value(UNIT_NPC_FLAGS);
     uint32 displayid = target->GetDisplayId();
     uint32 nativeid = target->GetNativeDisplayId();
+    uint32 phaseMask = target->GetPhaseMask();
     uint32 Entry = target->GetEntry();
     CreatureInfo const* cInfo = target->GetCreatureInfo();
+    uint32 VehicleId = cInfo ? cInfo->VehicleTemplateId : 0;
+    uint32 difficulty_entry_1 = cInfo ? cInfo->DifficultyEntry[0] : 0;
+    uint32 difficulty_entry_2 = cInfo ? cInfo->DifficultyEntry[1] : 0;
+    uint32 difficulty_entry_3 = cInfo ? cInfo->DifficultyEntry[2] : 0;
 
-    time_t curRespawnDelay = target->GetRespawnTimeEx()-time(NULL);
-    if(curRespawnDelay < 0)
+    time_t curRespawnDelay = target->GetRespawnTimeEx() - time(NULL);
+    if (curRespawnDelay < 0)
         curRespawnDelay = 0;
-    std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay,true);
-    std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(),true);
+    std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay, true);
+    std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(), true);
 
     // Send information dependend on difficulty mode
     CreatureInfo const* baseInfo = ObjectMgr::GetCreatureTemplate(Entry);
     uint32 diff = 1;
     for (; diff < MAX_DIFFICULTY; ++diff)
-        if (baseInfo->DifficultyEntry[diff-1] == target->GetCreatureInfo()->Entry)
+        if (baseInfo->DifficultyEntry[diff - 1] == target->GetCreatureInfo()->Entry)
             break;
 
     if (diff < MAX_DIFFICULTY)
         PSendSysMessage(LANG_NPCINFO_CHAR_DIFFICULTY, target->GetGuidStr().c_str(), faction, npcflags,
-            Entry, target->GetCreatureInfo()->Entry, diff,
-            displayid, nativeid);
+                        Entry, target->GetCreatureInfo()->Entry, diff,
+                        displayid, nativeid);
     else
         PSendSysMessage(LANG_NPCINFO_CHAR, target->GetGuidStr().c_str(), faction, npcflags, Entry, displayid, nativeid);
 
+    PSendSysMessage("VehicleId: %u", VehicleId);
+    PSendSysMessage("difficulty_entry_1: %u, difficulty_entry_2: %u, difficulty_entry_3: %u", difficulty_entry_1, difficulty_entry_2, difficulty_entry_3);
+
     PSendSysMessage(LANG_NPCINFO_LEVEL, target->getLevel());
-    PSendSysMessage(LANG_NPCINFO_HEALTH,target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth());
+    PSendSysMessage(LANG_NPCINFO_HEALTH, target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth());
     PSendSysMessage(LANG_NPCINFO_FLAGS, target->GetUInt32Value(UNIT_FIELD_FLAGS), target->GetUInt32Value(UNIT_DYNAMIC_FLAGS), target->getFaction());
-    PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(),curRespawnDelayStr.c_str());
-    PSendSysMessage(LANG_NPCINFO_LOOT,  cInfo->lootid,cInfo->pickpocketLootId,cInfo->SkinLootId);
+    PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(), curRespawnDelayStr.c_str());
+    PSendSysMessage(LANG_NPCINFO_LOOT,  cInfo->LootId, cInfo->PickpocketLootId, cInfo->SkinningLootId);
     PSendSysMessage(LANG_NPCINFO_DUNGEON_ID, target->GetInstanceId());
-    PSendSysMessage(LANG_NPCINFO_POSITION,float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ()));
+    PSendSysMessage(LANG_NPCINFO_POSITION, float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ()));
+
+    if (target->SD2AIName())
+        PSendSysMessage("ScriptName: %s", target->GetScriptName().c_str());
+    else if (target->HasAIName())
+        PSendSysMessage("AI name: %s", target->GetAIName().c_str());
 
-    if ((npcflags & UNIT_NPC_FLAG_VENDOR) )
+    PSendSysMessage("Phasemask %u, has %u active events, " SIZEFMTD " SpellAuraHolders, " SIZEFMTD " unit states",
+        phaseMask,
+        target->GetEvents()->size(),
+        target->GetSpellAuraHolderMap().size(),
+        target->GetUnitStateMgr().GetActions().size());
+
+    if ((npcflags & UNIT_NPC_FLAG_VENDOR))
     {
         SendSysMessage(LANG_NPCINFO_VENDOR);
     }
-    if ((npcflags & UNIT_NPC_FLAG_TRAINER) )
+    if ((npcflags & UNIT_NPC_FLAG_TRAINER))
     {
         SendSysMessage(LANG_NPCINFO_TRAINER);
     }
@@ -4249,13 +4361,13 @@ bool ChatHandler::HandleNpcInfoCommand(char* /*args*/)
     return true;
 }
 
-//play npc emote
+// play npc emote
 bool ChatHandler::HandleNpcPlayEmoteCommand(char* args)
 {
     uint32 emote = atoi(args);
 
     Creature* target = getSelectedCreature();
-    if(!target)
+    if (!target)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
@@ -4267,7 +4379,7 @@ bool ChatHandler::HandleNpcPlayEmoteCommand(char* args)
     return true;
 }
 
-//TODO: NpcCommands that needs to be fixed :
+// TODO: NpcCommands that needs to be fixed :
 
 bool ChatHandler::HandleNpcAddWeaponCommand(char* /*args*/)
 {
@@ -4345,7 +4457,7 @@ bool ChatHandler::HandleExploreCheatCommand(char* args)
 
     int flag = atoi(args);
 
-    Player *chr = getSelectedPlayer();
+    Player* chr = getSelectedPlayer();
     if (chr == NULL)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -4357,24 +4469,24 @@ bool ChatHandler::HandleExploreCheatCommand(char* args)
     {
         PSendSysMessage(LANG_YOU_SET_EXPLORE_ALL, GetNameLink(chr).c_str());
         if (needReportToTarget(chr))
-            ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_ALL,GetNameLink().c_str());
+            ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_ALL, GetNameLink().c_str());
     }
     else
     {
         PSendSysMessage(LANG_YOU_SET_EXPLORE_NOTHING, GetNameLink(chr).c_str());
         if (needReportToTarget(chr))
-            ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_NOTHING,GetNameLink().c_str());
+            ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_NOTHING, GetNameLink().c_str());
     }
 
-    for (uint8 i=0; i < PLAYER_EXPLORED_ZONES_SIZE; ++i)
+    for (uint8 i = 0; i < PLAYER_EXPLORED_ZONES_SIZE; ++i)
     {
         if (flag != 0)
         {
-            m_session->GetPlayer()->SetFlag(PLAYER_EXPLORED_ZONES_1+i,0xFFFFFFFF);
+            m_session->GetPlayer()->SetFlag(PLAYER_EXPLORED_ZONES_1 + i, 0xFFFFFFFF);
         }
         else
         {
-            m_session->GetPlayer()->SetFlag(PLAYER_EXPLORED_ZONES_1+i,0);
+            m_session->GetPlayer()->SetFlag(PLAYER_EXPLORED_ZONES_1 + i, 0);
         }
     }
 
@@ -4383,20 +4495,20 @@ bool ChatHandler::HandleExploreCheatCommand(char* args)
 
 void ChatHandler::HandleCharacterLevel(Player* player, ObjectGuid player_guid, uint32 oldlevel, uint32 newlevel)
 {
-    if(player)
+    if (player)
     {
         player->GiveLevel(newlevel);
         player->InitTalentForLevel();
-        player->SetUInt32Value(PLAYER_XP,0);
+        player->SetUInt32Value(PLAYER_XP, 0);
 
-        if(needReportToTarget(player))
+        if (needReportToTarget(player))
         {
-            if(oldlevel == newlevel)
-                ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_PROGRESS_RESET,GetNameLink().c_str());
-            else if(oldlevel < newlevel)
-                ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_UP,GetNameLink().c_str(),newlevel);
-            else                                                // if(oldlevel > newlevel)
-                ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_DOWN,GetNameLink().c_str(),newlevel);
+            if (oldlevel == newlevel)
+                ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_PROGRESS_RESET, GetNameLink().c_str());
+            else if (oldlevel < newlevel)
+                ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_UP, GetNameLink().c_str(), newlevel);
+            else                                            // if(oldlevel > newlevel)
+                ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_DOWN, GetNameLink().c_str(), newlevel);
         }
     }
     else
@@ -4443,12 +4555,15 @@ bool ChatHandler::HandleCharacterLevelCommand(char* args)
     if (newlevel > STRONG_MAX_LEVEL)                        // hardcoded maximum level
         newlevel = STRONG_MAX_LEVEL;
 
+    if (newlevel > int32(sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL)))
+        newlevel = int32(sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL));
+
     HandleCharacterLevel(target, target_guid, oldlevel, newlevel);
 
     if (!m_session || m_session->GetPlayer() != target)     // including player==NULL
     {
         std::string nameLink = playerLink(target_name);
-        PSendSysMessage(LANG_YOU_CHANGE_LVL,nameLink.c_str(),newlevel);
+        PSendSysMessage(LANG_YOU_CHANGE_LVL, nameLink.c_str(), newlevel);
     }
 
     return true;
@@ -4488,12 +4603,15 @@ bool ChatHandler::HandleLevelUpCommand(char* args)
     if (newlevel > STRONG_MAX_LEVEL)                        // hardcoded maximum level
         newlevel = STRONG_MAX_LEVEL;
 
+    if (newlevel > int32(sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL)))
+        newlevel = int32(sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL));
+
     HandleCharacterLevel(target, target_guid, oldlevel, newlevel);
 
     if (!m_session || m_session->GetPlayer() != target)     // including chr==NULL
     {
         std::string nameLink = playerLink(target_name);
-        PSendSysMessage(LANG_YOU_CHANGE_LVL,nameLink.c_str(),newlevel);
+        PSendSysMessage(LANG_YOU_CHANGE_LVL, nameLink.c_str(), newlevel);
     }
 
     return true;
@@ -4504,7 +4622,7 @@ bool ChatHandler::HandleShowAreaCommand(char* args)
     if (!*args)
         return false;
 
-    Player *chr = getSelectedPlayer();
+    Player* chr = getSelectedPlayer();
     if (chr == NULL)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -4535,7 +4653,7 @@ bool ChatHandler::HandleHideAreaCommand(char* args)
     if (!*args)
         return false;
 
-    Player *chr = getSelectedPlayer();
+    Player* chr = getSelectedPlayer();
     if (chr == NULL)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -4547,7 +4665,7 @@ bool ChatHandler::HandleHideAreaCommand(char* args)
     int offset = area / 32;
     uint32 val = (uint32)(1 << (area % 32));
 
-    if (area<0 || offset >= PLAYER_EXPLORED_ZONES_SIZE)
+    if (area < 0 || offset >= PLAYER_EXPLORED_ZONES_SIZE)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
@@ -4626,15 +4744,15 @@ bool ChatHandler::HandleAuctionItemCommand(char* args)
     if (!ExtractOptUInt32(&args, buyout, 0))
         return false;
 
-    uint32 etime = 4*MIN_AUCTION_TIME;
+    uint32 etime = 4 * MIN_AUCTION_TIME;
     if (char* timeStr = ExtractLiteralArg(&args))
     {
         if (strncmp(timeStr, "short", strlen(timeStr)) == 0)
-            etime = 1*MIN_AUCTION_TIME;
+            etime = 1 * MIN_AUCTION_TIME;
         else if (strncmp(timeStr, "long", strlen(timeStr)) == 0)
-            etime = 2*MIN_AUCTION_TIME;
+            etime = 2 * MIN_AUCTION_TIME;
         else if (strncmp(timeStr, "verylong", strlen(timeStr)) == 0)
-            etime = 4*MIN_AUCTION_TIME;
+            etime = 4 * MIN_AUCTION_TIME;
         else
             return false;
     }
@@ -4674,7 +4792,8 @@ bool ChatHandler::HandleAuctionItemCommand(char* args)
 
         auctionHouse->AddAuction(auctionHouseEntry, newItem, etime, price, buyout);
 
-    } while (item_count);
+    }
+    while (item_count);
 
     return true;
 }
@@ -4701,7 +4820,7 @@ bool ChatHandler::HandleStableCommand(char* /*args*/)
 
 bool ChatHandler::HandleChangeWeatherCommand(char* args)
 {
-    //Weather is OFF
+    // Weather is OFF
     if (!sWorld.getConfig(CONFIG_BOOL_WEATHER))
     {
         SendSysMessage(LANG_WEATHER_DISABLED);
@@ -4725,7 +4844,7 @@ bool ChatHandler::HandleChangeWeatherCommand(char* args)
     if (grade < 0.0f || grade > 1.0f)
         return false;
 
-    Player *player = m_session->GetPlayer();
+    Player* player = m_session->GetPlayer();
     uint32 zoneid = player->GetZoneId();
 
     Weather* wth = sWorld.FindWeather(zoneid);
@@ -4746,16 +4865,16 @@ bool ChatHandler::HandleChangeWeatherCommand(char* args)
 
 bool ChatHandler::HandleTeleAddCommand(char* args)
 {
-    if(!*args)
+    if (!*args)
         return false;
 
-    Player *player=m_session->GetPlayer();
+    Player* player = m_session->GetPlayer();
     if (!player)
         return false;
 
     std::string name = args;
 
-    if(sObjectMgr.GetGameTele(name))
+    if (sObjectMgr.GetGameTeleExactName(name))
     {
         SendSysMessage(LANG_COMMAND_TP_ALREADYEXIST);
         SetSentErrorMessage(true);
@@ -4763,14 +4882,10 @@ bool ChatHandler::HandleTeleAddCommand(char* args)
     }
 
     GameTele tele;
-    tele.position_x  = player->GetPositionX();
-    tele.position_y  = player->GetPositionY();
-    tele.position_z  = player->GetPositionZ();
-    tele.orientation = player->GetOrientation();
-    tele.mapId       = player->GetMapId();
-    tele.name        = name;
+    tele.loc  = player->GetPosition();
+    tele.name = name;
 
-    if(sObjectMgr.AddGameTele(tele))
+    if (sObjectMgr.AddGameTele(tele))
     {
         SendSysMessage(LANG_COMMAND_TP_ADDED);
     }
@@ -4791,7 +4906,7 @@ bool ChatHandler::HandleTeleDelCommand(char* args)
 
     std::string name = args;
 
-    if(!sObjectMgr.DeleteGameTele(name))
+    if (!sObjectMgr.DeleteGameTele(name))
     {
         SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
         SetSentErrorMessage(true);
@@ -4802,10 +4917,10 @@ bool ChatHandler::HandleTeleDelCommand(char* args)
     return true;
 }
 
-bool ChatHandler::HandleListAurasCommand (char* /*args*/)
+bool ChatHandler::HandleListAurasCommand(char* /*args*/)
 {
-    Unit *unit = getSelectedUnit();
-    if(!unit)
+    Unit* unit = getSelectedUnit();
+    if (!unit)
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
@@ -4821,12 +4936,12 @@ bool ChatHandler::HandleListAurasCommand (char* /*args*/)
     {
         bool talent = GetTalentSpellCost(itr->second->GetId()) > 0;
 
-        SpellAuraHolder *holder = itr->second;
+        SpellAuraHolderPtr holder = itr->second;
         char const* name = holder->GetSpellProto()->SpellName[GetSessionDbcLocale()];
 
         for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
         {
-            Aura *aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i));
+            Aura* aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i));
             if (!aur)
                 continue;
 
@@ -4836,18 +4951,18 @@ bool ChatHandler::HandleListAurasCommand (char* /*args*/)
                 ss_name << "|cffffffff|Hspell:" << itr->second->GetId() << "|h[" << name << "]|h|r";
 
                 PSendSysMessage(LANG_COMMAND_TARGET_AURADETAIL, holder->GetId(), aur->GetEffIndex(),
-                    aur->GetModifier()->m_auraname, aur->GetAuraDuration(), aur->GetAuraMaxDuration(),
-                    ss_name.str().c_str(),
-                    (holder->IsPassive() ? passiveStr : ""),(talent ? talentStr : ""),
-                    holder->GetCasterGuid().GetString().c_str());
+                                aur->GetModifier()->m_auraname, aur->GetAuraDuration(), aur->GetAuraMaxDuration(),
+                                ss_name.str().c_str(),
+                                (holder->IsPassive() ? passiveStr : ""), (talent ? talentStr : ""),
+                                holder->GetCasterGuid().GetString().c_str());
             }
             else
             {
                 PSendSysMessage(LANG_COMMAND_TARGET_AURADETAIL, holder->GetId(), aur->GetEffIndex(),
-                    aur->GetModifier()->m_auraname, aur->GetAuraDuration(), aur->GetAuraMaxDuration(),
-                    name,
-                    (holder->IsPassive() ? passiveStr : ""),(talent ? talentStr : ""),
-                    holder->GetCasterGuid().GetString().c_str());
+                                aur->GetModifier()->m_auraname, aur->GetAuraDuration(), aur->GetAuraMaxDuration(),
+                                name,
+                                (holder->IsPassive() ? passiveStr : ""), (talent ? talentStr : ""),
+                                holder->GetCasterGuid().GetString().c_str());
             }
         }
     }
@@ -4868,14 +4983,14 @@ bool ChatHandler::HandleListAurasCommand (char* /*args*/)
                 ss_name << "|cffffffff|Hspell:" << (*itr)->GetId() << "|h[" << name << "]|h|r";
 
                 PSendSysMessage(LANG_COMMAND_TARGET_AURASIMPLE, (*itr)->GetId(), (*itr)->GetEffIndex(),
-                    ss_name.str().c_str(),((*itr)->GetHolder()->IsPassive() ? passiveStr : ""),(talent ? talentStr : ""),
-                    (*itr)->GetCasterGuid().GetString().c_str());
+                                ss_name.str().c_str(), ((*itr)->GetHolder()->IsPassive() ? passiveStr : ""), (talent ? talentStr : ""),
+                                (*itr)->GetCasterGuid().GetString().c_str());
             }
             else
             {
                 PSendSysMessage(LANG_COMMAND_TARGET_AURASIMPLE, (*itr)->GetId(), (*itr)->GetEffIndex(),
-                    name,((*itr)->GetHolder()->IsPassive() ? passiveStr : ""),(talent ? talentStr : ""),
-                    (*itr)->GetCasterGuid().GetString().c_str());
+                                name, ((*itr)->GetHolder()->IsPassive() ? passiveStr : ""), (talent ? talentStr : ""),
+                                (*itr)->GetCasterGuid().GetString().c_str());
             }
         }
     }
@@ -4884,7 +4999,7 @@ bool ChatHandler::HandleListAurasCommand (char* /*args*/)
 
 bool ChatHandler::HandleListTalentsCommand(char* /*args*/)
 {
-    Player *player = getSelectedPlayer();
+    Player* player = getSelectedPlayer();
     if (!player)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
@@ -4926,7 +5041,7 @@ bool ChatHandler::HandleResetAchievementsCommand(char* args)
     if (!ExtractPlayerTarget(&args, &target, &target_guid))
         return false;
 
-    if(target)
+    if (target)
         target->GetAchievementMgr().Reset();
     else
         AchievementMgr::DeleteFromDB(target_guid);
@@ -4953,20 +5068,20 @@ bool ChatHandler::HandleResetHonorCommand(char* args)
 static bool HandleResetStatsOrLevelHelper(Player* player)
 {
     ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(player->getClass());
-    if(!cEntry)
+    if (!cEntry)
     {
-        sLog.outError("Class %u not found in DBC (Wrong DBC files?)",player->getClass());
+        sLog.outError("Class %u not found in DBC (Wrong DBC files?)", player->getClass());
         return false;
     }
 
-    uint8 powertype = cEntry->powerType;
+    Powers powertype = Powers(cEntry->powerType);
 
     // reset m_form if no aura
     if (!player->HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
         player->SetShapeshiftForm(FORM_NONE);
 
-    player->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, DEFAULT_WORLD_OBJECT_SIZE );
-    player->SetFloatValue(UNIT_FIELD_COMBATREACH, 1.5f   );
+    player->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, DEFAULT_WORLD_OBJECT_SIZE);
+    player->SetFloatValue(UNIT_FIELD_COMBATREACH, 1.5f);
 
     player->setFactionForRace(player->getRace());
 
@@ -4976,14 +5091,14 @@ static bool HandleResetStatsOrLevelHelper(Player* player)
     if (player->GetShapeshiftForm() == FORM_NONE)
         player->InitDisplayIds();
 
-    player->SetByteValue(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP );
+    player->SetByteValue(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP);
 
     player->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
 
     //-1 is default value
     player->SetInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, -1);
 
-    //player->SetUInt32Value(PLAYER_FIELD_BYTES, 0xEEE00000 );
+    // player->SetUInt32Value(PLAYER_FIELD_BYTES, 0xEEE00000 );
     return true;
 }
 
@@ -4998,8 +5113,8 @@ bool ChatHandler::HandleResetLevelCommand(char* args)
 
     // set starting level
     uint32 start_level = target->getClass() != CLASS_DEATH_KNIGHT
-        ? sWorld.getConfig(CONFIG_UINT32_START_PLAYER_LEVEL)
-        : sWorld.getConfig(CONFIG_UINT32_START_HEROIC_PLAYER_LEVEL);
+                         ? sWorld.getConfig(CONFIG_UINT32_START_PLAYER_LEVEL)
+                         : sWorld.getConfig(CONFIG_UINT32_START_HEROIC_PLAYER_LEVEL);
 
     target->_ApplyAllLevelScaleItemMods(false);
 
@@ -5009,7 +5124,7 @@ bool ChatHandler::HandleResetLevelCommand(char* args)
     target->InitTaxiNodesForLevel();
     target->InitGlyphsForLevel();
     target->InitTalentForLevel();
-    target->SetUInt32Value(PLAYER_XP,0);
+    target->SetUInt32Value(PLAYER_XP, 0);
 
     target->_ApplyAllLevelScaleItemMods(true);
 
@@ -5051,13 +5166,13 @@ bool ChatHandler::HandleResetSpellsCommand(char* args)
         target->resetSpells();
 
         ChatHandler(target).SendSysMessage(LANG_RESET_SPELLS);
-        if(!m_session || m_session->GetPlayer()!=target)
-            PSendSysMessage(LANG_RESET_SPELLS_ONLINE,GetNameLink(target).c_str());
+        if (!m_session || m_session->GetPlayer() != target)
+            PSendSysMessage(LANG_RESET_SPELLS_ONLINE, GetNameLink(target).c_str());
     }
     else
     {
-        CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'",uint32(AT_LOGIN_RESET_SPELLS), target_guid.GetCounter());
-        PSendSysMessage(LANG_RESET_SPELLS_OFFLINE,target_name.c_str());
+        CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'", uint32(AT_LOGIN_RESET_SPELLS), target_guid.GetCounter());
+        PSendSysMessage(LANG_RESET_SPELLS_OFFLINE, target_name.c_str());
     }
 
     return true;
@@ -5073,16 +5188,16 @@ bool ChatHandler::HandleResetSpecsCommand(char* args)
 
     if (target)
     {
-        target->resetTalents(true,true);
+        target->resetTalents(true, true);
         target->SendTalentsInfoData(false);
 
         ChatHandler(target).SendSysMessage(LANG_RESET_TALENTS);
         if (!m_session || m_session->GetPlayer() != target)
-            PSendSysMessage(LANG_RESET_TALENTS_ONLINE,GetNameLink(target).c_str());
+            PSendSysMessage(LANG_RESET_TALENTS_ONLINE, GetNameLink(target).c_str());
 
         Pet* pet = target->GetPet();
         Pet::resetTalentsForAllPetsOf(target, pet);
-        if(pet)
+        if (pet)
             target->SendTalentsInfoData(true);
         return true;
     }
@@ -5110,15 +5225,15 @@ bool ChatHandler::HandleResetTalentsCommand(char* args)
         Creature* creature = getSelectedCreature();
         if (!*args && creature && creature->IsPet())
         {
-            Unit *owner = creature->GetOwner();
-            if(owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet *)creature)->IsPermanentPetFor((Player*)owner))
+            Unit* owner = creature->GetOwner();
+            if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet*)creature)->IsPermanentPetFor((Player*)owner))
             {
-                ((Pet *)creature)->resetTalents(true);
+                ((Pet*)creature)->resetTalents();
                 ((Player*)owner)->SendTalentsInfoData(true);
 
                 ChatHandler((Player*)owner).SendSysMessage(LANG_RESET_PET_TALENTS);
-                if(!m_session || m_session->GetPlayer() != ((Player*)owner))
-                    PSendSysMessage(LANG_RESET_PET_TALENTS_ONLINE,GetNameLink((Player*)owner).c_str());
+                if (!m_session || m_session->GetPlayer() != ((Player*)owner))
+                    PSendSysMessage(LANG_RESET_PET_TALENTS_ONLINE, GetNameLink((Player*)owner).c_str());
             }
             return true;
         }
@@ -5134,11 +5249,11 @@ bool ChatHandler::HandleResetTalentsCommand(char* args)
         target->SendTalentsInfoData(false);
         ChatHandler(target).SendSysMessage(LANG_RESET_TALENTS);
         if (!m_session || m_session->GetPlayer() != target)
-            PSendSysMessage(LANG_RESET_TALENTS_ONLINE,GetNameLink(target).c_str());
+            PSendSysMessage(LANG_RESET_TALENTS_ONLINE, GetNameLink(target).c_str());
 
         Pet* pet = target->GetPet();
         Pet::resetTalentsForAllPetsOf(target, pet);
-        if(pet)
+        if (pet)
             target->SendTalentsInfoData(true);
         return true;
     }
@@ -5158,18 +5273,18 @@ bool ChatHandler::HandleResetAllCommand(char* args)
     AtLoginFlags atLogin;
 
     // Command specially created as single command to prevent using short case names
-    if(casename=="spells")
+    if (casename == "spells")
     {
         atLogin = AT_LOGIN_RESET_SPELLS;
         sWorld.SendWorldText(LANG_RESETALL_SPELLS);
-        if(!m_session)
+        if (!m_session)
             SendSysMessage(LANG_RESETALL_SPELLS);
     }
-    else if(casename=="talents")
+    else if (casename == "talents")
     {
         atLogin = AtLoginFlags(AT_LOGIN_RESET_TALENTS | AT_LOGIN_RESET_PET_TALENTS);
         sWorld.SendWorldText(LANG_RESETALL_TALENTS);
-        if(!m_session)
+        if (!m_session)
             SendSysMessage(LANG_RESETALL_TALENTS);
     }
     else
@@ -5209,7 +5324,7 @@ bool ChatHandler::HandleServerShutDownCommand(char* args)
     if (exitcode > 125)
         return false;
 
-    sWorld.ShutdownServ (delay, 0, exitcode);
+    sWorld.ShutdownServ(delay, 0, exitcode);
     return true;
 }
 
@@ -5249,7 +5364,7 @@ bool ChatHandler::HandleServerIdleRestartCommand(char* args)
     if (exitcode > 125)
         return false;
 
-    sWorld.ShutdownServ(delay, SHUTDOWN_MASK_RESTART|SHUTDOWN_MASK_IDLE, exitcode);
+    sWorld.ShutdownServ(delay, SHUTDOWN_MASK_RESTART | SHUTDOWN_MASK_IDLE, exitcode);
     return true;
 }
 
@@ -5276,7 +5391,7 @@ bool ChatHandler::HandleServerIdleShutDownCommand(char* args)
 bool ChatHandler::HandleQuestAddCommand(char* args)
 {
     Player* player = getSelectedPlayer();
-    if(!player)
+    if (!player)
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
         SetSentErrorMessage(true);
@@ -5290,17 +5405,17 @@ bool ChatHandler::HandleQuestAddCommand(char* args)
         return false;
 
     Quest const* pQuest = sObjectMgr.GetQuestTemplate(entry);
-    if(!pQuest)
+    if (!pQuest)
     {
-        PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND,entry);
+        PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
         SetSentErrorMessage(true);
         return false;
     }
 
     // check item starting quest (it can work incorrectly if added without item in inventory)
-    for (uint32 id = 0; id < sItemStorage.MaxEntry; ++id)
+    for (uint32 id = 0; id < sItemStorage.GetMaxEntry(); ++id)
     {
-        ItemPrototype const *pProto = sItemStorage.LookupEntry<ItemPrototype>(id);
+        ItemPrototype const* pProto = sItemStorage.LookupEntry<ItemPrototype>(id);
         if (!pProto)
             continue;
 
@@ -5350,23 +5465,24 @@ bool ChatHandler::HandleQuestRemoveCommand(char* args)
     }
 
     // remove all quest entries for 'entry' from quest log
-    for(uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot )
+    for (uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot)
     {
         uint32 quest = player->GetQuestSlotQuestId(slot);
-        if (quest==entry)
+        if (quest == entry)
         {
-            player->SetQuestSlot(slot,0);
+            player->SetQuestSlot(slot, 0);
 
             // we ignore unequippable quest items in this case, its' still be equipped
-            player->TakeQuestSourceItem( quest, false );
+            player->TakeQuestSourceItem(quest, false);
         }
     }
 
     // set quest status to not started (will updated in DB at next save)
-    player->SetQuestStatus( entry, QUEST_STATUS_NONE);
+    player->SetQuestStatus(entry, QUEST_STATUS_NONE);
 
     // reset rewarded for restart repeatable quest
-    player->getQuestStatusMap()[entry].m_rewarded = false;
+    if (QuestStatusData* data = player->GetQuestStatusData(entry))
+        data->m_rewarded = false;
 
     SendSysMessage(LANG_COMMAND_QUEST_REMOVED);
     return true;
@@ -5399,56 +5515,56 @@ bool ChatHandler::HandleQuestCompleteCommand(char* args)
     }
 
     // Add quest items for quests that require items
-    for(uint8 x = 0; x < QUEST_ITEM_OBJECTIVES_COUNT; ++x)
+    for (uint8 x = 0; x < QUEST_ITEM_OBJECTIVES_COUNT; ++x)
     {
         uint32 id = pQuest->ReqItemId[x];
         uint32 count = pQuest->ReqItemCount[x];
         if (!id || !count)
             continue;
 
-        uint32 curItemCount = player->GetItemCount(id,true);
+        uint32 curItemCount = player->GetItemCount(id, true);
 
         ItemPosCountVec dest;
-        uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, id, count - curItemCount );
+        uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, id, count - curItemCount);
         if (msg == EQUIP_ERR_OK)
         {
-            Item* item = player->StoreNewItem( dest, id, true);
-            player->SendNewItem(item,count-curItemCount, true, false);
+            Item* item = player->StoreNewItem(dest, id, true);
+            player->SendNewItem(item, count - curItemCount, true, false);
         }
     }
 
     // All creature/GO slain/casted (not required, but otherwise it will display "Creature slain 0/10")
-    for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
+    for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
     {
         int32 creature = pQuest->ReqCreatureOrGOId[i];
         uint32 creaturecount = pQuest->ReqCreatureOrGOCount[i];
 
         if (uint32 spell_id = pQuest->ReqSpell[i])
         {
-            for(uint16 z = 0; z < creaturecount; ++z)
+            for (uint16 z = 0; z < creaturecount; ++z)
                 player->CastedCreatureOrGO(creature, ObjectGuid(), spell_id);
         }
         else if (creature > 0)
         {
             if (CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(creature))
-                for(uint16 z = 0; z < creaturecount; ++z)
+                for (uint16 z = 0; z < creaturecount; ++z)
                     player->KilledMonster(cInfo, ObjectGuid());
         }
         else if (creature < 0)
         {
-            for(uint16 z = 0; z < creaturecount; ++z)
+            for (uint16 z = 0; z < creaturecount; ++z)
                 player->CastedCreatureOrGO(-creature, ObjectGuid(), 0);
         }
     }
 
     // If the quest requires reputation to complete
-    if(uint32 repFaction = pQuest->GetRepObjectiveFaction())
+    if (uint32 repFaction = pQuest->GetRepObjectiveFaction())
     {
         uint32 repValue = pQuest->GetRepObjectiveValue();
         uint32 curRep = player->GetReputationMgr().GetReputation(repFaction);
         if (curRep < repValue)
-            if (FactionEntry const *factionEntry = sFactionStore.LookupEntry(repFaction))
-                player->GetReputationMgr().SetReputation(factionEntry,repValue);
+            if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(repFaction))
+                player->GetReputationMgr().SetReputation(factionEntry, repValue);
     }
 
     // If the quest requires money
@@ -5487,27 +5603,27 @@ bool ChatHandler::HandleBanHelper(BanMode mode, char* args)
     std::string nameOrIP = cnameOrIP;
 
     char* duration = ExtractArg(&args);                     // time string
-    if(!duration)
+    if (!duration)
         return false;
 
     uint32 duration_secs = TimeStringToSecs(duration);
 
     char* reason = ExtractArg(&args);
-    if(!reason)
+    if (!reason)
         return false;
 
-    switch(mode)
+    switch (mode)
     {
         case BAN_ACCOUNT:
             if (!AccountMgr::normalizeString(nameOrIP))
             {
-                PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,nameOrIP.c_str());
+                PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP.c_str());
                 SetSentErrorMessage(true);
                 return false;
             }
             break;
         case BAN_CHARACTER:
-            if(!normalizePlayerName(nameOrIP))
+            if (!normalizePlayerName(nameOrIP))
             {
                 SendSysMessage(LANG_PLAYER_NOT_FOUND);
                 SetSentErrorMessage(true);
@@ -5515,32 +5631,61 @@ bool ChatHandler::HandleBanHelper(BanMode mode, char* args)
             }
             break;
         case BAN_IP:
-            if(!IsIPAddress(nameOrIP.c_str()))
+            if (!IsIPAddress(nameOrIP.c_str()))
                 return false;
             break;
     }
 
-    switch(sWorld.BanAccount(mode, nameOrIP, duration_secs, reason,m_session ? m_session->GetPlayerName() : ""))
+    switch (sWorld.BanAccount(mode, nameOrIP, duration_secs, reason, m_session ? m_session->GetPlayerName() : ""))
     {
         case BAN_SUCCESS:
             if (duration_secs > 0)
-                PSendSysMessage(LANG_BAN_YOUBANNED, nameOrIP.c_str(), secsToTimeString(duration_secs,true).c_str(), reason);
+                PSendSysMessage(LANG_BAN_YOUBANNED, nameOrIP.c_str(), secsToTimeString(duration_secs, true).c_str(), reason);
             else
                 PSendSysMessage(LANG_BAN_YOUPERMBANNED, nameOrIP.c_str(), reason);
+            if (sWorld.getConfig(CONFIG_BOOL_GM_ANNOUNCE_BAN))
+            {
+                std::string GMnameLink;
+                if (m_session)
+                    GMnameLink = playerLink(m_session->GetPlayerName());
+                else
+                    GMnameLink = "";
+                switch(mode)
+                {
+                    case BAN_ACCOUNT:
+                        if (duration_secs > 0)
+                            PSendGlobalSysMessage(LANG_BAN_ACCOUNT_ANNOUNCE, GMnameLink.c_str(), nameOrIP.c_str(), secsToTimeString(duration_secs, true).c_str(), reason);
+                        else
+                            PSendGlobalSysMessage(LANG_PERMBAN_ACCOUNT_ANNOUNCE, GMnameLink.c_str(), nameOrIP.c_str(), reason);
+                        break;
+                    case BAN_CHARACTER:
+                        if (duration_secs > 0)
+                            PSendGlobalSysMessage(LANG_BAN_CHARACTER_ANNOUNCE, GMnameLink.c_str(), nameOrIP.c_str(), secsToTimeString(duration_secs, true).c_str(), reason);
+                        else
+                            PSendGlobalSysMessage(LANG_PERMBAN_CHARACTER_ANNOUNCE, GMnameLink.c_str(), nameOrIP.c_str(), reason);
+                       break;
+                    case BAN_IP:
+                        if (duration_secs > 0)
+                            PSendGlobalSysMessage(LANG_BAN_IP_ANNOUNCE, GMnameLink.c_str(), nameOrIP.c_str(), secsToTimeString(duration_secs, true).c_str(), reason);
+                        else
+                            PSendGlobalSysMessage(LANG_PERMBAN_IP_ANNOUNCE, GMnameLink.c_str(), nameOrIP.c_str(), reason);
+                        break;
+                }
+            }
             break;
         case BAN_SYNTAX_ERROR:
             return false;
         case BAN_NOTFOUND:
-            switch(mode)
+            switch (mode)
             {
                 default:
-                    PSendSysMessage(LANG_BAN_NOTFOUND,"account", nameOrIP.c_str());
+                    PSendSysMessage(LANG_BAN_NOTFOUND, "account", nameOrIP.c_str());
                     break;
                 case BAN_CHARACTER:
-                    PSendSysMessage(LANG_BAN_NOTFOUND,"character", nameOrIP.c_str());
+                    PSendSysMessage(LANG_BAN_NOTFOUND, "character", nameOrIP.c_str());
                     break;
                 case BAN_IP:
-                    PSendSysMessage(LANG_BAN_NOTFOUND,"ip", nameOrIP.c_str());
+                    PSendSysMessage(LANG_BAN_NOTFOUND, "ip", nameOrIP.c_str());
                     break;
             }
             SetSentErrorMessage(true);
@@ -5576,18 +5721,18 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, char* args)
 
     std::string nameOrIP = cnameOrIP;
 
-    switch(mode)
+    switch (mode)
     {
         case BAN_ACCOUNT:
             if (!AccountMgr::normalizeString(nameOrIP))
             {
-                PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,nameOrIP.c_str());
+                PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP.c_str());
                 SetSentErrorMessage(true);
                 return false;
             }
             break;
         case BAN_CHARACTER:
-            if(!normalizePlayerName(nameOrIP))
+            if (!normalizePlayerName(nameOrIP))
             {
                 SendSysMessage(LANG_PLAYER_NOT_FOUND);
                 SetSentErrorMessage(true);
@@ -5595,15 +5740,15 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, char* args)
             }
             break;
         case BAN_IP:
-            if(!IsIPAddress(nameOrIP.c_str()))
+            if (!IsIPAddress(nameOrIP.c_str()))
                 return false;
             break;
     }
 
-    if(sWorld.RemoveBanAccount(mode,nameOrIP))
-        PSendSysMessage(LANG_UNBAN_UNBANNED,nameOrIP.c_str());
+    if (sWorld.RemoveBanAccount(mode, nameOrIP))
+        PSendSysMessage(LANG_UNBAN_UNBANNED, nameOrIP.c_str());
     else
-        PSendSysMessage(LANG_UNBAN_ERROR,nameOrIP.c_str());
+        PSendSysMessage(LANG_UNBAN_ERROR, nameOrIP.c_str());
 
     return true;
 }
@@ -5618,7 +5763,7 @@ bool ChatHandler::HandleBanInfoAccountCommand(char* args)
     if (!accountid)
         return false;
 
-    return HandleBanInfoHelper(accountid,account_name.c_str());
+    return HandleBanInfoHelper(accountid, account_name.c_str());
 }
 
 bool ChatHandler::HandleBanInfoCharacterCommand(char* args)
@@ -5628,41 +5773,42 @@ bool ChatHandler::HandleBanInfoCharacterCommand(char* args)
     if (!ExtractPlayerTarget(&args, &target, &target_guid))
         return false;
 
-    uint32 accountid = target ? target->GetSession()->GetAccountId() : sObjectMgr.GetPlayerAccountIdByGUID(target_guid);
+    uint32 accountid = target ? target->GetSession()->GetAccountId() : sAccountMgr.GetPlayerAccountIdByGUID(target_guid);
 
     std::string accountname;
-    if (!sAccountMgr.GetName(accountid,accountname))
+    if (!sAccountMgr.GetName(accountid, accountname))
     {
         PSendSysMessage(LANG_BANINFO_NOCHARACTER);
         return true;
     }
 
-    return HandleBanInfoHelper(accountid,accountname.c_str());
+    return HandleBanInfoHelper(accountid, accountname.c_str());
 }
 
 bool ChatHandler::HandleBanInfoHelper(uint32 accountid, char const* accountname)
 {
-    QueryResult *result = LoginDatabase.PQuery("SELECT FROM_UNIXTIME(bandate), unbandate-bandate, active, unbandate,banreason,bannedby FROM account_banned WHERE id = '%u' ORDER BY bandate ASC",accountid);
-    if(!result)
+    QueryResult* result = LoginDatabase.PQuery("SELECT FROM_UNIXTIME(bandate), unbandate-bandate, active, unbandate,banreason,bannedby FROM account_banned WHERE id = '%u' ORDER BY bandate ASC", accountid);
+    if (!result)
     {
         PSendSysMessage(LANG_BANINFO_NOACCOUNTBAN, accountname);
         return true;
     }
 
-    PSendSysMessage(LANG_BANINFO_BANHISTORY,accountname);
+    PSendSysMessage(LANG_BANINFO_BANHISTORY, accountname);
     do
     {
         Field* fields = result->Fetch();
 
         time_t unbandate = time_t(fields[3].GetUInt64());
         bool active = false;
-        if(fields[2].GetBool() && (fields[1].GetUInt64() == (uint64)0 ||unbandate >= time(NULL)) )
+        if (fields[2].GetBool() && (fields[1].GetUInt64() == (uint64)0 || unbandate >= time(NULL)))
             active = true;
         bool permanent = (fields[1].GetUInt64() == (uint64)0);
-        std::string bantime = permanent?GetMangosString(LANG_BANINFO_INFINITE):secsToTimeString(fields[1].GetUInt64(), true);
+        std::string bantime = permanent ? GetMangosString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[1].GetUInt64(), true);
         PSendSysMessage(LANG_BANINFO_HISTORYENTRY,
-            fields[0].GetString(), bantime.c_str(), active ? GetMangosString(LANG_BANINFO_YES):GetMangosString(LANG_BANINFO_NO), fields[4].GetString(), fields[5].GetString());
-    }while (result->NextRow());
+                        fields[0].GetString(), bantime.c_str(), active ? GetMangosString(LANG_BANINFO_YES) : GetMangosString(LANG_BANINFO_NO), fields[4].GetString(), fields[5].GetString());
+    }
+    while (result->NextRow());
 
     delete result;
     return true;
@@ -5674,7 +5820,7 @@ bool ChatHandler::HandleBanInfoIPCommand(char* args)
         return false;
 
     char* cIP = ExtractQuotedOrLiteralArg(&args);
-    if(!cIP)
+    if (!cIP)
         return false;
 
     if (!IsIPAddress(cIP))
@@ -5683,18 +5829,18 @@ bool ChatHandler::HandleBanInfoIPCommand(char* args)
     std::string IP = cIP;
 
     LoginDatabase.escape_string(IP);
-    QueryResult *result = LoginDatabase.PQuery("SELECT ip, FROM_UNIXTIME(bandate), FROM_UNIXTIME(unbandate), unbandate-UNIX_TIMESTAMP(), banreason,bannedby,unbandate-bandate FROM ip_banned WHERE ip = '%s'",IP.c_str());
-    if(!result)
+    QueryResult* result = LoginDatabase.PQuery("SELECT ip, FROM_UNIXTIME(bandate), FROM_UNIXTIME(unbandate), unbandate-UNIX_TIMESTAMP(), banreason,bannedby,unbandate-bandate FROM ip_banned WHERE ip = '%s'", IP.c_str());
+    if (!result)
     {
         PSendSysMessage(LANG_BANINFO_NOIP);
         return true;
     }
 
-    Field *fields = result->Fetch();
+    Field* fields = result->Fetch();
     bool permanent = !fields[6].GetUInt64();
     PSendSysMessage(LANG_BANINFO_IPENTRY,
-        fields[0].GetString(), fields[1].GetString(), permanent ? GetMangosString(LANG_BANINFO_NEVER):fields[2].GetString(),
-        permanent ? GetMangosString(LANG_BANINFO_INFINITE):secsToTimeString(fields[3].GetUInt64(), true).c_str(), fields[4].GetString(), fields[5].GetString());
+                    fields[0].GetString(), fields[1].GetString(), permanent ? GetMangosString(LANG_BANINFO_NEVER) : fields[2].GetString(),
+                    permanent ? GetMangosString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].GetUInt64(), true).c_str(), fields[4].GetString(), fields[5].GetString());
     delete result;
     return true;
 }
@@ -5704,12 +5850,12 @@ bool ChatHandler::HandleBanListCharacterCommand(char* args)
     LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
 
     char* cFilter = ExtractLiteralArg(&args);
-    if(!cFilter)
+    if (!cFilter)
         return false;
 
     std::string filter = cFilter;
     LoginDatabase.escape_string(filter);
-    QueryResult* result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE name "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"),filter.c_str());
+    QueryResult* result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE name " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'"), filter.c_str());
     if (!result)
     {
         PSendSysMessage(LANG_BANLIST_NOCHARACTER);
@@ -5729,16 +5875,16 @@ bool ChatHandler::HandleBanListAccountCommand(char* args)
 
     QueryResult* result;
 
-    if(filter.empty())
+    if (filter.empty())
     {
         result = LoginDatabase.Query("SELECT account.id, username FROM account, account_banned"
-            " WHERE account.id = account_banned.id AND active = 1 GROUP BY account.id");
+                                     " WHERE account.id = account_banned.id AND active = 1 GROUP BY account.id");
     }
     else
     {
         result = LoginDatabase.PQuery("SELECT account.id, username FROM account, account_banned"
-            " WHERE account.id = account_banned.id AND active = 1 AND username "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'")" GROUP BY account.id",
-            filter.c_str());
+                                      " WHERE account.id = account_banned.id AND active = 1 AND username " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'")" GROUP BY account.id",
+                                      filter.c_str());
     }
 
     if (!result)
@@ -5755,21 +5901,22 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result)
     PSendSysMessage(LANG_BANLIST_MATCHINGACCOUNT);
 
     // Chat short output
-    if(m_session)
+    if (m_session)
     {
         do
         {
             Field* fields = result->Fetch();
             uint32 accountid = fields[0].GetUInt32();
 
-            QueryResult* banresult = LoginDatabase.PQuery("SELECT account.username FROM account,account_banned WHERE account_banned.id='%u' AND account_banned.id=account.id",accountid);
-            if(banresult)
+            QueryResult* banresult = LoginDatabase.PQuery("SELECT account.username FROM account,account_banned WHERE account_banned.id='%u' AND account_banned.id=account.id", accountid);
+            if (banresult)
             {
                 Field* fields2 = banresult->Fetch();
-                PSendSysMessage("%s",fields2[0].GetString());
+                PSendSysMessage("%s", fields2[0].GetString());
                 delete banresult;
             }
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
     }
     // Console wide output
     else
@@ -5780,23 +5927,23 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result)
         do
         {
             SendSysMessage("-------------------------------------------------------------------------------");
-            Field *fields = result->Fetch();
-            uint32 account_id = fields[0].GetUInt32 ();
+            Field* fields = result->Fetch();
+            uint32 account_id = fields[0].GetUInt32();
 
             std::string account_name;
 
             // "account" case, name can be get in same query
-            if(result->GetFieldCount() > 1)
+            if (result->GetFieldCount() > 1)
                 account_name = fields[1].GetCppString();
             // "character" case, name need extract from another DB
             else
-                sAccountMgr.GetName (account_id,account_name);
+                sAccountMgr.GetName(account_id, account_name);
 
             // No SQL injection. id is uint32.
-            QueryResult *banInfo = LoginDatabase.PQuery("SELECT bandate,unbandate,bannedby,banreason FROM account_banned WHERE id = %u ORDER BY unbandate", account_id);
+            QueryResult* banInfo = LoginDatabase.PQuery("SELECT bandate,unbandate,bannedby,banreason FROM account_banned WHERE id = %u ORDER BY unbandate", account_id);
             if (banInfo)
             {
-                Field *fields2 = banInfo->Fetch();
+                Field* fields2 = banInfo->Fetch();
                 do
                 {
                     time_t t_ban = fields2[0].GetUInt64();
@@ -5805,22 +5952,24 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result)
                     if (fields2[0].GetUInt64() == fields2[1].GetUInt64())
                     {
                         PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|   permanent  |%-15.15s|%-15.15s|",
-                            account_name.c_str(),aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min,
-                            fields2[2].GetString(),fields2[3].GetString());
+                                        account_name.c_str(), aTm_ban->tm_year % 100, aTm_ban->tm_mon + 1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min,
+                                        fields2[2].GetString(), fields2[3].GetString());
                     }
                     else
                     {
                         time_t t_unban = fields2[1].GetUInt64();
                         tm* aTm_unban = localtime(&t_unban);
                         PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|%02d-%02d-%02d %02d:%02d|%-15.15s|%-15.15s|",
-                            account_name.c_str(),aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min,
-                            aTm_unban->tm_year%100, aTm_unban->tm_mon+1, aTm_unban->tm_mday, aTm_unban->tm_hour, aTm_unban->tm_min,
-                            fields2[2].GetString(),fields2[3].GetString());
+                                        account_name.c_str(), aTm_ban->tm_year % 100, aTm_ban->tm_mon + 1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min,
+                                        aTm_unban->tm_year % 100, aTm_unban->tm_mon + 1, aTm_unban->tm_mday, aTm_unban->tm_hour, aTm_unban->tm_min,
+                                        fields2[2].GetString(), fields2[3].GetString());
                     }
-                }while ( banInfo->NextRow() );
+                }
+                while (banInfo->NextRow());
                 delete banInfo;
             }
-        }while( result->NextRow() );
+        }
+        while (result->NextRow());
         SendSysMessage("===============================================================================");
     }
 
@@ -5838,20 +5987,20 @@ bool ChatHandler::HandleBanListIPCommand(char* args)
 
     QueryResult* result;
 
-    if(filter.empty())
+    if (filter.empty())
     {
-        result = LoginDatabase.Query ("SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned"
-            " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP())"
-            " ORDER BY unbandate" );
+        result = LoginDatabase.Query("SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned"
+                                     " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP())"
+                                     " ORDER BY unbandate");
     }
     else
     {
-        result = LoginDatabase.PQuery( "SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned"
-            " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP()) AND ip "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'")
-            " ORDER BY unbandate",filter.c_str() );
+        result = LoginDatabase.PQuery("SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned"
+                                      " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP()) AND ip " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'")
+                                      " ORDER BY unbandate", filter.c_str());
     }
 
-    if(!result)
+    if (!result)
     {
         PSendSysMessage(LANG_BANLIST_NOIP);
         return true;
@@ -5859,13 +6008,14 @@ bool ChatHandler::HandleBanListIPCommand(char* args)
 
     PSendSysMessage(LANG_BANLIST_MATCHINGIP);
     // Chat short output
-    if(m_session)
+    if (m_session)
     {
         do
         {
             Field* fields = result->Fetch();
-            PSendSysMessage("%s",fields[0].GetString());
-        } while (result->NextRow());
+            PSendSysMessage("%s", fields[0].GetString());
+        }
+        while (result->NextRow());
     }
     // Console wide output
     else
@@ -5876,25 +6026,26 @@ bool ChatHandler::HandleBanListIPCommand(char* args)
         do
         {
             SendSysMessage("-------------------------------------------------------------------------------");
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             time_t t_ban = fields[1].GetUInt64();
             tm* aTm_ban = localtime(&t_ban);
-            if ( fields[1].GetUInt64() == fields[2].GetUInt64() )
+            if (fields[1].GetUInt64() == fields[2].GetUInt64())
             {
                 PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|   permanent  |%-15.15s|%-15.15s|",
-                    fields[0].GetString(), aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min,
-                    fields[3].GetString(), fields[4].GetString());
+                                fields[0].GetString(), aTm_ban->tm_year % 100, aTm_ban->tm_mon + 1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min,
+                                fields[3].GetString(), fields[4].GetString());
             }
             else
             {
                 time_t t_unban = fields[2].GetUInt64();
                 tm* aTm_unban = localtime(&t_unban);
                 PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|%02d-%02d-%02d %02d:%02d|%-15.15s|%-15.15s|",
-                    fields[0].GetString(), aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min,
-                    aTm_unban->tm_year%100, aTm_unban->tm_mon+1, aTm_unban->tm_mday, aTm_unban->tm_hour, aTm_unban->tm_min,
-                    fields[3].GetString(), fields[4].GetString());
+                                fields[0].GetString(), aTm_ban->tm_year % 100, aTm_ban->tm_mon + 1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min,
+                                aTm_unban->tm_year % 100, aTm_unban->tm_mon + 1, aTm_unban->tm_mday, aTm_unban->tm_hour, aTm_unban->tm_min,
+                                fields[3].GetString(), fields[4].GetString());
             }
-        }while( result->NextRow() );
+        }
+        while (result->NextRow());
         SendSysMessage("===============================================================================");
     }
 
@@ -5923,7 +6074,7 @@ bool ChatHandler::HandleRespawnCommand(char* /*args*/)
     }
 
     MaNGOS::RespawnDo u_do;
-    MaNGOS::WorldObjectWorker<MaNGOS::RespawnDo> worker(pl,u_do);
+    MaNGOS::WorldObjectWorker<MaNGOS::RespawnDo> worker(pl, u_do);
     Cell::VisitGridObjects(pl, worker, pl->GetMap()->GetVisibilityDistance());
     return true;
 }
@@ -5938,12 +6089,11 @@ bool ChatHandler::HandleGMFlyCommand(char* args)
         return false;
     }
 
-    Player *target = getSelectedPlayer();
+    Player* target = getSelectedPlayer();
     if (!target)
         target = m_session->GetPlayer();
 
-    WorldPacket data(12);
-    data.SetOpcode(value ? SMSG_MOVE_SET_CAN_FLY : SMSG_MOVE_UNSET_CAN_FLY);
+    WorldPacket data(value ? SMSG_MOVE_SET_CAN_FLY : SMSG_MOVE_UNSET_CAN_FLY, 12);
     data << target->GetPackGUID();
     data << uint32(0);                                      // unknown
     target->SendMessageToSet(&data, true);
@@ -5951,7 +6101,7 @@ bool ChatHandler::HandleGMFlyCommand(char* args)
     return true;
 }
 
-bool ChatHandler::HandlePDumpLoadCommand(char *args)
+bool ChatHandler::HandlePDumpLoadCommand(char* args)
 {
     char* file = ExtractQuotedOrLiteralArg(&args);
     if (!file)
@@ -5978,7 +6128,7 @@ bool ChatHandler::HandlePDumpLoadCommand(char *args)
             return false;
         }
 
-        if (ObjectMgr::CheckPlayerName(name,true) != CHAR_NAME_SUCCESS)
+        if (ObjectMgr::CheckPlayerName(name, true) != CHAR_NAME_SUCCESS)
         {
             PSendSysMessage(LANG_INVALID_CHARACTER_NAME);
             SetSentErrorMessage(true);
@@ -5999,7 +6149,7 @@ bool ChatHandler::HandlePDumpLoadCommand(char *args)
 
             ObjectGuid guid = ObjectGuid(HIGHGUID_PLAYER, lowguid);
 
-            if (sObjectMgr.GetPlayerAccountIdByGUID(guid))
+            if (sAccountMgr.GetPlayerAccountIdByGUID(guid))
             {
                 PSendSysMessage(LANG_CHARACTER_GUID_IN_USE, lowguid);
                 SetSentErrorMessage(true);
@@ -6008,21 +6158,21 @@ bool ChatHandler::HandlePDumpLoadCommand(char *args)
         }
     }
 
-    switch(PlayerDumpReader().LoadDump(file, account_id, name, lowguid))
+    switch (PlayerDumpReader().LoadDump(file, account_id, name, lowguid))
     {
         case DUMP_SUCCESS:
             PSendSysMessage(LANG_COMMAND_IMPORT_SUCCESS);
             break;
         case DUMP_FILE_OPEN_ERROR:
-            PSendSysMessage(LANG_FILE_OPEN_FAIL,file);
+            PSendSysMessage(LANG_FILE_OPEN_FAIL, file);
             SetSentErrorMessage(true);
             return false;
         case DUMP_FILE_BROKEN:
-            PSendSysMessage(LANG_DUMP_BROKEN,file);
+            PSendSysMessage(LANG_DUMP_BROKEN, file);
             SetSentErrorMessage(true);
             return false;
         case DUMP_TOO_MANY_CHARS:
-            PSendSysMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL,account_name.c_str(),account_id);
+            PSendSysMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, account_name.c_str(), account_id);
             SetSentErrorMessage(true);
             return false;
         default:
@@ -6034,7 +6184,7 @@ bool ChatHandler::HandlePDumpLoadCommand(char *args)
     return true;
 }
 
-bool ChatHandler::HandlePDumpWriteCommand(char *args)
+bool ChatHandler::HandlePDumpWriteCommand(char* args)
 {
     if (!*args)
         return false;
@@ -6058,7 +6208,7 @@ bool ChatHandler::HandlePDumpWriteCommand(char *args)
             return false;
         }
 
-        guid = sObjectMgr.GetPlayerGuidByName(name);
+        guid = sAccountMgr.GetPlayerGuidByName(name);
         if (!guid)
         {
             PSendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -6071,20 +6221,20 @@ bool ChatHandler::HandlePDumpWriteCommand(char *args)
     else
         guid = ObjectGuid(HIGHGUID_PLAYER, lowguid);
 
-    if (!sObjectMgr.GetPlayerAccountIdByGUID(guid))
+    if (!sAccountMgr.GetPlayerAccountIdByGUID(guid))
     {
         PSendSysMessage(LANG_PLAYER_NOT_FOUND);
         SetSentErrorMessage(true);
         return false;
     }
 
-    switch(PlayerDumpWriter().WriteDump(file, lowguid))
+    switch (PlayerDumpWriter().WriteDump(file, lowguid))
     {
         case DUMP_SUCCESS:
             PSendSysMessage(LANG_COMMAND_EXPORT_SUCCESS);
             break;
         case DUMP_FILE_OPEN_ERROR:
-            PSendSysMessage(LANG_FILE_OPEN_FAIL,file);
+            PSendSysMessage(LANG_FILE_OPEN_FAIL, file);
             SetSentErrorMessage(true);
             return false;
         default:
@@ -6099,85 +6249,86 @@ bool ChatHandler::HandlePDumpWriteCommand(char *args)
 bool ChatHandler::HandleMovegensCommand(char* /*args*/)
 {
     Unit* unit = getSelectedUnit();
-    if(!unit)
+    if (!unit)
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
 
-    PSendSysMessage(LANG_MOVEGENS_LIST,(unit->GetTypeId()==TYPEID_PLAYER ? "Player" : "Creature" ),unit->GetGUIDLow());
+    PSendSysMessage(LANG_MOVEGENS_LIST, unit->GetObjectGuid().GetString().c_str());
+
+    UnitStateMgr& statemgr = unit->GetUnitStateMgr();
 
-    MotionMaster* mm = unit->GetMotionMaster();
-    float x,y,z;
-    mm->GetDestination(x,y,z);
-    for(MotionMaster::const_iterator itr = mm->begin(); itr != mm->end(); ++itr)
+    float x, y, z;
+    for (int32 i = UNIT_ACTION_PRIORITY_IDLE; i != UNIT_ACTION_PRIORITY_END; ++i)
     {
-        switch((*itr)->GetMovementGeneratorType())
+        ActionInfo* actionInfo = statemgr.GetAction(UnitActionPriority(i));
+        if (!actionInfo)
+            continue;
+
+        UnitActionPtr action = actionInfo->Action();
+
+        PSendSysMessage(LANG_MOVEGENS_DEFAULT, i, action->Name());
+
+        switch(action->GetMovementGeneratorType())
         {
-            case IDLE_MOTION_TYPE:          SendSysMessage(LANG_MOVEGENS_IDLE);          break;
-            case RANDOM_MOTION_TYPE:        SendSysMessage(LANG_MOVEGENS_RANDOM);        break;
-            case WAYPOINT_MOTION_TYPE:      SendSysMessage(LANG_MOVEGENS_WAYPOINT);      break;
-            case CONFUSED_MOTION_TYPE:      SendSysMessage(LANG_MOVEGENS_CONFUSED);      break;
+            case IDLE_MOTION_TYPE:
+            case RANDOM_MOTION_TYPE:
+            case WAYPOINT_MOTION_TYPE:
+            case CONFUSED_MOTION_TYPE:
+            case FLIGHT_MOTION_TYPE:
+            case FLEEING_MOTION_TYPE:
+            case DISTRACT_MOTION_TYPE:
+            case EFFECT_MOTION_TYPE:
+                break;
 
             case CHASE_MOTION_TYPE:
             {
                 Unit* target = NULL;
-                if(unit->GetTypeId()==TYPEID_PLAYER)
-                    target = static_cast<ChaseMovementGenerator<Player> const*>(*itr)->GetTarget();
+                if (unit->GetTypeId() == TYPEID_PLAYER)
+                    target = static_cast<ChaseMovementGenerator<Player> const*>(&*action)->GetTarget();
                 else
-                    target = static_cast<ChaseMovementGenerator<Creature> const*>(*itr)->GetTarget();
+                    target = static_cast<ChaseMovementGenerator<Creature> const*>(&*action)->GetTarget();
 
-                if (!target)
-                    SendSysMessage(LANG_MOVEGENS_CHASE_NULL);
-                else if (target->GetTypeId()==TYPEID_PLAYER)
-                    PSendSysMessage(LANG_MOVEGENS_CHASE_PLAYER,target->GetName(),target->GetGUIDLow());
-                else
-                    PSendSysMessage(LANG_MOVEGENS_CHASE_CREATURE,target->GetName(),target->GetGUIDLow());
+                PSendSysMessage(LANG_MOVEGENS_CHASE_TARGET,target ? target->GetObjectGuid().GetString().c_str() : "<NULL>");
                 break;
             }
             case FOLLOW_MOTION_TYPE:
             {
                 Unit* target = NULL;
-                if(unit->GetTypeId()==TYPEID_PLAYER)
-                    target = static_cast<FollowMovementGenerator<Player> const*>(*itr)->GetTarget();
+                if (unit->GetTypeId() == TYPEID_PLAYER)
+                    target = static_cast<FollowMovementGenerator<Player> const*>(&*action)->GetTarget();
                 else
-                    target = static_cast<FollowMovementGenerator<Creature> const*>(*itr)->GetTarget();
+                    target = static_cast<FollowMovementGenerator<Creature> const*>(&*action)->GetTarget();
 
-                if (!target)
-                    SendSysMessage(LANG_MOVEGENS_FOLLOW_NULL);
-                else if (target->GetTypeId()==TYPEID_PLAYER)
-                    PSendSysMessage(LANG_MOVEGENS_FOLLOW_PLAYER,target->GetName(),target->GetGUIDLow());
-                else
-                    PSendSysMessage(LANG_MOVEGENS_FOLLOW_CREATURE,target->GetName(),target->GetGUIDLow());
+                PSendSysMessage(LANG_MOVEGENS_FOLLOW_TARGET,target ? target->GetObjectGuid().GetString().c_str() : "<NULL>");
                 break;
             }
             case HOME_MOTION_TYPE:
-                if(unit->GetTypeId()==TYPEID_UNIT)
+                if (unit->GetTypeId() == TYPEID_UNIT)
                 {
-                    PSendSysMessage(LANG_MOVEGENS_HOME_CREATURE,x,y,z);
+                    ((Creature*)unit)->GetRespawnCoord(x, y, z);
+                    PSendSysMessage(LANG_MOVEGENS_HOME_CREATURE, x, y, z);
                 }
                 else
                     SendSysMessage(LANG_MOVEGENS_HOME_PLAYER);
                 break;
-            case FLIGHT_MOTION_TYPE:   SendSysMessage(LANG_MOVEGENS_FLIGHT);  break;
             case POINT_MOTION_TYPE:
             {
-                PSendSysMessage(LANG_MOVEGENS_POINT,x,y,z);
+                static_cast<PointMovementGenerator<Creature> const*>(&*action)->GetDestination(x,y,z);
+                PSendSysMessage(LANG_MOVEGENS_POINT, x, y, z);
                 break;
             }
-            case FLEEING_MOTION_TYPE:  SendSysMessage(LANG_MOVEGENS_FEAR);    break;
-            case DISTRACT_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_DISTRACT);  break;
-            case EFFECT_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_EFFECT);  break;
             default:
-                PSendSysMessage(LANG_MOVEGENS_UNKNOWN,(*itr)->GetMovementGeneratorType());
+                PSendSysMessage(LANG_MOVEGENS_UNKNOWN,action->Name());
                 break;
         }
     }
     return true;
 }
 
-bool ChatHandler::HandleServerPLimitCommand(char *args)
+bool ChatHandler::HandleServerPLimitCommand(char* args)
 {
     if (*args)
     {
@@ -6188,19 +6339,19 @@ bool ChatHandler::HandleServerPLimitCommand(char *args)
         int l = strlen(param);
 
         int val;
-        if(     strncmp(param,"player",l) == 0 )
+        if (strncmp(param, "player", l) == 0)
             sWorld.SetPlayerLimit(-SEC_PLAYER);
-        else if(strncmp(param,"moderator",l) == 0 )
+        else if (strncmp(param, "moderator", l) == 0)
             sWorld.SetPlayerLimit(-SEC_MODERATOR);
-        else if(strncmp(param,"gamemaster",l) == 0 )
+        else if (strncmp(param, "gamemaster", l) == 0)
             sWorld.SetPlayerLimit(-SEC_GAMEMASTER);
-        else if(strncmp(param,"administrator",l) == 0 )
+        else if (strncmp(param, "administrator", l) == 0)
             sWorld.SetPlayerLimit(-SEC_ADMINISTRATOR);
-        else if(strncmp(param,"reset",l) == 0 )
-            sWorld.SetPlayerLimit( sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT) );
-        else if(ExtractInt32(&param, val))
+        else if (strncmp(param, "reset", l) == 0)
+            sWorld.SetPlayerLimit(sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT));
+        else if (ExtractInt32(&param, val))
         {
-            if(val < -SEC_ADMINISTRATOR)
+            if (val < -SEC_ADMINISTRATOR)
                 val = -SEC_ADMINISTRATOR;
 
             sWorld.SetPlayerLimit(val);
@@ -6209,14 +6360,14 @@ bool ChatHandler::HandleServerPLimitCommand(char *args)
             return false;
 
         // kick all low security level players
-        if(sWorld.GetPlayerAmountLimit() > SEC_PLAYER)
+        if (sWorld.GetPlayerAmountLimit() > SEC_PLAYER)
             sWorld.KickAllLess(sWorld.GetPlayerSecurityLimit());
     }
 
     uint32 pLimit = sWorld.GetPlayerAmountLimit();
     AccountTypes allowedAccountType = sWorld.GetPlayerSecurityLimit();
     char const* secName = "";
-    switch(allowedAccountType)
+    switch (allowedAccountType)
     {
         case SEC_PLAYER:        secName = "Player";        break;
         case SEC_MODERATOR:     secName = "Moderator";     break;
@@ -6225,7 +6376,7 @@ bool ChatHandler::HandleServerPLimitCommand(char *args)
         default:                secName = "<unknown>";     break;
     }
 
-    PSendSysMessage("Player limits: amount %u, min. security level %s.",pLimit,secName);
+    PSendSysMessage("Player limits: amount %u, min. security level %s.", pLimit, secName);
 
     return true;
 }
@@ -6237,7 +6388,7 @@ bool ChatHandler::HandleCastCommand(char* args)
 
     Unit* target = getSelectedUnit();
 
-    if(!target)
+    if (!target)
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
@@ -6253,9 +6404,9 @@ bool ChatHandler::HandleCastCommand(char* args)
     if (!spellInfo)
         return false;
 
-    if (!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
+    if (!SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer()))
     {
-        PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell);
+        PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell);
         SetSentErrorMessage(true);
         return false;
     }
@@ -6264,7 +6415,7 @@ bool ChatHandler::HandleCastCommand(char* args)
     if (!triggered && *args)                                // can be fail also at syntax error
         return false;
 
-    m_session->GetPlayer()->CastSpell(target,spell,triggered);
+    m_session->GetPlayer()->CastSpell(target, spell, triggered);
 
     return true;
 }
@@ -6273,7 +6424,7 @@ bool ChatHandler::HandleCastBackCommand(char* args)
 {
     Creature* caster = getSelectedCreature();
 
-    if(!caster)
+    if (!caster)
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
@@ -6292,7 +6443,7 @@ bool ChatHandler::HandleCastBackCommand(char* args)
 
     caster->SetFacingToObject(m_session->GetPlayer());
 
-    caster->CastSpell(m_session->GetPlayer(),spell,triggered);
+    caster->CastSpell(m_session->GetPlayer(), spell, triggered);
 
     return true;
 }
@@ -6311,9 +6462,9 @@ bool ChatHandler::HandleCastDistCommand(char* args)
     if (!spellInfo)
         return false;
 
-    if (!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
+    if (!SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer()))
     {
-        PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell);
+        PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell);
         SetSentErrorMessage(true);
         return false;
     }
@@ -6326,10 +6477,10 @@ bool ChatHandler::HandleCastDistCommand(char* args)
     if (!triggered && *args)                                // can be fail also at syntax error
         return false;
 
-    float x,y,z;
-    m_session->GetPlayer()->GetClosePoint(x,y,z,dist);
+    float x, y, z;
+    m_session->GetPlayer()->GetClosePoint(x, y, z, dist);
 
-    m_session->GetPlayer()->CastSpell(x,y,z,spell,triggered);
+    m_session->GetPlayer()->CastSpell(x, y, z, spell, triggered);
     return true;
 }
 
@@ -6362,7 +6513,7 @@ bool ChatHandler::HandleCastTargetCommand(char* args)
 
     caster->SetFacingToObject(m_session->GetPlayer());
 
-    caster->CastSpell(caster->getVictim(),spell,triggered);
+    caster->CastSpell(caster->getVictim(), spell, triggered);
 
     return true;
 }
@@ -6372,7 +6523,7 @@ ComeToMe command REQUIRED for 3rd party scripting library to have access to Poin
 Without this function 3rd party scripting library will get linking errors (unresolved external)
 when attempting to use the PointMovementGenerator
 */
-bool ChatHandler::HandleComeToMeCommand(char *args)
+bool ChatHandler::HandleComeToMeCommand(char* /*args*/)
 {
     Creature* caster = getSelectedCreature();
 
@@ -6412,9 +6563,9 @@ bool ChatHandler::HandleCastSelfCommand(char* args)
     if (!spellInfo)
         return false;
 
-    if(!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
+    if (!SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer()))
     {
-        PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell);
+        PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell);
         SetSentErrorMessage(true);
         return false;
     }
@@ -6433,45 +6584,45 @@ bool ChatHandler::HandleInstanceListBindsCommand(char* /*args*/)
     Player* player = getSelectedPlayer();
     if (!player) player = m_session->GetPlayer();
     uint32 counter = 0;
-    for(uint8 i = 0; i < MAX_DIFFICULTY; ++i)
+    for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
     {
-        Player::BoundInstancesMap &binds = player->GetBoundInstances(Difficulty(i));
-        for(Player::BoundInstancesMap::const_iterator itr = binds.begin(); itr != binds.end(); ++itr)
+        Player::BoundInstancesMap& binds = player->GetBoundInstances(Difficulty(i));
+        for (Player::BoundInstancesMap::const_iterator itr = binds.begin(); itr != binds.end(); ++itr)
         {
-            DungeonPersistentState *state = itr->second.state;
+            DungeonPersistentState* state = itr->second.state;
             std::string timeleft = secsToTimeString(state->GetResetTime() - time(NULL), true);
             if (const MapEntry* entry = sMapStore.LookupEntry(itr->first))
             {
                 PSendSysMessage("map: %d (%s) inst: %d perm: %s diff: %d canReset: %s TTR: %s",
-                    itr->first, entry->name[GetSessionDbcLocale()], state->GetInstanceId(), itr->second.perm ? "yes" : "no",
-                    state->GetDifficulty(), state->CanReset() ? "yes" : "no", timeleft.c_str());
+                                itr->first, entry->name[GetSessionDbcLocale()], state->GetInstanceId(), itr->second.perm ? "yes" : "no",
+                                state->GetDifficulty(), state->CanReset() ? "yes" : "no", timeleft.c_str());
             }
             else
                 PSendSysMessage("bound for a nonexistent map %u", itr->first);
-            counter++;
+            ++counter;
         }
     }
     PSendSysMessage("player binds: %d", counter);
     counter = 0;
 
-    if (Group *group = player->GetGroup())
+    if (Group* group = player->GetGroup())
     {
-        for(uint8 i = 0; i < MAX_DIFFICULTY; ++i)
+        for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
         {
-            Group::BoundInstancesMap &binds = group->GetBoundInstances(Difficulty(i));
-            for(Group::BoundInstancesMap::const_iterator itr = binds.begin(); itr != binds.end(); ++itr)
+            Group::BoundInstancesMap& binds = group->GetBoundInstances(Difficulty(i));
+            for (Group::BoundInstancesMap::const_iterator itr = binds.begin(); itr != binds.end(); ++itr)
             {
-                DungeonPersistentState *state = itr->second.state;
+                DungeonPersistentState* state = itr->second.state;
                 std::string timeleft = secsToTimeString(state->GetResetTime() - time(NULL), true);
                 if (const MapEntry* entry = sMapStore.LookupEntry(itr->first))
                 {
                     PSendSysMessage("map: %d (%s) inst: %d perm: %s diff: %d canReset: %s TTR: %s",
-                        itr->first, entry->name[GetSessionDbcLocale()], state->GetInstanceId(), itr->second.perm ? "yes" : "no",
-                        state->GetDifficulty(), state->CanReset() ? "yes" : "no", timeleft.c_str());
+                                    itr->first, entry->name[GetSessionDbcLocale()], state->GetInstanceId(), itr->second.perm ? "yes" : "no",
+                                    state->GetDifficulty(), state->CanReset() ? "yes" : "no", timeleft.c_str());
                 }
                 else
                     PSendSysMessage("bound for a nonexistent map %u", itr->first);
-                counter++;
+                ++counter;
             }
         }
     }
@@ -6501,10 +6652,10 @@ bool ChatHandler::HandleInstanceUnbindCommand(char* args)
         mapid = atoi(args);
     }
 
-    for(uint8 i = 0; i < MAX_DIFFICULTY; ++i)
+    for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
     {
-        Player::BoundInstancesMap &binds = player->GetBoundInstances(Difficulty(i));
-        for(Player::BoundInstancesMap::iterator itr = binds.begin(); itr != binds.end();)
+        Player::BoundInstancesMap& binds = player->GetBoundInstances(Difficulty(i));
+        for (Player::BoundInstancesMap::iterator itr = binds.begin(); itr != binds.end();)
         {
             if (got_map && mapid != itr->first)
             {
@@ -6513,19 +6664,19 @@ bool ChatHandler::HandleInstanceUnbindCommand(char* args)
             }
             if (itr->first != player->GetMapId())
             {
-                DungeonPersistentState *save = itr->second.state;
+                DungeonPersistentState* save = itr->second.state;
                 std::string timeleft = secsToTimeString(save->GetResetTime() - time(NULL), true);
 
                 if (const MapEntry* entry = sMapStore.LookupEntry(itr->first))
                 {
                     PSendSysMessage("unbinding map: %d (%s) inst: %d perm: %s diff: %d canReset: %s TTR: %s",
-                        itr->first, entry->name[GetSessionDbcLocale()], save->GetInstanceId(), itr->second.perm ? "yes" : "no",
-                        save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str());
+                                    itr->first, entry->name[GetSessionDbcLocale()], save->GetInstanceId(), itr->second.perm ? "yes" : "no",
+                                    save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str());
                 }
                 else
                     PSendSysMessage("bound for a nonexistent map %u", itr->first);
                 player->UnbindInstance(itr, Difficulty(i));
-                counter++;
+                ++counter;
             }
             else
                 ++itr;
@@ -6571,8 +6722,10 @@ bool ChatHandler::HandleInstanceSaveDataCommand(char* /*args*/)
 bool ChatHandler::HandleGMListFullCommand(char* /*args*/)
 {
     ///- Get the accounts with GM Level >0
-    QueryResult *result = LoginDatabase.Query( "SELECT username,gmlevel FROM account WHERE gmlevel > 0" );
-    if(result)
+    QueryResult* result = LoginDatabase.PQuery("SELECT ac.username, af.gmlevel FROM account AS ac LEFT JOIN "
+                                               "account_access AS af ON (ac.id = af.id) WHERE (af.gmlevel > 0 AND (af.RealmID = '%u' OR af.RealmID = -1))"
+                                               , sConfig.GetIntDefault("RealmID", 0));
+    if (result)
     {
         SendSysMessage(LANG_GMLIST);
         SendSysMessage("========================");
@@ -6582,9 +6735,10 @@ bool ChatHandler::HandleGMListFullCommand(char* /*args*/)
         ///- Circle through them. Display username and GM level
         do
         {
-            Field *fields = result->Fetch();
-            PSendSysMessage("|%15s|%6s|", fields[0].GetString(),fields[1].GetString());
-        }while( result->NextRow() );
+            Field* fields = result->Fetch();
+            PSendSysMessage("|%15s|%6u|", fields[0].GetString(), fields[1].GetUInt8());
+        }
+        while (result->NextRow());
 
         PSendSysMessage("========================");
         delete result;
@@ -6629,12 +6783,12 @@ bool ChatHandler::ShowPlayerListHelper(QueryResult* result, uint32* limit, bool
             // check limit
             if (limit)
             {
-                if(*limit == 0)
+                if (*limit == 0)
                     break;
                 --*limit;
             }
 
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 guid      = fields[0].GetUInt32();
             std::string name = fields[1].GetCppString();
             uint8 race       = fields[2].GetUInt8();
@@ -6652,7 +6806,8 @@ bool ChatHandler::ShowPlayerListHelper(QueryResult* result, uint32* limit, bool
             else
                 PSendSysMessage(LANG_CHARACTERS_LIST_LINE_CHAT, guid, name.c_str(), name.c_str(), race_name, class_name, level);
 
-        }while( result->NextRow() );
+        }
+        while (result->NextRow());
 
         delete result;
     }
@@ -6671,11 +6826,11 @@ bool ChatHandler::HandleAccountCharactersCommand(char* args)
     std::string account_name;
     Player* target = NULL;                                  // only for triggering use targeted player account
     uint32 account_id = ExtractAccountId(&args, &account_name, &target);
-    if (!account_id )
+    if (!account_id)
         return false;
 
     ///- Get the characters for account id
-    QueryResult *result = CharacterDatabase.PQuery( "SELECT guid, name, race, class, level FROM characters WHERE account = %u", account_id);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT guid, name, race, class, level FROM characters WHERE account = %u", account_id);
 
     return ShowPlayerListHelper(result);
 }
@@ -6688,13 +6843,13 @@ bool ChatHandler::HandleAccountSetAddonCommand(char* args)
 
     std::string account_name;
     uint32 account_id = ExtractAccountId(&accountStr, &account_name);
-    if (!account_id )
+    if (!account_id)
         return false;
 
     // Let set addon state only for lesser (strong) security level
     // or to self account
-    if (GetAccountId() && GetAccountId () != account_id &&
-        HasLowerSecurityAccount (NULL,account_id,true))
+    if (GetAccountId() && GetAccountId() != account_id &&
+            HasLowerSecurityAccount(NULL, account_id, true))
         return false;
 
     uint32 lev;
@@ -6703,7 +6858,7 @@ bool ChatHandler::HandleAccountSetAddonCommand(char* args)
 
     // No SQL injection
     LoginDatabase.PExecute("UPDATE account SET expansion = '%u' WHERE id = '%u'", lev, account_id);
-    PSendSysMessage(LANG_ACCOUNT_SETADDON,account_name.c_str(), account_id, lev);
+    PSendSysMessage(LANG_ACCOUNT_SETADDON, account_name.c_str(), account_id, lev);
     return true;
 }
 
@@ -6733,6 +6888,9 @@ bool ChatHandler::HandleSendMassMailCommand(char* args)
     if (!ExtractRaceMask(&args, raceMask, &name))
         return false;
 
+    Gender gender;
+    ExtractGender(&args, gender);
+
     // need dynamic object because it trasfered to mass mailer
     MailDraft* draft = new MailDraft;
 
@@ -6746,14 +6904,12 @@ bool ChatHandler::HandleSendMassMailCommand(char* args)
     // from console show nonexistent sender
     MailSender sender(MAIL_NORMAL, m_session ? m_session->GetPlayer()->GetObjectGuid().GetCounter() : 0, MAIL_STATIONERY_GM);
 
-    sMassMailMgr.AddMassMailTask(draft, sender, raceMask);
+    sMassMailMgr.AddMassMailTask(draft, sender, raceMask, gender);
 
     PSendSysMessage(LANG_MAIL_SENT, name);
     return true;
 }
 
-
-
 bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
 {
     // format: "subject text" "mail text" item1[:count1] item2[:count2] ... item12[:count12]
@@ -6766,12 +6922,12 @@ bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
         return false;
 
     // extract items
-    typedef std::pair<uint32,uint32> ItemPair;
+    typedef std::pair<uint32, uint32> ItemPair;
     typedef std::list< ItemPair > ItemPairs;
     ItemPairs items;
 
     // get from tail next item str
-    while(char* itemStr = ExtractArg(&args))
+    while (char* itemStr = ExtractArg(&args))
     {
         // parse item str
         uint32 item_id = 0;
@@ -6780,7 +6936,7 @@ bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
             if (sscanf(itemStr, "%u", &item_id) != 1)
                 return false;
 
-        if(!item_id)
+        if (!item_id)
         {
             PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, item_id);
             SetSentErrorMessage(true);
@@ -6788,7 +6944,7 @@ bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
         }
 
         ItemPrototype const* item_proto = ObjectMgr::GetItemPrototype(item_id);
-        if(!item_proto)
+        if (!item_proto)
         {
             PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, item_id);
             SetSentErrorMessage(true);
@@ -6802,15 +6958,15 @@ bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
             return false;
         }
 
-        while(item_count > item_proto->GetMaxStackSize())
+        while (item_count > item_proto->GetMaxStackSize())
         {
-            items.push_back(ItemPair(item_id,item_proto->GetMaxStackSize()));
+            items.push_back(ItemPair(item_id, item_proto->GetMaxStackSize()));
             item_count -= item_proto->GetMaxStackSize();
         }
 
-        items.push_back(ItemPair(item_id,item_count));
+        items.push_back(ItemPair(item_id, item_count));
 
-        if(items.size() > MAX_MAIL_ITEMS)
+        if (items.size() > MAX_MAIL_ITEMS)
         {
             PSendSysMessage(LANG_COMMAND_MAIL_ITEMS_LIMIT, MAX_MAIL_ITEMS);
             SetSentErrorMessage(true);
@@ -6821,9 +6977,9 @@ bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
     // fill mail
     draft.SetSubjectAndBody(msgSubject, msgText);
 
-    for(ItemPairs::const_iterator itr = items.begin(); itr != items.end(); ++itr)
+    for (ItemPairs::const_iterator itr = items.begin(); itr != items.end(); ++itr)
     {
-        if(Item* item = Item::CreateItem(itr->first,itr->second,m_session ? m_session->GetPlayer() : 0))
+        if (Item* item = Item::CreateItem(itr->first, itr->second, m_session ? m_session->GetPlayer() : 0))
         {
             item->SaveToDB();                               // save for prevent lost at next mail load, if send fail then item will deleted
             draft.AddItem(item);
@@ -6868,10 +7024,12 @@ bool ChatHandler::HandleSendMassItemsCommand(char* args)
     if (!ExtractRaceMask(&args, raceMask, &name))
         return false;
 
+    Gender gender;
+    ExtractGender(&args, gender);
+
     // need dynamic object because it trasfered to mass mailer
     MailDraft* draft = new MailDraft;
 
-
     // fill mail
     if (!HandleSendItemsHelper(*draft, args))
     {
@@ -6882,7 +7040,7 @@ bool ChatHandler::HandleSendMassItemsCommand(char* args)
     // from console show nonexistent sender
     MailSender sender(MAIL_NORMAL, m_session ? m_session->GetPlayer()->GetObjectGuid().GetCounter() : 0, MAIL_STATIONERY_GM);
 
-    sMassMailMgr.AddMassMailTask(draft, sender, raceMask);
+    sMassMailMgr.AddMassMailTask(draft, sender, raceMask, gender);
 
     PSendSysMessage(LANG_MAIL_SENT, name);
     return true;
@@ -6932,7 +7090,7 @@ bool ChatHandler::HandleSendMoneyCommand(char* args)
     // from console show nonexistent sender
     MailSender sender(MAIL_NORMAL, m_session ? m_session->GetPlayer()->GetObjectGuid().GetCounter() : 0, MAIL_STATIONERY_GM);
 
-    draft.SendMailTo(MailReceiver(receiver, receiver_guid),sender);
+    draft.SendMailTo(MailReceiver(receiver, receiver_guid), sender);
 
     std::string nameLink = playerLink(receiver_name);
     PSendSysMessage(LANG_MAIL_SENT, nameLink.c_str());
@@ -6949,6 +7107,9 @@ bool ChatHandler::HandleSendMassMoneyCommand(char* args)
     if (!ExtractRaceMask(&args, raceMask, &name))
         return false;
 
+    Gender gender;
+    ExtractGender(&args, gender);
+
     // need dynamic object because it trasfered to mass mailer
     MailDraft* draft = new MailDraft;
 
@@ -6962,7 +7123,7 @@ bool ChatHandler::HandleSendMassMoneyCommand(char* args)
     // from console show nonexistent sender
     MailSender sender(MAIL_NORMAL, m_session ? m_session->GetPlayer()->GetObjectGuid().GetCounter() : 0, MAIL_STATIONERY_GM);
 
-    sMassMailMgr.AddMassMailTask(draft, sender, raceMask);
+    sMassMailMgr.AddMassMailTask(draft, sender, raceMask, gender);
 
     PSendSysMessage(LANG_MAIL_SENT, name);
     return true;
@@ -6972,7 +7133,7 @@ bool ChatHandler::HandleSendMassMoneyCommand(char* args)
 bool ChatHandler::HandleSendMessageCommand(char* args)
 {
     ///- Find the player
-    Player *rPlayer;
+    Player* rPlayer;
     if (!ExtractPlayerTarget(&args, &rPlayer))
         return false;
 
@@ -6989,11 +7150,11 @@ bool ChatHandler::HandleSendMessageCommand(char* args)
     }
 
     ///- Send the message
-    //Use SendAreaTriggerMessage for fastest delivery.
+    // Use SendAreaTriggerMessage for fastest delivery.
     rPlayer->GetSession()->SendAreaTriggerMessage("%s", args);
     rPlayer->GetSession()->SendAreaTriggerMessage("|cffff0000[Message from administrator]:|r");
 
-    //Confirmation message
+    // Confirmation message
     std::string nameLink = GetNameLink(rPlayer);
     PSendSysMessage(LANG_SENDMESSAGE, nameLink.c_str(), args);
     return true;
@@ -7005,12 +7166,12 @@ bool ChatHandler::HandleFlushArenaPointsCommand(char* /*args*/)
     return true;
 }
 
-bool ChatHandler::HandleModifyGenderCommand(char *args)
+bool ChatHandler::HandleModifyGenderCommand(char* args)
 {
     if (!*args)
         return false;
 
-    Player *player = getSelectedPlayer();
+    Player* player = getSelectedPlayer();
 
     if (!player)
     {
@@ -7020,7 +7181,7 @@ bool ChatHandler::HandleModifyGenderCommand(char *args)
     }
 
     PlayerInfo const* info = sObjectMgr.GetPlayerInfo(player->getRace(), player->getClass());
-    if(!info)
+    if (!info)
         return false;
 
     char* gender_str = args;
@@ -7028,16 +7189,16 @@ bool ChatHandler::HandleModifyGenderCommand(char *args)
 
     Gender gender;
 
-    if (!strncmp(gender_str, "male", gender_len))            // MALE
+    if (!strncmp(gender_str, "male", gender_len))           // MALE
     {
-        if(player->getGender() == GENDER_MALE)
+        if (player->getGender() == GENDER_MALE)
             return true;
 
         gender = GENDER_MALE;
     }
     else if (!strncmp(gender_str, "female", gender_len))    // FEMALE
     {
-        if(player->getGender() == GENDER_FEMALE)
+        if (player->getGender() == GENDER_FEMALE)
             return true;
 
         gender = GENDER_FEMALE;
@@ -7066,9 +7227,119 @@ bool ChatHandler::HandleModifyGenderCommand(char *args)
     return true;
 }
 
-bool ChatHandler::HandleShowGearScoreCommand(char *args)
+// Set friends for account
+bool ChatHandler::HandleAccountFriendAddCommand(char* args)
+{
+    ///- Get the command line arguments
+    std::string account_name;
+    uint32 targetAccountId = ExtractAccountId(&args, &account_name);
+
+    if (!targetAccountId)
+        return false;
+
+    std::string account_friend_name;
+    uint32 friendAccountId = ExtractAccountId(&args, &account_friend_name);
+
+    if (!friendAccountId)
+        return false;
+
+    AccountOpResult result = sAccountMgr.AddRAFLink(targetAccountId, friendAccountId);
+
+    switch(result)
+    {
+        case AOR_OK:
+            SendSysMessage(LANG_COMMAND_FRIEND);
+            PSendSysMessage("Added RAF link from referral account %u (%s) to referred %u (%s)",targetAccountId, account_name.c_str(), friendAccountId, account_friend_name.c_str());
+            break;
+        default:
+            SendSysMessage(LANG_COMMAND_FRIEND_ERROR);
+            SetSentErrorMessage(true);
+            return false;
+    }
+
+    return true;
+}
+
+// Delete friends for account
+bool ChatHandler::HandleAccountFriendDeleteCommand(char* args)
 {
-    Player *player = getSelectedPlayer();
+    ///- Get the command line arguments
+    std::string account_name;
+    uint32 targetAccountId = ExtractAccountId(&args, &account_name);
+
+    if (!targetAccountId)
+        return false;
+
+    std::string account_friend_name;
+    uint32 friendAccountId = ExtractAccountId(&args, &account_friend_name);
+
+    if (!friendAccountId)
+        return false;
+
+    AccountOpResult result = sAccountMgr.DeleteRAFLink(targetAccountId, friendAccountId);
+
+    switch(result)
+    {
+        case AOR_OK:
+            SendSysMessage(LANG_COMMAND_FRIEND);
+            PSendSysMessage("Deleted RAF link from referral account %u (%s) to referred %u (%s)",targetAccountId, account_name.c_str(), friendAccountId, account_friend_name.c_str());
+            break;
+        default:
+            SendSysMessage(LANG_COMMAND_FRIEND_ERROR);
+            SetSentErrorMessage(true);
+            return false;
+    }
+
+    return true;
+}
+
+// List friends for account
+bool ChatHandler::HandleAccountFriendListCommand(char* args)
+{
+    ///- Get the command line arguments
+    std::string account_name;
+    uint32 targetAccountId = ExtractAccountId(&args, &account_name);
+
+    if (!targetAccountId)
+        return false;
+
+    RafLinkedList const* referredAccounts = sAccountMgr.GetRAFAccounts(targetAccountId, true);
+    RafLinkedList const* referalAccounts  = sAccountMgr.GetRAFAccounts(targetAccountId, false);
+
+    if (!referredAccounts || !referalAccounts)
+    {
+        PSendSysMessage("Account %u (%s) not has RAF links!",targetAccountId, account_name.c_str());
+        return true;
+    }
+
+    if (!referredAccounts->empty())
+    {
+        PSendSysMessage("Account %u (%s) has " SIZEFMTD " referred accounts:",targetAccountId, account_name.c_str(), referredAccounts->size());
+        for (RafLinkedList::const_iterator itr = referredAccounts->begin(); itr != referredAccounts->end(); ++itr)
+        {
+            uint32 accId = *itr;
+            std::string acc_name;
+            sAccountMgr.GetName(accId, acc_name);
+            PSendSysMessage("        Referred account %u (%s)",accId, acc_name.c_str());
+        }
+    }
+    if (!referalAccounts->empty())
+    {
+        PSendSysMessage("Account %u (%s) has " SIZEFMTD " referral accounts:",targetAccountId, account_name.c_str(), referalAccounts->size());
+        for (RafLinkedList::const_iterator itr = referalAccounts->begin(); itr != referalAccounts->end(); ++itr)
+        {
+            uint32 accId = *itr;
+            std::string acc_name;
+            sAccountMgr.GetName(accId, acc_name);
+            PSendSysMessage("        Referal account %u (%s)",accId, acc_name.c_str());
+        }
+    }
+    return true;
+}
+
+bool ChatHandler::HandleShowGearScoreCommand(char* args)
+{
+    Player* player = getSelectedPlayer();
 
     if (!player)
     {
@@ -7094,26 +7365,18 @@ bool ChatHandler::HandleShowGearScoreCommand(char *args)
     return true;
 }
 
-bool ChatHandler::HandleMmap(char* args)
+bool ChatHandler::HandleMmapOn(char* /*args*/)
 {
-    bool on;
-    if (ExtractOnOff(&args, on))
-    {
-        if (on)
-        {
-            sWorld.setConfig(CONFIG_BOOL_MMAP_ENABLED, true);
-            SendSysMessage("WORLD: mmaps are now ENABLED (individual map settings still in effect)");
-        }
-        else
-        {
-            sWorld.setConfig(CONFIG_BOOL_MMAP_ENABLED, false);
-            SendSysMessage("WORLD: mmaps are now DISABLED");
-        }
-        return true;
-    }
+    sWorld.setConfig(CONFIG_BOOL_MMAP_ENABLED, true);
+    SendSysMessage("WORLD: mmaps are now ENABLED (individual map settings still in effect)");
 
-    on = sWorld.getConfig(CONFIG_BOOL_MMAP_ENABLED);
-    PSendSysMessage("mmaps are %sabled", on ? "en" : "dis");
+    return true;
+}
+
+bool ChatHandler::HandleMmapOff(char* /*args*/)
+{
+    sWorld.setConfig(CONFIG_BOOL_MMAP_ENABLED, false);
+    SendSysMessage("WORLD: mmaps are now DISABLED");
 
     return true;
 }
@@ -7131,13 +7394,13 @@ bool ChatHandler::HandleMmapTestArea(char* args)
 
     if (!creatureList.empty())
     {
-        PSendSysMessage("Found %i Creatures.", creatureList.size());
+        PSendSysMessage("Found " SIZEFMTD " Creatures.", creatureList.size());
 
         uint32 paths = 0;
         uint32 uStartTime = WorldTimer::getMSTime();
 
-        float gx,gy,gz;
-        m_session->GetPlayer()->GetPosition(gx,gy,gz);
+        float gx, gy, gz;
+        m_session->GetPlayer()->GetPosition(gx, gy, gz);
         for (std::list<Creature*>::iterator itr = creatureList.begin(); itr != creatureList.end(); ++itr)
         {
             PathFinder path(*itr);
@@ -7155,3 +7418,388 @@ bool ChatHandler::HandleMmapTestArea(char* args)
 
     return true;
 }
+
+bool ChatHandler::HandleTransportListCommand(char* args)
+{
+    uint32 mapID;
+    if (!ExtractOptUInt32(&args, mapID, m_session->GetPlayer()->GetMapId()))
+        return false;
+
+    Map* map = sMapMgr.CreateMap(mapID, m_session->GetPlayer());
+    if (!map)
+        return false;
+
+    QueryResult *result = WorldDatabase.PQuery("SELECT entry, name, period FROM transports");
+    if (!result)
+        return false;
+
+    do
+    {
+        Field *fields       = result->Fetch();
+        uint32 entry        = fields[0].GetUInt32();
+        std::string name    = fields[1].GetCppString();
+        uint32 period       = fields[2].GetUInt32();
+
+        ObjectGuid guid = ObjectGuid(HIGHGUID_MO_TRANSPORT, entry);
+        Transport* transport  = map->GetTransport(guid);
+
+        if (!transport)
+            continue;
+
+        GameObjectInfo const* gInfo = ObjectMgr::GetGameObjectInfo(entry);
+
+        if (!gInfo)
+            continue;
+
+        PSendSysMessage("Transport: %s on map %u (%s), %s, passengers " SIZEFMTD ", current coords %f %f %f",
+            transport->GetObjectGuid().GetString().c_str(),
+            mapID,
+            name.c_str(),
+            transport->isActiveObject() ? "active" : "passive",
+            transport->GetTransportKit()->GetPassengers().size(),
+            transport->GetPositionX(),
+            transport->GetPositionY(),
+            transport->GetPositionZ()
+            );
+    } while (result->NextRow());
+
+    delete result;
+    return true;
+}
+
+bool ChatHandler::HandleTransportCurrentCommand(char* args)
+{
+    Player* player = m_session->GetPlayer();
+
+    ObjectGuid guid = player->m_movementInfo.GetTransportGuid();
+    if (!guid)
+    {
+        PSendSysMessage("Player not on Transport!");
+        return true;
+    }
+
+    Map* map = player->GetMap();
+
+    Transport* transport  = NULL;
+
+    if (map)
+        transport = map->GetTransport(guid);
+
+    if (!transport)
+    {
+        PSendSysMessage("Player not on same map with binded transport!");
+        uint32 currentMap = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), true);
+        if (currentMap == UINT32_MAX || currentMap == player->GetMapId())
+            currentMap = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), false);
+        if (currentMap != UINT32_MAX)
+            map = sMapMgr.CreateMap(currentMap, player);
+
+        if (!map)
+            return true;
+
+        transport  = map->GetTransport(guid);
+
+        if (!transport)
+        {
+            PSendSysMessage("Binded transport not in world!!");
+            return true;
+        }
+    }
+
+    GameObjectInfo const* goInfo = transport->GetGOInfo();
+
+    if (!goInfo)
+    {
+        PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,guid.GetCounter());
+        return true;
+    }
+
+    PSendSysMessage(LANG_GAMEOBJECT_DETAIL,
+        guid.GetCounter(),
+        goInfo->name,
+        guid.GetCounter(),
+        0,
+        transport->GetPositionX(),
+        transport->GetPositionY(),
+        transport->GetPositionZ(),
+        transport->GetMap()->GetId(),
+        transport->GetOrientation());
+
+    PSendSysMessage("Player position: %f %f %f (offset %f %f %f) delta %f %f %f",
+                player->m_movementInfo.GetPosition().getX(),
+                player->m_movementInfo.GetPosition().getY(),
+                player->m_movementInfo.GetPosition().getZ(),
+                player->m_movementInfo.GetTransportPosition().getX(),
+                player->m_movementInfo.GetTransportPosition().getY(),
+                player->m_movementInfo.GetTransportPosition().getZ(),
+                player->m_movementInfo.GetPosition().getX() - transport->GetPositionX(),
+                player->m_movementInfo.GetPosition().getY() - transport->GetPositionY(),
+                player->m_movementInfo.GetPosition().getZ() - transport->GetPositionZ()
+                );
+
+    return true;
+}
+
+bool ChatHandler::HandleTransportPathCommand(char* args)
+{
+    uint32 transportEntry;
+    if (!ExtractOptUInt32(&args, transportEntry, 0))
+        return false;
+
+    Player* player = m_session->GetPlayer();
+
+    ObjectGuid guid = transportEntry ? ObjectGuid(HIGHGUID_MO_TRANSPORT, transportEntry) :
+                                        player->m_movementInfo.GetTransportGuid();
+    if (!guid)
+    {
+        PSendSysMessage("Bad transport guid!");
+        return true;
+    }
+
+    uint32 currentMap = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), true);
+
+    Map* map = NULL;
+    if (currentMap != UINT32_MAX)
+        map = sMapMgr.CreateMap(currentMap, player);
+
+    Transport* transport  =  NULL;
+
+    if (map)
+        transport = map->GetTransport(guid);
+
+    if (!transport)
+    {
+        uint32 currentMap2 = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), false);
+        if (currentMap2 != UINT32_MAX)
+            map = sMapMgr.CreateMap(currentMap2, player);
+
+        if (map)
+            transport = map->GetTransport(guid);
+
+        if (!transport)
+        {
+            PSendSysMessage("Transport %u not in world! Checked maps %u %u",guid.GetCounter(), currentMap, currentMap2);
+            return true;
+        }
+    }
+    if (transport->IsMOTransport())
+    {
+        PSendSysMessage("Transport: %s on map %u (%s), %s, passengers " SIZEFMTD ", current time %u (map %u xyz %f %f %f)",
+            transport->GetObjectGuid().GetString().c_str(),
+            map->GetId(),
+            ((MOTransport*)transport)->GetName(),
+            transport->isActiveObject() ? "active" : "passive",
+            transport->GetTransportKit()->GetPassengers().size(),
+            ((MOTransport*)transport)->GetCurrent()->first,
+            ((MOTransport*)transport)->GetCurrent()->second.loc.GetMapId(),
+            ((MOTransport*)transport)->GetCurrent()->second.loc.getX(),
+            ((MOTransport*)transport)->GetCurrent()->second.loc.getY(),
+            ((MOTransport*)transport)->GetCurrent()->second.loc.getZ()
+        );
+        PSendSysMessage("Transport: %s on map %u (%s), %s, passengers " SIZEFMTD ", next time %u (map %u xyz %f %f %f)",
+            transport->GetObjectGuid().GetString().c_str(),
+            map->GetId(),
+            ((MOTransport*)transport)->GetName(),
+            transport->isActiveObject() ? "active" : "passive",
+            transport->GetTransportKit()->GetPassengers().size(),
+            ((MOTransport*)transport)->GetNext()->first,
+            ((MOTransport*)transport)->GetNext()->second.loc.GetMapId(),
+            ((MOTransport*)transport)->GetNext()->second.loc.getX(),
+            ((MOTransport*)transport)->GetNext()->second.loc.getY(),
+            ((MOTransport*)transport)->GetNext()->second.loc.getZ()
+        );
+    }
+    else
+    {
+        PSendSysMessage("Transport: %s on map %u, %s, passengers " SIZEFMTD "",
+            transport->GetObjectGuid().GetString().c_str(),
+            map->GetId(),
+            transport->isActiveObject() ? "active" : "passive",
+            transport->GetTransportKit()->GetPassengers().size()
+        );
+    }
+
+    return true;
+}
+
+bool ChatHandler::HandleTransportCommand(char* args)
+{
+    uint32 transportEntry;
+    if (!ExtractOptUInt32(&args, transportEntry,0))
+        return false;
+
+    if (!transportEntry)
+        return false;
+
+    Player* player = m_session->GetPlayer();
+
+    ObjectGuid guid = ObjectGuid(HIGHGUID_MO_TRANSPORT, transportEntry);
+    uint32 currentMap = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), true);
+
+    Map* map = NULL;
+    if (currentMap != UINT32_MAX)
+        map = sMapMgr.CreateMap(currentMap, player);
+
+    Transport* transport  =  NULL;
+
+    if (map)
+        transport = map->GetTransport(guid);
+
+    if (!transport)
+    {
+        uint32 currentMap2 = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), false);
+        if (currentMap2 != UINT32_MAX)
+            map = sMapMgr.CreateMap(currentMap2, player);
+
+        if (map)
+            transport = map->GetTransport(guid);
+
+        if (!transport)
+        {
+            PSendSysMessage("Transport %u not in world! Checked maps %u %u",guid.GetCounter(), currentMap, currentMap2);
+            return true;
+        }
+    }
+
+    PSendSysMessage("Transport: %s on map %u (%s), %s, passengers " SIZEFMTD ", current coords %f %f %f",
+            transport->GetObjectGuid().GetString().c_str(),
+            map->GetId(),
+            transport->GetName(),
+            transport->isActiveObject() ? "active" : "passive",
+            transport->GetTransportKit()->GetPassengers().size(),
+            transport->GetPositionX(),
+            transport->GetPositionY(),
+            transport->GetPositionZ()
+        );
+
+    return true;
+}
+
+bool ChatHandler::HandleTransportGoCommand(char* args)
+{
+    uint32 transportEntry;
+    if (!ExtractOptUInt32(&args, transportEntry,0))
+        return false;
+
+    if (!transportEntry)
+        return false;
+
+    Player* player = m_session->GetPlayer();
+
+    ObjectGuid guid = ObjectGuid(HIGHGUID_MO_TRANSPORT, transportEntry);
+    uint32 currentMap = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), true);
+
+    Map* map = NULL;
+    if (currentMap != UINT32_MAX)
+        map = sMapMgr.CreateMap(currentMap, player);
+
+    Transport* transport  =  NULL;
+
+    if (map)
+        transport = map->GetTransport(guid);
+
+    if (!transport)
+    {
+        uint32 currentMap2 = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), false);
+        if (currentMap2 != UINT32_MAX)
+            map = sMapMgr.CreateMap(currentMap2, player);
+
+        if (map)
+            transport = map->GetTransport(guid);
+
+        if (!transport)
+        {
+            PSendSysMessage("Transport %u not in world! Checked maps %u %u",guid.GetCounter(), currentMap, currentMap2);
+            return true;
+        }
+    }
+    float z = transport->GetPositionZ() +2.0f;
+    HandleGoHelper(player, transport->GetMap()->GetId(), transport->GetPositionX(), transport->GetPositionY(), &z);
+    transport->AddPassenger(player, Position());
+
+    return true;
+}
+
+bool ChatHandler::HandleTransportStartCommand(char* args)
+{
+    uint32 transportEntry;
+    if (!ExtractOptUInt32(&args, transportEntry,0))
+        return false;
+
+    if (!transportEntry)
+        return false;
+
+    Player* player = m_session->GetPlayer();
+
+    ObjectGuid guid = ObjectGuid(HIGHGUID_MO_TRANSPORT, transportEntry);
+    uint32 currentMap = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), true);
+
+    Map* map = NULL;
+    if (currentMap != UINT32_MAX)
+        map = sMapMgr.CreateMap(currentMap, player);
+
+    Transport* transport  =  NULL;
+
+    if (map)
+        transport = map->GetTransport(guid);
+
+    if (!transport)
+    {
+        uint32 currentMap2 = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), false);
+        if (currentMap2 != UINT32_MAX)
+            map = sMapMgr.CreateMap(currentMap2, player);
+
+        if (map)
+            transport = map->GetTransport(guid);
+
+        if (!transport)
+        {
+            PSendSysMessage("Transport %u not in world! Checked maps %u %u",guid.GetCounter(), currentMap, currentMap2);
+            return true;
+        }
+    }
+    transport->Start();
+    return true;
+}
+
+bool ChatHandler::HandleTransportStopCommand(char* args)
+{
+    uint32 transportEntry;
+    if (!ExtractOptUInt32(&args, transportEntry,0))
+        return false;
+
+    if (!transportEntry)
+        return false;
+
+    Player* player = m_session->GetPlayer();
+
+    ObjectGuid guid = ObjectGuid(HIGHGUID_MO_TRANSPORT, transportEntry);
+    uint32 currentMap = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), true);
+
+    Map* map = NULL;
+    if (currentMap != UINT32_MAX)
+        map = sMapMgr.CreateMap(currentMap, player);
+
+    Transport* transport  =  NULL;
+
+    if (map)
+        transport = map->GetTransport(guid);
+
+    if (!transport)
+    {
+        uint32 currentMap2 = MOTransport::GetPossibleMapByEntry(guid.GetCounter(), false);
+        if (currentMap2 != UINT32_MAX)
+            map = sMapMgr.CreateMap(currentMap2, player);
+
+        if (map)
+            transport = map->GetTransport(guid);
+
+        if (!transport)
+        {
+            PSendSysMessage("Transport %u not in world! Checked maps %u %u",guid.GetCounter(), currentMap, currentMap2);
+            return true;
+        }
+    }
+    transport->Stop();
+    return true;
+}
diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp
index a58f1eb4cfd..e48067f5c90 100644
--- a/src/game/LootHandler.cpp
+++ b/src/game/LootHandler.cpp
@@ -30,26 +30,27 @@
 #include "Group.h"
 #include "World.h"
 #include "Util.h"
+#include "DBCStores.h"
 
-void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
+void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: CMSG_AUTOSTORE_LOOT_ITEM");
-    Player  *player =   GetPlayer();
+    Player*  player =   GetPlayer();
     ObjectGuid lguid = player->GetLootGuid();
-    Loot    *loot;
+    Loot*    loot;
     uint8    lootSlot;
     Item* pItem = NULL;
 
     recv_data >> lootSlot;
 
-    switch( lguid.GetHigh())
+    switch (lguid.GetHigh())
     {
         case HIGHGUID_GAMEOBJECT:
         {
-            GameObject *go = player->GetMap()->GetGameObject(lguid);
+            GameObject* go = player->GetMap()->GetGameObject(lguid);
 
             // not check distance for GO in case owned GO (fishing bobber case, for example) or Fishing hole GO
-            if (!go || ((go->GetOwnerGuid() != _player->GetObjectGuid() && go->GetGoType() != GAMEOBJECT_TYPE_FISHINGHOLE) && !go->IsWithinDistInMap(_player,INTERACTION_DISTANCE)))
+            if (!go || ((go->GetOwnerGuid() != _player->GetObjectGuid() && go->GetGoType() != GAMEOBJECT_TYPE_FISHINGHOLE) && !go->IsWithinDistInMap(_player, INTERACTION_DISTANCE)))
             {
                 player->SendLootRelease(lguid);
                 return;
@@ -60,7 +61,7 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
         }
         case HIGHGUID_ITEM:
         {
-            pItem = player->GetItemByGuid( lguid );
+            pItem = player->GetItemByGuid(lguid);
 
             if (!pItem || !pItem->HasGeneratedLoot())
             {
@@ -73,7 +74,7 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
         }
         case HIGHGUID_CORPSE:
         {
-            Corpse *bones = player->GetMap()->GetCorpse(lguid);
+            Corpse* bones = player->GetMap()->GetCorpse(lguid);
             if (!bones)
             {
                 player->SendLootRelease(lguid);
@@ -87,9 +88,9 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
         {
             Creature* pCreature = GetPlayer()->GetMap()->GetCreature(lguid);
 
-            bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass()==CLASS_ROGUE && pCreature->lootForPickPocketed);
+            bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass() == CLASS_ROGUE && pCreature->lootForPickPocketed);
 
-            if( !ok_loot || !pCreature->IsWithinDistInMap(_player,INTERACTION_DISTANCE) )
+            if (!ok_loot || !pCreature->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
             {
                 player->SendLootRelease(lguid);
                 return;
@@ -100,20 +101,20 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
         }
         default:
         {
-            sLog.outError("%s is unsupported for looting.",lguid.GetString().c_str());
+            sLog.outError("%s is unsupported for looting.", lguid.GetString().c_str());
             return;
         }
     }
 
-    QuestItem *qitem = NULL;
-    QuestItem *ffaitem = NULL;
-    QuestItem *conditem = NULL;
+    QuestItem* qitem = NULL;
+    QuestItem* ffaitem = NULL;
+    QuestItem* conditem = NULL;
 
-    LootItem *item = loot->LootItemInSlot(lootSlot,player,&qitem,&ffaitem,&conditem);
+    LootItem* item = loot->LootItemInSlot(lootSlot, player, &qitem, &ffaitem, &conditem);
 
-    if(!item)
+    if (!item)
     {
-        player->SendEquipError( EQUIP_ERR_ALREADY_LOOTED, NULL, NULL );
+        player->SendEquipError(EQUIP_ERR_ALREADY_LOOTED, NULL, NULL);
         return;
     }
 
@@ -128,15 +129,15 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
         pItem->SetLootState(ITEM_LOOT_CHANGED);
 
     ItemPosCountVec dest;
-    InventoryResult msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, item->itemid, item->count );
-    if ( msg == EQUIP_ERR_OK )
+    InventoryResult msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, item->itemid, item->count);
+    if (msg == EQUIP_ERR_OK)
     {
-        Item * newitem = player->StoreNewItem( dest, item->itemid, true, item->randomPropertyId);
+        Item* newitem = player->StoreNewItem(dest, item->itemid, true, item->randomPropertyId, item->GetAllowedLooters());
 
         if (qitem)
         {
             qitem->is_looted = true;
-            //freeforall is 1 if everyone's supposed to get the quest item.
+            // freeforall is 1 if everyone's supposed to get the quest item.
             if (item->freeforall || loot->GetPlayerQuestItems().size() == 1)
                 player->SendNotifyLootItemRemoved(lootSlot);
             else
@@ -146,20 +147,20 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
         {
             if (ffaitem)
             {
-                //freeforall case, notify only one player of the removal
-                ffaitem->is_looted=true;
+                // freeforall case, notify only one player of the removal
+                ffaitem->is_looted = true;
                 player->SendNotifyLootItemRemoved(lootSlot);
             }
             else
             {
-                //not freeforall, notify everyone
-                if(conditem)
-                    conditem->is_looted=true;
+                // not freeforall, notify everyone
+                if (conditem)
+                    conditem->is_looted = true;
                 loot->NotifyItemRemoved(lootSlot);
             }
         }
 
-        //if only one person is supposed to loot the item, then set it to looted
+        // if only one person is supposed to loot the item, then set it to looted
         if (!item->freeforall)
             item->is_looted = true;
 
@@ -171,38 +172,38 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
         player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_EPIC_ITEM, item->itemid, item->count);
     }
     else
-        player->SendEquipError( msg, NULL, NULL, item->itemid );
+        player->SendEquipError(msg, NULL, NULL, item->itemid);
 }
 
-void WorldSession::HandleLootMoneyOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleLootMoneyOpcode(WorldPacket& /*recv_data*/)
 {
     DEBUG_LOG("WORLD: CMSG_LOOT_MONEY");
 
-    Player *player = GetPlayer();
+    Player* player = GetPlayer();
     ObjectGuid guid = player->GetLootGuid();
     if (!guid)
         return;
 
-    Loot *pLoot = NULL;
+    Loot* pLoot = NULL;
     Item* pItem = NULL;
 
-    switch(guid.GetHigh())
+    switch (guid.GetHigh())
     {
         case HIGHGUID_GAMEOBJECT:
         {
-            GameObject *pGameObject = GetPlayer()->GetMap()->GetGameObject(guid);
+            GameObject* pGameObject = GetPlayer()->GetMap()->GetGameObject(guid);
 
             // not check distance for GO in case owned GO (fishing bobber case, for example)
-            if( pGameObject && (pGameObject->GetOwnerGuid() == _player->GetObjectGuid() || pGameObject->IsWithinDistInMap(_player,INTERACTION_DISTANCE)) )
+            if (pGameObject && (pGameObject->GetOwnerGuid() == _player->GetObjectGuid() || pGameObject->IsWithinDistInMap(_player, INTERACTION_DISTANCE)))
                 pLoot = &pGameObject->loot;
 
             break;
         }
         case HIGHGUID_CORPSE:                               // remove insignia ONLY in BG
         {
-            Corpse *bones = _player->GetMap()->GetCorpse(guid);
+            Corpse* bones = _player->GetMap()->GetCorpse(guid);
 
-            if (bones && bones->IsWithinDistInMap(_player,INTERACTION_DISTANCE) )
+            if (bones && bones->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
                 pLoot = &bones->loot;
 
             break;
@@ -221,9 +222,9 @@ void WorldSession::HandleLootMoneyOpcode( WorldPacket & /*recv_data*/ )
         {
             Creature* pCreature = GetPlayer()->GetMap()->GetCreature(guid);
 
-            bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass()==CLASS_ROGUE && pCreature->lootForPickPocketed);
+            bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass() == CLASS_ROGUE && pCreature->lootForPickPocketed);
 
-            if ( ok_loot && pCreature->IsWithinDistInMap(_player,INTERACTION_DISTANCE) )
+            if (ok_loot && pCreature->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
                 pLoot = &pCreature->loot ;
 
             break;
@@ -236,28 +237,34 @@ void WorldSession::HandleLootMoneyOpcode( WorldPacket & /*recv_data*/ )
     {
         pLoot->NotifyMoneyRemoved();
 
-        if (!guid.IsItem() && player->GetGroup())           //item can be looted only single player
+        if (!guid.IsItem() && player->GetGroup())           // item can be looted only single player
         {
-            Group *group = player->GetGroup();
+            Group* group = player->GetGroup();
 
             std::vector<Player*> playersNear;
-            for(GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+            for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
             {
                 Player* playerGroup = itr->getSource();
-                if(!playerGroup)
+                if (!playerGroup)
                     continue;
-                if (player->IsWithinDistInMap(playerGroup,sWorld.getConfig(CONFIG_FLOAT_GROUP_XP_DISTANCE),false))
+                if (player->IsWithinDistInMap(playerGroup, sWorld.getConfig(CONFIG_FLOAT_GROUP_XP_DISTANCE), false))
                     playersNear.push_back(playerGroup);
             }
 
-            uint32 money_per_player = uint32((pLoot->gold)/(playersNear.size()));
+            if (playersNear.size() == 0)
+            {
+                sLog.outError("WorldSession::HandleLootMoneyOpcode %s try aquire group loot without any group member! Cheat attempt assumed.", player->GetObjectGuid().GetString().c_str());
+                return;
+            }
+
+            uint32 money_per_player = uint32((pLoot->gold) / (playersNear.size()));
 
             for (std::vector<Player*>::const_iterator i = playersNear.begin(); i != playersNear.end(); ++i)
             {
-                (*i)->ModifyMoney( money_per_player );
+                (*i)->ModifyMoney(money_per_player);
                 (*i)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_MONEY, money_per_player);
 
-                WorldPacket data(SMSG_LOOT_MONEY_NOTIFY, 4+1);
+                WorldPacket data(SMSG_LOOT_MONEY_NOTIFY, 4 + 1);
                 data << uint32(money_per_player);
                 data << uint8(playersNear.size() > 1 ? 0 : 1);// 0 is "you share of loot..."
 
@@ -266,10 +273,10 @@ void WorldSession::HandleLootMoneyOpcode( WorldPacket & /*recv_data*/ )
         }
         else
         {
-            player->ModifyMoney( pLoot->gold );
+            player->ModifyMoney(pLoot->gold);
             player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_MONEY, pLoot->gold);
 
-            WorldPacket data(SMSG_LOOT_MONEY_NOTIFY, 4+1);
+            WorldPacket data(SMSG_LOOT_MONEY_NOTIFY, 4 + 1);
             data << uint32(pLoot->gold);
             data << uint8(1);                               // 1 is "you loot..."
             player->GetSession()->SendPacket(&data);
@@ -282,7 +289,7 @@ void WorldSession::HandleLootMoneyOpcode( WorldPacket & /*recv_data*/ )
     }
 }
 
-void WorldSession::HandleLootOpcode( WorldPacket & recv_data )
+void WorldSession::HandleLootOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: CMSG_LOOT");
 
@@ -290,13 +297,13 @@ void WorldSession::HandleLootOpcode( WorldPacket & recv_data )
     recv_data >> guid;
 
     // Check possible cheat
-    if (!_player->isAlive())
+    if (!GetPlayer()->isAlive() || !guid.IsCreatureOrVehicle())
         return;
 
     GetPlayer()->SendLoot(guid, LOOT_CORPSE);
 }
 
-void WorldSession::HandleLootReleaseOpcode( WorldPacket & recv_data )
+void WorldSession::HandleLootReleaseOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: CMSG_LOOT_RELEASE");
 
@@ -310,25 +317,25 @@ void WorldSession::HandleLootReleaseOpcode( WorldPacket & recv_data )
 
 void WorldSession::DoLootRelease(ObjectGuid lguid)
 {
-    Player  *player = GetPlayer();
-    Loot    *loot;
+    Player*  player = GetPlayer();
+    Loot*    loot;
 
     player->SetLootGuid(ObjectGuid());
     player->SendLootRelease(lguid);
 
     player->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_LOOTING);
 
-    if(!player->IsInWorld())
+    if (!player->IsInWorld())
         return;
 
-    switch(lguid.GetHigh())
+    switch (lguid.GetHigh())
     {
         case HIGHGUID_GAMEOBJECT:
         {
-            GameObject *go = GetPlayer()->GetMap()->GetGameObject(lguid);
+            GameObject* go = GetPlayer()->GetMap()->GetGameObject(lguid);
 
             // not check distance for GO in case owned GO (fishing bobber case, for example) or Fishing hole GO
-            if (!go || ((go->GetOwnerGuid() != _player->GetObjectGuid() && go->GetGoType() != GAMEOBJECT_TYPE_FISHINGHOLE) && !go->IsWithinDistInMap(_player,INTERACTION_DISTANCE)))
+            if (!go || ((go->GetOwnerGuid() != _player->GetObjectGuid() && go->GetGoType() != GAMEOBJECT_TYPE_FISHINGHOLE) && !go->IsWithinDistInMap(_player, INTERACTION_DISTANCE)))
                 return;
 
             loot = &go->loot;
@@ -341,53 +348,54 @@ void WorldSession::DoLootRelease(ObjectGuid lguid)
             else if (loot->isLooted() || go->GetGoType() == GAMEOBJECT_TYPE_FISHINGNODE)
             {
                 // GO is mineral vein? so it is not removed after its looted
-                if(go->GetGoType() == GAMEOBJECT_TYPE_CHEST)
+                if (go->GetGoType() == GAMEOBJECT_TYPE_CHEST)
                 {
                     uint32 go_min = go->GetGOInfo()->chest.minSuccessOpens;
                     uint32 go_max = go->GetGOInfo()->chest.maxSuccessOpens;
 
                     // only vein pass this check
-                    if(go_min != 0 && go_max > go_min)
+                    if (go_min != 0 && go_max > go_min)
                     {
                         float amount_rate = sWorld.getConfig(CONFIG_FLOAT_RATE_MINING_AMOUNT);
-                        float min_amount = go_min*amount_rate;
-                        float max_amount = go_max*amount_rate;
+                        float min_amount = go_min * amount_rate;
+                        float max_amount = go_max * amount_rate;
 
                         go->AddUse();
                         float uses = float(go->GetUseCount());
 
-                        if(uses < max_amount)
+                        if (uses < max_amount)
                         {
-                            if(uses >= min_amount)
+                            if (uses >= min_amount)
                             {
                                 float chance_rate = sWorld.getConfig(CONFIG_FLOAT_RATE_MINING_NEXT);
 
                                 int32 ReqValue = 175;
-                                LockEntry const *lockInfo = sLockStore.LookupEntry(go->GetGOInfo()->chest.lockId);
-                                if(lockInfo)
+                                LockEntry const* lockInfo = sLockStore.LookupEntry(go->GetGOInfo()->chest.lockId);
+                                if (lockInfo)
                                     ReqValue = lockInfo->Skill[0];
-                                float skill = float(player->GetSkillValue(SKILL_MINING))/(ReqValue+25);
-                                double chance = pow(0.8*chance_rate,4*(1/double(max_amount))*double(uses));
-                                if(roll_chance_f(float(100.0f*chance+skill)))
+                                float skill = float(player->GetSkillValue(SKILL_MINING)) / (ReqValue + 25);
+                                double chance = pow(0.8 * chance_rate, 4 * (1 / double(max_amount)) * double(uses));
+                                if (roll_chance_f(float(100.0f * chance + skill)))
                                 {
                                     go->SetLootState(GO_READY);
                                 }
-                                else                            // not have more uses
+                                else                        // not have more uses
                                     go->SetLootState(GO_JUST_DEACTIVATED);
                             }
-                            else                                // 100% chance until min uses
+                            else                            // 100% chance until min uses
                                 go->SetLootState(GO_READY);
                         }
-                        else                                    // max uses already
+                        else                                // max uses already
                             go->SetLootState(GO_JUST_DEACTIVATED);
                     }
-                    else                                        // not vein
+                    else                                    // not vein
                         go->SetLootState(GO_JUST_DEACTIVATED);
                 }
                 else if (go->GetGoType() == GAMEOBJECT_TYPE_FISHINGHOLE)
-                {                                               // The fishing hole used once more
-                    go->AddUse();                               // if the max usage is reached, will be despawned at next tick
-                    if (go->GetUseCount() >= urand(go->GetGOInfo()->fishinghole.minSuccessOpens,go->GetGOInfo()->fishinghole.maxSuccessOpens))
+                {
+                    // The fishing hole used once more
+                    go->AddUse();                           // if the max usage is reached, will be despawned at next tick
+                    if (go->GetUseCount() >= urand(go->GetGOInfo()->fishinghole.minSuccessOpens, go->GetGOInfo()->fishinghole.maxSuccessOpens))
                     {
                         go->SetLootState(GO_JUST_DEACTIVATED);
                     }
@@ -406,8 +414,8 @@ void WorldSession::DoLootRelease(ObjectGuid lguid)
         }
         case HIGHGUID_CORPSE:                               // ONLY remove insignia at BG
         {
-            Corpse *corpse = _player->GetMap()->GetCorpse(lguid);
-            if (!corpse || !corpse->IsWithinDistInMap(_player,INTERACTION_DISTANCE) )
+            Corpse* corpse = _player->GetMap()->GetCorpse(lguid);
+            if (!corpse || !corpse->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
                 return;
 
             loot = &corpse->loot;
@@ -421,7 +429,7 @@ void WorldSession::DoLootRelease(ObjectGuid lguid)
         }
         case HIGHGUID_ITEM:
         {
-            Item *pItem = player->GetItemByGuid(lguid );
+            Item* pItem = player->GetItemByGuid(lguid);
             if (!pItem)
                 return;
 
@@ -434,7 +442,7 @@ void WorldSession::DoLootRelease(ObjectGuid lguid)
                     uint32 count = pItem->GetCount();
 
                     // >=5 checked in spell code, but will work for cheating cases also with removing from another stacks.
-                    if(count > 5)
+                    if (count > 5)
                         count = 5;
 
                     // reset loot for allow repeat looting if stack > 5
@@ -451,7 +459,7 @@ void WorldSession::DoLootRelease(ObjectGuid lguid)
                         player->AutoStoreLoot(pItem->loot); // can be lost if no space
                     pItem->loot.clear();
                     pItem->SetLootState(ITEM_LOOT_REMOVED);
-                    player->DestroyItem( pItem->GetBagSlot(),pItem->GetSlot(), true);
+                    player->DestroyItem(pItem->GetBagSlot(), pItem->GetSlot(), true);
                     break;
                 }
                 // normal persistence loot
@@ -461,7 +469,7 @@ void WorldSession::DoLootRelease(ObjectGuid lguid)
                     if (pItem->loot.isLooted())
                     {
                         pItem->SetLootState(ITEM_LOOT_REMOVED);
-                        player->DestroyItem( pItem->GetBagSlot(),pItem->GetSlot(), true);
+                        player->DestroyItem(pItem->GetBagSlot(), pItem->GetSlot(), true);
                     }
                     break;
                 }
@@ -473,24 +481,22 @@ void WorldSession::DoLootRelease(ObjectGuid lguid)
         {
             Creature* pCreature = GetPlayer()->GetMap()->GetCreature(lguid);
 
-            bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass()==CLASS_ROGUE && pCreature->lootForPickPocketed);
-            if ( !ok_loot || !pCreature->IsWithinDistInMap(_player,INTERACTION_DISTANCE) )
+            bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass() == CLASS_ROGUE && pCreature->lootForPickPocketed);
+            if (!ok_loot || !pCreature->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
                 return;
 
             loot = &pCreature->loot;
 
             // update next looter
-            if(Group* group = pCreature->GetGroupLootRecipient())
+            if (Group* group = pCreature->GetGroupLootRecipient())
                 if (group->GetLooterGuid() == player->GetObjectGuid())
                     group->UpdateLooterGuid(pCreature);
 
-            if (loot->isLooted())
+            if (loot->isLooted() && !pCreature->isAlive())
             {
                 // for example skinning after normal loot
                 pCreature->PrepareBodyLootState();
-
-                if(!pCreature->isAlive())
-                    pCreature->AllLootRemovedFromCorpse();
+                pCreature->AllLootRemovedFromCorpse();
             }
             break;
         }
@@ -501,11 +507,11 @@ void WorldSession::DoLootRelease(ObjectGuid lguid)
         }
     }
 
-    //Player is not looking at loot list, he doesn't need to see updates on the loot list
+    // Player is not looking at loot list, he doesn't need to see updates on the loot list
     loot->RemoveLooter(player->GetObjectGuid());
 }
 
-void WorldSession::HandleLootMasterGiveOpcode( WorldPacket & recv_data )
+void WorldSession::HandleLootMasterGiveOpcode(WorldPacket& recv_data)
 {
     uint8 slotid;
     ObjectGuid lootguid;
@@ -519,29 +525,35 @@ void WorldSession::HandleLootMasterGiveOpcode( WorldPacket & recv_data )
         return;
     }
 
-    Player *target = ObjectAccessor::FindPlayer(target_playerguid);
+    Player* target = ObjectAccessor::FindPlayer(target_playerguid);
     if (!target)
         return;
 
-    DEBUG_LOG("WorldSession::HandleLootMasterGiveOpcode (CMSG_LOOT_MASTER_GIVE, 0x02A3) Target = %s [%s].", target_playerguid.GetString().c_str(), target->GetName());
+    DEBUG_LOG("WorldSession::HandleLootMasterGiveOpcode (CMSG_LOOT_MASTER_GIVE, 0x02A3) Target = %s.", target->GetGuidStr().c_str());
 
     if (_player->GetLootGuid() != lootguid)
         return;
 
-    Loot *pLoot = NULL;
+    if (!_player->IsInSameRaidWith(target) || !_player->IsInMap(target))
+    {
+        sLog.outString("WorldSession::HandleLootMasterGiveOpcode: %s tried to give an item to ineligible %s!", _player->GetGuidStr().c_str(), target->GetGuidStr().c_str());
+        return;
+    }
+
+    Loot* pLoot = NULL;
 
     if (lootguid.IsCreatureOrVehicle())
     {
-        Creature *pCreature = GetPlayer()->GetMap()->GetCreature(lootguid);
-        if(!pCreature)
+        Creature* pCreature = GetPlayer()->GetMap()->GetCreature(lootguid);
+        if (!pCreature)
             return;
 
         pLoot = &pCreature->loot;
     }
-    else if(lootguid.IsGameObject())
+    else if (lootguid.IsGameObject())
     {
-        GameObject *pGO = GetPlayer()->GetMap()->GetGameObject(lootguid);
-        if(!pGO)
+        GameObject* pGO = GetPlayer()->GetMap()->GetGameObject(lootguid);
+        if (!pGO)
             return;
 
         pLoot = &pGO->loot;
@@ -551,33 +563,33 @@ void WorldSession::HandleLootMasterGiveOpcode( WorldPacket & recv_data )
 
     if (slotid > pLoot->items.size())
     {
-        DEBUG_LOG("AutoLootItem: Player %s might be using a hack! (slot %d, size %lu)",GetPlayer()->GetName(), slotid, (unsigned long)pLoot->items.size());
+        DEBUG_LOG("AutoLootItem: %s might be using a hack! (slot %d, size " SIZEFMTD ")", GetPlayer()->GetGuidStr().c_str(), slotid, pLoot->items.size());
         return;
     }
 
     LootItem& item = pLoot->items[slotid];
 
     ItemPosCountVec dest;
-    InventoryResult msg = target->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, item.itemid, item.count );
-    if ( msg != EQUIP_ERR_OK )
+    InventoryResult msg = target->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, item.itemid, item.count);
+    if (msg != EQUIP_ERR_OK)
     {
-        target->SendEquipError( msg, NULL, NULL, item.itemid );
+        target->SendEquipError(msg, NULL, NULL, item.itemid);
 
         // send duplicate of error massage to master looter
-        _player->SendEquipError( msg, NULL, NULL, item.itemid );
+        _player->SendEquipError(msg, NULL, NULL, item.itemid);
         return;
     }
 
     // now move item from loot to target inventory
-    Item * newitem = target->StoreNewItem( dest, item.itemid, true, item.randomPropertyId );
-    target->SendNewItem(newitem, uint32(item.count), false, false, true );
+    Item* newitem = target->StoreNewItem(dest, item.itemid, true, item.randomPropertyId, item.GetAllowedLooters());
+    target->SendNewItem(newitem, uint32(item.count), false, false, true);
     target->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM, item.itemid, item.count);
     target->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE, pLoot->loot_type, item.count);
     target->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_EPIC_ITEM, item.itemid, item.count);
 
     // mark as looted
-    item.count=0;
-    item.is_looted=true;
+    item.count = 0;
+    item.is_looted = true;
 
     pLoot->NotifyItemRemoved(slotid);
     --pLoot->unlootedCount;
diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp
index faf43ec158d..e65531e5098 100644
--- a/src/game/LootMgr.cpp
+++ b/src/game/LootMgr.cpp
@@ -24,15 +24,18 @@
 #include "Util.h"
 #include "SharedDefines.h"
 #include "SpellMgr.h"
+#include "DBCStores.h"
+#include "SQLStorages.h"
 
-static eConfigFloatValues const qualityToRate[MAX_ITEM_QUALITY] = {
-    CONFIG_FLOAT_RATE_DROP_ITEM_POOR,                                    // ITEM_QUALITY_POOR
-    CONFIG_FLOAT_RATE_DROP_ITEM_NORMAL,                                  // ITEM_QUALITY_NORMAL
-    CONFIG_FLOAT_RATE_DROP_ITEM_UNCOMMON,                                // ITEM_QUALITY_UNCOMMON
-    CONFIG_FLOAT_RATE_DROP_ITEM_RARE,                                    // ITEM_QUALITY_RARE
-    CONFIG_FLOAT_RATE_DROP_ITEM_EPIC,                                    // ITEM_QUALITY_EPIC
-    CONFIG_FLOAT_RATE_DROP_ITEM_LEGENDARY,                               // ITEM_QUALITY_LEGENDARY
-    CONFIG_FLOAT_RATE_DROP_ITEM_ARTIFACT,                                // ITEM_QUALITY_ARTIFACT
+static eConfigFloatValues const qualityToRate[MAX_ITEM_QUALITY] =
+{
+    CONFIG_FLOAT_RATE_DROP_ITEM_POOR,                       // ITEM_QUALITY_POOR
+    CONFIG_FLOAT_RATE_DROP_ITEM_NORMAL,                     // ITEM_QUALITY_NORMAL
+    CONFIG_FLOAT_RATE_DROP_ITEM_UNCOMMON,                   // ITEM_QUALITY_UNCOMMON
+    CONFIG_FLOAT_RATE_DROP_ITEM_RARE,                       // ITEM_QUALITY_RARE
+    CONFIG_FLOAT_RATE_DROP_ITEM_EPIC,                       // ITEM_QUALITY_EPIC
+    CONFIG_FLOAT_RATE_DROP_ITEM_LEGENDARY,                  // ITEM_QUALITY_LEGENDARY
+    CONFIG_FLOAT_RATE_DROP_ITEM_ARTIFACT,                   // ITEM_QUALITY_ARTIFACT
 };
 
 LootStore LootTemplates_Creature(     "creature_loot_template",     "creature entry",                 true);
@@ -53,9 +56,9 @@ class LootTemplate::LootGroup                               // A set of loot def
     public:
         void AddEntry(LootStoreItem& item);                 // Adds an entry to the group (at loading stage)
         bool HasQuestDrop() const;                          // True if group includes at least 1 quest drop entry
-        bool HasQuestDropForPlayer(Player const * player) const;
-                                                            // The same for active quests of the player
-        void Process(Loot& loot) const;                     // Rolls an item from the group (if any) and adds the item to the loot
+        bool HasQuestDropForPlayer(Player const* player) const;
+        // The same for active quests of the player
+        void Process(Loot& loot, LootStore const& store) const;                     // Rolls an item from the group (if any) and adds the item to the loot
         float RawTotalChance() const;                       // Overall chance for the group (without equal chanced items)
         float TotalChance() const;                          // Overall chance for the group
 
@@ -66,13 +69,13 @@ class LootTemplate::LootGroup                               // A set of loot def
         LootStoreItemList ExplicitlyChanced;                // Entries with chances defined in DB
         LootStoreItemList EqualChanced;                     // Zero chances - every entry takes the same chance
 
-        LootStoreItem const * Roll() const;                 // Rolls an item from the group, returns NULL if all miss their chances
+        LootStoreItem const* Roll() const;                  // Rolls an item from the group, returns NULL if all miss their chances
 };
 
-//Remove all data and free all memory
+// Remove all data and free all memory
 void LootStore::Clear()
 {
-    for (LootTemplateMap::const_iterator itr=m_LootTemplates.begin(); itr != m_LootTemplates.end(); ++itr)
+    for (LootTemplateMap::const_iterator itr = m_LootTemplates.begin(); itr != m_LootTemplates.end(); ++itr)
         delete itr->second;
     m_LootTemplates.clear();
 }
@@ -81,7 +84,7 @@ void LootStore::Clear()
 // Actual checks are done within LootTemplate::Verify() which is called for every template
 void LootStore::Verify() const
 {
-    for (LootTemplateMap::const_iterator i = m_LootTemplates.begin(); i != m_LootTemplates.end(); ++i )
+    for (LootTemplateMap::const_iterator i = m_LootTemplates.begin(); i != m_LootTemplates.end(); ++i)
         i->second->Verify(*this, i->first);
 }
 
@@ -95,10 +98,10 @@ void LootStore::LoadLootTable()
     // Clearing store (for reloading case)
     Clear();
 
-    sLog.outString( "%s :", GetName());
+    sLog.outString("%s :", GetName());
 
     //                                                 0      1     2                    3        4              5         6
-    QueryResult *result = WorldDatabase.PQuery("SELECT entry, item, ChanceOrQuestChance, groupid, mincountOrRef, maxcount, condition_id FROM %s",GetName());
+    QueryResult* result = WorldDatabase.PQuery("SELECT entry, item, ChanceOrQuestChance, groupid, mincountOrRef, maxcount, condition_id FROM %s", GetName());
 
     if (result)
     {
@@ -106,7 +109,7 @@ void LootStore::LoadLootTable()
 
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             bar.step();
 
             uint32 entry               = fields[0].GetUInt32();
@@ -119,38 +122,38 @@ void LootStore::LoadLootTable()
 
             if (maxcount > std::numeric_limits<uint8>::max())
             {
-                sLog.outErrorDb("Table '%s' entry %d item %d: maxcount value (%u) to large. must be less %u - skipped", GetName(), entry, item, maxcount,std::numeric_limits<uint8>::max());
+                sLog.outErrorDb("Table '%s' entry %d item %d: maxcount value (%u) to large. must be less %u - skipped", GetName(), entry, item, maxcount, std::numeric_limits<uint8>::max());
                 continue;                                   // error already printed to log/console.
             }
 
-            if (mincountOrRef < 0 && conditionId)
-            {
-                sLog.outErrorDb("Table '%s' entry %u mincountOrRef %i < 0 and not allowed has condition, skipped", GetName(), entry, mincountOrRef);
-                continue;
-            }
-
             if (conditionId)
             {
                 const PlayerCondition* condition = sConditionStorage.LookupEntry<PlayerCondition>(conditionId);
                 if (!condition)
                 {
-                    sLog.outErrorDb("Table `%s` for entry %u, item %u has condition_id %u that does not exist in `conditions`, ignoring", GetName(), entry,item, conditionId);
-                    conditionId = 0;
+                    sLog.outErrorDb("Table `%s` for entry %u, item %u has condition_id %u that does not exist in `conditions`, ignoring", GetName(), entry, item, conditionId);
+                    continue;
+                }
+
+                if (mincountOrRef < 0 && !PlayerCondition::CanBeUsedWithoutPlayer(conditionId))
+                {
+                    sLog.outErrorDb("Table '%s' entry %u mincountOrRef %i < 0 and has condition %u that requires a player and is not supported, skipped", GetName(), entry, mincountOrRef, conditionId);
+                    continue;
                 }
             }
 
             LootStoreItem storeitem = LootStoreItem(item, chanceOrQuestChance, group, conditionId, mincountOrRef, maxcount);
 
-            if (!storeitem.IsValid(*this,entry))            // Validity checks
+            if (!storeitem.IsValid(*this, entry))           // Validity checks
                 continue;
 
             // Looking for the template of the entry
-                                                            // often entries are put together
+            // often entries are put together
             if (m_LootTemplates.empty() || tab->first != entry)
             {
                 // Searching the template (in case template Id changed)
                 tab = m_LootTemplates.find(entry);
-                if ( tab == m_LootTemplates.end() )
+                if (tab == m_LootTemplates.end())
                 {
                     std::pair< LootTemplateMap::iterator, bool > pr = m_LootTemplates.insert(LootTemplateMap::value_type(entry, new LootTemplate));
                     tab = pr.first;
@@ -163,33 +166,34 @@ void LootStore::LoadLootTable()
             tab->second->AddEntry(storeitem);
             ++count;
 
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
 
         delete result;
 
         Verify();                                           // Checks validity of the loot store
 
         sLog.outString();
-        sLog.outString( ">> Loaded %u loot definitions (%lu templates)", count, (unsigned long)m_LootTemplates.size());
+        sLog.outString(">> Loaded %u loot definitions (" SIZEFMTD " templates)", count, m_LootTemplates.size());
     }
     else
     {
         sLog.outString();
-        sLog.outErrorDb( ">> Loaded 0 loot definitions. DB table `%s` is empty.",GetName() );
+        sLog.outErrorDb(">> Loaded 0 loot definitions. DB table `%s` is empty.", GetName());
     }
 }
 
 bool LootStore::HaveQuestLootFor(uint32 loot_id) const
 {
     LootTemplateMap::const_iterator itr = m_LootTemplates.find(loot_id);
-    if(itr == m_LootTemplates.end())
+    if (itr == m_LootTemplates.end())
         return false;
 
     // scan loot for quest items
     return itr->second->HasQuestDrop(m_LootTemplates);
 }
 
-bool LootStore::HaveQuestLootForPlayer(uint32 loot_id,Player* player) const
+bool LootStore::HaveQuestLootForPlayer(uint32 loot_id, Player* player) const
 {
     LootTemplateMap::const_iterator tab = m_LootTemplates.find(loot_id);
     if (tab != m_LootTemplates.end())
@@ -213,26 +217,26 @@ void LootStore::LoadAndCollectLootIds(LootIdSet& ids_set)
 {
     LoadLootTable();
 
-    for(LootTemplateMap::const_iterator tab = m_LootTemplates.begin(); tab != m_LootTemplates.end(); ++tab)
+    for (LootTemplateMap::const_iterator tab = m_LootTemplates.begin(); tab != m_LootTemplates.end(); ++tab)
         ids_set.insert(tab->first);
 }
 
 void LootStore::CheckLootRefs(LootIdSet* ref_set) const
 {
-    for(LootTemplateMap::const_iterator ltItr = m_LootTemplates.begin(); ltItr != m_LootTemplates.end(); ++ltItr)
+    for (LootTemplateMap::const_iterator ltItr = m_LootTemplates.begin(); ltItr != m_LootTemplates.end(); ++ltItr)
         ltItr->second->CheckLootRefs(ref_set);
 }
 
 void LootStore::ReportUnusedIds(LootIdSet const& ids_set) const
 {
     // all still listed ids isn't referenced
-    for(LootIdSet::const_iterator itr = ids_set.begin(); itr != ids_set.end(); ++itr)
-        sLog.outErrorDb("Table '%s' entry %d isn't %s and not referenced from loot, and then useless.", GetName(), *itr,GetEntryName());
+    for (LootIdSet::const_iterator itr = ids_set.begin(); itr != ids_set.end(); ++itr)
+        sLog.outErrorDb("Table '%s' entry %d isn't %s and not referenced from loot, and then useless.", GetName(), *itr, GetEntryName());
 }
 
 void LootStore::ReportNotExistedId(uint32 id) const
 {
-    sLog.outErrorDb("Table '%s' entry %d (%s) not exist but used as loot id in DB.", GetName(), id,GetEntryName());
+    sLog.outErrorDb("Table '%s' entry %d (%s) not exist but used as loot id in DB.", GetName(), id, GetEntryName());
 }
 
 //
@@ -243,17 +247,17 @@ void LootStore::ReportNotExistedId(uint32 id) const
 // RATE_DROP_ITEMS is no longer used for all types of entries
 bool LootStoreItem::Roll(bool rate) const
 {
-    if(chance>=100.0f)
+    if (chance >= 100.0f)
         return true;
 
-    if(mincountOrRef < 0)                                   // reference case
-        return roll_chance_f(chance* (rate ? sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_ITEM_REFERENCED) : 1.0f));
+    if (mincountOrRef < 0)                                  // reference case
+        return roll_chance_f(chance * (rate ? sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_ITEM_REFERENCED) : 1.0f));
 
-    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(itemid);
+    ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemid);
 
     float qualityModifier = pProto && rate ? sWorld.getConfig(qualityToRate[pProto->Quality]) : 1.0f;
 
-    return roll_chance_f(chance*qualityModifier);
+    return roll_chance_f(chance * qualityModifier);
 }
 
 // Checks correctness of values
@@ -273,8 +277,8 @@ bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
 
     if (mincountOrRef > 0)                                  // item (quest or non-quest) entry, maybe grouped
     {
-        ItemPrototype const *proto = ObjectMgr::GetItemPrototype(itemid);
-        if(!proto)
+        ItemPrototype const* proto = ObjectMgr::GetItemPrototype(itemid);
+        if (!proto)
         {
             sLog.outErrorDb("Table '%s' entry %d item %d: item entry not listed in `item_template` - skipped", store.GetName(), entry, itemid);
             return false;
@@ -306,7 +310,7 @@ bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
             sLog.outErrorDb("Table '%s' entry %d item %d: negative chance is specified for a reference, skipped", store.GetName(), entry, itemid);
             return false;
         }
-        else if (chance == 0)                               // no chance for the reference
+        else if (chance == 0 && group == 0)                               // no chance for the reference
         {
             sLog.outErrorDb("Table '%s' entry %d item %d: zero chance is specified for a reference, skipped", store.GetName(), entry, itemid);
             return false;
@@ -359,13 +363,13 @@ LootItem::LootItem(uint32 itemid_, uint32 count_, uint32 randomSuffix_, int32 ra
 }
 
 // Basic checks for player/item compatibility - if false no chance to see the item in the loot
-bool LootItem::AllowedForPlayer(Player const * player) const
+bool LootItem::AllowedForPlayer(Player const* player, WorldObject const* lootTarget) const
 {
     // DB conditions check
-    if (conditionId && !sObjectMgr.IsPlayerMeetToNEWCondition(player, conditionId))
+    if (conditionId && !sObjectMgr.IsPlayerMeetToCondition(conditionId, player, player->GetMap(), lootTarget, CONDITION_FROM_LOOT))
         return false;
 
-    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(itemid);
+    ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemid);
     if (!pProto)
         return false;
 
@@ -376,10 +380,10 @@ bool LootItem::AllowedForPlayer(Player const * player) const
     if ((pProto->Flags2 & ITEM_FLAG2_ALLIANCE_ONLY) && player->GetTeam() != ALLIANCE)
         return false;
 
-    if ( needs_quest )
+    if (needs_quest)
     {
         // Checking quests for quest-only drop (check only quests requirements in this case)
-        if( !player->HasQuestForItem(itemid) )
+        if (!player->HasQuestForItem(itemid))
             return false;
     }
     else
@@ -392,25 +396,31 @@ bool LootItem::AllowedForPlayer(Player const * player) const
     return true;
 }
 
-LootSlotType LootItem::GetSlotTypeForSharedLoot(PermissionTypes permission, Player* viewer, bool condition_ok /*= false*/) const
+void LootItem::AddAllowedLooter(const Player* player)
+{
+    allowedGuids.insert(player->GetObjectGuid().GetCounter());
+}
+
+LootSlotType LootItem::GetSlotTypeForSharedLoot(PermissionTypes permission, Player* viewer, WorldObject const* lootTarget, bool condition_ok /*= false*/) const
 {
     // ignore looted, FFA (each player get own copy) and not allowed items
-    if (is_looted || freeforall || (conditionId && !condition_ok) || !AllowedForPlayer(viewer))
+    if (is_looted || freeforall || (conditionId && !condition_ok) || !AllowedForPlayer(viewer, lootTarget))
         return MAX_LOOT_SLOT_TYPE;
 
     switch (permission)
     {
-        case GROUP_PERMISSION:
-            return (is_blocked || is_underthreshold) ? LOOT_SLOT_NORMAL : LOOT_SLOT_VIEW;
         case ALL_PERMISSION:
             return LOOT_SLOT_NORMAL;
-        case OWNER_PERMISSION:
-            return LOOT_SLOT_OWNER;
+        case GROUP_PERMISSION:
+            return (is_blocked || is_underthreshold) ? LOOT_SLOT_NORMAL : LOOT_SLOT_VIEW;
         case MASTER_PERMISSION:
             return !is_underthreshold ? LOOT_SLOT_MASTER : LOOT_SLOT_NORMAL;
+        case OWNER_PERMISSION:
+            return LOOT_SLOT_OWNER;
+        case NONE_PERMISSION:
+        default:
+            return MAX_LOOT_SLOT_TYPE;
     }
-
-    return MAX_LOOT_SLOT_TYPE;
 }
 
 //
@@ -418,7 +428,7 @@ LootSlotType LootItem::GetSlotTypeForSharedLoot(PermissionTypes permission, Play
 //
 
 // Inserts the item into the loot (called by LootTemplate processors)
-void Loot::AddItem(LootStoreItem const & item)
+void Loot::AddItem(LootStoreItem const& item)
 {
     if (item.needs_quest)                                   // Quest drop
     {
@@ -445,7 +455,7 @@ void Loot::AddItem(LootStoreItem const & item)
 bool Loot::FillLoot(uint32 loot_id, LootStore const& store, Player* loot_owner, bool personal, bool noEmptyError)
 {
     // Must be provided
-    if(!loot_owner)
+    if (!loot_owner)
         return false;
 
     LootTemplate const* tab = store.GetLootFor(loot_id);
@@ -453,21 +463,21 @@ bool Loot::FillLoot(uint32 loot_id, LootStore const& store, Player* loot_owner,
     if (!tab)
     {
         if (!noEmptyError)
-            sLog.outErrorDb("Table '%s' loot id #%u used but it doesn't have records.",store.GetName(),loot_id);
+            sLog.outErrorDb("Table '%s' loot id #%u used but it doesn't have records.", store.GetName(), loot_id);
         return false;
     }
 
     items.reserve(MAX_NR_LOOT_ITEMS);
     m_questItems.reserve(MAX_NR_QUEST_ITEMS);
 
-    tab->Process(*this, store,store.IsRatesAllowed ());     // Processing is done there, callback via Loot::AddItem()
+    tab->Process(*this, store, store.IsRatesAllowed());     // Processing is done there, callback via Loot::AddItem()
 
     // Setting access rights for group loot case
-    Group * pGroup=loot_owner->GetGroup();
-    if(!personal && pGroup)
+    Group* pGroup = loot_owner->GetGroup();
+    if (!personal && pGroup)
     {
-        for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
-            if(Player* pl = itr->getSource())
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+            if (Player* pl = itr->getSource())
                 FillNotNormalLootFor(pl);
     }
     // ... for personal loot
@@ -496,36 +506,36 @@ void Loot::FillNotNormalLootFor(Player* pl)
 
 QuestItemList* Loot::FillFFALoot(Player* player)
 {
-    QuestItemList *ql = new QuestItemList();
+    QuestItemList* ql = &m_playerFFAItems[player->GetGUIDLow()];
+
+    ql->clear();
 
-    for(uint8 i = 0; i < items.size(); ++i)
+    for (uint8 i = 0; i < items.size(); ++i)
     {
-        LootItem &item = items[i];
-        if(!item.is_looted && item.freeforall && item.AllowedForPlayer(player) )
+        LootItem& item = items[i];
+        if (!item.is_looted && item.freeforall && item.AllowedForPlayer(player, m_lootTarget))
         {
             ql->push_back(QuestItem(i));
             ++unlootedCount;
         }
     }
     if (ql->empty())
-    {
-        delete ql;
         return NULL;
-    }
-
-    m_playerFFAItems[player->GetGUIDLow()] = ql;
     return ql;
 }
 
 QuestItemList* Loot::FillQuestLoot(Player* player)
 {
     if (items.size() == MAX_NR_LOOT_ITEMS) return NULL;
-    QuestItemList *ql = new QuestItemList();
 
-    for(uint8 i = 0; i < m_questItems.size(); ++i)
+    QuestItemList* ql = &m_playerQuestItems[player->GetGUIDLow()];
+
+    ql->clear();
+
+    for (uint8 i = 0; i < m_questItems.size(); ++i)
     {
-        LootItem &item = m_questItems[i];
-        if(!item.is_looted && item.AllowedForPlayer(player) )
+        LootItem& item = m_questItems[i];
+        if (!item.is_looted && item.AllowedForPlayer(player, m_lootTarget))
         {
             ql->push_back(QuestItem(i));
 
@@ -543,39 +553,38 @@ QuestItemList* Loot::FillQuestLoot(Player* player)
         }
     }
     if (ql->empty())
-    {
-        delete ql;
         return NULL;
-    }
-
-    m_playerQuestItems[player->GetGUIDLow()] = ql;
     return ql;
 }
 
 QuestItemList* Loot::FillNonQuestNonFFAConditionalLoot(Player* player)
 {
-    QuestItemList *ql = new QuestItemList();
+    QuestItemList* ql = &m_playerNonQuestNonFFAConditionalItems[player->GetGUIDLow()];
+
+    ql->clear();
 
-    for(uint8 i = 0; i < items.size(); ++i)
+    for (uint8 i = 0; i < items.size(); ++i)
     {
-        LootItem &item = items[i];
-        if(!item.is_looted && !item.freeforall && item.conditionId && item.AllowedForPlayer(player))
+        LootItem& item = items[i];
+        if (!item.is_looted && !item.freeforall && item.AllowedForPlayer(player, m_lootTarget))
         {
-            ql->push_back(QuestItem(i));
-            if(!item.is_counted)
+            ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(item.itemid);
+            if (pProto && !(pProto->Flags & ITEM_FLAG_LOOTABLE))
+                item.AddAllowedLooter(player);
+
+            if (item.conditionId)
             {
-                ++unlootedCount;
-                item.is_counted=true;
+                ql->push_back(QuestItem(i));
+                if (!item.is_counted)
+                {
+                    ++unlootedCount;
+                    item.is_counted = true;
+                }
             }
         }
     }
     if (ql->empty())
-    {
-        delete ql;
         return NULL;
-    }
-
-    m_playerNonQuestNonFFAConditionalItems[player->GetGUIDLow()] = ql;
     return ql;
 }
 
@@ -585,8 +594,8 @@ void Loot::NotifyItemRemoved(uint8 lootIndex)
 {
     // notify all players that are looting this that the item was removed
     // convert the index to the slot the player sees
-    PlayersLooting::iterator i_next;
-    for (PlayersLooting::iterator i = m_playersLooting.begin(); i != m_playersLooting.end(); i = i_next)
+    GuidSet::iterator i_next;
+    for (GuidSet::iterator i = m_playersLooting.begin(); i != m_playersLooting.end(); i = i_next)
     {
         i_next = i;
         ++i_next;
@@ -600,8 +609,8 @@ void Loot::NotifyItemRemoved(uint8 lootIndex)
 void Loot::NotifyMoneyRemoved()
 {
     // notify all players that are looting this that the money was removed
-    PlayersLooting::iterator i_next;
-    for (PlayersLooting::iterator i = m_playersLooting.begin(); i != m_playersLooting.end(); i = i_next)
+    GuidSet::iterator i_next;
+    for (GuidSet::iterator i = m_playersLooting.begin(); i != m_playersLooting.end(); i = i_next)
     {
         i_next = i;
         ++i_next;
@@ -619,18 +628,18 @@ void Loot::NotifyQuestItemRemoved(uint8 questIndex)
     // (other questitems can be looted by each group member)
     // bit inefficient but isnt called often
 
-    PlayersLooting::iterator i_next;
-    for (PlayersLooting::iterator i = m_playersLooting.begin(); i != m_playersLooting.end(); i = i_next)
+    GuidSet::iterator i_next;
+    for (GuidSet::iterator i = m_playersLooting.begin(); i != m_playersLooting.end(); i = i_next)
     {
         i_next = i;
         ++i_next;
         if (Player* pl = ObjectAccessor::FindPlayer(*i))
         {
             QuestItemMap::const_iterator pq = m_playerQuestItems.find(pl->GetGUIDLow());
-            if (pq != m_playerQuestItems.end() && pq->second)
+            if (pq != m_playerQuestItems.end() && !pq->second.empty())
             {
                 // find where/if the player has the given item in it's vector
-                QuestItemList& pql = *pq->second;
+                QuestItemList const& pql = pq->second;
 
                 uint8 j;
                 for (j = 0; j < pql.size(); ++j)
@@ -638,7 +647,7 @@ void Loot::NotifyQuestItemRemoved(uint8 questIndex)
                         break;
 
                 if (j < pql.size())
-                    pl->SendNotifyLootItemRemoved(items.size()+j);
+                    pl->SendNotifyLootItemRemoved(items.size() + j);
             }
         }
         else
@@ -646,7 +655,7 @@ void Loot::NotifyQuestItemRemoved(uint8 questIndex)
     }
 }
 
-void Loot::generateMoneyLoot( uint32 minAmount, uint32 maxAmount )
+void Loot::generateMoneyLoot(uint32 minAmount, uint32 maxAmount)
 {
     if (maxAmount > 0)
     {
@@ -659,7 +668,7 @@ void Loot::generateMoneyLoot( uint32 minAmount, uint32 maxAmount )
     }
 }
 
-LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qitem, QuestItem **ffaitem, QuestItem **conditem)
+LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem** qitem, QuestItem** ffaitem, QuestItem** conditem)
 {
     LootItem* item = NULL;
     bool is_looted = true;
@@ -667,10 +676,10 @@ LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qite
     {
         uint32 questSlot = lootSlot - items.size();
         QuestItemMap::const_iterator itr = m_playerQuestItems.find(player->GetGUIDLow());
-        if (itr != m_playerQuestItems.end() && questSlot < itr->second->size())
+        if (itr != m_playerQuestItems.end() && questSlot < itr->second.size())
         {
-            QuestItem *qitem2 = &itr->second->at(questSlot);
-            if(qitem)
+            QuestItem* qitem2 = const_cast<QuestItem*>(&itr->second.at(questSlot));
+            if (qitem)
                 *qitem = qitem2;
             item = &m_questItems[qitem2->index];
             is_looted = qitem2->is_looted;
@@ -680,16 +689,16 @@ LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qite
     {
         item = &items[lootSlot];
         is_looted = item->is_looted;
-        if(item->freeforall)
+        if (item->freeforall)
         {
             QuestItemMap::const_iterator itr = m_playerFFAItems.find(player->GetGUIDLow());
             if (itr != m_playerFFAItems.end())
             {
-                for(QuestItemList::const_iterator iter=itr->second->begin(); iter!= itr->second->end(); ++iter)
-                    if(iter->index==lootSlot)
+                for (QuestItemList::const_iterator iter = itr->second.begin(); iter!= itr->second.end(); ++iter)
+                    if (iter->index == lootSlot)
                     {
-                        QuestItem *ffaitem2 = (QuestItem*)&(*iter);
-                        if(ffaitem)
+                        QuestItem* ffaitem2 = (QuestItem*) & (*iter);
+                        if (ffaitem)
                             *ffaitem = ffaitem2;
                         is_looted = ffaitem2->is_looted;
                         break;
@@ -701,12 +710,12 @@ LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qite
             QuestItemMap::const_iterator itr = m_playerNonQuestNonFFAConditionalItems.find(player->GetGUIDLow());
             if (itr != m_playerNonQuestNonFFAConditionalItems.end())
             {
-                for(QuestItemList::const_iterator iter=itr->second->begin(); iter!= itr->second->end(); ++iter)
+                for (QuestItemList::const_iterator iter = itr->second.begin(); iter!= itr->second.end(); ++iter)
                 {
-                    if(iter->index==lootSlot)
+                    if (iter->index == lootSlot)
                     {
-                        QuestItem *conditem2 = (QuestItem*)&(*iter);
-                        if(conditem)
+                        QuestItem* conditem2 = (QuestItem*) & (*iter);
+                        if (conditem)
                             *conditem = conditem2;
                         is_looted = conditem2->is_looted;
                         break;
@@ -716,7 +725,7 @@ LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qite
         }
     }
 
-    if(is_looted)
+    if (is_looted)
         return NULL;
 
     return item;
@@ -725,7 +734,7 @@ LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qite
 uint32 Loot::GetMaxSlotInLootFor(Player* player) const
 {
     QuestItemMap::const_iterator itr = m_playerQuestItems.find(player->GetGUIDLow());
-    return items.size() + (itr != m_playerQuestItems.end() ?  itr->second->size() : 0);
+    return items.size() + (itr != m_playerQuestItems.end() ?  itr->second.size() : 0);
 }
 
 ByteBuffer& operator<<(ByteBuffer& b, LootItem const& li)
@@ -735,7 +744,7 @@ ByteBuffer& operator<<(ByteBuffer& b, LootItem const& li)
     b << uint32(ObjectMgr::GetItemPrototype(li.itemid)->DisplayInfoID);
     b << uint32(li.randomSuffix);
     b << uint32(li.randomPropertyId);
-    //b << uint8(0);                                        // slot type - will send after this function call
+    // b << uint8(0);                                       // slot type - will send after this function call
     return b;
 }
 
@@ -743,16 +752,16 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
 {
     if (lv.permission == NONE_PERMISSION)
     {
-        b << uint32(0);                                     //gold
+        b << uint32(0);                                     // gold
         b << uint8(0);                                      // item count
         return b;                                           // nothing output more
     }
 
-    Loot &l = lv.loot;
+    Loot& l = lv.loot;
 
     uint8 itemsShown = 0;
 
-    //gold
+    // gold
     b << uint32(l.gold);
 
     size_t count_pos = b.wpos();                            // pos of item count byte
@@ -764,7 +773,7 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
 
     for (uint8 i = 0; i < l.items.size(); ++i)
     {
-        LootSlotType slot_type = l.items[i].GetSlotTypeForSharedLoot(lv.permission, lv.viewer);
+        LootSlotType slot_type = l.items[i].GetSlotTypeForSharedLoot(lv.permission, lv.viewer, l.GetLootTarget());
         if (slot_type >= MAX_LOOT_SLOT_TYPE)
             continue;
 
@@ -777,12 +786,12 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
     QuestItemMap::const_iterator nn_itr = lootPlayerNonQuestNonFFAConditionalItems.find(lv.viewer->GetGUIDLow());
     if (nn_itr != lootPlayerNonQuestNonFFAConditionalItems.end())
     {
-        QuestItemList *conditional_list =  nn_itr->second;
-        for (QuestItemList::const_iterator ci = conditional_list->begin() ; ci != conditional_list->end(); ++ci)
+        QuestItemList const& conditional_list =  nn_itr->second;
+        for (QuestItemList::const_iterator ci = conditional_list.begin() ; ci != conditional_list.end(); ++ci)
         {
-            LootItem &item = l.items[ci->index];
+            LootItem& item = l.items[ci->index];
 
-            LootSlotType slot_type = item.GetSlotTypeForSharedLoot(lv.permission, lv.viewer, !ci->is_looted);
+            LootSlotType slot_type = item.GetSlotTypeForSharedLoot(lv.permission, lv.viewer, l.GetLootTarget(), !ci->is_looted);
             if (slot_type >= MAX_LOOT_SLOT_TYPE)
                 continue;
 
@@ -799,13 +808,13 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
     QuestItemMap::const_iterator q_itr = lootPlayerQuestItems.find(lv.viewer->GetGUIDLow());
     if (q_itr != lootPlayerQuestItems.end())
     {
-        QuestItemList *q_list = q_itr->second;
-        for (QuestItemList::const_iterator qi = q_list->begin() ; qi != q_list->end(); ++qi)
+        QuestItemList const& q_list = q_itr->second;
+        for (QuestItemList::const_iterator qi = q_list.begin() ; qi != q_list.end(); ++qi)
         {
-            LootItem &item = l.m_questItems[qi->index];
+            LootItem& item = l.m_questItems[qi->index];
             if (!qi->is_looted && !item.is_looted)
             {
-                b << uint8(l.items.size() + (qi - q_list->begin()));
+                b << uint8(l.items.size() + (qi - q_list.begin()));
                 b << item;
                 b << uint8(slot_type);                      // allow loot
                 ++itemsShown;
@@ -817,10 +826,10 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
     QuestItemMap::const_iterator ffa_itr = lootPlayerFFAItems.find(lv.viewer->GetGUIDLow());
     if (ffa_itr != lootPlayerFFAItems.end())
     {
-        QuestItemList *ffa_list = ffa_itr->second;
-        for (QuestItemList::const_iterator fi = ffa_list->begin() ; fi != ffa_list->end(); ++fi)
+        QuestItemList const& ffa_list = ffa_itr->second;
+        for (QuestItemList::const_iterator fi = ffa_list.begin() ; fi != ffa_list.end(); ++fi)
         {
-            LootItem &item = l.items[fi->index];
+            LootItem& item = l.items[fi->index];
             if (!fi->is_looted && !item.is_looted)
             {
                 b << uint8(fi->index) << item;
@@ -830,8 +839,8 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
         }
     }
 
-    //update number of items shown
-    b.put<uint8>(count_pos,itemsShown);
+    // update number of items shown
+    b.put<uint8>(count_pos, itemsShown);
 
     return b;
 }
@@ -850,15 +859,15 @@ void LootTemplate::LootGroup::AddEntry(LootStoreItem& item)
 }
 
 // Rolls an item from the group, returns NULL if all miss their chances
-LootStoreItem const * LootTemplate::LootGroup::Roll() const
+LootStoreItem const* LootTemplate::LootGroup::Roll() const
 {
     if (!ExplicitlyChanced.empty())                         // First explicitly chanced entries are checked
     {
         float Roll = rand_chance_f();
 
-        for (uint32 i=0; i<ExplicitlyChanced.size(); ++i)    //check each explicitly chanced entry in the template and modify its chance based on quality.
+        for (uint32 i = 0; i < ExplicitlyChanced.size(); ++i) // check each explicitly chanced entry in the template and modify its chance based on quality.
         {
-            if(ExplicitlyChanced[i].chance>=100.0f)
+            if (ExplicitlyChanced[i].chance >= 100.0f)
                 return &ExplicitlyChanced[i];
 
             Roll -= ExplicitlyChanced[i].chance;
@@ -867,7 +876,7 @@ LootStoreItem const * LootTemplate::LootGroup::Roll() const
         }
     }
     if (!EqualChanced.empty())                              // If nothing selected yet - an item is taken from equal-chanced part
-        return &EqualChanced[irand(0, EqualChanced.size()-1)];
+        return &EqualChanced[irand(0, EqualChanced.size() - 1)];
 
     return NULL;                                            // Empty drop from the group
 }
@@ -875,33 +884,45 @@ LootStoreItem const * LootTemplate::LootGroup::Roll() const
 // True if group includes at least 1 quest drop entry
 bool LootTemplate::LootGroup::HasQuestDrop() const
 {
-    for (LootStoreItemList::const_iterator i=ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i)
+    for (LootStoreItemList::const_iterator i = ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i)
         if (i->needs_quest)
             return true;
-    for (LootStoreItemList::const_iterator i=EqualChanced.begin(); i != EqualChanced.end(); ++i)
+    for (LootStoreItemList::const_iterator i = EqualChanced.begin(); i != EqualChanced.end(); ++i)
         if (i->needs_quest)
             return true;
     return false;
 }
 
 // True if group includes at least 1 quest drop entry for active quests of the player
-bool LootTemplate::LootGroup::HasQuestDropForPlayer(Player const * player) const
+bool LootTemplate::LootGroup::HasQuestDropForPlayer(Player const* player) const
 {
-    for (LootStoreItemList::const_iterator i=ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i)
+    for (LootStoreItemList::const_iterator i = ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i)
         if (player->HasQuestForItem(i->itemid))
             return true;
-    for (LootStoreItemList::const_iterator i=EqualChanced.begin(); i != EqualChanced.end(); ++i)
+    for (LootStoreItemList::const_iterator i = EqualChanced.begin(); i != EqualChanced.end(); ++i)
         if (player->HasQuestForItem(i->itemid))
             return true;
     return false;
 }
 
 // Rolls an item from the group (if any takes its chance) and adds the item to the loot
-void LootTemplate::LootGroup::Process(Loot& loot) const
+void LootTemplate::LootGroup::Process(Loot& loot, LootStore const& store) const
 {
-    LootStoreItem const * item = Roll();
+    LootStoreItem const* item = Roll();
     if (item != NULL)
-        loot.AddItem(*item);
+    {
+        if (item->mincountOrRef < 0)                           // References processing
+        {
+            LootTemplate const* Referenced = LootTemplates_Reference.GetLootFor(-item->mincountOrRef);
+            if(!Referenced)
+                return;                                   // Error message already printed at loading stage
+
+            for (uint32 loop=0; loop < item->maxcount; ++loop )// Ref multiplicator
+                Referenced->Process(loot, store, false, 0);
+        }
+        else
+            loot.AddItem(*item);
+    }
 }
 
 // Overall chance for the group without equal chanced items
@@ -909,8 +930,8 @@ float LootTemplate::LootGroup::RawTotalChance() const
 {
     float result = 0;
 
-    for (LootStoreItemList::const_iterator i=ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i)
-        if ( !i->needs_quest )
+    for (LootStoreItemList::const_iterator i = ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i)
+        if (!i->needs_quest)
             result += i->chance;
 
     return result;
@@ -935,7 +956,7 @@ void LootTemplate::LootGroup::Verify(LootStore const& lootstore, uint32 id, uint
         sLog.outErrorDb("Table '%s' entry %u group %d has total chance > 100%% (%f)", lootstore.GetName(), id, group_id, chance);
     }
 
-    if(chance >= 100.0f && !EqualChanced.empty())
+    if (chance >= 100.0f && !EqualChanced.empty())
     {
         sLog.outErrorDb("Table '%s' entry %u group %d has items with chance=0%% but group total chance >= 100%% (%f)", lootstore.GetName(), id, group_id, chance);
     }
@@ -943,24 +964,24 @@ void LootTemplate::LootGroup::Verify(LootStore const& lootstore, uint32 id, uint
 
 void LootTemplate::LootGroup::CheckLootRefs(LootIdSet* ref_set) const
 {
-    for (LootStoreItemList::const_iterator ieItr=ExplicitlyChanced.begin(); ieItr != ExplicitlyChanced.end(); ++ieItr)
+    for (LootStoreItemList::const_iterator ieItr = ExplicitlyChanced.begin(); ieItr != ExplicitlyChanced.end(); ++ieItr)
     {
-        if(ieItr->mincountOrRef < 0)
+        if (ieItr->mincountOrRef < 0)
         {
-            if(!LootTemplates_Reference.GetLootFor(-ieItr->mincountOrRef))
+            if (!LootTemplates_Reference.GetLootFor(-ieItr->mincountOrRef))
                 LootTemplates_Reference.ReportNotExistedId(-ieItr->mincountOrRef);
-            else if(ref_set)
+            else if (ref_set)
                 ref_set->erase(-ieItr->mincountOrRef);
         }
     }
 
-    for (LootStoreItemList::const_iterator ieItr=EqualChanced.begin(); ieItr != EqualChanced.end(); ++ieItr)
+    for (LootStoreItemList::const_iterator ieItr = EqualChanced.begin(); ieItr != EqualChanced.end(); ++ieItr)
     {
-        if(ieItr->mincountOrRef < 0)
+        if (ieItr->mincountOrRef < 0)
         {
-            if(!LootTemplates_Reference.GetLootFor(-ieItr->mincountOrRef))
+            if (!LootTemplates_Reference.GetLootFor(-ieItr->mincountOrRef))
                 LootTemplates_Reference.ReportNotExistedId(-ieItr->mincountOrRef);
-            else if(ref_set)
+            else if (ref_set)
                 ref_set->erase(-ieItr->mincountOrRef);
         }
     }
@@ -973,11 +994,11 @@ void LootTemplate::LootGroup::CheckLootRefs(LootIdSet* ref_set) const
 // Adds an entry to the group (at loading stage)
 void LootTemplate::AddEntry(LootStoreItem& item)
 {
-    if (item.group > 0 && item.mincountOrRef > 0)           // Group
+    if (item.group > 0)           // Group
     {
         if (item.group >= Groups.size())
             Groups.resize(item.group);                      // Adds new group the the loot template if needed
-        Groups[item.group-1].AddEntry(item);                // Adds new entry to the group
+        Groups[item.group - 1].AddEntry(item);              // Adds new entry to the group
     }
     else                                                    // Non-grouped entries and references are stored together
         Entries.push_back(item);
@@ -991,12 +1012,12 @@ void LootTemplate::Process(Loot& loot, LootStore const& store, bool rate, uint8
         if (groupId > Groups.size())
             return;                                         // Error message already printed at loading stage
 
-        Groups[groupId-1].Process(loot);
+        Groups[groupId - 1].Process(loot, store);
         return;
     }
 
     // Rolling non-grouped items
-    for (LootStoreItemList::const_iterator i = Entries.begin() ; i != Entries.end() ; ++i )
+    for (LootStoreItemList::const_iterator i = Entries.begin() ; i != Entries.end() ; ++i)
     {
         if (!i->Roll(rate))
             continue;                                       // Bad luck for the entry
@@ -1005,10 +1026,14 @@ void LootTemplate::Process(Loot& loot, LootStore const& store, bool rate, uint8
         {
             LootTemplate const* Referenced = LootTemplates_Reference.GetLootFor(-i->mincountOrRef);
 
-            if(!Referenced)
+            if (!Referenced)
                 continue;                                   // Error message already printed at loading stage
 
-            for (uint32 loop=0; loop < i->maxcount; ++loop )// Ref multiplicator
+            // Check condition
+            if (i->conditionId && !sObjectMgr.IsPlayerMeetToCondition(i->conditionId, NULL, NULL, loot.GetLootTarget(), CONDITION_FROM_REFERING_LOOT))
+                continue;
+
+            for (uint32 loop = 0; loop < i->maxcount; ++loop) // Ref multiplicator
                 Referenced->Process(loot, store, rate, i->group);
         }
         else                                                // Plain entries (not a reference, not grouped)
@@ -1016,8 +1041,8 @@ void LootTemplate::Process(Loot& loot, LootStore const& store, bool rate, uint8
     }
 
     // Now processing groups
-    for (LootGroups::const_iterator i = Groups.begin( ) ; i != Groups.end( ) ; ++i )
-        i->Process(loot);
+    for (LootGroups::const_iterator i = Groups.begin() ; i != Groups.end() ; ++i)
+        i->Process(loot, store);
 }
 
 // True if template includes at least 1 quest drop entry
@@ -1027,25 +1052,25 @@ bool LootTemplate::HasQuestDrop(LootTemplateMap const& store, uint8 groupId) con
     {
         if (groupId > Groups.size())
             return false;                                   // Error message [should be] already printed at loading stage
-        return Groups[groupId-1].HasQuestDrop();
+        return Groups[groupId - 1].HasQuestDrop();
     }
 
-    for (LootStoreItemList::const_iterator i = Entries.begin(); i != Entries.end(); ++i )
+    for (LootStoreItemList::const_iterator i = Entries.begin(); i != Entries.end(); ++i)
     {
         if (i->mincountOrRef < 0)                           // References
         {
             LootTemplateMap::const_iterator Referenced = store.find(-i->mincountOrRef);
-            if( Referenced ==store.end() )
+            if (Referenced == store.end())
                 continue;                                   // Error message [should be] already printed at loading stage
-            if (Referenced->second->HasQuestDrop(store, i->group) )
+            if (Referenced->second->HasQuestDrop(store, i->group))
                 return true;
         }
-        else if ( i->needs_quest )
+        else if (i->needs_quest)
             return true;                                    // quest drop found
     }
 
     // Now processing groups
-    for (LootGroups::const_iterator i = Groups.begin() ; i != Groups.end() ; ++i )
+    for (LootGroups::const_iterator i = Groups.begin() ; i != Groups.end() ; ++i)
         if (i->HasQuestDrop())
             return true;
 
@@ -1059,26 +1084,26 @@ bool LootTemplate::HasQuestDropForPlayer(LootTemplateMap const& store, Player co
     {
         if (groupId > Groups.size())
             return false;                                   // Error message already printed at loading stage
-        return Groups[groupId-1].HasQuestDropForPlayer(player);
+        return Groups[groupId - 1].HasQuestDropForPlayer(player);
     }
 
     // Checking non-grouped entries
-    for (LootStoreItemList::const_iterator i = Entries.begin() ; i != Entries.end() ; ++i )
+    for (LootStoreItemList::const_iterator i = Entries.begin() ; i != Entries.end() ; ++i)
     {
         if (i->mincountOrRef < 0)                           // References processing
         {
             LootTemplateMap::const_iterator Referenced = store.find(-i->mincountOrRef);
-            if (Referenced == store.end() )
+            if (Referenced == store.end())
                 continue;                                   // Error message already printed at loading stage
-            if (Referenced->second->HasQuestDropForPlayer(store, player, i->group) )
+            if (Referenced->second->HasQuestDropForPlayer(store, player, i->group))
                 return true;
         }
-        else if ( player->HasQuestForItem(i->itemid) )
+        else if (player->HasQuestForItem(i->itemid))
             return true;                                    // active quest drop found
     }
 
     // Now checking groups
-    for (LootGroups::const_iterator i = Groups.begin(); i != Groups.end(); ++i )
+    for (LootGroups::const_iterator i = Groups.begin(); i != Groups.end(); ++i)
         if (i->HasQuestDropForPlayer(player))
             return true;
 
@@ -1089,26 +1114,26 @@ bool LootTemplate::HasQuestDropForPlayer(LootTemplateMap const& store, Player co
 void LootTemplate::Verify(LootStore const& lootstore, uint32 id) const
 {
     // Checking group chances
-    for (uint32 i=0; i < Groups.size(); ++i)
-        Groups[i].Verify(lootstore,id,i+1);
+    for (uint32 i = 0; i < Groups.size(); ++i)
+        Groups[i].Verify(lootstore, id, i + 1);
 
     // TODO: References validity checks
 }
 
 void LootTemplate::CheckLootRefs(LootIdSet* ref_set) const
 {
-    for(LootStoreItemList::const_iterator ieItr = Entries.begin(); ieItr != Entries.end(); ++ieItr)
+    for (LootStoreItemList::const_iterator ieItr = Entries.begin(); ieItr != Entries.end(); ++ieItr)
     {
-        if(ieItr->mincountOrRef < 0)
+        if (ieItr->mincountOrRef < 0)
         {
-            if(!LootTemplates_Reference.GetLootFor(-ieItr->mincountOrRef))
+            if (!LootTemplates_Reference.GetLootFor(-ieItr->mincountOrRef))
                 LootTemplates_Reference.ReportNotExistedId(-ieItr->mincountOrRef);
-            else if(ref_set)
+            else if (ref_set)
                 ref_set->erase(-ieItr->mincountOrRef);
         }
     }
 
-    for(LootGroups::const_iterator grItr = Groups.begin(); grItr != Groups.end(); ++grItr)
+    for (LootGroups::const_iterator grItr = Groups.begin(); grItr != Groups.end(); ++grItr)
         grItr->CheckLootRefs(ref_set);
 }
 
@@ -1118,11 +1143,11 @@ void LoadLootTemplates_Creature()
     LootTemplates_Creature.LoadAndCollectLootIds(ids_set);
 
     // remove real entries and check existence loot
-    for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i )
+    for (uint32 i = 1; i < sCreatureStorage.GetMaxEntry(); ++i)
     {
-        if(CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
+        if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
         {
-            if(uint32 lootid = cInfo->lootid)
+            if (uint32 lootid = cInfo->LootId)
             {
                 if (ids_set.find(lootid) == ids_set.end())
                     LootTemplates_Creature.ReportNotExistedId(lootid);
@@ -1131,7 +1156,7 @@ void LoadLootTemplates_Creature()
             }
         }
     }
-    for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
+    for (LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
         ids_set.erase(*itr);
 
     // for alterac valley we've defined Player-loot inside creature_loot_template id=0
@@ -1148,11 +1173,11 @@ void LoadLootTemplates_Disenchant()
     LootTemplates_Disenchant.LoadAndCollectLootIds(ids_set);
 
     // remove real entries and check existence loot
-    for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i )
+    for (uint32 i = 1; i < sItemStorage.GetMaxEntry(); ++i)
     {
-        if(ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i))
+        if (ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i))
         {
-            if(uint32 lootid = proto->DisenchantID)
+            if (uint32 lootid = proto->DisenchantID)
             {
                 if (ids_set.find(lootid) == ids_set.end())
                     LootTemplates_Disenchant.ReportNotExistedId(lootid);
@@ -1161,7 +1186,7 @@ void LoadLootTemplates_Disenchant()
             }
         }
     }
-    for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
+    for (LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
         ids_set.erase(*itr);
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_Disenchant.ReportUnusedIds(ids_set);
@@ -1173,9 +1198,9 @@ void LoadLootTemplates_Fishing()
     LootTemplates_Fishing.LoadAndCollectLootIds(ids_set);
 
     // remove real entries and check existence loot
-    for(uint32 i = 1; i < sAreaStore.GetNumRows(); ++i )
+    for (uint32 i = 1; i < sAreaStore.GetNumRows(); ++i)
     {
-        if(AreaTableEntry const* areaEntry = sAreaStore.LookupEntry(i))
+        if (AreaTableEntry const* areaEntry = sAreaStore.LookupEntry(i))
             if (ids_set.find(areaEntry->ID) != ids_set.end())
                 ids_set.erase(areaEntry->ID);
     }
@@ -1193,20 +1218,17 @@ void LoadLootTemplates_Gameobject()
     LootTemplates_Gameobject.LoadAndCollectLootIds(ids_set);
 
     // remove real entries and check existence loot
-    for(uint32 i = 1; i < sGOStorage.MaxEntry; ++i )
+    for (SQLStorageBase::SQLSIterator<GameObjectInfo> itr = sGOStorage.getDataBegin<GameObjectInfo>(); itr < sGOStorage.getDataEnd<GameObjectInfo>(); ++itr)
     {
-        if(GameObjectInfo const* gInfo = sGOStorage.LookupEntry<GameObjectInfo>(i))
+        if (uint32 lootid = itr->GetLootId())
         {
-            if(uint32 lootid = gInfo->GetLootId())
-            {
-                if (ids_set.find(lootid) == ids_set.end())
-                    LootTemplates_Gameobject.ReportNotExistedId(lootid);
-                else
-                    ids_setUsed.insert(lootid);
-            }
+            if (ids_set.find(lootid) == ids_set.end())
+                LootTemplates_Gameobject.ReportNotExistedId(lootid);
+            else
+                ids_setUsed.insert(lootid);
         }
     }
-    for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
+    for (LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
         ids_set.erase(*itr);
 
     // output error for any still listed (not referenced from appropriate table) ids
@@ -1219,11 +1241,11 @@ void LoadLootTemplates_Item()
     LootTemplates_Item.LoadAndCollectLootIds(ids_set);
 
     // remove real entries and check existence loot
-    for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i )
+    for (uint32 i = 1; i < sItemStorage.GetMaxEntry(); ++i)
     {
-        if(ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i))
+        if (ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i))
         {
-            if  (!(proto->Flags & ITEM_FLAG_LOOTABLE))
+            if (!(proto->Flags & ITEM_FLAG_LOOTABLE))
                 continue;
 
             if (ids_set.find(proto->ItemId) != ids_set.end() || proto->MaxMoneyLoot > 0)
@@ -1244,10 +1266,10 @@ void LoadLootTemplates_Milling()
     LootTemplates_Milling.LoadAndCollectLootIds(ids_set);
 
     // remove real entries and check existence loot
-    for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i )
+    for (uint32 i = 1; i < sItemStorage.GetMaxEntry(); ++i)
     {
         ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i);
-        if(!proto)
+        if (!proto)
             continue;
 
         if (!(proto->Flags & ITEM_FLAG_MILLABLE))
@@ -1269,11 +1291,11 @@ void LoadLootTemplates_Pickpocketing()
     LootTemplates_Pickpocketing.LoadAndCollectLootIds(ids_set);
 
     // remove real entries and check existence loot
-    for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i )
+    for (uint32 i = 1; i < sCreatureStorage.GetMaxEntry(); ++i)
     {
-        if(CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
+        if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
         {
-            if(uint32 lootid = cInfo->pickpocketLootId)
+            if (uint32 lootid = cInfo->PickpocketLootId)
             {
                 if (ids_set.find(lootid) == ids_set.end())
                     LootTemplates_Pickpocketing.ReportNotExistedId(lootid);
@@ -1282,7 +1304,7 @@ void LoadLootTemplates_Pickpocketing()
             }
         }
     }
-    for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
+    for (LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
         ids_set.erase(*itr);
 
     // output error for any still listed (not referenced from appropriate table) ids
@@ -1295,7 +1317,7 @@ void LoadLootTemplates_Prospecting()
     LootTemplates_Prospecting.LoadAndCollectLootIds(ids_set);
 
     // remove real entries and check existence loot
-    for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i )
+    for (uint32 i = 1; i < sItemStorage.GetMaxEntry(); ++i)
     {
         ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i);
         if (!proto)
@@ -1306,7 +1328,7 @@ void LoadLootTemplates_Prospecting()
 
         if (ids_set.find(proto->ItemId) != ids_set.end())
             ids_set.erase(proto->ItemId);
-        //else -- exist some cases that possible can be prospected but not expected have any result loot
+        // else -- exist some cases that possible can be prospected but not expected have any result loot
         //    LootTemplates_Prospecting.ReportNotExistedId(proto->ItemId);
     }
 
@@ -1320,8 +1342,8 @@ void LoadLootTemplates_Mail()
     LootTemplates_Mail.LoadAndCollectLootIds(ids_set);
 
     // remove real entries and check existence loot
-    for(uint32 i = 1; i < sMailTemplateStore.GetNumRows(); ++i )
-        if(sMailTemplateStore.LookupEntry(i))
+    for (uint32 i = 1; i < sMailTemplateStore.GetNumRows(); ++i)
+        if (sMailTemplateStore.LookupEntry(i))
             if (ids_set.find(i) != ids_set.end())
                 ids_set.erase(i);
 
@@ -1335,11 +1357,11 @@ void LoadLootTemplates_Skinning()
     LootTemplates_Skinning.LoadAndCollectLootIds(ids_set);
 
     // remove real entries and check existence loot
-    for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i )
+    for (uint32 i = 1; i < sCreatureStorage.GetMaxEntry(); ++i)
     {
-        if(CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
+        if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
         {
-            if(uint32 lootid = cInfo->SkinLootId)
+            if (uint32 lootid = cInfo->SkinningLootId)
             {
                 if (ids_set.find(lootid) == ids_set.end())
                     LootTemplates_Skinning.ReportNotExistedId(lootid);
@@ -1348,7 +1370,7 @@ void LoadLootTemplates_Skinning()
             }
         }
     }
-    for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
+    for (LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
         ids_set.erase(*itr);
 
     // output error for any still listed (not referenced from appropriate table) ids
@@ -1361,14 +1383,14 @@ void LoadLootTemplates_Spell()
     LootTemplates_Spell.LoadAndCollectLootIds(ids_set);
 
     // remove real entries and check existence loot
-    for(uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id)
+    for (uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id)
     {
-        SpellEntry const* spellInfo = sSpellStore.LookupEntry (spell_id);
-        if(!spellInfo)
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell_id);
+        if (!spellInfo)
             continue;
 
         // possible cases
-        if( !IsLootCraftingSpell(spellInfo))
+        if (!IsLootCraftingSpell(spellInfo))
             continue;
 
         if (ids_set.find(spell_id) == ids_set.end())
@@ -1405,6 +1427,7 @@ void LoadLootTemplates_Reference()
     LootTemplates_Prospecting.CheckLootRefs(&ids_set);
     LootTemplates_Mail.CheckLootRefs(&ids_set);
     LootTemplates_Reference.CheckLootRefs(&ids_set);
+    LootTemplates_Spell.CheckLootRefs(&ids_set);
 
     // output error for any still listed ids (not referenced from any loot table)
     LootTemplates_Reference.ReportUnusedIds(ids_set);
diff --git a/src/game/LootMgr.h b/src/game/LootMgr.h
index 0d3bbc3b4e9..52e9945dee3 100644
--- a/src/game/LootMgr.h
+++ b/src/game/LootMgr.h
@@ -47,7 +47,7 @@ enum LootType
     LOOT_PICKPOCKETING          = 2,
     LOOT_FISHING                = 3,
     LOOT_DISENCHANTING          = 4,
-                                                            // ignored always by client
+    // ignored always by client
     LOOT_SKINNING               = 6,
     LOOT_PROSPECTING            = 7,
     LOOT_MILLING                = 8,
@@ -67,39 +67,41 @@ enum LootSlotType
     MAX_LOOT_SLOT_TYPE                                      // custom, use for mark skipped from show items
 };
 
-
-
 class Player;
 class LootStore;
+class WorldObject;
 
 struct LootStoreItem
 {
     uint32  itemid;                                         // id of the item
     float   chance;                                         // always positive, chance to drop for both quest and non-quest items, chance to be used for refs
     int32   mincountOrRef;                                  // mincount for drop items (positive) or minus referenced TemplateleId (negative)
-    uint8   group       :7;
-    bool    needs_quest :1;                                 // quest drop (negative ChanceOrQuestChance in DB)
-    uint8   maxcount    :8;                                 // max drop count for the item (mincountOrRef positive) or Ref multiplicator (mincountOrRef negative)
-    uint16  conditionId :16;                                // additional loot condition Id
+    uint8   group       : 7;
+    bool    needs_quest : 1;                                // quest drop (negative ChanceOrQuestChance in DB)
+    uint8   maxcount    : 8;                                // max drop count for the item (mincountOrRef positive) or Ref multiplicator (mincountOrRef negative)
+    uint16  conditionId : 16;                               // additional loot condition Id
 
     // Constructor, converting ChanceOrQuestChance -> (chance, needs_quest)
     // displayid is filled in IsValid() which must be called after
     LootStoreItem(uint32 _itemid, float _chanceOrQuestChance, int8 _group, uint16 _conditionId, int32 _mincountOrRef, uint8 _maxcount)
         : itemid(_itemid), chance(fabs(_chanceOrQuestChance)), mincountOrRef(_mincountOrRef),
-        group(_group), needs_quest(_chanceOrQuestChance < 0), maxcount(_maxcount), conditionId(_conditionId)
-         {}
+          group(_group), needs_quest(_chanceOrQuestChance < 0), maxcount(_maxcount), conditionId(_conditionId)
+    {}
 
     bool Roll(bool rate) const;                             // Checks if the entry takes it's chance (at loot generation)
     bool IsValid(LootStore const& store, uint32 entry) const;
-                                                            // Checks correctness of values
+    // Checks correctness of values
 };
 
+typedef std::set<uint32> AllowedLooterSet;
+
 struct LootItem
 {
     uint32  itemid;
     uint32  randomSuffix;
     int32   randomPropertyId;
-    uint16  conditionId       :16;                          // allow compiler pack structure
+    AllowedLooterSet allowedGuids;
+    uint16  conditionId       : 16;                         // allow compiler pack structure
     uint8   count             : 8;
     bool    is_looted         : 1;
     bool    is_blocked        : 1;
@@ -115,8 +117,12 @@ struct LootItem
     LootItem(uint32 itemid_, uint32 count_, uint32 randomSuffix_ = 0, int32 randomPropertyId_ = 0);
 
     // Basic checks for player/item compatibility - if false no chance to see the item in the loot
-    bool AllowedForPlayer(Player const * player) const;
-    LootSlotType GetSlotTypeForSharedLoot(PermissionTypes permission, Player* viewer, bool condition_ok = false) const;
+
+    void AddAllowedLooter(Player const* player);
+    AllowedLooterSet* GetAllowedLooters() { return &allowedGuids; }
+
+    bool AllowedForPlayer(Player const* player, WorldObject const* lootTarget) const;
+    LootSlotType GetSlotTypeForSharedLoot(PermissionTypes permission, Player* viewer, WorldObject const* lootTarget, bool condition_ok = false) const;
 };
 
 typedef std::vector<LootItem> LootItemList;
@@ -137,7 +143,7 @@ struct Loot;
 class LootTemplate;
 
 typedef std::vector<QuestItem> QuestItemList;
-typedef std::map<uint32, QuestItemList *> QuestItemMap;
+typedef std::map<uint32, QuestItemList> QuestItemMap;
 typedef std::vector<LootStoreItem> LootStoreItemList;
 typedef UNORDERED_MAP<uint32, LootTemplate*> LootTemplateMap;
 
@@ -159,7 +165,7 @@ class LootStore
 
         bool HaveLootFor(uint32 loot_id) const { return m_LootTemplates.find(loot_id) != m_LootTemplates.end(); }
         bool HaveQuestLootFor(uint32 loot_id) const;
-        bool HaveQuestLootForPlayer(uint32 loot_id,Player* player) const;
+        bool HaveQuestLootForPlayer(uint32 loot_id, Player* player) const;
 
         LootTemplate const* GetLootFor(uint32 loot_id) const;
 
@@ -178,8 +184,8 @@ class LootStore
 
 class LootTemplate
 {
-    class  LootGroup;                                       // A set of loot definitions for items (refs are not allowed inside)
-    typedef std::vector<LootGroup> LootGroups;
+        class  LootGroup;                                   // A set of loot definitions for items (refs are not allowed inside)
+        typedef std::vector<LootGroup> LootGroups;
 
     public:
         // Adds an entry to the group (at loading stage)
@@ -190,7 +196,7 @@ class LootTemplate
         // True if template includes at least 1 quest drop entry
         bool HasQuestDrop(LootTemplateMap const& store, uint8 GroupId = 0) const;
         // True if template includes at least 1 quest drop for an active quest of the player
-        bool HasQuestDropForPlayer(LootTemplateMap const& store, Player const * player, uint8 GroupId = 0) const;
+        bool HasQuestDropForPlayer(LootTemplateMap const& store, Player const* player, uint8 GroupId = 0) const;
 
         // Checks integrity of the template
         void Verify(LootStore const& store, uint32 Id) const;
@@ -234,66 +240,59 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv);
 
 struct Loot
 {
-    friend ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv);
-
-    QuestItemMap const& GetPlayerQuestItems() const { return m_playerQuestItems; }
-    QuestItemMap const& GetPlayerFFAItems() const { return m_playerFFAItems; }
-    QuestItemMap const& GetPlayerNonQuestNonFFAConditionalItems() const { return m_playerNonQuestNonFFAConditionalItems; }
-
-    LootItemList items;
-    uint32 gold;
-    uint8 unlootedCount;
-    LootType loot_type;                                     // required for achievement system
-
-    Loot(uint32 _gold = 0) : gold(_gold), unlootedCount(0), loot_type(LOOT_CORPSE) {}
-    ~Loot() { clear(); }
-
-    // if loot becomes invalid this reference is used to inform the listener
-    void addLootValidatorRef(LootValidatorRef* pLootValidatorRef)
-    {
-        m_LootValidatorRefManager.insertFirst(pLootValidatorRef);
-    }
-
-    // void clear();
-    void clear()
-    {
-        for (QuestItemMap::const_iterator itr = m_playerQuestItems.begin(); itr != m_playerQuestItems.end(); ++itr)
-            delete itr->second;
-        m_playerQuestItems.clear();
-
-        for (QuestItemMap::const_iterator itr = m_playerFFAItems.begin(); itr != m_playerFFAItems.end(); ++itr)
-            delete itr->second;
-        m_playerFFAItems.clear();
-
-        for (QuestItemMap::const_iterator itr = m_playerNonQuestNonFFAConditionalItems.begin(); itr != m_playerNonQuestNonFFAConditionalItems.end(); ++itr)
-            delete itr->second;
-        m_playerNonQuestNonFFAConditionalItems.clear();
-
-        m_playersLooting.clear();
-        items.clear();
-        m_questItems.clear();
-        gold = 0;
-        unlootedCount = 0;
-        m_LootValidatorRefManager.clearReferences();
-    }
-
-    bool empty() const { return items.empty() && gold == 0; }
-    bool isLooted() const { return gold == 0 && unlootedCount == 0; }
-
-    void NotifyItemRemoved(uint8 lootIndex);
-    void NotifyQuestItemRemoved(uint8 questIndex);
-    void NotifyMoneyRemoved();
-    void AddLooter(ObjectGuid guid) { m_playersLooting.insert(guid); }
-    void RemoveLooter(ObjectGuid guid) { m_playersLooting.erase(guid); }
-
-    void generateMoneyLoot(uint32 minAmount, uint32 maxAmount);
-    bool FillLoot(uint32 loot_id, LootStore const& store, Player* loot_owner, bool personal, bool noEmptyError = false);
-
-    // Inserts the item into the loot (called by LootTemplate processors)
-    void AddItem(LootStoreItem const & item);
-
-    LootItem* LootItemInSlot(uint32 lootslot, Player* player, QuestItem** qitem = NULL, QuestItem** ffaitem = NULL, QuestItem** conditem = NULL);
-    uint32 GetMaxSlotInLootFor(Player* player) const;
+        friend ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv);
+
+        QuestItemMap const& GetPlayerQuestItems() const { return m_playerQuestItems; }
+        QuestItemMap const& GetPlayerFFAItems() const { return m_playerFFAItems; }
+        QuestItemMap const& GetPlayerNonQuestNonFFAConditionalItems() const { return m_playerNonQuestNonFFAConditionalItems; }
+
+        LootItemList items;
+        uint32 gold;
+        uint8 unlootedCount;
+        LootType loot_type;                                 // required for achievement system
+
+        Loot(WorldObject const* lootTarget, uint32 _gold = 0) : gold(_gold), unlootedCount(0), loot_type(LOOT_CORPSE), m_lootTarget(lootTarget) {}
+        ~Loot() { clear(); }
+
+        // if loot becomes invalid this reference is used to inform the listener
+        void addLootValidatorRef(LootValidatorRef* pLootValidatorRef)
+        {
+            m_LootValidatorRefManager.insertFirst(pLootValidatorRef);
+        }
+
+        // void clear();
+        void clear()
+        {
+            m_playerQuestItems.clear();
+            m_playerFFAItems.clear();
+            m_playerNonQuestNonFFAConditionalItems.clear();
+            m_playersLooting.clear();
+            items.clear();
+            m_questItems.clear();
+            gold = 0;
+            unlootedCount = 0;
+            m_LootValidatorRefManager.clearReferences();
+        }
+
+        bool empty() const { return items.empty() && gold == 0; }
+        bool isLooted() const { return gold == 0 && unlootedCount == 0; }
+
+        void NotifyItemRemoved(uint8 lootIndex);
+        void NotifyQuestItemRemoved(uint8 questIndex);
+        void NotifyMoneyRemoved();
+        void AddLooter(ObjectGuid guid) { m_playersLooting.insert(guid); }
+        void RemoveLooter(ObjectGuid guid) { m_playersLooting.erase(guid); }
+
+        void generateMoneyLoot(uint32 minAmount, uint32 maxAmount);
+        bool FillLoot(uint32 loot_id, LootStore const& store, Player* loot_owner, bool personal, bool noEmptyError = false);
+
+        // Inserts the item into the loot (called by LootTemplate processors)
+        void AddItem(LootStoreItem const& item);
+
+        LootItem* LootItemInSlot(uint32 lootslot, Player* player, QuestItem** qitem = NULL, QuestItem** ffaitem = NULL, QuestItem** conditem = NULL);
+        uint32 GetMaxSlotInLootFor(Player* player) const;
+
+        WorldObject const* GetLootTarget() const { return m_lootTarget; }
 
     private:
         void FillNotNormalLootFor(Player* player);
@@ -303,8 +302,7 @@ struct Loot
 
         LootItemList m_questItems;
 
-        typedef std::set<ObjectGuid> PlayersLooting;
-        PlayersLooting m_playersLooting;
+        GuidSet m_playersLooting;
 
         QuestItemMap m_playerQuestItems;
         QuestItemMap m_playerFFAItems;
@@ -312,14 +310,17 @@ struct Loot
 
         // All rolls are registered here. They need to know, when the loot is not valid anymore
         LootValidatorRefManager m_LootValidatorRefManager;
+
+        // What is looted
+        WorldObject const* m_lootTarget;
 };
 
 struct LootView
 {
-    Loot &loot;
-    Player *viewer;
+    Loot& loot;
+    Player* viewer;
     PermissionTypes permission;
-    LootView(Loot &_loot, Player *_viewer,PermissionTypes _permission = ALL_PERMISSION)
+    LootView(Loot& _loot, Player* _viewer, PermissionTypes _permission = ALL_PERMISSION)
         : loot(_loot), viewer(_viewer), permission(_permission) {}
 };
 
diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp
index 8a611d8742d..76889f68180 100644
--- a/src/game/Mail.cpp
+++ b/src/game/Mail.cpp
@@ -25,6 +25,7 @@
  *
  */
 
+#include "AccountMgr.h"
 #include "Mail.h"
 #include "Log.h"
 #include "ObjectGuid.h"
@@ -32,6 +33,8 @@
 #include "Item.h"
 #include "Player.h"
 #include "World.h"
+#include "Calendar.h"
+#include "ahbot/AhBot.h"
 
 /**
  * Creates a new MailSender object.
@@ -39,9 +42,9 @@
  * @param sender The object/player sending this mail.
  * @param stationery The stationary associated with this sender.
  */
-MailSender::MailSender( Object* sender, MailStationery stationery ) : m_stationery(stationery)
+MailSender::MailSender(Object* sender, MailStationery stationery) : m_stationery(stationery)
 {
-    switch(sender->GetTypeId())
+    switch (sender->GetTypeId())
     {
         case TYPEID_UNIT:
             m_messageType = MAIL_CREATURE;
@@ -51,11 +54,6 @@ MailSender::MailSender( Object* sender, MailStationery stationery ) : m_statione
             m_messageType = MAIL_GAMEOBJECT;
             m_senderId = sender->GetEntry();
             break;
-        case TYPEID_ITEM:
-        case TYPEID_CONTAINER:
-            m_messageType = MAIL_ITEM;
-            m_senderId = sender->GetEntry();
-            break;
         case TYPEID_PLAYER:
             m_messageType = MAIL_NORMAL;
             m_senderId = sender->GetGUIDLow();
@@ -63,7 +61,7 @@ MailSender::MailSender( Object* sender, MailStationery stationery ) : m_statione
         default:
             m_messageType = MAIL_NORMAL;
             m_senderId = 0;                                 // will show mail from nonexistent player
-            sLog.outError( "MailSender::MailSender - Mail have unexpected sender typeid (%u)", sender->GetTypeId());
+            sLog.outError("MailSender::MailSender - Mail have unexpected sender typeid (%u)", sender->GetTypeId());
             break;
     }
 }
@@ -72,13 +70,24 @@ MailSender::MailSender( Object* sender, MailStationery stationery ) : m_statione
  *
  * @param sender the AuctionEntry from which this mail is generated.
  */
-MailSender::MailSender( AuctionEntry* sender )
+MailSender::MailSender(AuctionEntry* sender)
     : m_messageType(MAIL_AUCTION), m_senderId(sender->GetHouseId()), m_stationery(MAIL_STATIONERY_AUCTION)
 {
 }
 
 /**
- * Creates a new MailReceiver object.
+ * Creates a new MailSender object from an event.
+ *
+ * @param sender the calendar event from which this mail is generated.
+ *
+ * Note : Actualy it seem no info from event is required. We need more research to correctly initialise m_senderId
+ */
+MailSender::MailSender(CalendarEvent const* sender)
+    : m_messageType(MAIL_CALENDAR), m_senderId(0), m_stationery(MAIL_STATIONERY_DEFAULT)
+{
+}
+
+/** * Creates a new MailReceiver object.
  *
  * @param receiver The player receiving the mail.
  */
@@ -102,7 +111,7 @@ MailReceiver::MailReceiver(Player* receiver, ObjectGuid receiver_guid) : m_recei
  * @param item The item to be added to the MailDraft.
  * @returns the MailDraft the item was added to.
  */
-MailDraft& MailDraft::AddItem( Item* item )
+MailDraft& MailDraft::AddItem(Item* item)
 {
     m_items[item->GetGUIDLow()] = item;
     return *this;
@@ -117,13 +126,13 @@ bool MailDraft::prepareItems(Player* receiver)
 
     m_mailTemplateItemsNeed = false;
 
-    Loot mailLoot;
+    Loot mailLoot(NULL);
 
     // can be empty
     mailLoot.FillLoot(m_mailTemplateId, LootTemplates_Mail, receiver, true, true);
 
     uint32 max_slot = mailLoot.GetMaxSlotInLootFor(receiver);
-    for(uint32 i = 0; m_items.size() < MAX_MAIL_ITEMS && i < max_slot; ++i)
+    for (uint32 i = 0; m_items.size() < MAX_MAIL_ITEMS && i < max_slot; ++i)
     {
         if (LootItem* lootitem = mailLoot.LootItemInSlot(i, receiver))
         {
@@ -142,13 +151,13 @@ bool MailDraft::prepareItems(Player* receiver)
  *
  * @param inDB A boolean specifying whether the change should be saved to the database or not.
  */
-void MailDraft::deleteIncludedItems( bool inDB /**= false*/ )
+void MailDraft::deleteIncludedItems(bool inDB /**= false*/)
 {
-    for(MailItemMap::iterator mailItemIter = m_items.begin(); mailItemIter != m_items.end(); ++mailItemIter)
+    for (MailItemMap::iterator mailItemIter = m_items.begin(); mailItemIter != m_items.end(); ++mailItemIter)
     {
         Item* item = mailItemIter->second;
 
-        if(inDB)
+        if (inDB)
             CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid='%u'", item->GetGUIDLow());
 
         delete item;
@@ -171,11 +180,11 @@ void MailDraft::CloneFrom(MailDraft const& draft)
     m_money = draft.GetMoney();
     m_COD = draft.GetCOD();
 
-    for(MailItemMap::const_iterator mailItemIter = draft.m_items.begin(); mailItemIter != draft.m_items.end(); ++mailItemIter)
+    for (MailItemMap::const_iterator mailItemIter = draft.m_items.begin(); mailItemIter != draft.m_items.end(); ++mailItemIter)
     {
         Item* item = mailItemIter->second;
 
-        if(Item* newitem = item->CloneItem(item->GetCount()))
+        if (Item* newitem = item->CloneItem(item->GetCount()))
         {
             newitem->SaveToDB();
             AddItem(newitem);
@@ -191,11 +200,11 @@ void MailDraft::CloneFrom(MailDraft const& draft)
  */
 void MailDraft::SendReturnToSender(uint32 sender_acc, ObjectGuid sender_guid, ObjectGuid receiver_guid)
 {
-    Player *receiver = sObjectMgr.GetPlayer(receiver_guid);
+    Player* receiver = sObjectMgr.GetPlayer(receiver_guid);
 
     uint32 rc_account = 0;
     if (!receiver)
-        rc_account = sObjectMgr.GetPlayerAccountIdByGUID(receiver_guid);
+        rc_account = sAccountMgr.GetPlayerAccountIdByGUID(receiver_guid);
 
     if (!receiver && !rc_account)                           // sender not exist
     {
@@ -227,8 +236,9 @@ void MailDraft::SendReturnToSender(uint32 sender_acc, ObjectGuid sender_guid, Ob
     uint32 deliver_delay = needItemDelay ? sWorld.getConfig(CONFIG_UINT32_MAIL_DELIVERY_DELAY) : 0;
 
     // will delete item or place to receiver mail list
-    SendMailTo(MailReceiver(receiver,receiver_guid), MailSender(MAIL_NORMAL, sender_guid.GetCounter()), MAIL_CHECK_MASK_RETURNED, deliver_delay);
+    SendMailTo(MailReceiver(receiver, receiver_guid), MailSender(MAIL_NORMAL, sender_guid.GetCounter()), MAIL_CHECK_MASK_RETURNED, deliver_delay);
 }
+
 /**
  * Sends a mail.
  *
@@ -243,9 +253,9 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
 
     uint32 pReceiverAccount = 0;
     if (!pReceiver)
-        pReceiverAccount = sObjectMgr.GetPlayerAccountIdByGUID(receiver.GetPlayerGuid());
+        pReceiverAccount = sAccountMgr.GetPlayerAccountIdByGUID(receiver.GetPlayerGuid());
 
-    if (!pReceiver && !pReceiverAccount)                    // receiver not exist
+    if ((!pReceiver && !pReceiverAccount) || receiver.GetPlayerGuid() == auctionbot.GetAHBplayerGUID())                    // receiver not exist
     {
         deleteIncludedItems(true);
         return;
@@ -283,14 +293,14 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
 
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("INSERT INTO mail (id,messageType,stationery,mailTemplateId,sender,receiver,subject,body,has_items,expire_time,deliver_time,money,cod,checked) "
-        "VALUES ('%u', '%u', '%u', '%u', '%u', '%u', '%s', '%s', '%u', '" UI64FMTD "','" UI64FMTD "', '%u', '%u', '%u')",
-        mailId, sender.GetMailMessageType(), sender.GetStationery(), GetMailTemplateId(), sender.GetSenderId(), receiver.GetPlayerGuid().GetCounter(), safe_subject.c_str(), safe_body.c_str(), (has_items ? 1 : 0), (uint64)expire_time, (uint64)deliver_time, m_money, m_COD, checked);
+                               "VALUES ('%u', '%u', '%u', '%u', '%u', '%u', '%s', '%s', '%u', '" UI64FMTD "','" UI64FMTD "', '%u', '%u', '%u')",
+                               mailId, sender.GetMailMessageType(), sender.GetStationery(), GetMailTemplateId(), sender.GetSenderId(), receiver.GetPlayerGuid().GetCounter(), safe_subject.c_str(), safe_body.c_str(), (has_items ? 1 : 0), (uint64)expire_time, (uint64)deliver_time, m_money, m_COD, checked);
 
-    for(MailItemMap::const_iterator mailItemIter = m_items.begin(); mailItemIter != m_items.end(); ++mailItemIter)
+    for (MailItemMap::const_iterator mailItemIter = m_items.begin(); mailItemIter != m_items.end(); ++mailItemIter)
     {
         Item* item = mailItemIter->second;
         CharacterDatabase.PExecute("INSERT INTO mail_items (mail_id,item_guid,item_template,receiver) VALUES ('%u', '%u', '%u','%u')",
-            mailId, item->GetGUIDLow(), item->GetEntry(), receiver.GetPlayerGuid().GetCounter());
+                                   mailId, item->GetGUIDLow(), item->GetEntry(), receiver.GetPlayerGuid().GetCounter());
     }
     CharacterDatabase.CommitTransaction();
 
@@ -299,7 +309,7 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
     {
         pReceiver->AddNewMailDeliverTime(deliver_time);
 
-        Mail *m = new Mail;
+        Mail* m = new Mail;
         m->messageID = mailId;
         m->mailTemplateId = GetMailTemplateId();
         m->subject = GetSubject();
@@ -307,7 +317,7 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
         m->money = GetMoney();
         m->COD = GetCOD();
 
-        for(MailItemMap::const_iterator mailItemIter = m_items.begin(); mailItemIter != m_items.end(); ++mailItemIter)
+        for (MailItemMap::const_iterator mailItemIter = m_items.begin(); mailItemIter != m_items.end(); ++mailItemIter)
         {
             Item* item = mailItemIter->second;
             m->AddItem(item->GetGUIDLow(), item->GetEntry());
@@ -326,7 +336,7 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
 
         if (!m_items.empty())
         {
-            for(MailItemMap::iterator mailItemIter = m_items.begin(); mailItemIter != m_items.end(); ++mailItemIter)
+            for (MailItemMap::iterator mailItemIter = m_items.begin(); mailItemIter != m_items.end(); ++mailItemIter)
                 pReceiver->AddMItem(mailItemIter->second);
         }
     }
@@ -340,14 +350,14 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
  * @param receiver             reciver of mail
  */
 
-void Mail::prepareTemplateItems( Player* receiver )
+void Mail::prepareTemplateItems(Player* receiver)
 {
     if (!mailTemplateId || !items.empty())
         return;
 
     has_items = true;
 
-    Loot mailLoot;
+    Loot mailLoot(NULL);
 
     // can be empty
     mailLoot.FillLoot(mailTemplateId, LootTemplates_Mail, receiver, true, true);
@@ -356,7 +366,7 @@ void Mail::prepareTemplateItems( Player* receiver )
     CharacterDatabase.PExecute("UPDATE mail SET has_items = 1 WHERE id = %u", messageID);
 
     uint32 max_slot = mailLoot.GetMaxSlotInLootFor(receiver);
-    for(uint32 i = 0; items.size() < MAX_MAIL_ITEMS && i < max_slot; ++i)
+    for (uint32 i = 0; items.size() < MAX_MAIL_ITEMS && i < max_slot; ++i)
     {
         if (LootItem* lootitem = mailLoot.LootItemInSlot(i, receiver))
         {
@@ -369,7 +379,7 @@ void Mail::prepareTemplateItems( Player* receiver )
                 receiver->AddMItem(item);
 
                 CharacterDatabase.PExecute("INSERT INTO mail_items (mail_id,item_guid,item_template,receiver) VALUES ('%u', '%u', '%u','%u')",
-                    messageID, item->GetGUIDLow(), item->GetEntry(), receiver->GetGUIDLow());
+                                           messageID, item->GetGUIDLow(), item->GetEntry(), receiver->GetGUIDLow());
             }
         }
     }
diff --git a/src/game/Mail.h b/src/game/Mail.h
index b0aebf7c5b4..c692c6a22f1 100644
--- a/src/game/Mail.h
+++ b/src/game/Mail.h
@@ -42,6 +42,7 @@ struct AuctionEntry;
 class Item;
 class Object;
 class Player;
+class CalendarEvent;
 
 #define MAIL_BODY_ITEM_TEMPLATE 8383                        ///< - plain letter, A Dusty Unsent Letter: 889
 /// The maximal amount of items a mail can contain.
@@ -56,7 +57,7 @@ enum MailMessageType
     MAIL_AUCTION        = 2,
     MAIL_CREATURE       = 3,                                /// client send CMSG_CREATURE_QUERY on this mailmessagetype
     MAIL_GAMEOBJECT     = 4,                                /// client send CMSG_GAMEOBJECT_QUERY on this mailmessagetype
-    MAIL_ITEM           = 5,                                /// client send CMSG_ITEM_QUERY on this mailmessagetype
+    MAIL_CALENDAR       = 5,
 };
 /**
  * A Mask representing the status of the mail.
@@ -115,21 +116,22 @@ class MailSender
     public:                                                 // Constructors
         MailSender() : m_messageType(MAIL_NORMAL), m_senderId(0), m_stationery(MAIL_STATIONERY_DEFAULT) {}
 
-       /**
-        * Creates a new MailSender object.
-        *
-        * @param messageType the type of the mail.
-        * @param sender_guidlow_or_entry The lower part of the GUID of the player sending
-        *                                                                this mail, or the Entry of the non-player object.
-        * @param stationery The stationary associated with this MailSender.
-        *
-        */
+        /**
+         * Creates a new MailSender object.
+         *
+         * @param messageType the type of the mail.
+         * @param sender_guidlow_or_entry The lower part of the GUID of the player sending
+         *                                                                this mail, or the Entry of the non-player object.
+         * @param stationery The stationary associated with this MailSender.
+         *
+         */
         MailSender(MailMessageType messageType, uint32 sender_guidlow_or_entry, MailStationery stationery = MAIL_STATIONERY_DEFAULT)
             : m_messageType(messageType), m_senderId(sender_guidlow_or_entry), m_stationery(stationery)
         {
         }
         MailSender(Object* sender, MailStationery stationery = MAIL_STATIONERY_DEFAULT);
         MailSender(AuctionEntry* sender);
+        MailSender(CalendarEvent const* event);
     public:                                                 // Accessors
         /// The Messagetype of this MailSender.
         MailMessageType GetMailMessageType() const { return m_messageType; }
@@ -185,19 +187,19 @@ class MailDraft
         typedef std::map<uint32, Item*> MailItemMap;
 
     public:                                                 // Constructors
-       /**
-        * Creates a new blank MailDraft object
-        *
-        */
+        /**
+         * Creates a new blank MailDraft object
+         *
+         */
         MailDraft()
             : m_mailTemplateId(0), m_mailTemplateItemsNeed(false), m_money(0), m_COD(0) {}
-       /**
-        * Creates a new MailDraft object using mail template id.
-        *
-        * @param mailTemplateId The ID of the Template to be used.
-        * @param a boolean specifying whether the mail needs items or not.
-        *
-        */
+        /**
+         * Creates a new MailDraft object using mail template id.
+         *
+         * @param mailTemplateId The ID of the Template to be used.
+         * @param a boolean specifying whether the mail needs items or not.
+         *
+         */
         explicit MailDraft(uint16 mailTemplateId, bool need_items = true)
             : m_mailTemplateId(mailTemplateId), m_mailTemplateItemsNeed(need_items), m_money(0), m_COD(0)
         {}
@@ -348,9 +350,9 @@ struct Mail
      */
     bool RemoveItem(uint32 item_guid)
     {
-        for(MailItemInfoVec::iterator itr = items.begin(); itr != items.end(); ++itr)
+        for (MailItemInfoVec::iterator itr = items.begin(); itr != items.end(); ++itr)
         {
-            if(itr->item_guid == item_guid)
+            if (itr->item_guid == item_guid)
             {
                 items.erase(itr);
                 return true;
diff --git a/src/game/MailHandler.cpp b/src/game/MailHandler.cpp
index 782086f75a8..8b2ea80e8ff 100644
--- a/src/game/MailHandler.cpp
+++ b/src/game/MailHandler.cpp
@@ -25,6 +25,7 @@
  *
  */
 
+#include "AccountMgr.h"
 #include "Mail.h"
 #include "Language.h"
 #include "Log.h"
@@ -69,7 +70,7 @@ bool WorldSession::CheckMailBox(ObjectGuid guid)
             return false;
         }
 
-        if (!(creature->GetCreatureInfo()->type_flags & CREATURE_TYPEFLAGS_SQUIRE))
+        if (!(creature->GetCreatureInfo()->CreatureTypeFlags & CREATURE_TYPEFLAGS_SQUIRE))
         {
             DEBUG_LOG("%s not have access to mailbox.", creature->GetGuidStr().c_str());
             return false;
@@ -104,7 +105,7 @@ bool WorldSession::CheckMailBox(ObjectGuid guid)
  *
  * @param recv_data the WorldPacket containing the data sent by the client.
  */
-void WorldSession::HandleSendMail(WorldPacket & recv_data )
+void WorldSession::HandleSendMail(WorldPacket& recv_data)
 {
     ObjectGuid mailboxGuid;
     uint64 unk3;
@@ -133,7 +134,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
 
     ObjectGuid itemGuids[MAX_MAIL_ITEMS];
 
-    for(uint8 i = 0; i < items_count; ++i)
+    for (uint8 i = 0; i < items_count; ++i)
     {
         recv_data.read_skip<uint8>();                       // item slot in mail, not used
         recv_data >> itemGuids[i];
@@ -155,18 +156,18 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
 
     ObjectGuid rc;
     if (normalizePlayerName(receiver))
-        rc = sObjectMgr.GetPlayerGuidByName(receiver);
+        rc = sAccountMgr.GetPlayerGuidByName(receiver);
 
     if (!rc)
     {
         DETAIL_LOG("%s is sending mail to %s (GUID: nonexistent!) with subject %s and body %s includes %u items, %u copper and %u COD copper with unk1 = %u, unk2 = %u",
-            pl->GetGuidStr().c_str(), receiver.c_str(), subject.c_str(), body.c_str(), items_count, money, COD, unk1, unk2);
+                   pl->GetGuidStr().c_str(), receiver.c_str(), subject.c_str(), body.c_str(), items_count, money, COD, unk1, unk2);
         pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_RECIPIENT_NOT_FOUND);
         return;
     }
 
     DETAIL_LOG("%s is sending mail to %s with subject %s and body %s includes %u items, %u copper and %u COD copper with unk1 = %u, unk2 = %u",
-        pl->GetGuidStr().c_str(), rc.GetString().c_str(), subject.c_str(), body.c_str(), items_count, money, COD, unk1, unk2);
+               pl->GetGuidStr().c_str(), rc.GetString().c_str(), subject.c_str(), body.c_str(), items_count, money, COD, unk1, unk2);
 
     if (pl->GetObjectGuid() == rc)
     {
@@ -184,7 +185,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
         return;
     }
 
-    Player *receive = sObjectMgr.GetPlayer(rc);
+    Player* receive = sObjectMgr.GetPlayer(rc);
 
     Team rc_team;
     uint8 mails_count = 0;                                  // do not allow to send to one player more than 100 mails
@@ -196,10 +197,10 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
     }
     else
     {
-        rc_team = sObjectMgr.GetPlayerTeamByGUID(rc);
+        rc_team = sAccountMgr.GetPlayerTeamByGUID(rc);
         if (QueryResult* result = CharacterDatabase.PQuery("SELECT COUNT(*) FROM mail WHERE receiver = '%u'", rc.GetCounter()))
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             mails_count = fields[0].GetUInt32();
             delete result;
         }
@@ -220,12 +221,12 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
     }
 
     uint32 rc_account = receive
-        ? receive->GetSession()->GetAccountId()
-        : sObjectMgr.GetPlayerAccountIdByGUID(rc);
+                        ? receive->GetSession()->GetAccountId()
+                        : sAccountMgr.GetPlayerAccountIdByGUID(rc);
 
     Item* items[MAX_MAIL_ITEMS];
 
-    for(uint8 i = 0; i < items_count; ++i)
+    for (uint8 i = 0; i < items_count; ++i)
     {
         if (!itemGuids[i].IsItem())
         {
@@ -236,7 +237,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
         Item* item = pl->GetItemByGuid(itemGuids[i]);
 
         // prevent sending bag with items (cheat: can be placed in bag after adding equipped empty bag to mail)
-        if(!item)
+        if (!item)
         {
             pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_MAIL_ATTACHMENT_INVALID);
             return;
@@ -271,7 +272,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
 
     pl->SendMailResult(0, MAIL_SEND, MAIL_OK);
 
-    pl->ModifyMoney( -int32(reqmoney) );
+    pl->ModifyMoney(-int32(reqmoney));
     pl->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_FOR_MAIL, cost);
 
     bool needItemDelay = false;
@@ -282,15 +283,16 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
     {
         if (items_count > 0)
         {
-            for(uint8 i = 0; i < items_count; ++i)
+            for (uint8 i = 0; i < items_count; ++i)
             {
                 Item* item = items[i];
                 if (GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE))
                 {
                     sLog.outCommand(GetAccountId(), "GM %s (Account: %u) mail item: %s (Entry: %u Count: %u) to player: %s (Account: %u)",
-                        GetPlayerName(), GetAccountId(), item->GetProto()->Name1, item->GetEntry(), item->GetCount(), receiver.c_str(), rc_account);
+                                    GetPlayerName(), GetAccountId(), item->GetProto()->Name1, item->GetEntry(), item->GetCount(), receiver.c_str(), rc_account);
                 }
 
+                item->SetNotRefundable(GetPlayer());        // makes the item no longer refundable
                 pl->MoveItemFromInventory(items[i]->GetBagSlot(), item->GetSlot(), true);
                 CharacterDatabase.BeginTransaction();
                 item->DeleteFromInventoryDB();              // deletes item from character's inventory
@@ -308,8 +310,8 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
 
         if (money > 0 &&  GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE))
         {
-            sLog.outCommand(GetAccountId(),"GM %s (Account: %u) mail money: %u to player: %s (Account: %u)",
-                GetPlayerName(), GetAccountId(), money, receiver.c_str(), rc_account);
+            sLog.outCommand(GetAccountId(), "GM %s (Account: %u) mail money: %u to player: %s (Account: %u)",
+                            GetPlayerName(), GetAccountId(), money, receiver.c_str(), rc_account);
         }
     }
 
@@ -318,9 +320,9 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
 
     // will delete item or place to receiver mail list
     draft
-        .SetMoney(money)
-        .SetCOD(COD)
-        .SendMailTo(MailReceiver(receive, rc), pl, body.empty() ? MAIL_CHECK_MASK_COPIED : MAIL_CHECK_MASK_HAS_BODY, deliver_delay);
+    .SetMoney(money)
+    .SetCOD(COD)
+    .SendMailTo(MailReceiver(receive, rc), pl, body.empty() ? MAIL_CHECK_MASK_COPIED : MAIL_CHECK_MASK_HAS_BODY, deliver_delay);
 
     CharacterDatabase.BeginTransaction();
     pl->SaveInventoryAndGoldToDB();
@@ -338,7 +340,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
  * @param recv_data the packet containing information about the mail the player read.
  *
  */
-void WorldSession::HandleMailMarkAsRead(WorldPacket & recv_data )
+void WorldSession::HandleMailMarkAsRead(WorldPacket& recv_data)
 {
     ObjectGuid mailboxGuid;
     uint32 mailId;
@@ -348,9 +350,9 @@ void WorldSession::HandleMailMarkAsRead(WorldPacket & recv_data )
     if (!CheckMailBox(mailboxGuid))
         return;
 
-    Player *pl = _player;
+    Player* pl = _player;
 
-    if (Mail *m = pl->GetMail(mailId))
+    if (Mail* m = pl->GetMail(mailId))
     {
         if (pl->unReadMails)
             --pl->unReadMails;
@@ -368,7 +370,7 @@ void WorldSession::HandleMailMarkAsRead(WorldPacket & recv_data )
  * @param recv_data The packet containing information about the mail being deleted.
  *
  */
-void WorldSession::HandleMailDelete(WorldPacket & recv_data )
+void WorldSession::HandleMailDelete(WorldPacket& recv_data)
 {
     ObjectGuid mailboxGuid;
     uint32 mailId;
@@ -382,7 +384,7 @@ void WorldSession::HandleMailDelete(WorldPacket & recv_data )
     Player* pl = _player;
     pl->m_mailsUpdated = true;
 
-    if(Mail *m = pl->GetMail(mailId))
+    if (Mail* m = pl->GetMail(mailId))
     {
         // delete shouldn't show up for COD mails
         if (m->COD)
@@ -404,7 +406,7 @@ void WorldSession::HandleMailDelete(WorldPacket & recv_data )
  * @param recv_data The packet containing information about the mail being returned.
  *
  */
-void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data )
+void WorldSession::HandleMailReturnToSender(WorldPacket& recv_data)
 {
     ObjectGuid mailboxGuid;
     uint32 mailId;
@@ -415,19 +417,19 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data )
     if (!CheckMailBox(mailboxGuid))
         return;
 
-    Player *pl = _player;
-    Mail *m = pl->GetMail(mailId);
-    if(!m || m->state == MAIL_STATE_DELETED || m->deliver_time > time(NULL))
+    Player* pl = _player;
+    Mail* m = pl->GetMail(mailId);
+    if (!m || m->state == MAIL_STATE_DELETED || m->deliver_time > time(NULL))
     {
         pl->SendMailResult(mailId, MAIL_RETURNED_TO_SENDER, MAIL_ERR_INTERNAL_ERROR);
         return;
     }
 
-    //we can return mail now
-    //so firstly delete the old one
+    // we can return mail now
+    // so firstly delete the old one
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("DELETE FROM mail WHERE id = '%u'", mailId);
-                                                            // needed?
+    // needed?
     CharacterDatabase.PExecute("DELETE FROM mail_items WHERE mail_id = '%u'", mailId);
     CharacterDatabase.CommitTransaction();
     pl->RemoveMail(mailId);
@@ -441,11 +443,11 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data )
         else
             draft.SetSubjectAndBody(m->subject, m->body);
 
-        if(m->HasItems())
+        if (m->HasItems())
         {
-            for(MailItemInfoVec::iterator itr2 = m->items.begin(); itr2 != m->items.end(); ++itr2)
+            for (MailItemInfoVec::iterator itr2 = m->items.begin(); itr2 != m->items.end(); ++itr2)
             {
-                if(Item *item = pl->GetMItem(itr2->item_guid))
+                if (Item* item = pl->GetMItem(itr2->item_guid))
                     draft.AddItem(item);
 
                 pl->RemoveMItem(itr2->item_guid);
@@ -462,7 +464,7 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data )
 /**
  * Handles the packet sent by the client when taking an item from the mail.
  */
-void WorldSession::HandleMailTakeItem(WorldPacket & recv_data )
+void WorldSession::HandleMailTakeItem(WorldPacket& recv_data)
 {
     ObjectGuid mailboxGuid;
     uint32 mailId;
@@ -477,23 +479,23 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recv_data )
     Player* pl = _player;
 
     Mail* m = pl->GetMail(mailId);
-    if(!m || m->state == MAIL_STATE_DELETED || m->deliver_time > time(NULL))
+    if (!m || m->state == MAIL_STATE_DELETED || m->deliver_time > time(NULL))
     {
         pl->SendMailResult(mailId, MAIL_ITEM_TAKEN, MAIL_ERR_INTERNAL_ERROR);
         return;
     }
 
     // prevent cheating with skip client money check
-    if(pl->GetMoney() < m->COD)
+    if (pl->GetMoney() < m->COD)
     {
         pl->SendMailResult(mailId, MAIL_ITEM_TAKEN, MAIL_ERR_NOT_ENOUGH_MONEY);
         return;
     }
 
-    Item *it = pl->GetMItem(itemId);
+    Item* it = pl->GetMItem(itemId);
 
     ItemPosCountVec dest;
-    InventoryResult msg = _player->CanStoreItem( NULL_BAG, NULL_SLOT, dest, it, false );
+    InventoryResult msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, dest, it, false);
     if (msg == EQUIP_ERR_OK)
     {
         m->RemoveItem(itemId);
@@ -502,14 +504,14 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recv_data )
         if (m->COD > 0)                                     // if there is COD, take COD money from player and send them to sender by mail
         {
             ObjectGuid sender_guid = ObjectGuid(HIGHGUID_PLAYER, m->sender);
-            Player *sender = sObjectMgr.GetPlayer(sender_guid);
+            Player* sender = sObjectMgr.GetPlayer(sender_guid);
 
             uint32 sender_accId = 0;
 
-            if( GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE) )
+            if (GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE))
             {
                 std::string sender_name;
-                if(sender)
+                if (sender)
                 {
                     sender_accId = sender->GetSession()->GetAccountId();
                     sender_name = sender->GetName();
@@ -517,26 +519,26 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recv_data )
                 else if (sender_guid)
                 {
                     // can be calculated early
-                    sender_accId = sObjectMgr.GetPlayerAccountIdByGUID(sender_guid);
+                    sender_accId = sAccountMgr.GetPlayerAccountIdByGUID(sender_guid);
 
-                    if(!sObjectMgr.GetPlayerNameByGUID(sender_guid, sender_name))
+                    if (!sAccountMgr.GetPlayerNameByGUID(sender_guid, sender_name))
                         sender_name = sObjectMgr.GetMangosStringForDBCLocale(LANG_UNKNOWN);
                 }
                 sLog.outCommand(GetAccountId(), "GM %s (Account: %u) receive mail item: %s (Entry: %u Count: %u) and send COD money: %u to player: %s (Account: %u)",
-                    GetPlayerName(), GetAccountId(), it->GetProto()->Name1, it->GetEntry(), it->GetCount(), m->COD, sender_name.c_str(), sender_accId);
+                                GetPlayerName(), GetAccountId(), it->GetProto()->Name1, it->GetEntry(), it->GetCount(), m->COD, sender_name.c_str(), sender_accId);
             }
             else if (!sender)
-                sender_accId = sObjectMgr.GetPlayerAccountIdByGUID(sender_guid);
+                sender_accId = sAccountMgr.GetPlayerAccountIdByGUID(sender_guid);
 
             // check player existence
-            if(sender || sender_accId)
+            if (sender || sender_accId)
             {
                 MailDraft(m->subject, "")
-                    .SetMoney(m->COD)
-                    .SendMailTo(MailReceiver(sender, sender_guid), _player, MAIL_CHECK_MASK_COD_PAYMENT);
+                .SetMoney(m->COD)
+                .SendMailTo(MailReceiver(sender, sender_guid), _player, MAIL_CHECK_MASK_COD_PAYMENT);
             }
 
-            pl->ModifyMoney( -int32(m->COD) );
+            pl->ModifyMoney(-int32(m->COD));
         }
         m->COD = 0;
         m->state = MAIL_STATE_CHANGED;
@@ -560,7 +562,7 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recv_data )
 /**
  * Handles the packet sent by the client when taking money from the mail.
  */
-void WorldSession::HandleMailTakeMoney(WorldPacket & recv_data )
+void WorldSession::HandleMailTakeMoney(WorldPacket& recv_data)
 {
     ObjectGuid mailboxGuid;
     uint32 mailId;
@@ -570,10 +572,10 @@ void WorldSession::HandleMailTakeMoney(WorldPacket & recv_data )
     if (!CheckMailBox(mailboxGuid))
         return;
 
-    Player *pl = _player;
+    Player* pl = _player;
 
     Mail* m = pl->GetMail(mailId);
-    if(!m || m->state == MAIL_STATE_DELETED || m->deliver_time > time(NULL))
+    if (!m || m->state == MAIL_STATE_DELETED || m->deliver_time > time(NULL))
     {
         pl->SendMailResult(mailId, MAIL_MONEY_TAKEN, MAIL_ERR_INTERNAL_ERROR);
         return;
@@ -597,7 +599,7 @@ void WorldSession::HandleMailTakeMoney(WorldPacket & recv_data )
  * Handles the packet sent by the client when requesting the current mail list.
  * It will send a list of all available mails in the players mailbox to the client.
  */
-void WorldSession::HandleGetMailList(WorldPacket & recv_data )
+void WorldSession::HandleGetMailList(WorldPacket& recv_data)
 {
     ObjectGuid mailboxGuid;
     recv_data >> mailboxGuid;
@@ -616,10 +618,10 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
     data << uint8(0);                                       // mail's count
     time_t cur_time = time(NULL);
 
-    for(PlayerMails::iterator itr = _player->GetMailBegin(); itr != _player->GetMailEnd(); ++itr)
+    for (PlayerMails::iterator itr = _player->GetMailBegin(); itr != _player->GetMailEnd(); ++itr)
     {
         // packet send mail count as uint8, prevent overflow
-        if(mailsCount >= 254)
+        if (mailsCount >= 254)
         {
             realCount += 1;
             continue;
@@ -631,9 +633,9 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
 
         uint8 item_count = (*itr)->items.size();            // max count is MAX_MAIL_ITEMS (12)
 
-        size_t next_mail_size = 2+4+1+((*itr)->messageType == MAIL_NORMAL ? 8 : 4)+4*8+((*itr)->subject.size()+1)+((*itr)->body.size()+1)+1+item_count*(1+4+4+7*3*4+4+4+4+4+4+4+1);
+        size_t next_mail_size = 2 + 4 + 1 + ((*itr)->messageType == MAIL_NORMAL ? 8 : 4) + 4 * 8 + ((*itr)->subject.size() + 1) + ((*itr)->body.size() + 1) + 1 + item_count * (1 + 4 + 4 + 7 * 3 * 4 + 4 + 4 + 4 + 4 + 4 + 4 + 1);
 
-        if(data.wpos()+next_mail_size > maxPacketSize)
+        if (data.wpos() + next_mail_size > maxPacketSize)
         {
             realCount += 1;
             continue;
@@ -643,7 +645,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
         data << uint32((*itr)->messageID);                  // Message ID
         data << uint8((*itr)->messageType);                 // Message Type
 
-        switch((*itr)->messageType)
+        switch ((*itr)->messageType)
         {
             case MAIL_NORMAL:                               // sender guid
                 data << ObjectGuid(HIGHGUID_PLAYER, (*itr)->sender);
@@ -653,9 +655,8 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
             case MAIL_AUCTION:
                 data << uint32((*itr)->sender);             // creature/gameobject entry, auction id
                 break;
-            case MAIL_ITEM:                                 // item entry (?) sender = "Unknown", NYI
-                data << uint32(0);                          // item entry
-                break;
+            case MAIL_CALENDAR:
+                data << uint32(0);                          // unknown
         }
 
         data << uint32((*itr)->COD);                        // COD
@@ -670,16 +671,16 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
 
         data << uint8(item_count);                          // client limit is 0x10
 
-        for(uint8 i = 0; i < item_count; ++i)
+        for (uint8 i = 0; i < item_count; ++i)
         {
-            Item *item = _player->GetMItem((*itr)->items[i].item_guid);
+            Item* item = _player->GetMItem((*itr)->items[i].item_guid);
             // item index (0-6?)
             data << uint8(i);
             // item guid low?
             data << uint32(item ? item->GetGUIDLow() : 0);
             // entry
             data << uint32(item ? item->GetEntry() : 0);
-            for(uint8 j = 0; j < MAX_INSPECTED_ENCHANTMENT_SLOT; ++j)
+            for (uint8 j = 0; j < MAX_INSPECTED_ENCHANTMENT_SLOT; ++j)
             {
                 // unsure
                 data << uint32(item ? item->GetEnchantmentCharges((EnchantmentSlot)j) : 0);
@@ -723,7 +724,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
  * a new item with the text of the mail and store it in the players inventory (if possible).
  *
  */
-void WorldSession::HandleMailCreateTextItem(WorldPacket & recv_data )
+void WorldSession::HandleMailCreateTextItem(WorldPacket& recv_data)
 {
     ObjectGuid mailboxGuid;
     uint32 mailId;
@@ -734,7 +735,7 @@ void WorldSession::HandleMailCreateTextItem(WorldPacket & recv_data )
     if (!CheckMailBox(mailboxGuid))
         return;
 
-    Player *pl = _player;
+    Player* pl = _player;
 
     Mail* m = pl->GetMail(mailId);
     if (!m || (m->body.empty() && !m->mailTemplateId) || m->state == MAIL_STATE_DELETED || m->deliver_time > time(NULL))
@@ -743,7 +744,7 @@ void WorldSession::HandleMailCreateTextItem(WorldPacket & recv_data )
         return;
     }
 
-    Item *bodyItem = new Item;                              // This is not bag and then can be used new Item.
+    Item* bodyItem = new Item;                              // This is not bag and then can be used new Item.
     if (!bodyItem->Create(sObjectMgr.GenerateItemLowGuid(), MAIL_BODY_ITEM_TEMPLATE, pl))
     {
         delete bodyItem;
@@ -772,7 +773,7 @@ void WorldSession::HandleMailCreateTextItem(WorldPacket & recv_data )
     DETAIL_LOG("HandleMailCreateTextItem mailid=%u", mailId);
 
     ItemPosCountVec dest;
-    InventoryResult msg = _player->CanStoreItem( NULL_BAG, NULL_SLOT, dest, bodyItem, false );
+    InventoryResult msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, dest, bodyItem, false);
     if (msg == EQUIP_ERR_OK)
     {
         m->checked = m->checked | MAIL_CHECK_MASK_COPIED;
@@ -792,31 +793,31 @@ void WorldSession::HandleMailCreateTextItem(WorldPacket & recv_data )
 /**
  * No idea when this is called.
  */
-void WorldSession::HandleQueryNextMailTime(WorldPacket & /**recv_data*/ )
+void WorldSession::HandleQueryNextMailTime(WorldPacket& /**recv_data*/)
 {
     WorldPacket data(MSG_QUERY_NEXT_MAIL_TIME, 8);
 
-    if( _player->unReadMails > 0 )
+    if (_player->unReadMails > 0)
     {
         data << uint32(0);                                  // float
         data << uint32(0);                                  // count
 
         uint32 count = 0;
         time_t now = time(NULL);
-        for(PlayerMails::iterator itr = _player->GetMailBegin(); itr != _player->GetMailEnd(); ++itr)
+        for (PlayerMails::iterator itr = _player->GetMailBegin(); itr != _player->GetMailEnd(); ++itr)
         {
-            Mail *m = (*itr);
+            Mail* m = (*itr);
             // must be not checked yet
-            if(m->checked & MAIL_CHECK_MASK_READ)
+            if (m->checked & MAIL_CHECK_MASK_READ)
                 continue;
 
             // and already delivered
-            if(now < m->deliver_time)
+            if (now < m->deliver_time)
                 continue;
 
             data << ObjectGuid(HIGHGUID_PLAYER, m->sender); // sender guid
 
-            switch(m->messageType)
+            switch (m->messageType)
             {
                 case MAIL_AUCTION:
                     data << uint32(m->sender);              // auction house id
@@ -832,7 +833,7 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket & /**recv_data*/ )
             data << uint32(0xC6000000);                     // float unk, time or something
 
             ++count;
-            if(count == 2)                                  // do not display more than 2 mails
+            if (count == 2)                                 // do not display more than 2 mails
                 break;
         }
         data.put<uint32>(4, count);
diff --git a/src/game/Makefile.in b/src/game/Makefile.in
new file mode 100644
index 00000000000..81bfe502ab2
--- /dev/null
+++ b/src/game/Makefile.in
@@ -0,0 +1,1058 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# 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.
+
+@SET_MAKE@
+
+# Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/game
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+libmangosgame_a_AR = $(AR) $(ARFLAGS)
+libmangosgame_a_LIBADD =
+am_libmangosgame_a_OBJECTS = AccountMgr.$(OBJEXT) \
+	AchievementMgr.$(OBJEXT) AggressorAI.$(OBJEXT) \
+	ArenaTeam.$(OBJEXT) ArenaTeamHandler.$(OBJEXT) \
+	AuctionHouseHandler.$(OBJEXT) AuctionHouseMgr.$(OBJEXT) \
+	Bag.$(OBJEXT) BattleGround.$(OBJEXT) BattleGroundAA.$(OBJEXT) \
+	BattleGroundAB.$(OBJEXT) BattleGroundABG.$(OBJEXT) \
+	BattleGroundAV.$(OBJEXT) BattleGroundBE.$(OBJEXT) \
+	BattleGroundDS.$(OBJEXT) BattleGroundEY.$(OBJEXT) \
+	BattleGroundIC.$(OBJEXT) BattleGroundNA.$(OBJEXT) \
+	BattleGroundRL.$(OBJEXT) BattleGroundRV.$(OBJEXT) \
+	BattleGroundSA.$(OBJEXT) BattleGroundWS.$(OBJEXT) \
+	BattleGroundHandler.$(OBJEXT) BattleGroundMgr.$(OBJEXT) \
+	Calendar.$(OBJEXT) CalendarHandler.$(OBJEXT) Channel.$(OBJEXT) \
+	ChannelHandler.$(OBJEXT) ChannelMgr.$(OBJEXT) \
+	CharacterHandler.$(OBJEXT) Chat.$(OBJEXT) \
+	ChatHandler.$(OBJEXT) CombatHandler.$(OBJEXT) \
+	ConfusedMovementGenerator.$(OBJEXT) Corpse.$(OBJEXT) \
+	CreatureAI.$(OBJEXT) CreatureAIRegistry.$(OBJEXT) \
+	CreatureAISelector.$(OBJEXT) CreatureEventAI.$(OBJEXT) \
+	CreatureEventAIMgr.$(OBJEXT) Creature.$(OBJEXT) \
+	DBCStores.$(OBJEXT) debugcmds.$(OBJEXT) \
+	DestinationHolder.$(OBJEXT) DuelHandler.$(OBJEXT) \
+	DynamicObject.$(OBJEXT) FleeingMovementGenerator.$(OBJEXT) \
+	GameEventMgr.$(OBJEXT) GameObject.$(OBJEXT) \
+	GlobalEvents.$(OBJEXT) GMTicketHandler.$(OBJEXT) \
+	GMTicketMgr.$(OBJEXT) GossipDef.$(OBJEXT) \
+	GridNotifiers.$(OBJEXT) GridStates.$(OBJEXT) Group.$(OBJEXT) \
+	GroupHandler.$(OBJEXT) GuardAI.$(OBJEXT) Guild.$(OBJEXT) \
+	GuildHandler.$(OBJEXT) HomeMovementGenerator.$(OBJEXT) \
+	HostileRefManager.$(OBJEXT) IdleMovementGenerator.$(OBJEXT) \
+	InstanceData.$(OBJEXT) InstanceSaveMgr.$(OBJEXT) \
+	Item.$(OBJEXT) ItemEnchantmentMgr.$(OBJEXT) \
+	ItemHandler.$(OBJEXT) Level0.$(OBJEXT) Level1.$(OBJEXT) \
+	Level2.$(OBJEXT) Level3.$(OBJEXT) LFGHandler.$(OBJEXT) \
+	LootHandler.$(OBJEXT) LootMgr.$(OBJEXT) Mail.$(OBJEXT) \
+	Map.$(OBJEXT) MapInstanced.$(OBJEXT) MapManager.$(OBJEXT) \
+	MiscHandler.$(OBJEXT) MotionMaster.$(OBJEXT) \
+	MovementGenerator.$(OBJEXT) MovementHandler.$(OBJEXT) \
+	NPCHandler.$(OBJEXT) NullCreatureAI.$(OBJEXT) \
+	ObjectAccessor.$(OBJEXT) Object.$(OBJEXT) \
+	ObjectGridLoader.$(OBJEXT) ObjectMgr.$(OBJEXT) \
+	ObjectPosSelector.$(OBJEXT) Opcodes.$(OBJEXT) PetAI.$(OBJEXT) \
+	Pet.$(OBJEXT) PetHandler.$(OBJEXT) PetitionsHandler.$(OBJEXT) \
+	Player.$(OBJEXT) PlayerbotMgr.$(OBJEXT) PlayerbotAI.$(OBJEXT) \
+	PlayerbotClassAI.$(OBJEXT) PlayerbotDeathKnightAI.$(OBJEXT) \
+	PlayerbotDruidAI.$(OBJEXT) PlayerbotHunterAI.$(OBJEXT) \
+	PlayerbotMageAI.$(OBJEXT) PlayerbotPaladinAI.$(OBJEXT) \
+	PlayerbotPriestAI.$(OBJEXT) PlayerbotRogueAI.$(OBJEXT) \
+	PlayerbotShamanAI.$(OBJEXT) PlayerbotWarlockAI.$(OBJEXT) \
+	PlayerbotWarriorAI.$(OBJEXT) PlayerDump.$(OBJEXT) \
+	PointMovementGenerator.$(OBJEXT) PoolManager.$(OBJEXT) \
+	QueryHandler.$(OBJEXT) QuestDef.$(OBJEXT) \
+	QuestHandler.$(OBJEXT) RandomMovementGenerator.$(OBJEXT) \
+	ReactorAI.$(OBJEXT) ReputationMgr.$(OBJEXT) \
+	ScriptCalls.$(OBJEXT) SkillHandler.$(OBJEXT) \
+	SpellAuras.$(OBJEXT) Spell.$(OBJEXT) SpellEffects.$(OBJEXT) \
+	SkillDiscovery.$(OBJEXT) SkillExtraItems.$(OBJEXT) \
+	SpellHandler.$(OBJEXT) SocialMgr.$(OBJEXT) SpellMgr.$(OBJEXT) \
+	StatSystem.$(OBJEXT) TargetedMovementGenerator.$(OBJEXT) \
+	TaxiHandler.$(OBJEXT) TemporarySummon.$(OBJEXT) \
+	TotemAI.$(OBJEXT) Totem.$(OBJEXT) TradeHandler.$(OBJEXT) \
+	Transports.$(OBJEXT) ThreatManager.$(OBJEXT) Unit.$(OBJEXT) \
+	UpdateData.$(OBJEXT) Vehicle.$(OBJEXT) \
+	VoiceChatHandler.$(OBJEXT) WaypointManager.$(OBJEXT) \
+	WaypointMovementGenerator.$(OBJEXT) Weather.$(OBJEXT) \
+	World.$(OBJEXT) WorldSession.$(OBJEXT) WorldSocket.$(OBJEXT) \
+	WorldSocketMgr.$(OBJEXT) FollowerReference.$(OBJEXT) \
+	GroupReference.$(OBJEXT)
+libmangosgame_a_OBJECTS = $(am_libmangosgame_a_OBJECTS)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(libmangosgame_a_SOURCES)
+DIST_SOURCES = $(libmangosgame_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACE_CFLAGS = @ACE_CFLAGS@
+ACE_LIBS = @ACE_LIBS@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANGOSD_DEBUG_INFO = @MANGOSD_DEBUG_INFO@
+MANGOS_INCLUDES = @MANGOS_INCLUDES@
+MANGOS_LIBS = @MANGOS_LIBS@
+MKDIR_P = @MKDIR_P@
+MYSQL_CONFIG = @MYSQL_CONFIG@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../shared/vmap -I$(srcdir)/../realmd -DSYSCONFDIR=\"$(sysconfdir)/\"
+
+#  All libraries will be convenience libraries. Might be changed to shared
+#  later.
+noinst_LIBRARIES = libmangosgame.a
+
+#  libmangossgame library will later be reused by ...
+libmangosgame_a_SOURCES = \
+	AccountMgr.cpp \
+	AccountMgr.h \
+	AchievementMgr.h \
+	AchievementMgr.cpp \
+	AggressorAI.cpp \
+	AggressorAI.h \
+	AnimalRandomMovementGenerator.h \
+	ArenaTeam.cpp \
+	ArenaTeam.h \
+	ArenaTeamHandler.cpp \
+	AuctionHouseHandler.cpp \
+	AuctionHouseMgr.cpp \
+	AuctionHouseMgr.h \
+	Bag.cpp \
+	Bag.h \
+	BattleGround.cpp \
+	BattleGroundAA.cpp \
+	BattleGroundAB.cpp \
+	BattleGroundABG.cpp \
+	BattleGroundAV.cpp \
+	BattleGroundBE.cpp \
+	BattleGroundDS.cpp \
+	BattleGroundEY.cpp \
+	BattleGroundIC.cpp \
+	BattleGroundNA.cpp \
+	BattleGroundRL.cpp \
+	BattleGroundRV.cpp \
+	BattleGroundSA.cpp \
+	BattleGroundWS.cpp \
+	BattleGround.h \
+	BattleGroundAA.h \
+	BattleGroundAB.h \
+	BattleGroundABG.h \
+	BattleGroundAV.h \
+	BattleGroundBE.h \
+	BattleGroundDS.h \
+	BattleGroundEY.h \
+	BattleGroundIC.h \
+	BattleGroundNA.h \
+	BattleGroundRL.h \
+	BattleGroundRV.h \
+	BattleGroundSA.h \
+	BattleGroundWS.h \
+	BattleGroundHandler.cpp \
+	BattleGroundMgr.cpp \
+	BattleGroundMgr.h \
+	Calendar.cpp \
+	Calendar.h \
+	CalendarHandler.cpp \
+	Cell.h \
+	CellImpl.h \
+	Channel.cpp \
+	Channel.h \
+	ChannelHandler.cpp \
+	ChannelMgr.cpp \
+	ChannelMgr.h \
+	CharacterHandler.cpp \
+	Chat.cpp \
+	Chat.h \
+	ChatHandler.cpp \
+	CombatHandler.cpp \
+	ConfusedMovementGenerator.cpp \
+	ConfusedMovementGenerator.h \
+	Corpse.cpp \
+	Corpse.h \
+	CreatureAI.cpp \
+	CreatureAI.h \
+	CreatureAIImpl.h \
+	CreatureAIRegistry.cpp \
+	CreatureAIRegistry.h \
+	CreatureAISelector.cpp \
+	CreatureAISelector.h \
+	CreatureEventAI.cpp \
+	CreatureEventAI.h \
+	CreatureEventAIMgr.cpp \
+	CreatureEventAIMgr.h \
+	Creature.cpp \
+	Creature.h \
+	DBCEnums.h \
+	DBCfmt.h \
+	DBCStores.cpp \
+	DBCStores.h \
+	DBCStructure.h	\
+	debugcmds.cpp \
+	DestinationHolder.cpp \
+	DestinationHolder.h \
+	DestinationHolderImp.h \
+	DuelHandler.cpp \
+	DynamicObject.cpp \
+	DynamicObject.h \
+	FleeingMovementGenerator.cpp \
+	FleeingMovementGenerator.h \
+	Formulas.h \
+	GameEventMgr.cpp \
+	GameEventMgr.h \
+	GameObject.cpp \
+	GameObject.h \
+	GlobalEvents.cpp \
+	GlobalEvents.h \
+	GMTicketHandler.cpp \
+	GMTicketMgr.cpp \
+	GMTicketMgr.h \
+	GossipDef.cpp \
+	GossipDef.h \
+	GridDefines.h \
+	GridNotifiers.cpp \
+	GridNotifiers.h \
+	GridNotifiersImpl.h \
+	GridStates.cpp \
+	GridStates.h \
+	Group.cpp \
+	Group.h \
+	GroupHandler.cpp \
+	GuardAI.cpp \
+	GuardAI.h \
+	Guild.cpp \
+	Guild.h \
+	GuildHandler.cpp \
+	HomeMovementGenerator.cpp \
+	HomeMovementGenerator.h \
+	HostileRefManager.cpp \
+	HostileRefManager.h \
+	IdleMovementGenerator.cpp \
+	IdleMovementGenerator.h \
+	InstanceData.cpp \
+	InstanceData.h \
+	InstanceSaveMgr.cpp \
+	InstanceSaveMgr.h \
+	Item.cpp \
+	Item.h \
+	ItemEnchantmentMgr.cpp \
+	ItemEnchantmentMgr.h \
+	ItemHandler.cpp \
+	ItemPrototype.h \
+	Language.h \
+	Level0.cpp \
+	Level1.cpp \
+	Level2.cpp \
+	Level3.cpp \
+	LFGHandler.cpp \
+	LootHandler.cpp \
+	LootMgr.cpp \
+	LootMgr.h \
+	Mail.cpp \
+	Mail.h \
+	Map.cpp \
+	Map.h \
+	MapInstanced.cpp \
+	MapInstanced.h \
+	MapManager.cpp \
+	MapManager.h \
+	MapReference.h \
+	MapRefManager.h \
+	MiscHandler.cpp \
+	MotionMaster.cpp \
+	MotionMaster.h \
+	MovementGenerator.cpp \
+	MovementGenerator.h \
+	MovementGeneratorImpl.h \
+	MovementHandler.cpp \
+	NPCHandler.cpp \
+	NPCHandler.h \
+	NullCreatureAI.cpp \
+	NullCreatureAI.h \
+	ObjectAccessor.cpp \
+	ObjectAccessor.h \
+	Object.cpp \
+	ObjectDefines.h \
+	ObjectGridLoader.cpp \
+	ObjectGridLoader.h \
+	Object.h \
+	ObjectMgr.cpp \
+	ObjectMgr.h \
+	ObjectPosSelector.cpp \
+	ObjectPosSelector.h \
+	Opcodes.cpp \
+	Opcodes.h \
+	Path.h \
+	PetAI.cpp \
+	PetAI.h \
+	Pet.cpp \
+	Pet.h \
+	PetHandler.cpp \
+	PetitionsHandler.cpp \
+	Player.cpp \
+	Player.h \
+	PlayerbotMgr.cpp \
+	PlayerbotMgr.h \
+	PlayerbotAI.cpp \
+	PlayerbotAI.h \
+	PlayerbotClassAI.cpp \
+	PlayerbotClassAI.h \
+	PlayerbotDeathKnightAI.cpp \
+	PlayerbotDeathKnightAI.h \
+	PlayerbotDruidAI.cpp \
+	PlayerbotDruidAI.h \
+	PlayerbotHunterAI.cpp \
+	PlayerbotHunterAI.h \
+	PlayerbotMageAI.cpp \
+	PlayerbotMageAI.h \
+	PlayerbotPaladinAI.cpp \
+	PlayerbotPaladinAI.h \
+	PlayerbotPriestAI.cpp \
+	PlayerbotPriestAI.h \
+	PlayerbotRogueAI.cpp \
+	PlayerbotRogueAI.h \
+	PlayerbotShamanAI.cpp \
+	PlayerbotShamanAI.h \
+	PlayerbotWarlockAI.cpp \
+	PlayerbotWarlockAI.h \
+	PlayerbotWarriorAI.cpp \
+	PlayerbotWarriorAI.h \
+	PlayerDump.cpp \
+	PlayerDump.h \
+	PointMovementGenerator.cpp \
+	PointMovementGenerator.h \
+	PoolManager.cpp \
+	PoolManager.h \
+	QueryHandler.cpp \
+	QuestDef.cpp \
+	QuestDef.h \
+	QuestHandler.cpp \
+	RandomMovementGenerator.cpp \
+	RandomMovementGenerator.h \
+	ReactorAI.cpp \
+	ReactorAI.h \
+	ReputationMgr.cpp \
+	ReputationMgr.h \
+	ScriptCalls.cpp \
+	ScriptCalls.h \
+	SharedDefines.h \
+	SkillHandler.cpp \
+	SpellAuraDefines.h \
+	SpellAuras.cpp \
+	SpellAuras.h \
+	Spell.cpp \
+	SpellEffects.cpp \
+	Spell.h \
+	SkillDiscovery.cpp \
+	SkillDiscovery.h \
+	SkillExtraItems.cpp \
+	SkillExtraItems.h \
+	SpellHandler.cpp \
+	SocialMgr.cpp \
+	SocialMgr.h \
+	SpellMgr.cpp \
+	SpellMgr.h \
+	StatSystem.cpp \
+	TargetedMovementGenerator.cpp \
+	TargetedMovementGenerator.h \
+	TaxiHandler.cpp \
+	TemporarySummon.cpp \
+	TemporarySummon.h \
+	TotemAI.cpp \
+	TotemAI.h \
+	Totem.cpp \
+	Totem.h \
+	TradeHandler.cpp \
+	Transports.cpp \
+	Transports.h \
+	ThreatManager.cpp \
+	ThreatManager.h \
+	Traveller.h \
+	Unit.cpp \
+	Unit.h \
+	UnitEvents.h \
+	UpdateData.cpp \
+	UpdateData.h \
+	UpdateFields.h \
+	UpdateMask.h \
+	Vehicle.cpp \
+	Vehicle.h \
+	VoiceChatHandler.cpp \
+	WaypointManager.cpp \
+	WaypointManager.h \
+	WaypointMovementGenerator.cpp \
+	WaypointMovementGenerator.h \
+	Weather.cpp \
+	Weather.h \
+	World.cpp \
+	World.h \
+	WorldSession.cpp \
+	WorldSession.h \
+	WorldSocket.cpp \
+	WorldSocket.h \
+	WorldSocketMgr.cpp \
+	WorldSocketMgr.h \
+	FollowerReference.cpp \
+	FollowerReference.h \
+	FollowerRefManager.h \
+	GroupReference.cpp \
+	GroupReference.h \
+	GroupRefManager.h
+
+
+#  Precompiled Headers for WIN
+EXTRA_DIST = \
+	pchdef.cpp \
+	pchdef.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/game/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/game/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libmangosgame.a: $(libmangosgame_a_OBJECTS) $(libmangosgame_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libmangosgame.a
+	$(AM_V_AR)$(libmangosgame_a_AR) libmangosgame.a $(libmangosgame_a_OBJECTS) $(libmangosgame_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmangosgame.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AccountMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AchievementMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AggressorAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ArenaTeam.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ArenaTeamHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuctionHouseHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuctionHouseMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Bag.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGround.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundAA.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundAB.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundABG.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundAV.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundBE.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundDS.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundEY.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundIC.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundNA.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundRL.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundRV.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundSA.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BattleGroundWS.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Calendar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CalendarHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Channel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChannelHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChannelMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CharacterHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Chat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChatHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CombatHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfusedMovementGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Corpse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Creature.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CreatureAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CreatureAIRegistry.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CreatureAISelector.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CreatureEventAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CreatureEventAIMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DBCStores.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DestinationHolder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DuelHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DynamicObject.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FleeingMovementGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FollowerReference.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GMTicketHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GMTicketMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GameEventMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GameObject.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GlobalEvents.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GossipDef.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GridNotifiers.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GridStates.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Group.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GroupHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GroupReference.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GuardAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Guild.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GuildHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HomeMovementGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HostileRefManager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IdleMovementGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InstanceData.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InstanceSaveMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Item.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ItemEnchantmentMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ItemHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LFGHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Level0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Level1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Level2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Level3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LootHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LootMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mail.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Map.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MapInstanced.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MapManager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MiscHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MotionMaster.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MovementGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MovementHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NPCHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NullCreatureAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Object.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ObjectAccessor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ObjectGridLoader.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ObjectMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ObjectPosSelector.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Opcodes.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Pet.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PetAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PetHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PetitionsHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Player.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerDump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotClassAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotDeathKnightAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotDruidAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotHunterAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotMageAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotPaladinAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotPriestAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotRogueAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotShamanAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotWarlockAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PlayerbotWarriorAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PointMovementGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PoolManager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QueryHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuestDef.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuestHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RandomMovementGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReactorAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReputationMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ScriptCalls.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SkillDiscovery.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SkillExtraItems.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SkillHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SocialMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Spell.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SpellAuras.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SpellEffects.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SpellHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SpellMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StatSystem.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TargetedMovementGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TaxiHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TemporarySummon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ThreatManager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Totem.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TotemAI.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TradeHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Transports.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Unit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UpdateData.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Vehicle.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VoiceChatHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WaypointManager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WaypointMovementGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Weather.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/World.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WorldSession.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WorldSocket.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WorldSocketMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debugcmds.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 7cb8049bb66..e11640fd21c 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -21,7 +21,6 @@
 #include "Player.h"
 #include "GridNotifiers.h"
 #include "Log.h"
-#include "GridStates.h"
 #include "CellImpl.h"
 #include "InstanceData.h"
 #include "GridNotifiersImpl.h"
@@ -36,17 +35,21 @@
 #include "MapPersistentStateMgr.h"
 #include "VMapFactory.h"
 #include "MoveMap.h"
-#include "BattleGroundMgr.h"
+#include "BattleGround/BattleGroundMgr.h"
+#include "Calendar.h"
+#include "Chat.h"
 
 Map::~Map()
 {
     UnloadAll(true);
 
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+
     if(!m_scriptSchedule.empty())
         sScriptMgr.DecreaseScheduledScriptCount(m_scriptSchedule.size());
 
-    if (m_persistentState)
-        m_persistentState->SetUsedByMapState(NULL);         // field pointer can be deleted after this
+    if (GetPersistentState())
+        GetPersistentState()->SetUsedByMapState(NULL);         // field pointer can be deleted after this
 
     if(i_data)
     {
@@ -54,30 +57,32 @@ Map::~Map()
         i_data = NULL;
     }
 
+    sMapMgr.GetMapUpdater().MapStatisticDataRemove(this);
+
     // unload instance specific navigation data
-    MMAP::MMapFactory::createOrGetMMapManager()->unloadMapInstance(m_TerrainData->GetMapId(), GetInstanceId());
+    MMAP::MMapFactory::createOrGetMMapManager()->unloadMapInstance(GetTerrain()->GetMapId(), GetInstanceId());
 
-    //release reference count
-    if(m_TerrainData->Release())
-        sTerrainMgr.UnloadTerrain(m_TerrainData->GetMapId());
+    sTerrainMgr.UnloadTerrain(GetTerrain()->GetMapId());
+
+    DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "Map::~Map removing map %u instance %u complete", GetId(), GetInstanceId());
 }
 
 void Map::LoadMapAndVMap(int gx,int gy)
 {
-    if(m_bLoadedGrids[gx][gx])
+    if (m_bLoadedGrids[gx][gy])
         return;
 
-    GridMap * pInfo = m_TerrainData->Load(gx, gy);
-    if(pInfo)
-        m_bLoadedGrids[gx][gy] = true;
+    m_bLoadedGrids[gx][gy] = true;
+
+    if (!GetTerrain()->Load(gx, gy))
+        m_bLoadedGrids[gx][gy] = false;
 }
 
 Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode)
   : i_mapEntry (sMapStore.LookupEntry(id)), i_spawnMode(SpawnMode),
   i_id(id), i_InstanceId(InstanceId), m_unloadTimer(0),
-  m_VisibleDistance(DEFAULT_VISIBILITY_DISTANCE), m_persistentState(NULL),
-  m_activeNonPlayersIter(m_activeNonPlayers.end()),
-  i_gridExpiry(expiry), m_TerrainData(sTerrainMgr.LoadTerrain(id)),
+  m_VisibleDistance(DEFAULT_VISIBILITY_DISTANCE),
+  m_TerrainData(sTerrainMgr.LoadTerrain(id)),
   i_data(NULL), i_script_id(0)
 {
     m_CreatureGuids.Set(sObjectMgr.GetFirstTemporaryCreatureLowGuid());
@@ -96,11 +101,34 @@ Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode)
     //lets initialize visibility distance for map
     Map::InitVisibilityDistance();
 
-    //add reference for TerrainData object
-    m_TerrainData->AddRef();
+    MapPersistentState* persistentState = sMapPersistentStateMgr.AddPersistentState(i_mapEntry, GetInstanceId(), GetDifficulty(), 0, IsDungeon());
+    persistentState->SetUsedByMapState(this);
+    SetBroken(false);
+
+    // start unload timer for non continent and BG/Arena maps
+    if (!IsContinent() && !IsBattleGroundOrArena())
+    {
+        // the timer is started by default, and stopped when the first player joins
+        // this make sure it gets unloaded if for some reason no player joins
+        m_unloadTimer = sWorld.getConfig(CONFIG_UINT32_INSTANCE_UNLOAD_DELAY);
+    }
+
+    //if (GetInstanceId() && !sMapMgr.IsTransportMap(GetId()))
+    //    sObjectMgr.LoadTransports(this);
+
+    DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "Map::Map creating map %u instance %u complete", GetId(), GetInstanceId());
+}
 
-    m_persistentState = sMapPersistentStateMgr.AddPersistentState(i_mapEntry, GetInstanceId(), GetDifficulty(), 0, IsDungeon());
-    m_persistentState->SetUsedByMapState(this);
+MapPersistentState* Map::GetPersistentState() const
+{
+    MapPersistentState* state = sMapPersistentStateMgr.GetPersistentState(GetId(), GetInstanceId());
+    if (!state)
+    {
+        sLog.outError("Map::GetPersistentState requested, but map ( id %u, instance %u, difficulty %u ) not have this!", GetId(), GetInstanceId(), GetDifficulty());
+        state = sMapPersistentStateMgr.AddPersistentState(i_mapEntry, GetInstanceId(), GetDifficulty(), 0, IsDungeon());
+        state->SetUsedByMapState(const_cast<Map*>(this));
+    }
+    return state;
 }
 
 void Map::InitVisibilityDistance()
@@ -154,6 +182,21 @@ void Map::AddToGrid(Creature* obj, NGridType *grid, Cell const& cell)
     }
 }
 
+template<>
+void Map::AddToGrid(GameObject* obj, NGridType *grid, Cell const& cell)
+{
+    // add to world object registry in grid
+    if (obj->GetObjectGuid().IsMOTransport())
+    {
+        (*grid)(cell.CellX(), cell.CellY()).AddWorldObject<GameObject>(obj);
+    }
+    // add to grid object store
+    else
+    {
+        (*grid)(cell.CellX(), cell.CellY()).AddGridObject<GameObject>(obj);
+    }
+}
+
 template<class T>
 void Map::RemoveFromGrid(T* obj, NGridType *grid, Cell const& cell)
 {
@@ -196,40 +239,70 @@ void Map::RemoveFromGrid(Creature* obj, NGridType *grid, Cell const& cell)
     }
 }
 
+template<>
+void Map::RemoveFromGrid(GameObject* obj, NGridType *grid, Cell const& cell)
+{
+    // remove from world object registry in grid
+    if (obj->GetObjectGuid().IsMOTransport())
+    {
+        (*grid)(cell.CellX(), cell.CellY()).RemoveWorldObject<GameObject>(obj);
+    }
+    // remove from grid object store
+    else
+    {
+        (*grid)(cell.CellX(), cell.CellY()).RemoveGridObject<GameObject>(obj);
+    }
+}
+
 void Map::DeleteFromWorld(Player* pl)
 {
     sObjectAccessor.RemoveObject(pl);
     delete pl;
 }
 
+void Map::setUnitCell(Creature* obj)
+{
+    CellPair xy_val = MaNGOS::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
+    Cell cell(xy_val);
+    obj->SetCurrentCell(cell);
+}
+
 void
 Map::EnsureGridCreated(const GridPair &p)
 {
-    if(!getNGrid(p.x_coord, p.y_coord))
+    if (!getNGridWithoutLock(p.x_coord, p.y_coord))
     {
-        setNGrid(new NGridType(p.x_coord*MAX_NUMBER_OF_GRIDS + p.y_coord, p.x_coord, p.y_coord, i_gridExpiry, sWorld.getConfig(CONFIG_BOOL_GRID_UNLOAD)),
-            p.x_coord, p.y_coord);
+        {
+            WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
 
-        // build a linkage between this map and NGridType
-        buildNGridLinkage(getNGrid(p.x_coord, p.y_coord));
+            // Grid may be created while wait in semafore, requires double check
+            if (getNGridWithoutLock(p.x_coord, p.y_coord))
+                return;
 
-        getNGrid(p.x_coord, p.y_coord)->SetGridState(GRID_STATE_IDLE);
+            NGridType* grid = new NGridType(p.x_coord*MAX_NUMBER_OF_GRIDS + p.y_coord, p.x_coord, p.y_coord, sWorld.getConfig(CONFIG_UINT32_INTERVAL_GRIDCLEAN), sWorld.getConfig(CONFIG_BOOL_GRID_UNLOAD));
+            setNGrid(grid, p.x_coord, p.y_coord);
+
+            // build a linkage between this map and NGridType
+            buildNGridLinkage(grid);
+            grid->SetGridState(GRID_STATE_IDLE);
+            ResetGridExpiry(*grid, 0.2f);
+        }
 
         //z coord
         int gx = (MAX_NUMBER_OF_GRIDS - 1) - p.x_coord;
         int gy = (MAX_NUMBER_OF_GRIDS - 1) - p.y_coord;
 
-        if(!m_bLoadedGrids[gx][gy])
+        if (!m_bLoadedGrids[gx][gy])
             LoadMapAndVMap(gx,gy);
     }
 }
 
 void
-Map::EnsureGridLoadedAtEnter(const Cell &cell, Player *player)
+Map::EnsureGridLoadedAtEnter(Cell const& cell, Player* player)
 {
-    NGridType *grid;
+    NGridType* grid = NULL;
 
-    if(EnsureGridLoaded(cell))
+    if (EnsureGridLoaded(cell))
     {
         grid = getNGrid(cell.GridX(), cell.GridY());
 
@@ -242,8 +315,7 @@ Map::EnsureGridLoadedAtEnter(const Cell &cell, Player *player)
             DEBUG_FILTER_LOG(LOG_FILTER_PLAYER_MOVES, "Active object nearby triggers of loading grid [%u,%u] on map %u", cell.GridX(), cell.GridY(), i_id);
         }
 
-        ResetGridExpiry(*getNGrid(cell.GridX(), cell.GridY()), 0.1f);
-        grid->SetGridState(GRID_STATE_ACTIVE);
+        ActivateGrid(grid);
     }
     else
         grid = getNGrid(cell.GridX(), cell.GridY());
@@ -252,31 +324,47 @@ Map::EnsureGridLoadedAtEnter(const Cell &cell, Player *player)
         AddToGrid(player,grid,cell);
 }
 
-bool Map::EnsureGridLoaded(const Cell &cell)
+bool Map::EnsureGridLoaded(Cell const& cell)
 {
     EnsureGridCreated(GridPair(cell.GridX(), cell.GridY()));
-    NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
+    NGridType const* cgrid = getNGridWithoutLock(cell.GridX(), cell.GridY());
 
-    MANGOS_ASSERT(grid != NULL);
-    if( !isGridObjectDataLoaded(cell.GridX(), cell.GridY()) )
-    {
-        //it's important to set it loaded before loading!
-        //otherwise there is a possibility of infinity chain (grid loading will be called many times for the same grid)
-        //possible scenario:
-        //active object A(loaded with loader.LoadN call and added to the  map)
-        //summons some active object B, while B added to map grid loading called again and so on..
-        setGridObjectDataLoaded(true,cell.GridX(), cell.GridY());
-        ObjectGridLoader loader(*grid, this, cell);
-        loader.LoadN();
-
-        // Add resurrectable corpses to world object list in grid
-        sObjectAccessor.AddCorpsesToGrid(GridPair(cell.GridX(),cell.GridY()),(*grid)(cell.CellX(), cell.CellY()), this);
+    MANGOS_ASSERT(cgrid != NULL);
+
+    if (!IsGridObjectDataLoaded(cgrid))
+    {
+        NGridType* grid = const_cast<NGridType*>(cgrid);
+        {
+            WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+            //it's important to set it loaded before loading!
+            //otherwise there is a possibility of infinity chain (grid loading will be called many times for the same grid)
+            //possible scenario:
+            //active object A(loaded with loader.LoadN call and added to the  map)
+            //summons some active object B, while B added to map grid loading called again and so on..
+            SetGridObjectDataLoaded(true, *grid);
+            ObjectGridLoader loader(*grid, this, cell);
+            loader.LoadN();
+
+            // Add resurrectable corpses to world object list in grid
+            sObjectAccessor.AddCorpsesToGrid(GridPair(cell.GridX(),cell.GridY()),(*grid)(cell.CellX(), cell.CellY()), this);
+        }
+        DynamicMapTreeBalance();
         return true;
     }
 
     return false;
 }
 
+bool Map::IsGridObjectDataLoaded(NGridType const* grid) const 
+{
+    return grid ? grid->isGridObjectDataLoaded() : false;
+}
+
+void Map::SetGridObjectDataLoaded(bool pLoaded, NGridType& grid) 
+{
+    grid.setGridObjectDataLoaded(pLoaded);
+}
+
 void Map::LoadGrid(const Cell& cell, bool no_unload)
 {
     EnsureGridLoaded(cell);
@@ -285,44 +373,104 @@ void Map::LoadGrid(const Cell& cell, bool no_unload)
         getNGrid(cell.GridX(), cell.GridY())->setUnloadExplicitLock(true);
 }
 
-bool Map::Add(Player *player)
+bool Map::PreloadGrid(float x, float y)
+{
+    CellPair pair = MaNGOS::ComputeCellPair(x, y);
+    if(pair.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || pair.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
+    {
+        sLog.outError("Map::PreloadGrid: invalid coordinates X:%f Y:%f grid cell [%u:%u]", x, y, pair.x_coord, pair.y_coord);
+        return false;
+    }
+    Cell cell(pair);
+    EnsureGridLoaded(cell);
+    return IsLoadingObjectsQueueEmpty();
+}
+
+void Map::ActivateGrid(WorldLocation const& loc)
+{
+    Cell _cell(MaNGOS::ComputeCellPair(loc.x, loc.y));
+    NGridType* nGrid = getNGrid(_cell.GridX(), _cell.GridY());
+    ActivateGrid(nGrid);
+}
+
+void Map::ActivateGrid(NGridType* nGrid)
+{
+    if (nGrid)
+    {
+        WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+        ResetGridExpiry(*nGrid, 0.2f);
+        if (nGrid->GetGridState() != GRID_STATE_ACTIVE)
+            nGrid->SetGridState(GRID_STATE_ACTIVE);
+    }
+}
+
+bool Map::Add(Player* player)
 {
+    if (!IsContinent() && !IsBattleGroundOrArena())
+        m_unloadTimer = 0;
+
+    if (FindObject(player->GetObjectGuid()))
+    {
+        sLog.outError("Map::Add map %u instance %u %s is found stored in Map object store, but trying to be addes!", GetId(), GetInstanceId(), player->GetObjectGuid() ? player->GetObjectGuid().GetString().c_str() : "<no GUID>");
+    }
+
+    player->GetMapRef().unlink();
     player->GetMapRef().link(this, player);
     player->SetMap(this);
 
     // update player state for other player and visa-versa
+    AddToActive(player);
+    CreateAttackersStorageFor(player->GetObjectGuid());
+
     CellPair p = MaNGOS::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
     Cell cell(p);
     EnsureGridLoadedAtEnter(cell, player);
-    player->AddToWorld();
+    NGridType* grid = getNGrid(cell.GridX(), cell.GridY());
+    MANGOS_ASSERT(grid != NULL);
 
+    player->AddToWorld();
     SendInitSelf(player);
-    SendInitTransports(player);
-
-    NGridType* grid = getNGrid(cell.GridX(), cell.GridY());
+    SendInitActiveObjects(player);
     player->GetViewPoint().Event_AddedToWorld(&(*grid)(cell.CellX(), cell.CellY()));
     UpdateObjectVisibility(player,cell,p);
 
+    DEBUG_FILTER_LOG(LOG_FILTER_PLAYER_MOVES, "Map::Add map %u instance %u add %s to grid [%u,%u]", GetId(), GetInstanceId(), player->GetObjectGuid().GetString().c_str(), cell.GridX(), cell.GridY());
+
     if (i_data)
         i_data->OnPlayerEnter(player);
 
+    sLFGMgr.OnPlayerEnterMap(player, this);
     return true;
 }
 
 template<class T>
 void
-Map::Add(T *obj)
+Map::Add(T* obj)
 {
     MANGOS_ASSERT(obj);
 
     CellPair p = MaNGOS::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
     if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
     {
-        sLog.outError("Map::Add: Object (GUID: %u TypeId: %u) have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUIDLow(), obj->GetTypeId(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord);
+        sLog.outError("Map::Add map %u instance %u %s have invalid coordinates X:%f Y:%f grid cell [%u:%u]", GetId(), GetInstanceId(), obj->GetObjectGuid() ? obj->GetObjectGuid().GetString().c_str() : "<no GUID>", obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord);
         return;
     }
 
+    if (FindObject(obj->GetObjectGuid()))
+    {
+        if (obj->GetObjectGuid().IsCreatureOrVehicle())
+        {
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING,"Map::Add map %u instance %u %s is found stored in Map object store, but trying to be addes. Possible result of pool operations.", GetId(), GetInstanceId(), obj->GetObjectGuid() ? obj->GetObjectGuid().GetString().c_str() : "<no GUID>");
+        }
+        else
+        {
+            sLog.outError("Map::Add map %u instance %u %s is found stored in Map object store, but trying to be addes!", GetId(), GetInstanceId(), obj->GetObjectGuid() ? obj->GetObjectGuid().GetString().c_str() : "<no GUID>");
+        }
+    }
+
     obj->SetMap(this);
+    if (obj->GetTypeId() == TYPEID_UNIT)
+        CreateAttackersStorageFor(obj->GetObjectGuid());
 
     Cell cell(p);
     if(obj->isActiveObject())
@@ -330,8 +478,8 @@ Map::Add(T *obj)
     else
         EnsureGridCreated(GridPair(cell.GridX(), cell.GridY()));
 
-    NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
-    MANGOS_ASSERT( grid != NULL );
+    NGridType* grid = getNGrid(cell.GridX(), cell.GridY());
+    MANGOS_ASSERT(grid != NULL);
 
     AddToGrid(obj,grid,cell);
     obj->AddToWorld();
@@ -339,13 +487,13 @@ Map::Add(T *obj)
     if(obj->isActiveObject())
         AddToActive(obj);
 
-    DEBUG_LOG("%s enters grid[%u,%u]", obj->GetGuidStr().c_str(), cell.GridX(), cell.GridY());
+    DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "Map::Add map %u instance %u add %s to grid [%u,%u]", GetId(), GetInstanceId(), obj->GetObjectGuid() ? obj->GetObjectGuid().GetString().c_str() : "<no GUID>", cell.GridX(), cell.GridY());
 
     obj->GetViewPoint().Event_AddedToWorld(&(*grid)(cell.CellX(), cell.CellY()));
     UpdateObjectVisibility(obj,cell,p);
 }
 
-void Map::MessageBroadcast(Player *player, WorldPacket *msg, bool to_self)
+void Map::MessageBroadcast(Player const* player, WorldPacket* msg, bool to_self)
 {
     CellPair p = MaNGOS::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
 
@@ -358,7 +506,9 @@ void Map::MessageBroadcast(Player *player, WorldPacket *msg, bool to_self)
     Cell cell(p);
     cell.SetNoCreate();
 
-    if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
+    EnsureGridCreated(GridPair(cell.GridX(), cell.GridY()));
+
+    if (!loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)))
         return;
 
     MaNGOS::MessageDeliverer post_man(*player, msg, to_self);
@@ -366,7 +516,7 @@ void Map::MessageBroadcast(Player *player, WorldPacket *msg, bool to_self)
     cell.Visit(p, message, *this, *player, GetVisibilityDistance());
 }
 
-void Map::MessageBroadcast(WorldObject *obj, WorldPacket *msg)
+void Map::MessageBroadcast(WorldObject const* obj, WorldPacket* msg)
 {
     CellPair p = MaNGOS::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
 
@@ -379,17 +529,17 @@ void Map::MessageBroadcast(WorldObject *obj, WorldPacket *msg)
     Cell cell(p);
     cell.SetNoCreate();
 
-    if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
+    if (!loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)))
         return;
 
     //TODO: currently on continents when Visibility.Distance.InFlight > Visibility.Distance.Continents
     //we have alot of blinking mobs because monster move packet send is broken...
     MaNGOS::ObjectMessageDeliverer post_man(*obj,msg);
     TypeContainerVisitor<MaNGOS::ObjectMessageDeliverer, WorldTypeMapContainer > message(post_man);
-    cell.Visit(p, message, *this, *obj, GetVisibilityDistance());
+    cell.Visit(p, message, *this, *obj, GetVisibilityDistance(obj));
 }
 
-void Map::MessageDistBroadcast(Player *player, WorldPacket *msg, float dist, bool to_self, bool own_team_only)
+void Map::MessageDistBroadcast(Player const* player, WorldPacket* msg, float dist, bool to_self, bool own_team_only)
 {
     CellPair p = MaNGOS::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
 
@@ -402,6 +552,8 @@ void Map::MessageDistBroadcast(Player *player, WorldPacket *msg, float dist, boo
     Cell cell(p);
     cell.SetNoCreate();
 
+    EnsureGridCreated(GridPair(cell.GridX(), cell.GridY()));
+
     if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
         return;
 
@@ -410,7 +562,7 @@ void Map::MessageDistBroadcast(Player *player, WorldPacket *msg, float dist, boo
     cell.Visit(p, message, *this, *player, dist);
 }
 
-void Map::MessageDistBroadcast(WorldObject *obj, WorldPacket *msg, float dist)
+void Map::MessageDistBroadcast(WorldObject const* obj, WorldPacket* msg, float dist)
 {
     CellPair p = MaNGOS::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
 
@@ -431,34 +583,109 @@ void Map::MessageDistBroadcast(WorldObject *obj, WorldPacket *msg, float dist)
     cell.Visit(p, message, *this, *obj, dist);
 }
 
-bool Map::loaded(const GridPair &p) const
+bool Map::loaded(GridPair const& p) const
 {
-    return ( getNGrid(p.x_coord, p.y_coord) && isGridObjectDataLoaded(p.x_coord, p.y_coord) );
+    NGridType const* grid = getNGridWithoutLock(p.x_coord, p.y_coord);
+    return grid ? IsGridObjectDataLoaded(grid) : false;
 }
 
 void Map::Update(const uint32 &t_diff)
 {
-    /// update worldsessions for existing players
-    for(m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter)
+    DynamicMapTreeUpdate(t_diff);
+
+    // Load all objects in begin of update diff (loading objects count limited by time)
+    uint32 loadingObjectToGridUpdateTime = WorldTimer::getMSTime();
+    BattleGround* bg = this->IsBattleGroundOrArena() ? ((BattleGroundMap*)this)->GetBG() : NULL;
+    while (WorldTimer::getMSTimeDiff(loadingObjectToGridUpdateTime, WorldTimer::getMSTime()) < sWorld.getConfig(CONFIG_UINT32_OBJECTLOADINGSPLITTER_ALLOWEDTIME)
+        && !IsLoadingObjectsQueueEmpty())
     {
-        Player* plr = m_mapRefIter->getSource();
-        if(plr && plr->IsInWorld())
+        LoadingObjectQueueMember* loadingObject = GetNextLoadingObject();
+        if (!loadingObject)
+            continue;
+
+        switch(loadingObject->objectTypeID)
         {
-            WorldSession * pSession = plr->GetSession();
-            MapSessionFilter updater(pSession);
+            case TYPEID_UNIT:
+            {
+                LoadObjectToGrid<Creature>(loadingObject->guid, loadingObject->grid, bg);
+                break;
+            }
+            case TYPEID_GAMEOBJECT:
+            {
+                LoadObjectToGrid<GameObject>(loadingObject->guid, loadingObject->grid, bg);
+                break;
+            }
+            default:
+                sLog.outError("loadingObject->guid = %u, loadingObject.objectTypeID = %u", loadingObject->guid, loadingObject->objectTypeID);
+                break;
+        }
+        delete loadingObject;
+    }
+
+    UpdateEvents(t_diff);
+
+    /// update worldsessions for existing players (stage 1)
+    GuidQueue updateQueue = GetActiveObjects();
+    while (!updateQueue.empty())
+    {
+        ObjectGuid guid = updateQueue.front();
+        updateQueue.pop();
 
-            pSession->Update(updater);
+        if (!guid.IsPlayer())
+            continue;
+
+        Player* plr = GetPlayer(guid);
+
+        if (plr && plr->IsInWorld())
+        {
+            if (WorldSession* pSession = plr->GetSession())
+            {
+                MapSessionFilter updater(pSession);
+                pSession->Update(updater);
+                // sending WorldState updates
+                plr->SendUpdatedWorldStates(false);
+            }
         }
     }
 
-    /// update players at tick
-    for(m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter)
+    /// update active objects (players also) at tick (stage 2)
+    /*GuidQueue*/ updateQueue = GetActiveObjects();
+    while (!updateQueue.empty())
     {
-        Player* plr = m_mapRefIter->getSource();
-        if(plr && plr->IsInWorld())
+        ObjectGuid guid = updateQueue.front();
+        updateQueue.pop();
+
+        WorldObject* obj = GetWorldObject(guid);
+        if (!obj || !obj->IsInWorld())
+            continue;
+
+        switch (guid.GetHigh())
         {
-            WorldObject::UpdateHelper helper(plr);
-            helper.Update(t_diff);
+            case HIGHGUID_PLAYER:
+            {
+                Player* plr = dynamic_cast<Player*>(obj);
+                if (plr)
+                {
+                    WorldObject::UpdateHelper helper(*plr);
+                    helper.Update(t_diff);
+                }
+                break;
+            }
+            case HIGHGUID_MO_TRANSPORT:
+            {
+                // update active MO_TRANSPORT objects
+                if (obj->isActiveObject() && obj->IsPositionValid())
+                {
+                    WorldObject::UpdateHelper helper(*obj);
+                    helper.Update(t_diff);
+                }
+                break;
+            }
+            case HIGHGUID_TRANSPORT:
+            // updating regular transports (after fully implementing Transport:: (NOT MOTransport!) class)
+            default:
+            // All another objects (active and not active) be updated in TypeContainerVisitor<> expressions
+                break;
         }
     }
 
@@ -471,19 +698,22 @@ void Map::Update(const uint32 &t_diff)
     // for pets
     TypeContainerVisitor<MaNGOS::ObjectUpdater, WorldTypeMapContainer > world_object_update(updater);
 
-    // the player iterator is stored in the map object
-    // to make sure calls to Map::Remove don't invalidate it
-    for(m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter)
+    // player and non-player active objects (only cells re-mark)
+    /*GuidQueue*/ updateQueue = GetActiveObjects();
+    bool hasActive = !updateQueue.empty();
+    while (!updateQueue.empty())
     {
-        Player* plr = m_mapRefIter->getSource();
+        ObjectGuid guid = updateQueue.front();
+        updateQueue.pop();
+
+        WorldObject* obj = GetWorldObject(guid);
 
-        if (!plr->IsInWorld() || !plr->IsPositionValid())
+        if (!obj || !obj->IsInWorld() || !obj->isActiveObject() || !obj->IsPositionValid())
             continue;
 
         //lets update mobs/objects in ALL visible cells around player!
-        CellArea area = Cell::CalculateCellArea(plr->GetPositionX(), plr->GetPositionY(), GetVisibilityDistance());
-
-        for(uint32 x = area.low_bound.x_coord; x <= area.high_bound.x_coord; ++x)
+        CellArea area = Cell::CalculateCellArea(obj->GetPositionX(), obj->GetPositionY(), GetVisibilityDistance());
+        for (uint32 x = area.low_bound.x_coord; x <= area.high_bound.x_coord; ++x)
         {
             for(uint32 y = area.low_bound.y_coord; y <= area.high_bound.y_coord; ++y)
             {
@@ -503,47 +733,12 @@ void Map::Update(const uint32 &t_diff)
         }
     }
 
-    // non-player active objects
-    if(!m_activeNonPlayers.empty())
-    {
-        for(m_activeNonPlayersIter = m_activeNonPlayers.begin(); m_activeNonPlayersIter != m_activeNonPlayers.end(); )
-        {
-            // skip not in world
-            WorldObject* obj = *m_activeNonPlayersIter;
-
-            // step before processing, in this case if Map::Remove remove next object we correctly
-            // step to next-next, and if we step to end() then newly added objects can wait next update.
-            ++m_activeNonPlayersIter;
-
-            if (!obj->IsInWorld() || !obj->IsPositionValid())
-                continue;
-
-            //lets update mobs/objects in ALL visible cells around player!
-            CellArea area = Cell::CalculateCellArea(obj->GetPositionX(), obj->GetPositionY(), GetVisibilityDistance());
-
-            for(uint32 x = area.low_bound.x_coord; x <= area.high_bound.x_coord; ++x)
-            {
-                for(uint32 y = area.low_bound.y_coord; y <= area.high_bound.y_coord; ++y)
-                {
-                    // marked cells are those that have been visited
-                    // don't visit the same cell twice
-                    uint32 cell_id = (y * TOTAL_NUMBER_OF_CELLS_PER_MAP) + x;
-                    if(!isCellMarked(cell_id))
-                    {
-                        markCell(cell_id);
-                        CellPair pair(x,y);
-                        Cell cell(pair);
-                        cell.SetNoCreate();
-                        Visit(cell, grid_object_update);
-                        Visit(cell, world_object_update);
-                    }
-                }
-            }
-        }
-    }
-
     // Send world objects and item update field changes
-    SendObjectUpdates();
+    if (hasActive)
+        SendObjectUpdates();
+
+    // Calculate and send map-related WorldState updates
+    sWorldStateMgr.MapUpdate(this);
 
     // Don't unload grids if it's battleground, since we may have manually added GOs,creatures, those doesn't load from DB at grid re-load !
     // This isn't really bother us, since as soon as we have instanced BG-s, the whole map unloads as the BG gets ended
@@ -555,7 +750,7 @@ void Map::Update(const uint32 &t_diff)
             GridInfo *info = i->getSource()->getGridInfoRef();
             ++i;                                                // The update might delete the map and we need the next map before the iterator gets invalid
             MANGOS_ASSERT(grid->GetGridState() >= 0 && grid->GetGridState() < MAX_GRID_STATE);
-            sMapMgr.UpdateGridState(grid->GetGridState(), *this, *grid, *info, grid->getX(), grid->getY(), t_diff);
+            UpdateGridState(*grid, *info, t_diff);
         }
     }
 
@@ -567,66 +762,80 @@ void Map::Update(const uint32 &t_diff)
         i_data->Update(t_diff);
 }
 
-void Map::Remove(Player *player, bool remove)
+void Map::Remove(Player* player, bool remove)
 {
+    if (!FindObject(player->GetObjectGuid()))
+    {
+        sLog.outError("Map::Remove: map %u instance %u %s not stored in Map object store, byt trying to be removed!", GetId(), GetInstanceId(), player->GetObjectGuid().GetString().c_str());
+    }
+
     if (i_data)
         i_data->OnPlayerLeave(player);
 
-    if(remove)
+    sLFGMgr.OnPlayerLeaveMap(player, this);
+
+    RemoveFromActive(player);
+
+    if (remove)
         player->CleanupsBeforeDelete();
-    else
-        player->RemoveFromWorld();
+
+    RemoveAttackersStorageFor(player->GetObjectGuid());
+
+    player->RemoveFromWorld(remove);
 
     // this may be called during Map::Update
-    // after decrement+unlink, ++m_mapRefIter will continue correctly
-    // when the first element of the list is being removed
-    // nocheck_prev will return the padding element of the RefManager
-    // instead of NULL in the case of prev
-    if(m_mapRefIter == player->GetMapRef())
-        m_mapRefIter = m_mapRefIter->nocheck_prev();
     player->GetMapRef().unlink();
+
     CellPair p = MaNGOS::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
-    if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP)
+    if (p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP)
     {
         // invalid coordinates
-        player->ResetMap();
-
-        if( remove )
-            DeleteFromWorld(player);
-
+        sLog.outError("Map::Remove player %s invalid cellPair x:%d, y:%d", player->GetObjectGuid().GetString().c_str(), p.x_coord,p.y_coord);
+        remove ? DeleteFromWorld(player) :  (void)player->TeleportToHomebind();
         return;
     }
 
     Cell cell(p);
-
-    if( !getNGrid(cell.data.Part.grid_x, cell.data.Part.grid_y) )
+    NGridType* grid = getNGrid(cell.GridX(), cell.GridY());
+    if (!grid)
     {
-        sLog.outError("Map::Remove() i_grids was NULL x:%d, y:%d",cell.data.Part.grid_x,cell.data.Part.grid_y);
+        // invalid coordinates
+        sLog.outError("Map::Remove player %s i_grids was NULL x:%d, y:%d",player->GetObjectGuid().GetString().c_str(),cell.data.Part.grid_x,cell.data.Part.grid_y);
+        remove ? DeleteFromWorld(player) :  (void)player->TeleportToHomebind();
         return;
     }
 
-    DEBUG_FILTER_LOG(LOG_FILTER_PLAYER_MOVES, "Remove player %s from grid[%u,%u]", player->GetName(), cell.GridX(), cell.GridY());
-    NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
-    MANGOS_ASSERT(grid != NULL);
+    DEBUG_FILTER_LOG(LOG_FILTER_PLAYER_MOVES, "Map::Remove Remove player %s from grid [%u,%u]", player->GetName(), cell.GridX(), cell.GridY());
 
     RemoveFromGrid(player,grid,cell);
-
-    SendRemoveTransports(player);
+    SendRemoveActiveObjects(player);
     UpdateObjectVisibility(player,cell,p);
 
-    player->ResetMap();
-    if( remove )
+    if (!player->GetPlayerbotAI())
+        player->ResetMap();
+
+    // if remove - player be deleted (removed from storage already, in RemoveFromWorld()
+    if (!remove)
+        EraseObject(player->GetObjectGuid());
+    else
         DeleteFromWorld(player);
+
+    // if last player - set unload timer
+    if (!IsContinent() && !IsBattleGroundOrArena())
+    {
+        if (!m_unloadTimer && !HavePlayers())
+            m_unloadTimer = sWorld.getConfig(CONFIG_UINT32_INSTANCE_UNLOAD_DELAY);
+    }
 }
 
 template<class T>
 void
-Map::Remove(T *obj, bool remove)
+Map::Remove(T* obj, bool remove)
 {
     CellPair p = MaNGOS::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
     if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
     {
-        sLog.outError("Map::Remove: Object (GUID: %u TypeId:%u) have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUIDLow(), obj->GetTypeId(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord);
+        sLog.outError("Map::Remove: Object (%s Type: %u) have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetObjectGuid() ? obj->GetObjectGuid().GetString().c_str() : "<no GUID>", obj->GetTypeId(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord);
         return;
     }
 
@@ -635,45 +844,62 @@ Map::Remove(T *obj, bool remove)
         return;
 
     DEBUG_LOG("Remove object (GUID: %u TypeId:%u) from grid[%u,%u]", obj->GetGUIDLow(), obj->GetTypeId(), cell.data.Part.grid_x, cell.data.Part.grid_y);
-    NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
-    MANGOS_ASSERT( grid != NULL );
+    NGridType* grid = getNGrid(cell.GridX(), cell.GridY());
+    MANGOS_ASSERT(grid != NULL);
 
-    if(obj->isActiveObject())
-        RemoveFromActive(obj);
+    RemoveFromActive(obj);
 
-    if(remove)
+    if (remove)
         obj->CleanupsBeforeDelete();
-    else
-        obj->RemoveFromWorld();
+    obj->RemoveFromWorld(remove);
+
+    if (!obj->isActiveObject())
+        UpdateObjectVisibility(obj,cell,p);                     // i think will be better to call this function while object still in grid, this changes nothing but logically is better(as for me)
 
-    UpdateObjectVisibility(obj,cell,p);                     // i think will be better to call this function while object still in grid, this changes nothing but logically is better(as for me)
     RemoveFromGrid(obj,grid,cell);
 
-    obj->ResetMap();
-    if( remove )
+    if (obj->GetTypeId() == TYPEID_UNIT)
+        RemoveAttackersStorageFor(obj->GetObjectGuid());
+
+    if (obj->isActiveObject())
+        SendRemoveNotifyToStoredClients(obj, bool(obj->GetTypeId() == TYPEID_UNIT));
+
+    if (remove)
     {
         // if option set then object already saved at this moment
         if(!sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY))
             obj->SaveRespawnTime();
 
+        obj->ResetMap();
         // Note: In case resurrectable corpse and pet its removed from global lists in own destructor
         delete obj;
     }
+    else
+    {
+        EraseObject(obj->GetObjectGuid());
+    }
 }
 
-void
-Map::PlayerRelocation(Player *player, float x, float y, float z, float orientation)
+template<class T>
+void Map::Relocation(T* obj, Position const& pos)
+{
+    sLog.outError("Map::Relocation unhandled relocation call (object %s)!", obj ? obj->GetObjectGuid().GetString().c_str() : "<none>");
+    MANGOS_ASSERT(false);
+};
+
+template<>
+void Map::Relocation(Player* player, Position const& pos)
 {
     MANGOS_ASSERT(player);
 
     CellPair old_val = MaNGOS::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
-    CellPair new_val = MaNGOS::ComputeCellPair(x, y);
+    CellPair new_val = MaNGOS::ComputeCellPair(pos.x, pos.y);
 
     Cell old_cell(old_val);
     Cell new_cell(new_val);
     bool same_cell = (new_cell == old_cell);
 
-    player->Relocate(x, y, z, orientation);
+    player->Relocate(pos);
 
     if( old_cell.DiffGrid(new_cell) || old_cell.DiffCell(new_cell) )
     {
@@ -692,26 +918,23 @@ Map::PlayerRelocation(Player *player, float x, float y, float z, float orientati
 
     player->OnRelocated();
 
-    NGridType* newGrid = getNGrid(new_cell.GridX(), new_cell.GridY());
-    if( !same_cell && newGrid->GetGridState()!= GRID_STATE_ACTIVE )
-    {
-        ResetGridExpiry(*newGrid, 0.1f);
-        newGrid->SetGridState(GRID_STATE_ACTIVE);
-    }
-}
+    if (!same_cell)
+        ActivateGrid(getNGrid(new_cell.GridX(), new_cell.GridY()));
+};
 
-void Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang)
+template<>
+void Map::Relocation(Creature* creature, Position const& pos)
 {
     MANGOS_ASSERT(CheckGridIntegrity(creature,false));
 
-    Cell old_cell = creature->GetCurrentCell();
-    Cell new_cell(MaNGOS::ComputeCellPair(x, y));
+//    Cell old_cell = creature->GetCurrentCell();
+    Cell new_cell(MaNGOS::ComputeCellPair(pos.x, pos.y));
 
     // do move or do move to respawn or remove creature if previous all fail
     if (CreatureCellRelocation(creature,new_cell))
     {
         // update pos
-        creature->Relocate(x, y, z, ang);
+        creature->Relocate(pos);
         creature->OnRelocated();
     }
     // if creature can't be move in new cell/grid (not loaded) move it to repawn cell/grid
@@ -723,9 +946,49 @@ void Map::CreatureRelocation(Creature *creature, float x, float y, float z, floa
     }
 
     MANGOS_ASSERT(CheckGridIntegrity(creature,true));
-}
+};
+
+template<>
+void Map::Relocation(GameObject* go, Position const& pos)
+{
+    MANGOS_ASSERT(go);
+
+    CellPair old_val = MaNGOS::ComputeCellPair(go->GetPositionX(), go->GetPositionY());
+    CellPair new_val = MaNGOS::ComputeCellPair(pos.x, pos.y);
+
+    Cell old_cell(old_val);
+    Cell new_cell(new_val);
+
+    go->Relocate(pos);
+
+    if (old_cell != new_cell)
+    {
+        // Need check for spawn some GO in not loaded grids
+        EnsureGridLoadedAtEnter(old_cell);
+
+        NGridType* oldGrid = getNGrid(old_cell.GridX(), old_cell.GridY());
+
+        RemoveFromGrid(go, oldGrid,old_cell);
+        EnsureGridLoadedAtEnter(new_cell);
+        NGridType* newGrid = getNGrid(new_cell.GridX(), new_cell.GridY());
+        ActivateGrid(newGrid);
+
+        AddToGrid(go, newGrid, new_cell);
+
+        go->GetViewPoint().Event_GridChanged(&(*newGrid)(new_cell.CellX(),new_cell.CellY()));
+        DEBUG_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES, "GO %s moved in grid[%u,%u] from cell[%u,%u] to cell[%u,%u].", go->GetObjectGuid().GetString().c_str(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.CellX(), new_cell.CellY());
+    }
+
+    go->UpdateObjectVisibility();
+    // go->OnRelocated();
+};
 
-bool Map::CreatureCellRelocation(Creature *c, Cell new_cell)
+void Map::CreatureRelocation(Creature* object, float x, float y, float z, float orientation)
+{
+    Relocation(object, Position(x, y, z, orientation, object->GetPhaseMask()));
+};
+
+bool Map::CreatureCellRelocation(Creature* c, Cell new_cell)
 {
     Cell const& old_cell = c->GetCurrentCell();
     if (old_cell.DiffGrid(new_cell))
@@ -744,6 +1007,8 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell)
         NGridType* oldGrid = getNGrid(old_cell.GridX(), old_cell.GridY());
         NGridType* newGrid = getNGrid(new_cell.GridX(), new_cell.GridY());
         RemoveFromGrid(c, oldGrid, old_cell);
+        if (c->isActiveObject())
+            ActivateGrid(newGrid);
         AddToGrid(c, newGrid, new_cell);
         c->GetViewPoint().Event_GridChanged(&(*newGrid)(new_cell.CellX(),new_cell.CellY()));
     }
@@ -752,10 +1017,9 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell)
 
 bool Map::CreatureRespawnRelocation(Creature *c)
 {
-    float resp_x, resp_y, resp_z, resp_o;
-    c->GetRespawnCoord(resp_x, resp_y, resp_z, &resp_o);
+    WorldLocation loc = c->GetRespawnCoord();
 
-    CellPair resp_val = MaNGOS::ComputeCellPair(resp_x, resp_y);
+    CellPair resp_val = MaNGOS::ComputeCellPair(loc.x, loc.y);
     Cell resp_cell(resp_val);
 
     c->CombatStop();
@@ -766,7 +1030,7 @@ bool Map::CreatureRespawnRelocation(Creature *c)
     // teleport it to respawn point (like normal respawn if player see)
     if(CreatureCellRelocation(c,resp_cell))
     {
-        c->Relocate(resp_x, resp_y, resp_z, resp_o);
+        c->Relocate(loc);
         c->GetMotionMaster()->Initialize();                 // prevent possible problems with default move generators
         c->OnRelocated();
         return true;
@@ -775,72 +1039,98 @@ bool Map::CreatureRespawnRelocation(Creature *c)
         return false;
 }
 
-bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool pForce)
+bool Map::UnloadGrid(NGridType& grid, bool pForce)
 {
-    NGridType *grid = getNGrid(x, y);
-    MANGOS_ASSERT( grid != NULL);
+    if (!pForce && ActiveObjectsNearGrid(grid.getX(), grid.getY()))
+        return false;
 
-    {
-        if(!pForce && ActiveObjectsNearGrid(x, y) )
-            return false;
+    // Make refcounted pointer for deleting object in destructor
+    GridPtr deletePtr = GridPtr(&grid);
 
-        DEBUG_LOG("Unloading grid[%u,%u] for map %u", x,y, i_id);
-        ObjectGridUnloader unloader(*grid);
+    SetGridObjectDataLoaded(false, grid);
+    ObjectGridUnloader unloader(grid);
 
-        // Finish remove and delete all creatures with delayed remove before moving to respawn grids
-        // Must know real mob position before move
-        RemoveAllObjectsInRemoveList();
+    // Finish remove and delete all creatures with delayed remove before moving to respawn grids
+    // Must know real mob position before move
+    RemoveAllObjectsInRemoveList();
 
-        // move creatures to respawn grids if this is diff.grid or to remove list
-        unloader.MoveToRespawnN();
+    // move creatures to respawn grids if this is diff.grid or to remove list
+    unloader.MoveToRespawnN();
 
-        // Finish remove and delete all creatures with delayed remove before unload
-        RemoveAllObjectsInRemoveList();
+    // Finish remove and delete all creatures with delayed remove before unload
+    RemoveAllObjectsInRemoveList();
 
-        unloader.UnloadN();
-        delete getNGrid(x, y);
-        setNGrid(NULL, x, y);
-    }
+    unloader.UnloadN();
+    setNGrid(NULL, grid.getX(), grid.getY());
+
+    DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "Map::UnloadGrid unloading grid[%u,%u] for map %u finished", grid.getX(), grid.getY(), GetId(), GetInstanceId());
 
-    int gx = (MAX_NUMBER_OF_GRIDS - 1) - x;
-    int gy = (MAX_NUMBER_OF_GRIDS - 1) - y;
+    int gx = (MAX_NUMBER_OF_GRIDS - 1) - grid.getX();
+    int gy = (MAX_NUMBER_OF_GRIDS - 1) - grid.getY();
 
     // unload GridMap - it is reference-countable so will be deleted safely when lockCount < 1
     // also simply set Map's pointer to corresponding GridMap object to NULL
-    if(m_bLoadedGrids[gx][gy])
+    if (m_bLoadedGrids[gx][gy])
     {
         m_bLoadedGrids[gx][gy] = false;
-        m_TerrainData->Unload(gx, gy);
+        GetTerrain()->Unload(gx, gy);
     }
 
-    DEBUG_LOG("Unloading grid[%u,%u] for map %u finished", x,y, i_id);
     return true;
 }
 
 void Map::UnloadAll(bool pForce)
 {
+    while (!IsLoadingObjectsQueueEmpty())
+    {
+        if (LoadingObjectQueueMember* member = GetNextLoadingObject())
+            delete member;
+    }
+
     for (GridRefManager<NGridType>::iterator i = GridRefManager<NGridType>::begin(); i != GridRefManager<NGridType>::end(); )
     {
-        NGridType &grid(*i->getSource());
+        NGridType& grid(*i->getSource());
         ++i;
-        UnloadGrid(grid.getX(), grid.getY(), pForce);       // deletes the grid and removes it from the GridRefManager
+        UnloadGrid(grid, pForce);       // deletes the grid and removes it from the GridRefManager
+    }
+
+    //if (GetInstanceId() && !sMapMgr.IsTransportMap(GetId()))
+    //    sObjectMgr.UnLoadTransports(this);
+
+    DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "Map::UnloadAll unloading all objects from map %u instance %u complete", GetId(), GetInstanceId());
+}
+
+void Map::AddLoadingObject(LoadingObjectQueueMember* obj)
+{
+    i_loadingObjectQueue.push(obj);
+}
+
+LoadingObjectQueueMember* Map::GetNextLoadingObject()
+{
+    LoadingObjectQueueMember* loadingObject = NULL;
+    if (!IsLoadingObjectsQueueEmpty())
+    {
+        WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+        loadingObject = i_loadingObjectQueue.top();
+        i_loadingObjectQueue.pop();
     }
+    return loadingObject;
 }
 
-MapDifficulty const* Map::GetMapDifficulty() const
+MapDifficultyEntry const* Map::GetMapDifficulty() const
 {
     return GetMapDifficultyData(GetId(),GetDifficulty());
 }
 
 uint32 Map::GetMaxPlayers() const
 {
-    if(MapDifficulty const* mapDiff = GetMapDifficulty())
+    if(MapDifficultyEntry const* mapDiff = GetMapDifficulty())
     {
         if(mapDiff->maxPlayers || IsRegularDifficulty())    // Normal case (expect that regular difficulty always have correct maxplayers)
             return mapDiff->maxPlayers;
         else                                                // DBC have 0 maxplayers for heroic instances with expansion < 2
         {                                                   // The heroic entry exists, so we don't have to check anything, simply return normal max players
-            MapDifficulty const* normalDiff = GetMapDifficultyData(i_id, REGULAR_DIFFICULTY);
+            MapDifficultyEntry const* normalDiff = GetMapDifficultyData(i_id, REGULAR_DIFFICULTY);
             return normalDiff ? normalDiff->maxPlayers : 0;
         }
     }
@@ -877,39 +1167,38 @@ const char* Map::GetMapName() const
     return i_mapEntry ? i_mapEntry->name[sWorld.GetDefaultDbcLocale()] : "UNNAMEDMAP\x0";
 }
 
-void Map::UpdateObjectVisibility( WorldObject* obj, Cell cell, CellPair cellpair)
+void UpdateObjectVisibilityWithHelper::operator() (WorldObject* object) const
+{
+    if (!object)
+        return;
+
+    m_obj->GetMap()->UpdateObjectVisibility(object, m_cell, m_cellpair);
+}
+
+void Map::UpdateObjectVisibility(WorldObject* obj, Cell cell, CellPair cellpair)
 {
     cell.SetNoCreate();
     MaNGOS::VisibleChangesNotifier notifier(*obj);
     TypeContainerVisitor<MaNGOS::VisibleChangesNotifier, WorldTypeMapContainer > player_notifier(notifier);
-    cell.Visit(cellpair, player_notifier, *this, *obj, GetVisibilityDistance());
+    cell.Visit(cellpair, player_notifier, *this, *obj, GetVisibilityDistance(obj));
+    if (obj->IsTransport() && obj->GetTransportBase() && obj->GetTransportBase()->HasPassengers())
+        obj->GetTransportBase()->CallForAllPassengers(UpdateObjectVisibilityWithHelper(obj, cell, cellpair));
 }
 
-void Map::SendInitSelf( Player * player )
+void Map::SendInitSelf(Player* player )
 {
     DETAIL_LOG("Creating player data for himself %u", player->GetGUIDLow());
 
     UpdateData data;
-
-    // attach to player data current transport data
-    if(Transport* transport = player->GetTransport())
-    {
-        transport->BuildCreateUpdateBlockForPlayer(&data, player);
-    }
-
     // build data for self presence in world at own client (one time for map)
     player->BuildCreateUpdateBlockForPlayer(&data, player);
 
     // build other passengers at transport also (they always visible and marked as visible and will not send at visibility update at add to map
-    if(Transport* transport = player->GetTransport())
+    if (Transport* transport = player->GetTransport())
     {
-        for(Transport::PlayerSet::const_iterator itr = transport->GetPassengers().begin();itr!=transport->GetPassengers().end();++itr)
-        {
-            if(player!=(*itr) && player->HaveAtClient(*itr))
-            {
-                (*itr)->BuildCreateUpdateBlockForPlayer(&data, player);
-            }
-        }
+        // attach to player data current transport data
+        transport->BuildCreateUpdateBlockForPlayer(&data, player);
+        transport->GetTransportKit()->CallForAllPassengers(SendCurrentTransportDataWithHelper(&data, player));
     }
 
     WorldPacket packet;
@@ -917,57 +1206,85 @@ void Map::SendInitSelf( Player * player )
     player->GetSession()->SendPacket(&packet);
 }
 
-void Map::SendInitTransports( Player * player )
+void Map::SendInitActiveObjects(Player* player)
 {
-    // Hack to send out transports
-    MapManager::TransportMap& tmap = sMapMgr.m_TransportsByMap;
-
-    // no transports at map
-    if (tmap.find(player->GetMapId()) == tmap.end())
+    if (!player)
         return;
 
-    UpdateData transData;
+    GuidQueue updateQueue = GetActiveObjects();
+    if (updateQueue.empty())
+        return;
 
-    MapManager::TransportSet& tset = tmap[player->GetMapId()];
+    UpdateData initData = UpdateData();
+    bool hasAny = false;
 
-    for (MapManager::TransportSet::const_iterator i = tset.begin(); i != tset.end(); ++i)
+    while(!updateQueue.empty())
     {
-        // send data for current transport in other place
-        if((*i) != player->GetTransport() && (*i)->GetMapId()==i_id)
-        {
-            (*i)->BuildCreateUpdateBlockForPlayer(&transData, player);
-        }
+        ObjectGuid guid = updateQueue.front();
+        updateQueue.pop();
+
+        if (guid.IsPlayer())
+            continue;
+
+        WorldObject* object = GetWorldObject(guid);
+
+        if (!object || !object->IsInWorld() || !object->isVisibleForInState(player,player,false) || !object->isActiveObject())
+            continue;
+
+        object->BuildCreateUpdateBlockForPlayer(&initData, player);
+        object->AddNotifiedClient(player->GetObjectGuid());
+        hasAny = true;
+        DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "Map::SendInitActiveObjects %s visibility initialized for %s",
+                      guid.GetString().c_str(), player->GetGuidStr().c_str());
     }
+    if (!hasAny)
+        return;
 
     WorldPacket packet;
-    transData.BuildPacket(&packet);
+    initData.BuildPacket(&packet);
     player->GetSession()->SendPacket(&packet);
 }
 
-void Map::SendRemoveTransports( Player * player )
+void Map::SendRemoveActiveObjects(Player* player)
 {
-    // Hack to send out transports
-    MapManager::TransportMap& tmap = sMapMgr.m_TransportsByMap;
+    if (!player)
+        return;
 
-    // no transports at map
-    if (tmap.find(player->GetMapId()) == tmap.end())
+    GuidQueue updateQueue = GetActiveObjects();
+    if (updateQueue.empty())
         return;
 
-    UpdateData transData;
+    UpdateData initData = UpdateData();
+    bool hasAny = false;
+
+    while(!updateQueue.empty())
+    {
+        ObjectGuid guid = updateQueue.front();
+        updateQueue.pop();
+
+        if (guid.IsPlayer())
+            continue;
+
+        WorldObject* object = GetWorldObject(guid);
 
-    MapManager::TransportSet& tset = tmap[player->GetMapId()];
+        if (!object || !object->IsInWorld() || !object->isActiveObject())
+            continue;
 
-    // except used transport
-    for (MapManager::TransportSet::const_iterator i = tset.begin(); i != tset.end(); ++i)
-        if((*i) != player->GetTransport() && (*i)->GetMapId()!=i_id)
-            (*i)->BuildOutOfRangeUpdateBlock(&transData);
+        object->BuildOutOfRangeUpdateBlock(&initData);
+        hasAny = true;
+        object->RemoveNotifiedClient(player->GetObjectGuid());
+        DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "Map::SendRemoveActiveObjects %s visibility removed for %s",
+                    guid.GetString().c_str(), player->GetGuidStr().c_str());
+    }
+    if (!hasAny)
+        return;
 
     WorldPacket packet;
-    transData.BuildPacket(&packet);
+    initData.BuildPacket(&packet);
     player->GetSession()->SendPacket(&packet);
 }
 
-inline void Map::setNGrid(NGridType *grid, uint32 x, uint32 y)
+inline void Map::setNGrid(NGridType* grid, uint32 x, uint32 y)
 {
     if(x >= MAX_NUMBER_OF_GRIDS || y >= MAX_NUMBER_OF_GRIDS)
     {
@@ -977,16 +1294,22 @@ inline void Map::setNGrid(NGridType *grid, uint32 x, uint32 y)
     i_grids[x][y] = grid;
 }
 
-void Map::AddObjectToRemoveList(WorldObject *obj)
+void Map::AddObjectToRemoveList(WorldObject* obj, bool immediateCleanup)
 {
-    MANGOS_ASSERT(obj->GetMapId()==GetId() && obj->GetInstanceId()==GetInstanceId());
+    MANGOS_ASSERT(obj && obj->GetMap() == this);
 
-    obj->CleanupsBeforeDelete();                            // remove or simplify at least cross referenced links
+    obj->CleanupsBeforeDelete();                                // remove or simplify at least cross referenced links
 
     i_objectsToRemove.insert(obj);
     //DEBUG_LOG("Object (GUID: %u TypeId: %u ) added to removing list.",obj->GetGUIDLow(),obj->GetTypeId());
 }
 
+void Map::RemoveObjectFromRemoveList(WorldObject* obj)
+{
+    if (!i_objectsToRemove.empty())
+        i_objectsToRemove.erase(obj);
+}
+
 void Map::RemoveAllObjectsInRemoveList()
 {
     if(i_objectsToRemove.empty())
@@ -998,18 +1321,14 @@ void Map::RemoveAllObjectsInRemoveList()
         WorldObject* obj = *i_objectsToRemove.begin();
         i_objectsToRemove.erase(i_objectsToRemove.begin());
 
+        if (!obj)
+            continue;
+
         switch(obj->GetTypeId())
         {
             case TYPEID_CORPSE:
-            {
-                // ??? WTF
-                Corpse* corpse = GetCorpse(obj->GetObjectGuid());
-                if (!corpse)
-                    sLog.outError("Try delete corpse/bones %u that not in map", obj->GetGUIDLow());
-                else
-                    Remove(corpse,true);
+                Remove((Corpse*)obj,true);
                 break;
-            }
             case TYPEID_DYNAMICOBJECT:
                 Remove((DynamicObject*)obj,true);
                 break;
@@ -1052,26 +1371,25 @@ bool Map::ActiveObjectsNearGrid(uint32 x, uint32 y) const
 
     //we must find visible range in cells so we unload only non-visible cells...
     float viewDist = GetVisibilityDistance();
-    int cell_range = (int)ceilf(viewDist / SIZE_OF_GRID_CELL) + 1;
+    int cell_range = (int)ceil(viewDist / SIZE_OF_GRID_CELL) + 1;
 
     cell_min << cell_range;
     cell_min -= cell_range;
     cell_max >> cell_range;
     cell_max += cell_range;
 
-    for(MapRefManager::const_iterator iter = m_mapRefManager.begin(); iter != m_mapRefManager.end(); ++iter)
-    {
-        Player* plr = iter->getSource();
-
-        CellPair p = MaNGOS::ComputeCellPair(plr->GetPositionX(), plr->GetPositionY());
-        if( (cell_min.x_coord <= p.x_coord && p.x_coord <= cell_max.x_coord) &&
-            (cell_min.y_coord <= p.y_coord && p.y_coord <= cell_max.y_coord) )
-            return true;
-    }
+    GuidQueue updateQueue = const_cast<Map*>(this)->GetActiveObjects();
+    if (updateQueue.empty())
+        return false;
 
-    for(ActiveNonPlayers::const_iterator iter = m_activeNonPlayers.begin(); iter != m_activeNonPlayers.end(); ++iter)
+    while(!updateQueue.empty())
     {
-        WorldObject* obj = *iter;
+        ObjectGuid guid = updateQueue.front();
+        updateQueue.pop();
+
+        WorldObject const* obj = const_cast<Map*>(this)->GetWorldObject(guid);
+        if (!obj || !obj->isActiveObject())
+            continue;
 
         CellPair p = MaNGOS::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
         if( (cell_min.x_coord <= p.x_coord && p.x_coord <= cell_max.x_coord) &&
@@ -1082,11 +1400,17 @@ bool Map::ActiveObjectsNearGrid(uint32 x, uint32 y) const
     return false;
 }
 
-void Map::AddToActive( WorldObject* obj )
+void Map::AddToActive(WorldObject* obj)
 {
-    m_activeNonPlayers.insert(obj);
+    if (!obj)
+        return;
+    {
+        WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+        m_activeObjects.insert(obj->GetObjectGuid());
+    }
+
     Cell cell = Cell(MaNGOS::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY()));
-    EnsureGridLoaded(cell);
+    EnsureGridLoadedAtEnter(cell, obj->GetTypeId() == TYPEID_PLAYER ? (Player*)obj : NULL);
 
     // also not allow unloading spawn grid to prevent creating creature clone at load
     if (obj->GetTypeId() == TYPEID_UNIT)
@@ -1108,25 +1432,46 @@ void Map::AddToActive( WorldObject* obj )
             }
         }
     }
+
+    if (obj->GetTypeId() != TYPEID_PLAYER && IsVisibleGlobally(obj->GetObjectGuid()))
+    {
+        PlayerList const& plist = GetPlayers();
+        if (!plist.isEmpty())
+        {
+            for (PlayerList::const_iterator itr = plist.begin(); itr != plist.end(); ++itr)
+            {
+                Player* player = itr->getSource();
+                if (player && player->IsInWorld())
+                {
+                    UpdateData data;
+                    obj->BuildCreateUpdateBlockForPlayer(&data, player);
+                    WorldPacket packet;
+                    data.BuildPacket(&packet);
+                    player->SendDirectMessage(&packet);
+                    obj->AddNotifiedClient(player->GetObjectGuid());
+                    DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "Map::AddToActive %s send visibility notify to %s",
+                        obj->GetObjectGuid().GetString().c_str(), player->GetObjectGuid().GetString().c_str());
+                }
+            }
+        }
+    }
 }
 
-void Map::RemoveFromActive( WorldObject* obj )
+void Map::RemoveFromActive(WorldObject* obj)
 {
+    if (!obj)
+        return;
+
     // Map::Update for active object in proccess
-    if(m_activeNonPlayersIter != m_activeNonPlayers.end())
     {
-        ActiveNonPlayers::iterator itr = m_activeNonPlayers.find(obj);
-        if(itr==m_activeNonPlayersIter)
-            ++m_activeNonPlayersIter;
-        m_activeNonPlayers.erase(itr);
+        WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+        m_activeObjects.erase(obj->GetObjectGuid());
     }
-    else
-        m_activeNonPlayers.erase(obj);
 
     // also allow unloading spawn grid
-    if (obj->GetTypeId()==TYPEID_UNIT)
+    if (obj->GetTypeId() == TYPEID_UNIT)
     {
-        Creature* c= (Creature*)obj;
+        Creature* c = (Creature*)obj;
 
         if(!c->IsPet() && c->HasStaticDBSpawnData())
         {
@@ -1230,10 +1575,6 @@ DungeonMap::DungeonMap(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnM
 
     //lets initialize visibility distance for dungeons
     DungeonMap::InitVisibilityDistance();
-
-    // the timer is started by default, and stopped when the first player joins
-    // this make sure it gets unloaded if for some reason no player joins
-    m_unloadTimer = std::max(sWorld.getConfig(CONFIG_UINT32_INSTANCE_UNLOAD_DELAY), (uint32)MIN_UNLOAD_DELAY);
 }
 
 DungeonMap::~DungeonMap()
@@ -1258,22 +1599,6 @@ bool DungeonMap::CanEnter(Player *player)
         return false;
     }
 
-    // cannot enter if the instance is full (player cap), GMs don't count
-    uint32 maxPlayers = GetMaxPlayers();
-    if (!player->isGameMaster() && GetPlayersCountExceptGMs() >= maxPlayers)
-    {
-        DETAIL_LOG("MAP: Instance '%u' of map '%s' cannot have more than '%u' players. Player '%s' rejected", GetInstanceId(), GetMapName(), maxPlayers, player->GetName());
-        player->SendTransferAborted(GetId(), TRANSFER_ABORT_MAX_PLAYERS);
-        return false;
-    }
-
-    // cannot enter while an encounter in the instance is in progress
-    if (!player->isGameMaster() && GetInstanceData() && GetInstanceData()->IsEncounterInProgress() && player->GetMapId() != GetId())
-    {
-        player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
-        return false;
-    }
-
     return Map::CanEnter(player);
 }
 
@@ -1304,7 +1629,11 @@ bool DungeonMap::Add(Player *player)
                 GetPersistanceState()->GetMapId(), GetPersistanceState()->GetInstanceId(),
                 GetPersistanceState()->GetDifficulty(), GetPersistanceState()->GetPlayerCount(),
                 GetPersistanceState()->GetGroupCount(), GetPersistanceState()->CanReset());
-            MANGOS_ASSERT(false);
+            //MANGOS_ASSERT(false);
+            player->RemoveFromGroup();
+            player->RepopAtGraveyard();
+            player->GetSession()->KickPlayer();
+            return false;
         }
     }
     else
@@ -1313,10 +1642,10 @@ bool DungeonMap::Add(Player *player)
         if (pGroup)
         {
             // solo saves should be reset when entering a group
-            InstanceGroupBind *groupBind = pGroup->GetBoundInstance(this,GetDifficulty());
+            InstanceGroupBind* groupBind = pGroup->GetBoundInstance(this,GetDifficulty());
             if (playerBind)
             {
-                sLog.outError("DungeonMap::Add: %s is being put in instance %d,%d,%d,%d,%d,%d but he is in group (Id: %d) and is bound to instance %d,%d,%d,%d,%d,%d!",
+                DEBUG_LOG("DungeonMap::Add: %s enter to instance %d,%d,%d,%d,%d,%d but he is in group (Id: %d) and has non-permanent bind to instance %d,%d,%d,%d,%d,%d!",
                     player->GetGuidStr().c_str(), GetPersistentState()->GetMapId(), GetPersistentState()->GetInstanceId(),
                     GetPersistanceState()->GetDifficulty(), GetPersistanceState()->GetPlayerCount(), GetPersistanceState()->GetGroupCount(),
                     GetPersistanceState()->CanReset(), pGroup->GetId(),
@@ -1324,7 +1653,7 @@ bool DungeonMap::Add(Player *player)
                     playerBind->state->GetPlayerCount(), playerBind->state->GetGroupCount(), playerBind->state->CanReset());
 
                 if (groupBind)
-                    sLog.outError("DungeonMap::Add: the group (Id: %d) is bound to instance %d,%d,%d,%d,%d,%d",
+                    DEBUG_LOG("DungeonMap::Add: the group (Id: %d) is bound to instance %d,%d,%d,%d,%d,%d.",
                         pGroup->GetId(),
                         groupBind->state->GetMapId(), groupBind->state->GetInstanceId(), groupBind->state->GetDifficulty(),
                         groupBind->state->GetPlayerCount(), groupBind->state->GetGroupCount(), groupBind->state->CanReset());
@@ -1341,7 +1670,7 @@ bool DungeonMap::Add(Player *player)
                 // cannot jump to a different instance without resetting it
                 if (groupBind->state != GetPersistentState())
                 {
-                    sLog.outError("DungeonMap::Add: %s is being put in instance %d,%d,%d but he is in group (Id: %d) which is bound to instance %d,%d,%d!",
+                    DEBUG_LOG("DungeonMap::Add: %s is being put in instance %d,%d,%d but he is in group (Id: %d) which has non-permanent bind to instance %d,%d,%d!",
                         player->GetGuidStr().c_str(), GetPersistentState()->GetMapId(),
                         GetPersistentState()->GetInstanceId(), GetPersistentState()->GetDifficulty(),
                         pGroup->GetId(), groupBind->state->GetMapId(),
@@ -1354,16 +1683,22 @@ bool DungeonMap::Add(Player *player)
                         sLog.outError("GroupBind save players: %d, group count: %d", groupBind->state->GetPlayerCount(), groupBind->state->GetGroupCount());
                     else
                         sLog.outError("GroupBind save NULL");
-                    MANGOS_ASSERT(false);
+                    //MANGOS_ASSERT(false);
+                    player->RemoveFromGroup();
+                    player->RepopAtGraveyard();
+                    player->GetSession()->KickPlayer();
+                    return false;
                 }
                 // if the group/leader is permanently bound to the instance
                 // players also become permanently bound when they enter
-                if (groupBind->perm)
+                if (groupBind->perm && IsDungeon())
                 {
-                    WorldPacket data(SMSG_INSTANCE_SAVE_CREATED, 4);
-                    data << uint32(0);
+                    WorldPacket data(SMSG_PENDING_RAID_LOCK, 9);
+                    data << uint32(60000);
+                    data << groupBind->state->GetCompletedEncountersMask();
+                    data << uint8(0);
                     player->GetSession()->SendPacket(&data);
-                    player->BindToInstance(GetPersistanceState(), true);
+                    player->SetPendingBind(GetPersistanceState(), 60000);
                 }
             }
         }
@@ -1373,8 +1708,10 @@ bool DungeonMap::Add(Player *player)
             if(!playerBind)
                 player->BindToInstance(GetPersistanceState(), false);
             else
+            {
                 // cannot jump to a different instance without resetting it
                 MANGOS_ASSERT(playerBind->state == GetPersistentState());
+            }
         }
     }
 
@@ -1384,7 +1721,6 @@ bool DungeonMap::Add(Player *player)
 
     DETAIL_LOG("MAP: Player '%s' is entering instance '%u' of map '%s'", player->GetName(), GetInstanceId(), GetMapName());
     // initialize unload state
-    m_unloadTimer = 0;
     m_resetAfterUnload = false;
     m_unloadWhenEmpty = false;
 
@@ -1403,12 +1739,12 @@ void DungeonMap::Remove(Player *player, bool remove)
 {
     DETAIL_LOG("MAP: Removing player '%s' from instance '%u' of map '%s' before relocating to other map", player->GetName(), GetInstanceId(), GetMapName());
 
-    //if last player set unload timer
-    if(!m_unloadTimer && m_mapRefManager.getSize() == 1)
-        m_unloadTimer = m_unloadWhenEmpty ? MIN_UNLOAD_DELAY : std::max(sWorld.getConfig(CONFIG_UINT32_INSTANCE_UNLOAD_DELAY), (uint32)MIN_UNLOAD_DELAY);
-
     Map::Remove(player, remove);
 
+    // if last player and unload when empty - unload immediately
+    if (m_unloadWhenEmpty && !HavePlayers())
+        m_unloadTimer = MIN_UNLOAD_DELAY;
+
     // for normal instances schedule the reset after all players have left
     SetResetSchedule(true);
 }
@@ -1423,11 +1759,20 @@ bool DungeonMap::Reset(InstanceResetMethod method)
 
     if(HavePlayers())
     {
-        if(method == INSTANCE_RESET_ALL)
+        if (method == INSTANCE_RESET_ALL)
+        {
+            // notify the players to leave the instance so it can be reset
+            for(MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr)
+                itr->getSource()->SendResetFailedNotify(GetId());
+        }
+        else if (method == INSTANCE_RESET_CHANGE_DIFFICULTY)
         {
             // notify the players to leave the instance so it can be reset
             for(MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr)
                 itr->getSource()->SendResetFailedNotify(GetId());
+
+            m_unloadWhenEmpty = true;
+            m_resetAfterUnload = true;
         }
         else
         {
@@ -1454,7 +1799,7 @@ bool DungeonMap::Reset(InstanceResetMethod method)
     return m_mapRefManager.isEmpty();
 }
 
-void DungeonMap::PermBindAllPlayers(Player *player)
+void DungeonMap::PermBindAllPlayers(Player *player, bool permanent)
 {
     Group *group = player->GetGroup();
     // group members outside the instance group don't get bound
@@ -1466,15 +1811,16 @@ void DungeonMap::PermBindAllPlayers(Player *player)
         InstancePlayerBind *bind = plr->GetBoundInstance(GetId(), GetDifficulty());
         if (!bind || !bind->perm)
         {
-            plr->BindToInstance(GetPersistanceState(), true);
+            plr->BindToInstance(GetPersistanceState(), permanent);
             WorldPacket data(SMSG_INSTANCE_SAVE_CREATED, 4);
             data << uint32(0);
             plr->GetSession()->SendPacket(&data);
+            sCalendarMgr.SendCalendarRaidLockoutAdd(plr->GetObjectGuid(), GetPersistanceState());
         }
 
         // if the leader is not in the instance the group will not get a perm bind
         if (group && group->GetLeaderGuid() == plr->GetObjectGuid())
-            group->BindToInstance(GetPersistanceState(), true);
+            group->BindToInstance(GetPersistanceState(), permanent);
     }
 }
 
@@ -1491,7 +1837,10 @@ void DungeonMap::UnloadAll(bool pForce)
     }
 
     if(m_resetAfterUnload == true)
-        GetPersistanceState()->DeleteRespawnTimes();
+    {
+        if (DungeonPersistentState* state = GetPersistanceState())
+            state->DeleteRespawnTimes();
+    }
 
     Map::UnloadAll(pForce);
 }
@@ -1594,7 +1943,7 @@ void BattleGroundMap::UnloadAll(bool pForce)
     {
         if(Player * plr = m_mapRefManager.getFirst()->getSource())
         {
-            plr->TeleportTo(plr->GetBattleGroundEntryPoint());
+            plr->TeleportTo(plr->GetBattleGroundEntryPoint(), TELE_TO_NODELAY);
             // TeleportTo removes the player from this map (if the map exists) -> calls BattleGroundMap::Remove -> invalidates the iterator.
             // just in case, remove the player from the list explicitly here as well to prevent a possible infinite loop
             // note that this remove is not needed if the code works well in other places
@@ -1606,8 +1955,10 @@ void BattleGroundMap::UnloadAll(bool pForce)
 }
 
 /// Put scripts in the execution queue
-bool Map::ScriptsStart(ScriptMapMapName const& scripts, uint32 id, Object* source, Object* target)
+bool Map::ScriptsStart(ScriptMapMapName const& scripts, uint32 id, Object* source, Object* target, ScriptExecutionParam execParams /*=SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE_TARGET*/)
 {
+    MANGOS_ASSERT(source);
+
     ///- Find the script map
     ScriptMapMap::const_iterator s = scripts.second.find(id);
     if (s == scripts.second.end())
@@ -1618,15 +1969,29 @@ bool Map::ScriptsStart(ScriptMapMapName const& scripts, uint32 id, Object* sourc
     ObjectGuid targetGuid = target ? target->GetObjectGuid() : ObjectGuid();
     ObjectGuid ownerGuid  = source->isType(TYPEMASK_ITEM) ? ((Item*)source)->GetOwnerGuid() : ObjectGuid();
 
+    if (execParams)                                         // Check if the execution should be uniquely
+    {
+        ReadGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+        for (ScriptScheduleMap::const_iterator searchItr = m_scriptSchedule.begin(); searchItr != m_scriptSchedule.end(); ++searchItr)
+        {
+            if (searchItr->second.IsSameScript(scripts.first, id,
+                    execParams & SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE ? sourceGuid : ObjectGuid(),
+                    execParams & SCRIPT_EXEC_PARAM_UNIQUE_BY_TARGET ? targetGuid : ObjectGuid(), ownerGuid))
+            {
+                DEBUG_LOG("DB-SCRIPTS: Process table `%s` id %u. Skip script as script already started for source %s, target %s - ScriptsStartParams %u", scripts.first, id, sourceGuid.GetString().c_str(), targetGuid.GetString().c_str(), execParams);
+                return true;
+            }
+        }
+    }
+
     ///- Schedule script execution for all scripts in the script map
     ScriptMap const *s2 = &(s->second);
     for (ScriptMap::const_iterator iter = s2->begin(); iter != s2->end(); ++iter)
     {
         ScriptAction sa(scripts.first, this, sourceGuid, targetGuid, ownerGuid, &iter->second);
-
-        m_scriptSchedule.insert(ScriptScheduleMap::value_type(time_t(sWorld.GetGameTime() + iter->first), sa));
-
         sScriptMgr.IncreaseScheduledScriptsCount();
+        WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+        m_scriptSchedule.insert(ScriptScheduleMap::value_type(time_t(sWorld.GetGameTime() + iter->first), sa));
     }
 
     return true;
@@ -1642,30 +2007,105 @@ void Map::ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* sou
     ObjectGuid ownerGuid  = source->isType(TYPEMASK_ITEM) ? ((Item*)source)->GetOwnerGuid() : ObjectGuid();
 
     ScriptAction sa("Internal Activate Command used for spell", this, sourceGuid, targetGuid, ownerGuid, &script);
+    sScriptMgr.IncreaseScheduledScriptsCount();
 
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
     m_scriptSchedule.insert(ScriptScheduleMap::value_type(time_t(sWorld.GetGameTime() + delay), sa));
-
-    sScriptMgr.IncreaseScheduledScriptsCount();
 }
 
 /// Process queued scripts
 void Map::ScriptsProcess()
 {
-    if (m_scriptSchedule.empty())
-        return;
-
-    ///- Process overdue queued scripts
-    ScriptScheduleMap::iterator iter = m_scriptSchedule.begin();
     // ok as multimap is a *sorted* associative container
-    while (!m_scriptSchedule.empty() && (iter->first <= sWorld.GetGameTime()))
+    while (ScriptAction* action = GetNextSheduledScript())
     {
-        iter->second.HandleScriptStep();
+        if (action->HandleScriptStep())
+        {
+            // Terminate following script steps of this script
+            const char* tableName = action->GetTableName();
+            uint32 id = action->GetId();
+            ObjectGuid sourceGuid = action->GetSourceGuid();
+            ObjectGuid targetGuid = action->GetTargetGuid();
+            ObjectGuid ownerGuid = action->GetOwnerGuid();
+
+            for (ScriptScheduleMap::iterator rmItr = m_scriptSchedule.begin(); rmItr != m_scriptSchedule.end(); ++rmItr)
+            {
+                if (rmItr->second.IsSameScript(tableName, id, sourceGuid, targetGuid, ownerGuid))
+                {
+                    if (EraseScriptAction(&rmItr->second))
+                        rmItr = m_scriptSchedule.begin();
+                }
+            }
+        }
+        else
+            EraseScriptAction(action);
+    }
+}
 
-        m_scriptSchedule.erase(iter);
-        iter = m_scriptSchedule.begin();
+ScriptAction* Map::GetNextSheduledScript()
+{
+    ReadGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    if (m_scriptSchedule.empty())
+        return NULL;
+    ScriptScheduleMap::iterator iter = m_scriptSchedule.begin();
+    return (iter->first <= sWorld.GetGameTime()) ? &iter->second : NULL;
+}
 
-        sScriptMgr.DecreaseScheduledScriptCount();
+bool Map::EraseScriptAction(ScriptAction* action)
+{
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    if (m_scriptSchedule.empty())
+        return false;
+    for (ScriptScheduleMap::iterator itr = m_scriptSchedule.begin(); itr != m_scriptSchedule.end(); ++itr)
+    {
+        if (&itr->second == action)
+        {
+            m_scriptSchedule.erase(itr);
+            sScriptMgr.DecreaseScheduledScriptCount();
+            return true;
+        }
     }
+    return false;
+}
+
+/**
+ * Function inserts any object in MapObjectStore
+ *
+ * @param guid must be WorldObject*
+ */
+void Map::InsertObject(WorldObject* object)
+{
+    if (!object)
+        return;
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS));
+    m_objectsStore.insert(MapStoredObjectTypesContainer::value_type(object->GetObjectGuid(), object));
+}
+
+void Map::EraseObject(WorldObject* object)
+{
+    if (!object)
+        return;
+
+    EraseObject(object->GetObjectGuid());
+}
+
+void Map::EraseObject(ObjectGuid const& guid)
+{
+    if (guid.IsEmpty())
+        return;
+
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    m_objectsStore.erase(guid);
+}
+
+WorldObject* Map::FindObject(ObjectGuid const& guid)
+{
+    if (guid.IsEmpty())
+        return NULL;
+
+    ReadGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    MapStoredObjectTypesContainer::iterator itr = m_objectsStore.find(guid);
+    return (itr == m_objectsStore.end()) ? NULL : itr->second;
 }
 
 /**
@@ -1676,10 +2116,15 @@ void Map::ScriptsProcess()
  *
  * @param guid must be player guid (HIGHGUID_PLAYER)
  */
-Player* Map::GetPlayer(ObjectGuid guid)
+Player* Map::GetPlayer(ObjectGuid const& guid, bool globalSearch)
 {
-    Player* plr = ObjectAccessor::FindPlayer(guid);         // return only in world players
-    return plr && plr->GetMap() == this ? plr : NULL;
+    if (globalSearch)                                           // possible obsolete
+    {
+        Player* plr = ObjectAccessor::FindPlayer(guid);         // return only in world players
+        return plr && plr->GetMap() == this ? plr : NULL;
+    }
+    else
+        return (Player*)FindObject(guid);
 }
 
 /**
@@ -1687,9 +2132,9 @@ Player* Map::GetPlayer(ObjectGuid guid)
  *
  * @param guid must be creature or vehicle guid (HIGHGUID_UNIT HIGHGUID_VEHICLE)
  */
-Creature* Map::GetCreature(ObjectGuid guid)
+Creature* Map::GetCreature(ObjectGuid const& guid)
 {
-    return m_objectsStore.find<Creature>(guid, (Creature*)NULL);
+    return (Creature*)FindObject(guid);
 }
 
 /**
@@ -1697,9 +2142,9 @@ Creature* Map::GetCreature(ObjectGuid guid)
  *
  * @param guid must be pet guid (HIGHGUID_PET)
  */
-Pet* Map::GetPet(ObjectGuid guid)
+Pet* Map::GetPet(ObjectGuid const& guid)
 {
-    return m_objectsStore.find<Pet>(guid, (Pet*)NULL);
+    return (Pet*)FindObject(guid);
 }
 
 /**
@@ -1709,9 +2154,9 @@ Pet* Map::GetPet(ObjectGuid guid)
  *
  * @param guid must be corpse guid (HIGHGUID_CORPSE)
  */
-Corpse* Map::GetCorpse(ObjectGuid guid)
+Corpse* Map::GetCorpse(ObjectGuid const& guid)
 {
-    Corpse * ret = ObjectAccessor::GetCorpseInMap(guid,GetId());
+    Corpse * ret = ObjectAccessor::GetCorpseInMap(guid, GetId());
     return ret && ret->GetInstanceId() == GetInstanceId() ? ret : NULL;
 }
 
@@ -1720,16 +2165,17 @@ Corpse* Map::GetCorpse(ObjectGuid guid)
  *
  * @param guid must be non-player unit guid (HIGHGUID_PET HIGHGUID_UNIT HIGHGUID_VEHICLE)
  */
-Creature* Map::GetAnyTypeCreature(ObjectGuid guid)
+Creature* Map::GetAnyTypeCreature(ObjectGuid const& guid)
 {
-    switch(guid.GetHigh())
+    switch (guid.GetHigh())
     {
         case HIGHGUID_UNIT:
-        case HIGHGUID_VEHICLE:      return GetCreature(guid);
-        case HIGHGUID_PET:          return GetPet(guid);
-        default:                    break;
+        case HIGHGUID_VEHICLE:
+        case HIGHGUID_PET:
+            return (Creature*)FindObject(guid);
+        default:
+            break;
     }
-
     return NULL;
 }
 
@@ -1738,9 +2184,9 @@ Creature* Map::GetAnyTypeCreature(ObjectGuid guid)
  *
  * @param guid must be gameobject guid (HIGHGUID_GAMEOBJECT)
  */
-GameObject* Map::GetGameObject(ObjectGuid guid)
+GameObject* Map::GetGameObject(ObjectGuid const& guid)
 {
-    return m_objectsStore.find<GameObject>(guid, (GameObject*)NULL);
+    return (GameObject*)FindObject(guid);
 }
 
 /**
@@ -1748,9 +2194,19 @@ GameObject* Map::GetGameObject(ObjectGuid guid)
  *
  * @param guid must be dynamic object guid (HIGHGUID_DYNAMICOBJECT)
  */
-DynamicObject* Map::GetDynamicObject(ObjectGuid guid)
+DynamicObject* Map::GetDynamicObject(ObjectGuid const& guid)
+{
+    return (DynamicObject*)FindObject(guid);
+}
+
+/**
+ * Function return transport that in world at CURRENT map
+ *
+ * @param guid must be dynamic object guid (HIGHGUID_MO_TRANSPORT)
+ */
+Transport* Map::GetTransport(ObjectGuid const& guid)
 {
-    return m_objectsStore.find<DynamicObject>(guid, (DynamicObject*)NULL);
+    return (Transport*)FindObject(guid);
 }
 
 /**
@@ -1761,7 +2217,7 @@ DynamicObject* Map::GetDynamicObject(ObjectGuid guid)
  *
  * @param guid must be unit guid (HIGHGUID_PLAYER HIGHGUID_PET HIGHGUID_UNIT HIGHGUID_VEHICLE)
  */
-Unit* Map::GetUnit(ObjectGuid guid)
+Unit* Map::GetUnit(ObjectGuid const& guid)
 {
     if (guid.IsPlayer())
         return GetPlayer(guid);
@@ -1772,47 +2228,93 @@ Unit* Map::GetUnit(ObjectGuid guid)
 /**
  * Function return world object in world at CURRENT map, so any except transports
  */
-WorldObject* Map::GetWorldObject(ObjectGuid guid)
+WorldObject* Map::GetWorldObject(ObjectGuid const& guid)
 {
     switch(guid.GetHigh())
     {
-        case HIGHGUID_PLAYER:       return GetPlayer(guid);
-        case HIGHGUID_GAMEOBJECT:   return GetGameObject(guid);
+        case HIGHGUID_PLAYER:
+        case HIGHGUID_GAMEOBJECT:
         case HIGHGUID_UNIT:
-        case HIGHGUID_VEHICLE:      return GetCreature(guid);
-        case HIGHGUID_PET:          return GetPet(guid);
-        case HIGHGUID_DYNAMICOBJECT:return GetDynamicObject(guid);
+        case HIGHGUID_VEHICLE:
+        case HIGHGUID_PET:
+        case HIGHGUID_DYNAMICOBJECT:
+        case HIGHGUID_MO_TRANSPORT:
+        case HIGHGUID_TRANSPORT:
+            return FindObject(guid);
         case HIGHGUID_CORPSE:
         {
             // corpse special case, it can be not in world
             Corpse* corpse = GetCorpse(guid);
             return corpse && corpse->IsInWorld() ? corpse : NULL;
         }
-        case HIGHGUID_MO_TRANSPORT:
-        case HIGHGUID_TRANSPORT:
-        default:                    break;
+        default:
+            break;
     }
 
     return NULL;
 }
 
+void Map::AddUpdateObject(ObjectGuid const& guid)
+{
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    i_objectsToClientUpdate.insert(guid);
+}
+
+void Map::RemoveUpdateObject(ObjectGuid const& guid)
+{
+    i_objectsToClientUpdate.erase(guid);
+}
+
+ObjectGuid Map::GetNextObjectFromUpdateQueue()
+{
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS));
+    ObjectGuid guid = i_objectsToClientUpdate.empty() ? ObjectGuid::Null : *i_objectsToClientUpdate.begin();
+    i_objectsToClientUpdate.erase(guid);
+    return guid;
+}
+ 
 void Map::SendObjectUpdates()
 {
-    UpdateDataMapType update_players;
+    UpdateDataMapType update_players = UpdateDataMapType();
 
-    while(!i_objectsToClientUpdate.empty())
+    while (ObjectGuid guid = GetNextObjectFromUpdateQueue())
     {
-        Object* obj = *i_objectsToClientUpdate.begin();
-        i_objectsToClientUpdate.erase(i_objectsToClientUpdate.begin());
-        obj->BuildUpdateData(update_players);
+        WorldObject* obj = GetWorldObject(guid);
+        if (obj && obj->IsInWorld())
+        {
+            if (obj->IsMarkedForClientUpdate())
+                obj->BuildUpdateData(update_players);
+            if (obj->GetObjectsUpdateQueue() && !obj->GetObjectsUpdateQueue()->empty())
+            {
+                while (!obj->GetObjectsUpdateQueue()->empty())
+                {
+                    ObjectGuid dependentGuid = *obj->GetObjectsUpdateQueue()->begin();
+                    obj->RemoveUpdateObject(dependentGuid);
+                    Object* dependentObj = obj->GetDependentObject(dependentGuid);
+                    if (dependentObj && dependentObj->IsMarkedForClientUpdate())
+                        dependentObj->BuildUpdateData(update_players);
+                }
+            }
+        }
     }
 
-    WorldPacket packet;                                     // here we allocate a std::vector with a size of 0x10000
-    for(UpdateDataMapType::iterator iter = update_players.begin(); iter != update_players.end(); ++iter)
+    if (!update_players.empty())
     {
-        iter->second.BuildPacket(&packet);
-        iter->first->GetSession()->SendPacket(&packet);
-        packet.clear();                                     // clean the string
+        for (UpdateDataMapType::iterator iter = update_players.begin(); iter != update_players.end(); ++iter)
+        {
+            if (!iter->first || !iter->first.IsPlayer())
+                continue;
+
+            Player* pPlayer = GetPlayer(iter->first);
+            if (!pPlayer)
+                continue;
+
+            WorldPacket packet;
+
+            if (pPlayer->GetSession())
+                if (iter->second.BuildPacket(&packet))
+                    pPlayer->GetSession()->SendPacket(&packet);
+        }
     }
 }
 
@@ -1822,15 +2324,16 @@ uint32 Map::GenerateLocalLowGuid(HighGuid guidhigh)
     switch(guidhigh)
     {
         case HIGHGUID_UNIT:
+        case HIGHGUID_VEHICLE:
             return m_CreatureGuids.Generate();
         case HIGHGUID_GAMEOBJECT:
+        case HIGHGUID_MO_TRANSPORT:
+        case HIGHGUID_TRANSPORT:
             return m_GameObjectGuids.Generate();
         case HIGHGUID_DYNAMICOBJECT:
             return m_DynObjectGuids.Generate();
         case HIGHGUID_PET:
             return m_PetGuids.Generate();
-        case HIGHGUID_VEHICLE:
-            return m_VehicleGuids.Generate();
         default:
             MANGOS_ASSERT(false);
             return 0;
@@ -1844,7 +2347,7 @@ uint32 Map::GenerateLocalLowGuid(HighGuid guidhigh)
 class StaticMonsterChatBuilder
 {
     public:
-        StaticMonsterChatBuilder(CreatureInfo const* cInfo, ChatMsg msgtype, int32 textId, uint32 language, Unit* target, uint32 senderLowGuid = 0)
+        StaticMonsterChatBuilder(CreatureInfo const* cInfo, ChatMsg msgtype, int32 textId, Language language, Unit const* target, uint32 senderLowGuid = 0)
             : i_cInfo(cInfo), i_msgtype(msgtype), i_textId(textId), i_language(language), i_target(target)
         {
             // 0 lowguid not used in core, but accepted fine in this case by client
@@ -1857,7 +2360,8 @@ class StaticMonsterChatBuilder
             char const* nameForLocale = i_cInfo->Name;
             sObjectMgr.GetCreatureLocaleStrings(i_cInfo->Entry, loc_idx, &nameForLocale);
 
-            WorldObject::BuildMonsterChat(&data, i_senderGuid, i_msgtype, text, i_language, nameForLocale, i_target ? i_target->GetObjectGuid() : ObjectGuid(), i_target ? i_target->GetNameForLocaleIdx(loc_idx) : "");
+            ChatHandler::BuildChatPacket(data, i_msgtype, text, i_language, CHAT_TAG_NONE, i_senderGuid, nameForLocale, i_target ? i_target->GetObjectGuid() : ObjectGuid(),
+                i_target ? i_target->GetNameForLocaleIdx(loc_idx) : "");
         }
 
     private:
@@ -1865,8 +2369,8 @@ class StaticMonsterChatBuilder
         CreatureInfo const* i_cInfo;
         ChatMsg i_msgtype;
         int32 i_textId;
-        uint32 i_language;
-        Unit* i_target;
+        Language i_language;
+        Unit const* i_target;
 };
 
 
@@ -1878,7 +2382,7 @@ class StaticMonsterChatBuilder
  * @param language language of the text
  * @param target, can be NULL
  */
-void Map::MonsterYellToMap(ObjectGuid guid, int32 textId, uint32 language, Unit* target)
+void Map::MonsterYellToMap(ObjectGuid guid, int32 textId, Language language, Unit const* target) const
 {
     if (guid.IsAnyTypeCreature())
     {
@@ -1909,7 +2413,7 @@ void Map::MonsterYellToMap(ObjectGuid guid, int32 textId, uint32 language, Unit*
  * @param senderLowGuid provide way proper show yell for near spawned creature with known lowguid,
  *        0 accepted by client else if this not important
  */
-void Map::MonsterYellToMap(CreatureInfo const* cinfo, int32 textId, uint32 language, Unit* target, uint32 senderLowGuid /*= 0*/)
+void Map::MonsterYellToMap(CreatureInfo const* cinfo, int32 textId, Language language, Unit const* target, uint32 senderLowGuid /*= 0*/) const
 {
     StaticMonsterChatBuilder say_build(cinfo, CHAT_MSG_MONSTER_YELL, textId, language, target, senderLowGuid);
     MaNGOS::LocalizedPacketDo<StaticMonsterChatBuilder> say_do(say_build);
@@ -1925,7 +2429,7 @@ void Map::MonsterYellToMap(CreatureInfo const* cinfo, int32 textId, uint32 langu
  * @param soundId Played Sound
  * @param zoneId Id of the Zone to which the sound should be restricted
  */
-void Map::PlayDirectSoundToMap(uint32 soundId, uint32 zoneId /*=0*/)
+void Map::PlayDirectSoundToMap(uint32 soundId, uint32 zoneId /*=0*/) const
 {
     WorldPacket data(SMSG_PLAY_SOUND, 4);
     data << uint32(soundId);
@@ -1935,3 +2439,497 @@ void Map::PlayDirectSoundToMap(uint32 soundId, uint32 zoneId /*=0*/)
         if (!zoneId || itr->getSource()->GetZoneId() == zoneId)
             itr->getSource()->SendDirectMessage(&data);
 }
+
+/**
+* Function to change weather in zone and change weather on map from script. 
+*
+* need base support (With Values 0)
+*/
+
+void Map::SetMapWeather(WeatherState state, float grade)
+{
+    //Weather is OFF
+    if (!sWorld.getConfig(CONFIG_BOOL_WEATHER))
+        return;
+
+    if (grade < 0.0f || grade > 1.0f)
+        return;
+
+    if (!IsDungeon())
+        return;
+
+    WorldPacket data(SMSG_WEATHER, (4+4+4));
+    data << uint32(state) << (float)grade << uint8(0);
+
+    ((DungeonMap*)this)->SendToPlayers(&data);
+}
+
+bool Map::SetZoneWeather(uint32 zoneId, WeatherType type, float grade)
+{
+    //Weather is OFF
+    if (!sWorld.getConfig(CONFIG_BOOL_WEATHER))
+        return false;
+
+    if (grade < 0.0f || grade > 1.0f || MAX_WEATHER_TYPE <= type)
+        return false;
+
+    Weather* weather = sWorld.FindWeather(zoneId);
+
+    if (!weather)
+        weather = sWorld.AddWeather(zoneId);
+
+    if (!weather)
+        return false;
+
+    weather->SetWeather(type, grade);
+
+    return true;
+}
+
+void Map::UpdateWorldState(uint32 state, uint32 value)
+{
+    sWorldStateMgr.SetWorldStateValueFor(this, state, value);
+}
+
+/**
+ * Function to operations with attackers per-map storage
+ *
+ * @param targetGuid (attackerGuid)
+ */
+
+void Map::AddAttackerFor(ObjectGuid const& targetGuid, ObjectGuid const& attackerGuid)
+{
+    if (targetGuid.IsEmpty() || attackerGuid.IsEmpty())
+        return;
+
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    AttackersMap::iterator itr = m_attackersMap.find(targetGuid);
+    if (itr != m_attackersMap.end())
+    {
+        itr->second.insert(attackerGuid);
+    }
+    else
+    {
+        CreateAttackersStorageFor(targetGuid);
+        m_attackersMap[targetGuid].insert(attackerGuid);
+    }
+}
+
+void Map::RemoveAttackerFor(ObjectGuid const& targetGuid, ObjectGuid const& attackerGuid)
+{
+    if (targetGuid.IsEmpty() || attackerGuid.IsEmpty())
+        return;
+
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    AttackersMap::iterator itr = m_attackersMap.find(targetGuid);
+    if (itr != m_attackersMap.end())
+    {
+        itr->second.erase(attackerGuid);
+    }
+}
+
+void Map::RemoveAllAttackersFor(ObjectGuid const& targetGuid)
+{
+    if (targetGuid.IsEmpty())
+        return;
+
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    AttackersMap::iterator itr = m_attackersMap.find(targetGuid);
+    if (itr != m_attackersMap.end())
+    {
+        itr->second.clear();
+    }
+}
+
+GuidSet& Map::GetAttackersFor(ObjectGuid const& targetGuid)
+{
+    ReadGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    return m_attackersMap[targetGuid];
+}
+
+bool Map::IsInCombat(ObjectGuid const& targetGuid) const
+{
+    ReadGuard Guard(const_cast<Map*>(this)->GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    AttackersMap::const_iterator itr = m_attackersMap.find(targetGuid);
+    if (itr == m_attackersMap.end())
+        return false;
+
+    return !itr->second.empty();
+}
+
+void Map::CreateAttackersStorageFor(ObjectGuid const& targetGuid)
+{
+    if (targetGuid.IsEmpty())
+        return;
+
+    AttackersMap::iterator itr = m_attackersMap.find(targetGuid);
+    if (itr == m_attackersMap.end())
+    {
+        m_attackersMap.insert(std::make_pair(targetGuid,GuidSet()));
+    }
+
+}
+
+void Map::RemoveAttackersStorageFor(ObjectGuid const& targetGuid)
+{
+    if (targetGuid.IsEmpty())
+        return;
+
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    AttackersMap::iterator itr = m_attackersMap.find(targetGuid);
+    if (itr != m_attackersMap.end())
+    {
+        m_attackersMap.erase(itr);
+    }
+}
+
+void Map::ForcedUnload()
+{
+    sLog.outError("Map::ForcedUnload called for map %u instance %u. Map crushed. Cleaning up...", GetId(), GetInstanceId());
+
+    // Immediately cleanup update queue
+    i_objectsToClientUpdate.clear();
+
+    Map::PlayerList const pList = GetPlayers();
+    for (PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
+    {
+        Player* player = itr->getSource();
+        if (!player || !player->GetSession())
+            continue;
+
+        if (player->IsBeingTeleportedFar())
+        {
+            WorldLocation old_loc = player->GetPosition();
+            if (!player->TeleportTo(old_loc, TELE_TO_NODELAY))
+            {
+                DETAIL_LOG("Map::ForcedUnload: %s is in teleport state, cannot be ported to his previous place, teleporting him to his homebind place...",
+                    player->GetGuidStr().c_str());
+                player->TeleportToHomebind();
+            }
+            player->SetSemaphoreTeleportFar(false);
+        }
+
+        switch (sWorld.getConfig(CONFIG_UINT32_VMSS_MAPFREEMETHOD))
+        {
+            case 0:
+            {
+                player->RemoveAllAurasOnDeath();
+                if (Pet* pet = player->GetPet())
+                    pet->RemoveAllAurasOnDeath();
+                player->GetSession()->LogoutPlayer(true);
+                break;
+            }
+            case 1:
+            {
+                player->GetSession()->KickPlayer();
+                Remove(player, true);
+                break;
+            }
+            case 2:
+            {
+                player->GetSession()->LogoutPlayer(false);
+                Remove(player, true);
+                break;
+            }
+            default:
+                break;
+        }
+    }
+
+    switch (sWorld.getConfig(CONFIG_UINT32_VMSS_MAPFREEMETHOD))
+    {
+        case 0:
+            if (InstanceData* iData = GetInstanceData())
+                iData->Save();
+            break;
+        case 1:
+        case 2:
+        default:
+            break;
+    }
+
+    UnloadAll(true);
+
+    RemoveAllObjectsInRemoveList();
+
+    SetBroken(false);
+}
+
+float Map::GetVisibilityDistance(WorldObject const* obj) const 
+{
+    if (obj && obj->GetTypeId() == TYPEID_GAMEOBJECT)
+        return (m_VisibleDistance + ((GameObject const*)obj)->GetDeterminativeSize());
+    else
+        return m_VisibleDistance; 
+}
+
+bool Map::IsInLineOfSight(float srcX, float srcY, float srcZ, float destX, float destY, float destZ, uint32 phasemask) const
+{
+    return VMAP::VMapFactory::createOrGetVMapManager()->isInLineOfSight(GetId(), srcX, srcY, srcZ, destX, destY, destZ)
+        && IsInLineOfSightByDynamicMapTree(srcX, srcY, srcZ, destX, destY, destZ, phasemask);
+}
+
+/**
+test if we hit an object. return true if we hit one. the dest position will hold the orginal dest position or the possible hit position
+return true if we hit something
+*/
+// return HitPosition in dest point
+bool Map::GetHitPosition(float srcX, float srcY, float srcZ, float& destX, float& destY, float& destZ, uint32 phasemask, float modifyDist) const
+{
+    // at first check all static objects
+    float tempX, tempY, tempZ = 0.0f;
+    bool result0 = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(GetId(), srcX, srcY, srcZ, destX, destY, destZ, tempX, tempY, tempZ, modifyDist);
+    if (result0)
+    {
+        DEBUG_LOG("Map::GetHitPosition vmaps corrects gained with static objects! new dest coords are X:%f Y:%f Z:%f",destX, destY, destZ);
+        destX = tempX;
+        destY = tempY;
+        destZ = tempZ;
+    }
+    // at second all dynamic objects, if static check has an hit, then we can calculate only to this point and NOT to end, because we need closely hit point
+    ReadGuard Guard(const_cast<Map*>(this)->GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    bool result1 = GetDynamicMapTree().getObjectHitPos(phasemask, srcX, srcY, srcZ, destX, destY, destZ, tempX, tempY, tempZ, modifyDist);
+    if (result1)
+    {
+        DEBUG_LOG("Map::GetHitPosition vmaps corrects gained with dynamic objects! new dest coords are X:%f Y:%f Z:%f",destX, destY, destZ);
+        destX = tempX;
+        destY = tempY;
+        destZ = tempZ;
+    }
+    return result0 || result1;
+}
+
+float Map::GetHeight(uint32 phasemask, float x, float y, float z) const
+{
+    float staticHeight = GetTerrain()->GetHeightStatic(x, y, z);
+
+    // Get Dynamic Height around static Height (if valid)
+    float dynSearchHeight = 2.0f + (z < staticHeight ? staticHeight : z);
+    ReadGuard Guard(const_cast<Map*>(this)->GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    return std::max<float>(staticHeight, GetDynamicMapTree().getHeight(x, y, dynSearchHeight, dynSearchHeight - staticHeight, phasemask));
+}
+
+void Map::InsertGameObjectModel(GameObjectModel const& mdl)
+{
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    m_dyn_tree.insert(mdl);
+}
+
+void Map::RemoveGameObjectModel(GameObjectModel const& mdl)
+{
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    m_dyn_tree.remove(mdl);
+}
+
+bool Map::ContainsGameObjectModel(GameObjectModel const& mdl) const
+{
+    ReadGuard Guard(const_cast<Map*>(this)->GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    return GetDynamicMapTree().contains(mdl);
+}
+
+void Map::DynamicMapTreeBalance()
+{
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    m_dyn_tree.balance();
+}
+
+void Map::DynamicMapTreeUpdate(uint32 const& t_diff)
+{
+    WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    m_dyn_tree.update(t_diff);
+}
+
+bool Map::IsInLineOfSightByDynamicMapTree(float srcX, float srcY, float srcZ, float destX, float destY, float destZ, uint32 phasemask) const
+{
+    ReadGuard Guard(const_cast<Map*>(this)->GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    return GetDynamicMapTree().isInLineOfSight(srcX, srcY, srcZ, destX, destY, destZ, phasemask);
+}
+
+DynamicMapTree const& Map::GetDynamicMapTree() const
+{
+   // Don't need lock here! use locks around this usage.
+   return m_dyn_tree;
+}
+
+template<class T> void Map::LoadObjectToGrid(uint32& guid, GridType& grid, BattleGround* bg)
+{
+    T* obj = new T;
+    if(!obj->LoadFromDB(guid, this))
+    {
+        delete obj;
+        return;
+    }
+
+    {
+        WriteGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+        grid.AddGridObject(obj);
+    }
+    setUnitCell(obj);
+
+    obj->SetMap(this);
+    obj->AddToWorld();
+    if (obj->isActiveObject())
+        AddToActive(obj);
+
+    obj->GetViewPoint().Event_AddedToWorld(&grid);
+
+    if (bg)
+        bg->OnObjectDBLoad(obj);
+
+    obj->UpdateObjectVisibility();
+}
+
+WorldObjectEventProcessor* Map::GetEvents()
+{
+    return &m_Events;
+}
+
+void Map::KillAllEvents(bool force)
+{
+    GetEvents()->KillAllEvents(force);
+}
+
+void Map::AddEvent(BasicEvent* Event, uint64 e_time, bool set_addtime)
+{
+    if (set_addtime)
+        GetEvents()->AddEvent(Event, GetEvents()->CalculateTime(e_time), set_addtime);
+    else
+        GetEvents()->AddEvent(Event, e_time, set_addtime);
+}
+
+void Map::UpdateEvents(uint32 update_diff)
+{
+    GetEvents()->RenewEvents();
+    GetEvents()->Update(update_diff);
+}
+
+bool Map::IsVisibleGlobally(ObjectGuid const& guid)
+{
+    if (guid.IsMOTransport())
+    {
+        return bool(FindObject(guid));
+    }
+    return false;
+}
+
+void Map::SendRemoveNotifyToStoredClients(WorldObject* object, bool destroy)
+{
+    if (!object || !object->HasNotifiedClients())
+        return;
+
+    WorldPacket out_packet(SMSG_DESTROY_OBJECT, 9);
+    if (destroy)
+    {
+        out_packet << object->GetObjectGuid();
+        out_packet << uint8(0);
+    }
+    else
+    // Packet type rewrited to SMSG_UPDATE_OBJECT here
+    {
+        UpdateData data;
+        object->BuildOutOfRangeUpdateBlock(&data);
+        data.BuildPacket(&out_packet);
+    }
+
+    uint32 count = 0;
+
+    for (GuidSet::const_iterator itr = object->GetNotifiedClients().begin(); itr != object->GetNotifiedClients().end(); ++itr)
+    {
+        if (Player* player = GetPlayer(*itr))
+        {
+            if (player->IsInWorld() && !player->HaveAtClient(object->GetObjectGuid()))
+            {
+                player->SendDirectMessage(&out_packet);
+                ++count;
+            }
+        }
+    }
+
+    DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "Map::SendRemoveNotifyToStoredClients %s send visibility notify to %u clients (%u really)",
+        object->GetObjectGuid().GetString().c_str(), object->GetNotifiedClients().size(), count);
+
+    object->GetNotifiedClients().clear();
+}
+
+bool Map::UpdateGridState(NGridType& grid, GridInfo& info, uint32 const& t_diff)
+{
+
+    ACE_GUARD_RETURN(ObjectLockType, Guard, GetLock(MAP_LOCK_TYPE_MAPOBJECTS), false);
+
+    switch (grid.GetGridState())
+    {
+        case GRID_STATE_ACTIVE:
+        {
+            // Only check grid activity every (grid_expiry/10) ms, because it's really useless to do it every cycle
+            info.UpdateTimeTracker(t_diff);
+            if (info.getTimeTracker().Passed())
+            {
+                Guard.release();
+                if (grid.ActiveObjectsInGrid() == 0 && !ActiveObjectsNearGrid(grid.getX(), grid.getY()))
+                {
+                    ObjectGridStoper stoper(grid);
+                    stoper.StopN();
+                    grid.SetGridState(GRID_STATE_IDLE);
+                    DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING,"Map::UpdateGridState grid[%u,%u] on map %u instance %u moved to IDLE state", grid.getX(), grid.getY(), GetId(), GetInstanceId());
+                    ResetGridExpiry(grid, 0.1f);
+                }
+                else
+                {
+                    ResetGridExpiry(grid, 0.2f);
+                }
+            }
+            break;
+        }
+        case GRID_STATE_IDLE:
+        {
+            // Only check grid activity very (grid_expiry/10) ms, because it's really useless to do it every cycle
+            info.UpdateTimeTracker(t_diff);
+            if (info.getTimeTracker().Passed())
+            {
+                ResetGridExpiry(grid, 0.8f);
+                grid.SetGridState(GRID_STATE_REMOVAL);
+                DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING,"Map::UpdateGridState grid[%u,%u] on map %u instance %u moved to REMOVAL state", grid.getX(), grid.getY(), GetId(), GetInstanceId());
+            }
+            break;
+        }
+        case GRID_STATE_REMOVAL:
+        {
+            if (!info.getUnloadLock())
+            {
+                info.UpdateTimeTracker(t_diff);
+                if (info.getTimeTracker().Passed())
+                {
+                    Guard.release();
+                    if (!UnloadGrid(grid, false))
+                    {
+                        DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING,"Map::UpdateGridState grid[%u,%u] for map %u instance %u differed unloading due to players or active objects nearby", grid.getX(), grid.getY(), GetId(), GetInstanceId());
+                        ResetGridExpiry(grid);
+                    }
+                }
+            }
+            break;
+        }
+        case GRID_STATE_INVALID:
+        case MAX_GRID_STATE:
+        default:
+        {
+            sLog.outError("Map::UpdateGridState trying set invalid state (%u) to grid[%u,%u] on map %u instance %u", grid.GetGridState(), grid.getX(), grid.getY(), GetId(), GetInstanceId());
+            return false;
+        }
+    }
+    return true;
+}
+
+GuidQueue Map::GetActiveObjects()
+{
+    ReadGuard Guard(GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
+    GuidQueue result;
+    for (GuidSet::const_iterator itr = m_activeObjects.begin(); itr != m_activeObjects.end(); ++itr)
+        result.push(*itr);
+    return result;
+}
+
+time_t Map::GetGridExpiry() const
+{
+    return sWorld.getConfig(CONFIG_UINT32_INTERVAL_GRIDCLEAN);
+}
diff --git a/src/game/Map.h b/src/game/Map.h
index a3111ee5835..06717e0ae09 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -22,13 +22,12 @@
 #include "Common.h"
 #include "Platform/Define.h"
 #include "Policies/ThreadingModel.h"
-#include "ace/RW_Thread_Mutex.h"
-#include "ace/Thread_Mutex.h"
 
 #include "DBCStructure.h"
 #include "GridDefines.h"
 #include "Cell.h"
 #include "Object.h"
+#include "ObjectGuid.h"
 #include "Timer.h"
 #include "SharedDefines.h"
 #include "GridMap.h"
@@ -36,10 +35,16 @@
 #include "MapRefManager.h"
 #include "Utilities/TypeList.h"
 #include "ScriptMgr.h"
+#include "Weather.h"
 #include "CreatureLinkingMgr.h"
+#include "ObjectLock.h"
+#include "ObjectHandler.h"
+#include "vmap/DynamicTree.h"
+#include "WorldObjectEvents.h"
 
 #include <bitset>
 #include <list>
+#include <set>
 
 struct CreatureInfo;
 class Creature;
@@ -47,6 +52,7 @@ class Unit;
 class WorldPacket;
 class InstanceData;
 class Group;
+class Transport;
 class MapPersistentState;
 class WorldPersistentState;
 class DungeonPersistentState;
@@ -54,6 +60,8 @@ class BattleGroundPersistentState;
 struct ScriptInfo;
 class BattleGround;
 class GridMap;
+class GameObjectModel;
+class TerrainInfo;
 
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
@@ -91,6 +99,89 @@ enum LevelRequirementVsMode
 
 #define MIN_UNLOAD_DELAY      1                             // immediate unload
 
+struct MANGOS_DLL_DECL MapID
+{
+    explicit MapID(uint32 id) : nMapId(id), nInstanceId(0) {}
+    MapID(uint32 id, uint32 instid) : nMapId(id), nInstanceId(instid) {}
+
+    bool operator<(const MapID& val) const
+    {
+        if (nMapId == val.nMapId)
+            return nInstanceId < val.nInstanceId;
+
+        if (IsContinent() && !val.IsContinent())
+            return true;
+        else if (!IsContinent() && val.IsContinent())
+            return false;
+
+        return nMapId < val.nMapId;
+    }
+
+    bool operator==(const MapID& val) const { return nMapId == val.nMapId && nInstanceId == val.nInstanceId; }
+
+    bool IsContinent() const
+    {
+        return nMapId == 0 || nMapId == 1 || nMapId == 530 || nMapId == 571;
+    };
+
+    uint32 const& GetId() const { return nMapId; };
+    uint32 const& GetInstanceId() const { return nInstanceId; };
+
+    uint32 nMapId;
+    uint32 nInstanceId;
+};
+
+HASH_NAMESPACE_START
+template<> class hash <MapID>
+{
+    public: size_t operator()(const MapID& __x) const { return (size_t)((__x.GetId() << 16) | (__x.GetInstanceId())); }
+};
+HASH_NAMESPACE_END
+
+typedef UNORDERED_SET<MapID> MapIDSet;
+
+struct MANGOS_DLL_DECL ZoneID : public MapID
+{
+    explicit ZoneID(uint32 mapId, uint32 zoneId) : MapID(mapId), nZoneId(zoneId) {}
+    ZoneID(uint32 mapId, uint32 instid, uint32 zoneId) : MapID(mapId, instid), nZoneId(zoneId) {}
+    bool operator == (const ZoneID& val) const { return GetId() == val.GetId() && GetInstanceId() == val.GetInstanceId() && GetZoneId() == val.GetZoneId(); }
+    uint32 const& GetZoneId() const { return nZoneId; };
+    uint32 nZoneId;
+};
+
+HASH_NAMESPACE_START
+template<> class hash <ZoneID>
+{
+    public: size_t operator()(const ZoneID& __x) const { return (size_t)((__x.GetId() << 24) | (__x.GetInstanceId() << 16) | (__x.GetZoneId())) ; }
+};
+HASH_NAMESPACE_END
+
+typedef UNORDERED_MAP<ObjectGuid,GuidSet>  AttackersMap;
+
+struct LoadingObjectQueueMember
+{
+    explicit LoadingObjectQueueMember(uint32 _guid, TypeID _objectTypeID, GridType& _grid) :
+        guid(_guid), objectTypeID(_objectTypeID), grid(_grid)
+    {}
+    uint32 guid;
+    TypeID objectTypeID;
+    GridType& grid;
+};
+
+class LoadingObjectsCompare
+{
+    public:
+        LoadingObjectsCompare()
+        {}
+
+        bool operator() (LoadingObjectQueueMember const* lqm, LoadingObjectQueueMember const* rqm) const
+        {
+            return lqm->objectTypeID < rqm->objectTypeID;
+        };
+};
+
+typedef std::priority_queue<LoadingObjectQueueMember*, std::vector<LoadingObjectQueueMember*>, LoadingObjectsCompare> LoadingObjectsQueue;
+
 class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
 {
     friend class MapReference;
@@ -106,8 +197,10 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
         // currently unused for normal maps
         bool CanUnload(uint32 diff)
         {
-            if(!m_unloadTimer) return false;
-            if(m_unloadTimer <= diff) return true;
+            if(!m_unloadTimer)
+                return false;
+            if(m_unloadTimer <= diff)
+                return true;
             m_unloadTimer -= diff;
             return false;
         }
@@ -117,28 +210,33 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
         template<class T> void Add(T *);
         template<class T> void Remove(T *, bool);
 
-        static void DeleteFromWorld(Player* player);        // player object will deleted at call
+        void DeleteFromWorld(Player* player);                   // player object will deleted at call
 
         virtual void Update(const uint32&);
 
-        void MessageBroadcast(Player *, WorldPacket *, bool to_self);
-        void MessageBroadcast(WorldObject *, WorldPacket *);
-        void MessageDistBroadcast(Player *, WorldPacket *, float dist, bool to_self, bool own_team_only = false);
-        void MessageDistBroadcast(WorldObject *, WorldPacket *, float dist);
+        void MessageBroadcast(Player const*, WorldPacket*, bool to_self);
+        void MessageBroadcast(WorldObject const*, WorldPacket*);
+        void MessageDistBroadcast(Player const*, WorldPacket*, float dist, bool to_self, bool own_team_only = false);
+        void MessageDistBroadcast(WorldObject const*, WorldPacket*, float dist);
 
-        float GetVisibilityDistance() const { return m_VisibleDistance; }
+        float GetVisibilityDistance(WorldObject const* obj = NULL) const;
         //function for setting up visibility distance for maps on per-type/per-Id basis
         virtual void InitVisibilityDistance();
 
-        void PlayerRelocation(Player *, float x, float y, float z, float angl);
-        void CreatureRelocation(Creature *creature, float x, float y, float z, float orientation);
+        // Half-hack method for use with visible-over-grid active objects (like big WB and MOTransport)
+        bool IsVisibleGlobally(ObjectGuid const& guid);
+
+        template<class T> void Relocation(T* object, Position const& pos);
+
+        // FIXME - remove this wrapper after SD2 correct
+        void CreatureRelocation(Creature* object, float x, float y, float z, float orientation);
 
         template<class T, class CONTAINER> void Visit(const Cell& cell, TypeContainerVisitor<T, CONTAINER> &visitor);
 
         bool IsRemovalGrid(float x, float y) const
         {
             GridPair p = MaNGOS::ComputeGridPair(x, y);
-            return( !getNGrid(p.x_coord, p.y_coord) || getNGrid(p.x_coord, p.y_coord)->GetGridState() == GRID_STATE_REMOVAL );
+            return (!getNGrid(p.x_coord, p.y_coord) || getNGrid(p.x_coord, p.y_coord)->GetGridState() == GRID_STATE_REMOVAL);
         }
 
         bool IsLoaded(float x, float y) const
@@ -146,19 +244,24 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
             GridPair p = MaNGOS::ComputeGridPair(x, y);
             return loaded(p);
         }
+        bool PreloadGrid(float x, float y);
+        void ActivateGrid(WorldLocation const& loc);
+        void ActivateGrid(NGridType* nGrid);
 
         bool GetUnloadLock(const GridPair &p) const { return getNGrid(p.x_coord, p.y_coord)->getUnloadLock(); }
         void SetUnloadLock(const GridPair &p, bool on) { getNGrid(p.x_coord, p.y_coord)->setUnloadExplicitLock(on); }
         void LoadGrid(const Cell& cell, bool no_unload = false);
-        bool UnloadGrid(const uint32 &x, const uint32 &y, bool pForce);
+        bool UnloadGrid(NGridType& grid, bool pForce);
+        bool UpdateGridState(NGridType& grid, GridInfo& gridInfo, uint32 const& t_diff);
+
         virtual void UnloadAll(bool pForce);
 
-        void ResetGridExpiry(NGridType &grid, float factor = 1) const
+        void ResetGridExpiry(NGridType& grid, float factor = 1.0f) const
         {
-            grid.ResetTimeTracker((time_t)((float)i_gridExpiry*factor));
+            grid.ResetTimeTracker((time_t)((float)GetGridExpiry() * factor));
         }
 
-        time_t GetGridExpiry(void) const { return i_gridExpiry; }
+        time_t GetGridExpiry() const;
         uint32 GetId(void) const { return i_id; }
 
         // some calls like isInWater should not use vmaps due to processor power
@@ -183,7 +286,7 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
         bool IsRegularDifficulty() const { return GetDifficulty() == REGULAR_DIFFICULTY; }
         uint32 GetMaxPlayers() const;                       // dependent from map difficulty
         uint32 GetMaxResetDelay() const;                    // dependent from map difficulty
-        MapDifficulty const* GetMapDifficulty() const;      // dependent from map difficulty
+        MapDifficultyEntry const* GetMapDifficulty() const; // dependent from map difficulty
 
         bool Instanceable() const { return i_mapEntry && i_mapEntry->Instanceable(); }
         // NOTE: this duplicate of Instanceable(), but Instanceable() can be changed when BG also will be instanceable
@@ -193,11 +296,13 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
         bool IsBattleGround() const { return i_mapEntry && i_mapEntry->IsBattleGround(); }
         bool IsBattleArena() const { return i_mapEntry && i_mapEntry->IsBattleArena(); }
         bool IsBattleGroundOrArena() const { return i_mapEntry && i_mapEntry->IsBattleGroundOrArena(); }
+        bool IsContinent() const { return i_mapEntry && i_mapEntry->IsContinent(); }
 
         // can't be NULL for loaded map
-        MapPersistentState* GetPersistentState() const { return m_persistentState; }
+        MapPersistentState* GetPersistentState() const;
 
-        void AddObjectToRemoveList(WorldObject *obj);
+        void AddObjectToRemoveList(WorldObject *obj, bool immediateCleanup = false);
+        void RemoveObjectFromRemoveList(WorldObject* obj);
 
         void UpdateObjectVisibility(WorldObject* obj, Cell cell, CellPair cellpair);
 
@@ -206,6 +311,7 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
         void markCell(uint32 pCellId) { marked_cells.set(pCellId); }
 
         bool HavePlayers() const { return !m_mapRefManager.isEmpty(); }
+        bool isFull() const { return GetPlayersCountExceptGMs() >= GetMaxPlayers(); }
         uint32 GetPlayersCountExceptGMs() const;
         bool ActiveObjectsNearGrid(uint32 x,uint32 y) const;
 
@@ -214,72 +320,132 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
         typedef MapRefManager PlayerList;
         PlayerList const& GetPlayers() const { return m_mapRefManager; }
 
-        //per-map script storage
-        bool ScriptsStart(ScriptMapMapName const& scripts, uint32 id, Object* source, Object* target);
+        // per-map script storage
+        enum ScriptExecutionParam
+        {
+            SCRIPT_EXEC_PARAM_NONE                    = 0x00,   // Start regardless if already started
+            SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE        = 0x01,   // Start Script only if not yet started (uniqueness identified by id and source)
+            SCRIPT_EXEC_PARAM_UNIQUE_BY_TARGET        = 0x02,   // Start Script only if not yet started (uniqueness identified by id and target)
+            SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE_TARGET = 0x03,   // Start Script only if not yet started (uniqueness identified by id, source and target)
+        };
+        bool ScriptsStart(ScriptMapMapName const& scripts, uint32 id, Object* source, Object* target, ScriptExecutionParam execParams = SCRIPT_EXEC_PARAM_NONE);
         void ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* source, Object* target);
+        ScriptAction* GetNextSheduledScript();
+        bool EraseScriptAction(ScriptAction* action);
 
         // must called with AddToWorld
         void AddToActive(WorldObject* obj);
         // must called with RemoveFromWorld
         void RemoveFromActive(WorldObject* obj);
-
-        Player* GetPlayer(ObjectGuid guid);
-        Creature* GetCreature(ObjectGuid guid);
-        Pet* GetPet(ObjectGuid guid);
-        Creature* GetAnyTypeCreature(ObjectGuid guid);      // normal creature or pet or vehicle
-        GameObject* GetGameObject(ObjectGuid guid);
-        DynamicObject* GetDynamicObject(ObjectGuid guid);
-        Corpse* GetCorpse(ObjectGuid guid);                 // !!! find corpse can be not in world
-        Unit* GetUnit(ObjectGuid guid);                     // only use if sure that need objects at current map, specially for player case
-        WorldObject* GetWorldObject(ObjectGuid guid);       // only use if sure that need objects at current map, specially for player case
-
-        typedef TypeUnorderedMapContainer<AllMapStoredObjectTypes, ObjectGuid> MapStoredObjectTypesContainer;
-        MapStoredObjectTypesContainer& GetObjectsStore() { return m_objectsStore; }
-
-        void AddUpdateObject(Object *obj)
-        {
-            i_objectsToClientUpdate.insert(obj);
-        }
-
-        void RemoveUpdateObject(Object *obj)
-        {
-            i_objectsToClientUpdate.erase( obj );
-        }
+        GuidQueue GetActiveObjects();
+
+        Player* GetPlayer(ObjectGuid const& guid, bool globalSearch = false);
+        Creature* GetCreature(ObjectGuid  const& guid);
+        Pet* GetPet(ObjectGuid const& guid);
+        Creature* GetAnyTypeCreature(ObjectGuid const& guid);      // normal creature or pet or vehicle
+        GameObject* GetGameObject(ObjectGuid const& guid);
+        DynamicObject* GetDynamicObject(ObjectGuid const& guid);
+        Transport* GetTransport(ObjectGuid const& guid);
+        Corpse* GetCorpse(ObjectGuid const& guid);                 // !!! find corpse can be not in world
+        Unit* GetUnit(ObjectGuid const& guid);                     // only use if sure that need objects at current map, specially for player case
+        WorldObject* GetWorldObject(ObjectGuid const& guid);       // only use if sure that need objects at current map, specially for player case
+
+        // Container maked without any locks (for faster search), need make external locks!
+        typedef UNORDERED_MAP<ObjectGuid, WorldObject*> MapStoredObjectTypesContainer;
+        MapStoredObjectTypesContainer const& GetObjectsStore() { return m_objectsStore; }
+        void InsertObject(WorldObject* object);
+        void EraseObject(WorldObject* object);
+        void EraseObject(ObjectGuid const& guid);
+        WorldObject* FindObject(ObjectGuid const& guid);
+
+        // Manipulation with objects update queue
+        void AddUpdateObject(ObjectGuid const& guid);
+        void RemoveUpdateObject(ObjectGuid const& guid);
+        GuidSet const* GetObjectsUpdateQueue() { return &i_objectsToClientUpdate; };
+        ObjectGuid GetNextObjectFromUpdateQueue();
 
         // DynObjects currently
         uint32 GenerateLocalLowGuid(HighGuid guidhigh);
 
         //get corresponding TerrainData object for this particular map
-        const TerrainInfo * GetTerrain() const { return m_TerrainData; }
+        TerrainInfoPtr GetTerrain() const { return m_TerrainData; }
 
         void CreateInstanceData(bool load);
-        InstanceData* GetInstanceData() { return i_data; }
+        InstanceData* GetInstanceData() const { return i_data; }
         uint32 GetScriptId() const { return i_script_id; }
 
-        void MonsterYellToMap(ObjectGuid guid, int32 textId, uint32 language, Unit* target);
-        void MonsterYellToMap(CreatureInfo const* cinfo, int32 textId, uint32 language, Unit* target, uint32 senderLowGuid = 0);
-        void PlayDirectSoundToMap(uint32 soundId, uint32 zoneId = 0);
+        void MonsterYellToMap(ObjectGuid guid, int32 textId, Language language, Unit const* target) const;
+        void MonsterYellToMap(CreatureInfo const* cinfo, int32 textId, Language language, Unit const* target, uint32 senderLowGuid = 0) const;
+        void PlayDirectSoundToMap(uint32 soundId, uint32 zoneId = 0) const;
+
+        // Weather
+        void SetMapWeather(WeatherState state, float grade);
+        bool SetZoneWeather(uint32 zoneId, WeatherType type, float grade);
 
+        // WorldState operations
+        void UpdateWorldState(uint32 state, uint32 value);
+
+        // Attacker per-map storage operations
+        void AddAttackerFor(ObjectGuid const& targetGuid, ObjectGuid const& attackerGuid);
+        void RemoveAttackerFor(ObjectGuid const& targetGuid, ObjectGuid const& attackerGuid);
+        void RemoveAllAttackersFor(ObjectGuid const& targetGuid);
+        GuidSet& GetAttackersFor(ObjectGuid const& targetGuid);
+        void CreateAttackersStorageFor(ObjectGuid const& targetGuid);
+        void RemoveAttackersStorageFor(ObjectGuid const& targetGuid);
+        bool IsInCombat(ObjectGuid const& targetGuid) const;
+
+        // multithread locking
+        ObjectLockType& GetLock(MapLockType _locktype = MAP_LOCK_TYPE_DEFAULT) { return i_lock[_locktype]; }
 
         // Get Holder for Creature Linking
         CreatureLinkingHolder* GetCreatureLinkingHolder() { return &m_creatureLinkingHolder; }
 
+        // map restarting system
+        bool const IsBroken() { return m_broken; };
+        void SetBroken( bool _value = true ) { m_broken = _value; };
+        void ForcedUnload();
+
+        // Dynamic VMaps
+        DynamicMapTree const& GetDynamicMapTree() const;
+        float GetHeight(uint32 phasemask, float x, float y, float z) const;
+        bool IsInLineOfSight(float x1, float y1, float z1, float x2, float y2, float z2, uint32 phasemask) const;
+        bool GetHitPosition(float srcX, float srcY, float srcZ, float& destX, float& destY, float& destZ, uint32 phasemask, float modifyDist) const;
+        void DynamicMapTreeBalance();
+        void DynamicMapTreeUpdate(uint32 const& t_diff);
+        bool IsInLineOfSightByDynamicMapTree(float srcX, float srcY, float srcZ, float destX, float destY, float destZ, uint32 phasemask) const;
+
+        void InsertGameObjectModel(const GameObjectModel& mdl);
+        void RemoveGameObjectModel(const GameObjectModel& mdl);
+        bool ContainsGameObjectModel(const GameObjectModel& mdl) const;
+
+        void AddLoadingObject(LoadingObjectQueueMember* obj);
+        LoadingObjectQueueMember* GetNextLoadingObject();
+        LoadingObjectsQueue const& GetLoadingObjectsQueue() { return i_loadingObjectQueue; };
+        bool IsLoadingObjectsQueueEmpty() const { return i_loadingObjectQueue.empty(); };
+
+        // Event handler
+        WorldObjectEventProcessor* GetEvents();
+        void UpdateEvents(uint32 update_diff);
+        void KillAllEvents(bool force);
+        void AddEvent(BasicEvent* Event, uint64 e_time, bool set_addtime = true);
+
+
     private:
         void LoadMapAndVMap(int gx, int gy);
 
-        void SetTimer(uint32 t) { i_gridExpiry = t < MIN_GRID_DELAY ? MIN_GRID_DELAY : t; }
-
         void SendInitSelf( Player * player );
 
-        void SendInitTransports( Player * player );
-        void SendRemoveTransports( Player * player );
+        void SendInitActiveObjects(Player* player);
+        void SendRemoveActiveObjects(Player* player);
 
-        bool CreatureCellRelocation(Creature *creature, Cell new_cell);
+        void SendRemoveNotifyToStoredClients(WorldObject* object, bool destroy = false);
 
-        bool loaded(const GridPair &) const;
-        void EnsureGridCreated(const GridPair &);
-        bool EnsureGridLoaded(Cell const&);
-        void EnsureGridLoadedAtEnter(Cell const&, Player* player = NULL);
+        bool CreatureCellRelocation(Creature* creature, Cell new_cell);
+
+        bool loaded(GridPair const& p) const;
+        void EnsureGridCreated(GridPair const& p);
+        bool EnsureGridLoaded(Cell const& c);
+        void EnsureGridLoadedAtEnter(Cell const& c, Player* player = NULL);
 
         void buildNGridLinkage(NGridType* pNGridType) { pNGridType->link(this); }
 
@@ -290,17 +456,32 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
         {
             MANGOS_ASSERT(x < MAX_NUMBER_OF_GRIDS);
             MANGOS_ASSERT(y < MAX_NUMBER_OF_GRIDS);
+            ReadGuard Guard(const_cast<Map*>(this)->GetLock(MAP_LOCK_TYPE_MAPOBJECTS), true);
             return i_grids[x][y];
         }
 
-        bool isGridObjectDataLoaded(uint32 x, uint32 y) const { return getNGrid(x,y)->isGridObjectDataLoaded(); }
-        void setGridObjectDataLoaded(bool pLoaded, uint32 x, uint32 y) { getNGrid(x,y)->setGridObjectDataLoaded(pLoaded); }
+        NGridType const* getNGridWithoutLock(uint32 x, uint32 y) const
+        {
+            MANGOS_ASSERT(x < MAX_NUMBER_OF_GRIDS);
+            MANGOS_ASSERT(y < MAX_NUMBER_OF_GRIDS);
+            return i_grids[x][y];
+        }
+
+        template<class T> void LoadObjectToGrid(uint32& guid, GridType& grid, BattleGround* bg);
+        template<class T> void setUnitCell(T* /*obj*/) {}
+        void setUnitCell(Creature* obj);
+
+        bool IsGridObjectDataLoaded(NGridType const* grid) const;
+        void SetGridObjectDataLoaded(bool pLoaded, NGridType& grid);
 
         void setNGrid(NGridType* grid, uint32 x, uint32 y);
         void ScriptsProcess();
 
         void SendObjectUpdates();
-        std::set<Object *> i_objectsToClientUpdate;
+
+        GuidSet i_objectsToClientUpdate;
+
+        LoadingObjectsQueue i_loadingObjectQueue;
 
     protected:
         MapEntry const* i_mapEntry;
@@ -309,28 +490,26 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
         uint32 i_InstanceId;
         uint32 m_unloadTimer;
         float m_VisibleDistance;
-        MapPersistentState* m_persistentState;
 
         MapRefManager m_mapRefManager;
-        MapRefManager::iterator m_mapRefIter;
 
-        typedef std::set<WorldObject*> ActiveNonPlayers;
-        ActiveNonPlayers m_activeNonPlayers;
-        ActiveNonPlayers::iterator m_activeNonPlayersIter;
+        GuidSet m_activeObjects;
+        GuidSet m_activeObjectsSafeCopy;
         MapStoredObjectTypesContainer m_objectsStore;
 
     private:
-        time_t i_gridExpiry;
 
         NGridType* i_grids[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS];
 
         //Shared geodata object with map coord info...
-        TerrainInfo * const m_TerrainData;
+        TerrainInfoPtr m_TerrainData;
+        DynamicMapTree m_dyn_tree;
+
         bool m_bLoadedGrids[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS];
 
         std::bitset<TOTAL_NUMBER_OF_CELLS_PER_MAP*TOTAL_NUMBER_OF_CELLS_PER_MAP> marked_cells;
 
-        std::set<WorldObject *> i_objectsToRemove;
+        UNORDERED_SET<WorldObject*> i_objectsToRemove;
 
         typedef std::multimap<time_t, ScriptAction> ScriptScheduleMap;
         ScriptScheduleMap m_scriptSchedule;
@@ -343,7 +522,6 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
         ObjectGuidGenerator<HIGHGUID_GAMEOBJECT> m_GameObjectGuids;
         ObjectGuidGenerator<HIGHGUID_DYNAMICOBJECT> m_DynObjectGuids;
         ObjectGuidGenerator<HIGHGUID_PET> m_PetGuids;
-        ObjectGuidGenerator<HIGHGUID_VEHICLE> m_VehicleGuids;
 
         // Type specific code for add/remove to/from grid
         template<class T>
@@ -354,6 +532,13 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
 
         // Holder for information about linked mobs
         CreatureLinkingHolder m_creatureLinkingHolder;
+
+        mutable ObjectLockType  i_lock[MAP_LOCK_TYPE_MAX];
+        AttackersMap        m_attackersMap;
+        bool                m_broken;
+
+        WorldObjectEventProcessor m_Events;
+
 };
 
 class MANGOS_DLL_SPEC WorldMap : public Map
@@ -362,7 +547,7 @@ class MANGOS_DLL_SPEC WorldMap : public Map
         using Map::GetPersistentState;                      // hide in subclass for overwrite
     public:
         WorldMap(uint32 id, time_t expiry) : Map(id, expiry, 0, REGULAR_DIFFICULTY) {}
-        ~WorldMap() {}
+        virtual ~WorldMap() {}
 
         // can't be NULL for loaded map
         WorldPersistentState* GetPersistanceState() const;
@@ -374,12 +559,12 @@ class MANGOS_DLL_SPEC DungeonMap : public Map
         using Map::GetPersistentState;                      // hide in subclass for overwrite
     public:
         DungeonMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode);
-        ~DungeonMap();
+        virtual ~DungeonMap();
         bool Add(Player *);
         void Remove(Player *, bool);
         void Update(const uint32&);
         bool Reset(InstanceResetMethod method);
-        void PermBindAllPlayers(Player *player);
+        void PermBindAllPlayers(Player *player, bool permanent = true);
         void UnloadAll(bool pForce);
         bool CanEnter(Player* player);
         void SendResetWarnings(uint32 timeLeft) const;
@@ -400,7 +585,7 @@ class MANGOS_DLL_SPEC BattleGroundMap : public Map
         using Map::GetPersistentState;                      // hide in subclass for overwrite
     public:
         BattleGroundMap(uint32 id, time_t, uint32 InstanceId, uint8 spawnMode);
-        ~BattleGroundMap();
+        virtual ~BattleGroundMap();
 
         void Update(const uint32&);
         bool Add(Player *);
@@ -421,18 +606,15 @@ class MANGOS_DLL_SPEC BattleGroundMap : public Map
 };
 
 template<class T, class CONTAINER>
-inline void
-Map::Visit(const Cell& cell, TypeContainerVisitor<T, CONTAINER> &visitor)
+inline void Map::Visit(Cell const& cell, TypeContainerVisitor<T, CONTAINER>& visitor)
 {
-    const uint32 x = cell.GridX();
-    const uint32 y = cell.GridY();
-    const uint32 cell_x = cell.CellX();
-    const uint32 cell_y = cell.CellY();
-
-    if( !cell.NoCreate() || loaded(GridPair(x,y)) )
-    {
+    NGridType const* cgrid = getNGridWithoutLock(cell.GridX(), cell.GridY());
+    if (cell.NoCreate() && !IsGridObjectDataLoaded(cgrid))
+        return;
+    if (!IsGridObjectDataLoaded(cgrid))
         EnsureGridLoaded(cell);
-        getNGrid(x, y)->Visit(cell_x, cell_y, visitor);
-    }
+    NGridType& grid = *getNGrid(cell.GridX(), cell.GridY());
+    grid.Visit(cell.CellX(), cell.CellY(), visitor);
 }
+
 #endif
diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
index c59f83baf83..f1b6a0ab2c8 100644
--- a/src/game/MapManager.cpp
+++ b/src/game/MapManager.cpp
@@ -18,10 +18,9 @@
 
 #include "MapManager.h"
 #include "MapPersistentStateMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
-#include "Transports.h"
 #include "GridDefines.h"
 #include "World.h"
 #include "CellImpl.h"
@@ -33,120 +32,111 @@ INSTANTIATE_SINGLETON_2(MapManager, CLASS_LOCK);
 INSTANTIATE_CLASS_MUTEX(MapManager, ACE_Recursive_Thread_Mutex);
 
 MapManager::MapManager()
-    : i_gridCleanUpDelay(sWorld.getConfig(CONFIG_UINT32_INTERVAL_GRIDCLEAN))
 {
-    i_timer.SetInterval(sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE));
+    SetMapUpdateInterval(sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE));
 }
 
 MapManager::~MapManager()
 {
-    for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
-        delete iter->second;
-
-    for(TransportSet::iterator i = m_Transports.begin(); i != m_Transports.end(); ++i)
-        delete *i;
-
-    DeleteStateMachine();
-}
-
-void
-MapManager::Initialize()
-{
-    InitStateMachine();
-}
-
-void MapManager::InitStateMachine()
-{
-    si_GridStates[GRID_STATE_INVALID] = new InvalidState;
-    si_GridStates[GRID_STATE_ACTIVE] = new ActiveState;
-    si_GridStates[GRID_STATE_IDLE] = new IdleState;
-    si_GridStates[GRID_STATE_REMOVAL] = new RemovalState;
-}
-
-void MapManager::DeleteStateMachine()
-{
-    delete si_GridStates[GRID_STATE_INVALID];
-    delete si_GridStates[GRID_STATE_ACTIVE];
-    delete si_GridStates[GRID_STATE_IDLE];
-    delete si_GridStates[GRID_STATE_REMOVAL];
+    m_maps.clear();
 }
 
-void MapManager::UpdateGridState(grid_state_t state, Map& map, NGridType& ngrid, GridInfo& ginfo, const uint32 &x, const uint32 &y, const uint32 &t_diff)
+void MapManager::Initialize()
 {
-    // TODO: The grid state array itself is static and therefore 100% safe, however, the data
-    // the state classes in it accesses is not, since grids are shared across maps (for example
-    // in instances), so some sort of locking will be necessary later.
-
-    si_GridStates[state]->Update(map, ngrid, ginfo, x, y, t_diff);
 }
 
 void MapManager::InitializeVisibilityDistanceInfo()
 {
-    for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
+    Guard guard(*this);
+    for (MapMapType::iterator iter = m_maps.begin(); iter != m_maps.end(); ++iter)
         (*iter).second->InitVisibilityDistance();
 }
 
-Map* MapManager::CreateMap(uint32 id, const WorldObject* obj)
+Map* MapManager::CreateMap(uint32 id, WorldObject const* obj)
 {
     MANGOS_ASSERT(obj);
     //if(!obj->IsInWorld()) sLog.outError("GetMap: called for map %d with object (typeid %d, guid %d, mapid %d, instanceid %d) who is not in world!", id, obj->GetTypeId(), obj->GetGUIDLow(), obj->GetMapId(), obj->GetInstanceId());
-    Guard _guard(*this);
+    Guard guard(*this);
 
-    Map * m = NULL;
+    Map* map = NULL;
 
-    const MapEntry* entry = sMapStore.LookupEntry(id);
+    MapEntry const* entry = sMapStore.LookupEntry(id);
     if(!entry)
         return NULL;
 
-    if(entry->Instanceable())
+    if (entry->Instanceable())
     {
-        MANGOS_ASSERT(obj->GetTypeId() == TYPEID_PLAYER);
         //create DungeonMap object
-        if(obj->GetTypeId() == TYPEID_PLAYER)
-            m = CreateInstance(id, (Player*)obj);
+        if (obj->GetTypeId() == TYPEID_PLAYER)
+            map = CreateInstance(id, (Player*)obj);
+        else if (obj->IsInitialized() && obj->GetObjectGuid().IsMOTransport())
+            DEBUG_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES,"MapManager::CreateMap %s try create map %u (no instance given), currently not implemented.",obj->IsInitialized() ? obj->GetObjectGuid().GetString().c_str() : "<uninitialized>", id);
+        else
+            DETAIL_LOG("MapManager::CreateMap %s try create map %u (no instance given), BUG, wrong usage!",obj->IsInitialized() ? obj->GetObjectGuid().GetString().c_str() : "<uninitialized>", id);
     }
     else
     {
         //create regular non-instanceable map
-        m = FindMap(id);
-        if( m == NULL )
+        map = FindMap(id);
+        if (!map)
         {
-            m = new WorldMap(id, i_gridCleanUpDelay);
+            map = new WorldMap(id, sWorld.getConfig(CONFIG_UINT32_INTERVAL_GRIDCLEAN));
             //add map into container
-            i_maps[MapID(id)] = m;
+            m_maps[MapID(id)] = MapPtr(map);
 
             // non-instanceable maps always expected have saved state
-            m->CreateInstanceData(true);
+            map->CreateInstanceData(true);
         }
     }
 
-    return m;
+    return map;
 }
 
 Map* MapManager::CreateBgMap(uint32 mapid, BattleGround* bg)
 {
     sTerrainMgr.LoadTerrain(mapid);
-
     Guard _guard(*this);
     return CreateBattleGroundMap(mapid, sObjectMgr.GenerateInstanceLowGuid(), bg);
 }
 
 Map* MapManager::FindMap(uint32 mapid, uint32 instanceId) const
 {
-    Guard guard(*this);
+    //this is a small workaround for transports
+    if (IsTransportMap(mapid))
+        return NULL;
 
-    MapMapType::const_iterator iter = i_maps.find(MapID(mapid, instanceId));
-    if(iter == i_maps.end())
+    Guard guard(*this);
+    MapMapType::const_iterator iter = m_maps.find(MapID(mapid, instanceId));
+    if (iter == m_maps.end())
         return NULL;
 
+
+    return &*(iter->second);
+}
+
+MapPtr MapManager::GetMapPtr(uint32 mapid, uint32 instanceId)
+{
+    Guard guard(*this);
+    MapMapType::const_iterator iter = m_maps.find(MapID(mapid, instanceId));
+    if (iter == m_maps.end())
+        return MapPtr();
+    return iter->second;
+}
+
+Map* MapManager::FindFirstMap(uint32 mapid) const
+{
     //this is a small workaround for transports
-    if(instanceId == 0 && iter->second->Instanceable())
-    {
-        assert(false);
+    if (IsTransportMap(mapid))
         return NULL;
-    }
 
-    return iter->second;
+    Guard guard(*this);
+
+    for (MapMapType::const_iterator iter = m_maps.begin(); iter != m_maps.end(); ++iter)
+    {
+        if (iter->first.GetId() == mapid)
+            return &*(iter->second);
+    }
+    return NULL;
 }
 
 /*
@@ -155,113 +145,83 @@ Map* MapManager::FindMap(uint32 mapid, uint32 instanceId) const
 */
 bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
 {
-    const MapEntry *entry = sMapStore.LookupEntry(mapid);
+    MapEntry const* entry = sMapStore.LookupEntry(mapid);
     if(!entry)
         return false;
-
-    const char *mapName = entry->name[player->GetSession()->GetSessionDbcLocale()];
-
-    if(entry->IsDungeon())
-    {
-        if (entry->IsRaid())
-        {
-            // GMs can avoid raid limitations
-            if(!player->isGameMaster() && !sWorld.getConfig(CONFIG_BOOL_INSTANCE_IGNORE_RAID))
-            {
-                // can only enter in a raid group
-                Group* group = player->GetGroup();
-                if (!group || !group->isRaidGroup())
-                {
-                    // probably there must be special opcode, because client has this string constant in GlobalStrings.lua
-                    // TODO: this is not a good place to send the message
-                    player->GetSession()->SendAreaTriggerMessage("You must be in a raid group to enter %s instance", mapName);
-                    DEBUG_LOG("MAP: Player '%s' must be in a raid group to enter instance of '%s'", player->GetName(), mapName);
-                    return false;
-                }
-            }
-        }
-
-        //The player has a heroic mode and tries to enter into instance which has no a heroic mode
-        MapDifficulty const* mapDiff = GetMapDifficultyData(entry->MapID,player->GetDifficulty(entry->map_type == MAP_RAID));
-        if (!mapDiff)
-        {
-            bool isRegularTargetMap = player->GetDifficulty(entry->IsRaid()) == REGULAR_DIFFICULTY;
-
-            //Send aborted message
-            // FIX ME: what about absent normal/heroic mode with specific players limit...
-            player->SendTransferAborted(mapid, TRANSFER_ABORT_DIFFICULTY, isRegularTargetMap ? DUNGEON_DIFFICULTY_NORMAL : DUNGEON_DIFFICULTY_HEROIC);
-            return false;
-        }
-
-        // TODO: move this to a map dependent location
-        /*if(i_data && i_data->IsEncounterInProgress())
-        {
-            DEBUG_LOG("MAP: Player '%s' can't enter instance '%s' while an encounter is in progress.", player->GetName(), GetMapName());
-            player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
-            return(false);
-        }*/
-    }
-
     return true;
 }
 
 void MapManager::DeleteInstance(uint32 mapid, uint32 instanceId)
 {
-    Guard _guard(*this);
-
-    MapMapType::iterator iter = i_maps.find(MapID(mapid, instanceId));
-    if(iter != i_maps.end())
+    Guard guard(*this);
+    MapMapType::iterator iter = m_maps.find(MapID(mapid, instanceId));
+    if(iter != m_maps.end())
     {
-        Map * pMap = iter->second;
+        MapPtr pMap = iter->second;
         if (pMap->Instanceable())
         {
-            i_maps.erase(iter);
-
             pMap->UnloadAll(true);
-            delete pMap;
+            m_maps.erase(iter);
         }
     }
 }
 
-void
-MapManager::Update(uint32 diff)
+void MapManager::Update(uint32 diff)
 {
-    i_timer.Update(diff);
-    if( !i_timer.Passed() )
+    m_timer.Update(diff);
+    if (!m_timer.Passed())
         return;
 
-    for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
-        iter->second->Update((uint32)i_timer.GetCurrent());
+    GetMapUpdater().ReactivateIfNeed();
+    GetMapUpdater().UpdateLoadBalancer(true);
 
-    for (TransportSet::iterator iter = m_Transports.begin(); iter != m_Transports.end(); ++iter)
+    for (MapMapType::iterator iter = m_maps.begin(); iter != m_maps.end(); ++iter)
     {
-        WorldObject::UpdateHelper helper((*iter));
-        helper.Update((uint32)i_timer.GetCurrent());
+        if (GetMapUpdater().activated())
+        {
+            GetMapUpdater().schedule_update(*iter->second, m_timer.GetCurrent());
+        }
+        else
+            iter->second->Update(m_timer.GetCurrent());
+
+        std::string updaterErr = GetMapUpdater().getLastError();
+        if (!updaterErr.empty())
+            sLog.outError("MapManager::Update updater reports %s.", updaterErr.c_str());
     }
 
-    //remove all maps which can be unloaded
-    MapMapType::iterator iter = i_maps.begin();
-    while(iter != i_maps.end())
+    if (GetMapUpdater().activated())
     {
-        Map * pMap = iter->second;
-        //check if map can be unloaded
-        if(pMap->CanUnload((uint32)i_timer.GetCurrent()))
+        int result = GetMapUpdater().queue_wait(sWorld.getConfig(CONFIG_UINT32_VMSS_FREEZEDETECTTIME));
+        if (result != 0)
         {
-            pMap->UnloadAll(true);
-            delete pMap;
+            std::string updaterErr = GetMapUpdater().getLastError();
+            sLog.outError("MapManager::Update update thread bucket returned error %i after invoke, last error %s.", result, updaterErr.c_str());
+        }
+    }
 
-            i_maps.erase(iter++);
+    GetMapUpdater().UpdateLoadBalancer(false);
+
+    // check all maps which can be unloaded
+    {
+        Guard guard(*this);
+        for (MapMapType::const_iterator iter = m_maps.begin(); iter != m_maps.end();)
+        {
+            MapPtr pMap = iter->second;
+            //check if map can be unloaded
+            if (pMap->CanUnload(m_timer.GetCurrent()))
+                iter = m_maps.erase(iter);
+            else
+                ++iter;
+            //map  class be auto-deleted in end of cycle
         }
-        else
-            ++iter;
     }
 
-    i_timer.SetCurrent(0);
+    m_timer.SetCurrent(0);
 }
 
 void MapManager::RemoveAllObjectsInRemoveList()
 {
-    for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
+    for (MapMapType::iterator iter = m_maps.begin(); iter != m_maps.end(); ++iter)
         iter->second->RemoveAllObjectsInRemoveList();
 }
 
@@ -284,38 +244,71 @@ bool MapManager::IsValidMAP(uint32 mapid)
 
 void MapManager::UnloadAll()
 {
-    for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
+    for(MapMapType::iterator iter = m_maps.begin(); iter != m_maps.end(); ++iter)
         iter->second->UnloadAll(true);
 
-    while(!i_maps.empty())
-    {
-        delete i_maps.begin()->second;
-        i_maps.erase(i_maps.begin());
-    }
+    while (!m_maps.empty())
+        m_maps.erase(m_maps.begin());
+
+    sTerrainMgr.UnloadAll();
+
+    if (GetMapUpdater().activated())
+        GetMapUpdater().deactivate();
 
-    TerrainManager::Instance().UnloadAll();
 }
 
 uint32 MapManager::GetNumInstances()
 {
     uint32 ret = 0;
-    for(MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)
+    for (MapMapType::iterator itr = m_maps.begin(); itr != m_maps.end(); ++itr)
     {
-        Map *map = itr->second;
-        if(!map->IsDungeon()) continue;
-            ret += 1;
+        MapPtr map = itr->second;
+        if(!map->IsDungeon())
+            continue;
+        ++ret;
     }
     return ret;
 }
 
+struct TMapInfo
+{
+    TMapInfo() : m_mapName(NULL), m_mapCount(0), m_playerCount(0) {}
+    const char* m_mapName;
+    uint32 m_mapCount;
+    uint32 m_playerCount;
+};
+
+std::string MapManager::GetStrMaps()
+{
+    typedef std::map<uint32/*mapId*/, TMapInfo> TMapsInfo;
+
+    TMapsInfo mapsInfo;
+
+    for (MapMapType::const_iterator itr = m_maps.begin(); itr != m_maps.end(); ++itr)
+    {
+        TMapInfo& mapInfo = mapsInfo[itr->first.nMapId];
+        if (!mapInfo.m_mapName)
+            mapInfo.m_mapName = itr->second->GetMapName();
+        mapInfo.m_mapCount++;
+        mapInfo.m_playerCount += itr->second->GetPlayers().getSize();
+    }
+
+    std::ostringstream os; // [id:name:count:players]
+    for (TMapsInfo::const_iterator itr = mapsInfo.begin(); itr != mapsInfo.end(); ++itr)
+        os << " [" << itr->first << ":" << itr->second.m_mapName << ":" << itr->second.m_mapCount << ":" << itr->second.m_playerCount << "]";
+
+    return os.str();
+}
+
 uint32 MapManager::GetNumPlayersInInstances()
 {
     uint32 ret = 0;
-    for(MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)
+    for (MapMapType::iterator itr = m_maps.begin(); itr != m_maps.end(); ++itr)
     {
-        Map *map = itr->second;
-        if(!map->IsDungeon()) continue;
-            ret += map->GetPlayers().getSize();
+        MapPtr map = itr->second;
+        if(!map->IsDungeon())
+            continue;
+        ret += map->GetPlayers().getSize();
     }
     return ret;
 }
@@ -325,7 +318,7 @@ uint32 MapManager::GetNumPlayersInInstances()
 Map* MapManager::CreateInstance(uint32 id, Player * player)
 {
     Map* map = NULL;
-    Map * pNewMap = NULL;
+    Map* pNewMap = NULL;
     uint32 NewInstanceId = 0;                                   // instanceId of the resulting map
     const MapEntry* entry = sMapStore.LookupEntry(id);
 
@@ -359,7 +352,7 @@ Map* MapManager::CreateInstance(uint32 id, Player * player)
     //add a new map object into the registry
     if(pNewMap)
     {
-        i_maps[MapID(id, NewInstanceId)] = pNewMap;
+        m_maps[MapID(id, NewInstanceId)] = MapPtr(pNewMap);
         map = pNewMap;
     }
 
@@ -386,7 +379,7 @@ DungeonMap* MapManager::CreateDungeonMap(uint32 id, uint32 InstanceId, Difficult
 
     DEBUG_LOG("MapInstanced::CreateDungeonMap: %s map instance %d for %d created with difficulty %d", save?"":"new ", InstanceId, id, difficulty);
 
-    DungeonMap *map = new DungeonMap(id, i_gridCleanUpDelay, InstanceId, difficulty);
+    DungeonMap* map = new DungeonMap(id, sWorld.getConfig(CONFIG_UINT32_INTERVAL_GRIDCLEAN), InstanceId, difficulty);
 
     // Dungeons can have saved instance data
     bool load_data = save != NULL;
@@ -403,13 +396,13 @@ BattleGroundMap* MapManager::CreateBattleGroundMap(uint32 id, uint32 InstanceId,
 
     uint8 spawnMode = bracketEntry ? bracketEntry->difficulty : REGULAR_DIFFICULTY;
 
-    BattleGroundMap *map = new BattleGroundMap(id, i_gridCleanUpDelay, InstanceId, spawnMode);
+    BattleGroundMap* map = new BattleGroundMap(id, sWorld.getConfig(CONFIG_UINT32_INTERVAL_GRIDCLEAN), InstanceId, spawnMode);
     MANGOS_ASSERT(map->IsBattleGroundOrArena());
     map->SetBG(bg);
     bg->SetBgMap(map);
 
     //add map into map container
-    i_maps[MapID(id, InstanceId)] = map;
+    m_maps[MapID(id, InstanceId)] = MapPtr(map);
 
     // BGs/Arenas not have saved instance data
     map->CreateInstanceData(false);
@@ -417,3 +410,8 @@ BattleGroundMap* MapManager::CreateBattleGroundMap(uint32 id, uint32 InstanceId,
     return map;
 }
 
+bool MapManager::IsTransportMap(uint32 mapid)
+{
+    MapEntry const* mapEntry = sMapStore.LookupEntry(mapid);
+    return mapEntry ? mapEntry->IsTransport() : false;
+}
diff --git a/src/game/MapManager.h b/src/game/MapManager.h
index d1d37e69661..6f48d2eed8f 100644
--- a/src/game/MapManager.h
+++ b/src/game/MapManager.h
@@ -24,30 +24,10 @@
 #include "Policies/Singleton.h"
 #include "ace/Recursive_Thread_Mutex.h"
 #include "Map.h"
-#include "GridStates.h"
+#include "MapUpdater.h"
 
-class Transport;
 class BattleGround;
 
-struct MANGOS_DLL_DECL MapID
-{
-    explicit MapID(uint32 id) : nMapId(id), nInstanceId(0) {}
-    MapID(uint32 id, uint32 instid) : nMapId(id), nInstanceId(instid) {}
-
-    bool operator<(const MapID& val) const
-    {
-        if(nMapId == val.nMapId)
-            return nInstanceId < val.nInstanceId;
-
-        return nMapId < val.nMapId;
-    }
-
-    bool operator==(const MapID& val) const { return nMapId == val.nMapId && nInstanceId == val.nInstanceId; }
-
-    uint32 nMapId;
-    uint32 nInstanceId;
-};
-
 class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::ClassLevelLockable<MapManager, ACE_Recursive_Thread_Mutex> >
 {
     friend class MaNGOS::OperatorNew<MapManager>;
@@ -57,13 +37,13 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::
     typedef MaNGOS::ClassLevelLockable<MapManager, ACE_Recursive_Thread_Mutex>::Lock Guard;
 
     public:
-        typedef std::map<MapID, Map* > MapMapType;
+        typedef UNORDERED_MAP<MapID, MapPtr> MapMapType;
 
-        Map* CreateMap(uint32, const WorldObject* obj);
+        Map* CreateMap(uint32, WorldObject const* obj);
         Map* CreateBgMap(uint32 mapid, BattleGround* bg);
         Map* FindMap(uint32 mapid, uint32 instanceId = 0) const;
-
-        void UpdateGridState(grid_state_t state, Map& map, NGridType& ngrid, GridInfo& ginfo, const uint32 &x, const uint32 &y, const uint32 &t_diff);
+        Map* FindFirstMap(uint32 mapid) const;
+        MapPtr GetMapPtr(uint32 mapid, uint32 instanceId = 0);
 
         // only const version for outer users
         void DeleteInstance(uint32 mapid, uint32 instanceId);
@@ -71,21 +51,13 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::
         void Initialize(void);
         void Update(uint32);
 
-        void SetGridCleanUpDelay(uint32 t)
-        {
-            if( t < MIN_GRID_DELAY )
-                i_gridCleanUpDelay = MIN_GRID_DELAY;
-            else
-                i_gridCleanUpDelay = t;
-        }
-
         void SetMapUpdateInterval(uint32 t)
         {
-            if( t > MIN_MAP_UPDATE_DELAY )
+            if (t < MIN_MAP_UPDATE_DELAY)
                 t = MIN_MAP_UPDATE_DELAY;
 
-            i_timer.SetInterval(t);
-            i_timer.Reset();
+            m_timer.SetInterval(t);
+            m_timer.Reset();
         }
 
         //void LoadGrid(int mapid, int instId, float x, float y, const WorldObject* obj, bool no_unload = false);
@@ -93,6 +65,7 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::
 
         static bool ExistMapAndVMap(uint32 mapid, float x, float y);
         static bool IsValidMAP(uint32 mapid);
+        static bool IsTransportMap(uint32 mapid);
 
         static bool IsValidMapCoord(uint32 mapid, float x,float y)
         {
@@ -111,7 +84,7 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::
 
         static bool IsValidMapCoord(WorldLocation const& loc)
         {
-            return IsValidMapCoord(loc.mapid,loc.coord_x,loc.coord_y,loc.coord_z,loc.orientation);
+            return IsValidMapCoord(loc.GetMapId(),loc.x,loc.y,loc.z,loc.orientation);
         }
 
         // modulos a radian orientation to the range of 0..2PI
@@ -131,33 +104,23 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::
 
         void RemoveAllObjectsInRemoveList();
 
-        void LoadTransports();
-
-        typedef std::set<Transport *> TransportSet;
-        TransportSet m_Transports;
-
-        typedef std::map<uint32, TransportSet> TransportMap;
-        TransportMap m_TransportsByMap;
-
         bool CanPlayerEnter(uint32 mapid, Player* player);
         void InitializeVisibilityDistanceInfo();
 
         /* statistics */
         uint32 GetNumInstances();
+        std::string GetStrMaps();
         uint32 GetNumPlayersInInstances();
 
-
         //get list of all maps
-        const MapMapType& Maps() const { return i_maps; }
+        const MapMapType& Maps() const { return m_maps; }
 
         template<typename Do>
         void DoForAllMapsWithMapId(uint32 mapId, Do& _do);
 
-    private:
+        MapUpdater& GetMapUpdater() { return m_updater; };
 
-        // debugging code, should be deleted some day
-        GridState* si_GridStates[MAX_GRID_STATE];
-        int i_GridStateErrorCount;
+        void UpdateLoadBalancer(bool b_start);
 
     private:
 
@@ -167,25 +130,23 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::
         MapManager(const MapManager &);
         MapManager& operator=(const MapManager &);
 
-        void InitStateMachine();
-        void DeleteStateMachine();
-
         Map* CreateInstance(uint32 id, Player * player);
         DungeonMap* CreateDungeonMap(uint32 id, uint32 InstanceId, Difficulty difficulty, DungeonPersistentState *save = NULL);
         BattleGroundMap* CreateBattleGroundMap(uint32 id, uint32 InstanceId, BattleGround* bg);
 
-        uint32 i_gridCleanUpDelay;
-        MapMapType i_maps;
-        IntervalTimer i_timer;
+        MapMapType         m_maps;
+        MapUpdater         m_updater;
+        ShortIntervalTimer m_timer;
 };
 
 template<typename Do>
 inline void MapManager::DoForAllMapsWithMapId(uint32 mapId, Do& _do)
 {
-    MapMapType::const_iterator start = i_maps.lower_bound(MapID(mapId,0));
-    MapMapType::const_iterator end   = i_maps.lower_bound(MapID(mapId+1,0));
-    for(MapMapType::const_iterator itr = start; itr != end; ++itr)
-        _do(itr->second);
+    for(MapMapType::const_iterator itr = m_maps.begin(); itr != m_maps.end(); ++itr)
+    {
+        if (itr->first.nMapId == mapId)
+            _do(&*(itr->second));
+    }
 }
 
 #define sMapMgr MapManager::Instance()
diff --git a/src/game/MapPersistentStateMgr.cpp b/src/game/MapPersistentStateMgr.cpp
index 621c496fbf4..e6d9b98d463 100644
--- a/src/game/MapPersistentStateMgr.cpp
+++ b/src/game/MapPersistentStateMgr.cpp
@@ -22,7 +22,6 @@
 #include "Player.h"
 #include "GridNotifiers.h"
 #include "Log.h"
-#include "GridStates.h"
 #include "CellImpl.h"
 #include "Map.h"
 #include "MapManager.h"
@@ -35,6 +34,8 @@
 #include "Group.h"
 #include "InstanceData.h"
 #include "ProgressBar.h"
+#include "LFGMgr.h"
+#include "WorldStateMgr.h"
 
 INSTANTIATE_SINGLETON_1( MapPersistentStateManager );
 
@@ -43,7 +44,7 @@ static uint32 resetEventTypeDelay[MAX_RESET_EVENT_TYPE] = { 0, 3600, 900, 300, 6
 //== MapPersistentState functions ==========================
 MapPersistentState::MapPersistentState(uint16 MapId, uint32 InstanceId, Difficulty difficulty)
 : m_instanceid(InstanceId), m_mapid(MapId),
-  m_difficulty(difficulty), m_usedByMap(NULL)
+  m_difficulty(difficulty), m_usedByMap(NULL), m_needRemove(false)
 {
 }
 
@@ -61,7 +62,7 @@ bool MapPersistentState::UnloadIfEmpty()
 {
     if (CanBeUnload())
     {
-        sMapPersistentStateMgr.RemovePersistentState(GetMapId(), GetInstanceId());
+        m_needRemove = true;
         return false;
     }
     else
@@ -145,7 +146,8 @@ void MapPersistentState::ClearRespawnTimes()
     m_goRespawnTimes.clear();
     m_creatureRespawnTimes.clear();
 
-    UnloadIfEmpty();
+    if (GetMap())
+        UnloadIfEmpty();
 }
 
 void MapPersistentState::AddCreatureToGrid( uint32 guid, CreatureData const* data )
@@ -213,18 +215,42 @@ DungeonPersistentState::DungeonPersistentState( uint16 MapId, uint32 InstanceId,
 
 DungeonPersistentState::~DungeonPersistentState()
 {
-    while(!m_playerList.empty())
+    while (!m_playerList.empty())
     {
-        Player *player = *(m_playerList.begin());
-        player->UnbindInstance(GetMapId(), GetDifficulty(), true);
+        GuidSet::iterator itr = m_playerList.begin();
+        if (Player* player = ObjectAccessor::FindPlayer(*itr))
+            player->UnbindInstance(GetMapId(), GetDifficulty(), true);
+        else
+            m_playerList.erase(itr);
     }
-    while(!m_groupList.empty())
+    while (!m_groupList.empty())
     {
-        Group *group = *(m_groupList.begin());
-        group->UnbindInstance(GetMapId(), GetDifficulty(), true);
+        GuidSet::iterator itr = m_groupList.begin();
+        if (Group* group = sObjectMgr.GetGroup(*itr))
+            group->UnbindInstance(GetMapId(), GetDifficulty(), true);
+        else
+            m_groupList.erase(itr);
     }
 }
 
+void DungeonPersistentState::AddToBindList(ObjectGuid const& guid)
+{
+    if (guid.IsPlayer())
+        m_playerList.insert(guid);
+    else if (guid.IsGroup())
+        m_groupList.insert(guid);
+}
+
+void DungeonPersistentState::RemoveFromBindList(ObjectGuid const& guid)
+{
+    if (guid.IsPlayer())
+        m_playerList.erase(guid);
+    else if (guid.IsGroup())
+        m_groupList.erase(guid);
+
+    UnloadIfEmpty();
+}
+
 bool DungeonPersistentState::CanBeUnload() const
 {
     // prevent unload if any bounded groups or online bounded player still exists
@@ -249,7 +275,7 @@ void DungeonPersistentState::SaveToDB()
         }
     }
 
-    CharacterDatabase.PExecute("INSERT INTO instance VALUES ('%u', '%u', '"UI64FMTD"', '%u', '%u', '%s')", GetInstanceId(), GetMapId(), (uint64)GetResetTimeForDB(), GetDifficulty(), GetCompletedEncountersMask(), data.c_str());
+    CharacterDatabase.PExecute("INSERT INTO instance VALUES ('%u', '%u', '" UI64FMTD "', '%u', '%u', '%s')", GetInstanceId(), GetMapId(), (uint64)GetResetTime(), GetDifficulty(), GetCompletedEncountersMask(), data.c_str());
 }
 
 void DungeonPersistentState::DeleteRespawnTimes()
@@ -273,41 +299,163 @@ InstanceTemplate const* DungeonPersistentState::GetTemplate() const
     return ObjectMgr::GetInstanceTemplate(GetMapId());
 }
 
-time_t DungeonPersistentState::GetResetTimeForDB() const
+bool DungeonPersistentState::IsCompleted()
 {
-    // only state the reset time for normal instances
-    const MapEntry *entry = sMapStore.LookupEntry(GetMapId());
-    if(!entry || entry->map_type == MAP_RAID || GetDifficulty() == DUNGEON_DIFFICULTY_HEROIC)
-        return 0;
-    else
-        return GetResetTime();
+    DungeonEncounterMap const* encounterList = sObjectMgr.GetDungeonEncounters();
+
+    if (!encounterList)
+        return false;
+
+    for (DungeonEncounterMap::const_iterator itr = encounterList->begin(); itr != encounterList->end(); ++itr)
+    {
+        DungeonEncounter const* encounter = itr->second;
+
+        if (!encounter)
+            continue;
+
+        if (GetMapId() != encounter->dbcEntry->mapId  || GetDifficulty() != encounter->dbcEntry->Difficulty )
+            continue;
+
+        if (!(m_completedEncountersMask & ( 1 << encounter->dbcEntry->encounterIndex)))
+            return false;
+    }
+    return true;
 }
 
 void DungeonPersistentState::UpdateEncounterState(EncounterCreditType type, uint32 creditEntry)
 {
     DungeonEncounterMapBounds bounds = sObjectMgr.GetDungeonEncounterBounds(creditEntry);
 
-    for (DungeonEncounterMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+    for (DungeonEncounterMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
     {
-        DungeonEncounterEntry const* dbcEntry = iter->second->dbcEntry;
+        DungeonEncounterEntry const* dbcEntry = itr->second->dbcEntry;
 
-        if (iter->second->creditType == type && dbcEntry->Difficulty == GetDifficulty() && dbcEntry->mapId == GetMapId())
+        if (itr->second->creditType == type && Difficulty(dbcEntry->Difficulty) == GetDifficulty() && dbcEntry->mapId == GetMapId())
         {
+            uint32 oldMask = m_completedEncountersMask;
             m_completedEncountersMask |= 1 << dbcEntry->encounterIndex;
 
-            CharacterDatabase.PExecute("UPDATE instance SET encountersMask = '%u' WHERE id = '%u'", m_completedEncountersMask, GetInstanceId());
+            DungeonMap* dungeon = (DungeonMap*)GetMap();
+
+            if (!dungeon || dungeon->GetPlayers().isEmpty())
+                return;
+
+            Player* player = dungeon->GetPlayers().begin()->getSource();
 
-            DEBUG_LOG("DungeonPersistentState: Dungeon %s (Id %u) completed encounter %s", GetMap()->GetMapName(), GetInstanceId(), dbcEntry->encounterName[sWorld.GetDefaultDbcLocale()]);
-            if (uint32 dungeonId = iter->second->lastEncounterDungeon)
+            if ( m_completedEncountersMask != oldMask)
             {
-                DEBUG_LOG("DungeonPersistentState:: Dungeon %s (Id %u) completed last encounter %s", GetMap()->GetMapName(), GetInstanceId(), dbcEntry->encounterName[sWorld.GetDefaultDbcLocale()]);
-                // Place LFG reward here
+                if (dungeon && player)
+                    dungeon->PermBindAllPlayers(player, dungeon->IsRaidOrHeroicDungeon());
+
+                CharacterDatabase.PExecute("UPDATE instance SET encountersMask = '%u' WHERE id = '%u'", m_completedEncountersMask, GetInstanceId());
+
+                uint32 dungeonId = itr->second->lastEncounterDungeon;
+
+                DEBUG_LOG("DungeonPersistentState: Dungeon %s (Id %u) completed encounter %s %s", GetMap()->GetMapName(), GetInstanceId(), dbcEntry->encounterName[sWorld.GetDefaultDbcLocale()], dungeonId ? "(last)" : "");
+
+                if (dungeon && player && player->GetGroup() && player->GetGroup()->isLFGGroup())
+                {
+                    sLFGMgr.DungeonEncounterReached(player->GetGroup());
+
+                    if ((sWorld.getConfig(CONFIG_BOOL_LFG_ONLYLASTENCOUNTER) && dungeonId)
+                        || IsCompleted())
+                        sLFGMgr.SendLFGRewards(player->GetGroup());
+                }
             }
             return;
         }
     }
 }
 
+void DungeonPersistentState::UpdateSpecialEncounterState(EncounterFrameCommand command, ObjectGuid linkedGuid, uint8 param1 /*= 0*/, uint8 param2 /*= 0*/)
+{
+    if (linkedGuid.IsEmpty())
+        return;
+
+    SpecialEncountersMap::iterator itr = m_specialEncountersMap.find(linkedGuid);
+
+    if (itr == m_specialEncountersMap.end())
+        m_specialEncountersMap.insert(SpecialEncountersMap::value_type(linkedGuid,SpecialEncounterState(linkedGuid, command, param1, param2)));
+    else
+    {
+        itr->second.SetCommand(command);
+        itr->second.data1 = param1;
+        itr->second.data2 = param2;
+    }
+
+    SendSpecialEncounterState(linkedGuid);
+}
+
+void DungeonPersistentState::SendSpecialEncounterState(ObjectGuid guid)
+{
+    // Possible need move this method to DungeonMap class
+    DungeonMap* dungeon = (DungeonMap*)GetMap();
+    if (!dungeon || guid.IsEmpty())
+        return;
+
+    SpecialEncountersMap::iterator itr = m_specialEncountersMap.find(guid);
+
+    if (itr == m_specialEncountersMap.end())
+        return;
+
+    SpecialEncounterState* state = &itr->second;
+
+    if (!state || state->lastCommand >= ENCOUNTER_FRAME_MAX)
+        return;
+
+    // size of this packet is at most 15 (usually less)
+    WorldPacket data(SMSG_INSTANCE_ENCOUNTER, 15);
+
+    data << uint32(state->lastCommand);
+
+    switch (state->lastCommand)
+    {
+        case ENCOUNTER_FRAME_ENGAGE:
+        case ENCOUNTER_FRAME_DISENGAGE:
+        case ENCOUNTER_FRAME_UPDATE_PRIORITY:
+            data << state->guid.WriteAsPacked();
+            data << uint8(state->data1);
+            break;
+        case ENCOUNTER_FRAME_ADD_TIMER:
+        case ENCOUNTER_FRAME_ENABLE_OBJECTIVE:
+        case ENCOUNTER_FRAME_DISABLE_OBJECTIVE:
+            data << uint8(state->data1);
+            break;
+        case ENCOUNTER_FRAME_UPDATE_OBJECTIVE:
+            data << uint8(state->data1);
+            data << uint8(state->data2);
+            break;
+        case ENCOUNTER_FRAME_UNK7:
+        default:
+            break;
+    }
+
+    dungeon->SendToPlayers(&data);
+}
+
+time_t DungeonPersistentState::GetResetTimeForDB() const
+{
+    // only state the reset time for normal instances
+    const MapEntry *entry = sMapStore.LookupEntry(GetMapId());
+    if(!entry || entry->map_type == MAP_RAID || GetDifficulty() == DUNGEON_DIFFICULTY_HEROIC)
+        return 0;
+    else
+        return GetResetTime();
+}
+
+time_t DungeonPersistentState::GetRealResetTime() const
+{
+    if (GetResetTime())
+        return GetResetTime();
+
+    MapDifficultyEntry const* mapDiff = GetMapDifficultyData(GetMapId(),GetDifficulty());
+
+    if(!mapDiff)
+        return 0;
+
+    return DungeonResetScheduler::CalculateNextResetTime(mapDiff);
+}
+
 //== BattleGroundPersistentState functions =================
 
 bool BattleGroundPersistentState::CanBeUnload() const
@@ -319,9 +467,9 @@ bool BattleGroundPersistentState::CanBeUnload() const
 
 //== DungeonResetScheduler functions ======================
 
-uint32 DungeonResetScheduler::GetMaxResetTimeFor(MapDifficulty const* mapDiff)
+uint32 DungeonResetScheduler::GetMaxResetTimeFor(MapDifficultyEntry const* mapDiff)
 {
-    if (!mapDiff || !mapDiff->resetTime)
+    if (!mapDiff)
         return 0;
 
     uint32 delay = uint32(mapDiff->resetTime / DAY * sWorld.getConfig(CONFIG_FLOAT_RATE_INSTANCE_RESET_TIME)) * DAY;
@@ -329,20 +477,35 @@ uint32 DungeonResetScheduler::GetMaxResetTimeFor(MapDifficulty const* mapDiff)
     if (delay < DAY)                                        // the reset_delay must be at least one day
         delay = DAY;
 
+    if (delay > INSTANCE_MAX_RESET_OFFSET)                  // the reset_delay must be no more than X days
+        delay = INSTANCE_MAX_RESET_OFFSET;
+
     return delay;
 }
 
-time_t DungeonResetScheduler::CalculateNextResetTime(MapDifficulty const* mapDiff, time_t prevResetTime)
+time_t DungeonResetScheduler::CalculateNextResetTime(MapDifficultyEntry const* mapDiff)
 {
-    uint32 diff = sWorld.getConfig(CONFIG_UINT32_INSTANCE_RESET_TIME_HOUR) * HOUR;
-    uint32 period = GetMaxResetTimeFor(mapDiff);
-    return ((prevResetTime + MINUTE) / DAY * DAY) + period + diff;
+
+    if (!mapDiff)
+        return 0;
+
+    const time_t now = time(NULL);
+    struct tm *ts;
+    ts = localtime(&now);
+    ts->tm_sec = ts->tm_min = ts->tm_hour = 0;
+    time_t zeroHour = mktime(ts);
+    time_t offset   = GetMaxResetTimeFor(mapDiff);
+    time_t diff     = sWorld.getConfig(CONFIG_UINT32_INSTANCE_RESET_TIME_HOUR) * HOUR;
+
+    return diff + offset + zeroHour;
+
 }
 
 void DungeonResetScheduler::LoadResetTimes()
 {
-    time_t now = time(NULL);
-    time_t today = (now / DAY) * DAY;
+    time_t const now = time(NULL);
+    time_t const today = (now / DAY) * DAY;
+    time_t const nextWeek = today + (7 * DAY);
 
     // NOTE: Use DirectPExecute for tables that will be queried later
 
@@ -365,14 +528,16 @@ void DungeonResetScheduler::LoadResetTimes()
                 uint32 difficulty = (*result)[2].GetUInt32();
 
                 MapEntry const* mapEntry = sMapStore.LookupEntry(mapid);
+                MapDifficultyEntry const* mapDiff = GetMapDifficultyData(mapid,Difficulty(difficulty));
 
-                if (!mapEntry || !mapEntry->IsDungeon() || !GetMapDifficultyData(mapid, Difficulty(difficulty)))
+                if (!mapEntry || !mapEntry->IsDungeon() || !mapDiff)
                 {
                     sMapPersistentStateMgr.DeleteInstanceFromDB(id);
                     continue;
                 }
-
-                instResetTime[id] = ResetTimeMapDiffType(MAKE_PAIR32(mapid,difficulty), resettime);
+                //if in DBC no resettime - sedule resettime from DB
+                if (!mapDiff->resetTime)
+                    instResetTime[id] = ResetTimeMapDiffType(MAKE_PAIR32(mapid,difficulty), resettime);
             }
         }
         while (result->NextRow());
@@ -392,7 +557,7 @@ void DungeonResetScheduler::LoadResetTimes()
                 InstResetTimeMapDiffType::iterator itr = instResetTime.find(instance);
                 if(itr != instResetTime.end() && itr->second.second != resettime)
                 {
-                    CharacterDatabase.DirectPExecute("UPDATE instance SET resettime = '"UI64FMTD"' WHERE id = '%u'", uint64(resettime), instance);
+                    CharacterDatabase.DirectPExecute("UPDATE instance SET resettime = '" UI64FMTD "' WHERE id = '%u'", uint64(resettime), instance);
                     itr->second.second = resettime;
                 }
             }
@@ -415,9 +580,19 @@ void DungeonResetScheduler::LoadResetTimes()
         {
             Field* fields = result->Fetch();
 
-            uint32 mapid            = fields[0].GetUInt32();
-            Difficulty difficulty   = Difficulty(fields[1].GetUInt32());
-            uint64 oldresettime     = fields[2].GetUInt64();
+            time_t oldresettime;
+            uint32 mapid = fields[0].GetUInt32();
+            Difficulty difficulty = Difficulty(fields[1].GetUInt32());
+            uint64 _oldresettime = fields[2].GetUInt64();
+
+            if (_oldresettime > uint64(time(NULL) + INSTANCE_MAX_RESET_OFFSET))
+            {
+                MapDifficultyEntry const* mapDiff = GetMapDifficultyData(mapid,Difficulty(difficulty));
+                oldresettime = DungeonResetScheduler::CalculateNextResetTime(mapDiff);
+                sLog.outErrorDb("Wrong reset time in group_instance corrected to: %ld", oldresettime);
+            }
+            else
+                oldresettime = time_t(_oldresettime);
 
             MapEntry const* mapEntry = sMapStore.LookupEntry(mapid);
 
@@ -429,9 +604,9 @@ void DungeonResetScheduler::LoadResetTimes()
             }
 
             // update the reset time if the hour in the configs changes
-            uint64 newresettime = (oldresettime / DAY) * DAY + diff;
-            if(oldresettime != newresettime)
-                CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u' AND difficulty = '%u'", newresettime, mapid, difficulty);
+            time_t newresettime = (oldresettime / DAY) * DAY + diff;
+            if(oldresettime != newresettime && newresettime > now)
+                CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '" UI64FMTD "' WHERE mapid = '%u' AND difficulty = '%u'", (uint64)newresettime, mapid, difficulty);
 
             SetResetTimeFor(mapid,difficulty,newresettime);
         } while(result->NextRow());
@@ -446,10 +621,11 @@ void DungeonResetScheduler::LoadResetTimes()
     // add the global reset times to the priority queue
     for(MapDifficultyMap::const_iterator itr = sMapDifficultyMap.begin(); itr != sMapDifficultyMap.end(); ++itr)
     {
+
         uint32 map_diff_pair = itr->first;
         uint32 mapid = PAIR32_LOPART(map_diff_pair);
         Difficulty difficulty = Difficulty(PAIR32_HIPART(map_diff_pair));
-        MapDifficulty const* mapDiff = &itr->second;
+        MapDifficultyEntry const* mapDiff = itr->second;
 
         // skip mapDiff without global reset time
         if (!mapDiff->resetTime)
@@ -459,30 +635,22 @@ void DungeonResetScheduler::LoadResetTimes()
         if (!mapEntry || !mapEntry->IsDungeon())
             continue;
 
-        uint32 period = GetMaxResetTimeFor(mapDiff);
+        //time_t period = GetMaxResetTimeFor(mapDiff);
+
         time_t t = GetResetTimeFor(mapid,difficulty);
-        if(!t)
-        {
-            // initialize the reset time
-            t = today + period + diff;
-            CharacterDatabase.DirectPExecute("INSERT INTO instance_reset VALUES ('%u','%u','"UI64FMTD"')", mapid, difficulty, (uint64)t);
-        }
 
-        if(t < now)
+        if (!t || t < now || t > nextWeek)
         {
-            // assume that expired instances have already been cleaned
-            // calculate the next reset time
-            t = (t / DAY) * DAY;
-            t += ((today - t) / period + 1) * period + diff;
-            CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u' AND difficulty= '%u'", (uint64)t, mapid, difficulty);
+            t = CalculateNextResetTime(mapDiff);
+            CharacterDatabase.DirectPExecute("REPLACE INTO instance_reset VALUES ('%u','%u','" UI64FMTD "')", mapid, difficulty, (uint64)t);
         }
 
         SetResetTimeFor(mapid,difficulty,t);
 
         // schedule the global reset/warning
         ResetEventType type = RESET_EVENT_INFORM_1;
-        for(; type < RESET_EVENT_INFORM_LAST; type = ResetEventType(type+1))
-            if(t - resetEventTypeDelay[type] > now)
+        for (; type < RESET_EVENT_INFORM_LAST; type = ResetEventType(type + 1))
+            if (t > time_t(now + resetEventTypeDelay[type]))
                 break;
 
         ScheduleReset(true, t - resetEventTypeDelay[type], DungeonResetEvent(type, mapid, difficulty, 0));
@@ -527,8 +695,8 @@ void DungeonResetScheduler::ScheduleReset(bool add, time_t time, DungeonResetEve
 
 void DungeonResetScheduler::Update()
 {
-    time_t now = time(NULL), t;
-    while(!m_resetTimeQueue.empty() && (t = m_resetTimeQueue.begin()->first) < now)
+    time_t now = time(NULL);
+    while(!m_resetTimeQueue.empty() && (m_resetTimeQueue.begin()->first) < now)
     {
         DungeonResetEvent &event = m_resetTimeQueue.begin()->second;
         if (event.type == RESET_EVENT_NORMAL_DUNGEON)
@@ -540,8 +708,10 @@ void DungeonResetScheduler::Update()
         {
             // global reset/warning for a certain map
             time_t resetTime = GetResetTimeFor(event.mapid,event.difficulty);
-            m_InstanceSaves._ResetOrWarnAll(event.mapid, event.difficulty, event.type != RESET_EVENT_INFORM_LAST, uint32(resetTime - now));
-            if (event.type != RESET_EVENT_INFORM_LAST)
+            //MapDifficultyEntry const* mapDiff = GetMapDifficultyData(event.mapid,event.difficulty);
+
+            m_InstanceSaves._ResetOrWarnAll(event.mapid, event.difficulty, event.type != RESET_EVENT_INFORM_LAST, resetTime);
+            if(event.type != RESET_EVENT_INFORM_LAST)
             {
                 // schedule the next warning/reset
                 event.type = ResetEventType(event.type+1);
@@ -551,18 +721,18 @@ void DungeonResetScheduler::Update()
             {
                 // re-schedule the next/new global reset/warning
                 // calculate the next reset time
-                MapDifficulty const* mapDiff = GetMapDifficultyData(event.mapid,event.difficulty);
+                MapDifficultyEntry const* mapDiff = GetMapDifficultyData(event.mapid,event.difficulty);
                 MANGOS_ASSERT(mapDiff);
 
-                time_t next_reset = DungeonResetScheduler::CalculateNextResetTime(mapDiff, resetTime);
+                time_t next_reset = DungeonResetScheduler::CalculateNextResetTime(mapDiff);
 
-                CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u' AND difficulty = '%u'", uint64(next_reset), uint32(event.mapid), uint32(event.difficulty));
+                CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '" UI64FMTD "' WHERE mapid = '%u' AND difficulty = '%u'", (uint64)next_reset, uint32(event.mapid), uint32(event.difficulty));
 
                 SetResetTimeFor(event.mapid, event.difficulty, next_reset);
 
                 ResetEventType type = RESET_EVENT_INFORM_1;
-                for (; type < RESET_EVENT_INFORM_LAST; type = ResetEventType(type+1))
-                    if (next_reset - resetEventTypeDelay[type] > now)
+                for (; type < RESET_EVENT_INFORM_LAST; type = ResetEventType(type + 1))
+                    if (next_reset > time_t(now + resetEventTypeDelay[type]))
                         break;
 
                 // add new scheduler event to the queue
@@ -602,7 +772,7 @@ MapPersistentState* MapPersistentStateManager::AddPersistentState(MapEntry const
 
     if (mapEntry->IsDungeon())
     {
-        if (!resetTime)
+        if (!resetTime || resetTime < time(NULL))
         {
             // initialize reset time
             // for normal instances if no creatures are killed the instance will reset in two hours
@@ -617,10 +787,10 @@ MapPersistentState* MapPersistentStateManager::AddPersistentState(MapEntry const
         }
     }
 
-    DEBUG_LOG("MapPersistentStateManager::AddPersistentState: mapid = %d, instanceid = %d, reset time = %u, canRset = %u", mapEntry->MapID, instanceId, resetTime, canReset ? 1 : 0);
+    DEBUG_LOG("MapPersistentStateManager::AddPersistentState: mapid = %d, instanceid = %d, reset time = '" UI64FMTD "', canRset = %u", mapEntry->MapID, instanceId, uint64(resetTime), canReset ? 1 : 0);
 
-    MapPersistentState *state;
-    if (mapEntry->IsDungeon())
+    MapPersistentState* state = NULL;
+    if (mapEntry->IsDungeon() && instanceId)
     {
         DungeonPersistentState* dungeonState = new DungeonPersistentState(mapEntry->MapID, instanceId, difficulty, resetTime, canReset, completedEncountersMask);
         if (!load)
@@ -629,18 +799,26 @@ MapPersistentState* MapPersistentStateManager::AddPersistentState(MapEntry const
     }
     else if (mapEntry->IsBattleGroundOrArena())
         state = new BattleGroundPersistentState(mapEntry->MapID, instanceId, difficulty);
-    else
+    else if (!instanceId)
         state = new WorldPersistentState(mapEntry->MapID);
+    else
+    {
+        sLog.outError("MapPersistentStateManager::AddPersistentState cannot create persistent state for mapid = %d, instanceid = %d, reset time = %ld, canReset = %u", mapEntry->MapID, instanceId, resetTime, canReset ? 1 : 0);
+        return state;
+    }
 
 
-    if (instanceId)
+    if (state && instanceId)
         m_instanceSaveByInstanceId[instanceId] = state;
-    else
+    else if (state && !instanceId)
         m_instanceSaveByMapId[mapEntry->MapID] = state;
 
-    if (initPools)
+    if (state && initPools)
         state->InitPools();
 
+    if (state)
+        sWorldStateMgr.CreateInstanceState(mapEntry->MapID, instanceId);
+
     return state;
 }
 
@@ -677,6 +855,7 @@ void MapPersistentStateManager::RemovePersistentState(uint32 mapId, uint32 insta
     if (lock_instLists)
         return;
 
+    sWorldStateMgr.DeleteInstanceState(mapId, instanceId);
     if (instanceId)
     {
         PersistentStateMap::iterator itr = m_instanceSaveByInstanceId.find(instanceId);
@@ -685,9 +864,13 @@ void MapPersistentStateManager::RemovePersistentState(uint32 mapId, uint32 insta
             // state the resettime for normal instances only when they get unloaded
             if (itr->second->GetMapEntry()->IsDungeon())
                 if (time_t resettime = ((DungeonPersistentState*)itr->second)->GetResetTimeForDB())
-                    CharacterDatabase.PExecute("UPDATE instance SET resettime = '"UI64FMTD"' WHERE id = '%u'", (uint64)resettime, instanceId);
+                {
+                    CharacterDatabase.PExecute("UPDATE instance SET resettime = '" UI64FMTD "' WHERE id = '%u'", (uint64)resettime, instanceId);
+                    sLog.outDetail("MapPersistentStateManager::RemovePersistentState map %u instance %u difficulty %u reset time setted to %u", mapId, instanceId, itr->second->GetDifficulty(), (uint64)resettime);
+                }
 
             _ResetSave(m_instanceSaveByInstanceId, itr);
+            sWorldStateMgr.DeleteInstanceState(mapId, instanceId);
         }
     }
     else
@@ -700,7 +883,7 @@ void MapPersistentStateManager::RemovePersistentState(uint32 mapId, uint32 insta
 
 void MapPersistentStateManager::_DelHelper(DatabaseType &db, const char *fields, const char *table, const char *queryTail,...)
 {
-    Tokens fieldTokens = StrSplit(fields, ", ");
+    Tokens fieldTokens(fields, ',');
     MANGOS_ASSERT(fieldTokens.size() != 0);
 
     va_list ap;
@@ -831,20 +1014,20 @@ void MapPersistentStateManager::_ResetInstance(uint32 mapid, uint32 instanceId)
         // delay reset until map unload for loaded map
         if (Map * iMap = itr->second->GetMap())
         {
-            MANGOS_ASSERT(iMap->IsDungeon());
+//            MANGOS_ASSERT(iMap->IsDungeon());
 
-            ((DungeonMap*)iMap)->Reset(INSTANCE_RESET_RESPAWN_DELAY);
+            if (iMap->IsDungeon())
+                ((DungeonMap*)iMap)->Reset(INSTANCE_RESET_RESPAWN_DELAY);
             return;
         }
 
         _ResetSave(m_instanceSaveByInstanceId, itr);
     }
 
-
     DeleteInstanceFromDB(instanceId);                       // even if state not loaded
 }
 
-void MapPersistentStateManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, uint32 timeLeft)
+void MapPersistentStateManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, time_t resetTime)
 {
     // global reset for all instances of the given map
     MapEntry const *mapEntry = sMapStore.LookupEntry(mapid);
@@ -855,7 +1038,7 @@ void MapPersistentStateManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficu
 
     if (!warn)
     {
-        MapDifficulty const* mapDiff = GetMapDifficultyData(mapid,difficulty);
+        MapDifficultyEntry const* mapDiff = GetMapDifficultyData(mapid,difficulty);
         if (!mapDiff || !mapDiff->resetTime)
         {
             sLog.outError("MapPersistentStateManager::ResetOrWarnAll: not valid difficulty or no reset delay for map %d", mapid);
@@ -879,25 +1062,25 @@ void MapPersistentStateManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficu
         CharacterDatabase.CommitTransaction();
 
         // calculate the next reset time
-        time_t next_reset = DungeonResetScheduler::CalculateNextResetTime(mapDiff, now + timeLeft);
+        time_t next_reset = DungeonResetScheduler::CalculateNextResetTime(mapDiff);
         // update it in the DB
-        CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u' AND difficulty = '%u'", (uint64)next_reset, mapid, difficulty);
+        CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '" UI64FMTD "' WHERE mapid = '%u' AND difficulty = '%u'", (uint64)next_reset, mapid, difficulty);
     }
 
     // note: this isn't fast but it's meant to be executed very rarely
-    const MapManager::MapMapType& maps = sMapMgr.Maps();
+    MapManager::MapMapType const& maps = sMapMgr.Maps();
 
-    MapManager::MapMapType::const_iterator iter_last = maps.lower_bound(MapID(mapid + 1));
-    for(MapManager::MapMapType::const_iterator mitr = maps.lower_bound(MapID(mapid)); mitr != iter_last; ++mitr)
+    for (MapManager::MapMapType::const_iterator mitr = maps.begin(); mitr != maps.end(); ++mitr)
     {
-        Map *map2 = mitr->second;
+        MapPtr map2 = mitr->second;
+
         if(map2->GetId() != mapid)
             break;
 
         if (warn)
-            ((DungeonMap*)map2)->SendResetWarnings(timeLeft);
+            ((DungeonMap*)&*(map2))->SendResetWarnings(resetTime - now);
         else
-            ((DungeonMap*)map2)->Reset(INSTANCE_RESET_GLOBAL);
+            ((DungeonMap*)&*(map2))->Reset(INSTANCE_RESET_GLOBAL);
     }
 }
 
@@ -921,7 +1104,7 @@ void MapPersistentStateManager::GetStatistics(uint32& numStates, uint32& numBoun
 
 void MapPersistentStateManager::_CleanupExpiredInstancesAtTime( time_t t )
 {
-    _DelHelper(CharacterDatabase, "id, map, instance.difficulty", "instance", "LEFT JOIN instance_reset ON mapid = map AND instance.difficulty =  instance_reset.difficulty WHERE (instance.resettime < '"UI64FMTD"' AND instance.resettime > '0') OR (NOT instance_reset.resettime IS NULL AND instance_reset.resettime < '"UI64FMTD"')",  (uint64)t, (uint64)t);
+    _DelHelper(CharacterDatabase, "id, map, instance.difficulty", "instance", "LEFT JOIN instance_reset ON mapid = map AND instance.difficulty =  instance_reset.difficulty WHERE (instance.resettime < '" UI64FMTD "' AND instance.resettime > '0') OR (NOT instance_reset.resettime IS NULL AND instance_reset.resettime < '" UI64FMTD "')",  (uint64)t, (uint64)t);
 }
 
 
@@ -976,14 +1159,14 @@ void MapPersistentStateManager::LoadCreatureRespawnTimes()
         if (!data)
             continue;
 
-        if (mapId != data->mapid)
+        if (instanceId && mapId != data->mapid)
             continue;
 
-        MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
+        MapEntry const* mapEntry = sMapStore.LookupEntry(data->mapid);
         if (!mapEntry || (mapEntry->Instanceable() != (instanceId != 0)))
             continue;
 
-        if (difficulty >= (!mapEntry->Instanceable() ? REGULAR_DIFFICULTY : (mapEntry->IsRaid() ? MAX_RAID_DIFFICULTY : MAX_DUNGEON_DIFFICULTY)))
+        if (mapEntry->Instanceable() && difficulty >= (mapEntry->IsRaid() ? MAX_RAID_DIFFICULTY : MAX_DUNGEON_DIFFICULTY))
             continue;
 
         MapPersistentState* state = AddPersistentState(mapEntry, instanceId, Difficulty(difficulty), resetTime, mapEntry->IsDungeon(), true, true, completedEncounters);
@@ -1042,14 +1225,14 @@ void MapPersistentStateManager::LoadGameobjectRespawnTimes()
         if (!data)
             continue;
 
-        if (mapId != data->mapid)
+        if (instanceId && mapId != data->mapid)
             continue;
 
-        MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
+        MapEntry const* mapEntry = sMapStore.LookupEntry(data->mapid);
         if (!mapEntry || (mapEntry->Instanceable() != (instanceId != 0)))
             continue;
 
-        if (difficulty >= (!mapEntry->Instanceable() ? REGULAR_DIFFICULTY : (mapEntry->IsRaid() ? MAX_RAID_DIFFICULTY : MAX_DUNGEON_DIFFICULTY)))
+        if (mapEntry->Instanceable() && difficulty >= (mapEntry->IsRaid() ? MAX_RAID_DIFFICULTY : MAX_DUNGEON_DIFFICULTY))
             continue;
 
         MapPersistentState* state = AddPersistentState(mapEntry, instanceId, Difficulty(difficulty), resetTime, mapEntry->IsDungeon(), true, true, completedEncounters);
@@ -1067,3 +1250,39 @@ void MapPersistentStateManager::LoadGameobjectRespawnTimes()
     sLog.outString(">> Loaded %u gameobject respawn times", count);
     sLog.outString();
 }
+
+void MapPersistentStateManager::Update()
+{
+    m_Scheduler.Update();
+
+    MapIDSet removedSet;
+
+    // instance cleanups
+    for (PersistentStateMap::iterator itr = m_instanceSaveByInstanceId.begin(); itr != m_instanceSaveByInstanceId.end(); ++itr)
+    {
+        for (GuidSet::const_iterator itr1 = m_unloadQueue.begin(); itr1 != m_unloadQueue.end(); ++itr1)
+            itr->second->RemoveFromBindList(*itr1);
+
+        if (itr->second && itr->second->IsRequiresRemove())
+            removedSet.insert(MapID(itr->second->GetMapId(), itr->second->GetInstanceId()));
+    }
+    // map cleanups
+    for (PersistentStateMap::iterator itr = m_instanceSaveByMapId.begin(); itr != m_instanceSaveByMapId.end(); ++itr)
+    {
+        for (GuidSet::const_iterator itr1 = m_unloadQueue.begin(); itr1 != m_unloadQueue.end(); ++itr1)
+            itr->second->RemoveFromBindList(*itr1);
+
+        if (itr->second && itr->second->IsRequiresRemove())
+            removedSet.insert(MapID(itr->second->GetMapId(), itr->second->GetInstanceId()));
+    }
+
+    m_unloadQueue.clear();
+
+    for (MapIDSet::const_iterator itr = removedSet.begin(); itr != removedSet.end(); ++itr)
+        RemovePersistentState(itr->GetId(), itr->GetInstanceId());
+}
+
+void MapPersistentStateManager::AddToUnbindQueue(ObjectGuid const& guid)
+{
+    m_unloadQueue.insert(guid);
+}
diff --git a/src/game/MapPersistentStateMgr.h b/src/game/MapPersistentStateMgr.h
index 6f6c375b425..4b247044589 100644
--- a/src/game/MapPersistentStateMgr.h
+++ b/src/game/MapPersistentStateMgr.h
@@ -25,7 +25,6 @@
 #include "ace/Thread_Mutex.h"
 #include <list>
 #include <map>
-#include "Utilities/UnorderedMapSet.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "DBCStores.h"
@@ -34,7 +33,7 @@
 
 struct InstanceTemplate;
 struct MapEntry;
-struct MapDifficulty;
+struct MapDifficultyEntry;
 struct GameObjectData;
 struct CreatureData;
 
@@ -42,7 +41,7 @@ class Player;
 class Group;
 class Map;
 
-typedef std::set<uint32> CellGuidSet;
+typedef UNORDERED_SET<uint32> CellGuidSet;
 
 struct MapCellObjectGuids
 {
@@ -50,10 +49,41 @@ struct MapCellObjectGuids
     CellGuidSet gameobjects;
 };
 
+struct SpecialEncounterState
+{
+    SpecialEncounterState(ObjectGuid _guid, EncounterFrameCommand _command,  uint8 _data1, uint8 _data2)
+        : guid(_guid), lastCommand(_command), data1(_data1), data2(_data2)
+    {
+        //lastCommand = ENCOUNTER_FRAME_ENGAGE;
+        active = true;
+    };
+
+    void SetCommand(EncounterFrameCommand _command) { lastCommand = _command;};
+
+    ObjectGuid guid;                       // Creature/GO(?), which linked with this state
+    EncounterFrameCommand lastCommand;     // Last command sended to this state
+    uint8 data1;
+    uint8 data2;
+    bool active;
+};
+
+typedef std::map<ObjectGuid, SpecialEncounterState> SpecialEncountersMap;
+
 typedef UNORDERED_MAP<uint32/*cell_id*/,MapCellObjectGuids> MapCellObjectGuidsMap;
 
 class MapPersistentStateManager;
 
+// Instance Reset Schedule is calculated from this point in time.
+// 2005-12-28 10:00:00 - 10:00:00 = 2005-12-28 00:00:00
+// We will add X hours to this value, taking X from config (10 default).
+#define INSTANCE_RESET_SCHEDULE_START_TIME  1135717200
+#define INSTANCE_MAX_RESET_OFFSET  7*DAY
+/*
+    Holds the information necessary for creating a new map for non-instanceable maps
+
+    As object Used for non-instanceable Map only
+*/
+
 class MapPersistentState
 {
     friend class MapPersistentStateManager;
@@ -88,6 +118,11 @@ class MapPersistentState
                 UnloadIfEmpty();
         }
 
+        virtual void AddToBindList(ObjectGuid const& guid) {};
+        virtual void RemoveFromBindList(ObjectGuid const& guid) {};
+
+        bool const& IsRequiresRemove() const { return m_needRemove; };
+
         time_t GetCreatureRespawnTime(uint32 loguid) const
         {
             RespawnTimes::const_iterator itr = m_creatureRespawnTimes.find(loguid);
@@ -133,6 +168,8 @@ class MapPersistentState
         Difficulty m_difficulty;
         Map* m_usedByMap;                                   // NULL if map not loaded, non-NULL lock MapPersistentState from unload
 
+        bool m_needRemove;
+
         // persistent data
         RespawnTimes m_creatureRespawnTimes;                // lock MapPersistentState from unload, for example for temporary bound dungeon unload delay
         RespawnTimes m_goRespawnTimes;                      // lock MapPersistentState from unload, for example for temporary bound dungeon unload delay
@@ -142,7 +179,10 @@ class MapPersistentState
 inline bool MapPersistentState::CanBeUnload() const
 {
     // prevent unload if used for loaded map
-    return !m_usedByMap;
+    if (GetMap())
+        return false;
+    else
+        return true;
 }
 
 class WorldPersistentState : public MapPersistentState
@@ -191,19 +231,17 @@ class DungeonPersistentState : public MapPersistentState
         uint8 GetPlayerCount() const { return m_playerList.size(); }
         uint8 GetGroupCount() const { return m_groupList.size(); }
 
-        /* online players bound to the instance (perm/solo)
-           does not include the members of the group unless they have permanent saves */
-        void AddPlayer(Player *player) { m_playerList.push_back(player); }
-        bool RemovePlayer(Player *player) { m_playerList.remove(player); return UnloadIfEmpty(); }
-        /* all groups bound to the instance */
-        void AddGroup(Group *group) { m_groupList.push_back(group); }
-        bool RemoveGroup(Group *group) { m_groupList.remove(group); return UnloadIfEmpty(); }
+        /* online players (perm/solo) and all groups bound to the instance.
+           for players: does not include the members of the group unless they have permanent saves */
+        virtual void AddToBindList(ObjectGuid const& guid) override;
+        virtual void RemoveFromBindList(ObjectGuid const& guid) override;
 
         /* for normal instances this corresponds to max(creature respawn time) + X hours
            for raid/heroic instances this caches the global respawn time for the map */
         time_t GetResetTime() const { return m_resetTime; }
         void SetResetTime(time_t resetTime) { m_resetTime = resetTime; }
         time_t GetResetTimeForDB() const;
+        time_t GetRealResetTime() const;
 
         /* instances cannot be reset (except at the global reset time)
            if there are players permanently bound to it
@@ -211,12 +249,22 @@ class DungeonPersistentState : public MapPersistentState
         bool CanReset() const { return m_canReset; }
         void SetCanReset(bool canReset) { m_canReset = canReset; }
 
+        // Work with extended instances
+        bool IsExtended() const { return m_isExtended; }
+        void SetExtended(bool isExtended) { m_isExtended = isExtended; }
+
         // DBC encounter state update at kill/spell cast
         void UpdateEncounterState(EncounterCreditType type, uint32 creditEntry);
 
         // mask of completed encounters
         uint32 GetCompletedEncountersMask() { return m_completedEncountersMask; }
 
+        bool IsCompleted();
+
+        // Special (linked) encounter frame state set/send
+        void UpdateSpecialEncounterState(EncounterFrameCommand command, ObjectGuid linkedGuid, uint8 data1 = 0, uint8 data2 = 0);
+        void SendSpecialEncounterState(ObjectGuid linkedGuid);
+
         /* Saved when the instance is generated for the first time */
         void SaveToDB();
         /* When the instance is being reset (permanently deleted) */
@@ -229,21 +277,21 @@ class DungeonPersistentState : public MapPersistentState
         bool HasBounds() const { return !m_playerList.empty() || !m_groupList.empty(); }
 
     private:
-        typedef std::list<Player*> PlayerListType;
-        typedef std::list<Group*> GroupListType;
-
         time_t m_resetTime;
         bool m_canReset;
+        bool m_isExtended;
 
         /* the only reason the instSave-object links are kept is because
            the object-instSave links need to be broken at reset time
            TODO: maybe it's enough to just store the number of players/groups */
-        PlayerListType m_playerList;                        // lock MapPersistentState from unload
-        GroupListType m_groupList;                          // lock MapPersistentState from unload
+        GuidSet m_playerList;                               // lock MapPersistentState from unload
+        GuidSet m_groupList;                                // lock MapPersistentState from unload
 
         SpawnedPoolData m_spawnedPoolData;                  // Pools spawns state for map copy
 
         uint32 m_completedEncountersMask;                   // completed encounter mask, bit indexes are DungeonEncounter.dbc boss numbers, used for packets
+
+        SpecialEncountersMap m_specialEncountersMap;        // special (framed) encounters states
 };
 
 class BattleGroundPersistentState : public MapPersistentState
@@ -304,8 +352,9 @@ class DungeonResetScheduler
             return itr != m_resetTimeByMapDifficulty.end() ? itr->second : 0;
         }
 
-        static uint32 GetMaxResetTimeFor(MapDifficulty const* mapDiff);
-        static time_t CalculateNextResetTime(MapDifficulty const* mapDiff, time_t prevResetTime);
+        static uint32 GetMaxResetTimeFor(MapDifficultyEntry const* mapDiff);
+        static time_t CalculateNextResetTime(MapDifficultyEntry const* mapDiff);
+
     public:                                                 // modifiers
         void SetResetTimeFor(uint32 mapid, Difficulty d, time_t t)
         {
@@ -327,7 +376,7 @@ class DungeonResetScheduler
         ResetTimeQueue m_resetTimeQueue;
 };
 
-class MANGOS_DLL_DECL MapPersistentStateManager : public MaNGOS::Singleton<MapPersistentStateManager, MaNGOS::ClassLevelLockable<MapPersistentStateManager, ACE_Thread_Mutex> >
+class MANGOS_DLL_DECL MapPersistentStateManager : public MaNGOS::Singleton<MapPersistentStateManager, MaNGOS::ClassLevelLockable<MapPersistentStateManager, MANGOSR2_MUTEX_MODEL_2> >
 {
     friend class DungeonResetScheduler;
     public:                                                 // constructors
@@ -363,12 +412,15 @@ class MANGOS_DLL_DECL MapPersistentStateManager : public MaNGOS::Singleton<MapPe
 
         void GetStatistics(uint32& numStates, uint32& numBoundPlayers, uint32& numBoundGroups);
 
-        void Update() { m_Scheduler.Update(); }
+        void Update();
+
+        void AddToUnbindQueue(ObjectGuid const& guid);
+
     private:
         typedef UNORDERED_MAP<uint32 /*InstanceId or MapId*/, MapPersistentState*> PersistentStateMap;
 
         //  called by scheduler for DungeonPersistentStates
-        void _ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, uint32 timeleft);
+        void _ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, time_t resetTime);
         void _ResetInstance(uint32 mapid, uint32 instanceId);
         void _CleanupExpiredInstancesAtTime(time_t t);
 
@@ -383,6 +435,7 @@ class MANGOS_DLL_DECL MapPersistentStateManager : public MaNGOS::Singleton<MapPe
         PersistentStateMap m_instanceSaveByMapId;
 
         DungeonResetScheduler m_Scheduler;
+        GuidSet               m_unloadQueue;
 };
 
 template<typename Do>
diff --git a/src/game/MapUpdater.cpp b/src/game/MapUpdater.cpp
new file mode 100644
index 00000000000..3c03e0e5cb0
--- /dev/null
+++ b/src/game/MapUpdater.cpp
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2011-2013 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "MapUpdater.h"
+#include "ObjectUpdateTaskBase.h"
+#include "Map.h"
+#include "MapManager.h"
+#include "World.h"
+#include "Database/DatabaseEnv.h"
+
+MapUpdater::MapUpdater() : ObjectUpdateTaskBase<class Map>()
+{
+    m_threadsCountPreferred = sWorld.getConfig(CONFIG_BOOL_THREADS_DYNAMIC) ? 1 : sWorld.getConfig(CONFIG_UINT32_NUMTHREADS);
+
+    if (m_threadsCountPreferred > 0 && activate(m_threadsCountPreferred) == -1)
+        abort();
+
+    i_balanceTimer.SetInterval(sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE)*100);
+    m_previewTimeStamp = WorldTimer::getMSTime();
+    m_workTimeStorage = 0;
+    m_sleepTimeStorage = 0;
+    m_tickCount = 0;
+}
+
+int MapUpdater::update_hook()
+{
+    return 0;
+}
+
+int MapUpdater::freeze_hook()
+{
+    if (sWorld.getConfig(CONFIG_UINT32_VMSS_FREEZEDETECTTIME) == 0 ||  getActiveThreadsCount() == 0)
+        return 0;
+
+    // Lock in this case
+    ACE_Read_Guard<ACE_RW_Thread_Mutex> guardRW(m_rwmutex, true);
+    for (ThreadsMap::const_iterator itr = m_threadsMap.begin(); itr != m_threadsMap.end(); ++itr)
+    {
+        ObjectUpdateRequest<Map>* rq = itr->second;
+        if (!rq)
+            continue;
+
+        if (WorldTimer::getMSTime() - rq->getStartTime() > sWorld.getConfig(CONFIG_UINT32_VMSS_FREEZEDETECTTIME))
+        {
+            if (Map* map = rq->getObject())
+            {
+                map->SetBroken(true);
+                MapBrokenEvent(map);
+                ACE_thread_t threadId = itr->first;
+                sLog.outError("VMSS::MapUpdater::freeze_hook thread " I64FMT " possible freezed (is update map %u instance %u), killing his.", threadId, map->GetId(), map->GetInstanceId());
+                guardRW.release();
+                kill_thread(threadId, true);
+                if (m_queue.is_empty() && getActiveThreadsCount() == 0)
+                    return 1;
+                else
+                    return 0;
+            }
+        }
+    }
+    return 0;
+}
+
+void MapUpdater::MapBrokenEvent(Map* map)
+{
+    MapStatisticData& data = m_mapStatData[map];
+
+    if ((WorldTimer::getMSTime() - data.lastErrorTime) > sWorld.getConfig(CONFIG_UINT32_VMSS_TBREMTIME))
+    {
+        data.BreaksReset();
+        data.IncreaseBreaksCount();
+    }
+    else
+        data.IncreaseBreaksCount();
+}
+
+MapStatisticData const* MapUpdater::GetMapStatisticData(Map* map)
+{
+    return &m_mapStatData[map];
+}
+
+void MapUpdater::MapStatisticDataRemove(Map* map)
+{
+    if (!m_mapStatData.empty())
+    {
+        MapStatisticDataMap::const_iterator itr =  m_mapStatData.find(map);
+        if (itr != m_mapStatData.end())
+            m_mapStatData.erase(itr);
+    }
+}
+
+void MapUpdater::UpdateLoadBalancer(bool b_start)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_THREADS_DYNAMIC))
+    {
+        // only support for reloading config value of CONFIG_UINT32_NUMTHREADS;
+        m_threadsCountPreferred = sWorld.getConfig(CONFIG_UINT32_NUMTHREADS);
+        return;
+    }
+
+    uint32 timeDiff = WorldTimer::getMSTimeDiff(m_previewTimeStamp, WorldTimer::getMSTime());
+    m_previewTimeStamp = WorldTimer::getMSTime();
+
+    if (b_start)
+    {
+        m_sleepTimeStorage += timeDiff;
+        ++m_tickCount;
+    }
+    else
+        m_workTimeStorage += timeDiff;
+
+
+    i_balanceTimer.Update(timeDiff);
+
+    if (!i_balanceTimer.Passed() || !m_tickCount || !(m_workTimeStorage + m_sleepTimeStorage))
+        return;
+
+    float loadValue = float((m_workTimeStorage)/m_tickCount)/float((m_workTimeStorage + m_sleepTimeStorage)/ m_tickCount);
+
+    if (loadValue >= sWorld.getConfig(CONFIG_FLOAT_LOADBALANCE_HIGHVALUE))
+        m_threadsCountPreferred = (m_threadsCountPreferred < (int32)sWorld.getConfig(CONFIG_UINT32_NUMTHREADS)) ? (m_threadsCountPreferred + 1) : sWorld.getConfig(CONFIG_UINT32_NUMTHREADS);
+    else if (loadValue <= sWorld.getConfig(CONFIG_FLOAT_LOADBALANCE_LOWVALUE))
+        m_threadsCountPreferred = (m_threadsCountPreferred > 1) ? (m_threadsCountPreferred - 1) : 1;
+    else
+        m_threadsCountPreferred = getCurrentThreadsCount();
+
+    if (m_threadsCountPreferred != getCurrentThreadsCount())
+        sLog.outDetail("MapUpdater::UpdateLoadBalancer load balance %f (tick count %u), threads %u, new %u", loadValue, m_tickCount, getCurrentThreadsCount(), m_threadsCountPreferred);
+
+    m_workTimeStorage = 0;
+    m_sleepTimeStorage = 0;
+    m_tickCount = 0;
+
+    i_balanceTimer.SetCurrent(0);
+}
+
+void MapUpdater::ReactivateIfNeed()
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_THREADS_DYNAMIC) && sWorld.getConfig(CONFIG_UINT32_NUMTHREADS) < 2)
+        return;
+    std::string updaterErr = getLastError();
+    if (!updaterErr.empty())
+            sLog.outError("MapUpdater::ReactivateIfNeed updater reports %s.", updaterErr.c_str());
+
+    if (m_threadsCountPreferred != getCurrentThreadsCount())
+        sLog.outDetail("MapUpdater::Update map virtual server threads pool reactivated, new threads count is %u", m_threadsCountPreferred);
+
+    reactivate(m_threadsCountPreferred);
+}
\ No newline at end of file
diff --git a/src/game/MapUpdater.h b/src/game/MapUpdater.h
new file mode 100644
index 00000000000..2959f8ec8dc
--- /dev/null
+++ b/src/game/MapUpdater.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2011-2013 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _MAP_UPDATER_H_INCLUDED
+#define _MAP_UPDATER_H_INCLUDED
+
+#include "ObjectUpdateTaskBase.h"
+#include "Common.h"
+
+class Map;
+
+struct MapStatisticData
+{
+    explicit MapStatisticData()
+    {
+        BreaksReset();
+        CleanStatistic();
+    }
+
+    void BreaksReset()
+    {
+        breaksCount = 0;
+        lastErrorTime = WorldTimer::getMSTime();
+    };
+
+    void IncreaseBreaksCount() { ++breaksCount; ++summBreaksCount; lastErrorTime = WorldTimer::getMSTime(); };
+
+    void CleanStatistic() 
+    {
+        updatesCount = 0;
+        maxUpdateTime = 0;
+        minUpdateTime = 0;
+        averageUpdateTime = 0;
+        lifeTime = 0;
+        summBreaksCount = 0;
+    };
+
+    // Freeze detection/statistic
+    uint32 breaksCount;
+    uint32 lastErrorTime;
+
+    // common statistic
+    //
+    uint32 updatesCount;
+    uint32 maxUpdateTime;
+    uint32 minUpdateTime;
+    uint32 averageUpdateTime;
+    uint32 lifeTime;
+    uint32 summBreaksCount;
+};
+
+typedef UNORDERED_MAP<Map*, MapStatisticData> MapStatisticDataMap;
+
+class MapUpdater : public ObjectUpdateTaskBase<class Map>
+{
+    public:
+
+        MapUpdater();
+
+        virtual ~MapUpdater() {};
+
+        void ReactivateIfNeed();
+        void UpdateLoadBalancer(bool b_start);
+
+        Map* GetMapByThreadId(ACE_thread_t const threadId);
+        void MapBrokenEvent(Map* map);
+
+        MapStatisticData const* GetMapStatisticData(Map* map);
+        void MapStatisticDataRemove(Map* map);
+
+        virtual int update_hook() override;
+        virtual int freeze_hook() override;
+
+    private:
+        MapStatisticDataMap   m_mapStatData;
+
+        ShortIntervalTimer i_balanceTimer;
+        int32  m_threadsCountPreferred;
+        uint32 m_previewTimeStamp;
+        uint64 m_workTimeStorage;
+        uint64 m_sleepTimeStorage;
+        uint32 m_tickCount;
+};
+
+#endif //_MAP_UPDATER_H_INCLUDED
diff --git a/src/game/MassMailMgr.cpp b/src/game/MassMailMgr.cpp
index bea865a1e5a..2eedd2ba902 100644
--- a/src/game/MassMailMgr.cpp
+++ b/src/game/MassMailMgr.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "MassMailMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/DatabaseImpl.h"
 #include "SharedDefines.h"
@@ -35,33 +35,33 @@
 
 INSTANTIATE_SINGLETON_1(MassMailMgr);
 
-void MassMailMgr::AddMassMailTask(MailDraft* mailProto, MailSender sender, uint32 raceMask)
+void MassMailMgr::AddMassMailTask(MailDraft* mailProto, MailSender sender, uint32 raceMask, Gender gender/*= GENDER_NONE*/)
 {
+    std::ostringstream ss;
+    ss << "SELECT guid FROM characters WHERE deleteDate IS NULL";
+
     if (RACEMASK_ALL_PLAYABLE & ~raceMask)                  // have races not included in mask
-    {
-        std::ostringstream ss;
-        ss << "SELECT guid FROM characters WHERE (1 << (race - 1)) & " << raceMask << " AND deleteDate IS NULL";
-        AddMassMailTask(mailProto, sender, ss.str().c_str());
-    }
-    else
-        AddMassMailTask(mailProto, sender, "SELECT guid FROM characters WHERE deleteDate IS NULL");
+        ss << " AND (1 << (race - 1)) & " << raceMask;
+
+    if (gender != GENDER_NONE)
+        ss << " AND gender = " << uint32(gender);
+
+    AddMassMailTask(mailProto, sender, ss.str().c_str());
 }
 
 struct MassMailerQueryHandler
 {
-    void HandleQueryCallback(QueryResult * result, MailDraft* mailProto, MailSender sender)
+    void HandleQueryCallback(QueryResult* result, MailDraft* mailProto, MailSender sender)
     {
         if (!result)
             return;
 
         MassMailMgr::ReceiversList& recievers = sMassMailMgr.AddMassMailTask(mailProto, sender);
-
         do
         {
-            Field *fields = result->Fetch();
-            recievers.insert(fields[0].GetUInt32());
-
-        } while (result->NextRow());
+            recievers.insert(result->Fetch()[0].GetUInt32());
+        }
+        while (result->NextRow());
         delete result;
     }
 } massMailerQueryHandler;
diff --git a/src/game/MassMailMgr.h b/src/game/MassMailMgr.h
index 2adf54c0f3e..455b81d15b8 100644
--- a/src/game/MassMailMgr.h
+++ b/src/game/MassMailMgr.h
@@ -35,6 +35,7 @@
 #define MANGOS_MASS_MAIL_MGR_H
 
 #include "Common.h"
+#include "SharedDefines.h"
 #include "Mail.h"
 #include "Policies/Singleton.h"
 
@@ -64,7 +65,7 @@ class MassMailMgr
          *
          * Note: this function safe to be called from Map::Update content/etc, real data add will executed in next tick after query results ready
          */
-        void AddMassMailTask(MailDraft* mailProto, MailSender sender, uint32 raceMask);
+        void AddMassMailTask(MailDraft* mailProto, MailSender sender, uint32 raceMask, Gender gender = GENDER_NONE);
 
         /**
          * And new mass mail task with SQL query text for fill receivers list.
@@ -122,6 +123,7 @@ class MassMailMgr
 
         /// List of current queued mass mail tasks
         MassMailList m_massMails;
+
 };
 
 #define sMassMailMgr MaNGOS::Singleton<MassMailMgr>::Instance()
diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
index 6c2a500f00e..4fb1a006fcc 100644
--- a/src/game/MiscHandler.cpp
+++ b/src/game/MiscHandler.cpp
@@ -37,7 +37,8 @@
 #include <zlib/zlib.h>
 #include "ObjectAccessor.h"
 #include "Object.h"
-#include "BattleGround.h"
+#include "BattleGround/BattleGround.h"
+#include "OutdoorPvP/OutdoorPvP.h"
 #include "Pet.h"
 #include "SocialMgr.h"
 #include "DBCEnums.h"
@@ -292,14 +293,11 @@ void WorldSession::HandleLogoutRequestOpcode( WorldPacket & /*recv_data*/ )
     // not set flags if player can't free move to prevent lost state at logout cancel
     if(GetPlayer()->CanFreeMove())
     {
-        float height = GetPlayer()->GetTerrain()->GetHeight(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY(), GetPlayer()->GetPositionZ());
+        float height = GetPlayer()->GetMap()->GetHeight(GetPlayer()->GetPhaseMask(), GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY(), GetPlayer()->GetPositionZ());
         if ((GetPlayer()->GetPositionZ() < height + 0.1f) && !(GetPlayer()->IsInWater()))
             GetPlayer()->SetStandState(UNIT_STAND_STATE_SIT);
 
-        WorldPacket data( SMSG_FORCE_MOVE_ROOT, (8+4) );    // guess size
-        data << GetPlayer()->GetPackGUID();
-        data << (uint32)2;
-        SendPacket( &data );
+        GetPlayer()->SetRoot(true);
         GetPlayer()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
     }
 
@@ -328,10 +326,7 @@ void WorldSession::HandleLogoutCancelOpcode( WorldPacket & /*recv_data*/ )
     if(GetPlayer()->CanFreeMove())
     {
         //!we can move again
-        data.Initialize( SMSG_FORCE_MOVE_UNROOT, 8 );       // guess size
-        data << GetPlayer()->GetPackGUID();
-        data << uint32(0);
-        SendPacket( &data );
+        GetPlayer()->SetRoot(false);
 
         //! Stand Up
         GetPlayer()->SetStandState(UNIT_STAND_STATE_STAND);
@@ -406,13 +401,13 @@ void WorldSession::HandleSetSelectionOpcode( WorldPacket & recv_data )
     ObjectGuid guid;
     recv_data >> guid;
 
-    _player->SetSelectionGuid(guid);
-
     // update reputation list if need
     Unit* unit = ObjectAccessor::GetUnit(*_player, guid );  // can select group members at diff maps
     if (!unit)
         return;
 
+    _player->SetSelectionGuid(guid);
+
     if(FactionTemplateEntry const* factionTemplateEntry = sFactionTemplateStore.LookupEntry(unit->getFaction()))
         _player->GetReputationMgr().SetVisible(factionTemplateEntry);
 }
@@ -651,7 +646,7 @@ void WorldSession::HandleReclaimCorpseOpcode(WorldPacket &recv_data)
         return;
 
     // resurrect
-    GetPlayer()->ResurrectPlayer(GetPlayer()->InBattleGround() ? 1.0f : 0.5f);
+    GetPlayer()->ResurrectPlayer(GetPlayer()->InBattleGround() ? 100 : 50);
 
     // spawn bones
     GetPlayer()->SpawnCorpseBones();
@@ -737,127 +732,28 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
         return;
     }
 
-    if (pl->InBattleGround())
+    if (BattleGround* bg = pl->GetBattleGround())
     {
-        if (BattleGround* bg = pl->GetBattleGround())
-            bg->HandleAreaTrigger(pl, Trigger_ID);
+        bg->HandleAreaTrigger(pl, Trigger_ID);
         return;
     }
+    else if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(pl->GetCachedZoneId()))
+    {
+        if (outdoorPvP->HandleAreaTrigger(pl, Trigger_ID))
+            return;
+    }
 
     // NULL if all values default (non teleport trigger)
     AreaTrigger const* at = sObjectMgr.GetAreaTrigger(Trigger_ID);
     if (!at)
         return;
 
-    MapEntry const* targetMapEntry = sMapStore.LookupEntry(at->target_mapId);
+    MapEntry const* targetMapEntry = sMapStore.LookupEntry(at->loc.GetMapId());
     if (!targetMapEntry)
         return;
 
-    if (!pl->isGameMaster())
-    {
-        // ghost resurrected at enter attempt to dungeon with corpse (including fail enter cases)
-        if (!pl->isAlive() && targetMapEntry->IsDungeon())
-        {
-            int32 corpseMapId = 0;
-            if (Corpse *corpse = pl->GetCorpse())
-                corpseMapId = corpse->GetMapId();
-
-            // check back way from corpse to entrance
-            uint32 instance_map = corpseMapId;
-            do
-            {
-                // most often fast case
-                if (instance_map==targetMapEntry->MapID)
-                    break;
-
-                InstanceTemplate const* instance = ObjectMgr::GetInstanceTemplate(instance_map);
-                instance_map = instance ? instance->parent : 0;
-            }
-            while (instance_map);
-
-            // corpse not in dungeon or some linked deep dungeons
-            if (!instance_map)
-            {
-                WorldPacket data(SMSG_AREA_TRIGGER_NO_CORPSE);
-                pl->GetSession()->SendPacket(&data);
-                return;
-            }
-
-            // need find areatrigger to inner dungeon for landing point
-            if (at->target_mapId != corpseMapId)
-            {
-                if (AreaTrigger const* corpseAt = sObjectMgr.GetMapEntranceTrigger(corpseMapId))
-                {
-                    at = corpseAt;
-                    targetMapEntry = sMapStore.LookupEntry(at->target_mapId);
-                }
-            }
-
-            // now we can resurrect player, and then check teleport requirements
-            pl->ResurrectPlayer(0.5f);
-            pl->SpawnCorpseBones();
-        }
-
-        // check trigger requirements
-        bool missingItem = false;
-        bool missingLevel = false;
-        bool missingQuest = false;
-
-        if (pl->getLevel() < at->requiredLevel && !sWorld.getConfig(CONFIG_BOOL_INSTANCE_IGNORE_LEVEL))
-            missingLevel = true;
-
-        // must have one or the other, report the first one that's missing
-        if (at->requiredItem)
-        {
-            if (!pl->HasItemCount(at->requiredItem, 1) &&
-                (!at->requiredItem2 || !GetPlayer()->HasItemCount(at->requiredItem2, 1)))
-                missingItem = true;
-        }
-        else if (at->requiredItem2 && !pl->HasItemCount(at->requiredItem2, 1))
-            missingItem = true;
-
-        bool isRegularTargetMap = !targetMapEntry->IsDungeon() || pl->GetDifficulty(targetMapEntry->IsRaid()) == REGULAR_DIFFICULTY;
-
-        if (!isRegularTargetMap)
-        {
-            if (at->heroicKey)
-            {
-                if (!pl->HasItemCount(at->heroicKey, 1) &&
-                    (!at->heroicKey2 || !pl->HasItemCount(at->heroicKey2, 1)))
-                    missingItem = true;
-            }
-            else if (at->heroicKey2 && !pl->HasItemCount(at->heroicKey2, 1))
-                missingItem = true;
-        }
-
-        if (!isRegularTargetMap)
-        {
-            if (at->requiredQuestHeroic && !pl->GetQuestRewardStatus(at->requiredQuestHeroic))
-                missingQuest = true;
-        }
-        else
-        {
-            if (at->requiredQuest && !pl->GetQuestRewardStatus(at->requiredQuest))
-                missingQuest = true;
-        }
-
-        if (missingItem || missingLevel || missingQuest)
-        {
-            // hack for "Opening of the Dark Portal"
-            if (missingQuest && at->target_mapId == 269)
-                SendAreaTriggerMessage("%s", at->requiredFailedText.c_str());
-            else if (missingQuest && targetMapEntry->IsContinent())// do not report anything for quest areatriggers
-                return;
-            // hack for TBC heroics
-            else if (missingLevel && !targetMapEntry->IsRaid() && GetPlayer()->GetDifficulty(false) == DUNGEON_DIFFICULTY_HEROIC && targetMapEntry->addon == 1)
-                SendAreaTriggerMessage(GetMangosString(LANG_LEVEL_MINREQUIRED), at->requiredLevel);
-            else
-                pl->SendTransferAborted(at->target_mapId, TRANSFER_ABORT_DIFFICULTY, pl->GetDifficulty(targetMapEntry->IsRaid()));
-            return;
-        }
-    }
-
-    GetPlayer()->TeleportTo(at->target_mapId, at->target_X, at->target_Y, at->target_Z, at->target_Orientation, TELE_TO_NOT_LEAVE_TRANSPORT);
+    if (GetPlayer()->CheckTransferPossibility(at))
+        GetPlayer()->TeleportTo(at->loc.GetMapId(), at->loc.x, at->loc.y, at->loc.z, at->loc.orientation, TELE_TO_NOT_LEAVE_TRANSPORT|TELE_TO_CHECKED);
 }
 
 void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data)
@@ -1007,13 +903,18 @@ void WorldSession::HandleNextCinematicCamera( WorldPacket & /*recv_data*/ )
 void WorldSession::HandleMoveTimeSkippedOpcode( WorldPacket & recv_data )
 {
     /*  WorldSession::Update( WorldTimer::getMSTime() );*/
-    DEBUG_LOG( "WORLD: Time Lag/Synchronization Resent/Update" );
+//    DEBUG_LOG( "WORLD: Time Lag/Synchronization Resent/Update" );
 
     ObjectGuid guid;
+    uint32 time_skipped;
 
     recv_data >> guid.ReadAsPacked();
-    recv_data >> Unused<uint32>();
+    recv_data >> time_skipped;
 
+    DEBUG_LOG( "WORLD: Time Lag/Synchronization Resent/Update, data = %d", time_skipped);
+
+    if (GetPlayer()->GetObjectGuid() == guid)
+        GetPlayer()->GetAntiCheat()->SetTimeSkipped(time_skipped);
     /*
         ObjectGuid guid;
         uint32 time_skipped;
@@ -1046,7 +947,7 @@ void WorldSession::HandleMoveUnRootAck(WorldPacket& recv_data)
     recv_data >> guid;
 
     // now can skip not our packet
-    if(_player->GetGUID() != guid)
+    if(_player->GetObjectGuid() != guid)
     {
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
@@ -1101,16 +1002,6 @@ void WorldSession::HandleSetActionBarTogglesOpcode(WorldPacket& recv_data)
     GetPlayer()->SetByteValue(PLAYER_FIELD_BYTES, 2, ActionBar);
 }
 
-void WorldSession::HandleWardenDataOpcode(WorldPacket& recv_data)
-{
-    recv_data.read_skip<uint8>();
-    /*
-        uint8 tmp;
-        recv_data >> tmp;
-        DEBUG_LOG("Received opcode CMSG_WARDEN_DATA, not resolve.uint8 = %u", tmp);
-    */
-}
-
 void WorldSession::HandlePlayedTime(WorldPacket& recv_data)
 {
     uint8 unk1;
@@ -1332,25 +1223,35 @@ void WorldSession::HandleRealmSplitOpcode( WorldPacket & recv_data )
 
 void WorldSession::HandleFarSightOpcode( WorldPacket & recv_data )
 {
-    DEBUG_LOG("WORLD: CMSG_FAR_SIGHT");
-    //recv_data.hexlike();
-
     uint8 op;
     recv_data >> op;
 
-    WorldObject* obj = _player->GetMap()->GetWorldObject(_player->GetFarSightGuid());
-    if (!obj)
-        return;
-
     switch(op)
     {
         case 0:
-            DEBUG_LOG("Removed FarSight from %s", _player->GetGuidStr().c_str());
-            _player->GetCamera().ResetView(false);
+            DEBUG_LOG("WorldSession: CMSG_FAR_SIGHT removed FarSight from %s", GetPlayer()->GetGuidStr().c_str());
+            GetPlayer()->SetViewPoint(NULL, false, false);
             break;
         case 1:
-            DEBUG_LOG("Added FarSight %s to %s", _player->GetFarSightGuid().GetString().c_str(), _player->GetGuidStr().c_str());
-            _player->GetCamera().SetView(obj, false);
+            {
+                if (GetPlayer()->GetFarSightGuid().IsEmpty())
+                {
+                    sLog.outError("WorldSession: CMSG_FAR_SIGHT try add FarSight to %s, but ViewPoint guid is empty!", GetPlayer()->GetGuidStr().c_str());
+                    return;
+                }
+                WorldObject* obj = GetPlayer()->GetMap()->GetWorldObject(GetPlayer()->GetFarSightGuid());
+                if (!obj || !obj->IsInWorld())
+                {
+                    sLog.outError("WorldSession: CMSG_FAR_SIGHT try added FarSight %s to %s, but ViewPoint absent or not in world!", GetPlayer()->GetFarSightGuid().GetString().c_str(), GetPlayer()->GetGuidStr().c_str());
+                    GetPlayer()->SetGuidValue(PLAYER_FARSIGHT, ObjectGuid());
+                    return;
+                }
+                DEBUG_LOG("WorldSession: CMSG_FAR_SIGHT added FarSight %s to %s", GetPlayer()->GetFarSightGuid().GetString().c_str(), GetPlayer()->GetGuidStr().c_str());
+                GetPlayer()->SetViewPoint(obj, true, false);
+                break;
+            }
+        default:
+            sLog.outError("WorldSession: CMSG_FAR_SIGHT unknown command %u for player %s", op, GetPlayer()->GetGuidStr().c_str());
             break;
     }
 }
@@ -1530,14 +1431,21 @@ void WorldSession::HandleMoveSetCanFlyAckOpcode( WorldPacket & recv_data )
     recv_data >> movementInfo;
     recv_data >> Unused<float>();                           // unk2
 
-    if (_player->GetMover()->GetObjectGuid() != guid)
+    Unit * target;
+
+    if (GetPlayer()->GetObjectGuid() == guid)
+        target = GetPlayer();
+    else if (!GetPlayer()->IsSelfMover() && GetPlayer()->GetMover()->GetObjectGuid() == guid)
+        target = GetPlayer()->GetMover();
+    else
     {
-        DEBUG_LOG("WorldSession::HandleMoveSetCanFlyAckOpcode: player %s, mover %s, received %s, ignored",
-            _player->GetGuidStr().c_str(), _player->GetMover()->GetGuidStr().c_str(), guid.GetString().c_str());
+        DEBUG_LOG("WorldSession::HandleMoveSetCanFlyAckOpcode: player %s, "
+            "mover %s, received %s", _player->GetGuidStr().c_str(),
+            GetPlayer()->GetMover()->GetGuidStr().c_str(), guid.GetString().c_str());
         return;
     }
 
-    _player->GetMover()->m_movementInfo.SetMovementFlags(movementInfo.GetMovementFlags());
+    target->m_movementInfo.SetMovementFlags(movementInfo.GetMovementFlags());
 }
 
 void WorldSession::HandleRequestPetInfoOpcode( WorldPacket & /*recv_data */)
@@ -1562,7 +1470,8 @@ void WorldSession::HandleQueryInspectAchievementsOpcode( WorldPacket & recv_data
 
     recv_data >> guid.ReadAsPacked();
 
-    if(Player *player = sObjectMgr.GetPlayer(guid))
+    Player* player = sObjectMgr.GetPlayer(guid);
+    if(player)
         player->GetAchievementMgr().SendRespondInspectAchievements(_player);
 }
 
@@ -1601,3 +1510,103 @@ void WorldSession::HandleHearthandResurrect(WorldPacket & /*recv_data*/)
     _player->ResurrectPlayer(100);
     _player->TeleportToHomebind();
 }
+
+// Refer-A-Friend
+void WorldSession::HandleGrantLevel(WorldPacket& recv_data)
+{
+    DEBUG_LOG("WORLD: CMSG_GRANT_LEVEL");
+
+    ObjectGuid guid;
+    recv_data >> guid.ReadAsPacked();
+
+    if (!guid.IsPlayer())
+        return;
+
+    Player * target = sObjectMgr.GetPlayer(guid);
+
+    // cheating and other check
+    ReferAFriendError err = _player->GetReferFriendError(target, false);
+
+    if (err)
+    {
+        _player->SendReferFriendError(err, target);
+        return;
+    }
+
+    target->AccessGrantableLevel(_player->GetObjectGuid());
+
+    WorldPacket data(SMSG_PROPOSE_LEVEL_GRANT, _player->GetPackGUID().size());
+    data << _player->GetPackGUID();
+    target->GetSession()->SendPacket(&data);
+}
+
+void WorldSession::HandleAcceptGrantLevel(WorldPacket& recv_data)
+{
+    DEBUG_LOG("WORLD: CMSG_ACCEPT_LEVEL_GRANT");
+
+    ObjectGuid guid;
+    recv_data >> guid.ReadAsPacked();
+
+    if (!guid.IsPlayer())
+        return;
+
+    if (!_player->IsAccessGrantableLevel(guid))
+        return;
+
+    _player->AccessGrantableLevel(ObjectGuid());
+    Player * grant_giver = sObjectMgr.GetPlayer(guid);
+
+    if (!grant_giver)
+        return;
+
+    if (grant_giver->GetGrantableLevels())
+        grant_giver->ChangeGrantableLevels(0);
+    else
+        return;
+
+    _player->GiveLevel(_player->getLevel() + 1);
+}
+
+void WorldSession::HandleInstanceLockResponse(WorldPacket& recvPacket)
+{
+    DEBUG_LOG("WORLD: CMSG_INSTANCE_LOCK_WARNING_RESPONSE");
+    uint8 accept;
+    recvPacket >> accept;
+
+    if (!GetPlayer()->HasPendingBind())
+    {
+        sLog.outDetail("InstanceLockResponse: Player %s (guid %u) tried to bind himself/teleport to graveyard without a pending bind!", _player->GetName(), _player->GetGUIDLow());
+        return;
+    }
+
+    if (accept)
+        GetPlayer()->BindToInstance();
+    else
+        GetPlayer()->RepopAtGraveyard();
+
+    GetPlayer()->SetPendingBind(NULL, 0);
+}
+
+void WorldSession::HandleSetSavedInstanceExtend(WorldPacket& recv_data)
+{
+    DEBUG_LOG("WORLD: CMSG_SET_SAVED_INSTANCE_EXTEND");
+
+    uint32 map_id;
+    uint32 difficulty;
+    uint8  _extend;
+
+    recv_data >> map_id;
+    recv_data >> difficulty;
+    recv_data >> _extend;
+
+    DEBUG_LOG("SetSavedInstanceExtend: Player %s (guid %u) tried to extend (code %d) instance map %d difficulty %d ", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow(), _extend, map_id, difficulty);
+
+    if (InstancePlayerBind* bind = GetPlayer()->GetBoundInstance(map_id, Difficulty(difficulty)))
+    {
+        GetPlayer()->BindToInstance(bind->state, bind->perm, false, bool(_extend));
+    }
+    else
+    {
+        sLog.outError("SetSavedInstanceExtend: Player tryed to extend instance, but not bound to.");
+    }
+}
diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp
index 183bac2275c..bd2f6b25163 100644
--- a/src/game/MotionMaster.cpp
+++ b/src/game/MotionMaster.cpp
@@ -19,21 +19,23 @@
 #include "MotionMaster.h"
 #include "CreatureAISelector.h"
 #include "Creature.h"
-#include "ConfusedMovementGenerator.h"
-#include "FleeingMovementGenerator.h"
-#include "HomeMovementGenerator.h"
-#include "IdleMovementGenerator.h"
-#include "PointMovementGenerator.h"
-#include "TargetedMovementGenerator.h"
-#include "WaypointMovementGenerator.h"
-#include "RandomMovementGenerator.h"
+#include "Pet.h"
+#include "movementGenerators/ConfusedMovementGenerator.h"
+#include "movementGenerators/FleeingMovementGenerator.h"
+#include "movementGenerators/HomeMovementGenerator.h"
+#include "movementGenerators/IdleMovementGenerator.h"
+#include "movementGenerators/PointMovementGenerator.h"
+#include "movementGenerators/TargetedMovementGenerator.h"
+#include "movementGenerators/WaypointMovementGenerator.h"
+#include "movementGenerators/RandomMovementGenerator.h"
 #include "movement/MoveSpline.h"
 #include "movement/MoveSplineInit.h"
 #include "CreatureLinkingMgr.h"
+#include "DBCStores.h"
 
 #include <cassert>
 
-inline bool isStatic(MovementGenerator *mv)
+inline bool isStatic(MovementGenerator* mv)
 {
     return (mv == &si_idleMovement);
 }
@@ -41,298 +43,151 @@ inline bool isStatic(MovementGenerator *mv)
 void MotionMaster::Initialize()
 {
     // stop current move
-    if (!m_owner->IsStopped())
-        m_owner->StopMoving();
+    m_owner->StopMoving();
 
-    // clear ALL movement generators (including default)
-    Clear(false,true);
+    Clear(false, false);
 
     // set new default movement generator
-    if (m_owner->GetTypeId() == TYPEID_UNIT && !m_owner->hasUnitState(UNIT_STAT_CONTROLLED))
+    if (m_owner->GetTypeId() == TYPEID_UNIT /*&& !m_owner->hasUnitState(UNIT_STAT_CONTROLLED)*/)
     {
         MovementGenerator* movement = FactorySelector::selectMovementGenerator((Creature*)m_owner);
-        push(movement == NULL ? &si_idleMovement : movement);
-        top()->Initialize(*m_owner);
+        if (movement)
+            Mutate(movement, UNIT_ACTION_DOWAYPOINTS);
     }
-    else
-        push(&si_idleMovement);
 }
 
 MotionMaster::~MotionMaster()
 {
-    // just deallocate movement generator, but do not Finalize since it may access to already deallocated owner's memory
-    while(!empty())
-    {
-        MovementGenerator * m = top();
-        pop();
-        if (!isStatic(m))
-            delete m;
-    }
-}
-
-void MotionMaster::UpdateMotion(uint32 diff)
-{
-    if (m_owner->hasUnitState(UNIT_STAT_CAN_NOT_MOVE))
-        return;
-
-    MANGOS_ASSERT( !empty() );
-    m_cleanFlag |= MMCF_UPDATE;
-
-    if (!top()->Update(*m_owner, diff))
-    {
-        m_cleanFlag &= ~MMCF_UPDATE;
-        MovementExpired();
-    }
-    else
-        m_cleanFlag &= ~MMCF_UPDATE;
-
-    if (m_expList)
-    {
-        for (size_t i = 0; i < m_expList->size(); ++i)
-        {
-            MovementGenerator* mg = (*m_expList)[i];
-            if (!isStatic(mg))
-                delete mg;
-        }
-
-        delete m_expList;
-        m_expList = NULL;
-
-        if (empty())
-            Initialize();
-
-        if (m_cleanFlag & MMCF_RESET)
-        {
-            top()->Reset(*m_owner);
-            m_cleanFlag &= ~MMCF_RESET;
-        }
-    }
-}
-
-void MotionMaster::DirectClean(bool reset, bool all)
-{
-    while( all ? !empty() : size() > 1 )
-    {
-        MovementGenerator *curr = top();
-        pop();
-        curr->Finalize(*m_owner);
-
-        if (!isStatic(curr))
-            delete curr;
-    }
-
-    if (!all && reset)
-    {
-        MANGOS_ASSERT( !empty() );
-        top()->Reset(*m_owner);
-    }
-}
-
-void MotionMaster::DelayedClean(bool reset, bool all)
-{
-    if (reset)
-        m_cleanFlag |= MMCF_RESET;
-    else
-        m_cleanFlag &= ~MMCF_RESET;
-
-    if (empty() || (!all && size() == 1))
-        return;
-
-    if (!m_expList)
-        m_expList = new ExpireList();
-
-    while( all ? !empty() : size() > 1 )
-    {
-        MovementGenerator *curr = top();
-        pop();
-        curr->Finalize(*m_owner);
-
-        if (!isStatic(curr))
-            m_expList->push_back(curr);
-    }
-}
-
-void MotionMaster::DirectExpire(bool reset)
-{
-    if (empty() || size() == 1)
-        return;
-
-    MovementGenerator *curr = top();
-    pop();
-
-    // also drop stored under top() targeted motions
-    while (!empty() && (top()->GetMovementGeneratorType() == CHASE_MOTION_TYPE || top()->GetMovementGeneratorType() == FOLLOW_MOTION_TYPE))
-    {
-        MovementGenerator *temp = top();
-        pop();
-        temp->Finalize(*m_owner);
-        delete temp;
-    }
-
-    // Store current top MMGen, as Finalize might push a new MMGen
-    MovementGenerator* nowTop = empty() ? NULL : top();
-    // it can add another motions instead
-    curr->Finalize(*m_owner);
-
-    if (!isStatic(curr))
-        delete curr;
-
-    if (empty())
-        Initialize();
-
-    // Prevent reseting possible new pushed MMGen
-    if (reset && top() == nowTop)
-        top()->Reset(*m_owner);
 }
 
-void MotionMaster::DelayedExpire(bool reset)
+void MotionMaster::MoveIdle()
 {
-    if (reset)
-        m_cleanFlag |= MMCF_RESET;
-    else
-        m_cleanFlag &= ~MMCF_RESET;
-
-    if (empty() || size() == 1)
-        return;
-
-    MovementGenerator *curr = top();
-    pop();
-
-    if (!m_expList)
-        m_expList = new ExpireList();
-
-    // also drop stored under top() targeted motions
-    while (!empty() && (top()->GetMovementGeneratorType() == CHASE_MOTION_TYPE || top()->GetMovementGeneratorType() == FOLLOW_MOTION_TYPE))
-    {
-        MovementGenerator *temp = top();
-        pop();
-        temp ->Finalize(*m_owner);
-        m_expList->push_back(temp );
-    }
-
-    curr->Finalize(*m_owner);
-
-    if (!isStatic(curr))
-        m_expList->push_back(curr);
+    GetUnitStateMgr()->DropAllStates();
 }
 
-void MotionMaster::MoveIdle()
+void MotionMaster::MoveRandom(float radius)
 {
-    if (empty() || !isStatic(top()))
-        push(&si_idleMovement);
+    // Wrapper for MoveRandomAroundPoint for move around current point.
+    float x, y, z;
+    m_owner->GetPosition(x, y, z);
+    MoveRandomAroundPoint(x, y, z, radius);
 }
 
-void MotionMaster::MoveRandom()
+void MotionMaster::MoveRandomAroundPoint(float x, float y, float z, float radius, float verticalZ)
 {
     if (m_owner->GetTypeId() == TYPEID_PLAYER)
     {
-        sLog.outError("%s attempt to move random.", m_owner->GetGuidStr().c_str());
+        sLog.outError("MotionMaster: %s attempt to move random.", m_owner->GetGuidStr().c_str());
     }
     else
     {
-        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s move random.", m_owner->GetGuidStr().c_str());
-        Mutate(new RandomMovementGenerator<Creature>(*m_owner));
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s move random.", m_owner->GetGuidStr().c_str());
+        Mutate(new RandomMovementGenerator<Creature>(x, y, z, radius, verticalZ), UNIT_ACTION_DOWAYPOINTS);
     }
 }
 
 void MotionMaster::MoveTargetedHome()
 {
-    if (m_owner->hasUnitState(UNIT_STAT_LOST_CONTROL))
-        return;
-
-    Clear(false);
+   // if (m_owner->hasUnitState(UNIT_STAT_LOST_CONTROL))
+       // return;
 
     if (m_owner->GetTypeId() == TYPEID_UNIT && !((Creature*)m_owner)->GetCharmerOrOwnerGuid())
     {
         // Manual exception for linked mobs
         if (m_owner->IsLinkingEventTrigger() && m_owner->GetMap()->GetCreatureLinkingHolder()->TryFollowMaster((Creature*)m_owner))
-            DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s refollowed linked master", m_owner->GetGuidStr().c_str());
+            DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s refollowed linked master", m_owner->GetGuidStr().c_str());
         else
         {
-            DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s targeted home", m_owner->GetGuidStr().c_str());
-            Mutate(new HomeMovementGenerator<Creature>());
+            DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s targeted home", m_owner->GetGuidStr().c_str());
+            Mutate(new HomeMovementGenerator<Creature>(), UNIT_ACTION_HOME);
         }
     }
     else if (m_owner->GetTypeId() == TYPEID_UNIT && ((Creature*)m_owner)->GetCharmerOrOwnerGuid())
     {
-        if (Unit *target = ((Creature*)m_owner)->GetCharmerOrOwner())
+        if (Unit* target = ((Creature*)m_owner)->GetCharmerOrOwner())
         {
-            DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s follow to %s", m_owner->GetGuidStr().c_str(), target->GetGuidStr().c_str());
-            Mutate(new FollowMovementGenerator<Creature>(*target,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE));
+            DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s follow to %s", m_owner->GetGuidStr().c_str(), target->GetGuidStr().c_str());
+
+            float angle = ((Creature*)m_owner)->IsPet() ? ((Pet*)m_owner)->GetPetFollowAngle() : PET_FOLLOW_ANGLE;
+            switch (((Creature*)m_owner)->GetCharmState(CHARM_STATE_COMMAND))
+            {
+                case COMMAND_STAY:
+                    MoveIdle();
+                    m_owner->StopMoving(true);
+                    break;
+                case COMMAND_FOLLOW:
+                case COMMAND_ATTACK:
+                default:
+                    MoveFollow(target, PET_FOLLOW_DIST, angle);
+                    break;
+            }
         }
         else
-        {
             DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s attempt but fail to follow owner", m_owner->GetGuidStr().c_str());
-        }
     }
     else
-        sLog.outError("%s attempt targeted home", m_owner->GetGuidStr().c_str());
+        sLog.outError("MotionMaster: %s attempt targeted home", m_owner->GetGuidStr().c_str());
 }
 
 void MotionMaster::MoveConfused()
 {
-    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s move confused", m_owner->GetGuidStr().c_str());
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s move confused", m_owner->GetGuidStr().c_str());
 
     if (m_owner->GetTypeId() == TYPEID_PLAYER)
-        Mutate(new ConfusedMovementGenerator<Player>());
+        Mutate(new ConfusedMovementGenerator<Player>(), UNIT_ACTION_CONFUSED);
     else
-        Mutate(new ConfusedMovementGenerator<Creature>());
+        Mutate(new ConfusedMovementGenerator<Creature>(), UNIT_ACTION_CONFUSED);
 }
 
 void MotionMaster::MoveChase(Unit* target, float dist, float angle)
 {
-    // ignore movement request if target not exist
-    if (!target)
+    // ignore movement request if target not exist or owner has disable move flag
+    if (!target || target == m_owner || m_owner->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE))
         return;
 
-    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s chase to %s", m_owner->GetGuidStr().c_str(), target->GetGuidStr().c_str());
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s chase to %s", m_owner->GetGuidStr().c_str(), target->GetGuidStr().c_str());
 
     if (m_owner->GetTypeId() == TYPEID_PLAYER)
-        Mutate(new ChaseMovementGenerator<Player>(*target,dist,angle));
+        Mutate(new ChaseMovementGenerator<Player>(*target, dist, angle), UNIT_ACTION_CHASE);
     else
-        Mutate(new ChaseMovementGenerator<Creature>(*target,dist,angle));
+        Mutate(new ChaseMovementGenerator<Creature>(*target, dist, angle), UNIT_ACTION_CHASE);
 }
 
 void MotionMaster::MoveFollow(Unit* target, float dist, float angle)
 {
-    if (m_owner->hasUnitState(UNIT_STAT_LOST_CONTROL))
+    // ignore movement request if target not exist or owner has disable move flag
+    if (!target || target == m_owner || m_owner->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE))
         return;
 
-    Clear();
-
-    // ignore movement request if target not exist
-    if (!target)
-        return;
-
-    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s follow to %s", m_owner->GetGuidStr().c_str(), target->GetGuidStr().c_str());
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s follow to %s", m_owner->GetGuidStr().c_str(), target->GetGuidStr().c_str());
 
     if (m_owner->GetTypeId() == TYPEID_PLAYER)
-        Mutate(new FollowMovementGenerator<Player>(*target,dist,angle));
+        Mutate(new FollowMovementGenerator<Player>(*target, dist, angle), UNIT_ACTION_DOWAYPOINTS);
     else
-        Mutate(new FollowMovementGenerator<Creature>(*target,dist,angle));
+        Mutate(new FollowMovementGenerator<Creature>(*target, dist, angle), UNIT_ACTION_DOWAYPOINTS);
 }
 
-void MotionMaster::MovePoint(uint32 id, float x, float y, float z, bool generatePath)
+void MotionMaster::MovePoint(uint32 id, float x, float y, float z, bool generatePath /*= true*/, bool lowPriority /*= false*/)
 {
-    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s targeted point (Id: %u X: %f Y: %f Z: %f)", m_owner->GetGuidStr().c_str(), id, x, y, z );
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s targeted point (Id: %u X: %f Y: %f Z: %f)", m_owner->GetGuidStr().c_str(), id, x, y, z);
 
     if (m_owner->GetTypeId() == TYPEID_PLAYER)
-        Mutate(new PointMovementGenerator<Player>(id,x,y,z,generatePath));
+        Mutate(new PointMovementGenerator<Player>(id, x, y, z, generatePath), lowPriority ? UNIT_ACTION_DOWAYPOINTS : UNIT_ACTION_ASSISTANCE);
     else
-        Mutate(new PointMovementGenerator<Creature>(id,x,y,z,generatePath));
+        Mutate(new PointMovementGenerator<Creature>(id, x, y, z, generatePath), lowPriority ? UNIT_ACTION_DOWAYPOINTS : UNIT_ACTION_ASSISTANCE);
 }
 
 void MotionMaster::MoveSeekAssistance(float x, float y, float z)
 {
     if (m_owner->GetTypeId() == TYPEID_PLAYER)
     {
-        sLog.outError("%s attempt to seek assistance", m_owner->GetGuidStr().c_str());
+        sLog.outError("MotionMaster: %s attempt to seek assistance", m_owner->GetGuidStr().c_str());
     }
     else
     {
-        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s seek assistance (X: %f Y: %f Z: %f)",
-            m_owner->GetGuidStr().c_str(), x, y, z );
-        Mutate(new AssistanceMovementGenerator(x,y,z));
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s seek assistance (X: %f Y: %f Z: %f)",
+            m_owner->GetGuidStr().c_str(), x, y, z);
+        Mutate(new AssistanceMovementGenerator(x,y,z), UNIT_ACTION_ASSISTANCE);
     }
 }
 
@@ -340,31 +195,32 @@ void MotionMaster::MoveSeekAssistanceDistract(uint32 time)
 {
     if (m_owner->GetTypeId() == TYPEID_PLAYER)
     {
-        sLog.outError("%s attempt to call distract after assistance", m_owner->GetGuidStr().c_str());
+        sLog.outError("MotionMaster: %s attempt to call distract after assistance", m_owner->GetGuidStr().c_str());
     }
     else
     {
-        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s is distracted after assistance call (Time: %u)",
-            m_owner->GetGuidStr().c_str(), time );
-        Mutate(new AssistanceDistractMovementGenerator(time));
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s is distracted after assistance call (Time: %u)",
+            m_owner->GetGuidStr().c_str(), time);
+        Mutate(new AssistanceDistractMovementGenerator(time), UNIT_ACTION_ASSISTANCE);
     }
 }
 
 void MotionMaster::MoveFleeing(Unit* enemy, uint32 time)
 {
-    if (!enemy)
+    // ignore movement request if enemy not exist or owner has disable move flag
+    if (!enemy || enemy == m_owner || m_owner->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE))
         return;
 
-    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s flee from %s", m_owner->GetGuidStr().c_str(), enemy->GetGuidStr().c_str());
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s flee from %s", m_owner->GetGuidStr().c_str(), enemy->GetGuidStr().c_str());
 
     if (m_owner->GetTypeId() == TYPEID_PLAYER)
-        Mutate(new FleeingMovementGenerator<Player>(enemy->GetObjectGuid()));
+        Mutate(new FleeingMovementGenerator<Player>(enemy->GetObjectGuid()), UNIT_ACTION_FEARED);
     else
     {
         if (time)
-            Mutate(new TimedFleeingMovementGenerator(enemy->GetObjectGuid(), time));
+            Mutate(new TimedFleeingMovementGenerator(enemy->GetObjectGuid(), time), UNIT_ACTION_FEARED);
         else
-            Mutate(new FleeingMovementGenerator<Creature>(enemy->GetObjectGuid()));
+            Mutate(new FleeingMovementGenerator<Creature>(enemy->GetObjectGuid()), UNIT_ACTION_FEARED);
     }
 }
 
@@ -374,90 +230,48 @@ void MotionMaster::MoveWaypoint()
     {
         if (GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
         {
-            sLog.outError("Creature %s (Entry %u) attempt to MoveWaypoint() but creature is already using waypoint", m_owner->GetGuidStr().c_str(), m_owner->GetEntry());
+            sLog.outError("MotionMaster: Creature %s (Entry %u) attempt to MoveWaypoint() but creature is already using waypoint", m_owner->GetGuidStr().c_str(), m_owner->GetEntry());
             return;
         }
 
         Creature* creature = (Creature*)m_owner;
 
-        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Creature %s (Entry %u) start MoveWaypoint()", m_owner->GetGuidStr().c_str(), m_owner->GetEntry());
-        Mutate(new WaypointMovementGenerator<Creature>(*creature));
-    }
-    else
-    {
-        sLog.outError("Non-creature %s attempt to MoveWaypoint()", m_owner->GetGuidStr().c_str());
-    }
-}
-
-void MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode)
-{
-    if (m_owner->GetTypeId() == TYPEID_PLAYER)
-    {
-        if (path < sTaxiPathNodesByPath.size())
-        {
-            DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s taxi to (Path %u node %u)", m_owner->GetGuidStr().c_str(), path, pathnode);
-            FlightPathMovementGenerator* mgen = new FlightPathMovementGenerator(sTaxiPathNodesByPath[path],pathnode);
-            Mutate(mgen);
-        }
-        else
-        {
-            sLog.outError("%s attempt taxi to (nonexistent Path %u node %u)",
-                m_owner->GetGuidStr().c_str(), path, pathnode);
-        }
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: Creature %s (Entry %u) start MoveWaypoint()", m_owner->GetGuidStr().c_str(), m_owner->GetEntry());
+        Mutate(new WaypointMovementGenerator<Creature>(*creature), UNIT_ACTION_DOWAYPOINTS);
     }
     else
     {
-        sLog.outError("%s attempt taxi to (Path %u node %u)",
-            m_owner->GetGuidStr().c_str(), path, pathnode);
+        sLog.outError("MotionMaster: Non-creature %s attempt to MoveWaypoint()", m_owner->GetGuidStr().c_str());
     }
 }
 
 void MotionMaster::MoveDistract(uint32 timer)
 {
-    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s distracted (timer: %u)", m_owner->GetGuidStr().c_str(), timer);
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "MotionMaster: %s distracted (timer: %u)", m_owner->GetGuidStr().c_str(), timer);
     DistractMovementGenerator* mgen = new DistractMovementGenerator(timer);
-    Mutate(mgen);
+    Mutate(mgen, UNIT_ACTION_EFFECT);
 }
 
-void MotionMaster::Mutate(MovementGenerator *m)
+void MotionMaster::Mutate(MovementGenerator* mgen, UnitActionId stateId)
 {
-    if (!empty())
-    {
-        switch(top()->GetMovementGeneratorType())
-        {
-            // HomeMovement is not that important, delete it if meanwhile a new comes
-            case HOME_MOTION_TYPE:
-            // DistractMovement interrupted by any other movement
-            case DISTRACT_MOTION_TYPE:
-            case EFFECT_MOTION_TYPE:
-                MovementExpired(false);
-            default:
-                break;
-        }
-
-        if (!empty())
-            top()->Interrupt(*m_owner);
-    }
-
-    m->Initialize(*m_owner);
-    push(m);
+    GetUnitStateMgr()->PushAction(stateId, UnitActionPtr(mgen));
 }
 
 void MotionMaster::propagateSpeedChange()
 {
-    Impl::container_type::iterator it = Impl::c.begin();
-    for ( ;it != end(); ++it)
-    {
-        (*it)->unitSpeedChanged();
-    }
+    GetUnitStateMgr()->CurrentAction()->UnitSpeedChanged();
 }
 
-MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
+uint32 MotionMaster::getLastReachedWaypoint() const
 {
-    if (empty())
-        return IDLE_MOTION_TYPE;
+    if (ActionInfo* action = const_cast<MotionMaster*>(this)->GetUnitStateMgr()->GetAction(UNIT_ACTION_DOWAYPOINTS))
+        return static_cast<WaypointMovementGenerator<Creature>*>(&*(action->Action()))->getLastReachedWaypoint();
+    return 0;
+}
 
-    return top()->GetMovementGeneratorType();
+MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
+{
+    return const_cast<MotionMaster*>(this)->CurrentMovementGenerator()->GetMovementGeneratorType();
 }
 
 bool MotionMaster::GetDestination(float &x, float &y, float &z)
@@ -472,30 +286,118 @@ bool MotionMaster::GetDestination(float &x, float &y, float &z)
     return true;
 }
 
-void MotionMaster::UpdateFinalDistanceToTarget(float fDistance)
+MotionMaster::MotionMaster(Unit* unit) : m_owner(unit)
+{
+}
+
+/** Does nothing */
+void MotionMaster::Clear(bool reset /*= true*/, bool all /*= false*/)
 {
-    if (!empty())
-        top()->UpdateFinalDistance(fDistance);
+    if (all)
+        GetUnitStateMgr()->InitDefaults();
+    else if (reset)
+        GetUnitStateMgr()->DropAllStates();
+    // If no command provided, reinit only if states list empty.
+    else if (GetUnitStateMgr()->GetActions().empty())
+        GetUnitStateMgr()->InitDefaults();
+}
+
+MovementGenerator* MotionMaster::CurrentMovementGenerator()
+{
+    UnitActionPtr mgen = GetUnitStateMgr()->CurrentAction();
+    if (!mgen)
+    {
+        sLog.outError("MotionMaster::CurrentMovementGenerator() %s has empty states list! Possible no one update cycle?", m_owner->GetGuidStr().c_str());
+        return &si_idleMovement;
+    }
+    return ((MovementGenerator*)&*mgen);
+}
+
+UnitStateMgr* MotionMaster::GetUnitStateMgr()
+{
+    MANGOS_ASSERT(m_owner);
+    UnitStateMgr* mgr = &m_owner->GetUnitStateMgr();
+    MANGOS_ASSERT(mgr);
+    return mgr;
+}
+
+bool MotionMaster::empty()
+{
+    MovementGenerator* mgen = CurrentMovementGenerator();
+    if (isStatic(mgen))
+        return true;
+
+    return (mgen->GetMovementGeneratorType() == IDLE_MOTION_TYPE);
 }
 
 void MotionMaster::MoveJump(float x, float y, float z, float horizontalSpeed, float max_height, uint32 id)
 {
-    Movement::MoveSplineInit init(*m_owner);
-    init.MoveTo(x,y,z);
-    init.SetParabolic(max_height,0);
+    Movement::MoveSplineInit<Unit*> init(*m_owner);
+    init.MoveTo(x, y, z);
+    init.SetParabolic(max_height, 0);
+    init.SetVelocity(horizontalSpeed);
+    init.Launch();
+    Mutate(new EffectMovementGenerator(id), UNIT_ACTION_EFFECT);
+}
+
+void MotionMaster::MoveToDestination(float x, float y, float z, float o, Unit* target, float horizontalSpeed, float max_height, uint32 id)
+{
+    Movement::MoveSplineInit<Unit*> init(*m_owner);
+    init.MoveTo(x, y, z, bool(target), bool(target));
+    if (max_height > M_NULL_F)
+        init.SetParabolic(max_height, 0);
+    init.SetVelocity(horizontalSpeed);
+    if (target)
+        init.SetFacing(target);
+    else
+        init.SetFacing(o);
+    init.Launch();
+    Mutate(new EffectMovementGenerator(id), UNIT_ACTION_EFFECT);
+}
+
+void MotionMaster::MoveSkyDiving(float x, float y, float z, float o, float horizontalSpeed, float max_height, bool eject)
+{
+    Movement::MoveSplineInit<Unit*> init(*m_owner);
+    init.MoveTo(x, y, z, false, true);
+    init.SetParabolic(max_height, 0);
     init.SetVelocity(horizontalSpeed);
+    init.SetFacing(o);
+    if (!eject)
+        init.SetExitVehicle();
     init.Launch();
-    Mutate(new EffectMovementGenerator(id));
+    Mutate(new EjectMovementGenerator(0), UNIT_ACTION_EFFECT);
+}
+
+void MotionMaster::MoveBoardVehicle(float x, float y, float z, float o, float horizontalSpeed, float max_height)
+{
+    Movement::MoveSplineInit<Unit*> init(*m_owner);
+    init.MoveTo(x, y, z, false, true);
+    init.SetParabolic(max_height, 0);
+    init.SetVelocity(horizontalSpeed);
+    init.SetFacing(o);
+    init.SetBoardVehicle();
+    init.Launch();
+    // Currently no real unit action in this method, only visual effect
+    //Mutate(new EffectMovementGenerator(0), UNIT_ACTION_EFFECT);
+}
+
+void MotionMaster::MoveWithSpeed(float x, float y, float z, float speed, bool generatePath, bool forceDestination)
+{
+    Movement::MoveSplineInit<Unit*> init(*m_owner);
+    init.MoveTo(x, y, z, generatePath, forceDestination);
+    init.SetVelocity(speed);
+    init.Launch();
+    Mutate(new EffectMovementGenerator(0), UNIT_ACTION_EFFECT);
 }
 
 void MotionMaster::MoveFall()
 {
     // use larger distance for vmap height search than in most other cases
-    float tz = m_owner->GetTerrain()->GetHeight(m_owner->GetPositionX(), m_owner->GetPositionY(), m_owner->GetPositionZ(), true, MAX_FALL_DISTANCE);
+    float tz = m_owner->GetMap()->GetHeight(m_owner->GetPhaseMask(), m_owner->GetPositionX(), m_owner->GetPositionY(), m_owner->GetPositionZ());
     if (tz <= INVALID_HEIGHT)
     {
-        DEBUG_LOG("MotionMaster::MoveFall: unable retrive a proper height at map %u (x: %f, y: %f, z: %f).",
-            m_owner->GetMap()->GetId(), m_owner->GetPositionX(), m_owner->GetPositionX(), m_owner->GetPositionZ());
+        sLog.outError("MotionMaster::MoveFall: unable retrive a proper height at map %u (x: %f, y: %f, z: %f).",
+            m_owner->GetMap()->GetId(), m_owner->GetPositionX(), m_owner->GetPositionY(), m_owner->GetPositionZ());
         return;
     }
 
@@ -503,9 +405,18 @@ void MotionMaster::MoveFall()
     if (fabs(m_owner->GetPositionZ() - tz) < 0.1f)
         return;
 
-    Movement::MoveSplineInit init(*m_owner);
+    Movement::MoveSplineInit<Unit*> init(*m_owner);
     init.MoveTo(m_owner->GetPositionX(),m_owner->GetPositionY(),tz);
     init.SetFall();
     init.Launch();
-    Mutate(new EffectMovementGenerator(0));
+    Mutate(new EffectMovementGenerator(0), UNIT_ACTION_EFFECT);
+}
+
+void MotionMaster::MoveFlyOrLand(uint32 id, float x, float y, float z, bool liftOff)
+{
+    if (m_owner->GetTypeId() != TYPEID_UNIT)
+        return;
+
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "%s targeted point for %s (Id: %u X: %f Y: %f Z: %f)", m_owner->GetGuidStr().c_str(), liftOff ? "liftoff" : "landing", id, x, y, z);
+    Mutate(new FlyOrLandMovementGenerator(id, x, y, z, liftOff), UNIT_ACTION_EFFECT);
 }
diff --git a/src/game/MotionMaster.h b/src/game/MotionMaster.h
index f238f28f301..6f66b43df20 100644
--- a/src/game/MotionMaster.h
+++ b/src/game/MotionMaster.h
@@ -20,6 +20,7 @@
 #define MANGOS_MOTIONMASTER_H
 
 #include "Common.h"
+#include "StateMgrImpl.h"
 #include <stack>
 #include <vector>
 
@@ -29,107 +30,57 @@ class Unit;
 // Creature Entry ID used for waypoints show, visible only for GMs
 #define VISUAL_WAYPOINT 1
 
-// values 0 ... MAX_DB_MOTION_TYPE-1 used in DB
-enum MovementGeneratorType
+class MANGOS_DLL_SPEC MotionMaster 
 {
-    IDLE_MOTION_TYPE                = 0,                    // IdleMovementGenerator.h
-    RANDOM_MOTION_TYPE              = 1,                    // RandomMovementGenerator.h
-    WAYPOINT_MOTION_TYPE            = 2,                    // WaypointMovementGenerator.h
-    MAX_DB_MOTION_TYPE              = 3,                    // *** this and below motion types can't be set in DB.
-
-    CONFUSED_MOTION_TYPE            = 4,                    // ConfusedMovementGenerator.h
-    CHASE_MOTION_TYPE               = 5,                    // TargetedMovementGenerator.h
-    HOME_MOTION_TYPE                = 6,                    // HomeMovementGenerator.h
-    FLIGHT_MOTION_TYPE              = 7,                    // WaypointMovementGenerator.h
-    POINT_MOTION_TYPE               = 8,                    // PointMovementGenerator.h
-    FLEEING_MOTION_TYPE             = 9,                    // FleeingMovementGenerator.h
-    DISTRACT_MOTION_TYPE            = 10,                   // IdleMovementGenerator.h
-    ASSISTANCE_MOTION_TYPE          = 11,                   // PointMovementGenerator.h (first part of flee for assistance)
-    ASSISTANCE_DISTRACT_MOTION_TYPE = 12,                   // IdleMovementGenerator.h (second part of flee for assistance)
-    TIMED_FLEEING_MOTION_TYPE       = 13,                   // FleeingMovementGenerator.h (alt.second part of flee for assistance)
-    FOLLOW_MOTION_TYPE              = 14,                   // TargetedMovementGenerator.h
-    EFFECT_MOTION_TYPE              = 15,
-};
-
-enum MMCleanFlag
-{
-    MMCF_NONE   = 0,
-    MMCF_UPDATE = 1,                                        // Clear or Expire called from update
-    MMCF_RESET  = 2                                         // Flag if need top()->Reset()
-};
-
-class MANGOS_DLL_SPEC MotionMaster : private std::stack<MovementGenerator *>
-{
-    private:
-        typedef std::stack<MovementGenerator *> Impl;
-        typedef std::vector<MovementGenerator *> ExpireList;
     public:
 
-        explicit MotionMaster(Unit *unit) : m_owner(unit), m_expList(NULL), m_cleanFlag(MMCF_NONE) {}
+        explicit MotionMaster(Unit *unit);
         ~MotionMaster();
 
         void Initialize();
-
-        MovementGenerator* operator->(void) { return top(); }
-
-        using Impl::top;
-        using Impl::empty;
-
-        typedef Impl::container_type::const_iterator const_iterator;
-        const_iterator begin() const { return Impl::c.begin(); }
-        const_iterator end() const { return Impl::c.end(); }
-
-        void UpdateMotion(uint32 diff);
-        void Clear(bool reset = true, bool all = false)
-        {
-            if (m_cleanFlag & MMCF_UPDATE)
-                DelayedClean(reset, all);
-            else
-                DirectClean(reset, all);
-        }
-        void MovementExpired(bool reset = true)
-        {
-            if (m_cleanFlag & MMCF_UPDATE)
-                DelayedExpire(reset);
-            else
-                DirectExpire(reset);
-        }
+        void Clear(bool reset = true, bool all = false);
+        void MovementExpired(bool reset = true) { Clear(); }
 
         void MoveIdle();
-        void MoveRandom();
+        void MoveRandom(float radius = 5.0f);
+        void MoveRandomAroundPoint(float x, float y, float z, float radius, float verticalZ = 0.0f);
         void MoveTargetedHome();
         void MoveFollow(Unit* target, float dist, float angle);
         void MoveChase(Unit* target, float dist = 0.0f, float angle = 0.0f);
         void MoveConfused();
         void MoveFleeing(Unit* enemy, uint32 timeLimit = 0);
-        void MovePoint(uint32 id, float x,float y,float z, bool generatePath = true);
+        void MovePoint(uint32 id, float x,float y,float z, bool generatePath = true, bool lowPriority = false);
         void MoveSeekAssistance(float x,float y,float z);
         void MoveSeekAssistanceDistract(uint32 timer);
         void MoveWaypoint();
-        void MoveTaxiFlight(uint32 path, uint32 pathnode);
         void MoveDistract(uint32 timeLimit);
         void MoveJump(float x, float y, float z, float horizontalSpeed, float max_height, uint32 id = 0);
+        void MoveToDestination(float x, float y, float z, float o, Unit* target, float horizontalSpeed, float max_height, uint32 id = 0);
+        void MoveSkyDiving(float x, float y, float z, float o, float horizontalSpeed, float max_height, bool eject = false);
+        void MoveBoardVehicle(float x, float y, float z, float o, float horizontalSpeed, float max_height);
+        void MoveWithSpeed(float x, float y, float z, float speed, bool generatePath = true, bool forceDestination = false);
         void MoveFall();
+        void MoveFlyOrLand(uint32 id, float x, float y, float z, bool liftOff);
 
         MovementGeneratorType GetCurrentMovementGeneratorType() const;
 
         void propagateSpeedChange();
+        uint32 getLastReachedWaypoint() const;
 
-        // will only work in MMgens where we have a target (TARGETED_MOTION_TYPE)
-        void UpdateFinalDistanceToTarget(float fDistance);
+        class UnitStateMgr* GetUnitStateMgr();
+        MovementGenerator*  CurrentMovementGenerator();
+        Unit* GetOwner() { return m_owner; };
+        bool  empty();
 
         bool GetDestination(float &x, float &y, float &z);
-    private:
-        void Mutate(MovementGenerator *m);                  // use Move* functions instead
-
-        void DirectClean(bool reset, bool all);
-        void DelayedClean(bool reset, bool all);
 
-        void DirectExpire(bool reset);
-        void DelayedExpire(bool reset);
+    private:
+        void Mutate(MovementGenerator* mgen, UnitActionId slot);                  // use Move* functions instead
 
-        Unit       *m_owner;
-        ExpireList *m_expList;
+        Unit*       m_owner;
         uint8       m_cleanFlag;
 };
+
+#define DEFAULT_WALK_SPEED 24.0f
+
 #endif
diff --git a/src/game/MoveMap.cpp b/src/game/MoveMap.cpp
index b24ca8504f8..4f4adc38eb3 100644
--- a/src/game/MoveMap.cpp
+++ b/src/game/MoveMap.cpp
@@ -27,14 +27,14 @@ namespace MMAP
 {
     // ######################## MMapFactory ########################
     // our global singelton copy
-    MMapManager *g_MMapManager = NULL;
+    MMapManager* g_MMapManager = NULL;
 
     // stores list of mapids which do not use pathfinding
     std::set<uint32>* g_mmapDisabledIds = NULL;
 
     MMapManager* MMapFactory::createOrGetMMapManager()
     {
-        if(g_MMapManager == NULL)
+        if (g_MMapManager == NULL)
             g_MMapManager = new MMapManager();
 
         return g_MMapManager;
@@ -42,10 +42,10 @@ namespace MMAP
 
     void MMapFactory::preventPathfindingOnMaps(const char* ignoreMapIds)
     {
-        if(!g_mmapDisabledIds)
+        if (!g_mmapDisabledIds)
             g_mmapDisabledIds = new std::set<uint32>();
 
-        uint32 strLenght = strlen(ignoreMapIds)+1;
+        uint32 strLenght = strlen(ignoreMapIds) + 1;
         char* mapList = new char[strLenght];
         memcpy(mapList, ignoreMapIds, sizeof(char)*strLenght);
 
@@ -97,15 +97,16 @@ namespace MMAP
             return true;
 
         // load and init dtNavMesh - read parameters from file
-        uint32 pathLen = sWorld.GetDataPath().length() + strlen("mmaps/%03i.mmap")+1;
-        char *fileName = new char[pathLen];
-        snprintf(fileName, pathLen, (sWorld.GetDataPath()+"mmaps/%03i.mmap").c_str(), mapId);
+        uint32 pathLen = sWorld.GetDataPath().length() + strlen("mmaps/%03i.mmap") + 1;
+        char* fileName = new char[pathLen];
+        snprintf(fileName, pathLen, (sWorld.GetDataPath() + "mmaps/%03i.mmap").c_str(), mapId);
 
         FILE* file = fopen(fileName, "rb");
         if (!file)
         {
-            sLog.outDebug("MMAP:loadMapData: Error: Could not open mmap file '%s'", fileName);
-            delete [] fileName;
+            if (MMapFactory::IsPathfindingEnabled(mapId))
+                sLog.outError("MMAP:loadMapData: Error: Could not open mmap file '%s'", fileName);
+            delete[] fileName;
             return false;
         }
 
@@ -115,17 +116,18 @@ namespace MMAP
 
         dtNavMesh* mesh = dtAllocNavMesh();
         MANGOS_ASSERT(mesh);
-        if (DT_SUCCESS != mesh->init(&params))
+        dtStatus dtResult = mesh->init(&params);
+        if (dtStatusFailed(dtResult))
         {
             dtFreeNavMesh(mesh);
             sLog.outError("MMAP:loadMapData: Failed to initialize dtNavMesh for mmap %03u from file %s", mapId, fileName);
-            delete [] fileName;
+            delete[] fileName;
             return false;
         }
 
-        delete [] fileName;
+        delete[] fileName;
 
-        sLog.outDetail("MMAP:loadMapData: Loaded %03i.mmap", mapId);
+        DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "MMAP:loadMapData: Loaded %03i.mmap", mapId);
 
         // store inside our map list
         MMapData* mmap_data = new MMapData(mesh);
@@ -143,7 +145,7 @@ namespace MMAP
     bool MMapManager::loadMap(uint32 mapId, int32 x, int32 y)
     {
         // make sure the mmap is loaded and ready to load tiles
-        if(!loadMapData(mapId))
+        if (!loadMapData(mapId))
             return false;
 
         // get this mmap data
@@ -159,18 +161,18 @@ namespace MMAP
         }
 
         // load this tile :: mmaps/MMMXXYY.mmtile
-        uint32 pathLen = sWorld.GetDataPath().length() + strlen("mmaps/%03i%02i%02i.mmtile")+1;
-        char *fileName = new char[pathLen];
-        snprintf(fileName, pathLen, (sWorld.GetDataPath()+"mmaps/%03i%02i%02i.mmtile").c_str(), mapId, x, y);
+        uint32 pathLen = sWorld.GetDataPath().length() + strlen("mmaps/%03i%02i%02i.mmtile") + 1;
+        char* fileName = new char[pathLen];
+        snprintf(fileName, pathLen, (sWorld.GetDataPath() + "mmaps/%03i%02i%02i.mmtile").c_str(), mapId, x, y);
 
-        FILE *file = fopen(fileName, "rb");
+        FILE* file = fopen(fileName, "rb");
         if (!file)
         {
-            sLog.outDebug("MMAP:loadMap: Could not open mmtile file '%s'", fileName);
-            delete [] fileName;
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "ERROR: MMAP:loadMap: Could not open mmtile file '%s'", fileName);
+            delete[] fileName;
             return false;
         }
-        delete [] fileName;
+        delete[] fileName;
 
         // read header
         MmapTileHeader fileHeader;
@@ -179,13 +181,15 @@ namespace MMAP
         if (fileHeader.mmapMagic != MMAP_MAGIC)
         {
             sLog.outError("MMAP:loadMap: Bad header in mmap %03u%02i%02i.mmtile", mapId, x, y);
+            fclose(file);
             return false;
         }
 
         if (fileHeader.mmapVersion != MMAP_VERSION)
         {
             sLog.outError("MMAP:loadMap: %03u%02i%02i.mmtile was built with generator v%i, expected v%i",
-                                                mapId, x, y, fileHeader.mmapVersion, MMAP_VERSION);
+                          mapId, x, y, fileHeader.mmapVersion, MMAP_VERSION);
+            fclose(file);
             return false;
         }
 
@@ -193,30 +197,36 @@ namespace MMAP
         MANGOS_ASSERT(data);
 
         size_t result = fread(data, fileHeader.size, 1, file);
-        if(!result)
+        fclose(file);
+
+        if (!result)
         {
             sLog.outError("MMAP:loadMap: Bad header or data in mmap %03u%02i%02i.mmtile", mapId, x, y);
-            fclose(file);
             return false;
         }
 
-        fclose(file);
-
         dtMeshHeader* header = (dtMeshHeader*)data;
         dtTileRef tileRef = 0;
 
+        dtStatus dtResult;
+        dtResult = mmap->navMesh->addTile(data, fileHeader.size, DT_TILE_FREE_DATA, 0, &tileRef);
+
         // memory allocated for data is now managed by detour, and will be deallocated when the tile is removed
-        if (mmap->navMesh->addTile(data, fileHeader.size, DT_TILE_FREE_DATA, 0, &tileRef) != DT_SUCCESS)
+        if (dtStatusSucceed(dtResult))
+        {
+            mmap->mmapLoadedTiles.insert(std::pair<uint32, dtTileRef>(packedGridPos, tileRef));
+            ++loadedTiles;
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING,"MMAP:loadMap: Loaded mmtile %03i[%02i,%02i] into %03i[%02i,%02i]", mapId, x, y, mapId, header->x, header->y);
+            return true;
+        }
+        else
         {
-            sLog.outError("MMAP:loadMap: Could not load %03u%02i%02i.mmtile into navmesh", mapId, x, y);
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING,"MMAP:loadMap: Could not load %03u%02i%02i.mmtile into navmesh", mapId, x, y);
             dtFree(data);
             return false;
         }
 
-        mmap->mmapLoadedTiles.insert(std::pair<uint32, dtTileRef>(packedGridPos, tileRef));
-        ++loadedTiles;
-        sLog.outDetail("MMAP:loadMap: Loaded mmtile %03i[%02i,%02i] into %03i[%02i,%02i]", mapId, x, y, mapId, header->x, header->y);
-        return true;
+        return false;
     }
 
     bool MMapManager::unloadMap(uint32 mapId, int32 x, int32 y)
@@ -225,7 +235,7 @@ namespace MMAP
         if (loadedMMaps.find(mapId) == loadedMMaps.end())
         {
             // file may not exist, therefore not loaded
-            sLog.outDebug("MMAP:unloadMap: Asked to unload not loaded navmesh map. %03u%02i%02i.mmtile", mapId, x, y);
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "MMAP:unloadMap: Asked to unload not loaded navmesh map. %03u%02i%02i.mmtile", mapId, x, y);
             return false;
         }
 
@@ -236,14 +246,19 @@ namespace MMAP
         if (mmap->mmapLoadedTiles.find(packedGridPos) == mmap->mmapLoadedTiles.end())
         {
             // file may not exist, therefore not loaded
-            sLog.outDebug("MMAP:unloadMap: Asked to unload not loaded navmesh tile. %03u%02i%02i.mmtile", mapId, x, y);
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "MMAP:unloadMap: Asked to unload not loaded navmesh tile. %03u%02i%02i.mmtile", mapId, x, y);
             return false;
         }
 
         dtTileRef tileRef = mmap->mmapLoadedTiles[packedGridPos];
 
+        dtStatus dtResult;
+        {
+            WriteGuard Guard(GetLock(mapId));
+            dtResult = mmap->navMesh->removeTile(tileRef, NULL, NULL);
+        }
         // unload, and mark as non loaded
-        if(DT_SUCCESS != mmap->navMesh->removeTile(tileRef, NULL, NULL))
+        if (dtStatusFailed(dtResult))
         {
             // this is technically a memory leak
             // if the grid is later reloaded, dtNavMesh::addTile will return error but no extra memory is used
@@ -255,7 +270,7 @@ namespace MMAP
         {
             mmap->mmapLoadedTiles.erase(packedGridPos);
             --loadedTiles;
-            sLog.outDetail("MMAP:unloadMap: Unloaded mmtile %03i[%02i,%02i] from %03i", mapId, x, y, mapId);
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "MMAP:unloadMap: Unloaded mmtile %03i[%02i,%02i] from %03i", mapId, x, y, mapId);
             return true;
         }
 
@@ -267,7 +282,7 @@ namespace MMAP
         if (loadedMMaps.find(mapId) == loadedMMaps.end())
         {
             // file may not exist, therefore not loaded
-            sLog.outDebug("MMAP:unloadMap: Asked to unload not loaded navmesh map %03u", mapId);
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "MMAP:unloadMap: Asked to unload not loaded navmesh map %03u", mapId);
             return false;
         }
 
@@ -277,18 +292,19 @@ namespace MMAP
         {
             uint32 x = (i->first >> 16);
             uint32 y = (i->first & 0x0000FFFF);
-            if(DT_SUCCESS != mmap->navMesh->removeTile(i->second, NULL, NULL))
+            dtStatus dtResult = mmap->navMesh->removeTile(i->second, NULL, NULL);
+            if (dtStatusFailed(dtResult))
                 sLog.outError("MMAP:unloadMap: Could not unload %03u%02i%02i.mmtile from navmesh", mapId, x, y);
             else
             {
                 --loadedTiles;
-                sLog.outDetail("MMAP:unloadMap: Unloaded mmtile %03i[%02i,%02i] from %03i", mapId, x, y, mapId);
+                DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "MMAP:unloadMap: Unloaded mmtile %03i[%02i,%02i] from %03i", mapId, x, y, mapId);
             }
         }
 
         delete mmap;
         loadedMMaps.erase(mapId);
-        sLog.outDetail("MMAP:unloadMap: Unloaded %03i.mmap", mapId);
+        DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "MMAP:unloadMap: Unloaded %03i.mmap", mapId);
 
         return true;
     }
@@ -299,14 +315,14 @@ namespace MMAP
         if (loadedMMaps.find(mapId) == loadedMMaps.end())
         {
             // file may not exist, therefore not loaded
-            sLog.outDebug("MMAP:unloadMapInstance: Asked to unload not loaded navmesh map %03u", mapId);
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "MMAP:unloadMapInstance: Asked to unload not loaded navmesh map %03u", mapId);
             return false;
         }
 
         MMapData* mmap = loadedMMaps[mapId];
         if (mmap->navMeshQueries.find(instanceId) == mmap->navMeshQueries.end())
         {
-            sLog.outDebug("MMAP:unloadMapInstance: Asked to unload not loaded dtNavMeshQuery mapId %03u instanceId %u", mapId, instanceId);
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "MMAP:unloadMapInstance: Asked to unload not loaded dtNavMeshQuery mapId %03u instanceId %u", mapId, instanceId);
             return false;
         }
 
@@ -314,7 +330,7 @@ namespace MMAP
 
         dtFreeNavMeshQuery(query);
         mmap->navMeshQueries.erase(instanceId);
-        sLog.outDetail("MMAP:unloadMapInstance: Unloaded mapId %03u instanceId %u", mapId, instanceId);
+        DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "MMAP:unloadMapInstance: Unloaded mapId %03u instanceId %u", mapId, instanceId);
 
         return true;
     }
@@ -335,20 +351,26 @@ namespace MMAP
         MMapData* mmap = loadedMMaps[mapId];
         if (mmap->navMeshQueries.find(instanceId) == mmap->navMeshQueries.end())
         {
-             // allocate mesh query
+            // allocate mesh query
             dtNavMeshQuery* query = dtAllocNavMeshQuery();
             MANGOS_ASSERT(query);
-            if(DT_SUCCESS != query->init(mmap->navMesh, 1024))
+            dtStatus dtResult = query->init(mmap->navMesh, 1024);
+            if (dtStatusFailed(dtResult))
             {
                 dtFreeNavMeshQuery(query);
                 sLog.outError("MMAP:GetNavMeshQuery: Failed to initialize dtNavMeshQuery for mapId %03u instanceId %u", mapId, instanceId);
                 return NULL;
             }
 
-            sLog.outDetail("MMAP:GetNavMeshQuery: created dtNavMeshQuery for mapId %03u instanceId %u", mapId, instanceId);
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "MMAP:GetNavMeshQuery: created dtNavMeshQuery for mapId %03u instanceId %u", mapId, instanceId);
             mmap->navMeshQueries.insert(std::pair<uint32, dtNavMeshQuery*>(instanceId, query));
         }
 
         return mmap->navMeshQueries[instanceId];
     }
+
+    ObjectLockType& MMapManager::GetLock(uint32 mapId, MapLockType _lockType)
+    {
+        return sWorld.GetLock(_lockType);
+    }
 }
diff --git a/src/game/MoveMap.h b/src/game/MoveMap.h
index 5c4bcc7114d..010c6a948ee 100644
--- a/src/game/MoveMap.h
+++ b/src/game/MoveMap.h
@@ -25,6 +25,9 @@
 #include "../../dep/recastnavigation/Detour/Include/DetourNavMesh.h"
 #include "../../dep/recastnavigation/Detour/Include/DetourNavMeshQuery.h"
 
+#include "ObjectLock.h"
+#include "MapManager.h"
+
 //  memory management
 inline void* dtCustomAlloc(int size, dtAllocHint /*hint*/)
 {
@@ -84,6 +87,9 @@ namespace MMAP
 
             uint32 getLoadedTilesCount() const { return loadedTiles; }
             uint32 getLoadedMapsCount() const { return loadedMMaps.size(); }
+
+            ObjectLockType& GetLock(uint32 mapId, MapLockType _lockType = MAP_LOCK_TYPE_MOVEMENT);
+
         private:
             bool loadMapData(uint32 mapId);
             uint32 packTileID(int32 x, int32 y);
diff --git a/src/game/MoveMapSharedDefines.h b/src/game/MoveMapSharedDefines.h
index e9c0b02ae2f..d2b0d52de00 100644
--- a/src/game/MoveMapSharedDefines.h
+++ b/src/game/MoveMapSharedDefines.h
@@ -20,10 +20,10 @@
 #define _MOVE_MAP_SHARED_DEFINES_H
 
 #include "Platform/Define.h"
-#include "../recastnavigation/Detour/Include/DetourNavMesh.h"
+#include "../../dep/recastnavigation/Detour/Include/DetourNavMesh.h"
 
 #define MMAP_MAGIC 0x4d4d4150   // 'MMAP'
-#define MMAP_VERSION 3
+#define MMAP_VERSION 4
 
 struct MmapTileHeader
 {
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index 4aad269c5ea..b7b6f74b680 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -27,36 +27,38 @@
 #include "SpellAuras.h"
 #include "MapManager.h"
 #include "Transports.h"
-#include "BattleGround.h"
-#include "WaypointMovementGenerator.h"
+#include "BattleGround/BattleGround.h"
+#include "movementGenerators/WaypointMovementGenerator.h"
 #include "MapPersistentStateMgr.h"
 #include "ObjectMgr.h"
 
-void WorldSession::HandleMoveWorldportAckOpcode( WorldPacket & /*recv_data*/ )
+void WorldSession::HandleMoveWorldportAckOpcode(WorldPacket& /*recv_data*/)
 {
-    DEBUG_LOG( "WORLD: got MSG_MOVE_WORLDPORT_ACK." );
+    DEBUG_LOG("WORLD: got MSG_MOVE_WORLDPORT_ACK.");
     HandleMoveWorldportAckOpcode();
 }
 
 void WorldSession::HandleMoveWorldportAckOpcode()
 {
     // ignore unexpected far teleports
-    if(!GetPlayer()->IsBeingTeleportedFar())
+    if (!GetPlayer()->IsBeingTeleportedFar())
         return;
 
+    if (_player->GetVehicleKit())
+        _player->GetVehicleKit()->RemoveAllPassengers();
+
     // get start teleport coordinates (will used later in fail case)
-    WorldLocation old_loc;
-    GetPlayer()->GetPosition(old_loc);
+    WorldLocation const& old_loc = GetPlayer()->GetPosition();
 
     // get the teleport destination
-    WorldLocation &loc = GetPlayer()->GetTeleportDest();
+    WorldLocation& loc = GetPlayer()->GetTeleportDest();
 
     // possible errors in the coordinate validity check (only cheating case possible)
-    if (!MapManager::IsValidMapCoord(loc.mapid, loc.coord_x, loc.coord_y, loc.coord_z, loc.orientation))
+    if (!MapManager::IsValidMapCoord(loc))
     {
         sLog.outError("WorldSession::HandleMoveWorldportAckOpcode: %s was teleported far to a not valid location "
             "(map:%u, x:%f, y:%f, z:%f) We port him to his homebind instead..",
-            GetPlayer()->GetGuidStr().c_str(), loc.mapid, loc.coord_x, loc.coord_y, loc.coord_z);
+            GetPlayer()->GetGuidStr().c_str(), loc.GetMapId(), loc.x, loc.y, loc.z);
         // stop teleportation else we would try this again and again in LogoutPlayer...
         GetPlayer()->SetSemaphoreTeleportFar(false);
         // and teleport the player to a valid place
@@ -65,26 +67,26 @@ void WorldSession::HandleMoveWorldportAckOpcode()
     }
 
     // get the destination map entry, not the current one, this will fix homebind and reset greeting
-    MapEntry const* mEntry = sMapStore.LookupEntry(loc.mapid);
+    MapEntry const* mEntry = sMapStore.LookupEntry(loc.GetMapId());
 
     Map* map = NULL;
 
     // prevent crash at attempt landing to not existed battleground instance
-    if(mEntry->IsBattleGroundOrArena())
+    if (mEntry->IsBattleGroundOrArena())
     {
         if (GetPlayer()->GetBattleGroundId())
-            map = sMapMgr.FindMap(loc.mapid, GetPlayer()->GetBattleGroundId());
+            map = sMapMgr.FindMap(loc.GetMapId(), GetPlayer()->GetBattleGroundId());
 
         if (!map)
         {
             DETAIL_LOG("WorldSession::HandleMoveWorldportAckOpcode: %s was teleported far to nonexisten battleground instance "
                 " (map:%u, x:%f, y:%f, z:%f) Trying to port him to his previous place..",
-                GetPlayer()->GetGuidStr().c_str(), loc.mapid, loc.coord_x, loc.coord_y, loc.coord_z);
+                GetPlayer()->GetGuidStr().c_str(), loc.GetMapId(), loc.x, loc.y, loc.z);
 
             GetPlayer()->SetSemaphoreTeleportFar(false);
 
             // Teleport to previous place, if cannot be ported back TP to homebind place
-            if (!GetPlayer()->TeleportTo(old_loc))
+            if (!GetPlayer()->TeleportTo(old_loc, TELE_TO_NODELAY))
             {
                 DETAIL_LOG("WorldSession::HandleMoveWorldportAckOpcode: %s cannot be ported to his previous place, teleporting him to his homebind place...",
                     GetPlayer()->GetGuidStr().c_str());
@@ -94,7 +96,7 @@ void WorldSession::HandleMoveWorldportAckOpcode()
         }
     }
 
-    InstanceTemplate const* mInstance = ObjectMgr::GetInstanceTemplate(loc.mapid);
+    InstanceTemplate const* mInstance = ObjectMgr::GetInstanceTemplate(loc.GetMapId());
 
     // reset instance validity, except if going to an instance inside an instance
     if (GetPlayer()->m_InstanceValid == false && !mInstance)
@@ -104,25 +106,33 @@ void WorldSession::HandleMoveWorldportAckOpcode()
 
     // relocate the player to the teleport destination
     if (!map)
-        map = sMapMgr.CreateMap(loc.mapid, GetPlayer());
+        map = sMapMgr.CreateMap(loc.GetMapId(), GetPlayer());
+
+    if (!map)
+    {
+        DETAIL_LOG("WorldSession::HandleMoveWorldportAckOpcode: cannot create requested map %u for teleport player %s!",loc.GetMapId(), GetPlayer()->GetGuidStr().c_str());
+        GetPlayer()->SetSemaphoreTeleportFar(false);
+        GetPlayer()->TeleportToHomebind();
+        return;
+    }
 
     GetPlayer()->SetMap(map);
-    GetPlayer()->Relocate(loc.coord_x, loc.coord_y, loc.coord_z, loc.orientation);
+    GetPlayer()->Relocate(loc);
 
     GetPlayer()->SendInitialPacketsBeforeAddToMap();
     // the CanEnter checks are done in TeleporTo but conditions may change
     // while the player is in transit, for example the map may get full
-    if (!GetPlayer()->GetMap()->Add(GetPlayer()))
+    if (!map->Add(GetPlayer()))
     {
         // if player wasn't added to map, reset his map pointer!
         GetPlayer()->ResetMap();
 
         DETAIL_LOG("WorldSession::HandleMoveWorldportAckOpcode: %s was teleported far but couldn't be added to map "
             " (map:%u, x:%f, y:%f, z:%f) Trying to port him to his previous place..",
-            GetPlayer()->GetGuidStr().c_str(), loc.mapid, loc.coord_x, loc.coord_y, loc.coord_z);
+            GetPlayer()->GetGuidStr().c_str(), loc.GetMapId(), loc.x, loc.y, loc.z);
 
         // Teleport to previous place, if cannot be ported back TP to homebind place
-        if (!GetPlayer()->TeleportTo(old_loc))
+        if (!GetPlayer()->TeleportTo(old_loc, TELE_TO_NODELAY))
         {
             DETAIL_LOG("WorldSession::HandleMoveWorldportAckOpcode: %s cannot be ported to his previous place, teleporting him to his homebind place...",
                 GetPlayer()->GetGuidStr().c_str());
@@ -133,10 +143,10 @@ void WorldSession::HandleMoveWorldportAckOpcode()
 
     // battleground state prepare (in case join to BG), at relogin/tele player not invited
     // only add to bg group and object, if the player was invited (else he entered through command)
-    if(_player->InBattleGround())
+    if (_player->InBattleGround())
     {
         // cleanup setting if outdated
-        if(!mEntry->IsBattleGroundOrArena())
+        if (!mEntry->IsBattleGroundOrArena())
         {
             // We're not in BG
             _player->SetBattleGroundId(0, BATTLEGROUND_TYPE_NONE);
@@ -144,9 +154,9 @@ void WorldSession::HandleMoveWorldportAckOpcode()
             _player->SetBGTeam(TEAM_NONE);
         }
         // join to bg case
-        else if(BattleGround *bg = _player->GetBattleGround())
+        else if (BattleGround* bg = _player->GetBattleGround())
         {
-            if(_player->IsInvitedForBattleGroundInstance(_player->GetBattleGroundId()))
+            if (_player->IsInvitedForBattleGroundInstance(_player->GetBattleGroundId()))
                 bg->AddPlayer(_player);
         }
     }
@@ -154,25 +164,25 @@ void WorldSession::HandleMoveWorldportAckOpcode()
     GetPlayer()->SendInitialPacketsAfterAddToMap();
 
     // flight fast teleport case
-    if(GetPlayer()->GetMotionMaster()->GetCurrentMovementGeneratorType() == FLIGHT_MOTION_TYPE)
+    if (GetPlayer()->IsInUnitState(UNIT_ACTION_TAXI))
     {
-        if(!_player->InBattleGround())
+        if (!_player->InBattleGround())
         {
             // short preparations to continue flight
-            FlightPathMovementGenerator* flight = (FlightPathMovementGenerator*)(GetPlayer()->GetMotionMaster()->top());
+            FlightPathMovementGenerator* flight = (FlightPathMovementGenerator*)(GetPlayer()->GetMotionMaster()->CurrentMovementGenerator());
             flight->Reset(*GetPlayer());
             return;
         }
 
         // battleground state prepare, stop flight
-        GetPlayer()->GetMotionMaster()->MovementExpired();
+        GetPlayer()->GetUnitStateMgr().InitDefaults();
         GetPlayer()->m_taxi.ClearTaxiDestinations();
     }
 
     if (mInstance)
     {
         Difficulty diff = GetPlayer()->GetDifficulty(mEntry->IsRaid());
-        if(MapDifficulty const* mapDiff = GetMapDifficultyData(mEntry->MapID,diff))
+        if (MapDifficultyEntry const* mapDiff = GetMapDifficultyData(mEntry->MapID, diff))
         {
             if (mapDiff->resetTime)
             {
@@ -186,18 +196,21 @@ void WorldSession::HandleMoveWorldportAckOpcode()
     }
 
     // mount allow check
-    if(!mEntry->IsMountAllowed())
+    if (!mEntry->IsMountAllowed())
         _player->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
 
     // honorless target
-    if(GetPlayer()->pvpInfo.inHostileArea)
-        GetPlayer()->CastSpell(GetPlayer(), 2479, true);
+    if (GetPlayer()->pvpInfo.inHostileArea)
+        GetPlayer()->CastSpell(GetPlayer(), SPELL_ID_HONORLESS_TARGET, true);
 
     // resummon pet
     GetPlayer()->ResummonPetTemporaryUnSummonedIfAny();
 
-    //lets process all delayed operations on successful teleport
+    // lets process all delayed operations on successful teleport
     GetPlayer()->ProcessDelayedOperations();
+
+    // Set last WS update time to 0 - grant sending ALL WS updates from new map.
+    GetPlayer()->SetLastWorldStateUpdateTime(time_t(0));
 }
 
 void WorldSession::HandleMoveTeleportAckOpcode(WorldPacket& recv_data)
@@ -213,13 +226,13 @@ void WorldSession::HandleMoveTeleportAckOpcode(WorldPacket& recv_data)
     DEBUG_LOG("Guid: %s", guid.GetString().c_str());
     DEBUG_LOG("Counter %u, time %u", counter, time/IN_MILLISECONDS);
 
-    Unit *mover = _player->GetMover();
-    Player *plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL;
+    Unit* mover = _player->GetMover();
+    Player* plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL;
 
-    if(!plMover || !plMover->IsBeingTeleportedNear())
+    if (!plMover || !plMover->IsBeingTeleportedNear())
         return;
 
-    if(guid != plMover->GetObjectGuid())
+    if (guid != plMover->GetObjectGuid())
         return;
 
     plMover->SetSemaphoreTeleportNear(false);
@@ -228,38 +241,39 @@ void WorldSession::HandleMoveTeleportAckOpcode(WorldPacket& recv_data)
 
     WorldLocation const& dest = plMover->GetTeleportDest();
 
-    plMover->SetPosition(dest.coord_x, dest.coord_y, dest.coord_z, dest.orientation, true);
+    plMover->SetPosition(dest, true);
 
     uint32 newzone, newarea;
     plMover->GetZoneAndAreaId(newzone, newarea);
     plMover->UpdateZone(newzone, newarea);
 
     // new zone
-    if(old_zone != newzone)
+    if (old_zone != newzone)
     {
         // honorless target
-        if(plMover->pvpInfo.inHostileArea)
-            plMover->CastSpell(plMover, 2479, true);
+        if (plMover->pvpInfo.inHostileArea)
+            plMover->CastSpell(plMover, SPELL_ID_HONORLESS_TARGET, true);
     }
 
     // resummon pet
     GetPlayer()->ResummonPetTemporaryUnSummonedIfAny();
 
-    //lets process all delayed operations on successful teleport
+    // lets process all delayed operations on successful teleport
     GetPlayer()->ProcessDelayedOperations();
 }
 
-void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
+void WorldSession::HandleMovementOpcodes(WorldPacket & recv_data)
 {
-    uint32 opcode = recv_data.GetOpcode();
-    DEBUG_LOG("WORLD: Recvd %s (%u, 0x%X) opcode", LookupOpcodeName(opcode), opcode, opcode);
-    recv_data.hexlike();
+    Opcodes opcode = recv_data.GetOpcode();
+
+    DEBUG_FILTER_LOG(LOG_FILTER_PLAYER_MOVES,"WorldSession::HandleMovementOpcodes: Recvd %s (%u, 0x%X) opcode", LookupOpcodeName(opcode), opcode, opcode);
+    //recv_data.hexlike();
 
-    Unit *mover = _player->GetMover();
-    Player *plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL;
+    Unit* mover = _player->GetMover();
+    Player* plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL;
 
     // ignore, waiting processing in WorldSession::HandleMoveWorldportAckOpcode and WorldSession::HandleMoveTeleportAck
-    if(plMover && plMover->IsBeingTeleported())
+    if (plMover && plMover->IsBeingTeleported())
     {
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
@@ -271,6 +285,7 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
 
     recv_data >> guid.ReadAsPacked();
     recv_data >> movementInfo;
+
     /*----------------*/
 
     if (!VerifyMovementInfo(movementInfo, guid))
@@ -280,22 +295,58 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
     if (opcode == MSG_MOVE_FALL_LAND && plMover && !plMover->IsTaxiFlying())
         plMover->HandleFall(movementInfo);
 
+    /* process anticheat check */
+    GetPlayer()->GetAntiCheat()->DoAntiCheatCheck(CHECK_MOVEMENT,movementInfo, opcode);
+
     /* process position-change */
-    HandleMoverRelocation(movementInfo);
 
     if (plMover)
+    {
+        HandlePlayerRelocation(movementInfo);
+
         plMover->UpdateFallInformationIfNeed(movementInfo, opcode);
 
+        if (plMover->IsSitState() && (movementInfo.GetMovementFlags() & (MOVEFLAG_MASK_MOVING | MOVEFLAG_MASK_TURNING)))
+            plMover->SetStandState(UNIT_STAND_STATE_STAND);
+    }
+
     WorldPacket data(opcode, recv_data.size());
     data << mover->GetPackGUID();             // write guid
-    movementInfo.Write(data);                               // write data
+
+    // some movement packet fixes, taking into account client/server connection lag.
+    uint32 newTime = WorldTimer::getMSTime();
+
+    switch (sWorld.getConfig(CONFIG_UINT32_FIX_MOVE_PACKETS_METHOD))
+    {
+        case 1:
+        {
+            if (!m_clientTimeDelay)
+            {
+                if (newTime > movementInfo.GetTime())
+                    m_clientTimeDelay = newTime - movementInfo.GetTime();
+            }
+
+            if (m_clientTimeDelay)
+                newTime = movementInfo.GetTime() + m_clientTimeDelay;
+            break;
+        }
+        case 2:
+        {
+            newTime += sWorld.getConfig(CONFIG_UINT32_FIX_MOVE_PACKETS_ADD_TIME);
+            break;
+        }
+    }
+
+    movementInfo.UpdateTime(newTime);
+    movementInfo.Write(data);                 // write data
     mover->SendMessageToSetExcept(&data, _player);
+
+    UpdateMoverPosition(movementInfo);
 }
 
 void WorldSession::HandleForceSpeedChangeAckOpcodes(WorldPacket &recv_data)
 {
     uint32 opcode = recv_data.GetOpcode();
-    DEBUG_LOG("WORLD: Recvd %s (%u, 0x%X) opcode", LookupOpcodeName(opcode), opcode, opcode);
 
     /* extract packet */
     ObjectGuid guid;
@@ -307,8 +358,11 @@ void WorldSession::HandleForceSpeedChangeAckOpcodes(WorldPacket &recv_data)
     recv_data >> movementInfo;
     recv_data >> newspeed;
 
+    DEBUG_LOG("WORLD: Recvd %s (%u, 0x%X) opcode, unit %s new speed %f ", LookupOpcodeName(opcode), opcode, opcode,
+        guid ? guid.GetString().c_str() : "<none>", newspeed);
+
     // now can skip not our packet
-    if(_player->GetObjectGuid() != guid)
+    if (_player->GetObjectGuid() != guid)
     {
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
@@ -322,7 +376,7 @@ void WorldSession::HandleForceSpeedChangeAckOpcodes(WorldPacket &recv_data)
 
     static char const* move_type_name[MAX_MOVE_TYPE] = {  "Walk", "Run", "RunBack", "Swim", "SwimBack", "TurnRate", "Flight", "FlightBack", "PitchRate" };
 
-    switch(opcode)
+    switch (opcode)
     {
         case CMSG_FORCE_WALK_SPEED_CHANGE_ACK:          move_type = MOVE_WALK;          force_move_type = MOVE_WALK;        break;
         case CMSG_FORCE_RUN_SPEED_CHANGE_ACK:           move_type = MOVE_RUN;           force_move_type = MOVE_RUN;         break;
@@ -340,20 +394,20 @@ void WorldSession::HandleForceSpeedChangeAckOpcodes(WorldPacket &recv_data)
 
     // skip all forced speed changes except last and unexpected
     // in run/mounted case used one ACK and it must be skipped.m_forced_speed_changes[MOVE_RUN} store both.
-    if(_player->m_forced_speed_changes[force_move_type] > 0)
+    if (_player->m_forced_speed_changes[force_move_type] > 0)
     {
         --_player->m_forced_speed_changes[force_move_type];
-        if(_player->m_forced_speed_changes[force_move_type] > 0)
+        if (_player->m_forced_speed_changes[force_move_type] > 0)
             return;
     }
 
-    if (!_player->GetTransport() && fabs(_player->GetSpeed(move_type) - newspeed) > 0.01f)
+    if (!_player->IsOnTransport() && fabs(_player->GetSpeed(move_type) - newspeed) > 0.01f)
     {
-        if(_player->GetSpeed(move_type) > newspeed)         // must be greater - just correct
+        if (_player->GetSpeed(move_type) > newspeed)         // must be greater - just correct
         {
             sLog.outError("%sSpeedChange player %s is NOT correct (must be %f instead %f), force set to correct value",
                 move_type_name[move_type], _player->GetName(), _player->GetSpeed(move_type), newspeed);
-            _player->SetSpeedRate(move_type,_player->GetSpeedRate(move_type),true);
+            _player->SetSpeedRate(move_type, _player->GetSpeedRate(move_type), true);
         }
         else                                                // must be lesser - cheating
         {
@@ -364,62 +418,49 @@ void WorldSession::HandleForceSpeedChangeAckOpcodes(WorldPacket &recv_data)
     }
 }
 
-void WorldSession::HandleSetActiveMoverOpcode(WorldPacket &recv_data)
+void WorldSession::HandleSetActiveMoverOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Recvd CMSG_SET_ACTIVE_MOVER");
     recv_data.hexlike();
 
     ObjectGuid guid;
     recv_data >> guid;
+    ObjectGuid moverGuid = GetPlayer()->GetMover() ? GetPlayer()->GetMover()->GetObjectGuid() : ObjectGuid();
 
-    if(_player->GetMover()->GetObjectGuid() != guid)
+    if (moverGuid != guid)
     {
         sLog.outError("HandleSetActiveMoverOpcode: incorrect mover guid: mover is %s and should be %s",
-            _player->GetMover()->GetGuidStr().c_str(), guid.GetString().c_str());
+            moverGuid.GetString().c_str(), guid.GetString().c_str());
         return;
     }
 }
 
-void WorldSession::HandleMoveNotActiveMoverOpcode(WorldPacket &recv_data)
+void WorldSession::HandleMoveNotActiveMoverOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG("WORLD: Recvd CMSG_MOVE_NOT_ACTIVE_MOVER");
     recv_data.hexlike();
 
     ObjectGuid old_mover_guid;
-    MovementInfo mi;
+    MovementInfo movementInfo;
 
     recv_data >> old_mover_guid.ReadAsPacked();
-    recv_data >> mi;
+    recv_data >> movementInfo;
 
-    if(_player->GetMover()->GetObjectGuid() == old_mover_guid)
+    ObjectGuid moverGuid = GetPlayer()->GetMover() ? GetPlayer()->GetMover()->GetObjectGuid() : ObjectGuid();
+
+    if (moverGuid == old_mover_guid)
     {
-        sLog.outError("HandleMoveNotActiveMover: incorrect mover guid: mover is %s and should be %s instead of %s",
+/*        sLog.outError("HandleMoveNotActiveMover: incorrect mover guid: mover is %s and should be %s instead of %s",
             _player->GetMover()->GetGuidStr().c_str(),
             _player->GetGuidStr().c_str(),
             old_mover_guid.GetString().c_str());
+*/
+        DEBUG_LOG("World: CMSG_MOVE_NOT_ACTIVE_MOVER %s received, but %s now is active mover!", moverGuid.GetString().c_str(), old_mover_guid.GetString().c_str());
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
     }
 
-    _player->m_movementInfo = mi;
-}
-
-void WorldSession::HandleDismissControlledVehicle(WorldPacket &recv_data)
-{
-    DEBUG_LOG("WORLD: Recvd CMSG_DISMISS_CONTROLLED_VEHICLE");
-    recv_data.hexlike();
-
-    ObjectGuid guid;
-    MovementInfo mi;
-
-    recv_data >> guid.ReadAsPacked();
-    recv_data >> mi;
-
-    ObjectGuid vehicleGUID = _player->GetCharmGuid();
-    if (!vehicleGUID)                                       // something wrong here...
-        return;
-
-    _player->m_movementInfo = mi;
+    _player->m_movementInfo = movementInfo;
 }
 
 void WorldSession::HandleMountSpecialAnimOpcode(WorldPacket& /*recvdata*/)
@@ -432,15 +473,15 @@ void WorldSession::HandleMountSpecialAnimOpcode(WorldPacket& /*recvdata*/)
     GetPlayer()->SendMessageToSet(&data, false);
 }
 
-void WorldSession::HandleMoveKnockBackAck( WorldPacket & recv_data )
+void WorldSession::HandleMoveKnockBackAck(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_MOVE_KNOCK_BACK_ACK");
 
-    Unit *mover = _player->GetMover();
-    Player *plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL;
+    Unit* mover = _player->GetMover();
+    Player* plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL;
 
     // ignore, waiting processing in WorldSession::HandleMoveWorldportAckOpcode and WorldSession::HandleMoveTeleportAck
-    if(plMover && plMover->IsBeingTeleported())
+    if (plMover && plMover->IsBeingTeleported())
     {
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
@@ -456,7 +497,7 @@ void WorldSession::HandleMoveKnockBackAck( WorldPacket & recv_data )
     if (!VerifyMovementInfo(movementInfo, guid))
         return;
 
-    HandleMoverRelocation(movementInfo);
+    mover->m_movementInfo = movementInfo;
 
     WorldPacket data(MSG_MOVE_KNOCK_BACK, recv_data.size() + 15);
     data << mover->GetPackGUID();
@@ -465,10 +506,26 @@ void WorldSession::HandleMoveKnockBackAck( WorldPacket & recv_data )
     data << movementInfo.GetJumpInfo().cosAngle;
     data << movementInfo.GetJumpInfo().xyspeed;
     data << movementInfo.GetJumpInfo().velocity;
+
     mover->SendMessageToSetExcept(&data, _player);
 }
 
-void WorldSession::HandleMoveHoverAck( WorldPacket& recv_data )
+void WorldSession::SendKnockBack(float angle, float horizontalSpeed, float verticalSpeed)
+{
+    float vsin = sin(angle);
+    float vcos = cos(angle);
+
+    WorldPacket data(SMSG_MOVE_KNOCK_BACK, 9 + 4 + 4 + 4 + 4 + 4);
+    data << GetPlayer()->GetPackGUID();
+    data << uint32(0);                                  // Sequence
+    data << float(vcos);                                // x direction
+    data << float(vsin);                                // y direction
+    data << float(horizontalSpeed);                     // Horizontal speed
+    data << float(-verticalSpeed);                      // Z Movement speed (vertical)
+    SendPacket(&data);
+}
+
+void WorldSession::HandleMoveHoverAck(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_MOVE_HOVER_ACK");
 
@@ -513,71 +570,81 @@ bool WorldSession::VerifyMovementInfo(MovementInfo const& movementInfo, ObjectGu
     if (guid != _player->GetMover()->GetObjectGuid())
         return false;
 
-    if (!MaNGOS::IsValidMapCoord(movementInfo.GetPos()->x, movementInfo.GetPos()->y, movementInfo.GetPos()->z, movementInfo.GetPos()->o))
+    Position const* pos = movementInfo.GetPos();
+
+    if (!MaNGOS::IsValidMapCoord(pos->x, pos->y, pos->z, pos->o))
         return false;
 
     if (movementInfo.HasMovementFlag(MOVEFLAG_ONTRANSPORT))
     {
+        Position const* tPos = movementInfo.GetTransportPos();
+
         // transports size limited
         // (also received at zeppelin/lift leave by some reason with t_* as absolute in continent coordinates, can be safely skipped)
-        if( movementInfo.GetTransportPos()->x > 50 || movementInfo.GetTransportPos()->y > 50 || movementInfo.GetTransportPos()->z > 100 )
+        if (tPos->x > 50.0f || tPos->y > 50.0f || tPos->z > 100.0f)
             return false;
 
-        if( !MaNGOS::IsValidMapCoord(movementInfo.GetPos()->x + movementInfo.GetTransportPos()->x, movementInfo.GetPos()->y + movementInfo.GetTransportPos()->y,
-            movementInfo.GetPos()->z + movementInfo.GetTransportPos()->z, movementInfo.GetPos()->o + movementInfo.GetTransportPos()->o) )
-        {
+        if (!MaNGOS::IsValidMapCoord(pos->x + tPos->x, pos->y + tPos->y, pos->z + tPos->z, pos->o + tPos->o))
             return false;
-        }
     }
 
     return true;
 }
 
-void WorldSession::HandleMoverRelocation(MovementInfo& movementInfo)
+void WorldSession::HandlePlayerRelocation(MovementInfo& movementInfo)
 {
-    movementInfo.UpdateTime(WorldTimer::getMSTime());
+    Unit* mover = _player->GetMover();
 
-    Unit *mover = _player->GetMover();
+    Player* plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL;
+    if (!plMover)
+        return;
 
-    if (Player *plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL)
+    if (movementInfo.HasMovementFlag(MOVEFLAG_ONTRANSPORT))
     {
-        if (movementInfo.HasMovementFlag(MOVEFLAG_ONTRANSPORT))
-        {
-            if (!plMover->m_transport)
-            {
-                // elevators also cause the client to send MOVEFLAG_ONTRANSPORT - just unmount if the guid can be found in the transport list
-                for (MapManager::TransportSet::const_iterator iter = sMapMgr.m_Transports.begin(); iter != sMapMgr.m_Transports.end(); ++iter)
-                {
-                    if ((*iter)->GetObjectGuid() == movementInfo.GetTransportGuid())
-                    {
-                        plMover->m_transport = (*iter);
-                        (*iter)->AddPassenger(plMover);
-                        break;
-                    }
-                }
-            }
-        }
-        else if (plMover->m_transport)               // if we were on a transport, leave
+        if (!plMover->IsOnTransport() && plMover->GetMap())
         {
-            plMover->m_transport->RemovePassenger(plMover);
-            plMover->m_transport = NULL;
-            movementInfo.ClearTransportData();
+            /* process anticheat check */
+            GetPlayer()->GetAntiCheat()->DoAntiCheatCheck(CHECK_TRANSPORT, movementInfo);
+
+            // elevators also cause the client to send MOVEFLAG_ONTRANSPORT - just unmount if the guid can be found in the transport list
+            if (Transport* transport = sObjectMgr.GetTransportByGuid(movementInfo.GetTransportGuid()))
+                transport->AddPassenger(plMover, movementInfo.GetTransportPosition());
+            // FIXME - unblock next strings after finish ipmlement regular (not MO) transports.
+            //if (Transport* transport = plMover->GetMap()->GetTransport(movementInfo.GetTransportGuid()))
+            //    transport->AddPassenger(plMover, movementInfo.GetTransportPosition());
         }
+    }
+    else if (plMover->IsOnTransport())               // if we were on a transport, leave
+        plMover->GetTransport()->RemovePassenger(plMover);
 
-        if (movementInfo.HasMovementFlag(MOVEFLAG_SWIMMING) != plMover->IsInWater())
-        {
-            // now client not include swimming flag in case jumping under water
-            plMover->SetInWater( !plMover->IsInWater() || plMover->GetTerrain()->IsUnderWater(movementInfo.GetPos()->x, movementInfo.GetPos()->y, movementInfo.GetPos()->z) );
-        }
+    if (movementInfo.HasMovementFlag(MOVEFLAG_SWIMMING) != plMover->IsInWater())
+    {
+        // now client not include swimming flag in case jumping under water
+        Position const* pos = movementInfo.GetPos();
+        plMover->SetInWater(!plMover->IsInWater() || plMover->GetTerrain()->IsUnderWater(pos->x, pos->y, pos->z));
+    }
+}
+
+void WorldSession::UpdateMoverPosition(MovementInfo& movementInfo)
+{
+    Unit* unitMover = _player->GetMover();
 
-        plMover->SetPosition(movementInfo.GetPos()->x, movementInfo.GetPos()->y, movementInfo.GetPos()->z, movementInfo.GetPos()->o);
+    // player
+    if (Player* plMover = unitMover->GetTypeId() == TYPEID_PLAYER ? (Player*)unitMover : NULL)
+    {
         plMover->m_movementInfo = movementInfo;
 
-        if(movementInfo.GetPos()->z < -500.0f)
+        plMover->SetPosition(Position(movementInfo.GetPosition(), plMover->GetPosition().GetPhaseMask()));
+        if (plMover->IsOnTransport())
+            plMover->SetTransportPosition(movementInfo.GetTransportPosition());
+
+        float z = movementInfo.GetPos()->z;
+        uint32 mapId = plMover->GetMapId();
+
+        if ((z < -500.0f) || (mapId == 617 && z < 2.0f) || (mapId == 572 && z < 20.0f) ||
+            (mapId == 562 && z < -20.0f)) // Prevent falling under textures on some arenas
         {
-            if(plMover->InBattleGround()
-                && plMover->GetBattleGround()
-                && plMover->GetBattleGround()->HandlePlayerUnderMap(_player))
+            if (plMover->GetBattleGround() && plMover->GetBattleGround()->HandlePlayerUnderMap(_player))
             {
                 // do nothing, the handle already did if returned true
             }
@@ -586,11 +653,11 @@ void WorldSession::HandleMoverRelocation(MovementInfo& movementInfo)
                 // NOTE: this is actually called many times while falling
                 // even after the player has been teleported away
                 // TODO: discard movement packets after the player is rooted
-                if(plMover->isAlive())
+                if (plMover->isAlive())
                 {
                     plMover->EnvironmentalDamage(DAMAGE_FALL_TO_VOID, plMover->GetMaxHealth());
                     // pl can be alive if GM/etc
-                    if(!plMover->isAlive())
+                    if (!plMover->isAlive())
                     {
                         // change the death state to CORPSE to prevent the death timer from
                         // starting in the next player update
@@ -604,9 +671,13 @@ void WorldSession::HandleMoverRelocation(MovementInfo& movementInfo)
             }
         }
     }
-    else                                                    // creature charmed
+    // creature charmed
+    else if (unitMover->IsInWorld())
     {
-        if (mover->IsInWorld())
-            mover->GetMap()->CreatureRelocation((Creature*)mover, movementInfo.GetPos()->x, movementInfo.GetPos()->y, movementInfo.GetPos()->z, movementInfo.GetPos()->o);
+        unitMover->m_movementInfo = movementInfo;
+
+        unitMover->SetPosition(Position(movementInfo.GetPosition(), unitMover->GetPosition().GetPhaseMask()));
+        if (unitMover->IsOnTransport())
+            unitMover->SetTransportPosition(movementInfo.GetTransportPosition());
     }
 }
diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp
index 23916e9ade7..c9b7d4d77ba 100644
--- a/src/game/NPCHandler.cpp
+++ b/src/game/NPCHandler.cpp
@@ -292,12 +292,9 @@ void WorldSession::HandleTrainerBuySpellOpcode( WorldPacket & recv_data )
 
     _player->ModifyMoney( -int32(nSpellCost) );
 
-    WorldPacket data(SMSG_PLAY_SPELL_VISUAL, 12);           // visual effect on trainer
-    data << ObjectGuid(guid);
-    data << uint32(0xB3);                                   // index from SpellVisualKit.dbc
-    SendPacket(&data);
+    SendPlaySpellVisual(guid, 0xB3);                        // visual effect on trainer
 
-    data.Initialize(SMSG_PLAY_SPELL_IMPACT, 12);            // visual effect on player
+    WorldPacket data(SMSG_PLAY_SPELL_IMPACT, 8+4);          // visual effect on player
     data << _player->GetObjectGuid();
     data << uint32(0x016A);                                 // index from SpellVisualKit.dbc
     SendPacket(&data);
@@ -332,8 +329,7 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket & recv_data)
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
 
-    if (!pCreature->IsStopped())
-        pCreature->StopMoving();
+    pCreature->StopMoving();
 
     if (pCreature->isSpiritGuide())
         pCreature->SendAreaSpiritHealerQueryOpcode(_player);
@@ -421,7 +417,7 @@ void WorldSession::HandleSpiritHealerActivateOpcode( WorldPacket & recv_data )
 
 void WorldSession::SendSpiritResurrect()
 {
-    _player->ResurrectPlayer(0.5f, true);
+    _player->ResurrectPlayer(50, true);
 
     _player->DurabilityLossAll(0.25f,true);
 
@@ -442,18 +438,18 @@ void WorldSession::SendSpiritResurrect()
             _player->GetPositionX(), _player->GetPositionY(), _player->GetPositionZ(), _player->GetMapId(), _player->GetTeam());
 
         if(corpseGrave != ghostGrave)
-            _player->TeleportTo(corpseGrave->map_id, corpseGrave->x, corpseGrave->y, corpseGrave->z, _player->GetOrientation());
+            _player->TeleportTo(corpseGrave->map_id, corpseGrave->x, corpseGrave->y, corpseGrave->z, _player->GetOrientation(), TELE_TO_NODELAY);
         // or update at original position
         else
         {
-            _player->GetCamera().UpdateVisibilityForOwner();
+            _player->GetCamera()->UpdateVisibilityForOwner();
             _player->UpdateObjectVisibility();
         }
     }
     // or update at original position
     else
     {
-        _player->GetCamera().UpdateVisibilityForOwner();
+        _player->GetCamera()->UpdateVisibilityForOwner();
         _player->UpdateObjectVisibility();
     }
 }
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index b775a250897..5bf3557bf64 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -33,70 +33,124 @@
 #include "MapManager.h"
 #include "Log.h"
 #include "Transports.h"
-#include "TargetedMovementGenerator.h"
-#include "WaypointMovementGenerator.h"
+#include "movementGenerators/TargetedMovementGenerator.h"
+#include "movementGenerators/WaypointMovementGenerator.h"
 #include "VMapFactory.h"
 #include "CellImpl.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "ObjectPosSelector.h"
 #include "TemporarySummon.h"
+#include "OutdoorPvP/OutdoorPvPMgr.h"
 #include "movement/packet_builder.h"
+#include "movement/MoveSplineInit.h"
+#include "movement/MoveSpline.h"
+#include "UpdateFieldFlags.h"
+#include "Group.h"
+#include "CreatureLinkingMgr.h"
+#include "Chat.h"
 
-Object::Object( )
+#define TERRAIN_LOS_STEP_DISTANCE   3.0f        // sample distance for terrain LoS
+
+UpdateFieldData::UpdateFieldData(Object const* object, Player* target)
 {
-    m_objectTypeId      = TYPEID_OBJECT;
-    m_objectType        = TYPEMASK_OBJECT;
+    m_isSelf = object == target;
+    m_isItemOwner = false;
+    m_hasSpecialInfo = false;
+    m_isPartyMember = false;
+
+    switch (object->GetTypeId())
+    {
+        case TYPEID_ITEM:
+        case TYPEID_CONTAINER:
+            m_flags = ItemUpdateFieldFlags;
+            m_isOwner = m_isItemOwner = ((Item*)object)->GetOwnerGuid() == target->GetObjectGuid();
+            break;
+        case TYPEID_UNIT:
+        case TYPEID_PLAYER:
+        {
+            m_flags = UnitUpdateFieldFlags;
+            m_isOwner = ((Unit*)object)->GetOwnerGuid() == target->GetObjectGuid();
+            m_hasSpecialInfo = ((Unit*)object)->HasAuraTypeWithCaster(SPELL_AURA_EMPATHY, target->GetObjectGuid());
+            if (Player* pPlayer = ((Unit*)object)->GetCharmerOrOwnerPlayerOrPlayerItself())
+                m_isPartyMember = pPlayer->IsInSameRaidWith(target);
+            break;
+        }
+        case TYPEID_GAMEOBJECT:
+            m_flags = GameObjectUpdateFieldFlags;
+            m_isOwner = ((GameObject*)object)->GetOwnerGuid() == target->GetObjectGuid();
+            break;
+        case TYPEID_DYNAMICOBJECT:
+            m_flags = DynamicObjectUpdateFieldFlags;
+            m_isOwner = ((DynamicObject*)object)->GetCasterGuid() == target->GetObjectGuid();
+            break;
+        case TYPEID_CORPSE:
+            m_flags = CorpseUpdateFieldFlags;
+            m_isOwner = ((Corpse*)object)->GetOwnerGuid() == target->GetObjectGuid();
+            break;
+    }
+}
 
-    m_uint32Values      = 0;
-    m_uint32Values_mirror = 0;
-    m_valuesCount       = 0;
+bool UpdateFieldData::IsUpdateFieldVisible(uint16 fieldIndex) const
+{
+    if (m_flags[fieldIndex] == UF_FLAG_NONE)
+        return false;
 
-    m_inWorld           = false;
-    m_objectUpdated     = false;
+    if (HasFlags(fieldIndex, UF_FLAG_PUBLIC) ||
+        (HasFlags(fieldIndex, UF_FLAG_PRIVATE) && m_isSelf) ||
+        (HasFlags(fieldIndex, UF_FLAG_OWNER) && m_isOwner) ||
+        (HasFlags(fieldIndex, UF_FLAG_ITEM_OWNER) && m_isItemOwner) ||
+        (HasFlags(fieldIndex, UF_FLAG_PARTY_MEMBER) && m_isPartyMember))
+        return true;
+
+    return false;
+}
+
+Object::Object() :
+    m_objectTypeId(TYPEID_OBJECT),
+    m_objectType(TYPEMASK_OBJECT),
+    m_uint32Values(NULL),
+    m_valuesCount(0),
+    m_fieldNotifyFlags(UF_FLAG_DYNAMIC),
+    m_inWorld(false),
+    m_objectUpdated(false),
+    m_skipUpdate(false)
+{
 }
 
-Object::~Object( )
+Object::~Object()
 {
-    if(IsInWorld())
+    if (IsInWorld())
     {
         ///- Do NOT call RemoveFromWorld here, if the object is a player it will crash
-        sLog.outError("Object::~Object (GUID: %u TypeId: %u) deleted but still in world!!", GetGUIDLow(), GetTypeId());
+        sLog.outError("Object::~Object (%s type %u) deleted but still in world!!", GetObjectGuid() ? GetObjectGuid().GetString().c_str() : "<none>", GetTypeId());
         MANGOS_ASSERT(false);
     }
 
-    if(m_objectUpdated)
+    if (m_objectUpdated)
     {
-        sLog.outError("Object::~Object (GUID: %u TypeId: %u) deleted but still have updated status!!", GetGUIDLow(), GetTypeId());
+        sLog.outError("Object::~Object ((%s type %u) deleted but still have updated status!!", GetObjectGuid() ? GetObjectGuid().GetString().c_str() : "<none>", GetTypeId());
         MANGOS_ASSERT(false);
     }
 
-    if(m_uint32Values)
-    {
-        //DEBUG_LOG("Object desctr 1 check (%p)",(void*)this);
-        delete [] m_uint32Values;
-        delete [] m_uint32Values_mirror;
-        //DEBUG_LOG("Object desctr 2 check (%p)",(void*)this);
-    }
+    delete[] m_uint32Values;
 }
 
 void Object::_InitValues()
 {
-    m_uint32Values = new uint32[ m_valuesCount ];
-    memset(m_uint32Values, 0, m_valuesCount*sizeof(uint32));
+    m_uint32Values = new uint32[m_valuesCount];
+    memset(m_uint32Values, 0, m_valuesCount * sizeof(uint32));
 
-    m_uint32Values_mirror = new uint32[ m_valuesCount ];
-    memset(m_uint32Values_mirror, 0, m_valuesCount*sizeof(uint32));
+    m_changedValues.resize(m_valuesCount, false);
 
     m_objectUpdated = false;
 }
 
-void Object::_Create(uint32 guidlow, uint32 entry, HighGuid guidhigh)
+void Object::_Create(ObjectGuid guid)
 {
     if(!m_uint32Values)
         _InitValues();
 
-    ObjectGuid guid = ObjectGuid(guidhigh, entry, guidlow);
     SetGuidValue(OBJECT_FIELD_GUID, guid);
     SetUInt32Value(OBJECT_FIELD_TYPE, m_objectType);
     m_PackGUID.Set(guid);
@@ -115,13 +169,20 @@ void Object::SendForcedObjectUpdate()
     UpdateDataMapType update_players;
 
     BuildUpdateData(update_players);
-    RemoveFromClientUpdateList();
+//    RemoveFromClientUpdateList();
 
     WorldPacket packet;                                     // here we allocate a std::vector with a size of 0x10000
     for(UpdateDataMapType::iterator iter = update_players.begin(); iter != update_players.end(); ++iter)
     {
+        if (!iter->first || !iter->first.IsPlayer())
+            continue;
+
+        Player* pPlayer = ObjectAccessor::FindPlayer(iter->first);
+        if (!pPlayer)
+            continue;
+
         iter->second.BuildPacket(&packet);
-        iter->first->GetSession()->SendPacket(&packet);
+        pPlayer->GetSession()->SendPacket(&packet);
         packet.clear();                                     // clean the string
     }
 }
@@ -147,10 +208,10 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData *data, Player *target) c
     uint16 updateFlags  = m_updateFlag;
 
     /** lower flag1 **/
-    if(target == this)                                      // building packet for yourself
+    if (target == this)                                      // building packet for yourself
         updateFlags |= UPDATEFLAG_SELF;
 
-    if(updateFlags & UPDATEFLAG_HAS_POSITION)
+    if (updateFlags & UPDATEFLAG_HAS_POSITION)
     {
         // UPDATETYPE_CREATE_OBJECT2 dynamic objects, corpses...
         if (isType(TYPEMASK_DYNAMICOBJECT) || isType(TYPEMASK_CORPSE) || isType(TYPEMASK_PLAYER))
@@ -179,16 +240,16 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData *data, Player *target) c
             }
         }
 
-        if(isType(TYPEMASK_UNIT))
+        if (isType(TYPEMASK_UNIT))
         {
-            if(((Unit*)this)->getVictim())
+            if (((Unit*)this)->getVictim())
                 updateFlags |= UPDATEFLAG_HAS_ATTACKING_TARGET;
         }
     }
 
     //DEBUG_LOG("BuildCreateUpdate: update-type: %u, object-type: %u got updateFlags: %X", updatetype, m_objectTypeId, updateFlags);
 
-    ByteBuffer buf(500);
+    ByteBuffer buf;
     buf << uint8(updatetype);
     buf << GetPackGUID();
     buf << uint8(m_objectTypeId);
@@ -229,9 +290,9 @@ void Object::BuildValuesUpdateBlockForPlayer(UpdateData *data, Player *target) c
     data->AddUpdateBlock(buf);
 }
 
-void Object::BuildOutOfRangeUpdateBlock(UpdateData * data) const
+void Object::BuildOutOfRangeUpdateBlock(UpdateData* data) const
 {
-    data->AddOutOfRangeGUID(GetObjectGuid());
+    data->AddOutOfRangeGuid(GetObjectGuid());
 }
 
 void Object::DestroyForPlayer( Player *target, bool anim ) const
@@ -246,23 +307,18 @@ void Object::DestroyForPlayer( Player *target, bool anim ) const
 
 void Object::BuildMovementUpdate(ByteBuffer * data, uint16 updateFlags) const
 {
-    //uint16 moveFlags2 = (isType(TYPEMASK_UNIT) ? ((Unit*)this)->m_movementInfo.GetMovementFlags2() : MOVEFLAG2_NONE);
 
     *data << uint16(updateFlags);                           // update flags
 
     // 0x20
     if (updateFlags & UPDATEFLAG_LIVING)
     {
-        Unit *unit = ((Unit*)this);
+        Unit* unit = ((Unit*)this);
 
-        if (GetTypeId() == TYPEID_PLAYER)
-        {
-            Player *player = ((Player*)unit);
-            if(player->GetTransport())
-                player->m_movementInfo.AddMovementFlag(MOVEFLAG_ONTRANSPORT);
-            else
-                player->m_movementInfo.RemoveMovementFlag(MOVEFLAG_ONTRANSPORT);
-        }
+        if (unit->IsOnTransport() || unit->GetVehicle())
+            unit->m_movementInfo.AddMovementFlag(MOVEFLAG_ONTRANSPORT);
+        else
+            unit->m_movementInfo.RemoveMovementFlag(MOVEFLAG_ONTRANSPORT);
 
         // Update movement info time
         unit->m_movementInfo.UpdateTime(WorldTimer::getMSTime());
@@ -286,18 +342,36 @@ void Object::BuildMovementUpdate(ByteBuffer * data, uint16 updateFlags) const
     }
     else
     {
-        if(updateFlags & UPDATEFLAG_POSITION)
+        if (updateFlags & UPDATEFLAG_POSITION)
         {
-            *data << uint8(0);                              // unk PGUID!
-            *data << float(((WorldObject*)this)->GetPositionX());
-            *data << float(((WorldObject*)this)->GetPositionY());
-            *data << float(((WorldObject*)this)->GetPositionZ());
+            ObjectGuid transportGuid;
+            if (((WorldObject*)this)->GetTransportInfo())
+                transportGuid = ((WorldObject*)this)->GetTransportInfo()->GetTransportGuid();
+
+            if (transportGuid)
+                *data << transportGuid.WriteAsPacked();
+            else
+                *data << uint8(0);
+
             *data << float(((WorldObject*)this)->GetPositionX());
             *data << float(((WorldObject*)this)->GetPositionY());
             *data << float(((WorldObject*)this)->GetPositionZ());
+
+            if (transportGuid)
+            {
+                *data << float(((WorldObject*)this)->GetTransOffsetX());
+                *data << float(((WorldObject*)this)->GetTransOffsetY());
+                *data << float(((WorldObject*)this)->GetTransOffsetZ());
+            }
+            else
+            {
+                *data << float(((WorldObject*)this)->GetPositionX());
+                *data << float(((WorldObject*)this)->GetPositionY());
+                *data << float(((WorldObject*)this)->GetPositionZ());
+            }
             *data << float(((WorldObject*)this)->GetOrientation());
 
-            if(GetTypeId() == TYPEID_CORPSE)
+            if (GetTypeId() == TYPEID_CORPSE)
                 *data << float(((WorldObject*)this)->GetOrientation());
             else
                 *data << float(0);
@@ -308,26 +382,26 @@ void Object::BuildMovementUpdate(ByteBuffer * data, uint16 updateFlags) const
             if (updateFlags & UPDATEFLAG_HAS_POSITION)
             {
                 // 0x02
-                if(updateFlags & UPDATEFLAG_TRANSPORT && ((GameObject*)this)->GetGoType() == GAMEOBJECT_TYPE_MO_TRANSPORT)
+                if (updateFlags & UPDATEFLAG_TRANSPORT && !GetObjectGuid().IsMOTransport())
                 {
-                    *data << float(0);
-                    *data << float(0);
-                    *data << float(0);
-                    *data << float(((WorldObject *)this)->GetOrientation());
+                    *data << float(((WorldObject*)this)->GetTransOffsetX());
+                    *data << float(((WorldObject*)this)->GetTransOffsetY());
+                    *data << float(((WorldObject*)this)->GetTransOffsetZ());
+                    *data << float(((WorldObject*)this)->GetTransOffsetO());
                 }
                 else
                 {
-                    *data << float(((WorldObject *)this)->GetPositionX());
-                    *data << float(((WorldObject *)this)->GetPositionY());
-                    *data << float(((WorldObject *)this)->GetPositionZ());
-                    *data << float(((WorldObject *)this)->GetOrientation());
+                    *data << float(((WorldObject*)this)->GetPositionX());
+                    *data << float(((WorldObject*)this)->GetPositionY());
+                    *data << float(((WorldObject*)this)->GetPositionZ());
+                    *data << float(((WorldObject*)this)->GetOrientation());
                 }
             }
         }
     }
 
     // 0x8
-    if(updateFlags & UPDATEFLAG_LOWGUID)
+    if (updateFlags & UPDATEFLAG_LOWGUID)
     {
         switch(GetTypeId())
         {
@@ -343,7 +417,7 @@ void Object::BuildMovementUpdate(ByteBuffer * data, uint16 updateFlags) const
                 *data << uint32(0x0000000B);                // unk, can be 0xB or 0xC
                 break;
             case TYPEID_PLAYER:
-                if(updateFlags & UPDATEFLAG_SELF)
+                if (updateFlags & UPDATEFLAG_SELF)
                     *data << uint32(0x0000002F);            // unk, can be 0x15 or 0x22
                 else
                     *data << uint32(0x00000008);            // unk, can be 0x7 or 0x8
@@ -355,7 +429,7 @@ void Object::BuildMovementUpdate(ByteBuffer * data, uint16 updateFlags) const
     }
 
     // 0x10
-    if(updateFlags & UPDATEFLAG_HIGHGUID)
+    if (updateFlags & UPDATEFLAG_HIGHGUID)
     {
         switch(GetTypeId())
         {
@@ -371,7 +445,7 @@ void Object::BuildMovementUpdate(ByteBuffer * data, uint16 updateFlags) const
                 *data << uint32(0x0000000B);                // unk, can be 0xB or 0xC
                 break;
             case TYPEID_PLAYER:
-                if(updateFlags & UPDATEFLAG_SELF)
+                if (updateFlags & UPDATEFLAG_SELF)
                     *data << uint32(0x0000002F);            // unk, can be 0x15 or 0x22
                 else
                     *data << uint32(0x00000008);            // unk, can be 0x7 or 0x8
@@ -383,16 +457,16 @@ void Object::BuildMovementUpdate(ByteBuffer * data, uint16 updateFlags) const
     }
 
     // 0x4
-    if(updateFlags & UPDATEFLAG_HAS_ATTACKING_TARGET)       // packed guid (current target guid)
+    if (updateFlags & UPDATEFLAG_HAS_ATTACKING_TARGET)       // packed guid (current target guid)
     {
-        if (((Unit*)this)->getVictim())
-            *data << ((Unit*)this)->getVictim()->GetPackGUID();
+        if (Unit* pVictim = ((Unit*)this)->getVictim())
+            *data << pVictim->GetPackGUID();
         else
             data->appendPackGUID(0);
     }
 
     // 0x2
-    if(updateFlags & UPDATEFLAG_TRANSPORT)
+    if (updateFlags & UPDATEFLAG_TRANSPORT)
     {
         *data << uint32(WorldTimer::getMSTime());                       // ms time
     }
@@ -400,12 +474,15 @@ void Object::BuildMovementUpdate(ByteBuffer * data, uint16 updateFlags) const
     // 0x80
     if (updateFlags & UPDATEFLAG_VEHICLE)
     {
-        *data << uint32(((Unit*)this)->GetVehicleInfo()->GetEntry()->m_ID); // vehicle id
-        *data << float(((WorldObject*)this)->GetOrientation());
+        *data << uint32(((Unit*)this)->GetVehicleInfo()->m_ID); // vehicle id
+        if (((WorldObject*)this)->IsOnTransport())
+            *data << float(((WorldObject*)this)->GetTransOffsetO());
+        else
+            *data << float(((WorldObject*)this)->GetOrientation());
     }
 
     // 0x200
-    if(updateFlags & UPDATEFLAG_ROTATION)
+    if (updateFlags & UPDATEFLAG_ROTATION)
     {
         *data << int64(((GameObject*)this)->GetPackedWorldRotation());
     }
@@ -421,12 +498,10 @@ void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask *
 
     if (updatetype == UPDATETYPE_CREATE_OBJECT || updatetype == UPDATETYPE_CREATE_OBJECT2)
     {
-        if (isType(TYPEMASK_GAMEOBJECT) && !((GameObject*)this)->IsTransport())
+        if (isType(TYPEMASK_GAMEOBJECT) && !((GameObject*)this)->IsDynTransport())
         {
             if (((GameObject*)this)->ActivateToQuest(target) || target->isGameMaster())
                 IsActivateToQuest = true;
-
-            updateMask->SetBit(GAMEOBJECT_DYNAMIC);
         }
         else if (isType(TYPEMASK_UNIT))
         {
@@ -439,12 +514,10 @@ void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask *
     }
     else                                                    // case UPDATETYPE_VALUES
     {
-        if (isType(TYPEMASK_GAMEOBJECT) && !((GameObject*)this)->IsTransport())
+        if (isType(TYPEMASK_GAMEOBJECT) && !((GameObject*)this)->IsDynTransport())
         {
             if (((GameObject*)this)->ActivateToQuest(target) || target->isGameMaster())
                 IsActivateToQuest = true;
-
-            updateMask->SetBit(GAMEOBJECT_DYNAMIC);
             updateMask->SetBit(GAMEOBJECT_BYTES_1);         // why do we need this here?
         }
         else if (isType(TYPEMASK_UNIT))
@@ -541,6 +614,61 @@ void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask *
                             *data << (m_uint32Values[index] & ~(UNIT_DYNFLAG_TAPPED | UNIT_DYNFLAG_TAPPED_BY_PLAYER));
                     }
                 }
+                // hide RAF flag if need
+                else if (index == UNIT_DYNAMIC_FLAGS && GetTypeId() == TYPEID_PLAYER)
+                {
+                    if (!((Player*)this)->IsReferAFriendLinked(target))
+                        *data << (m_uint32Values[index] & ~UNIT_DYNFLAG_REFER_A_FRIEND);
+                    else
+                        *data << m_uint32Values[index];
+                }
+                // Frozen Mod
+                else if (index == UNIT_FIELD_BYTES_2 || index == UNIT_FIELD_FACTIONTEMPLATE)
+                {
+                    bool ch = false;
+
+                    if((GetTypeId() == TYPEID_PLAYER || GetTypeId() == TYPEID_UNIT) && target != this)
+                    {
+                        bool forcefriendly = false; // bool for pets/totems to offload more code from the big if below
+
+                        if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->GetOwner())
+                        {
+                            forcefriendly = (((Creature*)this)->IsTotem() || ((Creature*)this)->IsPet())
+                            && (((Creature*)this)->GetOwner()->GetTypeId() == TYPEID_PLAYER
+                                && ((Creature*)this)->GetOwner()->IsFriendlyTo(target)
+                                && ((Creature*)this)->GetOwner() != target
+                                && (target->IsInSameGroupWith((Player*)((Creature*)this)->GetOwner()) || target->IsInSameRaidWith((Player*)((Creature*)this)->GetOwner())));
+                        }
+
+                        if(((Unit*)this)->IsSpoofSamePlayerFaction() || forcefriendly || (target->GetTypeId() == TYPEID_PLAYER && GetTypeId() == TYPEID_PLAYER && (target->IsInSameGroupWith((Player*)this) || target->IsInSameRaidWith((Player*)this))))
+                        {
+                            if (index == UNIT_FIELD_BYTES_2)
+                            {
+                                DEBUG_LOG("-- VALUES_UPDATE: Sending '%s' the blue-group-fix from '%s' (flag)", target->GetName(), ((Unit*)this)->GetName());
+                                *data << ( m_uint32Values[ index ] & (UNIT_BYTE2_FLAG_SANCTUARY << 8) ); // this flag is at uint8 offset 1 !!
+                                ch = true;
+                            }
+                            else if (index == UNIT_FIELD_FACTIONTEMPLATE)
+                            {
+                                FactionTemplateEntry const *ft1, *ft2;
+                                ft1 = ((Unit*)this)->getFactionTemplateEntry();
+                                ft2 = ((Unit*)target)->getFactionTemplateEntry();
+
+                                if (ft1 && ft2 && (!ft1->IsFriendlyTo(*ft2) || ((Unit*)this)->IsSpoofSamePlayerFaction()))
+                                {
+                                    uint32 faction = ((Player*)target)->getFaction(); // pretend that all other HOSTILE players have own faction, to allow follow, heal, rezz (trade wont work)
+                                    DEBUG_LOG("-- VALUES_UPDATE: Sending '%s' the blue-group-fix from '%s' (faction %u)", target->GetName(), ((Unit*)this)->GetName(), faction);
+                                    *data << uint32(faction);
+                                    ch = true;
+                                }
+                            }
+                        }
+                    }
+
+                    if(!ch)
+                        *data << m_uint32Values[ index ];
+                }
+                // Frozen Mod
                 else
                 {
                     // send in current format (float as float, uint32 as uint32)
@@ -561,34 +689,30 @@ void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask *
                     // GAMEOBJECT_TYPE_DUNGEON_DIFFICULTY can have lo flag = 2
                     //      most likely related to "can enter map" and then should be 0 if can not enter
 
-                    if (IsActivateToQuest)
+                    switch(((GameObject*)this)->GetGoType())
                     {
-                        switch(((GameObject*)this)->GetGoType())
-                        {
-                            case GAMEOBJECT_TYPE_QUESTGIVER:
-                                // GO also seen with GO_DYNFLAG_LO_SPARKLE explicit, relation/reason unclear (192861)
-                                *data << uint16(GO_DYNFLAG_LO_ACTIVATE);
-                                *data << uint16(-1);
-                                break;
-                            case GAMEOBJECT_TYPE_CHEST:
-                            case GAMEOBJECT_TYPE_GENERIC:
-                            case GAMEOBJECT_TYPE_SPELL_FOCUS:
-                            case GAMEOBJECT_TYPE_GOOBER:
-                                *data << uint16(GO_DYNFLAG_LO_ACTIVATE | GO_DYNFLAG_LO_SPARKLE);
-                                *data << uint16(-1);
-                                break;
-                            default:
-                                // unknown, not happen.
-                                *data << uint16(0);
-                                *data << uint16(-1);
-                                break;
-                        }
-                    }
-                    else
-                    {
-                        // disable quest object
-                        *data << uint16(0);
-                        *data << uint16(-1);
+                        case GAMEOBJECT_TYPE_QUESTGIVER:
+                            // GO also seen with GO_DYNFLAG_LO_SPARKLE explicit, relation/reason unclear (192861)
+                            *data << uint16(IsActivateToQuest ? GO_DYNFLAG_LO_ACTIVATE : GO_DYNFLAG_LO_NONE);
+                            *data << uint16(-1);
+                            break;
+                        case GAMEOBJECT_TYPE_CHEST:
+                        case GAMEOBJECT_TYPE_GENERIC:
+                        case GAMEOBJECT_TYPE_SPELL_FOCUS:
+                        case GAMEOBJECT_TYPE_GOOBER:
+                            *data << uint16(IsActivateToQuest ? (GO_DYNFLAG_LO_ACTIVATE | GO_DYNFLAG_LO_SPARKLE) : GO_DYNFLAG_LO_NONE);
+                            *data << uint16(-1);
+                            break;
+                        case GAMEOBJECT_TYPE_TRANSPORT:
+                        case GAMEOBJECT_TYPE_MO_TRANSPORT:
+                            *data << uint16(((GameObject*)this)->GetGoState() != GO_STATE_ACTIVE ? GO_DYNFLAG_LO_TRANSPORT_STOP : GO_DYNFLAG_LO_NONE);
+                            *data << uint16(-1);
+                            break;
+                        default:
+                            // unknown, not happen.
+                            *data << uint16(GO_DYNFLAG_LO_NONE);
+                            *data << uint16(-1);
+                            break;
                     }
                 }
                 else
@@ -611,18 +735,15 @@ void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask *
 
 void Object::ClearUpdateMask(bool remove)
 {
-    if(m_uint32Values)
+    if (m_uint32Values)
     {
-        for( uint16 index = 0; index < m_valuesCount; ++index )
-        {
-            if(m_uint32Values_mirror[index]!= m_uint32Values[index])
-                m_uint32Values_mirror[index] = m_uint32Values[index];
-        }
+        for (uint16 index = 0; index < m_valuesCount; ++index)
+            m_changedValues[index] = false;
     }
 
-    if(m_objectUpdated)
+    if (m_objectUpdated)
     {
-        if(remove)
+        if (remove)
             RemoveFromClientUpdateList();
         m_objectUpdated = false;
     }
@@ -630,37 +751,42 @@ void Object::ClearUpdateMask(bool remove)
 
 bool Object::LoadValues(const char* data)
 {
-    if(!m_uint32Values) _InitValues();
+    if (!m_uint32Values)
+        _InitValues();
 
-    Tokens tokens = StrSplit(data, " ");
+    Tokens tokens(data, ' ');
 
-    if(tokens.size() != m_valuesCount)
+    if (tokens.size() != m_valuesCount)
         return false;
 
-    Tokens::iterator iter;
-    int index;
-    for (iter = tokens.begin(), index = 0; index < m_valuesCount; ++iter, ++index)
+    for (uint16 index = 0; index < m_valuesCount; ++index)
     {
-        m_uint32Values[index] = atol((*iter).c_str());
+        m_uint32Values[index] = atol(tokens[index]);
     }
 
     return true;
 }
 
-void Object::_SetUpdateBits(UpdateMask *updateMask, Player* /*target*/) const
+void Object::_SetUpdateBits(UpdateMask* updateMask, Player* target) const
 {
-    for( uint16 index = 0; index < m_valuesCount; ++index )
+    UpdateFieldData ufd(this, target);
+
+    for (uint16 index = 0; index < m_valuesCount; ++index)
     {
-        if(m_uint32Values_mirror[index]!= m_uint32Values[index])
+        if (ufd.IsUpdateNeeded(index, m_fieldNotifyFlags) ||
+            (m_changedValues[index] && ufd.IsUpdateFieldVisible(index)))
             updateMask->SetBit(index);
     }
 }
 
-void Object::_SetCreateBits(UpdateMask *updateMask, Player* /*target*/) const
+void Object::_SetCreateBits(UpdateMask* updateMask, Player* target) const
 {
-    for( uint16 index = 0; index < m_valuesCount; ++index )
+    UpdateFieldData ufd(this, target);
+
+    for (uint16 index = 0; index < m_valuesCount; ++index)
     {
-        if(GetUInt32Value(index) != 0)
+        if (ufd.IsUpdateNeeded(index, m_fieldNotifyFlags) ||
+            ((GetUInt32Value(index) != 0) && ufd.IsUpdateFieldVisible(index)))
             updateMask->SetBit(index);
     }
 }
@@ -669,9 +795,10 @@ void Object::SetInt32Value( uint16 index, int32 value )
 {
     MANGOS_ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
 
-    if(m_int32Values[ index ] != value)
+    if (m_int32Values[index] != value)
     {
-        m_int32Values[ index ] = value;
+        m_int32Values[index] = value;
+        m_changedValues[index] = true;
         MarkForClientUpdate();
     }
 }
@@ -680,20 +807,23 @@ void Object::SetUInt32Value( uint16 index, uint32 value )
 {
     MANGOS_ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
 
-    if(m_uint32Values[ index ] != value)
+    if (m_uint32Values[index] != value)
     {
-        m_uint32Values[ index ] = value;
+        m_uint32Values[index] = value;
+        m_changedValues[index] = true;
         MarkForClientUpdate();
     }
 }
 
 void Object::SetUInt64Value( uint16 index, const uint64 &value )
 {
-    MANGOS_ASSERT( index + 1 < m_valuesCount || PrintIndexError( index, true ) );
-    if(*((uint64*)&(m_uint32Values[ index ])) != value)
+    MANGOS_ASSERT(index + 1 < m_valuesCount || PrintIndexError(index, true));
+    if (*((uint64*) & (m_uint32Values[index])) != value)
     {
-        m_uint32Values[ index ] = *((uint32*)&value);
-        m_uint32Values[ index + 1 ] = *(((uint32*)&value) + 1);
+        m_uint32Values[index] = *((uint32*)&value);
+        m_uint32Values[index + 1] = *(((uint32*)&value) + 1);
+        m_changedValues[index] = true;
+        m_changedValues[index + 1] = true;
         MarkForClientUpdate();
     }
 }
@@ -702,9 +832,10 @@ void Object::SetFloatValue( uint16 index, float value )
 {
     MANGOS_ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
 
-    if(m_floatValues[ index ] != value)
+    if (m_floatValues[index] != value)
     {
-        m_floatValues[ index ] = value;
+        m_floatValues[index] = value;
+        m_changedValues[index] = true;
         MarkForClientUpdate();
     }
 }
@@ -713,16 +844,17 @@ void Object::SetByteValue( uint16 index, uint8 offset, uint8 value )
 {
     MANGOS_ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
 
-    if(offset > 4)
+    if (offset > 4)
     {
         sLog.outError("Object::SetByteValue: wrong offset %u", offset);
         return;
     }
 
-    if(uint8(m_uint32Values[ index ] >> (offset * 8)) != value)
+    if (uint8(m_uint32Values[index] >> (offset * 8)) != value)
     {
-        m_uint32Values[ index ] &= ~uint32(uint32(0xFF) << (offset * 8));
-        m_uint32Values[ index ] |= uint32(uint32(value) << (offset * 8));
+        m_uint32Values[index] &= ~uint32(uint32(0xFF) << (offset * 8));
+        m_uint32Values[index] |= uint32(uint32(value) << (offset * 8));
+        m_changedValues[index] = true;
         MarkForClientUpdate();
     }
 }
@@ -731,23 +863,24 @@ void Object::SetUInt16Value( uint16 index, uint8 offset, uint16 value )
 {
     MANGOS_ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
 
-    if(offset > 2)
+    if (offset > 2)
     {
         sLog.outError("Object::SetUInt16Value: wrong offset %u", offset);
         return;
     }
 
-    if(uint16(m_uint32Values[ index ] >> (offset * 16)) != value)
+    if (uint16(m_uint32Values[index] >> (offset * 16)) != value)
     {
-        m_uint32Values[ index ] &= ~uint32(uint32(0xFFFF) << (offset * 16));
-        m_uint32Values[ index ] |= uint32(uint32(value) << (offset * 16));
+        m_uint32Values[index] &= ~uint32(uint32(0xFFFF) << (offset * 16));
+        m_uint32Values[index] |= uint32(uint32(value) << (offset * 16));
+        m_changedValues[index] = true;
         MarkForClientUpdate();
     }
 }
 
 void Object::SetStatFloatValue( uint16 index, float value)
 {
-    if(value < 0)
+    if (value < 0)
         value = 0.0f;
 
     SetFloatValue(index, value);
@@ -755,7 +888,7 @@ void Object::SetStatFloatValue( uint16 index, float value)
 
 void Object::SetStatInt32Value( uint16 index, int32 value)
 {
-    if(value < 0)
+    if (value < 0)
         value = 0;
 
     SetUInt32Value(index, uint32(value));
@@ -765,7 +898,7 @@ void Object::ApplyModUInt32Value(uint16 index, int32 val, bool apply)
 {
     int32 cur = GetUInt32Value(index);
     cur += (apply ? val : -val);
-    if(cur < 0)
+    if (cur < 0)
         cur = 0;
     SetUInt32Value(index, cur);
 }
@@ -788,33 +921,35 @@ void Object::ApplyModPositiveFloatValue(uint16 index, float  val, bool apply)
 {
     float cur = GetFloatValue(index);
     cur += (apply ? val : -val);
-    if(cur < 0)
+    if (cur < 0)
         cur = 0;
     SetFloatValue(index, cur);
 }
 
 void Object::SetFlag( uint16 index, uint32 newFlag )
 {
-    MANGOS_ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
-    uint32 oldval = m_uint32Values[ index ];
+    MANGOS_ASSERT(index < m_valuesCount || PrintIndexError(index, true));
+    uint32 oldval = m_uint32Values[index];
     uint32 newval = oldval | newFlag;
 
-    if(oldval != newval)
+    if (oldval != newval)
     {
-        m_uint32Values[ index ] = newval;
+        m_uint32Values[index] = newval;
+        m_changedValues[index] = true;
         MarkForClientUpdate();
     }
 }
 
 void Object::RemoveFlag( uint16 index, uint32 oldFlag )
 {
-    MANGOS_ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
-    uint32 oldval = m_uint32Values[ index ];
+    MANGOS_ASSERT(index < m_valuesCount || PrintIndexError(index, true));
+    uint32 oldval = m_uint32Values[index];
     uint32 newval = oldval & ~oldFlag;
 
-    if(oldval != newval)
+    if (oldval != newval)
     {
-        m_uint32Values[ index ] = newval;
+        m_uint32Values[index] = newval;
+        m_changedValues[index] = true;
         MarkForClientUpdate();
     }
 }
@@ -823,15 +958,16 @@ void Object::SetByteFlag( uint16 index, uint8 offset, uint8 newFlag )
 {
     MANGOS_ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
 
-    if(offset > 4)
+    if (offset > 4)
     {
         sLog.outError("Object::SetByteFlag: wrong offset %u", offset);
         return;
     }
 
-    if(!(uint8(m_uint32Values[ index ] >> (offset * 8)) & newFlag))
+    if (!(uint8(m_uint32Values[index] >> (offset * 8)) & newFlag))
     {
-        m_uint32Values[ index ] |= uint32(uint32(newFlag) << (offset * 8));
+        m_uint32Values[index] |= uint32(uint32(newFlag) << (offset * 8));
+        m_changedValues[index] = true;
         MarkForClientUpdate();
     }
 }
@@ -840,15 +976,16 @@ void Object::RemoveByteFlag( uint16 index, uint8 offset, uint8 oldFlag )
 {
     MANGOS_ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
 
-    if(offset > 4)
+    if (offset > 4)
     {
         sLog.outError("Object::RemoveByteFlag: wrong offset %u", offset);
         return;
     }
 
-    if(uint8(m_uint32Values[ index ] >> (offset * 8)) & oldFlag)
+    if (uint8(m_uint32Values[index] >> (offset * 8)) & oldFlag)
     {
-        m_uint32Values[ index ] &= ~uint32(uint32(oldFlag) << (offset * 8));
+        m_uint32Values[index] &= ~uint32(uint32(oldFlag) << (offset * 8));
+        m_changedValues[index] = true;
         MarkForClientUpdate();
     }
 }
@@ -860,6 +997,7 @@ void Object::SetShortFlag(uint16 index, bool highpart, uint16 newFlag)
     if (!(uint16(m_uint32Values[index] >> (highpart ? 16 : 0)) & newFlag))
     {
         m_uint32Values[index] |= uint32(uint32(newFlag) << (highpart ? 16 : 0));
+        m_changedValues[index] = true;
         MarkForClientUpdate();
     }
 }
@@ -871,6 +1009,7 @@ void Object::RemoveShortFlag(uint16 index, bool highpart, uint16 oldFlag)
     if (uint16(m_uint32Values[index] >> (highpart ? 16 : 0)) & oldFlag)
     {
         m_uint32Values[index] &= ~uint32(uint32(oldFlag) << (highpart ? 16 : 0));
+        m_changedValues[index] = true;
         MarkForClientUpdate();
     }
 }
@@ -892,18 +1031,14 @@ bool Object::PrintEntryError(char const* descr) const
 }
 
 
-void Object::BuildUpdateDataForPlayer(Player* pl, UpdateDataMapType& update_players)
+void Object::BuildUpdateDataForPlayer(Player* player, UpdateDataMapType& update_players)
 {
-    UpdateDataMapType::iterator iter = update_players.find(pl);
+    if (!player)
+        return;
 
-    if (iter == update_players.end())
-    {
-        std::pair<UpdateDataMapType::iterator, bool> p = update_players.insert( UpdateDataMapType::value_type(pl, UpdateData()) );
-        MANGOS_ASSERT(p.second);
-        iter = p.first;
-    }
+    UpdateData& data = update_players[player->GetObjectGuid()];
 
-    BuildValuesUpdateBlockForPlayer(&iter->second, iter->first);
+    BuildValuesUpdateBlockForPlayer(&data, player);
 }
 
 void Object::AddToClientUpdateList()
@@ -926,7 +1061,7 @@ void Object::BuildUpdateData( UpdateDataMapType& /*update_players */)
 
 void Object::MarkForClientUpdate()
 {
-    if(m_inWorld)
+    if (m_inWorld)
     {
         if(!m_objectUpdated)
         {
@@ -937,48 +1072,102 @@ void Object::MarkForClientUpdate()
 }
 
 WorldObject::WorldObject()
-    : m_isActiveObject(false), m_currMap(NULL), m_mapId(0), m_InstanceId(0), m_phaseMask(PHASEMASK_NORMAL)
+    : loot(this), m_groupLootTimer(0), m_groupLootId(0), m_lootGroupRecipientId(0), m_transportInfo(NULL), movespline(new Movement::MoveSpline()),
+    m_currMap(NULL), m_position(WorldLocation()), m_viewPoint(*this), m_isActiveObject(false), m_LastUpdateTime(WorldTimer::getMSTime())
 {
 }
 
+WorldObject::~WorldObject()
+{
+    delete movespline;
+}
+
 void WorldObject::CleanupsBeforeDelete()
 {
-    RemoveFromWorld();
+    RemoveFromWorld(false);
+    ClearUpdateMask(true);
 }
 
-void WorldObject::_Create( uint32 guidlow, HighGuid guidhigh, uint32 phaseMask )
+void WorldObject::_Create(ObjectGuid guid, uint32 phaseMask)
 {
-    Object::_Create(guidlow, 0, guidhigh);
-    m_phaseMask = phaseMask;
+    Object::_Create(guid);
+    SetPhaseMask(phaseMask, false);
 }
 
-void WorldObject::Relocate(float x, float y, float z, float orientation)
+void WorldObject::AddToWorld()
 {
-    m_position.x = x;
-    m_position.y = y;
-    m_position.z = z;
-    m_position.o = orientation;
+    MANGOS_ASSERT(m_currMap);
+    if (!IsInWorld())
+        Object::AddToWorld();
 
-    if (isType(TYPEMASK_UNIT))
-        ((Unit*)this)->m_movementInfo.ChangePosition(x, y, z, orientation);
+    // Possible inserted object, already exists in object store. Not must cause any problem, but need check.
+    GetMap()->InsertObject(this);
+    GetMap()->AddUpdateObject(GetObjectGuid());
 }
 
-void WorldObject::Relocate(float x, float y, float z)
+void WorldObject::RemoveFromWorld(bool remove)
 {
-    m_position.x = x;
-    m_position.y = y;
-    m_position.z = z;
+    Map* map = GetMap();
+    MANGOS_ASSERT(map);
+
+    if (IsInWorld())
+        Object::RemoveFromWorld(remove);
+
+    map->RemoveUpdateObject(GetObjectGuid());
+
+    if (remove)
+    {
+        ResetMap();
+        map->EraseObject(GetObjectGuid());
+    }
+}
+
+ObjectLockType& WorldObject::GetLock(MapLockType _lockType)
+{
+    return GetMap() ? GetMap()->GetLock(_lockType) : sWorld.GetLock(_lockType);
+}
+
+// Attention! This method cannot must call while relocation to other map!
+void WorldObject::Relocate(Position const& position)
+{
+    bool positionChanged    = !bool(position == m_position);
+    bool orientationChanged = bool(fabs(position.o - m_position.o) > M_NULL_F);
+
+    m_position = position;
 
     if (isType(TYPEMASK_UNIT))
-        ((Unit*)this)->m_movementInfo.ChangePosition(x, y, z, GetOrientation());
+    {
+        if (positionChanged)
+            ((Unit*)this)->m_movementInfo.ChangePosition(m_position);
+        else if (orientationChanged)
+            ((Unit*)this)->m_movementInfo.ChangeOrientation(m_position.o);
+    }
 }
 
 void WorldObject::SetOrientation(float orientation)
 {
-    m_position.o = orientation;
+    Relocate(Position(GetPositionX(), GetPositionY(), GetPositionZ(), orientation, GetPhaseMask()));
+}
 
-    if (isType(TYPEMASK_UNIT))
-        ((Unit*)this)->m_movementInfo.ChangeOrientation(orientation);
+void WorldObject::Relocate(WorldLocation const& location)
+{
+    if (location.HasMap() && GetMapId() != location.GetMapId())
+    {
+        if (sMapMgr.IsValidMAP(location.GetMapId()))
+        {
+            SetLocationMapId(location.GetMapId());
+            if (GetInstanceId() != location.GetInstanceId())
+            {
+                if (!sMapMgr.FindMap(location.GetMapId(),location.GetInstanceId()))
+                    DEBUG_LOG("WorldObject::Relocate %s try relocate to non-existance instance %u (map %u).", GetObjectGuid().GetString().c_str(),location.GetInstanceId(), location.GetMapId());
+                SetLocationInstanceId(location.GetInstanceId());
+            }
+        }
+        else
+            sLog.outError("WorldObject::Relocate %s try relocate to non-existance map %u!", GetObjectGuid().GetString().c_str(), location.GetMapId());
+    }
+
+    Relocate(Position(location));
 }
 
 uint32 WorldObject::GetZoneId() const
@@ -1001,226 +1190,222 @@ InstanceData* WorldObject::GetInstanceData() const
     return GetMap()->GetInstanceData();
 }
 
-                                                            //slow
-float WorldObject::GetDistance(const WorldObject* obj) const
+float WorldObject::GetDistance(WorldObject const* obj) const
 {
-    float dx = GetPositionX() - obj->GetPositionX();
-    float dy = GetPositionY() - obj->GetPositionY();
-    float dz = GetPositionZ() - obj->GetPositionZ();
-    float sizefactor = GetObjectBoundingRadius() + obj->GetObjectBoundingRadius();
-    float dist = sqrt((dx*dx) + (dy*dy) + (dz*dz)) - sizefactor;
-    return ( dist > 0 ? dist : 0);
+    if (!obj)
+        return (MAX_VISIBILITY_DISTANCE + 1.0f);
+
+    float sizefactor = obj->GetObjectBoundingRadius();
+    float dist = GetDistance(obj->GetPosition()) - sizefactor;
+    return (dist > M_NULL_F ? dist : 0.0f);
+}
+
+float WorldObject::GetDistance(WorldLocation const& loc) const
+{
+    float sizefactor = GetObjectBoundingRadius();
+    float dist = GetPosition().GetDistance(loc) - sizefactor;
+    return (dist > M_NULL_F ? dist : 0.0f);
 }
 
 float WorldObject::GetDistance2d(float x, float y) const
 {
-    float dx = GetPositionX() - x;
-    float dy = GetPositionY() - y;
     float sizefactor = GetObjectBoundingRadius();
-    float dist = sqrt((dx*dx) + (dy*dy)) - sizefactor;
-    return ( dist > 0 ? dist : 0);
+    float dist = GetPosition().GetDistance(Location(x, y, GetPositionZ())) - sizefactor;
+    return (dist > M_NULL_F ? dist : 0.0f);
 }
 
 float WorldObject::GetDistance(float x, float y, float z) const
 {
-    float dx = GetPositionX() - x;
-    float dy = GetPositionY() - y;
-    float dz = GetPositionZ() - z;
     float sizefactor = GetObjectBoundingRadius();
-    float dist = sqrt((dx*dx) + (dy*dy) + (dz*dz)) - sizefactor;
-    return ( dist > 0 ? dist : 0);
+    float dist = GetPosition().GetDistance(Location(x, y, z)) - sizefactor;
+    return (dist > M_NULL_F ? dist : 0.0f);
 }
 
-float WorldObject::GetDistance2d(const WorldObject* obj) const
+float WorldObject::GetDistance2d(WorldObject const* obj) const
 {
-    float dx = GetPositionX() - obj->GetPositionX();
-    float dy = GetPositionY() - obj->GetPositionY();
+    if (!obj)
+        return (MAX_VISIBILITY_DISTANCE + 1.0f);
+
     float sizefactor = GetObjectBoundingRadius() + obj->GetObjectBoundingRadius();
-    float dist = sqrt((dx*dx) + (dy*dy)) - sizefactor;
-    return ( dist > 0 ? dist : 0);
+    float dist = GetPosition().GetDistance(Location(obj->GetPositionX(), obj->GetPositionY(), GetPositionZ())) - sizefactor;
+    return (dist > M_NULL_F ? dist : 0.0f);
 }
 
-float WorldObject::GetDistanceZ(const WorldObject* obj) const
+float WorldObject::GetDistanceZ(WorldObject const* obj) const
 {
+    if (!obj)
+        return (MAX_VISIBILITY_DISTANCE + 1.0f);
+
     float dz = fabs(GetPositionZ() - obj->GetPositionZ());
     float sizefactor = GetObjectBoundingRadius() + obj->GetObjectBoundingRadius();
     float dist = dz - sizefactor;
-    return ( dist > 0 ? dist : 0);
+    return (dist > M_NULL_F ? dist : 0.0f);
 }
 
 bool WorldObject::IsWithinDist3d(float x, float y, float z, float dist2compare) const
 {
-    float dx = GetPositionX() - x;
-    float dy = GetPositionY() - y;
-    float dz = GetPositionZ() - z;
-    float distsq = dx*dx + dy*dy + dz*dz;
+    return IsWithinDist3d(Location(x, y, z), dist2compare);
+}
 
+bool WorldObject::IsWithinDist3d(Location const& loc, float dist2compare) const
+{
     float sizefactor = GetObjectBoundingRadius();
+    float dist = GetPosition().GetDistance(loc);
     float maxdist = dist2compare + sizefactor;
 
-    return distsq < maxdist * maxdist;
+    return dist < maxdist;
 }
 
 bool WorldObject::IsWithinDist2d(float x, float y, float dist2compare) const
 {
-    float dx = GetPositionX() - x;
-    float dy = GetPositionY() - y;
-    float distsq = dx*dx + dy*dy;
-
+    float dist = GetPosition().GetDistance(Location(x, y, GetPositionZ()));
     float sizefactor = GetObjectBoundingRadius();
     float maxdist = dist2compare + sizefactor;
 
-    return distsq < maxdist * maxdist;
+    return dist < maxdist;
 }
 
 bool WorldObject::_IsWithinDist(WorldObject const* obj, float dist2compare, bool is3D) const
 {
-    float dx = GetPositionX() - obj->GetPositionX();
-    float dy = GetPositionY() - obj->GetPositionY();
-    float distsq = dx*dx + dy*dy;
-    if(is3D)
-    {
-        float dz = GetPositionZ() - obj->GetPositionZ();
-        distsq += dz*dz;
-    }
+
+    float dist = is3D ?
+        GetPosition().GetDistance(obj->GetPosition()) :
+        GetPosition().GetDistance(Location(obj->GetPositionX(), obj->GetPositionY(), GetPositionZ()));
+
     float sizefactor = GetObjectBoundingRadius() + obj->GetObjectBoundingRadius();
     float maxdist = dist2compare + sizefactor;
 
-    return distsq < maxdist * maxdist;
+    return dist < maxdist;
 }
 
-bool WorldObject::IsWithinLOSInMap(const WorldObject* obj) const
+bool WorldObject::IsWithinLOSInMap(WorldObject const* obj) const
 {
-    if (!IsInMap(obj)) return false;
+    if (!IsInMap(obj))
+        return false;
+
     float ox,oy,oz;
     obj->GetPosition(ox,oy,oz);
-    return(IsWithinLOS(ox, oy, oz ));
+    return IsWithinLOS(ox, oy, oz);
 }
 
 bool WorldObject::IsWithinLOS(float ox, float oy, float oz) const
 {
     float x,y,z;
     GetPosition(x,y,z);
-    VMAP::IVMapManager *vMapManager = VMAP::VMapFactory::createOrGetVMapManager();
-    return vMapManager->isInLineOfSight(GetMapId(), x, y, z+2.0f, ox, oy, oz+2.0f);
+    return GetMap()->IsInLineOfSight(x, y, z + 2.0f, ox, oy, oz + 2.0f, GetPhaseMask());
 }
 
 bool WorldObject::GetDistanceOrder(WorldObject const* obj1, WorldObject const* obj2, bool is3D /* = true */) const
 {
-    float dx1 = GetPositionX() - obj1->GetPositionX();
-    float dy1 = GetPositionY() - obj1->GetPositionY();
-    float distsq1 = dx1*dx1 + dy1*dy1;
-    if(is3D)
-    {
-        float dz1 = GetPositionZ() - obj1->GetPositionZ();
-        distsq1 += dz1*dz1;
-    }
+    float dist1 = is3D ?
+        GetPosition().GetDistance(obj1->GetPosition()) :
+        GetPosition().GetDistance(Location(obj1->GetPositionX(), obj1->GetPositionY(), GetPositionZ()));
 
-    float dx2 = GetPositionX() - obj2->GetPositionX();
-    float dy2 = GetPositionY() - obj2->GetPositionY();
-    float distsq2 = dx2*dx2 + dy2*dy2;
-    if(is3D)
-    {
-        float dz2 = GetPositionZ() - obj2->GetPositionZ();
-        distsq2 += dz2*dz2;
-    }
+    float dist2 = is3D ?
+        GetPosition().GetDistance(obj2->GetPosition()) :
+        GetPosition().GetDistance(Location(obj2->GetPositionX(), obj2->GetPositionY(), GetPositionZ()));
 
-    return distsq1 < distsq2;
+    return dist1 < dist2;
 }
 
 bool WorldObject::IsInRange(WorldObject const* obj, float minRange, float maxRange, bool is3D /* = true */) const
 {
-    float dx = GetPositionX() - obj->GetPositionX();
-    float dy = GetPositionY() - obj->GetPositionY();
-    float distsq = dx*dx + dy*dy;
-    if(is3D)
-    {
-        float dz = GetPositionZ() - obj->GetPositionZ();
-        distsq += dz*dz;
-    }
+    float dist = is3D ?
+        GetPosition().GetDistance(obj->GetPosition()) :
+        GetPosition().GetDistance(Location(obj->GetPositionX(), obj->GetPositionY(), GetPositionZ()));
 
     float sizefactor = GetObjectBoundingRadius() + obj->GetObjectBoundingRadius();
 
     // check only for real range
-    if(minRange > 0.0f)
+    if (minRange > M_NULL_F)
     {
         float mindist = minRange + sizefactor;
-        if(distsq < mindist * mindist)
+        if (dist < mindist)
             return false;
     }
 
     float maxdist = maxRange + sizefactor;
-    return distsq < maxdist * maxdist;
+    return dist < maxdist;
 }
 
 bool WorldObject::IsInRange2d(float x, float y, float minRange, float maxRange) const
 {
-    float dx = GetPositionX() - x;
-    float dy = GetPositionY() - y;
-    float distsq = dx*dx + dy*dy;
+    float dist = GetPosition().GetDistance(Location(x, y, GetPositionZ()));
 
     float sizefactor = GetObjectBoundingRadius();
 
     // check only for real range
-    if(minRange > 0.0f)
+    if (minRange > M_NULL_F)
     {
         float mindist = minRange + sizefactor;
-        if(distsq < mindist * mindist)
+        if (dist < mindist)
             return false;
     }
 
     float maxdist = maxRange + sizefactor;
-    return distsq < maxdist * maxdist;
+    return dist < maxdist;
 }
 
 bool WorldObject::IsInRange3d(float x, float y, float z, float minRange, float maxRange) const
 {
-    float dx = GetPositionX() - x;
-    float dy = GetPositionY() - y;
-    float dz = GetPositionZ() - z;
-    float distsq = dx*dx + dy*dy + dz*dz;
 
+    float dist = GetPosition().GetDistance(Location(x, y, z));
     float sizefactor = GetObjectBoundingRadius();
 
     // check only for real range
-    if(minRange > 0.0f)
+    if (minRange > M_NULL_F)
     {
         float mindist = minRange + sizefactor;
-        if(distsq < mindist * mindist)
+        if (dist < mindist)
             return false;
     }
 
     float maxdist = maxRange + sizefactor;
-    return distsq < maxdist * maxdist;
+    return dist < maxdist;
 }
 
-float WorldObject::GetAngle(const WorldObject* obj) const
+bool WorldObject::IsInBetween(WorldObject const* obj1, WorldObject const* obj2, float size) const
+{
+    if (GetPositionX() > std::max(obj1->GetPositionX(), obj2->GetPositionX())
+        || GetPositionX() < std::min(obj1->GetPositionX(), obj2->GetPositionX())
+        || GetPositionY() > std::max(obj1->GetPositionY(), obj2->GetPositionY())
+        || GetPositionY() < std::min(obj1->GetPositionY(), obj2->GetPositionY()))
+        return false;
+
+    if (!size)
+        size = GetObjectBoundingRadius() / 2;
+
+    float angle = obj1->GetAngle(this) - obj1->GetAngle(obj2);
+    return fabs(sin(angle)) * GetExactDist2d(obj1->GetPositionX(), obj1->GetPositionY()) < size;
+}
+
+float WorldObject::GetAngle(WorldObject const* obj) const
 {
     if (!obj)
         return 0.0f;
 
     // Rework the assert, when more cases where such a call can happen have been fixed
-    //MANGOS_ASSERT(obj != this || PrintEntryError("GetAngle (for self)"));
+    // MANGOS_ASSERT(obj != this || PrintEntryError("GetAngle (for self)"));
     if (obj == this)
     {
-        sLog.outError("INVALID CALL for GetAngle for %s", obj->GetGuidStr().c_str());
+        sLog.outError("WorldObject::GetAngle INVALID CALL for GetAngle for %s", obj->GetGuidStr().c_str());
         return 0.0f;
     }
     return GetAngle(obj->GetPositionX(), obj->GetPositionY());
 }
 
 // Return angle in range 0..2*pi
-float WorldObject::GetAngle(const float x, const float y) const
+float WorldObject::GetAngle(float const x, float const y) const
 {
     float dx = x - GetPositionX();
     float dy = y - GetPositionY();
 
     float ang = atan2(dy, dx);                              // returns value between -Pi..Pi
-    ang = (ang >= 0) ? ang : 2 * M_PI_F + ang;
-    return ang;
+    ang = (ang >= 0.0f) ? ang : 2 * M_PI_F + ang;
+    return MapManager::NormalizeOrientation(ang);
 }
 
-bool WorldObject::HasInArc(const float arcangle, const WorldObject* obj) const
+bool WorldObject::HasInArc(float const arcangle, WorldObject const* obj) const
 {
     // always have self in arc
     if (obj == this)
@@ -1237,11 +1422,11 @@ bool WorldObject::HasInArc(const float arcangle, const WorldObject* obj) const
     // move angle to range -pi ... +pi
     angle = MapManager::NormalizeOrientation(angle);
     if (angle > M_PI_F)
-        angle -= 2.0f*M_PI_F;
+        angle -= 2.0f * M_PI_F;
 
-    float lborder =  -1 * (arc/2.0f);                       // in range -pi..0
-    float rborder = (arc/2.0f);                             // in range 0..pi
-    return (( angle >= lborder ) && ( angle <= rborder ));
+    float lborder =  -1.0f * (arc / 2.0f);                    // in range -pi..0
+    float rborder = (arc / 2.0f);                             // in range 0..pi
+    return ((angle >= lborder) && (angle <= rborder));
 }
 
 bool WorldObject::isInFrontInMap(WorldObject const* target, float distance,  float arc) const
@@ -1266,7 +1451,7 @@ bool WorldObject::isInBack(WorldObject const* target, float distance, float arc)
 
 void WorldObject::GetRandomPoint( float x, float y, float z, float distance, float &rand_x, float &rand_y, float &rand_z) const
 {
-    if(distance == 0)
+    if (fabs(distance) < M_NULL_F)
     {
         rand_x = x;
         rand_y = y;
@@ -1275,7 +1460,7 @@ void WorldObject::GetRandomPoint( float x, float y, float z, float distance, flo
     }
 
     // angle to face `obj` to `this`
-    float angle = rand_norm_f()*2*M_PI_F;
+    float angle = rand_norm_f() * 2.0f * M_PI_F;
     float new_dist = rand_norm_f()*distance;
 
     rand_x = x + new_dist * cos(angle);
@@ -1289,9 +1474,9 @@ void WorldObject::GetRandomPoint( float x, float y, float z, float distance, flo
 
 void WorldObject::UpdateGroundPositionZ(float x, float y, float &z) const
 {
-    float new_z = GetTerrain()->GetHeight(x,y,z,true);
-    if(new_z > INVALID_HEIGHT)
-        z = new_z+ 0.05f;                                   // just to be sure that we are not a few pixel under the surface
+    float new_z = GetMap()->GetHeight(GetPhaseMask(), x, y, z);
+    if (new_z > INVALID_HEIGHT)
+        z = new_z + 0.05f;                                   // just to be sure that we are not a few pixel under the surface
 }
 
 void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const
@@ -1300,15 +1485,27 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const
     {
         case TYPEID_UNIT:
         {
+            if (Unit* pVictim = ((Creature const*)this)->getVictim())
+            {
+                // anyway creature move to victim for thinly Z distance (shun some VMAP wrong ground calculating)
+                if (fabs(GetPositionZ() - pVictim->GetPositionZ()) < 5.0f)
+                    return;
+            }
+
+            if (((Creature const*)this)->IsLevitating())
+            {
+                float ground_z = GetMap()->GetHeight(GetPhaseMask(), x, y, z);
+                z  = ground_z + ((Creature const*)this)->GetFloatValue(UNIT_FIELD_HOVERHEIGHT) + GetObjectBoundingRadius() * GetObjectScale();
+            }
             // non fly unit don't must be in air
             // non swim unit must be at ground (mostly speedup, because it don't must be in water and water level check less fast
-            if (!((Creature const*)this)->CanFly())
+            else if (!((Creature*)this)->CanFly())
             {
-                bool canSwim = ((Creature const*)this)->CanSwim();
+                bool canSwim = ((Creature*)this)->CanSwim();
                 float ground_z = z;
                 float max_z = canSwim
                     ? GetTerrain()->GetWaterOrGroundLevel(x, y, z, &ground_z, !((Unit const*)this)->HasAuraType(SPELL_AURA_WATER_WALK))
-                    : ((ground_z = GetTerrain()->GetHeight(x, y, z, true)));
+                    : ((ground_z = GetMap()->GetHeight(GetPhaseMask(), x, y, z)));
                 if (max_z > INVALID_HEIGHT)
                 {
                     if (z > max_z)
@@ -1319,7 +1516,7 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const
             }
             else
             {
-                float ground_z = GetTerrain()->GetHeight(x, y, z, true);
+                float ground_z = GetMap()->GetHeight(GetPhaseMask(), x, y, z);
                 if (z < ground_z)
                     z = ground_z;
             }
@@ -1327,14 +1524,14 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const
         }
         case TYPEID_PLAYER:
         {
-            // for server controlled moves playr work same as creature (but it can always swim)
+            // for server controlled moves player work same as creature (but it can always swim)
             if (!((Player const*)this)->CanFly())
             {
                 float ground_z = z;
                 float max_z = GetTerrain()->GetWaterOrGroundLevel(x, y, z, &ground_z, !((Unit const*)this)->HasAuraType(SPELL_AURA_WATER_WALK));
                 if (max_z > INVALID_HEIGHT)
                 {
-                    if (z > max_z)
+                    if (max_z != ground_z && z > max_z)
                         z = max_z;
                     else if (z < ground_z)
                         z = ground_z;
@@ -1342,7 +1539,7 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const
             }
             else
             {
-                float ground_z = GetTerrain()->GetHeight(x, y, z, true);
+                float ground_z = GetMap()->GetHeight(GetPhaseMask(), x, y, z);
                 if (z < ground_z)
                     z = ground_z;
             }
@@ -1350,8 +1547,8 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const
         }
         default:
         {
-            float ground_z = GetTerrain()->GetHeight(x, y, z, true);
-            if(ground_z > INVALID_HEIGHT)
+            float ground_z = GetMap()->GetHeight(GetPhaseMask(), x, y, z);
+            if (ground_z > INVALID_HEIGHT)
                 z = ground_z;
             break;
         }
@@ -1363,36 +1560,38 @@ bool WorldObject::IsPositionValid() const
     return MaNGOS::IsValidMapCoord(m_position.x,m_position.y,m_position.z,m_position.o);
 }
 
-void WorldObject::MonsterSay(const char* text, uint32 language, Unit* target)
+void WorldObject::MonsterSay(const char* text, uint32 language, Unit const* target) const
 {
-    WorldPacket data(SMSG_MESSAGECHAT, 200);
-    BuildMonsterChat(&data, GetObjectGuid(), CHAT_MSG_MONSTER_SAY, text, language, GetName(), target ? target->GetObjectGuid() : ObjectGuid(), target ? target->GetName() : "");
-    SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_SAY),true);
+    WorldPacket data;
+    ChatHandler::BuildChatPacket(data, CHAT_MSG_MONSTER_SAY, text, LANG_UNIVERSAL, CHAT_TAG_NONE, GetObjectGuid(), GetName(),
+        target ? target->GetObjectGuid() : ObjectGuid(),target ? target->GetName() : "");
+    SendMessageToSetInRange(&data, sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_SAY), true);
 }
 
-void WorldObject::MonsterYell(const char* text, uint32 language, Unit* target)
+void WorldObject::MonsterYell(const char* text, uint32 language, Unit const* target) const
 {
-    WorldPacket data(SMSG_MESSAGECHAT, 200);
-    BuildMonsterChat(&data, GetObjectGuid(), CHAT_MSG_MONSTER_YELL, text, language, GetName(), target ? target->GetObjectGuid() : ObjectGuid(), target ? target->GetName() : "");
-    SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_YELL),true);
+    WorldPacket data;
+    ChatHandler::BuildChatPacket(data, CHAT_MSG_MONSTER_YELL, text, LANG_UNIVERSAL, CHAT_TAG_NONE, GetObjectGuid(), GetName(),
+        target ? target->GetObjectGuid() : ObjectGuid(),target ? target->GetName() : "");
+    SendMessageToSetInRange(&data, sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_YELL), true);
 }
 
-void WorldObject::MonsterTextEmote(const char* text, Unit* target, bool IsBossEmote)
+void WorldObject::MonsterTextEmote(const char* text, Unit const* target, bool IsBossEmote) const
 {
-    WorldPacket data(SMSG_MESSAGECHAT, 200);
-    BuildMonsterChat(&data, GetObjectGuid(), IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE, text, LANG_UNIVERSAL,
-        GetName(), target ? target->GetObjectGuid() : ObjectGuid(), target ? target->GetName() : "");
+    WorldPacket data;
+    ChatHandler::BuildChatPacket(data, IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE, text, LANG_UNIVERSAL, CHAT_TAG_NONE, GetObjectGuid(), GetName(),
+        target ? target->GetObjectGuid() : ObjectGuid(),target ? target->GetName() : "");
     SendMessageToSetInRange(&data, sWorld.getConfig(IsBossEmote ? CONFIG_FLOAT_LISTEN_RANGE_YELL : CONFIG_FLOAT_LISTEN_RANGE_TEXTEMOTE), true);
 }
 
-void WorldObject::MonsterWhisper(const char* text, Unit* target, bool IsBossWhisper)
+void WorldObject::MonsterWhisper(const char* text, Unit const* target, bool IsBossWhisper) const
 {
     if (!target || target->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    WorldPacket data(SMSG_MESSAGECHAT, 200);
-    BuildMonsterChat(&data, GetObjectGuid(), IsBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER, text, LANG_UNIVERSAL,
-        GetName(), target->GetObjectGuid(), target->GetName());
+    WorldPacket data;
+    ChatHandler::BuildChatPacket(data, IsBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER, text, LANG_UNIVERSAL, CHAT_TAG_NONE, GetObjectGuid(), GetName(),
+        target->GetObjectGuid(), target->GetName());
     ((Player*)target)->GetSession()->SendPacket(&data);
 }
 
@@ -1401,120 +1600,110 @@ namespace MaNGOS
     class MonsterChatBuilder
     {
         public:
-            MonsterChatBuilder(WorldObject const& obj, ChatMsg msgtype, int32 textId, uint32 language, Unit* target)
-                : i_object(obj), i_msgtype(msgtype), i_textId(textId), i_language(language), i_target(target) {}
+            MonsterChatBuilder(WorldObject const& obj, ChatMsg msgtype, MangosStringLocale const* textData, Language language, Unit const* target)
+                : i_object(obj), i_msgtype(msgtype), i_textData(textData), i_language(language), i_target(target) {}
             void operator()(WorldPacket& data, int32 loc_idx)
             {
-                char const* text = sObjectMgr.GetMangosString(i_textId,loc_idx);
+                char const* text = NULL;
+                if ((int32)i_textData->Content.size() > loc_idx + 1 && !i_textData->Content[loc_idx + 1].empty())
+                    text = i_textData->Content[loc_idx + 1].c_str();
+                else
+                    text = i_textData->Content[0].c_str();
 
-                WorldObject::BuildMonsterChat(&data, i_object.GetObjectGuid(), i_msgtype, text, i_language, i_object.GetNameForLocaleIdx(loc_idx), i_target ? i_target->GetObjectGuid() : ObjectGuid(), i_target ? i_target->GetNameForLocaleIdx(loc_idx) : "");
+                ChatHandler::BuildChatPacket(data, i_msgtype, text, i_language, CHAT_TAG_NONE, i_object.GetObjectGuid(), i_object.GetNameForLocaleIdx(loc_idx),
+                    i_target ? i_target->GetObjectGuid() : ObjectGuid(), i_target ? i_target->GetNameForLocaleIdx(loc_idx) : "");
             }
 
         private:
             WorldObject const& i_object;
             ChatMsg i_msgtype;
-            int32 i_textId;
-            uint32 i_language;
-            Unit* i_target;
+            MangosStringLocale const* i_textData;
+            Language i_language;
+            Unit const* i_target;
     };
 }                                                           // namespace MaNGOS
 
-void WorldObject::MonsterSay(int32 textId, uint32 language, Unit* target)
+/// Helper function to create localized around a source
+void _DoLocalizedTextAround(WorldObject const* source, MangosStringLocale const* textData, ChatMsg msgtype, Language language, Unit const* target, float range)
 {
-    float range = sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_SAY);
-    MaNGOS::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_SAY, textId, language, target);
+    MaNGOS::MonsterChatBuilder say_build(*source, msgtype, textData, language, target);
     MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> say_do(say_build);
-    MaNGOS::CameraDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> > say_worker(this, range, say_do);
-    Cell::VisitWorldObjects(this, say_worker, range);
+    MaNGOS::CameraDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> > say_worker(source, range, say_do);
+    Cell::VisitWorldObjects(source, say_worker, range);
 }
 
-void WorldObject::MonsterYell(int32 textId, uint32 language, Unit* target)
+/// Function that sends a text associated to a MangosString
+void WorldObject::MonsterText(MangosStringLocale const* textData, Unit const* target) const
 {
-    float range = sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_YELL);
-    MaNGOS::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_YELL, textId, language, target);
-    MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> say_do(say_build);
-    MaNGOS::CameraDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> > say_worker(this,range,say_do);
-    Cell::VisitWorldObjects(this, say_worker, range);
-}
-
-void WorldObject::MonsterYellToZone(int32 textId, uint32 language, Unit* target)
-{
-    MaNGOS::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_YELL, textId, language, target);
-    MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> say_do(say_build);
-
-    uint32 zoneid = GetZoneId();
-
-    Map::PlayerList const& pList = GetMap()->GetPlayers();
-    for(Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
-        if(itr->getSource()->GetZoneId()==zoneid)
-            say_do(itr->getSource());
-}
-
-void WorldObject::MonsterTextEmote(int32 textId, Unit* target, bool IsBossEmote)
-{
-    float range = sWorld.getConfig(IsBossEmote ? CONFIG_FLOAT_LISTEN_RANGE_YELL : CONFIG_FLOAT_LISTEN_RANGE_TEXTEMOTE);
+    MANGOS_ASSERT(textData);
 
-    MaNGOS::MonsterChatBuilder say_build(*this, IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE, textId, LANG_UNIVERSAL, target);
-    MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> say_do(say_build);
-    MaNGOS::CameraDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> > say_worker(this,range,say_do);
-    Cell::VisitWorldObjects(this, say_worker, range);
-}
-
-void WorldObject::MonsterWhisper(int32 textId, Unit* target, bool IsBossWhisper)
-{
-    if (!target || target->GetTypeId() != TYPEID_PLAYER)
-        return;
-
-    uint32 loc_idx = ((Player*)target)->GetSession()->GetSessionDbLocaleIndex();
-    char const* text = sObjectMgr.GetMangosString(textId, loc_idx);
-
-    WorldPacket data(SMSG_MESSAGECHAT, 200);
-    BuildMonsterChat(&data, GetObjectGuid(), IsBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER, text, LANG_UNIVERSAL,
-        GetNameForLocaleIdx(loc_idx), target->GetObjectGuid(), "");
-
-    ((Player*)target)->GetSession()->SendPacket(&data);
-}
-
-void WorldObject::BuildMonsterChat(WorldPacket *data, ObjectGuid senderGuid, uint8 msgtype, char const* text, uint32 language, char const* name, ObjectGuid targetGuid, char const* targetName)
-{
-    *data << uint8(msgtype);
-    *data << uint32(language);
-    *data << ObjectGuid(senderGuid);
-    *data << uint32(0);                                     // 2.1.0
-    *data << uint32(strlen(name)+1);
-    *data << name;
-    *data << ObjectGuid(targetGuid);                        // Unit Target
-    if (targetGuid && !targetGuid.IsPlayer())
+    switch (textData->Type)
     {
-        *data << uint32(strlen(targetName)+1);              // target name length
-        *data << targetName;                                // target name
+        case CHAT_TYPE_SAY:
+            _DoLocalizedTextAround(this, textData, CHAT_MSG_MONSTER_SAY, textData->LanguageId, target, sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_SAY));
+            break;
+        case CHAT_TYPE_YELL:
+            _DoLocalizedTextAround(this, textData, CHAT_MSG_MONSTER_YELL, textData->LanguageId, target, sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_YELL));
+            break;
+        case CHAT_TYPE_TEXT_EMOTE:
+            _DoLocalizedTextAround(this, textData, CHAT_MSG_MONSTER_EMOTE, LANG_UNIVERSAL, target, sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_TEXTEMOTE));
+            break;
+        case CHAT_TYPE_BOSS_EMOTE:
+            _DoLocalizedTextAround(this, textData, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, target, sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_YELL));
+            break;
+        case CHAT_TYPE_WHISPER:
+        {
+            if (!target || target->GetTypeId() != TYPEID_PLAYER)
+                return;
+            MaNGOS::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_WHISPER, textData, LANG_UNIVERSAL, target);
+            MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> say_do(say_build);
+            say_do((Player*)target);
+            break;
+        }
+        case CHAT_TYPE_BOSS_WHISPER:
+        {
+            if (!target || target->GetTypeId() != TYPEID_PLAYER)
+                return;
+            MaNGOS::MonsterChatBuilder say_build(*this, CHAT_MSG_RAID_BOSS_WHISPER, textData, LANG_UNIVERSAL, target);
+            MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> say_do(say_build);
+            say_do((Player*)target);
+            break;
+        }
+        case CHAT_TYPE_ZONE_YELL:
+        {
+            MaNGOS::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_YELL, textData, textData->LanguageId, target);
+            MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> say_do(say_build);
+            uint32 zoneid = GetZoneId();
+            Map::PlayerList const& pList = GetMap()->GetPlayers();
+            for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
+                if (itr->getSource()->GetZoneId() == zoneid)
+                    say_do(itr->getSource());
+            break;
+        }
     }
-    *data << uint32(strlen(text)+1);
-    *data << text;
-    *data << uint8(0);                                      // ChatTag
 }
 
-void WorldObject::SendMessageToSet(WorldPacket *data, bool /*bToSelf*/)
+void WorldObject::SendMessageToSet(WorldPacket* data, bool /*bToSelf*/) const
 {
     //if object is in world, map for it already created!
     if (IsInWorld())
         GetMap()->MessageBroadcast(this, data);
 }
 
-void WorldObject::SendMessageToSetInRange(WorldPacket *data, float dist, bool /*bToSelf*/)
+void WorldObject::SendMessageToSetInRange(WorldPacket* data, float dist, bool /*bToSelf*/) const
 {
     //if object is in world, map for it already created!
     if (IsInWorld())
         GetMap()->MessageDistBroadcast(this, data, dist);
 }
 
-void WorldObject::SendMessageToSetExcept(WorldPacket *data, Player const* skipped_receiver)
+void WorldObject::SendMessageToSetExcept(WorldPacket* data, Player const* skipped_receiver) const
 {
     //if object is in world, map for it already created!
     if (IsInWorld())
     {
         MaNGOS::MessageDelivererExcept notifier(this, data, skipped_receiver);
-        Cell::VisitWorldObjects(this, notifier, GetMap()->GetVisibilityDistance());
+        Cell::VisitWorldObjects(this, notifier, GetMap()->GetVisibilityDistance(this));
     }
 }
 
@@ -1533,16 +1722,16 @@ void WorldObject::SendGameObjectCustomAnim(ObjectGuid guid, uint32 animId /*= 0*
     SendMessageToSet(&data, true);
 }
 
-void WorldObject::SetMap(Map * map)
+void WorldObject::SetMap(Map* map)
 {
     MANGOS_ASSERT(map);
     m_currMap = map;
     //lets save current map's Id/instanceId
-    m_mapId = map->GetId();
-    m_InstanceId = map->GetInstanceId();
+    m_position.SetMapId(map->GetId());
+    m_position.SetInstanceId(map->GetInstanceId());
 }
 
-TerrainInfo const* WorldObject::GetTerrain() const
+TerrainInfoPtr WorldObject::GetTerrain() const
 {
     MANGOS_ASSERT(m_currMap);
     return m_currMap->GetTerrain();
@@ -1553,6 +1742,11 @@ void WorldObject::AddObjectToRemoveList()
     GetMap()->AddObjectToRemoveList(this);
 }
 
+void WorldObject::RemoveObjectFromRemoveList()
+{
+    GetMap()->RemoveObjectFromRemoveList(this);
+}
+
 Creature* WorldObject::SummonCreature(uint32 id, float x, float y, float z, float ang,TempSummonType spwtype,uint32 despwtime, bool asActiveObject)
 {
     CreatureInfo const *cinfo = ObjectMgr::GetCreatureTemplate(id);
@@ -1570,7 +1764,7 @@ Creature* WorldObject::SummonCreature(uint32 id, float x, float y, float z, floa
 
     CreatureCreatePos pos(GetMap(), x, y, z, ang, GetPhaseMask());
 
-    if (x == 0.0f && y == 0.0f && z == 0.0f)
+    if (fabs(x) < M_NULL_F && fabs(y) < M_NULL_F && fabs(z) < M_NULL_F)
         pos = CreatureCreatePos(this, GetOrientation(), CONTACT_DISTANCE, ang);
 
     if (!pCreature->Create(GetMap()->GenerateLocalLowGuid(cinfo->GetHighGuid()), pos, cinfo, team))
@@ -1584,15 +1778,45 @@ Creature* WorldObject::SummonCreature(uint32 id, float x, float y, float z, floa
     // Active state set before added to map
     pCreature->SetActiveObjectState(asActiveObject);
 
-    pCreature->Summon(spwtype, despwtime);
+    pCreature->Summon(spwtype, despwtime);                  // Also initializes the AI and MMGen
 
-    if(GetTypeId()==TYPEID_UNIT && ((Creature*)this)->AI())
+    if (GetTypeId()==TYPEID_UNIT && ((Creature*)this)->AI())
         ((Creature*)this)->AI()->JustSummoned(pCreature);
 
+    // Creature Linking, Initial load is handled like respawn
+    if (pCreature->IsLinkingEventTrigger())
+        GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_RESPAWN, pCreature);
+
     // return the creature therewith the summoner has access to it
     return pCreature;
 }
 
+GameObject* WorldObject::SummonGameobject(uint32 id, float x, float y, float z, float angle, uint32 despwtime)
+{
+    GameObject* pGameObj = new GameObject;
+
+    Map *map = GetMap();
+
+    if (!map)
+        return NULL;
+
+    if(!pGameObj->Create(map->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), id, map,
+        GetPhaseMask(), x, y, z, angle))
+    {
+        delete pGameObj;
+        return NULL;
+    }
+
+    pGameObj->SetRespawnTime(despwtime/IN_MILLISECONDS);
+
+    map->Add(pGameObj);
+
+    return pGameObj;
+}
+
+// how much space should be left in front of/ behind a mob that already uses a space
+#define OCCUPY_POS_DEPTH_FACTOR                          1.8f
+
 namespace MaNGOS
 {
     class NearUsedPosDo
@@ -1639,16 +1863,19 @@ namespace MaNGOS
             // we must add used pos that can fill places around center
             void add(WorldObject* u, float x, float y) const
             {
-                // dist include size of u and i_object
                 float dx = i_object.GetPositionX() - x;
                 float dy = i_object.GetPositionY() - y;
                 float dist2d = sqrt((dx * dx) + (dy * dy));
 
-                float delta = i_selector.m_searcherSize + u->GetObjectBoundingRadius();
+                // It is ok for the objects to require a bit more space
+                float delta = u->GetObjectBoundingRadius();
+                if (i_selector.m_searchPosFor && i_selector.m_searchPosFor != u)
+                    delta += i_selector.m_searchPosFor->GetObjectBoundingRadius();
 
-                // u is too nearest/far away to i_object
-                if (dist2d < i_selector.m_searcherDist - delta ||
-                    dist2d >= i_selector.m_searcherDist + delta)
+                delta *= OCCUPY_POS_DEPTH_FACTOR;           // Increase by factor
+
+                // u is too near/far away from i_object. Do not consider it to occupy space
+                if (fabs(i_selector.m_searcherDist - dist2d) > delta)
                     return;
 
                 float angle = i_object.GetAngle(u) - i_absAngle;
@@ -1659,7 +1886,7 @@ namespace MaNGOS
                 else if (angle < -M_PI_F)
                     angle += 2.0f * M_PI_F;
 
-                i_selector.AddUsedArea(u->GetObjectBoundingRadius(), angle, dist2d);
+                i_selector.AddUsedArea(u, angle, dist2d);
             }
         private:
             WorldObject const& i_object;
@@ -1673,8 +1900,8 @@ namespace MaNGOS
 
 void WorldObject::GetNearPoint2D(float &x, float &y, float distance2d, float absAngle ) const
 {
-    x = GetPositionX() + (GetObjectBoundingRadius() + distance2d) * cos(absAngle);
-    y = GetPositionY() + (GetObjectBoundingRadius() + distance2d) * sin(absAngle);
+    x = GetPositionX() + distance2d * cos(absAngle);
+    y = GetPositionY() + distance2d * sin(absAngle);
 
     MaNGOS::NormalizeMapCoord(x);
     MaNGOS::NormalizeMapCoord(y);
@@ -1682,7 +1909,7 @@ void WorldObject::GetNearPoint2D(float &x, float &y, float distance2d, float abs
 
 void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float searcher_bounding_radius, float distance2d, float absAngle) const
 {
-    GetNearPoint2D(x, y, distance2d + searcher_bounding_radius, absAngle);
+    GetNearPoint2D(x, y, distance2d, absAngle);
     const float init_z = z = GetPositionZ();
 
     // if detection disabled, return first point
@@ -1703,14 +1930,14 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
     const float dist = distance2d + searcher_bounding_radius + GetObjectBoundingRadius();
 
     // prepare selector for work
-    ObjectPosSelector selector(GetPositionX(), GetPositionY(), dist, searcher_bounding_radius);
+    ObjectPosSelector selector(GetPositionX(), GetPositionY(), distance2d, searcher_bounding_radius, searcher);
 
     // adding used positions around object
     {
         MaNGOS::NearUsedPosDo u_do(*this, searcher, absAngle, selector);
         MaNGOS::WorldObjectWorker<MaNGOS::NearUsedPosDo> worker(this, u_do);
 
-        Cell::VisitAllObjects(this, worker, distance2d + searcher_bounding_radius);
+        Cell::VisitAllObjects(this, worker, dist);
     }
 
     // maybe can just place in primary position
@@ -1735,7 +1962,7 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
     // select in positions after current nodes (selection one by one)
     while (selector.NextAngle(angle))                        // angle for free pos
     {
-        GetNearPoint2D(x, y, distance2d + searcher_bounding_radius, absAngle + angle);
+        GetNearPoint2D(x, y, distance2d, absAngle + angle);
         z = GetPositionZ();
 
         if (searcher)
@@ -1767,7 +1994,7 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
     // select in positions after current nodes (selection one by one)
     while (selector.NextUsedAngle(angle))                   // angle for used pos but maybe without LOS problem
     {
-        GetNearPoint2D(x, y, distance2d + searcher_bounding_radius, absAngle + angle);
+        GetNearPoint2D(x, y, distance2d, absAngle + angle);
         z = GetPositionZ();
 
         if (searcher)
@@ -1791,13 +2018,13 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
 
 void WorldObject::SetPhaseMask(uint32 newPhaseMask, bool update)
 {
-    m_phaseMask = newPhaseMask;
+    m_position.SetPhaseMask(newPhaseMask);
 
-    if(update && IsInWorld())
+    if (update && IsInWorld())
         UpdateVisibilityAndView();
 }
 
-void WorldObject::PlayDistanceSound( uint32 sound_id, Player* target /*= NULL*/ )
+void WorldObject::PlayDistanceSound(uint32 sound_id, Player const* target /*= NULL*/) const
 {
     WorldPacket data(SMSG_PLAY_OBJECT_SOUND,4+8);
     data << uint32(sound_id);
@@ -1808,7 +2035,7 @@ void WorldObject::PlayDistanceSound( uint32 sound_id, Player* target /*= NULL*/
         SendMessageToSet( &data, true );
 }
 
-void WorldObject::PlayDirectSound( uint32 sound_id, Player* target /*= NULL*/ )
+void WorldObject::PlayDirectSound(uint32 sound_id, Player const* target /*= NULL*/) const
 {
     WorldPacket data(SMSG_PLAY_SOUND, 4);
     data << uint32(sound_id);
@@ -1818,6 +2045,38 @@ void WorldObject::PlayDirectSound( uint32 sound_id, Player* target /*= NULL*/ )
         SendMessageToSet( &data, true );
 }
 
+GameObject* WorldObject::GetClosestGameObjectWithEntry(const WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange)
+{
+    //return closest gameobject in grid, with range from pSource
+    GameObject* pGameObject = NULL;
+
+    CellPair p(MaNGOS::ComputeCellPair(pSource->GetPositionX(), pSource->GetPositionY()));
+    Cell cell(p);
+    cell.SetNoCreate();
+
+    MaNGOS::NearestGameObjectEntryInObjectRangeCheck gobject_check(*pSource, uiEntry, fMaxSearchRange);
+    MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck> searcher(pGameObject, gobject_check);
+
+    TypeContainerVisitor<MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck>, GridTypeMapContainer> grid_gobject_searcher(searcher);
+
+    cell.Visit(p, grid_gobject_searcher,*(pSource->GetMap()), *this, fMaxSearchRange);
+
+    return pGameObject;
+}
+
+void WorldObject::GetGameObjectListWithEntryInGrid(std::list<GameObject*>& lList, uint32 uiEntry, float fMaxSearchRange)
+{
+    CellPair pair(MaNGOS::ComputeCellPair(this->GetPositionX(), this->GetPositionY()));
+    Cell cell(pair);
+    cell.SetNoCreate();
+
+    MaNGOS::AllGameObjectsWithEntryInRange check(this, uiEntry, fMaxSearchRange);
+    MaNGOS::GameObjectListSearcher<MaNGOS::AllGameObjectsWithEntryInRange> searcher(lList, check);
+    TypeContainerVisitor<MaNGOS::GameObjectListSearcher<MaNGOS::AllGameObjectsWithEntryInRange>, GridTypeMapContainer> visitor(searcher);
+
+    GetMap()->Visit(cell, visitor);
+}
+
 void WorldObject::UpdateVisibilityAndView()
 {
     GetViewPoint().Call_UpdateVisibilityForOwner();
@@ -1825,6 +2084,20 @@ void WorldObject::UpdateVisibilityAndView()
     GetViewPoint().Event_ViewPointVisibilityChanged();
 }
 
+Creature* WorldObject::GetClosestCreatureWithEntry(WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange)
+{
+   Creature *p_Creature = NULL;
+   CellPair p(MaNGOS::ComputeCellPair(pSource->GetPositionX(), pSource->GetPositionY()));
+
+   Cell cell(p);
+   cell.SetNoCreate();
+   MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*pSource,uiEntry,true,false,fMaxSearchRange);
+   MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(p_Creature, u_check);
+   TypeContainerVisitor<MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck>, GridTypeMapContainer >  grid_creature_searcher(searcher);
+   cell.Visit(p, grid_creature_searcher, *pSource->GetMap(), *this, fMaxSearchRange);
+   return p_Creature;
+}
+
 void WorldObject::UpdateObjectVisibility()
 {
     CellPair p = MaNGOS::ComputeCellPair(GetPositionX(), GetPositionY());
@@ -1835,12 +2108,13 @@ void WorldObject::UpdateObjectVisibility()
 
 void WorldObject::AddToClientUpdateList()
 {
-    GetMap()->AddUpdateObject(this);
+    GetMap()->AddUpdateObject(GetObjectGuid());
 }
 
 void WorldObject::RemoveFromClientUpdateList()
 {
-    GetMap()->RemoveUpdateObject(this);
+    MAPLOCK_WRITE(this, MAP_LOCK_TYPE_MAPOBJECTS);
+    GetMap()->RemoveUpdateObject(GetObjectGuid());
 }
 
 struct WorldObjectChangeAccumulator
@@ -1851,7 +2125,7 @@ struct WorldObjectChangeAccumulator
     {
         // send self fields changes in another way, otherwise
         // with new camera system when player's camera too far from player, camera wouldn't receive packets and changes from player
-        if(i_object.isType(TYPEMASK_PLAYER))
+        if (i_object.isType(TYPEMASK_PLAYER))
             i_object.BuildUpdateDataForPlayer((Player*)&i_object, i_updateDatas);
     }
 
@@ -1860,7 +2134,7 @@ struct WorldObjectChangeAccumulator
         for(CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
         {
             Player* owner = iter->getSource()->GetOwner();
-            if(owner != &i_object && owner->HaveAtClient(&i_object))
+            if (owner && owner != &i_object && owner->HaveAtClient(i_object.GetObjectGuid()))
                 i_object.BuildUpdateDataForPlayer(owner, i_updateDatas);
         }
     }
@@ -1871,7 +2145,7 @@ struct WorldObjectChangeAccumulator
 void WorldObject::BuildUpdateData( UpdateDataMapType & update_players)
 {
     WorldObjectChangeAccumulator notifier(*this, update_players);
-    Cell::VisitWorldObjects(this, notifier, GetMap()->GetVisibilityDistance());
+    Cell::VisitWorldObjects(this, notifier, GetMap()->GetVisibilityDistance(this));
 
     ClearUpdateMask(false);
 }
@@ -1894,6 +2168,115 @@ bool WorldObject::IsControlledByPlayer() const
     }
 }
 
+void WorldObject::StartGroupLoot( Group* group, uint32 timer )
+{
+    m_groupLootId = group->GetId();
+    m_groupLootTimer = timer;
+}
+
+void WorldObject::StopGroupLoot()
+{
+    if (!m_groupLootId)
+        return;
+
+    Group* group = sObjectMgr.GetGroupById(m_groupLootId);
+    if (group)
+        group->EndRoll();
+
+    m_groupLootTimer = 0;
+    m_groupLootId = 0;
+}
+
+/**
+ * Return original player who tap creature, it can be different from player/group allowed to loot so not use it for loot code
+ */
+Player* WorldObject::GetOriginalLootRecipient() const
+{
+    return !m_lootRecipientGuid.IsEmpty() ? ObjectAccessor::FindPlayer(m_lootRecipientGuid) : NULL;
+}
+
+/**
+ * Return group if player tap creature as group member, independent is player after leave group or stil be group member
+ */
+Group* WorldObject::GetGroupLootRecipient() const
+{
+    // original recipient group if set and not disbanded
+    return m_lootGroupRecipientId ? sObjectMgr.GetGroupById(m_lootGroupRecipientId) : NULL;
+}
+
+/**
+ * Return player who can loot tapped creature (member of group or single player)
+ *
+ * In case when original player tap creature as group member then group tap prefered.
+ * This is for example important if player after tap leave group.
+ * If group not exist or disbanded or player tap creature not as group member return player
+ */
+Player* WorldObject::GetLootRecipient() const
+{
+    // original recipient group if set and not disbanded
+    Group* group = GetGroupLootRecipient();
+
+    // original recipient player if online
+    Player* player = GetOriginalLootRecipient();
+
+    // if group not set or disbanded return original recipient player if any
+    if (!group)
+        return player;
+
+    // group case
+
+    // return player if it still be in original recipient group
+    if (player && player->GetGroup() == group)
+        return player;
+
+    // find any in group
+    for(GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+        if (Player *p = itr->getSource())
+            return p;
+
+    return NULL;
+}
+
+/**
+ * Set player and group (if player group member) who tap creature
+ */
+void WorldObject::SetLootRecipient(Unit *unit)
+{
+    // set the player whose group should receive the right
+    // to loot the creature after it dies
+    // should be set to NULL after the loot disappears
+
+    if (!unit)
+    {
+        m_lootRecipientGuid.Clear();
+        m_lootGroupRecipientId = 0;
+        return;
+    }
+
+    Player* player = unit->GetCharmerOrOwnerPlayerOrPlayerItself();
+    if(!player)                                             // normal creature, no player involved
+        return;
+
+    // set player for non group case or if group will disbanded
+    m_lootRecipientGuid = player->GetObjectGuid();
+
+    // set group for group existed case including if player will leave group at loot time
+    if (Group* group = player->GetGroup())
+        m_lootGroupRecipientId = group->GetId();
+
+}
+
+// Frozen Mod
+void Object::ForceValuesUpdateAtIndex(uint16 index)
+{
+    MANGOS_ASSERT( index < m_valuesCount || PrintIndexError(index, true));
+
+    m_changedValues[index] = true; // makes server think the field changed
+
+    MarkForClientUpdate();
+}
+// Frozen Mod
+
 bool WorldObject::PrintCoordinatesError(float x, float y, float z, char const* descr) const
 {
     sLog.outError("%s with invalid %s coordinates: mapid = %uu, x = %f, y = %f, z = %f", GetGuidStr().c_str(), descr, GetMapId(), x, y, z);
@@ -1916,3 +2299,74 @@ void WorldObject::SetActiveObjectState(bool active)
     }
     m_isActiveObject = active;
 }
+
+void WorldObject::UpdateWorldState(uint32 state, uint32 value)
+{
+    if (GetMap())
+        sWorldStateMgr.SetWorldStateValueFor(GetMap(), state, value);
+}
+
+uint32 WorldObject::GetWorldState(uint32 stateId)
+{
+    return sWorldStateMgr.GetWorldStateValueFor(this, stateId);
+}
+
+WorldObjectEventProcessor* WorldObject::GetEvents()
+{
+    return &m_Events;
+}
+
+void WorldObject::KillAllEvents(bool force)
+{
+    GetEvents()->KillAllEvents(force);
+}
+
+void WorldObject::AddEvent(BasicEvent* Event, uint64 e_time, bool set_addtime)
+{
+    if (set_addtime)
+        GetEvents()->AddEvent(Event, GetEvents()->CalculateTime(e_time), set_addtime);
+    else
+        GetEvents()->AddEvent(Event, e_time, set_addtime);
+}
+
+void WorldObject::UpdateEvents(uint32 update_diff, uint32 time)
+{
+    GetEvents()->RenewEvents();
+    GetEvents()->Update(update_diff);
+}
+
+Transport* WorldObject::GetTransport() const
+{
+    return IsOnTransport() ? sObjectMgr.GetTransportByGuid(GetTransportInfo()->GetTransportGuid()) : NULL;
+}
+
+bool WorldObject::IsOnTransport() const
+{
+    return GetTransportInfo() && GetTransportInfo()->GetTransportGuid().IsMOTransport();
+}
+
+TransportBase* WorldObject::GetTransportBase()
+{
+    if (GetObjectGuid().IsMOTransport())
+        return ((Transport*)this)->GetTransportBase();
+    else if (GetObjectGuid().IsUnit())
+        return ((Unit*)this)->GetTransportBase();
+
+    return NULL;
+}
+
+void WorldObject::UpdateHelper::Update(uint32 time_diff)
+{
+    if (m_obj.SkipUpdate())
+    {
+        m_obj.SkipUpdate(false);
+        return;
+    }
+    uint32 realDiff = m_obj.m_updateTracker.timeElapsed();
+    if (realDiff < sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE)/2)
+        return;
+
+    m_obj.m_updateTracker.Reset();
+    m_obj.Update(realDiff, time_diff);
+    m_obj.SetLastUpdateTime();
+}
diff --git a/src/game/Object.h b/src/game/Object.h
index be7465b61a7..00be53d97c0 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -21,78 +21,67 @@
 
 #include "Common.h"
 #include "ByteBuffer.h"
-#include "UpdateFields.h"
+#include "UpdateFieldFlags.h"
 #include "UpdateData.h"
 #include "ObjectGuid.h"
 #include "Camera.h"
+#include "ObjectLock.h"
+#include "SharedDefines.h"
+#include "WorldObjectEvents.h"
+#include "WorldLocation.h"
+#include "LootMgr.h"
+#include "Util.h"
 
 #include <set>
 #include <string>
 
-#define CONTACT_DISTANCE            0.5f
-#define INTERACTION_DISTANCE        5.0f
-#define ATTACK_DISTANCE             5.0f
-#define MAX_VISIBILITY_DISTANCE     333.0f      // max distance for visible object show, limited in 333 yards
-#define DEFAULT_VISIBILITY_DISTANCE 90.0f       // default visible distance, 90 yards on continents
-#define DEFAULT_VISIBILITY_INSTANCE 120.0f      // default visible distance in instances, 120 yards
-#define DEFAULT_VISIBILITY_BGARENAS 180.0f      // default visible distance in BG/Arenas, 180 yards
-
 #define DEFAULT_WORLD_OBJECT_SIZE   0.388999998569489f      // currently used (correctly?) for any non Unit world objects. This is actually the bounding_radius, like player/creature from creature_model_data
 #define DEFAULT_OBJECT_SCALE        1.0f                    // player/item scale as default, npc/go from database, pets from dbc
 
 #define MAX_STEALTH_DETECT_RANGE    45.0f
 
-enum TempSummonType
-{
-    TEMPSUMMON_TIMED_OR_DEAD_DESPAWN       = 1,             // despawns after a specified time OR when the creature disappears
-    TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN     = 2,             // despawns after a specified time OR when the creature dies
-    TEMPSUMMON_TIMED_DESPAWN               = 3,             // despawns after a specified time
-    TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT = 4,             // despawns after a specified time after the creature is out of combat
-    TEMPSUMMON_CORPSE_DESPAWN              = 5,             // despawns instantly after death
-    TEMPSUMMON_CORPSE_TIMED_DESPAWN        = 6,             // despawns after a specified time after death
-    TEMPSUMMON_DEAD_DESPAWN                = 7,             // despawns when the creature disappears
-    TEMPSUMMON_MANUAL_DESPAWN              = 8              // despawns when UnSummon() is called
-};
+#define DEFAULT_HIDDEN_MODEL_ID     11686                   // common "hidden" (invisible) model ID
 
-enum PhaseMasks
+enum TempSummonType
 {
-    PHASEMASK_NORMAL   = 0x00000001,
-    PHASEMASK_ANYWHERE = 0xFFFFFFFF
+    TEMPSUMMON_MANUAL_DESPAWN              = 0,             // despawns when UnSummon() is called
+    TEMPSUMMON_DEAD_DESPAWN                = 1,             // despawns when the creature disappears
+    TEMPSUMMON_CORPSE_DESPAWN              = 2,             // despawns instantly after death
+    TEMPSUMMON_CORPSE_TIMED_DESPAWN        = 3,             // despawns after a specified time after death (or when the creature disappears)
+    TEMPSUMMON_TIMED_DESPAWN               = 4,             // despawns after a specified time
+    TEMPSUMMON_TIMED_OOC_DESPAWN           = 5,             // despawns after a specified time after the creature is out of combat
+    TEMPSUMMON_TIMED_OR_DEAD_DESPAWN       = 6,             // despawns after a specified time OR when the creature disappears
+    TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN     = 7,             // despawns after a specified time OR when the creature dies
+    TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN   = 8,             // despawns after a specified time (OOC) OR when the creature disappears
+    TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN = 9,             // despawns after a specified time (OOC) OR when the creature dies
+
+    // Place for future despawn types
+    TEMPSUMMON_LOST_OWNER_DESPAWN                           = 20,            // despawns when creature lost charmer/owner
+    TEMPSUMMON_DEAD_OR_LOST_OWNER_DESPAWN                   = 21,            // despawns when creature lost charmer/owner
+    TEMPSUMMON_TIMED_OR_DEAD_OR_LOST_OWNER_DESPAWN          = 22,            // despawns when creature lost charmer/owner, or by time
+    TEMPSUMMON_TIMED_OR_DEAD_OR_LOST_UNIQUENESS_DESPAWN     = 23,            // despawns when owner spawn creature this type in visible range, or by rules of TEMPSUMMON_TIMED_OR_DEAD_DESPAWN
+    TEMPSUMMON_DEAD_OR_LOST_UNIQUENESS_DESPAWN              = 24,            // despawns when owner spawn creature this type in visible range, or by rules of TEMPSUMMON_DEAD_DESPAWN
 };
 
 class WorldPacket;
 class UpdateData;
 class WorldSession;
 class Creature;
+class GameObject;
 class Player;
+class Group;
 class Unit;
 class Group;
 class Map;
 class UpdateMask;
 class InstanceData;
 class TerrainInfo;
+class Transport;
+class TransportBase;
+class TransportInfo;
+struct MangosStringLocale;
 
-typedef UNORDERED_MAP<Player*, UpdateData> UpdateDataMapType;
-
-struct Position
-{
-    Position() : x(0.0f), y(0.0f), z(0.0f), o(0.0f) {}
-    float x, y, z, o;
-};
-
-struct WorldLocation
-{
-    uint32 mapid;
-    float coord_x;
-    float coord_y;
-    float coord_z;
-    float orientation;
-    explicit WorldLocation(uint32 _mapid = 0, float _x = 0, float _y = 0, float _z = 0, float _o = 0)
-        : mapid(_mapid), coord_x(_x), coord_y(_y), coord_z(_z), orientation(_o) {}
-    WorldLocation(WorldLocation const &loc)
-        : mapid(loc.mapid), coord_x(loc.coord_x), coord_y(loc.coord_y), coord_z(loc.coord_z), orientation(loc.orientation) {}
-};
-
+typedef UNORDERED_MAP<ObjectGuid, UpdateData> UpdateDataMapType;
 
 //use this class to measure time between world update ticks
 //essential for units updating their spells after cells become active
@@ -101,9 +90,9 @@ class WorldUpdateCounter
     public:
         WorldUpdateCounter() : m_tmStart(0) {}
 
-        time_t timeElapsed()
+        uint32 timeElapsed()
         {
-            if(!m_tmStart)
+            if (!m_tmStart)
                 m_tmStart = WorldTimer::tickPrevTime();
 
             return WorldTimer::getMSTimeDiff(m_tmStart, WorldTimer::tickTime());
@@ -115,10 +104,28 @@ class WorldUpdateCounter
         uint32 m_tmStart;
 };
 
+class Object;
+struct UpdateFieldData
+{
+    public:
+        UpdateFieldData(Object const* object, Player* target);
+        bool IsUpdateNeeded(uint16 fieldIndex, uint32 fieldNotifyFlags) const { return HasFlags(fieldIndex, fieldNotifyFlags) || (HasFlags(fieldIndex, UF_FLAG_SPECIAL_INFO) && m_hasSpecialInfo); }
+        bool IsUpdateFieldVisible(uint16 fieldIndex) const;
+    private:
+        inline bool HasFlags(uint16 fieldIndex, uint32 flags) const { return m_flags[fieldIndex] & flags; }
+
+        uint32* m_flags;
+        bool m_isSelf;
+        bool m_isOwner;
+        bool m_isItemOwner;
+        bool m_hasSpecialInfo;
+        bool m_isPartyMember;
+};
+
 class MANGOS_DLL_SPEC Object
 {
     public:
-        virtual ~Object ( );
+        virtual ~Object();
 
         const bool& IsInWorld() const { return m_inWorld; }
         virtual void AddToWorld()
@@ -131,12 +138,13 @@ class MANGOS_DLL_SPEC Object
             // synchronize values mirror with values array (changes will send in updatecreate opcode any way
             ClearUpdateMask(false);                         // false - we can't have update data in update queue before adding to world
         }
-        virtual void RemoveFromWorld()
+        virtual void RemoveFromWorld(bool /*remove*/)
         {
             // if we remove from world then sending changes not required
             ClearUpdateMask(true);
             m_inWorld = false;
         }
+        bool IsInitialized() const { return (m_uint32Values ? true : false);}
 
         ObjectGuid const& GetObjectGuid() const { return GetGuidValue(OBJECT_FIELD_GUID); }
         uint32 GetGUIDLow() const { return GetObjectGuid().GetCounter(); }
@@ -166,6 +174,15 @@ class MANGOS_DLL_SPEC Object
         void MarkForClientUpdate();
         void SendForcedObjectUpdate();
 
+        virtual GuidSet const* GetObjectsUpdateQueue() { return NULL; };
+        bool IsMarkedForClientUpdate() const { return m_objectUpdated; };
+        virtual Object* GetDependentObject(ObjectGuid const& guid) { return NULL; };
+        virtual void RemoveUpdateObject(ObjectGuid const& guid) {};
+        virtual void AddUpdateObject(ObjectGuid const& guid) {};
+
+        void SetFieldNotifyFlag(uint16 flag) { m_fieldNotifyFlags |= flag; }
+        void RemoveFieldNotifyFlag(uint16 flag) { m_fieldNotifyFlags &= ~flag; }
+
         void BuildValuesUpdateBlockForPlayer( UpdateData *data, Player *target ) const;
         void BuildOutOfRangeUpdateBlock( UpdateData *data ) const;
         void BuildMovementUpdateBlock( UpdateData * data, uint16 flags = 0 ) const;
@@ -231,8 +248,9 @@ class MANGOS_DLL_SPEC Object
 
         void ApplyPercentModFloatValue(uint16 index, float val, bool apply)
         {
-            val = val != -100.0f ? val : -99.9f ;
-            SetFloatValue(index, GetFloatValue(index) * (apply?(100.0f+val)/100.0f : 100.0f / (100.0f+val)) );
+            float var = GetFloatValue(index);
+            ApplyPercentModFloatVar(var, val, apply);
+            SetFloatValue(index, var);
         }
 
         void SetFlag( uint16 index, uint32 newFlag );
@@ -353,20 +371,22 @@ class MANGOS_DLL_SPEC Object
 
         uint16 GetValuesCount() const { return m_valuesCount; }
 
-        void InitValues() { _InitValues(); }
+        // Frozen Mod
+        void ForceValuesUpdateAtIndex(uint16);
+        // Frozen Mod
 
         virtual bool HasQuest(uint32 /* quest_id */) const { return false; }
         virtual bool HasInvolvedQuest(uint32 /* quest_id */) const { return false; }
 
     protected:
-        Object ( );
+        Object();
 
         void _InitValues();
-        void _Create (uint32 guidlow, uint32 entry, HighGuid guidhigh);
-
-        virtual void _SetUpdateBits(UpdateMask *updateMask, Player *target) const;
+        void _Create(uint32 guidlow, uint32 entry, HighGuid guidhigh) { _Create(ObjectGuid(guidhigh, entry, guidlow)); }
+        void _Create(ObjectGuid guid);
 
-        virtual void _SetCreateBits(UpdateMask *updateMask, Player *target) const;
+        void _SetUpdateBits(UpdateMask* updateMask, Player* target) const;
+        void _SetCreateBits(UpdateMask* updateMask, Player* target) const;
 
         void BuildMovementUpdate(ByteBuffer * data, uint16 updateFlags) const;
         void BuildValuesUpdate(uint8 updatetype, ByteBuffer *data, UpdateMask *updateMask, Player *target ) const;
@@ -384,11 +404,13 @@ class MANGOS_DLL_SPEC Object
             float  *m_floatValues;
         };
 
-        uint32 *m_uint32Values_mirror;
+        std::vector<bool> m_changedValues;
 
         uint16 m_valuesCount;
+        uint16 m_fieldNotifyFlags;
 
         bool m_objectUpdated;
+        bool m_skipUpdate;
 
     private:
         bool m_inWorld;
@@ -402,9 +424,21 @@ class MANGOS_DLL_SPEC Object
         // for output helpfull error messages from ASSERTs
         bool PrintIndexError(uint32 index, bool set) const;
         bool PrintEntryError(char const* descr) const;
+
+    public:
+        // SkipUpdate mechanic used if object (Player, MOTransport, etc) moved from one map to another,
+        // for skipping double-update in one world update tick
+        bool SkipUpdate() const { return m_skipUpdate; };
+        void SkipUpdate(bool value) { m_skipUpdate = value; };
 };
 
 struct WorldObjectChangeAccumulator;
+class TransportKit;
+
+namespace Movement
+{
+    class MoveSpline;
+};
 
 class MANGOS_DLL_SPEC WorldObject : public Object
 {
@@ -417,52 +451,100 @@ class MANGOS_DLL_SPEC WorldObject : public Object
         class MANGOS_DLL_SPEC UpdateHelper
         {
             public:
-                explicit UpdateHelper(WorldObject * obj) : m_obj(obj) {}
-                ~UpdateHelper() { }
+                explicit UpdateHelper(WorldObject& obj) : m_obj(obj) {}
+                ~UpdateHelper() {}
 
-                void Update( uint32 time_diff )
-                {
-                    m_obj->Update( m_obj->m_updateTracker.timeElapsed(), time_diff);
-                    m_obj->m_updateTracker.Reset();
-                }
+                void Update(uint32 time_diff);
 
             private:
                 UpdateHelper( const UpdateHelper& );
                 UpdateHelper& operator=( const UpdateHelper& );
 
-                WorldObject * const m_obj;
+                WorldObject& m_obj;
         };
 
-        virtual ~WorldObject ( ) {}
+        virtual ~WorldObject();
 
         virtual void Update(uint32 /*update_diff*/, uint32 /*time_diff*/) {}
 
-        void _Create( uint32 guidlow, HighGuid guidhigh, uint32 phaseMask);
+        void _Create(ObjectGuid guid, uint32 phaseMask);
+
+        void AddToWorld();
+        virtual void RemoveFromWorld(bool remove) override;
+
+        TransportInfo* GetTransportInfo() const { return m_transportInfo; }
+        bool IsBoarded() const { return m_transportInfo != NULL; }
+        void SetTransportInfo(TransportInfo* transportInfo) { m_transportInfo = transportInfo; }
 
-        void Relocate(float x, float y, float z, float orientation);
-        void Relocate(float x, float y, float z);
+        virtual bool IsTransport() const { return false; };
+        virtual bool IsMOTransport() const { return false; };
+        TransportBase* GetTransportBase();
+        virtual TransportKit* GetTransportKit() { return NULL; };
 
+        void Relocate(WorldLocation const& location);
+        void Relocate(Position const& position);
         void SetOrientation(float orientation);
 
-        float GetPositionX( ) const { return m_position.x; }
-        float GetPositionY( ) const { return m_position.y; }
-        float GetPositionZ( ) const { return m_position.z; }
-        void GetPosition( float &x, float &y, float &z ) const
-            { x = m_position.x; y = m_position.y; z = m_position.z; }
-        void GetPosition( WorldLocation &loc ) const
-            { loc.mapid = m_mapId; GetPosition(loc.coord_x, loc.coord_y, loc.coord_z); loc.orientation = GetOrientation(); }
-        float GetOrientation( ) const { return m_position.o; }
-        void GetNearPoint2D( float &x, float &y, float distance, float absAngle) const;
-        void GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float searcher_bounding_radius, float distance2d, float absAngle) const;
-        void GetClosePoint(float &x, float &y, float &z, float bounding_radius, float distance2d = 0, float angle = 0, const WorldObject* obj = NULL ) const
+        // FIXME - need remove wrapper after cleanup SD2
+        void Relocate(float x, float y, float z, float orientation = 0.0f) { Relocate(Position(x, y, z, orientation, GetPhaseMask())); };
+
+        float const& GetPositionX() const     { return GetPosition().getX(); }
+        float const& GetPositionY() const     { return GetPosition().getY(); }
+        float const& GetPositionZ() const     { return GetPosition().getZ(); }
+        float const& GetOrientation() const   { return GetPosition().getO(); }
+        void GetPosition(float &x, float &y, float &z ) const { x = m_position.x; y = m_position.y; z = m_position.z; }
+        WorldLocation const& GetPosition() const { return m_position; };
+
+        virtual bool IsOnTransport() const;
+        virtual Transport* GetTransport() const;
+        float GetTransOffsetX() const { return GetPosition().GetTransportPos().getX(); }
+        float GetTransOffsetY() const { return GetPosition().GetTransportPos().getY(); }
+        float GetTransOffsetZ() const { return GetPosition().GetTransportPos().getZ(); }
+        float GetTransOffsetO() const { return GetPosition().GetTransportPos().getO(); }
+        Position const& GetTransportPosition() const { return GetPosition().GetTransportPos(); };
+        void SetTransportPosition(Position const& pos) { m_position.SetTransportPosition(pos); };
+        bool HasTransportPosition() const { return !GetTransportPosition().IsEmpty(); };
+        void ClearTransportData() { m_position.ClearTransportData(); };
+
+        /// Gives a 2d-point in distance distance2d in direction absAngle around the current position (point-to-point)
+        void GetNearPoint2D(float& x, float& y, float distance2d, float absAngle) const;
+        /** Gives a "free" spot for searcher in distance distance2d in direction absAngle on "good" height
+         * @param searcher          -           for whom a spot is searched for
+         * @param x, y, z           -           position for the found spot of the searcher
+         * @param searcher_bounding_radius  -   how much space the searcher will require
+         * @param distance2d        -           distance between the middle-points
+         * @param absAngle          -           angle in which the spot is preferred
+         */
+        void GetNearPoint(WorldObject const* searcher, float& x, float& y, float& z, float searcher_bounding_radius, float distance2d, float absAngle) const;
+        /** Gives a "free" spot for a searcher on the distance (including bounding-radius calculation)
+         * @param x, y, z           -           position for the found spot
+         * @param bounding_radius   -           radius for the searcher
+         * @param distance2d        -           range in which to find a free spot. Default = 0.0f (which usually means the units will have contact)
+         * @param angle             -           direction in which to look for a free spot. Default = 0.0f (direction in which 'this' is looking
+         * @param obj               -           for whom to look for a spot. Default = NULL
+         */
+        void GetClosePoint(float& x, float& y, float& z, float bounding_radius, float distance2d = 0.0f, float angle = 0.0f, const WorldObject* obj = NULL) const
         {
             // angle calculated from current orientation
-            GetNearPoint(obj, x, y, z, bounding_radius, distance2d, GetOrientation() + angle);
+            GetNearPoint(obj, x, y, z, bounding_radius, distance2d + GetObjectBoundingRadius() + bounding_radius, GetOrientation() + angle);
         }
-        void GetContactPoint( const WorldObject* obj, float &x, float &y, float &z, float distance2d = CONTACT_DISTANCE) const
+
+        WorldLocation GetClosePoint(float bounding_radius, float distance2d = 0.0f, float angle = 0.0f, WorldObject const* obj = NULL)
+        {
+            WorldLocation loc = GetPosition();
+            GetNearPoint(obj, loc.x, loc.y, loc.z, bounding_radius, distance2d, loc.o + angle);
+            return loc;
+        }
+
+        /** Gives a "free" spot for a searcher in contact-range of "this" (including bounding-radius calculation)
+         * @param x, y, z           -           position for the found spot
+         * @param obj               -           for whom to find a contact position. The position will be searched in direction from 'this' towards 'obj'
+         * @param distance2d        -           distance which 'obj' and 'this' should have beetween their bounding radiuses. Default = CONTACT_DISTANCE
+         */
+        void GetContactPoint(const WorldObject* obj, float& x, float& y, float& z, float distance2d = CONTACT_DISTANCE) const
         {
             // angle to face `obj` to `this` using distance includes size of `obj`
-            GetNearPoint(obj, x, y, z, obj->GetObjectBoundingRadius(), distance2d, GetAngle(obj));
+            GetNearPoint(obj, x, y, z, obj->GetObjectBoundingRadius(), distance2d + GetObjectBoundingRadius() + obj->GetObjectBoundingRadius(), GetAngle(obj));
         }
 
         virtual float GetObjectBoundingRadius() const { return DEFAULT_WORLD_OBJECT_SIZE; }
@@ -473,11 +555,11 @@ class MANGOS_DLL_SPEC WorldObject : public Object
 
         void GetRandomPoint( float x, float y, float z, float distance, float &rand_x, float &rand_y, float &rand_z ) const;
 
-        uint32 GetMapId() const { return m_mapId; }
-        uint32 GetInstanceId() const { return m_InstanceId; }
+        uint32 GetMapId() const { return m_position.GetMapId(); }
+        uint32 GetInstanceId() const { return m_position.GetInstanceId(); }
 
         virtual void SetPhaseMask(uint32 newPhaseMask, bool update);
-        uint32 GetPhaseMask() const { return m_phaseMask; }
+        uint32 GetPhaseMask() const { return m_position.GetPhaseMask(); }
         bool InSamePhase(WorldObject const* obj) const { return InSamePhase(obj->GetPhaseMask()); }
         bool InSamePhase(uint32 phasemask) const { return (GetPhaseMask() & phasemask); }
 
@@ -492,16 +574,19 @@ class MANGOS_DLL_SPEC WorldObject : public Object
 
         virtual const char* GetNameForLocaleIdx(int32 /*locale_idx*/) const { return GetName(); }
 
-        float GetDistance( const WorldObject* obj ) const;
+        float GetDistance(WorldLocation const& loc) const;
+
+        float GetDistance(WorldObject const* obj) const;
         float GetDistance(float x, float y, float z) const;
-        float GetDistance2d(const WorldObject* obj) const;
+        float GetDistance2d(WorldObject const* obj) const;
         float GetDistance2d(float x, float y) const;
-        float GetDistanceZ(const WorldObject* obj) const;
-        bool IsInMap(const WorldObject* obj) const
+        float GetDistanceZ(WorldObject const* obj) const;
+        bool IsInMap(WorldObject const* obj) const
         {
             return IsInWorld() && obj->IsInWorld() && (GetMap() == obj->GetMap()) && InSamePhase(obj);
         }
         bool IsWithinDist3d(float x, float y, float z, float dist2compare) const;
+        bool IsWithinDist3d(Location const& loc, float dist2compare) const;
         bool IsWithinDist2d(float x, float y, float dist2compare) const;
         bool _IsWithinDist(WorldObject const* obj, float dist2compare, bool is3D) const;
 
@@ -516,39 +601,40 @@ class MANGOS_DLL_SPEC WorldObject : public Object
             return obj && IsInMap(obj) && _IsWithinDist(obj,dist2compare,is3D);
         }
         bool IsWithinLOS(float x, float y, float z) const;
-        bool IsWithinLOSInMap(const WorldObject* obj) const;
+        bool IsWithinLOSInMap(WorldObject const* obj) const;
         bool GetDistanceOrder(WorldObject const* obj1, WorldObject const* obj2, bool is3D = true) const;
         bool IsInRange(WorldObject const* obj, float minRange, float maxRange, bool is3D = true) const;
         bool IsInRange2d(float x, float y, float minRange, float maxRange) const;
         bool IsInRange3d(float x, float y, float z, float minRange, float maxRange) const;
+        bool IsInBetween(WorldObject const* obj1, WorldObject const* obj2, float size = 0) const;
+
+        float GetExactDist2dSq(float x, float y) const
+        { float dx = m_position.x - x; float dy = m_position.y - y; return dx*dx + dy*dy; }
+        float GetExactDist2d(const float x, const float y) const
+        { return sqrt(GetExactDist2dSq(x, y)); }
+
+        float GetAngle(WorldObject const* obj) const;
+        float GetAngle(float const x, float const y) const;
+        bool HasInArc(float const arcangle, WorldObject const* obj) const;
+        bool isInFrontInMap(WorldObject const* target, float distance, float arc = M_PI_F) const;
+        bool isInBackInMap(WorldObject const* target, float distance, float arc = M_PI_F) const;
+        bool isInFront(WorldObject const* target, float distance, float arc = M_PI_F) const;
+        bool isInBack(WorldObject const* target, float distance, float arc = M_PI_F) const;
 
-        float GetAngle( const WorldObject* obj ) const;
-        float GetAngle( const float x, const float y ) const;
-        bool HasInArc( const float arcangle, const WorldObject* obj ) const;
-        bool isInFrontInMap(WorldObject const* target,float distance, float arc = M_PI) const;
-        bool isInBackInMap(WorldObject const* target, float distance, float arc = M_PI) const;
-        bool isInFront(WorldObject const* target,float distance, float arc = M_PI) const;
-        bool isInBack(WorldObject const* target, float distance, float arc = M_PI) const;
-
-        virtual void CleanupsBeforeDelete();                // used in destructor or explicitly before mass creature delete to remove cross-references to already deleted units
-
-        virtual void SendMessageToSet(WorldPacket *data, bool self);
-        virtual void SendMessageToSetInRange(WorldPacket *data, float dist, bool self);
-        void SendMessageToSetExcept(WorldPacket *data, Player const* skipped_receiver);
-
-        void MonsterSay(const char* text, uint32 language, Unit* target = NULL);
-        void MonsterYell(const char* text, uint32 language, Unit* target = NULL);
-        void MonsterTextEmote(const char* text, Unit* target, bool IsBossEmote = false);
-        void MonsterWhisper(const char* text, Unit* target, bool IsBossWhisper = false);
-        void MonsterSay(int32 textId, uint32 language, Unit* target = NULL);
-        void MonsterYell(int32 textId, uint32 language, Unit* target = NULL);
-        void MonsterTextEmote(int32 textId, Unit* target, bool IsBossEmote = false);
-        void MonsterWhisper(int32 textId, Unit* receiver, bool IsBossWhisper = false);
-        void MonsterYellToZone(int32 textId, uint32 language, Unit* target);
-        static void BuildMonsterChat(WorldPacket *data, ObjectGuid senderGuid, uint8 msgtype, char const* text, uint32 language, char const* name, ObjectGuid targetGuid, char const* targetName);
-
-        void PlayDistanceSound(uint32 sound_id, Player* target = NULL);
-        void PlayDirectSound(uint32 sound_id, Player* target = NULL);
+        virtual void CleanupsBeforeDelete();                   // used in destructor or explicitly before mass creature delete to remove cross-references to already deleted units
+
+        virtual void SendMessageToSet(WorldPacket* data, bool self) const;
+        virtual void SendMessageToSetInRange(WorldPacket* data, float dist, bool self) const;
+        void SendMessageToSetExcept(WorldPacket* data, Player const* skipped_receiver) const;
+
+        void MonsterSay(const char* text, uint32 language, Unit const* target = NULL) const;
+        void MonsterYell(const char* text, uint32 language, Unit const* target = NULL) const;
+        void MonsterTextEmote(const char* text, Unit const* target, bool IsBossEmote = false) const;
+        void MonsterWhisper(const char* text, Unit const* target, bool IsBossWhisper = false) const;
+        void MonsterText(MangosStringLocale const* textData, Unit const* target) const;
+
+        void PlayDistanceSound(uint32 sound_id, Player const* target = NULL) const;
+        void PlayDirectSound(uint32 sound_id, Player const* target = NULL) const;
 
         void SendObjectDeSpawnAnim(ObjectGuid guid);
         void SendGameObjectCustomAnim(ObjectGuid guid, uint32 animId = 0);
@@ -559,6 +645,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object
 
         virtual void SaveRespawnTime() {}
         void AddObjectToRemoveList();
+        void RemoveObjectFromRemoveList();
 
         void UpdateObjectVisibility();
         virtual void UpdateVisibilityAndView();             // update visibility for object and object for all around
@@ -569,29 +656,79 @@ class MANGOS_DLL_SPEC WorldObject : public Object
         // low level function for visibility change code, must be define in all main world object subclasses
         virtual bool isVisibleForInState(Player const* u, WorldObject const* viewPoint, bool inVisibleList) const = 0;
 
-        void SetMap(Map * map);
-        Map * GetMap() const { MANGOS_ASSERT(m_currMap); return m_currMap; }
+        virtual void SetMap(Map* map);
+        Map* GetMap() const { return m_currMap; }
         //used to check all object's GetMap() calls when object is not in world!
-        void ResetMap() { m_currMap = NULL; }
+        virtual void ResetMap() { m_currMap = NULL; }
+
+        ObjectLockType& GetLock(MapLockType _locktype = MAP_LOCK_TYPE_DEFAULT);
 
         //obtain terrain data for map where this object belong...
-        TerrainInfo const* GetTerrain() const;
+        TerrainInfoPtr GetTerrain() const;
 
-        void AddToClientUpdateList();
-        void RemoveFromClientUpdateList();
-        void BuildUpdateData(UpdateDataMapType &);
+        void AddToClientUpdateList() override;
+        void RemoveFromClientUpdateList() override;
+        void BuildUpdateData(UpdateDataMapType &) override;
+
+        Creature* SummonCreature(uint32 id, float x, float y, float z, float ang, TempSummonType spwtype, uint32 despwtime, bool asActiveObject = false);
+        Creature* SummonCreature(uint32 id, TempSummonType spwType, uint32 despwTime, bool asActiveObject = false)
+        {
+            return SummonCreature(id, 0.0f, 0.0f, 0.0f, 0.0f, spwType, despwTime, asActiveObject);
+        }
 
-        Creature* SummonCreature(uint32 id, float x, float y, float z, float ang,TempSummonType spwtype,uint32 despwtime, bool asActiveObject = false);
+        GameObject* SummonGameobject(uint32 id, float x, float y, float z, float angle, uint32 despwtime);
+
+        // Loot System
+        Loot loot;
+
+        void StartGroupLoot(Group* group, uint32 timer);
+        void StopGroupLoot();
+        ObjectGuid GetLootRecipientGuid() const { return m_lootRecipientGuid; }
+        uint32 GetLootGroupRecipientId() const { return m_lootGroupRecipientId; }
+        Player* GetLootRecipient() const;                   // use group cases as prefered
+        Group* GetGroupLootRecipient() const;
+        bool HasLootRecipient() const { return m_lootGroupRecipientId || !m_lootRecipientGuid.IsEmpty(); }
+        bool IsGroupLootRecipient() const { return m_lootGroupRecipientId; }
+        void SetLootRecipient(Unit* unit);
+        Player* GetOriginalLootRecipient() const;           // ignore group changes/etc, not for looting
+
+        // helper functions to select units
+        Creature* GetClosestCreatureWithEntry(WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange);
+        GameObject* GetClosestGameObjectWithEntry(const WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange);
+        void GetGameObjectListWithEntryInGrid(std::list<GameObject*>& lList, uint32 uiEntry, float fMaxSearchRange);
 
         bool isActiveObject() const { return m_isActiveObject || m_viewPoint.hasViewers(); }
         void SetActiveObjectState(bool active);
 
+        uint32 GetLastUpdateTime() const { return m_LastUpdateTime; }
+        void SetLastUpdateTime() { m_LastUpdateTime = WorldTimer::getMSTime(); }
+
         ViewPoint& GetViewPoint() { return m_viewPoint; }
 
         // ASSERT print helper
         bool PrintCoordinatesError(float x, float y, float z, char const* descr) const;
 
-        virtual void StartGroupLoot(Group* group, uint32 timer) {}
+        // WorldState operations
+        void UpdateWorldState(uint32 state, uint32 value);
+        uint32 GetWorldState(uint32 state);
+
+        // Event handler
+        WorldObjectEventProcessor* GetEvents();
+        void UpdateEvents(uint32 update_diff, uint32 time);
+        void KillAllEvents(bool force);
+        void AddEvent(BasicEvent* Event, uint64 e_time, bool set_addtime = true);
+
+        virtual bool IsVehicle() const { return false; }
+
+        // Movement
+        Movement::MoveSpline* movespline;
+        ShortTimeTracker m_movesplineTimer;
+
+        // Visibility operations for object in (must be used only in active state!)
+        GuidSet& GetNotifiedClients() { return m_notifiedClients;};
+        void  AddNotifiedClient(ObjectGuid const& guid)    { m_notifiedClients.insert(guid); };
+        void  RemoveNotifiedClient(ObjectGuid const& guid) { m_notifiedClients.erase(guid); };
+        bool  HasNotifiedClients() const { return !m_notifiedClients.empty(); };
 
     protected:
         explicit WorldObject();
@@ -599,24 +736,33 @@ class MANGOS_DLL_SPEC WorldObject : public Object
         //these functions are used mostly for Relocate() and Corpse/Player specific stuff...
         //use them ONLY in LoadFromDB()/Create() funcs and nowhere else!
         //mapId/instanceId should be set in SetMap() function!
-        void SetLocationMapId(uint32 _mapId) { m_mapId = _mapId; }
-        void SetLocationInstanceId(uint32 _instanceId) { m_InstanceId = _instanceId; }
+        void SetLocationMapId(uint32 _mapId)           { m_position.SetMapId(_mapId); }
+        void SetLocationInstanceId(uint32 _instanceId) { m_position.SetInstanceId(_instanceId); }
+
+        uint32 m_groupLootTimer;                            // (msecs)timer used for group loot
+        uint32 m_groupLootId;                               // used to find group which is looting corpse
 
-        virtual void StopGroupLoot() {}
+        ObjectGuid m_lootRecipientGuid;                     // player who will have rights for looting if m_lootGroupRecipient==0 or group disbanded
+        uint32 m_lootGroupRecipientId;                      // group who will have rights for looting if set and exist
 
         std::string m_name;
 
+        TransportInfo* m_transportInfo;
+
     private:
-        Map * m_currMap;                                    //current object's Map location
+        Map* m_currMap;                                     //current object's Map location
 
-        uint32 m_mapId;                                     // object at map with map_id
-        uint32 m_InstanceId;                                // in map copy with instance id
-        uint32 m_phaseMask;                                 // in area phase state
+        WorldLocation m_position;                           // Contains all needed coords for object
 
-        Position m_position;
         ViewPoint m_viewPoint;
         WorldUpdateCounter m_updateTracker;
         bool m_isActiveObject;
+
+        uint32 m_LastUpdateTime;
+
+        WorldObjectEventProcessor m_Events;
+
+        GuidSet    m_notifiedClients;
 };
 
 #endif
diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp
index 0a48efe9b1d..bfddf245e95 100644
--- a/src/game/ObjectAccessor.cpp
+++ b/src/game/ObjectAccessor.cpp
@@ -18,7 +18,7 @@
 
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Player.h"
 #include "WorldPacket.h"
 #include "Item.h"
@@ -33,22 +33,22 @@
 
 #include <cmath>
 
-#define CLASS_LOCK MaNGOS::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex>
-INSTANTIATE_SINGLETON_2(ObjectAccessor, CLASS_LOCK);
-INSTANTIATE_CLASS_MUTEX(ObjectAccessor, ACE_Thread_Mutex);
+INSTANTIATE_SINGLETON_1(ObjectAccessor);
+
+ObjectAccessor::ObjectAccessor() 
+{
+}
 
-ObjectAccessor::ObjectAccessor() {}
 ObjectAccessor::~ObjectAccessor()
 {
     for(Player2CorpsesMapType::const_iterator itr = i_player2corpse.begin(); itr != i_player2corpse.end(); ++itr)
     {
-        itr->second->RemoveFromWorld();
+        itr->second->RemoveFromWorld(true);
         delete itr->second;
     }
 }
 
-Unit*
-ObjectAccessor::GetUnit(WorldObject const &u, ObjectGuid guid)
+Unit* ObjectAccessor::GetUnit(WorldObject const &u, ObjectGuid guid)
 {
     if (!guid)
         return NULL;
@@ -64,7 +64,7 @@ ObjectAccessor::GetUnit(WorldObject const &u, ObjectGuid guid)
 
 Corpse* ObjectAccessor::GetCorpseInMap(ObjectGuid guid, uint32 mapid)
 {
-    Corpse * ret = HashMapHolder<Corpse>::Find(guid);
+    Corpse* ret = HashMapHolder<Corpse>::Find(guid);
     if (!ret)
         return NULL;
     if (ret->GetMapId() != mapid)
@@ -118,7 +118,7 @@ void ObjectAccessor::KickPlayer(ObjectGuid guid)
 Corpse*
 ObjectAccessor::GetCorpseForPlayerGUID(ObjectGuid guid)
 {
-    Guard guard(i_corpseGuard);
+    HashMapHolder<Corpse>::ReadGuard g(HashMapHolder<Corpse>::GetLock());
 
     Player2CorpsesMapType::iterator iter = i_player2corpse.find(guid);
     if (iter == i_player2corpse.end())
@@ -134,7 +134,8 @@ ObjectAccessor::RemoveCorpse(Corpse *corpse)
 {
     MANGOS_ASSERT(corpse && corpse->GetType() != CORPSE_BONES);
 
-    Guard guard(i_corpseGuard);
+    HashMapHolder<Corpse>::WriteGuard g(HashMapHolder<Corpse>::GetLock());
+
     Player2CorpsesMapType::iterator iter = i_player2corpse.find(corpse->GetOwnerGuid());
     if( iter == i_player2corpse.end() )
         return;
@@ -144,9 +145,11 @@ ObjectAccessor::RemoveCorpse(Corpse *corpse)
     uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
 
     sObjectMgr.DeleteCorpseCellData(corpse->GetMapId(), cell_id, corpse->GetOwnerGuid().GetCounter());
-    corpse->RemoveFromWorld();
-
+    corpse->RemoveFromWorld(true);
     i_player2corpse.erase(iter);
+
+    // need recheck - may be need free memory in this place
+    //delete corpse;
 }
 
 void
@@ -154,7 +157,8 @@ ObjectAccessor::AddCorpse(Corpse *corpse)
 {
     MANGOS_ASSERT(corpse && corpse->GetType() != CORPSE_BONES);
 
-    Guard guard(i_corpseGuard);
+    HashMapHolder<Corpse>::WriteGuard g(HashMapHolder<Corpse>::GetLock());
+
     MANGOS_ASSERT(i_player2corpse.find(corpse->GetOwnerGuid()) == i_player2corpse.end());
     i_player2corpse[corpse->GetOwnerGuid()] = corpse;
 
@@ -168,7 +172,9 @@ ObjectAccessor::AddCorpse(Corpse *corpse)
 void
 ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair,GridType& grid,Map* map)
 {
-    Guard guard(i_corpseGuard);
+
+    HashMapHolder<Corpse>::ReadGuard g(HashMapHolder<Corpse>::GetLock());
+
     for(Player2CorpsesMapType::iterator iter = i_player2corpse.begin(); iter != i_player2corpse.end(); ++iter)
         if(iter->second->GetGrid() == gridpair)
     {
@@ -231,8 +237,7 @@ ObjectAccessor::ConvertCorpseForPlayer(ObjectGuid player_guid, bool insignia)
         // bones->m_time = m_time;                              // don't overwrite time
         // bones->m_inWorld = m_inWorld;                        // don't overwrite world state
         // bones->m_type = m_type;                              // don't overwrite type
-        bones->Relocate(corpse->GetPositionX(), corpse->GetPositionY(), corpse->GetPositionZ(), corpse->GetOrientation());
-        bones->SetPhaseMask(corpse->GetPhaseMask(), false);
+        bones->Relocate(corpse->GetPosition());
 
         bones->SetUInt32Value(CORPSE_FIELD_FLAGS, CORPSE_FLAG_UNK2 | CORPSE_FLAG_BONES);
         bones->SetGuidValue(CORPSE_FIELD_OWNER, ObjectGuid());
@@ -272,9 +277,10 @@ void ObjectAccessor::RemoveOldCorpses()
 /// Define the static member of HashMapHolder
 
 template <class T> typename HashMapHolder<T>::MapType HashMapHolder<T>::m_objectMap;
-template <class T> ACE_RW_Thread_Mutex HashMapHolder<T>::i_lock;
+template <class T> MANGOSR2_MUTEX_MODEL HashMapHolder<T>::i_lock;
 
 /// Global definitions for the hashmap storage
 
 template class HashMapHolder<Player>;
 template class HashMapHolder<Corpse>;
+
diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h
index f35296219c4..1bce885a978 100644
--- a/src/game/ObjectAccessor.h
+++ b/src/game/ObjectAccessor.h
@@ -47,9 +47,9 @@ class HashMapHolder
     public:
 
         typedef UNORDERED_MAP<ObjectGuid, T*>   MapType;
-        typedef ACE_RW_Thread_Mutex LockType;
-        typedef ACE_Read_Guard<LockType> ReadGuard;
-        typedef ACE_Write_Guard<LockType> WriteGuard;
+        typedef MANGOSR2_MUTEX_MODEL            LockType;
+        typedef ACE_Read_Guard<LockType>        ReadGuard;
+        typedef ACE_Write_Guard<LockType>       WriteGuard;
 
         static void Insert(T* o)
         {
@@ -83,7 +83,7 @@ class HashMapHolder
         static MapType  m_objectMap;
 };
 
-class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor, MaNGOS::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> >
+class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor, MaNGOS::ClassLevelLockable<ObjectAccessor, ACE_Null_Mutex> >
 {
     friend class MaNGOS::OperatorNew<ObjectAccessor>;
 
@@ -129,12 +129,6 @@ class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor,
     private:
 
         Player2CorpsesMapType   i_player2corpse;
-
-        typedef ACE_Thread_Mutex LockType;
-        typedef MaNGOS::GeneralLock<LockType > Guard;
-
-        LockType i_playerGuard;
-        LockType i_corpseGuard;
 };
 
 #define sObjectAccessor ObjectAccessor::Instance()
diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp
index ac3c5897935..afaacb05950 100644
--- a/src/game/ObjectGridLoader.cpp
+++ b/src/game/ObjectGridLoader.cpp
@@ -107,40 +107,16 @@ template<> void addUnitState(Creature *obj, CellPair const& cell_pair)
 }
 
 template <class T>
-void LoadHelper(CellGuidSet const& guid_set, CellPair &cell, GridRefManager<T> &m, uint32 &count, Map* map, GridType& grid)
+void LoadHelper(CellGuidSet const& guid_set, CellPair& cell, GridRefManager<T>& /*m*/, uint32& count, Map* map, GridType& grid, TypeID objectTypeID)
 {
-    BattleGround* bg = map->IsBattleGroundOrArena() ? ((BattleGroundMap*)map)->GetBG() : NULL;
-
     for(CellGuidSet::const_iterator i_guid = guid_set.begin(); i_guid != guid_set.end(); ++i_guid)
     {
-        uint32 guid = *i_guid;
-
-        T* obj = new T;
-        //sLog.outString("DEBUG: LoadHelper from table: %s for (guid: %u) Loading",table,guid);
-        if(!obj->LoadFromDB(guid, map))
-        {
-            delete obj;
-            continue;
-        }
-
-        grid.AddGridObject(obj);
-
-        addUnitState(obj,cell);
-        obj->SetMap(map);
-        obj->AddToWorld();
-        if(obj->isActiveObject())
-            map->AddToActive(obj);
-
-        obj->GetViewPoint().Event_AddedToWorld(&grid);
-
-        if (bg)
-            bg->OnObjectDBLoad(obj);
-
+        map->AddLoadingObject(new LoadingObjectQueueMember(*i_guid, objectTypeID, grid));
         ++count;
     }
 }
 
-void LoadHelper(CellCorpseSet const& cell_corpses, CellPair &cell, CorpseMapType &m, uint32 &count, Map* map, GridType& grid)
+void LoadHelper(CellCorpseSet const& cell_corpses, CellPair& cell, CorpseMapType& /*m*/, uint32& count, Map* map, GridType& grid)
 {
     if(cell_corpses.empty())
         return;
@@ -168,8 +144,7 @@ void LoadHelper(CellCorpseSet const& cell_corpses, CellPair &cell, CorpseMapType
     }
 }
 
-void
-ObjectGridLoader::Visit(GameObjectMapType &m)
+void ObjectGridLoader::Visit(GameObjectMapType &m)
 {
     uint32 x = (i_cell.GridX()*MAX_NUMBER_OF_CELLS) + i_cell.CellX();
     uint32 y = (i_cell.GridY()*MAX_NUMBER_OF_CELLS) + i_cell.CellY();
@@ -178,13 +153,16 @@ ObjectGridLoader::Visit(GameObjectMapType &m)
 
     CellObjectGuids const& cell_guids = sObjectMgr.GetCellObjectGuids(i_map->GetId(), i_map->GetSpawnMode(), cell_id);
 
-    GridType& grid = (*i_map->getNGrid(i_cell.GridX(),i_cell.GridY())) (i_cell.CellX(),i_cell.CellY());
-    LoadHelper(cell_guids.gameobjects, cell_pair, m, i_gameObjects, i_map, grid);
-    LoadHelper(i_map->GetPersistentState()->GetCellObjectGuids(cell_id).gameobjects, cell_pair, m, i_gameObjects, i_map, grid);
+    NGridType* pNGrid = const_cast<NGridType*>(i_map->getNGridWithoutLock(i_cell.GridX(),i_cell.GridY()));
+    if (!pNGrid)
+        return;
+    GridType& grid = (*pNGrid)(i_cell.CellX(),i_cell.CellY());
+
+    LoadHelper(cell_guids.gameobjects, cell_pair, m, i_gameObjects, i_map, grid, TYPEID_GAMEOBJECT);
+    LoadHelper(i_map->GetPersistentState()->GetCellObjectGuids(cell_id).gameobjects, cell_pair, m, i_gameObjects, i_map, grid, TYPEID_GAMEOBJECT);
 }
 
-void
-ObjectGridLoader::Visit(CreatureMapType &m)
+void ObjectGridLoader::Visit(CreatureMapType &m)
 {
     uint32 x = (i_cell.GridX()*MAX_NUMBER_OF_CELLS) + i_cell.CellX();
     uint32 y = (i_cell.GridY()*MAX_NUMBER_OF_CELLS) + i_cell.CellY();
@@ -193,13 +171,16 @@ ObjectGridLoader::Visit(CreatureMapType &m)
 
     CellObjectGuids const& cell_guids = sObjectMgr.GetCellObjectGuids(i_map->GetId(), i_map->GetSpawnMode(), cell_id);
 
-    GridType& grid = (*i_map->getNGrid(i_cell.GridX(),i_cell.GridY())) (i_cell.CellX(),i_cell.CellY());
-    LoadHelper(cell_guids.creatures, cell_pair, m, i_creatures, i_map, grid);
-    LoadHelper(i_map->GetPersistentState()->GetCellObjectGuids(cell_id).creatures, cell_pair, m, i_creatures, i_map, grid);
+    NGridType* pNGrid = const_cast<NGridType*>(i_map->getNGridWithoutLock(i_cell.GridX(),i_cell.GridY()));
+    if (!pNGrid)
+        return;
+    GridType& grid = (*pNGrid)(i_cell.CellX(),i_cell.CellY());
+
+    LoadHelper(cell_guids.creatures, cell_pair, m, i_creatures, i_map, grid, TYPEID_UNIT);
+    LoadHelper(i_map->GetPersistentState()->GetCellObjectGuids(cell_id).creatures, cell_pair, m, i_creatures, i_map, grid, TYPEID_UNIT);
 }
 
-void
-ObjectWorldLoader::Visit(CorpseMapType &m)
+void ObjectWorldLoader::Visit(CorpseMapType &m)
 {
     uint32 x = (i_cell.GridX()*MAX_NUMBER_OF_CELLS) + i_cell.CellX();
     uint32 y = (i_cell.GridY()*MAX_NUMBER_OF_CELLS) + i_cell.CellY();
@@ -208,12 +189,15 @@ ObjectWorldLoader::Visit(CorpseMapType &m)
 
     // corpses are always added to spawn mode 0 and they are spawned by their instance id
     CellObjectGuids const& cell_guids = sObjectMgr.GetCellObjectGuids(i_map->GetId(), 0, cell_id);
-    GridType& grid = (*i_map->getNGrid(i_cell.GridX(),i_cell.GridY())) (i_cell.CellX(),i_cell.CellY());
+    NGridType* pNGrid = const_cast<NGridType*>(i_map->getNGridWithoutLock(i_cell.GridX(),i_cell.GridY()));
+    if (!pNGrid)
+        return;
+    GridType& grid = (*pNGrid)(i_cell.CellX(),i_cell.CellY());
+
     LoadHelper(cell_guids.corpses, cell_pair, m, i_corpses, i_map, grid);
 }
 
-void
-ObjectGridLoader::Load(GridType &grid)
+void ObjectGridLoader::Load(GridType &grid)
 {
     {
         TypeContainerVisitor<ObjectGridLoader, GridTypeMapContainer > loader(*this);
@@ -232,17 +216,17 @@ void ObjectGridLoader::LoadN(void)
 {
     i_gameObjects = 0; i_creatures = 0; i_corpses = 0;
     i_cell.data.Part.cell_y = 0;
-    for(unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x)
+    for (uint32 x = 0; x < MAX_NUMBER_OF_CELLS; ++x)
     {
         i_cell.data.Part.cell_x = x;
-        for(unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y)
+        for (uint32 y = 0; y < MAX_NUMBER_OF_CELLS; ++y)
         {
             i_cell.data.Part.cell_y = y;
             GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> loader;
             loader.Load(i_grid(x, y), *this);
         }
     }
-    DEBUG_LOG("%u GameObjects, %u Creatures, and %u Corpses/Bones loaded for grid %u on map %u", i_gameObjects, i_creatures, i_corpses,i_grid.GetGridId(), i_map->GetId());
+    DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING,"ObjectGridLoader::LoadN %u GameObjects, %u Creatures, and %u Corpses/Bones loaded for grid[%u,%u] on map %u instance %u", i_gameObjects, i_creatures, i_corpses, i_grid.getX(), i_grid.getY(), i_map->GetId(), i_map->GetInstanceId());
 }
 
 void ObjectGridUnloader::MoveToRespawnN()
@@ -269,17 +253,17 @@ void
 ObjectGridUnloader::Visit(GridRefManager<T> &m)
 {
     // remove all cross-reference before deleting
-    for(typename GridRefManager<T>::iterator iter=m.begin(); iter != m.end(); ++iter)
+    for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter)
         iter->getSource()->CleanupsBeforeDelete();
 
-    while(!m.isEmpty())
+    while (!m.isEmpty())
     {
-        T *obj = m.getFirst()->getSource();
+        T* obj = m.getFirst()->getSource();
         // if option set then object already saved at this moment
-        if(!sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY))
+        if (!sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY))
             obj->SaveRespawnTime();
         ///- object must be out of world before delete
-        obj->RemoveFromWorld();
+        obj->RemoveFromWorld(true);
         ///- object will get delinked from the manager when deleted
         delete obj;
     }
diff --git a/src/game/ObjectGuid.cpp b/src/game/ObjectGuid.cpp
index c6aec8953a7..33f6e0cb245 100644
--- a/src/game/ObjectGuid.cpp
+++ b/src/game/ObjectGuid.cpp
@@ -20,9 +20,12 @@
 
 #include "World.h"
 #include "ObjectMgr.h"
+#include "AccountMgr.h"
 
 #include <sstream>
 
+ObjectGuid const ObjectGuid::Null = ObjectGuid();
+
 char const* ObjectGuid::GetTypeName(HighGuid high)
 {
     switch(high)
@@ -39,6 +42,9 @@ char const* ObjectGuid::GetTypeName(HighGuid high)
         case HIGHGUID_MO_TRANSPORT: return "MoTransport";
         case HIGHGUID_INSTANCE:     return "InstanceID";
         case HIGHGUID_GROUP:        return "Group";
+
+        case HIGHGUID_CALENDAR_EVENT: return "Calendar event";
+        case HIGHGUID_INVITE:       return "Calendar invite";
         default:
             return "<unknown>";
     }
@@ -52,7 +58,7 @@ std::string ObjectGuid::GetString() const
     if (IsPlayer())
     {
         std::string name;
-        if (sObjectMgr.GetPlayerNameByGUID(*this, name))
+        if (sAccountMgr.GetPlayerNameByGUID(*this, name))
             str << " " << name;
     }
 
@@ -109,3 +115,6 @@ template uint32 ObjectGuidGenerator<HIGHGUID_DYNAMICOBJECT>::Generate();
 template uint32 ObjectGuidGenerator<HIGHGUID_CORPSE>::Generate();
 template uint32 ObjectGuidGenerator<HIGHGUID_INSTANCE>::Generate();
 template uint32 ObjectGuidGenerator<HIGHGUID_GROUP>::Generate();
+
+template uint32 ObjectGuidGenerator<HIGHGUID_CALENDAR_EVENT>::Generate();
+template uint32 ObjectGuidGenerator<HIGHGUID_INVITE>::Generate();
diff --git a/src/game/ObjectGuid.h b/src/game/ObjectGuid.h
index 9a0a88b9743..7dd7d50faab 100644
--- a/src/game/ObjectGuid.h
+++ b/src/game/ObjectGuid.h
@@ -21,6 +21,7 @@
 
 #include "Common.h"
 #include "ByteBuffer.h"
+#include "LockedVector.h"
 
 #include <functional>
 
@@ -33,21 +34,25 @@ enum TypeID
     TYPEID_PLAYER        = 4,
     TYPEID_GAMEOBJECT    = 5,
     TYPEID_DYNAMICOBJECT = 6,
-    TYPEID_CORPSE        = 7
+    TYPEID_CORPSE        = 7,
+    TYPEID_AIGROUP       = 8,
+    TYPEID_AREATRIGGER   = 9,
+    MAX_TYPE_ID
 };
 
-#define MAX_TYPE_ID        8
 
 enum TypeMask
 {
-    TYPEMASK_OBJECT         = 0x0001,
-    TYPEMASK_ITEM           = 0x0002,
-    TYPEMASK_CONTAINER      = 0x0004,
-    TYPEMASK_UNIT           = 0x0008,                       // players also have it
-    TYPEMASK_PLAYER         = 0x0010,
-    TYPEMASK_GAMEOBJECT     = 0x0020,
-    TYPEMASK_DYNAMICOBJECT  = 0x0040,
-    TYPEMASK_CORPSE         = 0x0080,
+    TYPEMASK_OBJECT         = (1 << TYPEID_OBJECT),
+    TYPEMASK_ITEM           = (1 << TYPEID_ITEM),
+    TYPEMASK_CONTAINER      = (1 << TYPEID_CONTAINER),
+    TYPEMASK_UNIT           = (1 << TYPEID_UNIT),
+    TYPEMASK_PLAYER         = (1 << TYPEID_PLAYER),
+    TYPEMASK_GAMEOBJECT     = (1 << TYPEID_GAMEOBJECT),
+    TYPEMASK_DYNAMICOBJECT  = (1 << TYPEID_DYNAMICOBJECT),
+    TYPEMASK_CORPSE         = (1 << TYPEID_CORPSE),
+    TYPEMASK_AIGROUP        = (1 << TYPEID_AIGROUP),
+    TYPEMASK_AREATRIGGER    = (1 << TYPEID_AREATRIGGER),
 
     // used combinations in Player::GetObjectByTypeMask (TYPEMASK_UNIT case ignore players in call)
     TYPEMASK_CREATURE_OR_GAMEOBJECT = TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT,
@@ -74,6 +79,19 @@ enum HighGuid
     HIGHGUID_MO_TRANSPORT   = 0x1FC,                        // blizz 1FC (for GAMEOBJECT_TYPE_MO_TRANSPORT)
     HIGHGUID_INSTANCE       = 0x1F4,                        // blizz 1F4
     HIGHGUID_GROUP          = 0x1F5,                        // blizz 1F5
+
+    HIGHGUID_BATTLEGROUND   = 0x1F1,                        // new 4.x
+    HIGHGUID_GUILD          = 0x1FF,                        // new 4.x
+
+    // Custom high guids (not found in sniffs! Only for coding convenience!)
+    HIGHGUID_EVENT          = 0xA01,                        // Calendar and guild events (FFU)
+    HIGHGUID_OBJECTEVENT    = 0xA02,                        // local object-attached events (FFU)
+    HIGHGUID_MAPEVENT       = 0xA03,                        // local map-attached events (FFU)
+    HIGHGUID_CALENDAR_EVENT = 0xA06,                        // Calendar events
+    HIGHGUID_INVITE         = 0xA07,                        // Calendar invites
+    HIGHGUID_AREATRIGGER    = 0xA10,                        // AreaTrigger (FFU), possible has real value in 4.x
+    HIGHGUID_WORLDLOCATION  = 0xA11,                        // World location (FFU)
+    HIGHGUID_WORLDSTATE     = 0xA12,                        // WorldState (FFU)
 };
 
 class ObjectGuid;
@@ -143,6 +161,15 @@ class MANGOS_DLL_SPEC ObjectGuid
         bool IsMOTransport()       const { return GetHigh() == HIGHGUID_MO_TRANSPORT;         }
         bool IsInstance()          const { return GetHigh() == HIGHGUID_INSTANCE;             }
         bool IsGroup()             const { return GetHigh() == HIGHGUID_GROUP;                }
+        bool IsPlayerOrPet()       const { return !IsEmpty() && (GetHigh() == HIGHGUID_PLAYER || GetHigh() == HIGHGUID_PET); }
+
+        bool IsEvent()             const { return GetHigh() == HIGHGUID_EVENT || GetHigh() == HIGHGUID_OBJECTEVENT || GetHigh() == HIGHGUID_MAPEVENT; }
+        bool IsAreaTrigger()       const { return GetHigh() == HIGHGUID_AREATRIGGER;          }
+        bool IsWorldState()        const { return GetHigh() == HIGHGUID_WORLDSTATE;           }
+        bool IsLocation()          const { return GetHigh() == HIGHGUID_WORLDLOCATION;        }
+
+        bool IsCalendarEvent()     const { return GetHigh() == HIGHGUID_CALENDAR_EVENT;       }
+        bool IsInvite()            const { return GetHigh() == HIGHGUID_INVITE;               }
 
         static TypeID GetTypeId(HighGuid high)
         {
@@ -158,9 +185,22 @@ class MANGOS_DLL_SPEC ObjectGuid
                 case HIGHGUID_CORPSE:       return TYPEID_CORPSE;
                 case HIGHGUID_MO_TRANSPORT: return TYPEID_GAMEOBJECT;
                 case HIGHGUID_VEHICLE:      return TYPEID_UNIT;
+
+                case HIGHGUID_CALENDAR_EVENT:
+                case HIGHGUID_INVITE:
+                case HIGHGUID_EVENT:
+                case HIGHGUID_OBJECTEVENT:
+                case HIGHGUID_MAPEVENT:     return TYPEID_AIGROUP;
+
+                case HIGHGUID_AREATRIGGER:
+                case HIGHGUID_WORLDLOCATION: return TYPEID_AREATRIGGER;
+
                 // unknown
                 case HIGHGUID_INSTANCE:
                 case HIGHGUID_GROUP:
+                case HIGHGUID_WORLDSTATE:
+                case HIGHGUID_BATTLEGROUND:
+                case HIGHGUID_GUILD:
                 default:                    return TYPEID_OBJECT;
             }
         }
@@ -189,24 +229,47 @@ class MANGOS_DLL_SPEC ObjectGuid
                 case HIGHGUID_MO_TRANSPORT:
                 case HIGHGUID_INSTANCE:
                 case HIGHGUID_GROUP:
+
+                case HIGHGUID_BATTLEGROUND:
+                case HIGHGUID_GUILD:
+
+                case HIGHGUID_AREATRIGGER:
+                case HIGHGUID_WORLDLOCATION:
+
+                case HIGHGUID_CALENDAR_EVENT:
+                case HIGHGUID_INVITE:
                     return false;
+
                 case HIGHGUID_GAMEOBJECT:
                 case HIGHGUID_TRANSPORT:
                 case HIGHGUID_UNIT:
                 case HIGHGUID_PET:
                 case HIGHGUID_VEHICLE:
+
+                case HIGHGUID_EVENT:
+                case HIGHGUID_OBJECTEVENT:
+                case HIGHGUID_MAPEVENT:
+                case HIGHGUID_WORLDSTATE:
+
                 default:
                     return true;
             }
         }
 
-        bool HasEntry() const { return HasEntry(GetHigh()); }
-
     private:                                                // fields
         uint64 m_guid;
+
+    public:
+        bool HasEntry() const { return HasEntry(GetHigh()); }
+        // predefined empty object for safe return by reference
+        static ObjectGuid const Null;
 };
 
-typedef std::set<ObjectGuid> ObjectGuidSet;
+// Some Shared defines
+typedef UNORDERED_SET<ObjectGuid> GuidSet;
+typedef ACE_Based::LockedVector<ObjectGuid> GuidList;
+typedef ACE_Based::LockedVector<ObjectGuid> GuidVector;
+typedef std::queue<ObjectGuid> GuidQueue;
 
 //minimum buffer size for packed guid is 9 bytes
 #define PACKED_GUID_MIN_BUFFER_SIZE 9
diff --git a/src/game/ObjectLock.h b/src/game/ObjectLock.h
new file mode 100644
index 00000000000..d8ded02494e
--- /dev/null
+++ b/src/game/ObjectLock.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOS_MAP_LOCKTYPE_H
+#define MANGOS_MAP_LOCKTYPE_H
+
+#include "Common.h"
+#include "Platform/Define.h"
+#include "Policies/ThreadingModel.h"
+#include "ace/RW_Thread_Mutex.h"
+#include "ace/Thread_Mutex.h"
+
+enum MapLockType
+{
+    MAP_LOCK_TYPE_DEFAULT,
+    MAP_LOCK_TYPE_AURAS,
+    MAP_LOCK_TYPE_MAPOBJECTS,
+    MAP_LOCK_TYPE_MOVEMENT,
+    MAP_LOCK_TYPE_MAX,
+};
+
+typedef   MANGOSR2_MUTEX_MODEL               ObjectLockType;
+typedef   ACE_Read_Guard<ObjectLockType>     ReadGuard;
+typedef   ACE_Write_Guard<ObjectLockType>    WriteGuard;
+
+#ifndef MAPLOCK_READ
+#  define MAPLOCK_READ(OBJ,TYPE) ReadGuard Guard((OBJ)->GetLock(TYPE), true);
+#endif
+
+#ifndef MAPLOCK_READ1
+#  define MAPLOCK_READ1(OBJ,TYPE) ReadGuard Guard1((OBJ)->GetLock(TYPE), true);
+#endif
+
+#ifndef MAPLOCK_READ2
+#  define MAPLOCK_READ2(OBJ,TYPE) ReadGuard Guard2((OBJ)->GetLock(TYPE), true);
+#endif
+
+#ifndef MAPLOCK_WRITE
+#  define MAPLOCK_WRITE(OBJ,TYPE) WriteGuard Guard((OBJ)->GetLock(TYPE), true);
+#endif
+
+#ifndef MAPLOCK_WRITE1
+#  define MAPLOCK_WRITE1(OBJ,TYPE) WriteGuard Guard1((OBJ)->GetLock(TYPE), true);
+#endif
+
+#ifndef MAPLOCK_TRYREAD
+#  define MAPLOCK_TRYREAD(OBJ,TYPE) ReadGuard Guard((OBJ)->GetLock(TYPE), false);
+#endif
+
+#ifndef MAPLOCK_TRYREAD1
+#  define MAPLOCK_TRYREAD1(OBJ,TYPE) ReadGuard Guard1((OBJ)->GetLock(TYPE), false);
+#endif
+
+#ifndef MAPLOCK_TRYWRITE
+#  define MAPLOCK_TRYWRITE(OBJ,TYPE) WriteGuard Guard((OBJ)->GetLock(TYPE), false);
+#endif
+
+#endif
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 89bc8bbfafa..28b3d802c41 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -18,8 +18,8 @@
 
 #include "ObjectMgr.h"
 #include "Database/DatabaseEnv.h"
-#include "Database/SQLStorageImpl.h"
-#include "Policies/SingletonImp.h"
+#include "SystemConfig.h"
+#include "Policies/Singleton.h"
 
 #include "SQLStorages.h"
 #include "Log.h"
@@ -46,6 +46,7 @@
 #include "GossipDef.h"
 #include "Mail.h"
 #include "InstanceData.h"
+#include "GridNotifiers.h"
 
 #include <limits>
 
@@ -106,9 +107,12 @@ LanguageDesc const* GetLanguageDescByID(uint32 lang)
     return NULL;
 }
 
-bool SpellClickInfo::IsFitToRequirements(Player const* player) const
+bool SpellClickInfo::IsFitToRequirements(Player const* player, Creature const* clickedCreature) const
 {
-    if(questStart)
+    if (conditionId)
+        return sObjectMgr.IsPlayerMeetToCondition(conditionId, player, player->GetMap(), clickedCreature, CONDITION_FROM_SPELLCLICK);
+
+    if (questStart)
     {
         // not in expected required quest state
         if (!player || ((!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart)))
@@ -148,10 +152,9 @@ ObjectMgr::ObjectMgr() :
     m_EquipmentSetIds("Equipment set ids"),
     m_GuildIds("Guild ids"),
     m_MailIds("Mail ids"),
-    m_PetNumbers("Pet numbers")
+    m_PetNumbers("Pet numbers"),
+    DBCLocaleIndex(LOCALE_enUS)
 {
-    // Only zero condition left, others will be added while loading DB tables
-    mConditions.resize(1);
 }
 
 ObjectMgr::~ObjectMgr()
@@ -159,6 +162,23 @@ ObjectMgr::~ObjectMgr()
     for( QuestMap::iterator i = mQuestTemplates.begin( ); i != mQuestTemplates.end( ); ++i )
         delete i->second;
 
+    mQuestLocaleMap.clear();
+    mItemLocaleMap.clear();
+    mNpcTextLocaleMap.clear();
+    mCreatureDataMap.clear();
+    mCreatureLocaleMap.clear();
+    mGameObjectDataMap.clear();
+    mGameObjectLocaleMap.clear();
+    mItemLocaleMap.clear();
+    mNpcTextLocaleMap.clear();
+    mPageTextLocaleMap.clear();
+    mMangosStringLocaleMap.clear();
+    mGossipMenuItemsLocaleMap.clear();
+    mPointOfInterestLocaleMap.clear();
+    m_DungeonEncounters.clear();
+    m_mCreatureModelRaceMap.clear();
+    m_GameTeleMap.clear();
+
     for(PetLevelInfoMap::iterator i = petInfo.begin( ); i != petInfo.end( ); ++i )
         delete[] i->second;
 
@@ -171,6 +191,9 @@ ObjectMgr::~ObjectMgr()
             delete[] playerInfo[race][class_].levelInfo;
 
     // free objects
+    for (TransportSet::iterator itr = m_Transports.begin(); itr != m_Transports.end(); ++itr)
+        delete *itr;
+
     for (GroupMap::iterator itr = mGroupMap.begin(); itr != mGroupMap.end(); ++itr)
         delete itr->second;
 
@@ -185,11 +208,23 @@ ObjectMgr::~ObjectMgr()
 
     for (CacheTrainerSpellMap::iterator itr = m_mCacheTrainerSpellMap.begin(); itr != m_mCacheTrainerSpellMap.end(); ++itr)
         itr->second.Clear();
+
+    for (PetScalingDataMap::iterator itr = m_PetScalingData.begin(); itr != m_PetScalingData.end(); ++itr)
+        delete itr->second;
+
+    for (DungeonEncounterMap::iterator itr = m_DungeonEncounters.begin(); itr != m_DungeonEncounters.end(); ++itr)
+        delete itr->second;
 }
 
 Group* ObjectMgr::GetGroupById(uint32 id) const
 {
-    GroupMap::const_iterator itr = mGroupMap.find(id);
+    ObjectGuid guid(HIGHGUID_GROUP,id);
+    return GetGroup(guid);
+}
+
+Group* ObjectMgr::GetGroup(ObjectGuid guid) const
+{
+    GroupMap::const_iterator itr = mGroupMap.find(guid);
     if (itr != mGroupMap.end())
         return itr->second;
 
@@ -223,11 +258,6 @@ ArenaTeam* ObjectMgr::GetArenaTeamByCaptain(ObjectGuid guid) const
     return NULL;
 }
 
-CreatureInfo const* ObjectMgr::GetCreatureTemplate(uint32 id)
-{
-    return sCreatureStorage.LookupEntry<CreatureInfo>(id);
-}
-
 void ObjectMgr::LoadCreatureLocales()
 {
     mCreatureLocaleMap.clear();                              // need for reload case
@@ -444,7 +474,7 @@ void ObjectMgr::LoadPointOfInterestLocales()
     sLog.outString(">> Loaded " SIZEFMTD " points_of_interest locale strings", mPointOfInterestLocaleMap.size());
 }
 
-struct SQLCreatureLoader : public SQLStorageLoaderBase<SQLCreatureLoader>
+struct SQLCreatureLoader : public SQLStorageLoaderBase<SQLCreatureLoader, SQLStorage>
 {
     template<class D>
     void convert_from_str(uint32 /*field_pos*/, char const *src, D &dst)
@@ -458,14 +488,14 @@ void ObjectMgr::LoadCreatureTemplates()
     SQLCreatureLoader loader;
     loader.Load(sCreatureStorage);
 
-    sLog.outString( ">> Loaded %u creature definitions", sCreatureStorage.RecordCount );
+    sLog.outString(">> Loaded %u creature definitions", sCreatureStorage.GetRecordCount());
     sLog.outString();
 
     std::set<uint32> difficultyEntries[MAX_DIFFICULTY - 1]; // already loaded difficulty 1 value in creatures
     std::set<uint32> hasDifficultyEntries[MAX_DIFFICULTY - 1]; // already loaded creatures with difficulty 1  values
 
     // check data correctness
-    for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i)
+    for (uint32 i = 1; i < sCreatureStorage.GetMaxEntry(); ++i)
     {
         CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i);
         if (!cInfo)
@@ -481,14 +511,14 @@ void ObjectMgr::LoadCreatureTemplates()
             CreatureInfo const* difficultyInfo = GetCreatureTemplate(cInfo->DifficultyEntry[diff]);
             if (!difficultyInfo)
             {
-                sLog.outErrorDb("Creature (Entry: %u) have `difficulty_entry_%u`=%u but creature entry %u not exist.",
+                sLog.outErrorDb("Creature (Entry: %u) have `DifficultyEntry%u`=%u but creature entry %u not exist.",
                     i, diff + 1, cInfo->DifficultyEntry[diff], cInfo->DifficultyEntry[diff]);
                 continue;
             }
 
             if (difficultyEntries[diff].find(i) != difficultyEntries[diff].end())
             {
-                sLog.outErrorDb("Creature (Entry: %u) listed as difficulty %u but have value in `difficulty_entry_%u`.", i, diff + 1, diff + 1);
+                sLog.outErrorDb("Creature (Entry: %u) listed as difficulty %u but have value in `DifficultyEntry%u`.", i, diff + 1, diff + 1);
                 continue;
             }
 
@@ -504,7 +534,7 @@ void ObjectMgr::LoadCreatureTemplates()
 
                 if (hasDifficultyEntries[diff2].find(cInfo->DifficultyEntry[diff]) != hasDifficultyEntries[diff2].end())
                 {
-                    sLog.outErrorDb("Creature (Entry: %u) have `difficulty_entry_%u`=%u but creature entry %u have difficulty %u entry also.",
+                    sLog.outErrorDb("Creature (Entry: %u) have `DifficultyEntry%u`=%u but creature entry %u have difficulty %u entry also.",
                         i, diff + 1, cInfo->DifficultyEntry[diff], cInfo->DifficultyEntry[diff], diff2 + 1);
                     continue;
                 }
@@ -513,40 +543,40 @@ void ObjectMgr::LoadCreatureTemplates()
             if (!ok2)
                 continue;
 
-            if (cInfo->unit_class != difficultyInfo->unit_class)
+            if (cInfo->UnitClass != difficultyInfo->UnitClass)
             {
-                sLog.outErrorDb("Creature (Entry: %u, class %u) has different `unit_class` in difficulty %u mode (Entry: %u, class %u).",
-                    i, cInfo->unit_class, diff + 1, cInfo->DifficultyEntry[diff], difficultyInfo->unit_class);
+                sLog.outErrorDb("Creature (Entry: %u, class %u) has different `UnitClass` in difficulty %u mode (Entry: %u, class %u).",
+                                i, cInfo->UnitClass, diff + 1, cInfo->DifficultyEntry[diff], difficultyInfo->UnitClass);
                 continue;
             }
 
-            if (cInfo->npcflag != difficultyInfo->npcflag)
+            if (cInfo->NpcFlags != difficultyInfo->NpcFlags)
             {
-                sLog.outErrorDb("Creature (Entry: %u) has different `npcflag` in difficulty %u mode (Entry: %u).", i, diff + 1, cInfo->DifficultyEntry[diff]);
+                sLog.outErrorDb("Creature (Entry: %u) has different `NpcFlags` in difficulty %u mode (Entry: %u).", i, diff + 1, cInfo->DifficultyEntry[diff]);
                 continue;
             }
 
-            if (cInfo->trainer_class != difficultyInfo->trainer_class)
+            if (cInfo->TrainerClass != difficultyInfo->TrainerClass)
             {
-                sLog.outErrorDb("Creature (Entry: %u) has different `trainer_class` in difficulty %u mode (Entry: %u).", i, diff + 1, cInfo->DifficultyEntry[diff]);
+                sLog.outErrorDb("Creature (Entry: %u) has different `TrainerClass` in difficulty %u mode (Entry: %u).", i, diff + 1, cInfo->DifficultyEntry[diff]);
                 continue;
             }
 
-            if (cInfo->trainer_race != difficultyInfo->trainer_race)
+            if (cInfo->TrainerRace != difficultyInfo->TrainerRace)
             {
-                sLog.outErrorDb("Creature (Entry: %u) has different `trainer_race` in difficulty %u mode (Entry: %u).", i, diff + 1, cInfo->DifficultyEntry[diff]);
+                sLog.outErrorDb("Creature (Entry: %u) has different `TrainerRace` in difficulty %u mode (Entry: %u).", i, diff + 1, cInfo->DifficultyEntry[diff]);
                 continue;
             }
 
-            if (cInfo->trainer_type != difficultyInfo->trainer_type)
+            if (cInfo->TrainerType != difficultyInfo->TrainerType)
             {
-                sLog.outErrorDb("Creature (Entry: %u) has different `trainer_type` in difficulty %u mode (Entry: %u).", i, diff + 1, cInfo->DifficultyEntry[diff]);
+                sLog.outErrorDb("Creature (Entry: %u) has different `TrainerType` in difficulty %u mode (Entry: %u).", i, diff + 1, cInfo->DifficultyEntry[diff]);
                 continue;
             }
 
-            if (cInfo->trainer_spell != difficultyInfo->trainer_spell)
+            if (cInfo->TrainerSpell != difficultyInfo->TrainerSpell)
             {
-                sLog.outErrorDb("Creature (Entry: %u) has different `trainer_spell` in difficulty %u mode (Entry: %u).", i, diff + 1, cInfo->DifficultyEntry[diff]);
+                sLog.outErrorDb("Creature (Entry: %u) has different `TrainerSpell` in difficulty %u mode (Entry: %u).", i, diff + 1, cInfo->DifficultyEntry[diff]);
                 continue;
             }
 
@@ -571,13 +601,13 @@ void ObjectMgr::LoadCreatureTemplates()
         if (!ok)
             continue;
 
-        FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->faction_A);
+        FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->FactionAlliance);
         if (!factionTemplate)
-            sLog.outErrorDb("Creature (Entry: %u) has nonexistent faction_A template (%u)", cInfo->Entry, cInfo->faction_A);
+            sLog.outErrorDb("Creature (Entry: %u) has nonexistent `FactionAlliance` template (%u)", cInfo->Entry, cInfo->FactionAlliance);
 
-        factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->faction_H);
+        factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->FactionHorde);
         if (!factionTemplate)
-            sLog.outErrorDb("Creature (Entry: %u) has nonexistent faction_H template (%u)", cInfo->Entry, cInfo->faction_H);
+            sLog.outErrorDb("Creature (Entry: %u) has nonexistent `FactionHorde` template (%u)", cInfo->Entry, cInfo->FactionHorde);
 
         for(int k = 0; k < MAX_KILL_CREDIT; ++k)
         {
@@ -601,7 +631,7 @@ void ObjectMgr::LoadCreatureTemplates()
                 CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->ModelId[i]);
                 if(!displayEntry)
                 {
-                    sLog.outErrorDb("Creature (Entry: %u) has nonexistent modelid_%d (%u), can crash client", cInfo->Entry, i+1, cInfo->ModelId[i]);
+                    sLog.outErrorDb("Creature (Entry: %u) has nonexistent `ModelId%d` (%u), can crash client", cInfo->Entry, i + 1, cInfo->ModelId[i]);
                     const_cast<CreatureInfo*>(cInfo)->ModelId[i] = 0;
                 }
                 else if(!displayScaleEntry)
@@ -609,109 +639,144 @@ void ObjectMgr::LoadCreatureTemplates()
 
                 CreatureModelInfo const* minfo = sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->ModelId[i]);
                 if (!minfo)
-                    sLog.outErrorDb("Creature (Entry: %u) are using modelid_%d (%u), but creature_model_info are missing for this model.", cInfo->Entry, i+1, cInfo->ModelId[i]);
+                    sLog.outErrorDb("Creature (Entry: %u) are using `ModelId%d` (%u), but creature_model_info are missing for this model.", cInfo->Entry, i + 1, cInfo->ModelId[i]);
             }
         }
 
         if (!displayScaleEntry)
-            sLog.outErrorDb("Creature (Entry: %u) has nonexistent modelid in modelid_1/modelid_2/modelid_3/modelid_4", cInfo->Entry);
+            sLog.outErrorDb("Creature (Entry: %u) has nonexistent modelid in `ModelId1`/`ModelId2`/ModelId3`/`ModelId4`", cInfo->Entry);
+
+        if (!cInfo->MinLevel)
+        {
+            sLog.outErrorDb("Creature (Entry: %u) has invalid `MinLevel`, set to 1", cInfo->Entry);
+            const_cast<CreatureInfo*>(cInfo)->MinLevel = 1;
+        }
+
+        if (cInfo->MinLevel > cInfo->MaxLevel)
+        {
+            sLog.outErrorDb("Creature (Entry: %u) has invalid `MaxLevel`, using `MinLevel` value instead", cInfo->Entry);
+            const_cast<CreatureInfo*>(cInfo)->MaxLevel = cInfo->MinLevel;
+        }
+
+        if (cInfo->MinLevel > DEFAULT_MAX_CREATURE_LEVEL)
+        {
+            sLog.outErrorDb("Creature (Entry: %u) `MinLevel` exceeds maximum allowed value of '%u'", cInfo->Entry, uint32(DEFAULT_MAX_CREATURE_LEVEL));
+            const_cast<CreatureInfo*>(cInfo)->MinLevel = uint32(DEFAULT_MAX_CREATURE_LEVEL);
+        }
+
+        if (cInfo->MaxLevel > DEFAULT_MAX_CREATURE_LEVEL)
+        {
+            sLog.outErrorDb("Creature (Entry: %u) `MaxLevel` exceeds maximum allowed value of '%u'", cInfo->Entry, uint32(DEFAULT_MAX_CREATURE_LEVEL));
+            const_cast<CreatureInfo*>(cInfo)->MaxLevel = uint32(DEFAULT_MAX_CREATURE_LEVEL);
+        }
+
+        if (cInfo->Expansion > MAX_EXPANSION)
+        {
+            sLog.outErrorDb("Creature (Entry: %u) `Expansion(%u)` is not correct", cInfo->Entry, uint32(MAX_EXPANSION));
+            const_cast<CreatureInfo*>(cInfo)->Expansion = -1;
+        }
 
         // use below code for 0-checks for unit_class
-        if (!cInfo->unit_class)
-            ERROR_DB_STRICT_LOG("Creature (Entry: %u) not has proper unit_class(%u) for creature_template", cInfo->Entry, cInfo->unit_class);
-        else if (((1 << (cInfo->unit_class-1)) & CLASSMASK_ALL_CREATURES) == 0)
-            sLog.outErrorDb("Creature (Entry: %u) has invalid unit_class(%u) for creature_template", cInfo->Entry, cInfo->unit_class);
+        if (!cInfo->UnitClass || (((1 << (cInfo->UnitClass - 1)) & CLASSMASK_ALL_CREATURES) == 0))
+        {
+            sLog.outErrorDb("Creature (Entry: %u) does not have proper `UnitClass(%u)` in creature_template", cInfo->Entry, cInfo->UnitClass);
+            const_cast<CreatureInfo*>(cInfo)->Expansion = -1;
+        }
+
+        if (cInfo->Expansion >= 0)
+        {
+             for (uint32 level = cInfo->MinLevel; level <= cInfo->MaxLevel; ++level)
+             {
+                 if (!GetCreatureClassLvlStats(level, cInfo->UnitClass, cInfo->Expansion))
+                 {
+                     sLog.outErrorDb("Creature (Entry: %u), level(%u) has no data in `creature_template_classlevelstats`", cInfo->Entry, level);
+                     const_cast<CreatureInfo*>(cInfo)->Expansion = -1;
+                     break;
+                 }
+             }
+        }
 
-        if(cInfo->dmgschool >= MAX_SPELL_SCHOOL)
+        if (cInfo->DamageSchool >= MAX_SPELL_SCHOOL)
         {
-            sLog.outErrorDb("Creature (Entry: %u) has invalid spell school value (%u) in `dmgschool`",cInfo->Entry,cInfo->dmgschool);
-            const_cast<CreatureInfo*>(cInfo)->dmgschool = SPELL_SCHOOL_NORMAL;
+            sLog.outErrorDb("Creature (Entry: %u) has invalid spell school value (%u) in `DamageSchool`", cInfo->Entry, cInfo->DamageSchool);
+            const_cast<CreatureInfo*>(cInfo)->DamageSchool = SPELL_SCHOOL_NORMAL;
         }
 
-        if(cInfo->baseattacktime == 0)
-            const_cast<CreatureInfo*>(cInfo)->baseattacktime  = BASE_ATTACK_TIME;
+        if (cInfo->MeleeBaseAttackTime == 0)
+            const_cast<CreatureInfo*>(cInfo)->MeleeBaseAttackTime  = BASE_ATTACK_TIME;
 
-        if(cInfo->rangeattacktime == 0)
-            const_cast<CreatureInfo*>(cInfo)->rangeattacktime = BASE_ATTACK_TIME;
+        if (cInfo->RangedBaseAttackTime == 0)
+            const_cast<CreatureInfo*>(cInfo)->RangedBaseAttackTime = BASE_ATTACK_TIME;
 
-        if(cInfo->npcflag & UNIT_NPC_FLAG_SPELLCLICK)
+        if (cInfo->NpcFlags & UNIT_NPC_FLAG_SPELLCLICK)
         {
-            sLog.outErrorDb("Creature (Entry: %u) has dynamic flag UNIT_NPC_FLAG_SPELLCLICK (%u) set, it expect to be set by code base at `npc_spellclick_spells` content.",cInfo->Entry,UNIT_NPC_FLAG_SPELLCLICK);
-            const_cast<CreatureInfo*>(cInfo)->npcflag &= ~UNIT_NPC_FLAG_SPELLCLICK;
+            sLog.outErrorDb("Creature (Entry: %u) has dynamic flag UNIT_NPC_FLAG_SPELLCLICK (%u) set, it expect to be set by code base at `npc_spellclick_spells` content.", cInfo->Entry, UNIT_NPC_FLAG_SPELLCLICK);
+            const_cast<CreatureInfo*>(cInfo)->NpcFlags &= ~UNIT_NPC_FLAG_SPELLCLICK;
         }
 
-        if((cInfo->npcflag & UNIT_NPC_FLAG_TRAINER) && cInfo->trainer_type >= MAX_TRAINER_TYPE)
-            sLog.outErrorDb("Creature (Entry: %u) has wrong trainer type %u",cInfo->Entry,cInfo->trainer_type);
+        if ((cInfo->NpcFlags & UNIT_NPC_FLAG_TRAINER) && cInfo->TrainerType >= MAX_TRAINER_TYPE)
+            sLog.outErrorDb("Creature (Entry: %u) has wrong `TrainerType(%u)`", cInfo->Entry, cInfo->TrainerType);
 
-        if(cInfo->type && !sCreatureTypeStore.LookupEntry(cInfo->type))
+        if (cInfo->CreatureType && !sCreatureTypeStore.LookupEntry(cInfo->CreatureType))
         {
-            sLog.outErrorDb("Creature (Entry: %u) has invalid creature type (%u) in `type`",cInfo->Entry,cInfo->type);
-            const_cast<CreatureInfo*>(cInfo)->type = CREATURE_TYPE_HUMANOID;
+            sLog.outErrorDb("Creature (Entry: %u) has invalid `CreatureType(%u)`", cInfo->Entry, cInfo->CreatureType);
+            const_cast<CreatureInfo*>(cInfo)->CreatureType = CREATURE_TYPE_HUMANOID;
         }
 
         // must exist or used hidden but used in data horse case
-        if(cInfo->family && !sCreatureFamilyStore.LookupEntry(cInfo->family) && cInfo->family != CREATURE_FAMILY_HORSE_CUSTOM )
+        if (cInfo->Family && !sCreatureFamilyStore.LookupEntry(cInfo->Family) && cInfo->Family != CREATURE_FAMILY_HORSE_CUSTOM)
         {
-            sLog.outErrorDb("Creature (Entry: %u) has invalid creature family (%u) in `family`",cInfo->Entry,cInfo->family);
-            const_cast<CreatureInfo*>(cInfo)->family = 0;
+            sLog.outErrorDb("Creature (Entry: %u) has invalid creature family (%u) in `Family`", cInfo->Entry, cInfo->Family);
+            const_cast<CreatureInfo*>(cInfo)->Family = 0;
         }
 
-        if(cInfo->InhabitType <= 0 || cInfo->InhabitType > INHABIT_ANYWHERE)
+        if (cInfo->InhabitType <= 0 || cInfo->InhabitType > INHABIT_ANYWHERE)
         {
-            sLog.outErrorDb("Creature (Entry: %u) has wrong value (%u) in `InhabitType`, creature will not correctly walk/swim/fly",cInfo->Entry,cInfo->InhabitType);
+            sLog.outErrorDb("Creature (Entry: %u) has wrong value (%u) in `InhabitType`, creature will not correctly walk/swim/fly", cInfo->Entry, cInfo->InhabitType);
             const_cast<CreatureInfo*>(cInfo)->InhabitType = INHABIT_ANYWHERE;
         }
 
-        if(cInfo->PetSpellDataId)
+        if (cInfo->PetSpellDataId)
         {
             CreatureSpellDataEntry const* spellDataId = sCreatureSpellDataStore.LookupEntry(cInfo->PetSpellDataId);
-            if(!spellDataId)
-                sLog.outErrorDb("Creature (Entry: %u) has non-existing PetSpellDataId (%u)", cInfo->Entry, cInfo->PetSpellDataId);
-        }
-
-        for(int j = 0; j < CREATURE_MAX_SPELLS; ++j)
-        {
-            if(cInfo->spells[j] && !sSpellStore.LookupEntry(cInfo->spells[j]))
-            {
-                sLog.outErrorDb("Creature (Entry: %u) has non-existing Spell%d (%u), set to 0", cInfo->Entry, j+1,cInfo->spells[j]);
-                const_cast<CreatureInfo*>(cInfo)->spells[j] = 0;
-            }
+            if (!spellDataId)
+                sLog.outErrorDb("Creature (Entry: %u) has non-existing `PetSpellDataId(%u)`", cInfo->Entry, cInfo->PetSpellDataId);
         }
 
-        if(cInfo->MovementType >= MAX_DB_MOTION_TYPE)
+        if (cInfo->MovementType >= MAX_DB_MOTION_TYPE)
         {
-            sLog.outErrorDb("Creature (Entry: %u) has wrong movement generator type (%u), ignore and set to IDLE.",cInfo->Entry,cInfo->MovementType);
+            sLog.outErrorDb("Creature (Entry: %u) has wrong movement generator type (%u) set in `MovementType`, ignore and set to IDLE.", cInfo->Entry, cInfo->MovementType);
             const_cast<CreatureInfo*>(cInfo)->MovementType = IDLE_MOTION_TYPE;
         }
 
-        if (cInfo->vehicleId && !sVehicleStore.LookupEntry(cInfo->vehicleId))
+        if (cInfo->VehicleTemplateId && !sVehicleStore.LookupEntry(cInfo->VehicleTemplateId))
         {
-            sLog.outErrorDb("Creature (Entry: %u) has non-existing vehicle_id (%u), set to 0.", cInfo->Entry, cInfo->vehicleId);
-            const_cast<CreatureInfo*>(cInfo)->vehicleId = 0;
+            sLog.outErrorDb("Creature (Entry: %u) has non-existing `VehicleTemplateId(%u)`, set to 0.", cInfo->Entry, cInfo->VehicleTemplateId);
+            const_cast<CreatureInfo*>(cInfo)->VehicleTemplateId = 0;
         }
 
-        if(cInfo->equipmentId > 0)                          // 0 no equipment
+        if (cInfo->EquipmentTemplateId > 0)                         // 0 no equipment
         {
-            if(!GetEquipmentInfo(cInfo->equipmentId))
+            if (!GetEquipmentInfo(cInfo->EquipmentTemplateId))
             {
-                sLog.outErrorDb("Table `creature_template` have creature (Entry: %u) with equipment_id %u not found in table `creature_equip_template`, set to no equipment.", cInfo->Entry, cInfo->equipmentId);
-                const_cast<CreatureInfo*>(cInfo)->equipmentId = 0;
+                sLog.outErrorDb("Table `creature_template` have creature (Entry: %u) with `EquipmentTemplateId(%u)` not found in table `creature_equip_template`, set to no equipment.", cInfo->Entry, cInfo->EquipmentTemplateId);
+                const_cast<CreatureInfo*>(cInfo)->EquipmentTemplateId = 0;
             }
         }
 
-        if(cInfo->vendorId > 0)
+        if (cInfo->VendorTemplateId > 0)
         {
-            if(!(cInfo->npcflag & UNIT_NPC_FLAG_VENDOR))
-                sLog.outErrorDb("Table `creature_template` have creature (Entry: %u) with vendor_id %u but not have flag UNIT_NPC_FLAG_VENDOR (%u), vendor items will ignored.", cInfo->Entry, cInfo->vendorId, UNIT_NPC_FLAG_VENDOR);
+            if (!(cInfo->NpcFlags & UNIT_NPC_FLAG_VENDOR))
+                sLog.outErrorDb("Table `creature_template` have creature (Entry: %u) with `VendorTemplateId(%u)` but not have flag UNIT_NPC_FLAG_VENDOR (%u), vendor items will ignored.", cInfo->Entry, cInfo->VendorTemplateId, UNIT_NPC_FLAG_VENDOR);
         }
 
         /// if not set custom creature scale then load scale from CreatureDisplayInfo.dbc
-        if(cInfo->scale <= 0.0f)
+        if (cInfo->Scale <= 0.0f)
         {
-            if(displayScaleEntry)
-                const_cast<CreatureInfo*>(cInfo)->scale = displayScaleEntry->scale;
+            if (displayScaleEntry)
+                const_cast<CreatureInfo*>(cInfo)->Scale = displayScaleEntry->scale;
             else
-                const_cast<CreatureInfo*>(cInfo)->scale = DEFAULT_OBJECT_SCALE;
+                const_cast<CreatureInfo*>(cInfo)->Scale = DEFAULT_OBJECT_SCALE;
         }
     }
 }
@@ -763,6 +828,23 @@ void ObjectMgr::ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const*
             continue;
         }
 
+        if (!IsSpellAppliesAura(AdditionalSpellInfo))
+        {
+            sLog.outDetail("Creature (%s: %u) has spell %u defined in `auras` field in `%s, but spell doesn't apply an aura`.", guidEntryStr, addon->guidOrEntry, cAura, table);
+        }
+
+        // TODO: Remove LogFilter check after more research
+        if (!sLog.HasLogFilter(LOG_FILTER_DB_STRICTED_CHECK) && !IsOnlySelfTargeting(AdditionalSpellInfo))
+        {
+            sLog.outDetail("Creature (%s: %u) has spell %u defined in `auras` field in `%s, but spell is no self-only spell`.", guidEntryStr, addon->guidOrEntry, cAura, table);
+        }
+
+        if (IsSpellHaveAura(AdditionalSpellInfo, SPELL_AURA_CONTROL_VEHICLE))
+        {
+            sLog.outErrorDb("Creature (%s: %u) has spell %u defined in `auras` field in `%s, but vehicle control spells are not suitable for _addon.auras handling`.", guidEntryStr, addon->guidOrEntry, cAura, table);
+            continue;
+        }
+
         if (std::find(&addon->auras[0], &addon->auras[i], cAura) != &addon->auras[i])
         {
             sLog.outErrorDb("Creature (%s: %u) has duplicate spell %u defined in `auras` field in `%s`.", guidEntryStr, addon->guidOrEntry, cAura, table);
@@ -780,11 +862,11 @@ void ObjectMgr::LoadCreatureAddons(SQLStorage& creatureaddons, char const* entry
 {
     creatureaddons.Load();
 
-    sLog.outString(">> Loaded %u %s", creatureaddons.RecordCount, comment);
+    sLog.outString(">> Loaded %u %s", creatureaddons.GetRecordCount(), comment);
     sLog.outString();
 
     // check data correctness and convert 'auras'
-    for(uint32 i = 1; i < creatureaddons.MaxEntry; ++i)
+    for (uint32 i = 1; i < creatureaddons.GetMaxEntry(); ++i)
     {
         CreatureDataAddon const* addon = creatureaddons.LookupEntry<CreatureDataAddon>(i);
         if(!addon)
@@ -817,30 +899,118 @@ void ObjectMgr::LoadCreatureAddons()
     LoadCreatureAddons(sCreatureInfoAddonStorage,"Entry","creature template addons");
 
     // check entry ids
-    for(uint32 i = 1; i < sCreatureInfoAddonStorage.MaxEntry; ++i)
-        if(CreatureDataAddon const* addon = sCreatureInfoAddonStorage.LookupEntry<CreatureDataAddon>(i))
-            if(!sCreatureStorage.LookupEntry<CreatureInfo>(addon->guidOrEntry))
-                sLog.outErrorDb("Creature (Entry: %u) does not exist but has a record in `%s`",addon->guidOrEntry, sCreatureInfoAddonStorage.GetTableName());
+    for (uint32 i = 1; i < sCreatureInfoAddonStorage.GetMaxEntry(); ++i)
+        if (CreatureDataAddon const* addon = sCreatureInfoAddonStorage.LookupEntry<CreatureDataAddon>(i))
+            if (!sCreatureStorage.LookupEntry<CreatureInfo>(addon->guidOrEntry))
+                sLog.outErrorDb("Creature (Entry: %u) does not exist but has a record in `%s`", addon->guidOrEntry, sCreatureInfoAddonStorage.GetTableName());
 
     LoadCreatureAddons(sCreatureDataAddonStorage,"GUID","creature addons");
 
     // check entry ids
-    for(uint32 i = 1; i < sCreatureDataAddonStorage.MaxEntry; ++i)
-        if(CreatureDataAddon const* addon = sCreatureDataAddonStorage.LookupEntry<CreatureDataAddon>(i))
-            if(mCreatureDataMap.find(addon->guidOrEntry)==mCreatureDataMap.end())
-                sLog.outErrorDb("Creature (GUID: %u) does not exist but has a record in `creature_addon`",addon->guidOrEntry);
+    for (uint32 i = 1; i < sCreatureDataAddonStorage.GetMaxEntry(); ++i)
+        if (CreatureDataAddon const* addon = sCreatureDataAddonStorage.LookupEntry<CreatureDataAddon>(i))
+            if (mCreatureDataMap.find(addon->guidOrEntry) == mCreatureDataMap.end())
+                sLog.outErrorDb("Creature (GUID: %u) does not exist but has a record in `creature_addon`", addon->guidOrEntry);
+}
+
+void ObjectMgr::LoadCreatureClassLvlStats()
+{
+    // initialize data array
+    memset(&m_creatureClassLvlStats, 0, sizeof(m_creatureClassLvlStats));
+
+    std::string queryStr = "SELECT Class, Level, BaseMana, BaseMeleeAttackPower, BaseRangedAttackPower, BaseArmor";
+
+    std::string expData = "";
+    for (int i = 0; i <= MAX_EXPANSION; ++i)
+    {
+        std::ostringstream str;
+        str << ", BaseHealthExp" << i << ", BaseDamageExp" << i;
+        expData += str.str();
+    }
+
+    queryStr += expData + " FROM creature_template_classlevelstats ORDER BY Class, Level";
+
+    QueryResult* result = WorldDatabase.Query(queryStr.c_str());
+
+    if (!result)
+    {
+        BarGoLink bar(1);
+
+        bar.step();
+
+        sLog.outString();
+        sLog.outErrorDb("DB table `creature_template_classlevelstats` is empty.");
+        return;
+    }
+
+    BarGoLink bar(result->GetRowCount());
+    uint32 totalRow = result->GetRowCount();
+    uint32 storedRow = 0;
+
+    do
+    {
+        Field* fields = result->Fetch();
+        bar.step();
+
+        uint32 creatureClass               = fields[0].GetUInt32();
+        uint32 creatureLevel               = fields[1].GetUInt32();
+
+        if (creatureLevel == 0 || creatureLevel > DEFAULT_MAX_CREATURE_LEVEL)
+        {
+            sLog.outErrorDb("Found stats for creature level [%u], incorrect level for this core. Skip!", creatureLevel);
+            continue;
+        }
+
+        if (((1 << (creatureClass - 1)) & CLASSMASK_ALL_CREATURES) == 0)
+        {
+            sLog.outErrorDb("Found stats for creature class [%u], incorrect class for this core. Skip!", creatureClass);
+            continue;
+        }
+
+        uint32  baseMana                   = fields[2].GetUInt32();
+        float   baseMeleeAttackPower       = fields[3].GetFloat();
+        float   baseRangedAttackPower      = fields[4].GetFloat();
+        uint32  baseArmor                  = fields[5].GetUInt32();
+
+        for (int i = 0; i <= MAX_EXPANSION; ++i)
+        {
+            CreatureClassLvlStats &cCLS = m_creatureClassLvlStats[creatureLevel][classToIndex[creatureClass]][i];
+
+            cCLS.BaseMana                   = baseMana;
+            cCLS.BaseMeleeAttackPower       = baseMeleeAttackPower;
+            cCLS.BaseRangedAttackPower      = baseRangedAttackPower;
+            cCLS.BaseArmor                  = baseArmor;
+
+            cCLS.BaseHealth = fields[6 + (i * 2)].GetUInt32();
+            cCLS.BaseDamage = fields[7 + (i * 2)].GetFloat();
+        }
+        ++storedRow;
+    }
+    while (result->NextRow());
+    delete result;
+
+    sLog.outString();
+    sLog.outString(">> Found %u creature stats definitions.", storedRow);
 }
 
-EquipmentInfo const* ObjectMgr::GetEquipmentInfo(uint32 entry)
+CreatureClassLvlStats const* ObjectMgr::GetCreatureClassLvlStats(uint32 level, uint32 unitClass, int32 expansion) const
 {
-    return sEquipmentStorage.LookupEntry<EquipmentInfo>(entry);
+    if (expansion < 0)
+        return NULL;
+
+    CreatureClassLvlStats const* cCLS = &m_creatureClassLvlStats[level][classToIndex[unitClass]][expansion];
+
+    if (cCLS->BaseHealth != 0 && cCLS->BaseDamage > 0.1f)
+        return cCLS;
+
+    return NULL;
 }
 
 void ObjectMgr::LoadEquipmentTemplates()
 {
     sEquipmentStorage.Load();
 
-    for(uint32 i=0; i < sEquipmentStorage.MaxEntry; ++i)
+    for (uint32 i = 0; i < sEquipmentStorage.GetMaxEntry(); ++i)
     {
         EquipmentInfo const* eqInfo = sEquipmentStorage.LookupEntry<EquipmentInfo>(i);
 
@@ -877,35 +1047,30 @@ void ObjectMgr::LoadEquipmentTemplates()
         }
     }
 
-    sLog.outString( ">> Loaded %u equipment template", sEquipmentStorage.RecordCount );
+    sLog.outString(">> Loaded %u equipment template", sEquipmentStorage.GetRecordCount());
     sLog.outString();
 }
 
-CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelid)
-{
-    return sCreatureModelStorage.LookupEntry<CreatureModelInfo>(modelid);
-}
-
 // generally models that does not have a gender(2), or has alternative model for same gender
-uint32 ObjectMgr::GetCreatureModelAlternativeModel(uint32 modelId)
+uint32 ObjectMgr::GetCreatureModelAlternativeModel(uint32 modelId) const
 {
-    if (const CreatureModelInfo *modelInfo = GetCreatureModelInfo(modelId))
+    if (const CreatureModelInfo* modelInfo = GetCreatureModelInfo(modelId))
         return modelInfo->modelid_alternative;
 
     return 0;
 }
 
-CreatureModelInfo const* ObjectMgr::GetCreatureModelRandomGender(uint32 display_id)
+CreatureModelInfo const* ObjectMgr::GetCreatureModelRandomGender(uint32 display_id) const
 {
-    CreatureModelInfo const *minfo = GetCreatureModelInfo(display_id);
-    if(!minfo)
+    CreatureModelInfo const* minfo = GetCreatureModelInfo(display_id);
+    if (!minfo)
         return NULL;
 
     // If a model for another gender exists, 50% chance to use it
-    if(minfo->modelid_other_gender != 0 && urand(0,1) == 0)
+    if (minfo->modelid_other_gender != 0 && urand(0, 1) == 0)
     {
-        CreatureModelInfo const *minfo_tmp = GetCreatureModelInfo(minfo->modelid_other_gender);
-        if(!minfo_tmp)
+        CreatureModelInfo const* minfo_tmp = GetCreatureModelInfo(minfo->modelid_other_gender);
+        if (!minfo_tmp)
         {
             sLog.outErrorDb("Model (Entry: %u) has modelid_other_gender %u not found in table `creature_model_info`. ", minfo->modelid, minfo->modelid_other_gender);
             return minfo;                                   // not fatal, just use the previous one
@@ -947,7 +1112,7 @@ void ObjectMgr::LoadCreatureModelInfo()
     sCreatureModelStorage.Load();
 
     // post processing
-    for(uint32 i = 1; i < sCreatureModelStorage.MaxEntry; ++i)
+    for (uint32 i = 1; i < sCreatureModelStorage.GetMaxEntry(); ++i)
     {
         CreatureModelInfo const *minfo = sCreatureModelStorage.LookupEntry<CreatureModelInfo>(i);
         if (!minfo)
@@ -1049,7 +1214,7 @@ void ObjectMgr::LoadCreatureModelInfo()
 
     }
 
-    sLog.outString( ">> Loaded %u creature model based info", sCreatureModelStorage.RecordCount );
+    sLog.outString(">> Loaded %u creature model based info", sCreatureModelStorage.GetRecordCount());
     sLog.outString();
 }
 
@@ -1201,7 +1366,7 @@ void ObjectMgr::LoadCreatures()
 
     // build single time for check creature data
     std::set<uint32> difficultyCreatures[MAX_DIFFICULTY - 1];
-    for (uint32 i = 0; i < sCreatureStorage.MaxEntry; ++i)
+    for (uint32 i = 0; i < sCreatureStorage.GetMaxEntry(); ++i)
         if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
             for (uint32 diff = 0; diff < MAX_DIFFICULTY - 1; ++diff)
                 if (cInfo->DifficultyEntry[diff])
@@ -1263,7 +1428,7 @@ void ObjectMgr::LoadCreatures()
         }
 
         if (data.spawnMask & ~spawnMasks[data.mapid])
-            sLog.outErrorDb("Table `creature` have creature (GUID: %u) that have wrong spawn mask %u including not supported difficulty modes for map (Id: %u).",guid, data.spawnMask, data.mapid );
+            sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) that have wrong spawn mask %u including not supported difficulty modes for map (Id: %u).", guid, entry, data.spawnMask, data.mapid);
 
         bool ok = true;
         for (uint32 diff = 0; diff < MAX_DIFFICULTY - 1 && ok; ++diff)
@@ -1293,30 +1458,30 @@ void ObjectMgr::LoadCreatures()
             }
         }
 
-        if(cInfo->RegenHealth && data.curhealth < cInfo->minhealth)
+        if (cInfo->RegenerateStats & REGEN_FLAG_HEALTH && data.curhealth < cInfo->MinLevelHealth)
         {
-            sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `creature_template`.`RegenHealth`=1 and low current health (%u), `creature_template`.`minhealth`=%u.",guid,data.id,data.curhealth, cInfo->minhealth );
-            data.curhealth = cInfo->minhealth;
+            sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `creature_template`.`RegenerateStats` & REGEN_FLAG_HEALTH and low current health (%u), `creature_template`.`minhealth`=%u.", guid, data.id, data.curhealth, cInfo->MinLevelHealth);
+            data.curhealth = cInfo->MinLevelHealth;
         }
 
-        if(cInfo->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND)
+        if (cInfo->ExtraFlags & CREATURE_FLAG_EXTRA_INSTANCE_BIND)
         {
             if(!mapEntry || !mapEntry->IsDungeon())
                 sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `creature_template`.`flags_extra` including CREATURE_FLAG_EXTRA_INSTANCE_BIND (%u) but creature are not in instance.",
                     guid, data.id, CREATURE_FLAG_EXTRA_INSTANCE_BIND);
         }
 
-        if(cInfo->flags_extra & CREATURE_FLAG_EXTRA_AGGRO_ZONE)
+        if (cInfo->ExtraFlags & CREATURE_FLAG_EXTRA_AGGRO_ZONE)
         {
             if(!mapEntry || !mapEntry->IsDungeon())
                 sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `creature_template`.`flags_extra` including CREATURE_FLAG_EXTRA_AGGRO_ZONE (%u) but creature are not in instance.",
                     guid, data.id, CREATURE_FLAG_EXTRA_AGGRO_ZONE);
         }
 
-        if(data.curmana < cInfo->minmana)
+        if (data.curmana < cInfo->MinLevelMana)
         {
-            sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with low current mana (%u), `creature_template`.`minmana`=%u.",guid,data.id,data.curmana, cInfo->minmana );
-            data.curmana = cInfo->minmana;
+            sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with low current mana (%u), `creature_template`.`minmana`=%u.", guid, data.id, data.curmana, cInfo->MinLevelMana);
+            data.curmana = cInfo->MinLevelMana;
         }
 
         if(data.spawndist < 0.0f)
@@ -1326,7 +1491,7 @@ void ObjectMgr::LoadCreatures()
         }
         else if(data.movementType == RANDOM_MOTION_TYPE)
         {
-            if(data.spawndist == 0.0f)
+            if(fabs(data.spawndist) < M_NULL_F)
             {
                 sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `MovementType`=1 (random movement) but with `spawndist`=0, replace by idle movement type (0).",guid,data.id );
                 data.movementType = IDLE_MOTION_TYPE;
@@ -1334,7 +1499,7 @@ void ObjectMgr::LoadCreatures()
         }
         else if(data.movementType == IDLE_MOTION_TYPE)
         {
-            if(data.spawndist != 0.0f)
+            if(fabs(data.spawndist) > M_NULL_F)
             {
                 sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `MovementType`=0 (idle) have `spawndist`<>0, set to 0.",guid,data.id );
                 data.spawndist = 0.0f;
@@ -1392,6 +1557,37 @@ void ObjectMgr::RemoveCreatureFromGrid(uint32 guid, CreatureData const* data)
     }
 }
 
+void ObjectMgr::LoadVehicleAccessory()
+{
+    sVehicleAccessoryStorage.Load();
+
+    sLog.outString(">> Loaded %u vehicle accessories", sVehicleAccessoryStorage.GetRecordCount());
+    sLog.outString();
+
+    // Check content
+    for (SQLMultiStorage::SQLSIterator<VehicleAccessory> itr = sVehicleAccessoryStorage.getDataBegin<VehicleAccessory>(); itr < sVehicleAccessoryStorage.getDataEnd<VehicleAccessory>(); ++itr)
+    {
+        if (!sCreatureStorage.LookupEntry<CreatureInfo>(itr->vehicleEntry))
+        {
+            sLog.outErrorDb("Table `vehicle_accessory` has entry (vehicle entry: %u, seat %u, passenger %u) where vehicle_entry is invalid, skip vehicle.", itr->vehicleEntry, itr->seatId, itr->passengerEntry);
+            sVehicleAccessoryStorage.EraseEntry(itr->vehicleEntry);
+            continue;
+        }
+        if (!sCreatureStorage.LookupEntry<CreatureInfo>(itr->passengerEntry))
+        {
+            sLog.outErrorDb("Table `vehicle_accessory` has entry (vehicle entry: %u, seat %u, passenger %u) where accessory_entry is invalid, skip vehicle.", itr->vehicleEntry, itr->seatId, itr->passengerEntry);
+            sVehicleAccessoryStorage.EraseEntry(itr->vehicleEntry);
+            continue;
+        }
+        if (itr->seatId >= MAX_VEHICLE_SEAT)
+        {
+            sLog.outErrorDb("Table `vehicle_accessory` has entry (vehicle entry: %u, seat %u, passenger %u) where seat is invalid (must be between 0 and %u), skip vehicle.", itr->vehicleEntry, itr->seatId, itr->passengerEntry, MAX_VEHICLE_SEAT - 1);
+            sVehicleAccessoryStorage.EraseEntry(itr->vehicleEntry);
+            continue;
+        }
+    }
+}
+
 void ObjectMgr::LoadGameObjects()
 {
     uint32 count = 0;
@@ -1544,6 +1740,10 @@ void ObjectMgr::LoadGameObjects()
         if (gameEvent==0 && GuidPoolId==0 && EntryPoolId==0)// if not this is to be managed by GameEvent System or Pool system
             AddGameobjectToGrid(guid, &data);
 
+        //uint32 zoneId, areaId;
+        //sTerrainMgr.LoadTerrain(data.mapid)->GetZoneAndAreaId(zoneId, areaId, data.posX, data.posY, data.posZ);
+        //sLog.outErrorDb("UPDATE gameobject SET zone_id=%u, area_id=%u WHERE guid=%u;", zoneId, areaId, guid);
+
         ++count;
 
     } while (result->NextRow());
@@ -1558,10 +1758,10 @@ void ObjectMgr::LoadGameObjectAddon()
 {
     sGameObjectDataAddonStorage.Load();
 
-    sLog.outString(">> Loaded %u gameobject addons", sGameObjectDataAddonStorage.RecordCount);
+    sLog.outString(">> Loaded %u gameobject addons", sGameObjectDataAddonStorage.GetRecordCount());
     sLog.outString();
 
-    for(uint32 i = 1; i < sGameObjectDataAddonStorage.MaxEntry; ++i)
+    for (uint32 i = 1; i < sGameObjectDataAddonStorage.GetMaxEntry(); ++i)
     {
         GameObjectDataAddon const* addon = sGameObjectDataAddonStorage.LookupEntry<GameObjectDataAddon>(i);
         if (!addon)
@@ -1597,21 +1797,6 @@ void ObjectMgr::AddGameobjectToGrid(uint32 guid, GameObjectData const* data)
     }
 }
 
-void ObjectMgr::RemoveGameobjectFromGrid(uint32 guid, GameObjectData const* data)
-{
-    uint8 mask = data->spawnMask;
-    for(uint8 i = 0; mask != 0; i++, mask >>= 1)
-    {
-        if(mask & 1)
-        {
-            CellPair cell_pair = MaNGOS::ComputeCellPair(data->posX, data->posY);
-            uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
-
-            CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid,i)][cell_id];
-            cell_guids.gameobjects.erase(guid);
-        }
-    }
-}
 
 // name must be checked to correctness (if received) before call this function
 ObjectGuid ObjectMgr::GetPlayerGuidByName(std::string name) const
@@ -1621,7 +1806,7 @@ ObjectGuid ObjectMgr::GetPlayerGuidByName(std::string name) const
     CharacterDatabase.escape_string(name);
 
     // Player name safe to sending to DB (checked at login) and this function using
-    QueryResult *result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE name = '%s'", name.c_str());
+    QueryResult* result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE name = '%s'", name.c_str());
     if (result)
     {
         guid = ObjectGuid(HIGHGUID_PLAYER, (*result)[0].GetUInt32());
@@ -1632,10 +1817,10 @@ ObjectGuid ObjectMgr::GetPlayerGuidByName(std::string name) const
     return guid;
 }
 
-bool ObjectMgr::GetPlayerNameByGUID(ObjectGuid guid, std::string &name) const
+bool ObjectMgr::GetPlayerNameByGUID(ObjectGuid guid, std::string& name) const
 {
     // prevent DB access for online player
-    if(Player* player = GetPlayer(guid))
+    if (Player* player = GetPlayer(guid))
     {
         name = player->GetName();
         return true;
@@ -1643,9 +1828,9 @@ bool ObjectMgr::GetPlayerNameByGUID(ObjectGuid guid, std::string &name) const
 
     uint32 lowguid = guid.GetCounter();
 
-    QueryResult *result = CharacterDatabase.PQuery("SELECT name FROM characters WHERE guid = '%u'", lowguid);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT name FROM characters WHERE guid = '%u'", lowguid);
 
-    if(result)
+    if (result)
     {
         name = (*result)[0].GetCppString();
         delete result;
@@ -1663,7 +1848,7 @@ Team ObjectMgr::GetPlayerTeamByGUID(ObjectGuid guid) const
 
     uint32 lowguid = guid.GetCounter();
 
-    QueryResult *result = CharacterDatabase.PQuery("SELECT race FROM characters WHERE guid = '%u'", lowguid);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT race FROM characters WHERE guid = '%u'", lowguid);
 
     if (result)
     {
@@ -1681,12 +1866,12 @@ uint32 ObjectMgr::GetPlayerAccountIdByGUID(ObjectGuid guid) const
         return 0;
 
     // prevent DB access for online player
-    if(Player* player = GetPlayer(guid))
+    if (Player* player = GetPlayer(guid))
         return player->GetSession()->GetAccountId();
 
     uint32 lowguid = guid.GetCounter();
 
-    QueryResult *result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE guid = '%u'", lowguid);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE guid = '%u'", lowguid);
     if (result)
     {
         uint32 acc = (*result)[0].GetUInt32();
@@ -1699,8 +1884,8 @@ uint32 ObjectMgr::GetPlayerAccountIdByGUID(ObjectGuid guid) const
 
 uint32 ObjectMgr::GetPlayerAccountIdByPlayerName(const std::string& name) const
 {
-    QueryResult *result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE name = '%s'", name.c_str());
-    if(result)
+    QueryResult* result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE name = '%s'", name.c_str());
+    if (result)
     {
         uint32 acc = (*result)[0].GetUInt32();
         delete result;
@@ -1710,6 +1895,23 @@ uint32 ObjectMgr::GetPlayerAccountIdByPlayerName(const std::string& name) const
     return 0;
 }
 
+
+void ObjectMgr::RemoveGameobjectFromGrid(uint32 guid, GameObjectData const* data)
+{
+    uint8 mask = data->spawnMask;
+    for(uint8 i = 0; mask != 0; i++, mask >>= 1)
+    {
+        if(mask & 1)
+        {
+            CellPair cell_pair = MaNGOS::ComputeCellPair(data->posX, data->posY);
+            uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
+
+            CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid,i)][cell_id];
+            cell_guids.gameobjects.erase(guid);
+        }
+    }
+}
+
 void ObjectMgr::LoadItemLocales()
 {
     mItemLocaleMap.clear();                                 // need for reload case
@@ -1780,7 +1982,7 @@ void ObjectMgr::LoadItemLocales()
     sLog.outString( ">> Loaded %lu Item locale strings", (unsigned long)mItemLocaleMap.size() );
 }
 
-struct SQLItemLoader : public SQLStorageLoaderBase<SQLItemLoader>
+struct SQLItemLoader : public SQLStorageLoaderBase<SQLItemLoader, SQLStorage>
 {
     template<class D>
     void convert_from_str(uint32 /*field_pos*/, char const *src, D &dst)
@@ -1793,11 +1995,11 @@ void ObjectMgr::LoadItemPrototypes()
 {
     SQLItemLoader loader;
     loader.Load(sItemStorage);
-    sLog.outString( ">> Loaded %u item prototypes", sItemStorage.RecordCount );
+    sLog.outString(">> Loaded %u item prototypes", sItemStorage.GetRecordCount());
     sLog.outString();
 
     // check data correctness
-    for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i)
+    for (uint32 i = 1; i < sItemStorage.GetMaxEntry(); ++i)
     {
         ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype >(i);
         ItemEntry const *dbcitem = sItemStore.LookupEntry(i);
@@ -2032,12 +2234,18 @@ void ObjectMgr::LoadItemPrototypes()
         for (int j = 0; j < MAX_ITEM_PROTO_STATS; ++j)
         {
             // for ItemStatValue != 0
-            if(proto->ItemStat[j].ItemStatValue && proto->ItemStat[j].ItemStatType >= MAX_ITEM_MOD)
+            if (proto->ItemStat[j].ItemStatValue && proto->ItemStat[j].ItemStatType >= MAX_ITEM_MOD)
             {
                 sLog.outErrorDb("Item (Entry: %u) has wrong stat_type%d (%u)",i,j+1,proto->ItemStat[j].ItemStatType);
                 const_cast<ItemPrototype*>(proto)->ItemStat[j].ItemStatType = 0;
             }
 
+            if (abs(proto->ItemStat[j].ItemStatValue) >= MAX_CLIENT_STAT_VALUE)
+            {
+                sLog.outErrorDb("Item (Entry: %u) has wrong stat_value%d (%u)",i,j+1,proto->ItemStat[j].ItemStatValue);
+                const_cast<ItemPrototype*>(proto)->ItemStat[j].ItemStatValue = 0;
+            }
+
             switch(proto->ItemStat[j].ItemStatType)
             {
                 case ITEM_MOD_SPELL_HEALING_DONE:
@@ -2056,6 +2264,20 @@ void ObjectMgr::LoadItemPrototypes()
                 sLog.outErrorDb("Item (Entry: %u) has wrong dmg_type%d (%u)",i,j+1,proto->Damage[j].DamageType);
                 const_cast<ItemPrototype*>(proto)->Damage[j].DamageType = 0;
             }
+
+            if (proto->Damage[j].DamageMax >= (float)MAX_CLIENT_STAT_VALUE ||
+                proto->Damage[j].DamageMax < 0.0f ||
+                proto->Damage[j].DamageMax < proto->Damage[j].DamageMin)
+            {
+                sLog.outErrorDb("Item (Entry: %u) has wrong dmg_max%d (%f)",i,j+1,proto->Damage[j].DamageMax);
+                const_cast<ItemPrototype*>(proto)->Damage[j].DamageMax = 0;
+            }
+
+            if (proto->Damage[j].DamageMin < 0.0f || proto->Damage[j].DamageMin > proto->Damage[j].DamageMax)
+            {
+                sLog.outErrorDb("Item (Entry: %u) has wrong dmg_min%d (%f)",i,j+1,proto->Damage[j].DamageMin);
+                const_cast<ItemPrototype*>(proto)->Damage[j].DamageMin = 0;
+            }
         }
 
         // special format
@@ -2547,7 +2769,7 @@ void ObjectMgr::LoadItemRequiredTarget()
             {
                 if (pItemProto->Spells[i].SpellTrigger == ITEM_SPELLTRIGGER_ON_USE)
                 {
-                    SpellScriptTargetBounds bounds = sSpellMgr.GetSpellScriptTargetBounds(pSpellInfo->Id);
+                    SQLMultiStorage::SQLMSIteratorBounds<SpellTargetEntry> bounds = sSpellScriptTargetStorage.getBounds<SpellTargetEntry>(pSpellInfo->Id);
                     if (bounds.first != bounds.second)
                         break;
 
@@ -2605,10 +2827,11 @@ void ObjectMgr::LoadItemRequiredTarget()
 
 void ObjectMgr::LoadPetLevelInfo()
 {
+    uint32 maxLevel = 80;
     // Loading levels data
     {
-        //                                                 0               1      2   3     4    5    6    7     8    9
-        QueryResult *result  = WorldDatabase.Query("SELECT creature_entry, level, hp, mana, str, agi, sta, inte, spi, armor FROM pet_levelstats");
+        //                                                 0               1      2   3     4    5    6    7     8    9      10      11      12
+        QueryResult *result  = WorldDatabase.Query("SELECT creature_entry, level, hp, mana, str, agi, sta, inte, spi, armor, mindmg, maxdmg, attackpower FROM pet_levelstats");
 
         uint32 count = 0;
 
@@ -2637,7 +2860,7 @@ void ObjectMgr::LoadPetLevelInfo()
             }
 
             uint32 current_level = fields[1].GetUInt32();
-            if(current_level > sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
+            if(current_level > maxLevel)
             {
                 if(current_level > STRONG_MAX_LEVEL)        // hardcoded level maximum
                     sLog.outErrorDb("Wrong (> %u) level %u in `pet_levelstats` table, ignoring.",STRONG_MAX_LEVEL,current_level);
@@ -2657,7 +2880,7 @@ void ObjectMgr::LoadPetLevelInfo()
             PetLevelInfo*& pInfoMapEntry = petInfo[creature_id];
 
             if(pInfoMapEntry==NULL)
-                pInfoMapEntry =  new PetLevelInfo[sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL)];
+                pInfoMapEntry =  new PetLevelInfo[maxLevel];
 
             // data for level 1 stored in [0] array element, ...
             PetLevelInfo* pLevelInfo = &pInfoMapEntry[current_level-1];
@@ -2665,6 +2888,9 @@ void ObjectMgr::LoadPetLevelInfo()
             pLevelInfo->health = fields[2].GetUInt16();
             pLevelInfo->mana   = fields[3].GetUInt16();
             pLevelInfo->armor  = fields[9].GetUInt16();
+            pLevelInfo->mindmg = fields[10].GetUInt32();
+            pLevelInfo->maxdmg = fields[11].GetUInt32();
+            pLevelInfo->attackpower = fields[12].GetUInt32();
 
             for (int i = 0; i < MAX_STATS; i++)
             {
@@ -2682,26 +2908,72 @@ void ObjectMgr::LoadPetLevelInfo()
         sLog.outString( ">> Loaded %u level pet stats definitions", count );
     }
 
+    PetLevelInfo* petBaseInfo = petInfo[1];
+
+    // fatal error if no base pet with id 1
+    if (!petBaseInfo)
+    {
+        sLog.outErrorDb("Table `pet_levelstats` does not have requered base pet with id 1! Must be exist!");
+        Log::WaitBeforeContinueIfNeed();
+        exit(1);
+    }
+
     // Fill gaps and check integrity
     for (PetLevelInfoMap::iterator itr = petInfo.begin(); itr != petInfo.end(); ++itr)
     {
+        if (itr->first == 1) continue; // No fill data for default pet! _Must_ be exist!
+
         PetLevelInfo* pInfo = itr->second;
 
-        // fatal error if no level 1 data
-        if(!pInfo || pInfo[0].health == 0 )
+        // fatal error if no level 1 and max health data
+        if(!pInfo || pInfo[0].health == 0 || pInfo[maxLevel-1].health == 0 )
         {
-            sLog.outErrorDb("Creature %u does not have pet stats data for Level 1!",itr->first);
+            sLog.outErrorDb("Creature %u does not have pet stats data for Levels 1 or %u! Must be exist!",itr->first, maxLevel);
             Log::WaitBeforeContinueIfNeed();
             exit(1);
         }
 
         // fill level gaps
-        for (uint32 level = 1; level < sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL); ++level)
+        for (uint32 level = 1; level < maxLevel; ++level)
         {
-            if(pInfo[level].health == 0)
+            if(   pInfo[level].health == 0
+               || pInfo[level].mana == 0
+               || pInfo[level].armor == 0
+               || pInfo[level].mindmg == 0
+               || pInfo[level].maxdmg == 0
+               || pInfo[level].stats[STAT_STRENGTH] == 0
+               || pInfo[level].stats[STAT_STAMINA] == 0
+               || pInfo[level].stats[STAT_AGILITY] == 0
+               || pInfo[level].stats[STAT_INTELLECT] == 0
+               || pInfo[level].stats[STAT_SPIRIT] == 0
+            )
             {
-                sLog.outErrorDb("Creature %u has no data for Level %i pet stats data, using data of Level %i.",itr->first,level+1, level);
-                pInfo[level] = pInfo[level-1];
+                DEBUG_LOG("Creature %u has no full data set for Level %i pet stats data, using approximated (from default pet progression) data",itr->first,level+1);
+
+                if(pInfo[level].health == 0)
+                    pInfo[level].health = uint16(pInfo[maxLevel-1].health * (petBaseInfo[level].health / petBaseInfo[maxLevel-1].health));
+
+                if(pInfo[level].mana == 0)
+                    pInfo[level].mana = uint16(pInfo[maxLevel-1].mana * (petBaseInfo[level].mana / petBaseInfo[maxLevel-1].mana));
+
+                if(pInfo[level].armor == 0)
+                    pInfo[level].armor = uint16(pInfo[maxLevel-1].armor * (petBaseInfo[level].armor / petBaseInfo[maxLevel-1].armor));
+
+                if(pInfo[level].mindmg == 0)
+                    pInfo[level].mindmg = uint16(pInfo[maxLevel-1].mindmg * (petBaseInfo[level].mindmg / petBaseInfo[maxLevel-1].mindmg));
+
+                if(pInfo[level].maxdmg == 0)
+                    pInfo[level].maxdmg = uint16(pInfo[maxLevel-1].maxdmg * (petBaseInfo[level].maxdmg / petBaseInfo[maxLevel-1].maxdmg));
+
+                if(pInfo[level].attackpower == 0)
+                    pInfo[level].attackpower = uint16(pInfo[maxLevel-1].attackpower * (petBaseInfo[level].attackpower / petBaseInfo[maxLevel-1].attackpower));
+
+                for (int i = 0; i < MAX_STATS; i++)
+                {
+                    if(pInfo[level].stats[i] == 0)
+                        pInfo[level].stats[i] = uint16(pInfo[maxLevel-1].stats[i] * (petBaseInfo[level].stats[i] / petBaseInfo[maxLevel-1].stats[i]));
+                }
+
             }
         }
     }
@@ -2719,69 +2991,322 @@ PetLevelInfo const* ObjectMgr::GetPetLevelInfo(uint32 creature_id, uint32 level)
     return &itr->second[level-1];                           // data for level 1 stored in [0] array element, ...
 }
 
-void ObjectMgr::LoadPlayerInfo()
+void ObjectMgr::LoadPetScalingData()
 {
-    // Load playercreate
+    // Loading scaling data
+    //                                                 0               1     2           3       4          5       6    7    8    9     10
+    QueryResult *result  = WorldDatabase.Query("SELECT creature_entry, aura, healthbase, health, powerbase, power,  str, agi, sta, inte, spi,"
+    //                                          11     12           13           14           15           16           17
+                                               "armor, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6,"
+    //                                          18      19           20           21      22           23        24   25         26           27    28
+                                               "apbase, apbasescale, attackpower, damage, spelldamage, spellhit, hit, expertize, attackspeed, crit, regen"
+                                               " FROM pet_scaling_data");
+
+    uint32 count = 0;
+
+    if (!result)
     {
-        //                                                0     1      2    3     4           5           6
-        QueryResult *result = WorldDatabase.Query("SELECT race, class, map, zone, position_x, position_y, position_z, orientation FROM playercreateinfo");
+        BarGoLink bar(1);
+        bar.step();
 
-        uint32 count = 0;
+        sLog.outString();
+        sLog.outString(">> Loaded %u pet scaling data definitions", count);
+        sLog.outErrorDb("Error loading `pet_scaling_data` table or table is empty.");
+        return;
+    }
 
-        if (!result)
-        {
-            BarGoLink bar(1);
+    BarGoLink bar((int)result->GetRowCount());
 
-            sLog.outString();
-            sLog.outString( ">> Loaded %u player create definitions", count );
-            sLog.outErrorDb( "Error loading `playercreateinfo` table or empty table.");
-            Log::WaitBeforeContinueIfNeed();
-            exit(1);
-        }
+    m_PetScalingData.clear();
 
-        BarGoLink bar(result->GetRowCount());
+    do
+    {
+        Field* fields = result->Fetch();
 
-        do
+        uint32 creature_id = fields[0].GetUInt32();
+
+        if(creature_id && !sCreatureStorage.LookupEntry<CreatureInfo>(creature_id)) // in 0 creature_id storing default values. _must_ be exist.
         {
-            Field* fields = result->Fetch();
+            sLog.outErrorDb("Wrong creature id %u in `pet_scaling_data` table, ignoring.",creature_id);
+            continue;
+        }
 
-            uint32 current_race  = fields[0].GetUInt32();
-            uint32 current_class = fields[1].GetUInt32();
-            uint32 mapId         = fields[2].GetUInt32();
-            uint32 areaId        = fields[3].GetUInt32();
-            float  positionX     = fields[4].GetFloat();
-            float  positionY     = fields[5].GetFloat();
-            float  positionZ     = fields[6].GetFloat();
-            float  orientation   = fields[7].GetFloat();
+        PetScalingDataList*& pScalingDataList = m_PetScalingData[creature_id];
 
-            ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(current_race);
-            if(!rEntry || !((1 << (current_race-1)) & RACEMASK_ALL_PLAYABLE))
-            {
-                sLog.outErrorDb("Wrong race %u in `playercreateinfo` table, ignoring.",current_race);
-                continue;
-            }
+        if (pScalingDataList == NULL)
+                pScalingDataList =  new PetScalingDataList;
 
-            ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(current_class);
-            if(!cEntry || !((1 << (current_class-1)) & CLASSMASK_ALL_PLAYABLE))
-            {
-                sLog.outErrorDb("Wrong class %u in `playercreateinfo` table, ignoring.",current_class);
-                continue;
-            }
+        PetScalingData pScalingDataEntry;
 
-            // accept DB data only for valid position (and non instanceable)
-            if( !MapManager::IsValidMapCoord(mapId,positionX,positionY,positionZ, orientation) )
-            {
-                sLog.outErrorDb("Wrong home position for class %u race %u pair in `playercreateinfo` table, ignoring.",current_class,current_race);
-                continue;
-            }
+        pScalingDataEntry.creatureID = fields[0].GetUInt32();
+        pScalingDataEntry.requiredAura = fields[1].GetUInt32();
+        pScalingDataEntry.healthBasepoint = fields[2].GetInt32();
+        pScalingDataEntry.healthScale = fields[3].GetInt32();
+        pScalingDataEntry.powerBasepoint = fields[4].GetInt32();
+        pScalingDataEntry.powerScale = fields[5].GetInt32();
+        for (int i = 0; i < MAX_STATS; i++)
+        {
+            pScalingDataEntry.statScale[i] = fields[i+6].GetInt32();
+        }
+        for (int i = 0; i < MAX_SPELL_SCHOOL; i++)
+        {
+            pScalingDataEntry.resistanceScale[i] = fields[i+11].GetInt32();
+        }
+        pScalingDataEntry.APBasepoint = fields[18].GetInt32();
+        pScalingDataEntry.APBaseScale = fields[19].GetInt32();
+        pScalingDataEntry.attackpowerScale = fields[20].GetInt32();
+        pScalingDataEntry.damageScale = fields[21].GetInt32();
+        pScalingDataEntry.spelldamageScale = fields[22].GetInt32();
+        pScalingDataEntry.spellHitScale = fields[23].GetInt32();
+        pScalingDataEntry.meleeHitScale = fields[24].GetInt32();
+        pScalingDataEntry.expertizeScale = fields[25].GetInt32();
+        pScalingDataEntry.attackspeedScale = fields[26].GetInt32();
+        pScalingDataEntry.critScale = fields[27].GetInt32();
+        pScalingDataEntry.powerregenScale = fields[28].GetInt32();
 
-            if( sMapStore.LookupEntry(mapId)->Instanceable() )
-            {
-                sLog.outErrorDb("Home position in instanceable map for class %u race %u pair in `playercreateinfo` table, ignoring.",current_class,current_race);
-                continue;
-            }
+        pScalingDataList->push_back(pScalingDataEntry);
 
-            PlayerInfo* pInfo = &playerInfo[current_race][current_class];
+        ++count;
+    }
+    while (result->NextRow());
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString( ">> Loaded %u level pet scaling data definitions", count );
+}
+
+PetScalingDataList const* ObjectMgr::GetPetScalingData(uint32 creature_id) const
+{
+    PetScalingDataMap::const_iterator itr = m_PetScalingData.find(creature_id);
+
+    if (itr == m_PetScalingData.end())
+        return NULL;
+    else
+        return itr->second;
+}
+
+void ObjectMgr::LoadAntiCheatConfig()
+{
+    //                                                             0             1           2                 3           4
+    QueryResult *result  = CharacterDatabase.Query("SELECT checktype, check_period,alarmscount, disableoperation, messagenum,"
+    //                                                             5          6             7             8
+                                                           "intparam1, intparam2,  floatparam1,  floatparam2,"
+    //                                                            9              10        11             12
+                                                           "action1,   actionparam1,  action2,  actionparam2,"
+    //                                                                 13           14
+                                                           "disabledzones, description FROM anticheat_config");
+
+    uint32 count = 0;
+
+    if (!result)
+    {
+        BarGoLink bar(1);
+        bar.step();
+
+        sLog.outString();
+        sLog.outString(">> Loaded %u anticheat config definitions", count);
+        sLog.outErrorDb("Error loading `anticheat_config` table or table is empty.");
+        return;
+    }
+
+    BarGoLink bar( (int)result->GetRowCount() );
+
+    m_AntiCheatConfig.clear();
+
+    do
+    {
+        Field* fields = result->Fetch();
+
+        AntiCheatConfig AntiCheatConfigEntry;
+
+        AntiCheatConfigEntry.checkType = fields[0].GetUInt32();
+
+        if (AntiCheatConfigEntry.checkType > 9999)
+        {
+            sLog.outErrorDb("Wrong check type id %u in `anticheat_config` table, ignoring.",AntiCheatConfigEntry.checkType);
+            continue;
+        }
+
+        AntiCheatConfigEntry.checkPeriod = fields[1].GetUInt32();
+        AntiCheatConfigEntry.alarmsCount = fields[2].GetUInt32();
+        AntiCheatConfigEntry.disableOperation = fields[3].GetBool();
+        AntiCheatConfigEntry.messageNum  = fields[4].GetUInt32();
+
+        for (int i=0; i < ANTICHEAT_CHECK_PARAMETERS; ++i )
+        {
+            AntiCheatConfigEntry.checkParam[i] = fields[5+i].GetUInt32();
+        }
+
+        for (int i=0; i < ANTICHEAT_CHECK_PARAMETERS; ++i )
+        {
+            AntiCheatConfigEntry.checkFloatParam[i] = fields[5+ANTICHEAT_CHECK_PARAMETERS+i].GetFloat();
+        }
+
+        for (int i=0; i < ANTICHEAT_ACTIONS; ++i )
+        {
+            AntiCheatConfigEntry.actionType[i] = fields[5+ANTICHEAT_CHECK_PARAMETERS*2+i*2].GetUInt32();
+            AntiCheatConfigEntry.actionParam[i] = fields[6+ANTICHEAT_CHECK_PARAMETERS*2+i*2].GetUInt32();
+        };
+
+        std::string zonesList = fields[5+ANTICHEAT_CHECK_PARAMETERS*2+ANTICHEAT_ACTIONS*2].GetCppString();
+
+        Tokens _list(zonesList, ' ');
+        if (!_list.empty())
+        {
+            for (Tokens::iterator itr = _list.begin(); itr != _list.end(); ++itr)
+                AntiCheatConfigEntry.disabledZones.insert(atol(*itr));
+        }
+
+        AntiCheatConfigEntry.description  = fields[6+ANTICHEAT_CHECK_PARAMETERS*2+ANTICHEAT_ACTIONS*2].GetCppString();
+
+        m_AntiCheatConfig.insert(std::make_pair(AntiCheatConfigEntry.checkType, AntiCheatConfigEntry));
+
+        ++count;
+    }
+    while (result->NextRow());
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString( ">> Loaded %u anticheat config definitions", count );
+
+}
+
+AntiCheatConfig const* ObjectMgr::GetAntiCheatConfig(uint32 checkType) const
+{
+    AntiCheatConfigMap::const_iterator itr = m_AntiCheatConfig.find(checkType);
+    if (itr == m_AntiCheatConfig.end())
+        return NULL;
+    else
+        return &itr->second;
+}
+
+void ObjectMgr::LoadCreatureSpells()
+{
+    // Loading creature spells
+    //                                                    0         1        2         3           4        5
+    QueryResult* result  = WorldDatabase.Query("SELECT `guid`, `spell`, `index`, `active`, `disabled`, `flags` FROM `creature_spell`");
+
+    uint32 count = 0;
+
+    if (!result)
+    {
+        BarGoLink bar(1);
+        bar.step();
+
+        sLog.outString();
+        sLog.outErrorDb("Error loading creature_spell table or table is empty.");
+        return;
+    }
+
+    BarGoLink bar( (int)result->GetRowCount() );
+
+    do
+    {
+        Field* fields = result->Fetch();
+
+        uint32 creature_id = fields[0].GetUInt32();
+
+        uint8 activeState  = fields[3].GetUInt8();
+        CreatureSpellsList* pCreatureSpells = &m_creatureSpellStorage[activeState][creature_id];
+
+        if (!pCreatureSpells)
+        {
+            m_creatureSpellStorage[activeState].insert(std::make_pair(creature_id,CreatureSpellsList()));
+            pCreatureSpells = &m_creatureSpellStorage[activeState][creature_id];
+            MANGOS_ASSERT(pCreatureSpells);
+        }
+
+        uint8 index = fields[2].GetUInt8();
+        CreatureSpellEntry creatureSpellEntry;
+
+        creatureSpellEntry.spell        = fields[1].GetUInt32();
+        creatureSpellEntry.disabled     = fields[4].GetBool();
+        creatureSpellEntry.flags        = fields[5].GetUInt32();
+
+        pCreatureSpells->insert(std::make_pair(index,creatureSpellEntry));
+        ++count;
+    }
+    while (result->NextRow());
+
+    delete result;
+    sLog.outString();
+    sLog.outString( ">> Loaded %u creature spell definitions", count );
+}
+
+CreatureSpellsList const* ObjectMgr::GetCreatureSpells(uint32 creature_id, uint8 activeState)
+{
+    CreatureSpellStorage::const_iterator itr = m_creatureSpellStorage[activeState].find(creature_id);
+    if (itr == m_creatureSpellStorage[activeState].end())
+        return NULL;
+    else
+        return &itr->second;
+}
+
+void ObjectMgr::LoadPlayerInfo()
+{
+    // Load playercreate
+    {
+        //                                                0     1      2    3     4           5           6
+        QueryResult *result = WorldDatabase.Query("SELECT race, class, map, zone, position_x, position_y, position_z, orientation FROM playercreateinfo");
+
+        uint32 count = 0;
+
+        if (!result)
+        {
+            BarGoLink bar(1);
+
+            sLog.outString();
+            sLog.outString( ">> Loaded %u player create definitions", count );
+            sLog.outErrorDb( "Error loading `playercreateinfo` table or empty table.");
+            Log::WaitBeforeContinueIfNeed();
+            exit(1);
+        }
+
+        BarGoLink bar(result->GetRowCount());
+
+        do
+        {
+            Field* fields = result->Fetch();
+
+            uint32 current_race  = fields[0].GetUInt32();
+            uint32 current_class = fields[1].GetUInt32();
+            uint32 mapId         = fields[2].GetUInt32();
+            uint32 areaId        = fields[3].GetUInt32();
+            float  positionX     = fields[4].GetFloat();
+            float  positionY     = fields[5].GetFloat();
+            float  positionZ     = fields[6].GetFloat();
+            float  orientation   = fields[7].GetFloat();
+
+            ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(current_race);
+            if(!rEntry || !((1 << (current_race-1)) & RACEMASK_ALL_PLAYABLE))
+            {
+                sLog.outErrorDb("Wrong race %u in `playercreateinfo` table, ignoring.",current_race);
+                continue;
+            }
+
+            ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(current_class);
+            if(!cEntry || !((1 << (current_class-1)) & CLASSMASK_ALL_PLAYABLE))
+            {
+                sLog.outErrorDb("Wrong class %u in `playercreateinfo` table, ignoring.",current_class);
+                continue;
+            }
+
+            // accept DB data only for valid position (and non instanceable)
+            if( !MapManager::IsValidMapCoord(mapId,positionX,positionY,positionZ, orientation) )
+            {
+                sLog.outErrorDb("Wrong home position for class %u race %u pair in `playercreateinfo` table, ignoring.",current_class,current_race);
+                continue;
+            }
+
+            if( sMapStore.LookupEntry(mapId)->Instanceable() )
+            {
+                sLog.outErrorDb("Home position in instanceable map for class %u race %u pair in `playercreateinfo` table, ignoring.",current_class,current_race);
+                continue;
+            }
+
+            PlayerInfo* pInfo = &playerInfo[current_race][current_class];
 
             pInfo->mapId       = mapId;
             pInfo->areaId      = areaId;
@@ -3194,11 +3719,11 @@ void ObjectMgr::LoadPlayerInfo()
                 continue;
 
             // skip expansion races if not playing with expansion
-            if (sWorld.getConfig(CONFIG_UINT32_EXPANSION) < 1 && (race == RACE_BLOODELF || race == RACE_DRAENEI))
+            if (sWorld.getConfig(CONFIG_UINT32_EXPANSION) < EXPANSION_TBC && (race == RACE_BLOODELF || race == RACE_DRAENEI))
                 continue;
 
             // skip expansion classes if not playing with expansion
-            if (sWorld.getConfig(CONFIG_UINT32_EXPANSION) < 2 && class_ == CLASS_DEATH_KNIGHT)
+            if (sWorld.getConfig(CONFIG_UINT32_EXPANSION) < EXPANSION_WOTLK && class_ == CLASS_DEATH_KNIGHT)
                 continue;
 
             // fatal error if no level 1 data
@@ -3386,10 +3911,31 @@ void ObjectMgr::BuildPlayerLevelInfo(uint8 race, uint8 _class, uint8 level, Play
                 info->stats[STAT_AGILITY]   += (lvl > 38 ? 2: (lvl > 8 && (lvl%2) ? 1: 0));
                 info->stats[STAT_INTELLECT] += (lvl > 38 ? 3: (lvl > 4 ? 1: 0));
                 info->stats[STAT_SPIRIT]    += (lvl > 38 ? 3: (lvl > 5 ? 1: 0));
+                break;
+            default:
+                break;
         }
     }
 }
 
+/* ********************************************************************************************* */
+/* *                                Static Wrappers                                              */
+/* ********************************************************************************************* */
+GameObjectInfo const* ObjectMgr::GetGameObjectInfo(uint32 id) { return sGOStorage.LookupEntry<GameObjectInfo>(id); }
+Player* ObjectMgr::GetPlayer(const char* name) { return ObjectAccessor::FindPlayerByName(name); }
+Player* ObjectMgr::GetPlayer(ObjectGuid guid, bool inWorld /*=true*/) { return ObjectAccessor::FindPlayer(guid, inWorld); }
+CreatureInfo const* ObjectMgr::GetCreatureTemplate(uint32 id) { return sCreatureStorage.LookupEntry<CreatureInfo>(id); }
+CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelid) { return sCreatureModelStorage.LookupEntry<CreatureModelInfo>(modelid); }
+EquipmentInfo const* ObjectMgr::GetEquipmentInfo(uint32 entry) { return sEquipmentStorage.LookupEntry<EquipmentInfo>(entry); }
+CreatureDataAddon const* ObjectMgr::GetCreatureAddon(uint32 lowguid) { return sCreatureDataAddonStorage.LookupEntry<CreatureDataAddon>(lowguid); }
+CreatureDataAddon const* ObjectMgr::GetCreatureTemplateAddon(uint32 entry) { return sCreatureInfoAddonStorage.LookupEntry<CreatureDataAddon>(entry); }
+ItemPrototype const* ObjectMgr::GetItemPrototype(uint32 id) { return sItemStorage.LookupEntry<ItemPrototype>(id); }
+InstanceTemplate const* ObjectMgr::GetInstanceTemplate(uint32 map) { return sInstanceTemplate.LookupEntry<InstanceTemplate>(map); }
+WorldTemplate const* ObjectMgr::GetWorldTemplate(uint32 map) { return sWorldTemplate.LookupEntry<WorldTemplate>(map); }
+
+/* ********************************************************************************************* */
+/* *                                Loading Functions                                            */
+/* ********************************************************************************************* */
 void ObjectMgr::LoadArenaTeams()
 {
     uint32 count = 0;
@@ -3448,8 +3994,8 @@ void ObjectMgr::LoadGroups()
 {
     // -- loading groups --
     uint32 count = 0;
-    //                                                    0         1              2           3           4              5      6      7      8      9      10     11     12     13         14          15              16          17
-    QueryResult *result = CharacterDatabase.Query("SELECT mainTank, mainAssistant, lootMethod, looterGuid, lootThreshold, icon1, icon2, icon3, icon4, icon5, icon6, icon7, icon8, groupType, difficulty, raiddifficulty, leaderGuid, groupId FROM groups");
+    //                                                    0           1           2              3      4      5      6      7      8      9      10     11         12          13              14          15
+    QueryResult *result = CharacterDatabase.Query("SELECT lootMethod, looterGuid, lootThreshold, icon1, icon2, icon3, icon4, icon5, icon6, icon7, icon8, groupType, difficulty, raiddifficulty, leaderGuid, groupId FROM groups");
 
     if (!result)
     {
@@ -3469,7 +4015,7 @@ void ObjectMgr::LoadGroups()
         bar.step();
         Field *fields = result->Fetch();
         ++count;
-        Group *group = new Group;
+        Group* group = new Group(GROUPTYPE_NORMAL);
         if (!group->LoadGroupFromDB(fields))
         {
             group->Disband();
@@ -3486,8 +4032,8 @@ void ObjectMgr::LoadGroups()
 
     // -- loading members --
     count = 0;
-    //                                       0           1          2         3
-    result = CharacterDatabase.Query("SELECT memberGuid, assistant, subgroup, groupId FROM group_member ORDER BY groupId");
+    //                                       0           1            2         3        4
+    result = CharacterDatabase.Query("SELECT memberGuid, memberFlags, subgroup, groupId, roles FROM group_member ORDER BY groupId");
     if (!result)
     {
         BarGoLink bar2(1);
@@ -3506,9 +4052,10 @@ void ObjectMgr::LoadGroups()
 
             uint32 memberGuidlow = fields[0].GetUInt32();
             ObjectGuid memberGuid = ObjectGuid(HIGHGUID_PLAYER, memberGuidlow);
-            bool   assistent     = fields[1].GetBool();
+            uint8  flags         = fields[1].GetUInt8();
             uint8  subgroup      = fields[2].GetUInt8();
             uint32 groupId       = fields[3].GetUInt32();
+            uint8  roles         = fields[4].GetUInt8();
             if (!group || group->GetId() != groupId)
             {
                 group = GetGroupById(groupId);
@@ -3521,7 +4068,7 @@ void ObjectMgr::LoadGroups()
                 }
             }
 
-            if (!group->LoadMemberFromDB(memberGuidlow, subgroup, assistent))
+            if (!group->LoadMemberFromDB(memberGuidlow, subgroup, GroupFlagMask(flags), LFGRoleMask(roles)))
             {
                 sLog.outErrorDb("Incorrect entry in group_member table : member %s cannot be added to group (Id: %u)!",
                     memberGuid.GetString().c_str(), groupId);
@@ -3533,16 +4080,18 @@ void ObjectMgr::LoadGroups()
 
     // clean groups
     // TODO: maybe delete from the DB before loading in this case
-    for (GroupMap::iterator itr = mGroupMap.begin(); itr != mGroupMap.end();)
+    for (GroupMap::iterator itr = mGroupMap.begin(); itr != mGroupMap.end(); ++itr)
     {
-        if (itr->second->GetMembersCount() < 2)
+        if (Group* group = itr->second)
         {
-            itr->second->Disband();
-            delete itr->second;
-            mGroupMap.erase(itr++);
+            if (group->GetMembersCount() < 2)
+            {
+                itr = mGroupMap.begin();
+                // group deleted from mGroupMap in Disband() method!
+                group->Disband();
+                delete group;
+            }
         }
-        else
-            ++itr;
     }
 
     // -- loading instances --
@@ -3577,6 +4126,8 @@ void ObjectMgr::LoadGroups()
             uint32 mapId = fields[1].GetUInt32();
             Difficulty diff = (Difficulty)fields[4].GetUInt8();
             uint32 groupId = fields[7].GetUInt32();
+            time_t resetTime = fields[5].GetUInt64();
+            uint32 encountersMask = fields[8].GetUInt32();
 
             if (!group || group->GetId() != groupId)
             {
@@ -3602,8 +4153,9 @@ void ObjectMgr::LoadGroups()
                 diff = REGULAR_DIFFICULTY;                  // default for both difficaly types
             }
 
-            DungeonPersistentState *state = (DungeonPersistentState*)sMapPersistentStateMgr.AddPersistentState(mapEntry, fields[2].GetUInt32(), Difficulty(diff), (time_t)fields[5].GetUInt64(), (fields[6].GetUInt32() == 0), true, true, fields[8].GetUInt32());
+            DungeonPersistentState *state = (DungeonPersistentState*)sMapPersistentStateMgr.AddPersistentState(mapEntry, fields[2].GetUInt32(), Difficulty(diff), resetTime, (fields[6].GetUInt32() == 0), true, true, encountersMask);
             group->BindToInstance(state, fields[3].GetBool(), true);
+
         }while( result->NextRow() );
         delete result;
     }
@@ -4281,15 +4833,13 @@ void ObjectMgr::LoadQuests()
             if (!quest)
                 continue;
 
-            if (!quest->HasSpecialFlag(QUEST_SPECIAL_FLAG_EXPLORATION_OR_EVENT))
+            // Exclude false positive of quest 10162
+            if (!quest->HasSpecialFlag(QUEST_SPECIAL_FLAG_EXPLORATION_OR_EVENT) && spellInfo->Id != 33824 && quest_id != 10162)
             {
                 sLog.outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE for quest %u , but quest does not have SpecialFlags QUEST_SPECIAL_FLAG_EXPLORATION_OR_EVENT (2) set. Quest SpecialFlags should be corrected to enable this objective.", spellInfo->Id, quest_id);
 
-                // The below forced alteration has been disabled because of spell 33824 / quest 10162.
-                // A startup error will still occur with proper data in quest_template, but it will be possible to sucessfully complete the quest with the expected data.
-
                 // this will prevent quest completing without objective
-                // const_cast<Quest*>(quest)->SetSpecialFlag(QUEST_SPECIAL_FLAG_EXPLORATION_OR_EVENT);
+                const_cast<Quest*>(quest)->SetSpecialFlag(QUEST_SPECIAL_FLAG_EXPLORATION_OR_EVENT);
             }
         }
     }
@@ -4454,13 +5004,11 @@ void ObjectMgr::LoadQuestLocales()
 
 void ObjectMgr::LoadPageTexts()
 {
-    sPageTextStore.Free();                                  // for reload case
-
     sPageTextStore.Load();
-    sLog.outString( ">> Loaded %u page texts", sPageTextStore.RecordCount );
+    sLog.outString(">> Loaded %u page texts", sPageTextStore.GetRecordCount());
     sLog.outString();
 
-    for(uint32 i = 1; i < sPageTextStore.MaxEntry; ++i)
+    for (uint32 i = 1; i < sPageTextStore.GetMaxEntry(); ++i)
     {
         // check data correctness
         PageText const* page = sPageTextStore.LookupEntry<PageText>(i);
@@ -4556,7 +5104,12 @@ void ObjectMgr::LoadPageTextLocales()
 
 void ObjectMgr::LoadInstanceEncounters()
 {
-    m_DungeonEncounters.clear();         // need for reload case
+    if (!m_DungeonEncounters.empty())         // need for reload case
+    {
+        for (DungeonEncounterMap::iterator itr = m_DungeonEncounters.begin(); itr != m_DungeonEncounters.end(); ++itr)
+            delete itr->second;
+        m_DungeonEncounters.clear();
+    }
 
     QueryResult* result = WorldDatabase.Query("SELECT entry, creditType, creditEntry, lastEncounterDungeon FROM instance_encounters");
 
@@ -4606,7 +5159,7 @@ void ObjectMgr::LoadInstanceEncounters()
                 if (!sSpellStore.LookupEntry(creditEntry))
                 {
                     // skip spells that aren't in dbc for now
-                    //sLog.outErrorDb("Table `instance_encounters` has an invalid spell (entry %u) linked to the encounter %u (%s), skipped!", creditEntry, entry, dungeonEncounter->encounterName[0]);
+                    sLog.outErrorDb("Table `instance_encounters` has an invalid spell (entry %u) linked to the encounter %u (%s), skipped!", creditEntry, entry, dungeonEncounter->encounterName[0]);
                     continue;
                 }
                 break;
@@ -4627,7 +5180,7 @@ void ObjectMgr::LoadInstanceEncounters()
     sLog.outString( ">> Loaded %lu Instance Encounters", (unsigned long)m_DungeonEncounters.size() );
 }
 
-struct SQLInstanceLoader : public SQLStorageLoaderBase<SQLInstanceLoader>
+struct SQLInstanceLoader : public SQLStorageLoaderBase<SQLInstanceLoader, SQLStorage>
 {
     template<class D>
     void convert_from_str(uint32 /*field_pos*/, char const *src, D &dst)
@@ -4641,7 +5194,7 @@ void ObjectMgr::LoadInstanceTemplate()
     SQLInstanceLoader loader;
     loader.Load(sInstanceTemplate);
 
-    for(uint32 i = 0; i < sInstanceTemplate.MaxEntry; i++)
+    for (uint32 i = 0; i < sInstanceTemplate.GetMaxEntry(); ++i)
     {
         InstanceTemplate const* temp = GetInstanceTemplate(i);
         if (!temp)
@@ -4669,7 +5222,7 @@ void ObjectMgr::LoadInstanceTemplate()
             if (!parentEntry)
             {
                 sLog.outErrorDb("ObjectMgr::LoadInstanceTemplate: bad parent map id %u for instance template %d template!",
-                    parentEntry->MapID, temp->map);
+                    temp->parent, temp->map);
                 const_cast<InstanceTemplate*>(temp)->parent = 0;
                 continue;
             }
@@ -4684,11 +5237,11 @@ void ObjectMgr::LoadInstanceTemplate()
         }
     }
 
-    sLog.outString( ">> Loaded %u Instance Template definitions", sInstanceTemplate.RecordCount );
+    sLog.outString(">> Loaded %u Instance Template definitions", sInstanceTemplate.GetRecordCount());
     sLog.outString();
 }
 
-struct SQLWorldLoader : public SQLStorageLoaderBase<SQLWorldLoader>
+struct SQLWorldLoader : public SQLStorageLoaderBase<SQLWorldLoader, SQLStorage>
 {
     template<class D>
     void convert_from_str(uint32 /*field_pos*/, char const *src, D &dst)
@@ -4702,7 +5255,7 @@ void ObjectMgr::LoadWorldTemplate()
     SQLWorldLoader loader;
     loader.Load(sWorldTemplate, false);
 
-    for (uint32 i = 0; i < sWorldTemplate.MaxEntry; ++i)
+    for (uint32 i = 0; i < sWorldTemplate.GetMaxEntry(); ++i)
     {
         WorldTemplate const* temp = GetWorldTemplate(i);
         if (!temp)
@@ -4724,16 +5277,16 @@ void ObjectMgr::LoadWorldTemplate()
         }
     }
 
-    sLog.outString( ">> Loaded %u World Template definitions", sWorldTemplate.RecordCount);
+    sLog.outString(">> Loaded %u World Template definitions", sWorldTemplate.GetRecordCount());
     sLog.outString();
 }
 
 void ObjectMgr::LoadConditions()
 {
     SQLWorldLoader loader;
-    loader.Load(sConditionStorage, false);
+    loader.Load(sConditionStorage);
 
-    for (uint32 i = 0; i < sConditionStorage.MaxEntry; ++i)
+    for (uint32 i = 0; i < sConditionStorage.GetMaxEntry(); ++i)
     {
         const PlayerCondition* condition = sConditionStorage.LookupEntry<PlayerCondition>(i);
         if (!condition)
@@ -4747,7 +5300,7 @@ void ObjectMgr::LoadConditions()
         }
     }
 
-    sLog.outString( ">> Loaded %u Condition definitions", sConditionStorage.RecordCount);
+    sLog.outString(">> Loaded %u Condition definitions", sConditionStorage.GetRecordCount());
     sLog.outString();
 }
 
@@ -5118,7 +5671,7 @@ void ObjectMgr::LoadTavernAreaTriggers()
 uint32 ObjectMgr::GetNearestTaxiNode( float x, float y, float z, uint32 mapid, Team team )
 {
     bool found = false;
-    float dist;
+    float dist = 0.0f;
     uint32 id = 0;
 
     for(uint32 i = 1; i < sTaxiNodesStore.GetNumRows(); ++i)
@@ -5267,7 +5820,7 @@ void ObjectMgr::LoadGraveyardZones()
             continue;
         }
 
-        if (team != TEAM_NONE && team != HORDE && team != ALLIANCE)
+        if (team != TEAM_BOTH_ALLOWED && team != HORDE && team != ALLIANCE)
         {
             sLog.outErrorDb("Table `game_graveyard_zone` has record for non player faction (%u), skipped.", team);
             continue;
@@ -5286,7 +5839,7 @@ void ObjectMgr::LoadGraveyardZones()
 WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float z, uint32 MapId, Team team)
 {
     // search for zone associated closest graveyard
-    uint32 zoneId = sTerrainMgr.GetZoneId(MapId,x,y,z);
+    uint32 zoneId = sTerrainMgr.GetZoneId(MapId, x, y, z);
 
     // Simulate std. algorithm:
     //   found some graveyard associated to (ghost_zone,ghost_map)
@@ -5305,12 +5858,12 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float
 
     // at corpse map
     bool foundNear = false;
-    float distNear;
+    float distNear = 0.0f;
     WorldSafeLocsEntry const* entryNear = NULL;
 
     // at entrance map for corpse map
     bool foundEntr = false;
-    float distEntr;
+    float distEntr = 0.0f;
     WorldSafeLocsEntry const* entryEntr = NULL;
 
     // some where other
@@ -5322,16 +5875,13 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float
     {
         GraveYardData const& data = itr->second;
 
+        // Checked on load
         WorldSafeLocsEntry const* entry = sWorldSafeLocsStore.LookupEntry(data.safeLocId);
-        if(!entry)
-        {
-            sLog.outErrorDb("Table `game_graveyard_zone` has record for not existing graveyard (WorldSafeLocs.dbc id) %u, skipped.",data.safeLocId);
-            continue;
-        }
 
         // skip enemy faction graveyard
-        // team == 0 case can be at call from .neargrave
-        if (data.team != TEAM_NONE && team != TEAM_NONE && data.team != team)
+        // team == TEAM_BOTH_ALLOWED case can be at call from .neargrave
+        // TEAM_INVALID != team for all teams
+        if (data.team != TEAM_BOTH_ALLOWED && data.team != team && team != TEAM_BOTH_ALLOWED)
             continue;
 
         // find now nearest graveyard at other (continent) map
@@ -5411,7 +5961,7 @@ GraveYardData const* ObjectMgr::FindGraveYardData(uint32 id, uint32 zoneId) cons
 
 bool ObjectMgr::AddGraveYardLink(uint32 id, uint32 zoneId, Team team, bool inDB)
 {
-    if(FindGraveYardData(id,zoneId))
+    if (FindGraveYardData(id, zoneId))                      // This ensures that (safeLoc)Id,  zoneId is unique in mGraveYardMap
         return false;
 
     // add link to loaded data
@@ -5419,16 +5969,84 @@ bool ObjectMgr::AddGraveYardLink(uint32 id, uint32 zoneId, Team team, bool inDB)
     data.safeLocId = id;
     data.team = team;
 
-    mGraveYardMap.insert(GraveYardMap::value_type(zoneId,data));
+    mGraveYardMap.insert(GraveYardMap::value_type(zoneId, data));
 
     // add link to DB
+    if (inDB)
+        WorldDatabase.PExecuteLog("INSERT INTO game_graveyard_zone ( id,ghost_zone,faction) VALUES ('%u', '%u','%u')", id, zoneId, uint32(team));
+
+    return true;
+}
+
+void ObjectMgr::SetGraveYardLinkTeam(uint32 id, uint32 zoneId, Team team)
+{
+    std::pair<GraveYardMap::iterator, GraveYardMap::iterator> bounds = mGraveYardMap.equal_range(zoneId);
+
+    for (GraveYardMap::iterator itr = bounds.first; itr != bounds.second; ++itr)
+    {
+        GraveYardData& data = itr->second;
+
+        // skip not matching safezone id
+        if (data.safeLocId != id)
+            continue;
+
+        data.team = team;                                   // Validate link
+        return;
+    }
+
+    if (team == TEAM_INVALID)
+        return;
+
+    // Link expected but not exist.
+    sLog.outErrorDb("ObjectMgr::SetGraveYardLinkTeam called for safeLoc %u, zoneId %u, but no graveyard link for this found in database.", id, zoneId);
+    AddGraveYardLink(id, zoneId, team);                     // Add to prevent further error message and correct mechanismn
+}
+
+void ObjectMgr::RemoveGraveYardLink(uint32 id, uint32 zoneId, Team team, bool inDB)
+{
+    GraveYardMap::iterator graveLow  = mGraveYardMap.lower_bound(zoneId);
+    GraveYardMap::iterator graveUp   = mGraveYardMap.upper_bound(zoneId);
+    if(graveLow==graveUp)
+    {
+        //sLog.outErrorDb("Table `game_graveyard_zone` incomplete: Zone %u Team %u does not have a linked graveyard.",zoneId,team);
+        return;
+    }
+
+    bool found = false;
+
+    GraveYardMap::iterator itr;
+
+    for (itr = graveLow; itr != graveUp; ++itr)
+    {
+        GraveYardData & data = itr->second;
+
+        // skip not matching safezone id
+        if(data.safeLocId != id)
+            continue;
+
+        // skip enemy faction graveyard at same map (normal area, city, or battleground)
+        // team == 0 case can be at call from .neargrave
+        if(data.team != 0 && team != 0 && data.team != team)
+            continue;
+
+        found = true;
+        break;
+    }
+
+    // no match, return
+    if(!found)
+        return;
+
+    // remove from links
+    mGraveYardMap.erase(itr);
+
+    // remove link from DB
     if(inDB)
     {
-        WorldDatabase.PExecuteLog("INSERT INTO game_graveyard_zone ( id,ghost_zone,faction) "
-            "VALUES ('%u', '%u','%u')", id, zoneId, uint32(team));
+        WorldDatabase.PExecute("DELETE FROM game_graveyard_zone WHERE id = '%u' AND ghost_zone = '%u' AND faction = '%u'",id,zoneId,team);
     }
 
-    return true;
+    return;
 }
 
 void ObjectMgr::LoadAreaTriggerTeleports()
@@ -5437,8 +6055,14 @@ void ObjectMgr::LoadAreaTriggerTeleports()
 
     uint32 count = 0;
 
-    //                                                0   1               2              3               4           5            6                    7                           8                     9           10                 11                 12                 13
-    QueryResult *result = WorldDatabase.Query("SELECT id, required_level, required_item, required_item2, heroic_key, heroic_key2, required_quest_done, required_quest_done_heroic, required_failed_text, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM areatrigger_teleport");
+    //                                                0   1               2              3               4           5
+    QueryResult* result = WorldDatabase.Query("SELECT id, required_level, required_item, required_item2, heroic_key, heroic_key2,"
+    // 6                     7                              8                      9                            10     11
+    "required_quest_done_A, required_quest_done_heroic_A, required_quest_done_H, required_quest_done_heroic_H, minGS, maxGS,"
+    // 12          13                 14                 15                 16                  17           18           19
+    " target_map, target_position_x, target_position_y, target_position_z, target_orientation, achiev_id_0, achiev_id_1, combat_mode "
+    //
+    "FROM areatrigger_teleport");
     if (!result)
     {
 
@@ -5470,17 +6094,23 @@ void ObjectMgr::LoadAreaTriggerTeleports()
         at.requiredItem2        = fields[3].GetUInt32();
         at.heroicKey            = fields[4].GetUInt32();
         at.heroicKey2           = fields[5].GetUInt32();
-        at.requiredQuest        = fields[6].GetUInt32();
-        at.requiredQuestHeroic  = fields[7].GetUInt32();
-        at.requiredFailedText   = fields[8].GetCppString();
-        at.target_mapId         = fields[9].GetUInt32();
-        at.target_X             = fields[10].GetFloat();
-        at.target_Y             = fields[11].GetFloat();
-        at.target_Z             = fields[12].GetFloat();
-        at.target_Orientation   = fields[13].GetFloat();
+        at.requiredQuestA       = fields[6].GetUInt32();
+        at.requiredQuestHeroicA = fields[7].GetUInt32();
+        at.requiredQuestH       = fields[8].GetUInt32();
+        at.requiredQuestHeroicH = fields[9].GetUInt32();
+        at.minGS                = fields[10].GetUInt32();
+        at.maxGS                = fields[11].GetUInt32();
+        at.loc                  = WorldLocation(fields[12].GetUInt32(),
+                                                fields[13].GetFloat(),
+                                                fields[14].GetFloat(),
+                                                fields[15].GetFloat(),
+                                                fields[16].GetFloat());
+        at.achiev0              = fields[17].GetUInt32();
+        at.achiev1              = fields[18].GetUInt32();
+        at.combatMode           = fields[19].GetUInt32();
 
         AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
-        if (!atEntry)
+        if (!atEntry && !sWorld.getConfig(CONFIG_BOOL_ALLOW_CUSTOM_MAPS))
         {
             sLog.outErrorDb("Table `areatrigger_teleport` has area trigger (ID:%u) not listed in `AreaTrigger.dbc`.", Trigger_ID);
             continue;
@@ -5526,37 +6156,64 @@ void ObjectMgr::LoadAreaTriggerTeleports()
             }
         }
 
-        if (at.requiredQuest)
+        if (at.requiredQuestA)
+        {
+            QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuestA);
+            if (qReqItr == mQuestTemplates.end())
+            {
+                sLog.outErrorDb("Table `areatrigger_teleport` has nonexistent required quest %u for trigger %u, remove quest done requirement.",at.requiredQuestA,Trigger_ID);
+                at.requiredQuestA = 0;
+            }
+        }
+
+        if (at.requiredQuestH)
+        {
+            QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuestH);
+            if (qReqItr == mQuestTemplates.end())
+            {
+                sLog.outErrorDb("Table `areatrigger_teleport` has nonexistent required quest %u for trigger %u, remove quest done requirement.",at.requiredQuestH,Trigger_ID);
+                at.requiredQuestH = 0;
+            }
+        }
+
+        if (at.requiredQuestHeroicA)
         {
-            QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuest);
+            QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuestHeroicA);
             if (qReqItr == mQuestTemplates.end())
             {
-                sLog.outErrorDb("Table `areatrigger_teleport` has nonexistent required quest %u for trigger %u, remove quest done requirement.",at.requiredQuest,Trigger_ID);
-                at.requiredQuest = 0;
+                sLog.outErrorDb("Table `areatrigger_teleport` has nonexistent required heroic quest %u for trigger %u, remove quest done requirement.",at.requiredQuestHeroicA,Trigger_ID);
+                at.requiredQuestHeroicA = 0;
             }
         }
 
-        if (at.requiredQuestHeroic)
+        if (at.requiredQuestHeroicH)
         {
-            QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuestHeroic);
+            QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuestHeroicH);
             if (qReqItr == mQuestTemplates.end())
             {
-                sLog.outErrorDb("Table `areatrigger_teleport` has nonexistent required heroic quest %u for trigger %u, remove quest done requirement.",at.requiredQuestHeroic,Trigger_ID);
-                at.requiredQuestHeroic = 0;
+                sLog.outErrorDb("Table `areatrigger_teleport` has nonexistent required heroic quest %u for trigger %u, remove quest done requirement.",at.requiredQuestHeroicH,Trigger_ID);
+                at.requiredQuestHeroicH = 0;
             }
         }
 
-        MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId);
+        MapEntry const* mapEntry = sMapStore.LookupEntry(at.loc.GetMapId());
         if (!mapEntry)
         {
-            sLog.outErrorDb("Table `areatrigger_teleport` has nonexistent target map (ID: %u) for Area trigger (ID:%u).", at.target_mapId, Trigger_ID);
+            sLog.outErrorDb("Table `areatrigger_teleport` has nonexistent target map (ID: %u) for Area trigger (ID:%u).", at.loc.GetMapId(), Trigger_ID);
             continue;
         }
 
-        if (at.target_X==0 && at.target_Y==0 && at.target_Z==0)
+        if (at.loc.IsEmpty())
         {
-            sLog.outErrorDb("Table `areatrigger_teleport` has area trigger (ID:%u) without target coordinates.",Trigger_ID);
-            continue;
+            if (!sWorld.getConfig(CONFIG_BOOL_ALLOW_CUSTOM_MAPS))
+            {
+                sLog.outErrorDb("Table `areatrigger_teleport` has area trigger (ID:%u) without target coordinates.",Trigger_ID);
+                continue;
+            }
+            else
+            {
+                sLog.outDetail("Table `areatrigger_teleport` has area trigger (ID:%u) without correct target coordinates.",Trigger_ID);
+            }
         }
 
         mAreaTriggers[Trigger_ID] = at;
@@ -5572,39 +6229,81 @@ void ObjectMgr::LoadAreaTriggerTeleports()
 /*
  * Searches for the areatrigger which teleports players out of the given map (only direct to continent)
  */
-AreaTrigger const* ObjectMgr::GetGoBackTrigger(uint32 map_id) const
+AreaTrigger const* ObjectMgr::GetGoBackTrigger(uint32 mapId) const
 {
-    const MapEntry *mapEntry = sMapStore.LookupEntry(map_id);
+    const MapEntry* mapEntry = sMapStore.LookupEntry(mapId);
     if (!mapEntry || mapEntry->ghost_entrance_map < 0)
         return NULL;
-
-    for (AreaTriggerMap::const_iterator itr = mAreaTriggers.begin(); itr != mAreaTriggers.end(); ++itr)
+    uint32 ghost_entrance_map = uint32(mapEntry->ghost_entrance_map);
+    if (mapEntry->ghost_entrance_map == 0 && mapEntry->ghost_entrance_x == 0.0f && mapEntry->ghost_entrance_y == 0.0f)
     {
-        if (itr->second.target_mapId == uint32(mapEntry->ghost_entrance_map))
+        GraveYardMapBounds bounds = mGraveYardMap.equal_range(mapEntry->linked_zone);
+        for(GraveYardMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
         {
-            AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(itr->first);
-            if(atEntry && atEntry->mapid == map_id)
-                return &itr->second;
+            WorldSafeLocsEntry const* worldSafeLocsEntry = sWorldSafeLocsStore.LookupEntry(itr->second.safeLocId);
+            ghost_entrance_map = worldSafeLocsEntry->map_id;
         }
     }
-    return NULL;
+
+    for (AreaTriggerMap::const_iterator itr = mAreaTriggers.begin(); itr != mAreaTriggers.end(); ++itr)
+    {
+        if (itr->second.loc.GetMapId() != ghost_entrance_map)
+            continue;
+        AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(itr->first);
+        if (!atEntry || atEntry->mapid != mapId)
+            continue;
+        return &itr->second;
+    }
+
+    if (sWorld.getConfig(CONFIG_BOOL_ALLOW_CUSTOM_MAPS))
+    {
+        for (AreaTriggerMap::const_iterator itr = mAreaTriggers.begin(); itr != mAreaTriggers.end(); ++itr)
+        {
+            if (itr->second.loc.GetMapId() == ghost_entrance_map)
+                return &itr->second;
+        }
+    }
+
+    return NULL;
 }
 
 /**
  * Searches for the areatrigger which teleports players to the given map
  */
-AreaTrigger const* ObjectMgr::GetMapEntranceTrigger(uint32 Map) const
+AreaTrigger const* ObjectMgr::GetMapEntranceTrigger(uint32 mapId) const
 {
+    AreaTrigger const* compareTrigger = NULL;
+    MapEntry const* mEntry = sMapStore.LookupEntry(mapId);
+
     for (AreaTriggerMap::const_iterator itr = mAreaTriggers.begin(); itr != mAreaTriggers.end(); ++itr)
     {
-        if(itr->second.target_mapId == Map)
+        if (itr->second.loc.GetMapId() == mapId)
         {
             AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(itr->first);
-            if(atEntry)
+            if (!atEntry && sWorld.getConfig(CONFIG_BOOL_ALLOW_CUSTOM_MAPS))
                 return &itr->second;
+
+            if (mEntry->Instanceable())
+            {
+                if (!atEntry || atEntry->mapid == mapId)
+                    continue;
+                // Remark that IsLessOrEqualThan is no total order, and a->IsLeQ(b) != !b->IsLeQ(a)
+                if (!compareTrigger || compareTrigger->IsLessOrEqualThan(&itr->second))
+                    compareTrigger = &itr->second;
+            }
+            else
+            {
+                if (!compareTrigger || itr->second.IsLessOrEqualThan(compareTrigger))
+                {
+                    if (itr->second.IsMinimal())
+                        return &itr->second;
+
+                    compareTrigger = &itr->second;
+                }
+            }
         }
     }
-    return NULL;
+    return compareTrigger;
 }
 
 void ObjectMgr::PackGroupIds()
@@ -5844,7 +6543,7 @@ void ObjectMgr::LoadGameObjectLocales()
     sLog.outString( ">> Loaded %lu gameobject locale strings", (unsigned long)mGameObjectLocaleMap.size() );
 }
 
-struct SQLGameObjectLoader : public SQLStorageLoaderBase<SQLGameObjectLoader>
+struct SQLGameObjectLoader : public SQLStorageLoaderBase<SQLGameObjectLoader, SQLHashStorage>
 {
     template<class D>
     void convert_from_str(uint32 /*field_pos*/, char const *src, D &dst)
@@ -5917,18 +6616,27 @@ inline void CheckGOConsumable(GameObjectInfo const* goInfo,uint32 dataN,uint32 N
         goInfo->id,goInfo->type,N,dataN);
 }
 
+inline void CheckAndFixGOCaptureMinTime(GameObjectInfo const* goInfo, uint32 const& dataN, uint32 N)
+{
+    if (dataN > 0)
+        return;
+
+    sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) has data%d=%u but minTime field value must be > 0.",
+        goInfo->id, goInfo->type, N, dataN);
+
+    // prevent division through 0 exception
+    const_cast<uint32&>(dataN) = 1;
+}
+
 void ObjectMgr::LoadGameobjectInfo()
 {
     SQLGameObjectLoader loader;
     loader.Load(sGOStorage);
 
     // some checks
-    for(uint32 id = 1; id < sGOStorage.MaxEntry; id++)
+    for (SQLStorageBase::SQLSIterator<GameObjectInfo> itr = sGOStorage.getDataBegin<GameObjectInfo>(); itr < sGOStorage.getDataEnd<GameObjectInfo>(); ++itr)
     {
-        GameObjectInfo const* goInfo = sGOStorage.LookupEntry<GameObjectInfo>(id);
-        if (!goInfo)
-            continue;
-
+        GameObjectInfo const* goInfo = itr.getValue();
 
         if (goInfo->size <= 0.0f)                           // prevent use too small scales
         {
@@ -5994,7 +6702,7 @@ void ObjectMgr::LoadGameobjectInfo()
                 {
                     if (!sSpellFocusObjectStore.LookupEntry(goInfo->spellFocus.focusId))
                         sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data0=%u but SpellFocus (Id: %u) not exist.",
-                            id,goInfo->type,goInfo->spellFocus.focusId,goInfo->spellFocus.focusId);
+                                        goInfo->id, goInfo->type, goInfo->spellFocus.focusId, goInfo->spellFocus.focusId);
                 }
 
                 if (goInfo->spellFocus.linkedTrapId)        // linked trap
@@ -6012,7 +6720,7 @@ void ObjectMgr::LoadGameobjectInfo()
                 {
                     if (!sPageTextStore.LookupEntry<PageText>(goInfo->goober.pageId))
                         sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data7=%u but PageText (Entry %u) not exist.",
-                            id,goInfo->type,goInfo->goober.pageId,goInfo->goober.pageId);
+                                        goInfo->id, goInfo->type, goInfo->goober.pageId, goInfo->goober.pageId);
                 }
                 /* disable check for while, too many nonexistent spells
                 if (goInfo->goober.spellId)                 // spell
@@ -6041,7 +6749,7 @@ void ObjectMgr::LoadGameobjectInfo()
                 {
                     if (goInfo->moTransport.taxiPathId >= sTaxiPathNodesByPath.size() || sTaxiPathNodesByPath[goInfo->moTransport.taxiPathId].empty())
                         sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data0=%u but TaxiPath (Id: %u) not exist.",
-                            id,goInfo->type,goInfo->moTransport.taxiPathId,goInfo->moTransport.taxiPathId);
+                                        goInfo->id, goInfo->type, goInfo->moTransport.taxiPathId, goInfo->moTransport.taxiPathId);
                 }
                 break;
             }
@@ -6079,13 +6787,18 @@ void ObjectMgr::LoadGameobjectInfo()
                 CheckGONoDamageImmuneId(goInfo,goInfo->flagdrop.noDamageImmune,3);
                 break;
             }
+            case GAMEOBJECT_TYPE_CAPTURE_POINT:             //29
+            {
+                CheckAndFixGOCaptureMinTime(goInfo, goInfo->capturePoint.minTime, 16);
+                break;
+            }
             case GAMEOBJECT_TYPE_BARBER_CHAIR:              //32
                 CheckAndFixGOChairHeightId(goInfo,goInfo->barberChair.chairheight,0);
                 break;
         }
     }
 
-    sLog.outString( ">> Loaded %u game object templates", sGOStorage.RecordCount );
+    sLog.outString(">> Loaded %u game object templates", sGOStorage.GetRecordCount());
     sLog.outString();
 }
 
@@ -6201,11 +6914,9 @@ std::string ObjectMgr::GeneratePetName(uint32 entry)
 
     if (list0.empty() || list1.empty())
     {
-        CreatureInfo const *cinfo = GetCreatureTemplate(entry);
-        char const* petname = GetPetName(cinfo->family, sWorld.GetDefaultDbcLocale());
-        if (!petname)
-            petname = cinfo->Name;
-        return std::string(petname);
+        CreatureInfo const* cinfo = GetCreatureTemplate(entry);
+        char const* petname = GetPetName(cinfo->Family, sWorld.GetDefaultDbcLocale());
+        return std::string(petname ? petname : "");
     }
 
     return *(list0.begin()+urand(0, list0.size()-1)) + *(list1.begin()+urand(0, list1.size()-1));
@@ -6337,8 +7048,8 @@ void ObjectMgr::LoadReputationOnKill()
 
     //                                                0            1                     2
     QueryResult *result = WorldDatabase.Query("SELECT creature_id, RewOnKillRepFaction1, RewOnKillRepFaction2,"
-    //   3             4             5                   6             7             8                   9
-        "IsTeamAward1, MaxStanding1, RewOnKillRepValue1, IsTeamAward2, MaxStanding2, RewOnKillRepValue2, TeamDependent "
+    //   3             4             5                   6             7             8                   9              10
+        "IsTeamAward1, MaxStanding1, RewOnKillRepValue1, IsTeamAward2, MaxStanding2, RewOnKillRepValue2, TeamDependent, ChampioningAura "
         "FROM creature_onkill_reputation");
 
     if (!result)
@@ -6371,6 +7082,7 @@ void ObjectMgr::LoadReputationOnKill()
         repOnKill.reputation_max_cap2  = fields[7].GetUInt32();
         repOnKill.repvalue2            = fields[8].GetInt32();
         repOnKill.team_dependent       = fields[9].GetUInt8();
+        repOnKill.championingAura      = fields[10].GetUInt32();
 
         if(!GetCreatureTemplate(creature_id))
         {
@@ -6666,8 +7378,8 @@ void ObjectMgr::LoadNPCSpellClickSpells()
     uint32 count = 0;
 
     mSpellClickInfoMap.clear();
-    //                                                0          1         2            3                   4          5
-    QueryResult *result = WorldDatabase.Query("SELECT npc_entry, spell_id, quest_start, quest_start_active, quest_end, cast_flags FROM npc_spellclick_spells");
+    //                                                0          1         2            3                   4          5           6
+    QueryResult* result = WorldDatabase.Query("SELECT npc_entry, spell_id, quest_start, quest_start_active, quest_end, cast_flags, condition_id FROM npc_spellclick_spells");
 
     if (!result)
     {
@@ -6687,7 +7399,15 @@ void ObjectMgr::LoadNPCSpellClickSpells()
         Field *fields = result->Fetch();
         bar.step();
 
-        uint32 npc_entry = fields[0].GetUInt32();
+        SpellClickInfo info;
+        uint32 npc_entry         = fields[0].GetUInt32();
+        info.spellId             = fields[1].GetUInt32();
+        info.questStart          = fields[2].GetUInt32();
+        info.questStartCanActive = fields[3].GetBool();
+        info.questEnd            = fields[4].GetUInt32();
+        info.castFlags           = fields[5].GetUInt8();
+        info.conditionId         = fields[6].GetUInt16();
+
         CreatureInfo const* cInfo = GetCreatureTemplate(npc_entry);
         if (!cInfo)
         {
@@ -6695,52 +7415,40 @@ void ObjectMgr::LoadNPCSpellClickSpells()
             continue;
         }
 
-        uint32 spellid = fields[1].GetUInt32();
-        SpellEntry const *spellinfo = sSpellStore.LookupEntry(spellid);
+        SpellEntry const* spellinfo = sSpellStore.LookupEntry(info.spellId);
         if (!spellinfo)
         {
-            sLog.outErrorDb("Table npc_spellclick_spells references unknown spellid %u. Skipping entry.", spellid);
+            sLog.outErrorDb("Table npc_spellclick_spells references unknown spellid %u. Skipping entry.", info.spellId);
             continue;
         }
 
-        uint32 quest_start = fields[2].GetUInt32();
-
-        // quest might be 0 to enable spellclick independent of any quest
-        if (quest_start)
+        if (info.conditionId && !sConditionStorage.LookupEntry<PlayerCondition const*>(info.conditionId))
+        {
+            sLog.outErrorDb("Table npc_spellclick_spells references unknown condition %u. Skipping entry.", info.conditionId);
+            continue;
+        }
+        else if (!info.conditionId)                         // TODO Drop block after finished converting
         {
-            if(mQuestTemplates.find(quest_start) == mQuestTemplates.end())
+            // quest might be 0 to enable spellclick independent of any quest
+            if (info.questStart && mQuestTemplates.find(info.questStart) == mQuestTemplates.end())
             {
-                sLog.outErrorDb("Table npc_spellclick_spells references unknown start quest %u. Skipping entry.", quest_start);
+                sLog.outErrorDb("Table npc_spellclick_spells references unknown start quest %u. Skipping entry.", info.questStart);
                 continue;
             }
 
-        }
-
-        bool quest_start_active = fields[3].GetBool();
-
-        uint32 quest_end = fields[4].GetUInt32();
-        // quest might be 0 to enable spellclick active infinity after start quest
-        if (quest_end)
-        {
-            if(mQuestTemplates.find(quest_end) == mQuestTemplates.end())
+            // quest might be 0 to enable spellclick active infinity after start quest
+            if (info.questEnd && mQuestTemplates.find(info.questEnd) == mQuestTemplates.end())
             {
-                sLog.outErrorDb("Table npc_spellclick_spells references unknown end quest %u. Skipping entry.", quest_end);
+                sLog.outErrorDb("Table npc_spellclick_spells references unknown end quest %u. Skipping entry.", info.questEnd);
                 continue;
             }
 
         }
 
-        uint8 castFlags = fields[5].GetUInt8();
-        SpellClickInfo info;
-        info.spellId = spellid;
-        info.questStart = quest_start;
-        info.questStartCanActive = quest_start_active;
-        info.questEnd = quest_end;
-        info.castFlags = castFlags;
         mSpellClickInfoMap.insert(SpellClickInfoMap::value_type(npc_entry, info));
 
         // mark creature template as spell clickable
-        const_cast<CreatureInfo*>(cInfo)->npcflag |= UNIT_NPC_FLAG_SPELLCLICK;
+        const_cast<CreatureInfo*>(cInfo)->NpcFlags |= UNIT_NPC_FLAG_SPELLCLICK;
 
         ++count;
     } while (result->NextRow());
@@ -6753,12 +7461,12 @@ void ObjectMgr::LoadNPCSpellClickSpells()
 
 static char* SERVER_SIDE_SPELL      = "MaNGOS server-side spell";
 
-struct SQLSpellLoader : public SQLStorageLoaderBase<SQLSpellLoader>
+struct SQLSpellLoader : public SQLStorageLoaderBase<SQLSpellLoader, SQLHashStorage>
 {
     template<class S, class D>
     void default_fill(uint32 field_pos, S src, D &dst)
     {
-        if (field_pos == 65)                                // EquippedItemClass
+        if (field_pos == LOADED_SPELLDBC_FIELD_POS_EQUIPPED_ITEM_CLASS)
             dst = D(-1);
         else
             dst = D(src);
@@ -6766,7 +7474,7 @@ struct SQLSpellLoader : public SQLStorageLoaderBase<SQLSpellLoader>
 
     void default_fill_to_str(uint32 field_pos, char const* /*src*/, char * & dst)
     {
-        if (field_pos == 132)                               // SpellName[0]
+        if (field_pos == LOADED_SPELLDBC_FIELD_POS_SPELLNAME_0)
         {
             dst = SERVER_SIDE_SPELL;
         }
@@ -6783,10 +7491,10 @@ void ObjectMgr::LoadSpellTemplate()
     SQLSpellLoader loader;
     loader.Load(sSpellTemplate);
 
-    sLog.outString(">> Loaded %u spell definitions", sSpellTemplate.RecordCount);
+    sLog.outString(">> Loaded %u spell definitions", sSpellTemplate.GetRecordCount());
     sLog.outString();
 
-    for (uint32 i = 1; i < sSpellTemplate.MaxEntry; ++i)
+    for (uint32 i = 1; i < sSpellTemplate.GetMaxEntry(); ++i)
     {
         // check data correctness
         SpellEntry const* spellEntry = sSpellTemplate.LookupEntry<SpellEntry>(i);
@@ -6796,7 +7504,12 @@ void ObjectMgr::LoadSpellTemplate()
         // insert serverside spell data
         if (sSpellStore.GetNumRows() <= i)
         {
-            sLog.outErrorDb("Loading Spell Template for spell %u, index out of bounds (max = %)", i, sSpellStore.GetNumRows());
+            sLog.outErrorDb("Loading Spell Template for spell %u, index out of bounds (max = %u)", i, sSpellStore.GetNumRows());
+            continue;
+        }
+        else if (/*SpellEntry const* originalSpellEntry = */sSpellStore.LookupEntry(i))
+        {
+            sLog.outErrorDb("Loading Spell Template for spell %u failed, index already handled (possible in spell_dbc)", i);
             continue;
         }
         else
@@ -6984,7 +7697,7 @@ void ObjectMgr::LoadCreatureQuestRelations()
         CreatureInfo const* cInfo = GetCreatureTemplate(itr->first);
         if (!cInfo)
             sLog.outErrorDb("Table `creature_questrelation` have data for nonexistent creature entry (%u) and existing quest %u",itr->first,itr->second);
-        else if (!(cInfo->npcflag & UNIT_NPC_FLAG_QUESTGIVER))
+        else if (!(cInfo->NpcFlags & UNIT_NPC_FLAG_QUESTGIVER))
             sLog.outErrorDb("Table `creature_questrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER",itr->first,itr->second);
     }
 }
@@ -6998,7 +7711,7 @@ void ObjectMgr::LoadCreatureInvolvedRelations()
         CreatureInfo const* cInfo = GetCreatureTemplate(itr->first);
         if (!cInfo)
             sLog.outErrorDb("Table `creature_involvedrelation` have data for nonexistent creature entry (%u) and existing quest %u",itr->first,itr->second);
-        else if (!(cInfo->npcflag & UNIT_NPC_FLAG_QUESTGIVER))
+        else if (!(cInfo->NpcFlags & UNIT_NPC_FLAG_QUESTGIVER))
             sLog.outErrorDb("Table `creature_involvedrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER",itr->first,itr->second);
     }
 }
@@ -7150,6 +7863,11 @@ uint8 ObjectMgr::CheckPlayerName( const std::string& name, bool create )
     if(!isValidString(wname,strictMask,false,create))
         return CHAR_NAME_MIXED_LANGUAGES;
 
+    wstrToLower(wname);
+    for (size_t i = 2; i < wname.size(); ++i)
+        if (wname[i] == wname[i-1] && wname[i] == wname[i-2])
+            return CHAR_NAME_THREE_CONSECUTIVE;
+
     return CHAR_NAME_SUCCESS;
 }
 
@@ -7228,7 +7946,7 @@ void ObjectMgr::LoadGameObjectForQuests()
 {
     mGameObjectForQuestSet.clear();                         // need for reload case
 
-    if (!sGOStorage.MaxEntry)
+    if (!sGOStorage.GetMaxEntry())
     {
         BarGoLink bar(1);
         bar.step();
@@ -7237,25 +7955,21 @@ void ObjectMgr::LoadGameObjectForQuests()
         return;
     }
 
-    BarGoLink bar(sGOStorage.MaxEntry - 1);
+    BarGoLink bar(sGOStorage.GetRecordCount());
     uint32 count = 0;
 
     // collect GO entries for GO that must activated
-    for (uint32 go_entry = 1; go_entry < sGOStorage.MaxEntry; ++go_entry)
+    for (SQLStorageBase::SQLSIterator<GameObjectInfo> itr = sGOStorage.getDataBegin<GameObjectInfo>(); itr < sGOStorage.getDataEnd<GameObjectInfo>(); ++itr)
     {
         bar.step();
-        GameObjectInfo const* goInfo = GetGameObjectInfo(go_entry);
-        if (!goInfo)
-            continue;
-
-        switch(goInfo->type)
+        switch (itr->type)
         {
             case GAMEOBJECT_TYPE_QUESTGIVER:
             {
-                if (m_GOQuestRelations.find(go_entry) != m_GOQuestRelations.end() ||
-                    m_GOQuestInvolvedRelations.find(go_entry) != m_GOQuestInvolvedRelations.end())
+                if (m_GOQuestRelations.find(itr->id) != m_GOQuestRelations.end() ||
+                        m_GOQuestInvolvedRelations.find(itr->id) != m_GOQuestInvolvedRelations.end())
                 {
-                    mGameObjectForQuestSet.insert(go_entry);
+                    mGameObjectForQuestSet.insert(itr->id);
                     ++count;
                 }
 
@@ -7264,40 +7978,40 @@ void ObjectMgr::LoadGameObjectForQuests()
             case GAMEOBJECT_TYPE_CHEST:
             {
                 // scan GO chest with loot including quest items
-                uint32 loot_id = goInfo->GetLootId();
+                uint32 loot_id = itr->GetLootId();
 
                 // always activate to quest, GO may not have loot, OR find if GO has loot for quest.
-                if (goInfo->chest.questId || LootTemplates_Gameobject.HaveQuestLootFor(loot_id))
+                if (itr->chest.questId || LootTemplates_Gameobject.HaveQuestLootFor(loot_id))
                 {
-                    mGameObjectForQuestSet.insert(go_entry);
+                    mGameObjectForQuestSet.insert(itr->id);
                     ++count;
                 }
                 break;
             }
             case GAMEOBJECT_TYPE_GENERIC:
             {
-                if (goInfo->_generic.questID)               // quest related objects, has visual effects
+                if (itr->_generic.questID)                  // quest related objects, has visual effects
                 {
-                    mGameObjectForQuestSet.insert(go_entry);
-                    count++;
+                    mGameObjectForQuestSet.insert(itr->id);
+                    ++count;
                 }
                 break;
             }
             case GAMEOBJECT_TYPE_SPELL_FOCUS:
             {
-                if (goInfo->spellFocus.questID)             // quest related objects, has visual effect
+                if (itr->spellFocus.questID)                // quest related objects, has visual effect
                 {
-                    mGameObjectForQuestSet.insert(go_entry);
-                    count++;
+                    mGameObjectForQuestSet.insert(itr->id);
+                    ++count;
                 }
                 break;
             }
             case GAMEOBJECT_TYPE_GOOBER:
             {
-                if (goInfo->goober.questId)                 //quests objects
+                if (itr->goober.questId)                    // quests objects
                 {
-                    mGameObjectForQuestSet.insert(go_entry);
-                    count++;
+                    mGameObjectForQuestSet.insert(itr->id);
+                    ++count;
                 }
                 break;
             }
@@ -7310,7 +8024,27 @@ void ObjectMgr::LoadGameObjectForQuests()
     sLog.outString( ">> Loaded %u GameObjects for quests", count );
 }
 
-bool ObjectMgr::LoadMangosStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value)
+inline void _DoStringError(int32 entry, char const* text, ...)
+{
+    MANGOS_ASSERT(text);
+
+    char buf[256];
+    va_list ap;
+    va_start(ap, text);
+    vsnprintf(buf, 256, text, ap);
+    va_end(ap);
+
+    if (entry <= MAX_CREATURE_AI_TEXT_STRING_ID)            // script library error
+        sLog.outErrorScriptLib("%s", buf);
+    else if (entry <= MIN_CREATURE_AI_TEXT_STRING_ID)       // eventAI error
+        sLog.outErrorEventAI("%s", buf);
+    else if (entry < MIN_DB_SCRIPT_STRING_ID)               // mangos string error
+        sLog.outError("%s", buf);
+    else // if (entry > MIN_DB_SCRIPT_STRING_ID)            // DB script text error
+        sLog.outErrorDb("DB-SCRIPTS: %s", buf);
+}
+
+bool ObjectMgr::LoadMangosStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value, bool extra_content)
 {
     int32 start_value = min_value;
     int32 end_value   = max_value;
@@ -7346,7 +8080,10 @@ bool ObjectMgr::LoadMangosStrings(DatabaseType& db, char const* table, int32 min
             ++itr;
     }
 
-    QueryResult *result = db.PQuery("SELECT entry,content_default,content_loc1,content_loc2,content_loc3,content_loc4,content_loc5,content_loc6,content_loc7,content_loc8 FROM %s",table);
+    sLog.outString("Loading texts from %s%s", table, extra_content ? ", with additional data" : "");
+
+    QueryResult* result = db.PQuery("SELECT entry,content_default,content_loc1,content_loc2,content_loc3,content_loc4,content_loc5,content_loc6,content_loc7,content_loc8 %s FROM %s",
+                                    extra_content ? ",sound,type,language,emote" : "", table);
 
     if (!result)
     {
@@ -7375,20 +8112,20 @@ bool ObjectMgr::LoadMangosStrings(DatabaseType& db, char const* table, int32 min
 
         if (entry==0)
         {
-            sLog.outErrorDb("Table `%s` contain reserved entry 0, ignored.",table);
+            _DoStringError(start_value, "Table `%s` contain reserved entry 0, ignored.", table);
             continue;
         }
         else if (entry < start_value || entry >= end_value)
         {
-            sLog.outErrorDb("Table `%s` contain entry %i out of allowed range (%d - %d), ignored.",table,entry,min_value,max_value);
+            _DoStringError(start_value, "Table `%s` contain entry %i out of allowed range (%d - %d), ignored.", table, entry, min_value, max_value);
             continue;
         }
 
         MangosStringLocale& data = mMangosStringLocaleMap[entry];
 
-        if (data.Content.size() > 0)
+        if (!data.Content.empty())
         {
-            sLog.outErrorDb("Table `%s` contain data for already loaded entry  %i (from another table?), ignored.",table,entry);
+            _DoStringError(entry, "Table `%s` contain data for already loaded entry  %i (from another table?), ignored.", table, entry);
             continue;
         }
 
@@ -7414,42 +8151,112 @@ bool ObjectMgr::LoadMangosStrings(DatabaseType& db, char const* table, int32 min
                 }
             }
         }
-    } while (result->NextRow());
+
+        // Load additional string content if necessary
+        if (extra_content)
+        {
+            data.SoundId     = fields[10].GetUInt32();
+            data.Type        = fields[11].GetUInt32();
+            data.LanguageId    = Language(fields[12].GetUInt32());
+            data.Emote       = fields[13].GetUInt32();
+
+            if (data.SoundId && !sSoundEntriesStore.LookupEntry(data.SoundId))
+            {
+                _DoStringError(entry, "Entry %i in table `%s` has soundId %u but sound does not exist.", entry, table, data.SoundId);
+                data.SoundId = 0;
+            }
+
+            if (!GetLanguageDescByID(data.LanguageId))
+            {
+                _DoStringError(entry, "Entry %i in table `%s` using Language %u but Language does not exist.", entry, table, uint32(data.LanguageId));
+                data.LanguageId = LANG_UNIVERSAL;
+            }
+
+            if (data.Type >= CHAT_TYPE_MAX)
+            {
+                _DoStringError(entry, "Entry %i in table `%s` has Type %u but this Chat Type does not exist.", entry, table, data.Type);
+                data.Type = CHAT_TYPE_SAY;
+            }
+
+            if (data.Emote && !sEmotesStore.LookupEntry(data.Emote))
+            {
+                _DoStringError(entry, "Entry %i in table `%s` has Emote %u but emote does not exist.", entry, table, data.Emote);
+                data.Emote = EMOTE_ONESHOT_NONE;
+            }
+        }
+    }
+    while (result->NextRow());
 
     delete result;
 
-    sLog.outString();
     if (min_value == MIN_MANGOS_STRING_ID)
         sLog.outString( ">> Loaded %u MaNGOS strings from table %s", count,table);
     else
-        sLog.outString( ">> Loaded %u string templates from %s", count,table);
+        sLog.outString(">> Loaded %u %s templates from %s", count, extra_content ? "text" : "string", table);
+    sLog.outString();
+
+    m_loadedStringCount[min_value] = count;
 
     return true;
 }
 
-const char *ObjectMgr::GetMangosString(int32 entry, int locale_idx) const
+const char* ObjectMgr::GetMangosString(int32 entry, int locale_idx) const
 {
     // locale_idx==-1 -> default, locale_idx >= 0 in to idx+1
     // Content[0] always exist if exist MangosStringLocale
-    if(MangosStringLocale const *msl = GetMangosStringLocale(entry))
+    if (MangosStringLocale const* msl = GetMangosStringLocale(entry))
     {
-        if((int32)msl->Content.size() > locale_idx+1 && !msl->Content[locale_idx+1].empty())
+        if ((int32)msl->Content.size() > locale_idx+1 && !msl->Content[locale_idx+1].empty())
             return msl->Content[locale_idx+1].c_str();
         else
             return msl->Content[0].c_str();
     }
 
-    if(entry > MIN_DB_SCRIPT_STRING_ID)
-        sLog.outErrorDb("Entry %i not found in `db_script_string` table.",entry);
-    else if(entry > 0)
-        sLog.outErrorDb("Entry %i not found in `mangos_string` table.",entry);
-    else if(entry > MAX_CREATURE_AI_TEXT_STRING_ID)
-        sLog.outErrorDb("Entry %i not found in `creature_ai_texts` table.",entry);
-    else
-        sLog.outErrorDb("Mangos string entry %i not found in DB.",entry);
+    _DoStringError(entry, "Entry %i not found but requested", entry);
+
     return "<error>";
 }
 
+void ObjectMgr::LoadSpellDisabledEntrys()
+{
+    m_spell_disabled.clear();                                // need for reload case
+    QueryResult *result = WorldDatabase.Query("SELECT entry, ischeat_spell FROM spell_disabled where active=1");
+
+    uint32 total_count = 0;
+    uint32 cheat_spell_count=0;
+
+    if( !result )
+    {
+        BarGoLink bar( 1 );
+        bar.step();
+
+        sLog.outString();
+        sLog.outString( ">> Loaded %u disabled spells", total_count );
+        return;
+    }
+
+    BarGoLink bar( result->GetRowCount() );
+
+    Field* fields;
+    do
+    {
+        bar.step();
+        fields = result->Fetch();
+        uint32 spellid = fields[0].GetUInt32();
+        bool ischeater = fields[1].GetBool();
+        m_spell_disabled[spellid] = ischeater;
+        ++total_count;
+        if(ischeater)
+        ++cheat_spell_count;
+
+    } while ( result->NextRow() );
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString( ">> Loaded %u disabled spells ( %u - is cheaters spells)", total_count, cheat_spell_count);
+}
+
 void ObjectMgr::LoadFishingBaseSkillLevel()
 {
     mFishingBaseForArea.clear();                            // for reload case
@@ -7496,30 +8303,23 @@ void ObjectMgr::LoadFishingBaseSkillLevel()
     sLog.outString(">> Loaded %u areas for fishing base skill level", count);
 }
 
-// Searches for the same condition already in Conditions store
-// Returns Id if found, else adds it to Conditions and returns Id
-uint16 ObjectMgr::GetConditionId( ConditionType condition, uint32 value1, uint32 value2 )
+// Check if a player meets condition conditionId
+bool ObjectMgr::IsPlayerMeetToCondition(uint16 conditionId, Player const* pPlayer, Map const* map, WorldObject const* source, ConditionSource conditionSourceType) const
 {
-    PlayerCondition lc = PlayerCondition(0, condition, value1, value2);
-    for (uint16 i=0; i < mConditions.size(); ++i)
-    {
-        if (lc == mConditions[i])
-            return i;
-    }
-
-    mConditions.push_back(lc);
-
-    if(mConditions.size() > 0xFFFF)
-    {
-        sLog.outError("Conditions store overflow! Current and later loaded conditions will ignored!");
-        return 0;
-    }
+    if (const PlayerCondition* condition = sConditionStorage.LookupEntry<PlayerCondition>(conditionId))
+        return condition->Meets(pPlayer, map, source, conditionSourceType);
 
-    return mConditions.size() - 1;
+    return false;
 }
 
-bool ObjectMgr::CheckDeclinedNames( std::wstring mainpart, DeclinedName const& names )
+bool ObjectMgr::CheckDeclinedNames( std::wstring w_ownname, DeclinedName const& names )
 {
+    // get main part of the name
+    std::wstring mainpart = GetMainPartOfName(w_ownname, 0);
+    // prepare flags
+    bool x = true;
+    bool y = true;
+    // check declined names
     for(int i =0; i < MAX_DECLINED_NAME_CASES; ++i)
     {
         std::wstring wname;
@@ -7527,25 +8327,48 @@ bool ObjectMgr::CheckDeclinedNames( std::wstring mainpart, DeclinedName const& n
             return false;
 
         if(mainpart!=GetMainPartOfName(wname,i+1))
-            return false;
+            x = false;
+
+        if(w_ownname!=wname)
+            y = false;
     }
-    return true;
+    return (x||y);
 }
 
+char const* conditionSourceToStr[] =
+{
+    "loot system",
+    "referencing loot",
+    "gossip menu",
+    "gossip menu option",
+    "event AI",
+    "hardcoded",
+    "vendor's item check",
+    "spell_area check",
+    "npc_spellclick_spells check",
+    "DBScript engine"
+};
+
 // Checks if player meets the condition
-bool PlayerCondition::Meets(Player const * player) const
+bool PlayerCondition::Meets(Player const* player, Map const* map, WorldObject const* source, ConditionSource conditionSourceType) const
 {
-    if (!player)
-        return false;                                       // player not present, return false
+    DEBUG_LOG("Condition-System: Check condition %u, type %i - called from %s with params plr: %s, map %i, src %s",
+        m_entry, m_condition, conditionSourceToStr[conditionSourceType], player ? player->GetGuidStr().c_str() : "<NULL>", map ? map->GetId() : -1, source ? source->GetGuidStr().c_str() : "<NULL>");
+
+    if (!CheckParamRequirements(player, map, source, conditionSourceType))
+        return false;
 
     switch (m_condition)
     {
+        case CONDITION_NOT:
+            // Checked on load
+            return !sConditionStorage.LookupEntry<PlayerCondition>(m_value1)->Meets(player, map, source, conditionSourceType);
         case CONDITION_OR:
             // Checked on load
-            return sConditionStorage.LookupEntry<PlayerCondition>(m_value1)->Meets(player) || sConditionStorage.LookupEntry<PlayerCondition>(m_value2)->Meets(player);
+            return sConditionStorage.LookupEntry<PlayerCondition>(m_value1)->Meets(player, map, source, conditionSourceType) || sConditionStorage.LookupEntry<PlayerCondition>(m_value2)->Meets(player, map, source, conditionSourceType);
         case CONDITION_AND:
             // Checked on load
-            return sConditionStorage.LookupEntry<PlayerCondition>(m_value1)->Meets(player) && sConditionStorage.LookupEntry<PlayerCondition>(m_value2)->Meets(player);
+            return sConditionStorage.LookupEntry<PlayerCondition>(m_value1)->Meets(player, map, source, conditionSourceType) && sConditionStorage.LookupEntry<PlayerCondition>(m_value2)->Meets(player, map, source, conditionSourceType);
         case CONDITION_NONE:
             return true;                                    // empty condition, always met
         case CONDITION_AURA:
@@ -7557,7 +8380,8 @@ bool PlayerCondition::Meets(Player const * player) const
         case CONDITION_AREAID:
         {
             uint32 zone, area;
-            player->GetZoneAndAreaId(zone,area);
+            WorldObject const* searcher = source ? source : player;
+            searcher->GetZoneAndAreaId(zone, area);
             return (zone == m_value1 || area == m_value1) == (m_value2 == 0);
         }
         case CONDITION_REPUTATION_RANK_MIN:
@@ -7572,14 +8396,12 @@ bool PlayerCondition::Meets(Player const * player) const
         case CONDITION_QUESTREWARDED:
             return player->GetQuestRewardStatus(m_value1);
         case CONDITION_QUESTTAKEN:
-        {
             return player->IsCurrentQuest(m_value1, m_value2);
-        }
         case CONDITION_AD_COMMISSION_AURA:
         {
             Unit::SpellAuraHolderMap const& auras = player->GetSpellAuraHolderMap();
             for (Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
-                if ((itr->second->GetSpellProto()->HasAttribute(SPELL_ATTR_CASTABLE_WHILE_MOUNTED) || itr->second->GetSpellProto()->HasAttribute(SPELL_ATTR_UNK4)) && itr->second->GetSpellProto()->SpellVisual[0]==3580)
+                if ((itr->second->GetSpellProto()->HasAttribute(SPELL_ATTR_CASTABLE_WHILE_MOUNTED) || itr->second->GetSpellProto()->HasAttribute(SPELL_ATTR_ABILITY)) && itr->second->GetSpellProto()->GetSpellVisual()==3580)
                     return true;
             return false;
         }
@@ -7589,7 +8411,8 @@ bool PlayerCondition::Meets(Player const * player) const
             return sGameEventMgr.IsActiveEvent(m_value1);
         case CONDITION_AREA_FLAG:
         {
-            if (AreaTableEntry const *pAreaEntry = GetAreaEntryByAreaID(player->GetAreaId()))
+            WorldObject const* searcher = source ? source : player;
+            if (AreaTableEntry const* pAreaEntry = GetAreaEntryByAreaID(searcher->GetAreaId()))
             {
                 if ((!m_value1 || (pAreaEntry->flags & m_value1)) && (!m_value2 || !(pAreaEntry->flags & m_value2)))
                     return true;
@@ -7602,7 +8425,7 @@ bool PlayerCondition::Meets(Player const * player) const
             return false;
         case CONDITION_LEVEL:
         {
-            switch(m_value2)
+            switch (m_value2)
             {
                 case 0: return player->getLevel() == m_value1;
                 case 1: return player->getLevel() >= m_value1;
@@ -7614,7 +8437,7 @@ bool PlayerCondition::Meets(Player const * player) const
             return !player->HasItemCount(m_value1, m_value2);
         case CONDITION_SPELL:
         {
-            switch(m_value2)
+            switch (m_value2)
             {
                 case 0: return player->HasSpell(m_value1);
                 case 1: return !player->HasSpell(m_value1);
@@ -7623,23 +8446,27 @@ bool PlayerCondition::Meets(Player const * player) const
         }
         case CONDITION_INSTANCE_SCRIPT:
         {
-            // have meaning only for specific map instance script so ignore other maps
-            if (player->GetMapId() != m_value1)
+            if (!map)
+                map = player ? player->GetMap() : source ? source->GetMap() : NULL;
+
+            if (!map)
+            {
+                sLog.outErrorDb("CONDITION_INSTANCE_SCRIPT (entry %u) is used without map by %s", m_entry, player ? player->GetGuidStr().c_str() : source ? source->GetGuidStr().c_str() : "<none>");
                 return false;
-            if (InstanceData* data = player->GetInstanceData())
-                return data->CheckConditionCriteriaMeet(player, m_value1, m_value2);
+            }
+
+            if (InstanceData* data = map->GetInstanceData())
+                return data->CheckConditionCriteriaMeet(player, m_value1, source, conditionSourceType);
+
             return false;
         }
         case CONDITION_QUESTAVAILABLE:
         {
-            if (Quest const* quest = sObjectMgr.GetQuestTemplate(m_value1))
-                return player->CanTakeQuest(quest, false);
-            else
-                return false;
+            return player->CanTakeQuest(sObjectMgr.GetQuestTemplate(m_value1), false);
         }
         case CONDITION_ACHIEVEMENT:
         {
-            switch(m_value2)
+            switch (m_value2)
             {
                 case 0: return player->GetAchievementMgr().HasAchievement(m_value1);
                 case 1: return !player->GetAchievementMgr().HasAchievement(m_value1);
@@ -7649,7 +8476,7 @@ bool PlayerCondition::Meets(Player const * player) const
         case CONDITION_ACHIEVEMENT_REALM:
         {
             AchievementEntry const* ach = sAchievementStore.LookupEntry(m_value1);
-            switch(m_value2)
+            switch (m_value2)
             {
                 case 0: return sAchievementMgr.IsRealmCompleted(ach);
                 case 1: return !sAchievementMgr.IsRealmCompleted(ach);
@@ -7692,7 +8519,7 @@ bool PlayerCondition::Meets(Player const * player) const
 
             SkillLineAbilityMapBounds bounds = sSpellMgr.GetSkillLineAbilityMapBounds(m_value1);
 
-            for(SkillLineAbilityMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+            for (SkillLineAbilityMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
             {
                 const SkillLineAbilityEntry* skillInfo = itr->second;
 
@@ -7725,25 +8552,232 @@ bool PlayerCondition::Meets(Player const * player) const
             return false;
         }
         case CONDITION_SKILL_BELOW:
+        {
             if (m_value2 == 1)
                 return !player->HasSkill(m_value1);
             else
                 return player->HasSkill(m_value1) && player->GetBaseSkillValue(m_value1) < m_value2;
+        }
         case CONDITION_REPUTATION_RANK_MAX:
         {
             FactionEntry const* faction = sFactionStore.LookupEntry(m_value1);
             return faction && player->GetReputationMgr().GetRank(faction) <= ReputationRank(m_value2);
         }
+        case CONDITION_COMPLETED_ENCOUNTER:
+        {
+            if (!map)
+                map = player ? player->GetMap() : source ? source->GetMap() : NULL;
+
+            if (!map)
+            {
+                sLog.outErrorDb("CONDITION_COMPLETED_ENCOUNTER (entry %u) is used without dungeon map by %s", m_entry, player ? player->GetGuidStr().c_str() : source ? source->GetGuidStr().c_str() : "<none>");
+                return false;
+            }
+
+            if (!map->IsDungeon())
+            {
+                sLog.outErrorDb("CONDITION_COMPLETED_ENCOUNTER (entry %u) is used outside of a dungeon (on Map %u) by %s", m_entry, player->GetMapId(), player->GetGuidStr().c_str());
+                return false;
+            }
+
+            uint32 completedEncounterMask = ((DungeonMap*)map)->GetPersistanceState()->GetCompletedEncountersMask();
+            DungeonEncounterEntry const* dbcEntry1 = sDungeonEncounterStore.LookupEntry(m_value1);
+            DungeonEncounterEntry const* dbcEntry2 = sDungeonEncounterStore.LookupEntry(m_value2);
+            // Check that on proper map
+            if (dbcEntry1->mapId != map->GetId())
+            {
+                sLog.outErrorDb("CONDITION_COMPLETED_ENCOUNTER (entry %u, DungeonEncounterEntry %u) is used on wrong map (used on Map %u) by %s", m_entry, m_value1, player->GetMapId(), player->GetGuidStr().c_str());
+                return false;
+            }
+            // Select matching difficulties
+            if (map->GetDifficulty() != Difficulty(dbcEntry1->Difficulty))
+                dbcEntry1 = NULL;
+            if (dbcEntry2 && map->GetDifficulty() != Difficulty(dbcEntry2->Difficulty))
+                dbcEntry2 = NULL;
+
+            return completedEncounterMask & ((dbcEntry1 ? 1 << dbcEntry1->encounterIndex : 0) | (dbcEntry2 ? 1 << dbcEntry2->encounterIndex : 0));
+        }
+        case CONDITION_SOURCE_AURA:
+        {
+            if (!source->isType(TYPEMASK_UNIT))
+            {
+                sLog.outErrorDb("CONDITION_SOURCE_AURA (entry %u) is used for non unit source (source %s) by %s", m_entry, source->GetGuidStr().c_str(), player->GetGuidStr().c_str());
+                return false;
+            }
+            return ((Unit*)source)->HasAura(m_value1, SpellEffectIndex(m_value2));
+        }
+        case CONDITION_LAST_WAYPOINT:
+        {
+            if (source->GetTypeId() != TYPEID_UNIT)
+            {
+                sLog.outErrorDb("CONDITION_LAST_WAYPOINT (entry %u) is used for non creature source (source %s) by %s", m_entry, source->GetGuidStr().c_str(), player->GetGuidStr().c_str());
+                return false;
+            }
+            uint32 lastReachedWp = ((Creature*)source)->GetMotionMaster()->getLastReachedWaypoint();
+            switch (m_value2)
+            {
+                case 0: return m_value1 == lastReachedWp;
+                case 1: return m_value1 <= lastReachedWp;
+                case 2: return m_value1 > lastReachedWp;
+            }
+            return false;
+        }
+        case CONDITION_XP_USER:
+        {
+            switch (m_value1)
+            {
+                case 0: return player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_XP_USER_DISABLED);
+                case 1: return !player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_XP_USER_DISABLED);
+            }
+            return false;
+        }
+        case CONDITION_GENDER:
+            return player->getGender() == m_value1;
+        case CONDITION_DEAD_OR_AWAY:
+            switch (m_value1)
+            {
+                case 0:                                     // Player dead or out of range
+                    return !player || !player->isAlive() || (m_value2 && source && !source->IsWithinDistInMap(player, m_value2));
+                case 1:                                     // All players in Group dead or out of range
+                    if (!player)
+                        return true;
+                    if (Group const* grp = player->GetGroup())
+                    {
+                        for (GroupReference const* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
+                        {
+                            Player const* pl = itr->getSource();
+                            if (pl && pl->isAlive() && !pl->isGameMaster() && (!m_value2 || !source || source->IsWithinDistInMap(pl, m_value2)))
+                                return false;
+                        }
+                        return true;
+                    }
+                    else
+                        return !player->isAlive() || (m_value2 && source && !source->IsWithinDistInMap(player, m_value2));
+                case 2:                                     // All players in instance dead or out of range
+                    for (Map::PlayerList::const_iterator itr = map->GetPlayers().begin(); itr != map->GetPlayers().end(); ++itr)
+                    {
+                        Player const* plr = itr->getSource();
+                        if (plr && plr->isAlive() && !plr->isGameMaster() && (!m_value2 || !source || source->IsWithinDistInMap(plr, m_value2)))
+                            return false;
+                    }
+                    return true;
+                case 3:                                     // Creature source is dead
+                    return !source || source->GetTypeId() != TYPEID_UNIT || !((Unit*)source)->isAlive();
+            }
+        case CONDITION_CREATURE_IN_RANGE:
+        {
+            Creature* creature = NULL;
+
+            MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck creature_check(*player, m_value1, true, false, m_value2, true);
+            MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(creature, creature_check);
+            Cell::VisitGridObjects(player, searcher, m_value2);
+
+            return creature;
+        }
         default:
             return false;
     }
 }
 
+// Which params must be provided to a Condition
+bool PlayerCondition::CheckParamRequirements(Player const* pPlayer, Map const* map, WorldObject const* source, ConditionSource conditionSourceType) const
+{
+    switch (m_condition)
+    {
+        case CONDITION_NOT:
+        case CONDITION_AND:
+        case CONDITION_OR:
+        case CONDITION_NONE:
+        case CONDITION_ACTIVE_GAME_EVENT:
+        case CONDITION_ACHIEVEMENT_REALM:
+        case CONDITION_NOT_ACTIVE_GAME_EVENT:
+        case CONDITION_ACTIVE_HOLIDAY:
+        case CONDITION_NOT_ACTIVE_HOLIDAY:
+            break;
+        case CONDITION_AREAID:
+        case CONDITION_AREA_FLAG:
+            if (!pPlayer && !source)
+            {
+                sLog.outErrorDb("CONDITION %u type %u used with bad parameters, called from %s, used with plr: %s, map %i, src %s",
+                                    m_entry, m_condition, conditionSourceToStr[conditionSourceType], pPlayer ? pPlayer->GetGuidStr().c_str() : "NULL", map ? map->GetId() : -1, source ? source->GetGuidStr().c_str() : "NULL");
+                return false;
+            }
+            break;
+        case CONDITION_INSTANCE_SCRIPT:
+        case CONDITION_COMPLETED_ENCOUNTER:
+            if (!pPlayer && !source && !map)
+            {
+                sLog.outErrorDb("CONDITION %u type %u used with bad parameters, called from %s, used with plr: %s, map %i, src %s",
+                                    m_entry, m_condition, conditionSourceToStr[conditionSourceType], pPlayer ? pPlayer->GetGuidStr().c_str() : "NULL", map ? map->GetId() : -1, source ? source->GetGuidStr().c_str() : "NULL");
+                return false;
+            }
+            break;
+        case CONDITION_SOURCE_AURA:
+        case CONDITION_LAST_WAYPOINT:
+            if (!source)
+            {
+                sLog.outErrorDb("CONDITION %u type %u used with bad parameters, called from %s, used with plr: %s, map %i, src %s",
+                                    m_entry, m_condition, conditionSourceToStr[conditionSourceType], pPlayer ? pPlayer->GetGuidStr().c_str() : "NULL", map ? map->GetId() : -1, source ? source->GetGuidStr().c_str() : "NULL");
+                return false;
+            }
+            break;
+        case CONDITION_DEAD_OR_AWAY:
+            switch (m_value1)
+            {
+                case 0:                                     // Player dead or out of range
+                case 1:                                     // All players in Group dead or out of range
+                case 2:                                     // All players in instance dead or out of range
+                    if (m_value2 && !source)
+                    {
+                        sLog.outErrorDb("CONDITION_DEAD_OR_AWAY %u - called from %s without source, but source expected for range check", m_entry, conditionSourceToStr[conditionSourceType]);
+                        return false;
+                    }
+                    if (m_value1 != 2)
+                        return true;
+                    // Case 2 (Instance map only)
+                    if (!map && (pPlayer || source))
+                        map = source ? source->GetMap() : pPlayer->GetMap();
+                    if (!map || !map->Instanceable())
+                    {
+                        sLog.outErrorDb("CONDITION_DEAD_OR_AWAY %u (Player in instance case) - called from %s without map param or from non-instanceable map %i", m_entry,  conditionSourceToStr[conditionSourceType], map ? map->GetId() : -1);
+                        return false;
+                    }
+                case 3:                                     // Creature source is dead
+                    return true;
+            }
+            break;
+        default:
+            if (!pPlayer)
+            {
+                sLog.outErrorDb("CONDITION %u type %u used with bad parameters, called from %s, used with plr: %s, map %i, src %s",
+                                    m_entry, m_condition, conditionSourceToStr[conditionSourceType], pPlayer ? pPlayer->GetGuidStr().c_str() : "NULL", map ? map->GetId() : -1, source ? source->GetGuidStr().c_str() : "NULL");
+                return false;
+            }
+            break;
+    }
+    return true;
+}
+
 // Verification of condition values validity
 bool PlayerCondition::IsValid(uint16 entry, ConditionType condition, uint32 value1, uint32 value2)
 {
     switch (condition)
     {
+        case CONDITION_NOT:
+        {
+            if (value1 >= entry)
+            {
+                sLog.outErrorDb("NOT condition (entry %u, type %d) has invalid value1 %u, must be lower than entry, skipped", entry, condition, value1);
+                return false;
+            }
+            const PlayerCondition* condition1 = sConditionStorage.LookupEntry<PlayerCondition>(value1);
+            if (!condition1)
+            {
+                sLog.outErrorDb("NOT condition (entry %u, type %d) has value1 %u without proper condition, skipped", entry, condition, value1);
+                return false;
+            }
+            break;
+        }
         case CONDITION_OR:
         case CONDITION_AND:
         {
@@ -7772,6 +8806,7 @@ bool PlayerCondition::IsValid(uint16 entry, ConditionType condition, uint32 valu
             break;
         }
         case CONDITION_AURA:
+        case CONDITION_SOURCE_AURA:
         {
             if (!sSpellStore.LookupEntry(value1))
             {
@@ -7903,7 +8938,7 @@ bool PlayerCondition::IsValid(uint16 entry, ConditionType condition, uint32 valu
                 sLog.outErrorDb("Aura condition (entry %u, type %u) requires to have non existing spell (Id: %d), skipped", entry, condition, value1);
                 return false;
             }
-            if (value2 > MAX_EFFECT_INDEX)
+            if (value2 >= MAX_EFFECT_INDEX)
             {
                 sLog.outErrorDb("Aura condition (entry %u, type %u) requires to have non existing effect index (%u) (must be 0..%u), skipped", entry, condition, value2, MAX_EFFECT_INDEX-1);
                 return false;
@@ -7983,16 +9018,7 @@ bool PlayerCondition::IsValid(uint16 entry, ConditionType condition, uint32 valu
             break;
         }
         case CONDITION_INSTANCE_SCRIPT:
-        {
-            MapEntry const* mapEntry = sMapStore.LookupEntry(value1);
-            if (!mapEntry || !mapEntry->IsDungeon())
-            {
-                sLog.outErrorDb("Instance script condition (entry %u, type %u) has nonexistent map id %u as first arg, skipped", entry, condition, value1);
-                return false;
-            }
-
             break;
-        }
         case CONDITION_ACHIEVEMENT:
         case CONDITION_ACHIEVEMENT_REALM:
         {
@@ -8026,7 +9052,7 @@ bool PlayerCondition::IsValid(uint16 entry, ConditionType condition, uint32 valu
 
             if (bounds.first == bounds.second)
             {
-                sLog.outErrorDb("Learnable ability conditon (entry %u, type %u) has spell id %u defined, but this spell is not listed in SkillLineAbility and can not be used, skipping.", entry, condition, value1);
+                sLog.outErrorDb("Learnable ability condition (entry %u, type %u) has spell id %u defined, but this spell is not listed in SkillLineAbility and can not be used, skipping.", entry, condition, value1);
                 return false;
             }
 
@@ -8035,15 +9061,89 @@ bool PlayerCondition::IsValid(uint16 entry, ConditionType condition, uint32 valu
                 ItemPrototype const *proto = ObjectMgr::GetItemPrototype(value2);
                 if (!proto)
                 {
-                    sLog.outErrorDb("Learnable ability conditon (entry %u, type %u) has item entry %u defined but item does not exist, skipping.", entry, condition, value2);
+                    sLog.outErrorDb("Learnable ability condition (entry %u, type %u) has item entry %u defined but item does not exist, skipping.", entry, condition, value2);
                     return false;
                 }
             }
 
             break;
         }
-        case CONDITION_NONE:
-            break;
+        case CONDITION_COMPLETED_ENCOUNTER:
+        {
+            DungeonEncounterEntry const* dbcEntry1 = sDungeonEncounterStore.LookupEntry(value1);
+            DungeonEncounterEntry const* dbcEntry2 = sDungeonEncounterStore.LookupEntry(value2);
+            if (!dbcEntry1)
+            {
+                sLog.outErrorDb("Completed Encounter condition (entry %u, type %u) has an unknown DungeonEncounter entry %u defined (in value1), skipping.", entry, condition, value1);
+                return false;
+            }
+            if (value2 && !dbcEntry2)
+            {
+                sLog.outErrorDb("Completed Encounter condition (entry %u, type %u) has an unknown DungeonEncounter entry %u defined (in value2), skipping.", entry, condition, value2);
+                return false;
+            }
+            if (dbcEntry2 && dbcEntry1->mapId != dbcEntry2->mapId)
+            {
+                sLog.outErrorDb("Completed Encounter condition (entry %u, type %u) has different mapIds for both encounters, skipping.", entry, condition);
+                return false;
+            }
+            break;
+        }
+        case CONDITION_LAST_WAYPOINT:
+        {
+            if (value2 > 2)
+            {
+                sLog.outErrorDb("Last Waypoint condition (entry %u, type %u) has an invalid value in value2. (Has %u, supported 0, 1, or 2), skipping.", entry, condition, value2);
+                return false;
+            }
+            break;
+        }
+        case CONDITION_XP_USER:
+        {
+            if (value1 > 1)
+            {
+                sLog.outErrorDb("XP user condition (entry %u, type %u) has invalid argument %u (must be 0..1), skipped", entry, condition, value1);
+                return false;
+            }
+
+            if (value2)
+                sLog.outErrorDb("XP user condition (entry %u, type %u) has useless data in value2 (%u)!", entry, condition, value2);
+
+            break;
+        }
+        case CONDITION_GENDER:
+        {
+            if (value1 >= MAX_GENDER)
+            {
+                sLog.outErrorDb("Gender condition (entry %u, type %u) has an invalid value in value1. (Has %u, must be smaller than %u), skipping.", entry, condition, value1, MAX_GENDER);
+                return false;
+            }
+            break;
+        }
+        case CONDITION_DEAD_OR_AWAY:
+        {
+            if (value1 >= 4)
+            {
+                sLog.outErrorDb("Dead condition (entry %u, type %u) has an invalid value in value1. (Has %u, must be smaller than 4), skipping.", entry, condition, value1);
+                return false;
+            }
+            break;
+        }
+        case CONDITION_CREATURE_IN_RANGE:
+        {
+            if (!sCreatureStorage.LookupEntry<CreatureInfo> (value1))
+            {
+                sLog.outErrorDb("Creature in range condition (entry %u, type %u) has an invalid value in value1. (Creature %u does not exist in the database), skipping.", entry, condition, value1);
+                return false;
+            }
+            if (value2 <= 0)
+            {
+                sLog.outErrorDb("Creature in range condition (entry %u, type %u) has an invalid value in value2. (Range %u must be greater than 0), skipping.", entry, condition, value2);
+                return false;
+            }
+        }
+        case CONDITION_NONE:
+            break;
         default:
             sLog.outErrorDb("Condition entry %u has bad type of %d, skipped ", entry, condition);
             return false;
@@ -8051,7 +9151,39 @@ bool PlayerCondition::IsValid(uint16 entry, ConditionType condition, uint32 valu
     return true;
 }
 
-SkillRangeType GetSkillRangeType(SkillLineEntry const *pSkill, bool racial)
+// Check if a condition can be used without providing a player param
+bool PlayerCondition::CanBeUsedWithoutPlayer(uint16 entry)
+{
+    PlayerCondition const* condition = sConditionStorage.LookupEntry<PlayerCondition>(entry);
+    if (!condition)
+        return false;
+
+    switch (condition->m_condition)
+    {
+        case CONDITION_NOT:
+            return CanBeUsedWithoutPlayer(condition->m_value1);
+        case CONDITION_AND:
+        case CONDITION_OR:
+            return CanBeUsedWithoutPlayer(condition->m_value1) && CanBeUsedWithoutPlayer(condition->m_value2);
+        case CONDITION_NONE:
+        case CONDITION_ACTIVE_GAME_EVENT:
+        case CONDITION_ACHIEVEMENT_REALM:
+        case CONDITION_NOT_ACTIVE_GAME_EVENT:
+        case CONDITION_ACTIVE_HOLIDAY:
+        case CONDITION_NOT_ACTIVE_HOLIDAY:
+        case CONDITION_AREAID:
+        case CONDITION_AREA_FLAG:
+        case CONDITION_INSTANCE_SCRIPT:
+        case CONDITION_COMPLETED_ENCOUNTER:
+        case CONDITION_SOURCE_AURA:
+        case CONDITION_LAST_WAYPOINT:
+            return true;
+        default:
+            return false;
+    }
+}
+
+SkillRangeType GetSkillRangeType(SkillLineEntry const* pSkill, bool racial)
 {
     switch(pSkill->categoryId)
     {
@@ -8113,14 +9245,14 @@ void ObjectMgr::LoadGameTele()
 
         GameTele gt;
 
-        gt.position_x     = fields[1].GetFloat();
-        gt.position_y     = fields[2].GetFloat();
-        gt.position_z     = fields[3].GetFloat();
-        gt.orientation    = fields[4].GetFloat();
-        gt.mapId          = fields[5].GetUInt32();
+        gt.loc.x          = fields[1].GetFloat();
+        gt.loc.y          = fields[2].GetFloat();
+        gt.loc.z          = fields[3].GetFloat();
+        gt.loc.orientation = fields[4].GetFloat();
+        gt.loc.SetMapId(fields[5].GetUInt32());
         gt.name           = fields[6].GetCppString();
 
-        if (!MapManager::IsValidMapCoord(gt.mapId,gt.position_x,gt.position_y,gt.position_z,gt.orientation))
+        if (!MapManager::IsValidMapCoord(gt.loc))
         {
             sLog.outErrorDb("Wrong position for id %u (name: %s) in `game_tele` table, ignoring.",id,gt.name.c_str());
             continue;
@@ -8145,34 +9277,57 @@ void ObjectMgr::LoadGameTele()
     sLog.outString(">> Loaded %u GameTeleports", count);
 }
 
-GameTele const* ObjectMgr::GetGameTele(const std::string& name) const
+GameTele const* ObjectMgr::GetGameTele(std::string const& name) const
 {
     // explicit name case
     std::wstring wname;
-    if(!Utf8toWStr(name,wname))
+    if (!Utf8toWStr(name, wname))
         return NULL;
 
     // converting string that we try to find to lower case
-    wstrToLower( wname );
+    wstrToLower(wname);
 
     // Alternative first GameTele what contains wnameLow as substring in case no GameTele location found
     const GameTele* alt = NULL;
-    for(GameTeleMap::const_iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr)
-        if(itr->second.wnameLow == wname)
+    for (GameTeleMap::const_iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr)
+    {
+        if (itr->second.wnameLow == wname)
             return &itr->second;
         else if (alt == NULL && itr->second.wnameLow.find(wname) != std::wstring::npos)
             alt = &itr->second;
+    }
 
     return alt;
 }
 
+GameTele const* ObjectMgr::GetGameTeleExactName(std::string const& name) const
+{
+    // explicit name case
+    std::wstring wname;
+    if (!Utf8toWStr(name, wname))
+        return NULL;
+
+    // converting string that we try to find to lower case
+    wstrToLower(wname);
+
+    for (GameTeleMap::const_iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr)
+    {
+        if (itr->second.wnameLow == wname)
+            return &itr->second;
+    }
+
+    return NULL;
+}
+
 bool ObjectMgr::AddGameTele(GameTele& tele)
 {
     // find max id
     uint32 new_id = 0;
     for (GameTeleMap::const_iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr)
+    {
         if (itr->first > new_id)
             new_id = itr->first;
+    }
 
     // use next
     ++new_id;
@@ -8183,31 +9338,32 @@ bool ObjectMgr::AddGameTele(GameTele& tele)
     wstrToLower(tele.wnameLow);
 
     m_GameTeleMap[new_id] = tele;
+
     std::string safeName(tele.name);
     WorldDatabase.escape_string(safeName);
 
     return WorldDatabase.PExecuteLog("INSERT INTO game_tele "
         "(id,position_x,position_y,position_z,orientation,map,name) "
         "VALUES (%u,%f,%f,%f,%f,%u,'%s')",
-        new_id, tele.position_x, tele.position_y, tele.position_z,
-        tele.orientation, tele.mapId, safeName.c_str());
+        new_id, tele.loc.x, tele.loc.y, tele.loc.z,
+        tele.loc.o, tele.loc.GetMapId(), safeName.c_str());
 }
 
 bool ObjectMgr::DeleteGameTele(const std::string& name)
 {
     // explicit name case
     std::wstring wname;
-    if(!Utf8toWStr(name,wname))
+    if (!Utf8toWStr(name, wname))
         return false;
 
     // converting string that we try to find to lower case
-    wstrToLower( wname );
+    wstrToLower(wname);
 
-    for(GameTeleMap::iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr)
+    for (GameTeleMap::iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr)
     {
-        if(itr->second.wnameLow == wname)
+        if (itr->second.wnameLow == wname)
         {
-            WorldDatabase.PExecuteLog("DELETE FROM game_tele WHERE name = '%s'",itr->second.name.c_str());
+            WorldDatabase.PExecuteLog("DELETE FROM game_tele WHERE name = '%s'", itr->second.name.c_str());
             m_GameTeleMap.erase(itr);
             return true;
         }
@@ -8353,7 +9509,7 @@ void ObjectMgr::LoadTrainers(char const* tableName, bool isTemplates)
                 continue;
             }
 
-            if (!(cInfo->npcflag & UNIT_NPC_FLAG_TRAINER))
+            if (!(cInfo->NpcFlags & UNIT_NPC_FLAG_TRAINER))
             {
                 if (skip_trainers.find(entry) == skip_trainers.end())
                 {
@@ -8363,11 +9519,11 @@ void ObjectMgr::LoadTrainers(char const* tableName, bool isTemplates)
                 continue;
             }
 
-            if (TrainerSpellData const* tSpells = cInfo->trainerId ? GetNpcTrainerTemplateSpells(cInfo->trainerId) : NULL)
+            if (TrainerSpellData const* tSpells = cInfo->TrainerTemplateId ? GetNpcTrainerTemplateSpells(cInfo->TrainerTemplateId) : NULL)
             {
                 if (tSpells->spellList.find(spell) != tSpells->spellList.end())
                 {
-                    sLog.outErrorDb("Table `%s` (Entry: %u) has spell %u listed in trainer template %u, ignore", tableName, entry, spell, cInfo->trainerId);
+                    sLog.outErrorDb("Table `%s` (Entry: %u) has spell %u listed in trainer template %u, ignore", tableName, entry, spell, cInfo->TrainerTemplateId);
                     continue;
                 }
             }
@@ -8452,16 +9608,16 @@ void ObjectMgr::LoadTrainerTemplates()
     for(CacheTrainerSpellMap::const_iterator tItr = m_mCacheTrainerTemplateSpellMap.begin(); tItr != m_mCacheTrainerTemplateSpellMap.end(); ++tItr)
         trainer_ids.insert(tItr->first);
 
-    for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i)
+    for (uint32 i = 1; i < sCreatureStorage.GetMaxEntry(); ++i)
     {
         if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
         {
-            if (cInfo->trainerId)
+            if (cInfo->TrainerTemplateId)
             {
-                if (m_mCacheTrainerTemplateSpellMap.find(cInfo->trainerId) != m_mCacheTrainerTemplateSpellMap.end())
-                    trainer_ids.erase(cInfo->trainerId);
+                if (m_mCacheTrainerTemplateSpellMap.find(cInfo->TrainerTemplateId) != m_mCacheTrainerTemplateSpellMap.end())
+                    trainer_ids.erase(cInfo->TrainerTemplateId);
                 else
-                    sLog.outErrorDb("Creature (Entry: %u) has trainer_id = %u for nonexistent trainer template", cInfo->Entry, cInfo->trainerId);
+                    sLog.outErrorDb("Creature (Entry: %u) has trainer_id = %u for nonexistent trainer template", cInfo->Entry, cInfo->TrainerTemplateId);
             }
         }
     }
@@ -8481,7 +9637,7 @@ void ObjectMgr::LoadVendors(char const* tableName, bool isTemplates)
 
     std::set<uint32> skip_vendors;
 
-    QueryResult *result = WorldDatabase.PQuery("SELECT entry, item, maxcount, incrtime, ExtendedCost FROM %s", tableName);
+    QueryResult* result = WorldDatabase.PQuery("SELECT entry, item, maxcount, incrtime, ExtendedCost, condition_id FROM %s", tableName);
     if (!result)
     {
         BarGoLink bar(1);
@@ -8506,13 +9662,14 @@ void ObjectMgr::LoadVendors(char const* tableName, bool isTemplates)
         uint32 maxcount     = fields[2].GetUInt32();
         uint32 incrtime     = fields[3].GetUInt32();
         uint32 ExtendedCost = fields[4].GetUInt32();
+        uint16 conditionId  = fields[5].GetUInt16();
 
-        if (!IsVendorItemValid(isTemplates, tableName, entry, item_id, maxcount, incrtime, ExtendedCost, NULL, &skip_vendors))
+        if (!IsVendorItemValid(isTemplates, tableName, entry, item_id, maxcount, incrtime, ExtendedCost, conditionId, NULL, &skip_vendors))
             continue;
 
         VendorItemData& vList = vendorList[entry];
 
-        vList.AddItem(item_id, maxcount, incrtime, ExtendedCost);
+        vList.AddItem(item_id, maxcount, incrtime, ExtendedCost, conditionId);
         ++count;
 
     } while (result->NextRow());
@@ -8533,16 +9690,16 @@ void ObjectMgr::LoadVendorTemplates()
     for(CacheVendorItemMap::const_iterator vItr = m_mCacheVendorTemplateItemMap.begin(); vItr != m_mCacheVendorTemplateItemMap.end(); ++vItr)
         vendor_ids.insert(vItr->first);
 
-    for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i)
+    for (uint32 i = 1; i < sCreatureStorage.GetMaxEntry(); ++i)
     {
         if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
         {
-            if (cInfo->vendorId)
+            if (cInfo->VendorTemplateId)
             {
-                if (m_mCacheVendorTemplateItemMap.find(cInfo->vendorId) !=  m_mCacheVendorTemplateItemMap.end())
-                    vendor_ids.erase(cInfo->vendorId);
+                if (m_mCacheVendorTemplateItemMap.find(cInfo->VendorTemplateId) !=  m_mCacheVendorTemplateItemMap.end())
+                    vendor_ids.erase(cInfo->VendorTemplateId);
                 else
-                    sLog.outErrorDb("Creature (Entry: %u) has vendor_id = %u for nonexistent vendor template", cInfo->Entry, cInfo->vendorId);
+                    sLog.outErrorDb("Creature (Entry: %u) has vendor_id = %u for nonexistent vendor template", cInfo->Entry, cInfo->VendorTemplateId);
             }
         }
     }
@@ -8551,64 +9708,13 @@ void ObjectMgr::LoadVendorTemplates()
         sLog.outErrorDb("Table `npc_vendor_template` has vendor template %u not used by any vendors ", *vItr);
 }
 
-void ObjectMgr::LoadNpcGossips()
-{
-
-    m_mCacheNpcTextIdMap.clear();
-
-    QueryResult* result = WorldDatabase.Query("SELECT npc_guid, textid FROM npc_gossip");
-    if( !result )
-    {
-        BarGoLink bar(1);
-
-        bar.step();
-
-        sLog.outString();
-        sLog.outErrorDb(">> Loaded `npc_gossip`, table is empty!");
-        return;
-    }
-
-    BarGoLink bar(result->GetRowCount());
-
-    uint32 count = 0;
-    uint32 guid,textid;
-    do
-    {
-        bar.step();
-
-        Field* fields = result->Fetch();
-
-        guid   = fields[0].GetUInt32();
-        textid = fields[1].GetUInt32();
-
-        if (!GetCreatureData(guid))
-        {
-            sLog.outErrorDb("Table `npc_gossip` have nonexistent creature (GUID: %u) entry, ignore. ",guid);
-            continue;
-        }
-        if (!GetGossipText(textid))
-        {
-            sLog.outErrorDb("Table `npc_gossip` for creature (GUID: %u) have wrong Textid (%u), ignore. ", guid, textid);
-            continue;
-        }
-
-        m_mCacheNpcTextIdMap[guid] = textid ;
-        ++count;
-
-    } while (result->NextRow());
-    delete result;
-
-    sLog.outString();
-    sLog.outString( ">> Loaded %d NpcTextId ", count );
-}
-
 void ObjectMgr::LoadGossipMenu(std::set<uint32>& gossipScriptSet)
 {
     m_mGossipMenusMap.clear();
     //                                                0      1        2
     QueryResult* result = WorldDatabase.Query("SELECT entry, text_id, script_id, "
-    //   3       4             5             6       7             8            9
-        "cond_1, cond_1_val_1, cond_1_val_2, cond_2, cond_2_val_1, cond_2_val_2, condition_id FROM gossip_menu");
+                          //   3
+                          "condition_id FROM gossip_menu");
 
     if (!result)
     {
@@ -8637,14 +9743,7 @@ void ObjectMgr::LoadGossipMenu(std::set<uint32>& gossipScriptSet)
         gMenu.text_id           = fields[1].GetUInt32();
         gMenu.script_id         = fields[2].GetUInt32();
 
-        ConditionType cond_1    = (ConditionType)fields[3].GetUInt32();
-        uint32 cond_1_val_1     = fields[4].GetUInt32();
-        uint32 cond_1_val_2     = fields[5].GetUInt32();
-        ConditionType cond_2    = (ConditionType)fields[6].GetUInt32();
-        uint32 cond_2_val_1     = fields[7].GetUInt32();
-        uint32 cond_2_val_2     = fields[8].GetUInt32();
-
-        gMenu.conditionId       = fields[9].GetUInt16();
+        gMenu.conditionId       = fields[3].GetUInt16();
 
         if (!GetGossipText(gMenu.text_id))
         {
@@ -8657,7 +9756,7 @@ void ObjectMgr::LoadGossipMenu(std::set<uint32>& gossipScriptSet)
         {
             if (sGossipScripts.second.find(gMenu.script_id) == sGossipScripts.second.end())
             {
-                sLog.outErrorDb("Table gossip_menu for menu %u, text-id %u have script_id %u that does not exist in `gossip_scripts`, ignoring", gMenu.entry, gMenu.text_id, gMenu.script_id);
+                sLog.outErrorDb("Table gossip_menu for menu %u, text-id %u have script_id %u that does not exist in `dbscripts_on_gossip`, ignoring", gMenu.entry, gMenu.text_id, gMenu.script_id);
                 continue;
             }
 
@@ -8665,21 +9764,6 @@ void ObjectMgr::LoadGossipMenu(std::set<uint32>& gossipScriptSet)
             gossipScriptSet.erase(gMenu.script_id);
         }
 
-        if (!PlayerCondition::IsValid(0, cond_1, cond_1_val_1, cond_1_val_2))
-        {
-            sLog.outErrorDb("Table gossip_menu entry %u, invalid condition 1 for id %u", gMenu.entry, gMenu.text_id);
-            continue;
-        }
-
-        if (!PlayerCondition::IsValid(0, cond_2, cond_2_val_1, cond_2_val_2))
-        {
-            sLog.outErrorDb("Table gossip_menu entry %u, invalid condition 2 for id %u", gMenu.entry, gMenu.text_id);
-            continue;
-        }
-
-        gMenu.cond_1 = GetConditionId(cond_1, cond_1_val_1, cond_1_val_2);
-        gMenu.cond_2 = GetConditionId(cond_2, cond_2_val_1, cond_2_val_2);
-
         if (gMenu.conditionId)
         {
             const PlayerCondition* condition = sConditionStorage.LookupEntry<PlayerCondition>(gMenu.conditionId);
@@ -8702,30 +9786,27 @@ void ObjectMgr::LoadGossipMenu(std::set<uint32>& gossipScriptSet)
     sLog.outString( ">> Loaded %u gossip_menu entries", count);
 
     // post loading tests
-    for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i)
+    for (uint32 i = 1; i < sCreatureStorage.GetMaxEntry(); ++i)
         if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
             if (cInfo->GossipMenuId)
                 if (m_mGossipMenusMap.find(cInfo->GossipMenuId) == m_mGossipMenusMap.end())
                     sLog.outErrorDb("Creature (Entry: %u) has gossip_menu_id = %u for nonexistent menu", cInfo->Entry, cInfo->GossipMenuId);
 
-    for(uint32 i = 1; i < sGOStorage.MaxEntry; ++i)
-        if (GameObjectInfo const* gInfo = sGOStorage.LookupEntry<GameObjectInfo>(i))
-            if (uint32 menuid = gInfo->GetGossipMenuId())
-                if (m_mGossipMenusMap.find(menuid) == m_mGossipMenusMap.end())
-                    ERROR_DB_STRICT_LOG("Gameobject (Entry: %u) has gossip_menu_id = %u for nonexistent menu", gInfo->id, menuid);
+    for (SQLStorageBase::SQLSIterator<GameObjectInfo> itr = sGOStorage.getDataBegin<GameObjectInfo>(); itr < sGOStorage.getDataEnd<GameObjectInfo>(); ++itr)
+        if (uint32 menuid = itr->GetGossipMenuId())
+            if (m_mGossipMenusMap.find(menuid) == m_mGossipMenusMap.end())
+                ERROR_DB_STRICT_LOG("Gameobject (Entry: %u) has gossip_menu_id = %u for nonexistent menu", itr->id, menuid);
 }
 
 void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
 {
     m_mGossipMenuItemsMap.clear();
 
-    QueryResult *result = WorldDatabase.Query(
-        "SELECT menu_id, id, option_icon, option_text, option_id, npc_option_npcflag, "
-        "action_menu_id, action_poi_id, action_script_id, box_coded, box_money, box_text, "
-        "cond_1, cond_1_val_1, cond_1_val_2, "
-        "cond_2, cond_2_val_1, cond_2_val_2, "
-        "cond_3, cond_3_val_1, cond_3_val_2, condition_id "
-        "FROM gossip_menu_option");
+    QueryResult* result = WorldDatabase.Query(
+                              "SELECT menu_id, id, option_icon, option_text, option_id, npc_option_npcflag, "
+                              "action_menu_id, action_poi_id, action_script_id, box_coded, box_money, box_text, "
+                              "condition_id "
+                              "FROM gossip_menu_option ORDER BY menu_id, id");
 
     if (!result)
     {
@@ -8746,10 +9827,9 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
             if (itr->first)
                 menu_ids.insert(itr->first);
 
-        for (uint32 i = 1; i < sGOStorage.MaxEntry; ++i)
-            if (GameObjectInfo const* gInfo = sGOStorage.LookupEntry<GameObjectInfo>(i))
-                if (uint32 menuid = gInfo->GetGossipMenuId())
-                    menu_ids.erase(menuid);
+        for (SQLStorageBase::SQLSIterator<GameObjectInfo> itr = sGOStorage.getDataBegin<GameObjectInfo>(); itr < sGOStorage.getDataEnd<GameObjectInfo>(); ++itr)
+            if (uint32 menuid = itr->GetGossipMenuId())
+                menu_ids.erase(menuid);
     }
 
     // loading
@@ -8760,7 +9840,7 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
     // prepare menuid -> CreatureInfo map for fast access
     typedef  std::multimap<uint32, const CreatureInfo*> Menu2CInfoMap;
     Menu2CInfoMap menu2CInfoMap;
-    for (uint32 i = 1;  i < sCreatureStorage.MaxEntry; ++i)
+    for (uint32 i = 1;  i < sCreatureStorage.GetMaxEntry(); ++i)
         if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
             if (cInfo->GossipMenuId)
             {
@@ -8792,16 +9872,7 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
         gMenuItem.box_money             = fields[10].GetUInt32();
         gMenuItem.box_text              = fields[11].GetCppString();
 
-        ConditionType cond_1            = (ConditionType)fields[12].GetUInt32();
-        uint32 cond_1_val_1             = fields[13].GetUInt32();
-        uint32 cond_1_val_2             = fields[14].GetUInt32();
-        ConditionType cond_2            = (ConditionType)fields[15].GetUInt32();
-        uint32 cond_2_val_1             = fields[16].GetUInt32();
-        uint32 cond_2_val_2             = fields[17].GetUInt32();
-        ConditionType cond_3            = (ConditionType)fields[18].GetUInt32();
-        uint32 cond_3_val_1             = fields[19].GetUInt32();
-        uint32 cond_3_val_2             = fields[20].GetUInt32();
-        gMenuItem.conditionId           = fields[21].GetUInt16();
+        gMenuItem.conditionId           = fields[12].GetUInt16();
 
         if (gMenuItem.menu_id)                              // == 0 id is special and not have menu_id data
         {
@@ -8812,22 +9883,6 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
             }
         }
 
-        if (!PlayerCondition::IsValid(0, cond_1, cond_1_val_1, cond_1_val_2))
-        {
-            sLog.outErrorDb("Table gossip_menu_option menu %u, invalid condition 1 for id %u", gMenuItem.menu_id, gMenuItem.id);
-            continue;
-        }
-        if (!PlayerCondition::IsValid(0, cond_2, cond_2_val_1, cond_2_val_2))
-        {
-            sLog.outErrorDb("Table gossip_menu_option menu %u, invalid condition 2 for id %u", gMenuItem.menu_id, gMenuItem.id);
-            continue;
-        }
-        if (!PlayerCondition::IsValid(0, cond_3, cond_3_val_1, cond_3_val_2))
-        {
-            sLog.outErrorDb("Table gossip_menu_option menu %u, invalid condition 3 for id %u", gMenuItem.menu_id, gMenuItem.id);
-            continue;
-        }
-
         if (gMenuItem.action_menu_id > 0)
         {
             if (m_mGossipMenusMap.find(gMenuItem.action_menu_id) == m_mGossipMenusMap.end())
@@ -8861,7 +9916,7 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
                 found_menu_uses = true;
 
                 // some from creatures with gossip menu can use gossip option base at npc_flags
-                if (gMenuItem.npc_option_npcflag & cInfo->npcflag)
+                if (gMenuItem.npc_option_npcflag & cInfo->NpcFlags)
                     found_flags_uses = true;
             }
 
@@ -8879,7 +9934,7 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
         {
             if (sGossipScripts.second.find(gMenuItem.action_script_id) == sGossipScripts.second.end())
             {
-                sLog.outErrorDb("Table gossip_menu_option for menu %u, id %u have action_script_id %u that does not exist in `gossip_scripts`, ignoring", gMenuItem.menu_id, gMenuItem.id, gMenuItem.action_script_id);
+                sLog.outErrorDb("Table gossip_menu_option for menu %u, id %u have action_script_id %u that does not exist in `dbscripts_on_gossip`, ignoring", gMenuItem.menu_id, gMenuItem.id, gMenuItem.action_script_id);
                 continue;
             }
 
@@ -8887,10 +9942,6 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
             gossipScriptSet.erase(gMenuItem.action_script_id);
         }
 
-        gMenuItem.cond_1 = GetConditionId(cond_1, cond_1_val_1, cond_1_val_2);
-        gMenuItem.cond_2 = GetConditionId(cond_2, cond_2_val_1, cond_2_val_2);
-        gMenuItem.cond_3 = GetConditionId(cond_3, cond_3_val_1, cond_3_val_2);
-
         if (gMenuItem.conditionId)
         {
             const PlayerCondition* condition = sConditionStorage.LookupEntry<PlayerCondition>(gMenuItem.conditionId);
@@ -8922,7 +9973,7 @@ void ObjectMgr::LoadGossipMenuItems(std::set<uint32>& gossipScriptSet)
 
 void ObjectMgr::LoadGossipMenus()
 {
-    // Check which script-ids in gossip_scripts are not used
+    // Check which script-ids in dbscripts_on_gossip are not used
     std::set<uint32> gossipScriptSet;
     for (ScriptMapMap::const_iterator itr = sGossipScripts.second.begin(); itr != sGossipScripts.second.end(); ++itr)
         gossipScriptSet.insert(itr->first);
@@ -8934,13 +9985,13 @@ void ObjectMgr::LoadGossipMenus()
     LoadGossipMenuItems(gossipScriptSet);
 
     for (std::set<uint32>::const_iterator itr = gossipScriptSet.begin(); itr != gossipScriptSet.end(); ++itr)
-        sLog.outErrorDb("Table `gossip_scripts` contains unused script, id %u.", *itr);
+        sLog.outErrorDb("Table `dbscripts_on_gossip` contains unused script, id %u.", *itr);
 }
 
 void ObjectMgr::AddVendorItem( uint32 entry,uint32 item, uint32 maxcount, uint32 incrtime, uint32 extendedcost )
 {
     VendorItemData& vList = m_mCacheVendorItemMap[entry];
-    vList.AddItem(item,maxcount,incrtime,extendedcost);
+    vList.AddItem(item, maxcount, incrtime, extendedcost, 0);
 
     WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%u')",entry, item, maxcount,incrtime,extendedcost);
 }
@@ -8958,7 +10009,7 @@ bool ObjectMgr::RemoveVendorItem( uint32 entry,uint32 item )
     return true;
 }
 
-bool ObjectMgr::IsVendorItemValid(bool isTemplate, char const* tableName, uint32 vendor_entry, uint32 item_id, uint32 maxcount, uint32 incrtime, uint32 ExtendedCost, Player* pl, std::set<uint32>* skip_vendors ) const
+bool ObjectMgr::IsVendorItemValid(bool isTemplate, char const* tableName, uint32 vendor_entry, uint32 item_id, uint32 maxcount, uint32 incrtime, uint32 ExtendedCost, uint16 conditionId, Player* pl, std::set<uint32>* skip_vendors) const
 {
     char const* idStr = isTemplate ? "vendor template" : "vendor";
     CreatureInfo const* cInfo = NULL;
@@ -8975,7 +10026,7 @@ bool ObjectMgr::IsVendorItemValid(bool isTemplate, char const* tableName, uint32
             return false;
         }
 
-        if (!(cInfo->npcflag & UNIT_NPC_FLAG_VENDOR))
+        if (!(cInfo->NpcFlags & UNIT_NPC_FLAG_VENDOR))
         {
             if (!skip_vendors || skip_vendors->count(vendor_entry)==0)
             {
@@ -9030,6 +10081,12 @@ bool ObjectMgr::IsVendorItemValid(bool isTemplate, char const* tableName, uint32
         return false;
     }
 
+    if (conditionId && !sConditionStorage.LookupEntry<PlayerCondition>(conditionId))
+    {
+        sLog.outErrorDb("Table `%s` has `condition_id`=%u for item %u of %s %u but this condition is not valid, ignoring", tableName, conditionId, item_id, idStr, vendor_entry);
+        return false;
+    }
+
     VendorItemData const* vItems = isTemplate ? GetNpcVendorTemplateItemList(vendor_entry) : GetNpcVendorItemList(vendor_entry);
     VendorItemData const* tItems = isTemplate ? NULL : GetNpcVendorTemplateItemList(vendor_entry);
 
@@ -9054,12 +10111,12 @@ bool ObjectMgr::IsVendorItemValid(bool isTemplate, char const* tableName, uint32
                 ChatHandler(pl).PSendSysMessage(LANG_ITEM_ALREADY_IN_LIST, item_id, ExtendedCost);
             else
             {
-                if (!cInfo->vendorId)
+                if (!cInfo->VendorTemplateId)
                     sLog.outErrorDb( "Table `%s` has duplicate items %u (with extended cost %u) for %s %u, ignoring",
                         tableName, item_id, ExtendedCost, idStr, vendor_entry);
                 else
-                    sLog.outErrorDb( "Table `%s` has duplicate items %u (with extended cost %u) for %s %u (or possible in vendor template %u), ignoring",
-                        tableName, item_id, ExtendedCost, idStr, vendor_entry, cInfo->vendorId);
+                    sLog.outErrorDb("Table `%s` has duplicate items %u (with extended cost %u) for %s %u (or possible in vendor template %u), ignoring",
+                                    tableName, item_id, ExtendedCost, idStr, vendor_entry, cInfo->VendorTemplateId);
             }
             return false;
         }
@@ -9083,12 +10140,12 @@ bool ObjectMgr::IsVendorItemValid(bool isTemplate, char const* tableName, uint32
 
 void ObjectMgr::AddGroup( Group* group )
 {
-    mGroupMap[group->GetId()] = group ;
+    mGroupMap[group->GetObjectGuid()] = group ;
 }
 
 void ObjectMgr::RemoveGroup( Group* group )
 {
-    mGroupMap.erase(group->GetId());
+    mGroupMap.erase(group->GetObjectGuid());
 }
 
 void ObjectMgr::AddArenaTeam( ArenaTeam* arenaTeam )
@@ -9181,7 +10238,7 @@ void ObjectMgr::GetNpcTextLocaleStrings0(uint32 entry, int32 loc_idx, std::strin
 }
 
 // Functions for scripting access
-bool LoadMangosStrings(DatabaseType& db, char const* table,int32 start_value, int32 end_value)
+bool LoadMangosStrings(DatabaseType& db, char const* table, int32 start_value, int32 end_value, bool extra_content)
 {
     // MAX_DB_SCRIPT_STRING_ID is max allowed negative value for scripts (scrpts can use only more deep negative values
     // start/end reversed for negative values
@@ -9191,7 +10248,7 @@ bool LoadMangosStrings(DatabaseType& db, char const* table,int32 start_value, in
         return false;
     }
 
-    return sObjectMgr.LoadMangosStrings(db,table,start_value,end_value);
+    return sObjectMgr.LoadMangosStrings(db, table, start_value, end_value, extra_content);
 }
 
 CreatureInfo const* GetCreatureTemplateStore(uint32 entry)
@@ -9204,7 +10261,12 @@ Quest const* GetQuestTemplateStore(uint32 entry)
     return sObjectMgr.GetQuestTemplate(entry);
 }
 
-bool FindCreatureData::operator()( CreatureDataPair const& dataPair )
+MangosStringLocale const* GetMangosStringData(int32 entry)
+{
+    return sObjectMgr.GetMangosStringLocale(entry);
+}
+
+bool FindCreatureData::operator()(CreatureDataPair const& dataPair)
 {
     // skip wrong entry ids
     if (i_id && dataPair.second.id != i_id)
@@ -9303,3 +10365,328 @@ GameObjectDataPair const* FindGOData::GetResult() const
 
     return i_anyData;
 }
+
+void ObjectMgr::LoadTransports()
+{
+    QueryResult *result = WorldDatabase.Query("SELECT entry, name, period FROM transports");
+
+    uint32 count = 0;
+
+    if( !result )
+    {
+        BarGoLink bar(1);
+        bar.step();
+
+        sLog.outString();
+        sLog.outString( ">> Loaded %u transports", count );
+        return;
+    }
+
+    BarGoLink bar(result->GetRowCount());
+
+    do
+    {
+        bar.step();
+
+        MOTransport* t = new MOTransport;
+
+        Field* fields = result->Fetch();
+
+        uint32 entry = fields[0].GetUInt32();
+        std::string name = fields[1].GetCppString();
+        t->SetDBPeriod(fields[2].GetUInt32());
+
+        GameObjectInfo const* goinfo = ObjectMgr::GetGameObjectInfo(entry);
+
+        if(!goinfo)
+        {
+            sLog.outErrorDb("Transport ID:%u, Name: %s, will not be loaded, gameobject_template missing", entry, name.c_str());
+            delete t;
+            continue;
+        }
+
+        if(goinfo->type != GAMEOBJECT_TYPE_MO_TRANSPORT)
+        {
+            sLog.outErrorDb("Transport ID:%u, Name: %s, will not be loaded, gameobject_template type wrong", entry, name.c_str());
+            delete t;
+            continue;
+        }
+
+        DEBUG_LOG("Loading transport %u between %s, %s transport map id %u", entry, name.c_str(), goinfo->name, goinfo->moTransport.mapID);
+
+        std::set<uint32> mapsUsed;
+
+        if(!t->GenerateWaypoints(goinfo->moTransport.taxiPathId, mapsUsed))
+            // skip transports with empty waypoints list
+        {
+            sLog.outErrorDb("Transport (path id %u) path size = 0. Transport ignored, check DBC files or transport GO data0 field.",goinfo->moTransport.taxiPathId);
+            delete t;
+            continue;
+        }
+
+        WorldLocation loc = t->GetWayPoint(0).loc;
+
+        //current code does not support transports in dungeon!
+        MapEntry const* pMapInfo = sMapStore.LookupEntry(loc.GetMapId());
+        if(!pMapInfo || pMapInfo->Instanceable())
+        {
+            delete t;
+            continue;
+        }
+
+        // creates the Gameobject
+        if (!t->Create(entry, loc.GetMapId(), loc.x, loc.y, loc.z, loc.o, GO_ANIMPROGRESS_DEFAULT, GO_DYNFLAG_LO_NONE))
+        {
+            delete t;
+            continue;
+        }
+
+        m_Transports.insert(t);
+
+        //If we someday decide to use the grid to track transports, here:
+        Map* map = sMapMgr.CreateMap(loc.GetMapId(), t);
+        t->SetMap(map);
+        map->Relocation((GameObject*)t, loc);
+        map->Add((GameObject*)t);
+        t->Start();
+
+        ++count;
+    } while(result->NextRow());
+    delete result;
+
+    sLog.outString();
+    sLog.outString( ">> Loaded %u transports", count );
+
+    // check transport data DB integrity
+    result = WorldDatabase.Query("SELECT gameobject.guid,gameobject.id,transports.name FROM gameobject,transports WHERE gameobject.id = transports.entry");
+    if(result)                                              // wrong data found
+    {
+        do
+        {
+            Field *fields = result->Fetch();
+
+            uint32 guid  = fields[0].GetUInt32();
+            uint32 entry = fields[1].GetUInt32();
+            std::string name = fields[2].GetCppString();
+            sLog.outErrorDb("Transport %u '%s' have record (GUID: %u) in `gameobject`. Transports DON'T must have any records in `gameobject` or its behavior will be unpredictable/bugged.",entry,name.c_str(),guid);
+        }
+        while(result->NextRow());
+
+        delete result;
+    }
+}
+
+MOTransport const* ObjectMgr::GetTransportByGOMapId(uint32 mapid) const
+{
+    for (TransportSet::const_iterator iter = m_Transports.begin(); iter != m_Transports.end(); ++iter)
+    {
+        MOTransport const* transport = *iter;
+
+        if (!transport)
+            continue;
+
+        if (transport->GetGOInfo()->moTransport.mapID == mapid)
+            return transport;
+    }
+    return NULL;
+}
+
+MOTransport* ObjectMgr::GetTransportByGuid(ObjectGuid const& guid)
+{
+    for (TransportSet::iterator iter = m_Transports.begin(); iter != m_Transports.end(); ++iter)
+    {
+        MOTransport* transport = *iter;
+
+        if (!transport)
+            continue;
+
+        if (transport->GetObjectGuid() == guid)
+            return transport;
+    }
+    return NULL;
+}
+
+void ObjectMgr::LoadTransports(Map* map)
+{
+    if (!map)
+        return;
+
+    QueryResult* result = WorldDatabase.PQuery("SELECT entry, name, period FROM transports");
+
+    if (!result)
+        return;
+
+    uint32 count = 0;
+    do
+    {
+        Field* fields = result->Fetch();
+        uint32 entry        = fields[0].GetUInt32();
+        std::string name    = fields[1].GetCppString();
+        uint32 period       = fields[2].GetUInt32();
+
+        if (MOTransport::GetPossibleMapByEntry(entry, true) != map->GetId() || !MOTransport::IsSpawnedAtDifficulty(entry, map->GetDifficulty()))
+            continue;
+
+        ++count;
+/*
+        if (Transport* transport = Transport::Load(this, entry, name, period))
+        {
+            if (transport->GetGoState() == GO_STATE_READY)
+                transport->Start();
+            Add<GameObject>(transport);
+            DEBUG_LOG("Map::LoadTransports Loading %s %s, %s, transport map id %u",
+                transport->GetObjectGuid().GetString().c_str(),
+                transport->GetGOInfo()->name,
+                name.c_str(),
+                transport->GetGOInfo()->moTransport.mapID);
+                DEBUG_LOG("Map::LoadTransports guid %u coords %f %f %f",
+                transport->GetObjectGuid().GetRawValue(),
+                transport->GetPositionX(),
+                transport->GetPositionY(),
+                transport->GetPositionZ());
+        }
+*/
+    } while (result->NextRow());
+
+    delete result;
+
+    if (count > 0)
+       DETAIL_LOG( "Map::LoadTransports Loaded %u transports for map %u instance %u", count, map->GetId(), map->GetInstanceId() );
+
+    // check transport data DB integrity
+    result = WorldDatabase.PQuery("SELECT gameobject.guid,gameobject.id,transports.name FROM gameobject,transports WHERE gameobject.id = transports.entry AND gameobject.map = %u",map->GetId());
+    if(result)                                              // wrong data found
+    {
+        do
+        {
+            Field *fields = result->Fetch();
+
+            uint32 guid  = fields[0].GetUInt32();
+            uint32 entry = fields[1].GetUInt32();
+            std::string name = fields[2].GetCppString();
+            sLog.outErrorDb("Map::LoadTransportsTransport %u '%s' have record (GUID: %u) in `gameobject`. Transports DON'T must have any records in `gameobject` or its behavior will be unpredictable/bugged.",entry,name.c_str(),guid);
+        }
+        while(result->NextRow());
+        delete result;
+    }
+}
+
+void ObjectMgr::LoadOpcodes()
+{
+    // Reload case
+    opcodeSubstTable.clear();
+    opcodeValueSubstTable.clear();
+
+    QueryResult* result = WorldDatabase.PQuery("SELECT `name`, `value`, `flags` FROM `opcodes` WHERE `version`= %u", CLIENT_VERSION);
+
+    if (!result)
+    {
+        sLog.outString();
+        sLog.outErrorDb(" Loading opcodes - current opcodes set is empty!");
+        MANGOS_ASSERT(false);
+        return;
+    }
+    uint32 count = 0;
+    uint32 count1 = 0;
+
+    BarGoLink bar(result->GetRowCount());
+
+    do
+    {
+        bar.step();
+
+        Field* fields = result->Fetch();
+
+        char const*  opcodeName         = fields[0].GetString();
+        uint16 opcodeValue              = fields[1].GetUInt16();
+        uint32 opcodeFlags              = fields[2].GetUInt32();
+
+        ++count;
+        bool parsed = false;
+        for (uint16 i = 0; i < NUM_MSG_TYPES; ++i)
+        {
+            OpcodeHandler* handler = &opcodeTable[i];
+            if (!strcmp(handler->name, opcodeName))
+            {
+                if (opcodeFlags & OPCODE_LOAD_FLAGS_UNHANDLED)
+                    handler->status = STATUS_UNHANDLED;
+
+                if (MakeOpcodeHash(Opcodes(i), opcodeValue))
+                {
+                    parsed = true;
+                    ++count1;
+                }
+                break;
+            }
+        }
+        if (!parsed && opcodeValue != MSG_NULL_ACTION)
+            DETAIL_LOG( "ObjectMgr::LoadOpcodes Opcode %u (%s) not has definition in opcodes table!", opcodeValue, opcodeName);
+    }
+    while(result->NextRow());
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u opcode definitions, %u successful parsed", count, count1);
+    if (count1 < (count-1))
+    {
+        sLog.outErrorDb(">> Loading opcodes - %u loaded opcodes not has handlers! check DB and core definitions!", count - count1 -1);
+    }
+}
+
+bool ObjectMgr::MakeOpcodeHash(Opcodes opcode, uint16 value)
+{
+    if (opcode > NUM_MSG_TYPES)
+        return false;
+    opcodeSubstTable[value] = opcode;
+    opcodeValueSubstTable[opcode] = value;
+
+    return true;
+}
+
+bool DoDisplayText(WorldObject* source, int32 entry, Unit const* target /*=NULL*/)
+{
+    MangosStringLocale const* data = sObjectMgr.GetMangosStringLocale(entry);
+
+    if (!data)
+    {
+        _DoStringError(entry, "DoScriptText with source %s could not find text entry %i.", source->GetGuidStr().c_str(), entry);
+        return false;
+    }
+
+    if (data->SoundId)
+    {
+        if (data->Type == CHAT_TYPE_ZONE_YELL)
+            source->GetMap()->PlayDirectSoundToMap(data->SoundId, source->GetZoneId());
+        else if (data->Type == CHAT_TYPE_WHISPER || data->Type == CHAT_TYPE_BOSS_WHISPER)
+        {
+            // An error will be displayed for the text
+            if (target && target->GetTypeId() == TYPEID_PLAYER)
+                source->PlayDirectSound(data->SoundId, (Player const*)target);
+        }
+        else
+            source->PlayDirectSound(data->SoundId);
+    }
+
+    if (data->Emote)
+    {
+        if (source->GetTypeId() == TYPEID_UNIT || source->GetTypeId() == TYPEID_PLAYER)
+        {
+            ((Unit*)source)->HandleEmote(data->Emote);
+        }
+        else
+        {
+            _DoStringError(entry, "DoDisplayText entry %i tried to process emote for invalid source %s", entry, source->GetGuidStr().c_str());
+            return false;
+        }
+    }
+
+    if ((data->Type == CHAT_TYPE_WHISPER || data->Type == CHAT_TYPE_BOSS_WHISPER) && (!target || target->GetTypeId() != TYPEID_PLAYER))
+    {
+        _DoStringError(entry, "DoDisplayText entry %i cannot whisper without target unit (TYPEID_PLAYER).", entry);
+        return false;
+    }
+
+    source->MonsterText(data, target);
+    return true;
+}
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index 585cb4a40cf..2f613e2c5b6 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -35,8 +35,9 @@
 #include "MapPersistentStateMgr.h"
 #include "ObjectAccessor.h"
 #include "ObjectGuid.h"
+#include "Opcodes.h"
 #include "Policies/Singleton.h"
-#include "SQLStorages.h"
+#include "Vehicle.h"
 
 #include <string>
 #include <map>
@@ -45,14 +46,12 @@
 class Group;
 class ArenaTeam;
 class Item;
+class SQLStorage;
+class MOTransport;
 
 struct GameTele
 {
-    float  position_x;
-    float  position_y;
-    float  position_z;
-    float  orientation;
-    uint32 mapId;
+    WorldLocation loc;
     std::string name;
     std::wstring wnameLow;
 };
@@ -66,13 +65,14 @@ struct SpellClickInfo
     uint32 questEnd;                                        // quest end (quest don't must be rewarded for spell apply)
     bool   questStartCanActive;                             // if true then quest start can be active (not only rewarded)
     uint8 castFlags;
+    uint16 conditionId;                                     // intends to replace questStart, questEnd, questStartCanActive
 
     // helpers
-    bool IsFitToRequirements(Player const* player) const;
+    bool IsFitToRequirements(Player const* player, Creature const* clickedCreature) const;
 };
 
-typedef std::multimap<uint32, SpellClickInfo> SpellClickInfoMap;
-typedef std::pair<SpellClickInfoMap::const_iterator,SpellClickInfoMap::const_iterator> SpellClickInfoMapBounds;
+typedef UNORDERED_MULTIMAP<uint32 /*npcEntry*/, SpellClickInfo> SpellClickInfoMap;
+typedef std::pair<SpellClickInfoMap::const_iterator, SpellClickInfoMap::const_iterator> SpellClickInfoMapBounds;
 
 struct AreaTrigger
 {
@@ -81,14 +81,54 @@ struct AreaTrigger
     uint32 requiredItem2;
     uint32 heroicKey;
     uint32 heroicKey2;
-    uint32 requiredQuest;
-    uint32 requiredQuestHeroic;
-    std::string requiredFailedText;
-    uint32 target_mapId;
-    float  target_X;
-    float  target_Y;
-    float  target_Z;
-    float  target_Orientation;
+    uint32 requiredQuestA;
+    uint32 requiredQuestHeroicA;
+    uint32 requiredQuestH;
+    uint32 requiredQuestHeroicH;
+    uint32 minGS;
+    uint32 maxGS;
+    uint32 achiev0;
+    uint32 achiev1;
+    uint32 combatMode;
+    WorldLocation loc;
+
+    // Operators
+    bool IsMinimal() const { return (requiredLevel == 0 
+                                    && requiredItem == 0 
+                                    && requiredItem2 == 0 
+                                    && heroicKey == 0 
+                                    && heroicKey2 == 0 
+                                    && requiredQuestA == 0 
+                                    && requiredQuestHeroicA == 0
+                                    && requiredQuestH == 0 
+                                    && requiredQuestHeroicH == 0
+                                    && minGS == 0 
+                                    && maxGS == 0
+                                    && achiev0 == 0 
+                                    && achiev1 == 0);
+                                    }
+
+    bool IsLessOrEqualThan(AreaTrigger const* l) const      // Expected to have same map
+    {
+        MANGOS_ASSERT(loc.GetMapId() == l->loc.GetMapId());
+        return (requiredLevel <= l->requiredLevel
+                && requiredItem <= l->requiredItem
+                && requiredItem2 <= l->requiredItem2
+                && heroicKey <= l->heroicKey
+                && heroicKey2 <= l->heroicKey2
+                && requiredQuestA <= l->requiredQuestA
+                && requiredQuestHeroicA <= l->requiredQuestHeroicA
+                && requiredQuestH <= l->requiredQuestH
+                && requiredQuestHeroicH <= l->requiredQuestHeroicH
+                && minGS <= l->minGS
+                && maxGS <= l->maxGS
+                && achiev0 <= l->achiev0
+                && achiev1 <= l->achiev1
+                );
+    }
+
+    bool operator <= (AreaTrigger const* l) const { return IsLessOrEqualThan(l); }
+
 };
 
 typedef std::map<uint32/*player guid*/,uint32/*instance*/> CellCorpseSet;
@@ -105,13 +145,22 @@ typedef UNORDERED_MAP<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapOb
 #define MIN_MANGOS_STRING_ID           1                    // 'mangos_string'
 #define MAX_MANGOS_STRING_ID           2000000000
 #define MIN_DB_SCRIPT_STRING_ID        MAX_MANGOS_STRING_ID // 'db_script_string'
-#define MAX_DB_SCRIPT_STRING_ID        2000010000
+#define MAX_DB_SCRIPT_STRING_ID        2001000000
 #define MIN_CREATURE_AI_TEXT_STRING_ID (-1)                 // 'creature_ai_texts'
 #define MAX_CREATURE_AI_TEXT_STRING_ID (-1000000)
+// Anything below MAX_CREATURE_AI_TEXT_STRING_ID is handled by the external script lib
+
+static_assert(MAX_DB_SCRIPT_STRING_ID < ACE_INT32_MAX, "Must scope with int32 range");
 
 struct MangosStringLocale
 {
+    MangosStringLocale() : SoundId(0), Type(0), LanguageId(LANG_UNIVERSAL), Emote(0) { }
+
     std::vector<std::string> Content;                       // 0 -> default, i -> i-1 locale index
+    uint32 SoundId;
+    uint8  Type;
+    Language LanguageId;
+    uint32 Emote;
 };
 
 typedef UNORDERED_MAP<uint32,CreatureData> CreatureDataMap;
@@ -171,21 +220,98 @@ typedef UNORDERED_MAP<uint32,GossipMenuItemsLocale> GossipMenuItemsLocaleMap;
 typedef UNORDERED_MAP<uint32,PointOfInterestLocale> PointOfInterestLocaleMap;
 typedef UNORDERED_MAP<uint32,uint32> ItemConvertMap;
 
-typedef std::multimap<int32, uint32> ExclusiveQuestGroupsMap;
-typedef std::multimap<uint32, ItemRequiredTarget> ItemRequiredTargetMap;
-typedef std::multimap<uint32, uint32> QuestRelationsMap;
+typedef UNORDERED_MULTIMAP<int32, uint32> ExclusiveQuestGroupsMap;
+typedef UNORDERED_MULTIMAP<uint32, ItemRequiredTarget> ItemRequiredTargetMap;
+typedef UNORDERED_MULTIMAP<uint32, uint32> QuestRelationsMap;
 typedef std::pair<ExclusiveQuestGroupsMap::const_iterator, ExclusiveQuestGroupsMap::const_iterator> ExclusiveQuestGroupsMapBounds;
 typedef std::pair<ItemRequiredTargetMap::const_iterator, ItemRequiredTargetMap::const_iterator> ItemRequiredTargetMapBounds;
 typedef std::pair<QuestRelationsMap::const_iterator, QuestRelationsMap::const_iterator> QuestRelationsMapBounds;
 
 struct PetLevelInfo
 {
-    PetLevelInfo() : health(0), mana(0) { for(int i=0; i < MAX_STATS; ++i ) stats[i] = 0; }
+    PetLevelInfo(): health(0), mana(0), armor(0), mindmg(0), maxdmg(0), attackpower(0)
+        { for (int i = 0; i < MAX_STATS; ++i) stats[i] = 0; }
 
     uint16 stats[MAX_STATS];
     uint16 health;
     uint16 mana;
     uint16 armor;
+    uint32 mindmg;
+    uint32 maxdmg;
+    uint32 attackpower;
+};
+
+struct PetScalingData
+{
+    PetScalingData() : creatureID(0), requiredAura(0),
+    healthBasepoint(0), healthScale(0), powerBasepoint(0), powerScale(0),
+    APBasepoint(0), APBaseScale(0), attackpowerScale(0), damageScale(0), spelldamageScale(0), spellHitScale(0),
+    meleeHitScale(0), expertizeScale(0), attackspeedScale(0), critScale(0), powerregenScale(0)
+    {
+        for(int i=0; i < MAX_STATS; ++i ) statScale[i] = 0;
+        for(int i=0; i < MAX_SPELL_SCHOOL; ++i ) resistanceScale[i] = 0;
+    }
+
+    uint32 creatureID;
+    uint32 requiredAura;
+    int32  healthBasepoint;
+    int32  healthScale;
+    int32  powerBasepoint;
+    int32  powerScale;
+    int32  APBasepoint;
+    int32  APBaseScale;
+    int32  statScale[MAX_STATS];
+    int32  resistanceScale[MAX_SPELL_SCHOOL];
+    int32  attackpowerScale;
+    int32  damageScale;
+    int32  spelldamageScale;
+    int32  spellHitScale;
+    int32  meleeHitScale;
+    int32  expertizeScale;
+    int32  attackspeedScale;
+    int32  critScale;
+    int32  powerregenScale;
+};
+
+typedef std::vector<PetScalingData> PetScalingDataList;
+
+#define ANTICHEAT_ACTIONS 2
+#define ANTICHEAT_CHECK_PARAMETERS 2
+
+struct AntiCheatConfig
+{
+    AntiCheatConfig() : checkType(0), alarmsCount(0),disableOperation(false), messageNum(0)
+    {
+        for (int i=0; i < ANTICHEAT_ACTIONS; ++i )
+        {
+            actionType[i] = 0;
+            actionParam[i] = 0;
+        };
+
+        for (int i=0; i < ANTICHEAT_CHECK_PARAMETERS; ++i )
+        {
+            checkParam[i] = 0;
+        }
+
+        for (int i=0; i < ANTICHEAT_CHECK_PARAMETERS; ++i )
+        {
+            checkFloatParam[i] = 0.0f;
+        }
+        disabledZones.clear();
+    }
+
+    uint32 checkType;
+    uint32 checkPeriod;
+    uint32 alarmsCount;
+    bool   disableOperation;
+    uint32 messageNum;
+    uint32 checkParam[ANTICHEAT_CHECK_PARAMETERS];
+    float  checkFloatParam[ANTICHEAT_CHECK_PARAMETERS];
+    uint32 actionType[ANTICHEAT_ACTIONS];
+    uint32 actionParam[ANTICHEAT_ACTIONS];
+    UNORDERED_SET<uint32> disabledZones;
+    std::string description;
+
 };
 
 struct MailLevelReward
@@ -220,6 +346,7 @@ struct ReputationOnKillEntry
     uint32 reputation_max_cap2;
     int32 repvalue2;
     bool team_dependent;
+    uint32 championingAura;
 };
 
 struct RepSpilloverTemplate
@@ -254,9 +381,6 @@ struct GossipMenuItems
     bool            box_coded;
     uint32          box_money;
     std::string     box_text;
-    uint16          cond_1;
-    uint16          cond_2;
-    uint16          cond_3;
     uint16          conditionId;
 };
 
@@ -265,8 +389,6 @@ struct GossipMenus
     uint32          entry;
     uint32          text_id;
     uint32          script_id;
-    uint16          cond_1;
-    uint16          cond_2;
     uint16          conditionId;
 };
 
@@ -333,11 +455,13 @@ struct GraveYardData
     uint32 safeLocId;
     Team team;
 };
-typedef std::multimap<uint32, GraveYardData> GraveYardMap;
+typedef std::multimap<uint32 /*zoneId*/, GraveYardData> GraveYardMap;
 typedef std::pair<GraveYardMap::const_iterator, GraveYardMap::const_iterator> GraveYardMapBounds;
 
 enum ConditionType
-{                                                           // value1       value2  for the Condition enumed
+{
+    //                                                      // value1       value2  for the Condition enumed
+    CONDITION_NOT                   = -3,                   // cond-id-1    0          returns !cond-id-1
     CONDITION_OR                    = -2,                   // cond-id-1    cond-id-2  returns cond-id-1 OR cond-id-2
     CONDITION_AND                   = -1,                   // cond-id-1    cond-id-2  returns cond-id-1 AND cond-id-2
     CONDITION_NONE                  = 0,                    // 0            0
@@ -358,7 +482,7 @@ enum ConditionType
     CONDITION_LEVEL                 = 15,                   // player_level 0, 1 or 2 (0: equal to, 1: equal or higher than, 2: equal or less than)
     CONDITION_NOITEM                = 16,                   // item_id      count   check not present req. amount items in inventory
     CONDITION_SPELL                 = 17,                   // spell_id     0, 1 (0: has spell, 1: hasn't spell)
-    CONDITION_INSTANCE_SCRIPT       = 18,                   // map_id       instance_condition_id (instance script specific enum)
+    CONDITION_INSTANCE_SCRIPT       = 18,                   // instance_condition_id (instance script specific enum) 0
     CONDITION_QUESTAVAILABLE        = 19,                   // quest_id     0       for case when loot/gossip possible only if player can start quest
     CONDITION_ACHIEVEMENT           = 20,                   // ach_id       0, 1 (0: has achievement, 1: hasn't achievement) for player
     CONDITION_ACHIEVEMENT_REALM     = 21,                   // ach_id       0, 1 (0: has achievement, 1: hasn't achievement) for server
@@ -376,6 +500,14 @@ enum ConditionType
                                                             // True if player has skill skill_id and skill less than (and not equal) skill_value (for skill_value > 1)
                                                             // If skill_value == 1, then true if player has not skill skill_id
     CONDITION_REPUTATION_RANK_MAX   = 30,                   // faction_id   max_rank
+    CONDITION_COMPLETED_ENCOUNTER   = 31,                   // encounter_id encounter_id2       encounter_id[2] = DungeonEncounter(dbc).id (if value2 provided it will return value1 OR value2)
+    CONDITION_SOURCE_AURA           = 32,                   // spell_id     effindex (returns true if the source of the condition check has aura of spell_id, effIndex)
+    CONDITION_LAST_WAYPOINT         = 33,                   // waypointId   0 = exact, 1: wp <= waypointId, 2: wp > waypointId  Use to check what waypoint was last reached
+    CONDITION_XP_USER               = 34,                   // 0, 1 (0: XP off, 1: XP on) for player    0
+    CONDITION_GENDER                = 35,                   // 0=male, 1=female, 2=none (see enum Gender)
+    CONDITION_DEAD_OR_AWAY          = 36,                   // value1: 0=player dead, 1=player is dead (with group dead), 2=player in instance are dead, 3=creature is dead
+                                                            // value2: if != 0 only consider players in range of this value
+    CONDITION_CREATURE_IN_RANGE     = 37,                   // value1: creature entry; value2: range; returns only alive creatures
 };
 
 class PlayerCondition
@@ -391,15 +523,13 @@ class PlayerCondition
         bool IsValid() const { return IsValid(m_entry, m_condition, m_value1, m_value2); }
         static bool IsValid(uint16 entry, ConditionType condition, uint32 value1, uint32 value2);
 
-        bool Meets(Player const* pPlayer) const;            // Checks if the player meets the condition
+        static bool CanBeUsedWithoutPlayer(uint16 entry);
 
-        // TODO: old system, remove soon!
-        bool operator == (PlayerCondition const& lc) const
-        {
-            return (lc.m_condition == m_condition && lc.m_value1 == m_value1 && lc.m_value2 == m_value2);
-        }
+        // Checks if the player meets the condition
+        bool Meets(Player const* pPlayer, Map const* map, WorldObject const* source, ConditionSource conditionSourceType) const;
 
     private:
+        bool CheckParamRequirements(Player const* pPlayer, Map const* map, WorldObject const* source, ConditionSource conditionSourceType) const;
         uint16 m_entry;                                     // entry of the condition
         ConditionType m_condition;                          // additional condition type
         uint32 m_value1;                                    // data for the condition - see ConditionType definition
@@ -470,7 +600,7 @@ class ObjectMgr
 
         typedef UNORDERED_MAP<uint32, Item*> ItemMap;
 
-        typedef UNORDERED_MAP<uint32, Group*> GroupMap;
+        typedef UNORDERED_MAP<ObjectGuid, Group*> GroupMap;
 
         typedef UNORDERED_MAP<uint32, ArenaTeam*> ArenaTeamMap;
 
@@ -486,19 +616,18 @@ class ObjectMgr
 
         typedef UNORDERED_MAP<uint32, WeatherZoneChances> WeatherZoneMap;
 
-        static Player* GetPlayer(const char* name) { return ObjectAccessor::FindPlayerByName(name);}
-        static Player* GetPlayer(ObjectGuid guid, bool inWorld = true) { return ObjectAccessor::FindPlayer(guid, inWorld); }
-
-        static GameObjectInfo const *GetGameObjectInfo(uint32 id) { return sGOStorage.LookupEntry<GameObjectInfo>(id); }
-
         void LoadGameobjectInfo();
         void AddGameobjectInfo(GameObjectInfo *goinfo);
 
         void PackGroupIds();
         Group* GetGroupById(uint32 id) const;
+        Group* GetGroup(ObjectGuid guid) const;
         void AddGroup(Group* group);
         void RemoveGroup(Group* group);
 
+        GroupMap::iterator GetGroupMapBegin() { return mGroupMap.begin(); }
+        GroupMap::iterator GetGroupMapEnd()   { return mGroupMap.end(); }
+
         ArenaTeam* GetArenaTeamById(uint32 arenateamid) const;
         ArenaTeam* GetArenaTeamByName(const std::string& arenateamname) const;
         ArenaTeam* GetArenaTeamByCaptain(ObjectGuid guid) const;
@@ -507,35 +636,16 @@ class ObjectMgr
         ArenaTeamMap::iterator GetArenaTeamMapBegin() { return mArenaTeamMap.begin(); }
         ArenaTeamMap::iterator GetArenaTeamMapEnd()   { return mArenaTeamMap.end(); }
 
-        static CreatureInfo const *GetCreatureTemplate( uint32 id );
-        CreatureModelInfo const *GetCreatureModelInfo( uint32 modelid );
-        CreatureModelInfo const* GetCreatureModelRandomGender(uint32 display_id);
-        uint32 GetCreatureModelAlternativeModel(uint32 modelId);
+        CreatureModelInfo const* GetCreatureModelRandomGender(uint32 display_id) const;
+        uint32 GetCreatureModelAlternativeModel(uint32 modelId) const;
 
-        EquipmentInfo const *GetEquipmentInfo( uint32 entry );
-        static CreatureDataAddon const *GetCreatureAddon( uint32 lowguid )
-        {
-            return sCreatureDataAddonStorage.LookupEntry<CreatureDataAddon>(lowguid);
-        }
+        CreatureSpellsList const* GetCreatureSpells( uint32 id, uint8 activeState = 0);
 
-        static CreatureDataAddon const *GetCreatureTemplateAddon( uint32 entry )
-        {
-            return sCreatureInfoAddonStorage.LookupEntry<CreatureDataAddon>(entry);
-        }
-
-        static ItemPrototype const* GetItemPrototype(uint32 id) { return sItemStorage.LookupEntry<ItemPrototype>(id); }
-
-        static InstanceTemplate const* GetInstanceTemplate(uint32 map)
-        {
-            return sInstanceTemplate.LookupEntry<InstanceTemplate>(map);
-        }
+        PetLevelInfo const* GetPetLevelInfo(uint32 creature_id, uint32 level) const;
 
-        static WorldTemplate const* GetWorldTemplate(uint32 map)
-        {
-            return sWorldTemplate.LookupEntry<WorldTemplate>(map);
-        }
+        PetScalingDataList const* GetPetScalingData(uint32 creature_id) const;
 
-        PetLevelInfo const* GetPetLevelInfo(uint32 creature_id, uint32 level) const;
+        AntiCheatConfig const* GetAntiCheatConfig(uint32 checkType) const;
 
         PlayerClassInfo const* GetPlayerClassInfo(uint32 class_) const
         {
@@ -555,7 +665,7 @@ class ObjectMgr
         void GetPlayerLevelInfo(uint32 race, uint32 class_,uint32 level, PlayerLevelInfo* info) const;
 
         ObjectGuid GetPlayerGuidByName(std::string name) const;
-        bool GetPlayerNameByGUID(ObjectGuid guid, std::string &name) const;
+        bool GetPlayerNameByGUID(ObjectGuid guid, std::string& name) const;
         Team GetPlayerTeamByGUID(ObjectGuid guid) const;
         uint32 GetPlayerAccountIdByGUID(ObjectGuid guid) const;
         uint32 GetPlayerAccountIdByPlayerName(const std::string& name) const;
@@ -590,8 +700,10 @@ class ObjectMgr
 
         GossipText const* GetGossipText(uint32 Text_ID) const;
 
-        WorldSafeLocsEntry const *GetClosestGraveYard(float x, float y, float z, uint32 MapId, Team team);
+        WorldSafeLocsEntry const* GetClosestGraveYard(float x, float y, float z, uint32 MapId, Team team);
         bool AddGraveYardLink(uint32 id, uint32 zone, Team team, bool inDB = true);
+        void SetGraveYardLinkTeam(uint32 id, uint32 zoneId, Team team);
+        void RemoveGraveYardLink(uint32 id, uint32 zone, Team team, bool inDB = false);
         void LoadGraveyardZones();
         GraveYardData const* FindGraveYardData(uint32 id, uint32 zone) const;
 
@@ -603,8 +715,8 @@ class ObjectMgr
             return NULL;
         }
 
-        AreaTrigger const* GetGoBackTrigger(uint32 Map) const;
-        AreaTrigger const* GetMapEntranceTrigger(uint32 Map) const;
+        AreaTrigger const* GetGoBackTrigger(uint32 mapId) const;
+        AreaTrigger const* GetMapEntranceTrigger(uint32 mapId) const;
 
         RepRewardRate const* GetRepRewardRate(uint32 factionId) const
         {
@@ -648,6 +760,20 @@ class ObjectMgr
             return NULL;
         }
 
+        // Static wrappers for various accessors
+        static GameObjectInfo const* GetGameObjectInfo(uint32 id);                  ///< Wrapper for sGOStorage.LookupEntry
+        static Player* GetPlayer(const char* name);                                 ///< Wrapper for ObjectAccessor::FindPlayerByName
+        static Player* GetPlayer(ObjectGuid guid, bool inWorld = true);             ///< Wrapper for ObjectAccessor::FindPlayer
+        static CreatureInfo const* GetCreatureTemplate(uint32 id);                  ///< Wrapper for sCreatureStorage.LookupEntry
+        static CreatureModelInfo const* GetCreatureModelInfo(uint32 modelid);       ///< Wrapper for sCreatureModelStorage.LookupEntry
+        static EquipmentInfo const* GetEquipmentInfo(uint32 entry);                 ///< Wrapper for sEquipmentStorage.LookupEntry
+        static CreatureDataAddon const* GetCreatureAddon(uint32 lowguid);           ///< Wrapper for sCreatureDataAddonStorage.LookupEntry
+        static CreatureDataAddon const* GetCreatureTemplateAddon(uint32 entry);     ///< Wrapper for sCreatureInfoAddonStorage.LookupEntry
+        static ItemPrototype const* GetItemPrototype(uint32 id);                    ///< Wrapper for sItemStorage.LookupEntry
+        static InstanceTemplate const* GetInstanceTemplate(uint32 map);             ///< Wrapper for sInstanceTemplate.LookupEntry
+        static WorldTemplate const* GetWorldTemplate(uint32 map);                   ///< Wrapper for sWorldTemplate.LookupEntry
+
+        // Loading functions
         void LoadArenaTeams();
         void LoadGroups();
         void LoadQuests();
@@ -663,14 +789,16 @@ class ObjectMgr
         void LoadCreatureQuestRelations();
         void LoadCreatureInvolvedRelations();
 
-        bool LoadMangosStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value);
-        bool LoadMangosStrings() { return LoadMangosStrings(WorldDatabase,"mangos_string",MIN_MANGOS_STRING_ID,MAX_MANGOS_STRING_ID); }
+        bool LoadMangosStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value, bool extra_content);
+        bool LoadMangosStrings() { return LoadMangosStrings(WorldDatabase, "mangos_string", MIN_MANGOS_STRING_ID, MAX_MANGOS_STRING_ID, false); }
         void LoadCreatureLocales();
         void LoadCreatureTemplates();
         void LoadCreatures();
         void LoadCreatureAddons();
+        void LoadCreatureClassLvlStats();
         void LoadCreatureModelInfo();
         void LoadCreatureModelRace();
+        void LoadCreatureSpells();
         void LoadEquipmentTemplates();
         void LoadGameObjectLocales();
         void LoadGameObjects();
@@ -700,8 +828,11 @@ class ObjectMgr
 
         void LoadPageTexts();
 
+        void LoadAntiCheatConfig();
+
         void LoadPlayerInfo();
         void LoadPetLevelInfo();
+        void LoadPetScalingData();
         void LoadExplorationBaseXP();
         void LoadPetNames();
         void LoadPetNumber();
@@ -718,11 +849,11 @@ class ObjectMgr
         void LoadNPCSpellClickSpells();
         void LoadSpellTemplate();
 
+        void LoadOpcodes();
+
         void LoadWeatherZoneChances();
         void LoadGameTele();
 
-        void LoadNpcGossips();
-
         void LoadGossipMenus();
 
         void LoadVendorTemplates();
@@ -730,6 +861,16 @@ class ObjectMgr
         void LoadTrainerTemplates();
         void LoadTrainers() { LoadTrainers("npc_trainer", false); }
 
+        void LoadVehicleAccessory();
+
+        void LoadTransports(Map* map);
+        void LoadTransports();
+        typedef UNORDERED_SET<MOTransport*> TransportSet;
+        TransportSet const& GetTransports() { return m_Transports; };
+
+        MOTransport* GetTransportByGuid(ObjectGuid const& guid);
+        MOTransport const* GetTransportByGOMapId(uint32 mapid) const;
+
         std::string GeneratePetName(uint32 entry);
         uint32 GetBaseXP(uint32 level) const;
         uint32 GetXPForLevel(uint32 level) const;
@@ -909,6 +1050,13 @@ class ObjectMgr
             if(itr==mMangosStringLocaleMap.end()) return NULL;
             return &itr->second;
         }
+        uint32 GetLoadedStringsCount(int32 minEntry) const
+        {
+            std::map<int32, uint32>::const_iterator itr = m_loadedStringCount.find(minEntry);
+            if (itr != m_loadedStringCount.end())
+                return itr->second;
+            return 0;
+        }
 
         const char *GetMangosString(int32 entry, int locale_idx) const;
         const char *GetMangosStringForDBCLocale(int32 entry) const { return GetMangosString(entry,DBCLocaleIndex); }
@@ -939,44 +1087,39 @@ class ObjectMgr
         static PetNameInvalidReason CheckPetName( const std::string& name );
         static bool IsValidCharterName( const std::string& name );
 
-        static bool CheckDeclinedNames(std::wstring mainpart, DeclinedName const& names);
+        static bool CheckDeclinedNames(std::wstring w_ownname, DeclinedName const& names);
 
-        int GetIndexForLocale(LocaleConstant loc);
-        LocaleConstant GetLocaleForIndex(int i);
-
-        // TODO: Outdated version, rename NEW and remove soon
-        uint16 GetConditionId(ConditionType condition, uint32 value1, uint32 value2);
-        bool IsPlayerMeetToCondition(Player const* player, uint16 condition_id) const
+        void LoadSpellDisabledEntrys();
+        uint8 IsSpellDisabled(uint32 spellid)
         {
-            if(condition_id >= mConditions.size())
-                return false;
-
-            return mConditions[condition_id].Meets(player);
+            uint8 result=0;
+            SpellDisabledMap::const_iterator itr = m_spell_disabled.find(spellid);
+            if(itr != m_spell_disabled.end())
+            {
+                result=1;
+                if(itr->second != 0)
+                    result=2;
+            }
+            return result;
         }
 
-        // Check if a player meets condition conditionId
-        bool IsPlayerMeetToNEWCondition(Player const* pPlayer, uint16 conditionId) const
-        {
-            if (!pPlayer)
-                return false;                               // player not present, return false
-
-            if (const PlayerCondition* condition = sConditionStorage.LookupEntry<PlayerCondition>(conditionId))
-                return condition->Meets(pPlayer);
+        int GetIndexForLocale(LocaleConstant loc);
+        LocaleConstant GetLocaleForIndex(int i);
 
-            return false;
-        }
+        // Check if a player meets condition conditionId
+        bool IsPlayerMeetToCondition(uint16 conditionId, Player const* pPlayer, Map const* map, WorldObject const* source, ConditionSource conditionSourceType) const;
 
         GameTele const* GetGameTele(uint32 id) const
         {
             GameTeleMap::const_iterator itr = m_GameTeleMap.find(id);
-            if(itr==m_GameTeleMap.end()) return NULL;
-            return &itr->second;
+            return itr != m_GameTeleMap.end() ? &itr->second : NULL;
         }
 
-        GameTele const* GetGameTele(const std::string& name) const;
+        GameTele const* GetGameTele(std::string const& name) const;
+        GameTele const* GetGameTeleExactName(std::string const& name) const;
         GameTeleMap const& GetGameTeleMap() const { return m_GameTeleMap; }
         bool AddGameTele(GameTele& data);
-        bool DeleteGameTele(const std::string& name);
+        bool DeleteGameTele(std::string const& name);
 
         uint32 GetNpcGossip(uint32 entry) const
         {
@@ -1023,9 +1166,9 @@ class ObjectMgr
             return &iter->second;
         }
 
-        void AddVendorItem(uint32 entry,uint32 item, uint32 maxcount, uint32 incrtime, uint32 ExtendedCost);
-        bool RemoveVendorItem(uint32 entry,uint32 item);
-        bool IsVendorItemValid(bool isTemplate, char const* tableName, uint32 vendor_entry, uint32 item, uint32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* pl = NULL, std::set<uint32>* skip_vendors = NULL) const;
+        void AddVendorItem(uint32 entry, uint32 item, uint32 maxcount, uint32 incrtime, uint32 ExtendedCost);
+        bool RemoveVendorItem(uint32 entry, uint32 item);
+        bool IsVendorItemValid(bool isTemplate, char const* tableName, uint32 vendor_entry, uint32 item, uint32 maxcount, uint32 ptime, uint32 ExtendedCost, uint16 conditionId, Player* pl = NULL, std::set<uint32>* skip_vendors = NULL) const;
 
         int GetOrNewIndexForLocale(LocaleConstant loc);
 
@@ -1041,7 +1184,7 @@ class ObjectMgr
                 return 0;
 
             ItemPrototype const* proto = GetItemPrototype(iter->second);
-            return (proto && proto->AllowableRace & raceMask) ? iter->second : 0;
+            return (proto && (proto->AllowableRace & raceMask)) ? iter->second : 0;
         }
 
         uint32 GetItemExpireConvert(uint32 itemEntry) const
@@ -1060,6 +1203,11 @@ class ObjectMgr
             return m_DungeonEncounters.equal_range(creditEntry);
         }
 
+        DungeonEncounterMap const* GetDungeonEncounters()
+        {
+            return &m_DungeonEncounters;
+        }
+
         GossipMenusMapBounds GetGossipMenusMapBounds(uint32 uiMenuId) const
         {
             return m_mGossipMenusMap.equal_range(uiMenuId);
@@ -1098,8 +1246,39 @@ class ObjectMgr
         QuestRelationsMap& GetCreatureQuestRelationsMap() { return m_CreatureQuestRelations; }
 
         uint32 GetModelForRace(uint32 sourceModelId, uint32 racemask);
+
+        uint16 const GetOpcodeValue(Opcodes opcode) const
+        {
+            UNORDERED_MAP<Opcodes, uint16>::const_iterator iter = opcodeValueSubstTable.find(opcode);
+            return (iter == opcodeValueSubstTable.end()) ? 0 : iter->second;
+        }
+        Opcodes const GetOpcode(uint16 value) const
+        {
+            UNORDERED_MAP<uint16, Opcodes>::const_iterator iter = opcodeSubstTable.find(value);
+            return (iter == opcodeSubstTable.end()) ? MSG_NULL_ACTION : iter->second;
+        }
+        bool MakeOpcodeHash(Opcodes opcode, uint16 value);
+
+        /**
+        * \brief: Data returned is used to compute health, mana, armor, damage of creatures. May be NULL.
+        * \param uint32 level               creature level
+        * \param uint32 unitClass           creature class, related to CLASSMASK_ALL_CREATURES
+        * \param uint32 expansion           creature expansion (we could have creature exp = 0 for wotlk as well as exp = 1 or exp = 2)
+        * \return: CreatureClassLvlStats const* or NULL
+        *
+        * Description: GetCreatureClassLvlStats give fast access to creature stats data.
+        * FullName: ObjectMgr::GetCreatureClassLvlStats
+        * Access: public
+        * Qualifier: const
+        **/
+        CreatureClassLvlStats const* GetCreatureClassLvlStats(uint32 level, uint32 unitClass, int32 expansion) const;
+
     protected:
 
+        // initial free low guid for selected guid type for map local guids
+        uint32 m_FirstTemporaryCreatureGuid;
+        uint32 m_FirstTemporaryGameObjectGuid;
+
         // first free id for selected id type
         IdGenerator<uint32> m_ArenaTeamIds;
         IdGenerator<uint32> m_AuctionIds;
@@ -1108,10 +1287,6 @@ class ObjectMgr
         IdGenerator<uint32> m_MailIds;
         IdGenerator<uint32> m_PetNumbers;
 
-        // initial free low guid for selected guid type for map local guids
-        uint32 m_FirstTemporaryCreatureGuid;
-        uint32 m_FirstTemporaryGameObjectGuid;
-
         // guids from reserved range for use in .npc add/.gobject add commands for adding new static spawns (saved in DB) from client.
         ObjectGuidGenerator<HIGHGUID_UNIT>        m_StaticCreatureGuids;
         ObjectGuidGenerator<HIGHGUID_GAMEOBJECT>  m_StaticGameObjectGuids;
@@ -1127,10 +1302,10 @@ class ObjectMgr
 
         typedef UNORDERED_MAP<uint32, GossipText> GossipTextMap;
         typedef UNORDERED_MAP<uint32, uint32> QuestAreaTriggerMap;
-        typedef std::set<uint32> TavernAreaTriggerSet;
-        typedef std::set<uint32> GameObjectForQuestSet;
+        typedef UNORDERED_SET<uint32> TavernAreaTriggerSet;
+        typedef UNORDERED_SET<uint32> GameObjectForQuestSet;
 
-        typedef std::multimap<uint32, CreatureModelRace> CreatureModelRaceMap;
+        typedef UNORDERED_MULTIMAP<uint32, CreatureModelRace> CreatureModelRaceMap;
         typedef std::pair<CreatureModelRaceMap::const_iterator, CreatureModelRaceMap::const_iterator> CreatureModelRaceMapBounds;
 
         GroupMap            mGroupMap;
@@ -1155,9 +1330,12 @@ class ObjectMgr
         WeatherZoneMap      mWeatherZoneMap;
 
         //character reserved names
-        typedef std::set<std::wstring> ReservedNamesMap;
+        typedef UNORDERED_SET<std::wstring> ReservedNamesMap;
         ReservedNamesMap    m_ReservedNames;
 
+        typedef UNORDERED_MAP<uint32, uint32> SpellDisabledMap;
+        SpellDisabledMap  m_spell_disabled;
+
         GraveYardMap        mGraveYardMap;
 
         GameTeleMap         m_GameTeleMap;
@@ -1180,6 +1358,9 @@ class ObjectMgr
 
         int DBCLocaleIndex;
 
+        UNORDERED_MAP<Opcodes, uint16>  opcodeValueSubstTable;    // Hash for fast subst internal->real opcode
+        UNORDERED_MAP<uint16, Opcodes>  opcodeSubstTable;         // Hash for fast subst real->internal opcode
+
     private:
         void LoadCreatureAddons(SQLStorage& creatureaddons, char const* entryName, char const* comment);
         void ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const* table, char const* guidEntryStr);
@@ -1196,6 +1377,14 @@ class ObjectMgr
         // PetLevelInfoMap[creature_id][level]
         PetLevelInfoMap petInfo;                            // [creature_id][level]
 
+        typedef std::map<uint32, PetScalingDataList*> PetScalingDataMap;
+        PetScalingDataMap m_PetScalingData;                 // [creature_id]
+
+        typedef std::map<uint32, AntiCheatConfig> AntiCheatConfigMap;
+        AntiCheatConfigMap m_AntiCheatConfig;               // [check_type]
+
+        CreatureSpellStorage   m_creatureSpellStorage[MAX_CREATURE_SPELL_LISTS];
+
         PlayerClassInfo playerClassInfo[MAX_CLASSES];
 
         void BuildPlayerLevelInfo(uint8 race, uint8 class_, uint8 level, PlayerLevelInfo* plinfo) const;
@@ -1214,6 +1403,9 @@ class ObjectMgr
         HalfNameMap PetHalfName0;
         HalfNameMap PetHalfName1;
 
+        // Array to store creature stats, Max creature level + 1 (for data alignement with in game level)
+        CreatureClassLvlStats m_creatureClassLvlStats[DEFAULT_MAX_CREATURE_LEVEL + 1][MAX_CREATURE_CLASS][MAX_EXPANSION + 1];
+
         MapObjectGuids mMapObjectGuids;
         CreatureDataMap mCreatureDataMap;
         CreatureLocaleMap mCreatureLocaleMap;
@@ -1224,16 +1416,15 @@ class ObjectMgr
         NpcTextLocaleMap mNpcTextLocaleMap;
         PageTextLocaleMap mPageTextLocaleMap;
         MangosStringLocaleMap mMangosStringLocaleMap;
+        std::map<int32 /*minEntryOfBracket*/, uint32 /*count*/> m_loadedStringCount;
         GossipMenuItemsLocaleMap mGossipMenuItemsLocaleMap;
         PointOfInterestLocaleMap mPointOfInterestLocaleMap;
         DungeonEncounterMap m_DungeonEncounters;
 
-        // Storage for Conditions. First element (index 0) is reserved for zero-condition (nothing required)
-        typedef std::vector<PlayerCondition> ConditionStore;
-        ConditionStore mConditions;
-
         CreatureModelRaceMap    m_mCreatureModelRaceMap;
 
+        TransportSet m_Transports;
+
         CacheNpcTextIdMap m_mCacheNpcTextIdMap;
         CacheVendorItemMap m_mCacheVendorTemplateItemMap;
         CacheVendorItemMap m_mCacheVendorItemMap;
@@ -1243,9 +1434,13 @@ class ObjectMgr
 
 #define sObjectMgr MaNGOS::Singleton<ObjectMgr>::Instance()
 
+/// generic text function
+MANGOS_DLL_SPEC bool DoDisplayText(WorldObject* source, int32 entry, Unit const* target = NULL);
+
 // scripting access functions
-MANGOS_DLL_SPEC bool LoadMangosStrings(DatabaseType& db, char const* table,int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min());
+MANGOS_DLL_SPEC bool LoadMangosStrings(DatabaseType& db, char const* table, int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min(), bool extra_content = false);
 MANGOS_DLL_SPEC CreatureInfo const* GetCreatureTemplateStore(uint32 entry);
 MANGOS_DLL_SPEC Quest const* GetQuestTemplateStore(uint32 entry);
+MANGOS_DLL_SPEC MangosStringLocale const* GetMangosStringData(int32 entry);
 
 #endif
diff --git a/src/game/ObjectPosSelector.cpp b/src/game/ObjectPosSelector.cpp
index 3c54aee4e7e..1c26650622c 100644
--- a/src/game/ObjectPosSelector.cpp
+++ b/src/game/ObjectPosSelector.cpp
@@ -19,20 +19,25 @@
 #include "ObjectPosSelector.h"
 #include "Object.h"
 
-ObjectPosSelector::ObjectPosSelector(float x, float y, float dist, float searcher_size) :
-    m_centerX(x), m_centerY(y), m_searcherDist(dist), m_searcherSize(searcher_size)
+// The bigger this value, the more space npcs require around their target
+#define OCCUPY_POS_ANGLE_ATAN_FACTOR                      1.8f
+
+ObjectPosSelector::ObjectPosSelector(float x, float y, float dist, float searchedForSize, WorldObject const* searchPosFor) :
+    m_centerX(x), m_centerY(y), m_searcherDist(dist), m_searchPosFor(searchPosFor)
 {
     // if size == 0, m_anglestep will become 0 -> freeze
-    if (m_searcherSize == 0.0f)
-        m_searcherSize = DEFAULT_WORLD_OBJECT_SIZE;
+    if (fabs(searchedForSize) < M_NULL_F)
+        searchedForSize = DEFAULT_WORLD_OBJECT_SIZE;
+
+    // undefined behaviour
+    if (m_searcherDist == 0.0f)
+        m_searcherDist = DEFAULT_WORLD_OBJECT_SIZE;
 
-    m_searcherHalfSize = asin(m_searcherSize/m_searcherDist);
+    m_searchedForReqHAngle = atan(OCCUPY_POS_ANGLE_ATAN_FACTOR * searchedForSize / m_searcherDist);
 
     // Really init in InitilizeAngle
     m_nextUsedAreaItr[USED_POS_PLUS]  = m_UsedAreaLists[USED_POS_PLUS].begin();
     m_nextUsedAreaItr[USED_POS_MINUS] = m_UsedAreaLists[USED_POS_MINUS].begin();
-    m_nextUsedAreaStart[USED_POS_PLUS] = 0.0f;
-    m_nextUsedAreaStart[USED_POS_MINUS] = 0.0f;
     m_stepAngle[USED_POS_PLUS]  = 0.0f;
     m_stepAngle[USED_POS_MINUS] = 0.0f;
 }
@@ -41,27 +46,27 @@ ObjectPosSelector::ObjectPosSelector(float x, float y, float dist, float searche
  * Add used area (circle) near target object excluded from possible searcher position
  *
  *
- * @param size  Size of used circle
+ * @param obj  Object that occupies area
  * @param angle Angle of used circle center point from target-searcher line
  * @param dist  Distance from target object center point to used circle center point
  *
  * Used circles data stored as projections to searcher dist size circle as angle coordinate and half angle size
  */
-void ObjectPosSelector::AddUsedArea(float size, float angle, float dist)
+void ObjectPosSelector::AddUsedArea(WorldObject const* obj, float angle, float dist)
 {
-    float sr_dist = size + m_searcherSize;
-
-    //  by Law of cosines, angle of searcher/used centers
-    float sr_angle = acos((m_searcherDist * m_searcherDist + dist * dist - sr_dist * sr_dist) / (2 * m_searcherDist * dist));
+    MANGOS_ASSERT(obj);
 
     // skip some unexpected results.
-    if (!finite(sr_angle) || sr_angle <= 0)
+    if (dist == 0.0f)
         return;
 
+    // (half) angle that obj occupies
+    float sr_angle = atan(OCCUPY_POS_ANGLE_ATAN_FACTOR * obj->GetObjectBoundingRadius() / dist);
+
     if (angle >= 0)
-        m_UsedAreaLists[USED_POS_PLUS].insert(UsedArea(angle, sr_angle));
+        m_UsedAreaLists[USED_POS_PLUS].insert(UsedArea(angle, OccupiedArea(sr_angle, obj)));
     else
-        m_UsedAreaLists[USED_POS_MINUS].insert(UsedArea(-angle, sr_angle));
+        m_UsedAreaLists[USED_POS_MINUS].insert(UsedArea(-angle, OccupiedArea(sr_angle, obj)));
 }
 
 /**
@@ -76,22 +81,9 @@ void ObjectPosSelector::AddUsedArea(float size, float angle, float dist)
 bool ObjectPosSelector::CheckAngle(UsedArea const& usedArea, UsedAreaSide side, float angle) const
 {
     float used_angle = usedArea.first * SignOf(side);
-    float used_offset = usedArea.second;
-
-    return fabs(used_angle - angle) > used_offset;
-}
+    float used_offset = usedArea.second.angleOffset;
 
-/**
- * Check searcher circle not intercepting with used circle at side (only start angle provided)
- *
- * @param side     Side of used circle
- * @param angle    Checked angle at side, positive always
- *
- * @return true, if used circle not intercepted with searcher circle in terms projection angles
- */
-bool ObjectPosSelector::CheckSideAngle(UsedAreaSide side, float angle) const
-{
-    return angle + m_searcherHalfSize < m_nextUsedAreaStart[side];
+    return fabs(used_angle - angle) > used_offset || (m_searchPosFor && usedArea.second.occupyingObj == m_searchPosFor);
 }
 
 /**
@@ -121,53 +113,18 @@ void ObjectPosSelector::InitializeAngle()
 void ObjectPosSelector::InitializeAngle(UsedAreaSide side)
 {
     m_nextUsedAreaItr[side] = m_UsedAreaLists[side].begin();
-    UpdateNextAreaStart(side);
 
-    // if another side not alow use 0.0f angle calculate possible value in 0..m_searcherHalfSize range
+    // if another side not alow use 0.0f angle calculate possible value in 0..m_searchedForReqHAngle range
     if (!m_UsedAreaLists[~side].empty())
     {
         UsedArea const& otherArea = *m_UsedAreaLists[~side].begin();
-
-        // if other are near start
-        if (otherArea.first < otherArea.second)
-            m_stepAngle[side] = otherArea.second - otherArea.first;
-        else
-            m_stepAngle[side] = 0.0f;
+        m_stepAngle[side] = std::max(m_searchedForReqHAngle + otherArea.second.angleOffset - otherArea.first, 0.0f);
     }
-    else
+    else                                                    // Other side empty. start from 0
         m_stepAngle[side] = 0.0f;
-}
-
-/**
- * Update next used area start angle for current m_nextUsedAreaItr value at side
- */
-void ObjectPosSelector::UpdateNextAreaStart(UsedAreaSide side)
-{
-    // not last next area at side
-    if (m_nextUsedAreaItr[side] != m_UsedAreaLists[side].end())
-    {
-        m_nextUsedAreaStart[side] = m_nextUsedAreaItr[side]->first - m_nextUsedAreaItr[side]->second + m_searcherHalfSize;
-        return;
-    }
-
-    // last area at side and not another side areas
-    if (m_UsedAreaLists[~side].empty())
-    {
-        m_nextUsedAreaStart[side] = M_PI_F + m_searcherHalfSize + 0.01f;
-        return;
-    }
-
-    UsedArea const& lastArea = *m_UsedAreaLists[~side].rbegin();
-
-    // another side have used area near to end (near to PI)
-    if (lastArea.first + lastArea.second > M_PI_F - m_searcherHalfSize)
-    {
-        m_nextUsedAreaStart[side] = M_PI_F + (M_PI_F - lastArea.first - lastArea.second) + m_searcherHalfSize;
-        return;
-    }
 
-    // last area and fail find any used area at another side, prepare fake data as stopper
-    m_nextUsedAreaStart[side] = M_PI_F + m_searcherHalfSize + 0.01f;
+    // As m_stepAngle will be incremented first in ::NextSideAngle
+    m_stepAngle[side] -= m_searchedForReqHAngle;
 }
 
 /**
@@ -215,33 +172,34 @@ bool ObjectPosSelector::NextAngle(float& angle)
 bool ObjectPosSelector::NextSideAngle(UsedAreaSide side, float &angle )
 {
     // next possible angle
-    m_stepAngle[side] += (m_searcherHalfSize + 0.01);
+    m_stepAngle[side] += (m_searchedForReqHAngle + 0.01);
 
     // prevent jump to another side
     if (m_stepAngle[side] > M_PI_F)
         return false;
 
-    // update angle at attempt jump after next used area
-    while (m_stepAngle[side] <= M_PI_F && m_stepAngle[side] + m_searcherHalfSize >= m_nextUsedAreaStart[side])
+    // no used area anymore on this side
+    if (m_nextUsedAreaItr[side] == m_UsedAreaLists[side].end())
     {
-        // no used area for pass
-        if (m_nextUsedAreaItr[side] == m_UsedAreaLists[side].end())
-        {
-            m_stepAngle[side] = M_PI_F + m_searcherHalfSize;// prevent continue search at side
-            return false;
-        }
-
-        // angle set at first possible pos after passed m_nextUsedAreaItr
-        m_stepAngle[side] = m_nextUsedAreaItr[side]->first + m_nextUsedAreaItr[side]->second;
+        angle = m_stepAngle[side] * SignOf(side);
+        return true;
+    }
 
-        ++m_nextUsedAreaItr[side];
-        UpdateNextAreaStart(side);
+    // Already occupied and no better found
+    if ((m_searchPosFor && m_nextUsedAreaItr[side]->second.occupyingObj == m_searchPosFor) ||
+         // Next occupied is too far away
+        (m_stepAngle[side] + m_searchedForReqHAngle < m_nextUsedAreaItr[side]->first - m_nextUsedAreaItr[side]->second.angleOffset))
+    {
+        angle = m_stepAngle[side] * SignOf(side);
+        return true;
     }
 
-    angle = m_stepAngle[side] * SignOf(side);
+    // angle set at first possible pos after passed m_nextUsedAreaItr
+    m_stepAngle[side] = m_nextUsedAreaItr[side]->first + m_nextUsedAreaItr[side]->second.angleOffset;
 
-    // if next node not allow use selected angle, mark and fail
-    return CheckSideAngle(side, m_stepAngle[side]);
+    ++m_nextUsedAreaItr[side];
+
+    return false;
 }
 
 /**
diff --git a/src/game/ObjectPosSelector.h b/src/game/ObjectPosSelector.h
index 1da012370c7..de02c3e62ee 100644
--- a/src/game/ObjectPosSelector.h
+++ b/src/game/ObjectPosSelector.h
@@ -23,6 +23,8 @@
 
 #include<map>
 
+class WorldObject;
+
 enum UsedAreaSide { USED_POS_PLUS, USED_POS_MINUS };
 
 inline UsedAreaSide operator ~(UsedAreaSide side)
@@ -37,12 +39,19 @@ inline float SignOf(UsedAreaSide side)
 
 struct ObjectPosSelector
 {
-    typedef std::multimap<float,float> UsedAreaList;        // angle pos -> angle offset
+    struct OccupiedArea
+    {
+        OccupiedArea(float _angleOffset, WorldObject const* obj) : angleOffset(_angleOffset), occupyingObj(obj) {}
+        float angleOffset;
+        WorldObject const* occupyingObj;
+    };
+    // angle pos -> OccupiedArea
+    typedef UNORDERED_MULTIMAP<float, OccupiedArea> UsedAreaList;
     typedef UsedAreaList::value_type UsedArea;
 
-    ObjectPosSelector(float x, float y, float dist, float searcher_size);
+    ObjectPosSelector(float x, float y, float dist, float searchedForSize, WorldObject const* searchPosFor);
 
-    void AddUsedArea(float size, float angle, float dist);
+    void AddUsedArea(WorldObject const* obj, float angle, float dist);
 
     bool CheckOriginalAngle() const;
 
@@ -52,22 +61,20 @@ struct ObjectPosSelector
     bool NextUsedAngle(float& angle);
 
     bool CheckAngle(UsedArea const& usedArea, UsedAreaSide side, float angle) const;
-    bool CheckSideAngle(UsedAreaSide side, float angle) const;
     void InitializeAngle(UsedAreaSide side);
-    void UpdateNextAreaStart(UsedAreaSide side);
     bool NextSideAngle(UsedAreaSide side, float& angle);
 
     float m_centerX;
     float m_centerY;
-    float m_searcherDist;                                   // distance for searching pos (including searcher size and target object size)
-    float m_searcherSize;                                   // searcher object radius
-    float m_searcherHalfSize;                               // angle size/2 of searcher object (at dist distance)
+    float m_searcherDist;                                   // distance for searching pos
+    float m_searchedForReqHAngle;                           // angle size/2 of searcher object (at dist distance)
 
     UsedAreaList m_UsedAreaLists[2];                        // list left/right side used angles (with angle size)
 
     UsedAreaList::const_iterator m_nextUsedAreaItr[2];      // next used used areas for check at left/right side, possible angles selected in range m_smallStepAngle..m_nextUsedAreaItr
-    float m_nextUsedAreaStart[2];                           // cached angle for next used area from m_nextUsedAreaItr or another side
 
     float m_stepAngle[2];                                   // current checked angle position at sides (less m_nextUsedArea), positive value
+
+    WorldObject const* m_searchPosFor;                      // For whom a position is searched (can be NULL)
 };
 #endif
diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp
index 2c45d041a83..e8c05160683 100644
--- a/src/game/Opcodes.cpp
+++ b/src/game/Opcodes.cpp
@@ -345,7 +345,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x13C*/ { "SMSG_AI_REACTION",                             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x13D*/ { "CMSG_SET_SELECTION",                           STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleSetSelectionOpcode        },
     /*0x13E*/ { "CMSG_DELETEEQUIPMENT_SET",                     STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleEquipmentSetDeleteOpcode  },
-    /*0x13F*/ { "CMSG_INSTANCE_LOCK_RESPONSE",                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x13F*/ { "CMSG_INSTANCE_LOCK_RESPONSE",                  STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleInstanceLockResponse      },
     /*0x140*/ { "CMSG_DEBUG_PASSIVE_AURA",                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x141*/ { "CMSG_ATTACKSWING",                             STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleAttackSwingOpcode         },
     /*0x142*/ { "CMSG_ATTACKSTOP",                              STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleAttackStopOpcode          },
@@ -526,7 +526,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x1F1*/ { "MSG_SAVE_GUILD_EMBLEM",                        STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSaveGuildEmblemOpcode     },
     /*0x1F2*/ { "MSG_TABARDVENDOR_ACTIVATE",                    STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTabardVendorActivateOpcode},
     /*0x1F3*/ { "SMSG_PLAY_SPELL_VISUAL",                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x1F4*/ { "CMSG_ZONEUPDATE",                              STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleZoneUpdateOpcode          },
+    /*0x1F4*/ { "CMSG_ZONEUPDATE",                              STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleZoneUpdateOpcode          },
     /*0x1F5*/ { "SMSG_PARTYKILLLOG",                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x1F6*/ { "SMSG_COMPRESSED_UPDATE_OBJECT",                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x1F7*/ { "SMSG_PLAY_SPELL_IMPACT",                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
@@ -684,11 +684,11 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x28F*/ { "CMSG_GROUP_ASSISTANT_LEADER",                  STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupAssistantLeaderOpcode},
     /*0x290*/ { "CMSG_BUYBACK_ITEM",                            STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBuybackItem               },
     /*0x291*/ { "SMSG_SERVER_MESSAGE",                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x292*/ { "CMSG_SET_SAVED_INSTANCE_EXTEND",               STATUS_UNHANDLED,PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x292*/ { "CMSG_SET_SAVED_INSTANCE_EXTEND",               STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetSavedInstanceExtend    },
     /*0x293*/ { "SMSG_LFG_OFFER_CONTINUE",                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x294*/ { "CMSG_TEST_DROP_RATE",                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x295*/ { "SMSG_TEST_DROP_RATE_RESULT",                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x296*/ { "CMSG_LFG_GET_STATUS",                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x296*/ { "CMSG_LFG_GET_STATUS",                          STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleLfgGetStatus              },
     /*0x297*/ { "SMSG_SHOW_MAILBOX",                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x298*/ { "SMSG_RESET_RANGED_COMBAT_TIMER",               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x299*/ { "SMSG_CHAT_NOT_IN_PARTY",                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
@@ -769,7 +769,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x2E4*/ { "SMSG_AREA_SPIRIT_HEALER_TIME",                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x2E5*/ { "CMSG_GM_UNTEACH",                              STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x2E6*/ { "SMSG_WARDEN_DATA",                             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x2E7*/ { "CMSG_WARDEN_DATA",                             STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleWardenDataOpcode          },
+    /*0x2E7*/ { "CMSG_WARDEN_DATA",                             STATUS_AUTHED,   PROCESS_THREADUNSAFE, &WorldSession::HandleWardenDataOpcode          },
     /*0x2E8*/ { "SMSG_GROUP_JOINED_BATTLEGROUND",               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x2E9*/ { "MSG_BATTLEGROUND_PLAYER_POSITIONS",            STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattleGroundPlayerPositionsOpcode},
     /*0x2EA*/ { "CMSG_PET_STOP_ATTACK",                         STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetStopAttack             },
@@ -778,7 +778,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x2ED*/ { "SMSG_BATTLEGROUND_PLAYER_LEFT",                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x2EE*/ { "CMSG_BATTLEMASTER_JOIN",                       STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlemasterJoinOpcode    },
     /*0x2EF*/ { "SMSG_ADDON_INFO",                              STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x2F0*/ { "CMSG_PET_UNLEARN",                             STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetUnlearnOpcode          },
+    /*0x2F0*/ { "CMSG_PET_UNLEARN",                             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_Deprecated               },
     /*0x2F1*/ { "SMSG_PET_UNLEARN_CONFIRM",                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x2F2*/ { "SMSG_PARTY_MEMBER_STATS_FULL",                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x2F3*/ { "CMSG_PET_SPELL_AUTOCAST",                      STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetSpellAutocastOpcode    },
@@ -886,28 +886,28 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x359*/ { "MSG_MOVE_START_ASCEND",                        STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           },
     /*0x35A*/ { "MSG_MOVE_STOP_ASCEND",                         STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           },
     /*0x35B*/ { "SMSG_ARENA_TEAM_STATS",                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x35C*/ { "CMSG_LFG_JOIN",                                STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLfgJoinOpcode             },
-    /*0x35D*/ { "CMSG_LFG_LEAVE",                               STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLfgLeaveOpcode            },
-    /*0x35E*/ { "CMSG_LFG_SEARCH_JOIN",                         STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSearchLfgJoinOpcode       },
-    /*0x35F*/ { "CMSG_LFG_SEARCH_LEAVE",                        STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSearchLfgLeaveOpcode      },
+    /*0x35C*/ { "CMSG_LFG_JOIN",                                STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleLfgJoinOpcode             },
+    /*0x35D*/ { "CMSG_LFG_LEAVE",                               STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleLfgLeaveOpcode            },
+    /*0x35E*/ { "CMSG_LFG_SEARCH_JOIN",                         STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleLfrSearchOpcode           },
+    /*0x35F*/ { "CMSG_LFG_SEARCH_LEAVE",                        STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleLfrLeaveOpcode            },
     /*0x360*/ { "SMSG_LFG_SEARCH_RESULTS",                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x361*/ { "SMSG_LFG_PROPOSAL_UPDATE",                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x362*/ { "CMSG_LFG_PROPOSAL_RESPONSE",                   STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x362*/ { "CMSG_LFG_PROPOSAL_RESPONSE",                   STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleLfgProposalResultOpcode   },
     /*0x363*/ { "SMSG_LFG_ROLE_CHECK_UPDATE",                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x364*/ { "SMSG_LFG_JOIN_RESULT",                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x365*/ { "SMSG_LFG_QUEUE_STATUS",                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x366*/ { "CMSG_SET_LFG_COMMENT",                         STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetLfgCommentOpcode       },
+    /*0x366*/ { "CMSG_SET_LFG_COMMENT",                         STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleSetLfgCommentOpcode       },
     /*0x367*/ { "SMSG_LFG_UPDATE_PLAYER",                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x368*/ { "SMSG_LFG_UPDATE_PARTY",                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x369*/ { "SMSG_LFG_UPDATE_SEARCH",                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x36A*/ { "CMSG_LFG_SET_ROLES",                           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x36A*/ { "CMSG_LFG_SET_ROLES",                           STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleLfgSetRolesOpcode         },
     /*0x36B*/ { "CMSG_LFG_SET_NEEDS",                           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x36C*/ { "CMSG_LFG_BOOT_PLAYER_VOTE",                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x36C*/ { "CMSG_LFG_BOOT_PLAYER_VOTE",                    STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleLfgSetBootVoteOpcode      },
     /*0x36D*/ { "SMSG_LFG_BOOT_PLAYER",                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x36E*/ { "CMSG_LFG_GET_PLAYER_INFO",                     STATUS_UNHANDLED,PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x36E*/ { "CMSG_LFG_GET_PLAYER_INFO",                     STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLfgPlayerLockInfoRequestOpcode},
     /*0x36F*/ { "SMSG_LFG_PLAYER_INFO",                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x370*/ { "CMSG_LFG_TELEPORT",                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x371*/ { "CMSG_LFG_GET_PARTY_INFO",                      STATUS_UNHANDLED,PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x370*/ { "CMSG_LFG_TELEPORT",                            STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleLfgTeleportOpcode         },
+    /*0x371*/ { "CMSG_LFG_GET_PARTY_INFO",                      STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleLfgPartyLockInfoRequestOpcode},
     /*0x372*/ { "SMSG_LFG_PARTY_INFO",                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x373*/ { "SMSG_TITLE_EARNED",                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x374*/ { "CMSG_SET_TITLE",                               STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetTitleOpcode            },
@@ -1063,7 +1063,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x40A*/ { "MSG_QUERY_GUILD_BANK_TEXT",                    STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleQueryGuildBankTabText     },
     /*0x40B*/ { "CMSG_SET_GUILD_BANK_TEXT",                     STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetGuildBankTabText       },
     /*0x40C*/ { "CMSG_SET_GRANTABLE_LEVELS",                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x40D*/ { "CMSG_GRANT_LEVEL",                             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x40D*/ { "CMSG_GRANT_LEVEL",                             STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGrantLevel                },
     /*0x40E*/ { "CMSG_REFER_A_FRIEND",                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x40F*/ { "MSG_GM_CHANGE_ARENA_RATING",                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x410*/ { "CMSG_DECLINE_CHANNEL_INVITE",                  STATUS_UNHANDLED,PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
@@ -1082,8 +1082,8 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x41D*/ { "SMSG_SERVER_BUCK_DATA",                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x41E*/ { "SMSG_SEND_UNLEARN_SPELLS",                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x41F*/ { "SMSG_PROPOSE_LEVEL_GRANT",                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x420*/ { "CMSG_ACCEPT_LEVEL_GRANT",                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x421*/ { "SMSG_REFER_A_FRIEND_FAILURE",                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
+    /*0x420*/ { "CMSG_ACCEPT_LEVEL_GRANT",                      STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAcceptGrantLevel          },
+    /*0x421*/ { "SMSG_REFER_A_FRIEND_ERROR",                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x422*/ { "SMSG_SPLINE_MOVE_SET_FLYING",                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x423*/ { "SMSG_SPLINE_MOVE_UNSET_FLYING",                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x424*/ { "SMSG_SUMMON_CANCEL",                           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
@@ -1148,7 +1148,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x45F*/ { "CMSG_CALENDAR_EVENT_INVITE_NOTES",             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x460*/ { "SMSG_CALENDAR_EVENT_INVITE_NOTES",             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x461*/ { "SMSG_CALENDAR_EVENT_INVITE_NOTES_ALERT",       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x462*/ { "CMSG_UPDATE_MISSILE_TRAJECTORY",               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x462*/ { "CMSG_UPDATE_MISSILE_TRAJECTORY",               STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleUpdateMissileTrajectory   },
     /*0x463*/ { "SMSG_UPDATE_ACCOUNT_DATA_COMPLETE",            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x464*/ { "SMSG_TRIGGER_MOVIE",                           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x465*/ { "CMSG_COMPLETE_MOVIE",                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
@@ -1168,10 +1168,10 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x473*/ { "CMSG_CHAR_CUSTOMIZE",                          STATUS_AUTHED,   PROCESS_THREADUNSAFE, &WorldSession::HandleCharCustomizeOpcode       },
     /*0x474*/ { "SMSG_CHAR_CUSTOMIZE",                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x475*/ { "SMSG_PET_RENAMEABLE",                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x476*/ { "CMSG_REQUEST_VEHICLE_EXIT",                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x477*/ { "CMSG_REQUEST_VEHICLE_PREV_SEAT",               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x478*/ { "CMSG_REQUEST_VEHICLE_NEXT_SEAT",               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x479*/ { "CMSG_REQUEST_VEHICLE_SWITCH_SEAT",             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x476*/ { "CMSG_REQUEST_VEHICLE_EXIT",                    STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestVehicleExit        },
+    /*0x477*/ { "CMSG_REQUEST_VEHICLE_PREV_SEAT",               STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestVehiclePrevSeat    },
+    /*0x478*/ { "CMSG_REQUEST_VEHICLE_NEXT_SEAT",               STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestVehicleNextSeat    },
+    /*0x479*/ { "CMSG_REQUEST_VEHICLE_SWITCH_SEAT",             STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestVehicleSwitchSeat  },
     /*0x47A*/ { "CMSG_PET_LEARN_TALENT",                        STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetLearnTalent            },
     /*0x47B*/ { "CMSG_PET_UNLEARN_TALENTS",                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x47C*/ { "SMSG_SET_PHASE_SHIFT",                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
@@ -1205,7 +1205,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x498*/ { "SMSG_SERVER_FIRST_ACHIEVEMENT",                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x499*/ { "SMSG_PET_LEARNED_SPELL",                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x49A*/ { "SMSG_PET_REMOVED_SPELL",                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x49B*/ { "CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE",      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x49B*/ { "CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE",      STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleChangeSeatsOnControlledVehicle},
     /*0x49C*/ { "CMSG_HEARTH_AND_RESURRECT",                    STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleHearthandResurrect        },
     /*0x49D*/ { "SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA",    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x49E*/ { "SMSG_CRITERIA_DELETED",                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
@@ -1218,8 +1218,8 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x4A5*/ { "CMSG_QUERY_VEHICLE_STATUS",                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4A6*/ { "SMSG_BATTLEGROUND_INFO_THROTTLED",             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4A7*/ { "SMSG_SET_VEHICLE_REC_ID",                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x4A8*/ { "CMSG_RIDE_VEHICLE_INTERACT",                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x4A9*/ { "CMSG_CONTROLLER_EJECT_PASSENGER",              STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x4A8*/ { "CMSG_RIDE_VEHICLE_INTERACT",                   STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleEnterPlayerVehicle        },
+    /*0x4A9*/ { "CMSG_CONTROLLER_EJECT_PASSENGER",              STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleEjectPassenger             },
     /*0x4AA*/ { "SMSG_PET_GUIDS",                               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4AB*/ { "SMSG_CLIENTCACHE_VERSION",                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4AC*/ { "CMSG_CHANGE_GDF_ARENA_RATING",                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
@@ -1228,19 +1228,19 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x4AF*/ { "CMSG_SET_ARENA_TEAM_SEASON_GAMES",             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4B0*/ { "CMSG_SET_ARENA_MEMBER_WEEKLY_GAMES",           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4B1*/ { "CMSG_SET_ARENA_MEMBER_SEASON_GAMES",           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x4B2*/ { "SMSG_SET_ITEM_PURCHASE_DATA",                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x4B3*/ { "CMSG_GET_ITEM_PURCHASE_DATA",                  STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleItemRefundInfoRequest     },
-    /*0x4B4*/ { "CMSG_ITEM_PURCHASE_REFUND",                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x4B5*/ { "SMSG_ITEM_PURCHASE_REFUND_RESULT",             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
+    /*0x4B2*/ { "SMSG_ITEM_REFUND_INFO_RESPONSE",               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
+    /*0x4B3*/ { "CMSG_GET_ITEM_REFUND_INFO",                    STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleItemRefundInfoRequest     },
+    /*0x4B4*/ { "CMSG_ITEM_REFUND",                             STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleItemRefund                },
+    /*0x4B5*/ { "SMSG_ITEM_REFUND_RESULT",                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4B6*/ { "CMSG_CORPSE_TRANSPORT_QUERY",                  STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCorpseMapPositionQueryOpcode},
     /*0x4B7*/ { "SMSG_CORPSE_TRANSPORT_QUERY",                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4B8*/ { "CMSG_UNUSED5",                                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4B9*/ { "CMSG_UNUSED6",                                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x4BA*/ { "CMSG_CALENDAR_EVENT_SIGNUP",                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x4BA*/ { "CMSG_CALENDAR_EVENT_SIGNUP",                   STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCalendarEventSignup       },
     /*0x4BB*/ { "SMSG_CALENDAR_CLEAR_PENDING_ACTION",           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4BC*/ { "SMSG_LOAD_EQUIPMENT_SET",                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4BD*/ { "CMSG_SAVE_EQUIPMENT_SET",                      STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleEquipmentSetSaveOpcode    },
-    /*0x4BE*/ { "CMSG_ON_MISSILE_TRAJECTORY_COLLISION",         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x4BE*/ { "CMSG_ON_MISSILE_TRAJECTORY_COLLISION",         STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleUpdateProjectilePosition  },
     /*0x4BF*/ { "SMSG_NOTIFY_MISSILE_TRAJECTORY_COLLISION",     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4C0*/ { "SMSG_TALENT_UPDATE",                           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4C1*/ { "CMSG_LEARN_TALENT_GROUP",                      STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLearnPreviewTalents       },
@@ -1267,21 +1267,21 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x4D6*/ { "SMSG_USE_EQUIPMENT_SET_RESULT",                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4D7*/ { "CMSG_FORCE_ANIM",                              STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4D8*/ { "SMSG_FORCE_ANIM",                              STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x4D9*/ { "CMSG_CHAR_FACTION_CHANGE",                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x4D9*/ { "CMSG_CHAR_FACTION_CHANGE",                     STATUS_AUTHED,   PROCESS_INPLACE,      &WorldSession::HandleCharFactionOrRaceChangeOpcode},
     /*0x4DA*/ { "SMSG_CHAR_FACTION_CHANGE",                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4DB*/ { "CMSG_PVP_QUEUE_STATS_REQUEST",                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4DC*/ { "SMSG_PVP_QUEUE_STATS",                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4DD*/ { "CMSG_SET_PAID_SERVICE_CHEAT",                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4DE*/ { "SMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE",        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x4DF*/ { "CMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE_RESPONSE",STATUS_NEVER,   PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x4DF*/ { "CMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE_RESPONSE",STATUS_LOGGEDIN,PROCESS_INPLACE,      &WorldSession::HandleBfEntryInviteResponse     },
     /*0x4E0*/ { "SMSG_BATTLEFIELD_MANAGER_ENTERING",            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4E1*/ { "SMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE",        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x4E2*/ { "CMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE_RESPONSE",STATUS_NEVER,   PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
-    /*0x4E3*/ { "CMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST",       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x4E2*/ { "CMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE_RESPONSE",STATUS_LOGGEDIN,PROCESS_INPLACE,      &WorldSession::HandleBfQueueInviteResponse     },
+    /*0x4E3*/ { "CMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST",       STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleBfQueueRequest            },
     /*0x4E4*/ { "SMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST_RESPONSE",STATUS_NEVER,  PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4E5*/ { "SMSG_BATTLEFIELD_MANAGER_EJECT_PENDING",       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4E6*/ { "SMSG_BATTLEFIELD_MANAGER_EJECTED",             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x4E7*/ { "CMSG_BATTLEFIELD_MANAGER_EXIT_REQUEST",        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x4E7*/ { "CMSG_BATTLEFIELD_MANAGER_EXIT_REQUEST",        STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleBfExitRequest             },
     /*0x4E8*/ { "SMSG_BATTLEFIELD_MANAGER_STATE_CHANGED",       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4E9*/ { "CMSG_BATTLEFIELD_MANAGER_ADVANCE_STATE",       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4EA*/ { "CMSG_BATTLEFIELD_MANAGER_SET_NEXT_TRANSITION_TIME",STATUS_NEVER,PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
@@ -1298,7 +1298,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x4F5*/ { "SMSG_SERVERINFO",                              STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4F6*/ { "CMSG_UI_TIME_REQUEST",                         STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleUITimeRequestOpcode       },
     /*0x4F7*/ { "SMSG_UI_TIME",                                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x4F8*/ { "CMSG_CHAR_RACE_CHANGE",                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x4F8*/ { "CMSG_CHAR_RACE_CHANGE",                        STATUS_AUTHED,   PROCESS_INPLACE,      &WorldSession::HandleCharFactionOrRaceChangeOpcode},
     /*0x4F9*/ { "MSG_VIEW_PHASE_SHIFT",                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x4FA*/ { "SMSG_TALENTS_INVOLUNTARILY_RESET",             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x4FB*/ { "CMSG_DEBUG_SERVER_GEO",                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
@@ -1329,7 +1329,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x514*/ { "SMSG_SEND_ALL_COMBAT_LOG",                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x515*/ { "SMSG_OPEN_LFG_DUNGEON_FINDER",                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x516*/ { "SMSG_MOVE_SET_COLLISION_HGT",                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
-    /*0x517*/ { "CMSG_MOVE_SET_COLLISION_HGT_ACK",              STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
+    /*0x517*/ { "CMSG_MOVE_SET_COLLISION_HGT_ACK",              STATUS_UNHANDLED,PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x518*/ { "MSG_MOVE_SET_COLLISION_HGT",                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               },
     /*0x519*/ { "CMSG_CLEAR_RANDOM_BG_WIN_TIME",                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
     /*0x51A*/ { "CMSG_CLEAR_HOLIDAY_BG_WIN_TIME",               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     },
diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h
index e1248238706..c828cd378a4 100644
--- a/src/game/Opcodes.h
+++ b/src/game/Opcodes.h
@@ -1091,7 +1091,7 @@ enum Opcodes
     SMSG_SEND_UNLEARN_SPELLS                        = 0x41E,
     SMSG_PROPOSE_LEVEL_GRANT                        = 0x41F,
     CMSG_ACCEPT_LEVEL_GRANT                         = 0x420,
-    SMSG_REFER_A_FRIEND_FAILURE                     = 0x421,
+    SMSG_REFER_A_FRIEND_ERROR                       = 0x421,
     SMSG_SPLINE_MOVE_SET_FLYING                     = 0x422,
     SMSG_SPLINE_MOVE_UNSET_FLYING                   = 0x423,
     SMSG_SUMMON_CANCEL                              = 0x424,
@@ -1236,10 +1236,10 @@ enum Opcodes
     CMSG_SET_ARENA_TEAM_SEASON_GAMES                = 0x4AF,
     CMSG_SET_ARENA_MEMBER_WEEKLY_GAMES              = 0x4B0,
     CMSG_SET_ARENA_MEMBER_SEASON_GAMES              = 0x4B1,
-    SMSG_SET_ITEM_PURCHASE_DATA                     = 0x4B2,
-    CMSG_GET_ITEM_PURCHASE_DATA                     = 0x4B3,
-    CMSG_ITEM_PURCHASE_REFUND                       = 0x4B4,
-    SMSG_ITEM_PURCHASE_REFUND_RESULT                = 0x4B5,
+    SMSG_ITEM_REFUND_INFO_RESPONSE                  = 0x4B2,
+    CMSG_GET_ITEM_REFUND_INFO                       = 0x4B3,
+    CMSG_ITEM_REFUND                                = 0x4B4,
+    SMSG_ITEM_REFUND_RESULT                         = 0x4B5,
     CMSG_CORPSE_TRANSPORT_QUERY                     = 0x4B6,
     SMSG_CORPSE_TRANSPORT_QUERY                     = 0x4B7,
     CMSG_UNUSED5                                    = 0x4B8,
@@ -1352,8 +1352,8 @@ enum Opcodes
 enum SessionStatus
 {
     STATUS_AUTHED = 0,                                      ///< Player authenticated (_player==NULL, m_playerRecentlyLogout = false or will be reset before handler call, m_GUID have garbage)
-    STATUS_LOGGEDIN,                                        ///< Player in game (_player!=NULL, m_GUID == _player->GetGUID(), inWorld())
-    STATUS_TRANSFER,                                        ///< Player transferring to another map (_player!=NULL, m_GUID == _player->GetGUID(), !inWorld())
+    STATUS_LOGGEDIN,                                        ///< Player in game (_player!=NULL, m_GUID == _player->GetObjectGuid(), inWorld())
+    STATUS_TRANSFER,                                        ///< Player transferring to another map (_player!=NULL, m_GUID == _player->GetObjectGuid(), !inWorld())
     STATUS_LOGGEDIN_OR_RECENTLY_LOGGEDOUT,                  ///< _player!= NULL or _player==NULL && m_playerRecentlyLogout, m_GUID store last _player guid)
     STATUS_NEVER,                                           ///< Opcode not accepted from client (deprecated or server side only)
     STATUS_UNHANDLED                                        ///< We don' handle this opcode yet
@@ -1385,5 +1385,19 @@ inline const char* LookupOpcodeName(uint16 id)
         return "Received unknown opcode, it's more than max!";
     return opcodeTable[id].name;
 }
+
+enum OpcodeLoadFlags
+{
+    OPCODE_LOAD_FLAGS_NONE           = 0x0,
+    OPCODE_LOAD_FLAGS_UNHANDLED      = 0x1,
+    OPCODE_LOAD_FLAGS_MAX            = 0x100,
+};
+
+HASH_NAMESPACE_START
+template<> class hash <Opcodes>
+{
+    public: size_t operator()(const Opcodes &__x) const { return (size_t)__x; }
+};
+HASH_NAMESPACE_END
 #endif
 /// @}
diff --git a/src/game/OutdoorPvP/OutdoorPvP.cpp b/src/game/OutdoorPvP/OutdoorPvP.cpp
new file mode 100644
index 00000000000..9fa9bacb617
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvP.cpp
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "OutdoorPvP.h"
+#include "../Language.h"
+#include "../World.h"
+#include "../ObjectMgr.h"
+#include "../Object.h"
+#include "../GameObject.h"
+#include "../Player.h"
+
+/**
+   Function that adds a player to the players of the affected outdoor pvp zones
+
+   @param   player to add
+   @param   whether zone is main outdoor pvp zone or a affected zone
+ */
+void OutdoorPvP::HandlePlayerEnterZone(Player* player, bool isMainZone)
+{
+    m_zonePlayers[player->GetObjectGuid()] = isMainZone;
+}
+
+/**
+   Function that removes a player from the players of the affected outdoor pvp zones
+
+   @param   player to remove
+   @param   whether zone is main outdoor pvp zone or a affected zone
+ */
+void OutdoorPvP::HandlePlayerLeaveZone(Player* player, bool isMainZone)
+{
+    if (m_zonePlayers.erase(player->GetObjectGuid()))
+    {
+        // remove the world state information from the player
+        // if (isMainZone && !player->GetSession()->PlayerLogout())
+        //    SendRemoveWorldStates(player);
+
+        sLog.outDebug("Player %s left an Outdoor PvP zone", player->GetName());
+    }
+}
+
+/**
+   Function that updates the world state for all the players of the outdoor pvp zone
+
+   @param   world state to update
+   @param   new world state value
+ */
+void OutdoorPvP::SendUpdateWorldState(uint32 field, uint32 value)
+{
+    uint32 zoneId = sOutdoorPvPMgr.GetZoneOfAffectedScript(this);
+    sWorldStateMgr.SetWorldStateValueFor(zoneId, field, value);
+}
+
+/**
+   Function that updates world state for all the players in an outdoor pvp map
+
+   @param world state it to update
+   @param value which should update the world state
+ */
+void OutdoorPvP::SendUpdateWorldStateForMap(uint32 uiField, uint32 uiValue, Map* map)
+{
+    Map::PlayerList const& pList = map->GetPlayers();
+    for (Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
+    {
+        if (!itr->getSource() || !itr->getSource()->IsInWorld())
+            continue;
+
+        itr->getSource()->SendUpdateWorldState(uiField, uiValue);
+    }
+}
+
+/**
+   Function that handles player kills in the main outdoor pvp zones
+
+   @param   player who killed another player
+   @param   victim who was killed
+ */
+void OutdoorPvP::HandlePlayerKill(Player* killer, Player* victim)
+{
+    if (Group* group = killer->GetGroup())
+    {
+        for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* groupMember = itr->getSource();
+
+            if (!groupMember)
+                continue;
+
+            // skip if too far away
+            if (!groupMember->IsAtGroupRewardDistance(victim))
+                continue;
+
+            // creature kills must be notified, even if not inside objective / not outdoor pvp active
+            // player kills only count if active and inside objective
+            if (groupMember->CanUseCapturePoint())
+                HandlePlayerKillInsideArea(groupMember);
+        }
+    }
+    else
+    {
+        // creature kills must be notified, even if not inside objective / not outdoor pvp active
+        if (killer && killer->CanUseCapturePoint())
+            HandlePlayerKillInsideArea(killer);
+    }
+}
+
+// apply a team buff for the main and affected zones
+void OutdoorPvP::BuffTeam(Team team, uint32 spellId, bool remove /*= false*/, bool onlyMembers /*= true*/, uint32 area /*= 0*/)
+{
+    for (GuidZoneMap::iterator itr = m_zonePlayers.begin(); itr != m_zonePlayers.end(); ++itr)
+    {
+        Player* player = sObjectMgr.GetPlayer(itr->first);
+        if (!player)
+            continue;
+
+        if (player && (team == TEAM_NONE || player->GetTeam() == team) && (!onlyMembers || IsMember(player->GetObjectGuid())))
+        {
+            if (!area || area == player->GetAreaId())
+            {
+                if (remove)
+                    player->RemoveAurasDueToSpell(spellId);
+                else
+                    player->CastSpell(player, spellId, true);
+            }
+        }
+    }
+}
+
+uint32 OutdoorPvP::GetBannerArtKit(Team team, uint32 artKitAlliance /*= CAPTURE_ARTKIT_ALLIANCE*/, uint32 artKitHorde /*= CAPTURE_ARTKIT_HORDE*/, uint32 artKitNeutral /*= CAPTURE_ARTKIT_NEUTRAL*/)
+{
+    switch (team)
+    {
+        case ALLIANCE:
+            return artKitAlliance;
+        case HORDE:
+            return artKitHorde;
+        default:
+            return artKitNeutral;
+    }
+}
+
+void OutdoorPvP::SetBannerVisual(const WorldObject* objRef, ObjectGuid goGuid, uint32 artKit, uint32 animId)
+{
+    if (GameObject* go = objRef->GetMap()->GetGameObject(goGuid))
+        SetBannerVisual(go, artKit, animId);
+}
+
+void OutdoorPvP::SetBannerVisual(GameObject* go, uint32 artKit, uint32 animId)
+{
+    go->SendGameObjectCustomAnim(go->GetObjectGuid(), animId);
+    go->SetGoArtKit(artKit);
+    go->Refresh();
+}
+
+void OutdoorPvP::RespawnGO(const WorldObject* objRef, ObjectGuid goGuid, bool respawn)
+{
+    if (GameObject* go = objRef->GetMap()->GetGameObject(goGuid))
+    {
+        go->SetRespawnTime(7 * DAY);
+
+        if (respawn)
+            go->Refresh();
+        else if (go->isSpawned())
+            go->SetLootState(GO_JUST_DEACTIVATED);
+    }
+}
+
+void OutdoorPvP::FillInitialWorldState(uint32 zoneId, uint32 stateId, uint32 value)
+{
+    sWorldStateMgr.SetWorldStateValueFor(zoneId, stateId, value);
+}
+
diff --git a/src/game/OutdoorPvP/OutdoorPvP.h b/src/game/OutdoorPvP/OutdoorPvP.h
new file mode 100644
index 00000000000..d06955a9dd3
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvP.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef OUTDOOR_PVP_H
+#define OUTDOOR_PVP_H
+
+#include "Common.h"
+#include "../ObjectGuid.h"
+#include "../SharedDefines.h"
+#include "OutdoorPvPMgr.h"
+
+class WorldPacket;
+class WorldObject;
+class Player;
+class GameObject;
+class Unit;
+class Creature;
+class Map;
+
+enum CapturePointArtKits
+{
+    CAPTURE_ARTKIT_ALLIANCE = 2,
+    CAPTURE_ARTKIT_HORDE    = 1,
+    CAPTURE_ARTKIT_NEUTRAL  = 21
+};
+
+enum CapturePointAnimations
+{
+    CAPTURE_ANIM_ALLIANCE   = 1,
+    CAPTURE_ANIM_HORDE      = 0,
+    CAPTURE_ANIM_NEUTRAL    = 2
+};
+
+typedef std::map<ObjectGuid /*playerGuid*/, bool /*isMainZone*/> GuidZoneMap;
+
+class MANGOS_DLL_SPEC OutdoorPvP
+{
+    friend class OutdoorPvPMgr;
+
+    public:
+        OutdoorPvP(uint32 _id) : m_id(_id), m_isBattleField(false) {}
+        virtual ~OutdoorPvP() {}
+
+        // called when the zone is initialized
+        virtual void FillInitialWorldStates(uint32 zoneId) {}
+
+        // Process Capture event
+        virtual bool HandleEvent(uint32 /*eventId*/, GameObject* /*go*/) { return false; }
+
+        // handle capture objective complete
+        virtual void HandleObjectiveComplete(uint32 /*eventId*/, std::list<Player*> /*players*/, Team /*team*/) {}
+
+        // Called when a creature or gameobject is created
+        virtual void HandleCreatureCreate(Creature* /*creature*/) {}
+        virtual void HandleGameObjectCreate(GameObject* /*go*/) {}
+
+        // Called on creature death
+        virtual void HandleCreatureDeath(Creature* /*creature*/) {}
+
+        // Called on creature respawn
+        virtual void HandleCreatureRespawn(Creature* /*creature*/) {}
+
+        // called when a player uses a gameobject related to outdoor pvp events
+        virtual bool HandleGameObjectUse(Player* /*player*/, GameObject* /*go*/) { return false; }
+
+        // called when a player triggers an areatrigger
+        virtual bool HandleAreaTrigger(Player* /*player*/, uint32 /*triggerId*/) { return false; }
+
+        // called when a player drops a flag
+        virtual bool HandleDropFlag(Player* /*player*/, uint32 /*spellId*/) { return false; }
+
+        // update - called by the OutdoorPvPMgr
+        virtual void Update(uint32 /*diff*/) {}
+
+        // Handle player kill
+        void HandlePlayerKill(Player* killer, Player* victim);
+
+        // Wrapper for initial (per-script) WorldState filling, once per zone
+        void FillInitialWorldState(uint32 zoneId, uint32 stateId, uint32 value);
+
+        // Damage GO - for WG mostly
+        virtual void EventPlayerDamageGO(Player* /*player*/, GameObject* /*target_obj*/, uint32 /*eventId*/, uint32 /*bySpellId*/) {}
+        
+        // send world state update to all players present
+        void SendUpdateWorldStateForMap(uint32 field, uint32 value, Map* map);
+        void SendUpdateWorldState(uint32 field, uint32 value);
+
+        // set banner visual
+        void SetBannerVisual(const WorldObject* objRef, ObjectGuid goGuid, uint32 artKit, uint32 animId);
+        void SetBannerVisual(GameObject* go, uint32 artKit, uint32 animId);
+
+        // applies buff to a team inside the specific zone
+        void BuffTeam(Team team, uint32 spellId, bool remove = false, bool onlyMembers = true, uint32 area = 0);
+
+        uint32 GetId() const { return m_id; }
+        bool IsBattleField() const { return m_isBattleField; }
+
+        virtual bool IsMember(ObjectGuid guid) { return true; }
+
+        virtual bool InitOutdoorPvPArea() { return true; }
+
+    protected:
+
+        // Player related stuff
+        virtual void HandlePlayerEnterZone(Player* /*player*/, bool /*isMainZone*/);
+        virtual void HandlePlayerLeaveZone(Player* /*player*/, bool /*isMainZone*/);
+
+        // remove world states
+        virtual void SendRemoveWorldStates(Player* /*player*/) {}
+
+        // handle npc/player kill
+        virtual void HandlePlayerKillInsideArea(Player* /*killer*/) {}
+
+        // get banner artkit based on controlling team
+        uint32 GetBannerArtKit(Team team, uint32 artKitAlliance = CAPTURE_ARTKIT_ALLIANCE, uint32 artKitHorde = CAPTURE_ARTKIT_HORDE, uint32 artKitNeutral = CAPTURE_ARTKIT_NEUTRAL);
+
+        // Handle gameobject spawn / despawn
+        void RespawnGO(const WorldObject* objRef, ObjectGuid goGuid, bool respawn);
+
+        // store the players inside the area
+        GuidZoneMap m_zonePlayers;
+
+        // outdoor pvp type id
+        uint32 m_id;
+        bool m_isBattleField;
+};
+
+#endif
diff --git a/src/game/OutdoorPvP/OutdoorPvPEP.cpp b/src/game/OutdoorPvP/OutdoorPvPEP.cpp
new file mode 100644
index 00000000000..50618897d71
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPEP.cpp
@@ -0,0 +1,360 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "OutdoorPvPEP.h"
+#include "WorldPacket.h"
+#include "../World.h"
+#include "../ObjectMgr.h"
+#include "../Object.h"
+#include "../Creature.h"
+#include "../GameObject.h"
+#include "../Player.h"
+
+OutdoorPvPEP::OutdoorPvPEP(uint32 id) : OutdoorPvP(id),
+    m_towersAlliance(0),
+    m_towersHorde(0)
+{
+    // FIXME - need read data from worlstates
+    m_towerWorldState[0] = WORLD_STATE_EP_NORTHPASS_NEUTRAL;
+    m_towerWorldState[1] = WORLD_STATE_EP_CROWNGUARD_NEUTRAL;
+    m_towerWorldState[2] = WORLD_STATE_EP_EASTWALL_NEUTRAL;
+    m_towerWorldState[3] = WORLD_STATE_EP_PLAGUEWOOD_NEUTRAL;
+
+    for (uint8 i = 0; i < MAX_EP_TOWERS; ++i)
+        m_towerOwner[i] = TEAM_NONE;
+
+    // initially set graveyard owner to neither faction
+    sObjectMgr.SetGraveYardLinkTeam(GRAVEYARD_ID_EASTERN_PLAGUE, GRAVEYARD_ZONE_EASTERN_PLAGUE, TEAM_INVALID);
+
+    uint32 zoneId = sOutdoorPvPMgr.GetZoneOfAffectedScript(this);
+    FillInitialWorldStates(zoneId);
+}
+
+void OutdoorPvPEP::FillInitialWorldStates(uint32 zoneId)
+{
+    FillInitialWorldState(zoneId, WORLD_STATE_EP_TOWER_COUNT_ALLIANCE, m_towersAlliance);
+    FillInitialWorldState(zoneId, WORLD_STATE_EP_TOWER_COUNT_HORDE, m_towersHorde);
+}
+
+void OutdoorPvPEP::SendRemoveWorldStates(Player* player)
+{
+    for (uint8 i = 0; i < MAX_EP_TOWERS; ++i)
+        player->SendUpdateWorldState(m_towerWorldState[i], WORLD_STATE_REMOVE);
+}
+
+void OutdoorPvPEP::HandlePlayerEnterZone(Player* player, bool isMainZone)
+{
+    OutdoorPvP::HandlePlayerEnterZone(player, isMainZone);
+
+    // remove the buff from the player first; Sometimes on relog players still have the aura
+    for (uint8 i = 0; i < MAX_EP_TOWERS; ++i)
+        player->RemoveAurasDueToSpell(player->GetTeam() == ALLIANCE ? plaguelandsTowerBuffs[i].spellIdAlliance : plaguelandsTowerBuffs[i].spellIdHorde);
+
+    // buff the player
+    switch (player->GetTeam())
+    {
+        case ALLIANCE:
+            if (m_towersAlliance > 0)
+                player->CastSpell(player, plaguelandsTowerBuffs[m_towersAlliance - 1].spellIdAlliance, true);
+            break;
+        case HORDE:
+            if (m_towersHorde > 0)
+                player->CastSpell(player, plaguelandsTowerBuffs[m_towersHorde - 1].spellIdHorde, true);
+            break;
+        default:
+            break;
+    }
+}
+
+void OutdoorPvPEP::HandlePlayerLeaveZone(Player* player, bool isMainZone)
+{
+    // remove the buff from the player
+    for (uint8 i = 0; i < MAX_EP_TOWERS; ++i)
+        player->RemoveAurasDueToSpell(player->GetTeam() == ALLIANCE ? plaguelandsTowerBuffs[i].spellIdAlliance : plaguelandsTowerBuffs[i].spellIdHorde);
+
+    OutdoorPvP::HandlePlayerLeaveZone(player, isMainZone);
+}
+
+void OutdoorPvPEP::HandleCreatureCreate(Creature* creature)
+{
+    switch (creature->GetEntry())
+    {
+        case NPC_SPECTRAL_FLIGHT_MASTER:
+            m_flightMaster = creature->GetObjectGuid();
+            creature->setFaction(m_towerOwner[TOWER_ID_PLAGUEWOOD] == ALLIANCE ? FACTION_FLIGHT_MASTER_ALLIANCE : FACTION_FLIGHT_MASTER_HORDE);
+            creature->CastSpell(creature, m_towerOwner[TOWER_ID_PLAGUEWOOD] == ALLIANCE ? SPELL_SPIRIT_PARTICLES_BLUE : SPELL_SPIRIT_PARTICLES_RED, true);
+            break;
+        case NPC_LORDAERON_COMMANDER:
+        case NPC_LORDAERON_SOLDIER:
+        case NPC_LORDAERON_VETERAN:
+        case NPC_LORDAERON_FIGHTER:
+            m_soldiers.push_back(creature->GetObjectGuid());
+            break;
+    }
+}
+
+void OutdoorPvPEP::HandleGameObjectCreate(GameObject* go)
+{
+    switch (go->GetEntry())
+    {
+        case GO_TOWER_BANNER_NORTHPASS:
+            InitBanner(go, TOWER_ID_NORTHPASS);
+            break;
+        case GO_TOWER_BANNER_CROWNGUARD:
+            InitBanner(go, TOWER_ID_CROWNGUARD);
+            break;
+        case GO_TOWER_BANNER_EASTWALL:
+            InitBanner(go, TOWER_ID_EASTWALL);
+            break;
+        case GO_TOWER_BANNER_PLAGUEWOOD:
+            InitBanner(go, TOWER_ID_PLAGUEWOOD);
+            break;
+        case GO_TOWER_BANNER:
+            // sort banners
+            if (go->IsWithinDist2d(plaguelandsTowerLocations[TOWER_ID_NORTHPASS][0], plaguelandsTowerLocations[TOWER_ID_NORTHPASS][1], 50.0f))
+                InitBanner(go, TOWER_ID_NORTHPASS);
+            else if (go->IsWithinDist2d(plaguelandsTowerLocations[TOWER_ID_CROWNGUARD][0], plaguelandsTowerLocations[TOWER_ID_CROWNGUARD][1], 50.0f))
+                InitBanner(go, TOWER_ID_CROWNGUARD);
+            else if (go->IsWithinDist2d(plaguelandsTowerLocations[TOWER_ID_EASTWALL][0], plaguelandsTowerLocations[TOWER_ID_EASTWALL][1], 50.0f))
+                InitBanner(go, TOWER_ID_EASTWALL);
+            else if (go->IsWithinDist2d(plaguelandsTowerLocations[TOWER_ID_PLAGUEWOOD][0], plaguelandsTowerLocations[TOWER_ID_PLAGUEWOOD][1], 50.0f))
+                InitBanner(go, TOWER_ID_PLAGUEWOOD);
+            break;
+        case GO_LORDAERON_SHRINE_ALLIANCE:
+            m_lordaeronShrineAlliance = go->GetObjectGuid();
+            break;
+        case GO_LORDAERON_SHRINE_HORDE:
+            m_lordaeronShrineHorde = go->GetObjectGuid();
+            break;
+    }
+}
+
+void OutdoorPvPEP::HandleObjectiveComplete(uint32 eventId, std::list<Player*> players, Team team)
+{
+    uint32 credit = 0;
+
+    switch (eventId)
+    {
+        case EVENT_CROWNGUARD_PROGRESS_ALLIANCE:
+        case EVENT_CROWNGUARD_PROGRESS_HORDE:
+            credit = NPC_CROWNGUARD_TOWER_QUEST_DOODAD;
+            break;
+        case EVENT_EASTWALL_PROGRESS_ALLIANCE:
+        case EVENT_EASTWALL_PROGRESS_HORDE:
+            credit = NPC_EASTWALL_TOWER_QUEST_DOODAD;
+            break;
+        case EVENT_NORTHPASS_PROGRESS_ALLIANCE:
+        case EVENT_NORTHPASS_PROGRESS_HORDE:
+            credit = NPC_NORTHPASS_TOWER_QUEST_DOODAD;
+            break;
+        case EVENT_PLAGUEWOOD_PROGRESS_ALLIANCE:
+        case EVENT_PLAGUEWOOD_PROGRESS_HORDE:
+            credit = NPC_PLAGUEWOOD_TOWER_QUEST_DOODAD;
+            break;
+        default:
+            return;
+    }
+
+    for (std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr)
+    {
+        if ((*itr) && (*itr)->GetTeam() == team)
+        {
+            (*itr)->KilledMonsterCredit(credit);
+            (*itr)->RewardHonor(NULL, 1, HONOR_REWARD_PLAGUELANDS);
+        }
+    }
+}
+
+// process the capture events
+bool OutdoorPvPEP::HandleEvent(uint32 eventId, GameObject* go)
+{
+    for (uint8 i = 0; i < MAX_EP_TOWERS; ++i)
+    {
+        if (plaguelandsBanners[i] == go->GetEntry())
+        {
+            for (uint8 j = 0; j < 4; ++j)
+            {
+                if (plaguelandsTowerEvents[i][j].eventEntry == eventId)
+                {
+                    // prevent processing if the owner did not change (happens if progress event is called after contest event)
+                    if (plaguelandsTowerEvents[i][j].team != m_towerOwner[i])
+                    {
+                        if (plaguelandsTowerEvents[i][j].defenseMessage)
+                            sWorld.SendDefenseMessage(ZONE_ID_EASTERN_PLAGUELANDS, plaguelandsTowerEvents[i][j].defenseMessage);
+
+                        return ProcessCaptureEvent(go, i, plaguelandsTowerEvents[i][j].team, plaguelandsTowerEvents[i][j].worldState);
+                    }
+                    // no need to iterate other events or towers
+                    return false;
+                }
+            }
+            // no need to iterate other towers
+            return false;
+        }
+    }
+
+    return false;
+}
+
+bool OutdoorPvPEP::ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team, uint32 newWorldState)
+{
+    if (team == ALLIANCE)
+    {
+        // update banner
+        for (GuidList::const_iterator itr = m_towerBanners[towerId].begin(); itr != m_towerBanners[towerId].end(); ++itr)
+            SetBannerVisual(go, (*itr), CAPTURE_ARTKIT_ALLIANCE, CAPTURE_ANIM_ALLIANCE);
+
+        // update counter
+        ++m_towersAlliance;
+        SendUpdateWorldState(WORLD_STATE_EP_TOWER_COUNT_ALLIANCE, m_towersAlliance);
+
+        // buff players
+        BuffTeam(ALLIANCE, plaguelandsTowerBuffs[m_towersAlliance - 1].spellIdAlliance);
+    }
+    else if (team == HORDE)
+    {
+        // update banner
+        for (GuidList::const_iterator itr = m_towerBanners[towerId].begin(); itr != m_towerBanners[towerId].end(); ++itr)
+            SetBannerVisual(go, (*itr), CAPTURE_ARTKIT_HORDE, CAPTURE_ANIM_HORDE);
+
+        // update counter
+        ++m_towersHorde;
+        SendUpdateWorldState(WORLD_STATE_EP_TOWER_COUNT_HORDE, m_towersHorde);
+
+        // buff players
+        BuffTeam(HORDE, plaguelandsTowerBuffs[m_towersHorde - 1].spellIdHorde);
+    }
+    else
+    {
+        // update banner
+        for (GuidList::const_iterator itr = m_towerBanners[towerId].begin(); itr != m_towerBanners[towerId].end(); ++itr)
+            SetBannerVisual(go, (*itr), CAPTURE_ARTKIT_NEUTRAL, CAPTURE_ANIM_NEUTRAL);
+
+        if (m_towerOwner[towerId] == ALLIANCE)
+        {
+            // update counter
+            --m_towersAlliance;
+            SendUpdateWorldState(WORLD_STATE_EP_TOWER_COUNT_ALLIANCE, m_towersAlliance);
+
+            if (m_towersAlliance == 0)
+                BuffTeam(ALLIANCE, plaguelandsTowerBuffs[0].spellIdAlliance, true);
+        }
+        else
+        {
+            // update counter
+            --m_towersHorde;
+            SendUpdateWorldState(WORLD_STATE_EP_TOWER_COUNT_HORDE, m_towersHorde);
+
+            if (m_towersHorde == 0)
+                BuffTeam(HORDE, plaguelandsTowerBuffs[0].spellIdHorde, true);
+        }
+    }
+
+    bool eventHandled = true;
+
+    if (team != TEAM_NONE)
+    {
+        // update capture point owner before rewards are applied
+        m_towerOwner[towerId] = team;
+
+        // apply rewards of changed tower
+        switch (towerId)
+        {
+            case TOWER_ID_NORTHPASS:
+                RespawnGO(go, team == ALLIANCE ? m_lordaeronShrineAlliance : m_lordaeronShrineHorde, true);
+                break;
+            case TOWER_ID_CROWNGUARD:
+                sObjectMgr.SetGraveYardLinkTeam(GRAVEYARD_ID_EASTERN_PLAGUE, GRAVEYARD_ZONE_EASTERN_PLAGUE, team);
+                break;
+            case TOWER_ID_EASTWALL:
+                // Return false - allow the DB to handle summons
+                if (m_towerOwner[TOWER_ID_NORTHPASS] != team)
+                    eventHandled = false;
+                break;
+            case TOWER_ID_PLAGUEWOOD:
+                // Return false - allow the DB to handle summons
+                eventHandled = false;
+                break;
+        }
+    }
+    else
+    {
+        // remove rewards of changed tower
+        switch (towerId)
+        {
+            case TOWER_ID_NORTHPASS:
+                RespawnGO(go, m_towerOwner[TOWER_ID_NORTHPASS] == ALLIANCE ? m_lordaeronShrineAlliance : m_lordaeronShrineHorde, false);
+                break;
+            case TOWER_ID_CROWNGUARD:
+                sObjectMgr.SetGraveYardLinkTeam(GRAVEYARD_ID_EASTERN_PLAGUE, GRAVEYARD_ZONE_EASTERN_PLAGUE, TEAM_INVALID);
+                break;
+            case TOWER_ID_EASTWALL:
+                UnsummonSoldiers(go);
+                break;
+            case TOWER_ID_PLAGUEWOOD:
+                UnsummonFlightMaster(go);
+                break;
+        }
+
+        // update capture point owner after rewards have been removed
+        m_towerOwner[towerId] = team;
+    }
+
+    // update tower state
+    SendUpdateWorldState(m_towerWorldState[towerId], WORLD_STATE_REMOVE);
+    m_towerWorldState[towerId] = newWorldState;
+    SendUpdateWorldState(m_towerWorldState[towerId], WORLD_STATE_ADD);
+
+    // there are some events which required further DB script
+    return eventHandled;
+}
+
+bool OutdoorPvPEP::HandleGameObjectUse(Player* /*player*/, GameObject* go)
+{
+    // prevent despawning after go use
+    if (go->GetEntry() == GO_LORDAERON_SHRINE_ALLIANCE || go->GetEntry() == GO_LORDAERON_SHRINE_HORDE)
+        go->SetRespawnTime(0);
+
+    return false;
+}
+
+void OutdoorPvPEP::InitBanner(GameObject* go, uint32 towerId)
+{
+    m_towerBanners[towerId].push_back(go->GetObjectGuid());
+    m_towerOwner[towerId] = go->GetTeam();
+    go->SetGoArtKit(GetBannerArtKit(m_towerOwner[towerId]));
+}
+
+// Handle the unsummon of the spectral flight master when the Plaguewood tower is lost
+void OutdoorPvPEP::UnsummonFlightMaster(const WorldObject* objRef)
+{
+    if (Creature* flightMaster = objRef->GetMap()->GetCreature(m_flightMaster))
+        flightMaster->ForcedDespawn();
+}
+
+// Handle the unsummon of the soldiers when the Eastwall tower is lost
+void OutdoorPvPEP::UnsummonSoldiers(const WorldObject* objRef)
+{
+    for (GuidList::const_iterator itr = m_soldiers.begin(); itr != m_soldiers.end(); ++itr)
+    {
+        if (Creature* soldier = objRef->GetMap()->GetCreature(*itr))
+            soldier->ForcedDespawn();
+    }
+
+    m_soldiers.clear();
+}
diff --git a/src/game/OutdoorPvP/OutdoorPvPEP.h b/src/game/OutdoorPvP/OutdoorPvPEP.h
new file mode 100644
index 00000000000..835753ee0c0
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPEP.h
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef WORLD_PVP_EP
+#define WORLD_PVP_EP
+
+#include "Common.h"
+#include "OutdoorPvP.h"
+#include "../Language.h"
+
+enum
+{
+    TOWER_ID_NORTHPASS                              = 0,
+    TOWER_ID_CROWNGUARD                             = 1,
+    TOWER_ID_EASTWALL                               = 2,
+    TOWER_ID_PLAGUEWOOD                             = 3,
+    MAX_EP_TOWERS                                   = 4,
+
+    // spells
+    SPELL_ECHOES_OF_LORDAERON_ALLIANCE_1            = 11413,
+    SPELL_ECHOES_OF_LORDAERON_ALLIANCE_2            = 11414,
+    SPELL_ECHOES_OF_LORDAERON_ALLIANCE_3            = 11415,
+    SPELL_ECHOES_OF_LORDAERON_ALLIANCE_4            = 1386,
+
+    SPELL_ECHOES_OF_LORDAERON_HORDE_1               = 30880,
+    SPELL_ECHOES_OF_LORDAERON_HORDE_2               = 30683,
+    SPELL_ECHOES_OF_LORDAERON_HORDE_3               = 30682,
+    SPELL_ECHOES_OF_LORDAERON_HORDE_4               = 29520,
+
+    // graveyards
+    GRAVEYARD_ZONE_EASTERN_PLAGUE                   = 139,
+    GRAVEYARD_ID_EASTERN_PLAGUE                     = 927,
+
+    // misc
+    HONOR_REWARD_PLAGUELANDS                        = 18,
+
+    // npcs
+    NPC_SPECTRAL_FLIGHT_MASTER                      = 17209,
+
+    // flight master factions
+    FACTION_FLIGHT_MASTER_ALLIANCE                  = 774,
+    FACTION_FLIGHT_MASTER_HORDE                     = 775,
+
+    SPELL_SPIRIT_PARTICLES_BLUE                     = 17327,
+    SPELL_SPIRIT_PARTICLES_RED                      = 31309,
+
+    // quest
+    NPC_CROWNGUARD_TOWER_QUEST_DOODAD               = 17689,
+    NPC_EASTWALL_TOWER_QUEST_DOODAD                 = 17690,
+    NPC_NORTHPASS_TOWER_QUEST_DOODAD                = 17696,
+    NPC_PLAGUEWOOD_TOWER_QUEST_DOODAD               = 17698,
+
+    // alliance
+    NPC_LORDAERON_COMMANDER                         = 17635,
+    NPC_LORDAERON_SOLDIER                           = 17647,
+
+    // horde
+    NPC_LORDAERON_VETERAN                           = 17995,
+    NPC_LORDAERON_FIGHTER                           = 17996,
+
+    // gameobjects
+    GO_LORDAERON_SHRINE_ALLIANCE                    = 181682,
+    GO_LORDAERON_SHRINE_HORDE                       = 181955,
+    GO_TOWER_FLAG                                   = 182106,
+
+    // possible shrine auras - not used
+    //GO_ALLIANCE_BANNER_AURA                       = 180100,
+    //GO_HORDE_BANNER_AURA                          = 180101,
+
+    // capture points
+    GO_TOWER_BANNER_NORTHPASS                       = 181899,
+    GO_TOWER_BANNER_CROWNGUARD                      = 182096,
+    GO_TOWER_BANNER_EASTWALL                        = 182097,
+    GO_TOWER_BANNER_PLAGUEWOOD                      = 182098,
+
+    GO_TOWER_BANNER                                 = 182106,   // tower banners around
+
+    // events
+    //EVENT_NORTHPASS_WIN_ALLIANCE                  = 10568,
+    //EVENT_NORTHPASS_WIN_HORDE                     = 10556,
+    //EVENT_NORTHPASS_CONTEST_ALLIANCE              = 10697,
+    //EVENT_NORTHPASS_CONTEST_HORDE                 = 10696,
+    EVENT_NORTHPASS_PROGRESS_ALLIANCE               = 10699,
+    EVENT_NORTHPASS_PROGRESS_HORDE                  = 10698,
+    EVENT_NORTHPASS_NEUTRAL_ALLIANCE                = 11151,
+    EVENT_NORTHPASS_NEUTRAL_HORDE                   = 11150,
+
+    //EVENT_CROWNGUARD_WIN_ALLIANCE                 = 10570,
+    //EVENT_CROWNGUARD_WIN_HORDE                    = 10566,
+    //EVENT_CROWNGUARD_CONTEST_ALLIANCE             = 10703,
+    //EVENT_CROWNGUARD_CONTEST_HORDE                = 10702,
+    EVENT_CROWNGUARD_PROGRESS_ALLIANCE              = 10705,
+    EVENT_CROWNGUARD_PROGRESS_HORDE                 = 10704,
+    EVENT_CROWNGUARD_NEUTRAL_ALLIANCE               = 11155,
+    EVENT_CROWNGUARD_NEUTRAL_HORDE                  = 11154,
+
+    //EVENT_EASTWALL_WIN_ALLIANCE                   = 10569,
+    //EVENT_EASTWALL_WIN_HORDE                      = 10565,
+    //EVENT_EASTWALL_CONTEST_ALLIANCE               = 10689,
+    //EVENT_EASTWALL_CONTEST_HORDE                  = 10690,
+    EVENT_EASTWALL_PROGRESS_ALLIANCE                = 10691,
+    EVENT_EASTWALL_PROGRESS_HORDE                   = 10692,
+    EVENT_EASTWALL_NEUTRAL_ALLIANCE                 = 11149,
+    EVENT_EASTWALL_NEUTRAL_HORDE                    = 11148,
+
+    //EVENT_PLAGUEWOOD_WIN_ALLIANCE                 = 10567,
+    //EVENT_PLAGUEWOOD_WIN_HORDE                    = 10564,
+    //EVENT_PLAGUEWOOD_CONTEST_ALLIANCE             = 10687,
+    //EVENT_PLAGUEWOOD_CONTEST_HORDE                = 10688,
+    EVENT_PLAGUEWOOD_PROGRESS_ALLIANCE              = 10701,
+    EVENT_PLAGUEWOOD_PROGRESS_HORDE                 = 10700,
+    EVENT_PLAGUEWOOD_NEUTRAL_ALLIANCE               = 11153,
+    EVENT_PLAGUEWOOD_NEUTRAL_HORDE                  = 11152,
+
+    // world states
+    WORLD_STATE_EP_TOWER_COUNT_ALLIANCE             = 2327,
+    WORLD_STATE_EP_TOWER_COUNT_HORDE                = 2328,
+
+    //WORLD_STATE_EP_PLAGUEWOOD_CONTEST_ALLIANCE    = 2366,
+    //WORLD_STATE_EP_PLAGUEWOOD_CONTEST_HORDE       = 2367,
+    //WORLD_STATE_EP_PLAGUEWOOD_PROGRESS_ALLIANCE   = 2368,
+    //WORLD_STATE_EP_PLAGUEWOOD_PROGRESS_HORDE      = 2369,
+    WORLD_STATE_EP_PLAGUEWOOD_ALLIANCE              = 2370,
+    WORLD_STATE_EP_PLAGUEWOOD_HORDE                 = 2371,
+    WORLD_STATE_EP_PLAGUEWOOD_NEUTRAL               = 2353,
+
+    //WORLD_STATE_EP_NORTHPASS_CONTEST_ALLIANCE     = 2362,
+    //WORLD_STATE_EP_NORTHPASS_CONTEST_HORDE        = 2363,
+    //WORLD_STATE_EP_NORTHPASS_PROGRESS_ALLIANCE    = 2364,
+    //WORLD_STATE_EP_NORTHPASS_PROGRESS_HORDE       = 2365,
+    WORLD_STATE_EP_NORTHPASS_ALLIANCE               = 2372,
+    WORLD_STATE_EP_NORTHPASS_HORDE                  = 2373,
+    WORLD_STATE_EP_NORTHPASS_NEUTRAL                = 2352,
+
+    //WORLD_STATE_EP_EASTWALL_CONTEST_ALLIANCE      = 2359,
+    //WORLD_STATE_EP_EASTWALL_CONTEST_HORDE         = 2360,
+    //WORLD_STATE_EP_EASTWALL_PROGRESS_ALLIANCE     = 2357,
+    //WORLD_STATE_EP_EASTWALL_PROGRESS_HORDE        = 2358,
+    WORLD_STATE_EP_EASTWALL_ALLIANCE                = 2354,
+    WORLD_STATE_EP_EASTWALL_HORDE                   = 2356,
+    WORLD_STATE_EP_EASTWALL_NEUTRAL                 = 2361,
+
+    //WORLD_STATE_EP_CROWNGUARD_CONTEST_ALLIANCE    = 2374,
+    //WORLD_STATE_EP_CROWNGUARD_CONTEST_HORDE       = 2375,
+    //WORLD_STATE_EP_CROWNGUARD_PROGRESS_ALLIANCE   = 2376,
+    //WORLD_STATE_EP_CROWNGUARD_PROGRESS_HORDE      = 2377,
+    WORLD_STATE_EP_CROWNGUARD_ALLIANCE              = 2378,
+    WORLD_STATE_EP_CROWNGUARD_HORDE                 = 2379,
+    WORLD_STATE_EP_CROWNGUARD_NEUTRAL               = 2355
+};
+
+struct PlaguelandsTowerBuff
+{
+    uint32 spellIdAlliance, spellIdHorde;
+};
+
+static const PlaguelandsTowerBuff plaguelandsTowerBuffs[MAX_EP_TOWERS] =
+{
+    {SPELL_ECHOES_OF_LORDAERON_ALLIANCE_1, SPELL_ECHOES_OF_LORDAERON_HORDE_1},
+    {SPELL_ECHOES_OF_LORDAERON_ALLIANCE_2, SPELL_ECHOES_OF_LORDAERON_HORDE_2},
+    {SPELL_ECHOES_OF_LORDAERON_ALLIANCE_3, SPELL_ECHOES_OF_LORDAERON_HORDE_3},
+    {SPELL_ECHOES_OF_LORDAERON_ALLIANCE_4, SPELL_ECHOES_OF_LORDAERON_HORDE_4}
+};
+
+// capture points coordinates to sort the banners
+static const float plaguelandsTowerLocations[MAX_EP_TOWERS][2] =
+{
+    {3181.08f, -4379.36f},       // Northpass
+    {1860.85f, -3731.23f},       // Crownguard
+    {2574.51f, -4794.89f},       // Eastwall
+    {2962.71f, -3042.31f}        // Plaguewood
+};
+
+struct PlaguelandsTowerEvent
+{
+    uint32  eventEntry;
+    Team    team;
+    uint32  defenseMessage;
+    uint32  worldState;
+};
+
+static const PlaguelandsTowerEvent plaguelandsTowerEvents[MAX_EP_TOWERS][4] =
+{
+    {
+        {EVENT_NORTHPASS_PROGRESS_ALLIANCE,     ALLIANCE,   LANG_OPVP_EP_CAPTURE_NPT_A, WORLD_STATE_EP_NORTHPASS_ALLIANCE},
+        {EVENT_NORTHPASS_PROGRESS_HORDE,        HORDE,      LANG_OPVP_EP_CAPTURE_NPT_H, WORLD_STATE_EP_NORTHPASS_HORDE},
+        {EVENT_NORTHPASS_NEUTRAL_HORDE,         TEAM_NONE,  0,                          WORLD_STATE_EP_NORTHPASS_NEUTRAL},
+        {EVENT_NORTHPASS_NEUTRAL_ALLIANCE,      TEAM_NONE,  0,                          WORLD_STATE_EP_NORTHPASS_NEUTRAL},
+    },
+    {
+        {EVENT_CROWNGUARD_PROGRESS_ALLIANCE,    ALLIANCE,   LANG_OPVP_EP_CAPTURE_CGT_A, WORLD_STATE_EP_CROWNGUARD_ALLIANCE},
+        {EVENT_CROWNGUARD_PROGRESS_HORDE,       HORDE,      LANG_OPVP_EP_CAPTURE_CGT_H, WORLD_STATE_EP_CROWNGUARD_HORDE},
+        {EVENT_CROWNGUARD_NEUTRAL_HORDE,        TEAM_NONE,  0,                          WORLD_STATE_EP_CROWNGUARD_NEUTRAL},
+        {EVENT_CROWNGUARD_NEUTRAL_ALLIANCE,     TEAM_NONE,  0,                          WORLD_STATE_EP_CROWNGUARD_NEUTRAL},
+    },
+    {
+        {EVENT_EASTWALL_PROGRESS_ALLIANCE,      ALLIANCE,   LANG_OPVP_EP_CAPTURE_EWT_A, WORLD_STATE_EP_EASTWALL_ALLIANCE},
+        {EVENT_EASTWALL_PROGRESS_HORDE,         HORDE,      LANG_OPVP_EP_CAPTURE_EWT_H, WORLD_STATE_EP_EASTWALL_HORDE},
+        {EVENT_EASTWALL_NEUTRAL_HORDE,          TEAM_NONE,  0,                          WORLD_STATE_EP_EASTWALL_NEUTRAL},
+        {EVENT_EASTWALL_NEUTRAL_ALLIANCE,       TEAM_NONE,  0,                          WORLD_STATE_EP_EASTWALL_NEUTRAL},
+    },
+    {
+        {EVENT_PLAGUEWOOD_PROGRESS_ALLIANCE,    ALLIANCE,   LANG_OPVP_EP_CAPTURE_PWT_A, WORLD_STATE_EP_PLAGUEWOOD_ALLIANCE},
+        {EVENT_PLAGUEWOOD_PROGRESS_HORDE,       HORDE,      LANG_OPVP_EP_CAPTURE_PWT_H, WORLD_STATE_EP_PLAGUEWOOD_HORDE},
+        {EVENT_PLAGUEWOOD_NEUTRAL_HORDE,        TEAM_NONE,  0,                          WORLD_STATE_EP_PLAGUEWOOD_NEUTRAL},
+        {EVENT_PLAGUEWOOD_NEUTRAL_ALLIANCE,     TEAM_NONE,  0,                          WORLD_STATE_EP_PLAGUEWOOD_NEUTRAL},
+    },
+};
+
+static const uint32 plaguelandsBanners[MAX_EP_TOWERS] = {GO_TOWER_BANNER_NORTHPASS, GO_TOWER_BANNER_CROWNGUARD, GO_TOWER_BANNER_EASTWALL, GO_TOWER_BANNER_PLAGUEWOOD};
+
+class OutdoorPvPEP : public OutdoorPvP
+{
+    public:
+        OutdoorPvPEP(uint32 id);
+
+        void HandlePlayerEnterZone(Player* player, bool isMainZone) override;
+        void HandlePlayerLeaveZone(Player* player, bool isMainZone) override;
+        void FillInitialWorldStates(uint32 zoneId) override;
+        void SendRemoveWorldStates(Player* player) override;
+
+        bool HandleEvent(uint32 eventId, GameObject* go) override;
+        void HandleObjectiveComplete(uint32 eventId, std::list<Player*> players, Team team) override;
+
+        void HandleCreatureCreate(Creature* creature) override;
+        void HandleGameObjectCreate(GameObject* go) override;
+        bool HandleGameObjectUse(Player* player, GameObject* go) override;
+
+    private:
+        // process capture events
+        bool ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team, uint32 newWorldState);
+
+        void InitBanner(GameObject* go, uint32 towerId);
+
+        // Plaguewood bonus - flight master
+        void UnsummonFlightMaster(const WorldObject* objRef);
+        // Eastwall bonus - soldiers
+        void UnsummonSoldiers(const WorldObject* objRef);
+
+        Team m_towerOwner[MAX_EP_TOWERS];
+        uint32 m_towerWorldState[MAX_EP_TOWERS];
+        uint32 m_towersAlliance;
+        uint32 m_towersHorde;
+
+        ObjectGuid m_flightMaster;
+        ObjectGuid m_lordaeronShrineAlliance;
+        ObjectGuid m_lordaeronShrineHorde;
+
+        GuidList m_soldiers;
+
+        GuidList m_towerBanners[MAX_EP_TOWERS];
+};
+
+#endif
diff --git a/src/game/OutdoorPvP/OutdoorPvPGH.cpp b/src/game/OutdoorPvP/OutdoorPvPGH.cpp
new file mode 100644
index 00000000000..eb94a4063e1
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPGH.cpp
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "OutdoorPvPGH.h"
+#include "../Map.h"
+#include "../Object.h"
+#include "../Creature.h"
+#include "../GameObject.h"
+
+OutdoorPvPGH::OutdoorPvPGH(uint32 id) : OutdoorPvP(id),
+    m_zoneOwner(TEAM_NONE)
+{
+}
+
+void OutdoorPvPGH::HandleCreatureCreate(Creature* creature)
+{
+    // only handle summoned creatures
+    if (!creature->IsTemporarySummon())
+        return;
+
+    switch (creature->GetEntry())
+    {
+        case NPC_HORSE:
+        case NPC_BLACKSMITH_JASON_RIGGINS:
+        case NPC_STABLE_MASTER_TIM:
+        case NPC_VENDOR_ADAMS:
+        case NPC_BLACKSMITH_KOLOTH:
+        case NPC_STABLE_MASTER_KOR:
+        case NPC_VENDOR_PURKOM:
+        case NPC_RIDING_WOLF:
+            m_teamVendors.push_back(creature->GetObjectGuid());
+            break;
+    }
+}
+
+void OutdoorPvPGH::HandleCreatureDeath(Creature* creature)
+{
+    switch (creature->GetEntry())
+    {
+        // Note: even if some soldiers or vendors are killed, they don't respawn on timer.
+        // The only way to respawn them is to capture the zone from the other faction.
+        case NPC_COMMANDER_HOWSER:
+        case NPC_GENERAL_GORLOK:
+            UnlockLighthouse(creature);
+            break;
+    }
+}
+
+void OutdoorPvPGH::HandleGameObjectCreate(GameObject* go)
+{
+    if (go->GetEntry() == GO_VENTURE_BAY_LIGHTHOUSE)
+    {
+        m_capturePoint = go->GetObjectGuid();
+        m_zoneOwner    = go->GetTeam();
+        go->SetGoArtKit(GetBannerArtKit(m_zoneOwner));
+        LockLighthouse(go);
+        DespawnVendors(go);
+    }
+}
+
+// process the capture events
+bool OutdoorPvPGH::HandleEvent(uint32 eventId, GameObject* go)
+{
+    // If we are not using the lighthouse return
+    if (go->GetEntry() != GO_VENTURE_BAY_LIGHTHOUSE)
+        return false;
+
+    bool eventHandled = true;
+
+    switch (eventId)
+    {
+        case EVENT_LIGHTHOUSE_WIN_ALLIANCE:
+            // Ignore the event if the zone is already in alliance control
+            if (m_zoneOwner == ALLIANCE)
+                return true;
+
+            // Spawn the npcs only when the tower is fully controlled. Also allow the event to handle summons in DB.
+            m_zoneOwner = ALLIANCE;
+            LockLighthouse(go);
+            DespawnVendors(go);
+            eventHandled = false;
+            break;
+        case EVENT_LIGHTHOUSE_WIN_HORDE:
+            // Ignore the event if the zone is already in horde control
+            if (m_zoneOwner == HORDE)
+                return true;
+
+            // Spawn the npcs only when the tower is fully controlled. Also allow the event to handle summons in DB.
+            m_zoneOwner = HORDE;
+            LockLighthouse(go);
+            DespawnVendors(go);
+            eventHandled = false;
+            break;
+        case EVENT_LIGHTHOUSE_PROGRESS_ALLIANCE:
+            SetBannerVisual(go, CAPTURE_ARTKIT_ALLIANCE, CAPTURE_ANIM_ALLIANCE);
+            break;
+        case EVENT_LIGHTHOUSE_PROGRESS_HORDE:
+            SetBannerVisual(go, CAPTURE_ARTKIT_HORDE, CAPTURE_ANIM_HORDE);
+            break;
+        case EVENT_LIGHTHOUSE_NEUTRAL_ALLIANCE:
+        case EVENT_LIGHTHOUSE_NEUTRAL_HORDE:
+            m_zoneOwner = TEAM_NONE;
+            SetBannerVisual(go, CAPTURE_ARTKIT_NEUTRAL, CAPTURE_ANIM_NEUTRAL);
+            break;
+    }
+
+    // there are some events which required further DB script
+    return eventHandled;
+}
+
+// Despawn the vendors when the lighthouse is won by the opposite faction
+void OutdoorPvPGH::DespawnVendors(const WorldObject* objRef)
+{
+    // despawn all team vendors
+    for (GuidList::const_iterator itr = m_teamVendors.begin(); itr != m_teamVendors.end(); ++itr)
+    {
+        if (Creature* vendor = objRef->GetMap()->GetCreature(*itr))
+            vendor->ForcedDespawn();
+    }
+    m_teamVendors.clear();
+}
+
+// Handle Lighthouse lock when all the soldiers and the commander are spawned
+void OutdoorPvPGH::LockLighthouse(const WorldObject* objRef)
+{
+    if (GameObject* go = objRef->GetMap()->GetGameObject(m_capturePoint))
+        go->SetCapturePointSlider(m_zoneOwner == ALLIANCE ? CAPTURE_SLIDER_ALLIANCE_LOCKED : CAPTURE_SLIDER_HORDE_LOCKED);
+
+    sOutdoorPvPMgr.SetCapturePointSlider(m_capturePoint, m_zoneOwner == ALLIANCE ? CAPTURE_SLIDER_ALLIANCE_LOCKED : CAPTURE_SLIDER_HORDE_LOCKED);
+}
+
+// Handle Lighthouse unlock when the commander is killed
+void OutdoorPvPGH::UnlockLighthouse(const WorldObject* objRef)
+{
+    if (GameObject* go = objRef->GetMap()->GetGameObject(m_capturePoint))
+        go->SetCapturePointSlider(CAPTURE_SLIDER_GET_VALUE);
+        // no banner visual update needed because it already has the correct one
+    else
+        // if grid is unloaded, resetting the slider value is enough
+        sOutdoorPvPMgr.SetCapturePointSlider(m_capturePoint, m_zoneOwner == ALLIANCE ? CAPTURE_SLIDER_ALLIANCE : CAPTURE_SLIDER_HORDE);
+}
diff --git a/src/game/OutdoorPvP/OutdoorPvPGH.h b/src/game/OutdoorPvP/OutdoorPvPGH.h
new file mode 100644
index 00000000000..98c2a1adc2c
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPGH.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef WORLD_PVP_GH
+#define WORLD_PVP_GH
+
+#include "Common.h"
+#include "OutdoorPvP.h"
+
+enum
+{
+    // npcs
+    // alliance
+    NPC_WESTFALL_BRIGADE_DEFENDER           = 27758,
+    NPC_COMMANDER_HOWSER                    = 27759,
+    NPC_BLACKSMITH_JASON_RIGGINS            = 29252,
+    NPC_VENDOR_ADAMS                        = 27760,
+    NPC_STABLE_MASTER_TIM                   = 29250,
+    NPC_HORSE                               = 385,
+
+    // horde
+    NPC_CONQUEST_HOLD_DEFENDER              = 27748,
+    NPC_GENERAL_GORLOK                      = 27708,
+    NPC_BLACKSMITH_KOLOTH                   = 29253,
+    NPC_VENDOR_PURKOM                       = 27730,
+    NPC_STABLE_MASTER_KOR                   = 29251,
+    NPC_RIDING_WOLF                         = 5774,
+
+    // gameobjects
+    GO_VENTURE_BAY_LIGHTHOUSE               = 189310,
+
+    // events
+    EVENT_LIGHTHOUSE_WIN_ALLIANCE           = 18035,
+    EVENT_LIGHTHOUSE_WIN_HORDE              = 18036,
+    //EVENT_LIGHTHOUSE_CONTEST_ALLIANCE     = 18037,
+    //EVENT_LIGHTHOUSE_CONTEST_HORDE        = 18038,
+    EVENT_LIGHTHOUSE_PROGRESS_ALLIANCE      = 18039,
+    EVENT_LIGHTHOUSE_PROGRESS_HORDE         = 18040,
+    EVENT_LIGHTHOUSE_NEUTRAL_ALLIANCE       = 18041,
+    EVENT_LIGHTHOUSE_NEUTRAL_HORDE          = 18042,
+};
+
+class OutdoorPvPGH : public OutdoorPvP
+{
+    public:
+        OutdoorPvPGH(uint32 id);
+
+        bool HandleEvent(uint32 eventId, GameObject* go) override;
+
+        void HandleCreatureCreate(Creature* creature) override;
+        void HandleCreatureDeath(Creature* creature) override;
+        void HandleGameObjectCreate(GameObject* go) override;
+
+    private:
+        // despawn team vendors, if not killed already
+        void DespawnVendors(const WorldObject* objRef);
+
+        void LockLighthouse(const WorldObject* objRef);
+        void UnlockLighthouse(const WorldObject* objRef);
+
+        Team m_zoneOwner;
+
+        GuidList m_teamVendors;
+
+        ObjectGuid m_capturePoint;
+};
+
+#endif
diff --git a/src/game/OutdoorPvP/OutdoorPvPHP.cpp b/src/game/OutdoorPvP/OutdoorPvPHP.cpp
new file mode 100644
index 00000000000..93aec10671c
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPHP.cpp
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "OutdoorPvPHP.h"
+#include "WorldPacket.h"
+#include "../World.h"
+#include "../Object.h"
+#include "../Creature.h"
+#include "../GameObject.h"
+#include "../Player.h"
+
+OutdoorPvPHP::OutdoorPvPHP(uint32 id) : OutdoorPvP(id),
+    m_towersAlliance(0),
+    m_towersHorde(0)
+{
+    m_towerWorldState[0] = WORLD_STATE_HP_OVERLOOK_NEUTRAL;
+    m_towerWorldState[1] = WORLD_STATE_HP_STADIUM_NEUTRAL;
+    m_towerWorldState[2] = WORLD_STATE_HP_BROKEN_HILL_NEUTRAL;
+
+    for (uint8 i = 0; i < MAX_HP_TOWERS; ++i)
+        m_towerOwner[i] = TEAM_NONE;
+
+    uint32 zoneId = sOutdoorPvPMgr.GetZoneOfAffectedScript(this);
+    FillInitialWorldStates(zoneId);
+}
+
+void OutdoorPvPHP::FillInitialWorldStates(uint32 zoneId)
+{
+    FillInitialWorldState(zoneId, WORLD_STATE_HP_TOWER_COUNT_ALLIANCE, m_towersAlliance);
+    FillInitialWorldState(zoneId, WORLD_STATE_HP_TOWER_COUNT_HORDE, m_towersHorde);
+}
+
+void OutdoorPvPHP::SendRemoveWorldStates(Player* player)
+{
+    player->SendUpdateWorldState(WORLD_STATE_HP_TOWER_DISPLAY_A, WORLD_STATE_REMOVE);
+    player->SendUpdateWorldState(WORLD_STATE_HP_TOWER_DISPLAY_H, WORLD_STATE_REMOVE);
+
+    for (uint8 i = 0; i < MAX_HP_TOWERS; ++i)
+        player->SendUpdateWorldState(m_towerWorldState[i], WORLD_STATE_REMOVE);
+}
+
+void OutdoorPvPHP::HandlePlayerEnterZone(Player* player, bool isMainZone)
+{
+    OutdoorPvP::HandlePlayerEnterZone(player, isMainZone);
+
+    // remove the buff from the player first; Sometimes on relog players still have the aura
+    player->RemoveAurasDueToSpell(player->GetTeam() == ALLIANCE ? SPELL_HELLFIRE_SUPERIORITY_ALLIANCE : SPELL_HELLFIRE_SUPERIORITY_HORDE);
+
+    // buff the player if same team is controlling all capture points
+    if (m_towersAlliance == MAX_HP_TOWERS && player->GetTeam() == ALLIANCE)
+        player->CastSpell(player, SPELL_HELLFIRE_SUPERIORITY_ALLIANCE, true);
+    else if (m_towersHorde == MAX_HP_TOWERS && player->GetTeam() == HORDE)
+        player->CastSpell(player, SPELL_HELLFIRE_SUPERIORITY_HORDE, true);
+}
+
+void OutdoorPvPHP::HandlePlayerLeaveZone(Player* player, bool isMainZone)
+{
+    // remove the buff from the player
+    player->RemoveAurasDueToSpell(player->GetTeam() == ALLIANCE ? SPELL_HELLFIRE_SUPERIORITY_ALLIANCE : SPELL_HELLFIRE_SUPERIORITY_HORDE);
+
+    OutdoorPvP::HandlePlayerLeaveZone(player, isMainZone);
+}
+
+void OutdoorPvPHP::HandleGameObjectCreate(GameObject* go)
+{
+    switch (go->GetEntry())
+    {
+        case GO_TOWER_BANNER_OVERLOOK:
+            m_banners[0] = go->GetObjectGuid();
+            go->SetGoArtKit(GetBannerArtKit(m_towerOwner[0], GO_ARTKIT_OVERLOOK_ALLIANCE, GO_ARTKIT_OVERLOOK_HORDE, GO_ARTKIT_OVERLOOK_NEUTRAL));
+            break;
+        case GO_TOWER_BANNER_STADIUM:
+            m_banners[1] = go->GetObjectGuid();
+            go->SetGoArtKit(GetBannerArtKit(m_towerOwner[1], GO_ARTKIT_STADIUM_ALLIANCE, GO_ARTKIT_STADIUM_HORDE, GO_ARTKIT_STADIUM_NEUTRAL));
+            break;
+        case GO_TOWER_BANNER_BROKEN_HILL:
+            m_banners[2] = go->GetObjectGuid();
+            go->SetGoArtKit(GetBannerArtKit(m_towerOwner[2], GO_ARTKIT_BROKEN_HILL_ALLIANCE, GO_ARTKIT_BROKEN_HILL_HORDE, GO_ARTKIT_BROKEN_HILL_NEUTRAL));
+            break;
+        case GO_HELLFIRE_BANNER_OVERLOOK:
+            m_towers[0] = go->GetObjectGuid();
+            m_towerOwner[0] = go->GetTeam();
+            go->SetGoArtKit(GetBannerArtKit(m_towerOwner[0]));
+            break;
+        case GO_HELLFIRE_BANNER_STADIUM:
+            m_towers[1] = go->GetObjectGuid();
+            m_towerOwner[1] = go->GetTeam();
+            go->SetGoArtKit(GetBannerArtKit(m_towerOwner[1]));
+            break;
+        case GO_HELLFIRE_BANNER_BROKEN_HILL:
+            m_towers[2] = go->GetObjectGuid();
+            m_towerOwner[2] = go->GetTeam();
+            go->SetGoArtKit(GetBannerArtKit(m_towerOwner[2]));
+            break;
+    }
+}
+
+void OutdoorPvPHP::HandleObjectiveComplete(uint32 eventId, std::list<Player*> players, Team team)
+{
+    uint32 credit = 0;
+
+    switch (eventId)
+    {
+        case EVENT_OVERLOOK_PROGRESS_ALLIANCE:
+        case EVENT_OVERLOOK_PROGRESS_HORDE:
+            credit = NPC_CAPTURE_CREDIT_OVERLOOK;
+            break;
+        case EVENT_STADIUM_PROGRESS_ALLIANCE:
+        case EVENT_STADIUM_PROGRESS_HORDE:
+            credit = NPC_CAPTURE_CREDIT_STADIUM;
+            break;
+        case EVENT_BROKEN_HILL_PROGRESS_ALLIANCE:
+        case EVENT_BROKEN_HILL_PROGRESS_HORDE:
+            credit = NPC_CAPTURE_CREDIT_BROKEN_HILL;
+            break;
+        default:
+            return;
+    }
+
+    for (std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr)
+    {
+        if ((*itr) && (*itr)->GetTeam() == team)
+        {
+            (*itr)->KilledMonsterCredit(credit);
+            (*itr)->RewardHonor(NULL, 1, HONOR_REWARD_HELLFIRE);
+        }
+    }
+}
+
+// Cast player spell on opponent kill
+void OutdoorPvPHP::HandlePlayerKillInsideArea(Player* player)
+{
+    for (uint8 i = 0; i < MAX_HP_TOWERS; ++i)
+    {
+        if (GameObject* capturePoint = player->GetMap()->GetGameObject(m_towers[i]))
+        {
+            // check capture point range
+            GameObjectInfo const* info = capturePoint->GetGOInfo();
+            if (info && player->IsWithinDistInMap(capturePoint, info->capturePoint.radius))
+            {
+                // check capture point team
+                if (player->GetTeam() == m_towerOwner[i])
+                    player->CastSpell(player, player->GetTeam() == ALLIANCE ? SPELL_HELLFIRE_TOWER_TOKEN_ALLIANCE : SPELL_HELLFIRE_TOWER_TOKEN_HORDE, true);
+
+                return;
+            }
+        }
+    }
+}
+
+// process the capture events
+bool OutdoorPvPHP::HandleEvent(uint32 eventId, GameObject* go)
+{
+    for (uint8 i = 0; i < MAX_HP_TOWERS; ++i)
+    {
+        if (hellfireBanners[i] == go->GetEntry())
+        {
+            for (uint8 j = 0; j < 4; ++j)
+            {
+                if (hellfireTowerEvents[i][j].eventEntry == eventId)
+                {
+                    // prevent processing if the owner did not change (happens if progress event is called after contest event)
+                    if (hellfireTowerEvents[i][j].team != m_towerOwner[i])
+                    {
+                        if (hellfireTowerEvents[i][j].defenseMessage)
+                            sWorld.SendDefenseMessage(ZONE_ID_HELLFIRE_PENINSULA, hellfireTowerEvents[i][j].defenseMessage);
+
+                        return ProcessCaptureEvent(go, i, hellfireTowerEvents[i][j].team, hellfireTowerEvents[i][j].worldState, hellfireTowerEvents[i][j].towerArtKit, hellfireTowerEvents[i][j].towerAnim);
+                    }
+                    // no need to iterate other events or towers
+                    return false;
+                }
+            }
+            // no need to iterate other towers
+            return false;
+        }
+    }
+
+    return false;
+}
+
+bool OutdoorPvPHP::ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team, uint32 newWorldState, uint32 towerArtKit, uint32 towerAnim)
+{
+    // set artkits and process buffs
+    if (team == ALLIANCE)
+    {
+        SetBannerVisual(go, CAPTURE_ARTKIT_ALLIANCE, CAPTURE_ANIM_ALLIANCE);
+
+        // update counter state
+        ++m_towersAlliance;
+        SendUpdateWorldState(WORLD_STATE_HP_TOWER_COUNT_ALLIANCE, m_towersAlliance);
+
+        if (m_towersAlliance == MAX_HP_TOWERS)
+            BuffTeam(ALLIANCE, SPELL_HELLFIRE_SUPERIORITY_ALLIANCE);
+    }
+    else if (team == HORDE)
+    {
+        SetBannerVisual(go, CAPTURE_ARTKIT_HORDE, CAPTURE_ANIM_HORDE);
+
+        // update counter
+        ++m_towersHorde;
+        SendUpdateWorldState(WORLD_STATE_HP_TOWER_COUNT_HORDE, m_towersHorde);
+
+        if (m_towersHorde == MAX_HP_TOWERS)
+            BuffTeam(HORDE, SPELL_HELLFIRE_SUPERIORITY_HORDE);
+    }
+    else
+    {
+        SetBannerVisual(go, CAPTURE_ARTKIT_NEUTRAL, CAPTURE_ANIM_NEUTRAL);
+
+        if (m_towerOwner[towerId] == ALLIANCE)
+        {
+            if (m_towersAlliance == MAX_HP_TOWERS)
+                BuffTeam(ALLIANCE, SPELL_HELLFIRE_SUPERIORITY_ALLIANCE, true);
+
+            // update counter
+            --m_towersAlliance;
+            SendUpdateWorldState(WORLD_STATE_HP_TOWER_COUNT_ALLIANCE, m_towersAlliance);
+        }
+        else
+        {
+            if (m_towersHorde == MAX_HP_TOWERS)
+                BuffTeam(HORDE, SPELL_HELLFIRE_SUPERIORITY_HORDE, true);
+
+            // update counter
+            --m_towersHorde;
+            SendUpdateWorldState(WORLD_STATE_HP_TOWER_COUNT_HORDE, m_towersHorde);
+        }
+    }
+
+    SetBannerVisual(go, m_banners[towerId], towerArtKit, towerAnim);
+
+    // update tower state
+    SendUpdateWorldState(m_towerWorldState[towerId], WORLD_STATE_REMOVE);
+    m_towerWorldState[towerId] = newWorldState;
+    SendUpdateWorldState(m_towerWorldState[towerId], WORLD_STATE_ADD);
+
+    // update capture point owner
+    m_towerOwner[towerId] = team;
+
+    // the are no DB exceptions in this case
+    return true;
+}
diff --git a/src/game/OutdoorPvP/OutdoorPvPHP.h b/src/game/OutdoorPvP/OutdoorPvPHP.h
new file mode 100644
index 00000000000..16edba2f57d
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPHP.h
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef WORLD_PVP_HP
+#define WORLD_PVP_HP
+
+#include "Common.h"
+#include "OutdoorPvP.h"
+#include "../Language.h"
+
+enum
+{
+    MAX_HP_TOWERS                           = 3,
+
+    // spells
+    SPELL_HELLFIRE_TOWER_TOKEN_ALLIANCE     = 32155,
+    SPELL_HELLFIRE_TOWER_TOKEN_HORDE        = 32158,
+    SPELL_HELLFIRE_SUPERIORITY_ALLIANCE     = 32071,
+    SPELL_HELLFIRE_SUPERIORITY_HORDE        = 32049,
+
+    // npcs
+    NPC_CAPTURE_CREDIT_OVERLOOK             = 19028,
+    NPC_CAPTURE_CREDIT_STADIUM              = 19029,
+    NPC_CAPTURE_CREDIT_BROKEN_HILL          = 19032,
+
+    // misc
+    HONOR_REWARD_HELLFIRE                   = 18,
+
+    // gameobjects
+    GO_TOWER_BANNER_OVERLOOK                = 182525,
+    GO_TOWER_BANNER_STADIUM                 = 183515,
+    GO_TOWER_BANNER_BROKEN_HILL             = 183514,
+
+    // capture points
+    GO_HELLFIRE_BANNER_OVERLOOK             = 182174,
+    GO_HELLFIRE_BANNER_STADIUM              = 182173,
+    GO_HELLFIRE_BANNER_BROKEN_HILL          = 182175,
+
+    // events
+    //EVENT_OVERLOOK_WIN_ALLIANCE           = 11398,
+    //EVENT_OVERLOOK_WIN_HORDE              = 11397,
+    //EVENT_OVERLOOK_CONTEST_ALLIANCE       = 11392,
+    //EVENT_OVERLOOK_CONTEST_HORDE          = 11391,
+    EVENT_OVERLOOK_PROGRESS_ALLIANCE        = 11396,
+    EVENT_OVERLOOK_PROGRESS_HORDE           = 11395,
+    EVENT_OVERLOOK_NEUTRAL_ALLIANCE         = 11394,
+    EVENT_OVERLOOK_NEUTRAL_HORDE            = 11393,
+
+    //EVENT_STADIUM_WIN_ALLIANCE            = 11390,
+    //EVENT_STADIUM_WIN_HORDE               = 11389,
+    //EVENT_STADIUM_CONTEST_ALLIANCE        = 11384,
+    //EVENT_STADIUM_CONTEST_HORDE           = 11383,
+    EVENT_STADIUM_PROGRESS_ALLIANCE         = 11388,
+    EVENT_STADIUM_PROGRESS_HORDE            = 11387,
+    EVENT_STADIUM_NEUTRAL_ALLIANCE          = 11386,
+    EVENT_STADIUM_NEUTRAL_HORDE             = 11385,
+
+    //EVENT_BROKEN_HILL_WIN_ALLIANCE        = 11406,
+    //EVENT_BROKEN_HILL_WIN_HORDE           = 11405,
+    //EVENT_BROKEN_HILL_CONTEST_ALLIANCE    = 11400,
+    //EVENT_BROKEN_HILL_CONTEST_HORDE       = 11399,
+    EVENT_BROKEN_HILL_PROGRESS_ALLIANCE     = 11404,
+    EVENT_BROKEN_HILL_PROGRESS_HORDE        = 11403,
+    EVENT_BROKEN_HILL_NEUTRAL_ALLIANCE      = 11402,
+    EVENT_BROKEN_HILL_NEUTRAL_HORDE         = 11401,
+
+    // tower artkits
+    GO_ARTKIT_BROKEN_HILL_ALLIANCE          = 65,
+    GO_ARTKIT_BROKEN_HILL_HORDE             = 64,
+    GO_ARTKIT_BROKEN_HILL_NEUTRAL           = 66,
+
+    GO_ARTKIT_OVERLOOK_ALLIANCE             = 62,
+    GO_ARTKIT_OVERLOOK_HORDE                = 61,
+    GO_ARTKIT_OVERLOOK_NEUTRAL              = 63,
+
+    GO_ARTKIT_STADIUM_ALLIANCE              = 67,
+    GO_ARTKIT_STADIUM_HORDE                 = 68,
+    GO_ARTKIT_STADIUM_NEUTRAL               = 69,
+
+    // world states
+    WORLD_STATE_HP_TOWER_DISPLAY_A          = 2490,
+    WORLD_STATE_HP_TOWER_DISPLAY_H          = 2489,
+    WORLD_STATE_HP_TOWER_COUNT_ALLIANCE     = 2476,
+    WORLD_STATE_HP_TOWER_COUNT_HORDE        = 2478,
+
+    WORLD_STATE_HP_BROKEN_HILL_ALLIANCE     = 2483,
+    WORLD_STATE_HP_BROKEN_HILL_HORDE        = 2484,
+    WORLD_STATE_HP_BROKEN_HILL_NEUTRAL      = 2485,
+
+    WORLD_STATE_HP_OVERLOOK_ALLIANCE        = 2480,
+    WORLD_STATE_HP_OVERLOOK_HORDE           = 2481,
+    WORLD_STATE_HP_OVERLOOK_NEUTRAL         = 2482,
+
+    WORLD_STATE_HP_STADIUM_ALLIANCE         = 2471,
+    WORLD_STATE_HP_STADIUM_HORDE            = 2470,
+    WORLD_STATE_HP_STADIUM_NEUTRAL          = 2472
+};
+
+struct HellfireTowerEvent
+{
+    uint32  eventEntry;
+    Team    team;
+    uint32  defenseMessage;
+    uint32  worldState;
+    uint32  towerArtKit;
+    uint32  towerAnim;
+};
+
+static const HellfireTowerEvent hellfireTowerEvents[MAX_HP_TOWERS][4] =
+{
+    {
+        {EVENT_OVERLOOK_PROGRESS_ALLIANCE,      ALLIANCE,   LANG_OPVP_HP_CAPTURE_OVERLOOK_A,    WORLD_STATE_HP_OVERLOOK_ALLIANCE,       GO_ARTKIT_OVERLOOK_ALLIANCE,    CAPTURE_ANIM_ALLIANCE},
+        {EVENT_OVERLOOK_PROGRESS_HORDE,         HORDE,      LANG_OPVP_HP_CAPTURE_OVERLOOK_H,    WORLD_STATE_HP_OVERLOOK_HORDE,          GO_ARTKIT_OVERLOOK_HORDE,       CAPTURE_ANIM_HORDE},
+        {EVENT_OVERLOOK_NEUTRAL_HORDE,          TEAM_NONE,  0,                                  WORLD_STATE_HP_OVERLOOK_NEUTRAL,        GO_ARTKIT_OVERLOOK_NEUTRAL,     CAPTURE_ANIM_NEUTRAL},
+        {EVENT_OVERLOOK_NEUTRAL_ALLIANCE,       TEAM_NONE,  0,                                  WORLD_STATE_HP_OVERLOOK_NEUTRAL,        GO_ARTKIT_OVERLOOK_NEUTRAL,     CAPTURE_ANIM_NEUTRAL},
+    },
+    {
+        {EVENT_STADIUM_PROGRESS_ALLIANCE,       ALLIANCE,   LANG_OPVP_HP_CAPTURE_STADIUM_A,     WORLD_STATE_HP_STADIUM_ALLIANCE,        GO_ARTKIT_STADIUM_ALLIANCE,     CAPTURE_ANIM_ALLIANCE},
+        {EVENT_STADIUM_PROGRESS_HORDE,          HORDE,      LANG_OPVP_HP_CAPTURE_STADIUM_H,     WORLD_STATE_HP_STADIUM_HORDE,           GO_ARTKIT_STADIUM_HORDE,        CAPTURE_ANIM_HORDE},
+        {EVENT_STADIUM_NEUTRAL_HORDE,           TEAM_NONE,  0,                                  WORLD_STATE_HP_STADIUM_NEUTRAL,         GO_ARTKIT_STADIUM_NEUTRAL,      CAPTURE_ANIM_NEUTRAL},
+        {EVENT_STADIUM_NEUTRAL_ALLIANCE,        TEAM_NONE,  0,                                  WORLD_STATE_HP_STADIUM_NEUTRAL,         GO_ARTKIT_STADIUM_NEUTRAL,      CAPTURE_ANIM_NEUTRAL},
+    },
+    {
+        {EVENT_BROKEN_HILL_PROGRESS_ALLIANCE,   ALLIANCE,   LANG_OPVP_HP_CAPTURE_BROKENHILL_A,  WORLD_STATE_HP_BROKEN_HILL_ALLIANCE,    GO_ARTKIT_BROKEN_HILL_ALLIANCE, CAPTURE_ANIM_ALLIANCE},
+        {EVENT_BROKEN_HILL_PROGRESS_HORDE,      HORDE,      LANG_OPVP_HP_CAPTURE_BROKENHILL_H,  WORLD_STATE_HP_BROKEN_HILL_HORDE,       GO_ARTKIT_BROKEN_HILL_HORDE,    CAPTURE_ANIM_HORDE},
+        {EVENT_BROKEN_HILL_NEUTRAL_HORDE,       TEAM_NONE,  0,                                  WORLD_STATE_HP_BROKEN_HILL_NEUTRAL,     GO_ARTKIT_BROKEN_HILL_NEUTRAL,  CAPTURE_ANIM_NEUTRAL},
+        {EVENT_BROKEN_HILL_NEUTRAL_ALLIANCE,    TEAM_NONE,  0,                                  WORLD_STATE_HP_BROKEN_HILL_NEUTRAL,     GO_ARTKIT_BROKEN_HILL_NEUTRAL,  CAPTURE_ANIM_NEUTRAL},
+    },
+};
+
+static const uint32 hellfireBanners[MAX_HP_TOWERS] = {GO_HELLFIRE_BANNER_OVERLOOK, GO_HELLFIRE_BANNER_STADIUM, GO_HELLFIRE_BANNER_BROKEN_HILL};
+
+class OutdoorPvPHP : public OutdoorPvP
+{
+    public:
+        OutdoorPvPHP(uint32 id);
+
+        void HandlePlayerEnterZone(Player* player, bool isMainZone) override;
+        void HandlePlayerLeaveZone(Player* player, bool isMainZone) override;
+        void FillInitialWorldStates(uint32 zoneId) override;
+        void SendRemoveWorldStates(Player* player) override;
+
+        bool HandleEvent(uint32 eventId, GameObject* go) override;
+        void HandleObjectiveComplete(uint32 eventId, std::list<Player*> players, Team team) override;
+
+        void HandleGameObjectCreate(GameObject* go) override;
+        void HandlePlayerKillInsideArea(Player* player) override;
+
+    private:
+        // process capture events
+        bool ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team, uint32 newWorldState, uint32 towerArtKit, uint32 towerAnim);
+
+        Team m_towerOwner[MAX_HP_TOWERS];
+        uint32 m_towerWorldState[MAX_HP_TOWERS];
+        uint32 m_towersAlliance;
+        uint32 m_towersHorde;
+
+        ObjectGuid m_towers[MAX_HP_TOWERS];
+        ObjectGuid m_banners[MAX_HP_TOWERS];
+};
+
+#endif
diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp
new file mode 100644
index 00000000000..fb74d5a1ebf
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -0,0 +1,264 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "OutdoorPvPMgr.h"
+#include "Policies/Singleton.h"
+#include "OutdoorPvP.h"
+#include "../GameObject.h"
+#include "../World.h"
+#include "Log.h"
+#include "OutdoorPvPEP.h"
+#include "OutdoorPvPGH.h"
+#include "OutdoorPvPHP.h"
+#include "OutdoorPvPNA.h"
+#include "OutdoorPvPSI.h"
+#include "OutdoorPvPTF.h"
+#include "OutdoorPvPZM.h"
+#include "BattleField/BattleField.h"
+
+INSTANTIATE_SINGLETON_1(OutdoorPvPMgr);
+
+OutdoorPvPMgr::OutdoorPvPMgr()
+{
+    m_updateTimer.SetInterval(sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE));
+    // warning - unsafe place. 
+    memset(&m_scripts, 0, sizeof(m_scripts));
+}
+
+OutdoorPvPMgr::~OutdoorPvPMgr()
+{
+    for (uint8 i = 0; i < MAX_OPVP_ID; ++i)
+        delete m_scripts[i];
+}
+
+#define LOAD_OPVP_ZONE(a)                                           \
+    if (sWorld.getConfig(CONFIG_BOOL_OUTDOORPVP_##a##_ENABLED))     \
+    {                                                               \
+        m_scripts[OPVP_ID_##a] = new OutdoorPvP##a(OPVP_ID_##a);    \
+        if (!m_scripts[OPVP_ID_##a]->InitOutdoorPvPArea())          \
+        {                                                           \
+            delete m_scripts[OPVP_ID_##a];                          \
+            m_scripts[OPVP_ID_##a] = NULL;                          \
+        }                                                           \
+        else                                                        \
+            ++counter;                                              \
+    }
+
+#define LOAD_BATTLEFIELD(a)                                         \
+    if (sWorld.getConfig(CONFIG_BOOL_BATTLEFIELD_##a##_ENABLED))    \
+    {                                                               \
+        m_scripts[OPVP_ID_##a] = new BattleField##a(OPVP_ID_##a);   \
+        if (!m_scripts[OPVP_ID_##a]->InitOutdoorPvPArea())          \
+        {                                                           \
+            delete m_scripts[OPVP_ID_##a];                          \
+            m_scripts[OPVP_ID_##a] = NULL;                          \
+        }                                                           \
+        else                                                        \
+            ++counter;                                              \
+    }
+/**
+   Function which loads all outdoor pvp scripts
+ */
+void OutdoorPvPMgr::InitOutdoorPvP()
+{
+    uint8 counter = 0;
+
+    LOAD_OPVP_ZONE(SI);
+    LOAD_OPVP_ZONE(EP);
+    LOAD_OPVP_ZONE(HP);
+    LOAD_OPVP_ZONE(ZM);
+    LOAD_OPVP_ZONE(TF);
+    LOAD_OPVP_ZONE(NA);
+    LOAD_OPVP_ZONE(GH);
+
+// currently disabled, be enabled after finish development phase
+//    LOAD_OPVP_ZONE(WG);
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u Outdoor PvP zones", counter);
+}
+
+OutdoorPvP* OutdoorPvPMgr::GetScript(uint32 zoneId)
+{
+    switch (zoneId)
+    {
+        case ZONE_ID_SILITHUS:
+            return m_scripts[OPVP_ID_SI];
+        case ZONE_ID_EASTERN_PLAGUELANDS:
+            return m_scripts[OPVP_ID_EP];
+        case ZONE_ID_HELLFIRE_PENINSULA:
+            return m_scripts[OPVP_ID_HP];
+        case ZONE_ID_ZANGARMARSH:
+            return m_scripts[OPVP_ID_ZM];
+        case ZONE_ID_TEROKKAR_FOREST:
+            return m_scripts[OPVP_ID_TF];
+        case ZONE_ID_NAGRAND:
+            return m_scripts[OPVP_ID_NA];
+        case ZONE_ID_GRIZZLY_HILLS:
+            return m_scripts[OPVP_ID_GH];
+        case ZONE_ID_WINTERGRASP:
+            return m_scripts[OPVP_ID_WG];
+        default:
+            return NULL;
+    }
+}
+
+OutdoorPvP* OutdoorPvPMgr::GetScriptOfAffectedZone(uint32 zoneId)
+{
+    switch (zoneId)
+    {
+        case ZONE_ID_TEMPLE_OF_AQ:
+        case ZONE_ID_RUINS_OF_AQ:
+        case ZONE_ID_GATES_OF_AQ:
+            return m_scripts[OPVP_ID_SI];
+        case ZONE_ID_STRATHOLME:
+        case ZONE_ID_SCHOLOMANCE:
+            return m_scripts[OPVP_ID_EP];
+        case ZONE_ID_HELLFIRE_RAMPARTS:
+        case ZONE_ID_HELLFIRE_CITADEL:
+        case ZONE_ID_BLOOD_FURNACE:
+        case ZONE_ID_SHATTERED_HALLS:
+        case ZONE_ID_MAGTHERIDON_LAIR:
+            return m_scripts[OPVP_ID_HP];
+        case ZONE_ID_SERPENTSHRINE_CAVERN:
+        case ZONE_ID_STREAMVAULT:
+        case ZONE_ID_UNDERBOG:
+        case ZONE_ID_SLAVE_PENS:
+            return m_scripts[OPVP_ID_ZM];
+        case ZONE_ID_SHADOW_LABYRINTH:
+        case ZONE_ID_AUCHENAI_CRYPTS:
+        case ZONE_ID_SETHEKK_HALLS:
+        case ZONE_ID_MANA_TOMBS:
+            return m_scripts[OPVP_ID_TF];
+        case ZONE_ID_WINTERGRASP:
+            return m_scripts[OPVP_ID_WG];
+        default:
+            return NULL;
+    }
+}
+
+/**
+   Function that handles the players which enters a specific zone
+
+   @param   player to be handled in the event
+   @param   zone id used for the current outdoor pvp script
+ */
+void OutdoorPvPMgr::HandlePlayerEnterZone(Player* player, uint32 zoneId)
+{
+    if (OutdoorPvP* script = GetScript(zoneId))
+        script->HandlePlayerEnterZone(player, true);
+    else if (OutdoorPvP* script = GetScriptOfAffectedZone(zoneId))
+        script->HandlePlayerEnterZone(player, false);
+}
+
+/**
+   Function that handles the player who leaves a specific zone
+
+   @param   player to be handled in the event
+   @param   zone id used for the current outdoor pvp script
+ */
+void OutdoorPvPMgr::HandlePlayerLeaveZone(Player* player, uint32 zoneId)
+{
+    // teleport: called once from Player::CleanupsBeforeDelete, once from Player::UpdateZone
+    if (OutdoorPvP* script = GetScript(zoneId))
+        script->HandlePlayerLeaveZone(player, true);
+    else if (OutdoorPvP* script = GetScriptOfAffectedZone(zoneId))
+        script->HandlePlayerLeaveZone(player, false);
+}
+
+void OutdoorPvPMgr::Update(uint32 diff)
+{
+    m_updateTimer.Update(diff);
+    if (!m_updateTimer.Passed())
+        return;
+
+    for (uint8 i = 0; i < MAX_OPVP_ID; ++i)
+        if (m_scripts[i])
+            m_scripts[i]->Update(m_updateTimer.GetCurrent());
+
+    m_updateTimer.SetCurrent(0);
+}
+
+/**
+   Function that gets the capture point slider value
+
+   @param   capture point entry
+*/
+int8 OutdoorPvPMgr::GetCapturePointSliderValue(uint32 entry)
+{
+    std::map<uint32, int8>::iterator itr = m_capturePointSlider.find(entry);
+
+    if (itr != m_capturePointSlider.end())
+        return itr->second;
+
+    // return default value if we can't find any
+    return CAPTURE_SLIDER_NEUTRAL;
+}
+
+uint32 OutdoorPvPMgr::GetZoneOfAffectedScript(OutdoorPvP const* script) const
+{
+    uint8 scriptId = MAX_OPVP_ID;
+
+    for (uint8 i = 0; i < MAX_OPVP_ID; ++i)
+    {
+        if (m_scripts[i] == script)
+        {
+            scriptId = i;
+            break;
+        }
+    }
+
+    switch (scriptId)
+    {
+        case OPVP_ID_SI:
+            return ZONE_ID_SILITHUS;
+        case OPVP_ID_EP:
+            return ZONE_ID_EASTERN_PLAGUELANDS;
+        case OPVP_ID_HP:
+            return ZONE_ID_HELLFIRE_PENINSULA;
+        case OPVP_ID_ZM:
+            return ZONE_ID_ZANGARMARSH;
+        case OPVP_ID_TF:
+            return ZONE_ID_TEROKKAR_FOREST;
+        case OPVP_ID_NA:
+            return ZONE_ID_NAGRAND;
+        case OPVP_ID_GH:
+            return ZONE_ID_GRIZZLY_HILLS;
+        case OPVP_ID_WG:
+            return ZONE_ID_WINTERGRASP;
+
+        case MAX_OPVP_ID:
+        default:
+            return ZONE_ID_ERROR;
+    }
+}
+
+BattleField* OutdoorPvPMgr::GetBattlefieldByGuid(ObjectGuid guid)
+{
+    return GetBattlefieldById(guid.GetCounter() & 0xFFFF);
+}
+
+BattleField* OutdoorPvPMgr::GetBattlefieldById(uint32 id)
+{
+    for (uint8 i = 0; i < MAX_OPVP_ID; ++i)
+        if (OutdoorPvP* opvp = m_scripts[i])
+            if (opvp->IsBattleField() && ((BattleField*)opvp)->GetBattlefieldId() == id)
+                return (BattleField*)opvp;
+
+    return NULL;
+}
diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.h b/src/game/OutdoorPvP/OutdoorPvPMgr.h
new file mode 100644
index 00000000000..7410e602a49
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPMgr.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef WORLD_PVP_MGR_H
+#define WORLD_PVP_MGR_H
+
+#include "Common.h"
+#include "Policies/Singleton.h"
+#include "Timer.h"
+
+enum OutdoorPvPTypes
+{
+    OPVP_ID_SI = 0,
+    OPVP_ID_EP,
+    OPVP_ID_HP,
+    OPVP_ID_ZM,
+    OPVP_ID_TF,
+    OPVP_ID_NA,
+    OPVP_ID_GH,
+    OPVP_ID_WG,
+
+    MAX_OPVP_ID
+};
+
+enum BattlefieldTypes
+{
+    BATTLEFIELD_WG = 1,
+    BATTLEFIELD_TB = 21,
+};
+
+enum OutdoorPvPZones
+{
+    ZONE_ID_SILITHUS                = 1377,
+    ZONE_ID_TEMPLE_OF_AQ            = 3428,
+    ZONE_ID_RUINS_OF_AQ             = 3429,
+    ZONE_ID_GATES_OF_AQ             = 3478,
+
+    ZONE_ID_EASTERN_PLAGUELANDS     = 139,
+    ZONE_ID_STRATHOLME              = 2017,
+    ZONE_ID_SCHOLOMANCE             = 2057,
+
+    ZONE_ID_HELLFIRE_PENINSULA      = 3483,
+    ZONE_ID_HELLFIRE_RAMPARTS       = 3562,
+    ZONE_ID_HELLFIRE_CITADEL        = 3563,
+    ZONE_ID_BLOOD_FURNACE           = 3713,
+    ZONE_ID_SHATTERED_HALLS         = 3714,
+    ZONE_ID_MAGTHERIDON_LAIR        = 3836,
+
+    ZONE_ID_ZANGARMARSH             = 3521,
+    ZONE_ID_SERPENTSHRINE_CAVERN    = 3607,
+    ZONE_ID_STREAMVAULT             = 3715,
+    ZONE_ID_UNDERBOG                = 3716,
+    ZONE_ID_SLAVE_PENS              = 3717,
+
+    ZONE_ID_TEROKKAR_FOREST         = 3519,
+    ZONE_ID_SHADOW_LABYRINTH        = 3789,
+    ZONE_ID_AUCHENAI_CRYPTS         = 3790,
+    ZONE_ID_SETHEKK_HALLS           = 3791,
+    ZONE_ID_MANA_TOMBS              = 3792,
+
+    ZONE_ID_NAGRAND                 = 3518,
+
+    ZONE_ID_GRIZZLY_HILLS           = 394,
+
+    ZONE_ID_WINTERGRASP             = 4197,
+
+    ZONE_ID_ERROR                   = 0,
+};
+
+class BattleField;
+class Player;
+class GameObject;
+class Creature;
+class OutdoorPvP;
+class ObjectGuid;
+
+class MANGOS_DLL_SPEC OutdoorPvPMgr
+{
+    public:
+        OutdoorPvPMgr();
+        ~OutdoorPvPMgr();
+
+        // load all outdoor pvp scripts
+        void InitOutdoorPvP();
+
+        // called when a player enters an outdoor pvp area
+        void HandlePlayerEnterZone(Player* player, uint32 zoneId);
+
+        // called when player leaves an outdoor pvp area
+        void HandlePlayerLeaveZone(Player* player, uint32 zoneId);
+
+        // return assigned outdoor pvp script
+        OutdoorPvP* GetScript(uint32 zoneId);
+
+        void Update(uint32 diff);
+
+        // Handle capture point stuff
+        // fully wrong and not needed, see Get/SetLinkedWorldState() FIXME - rewrite need
+        int8 GetCapturePointSliderValue(uint32 entry);
+        void SetCapturePointSlider(uint32 entry, int8 value) { m_capturePointSlider[entry] = value; }
+
+        uint32 GetZoneOfAffectedScript(OutdoorPvP const* script) const;
+
+        BattleField* GetBattlefieldByGuid(ObjectGuid guid);
+        BattleField* GetBattlefieldById(uint32 id);
+
+    private:
+        // return assigned outdoor pvp script
+        OutdoorPvP* GetScriptOfAffectedZone(uint32 zoneId);
+
+        // contains all outdoor pvp scripts
+        OutdoorPvP* m_scripts[MAX_OPVP_ID];
+
+        std::map<uint32 /*capture point entry*/, int8 /*slider value*/> m_capturePointSlider;
+
+        // update interval
+        ShortIntervalTimer m_updateTimer;
+};
+
+#define sOutdoorPvPMgr MaNGOS::Singleton<OutdoorPvPMgr>::Instance()
+
+#endif
diff --git a/src/game/OutdoorPvP/OutdoorPvPNA.cpp b/src/game/OutdoorPvP/OutdoorPvPNA.cpp
new file mode 100644
index 00000000000..45f6462f076
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPNA.cpp
@@ -0,0 +1,558 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "OutdoorPvPNA.h"
+#include "WorldPacket.h"
+#include "../World.h"
+#include "../ObjectMgr.h"
+#include "../Object.h"
+#include "../Creature.h"
+#include "../GameObject.h"
+#include "../Player.h"
+
+OutdoorPvPNA::OutdoorPvPNA(uint32 id) : OutdoorPvP(id),
+    m_zoneOwner(TEAM_NONE),
+    m_soldiersRespawnTimer(0),
+    m_zoneWorldState(0),
+    m_zoneMapState(WORLD_STATE_NA_HALAA_NEUTRAL),
+    m_guardsLeft(0),
+    m_isUnderSiege(false)
+{
+    // initially set graveyard owner to neither faction
+    sObjectMgr.SetGraveYardLinkTeam(GRAVEYARD_ID_HALAA, GRAVEYARD_ZONE_ID_HALAA, TEAM_INVALID);
+
+    uint32 zoneId = sOutdoorPvPMgr.GetZoneOfAffectedScript(this);
+    FillInitialWorldStates(zoneId);
+}
+
+void OutdoorPvPNA::FillInitialWorldStates(uint32 zoneId)
+{
+    if (m_zoneOwner != TEAM_NONE)
+    {
+        FillInitialWorldState(zoneId, m_zoneWorldState, WORLD_STATE_ADD);
+
+        // map states
+        for (uint8 i = 0; i < MAX_NA_ROOSTS; ++i)
+            FillInitialWorldState(zoneId, m_roostWorldState[i], WORLD_STATE_ADD);
+    }
+
+    FillInitialWorldState(zoneId, m_zoneMapState, WORLD_STATE_ADD);
+    FillInitialWorldState(zoneId, WORLD_STATE_NA_GUARDS_MAX, MAX_NA_GUARDS);
+    FillInitialWorldState(zoneId, WORLD_STATE_NA_GUARDS_LEFT, m_guardsLeft);
+}
+
+void OutdoorPvPNA::SendRemoveWorldStates(Player* player)
+{
+}
+
+void OutdoorPvPNA::HandlePlayerEnterZone(Player* player, bool isMainZone)
+{
+    OutdoorPvP::HandlePlayerEnterZone(player, isMainZone);
+
+    // remove the buff from the player first because there are some issues at relog
+    player->RemoveAurasDueToSpell(SPELL_STRENGTH_HALAANI);
+
+    // buff the player if same team is controlling the zone
+    if (player->GetTeam() == m_zoneOwner)
+        player->CastSpell(player, SPELL_STRENGTH_HALAANI, true);
+}
+
+void OutdoorPvPNA::HandlePlayerLeaveZone(Player* player, bool isMainZone)
+{
+    // remove the buff from the player
+    player->RemoveAurasDueToSpell(SPELL_STRENGTH_HALAANI);
+
+    OutdoorPvP::HandlePlayerLeaveZone(player, isMainZone);
+}
+
+void OutdoorPvPNA::HandleObjectiveComplete(uint32 eventId, std::list<Player*> players, Team team)
+{
+    if (eventId == EVENT_HALAA_BANNER_WIN_ALLIANCE || eventId == EVENT_HALAA_BANNER_WIN_HORDE)
+    {
+        for (std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr)
+        {
+            if ((*itr) && (*itr)->GetTeam() == team)
+                (*itr)->KilledMonsterCredit(NPC_HALAA_COMBATANT);
+        }
+    }
+}
+
+// Cast player spell on opponent kill
+void OutdoorPvPNA::HandlePlayerKillInsideArea(Player* player)
+{
+    if (GameObject* capturePoint = player->GetMap()->GetGameObject(m_capturePoint))
+    {
+        // check capture point range
+        GameObjectInfo const* info = capturePoint->GetGOInfo();
+        if (info && player->IsWithinDistInMap(capturePoint, info->capturePoint.radius))
+        {
+            // check capture point team
+            if (player->GetTeam() == m_zoneOwner)
+                player->CastSpell(player, player->GetTeam() == ALLIANCE ? SPELL_NAGRAND_TOKEN_ALLIANCE : SPELL_NAGRAND_TOKEN_HORDE, true);
+
+            return;
+        }
+    }
+}
+
+void OutdoorPvPNA::HandleCreatureCreate(Creature* creature)
+{
+    switch (creature->GetEntry())
+    {
+        case NPC_RESEARCHER_KARTOS:
+        case NPC_QUARTERMASTER_DAVIAN:
+        case NPC_MERCHANT_ALDRAAN:
+        case NPC_VENDOR_CENDRII:
+        case NPC_AMMUNITIONER_BANRO:
+        case NPC_RESEARCHER_AMERELDINE:
+        case NPC_QUARTERMASTER_NORELIQE:
+        case NPC_MERCHANT_COREIEL:
+        case NPC_VENDOR_EMBELAR:
+        case NPC_AMMUNITIONER_TASALDAN:
+            m_teamVendors.push_back(creature->GetObjectGuid());
+            break;
+        case NPC_HORDE_HALAANI_GUARD:
+        case NPC_ALLIANCE_HANAANI_GUARD:
+            // prevent updating guard counter on owner take over
+            if (m_guardsLeft == MAX_NA_GUARDS)
+                return;
+
+            if (m_guardsLeft == 0)
+            {
+                LockHalaa(creature);
+
+                // update world state
+                SendUpdateWorldState(m_zoneMapState, WORLD_STATE_REMOVE);
+                m_zoneMapState = m_zoneOwner == ALLIANCE ? WORLD_STATE_NA_HALAA_ALLIANCE : WORLD_STATE_NA_HALAA_HORDE;
+                SendUpdateWorldState(m_zoneMapState, WORLD_STATE_ADD);
+            }
+
+            ++m_guardsLeft;
+            SendUpdateWorldState(WORLD_STATE_NA_GUARDS_LEFT, m_guardsLeft);
+            break;
+    }
+}
+
+void OutdoorPvPNA::HandleCreatureDeath(Creature* creature)
+{
+    if (creature->GetEntry() != NPC_HORDE_HALAANI_GUARD && creature->GetEntry() != NPC_ALLIANCE_HANAANI_GUARD)
+        return;
+
+    // get the location of the dead guard for future respawn
+    float x, y, z, o;
+    creature->GetRespawnCoord(x, y, z, &o);
+    HalaaSoldiersSpawns location = {x, y, z, o};
+    m_deadSoldiers.push(location);
+
+    // set the respawn timer after the last guard died - 5 min for the first time, or 1 hour if the city is under siege
+    if (!m_soldiersRespawnTimer)
+        m_soldiersRespawnTimer = m_isUnderSiege ? HOUR * IN_MILLISECONDS : 5 * MINUTE * IN_MILLISECONDS;
+
+    // decrease the counter
+    --m_guardsLeft;
+    SendUpdateWorldState(WORLD_STATE_NA_GUARDS_LEFT, m_guardsLeft);
+
+    if (m_guardsLeft == 0)
+    {
+        // set the zone under siege and increase the respawn timer
+        m_isUnderSiege = true;
+        m_soldiersRespawnTimer = HOUR * IN_MILLISECONDS;
+
+        // make capturable
+        UnlockHalaa(creature);
+
+        // update world state
+        SendUpdateWorldState(m_zoneMapState, WORLD_STATE_REMOVE);
+        m_zoneMapState = m_zoneOwner == ALLIANCE ? WORLD_STATE_NA_HALAA_NEUTRAL_A : WORLD_STATE_NA_HALAA_NEUTRAL_H;
+        SendUpdateWorldState(m_zoneMapState, WORLD_STATE_ADD);
+
+        sWorld.SendDefenseMessage(ZONE_ID_NAGRAND, LANG_OPVP_NA_DEFENSELESS);
+    }
+}
+
+void OutdoorPvPNA::HandleGameObjectCreate(GameObject* go)
+{
+    switch (go->GetEntry())
+    {
+        case GO_HALAA_BANNER:
+            m_capturePoint = go->GetObjectGuid();
+            go->SetGoArtKit(GetBannerArtKit(m_zoneOwner));
+            break;
+
+        case GO_WYVERN_ROOST_ALLIANCE_SOUTH:
+            m_roostsAlliance[0] = go->GetObjectGuid();
+            break;
+        case GO_WYVERN_ROOST_ALLIANCE_NORTH:
+            m_roostsAlliance[1] = go->GetObjectGuid();
+            break;
+        case GO_WYVERN_ROOST_ALLIANCE_EAST:
+            m_roostsAlliance[2] = go->GetObjectGuid();
+            break;
+        case GO_WYVERN_ROOST_ALLIANCE_WEST:
+            m_roostsAlliance[3] = go->GetObjectGuid();
+            break;
+
+        case GO_BOMB_WAGON_HORDE_SOUTH:
+            m_wagonsHorde[0] = go->GetObjectGuid();
+            break;
+        case GO_BOMB_WAGON_HORDE_NORTH:
+            m_wagonsHorde[1] = go->GetObjectGuid();
+            break;
+        case GO_BOMB_WAGON_HORDE_EAST:
+            m_wagonsHorde[2] = go->GetObjectGuid();
+            break;
+        case GO_BOMB_WAGON_HORDE_WEST:
+            m_wagonsHorde[3] = go->GetObjectGuid();
+            break;
+
+        case GO_DESTROYED_ROOST_ALLIANCE_SOUTH:
+            m_roostsBrokenAlliance[0] = go->GetObjectGuid();
+            break;
+        case GO_DESTROYED_ROOST_ALLIANCE_NORTH:
+            m_roostsBrokenAlliance[1] = go->GetObjectGuid();
+            break;
+        case GO_DESTROYED_ROOST_ALLIANCE_EAST:
+            m_roostsBrokenAlliance[2] = go->GetObjectGuid();
+            break;
+        case GO_DESTROYED_ROOST_ALLIANCE_WEST:
+            m_roostsBrokenAlliance[3] = go->GetObjectGuid();
+            break;
+
+        case GO_WYVERN_ROOST_HORDE_SOUTH:
+            m_roostsHorde[0] = go->GetObjectGuid();
+            break;
+        case GO_WYVERN_ROOST_HORDE_NORTH:
+            m_roostsHorde[1] = go->GetObjectGuid();
+            break;
+        case GO_WYVERN_ROOST_HORDE_EAST:
+            m_roostsHorde[2] = go->GetObjectGuid();
+            break;
+        case GO_WYVERN_ROOST_HORDE_WEST:
+            m_roostsHorde[3] = go->GetObjectGuid();
+            break;
+
+        case GO_BOMB_WAGON_ALLIANCE_SOUTH:
+            m_wagonsAlliance[0] = go->GetObjectGuid();
+            break;
+        case GO_BOMB_WAGON_ALLIANCE_NORTH:
+            m_wagonsAlliance[1] = go->GetObjectGuid();
+            break;
+        case GO_BOMB_WAGON_ALLIANCE_EAST:
+            m_wagonsAlliance[2] = go->GetObjectGuid();
+            break;
+        case GO_BOMB_WAGON_ALLIANCE_WEST:
+            m_wagonsAlliance[3] = go->GetObjectGuid();
+            break;
+
+        case GO_DESTROYED_ROOST_HORDE_SOUTH:
+            m_roostsBrokenHorde[0] = go->GetObjectGuid();
+            break;
+        case GO_DESTROYED_ROOST_HORDE_NORTH:
+            m_roostsBrokenHorde[1] = go->GetObjectGuid();
+            break;
+        case GO_DESTROYED_ROOST_HORDE_EAST:
+            m_roostsBrokenHorde[2] = go->GetObjectGuid();
+            break;
+        case GO_DESTROYED_ROOST_HORDE_WEST:
+            m_roostsBrokenHorde[3] = go->GetObjectGuid();
+            break;
+    }
+}
+
+void OutdoorPvPNA::UpdateWorldState(uint32 value)
+{
+    SendUpdateWorldState(m_zoneWorldState, value);
+    SendUpdateWorldState(m_zoneMapState, value);
+
+    UpdateWyvernsWorldState(value);
+}
+
+void OutdoorPvPNA::UpdateWyvernsWorldState(uint32 value)
+{
+    for (uint8 i = 0; i < MAX_NA_ROOSTS; ++i)
+        SendUpdateWorldState(m_roostWorldState[i], value);
+}
+
+// process the capture events
+bool OutdoorPvPNA::HandleEvent(uint32 eventId, GameObject* go)
+{
+    // If we are not using the Halaa banner return
+    if (go->GetEntry() != GO_HALAA_BANNER)
+        return false;
+
+    bool eventHandled = true;
+
+    switch (eventId)
+    {
+        case EVENT_HALAA_BANNER_WIN_ALLIANCE:
+            ProcessCaptureEvent(go, ALLIANCE);
+            eventHandled = false;
+            break;
+        case EVENT_HALAA_BANNER_WIN_HORDE:
+            ProcessCaptureEvent(go, HORDE);
+            eventHandled = false;
+            break;
+        case EVENT_HALAA_BANNER_PROGRESS_ALLIANCE:
+            SetBannerVisual(go, CAPTURE_ARTKIT_ALLIANCE, CAPTURE_ANIM_ALLIANCE);
+            sWorld.SendDefenseMessage(ZONE_ID_NAGRAND, LANG_OPVP_NA_PROGRESS_A);
+            break;
+        case EVENT_HALAA_BANNER_PROGRESS_HORDE:
+            SetBannerVisual(go, CAPTURE_ARTKIT_HORDE, CAPTURE_ANIM_HORDE);
+            sWorld.SendDefenseMessage(ZONE_ID_NAGRAND, LANG_OPVP_NA_PROGRESS_H);
+            break;
+    }
+
+    // there are some events which required further DB script
+    return eventHandled;
+}
+
+void OutdoorPvPNA::ProcessCaptureEvent(GameObject* go, Team team)
+{
+    BuffTeam(m_zoneOwner, SPELL_STRENGTH_HALAANI, true);
+
+    // update capture point owner
+    m_zoneOwner = team;
+
+    LockHalaa(go);
+    m_guardsLeft = MAX_NA_GUARDS;
+
+    m_isUnderSiege = false;
+    m_soldiersRespawnTimer = 0;
+
+    UpdateWorldState(WORLD_STATE_REMOVE);
+    DespawnVendors(go);
+    sObjectMgr.SetGraveYardLinkTeam(GRAVEYARD_ID_HALAA, GRAVEYARD_ZONE_ID_HALAA, m_zoneOwner);
+
+    if (m_zoneOwner == ALLIANCE)
+    {
+        m_zoneWorldState = WORLD_STATE_NA_GUARDS_ALLIANCE;
+        m_zoneMapState = WORLD_STATE_NA_HALAA_ALLIANCE;
+    }
+    else
+    {
+        m_zoneWorldState = WORLD_STATE_NA_GUARDS_HORDE;
+        m_zoneMapState = WORLD_STATE_NA_HALAA_HORDE;
+    }
+
+    HandleFactionObjects(go);
+    UpdateWorldState(WORLD_STATE_ADD);
+
+    SendUpdateWorldState(WORLD_STATE_NA_GUARDS_LEFT, m_guardsLeft);
+
+    BuffTeam(m_zoneOwner, SPELL_STRENGTH_HALAANI);
+    sWorld.SendDefenseMessage(ZONE_ID_NAGRAND, m_zoneOwner == ALLIANCE ? LANG_OPVP_NA_CAPTURE_A: LANG_OPVP_NA_CAPTURE_H);
+}
+
+// Handle the gameobjects spawn/despawn depending on the controller faction
+void OutdoorPvPNA::HandleFactionObjects(const WorldObject* objRef)
+{
+    if (m_zoneOwner == ALLIANCE)
+    {
+        for (uint8 i = 0; i < MAX_NA_ROOSTS; ++i)
+        {
+            RespawnGO(objRef, m_wagonsHorde[i], false);
+            RespawnGO(objRef, m_roostsBrokenAlliance[i], false);
+            RespawnGO(objRef, m_roostsAlliance[i], false);
+            RespawnGO(objRef, m_wagonsAlliance[i], false);
+            RespawnGO(objRef, m_roostsBrokenHorde[i], true);
+
+            m_roostWorldState[i] = nagrandRoostStatesHordeNeutral[i];
+        }
+    }
+    else
+    {
+        for (uint8 i = 0; i < MAX_NA_ROOSTS; ++i)
+        {
+            RespawnGO(objRef, m_wagonsAlliance[i], false);
+            RespawnGO(objRef, m_roostsBrokenHorde[i], false);
+            RespawnGO(objRef, m_roostsHorde[i], false);
+            RespawnGO(objRef, m_wagonsHorde[i], false);
+            RespawnGO(objRef, m_roostsBrokenAlliance[i], true);
+
+            m_roostWorldState[i] = nagrandRoostStatesAllianceNeutral[i];
+        }
+    }
+}
+
+// Handle vendors despawn when the city is captured by the other faction
+void OutdoorPvPNA::DespawnVendors(const WorldObject* objRef)
+{
+    // despawn all team vendors
+    for (GuidList::const_iterator itr = m_teamVendors.begin(); itr != m_teamVendors.end(); ++itr)
+    {
+        if (Creature* soldier = objRef->GetMap()->GetCreature(*itr))
+            soldier->ForcedDespawn();
+    }
+    m_teamVendors.clear();
+}
+
+bool OutdoorPvPNA::HandleGameObjectUse(Player* player, GameObject* go)
+{
+    if (player->GetTeam() == ALLIANCE)
+    {
+        for (uint8 i = 0; i < MAX_NA_ROOSTS; ++i)
+        {
+            if (go->GetEntry() == nagrandWagonsAlliance[i])
+            {
+                // update roost states
+                UpdateWyvernsWorldState(WORLD_STATE_REMOVE);
+                m_roostWorldState[i] = nagrandRoostStatesHordeNeutral[i];
+                UpdateWyvernsWorldState(WORLD_STATE_ADD);
+
+                // spawn the broken roost and despawn the other one
+                RespawnGO(go, m_roostsHorde[i], false);
+                RespawnGO(go, m_roostsBrokenHorde[i], true);
+
+                // no need to iterate the other roosts
+                return false;
+            }
+            else if (go->GetEntry() == nagrandRoostsBrokenAlliance[i])
+            {
+                // update roost states
+                UpdateWyvernsWorldState(WORLD_STATE_REMOVE);
+                m_roostWorldState[i] = nagrandRoostStatesAlliance[i];
+                UpdateWyvernsWorldState(WORLD_STATE_ADD);
+
+                // spawn the repaired one along with the explosive wagon - the broken one despawns by self
+                RespawnGO(go, m_wagonsHorde[i], true);
+                RespawnGO(go, m_roostsAlliance[i], true);
+
+                // no need to iterate the other roosts
+                return false;
+            }
+            else if (go->GetEntry() == nagrandRoostsAlliance[i])
+            {
+                // mark player as pvp
+                player->UpdatePvP(true, true);
+                player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
+
+                // prevent despawning after go use
+                go->SetRespawnTime(0);
+
+                // no need to iterate the other roosts
+                return false;
+            }
+        }
+    }
+    else if (player->GetTeam() == HORDE)
+    {
+        for (uint8 i = 0; i < MAX_NA_ROOSTS; ++i)
+        {
+            if (go->GetEntry() == nagrandWagonsHorde[i])
+            {
+                // update roost states
+                UpdateWyvernsWorldState(WORLD_STATE_REMOVE);
+                m_roostWorldState[i] = nagrandRoostStatesAllianceNeutral[i];
+                UpdateWyvernsWorldState(WORLD_STATE_ADD);
+
+                // spawn the broken roost and despawn the other one
+                RespawnGO(go, m_roostsAlliance[i], false);
+                RespawnGO(go, m_roostsBrokenAlliance[i], true);
+
+                // no need to iterate the other roosts
+                return false;
+            }
+            else if (go->GetEntry() == nagrandRoostsBrokenHorde[i])
+            {
+                // update roost states
+                UpdateWyvernsWorldState(WORLD_STATE_REMOVE);
+                m_roostWorldState[i] = nagrandRoostStatesHorde[i];
+                UpdateWyvernsWorldState(WORLD_STATE_ADD);
+
+                // spawn the repaired one along with the explosive wagon - the broken one despawns by self
+                RespawnGO(go, m_wagonsAlliance[i], true);
+                RespawnGO(go, m_roostsHorde[i], true);
+
+                // no need to iterate the other roosts
+                return false;
+            }
+            else if (go->GetEntry() == nagrandRoostsHorde[i])
+            {
+                // mark player as pvp
+                player->UpdatePvP(true, true);
+                player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
+
+                // prevent despawning after go use
+                go->SetRespawnTime(0);
+
+                // no need to iterate the other roosts
+                return false;
+            }
+        }
+    }
+
+    return false;
+}
+
+void OutdoorPvPNA::Update(uint32 diff)
+{
+    if (m_soldiersRespawnTimer)
+    {
+        if (m_soldiersRespawnTimer < diff)
+        {
+            RespawnSoldier();
+
+            // if all the guards are respawned, stop the timer, else resume the timer depending on the siege state
+            if (m_guardsLeft == MAX_NA_GUARDS)
+                m_soldiersRespawnTimer = 0;
+            else
+                m_soldiersRespawnTimer = m_isUnderSiege ? HOUR * IN_MILLISECONDS : 5 * MINUTE * IN_MILLISECONDS;
+        }
+        else
+            m_soldiersRespawnTimer -= diff;
+    }
+}
+
+// Handle soldiers respawn on timer - this will summon a replacement for the dead soldier
+void OutdoorPvPNA::RespawnSoldier()
+{
+    for (GuidZoneMap::iterator itr = m_zonePlayers.begin(); itr != m_zonePlayers.end(); ++itr)
+    {
+        // Find player who is in main zone (Nagrand) to get correct map reference
+        if (!itr->second)
+            continue;
+
+        if (Player* player = sObjectMgr.GetPlayer(itr->first))
+        {
+            // summon a soldier replacement in the order they were set in the deque. delete the element after summon
+            player->SummonCreature(m_zoneOwner == ALLIANCE ? NPC_ALLIANCE_HANAANI_GUARD : NPC_HORDE_HALAANI_GUARD, m_deadSoldiers.front().x, m_deadSoldiers.front().y, m_deadSoldiers.front().z, m_deadSoldiers.front().o, TEMPSUMMON_DEAD_DESPAWN, 0, true);
+            m_deadSoldiers.pop();
+            break;
+        }
+    }
+}
+
+// Lock Halaa when captured
+void OutdoorPvPNA::LockHalaa(const WorldObject* objRef)
+{
+    if (GameObject* go = objRef->GetMap()->GetGameObject(m_capturePoint))
+        go->SetLootState(GO_JUST_DEACTIVATED);
+
+    sOutdoorPvPMgr.SetCapturePointSlider(m_capturePoint, m_zoneOwner == ALLIANCE ? CAPTURE_SLIDER_ALLIANCE_LOCKED : CAPTURE_SLIDER_HORDE_LOCKED);
+}
+
+// Unlock Halaa when all the soldiers are killed
+void OutdoorPvPNA::UnlockHalaa(const WorldObject* objRef)
+{
+    if (GameObject* go = objRef->GetMap()->GetGameObject(m_capturePoint))
+        go->SetCapturePointSlider(m_zoneOwner == ALLIANCE ? CAPTURE_SLIDER_ALLIANCE : CAPTURE_SLIDER_HORDE);
+        // no banner visual update needed because it already has the correct one
+    else
+        // if grid is unloaded, resetting the slider value is enough
+        sOutdoorPvPMgr.SetCapturePointSlider(m_capturePoint, m_zoneOwner == ALLIANCE ? CAPTURE_SLIDER_ALLIANCE : CAPTURE_SLIDER_HORDE);
+}
diff --git a/src/game/OutdoorPvP/OutdoorPvPNA.h b/src/game/OutdoorPvP/OutdoorPvPNA.h
new file mode 100644
index 00000000000..1adf615c294
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPNA.h
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef WORLD_PVP_NA
+#define WORLD_PVP_NA
+
+#include "Common.h"
+#include "OutdoorPvP.h"
+#include "../Language.h"
+
+enum
+{
+    MAX_NA_GUARDS                           = 15,
+    MAX_NA_ROOSTS                           = 4,                // roosts for each type and team
+    MAX_FIRE_BOMBS                          = 10,
+
+    // spells
+    SPELL_STRENGTH_HALAANI                  = 33795,
+    SPELL_NAGRAND_TOKEN_ALLIANCE            = 33005,
+    SPELL_NAGRAND_TOKEN_HORDE               = 33004,
+
+    // npcs
+    // quest credit
+    NPC_HALAA_COMBATANT                     = 24867,
+
+    GRAVEYARD_ID_HALAA                      = 993,
+    GRAVEYARD_ZONE_ID_HALAA                 = 3518,
+
+    ITEM_ID_FIRE_BOMB                       = 24538,
+
+    // gameobjects
+    GO_HALAA_BANNER                         = 182210,
+
+    // spawned when horde is in control - alliance is attacking
+    GO_WYVERN_ROOST_ALLIANCE_SOUTH          = 182267,
+    GO_WYVERN_ROOST_ALLIANCE_WEST           = 182280,
+    GO_WYVERN_ROOST_ALLIANCE_NORTH          = 182281,
+    GO_WYVERN_ROOST_ALLIANCE_EAST           = 182282,
+
+    GO_BOMB_WAGON_HORDE_SOUTH               = 182222,
+    GO_BOMB_WAGON_HORDE_WEST                = 182272,
+    GO_BOMB_WAGON_HORDE_NORTH               = 182273,
+    GO_BOMB_WAGON_HORDE_EAST                = 182274,
+
+    GO_DESTROYED_ROOST_ALLIANCE_SOUTH       = 182266,
+    GO_DESTROYED_ROOST_ALLIANCE_WEST        = 182275,
+    GO_DESTROYED_ROOST_ALLIANCE_NORTH       = 182276,
+    GO_DESTROYED_ROOST_ALLIANCE_EAST        = 182277,
+
+    // spawned when alliance is in control - horde is attacking
+    GO_WYVERN_ROOST_HORDE_SOUTH             = 182301,
+    GO_WYVERN_ROOST_HORDE_WEST              = 182302,
+    GO_WYVERN_ROOST_HORDE_NORTH             = 182303,
+    GO_WYVERN_ROOST_HORDE_EAST              = 182304,
+
+    GO_BOMB_WAGON_ALLIANCE_SOUTH            = 182305,
+    GO_BOMB_WAGON_ALLIANCE_WEST             = 182306,
+    GO_BOMB_WAGON_ALLIANCE_NORTH            = 182307,
+    GO_BOMB_WAGON_ALLIANCE_EAST             = 182308,
+
+    GO_DESTROYED_ROOST_HORDE_SOUTH          = 182297,
+    GO_DESTROYED_ROOST_HORDE_WEST           = 182298,
+    GO_DESTROYED_ROOST_HORDE_NORTH          = 182299,
+    GO_DESTROYED_ROOST_HORDE_EAST           = 182300,
+
+    // npcs
+    // alliance
+    NPC_RESEARCHER_KARTOS                   = 18817,
+    NPC_QUARTERMASTER_DAVIAN                = 18822,
+    NPC_MERCHANT_ALDRAAN                    = 21485,
+    NPC_VENDOR_CENDRII                      = 21487,
+    NPC_AMMUNITIONER_BANRO                  = 21488,
+    NPC_ALLIANCE_HANAANI_GUARD              = 18256,
+
+    // horde
+    NPC_RESEARCHER_AMERELDINE               = 18816,
+    NPC_QUARTERMASTER_NORELIQE              = 18821,
+    NPC_MERCHANT_COREIEL                    = 21474,
+    NPC_VENDOR_EMBELAR                      = 21484,
+    NPC_AMMUNITIONER_TASALDAN               = 21483,
+    NPC_HORDE_HALAANI_GUARD                 = 18192,
+
+    // events
+    EVENT_HALAA_BANNER_WIN_ALLIANCE         = 11504,
+    EVENT_HALAA_BANNER_WIN_HORDE            = 11503,
+    EVENT_HALAA_BANNER_CONTEST_ALLIANCE     = 11559,
+    EVENT_HALAA_BANNER_CONTEST_HORDE        = 11558,
+    EVENT_HALAA_BANNER_PROGRESS_ALLIANCE    = 11821,
+    EVENT_HALAA_BANNER_PROGRESS_HORDE       = 11822,
+
+    // world states
+    WORLD_STATE_NA_GUARDS_HORDE             = 2503,
+    WORLD_STATE_NA_GUARDS_ALLIANCE          = 2502,
+    WORLD_STATE_NA_GUARDS_MAX               = 2493,
+    WORLD_STATE_NA_GUARDS_LEFT              = 2491,
+
+    // map states
+    WORLD_STATE_NA_WYVERN_NORTH_NEUTRAL_H   = 2762,
+    WORLD_STATE_NA_WYVERN_NORTH_NEUTRAL_A   = 2662,
+    WORLD_STATE_NA_WYVERN_NORTH_H           = 2663,
+    WORLD_STATE_NA_WYVERN_NORTH_A           = 2664,
+
+    WORLD_STATE_NA_WYVERN_SOUTH_NEUTRAL_H   = 2760,
+    WORLD_STATE_NA_WYVERN_SOUTH_NEUTRAL_A   = 2670,
+    WORLD_STATE_NA_WYVERN_SOUTH_H           = 2668,
+    WORLD_STATE_NA_WYVERN_SOUTH_A           = 2669,
+
+    WORLD_STATE_NA_WYVERN_WEST_NEUTRAL_H    = 2761,
+    WORLD_STATE_NA_WYVERN_WEST_NEUTRAL_A    = 2667,
+    WORLD_STATE_NA_WYVERN_WEST_H            = 2665,
+    WORLD_STATE_NA_WYVERN_WEST_A            = 2666,
+
+    WORLD_STATE_NA_WYVERN_EAST_NEUTRAL_H    = 2763,
+    WORLD_STATE_NA_WYVERN_EAST_NEUTRAL_A    = 2659,
+    WORLD_STATE_NA_WYVERN_EAST_H            = 2660,
+    WORLD_STATE_NA_WYVERN_EAST_A            = 2661,
+
+    WORLD_STATE_NA_HALAA_NEUTRAL            = 2671,
+    WORLD_STATE_NA_HALAA_NEUTRAL_A          = 2676,
+    WORLD_STATE_NA_HALAA_NEUTRAL_H          = 2677,
+    WORLD_STATE_NA_HALAA_HORDE              = 2672,
+    WORLD_STATE_NA_HALAA_ALLIANCE           = 2673,
+};
+
+struct HalaaSoldiersSpawns
+{
+    float x, y, z, o;
+};
+
+static const uint32 nagrandRoostsAlliance[MAX_NA_ROOSTS]                = {GO_WYVERN_ROOST_ALLIANCE_SOUTH,          GO_WYVERN_ROOST_ALLIANCE_NORTH,         GO_WYVERN_ROOST_ALLIANCE_EAST,          GO_WYVERN_ROOST_ALLIANCE_WEST};
+static const uint32 nagrandRoostsHorde[MAX_NA_ROOSTS]                   = {GO_WYVERN_ROOST_HORDE_SOUTH,             GO_WYVERN_ROOST_HORDE_NORTH,            GO_WYVERN_ROOST_HORDE_EAST,             GO_WYVERN_ROOST_HORDE_WEST};
+static const uint32 nagrandRoostsBrokenAlliance[MAX_NA_ROOSTS]          = {GO_DESTROYED_ROOST_ALLIANCE_SOUTH,       GO_DESTROYED_ROOST_ALLIANCE_NORTH,      GO_DESTROYED_ROOST_ALLIANCE_EAST,       GO_DESTROYED_ROOST_ALLIANCE_WEST};
+static const uint32 nagrandRoostsBrokenHorde[MAX_NA_ROOSTS]             = {GO_DESTROYED_ROOST_HORDE_SOUTH,          GO_DESTROYED_ROOST_HORDE_NORTH,         GO_DESTROYED_ROOST_HORDE_EAST,          GO_DESTROYED_ROOST_HORDE_WEST};
+static const uint32 nagrandWagonsAlliance[MAX_NA_ROOSTS]                = {GO_BOMB_WAGON_ALLIANCE_SOUTH,            GO_BOMB_WAGON_ALLIANCE_NORTH,           GO_BOMB_WAGON_ALLIANCE_EAST,            GO_BOMB_WAGON_ALLIANCE_WEST};
+static const uint32 nagrandWagonsHorde[MAX_NA_ROOSTS]                   = {GO_BOMB_WAGON_HORDE_SOUTH,               GO_BOMB_WAGON_HORDE_NORTH,              GO_BOMB_WAGON_HORDE_EAST,               GO_BOMB_WAGON_HORDE_WEST};
+
+static const uint32 nagrandRoostStatesAlliance[MAX_NA_ROOSTS]           = {WORLD_STATE_NA_WYVERN_SOUTH_A,           WORLD_STATE_NA_WYVERN_NORTH_A,          WORLD_STATE_NA_WYVERN_EAST_A,           WORLD_STATE_NA_WYVERN_WEST_A};
+static const uint32 nagrandRoostStatesHorde[MAX_NA_ROOSTS]              = {WORLD_STATE_NA_WYVERN_SOUTH_H,           WORLD_STATE_NA_WYVERN_NORTH_H,          WORLD_STATE_NA_WYVERN_EAST_H,           WORLD_STATE_NA_WYVERN_WEST_H};
+static const uint32 nagrandRoostStatesAllianceNeutral[MAX_NA_ROOSTS]    = {WORLD_STATE_NA_WYVERN_SOUTH_NEUTRAL_A,   WORLD_STATE_NA_WYVERN_NORTH_NEUTRAL_A,  WORLD_STATE_NA_WYVERN_EAST_NEUTRAL_A,   WORLD_STATE_NA_WYVERN_WEST_NEUTRAL_A};
+static const uint32 nagrandRoostStatesHordeNeutral[MAX_NA_ROOSTS]       = {WORLD_STATE_NA_WYVERN_SOUTH_NEUTRAL_H,   WORLD_STATE_NA_WYVERN_NORTH_NEUTRAL_H,  WORLD_STATE_NA_WYVERN_EAST_NEUTRAL_H,   WORLD_STATE_NA_WYVERN_WEST_NEUTRAL_H};
+
+class OutdoorPvPNA : public OutdoorPvP
+{
+    public:
+        OutdoorPvPNA(uint32 id);
+
+        void HandlePlayerEnterZone(Player* player, bool isMainZone) override;
+        void HandlePlayerLeaveZone(Player* player, bool isMainZone) override;
+        void FillInitialWorldStates(uint32 zoneId) override;
+        void SendRemoveWorldStates(Player* player) override;
+
+        bool HandleEvent(uint32 eventId, GameObject* go) override;
+        void HandleObjectiveComplete(uint32 eventId, std::list<Player*> players, Team team) override;
+
+        void HandleCreatureCreate(Creature* creature) override;
+        void HandleGameObjectCreate(GameObject* go) override;
+        void HandleCreatureDeath(Creature* creature) override;
+
+        void HandlePlayerKillInsideArea(Player* player) override;
+        bool HandleGameObjectUse(Player* player, GameObject* go) override;
+        void Update(uint32 diff) override;
+
+    private:
+        // world states handling
+        void UpdateWorldState(uint32 value);
+        void UpdateWyvernsWorldState(uint32 value);
+
+        // process capture events
+        void ProcessCaptureEvent(GameObject* go, Team team);
+
+        // set specific team vendors and objects after capture
+        void DespawnVendors(const WorldObject* objRef);
+        void HandleFactionObjects(const WorldObject* objRef);
+
+        // handle a specific game objects
+        void LockHalaa(const WorldObject* objRef);
+        void UnlockHalaa(const WorldObject* objRef);
+
+        // handle soldier respawn on timer
+        void RespawnSoldier();
+
+        Team m_zoneOwner;
+        uint32 m_soldiersRespawnTimer;
+        uint32 m_zoneWorldState;
+        uint32 m_zoneMapState;
+        uint32 m_roostWorldState[MAX_NA_ROOSTS];
+        uint32 m_guardsLeft;
+
+        bool m_isUnderSiege;
+
+        ObjectGuid m_capturePoint;
+        ObjectGuid m_roostsAlliance[MAX_NA_ROOSTS];
+        ObjectGuid m_roostsHorde[MAX_NA_ROOSTS];
+        ObjectGuid m_roostsBrokenAlliance[MAX_NA_ROOSTS];
+        ObjectGuid m_roostsBrokenHorde[MAX_NA_ROOSTS];
+        ObjectGuid m_wagonsAlliance[MAX_NA_ROOSTS];
+        ObjectGuid m_wagonsHorde[MAX_NA_ROOSTS];
+
+        GuidList m_teamVendors;
+
+        std::queue<HalaaSoldiersSpawns> m_deadSoldiers;
+};
+
+#endif
diff --git a/src/game/OutdoorPvP/OutdoorPvPSI.cpp b/src/game/OutdoorPvP/OutdoorPvPSI.cpp
new file mode 100644
index 00000000000..f7330a86c6e
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPSI.cpp
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "OutdoorPvPSI.h"
+#include "WorldPacket.h"
+#include "../World.h"
+#include "../ObjectMgr.h"
+#include "../Object.h"
+#include "../Creature.h"
+#include "../GameObject.h"
+#include "../Player.h"
+
+OutdoorPvPSI::OutdoorPvPSI(uint32 id) : OutdoorPvP(id),
+    m_resourcesAlliance(0),
+    m_resourcesHorde(0),
+    m_zoneOwner(TEAM_NONE)
+{
+    uint32 zoneId = sOutdoorPvPMgr.GetZoneOfAffectedScript(this);
+    FillInitialWorldStates(zoneId);
+}
+
+// Send initial world states
+void OutdoorPvPSI::FillInitialWorldStates(uint32 zoneId)
+{
+    FillInitialWorldState(zoneId, WORLD_STATE_SI_GATHERED_A, m_resourcesAlliance);
+    FillInitialWorldState(zoneId, WORLD_STATE_SI_GATHERED_H, m_resourcesHorde);
+    // FillInitialWorldState(zoneId, WORLD_STATE_SI_SILITHYST_MAX, MAX_SILITHYST); -- check in DB
+}
+
+// Handle buffs when player enters the zone
+void OutdoorPvPSI::HandlePlayerEnterZone(Player* player, bool isMainZone)
+{
+    OutdoorPvP::HandlePlayerEnterZone(player, isMainZone);
+
+    // remove the buff from the player first; Sometimes on relog players still have the aura
+    player->RemoveAurasDueToSpell(SPELL_CENARION_FAVOR);
+
+    // buff the player if same team is controlling the zone
+    if (player->GetTeam() == m_zoneOwner)
+        player->CastSpell(player, SPELL_CENARION_FAVOR, true);
+}
+
+// Remove buffs when player leaves zone
+void OutdoorPvPSI::HandlePlayerLeaveZone(Player* player, bool isMainZone)
+{
+    // remove the buff from the player
+    player->RemoveAurasDueToSpell(SPELL_CENARION_FAVOR);
+
+    OutdoorPvP::HandlePlayerLeaveZone(player, isMainZone);
+}
+
+// Handle case when player returns a silithyst
+bool OutdoorPvPSI::HandleAreaTrigger(Player* player, uint32 triggerId)
+{
+    if (player->isGameMaster() || player->isDead())
+        return false;
+
+    switch (triggerId)
+    {
+        case AREATRIGGER_SILITHUS_ALLIANCE:
+            if (player->GetTeam() != ALLIANCE || !player->HasAura(SPELL_SILITHYST))
+                return false;
+
+            // update counter
+            ++ m_resourcesAlliance;
+            SendUpdateWorldState(WORLD_STATE_SI_GATHERED_A, m_resourcesAlliance);
+
+            // handle the case when the faction has reached maximum resources allowed
+            if (m_resourcesAlliance == MAX_SILITHYST)
+            {
+                // NOTE: On retail it would not reset until server restart but we do not support weekly restart :)
+                m_zoneOwner = ALLIANCE;
+                m_resourcesAlliance = 0;
+                m_resourcesHorde = 0;
+
+                // also update the horde counter if resources were reset
+                SendUpdateWorldState(WORLD_STATE_SI_GATHERED_H, m_resourcesHorde);
+
+                // apply buff to owner team
+                BuffTeam(ALLIANCE, SPELL_CENARION_FAVOR);
+
+                // Send defense message
+                sWorld.SendDefenseMessage(ZONE_ID_SILITHUS, LANG_OPVP_SI_CAPTURE_A);
+            }
+
+            // give quest credit if necessary
+            if (player->GetQuestStatus(QUEST_SCOURING_DESERT_ALLIANCE) == QUEST_STATUS_INCOMPLETE)
+                player->KilledMonsterCredit(NPC_SILITHUS_DUST_QUEST_ALLIANCE);
+            break;
+        case AREATRIGGER_SILITHUS_HORDE:
+            if (player->GetTeam() != HORDE || !player->HasAura(SPELL_SILITHYST))
+                return false;
+
+            // update counter
+            ++ m_resourcesHorde;
+            SendUpdateWorldState(WORLD_STATE_SI_GATHERED_H, m_resourcesHorde);
+
+            // handle the case when the faction has reached maximum resources allowed
+            if (m_resourcesHorde == MAX_SILITHYST)
+            {
+                // NOTE: On retail it would not reset until server restart but we do not support weekly restart :)
+                m_zoneOwner = HORDE;
+                m_resourcesAlliance = 0;
+                m_resourcesHorde = 0;
+
+                // also update the alliance counter if resources were reset
+                SendUpdateWorldState(WORLD_STATE_SI_GATHERED_A, m_resourcesAlliance);
+
+                // apply buff to owner team
+                BuffTeam(HORDE, SPELL_CENARION_FAVOR);
+
+                // Send defense message
+                sWorld.SendDefenseMessage(ZONE_ID_SILITHUS, LANG_OPVP_SI_CAPTURE_H);
+            }
+
+            // give quest credit if necessary
+            if (player->GetQuestStatus(QUEST_SCOURING_DESERT_HORDE) == QUEST_STATUS_INCOMPLETE)
+                player->KilledMonsterCredit(NPC_SILITHUS_DUST_QUEST_HORDE);
+            break;
+        default:
+            return false;
+    }
+
+    // remove silithyst aura
+    player->RemoveAurasDueToSpell(SPELL_SILITHYST);
+
+    // reward the player
+    player->CastSpell(player, SPELL_TRACES_OF_SILITHYST, true);
+    player->RewardHonor(NULL, 1, HONOR_REWARD_SILITHYST);
+    player->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(FACTION_CENARION_CIRCLE), REPUTATION_REWARD_SILITHYST);
+
+    return true;
+}
+
+// Handle case when player drops flag
+// TODO - fix this workaround!
+struct SilithusSpawnLocation
+{
+    float x, y, z;
+};
+// Area trigger location - workaround to check the flag drop handling
+static SilithusSpawnLocation silithusFlagDropLocations[2] =
+{
+    {-7142.04f, 1397.92f, 4.327f},      // alliance
+    {-7588.48f, 756.806f, -16.425f}     // horde
+};
+
+bool OutdoorPvPSI::HandleDropFlag(Player* player, uint32 spellId)
+{
+    if (spellId != SPELL_SILITHYST)
+        return false;
+
+    // don't drop flag at area trigger
+    // we are checking distance from the AT hard-coded coordinates because it's much faster than checking the area trigger store
+    switch (player->GetTeam())
+    {
+        case ALLIANCE:
+            if (player->IsWithinDist3d(silithusFlagDropLocations[0].x, silithusFlagDropLocations[0].y, silithusFlagDropLocations[0].z, 5.0f))
+                return false;
+            break;
+        case HORDE:
+            if (player->IsWithinDist3d(silithusFlagDropLocations[1].x, silithusFlagDropLocations[1].y, silithusFlagDropLocations[1].z, 5.0f))
+                return false;
+            break;
+        default:
+            break;
+    }
+
+    // drop the flag in other case
+    player->CastSpell(player, SPELL_SILITHYST_FLAG_DROP, true);
+    return true;
+}
+
+// Handle the case when player picks a silithyst mound or geyser
+// This needs to be done because the spells used by these objects are missing
+bool OutdoorPvPSI::HandleGameObjectUse(Player* player, GameObject* go)
+{
+    if (go->GetEntry() == GO_SILITHYST_MOUND || go->GetEntry() == GO_SILITHYST_GEYSER)
+    {
+        // Also mark player with pvp on
+        player->CastSpell(player, SPELL_SILITHYST, true);
+        player->UpdatePvP(true, true);
+        player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
+        // Despawn the gameobject (workaround)
+        go->SetLootState(GO_JUST_DEACTIVATED);
+        return true;
+    }
+
+    return false;
+}
diff --git a/src/game/OutdoorPvP/OutdoorPvPSI.h b/src/game/OutdoorPvP/OutdoorPvPSI.h
new file mode 100644
index 00000000000..9d9e35ebc15
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPSI.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef WORLD_PVP_SI
+#define WORLD_PVP_SI
+
+#include "Common.h"
+#include "OutdoorPvP.h"
+#include "../Language.h"
+
+enum
+{
+    // npcs
+    NPC_SILITHUS_DUST_QUEST_ALLIANCE    = 17090,        // dummy npcs for quest credit
+    NPC_SILITHUS_DUST_QUEST_HORDE       = 18199,
+
+    // game objects
+    GO_SILITHYST_MOUND                  = 181597,       // created when a player drops the flag
+    GO_SILITHYST_GEYSER                 = 181598,       // spawn on the map by default
+
+    // spells
+    //SPELL_SILITHYST_OBJECT            = 29518,        // unknown, related to the GO
+    SPELL_SILITHYST                     = 29519,        // buff received when you are carrying a silithyst
+    SPELL_TRACES_OF_SILITHYST           = 29534,        // individual buff received when successfully delivered a silithyst
+    SPELL_CENARION_FAVOR                = 30754,        // zone buff received when a team gathers 200 silithyst
+    SPELL_SILITHYST_FLAG_DROP           = 29533,        // drop the flag
+
+    // quests
+    QUEST_SCOURING_DESERT_ALLIANCE      = 9419,
+    QUEST_SCOURING_DESERT_HORDE         = 9422,
+
+    // area triggers
+    AREATRIGGER_SILITHUS_ALLIANCE       = 4162,
+    AREATRIGGER_SILITHUS_HORDE          = 4168,
+
+    // misc
+    FACTION_CENARION_CIRCLE             = 609,
+    HONOR_REWARD_SILITHYST              = 19,
+    REPUTATION_REWARD_SILITHYST         = 20,
+    MAX_SILITHYST                       = 200,
+
+    // world states
+    WORLD_STATE_SI_GATHERED_A           = 2313,
+    WORLD_STATE_SI_GATHERED_H           = 2314,
+    WORLD_STATE_SI_SILITHYST_MAX        = 2317
+};
+
+class OutdoorPvPSI : public OutdoorPvP
+{
+    public:
+        OutdoorPvPSI(uint32 id);
+
+        void HandlePlayerEnterZone(Player* player, bool isMainZone) override;
+        void HandlePlayerLeaveZone(Player* player, bool isMainZone) override;
+        void FillInitialWorldStates(uint32 zoneId) override;
+
+        bool HandleAreaTrigger(Player* player, uint32 triggerId) override;
+        bool HandleGameObjectUse(Player* player, GameObject* go) override;
+        bool HandleDropFlag(Player* player, uint32 spellId) override;
+
+    private:
+        uint32 m_resourcesAlliance;
+        uint32 m_resourcesHorde;
+        Team m_zoneOwner;
+};
+
+#endif
diff --git a/src/game/OutdoorPvP/OutdoorPvPTF.cpp b/src/game/OutdoorPvP/OutdoorPvPTF.cpp
new file mode 100644
index 00000000000..fd48748bca0
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPTF.cpp
@@ -0,0 +1,367 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "OutdoorPvPTF.h"
+#include "WorldPacket.h"
+#include "../World.h"
+#include "../ObjectMgr.h"
+#include "../Object.h"
+#include "../Creature.h"
+#include "../GameObject.h"
+#include "../Player.h"
+
+OutdoorPvPTF::OutdoorPvPTF(uint32 id) : OutdoorPvP(id),
+    m_zoneWorldState(WORLD_STATE_TF_TOWERS_CONTROLLED),
+    m_zoneOwner(TEAM_NONE),
+    //m_zoneUpdateTimer(TIMER_TF_UPDATE_TIME),
+    m_zoneLockTimer(0),
+    m_towersAlliance(0),
+    m_towersHorde(0)
+{
+    m_towerWorldState[0] = WORLD_STATE_TF_WEST_TOWER_NEUTRAL;
+    m_towerWorldState[1] = WORLD_STATE_TF_NORTH_TOWER_NEUTRAL;
+    m_towerWorldState[2] = WORLD_STATE_TF_EAST_TOWER_NEUTRAL;
+    m_towerWorldState[3] = WORLD_STATE_TF_SOUTH_EAST_TOWER_NEUTRAL;
+    m_towerWorldState[4] = WORLD_STATE_TF_SOUTH_TOWER_NEUTRAL;
+
+    for (uint8 i = 0; i < MAX_TF_TOWERS; ++i)
+        m_towerOwner[i] = TEAM_NONE;
+
+    uint32 zoneId = sOutdoorPvPMgr.GetZoneOfAffectedScript(this);
+    FillInitialWorldStates(zoneId);
+}
+
+void OutdoorPvPTF::FillInitialWorldStates(uint32 zoneId)
+{
+    if (m_zoneWorldState == WORLD_STATE_TF_TOWERS_CONTROLLED)
+    {
+        FillInitialWorldState(zoneId, WORLD_STATE_TF_TOWER_COUNT_H, m_towersHorde);
+        FillInitialWorldState(zoneId, WORLD_STATE_TF_TOWER_COUNT_A, m_towersAlliance);
+    }
+    else
+        UpdateTimerWorldState();
+}
+
+void OutdoorPvPTF::SendRemoveWorldStates(Player* player)
+{
+}
+
+void OutdoorPvPTF::HandlePlayerEnterZone(Player* player, bool isMainZone)
+{
+    OutdoorPvP::HandlePlayerEnterZone(player, isMainZone);
+
+    // remove the buff from the player first because there are some issues at relog
+    player->RemoveAurasDueToSpell(SPELL_AUCHINDOUN_BLESSING);
+
+    // Handle the buffs
+    if (player->GetTeam() == m_zoneOwner)
+        player->CastSpell(player, SPELL_AUCHINDOUN_BLESSING, true);
+}
+
+void OutdoorPvPTF::HandlePlayerLeaveZone(Player* player, bool isMainZone)
+{
+    // remove the buff from the player
+    player->RemoveAurasDueToSpell(SPELL_AUCHINDOUN_BLESSING);
+
+    OutdoorPvP::HandlePlayerLeaveZone(player, isMainZone);
+}
+
+void OutdoorPvPTF::HandleGameObjectCreate(GameObject* go)
+{
+    switch (go->GetEntry())
+    {
+        case GO_TOWER_BANNER_WEST:
+            m_towerBanners[0] = go->GetObjectGuid();
+            m_towerOwner[0] = go->GetTeam();
+            go->SetGoArtKit(GetBannerArtKit(m_towerOwner[0]));
+            break;
+        case GO_TOWER_BANNER_NORTH:
+            m_towerBanners[1] = go->GetObjectGuid();
+            m_towerOwner[1] = go->GetTeam();
+            go->SetGoArtKit(GetBannerArtKit(m_towerOwner[1]));
+            break;
+        case GO_TOWER_BANNER_EAST:
+            m_towerBanners[2] = go->GetObjectGuid();
+            m_towerOwner[2] = go->GetTeam();
+            go->SetGoArtKit(GetBannerArtKit(m_towerOwner[2]));
+            break;
+        case GO_TOWER_BANNER_SOUTH_EAST:
+            m_towerBanners[3] = go->GetObjectGuid();
+            m_towerOwner[3] = go->GetTeam();
+            go->SetGoArtKit(GetBannerArtKit(m_towerOwner[3]));
+            break;
+        case GO_TOWER_BANNER_SOUTH:
+            m_towerBanners[4] = go->GetObjectGuid();
+            m_towerOwner[4] = go->GetTeam();
+            go->SetGoArtKit(GetBannerArtKit(m_towerOwner[4]));
+            break;
+    }
+}
+
+void OutdoorPvPTF::HandleObjectiveComplete(uint32 eventId, std::list<Player*> players, Team team)
+{
+    for (uint8 i = 0; i < MAX_TF_TOWERS; ++i)
+    {
+        for (uint8 j = 0; j < 4; ++j)
+        {
+            if (terokkarTowerEvents[i][j].eventEntry == eventId)
+            {
+                for (std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr)
+                {
+                    if ((*itr) && (*itr)->GetTeam() == team)
+                        (*itr)->AreaExploredOrEventHappens(team == ALLIANCE ? QUEST_SPIRITS_OF_AUCHINDOUM_ALLIANCE : QUEST_SPIRITS_OF_AUCHINDOUM_HORDE);
+                }
+                return;
+            }
+        }
+    }
+}
+
+// process the capture events
+bool OutdoorPvPTF::HandleEvent(uint32 eventId, GameObject* go)
+{
+    for (uint8 i = 0; i < MAX_TF_TOWERS; ++i)
+    {
+        if (terokkarTowers[i] == go->GetEntry())
+        {
+            for (uint8 j = 0; j < 4; ++j)
+            {
+                if (terokkarTowerEvents[i][j].eventEntry == eventId)
+                {
+                    // prevent processing if the owner did not change (happens if progress event is called after contest event)
+                    if (terokkarTowerEvents[i][j].team != m_towerOwner[i])
+                    {
+                        sWorld.SendDefenseMessage(ZONE_ID_TEROKKAR_FOREST, terokkarTowerEvents[i][j].defenseMessage);
+
+                        return ProcessCaptureEvent(go, i, terokkarTowerEvents[i][j].team, terokkarTowerEvents[i][j].worldState);
+                    }
+                    // no need to iterate other events or towers
+                    return false;
+                }
+            }
+            // no need to iterate other towers
+            return false;
+        }
+    }
+
+    return false;
+}
+
+bool OutdoorPvPTF::ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team, uint32 newWorldState)
+{
+    if (team == ALLIANCE)
+    {
+        // update banner
+        SetBannerVisual(go, CAPTURE_ARTKIT_ALLIANCE, CAPTURE_ANIM_ALLIANCE);
+
+        // update tower count
+        ++m_towersAlliance;
+
+        // if all towers are captured then process event
+        if (m_towersAlliance == MAX_TF_TOWERS)
+        {
+            LockZone(go, towerId, team, newWorldState);
+            return true;
+        }
+
+        // update tower count world state
+        SendUpdateWorldState(WORLD_STATE_TF_TOWER_COUNT_A, m_towersAlliance);
+    }
+    else if (team == HORDE)
+    {
+        // update banner
+        SetBannerVisual(go, CAPTURE_ARTKIT_HORDE, CAPTURE_ANIM_HORDE);
+
+        // update tower count
+        ++m_towersHorde;
+
+        // if all towers are captured then process event
+        if (m_towersHorde == MAX_TF_TOWERS)
+        {
+            LockZone(go, towerId, team, newWorldState);
+            return true;
+        }
+
+        // update tower count world state
+        SendUpdateWorldState(WORLD_STATE_TF_TOWER_COUNT_H, m_towersHorde);
+    }
+    else
+    {
+        // update banner
+        SetBannerVisual(go, CAPTURE_ARTKIT_NEUTRAL, CAPTURE_ANIM_NEUTRAL);
+
+        // update tower count
+        if (m_towerOwner[towerId] == ALLIANCE)
+        {
+            --m_towersAlliance;
+            SendUpdateWorldState(WORLD_STATE_TF_TOWER_COUNT_A, m_towersAlliance);
+        }
+        else
+        {
+            --m_towersHorde;
+            SendUpdateWorldState(WORLD_STATE_TF_TOWER_COUNT_H, m_towersHorde);
+        }
+    }
+
+    // update tower state
+    SendUpdateWorldState(m_towerWorldState[towerId], WORLD_STATE_REMOVE);
+    m_towerWorldState[towerId] = newWorldState;
+    SendUpdateWorldState(m_towerWorldState[towerId], WORLD_STATE_ADD);
+
+    // update capture point owner
+    m_towerOwner[towerId] = team;
+
+    // the are no DB exceptions in this case
+    return true;
+}
+
+// Handle the zone lock when the timer is activated
+void OutdoorPvPTF::LockZone(GameObject* go, uint32 towerId, Team team, uint32 newWorldState)
+{
+    SendUpdateWorldState(m_zoneWorldState, WORLD_STATE_REMOVE);
+    m_zoneWorldState = team == ALLIANCE ? WORLD_STATE_TF_LOCKED_ALLIANCE : WORLD_STATE_TF_LOCKED_HORDE;
+    SendUpdateWorldState(m_zoneWorldState, WORLD_STATE_ADD);
+
+    m_zoneLockTimer = TIMER_TF_LOCK_TIME;
+    UpdateTimerWorldState();
+
+    m_zoneOwner = team;
+    BuffTeam(team, SPELL_AUCHINDOUN_BLESSING);
+
+    // lock the towers
+    LockTowers(go);
+
+    sWorld.SendDefenseMessage(ZONE_ID_TEROKKAR_FOREST, team == ALLIANCE ? LANG_OPVP_TF_CAPTURE_ALL_TOWERS_A : LANG_OPVP_TF_CAPTURE_ALL_TOWERS_H);
+
+    // remove tower states when zone has been captured and locked
+    for (uint8 i = 0; i < MAX_TF_TOWERS; ++i)
+        SendUpdateWorldState(m_towerWorldState[i], WORLD_STATE_REMOVE);
+
+    m_towerWorldState[towerId] = newWorldState;
+}
+
+// Handle the zone reset when the timer expires
+void OutdoorPvPTF::UnlockZone()
+{
+    // remove buffs
+    BuffTeam(m_zoneOwner, SPELL_AUCHINDOUN_BLESSING, true);
+
+    m_zoneOwner = TEAM_NONE;
+
+    // reset world states and towers
+    SendUpdateWorldState(m_zoneWorldState, WORLD_STATE_REMOVE);
+    m_zoneWorldState = WORLD_STATE_TF_TOWERS_CONTROLLED;
+    SendUpdateWorldState(m_zoneWorldState, WORLD_STATE_ADD);
+
+    // reset tower states
+    m_towerWorldState[0] = WORLD_STATE_TF_WEST_TOWER_NEUTRAL;
+    m_towerWorldState[1] = WORLD_STATE_TF_NORTH_TOWER_NEUTRAL;
+    m_towerWorldState[2] = WORLD_STATE_TF_EAST_TOWER_NEUTRAL;
+    m_towerWorldState[3] = WORLD_STATE_TF_SOUTH_EAST_TOWER_NEUTRAL;
+    m_towerWorldState[4] = WORLD_STATE_TF_SOUTH_TOWER_NEUTRAL;
+    for (uint8 i = 0; i < MAX_TF_TOWERS; ++i)
+        SendUpdateWorldState(m_towerWorldState[i], WORLD_STATE_ADD);
+
+    // update tower count
+    m_towersAlliance = 0;
+    m_towersHorde = 0;
+    SendUpdateWorldState(WORLD_STATE_TF_TOWER_COUNT_A, m_towersAlliance);
+    SendUpdateWorldState(WORLD_STATE_TF_TOWER_COUNT_H, m_towersHorde);
+
+    for (GuidZoneMap::iterator itr = m_zonePlayers.begin(); itr != m_zonePlayers.end(); ++itr)
+    {
+        // Find player who is in main zone (Terokkar Forest) to get correct map reference
+        if (!itr->second)
+            continue;
+
+        if (Player* player = sObjectMgr.GetPlayer(itr->first))
+        {
+            ResetTowers(player);
+            break;
+        }
+    }
+}
+
+void OutdoorPvPTF::Update(uint32 diff)
+{
+    if (m_zoneLockTimer)
+    {
+        if (m_zoneLockTimer < diff)
+        {
+            UnlockZone();
+            m_zoneLockTimer = 0;
+        }
+        else
+        {
+            // update timer - if OutdoorPvPMgr update timer interval needs to be lowered replace this line with the commented-out ones below
+            UpdateTimerWorldState();
+
+            /*if (m_zoneUpdateTimer < diff)
+            {
+                // update timer
+                UpdateTimerWorldState();
+                m_zoneUpdateTimer = TIMER_TF_UPDATE_TIME;
+            }
+            else
+                m_zoneUpdateTimer -= diff;*/
+
+            m_zoneLockTimer -= diff;
+        }
+    }
+}
+
+void OutdoorPvPTF::UpdateTimerWorldState()
+{
+    // Calculate time
+    uint32 minutesLeft = m_zoneLockTimer / 60000;
+    uint32 hoursLeft = minutesLeft / 60;
+    minutesLeft -= hoursLeft * 60;
+    uint32 firstDigit = minutesLeft / 10;
+
+    SendUpdateWorldState(WORLD_STATE_TF_TIME_MIN_FIRST_DIGIT, firstDigit);
+    SendUpdateWorldState(WORLD_STATE_TF_TIME_MIN_SECOND_DIGIT, minutesLeft - firstDigit * 10);
+    SendUpdateWorldState(WORLD_STATE_TF_TIME_HOURS, hoursLeft);
+}
+
+// Handle the Terokkar towers lock during the update timer
+void OutdoorPvPTF::LockTowers(const WorldObject* objRef)
+{
+    for (uint8 i = 0; i < MAX_TF_TOWERS; ++i)
+    {
+        if (GameObject* go = objRef->GetMap()->GetGameObject(m_towerBanners[i]))
+            go->SetLootState(GO_JUST_DEACTIVATED);
+
+        sOutdoorPvPMgr.SetCapturePointSlider(terokkarTowers[i], m_zoneOwner == ALLIANCE ? CAPTURE_SLIDER_ALLIANCE_LOCKED : CAPTURE_SLIDER_HORDE_LOCKED);
+    }
+}
+
+// Handle towers reset when the timer expires
+void OutdoorPvPTF::ResetTowers(const WorldObject* objRef)
+{
+    for (uint8 i = 0; i < MAX_TF_TOWERS; ++i)
+    {
+        if (GameObject* go = objRef->GetMap()->GetGameObject(m_towerBanners[i]))
+        {
+            go->SetCapturePointSlider(CAPTURE_SLIDER_NEUTRAL);
+            SetBannerVisual(go, CAPTURE_ARTKIT_NEUTRAL, CAPTURE_ANIM_NEUTRAL);
+        }
+        else
+            // if grid is unloaded, resetting the slider value is enough
+            sOutdoorPvPMgr.SetCapturePointSlider(terokkarTowers[i], CAPTURE_SLIDER_NEUTRAL);
+    }
+}
diff --git a/src/game/OutdoorPvP/OutdoorPvPTF.h b/src/game/OutdoorPvP/OutdoorPvPTF.h
new file mode 100644
index 00000000000..d643c1c4d81
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPTF.h
@@ -0,0 +1,201 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef WORLD_PVP_TF
+#define WORLD_PVP_TF
+
+#include "Common.h"
+#include "OutdoorPvP.h"
+#include "../Language.h"
+
+enum
+{
+    MAX_TF_TOWERS                               = 5,
+
+    // gameobjects
+    GO_TOWER_BANNER_WEST                        = 183104,
+    GO_TOWER_BANNER_NORTH                       = 183411,
+    GO_TOWER_BANNER_EAST                        = 183412,
+    GO_TOWER_BANNER_SOUTH_EAST                  = 183413,
+    GO_TOWER_BANNER_SOUTH                       = 183414,
+
+    // spells
+    SPELL_AUCHINDOUN_BLESSING                   = 33377,
+
+    // timers
+    TIMER_TF_LOCK_TIME                          = 6 * HOUR * IN_MILLISECONDS,
+    //TIMER_TF_UPDATE_TIME                        = MINUTE * IN_MILLISECONDS,
+
+    // quests
+    QUEST_SPIRITS_OF_AUCHINDOUM_ALLIANCE        = 11505,
+    QUEST_SPIRITS_OF_AUCHINDOUM_HORDE           = 11506,
+
+    // events
+    EVENT_WEST_TOWER_PROGRESS_ALLIANCE          = 12226,
+    EVENT_WEST_TOWER_PROGRESS_HORDE             = 12225,
+    EVENT_WEST_TOWER_NEUTRAL_ALLIANCE           = 12228,
+    EVENT_WEST_TOWER_NEUTRAL_HORDE              = 12227,
+
+    EVENT_NORTH_TOWER_PROGRESS_ALLIANCE         = 12497,
+    EVENT_NORTH_TOWER_PROGRESS_HORDE            = 12496,
+    EVENT_NORTH_TOWER_NEUTRAL_ALLIANCE          = 12490,
+    EVENT_NORTH_TOWER_NEUTRAL_HORDE             = 12491,
+
+    EVENT_EAST_TOWER_PROGRESS_ALLIANCE          = 12486,
+    EVENT_EAST_TOWER_PROGRESS_HORDE             = 12487,
+    EVENT_EAST_TOWER_NEUTRAL_ALLIANCE           = 12488,
+    EVENT_EAST_TOWER_NEUTRAL_HORDE              = 12489,
+
+    EVENT_SOUTH_EAST_TOWER_PROGRESS_ALLIANCE    = 12499,
+    EVENT_SOUTH_EAST_TOWER_PROGRESS_HORDE       = 12498,
+    EVENT_SOUTH_EAST_TOWER_NEUTRAL_ALLIANCE     = 12492,
+    EVENT_SOUTH_EAST_TOWER_NEUTRAL_HORDE        = 12493,
+
+    EVENT_SOUTH_TOWER_PROGRESS_ALLIANCE         = 12501,
+    EVENT_SOUTH_TOWER_PROGRESS_HORDE            = 12500,
+    EVENT_SOUTH_TOWER_NEUTRAL_ALLIANCE          = 12494,
+    EVENT_SOUTH_TOWER_NEUTRAL_HORDE             = 12495,
+
+    // world states
+    // tower counter before the lock event
+    WORLD_STATE_TF_TOWER_COUNT_H                = 2622,
+    WORLD_STATE_TF_TOWER_COUNT_A                = 2621,
+    WORLD_STATE_TF_TOWERS_CONTROLLED            = 2620,
+
+    // timer for the lock event
+    WORLD_STATE_TF_TIME_MIN_FIRST_DIGIT         = 2512,
+    WORLD_STATE_TF_TIME_MIN_SECOND_DIGIT        = 2510,
+    WORLD_STATE_TF_TIME_HOURS                   = 2509,
+
+    // lock period - factions
+    WORLD_STATE_TF_LOCKED_NEUTRAL               = 2508,
+    WORLD_STATE_TF_LOCKED_HORDE                 = 2768,
+    WORLD_STATE_TF_LOCKED_ALLIANCE              = 2767,
+
+    // tower world states
+    WORLD_STATE_TF_WEST_TOWER_ALLIANCE          = 2683,
+    WORLD_STATE_TF_WEST_TOWER_HORDE             = 2682,
+    WORLD_STATE_TF_WEST_TOWER_NEUTRAL           = 2681,
+
+    WORLD_STATE_TF_NORTH_TOWER_ALLIANCE         = 2684,
+    WORLD_STATE_TF_NORTH_TOWER_HORDE            = 2685,
+    WORLD_STATE_TF_NORTH_TOWER_NEUTRAL          = 2686,
+
+    WORLD_STATE_TF_EAST_TOWER_ALLIANCE          = 2688,
+    WORLD_STATE_TF_EAST_TOWER_HORDE             = 2689,
+    WORLD_STATE_TF_EAST_TOWER_NEUTRAL           = 2690,
+
+    WORLD_STATE_TF_SOUTH_EAST_TOWER_ALLIANCE    = 2694,
+    WORLD_STATE_TF_SOUTH_EAST_TOWER_HORDE       = 2695,
+    WORLD_STATE_TF_SOUTH_EAST_TOWER_NEUTRAL     = 2696,
+
+    WORLD_STATE_TF_SOUTH_TOWER_ALLIANCE         = 2691,
+    WORLD_STATE_TF_SOUTH_TOWER_HORDE            = 2692,
+    WORLD_STATE_TF_SOUTH_TOWER_NEUTRAL          = 2693
+};
+
+struct TerokkarTowerEvent
+{
+    uint32  eventEntry;
+    Team    team;
+    uint32  defenseMessage;
+    uint32  worldState;
+};
+
+static const TerokkarTowerEvent terokkarTowerEvents[MAX_TF_TOWERS][4] =
+{
+    {
+        {EVENT_WEST_TOWER_PROGRESS_ALLIANCE,        ALLIANCE,   LANG_OPVP_TF_CAPTURE_TOWER_A,   WORLD_STATE_TF_WEST_TOWER_ALLIANCE},
+        {EVENT_WEST_TOWER_PROGRESS_HORDE,           HORDE,      LANG_OPVP_TF_CAPTURE_TOWER_H,   WORLD_STATE_TF_WEST_TOWER_HORDE},
+        {EVENT_WEST_TOWER_NEUTRAL_HORDE,            TEAM_NONE,  LANG_OPVP_TF_LOSE_TOWER_A,      WORLD_STATE_TF_WEST_TOWER_NEUTRAL},
+        {EVENT_WEST_TOWER_NEUTRAL_ALLIANCE,         TEAM_NONE,  LANG_OPVP_TF_LOSE_TOWER_H,      WORLD_STATE_TF_WEST_TOWER_NEUTRAL},
+    },
+    {
+        {EVENT_NORTH_TOWER_PROGRESS_ALLIANCE,       ALLIANCE,   LANG_OPVP_TF_CAPTURE_TOWER_A,   WORLD_STATE_TF_NORTH_TOWER_ALLIANCE},
+        {EVENT_NORTH_TOWER_PROGRESS_HORDE,          HORDE,      LANG_OPVP_TF_CAPTURE_TOWER_H,   WORLD_STATE_TF_NORTH_TOWER_HORDE},
+        {EVENT_NORTH_TOWER_NEUTRAL_HORDE,           TEAM_NONE,  LANG_OPVP_TF_LOSE_TOWER_A,      WORLD_STATE_TF_NORTH_TOWER_NEUTRAL},
+        {EVENT_NORTH_TOWER_NEUTRAL_ALLIANCE,        TEAM_NONE,  LANG_OPVP_TF_LOSE_TOWER_H,      WORLD_STATE_TF_NORTH_TOWER_NEUTRAL},
+    },
+    {
+        {EVENT_EAST_TOWER_PROGRESS_ALLIANCE,        ALLIANCE,   LANG_OPVP_TF_CAPTURE_TOWER_A,   WORLD_STATE_TF_EAST_TOWER_ALLIANCE},
+        {EVENT_EAST_TOWER_PROGRESS_HORDE,           HORDE,      LANG_OPVP_TF_CAPTURE_TOWER_H,   WORLD_STATE_TF_EAST_TOWER_HORDE},
+        {EVENT_EAST_TOWER_NEUTRAL_HORDE,            TEAM_NONE,  LANG_OPVP_TF_LOSE_TOWER_A,      WORLD_STATE_TF_EAST_TOWER_NEUTRAL},
+        {EVENT_EAST_TOWER_NEUTRAL_ALLIANCE,         TEAM_NONE,  LANG_OPVP_TF_LOSE_TOWER_H,      WORLD_STATE_TF_EAST_TOWER_NEUTRAL},
+    },
+    {
+        {EVENT_SOUTH_EAST_TOWER_PROGRESS_ALLIANCE,  ALLIANCE,   LANG_OPVP_TF_CAPTURE_TOWER_A,   WORLD_STATE_TF_SOUTH_EAST_TOWER_ALLIANCE},
+        {EVENT_SOUTH_EAST_TOWER_PROGRESS_HORDE,     HORDE,      LANG_OPVP_TF_CAPTURE_TOWER_H,   WORLD_STATE_TF_SOUTH_EAST_TOWER_HORDE},
+        {EVENT_SOUTH_EAST_TOWER_NEUTRAL_HORDE,      TEAM_NONE,  LANG_OPVP_TF_LOSE_TOWER_A,      WORLD_STATE_TF_SOUTH_EAST_TOWER_NEUTRAL},
+        {EVENT_SOUTH_EAST_TOWER_NEUTRAL_ALLIANCE,   TEAM_NONE,  LANG_OPVP_TF_LOSE_TOWER_H,      WORLD_STATE_TF_SOUTH_EAST_TOWER_NEUTRAL},
+    },
+    {
+        {EVENT_SOUTH_TOWER_PROGRESS_ALLIANCE,       ALLIANCE,   LANG_OPVP_TF_CAPTURE_TOWER_A,   WORLD_STATE_TF_SOUTH_TOWER_ALLIANCE},
+        {EVENT_SOUTH_TOWER_PROGRESS_HORDE,          HORDE,      LANG_OPVP_TF_CAPTURE_TOWER_H,   WORLD_STATE_TF_SOUTH_TOWER_HORDE},
+        {EVENT_SOUTH_TOWER_NEUTRAL_HORDE,           TEAM_NONE,  LANG_OPVP_TF_LOSE_TOWER_A,      WORLD_STATE_TF_SOUTH_TOWER_NEUTRAL},
+        {EVENT_SOUTH_TOWER_NEUTRAL_ALLIANCE,        TEAM_NONE,  LANG_OPVP_TF_LOSE_TOWER_H,      WORLD_STATE_TF_SOUTH_TOWER_NEUTRAL},
+    },
+};
+
+static const uint32 terokkarTowers[MAX_TF_TOWERS] = {GO_TOWER_BANNER_WEST, GO_TOWER_BANNER_NORTH, GO_TOWER_BANNER_EAST, GO_TOWER_BANNER_SOUTH_EAST, GO_TOWER_BANNER_SOUTH};
+
+class OutdoorPvPTF : public OutdoorPvP
+{
+    friend class OutdoorPvPMgr;
+
+    public:
+        OutdoorPvPTF(uint32 id);
+
+        void HandlePlayerEnterZone(Player* player, bool isMainZone) override;
+        void HandlePlayerLeaveZone(Player* player, bool isMainZone) override;
+        void FillInitialWorldStates(uint32 zoneId) override;
+        void SendRemoveWorldStates(Player* player) override;
+
+        bool HandleEvent(uint32 eventId, GameObject* go) override;
+        void HandleObjectiveComplete(uint32 eventId, std::list<Player*> players, Team team) override;
+
+        void HandleGameObjectCreate(GameObject* go) override;
+        void Update(uint32 diff) override;
+
+    private:
+        void UpdateTimerWorldState();
+
+        // process capture events
+        bool ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team, uint32 newWorldState);
+
+        void LockZone(GameObject* go, uint32 towerId, Team team, uint32 newWorldState);
+        void UnlockZone();
+
+        void LockTowers(const WorldObject* objRef);
+        void ResetTowers(const WorldObject* objRef);
+
+        uint32 m_towerWorldState[MAX_TF_TOWERS];
+        uint32 m_zoneWorldState;
+
+        Team m_towerOwner[MAX_TF_TOWERS];
+        Team m_zoneOwner;
+
+        uint32 m_zoneLockTimer;
+        //uint32 m_zoneUpdateTimer;
+
+        uint32 m_towersAlliance;
+        uint32 m_towersHorde;
+
+        ObjectGuid m_towerBanners[MAX_TF_TOWERS];
+};
+
+#endif
diff --git a/src/game/OutdoorPvP/OutdoorPvPZM.cpp b/src/game/OutdoorPvP/OutdoorPvPZM.cpp
new file mode 100644
index 00000000000..142460e8c74
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPZM.cpp
@@ -0,0 +1,382 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "OutdoorPvPZM.h"
+#include "WorldPacket.h"
+#include "../World.h"
+#include "../ObjectMgr.h"
+#include "../Object.h"
+#include "../Creature.h"
+#include "../GameObject.h"
+#include "../Player.h"
+
+OutdoorPvPZM::OutdoorPvPZM(uint32 id) : OutdoorPvP(id),
+    m_graveyardOwner(TEAM_NONE),
+    m_graveyardWorldState(WORLD_STATE_ZM_GRAVEYARD_NEUTRAL),
+    m_scoutWorldStateAlliance(WORLD_STATE_ZM_FLAG_NOT_READY_ALLIANCE),
+    m_scoutWorldStateHorde(WORLD_STATE_ZM_FLAG_NOT_READY_HORDE),
+    m_towersAlliance(0),
+    m_towersHorde(0)
+{
+    // init world states
+    // FIXME- wrong, need read data from WorldStates
+    m_towerWorldState[0] = WORLD_STATE_ZM_BEACON_EAST_UI_NEUTRAL;
+    m_towerWorldState[1] = WORLD_STATE_ZM_BEACON_WEST_UI_NEUTRAL;
+    m_towerMapState[0] = WORLD_STATE_ZM_BEACON_EAST_NEUTRAL;
+    m_towerMapState[1] = WORLD_STATE_ZM_BEACON_WEST_NEUTRAL;
+
+    for (uint8 i = 0; i < MAX_ZM_TOWERS; ++i)
+        m_towerOwner[i] = TEAM_NONE;
+
+    // initially set graveyard owner to neither faction
+    sObjectMgr.SetGraveYardLinkTeam(GRAVEYARD_ID_TWIN_SPIRE, GRAVEYARD_ZONE_TWIN_SPIRE, TEAM_INVALID);
+}
+
+void OutdoorPvPZM::SendRemoveWorldStates(Player* player)
+{
+}
+
+void OutdoorPvPZM::HandlePlayerEnterZone(Player* player, bool isMainZone)
+{
+    OutdoorPvP::HandlePlayerEnterZone(player, isMainZone);
+
+    // remove the buff from the player first; Sometimes on relog players still have the aura
+    player->RemoveAurasDueToSpell(SPELL_TWIN_SPIRE_BLESSING);
+
+    // cast buff the the player which enters the zone
+    if (player->GetTeam() == m_graveyardOwner)
+        player->CastSpell(player, SPELL_TWIN_SPIRE_BLESSING, true);
+}
+
+void OutdoorPvPZM::HandlePlayerLeaveZone(Player* player, bool isMainZone)
+{
+    // remove the buff from the player
+    player->RemoveAurasDueToSpell(SPELL_TWIN_SPIRE_BLESSING);
+
+    OutdoorPvP::HandlePlayerLeaveZone(player, isMainZone);
+}
+
+void OutdoorPvPZM::HandleCreatureCreate(Creature* creature)
+{
+    switch (creature->GetEntry())
+    {
+        case NPC_PVP_BEAM_RED:
+            if (creature->GetPositionY() < 7000.0f)                 // East Beam
+                m_beamTowerRed[0] = creature->GetObjectGuid();
+            else if (creature->GetPositionY() < 7300.0f)            // Center Beam
+                m_beamGraveyardRed = creature->GetObjectGuid();
+            else                                                    // West Beam
+                m_beamTowerRed[1] = creature->GetObjectGuid();
+            break;
+        case NPC_PVP_BEAM_BLUE:
+            if (creature->GetPositionY() < 7000.0f)                 // East Beam
+                m_beamTowerBlue[0] = creature->GetObjectGuid();
+            else if (creature->GetPositionY() < 7300.0f)            // Center Beam
+                m_beamGraveyardBlue = creature->GetObjectGuid();
+            else                                                    // West Beam
+                m_beamTowerBlue[1] = creature->GetObjectGuid();
+            break;
+    }
+}
+
+void OutdoorPvPZM::HandleGameObjectCreate(GameObject* go)
+{
+    switch (go->GetEntry())
+    {
+        case GO_ZANGA_BANNER_EAST:
+            m_towerBanners[0] = go->GetObjectGuid();
+            break;
+        case GO_ZANGA_BANNER_WEST:
+            m_towerBanners[1] = go->GetObjectGuid();
+            break;
+        case GO_ZANGA_BANNER_CENTER_ALLIANCE:
+            m_graveyardBannerAlliance = go->GetObjectGuid();
+            break;
+        case GO_ZANGA_BANNER_CENTER_HORDE:
+            m_graveyardBannerHorde = go->GetObjectGuid();
+            break;
+        case GO_ZANGA_BANNER_CENTER_NEUTRAL:
+            m_graveyardBannerNeutral = go->GetObjectGuid();
+            break;
+    }
+}
+
+// Cast player spell on opponent kill
+void OutdoorPvPZM::HandlePlayerKillInsideArea(Player* player)
+{
+    for (uint8 i = 0; i < MAX_ZM_TOWERS; ++i)
+    {
+        if (GameObject* capturePoint = player->GetMap()->GetGameObject(m_towerBanners[i]))
+        {
+            // check capture point range
+            GameObjectInfo const* info = capturePoint->GetGOInfo();
+            if (info && player->IsWithinDistInMap(capturePoint, info->capturePoint.radius))
+            {
+                // check capture point team
+                if (player->GetTeam() == m_towerOwner[i])
+                    player->CastSpell(player, player->GetTeam() == ALLIANCE ? SPELL_ZANGA_TOWER_TOKEN_ALLIANCE : SPELL_ZANGA_TOWER_TOKEN_HORDE, true);
+
+                return;
+            }
+        }
+    }
+}
+
+// process the capture events
+bool OutdoorPvPZM::HandleEvent(uint32 eventId, GameObject* go)
+{
+    for (uint8 i = 0; i < MAX_ZM_TOWERS; ++i)
+    {
+        if (zangarmarshTowers[i] == go->GetEntry())
+        {
+            for (uint8 j = 0; j < 4; ++j)
+            {
+                if (zangarmarshTowerEvents[i][j].eventEntry == eventId)
+                {
+                    // prevent processing if the owner did not change (happens if progress event is called after contest event)
+                    if (zangarmarshTowerEvents[i][j].team != m_towerOwner[i])
+                    {
+                        if (zangarmarshTowerEvents[i][j].defenseMessage)
+                            sWorld.SendDefenseMessage(ZONE_ID_ZANGARMARSH, zangarmarshTowerEvents[i][j].defenseMessage);
+
+                        return ProcessCaptureEvent(go, i, zangarmarshTowerEvents[i][j].team, zangarmarshTowerEvents[i][j].worldState, zangarmarshTowerEvents[i][j].mapState);
+                    }
+                    // no need to iterate other events or towers
+                    return false;
+                }
+            }
+            // no need to iterate other towers
+            return false;
+        }
+    }
+
+    return false;
+}
+
+bool OutdoorPvPZM::ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team, uint32 newWorldState, uint32 newMapState)
+{
+    if (team == ALLIANCE)
+    {
+        // update counter
+        SetBeaconArtKit(go, m_beamTowerBlue[towerId], SPELL_BEAM_BLUE);
+        ++m_towersAlliance;
+
+        if (m_towersAlliance == MAX_ZM_TOWERS)
+        {
+            // Send this defense message before updating scout state as this sends another
+            sWorld.SendDefenseMessage(ZONE_ID_ZANGARMARSH, LANG_OPVP_ZM_CAPTURE_BOTH_BEACONS_A);
+
+            // only add flag to scouts if team does not have captured graveyard already
+            if (m_graveyardOwner != ALLIANCE)
+                UpdateScoutState(ALLIANCE, true);
+        }
+    }
+    else if (team == HORDE)
+    {
+        // update counter
+        SetBeaconArtKit(go, m_beamTowerRed[towerId], SPELL_BEAM_RED);
+        ++m_towersHorde;
+
+        if (m_towersHorde == MAX_ZM_TOWERS)
+        {
+            // Send this defense message before updating scout state as this sends another
+            sWorld.SendDefenseMessage(ZONE_ID_ZANGARMARSH, LANG_OPVP_ZM_CAPTURE_BOTH_BEACONS_H);
+
+            // only add flag to scouts if team does not already have captured graveyard
+            if (m_graveyardOwner != HORDE)
+                UpdateScoutState(HORDE, true);
+        }
+    }
+    else
+    {
+        if (m_towerOwner[towerId] == ALLIANCE)
+        {
+            SetBeaconArtKit(go, m_beamTowerBlue[towerId], 0);
+
+            // only remove flag from scouts if team does not already have captured graveyard
+            if (m_towersAlliance == MAX_ZM_TOWERS && m_graveyardOwner != ALLIANCE)
+                UpdateScoutState(ALLIANCE, false);
+
+            // update counter
+            --m_towersAlliance;
+        }
+        else
+        {
+            SetBeaconArtKit(go, m_beamTowerRed[towerId], 0);
+
+            // only remove flag from scouts if team does not already have captured graveyard
+            if (m_towersHorde == MAX_ZM_TOWERS && m_graveyardOwner != HORDE)
+                UpdateScoutState(HORDE, false);
+
+            // update counter
+            --m_towersHorde;
+        }
+    }
+
+    // update tower state
+    SendUpdateWorldState(m_towerWorldState[towerId], WORLD_STATE_REMOVE);
+    m_towerWorldState[towerId] = newWorldState;
+    SendUpdateWorldState(m_towerWorldState[towerId], WORLD_STATE_ADD);
+
+    SendUpdateWorldState(m_towerMapState[towerId], WORLD_STATE_REMOVE);
+    m_towerMapState[towerId] = newMapState;
+    SendUpdateWorldState(m_towerMapState[towerId], WORLD_STATE_ADD);;
+
+    // update capture point owner
+    m_towerOwner[towerId] = team;
+
+    // the are no DB exceptions in this case
+    return true;
+}
+
+// Handle scout activation, when both beacons are captured
+void OutdoorPvPZM::UpdateScoutState(Team team, bool spawned)
+{
+    if (team == ALLIANCE)
+    {
+        SendUpdateWorldState(m_scoutWorldStateAlliance, WORLD_STATE_REMOVE);
+        m_scoutWorldStateAlliance = spawned ? WORLD_STATE_ZM_FLAG_READY_ALLIANCE : WORLD_STATE_ZM_FLAG_NOT_READY_ALLIANCE;
+        SendUpdateWorldState(m_scoutWorldStateAlliance, WORLD_STATE_ADD);
+
+        if (spawned)
+            sWorld.SendDefenseMessage(ZONE_ID_ZANGARMARSH, LANG_OPVP_ZM_SPAWN_FIELD_SCOUT_A);
+    }
+    else
+    {
+        SendUpdateWorldState(m_scoutWorldStateHorde, WORLD_STATE_REMOVE);
+        m_scoutWorldStateHorde = spawned ? WORLD_STATE_ZM_FLAG_READY_HORDE : WORLD_STATE_ZM_FLAG_NOT_READY_HORDE;
+        SendUpdateWorldState(m_scoutWorldStateHorde, WORLD_STATE_ADD);
+
+        if (spawned)
+            sWorld.SendDefenseMessage(ZONE_ID_ZANGARMARSH, LANG_OPVP_ZM_SPAWN_FIELD_SCOUT_H);
+    }
+}
+
+// Handle the graveyard banner use
+bool OutdoorPvPZM::HandleGameObjectUse(Player* player, GameObject* go)
+{
+    Team team = player->GetTeam();
+
+    switch (go->GetEntry())
+    {
+        case GO_ZANGA_BANNER_CENTER_NEUTRAL:
+            break;
+        case GO_ZANGA_BANNER_CENTER_ALLIANCE:
+            if (team == ALLIANCE || !player->HasAura(SPELL_BATTLE_STANDARD_HORDE))
+                return false;
+            break;
+        case GO_ZANGA_BANNER_CENTER_HORDE:
+            if (team == HORDE || !player->HasAura(SPELL_BATTLE_STANDARD_ALLIANCE))
+                return false;
+            break;
+        default:
+            return false;
+    }
+
+    // disable old banners - note the alliance and horde banners can despawn by self
+    if (m_graveyardOwner == ALLIANCE)
+    {
+        //RespawnGO(go, m_graveyardBannerAlliance, false);
+        SetBeaconArtKit(go, m_beamGraveyardBlue, 0);
+    }
+    else if (m_graveyardOwner == HORDE)
+    {
+        //RespawnGO(go, m_graveyardBannerHorde, false);
+        SetBeaconArtKit(go, m_beamGraveyardRed, 0);
+    }
+    else
+        RespawnGO(go, m_graveyardBannerNeutral, false);
+
+    if (team == ALLIANCE)
+    {
+        // change banners
+        RespawnGO(go, m_graveyardBannerAlliance, true);
+        SetBeaconArtKit(go, m_beamGraveyardBlue, SPELL_BEAM_BLUE);
+
+        // update world state
+        SendUpdateWorldState(m_graveyardWorldState, WORLD_STATE_REMOVE);
+        m_graveyardWorldState = WORLD_STATE_ZM_GRAVEYARD_ALLIANCE;
+        SendUpdateWorldState(m_graveyardWorldState, WORLD_STATE_ADD);
+
+        // remove player flag aura
+        player->RemoveAurasDueToSpell(SPELL_BATTLE_STANDARD_ALLIANCE);
+
+        // send defense message
+        sWorld.SendDefenseMessage(ZONE_ID_ZANGARMARSH, LANG_OPVP_ZM_CAPTURE_GRAVEYARD_A);
+    }
+    else
+    {
+        // change banners
+        RespawnGO(go, m_graveyardBannerHorde, true);
+        SetBeaconArtKit(go, m_beamGraveyardRed, SPELL_BEAM_RED);
+
+        // update world state
+        SendUpdateWorldState(m_graveyardWorldState, WORLD_STATE_REMOVE);
+        m_graveyardWorldState = WORLD_STATE_ZM_GRAVEYARD_HORDE;
+        SendUpdateWorldState(m_graveyardWorldState, WORLD_STATE_ADD);
+
+        // remove player flag aura
+        player->RemoveAurasDueToSpell(SPELL_BATTLE_STANDARD_HORDE);
+
+        // send defense message
+        sWorld.SendDefenseMessage(ZONE_ID_ZANGARMARSH, LANG_OPVP_ZM_CAPTURE_GRAVEYARD_H);
+    }
+
+    // change the graveyard link
+    sObjectMgr.SetGraveYardLinkTeam(GRAVEYARD_ID_TWIN_SPIRE, GRAVEYARD_ZONE_TWIN_SPIRE, team);
+
+    // apply zone buff
+    if (m_graveyardOwner != TEAM_NONE)
+        BuffTeam(m_graveyardOwner, SPELL_TWIN_SPIRE_BLESSING, true);
+    BuffTeam(team, SPELL_TWIN_SPIRE_BLESSING);
+
+    // reset scout so that team cannot take flag
+    UpdateScoutState(team, false);
+
+    // update graveyard owner
+    m_graveyardOwner = team;
+
+    return false;
+}
+
+// ToDo: Handle the case when the player drops the flag
+//bool OutdoorPvPZM::HandleDropFlag(Player* player, uint32 spellId)
+//{
+//    if (spellId == SPELL_BATTLE_STANDARD_HORDE || spellId == SPELL_BATTLE_STANDARD_ALLIANCE)
+//    {
+//        // ToDo: implement this when the scout DB conditions are implemented
+//        // The scouts gossip options should check a DB condition if the gossip is pvp available
+//        // The idea is to set the Outdoor PvP condition to false on flag take - this will allow only one player to use the flag
+//        // on flag drop the condition can be set back to true if necessary, so the players can retake the flag
+//        return true;
+//    }
+//
+//    return false;
+//}
+
+// Handle the ZM beacons - this is done by npcs which have certain auras
+void OutdoorPvPZM::SetBeaconArtKit(const WorldObject* objRef, ObjectGuid creatureGuid, uint32 auraId)
+{
+    if (Creature* beam = objRef->GetMap()->GetCreature(creatureGuid))
+    {
+        if (auraId)
+            beam->CastSpell(beam, auraId, true);
+        else
+            beam->RemoveAllAuras();
+    }
+}
diff --git a/src/game/OutdoorPvP/OutdoorPvPZM.h b/src/game/OutdoorPvP/OutdoorPvPZM.h
new file mode 100644
index 00000000000..a5e01994498
--- /dev/null
+++ b/src/game/OutdoorPvP/OutdoorPvPZM.h
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+#ifndef WORLD_PVP_ZM
+#define WORLD_PVP_ZM
+
+#include "Common.h"
+#include "OutdoorPvP.h"
+#include "../Language.h"
+
+enum
+{
+    MAX_ZM_TOWERS                           = 2,
+
+    // npcs
+    //NPC_ALLIANCE_FIELD_SCOUT              = 18581,
+    //NPC_HORDE_FIELD_SCOUT                 = 18564,
+
+    // these 2 npcs act as an artkit
+    NPC_PVP_BEAM_RED                        = 18757,
+    NPC_PVP_BEAM_BLUE                       = 18759,
+
+    // gameobjects
+    GO_ZANGA_BANNER_WEST                    = 182522,
+    GO_ZANGA_BANNER_EAST                    = 182523,
+    GO_ZANGA_BANNER_CENTER_ALLIANCE         = 182527,
+    GO_ZANGA_BANNER_CENTER_HORDE            = 182528,
+    GO_ZANGA_BANNER_CENTER_NEUTRAL          = 182529,
+
+    // spells
+    SPELL_TWIN_SPIRE_BLESSING               = 33779,
+    SPELL_BATTLE_STANDARD_ALLIANCE          = 32430,
+    SPELL_BATTLE_STANDARD_HORDE             = 32431,
+
+    SPELL_ZANGA_TOWER_TOKEN_ALLIANCE        = 32155,
+    SPELL_ZANGA_TOWER_TOKEN_HORDE           = 32158,
+
+    SPELL_BEAM_RED                          = 32839,
+    SPELL_BEAM_BLUE                         = 32840,
+
+    // misc
+    GRAVEYARD_ID_TWIN_SPIRE                 = 969,
+    GRAVEYARD_ZONE_TWIN_SPIRE               = 3521,
+
+    // events
+    //EVENT_EAST_BEACON_CONTEST_ALLIANCE    = 11816,
+    //EVENT_EAST_BEACON_CONTEST_HORDE       = 11817,
+    EVENT_EAST_BEACON_PROGRESS_ALLIANCE     = 11807,
+    EVENT_EAST_BEACON_PROGRESS_HORDE        = 11806,
+    EVENT_EAST_BEACON_NEUTRAL_ALLIANCE      = 11814,
+    EVENT_EAST_BEACON_NEUTRAL_HORDE         = 11815,
+
+    //EVENT_WEST_BEACON_CONTEST_ALLIANCE    = 11813,
+    //EVENT_WEST_BEACON_CONTEST_HORDE       = 11812,
+    EVENT_WEST_BEACON_PROGRESS_ALLIANCE     = 11805,
+    EVENT_WEST_BEACON_PROGRESS_HORDE        = 11804,
+    EVENT_WEST_BEACON_NEUTRAL_ALLIANCE      = 11808,
+    EVENT_WEST_BEACON_NEUTRAL_HORDE         = 11809,
+
+    // world states
+    WORLD_STATE_ZM_BEACON_EAST_UI_ALLIANCE  = 2558,
+    WORLD_STATE_ZM_BEACON_EAST_UI_HORDE     = 2559,
+    WORLD_STATE_ZM_BEACON_EAST_UI_NEUTRAL   = 2560,
+
+    WORLD_STATE_ZM_BEACON_WEST_UI_ALLIANCE  = 2555,
+    WORLD_STATE_ZM_BEACON_WEST_UI_HORDE     = 2556,
+    WORLD_STATE_ZM_BEACON_WEST_UI_NEUTRAL   = 2557,
+
+    WORLD_STATE_ZM_BEACON_EAST_ALLIANCE     = 2650,
+    WORLD_STATE_ZM_BEACON_EAST_HORDE        = 2651,
+    WORLD_STATE_ZM_BEACON_EAST_NEUTRAL      = 2652,
+
+    WORLD_STATE_ZM_BEACON_WEST_ALLIANCE     = 2644,
+    WORLD_STATE_ZM_BEACON_WEST_HORDE        = 2645,
+    WORLD_STATE_ZM_BEACON_WEST_NEUTRAL      = 2646,
+
+    WORLD_STATE_ZM_GRAVEYARD_ALLIANCE       = 2648,
+    WORLD_STATE_ZM_GRAVEYARD_HORDE          = 2649,
+    WORLD_STATE_ZM_GRAVEYARD_NEUTRAL        = 2647,
+
+    WORLD_STATE_ZM_FLAG_READY_HORDE         = 2658,
+    WORLD_STATE_ZM_FLAG_NOT_READY_HORDE     = 2657,
+    WORLD_STATE_ZM_FLAG_READY_ALLIANCE      = 2655,
+    WORLD_STATE_ZM_FLAG_NOT_READY_ALLIANCE  = 2656
+
+    //WORLD_STATE_ZM_UNK                    = 2653
+};
+
+struct ZangarmarshTowerEvent
+{
+    uint32  eventEntry;
+    Team    team;
+    uint32  defenseMessage;
+    uint32  worldState;
+    uint32  mapState;
+};
+
+static const ZangarmarshTowerEvent zangarmarshTowerEvents[MAX_ZM_TOWERS][4] =
+{
+    {
+        {EVENT_EAST_BEACON_PROGRESS_ALLIANCE,   ALLIANCE,   LANG_OPVP_ZM_CAPTURE_EAST_BEACON_A, WORLD_STATE_ZM_BEACON_EAST_UI_ALLIANCE, WORLD_STATE_ZM_BEACON_EAST_ALLIANCE},
+        {EVENT_EAST_BEACON_PROGRESS_HORDE,      HORDE,      LANG_OPVP_ZM_CAPTURE_EAST_BEACON_H, WORLD_STATE_ZM_BEACON_EAST_UI_HORDE,    WORLD_STATE_ZM_BEACON_EAST_HORDE},
+        {EVENT_EAST_BEACON_NEUTRAL_HORDE,       TEAM_NONE,  0,                                  WORLD_STATE_ZM_BEACON_EAST_UI_NEUTRAL,  WORLD_STATE_ZM_BEACON_EAST_NEUTRAL},
+        {EVENT_EAST_BEACON_NEUTRAL_ALLIANCE,    TEAM_NONE,  0,                                  WORLD_STATE_ZM_BEACON_EAST_UI_NEUTRAL,  WORLD_STATE_ZM_BEACON_EAST_NEUTRAL},
+    },
+    {
+        {EVENT_WEST_BEACON_PROGRESS_ALLIANCE,   ALLIANCE,   LANG_OPVP_ZM_CAPTURE_WEST_BEACON_A, WORLD_STATE_ZM_BEACON_WEST_UI_ALLIANCE, WORLD_STATE_ZM_BEACON_WEST_ALLIANCE},
+        {EVENT_WEST_BEACON_PROGRESS_HORDE,      HORDE,      LANG_OPVP_ZM_CAPTURE_WEST_BEACON_H, WORLD_STATE_ZM_BEACON_WEST_UI_HORDE,    WORLD_STATE_ZM_BEACON_WEST_HORDE},
+        {EVENT_WEST_BEACON_NEUTRAL_HORDE,       TEAM_NONE,  0,                                  WORLD_STATE_ZM_BEACON_WEST_UI_NEUTRAL,  WORLD_STATE_ZM_BEACON_WEST_NEUTRAL},
+        {EVENT_WEST_BEACON_NEUTRAL_ALLIANCE,    TEAM_NONE,  0,                                  WORLD_STATE_ZM_BEACON_WEST_UI_NEUTRAL,  WORLD_STATE_ZM_BEACON_WEST_NEUTRAL},
+    },
+};
+
+static const uint32 zangarmarshTowers[MAX_ZM_TOWERS] = {GO_ZANGA_BANNER_EAST, GO_ZANGA_BANNER_WEST};
+
+class OutdoorPvPZM : public OutdoorPvP
+{
+    public:
+        OutdoorPvPZM(uint32 id);
+
+        void HandlePlayerEnterZone(Player* player, bool isMainZone) override;
+        void HandlePlayerLeaveZone(Player* player, bool isMainZone) override;
+        void SendRemoveWorldStates(Player* player) override;
+
+        bool HandleEvent(uint32 eventId, GameObject* go) override;
+
+        void HandleCreatureCreate(Creature* creature) override;
+        void HandleGameObjectCreate(GameObject* go) override;
+
+        void HandlePlayerKillInsideArea(Player* player) override;
+        bool HandleGameObjectUse(Player* player, GameObject* go) override;
+        //bool HandleDropFlag(Player* player, uint32 spellId) override;
+
+    private:
+        // process capture events
+        bool ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team, uint32 newWorldState, uint32 newMapState);
+
+        // handles scout world states
+        void UpdateScoutState(Team team, bool spawned);
+
+        // respawn npcs which act as an artkit visual
+        void SetBeaconArtKit(const WorldObject* objRef, ObjectGuid creatureGuid, uint32 auraId);
+
+        uint32 m_towerWorldState[MAX_ZM_TOWERS];
+        uint32 m_towerMapState[MAX_ZM_TOWERS];
+
+        Team m_towerOwner[MAX_ZM_TOWERS];
+        Team m_graveyardOwner;
+
+        uint32 m_graveyardWorldState;
+        uint32 m_scoutWorldStateAlliance;
+        uint32 m_scoutWorldStateHorde;
+        uint32 m_towersAlliance;
+        uint32 m_towersHorde;
+
+        ObjectGuid m_towerBanners[MAX_ZM_TOWERS];
+        ObjectGuid m_graveyardBannerAlliance;
+        ObjectGuid m_graveyardBannerHorde;
+        ObjectGuid m_graveyardBannerNeutral;
+
+        ObjectGuid m_beamTowerBlue[MAX_ZM_TOWERS];
+        ObjectGuid m_beamTowerRed[MAX_ZM_TOWERS];
+        ObjectGuid m_beamGraveyardBlue;
+        ObjectGuid m_beamGraveyardRed;
+};
+
+#endif
diff --git a/src/game/PathFinder.cpp b/src/game/PathFinder.cpp
index 1c0b5441476..e12c6d57c74 100644
--- a/src/game/PathFinder.cpp
+++ b/src/game/PathFinder.cpp
@@ -66,7 +66,7 @@ bool PathFinder::calculate(float destX, float destY, float destZ, bool forceDest
     // make sure navMesh works - we can run on map w/o mmap
     // check if the start and end point have a .mmtile loaded (can we pass via not loaded tile on the way?)
     if (!m_navMesh || !m_navMeshQuery || m_sourceUnit->hasUnitState(UNIT_STAT_IGNORE_PATHFINDING) ||
-        !HaveTile(start) || !HaveTile(dest))
+        !HaveTile(start) || !HaveTile(dest) || (m_sourceUnit->GetTypeId() == TYPEID_UNIT && ((Creature*)m_sourceUnit)->IsLevitating()))
     {
         BuildShortcut();
         m_type = PathType(PATHFIND_NORMAL | PATHFIND_NOT_USING_PATH);
@@ -75,27 +75,11 @@ bool PathFinder::calculate(float destX, float destY, float destZ, bool forceDest
 
     updateFilter();
 
-    // check if destination moved - if not we can optimize something here
-    // we are following old, precalculated path?
-    float dist = m_sourceUnit->GetObjectBoundingRadius();
-    if (inRange(oldDest, dest, dist, dist) && m_pathPoints.size() > 2)
-    {
-        // our target is not moving - we just coming closer
-        // we are moving on precalculated path - enjoy the ride
-        DEBUG_FILTER_LOG(LOG_FILTER_PATHFINDING, "++ PathFinder::calculate:: precalculated path\n");
-
-        m_pathPoints.erase(m_pathPoints.begin());
-        return false;
-    }
-    else
-    {
-        // target moved, so we need to update the poly path
-        BuildPolyPath(start, dest);
-        return true;
-    }
+    BuildPolyPath(start, dest);
+    return true;
 }
 
-dtPolyRef PathFinder::getPathPolyByPosition(const dtPolyRef *polyPath, uint32 polyPathSize, const float* point, float *distance) const
+dtPolyRef PathFinder::getPathPolyByPosition(const dtPolyRef* polyPath, uint32 polyPathSize, const float* point, float* distance) const
 {
     if (!polyPath || !polyPathSize)
         return INVALID_POLYREF;
@@ -107,7 +91,8 @@ dtPolyRef PathFinder::getPathPolyByPosition(const dtPolyRef *polyPath, uint32 po
     for (uint32 i = 0; i < polyPathSize; ++i)
     {
         float closestPoint[VERTEX_SIZE];
-        if (DT_SUCCESS != m_navMeshQuery->closestPointOnPoly(polyPath[i], point, closestPoint))
+        dtStatus dtResult = m_navMeshQuery->closestPointOnPoly(polyPath[i], point, closestPoint);
+        if (dtStatusFailed(dtResult))
             continue;
 
         float d = dtVdist2DSqr(point, closestPoint);
@@ -118,7 +103,7 @@ dtPolyRef PathFinder::getPathPolyByPosition(const dtPolyRef *polyPath, uint32 po
             minDist3d = dtVdistSqr(point, closestPoint);
         }
 
-        if(minDist2d < 1.0f) // shortcut out - close enough for us
+        if (minDist2d < 1.0f) // shortcut out - close enough for us
             break;
     }
 
@@ -128,13 +113,13 @@ dtPolyRef PathFinder::getPathPolyByPosition(const dtPolyRef *polyPath, uint32 po
     return (minDist2d < 3.0f) ? nearestPoly : INVALID_POLYREF;
 }
 
-dtPolyRef PathFinder::getPolyByLocation(const float* point, float *distance) const
+dtPolyRef PathFinder::getPolyByLocation(const float* point, float* distance) const
 {
     // first we check the current path
     // if the current path doesn't contain the current poly,
     // we need to use the expensive navMesh.findNearestPoly
     dtPolyRef polyRef = getPathPolyByPosition(m_pathPolyRefs, m_polyLength, point, distance);
-    if(polyRef != INVALID_POLYREF)
+    if (polyRef != INVALID_POLYREF)
         return polyRef;
 
     // we don't have it in our old path
@@ -142,8 +127,8 @@ dtPolyRef PathFinder::getPolyByLocation(const float* point, float *distance) con
     // first try with low search box
     float extents[VERTEX_SIZE] = {3.0f, 5.0f, 3.0f};    // bounds of poly search area
     float closestPoint[VERTEX_SIZE] = {0.0f, 0.0f, 0.0f};
-    dtStatus result = m_navMeshQuery->findNearestPoly(point, extents, &m_filter, &polyRef, closestPoint);
-    if(DT_SUCCESS == result && polyRef != INVALID_POLYREF)
+    dtStatus dtResult = m_navMeshQuery->findNearestPoly(point, extents, &m_filter, &polyRef, closestPoint);
+    if (dtStatusSucceed(dtResult) && polyRef != INVALID_POLYREF)
     {
         *distance = dtVdist(closestPoint, point);
         return polyRef;
@@ -152,8 +137,8 @@ dtPolyRef PathFinder::getPolyByLocation(const float* point, float *distance) con
     // still nothing ..
     // try with bigger search box
     extents[1] = 200.0f;
-    result = m_navMeshQuery->findNearestPoly(point, extents, &m_filter, &polyRef, closestPoint);
-    if(DT_SUCCESS == result && polyRef != INVALID_POLYREF)
+    dtResult = m_navMeshQuery->findNearestPoly(point, extents, &m_filter, &polyRef, closestPoint);
+    if (dtStatusSucceed(dtResult) && polyRef != INVALID_POLYREF)
     {
         *distance = dtVdist(closestPoint, point);
         return polyRef;
@@ -162,7 +147,7 @@ dtPolyRef PathFinder::getPolyByLocation(const float* point, float *distance) con
     return INVALID_POLYREF;
 }
 
-void PathFinder::BuildPolyPath(const Vector3 &startPos, const Vector3 &endPos)
+void PathFinder::BuildPolyPath(const Vector3& startPos, const Vector3& endPos)
 {
     // *** getting start/end poly logic ***
 
@@ -173,15 +158,28 @@ void PathFinder::BuildPolyPath(const Vector3 &startPos, const Vector3 &endPos)
     dtPolyRef startPoly = getPolyByLocation(startPoint, &distToStartPoly);
     dtPolyRef endPoly = getPolyByLocation(endPoint, &distToEndPoly);
 
+    dtStatus dtResult;
+
     // we have a hole in our mesh
-    // make shortcut path and mark it as NOPATH ( with flying exception )
+    // make shortcut path and mark it as NOPATH (with flying exception)
     // its up to caller how he will use this info
     if (startPoly == INVALID_POLYREF || endPoly == INVALID_POLYREF)
     {
         DEBUG_FILTER_LOG(LOG_FILTER_PATHFINDING, "++ BuildPolyPath :: (startPoly == 0 || endPoly == 0)\n");
         BuildShortcut();
-        m_type = (m_sourceUnit->GetTypeId() == TYPEID_UNIT && ((Creature*)m_sourceUnit)->CanFly())
-                    ? PathType(PATHFIND_NORMAL | PATHFIND_NOT_USING_PATH) : PATHFIND_NOPATH;
+
+        // Check for swimming or flying shortcut
+        if (m_sourceUnit->GetTypeId() == TYPEID_UNIT)
+        {
+            if ((startPoly == INVALID_POLYREF && m_sourceUnit->GetTerrain()->IsUnderWater(startPos.x, startPos.y, startPos.z)) ||
+                (endPoly == INVALID_POLYREF && m_sourceUnit->GetTerrain()->IsUnderWater(endPos.x, endPos.y, endPos.z)))
+                m_type = ((Creature*)m_sourceUnit)->CanSwim() ? PathType(PATHFIND_NORMAL | PATHFIND_NOT_USING_PATH) : PATHFIND_NOPATH;
+            else
+                m_type = ((Creature*)m_sourceUnit)->CanFly() ? PathType(PATHFIND_NORMAL | PATHFIND_NOT_USING_PATH) : PATHFIND_NOPATH;
+        }
+        else
+            m_type = PATHFIND_NOPATH;
+
         return;
     }
 
@@ -206,7 +204,7 @@ void PathFinder::BuildPolyPath(const Vector3 &startPos, const Vector3 &endPos)
             else
             {
                 DEBUG_FILTER_LOG(LOG_FILTER_PATHFINDING, "++ BuildPolyPath :: flying case\n");
-                if (owner->CanFly())
+                if (owner->IsLevitating())
                     buildShotrcut = true;
             }
         }
@@ -221,10 +219,11 @@ void PathFinder::BuildPolyPath(const Vector3 &startPos, const Vector3 &endPos)
         {
             float closestPoint[VERTEX_SIZE];
             // we may want to use closestPointOnPolyBoundary instead
-            if (DT_SUCCESS == m_navMeshQuery->closestPointOnPoly(endPoly, endPoint, closestPoint))
+            dtResult = m_navMeshQuery->closestPointOnPoly(endPoly, endPoint, closestPoint);
+            if (dtStatusSucceed(dtResult))
             {
                 dtVcopy(endPoint, closestPoint);
-                setActualEndPosition(Vector3(endPoint[2],endPoint[0],endPoint[1]));
+                setActualEndPosition(Vector3(endPoint[2], endPoint[0], endPoint[1]));
             }
 
             m_type = PATHFIND_INCOMPLETE;
@@ -311,13 +310,15 @@ void PathFinder::BuildPolyPath(const Vector3 &startPos, const Vector3 &endPos)
 
         // we need any point on our suffix start poly to generate poly-path, so we need last poly in prefix data
         float suffixEndPoint[VERTEX_SIZE];
-        if (DT_SUCCESS != m_navMeshQuery->closestPointOnPoly(suffixStartPoly, endPoint, suffixEndPoint))
+        dtResult = m_navMeshQuery->closestPointOnPoly(suffixStartPoly, endPoint, suffixEndPoint);
+        if (dtStatusFailed(dtResult))
         {
             // we can hit offmesh connection as last poly - closestPointOnPoly() don't like that
             // try to recover by using prev polyref
             --prefixPolyLength;
             suffixStartPoly = m_pathPolyRefs[prefixPolyLength-1];
-            if (DT_SUCCESS != m_navMeshQuery->closestPointOnPoly(suffixStartPoly, endPoint, suffixEndPoint))
+            dtResult = m_navMeshQuery->closestPointOnPoly(suffixStartPoly, endPoint, suffixEndPoint);
+            if (dtStatusFailed(dtResult))
             {
                 // suffixStartPoly is still invalid, error state
                 BuildShortcut();
@@ -328,7 +329,7 @@ void PathFinder::BuildPolyPath(const Vector3 &startPos, const Vector3 &endPos)
 
         // generate suffix
         uint32 suffixPolyLength = 0;
-        dtStatus dtResult = m_navMeshQuery->findPath(
+        dtResult = m_navMeshQuery->findPath(
                                 suffixStartPoly,    // start polygon
                                 endPoly,            // end polygon
                                 suffixEndPoint,     // start position
@@ -338,7 +339,7 @@ void PathFinder::BuildPolyPath(const Vector3 &startPos, const Vector3 &endPos)
                                 (int*)&suffixPolyLength,
                                 MAX_PATH_LENGTH-prefixPolyLength);   // max number of polygons in output path
 
-        if (!suffixPolyLength || dtResult != DT_SUCCESS)
+        if (!suffixPolyLength || dtStatusFailed(dtResult))
         {
             // this is probably an error state, but we'll leave it
             // and hopefully recover on the next Update
@@ -362,7 +363,7 @@ void PathFinder::BuildPolyPath(const Vector3 &startPos, const Vector3 &endPos)
         // free and invalidate old path data
         clear();
 
-        dtStatus dtResult = m_navMeshQuery->findPath(
+        dtResult = m_navMeshQuery->findPath(
                 startPoly,          // start polygon
                 endPoly,            // end polygon
                 startPoint,         // start position
@@ -372,7 +373,7 @@ void PathFinder::BuildPolyPath(const Vector3 &startPos, const Vector3 &endPos)
                 (int*)&m_polyLength,
                 MAX_PATH_LENGTH);   // max number of polygons in output path
 
-        if (!m_polyLength || dtResult != DT_SUCCESS)
+        if (!m_polyLength || dtStatusFailed(dtResult))
         {
             // only happens if we passed bad data to findPath(), or navmesh is messed up
             sLog.outError("%u's Path Build failed: 0 length path", m_sourceUnit->GetGUIDLow());
@@ -392,9 +393,9 @@ void PathFinder::BuildPolyPath(const Vector3 &startPos, const Vector3 &endPos)
     BuildPointPath(startPoint, endPoint);
 }
 
-void PathFinder::BuildPointPath(const float *startPoint, const float *endPoint)
+void PathFinder::BuildPointPath(const float* startPoint, const float* endPoint)
 {
-    float pathPoints[MAX_POINT_PATH_LENGTH*VERTEX_SIZE];
+    float pathPoints[MAX_POINT_PATH_LENGTH * VERTEX_SIZE];
     uint32 pointCount = 0;
     dtStatus dtResult = DT_FAILURE;
     if (m_useStraightPath)
@@ -422,7 +423,7 @@ void PathFinder::BuildPointPath(const float *startPoint, const float *endPoint)
                 m_pointPathLimit);    // maximum number of points
     }
 
-    if (pointCount < 2 || dtResult != DT_SUCCESS)
+    if (pointCount < 2 || dtStatusFailed(dtResult))
     {
         // only happens if pass bad data to findStraightPath or navmesh is broken
         // single point paths can be generated here
@@ -433,19 +434,59 @@ void PathFinder::BuildPointPath(const float *startPoint, const float *endPoint)
         return;
     }
 
-    m_pathPoints.resize(pointCount);
+    uint32 tempPointCounter = 2;
+    uint8  cutLimit         = 0;
+
+    PointsArray    tempPathPoints;
+    tempPathPoints.resize(pointCount);
+
+    for (uint32 i = 0; i < pointCount; ++i)
+        tempPathPoints[i] = Vector3(pathPoints[i*VERTEX_SIZE+2], pathPoints[i*VERTEX_SIZE], pathPoints[i*VERTEX_SIZE+1]);
+
+    // Optimize points
+    for (uint32 i = 1; i < pointCount - 1; ++i)
+    {
+        G3D::Vector3 p  = tempPathPoints[i];     // Point        
+        G3D::Vector3 p1 = tempPathPoints[i - 1]; // PrevPoint
+        G3D::Vector3 p2 = tempPathPoints[i + 1]; // NextPoint
+
+        float line = (p1.y - p2.y) * p.x + (p2.x - p1.x) * p.y + (p1.x * p2.y - p2.x * p1.y);
+
+        if (fabs(line) < LINE_FAULT && cutLimit < SKIP_POINT_LIMIT)
+        {
+            tempPathPoints[i] = Vector3(0, 0, 0);
+            ++cutLimit;
+        }
+        else
+        {
+            ++tempPointCounter;
+            cutLimit = 0;
+        }
+    }
+
+    m_pathPoints.resize(tempPointCounter);
+
+    uint32 b = 0;
     for (uint32 i = 0; i < pointCount; ++i)
-        m_pathPoints[i] = Vector3(pathPoints[i*VERTEX_SIZE+2], pathPoints[i*VERTEX_SIZE], pathPoints[i*VERTEX_SIZE+1]);
+    {
+        if (tempPathPoints[i] != Vector3(0, 0, 0))
+        {
+            m_pathPoints[b] = tempPathPoints[i];
+            ++b;
+        }
+    }
+
+    pointCount = tempPointCounter;
 
     // first point is always our current location - we need the next one
-    setActualEndPosition(m_pathPoints[pointCount-1]);
+    setActualEndPosition(m_pathPoints[pointCount - 1]);
 
     // force the given destination, if needed
-    if(m_forceDestination &&
+    if (m_forceDestination &&
         (!(m_type & PATHFIND_NORMAL) || !inRange(getEndPosition(), getActualEndPosition(), 1.0f, 1.0f)))
     {
         // we may want to keep partial subpath
-        if(dist3DSqr(getActualEndPosition(), getEndPosition()) <
+        if (dist3DSqr(getActualEndPosition(), getEndPosition()) <
             0.3f * dist3DSqr(getStartPosition(), getEndPosition()))
         {
             setActualEndPosition(getEndPosition());
@@ -524,9 +565,10 @@ void PathFinder::updateFilter()
 NavTerrain PathFinder::getNavTerrain(float x, float y, float z)
 {
     GridMapLiquidData data;
-    m_sourceUnit->GetTerrain()->getLiquidStatus(x, y, z, MAP_ALL_LIQUIDS, &data);
+    if (m_sourceUnit->GetTerrain()->getLiquidStatus(x, y, z, MAP_ALL_LIQUIDS, &data) == LIQUID_MAP_NO_WATER)
+        return NAV_GROUND;
 
-    switch (data.type)
+    switch (data.type_flags)
     {
         case MAP_LIQUID_TYPE_WATER:
         case MAP_LIQUID_TYPE_OCEAN:
@@ -546,7 +588,7 @@ bool PathFinder::HaveTile(const Vector3 &p) const
     float point[VERTEX_SIZE] = {p.y, p.z, p.x};
 
     m_navMesh->calcTileLoc(point, &tx, &ty);
-    return (m_navMesh->getTileAt(tx, ty) != NULL);
+    return (m_navMesh->getTileAt(tx, ty, 0) != NULL); // Don't use layer so always set to 0
 }
 
 uint32 PathFinder::fixupCorridor(dtPolyRef* path, uint32 npath, uint32 maxPath,
@@ -580,10 +622,10 @@ uint32 PathFinder::fixupCorridor(dtPolyRef* path, uint32 npath, uint32 maxPath,
 
     // Adjust beginning of the buffer to include the visited.
     uint32 req = nvisited - furthestVisited;
-    uint32 orig = uint32(furthestPath+1) < npath ? furthestPath+1 : npath;
-    uint32 size = npath-orig > 0 ? npath-orig : 0;
-    if (req+size > maxPath)
-        size = maxPath-req;
+    uint32 orig = uint32(furthestPath + 1) < npath ? furthestPath + 1 : npath;
+    uint32 size = npath > orig ? npath - orig : 0;
+    if (req + size > maxPath)
+        size = maxPath - req;
 
     if (size)
         memmove(path+req, path+orig, size*sizeof(dtPolyRef));
@@ -607,7 +649,7 @@ bool PathFinder::getSteerTarget(const float* startPos, const float* endPos,
     uint32 nsteerPath = 0;
     dtStatus dtResult = m_navMeshQuery->findStraightPath(startPos, endPos, path, pathSize,
                                                 steerPath, steerPathFlags, steerPathPolys, (int*)&nsteerPath, MAX_STEER_POINTS);
-    if (!nsteerPath || DT_SUCCESS != dtResult)
+    if (!nsteerPath || dtStatusFailed(dtResult))
         return false;
 
     // Find vertex far enough to steer to.
@@ -618,7 +660,7 @@ bool PathFinder::getSteerTarget(const float* startPos, const float* endPos,
         if ((steerPathFlags[ns] & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ||
             !inRangeYZX(&steerPath[ns*VERTEX_SIZE], startPos, minTargetDist, 1000.0f))
             break;
-        ns++;
+        ++ns;
     }
     // Failed to find good point to steer to.
     if (ns >= nsteerPath)
@@ -644,14 +686,16 @@ dtStatus PathFinder::findSmoothPath(const float* startPos, const float* endPos,
     uint32 npolys = polyPathSize;
 
     float iterPos[VERTEX_SIZE], targetPos[VERTEX_SIZE];
-    if(DT_SUCCESS != m_navMeshQuery->closestPointOnPolyBoundary(polys[0], startPos, iterPos))
+    dtStatus dtResult = m_navMeshQuery->closestPointOnPolyBoundary(polys[0], startPos, iterPos);
+    if (dtStatusFailed(dtResult))
         return DT_FAILURE;
 
-    if(DT_SUCCESS != m_navMeshQuery->closestPointOnPolyBoundary(polys[npolys-1], endPos, targetPos))
+    dtResult = m_navMeshQuery->closestPointOnPolyBoundary(polys[npolys - 1], endPos, targetPos);
+    if (dtStatusFailed(dtResult))
         return DT_FAILURE;
 
-    dtVcopy(&smoothPath[nsmoothPath*VERTEX_SIZE], iterPos);
-    nsmoothPath++;
+    dtVcopy(&smoothPath[nsmoothPath * VERTEX_SIZE], iterPos);
+    ++nsmoothPath;
 
     // Move towards target a small advancement at a time until target reached or
     // when ran out of memory to store the path.
@@ -702,7 +746,7 @@ dtStatus PathFinder::findSmoothPath(const float* startPos, const float* endPos,
             if (nsmoothPath < maxSmoothPathSize)
             {
                 dtVcopy(&smoothPath[nsmoothPath*VERTEX_SIZE], iterPos);
-                nsmoothPath++;
+                ++nsmoothPath;
             }
             break;
         }
@@ -716,7 +760,7 @@ dtStatus PathFinder::findSmoothPath(const float* startPos, const float* endPos,
             {
                 prevRef = polyRef;
                 polyRef = polys[npos];
-                npos++;
+                ++npos;
             }
 
             for (uint32 i = npos; i < npolys; ++i)
@@ -726,12 +770,13 @@ dtStatus PathFinder::findSmoothPath(const float* startPos, const float* endPos,
 
             // Handle the connection.
             float startPos[VERTEX_SIZE], endPos[VERTEX_SIZE];
-            if (DT_SUCCESS == m_navMesh->getOffMeshConnectionPolyEndPoints(prevRef, polyRef, startPos, endPos))
+            dtResult = m_navMesh->getOffMeshConnectionPolyEndPoints(prevRef, polyRef, startPos, endPos);
+            if (dtStatusSucceed(dtResult))
             {
                 if (nsmoothPath < maxSmoothPathSize)
                 {
-                    dtVcopy(&smoothPath[nsmoothPath*VERTEX_SIZE], startPos);
-                    nsmoothPath++;
+                    dtVcopy(&smoothPath[nsmoothPath * VERTEX_SIZE], startPos);
+                    ++nsmoothPath;
                 }
                 // Move position at the other side of the off-mesh link.
                 dtVcopy(iterPos, endPos);
@@ -745,7 +790,7 @@ dtStatus PathFinder::findSmoothPath(const float* startPos, const float* endPos,
         if (nsmoothPath < maxSmoothPathSize)
         {
             dtVcopy(&smoothPath[nsmoothPath*VERTEX_SIZE], iterPos);
-            nsmoothPath++;
+            ++nsmoothPath;
         }
     }
 
diff --git a/src/game/PathFinder.h b/src/game/PathFinder.h
index f1145211cd8..7aa70795f64 100644
--- a/src/game/PathFinder.h
+++ b/src/game/PathFinder.h
@@ -39,6 +39,11 @@ class Unit;
 #define SMOOTH_PATH_STEP_SIZE   4.0f
 #define SMOOTH_PATH_SLOP        0.3f
 
+// How many points can be cutted
+// May occupt visual bugs when lenght > 20y
+#define SKIP_POINT_LIMIT        6
+#define LINE_FAULT              0.5f
+
 #define VERTEX_SIZE       3
 #define INVALID_POLYREF   0
 
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index 2c521b05898..4c975f2cbfc 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -25,99 +25,103 @@
 #include "Formulas.h"
 #include "SpellAuras.h"
 #include "CreatureAI.h"
+#include "PetAI.h"
 #include "Unit.h"
 #include "Util.h"
 
 Pet::Pet(PetType type) :
 Creature(CREATURE_SUBTYPE_PET),
-m_resetTalentsCost(0), m_resetTalentsTime(0), m_usedTalentCount(0),
-m_removed(false), m_happinessTimer(7500), m_petType(type), m_duration(0),
-m_bonusdamage(0), m_auraUpdateMask(0), m_loading(false),
-m_declinedname(NULL), m_petModeFlags(PET_MODE_DEFAULT)
+m_usedTalentCount(0),
+m_removed(false), m_updated(false), m_happinessTimer(7500), m_petType(type), m_duration(0),
+m_auraUpdateMask(0), m_loading(true), m_needSave(true), m_petFollowAngle(PET_FOLLOW_ANGLE),
+m_petCounter(0), m_PetScalingData(NULL), m_createSpellID(0), m_HappinessState(0),
+m_declinedname(NULL)
 {
-    m_name = "Pet";
-    m_regenTimer = 4000;
+    SetName("Pet");
+    m_regenTimer = REGEN_TIME_FULL;
 
-    // pets always have a charminfo, even if they are not actually charmed
-    CharmInfo* charmInfo = InitCharmInfo(this);
+    m_baseBonusData = new PetScalingData;
 
-    if(type == MINI_PET)                                    // always passive
-        charmInfo->SetReactState(REACT_PASSIVE);
-    else if(type == PROTECTOR_PET)                          // always defensive
-        charmInfo->SetReactState(REACT_DEFENSIVE);
-    else if(type == GUARDIAN_PET)                           // always aggressive
-        charmInfo->SetReactState(REACT_AGGRESSIVE);
+    // pets always have a charminfo, even if they are not actually charmed
+    if (!GetCharmInfo())
+        InitCharmInfo(this);
+
+    if (type == MINI_PET)                                    // always passive
+        GetCharmInfo()->SetState(CHARM_STATE_REACT,REACT_PASSIVE);
+    else if (type == PROTECTOR_PET)                           // always defensive
+        GetCharmInfo()->SetState(CHARM_STATE_REACT,REACT_DEFENSIVE);
+    else if (type == GUARDIAN_PET)                           // always aggressive
+        GetCharmInfo()->SetState(CHARM_STATE_REACT,REACT_AGGRESSIVE);
 }
 
 Pet::~Pet()
 {
-    delete m_declinedname;
-}
+    m_spells.clear();
 
-void Pet::AddToWorld()
-{
-    ///- Register the pet for guid lookup
-    if(!IsInWorld())
-        GetMap()->GetObjectsStore().insert<Pet>(GetObjectGuid(), (Pet*)this);
+    while (!m_scalingQueue.empty())
+        m_scalingQueue.pop();
 
-    Unit::AddToWorld();
-}
+    delete m_declinedname;
 
-void Pet::RemoveFromWorld()
-{
-    ///- Remove the pet from the accessor
-    if(IsInWorld())
-        GetMap()->GetObjectsStore().erase<Pet>(GetObjectGuid(), (Pet*)NULL);
+    if (m_PetScalingData)
+        delete m_PetScalingData;
+
+    if (m_baseBonusData)
+        delete m_baseBonusData;
 
-    ///- Don't call the function for Creature, normal mobs + totems go in a different storage
-    Unit::RemoveFromWorld();
+    m_removed = true;
 }
 
-bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool current )
+bool Pet::LoadPetFromDB(Player* owner, uint32 petentry, uint32 petnumber, bool current, CreatureCreatePos* pos)
 {
     m_loading = true;
 
     uint32 ownerid = owner->GetGUIDLow();
 
-    QueryResult *result;
+    QueryResult* result;
 
     if (petnumber)
-        // known petnumber entry                  0   1      2(?)   3        4      5    6           7     8     9        10         11       12            13      14        15                 16                 17              18
-        result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType "
+        // known petnumber entry                  0   1      2(?)   3        4      5    6           7     8     9        10         11       12            13      14        15              16
+        result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, CreatedBySpell, PetType "
             "FROM character_pet WHERE owner = '%u' AND id = '%u'",
             ownerid, petnumber);
     else if (current)
-        // current pet (slot 0)                   0   1      2(?)   3        4      5    6           7     8     9        10         11       12            13      14        15                 16                 17              18
-        result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType "
+        // current pet (slot 0)                   0   1      2(?)   3        4      5    6           7     8     9        10         11       12            13      14        15              16
+        result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, CreatedBySpell, PetType "
             "FROM character_pet WHERE owner = '%u' AND slot = '%u'",
-            ownerid, PET_SAVE_AS_CURRENT );
+            ownerid, PET_SAVE_AS_CURRENT);
     else if (petentry)
         // known petentry entry (unique for summoned pet, but non unique for hunter pet (only from current or not stabled pets)
-        //                                        0   1      2(?)   3        4      5    6           7     8     9        10         11       12           13       14        15                 16                 17              18
-        result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType "
+        //                                        0   1      2(?)   3        4      5    6           7     8     9        10         11       12           13       14        15              16
+        result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, CreatedBySpell, PetType "
             "FROM character_pet WHERE owner = '%u' AND entry = '%u' AND (slot = '%u' OR slot > '%u') ",
-            ownerid, petentry,PET_SAVE_AS_CURRENT,PET_SAVE_LAST_STABLE_SLOT);
+            ownerid, petentry, PET_SAVE_AS_CURRENT, PET_SAVE_LAST_STABLE_SLOT);
     else
         // any current or other non-stabled pet (for hunter "call pet")
-        //                                        0   1      2(?)   3        4      5    6           7     8     9        10         11       12            13      14        15                 16                 17              18
-        result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType "
+        //                                        0   1      2(?)   3        4      5    6           7     8     9        10         11       12            13      14        15              16
+        result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, CreatedBySpell, PetType "
             "FROM character_pet WHERE owner = '%u' AND (slot = '%u' OR slot > '%u') ",
-            ownerid,PET_SAVE_AS_CURRENT,PET_SAVE_LAST_STABLE_SLOT);
+            ownerid, PET_SAVE_AS_CURRENT, PET_SAVE_LAST_STABLE_SLOT);
 
-    if(!result)
+    if (!result)
         return false;
 
-    Field *fields = result->Fetch();
+    Field* fields = result->Fetch();
+
+    uint32 pet_number = fields[0].GetUInt32();
 
     // update for case of current pet "slot = 0"
     petentry = fields[1].GetUInt32();
+
+    PetSaveMode savemode = PetSaveMode(fields[7].GetUInt32());
+
     if (!petentry)
     {
         delete result;
         return false;
     }
 
-    CreatureInfo const *creatureInfo = ObjectMgr::GetCreatureTemplate(petentry);
+    CreatureInfo const* creatureInfo = ObjectMgr::GetCreatureTemplate(petentry);
     if (!creatureInfo)
     {
         sLog.outError("Pet entry %u does not exist but used at pet load (owner: %s).", petentry, owner->GetGuidStr().c_str());
@@ -125,21 +129,9 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
         return false;
     }
 
+    setPetType(PetType(fields[16].GetUInt8()));
 
-    uint32 summon_spell_id = fields[17].GetUInt32();
-    SpellEntry const* spellInfo = sSpellStore.LookupEntry(summon_spell_id);
-
-    bool is_temporary_summoned = spellInfo && GetSpellDuration(spellInfo) > 0;
-
-    // check temporary summoned pets like mage water elemental
-    if (current && is_temporary_summoned)
-    {
-        delete result;
-        return false;
-    }
-
-    PetType pet_type = PetType(fields[18].GetUInt8());
-    if(pet_type == HUNTER_PET)
+    if (getPetType() == HUNTER_PET)
     {
         if (!creatureInfo->isTameable(owner->CanTameExoticPets()))
         {
@@ -148,7 +140,18 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
         }
     }
 
-    uint32 pet_number = fields[0].GetUInt32();
+    if (!GetCreateSpellID())
+        SetCreateSpellID(fields[15].GetUInt32());
+
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(GetCreateSpellID());
+
+    uint32 timediff = uint32(uint64(time(NULL)) - fields[14].GetUInt64());
+
+    if (spellInfo && GetSpellDuration(spellInfo) > 0)
+    {
+        uint32 duration = (GetSpellDuration(spellInfo) > (int32)timediff * IN_MILLISECONDS) ? GetSpellDuration(spellInfo) - timediff * IN_MILLISECONDS : GetSpellDuration(spellInfo);
+        SetDuration(duration);
+    }
 
     if (current && owner->IsPetNeedBeTemporaryUnsummoned())
     {
@@ -157,59 +160,72 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
         return false;
     }
 
-    Map *map = owner->GetMap();
+    SetPetFollowAngle(getPetType() == MINI_PET ? M_PI_F * 1.25f : PET_FOLLOW_ANGLE * (1 - GetPetCounter()));
 
-    CreatureCreatePos pos(owner, owner->GetOrientation(), PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
+    CreatureCreatePos* temp_pos = NULL;
+    if (!pos)
+        pos = temp_pos = new CreatureCreatePos(owner, owner->GetOrientation(), PET_FOLLOW_DIST, GetPetFollowAngle());
 
-    uint32 guid = pos.GetMap()->GenerateLocalLowGuid(HIGHGUID_PET);
-    if (!Create(guid, pos, creatureInfo, pet_number))
+    uint32 guid = pos->GetMap()->GenerateLocalLowGuid(HIGHGUID_PET);
+
+    if (!Create(guid, *pos, creatureInfo, pet_number, owner))
     {
         delete result;
+        if (temp_pos)
+            delete temp_pos;
         return false;
     }
+    if (temp_pos)
+        delete temp_pos;
 
-    setPetType(pet_type);
-    setFaction(owner->getFaction());
-    SetUInt32Value(UNIT_CREATED_BY_SPELL, summon_spell_id);
+    SetDisplayId(fields[3].GetUInt32());
+    SetNativeDisplayId(fields[3].GetUInt32());
+    uint32 petlevel = fields[4].GetUInt32();
+    SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+    SetName(std::string(fields[8].GetCppString()));
+    SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, fields[5].GetUInt32());
+    GetCharmInfo()->SetState(fields[6].GetUInt32());
+    GetCharmInfo()->SetState(CHARM_STATE_ACTION, ACTIONS_ENABLE);
 
     // reget for sure use real creature info selected for Pet at load/creating
-    CreatureInfo const *cinfo = GetCreatureInfo();
-    if (cinfo->type == CREATURE_TYPE_CRITTER)
+    CreatureInfo const* cinfo = GetCreatureInfo();
+    if (cinfo->CreatureType == CREATURE_TYPE_CRITTER)
     {
+        LoadCreatureAddon(true);
+        pos->GetMap()->Add((Creature*)this);
         AIM_Initialize();
-        pos.GetMap()->Add((Creature*)this);
         delete result;
         return true;
     }
 
-    m_charmInfo->SetPetNumber(pet_number, IsPermanentPetFor(owner));
-
-    SetOwnerGuid(owner->GetObjectGuid());
-    SetDisplayId(fields[3].GetUInt32());
-    SetNativeDisplayId(fields[3].GetUInt32());
-    uint32 petlevel = fields[4].GetUInt32();
-    SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
-    SetName(fields[8].GetString());
-
     switch (getPetType())
     {
         case SUMMON_PET:
-            petlevel=owner->getLevel();
+            petlevel = owner->getLevel();
+            RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP | UNIT_BYTE2_FLAG_SANCTUARY | UNIT_BYTE2_FLAG_PVP);
+            LoadCreatureAddon(true);
             break;
         case HUNTER_PET:
             SetByteFlag(UNIT_FIELD_BYTES_2, 2, fields[9].GetBool() ? UNIT_CAN_BE_ABANDONED : UNIT_CAN_BE_RENAMED | UNIT_CAN_BE_ABANDONED);
+            RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP | UNIT_BYTE2_FLAG_SANCTUARY | UNIT_BYTE2_FLAG_PVP);
             SetMaxPower(POWER_HAPPINESS, GetCreatePowers(POWER_HAPPINESS));
             SetPower(POWER_HAPPINESS, fields[12].GetUInt32());
-            setPowerType(POWER_FOCUS);
+            SetPowerType(POWER_FOCUS);
             break;
         default:
+            RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP | UNIT_BYTE2_FLAG_SANCTUARY | UNIT_BYTE2_FLAG_PVP);
+            LoadCreatureAddon(true);
             sLog.outError("Pet have incorrect type (%u) for pet loading.", getPetType());
+            break;
     }
 
-    if(owner->IsPvP())
+    if (getFaction() != owner->getFaction())
+        setFaction(owner->getFaction());
+
+    if (owner->IsPvP())
         SetPvP(true);
 
-    if(owner->IsFFAPvP())
+    if (owner->IsFFAPvP())
         SetFFAPvP(true);
 
     SetCanModifyStats(true);
@@ -217,19 +233,15 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
     InitTalentForLevel();                                   // set original talents points before spell loading
 
     SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, uint32(time(NULL)));
-    SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, fields[5].GetUInt32());
-    SetCreatorGuid(owner->GetObjectGuid());
-
-    m_charmInfo->SetReactState(ReactStates(fields[6].GetUInt8()));
 
     uint32 savedhealth = fields[10].GetUInt32();
-    uint32 savedmana = fields[11].GetUInt32();
+    uint32 savedpower = fields[11].GetUInt32();
 
     // set current pet as current
     // 0=current
     // 1..MAX_PET_STABLES in stable slot
     // PET_SAVE_NOT_IN_SLOT(100) = not stable slot (summoning))
-    if (fields[7].GetUInt32() != 0)
+    if (savemode != PET_SAVE_AS_CURRENT)
     {
         CharacterDatabase.BeginTransaction();
 
@@ -246,87 +258,88 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
     }
 
     // load action bar, if data broken will fill later by default spells.
-    if (!is_temporary_summoned)
-        m_charmInfo->LoadPetActionBar(fields[13].GetCppString());
-
-    // since last save (in seconds)
-    uint32 timediff = uint32(time(NULL) - fields[14].GetUInt64());
-
-    m_resetTalentsCost = fields[15].GetUInt32();
-    m_resetTalentsTime = fields[16].GetUInt64();
+    m_charmInfo->LoadPetActionBar(fields[13].GetCppString());
 
+    // Finished use DB data
     delete result;
 
     //load spells/cooldowns/auras
     _LoadAuras(timediff);
+    _LoadSpells();
+    SynchronizeLevelWithOwner();
+    InitLevelupSpellsForLevel();
+    LearnPetPassives();
+    _LoadSpellCooldowns();
 
-    //init AB
-    if (is_temporary_summoned)
-    {
-        // Temporary summoned pets always have initial spell list at load
-        InitPetCreateSpells();
-    }
+    GetMap()->Add((Creature*)this);
+    owner->SetPet(this);                                    // in DB stored only full controlled creature
+
+    if (getPetType() == SUMMON_PET)
+        CastPetAuras(true);
     else
-    {
-        LearnPetPassives();
         CastPetAuras(current);
-    }
 
-    if (getPetType() == SUMMON_PET && !current)             //all (?) summon pets come with full health when called, but not when they are current
-    {
-        SetHealth(GetMaxHealth());
-        SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
-    }
-    else
+    CastPetPassiveAuras(true);
+    CalculateScalingData(true);
+    ApplyAllScalingBonuses(true);
+
+    if (isControlled())
+     //all (?) summon pets come with full health when called, note by virusav
     {
-        SetHealth(savedhealth > GetMaxHealth() ? GetMaxHealth() : savedhealth);
-        SetPower(POWER_MANA, savedmana > GetMaxPower(POWER_MANA) ? GetMaxPower(POWER_MANA) : savedmana);
+        if (getPetType() == HUNTER_PET)
+        {
+            if (savedhealth < 1)
+            {
+                SetDeathState(JUST_DIED);
+                SetHealth(0);
+            }
+            else
+            {
+                SetHealth(savedhealth > GetMaxHealth() ? GetMaxHealth() : savedhealth);
+                SetPower(POWER_MANA, savedpower > GetMaxPower(POWER_MANA) ? GetMaxPower(POWER_MANA) : savedpower);
+            }
+        }
+        else
+        {
+            SetHealth(GetMaxHealth());
+            SetPower(GetPowerType(), GetMaxPower(GetPowerType()));
+        }
     }
 
     AIM_Initialize();
-    map->Add((Creature*)this);
-
-    // Spells should be loaded after pet is added to map, because in CheckCast is check on it
-    _LoadSpells();
-    InitLevelupSpellsForLevel();
-
-    CleanupActionBar();                                     // remove unknown spells from action bar after load
-
-    _LoadSpellCooldowns();
 
-    owner->SetPet(this);                                    // in DB stored only full controlled creature
-    DEBUG_LOG("New Pet has guid %u", GetGUIDLow());
+    DEBUG_LOG("Pet::LoadPetFromDB pet %s successfully loaded", GetGuidStr().c_str());
+    m_loading = false;
 
     if (owner->GetTypeId() == TYPEID_PLAYER)
     {
-        ((Player*)owner)->PetSpellInitialize();
-        if(((Player*)owner)->GetGroup())
-            ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_PET);
-
-        ((Player*)owner)->SendTalentsInfoData(true);
+        CleanupActionBar();                                     // remove unknown spells from action bar after load
+        if (isControlled())
+            SetNeedSave(true);
+        if (isControlled() && !GetPetCounter())
+        {
+            ((Player*)owner)->PetSpellInitialize();
+            ((Player*)owner)->SendTalentsInfoData(true);
+        }
     }
 
     if (owner->GetTypeId() == TYPEID_PLAYER && getPetType() == HUNTER_PET)
     {
         result = CharacterDatabase.PQuery("SELECT genitive, dative, accusative, instrumental, prepositional FROM character_pet_declinedname WHERE owner = '%u' AND id = '%u'", owner->GetGUIDLow(), GetCharmInfo()->GetPetNumber());
-
-        if(result)
+        if (result)
         {
-            if(m_declinedname)
+            if (m_declinedname)
                 delete m_declinedname;
 
             m_declinedname = new DeclinedName;
-            Field *fields2 = result->Fetch();
-            for(int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
+            Field* fields2 = result->Fetch();
+            for (int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
                 m_declinedname->name[i] = fields2[i].GetCppString();
 
             delete result;
         }
     }
 
-    m_loading = false;
-
-    SynchronizeLevelWithOwner();
     return true;
 }
 
@@ -354,11 +367,11 @@ void Pet::SavePetToDB(PetSaveMode mode)
         if (mode == PET_SAVE_REAGENTS)
             mode = PET_SAVE_NOT_IN_SLOT;
         // not save pet as current if another pet temporary unsummoned
-        else if (mode == PET_SAVE_AS_CURRENT && pOwner->GetTemporaryUnsummonedPetNumber() &&
-            pOwner->GetTemporaryUnsummonedPetNumber() != m_charmInfo->GetPetNumber())
+        else if (mode == PET_SAVE_AS_CURRENT && pOwner->GetTemporaryUnsummonedPetCount() &&
+            pOwner->GetTemporaryUnsummonedPetNumber(GetPetCounter()) != m_charmInfo->GetPetNumber())
         {
             // pet will lost anyway at restore temporary unsummoned
-            if(getPetType()==HUNTER_PET)
+            if (getPetType() == HUNTER_PET)
                 return;
 
             // for warlock case
@@ -366,23 +379,23 @@ void Pet::SavePetToDB(PetSaveMode mode)
         }
 
         uint32 curhealth = GetHealth();
-        uint32 curmana = GetPower(POWER_MANA);
+        uint32 curpower = GetPower(GetPowerType());
 
         // stable and not in slot saves
-        if (mode != PET_SAVE_AS_CURRENT)
+        if (getPetType() == HUNTER_PET && mode != PET_SAVE_AS_CURRENT)
             RemoveAllAuras();
 
-        //save pet's data as one single transaction
+        // save pet's data as one single transaction
         CharacterDatabase.BeginTransaction();
+
         _SaveSpells();
         _SaveSpellCooldowns();
         _SaveAuras();
 
         uint32 ownerLow = GetOwnerGuid().GetCounter();
-        // remove current data
-        static SqlStatementID delPet ;
-        static SqlStatementID insPet ;
 
+        // remove current data
+        static SqlStatementID delPet;
         SqlStatement stmt = CharacterDatabase.CreateStatement(delPet, "DELETE FROM character_pet WHERE owner = ? AND id = ?");
         stmt.PExecute(ownerLow, m_charmInfo->GetPetNumber());
 
@@ -390,24 +403,23 @@ void Pet::SavePetToDB(PetSaveMode mode)
         if (mode <= PET_SAVE_LAST_STABLE_SLOT)
         {
             static SqlStatementID updPet ;
-
             stmt = CharacterDatabase.CreateStatement(updPet, "UPDATE character_pet SET slot = ? WHERE owner = ? AND slot = ?");
             stmt.PExecute(uint32(PET_SAVE_NOT_IN_SLOT), ownerLow, uint32(mode));
         }
 
         // prevent existence another hunter pet in PET_SAVE_AS_CURRENT and PET_SAVE_NOT_IN_SLOT
-        if (getPetType()==HUNTER_PET && (mode==PET_SAVE_AS_CURRENT||mode > PET_SAVE_LAST_STABLE_SLOT))
+        if (getPetType() == HUNTER_PET && (mode == PET_SAVE_AS_CURRENT || mode > PET_SAVE_LAST_STABLE_SLOT))
         {
-            static SqlStatementID del ;
-
-            stmt = CharacterDatabase.CreateStatement(del, "DELETE FROM character_pet WHERE owner = ? AND (slot = ? OR slot > ?)");
+            static SqlStatementID delPet2;
+            stmt = CharacterDatabase.CreateStatement(delPet2, "DELETE FROM character_pet WHERE owner = ? AND (slot = ? OR slot > ?)");
             stmt.PExecute(ownerLow, uint32(PET_SAVE_AS_CURRENT), uint32(PET_SAVE_LAST_STABLE_SLOT));
         }
 
         // save pet
-        SqlStatement savePet = CharacterDatabase.CreateStatement(insPet, "INSERT INTO character_pet ( id, entry,  owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, "
-            "curmana, curhappiness, abdata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType) "
-             "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+        static SqlStatementID insPet;
+        SqlStatement savePet = CharacterDatabase.CreateStatement(insPet, "INSERT INTO character_pet (id, entry,  owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, "
+            "curmana, curhappiness, abdata, savetime, CreatedBySpell, PetType) "
+             "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
 
         savePet.addUInt32(m_charmInfo->GetPetNumber());
         savePet.addUInt32(GetEntry());
@@ -415,31 +427,32 @@ void Pet::SavePetToDB(PetSaveMode mode)
         savePet.addUInt32(GetNativeDisplayId());
         savePet.addUInt32(getLevel());
         savePet.addUInt32(GetUInt32Value(UNIT_FIELD_PETEXPERIENCE));
-        savePet.addUInt32(uint32(m_charmInfo->GetReactState()));
+        savePet.addUInt32(uint32(m_charmInfo->GetState()));
         savePet.addUInt32(uint32(mode));
         savePet.addString(m_name);
         savePet.addUInt32(uint32(HasByteFlag(UNIT_FIELD_BYTES_2, 2, UNIT_CAN_BE_RENAMED) ? 0 : 1));
-        savePet.addUInt32((curhealth < 1 ? 1 : curhealth));
-        savePet.addUInt32(curmana);
+        savePet.addUInt32(curhealth < 1 ? (getPetType() == HUNTER_PET ? 0 : 1) : curhealth);
+        savePet.addUInt32(curpower);
         savePet.addUInt32(GetPower(POWER_HAPPINESS));
 
         std::ostringstream ss;
-        for(uint32 i = ACTION_BAR_INDEX_START; i < ACTION_BAR_INDEX_END; ++i)
+        bool needDelimiter = false;
+        for (uint32 i = ACTION_BAR_INDEX_START; i < ACTION_BAR_INDEX_END; ++i)
         {
-            ss << uint32(m_charmInfo->GetActionBarEntry(i)->GetType()) << " "
-               << uint32(m_charmInfo->GetActionBarEntry(i)->GetAction()) << " ";
+            needDelimiter ? ss << ' ' : needDelimiter = true;
+            UnitActionBarEntry const* uabe = m_charmInfo->GetActionBarEntry(i);
+            ss << uint32(uabe->GetType()) << ' ' << uint32(uabe->GetAction());
         };
         savePet.addString(ss);
 
-        savePet.addUInt64(uint64(time(NULL)));
-        savePet.addUInt32(uint32(m_resetTalentsCost));
-        savePet.addUInt64(uint64(m_resetTalentsTime));
-        savePet.addUInt32(GetUInt32Value(UNIT_CREATED_BY_SPELL));
+        savePet.addUInt64((m_duration == 0) ? uint64(time(NULL)) : uint64(time(NULL) - (GetSpellDuration(sSpellStore.LookupEntry(GetCreateSpellID())) - m_duration) / IN_MILLISECONDS));
+        savePet.addUInt32(GetCreateSpellID());
         savePet.addUInt32(uint32(getPetType()));
 
         savePet.Execute();
         CharacterDatabase.CommitTransaction();
     }
+    // delete
     else
     {
         RemoveAllAuras(AURA_REMOVE_BY_DELETE);
@@ -449,7 +462,7 @@ void Pet::SavePetToDB(PetSaveMode mode)
 
 void Pet::DeleteFromDB(uint32 guidlow, bool separate_transaction)
 {
-    if(separate_transaction)
+    if (separate_transaction)
         CharacterDatabase.BeginTransaction();
 
     static SqlStatementID delPet ;
@@ -473,17 +486,17 @@ void Pet::DeleteFromDB(uint32 guidlow, bool separate_transaction)
     stmt = CharacterDatabase.CreateStatement(delSpellCD, "DELETE FROM pet_spell_cooldown WHERE guid = ?");
     stmt.PExecute(guidlow);
 
-    if(separate_transaction)
+    if (separate_transaction)
         CharacterDatabase.CommitTransaction();
 }
 
 void Pet::SetDeathState(DeathState s)                       // overwrite virtual Creature::SetDeathState and Unit::SetDeathState
 {
     Creature::SetDeathState(s);
-    if(getDeathState()==CORPSE)
+    if (getDeathState() == CORPSE)
     {
-        //remove summoned pet (no corpse)
-        if(getPetType()==SUMMON_PET)
+        // remove summoned pet (no corpse)
+        if (getPetType() == SUMMON_PET)
             Unsummon(PET_SAVE_NOT_IN_SLOT);
         // other will despawn at corpse desppawning (Pet::Update code)
         else
@@ -492,15 +505,18 @@ void Pet::SetDeathState(DeathState s)                       // overwrite virtual
             SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE);
             RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
 
-            //lose happiness when died and not in BG/Arena
+            // lose happiness when died and not in BG/Arena
             MapEntry const* mapEntry = sMapStore.LookupEntry(GetMapId());
-            if(!mapEntry || (mapEntry->map_type != MAP_ARENA && mapEntry->map_type != MAP_BATTLEGROUND))
+            if (!mapEntry || (mapEntry->map_type != MAP_ARENA && mapEntry->map_type != MAP_BATTLEGROUND))
                 ModifyPower(POWER_HAPPINESS, -HAPPINESS_LEVEL_SIZE);
 
+//            if (HasSpell(55709))
+//                CastSpell(this, 55709, true);
+
             SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
         }
     }
-    else if(getDeathState()==ALIVE)
+    else if (getDeathState() == ALIVE)
     {
         RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
         CastPetAuras(true);
@@ -509,52 +525,123 @@ void Pet::SetDeathState(DeathState s)                       // overwrite virtual
 
 void Pet::Update(uint32 update_diff, uint32 diff)
 {
-    if(m_removed)                                           // pet already removed, just wait in remove queue, no updates
+    if (!IsInWorld() || m_removed)                          // pet already removed, just wait in remove queue, no updates
+        return;
+
+    if (m_updated)                                          // pet now already upated (in other thread?)
+    {
+        DEBUG_LOG("Pet::Update: %s already in update stage now!", GetGuidStr().c_str());
         return;
+    }
+
+    m_updated = true;
 
-    switch( m_deathState )
+    switch (m_deathState)
     {
         case CORPSE:
         {
             if (m_corpseDecayTimer <= update_diff)
             {
-                MANGOS_ASSERT(getPetType()!=SUMMON_PET && "Must be already removed.");
-                Unsummon(PET_SAVE_NOT_IN_SLOT);             //hunters' pets never get removed because of death, NEVER!
+                if (getPetType() == SUMMON_PET)
+                {
+                    sLog.outError("Pet::Update: %s (owner %s) has CORPSE state, but not must (has type SUMMON_PET). Crush possible later.",
+                        GetGuidStr().c_str(), GetOwner() ? GetOwner()->GetGuidStr().c_str() : "<none>");
+                    RemoveCorpse();
+                    return;
+                }
+
+                Unsummon(PET_SAVE_NOT_IN_SLOT);             // hunters' pets never get removed because of death, NEVER!
                 return;
             }
             break;
         }
         case ALIVE:
+        case GHOULED:
         {
             // unsummon pet that lost owner
             Unit* owner = GetOwner();
-            if (!owner ||
-                (!IsWithinDistInMap(owner, GetMap()->GetVisibilityDistance()) && (owner->GetCharmGuid() && (owner->GetCharmGuid() != GetObjectGuid()))) ||
-                (isControlled() && !owner->GetPetGuid()))
+            if (!owner || !owner->IsInWorld())
+            {
+                sLog.outError("Pet::Update: %s lost owner, removed.", GetGuidStr().c_str());
+                Unsummon(PET_SAVE_NOT_IN_SLOT);
+                return;
+            }
+
+            if (owner->GetMap() != GetMap())
+            {
+                sLog.outError("Pet::Update: %s on other map then owner, removed. Crush possible later!", GetGuidStr().c_str());
+                Unsummon(PET_SAVE_NOT_IN_SLOT, owner);
+                return;
+            }
+
+            // special way for unsummon falled under map pets. need remove ater solving problem with vmaps.
+            if (GetPositionZ() <= INVALID_HEIGHT)
+            {
+                sLog.outError("Pet::Update: %s falled under map, removed. Crush possible later!", GetGuidStr().c_str());
+                Unsummon(PET_SAVE_NOT_IN_SLOT, owner);
+                return;
+            }
+
+            if (!owner->isAlive())
+            {
+                DEBUG_LOG("Pet::Update: Pet's %u owner died, removed.", GetObjectGuid().GetCounter());
+                Unsummon(getPetType() == HUNTER_PET ? PET_SAVE_AS_CURRENT : PET_SAVE_NOT_IN_SLOT, owner);
+                return;
+            }
+
+            if (GetCreator() != GetOwner())
+            {
+                // special way for remove elementals, if totem is dead
+                if (!GetCreator() || !GetCreator()->isAlive())
+                {
+                    Unsummon(PET_SAVE_NOT_IN_SLOT);
+                    return;
+                }
+            }
+
+            if (!IsWithinDistInMap(owner, GetMap()->GetVisibilityDistance()) && !owner->GetCharmGuid().IsEmpty())
             {
-                Unsummon(PET_SAVE_REAGENTS);
+                DEBUG_LOG("Pet::Update: %s lost control, removed. Owner = %u, distance = %g, pet GUID = %u", GetGuidStr().c_str(), owner->GetObjectGuid().GetCounter(), GetDistance2d(owner), owner->GetPetGuid().GetCounter());
+                Unsummon(PET_SAVE_REAGENTS, owner);
                 return;
             }
 
             if (isControlled())
             {
-                if (owner->GetPetGuid() != GetObjectGuid())
+                GuidSet const& groupPets = owner->GetPets();
+                if (groupPets.find(GetObjectGuid()) == groupPets.end())
                 {
+                    sLog.outError("Pet::Update: %s controlled, but not in list, removed.", GetGuidStr().c_str());
                     Unsummon(getPetType() == HUNTER_PET ? PET_SAVE_AS_DELETED : PET_SAVE_NOT_IN_SLOT, owner);
                     return;
                 }
             }
+            else
+            {
+                if (!IsWithinDistInMap(owner, GetMap()->GetVisibilityDistance()))
+                {
+                    sLog.outError("Not controlled %s lost view from owner, removed. Owner %s, distance = %g, pet %s", GetGuidStr().c_str(), owner->GetGuidStr().c_str(), GetDistance2d(owner), owner->GetPetGuid().GetString().c_str());
+                    Unsummon(PET_SAVE_AS_DELETED);
+                    return;
+                }
+            }
 
             if (m_duration > 0)
             {
-                if(m_duration > (int32)update_diff)
+                if (m_duration > (int32)update_diff)
                     m_duration -= (int32)update_diff;
                 else
                 {
-                    Unsummon(getPetType() != SUMMON_PET ? PET_SAVE_AS_DELETED : PET_SAVE_NOT_IN_SLOT, owner);
+                    DEBUG_LOG("%s removed with duration expired.", GetGuidStr().c_str());
+                    if (sWorld.getConfig(CONFIG_BOOL_PET_SAVE_ALL))
+                        Unsummon(bool(GetPetCounter()) ? PET_SAVE_NOT_IN_SLOT : PET_SAVE_AS_CURRENT, owner);
+                    else
+                        Unsummon(PET_SAVE_AS_DELETED, owner);
                     return;
                 }
             }
+
+            RegenerateAll(update_diff);
             break;
         }
         default:
@@ -562,99 +649,41 @@ void Pet::Update(uint32 update_diff, uint32 diff)
     }
 
     Creature::Update(update_diff, diff);
-}
 
-void Pet::RegenerateAll( uint32 update_diff )
-{
-    //regenerate focus for hunter pets or energy for deathknight's ghoul
-    if (m_regenTimer <= update_diff)
+    if (IsInWorld() && isAlive())
     {
-        switch (getPowerType())
+        // Update scaling auras from queue
+        while (!m_scalingQueue.empty())
         {
-            case POWER_FOCUS:
-            case POWER_ENERGY:
-                Regenerate(getPowerType());
-                break;
-            default:
-                break;
+            ApplyScalingBonus(&m_scalingQueue.front());
+            m_scalingQueue.pop();
         }
-
-        if (!isInCombat() || IsPolymorphed())
-            RegenerateHealth();
-
-        RegenerateMana();
-
-        m_regenTimer = 4000;
     }
-    else
-        m_regenTimer -= update_diff;
-
-    if (getPetType() != HUNTER_PET)
-        return;
 
-    if(m_happinessTimer <= update_diff)
-    {
-        LooseHappiness();
-        m_happinessTimer = 7500;
-    }
-    else
-        m_happinessTimer -= update_diff;
+    m_updated = false;
 }
 
-
-void Pet::Regenerate(Powers power)
+void Pet::RegenerateAll(uint32 update_diff)
 {
-    uint32 curValue = GetPower(power);
-    uint32 maxValue = GetMaxPower(power);
-
-    if (curValue >= maxValue)
-        return;
-
-    float addvalue = 0.0f;
-
-    switch (power)
+    // regenerate focus for hunter pets or energy for deathknight's ghoul
+    if (m_regenTimer <= update_diff)
     {
-        case POWER_FOCUS:
-        {
-            // For hunter pets.
-            addvalue = 24 * sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_FOCUS);
-            break;
-        }
-        case POWER_ENERGY:
-        {
-            // For deathknight's ghoul.
-            addvalue = 20;
-            break;
-        }
-        default:
-            return;
-    }
-
-    // Apply modifiers (if any).
-    AuraList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT);
-    for(AuraList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
-        if ((*i)->GetModifier()->m_miscvalue == int32(power))
-            addvalue *= ((*i)->GetModifier()->m_amount + 100) / 100.0f;
+        if (!isInCombat() || IsPolymorphed())
+            RegenerateHealth(REGEN_TIME_FULL);
 
-    ModifyPower(power, (int32)addvalue);
-}
+        RegeneratePower();
 
-void Pet::LooseHappiness()
-{
-    uint32 curValue = GetPower(POWER_HAPPINESS);
-    if (curValue <= 0)
-        return;
-    int32 addvalue = 670;                                   //value is 70/35/17/8/4 (per min) * 1000 / 8 (timer 7.5 secs)
-    if(isInCombat())                                        //we know in combat happiness fades faster, multiplier guess
-        addvalue = int32(addvalue * 1.5);
-    ModifyPower(POWER_HAPPINESS, -addvalue);
+        m_regenTimer = 4000;
+    }
+    else
+        m_regenTimer -= update_diff;
 }
 
 HappinessState Pet::GetHappinessState()
 {
-    if(GetPower(POWER_HAPPINESS) < HAPPINESS_LEVEL_SIZE)
+    if (GetPower(POWER_HAPPINESS) < HAPPINESS_LEVEL_SIZE)
         return UNHAPPY;
-    else if(GetPower(POWER_HAPPINESS) >= HAPPINESS_LEVEL_SIZE * 2)
+    else if (GetPower(POWER_HAPPINESS) >= HAPPINESS_LEVEL_SIZE * 2)
         return HAPPY;
     else
         return CONTENT;
@@ -665,33 +694,33 @@ bool Pet::CanTakeMoreActiveSpells(uint32 spellid)
     uint8  activecount = 1;
     uint32 chainstartstore[ACTIVE_SPELLS_MAX];
 
-    if(IsPassiveSpell(spellid))
+    if (IsPassiveSpell(spellid))
         return true;
 
     chainstartstore[0] = sSpellMgr.GetFirstSpellInChain(spellid);
 
     for (PetSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr)
     {
-        if(itr->second.state == PETSPELL_REMOVED)
+        if (itr->second.state == PETSPELL_REMOVED)
             continue;
 
-        if(IsPassiveSpell(itr->first))
+        if (IsPassiveSpell(itr->first))
             continue;
 
         uint32 chainstart = sSpellMgr.GetFirstSpellInChain(itr->first);
 
         uint8 x;
 
-        for(x = 0; x < activecount; x++)
+        for (x = 0; x < activecount; x++)
         {
-            if(chainstart == chainstartstore[x])
+            if (chainstart == chainstartstore[x])
                 break;
         }
 
-        if(x == activecount)                                //spellchain not yet saved -> add active count
+        if (x == activecount)                                //spellchain not yet saved -> add active count
         {
             ++activecount;
-            if(activecount > ACTIVE_SPELLS_MAX)
+            if (activecount > ACTIVE_SPELLS_MAX)
                 return false;
             chainstartstore[x] = chainstart;
         }
@@ -701,32 +730,33 @@ bool Pet::CanTakeMoreActiveSpells(uint32 spellid)
 
 void Pet::Unsummon(PetSaveMode mode, Unit* owner /*= NULL*/)
 {
+    if (m_removed)
+        return;
+
     if (!owner)
         owner = GetOwner();
 
     CombatStop();
 
-    if(owner)
+    if (owner)
     {
         if (GetOwnerGuid() != owner->GetObjectGuid())
             return;
 
-        Player* p_owner = owner->GetTypeId()==TYPEID_PLAYER ? (Player*)owner : NULL;
+        Player* p_owner = owner->GetTypeId() == TYPEID_PLAYER ? (Player*)owner : NULL;
 
         if (p_owner)
         {
-
             // not save secondary permanent pet as current
-            if (mode == PET_SAVE_AS_CURRENT && p_owner->GetTemporaryUnsummonedPetNumber() &&
-                p_owner->GetTemporaryUnsummonedPetNumber() != GetCharmInfo()->GetPetNumber())
+            if (mode == PET_SAVE_AS_CURRENT && p_owner->GetTemporaryUnsummonedPetCount() &&
+                p_owner->GetTemporaryUnsummonedPetNumber(GetPetCounter()) != m_charmInfo->GetPetNumber())
                 mode = PET_SAVE_NOT_IN_SLOT;
 
+            SpellEntry const* spellInfo = sSpellStore.LookupEntry(GetCreateSpellID());
+
             if (mode == PET_SAVE_REAGENTS)
             {
                 //returning of reagents only for players, so best done here
-                uint32 spellId = GetUInt32Value(UNIT_CREATED_BY_SPELL);
-                SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
-
                 if (spellInfo)
                 {
                     for(uint32 i = 0; i < MAX_SPELL_REAGENTS; ++i)
@@ -746,17 +776,22 @@ void Pet::Unsummon(PetSaveMode mode, Unit* owner /*= NULL*/)
                 }
             }
 
-            if (isControlled())
+            if (isControlled() && !GetPetCounter())
             {
                 p_owner->RemovePetActionBar();
 
                 if (p_owner->GetGroup())
                     p_owner->SetGroupUpdateFlag(GROUP_UPDATE_PET);
+
+                // Special way for remove cooldown if SPELL_ATTR_DISABLED_WHILE_ACTIVE
+                if (spellInfo && spellInfo->HasAttribute(SPELL_ATTR_DISABLED_WHILE_ACTIVE))
+                    if (p_owner->GetTemporaryUnsummonedPetNumber(GetPetCounter()) != m_charmInfo->GetPetNumber())
+                        p_owner->SendCooldownEvent(spellInfo);
             }
         }
 
         // only if current pet in slot
-        switch(getPetType())
+        switch (getPetType())
         {
             case MINI_PET:
                 if (p_owner)
@@ -767,26 +802,29 @@ void Pet::Unsummon(PetSaveMode mode, Unit* owner /*= NULL*/)
                 owner->RemoveGuardian(this);
                 break;
             default:
+                owner->RemovePetFromList(this);
                 if (owner->GetPetGuid() == GetObjectGuid())
                     owner->SetPet(NULL);
                 break;
         }
+
+        if (GetNeedSave())
+            SavePetToDB(mode);
     }
 
-    SavePetToDB(mode);
     AddObjectToRemoveList();
     m_removed = true;
 }
 
 void Pet::GivePetXP(uint32 xp)
 {
-    if(getPetType() != HUNTER_PET)
+    if (getPetType() != HUNTER_PET)
         return;
 
-    if ( xp < 1 )
+    if (xp < 1)
         return;
 
-    if(!isAlive())
+    if (!isAlive())
         return;
 
     uint32 level = getLevel();
@@ -798,9 +836,9 @@ void Pet::GivePetXP(uint32 xp)
 
     uint32 nextLvlXP = GetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP);
     uint32 curXP = GetUInt32Value(UNIT_FIELD_PETEXPERIENCE);
-    uint32 newXP = curXP + xp;
+    uint32 newXP = curXP + xp * sWorld.getConfig(CONFIG_FLOAT_RATE_XP_PETKILL);
 
-    while( newXP >= nextLvlXP && level < maxlevel)
+    while (newXP >= nextLvlXP && level < maxlevel)
     {
         newXP -= nextLvlXP;
         ++level;
@@ -829,271 +867,250 @@ void Pet::GivePetLevel(uint32 level)
     InitTalentForLevel();
 }
 
-bool Pet::CreateBaseAtCreature(Creature* creature)
+bool Pet::CreateBaseAtCreature(Creature* creature, Unit* owner)
 {
-    if(!creature)
+    if (!creature)
     {
         sLog.outError("CRITICAL: NULL pointer passed into CreateBaseAtCreature()");
         return false;
     }
 
-    CreatureCreatePos pos(creature, creature->GetOrientation());
-
-    uint32 guid = creature->GetMap()->GenerateLocalLowGuid(HIGHGUID_PET);
-
-    BASIC_LOG("Create pet");
-    uint32 pet_number = sObjectMgr.GeneratePetNumber();
-    if (!Create(guid, pos, creature->GetCreatureInfo(), pet_number))
+    if (!owner)
         return false;
 
-    CreatureInfo const *cinfo = GetCreatureInfo();
-    if(!cinfo)
+    CreatureInfo const* cinfo = creature->GetCreatureInfo();
+    if (!cinfo)
     {
         sLog.outError("CreateBaseAtCreature() failed, creatureInfo is missing!");
         return false;
     }
 
-    if(cinfo->type == CREATURE_TYPE_CRITTER)
-    {
-        setPetType(MINI_PET);
-        return true;
-    }
-    SetDisplayId(creature->GetDisplayId());
-    SetNativeDisplayId(creature->GetNativeDisplayId());
-    SetMaxPower(POWER_HAPPINESS, GetCreatePowers(POWER_HAPPINESS));
-    SetPower(POWER_HAPPINESS, 166500);
-    setPowerType(POWER_FOCUS);
-    SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, 0);
-    SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0);
-    SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, sObjectMgr.GetXPForPetLevel(creature->getLevel()));
-    SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+    CreatureCreatePos pos(creature, creature->GetOrientation());
+
+    BASIC_LOG("%s create new pet from creature %d ", owner->GetGuidStr().c_str(), creature->GetEntry());
 
-    if(CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cinfo->family))
+    BASIC_LOG("Create pet");
+
+    if (!Create(0, pos, cinfo, 0, owner))
+        return false;
+
+    if (CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cinfo->Family))
         SetName(cFamily->Name[sWorld.GetDefaultDbcLocale()]);
     else
         SetName(creature->GetNameForLocaleIdx(sObjectMgr.GetDBCLocaleIndex()));
 
-    if(cinfo->type == CREATURE_TYPE_BEAST)
+
+    if (cinfo->CreatureType == CREATURE_TYPE_CRITTER)
+    {
+        setPetType(MINI_PET);
+        return true;
+    }
+
+    if (cinfo->CreatureType == CREATURE_TYPE_BEAST)
     {
-        SetByteValue(UNIT_FIELD_BYTES_0, 1, CLASS_WARRIOR);
-        SetByteValue(UNIT_FIELD_BYTES_0, 2, GENDER_NONE);
-        SetByteValue(UNIT_FIELD_BYTES_0, 3, POWER_FOCUS);
-        SetSheath(SHEATH_STATE_MELEE);
-        SetByteFlag(UNIT_FIELD_BYTES_2, 2, UNIT_CAN_BE_RENAMED | UNIT_CAN_BE_ABANDONED);
         SetUInt32Value(UNIT_MOD_CAST_SPEED, creature->GetUInt32Value(UNIT_MOD_CAST_SPEED));
     }
+
+    SetDisplayId(creature->GetDisplayId());
+    SetNativeDisplayId(creature->GetNativeDisplayId());
+
     return true;
 }
 
 bool Pet::InitStatsForLevel(uint32 petlevel, Unit* owner)
 {
-    CreatureInfo const *cinfo = GetCreatureInfo();
+    CreatureInfo const* cinfo = GetCreatureInfo();
     MANGOS_ASSERT(cinfo);
 
-    if(!owner)
+    if (!owner)
     {
         owner = GetOwner();
-        if(!owner)
+        if (!owner)
         {
             sLog.outError("attempt to summon pet (Entry %u) without owner! Attempt terminated.", cinfo->Entry);
             return false;
         }
     }
 
-    uint32 creature_ID = (getPetType() == HUNTER_PET) ? 1 : cinfo->Entry;
+    if (!petlevel)
+        petlevel = owner->getLevel();
+
+    SetLevel(petlevel);
+
+    PetLevelInfo const* pInfo = sObjectMgr.GetPetLevelInfo(cinfo->Entry, petlevel);
+
+    SetMeleeDamageSchool(SpellSchools(cinfo->DamageSchool));
+
+    int32 createStats[MAX_STATS+7] =  {22,     // STAT_STRENGTH
+                                       22,     // STAT_AGILITY
+                                       25,     // STAT_STAMINA
+                                       28,     // STAT_INTELLECT
+                                       27,     // STAT_SPIRIT
+                                       42,     // Base HEALTH
+                                       20,     // Base POWER/MANA
+                                       10,     // Base AttackPower
+                                       5,      // Base MinDamage
+                                       10,     // Base MaxDamage
+                                       1,      // Base MinRangeDamage
+                                       3};     // Base MaxRangeDamage
+
+    uint32 createResistance[MAX_SPELL_SCHOOL] = {0,0,0,0,0,0,0};
+
+    createResistance[SPELL_SCHOOL_HOLY]   = cinfo->ResistanceHoly;
+    createResistance[SPELL_SCHOOL_FIRE]   = cinfo->ResistanceFire;
+    createResistance[SPELL_SCHOOL_NATURE] = cinfo->ResistanceNature;
+    createResistance[SPELL_SCHOOL_FROST]  = cinfo->ResistanceFrost;
+    createResistance[SPELL_SCHOOL_SHADOW] = cinfo->ResistanceShadow;
+    createResistance[SPELL_SCHOOL_ARCANE] = cinfo->ResistanceArcane;
+    // Armor
+    createResistance[SPELL_SCHOOL_NORMAL] = int32(cinfo->Armor  * petlevel / cinfo->MaxLevel / (1 +  cinfo->Rank));
+
+    for (int i = 0; i < MAX_STATS; ++i)
+        createStats[i] *= petlevel/10;
+
+    createStats[MAX_STATS]    = int32(cinfo->MaxLevelHealth * petlevel / cinfo->MaxLevel / (1 +  cinfo->Rank));
+    createStats[MAX_STATS+1]  = int32(cinfo->MaxLevelMana * petlevel / cinfo->MaxLevel / (1 +  cinfo->Rank));
+    createStats[MAX_STATS+2]  = int32(cinfo->MeleeAttackPower * petlevel / cinfo->MaxLevel / (1 +  cinfo->Rank));
+    createStats[MAX_STATS+3]  = int32(cinfo->MinMeleeDmg * petlevel / cinfo->MaxLevel / (1 + cinfo->Rank));
+    createStats[MAX_STATS+4]  = int32(cinfo->MaxMeleeDmg * petlevel / cinfo->MaxLevel / (1 + cinfo->Rank));
+    createStats[MAX_STATS+5]  = int32(cinfo->MinRangedDmg * petlevel / cinfo->MaxLevel/ (1 + cinfo->Rank));
+    createStats[MAX_STATS+6]  = int32(cinfo->MaxRangedDmg * petlevel / cinfo->MaxLevel/ (1 + cinfo->Rank));
+    SetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, float(cinfo->MaxRangedDmg * petlevel / cinfo->MaxLevel));
+
+    SetAttackTime(BASE_ATTACK, cinfo->MeleeBaseAttackTime);
+    SetAttackTime(RANGED_ATTACK, cinfo->RangedBaseAttackTime);
 
     switch (getPetType())
     {
         case SUMMON_PET:
+        {
             SetByteValue(UNIT_FIELD_BYTES_0, 1, CLASS_MAGE);
-
-            // this enables popup window (pet dismiss, cancel)
-            SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+            if (cinfo->Family == CREATURE_FAMILY_GHOUL)
+                SetPowerType(POWER_ENERGY);
             break;
+        }
         case HUNTER_PET:
+        {
+            if (!pInfo)         //If no pet levelstats in DB - use 1 for default hunter pet
+                pInfo = sObjectMgr.GetPetLevelInfo(1, petlevel);
+
             SetByteValue(UNIT_FIELD_BYTES_0, 1, CLASS_WARRIOR);
             SetByteValue(UNIT_FIELD_BYTES_0, 2, GENDER_NONE);
             SetSheath(SHEATH_STATE_MELEE);
 
-            // this enables popup window (pet abandon, cancel)
-            SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+            CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cinfo->Family);
+            if (cFamily && cFamily->minScale > 0.0f && getPetType()==HUNTER_PET)
+            {
+                float scale;
+                if (getLevel() >= cFamily->maxScaleLevel)
+                    scale = cFamily->maxScale;
+                else if (getLevel() <= cFamily->minScaleLevel)
+                    scale = cFamily->minScale;
+                else
+                    scale = cFamily->minScale + float(getLevel() - cFamily->minScaleLevel) / cFamily->maxScaleLevel * (cFamily->maxScale - cFamily->minScale);
+
+                SetObjectScale(scale);
+                UpdateModelData();
+            }
+
+            SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, sObjectMgr.GetXPForPetLevel(petlevel));
+            SetPowerType(POWER_FOCUS);
+            break;
+        }
+        case GUARDIAN_PET:
+        case PROTECTOR_PET:
+        {
+            SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0);
+            SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, 1000);
+            // DK ghouls have energy
+            if (cinfo->Family == CREATURE_FAMILY_GHOUL)
+                SetPowerType(POWER_ENERGY);
+            break;
+        }
+        default:
+        {
+            sLog.outError("Pet have incorrect type (%u) for levelup.", getPetType());
+            return true;
             break;
+        }
     }
 
-    SetLevel(petlevel);
+    if (pInfo)                                       // exist in DB
+    {
+        if (pInfo->health)
+            SetCreateHealth(pInfo->health);
+        else
+            SetCreateHealth(createStats[MAX_STATS]);
 
-    SetMeleeDamageSchool(SpellSchools(cinfo->dmgschool));
+        if (pInfo->mana)
+            SetCreateMana(pInfo->mana);
+        else
+            SetCreateMana(createStats[MAX_STATS+1]);
 
-    SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE, float(petlevel*50));
+        if (pInfo->armor)
+            SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE, float(pInfo->armor));
+        else
+            SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE,  float(createResistance[SPELL_SCHOOL_NORMAL]));
 
-    SetAttackTime(BASE_ATTACK, BASE_ATTACK_TIME);
-    SetAttackTime(OFF_ATTACK, BASE_ATTACK_TIME);
-    SetAttackTime(RANGED_ATTACK, BASE_ATTACK_TIME);
+        for(int i = STAT_STRENGTH; i < MAX_STATS; ++i)
+            if (pInfo->stats[i])
+               SetCreateStat(Stats(i), float(pInfo->stats[i]));
+            else
+               SetCreateStat(Stats(i), float(createStats[i]));
 
-    SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0);
+        if (pInfo->attackpower)
+            SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, float(pInfo->attackpower));
+        else
+            SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, float(createStats[MAX_STATS+2]));
 
-    CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cinfo->family);
-    if(cFamily && cFamily->minScale > 0.0f && getPetType()==HUNTER_PET)
-    {
-        float scale;
-        if (getLevel() >= cFamily->maxScaleLevel)
-            scale = cFamily->maxScale;
-        else if (getLevel() <= cFamily->minScaleLevel)
-            scale = cFamily->minScale;
+        if (pInfo->mindmg)
+            SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(pInfo->mindmg));
         else
-            scale = cFamily->minScale + float(getLevel() - cFamily->minScaleLevel) / cFamily->maxScaleLevel * (cFamily->maxScale - cFamily->minScale);
+            SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(createStats[MAX_STATS+3]));
 
-        SetObjectScale(scale);
-        UpdateModelData();
-    }
-    m_bonusdamage = 0;
+        if (pInfo->maxdmg)
+            SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(pInfo->maxdmg));
+        else
+            SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(createStats[MAX_STATS+4]));
 
-    int32 createResistance[MAX_SPELL_SCHOOL] = {0,0,0,0,0,0,0};
+        SetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE,float(createStats[MAX_STATS+5]));
+        SetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE,float(createStats[MAX_STATS+6]));
 
-    if(getPetType() != HUNTER_PET)
-    {
-        createResistance[SPELL_SCHOOL_HOLY]   = cinfo->resistance1;
-        createResistance[SPELL_SCHOOL_FIRE]   = cinfo->resistance2;
-        createResistance[SPELL_SCHOOL_NATURE] = cinfo->resistance3;
-        createResistance[SPELL_SCHOOL_FROST]  = cinfo->resistance4;
-        createResistance[SPELL_SCHOOL_SHADOW] = cinfo->resistance5;
-        createResistance[SPELL_SCHOOL_ARCANE] = cinfo->resistance6;
+        DEBUG_LOG("Pet %u stats for level initialized (from pet_levelstat values)", cinfo->Entry);
     }
-
-    switch(getPetType())
+    else                                            // not exist in DB, use some default fake data
     {
-        case SUMMON_PET:
-        {
-            if(owner->GetTypeId() == TYPEID_PLAYER)
-            {
-                switch(owner->getClass())
-                {
-                    case CLASS_WARLOCK:
-                    {
-
-                        //the damage bonus used for pets is either fire or shadow damage, whatever is higher
-                        uint32 fire  = owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + SPELL_SCHOOL_FIRE);
-                        uint32 shadow = owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + SPELL_SCHOOL_SHADOW);
-                        uint32 val  = (fire > shadow) ? fire : shadow;
-
-                        SetBonusDamage(int32 (val * 0.15f));
-                        //bonusAP += val * 0.57;
-                        break;
-                    }
-                    case CLASS_MAGE:
-                    {
-                                                            //40% damage bonus of mage's frost damage
-                        float val = owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + SPELL_SCHOOL_FROST) * 0.4f;
-                        if(val < 0)
-                            val = 0;
-                        SetBonusDamage( int32(val));
-                        break;
-                    }
-                    default:
-                        break;
-                }
-            }
-
-            SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(petlevel - (petlevel / 4)) );
-            SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel + (petlevel / 4)) );
-
-            //SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, float(cinfo->attackpower));
-
-            PetLevelInfo const* pInfo = sObjectMgr.GetPetLevelInfo(creature_ID, petlevel);
-            if(pInfo)                                       // exist in DB
-            {
-                SetCreateHealth(pInfo->health);
-                SetCreateMana(pInfo->mana);
-
-                if(pInfo->armor > 0)
-                    SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE, float(pInfo->armor));
-
-                for(int stat = 0; stat < MAX_STATS; ++stat)
-                {
-                    SetCreateStat(Stats(stat), float(pInfo->stats[stat]));
-                }
-            }
-            else                                            // not exist in DB, use some default fake data
-            {
-                sLog.outErrorDb("Summoned pet (Entry: %u) not have pet stats data in DB",cinfo->Entry);
-
-                // remove elite bonuses included in DB values
-                SetCreateHealth(uint32(((float(cinfo->maxhealth) / cinfo->maxlevel) / (1 + 2 * cinfo->rank)) * petlevel) );
-                SetCreateMana(  uint32(((float(cinfo->maxmana)   / cinfo->maxlevel) / (1 + 2 * cinfo->rank)) * petlevel) );
-
-                SetCreateStat(STAT_STRENGTH, 22);
-                SetCreateStat(STAT_AGILITY, 22);
-                SetCreateStat(STAT_STAMINA, 25);
-                SetCreateStat(STAT_INTELLECT, 28);
-                SetCreateStat(STAT_SPIRIT, 27);
-            }
-            break;
-        }
-        case HUNTER_PET:
-        {
-            SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, sObjectMgr.GetXPForPetLevel(petlevel));
-            //these formula may not be correct; however, it is designed to be close to what it should be
-            //this makes dps 0.5 of pets level
-            SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(petlevel - (petlevel / 4)) );
-            //damage range is then petlevel / 2
-            SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel + (petlevel / 4)) );
-            //damage is increased afterwards as strength and pet scaling modify attack power
-
-            //stored standard pet stats are entry 1 in pet_levelinfo
-            PetLevelInfo const* pInfo = sObjectMgr.GetPetLevelInfo(creature_ID, petlevel);
-            if(pInfo)                                       // exist in DB
-            {
-                SetCreateHealth(pInfo->health);
-                SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE, float(pInfo->armor));
-                //SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, float(cinfo->attackpower));
+        DEBUG_LOG("Summoned pet (Entry: %u) not have pet stats data in DB. Use hardcoded values.",cinfo->Entry);
+        for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
+            SetCreateStat(Stats(i),float(createStats[i]));
 
-                for( int i = STAT_STRENGTH; i < MAX_STATS; ++i)
-                {
-                    SetCreateStat(Stats(i),  float(pInfo->stats[i]));
-                }
-            }
-            else                                            // not exist in DB, use some default fake data
-            {
-                sLog.outErrorDb("Hunter pet levelstats missing in DB");
+        SetCreateHealth(createStats[MAX_STATS]);
+        SetCreateMana(createStats[MAX_STATS+1]);
+        SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE,  float(createResistance[SPELL_SCHOOL_NORMAL]));
 
-                // remove elite bonuses included in DB values
-                SetCreateHealth( uint32(((float(cinfo->maxhealth) / cinfo->maxlevel) / (1 + 2 * cinfo->rank)) * petlevel) );
+        SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, float(createStats[MAX_STATS+2]));
 
-                SetCreateStat(STAT_STRENGTH, 22);
-                SetCreateStat(STAT_AGILITY, 22);
-                SetCreateStat(STAT_STAMINA, 25);
-                SetCreateStat(STAT_INTELLECT, 28);
-                SetCreateStat(STAT_SPIRIT, 27);
-            }
-            break;
-        }
-        case GUARDIAN_PET:
-        case PROTECTOR_PET:
-            SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0);
-            SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, 1000);
+        SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(createStats[MAX_STATS+3]));
+        SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(createStats[MAX_STATS+4]));
 
-            SetCreateMana(28 + 10*petlevel);
-            SetCreateHealth(28 + 30*petlevel);
+        SetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, float(createStats[MAX_STATS+5]));
+        SetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, float(createStats[MAX_STATS+6]));
 
-            // FIXME: this is wrong formula, possible each guardian pet have own damage formula
-            //these formula may not be correct; however, it is designed to be close to what it should be
-            //this makes dps 0.5 of pets level
-            SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(petlevel - (petlevel / 4)));
-            //damage range is then petlevel / 2
-            SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel + (petlevel / 4)));
-            break;
-        default:
-            sLog.outError("Pet have incorrect type (%u) for levelup.", getPetType());
-            break;
+        DEBUG_LOG("Pet %u stats for level initialized (from creature_template values)", cinfo->Entry);
     }
 
     for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
         SetModifierValue(UnitMods(UNIT_MOD_RESISTANCE_START + i), BASE_VALUE, float(createResistance[i]));
 
+    SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_PCT, 1.0f);
+    SetAttackTime(OFF_ATTACK, BASE_ATTACK_TIME);
+    SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f);
+
+
     UpdateAllStats();
 
     SetHealth(GetMaxHealth());
-    SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
+    SetPower(GetPowerType(), GetMaxPower(GetPowerType()));
 
     return true;
 }
@@ -1104,11 +1121,11 @@ bool Pet::HaveInDiet(ItemPrototype const* item) const
         return false;
 
     CreatureInfo const* cInfo = GetCreatureInfo();
-    if(!cInfo)
+    if (!cInfo)
         return false;
 
-    CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cInfo->family);
-    if(!cFamily)
+    CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cInfo->Family);
+    if (!cFamily)
         return false;
 
     uint32 diet = cFamily->petFoodMask;
@@ -1119,13 +1136,13 @@ bool Pet::HaveInDiet(ItemPrototype const* item) const
 uint32 Pet::GetCurrentFoodBenefitLevel(uint32 itemlevel)
 {
     // -5 or greater food level
-    if(getLevel() <= itemlevel + 5)                         //possible to feed level 60 pet with level 55 level food for full effect
+    if (getLevel() <= itemlevel + 5)                         //possible to feed level 60 pet with level 55 level food for full effect
         return 35000;
     // -10..-6
-    else if(getLevel() <= itemlevel + 10)                   //pure guess, but sounds good
+    else if (getLevel() <= itemlevel + 10)                   //pure guess, but sounds good
         return 17000;
     // -14..-11
-    else if(getLevel() <= itemlevel + 14)                   //level 55 food gets green on 70, makes sense to me
+    else if (getLevel() <= itemlevel + 14)                   //level 55 food gets green on 70, makes sense to me
         return 8000;
     // -15 or less
     else
@@ -1134,12 +1151,10 @@ uint32 Pet::GetCurrentFoodBenefitLevel(uint32 itemlevel)
 
 void Pet::_LoadSpellCooldowns()
 {
-    m_CreatureSpellCooldowns.clear();
-    m_CreatureCategoryCooldowns.clear();
-
-    QueryResult *result = CharacterDatabase.PQuery("SELECT spell,time FROM pet_spell_cooldown WHERE guid = '%u'",m_charmInfo->GetPetNumber());
+    RemoveAllSpellCooldown();
 
-    if(result)
+    QueryResult* result = CharacterDatabase.PQuery("SELECT spell,time FROM pet_spell_cooldown WHERE guid = '%u'",m_charmInfo->GetPetNumber());
+    if (result)
     {
         time_t curTime = time(NULL);
 
@@ -1149,33 +1164,33 @@ void Pet::_LoadSpellCooldowns()
 
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             uint32 spell_id = fields[0].GetUInt32();
             time_t db_time  = (time_t)fields[1].GetUInt64();
 
-            if(!sSpellStore.LookupEntry(spell_id))
+            if (!sSpellStore.LookupEntry(spell_id))
             {
                 sLog.outError("Pet %u have unknown spell %u in `pet_spell_cooldown`, skipping.",m_charmInfo->GetPetNumber(),spell_id);
                 continue;
             }
 
             // skip outdated cooldown
-            if(db_time <= curTime)
+            if (db_time <= curTime)
                 continue;
 
             data << uint32(spell_id);
-            data << uint32(uint32(db_time-curTime)*IN_MILLISECONDS);
+            data << uint32(uint32(db_time-curTime) * IN_MILLISECONDS);
 
-            _AddCreatureSpellCooldown(spell_id,db_time);
+            AddSpellCooldown(spell_id, 0, db_time);
 
             DEBUG_LOG("Pet (Number: %u) spell %u cooldown loaded (%u secs).", m_charmInfo->GetPetNumber(), spell_id, uint32(db_time-curTime));
         }
-        while( result->NextRow() );
+        while (result->NextRow());
 
         delete result;
 
-        if(!m_CreatureSpellCooldowns.empty() && GetOwner())
+        if (!GetSpellCooldownMap()->empty() && GetOwner())
         {
             ((Player*)GetOwner())->GetSession()->SendPacket(&data);
         }
@@ -1190,35 +1205,34 @@ void Pet::_SaveSpellCooldowns()
     SqlStatement stmt = CharacterDatabase.CreateStatement(delSpellCD, "DELETE FROM pet_spell_cooldown WHERE guid = ?");
     stmt.PExecute(m_charmInfo->GetPetNumber());
 
-    time_t curTime = time(NULL);
-
     // remove oudated and save active
-    for(CreatureSpellCooldowns::iterator itr = m_CreatureSpellCooldowns.begin();itr != m_CreatureSpellCooldowns.end();)
+    RemoveOutdatedSpellCooldowns();
+    for(SpellCooldowns::const_iterator itr = GetSpellCooldownMap()->begin();itr != GetSpellCooldownMap()->end(); ++itr)
     {
-        if(itr->second <= curTime)
-            m_CreatureSpellCooldowns.erase(itr++);
-        else
-        {
-            stmt = CharacterDatabase.CreateStatement(insSpellCD, "INSERT INTO pet_spell_cooldown (guid,spell,time) VALUES (?, ?, ?)");
-            stmt.PExecute(m_charmInfo->GetPetNumber(), itr->first, uint64(itr->second));
-            ++itr;
-        }
+        stmt = CharacterDatabase.CreateStatement(insSpellCD, "INSERT INTO pet_spell_cooldown (guid,spell,time) VALUES (?, ?, ?)");
+        stmt.PExecute(m_charmInfo->GetPetNumber(), itr->first, uint64(itr->second.end));
     }
 }
 
 void Pet::_LoadSpells()
 {
-    QueryResult *result = CharacterDatabase.PQuery("SELECT spell,active FROM pet_spell WHERE guid = '%u'",m_charmInfo->GetPetNumber());
+    uint8 spec = 0;
+    if (getPetType() == HUNTER_PET)
+    {
+        Unit* owner = GetOwner();
+        if (owner && owner->GetTypeId() == TYPEID_PLAYER)
+            spec = ((Player*)owner)->GetActiveSpec();
+    }
 
-    if(result)
+    QueryResult* result = CharacterDatabase.PQuery("SELECT spell,active FROM pet_spell WHERE guid = '%u' AND spec = '%u'", m_charmInfo->GetPetNumber(), spec);
+    if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
-
+            Field* fields = result->Fetch();
             addSpell(fields[0].GetUInt32(), ActiveStates(fields[1].GetUInt8()), PETSPELL_UNCHANGED);
         }
-        while( result->NextRow() );
+        while (result->NextRow());
 
         delete result;
     }
@@ -1226,8 +1240,16 @@ void Pet::_LoadSpells()
 
 void Pet::_SaveSpells()
 {
-    static SqlStatementID delSpell ;
-    static SqlStatementID insSpell ;
+    static SqlStatementID delSpell;
+    static SqlStatementID insSpell;
+
+    uint8 spec = 0;
+    if (getPetType() == HUNTER_PET)
+    {
+        Unit* owner = GetOwner();
+        if (owner && owner->GetTypeId() == TYPEID_PLAYER)
+            spec = ((Player*)owner)->GetActiveSpec();
+    }
 
     for (PetSpellMap::iterator itr = m_spells.begin(), next = m_spells.begin(); itr != m_spells.end(); itr = next)
     {
@@ -1237,30 +1259,30 @@ void Pet::_SaveSpells()
         if (itr->second.type == PETSPELL_FAMILY)
             continue;
 
-        switch(itr->second.state)
+        switch (itr->second.state)
         {
             case PETSPELL_REMOVED:
-                {
-                    SqlStatement stmt = CharacterDatabase.CreateStatement(delSpell, "DELETE FROM pet_spell WHERE guid = ? and spell = ?");
-                    stmt.PExecute(m_charmInfo->GetPetNumber(), itr->first);
-                    m_spells.erase(itr);
-                }
+            {
+                CharacterDatabase.CreateStatement(delSpell, "DELETE FROM pet_spell WHERE guid = ? AND spell = ? AND spec = ?")
+                    .PExecute(m_charmInfo->GetPetNumber(), itr->first, spec);
+                m_spells.erase(itr);
                 continue;
+            }
             case PETSPELL_CHANGED:
-                {
-                    SqlStatement stmt = CharacterDatabase.CreateStatement(delSpell, "DELETE FROM pet_spell WHERE guid = ? and spell = ?");
-                    stmt.PExecute(m_charmInfo->GetPetNumber(), itr->first);
+            {
+                CharacterDatabase.CreateStatement(delSpell, "DELETE FROM pet_spell WHERE guid = ? AND spell = ? AND spec = ?")
+                    .PExecute(m_charmInfo->GetPetNumber(), itr->first, spec);
 
-                    stmt = CharacterDatabase.CreateStatement(insSpell, "INSERT INTO pet_spell (guid,spell,active) VALUES (?, ?, ?)");
-                    stmt.PExecute(m_charmInfo->GetPetNumber(), itr->first, uint32(itr->second.active));
-                }
+                CharacterDatabase.CreateStatement(insSpell, "INSERT INTO pet_spell (guid, spell, active, spec) VALUES (?, ?, ?, ?)")
+                    .PExecute(m_charmInfo->GetPetNumber(), itr->first, uint32(itr->second.active), spec);
                 break;
+            }
             case PETSPELL_NEW:
-                {
-                    SqlStatement stmt = CharacterDatabase.CreateStatement(insSpell, "INSERT INTO pet_spell (guid,spell,active) VALUES (?, ?, ?)");
-                    stmt.PExecute(m_charmInfo->GetPetNumber(), itr->first, uint32(itr->second.active));
-                }
+            {
+                CharacterDatabase.CreateStatement(insSpell, "INSERT INTO pet_spell (guid, spell, active, spec) VALUES (?, ?, ?, ?)")
+                    .PExecute(m_charmInfo->GetPetNumber(), itr->first, uint32(itr->second.active), spec);
                 break;
+            }
             case PETSPELL_UNCHANGED:
                 continue;
         }
@@ -1271,15 +1293,18 @@ void Pet::_SaveSpells()
 
 void Pet::_LoadAuras(uint32 timediff)
 {
-    RemoveAllAuras();
+    // Remove auras before load only for permanent pets! Some temp pets has additional auras in creature_addon
+    if (getPetType() == HUNTER_PET || m_duration == 0)
+        RemoveAllAuras();
 
     QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid,item_guid,spell,stackcount,remaincharges,basepoints0,basepoints1,basepoints2,periodictime0,periodictime1,periodictime2,maxduration,remaintime,effIndexMask FROM pet_aura WHERE guid = '%u'", m_charmInfo->GetPetNumber());
 
-    if(result)
+    if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
+
             ObjectGuid casterGuid = ObjectGuid(fields[0].GetUInt64());
             uint32 item_lowguid = fields[1].GetUInt32();
             uint32 spellid = fields[2].GetUInt32();
@@ -1305,6 +1330,12 @@ void Pet::_LoadAuras(uint32 timediff)
                 continue;
             }
 
+            if (casterGuid.IsEmpty() || !casterGuid.IsUnit())
+            {
+                sLog.outError("Pet::LoadAuras Unknown caster %llu, ignore.",fields[0].GetUInt64());
+                continue;
+            }
+
             // do not load single target auras (unless they were cast by the player)
             if (casterGuid != GetObjectGuid() && IsSingleTargetSpell(spellproto))
                 continue;
@@ -1328,7 +1359,7 @@ void Pet::_LoadAuras(uint32 timediff)
             else if (!stackcount)
                 stackcount = 1;
 
-            SpellAuraHolder *holder = CreateSpellAuraHolder(spellproto, this, NULL);
+            SpellAuraHolderPtr holder = CreateSpellAuraHolder(spellproto, this, NULL);
             holder->SetLoadedState(casterGuid, ObjectGuid(HIGHGUID_ITEM, item_lowguid), stackcount, remaincharges, maxduration, remaintime);
 
             for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
@@ -1336,20 +1367,17 @@ void Pet::_LoadAuras(uint32 timediff)
                 if ((effIndexMask & (1 << i)) == 0)
                     continue;
 
-                Aura* aura = CreateAura(spellproto, SpellEffectIndex(i), NULL, holder, this);
+                Aura* aura = holder->CreateAura(spellproto, SpellEffectIndex(i), NULL, holder, (Unit*)this, NULL, NULL);
                 if (!damage[i])
                     damage[i] = aura->GetModifier()->m_amount;
 
                 aura->SetLoadedState(damage[i], periodicTime[i]);
-                holder->AddAura(aura, SpellEffectIndex(i));
             }
 
             if (!holder->IsEmptyHolder())
                 AddSpellAuraHolder(holder);
-            else
-                delete holder;
         }
-        while( result->NextRow() );
+        while (result->NextRow());
 
         delete result;
     }
@@ -1357,6 +1385,7 @@ void Pet::_LoadAuras(uint32 timediff)
 
 void Pet::_SaveAuras()
 {
+    MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
     static SqlStatementID delAuras ;
     static SqlStatementID insAuras ;
 
@@ -1374,12 +1403,13 @@ void Pet::_SaveAuras()
 
     for(SpellAuraHolderMap::const_iterator itr = auraHolders.begin(); itr != auraHolders.end(); ++itr)
     {
-        SpellAuraHolder *holder = itr->second;
+        if (!itr->second || itr->second->IsDeleted())
+            continue;
 
         bool save = true;
         for (int32 j = 0; j < MAX_EFFECT_INDEX; ++j)
         {
-            SpellEntry const* spellInfo = holder->GetSpellProto();
+            SpellEntry const* spellInfo = itr->second->GetSpellProto();
             if (spellInfo->EffectApplyAuraName[j] == SPELL_AURA_MOD_STEALTH ||
                         spellInfo->Effect[j] == SPELL_EFFECT_APPLY_AREA_AURA_OWNER ||
                         spellInfo->Effect[j] == SPELL_EFFECT_APPLY_AREA_AURA_PET )
@@ -1388,10 +1418,30 @@ void Pet::_SaveAuras()
                 break;
             }
         }
+        if (save)
+        {
+            Unit* owner = GetOwner();
+            if (owner)
+            {
+                for(PetAuraSet::const_iterator itr1 = owner->m_petAuras.begin(); itr1 != owner->m_petAuras.end(); ++itr1)
+                {
+                    uint32 auraId = (*itr1)->GetAura(GetEntry());
+
+                    if(!auraId)
+                        continue;
+                    if (auraId == itr->second->GetId())
+                    {
+                        save = false;
+                        break;
+                    }
+                }
+            }
+        }
 
-        //skip all holders from spells that are passive or channeled
-        //do not save single target holders (unless they were cast by the player)
-        if (save && !holder->IsPassive() && !IsChanneledSpell(holder->GetSpellProto()) && (holder->GetCasterGuid() == GetObjectGuid() || !holder->IsSingleTarget()))
+        // skip all holders from spells that are passive or channeled
+        // do not save single target holders (unless they were cast by the player)
+        if (save && !itr->second->IsPassive() && !IsChanneledSpell(itr->second->GetSpellProto())
+            && (itr->second->GetCasterGuid() == GetObjectGuid() || itr->second->GetTrackedAuraType() != TRACK_AURA_TYPE_NOT_TRACKED))
         {
             int32  damage[MAX_EFFECT_INDEX];
             uint32 periodicTime[MAX_EFFECT_INDEX];
@@ -1402,10 +1452,10 @@ void Pet::_SaveAuras()
                 damage[i] = 0;
                 periodicTime[i] = 0;
 
-                if (Aura *aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i)))
+                if (Aura *aur = itr->second->GetAuraByEffectIndex(SpellEffectIndex(i)))
                 {
                     // don't save not own area auras
-                    if (aur->IsAreaAura() && holder->GetCasterGuid() != GetObjectGuid())
+                    if (aur->IsAreaAura() && itr->second->GetCasterGuid() != GetObjectGuid())
                         continue;
 
                     damage[i] = aur->GetModifier()->m_amount;
@@ -1418,11 +1468,11 @@ void Pet::_SaveAuras()
                 continue;
 
             stmt.addUInt32(m_charmInfo->GetPetNumber());
-            stmt.addUInt64(holder->GetCasterGuid().GetRawValue());
-            stmt.addUInt32(holder->GetCastItemGuid().GetCounter());
-            stmt.addUInt32(holder->GetId());
-            stmt.addUInt32(holder->GetStackAmount());
-            stmt.addUInt8(holder->GetAuraCharges());
+            stmt.addUInt64(itr->second->GetCasterGuid().GetRawValue());
+            stmt.addUInt32(itr->second->GetCastItemGuid().GetCounter());
+            stmt.addUInt32(itr->second->GetId());
+            stmt.addUInt32(itr->second->GetStackAmount());
+            stmt.addUInt8(itr->second->GetAuraCharges());
 
             for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
                 stmt.addInt32(damage[i]);
@@ -1430,8 +1480,8 @@ void Pet::_SaveAuras()
             for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
                 stmt.addUInt32(periodicTime[i]);
 
-            stmt.addInt32(holder->GetAuraMaxDuration());
-            stmt.addInt32(holder->GetAuraDuration());
+            stmt.addInt32(itr->second->GetAuraMaxDuration());
+            stmt.addInt32(itr->second->GetAuraDuration());
             stmt.addUInt32(effIndexMask);
             stmt.Execute();
         }
@@ -1440,11 +1490,11 @@ void Pet::_SaveAuras()
 
 bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpellState state /*= PETSPELL_NEW*/, PetSpellType type /*= PETSPELL_NORMAL*/)
 {
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell_id);
     if (!spellInfo)
     {
         // do pet spell book cleanup
-        if(state == PETSPELL_UNCHANGED)                     // spell load case
+        if (state == PETSPELL_UNCHANGED)                     // spell load case
         {
             sLog.outError("Pet::addSpell: nonexistent in SpellStore spell #%u request, deleting for all pets in `pet_spell`.",spell_id);
             CharacterDatabase.PExecute("DELETE FROM pet_spell WHERE spell = '%u'",spell_id);
@@ -1468,9 +1518,9 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
             // can be in case spell loading but learned at some previous spell loading
             itr->second.state = PETSPELL_UNCHANGED;
 
-            if(active == ACT_ENABLED)
+            if (active == ACT_ENABLED)
                 ToggleAutocast(spell_id, true);
-            else if(active == ACT_DISABLED)
+            else if (active == ACT_DISABLED)
                 ToggleAutocast(spell_id, false);
 
             return false;
@@ -1479,15 +1529,13 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
             return false;
     }
 
-    uint32 oldspell_id = 0;
-
     PetSpell newspell;
     newspell.state = state;
     newspell.type = type;
 
-    if(active == ACT_DECIDE)                                //active was not used before, so we save it's autocast/passive state here
+    if (active == ACT_DECIDE)                                //active was not used before, so we save it's autocast/passive state here
     {
-        if(IsPassiveSpell(spellInfo))
+        if (IsPassiveSpell(spellInfo))
             newspell.active = ACT_PASSIVE;
         else
             newspell.active = ACT_DISABLED;
@@ -1496,46 +1544,46 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
         newspell.active = active;
 
     // talent: unlearn all other talent ranks (high and low)
-    if(TalentSpellPos const* talentPos = GetTalentSpellPos(spell_id))
+    if (TalentSpellPos const* talentPos = GetTalentSpellPos(spell_id))
     {
-        if(TalentEntry const *talentInfo = sTalentStore.LookupEntry( talentPos->talent_id ))
+        if (TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentPos->talent_id))
         {
-            for(int i=0; i < MAX_TALENT_RANK; ++i)
+            for (int i = 0; i < MAX_TALENT_RANK; ++i)
             {
                 // skip learning spell and no rank spell case
                 uint32 rankSpellId = talentInfo->RankID[i];
-                if(!rankSpellId || rankSpellId==spell_id)
+                if (!rankSpellId || rankSpellId == spell_id)
                     continue;
 
                 // skip unknown ranks
-                if(!HasSpell(rankSpellId))
+                if (!HasSpell(rankSpellId))
                     continue;
                 removeSpell(rankSpellId,false,false);
             }
         }
     }
-    else if(sSpellMgr.GetSpellRank(spell_id)!=0)
+    else if (sSpellMgr.GetSpellRank(spell_id)!=0)
     {
         for (PetSpellMap::const_iterator itr2 = m_spells.begin(); itr2 != m_spells.end(); ++itr2)
         {
-            if(itr2->second.state == PETSPELL_REMOVED) continue;
+            if (itr2->second.state == PETSPELL_REMOVED)
+                continue;
 
-            if( sSpellMgr.IsRankSpellDueToSpell(spellInfo,itr2->first) )
+            if (sSpellMgr.IsRankSpellDueToSpell(spellInfo,itr2->first))
             {
                 // replace by new high rank
-                if(sSpellMgr.IsHighRankOfSpell(spell_id,itr2->first))
+                if (sSpellMgr.IsHighRankOfSpell(spell_id,itr2->first))
                 {
                     newspell.active = itr2->second.active;
 
-                    if(newspell.active == ACT_ENABLED)
+                    if (newspell.active == ACT_ENABLED)
                         ToggleAutocast(itr2->first, false);
 
-                    oldspell_id = itr2->first;
                     unlearnSpell(itr2->first,false,false);
                     break;
                 }
                 // ignore new lesser rank
-                else if(sSpellMgr.IsHighRankOfSpell(itr2->first,spell_id))
+                else if (sSpellMgr.IsHighRankOfSpell(itr2->first,spell_id))
                     return false;
             }
         }
@@ -1548,7 +1596,7 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
     else
         m_charmInfo->AddSpellToActionBar(spell_id, ActiveStates(newspell.active));
 
-    if(newspell.active == ACT_ENABLED)
+    if (newspell.active == ACT_ENABLED)
         ToggleAutocast(spell_id, true);
 
     uint32 talentCost = GetTalentSpellCost(spell_id);
@@ -1566,10 +1614,10 @@ bool Pet::learnSpell(uint32 spell_id)
     if (!addSpell(spell_id))
         return false;
 
-    if(!m_loading)
+    if (!m_loading)
     {
         Unit* owner = GetOwner();
-        if(owner && owner->GetTypeId() == TYPEID_PLAYER)
+        if (owner && owner->GetTypeId() == TYPEID_PLAYER)
         {
             WorldPacket data(SMSG_PET_LEARNED_SPELL, 4);
             data << uint32(spell_id);
@@ -1585,13 +1633,13 @@ void Pet::InitLevelupSpellsForLevel()
 {
     uint32 level = getLevel();
 
-    if(PetLevelupSpellSet const *levelupSpells = GetCreatureInfo()->family ? sSpellMgr.GetPetLevelupSpellList(GetCreatureInfo()->family) : NULL)
+    if (PetLevelupSpellSet const* levelupSpells = GetCreatureInfo()->Family ? sSpellMgr.GetPetLevelupSpellList(GetCreatureInfo()->Family) : NULL)
     {
         // PetLevelupSpellSet ordered by levels, process in reversed order
-        for(PetLevelupSpellSet::const_reverse_iterator itr = levelupSpells->rbegin(); itr != levelupSpells->rend(); ++itr)
+        for (PetLevelupSpellSet::const_reverse_iterator itr = levelupSpells->rbegin(); itr != levelupSpells->rend(); ++itr)
         {
             // will called first if level down
-            if(itr->first > level)
+            if (itr->first > level)
                 unlearnSpell(itr->second,true);                 // will learn prev rank if any
             // will called if level up
             else
@@ -1602,16 +1650,16 @@ void Pet::InitLevelupSpellsForLevel()
     int32 petSpellsId = GetCreatureInfo()->PetSpellDataId ? -(int32)GetCreatureInfo()->PetSpellDataId : GetEntry();
 
     // default spells (can be not learned if pet level (as owner level decrease result for example) less first possible in normal game)
-    if(PetDefaultSpellsEntry const *defSpells = sSpellMgr.GetPetDefaultSpellsEntry(petSpellsId))
+    if (PetDefaultSpellsEntry const* defSpells = sSpellMgr.GetPetDefaultSpellsEntry(petSpellsId))
     {
-        for(int i = 0; i < MAX_CREATURE_SPELL_DATA_SLOT; ++i)
+        for (int i = 0; i < MAX_CREATURE_SPELL_DATA_SLOT; ++i)
         {
             SpellEntry const* spellEntry = sSpellStore.LookupEntry(defSpells->spellid[i]);
-            if(!spellEntry)
+            if (!spellEntry)
                 continue;
 
             // will called first if level down
-            if(spellEntry->spellLevel > level)
+            if (spellEntry->spellLevel > level)
                 unlearnSpell(spellEntry->Id,true);
             // will called if level up
             else
@@ -1622,13 +1670,13 @@ void Pet::InitLevelupSpellsForLevel()
 
 bool Pet::unlearnSpell(uint32 spell_id, bool learn_prev, bool clear_ab)
 {
-    if(removeSpell(spell_id,learn_prev,clear_ab))
+    if (removeSpell(spell_id,learn_prev,clear_ab))
     {
-        if(!m_loading)
+        if (!m_loading)
         {
             if (Unit* owner = GetOwner())
             {
-                if(owner->GetTypeId() == TYPEID_PLAYER)
+                if (owner->GetTypeId() == TYPEID_PLAYER)
                 {
                     WorldPacket data(SMSG_PET_REMOVED_SPELL, 4);
                     data << uint32(spell_id);
@@ -1647,10 +1695,10 @@ bool Pet::removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab)
     if (itr == m_spells.end())
         return false;
 
-    if(itr->second.state == PETSPELL_REMOVED)
+    if (itr->second.state == PETSPELL_REMOVED)
         return false;
 
-    if(itr->second.state == PETSPELL_NEW)
+    if (itr->second.state == PETSPELL_NEW)
         m_spells.erase(itr);
     else
         itr->second.state = PETSPELL_REMOVED;
@@ -1679,25 +1727,28 @@ bool Pet::removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab)
     // if remove last rank or non-ranked then update action bar at server and client if need
     if (clear_ab && !learn_prev && m_charmInfo->RemoveSpellFromActionBar(spell_id))
     {
-        if(!m_loading)
+        if (IsInWorld())
         {
             // need update action bar for last removed rank
             if (Unit* owner = GetOwner())
-                if (owner->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (owner->GetTypeId() == TYPEID_PLAYER && !GetPetCounter())
                     ((Player*)owner)->PetSpellInitialize();
+            }
         }
     }
 
     return true;
 }
 
+
 void Pet::CleanupActionBar()
 {
-    for(int i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i)
-        if(UnitActionBarEntry const* ab = m_charmInfo->GetActionBarEntry(i))
-            if(uint32 action = ab->GetAction())
-                if(ab->IsActionBarForSpell() && !HasSpell(action))
-                    m_charmInfo->SetActionBar(i,0,ACT_DISABLED);
+    for (int i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i)
+        if (UnitActionBarEntry const* ab = m_charmInfo->GetActionBarEntry(i))
+            if (uint32 action = ab->GetAction())
+                if (ab->IsActionBarForSpell() && !HasSpell(action))
+                    m_charmInfo->SetActionBar(i, 0, ACT_DISABLED);
 }
 
 void Pet::InitPetCreateSpells()
@@ -1707,28 +1758,43 @@ void Pet::InitPetCreateSpells()
 
     LearnPetPassives();
 
+    if (!isControlled())
+    {
+        for (uint32 x = 0; x <= GetSpellMaxIndex(); ++x)
+        {
+            if (uint32 spellId = GetSpell(x))
+            {
+                if (IsPassiveSpell(spellId))
+                    CastSpell(this, spellId, true);
+                else
+                    addSpell(spellId, ACT_ENABLED);
+            }
+        }
+    }
+
     CastPetAuras(false);
 }
 
-bool Pet::resetTalents(bool no_cost)
+bool Pet::resetTalents()
 {
-    Unit *owner = GetOwner();
-    if (!owner || owner->GetTypeId()!=TYPEID_PLAYER)
+    Unit* owner = GetOwner();
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
         return false;
 
     // not need after this call
-    if(((Player*)owner)->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS))
+    if (((Player*)owner)->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS))
         ((Player*)owner)->RemoveAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS,true);
 
-    CreatureInfo const * ci = GetCreatureInfo();
-    if(!ci)
+    CreatureInfo const* ci = GetCreatureInfo();
+    if (!ci)
         return false;
+
     // Check pet talent type
-    CreatureFamilyEntry const *pet_family = sCreatureFamilyStore.LookupEntry(ci->family);
-    if(!pet_family || pet_family->petTalentType < 0)
+    CreatureFamilyEntry const* pet_family = sCreatureFamilyStore.LookupEntry(ci->Family);
+    if (!pet_family || pet_family->petTalentType < 0)
         return false;
 
-    Player *player = (Player *)owner;
+    Player* player = (Player*)owner;
 
     if (m_usedTalentCount == 0)
     {
@@ -1736,48 +1802,37 @@ bool Pet::resetTalents(bool no_cost)
         return false;
     }
 
-    uint32 cost = 0;
-
-    if(!no_cost)
-    {
-        cost = resetTalentsCost();
-
-        if (player->GetMoney() < cost)
-        {
-            player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
-            return false;
-        }
-    }
+    //uint32 cost = 0;
 
-    for (unsigned int i = 0; i < sTalentStore.GetNumRows(); ++i)
+    for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i)
     {
-        TalentEntry const *talentInfo = sTalentStore.LookupEntry(i);
+        TalentEntry const* talentInfo = sTalentStore.LookupEntry(i);
 
         if (!talentInfo) continue;
 
-        TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab );
+        TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry(talentInfo->TalentTab);
 
-        if(!talentTabInfo)
+        if (!talentTabInfo)
             continue;
 
         // unlearn only talents for pets family talent type
-        if(!((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask))
+        if (!((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask))
             continue;
 
         for (int j = 0; j < MAX_TALENT_RANK; j++)
             if (talentInfo->RankID[j])
-                removeSpell(talentInfo->RankID[j],!IsPassiveSpell(talentInfo->RankID[j]),false);
+            {
+                removeSpell(talentInfo->RankID[j], !IsPassiveSpell(talentInfo->RankID[j]), false);
+
+                SpellEntry const* spellInfo = sSpellStore.LookupEntry(talentInfo->RankID[j]);
+                for (uint32 k = 0; k < MAX_EFFECT_INDEX; ++k)
+                    if (spellInfo->EffectTriggerSpell[k])
+                        removeSpell(spellInfo->EffectTriggerSpell[k], false);
+            }
     }
 
     UpdateFreeTalentPoints(false);
 
-    if(!no_cost)
-    {
-        player->ModifyMoney(-(int32)cost);
-
-        m_resetTalentsCost = cost;
-        m_resetTalentsTime = time(NULL);
-    }
     player->PetSpellInitialize();
     return true;
 }
@@ -1785,30 +1840,30 @@ bool Pet::resetTalents(bool no_cost)
 void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* online_pet /*= NULL*/)
 {
     // not need after this call
-    if(((Player*)owner)->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS))
-        ((Player*)owner)->RemoveAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS,true);
+    if (((Player*)owner)->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS))
+        ((Player*)owner)->RemoveAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS, true);
 
     // reset for online
-    if(online_pet)
-        online_pet->resetTalents(true);
+    if (online_pet)
+        online_pet->resetTalents();
 
     // now need only reset for offline pets (all pets except online case)
     uint32 except_petnumber = online_pet ? online_pet->GetCharmInfo()->GetPetNumber() : 0;
 
-    QueryResult *resultPets = CharacterDatabase.PQuery(
+    QueryResult* resultPets = CharacterDatabase.PQuery(
         "SELECT id FROM character_pet WHERE owner = '%u' AND id <> '%u'",
-        owner->GetGUIDLow(),except_petnumber);
+        owner->GetGUIDLow(), except_petnumber);
 
     // no offline pets
-    if(!resultPets)
+    if (!resultPets)
         return;
 
-    QueryResult *result = CharacterDatabase.PQuery(
+    QueryResult* result = CharacterDatabase.PQuery(
         "SELECT DISTINCT pet_spell.spell FROM pet_spell, character_pet "
         "WHERE character_pet.owner = '%u' AND character_pet.id = pet_spell.guid AND character_pet.id <> %u",
-        owner->GetGUIDLow(),except_petnumber);
+        owner->GetGUIDLow(), except_petnumber);
 
-    if(!result)
+    if (!result)
     {
         delete resultPets;
         return;
@@ -1820,18 +1875,18 @@ void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* online_pet /*= NULL*/)
 
     do
     {
-        Field *fields = resultPets->Fetch();
+        Field* fields = resultPets->Fetch();
 
         uint32 id = fields[0].GetUInt32();
 
-        if(need_comma)
+        if (need_comma)
             ss << ",";
 
         ss << id;
 
         need_comma = true;
     }
-    while( resultPets->NextRow() );
+    while (resultPets->NextRow());
 
     delete resultPets;
 
@@ -1840,25 +1895,25 @@ void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* online_pet /*= NULL*/)
     bool need_execute = false;
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
 
         uint32 spell = fields[0].GetUInt32();
 
-        if(!GetTalentSpellCost(spell))
+        if (!GetTalentSpellCost(spell))
             continue;
 
-        if(need_execute)
+        if (need_execute)
             ss << ",";
 
         ss << spell;
 
         need_execute = true;
     }
-    while( result->NextRow() );
+    while (result->NextRow());
 
     delete result;
 
-    if(!need_execute)
+    if (!need_execute)
         return;
 
     ss << ")";
@@ -1878,7 +1933,7 @@ void Pet::UpdateFreeTalentPoints(bool resetIfNeed)
         {
             Unit *owner = GetOwner();
             if (!owner || owner->GetTypeId() != TYPEID_PLAYER || ((Player*)owner)->GetSession()->GetSecurity() < SEC_ADMINISTRATOR)
-                resetTalents(true);
+                resetTalents();
             else
                 SetFreeTalentPoints(0);
         }
@@ -1898,28 +1953,10 @@ void Pet::InitTalentForLevel()
     if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    if(!m_loading)
+    if (!m_loading)
         ((Player*)owner)->SendTalentsInfoData(true);
 }
 
-uint32 Pet::resetTalentsCost() const
-{
-    uint32 days = uint32(sWorld.GetGameTime() - m_resetTalentsTime)/DAY;
-
-    // The first time reset costs 10 silver; after 1 day cost is reset to 10 silver
-    if(m_resetTalentsCost < 10*SILVER || days > 0)
-        return 10*SILVER;
-    // then 50 silver
-    else if(m_resetTalentsCost < 50*SILVER)
-        return 50*SILVER;
-    // then 1 gold
-    else if(m_resetTalentsCost < 1*GOLD)
-        return 1*GOLD;
-    // then increasing at a rate of 1 gold; cap 10 gold
-    else
-        return (m_resetTalentsCost + 1*GOLD > 10*GOLD ? 10*GOLD : m_resetTalentsCost + 1*GOLD);
-}
-
 uint8 Pet::GetMaxTalentPointsForLevel(uint32 level)
 {
     uint8 points = (level >= 20) ? ((level - 16) / 4) : 0;
@@ -1931,14 +1968,17 @@ uint8 Pet::GetMaxTalentPointsForLevel(uint32 level)
 
 void Pet::ToggleAutocast(uint32 spellid, bool apply)
 {
-    if(IsPassiveSpell(spellid))
+    if (IsPassiveSpell(spellid))
         return;
 
     PetSpellMap::iterator itr = m_spells.find(spellid);
 
+    if (itr == m_spells.end())
+        return;
+
     uint32 i;
 
-    if(apply)
+    if (apply)
     {
         for (i = 0; i < m_autospells.size() && m_autospells[i] != spellid; ++i)
             ;                                               // just search
@@ -1947,10 +1987,10 @@ void Pet::ToggleAutocast(uint32 spellid, bool apply)
         {
             m_autospells.push_back(spellid);
 
-            if(itr->second.active != ACT_ENABLED)
+            if (itr->second.active != ACT_ENABLED)
             {
                 itr->second.active = ACT_ENABLED;
-                if(itr->second.state != PETSPELL_NEW)
+                if (itr->second.state != PETSPELL_NEW)
                     itr->second.state = PETSPELL_CHANGED;
             }
         }
@@ -1964,32 +2004,39 @@ void Pet::ToggleAutocast(uint32 spellid, bool apply)
         if (i < m_autospells.size())
         {
             m_autospells.erase(itr2);
-            if(itr->second.active != ACT_DISABLED)
+            if (itr->second.active != ACT_DISABLED)
             {
                 itr->second.active = ACT_DISABLED;
-                if(itr->second.state != PETSPELL_NEW)
+                if (itr->second.state != PETSPELL_NEW)
                     itr->second.state = PETSPELL_CHANGED;
             }
         }
     }
+
+    if (PetAI* ai = ((PetAI*)AI()))
+        ai->Reset();
 }
 
 bool Pet::IsPermanentPetFor(Player* owner)
 {
-    switch(getPetType())
+    switch (getPetType())
     {
         case SUMMON_PET:
-            switch(owner->getClass())
+            switch (owner->getClass())
             {
                 // oddly enough, Mage's Water Elemental is still treated as temporary pet with Glyph of Eternal Water
                 // i.e. does not unsummon at mounting, gets dismissed at teleport etc.
                 case CLASS_WARLOCK:
-                    return GetCreatureInfo()->type == CREATURE_TYPE_DEMON;
+                    return GetCreatureInfo()->CreatureType == CREATURE_TYPE_DEMON;
                 case CLASS_DEATH_KNIGHT:
-                    return GetCreatureInfo()->type == CREATURE_TYPE_UNDEAD;
+                    return GetCreatureInfo()->CreatureType == CREATURE_TYPE_UNDEAD;
+                case CLASS_MAGE:
+                    // both permanent and temporary water elementals should be in spellbook
+                    return GetCreatureInfo()->Entry == (owner->HasAura(70937) ? 37994 : 510);
                 default:
                     return false;
             }
+            break;
         case HUNTER_PET:
             return true;
         default:
@@ -1997,52 +2044,93 @@ bool Pet::IsPermanentPetFor(Player* owner)
     }
 }
 
-bool Pet::Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo const* cinfo, uint32 pet_number)
+bool Pet::Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo const* cinfo, uint32 pet_number, Unit* owner)
 {
+    if (!owner)
+        return false;
+
+    if (!cinfo)
+        return false;
+
+    m_loading = true;
+
     SetMap(cPos.GetMap());
     SetPhaseMask(cPos.GetPhaseMask(), false);
+    m_originalEntry = cinfo->Entry;
 
-    Object::_Create(guidlow, pet_number, HIGHGUID_PET);
+    if (!guidlow)
+        guidlow = cPos.GetMap()->GenerateLocalLowGuid(HIGHGUID_PET);
 
-    m_originalEntry = cinfo->Entry;
+    if (!pet_number)
+        pet_number = sObjectMgr.GeneratePetNumber();
+
+    Object::_Create(ObjectGuid(HIGHGUID_PET, pet_number, guidlow));
 
     if (!InitEntry(cinfo->Entry))
         return false;
 
-    cPos.SelectFinalPoint(this);
+    cPos.SelectFinalPoint(this, true);
 
     if (!cPos.Relocate(this))
         return false;
 
     SetSheath(SHEATH_STATE_MELEE);
 
+    if (owner->GetTypeId() == TYPEID_PLAYER)
+        m_charmInfo->SetPetNumber(pet_number, IsPermanentPetFor((Player*)owner));
+    else
+        m_charmInfo->SetPetNumber(pet_number, false);
+
+    setFaction(owner->getFaction()); // Faction be owerwritten later, if ForceFaction present
+
+    SetOwnerGuid(owner->GetObjectGuid());
+    SetCreatorGuid(owner->GetObjectGuid());
+
+    if (GetCreateSpellID())
+        SetUInt32Value(UNIT_CREATED_BY_SPELL, GetCreateSpellID());
+
     if (getPetType() == MINI_PET)                           // always non-attackable
         SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-
+    else
+        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
     return true;
 }
 
-bool Pet::HasSpell(uint32 spell) const
+bool Pet::HasSpell(uint32 spellId) const
 {
-    PetSpellMap::const_iterator itr = m_spells.find(spell);
-    return (itr != m_spells.end() && itr->second.state != PETSPELL_REMOVED );
+    uint32 parentSpell = 0;
+    switch (spellId)
+    {
+        case 54045:                  // Carrion feeder - not triggered spell
+            parentSpell = 54044;
+            break;
+        case 52749:                  // Voracious appetite - not triggered spell
+            parentSpell = 52748;
+            break;
+        default:
+            parentSpell = spellId;
+            break;
+    }
+
+    PetSpellMap::const_iterator itr = m_spells.find(parentSpell);
+    return (itr != m_spells.end() && itr->second.state != PETSPELL_REMOVED);
 }
 
 // Get all passive spells in our skill line
 void Pet::LearnPetPassives()
 {
     CreatureInfo const* cInfo = GetCreatureInfo();
-    if(!cInfo)
+    if (!cInfo)
         return;
 
-    CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cInfo->family);
-    if(!cFamily)
+    CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cInfo->Family);
+    if (!cFamily)
         return;
 
     PetFamilySpellsStore::const_iterator petStore = sPetFamilySpellsStore.find(cFamily->ID);
-    if(petStore != sPetFamilySpellsStore.end())
+    if (petStore != sPetFamilySpellsStore.end())
     {
-        for(PetFamilySpellsSet::const_iterator petSet = petStore->second.begin(); petSet != petStore->second.end(); ++petSet)
+        for (PetFamilySpellsSet::const_iterator petSet = petStore->second.begin(); petSet != petStore->second.end(); ++petSet)
             addSpell(*petSet, ACT_DECIDE, PETSPELL_NEW, PETSPELL_FAMILY);
     }
 }
@@ -2050,15 +2138,15 @@ void Pet::LearnPetPassives()
 void Pet::CastPetAuras(bool current)
 {
     Unit* owner = GetOwner();
-    if(!owner || owner->GetTypeId()!=TYPEID_PLAYER)
+    if (!owner || owner->GetTypeId()!=TYPEID_PLAYER)
         return;
 
-    for(PetAuraSet::const_iterator itr = owner->m_petAuras.begin(); itr != owner->m_petAuras.end();)
+    for (PetAuraSet::const_iterator itr = owner->m_petAuras.begin(); itr != owner->m_petAuras.end();)
     {
         PetAura const* pa = *itr;
         ++itr;
 
-        if(!current && pa->IsRemovedOnChangePet())
+        if (!current && pa->IsRemovedOnChangePet())
             owner->RemovePetAura(pa);
         else
             CastPetAura(pa);
@@ -2068,10 +2156,10 @@ void Pet::CastPetAuras(bool current)
 void Pet::CastPetAura(PetAura const* aura)
 {
     uint32 auraId = aura->GetAura(GetEntry());
-    if(!auraId)
+    if (!auraId)
         return;
 
-    if(auraId == 35696)                                       // Demonic Knowledge
+    if (auraId == 35696)                                       // Demonic Knowledge
     {
         int32 basePoints = int32(aura->GetDamage() * (GetStat(STAT_STAMINA) + GetStat(STAT_INTELLECT)) / 100);
         CastCustomSpell(this, auraId, &basePoints, NULL, NULL, true);
@@ -2098,10 +2186,16 @@ void Pet::learnSpellHighRank(uint32 spellid)
 void Pet::SynchronizeLevelWithOwner()
 {
     Unit* owner = GetOwner();
-    if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
+    if (!owner)
+        return;
+
+    if (owner->GetTypeId() != TYPEID_PLAYER)
+    {
+        GivePetLevel(owner->getLevel());
         return;
+    }
 
-    switch(getPetType())
+    switch (getPetType())
     {
         // always same level
         case SUMMON_PET:
@@ -2119,19 +2213,1237 @@ void Pet::SynchronizeLevelWithOwner()
     }
 }
 
-void Pet::ApplyModeFlags(PetModeFlags mode, bool apply)
+void Pet::ApplyStatScalingBonus(Stats stat, bool apply)
 {
-    if (apply)
-        m_petModeFlags = PetModeFlags(m_petModeFlags | mode);
+    if (stat > STAT_SPIRIT || stat < STAT_STRENGTH)
+        return;
+
+    Unit* owner = GetOwner();
+
+    // Don't apply scaling bonuses if no owner or owner is not player
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER || m_removed)
+        return;
+
+    int32 newStat = owner->GetTotalStatValue(stat);
+
+    if (m_baseBonusData->statScale[stat] == newStat && !apply)
+        return;
+
+    m_baseBonusData->statScale[stat] = newStat;
+
+    int32 basePoints = int32(m_baseBonusData->statScale[stat] * (CalculateScalingData()->statScale[stat] / 100.0f));
+
+    bool needRecalculateStat = false;
+
+    if (basePoints == 0)
+        needRecalculateStat = true;
+
+    if (Aura* aura = GetScalingAura(SPELL_AURA_MOD_STAT, stat))
+        if (ReapplyScalingAura(aura, basePoints))
+            needRecalculateStat = true;
+
+    if (needRecalculateStat)
+        UpdateStats(stat);
+}
+
+void Pet::ApplyResistanceScalingBonus(uint32 school, bool apply)
+{
+    if (school < SPELL_SCHOOL_NORMAL || school > SPELL_SCHOOL_ARCANE)
+        return;
+
+    Unit* owner = GetOwner();
+
+    // Don't apply scaling bonuses if no owner or owner is not player
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER || m_removed)
+        return;
+
+    int32 newResistance;
+
+    if (school == SPELL_SCHOOL_NORMAL)
+        newResistance = owner->GetArmor();
     else
-        m_petModeFlags = PetModeFlags(m_petModeFlags & ~mode);
+        newResistance = owner->GetResistance(SpellSchools(school));
+
+    if (m_baseBonusData->resistanceScale[school] == newResistance && !apply)
+        return;
+
+    m_baseBonusData->resistanceScale[school] = newResistance;
+
+    int32 basePoints = int32(m_baseBonusData->resistanceScale[school] * (CalculateScalingData()->resistanceScale[school] / 100.0f));
+
+    bool needRecalculateStat = false;
+
+    if (basePoints == 0)
+        needRecalculateStat = true;
+
+    if (Aura* aura = GetScalingAura(SPELL_AURA_MOD_RESISTANCE, school))
+        if (ReapplyScalingAura(aura, basePoints))
+            needRecalculateStat = true;
+
+    if (needRecalculateStat)
+    {
+        if (school == SPELL_SCHOOL_NORMAL)
+            UpdateArmor();
+        else
+            UpdateResistances(school);
+    }
+}
 
+void Pet::ApplyAttackPowerScalingBonus(bool apply)
+{
     Unit* owner = GetOwner();
-    if(!owner || owner->GetTypeId()!=TYPEID_PLAYER)
+
+    // Don't apply scaling bonuses if no owner or owner is not player
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER || m_removed)
         return;
 
-    WorldPacket data(SMSG_PET_MODE, 12);
-    data << GetObjectGuid();
-    data << uint32(m_petModeFlags);
-    ((Player*)owner)->GetSession()->SendPacket(&data);
+    int32 newAPBonus;
+
+    switch (getPetType())
+    {
+        case GUARDIAN_PET:
+        case PROTECTOR_PET:
+        {
+            if (owner->getClass() == CLASS_SHAMAN)
+            {
+                newAPBonus = owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_NATURE);
+                break;
+            }
+        }
+        /* no break another case!*/
+        case SUMMON_PET:
+        {
+            switch (owner->getClass())
+            {
+                case CLASS_WARLOCK:
+                {
+                    newAPBonus = std::max(owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_SHADOW),owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_FIRE));
+                    break;
+                }
+                case CLASS_DEATH_KNIGHT:
+                    newAPBonus = owner->GetTotalAttackPowerValue(BASE_ATTACK);
+                    break;
+                case CLASS_PRIEST:
+                    newAPBonus = owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_SHADOW);
+                    break;
+                case CLASS_SHAMAN:
+                    newAPBonus = owner->GetTotalAttackPowerValue(BASE_ATTACK);
+                    break;
+                case CLASS_MAGE:
+                {
+                   newAPBonus = std::max(owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_FROST),owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_FIRE));
+                   break;
+                }
+                default:
+                    newAPBonus = 0;
+                    break;
+            }
+            break;
+        }
+        case HUNTER_PET:
+            newAPBonus = owner->GetTotalAttackPowerValue(RANGED_ATTACK);
+            break;
+        default:
+            newAPBonus = 0;
+            break;
+    }
+
+    if (newAPBonus < 0)
+        newAPBonus = 0;
+
+    if (m_baseBonusData->attackpowerScale == newAPBonus && !apply)
+        return;
+
+    m_baseBonusData->attackpowerScale = newAPBonus;
+
+    int32 basePoints = int32(m_baseBonusData->attackpowerScale * (CalculateScalingData()->attackpowerScale / 100.0f));
+
+    bool needRecalculateStat = false;
+
+    if (basePoints == 0)
+        needRecalculateStat = true;
+
+    if (Aura* aura = GetScalingAura(SPELL_AURA_MOD_ATTACK_POWER))
+        if (ReapplyScalingAura(aura, basePoints))
+            needRecalculateStat = true;
+
+    if (needRecalculateStat)
+    {
+        UpdateAttackPowerAndDamage();
+        UpdateAttackPowerAndDamage(true);
+    }
+}
+
+void Pet::ApplyDamageScalingBonus(bool apply)
+{
+    // SpellPower for pets exactly same DamageBonus.
+    //    m_baseBonusData->damageScale
+    Unit* owner = GetOwner();
+
+    // Don't apply scaling bonuses if no owner or owner is not player
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER || m_removed)
+        return;
+
+    int32 newDamageBonus;
+
+    switch (getPetType())
+    {
+        case SUMMON_PET:
+        case GUARDIAN_PET:
+        case PROTECTOR_PET:
+        case HUNTER_PET:
+        {
+            switch (owner->getClass())
+            {
+                case CLASS_DEATH_KNIGHT:
+                    newDamageBonus = owner->GetTotalAttackPowerValue(BASE_ATTACK);
+                    break;
+                case CLASS_PRIEST:
+                    newDamageBonus = owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_SHADOW);
+                    break;
+                default:
+                    newDamageBonus = 0;
+                    break;
+            }
+            break;
+        }
+        default:
+            newDamageBonus = 0;
+            break;
+    }
+
+    if (newDamageBonus < 0)
+        newDamageBonus = 0;
+
+    if (m_baseBonusData->damageScale == newDamageBonus && !apply)
+        return;
+
+    m_baseBonusData->damageScale = newDamageBonus;
+
+    int32 basePoints = int32(m_baseBonusData->damageScale * (CalculateScalingData()->damageScale / 100.0f));
+
+    bool needRecalculateStat = false;
+
+    if (basePoints == 0)
+        needRecalculateStat = true;
+
+    if (Aura* aura = GetScalingAura(SPELL_AURA_MOD_DAMAGE_DONE, SPELL_SCHOOL_MASK_ALL))
+        if (ReapplyScalingAura(aura, basePoints))
+            needRecalculateStat = true;
+
+    if (needRecalculateStat)
+    {
+        UpdateDamagePhysical(BASE_ATTACK);
+        UpdateDamagePhysical(RANGED_ATTACK);
+    }
+}
+
+void Pet::ApplySpellDamageScalingBonus(bool apply)
+{
+    Unit* owner = GetOwner();
+
+    // Don't apply scaling bonuses if no owner or owner is not player
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER || m_removed)
+        return;
+
+    int32 newDamageBonus;
+
+    switch (getPetType())
+    {
+        case GUARDIAN_PET:
+        case PROTECTOR_PET:
+        {
+            if (owner->getClass() == CLASS_SHAMAN)
+            {
+                newDamageBonus = owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_NATURE);
+                break;
+            }
+        }
+        /* no break another case!*/
+        case SUMMON_PET:
+        {
+            switch (owner->getClass())
+            {
+                case CLASS_WARLOCK:
+                    newDamageBonus = std::max(owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_SHADOW),owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_FIRE));
+                    break;
+                case CLASS_PRIEST:
+                    newDamageBonus = owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_SHADOW);
+                    break;
+                case CLASS_DEATH_KNIGHT:
+                    newDamageBonus = owner->GetTotalAttackPowerValue(BASE_ATTACK);
+                    break;
+                case CLASS_SHAMAN:
+                    newDamageBonus = owner->GetTotalAttackPowerValue(BASE_ATTACK);
+                    break;
+                case CLASS_MAGE:
+                    newDamageBonus = std::max(owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_FROST),owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_FIRE));
+                    break;
+                default:
+                    newDamageBonus = 0;
+                    break;
+            }
+            break;
+        }
+        case HUNTER_PET:
+            newDamageBonus = owner->GetTotalAttackPowerValue(RANGED_ATTACK);
+            break;
+        default:
+            newDamageBonus = 0;
+            break;
+    }
+
+    if (newDamageBonus < 0)
+        newDamageBonus = 0;
+
+    if (m_baseBonusData->damageScale == newDamageBonus && !apply)
+        return;
+
+    m_baseBonusData->spelldamageScale = newDamageBonus;
+
+    int32 basePoints = int32(m_baseBonusData->spelldamageScale * (CalculateScalingData()->spelldamageScale / 100.0f));
+
+    bool needRecalculateStat = false;
+
+    if (basePoints == 0)
+        needRecalculateStat = true;
+
+    if (Aura* aura = GetScalingAura(SPELL_AURA_MOD_DAMAGE_DONE, SPELL_SCHOOL_MASK_MAGIC))
+        if (ReapplyScalingAura(aura, basePoints))
+            needRecalculateStat = true;
+
+    if (needRecalculateStat)
+        UpdateSpellPower();
+}
+
+
+void Pet::ApplyAllScalingBonuses(bool apply)
+{
+    for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
+        ApplyStatScalingBonus(Stats(i),apply);
+
+    for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
+        ApplyResistanceScalingBonus(SpellSchools(i), apply);
+
+    ApplyAttackPowerScalingBonus(apply);
+    ApplySpellDamageScalingBonus(apply);
+    ApplyDamageScalingBonus(apply);
+    ApplyHitScalingBonus(apply);
+    ApplySpellHitScalingBonus(apply);
+    ApplyExpertizeScalingBonus(apply);
+    ApplyPowerregenScalingBonus(apply);
+    ApplyAttackSpeedScalingBonus(apply);
+}
+
+void Pet::ApplyHitScalingBonus(bool apply)
+{
+    Unit* owner = GetOwner();
+
+    // Don't apply scaling bonuses if no owner or owner is not player
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER || m_removed)
+        return;
+    int32 m_MeleeHitChance = owner->GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE);
+    m_MeleeHitChance +=  ((Player*)owner)->GetRatingBonusValue(CR_HIT_MELEE);
+
+    if (m_baseBonusData->meleeHitScale == m_MeleeHitChance && !apply)
+        return;
+
+    m_baseBonusData->meleeHitScale = m_MeleeHitChance;
+
+    int32 basePoints = int32(m_baseBonusData->meleeHitScale * (CalculateScalingData()->meleeHitScale / 100.0f));
+
+    if (Aura* aura = GetScalingAura(SPELL_AURA_MOD_HIT_CHANCE))
+        ReapplyScalingAura(aura, basePoints);
+}
+
+void Pet::ApplySpellHitScalingBonus(bool apply)
+{
+    Unit* owner = GetOwner();
+
+    // Don't apply scaling bonuses if no owner or owner is not player
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER || m_removed)
+        return;
+
+    int32 m_SpellHitChance = owner->GetTotalAuraModifier(SPELL_AURA_MOD_SPELL_HIT_CHANCE);
+    m_SpellHitChance += ((Player*)owner)->GetRatingBonusValue(CR_HIT_SPELL);
+
+    if (m_baseBonusData->spellHitScale == m_SpellHitChance && !apply)
+        return;
+
+    m_baseBonusData->spellHitScale = m_SpellHitChance;
+
+    int32 basePoints = int32(m_baseBonusData->spellHitScale * (CalculateScalingData()->spellHitScale / 100.0f));
+
+    if (Aura* aura = GetScalingAura(SPELL_AURA_MOD_SPELL_HIT_CHANCE))
+        ReapplyScalingAura(aura, basePoints);
+}
+
+void Pet::ApplyExpertizeScalingBonus(bool apply)
+{
+    Unit* owner = GetOwner();
+
+    // Don't apply scaling bonuses if no owner or owner is not player
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER || m_removed)
+        return;
+    int32 m_expertize = owner->GetUInt32Value(PLAYER_EXPERTISE);
+
+    if (m_baseBonusData->expertizeScale == m_expertize && !apply)
+        return;
+
+    m_baseBonusData->expertizeScale = m_expertize;
+
+    int32 basePoints = int32(m_baseBonusData->expertizeScale * (CalculateScalingData()->expertizeScale / 100.0f));
+
+    if (Aura* aura = GetScalingAura(SPELL_AURA_MOD_EXPERTISE))
+        ReapplyScalingAura(aura, basePoints);
+}
+
+void Pet::ApplyPowerregenScalingBonus(bool apply)
+{
+    Unit* owner = GetOwner();
+
+    // Don't apply scaling bonuses if no owner or owner is not player
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER || m_removed)
+        return;
+
+    int32 m_manaregen = int32(owner->GetFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER));
+
+    if (m_baseBonusData->powerregenScale == m_manaregen && !apply)
+        return;
+
+    m_baseBonusData->powerregenScale = m_manaregen;
+
+    int32 basePoints = int32(m_baseBonusData->powerregenScale * (CalculateScalingData()->powerregenScale / 100.0f));
+
+    bool needRecalculateStat = false;
+
+    if (basePoints == 0)
+        needRecalculateStat = true;
+
+    if (Aura* aura = GetScalingAura(SPELL_AURA_MOD_POWER_REGEN))
+        if (ReapplyScalingAura(aura, basePoints))
+            needRecalculateStat = true;
+
+    if (needRecalculateStat)
+        UpdateManaRegen();
+}
+
+void Pet::ApplyAttackSpeedScalingBonus(bool apply)
+{
+    Unit* owner = GetOwner();
+
+    // Don't apply scaling bonuses if no owner or owner is not player
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER || m_removed)
+        return;
+
+    int32 m_attackspeed = int32((1.0f - owner->m_modAttackSpeedPct[BASE_ATTACK])*100.0f);
+
+    if (m_baseBonusData->attackspeedScale == m_attackspeed && !apply)
+        return;
+
+    m_baseBonusData->attackspeedScale = m_attackspeed;
+
+    int32 basePoints = int32((float)m_baseBonusData->attackspeedScale * float(CalculateScalingData()->attackspeedScale) / 100.0f);
+
+    if (Aura* aura = GetScalingAura(SPELL_AURA_HASTE_ALL))
+        ReapplyScalingAura(aura, basePoints);
+
+}
+
+bool Pet::Summon()
+{
+    Unit* owner = GetOwner();
+    if (!owner)
+        return false;
+
+    Map* map = GetMap();
+    if (!map)
+        return false;
+
+    SetPetFollowAngle(getPetType() == MINI_PET ? M_PI_F * 1.25f : PET_FOLLOW_ANGLE * (1 - GetPetCounter()));
+
+    uint16 level = getLevel() ? getLevel() : owner->getLevel();;
+
+    if (GetCreateSpellID())
+        SetUInt32Value(UNIT_CREATED_BY_SPELL, GetCreateSpellID());
+
+    if (isTemporarySummoned() && getPetType() != PROTECTOR_PET)
+        GetCharmInfo()->SetState(CHARM_STATE_REACT,REACT_AGGRESSIVE);
+    else
+        GetCharmInfo()->SetState(CHARM_STATE_REACT,REACT_DEFENSIVE);
+
+    if (owner->GetTypeId() != TYPEID_PLAYER || !IsPermanentPetFor((Player*)owner))
+    {
+        GetCharmInfo()->InitCharmCreateSpells();
+        LoadCreatureAddon(true);
+    }
+
+    switch (getPetType())
+    {
+        case GUARDIAN_PET:
+        case PROTECTOR_PET:
+        {
+            RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP | UNIT_BYTE2_FLAG_SANCTUARY | UNIT_BYTE2_FLAG_PVP);
+            SetUInt32Value(UNIT_NPC_FLAGS, GetCreatureInfo()->NpcFlags);
+            SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
+            SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+            SetNeedSave(false);
+            owner->AddGuardian(this);
+            break;
+        }
+        case SUMMON_PET:
+        {
+            level = owner->getLevel();
+            LoadCreatureAddon(true);
+            SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+            SetUInt32Value(UNIT_FIELD_BYTES_0, 2048);
+            SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0);
+            SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, 1000);
+            SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+            RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP | UNIT_BYTE2_FLAG_SANCTUARY | UNIT_BYTE2_FLAG_PVP);
+            SetNeedSave(true);
+            owner->SetPet(this);
+            setFaction(owner->getFaction());
+
+            std::string newName;
+            if (!isTemporarySummoned()) // generate new name for first summon pet (not for tempsummoned)
+                newName = sObjectMgr.GeneratePetName(GetEntry());
+            if (newName.empty())
+                newName = Creature::GetNameForLocaleIdx(sObjectMgr.GetDBCLocaleIndex());
+            SetName(newName);
+            break;
+        }
+        case HUNTER_PET:  // Called only if new tamed pet created
+        {
+            SetSheath(SHEATH_STATE_MELEE);
+            SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+            SetUInt32Value(UNIT_FIELD_BYTES_0, 0x02020100);
+            RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP | UNIT_BYTE2_FLAG_SANCTUARY | UNIT_BYTE2_FLAG_PVP);
+            SetByteFlag(UNIT_FIELD_BYTES_2, 2, UNIT_CAN_BE_RENAMED | UNIT_CAN_BE_ABANDONED);
+            SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0);
+            SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, sObjectMgr.GetXPForPetLevel(getLevel()));
+            SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, time(NULL));
+            SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+            SetMaxPower(POWER_HAPPINESS, GetCreatePowers(POWER_HAPPINESS));
+            SetPower(POWER_HAPPINESS, HAPPINESS_LEVEL_SIZE);
+            SetNeedSave(true);
+            owner->SetPet(this);
+            setFaction(owner->getFaction());
+            break;
+        }
+        case MINI_PET:
+        {
+            SelectLevel(GetCreatureInfo());
+            SetUInt32Value(UNIT_NPC_FLAGS, GetCreatureInfo()->NpcFlags);
+            SetByteValue(UNIT_FIELD_BYTES_2, 1, 0);
+            SetName("");
+            SetNeedSave(false);
+            m_loading = false;
+            InitPetCreateSpells();
+            LoadCreatureAddon(true);
+            map->Add((Creature*)this);
+            owner->SetMiniPet(this);
+            AIM_Initialize();
+            return true;
+        }
+        default:
+        {
+            sLog.outError("Pet have incorrect type (%u) for pet creating.", getPetType());
+            return false;
+        }
+    }
+
+    if (owner->IsPvP())
+        SetPvP(true);
+
+    if (owner->IsFFAPvP())
+        SetFFAPvP(true);
+
+    SetCanModifyStats(true);
+
+    InitStatsForLevel(level, owner);
+    InitTalentForLevel();
+    InitPetCreateSpells();
+    SynchronizeLevelWithOwner();
+    InitLevelupSpellsForLevel();
+    LearnPetPassives();
+
+    map->Add((Creature*)this);
+
+    CastPetAuras(true);
+
+    if (owner->GetTypeId() == TYPEID_PLAYER)
+    {
+        CastPetPassiveAuras(true);
+        ApplyAllScalingBonuses(true);
+    }
+
+    SetHealth(GetMaxHealth());
+    SetPower(GetPowerType(), GetMaxPower(GetPowerType()));
+
+    AIM_Initialize();
+
+    DEBUG_LOG("Pet::LoadPetFromDB pet %s successfully loaded", GetGuidStr().c_str());
+    m_loading = false;
+
+    if (owner->GetTypeId() == TYPEID_PLAYER)
+    {
+        CleanupActionBar();                                     // remove unknown spells from action bar after load
+        if (isControlled() && !GetPetCounter())
+        {
+            if (!GetPetCounter())
+                ((Player*)owner)->PetSpellInitialize();
+            ((Player*)owner)->SendTalentsInfoData(true);
+        }
+
+        if (((Player*)owner)->GetGroup())
+            ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_PET);
+
+        if (getPetType() == HUNTER_PET)
+            SavePetToDB(PET_SAVE_AS_CURRENT);
+        else if (getPetType() == SUMMON_PET)
+            SavePetToDB(PET_SAVE_NOT_IN_SLOT);
+        else
+            SetNeedSave(false);
+    }
+    else
+    {
+        SetNeedSave(false);
+        if (((Creature*)owner)->AI())
+            ((Creature*)owner)->AI()->JustSummoned((Creature*)this);
+    }
+
+    return true;
+}
+
+Unit* Pet::GetOwner() const
+{
+    Unit* owner = Unit::GetOwner();
+
+    if (!owner)
+        if (!GetOwnerGuid().IsEmpty() && GetOwnerGuid().IsAnyTypeCreature())
+            if (Map* pMap = GetMap())
+                owner = pMap->GetAnyTypeCreature(GetOwnerGuid());
+
+    if (owner && owner->GetTypeId() == TYPEID_UNIT && ((Creature*)owner)->IsTotem())
+        if (Unit* ownerOfOwner = owner->GetOwner())
+            return ownerOfOwner;
+
+    if (owner)
+        return owner;
+    else
+        return NULL;
+}
+
+bool Pet::IsInEvadeMode() const
+{
+    switch (GetCharmState(CHARM_STATE_COMMAND))
+    {
+        case COMMAND_STAY:
+            return false;
+        case COMMAND_FOLLOW:
+        case COMMAND_ATTACK:
+        default:
+            return IsInUnitState(UNIT_ACTION_HOME) && !IsWithinDistInMap(GetOwner(), PET_FOLLOW_DIST + 1.0f);
+    }
+    return false;
+}
+
+bool Pet::ReapplyScalingAura(Aura* aura, int32 basePoints)
+{
+    if (!aura)
+        return false;
+
+    SpellAuraHolderPtr holder = aura->GetHolder();
+    if (!holder || holder->IsDeleted())
+        return false;
+
+    SetCanModifyStats(false);
+    DEBUG_LOG("Pet::ReapplyScalingAura pet %u, spell %u, index %u, oldValue %u, newValue %u", GetObjectGuid().GetCounter(), holder->GetId(), aura->GetEffIndex(), aura->GetModifier()->m_amount, basePoints);
+    {
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        aura->ApplyModifier(false, true);
+        aura->GetModifier()->m_amount = basePoints;
+        aura->ApplyModifier(true, true);
+    }
+    SetCanModifyStats(true);
+    return true;
+}
+
+void Pet::CastPetPassiveAuras(bool current)
+{
+    Unit* owner = GetOwner();
+
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    // Cast pet passive aura (if not casted as passive)
+    uint32 creature_id;
+
+    switch (getPetType())
+    {
+        case SUMMON_PET:
+        case GUARDIAN_PET:
+        case PROTECTOR_PET:
+            creature_id = GetEntry();
+            break;
+        case HUNTER_PET:
+            creature_id = 1;
+            break;
+        default:
+            creature_id = 0;
+            break;
+    }
+
+    PetPassiveAuraList const* pPassiveAuraList  =  sSpellMgr.GetPetPassiveAuraList(creature_id);
+
+    if (!pPassiveAuraList || pPassiveAuraList->empty())
+        return;
+
+    for (PetPassiveAuraList::const_iterator itr = pPassiveAuraList->begin(); itr != pPassiveAuraList->end(); ++itr)
+    {
+        PetAura const petAura = *itr;
+
+        uint32 auraID = petAura.GetAura(creature_id);
+
+        if (!current && HasAura(auraID))
+            RemoveAurasDueToSpell(auraID);
+        else if (current && !HasAura(auraID))
+        {
+            CastSpell(this, auraID, true);
+            DEBUG_LOG("Cast passive pet aura %u", auraID);
+        }
+    }
+}
+
+PetScalingData* Pet::CalculateScalingData(bool recalculate)
+{
+    if (m_PetScalingData && !recalculate)
+        return m_PetScalingData;
+
+    delete m_PetScalingData;
+
+    m_PetScalingData = new PetScalingData;
+
+    Unit* owner = GetOwner();
+
+    PetScalingDataList const* pScalingDataList;
+
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER)        // if no owner ising record for creature_id = 0. Must be exist.
+        pScalingDataList = sObjectMgr.GetPetScalingData(0);
+    else if (getPetType() == HUNTER_PET)                      // Using creature_id = 1 for hunter pets
+        pScalingDataList = sObjectMgr.GetPetScalingData(1);
+    else if (getPetType() == SUMMON_PET || getPetType() == GUARDIAN_PET || getPetType() == PROTECTOR_PET)
+    {
+        pScalingDataList = sObjectMgr.GetPetScalingData(GetEntry());
+        if (!pScalingDataList)
+        {
+            DEBUG_LOG("No data list for pet %u! Get zero values", GetEntry());
+            pScalingDataList = sObjectMgr.GetPetScalingData(0);
+        }
+    }
+    else
+    {
+        DEBUG_LOG("No selection type data list for pet %u! Get zero values", GetEntry());
+        pScalingDataList = sObjectMgr.GetPetScalingData(0);
+    }
+
+    if (!pScalingDataList || pScalingDataList->empty())                            // Zero values...
+        return m_PetScalingData;
+
+    for (PetScalingDataList::const_iterator itr = pScalingDataList->begin(); itr != pScalingDataList->end(); ++itr)
+    {
+         const PetScalingData* pData = &*itr;
+
+         if (!pData->creatureID || (owner && (!pData->requiredAura || owner->HasSpell(pData->requiredAura) || owner->HasAura(pData->requiredAura) || HasSpell(pData->requiredAura) || HasAura(pData->requiredAura))))
+         {
+             m_PetScalingData->healthBasepoint  += pData->healthBasepoint;
+             m_PetScalingData->healthScale      += pData->healthScale;
+             m_PetScalingData->powerBasepoint   += pData->powerBasepoint;
+             m_PetScalingData->powerScale       += pData->powerScale;
+             m_PetScalingData->APBasepoint      += pData->APBasepoint;
+             m_PetScalingData->APBaseScale      += pData->APBaseScale;
+             m_PetScalingData->attackpowerScale += pData->attackpowerScale;
+             m_PetScalingData->damageScale      += pData->damageScale;
+             m_PetScalingData->spelldamageScale += pData->spelldamageScale;
+             m_PetScalingData->spellHitScale    += pData->spellHitScale;
+             m_PetScalingData->meleeHitScale    += pData->meleeHitScale;
+             m_PetScalingData->expertizeScale   += pData->expertizeScale;
+             m_PetScalingData->attackspeedScale += pData->attackspeedScale;
+             m_PetScalingData->critScale        += pData->critScale;
+             m_PetScalingData->powerregenScale  += pData->powerregenScale;
+             for (int i = 0; i < MAX_STATS; i++)
+             {
+                  m_PetScalingData->statScale[i] += pData->statScale[i];
+             }
+             for (int i = 0; i < MAX_SPELL_SCHOOL; i++)
+             {
+                  m_PetScalingData->resistanceScale[i] += pData->resistanceScale[i];
+             }
+         }
+    }
+    return m_PetScalingData;
+}
+
+// diff contains the time in milliseconds since last regen.
+void Pet::Regenerate(Powers power, uint32 diff)
+{
+    int32 curValue = GetPower(power);
+    uint32 maxValue = GetMaxPower(power);
+
+    float addvalue = 0.0f;
+
+    switch (power)
+    {
+        case POWER_MANA:
+        {
+            float ManaIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_MANA);
+            if (IsUnderLastManaUseEffect())
+            {
+                // Mangos Updates Mana in intervals of 2s, which is correct
+                addvalue += GetFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER) *  ManaIncreaseRate * (float)REGEN_TIME_FULL/IN_MILLISECONDS;
+            }
+            else
+            {
+                addvalue += GetFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER) * ManaIncreaseRate * (float)REGEN_TIME_FULL/IN_MILLISECONDS;
+            }
+            break;
+        }
+        case POWER_RAGE:                                    // Regenerate rage ?
+        {
+            addvalue -= 20 * sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_RAGE_LOSS);
+            break;
+        }
+        case POWER_ENERGY:                                  // Regenerate energy (ghoul)
+        {
+            addvalue += 20 * sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_ENERGY);
+            break;
+        }
+        case POWER_FOCUS:                                   // Hunter pets
+        {
+            addvalue += 10 * sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_FOCUS);
+            break;
+        }
+        case POWER_HAPPINESS:
+        {
+            addvalue = -178.0f;                                   //value is 70/35/17/8/4 (per min) * 1000 / 8 (timer 2 secs)
+            if (isInCombat())                                     //we know in combat happiness fades faster, multiplier guess
+                addvalue = addvalue * 1.5f;
+            ApplyHappinessBonus(true);
+            break;
+        }
+        case POWER_RUNIC_POWER:
+        case POWER_RUNE:
+        case POWER_HEALTH:
+        default:
+            addvalue = 0.0f;
+            break;
+    }
+
+    // Mana regen calculated in Pet::UpdateManaRegen()
+    // Exist only for POWER_MANA, POWER_ENERGY, POWER_FOCUS auras
+    if (power != POWER_MANA)
+    {
+        AuraList const& ModPowerRegenAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN);
+        for(AuraList::const_iterator i = ModPowerRegenAuras.begin(); i != ModPowerRegenAuras.end(); ++i)
+            if ((*i)->GetModifier()->m_miscvalue == (int32)power)
+                addvalue += (*i)->GetModifier()->m_amount;
+
+        AuraList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT);
+        for(AuraList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
+            if ((*i)->GetModifier()->m_miscvalue == (int32)power)
+                addvalue *= ((*i)->GetModifier()->m_amount + 100) / 100.0f;
+    }
+
+    // addvalue computed on a 2sec basis. => update to diff time
+    int32 _addvalue = ceil(addvalue * float(diff) / (float)REGEN_TIME_FULL);
+
+    curValue += _addvalue;
+
+    if (curValue < 0)
+        curValue = 0;
+    else if (curValue > int32(maxValue))
+        curValue = maxValue;
+
+    SetPower(power, curValue);
+}
+
+void Pet::RegenerateHealth(uint32 diff)
+{
+    uint32 curValue = GetHealth();
+    uint32 maxValue = GetMaxHealth();
+
+    if (curValue >= maxValue)
+        return;
+
+    float addvalue = 0.0f;
+    float HealthIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_HEALTH);
+
+    // polymorphed case
+    if (IsPolymorphed())
+        addvalue = (float)GetMaxHealth() / 3.0f;
+    // normal regen case (maybe partly in combat case)
+    else if (!isInCombat() || HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT))
+    {
+        addvalue = OCTRegenHPPerSpirit() * HealthIncreaseRate;
+        if (!isInCombat())
+        {
+            AuraList const& mModHealthRegenPct = GetAurasByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT);
+            for(AuraList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i)
+                addvalue *= (100.0f + (*i)->GetModifier()->m_amount) / 100.0f;
+        }
+        else if (HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT))
+            addvalue *= GetTotalAuraModifier(SPELL_AURA_MOD_REGEN_DURING_COMBAT) / 100.0f;
+    }
+    // always regeneration bonus (including combat)
+    addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT);
+
+    if (addvalue < 0)
+        addvalue = 0;
+
+    addvalue *= (float)diff / REGEN_TIME_FULL;
+
+    ModifyHealth(int32(addvalue));
+}
+
+void Pet::ApplyScalingBonus(ScalingAction* action)
+{
+    if (!IsInWorld())
+        return;
+
+    switch (action->target)
+    {
+        case SCALING_TARGET_ALL:
+            ApplyAllScalingBonuses(action->apply);
+            break;
+        case SCALING_TARGET_STAT:
+            ApplyStatScalingBonus(Stats(action->stat),action->apply);
+            break;
+        case SCALING_TARGET_RESISTANCE:
+            ApplyResistanceScalingBonus(action->stat, action->apply);
+            break;
+        case SCALING_TARGET_ATTACKPOWER:
+            ApplyAttackPowerScalingBonus(action->apply);
+            break;
+        case SCALING_TARGET_DAMAGE:
+            ApplyDamageScalingBonus(action->apply);
+            break;
+        case SCALING_TARGET_SPELLDAMAGE:
+            ApplySpellDamageScalingBonus(action->apply);
+            break;
+        case SCALING_TARGET_HIT:
+            ApplyHitScalingBonus(action->apply);
+            break;
+        case SCALING_TARGET_SPELLHIT:
+            ApplySpellHitScalingBonus(action->apply);
+            break;
+        case SCALING_TARGET_EXPERTIZE:
+            ApplyExpertizeScalingBonus(action->apply);
+            break;
+        case SCALING_TARGET_POWERREGEN:
+            ApplyPowerregenScalingBonus(action->apply);
+            break;
+        case SCALING_TARGET_ATTACKSPEED:
+            ApplyAttackSpeedScalingBonus(action->apply);
+            break;
+        case SCALING_TARGET_MAX:
+        default:
+            break;
+    }
+}
+
+void Pet::AddScalingAction(ScalingTarget target, uint32 stat, bool apply)
+{
+    m_scalingQueue.push(ScalingAction(target,stat,apply));
+}
+
+void ApplyScalingBonusWithHelper::operator() (Unit* unit) const
+{
+    if (!unit || !unit->GetObjectGuid().IsPet())
+        return;
+
+    Pet* pet = (Pet*)unit;
+
+    if (pet->IsInWorld())
+        pet->AddScalingAction(target, stat, apply);
+}
+
+void Pet::ApplyHappinessBonus(bool apply)
+{
+    if (!IsInWorld())
+        return;
+
+    if (GetHappinessState() == m_HappinessState)
+        return;
+    else
+        m_HappinessState = GetHappinessState();
+
+    if (apply)
+    {
+        RemoveAurasDueToSpell(8875);
+        int32 basePoints = 0;
+        switch (HappinessState(m_HappinessState))
+        {
+            case HAPPY:
+                // 125% of normal damage
+                basePoints = 25;
+                break;
+            case CONTENT:
+                // 100% of normal damage, nothing to modify
+                basePoints = 0;
+                break;
+            case UNHAPPY:
+                // 75% of normal damage
+                basePoints = -25;
+                break;
+            default:
+                basePoints = 0;
+                break;
+        }
+
+        CastCustomSpell(this, 8875, &basePoints, NULL, NULL, true);
+
+        UpdateDamagePhysical(BASE_ATTACK);
+        UpdateDamagePhysical(RANGED_ATTACK);
+        UpdateSpellPower();
+    }
+}
+
+float Pet::OCTRegenHPPerSpirit()
+{
+    Unit* owner = GetOwner();
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
+        return (GetPower(POWER_MANA) > 0) ? (GetStat(STAT_SPIRIT) * 0.25f) : (GetStat(STAT_SPIRIT) * 0.80f);
+
+    uint32 level = ((Player*)owner)->getLevel();
+    uint32 pclass = ((Player*)owner)->getClass();
+
+    if (level > GT_MAX_LEVEL) level = GT_MAX_LEVEL;
+
+    GtOCTRegenHPEntry     const *baseRatio = sGtOCTRegenHPStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
+    GtRegenHPPerSptEntry  const *moreRatio = sGtRegenHPPerSptStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
+
+    if (baseRatio == NULL || moreRatio == NULL)
+        return 0.0f;
+
+    // Formula from PaperDollFrame script
+    float spirit = GetStat(STAT_SPIRIT);
+    float baseSpirit = spirit;
+    if (baseSpirit > 50)
+        baseSpirit = 50;
+
+    float moreSpirit = spirit - baseSpirit;
+    float regen = baseSpirit * baseRatio->ratio + moreSpirit * moreRatio->ratio;
+    return regen;
+}
+
+float Pet::OCTRegenMPPerSpirit()
+{
+    Unit* owner = GetOwner();
+
+    if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
+        return ((GetStat(STAT_SPIRIT) / 5.0f + 17.0f)/sqrt(GetStat(STAT_INTELLECT)));
+
+    uint32 level = ((Player*)owner)->getLevel();
+    uint32 pclass = ((Player*)owner)->getClass();
+
+    if (level > GT_MAX_LEVEL) level = GT_MAX_LEVEL;
+
+    GtRegenMPPerSptEntry const* moreRatio = sGtRegenMPPerSptStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
+
+    if (moreRatio == NULL)
+        return 0.0f;
+
+    // Formula get from PaperDollFrame script
+    float spirit    = GetStat(STAT_SPIRIT);
+    float regen     = spirit * moreRatio->ratio;
+    return regen;
+}
+
+void ApplyArenaPreparationWithHelper::operator() (Unit* unit) const
+{
+    if (!unit || !unit->GetObjectGuid().IsPet())
+        return;
+
+    if (unit->IsInWorld())
+        unit->HandleArenaPreparation(apply);
+}
+
+Unit* Pet::SelectPreferredTargetForSpell(SpellEntry const* spellInfo)
+{
+    Unit* target = NULL;
+
+    if (spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
+        return NULL;
+    if (spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
+        return NULL;
+
+    SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->GetRangeIndex());
+
+    float max_range_friendly = GetSpellMaxRange(srange,true);
+    float max_range_unfriendly = (spellInfo->GetRangeIndex() == SPELL_RANGE_IDX_COMBAT) ?
+                                    GetObjectBoundingRadius() + 1.0f :
+                                    GetSpellMaxRange(srange,false);
+
+    if (Player* modOwner = GetSpellModOwner())
+    {
+        modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_RANGE, max_range_friendly);
+        modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_RANGE, max_range_unfriendly);
+    }
+
+    switch (GetPreferredTargetForSpell(spellInfo))
+    {
+        case SPELL_PREFERRED_TARGET_SELF:
+            target = this;
+            break;
+
+        case SPELL_PREFERRED_TARGET_VICTIM:
+            if (Unit* pVictim = getVictim())
+                target = pVictim;
+            else
+                target = SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0, spellInfo, 0);
+            break;
+
+        case SPELL_PREFERRED_TARGET_ENEMY:
+            target = SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0, spellInfo, 0);
+            break;
+
+        case SPELL_PREFERRED_TARGET_OWNER:
+            if (GetOwner())
+                target = GetOwner();
+            else
+                target = this;
+            break;
+
+        case SPELL_PREFERRED_TARGET_FRIEND:
+        {
+            if (PetAI* ai = ((PetAI*)AI()))
+            {
+                GuidSet const& allys = ai->GetAllyGuids();
+                uint32 ally_size = allys.size();
+                switch (ally_size)
+                {
+                    case 0:
+                        target = NULL;
+                        break;
+                    case 1:
+                        target = GetMap()->GetUnit(*allys.begin());
+                        break;
+                    default:
+                    {
+                        target = NULL;
+                        uint32 t_num = urand(0,ally_size -1);
+                        for (GuidSet::const_iterator itr = allys.begin(); itr != allys.end(); ++itr)
+                        {
+                            if (t_num > 0)
+                            {
+                                --t_num;
+                                continue;
+                            }
+                            target = GetMap()->GetUnit(*itr);
+                            break;
+                        }
+                    }
+                }
+            }
+            else
+                target = SelectRandomFriendlyTarget(this,max_range_friendly);
+
+            if (target == this)
+                target = NULL;
+            break;
+        }
+        case SPELL_PREFERRED_TARGET_RANDOM:
+            target = urand(0, 1) ? SelectRandomFriendlyTarget(NULL,max_range_friendly) : SelectRandomUnfriendlyTarget(NULL, max_range_unfriendly);
+            break;
+
+        case SPELL_PREFERRED_TARGET_AREA:
+        case SPELL_PREFERRED_TARGET_MAX:
+        default:
+            break;
+    }
+    /*
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS,"PetAI::SelectPreferredTargetForSpell %s, spell %u preferred %u Target %s",
+                            GetObjectGuid().GetString().c_str(),
+                            spellInfo->Id,
+                            GetPreferredTargetForSpell(spellInfo),
+                            target ? target->GetObjectGuid().GetString().c_str() : "<none>");
+    */
+    if (!target)
+        return NULL;
+
+    if (target && target != this)
+    {
+        if (spellInfo->GetRangeIndex() == SPELL_RANGE_IDX_COMBAT)
+            max_range_unfriendly = GetCombatReach(target, true);
+
+        bool friendly = IsFriendlyTo(target);
+        float dist = GetDistance(target);
+        if ((dist > (friendly ? max_range_friendly : max_range_unfriendly)) || dist < GetSpellMinRange(srange, friendly))
+            return NULL;
+    }
+
+    if (target && IsSpellAppliesAura(spellInfo))
+    {
+        for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
+        {
+            if (target && spellInfo->Effect[j] == SPELL_EFFECT_APPLY_AURA)
+            {
+                if (spellInfo->StackAmount <= 1)
+                {
+                    if (target->HasAura(spellInfo->Id, SpellEffectIndex(j)))
+                        return NULL;
+                }
+                else
+                {
+                    if (Aura* aura = target->GetAura(spellInfo->Id, SpellEffectIndex(j)))
+                        if (aura->GetStackAmount() >= spellInfo->StackAmount)
+                            return NULL;
+                }
+            }
+            else if (target && IsAreaAuraEffect(spellInfo->Effect[j]))
+            {
+                if (target->HasAura(spellInfo->Id))
+                    return NULL;
+            }
+        }
+    }
+
+    if (target && IsDispelSpell(spellInfo))
+    {
+        uint8 dispel_count = 0;
+
+        Unit::SpellAuraHolderMap const& auras = target->GetSpellAuraHolderMap();
+        for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
+        {
+            if (!itr->second || itr->second->IsDeleted())
+                continue;
+
+            if ((1 << itr->second->GetSpellProto()->Dispel) & GetDispellMask(DispelType(spellInfo->EffectMiscValue[EFFECT_INDEX_0])))
+            {
+                if (itr->second->GetSpellProto()->Dispel == DISPEL_MAGIC)
+                {
+                    bool positive = true;
+                    if (!itr->second->IsPositive())
+                        positive = false;
+                    else
+                        positive = !itr->second->GetSpellProto()->HasAttribute(SPELL_ATTR_EX_NEGATIVE);
+
+                    if (positive == IsFriendlyTo(target))
+                        continue;
+                }
+                ++dispel_count;
+            }
+        }
+        if (dispel_count == 0)
+            return NULL;
+    }
+
+    if (target && HasInterruptSpellEffect(spellInfo))
+    {
+        if (!target->IsNonMeleeSpellCasted(false))
+            return NULL;
+    }
+
+    return target;
 }
diff --git a/src/game/Pet.h b/src/game/Pet.h
index bd53105a950..e3fb7dbe9e6 100644
--- a/src/game/Pet.h
+++ b/src/game/Pet.h
@@ -47,17 +47,6 @@ enum PetSaveMode
     PET_SAVE_REAGENTS          =  101                       // PET_SAVE_NOT_IN_SLOT with reagents return
 };
 
-// There might be a lot more
-enum PetModeFlags
-{
-    PET_MODE_UNKNOWN_0         = 0x0000001,
-    PET_MODE_UNKNOWN_2         = 0x0000100,
-    PET_MODE_DISABLE_ACTIONS   = 0x8000000,
-
-    // autoset in client at summon
-    PET_MODE_DEFAULT           = PET_MODE_UNKNOWN_0 | PET_MODE_UNKNOWN_2,
-};
-
 enum HappinessState
 {
     UNHAPPY = 1,
@@ -121,8 +110,35 @@ enum PetNameInvalidReason
     PET_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME              = 16
 };
 
+enum ScalingTarget
+{
+    SCALING_TARGET_ALL          = 0,
+    SCALING_TARGET_STAT,
+    SCALING_TARGET_RESISTANCE,
+    SCALING_TARGET_ATTACKPOWER,
+    SCALING_TARGET_DAMAGE,
+    SCALING_TARGET_SPELLDAMAGE,
+    SCALING_TARGET_HIT,
+    SCALING_TARGET_SPELLHIT,
+    SCALING_TARGET_EXPERTIZE,
+    SCALING_TARGET_POWERREGEN,
+    SCALING_TARGET_ATTACKSPEED,
+    SCALING_TARGET_MAX
+};
+
+struct ScalingAction
+{
+    explicit ScalingAction(ScalingTarget _target, uint32 _stat, bool _apply ) :
+                                         target(_target), stat(_stat), apply(_apply)
+    {}
+    ScalingTarget target;
+    uint32        stat;
+    bool          apply;
+};
+
 typedef UNORDERED_MAP<uint32, PetSpell> PetSpellMap;
 typedef std::vector<uint32> AutoSpellList;
+typedef std::map<uint8, uint32> PetNumberList;
 
 #define HAPPINESS_LEVEL_SIZE        333000
 
@@ -132,6 +148,7 @@ typedef std::vector<uint32> AutoSpellList;
 #define PET_FOLLOW_ANGLE (M_PI_F/2.0f)
 
 class Player;
+struct PetScalingData;
 
 class MANGOS_DLL_SPEC Pet : public Creature
 {
@@ -139,9 +156,6 @@ class MANGOS_DLL_SPEC Pet : public Creature
         explicit Pet(PetType type = MAX_PET_TYPE);
         virtual ~Pet();
 
-        void AddToWorld();
-        void RemoveFromWorld();
-
         PetType getPetType() const { return m_petType; }
         void setPetType(PetType type) { m_petType = type; }
         bool isControlled() const { return getPetType()==SUMMON_PET || getPetType()==HUNTER_PET; }
@@ -149,15 +163,15 @@ class MANGOS_DLL_SPEC Pet : public Creature
 
         bool IsPermanentPetFor(Player* owner);              // pet have tab in character windows and set UNIT_FIELD_PETNUMBER
 
-        bool Create (uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo const* cinfo, uint32 pet_number);
-        bool CreateBaseAtCreature(Creature* creature);
-        bool LoadPetFromDB( Player* owner,uint32 petentry = 0,uint32 petnumber = 0, bool current = false );
+        bool Create (uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo const* cinfo, uint32 pet_number, Unit* owner);
+        bool CreateBaseAtCreature(Creature* creature, Unit* owner);
+        bool LoadPetFromDB( Player* owner,uint32 petentry = 0,uint32 petnumber = 0, bool current = false, CreatureCreatePos* pos = NULL );
         void SavePetToDB(PetSaveMode mode);
         void Unsummon(PetSaveMode mode, Unit* owner = NULL);
         static void DeleteFromDB(uint32 guidlow, bool separate_transaction = true);
 
         void SetDeathState(DeathState s);                   // overwrite virtual Creature::SetDeathState and Unit::SetDeathState
-        void Update(uint32 update_diff, uint32 diff) override;  // overwrite virtual Creature::Update and Unit::Update
+        virtual void Update(uint32 update_diff, uint32 diff) override;  // overwrite virtual Creature::Update and Unit::Update
 
         uint8 GetPetAutoSpellSize() const { return m_autospells.size(); }
         uint32 GetPetAutoSpellOnPos(uint8 pos) const
@@ -168,9 +182,10 @@ class MANGOS_DLL_SPEC Pet : public Creature
                 return m_autospells[pos];
         }
 
+        Unit* SelectPreferredTargetForSpell(SpellEntry const* spellInfo);
+
         void RegenerateAll(uint32 update_diff);             // overwrite Creature::RegenerateAll
-        void Regenerate(Powers power);
-        void LooseHappiness();
+        void Regenerate(Powers power, uint32 diff);
         HappinessState GetHappinessState();
         void GivePetXP(uint32 xp);
         void GivePetLevel(uint32 level);
@@ -178,10 +193,7 @@ class MANGOS_DLL_SPEC Pet : public Creature
         bool InitStatsForLevel(uint32 level, Unit* owner = NULL);
         bool HaveInDiet(ItemPrototype const* item) const;
         uint32 GetCurrentFoodBenefitLevel(uint32 itemlevel);
-        void SetDuration(int32 dur) { m_duration = dur; }
-
-        int32 GetBonusDamage() { return m_bonusdamage; }
-        void SetBonusDamage(int32 damage) { m_bonusdamage = damage; }
+        void SetDuration(uint32 dur) { m_duration = dur; }
 
         bool UpdateStats(Stats stat);
         bool UpdateAllStats();
@@ -191,19 +203,39 @@ class MANGOS_DLL_SPEC Pet : public Creature
         void UpdateMaxPower(Powers power);
         void UpdateAttackPowerAndDamage(bool ranged = false);
         void UpdateDamagePhysical(WeaponAttackType attType);
+        void UpdateSpellPower();
+        void UpdateManaRegen();
 
         bool CanTakeMoreActiveSpells(uint32 SpellIconID);
         void ToggleAutocast(uint32 spellid, bool apply);
 
-        void ApplyModeFlags(PetModeFlags mode, bool apply);
-        PetModeFlags GetModeFlags() const { return m_petModeFlags; }
-
         bool HasSpell(uint32 spell) const;
 
         void LearnPetPassives();
         void CastPetAuras(bool current);
         void CastPetAura(PetAura const* aura);
 
+        void RegenerateHealth(uint32 diff);
+        float OCTRegenHPPerSpirit();
+        float OCTRegenMPPerSpirit();
+        void CastPetPassiveAuras(bool current);
+        void ApplyScalingBonus(ScalingAction* action);
+        void ApplyAllScalingBonuses(bool apply);
+        void ApplyStatScalingBonus(Stats stat, bool apply);
+        void ApplyResistanceScalingBonus(uint32 school, bool apply);
+        void ApplyAttackPowerScalingBonus(bool apply);
+        void ApplyDamageScalingBonus(bool apply);
+        void ApplySpellDamageScalingBonus(bool apply);
+        void ApplyHitScalingBonus(bool apply);
+        void ApplySpellHitScalingBonus(bool apply);
+        void ApplyExpertizeScalingBonus(bool apply);
+        void ApplyPowerregenScalingBonus(bool apply);
+        void ApplyAttackSpeedScalingBonus(bool apply);
+        bool ReapplyScalingAura(Aura* aura, int32 basePoints);
+        PetScalingData* CalculateScalingData( bool recalculate = false );
+        void AddScalingAction(ScalingTarget target, uint32 stat, bool apply);
+        void ApplyHappinessBonus(bool apply);
+
         void _LoadSpellCooldowns();
         void _SaveSpellCooldowns();
         void _LoadAuras(uint32 timediff);
@@ -224,9 +256,8 @@ class MANGOS_DLL_SPEC Pet : public Creature
 
         void InitPetCreateSpells();
 
-        bool resetTalents(bool no_cost = false);
+        bool resetTalents();
         static void resetTalentsForAllPetsOf(Player* owner, Pet* online_pet = NULL);
-        uint32 resetTalentsCost() const;
         void InitTalentForLevel();
 
         uint8 GetMaxTalentPointsForLevel(uint32 level);
@@ -234,33 +265,51 @@ class MANGOS_DLL_SPEC Pet : public Creature
         void SetFreeTalentPoints(uint8 points) { SetByteValue(UNIT_FIELD_BYTES_1, 1, points); }
         void UpdateFreeTalentPoints(bool resetIfNeed = true);
 
-        uint32  m_resetTalentsCost;
-        time_t  m_resetTalentsTime;
         uint32  m_usedTalentCount;
 
         const uint64& GetAuraUpdateMask() const { return m_auraUpdateMask; }
         void SetAuraUpdateMask(uint8 slot) { m_auraUpdateMask |= (uint64(1) << slot); }
         void ResetAuraUpdateMask() { m_auraUpdateMask = 0; }
 
+        float GetPetFollowAngle() const { return m_petFollowAngle; }
+        void SetPetFollowAngle(float angle) { m_petFollowAngle = angle; }
+
+        Unit* GetOwner() const;
+        bool GetNeedSave() const { return m_needSave; }
+        void SetNeedSave(bool needSave) { m_needSave = needSave; }
+        uint8 GetPetCounter() { return m_petCounter; }
+        void SetPetCounter(uint8 counter) { m_petCounter = counter; }
+        bool Summon();
+        void SetCreateSpellID(uint32 SpellID) { m_createSpellID = SpellID; }
+        uint32 GetCreateSpellID() { return m_createSpellID; }
+
+        bool IsInEvadeMode() const override;
+
         // overwrite Creature function for name localization back to WorldObject version without localization
         const char* GetNameForLocaleIdx(int32 locale_idx) const { return WorldObject::GetNameForLocaleIdx(locale_idx); }
 
         DeclinedName const* GetDeclinedNames() const { return m_declinedname; }
 
         bool    m_removed;                                  // prevent overwrite pet state in DB at next Pet::Update if pet already removed(saved)
+        bool    m_updated;                                  // pet updated now
     protected:
         uint32  m_happinessTimer;
         PetType m_petType;
         int32   m_duration;                                 // time until unsummon (used mostly for summoned guardians and not used for controlled pets)
-        int32   m_bonusdamage;
         uint64  m_auraUpdateMask;
         bool    m_loading;
+        bool    m_needSave;                                 // is pet needed to be saved in DB
+        float   m_petFollowAngle;                           // follow angle for the pet
+        uint8   m_petCounter;
+        PetScalingData*  m_PetScalingData;
+        PetScalingData*  m_baseBonusData;
+        uint32  m_createSpellID;
+        std::queue<ScalingAction> m_scalingQueue;
+        uint8   m_HappinessState;
 
         DeclinedName *m_declinedname;
 
     private:
-        PetModeFlags m_petModeFlags;
-
         void SaveToDB(uint32, uint8, uint32)                // overwrited of Creature::SaveToDB     - don't must be called
         {
             MANGOS_ASSERT(false);
@@ -270,4 +319,60 @@ class MANGOS_DLL_SPEC Pet : public Creature
             MANGOS_ASSERT(false);
         }
 };
+
+
+struct ApplyScalingBonusWithHelper
+{
+    explicit ApplyScalingBonusWithHelper(ScalingTarget _target, uint32 _stat, bool _apply ) :
+                                         target(_target), stat(_stat), apply(_apply)
+    {}
+    void operator()(Unit* unit) const;
+    ScalingTarget target;
+    uint32 stat;
+    bool apply;
+};
+
+struct ApplyArenaPreparationWithHelper
+{
+    explicit ApplyArenaPreparationWithHelper(bool _apply ) : apply(_apply)
+    {}
+    void operator()(Unit* unit) const;
+    bool apply;
+};
+
+struct DoPetActionWithHelper
+{
+    explicit DoPetActionWithHelper( Player* _owner, uint8 _flag, uint32 _spellid, ObjectGuid _petGuid, ObjectGuid _targetGuid) :
+             owner(_owner), flag(_flag), spellid(_spellid), petGuid(_petGuid), targetGuid(_targetGuid)
+    {}
+    void operator()(Unit* unit) const { unit->DoPetAction(owner, flag, spellid, petGuid, targetGuid); }
+    Player* owner;
+    uint8 flag;
+    uint32 spellid;
+    ObjectGuid petGuid;
+    ObjectGuid targetGuid;
+};
+
+struct DoPetCastWithHelper
+{
+    explicit DoPetCastWithHelper( Player* _owner, uint8 _cast_count, SpellCastTargets* _targets, SpellEntry const* _spellInfo ) :
+             owner(_owner), cast_count(_cast_count), targets(_targets), spellInfo(_spellInfo)
+    {}
+    void operator()(Unit* unit) const { unit->DoPetCastSpell(owner,cast_count,targets,spellInfo ); }
+    Player* owner;
+    uint8 cast_count;
+    SpellCastTargets* targets;
+    SpellEntry const* spellInfo;
+};
+
+struct AttackedByHelper
+{
+    explicit AttackedByHelper(Unit* _attacker) : attacker(_attacker)
+    {}
+    void operator()(Unit* unit) const { unit->AttackedBy(attacker); };
+    Unit* attacker;
+};
+
+typedef UNORDERED_MAP<uint32,std::string> KnownPetNames;
+
 #endif
diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp
index a9361cef846..ea8c0dd3077 100644
--- a/src/game/PetAI.cpp
+++ b/src/game/PetAI.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,94 +31,388 @@
 
 int PetAI::Permissible(const Creature *creature)
 {
-    if( creature->IsPet())
+    if (creature->IsPet())
         return PERMIT_BASE_SPECIAL;
 
     return PERMIT_BASE_NO;
 }
 
-PetAI::PetAI(Creature *c) : CreatureAI(c), i_tracker(TIME_INTERVAL_LOOK), inCombat(false)
+PetAI::PetAI(Creature* c) : CreatureAI(c), inCombat(false)
 {
-    m_AllySet.clear();
+    Reset();
+}
+
+void PetAI::Reset()
+{
+    m_primaryTargetGuid.Clear();
+    m_savedTargetGuid.Clear();
+    m_attackDistanceRecheckTimer.SetInterval(TIME_INTERVAL_LOOK);
+    m_attackDistanceRecheckTimer.Reset();
+    m_updateAlliesTimer.SetInterval(ALLIES_UPDATE_TIME);
+    m_updateAlliesTimer.Reset();
     UpdateAllies();
+
+    for (uint8 i = PET_SPELL_PASSIVE; i < PET_SPELL_MAX; ++i)
+        m_spellType[i].clear();
+
+    m_AIType = PET_AI_PASSIVE;
+    m_attackDistance  = 0.0f;
+    float f_range   = 0.0f;
+
+    if (!m_creature->GetCharmInfo())
+        return;
+
+    uint32 spellsSize = m_creature->IsPet() ? ((Pet*)m_creature)->GetPetAutoSpellSize() : m_creature->GetPetAutoSpellSize();
+    uint8 rangedDamageSpells = 0;
+    uint8 meleeDamageSpells = 0;
+
+    // classification for pet spells
+    for (uint32 i = 0; i < spellsSize; ++i)
+    {
+        uint32 spellID = m_creature->IsPet() ? ((Pet*)m_creature)->GetPetAutoSpellOnPos(i) : m_creature->GetPetAutoSpellOnPos(i);
+        if (!spellID)
+            continue;
+
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellID);
+        if (!spellInfo)
+            continue;
+
+        if (IsPassiveSpell(spellInfo))
+        {
+            m_spellType[PET_SPELL_PASSIVE].insert(spellID);
+            continue;
+        }
+
+        if (IsNonCombatSpell(spellInfo))
+        {
+            // Voidwalker Consume Shadows
+            if (IsChanneledSpell(spellInfo))
+                m_spellType[PET_SPELL_HEAL].insert(spellID);
+            else
+                m_spellType[PET_SPELL_NONCOMBAT].insert(spellID);
+            continue;
+        }
+
+        // need more correct define this type
+        if (IsSpellReduceThreat(spellInfo) || IsChanneledSpell(spellInfo))
+        {
+            m_spellType[PET_SPELL_DEFENCE].insert(spellID);
+            continue;
+        }
+
+        // Voracious Appetite && Cannibalize && Carrion Feeder
+        if (spellInfo->HasAttribute(SPELL_ATTR_ABILITY) && spellInfo->HasAttribute(SPELL_ATTR_EX2_ALLOW_DEAD_TARGET))
+        {
+            m_spellType[PET_SPELL_HEAL].insert(spellID);
+            continue;
+        }
+
+        if (IsPositiveSpell(spellInfo) && IsSpellAppliesAura(spellInfo))
+        {
+            m_spellType[PET_SPELL_BUFF].insert(spellID);
+            continue;
+        }
+
+        if (spellInfo->HasAttribute(SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY))
+        {
+            m_spellType[PET_SPELL_FREEACTION].insert(spellID);
+            continue;
+        }
+
+        // don't have SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY !
+        if (spellInfo->HasAttribute(SPELL_ATTR_EX_CANT_REFLECTED) ||
+            spellInfo->HasAttribute(SPELL_ATTR_EX7_HAS_CHARGE_EFFECT))
+        {
+            m_spellType[PET_SPELL_ATTACKSTART].insert(spellID);
+            continue;
+        }
+
+        if (IsSpellIncreaseThreat(spellInfo))
+        {
+            m_spellType[PET_SPELL_THREAT].insert(spellID);
+            continue;
+        }
+
+        // all non-combat spells classified.
+        switch (spellInfo->GetRangeIndex())
+        {
+            case SPELL_RANGE_IDX_COMBAT:
+            {
+                if (IsSpellCauseDamage(spellInfo))
+                {
+                    m_spellType[PET_SPELL_MELEE].insert(spellID);
+                    ++meleeDamageSpells;
+                }
+                else
+                {
+                    m_spellType[PET_SPELL_SPECIAL].insert(spellID);
+                }
+                break;
+            }
+            // possible debuffs or auras?
+            case SPELL_RANGE_IDX_SELF_ONLY:
+            case SPELL_RANGE_IDX_ANYWHERE:
+            {
+                m_spellType[PET_SPELL_SPECIAL].insert(spellID);
+                break;
+            }
+            default:
+            {
+                float range = GetSpellMaxRange(sSpellRangeStore.LookupEntry(spellInfo->GetRangeIndex()), false);
+                if (f_range < M_NULL_F || (range > M_NULL_F && range < f_range))
+                    f_range = range;
+                if (IsSpellCauseDamage(spellInfo))
+                {
+                    m_spellType[PET_SPELL_RANGED].insert(spellID);
+                    ++rangedDamageSpells;
+                }
+                else
+                {
+                    m_spellType[PET_SPELL_SPECIAL].insert(spellID);
+                }
+                break;
+            }
+        }
+    }
+
+    // define initial AI type
+    if (m_creature->IsVehicle())
+        m_AIType = PET_AI_PASSIVE;
+
+    if (m_spellType[PET_SPELL_RANGED].size() > 0 && (m_spellType[PET_SPELL_MELEE].size() < m_spellType[PET_SPELL_RANGED].size()))
+    {
+        m_AIType = PET_AI_RANGED;
+        m_attackDistance = f_range - m_creature->GetObjectBoundingRadius() - 2.0f;
+        if (m_attackDistance < 20.0f)
+            m_attackDistance = 18.0f;
+    }
+    else
+    {
+        m_AIType = PET_AI_MELEE;
+        m_attackDistance = 0.0f;
+    }
+    m_savedAIType = m_AIType;
+
+    m_creature->GetMotionMaster()->MoveTargetedHome();
+
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS,"PetAI::Reset %s, AI %u dist %f, spells: " SIZEFMTD " " SIZEFMTD " " SIZEFMTD " " SIZEFMTD " " SIZEFMTD " " SIZEFMTD " " SIZEFMTD " " SIZEFMTD " " SIZEFMTD " " SIZEFMTD " " SIZEFMTD " " SIZEFMTD ,
+        m_creature->GetObjectGuid().GetString().c_str(),
+        m_AIType,
+        m_attackDistance,
+        m_spellType[PET_SPELL_PASSIVE].size(),
+        m_spellType[PET_SPELL_NONCOMBAT].size(),
+        m_spellType[PET_SPELL_BUFF].size(),
+        m_spellType[PET_SPELL_DEBUFF].size(),
+        m_spellType[PET_SPELL_FREEACTION].size(),
+        m_spellType[PET_SPELL_ATTACKSTART].size(),
+        m_spellType[PET_SPELL_THREAT].size(),
+        m_spellType[PET_SPELL_MELEE].size(),
+        m_spellType[PET_SPELL_RANGED].size(),
+        m_spellType[PET_SPELL_DEFENCE].size(),
+        m_spellType[PET_SPELL_SPECIAL].size(),
+        m_spellType[PET_SPELL_HEAL].size()
+        );
 }
 
-void PetAI::MoveInLineOfSight(Unit *u)
+void PetAI::MoveInLineOfSight(Unit* pWho)
 {
+    if (m_creature->hasUnitState(UNIT_STAT_CAN_NOT_REACT))
+        return;
+
     if (m_creature->getVictim())
         return;
 
-    if (m_creature->IsPet() && ((Pet*)m_creature)->GetModeFlags() & PET_MODE_DISABLE_ACTIONS)
+    if (m_savedTargetGuid && m_savedTargetGuid == pWho->GetObjectGuid())
+        return;
+
+    CharmInfo* charmInfo = m_creature->GetCharmInfo();
+    if (!charmInfo)
+        return;
+
+    if (m_creature->IsPet() && charmInfo->HasState(CHARM_STATE_ACTION, ACTIONS_DISABLE))
+        return;
+
+    if (!charmInfo->HasState(CHARM_STATE_REACT, REACT_AGGRESSIVE))
+        return;
+
+    if (!pWho->isTargetableForAttack() || !m_creature->IsHostileTo(pWho) ||
+        !pWho->isInAccessablePlaceFor(m_creature) ||
+        !pWho->isVisibleForOrDetect(m_creature, m_creature, true))
+        return;
+
+    float attackRadius = m_creature->GetAttackDistance(pWho);
+    if (m_creature->IsWithinDistInMap(pWho, attackRadius) && m_creature->GetDistanceZ(pWho) <= CREATURE_Z_ATTACK_RANGE)
+        AttackStart(pWho);
+}
+
+void PetAI::AttackStart(Unit* pTarget)
+{
+    m_savedTargetGuid.Clear();
+
+    if (!pTarget || (m_creature->IsPet() && ((Pet*)m_creature)->getPetType() == MINI_PET))
+        return;
+
+    m_creature->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_COMBAT);
+
+    if (!pTarget->isVisibleForOrDetect(m_creature, m_creature, true))
         return;
 
-    if (!m_creature->GetCharmInfo() || !m_creature->GetCharmInfo()->HasReactState(REACT_AGGRESSIVE))
+    Unit* owner = m_creature->GetCharmerOrOwner();
+    if (owner && !pTarget->isVisibleForOrDetect(owner, owner, true))
         return;
 
-    if (u->isTargetableForAttack() && m_creature->IsHostileTo( u ) &&
-        u->isInAccessablePlaceFor(m_creature))
+    if (m_creature->Attack(pTarget, m_AIType != PET_AI_RANGED))
+    {
+        inCombat = true;
+        if (!UpdateAIType())
+            MoveToVictim(pTarget);
+    }
+}
+
+bool PetAI::UpdateAIType()
+{
+    if (!inCombat && m_AIType != PET_AI_PASSIVE)
+    {
+        m_savedAIType = m_AIType;
+        m_AIType = PET_AI_PASSIVE;
+        return true;
+    }
+    else if (inCombat && m_AIType == PET_AI_PASSIVE)
+    {
+        m_AIType = m_savedAIType;
+    }
+
+    if (!inCombat)
+        return false;
+
+    if (m_creature->IsVehicle() && m_creature->GetCharmerOrOwner())
+    {
+        m_AIType = PET_AI_PASSIVE;
+        return false;
+    }
+
+    if (sWorld.getConfig(CONFIG_BOOL_PET_ADVANCED_AI_SLACKER) &&
+        m_AIType != PET_AI_SLACKER &&
+        !m_creature->GetCharmInfo()->HasState(CHARM_STATE_REACT, REACT_AGGRESSIVE) &&
+        m_creature->HasAuraState(AURA_STATE_HEALTHLESS_20_PERCENT))
     {
-        float attackRadius = m_creature->GetAttackDistance(u);
-        if(m_creature->IsWithinDistInMap(u, attackRadius) && m_creature->GetDistanceZ(u) <= CREATURE_Z_ATTACK_RANGE)
+        m_savedAIType = m_AIType;
+        m_AIType = PET_AI_SLACKER;
+        MoveToVictim(m_creature->getVictim());
+        return true;
+    }
+    else if (sWorld.getConfig(CONFIG_BOOL_PET_ADVANCED_AI_SLACKER) &&
+        m_AIType == PET_AI_SLACKER &&
+        (!m_creature->HasAuraState(AURA_STATE_HEALTHLESS_20_PERCENT) ||
+        m_creature->GetCharmInfo()->HasState(CHARM_STATE_REACT, REACT_AGGRESSIVE)))
+    {
+        m_AIType = m_savedAIType;
+        m_creature->GetMotionMaster()->MoveIdle();
+        MoveToVictim(m_creature->getVictim());
+        return true;
+    }
+
+    if (m_AIType == PET_AI_RANGED)
+    {
+        if (m_creature->GetPower(POWER_MANA) < m_creature->GetMaxPower(POWER_MANA) / 10)
         {
-            if(m_creature->IsWithinLOSInMap(u))
-            {
-                AttackStart(u);
-                u->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
-            }
+            m_AIType = PET_AI_RANGED_NOAMMO;
+            MoveToVictim(m_creature->getVictim());
+            return true;
+        }
+    }
+    else if (m_AIType == PET_AI_RANGED_NOAMMO)
+    {
+        if (m_creature->GetPower(POWER_MANA) > m_creature->GetMaxPower(POWER_MANA) / 4)
+        {
+            m_AIType = PET_AI_RANGED;
+            MoveToVictim(m_creature->getVictim());
+            return true;
         }
     }
+    return false;
 }
 
-void PetAI::AttackStart(Unit *u)
+void PetAI::MoveToVictim(Unit* pTarget)
 {
-    if(!u || (m_creature->IsPet() && ((Pet*)m_creature)->getPetType() == MINI_PET))
+    if (!pTarget)
         return;
 
-    if(m_creature->Attack(u,true))
+    switch (m_AIType)
     {
-        // TMGs call CreatureRelocation which via MoveInLineOfSight can call this function
-        // thus with the following clear the original TMG gets invalidated and crash, doh
-        // hope it doesn't start to leak memory without this :-/
-        //i_pet->Clear();
-        m_creature->GetMotionMaster()->MoveChase(u);
-        inCombat = true;
+        case PET_AI_PASSIVE:
+        case PET_AI_SLACKER:
+        case PET_AI_HEALER:
+            m_creature->GetMotionMaster()->MoveTargetedHome();
+            break;
+        case PET_AI_RANGED:
+            if (sWorld.getConfig(CONFIG_BOOL_PET_ADVANCED_AI))
+                m_creature->GetMotionMaster()->MoveChase(pTarget, m_attackDistance, m_creature->GetAngle(pTarget) + frand(-M_PI_F / 4.0f, M_PI_F / 4.0f));
+            else
+                m_creature->GetMotionMaster()->MoveChase(pTarget);
+            break;
+        case PET_AI_MELEE:
+        case PET_AI_RANGED_NOAMMO:
+        default:
+            m_creature->GetMotionMaster()->MoveChase(pTarget);
+            break;
     }
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS,"PetAI::MoveToVictim pet %s move to %s, distance %f,  AI type %u",
+        m_creature->GetGuidStr().c_str(), pTarget ? pTarget->GetGuidStr().c_str() : "<none>", m_attackDistance, m_AIType);
 }
 
 void PetAI::EnterEvadeMode()
 {
+    Reset();
+    UpdateAIType();
+    m_creature->GetMotionMaster()->MoveTargetedHome();
 }
 
-bool PetAI::IsVisible(Unit *pl) const
+bool PetAI::IsVisible(Unit* pl) const
 {
     return _isVisible(pl);
 }
 
 bool PetAI::_needToStop() const
 {
+    Unit* pVictim = m_creature->getVictim();
+    if (!pVictim)
+        return true;
+
     // This is needed for charmed creatures, as once their target was reset other effects can trigger threat
-    if(m_creature->isCharmed() && m_creature->getVictim() == m_creature->GetCharmer())
+    if (m_creature->isCharmed() && m_creature->GetCharmer() == pVictim)
+        return true;
+
+    Unit* owner = m_creature->GetCharmerOrOwner();
+
+    if (owner == pVictim)
+        return true;
+
+    if (!pVictim->isVisibleForOrDetect(m_creature, m_creature, false))
         return true;
 
-    return !m_creature->getVictim()->isTargetableForAttack();
+    if (owner && !pVictim->isVisibleForOrDetect(owner, owner, true))
+        return true;
+
+    if (m_primaryTargetGuid && m_primaryTargetGuid != pVictim->GetObjectGuid())
+        return true;
+
+    return !pVictim->isTargetableForAttack();
 }
 
 void PetAI::_stopAttack()
 {
-    inCombat = false;
+    if (!IsInCombat())
+        return;
 
-    Unit* owner = m_creature->GetCharmerOrOwner();
+    inCombat = false;
 
-    if(owner && m_creature->GetCharmInfo() && m_creature->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
-    {
-        m_creature->GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE);
-    }
-    else
-    {
-        m_creature->GetMotionMaster()->Clear(false);
-        m_creature->GetMotionMaster()->MoveIdle();
-    }
+    m_creature->CastStop();
     m_creature->AttackStop();
+    m_creature->GetMotionMaster()->Clear(); // move idle
+
+    if (!m_savedTargetGuid)
+        m_creature->GetMotionMaster()->MoveTargetedHome();
 }
 
 void PetAI::UpdateAI(const uint32 diff)
@@ -125,30 +420,70 @@ void PetAI::UpdateAI(const uint32 diff)
     if (!m_creature->isAlive())
         return;
 
-    Unit* owner = m_creature->GetCharmerOrOwner();
-
-    if (m_updateAlliesTimer <= diff)
-        // UpdateAllies self set update timer
+    m_updateAlliesTimer.Update(diff);
+    if (m_updateAlliesTimer.Passed())
+    {
         UpdateAllies();
-    else
-        m_updateAlliesTimer -= diff;
+        m_updateAlliesTimer.Reset();
+    }
 
-    if (inCombat && (!m_creature->getVictim() || (m_creature->IsPet() && ((Pet*)m_creature)->GetModeFlags() & PET_MODE_DISABLE_ACTIONS)))
+    if (!inCombat && m_savedTargetGuid)
+    {
+        if (Unit* savedTarget = m_creature->GetMap()->GetUnit(m_savedTargetGuid))
+        {
+            if (!savedTarget->isAlive())
+                m_savedTargetGuid.Clear();
+            else if (!savedTarget->IsCrowdControlled())
+                AttackStart(savedTarget);
+        }
+        else
+            m_savedTargetGuid.Clear();
+    }
+
+    Unit* pVictim = m_creature->getVictim();
+
+    if (inCombat &&
+        (!pVictim || !pVictim->isAlive() ||
+        (m_creature->IsPet() && m_creature->GetCharmInfo()->HasState(CHARM_STATE_ACTION, ACTIONS_DISABLE))))
         _stopAttack();
 
+    if (m_creature->hasUnitState(UNIT_STAT_CAN_NOT_REACT) || m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
+    {
+        UpdateAIType();
+        return;
+    }
+
+    Unit* owner = m_creature->GetCharmerOrOwner();
+
     // i_pet.getVictim() can't be used for check in case stop fighting, i_pet.getVictim() clear at Unit death etc.
-    if (m_creature->getVictim())
+    if (pVictim)
     {
+        bool meleeReach = m_creature->CanReachWithMeleeAttack(pVictim);
+
         if (_needToStop())
         {
             DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "PetAI (guid = %u) is stopping attack.", m_creature->GetGUIDLow());
             _stopAttack();
             return;
         }
-
-        bool meleeReach = m_creature->CanReachWithMeleeAttack(m_creature->getVictim());
-
-        if (m_creature->IsStopped() || meleeReach)
+        else if (!pVictim->isAlive())                        // Stop attack if target dead
+        {
+            m_creature->InterruptNonMeleeSpells(false);
+            _stopAttack();
+            return;
+        }
+        // Stop attack if target under CC effect
+        else if (sWorld.getConfig(CONFIG_BOOL_PET_ADVANCED_AI) && IsInCombat() &&
+            pVictim->IsCrowdControlled() &&
+            !m_creature->GetCurrentSpell(CURRENT_CHANNELED_SPELL))
+        {
+            m_savedTargetGuid = pVictim->GetObjectGuid();
+            m_creature->InterruptSpell(CURRENT_GENERIC_SPELL, true);
+            if (!m_creature->IsNonMeleeSpellCasted(false, false, true))
+                _stopAttack();
+            return;
+        }
+        else if (m_creature->IsStopped() || meleeReach)
         {
             // required to be stopped cases
             if (m_creature->IsStopped() && m_creature->IsNonMeleeSpellCasted(false))
@@ -161,36 +496,82 @@ void PetAI::UpdateAI(const uint32 diff)
             // not required to be stopped case
             else if (DoMeleeAttackIfReady())
             {
-                if (!m_creature->getVictim())
+                pVictim = m_creature->getVictim();
+                if (!pVictim)
                     return;
 
-                //if pet misses its target, it will also be the first in threat list
-                m_creature->getVictim()->AddThreat(m_creature);
+                // if pet misses its target, it will also be the first in threat list
+                pVictim->AddThreat(m_creature);
 
                 if (_needToStop())
                     _stopAttack();
             }
         }
-    }
-    else if (owner && m_creature->GetCharmInfo())
-    {
-        if (owner->isInCombat() && !(m_creature->GetCharmInfo()->HasReactState(REACT_PASSIVE) || m_creature->GetCharmInfo()->HasCommandState(COMMAND_STAY)))
+
+        if (!m_creature->IsNonMeleeSpellCasted(true))
         {
-            AttackStart(owner->getAttackerForHelper());
+            m_attackDistanceRecheckTimer.Update(diff);
+            if (m_attackDistanceRecheckTimer.Passed())
+            {
+                m_attackDistanceRecheckTimer.Reset();
+                if (sWorld.getConfig(CONFIG_BOOL_PET_ADVANCED_AI) && m_AIType == PET_AI_RANGED && pVictim)
+                {
+                    float dist = m_creature->GetDistance(pVictim);
+                    if ((m_creature->CanReachWithMeleeAttack(pVictim) &&
+                        m_creature->IsWithinDist(owner, m_creature->GetMap()->GetVisibilityDistance() / 2.0f)) ||
+                        dist > (m_attackDistance + 2.0f))
+                    {
+                        MoveToVictim(pVictim);
+                        return;
+                    }
+                }
+
+                if (sWorld.getConfig(CONFIG_BOOL_PET_ADVANCED_AI))
+                {
+                    // FIXME: AOE check
+                }
+            }
         }
-        else if(m_creature->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
+    }
+    else if (Unit* target = GetPrimaryTarget())
+    {
+        AttackStart(target);
+    }
+    else if (owner)
+    {
+        switch (m_creature->GetCharmState(CHARM_STATE_REACT))
         {
-            if (!m_creature->hasUnitState(UNIT_STAT_FOLLOW) )
+            case REACT_DEFENSIVE:
             {
-                m_creature->GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE);
+                if (!m_primaryTargetGuid)
+                {
+                    Unit* ownerVictim = owner->getVictim();
+                    if (ownerVictim && ownerVictim->isAlive())
+                        AttackStart(ownerVictim);
+                }
+                break;
             }
+            case REACT_AGGRESSIVE:
+            {
+                if (Unit* pTarget = owner->getAttackerForHelper())
+                    AttackStart(pTarget);
+                break;
+            }
+            // case REACT_PASSIVE:
+            default:
+                break;
         }
     }
 
+    UpdateAIType();
+
+    if (m_creature->IsNonMeleeSpellCasted(true))
+        return;
+
     // Autocast (casted only in combat or persistent spells in any state)
-    if (!m_creature->IsNonMeleeSpellCasted(false))
+    if (!sWorld.getConfig(CONFIG_BOOL_PET_ADVANCED_AI) && m_AIType != PET_AI_PASSIVE)
     {
-        typedef std::vector<std::pair<Unit*, Spell*> > TargetSpellList;
+        typedef std::vector<std::pair<ObjectGuid, uint32> > TargetSpellList;
         TargetSpellList targetSpellStore;
 
         for (uint8 i = 0; i < m_creature->GetPetAutoSpellSize(); ++i)
@@ -199,13 +580,16 @@ void PetAI::UpdateAI(const uint32 diff)
             if (!spellID)
                 continue;
 
-            SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID);
+            SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellID);
             if (!spellInfo)
                 continue;
 
             if (m_creature->GetCharmInfo() && m_creature->GetCharmInfo()->GetGlobalCooldownMgr().HasGlobalCooldown(spellInfo))
                 continue;
 
+            if (m_creature->HasSpellCooldown(spellInfo))
+                continue;
+
             // ignore some combinations of combat state and combat/noncombat spells
             if (!inCombat)
             {
@@ -236,100 +620,257 @@ void PetAI::UpdateAI(const uint32 diff)
                     continue;
             }
 
-            Spell *spell = new Spell(m_creature, spellInfo, false);
+            Unit* autoCastTarget = NULL;
 
-            if (inCombat && !m_creature->hasUnitState(UNIT_STAT_FOLLOW) && spell->CanAutoCast(m_creature->getVictim()))
+            if (inCombat)
             {
-                targetSpellStore.push_back(TargetSpellList::value_type(m_creature->getVictim(), spell));
-                continue;
+                Unit* pVictim = m_creature->getVictim();
+                if (pVictim && !m_creature->hasUnitState(UNIT_STAT_FOLLOW))
+                {
+                    SpellCastResult result = CanAutoCast(pVictim, spellInfo);
+                    if (result == SPELL_CAST_OK || result == SPELL_FAILED_UNIT_NOT_INFRONT)
+                        autoCastTarget = pVictim;
+                }
             }
-            else
+
+            if (!autoCastTarget)
             {
-                bool spellUsed = false;
-                for (AllySet::const_iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar)
+                for (GuidSet::const_iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar)
                 {
-                    Unit* Target = m_creature->GetMap()->GetUnit(*tar);
+                    Unit* target = m_creature->GetMap()->GetUnit(*tar);
 
-                    //only buff targets that are in combat, unless the spell can only be cast while out of combat
-                    if (!Target)
+                    // Only buff targets that are in combat, unless the spell can only be cast while out of combat
+                    if (!target)
                         continue;
 
-                    if (spell->CanAutoCast(Target))
+                    SpellCastResult result = CanAutoCast(target, spellInfo);
+                    if (result == SPELL_CAST_OK || result == SPELL_FAILED_UNIT_NOT_INFRONT)
                     {
-                        targetSpellStore.push_back(TargetSpellList::value_type(Target, spell));
-                        spellUsed = true;
+                        autoCastTarget = target;
                         break;
                     }
                 }
-                if (!spellUsed)
-                    delete spell;
             }
+
+            if (autoCastTarget)
+                targetSpellStore.push_back(TargetSpellList::value_type(autoCastTarget->GetObjectGuid(), spellInfo->Id));
         }
 
-        //found units to cast on to
+        // found units to cast on to
         if (!targetSpellStore.empty())
         {
             uint32 index = urand(0, targetSpellStore.size() - 1);
+            if (Unit* target = m_creature->GetMap()->GetUnit(targetSpellStore[index].first))
+                m_creature->DoPetCastSpell(target, targetSpellStore[index].second);
+        }
+    }
+    else
+    {
+        AutoSpellList currentSpells;
+        switch (m_AIType)
+        {
+            case PET_AI_PASSIVE:
+            {
+                currentSpells.push_back(GetSpellType(PET_SPELL_BUFF));
+                break;
+            }
+            case PET_AI_SLACKER:
+            {
+                if (!IsInCombat())
+                    break;
+
+                if (m_creature->IsCrowdControlled() || (owner && owner->IsCrowdControlled()))
+                    currentSpells.push_back(GetSpellType(PET_SPELL_FREEACTION));
+                currentSpells.push_back(GetSpellType(PET_SPELL_DEFENCE));
+                currentSpells.push_back(GetSpellType(PET_SPELL_BUFF));
+                currentSpells.push_back(GetSpellType(PET_SPELL_DEBUFF));
+                currentSpells.push_back(GetSpellType(PET_SPELL_RANGED));
+                break;
+            }
+            case PET_AI_HEALER:
+            {
+                if (!IsInCombat())
+                    break;
+
+                if (m_creature->IsCrowdControlled() || (owner && owner->IsCrowdControlled()))
+                    currentSpells.push_back(GetSpellType(PET_SPELL_FREEACTION));
+                if (m_creature->GetHealth() < m_creature->GetMaxHealth() ||
+                    (owner && (owner->GetHealth() < owner->GetMaxHealth())))
+                    currentSpells.push_back(GetSpellType(PET_SPELL_HEAL));
+                currentSpells.push_back(GetSpellType(PET_SPELL_BUFF));
+                currentSpells.push_back(GetSpellType(PET_SPELL_RANGED));
+                break;
+            }
+            case PET_AI_RANGED:
+            {
+                if (!IsInCombat())
+                    break;
+
+                if (m_creature->IsCrowdControlled() || (owner && owner->IsCrowdControlled()))
+                    currentSpells.push_back(GetSpellType(PET_SPELL_FREEACTION));
+                currentSpells.push_back(GetSpellType(PET_SPELL_RANGED));
+                currentSpells.push_back(GetSpellType(PET_SPELL_DEBUFF));
+                currentSpells.push_back(GetSpellType(PET_SPELL_BUFF));
+                break;
+            }
+            case PET_AI_MELEE:
+            case PET_AI_RANGED_NOAMMO:
+            {
+                if (!IsInCombat())
+                    break;
 
-            Spell* spell  = targetSpellStore[index].second;
-            Unit*  target = targetSpellStore[index].first;
+                if (Unit* victim = m_creature->getVictim())
+                {
+                    Unit* victimVictim = victim->getVictim();
+                    if (!victimVictim || (victimVictim->GetObjectGuid() != m_creature->GetObjectGuid()))
+                    {
+                        currentSpells.push_back(GetSpellType(PET_SPELL_ATTACKSTART));
+                        currentSpells.push_back(GetSpellType(PET_SPELL_THREAT));
+                    }
+                }
 
-            targetSpellStore.erase(targetSpellStore.begin() + index);
+                if (m_creature->IsCrowdControlled() || (owner && owner->IsCrowdControlled()))
+                    currentSpells.push_back(GetSpellType(PET_SPELL_FREEACTION));
+            }
+            /* no break here!*/
+            default:
+            {
+                if (!IsInCombat())
+                    break;
+
+                currentSpells.push_back(GetSpellType(PET_SPELL_MELEE));
+                currentSpells.push_back(GetSpellType(PET_SPELL_DEBUFF));
+                currentSpells.push_back(GetSpellType(PET_SPELL_RANGED));
+                currentSpells.push_back(GetSpellType(PET_SPELL_BUFF));
+                break;
+            }
+        }
 
-            SpellCastTargets targets;
-            targets.setUnitTarget( target );
+        if (!IsInCombat())
+        {
+            currentSpells.push_back(GetSpellType(PET_SPELL_NONCOMBAT));
+            if (m_creature->GetHealthPercent() < 95.0f)
+                currentSpells.push_back(GetSpellType(PET_SPELL_HEAL));
+        }
+        else
+            currentSpells.push_back(GetSpellType(PET_SPELL_SPECIAL));
 
-            if (!m_creature->HasInArc(M_PI_F, target))
+        for (AutoSpellList::const_iterator itr = currentSpells.begin(); itr != currentSpells.end(); ++itr)
+        {
+            uint32 spellID = *itr;
+            if (!spellID)
+                continue;
+
+            SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellID);
+            if (!spellInfo)
+                continue;
+
+            if (m_creature->GetCharmInfo() && m_creature->GetCharmInfo()->GetGlobalCooldownMgr().HasGlobalCooldown(spellInfo))
+                continue;
+
+            Unit* pTarget = m_creature->IsPet()
+                ? ((Pet*)m_creature)->SelectPreferredTargetForSpell(spellInfo)
+                : ((Creature*)m_creature)->SelectPreferredTargetForSpell(spellInfo);
+
+            bool b_castOk = false;
+
+            if (pTarget)
             {
-                m_creature->SetInFront(target);
-                if (target->GetTypeId() == TYPEID_PLAYER)
-                    m_creature->SendCreateUpdateToPlayer((Player*)target);
+                SpellCastResult result = CanAutoCast(pTarget, spellInfo);
+                DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS,"PetAI::Update %s, AI %u try cast %u Target %s",
+                            m_creature->GetGuidStr().c_str(),
+                            m_AIType,
+                            spellID,
+                            pTarget ? pTarget->GetGuidStr().c_str() : "<none>");
+
+                switch (result)
+                {
+                    case SPELL_FAILED_TOO_CLOSE:
+                    case SPELL_FAILED_OUT_OF_RANGE:
+                        break; // ignore
+                    case SPELL_FAILED_UNIT_NOT_INFRONT:
+                    {
+                        if (DoCastSpellIfCan(pTarget, spellID) == CAST_OK)
+                        {
+                            b_castOk = true;
+                            m_creature->SetInFront(pTarget);
+                            if (pTarget->GetTypeId() == TYPEID_PLAYER)
+                                m_creature->SendCreateUpdateToPlayer((Player*)pTarget);
+                        }
+                        break;
+                    }
+                    case SPELL_CAST_OK:
+                    {
+                        if (DoCastSpellIfCan(pTarget, spellID) == CAST_OK)
+                            b_castOk = true;
 
-                if (owner && owner->GetTypeId() == TYPEID_PLAYER)
-                    m_creature->SendCreateUpdateToPlayer( (Player*)owner );
+                        break;
+                    }
+                    default:
+                    {
+                        Player* owner = (Player*)m_creature->GetOwner();
+                        if (owner)
+                            Spell::SendCastResult(owner, spellInfo, 0, result, true);
+
+                        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "PetAI::Update cast %s, AI %u Target %s spell %u result %u",
+                            m_creature->GetGuidStr().c_str(),
+                            m_AIType,
+                            pTarget ? pTarget->GetGuidStr().c_str() : "<none>",
+                            spellID,
+                            result);
+                        break;
+                    }
+                }
             }
+            else
+                continue;
 
-            m_creature->AddCreatureSpellCooldown(spell->m_spellInfo->Id);
-
-            spell->prepare(&targets);
+            if (b_castOk)
+            {
+                if (m_creature->IsPet())
+                {
+                    if (((Pet*)m_creature)->getPetType() == SUMMON_PET && (urand(0, 100) < 10))
+                        m_creature->SendPetTalk((uint32)PET_TALK_SPECIAL_SPELL);
+                    else
+                        m_creature->SendPetAIReaction();
+                }
+                break;
+            }
         }
-
-        // deleted cached Spell objects
-        for(TargetSpellList::const_iterator itr = targetSpellStore.begin(); itr != targetSpellStore.end(); ++itr)
-            delete itr->second;
     }
 }
 
-bool PetAI::_isVisible(Unit *u) const
+bool PetAI::_isVisible(Unit* u) const
 {
-    return m_creature->IsWithinDist(u,sWorld.getConfig(CONFIG_FLOAT_SIGHT_GUARDER))
-        && u->isVisibleForOrDetect(m_creature,m_creature,true);
+    return m_creature->IsWithinDist(u, sWorld.getConfig(CONFIG_FLOAT_SIGHT_GUARDER))
+        && u->isVisibleForOrDetect(m_creature, m_creature, true);
 }
 
 void PetAI::UpdateAllies()
 {
     Unit* owner = m_creature->GetCharmerOrOwner();
-    Group *pGroup = NULL;
-
-    m_updateAlliesTimer = 10*IN_MILLISECONDS;                //update friendly targets every 10 seconds, lesser checks increase performance
-
     if (!owner)
         return;
-    else if (owner->GetTypeId() == TYPEID_PLAYER)
+
+    Group* pGroup = NULL;
+
+    if (owner->GetTypeId() == TYPEID_PLAYER)
         pGroup = ((Player*)owner)->GetGroup();
 
-    //only pet and owner/not in group->ok
+    // only pet and owner/not in group->ok
     if (m_AllySet.size() == 2 && !pGroup)
         return;
-    //owner is in group; group members filled in already (no raid -> subgroupcount = whole count)
+
+    // owner is in group; group members filled in already (no raid -> subgroupcount = whole count)
     if (pGroup && !pGroup->isRaidGroup() && m_AllySet.size() == (pGroup->GetMembersCount() + 2))
         return;
 
     m_AllySet.clear();
     m_AllySet.insert(m_creature->GetObjectGuid());
-    if (pGroup)                                             //add group
+
+    if (pGroup)                                              // add group
     {
-        for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player* target = itr->getSource();
             if (!target || !pGroup->SameSubGroup((Player*)owner, target))
@@ -341,14 +882,107 @@ void PetAI::UpdateAllies()
             m_AllySet.insert(target->GetObjectGuid());
         }
     }
-    else                                                    //remove group
+    else                                                    // remove group
         m_AllySet.insert(owner->GetObjectGuid());
 }
 
-void PetAI::AttackedBy(Unit *attacker)
+void PetAI::AttackedBy(Unit* attacker)
 {
-    //when attacked, fight back in case 1)no victim already AND 2)not set to passive AND 3)not set to stay, unless can it can reach attacker with melee attack anyway
-    if(!m_creature->getVictim() && m_creature->GetCharmInfo() && !m_creature->GetCharmInfo()->HasReactState(REACT_PASSIVE) &&
-        (!m_creature->GetCharmInfo()->HasCommandState(COMMAND_STAY) || m_creature->CanReachWithMeleeAttack(attacker)))
+    if (m_AIType == PET_AI_SLACKER)
+    {
+        // special reaction (like change movement type) here
+        return;
+    }
+
+    // when attacked, fight back in case 1) no victim already AND 2) not set to passive AND 3) not set to stay, unless can it can reach attacker with melee attack anyway
+    if (!m_creature->getVictim() && m_creature->GetCharmInfo() && !m_creature->GetCharmInfo()->HasState(CHARM_STATE_REACT, REACT_PASSIVE) &&
+        (!m_creature->GetCharmInfo()->HasState(CHARM_STATE_COMMAND, COMMAND_STAY) || m_creature->CanReachWithMeleeAttack(attacker)))
         AttackStart(attacker);
 }
+
+SpellCastResult PetAI::CanAutoCast(Unit* target, SpellEntry const* spellInfo)
+{
+    if (!spellInfo || !target)
+        return SPELL_FAILED_DONT_REPORT;
+
+    Spell spell = Spell(m_creature, spellInfo, false);
+    return spell.CanAutoCast(target);
+}
+
+uint32 PetAI::GetSpellType(PetAutoSpellType type)
+{
+    if (type >= PET_SPELL_MAX || m_spellType[type].empty())
+        return 0;
+
+    std::vector<uint32> tmpSet;
+
+    for (Unit::SpellIdSet::const_iterator itr = m_spellType[type].begin(); itr != m_spellType[type].end(); ++itr)
+    {
+        uint32 _spellID = *itr;
+        if (!_spellID)
+            continue;
+
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(_spellID);
+        if (!spellInfo)
+            continue;
+
+        if (m_creature->GetCharmInfo() && m_creature->GetCharmInfo()->GetGlobalCooldownMgr().HasGlobalCooldown(spellInfo))
+            continue;
+
+        if (m_creature->HasSpellCooldown(spellInfo))
+            continue;
+
+        if (IsInCombat() && IsNonCombatSpell(spellInfo))
+            continue;
+
+        if (!IsInCombat() && IsPositiveSpell(spellInfo) && !IsNonCombatSpell(spellInfo))
+        {
+            int32 duration = GetSpellDuration(spellInfo);
+//            if ((spellInfo->manaCost || spellInfo->ManaCostPercentage || spellInfo->manaPerSecond) && duration > 0)
+//                continue;
+
+            // allow only spell without cooldown > duration
+            int32 cooldown = GetSpellRecoveryTime(spellInfo);
+            if (cooldown >= 0 && duration >= 0 && cooldown > duration)
+                continue;
+        }
+
+        tmpSet.push_back(_spellID);
+    }
+
+    if (tmpSet.empty())
+        return 0;
+    else
+        return tmpSet[urand(0, tmpSet.size() - 1)];
+}
+
+bool PetAI::IsInCombat()
+{
+    return (inCombat || m_creature->isInCombat());
+}
+
+bool PetAI::SetPrimaryTarget(ObjectGuid const& guid)
+{
+    if (!guid || (m_primaryTargetGuid.IsEmpty() || !GetPrimaryTarget()))
+    {
+        m_primaryTargetGuid = guid;
+        return true;
+    }
+    return false;
+}
+
+Unit* PetAI::GetPrimaryTarget()
+{
+    if (m_primaryTargetGuid.IsEmpty() || !m_primaryTargetGuid.IsUnit())
+        return NULL;
+
+    Unit* target = m_creature->GetMap()->GetUnit(m_primaryTargetGuid);
+
+    if (!target || !target->isAlive() || !target->isTargetableForAttack() || !target->isInAccessablePlaceFor(m_creature))
+    {
+        m_primaryTargetGuid.Clear();
+        return NULL;
+    }
+
+    return target;
+}
diff --git a/src/game/PetAI.h b/src/game/PetAI.h
index b74c7432cda..b0cb70e8b43 100644
--- a/src/game/PetAI.h
+++ b/src/game/PetAI.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2011-2013 /dev/rsa for MangosR2 <http://github.com/MangosR2>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,33 +27,86 @@
 class Creature;
 class Spell;
 
+enum PetAIType
+{
+    PET_AI_PASSIVE,
+    PET_AI_MELEE,
+    PET_AI_RANGED,
+    PET_AI_RANGED_NOAMMO,
+    PET_AI_HEALER,
+    PET_AI_SLACKER,
+    PET_AI_MAX
+};
+
+enum PetAutoSpellType
+{
+    PET_SPELL_PASSIVE,
+    PET_SPELL_NONCOMBAT,
+    PET_SPELL_BUFF,
+    PET_SPELL_DEBUFF,
+    PET_SPELL_FREEACTION,
+    PET_SPELL_ATTACKSTART,
+    PET_SPELL_THREAT,
+    PET_SPELL_MELEE,
+    PET_SPELL_RANGED,
+    PET_SPELL_DEFENCE,
+    PET_SPELL_SPECIAL,
+    PET_SPELL_HEAL,
+    PET_SPELL_MAX
+};
+
+enum
+{
+    ALLIES_UPDATE_TIME = 10*IN_MILLISECONDS,
+};
+
 class MANGOS_DLL_DECL PetAI : public CreatureAI
 {
     public:
 
         explicit PetAI(Creature *c);
 
+        void Reset();
+
         void MoveInLineOfSight(Unit *);
         void AttackStart(Unit *);
-        void EnterEvadeMode();
-        void AttackedBy(Unit*);
+        void EnterEvadeMode() override;
+        void AttackedBy(Unit*) override;
         bool IsVisible(Unit *) const;
 
         void UpdateAI(const uint32);
         static int Permissible(const Creature *);
 
+        bool UpdateAIType();
+        void MoveToVictim(Unit* unit);
+        bool IsInCombat();
+
+        GuidSet const& GetAllyGuids() { return m_AllySet; };
+
+        bool  SetPrimaryTarget(ObjectGuid const& guid);
+        Unit* GetPrimaryTarget();
+
     private:
         bool _isVisible(Unit *) const;
         bool _needToStop(void) const;
         void _stopAttack(void);
 
         void UpdateAllies();
+        SpellCastResult CanAutoCast(Unit* target, SpellEntry const* spellInfo);
+        uint32 GetSpellType(PetAutoSpellType type);
 
-        TimeTracker i_tracker;
         bool inCombat;
 
-        typedef std::set<ObjectGuid> AllySet;
-        AllySet m_AllySet;
-        uint32 m_updateAlliesTimer;
+        GuidSet m_AllySet;
+        ObjectGuid m_primaryTargetGuid;
+
+        IntervalTimer   m_updateAlliesTimer;
+        IntervalTimer   m_attackDistanceRecheckTimer;
+
+        PetAIType       m_AIType;
+        PetAIType       m_savedAIType;
+        float           m_attackDistance;
+        ObjectGuid      m_savedTargetGuid;
+        Unit::SpellIdSet      m_spellType[PET_SPELL_MAX]; //Classified autospell storage
 };
 #endif
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index 8bc30649241..44edb0303bf 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -27,6 +27,7 @@
 #include "CreatureAI.h"
 #include "Util.h"
 #include "Pet.h"
+#include "Threading.h"
 
 void WorldSession::HandlePetAction(WorldPacket& recv_data)
 {
@@ -43,7 +44,7 @@ void WorldSession::HandlePetAction(WorldPacket& recv_data)
     DETAIL_LOG("HandlePetAction: %s flag is %u, spellid is %u, target %s.", petGuid.GetString().c_str(), uint32(flag), spellid, targetGuid.GetString().c_str());
 
     // used also for charmed creature/player
-    Unit* pet = _player->GetMap()->GetUnit(petGuid);
+    Unit* pet = GetPlayer()->GetMap()->GetUnit(petGuid);
     if (!pet)
     {
         sLog.outError("HandlePetAction: %s not exist.", petGuid.GetString().c_str());
@@ -56,8 +57,19 @@ void WorldSession::HandlePetAction(WorldPacket& recv_data)
         return;
     }
 
+
+    CharmInfo* charmInfo = pet->GetCharmInfo();
+    if (!charmInfo)
+    {
+        sLog.outError("WorldSession::HandlePetAction: object (GUID: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", pet->GetGUIDLow(), pet->GetTypeId());
+        return;
+    }
+
     if (!pet->isAlive())
+    {
+        pet->SendPetActionFeedback(FEEDBACK_PET_DEAD);
         return;
+    }
 
     if (pet->GetTypeId() == TYPEID_PLAYER)
     {
@@ -68,207 +80,12 @@ void WorldSession::HandlePetAction(WorldPacket& recv_data)
     else if (((Creature*)pet)->IsPet())
     {
         // pet can have action bar disabled
-        if (((Pet*)pet)->GetModeFlags() & PET_MODE_DISABLE_ACTIONS)
+        if (charmInfo->HasState(CHARM_STATE_ACTION,ACTIONS_DISABLE))
             return;
     }
 
-    CharmInfo* charmInfo = pet->GetCharmInfo();
-    if (!charmInfo)
-    {
-        sLog.outError("WorldSession::HandlePetAction: object (GUID: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", pet->GetGUIDLow(), pet->GetTypeId());
-        return;
-    }
-
-    switch (flag)
-    {
-        case ACT_COMMAND:                                   // 0x07
-            switch (spellid)
-            {
-                case COMMAND_STAY:                          // flat=1792  //STAY
-                    pet->StopMoving();
-                    pet->GetMotionMaster()->Clear(false);
-                    pet->GetMotionMaster()->MoveIdle();
-                    charmInfo->SetCommandState(COMMAND_STAY);
-                    break;
-                case COMMAND_FOLLOW:                        // spellid=1792  //FOLLOW
-                    pet->AttackStop();
-                    pet->GetMotionMaster()->MoveFollow(_player, PET_FOLLOW_DIST,PET_FOLLOW_ANGLE);
-                    charmInfo->SetCommandState(COMMAND_FOLLOW);
-                    break;
-                case COMMAND_ATTACK:                        // spellid=1792  // ATTACK
-                {
-                    Unit* TargetUnit = _player->GetMap()->GetUnit(targetGuid);
-                    if (!TargetUnit)
-                        return;
-
-                    // not let attack friendly units.
-                    if (GetPlayer()->IsFriendlyTo(TargetUnit))
-                        return;
-                    // Not let attack through obstructions
-                    if (!pet->IsWithinLOSInMap(TargetUnit))
-                        return;
-
-                    // This is true if pet has no target or has target but targets differs.
-                    if (pet->getVictim() != TargetUnit)
-                    {
-                        if (pet->getVictim())
-                            pet->AttackStop();
-
-                        if (pet->hasUnitState(UNIT_STAT_CONTROLLED))
-                        {
-                            pet->Attack(TargetUnit, true);
-                            pet->SendPetAIReaction();
-                        }
-                        else
-                        {
-                            pet->GetMotionMaster()->Clear();
-
-                            if (((Creature*)pet)->AI())
-                                ((Creature*)pet)->AI()->AttackStart(TargetUnit);
-
-                            // 10% chance to play special pet attack talk, else growl
-                            if (((Creature*)pet)->IsPet() && ((Pet*)pet)->getPetType() == SUMMON_PET && pet != TargetUnit && roll_chance_i(10))
-                                pet->SendPetTalk((uint32)PET_TALK_ATTACK);
-                            else
-                            {
-                                // 90% chance for pet and 100% chance for charmed creature
-                                pet->SendPetAIReaction();
-                            }
-                        }
-                    }
-                    break;
-                }
-                case COMMAND_ABANDON:                       // abandon (hunter pet) or dismiss (summoned pet)
-                    if (((Creature*)pet)->IsPet())
-                    {
-                        Pet* p = (Pet*)pet;
-                        if (p->getPetType() == HUNTER_PET)
-                            p->Unsummon(PET_SAVE_AS_DELETED, _player);
-                        else
-                            // dismissing a summoned pet is like killing them (this prevents returning a soulshard...)
-                            p->SetDeathState(CORPSE);
-                    }
-                    else                                    // charmed
-                        _player->Uncharm();
-                    break;
-                default:
-                    sLog.outError("WORLD: unknown PET flag Action %i and spellid %i.", uint32(flag), spellid);
-            }
-            break;
-        case ACT_REACTION:                                  // 0x6
-            switch (spellid)
-            {
-                case REACT_PASSIVE:                         // passive
-                case REACT_DEFENSIVE:                       // recovery
-                case REACT_AGGRESSIVE:                      // activete
-                    charmInfo->SetReactState(ReactStates(spellid));
-                    break;
-            }
-            break;
-        case ACT_DISABLED:                                  // 0x81    spell (disabled), ignore
-        case ACT_PASSIVE:                                   // 0x01
-        case ACT_ENABLED:                                   // 0xC1    spell
-        {
-            Unit* unit_target = NULL;
-            if (targetGuid)
-                unit_target = _player->GetMap()->GetUnit(targetGuid);
-
-            // do not cast unknown spells
-            SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid);
-            if (!spellInfo)
-            {
-                sLog.outError("WORLD: unknown PET spell id %i", spellid);
-                return;
-            }
-
-            if (pet->GetCharmInfo() && pet->GetCharmInfo()->GetGlobalCooldownMgr().HasGlobalCooldown(spellInfo))
-                return;
-
-            for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
-            {
-                if (spellInfo->EffectImplicitTargetA[i] == TARGET_ALL_ENEMY_IN_AREA || spellInfo->EffectImplicitTargetA[i] == TARGET_ALL_ENEMY_IN_AREA_INSTANT || spellInfo->EffectImplicitTargetA[i] == TARGET_ALL_ENEMY_IN_AREA_CHANNELED)
-                    return;
-            }
-
-            // do not cast not learned spells
-            if (!pet->HasSpell(spellid) || IsPassiveSpell(spellInfo))
-                return;
-
-            pet->clearUnitState(UNIT_STAT_MOVING);
-
-            Spell* spell = new Spell(pet, spellInfo, false);
-
-            SpellCastResult result = spell->CheckPetCast(unit_target);
-
-            // auto turn to target unless possessed
-            if (result == SPELL_FAILED_UNIT_NOT_INFRONT && !pet->HasAuraType(SPELL_AURA_MOD_POSSESS))
-            {
-                if (unit_target)
-                {
-                    pet->SetInFront(unit_target);
-                    if (unit_target->GetTypeId() == TYPEID_PLAYER)
-                        pet->SendCreateUpdateToPlayer( (Player*)unit_target );
-                }
-                else if (Unit* unit_target2 = spell->m_targets.getUnitTarget())
-                {
-                    pet->SetInFront(unit_target2);
-                    if (unit_target2->GetTypeId() == TYPEID_PLAYER)
-                        pet->SendCreateUpdateToPlayer((Player*)unit_target2);
-                }
-                if (Unit* powner = pet->GetCharmerOrOwner())
-                    if (powner->GetTypeId() == TYPEID_PLAYER)
-                        pet->SendCreateUpdateToPlayer((Player*)powner);
-                result = SPELL_CAST_OK;
-            }
-
-            if (result == SPELL_CAST_OK)
-            {
-                ((Creature*)pet)->AddCreatureSpellCooldown(spellid);
-
-                unit_target = spell->m_targets.getUnitTarget();
-
-                // 10% chance to play special pet attack talk, else growl
-                // actually this only seems to happen on special spells, fire shield for imp, torment for voidwalker, but it's stupid to check every spell
-                if (((Creature*)pet)->IsPet() && (((Pet*)pet)->getPetType() == SUMMON_PET) && (pet != unit_target) && (urand(0, 100) < 10))
-                    pet->SendPetTalk((uint32)PET_TALK_SPECIAL_SPELL);
-                else
-                {
-                    pet->SendPetAIReaction();
-                }
-
-                if (unit_target && !GetPlayer()->IsFriendlyTo(unit_target) && !pet->HasAuraType(SPELL_AURA_MOD_POSSESS))
-                {
-                    // This is true if pet has no target or has target but targets differs.
-                    if (pet->getVictim() != unit_target)
-                    {
-                        if (pet->getVictim())
-                            pet->AttackStop();
-                        pet->GetMotionMaster()->Clear();
-                        if (((Creature*)pet)->AI())
-                            ((Creature*)pet)->AI()->AttackStart(unit_target);
-                    }
-                }
-
-                spell->prepare(&(spell->m_targets));
-            }
-            else
-            {
-                if (pet->HasAuraType(SPELL_AURA_MOD_POSSESS))
-                    Spell::SendCastResult(GetPlayer(), spellInfo, 0, result);
-                else
-                    pet->SendPetCastFail(spellid, result);
-
-                if (!((Creature*)pet)->HasSpellCooldown(spellid))
-                    GetPlayer()->SendClearCooldown(spellid, pet);
-
-                spell->finish(false);
-                delete spell;
-            }
-            break;
-        }
-        default:
-            sLog.outError("WORLD: unknown PET flag Action %i and spellid %i.", uint32(flag), spellid);
-    }
+    if (((Creature*)pet)->IsPet() || pet->isCharmed())
+        GetPlayer()->CallForAllControlledUnits(DoPetActionWithHelper(GetPlayer(), flag, spellid, petGuid, targetGuid), CONTROLLED_PET | CONTROLLED_GUARDIANS | CONTROLLED_CHARM);
 }
 
 void WorldSession::HandlePetStopAttack(WorldPacket& recv_data)
@@ -281,20 +98,33 @@ void WorldSession::HandlePetStopAttack(WorldPacket& recv_data)
     Unit* pet = GetPlayer()->GetMap()->GetUnit(petGuid);    // pet or controlled creature/player
     if (!pet)
     {
-        sLog.outError("%s doesn't exist.", petGuid.GetString().c_str());
+        sLog.outError("WorldSession::HandlePetStopAttack: %s doesn't exist.", petGuid.GetString().c_str());
         return;
     }
 
     if (GetPlayer()->GetObjectGuid() != pet->GetCharmerOrOwnerGuid())
     {
-        sLog.outError("HandlePetStopAttack: %s isn't charm/pet of %s.", petGuid.GetString().c_str(), GetPlayer()->GetGuidStr().c_str());
+        sLog.outError("WorldSession::HandlePetStopAttack: %s isn't charm/pet of %s.", petGuid.GetString().c_str(), GetPlayer()->GetGuidStr().c_str());
         return;
     }
 
     if (!pet->isAlive())
+    {
+        pet->SendPetActionFeedback(FEEDBACK_PET_DEAD);
         return;
+    }
 
-    pet->AttackStop();
+    GuidSet const& groupPets = GetPlayer()->GetPets();
+    if (!groupPets.empty())
+    {
+        for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+        {
+            if (Pet* pPet = GetPlayer()->GetMap()->GetPet(*itr))
+                pPet->AttackStop();
+        }
+    }
+    else
+        pet->AttackStop();
 }
 
 void WorldSession::HandlePetNameQueryOpcode(WorldPacket& recv_data)
@@ -367,10 +197,6 @@ void WorldSession::HandlePetSetAction(WorldPacket& recv_data)
         return;
     }
 
-    // pet can have action bar disabled
-    if (pet->IsPet() && ((Pet*)pet)->GetModeFlags() & PET_MODE_DISABLE_ACTIONS)
-        return;
-
     CharmInfo* charmInfo = pet->GetCharmInfo();
     if (!charmInfo)
     {
@@ -378,6 +204,14 @@ void WorldSession::HandlePetSetAction(WorldPacket& recv_data)
         return;
     }
 
+    // pet can have action bar disabled
+    if (pet->IsPet() && charmInfo->HasState(CHARM_STATE_ACTION,ACTIONS_DISABLE))
+        return;
+
+    // if pet is chained - used first pet action bar
+    if (((Pet*)pet)->GetPetCounter())
+        return;
+
     count = (recv_data.size() == 24) ? 2 : 1;
 
     uint32 position[2];
@@ -436,28 +270,34 @@ void WorldSession::HandlePetSetAction(WorldPacket& recv_data)
         uint32 spell_id = UNIT_ACTION_BUTTON_ACTION(data[i]);
         uint8 act_state = UNIT_ACTION_BUTTON_TYPE(data[i]);
 
-        DETAIL_LOG( "Player %s has changed pet spell action. Position: %u, Spell: %u, State: 0x%X", _player->GetName(), position[i], spell_id, uint32(act_state));
+        DETAIL_LOG("Player %s has changed pet spell action. Position: %u, Spell: %u, State: 0x%X", _player->GetName(), position[i], spell_id, uint32(act_state));
 
         // if it's act for spell (en/disable/cast) and there is a spell given (0 = remove spell) which pet doesn't know, don't add
-        if (!((act_state == ACT_ENABLED || act_state == ACT_DISABLED || act_state == ACT_PASSIVE) && spell_id && !pet->HasSpell(spell_id)))
+        if ((act_state == ACT_ENABLED || act_state == ACT_DISABLED || act_state == ACT_PASSIVE) && spell_id && ((Pet*)pet)->HasSpell(spell_id))
         {
-            // sign for autocast
-            if (act_state == ACT_ENABLED && spell_id)
-            {
-                if (pet->isCharmed())
-                    charmInfo->ToggleCreatureAutocast(spell_id, true);
-                else
-                    ((Pet*)pet)->ToggleAutocast(spell_id, true);
-            }
-            // sign for no/turn off autocast
-            else if (act_state == ACT_DISABLED && spell_id)
+            // sign for autocast on/off
+            if (act_state == ACT_ENABLED || act_state == ACT_DISABLED)
             {
+                bool enabled = act_state == ACT_ENABLED;
+
                 if (pet->isCharmed())
-                    charmInfo->ToggleCreatureAutocast(spell_id, false);
+                    charmInfo->ToggleCreatureAutocast(spell_id, enabled);
                 else
-                    ((Pet*)pet)->ToggleAutocast(spell_id, false);
+                {
+                    GuidSet const& groupPets = _player->GetPets();
+                    if (!groupPets.empty())
+                    {
+                        for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                        {
+                            if (Pet* pPet = GetPlayer()->GetMap()->GetPet(*itr))
+                            {
+                                if (pPet->IsInWorld())
+                                    pPet->ToggleAutocast(spell_id, enabled);
+                            }
+                        }
+                    }
+                }
             }
-
             charmInfo->SetActionBar(position[i], spell_id, ActiveStates(act_state));
         }
     }
@@ -548,50 +388,22 @@ void WorldSession::HandlePetAbandon(WorldPacket& recv_data)
         return;
 
     // pet/charmed
-    if (Creature* pet = _player->GetMap()->GetAnyTypeCreature(guid))
+    if (Creature* pet = GetPlayer()->GetMap()->GetAnyTypeCreature(guid))
     {
         if (pet->IsPet())
         {
             if (pet->GetObjectGuid() == _player->GetPetGuid())
                 pet->ModifyPower(POWER_HAPPINESS, -50000);
 
-            ((Pet*)pet)->Unsummon(PET_SAVE_AS_DELETED, _player);
+            ((Pet*)pet)->Unsummon(PET_SAVE_AS_DELETED, GetPlayer());
         }
-        else if (pet->GetObjectGuid() == _player->GetCharmGuid())
+        else if (pet->GetObjectGuid() == GetPlayer()->GetCharmGuid())
         {
-            _player->Uncharm();
+            GetPlayer()->Uncharm();
         }
     }
 }
 
-void WorldSession::HandlePetUnlearnOpcode(WorldPacket& recvPacket)
-{
-    DETAIL_LOG("CMSG_PET_UNLEARN");
-
-    ObjectGuid guid;
-    recvPacket >> guid;                 // Pet guid
-
-    Pet* pet = _player->GetPet();
-
-    if (!pet || guid != pet->GetObjectGuid())
-    {
-        sLog.outError("HandlePetUnlearnOpcode. %s isn't pet of %s .", guid.GetString().c_str(), GetPlayer()->GetGuidStr().c_str());
-        return;
-    }
-
-    if (pet->getPetType() != HUNTER_PET || pet->m_usedTalentCount == 0)
-        return;
-
-    CharmInfo* charmInfo = pet->GetCharmInfo();
-    if (!charmInfo)
-    {
-        sLog.outError("WorldSession::HandlePetUnlearnOpcode: %s is considered pet-like but doesn't have a charminfo!", pet->GetGuidStr().c_str());
-        return;
-    }
-    pet->resetTalents();
-    _player->SendTalentsInfoData(true);
-}
-
 void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket)
 {
     DETAIL_LOG("CMSG_PET_SPELL_AUTOCAST");
@@ -620,10 +432,18 @@ void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket)
     }
 
     if (pet->isCharmed())
-                                                            // state can be used as boolean
-        pet->GetCharmInfo()->ToggleCreatureAutocast(spellid, state);
+        pet->GetCharmInfo()->ToggleCreatureAutocast(spellid, state); // state can be used as boolean
     else
-        ((Pet*)pet)->ToggleAutocast(spellid, state);
+    {
+        GuidSet const& groupPets = _player->GetPets();
+        if (!groupPets.empty())
+        {
+            for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                if (Pet* pPet = _player->GetMap()->GetPet(*itr))
+                    if (pPet->IsInWorld())
+                        pPet->ToggleAutocast(spellid, state);
+        }
+    }
 
     charmInfo->SetSpellAutocast(spellid, state);
 }
@@ -641,7 +461,7 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket)
 
     DEBUG_LOG("WORLD: CMSG_PET_CAST_SPELL, %s, cast_count: %u, spellid %u, unk_flags %u", guid.GetString().c_str(), cast_count, spellid, unk_flags);
 
-    Creature* pet = _player->GetMap()->GetAnyTypeCreature(guid);
+    Creature* pet = GetPlayer()->GetMap()->GetAnyTypeCreature(guid);
 
     if (!pet || (guid != _player->GetPetGuid() && guid != _player->GetCharmGuid()))
     {
@@ -649,6 +469,13 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket)
         return;
     }
 
+    SpellCastTargets targets;
+    recvPacket >> targets.ReadForCaster(pet);
+
+    // some spell cast packet including more data (for projectiles?)
+    if (unk_flags & 0x02)
+        targets.ReadAdditionalData(recvPacket);
+
     SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid);
     if (!spellInfo)
     {
@@ -659,46 +486,18 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket)
     if (pet->GetCharmInfo() && pet->GetCharmInfo()->GetGlobalCooldownMgr().HasGlobalCooldown(spellInfo))
         return;
 
+    bool triggered = bool(pet->GetTriggeredByClientAura(spellid));
 
     // do not cast not learned spells
-    if (!pet->HasSpell(spellid) || IsPassiveSpell(spellInfo))
+    if ((!pet->HasSpell(spellid) && !triggered)
+        || IsPassiveSpell(spellInfo))
         return;
 
-    SpellCastTargets targets;
-
-    recvPacket >> targets.ReadForCaster(pet);
-
-    pet->clearUnitState(UNIT_STAT_MOVING);
+    if (pet->IsNonMeleeSpellCasted(false) && !triggered)
+        pet->InterruptNonMeleeSpells(false);
 
-    Spell* spell = new Spell(pet, spellInfo, false);
-    spell->m_cast_count = cast_count;                       // probably pending spell cast
-    spell->m_targets = targets;
-
-    SpellCastResult result = spell->CheckPetCast(NULL);
-    if (result == SPELL_CAST_OK)
-    {
-        pet->AddCreatureSpellCooldown(spellid);
-        if (pet->IsPet())
-        {
-            // 10% chance to play special pet attack talk, else growl
-            // actually this only seems to happen on special spells, fire shield for imp, torment for voidwalker, but it's stupid to check every spell
-            if (((Pet*)pet)->getPetType() == SUMMON_PET && (urand(0, 100) < 10))
-                pet->SendPetTalk((uint32)PET_TALK_SPECIAL_SPELL);
-            else
-                pet->SendPetAIReaction();
-        }
-
-        spell->prepare(&(spell->m_targets));
-    }
-    else
-    {
-        pet->SendPetCastFail(spellid, result);
-        if (!pet->HasSpellCooldown(spellid))
-            GetPlayer()->SendClearCooldown(spellid, pet);
-
-        spell->finish(false);
-        delete spell;
-    }
+    if (pet->IsPet() || pet->isCharmed())
+        GetPlayer()->CallForAllControlledUnits(DoPetCastWithHelper(GetPlayer(), cast_count, &targets, spellInfo),CONTROLLED_PET | CONTROLLED_GUARDIANS | CONTROLLED_CHARM);
 }
 
 void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, DeclinedName* declinedName)
diff --git a/src/game/PetitionsHandler.cpp b/src/game/PetitionsHandler.cpp
index 1889178b0bd..7a1c9ba0af2 100644
--- a/src/game/PetitionsHandler.cpp
+++ b/src/game/PetitionsHandler.cpp
@@ -21,6 +21,7 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "World.h"
+#include "AccountMgr.h"
 #include "ObjectMgr.h"
 #include "Log.h"
 #include "Opcodes.h"
@@ -480,7 +481,7 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data)
 
     // not let enemies sign guild charter
     if (!sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GUILD) &&
-        GetPlayer()->GetTeam() != sObjectMgr.GetPlayerTeamByGUID(ownerGuid))
+        GetPlayer()->GetTeam() != sAccountMgr.GetPlayerTeamByGUID(ownerGuid))
     {
         if(type != 9)
             SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", "", ERR_ARENA_TEAM_NOT_ALLIED);
@@ -549,7 +550,8 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data)
         SendPacket(&data);
 
         // update for owner if online
-        if(Player *owner = sObjectMgr.GetPlayer(ownerGuid))
+        Player* owner = sObjectMgr.GetPlayer(ownerGuid);
+        if(owner)
             owner->GetSession()->SendPacket(&data);
         return;
     }
@@ -573,7 +575,8 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data)
     //    item->SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1+1, signs);
 
     // update for owner if online
-    if(Player *owner = sObjectMgr.GetPlayer(ownerGuid))
+    Player* owner = sObjectMgr.GetPlayer(ownerGuid);
+    if(owner)
         owner->GetSession()->SendPacket(&data);
 }
 
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 999eab6e297..41cb2aceed5 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -26,7 +26,6 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "UpdateMask.h"
-#include "SkillDiscovery.h"
 #include "QuestDef.h"
 #include "GossipDef.h"
 #include "UpdateData.h"
@@ -35,6 +34,7 @@
 #include "MapManager.h"
 #include "MapPersistentStateMgr.h"
 #include "InstanceData.h"
+#include "GameEventMgr.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
@@ -49,9 +49,10 @@
 #include "Util.h"
 #include "Transports.h"
 #include "Weather.h"
-#include "BattleGround.h"
-#include "BattleGroundAV.h"
-#include "BattleGroundMgr.h"
+#include "BattleGround/BattleGround.h"
+#include "BattleGround/BattleGroundMgr.h"
+#include "BattleGround/BattleGroundAV.h"
+#include "OutdoorPvP/OutdoorPvP.h"
 #include "ArenaTeam.h"
 #include "Chat.h"
 #include "Database/DatabaseImpl.h"
@@ -61,9 +62,17 @@
 #include "AchievementMgr.h"
 #include "Mail.h"
 #include "SpellAuras.h"
+#include "DBCStores.h"
+#include "SQLStorages.h"
+#include "Calendar.h"
 
 #include <cmath>
 
+// Playerbot mod:
+#include "playerbot/playerbot.h"
+
+#include "Config/Config.h"
+
 #define ZONE_UPDATE_INTERVAL (1*IN_MILLISECONDS)
 
 #define PLAYER_SKILL_INDEX(x)       (PLAYER_SKILL_INFO_1_1 + ((x)*3))
@@ -127,7 +136,7 @@ enum CharacterCustomizeFlags
 #define DEATH_EXPIRE_STEP (5*MINUTE)
 #define MAX_DEATH_COUNT 3
 
-static uint32 copseReclaimDelay[MAX_DEATH_COUNT] = { 30, 60, 120 };
+static const uint32 corpseReclaimDelay[MAX_DEATH_COUNT] = {30, 60, 120};
 
 //== PlayerTaxi ================================================
 
@@ -140,18 +149,18 @@ PlayerTaxi::PlayerTaxi()
 void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint32 level)
 {
     // class specific initial known nodes
-    switch(chrClass)
+    switch (chrClass)
     {
         case CLASS_DEATH_KNIGHT:
         {
-            for(int i = 0; i < TaxiMaskSize; ++i)
+            for (int i = 0; i < TaxiMaskSize; ++i)
                 m_taximask[i] |= sOldContinentsNodesMask[i];
             break;
         }
     }
 
     // race specific initial known nodes: capital and taxi hub masks
-    switch(race)
+    switch (race)
     {
         case RACE_HUMAN:    SetTaximaskNode(2);  break;     // Human
         case RACE_ORC:      SetTaximaskNode(23); break;     // Orc
@@ -167,19 +176,20 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint32 leve
     }
 
     // new continent starting masks (It will be accessible only at new map)
-    switch(Player::TeamForRace(race))
+    switch (Player::TeamForRace(race))
     {
         case ALLIANCE: SetTaximaskNode(100); break;
         case HORDE:    SetTaximaskNode(99);  break;
+        default: break;
     }
     // level dependent taxi hubs
-    if(level>=68)
-        SetTaximaskNode(213);                               //Shattered Sun Staging Area
+    if (level >= 68)
+        SetTaximaskNode(213);                               // Shattered Sun Staging Area
 }
 
 void PlayerTaxi::LoadTaxiMask(const char* data)
 {
-    Tokens tokens = StrSplit(data, " ");
+    Tokens tokens(data, ' ');
 
     int index;
     Tokens::iterator iter;
@@ -187,20 +197,20 @@ void PlayerTaxi::LoadTaxiMask(const char* data)
         (index < TaxiMaskSize) && (iter != tokens.end()); ++iter, ++index)
     {
         // load and set bits only for existing taxi nodes
-        m_taximask[index] = sTaxiNodesMask[index] & uint32(atol((*iter).c_str()));
+        m_taximask[index] = sTaxiNodesMask[index] & uint32(atol(*iter));
     }
 }
 
-void PlayerTaxi::AppendTaximaskTo( ByteBuffer& data, bool all )
+void PlayerTaxi::AppendTaximaskTo(ByteBuffer& data, bool all)
 {
-    if(all)
+    if (all)
     {
-        for (uint8 i=0; i<TaxiMaskSize; ++i)
+        for (uint8 i = 0; i < TaxiMaskSize; ++i)
             data << uint32(sTaxiNodesMask[i]);              // all existing nodes
     }
     else
     {
-        for (uint8 i=0; i<TaxiMaskSize; ++i)
+        for (uint8 i = 0; i < TaxiMaskSize; ++i)
             data << uint32(m_taximask[i]);                  // known nodes
     }
 }
@@ -209,26 +219,26 @@ bool PlayerTaxi::LoadTaxiDestinationsFromString(const std::string& values, Team
 {
     ClearTaxiDestinations();
 
-    Tokens tokens = StrSplit(values," ");
+    Tokens tokens(values, ' ');
 
-    for(Tokens::iterator iter = tokens.begin(); iter != tokens.end(); ++iter)
+    for (Tokens::iterator iter = tokens.begin(); iter != tokens.end(); ++iter)
     {
-        uint32 node = uint32(atol(iter->c_str()));
+        uint32 node = uint32(atol(*iter));
         AddTaxiDestination(node);
     }
 
-    if(m_TaxiDestinations.empty())
+    if (m_TaxiDestinations.empty())
         return true;
 
     // Check integrity
-    if(m_TaxiDestinations.size() < 2)
+    if (m_TaxiDestinations.size() < 2)
         return false;
 
-    for(size_t i = 1; i < m_TaxiDestinations.size(); ++i)
+    for (size_t i = 1; i < m_TaxiDestinations.size(); ++i)
     {
         uint32 cost;
         uint32 path;
-        sObjectMgr.GetTaxiPath(m_TaxiDestinations[i-1],m_TaxiDestinations[i], path, cost);
+        sObjectMgr.GetTaxiPath(m_TaxiDestinations[i - 1], m_TaxiDestinations[i], path, cost);
         if (!path)
             return false;
     }
@@ -242,36 +252,45 @@ bool PlayerTaxi::LoadTaxiDestinationsFromString(const std::string& values, Team
 
 std::string PlayerTaxi::SaveTaxiDestinationsToString()
 {
-    if(m_TaxiDestinations.empty())
+    if (m_TaxiDestinations.empty())
         return "";
 
     std::ostringstream ss;
 
-    for(size_t i=0; i < m_TaxiDestinations.size(); ++i)
-        ss << m_TaxiDestinations[i] << " ";
+    bool needDelimiter = false;
+    for (size_t i = 0; i < m_TaxiDestinations.size(); ++i)
+    {
+        needDelimiter ? ss << ' ' : needDelimiter = true;
+        ss << m_TaxiDestinations[i];
+    }
 
     return ss.str();
 }
 
 uint32 PlayerTaxi::GetCurrentTaxiPath() const
 {
-    if(m_TaxiDestinations.size() < 2)
+    if (m_TaxiDestinations.size() < 2)
         return 0;
 
     uint32 path;
     uint32 cost;
 
-    sObjectMgr.GetTaxiPath(m_TaxiDestinations[0],m_TaxiDestinations[1],path,cost);
+    sObjectMgr.GetTaxiPath(m_TaxiDestinations[0], m_TaxiDestinations[1], path, cost);
 
     return path;
 }
 
-std::ostringstream& operator<< (std::ostringstream& ss, PlayerTaxi const& taxi)
+std::ostringstream& operator << (std::ostringstream& ss, PlayerTaxi const& taxi)
 {
-    for(int i = 0; i < TaxiMaskSize; ++i)
-        ss << taxi.m_taximask[i] << " ";
+    bool needDelimiter = false;
+    for (uint8 i = 0; i < TaxiMaskSize; ++i)
+    {
+        needDelimiter ? ss << ' ' : needDelimiter = true;
+        ss << taxi.m_taximask[i];
+    }
     return ss;
 }
+
 //== TradeData =================================================
 
 TradeData* TradeData::GetTraderData() const
@@ -279,26 +298,25 @@ TradeData* TradeData::GetTraderData() const
     return m_trader->GetTradeData();
 }
 
-Item* TradeData::GetItem( TradeSlots slot ) const
+Item* TradeData::GetItem(TradeSlots slot) const
 {
     return m_items[slot] ? m_player->GetItemByGuid(m_items[slot]) : NULL;
 }
 
-bool TradeData::HasItem( ObjectGuid item_guid ) const
+bool TradeData::HasItem(ObjectGuid item_guid) const
 {
-    for(int i = 0; i < TRADE_SLOT_COUNT; ++i)
+    for (int i = 0; i < TRADE_SLOT_COUNT; ++i)
         if (m_items[i] == item_guid)
             return true;
     return false;
 }
 
-
 Item* TradeData::GetSpellCastItem() const
 {
     return m_spellCastItem ?  m_player->GetItemByGuid(m_spellCastItem) : NULL;
 }
 
-void TradeData::SetItem( TradeSlots slot, Item* item )
+void TradeData::SetItem(TradeSlots slot, Item* item)
 {
     ObjectGuid itemGuid = item ? item->GetObjectGuid() : ObjectGuid();
 
@@ -320,7 +338,7 @@ void TradeData::SetItem( TradeSlots slot, Item* item )
     SetSpell(0);
 }
 
-void TradeData::SetSpell( uint32 spell_id, Item* castItem /*= NULL*/ )
+void TradeData::SetSpell(uint32 spell_id, Item* castItem /*= NULL*/)
 {
     ObjectGuid itemGuid = castItem ? castItem->GetObjectGuid() : ObjectGuid();
 
@@ -337,11 +355,17 @@ void TradeData::SetSpell( uint32 spell_id, Item* castItem /*= NULL*/ )
     Update(false);                                          // send spell info to caster self
 }
 
-void TradeData::SetMoney( uint32 money )
+void TradeData::SetMoney(uint32 money)
 {
     if (m_money == money)
         return;
 
+    if (money > m_player->GetMoney())
+    {
+        m_player->GetSession()->SendTradeStatus(TRADE_STATUS_BUSY);
+        return;
+    }
+
     m_money = money;
 
     SetAccepted(false);
@@ -350,7 +374,7 @@ void TradeData::SetMoney( uint32 money )
     Update();
 }
 
-void TradeData::Update( bool for_trader /*= true*/ )
+void TradeData::Update(bool for_trader /*= true*/)
 {
     if (for_trader)
         m_trader->GetSession()->SendUpdateTrade(true);      // player state for trader
@@ -373,11 +397,11 @@ void TradeData::SetAccepted(bool state, bool crosssend /*= false*/)
 
 //== Player ====================================================
 
-UpdateMask Player::updateVisualBits;
-
-Player::Player (WorldSession *session): Unit(), m_mover(this), m_camera(this), m_achievementMgr(this), m_reputationMgr(this)
+Player::Player(WorldSession* session): Unit(), m_mover(this), m_camera(NULL), m_achievementMgr(this), m_reputationMgr(this)
 {
-    m_transport = 0;
+    // Playerbot mod:
+    m_playerbotAI = 0;
+    m_playerbotMgr = 0;
 
     m_speakTime = 0;
     m_speakCount = 0;
@@ -392,23 +416,22 @@ Player::Player (WorldSession *session): Unit(), m_mover(this), m_camera(this), m
     m_session = session;
 
     m_ExtraFlags = 0;
-    if(GetSession()->GetSecurity() >= SEC_GAMEMASTER)
+    if (GetSession()->GetSecurity() >= SEC_GAMEMASTER)
         SetAcceptTicket(true);
 
     // players always accept
-    if(GetSession()->GetSecurity() == SEC_PLAYER)
+    if (GetSession()->GetSecurity() == SEC_PLAYER)
         SetAcceptWhispers(true);
 
-    m_comboPoints = 0;
-
     m_usedTalentCount = 0;
     m_questRewardTalentCount = 0;
 
-    m_regenTimer = 0;
+    m_regenTimer = REGEN_TIME_FULL;
     m_weaponChangeTimer = 0;
 
     m_zoneUpdateId = 0;
     m_zoneUpdateTimer = 0;
+    m_positionStatusUpdateTimer = 0;
 
     m_areaUpdateId = 0;
 
@@ -416,16 +439,16 @@ Player::Player (WorldSession *session): Unit(), m_mover(this), m_camera(this), m
 
     // randomize first save time in range [CONFIG_UINT32_INTERVAL_SAVE] around [CONFIG_UINT32_INTERVAL_SAVE]
     // this must help in case next save after mass player load after server startup
-    m_nextSave = urand(m_nextSave/2,m_nextSave*3/2);
+    m_nextSave = urand(m_nextSave / 2, m_nextSave * 3 / 2);
 
     clearResurrectRequestData();
 
-    memset(m_items, 0, sizeof(Item*)*PLAYER_SLOTS_COUNT);
+    memset(m_items, 0, sizeof(Item*) * PLAYER_SLOTS_COUNT);
 
     m_social = NULL;
 
     // group is initialized in the reference constructor
-    SetGroupInvite(NULL);
+    SetGroupInvite(ObjectGuid());
     m_groupUpdateMask = 0;
     m_auraUpdateMask = 0;
 
@@ -438,6 +461,7 @@ Player::Player (WorldSession *session): Unit(), m_mover(this), m_camera(this), m
 
     mSemaphoreTeleport_Near = false;
     mSemaphoreTeleport_Far = false;
+    mSemaphoreTeleport_DelayEvent = false;
 
     m_DelayedOperations = 0;
     m_bCanDelayTeleport = false;
@@ -449,13 +473,16 @@ Player::Player (WorldSession *session): Unit(), m_mover(this), m_camera(this), m
 
     m_cinematic = 0;
 
-    PlayerTalkClass = new PlayerMenu( GetSession() );
+    PlayerTalkClass = new PlayerMenu(GetSession());
     m_currentBuybackSlot = BUYBACK_SLOT_START;
 
     m_DailyQuestChanged = false;
     m_WeeklyQuestChanged = false;
+    m_MonthlyQuestChanged = false;
+
+    m_lastLiquid = NULL;
 
-    for (int i=0; i<MAX_TIMERS; ++i)
+    for (int i = 0; i < MAX_TIMERS; ++i)
         m_MirrorTimer[i] = DISABLED_MIRROR_TIMER;
 
     m_MirrorTimerFlags = UNDERWATER_NONE;
@@ -463,16 +490,17 @@ Player::Player (WorldSession *session): Unit(), m_mover(this), m_camera(this), m
 
     m_isInWater = false;
     m_drunkTimer = 0;
-    m_drunk = 0;
     m_restTime = 0;
     m_deathTimer = 0;
     m_deathExpireTime = 0;
 
+    m_lastWSUpdateTime = 0; // == 0 in initialise, for review all updates
+
     m_swingErrorMsg = 0;
 
-    m_DetectInvTimer = 1*IN_MILLISECONDS;
+    m_DetectInvTimer = 1 * IN_MILLISECONDS;
 
-    for (int j=0; j < PLAYER_MAX_BATTLEGROUND_QUEUES; ++j)
+    for (int j = 0; j < PLAYER_MAX_BATTLEGROUND_QUEUES; ++j)
     {
         m_bgBattleGroundQueueID[j].bgQueueTypeId  = BATTLEGROUND_QUEUE_NONE;
         m_bgBattleGroundQueueID[j].invitedToInstance = 0;
@@ -488,13 +516,13 @@ Player::Player (WorldSession *session): Unit(), m_mover(this), m_camera(this), m
     m_canTitanGrip = false;
     m_ammoDPS = 0.0f;
 
-    m_temporaryUnsummonedPetNumber = 0;
+    m_temporaryUnsummonedPetNumber.clear();
 
     ////////////////////Rest System/////////////////////
-    time_inn_enter=0;
-    inn_trigger_id=0;
-    m_rest_bonus=0;
-    rest_type=REST_TYPE_NO;
+    time_inn_enter = 0;
+    inn_trigger_id = 0;
+    m_rest_bonus = 0;
+    rest_type = REST_TYPE_NO;
     ////////////////////Rest System/////////////////////
 
     m_mailsUpdated = false;
@@ -514,8 +542,10 @@ Player::Player (WorldSession *session): Unit(), m_mover(this), m_camera(this), m
 
     m_HomebindTimer = 0;
     m_InstanceValid = true;
-    m_dungeonDifficulty = DUNGEON_DIFFICULTY_NORMAL;
-    m_raidDifficulty = RAID_DIFFICULTY_10MAN_NORMAL;
+
+    m_Difficulty = 0;
+    SetDungeonDifficulty(DUNGEON_DIFFICULTY_NORMAL);
+    SetRaidDifficulty(RAID_DIFFICULTY_10MAN_NORMAL);
 
     m_lastPotionId = 0;
 
@@ -534,18 +564,17 @@ Player::Player (WorldSession *session): Unit(), m_mover(this), m_camera(this), m
     m_baseSpellPower = 0;
     m_baseFeralAP = 0;
     m_baseManaRegen = 0;
+    m_baseHealthRegen = 0;
     m_armorPenetrationPct = 0.0f;
     m_spellPenetrationItemMod = 0;
 
     // Honor System
     m_lastHonorUpdateTime = time(NULL);
 
+    m_isRandomBGWinner = false;
+
     // Player summoning
     m_summon_expire = 0;
-    m_summon_mapid = 0;
-    m_summon_x = 0.0f;
-    m_summon_y = 0.0f;
-    m_summon_z = 0.0f;
 
     m_contestedPvPTimer = 0;
 
@@ -555,95 +584,133 @@ Player::Player (WorldSession *session): Unit(), m_mover(this), m_camera(this), m
     m_lastFallTime = 0;
     m_lastFallZ = 0;
 
+    // Refer-A-Friend
+    m_GrantableLevelsCount = 0;
+
+    // Playerbot mod:
+    m_playerbotAI = NULL;
+    m_playerbotMgr = NULL;
+
+    m_anticheat = new AntiCheat(this);
+
+    SetPendingBind(NULL, 0);
+
+    m_camera = new Camera(*this);
+
     m_cachedGS = 0;
 }
 
-Player::~Player ()
+Player::~Player()
 {
     CleanupsBeforeDelete();
 
     // it must be unloaded already in PlayerLogout and accessed only for loggined player
-    //m_social = NULL;
+    // m_social = NULL;
+
+    // Clear cache need only if player true loaded, not in broken state
+    if (m_uint32Values && !GetObjectGuid().IsEmpty())
+    {
+        sAccountMgr.ClearPlayerDataCache(GetObjectGuid());
+        sMapPersistentStateMgr.AddToUnbindQueue(GetObjectGuid());
+        sLFGMgr.RemoveLFGState(GetObjectGuid());
+    }
 
     // Note: buy back item already deleted from DB when player was saved
-    for(int i = 0; i < PLAYER_SLOTS_COUNT; ++i)
+    for (int i = 0; i < PLAYER_SLOTS_COUNT; ++i)
     {
-        if(m_items[i])
+        if (m_items[i])
+        {
+            m_items[i]->RemoveFromWorld(true);
             delete m_items[i];
+        }
     }
     CleanupChannels();
 
-    //all mailed items should be deleted, also all mail should be deallocated
-    for (PlayerMails::const_iterator itr =  m_mail.begin(); itr != m_mail.end();++itr)
+    // all mailed items should be deleted, also all mail should be deallocated
+    for (PlayerMails::const_iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr)
         delete *itr;
 
     for (ItemMap::const_iterator iter = mMitems.begin(); iter != mMitems.end(); ++iter)
-        delete iter->second;                                //if item is duplicated... then server may crash ... but that item should be deallocated
+    {
+        if (!iter->second)
+            continue;
+
+        iter->second->RemoveFromWorld(true);
+        delete iter->second;                                // if item is duplicated... then server may crash ... but that item should be deallocated
+    }
 
     delete PlayerTalkClass;
 
-    if (m_transport)
-    {
-        m_transport->RemovePassenger(this);
-    }
+    if (Transport* transport = GetTransport())
+        transport->RemovePassenger(this);
 
-    for(size_t x = 0; x < ItemSetEff.size(); x++)
-        if(ItemSetEff[x])
+    for (size_t x = 0; x < ItemSetEff.size(); x++)
+        if (ItemSetEff[x])
             delete ItemSetEff[x];
 
-    // clean up player-instance binds, may unload some instance saves
-    for(uint8 i = 0; i < MAX_DIFFICULTY; ++i)
-        for(BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ++itr)
-            itr->second.state->RemovePlayer(this);
-
     delete m_declinedname;
     delete m_runes;
+    delete m_anticheat;
+    delete m_camera;
+
+    // Playerbot mod
+    if (m_playerbotAI) {
+        delete m_playerbotAI;
+        m_playerbotAI = 0;
+    }
+    if (m_playerbotMgr) {
+        delete m_playerbotMgr;
+        m_playerbotMgr = 0;
+    }
 }
 
 void Player::CleanupsBeforeDelete()
 {
-    if(m_uint32Values)                                      // only for fully created Object
+    if (m_uint32Values)                                      // only for fully created Object
     {
         TradeCancel(false);
-        DuelComplete(DUEL_INTERUPTED);
+        DuelComplete(DUEL_INTERRUPTED);
+
+        // notify zone scripts for player logout
+        sOutdoorPvPMgr.HandlePlayerLeaveZone(this, m_zoneUpdateId);
     }
+
     Unit::CleanupsBeforeDelete();
 }
 
-bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8 class_, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 /*outfitId */)
+bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 class_, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 /*outfitId */)
 {
-    //FIXME: outfitId not used in player creating
+    // FIXME: outfitId not used in player creating
 
-    Object::_Create(guidlow, 0, HIGHGUID_PLAYER);
+    Object::_Create(ObjectGuid(HIGHGUID_PLAYER, guidlow));
 
     m_name = name;
 
     PlayerInfo const* info = sObjectMgr.GetPlayerInfo(race, class_);
-    if(!info)
+    if (!info)
     {
-        sLog.outError("Player have incorrect race/class pair. Can't be loaded.");
+        sLog.outError("Player::Create: %s have incorrect race (%u) / class (%u) pair. Can't be loaded.", GetGuidStr().c_str(), race, class_);
         return false;
     }
 
     ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(class_);
-    if(!cEntry)
+    if (!cEntry)
     {
-        sLog.outError("Class %u not found in DBC (Wrong DBC files?)",class_);
+        sLog.outError("Player::Create: %s has class %u not found in DBC (Wrong DBC files?)", GetGuidStr().c_str(), class_);
         return false;
     }
 
     // player store gender in single bit
     if (gender != uint8(GENDER_MALE) && gender != uint8(GENDER_FEMALE))
     {
-        sLog.outError("Invalid gender %u at player creating", uint32(gender));
+        sLog.outError("Player::Create: %s has invalid gender %u at player creating", GetGuidStr().c_str(), uint32(gender));
         return false;
     }
 
     for (int i = 0; i < PLAYER_SLOTS_COUNT; ++i)
         m_items[i] = NULL;
 
-    SetLocationMapId(info->mapId);
-    Relocate(info->positionX,info->positionY,info->positionZ, info->orientation);
+    Relocate(WorldLocation(info->mapId, info->positionX, info->positionY, info->positionZ, info->orientation));
 
     SetMap(sMapMgr.CreateMap(info->mapId, this));
 
@@ -658,8 +725,8 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
 
     InitDisplayIds();                                       // model, scale and model data
 
-    SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP );
-    SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE );
+    SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP);
+    SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
     SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER);
     SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f);               // fix cast time showed in spell tooltip on client
     SetFloatValue(UNIT_FIELD_HOVERHEIGHT, 1.0f);            // default for players in 3.0.3
@@ -672,23 +739,29 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
     SetByteValue(PLAYER_BYTES, 3, hairColor);
 
     SetByteValue(PLAYER_BYTES_2, 0, facialHair);
-    SetByteValue(PLAYER_BYTES_2, 3, 0x02);                  // rest state = normal
 
-    SetUInt16Value(PLAYER_BYTES_3, 0, gender);              // only GENDER_MALE/GENDER_FEMALE (1 bit) allowed, drunk state = 0
+    LoadAccountLinkedState();
+
+    if (GetAccountLinkedState() != STATE_NOT_LINKED)
+        SetByteValue(PLAYER_BYTES_2, 3, REST_STATE_NORMAL | REST_STATE_RAF_LINKED);
+    else
+        SetByteValue(PLAYER_BYTES_2, 3, REST_STATE_NORMAL);
+
+    SetByteValue(PLAYER_BYTES_3, 0, gender);
     SetByteValue(PLAYER_BYTES_3, 3, 0);                     // BattlefieldArenaFaction (0 or 1)
 
-    SetUInt32Value( PLAYER_GUILDID, 0 );
-    SetUInt32Value( PLAYER_GUILDRANK, 0 );
-    SetUInt32Value( PLAYER_GUILD_TIMESTAMP, 0 );
+    SetUInt32Value(PLAYER_GUILDID, 0);
+    SetUInt32Value(PLAYER_GUILDRANK, 0);
+    SetUInt32Value(PLAYER_GUILD_TIMESTAMP, 0);
 
-    for(int i = 0; i < KNOWN_TITLES_SIZE; ++i)
+    for (int i = 0; i < KNOWN_TITLES_SIZE; ++i)
         SetUInt64Value(PLAYER__FIELD_KNOWN_TITLES + i, 0);  // 0=disabled
-    SetUInt32Value( PLAYER_CHOSEN_TITLE, 0 );
+    SetUInt32Value(PLAYER_CHOSEN_TITLE, 0);
 
-    SetUInt32Value( PLAYER_FIELD_KILLS, 0 );
-    SetUInt32Value( PLAYER_FIELD_LIFETIME_HONORBALE_KILLS, 0 );
-    SetUInt32Value( PLAYER_FIELD_TODAY_CONTRIBUTION, 0 );
-    SetUInt32Value( PLAYER_FIELD_YESTERDAY_CONTRIBUTION, 0 );
+    SetUInt32Value(PLAYER_FIELD_KILLS, 0);
+    SetUInt32Value(PLAYER_FIELD_LIFETIME_HONORBALE_KILLS, 0);
+    SetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, 0);
+    SetUInt32Value(PLAYER_FIELD_YESTERDAY_CONTRIBUTION, 0);
 
     // set starting level
     uint32 start_level = getClass() != CLASS_DEATH_KNIGHT
@@ -698,7 +771,7 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
     if (GetSession()->GetSecurity() >= SEC_MODERATOR)
     {
         uint32 gm_level = sWorld.getConfig(CONFIG_UINT32_START_GM_LEVEL);
-        if(gm_level > start_level)
+        if (gm_level > start_level)
             start_level = gm_level;
     }
 
@@ -726,13 +799,13 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
     UpdateMaxHealth();                                      // Update max Health (for add bonus from stamina)
     SetHealth(GetMaxHealth());
 
-    if (getPowerType() == POWER_MANA)
+    if (GetPowerType() == POWER_MANA)
     {
         UpdateMaxPower(POWER_MANA);                         // Update max Mana (for add bonus from intellect)
         SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
     }
 
-    if(getPowerType() != POWER_MANA)                        // hide additional mana bar if we have no mana
+    if (GetPowerType() != POWER_MANA)                       // hide additional mana bar if we have no mana
     {
         SetPower(POWER_MANA, 0);
         SetMaxPower(POWER_MANA, 0);
@@ -743,7 +816,7 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
 
     // original action bar
     for (PlayerCreateInfoActions::const_iterator action_itr = info->action.begin(); action_itr != info->action.end(); ++action_itr)
-        addActionButton(0, action_itr->button,action_itr->action,action_itr->type);
+        addActionButton(0, action_itr->button, action_itr->action, action_itr->type);
 
     // original items
     uint32 raceClassGender = GetUInt32Value(UNIT_FIELD_BYTES_0) & 0x00FFFFFF;
@@ -751,9 +824,9 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
     CharStartOutfitEntry const* oEntry = NULL;
     for (uint32 i = 1; i < sCharStartOutfitStore.GetNumRows(); ++i)
     {
-        if(CharStartOutfitEntry const* entry = sCharStartOutfitStore.LookupEntry(i))
+        if (CharStartOutfitEntry const* entry = sCharStartOutfitStore.LookupEntry(i))
         {
-            if(entry->RaceClassGender == raceClassGender)
+            if (entry->RaceClassGender == raceClassGender)
             {
                 oEntry = entry;
                 break;
@@ -761,36 +834,36 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
         }
     }
 
-    if(oEntry)
+    if (oEntry)
     {
-        for(int j = 0; j < MAX_OUTFIT_ITEMS; ++j)
+        for (int j = 0; j < MAX_OUTFIT_ITEMS; ++j)
         {
-            if(oEntry->ItemId[j] <= 0)
+            if (oEntry->ItemId[j] <= 0)
                 continue;
 
             uint32 item_id = oEntry->ItemId[j];
 
             // just skip, reported in ObjectMgr::LoadItemPrototypes
             ItemPrototype const* iProto = ObjectMgr::GetItemPrototype(item_id);
-            if(!iProto)
+            if (!iProto)
                 continue;
 
             // BuyCount by default
             int32 count = iProto->BuyCount;
 
             // special amount for foor/drink
-            if(iProto->Class==ITEM_CLASS_CONSUMABLE && iProto->SubClass==ITEM_SUBCLASS_FOOD)
+            if (iProto->Class == ITEM_CLASS_CONSUMABLE && iProto->SubClass == ITEM_SUBCLASS_FOOD)
             {
-                switch(iProto->Spells[0].SpellCategory)
+                switch (iProto->Spells[0].SpellCategory)
                 {
                     case 11:                                // food
-                        count = getClass()==CLASS_DEATH_KNIGHT ? 10 : 4;
+                        count = getClass() == CLASS_DEATH_KNIGHT ? 10 : 4;
                         break;
                     case 59:                                // drink
                         count = 2;
                         break;
                 }
-                if(iProto->Stackable < count)
+                if (iProto->Stackable < count)
                     count = iProto->Stackable;
             }
 
@@ -823,8 +896,8 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
                 msg = CanStoreItem(NULL_BAG, NULL_SLOT, sDest, pItem, false);
                 if (msg == EQUIP_ERR_OK)
                 {
-                    RemoveItem(INVENTORY_SLOT_BAG_0, i,true);
-                    pItem = StoreItem( sDest, pItem, true);
+                    RemoveItem(INVENTORY_SLOT_BAG_0, i, true);
+                    pItem = StoreItem(sDest, pItem, true);
                 }
 
                 // if  this is ammo then use it
@@ -841,36 +914,36 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
 
 bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount)
 {
-    DEBUG_LOG("STORAGE: Creating initial item, itemId = %u, count = %u",titem_id, titem_amount);
+    DEBUG_LOG("STORAGE: Creating initial item, itemId = %u, count = %u", titem_id, titem_amount);
 
     // attempt equip by one
-    while(titem_amount > 0)
+    while (titem_amount > 0)
     {
         uint16 eDest;
-        uint8 msg = CanEquipNewItem( NULL_SLOT, eDest, titem_id, false );
-        if( msg != EQUIP_ERR_OK )
+        uint8 msg = CanEquipNewItem(NULL_SLOT, eDest, titem_id, false);
+        if (msg != EQUIP_ERR_OK)
             break;
 
-        EquipNewItem( eDest, titem_id, true);
+        EquipNewItem(eDest, titem_id, true);
         AutoUnequipOffhandIfNeed();
         --titem_amount;
     }
 
-    if(titem_amount == 0)
+    if (titem_amount == 0)
         return true;                                        // equipped
 
     // attempt store
     ItemPosCountVec sDest;
     // store in main bag to simplify second pass (special bags can be not equipped yet at this moment)
-    uint8 msg = CanStoreNewItem( INVENTORY_SLOT_BAG_0, NULL_SLOT, sDest, titem_id, titem_amount );
-    if( msg == EQUIP_ERR_OK )
+    uint8 msg = CanStoreNewItem(INVENTORY_SLOT_BAG_0, NULL_SLOT, sDest, titem_id, titem_amount);
+    if (msg == EQUIP_ERR_OK)
     {
-        StoreNewItem( sDest, titem_id, true, Item::GenerateItemRandomPropertyId(titem_id) );
+        StoreNewItem(sDest, titem_id, true, Item::GenerateItemRandomPropertyId(titem_id));
         return true;                                        // stored
     }
 
     // item can't be added
-    sLog.outError("STORAGE: Can't equip or store initial item %u for race %u class %u , error msg = %u",titem_id,getRace(),getClass(),msg);
+    sLog.outError("STORAGE: %s can't equip or store initial item %u for race %u class %u , error msg = %u", GetGuidStr().c_str(), titem_id, getRace(), getClass(), msg);
     return false;
 }
 
@@ -898,57 +971,68 @@ void Player::SendMirrorTimer(MirrorTimerType Type, uint32 MaxValue, uint32 Curre
             StopMirrorTimer(Type);
         return;
     }
-    WorldPacket data(SMSG_START_MIRROR_TIMER, (21));
-    data << (uint32)Type;
+
+    WorldPacket data(SMSG_START_MIRROR_TIMER, 21);
+    data << uint32(Type);
     data << CurrentValue;
     data << MaxValue;
     data << Regen;
-    data << (uint8)0;
-    data << (uint32)0;                                      // spell id
-    GetSession()->SendPacket( &data );
+    data << uint8(0);
+    data << uint32(0);                                      // spell id
+    GetSession()->SendPacket(&data);
 }
 
 void Player::StopMirrorTimer(MirrorTimerType Type)
 {
     m_MirrorTimer[Type] = DISABLED_MIRROR_TIMER;
     WorldPacket data(SMSG_STOP_MIRROR_TIMER, 4);
-    data << (uint32)Type;
-    GetSession()->SendPacket( &data );
+    data << uint32(Type);
+    GetSession()->SendPacket(&data);
 }
 
 uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage)
 {
-    if(!isAlive() || isGameMaster())
+    if (!isAlive() || isGameMaster())
         return 0;
 
-    // Absorb, resist some environmental damage type
-    uint32 absorb = 0;
-    uint32 resist = 0;
-    if (type == DAMAGE_LAVA)
-        CalculateDamageAbsorbAndResist(this, SPELL_SCHOOL_MASK_FIRE, DIRECT_DAMAGE, damage, &absorb, &resist);
-    else if (type == DAMAGE_SLIME)
-        CalculateDamageAbsorbAndResist(this, SPELL_SCHOOL_MASK_NATURE, DIRECT_DAMAGE, damage, &absorb, &resist);
+    //16455 lava, 16456 slime
+    uint32 spellID = 0;
+    switch (type)
+    {
+        case DAMAGE_LAVA:
+            spellID = 16455;
+            break;
+        case DAMAGE_SLIME:
+            spellID = 16456;
+            //as i think, not used NATURE mask for slime damage.
+            break;
+        default:
+            break;
+    }
+
+    DamageInfo damageInfo = DamageInfo(this, this, spellID, damage);
+    damageInfo.damageType = (type == DAMAGE_FALL && getClass() == CLASS_ROGUE) ? SELF_DAMAGE_ROGUE_FALL : SELF_DAMAGE;
 
-    damage-=absorb+resist;
+    CalculateDamageAbsorbAndResist(this, &damageInfo);
 
-    DealDamageMods(this,damage,&absorb);
+    DealDamageMods(&damageInfo);
 
     WorldPacket data(SMSG_ENVIRONMENTALDAMAGELOG, (21));
     data << GetObjectGuid();
-    data << uint8(type!=DAMAGE_FALL_TO_VOID ? type : DAMAGE_FALL);
-    data << uint32(damage);
-    data << uint32(absorb);
-    data << uint32(resist);
+    data << uint8(type != DAMAGE_FALL_TO_VOID ? type : DAMAGE_FALL);
+    data << uint32(damageInfo.damage);
+    data << uint32(damageInfo.GetAbsorb());
+    data << uint32(damageInfo.resist);
     SendMessageToSet(&data, true);
 
-    uint32 final_damage = DealDamage(this, damage, NULL, SELF_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+    uint32 final_damage = DealDamage(this, &damageInfo, false);
 
-    if(!isAlive())
+    if (!isAlive())
     {
-        if(type==DAMAGE_FALL)                               // DealDamage not apply item durability loss at self damage
+        if (type == DAMAGE_FALL)                               // DealDamage not apply item durability loss at self damage
         {
             DEBUG_LOG("We are fall to death, loosing 10 percents durability");
-            DurabilityLossAll(0.10f,false);
+            DurabilityLossAll(0.10f, false);
             // durability lost message
             WorldPacket data2(SMSG_DURABILITY_DAMAGE_DEATH, 0);
             GetSession()->SendPacket(&data2);
@@ -975,7 +1059,7 @@ int32 Player::getMaxTimer(MirrorTimerType timer)
                 return DISABLED_MIRROR_TIMER;
             int32 UnderWaterTime = sWorld.getConfig(CONFIG_UINT32_TIMERBAR_BREATH_MAX)*IN_MILLISECONDS;
             AuraList const& mModWaterBreathing = GetAurasByType(SPELL_AURA_MOD_WATER_BREATHING);
-            for(AuraList::const_iterator i = mModWaterBreathing.begin(); i != mModWaterBreathing.end(); ++i)
+            for (AuraList::const_iterator i = mModWaterBreathing.begin(); i != mModWaterBreathing.end(); ++i)
                 UnderWaterTime = uint32(UnderWaterTime * (100.0f + (*i)->GetModifier()->m_amount) / 100.0f);
             return UnderWaterTime;
         }
@@ -983,7 +1067,7 @@ int32 Player::getMaxTimer(MirrorTimerType timer)
         {
             if (!isAlive() || GetSession()->GetSecurity() >= (AccountTypes)sWorld.getConfig(CONFIG_UINT32_TIMERBAR_FIRE_GMLEVEL))
                 return DISABLED_MIRROR_TIMER;
-            return sWorld.getConfig(CONFIG_UINT32_TIMERBAR_FIRE_MAX)*IN_MILLISECONDS;
+            return sWorld.getConfig(CONFIG_UINT32_TIMERBAR_FIRE_MAX) * IN_MILLISECONDS;
         }
         default:
             return 0;
@@ -1032,7 +1116,7 @@ void Player::HandleDrowning(uint32 time_diff)
     {
         int32 UnderWaterTime = getMaxTimer(BREATH_TIMER);
         // Need breath regen
-        m_MirrorTimer[BREATH_TIMER]+=10*time_diff;
+        m_MirrorTimer[BREATH_TIMER] += 10 * time_diff;
         if (m_MirrorTimer[BREATH_TIMER] >= UnderWaterTime || !isAlive())
             StopMirrorTimer(BREATH_TIMER);
         else if (m_MirrorTimerFlagsLast & UNDERWATER_INWATER)
@@ -1050,14 +1134,14 @@ void Player::HandleDrowning(uint32 time_diff)
         }
         else
         {
-            m_MirrorTimer[FATIGUE_TIMER]-=time_diff;
+            m_MirrorTimer[FATIGUE_TIMER] -= time_diff;
             // Timer limit - need deal damage or teleport ghost to graveyard
             if (m_MirrorTimer[FATIGUE_TIMER] < 0)
             {
                 m_MirrorTimer[FATIGUE_TIMER] += 2 * IN_MILLISECONDS;
                 if (isAlive())                                            // Calculate and deal damage
                 {
-                    uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel()-1);
+                    uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel() - 1);
                     EnvironmentalDamage(DAMAGE_EXHAUSTED, damage);
                 }
                 else if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))       // Teleport ghost to graveyard
@@ -1070,33 +1154,31 @@ void Player::HandleDrowning(uint32 time_diff)
     else if (m_MirrorTimer[FATIGUE_TIMER] != DISABLED_MIRROR_TIMER)       // Regen timer
     {
         int32 DarkWaterTime = getMaxTimer(FATIGUE_TIMER);
-        m_MirrorTimer[FATIGUE_TIMER]+=10*time_diff;
+        m_MirrorTimer[FATIGUE_TIMER] += 10 * time_diff;
         if (m_MirrorTimer[FATIGUE_TIMER] >= DarkWaterTime || !isAlive())
             StopMirrorTimer(FATIGUE_TIMER);
         else if (m_MirrorTimerFlagsLast & UNDERWATER_INDARKWATER)
             SendMirrorTimer(FATIGUE_TIMER, DarkWaterTime, m_MirrorTimer[FATIGUE_TIMER], 10);
     }
 
-    if (m_MirrorTimerFlags & (UNDERWATER_INLAVA|UNDERWATER_INSLIME))
+    if ((m_MirrorTimerFlags & (UNDERWATER_INLAVA /*| UNDERWATER_INSLIME*/)) && !(m_lastLiquid && m_lastLiquid->SpellId))
     {
         // Breath timer not activated - activate it
         if (m_MirrorTimer[FIRE_TIMER] == DISABLED_MIRROR_TIMER)
             m_MirrorTimer[FIRE_TIMER] = getMaxTimer(FIRE_TIMER);
         else
         {
-            m_MirrorTimer[FIRE_TIMER]-=time_diff;
+            m_MirrorTimer[FIRE_TIMER] -= time_diff;
             if (m_MirrorTimer[FIRE_TIMER] < 0)
             {
                 m_MirrorTimer[FIRE_TIMER] += 2 * IN_MILLISECONDS;
                 // Calculate and deal damage
                 // TODO: Check this formula
                 uint32 damage = urand(600, 700);
-                if (m_MirrorTimerFlags&UNDERWATER_INLAVA)
+                if (m_MirrorTimerFlags & UNDERWATER_INLAVA)
                     EnvironmentalDamage(DAMAGE_LAVA, damage);
-                // need to skip Slime damage in Undercity,
+                // need to skip Slime damage in Undercity and Ruins of Lordaeron arena
                 // maybe someone can find better way to handle environmental damage
-                else if (m_zoneUpdateId != 1497)
-                    EnvironmentalDamage(DAMAGE_SLIME, damage);
             }
         }
     }
@@ -1104,55 +1186,66 @@ void Player::HandleDrowning(uint32 time_diff)
         m_MirrorTimer[FIRE_TIMER] = DISABLED_MIRROR_TIMER;
 
     // Recheck timers flag
-    m_MirrorTimerFlags&=~UNDERWATER_EXIST_TIMERS;
+    m_MirrorTimerFlags &= ~UNDERWATER_EXIST_TIMERS;
     for (int i = 0; i< MAX_TIMERS; ++i)
-        if (m_MirrorTimer[i]!=DISABLED_MIRROR_TIMER)
+    {
+        if (m_MirrorTimer[i] != DISABLED_MIRROR_TIMER)
         {
-            m_MirrorTimerFlags|=UNDERWATER_EXIST_TIMERS;
+            m_MirrorTimerFlags |= UNDERWATER_EXIST_TIMERS;
             break;
         }
+    }
     m_MirrorTimerFlagsLast = m_MirrorTimerFlags;
 }
 
-///The player sobers by 256 every 10 seconds
+/// The player sobers by 1% every 9 seconds
 void Player::HandleSobering()
 {
     m_drunkTimer = 0;
 
-    uint32 drunk = (m_drunk <= 256) ? 0 : (m_drunk - 256);
-    SetDrunkValue(drunk);
+    uint8 currentDrunkValue = GetDrunkValue();
+    if (currentDrunkValue)
+    {
+        --currentDrunkValue;
+        SetDrunkValue(currentDrunkValue);
+    }
 }
 
-DrunkenState Player::GetDrunkenstateByValue(uint16 value)
+DrunkenState Player::GetDrunkenstateByValue(uint8 value)
 {
-    if(value >= 23000)
+    if (value >= 90)
         return DRUNKEN_SMASHED;
-    if(value >= 12800)
+    if (value >= 50)
         return DRUNKEN_DRUNK;
-    if(value & 0xFFFE)
+    if (value)
         return DRUNKEN_TIPSY;
     return DRUNKEN_SOBER;
 }
 
-void Player::SetDrunkValue(uint16 newDrunkenValue, uint32 itemId)
+void Player::SetDrunkValue(uint8 newDrunkValue, uint32 itemId /*= 0*/)
 {
-    uint32 oldDrunkenState = Player::GetDrunkenstateByValue(m_drunk);
+    if (newDrunkValue > 100)
+        newDrunkValue = 100;
 
-    m_drunk = newDrunkenValue;
-    SetUInt16Value(PLAYER_BYTES_3, 0, uint16(getGender()) | (m_drunk & 0xFFFE));
+    if (newDrunkValue < GetDrunkValue())
+        m_drunkTimer = 0;   // reset sobering timer
 
-    uint32 newDrunkenState = Player::GetDrunkenstateByValue(m_drunk);
+    uint32 oldDrunkenState = Player::GetDrunkenstateByValue(GetDrunkValue());
+
+    SetByteValue(PLAYER_BYTES_3, 1, newDrunkValue);
+
+    uint32 newDrunkenState = Player::GetDrunkenstateByValue(newDrunkValue);
 
     // special drunk invisibility detection
-    if(newDrunkenState >= DRUNKEN_DRUNK)
-        m_detectInvisibilityMask |= (1<<6);
+    if (newDrunkenState >= DRUNKEN_DRUNK)
+        m_detectInvisibilityMask |= (1 << 6);
     else
-        m_detectInvisibilityMask &= ~(1<<6);
+        m_detectInvisibilityMask &= ~(1 << 6);
 
-    if(newDrunkenState == oldDrunkenState)
+    if (newDrunkenState == oldDrunkenState)
         return;
 
-    WorldPacket data(SMSG_CROSSED_INEBRIATION_THRESHOLD, (8+4+4));
+    WorldPacket data(SMSG_CROSSED_INEBRIATION_THRESHOLD, 8 + 4 + 4);
     data << GetObjectGuid();
     data << uint32(newDrunkenState);
     data << uint32(itemId);
@@ -1160,16 +1253,16 @@ void Player::SetDrunkValue(uint16 newDrunkenValue, uint32 itemId)
     SendMessageToSet(&data, true);
 }
 
-void Player::Update( uint32 update_diff, uint32 p_time )
+void Player::Update(uint32 update_diff, uint32 p_time)
 {
-    if(!IsInWorld())
+    if (!IsInWorld())
         return;
 
-    // remove failed timed Achievements
+    // Remove failed timed Achievements
     GetAchievementMgr().DoFailedTimedAchievementCriterias();
 
-    // undelivered mail
-    if(m_nextMailDelivereTime && m_nextMailDelivereTime <= time(NULL))
+    // Undelivered mail
+    if (m_nextMailDelivereTime && m_nextMailDelivereTime <= time(NULL))
     {
         SendNewMail();
         ++unReadMails;
@@ -1178,23 +1271,16 @@ void Player::Update( uint32 update_diff, uint32 p_time )
         m_nextMailDelivereTime = 0;
     }
 
-    //used to implement delayed far teleports
+    // Used to implement delayed far teleports
     SetCanDelayTeleport(true);
-    Unit::Update( update_diff, p_time );
+    Unit::Update(update_diff, p_time);
     SetCanDelayTeleport(false);
 
-    // update player only attacks
-    if(uint32 ranged_att = getAttackTimer(RANGED_ATTACK))
-    {
-        setAttackTimer(RANGED_ATTACK, (update_diff >= ranged_att ? 0 : ranged_att - update_diff) );
-    }
-
-    if(uint32 off_att = getAttackTimer(OFF_ATTACK))
-    {
-        setAttackTimer(OFF_ATTACK, (update_diff >= off_att ? 0 : off_att - update_diff) );
-    }
+    // Update player only attacks
+    if (uint32 ranged_att = getAttackTimer(RANGED_ATTACK))
+        setAttackTimer(RANGED_ATTACK, (update_diff >= ranged_att ? 0 : ranged_att - update_diff));
 
-    time_t now = time (NULL);
+    time_t now = time(NULL);
 
     UpdatePvPFlag(now);
 
@@ -1207,8 +1293,8 @@ void Player::Update( uint32 update_diff, uint32 p_time )
     UpdateAfkReport(now);
 
     // Update items that have just a limited lifetime
-    if (now>m_Last_tick)
-        UpdateItemDuration(uint32(now- m_Last_tick));
+    if (now > m_Last_tick)
+        UpdateItemDuration(uint32(now - m_Last_tick));
 
     if (!m_timedquests.empty())
     {
@@ -1216,10 +1302,10 @@ void Player::Update( uint32 update_diff, uint32 p_time )
         while (iter != m_timedquests.end())
         {
             QuestStatusData& q_status = mQuestStatus[*iter];
-            if( q_status.m_timer <= update_diff )
+            if (q_status.m_timer <= update_diff)
             {
                 uint32 quest_id  = *iter;
-                ++iter;                                     // current iter will be removed in FailQuest
+                ++iter;                                     // Current iter will be removed in FailQuest
                 FailQuest(quest_id);
             }
             else
@@ -1235,10 +1321,10 @@ void Player::Update( uint32 update_diff, uint32 p_time )
     {
         UpdateMeleeAttackingState();
 
-        Unit *pVictim = getVictim();
+        Unit* pVictim = getVictim();
         if (pVictim && !IsNonMeleeSpellCasted(false))
         {
-            Player *vOwner = pVictim->GetCharmerOrOwnerPlayerOrPlayerItself();
+            Player* vOwner = pVictim->GetCharmerOrOwnerPlayerOrPlayerItself();
             if (vOwner && vOwner->IsPvP() && !IsInDuelWith(vOwner))
             {
                 UpdatePvP(true);
@@ -1249,14 +1335,14 @@ void Player::Update( uint32 update_diff, uint32 p_time )
 
     if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING))
     {
-        if (roll_chance_i(3) && GetTimeInnEnter() > 0)      //freeze update
+        if (roll_chance_i(3) && GetTimeInnEnter() > 0)      // Freeze update
         {
-            time_t time_inn = time(NULL)-GetTimeInnEnter();
-            if (time_inn >= 10)                             //freeze update
+            time_t time_inn = time(NULL) - GetTimeInnEnter();
+            if (time_inn >= 10)                             // Freeze update
             {
-                float bubble = 0.125f*sWorld.getConfig(CONFIG_FLOAT_RATE_REST_INGAME);
-                //speed collect rest bonus (section/in hour)
-                SetRestBonus( float(GetRestBonus()+ time_inn*(GetUInt32Value(PLAYER_NEXT_LEVEL_XP)/72000)*bubble ));
+                float bubble = 0.125f * sWorld.getConfig(CONFIG_FLOAT_RATE_REST_INGAME);
+                // Speed collect rest bonus (section/in hour)
+                SetRestBonus(float(GetRestBonus() + time_inn * (GetUInt32Value(PLAYER_NEXT_LEVEL_XP) / 72000) * bubble));
                 UpdateInnerTime(time(NULL));
             }
         }
@@ -1264,15 +1350,23 @@ void Player::Update( uint32 update_diff, uint32 p_time )
 
     if (m_regenTimer)
     {
-        if(update_diff >= m_regenTimer)
+        if (update_diff >= m_regenTimer)
             m_regenTimer = 0;
         else
             m_regenTimer -= update_diff;
     }
 
+    if (m_positionStatusUpdateTimer)
+    {
+        if (update_diff >= m_positionStatusUpdateTimer)
+            m_positionStatusUpdateTimer = 0;
+        else
+            m_positionStatusUpdateTimer -= update_diff;
+    }
+
     if (m_weaponChangeTimer > 0)
     {
-        if(update_diff >= m_weaponChangeTimer)
+        if (update_diff >= m_weaponChangeTimer)
             m_weaponChangeTimer = 0;
         else
             m_weaponChangeTimer -= update_diff;
@@ -1280,18 +1374,18 @@ void Player::Update( uint32 update_diff, uint32 p_time )
 
     if (m_zoneUpdateTimer > 0)
     {
-        if(update_diff >= m_zoneUpdateTimer)
+        if (update_diff >= m_zoneUpdateTimer)
         {
             uint32 newzone, newarea;
-            GetZoneAndAreaId(newzone,newarea);
+            GetZoneAndAreaId(newzone, newarea);
 
-            if( m_zoneUpdateId != newzone )
-                UpdateZone(newzone,newarea);                // also update area
+            if (m_zoneUpdateId != newzone)
+                UpdateZone(newzone, newarea);               // Also update area
             else
             {
-                // use area updates as well
-                // needed for free far all arenas for example
-                if( m_areaUpdateId != newarea )
+                // Use area updates as well
+                // Needed for free for all arenas for example
+                if (m_areaUpdateId != newarea)
                     UpdateArea(newarea);
 
                 m_zoneUpdateTimer = ZONE_UPDATE_INTERVAL;
@@ -1303,7 +1397,7 @@ void Player::Update( uint32 update_diff, uint32 p_time )
 
     if (m_timeSyncTimer > 0)
     {
-        if(update_diff >= m_timeSyncTimer)
+        if (update_diff >= m_timeSyncTimer)
             SendTimeSync();
         else
             m_timeSyncTimer -= update_diff;
@@ -1316,28 +1410,31 @@ void Player::Update( uint32 update_diff, uint32 p_time )
             SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER);
 
         if (!m_regenTimer)
-            RegenerateAll();
+            RegenerateAll(IsUnderLastManaUseEffect() ? REGEN_TIME_PRECISE : REGEN_TIME_FULL);
     }
 
+    if (!isAlive() && !HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST) && getDeathState() != GHOULED)
+        SetHealth(0);
+
     if (m_deathState == JUST_DIED)
         KillPlayer();
 
-    if(m_nextSave > 0)
+    if (m_nextSave > 0)
     {
-        if(update_diff >= m_nextSave)
+        if (update_diff >= m_nextSave)
         {
             // m_nextSave reseted in SaveToDB call
             SaveToDB();
-            DETAIL_LOG("Player '%s' (GUID: %u) saved", GetName(), GetGUIDLow());
+            DETAIL_LOG("%s saved", GetGuidStr().c_str());
         }
         else
             m_nextSave -= update_diff;
     }
 
-    //Handle Water/drowning
+    // Handle Water/drowning
     HandleDrowning(update_diff);
 
-    //Handle detect stealth players
+    // Handle detect stealth players
     if (m_DetectInvTimer > 0)
     {
         if (update_diff >= m_DetectInvTimer)
@@ -1358,18 +1455,29 @@ void Player::Update( uint32 update_diff, uint32 p_time )
         m_Last_tick = now;
     }
 
-    if (m_drunk)
+    if (GetDrunkValue())
     {
         m_drunkTimer += update_diff;
 
-        if (m_drunkTimer > 10*IN_MILLISECONDS)
+        if (m_drunkTimer > 9 * IN_MILLISECONDS)
             HandleSobering();
     }
 
-    // not auto-free ghost from body in instances
-    if(m_deathTimer > 0  && !GetMap()->Instanceable())
+    if (HasPendingBind())
+    {
+        if (_pendingBindTimer <= p_time)
+        {
+            BindToInstance();
+            SetPendingBind(NULL, 0);
+        }
+        else
+            _pendingBindTimer -= p_time;
+    }
+
+    // Not auto-free ghost from body in instances
+    if (m_deathTimer > 0 && !GetMap()->Instanceable() && getDeathState() != GHOULED)
     {
-        if(p_time >= m_deathTimer)
+        if (p_time >= m_deathTimer)
         {
             m_deathTimer = 0;
             BuildPlayerRepop();
@@ -1382,7 +1490,7 @@ void Player::Update( uint32 update_diff, uint32 p_time )
     UpdateEnchantTime(update_diff);
     UpdateHomebindTime(update_diff);
 
-    // group update
+    // Group update
     SendUpdateToOutOfRangeGroupMembers();
 
     Pet* pet = GetPet();
@@ -1391,6 +1499,12 @@ void Player::Update( uint32 update_diff, uint32 p_time )
 
     if (IsHasDelayedTeleport())
         TeleportTo(m_teleport_dest, m_teleport_options);
+
+    // Playerbot mod
+    if (m_playerbotAI)
+       m_playerbotAI->UpdateAI(p_time);
+    if (m_playerbotMgr)
+       m_playerbotMgr->UpdateAI(p_time);
 }
 
 void Player::SetDeathState(DeathState s)
@@ -1399,7 +1513,7 @@ void Player::SetDeathState(DeathState s)
 
     bool cur = isAlive();
 
-    if(s == JUST_DIED && cur)
+    if (s == JUST_DIED && cur)
     {
         // drunken state is cleared on death
         SetDrunkValue(0);
@@ -1411,14 +1525,20 @@ void Player::SetDeathState(DeathState s)
         // remove form before other mods to prevent incorrect stats calculation
         RemoveSpellsCausingAura(SPELL_AURA_MOD_SHAPESHIFT);
 
-        //FIXME: is pet dismissed at dying or releasing spirit? if second, add SetDeathState(DEAD) to HandleRepopRequestOpcode and define pet unsummon here with (s == DEAD)
-        RemovePet(PET_SAVE_REAGENTS);
+        if (Pet* pet = GetPet())
+        {
+            if (pet->getPetType() == HUNTER_PET)
+                SetTemporaryUnsummonedPetNumber(pet->GetCharmInfo()->GetPetNumber());
+
+            // FIXME: is pet dismissed at dying or releasing spirit? if second, add SetDeathState(DEAD) to HandleRepopRequestOpcode and define pet unsummon here with (s == DEAD)
+            RemovePet(PET_SAVE_REAGENTS);
+        }
 
         // save value before aura remove in Unit::SetDeathState
         ressSpellId = GetUInt32Value(PLAYER_SELF_RES_SPELL);
 
         // passive spell
-        if(!ressSpellId)
+        if (!ressSpellId)
             ressSpellId = GetResurrectionSpellId();
 
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DEATH_AT_MAP, 1);
@@ -1432,21 +1552,27 @@ void Player::SetDeathState(DeathState s)
     Unit::SetDeathState(s);
 
     // restore resurrection spell id for player after aura remove
-    if(s == JUST_DIED && cur && ressSpellId)
+    if (s == JUST_DIED && cur && ressSpellId)
         SetUInt32Value(PLAYER_SELF_RES_SPELL, ressSpellId);
 
-    if(isAlive() && !cur)
+    if (!cur && s == ALIVE)
+    {
+        _RemoveAllItemMods();
+        _ApplyAllItemMods();
+    }
+
+    if (isAlive() && !cur)
     {
         //clear aura case after resurrection by another way (spells will be applied before next death)
         SetUInt32Value(PLAYER_SELF_RES_SPELL, 0);
 
         // restore default warrior stance
-        if(getClass()== CLASS_WARRIOR)
-            CastSpell(this,SPELL_ID_PASSIVE_BATTLE_STANCE,true);
+        if (getClass() == CLASS_WARRIOR)
+            CastSpell(this, SPELL_ID_PASSIVE_BATTLE_STANCE, true);
     }
 }
 
-bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
+bool Player::BuildEnumData(QueryResult* result, WorldPacket* p_data)
 {
     //             0               1                2                3                 4                  5                       6                        7
     //    "SELECT characters.guid, characters.name, characters.race, characters.class, characters.gender, characters.playerBytes, characters.playerBytes2, characters.level, "
@@ -1455,16 +1581,16 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
     //    15                    16                   17                     18                   19                         20
     //    "characters.at_login, character_pet.entry, character_pet.modelid, character_pet.level, characters.equipmentCache, character_declinedname.genitive "
 
-    Field *fields = result->Fetch();
+    Field* fields = result->Fetch();
 
     uint32 guid = fields[0].GetUInt32();
     uint8 pRace = fields[2].GetUInt8();
     uint8 pClass = fields[3].GetUInt8();
 
-    PlayerInfo const *info = sObjectMgr.GetPlayerInfo(pRace, pClass);
-    if(!info)
+    PlayerInfo const* info = sObjectMgr.GetPlayerInfo(pRace, pClass);
+    if (!info)
     {
-        sLog.outError("Player %u has incorrect race/class pair. Don't build enum.", guid);
+        sLog.outError("Player::BuildEnumData: Player %s (Guid: %u) has incorrect race (%u) / class (%u) pair. Don't build enum.", fields[1].GetString(), guid, pRace, pClass);
         return false;
     }
 
@@ -1496,25 +1622,32 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
     uint32 char_flags = 0;
     uint32 playerFlags = fields[14].GetUInt32();
     uint32 atLoginFlags = fields[15].GetUInt32();
-    if(playerFlags & PLAYER_FLAGS_HIDE_HELM)
+    if (playerFlags & PLAYER_FLAGS_HIDE_HELM)
         char_flags |= CHARACTER_FLAG_HIDE_HELM;
-    if(playerFlags & PLAYER_FLAGS_HIDE_CLOAK)
+    if (playerFlags & PLAYER_FLAGS_HIDE_CLOAK)
         char_flags |= CHARACTER_FLAG_HIDE_CLOAK;
-    if(playerFlags & PLAYER_FLAGS_GHOST)
+    if (playerFlags & PLAYER_FLAGS_GHOST)
         char_flags |= CHARACTER_FLAG_GHOST;
-    if(atLoginFlags & AT_LOGIN_RENAME)
+    if (atLoginFlags & AT_LOGIN_RENAME)
         char_flags |= CHARACTER_FLAG_RENAME;
-    if(sWorld.getConfig(CONFIG_BOOL_DECLINED_NAMES_USED))
+    if (sWorld.getConfig(CONFIG_BOOL_DECLINED_NAMES_USED))
     {
-        if(!fields[20].GetCppString().empty())
+        if (!fields[20].GetCppString().empty())
             char_flags |= CHARACTER_FLAG_DECLINED;
     }
     else
         char_flags |= CHARACTER_FLAG_DECLINED;
 
     *p_data << uint32(char_flags);                          // character flags
-    // character customize flags
-    *p_data << uint32(atLoginFlags & AT_LOGIN_CUSTOMIZE ? CHAR_CUSTOMIZE_FLAG_CUSTOMIZE : CHAR_CUSTOMIZE_FLAG_NONE);
+    // character customize/faction/race change flags
+    if (atLoginFlags & AT_LOGIN_CUSTOMIZE)
+        *p_data << uint32(CHAR_CUSTOMIZE_FLAG_CUSTOMIZE);
+    else if (atLoginFlags & AT_LOGIN_CHANGE_FACTION)
+        *p_data << uint32(CHAR_CUSTOMIZE_FLAG_FACTION);
+    else if (atLoginFlags & AT_LOGIN_CHANGE_RACE)
+        *p_data << uint32(CHAR_CUSTOMIZE_FLAG_RACE);
+    else
+        *p_data << uint32(CHAR_CUSTOMIZE_FLAG_NONE);
     // First login
     *p_data << uint8(atLoginFlags & AT_LOGIN_FIRST ? 1 : 0);
 
@@ -1529,11 +1662,11 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
         {
             uint32 entry = fields[16].GetUInt32();
             CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(entry);
-            if(cInfo)
+            if (cInfo)
             {
                 petDisplayId = fields[17].GetUInt32();
                 petLevel     = fields[18].GetUInt32();
-                petFamily    = cInfo->family;
+                petFamily    = cInfo->Family;
             }
         }
 
@@ -1543,13 +1676,13 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
     }
 
 
-    Tokens data = StrSplit(fields[19].GetCppString(), " ");
+    Tokens data(fields[19].GetCppString(), ' ');
     for (uint8 slot = 0; slot < EQUIPMENT_SLOT_END; slot++)
     {
         uint32 visualbase = slot * 2;
-        uint32 item_id = GetUInt32ValueFromArray(data, visualbase);
+        uint32 item_id = atoi(data[visualbase]);
         const ItemPrototype * proto = ObjectMgr::GetItemPrototype(item_id);
-        if(!proto)
+        if (!proto)
         {
             *p_data << uint32(0);
             *p_data << uint8(0);
@@ -1557,17 +1690,17 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
             continue;
         }
 
-        SpellItemEnchantmentEntry const *enchant = NULL;
+        SpellItemEnchantmentEntry const* enchant = NULL;
 
-        uint32 enchants = GetUInt32ValueFromArray(data, visualbase + 1);
-        for(uint8 enchantSlot = PERM_ENCHANTMENT_SLOT; enchantSlot <= TEMP_ENCHANTMENT_SLOT; ++enchantSlot)
+        uint32 enchants = atoi(data[visualbase + 1]);
+        for (uint8 enchantSlot = PERM_ENCHANTMENT_SLOT; enchantSlot <= TEMP_ENCHANTMENT_SLOT; ++enchantSlot)
         {
             // values stored in 2 uint16
             uint32 enchantId = 0x0000FFFF & (enchants >> enchantSlot*16);
-            if(!enchantId)
+            if (!enchantId)
                 continue;
 
-            if ((enchant = sSpellItemEnchantmentStore.LookupEntry(enchantId)))
+            if (enchant = sSpellItemEnchantmentStore.LookupEntry(enchantId))
                 break;
         }
 
@@ -1606,120 +1739,152 @@ void Player::ToggleDND()
     ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_DND);
 }
 
-uint8 Player::chatTag() const
+ChatTagFlags Player::GetChatTag() const
 {
-    // it's bitmask
-    // 0x1 - afk
-    // 0x2 - dnd
-    // 0x4 - gm
-    // 0x8 - ??
-
-    if (isGMChat())                                         // Always show GM icons if activated
-        return 4;
+    ChatTagFlags tag = CHAT_TAG_NONE;
 
     if (isAFK())
-        return 1;
+        tag |= CHAT_TAG_AFK;
     if (isDND())
-        return 3;
+        tag |= CHAT_TAG_DND;
+    if (isGMChat())
+        tag |= CHAT_TAG_GM;
+    if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_COMMENTATOR))
+        tag |= CHAT_TAG_COM;
+    if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_DEVELOPER))
+        tag |= CHAT_TAG_DEV;
 
-    return 0;
+    return tag;
 }
 
-bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientation, uint32 options)
+bool Player::TeleportTo(WorldLocation const& loc, uint32 options)
 {
-    if(!MapManager::IsValidMapCoord(mapid, x, y, z, orientation))
+    if (!MapManager::IsValidMapCoord(loc))
     {
-        sLog.outError("TeleportTo: invalid map %d or absent instance template.", mapid);
+        sLog.outError("Player::TeleportTo: %s has invalid map %d or absent instance template.", GetGuidStr().c_str(), loc.GetMapId());
         return false;
     }
 
+    if (GetMapId() != loc.GetMapId())
+    {
+        if (!(options & TELE_TO_CHECKED))
+        {
+            if (!CheckTransferPossibility(loc.GetMapId()))
+            {
+                if (IsOnTransport())
+                    TeleportToHomebind();
+
+                DEBUG_LOG("Player::TeleportTo %s is NOT teleported to map %u (requirements check failed)", GetName(), loc.GetMapId());
+
+                return false;                                       // normal client can't teleport to this map...
+            }
+            else
+                options |= TELE_TO_CHECKED;
+        }
+        DEBUG_LOG("Player::TeleportTo %s is being far teleported to map %u %s", GetName(), loc.GetMapId(), IsBeingTeleportedFar() ? "(stage 2)" : "");
+    }
+    else
+    {
+        DEBUG_LOG("Player::TeleportTo %s is being near teleported to map %u %s", GetName(), loc.GetMapId(), IsBeingTeleportedNear() ? "(stage 2)" : "");
+    }
+
     // preparing unsummon pet if lost (we must get pet before teleportation or will not find it later)
     Pet* pet = GetPet();
 
-    MapEntry const* mEntry = sMapStore.LookupEntry(mapid);
+    MapEntry const* mEntry = sMapStore.LookupEntry(loc.GetMapId());
+    if (!mEntry)
+    {
+        sLog.outError("TeleportTo: invalid map entry (id %d). possible disk or memory error.", loc.GetMapId());
+        return false;
+    }
 
     // don't let enter battlegrounds without assigned battleground id (for example through areatrigger)...
     // don't let gm level > 1 either
-    if(!InBattleGround() && mEntry->IsBattleGroundOrArena())
+    if (!InBattleGround() && mEntry->IsBattleGroundOrArena())
         return false;
 
-    // client without expansion support
-    if(GetSession()->Expansion() < mEntry->Expansion())
-    {
-        DEBUG_LOG("Player %s using client without required expansion tried teleport to non accessible map %u", GetName(), mapid);
-
-        if(GetTransport())
-            RepopAtGraveyard();                             // teleport to near graveyard if on transport, looks blizz like :)
-
-        SendTransferAborted(mapid, TRANSFER_ABORT_INSUF_EXPAN_LVL, mEntry->Expansion());
-
-        return false;                                       // normal client can't teleport to this map...
-    }
-    else
-    {
-        DEBUG_LOG("Player %s is being teleported to map %u", GetName(), mapid);
-    }
+    if (!GetMap())
+        options |= TELE_TO_NODELAY;
 
     if (Group* grp = GetGroup())
-        grp->SetPlayerMap(GetObjectGuid(), mapid);
+        grp->SetPlayerMap(GetObjectGuid(), loc.GetMapId());
 
     // if we were on a transport, leave
-    if (!(options & TELE_TO_NOT_LEAVE_TRANSPORT) && m_transport)
-    {
-        m_transport->RemovePassenger(this);
-        m_transport = NULL;
-        m_movementInfo.ClearTransportData();
-    }
+    if (!(options & TELE_TO_NOT_LEAVE_TRANSPORT) && IsOnTransport())
+        GetTransport()->RemovePassenger(this);
+
+    if (GetVehicleKit())
+        GetVehicleKit()->RemoveAllPassengers();
+
+    ExitVehicle(true);
 
     // The player was ported to another map and looses the duel immediately.
     // We have to perform this check before the teleport, otherwise the
     // ObjectAccessor won't find the flag.
-    if (duel && GetMapId() != mapid)
+    if (duel && GetMapId() != loc.GetMapId())
         if (GetMap()->GetGameObject(GetGuidValue(PLAYER_DUEL_ARBITER)))
             DuelComplete(DUEL_FLED);
 
     // reset movement flags at teleport, because player will continue move with these flags after teleport
-    m_movementInfo.SetMovementFlags(MOVEFLAG_NONE);
     DisableSpline();
+    m_movementInfo.SetMovementFlags(MOVEFLAG_NONE);
 
-    if ((GetMapId() == mapid) && (!m_transport))
+    if (GetMap() && GetMapId() == loc.GetMapId() && !IsOnTransport())
     {
-        //lets reset far teleport flag if it wasn't reset during chained teleports
+        // lets reset far teleport flag if it wasn't reset during chained teleports
         SetSemaphoreTeleportFar(false);
-        //setup delayed teleport flag
-        //if teleport spell is casted in Unit::Update() func
-        //then we need to delay it until update process will be finished
+
+        // try preload grid, targeted for teleport
+        if (!(options & TELE_TO_NODELAY) && !GetMap()->PreloadGrid(loc.x, loc.y))
+        {
+            // If loading grid not finished, delay teleport on one update tick
+            AddEvent(new TeleportDelayEvent(*this, loc, options),
+                sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE));
+            DEBUG_LOG("Player::TeleportTo grid (map %u, instance %u, X%f Y%f) not fully loaded, near teleport %s delayed.", loc.GetMapId(), GetInstanceId(), loc.x, loc.y, GetName());
+            SetSemaphoreTeleportDelayEvent(true);
+            m_teleport_dest = loc;
+            return true;
+        }
+
+        // setup delayed teleport flag
+        // if teleport spell is casted in Unit::Update() func
+        // then we need to delay it until update process will be finished
         if (SetDelayedTeleportFlagIfCan())
         {
             SetSemaphoreTeleportNear(true);
-            //lets save teleport destination for player
-            m_teleport_dest = WorldLocation(mapid, x, y, z, orientation);
+            // lets save teleport destination for player
+            m_teleport_dest = loc;
             m_teleport_options = options;
             return true;
         }
 
         if (!(options & TELE_TO_NOT_UNSUMMON_PET))
         {
-            //same map, only remove pet if out of range for new position
-            if(pet && !pet->IsWithinDist3d(x, y, z, GetMap()->GetVisibilityDistance()))
+            // same map, only remove pet if out of range for new position
+            if (pet && !pet->IsWithinDist3d(loc.x, loc.y, loc.z, GetMap()->GetVisibilityDistance()))
                 UnsummonPetTemporaryIfAny();
         }
 
         if (!(options & TELE_TO_NOT_LEAVE_COMBAT))
             CombatStop();
 
+        InterruptSpell(CURRENT_CHANNELED_SPELL);
+
+        if (!IsWithinDist3d(loc.x, loc.y, loc.z, GetMap()->GetVisibilityDistance()))
+            RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED);
+
         // this will be used instead of the current location in SaveToDB
-        m_teleport_dest = WorldLocation(mapid, x, y, z, orientation);
-        SetFallInformation(0, z);
+        m_teleport_dest = loc;
+        SetFallInformation(0, loc.z);
 
         // code for finish transfer called in WorldSession::HandleMovementOpcodes()
         // at client packet MSG_MOVE_TELEPORT_ACK
         SetSemaphoreTeleportNear(true);
         // near teleport, triggering send MSG_MOVE_TELEPORT_ACK from client at landing
-        if(!GetSession()->PlayerLogout())
+        if (!GetSession()->PlayerLogout())
         {
             WorldPacket data;
-            BuildTeleportAckMsg(data, x, y, z, orientation);
+            BuildTeleportAckMsg(data, loc.getX(), loc.getY(), loc.getZ(), loc.orientation);
             GetSession()->SendPacket(&data);
         }
     }
@@ -1731,17 +1896,49 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
 
         // Check enter rights before map getting to avoid creating instance copy for player
         // this check not dependent from map instance copy and same for all instance copies of selected map
-        if (!sMapMgr.CanPlayerEnter(mapid, this))
+        if (!sMapMgr.CanPlayerEnter(loc.GetMapId(), this))
             return false;
 
         // If the map is not created, assume it is possible to enter it.
         // It will be created in the WorldPortAck.
-        DungeonPersistentState* state = GetBoundInstanceSaveForSelfOrGroup(mapid);
-        Map *map = sMapMgr.FindMap(mapid, state ? state->GetInstanceId() : 0);
-        if (!map ||  map->CanEnter(this))
+        DungeonPersistentState* state = GetBoundInstanceSaveForSelfOrGroup(loc.GetMapId());
+        Map* map = sMapMgr.FindMap(loc.GetMapId(), state ? state->GetInstanceId() : loc.GetInstanceId());
+        if (!map || map->CanEnter(this))
         {
-            //lets reset near teleport flag if it wasn't reset during chained teleports
+            // lets reset near teleport flag if it wasn't reset during chained teleports
             SetSemaphoreTeleportNear(false);
+
+/*
+temporarily disable precreate maps. need found reason double map creation
+
+            // try create map before trying teleport on this map
+            if (!map)
+            {
+                if (mEntry->Instanceable() && loc.GetInstanceId())
+                    map = sMapMgr.FindMap(loc.GetMapId(), loc.GetInstanceId());
+                else
+                    map = sMapMgr.CreateMap(loc.GetMapId(), this);
+
+                if (!map)
+                {
+                    sLog.outError("Player::TeleportTo player %s cannot find or load map %u instance %u!", GetName(), loc.GetMapId(), loc.GetInstanceId());
+                    return false;
+                }
+            }
+*/
+            // try preload grid, targeted for teleport
+            if (!(options & TELE_TO_NODELAY) && map && !map->PreloadGrid(loc.x, loc.y))
+            {
+                // If loading grid not finished, delay teleport 5 map update ticks
+                AddEvent(new TeleportDelayEvent(*this, WorldLocation(loc.GetMapId(), loc.x, loc.y, loc.z, loc.orientation, GetPhaseMask(), map->GetInstanceId(), sWorld.getConfig(CONFIG_UINT32_REALMID)), options),
+                    5 * sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE));
+
+                DEBUG_LOG("Player::TeleportTo grid (map %u, instance %u, X%f Y%f) not fully loaded, far teleport %s delayed.", loc.GetMapId(), map->GetInstanceId(), loc.x, loc.y, GetName());
+                SetSemaphoreTeleportDelayEvent(true);
+                m_teleport_dest = loc;
+                return true;
+            }
+
             //setup delayed teleport flag
             //if teleport spell is casted in Unit::Update() func
             //then we need to delay it until update process will be finished
@@ -1749,7 +1946,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
             {
                 SetSemaphoreTeleportFar(true);
                 //lets save teleport destination for player
-                m_teleport_dest = WorldLocation(mapid, x, y, z, orientation);
+                m_teleport_dest = loc;
                 m_teleport_options = options;
                 return true;
             }
@@ -1758,6 +1955,10 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
 
             CombatStop();
 
+            InterruptSpell(CURRENT_CHANNELED_SPELL);
+            RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED);
+            UnsummonAllTotems();
+
             ResetContestedPvP();
 
             // remove player from battleground on far teleport (when changing maps)
@@ -1766,13 +1967,12 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
                 // Note: at battleground join battleground id set before teleport
                 // and we already will found "current" battleground
                 // just need check that this is targeted map or leave
-                if(bg->GetMapId() != mapid)
+                if (bg->GetMapId() != loc.GetMapId())
                     LeaveBattleground(false);                   // don't teleport to entry point
             }
 
             // remove pet on map change
-            if (pet)
-                UnsummonPetTemporaryIfAny();
+            UnsummonPetTemporaryIfAny();
 
             // remove all dyn objects
             RemoveAllDynObjects();
@@ -1790,10 +1990,10 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
             {
                 // send transfer packet to display load screen
                 WorldPacket data(SMSG_TRANSFER_PENDING, (4+4+4));
-                data << uint32(mapid);
-                if (m_transport)
+                data << uint32(loc.GetMapId());
+                if (IsOnTransport())
                 {
-                    data << uint32(m_transport->GetEntry());
+                    data << uint32(GetTransport()->GetEntry());
                     data << uint32(GetMapId());
                 }
                 GetSession()->SendPacket(&data);
@@ -1803,22 +2003,15 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
             if (oldmap)
                 oldmap->Remove(this, false);
 
-            // new final coordinates
-            float final_x = x;
-            float final_y = y;
-            float final_z = z;
-            float final_o = orientation;
+            SkipUpdate(true);
 
-            if (m_transport)
-            {
-                final_x += m_movementInfo.GetTransportPos()->x;
-                final_y += m_movementInfo.GetTransportPos()->y;
-                final_z += m_movementInfo.GetTransportPos()->z;
-                final_o += m_movementInfo.GetTransportPos()->o;
-            }
+            // new final coordinates
+            WorldLocation final = loc;
+            if (IsOnTransport())
+                final += (*m_movementInfo.GetTransportPos());
 
-            m_teleport_dest = WorldLocation(mapid, final_x, final_y, final_z, final_o);
-            SetFallInformation(0, final_z);
+            m_teleport_dest = final;
+            SetFallInformation(0, final.z);
             // if the player is saved before worldport ack (at logout for example)
             // this will be used instead of the current location in SaveToDB
 
@@ -1829,9 +2022,9 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
             if (!GetSession()->PlayerLogout())
             {
                 // transfer finished, inform client to start load
-                WorldPacket data(SMSG_NEW_WORLD, (20));
-                data << uint32(mapid);
-                if (m_transport)
+                WorldPacket data(SMSG_NEW_WORLD, 20);
+                data << uint32(loc.GetMapId());
+                if (IsOnTransport())
                 {
                     data << float(m_movementInfo.GetTransportPos()->x);
                     data << float(m_movementInfo.GetTransportPos()->y);
@@ -1840,13 +2033,13 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
                 }
                 else
                 {
-                    data << float(final_x);
-                    data << float(final_y);
-                    data << float(final_z);
-                    data << float(final_o);
+                    data << float(final.x);
+                    data << float(final.y);
+                    data << float(final.z);
+                    data << float(final.o);
                 }
 
-                GetSession()->SendPacket( &data );
+                GetSession()->SendPacket(&data);
                 SendSavedInstances();
             }
         }
@@ -1858,6 +2051,9 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
 
 bool Player::TeleportToBGEntryPoint()
 {
+    RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+    RemoveSpellsCausingAura(SPELL_AURA_FLY);
+
     ScheduleDelayedOperation(DELAYED_BG_MOUNT_RESTORE);
     ScheduleDelayedOperation(DELAYED_BG_TAXI_RESTORE);
     return TeleportTo(m_bgData.joinPos);
@@ -1865,35 +2061,35 @@ bool Player::TeleportToBGEntryPoint()
 
 void Player::ProcessDelayedOperations()
 {
-    if(m_DelayedOperations == 0)
+    if (m_DelayedOperations == 0)
         return;
 
-    if(m_DelayedOperations & DELAYED_RESURRECT_PLAYER)
+    if (m_DelayedOperations & DELAYED_RESURRECT_PLAYER)
     {
-        ResurrectPlayer(0.0f, false);
+        ResurrectPlayer(0, false);
 
-        if(GetMaxHealth() > m_resurrectHealth)
-            SetHealth( m_resurrectHealth );
+        if (GetMaxHealth() > m_resurrectHealth)
+            SetHealth(m_resurrectHealth);
         else
-            SetHealth( GetMaxHealth() );
+            SetHealth(GetMaxHealth());
 
-        if(GetMaxPower(POWER_MANA) > m_resurrectMana)
-            SetPower(POWER_MANA, m_resurrectMana );
+        if (GetMaxPower(POWER_MANA) > m_resurrectMana)
+            SetPower(POWER_MANA, m_resurrectMana);
         else
-            SetPower(POWER_MANA, GetMaxPower(POWER_MANA) );
+            SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
 
-        SetPower(POWER_RAGE, 0 );
-        SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY) );
+        SetPower(POWER_RAGE, 0);
+        SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY));
 
         SpawnCorpseBones();
     }
 
-    if(m_DelayedOperations & DELAYED_SAVE_PLAYER)
+    if (m_DelayedOperations & DELAYED_SAVE_PLAYER)
     {
         SaveToDB();
     }
 
-    if(m_DelayedOperations & DELAYED_SPELL_CAST_DESERTER)
+    if (m_DelayedOperations & DELAYED_SPELL_CAST_DESERTER)
     {
         CastSpell(this, 26013, true);               // Deserter
     }
@@ -1930,37 +2126,55 @@ void Player::AddToWorld()
     ///- The player should only be added when logging in
     Unit::AddToWorld();
 
-    for(int i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i)
+    for (int i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i)
     {
-        if(m_items[i])
+        if (m_items[i])
             m_items[i]->AddToWorld();
     }
 }
 
-void Player::RemoveFromWorld()
+void Player::RemoveFromWorld(bool remove)
 {
-    for(int i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i)
+    for (int i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i)
     {
-        if(m_items[i])
-            m_items[i]->RemoveFromWorld();
+        if (m_items[i])
+        {
+            m_items[i]->RemoveFromWorld(true);
+            // possible need delete Item structure in this place? Need recheck
+            //delete m_items[i];
+        }
     }
 
     ///- Do not add/remove the player from the object storage
     ///- It will crash when updating the ObjectAccessor
     ///- The player should only be removed when logging out
-    if (IsInWorld())
-        GetCamera().ResetView();
+    if (IsInWorld() && GetCamera())
+        GetCamera()->ResetView();
 
-    Unit::RemoveFromWorld();
+    Unit::RemoveFromWorld(remove);
 }
 
-void Player::RewardRage( uint32 damage, uint32 weaponSpeedHitFactor, bool attacker )
+void Player::SetMap(Map* map)
+{
+    WorldObject::SetMap(map);
+    // Lock map from unload while player on his
+    m_mapPtr = sMapMgr.GetMapPtr(map->GetId(), map->GetInstanceId());
+}
+
+void Player::ResetMap()
+{
+    WorldObject::ResetMap();
+    // Unlock map
+    m_mapPtr = MapPtr();
+}
+
+void Player::RewardRage(uint32 damage, uint32 weaponSpeedHitFactor, bool attacker)
 {
     float addRage;
 
     float rageconversion = float((0.0091107836 * getLevel()*getLevel())+3.225598133*getLevel())+4.2652911f;
 
-    if(attacker)
+    if (attacker)
     {
         addRage = ((damage/rageconversion*7.5f + weaponSpeedHitFactor)/2.0f);
 
@@ -1985,13 +2199,13 @@ void Player::RegenerateAll(uint32 diff)
 {
     // Not in combat or they have regeneration
     if (!isInCombat() || HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT) ||
-        HasAuraType(SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT) || IsPolymorphed() )
+        HasAuraType(SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT) || IsPolymorphed() || m_baseHealthRegen)
     {
         RegenerateHealth(diff);
         if (!isInCombat() && !HasAuraType(SPELL_AURA_INTERRUPT_REGEN))
         {
             Regenerate(POWER_RAGE, diff);
-            if(getClass() == CLASS_DEATH_KNIGHT)
+            if (getClass() == CLASS_DEATH_KNIGHT)
                 Regenerate(POWER_RUNIC_POWER, diff);
         }
     }
@@ -2003,7 +2217,7 @@ void Player::RegenerateAll(uint32 diff)
     if (getClass() == CLASS_DEATH_KNIGHT)
         Regenerate(POWER_RUNE, diff);
 
-    m_regenTimer = REGEN_TIME_FULL;
+    m_regenTimer = IsUnderLastManaUseEffect() ? REGEN_TIME_PRECISE : REGEN_TIME_FULL;
 }
 
 // diff contains the time in milliseconds since last regen.
@@ -2020,84 +2234,107 @@ void Player::Regenerate(Powers power, uint32 diff)
         {
             if (HasAuraType(SPELL_AURA_STOP_NATURAL_MANA_REGEN))
                 break;
-            bool recentCast = IsUnderLastManaUseEffect();
+
             float ManaIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_MANA);
-            if (recentCast)
+            if (IsUnderLastManaUseEffect())
             {
                 // Mangos Updates Mana in intervals of 2s, which is correct
-                addvalue = GetFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER) *  ManaIncreaseRate * 2.00f;
+                addvalue += GetFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER) *  ManaIncreaseRate * (float)REGEN_TIME_FULL/IN_MILLISECONDS;
             }
             else
             {
-                addvalue = GetFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER) * ManaIncreaseRate * 2.00f;
+                addvalue += GetFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER) * ManaIncreaseRate * (float)REGEN_TIME_FULL/IN_MILLISECONDS;
             }
-        }   break;
+            break;
+        }
         case POWER_RAGE:                                    // Regenerate rage
         {
             float RageDecreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_RAGE_LOSS);
-            addvalue = 20 * RageDecreaseRate;               // 2 rage by tick (= 2 seconds => 1 rage/sec)
-        }   break;
-        case POWER_ENERGY:                                  // Regenerate energy (rogue)
+            addvalue += 20 * RageDecreaseRate;               // 2 rage by tick (= 2 seconds => 1 rage/sec)
+            break;
+        }
+        case POWER_ENERGY:                                  // Regenerate energy
         {
             float EnergyRate = sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_ENERGY);
-            addvalue = 20 * EnergyRate;
+            addvalue += 20 * EnergyRate;
             break;
         }
         case POWER_RUNIC_POWER:
         {
             float RunicPowerDecreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_RUNICPOWER_LOSS);
-            addvalue = 30 * RunicPowerDecreaseRate;         // 3 RunicPower by tick
-        }   break;
+            addvalue += 30 * RunicPowerDecreaseRate;         // 3 RunicPower by tick
+            break;
+        }
         case POWER_RUNE:
         {
             if (getClass() != CLASS_DEATH_KNIGHT)
                 break;
 
-            for(uint32 rune = 0; rune < MAX_RUNES; ++rune)
+            for (uint32 rune = 0; rune < MAX_RUNES; ++rune)
             {
-                if(uint16 cd = GetRuneCooldown(rune))       // if we have cooldown, reduce it...
+                if (uint16 cd = GetRuneCooldown(rune))       // if we have cooldown, reduce it...
                 {
                     uint32 cd_diff = diff;
                     AuraList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT);
-                    for(AuraList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
-                        if ((*i)->GetModifier()->m_miscvalue == int32(power) && (*i)->GetMiscBValue()==GetCurrentRune(rune))
+                    for (AuraList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
+                    {
+                        if ((*i)->GetModifier()->m_miscvalue == int32(power) && (*i)->GetMiscValueB() == GetCurrentRune(rune))
                             cd_diff = cd_diff * ((*i)->GetModifier()->m_amount + 100) / 100;
+                    }
 
                     SetRuneCooldown(rune, (cd < cd_diff) ? 0 : cd - cd_diff);
+
+                    // check if we don't have cooldown, need convert and that our rune wasn't already converted
+                    if (cd < cd_diff && m_runes->IsRuneNeedsConvert(rune) && GetBaseRune(rune) == GetCurrentRune(rune))
+                    {
+                        // currently all delayed rune converts happen with rune death
+                        // ConvertedBy was initialized at proc
+                        ConvertRune(rune, RUNE_DEATH);
+                        SetNeedConvertRune(rune, false);
+                    }
+                }
+                else if (m_runes->IsRuneNeedsConvert(rune) && GetBaseRune(rune) == GetCurrentRune(rune))
+                {
+                    // currently all delayed rune converts happen with rune death
+                    // ConvertedBy was initialized at proc
+                    ConvertRune(rune, RUNE_DEATH);
+                    SetNeedConvertRune(rune, false);
                 }
             }
-        }   break;
+            break;
+        }
         case POWER_FOCUS:
         case POWER_HAPPINESS:
         case POWER_HEALTH:
+        default:
             break;
     }
 
     // Mana regen calculated in Player::UpdateManaRegen()
     // Exist only for POWER_MANA, POWER_ENERGY, POWER_FOCUS auras
-    if(power != POWER_MANA)
+    if (power != POWER_MANA)
     {
         AuraList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT);
-        for(AuraList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
+        for (AuraList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
             if ((*i)->GetModifier()->m_miscvalue == int32(power))
                 addvalue *= ((*i)->GetModifier()->m_amount + 100) / 100.0f;
     }
 
     // addvalue computed on a 2sec basis. => update to diff time
-    addvalue *= float(diff) / REGEN_TIME_FULL;
+    uint32 _addvalue = ceil(fabs(addvalue * float(diff) / (float)REGEN_TIME_FULL));
 
     if (power != POWER_RAGE && power != POWER_RUNIC_POWER)
     {
-        curValue += uint32(addvalue);
+        curValue += _addvalue;
         if (curValue > maxValue)
             curValue = maxValue;
     }
     else
     {
-        if(curValue <= uint32(addvalue))
+        if (curValue <= _addvalue)
             curValue = 0;
         else
-            curValue -= uint32(addvalue);
+            curValue -= _addvalue;
     }
     SetPower(power, curValue);
 }
@@ -2107,36 +2344,38 @@ void Player::RegenerateHealth(uint32 diff)
     uint32 curValue = GetHealth();
     uint32 maxValue = GetMaxHealth();
 
-    if (curValue >= maxValue) return;
+    if (curValue >= maxValue)
+        return;
 
     float HealthIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_HEALTH);
 
     float addvalue = 0.0f;
 
     // polymorphed case
-    if ( IsPolymorphed() )
-        addvalue = (float)GetMaxHealth()/3;
+    if (IsPolymorphed())
+        addvalue = (float)GetMaxHealth() / 3;
     // normal regen case (maybe partly in combat case)
-    else if (!isInCombat() || HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT) )
+    else if (!isInCombat() || HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT))
     {
-        addvalue = OCTRegenHPPerSpirit()* HealthIncreaseRate;
+        addvalue = OCTRegenHPPerSpirit() * HealthIncreaseRate;
         if (!isInCombat())
         {
             AuraList const& mModHealthRegenPct = GetAurasByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT);
-            for(AuraList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i)
+            for (AuraList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i)
                 addvalue *= (100.0f + (*i)->GetModifier()->m_amount) / 100.0f;
         }
-        else if(HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT))
+        else if (HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT))
             addvalue *= GetTotalAuraModifier(SPELL_AURA_MOD_REGEN_DURING_COMBAT) / 100.0f;
 
-        if(!IsStandState())
+        if (!IsStandState())
             addvalue *= 1.5;
     }
 
     // always regeneration bonus (including combat)
     addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT);
+    addvalue += m_baseHealthRegen / 2.5f; //From ITEM_MOD_HEALTH_REGEN. It is correct tick amount?
 
-    if(addvalue < 0)
+    if (addvalue < 0)
         addvalue = 0;
 
     addvalue *= (float)diff / REGEN_TIME_FULL;
@@ -2151,16 +2390,16 @@ Creature* Player::GetNPCIfCanInteractWith(ObjectGuid guid, uint32 npcflagmask)
         return NULL;
 
     // not in interactive state
-    if (hasUnitState(UNIT_STAT_CAN_NOT_REACT_OR_LOST_CONTROL))
+    if (hasUnitState(UNIT_STAT_CAN_NOT_REACT_OR_LOST_CONTROL) && !hasUnitState(UNIT_STAT_ON_VEHICLE))
         return NULL;
 
     // exist (we need look pets also for some interaction (quest/etc)
-    Creature *unit = GetMap()->GetAnyTypeCreature(guid);
+    Creature* unit = GetMap()->GetAnyTypeCreature(guid);
     if (!unit)
         return NULL;
 
     // appropriate npc type
-    if (npcflagmask && !unit->HasFlag( UNIT_NPC_FLAGS, npcflagmask ))
+    if (npcflagmask && !unit->HasFlag(UNIT_NPC_FLAGS, npcflagmask))
         return NULL;
 
     if (npcflagmask == UNIT_NPC_FLAG_STABLEMASTER)
@@ -2198,15 +2437,15 @@ GameObject* Player::GetGameObjectIfCanInteractWith(ObjectGuid guid, uint32 gameo
         return NULL;
 
     // not in interactive state
-    if (hasUnitState(UNIT_STAT_CAN_NOT_REACT_OR_LOST_CONTROL))
+    if (hasUnitState(UNIT_STAT_CAN_NOT_REACT_OR_LOST_CONTROL) && !hasUnitState(UNIT_STAT_ON_VEHICLE))
         return NULL;
 
-    if (GameObject *go = GetMap()->GetGameObject(guid))
+    if (GameObject* go = GetMap()->GetGameObject(guid))
     {
         if (uint32(go->GetGoType()) == gameobject_type || gameobject_type == MAX_GAMEOBJECT_TYPE)
         {
             float maxdist;
-            switch(go->GetGoType())
+            switch (go->GetGoType())
             {
                 // TODO: find out how the client calculates the maximal usage distance to spellless working
                 // gameobjects like guildbanks and mailboxes - 10.0 is a just an abitrary choosen number
@@ -2215,7 +2454,7 @@ GameObject* Player::GetGameObjectIfCanInteractWith(ObjectGuid guid, uint32 gameo
                     maxdist = 10.0f;
                     break;
                 case GAMEOBJECT_TYPE_FISHINGHOLE:
-                    maxdist = 20.0f+CONTACT_DISTANCE;       // max spell range
+                    maxdist = 20.0f + CONTACT_DISTANCE;     // max spell range
                     break;
                 default:
                     maxdist = INTERACTION_DISTANCE;
@@ -2234,19 +2473,19 @@ GameObject* Player::GetGameObjectIfCanInteractWith(ObjectGuid guid, uint32 gameo
 
 bool Player::IsUnderWater() const
 {
-    return GetTerrain()->IsUnderWater(GetPositionX(), GetPositionY(), GetPositionZ()+2);
+    return GetTerrain()->IsUnderWater(GetPositionX(), GetPositionY(), GetPositionZ() + 2);
 }
 
 void Player::SetInWater(bool apply)
 {
-    if(m_isInWater==apply)
+    if (m_isInWater == apply)
         return;
 
-    //define player in water by opcodes
-    //move player's guid into HateOfflineList of those mobs
-    //which can't swim and move guid back into ThreatList when
-    //on surface.
-    //TODO: exist also swimming mobs, and function must be symmetric to enter/leave water
+    // define player in water by opcodes
+    // move player's guid into HateOfflineList of those mobs
+    // which can't swim and move guid back into ThreatList when
+    // on surface.
+    // TODO: exist also swimming mobs, and function must be symmetric to enter/leave water
     m_isInWater = apply;
 
     // remove auras that need water/land
@@ -2284,7 +2523,7 @@ void Player::SetGameMaster(bool on)
         setFaction(35);
         SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM);
 
-        CallForAllControlledUnits(SetGameMasterOnHelper(), CONTROLLED_PET|CONTROLLED_TOTEMS|CONTROLLED_GUARDIANS|CONTROLLED_CHARM);
+        CallForAllControlledUnits(SetGameMasterOnHelper(), CONTROLLED_PET | CONTROLLED_TOTEMS | CONTROLLED_GUARDIANS | CONTROLLED_CHARM);
 
         SetFFAPvP(false);
         ResetContestedPvP();
@@ -2292,11 +2531,11 @@ void Player::SetGameMaster(bool on)
         getHostileRefManager().setOnlineOfflineState(false);
         CombatStopWithPets();
 
-        SetPhaseMask(PHASEMASK_ANYWHERE,false);             // see and visible in all phases
+        SetPhaseMask(PHASEMASK_ANYWHERE, false);            // see and visible in all phases
     }
     else
     {
-        m_ExtraFlags &= ~ PLAYER_EXTRA_GM_ON;
+        m_ExtraFlags &= ~PLAYER_EXTRA_GM_ON;
         setFactionForRace(getRace());
         RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM);
 
@@ -2304,10 +2543,10 @@ void Player::SetGameMaster(bool on)
         AuraList const& phases = GetAurasByType(SPELL_AURA_PHASE);
         SetPhaseMask(!phases.empty() ? phases.front()->GetMiscValue() : PHASEMASK_NORMAL,false);
 
-        CallForAllControlledUnits(SetGameMasterOffHelper(getFaction()), CONTROLLED_PET|CONTROLLED_TOTEMS|CONTROLLED_GUARDIANS|CONTROLLED_CHARM);
+        CallForAllControlledUnits(SetGameMasterOffHelper(getFaction()), CONTROLLED_PET | CONTROLLED_TOTEMS | CONTROLLED_GUARDIANS | CONTROLLED_CHARM);
 
         // restore FFA PvP Server state
-        if(sWorld.IsFFAPvPRealm())
+        if (sWorld.IsFFAPvPRealm())
             SetFFAPvP(true);
 
         // restore FFA PvP area state, remove not allowed for GM mounts
@@ -2316,28 +2555,28 @@ void Player::SetGameMaster(bool on)
         getHostileRefManager().setOnlineOfflineState(true);
     }
 
-    m_camera.UpdateVisibilityForOwner();
+    GetCamera()->UpdateVisibilityForOwner();
     UpdateObjectVisibility();
     UpdateForQuestWorldObjects();
 }
 
 void Player::SetGMVisible(bool on)
 {
-    if(on)
+    if (on)
     {
-        m_ExtraFlags &= ~PLAYER_EXTRA_GM_INVISIBLE;         //remove flag
+        m_ExtraFlags &= ~PLAYER_EXTRA_GM_INVISIBLE;         // remove flag
 
         // Reapply stealth/invisibility if active or show if not any
-        if(HasAuraType(SPELL_AURA_MOD_STEALTH))
+        if (HasAuraType(SPELL_AURA_MOD_STEALTH))
             SetVisibility(VISIBILITY_GROUP_STEALTH);
-        else if(HasAuraType(SPELL_AURA_MOD_INVISIBILITY))
+        else if (HasAuraType(SPELL_AURA_MOD_INVISIBILITY))
             SetVisibility(VISIBILITY_GROUP_INVISIBILITY);
         else
             SetVisibility(VISIBILITY_ON);
     }
     else
     {
-        m_ExtraFlags |= PLAYER_EXTRA_GM_INVISIBLE;          //add flag
+        m_ExtraFlags |= PLAYER_EXTRA_GM_INVISIBLE;          // add flag
 
         SetAcceptWhispers(false);
         SetGameMaster(true);
@@ -2348,117 +2587,146 @@ void Player::SetGMVisible(bool on)
 
 bool Player::IsGroupVisibleFor(Player* p) const
 {
-    switch(sWorld.getConfig(CONFIG_UINT32_GROUP_VISIBILITY))
+    switch (sWorld.getConfig(CONFIG_UINT32_GROUP_VISIBILITY))
     {
         default: return IsInSameGroupWith(p);
         case 1:  return IsInSameRaidWith(p);
-        case 2:  return GetTeam()==p->GetTeam();
+        case 2:  return GetTeam() == p->GetTeam();
     }
 }
 
 bool Player::IsInSameGroupWith(Player const* p) const
 {
-    return (p==this || (GetGroup() != NULL &&
-        GetGroup()->SameSubGroup((Player*)this, (Player*)p)));
+    return (p == this || (GetGroup() != NULL && GetGroup()->SameSubGroup(this, p)));
 }
 
 ///- If the player is invited, remove him. If the group if then only 1 person, disband the group.
 /// \todo Shouldn't we also check if there is no other invitees before disbanding the group?
 void Player::UninviteFromGroup()
 {
-    Group* group = GetGroupInvite();
-    if(!group)
+    Group* group = sObjectMgr.GetGroup(GetGroupInvite());
+    if (!group)
+    {
+        SetGroupInvite(ObjectGuid());
         return;
+    }
 
     group->RemoveInvite(this);
 
-    if(group->GetMembersCount() <= 1)                       // group has just 1 member => disband
+    if (group->GetMembersCount() <= 1)                       // group has just 1 member => disband
     {
-        if(group->IsCreated())
-        {
-            group->Disband(true);
-            sObjectMgr.RemoveGroup(group);
-        }
-        else
-            group->RemoveAllInvites();
-
+        group->RemoveAllInvites();
+        group->Disband(true);
         delete group;
     }
 }
 
-void Player::RemoveFromGroup(Group* group, ObjectGuid guid)
+void Player::RemoveFromGroup(bool logout /*=false*/)
 {
-    if (group)
+    if (Group* group = GetGroup())
     {
-        if (group->RemoveMember(guid, 0) <= 1)
-        {
-            // group->Disband(); already disbanded in RemoveMember
-            sObjectMgr.RemoveGroup(group);
+        if (group->RemoveMember(GetObjectGuid(), 0, logout) <= 1)
             delete group;
-            // removemember sets the player's group pointer to NULL
-        }
     }
+    else
+        SetGroup(ObjectGuid());
 }
 
-void Player::SendLogXPGain(uint32 GivenXP, Unit* victim, uint32 RestXP)
+void Player::SendLogXPGain(uint32 GivenXP, Unit* victim, uint32 BonusXP, bool ReferAFriend)
 {
     WorldPacket data(SMSG_LOG_XPGAIN, 21);
-    data << (victim ? victim->GetObjectGuid() : ObjectGuid());// guid
-    data << uint32(GivenXP+RestXP);                         // given experience
-    data << uint8(victim ? 0 : 1);                          // 00-kill_xp type, 01-non_kill_xp type
-    if(victim)
+    data << (victim ? victim->GetObjectGuid() : ObjectGuid()); // guid
+    data << uint32(GivenXP + BonusXP);                         // total experience
+    data << uint8(victim ? 0 : 1);                             // 00-kill_xp type, 01-non_kill_xp type
+    if (victim)
     {
-        data << uint32(GivenXP);                            // experience without rested bonus
-        data << float(1);                                   // 1 - none 0 - 100% group bonus output
+        data << uint32(GivenXP);                               // experience without rested bonus
+        data << float(1);                                      // 1 - none 0 - 100% group bonus output
     }
-    data << uint8(0);                                       // new 2.4.0
+    data << uint8(ReferAFriend ? 1 : 0);                       // Refer-A-Friend State
     GetSession()->SendPacket(&data);
 }
 
 void Player::GiveXP(uint32 xp, Unit* victim)
 {
-    if ( xp < 1 )
+    if (xp < 1)
+        return;
+
+    if (!isAlive())
+        return;
+
+    if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_XP_USER_DISABLED))
         return;
 
-    if(!isAlive())
+    if (hasUnitState(UNIT_STAT_ON_VEHICLE))
         return;
 
     uint32 level = getLevel();
 
+    // prevent Northrend Level Leeching :P
+    if (level < 66 && GetMapId() == 571)
+        return;
+
     // XP to money conversion processed in Player::RewardQuest
-    if(level >= sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
+    if (level >= sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
         return;
 
-    if(victim)
+    if (victim)
     {
         // handle SPELL_AURA_MOD_KILL_XP_PCT auras
         Unit::AuraList const& ModXPPctAuras = GetAurasByType(SPELL_AURA_MOD_KILL_XP_PCT);
-        for(Unit::AuraList::const_iterator i = ModXPPctAuras.begin();i != ModXPPctAuras.end(); ++i)
+        for (Unit::AuraList::const_iterator i = ModXPPctAuras.begin();i != ModXPPctAuras.end(); ++i)
             xp = uint32(xp*(1.0f + (*i)->GetModifier()->m_amount / 100.0f));
     }
     else
     {
         // handle SPELL_AURA_MOD_QUEST_XP_PCT auras
         Unit::AuraList const& ModXPPctAuras = GetAurasByType(SPELL_AURA_MOD_QUEST_XP_PCT);
-        for(Unit::AuraList::const_iterator i = ModXPPctAuras.begin();i != ModXPPctAuras.end(); ++i)
+        for (Unit::AuraList::const_iterator i = ModXPPctAuras.begin();i != ModXPPctAuras.end(); ++i)
             xp = uint32(xp*(1.0f + (*i)->GetModifier()->m_amount / 100.0f));
     }
 
-    // XP resting bonus for kill
-    uint32 rested_bonus_xp = victim ? GetXPRestBonus(xp) : 0;
+    uint32 bonus_xp = 0;
+    bool ReferAFriend = false;
+    if (CheckRAFConditions())
+    {
+        // RAF bonus exp don't decrease rest exp
+        ReferAFriend = true;
+        bonus_xp = xp * (sWorld.getConfig(CONFIG_FLOAT_RATE_RAF_XP) - 1);
+    }
+    else
+        // XP resting bonus for kill
+        bonus_xp = victim ? GetXPRestBonus(xp) : 0;
 
-    SendLogXPGain(xp,victim,rested_bonus_xp);
+    SendLogXPGain(xp,victim,bonus_xp,ReferAFriend);
 
     uint32 curXP = GetUInt32Value(PLAYER_XP);
     uint32 nextLvlXP = GetUInt32Value(PLAYER_NEXT_LEVEL_XP);
-    uint32 newXP = curXP + xp + rested_bonus_xp;
+    uint32 newXP = curXP + xp + bonus_xp;
 
-    while( newXP >= nextLvlXP && level < sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL) )
+    while (newXP >= nextLvlXP && level < sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
     {
         newXP -= nextLvlXP;
 
-        if ( level < sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL) )
+        if (level < sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
+        {
             GiveLevel(level + 1);
+            level = getLevel();
+            // Refer-A-Friend
+            if (GetAccountLinkedState() == STATE_REFERRAL || GetAccountLinkedState() == STATE_DUAL)
+            {
+                if (level < sWorld.getConfig(CONFIG_UINT32_RAF_MAXGRANTLEVEL))
+                {
+                    if (sWorld.getConfig(CONFIG_FLOAT_RATE_RAF_LEVELPERLEVEL) < 1.0f)
+                    {
+                        if (level%uint8(1.0f/sWorld.getConfig(CONFIG_FLOAT_RATE_RAF_LEVELPERLEVEL)) == 0)
+                            ChangeGrantableLevels(1);
+                    }
+                    else
+                        ChangeGrantableLevels(uint8(sWorld.getConfig(CONFIG_FLOAT_RATE_RAF_LEVELPERLEVEL)));
+                }
+            }
+        }
 
         level = getLevel();
         nextLvlXP = GetUInt32Value(PLAYER_NEXT_LEVEL_XP);
@@ -2471,46 +2739,42 @@ void Player::GiveXP(uint32 xp, Unit* victim)
 // Current player experience not update (must be update by caller)
 void Player::GiveLevel(uint32 level)
 {
-    if ( level == getLevel() )
+    if (level == getLevel())
         return;
 
     PlayerLevelInfo info;
-    sObjectMgr.GetPlayerLevelInfo(getRace(),getClass(),level,&info);
+    sObjectMgr.GetPlayerLevelInfo(getRace(), getClass(), level, &info);
 
     PlayerClassLevelInfo classInfo;
-    sObjectMgr.GetPlayerClassLevelInfo(getClass(),level,&classInfo);
+    sObjectMgr.GetPlayerClassLevelInfo(getClass(), level, &classInfo);
 
     // send levelup info to client
-    WorldPacket data(SMSG_LEVELUP_INFO, (4+4+MAX_POWERS*4+MAX_STATS*4));
+    WorldPacket data(SMSG_LEVELUP_INFO, 4 + 4 + MAX_POWERS * 4 + MAX_STATS * 4);
     data << uint32(level);
     data << uint32(int32(classInfo.basehealth) - int32(GetCreateHealth()));
-    // for(int i = 0; i < MAX_POWERS; ++i)                  // Powers loop (0-6)
-    data << uint32(int32(classInfo.basemana)   - int32(GetCreateMana()));
-    data << uint32(0);
-    data << uint32(0);
-    data << uint32(0);
-    data << uint32(0);
-    data << uint32(0);
-    data << uint32(0);
-    // end for
-    for(int i = STAT_STRENGTH; i < MAX_STATS; ++i)          // Stats loop (0-4)
+    // Powers loop (0-6)
+    data << uint32(int32(classInfo.basemana) - int32(GetCreateMana()));
+    for (uint32 i = 1; i < MAX_POWERS; ++i)
+        data << uint32(0);
+    // Stats loop (0-4)
+    for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
         data << uint32(int32(info.stats[i]) - GetCreateStat(Stats(i)));
 
     GetSession()->SendPacket(&data);
 
     SetUInt32Value(PLAYER_NEXT_LEVEL_XP, sObjectMgr.GetXPForLevel(level));
 
-    //update level, max level of skills
+    // update level, max level of skills
     m_Played_time[PLAYED_TIME_LEVEL] = 0;                   // Level Played Time reset
 
     _ApplyAllLevelScaleItemMods(false);
 
     SetLevel(level);
 
-    UpdateSkillsForLevel ();
+    UpdateSkillsForLevel();
 
     // save base values (bonuses already included in stored stats
-    for(int i = STAT_STRENGTH; i < MAX_STATS; ++i)
+    for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
         SetCreateStat(Stats(i), info.stats[i]);
 
     SetCreateHealth(classInfo.basehealth);
@@ -2527,7 +2791,7 @@ void Player::GiveLevel(uint32 level)
         SetHealth(GetMaxHealth());
     SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
     SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY));
-    if(GetPower(POWER_RAGE) > GetMaxPower(POWER_RAGE))
+    if (GetPower(POWER_RAGE) > GetMaxPower(POWER_RAGE))
         SetPower(POWER_RAGE, GetMaxPower(POWER_RAGE));
     SetPower(POWER_FOCUS, 0);
     SetPower(POWER_HAPPINESS, 0);
@@ -2538,16 +2802,28 @@ void Player::GiveLevel(uint32 level)
     if (Pet* pet = GetPet())
         pet->SynchronizeLevelWithOwner();
 
-    if (MailLevelReward const* mailReward = sObjectMgr.GetMailLevelReward(level,getRaceMask()))
-        MailDraft(mailReward->mailTemplateId).SendMailTo(this,MailSender(MAIL_CREATURE,mailReward->senderEntry));
+    if (MailLevelReward const* mailReward = sObjectMgr.GetMailLevelReward(level, getRaceMask()))
+        MailDraft(mailReward->mailTemplateId).SendMailTo(this, MailSender(MAIL_CREATURE, mailReward->senderEntry));
 
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_LEVEL);
+
+    sLFGMgr.GetLFGPlayerState(GetObjectGuid())->Update();
+
+    // resend quests status directly
+    if (GetSession())
+    {
+        WorldPacket packet = WorldPacket();
+        GetSession()->HandleQuestgiverStatusMultipleQuery(packet);
+    }
+
+    //if (m_playerbotAI)
+    //    m_playerbotAI->GiveLevel(level);
 }
 
 void Player::UpdateFreeTalentPoints(bool resetIfNeed)
 {
     uint32 level = getLevel();
-    // talents base at level diff ( talents = level - 9 but some can be used already)
+    // talents base at level diff (talents = level - 9 but some can be used already)
     if (level < 10)
     {
         // Remove all talent points
@@ -2560,6 +2836,12 @@ void Player::UpdateFreeTalentPoints(bool resetIfNeed)
     }
     else
     {
+        if (m_specsCount == 0)
+        {
+            m_specsCount = 1;
+            m_activeSpec = 0;
+        }
+
         uint32 talentPointsForLevel = CalculateTalentsPoints();
 
         // if used more that have then reset
@@ -2572,8 +2854,9 @@ void Player::UpdateFreeTalentPoints(bool resetIfNeed)
         }
         // else update amount of free points
         else
-            SetFreeTalentPoints(talentPointsForLevel-m_usedTalentCount);
+            SetFreeTalentPoints(talentPointsForLevel - m_usedTalentCount);
     }
+    ResetTalentsCount();
 }
 
 void Player::InitTalentForLevel()
@@ -2586,81 +2869,83 @@ void Player::InitTalentForLevel()
 
 void Player::InitStatsForLevel(bool reapplyMods)
 {
-    if(reapplyMods)                                         //reapply stats values only on .reset stats (level) command
+    if (reapplyMods)                                        // reapply stats values only on .reset stats (level) command
         _RemoveAllStatBonuses();
 
     PlayerClassLevelInfo classInfo;
-    sObjectMgr.GetPlayerClassLevelInfo(getClass(),getLevel(),&classInfo);
+    sObjectMgr.GetPlayerClassLevelInfo(getClass(), getLevel(), &classInfo);
 
     PlayerLevelInfo info;
-    sObjectMgr.GetPlayerLevelInfo(getRace(),getClass(),getLevel(),&info);
+    sObjectMgr.GetPlayerLevelInfo(getRace(), getClass(), getLevel(), &info);
 
-    SetUInt32Value(PLAYER_FIELD_MAX_LEVEL, sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL) );
+    SetUInt32Value(PLAYER_FIELD_MAX_LEVEL, sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL));
     SetUInt32Value(PLAYER_NEXT_LEVEL_XP, sObjectMgr.GetXPForLevel(getLevel()));
 
     // reset before any aura state sources (health set/aura apply)
     SetUInt32Value(UNIT_FIELD_AURASTATE, 0);
 
-    UpdateSkillsForLevel ();
+    UpdateSkillsForLevel();
 
     // set default cast time multiplier
     SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f);
 
     // save base values (bonuses already included in stored stats
-    for(int i = STAT_STRENGTH; i < MAX_STATS; ++i)
+    for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
         SetCreateStat(Stats(i), info.stats[i]);
 
-    for(int i = STAT_STRENGTH; i < MAX_STATS; ++i)
+    for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
         SetStat(Stats(i), info.stats[i]);
 
     SetCreateHealth(classInfo.basehealth);
 
-    //set create powers
+    // set create powers
     SetCreateMana(classInfo.basemana);
 
-    SetArmor(int32(m_createStats[STAT_AGILITY]*2));
+    SetArmor(int32(m_createStats[STAT_AGILITY] * 2));
 
     InitStatBuffMods();
 
-    //reset rating fields values
-    for(uint16 index = PLAYER_FIELD_COMBAT_RATING_1; index < PLAYER_FIELD_COMBAT_RATING_1 + MAX_COMBAT_RATING; ++index)
+    // reset rating fields values
+    for (uint16 index = PLAYER_FIELD_COMBAT_RATING_1; index < PLAYER_FIELD_COMBAT_RATING_1 + MAX_COMBAT_RATING; ++index)
         SetUInt32Value(index, 0);
 
-    SetUInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS,0);
+    SetUInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS, 0);
+    SetFloatValue(PLAYER_FIELD_MOD_HEALING_PCT, 1.0f);
+    SetFloatValue(PLAYER_FIELD_MOD_HEALING_DONE_PCT, 1.0f);
     for (int i = 0; i < MAX_SPELL_SCHOOL; ++i)
     {
-        SetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG+i, 0);
-        SetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+i, 0);
-        SetFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT+i, 1.00f);
+        SetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + i, 0);
+        SetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + i, 0);
+        SetFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT + i, 1.00f);
     }
 
-    //reset attack power, damage and attack speed fields
-    SetFloatValue(UNIT_FIELD_BASEATTACKTIME, 2000.0f );
-    SetFloatValue(UNIT_FIELD_BASEATTACKTIME + 1, 2000.0f ); // offhand attack time
-    SetFloatValue(UNIT_FIELD_RANGEDATTACKTIME, 2000.0f );
+    // reset attack power, damage and attack speed fields
+    SetFloatValue(UNIT_FIELD_BASEATTACKTIME, 2000.0f);
+    SetFloatValue(UNIT_FIELD_BASEATTACKTIME + 1, 2000.0f);  // offhand attack time
+    SetFloatValue(UNIT_FIELD_RANGEDATTACKTIME, 2000.0f);
 
-    SetFloatValue(UNIT_FIELD_MINDAMAGE, 0.0f );
-    SetFloatValue(UNIT_FIELD_MAXDAMAGE, 0.0f );
-    SetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE, 0.0f );
-    SetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE, 0.0f );
-    SetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, 0.0f );
-    SetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, 0.0f );
+    SetFloatValue(UNIT_FIELD_MINDAMAGE, 0.0f);
+    SetFloatValue(UNIT_FIELD_MAXDAMAGE, 0.0f);
+    SetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE, 0.0f);
+    SetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE, 0.0f);
+    SetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, 0.0f);
+    SetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, 0.0f);
 
-    SetInt32Value(UNIT_FIELD_ATTACK_POWER,            0 );
-    SetInt32Value(UNIT_FIELD_ATTACK_POWER_MODS,       0 );
-    SetFloatValue(UNIT_FIELD_ATTACK_POWER_MULTIPLIER,0.0f);
-    SetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER,     0 );
-    SetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER_MODS,0 );
-    SetFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER,0.0f);
+    SetInt32Value(UNIT_FIELD_ATTACK_POWER,            0);
+    SetInt32Value(UNIT_FIELD_ATTACK_POWER_MODS,       0);
+    SetFloatValue(UNIT_FIELD_ATTACK_POWER_MULTIPLIER, 0.0f);
+    SetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER,     0);
+    SetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER_MODS, 0);
+    SetFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER, 0.0f);
 
     // Base crit values (will be recalculated in UpdateAllStats() at loading and in _ApplyAllStatBonuses() at reset
-    SetFloatValue(PLAYER_CRIT_PERCENTAGE,0.0f);
-    SetFloatValue(PLAYER_OFFHAND_CRIT_PERCENTAGE,0.0f);
-    SetFloatValue(PLAYER_RANGED_CRIT_PERCENTAGE,0.0f);
+    SetFloatValue(PLAYER_CRIT_PERCENTAGE, 0.0f);
+    SetFloatValue(PLAYER_OFFHAND_CRIT_PERCENTAGE, 0.0f);
+    SetFloatValue(PLAYER_RANGED_CRIT_PERCENTAGE, 0.0f);
 
     // Init spell schools (will be recalculated in UpdateAllStats() at loading and in _ApplyAllStatBonuses() at reset
     for (uint8 i = 0; i < MAX_SPELL_SCHOOL; ++i)
-        SetFloatValue(PLAYER_SPELL_CRIT_PERCENTAGE1+i, 0.0f);
+        SetFloatValue(PLAYER_SPELL_CRIT_PERCENTAGE1 + i, 0.0f);
 
     SetFloatValue(PLAYER_PARRY_PERCENTAGE, 0.0f);
     SetFloatValue(PLAYER_BLOCK_PERCENTAGE, 0.0f);
@@ -2670,7 +2955,7 @@ void Player::InitStatsForLevel(bool reapplyMods)
     SetFloatValue(PLAYER_DODGE_PERCENTAGE, 0.0f);
 
     // set armor (resistance 0) to original value (create_agility*2)
-    SetArmor(int32(m_createStats[STAT_AGILITY]*2));
+    SetArmor(int32(m_createStats[STAT_AGILITY] * 2));
     SetResistanceBuffMods(SpellSchools(0), true, 0.0f);
     SetResistanceBuffMods(SpellSchools(0), false, 0.0f);
     // set other resistance to original value (0)
@@ -2681,15 +2966,15 @@ void Player::InitStatsForLevel(bool reapplyMods)
         SetResistanceBuffMods(SpellSchools(i), false, 0.0f);
     }
 
-    SetUInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE,0);
-    SetUInt32Value(PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE,0);
-    for(int i = 0; i < MAX_SPELL_SCHOOL; ++i)
+    SetUInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE, 0);
+    SetUInt32Value(PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE, 0);
+    for (int i = 0; i < MAX_SPELL_SCHOOL; ++i)
     {
-        SetUInt32Value(UNIT_FIELD_POWER_COST_MODIFIER+i,0);
-        SetFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER+i,0.0f);
+        SetUInt32Value(UNIT_FIELD_POWER_COST_MODIFIER + i, 0);
+        SetFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER + i, 0.0f);
     }
     // Reset no reagent cost field
-    for(int i = 0; i < 3; ++i)
+    for (int i = 0; i < 3; ++i)
         SetUInt32Value(PLAYER_NO_REAGENT_COST_1 + i, 0);
     // Init data for form but skip reapply item mods for form
     InitDataForForm(reapplyMods);
@@ -2704,16 +2989,16 @@ void Player::InitStatsForLevel(bool reapplyMods)
     SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, 0);
 
     // cleanup unit flags (will be re-applied if need at aura load).
-    RemoveFlag( UNIT_FIELD_FLAGS,
+    RemoveFlag(UNIT_FIELD_FLAGS,
         UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_ATTACKABLE_1 |
         UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_PASSIVE  | UNIT_FLAG_LOOTING          |
         UNIT_FLAG_PET_IN_COMBAT  | UNIT_FLAG_SILENCED     | UNIT_FLAG_PACIFIED         |
         UNIT_FLAG_STUNNED        | UNIT_FLAG_IN_COMBAT    | UNIT_FLAG_DISARMED         |
         UNIT_FLAG_CONFUSED       | UNIT_FLAG_FLEEING      | UNIT_FLAG_NOT_SELECTABLE   |
-        UNIT_FLAG_SKINNABLE      | UNIT_FLAG_MOUNT        | UNIT_FLAG_TAXI_FLIGHT      );
-    SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE );   // must be set
+        UNIT_FLAG_SKINNABLE      | UNIT_FLAG_MOUNT        | UNIT_FLAG_TAXI_FLIGHT     );
+    SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);   // must be set
 
-    SetFlag(UNIT_FIELD_FLAGS_2,UNIT_FLAG2_REGENERATE_POWER);// must be set
+    SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER); // must be set
 
     // cleanup player flags (will be re-applied if need at aura load), to avoid have ghost flag without ghost aura, for example.
     RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK | PLAYER_FLAGS_DND | PLAYER_FLAGS_GM | PLAYER_FLAGS_GHOST);
@@ -2722,16 +3007,16 @@ void Player::InitStatsForLevel(bool reapplyMods)
     RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP | UNIT_BYTE2_FLAG_SANCTUARY);
 
     // restore if need some important flags
-    SetUInt32Value(PLAYER_FIELD_BYTES2, 0 );                // flags empty by default
+    SetUInt32Value(PLAYER_FIELD_BYTES2, 0);                 // flags empty by default
 
-    if(reapplyMods)                                         //reapply stats values only on .reset stats (level) command
+    if (reapplyMods)                                        // reapply stats values only on .reset stats (level) command
         _ApplyAllStatBonuses();
 
     // set current level health and mana/energy to maximum after applying all mods.
     SetHealth(GetMaxHealth());
     SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
     SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY));
-    if(GetPower(POWER_RAGE) > GetMaxPower(POWER_RAGE))
+    if (GetPower(POWER_RAGE) > GetMaxPower(POWER_RAGE))
         SetPower(POWER_RAGE, GetMaxPower(POWER_RAGE));
     SetPower(POWER_FOCUS, 0);
     SetPower(POWER_HAPPINESS, 0);
@@ -2749,7 +3034,8 @@ void Player::SendInitialSpells()
 
     uint16 spellCount = 0;
 
-    WorldPacket data(SMSG_INITIAL_SPELLS, (1+2+4*m_spells.size()+2+m_spellCooldowns.size()*(2+2+2+4+4)));
+    size_t cooldownMapSize = GetSpellCooldownMap()->size();
+    WorldPacket data(SMSG_INITIAL_SPELLS, (1+2+4*m_spells.size()+2+cooldownMapSize*(2+2+2+4+4)));
     data << uint8(0);
 
     size_t countPos = data.wpos();
@@ -2757,26 +3043,26 @@ void Player::SendInitialSpells()
 
     for (PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr)
     {
-        if(itr->second.state == PLAYERSPELL_REMOVED)
+        if (itr->second.state == PLAYERSPELL_REMOVED)
             continue;
 
-        if(!itr->second.active || itr->second.disabled)
+        if (!itr->second.active || itr->second.disabled)
             continue;
 
         data << uint32(itr->first);
         data << uint16(0);                                  // it's not slot id
 
-        spellCount +=1;
+        spellCount += 1;
     }
 
-    data.put<uint16>(countPos,spellCount);                  // write real count value
+    data.put<uint16>(countPos, spellCount);                 // write real count value
 
-    uint16 spellCooldowns = m_spellCooldowns.size();
+    uint16 spellCooldowns = GetSpellCooldownMap()->size();
     data << uint16(spellCooldowns);
-    for(SpellCooldowns::const_iterator itr=m_spellCooldowns.begin(); itr!=m_spellCooldowns.end(); ++itr)
+    for (SpellCooldowns::const_iterator itr = GetSpellCooldownMap()->begin(); itr != GetSpellCooldownMap()->end(); ++itr)
     {
-        SpellEntry const *sEntry = sSpellStore.LookupEntry(itr->first);
-        if(!sEntry)
+        SpellEntry const* sEntry = sSpellStore.LookupEntry(itr->first);
+        if (!sEntry)
             continue;
 
         data << uint32(itr->first);
@@ -2785,16 +3071,16 @@ void Player::SendInitialSpells()
         data << uint16(sEntry->Category);                   // spell category
 
         // send infinity cooldown in special format
-        if(itr->second.end >= infTime)
+        if (itr->second.end >= infTime)
         {
             data << uint32(1);                              // cooldown
             data << uint32(0x80000000);                     // category cooldown
             continue;
         }
 
-        time_t cooldown = itr->second.end > curTime ? (itr->second.end-curTime)*IN_MILLISECONDS : 0;
+        time_t cooldown = itr->second.end > curTime ? (itr->second.end - curTime) * IN_MILLISECONDS : 0;
 
-        if(sEntry->Category)                                // may be wrong, but anyway better than nothing...
+        if (sEntry->Category)                               // may be wrong, but anyway better than nothing...
         {
             data << uint32(0);                              // cooldown
             data << uint32(cooldown);                       // category cooldown
@@ -2808,16 +3094,26 @@ void Player::SendInitialSpells()
 
     GetSession()->SendPacket(&data);
 
-    DETAIL_LOG( "CHARACTER: Sent Initial Spells" );
+    DETAIL_LOG("CHARACTER: Sent Initial Spells");
+}
+
+void Player::SendCalendarResult(CalendarResponseResult result, std::string str)
+{
+    WorldPacket data(SMSG_CALENDAR_COMMAND_RESULT, 200);
+    data << uint32(0);  // unused
+    data << uint8(0);   // std::string, currently unused
+    data << str;
+    data << uint32(result);
+    GetSession()->SendPacket(&data);
 }
 
 void Player::RemoveMail(uint32 id)
 {
-    for(PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end();++itr)
+    for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr)
     {
         if ((*itr)->messageID == id)
         {
-            //do not delete item, because Player::removeMail() is called when returning mail to sender.
+            // do not delete item, because Player::removeMail() is called when returning mail to sender.
             m_mail.erase(itr);
             return;
         }
@@ -2826,13 +3122,13 @@ void Player::RemoveMail(uint32 id)
 
 void Player::SendMailResult(uint32 mailId, MailResponseType mailAction, MailResponseResult mailError, uint32 equipError, uint32 item_guid, uint32 item_count)
 {
-    WorldPacket data(SMSG_SEND_MAIL_RESULT, (4+4+4+(mailError == MAIL_ERR_EQUIP_ERROR?4:(mailAction == MAIL_ITEM_TAKEN?4+4:0))));
+    WorldPacket data(SMSG_SEND_MAIL_RESULT, 4 + 4 + 4 + (mailError == MAIL_ERR_EQUIP_ERROR ? 4 : (mailAction == MAIL_ITEM_TAKEN ? 4 + 4 : 0)));
     data << (uint32) mailId;
     data << (uint32) mailAction;
     data << (uint32) mailError;
-    if ( mailError == MAIL_ERR_EQUIP_ERROR )
+    if (mailError == MAIL_ERR_EQUIP_ERROR)
         data << (uint32) equipError;
-    else if( mailAction == MAIL_ITEM_TAKEN )
+    else if (mailAction == MAIL_ITEM_TAKEN)
     {
         data << (uint32) item_guid;                         // item guid low?
         data << (uint32) item_count;                        // item count?
@@ -2844,7 +3140,7 @@ void Player::SendNewMail()
 {
     // deliver undelivered mail
     WorldPacket data(SMSG_RECEIVED_MAIL, 4);
-    data << (uint32) 0;
+    data << uint32(0);
     GetSession()->SendPacket(&data);
 }
 
@@ -2855,59 +3151,59 @@ void Player::UpdateNextMailTimeAndUnreads()
     time_t cTime = time(NULL);
     m_nextMailDelivereTime = 0;
     unReadMails = 0;
-    for(PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr)
+    for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr)
     {
-        if((*itr)->deliver_time > cTime)
+        if ((*itr)->deliver_time > cTime)
         {
-            if(!m_nextMailDelivereTime || m_nextMailDelivereTime > (*itr)->deliver_time)
+            if (!m_nextMailDelivereTime || m_nextMailDelivereTime > (*itr)->deliver_time)
                 m_nextMailDelivereTime = (*itr)->deliver_time;
         }
-        else if(((*itr)->checked & MAIL_CHECK_MASK_READ) == 0)
+        else if (((*itr)->checked & MAIL_CHECK_MASK_READ) == 0)
             ++unReadMails;
     }
 }
 
 void Player::AddNewMailDeliverTime(time_t deliver_time)
 {
-    if(deliver_time <= time(NULL))                          // ready now
+    if (deliver_time <= time(NULL))                          // ready now
     {
         ++unReadMails;
         SendNewMail();
     }
     else                                                    // not ready and no have ready mails
     {
-        if(!m_nextMailDelivereTime || m_nextMailDelivereTime > deliver_time)
+        if (!m_nextMailDelivereTime || m_nextMailDelivereTime > deliver_time)
             m_nextMailDelivereTime =  deliver_time;
     }
 }
 
 bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependent, bool disabled)
 {
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell_id);
     if (!spellInfo)
     {
         // do character spell book cleanup (all characters)
-        if(!IsInWorld() && !learning)                       // spell load case
+        if (!IsInWorld() && !learning)                       // spell load case
         {
-            sLog.outError("Player::addSpell: nonexistent in SpellStore spell #%u request, deleting for all characters in `character_spell`.",spell_id);
-            CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = '%u'",spell_id);
+            sLog.outError("Player::addSpell: %s has nonexistent in SpellStore spell (id: %u) request, deleting for all characters in `character_spell`.", GetGuidStr().c_str(), spell_id);
+            CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = %u", spell_id);
         }
         else
-            sLog.outError("Player::addSpell: nonexistent in SpellStore spell #%u request.",spell_id);
+            sLog.outError("Player::addSpell: %s has nonexistent in SpellStore spell (id: %u) request.", GetGuidStr().c_str(), spell_id);
 
         return false;
     }
 
-    if(!SpellMgr::IsSpellValid(spellInfo,this,false))
+    if (!SpellMgr::IsSpellValid(spellInfo,this,false))
     {
         // do character spell book cleanup (all characters)
-        if(!IsInWorld() && !learning)                       // spell load case
+        if (!IsInWorld() && !learning)                       // spell load case
         {
-            sLog.outError("Player::addSpell: Broken spell #%u learning not allowed, deleting for all characters in `character_spell`.",spell_id);
-            CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = '%u'",spell_id);
+            sLog.outError("Player::addSpell: %s has broken spell (id: %u) learning not allowed, deleting for all characters in `character_spell`.", GetGuidStr().c_str(), spell_id);
+            CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = %u", spell_id);
         }
         else
-            sLog.outError("Player::addSpell: Broken spell #%u learning not allowed.",spell_id);
+            sLog.outError("Player::addSpell: %s has broken spell (id: %u) learning not allowed.", GetGuidStr().c_str(), spell_id);
 
         return false;
     }
@@ -2923,12 +3219,12 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
     {
         uint32 next_active_spell_id = 0;
         // fix activate state for non-stackable low rank (and find next spell for !active case)
-        if(sSpellMgr.IsRankedSpellNonStackableInSpellBook(spellInfo))
+        if (sSpellMgr.IsRankedSpellNonStackableInSpellBook(spellInfo))
         {
             SpellChainMapNext const& nextMap = sSpellMgr.GetSpellChainNext();
-            for(SpellChainMapNext::const_iterator next_itr = nextMap.lower_bound(spell_id); next_itr != nextMap.upper_bound(spell_id); ++next_itr)
+            for (SpellChainMapNext::const_iterator next_itr = nextMap.lower_bound(spell_id); next_itr != nextMap.upper_bound(spell_id); ++next_itr)
             {
-                if(HasSpell(next_itr->second))
+                if (HasSpell(next_itr->second))
                 {
                     // high rank already known so this must !active
                     active = false;
@@ -2939,10 +3235,10 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
         }
 
         // not do anything if already known in expected state
-        if(itr->second.state != PLAYERSPELL_REMOVED && itr->second.active == active &&
+        if (itr->second.state != PLAYERSPELL_REMOVED && itr->second.active == active &&
             itr->second.dependent == dependent && itr->second.disabled == disabled)
         {
-            if(!IsInWorld() && !learning)                   // explicitly load from DB and then exist in it already and set correctly
+            if (!IsInWorld() && !learning)                   // explicitly load from DB and then exist in it already and set correctly
                 itr->second.state = PLAYERSPELL_UNCHANGED;
 
             return false;
@@ -2958,29 +3254,29 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
         }
 
         // update active state for known spell
-        if(itr->second.active != active && itr->second.state != PLAYERSPELL_REMOVED && !itr->second.disabled)
+        if (itr->second.active != active && itr->second.state != PLAYERSPELL_REMOVED && !itr->second.disabled)
         {
             itr->second.active = active;
 
-            if(!IsInWorld() && !learning && !dependent_set) // explicitly load from DB and then exist in it already and set correctly
+            if (!IsInWorld() && !learning && !dependent_set) // explicitly load from DB and then exist in it already and set correctly
                 itr->second.state = PLAYERSPELL_UNCHANGED;
-            else if(itr->second.state != PLAYERSPELL_NEW)
+            else if (itr->second.state != PLAYERSPELL_NEW)
                 itr->second.state = PLAYERSPELL_CHANGED;
 
-            if(active)
+            if (active)
             {
                 if (IsNeedCastPassiveLikeSpellAtLearn(spellInfo))
                     CastSpell (this, spell_id, true);
             }
-            else if(IsInWorld())
+            else if (IsInWorld())
             {
-                if(next_active_spell_id)
+                if (next_active_spell_id)
                 {
                     // update spell ranks in spellbook and action bar
                     WorldPacket data(SMSG_SUPERCEDED_SPELL, 4 + 4);
                     data << uint32(spell_id);
                     data << uint32(next_active_spell_id);
-                    GetSession()->SendPacket( &data );
+                    GetSession()->SendPacket(&data);
                 }
                 else
                 {
@@ -2993,18 +3289,18 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
             return active;                                  // learn (show in spell book if active now)
         }
 
-        if(itr->second.disabled != disabled && itr->second.state != PLAYERSPELL_REMOVED)
+        if (itr->second.disabled != disabled && itr->second.state != PLAYERSPELL_REMOVED)
         {
-            if(itr->second.state != PLAYERSPELL_NEW)
+            if (itr->second.state != PLAYERSPELL_NEW)
                 itr->second.state = PLAYERSPELL_CHANGED;
             itr->second.disabled = disabled;
 
-            if(disabled)
+            if (disabled)
                 return false;
 
             disabled_case = true;
         }
-        else switch(itr->second.state)
+        else switch (itr->second.state)
         {
             case PLAYERSPELL_UNCHANGED:                     // known saved spell
                 return false;
@@ -3017,7 +3313,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
             default:                                        // known not saved yet spell (new or modified)
             {
                 // can be in case spell loading but learned at some previous spell loading
-                if(!IsInWorld() && !learning && !dependent_set)
+                if (!IsInWorld() && !learning && !dependent_set)
                     itr->second.state = PLAYERSPELL_UNCHANGED;
 
                 return false;
@@ -3027,18 +3323,18 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
 
     TalentSpellPos const* talentPos = GetTalentSpellPos(spell_id);
 
-    if(!disabled_case) // skip new spell adding if spell already known (disabled spells case)
+    if (!disabled_case) // skip new spell adding if spell already known (disabled spells case)
     {
         // talent: unlearn all other talent ranks (high and low)
         if (talentPos)
         {
-            if(TalentEntry const *talentInfo = sTalentStore.LookupEntry( talentPos->talent_id ))
+            if (TalentEntry const *talentInfo = sTalentStore.LookupEntry(talentPos->talent_id))
             {
-                for(int i=0; i < MAX_TALENT_RANK; ++i)
+                for (int i=0; i < MAX_TALENT_RANK; ++i)
                 {
                     // skip learning spell and no rank spell case
                     uint32 rankSpellId = talentInfo->RankID[i];
-                    if(!rankSpellId || rankSpellId == spell_id)
+                    if (!rankSpellId || rankSpellId == spell_id)
                         continue;
 
                     removeSpell(rankSpellId, false, false);
@@ -3046,9 +3342,9 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
             }
         }
         // non talent spell: learn low ranks (recursive call)
-        else if(uint32 prev_spell = sSpellMgr.GetPrevSpellInChain(spell_id))
+        else if (uint32 prev_spell = sSpellMgr.GetPrevSpellInChain(spell_id))
         {
-            if(!IsInWorld() || disabled)                    // at spells loading, no output, but allow save
+            if (!IsInWorld() || disabled)                    // at spells loading, no output, but allow save
                 addSpell(prev_spell, active, true, true, disabled);
             else                                            // at normal learning
                 learnSpell(prev_spell, true);
@@ -3061,47 +3357,47 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
         newspell.disabled  = disabled;
 
         // replace spells in action bars and spellbook to bigger rank if only one spell rank must be accessible
-        if(newspell.active && !newspell.disabled && sSpellMgr.IsRankedSpellNonStackableInSpellBook(spellInfo))
+        if (newspell.active && !newspell.disabled && sSpellMgr.IsRankedSpellNonStackableInSpellBook(spellInfo))
         {
-            for( PlayerSpellMap::iterator itr2 = m_spells.begin(); itr2 != m_spells.end(); ++itr2 )
+            for (PlayerSpellMap::iterator itr2 = m_spells.begin(); itr2 != m_spells.end(); ++itr2)
             {
-                if(itr2->second.state == PLAYERSPELL_REMOVED) continue;
-                SpellEntry const *i_spellInfo = sSpellStore.LookupEntry(itr2->first);
-                if(!i_spellInfo) continue;
+                if (itr2->second.state == PLAYERSPELL_REMOVED) continue;
+                SpellEntry const* i_spellInfo = sSpellStore.LookupEntry(itr2->first);
+                if (!i_spellInfo) continue;
 
-                if( sSpellMgr.IsRankSpellDueToSpell(spellInfo, itr2->first) )
+                if (sSpellMgr.IsRankSpellDueToSpell(spellInfo, itr2->first))
                 {
-                    if(itr2->second.active)
+                    if (itr2->second.active)
                     {
-                        if(sSpellMgr.IsHighRankOfSpell(spell_id,itr2->first))
+                        if (sSpellMgr.IsHighRankOfSpell(spell_id, itr2->first))
                         {
-                            if(IsInWorld())                 // not send spell (re-/over-)learn packets at loading
+                            if (IsInWorld())                 // not send spell (re-/over-)learn packets at loading
                             {
                                 WorldPacket data(SMSG_SUPERCEDED_SPELL, 4 + 4);
                                 data << uint32(itr2->first);
                                 data << uint32(spell_id);
-                                GetSession()->SendPacket( &data );
+                                GetSession()->SendPacket(&data);
                             }
 
                             // mark old spell as disable (SMSG_SUPERCEDED_SPELL replace it in client by new)
                             itr2->second.active = false;
-                            if(itr2->second.state != PLAYERSPELL_NEW)
+                            if (itr2->second.state != PLAYERSPELL_NEW)
                                 itr2->second.state = PLAYERSPELL_CHANGED;
                             superceded_old = true;          // new spell replace old in action bars and spell book.
                         }
-                        else if(sSpellMgr.IsHighRankOfSpell(itr2->first,spell_id))
+                        else if (sSpellMgr.IsHighRankOfSpell(itr2->first, spell_id))
                         {
-                            if(IsInWorld())                 // not send spell (re-/over-)learn packets at loading
+                            if (IsInWorld())                 // not send spell (re-/over-)learn packets at loading
                             {
                                 WorldPacket data(SMSG_SUPERCEDED_SPELL, 4 + 4);
                                 data << uint32(spell_id);
                                 data << uint32(itr2->first);
-                                GetSession()->SendPacket( &data );
+                                GetSession()->SendPacket(&data);
                             }
 
                             // mark new spell as disable (not learned yet for client and will not learned)
                             newspell.active = false;
-                            if(newspell.state != PLAYERSPELL_NEW)
+                            if (newspell.state != PLAYERSPELL_NEW)
                                 newspell.state = PLAYERSPELL_CHANGED;
                         }
                     }
@@ -3148,13 +3444,13 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
     // update free primary prof.points (if any, can be none in case GM .learn prof. learning)
     if (uint32 freeProfs = GetFreePrimaryProfessionPoints())
     {
-        if(sSpellMgr.IsPrimaryProfessionFirstRankSpell(spell_id))
-            SetFreePrimaryProfessions(freeProfs-1);
+        if (sSpellMgr.IsPrimaryProfessionFirstRankSpell(spell_id))
+            SetFreePrimaryProfessions(freeProfs - 1);
     }
 
     // cast talents with SPELL_EFFECT_LEARN_SPELL (other dependent spells will learned later as not auto-learned)
     // note: all spells with SPELL_EFFECT_LEARN_SPELL isn't passive
-    if (talentPos && IsSpellHaveEffect(spellInfo,SPELL_EFFECT_LEARN_SPELL))
+    if (talentPos && IsSpellHaveEffect(spellInfo, SPELL_EFFECT_LEARN_SPELL))
     {
         // ignore stance requirement for talent learn spell (stance set for spell only for client spell description show)
         CastSpell(this, spell_id, true);
@@ -3164,7 +3460,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
     {
         CastSpell(this, spell_id, true);
     }
-    else if (IsSpellHaveEffect(spellInfo,SPELL_EFFECT_SKILL_STEP))
+    else if (IsSpellHaveEffect(spellInfo, SPELL_EFFECT_SKILL_STEP))
     {
         CastSpell(this, spell_id, true);
         return false;
@@ -3195,9 +3491,9 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
     else
     {
         // not ranked skills
-        for(SkillLineAbilityMap::const_iterator _spell_idx = skill_bounds.first; _spell_idx != skill_bounds.second; ++_spell_idx)
+        for (SkillLineAbilityMap::const_iterator _spell_idx = skill_bounds.first; _spell_idx != skill_bounds.second; ++_spell_idx)
         {
-            SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(_spell_idx->second->skillId);
+            SkillLineEntry const* pSkill = sSkillLineStore.LookupEntry(_spell_idx->second->skillId);
             if (!pSkill)
                 continue;
 
@@ -3208,16 +3504,16 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
                 // lockpicking/runeforging special case, not have ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL
                 ((pSkill->id==SKILL_LOCKPICKING || pSkill->id==SKILL_RUNEFORGING) && _spell_idx->second->max_value==0))
             {
-                switch(GetSkillRangeType(pSkill, _spell_idx->second->racemask != 0))
+                switch (GetSkillRangeType(pSkill, _spell_idx->second->racemask != 0))
                 {
                     case SKILL_RANGE_LANGUAGE:
-                        SetSkill(pSkill->id, 300, 300 );
+                        SetSkill(pSkill->id, 300, 300);
                         break;
                     case SKILL_RANGE_LEVEL:
-                        SetSkill(pSkill->id, 1, GetMaxSkillValueForLevel() );
+                        SetSkill(pSkill->id, 1, GetMaxSkillValueForLevel());
                         break;
                     case SKILL_RANGE_MONO:
-                        SetSkill(pSkill->id, 1, 1 );
+                        SetSkill(pSkill->id, 1, 1);
                         break;
                     default:
                         break;
@@ -3229,7 +3525,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
     // learn dependent spells
     SpellLearnSpellMapBounds spell_bounds = sSpellMgr.GetSpellLearnSpellMapBounds(spell_id);
 
-    for(SpellLearnSpellMap::const_iterator itr2 = spell_bounds.first; itr2 != spell_bounds.second; ++itr2)
+    for (SpellLearnSpellMap::const_iterator itr2 = spell_bounds.first; itr2 != spell_bounds.second; ++itr2)
     {
         if (!itr2->second.autoLearned)
         {
@@ -3243,7 +3539,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
     if (!GetSession()->PlayerLoading())
     {
         // not ranked skills
-        for(SkillLineAbilityMap::const_iterator _spell_idx = skill_bounds.first; _spell_idx != skill_bounds.second; ++_spell_idx)
+        for (SkillLineAbilityMap::const_iterator _spell_idx = skill_bounds.first; _spell_idx != skill_bounds.second; ++_spell_idx)
         {
             GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LINE,_spell_idx->second->skillId);
             GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILLLINE_SPELLS,_spell_idx->second->skillId);
@@ -3260,7 +3556,7 @@ bool Player::IsNeedCastPassiveLikeSpellAtLearn(SpellEntry const* spellInfo) cons
 {
     ShapeshiftForm form = GetShapeshiftForm();
 
-    if (IsNeedCastSpellAtFormApply(spellInfo, form))        // SPELL_ATTR_PASSIVE | SPELL_ATTR_UNK7 spells
+    if (IsNeedCastSpellAtFormApply(spellInfo, form))        // SPELL_ATTR_PASSIVE | SPELL_ATTR_HIDDEN_CLIENTSIDE spells
         return true;                                        // all stance req. cases, not have auarastate cases
 
     if (!spellInfo->HasAttribute(SPELL_ATTR_PASSIVE))
@@ -3293,10 +3589,10 @@ void Player::learnSpell(uint32 spell_id, bool dependent)
     }
 
     // learn all disabled higher ranks (recursive)
-    if(disabled)
+    if (disabled)
     {
         SpellChainMapNext const& nextMap = sSpellMgr.GetSpellChainNext();
-        for(SpellChainMapNext::const_iterator i = nextMap.lower_bound(spell_id); i != nextMap.upper_bound(spell_id); ++i)
+        for (SpellChainMapNext::const_iterator i = nextMap.lower_bound(spell_id); i != nextMap.upper_bound(spell_id); ++i)
         {
             PlayerSpellMap::iterator iter = m_spells.find(i->second);
             if (iter != m_spells.end() && iter->second.disabled)
@@ -3316,8 +3612,8 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
 
     // unlearn non talent higher ranks (recursive)
     SpellChainMapNext const& nextMap = sSpellMgr.GetSpellChainNext();
-    for(SpellChainMapNext::const_iterator itr2 = nextMap.lower_bound(spell_id); itr2 != nextMap.upper_bound(spell_id); ++itr2)
-        if(HasSpell(itr2->second) && !GetTalentSpellPos(itr2->second))
+    for (SpellChainMapNext::const_iterator itr2 = nextMap.lower_bound(spell_id); itr2 != nextMap.upper_bound(spell_id); ++itr2)
+        if (HasSpell(itr2->second) && !GetTalentSpellPos(itr2->second))
             removeSpell(itr2->second, disabled, false);
 
     // re-search, it can be corrupted in prev loop
@@ -3331,12 +3627,12 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
     if (disabled)
     {
         itr->second.disabled = disabled;
-        if(itr->second.state != PLAYERSPELL_NEW)
+        if (itr->second.state != PLAYERSPELL_NEW)
             itr->second.state = PLAYERSPELL_CHANGED;
     }
     else
     {
-        if(itr->second.state == PLAYERSPELL_NEW)
+        if (itr->second.state == PLAYERSPELL_NEW)
             m_spells.erase(itr);
         else
             itr->second.state = PLAYERSPELL_REMOVED;
@@ -3345,9 +3641,11 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
     RemoveAurasDueToSpell(spell_id);
 
     // remove pet auras
-    for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if(PetAura const* petSpell = sSpellMgr.GetPetAura(spell_id, SpellEffectIndex(i)))
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        if (PetAura const* petSpell = sSpellMgr.GetPetAura(spell_id, SpellEffectIndex(i)))
             RemovePetAura(petSpell);
+    }
 
     TalentSpellPos const* talentPos = GetTalentSpellPos(spell_id);
     if (talentPos)
@@ -3362,12 +3660,12 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
                 m_talents[m_activeSpec].erase(iter);
         }
         else
-            sLog.outError("removeSpell: Player (GUID: %u) has talent spell (id: %u) but doesn't have talent",GetGUIDLow(), spell_id );
+            sLog.outError("Player::removeSpell: %s has talent spell (Id: %u) but doesn't have talent.", GetGuidStr().c_str(), spell_id);
 
         // free talent points
         uint32 talentCosts = GetTalentSpellCost(talentPos);
 
-        if(talentCosts < m_usedTalentCount)
+        if (talentCosts < m_usedTalentCount)
             m_usedTalentCount -= talentCosts;
         else
             m_usedTalentCount = 0;
@@ -3376,26 +3674,26 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
     }
 
     // update free primary prof.points (if not overflow setting, can be in case GM use before .learn prof. learning)
-    if(sSpellMgr.IsPrimaryProfessionFirstRankSpell(spell_id))
+    if (sSpellMgr.IsPrimaryProfessionFirstRankSpell(spell_id))
     {
         uint32 freeProfs = GetFreePrimaryProfessionPoints()+1;
         uint32 maxProfs = GetSession()->GetSecurity() < AccountTypes(sWorld.getConfig(CONFIG_UINT32_TRADE_SKILL_GMIGNORE_MAX_PRIMARY_COUNT)) ? sWorld.getConfig(CONFIG_UINT32_MAX_PRIMARY_TRADE_SKILL) : 10;
-        if(freeProfs <= maxProfs)
+        if (freeProfs <= maxProfs)
             SetFreePrimaryProfessions(freeProfs);
     }
 
     // remove dependent skill
     SpellLearnSkillNode const* spellLearnSkill = sSpellMgr.GetSpellLearnSkill(spell_id);
-    if(spellLearnSkill)
+    if (spellLearnSkill)
     {
         uint32 prev_spell = sSpellMgr.GetPrevSpellInChain(spell_id);
-        if(!prev_spell)                                     // first rank, remove skill
+        if (!prev_spell)                                     // first rank, remove skill
             SetSkill(spellLearnSkill->skill, 0, 0);
         else
         {
             // search prev. skill setting by spell ranks chain
             SpellLearnSkillNode const* prevSkill = sSpellMgr.GetSpellLearnSkill(prev_spell);
-            while(!prevSkill && prev_spell)
+            while (!prevSkill && prev_spell)
             {
                 prev_spell = sSpellMgr.GetPrevSpellInChain(prev_spell);
                 prevSkill = sSpellMgr.GetSpellLearnSkill(sSpellMgr.GetFirstSpellInChain(prev_spell));
@@ -3419,16 +3717,15 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
                 SetSkill(prevSkill->skill, skill_value, skill_max_value, prevSkill->step);
             }
         }
-
     }
     else
     {
         // not ranked skills
         SkillLineAbilityMapBounds bounds = sSpellMgr.GetSkillLineAbilityMapBounds(spell_id);
 
-        for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
+        for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
         {
-            SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(_spell_idx->second->skillId);
+            SkillLineEntry const* pSkill = sSkillLineStore.LookupEntry(_spell_idx->second->skillId);
             if (!pSkill)
                 continue;
 
@@ -3450,20 +3747,20 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
     // remove dependent spells
     SpellLearnSpellMapBounds spell_bounds = sSpellMgr.GetSpellLearnSpellMapBounds(spell_id);
 
-    for(SpellLearnSpellMap::const_iterator itr2 = spell_bounds.first; itr2 != spell_bounds.second; ++itr2)
+    for (SpellLearnSpellMap::const_iterator itr2 = spell_bounds.first; itr2 != spell_bounds.second; ++itr2)
         removeSpell(itr2->second.spell, disabled);
 
     // activate lesser rank in spellbook/action bar, and cast it if need
     bool prev_activate = false;
 
-    if (uint32 prev_id = sSpellMgr.GetPrevSpellInChain (spell_id))
+    if (uint32 prev_id = sSpellMgr.GetPrevSpellInChain(spell_id))
     {
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell_id);
 
         // if talent then lesser rank also talent and need learn
         if (talentPos)
         {
-            if(learn_low_rank)
+            if (learn_low_rank)
                 learnSpell(prev_id, false);
         }
         // if ranked non-stackable spell: need activate lesser rank and update dependence state
@@ -3489,7 +3786,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
                         WorldPacket data(SMSG_SUPERCEDED_SPELL, 4 + 4);
                         data << uint32(spell_id);
                         data << uint32(prev_id);
-                        GetSession()->SendPacket( &data );
+                        GetSession()->SendPacket(&data);
                         prev_activate = true;
                     }
                 }
@@ -3500,7 +3797,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
     // for Titan's Grip and shaman Dual-wield
     if (CanDualWield() || CanTitanGrip())
     {
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell_id);
 
         if (CanDualWield() && IsSpellHaveEffect(spellInfo, SPELL_EFFECT_DUAL_WIELD))
             SetCanDualWield(false);
@@ -3514,7 +3811,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
     }
 
     // for talents and normal spell unlearn that allow offhand use for some weapons
-    if(sWorld.getConfig(CONFIG_BOOL_OFFHAND_CHECK_AT_TALENTS_RESET))
+    if (sWorld.getConfig(CONFIG_BOOL_OFFHAND_CHECK_AT_TALENTS_RESET))
         AutoUnequipOffhandIfNeed();
 
     // remove from spell book if not replaced by lesser rank
@@ -3526,60 +3823,28 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
     }
 }
 
-void Player::RemoveSpellCooldown( uint32 spell_id, bool update /* = false */ )
-{
-    m_spellCooldowns.erase(spell_id);
-
-    if(update)
-        SendClearCooldown(spell_id, this);
-}
-
-void Player::RemoveSpellCategoryCooldown(uint32 cat, bool update /* = false */)
-{
-    SpellCategoryStore::const_iterator ct = sSpellCategoryStore.find(cat);
-    if (ct == sSpellCategoryStore.end())
-        return;
-
-    const SpellCategorySet& ct_set = ct->second;
-    for (SpellCooldowns::const_iterator i = m_spellCooldowns.begin(); i != m_spellCooldowns.end();)
-    {
-        if (ct_set.find(i->first) != ct_set.end())
-            RemoveSpellCooldown((i++)->first, update);
-        else
-            ++i;
-    }
-}
-
-void Player::RemoveArenaSpellCooldowns()
+void Player::RemoveArenaSpellCooldowns()
 {
     // remove cooldowns on spells that has < 15 min CD
-    SpellCooldowns::iterator itr, next;
+    SpellCooldowns::const_iterator itr, next;
     // iterate spell cooldowns
-    for(itr = m_spellCooldowns.begin();itr != m_spellCooldowns.end(); itr = next)
+    for (itr = GetSpellCooldownMap()->begin(); itr != GetSpellCooldownMap()->end(); itr = next)
     {
         next = itr;
         ++next;
-        SpellEntry const * entry = sSpellStore.LookupEntry(itr->first);
+        SpellEntry const* entry = sSpellStore.LookupEntry(itr->first);
         // check if spellentry is present and if the cooldown is less than 15 mins
-        if( entry &&
+        if (entry &&
             entry->RecoveryTime <= 15 * MINUTE * IN_MILLISECONDS &&
-            entry->CategoryRecoveryTime <= 15 * MINUTE * IN_MILLISECONDS )
+            entry->CategoryRecoveryTime <= 15 * MINUTE * IN_MILLISECONDS)
         {
             // remove & notify
             RemoveSpellCooldown(itr->first, true);
         }
     }
-}
-
-void Player::RemoveAllSpellCooldown()
-{
-    if(!m_spellCooldowns.empty())
-    {
-        for(SpellCooldowns::const_iterator itr = m_spellCooldowns.begin();itr != m_spellCooldowns.end(); ++itr)
-            SendClearCooldown(itr->first, this);
 
-        m_spellCooldowns.clear();
-    }
+    if (Pet* pet = GetPet())
+        pet->RemoveAllSpellCooldown();
 }
 
 void Player::_LoadSpellCooldowns(QueryResult *result)
@@ -3588,33 +3853,33 @@ void Player::_LoadSpellCooldowns(QueryResult *result)
 
     //QueryResult *result = CharacterDatabase.PQuery("SELECT spell,item,time FROM character_spell_cooldown WHERE guid = '%u'",GetGUIDLow());
 
-    if(result)
+    if (result)
     {
         time_t curTime = time(NULL);
 
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             uint32 spell_id = fields[0].GetUInt32();
             uint32 item_id  = fields[1].GetUInt32();
             time_t db_time  = (time_t)fields[2].GetUInt64();
 
-            if(!sSpellStore.LookupEntry(spell_id))
+            if (!sSpellStore.LookupEntry(spell_id))
             {
-                sLog.outError("Player %u has unknown spell %u in `character_spell_cooldown`, skipping.",GetGUIDLow(),spell_id);
+                sLog.outError("Player::_LoadSpellCooldowns: %s has unknown spell %u in `character_spell_cooldown`, skipping.", GetGuidStr().c_str(), spell_id);
                 continue;
             }
 
             // skip outdated cooldown
-            if(db_time <= curTime)
+            if (db_time <= curTime)
                 continue;
 
             AddSpellCooldown(spell_id, item_id, db_time);
 
             DEBUG_LOG("Player (GUID: %u) spell %u, item %u cooldown loaded (%u secs).", GetGUIDLow(), spell_id, item_id, uint32(db_time-curTime));
         }
-        while( result->NextRow() );
+        while (result->NextRow());
 
         delete result;
     }
@@ -3622,59 +3887,53 @@ void Player::_LoadSpellCooldowns(QueryResult *result)
 
 void Player::_SaveSpellCooldowns()
 {
-    static SqlStatementID deleteSpellCooldown ;
-    static SqlStatementID insertSpellCooldown ;
-
-    SqlStatement stmt = CharacterDatabase.CreateStatement(deleteSpellCooldown, "DELETE FROM character_spell_cooldown WHERE guid = ?");
-    stmt.PExecute(GetGUIDLow());
+    static SqlStatementID deleteSpellCooldown;
+    CharacterDatabase.CreateStatement(deleteSpellCooldown, "DELETE FROM character_spell_cooldown WHERE guid = ?")
+        .PExecute(GetGUIDLow());
 
     time_t curTime = time(NULL);
     time_t infTime = curTime + infinityCooldownDelayCheck;
 
     // remove outdated and save active
-    for(SpellCooldowns::iterator itr = m_spellCooldowns.begin();itr != m_spellCooldowns.end();)
+    RemoveOutdatedSpellCooldowns();
+
+    static SqlStatementID insertSpellCooldown;
+    SqlStatement stmt = CharacterDatabase.CreateStatement(insertSpellCooldown, "INSERT INTO character_spell_cooldown (guid,spell,item,time) VALUES(?, ?, ?, ?)");
+    for (SpellCooldowns::const_iterator itr = GetSpellCooldownMap()->begin(); itr != GetSpellCooldownMap()->end(); ++itr)
     {
-        if(itr->second.end <= curTime)
-            m_spellCooldowns.erase(itr++);
-        else if(itr->second.end <= infTime)                 // not save locked cooldowns, it will be reset or set at reload
-        {
-            stmt = CharacterDatabase.CreateStatement(insertSpellCooldown, "INSERT INTO character_spell_cooldown (guid,spell,item,time) VALUES( ?, ?, ?, ?)");
+        if (itr->second.end <= infTime)                 // not save locked cooldowns, it will be reset or set at reload
             stmt.PExecute(GetGUIDLow(), itr->first, itr->second.itemid, uint64(itr->second.end));
-            ++itr;
-        }
-        else
-            ++itr;
     }
 }
 
 uint32 Player::resetTalentsCost() const
 {
     // The first time reset costs 1 gold
-    if(m_resetTalentsCost < 1*GOLD)
-        return 1*GOLD;
+    if (m_resetTalentsCost < 1 * GOLD)
+        return 1 * GOLD;
     // then 5 gold
-    else if(m_resetTalentsCost < 5*GOLD)
-        return 5*GOLD;
+    else if (m_resetTalentsCost < 5 * GOLD)
+        return 5 * GOLD;
     // After that it increases in increments of 5 gold
-    else if(m_resetTalentsCost < 10*GOLD)
-        return 10*GOLD;
+    else if (m_resetTalentsCost < 10 * GOLD)
+        return 10 * GOLD;
     else
     {
-        time_t months = (sWorld.GetGameTime() - m_resetTalentsTime)/MONTH;
-        if(months > 0)
+        time_t months = (sWorld.GetGameTime() - m_resetTalentsTime) / MONTH;
+        if (months > 0)
         {
             // This cost will be reduced by a rate of 5 gold per month
-            int32 new_cost = int32((m_resetTalentsCost) - 5*GOLD*months);
+            int32 new_cost = int32((m_resetTalentsCost) - 5 * GOLD * months);
             // to a minimum of 10 gold.
-            return uint32(new_cost < 10*GOLD ? 10*GOLD : new_cost);
+            return uint32(new_cost < 10 * GOLD ? 10 * GOLD : new_cost);
         }
         else
         {
             // After that it increases in increments of 5 gold
-            int32 new_cost = m_resetTalentsCost + 5*GOLD;
+            int32 new_cost = m_resetTalentsCost + 5 * GOLD;
             // until it hits a cap of 50 gold.
-            if(new_cost > 50*GOLD)
-                new_cost = 50*GOLD;
+            if (new_cost > 50 * GOLD)
+                new_cost = 50 * GOLD;
             return new_cost;
         }
     }
@@ -3683,8 +3942,8 @@ uint32 Player::resetTalentsCost() const
 bool Player::resetTalents(bool no_cost, bool all_specs)
 {
     // not need after this call
-    if(HasAtLoginFlag(AT_LOGIN_RESET_TALENTS) && all_specs)
-        RemoveAtLoginFlag(AT_LOGIN_RESET_TALENTS,true);
+    if (HasAtLoginFlag(AT_LOGIN_RESET_TALENTS) && all_specs)
+        RemoveAtLoginFlag(AT_LOGIN_RESET_TALENTS, true);
 
     if (m_usedTalentCount == 0 && !all_specs)
     {
@@ -3694,17 +3953,19 @@ bool Player::resetTalents(bool no_cost, bool all_specs)
 
     uint32 cost = 0;
 
-    if(!no_cost)
+    if (!no_cost)
     {
         cost = resetTalentsCost();
 
         if (GetMoney() < cost)
         {
-            SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
+            SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
             return false;
         }
     }
 
+    RemoveAllEnchantments(TEMP_ENCHANTMENT_SLOT);
+
     for (PlayerTalentMap::iterator iter = m_talents[m_activeSpec].begin(); iter != m_talents[m_activeSpec].end();)
     {
         if (iter->second.state == PLAYERSPELL_REMOVED)
@@ -3739,8 +4000,17 @@ bool Player::resetTalents(bool no_cost, bool all_specs)
 
         for (int j = 0; j < MAX_TALENT_RANK; ++j)
             if (talentInfo->RankID[j])
+            {
                 removeSpell(talentInfo->RankID[j],!IsPassiveSpell(talentInfo->RankID[j]),false);
 
+                SpellEntry const* spellInfo = sSpellStore.LookupEntry(talentInfo->RankID[j]);
+                for (int k = 0; k < MAX_EFFECT_INDEX; ++k)
+                {
+                    if (spellInfo->EffectTriggerSpell[k])
+                        removeSpell(spellInfo->EffectTriggerSpell[k]);
+                }
+            }
+
         iter = m_talents[m_activeSpec].begin();
     }
 
@@ -3756,16 +4026,16 @@ bool Player::resetTalents(bool no_cost, bool all_specs)
             {
                 switch (iter->second.state)
                 {
-                case PLAYERSPELL_REMOVED:
-                    ++iter;
-                    break;
-                case PLAYERSPELL_NEW:
-                    m_talents[spec].erase(iter++);
-                    break;
-                default:
-                    iter->second.state = PLAYERSPELL_REMOVED;
-                    ++iter;
-                    break;
+                    case PLAYERSPELL_REMOVED:
+                        ++iter;
+                        break;
+                    case PLAYERSPELL_NEW:
+                        m_talents[spec].erase(iter++);
+                        break;
+                    default:
+                        iter->second.state = PLAYERSPELL_REMOVED;
+                        ++iter;
+                        break;
                 }
             }
         }
@@ -3773,7 +4043,7 @@ bool Player::resetTalents(bool no_cost, bool all_specs)
 
     UpdateFreeTalentPoints(false);
 
-    if(!no_cost)
+    if (!no_cost)
     {
         ModifyMoney(-(int32)cost);
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_FOR_TALENTS, cost);
@@ -3783,12 +4053,12 @@ bool Player::resetTalents(bool no_cost, bool all_specs)
         m_resetTalentsTime = time(NULL);
     }
 
-    //FIXME: remove pet before or after unlearn spells? for now after unlearn to allow removing of talent related, pet affecting auras
+    // FIXME: remove pet before or after unlearn spells? for now after unlearn to allow removing of talent related, pet affecting auras
     RemovePet(PET_SAVE_REAGENTS);
     /* when prev line will dropped use next line
-    if(Pet* pet = GetPet())
+    if (Pet* pet = GetPet())
     {
-        if(pet->getPetType()==HUNTER_PET && !pet->GetCreatureInfo()->isTameable(CanTameExoticPets()))
+        if (pet->getPetType()==HUNTER_PET && !pet->GetCreatureInfo()->isTameable(CanTameExoticPets()))
             pet->Unsummon(PET_SAVE_REAGENTS, this);
     }
     */
@@ -3797,7 +4067,7 @@ bool Player::resetTalents(bool no_cost, bool all_specs)
 
 Mail* Player::GetMail(uint32 id)
 {
-    for(PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr)
+    for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr)
     {
         if ((*itr)->messageID == id)
         {
@@ -3807,181 +4077,63 @@ Mail* Player::GetMail(uint32 id)
     return NULL;
 }
 
-void Player::_SetCreateBits(UpdateMask *updateMask, Player *target) const
+void Player::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const
 {
-    if(target == this)
+    if (target == this)
     {
-        Object::_SetCreateBits(updateMask, target);
-    }
-    else
-    {
-        for(uint16 index = 0; index < m_valuesCount; index++)
+        for (int i = 0; i < EQUIPMENT_SLOT_END; ++i)
         {
-            if(GetUInt32Value(index) != 0 && updateVisualBits.GetBit(index))
-                updateMask->SetBit(index);
-        }
-    }
-}
-
-void Player::_SetUpdateBits(UpdateMask *updateMask, Player *target) const
-{
-    if(target == this)
-    {
-        Object::_SetUpdateBits(updateMask, target);
-    }
-    else
-    {
-        Object::_SetUpdateBits(updateMask, target);
-        *updateMask &= updateVisualBits;
-    }
-}
-
-void Player::InitVisibleBits()
-{
-    updateVisualBits.SetCount(PLAYER_END);
-
-    updateVisualBits.SetBit(OBJECT_FIELD_GUID);
-    updateVisualBits.SetBit(OBJECT_FIELD_TYPE);
-    updateVisualBits.SetBit(OBJECT_FIELD_ENTRY);
-    updateVisualBits.SetBit(OBJECT_FIELD_SCALE_X);
-    updateVisualBits.SetBit(UNIT_FIELD_CHARM + 0);
-    updateVisualBits.SetBit(UNIT_FIELD_CHARM + 1);
-    updateVisualBits.SetBit(UNIT_FIELD_SUMMON + 0);
-    updateVisualBits.SetBit(UNIT_FIELD_SUMMON + 1);
-    updateVisualBits.SetBit(UNIT_FIELD_CHARMEDBY + 0);
-    updateVisualBits.SetBit(UNIT_FIELD_CHARMEDBY + 1);
-    updateVisualBits.SetBit(UNIT_FIELD_TARGET + 0);
-    updateVisualBits.SetBit(UNIT_FIELD_TARGET + 1);
-    updateVisualBits.SetBit(UNIT_FIELD_CHANNEL_OBJECT + 0);
-    updateVisualBits.SetBit(UNIT_FIELD_CHANNEL_OBJECT + 1);
-    updateVisualBits.SetBit(UNIT_FIELD_BYTES_0);
-    updateVisualBits.SetBit(UNIT_FIELD_HEALTH);
-    updateVisualBits.SetBit(UNIT_FIELD_POWER1);
-    updateVisualBits.SetBit(UNIT_FIELD_POWER2);
-    updateVisualBits.SetBit(UNIT_FIELD_POWER3);
-    updateVisualBits.SetBit(UNIT_FIELD_POWER4);
-    updateVisualBits.SetBit(UNIT_FIELD_POWER5);
-    updateVisualBits.SetBit(UNIT_FIELD_POWER6);
-    updateVisualBits.SetBit(UNIT_FIELD_POWER7);
-    updateVisualBits.SetBit(UNIT_FIELD_MAXHEALTH);
-    updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER1);
-    updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER2);
-    updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER3);
-    updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER4);
-    updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER5);
-    updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER6);
-    updateVisualBits.SetBit(UNIT_FIELD_MAXPOWER7);
-    updateVisualBits.SetBit(UNIT_FIELD_LEVEL);
-    updateVisualBits.SetBit(UNIT_FIELD_FACTIONTEMPLATE);
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_ID + 0);
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_ID + 1);
-    updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_ID + 2);
-    updateVisualBits.SetBit(UNIT_FIELD_FLAGS);
-    updateVisualBits.SetBit(UNIT_FIELD_FLAGS_2);
-    updateVisualBits.SetBit(UNIT_FIELD_AURASTATE);
-    updateVisualBits.SetBit(UNIT_FIELD_BASEATTACKTIME + 0);
-    updateVisualBits.SetBit(UNIT_FIELD_BASEATTACKTIME + 1);
-    updateVisualBits.SetBit(UNIT_FIELD_BOUNDINGRADIUS);
-    updateVisualBits.SetBit(UNIT_FIELD_COMBATREACH);
-    updateVisualBits.SetBit(UNIT_FIELD_DISPLAYID);
-    updateVisualBits.SetBit(UNIT_FIELD_NATIVEDISPLAYID);
-    updateVisualBits.SetBit(UNIT_FIELD_MOUNTDISPLAYID);
-    updateVisualBits.SetBit(UNIT_FIELD_BYTES_1);
-    updateVisualBits.SetBit(UNIT_FIELD_PETNUMBER);
-    updateVisualBits.SetBit(UNIT_FIELD_PET_NAME_TIMESTAMP);
-    updateVisualBits.SetBit(UNIT_DYNAMIC_FLAGS);
-    updateVisualBits.SetBit(UNIT_CHANNEL_SPELL);
-    updateVisualBits.SetBit(UNIT_MOD_CAST_SPEED);
-    updateVisualBits.SetBit(UNIT_FIELD_BASE_MANA);
-    updateVisualBits.SetBit(UNIT_FIELD_BYTES_2);
-    updateVisualBits.SetBit(UNIT_FIELD_HOVERHEIGHT);
-
-    updateVisualBits.SetBit(PLAYER_DUEL_ARBITER + 0);
-    updateVisualBits.SetBit(PLAYER_DUEL_ARBITER + 1);
-    updateVisualBits.SetBit(PLAYER_FLAGS);
-    updateVisualBits.SetBit(PLAYER_GUILDID);
-    updateVisualBits.SetBit(PLAYER_GUILDRANK);
-    updateVisualBits.SetBit(PLAYER_BYTES);
-    updateVisualBits.SetBit(PLAYER_BYTES_2);
-    updateVisualBits.SetBit(PLAYER_BYTES_3);
-    updateVisualBits.SetBit(PLAYER_DUEL_TEAM);
-    updateVisualBits.SetBit(PLAYER_GUILD_TIMESTAMP);
-
-    // PLAYER_QUEST_LOG_x also visible bit on official (but only on party/raid)...
-    for(uint16 i = PLAYER_QUEST_LOG_1_1; i < PLAYER_QUEST_LOG_25_2; i += MAX_QUEST_OFFSET)
-        updateVisualBits.SetBit(i);
-
-    // Players visible items are not inventory stuff
-    for(uint16 i = 0; i < EQUIPMENT_SLOT_END; ++i)
-    {
-        uint32 offset = i * 2;
-
-        // item entry
-        updateVisualBits.SetBit(PLAYER_VISIBLE_ITEM_1_ENTRYID + offset);
-        // enchant
-        updateVisualBits.SetBit(PLAYER_VISIBLE_ITEM_1_ENCHANTMENT + offset);
-    }
-
-    updateVisualBits.SetBit(PLAYER_CHOSEN_TITLE);
-}
-
-void Player::BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const
-{
-    if(target == this)
-    {
-        for(int i = 0; i < EQUIPMENT_SLOT_END; ++i)
-        {
-            if(m_items[i] == NULL)
+            if (m_items[i] == NULL)
                 continue;
 
-            m_items[i]->BuildCreateUpdateBlockForPlayer( data, target );
+            m_items[i]->BuildCreateUpdateBlockForPlayer(data, target);
         }
-        for(int i = INVENTORY_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+        for (int i = INVENTORY_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
         {
-            if(m_items[i] == NULL)
+            if (m_items[i] == NULL)
                 continue;
 
-            m_items[i]->BuildCreateUpdateBlockForPlayer( data, target );
+            m_items[i]->BuildCreateUpdateBlockForPlayer(data, target);
         }
-        for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+        for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
         {
-            if(m_items[i] == NULL)
+            if (m_items[i] == NULL)
                 continue;
 
-            m_items[i]->BuildCreateUpdateBlockForPlayer( data, target );
+            m_items[i]->BuildCreateUpdateBlockForPlayer(data, target);
         }
     }
 
-    Unit::BuildCreateUpdateBlockForPlayer( data, target );
+    Unit::BuildCreateUpdateBlockForPlayer(data, target);
 }
 
-void Player::DestroyForPlayer( Player *target, bool anim ) const
+void Player::DestroyForPlayer(Player* target, bool anim) const
 {
-    Unit::DestroyForPlayer( target, anim );
+    Unit::DestroyForPlayer(target, anim);
 
-    for(int i = 0; i < INVENTORY_SLOT_BAG_END; ++i)
+    for (int i = 0; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        if(m_items[i] == NULL)
+        if (m_items[i] == NULL)
             continue;
 
-        m_items[i]->DestroyForPlayer( target );
+        m_items[i]->DestroyForPlayer(target);
     }
 
-    if(target == this)
+    if (target == this)
     {
-        for(int i = INVENTORY_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+        for (int i = INVENTORY_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
         {
-            if(m_items[i] == NULL)
+            if (m_items[i] == NULL)
                 continue;
 
-            m_items[i]->DestroyForPlayer( target );
+            m_items[i]->DestroyForPlayer(target);
         }
-        for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+        for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
         {
-            if(m_items[i] == NULL)
+            if (m_items[i] == NULL)
                 continue;
 
-            m_items[i]->DestroyForPlayer( target );
+            m_items[i]->DestroyForPlayer(target);
         }
     }
 }
@@ -4023,14 +4175,14 @@ TrainerSpellState Player::GetTrainerSpellState(TrainerSpell const* trainer_spell
         if (getLevel() < reqLevel)
             return TRAINER_SPELL_RED;
 
-    if(SpellChainNode const* spell_chain = sSpellMgr.GetSpellChainNode(trainer_spell->learnedSpell))
+    if (SpellChainNode const* spell_chain = sSpellMgr.GetSpellChainNode(trainer_spell->learnedSpell))
     {
         // check prev.rank requirement
-        if(spell_chain->prev && !HasSpell(spell_chain->prev))
+        if (spell_chain->prev && !HasSpell(spell_chain->prev))
             return TRAINER_SPELL_RED;
 
         // check additional spell requirement
-        if(spell_chain->req && !HasSpell(spell_chain->req))
+        if (spell_chain->req && !HasSpell(spell_chain->req))
             return TRAINER_SPELL_RED;
     }
 
@@ -4045,11 +4197,11 @@ TrainerSpellState Player::GetTrainerSpellState(TrainerSpell const* trainer_spell
     // secondary prof. or not prof. spell
     uint32 skill = spell->EffectMiscValue[1];
 
-    if(spell->Effect[1] != SPELL_EFFECT_SKILL || !IsPrimaryProfessionSkill(skill))
+    if (spell->Effect[1] != SPELL_EFFECT_SKILL || !IsPrimaryProfessionSkill(skill))
         return TRAINER_SPELL_GREEN;
 
     // check primary prof. limit
-    if(sSpellMgr.IsPrimaryProfessionFirstRankSpell(spell->Id) && GetFreePrimaryProfessionPoints() == 0)
+    if (sSpellMgr.IsPrimaryProfessionFirstRankSpell(spell->Id) && GetFreePrimaryProfessionPoints() == 0)
         return TRAINER_SPELL_GREEN_DISABLED;
 
     return TRAINER_SPELL_GREEN;
@@ -4080,7 +4232,7 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
     if (deleteFinally || Player::GetLevelFromDB(playerguid) < charDelete_minLvl)
         charDelete_method = 0;
 
-    uint32 lowguid = playerguid.GetCounter();
+    uint32 lowGuid = playerguid.GetCounter();
 
     // convert corpse to bones if exist (to prevent exiting Corpse in World without DB entry)
     // bones will be deleted by corpse/bones deleting thread shortly
@@ -4103,30 +4255,34 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
     LeaveAllArenaTeams(playerguid);
 
     // the player was uninvited already on logout so just remove from group
-    QueryResult *resultGroup = CharacterDatabase.PQuery("SELECT groupId FROM group_member WHERE memberGuid='%u'", lowguid);
+    QueryResult* resultGroup = CharacterDatabase.PQuery("SELECT groupId FROM group_member WHERE memberGuid = %u", lowGuid);
     if (resultGroup)
     {
         uint32 groupId = (*resultGroup)[0].GetUInt32();
         delete resultGroup;
-        if (Group* group = sObjectMgr.GetGroupById(groupId))
-            RemoveFromGroup(group, playerguid);
+        ObjectGuid groupGuid = ObjectGuid(HIGHGUID_GROUP, groupId);
+
+        if (Group* group = sObjectMgr.GetGroup(groupGuid))
+        {
+            group->RemoveMember(playerguid, 0);
+        }
     }
 
     // remove signs from petitions (also remove petitions if owner);
     RemovePetitionsAndSigns(playerguid, 10);
 
-    switch(charDelete_method)
+    switch (charDelete_method)
     {
         // completely remove from the database
         case 0:
         {
-            // return back all mails with COD and Item                 0  1           2              3      4       5    6     7
-            QueryResult *resultMail = CharacterDatabase.PQuery("SELECT id,messageType,mailTemplateId,sender,subject,body,money,has_items FROM mail WHERE receiver='%u' AND has_items<>0 AND cod<>0", lowguid);
+            // return back all mails with COD and Item                 0   1            2               3       4        5     6      7
+            QueryResult* resultMail = CharacterDatabase.PQuery("SELECT id, messageType, mailTemplateId, sender, subject, body, money, has_items FROM mail WHERE receiver = %u AND has_items <> 0 AND cod <> 0", lowGuid);
             if (resultMail)
             {
                 do
                 {
-                    Field *fields = resultMail->Fetch();
+                    Field* fields = resultMail->Fetch();
 
                     uint32 mail_id       = fields[0].GetUInt32();
                     uint16 mailType      = fields[1].GetUInt16();
@@ -4137,15 +4293,15 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
                     uint32 money         = fields[6].GetUInt32();
                     bool has_items       = fields[7].GetBool();
 
-                    //we can return mail now
-                    //so firstly delete the old one
-                    CharacterDatabase.PExecute("DELETE FROM mail WHERE id = '%u'", mail_id);
+                    // we can return mail now
+                    // so firstly delete the old one
+                    CharacterDatabase.PExecute("DELETE FROM mail WHERE id = %u", mail_id);
 
                     // mail not from player
                     if (mailType != MAIL_NORMAL)
                     {
-                        if(has_items)
-                            CharacterDatabase.PExecute("DELETE FROM mail_items WHERE mail_id = '%u'", mail_id);
+                        if (has_items)
+                            CharacterDatabase.PExecute("DELETE FROM mail_items WHERE mail_id = %u", mail_id);
                         continue;
                     }
 
@@ -4158,13 +4314,13 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
                     if (has_items)
                     {
                         // data needs to be at first place for Item::LoadFromDB
-                        //                                                          0    1    2         3
-                        QueryResult *resultItems = CharacterDatabase.PQuery("SELECT data,text,item_guid,item_template FROM mail_items JOIN item_instance ON item_guid = guid WHERE mail_id='%u'", mail_id);
+                        //                                                          0     1     2          3
+                        QueryResult* resultItems = CharacterDatabase.PQuery("SELECT data, text, item_guid, item_template FROM mail_items JOIN item_instance ON item_guid = guid WHERE mail_id = %u", mail_id);
                         if (resultItems)
                         {
                             do
                             {
-                                Field *fields2 = resultItems->Fetch();
+                                Field* fields2 = resultItems->Fetch();
 
                                 uint32 item_guidlow = fields2[2].GetUInt32();
                                 uint32 item_template = fields2[3].GetUInt32();
@@ -4172,15 +4328,15 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
                                 ItemPrototype const* itemProto = ObjectMgr::GetItemPrototype(item_template);
                                 if (!itemProto)
                                 {
-                                    CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid = '%u'", item_guidlow);
+                                    Item::DeleteFromDB(item_guidlow);
                                     continue;
                                 }
 
-                                Item *pItem = NewItemOrBag(itemProto);
+                                Item* pItem = NewItemOrBag(itemProto);
                                 if (!pItem->LoadFromDB(item_guidlow, fields2, playerguid))
                                 {
                                     pItem->FSetState(ITEM_REMOVED);
-                                    pItem->SaveToDB();              // it also deletes item object !
+                                    pItem->SaveToDB();              // it also deletes item object!
                                     continue;
                                 }
 
@@ -4192,9 +4348,9 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
                         }
                     }
 
-                    CharacterDatabase.PExecute("DELETE FROM mail_items WHERE mail_id = '%u'", mail_id);
+                    CharacterDatabase.PExecute("DELETE FROM mail_items WHERE mail_id = %u", mail_id);
 
-                    uint32 pl_account = sObjectMgr.GetPlayerAccountIdByGUID(playerguid);
+                    uint32 pl_account = sAccountMgr.GetPlayerAccountIdByGUID(playerguid);
 
                     draft.SetMoney(money).SendReturnToSender(pl_account, playerguid, ObjectGuid(HIGHGUID_PLAYER, sender));
                 }
@@ -4205,10 +4361,10 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
 
             // unsummon and delete for pets in world is not required: player deleted from CLI or character list with not loaded pet.
             // Get guids of character's pets, will deleted in transaction
-            QueryResult *resultPets = CharacterDatabase.PQuery("SELECT id FROM character_pet WHERE owner = '%u'", lowguid);
+            QueryResult* resultPets = CharacterDatabase.PQuery("SELECT id FROM character_pet WHERE owner = %u", lowGuid);
 
             // delete char from friends list when selected chars is online (non existing - error)
-            QueryResult *resultFriend = CharacterDatabase.PQuery("SELECT DISTINCT guid FROM character_social WHERE friend = '%u'", lowguid);
+            QueryResult* resultFriend = CharacterDatabase.PQuery("SELECT DISTINCT guid FROM character_social WHERE friend = %u", lowGuid);
 
             // NOW we can finally clear other DB data related to character
             CharacterDatabase.BeginTransaction();
@@ -4216,11 +4372,12 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
             {
                 do
                 {
-                    Field *fields3 = resultPets->Fetch();
+                    Field* fields3 = resultPets->Fetch();
                     uint32 petguidlow = fields3[0].GetUInt32();
-                    //do not create separate transaction for pet delete otherwise we will get fatal error!
+                    // do not create separate transaction for pet delete otherwise we will get fatal error!
                     Pet::DeleteFromDB(petguidlow, false);
-                } while (resultPets->NextRow());
+                }
+                while (resultPets->NextRow());
                 delete resultPets;
             }
 
@@ -4238,55 +4395,74 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
                             sSocialMgr.SendFriendStatus(sFriend, FRIEND_REMOVED, playerguid, false);
                         }
                     }
-                } while (resultFriend->NextRow());
+                }
+                while (resultFriend->NextRow());
                 delete resultFriend;
             }
 
-            CharacterDatabase.PExecute("DELETE FROM characters WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_account_data WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_action WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_aura WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_battleground_data WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_gifts WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_glyphs WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_homebind WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM group_instance WHERE leaderGuid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_queststatus WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_queststatus_daily WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_queststatus_weekly WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_reputation WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_skills WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_spell WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_spell_cooldown WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_ticket WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM item_instance WHERE owner_guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_social WHERE guid = '%u' OR friend='%u'", lowguid, lowguid);
-            CharacterDatabase.PExecute("DELETE FROM mail WHERE receiver = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM mail_items WHERE receiver = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_pet WHERE owner = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_pet_declinedname WHERE owner = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM character_equipmentsets WHERE guid = '%u'", lowguid);
-            CharacterDatabase.PExecute("DELETE FROM guild_eventlog WHERE PlayerGuid1 = '%u' OR PlayerGuid2 = '%u'", lowguid, lowguid);
-            CharacterDatabase.PExecute("DELETE FROM guild_bank_eventlog WHERE PlayerGuid = '%u'", lowguid);
+            // wow armory begin
+            CharacterDatabase.PExecute("DELETE FROM armory_character_stats WHERE guid = '%u'", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_feed_log WHERE guid = '%u'", lowGuid);
+            // wow armory end
+            CharacterDatabase.PExecute("DELETE FROM characters WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_account_data WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_action WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_aura WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_battleground_data WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_battleground_random WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_gifts WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_glyphs WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_homebind WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM group_instance WHERE leaderGuid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM group_member WHERE groupId = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM group_member WHERE memberGuid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM groups WHERE leaderGuid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_queststatus WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_queststatus_daily WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_queststatus_weekly WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_reputation WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_skills WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_spell WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_spell_cooldown WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_stats WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_ticket WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM item_instance WHERE owner_guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_social WHERE guid = %u OR friend = %u", lowGuid, lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM mail WHERE receiver = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM mail_items WHERE receiver = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_pet WHERE owner = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_pet_declinedname WHERE owner = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM character_equipmentsets WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM guild_eventlog WHERE PlayerGuid1 = %u OR PlayerGuid2 = %u", lowGuid, lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM guild_bank_eventlog WHERE PlayerGuid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM hidden_rating WHERE guid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM item_refund_instance WHERE playerGuid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM calendar_invites WHERE inviteeGuid = %u", lowGuid);
+            CharacterDatabase.PExecute("DELETE FROM calendar_invites WHERE senderGuid = %u", lowGuid);
+
             CharacterDatabase.CommitTransaction();
             break;
         }
+
         // The character gets unlinked from the account, the name gets freed up and appears as deleted ingame
         case 1:
-            CharacterDatabase.PExecute("UPDATE characters SET deleteInfos_Name=name, deleteInfos_Account=account, deleteDate='" UI64FMTD "', name='', account=0 WHERE guid=%u", uint64(time(NULL)), lowguid);
+            CharacterDatabase.PExecute("UPDATE characters SET deleteInfos_Name = name, deleteInfos_Account = account, deleteDate = '" UI64FMTD "', name = '', account = 0 WHERE guid = %u", uint64(time(NULL)), lowGuid);
             break;
         default:
             sLog.outError("Player::DeleteFromDB: Unsupported delete method: %u.", charDelete_method);
+            break;
     }
 
+    sAccountMgr.ClearPlayerDataCache(playerguid);
+
     if (updateRealmChars)
-        sWorld.UpdateRealmCharCount(accountId);
+        sAccountMgr.UpdateCharactersCount(accountId, sWorld.getConfig(CONFIG_UINT32_REALMID));
 }
 
 /**
@@ -4314,36 +4490,35 @@ void Player::DeleteOldCharacters(uint32 keepDays)
 {
     sLog.outString("Player::DeleteOldChars: Deleting all characters which have been deleted %u days before...", keepDays);
 
-    QueryResult *resultChars = CharacterDatabase.PQuery("SELECT guid, deleteInfos_Account FROM characters WHERE deleteDate IS NOT NULL AND deleteDate < '" UI64FMTD "'", uint64(time(NULL) - time_t(keepDays * DAY)));
+    QueryResult* resultChars = CharacterDatabase.PQuery("SELECT guid, deleteInfos_Account FROM characters WHERE deleteDate IS NOT NULL AND deleteDate < '" UI64FMTD "'", uint64(time(NULL) - time_t(keepDays * DAY)));
     if (resultChars)
     {
-        sLog.outString("Player::DeleteOldChars: Found %u character(s) to delete",uint32(resultChars->GetRowCount()));
+        sLog.outString("Player::DeleteOldChars: Found %u character(s) to delete", uint32(resultChars->GetRowCount()));
         do
         {
-            Field *charFields = resultChars->Fetch();
+            Field* charFields = resultChars->Fetch();
             ObjectGuid guid = ObjectGuid(HIGHGUID_PLAYER, charFields[0].GetUInt32());
             Player::DeleteFromDB(guid, charFields[1].GetUInt32(), true, true);
-        } while(resultChars->NextRow());
+        }
+        while (resultChars->NextRow());
         delete resultChars;
     }
 }
 
-void Player::SetMovement(PlayerMovementType pType)
+void Player::SetRoot(bool enable)
 {
-    WorldPacket data;
-    switch(pType)
-    {
-        case MOVE_ROOT:       data.Initialize(SMSG_FORCE_MOVE_ROOT,   GetPackGUID().size()+4); break;
-        case MOVE_UNROOT:     data.Initialize(SMSG_FORCE_MOVE_UNROOT, GetPackGUID().size()+4); break;
-        case MOVE_WATER_WALK: data.Initialize(SMSG_MOVE_WATER_WALK,   GetPackGUID().size()+4); break;
-        case MOVE_LAND_WALK:  data.Initialize(SMSG_MOVE_LAND_WALK,    GetPackGUID().size()+4); break;
-        default:
-            sLog.outError("Player::SetMovement: Unsupported move type (%d), data not sent to client.",pType);
-            return;
-    }
+    WorldPacket data(enable ? SMSG_FORCE_MOVE_ROOT : SMSG_FORCE_MOVE_UNROOT, GetPackGUID().size() + 4);
     data << GetPackGUID();
     data << uint32(0);
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
+}
+
+void Player::SetWaterWalk(bool enable)
+{
+    WorldPacket data(enable ? SMSG_MOVE_WATER_WALK : SMSG_MOVE_LAND_WALK, GetPackGUID().size() + 4);
+    data << GetPackGUID();
+    data << uint32(0);
+    GetSession()->SendPacket(&data);
 }
 
 /* Preconditions:
@@ -4356,7 +4531,7 @@ void Player::BuildPlayerRepop()
     data << GetPackGUID();
     GetSession()->SendPacket(&data);
 
-    if(getRace() == RACE_NIGHTELF)
+    if (getRace() == RACE_NIGHTELF)
         CastSpell(this, 20584, true);                       // auras SPELL_AURA_INCREASE_SPEED(+speed in wisp form), SPELL_AURA_INCREASE_SWIM_SPEED(+swim speed in wisp form), SPELL_AURA_TRANSFORM (to wisp form)
     CastSpell(this, 8326, true);                            // auras SPELL_AURA_GHOST, SPELL_AURA_INCREASE_SPEED(why?), SPELL_AURA_INCREASE_SWIM_SPEED(why?)
 
@@ -4365,32 +4540,35 @@ void Player::BuildPlayerRepop()
     // there we must send 888 opcode
 
     // the player cannot have a corpse already, only bones which are not returned by GetCorpse
-    if(GetCorpse())
+    if (GetCorpse())
     {
-        sLog.outError("BuildPlayerRepop: player %s(%d) already has a corpse", GetName(), GetGUIDLow());
-        MANGOS_ASSERT(false);
+        sLog.outError("Player::BuildPlayerRepop: %s already has a corpse", GetGuidStr().c_str());
+        sLog.outError("Removing %s corpse from DB", GetGuidStr().c_str());
+        CharacterDatabase.PExecute("DELETE FROM corpse WHERE player = %u", GetGUIDLow());
     }
 
     // create a corpse and place it at the player's location
     Corpse *corpse = CreateCorpse();
-    if(!corpse)
+    if (!corpse)
     {
-        sLog.outError("Error creating corpse for Player %s [%u]", GetName(), GetGUIDLow());
+        sLog.outError("Player::BuildPlayerRepop: Error creating corpse for %s", GetGuidStr().c_str());
         return;
     }
     GetMap()->Add(corpse);
 
     // convert player body to ghost
-    SetHealth( 1 );
+    if (getDeathState() != GHOULED)
+        SetHealth(1);
 
-    SetMovement(MOVE_WATER_WALK);
-    if(!GetSession()->isLogingOut())
-        SetMovement(MOVE_UNROOT);
+    SetWaterWalk(true);
+    if (!GetSession()->isLogingOut())
+        SetRoot(false);
 
     // BG - remove insignia related
     RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
 
-    SendCorpseReclaimDelay();
+    if (getDeathState() != GHOULED)
+        SendCorpseReclaimDelay();
 
     // to prevent cheating
     corpse->ResetGhostTime();
@@ -4401,9 +4579,9 @@ void Player::BuildPlayerRepop()
     SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND);
 }
 
-void Player::ResurrectPlayer(float restore_percent, bool applySickness)
+void Player::ResurrectPlayer(uint32 restorePercent, bool applySickness)
 {
-    WorldPacket data(SMSG_DEATH_RELEASE_LOC, 4*4);          // remove spirit healer position
+    WorldPacket data(SMSG_DEATH_RELEASE_LOC, 4 * 4);        // remove spirit healer position
     data << uint32(-1);
     data << float(0);
     data << float(0);
@@ -4417,22 +4595,29 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
 
     SetDeathState(ALIVE);
 
-    if(getRace() == RACE_NIGHTELF)
+    if (getRace() == RACE_NIGHTELF)
         RemoveAurasDueToSpell(20584);                       // speed bonuses
     RemoveAurasDueToSpell(8326);                            // SPELL_AURA_GHOST
 
-    SetMovement(MOVE_LAND_WALK);
-    SetMovement(MOVE_UNROOT);
+    // refer-a-friend flag - maybe wrong and hacky
+    if (GetAccountLinkedState() != STATE_NOT_LINKED)
+        SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_REFER_A_FRIEND);
+
+    SetWaterWalk(false);
+    SetRoot(false);
 
     m_deathTimer = 0;
 
+    if (restorePercent > 100)
+        restorePercent = 100;
+
     // set health/powers (0- will be set in caller)
-    if(restore_percent>0.0f)
+    if (restorePercent > 0)
     {
-        SetHealth(uint32(GetMaxHealth()*restore_percent));
-        SetPower(POWER_MANA, uint32(GetMaxPower(POWER_MANA)*restore_percent));
+        SetHealth(GetMaxHealth() * restorePercent / 100);
+        SetPower(POWER_MANA, GetMaxPower(POWER_MANA) * restorePercent / 100);
         SetPower(POWER_RAGE, 0);
-        SetPower(POWER_ENERGY, uint32(GetMaxPower(POWER_ENERGY)*restore_percent));
+        SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY) * restorePercent / 100);
     }
 
     // trigger update zone for alive state zone updates
@@ -4441,30 +4626,37 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
     UpdateZone(newzone,newarea);
 
     // update visibility of world around viewpoint
-    m_camera.UpdateVisibilityForOwner();
+    GetCamera()->UpdateVisibilityForOwner();
     // update visibility of player for nearby cameras
     UpdateObjectVisibility();
 
-    if(!applySickness)
+    if (!applySickness)
+    {
+        if (Map* map = GetMap())
+        {
+            if (!map->Instanceable())
+                CastSpell(this, SPELL_ID_HONORLESS_TARGET, true);
+        }
         return;
+    }
 
-    //Characters from level 1-10 are not affected by resurrection sickness.
-    //Characters from level 11-19 will suffer from one minute of sickness
-    //for each level they are above 10.
-    //Characters level 20 and up suffer from ten minutes of sickness.
+    // Characters from level 1-10 are not affected by resurrection sickness.
+    // Characters from level 11-19 will suffer from one minute of sickness
+    // for each level they are above 10.
+    // Characters level 20 and up suffer from ten minutes of sickness.
     int32 startLevel = sWorld.getConfig(CONFIG_INT32_DEATH_SICKNESS_LEVEL);
 
-    if(int32(getLevel()) >= startLevel)
+    if (int32(getLevel()) >= startLevel)
     {
         // set resurrection sickness
-        CastSpell(this,SPELL_ID_PASSIVE_RESURRECTION_SICKNESS,true);
+        CastSpell(this, SPELL_ID_PASSIVE_RESURRECTION_SICKNESS, true);
 
         // not full duration
-        if(int32(getLevel()) < startLevel+9)
+        if (int32(getLevel()) < startLevel + 9)
         {
-            int32 delta = (int32(getLevel()) - startLevel + 1)*MINUTE;
+            int32 delta = (int32(getLevel()) - startLevel + 1) * MINUTE;
 
-            if (SpellAuraHolder* holder = GetSpellAuraHolder(SPELL_ID_PASSIVE_RESURRECTION_SICKNESS))
+            if (SpellAuraHolderPtr holder = GetSpellAuraHolder(SPELL_ID_PASSIVE_RESURRECTION_SICKNESS))
             {
                 holder->SetAuraDuration(delta*IN_MILLISECONDS);
                 holder->SendAuraUpdate(false);
@@ -4475,18 +4667,17 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
 
 void Player::KillPlayer()
 {
-    SetMovement(MOVE_ROOT);
-
-    StopMirrorTimers();                                     //disable timers(bars)
+    SetRoot(true);
+    StopMirrorTimers();                                     // disable timers(bars)
 
     SetDeathState(CORPSE);
-    //SetFlag( UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_IN_PVP );
+    // SetFlag( UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_IN_PVP );
 
     SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE);
     ApplyModByteFlag(PLAYER_FIELD_BYTES, 0, PLAYER_FIELD_BYTE_RELEASE_TIMER, !sMapStore.LookupEntry(GetMapId())->Instanceable());
 
     // 6 minutes until repop at graveyard
-    m_deathTimer = 6*MINUTE*IN_MILLISECONDS;
+    m_deathTimer = 6 * MINUTE * IN_MILLISECONDS;
 
     UpdateCorpseReclaimDelay();                             // dependent at use SetDeathPvP() call before kill
 
@@ -4501,7 +4692,7 @@ Corpse* Player::CreateCorpse()
     // prevent existence 2 corpse for player
     SpawnCorpseBones();
 
-    Corpse *corpse = new Corpse( (m_ExtraFlags & PLAYER_EXTRA_PVP_DEATH) ? CORPSE_RESURRECTABLE_PVP : CORPSE_RESURRECTABLE_PVE );
+    Corpse* corpse = new Corpse((m_ExtraFlags & PLAYER_EXTRA_PVP_DEATH) ? CORPSE_RESURRECTABLE_PVP : CORPSE_RESURRECTABLE_PVE);
     SetPvPDeath(false);
 
     if (!corpse->Create(sObjectMgr.GenerateCorpseLowGuid(), this))
@@ -4532,11 +4723,11 @@ Corpse* Player::CreateCorpse()
         flags |= CORPSE_FLAG_HIDE_CLOAK;
     if (InBattleGround() && !InArena())
         flags |= CORPSE_FLAG_LOOTABLE;                      // to be able to remove insignia
-    corpse->SetUInt32Value( CORPSE_FIELD_FLAGS, flags );
+    corpse->SetUInt32Value(CORPSE_FIELD_FLAGS, flags);
 
-    corpse->SetUInt32Value( CORPSE_FIELD_DISPLAY_ID, GetNativeDisplayId() );
+    corpse->SetUInt32Value(CORPSE_FIELD_DISPLAY_ID, GetNativeDisplayId());
 
-    corpse->SetUInt32Value( CORPSE_FIELD_GUILD, GetGuildId() );
+    corpse->SetUInt32Value(CORPSE_FIELD_GUILD, GetGuildId());
 
     uint32 iDisplayID;
     uint32 iIventoryType;
@@ -4548,7 +4739,7 @@ Corpse* Player::CreateCorpse()
             iDisplayID = m_items[i]->GetProto()->DisplayInfoID;
             iIventoryType = m_items[i]->GetProto()->InventoryType;
 
-            _cfi =  iDisplayID | (iIventoryType << 24);
+            _cfi = iDisplayID | (iIventoryType << 24);
             corpse->SetUInt32Value(CORPSE_FIELD_ITEM + i, _cfi);
         }
     }
@@ -4564,7 +4755,7 @@ Corpse* Player::CreateCorpse()
 
 void Player::SpawnCorpseBones()
 {
-    if(sObjectAccessor.ConvertCorpseForPlayer(GetObjectGuid()))
+    if (sObjectAccessor.ConvertCorpseForPlayer(GetObjectGuid()))
         if (!GetSession()->PlayerLogoutWithSave())          // at logout we will already store the player
             SaveToDB();                                     // prevent loading as ghost without corpse
 }
@@ -4576,71 +4767,71 @@ Corpse* Player::GetCorpse() const
 
 void Player::DurabilityLossAll(double percent, bool inventory)
 {
-    for(int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
-        if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
-            DurabilityLoss(pItem,percent);
+    for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            DurabilityLoss(pItem, percent);
 
-    if(inventory)
+    if (inventory)
     {
         // bags not have durability
-        // for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        // for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
 
-        for(int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
-            if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
-                DurabilityLoss(pItem,percent);
+        for (int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+            if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                DurabilityLoss(pItem, percent);
 
         // keys not have durability
-        //for(int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; ++i)
+        //for (int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; ++i)
 
-        for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
-            if(Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
-                for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
-                    if(Item* pItem = GetItemByPos( i, j ))
-                        DurabilityLoss(pItem,percent);
+        for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+            if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
+                    if (Item* pItem = GetItemByPos(i, j))
+                        DurabilityLoss(pItem, percent);
     }
 }
 
 void Player::DurabilityLoss(Item* item, double percent)
 {
-    if(!item )
+    if (!item)
         return;
 
     uint32 pMaxDurability =  item ->GetUInt32Value(ITEM_FIELD_MAXDURABILITY);
 
-    if(!pMaxDurability)
+    if (!pMaxDurability)
         return;
 
-    uint32 pDurabilityLoss = uint32(pMaxDurability*percent);
+    uint32 pDurabilityLoss = uint32(pMaxDurability * percent);
 
-    if(pDurabilityLoss < 1 )
+    if (pDurabilityLoss < 1)
         pDurabilityLoss = 1;
 
-    DurabilityPointsLoss(item,pDurabilityLoss);
+    DurabilityPointsLoss(item, pDurabilityLoss);
 }
 
 void Player::DurabilityPointsLossAll(int32 points, bool inventory)
 {
-    for(int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
-        if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
-            DurabilityPointsLoss(pItem,points);
+    for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            DurabilityPointsLoss(pItem, points);
 
-    if(inventory)
+    if (inventory)
     {
         // bags not have durability
-        // for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        // for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
 
-        for(int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
-            if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
-                DurabilityPointsLoss(pItem,points);
+        for (int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+            if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                DurabilityPointsLoss(pItem, points);
 
         // keys not have durability
-        //for(int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; ++i)
+        //for (int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; ++i)
 
-        for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
-            if(Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
-                for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
-                    if(Item* pItem = GetItemByPos( i, j ))
-                        DurabilityPointsLoss(pItem,points);
+        for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+            if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
+                    if (Item* pItem = GetItemByPos(i, j))
+                        DurabilityPointsLoss(pItem, points);
     }
 }
 
@@ -4658,14 +4849,14 @@ void Player::DurabilityPointsLoss(Item* item, int32 points)
     if (pOldDurability != pNewDurability)
     {
         // modify item stats _before_ Durability set to 0 to pass _ApplyItemMods internal check
-        if ( pNewDurability == 0 && pOldDurability > 0 && item->IsEquipped())
-            _ApplyItemMods(item,item->GetSlot(), false);
+        if (pNewDurability == 0 && pOldDurability > 0 && item->IsEquipped())
+            _ApplyItemMods(item, item->GetSlot(), false);
 
         item->SetUInt32Value(ITEM_FIELD_DURABILITY, pNewDurability);
 
         // modify item stats _after_ restore durability to pass _ApplyItemMods internal check
-        if ( pNewDurability > 0 && pOldDurability == 0 && item->IsEquipped())
-            _ApplyItemMods(item,item->GetSlot(), true);
+        if (pNewDurability > 0 && pOldDurability == 0 && item->IsEquipped())
+            _ApplyItemMods(item, item->GetSlot(), true);
 
         item->SetState(ITEM_CHANGED, this);
     }
@@ -4673,23 +4864,23 @@ void Player::DurabilityPointsLoss(Item* item, int32 points)
 
 void Player::DurabilityPointLossForEquipSlot(EquipmentSlots slot)
 {
-    if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, slot ))
-        DurabilityPointsLoss(pItem,1);
+    if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, slot))
+        DurabilityPointsLoss(pItem, 1);
 }
 
 uint32 Player::DurabilityRepairAll(bool cost, float discountMod, bool guildBank)
 {
     uint32 TotalCost = 0;
     // equipped, backpack, bags itself
-    for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
-        TotalCost += DurabilityRepair(( (INVENTORY_SLOT_BAG_0 << 8) | i ),cost,discountMod, guildBank);
+    for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+        TotalCost += DurabilityRepair(((INVENTORY_SLOT_BAG_0 << 8) | i), cost, discountMod, guildBank);
 
     // bank, buyback and keys not repaired
 
     // items in inventory bags
-    for(int j = INVENTORY_SLOT_BAG_START; j < INVENTORY_SLOT_BAG_END; ++j)
-        for(int i = 0; i < MAX_BAG_SIZE; ++i)
-            TotalCost += DurabilityRepair(( (j << 8) | i ),cost,discountMod, guildBank);
+    for (int j = INVENTORY_SLOT_BAG_START; j < INVENTORY_SLOT_BAG_END; ++j)
+        for (int i = 0; i < MAX_BAG_SIZE; ++i)
+            TotalCost += DurabilityRepair(((j << 8) | i), cost, discountMod, guildBank);
     return TotalCost;
 }
 
@@ -4698,48 +4889,48 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g
     Item* item = GetItemByPos(pos);
 
     uint32 TotalCost = 0;
-    if(!item)
+    if (!item)
         return TotalCost;
 
     uint32 maxDurability = item->GetUInt32Value(ITEM_FIELD_MAXDURABILITY);
-    if(!maxDurability)
+    if (!maxDurability)
         return TotalCost;
 
     uint32 curDurability = item->GetUInt32Value(ITEM_FIELD_DURABILITY);
 
-    if(cost)
+    if (cost)
     {
         uint32 LostDurability = maxDurability - curDurability;
-        if(LostDurability>0)
+        if (LostDurability > 0)
         {
-            ItemPrototype const *ditemProto = item->GetProto();
+            ItemPrototype const* ditemProto = item->GetProto();
 
-            DurabilityCostsEntry const *dcost = sDurabilityCostsStore.LookupEntry(ditemProto->ItemLevel);
-            if(!dcost)
+            DurabilityCostsEntry const* dcost = sDurabilityCostsStore.LookupEntry(ditemProto->ItemLevel);
+            if (!dcost)
             {
                 sLog.outError("RepairDurability: Wrong item lvl %u", ditemProto->ItemLevel);
                 return TotalCost;
             }
 
-            uint32 dQualitymodEntryId = (ditemProto->Quality+1)*2;
-            DurabilityQualityEntry const *dQualitymodEntry = sDurabilityQualityStore.LookupEntry(dQualitymodEntryId);
-            if(!dQualitymodEntry)
+            uint32 dQualitymodEntryId = (ditemProto->Quality + 1) * 2;
+            DurabilityQualityEntry const* dQualitymodEntry = sDurabilityQualityStore.LookupEntry(dQualitymodEntryId);
+            if (!dQualitymodEntry)
             {
                 sLog.outError("RepairDurability: Wrong dQualityModEntry %u", dQualitymodEntryId);
                 return TotalCost;
             }
 
-            uint32 dmultiplier = dcost->multiplier[ItemSubClassToDurabilityMultiplierId(ditemProto->Class,ditemProto->SubClass)];
-            uint32 costs = uint32(LostDurability*dmultiplier*double(dQualitymodEntry->quality_mod));
+            uint32 dmultiplier = dcost->multiplier[ItemSubClassToDurabilityMultiplierId(ditemProto->Class, ditemProto->SubClass)];
+            uint32 costs = uint32(LostDurability * dmultiplier * double(dQualitymodEntry->quality_mod));
 
             costs = uint32(costs * discountMod);
 
-            if (costs==0)                                   //fix for ITEM_QUALITY_ARTIFACT
+            if (costs == 0)                                 // fix for ITEM_QUALITY_ARTIFACT
                 costs = 1;
 
             if (guildBank)
             {
-                if (GetGuildId()==0)
+                if (GetGuildId() == 0)
                 {
                     DEBUG_LOG("You are not member of a guild");
                     return TotalCost;
@@ -4776,7 +4967,7 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g
                 return TotalCost;
             }
             else
-                ModifyMoney( -int32(costs) );
+                ModifyMoney(-int32(costs));
         }
     }
 
@@ -4784,8 +4975,8 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g
     item->SetState(ITEM_CHANGED, this);
 
     // reapply mods for total broken and repaired item if equipped
-    if(IsEquipmentPos(pos) && !curDurability)
-        _ApplyItemMods(item,pos & 255, true);
+    if (IsEquipmentPos(pos) && !curDurability)
+        _ApplyItemMods(item, pos & 255, true);
     return TotalCost;
 }
 
@@ -4794,49 +4985,52 @@ void Player::RepopAtGraveyard()
     // note: this can be called also when the player is alive
     // for example from WorldSession::HandleMovementOpcodes
 
-    AreaTableEntry const *zone = GetAreaEntryByAreaID(GetAreaId());
+    AreaTableEntry const* zone = GetAreaEntryByAreaID(GetAreaId());
 
     // Such zones are considered unreachable as a ghost and the player must be automatically revived
-    if ((!isAlive() && zone && zone->flags & AREA_FLAG_NEED_FLY) || GetTransport())
+    if ((!isAlive() && zone && (zone->flags & AREA_FLAG_NEED_FLY)) || IsOnTransport() || GetPositionZ() < -500.0f)
     {
-        ResurrectPlayer(0.5f);
+        ResurrectPlayer(50);
         SpawnCorpseBones();
     }
 
-    WorldSafeLocsEntry const *ClosestGrave = NULL;
+    WorldSafeLocsEntry const* ClosestGrave = NULL;
 
     // Special handle for battleground maps
-    if( BattleGround *bg = GetBattleGround() )
+    if (BattleGround* bg = GetBattleGround())
         ClosestGrave = bg->GetClosestGraveYard(this);
     else
-        ClosestGrave = sObjectMgr.GetClosestGraveYard( GetPositionX(), GetPositionY(), GetPositionZ(), GetMapId(), GetTeam() );
+        ClosestGrave = sObjectMgr.GetClosestGraveYard(GetPositionX(), GetPositionY(), GetPositionZ(), GetMapId(), GetTeam());
 
     // stop countdown until repop
     m_deathTimer = 0;
 
     // if no grave found, stay at the current location
     // and don't show spirit healer location
-    if(ClosestGrave)
+    if (ClosestGrave)
     {
+        bool updateVisibility = IsInWorld() && GetMap() && GetMapId() == ClosestGrave->map_id;
         TeleportTo(ClosestGrave->map_id, ClosestGrave->x, ClosestGrave->y, ClosestGrave->z, GetOrientation());
-        if(isDead())                                        // not send if alive, because it used in TeleportTo()
+        if (isDead())                                       // not send if alive, because it used in TeleportTo()
         {
-            WorldPacket data(SMSG_DEATH_RELEASE_LOC, 4*4);  // show spirit healer position on minimap
+            WorldPacket data(SMSG_DEATH_RELEASE_LOC, 4 * 4); // show spirit healer position on minimap
             data << ClosestGrave->map_id;
             data << ClosestGrave->x;
             data << ClosestGrave->y;
             data << ClosestGrave->z;
             GetSession()->SendPacket(&data);
         }
+        if (updateVisibility && IsInWorld())
+            UpdateVisibilityAndView();
     }
 }
 
-void Player::JoinedChannel(Channel *c)
+void Player::JoinedChannel(Channel* c)
 {
     m_channels.push_back(c);
 }
 
-void Player::LeftChannel(Channel *c)
+void Player::LeftChannel(Channel* c)
 {
     m_channels.remove(c);
 }
@@ -4847,55 +5041,54 @@ void Player::CleanupChannels()
     {
         Channel* ch = *m_channels.begin();
         m_channels.erase(m_channels.begin());               // remove from player's channel list
-        ch->Leave(GetObjectGuid(), false);                  // not send to client, not remove from player's channel list
+        ch->Leave(this, false);                             // not send to client, not remove from player's channel list
         if (ChannelMgr* cMgr = channelMgr(GetTeam()))
             cMgr->LeftChannel(ch->GetName());               // deleted channel if empty
-
     }
     DEBUG_LOG("Player: channels cleaned up!");
 }
 
-void Player::UpdateLocalChannels(uint32 newZone )
+void Player::UpdateLocalChannels(uint32 newZone)
 {
-    if(m_channels.empty())
+    if (m_channels.empty())
         return;
 
     AreaTableEntry const* current_zone = GetAreaEntryByAreaID(newZone);
-    if(!current_zone)
+    if (!current_zone)
         return;
 
     ChannelMgr* cMgr = channelMgr(GetTeam());
-    if(!cMgr)
+    if (!cMgr)
         return;
 
     std::string current_zone_name = current_zone->area_name[GetSession()->GetSessionDbcLocale()];
 
-    for(JoinedChannelsList::iterator i = m_channels.begin(), next; i != m_channels.end(); i = next)
+    for (JoinedChannelsList::iterator i = m_channels.begin(), next; i != m_channels.end(); i = next)
     {
         next = i; ++next;
 
         // skip non built-in channels
-        if(!(*i)->IsConstant())
+        if (!(*i)->IsConstant())
             continue;
 
         ChatChannelsEntry const* ch = GetChannelEntryFor((*i)->GetChannelId());
-        if(!ch)
+        if (!ch)
             continue;
 
-        if((ch->flags & 4) == 4)                            // global channel without zone name in pattern
+        if ((ch->flags & 4) == 4)                           // global channel without zone name in pattern
             continue;
 
         //  new channel
         char new_channel_name_buf[100];
-        snprintf(new_channel_name_buf,100,ch->pattern[m_session->GetSessionDbcLocale()],current_zone_name.c_str());
-        Channel* new_channel = cMgr->GetJoinChannel(new_channel_name_buf,ch->ChannelID);
+        snprintf(new_channel_name_buf, 100, ch->pattern[m_session->GetSessionDbcLocale()], current_zone_name.c_str());
+        Channel* new_channel = cMgr->GetJoinChannel(new_channel_name_buf, ch->ChannelID);
 
-        if ((*i)!=new_channel)
+        if ((*i) != new_channel)
         {
-            new_channel->Join(GetObjectGuid(),"");          // will output Changed Channel: N. Name
+            new_channel->Join(this, "");                    // will output Changed Channel: N. Name
 
             // leave old channel
-            (*i)->Leave(GetObjectGuid(),false);             // not send leave channel, it already replaced at client
+            (*i)->Leave(this, false);                       // not send leave channel, it already replaced at client
             std::string name = (*i)->GetName();             // store name, (*i)erase in LeftChannel
             LeftChannel(*i);                                // remove from player's channel list
             cMgr->LeftChannel(name);                        // delete if empty
@@ -4906,11 +5099,23 @@ void Player::UpdateLocalChannels(uint32 newZone )
 
 void Player::LeaveLFGChannel()
 {
-    for(JoinedChannelsList::iterator i = m_channels.begin(); i != m_channels.end(); ++i )
+    for (JoinedChannelsList::iterator i = m_channels.begin(); i != m_channels.end(); ++i)
+    {
+        if ((*i)->IsLFG())
+        {
+            (*i)->Leave(this);
+            break;
+        }
+    }
+}
+
+void Player::JoinLFGChannel()
+{
+    for (JoinedChannelsList::iterator i = m_channels.begin(); i != m_channels.end(); ++i)
     {
         if ((*i)->IsLFG())
         {
-            (*i)->Leave(GetObjectGuid());
+            (*i)->Join(this, "");
             break;
         }
     }
@@ -4920,7 +5125,7 @@ void Player::UpdateDefense()
 {
     uint32 defense_skill_gain = sWorld.getConfig(CONFIG_UINT32_SKILL_GAIN_DEFENSE);
 
-    if(UpdateSkill(SKILL_DEFENSE,defense_skill_gain))
+    if (UpdateSkill(SKILL_DEFENSE, defense_skill_gain))
     {
         // update dependent from defense skill part
         UpdateDefenseBonusesMod();
@@ -4929,7 +5134,7 @@ void Player::UpdateDefense()
 
 void Player::HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, float amount, bool apply)
 {
-    if(modGroup >= BASEMOD_END || modType >= MOD_END)
+    if (modGroup >= BASEMOD_END || modType >= MOD_END)
     {
         sLog.outError("ERROR in HandleBaseModValue(): nonexistent BaseModGroup of wrong BaseModType!");
         return;
@@ -4937,24 +5142,33 @@ void Player::HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, floa
 
     float val = 1.0f;
 
-    switch(modType)
+    switch (modType)
     {
         case FLAT_MOD:
             m_auraBaseMod[modGroup][modType] += apply ? amount : -amount;
             break;
         case PCT_MOD:
-            if(amount <= -100.0f)
+            if (amount <= -100.0f)
                 amount = -200.0f;
 
-            val = (100.0f + amount) / 100.0f;
-            m_auraBaseMod[modGroup][modType] *= apply ? val : (1.0f/val);
+            // Shield Block Value PCT_MODs should be added, not multiplied
+            if (modGroup == SHIELD_BLOCK_VALUE)
+            {
+                val = amount / 100.0f;
+                m_auraBaseMod[modGroup][modType] += apply ? val : -val;
+            }
+            else
+            {
+                val = (100.0f + amount) / 100.0f;
+                m_auraBaseMod[modGroup][modType] *= apply ? val : (1.0f/val);
+            }
             break;
     }
 
-    if(!CanModifyStats())
+    if (!CanModifyStats())
         return;
 
-    switch(modGroup)
+    switch (modGroup)
     {
         case CRIT_PERCENTAGE:              UpdateCritPercentage(BASE_ATTACK);                          break;
         case RANGED_CRIT_PERCENTAGE:       UpdateCritPercentage(RANGED_ATTACK);                        break;
@@ -4966,13 +5180,13 @@ void Player::HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, floa
 
 float Player::GetBaseModValue(BaseModGroup modGroup, BaseModType modType) const
 {
-    if(modGroup >= BASEMOD_END || modType > MOD_END)
+    if (modGroup >= BASEMOD_END || modType > MOD_END)
     {
         sLog.outError("trial to access nonexistent BaseModGroup or wrong BaseModType!");
         return 0.0f;
     }
 
-    if(modType == PCT_MOD && m_auraBaseMod[modGroup][PCT_MOD] <= 0.0f)
+    if (modType == PCT_MOD && m_auraBaseMod[modGroup][PCT_MOD] <= 0.0f)
         return 0.0f;
 
     return m_auraBaseMod[modGroup][modType];
@@ -4980,13 +5194,13 @@ float Player::GetBaseModValue(BaseModGroup modGroup, BaseModType modType) const
 
 float Player::GetTotalBaseModValue(BaseModGroup modGroup) const
 {
-    if(modGroup >= BASEMOD_END)
+    if (modGroup >= BASEMOD_END)
     {
         sLog.outError("wrong BaseModGroup in GetTotalBaseModValue()!");
         return 0.0f;
     }
 
-    if(m_auraBaseMod[modGroup][PCT_MOD] <= 0.0f)
+    if (m_auraBaseMod[modGroup][PCT_MOD] <= 0.0f)
         return 0.0f;
 
     return m_auraBaseMod[modGroup][FLAT_MOD] * m_auraBaseMod[modGroup][PCT_MOD];
@@ -4994,7 +5208,7 @@ float Player::GetTotalBaseModValue(BaseModGroup modGroup) const
 
 uint32 Player::GetShieldBlockValue() const
 {
-    float value = (m_auraBaseMod[SHIELD_BLOCK_VALUE][FLAT_MOD] + GetStat(STAT_STRENGTH) * 0.5f - 10)*m_auraBaseMod[SHIELD_BLOCK_VALUE][PCT_MOD];
+    float value = (m_auraBaseMod[SHIELD_BLOCK_VALUE][FLAT_MOD] + GetStat(STAT_STRENGTH) * 0.5f - 10) * m_auraBaseMod[SHIELD_BLOCK_VALUE][PCT_MOD];
 
     value = (value < 0) ? 0 : value;
 
@@ -5006,18 +5220,19 @@ float Player::GetMeleeCritFromAgility()
     uint32 level = getLevel();
     uint32 pclass = getClass();
 
-    if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
+    if (level > GT_MAX_LEVEL)
+        level = GT_MAX_LEVEL;
 
-    GtChanceToMeleeCritBaseEntry const *critBase  = sGtChanceToMeleeCritBaseStore.LookupEntry(pclass-1);
-    GtChanceToMeleeCritEntry     const *critRatio = sGtChanceToMeleeCritStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
-    if (critBase==NULL || critRatio==NULL)
+    GtChanceToMeleeCritBaseEntry const* critBase  = sGtChanceToMeleeCritBaseStore.LookupEntry(pclass - 1);
+    GtChanceToMeleeCritEntry     const* critRatio = sGtChanceToMeleeCritStore.LookupEntry((pclass - 1) * GT_MAX_LEVEL + level - 1);
+    if (critBase == NULL || critRatio == NULL)
         return 0.0f;
 
-    float crit=critBase->base + GetStat(STAT_AGILITY)*critRatio->ratio;
-    return crit*100.0f;
+    float crit = critBase->base + GetStat(STAT_AGILITY) * critRatio->ratio;
+    return crit * 100.0f;
 }
 
-void Player::GetDodgeFromAgility(float &diminishing, float &nondiminishing)
+void Player::GetDodgeFromAgility(float& diminishing, float& nondiminishing)
 {
     // Table for base dodge values
     const float dodge_base[MAX_CLASSES] =
@@ -5034,6 +5249,7 @@ void Player::GetDodgeFromAgility(float &diminishing, float &nondiminishing)
          0.0f,      // ??
          0.056097f  // Druid
     };
+
     // Crit/agility to dodge/agility coefficient multipliers; 3.2.0 increased required agility by 15%
     const float crit_to_dodge[MAX_CLASSES] =
     {
@@ -5053,19 +5269,20 @@ void Player::GetDodgeFromAgility(float &diminishing, float &nondiminishing)
     uint32 level = getLevel();
     uint32 pclass = getClass();
 
-    if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
+    if (level > GT_MAX_LEVEL)
+        level = GT_MAX_LEVEL;
 
     // Dodge per agility is proportional to crit per agility, which is available from DBC files
-    GtChanceToMeleeCritEntry  const *dodgeRatio = sGtChanceToMeleeCritStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
-    if (dodgeRatio==NULL || pclass > MAX_CLASSES)
+    GtChanceToMeleeCritEntry  const* dodgeRatio = sGtChanceToMeleeCritStore.LookupEntry((pclass - 1) * GT_MAX_LEVEL + level - 1);
+    if (dodgeRatio == NULL || pclass > MAX_CLASSES)
         return;
 
     // TODO: research if talents/effects that increase total agility by x% should increase non-diminishing part
     float base_agility = GetCreateStat(STAT_AGILITY) * m_auraModifiersGroup[UNIT_MOD_STAT_START + STAT_AGILITY][BASE_PCT];
     float bonus_agility = GetStat(STAT_AGILITY) - base_agility;
     // calculate diminishing (green in char screen) and non-diminishing (white) contribution
-    diminishing = 100.0f * bonus_agility * dodgeRatio->ratio * crit_to_dodge[pclass-1];
-    nondiminishing = 100.0f * (dodge_base[pclass-1] + base_agility * dodgeRatio->ratio * crit_to_dodge[pclass-1]);
+    diminishing = 100.0f * bonus_agility * dodgeRatio->ratio * crit_to_dodge[pclass - 1];
+    nondiminishing = 100.0f * (dodge_base[pclass - 1] + base_agility * dodgeRatio->ratio * crit_to_dodge[pclass - 1]);
 }
 
 float Player::GetSpellCritFromIntellect()
@@ -5073,26 +5290,28 @@ float Player::GetSpellCritFromIntellect()
     uint32 level = getLevel();
     uint32 pclass = getClass();
 
-    if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
+    if (level > GT_MAX_LEVEL)
+        level = GT_MAX_LEVEL;
 
-    GtChanceToSpellCritBaseEntry const *critBase  = sGtChanceToSpellCritBaseStore.LookupEntry(pclass-1);
-    GtChanceToSpellCritEntry     const *critRatio = sGtChanceToSpellCritStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
-    if (critBase==NULL || critRatio==NULL)
+    GtChanceToSpellCritBaseEntry const* critBase  = sGtChanceToSpellCritBaseStore.LookupEntry(pclass - 1);
+    GtChanceToSpellCritEntry     const* critRatio = sGtChanceToSpellCritStore.LookupEntry((pclass - 1) * GT_MAX_LEVEL + level - 1);
+    if (critBase == NULL || critRatio == NULL)
         return 0.0f;
 
-    float crit=critBase->base + GetStat(STAT_INTELLECT)*critRatio->ratio;
-    return crit*100.0f;
+    float crit = critBase->base + GetStat(STAT_INTELLECT) * critRatio->ratio;
+    return crit * 100.0f;
 }
 
 float Player::GetRatingMultiplier(CombatRating cr) const
 {
     uint32 level = getLevel();
 
-    if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
+    if (level > GT_MAX_LEVEL)
+        level = GT_MAX_LEVEL;
 
-    GtCombatRatingsEntry const *Rating = sGtCombatRatingsStore.LookupEntry(cr*GT_MAX_LEVEL+level-1);
+    GtCombatRatingsEntry const* Rating = sGtCombatRatingsStore.LookupEntry(cr * GT_MAX_LEVEL + level - 1);
     // gtOCTClassCombatRatingScalarStore.dbc starts with 1, CombatRating with zero, so cr+1
-    GtOCTClassCombatRatingScalarEntry const *classRating = sGtOCTClassCombatRatingScalarStore.LookupEntry((getClass()-1)*GT_MAX_RATING+cr+1);
+    GtOCTClassCombatRatingScalarEntry const* classRating = sGtOCTClassCombatRatingScalarStore.LookupEntry((getClass() - 1) * GT_MAX_RATING + cr + 1);
     if (!Rating || !classRating)
         return 1.0f;                                        // By default use minimum coefficient (not must be called)
 
@@ -5123,17 +5342,18 @@ float Player::OCTRegenHPPerSpirit()
     uint32 level = getLevel();
     uint32 pclass = getClass();
 
-    if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
+    if (level > GT_MAX_LEVEL)
+        level = GT_MAX_LEVEL;
 
-    GtOCTRegenHPEntry     const *baseRatio = sGtOCTRegenHPStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
-    GtRegenHPPerSptEntry  const *moreRatio = sGtRegenHPPerSptStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
-    if (baseRatio==NULL || moreRatio==NULL)
+    GtOCTRegenHPEntry     const* baseRatio = sGtOCTRegenHPStore.LookupEntry((pclass - 1) * GT_MAX_LEVEL + level - 1);
+    GtRegenHPPerSptEntry  const* moreRatio = sGtRegenHPPerSptStore.LookupEntry((pclass - 1) * GT_MAX_LEVEL + level - 1);
+    if (baseRatio == NULL || moreRatio == NULL)
         return 0.0f;
 
     // Formula from PaperDollFrame script
     float spirit = GetStat(STAT_SPIRIT);
     float baseSpirit = spirit;
-    if (baseSpirit>50) baseSpirit = 50;
+    if (baseSpirit > 50) baseSpirit = 50;
     float moreSpirit = spirit - baseSpirit;
     float regen = baseSpirit * baseRatio->ratio + moreSpirit * moreRatio->ratio;
     return regen;
@@ -5144,11 +5364,12 @@ float Player::OCTRegenMPPerSpirit()
     uint32 level = getLevel();
     uint32 pclass = getClass();
 
-    if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
+    if (level > GT_MAX_LEVEL)
+        level = GT_MAX_LEVEL;
 
 //    GtOCTRegenMPEntry     const *baseRatio = sGtOCTRegenMPStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
-    GtRegenMPPerSptEntry  const *moreRatio = sGtRegenMPPerSptStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
-    if (moreRatio==NULL)
+    GtRegenMPPerSptEntry  const* moreRatio = sGtRegenMPPerSptStore.LookupEntry((pclass - 1) * GT_MAX_LEVEL + level - 1);
+    if (moreRatio == NULL)
         return 0.0f;
 
     // Formula get from PaperDollFrame script
@@ -5159,7 +5380,7 @@ float Player::OCTRegenMPPerSpirit()
 
 void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply)
 {
-    m_baseRatingValue[cr]+=(apply ? value : -value);
+    m_baseRatingValue[cr] += (apply ? value : -value);
 
     // explicit affected values
     switch (cr)
@@ -5167,8 +5388,8 @@ void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply)
         case CR_HASTE_MELEE:
         {
             float RatingChange = value * GetRatingMultiplier(cr);
-            ApplyAttackTimePercentMod(BASE_ATTACK,RatingChange,apply);
-            ApplyAttackTimePercentMod(OFF_ATTACK,RatingChange,apply);
+            ApplyAttackTimePercentMod(BASE_ATTACK, RatingChange, apply);
+            ApplyAttackTimePercentMod(OFF_ATTACK, RatingChange, apply);
             break;
         }
         case CR_HASTE_RANGED:
@@ -5180,7 +5401,7 @@ void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply)
         case CR_HASTE_SPELL:
         {
             float RatingChange = value * GetRatingMultiplier(cr);
-            ApplyCastTimePercentMod(RatingChange,apply);
+            ApplyCastTimePercentMod(RatingChange, apply);
             break;
         }
         default:
@@ -5196,9 +5417,9 @@ void Player::UpdateRating(CombatRating cr)
     // Apply bonus from SPELL_AURA_MOD_RATING_FROM_STAT
     // stat used stored in miscValueB for this aura
     AuraList const& modRatingFromStat = GetAurasByType(SPELL_AURA_MOD_RATING_FROM_STAT);
-    for(AuraList::const_iterator i = modRatingFromStat.begin();i != modRatingFromStat.end(); ++i)
-        if ((*i)->GetMiscValue() & (1<<cr))
-            amount += int32(GetStat(Stats((*i)->GetMiscBValue())) * (*i)->GetModifier()->m_amount / 100.0f);
+    for (AuraList::const_iterator i = modRatingFromStat.begin(); i != modRatingFromStat.end(); ++i)
+        if ((*i)->GetMiscValue() & (1 << cr))
+            amount += int32(GetStat(Stats((*i)->GetMiscValueB())) * (*i)->GetModifier()->m_amount / 100.0f);
     if (amount < 0)
         amount = 0;
     SetUInt32Value(PLAYER_FIELD_COMBAT_RATING_1 + cr, uint32(amount));
@@ -5230,18 +5451,18 @@ void Player::UpdateRating(CombatRating cr)
             UpdateSpellHitChances();
             break;
         case CR_CRIT_MELEE:
-            if(affectStats)
+            if (affectStats)
             {
                 UpdateCritPercentage(BASE_ATTACK);
                 UpdateCritPercentage(OFF_ATTACK);
             }
             break;
         case CR_CRIT_RANGED:
-            if(affectStats)
+            if (affectStats)
                 UpdateCritPercentage(RANGED_ATTACK);
             break;
         case CR_CRIT_SPELL:
-            if(affectStats)
+            if (affectStats)
                 UpdateAllSpellCritChances();
             break;
         case CR_HIT_TAKEN_MELEE:                            // Implemented in Unit::MeleeMissChanceCalc
@@ -5263,14 +5484,14 @@ void Player::UpdateRating(CombatRating cr)
         case CR_WEAPON_SKILL_RANGED:
             break;
         case CR_EXPERTISE:
-            if(affectStats)
+            if (affectStats)
             {
                 UpdateExpertise(BASE_ATTACK);
                 UpdateExpertise(OFF_ATTACK);
             }
             break;
         case CR_ARMOR_PENETRATION:
-            if(affectStats)
+            if (affectStats)
                 UpdateArmorPenetration();
             break;
     }
@@ -5278,19 +5499,19 @@ void Player::UpdateRating(CombatRating cr)
 
 void Player::UpdateAllRatings()
 {
-    for(int cr = 0; cr < MAX_COMBAT_RATING; ++cr)
+    for (int cr = 0; cr < MAX_COMBAT_RATING; ++cr)
         UpdateRating(CombatRating(cr));
 }
 
 void Player::SetRegularAttackTime()
 {
-    for(int i = 0; i < MAX_ATTACK; ++i)
+    for (int i = 0; i < MAX_ATTACK; ++i)
     {
-        Item *tmpitem = GetWeaponForAttack(WeaponAttackType(i),true,false);
+        Item* tmpitem = GetWeaponForAttack(WeaponAttackType(i), true, false);
         if (tmpitem)
         {
-            ItemPrototype const *proto = tmpitem->GetProto();
-            if(proto->Delay)
+            ItemPrototype const* proto = tmpitem->GetProto();
+            if (proto->Delay)
                 SetAttackTime(WeaponAttackType(i), proto->Delay);
             else
                 SetAttackTime(WeaponAttackType(i), BASE_ATTACK_TIME);
@@ -5298,14 +5519,14 @@ void Player::SetRegularAttackTime()
     }
 }
 
-//skill+step, checking for max value
+// skill+step, checking for max value
 bool Player::UpdateSkill(uint32 skill_id, uint32 step)
 {
-    if(!skill_id)
+    if (!skill_id)
         return false;
 
     SkillStatusMap::iterator itr = mSkillStatus.find(skill_id);
-    if(itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
+    if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
         return false;
 
     uint32 valueIndex = PLAYER_SKILL_VALUE_INDEX(itr->second.pos);
@@ -5316,16 +5537,16 @@ bool Player::UpdateSkill(uint32 skill_id, uint32 step)
     if ((!max) || (!value) || (value >= max))
         return false;
 
-    if (value*512 < max*urand(0,512))
+    if (value * 512 < max * urand(0, 512))
     {
-        uint32 new_value = value+step;
-        if(new_value > max)
+        uint32 new_value = value + step;
+        if (new_value > max)
             new_value = max;
 
-        SetUInt32Value(valueIndex,MAKE_SKILL_VALUE(new_value,max));
-        if(itr->second.uState != SKILL_NEW)
+        SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(new_value, max));
+        if (itr->second.uState != SKILL_NEW)
             itr->second.uState = SKILL_CHANGED;
-        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL,skill_id);
+        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL, skill_id);
         return true;
     }
 
@@ -5334,13 +5555,13 @@ bool Player::UpdateSkill(uint32 skill_id, uint32 step)
 
 inline int SkillGainChance(uint32 SkillValue, uint32 GrayLevel, uint32 GreenLevel, uint32 YellowLevel)
 {
-    if ( SkillValue >= GrayLevel )
-        return sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_GREY)*10;
-    if ( SkillValue >= GreenLevel )
-        return sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_GREEN)*10;
-    if ( SkillValue >= YellowLevel )
-        return sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_YELLOW)*10;
-    return sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_ORANGE)*10;
+    if (SkillValue >= GrayLevel)
+        return sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_GREY) * 10;
+    if (SkillValue >= GreenLevel)
+        return sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_GREEN) * 10;
+    if (SkillValue >= YellowLevel)
+        return sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_YELLOW) * 10;
+    return sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_ORANGE) * 10;
 }
 
 bool Player::UpdateCraftSkill(uint32 spellid)
@@ -5349,7 +5570,7 @@ bool Player::UpdateCraftSkill(uint32 spellid)
 
     SkillLineAbilityMapBounds bounds = sSpellMgr.GetSkillLineAbilityMapBounds(spellid);
 
-    for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
+    for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
     {
         if (_spell_idx->second->skillId)
         {
@@ -5359,7 +5580,7 @@ bool Player::UpdateCraftSkill(uint32 spellid)
             SpellEntry const* spellEntry = sSpellStore.LookupEntry(spellid);
             if (spellEntry && spellEntry->Mechanic == MECHANIC_DISCOVERY)
             {
-                if (uint32 discoveredSpell = GetSkillDiscoverySpell(_spell_idx->second->skillId, spellid, this))
+                if (uint32 discoveredSpell = sSpellMgr.GetSkillDiscoverySpell(_spell_idx->second->skillId, spellid, this))
                     learnSpell(discoveredSpell, false);
             }
 
@@ -5375,7 +5596,7 @@ bool Player::UpdateCraftSkill(uint32 spellid)
     return false;
 }
 
-bool Player::UpdateGatherSkill(uint32 SkillId, uint32 SkillValue, uint32 RedLevel, uint32 Multiplicator )
+bool Player::UpdateGatherSkill(uint32 SkillId, uint32 SkillValue, uint32 RedLevel, uint32 Multiplicator)
 {
     DEBUG_LOG("UpdateGatherSkill(SkillId %d SkillLevel %d RedLevel %d)", SkillId, SkillValue, RedLevel);
 
@@ -5388,17 +5609,17 @@ bool Player::UpdateGatherSkill(uint32 SkillId, uint32 SkillValue, uint32 RedLeve
         case SKILL_LOCKPICKING:
         case SKILL_JEWELCRAFTING:
         case SKILL_INSCRIPTION:
-            return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator,gathering_skill_gain);
+            return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel + 100, RedLevel + 50, RedLevel + 25) * Multiplicator, gathering_skill_gain);
         case SKILL_SKINNING:
-            if( sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_SKINNING_STEPS)==0)
-                return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator,gathering_skill_gain);
+            if (sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_SKINNING_STEPS) == 0)
+                return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel + 100, RedLevel + 50, RedLevel + 25) * Multiplicator, gathering_skill_gain);
             else
-                return UpdateSkillPro(SkillId, (SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator) >> (SkillValue/sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_SKINNING_STEPS)), gathering_skill_gain);
+                return UpdateSkillPro(SkillId, (SkillGainChance(SkillValue, RedLevel + 100, RedLevel + 50, RedLevel + 25) * Multiplicator) >> (SkillValue / sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_SKINNING_STEPS)), gathering_skill_gain);
         case SKILL_MINING:
-            if (sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_MINING_STEPS)==0)
-                return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator,gathering_skill_gain);
+            if (sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_MINING_STEPS) == 0)
+                return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel + 100, RedLevel + 50, RedLevel + 25) * Multiplicator, gathering_skill_gain);
             else
-                return UpdateSkillPro(SkillId, (SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator) >> (SkillValue/sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_MINING_STEPS)),gathering_skill_gain);
+                return UpdateSkillPro(SkillId, (SkillGainChance(SkillValue, RedLevel + 100, RedLevel + 50, RedLevel + 25) * Multiplicator) >> (SkillValue / sWorld.getConfig(CONFIG_UINT32_SKILL_CHANCE_MINING_STEPS)), gathering_skill_gain);
     }
     return false;
 }
@@ -5409,32 +5630,32 @@ bool Player::UpdateFishingSkill()
 
     uint32 SkillValue = GetPureSkillValue(SKILL_FISHING);
 
-    int32 chance = SkillValue < 75 ? 100 : 2500/(SkillValue-50);
+    int32 chance = SkillValue < 90 ? 100 : 3000 / (SkillValue - 60);
 
     uint32 gathering_skill_gain = sWorld.getConfig(CONFIG_UINT32_SKILL_GAIN_GATHERING);
 
-    return UpdateSkillPro(SKILL_FISHING,chance*10,gathering_skill_gain);
+    return UpdateSkillPro(SKILL_FISHING, chance * 10, gathering_skill_gain);
 }
 
 // levels sync. with spell requirement for skill levels to learn
 // bonus abilities in sSkillLineAbilityStore
 // Used only to avoid scan DBC at each skill grow
-static uint32 bonusSkillLevels[] = {75,150,225,300,375,450};
+static uint32 bonusSkillLevels[] = {75, 150, 225, 300, 375, 450};
 
 bool Player::UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step)
 {
-    DEBUG_LOG("UpdateSkillPro(SkillId %d, Chance %3.1f%%)", SkillId, Chance/10.0);
-    if ( !SkillId )
+    DEBUG_LOG("UpdateSkillPro(SkillId %d, Chance %3.1f%%)", SkillId, Chance / 10.0);
+    if (!SkillId)
         return false;
 
-    if(Chance <= 0)                                         // speedup in 0 chance case
+    if (Chance <= 0)                                        // speedup in 0 chance case
     {
-        DEBUG_LOG("Player::UpdateSkillPro Chance=%3.1f%% missed", Chance/10.0);
+        DEBUG_LOG("Player::UpdateSkillPro Chance=%3.1f%% missed", Chance / 10.0);
         return false;
     }
 
     SkillStatusMap::iterator itr = mSkillStatus.find(SkillId);
-    if(itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
+    if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
         return false;
 
     uint32 valueIndex = PLAYER_SKILL_VALUE_INDEX(itr->second.pos);
@@ -5443,34 +5664,57 @@ bool Player::UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step)
     uint16 SkillValue = SKILL_VALUE(data);
     uint16 MaxValue   = SKILL_MAX(data);
 
-    if ( !MaxValue || !SkillValue || SkillValue >= MaxValue )
+    if (!MaxValue || !SkillValue || SkillValue >= MaxValue)
         return false;
 
-    int32 Roll = irand(1,1000);
+    int32 Roll = irand(1, 1000);
 
-    if ( Roll <= Chance )
+    if (Roll <= Chance)
     {
-        uint32 new_value = SkillValue+step;
-        if(new_value > MaxValue)
+        uint32 new_value = SkillValue + step;
+        if (new_value > MaxValue)
             new_value = MaxValue;
 
-        SetUInt32Value(valueIndex,MAKE_SKILL_VALUE(new_value,MaxValue));
-        if(itr->second.uState != SKILL_NEW)
+        SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(new_value, MaxValue));
+        if (itr->second.uState != SKILL_NEW)
             itr->second.uState = SKILL_CHANGED;
-        for(uint32* bsl = &bonusSkillLevels[0]; *bsl; ++bsl)
+        for (uint32* bsl = &bonusSkillLevels[0]; *bsl; ++bsl)
         {
-            if((SkillValue < *bsl && new_value >= *bsl))
+            if ((SkillValue < *bsl && new_value >= *bsl))
             {
-                learnSkillRewardedSpells( SkillId, new_value);
+                learnSkillRewardedSpells(SkillId, new_value);
                 break;
             }
         }
-        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL,SkillId);
-        DEBUG_LOG("Player::UpdateSkillPro Chance=%3.1f%% taken", Chance/10.0);
+
+        // Update depended enchants
+        for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+        {
+            if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            {
+                for (int slot = 0; slot < MAX_ENCHANTMENT_SLOT; ++slot)
+                {
+                    uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(slot));
+                    if (!enchant_id)
+                         continue;
+
+                     SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+                     if (!pEnchant)
+                         continue;
+                     if (pEnchant->requiredSkill != SkillId)
+                         continue;
+                     if (SkillValue < pEnchant->requiredSkillValue && new_value >= pEnchant->requiredSkillValue)
+                         ApplyEnchantment(pItem, EnchantmentSlot(slot), true);
+                }
+            }
+        }
+
+        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL, SkillId);
+        DEBUG_LOG("Player::UpdateSkillPro Chance=%3.1f%% taken", Chance / 10.0);
         return true;
     }
 
-    DEBUG_LOG("Player::UpdateSkillPro Chance=%3.1f%% missed", Chance/10.0);
+    DEBUG_LOG("Player::UpdateSkillPro Chance=%3.1f%% missed", Chance / 10.0);
     return false;
 }
 
@@ -5498,19 +5742,19 @@ void Player::UpdateWeaponSkill(WeaponAttackType attType)
     UpdateAllCritPercentages();
 }
 
-void Player::UpdateCombatSkills(Unit *pVictim, WeaponAttackType attType, bool defence)
+void Player::UpdateCombatSkills(Unit* pVictim, WeaponAttackType attType, bool defence)
 {
     uint32 plevel = getLevel();                             // if defense than pVictim == attacker
     uint32 greylevel = MaNGOS::XP::GetGrayLevel(plevel);
     uint32 moblevel = pVictim->GetLevelForTarget(this);
-    if(moblevel < greylevel)
+    if (moblevel < greylevel)
         return;
 
     if (moblevel > plevel + 5)
         moblevel = plevel + 5;
 
     uint32 lvldif = moblevel - greylevel;
-    if(lvldif < 3)
+    if (lvldif < 3)
         lvldif = 3;
 
     int32 skilldif = 5 * plevel - (defence ? GetBaseDefenseSkillValue() : GetBaseWeaponSkillValue(attType));
@@ -5521,14 +5765,17 @@ void Player::UpdateCombatSkills(Unit *pVictim, WeaponAttackType attType, bool de
         return;
 
     float chance = float(3 * lvldif * skilldif) / plevel;
-    if(!defence)
-        chance *= 0.1f * GetStat(STAT_INTELLECT);
+    if (!defence)
+    {
+        if (getClass() == CLASS_WARRIOR || getClass() == CLASS_ROGUE)
+            chance *= 0.1f * GetStat(STAT_INTELLECT);
+    }
 
-    chance = chance < 1.0f ? 1.0f : chance;                 //minimum chance to increase skill is 1%
+    chance = chance < 1.0f ? 1.0f : chance;                 // minimum chance to increase skill is 1%
 
-    if(roll_chance_f(chance))
+    if (roll_chance_f(chance))
     {
-        if(defence)
+        if (defence)
             UpdateDefense();
         else
             UpdateWeaponSkill(attType);
@@ -5537,10 +5784,10 @@ void Player::UpdateCombatSkills(Unit *pVictim, WeaponAttackType attType, bool de
         return;
 }
 
-void Player::ModifySkillBonus(uint32 skillid,int32 val, bool talent)
+void Player::ModifySkillBonus(uint32 skillid, int32 val, bool talent)
 {
     SkillStatusMap::const_iterator itr = mSkillStatus.find(skillid);
-    if(itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
+    if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
         return;
 
     uint32 bonusIndex = PLAYER_SKILL_BONUS_INDEX(itr->second.pos);
@@ -5549,10 +5796,10 @@ void Player::ModifySkillBonus(uint32 skillid,int32 val, bool talent)
     int16 temp_bonus = SKILL_TEMP_BONUS(bonus_val);
     int16 perm_bonus = SKILL_PERM_BONUS(bonus_val);
 
-    if(talent)                                          // permanent bonus stored in high part
-        SetUInt32Value(bonusIndex,MAKE_SKILL_BONUS(temp_bonus,perm_bonus+val));
+    if (talent)                                         // permanent bonus stored in high part
+        SetUInt32Value(bonusIndex, MAKE_SKILL_BONUS(temp_bonus, perm_bonus + val));
     else                                                // temporary/item bonus stored in low part
-        SetUInt32Value(bonusIndex,MAKE_SKILL_BONUS(temp_bonus+val,perm_bonus));
+        SetUInt32Value(bonusIndex, MAKE_SKILL_BONUS(temp_bonus + val, perm_bonus));
 }
 
 void Player::UpdateSkillsForLevel()
@@ -5562,18 +5809,18 @@ void Player::UpdateSkillsForLevel()
 
     bool alwaysMaxSkill = sWorld.getConfig(CONFIG_BOOL_ALWAYS_MAX_SKILL_FOR_LEVEL);
 
-    for(SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); ++itr)
+    for (SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); ++itr)
     {
-        if(itr->second.uState == SKILL_DELETED)
+        if (itr->second.uState == SKILL_DELETED)
             continue;
 
         uint32 pskill = itr->first;
 
-        SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(pskill);
-        if(!pSkill)
+        SkillLineEntry const* pSkill = sSkillLineStore.LookupEntry(pskill);
+        if (!pSkill)
             continue;
 
-        if(GetSkillRangeType(pSkill,false) != SKILL_RANGE_LEVEL)
+        if (GetSkillRangeType(pSkill, false) != SKILL_RANGE_LEVEL)
             continue;
 
         uint32 valueIndex = PLAYER_SKILL_VALUE_INDEX(itr->second.pos);
@@ -5582,20 +5829,20 @@ void Player::UpdateSkillsForLevel()
         uint32 val = SKILL_VALUE(data);
 
         /// update only level dependent max skill values
-        if(max!=1)
+        if (max != 1)
         {
             /// maximize skill always
-            if(alwaysMaxSkill)
+            if (alwaysMaxSkill)
             {
-                SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(maxSkill,maxSkill));
-                if(itr->second.uState != SKILL_NEW)
+                SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(maxSkill, maxSkill));
+                if (itr->second.uState != SKILL_NEW)
                     itr->second.uState = SKILL_CHANGED;
                 GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL, pskill);
             }
-            else if(max != maxconfskill)                    /// update max skill value if current max skill not maximized
+            else if (max != maxconfskill)                   /// update max skill value if current max skill not maximized
             {
-                SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(val,maxSkill));
-                if(itr->second.uState != SKILL_NEW)
+                SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(val, maxSkill));
+                if (itr->second.uState != SKILL_NEW)
                     itr->second.uState = SKILL_CHANGED;
             }
         }
@@ -5604,28 +5851,28 @@ void Player::UpdateSkillsForLevel()
 
 void Player::UpdateSkillsToMaxSkillsForLevel()
 {
-    for(SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); ++itr)
+    for (SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); ++itr)
     {
-        if(itr->second.uState == SKILL_DELETED)
+        if (itr->second.uState == SKILL_DELETED)
             continue;
 
         uint32 pskill = itr->first;
-        if( IsProfessionOrRidingSkill(pskill))
+        if (IsProfessionOrRidingSkill(pskill))
             continue;
         uint32 valueIndex = PLAYER_SKILL_VALUE_INDEX(itr->second.pos);
         uint32 data = GetUInt32Value(valueIndex);
 
         uint32 max = SKILL_MAX(data);
 
-        if(max > 1)
+        if (max > 1)
         {
-            SetUInt32Value(valueIndex,MAKE_SKILL_VALUE(max,max));
-            if(itr->second.uState != SKILL_NEW)
+            SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(max, max));
+            if (itr->second.uState != SKILL_NEW)
                 itr->second.uState = SKILL_CHANGED;
             GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL, pskill);
         }
 
-        if(pskill == SKILL_DEFENSE)
+        if (pskill == SKILL_DEFENSE)
             UpdateDefenseBonusesMod();
     }
 }
@@ -5634,66 +5881,129 @@ void Player::UpdateSkillsToMaxSkillsForLevel()
 // To "remove" a skill line, set it's values to zero
 void Player::SetSkill(uint16 id, uint16 currVal, uint16 maxVal, uint16 step /*=0*/)
 {
-    if(!id)
+    if (!id)
         return;
 
     SkillStatusMap::iterator itr = mSkillStatus.find(id);
 
     // has skill
-    if(itr != mSkillStatus.end() && itr->second.uState != SKILL_DELETED)
+    if (itr != mSkillStatus.end() && itr->second.uState != SKILL_DELETED)
     {
-        if(currVal)
+        if (currVal)
         {
+             for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+             {
+                if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                {
+                    for (int slot = 0; slot < MAX_ENCHANTMENT_SLOT; ++slot)
+                    {
+                         uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(slot));
+                         if (!enchant_id)
+                             continue;
+
+                         SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+                         if (!pEnchant)
+                             continue;
+                         if (pEnchant->requiredSkill != id)
+                             continue;
+                         ApplyEnchantment(pItem, EnchantmentSlot(slot), false);
+                    }
+                }
+            }
+
             if (step)                                      // need update step
                 SetUInt32Value(PLAYER_SKILL_INDEX(itr->second.pos), MAKE_PAIR32(id, step));
             // update value
             SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(itr->second.pos), MAKE_SKILL_VALUE(currVal, maxVal));
-            if(itr->second.uState != SKILL_NEW)
+            if (itr->second.uState != SKILL_NEW)
                 itr->second.uState = SKILL_CHANGED;
             learnSkillRewardedSpells(id, currVal);
             GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL, id);
             GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL, id);
+
+            for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+            {
+                if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                {
+                    for (int slot = 0; slot < MAX_ENCHANTMENT_SLOT; ++slot)
+                    {
+                         uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(slot));
+                         if (!enchant_id)
+                             continue;
+
+                         SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+                         if (!pEnchant)
+                             continue;
+                         if (pEnchant->requiredSkill != id)
+                             continue;
+                         ApplyEnchantment(pItem, EnchantmentSlot(slot), true);
+                    }
+                }
+            }
         }
         else                                                //remove
         {
+            // Remove depended enchants
+            for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+            {
+                if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                {
+                    for (int slot = 0; slot < MAX_ENCHANTMENT_SLOT; ++slot)
+                    {
+                         uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(slot));
+                         if (!enchant_id)
+                             continue;
+
+                         SpellItemEnchantmentEntry const* pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+                         if (!pEnchant)
+                             continue;
+
+                         if (pEnchant->requiredSkill != id)
+                             continue;
+
+                         ApplyEnchantment(pItem, EnchantmentSlot(slot), false);
+                    }
+                }
+            }
+
             // clear skill fields
             SetUInt32Value(PLAYER_SKILL_INDEX(itr->second.pos), 0);
             SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(itr->second.pos), 0);
             SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(itr->second.pos), 0);
 
             // mark as deleted or simply remove from map if not saved yet
-            if(itr->second.uState != SKILL_NEW)
+            if (itr->second.uState != SKILL_NEW)
                 itr->second.uState = SKILL_DELETED;
             else
                 mSkillStatus.erase(itr);
 
             // remove all spells that related to this skill
             for (uint32 j = 0; j < sSkillLineAbilityStore.GetNumRows(); ++j)
-                if(SkillLineAbilityEntry const *pAbility = sSkillLineAbilityStore.LookupEntry(j))
+                if (SkillLineAbilityEntry const* pAbility = sSkillLineAbilityStore.LookupEntry(j))
                     if (pAbility->skillId == id)
                         removeSpell(sSpellMgr.GetFirstSpellInChain(pAbility->spellId));
         }
     }
-    else if(currVal)                                        // add
+    else if (currVal)                                        // add
     {
         for (int i = 0; i < PLAYER_MAX_SKILLS; ++i)
         {
             if (!GetUInt32Value(PLAYER_SKILL_INDEX(i)))
             {
-                SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(id);
-                if(!pSkill)
+                SkillLineEntry const* pSkill = sSkillLineStore.LookupEntry(id);
+                if (!pSkill)
                 {
-                    sLog.outError("Skill not found in SkillLineStore: skill #%u", id);
+                    sLog.outError("Player::SetSkill: %s has skill not found in SkillLineStore: skill (id: %u)", GetGuidStr().c_str(), id);
                     return;
                 }
 
                 SetUInt32Value(PLAYER_SKILL_INDEX(i), MAKE_PAIR32(id, step));
-                SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i),MAKE_SKILL_VALUE(currVal, maxVal));
+                SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i), MAKE_SKILL_VALUE(currVal, maxVal));
                 GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL, id);
                 GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL, id);
 
                 // insert new entry or update if not deleted old entry yet
-                if(itr != mSkillStatus.end())
+                if (itr != mSkillStatus.end())
                 {
                     itr->second.pos = i;
                     itr->second.uState = SKILL_CHANGED;
@@ -5705,16 +6015,19 @@ void Player::SetSkill(uint16 id, uint16 currVal, uint16 maxVal, uint16 step /*=0
                 SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i), 0);
 
                 // temporary bonuses
-                AuraList const& mModSkill = GetAurasByType(SPELL_AURA_MOD_SKILL);
-                for(AuraList::const_iterator j = mModSkill.begin(); j != mModSkill.end(); ++j)
-                    if ((*j)->GetModifier()->m_miscvalue == int32(id))
-                        (*j)->ApplyModifier(true);
-
-                // permanent bonuses
-                AuraList const& mModSkillTalent = GetAurasByType(SPELL_AURA_MOD_SKILL_TALENT);
-                for(AuraList::const_iterator j = mModSkillTalent.begin(); j != mModSkillTalent.end(); ++j)
-                    if ((*j)->GetModifier()->m_miscvalue == int32(id))
-                        (*j)->ApplyModifier(true);
+                {
+                    MAPLOCK_READ(const_cast<Player*>(this), MAP_LOCK_TYPE_AURAS);
+                    AuraList& mModSkill = GetAurasByType(SPELL_AURA_MOD_SKILL);
+                    for (AuraList::iterator j = mModSkill.begin(); j != mModSkill.end(); ++j)
+                        if ((*j)->GetModifier()->m_miscvalue == int32(id))
+                            (*j)->ApplyModifier(true);
+
+                    // permanent bonuses
+                    AuraList& mModSkillTalent = GetAurasByType(SPELL_AURA_MOD_SKILL_TALENT);
+                    for (AuraList::iterator j = mModSkillTalent.begin(); j != mModSkillTalent.end(); ++j)
+                        if ((*j)->GetModifier()->m_miscvalue == int32(id))
+                            (*j)->ApplyModifier(true);
+                }
 
                 // Learn all spells for skill
                 learnSkillRewardedSpells(id, currVal);
@@ -5726,7 +6039,7 @@ void Player::SetSkill(uint16 id, uint16 currVal, uint16 maxVal, uint16 step /*=0
 
 bool Player::HasSkill(uint32 skill) const
 {
-    if(!skill)
+    if (!skill)
         return false;
 
     SkillStatusMap::const_iterator itr = mSkillStatus.find(skill);
@@ -5735,11 +6048,11 @@ bool Player::HasSkill(uint32 skill) const
 
 uint16 Player::GetSkillValue(uint32 skill) const
 {
-    if(!skill)
+    if (!skill)
         return 0;
 
     SkillStatusMap::const_iterator itr = mSkillStatus.find(skill);
-    if(itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
+    if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
         return 0;
 
     uint32 bonus = GetUInt32Value(PLAYER_SKILL_BONUS_INDEX(itr->second.pos));
@@ -5752,11 +6065,11 @@ uint16 Player::GetSkillValue(uint32 skill) const
 
 uint16 Player::GetMaxSkillValue(uint32 skill) const
 {
-    if(!skill)
+    if (!skill)
         return 0;
 
     SkillStatusMap::const_iterator itr = mSkillStatus.find(skill);
-    if(itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
+    if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
         return 0;
 
     uint32 bonus = GetUInt32Value(PLAYER_SKILL_BONUS_INDEX(itr->second.pos));
@@ -5769,11 +6082,11 @@ uint16 Player::GetMaxSkillValue(uint32 skill) const
 
 uint16 Player::GetPureMaxSkillValue(uint32 skill) const
 {
-    if(!skill)
+    if (!skill)
         return 0;
 
     SkillStatusMap::const_iterator itr = mSkillStatus.find(skill);
-    if(itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
+    if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
         return 0;
 
     return SKILL_MAX(GetUInt32Value(PLAYER_SKILL_VALUE_INDEX(itr->second.pos)));
@@ -5781,11 +6094,11 @@ uint16 Player::GetPureMaxSkillValue(uint32 skill) const
 
 uint16 Player::GetBaseSkillValue(uint32 skill) const
 {
-    if(!skill)
+    if (!skill)
         return 0;
 
     SkillStatusMap::const_iterator itr = mSkillStatus.find(skill);
-    if(itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
+    if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
         return 0;
 
     int32 result = int32(SKILL_VALUE(GetUInt32Value(PLAYER_SKILL_VALUE_INDEX(itr->second.pos))));
@@ -5795,11 +6108,11 @@ uint16 Player::GetBaseSkillValue(uint32 skill) const
 
 uint16 Player::GetPureSkillValue(uint32 skill) const
 {
-    if(!skill)
+    if (!skill)
         return 0;
 
     SkillStatusMap::const_iterator itr = mSkillStatus.find(skill);
-    if(itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
+    if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
         return 0;
 
     return SKILL_VALUE(GetUInt32Value(PLAYER_SKILL_VALUE_INDEX(itr->second.pos)));
@@ -5807,11 +6120,11 @@ uint16 Player::GetPureSkillValue(uint32 skill) const
 
 int16 Player::GetSkillPermBonusValue(uint32 skill) const
 {
-    if(!skill)
+    if (!skill)
         return 0;
 
     SkillStatusMap::const_iterator itr = mSkillStatus.find(skill);
-    if(itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
+    if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
         return 0;
 
     return SKILL_PERM_BONUS(GetUInt32Value(PLAYER_SKILL_BONUS_INDEX(itr->second.pos)));
@@ -5819,110 +6132,119 @@ int16 Player::GetSkillPermBonusValue(uint32 skill) const
 
 int16 Player::GetSkillTempBonusValue(uint32 skill) const
 {
-    if(!skill)
+    if (!skill)
         return 0;
 
     SkillStatusMap::const_iterator itr = mSkillStatus.find(skill);
-    if(itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
+    if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED)
         return 0;
 
     return SKILL_TEMP_BONUS(GetUInt32Value(PLAYER_SKILL_BONUS_INDEX(itr->second.pos)));
 }
 
-void Player::SendInitialActionButtons() const
+void Player::SendActionButtons(uint32 state) const
 {
-    DETAIL_LOG( "Initializing Action Buttons for '%u' spec '%u'", GetGUIDLow(), m_activeSpec);
+    DETAIL_LOG("Initializing Action Buttons for '%u' spec '%u'", GetGUIDLow(), m_activeSpec);
 
     WorldPacket data(SMSG_ACTION_BUTTONS, 1+(MAX_ACTION_BUTTONS*4));
-    data << uint8(1);                                       // talent spec amount (in packet)
-    ActionButtonList const& currentActionButtonList = m_actionButtons[m_activeSpec];
-    for(uint8 button = 0; button < MAX_ACTION_BUTTONS; ++button)
+    data << uint8(state);
+    /*
+        state can be 0, 1, 2
+        0 - Looks to be sent when initial action buttons get sent, however on Trinity we use 1 since 0 had some difficulties
+        1 - Used in any SMSG_ACTION_BUTTONS packet with button data on Trinity. Only used after spec swaps on retail.
+        2 - Clears the action bars client sided. This is sent during spec swap before unlearning and before sending the new buttons
+    */
+    if (state != 2)
     {
-        ActionButtonList::const_iterator itr = currentActionButtonList.find(button);
-        if(itr != currentActionButtonList.end() && itr->second.uState != ACTIONBUTTON_DELETED)
-            data << uint32(itr->second.packedData);
-        else
-            data << uint32(0);
+        ActionButtonList const& currentActionButtonList = m_actionButtons[m_activeSpec];
+        for (uint8 button = 0; button < MAX_ACTION_BUTTONS; ++button)
+        {
+            ActionButtonList::const_iterator itr = currentActionButtonList.find(button);
+            if (itr != currentActionButtonList.end() && itr->second.uState != ACTIONBUTTON_DELETED)
+                data << uint32(itr->second.packedData);
+            else
+                data << uint32(0);
+        }
     }
 
-    GetSession()->SendPacket( &data );
-    DETAIL_LOG( "Action Buttons for '%u' spec '%u' Initialized", GetGUIDLow(), m_activeSpec );
+    GetSession()->SendPacket(&data);
+    DETAIL_LOG("Action Buttons for '%u' spec '%u' Initialized", GetGUIDLow(), m_activeSpec);
 }
 
 void Player::SendLockActionButtons() const
 {
-    DETAIL_LOG( "Locking Action Buttons for '%u' spec '%u'", GetGUIDLow(), m_activeSpec);
+    DETAIL_LOG("Locking Action Buttons for '%u' spec '%u'", GetGUIDLow(), m_activeSpec);
     WorldPacket data(SMSG_ACTION_BUTTONS, 1);
     // sending 2 locks actions bars, neither user can remove buttons, nor client removes buttons at spell unlearn
     // they remain locked until server sends new action buttons
     data << uint8(2);
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
 bool Player::IsActionButtonDataValid(uint8 button, uint32 action, uint8 type, Player* player, bool msg)
 {
-    if(button >= MAX_ACTION_BUTTONS)
+    if (button >= MAX_ACTION_BUTTONS)
     {
         if (msg)
         {
             if (player)
-                sLog.outError( "Action %u not added into button %u for player %s: button must be < %u", action, button, player->GetName(), MAX_ACTION_BUTTONS );
+                sLog.outError("Action %u not added into button %u for %s: button must be < %u", action, button, player->GetGuidStr().c_str(), MAX_ACTION_BUTTONS);
             else
-                sLog.outError( "Table `playercreateinfo_action` have action %u into button %u : button must be < %u", action, button, MAX_ACTION_BUTTONS );
+                sLog.outError("Table `playercreateinfo_action` have action %u into button %u : button must be < %u", action, button, MAX_ACTION_BUTTONS);
 
         }
         return false;
     }
 
-    if(action >= MAX_ACTION_BUTTON_ACTION_VALUE)
+    if (action >= MAX_ACTION_BUTTON_ACTION_VALUE)
     {
         if (msg)
         {
             if (player)
-                sLog.outError( "Action %u not added into button %u for player %s: action must be < %u", action, button, player->GetName(), MAX_ACTION_BUTTON_ACTION_VALUE );
+                sLog.outError("Action %u not added into button %u for %s: action must be < %u", action, button, player->GetGuidStr().c_str(), MAX_ACTION_BUTTON_ACTION_VALUE);
             else
-                sLog.outError( "Table `playercreateinfo_action` have action %u into button %u : action must be < %u", action, button, MAX_ACTION_BUTTON_ACTION_VALUE );
+                sLog.outError("Table `playercreateinfo_action` have action %u into button %u : action must be < %u", action, button, MAX_ACTION_BUTTON_ACTION_VALUE);
         }
         return false;
     }
 
-    switch(type)
+    switch (type)
     {
         case ACTION_BUTTON_SPELL:
         {
             SpellEntry const* spellProto = sSpellStore.LookupEntry(action);
-            if(!spellProto)
+            if (!spellProto)
             {
                 if (msg)
                 {
                     if (player)
-                        sLog.outError( "Spell action %u not added into button %u for player %s: spell not exist", action, button, player->GetName() );
+                        sLog.outError("Spell action %u not added into button %u for %s: spell not exist", action, button, player->GetGuidStr().c_str());
                     else
-                        sLog.outError( "Table `playercreateinfo_action` have spell action %u into button %u: spell not exist", action, button );
+                        sLog.outError("Table `playercreateinfo_action` have spell action %u into button %u: spell not exist", action, button);
                 }
                 return false;
             }
 
-            if(player)
+            if (player)
             {
-                if(!player->HasSpell(spellProto->Id))
+                if (!player->HasSpell(spellProto->Id))
                 {
                     if (msg)
-                        sLog.outError( "Spell action %u not added into button %u for player %s: player don't known this spell", action, button, player->GetName() );
+                        sLog.outError("Spell action %u not added into button %u for %s: player don't known this spell", action, button, player->GetGuidStr().c_str());
                     return false;
                 }
-                else if(IsPassiveSpell(spellProto))
+                else if (IsPassiveSpell(spellProto))
                 {
                     if (msg)
-                        sLog.outError( "Spell action %u not added into button %u for player %s: spell is passive", action, button, player->GetName() );
+                        sLog.outError("Spell action %u not added into button %u for %s: spell is passive", action, button, player->GetGuidStr().c_str());
                     return false;
                 }
                 // current range for button of totem bar is from ACTION_BUTTON_SHAMAN_TOTEMS_BAR to (but not including) ACTION_BUTTON_SHAMAN_TOTEMS_BAR + 12
-                else if(button >= ACTION_BUTTON_SHAMAN_TOTEMS_BAR && button < (ACTION_BUTTON_SHAMAN_TOTEMS_BAR + 12)
+                else if (button >= ACTION_BUTTON_SHAMAN_TOTEMS_BAR && button < (ACTION_BUTTON_SHAMAN_TOTEMS_BAR + 12)
                     && !spellProto->HasAttribute(SPELL_ATTR_EX7_TOTEM_SPELL))
                 {
                     if (msg)
-                        sLog.outError( "Spell action %u not added into button %u for player %s: attempt to add non totem spell to totem bar", action, button, player->GetName() );
+                        sLog.outError("Spell action %u not added into button %u for %s: attempt to add non totem spell to totem bar", action, button, player->GetGuidStr().c_str());
                     return false;
                 }
             }
@@ -5930,14 +6252,14 @@ bool Player::IsActionButtonDataValid(uint8 button, uint32 action, uint8 type, Pl
         }
         case ACTION_BUTTON_ITEM:
         {
-            if(!ObjectMgr::GetItemPrototype(action))
+            if (!ObjectMgr::GetItemPrototype(action))
             {
                 if (msg)
                 {
                     if (player)
-                        sLog.outError( "Item action %u not added into button %u for player %s: item not exist", action, button, player->GetName() );
+                        sLog.outError("Item action %u not added into button %u for %s: item not exist", action, button, player->GetGuidStr().c_str());
                     else
-                        sLog.outError( "Table `playercreateinfo_action` have item action %u into button %u: item not exist", action, button );
+                        sLog.outError("Table `playercreateinfo_action` have item action %u into button %u: item not exist", action, button);
                 }
                 return false;
             }
@@ -5953,14 +6275,14 @@ bool Player::IsActionButtonDataValid(uint8 button, uint32 action, uint8 type, Pl
 ActionButton* Player::addActionButton(uint8 spec, uint8 button, uint32 action, uint8 type)
 {
     // check action only for active spec (so not check at copy/load passive spec)
-    if (spec == GetActiveSpec() && !IsActionButtonDataValid(button,action,type,this))
+    if (spec == GetActiveSpec() && !IsActionButtonDataValid(button, action, type, this))
         return NULL;
 
     // it create new button (NEW state) if need or return existing
     ActionButton& ab = m_actionButtons[spec][button];
 
     // set data and update to CHANGED if not NEW
-    ab.SetActionAndType(action,ActionButtonType(type));
+    ab.SetActionAndType(action, ActionButtonType(type));
 
     DETAIL_LOG("Player '%u' Added Action '%u' (type %u) to Button '%u' for spec %u", GetGUIDLow(), action, uint32(type), button, spec);
     return &ab;
@@ -5985,57 +6307,40 @@ ActionButton const* Player::GetActionButton(uint8 button)
 {
     ActionButtonList& currentActionButtonList = m_actionButtons[m_activeSpec];
     ActionButtonList::iterator buttonItr = currentActionButtonList.find(button);
-    if (buttonItr==currentActionButtonList.end() || buttonItr->second.uState == ACTIONBUTTON_DELETED)
+    if (buttonItr == currentActionButtonList.end() || buttonItr->second.uState == ACTIONBUTTON_DELETED)
         return NULL;
 
     return &buttonItr->second;
 }
 
-bool Player::SetPosition(float x, float y, float z, float orientation, bool teleport)
+bool Player::SetPosition(Position const& pos, bool teleport)
 {
-    // prevent crash when a bad coord is sent by the client
-    if(!MaNGOS::IsValidMapCoord(x,y,z,orientation))
-    {
-        DEBUG_LOG("Player::SetPosition(%f, %f, %f, %f, %d) .. bad coordinates for player %d!",x,y,z,orientation,teleport,GetGUIDLow());
-        return false;
-    }
-
-    Map *m = GetMap();
+    bool groupUpdate = (GetGroup() && (teleport || abs(GetPositionX() - pos.x) > 1.0f || abs(GetPositionY() - pos.y) > 1.0f));
 
-    const float old_x = GetPositionX();
-    const float old_y = GetPositionY();
-    const float old_z = GetPositionZ();
-    const float old_r = GetOrientation();
-
-    if( teleport || old_x != x || old_y != y || old_z != z || old_r != orientation )
-    {
-        if (teleport || old_x != x || old_y != y || old_z != z)
-            RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOVE | AURA_INTERRUPT_FLAG_TURNING);
-        else
-            RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING);
-
-        RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+    if (!Unit::SetPosition(pos, teleport))
+        return false;
 
-        // move and update visible state if need
-        m->PlayerRelocation(this, x, y, z, orientation);
+    // Update position's state only on interval
+    if (m_positionStatusUpdateTimer)
+        return true;
+    m_positionStatusUpdateTimer = 100;
 
-        // reread after Map::Relocation
-        m = GetMap();
-        x = GetPositionX();
-        y = GetPositionY();
-        z = GetPositionZ();
+    // will close both side trade windows
+    if (GetTrader() && !IsWithinDistInMap(GetTrader(), INTERACTION_DISTANCE))
+        GetSession()->SendCancelTrade();
 
-        // group update
-        if (GetGroup() && (old_x != x || old_y != y))
-            SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POSITION);
+    // movement should cancel looting
+    if (ObjectGuid lootGuid = GetLootGuid())
+        SendLootRelease(lootGuid);
 
-        if (GetTrader() && !IsWithinDistInMap(GetTrader(), INTERACTION_DISTANCE))
-            GetSession()->SendCancelTrade();   // will close both side trade windows
-    }
+    // group update
+    if (groupUpdate)
+        SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POSITION);
 
     // code block for underwater state update
-    UpdateUnderwaterState(m, x, y, z);
+    UpdateUnderwaterState(GetMap(), pos.x, pos.y, pos.z);
 
+    // code block for outdoor state and area-explore check
     CheckAreaExploreAndOutdoor();
 
     return true;
@@ -6043,25 +6348,21 @@ bool Player::SetPosition(float x, float y, float z, float orientation, bool tele
 
 void Player::SaveRecallPosition()
 {
-    m_recallMap = GetMapId();
-    m_recallX = GetPositionX();
-    m_recallY = GetPositionY();
-    m_recallZ = GetPositionZ();
-    m_recallO = GetOrientation();
+    m_recall = GetPosition();
 }
 
-void Player::SendMessageToSet(WorldPacket *data, bool self)
+void Player::SendMessageToSet(WorldPacket* data, bool self) const
 {
     if (IsInWorld())
         GetMap()->MessageBroadcast(this, data, false);
 
-    //if player is not in world and map in not created/already destroyed
-    //no need to create one, just send packet for itself!
+    // if player is not in world and map in not created/already destroyed
+    // no need to create one, just send packet for itself!
     if (self)
         GetSession()->SendPacket(data);
 }
 
-void Player::SendMessageToSetInRange(WorldPacket *data, float dist, bool self)
+void Player::SendMessageToSetInRange(WorldPacket* data, float dist, bool self) const
 {
     if (IsInWorld())
         GetMap()->MessageDistBroadcast(this, data, dist, false);
@@ -6070,7 +6371,7 @@ void Player::SendMessageToSetInRange(WorldPacket *data, float dist, bool self)
         GetSession()->SendPacket(data);
 }
 
-void Player::SendMessageToSetInRange(WorldPacket *data, float dist, bool self, bool own_team_only)
+void Player::SendMessageToSetInRange(WorldPacket* data, float dist, bool self, bool own_team_only) const
 {
     if (IsInWorld())
         GetMap()->MessageDistBroadcast(this, data, dist, false, own_team_only);
@@ -6079,7 +6380,7 @@ void Player::SendMessageToSetInRange(WorldPacket *data, float dist, bool self, b
         GetSession()->SendPacket(data);
 }
 
-void Player::SendDirectMessage(WorldPacket *data)
+void Player::SendDirectMessage(WorldPacket* data) const
 {
     GetSession()->SendPacket(data);
 }
@@ -6100,14 +6401,11 @@ void Player::SendMovieStart(uint32 MovieId)
 
 void Player::CheckAreaExploreAndOutdoor()
 {
-    if (!isAlive())
-        return;
-
-    if (IsTaxiFlying())
+    if (!isAlive() || IsTaxiFlying() || !GetMap())
         return;
 
     bool isOutdoor;
-    uint16 areaFlag = GetTerrain()->GetAreaFlag(GetPositionX(),GetPositionY(),GetPositionZ(), &isOutdoor);
+    uint16 areaFlag = GetTerrain()->GetAreaFlag(GetPositionX(), GetPositionY(), GetPositionZ(), &isOutdoor);
 
     if (isOutdoor)
     {
@@ -6122,15 +6420,19 @@ void Player::CheckAreaExploreAndOutdoor()
         }
     }
     else if (sWorld.getConfig(CONFIG_BOOL_VMAP_INDOOR_CHECK) && !isGameMaster())
-        RemoveAurasWithAttribute(SPELL_ATTR_OUTDOORS_ONLY);
+        RemoveAurasWithAttribute(SPELL_ATTR_OUTDOORS_ONLY, SPELL_ATTR_PASSIVE);
+
+    if (sWorld.getConfig(CONFIG_BOOL_VMAP_INDOOR_CHECK))
+        TriggerPassiveAurasWithAttribute(isOutdoor, SPELL_ATTR_OUTDOORS_ONLY);
 
-    if (areaFlag==0xffff)
+    if (areaFlag == 0xffff)
         return;
+
     int offset = areaFlag / 32;
 
     if (offset >= PLAYER_EXPLORED_ZONES_SIZE)
     {
-        sLog.outError("Wrong area flag %u in map data for (X: %f Y: %f) point to field PLAYER_EXPLORED_ZONES_1 + %u ( %u must be < %u ).",areaFlag,GetPositionX(),GetPositionY(),offset,offset, PLAYER_EXPLORED_ZONES_SIZE);
+        sLog.outError("Wrong area flag %u in map data for (X: %f Y: %f) point to field PLAYER_EXPLORED_ZONES_1 + %u (%u must be < %u).", areaFlag, GetPositionX(), GetPositionY(), offset, offset, PLAYER_EXPLORED_ZONES_SIZE);
         return;
     }
 
@@ -6143,17 +6445,17 @@ void Player::CheckAreaExploreAndOutdoor()
 
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EXPLORE_AREA);
 
-        AreaTableEntry const *p = GetAreaEntryByAreaFlagAndMap(areaFlag,GetMapId());
-        if(!p)
+        AreaTableEntry const* p = GetAreaEntryByAreaFlagAndMap(areaFlag, GetMapId());
+        if (!p)
         {
-            sLog.outError("PLAYER: Player %u discovered unknown area (x: %f y: %f map: %u", GetGUIDLow(), GetPositionX(),GetPositionY(),GetMapId());
+            sLog.outError("Player::CheckAreaExploreAndOutdoor: %s discovered unknown area (x: %f y: %f map: %u", GetGuidStr().c_str(), GetPositionX(), GetPositionY(), GetMapId());
         }
-        else if(p->area_level > 0)
+        else if (p->area_level > 0)
         {
             uint32 area = p->ID;
             if (getLevel() >= sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
             {
-                SendExplorationExperience(area,0);
+                SendExplorationExperience(area, 0);
             }
             else
             {
@@ -6161,25 +6463,25 @@ void Player::CheckAreaExploreAndOutdoor()
                 uint32 XP = 0;
                 if (diff < -5)
                 {
-                    XP = uint32(sObjectMgr.GetBaseXP(getLevel()+5)*sWorld.getConfig(CONFIG_FLOAT_RATE_XP_EXPLORE));
+                    XP = uint32(sObjectMgr.GetBaseXP(getLevel() + 5) * sWorld.getConfig(CONFIG_FLOAT_RATE_XP_EXPLORE));
                 }
                 else if (diff > 5)
                 {
-                    int32 exploration_percent = (100-((diff-5)*5));
+                    int32 exploration_percent = (100 - ((diff - 5) * 5));
                     if (exploration_percent > 100)
                         exploration_percent = 100;
                     else if (exploration_percent < 0)
                         exploration_percent = 0;
 
-                    XP = uint32(sObjectMgr.GetBaseXP(p->area_level)*exploration_percent/100*sWorld.getConfig(CONFIG_FLOAT_RATE_XP_EXPLORE));
+                    XP = uint32(sObjectMgr.GetBaseXP(p->area_level) * exploration_percent / 100 * sWorld.getConfig(CONFIG_FLOAT_RATE_XP_EXPLORE));
                 }
                 else
                 {
-                    XP = uint32(sObjectMgr.GetBaseXP(p->area_level)*sWorld.getConfig(CONFIG_FLOAT_RATE_XP_EXPLORE));
+                    XP = uint32(sObjectMgr.GetBaseXP(p->area_level) * sWorld.getConfig(CONFIG_FLOAT_RATE_XP_EXPLORE));
                 }
 
-                GiveXP( XP, NULL );
-                SendExplorationExperience(area,XP);
+                GiveXP(XP, NULL);
+                SendExplorationExperience(area, XP);
             }
             DETAIL_LOG("PLAYER: Player %u discovered a new area: %u", GetGUIDLow(), area);
         }
@@ -6191,26 +6493,26 @@ Team Player::TeamForRace(uint8 race)
     ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(race);
     if (!rEntry)
     {
-        sLog.outError("Race %u not found in DBC: wrong DBC files?",uint32(race));
+        sLog.outError("Race %u not found in DBC: wrong DBC files?", uint32(race));
         return ALLIANCE;
     }
 
-    switch(rEntry->TeamID)
+    switch (rEntry->TeamID)
     {
         case 7: return ALLIANCE;
         case 1: return HORDE;
     }
 
-    sLog.outError("Race %u have wrong teamid %u in DBC: wrong DBC files?",uint32(race),rEntry->TeamID);
+    sLog.outError("Race %u have wrong teamid %u in DBC: wrong DBC files?", uint32(race), rEntry->TeamID);
     return TEAM_NONE;
 }
 
 uint32 Player::getFactionForRace(uint8 race)
 {
     ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(race);
-    if(!rEntry)
+    if (!rEntry)
     {
-        sLog.outError("Race %u not found in DBC: wrong DBC files?",uint32(race));
+        sLog.outError("Race %u not found in DBC: wrong DBC files?", uint32(race));
         return 0;
     }
 
@@ -6229,7 +6531,7 @@ ReputationRank Player::GetReputationRank(uint32 faction) const
     return GetReputationMgr().GetRank(factionEntry);
 }
 
-//Calculate total reputation percent player gain with quest/creature level
+// Calculate total reputation percent player gain with quest/creature level
 int32 Player::CalculateReputationGain(ReputationSource source, int32 rep, int32 faction, uint32 creatureOrQuestLevel, bool noAuraBonus)
 {
     float percent = 100.0f;
@@ -6264,7 +6566,7 @@ int32 Player::CalculateReputationGain(ReputationSource source, int32 rep, int32
         return 0;
 
     // Multiply result with the faction specific rate
-    if (const RepRewardRate *repData = sObjectMgr.GetRepRewardRate(faction))
+    if (const RepRewardRate* repData = sObjectMgr.GetRepRewardRate(faction))
     {
         float repRate = 0.0f;
         switch (source)
@@ -6287,26 +6589,46 @@ int32 Player::CalculateReputationGain(ReputationSource source, int32 rep, int32
         percent *= repRate;
     }
 
-    return int32(sWorld.getConfig(CONFIG_FLOAT_RATE_REPUTATION_GAIN)*rep*percent/100.0f);
+    if (CheckRAFConditions())
+    {
+        percent *= sWorld.getConfig(CONFIG_FLOAT_RATE_RAF_XP);
+    }
+
+    return int32(sWorld.getConfig(CONFIG_FLOAT_RATE_REPUTATION_GAIN) * rep * percent / 100.0f);
 }
 
-//Calculates how many reputation points player gains in victim's enemy factions
-void Player::RewardReputation(Unit *pVictim, float rate)
+// Calculates how many reputation points player gains in victim's enemy factions
+void Player::RewardReputation(Unit* pVictim, float rate)
 {
-    if(!pVictim || pVictim->GetTypeId() == TYPEID_PLAYER)
+    if (!pVictim || pVictim->GetTypeId() == TYPEID_PLAYER)
         return;
 
     // used current difficulty creature entry instead normal version (GetEntry())
     ReputationOnKillEntry const* Rep = sObjectMgr.GetReputationOnKillEntry(((Creature*)pVictim)->GetCreatureInfo()->Entry);
-
-    if(!Rep)
+    if (!Rep)
         return;
 
-    if(Rep->repfaction1 && (!Rep->team_dependent || GetTeam()==ALLIANCE))
+    uint32 Repfaction1 = Rep->repfaction1;
+    uint32 Repfaction2 = Rep->repfaction2;
+
+    // Championning tabard reputation system
+    if (HasAura(Rep->championingAura))
+    {
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_TABARD))
+        {
+            if (uint32 tabardFactionID = pItem->GetProto()->RequiredReputationFaction)
+            {
+                Repfaction1 = tabardFactionID;
+                Repfaction2 = tabardFactionID;
+            }
+        }
+    }
+
+    if (Repfaction1 && (!Rep->team_dependent || GetTeam()==ALLIANCE))
     {
-        int32 donerep1 = CalculateReputationGain(REPUTATION_SOURCE_KILL, Rep->repvalue1, Rep->repfaction1, pVictim->getLevel());
-        donerep1 = int32(donerep1*rate);
-        FactionEntry const *factionEntry1 = sFactionStore.LookupEntry(Rep->repfaction1);
+        int32 donerep1 = CalculateReputationGain(REPUTATION_SOURCE_KILL, Rep->repvalue1, Repfaction1, pVictim->getLevel());
+        donerep1 = int32(donerep1 * rate);
+        FactionEntry const* factionEntry1 = sFactionStore.LookupEntry(Repfaction1);
         uint32 current_reputation_rank1 = GetReputationMgr().GetRank(factionEntry1);
         if (factionEntry1 && current_reputation_rank1 <= Rep->reputation_max_cap1)
             GetReputationMgr().ModifyReputation(factionEntry1, donerep1);
@@ -6314,17 +6636,17 @@ void Player::RewardReputation(Unit *pVictim, float rate)
         // Wiki: Team factions value divided by 2
         if (factionEntry1 && Rep->is_teamaward1)
         {
-            FactionEntry const *team1_factionEntry = sFactionStore.LookupEntry(factionEntry1->team);
-            if(team1_factionEntry)
+            FactionEntry const* team1_factionEntry = sFactionStore.LookupEntry(factionEntry1->team);
+            if (team1_factionEntry)
                 GetReputationMgr().ModifyReputation(team1_factionEntry, donerep1 / 2);
         }
     }
 
-    if(Rep->repfaction2 && (!Rep->team_dependent || GetTeam()==HORDE))
+    if (Repfaction2 && (!Rep->team_dependent || GetTeam()==HORDE))
     {
-        int32 donerep2 = CalculateReputationGain(REPUTATION_SOURCE_KILL, Rep->repvalue2, Rep->repfaction2, pVictim->getLevel());
-        donerep2 = int32(donerep2*rate);
-        FactionEntry const *factionEntry2 = sFactionStore.LookupEntry(Rep->repfaction2);
+        int32 donerep2 = CalculateReputationGain(REPUTATION_SOURCE_KILL, Rep->repvalue2, Repfaction2, pVictim->getLevel());
+        donerep2 = int32(donerep2 * rate);
+        FactionEntry const* factionEntry2 = sFactionStore.LookupEntry(Repfaction2);
         uint32 current_reputation_rank2 = GetReputationMgr().GetRank(factionEntry2);
         if (factionEntry2 && current_reputation_rank2 <= Rep->reputation_max_cap2)
             GetReputationMgr().ModifyReputation(factionEntry2, donerep2);
@@ -6332,18 +6654,18 @@ void Player::RewardReputation(Unit *pVictim, float rate)
         // Wiki: Team factions value divided by 2
         if (factionEntry2 && Rep->is_teamaward2)
         {
-            FactionEntry const *team2_factionEntry = sFactionStore.LookupEntry(factionEntry2->team);
-            if(team2_factionEntry)
+            FactionEntry const* team2_factionEntry = sFactionStore.LookupEntry(factionEntry2->team);
+            if (team2_factionEntry)
                 GetReputationMgr().ModifyReputation(team2_factionEntry, donerep2 / 2);
         }
     }
 }
 
-//Calculate how many reputation points player gain with the quest
-void Player::RewardReputation(Quest const *pQuest)
+// Calculate how many reputation points player gain with the quest
+void Player::RewardReputation(Quest const* pQuest)
 {
     // quest reputation reward/loss
-    for(int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
     {
         if (!pQuest->RewRepFaction[i])
             continue;
@@ -6351,7 +6673,7 @@ void Player::RewardReputation(Quest const *pQuest)
         // No diplomacy mod are applied to the final value (flat). Note the formula (finalValue = DBvalue/100)
         if (pQuest->RewRepValue[i])
         {
-            int32 rep = CalculateReputationGain(REPUTATION_SOURCE_QUEST, pQuest->RewRepValue[i]/100, pQuest->RewRepFaction[i], GetQuestLevelForPlayer(pQuest), true);
+            int32 rep = CalculateReputationGain(REPUTATION_SOURCE_QUEST, pQuest->RewRepValue[i] / 100, pQuest->RewRepFaction[i], GetQuestLevelForPlayer(pQuest), true);
 
             if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(pQuest->RewRepFaction[i]))
                 GetReputationMgr().ModifyReputation(factionEntry, rep);
@@ -6361,7 +6683,7 @@ void Player::RewardReputation(Quest const *pQuest)
             uint32 row = ((pQuest->RewRepValueId[i] < 0) ? 1 : 0) + 1;
             uint32 field = abs(pQuest->RewRepValueId[i]);
 
-            if (const QuestFactionRewardEntry *pRow = sQuestFactionRewardStore.LookupEntry(row))
+            if (const QuestFactionRewardEntry* pRow = sQuestFactionRewardStore.LookupEntry(row))
             {
                 int32 repPoints = pRow->rewardValue[field];
 
@@ -6390,20 +6712,20 @@ void Player::UpdateHonorFields()
     time_t now = time(NULL);
     time_t today = (time(NULL) / DAY) * DAY;
 
-    if(m_lastHonorUpdateTime < today)
+    if (m_lastHonorUpdateTime < today)
     {
         time_t yesterday = today - DAY;
 
         uint16 kills_today = PAIR32_LOPART(GetUInt32Value(PLAYER_FIELD_KILLS));
 
         // update yesterday's contribution
-        if(m_lastHonorUpdateTime >= yesterday )
+        if (m_lastHonorUpdateTime >= yesterday)
         {
             SetUInt32Value(PLAYER_FIELD_YESTERDAY_CONTRIBUTION, GetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION));
 
             // this is the first update today, reset today's contribution
             SetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, 0);
-            SetUInt32Value(PLAYER_FIELD_KILLS, MAKE_PAIR32(0,kills_today));
+            SetUInt32Value(PLAYER_FIELD_KILLS, MAKE_PAIR32(0, kills_today));
         }
         else
         {
@@ -6414,13 +6736,85 @@ void Player::UpdateHonorFields()
     }
 
     m_lastHonorUpdateTime = now;
+
+    // START custom PvP Honor Kills Title System
+    if (sWorld.getConfig(CONFIG_BOOL_ALLOW_HONOR_KILLS_TITLES))
+    {
+        uint32 HonorKills = GetUInt32Value(PLAYER_FIELD_LIFETIME_HONORBALE_KILLS);
+        uint32 victim_rank = 0;
+
+        //this may consume a lot of cpu cycles.
+        //You can use this sql query: "SELECT max(totalKills) FROM characters" to get the max totalKills
+        //of yours players and edit this condition to:  "if (HonorKills < 15 || HonorKills > max(totalKills)+1)) return;"
+        //don't forget to replace max(totalKills) with the result of query
+        if (HonorKills < 15)
+            return;
+
+        if (HonorKills >= 15 && HonorKills < 2000)
+            victim_rank = 1;
+        else if (HonorKills >= 2000 && HonorKills < 5000)
+            victim_rank = 2;
+        else if (HonorKills >= 5000 && HonorKills < 10000)
+            victim_rank = 3;
+        else if (HonorKills >= 10000 && HonorKills < 15000)
+            victim_rank = 4;
+        else if (HonorKills >= 15000 && HonorKills < 20000)
+            victim_rank = 5;
+        else if (HonorKills >= 20000 && HonorKills < 25000)
+            victim_rank = 6;
+        else if (HonorKills >= 25000 && HonorKills < 30000)
+            victim_rank = 7;
+        else if (HonorKills >= 30000 && HonorKills < 35000)
+            victim_rank = 8;
+        else if (HonorKills >= 35000 && HonorKills < 40000)
+            victim_rank = 9;
+        else if (HonorKills >= 40000 && HonorKills < 45000)
+            victim_rank = 10;
+        else if (HonorKills >= 45000 && HonorKills < 50000)
+            victim_rank = 11;
+        else if (HonorKills >= 50000 && HonorKills < 55000)
+            victim_rank = 12;
+        else if (HonorKills >= 55000 && HonorKills < 60000)
+            victim_rank = 13;
+        else if (HonorKills >= 60000)
+            victim_rank = 14;
+
+        // horde titles starting from 15+
+        if (GetTeam() == HORDE)
+            victim_rank += 14;
+
+        if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(victim_rank))
+        {
+            // if player does have title there is no need to update fourther
+            if (!HasTitle(titleEntry))
+            {
+                // lets remove all previous ranks
+                for (uint8 i = 1; i < 29; ++i)
+                {
+                    if (CharTitlesEntry const* title = sCharTitlesStore.LookupEntry(i))
+                    {
+                        if (HasTitle(title))
+                            SetTitle(title, true);
+                    }
+                }
+                // finaly apply and set as active new title
+                SetTitle(titleEntry);
+                SetUInt32Value(PLAYER_CHOSEN_TITLE, victim_rank);
+            }
+        }
+    }
+    // END custom PvP Honor Kills Title System
 }
 
-///Calculate the amount of honor gained based on the victim
-///and the size of the group for which the honor is divided
-///An exact honor value can also be given (overriding the calcs)
-bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor)
+/// Calculate the amount of honor gained based on the victim
+/// and the size of the group for which the honor is divided
+/// An exact honor value can also be given (overriding the calcs)
+bool Player::RewardHonor(Unit* uVictim, uint32 groupsize, float honor)
 {
+    // Do not reward honor to player marked as afk in Battlegrounds
+    if (HasAura(43681))
+        return false;
+
     // do not reward honor in arenas, but enable onkill spellproc
     if (InArena())
     {
@@ -6452,12 +6846,12 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor)
 
         if (uVictim->GetTypeId() == TYPEID_PLAYER)
         {
-            Player *pVictim = (Player *)uVictim;
+            Player* pVictim = (Player*)uVictim;
 
             if (GetTeam() == pVictim->GetTeam() && !sWorld.IsFFAPvPRealm())
                 return false;
 
-            float f = 1;                                    //need for total kills (?? need more info)
+            float f = 1;                                    // need for total kills (?? need more info)
             uint32 k_grey = 0;
             uint32 k_level = getLevel();
             uint32 v_level = pVictim->getLevel();
@@ -6487,45 +6881,50 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor)
 
             k_grey = MaNGOS::XP::GetGrayLevel(k_level);
 
-            if (v_level<=k_grey)
+            if (v_level <= k_grey)
                 return false;
 
             float diff_level = (k_level == k_grey) ? 1 : ((float(v_level) - float(k_grey)) / (float(k_level) - float(k_grey)));
 
-            int32 v_rank =1;                                //need more info
+            int32 v_rank = 1;                               // need more info
 
-            honor = ((f * diff_level * (190 + v_rank*10))/6);
-            honor *= float(k_level) / 70.0f;                //factor of dependence on levels of the killer
+            honor = ((f * diff_level * (190 + v_rank * 10)) / 6);
+            honor *= float(k_level) / 70.0f;                // factor of dependence on levels of the killer
 
             // count the number of playerkills in one day
             ApplyModUInt32Value(PLAYER_FIELD_KILLS, 1, true);
             // and those in a lifetime
             ApplyModUInt32Value(PLAYER_FIELD_LIFETIME_HONORBALE_KILLS, 1, true);
             UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL);
+            UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL, 1);
             UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HK_CLASS, pVictim->getClass());
             UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HK_RACE, pVictim->getRace());
         }
         else
         {
-            Creature *cVictim = (Creature *)uVictim;
+            Creature* cVictim = (Creature*)uVictim;
 
             if (!cVictim->IsRacialLeader())
                 return false;
 
-            honor = 100;                                    // ??? need more info
+            honor = 2000;                                    // ??? need more info
             victim_rank = 19;                               // HK: Leader
+
+            if (groupsize > 1)
+                honor *= groupsize;
         }
     }
 
     if (uVictim != NULL)
     {
         honor *= sWorld.getConfig(CONFIG_FLOAT_RATE_HONOR);
-        honor *= (GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HONOR_GAIN) + 100.0f)/100.0f;
+        honor *= (GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HONOR_GAIN) + 100.0f) / 100.0f;
 
         if (groupsize > 1)
             honor /= groupsize;
 
-        honor *= (((float)urand(8,12))/10);                 // approx honor: 80% - 120% of real honor
+        honor *= (((float)urand(8, 12)) / 10);              // approx honor: 80% - 120% of real honor
+        honor *= 2.0f;   // as of 3.3.3  HK have had a 100% increase to honor
     }
 
     // honor - for show honor points in log
@@ -6584,68 +6983,69 @@ void Player::ModifyArenaPoints(int32 value)
 
 uint32 Player::GetGuildIdFromDB(ObjectGuid guid)
 {
-    uint32 lowguid = guid.GetCounter();
-
-    QueryResult* result = CharacterDatabase.PQuery("SELECT guildid FROM guild_member WHERE guid='%u'", lowguid);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT guildid FROM guild_member WHERE guid = %u", guid.GetCounter());
     if (!result)
         return 0;
 
     uint32 id = result->Fetch()[0].GetUInt32();
     delete result;
+
     return id;
 }
 
 uint32 Player::GetRankFromDB(ObjectGuid guid)
 {
-    QueryResult *result = CharacterDatabase.PQuery("SELECT rank FROM guild_member WHERE guid='%u'", guid.GetCounter());
-    if (result)
-    {
-        uint32 v = result->Fetch()[0].GetUInt32();
-        delete result;
-        return v;
-    }
-    else
+    QueryResult* result = CharacterDatabase.PQuery("SELECT rank FROM guild_member WHERE guid = %u", guid.GetCounter());
+    if (!result)
         return 0;
+
+    uint32 rank = result->Fetch()[0].GetUInt32();
+    delete result;
+
+    return rank;
 }
 
 uint32 Player::GetArenaTeamIdFromDB(ObjectGuid guid, ArenaType type)
 {
-    QueryResult *result = CharacterDatabase.PQuery("SELECT arena_team_member.arenateamid FROM arena_team_member JOIN arena_team ON arena_team_member.arenateamid = arena_team.arenateamid WHERE guid='%u' AND type='%u' LIMIT 1", guid.GetCounter(), type);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT arena_team_member.arenateamid FROM arena_team_member JOIN arena_team ON arena_team_member.arenateamid = arena_team.arenateamid WHERE guid = %u AND type = %u LIMIT 1", guid.GetCounter(), type);
     if (!result)
         return 0;
 
     uint32 id = (*result)[0].GetUInt32();
     delete result;
+
     return id;
 }
 
 uint32 Player::GetZoneIdFromDB(ObjectGuid guid)
 {
-    uint32 lowguid = guid.GetCounter();
-    QueryResult *result = CharacterDatabase.PQuery("SELECT zone FROM characters WHERE guid='%u'", lowguid);
+    uint32 lowGuid = guid.GetCounter();
+
+    QueryResult* result = CharacterDatabase.PQuery("SELECT zone FROM characters WHERE guid = %u", lowGuid);
     if (!result)
         return 0;
-    Field* fields = result->Fetch();
-    uint32 zone = fields[0].GetUInt32();
+
+    uint32 zone = result->Fetch()[0].GetUInt32();
     delete result;
 
     if (!zone)
     {
         // stored zone is zero, use generic and slow zone detection
-        result = CharacterDatabase.PQuery("SELECT map,position_x,position_y,position_z FROM characters WHERE guid='%u'", lowguid);
-        if( !result )
+        result = CharacterDatabase.PQuery("SELECT map, position_x, position_y, position_z FROM characters WHERE guid = %u", lowGuid);
+        if (!result)
             return 0;
-        fields = result->Fetch();
+
+        Field* fields = result->Fetch();
         uint32 map = fields[0].GetUInt32();
         float posx = fields[1].GetFloat();
         float posy = fields[2].GetFloat();
         float posz = fields[3].GetFloat();
         delete result;
 
-        zone = sTerrainMgr.GetZoneId(map,posx,posy,posz);
+        zone = sTerrainMgr.GetZoneId(map, posx, posy, posz);
 
         if (zone > 0)
-            CharacterDatabase.PExecute("UPDATE characters SET zone='%u' WHERE guid='%u'", zone, lowguid);
+            CharacterDatabase.PExecute("UPDATE characters SET zone = %u WHERE guid = %u", zone, lowGuid);
     }
 
     return zone;
@@ -6653,14 +7053,11 @@ uint32 Player::GetZoneIdFromDB(ObjectGuid guid)
 
 uint32 Player::GetLevelFromDB(ObjectGuid guid)
 {
-    uint32 lowguid = guid.GetCounter();
-
-    QueryResult *result = CharacterDatabase.PQuery("SELECT level FROM characters WHERE guid='%u'", lowguid);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT level FROM characters WHERE guid = %u", guid.GetCounter());
     if (!result)
         return 0;
 
-    Field* fields = result->Fetch();
-    uint32 level = fields[0].GetUInt32();
+    uint32 level = result->Fetch()[0].GetUInt32();
     delete result;
 
     return level;
@@ -6668,7 +7065,14 @@ uint32 Player::GetLevelFromDB(ObjectGuid guid)
 
 void Player::UpdateArea(uint32 newArea)
 {
-    m_areaUpdateId    = newArea;
+    if (m_areaUpdateId != newArea)
+    {
+        // call this method in order to handle some scripted maps
+        if (InstanceData* mapInstance = GetInstanceData())
+            mapInstance->OnPlayerEnterArea(this, newArea, m_areaUpdateId);
+    }
+
+    m_areaUpdateId = newArea;
 
     AreaTableEntry const* area = GetAreaEntryByAreaID(newArea);
 
@@ -6683,10 +7087,22 @@ void Player::UpdateArea(uint32 newArea)
     {
         // remove ffa flag only if not ffapvp realm
         // removal in sanctuaries and capitals is handled in zone update
-        if(IsFFAPvP() && !sWorld.IsFFAPvPRealm())
+        if (IsFFAPvP() && !sWorld.IsFFAPvPRealm())
             SetFFAPvP(false);
     }
 
+    uint32 const areaRestFlag = (GetTeam() == ALLIANCE) ? AREA_FLAG_REST_ZONE_ALLIANCE : AREA_FLAG_REST_ZONE_HORDE;
+    if (area && area->flags & areaRestFlag)
+    {
+        SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);
+        SetRestType(REST_TYPE_IN_FACTION_AREA);
+    }
+    else if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && GetRestType() == REST_TYPE_IN_FACTION_AREA)
+    {
+        RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);
+        SetRestType(REST_TYPE_NO);
+    }
+
     if (area)
     {
         // Dalaran restricted flight zone
@@ -6701,21 +7117,51 @@ void Player::UpdateArea(uint32 newArea)
     UpdateAreaDependentAuras();
 }
 
+bool Player::IsOutdoorPvPActive()
+{
+    return CanUseCapturePoint();
+}
+
+bool Player::CanUseCapturePoint()
+{
+    return isAlive() &&                                     // living
+           !HasStealthAura() &&                             // not stealthed
+           !HasInvisibilityAura() &&                        // visible
+           (IsPvP() || sWorld.IsPvPRealm()) &&
+           !HasMovementFlag(MOVEFLAG_FLYING) &&
+           !IsTaxiFlying() &&
+           !isGameMaster();
+}
+
 void Player::UpdateZone(uint32 newZone, uint32 newArea)
 {
     AreaTableEntry const* zone = GetAreaEntryByAreaID(newZone);
-    if(!zone)
+    if (!zone)
         return;
 
-    if(m_zoneUpdateId != newZone)
+    if (m_zoneUpdateId != newZone)
     {
+        sWorldStateMgr.CreateZoneAreaStateIfNeed(this, newZone, newArea);
+
+        // Called when a player leave zone
+        if (InstanceData* mapInstance = GetInstanceData())
+            mapInstance->OnPlayerLeaveZone(this, m_zoneUpdateId);
+
+        // handle outdoor pvp zones
+        sOutdoorPvPMgr.HandlePlayerLeaveZone(this, m_zoneUpdateId);
+        sOutdoorPvPMgr.HandlePlayerEnterZone(this, newZone);
+
         SendInitWorldStates(newZone, newArea);              // only if really enters to new zone, not just area change, works strange...
 
+        // call this method in order to handle some scripted zones
+        if (InstanceData* mapInstance = GetInstanceData())
+            mapInstance->OnPlayerEnterZone(this, newZone, newArea);
+
         if (sWorld.getConfig(CONFIG_BOOL_WEATHER))
         {
-            if(Weather *wth = sWorld.FindWeather(zone->ID))
+            if (Weather* wth = sWorld.FindWeather(zone->ID))
                 wth->SendWeatherUpdateToPlayer(this);
-            else if(!sWorld.AddWeather(zone->ID))
+            else if (!sWorld.AddWeather(zone->ID))
             {
                 // send fine weather packet to remove old zone's weather
                 Weather::SendFineWeatherUpdateToPlayer(this);
@@ -6731,13 +7177,13 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
 
     // in PvP, any not controlled zone (except zone->team == 6, default case)
     // in PvE, only opposition team capital
-    switch(zone->team)
+    switch (zone->team)
     {
         case AREATEAM_ALLY:
-            pvpInfo.inHostileArea = GetTeam() != ALLIANCE && (sWorld.IsPvPRealm() || zone->flags & AREA_FLAG_CAPITAL);
+            pvpInfo.inHostileArea = GetTeam() != ALLIANCE && (sWorld.IsPvPRealm() || (zone->flags & AREA_FLAG_CAPITAL));
             break;
         case AREATEAM_HORDE:
-            pvpInfo.inHostileArea = GetTeam() != HORDE && (sWorld.IsPvPRealm() || zone->flags & AREA_FLAG_CAPITAL);
+            pvpInfo.inHostileArea = GetTeam() != HORDE && (sWorld.IsPvPRealm() || (zone->flags & AREA_FLAG_CAPITAL));
             break;
         case AREATEAM_NONE:
             // overwrite for battlegrounds, maybe batter some zone flags but current known not 100% fit to this
@@ -6748,21 +7194,21 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
             break;
     }
 
-    if(pvpInfo.inHostileArea)                               // in hostile area
+    if (pvpInfo.inHostileArea)                              // in hostile area
     {
-        if(!IsPvP() || pvpInfo.endTimer != 0)
+        if (!IsPvP() || pvpInfo.endTimer != 0)
             UpdatePvP(true, true);
     }
     else                                                    // in friendly area
     {
-        if(IsPvP() && !HasFlag(PLAYER_FLAGS,PLAYER_FLAGS_IN_PVP) && pvpInfo.endTimer == 0)
+        if (IsPvP() && !HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP) && pvpInfo.endTimer == 0)
             pvpInfo.endTimer = time(0);                     // start toggle-off
     }
 
-    if(zone->flags & AREA_FLAG_SANCTUARY)                   // in sanctuary
+    if (zone->flags & AREA_FLAG_SANCTUARY)                   // in sanctuary
     {
         SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_SANCTUARY);
-        if(sWorld.IsFFAPvPRealm())
+        if (sWorld.IsFFAPvPRealm())
             SetFFAPvP(false);
     }
     else
@@ -6770,7 +7216,7 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
         RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_SANCTUARY);
     }
 
-    if(zone->flags & AREA_FLAG_CAPITAL)                     // in capital city
+    if (zone->flags & AREA_FLAG_CAPITAL)                    // in capital city
         SetRestType(REST_TYPE_IN_CITY);
     else if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && GetRestType() != REST_TYPE_IN_TAVERN)
         // resting and not in tavern (leave city then); tavern leave handled in CheckAreaExploreAndOutdoor
@@ -6778,24 +7224,24 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
 
     // remove items with area/map limitations (delete only for alive player to allow back in ghost mode)
     // if player resurrected at teleport this will be applied in resurrect code
-    if(isAlive())
-        DestroyZoneLimitedItem( true, newZone );
+    if (isAlive())
+        DestroyZoneLimitedItem(true, newZone);
 
     // check some item equip limitations (in result lost CanTitanGrip at talent reset, for example)
     AutoUnequipOffhandIfNeed();
 
     // recent client version not send leave/join channel packets for built-in local channels
-    UpdateLocalChannels( newZone );
+    UpdateLocalChannels(newZone);
 
     // group update
-    if(GetGroup())
+    if (GetGroup())
         SetGroupUpdateFlag(GROUP_UPDATE_FLAG_ZONE);
 
     UpdateZoneDependentAuras();
     UpdateZoneDependentPets();
 }
 
-//If players are too far way of duel flag... then player loose the duel
+// If players are too far way of duel flag... then player loose the duel
 void Player::CheckDuelDistance(time_t currTime)
 {
     if (!duel)
@@ -6828,7 +7274,7 @@ void Player::CheckDuelDistance(time_t currTime)
             WorldPacket data(SMSG_DUEL_INBOUNDS, 0);
             GetSession()->SendPacket(&data);
         }
-        else if (currTime >= (duel->outOfBound+10))
+        else if (currTime >= (duel->outOfBound + 10))
         {
             DuelComplete(DUEL_FLED);
         }
@@ -6842,17 +7288,17 @@ void Player::DuelComplete(DuelCompleteType type)
         return;
 
     WorldPacket data(SMSG_DUEL_COMPLETE, (1));
-    data << (uint8)((type != DUEL_INTERUPTED) ? 1 : 0);
+    data << (uint8)((type != DUEL_INTERRUPTED) ? 1 : 0);
     GetSession()->SendPacket(&data);
     duel->opponent->GetSession()->SendPacket(&data);
 
-    if (type != DUEL_INTERUPTED)
+    if (type != DUEL_INTERRUPTED)
     {
-        data.Initialize(SMSG_DUEL_WINNER, (1+20));          // we guess size
-        data << (uint8)((type==DUEL_WON) ? 0 : 1);          // 0 = just won; 1 = fled
+        data.Initialize(SMSG_DUEL_WINNER, (1 + 20));        // we guess size
+        data << (uint8)((type == DUEL_WON) ? 0 : 1);        // 0 = just won; 1 = fled
         data << duel->opponent->GetName();
         data << GetName();
-        SendMessageToSet(&data,true);
+        SendMessageToSet(&data, true);
     }
 
     if (type == DUEL_WON)
@@ -6875,7 +7321,7 @@ void Player::DuelComplete(DuelCompleteType type)
             auras2remove.push_back(i->second->GetId());
     }
 
-    for(size_t i=0; i<auras2remove.size(); ++i)
+    for (size_t i=0; i<auras2remove.size(); ++i)
         duel->opponent->RemoveAurasDueToSpell(auras2remove[i]);
 
     auras2remove.clear();
@@ -6885,7 +7331,7 @@ void Player::DuelComplete(DuelCompleteType type)
         if (!i->second->IsPositive() && i->second->GetCasterGuid() == duel->opponent->GetObjectGuid() && i->second->GetAuraApplyTime() >= duel->startTime)
             auras2remove.push_back(i->second->GetId());
     }
-    for (size_t i=0; i<auras2remove.size(); ++i)
+    for (size_t i = 0; i < auras2remove.size(); ++i)
         RemoveAurasDueToSpell(auras2remove[i]);
 
     // cleanup combo points
@@ -6899,7 +7345,7 @@ void Player::DuelComplete(DuelCompleteType type)
     else if (duel->opponent->GetComboTargetGuid() == GetPetGuid())
         duel->opponent->ClearComboPoints();
 
-    //cleanups
+    // cleanups
     SetGuidValue(PLAYER_DUEL_ARBITER, ObjectGuid());
     SetUInt32Value(PLAYER_DUEL_TEAM, 0);
     duel->opponent->SetGuidValue(PLAYER_DUEL_ARBITER, ObjectGuid());
@@ -6913,46 +7359,45 @@ void Player::DuelComplete(DuelCompleteType type)
 
 //---------------------------------------------------------//
 
-void Player::_ApplyItemMods(Item *item, uint8 slot,bool apply)
+void Player::_ApplyItemMods(Item* item, uint8 slot, bool apply)
 {
-    if(slot >= INVENTORY_SLOT_BAG_END || !item)
+    if (slot >= INVENTORY_SLOT_BAG_END || !item)
         return;
 
     // not apply/remove mods for broken item
-    if(item->IsBroken())
+    if (item->IsBroken())
         return;
 
-    ItemPrototype const *proto = item->GetProto();
-
-    if(!proto)
+    ItemPrototype const* proto = item->GetProto();
+    if (!proto)
         return;
 
-    DETAIL_LOG("applying mods for item %u ",item->GetGUIDLow());
+    DETAIL_LOG("applying mods for item %u ", item->GetGUIDLow());
 
     uint32 attacktype = Player::GetAttackBySlot(slot);
-    if(attacktype < MAX_ATTACK)
-        _ApplyWeaponDependentAuraMods(item,WeaponAttackType(attacktype),apply);
+    if (attacktype < MAX_ATTACK)
+        _ApplyWeaponDependentAuraMods(item, WeaponAttackType(attacktype), apply);
 
-    _ApplyItemBonuses(proto,slot,apply);
+    _ApplyItemBonuses(proto, slot, apply);
 
-    if( slot==EQUIPMENT_SLOT_RANGED )
+    if (slot == EQUIPMENT_SLOT_RANGED)
         _ApplyAmmoBonuses();
 
-    ApplyItemEquipSpell(item,apply);
+    ApplyItemEquipSpell(item, apply);
     ApplyEnchantment(item, apply);
 
-    if(proto->Socket[0].Color)                              //only (un)equipping of items with sockets can influence metagems, so no need to waste time with normal items
+    if (proto->Socket[0].Color)                              //only (un)equipping of items with sockets can influence metagems, so no need to waste time with normal items
         CorrectMetaGemEnchants(slot, apply);
 
     DEBUG_LOG("_ApplyItemMods complete.");
 }
 
-void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool apply, bool only_level_scale /*= false*/)
+void Player::_ApplyItemBonuses(ItemPrototype const* proto, uint8 slot, bool apply, bool only_level_scale /*= false*/)
 {
     if (slot >= INVENTORY_SLOT_BAG_END || !proto)
         return;
 
-    ScalingStatDistributionEntry const *ssd = proto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(proto->ScalingStatDistribution) : NULL;
+    ScalingStatDistributionEntry const* ssd = proto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(proto->ScalingStatDistribution) : NULL;
     if (only_level_scale && !ssd)
         return;
 
@@ -6961,7 +7406,7 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
     if (ssd && ssd_level > ssd->MaxLevel)
         ssd_level = ssd->MaxLevel;
 
-    ScalingStatValuesEntry const *ssv = proto->ScalingStatValue ? sScalingStatValuesStore.LookupEntry(ssd_level) : NULL;
+    ScalingStatValuesEntry const* ssv = proto->ScalingStatValue ? sScalingStatValuesStore.LookupEntry(ssd_level) : NULL;
     if (only_level_scale && !ssv)
         return;
 
@@ -6985,7 +7430,7 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
             val = proto->ItemStat[i].ItemStatValue;
         }
 
-        if(val == 0)
+        if (val == 0)
             continue;
 
         switch (statType)
@@ -7000,19 +7445,19 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
                 HandleStatModifier(UNIT_MOD_STAT_AGILITY, BASE_VALUE, float(val), apply);
                 ApplyStatBuffMod(STAT_AGILITY, float(val), apply);
                 break;
-            case ITEM_MOD_STRENGTH:                         //modify strength
+            case ITEM_MOD_STRENGTH:                         // modify strength
                 HandleStatModifier(UNIT_MOD_STAT_STRENGTH, BASE_VALUE, float(val), apply);
                 ApplyStatBuffMod(STAT_STRENGTH, float(val), apply);
                 break;
-            case ITEM_MOD_INTELLECT:                        //modify intellect
+            case ITEM_MOD_INTELLECT:                        // modify intellect
                 HandleStatModifier(UNIT_MOD_STAT_INTELLECT, BASE_VALUE, float(val), apply);
                 ApplyStatBuffMod(STAT_INTELLECT, float(val), apply);
                 break;
-            case ITEM_MOD_SPIRIT:                           //modify spirit
+            case ITEM_MOD_SPIRIT:                           // modify spirit
                 HandleStatModifier(UNIT_MOD_STAT_SPIRIT, BASE_VALUE, float(val), apply);
                 ApplyStatBuffMod(STAT_SPIRIT, float(val), apply);
                 break;
-            case ITEM_MOD_STAMINA:                          //modify stamina
+            case ITEM_MOD_STAMINA:                          // modify stamina
                 HandleStatModifier(UNIT_MOD_STAT_STAMINA, BASE_VALUE, float(val), apply);
                 ApplyStatBuffMod(STAT_STAMINA, float(val), apply);
                 break;
@@ -7122,6 +7567,9 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
             case ITEM_MOD_SPELL_POWER:
                 ApplySpellPowerBonus(int32(val), apply);
                 break;
+            case ITEM_MOD_HEALTH_REGEN:
+                ApplyHealthRegenBonus(int32(val), apply);
+                break;
             case ITEM_MOD_SPELL_PENETRATION:
                 ApplyModInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE, -int32(val), apply);
                 m_spellPenetrationItemMod += apply ? val : -val;
@@ -7138,7 +7586,7 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
     }
 
     // Apply Spell Power from ScalingStatValue if set
-    if(ssv)
+    if (ssv)
     {
         if (int32 spellbonus = ssv->getSpellBonus(proto->ScalingStatValue))
             ApplySpellPowerBonus(spellbonus, apply);
@@ -7157,7 +7605,7 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
 
     if (armor)
     {
-        switch(proto->InventoryType)
+        switch (proto->InventoryType)
         {
             case INVTYPE_TRINKET:
             case INVTYPE_NECK:
@@ -7195,13 +7643,13 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
     WeaponAttackType attType = BASE_ATTACK;
     float damage = 0.0f;
 
-    if( slot == EQUIPMENT_SLOT_RANGED && (
+    if (slot == EQUIPMENT_SLOT_RANGED && (
         proto->InventoryType == INVTYPE_RANGED || proto->InventoryType == INVTYPE_THROWN ||
-        proto->InventoryType == INVTYPE_RANGEDRIGHT ))
+        proto->InventoryType == INVTYPE_RANGEDRIGHT))
     {
         attType = RANGED_ATTACK;
     }
-    else if(slot==EQUIPMENT_SLOT_OFFHAND)
+    else if (slot == EQUIPMENT_SLOT_OFFHAND)
     {
         attType = OFF_ATTACK;
     }
@@ -7219,14 +7667,14 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
             maxDamage = 1.3f * average;
         }
     }
-    if (minDamage > 0 )
+    if (minDamage > 0)
     {
         damage = apply ? minDamage : BASE_MINDAMAGE;
         SetBaseWeaponDamage(attType, MINDAMAGE, damage);
-        //sLog.outError("applying mindam: assigning %f to weapon mindamage, now is: %f", damage, GetWeaponDamageRange(attType, MINDAMAGE));
+        // sLog.outError("applying mindam: assigning %f to weapon mindamage, now is: %f", damage, GetWeaponDamageRange(attType, MINDAMAGE));
     }
 
-    if (maxDamage  > 0 )
+    if (maxDamage  > 0)
     {
         damage = apply ? maxDamage : BASE_MAXDAMAGE;
         SetBaseWeaponDamage(attType, MAXDAMAGE, damage);
@@ -7251,67 +7699,69 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
 
     if (proto->Delay)
     {
-        if(slot == EQUIPMENT_SLOT_RANGED)
-            SetAttackTime(RANGED_ATTACK, apply ? proto->Delay: BASE_ATTACK_TIME);
-        else if(slot==EQUIPMENT_SLOT_MAINHAND)
-            SetAttackTime(BASE_ATTACK, apply ? proto->Delay: BASE_ATTACK_TIME);
-        else if(slot==EQUIPMENT_SLOT_OFFHAND)
-            SetAttackTime(OFF_ATTACK, apply ? proto->Delay: BASE_ATTACK_TIME);
+        if (slot == EQUIPMENT_SLOT_RANGED)
+            SetAttackTime(RANGED_ATTACK, apply ? proto->Delay : BASE_ATTACK_TIME);
+        else if (slot == EQUIPMENT_SLOT_MAINHAND)
+            SetAttackTime(BASE_ATTACK, apply ? proto->Delay : BASE_ATTACK_TIME);
+        else if (slot == EQUIPMENT_SLOT_OFFHAND)
+            SetAttackTime(OFF_ATTACK, apply ? proto->Delay : BASE_ATTACK_TIME);
     }
 
-    if(CanModifyStats() && (damage || proto->Delay))
+    if (CanModifyStats() && (damage || proto->Delay))
         UpdateDamagePhysical(attType);
 }
 
-void Player::_ApplyWeaponDependentAuraMods(Item *item,WeaponAttackType attackType,bool apply)
+void Player::_ApplyWeaponDependentAuraMods(Item* item, WeaponAttackType attackType, bool apply)
 {
-    AuraList const& auraCritList = GetAurasByType(SPELL_AURA_MOD_CRIT_PERCENT);
-    for(AuraList::const_iterator itr = auraCritList.begin(); itr!=auraCritList.end();++itr)
-        _ApplyWeaponDependentAuraCritMod(item,attackType,*itr,apply);
+    MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
 
-    AuraList const& auraDamageFlatList = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE);
-    for(AuraList::const_iterator itr = auraDamageFlatList.begin(); itr!=auraDamageFlatList.end();++itr)
-        _ApplyWeaponDependentAuraDamageMod(item,attackType,*itr,apply);
+    AuraList& auraCritList = GetAurasByType(SPELL_AURA_MOD_CRIT_PERCENT);
+    for (AuraList::iterator itr = auraCritList.begin(); itr!=auraCritList.end();++itr)
+        _ApplyWeaponDependentAuraCritMod(item,attackType,(*itr)(),apply);
 
-    AuraList const& auraDamagePCTList = GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
-    for(AuraList::const_iterator itr = auraDamagePCTList.begin(); itr!=auraDamagePCTList.end();++itr)
-        _ApplyWeaponDependentAuraDamageMod(item,attackType,*itr,apply);
+    AuraList& auraDamageFlatList = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE);
+    for (AuraList::iterator itr = auraDamageFlatList.begin(); itr!=auraDamageFlatList.end();++itr)
+        _ApplyWeaponDependentAuraDamageMod(item,attackType,(*itr)(),apply);
+
+    AuraList& auraDamagePCTList = GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
+    for (AuraList::iterator itr = auraDamagePCTList.begin(); itr!=auraDamagePCTList.end();++itr)
+        _ApplyWeaponDependentAuraDamageMod(item,attackType,(*itr)(),apply);
 }
 
-void Player::_ApplyWeaponDependentAuraCritMod(Item *item, WeaponAttackType attackType, Aura* aura, bool apply)
+void Player::_ApplyWeaponDependentAuraCritMod(Item* item, WeaponAttackType attackType, Aura* aura, bool apply)
 {
     // generic not weapon specific case processes in aura code
-    if(aura->GetSpellProto()->EquippedItemClass == -1)
+    if (aura->GetSpellProto()->EquippedItemClass == -1)
         return;
 
     BaseModGroup mod = BASEMOD_END;
-    switch(attackType)
+    switch (attackType)
     {
         case BASE_ATTACK:   mod = CRIT_PERCENTAGE;        break;
-        case OFF_ATTACK:    mod = OFFHAND_CRIT_PERCENTAGE;break;
+        case OFF_ATTACK:    mod = OFFHAND_CRIT_PERCENTAGE; break;
         case RANGED_ATTACK: mod = RANGED_CRIT_PERCENTAGE; break;
         default: return;
     }
 
-    if (item->IsFitToSpellRequirements(aura->GetSpellProto()))
+    if (!item->IsBroken() && item->IsFitToSpellRequirements(aura->GetSpellProto()))
     {
-        HandleBaseModValue(mod, FLAT_MOD, float (aura->GetModifier()->m_amount), apply);
+        HandleBaseModValue(mod, FLAT_MOD, float(aura->GetModifier()->m_amount), apply);
     }
 }
 
-void Player::_ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType attackType, Aura* aura, bool apply)
+void Player::_ApplyWeaponDependentAuraDamageMod(Item* item, WeaponAttackType attackType, Aura* aura, bool apply)
 {
     // ignore spell mods for not wands
     Modifier const* modifier = aura->GetModifier();
-    if((modifier->m_miscvalue & SPELL_SCHOOL_MASK_NORMAL)==0 && (getClassMask() & CLASSMASK_WAND_USERS)==0)
+    if ((modifier->m_miscvalue & SPELL_SCHOOL_MASK_NORMAL)==0 && (getClassMask() & CLASSMASK_WAND_USERS)==0)
         return;
 
     // generic not weapon specific case processes in aura code
-    if(aura->GetSpellProto()->EquippedItemClass == -1)
+    if (aura->GetSpellProto()->EquippedItemClass == -1)
         return;
 
     UnitMods unitMod = UNIT_MOD_END;
-    switch(attackType)
+    switch (attackType)
     {
         case BASE_ATTACK:   unitMod = UNIT_MOD_DAMAGE_MAINHAND; break;
         case OFF_ATTACK:    unitMod = UNIT_MOD_DAMAGE_OFFHAND;  break;
@@ -7327,19 +7777,19 @@ void Player::_ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType att
         default: return;
     }
 
-    if (item->IsFitToSpellRequirements(aura->GetSpellProto()))
+    if (!item->IsBroken() && item->IsFitToSpellRequirements(aura->GetSpellProto()))
     {
-        HandleStatModifier(unitMod, unitModType, float(modifier->m_amount),apply);
+        HandleStatModifier(unitMod, unitModType, float(modifier->m_amount), apply);
     }
 }
 
-void Player::ApplyItemEquipSpell(Item *item, bool apply, bool form_change)
+void Player::ApplyItemEquipSpell(Item* item, bool apply, bool form_change)
 {
-    if(!item)
+    if (!item)
         return;
 
-    ItemPrototype const *proto = item->GetProto();
-    if(!proto)
+    ItemPrototype const* proto = item->GetProto();
+    if (!proto)
         return;
 
     for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
@@ -7347,7 +7797,7 @@ void Player::ApplyItemEquipSpell(Item *item, bool apply, bool form_change)
         _Spell const& spellData = proto->Spells[i];
 
         // no spell
-        if(!spellData.SpellId )
+        if (!spellData.SpellId)
             continue;
 
         if (apply)
@@ -7367,16 +7817,16 @@ void Player::ApplyItemEquipSpell(Item *item, bool apply, bool form_change)
 
         // check if it is valid spell
         SpellEntry const* spellproto = sSpellStore.LookupEntry(spellData.SpellId);
-        if(!spellproto)
+        if (!spellproto)
             continue;
 
-        ApplyEquipSpell(spellproto,item,apply,form_change);
+        ApplyEquipSpell(spellproto, item, apply, form_change);
     }
 }
 
 void Player::ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply, bool form_change)
 {
-    if(apply)
+    if (apply)
     {
         // Cannot be used in this stance/form
         if (GetErrorAtShapeshiftedCast(spellInfo, GetShapeshiftForm()) != SPELL_CAST_OK)
@@ -7390,23 +7840,23 @@ void Player::ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply
                 SpellAuraHolderBounds spair = GetSpellAuraHolderBounds(spellInfo->Id);
                 for (SpellAuraHolderMap::const_iterator iter = spair.first; iter != spair.second; ++iter)
                 {
-                    if(!item || iter->second->GetCastItemGuid() == item->GetObjectGuid())
+                    if (!item || iter->second->GetCastItemGuid() == item->GetObjectGuid())
                     {
                         found = true;
                         break;
                     }
                 }
-                if(found)
+                if (found)
                     break;
             }
 
-            if(found)                                       // and skip re-cast already active aura at form change
+            if (found)                                      // and skip re-cast already active aura at form change
                 return;
         }
 
         DEBUG_LOG("WORLD: cast %s Equip spellId - %i", (item ? "item" : "itemset"), spellInfo->Id);
 
-        CastSpell(this,spellInfo,true,item);
+        CastSpell(this, spellInfo, true, item);
     }
     else
     {
@@ -7418,7 +7868,7 @@ void Player::ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply
         }
 
         if (item)
-            RemoveAurasDueToItemSpell(item,spellInfo->Id);  // un-apply all spells , not only at-equipped
+            RemoveAurasDueToItemSpell(item, spellInfo->Id); // un-apply all spells , not only at-equipped
         else
             RemoveAurasDueToSpell(spellInfo->Id);           // un-apply spell (item set case)
     }
@@ -7428,28 +7878,28 @@ void Player::UpdateEquipSpellsAtFormChange()
 {
     for (int i = 0; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        if(m_items[i] && !m_items[i]->IsBroken())
+        if (m_items[i] && !m_items[i]->IsBroken())
         {
-            ApplyItemEquipSpell(m_items[i],false,true);     // remove spells that not fit to form
-            ApplyItemEquipSpell(m_items[i],true,true);      // add spells that fit form but not active
+            ApplyItemEquipSpell(m_items[i], false, true);   // remove spells that not fit to form
+            ApplyItemEquipSpell(m_items[i], true, true);    // add spells that fit form but not active
         }
     }
 
     // item set bonuses not dependent from item broken state
-    for(size_t setindex = 0; setindex < ItemSetEff.size(); ++setindex)
+    for (size_t setindex = 0; setindex < ItemSetEff.size(); ++setindex)
     {
         ItemSetEffect* eff = ItemSetEff[setindex];
-        if(!eff)
+        if (!eff)
             continue;
 
-        for(uint32 y=0;y<8; ++y)
+        for (uint32 y = 0; y < 8; ++y)
         {
             SpellEntry const* spellInfo = eff->spells[y];
-            if(!spellInfo)
+            if (!spellInfo)
                 continue;
 
-            ApplyEquipSpell(spellInfo,NULL,false,true);       // remove spells that not fit to form
-            ApplyEquipSpell(spellInfo,NULL,true,true);        // add spells that fit form but not active
+            ApplyEquipSpell(spellInfo, NULL, false, true);  // remove spells that not fit to form
+            ApplyEquipSpell(spellInfo, NULL, true, true);   // add spells that fit form but not active
         }
     }
 }
@@ -7467,12 +7917,12 @@ void Player::UpdateEquipSpellsAtFormChange()
  * function will call after it in some way if need.
  */
 
-void Player::ApplyItemOnStoreSpell(Item *item, bool apply)
+void Player::ApplyItemOnStoreSpell(Item* item, bool apply)
 {
     if (!item)
         return;
 
-    ItemPrototype const *proto = item->GetProto();
+    ItemPrototype const* proto = item->GetProto();
     if (!proto)
         return;
 
@@ -7504,7 +7954,7 @@ void Player::DestroyItemWithOnStoreSpell(Item* item, uint32 spellId)
     if (!item)
         return;
 
-    ItemPrototype const *proto = item->GetProto();
+    ItemPrototype const* proto = item->GetProto();
     if (!proto)
         return;
 
@@ -7526,9 +7976,9 @@ void Player::DestroyItemWithOnStoreSpell(Item* item, uint32 spellId)
 
 
 /// handles unique effect of Deadly Poison: apply poison of the other weapon when already at max. stack
-void Player::_HandleDeadlyPoison(Unit* Target, WeaponAttackType attType, SpellEntry const *spellInfo)
+void Player::_HandleDeadlyPoison(Unit* Target, WeaponAttackType attType, SpellEntry const* spellInfo)
 {
-    SpellAuraHolder const* dPoison = NULL;
+    SpellAuraHolderPtr dPoison = SpellAuraHolderPtr(NULL);
     SpellAuraHolderConstBounds holders = Target->GetSpellAuraHolderBounds(spellInfo->Id);
     for (SpellAuraHolderMap::const_iterator iter = holders.first; iter != holders.second; ++iter)
     {
@@ -7540,7 +7990,7 @@ void Player::_HandleDeadlyPoison(Unit* Target, WeaponAttackType attType, SpellEn
     }
     if (dPoison && dPoison->GetStackAmount() == spellInfo->StackAmount)
     {
-        Item *otherWeapon = GetWeaponForAttack(attType == BASE_ATTACK ? OFF_ATTACK : BASE_ATTACK );
+        Item* otherWeapon = GetWeaponForAttack(attType == BASE_ATTACK ? OFF_ATTACK : BASE_ATTACK);
         if (!otherWeapon)
             return;
 
@@ -7567,15 +8017,15 @@ void Player::_HandleDeadlyPoison(Unit* Target, WeaponAttackType attType, SpellEn
 
 void Player::CastItemCombatSpell(Unit* Target, WeaponAttackType attType)
 {
-    Item *item = GetWeaponForAttack(attType, true, false);
-    if(!item)
+    Item* item = GetWeaponForAttack(attType, true, false);
+    if (!item)
         return;
 
-    ItemPrototype const *proto = item->GetProto();
-    if(!proto)
+    ItemPrototype const* proto = item->GetProto();
+    if (!proto)
         return;
 
-    if (!Target || Target == this )
+    if (!Target || Target == this)
         return;
 
     for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
@@ -7583,32 +8033,32 @@ void Player::CastItemCombatSpell(Unit* Target, WeaponAttackType attType)
         _Spell const& spellData = proto->Spells[i];
 
         // no spell
-        if(!spellData.SpellId )
+        if (!spellData.SpellId)
             continue;
 
         // wrong triggering type
-        if(spellData.SpellTrigger != ITEM_SPELLTRIGGER_CHANCE_ON_HIT)
+        if (spellData.SpellTrigger != ITEM_SPELLTRIGGER_CHANCE_ON_HIT)
             continue;
 
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellData.SpellId);
-        if(!spellInfo)
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellData.SpellId);
+        if (!spellInfo)
         {
             sLog.outError("WORLD: unknown Item spellid %i", spellData.SpellId);
             continue;
         }
 
         // not allow proc extra attack spell at extra attack
-        if( m_extraAttacks && IsSpellHaveEffect(spellInfo,SPELL_EFFECT_ADD_EXTRA_ATTACKS) )
+        if (m_extraAttacks && IsSpellHaveEffect(spellInfo, SPELL_EFFECT_ADD_EXTRA_ATTACKS))
             return;
 
         float chance = (float)spellInfo->procChance;
 
-        if(spellData.SpellPPMRate)
+        if (spellData.SpellPPMRate)
         {
             uint32 WeaponSpeed = proto->Delay;
             chance = GetPPMProcChance(WeaponSpeed, spellData.SpellPPMRate);
         }
-        else if(chance > 100.0f)
+        else if (chance > 100.0f)
         {
             chance = GetWeaponProcChance();
         }
@@ -7618,22 +8068,21 @@ void Player::CastItemCombatSpell(Unit* Target, WeaponAttackType attType)
     }
 
     // item combat enchantments
-    for(int e_slot = 0; e_slot < MAX_ENCHANTMENT_SLOT; ++e_slot)
+    for (int e_slot = 0; e_slot < MAX_ENCHANTMENT_SLOT; ++e_slot)
     {
         uint32 enchant_id = item->GetEnchantmentId(EnchantmentSlot(e_slot));
-        SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
-        if(!pEnchant) continue;
+        SpellItemEnchantmentEntry const* pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+        if (!pEnchant) continue;
         for (int s = 0; s < 3; ++s)
         {
-            uint32 proc_spell_id = pEnchant->spellid[s];
-
             if (pEnchant->type[s] != ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL)
                 continue;
 
-            SpellEntry const *spellInfo = sSpellStore.LookupEntry(proc_spell_id);
+            uint32 proc_spell_id = pEnchant->spellid[s];
+            SpellEntry const* spellInfo = sSpellStore.LookupEntry(proc_spell_id);
             if (!spellInfo)
             {
-                sLog.outError("Player::CastItemCombatSpell Enchant %i, cast unknown spell %i", pEnchant->ID, proc_spell_id);
+                sLog.outError("Player::CastItemCombatSpell: %s enchant (id: %i), cast unknown spell (id: %i)", GetGuidStr().c_str(), pEnchant->ID, proc_spell_id);
                 continue;
             }
 
@@ -7644,9 +8093,8 @@ void Player::CastItemCombatSpell(Unit* Target, WeaponAttackType attType)
                 ? GetPPMProcChance(proto->Delay, ppmRate)
                 : pEnchant->amount[s] != 0 ? float(pEnchant->amount[s]) : GetWeaponProcChance();
 
-
-            ApplySpellMod(spellInfo->Id,SPELLMOD_CHANCE_OF_SUCCESS, chance);
-            ApplySpellMod(spellInfo->Id,SPELLMOD_FREQUENCY_OF_SUCCESS, chance);
+            ApplySpellMod(spellInfo->Id, SPELLMOD_CHANCE_OF_SUCCESS, chance);
+            ApplySpellMod(spellInfo->Id, SPELLMOD_FREQUENCY_OF_SUCCESS, chance);
 
             if (roll_chance_f(chance))
             {
@@ -7655,7 +8103,7 @@ void Player::CastItemCombatSpell(Unit* Target, WeaponAttackType attType)
                 else
                 {
                     // Deadly Poison, unique effect needs to be handled before casting triggered spell
-                    if (spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE && spellInfo->SpellFamilyFlags & UI64LIT(0x10000))
+                    if (spellInfo->IsFitToFamily<SPELLFAMILY_ROGUE, CF_ROGUE_DEADLY_POISON>())
                         _HandleDeadlyPoison(Target, attType, spellInfo);
 
                     CastSpell(Target, spellInfo->Id, true, item);
@@ -7665,26 +8113,27 @@ void Player::CastItemCombatSpell(Unit* Target, WeaponAttackType attType)
     }
 }
 
-void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 cast_count, uint32 glyphIndex)
+void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 cast_count, uint32 glyphIndex)
 {
     ItemPrototype const* proto = item->GetProto();
+
     // special learning case
-    if (proto->Spells[0].SpellId==SPELL_ID_GENERIC_LEARN || proto->Spells[0].SpellId==SPELL_ID_GENERIC_LEARN_PET)
+    if (proto->Spells[0].SpellId == SPELL_ID_GENERIC_LEARN || proto->Spells[0].SpellId == SPELL_ID_GENERIC_LEARN_PET)
     {
         uint32 learn_spell_id = proto->Spells[0].SpellId;
         uint32 learning_spell_id = proto->Spells[1].SpellId;
 
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(learn_spell_id);
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(learn_spell_id);
         if (!spellInfo)
         {
-            sLog.outError("Player::CastItemUseSpell: Item (Entry: %u) in have wrong spell id %u, ignoring ",proto->ItemId, learn_spell_id);
+            sLog.outError("Player::CastItemUseSpell: Item (Entry: %u) in have wrong spell id %u, ignoring ", proto->ItemId, learn_spell_id);
             SendEquipError(EQUIP_ERR_NONE, item);
             return;
         }
 
-        Spell *spell = new Spell(this, spellInfo, false);
+        Spell* spell = new Spell(this, spellInfo, false);
         spell->m_CastItem = item;
-        spell->m_cast_count = cast_count;                   //set count of casts
+        spell->m_cast_count = cast_count;                   // set count of casts
         spell->m_currentBasePoints[EFFECT_INDEX_0] = learning_spell_id;
         spell->prepare(&targets);
         return;
@@ -7694,7 +8143,7 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c
     int count = 0;
 
     // item spells casted at use
-    for(int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
+    for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
     {
         _Spell const& spellData = proto->Spells[i];
 
@@ -7706,14 +8155,14 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c
         if (spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_USE)
             continue;
 
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellData.SpellId);
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellData.SpellId);
         if (!spellInfo)
         {
-            sLog.outError("Player::CastItemUseSpell: Item (Entry: %u) in have wrong spell id %u, ignoring",proto->ItemId, spellData.SpellId);
+            sLog.outError("Player::CastItemUseSpell: Item (Entry: %u) in have wrong spell id %u, ignoring", proto->ItemId, spellData.SpellId);
             continue;
         }
 
-        Spell *spell = new Spell(this, spellInfo, (count > 0));
+        Spell* spell = new Spell(this, spellInfo, (count > 0));
         spell->m_CastItem = item;
         spell->m_cast_count = cast_count;                   // set count of casts
         spell->m_glyphIndex = glyphIndex;                   // glyph index
@@ -7726,23 +8175,23 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c
     for (int e_slot = 0; e_slot < MAX_ENCHANTMENT_SLOT; ++e_slot)
     {
         uint32 enchant_id = item->GetEnchantmentId(EnchantmentSlot(e_slot));
-        SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+        SpellItemEnchantmentEntry const* pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
         if (!pEnchant)
             continue;
 
         for (int s = 0; s < 3; ++s)
         {
-            if (pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_USE_SPELL)
+            if (pEnchant->type[s] != ITEM_ENCHANTMENT_TYPE_USE_SPELL)
                 continue;
 
-            SpellEntry const *spellInfo = sSpellStore.LookupEntry(pEnchant->spellid[s]);
+            SpellEntry const* spellInfo = sSpellStore.LookupEntry(pEnchant->spellid[s]);
             if (!spellInfo)
             {
                 sLog.outError("Player::CastItemUseSpell Enchant %i, cast unknown spell %i", pEnchant->ID, pEnchant->spellid[s]);
                 continue;
             }
 
-            Spell *spell = new Spell(this, spellInfo, (count > 0));
+            Spell* spell = new Spell(this, spellInfo, (count > 0));
             spell->m_CastItem = item;
             spell->m_cast_count = cast_count;               // set count of casts
             spell->m_glyphIndex = glyphIndex;               // glyph index
@@ -7759,41 +8208,41 @@ void Player::_RemoveAllItemMods()
 
     for (int i = 0; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        if(m_items[i])
+        if (m_items[i])
         {
-            ItemPrototype const *proto = m_items[i]->GetProto();
-            if(!proto)
+            ItemPrototype const* proto = m_items[i]->GetProto();
+            if (!proto)
                 continue;
 
             // item set bonuses not dependent from item broken state
-            if(proto->ItemSet)
-                RemoveItemsSetItem(this,proto);
+            if (proto->ItemSet)
+                RemoveItemsSetItem(this, proto);
 
-            if(m_items[i]->IsBroken())
+            if (m_items[i]->IsBroken())
                 continue;
 
-            ApplyItemEquipSpell(m_items[i],false);
+            ApplyItemEquipSpell(m_items[i], false);
             ApplyEnchantment(m_items[i], false);
         }
     }
 
     for (int i = 0; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        if(m_items[i])
+        if (m_items[i])
         {
-            if(m_items[i]->IsBroken())
+            if (m_items[i]->IsBroken())
                 continue;
-            ItemPrototype const *proto = m_items[i]->GetProto();
-            if(!proto)
+            ItemPrototype const* proto = m_items[i]->GetProto();
+            if (!proto)
                 continue;
 
             uint32 attacktype = Player::GetAttackBySlot(i);
-            if(attacktype < MAX_ATTACK)
-                _ApplyWeaponDependentAuraMods(m_items[i],WeaponAttackType(attacktype),false);
+            if (attacktype < MAX_ATTACK)
+                _ApplyWeaponDependentAuraMods(m_items[i], WeaponAttackType(attacktype), false);
 
-            _ApplyItemBonuses(proto,i, false);
+            _ApplyItemBonuses(proto, i, false);
 
-            if( i == EQUIPMENT_SLOT_RANGED )
+            if (i == EQUIPMENT_SLOT_RANGED)
                 _ApplyAmmoBonuses();
         }
     }
@@ -7807,42 +8256,42 @@ void Player::_ApplyAllItemMods()
 
     for (int i = 0; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        if(m_items[i])
+        if (m_items[i])
         {
-            if(m_items[i]->IsBroken())
+            if (m_items[i]->IsBroken())
                 continue;
 
-            ItemPrototype const *proto = m_items[i]->GetProto();
-            if(!proto)
+            ItemPrototype const* proto = m_items[i]->GetProto();
+            if (!proto)
                 continue;
 
             uint32 attacktype = Player::GetAttackBySlot(i);
-            if(attacktype < MAX_ATTACK)
-                _ApplyWeaponDependentAuraMods(m_items[i],WeaponAttackType(attacktype),true);
+            if (attacktype < MAX_ATTACK)
+                _ApplyWeaponDependentAuraMods(m_items[i], WeaponAttackType(attacktype), true);
 
-            _ApplyItemBonuses(proto,i, true);
+            _ApplyItemBonuses(proto, i, true);
 
-            if( i == EQUIPMENT_SLOT_RANGED )
+            if (i == EQUIPMENT_SLOT_RANGED)
                 _ApplyAmmoBonuses();
         }
     }
 
     for (int i = 0; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        if(m_items[i])
+        if (m_items[i])
         {
-            ItemPrototype const *proto = m_items[i]->GetProto();
-            if(!proto)
+            ItemPrototype const* proto = m_items[i]->GetProto();
+            if (!proto)
                 continue;
 
             // item set bonuses not dependent from item broken state
-            if(proto->ItemSet)
-                AddItemsSetItem(this,m_items[i]);
+            if (proto->ItemSet)
+                AddItemsSetItem(this, m_items[i]);
 
-            if(m_items[i]->IsBroken())
+            if (m_items[i]->IsBroken())
                 continue;
 
-            ApplyItemEquipSpell(m_items[i],true);
+            ApplyItemEquipSpell(m_items[i], true);
             ApplyEnchantment(m_items[i], true);
         }
     }
@@ -7854,16 +8303,16 @@ void Player::_ApplyAllLevelScaleItemMods(bool apply)
 {
     for (int i = 0; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        if(m_items[i])
+        if (m_items[i])
         {
-            if(m_items[i]->IsBroken())
+            if (m_items[i]->IsBroken())
                 continue;
 
-            ItemPrototype const *proto = m_items[i]->GetProto();
-            if(!proto)
+            ItemPrototype const* proto = m_items[i]->GetProto();
+            if (!proto)
                 continue;
 
-            _ApplyItemBonuses(proto,i, apply, true);
+            _ApplyItemBonuses(proto, i, apply, true);
         }
     }
 }
@@ -7872,50 +8321,50 @@ void Player::_ApplyAmmoBonuses()
 {
     // check ammo
     uint32 ammo_id = GetUInt32Value(PLAYER_AMMO_ID);
-    if(!ammo_id)
+    if (!ammo_id)
         return;
 
     float currentAmmoDPS;
 
-    ItemPrototype const *ammo_proto = ObjectMgr::GetItemPrototype( ammo_id );
-    if( !ammo_proto || ammo_proto->Class!=ITEM_CLASS_PROJECTILE || !CheckAmmoCompatibility(ammo_proto))
+    ItemPrototype const* ammo_proto = ObjectMgr::GetItemPrototype(ammo_id);
+    if (!ammo_proto || ammo_proto->Class != ITEM_CLASS_PROJECTILE || !CheckAmmoCompatibility(ammo_proto))
         currentAmmoDPS = 0.0f;
     else
         currentAmmoDPS = ammo_proto->Damage[0].DamageMin;
 
-    if(currentAmmoDPS == GetAmmoDPS())
+    if (currentAmmoDPS == GetAmmoDPS())
         return;
 
     m_ammoDPS = currentAmmoDPS;
 
-    if(CanModifyStats())
+    if (CanModifyStats())
         UpdateDamagePhysical(RANGED_ATTACK);
 }
 
-bool Player::CheckAmmoCompatibility(const ItemPrototype *ammo_proto) const
+bool Player::CheckAmmoCompatibility(const ItemPrototype* ammo_proto) const
 {
-    if(!ammo_proto)
+    if (!ammo_proto)
         return false;
 
     // check ranged weapon
-    Item *weapon = GetWeaponForAttack( RANGED_ATTACK, true, false );
+    Item* weapon = GetWeaponForAttack(RANGED_ATTACK, true, false);
     if (!weapon)
         return false;
 
     ItemPrototype const* weapon_proto = weapon->GetProto();
-    if(!weapon_proto || weapon_proto->Class!=ITEM_CLASS_WEAPON )
+    if (!weapon_proto || weapon_proto->Class != ITEM_CLASS_WEAPON)
         return false;
 
     // check ammo ws. weapon compatibility
-    switch(weapon_proto->SubClass)
+    switch (weapon_proto->SubClass)
     {
         case ITEM_SUBCLASS_WEAPON_BOW:
         case ITEM_SUBCLASS_WEAPON_CROSSBOW:
-            if(ammo_proto->SubClass!=ITEM_SUBCLASS_ARROW)
+            if (ammo_proto->SubClass != ITEM_SUBCLASS_ARROW)
                 return false;
             break;
         case ITEM_SUBCLASS_WEAPON_GUN:
-            if(ammo_proto->SubClass!=ITEM_SUBCLASS_BULLET)
+            if (ammo_proto->SubClass != ITEM_SUBCLASS_BULLET)
                 return false;
             break;
         default:
@@ -7933,20 +8382,20 @@ void Player::RemovedInsignia(Player* looterPlr)
         return;
 
     // If not released spirit, do it !
-    if(m_deathTimer > 0)
+    if (m_deathTimer > 0)
     {
         m_deathTimer = 0;
         BuildPlayerRepop();
         RepopAtGraveyard();
     }
 
-    Corpse *corpse = GetCorpse();
+    Corpse* corpse = GetCorpse();
     if (!corpse)
         return;
 
     // We have to convert player corpse to bones, not to be able to resurrect there
     // SpawnCorpseBones isn't handy, 'cos it saves player while he in BG
-    Corpse *bones = sObjectAccessor.ConvertCorpseForPlayer(GetObjectGuid(), true);
+    Corpse* bones = sObjectAccessor.ConvertCorpseForPlayer(GetObjectGuid(), true);
     if (!bones)
         return;
 
@@ -7962,10 +8411,10 @@ void Player::RemovedInsignia(Player* looterPlr)
 
 void Player::SendLootRelease(ObjectGuid guid)
 {
-    WorldPacket data( SMSG_LOOT_RELEASE_RESPONSE, (8+1) );
+    WorldPacket data(SMSG_LOOT_RELEASE_RESPONSE, 8 + 1);
     data << guid;
     data << uint8(1);
-    SendDirectMessage( &data );
+    SendDirectMessage(&data);
 }
 
 void Player::SendLoot(ObjectGuid guid, LootType loot_type)
@@ -7977,16 +8426,16 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
     PermissionTypes permission = ALL_PERMISSION;
 
     DEBUG_LOG("Player::SendLoot");
-    switch(guid.GetHigh())
+    switch (guid.GetHigh())
     {
         case HIGHGUID_GAMEOBJECT:
         {
             DEBUG_LOG("       IS_GAMEOBJECT_GUID(guid)");
-            GameObject *go = GetMap()->GetGameObject(guid);
+            GameObject* go = GetMap()->GetGameObject(guid);
 
             // not check distance for GO in case owned GO (fishing bobber case, for example)
             // And permit out of range GO with no owner in case fishing hole
-            if (!go || (loot_type != LOOT_FISHINGHOLE && (loot_type != LOOT_FISHING && loot_type != LOOT_FISHING_FAIL || go->GetOwnerGuid() != GetObjectGuid()) && !go->IsWithinDistInMap(this,INTERACTION_DISTANCE)))
+            if (!go || (loot_type != LOOT_FISHINGHOLE && ((loot_type != LOOT_FISHING && loot_type != LOOT_FISHING_FAIL) || go->GetOwnerGuid() != GetObjectGuid()) && !go->IsWithinDistInMap(this,INTERACTION_DISTANCE)))
             {
                 SendLootRelease(guid);
                 return;
@@ -8006,58 +8455,74 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
             {
                 uint32 lootid =  go->GetGOInfo()->GetLootId();
                 if ((go->GetEntry() == BG_AV_OBJECTID_MINE_N || go->GetEntry() == BG_AV_OBJECTID_MINE_S))
-                    if (BattleGround *bg = GetBattleGround())
+                {
+                    if (BattleGround* bg = GetBattleGround())
                         if (bg->GetTypeID() == BATTLEGROUND_AV)
                             if (!(((BattleGroundAV*)bg)->PlayerCanDoMineQuest(go->GetEntry(), GetTeam())))
                             {
                                 SendLootRelease(guid);
                                 return;
                             }
+                }
 
-                // Entry 0 in fishing loot template used for store junk fish loot at fishing fail it junk allowed by config option
-                // this is overwrite fishinghole loot for example
-                if (loot_type == LOOT_FISHING_FAIL)
-                    loot->FillLoot(0, LootTemplates_Fishing, this, true);
-                else if (lootid)
+                loot->clear();
+                switch (loot_type)
                 {
-                    DEBUG_LOG("       if(lootid)");
-                    loot->clear();
-                    loot->FillLoot(lootid, LootTemplates_Gameobject, this, false);
-                    loot->generateMoneyLoot(go->GetGOInfo()->MinMoneyLoot, go->GetGOInfo()->MaxMoneyLoot);
+                    // Entry 0 in fishing loot template used for store junk fish loot at fishing fail it junk allowed by config option
+                    // this is overwrite fishinghole loot for example
+                    case LOOT_FISHING_FAIL:
+                        loot->FillLoot(0, LootTemplates_Fishing, this, true);
+                        break;
+                    case LOOT_FISHING:
+                        uint32 zone, subzone;
+                        go->GetZoneAndAreaId(zone, subzone);
+                        // if subzone loot exist use it
+                        if (!loot->FillLoot(subzone, LootTemplates_Fishing, this, true, (subzone != zone)) && subzone != zone)
+                            // else use zone loot (if zone diff. from subzone, must exist in like case)
+                            loot->FillLoot(zone, LootTemplates_Fishing, this, true);
+                        break;
+                    default:
+                        if (!lootid)
+                            break;
+                        DEBUG_LOG("       send normal GO loot");
 
-                    if (go->GetGoType() == GAMEOBJECT_TYPE_CHEST && go->GetGOInfo()->chest.groupLootRules)
-                    {
-                        if (Group* group = go->GetGroupLootRecipient())
-                        {
-                            group->UpdateLooterGuid(go, true);
+                        loot->FillLoot(lootid, LootTemplates_Gameobject, this, false);
+                        loot->generateMoneyLoot(go->GetGOInfo()->MinMoneyLoot, go->GetGOInfo()->MaxMoneyLoot);
 
-                            switch (group->GetLootMethod())
+                        if (go->GetGoType() == GAMEOBJECT_TYPE_CHEST && go->GetGOInfo()->chest.groupLootRules)
+                        {
+                            if (Group* group = go->GetGroupLootRecipient())
                             {
-                                case GROUP_LOOT:
-                                    // GroupLoot delete items over threshold (threshold even not implemented), and roll them. Items with quality<threshold, round robin
-                                    group->GroupLoot(go, loot);
-                                    permission = GROUP_PERMISSION;
-                                    break;
-                                case NEED_BEFORE_GREED:
-                                    group->NeedBeforeGreed(go, loot);
-                                    permission = GROUP_PERMISSION;
-                                    break;
-                                case MASTER_LOOT:
-                                    group->MasterLoot(go, loot);
-                                    permission = MASTER_PERMISSION;
-                                    break;
-                                default:
-                                    break;
+                                group->UpdateLooterGuid(go, true);
+
+                                switch (group->GetLootMethod())
+                                {
+                                    case GROUP_LOOT:
+                                        // GroupLoot delete items over threshold (threshold even not implemented), and roll them. Items with quality<threshold, round robin
+                                        group->GroupLoot(go, loot);
+                                        permission = GROUP_PERMISSION;
+                                        break;
+                                    case NEED_BEFORE_GREED:
+                                        group->NeedBeforeGreed(go, loot);
+                                        permission = GROUP_PERMISSION;
+                                        break;
+                                    case MASTER_LOOT:
+                                        group->MasterLoot(go, loot);
+                                        permission = MASTER_PERMISSION;
+                                        break;
+                                    default:
+                                        break;
+                                }
                             }
                         }
-                    }
+                        break;
                 }
-                else if (loot_type == LOOT_FISHING)
-                    go->getFishLoot(loot,this);
 
                 go->SetLootState(GO_ACTIVATED);
             }
-            if (go->getLootState() == GO_ACTIVATED && go->GetGoType() == GAMEOBJECT_TYPE_CHEST && go->GetGOInfo()->chest.groupLootRules)
+            if (go->getLootState() == GO_ACTIVATED &&
+            go->GetGoType() == GAMEOBJECT_TYPE_CHEST &&
+            (go->GetGOInfo()->chest.groupLootRules || sWorld.getConfig(CONFIG_BOOL_LOOT_CHESTS_IGNORE_DB)))
             {
                 if (Group* group = go->GetGroupLootRecipient())
                 {
@@ -8087,8 +8552,7 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
         }
         case HIGHGUID_ITEM:
         {
-            Item *item = GetItemByGuid( guid );
-
+            Item* item = GetItemByGuid(guid);
             if (!item)
             {
                 SendLootRelease(guid);
@@ -8103,7 +8567,7 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
             {
                 item->loot.clear();
 
-                switch(loot_type)
+                switch (loot_type)
                 {
                     case LOOT_DISENCHANTING:
                         loot->FillLoot(item->GetProto()->DisenchantID, LootTemplates_Disenchant, this, true);
@@ -8128,9 +8592,9 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
         }
         case HIGHGUID_CORPSE:                               // remove insignia
         {
-            Corpse *bones = GetMap()->GetCorpse(guid);
+            Corpse* bones = GetMap()->GetCorpse(guid);
 
-            if (!bones || !((loot_type == LOOT_CORPSE) || (loot_type == LOOT_INSIGNIA)) || (bones->GetType() != CORPSE_BONES) )
+            if (!bones || !((loot_type == LOOT_CORPSE) || (loot_type == LOOT_INSIGNIA)) || (bones->GetType() != CORPSE_BONES))
             {
                 SendLootRelease(guid);
                 return;
@@ -8143,11 +8607,11 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
                 bones->lootForBody = true;
                 uint32 pLevel = bones->loot.gold;
                 bones->loot.clear();
-                if (GetBattleGround()->GetTypeID() == BATTLEGROUND_AV)
+                if (GetBattleGround() && GetBattleGround()->GetTypeID(true) == BATTLEGROUND_AV)
                     loot->FillLoot(0, LootTemplates_Creature, this, false);
                 // It may need a better formula
                 // Now it works like this: lvl10: ~6copper, lvl70: ~9silver
-                bones->loot.gold = (uint32)( urand(50, 150) * 0.016f * pow( ((float)pLevel)/5.76f, 2.5f) * sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_MONEY) );
+                bones->loot.gold = (uint32)(urand(50, 150) * 0.016f * pow(((float)pLevel) / 5.76f, 2.5f) * sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_MONEY));
             }
 
             if (bones->lootRecipient != this)
@@ -8159,10 +8623,10 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
         case HIGHGUID_UNIT:
         case HIGHGUID_VEHICLE:
         {
-            Creature *creature = GetMap()->GetCreature(guid);
+            Creature* creature = GetMap()->GetCreature(guid);
 
             // must be in range and creature must be alive for pickpocket and must be dead for another loot
-            if (!creature || creature->isAlive()!=(loot_type == LOOT_PICKPOCKETING) || !creature->IsWithinDistInMap(this,INTERACTION_DISTANCE))
+            if (!creature || creature->isAlive() != (loot_type == LOOT_PICKPOCKETING) || !creature->IsWithinDistInMap(this, INTERACTION_DISTANCE))
             {
                 SendLootRelease(guid);
                 return;
@@ -8174,7 +8638,7 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
                 return;
             }
 
-            loot   = &creature->loot;
+            loot = &creature->loot;
 
             if (loot_type == LOOT_PICKPOCKETING)
             {
@@ -8183,12 +8647,12 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
                     creature->lootForPickPocketed = true;
                     loot->clear();
 
-                    if (uint32 lootid = creature->GetCreatureInfo()->pickpocketLootId)
+                    if (uint32 lootid = creature->GetCreatureInfo()->PickpocketLootId)
                         loot->FillLoot(lootid, LootTemplates_Pickpocketing, this, false);
 
                     // Generate extra money for pick pocket loot
-                    const uint32 a = urand(0, creature->getLevel()/2);
-                    const uint32 b = urand(0, getLevel()/2);
+                    const uint32 a = urand(0, creature->getLevel() / 2);
+                    const uint32 b = urand(0, getLevel() / 2);
                     loot->gold = uint32(10 * (a + b) * sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_MONEY));
                     permission = OWNER_PERMISSION;
                 }
@@ -8196,7 +8660,7 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
             else
             {
                 // the player whose group may loot the corpse
-                Player *recipient = creature->GetLootRecipient();
+                Player* recipient = creature->GetLootRecipient();
                 if (!recipient)
                 {
                     creature->SetLootRecipient(this);
@@ -8214,14 +8678,14 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
                     creature->lootForBody = true;
                     loot->clear();
 
-                    if (uint32 lootid = creature->GetCreatureInfo()->lootid)
+                    if (uint32 lootid = creature->GetCreatureInfo()->LootId)
                         loot->FillLoot(lootid, LootTemplates_Creature, recipient, false);
 
-                    loot->generateMoneyLoot(creature->GetCreatureInfo()->mingold,creature->GetCreatureInfo()->maxgold);
+                    loot->generateMoneyLoot(creature->GetCreatureInfo()->MinLootGold, creature->GetCreatureInfo()->MaxLootGold);
 
                     if (Group* group = creature->GetGroupLootRecipient())
                     {
-                        group->UpdateLooterGuid(creature,true);
+                        group->UpdateLooterGuid(creature, true);
 
                         switch (group->GetLootMethod())
                         {
@@ -8248,7 +8712,7 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
                     {
                         creature->lootForSkin = true;
                         loot->clear();
-                        loot->FillLoot(creature->GetCreatureInfo()->SkinLootId, LootTemplates_Skinning, this, false);
+                        loot->FillLoot(creature->GetCreatureInfo()->SkinningLootId, LootTemplates_Skinning, this, false);
 
                         // let reopen skinning loot if will closed.
                         if (!loot->empty())
@@ -8260,7 +8724,7 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
                 // set group rights only for loot_type != LOOT_SKINNING
                 else
                 {
-                    if(Group* group = creature->GetGroupLootRecipient())
+                    if (Group* group = creature->GetGroupLootRecipient())
                     {
                         if (group == GetGroup())
                         {
@@ -8297,7 +8761,7 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
     SetLootGuid(guid);
 
     // LOOT_INSIGNIA and LOOT_FISHINGHOLE unsupported by client
-    switch(loot_type)
+    switch (loot_type)
     {
         case LOOT_INSIGNIA:     loot_type = LOOT_SKINNING; break;
         case LOOT_FISHING_FAIL: loot_type = LOOT_FISHING; break;
@@ -8308,7 +8772,7 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
     // need know merged fishing/corpse loot type for achievements
     loot->loot_type = loot_type;
 
-    WorldPacket data(SMSG_LOOT_RESPONSE, (9+50));           // we guess size
+    WorldPacket data(SMSG_LOOT_RESPONSE, 8 + 1 + 50);       // we guess size
     data << ObjectGuid(guid);
     data << uint8(loot_type);
     data << LootView(*loot, this, permission);
@@ -8325,428 +8789,102 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
 void Player::SendNotifyLootMoneyRemoved()
 {
     WorldPacket data(SMSG_LOOT_CLEAR_MONEY, 0);
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
 void Player::SendNotifyLootItemRemoved(uint8 lootSlot)
 {
     WorldPacket data(SMSG_LOOT_REMOVED, 1);
     data << uint8(lootSlot);
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
 void Player::SendUpdateWorldState(uint32 Field, uint32 Value)
 {
-    WorldPacket data(SMSG_UPDATE_WORLD_STATE, 8);
-    data << Field;
-    data << Value;
-    GetSession()->SendPacket(&data);
+    // _SendUpdateWorldState(uint32 Field, uint32 Value)
+    UpdateWorldState(Field, Value);
 }
 
-static WorldStatePair AV_world_states[] =
-{
-    { 0x7ae, 0x1 },                                         // 1966  7 snowfall n
-    { 0x532, 0x1 },                                         // 1330  8 frostwolfhut hc
-    { 0x531, 0x0 },                                         // 1329  9 frostwolfhut ac
-    { 0x52e, 0x0 },                                         // 1326 10 stormpike firstaid a_a
-    { 0x571, 0x0 },                                         // 1393 11 east frostwolf tower horde assaulted -unused
-    { 0x570, 0x0 },                                         // 1392 12 west frostwolf tower horde assaulted - unused
-    { 0x567, 0x1 },                                         // 1383 13 frostwolfe c
-    { 0x566, 0x1 },                                         // 1382 14 frostwolfw c
-    { 0x550, 0x1 },                                         // 1360 15 irondeep (N) ally
-    { 0x544, 0x0 },                                         // 1348 16 ice grave a_a
-    { 0x536, 0x0 },                                         // 1334 17 stormpike grave h_c
-    { 0x535, 0x1 },                                         // 1333 18 stormpike grave a_c
-    { 0x518, 0x0 },                                         // 1304 19 stoneheart grave a_a
-    { 0x517, 0x0 },                                         // 1303 20 stoneheart grave h_a
-    { 0x574, 0x0 },                                         // 1396 21 unk
-    { 0x573, 0x0 },                                         // 1395 22 iceblood tower horde assaulted -unused
-    { 0x572, 0x0 },                                         // 1394 23 towerpoint horde assaulted - unused
-    { 0x56f, 0x0 },                                         // 1391 24 unk
-    { 0x56e, 0x0 },                                         // 1390 25 iceblood a
-    { 0x56d, 0x0 },                                         // 1389 26 towerp a
-    { 0x56c, 0x0 },                                         // 1388 27 frostwolfe a
-    { 0x56b, 0x0 },                                         // 1387 28 froswolfw a
-    { 0x56a, 0x1 },                                         // 1386 29 unk
-    { 0x569, 0x1 },                                         // 1385 30 iceblood c
-    { 0x568, 0x1 },                                         // 1384 31 towerp c
-    { 0x565, 0x0 },                                         // 1381 32 stoneh tower a
-    { 0x564, 0x0 },                                         // 1380 33 icewing tower a
-    { 0x563, 0x0 },                                         // 1379 34 dunn a
-    { 0x562, 0x0 },                                         // 1378 35 duns a
-    { 0x561, 0x0 },                                         // 1377 36 stoneheart bunker alliance assaulted - unused
-    { 0x560, 0x0 },                                         // 1376 37 icewing bunker alliance assaulted - unused
-    { 0x55f, 0x0 },                                         // 1375 38 dunbaldar south alliance assaulted - unused
-    { 0x55e, 0x0 },                                         // 1374 39 dunbaldar north alliance assaulted - unused
-    { 0x55d, 0x0 },                                         // 1373 40 stone tower d
-    { 0x3c6, 0x0 },                                         //  966 41 unk
-    { 0x3c4, 0x0 },                                         //  964 42 unk
-    { 0x3c2, 0x0 },                                         //  962 43 unk
-    { 0x516, 0x1 },                                         // 1302 44 stoneheart grave a_c
-    { 0x515, 0x0 },                                         // 1301 45 stonheart grave h_c
-    { 0x3b6, 0x0 },                                         //  950 46 unk
-    { 0x55c, 0x0 },                                         // 1372 47 icewing tower d
-    { 0x55b, 0x0 },                                         // 1371 48 dunn d
-    { 0x55a, 0x0 },                                         // 1370 49 duns d
-    { 0x559, 0x0 },                                         // 1369 50 unk
-    { 0x558, 0x0 },                                         // 1368 51 iceblood d
-    { 0x557, 0x0 },                                         // 1367 52 towerp d
-    { 0x556, 0x0 },                                         // 1366 53 frostwolfe d
-    { 0x555, 0x0 },                                         // 1365 54 frostwolfw d
-    { 0x554, 0x1 },                                         // 1364 55 stoneh tower c
-    { 0x553, 0x1 },                                         // 1363 56 icewing tower c
-    { 0x552, 0x1 },                                         // 1362 57 dunn c
-    { 0x551, 0x1 },                                         // 1361 58 duns c
-    { 0x54f, 0x0 },                                         // 1359 59 irondeep (N) horde
-    { 0x54e, 0x0 },                                         // 1358 60 irondeep (N) ally
-    { 0x54d, 0x1 },                                         // 1357 61 mine (S) neutral
-    { 0x54c, 0x0 },                                         // 1356 62 mine (S) horde
-    { 0x54b, 0x0 },                                         // 1355 63 mine (S) ally
-    { 0x545, 0x0 },                                         // 1349 64 iceblood h_a
-    { 0x543, 0x1 },                                         // 1347 65 iceblod h_c
-    { 0x542, 0x0 },                                         // 1346 66 iceblood a_c
-    { 0x540, 0x0 },                                         // 1344 67 snowfall h_a
-    { 0x53f, 0x0 },                                         // 1343 68 snowfall a_a
-    { 0x53e, 0x0 },                                         // 1342 69 snowfall h_c
-    { 0x53d, 0x0 },                                         // 1341 70 snowfall a_c
-    { 0x53c, 0x0 },                                         // 1340 71 frostwolf g h_a
-    { 0x53b, 0x0 },                                         // 1339 72 frostwolf g a_a
-    { 0x53a, 0x1 },                                         // 1338 73 frostwolf g h_c
-    { 0x539, 0x0 },                                         // l33t 74 frostwolf g a_c
-    { 0x538, 0x0 },                                         // 1336 75 stormpike grave h_a
-    { 0x537, 0x0 },                                         // 1335 76 stormpike grave a_a
-    { 0x534, 0x0 },                                         // 1332 77 frostwolf hut h_a
-    { 0x533, 0x0 },                                         // 1331 78 frostwolf hut a_a
-    { 0x530, 0x0 },                                         // 1328 79 stormpike first aid h_a
-    { 0x52f, 0x0 },                                         // 1327 80 stormpike first aid h_c
-    { 0x52d, 0x1 },                                         // 1325 81 stormpike first aid a_c
-    { 0x0,   0x0 }
-};
+void Player::_SendUpdateWorldState(uint32 Field, uint32 Value)
+{
+    if (!IsInWorld() || !GetSession())
+        return;
 
-static WorldStatePair WS_world_states[] =
-{
-    { 0x62d, 0x0 },                                         // 1581  7 alliance flag captures
-    { 0x62e, 0x0 },                                         // 1582  8 horde flag captures
-    { 0x609, 0x0 },                                         // 1545  9 unk, set to 1 on alliance flag pickup...
-    { 0x60a, 0x0 },                                         // 1546 10 unk, set to 1 on horde flag pickup, after drop it's -1
-    { 0x60b, 0x2 },                                         // 1547 11 unk
-    { 0x641, 0x3 },                                         // 1601 12 unk (max flag captures?)
-    { 0x922, 0x1 },                                         // 2338 13 horde (0 - hide, 1 - flag ok, 2 - flag picked up (flashing), 3 - flag picked up (not flashing)
-    { 0x923, 0x1 },                                         // 2339 14 alliance (0 - hide, 1 - flag ok, 2 - flag picked up (flashing), 3 - flag picked up (not flashing)
-    { 0x1097,0x1 },                                         // 4247 15 show time limit?
-    { 0x1098,0x19 },                                        // 4248 16 time remaining in minutes
-    { 0x0,   0x0 }
-};
+    WorldPacket data(SMSG_UPDATE_WORLD_STATE, 8);
+    data << uint32(Field);
+    data << uint32(Value);
+    GetSession()->SendPacket(&data);
+}
 
-static WorldStatePair AB_world_states[] =
-{
-    { 0x6e7, 0x0 },                                         // 1767  7 stables alliance
-    { 0x6e8, 0x0 },                                         // 1768  8 stables horde
-    { 0x6e9, 0x0 },                                         // 1769  9 unk, ST?
-    { 0x6ea, 0x0 },                                         // 1770 10 stables (show/hide)
-    { 0x6ec, 0x0 },                                         // 1772 11 farm (0 - horde controlled, 1 - alliance controlled)
-    { 0x6ed, 0x0 },                                         // 1773 12 farm (show/hide)
-    { 0x6ee, 0x0 },                                         // 1774 13 farm color
-    { 0x6ef, 0x0 },                                         // 1775 14 gold mine color, may be FM?
-    { 0x6f0, 0x0 },                                         // 1776 15 alliance resources
-    { 0x6f1, 0x0 },                                         // 1777 16 horde resources
-    { 0x6f2, 0x0 },                                         // 1778 17 horde bases
-    { 0x6f3, 0x0 },                                         // 1779 18 alliance bases
-    { 0x6f4, 0x7d0 },                                       // 1780 19 max resources (2000)
-    { 0x6f6, 0x0 },                                         // 1782 20 blacksmith color
-    { 0x6f7, 0x0 },                                         // 1783 21 blacksmith (show/hide)
-    { 0x6f8, 0x0 },                                         // 1784 22 unk, bs?
-    { 0x6f9, 0x0 },                                         // 1785 23 unk, bs?
-    { 0x6fb, 0x0 },                                         // 1787 24 gold mine (0 - horde contr, 1 - alliance contr)
-    { 0x6fc, 0x0 },                                         // 1788 25 gold mine (0 - conflict, 1 - horde)
-    { 0x6fd, 0x0 },                                         // 1789 26 gold mine (1 - show/0 - hide)
-    { 0x6fe, 0x0 },                                         // 1790 27 gold mine color
-    { 0x700, 0x0 },                                         // 1792 28 gold mine color, wtf?, may be LM?
-    { 0x701, 0x0 },                                         // 1793 29 lumber mill color (0 - conflict, 1 - horde contr)
-    { 0x702, 0x0 },                                         // 1794 30 lumber mill (show/hide)
-    { 0x703, 0x0 },                                         // 1795 31 lumber mill color color
-    { 0x732, 0x1 },                                         // 1842 32 stables (1 - uncontrolled)
-    { 0x733, 0x1 },                                         // 1843 33 gold mine (1 - uncontrolled)
-    { 0x734, 0x1 },                                         // 1844 34 lumber mill (1 - uncontrolled)
-    { 0x735, 0x1 },                                         // 1845 35 farm (1 - uncontrolled)
-    { 0x736, 0x1 },                                         // 1846 36 blacksmith (1 - uncontrolled)
-    { 0x745, 0x2 },                                         // 1861 37 unk
-    { 0x7a3, 0x708 },                                       // 1955 38 warning limit (1800)
-    { 0x0,   0x0 }
-};
+void Player::UpdateWorldState(uint32 state, uint32 value)
+{
+    sWorldStateMgr.SetWorldStateValueFor(this, state, value);
+}
 
-static WorldStatePair EY_world_states[] =
-{
-    { 0xac1, 0x0 },                                         // 2753  7 Horde Bases
-    { 0xac0, 0x0 },                                         // 2752  8 Alliance Bases
-    { 0xab6, 0x0 },                                         // 2742  9 Mage Tower - Horde conflict
-    { 0xab5, 0x0 },                                         // 2741 10 Mage Tower - Alliance conflict
-    { 0xab4, 0x0 },                                         // 2740 11 Fel Reaver - Horde conflict
-    { 0xab3, 0x0 },                                         // 2739 12 Fel Reaver - Alliance conflict
-    { 0xab2, 0x0 },                                         // 2738 13 Draenei - Alliance conflict
-    { 0xab1, 0x0 },                                         // 2737 14 Draenei - Horde conflict
-    { 0xab0, 0x0 },                                         // 2736 15 unk // 0 at start
-    { 0xaaf, 0x0 },                                         // 2735 16 unk // 0 at start
-    { 0xaad, 0x0 },                                         // 2733 17 Draenei - Horde control
-    { 0xaac, 0x0 },                                         // 2732 18 Draenei - Alliance control
-    { 0xaab, 0x1 },                                         // 2731 19 Draenei uncontrolled (1 - yes, 0 - no)
-    { 0xaaa, 0x0 },                                         // 2730 20 Mage Tower - Alliance control
-    { 0xaa9, 0x0 },                                         // 2729 21 Mage Tower - Horde control
-    { 0xaa8, 0x1 },                                         // 2728 22 Mage Tower uncontrolled (1 - yes, 0 - no)
-    { 0xaa7, 0x0 },                                         // 2727 23 Fel Reaver - Horde control
-    { 0xaa6, 0x0 },                                         // 2726 24 Fel Reaver - Alliance control
-    { 0xaa5, 0x1 },                                         // 2725 25 Fel Reaver uncontrolled (1 - yes, 0 - no)
-    { 0xaa4, 0x0 },                                         // 2724 26 Boold Elf - Horde control
-    { 0xaa3, 0x0 },                                         // 2723 27 Boold Elf - Alliance control
-    { 0xaa2, 0x1 },                                         // 2722 28 Boold Elf uncontrolled (1 - yes, 0 - no)
-    { 0xac5, 0x1 },                                         // 2757 29 Flag (1 - show, 0 - hide) - doesn't work exactly this way!
-    { 0xad2, 0x1 },                                         // 2770 30 Horde top-stats (1 - show, 0 - hide) // 02 -> horde picked up the flag
-    { 0xad1, 0x1 },                                         // 2769 31 Alliance top-stats (1 - show, 0 - hide) // 02 -> alliance picked up the flag
-    { 0xabe, 0x0 },                                         // 2750 32 Horde resources
-    { 0xabd, 0x0 },                                         // 2749 33 Alliance resources
-    { 0xa05, 0x8e },                                        // 2565 34 unk, constant?
-    { 0xaa0, 0x0 },                                         // 2720 35 Capturing progress-bar (100 -> empty (only grey), 0 -> blue|red (no grey), default 0)
-    { 0xa9f, 0x0 },                                         // 2719 36 Capturing progress-bar (0 - left, 100 - right)
-    { 0xa9e, 0x0 },                                         // 2718 37 Capturing progress-bar (1 - show, 0 - hide)
-    { 0xc0d, 0x17b },                                       // 3085 38 unk
-    // and some more ... unknown
-    { 0x0,   0x0 }
-};
+void Player::SendUpdatedWorldStates(bool force)
+{
+    // don't need update client, if not have session or player not in world
+    if (!IsInWorld() || !GetSession())
+        return;
 
-static WorldStatePair HP_world_states[] =                   // Hellfire Peninsula
-{
-    { 0x9ba, 0x1 },                                         // 2490 10
-    { 0x9b9, 0x1 },                                         // 2489 11
-    { 0x9b5, 0x0 },                                         // 2485 12
-    { 0x9b4, 0x1 },                                         // 2484 13
-    { 0x9b3, 0x0 },                                         // 2483 14
-    { 0x9b2, 0x0 },                                         // 2482 15
-    { 0x9b1, 0x1 },                                         // 2481 16
-    { 0x9b0, 0x0 },                                         // 2480 17
-    { 0x9ae, 0x0 },                                         // 2478 18 horde pvp objectives captured
-    { 0x9ac, 0x0 },                                         // 2476 19
-    { 0x9a8, 0x0 },                                         // 2472 20
-    { 0x9a7, 0x0 },                                         // 2471 21
-    { 0x9a6, 0x1 },                                         // 2470 22
-    { 0x0,   0x0 }
-};
+    // don't need update states more then one time per second
+    if (IsBeingTeleported() || GetLastWorldStateUpdateTime() == time(NULL))
+        return;
 
-static WorldStatePair TF_world_states[] =                   // Terokkar Forest
-{
-    { 0xa41, 0x0 },                                         // 2625 10
-    { 0xa40, 0x14 },                                        // 2624 11
-    { 0xa3f, 0x0 },                                         // 2623 12
-    { 0xa3e, 0x0 },                                         // 2622 13
-    { 0xa3d, 0x5 },                                         // 2621 14
-    { 0xa3c, 0x0 },                                         // 2620 15
-    { 0xa87, 0x0 },                                         // 2695 16
-    { 0xa86, 0x0 },                                         // 2694 17
-    { 0xa85, 0x0 },                                         // 2693 18
-    { 0xa84, 0x0 },                                         // 2692 19
-    { 0xa83, 0x0 },                                         // 2691 20
-    { 0xa82, 0x0 },                                         // 2690 21
-    { 0xa81, 0x0 },                                         // 2689 22
-    { 0xa80, 0x0 },                                         // 2688 23
-    { 0xa7e, 0x0 },                                         // 2686 24
-    { 0xa7d, 0x0 },                                         // 2685 25
-    { 0xa7c, 0x0 },                                         // 2684 26
-    { 0xa7b, 0x0 },                                         // 2683 27
-    { 0xa7a, 0x0 },                                         // 2682 28
-    { 0xa79, 0x0 },                                         // 2681 29
-    { 0x9d0, 0x5 },                                         // 2512 30
-    { 0x9ce, 0x0 },                                         // 2510 31
-    { 0x9cd, 0x0 },                                         // 2509 32
-    { 0x9cc, 0x0 },                                         // 2508 33
-    { 0xa88, 0x0 },                                         // 2696 34
-    { 0xad0, 0x0 },                                         // 2768 35
-    { 0xacf, 0x1 },                                         // 2767 36
-    { 0x0,   0x0 }
-};
+    if (WorldStateSet* wsSet = sWorldStateMgr.GetUpdatedWorldStatesFor(this, force ? 0 : GetLastWorldStateUpdateTime()))
+    {
+        for (uint8 i = 0; i < wsSet->count(); ++i)
+        {
+            //DEBUG_LOG("Player::SendUpdatedWorldStates send state %u instance %u value %u to %s",(*itr)->GetId(), (*itr)->GetInstance(),(*itr)->GetValue(),GetObjectGuid().GetString().c_str());
+            WorldState* ws = (*wsSet)[i];
+            _SendUpdateWorldState(ws->GetId(), ws->GetValue());
+        }
+        delete wsSet;
+    }
 
-static WorldStatePair ZM_world_states[] =                   // Zangarmarsh
-{
-    { 0x9e1, 0x0 },                                         // 2529 10
-    { 0x9e0, 0x0 },                                         // 2528 11
-    { 0x9df, 0x0 },                                         // 2527 12
-    { 0xa5d, 0x1 },                                         // 2526 13
-    { 0xa5c, 0x0 },                                         // 2525 14
-    { 0xa5b, 0x1 },                                         // 2524 15
-    { 0xa5a, 0x0 },                                         // 2523 16
-    { 0xa59, 0x1 },                                         // 2649 17
-    { 0xa58, 0x0 },                                         // 2648 18
-    { 0xa57, 0x0 },                                         // 2647 19
-    { 0xa56, 0x0 },                                         // 2646 20
-    { 0xa55, 0x1 },                                         // 2645 21
-    { 0xa54, 0x0 },                                         // 2644 22
-    { 0x9e7, 0x0 },                                         // 2535 23
-    { 0x9e6, 0x0 },                                         // 2534 24
-    { 0x9e5, 0x0 },                                         // 2533 25
-    { 0xa00, 0x0 },                                         // 2560 26
-    { 0x9ff, 0x1 },                                         // 2559 27
-    { 0x9fe, 0x0 },                                         // 2558 28
-    { 0x9fd, 0x0 },                                         // 2557 29
-    { 0x9fc, 0x1 },                                         // 2556 30
-    { 0x9fb, 0x0 },                                         // 2555 31
-    { 0xa62, 0x0 },                                         // 2658 32
-    { 0xa61, 0x1 },                                         // 2657 33
-    { 0xa60, 0x1 },                                         // 2656 34
-    { 0xa5f, 0x0 },                                         // 2655 35
-    { 0x0,   0x0 }
-};
+    SetLastWorldStateUpdateTime(time(NULL));
+}
 
 void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
 {
     // data depends on zoneid/mapid...
-    BattleGround* bg = GetBattleGround();
-    uint32 mapid = GetMapId();
+    // Get worldstates (initial set)
+    WorldStateSet* wsSet = sWorldStateMgr.GetInitWorldStates(GetMapId(), GetInstanceId(), zoneid, areaid);
+    if (!wsSet)
+    {
+        sLog.outError("Player::SendInitWorldStates initial states list for player %s are empty!", GetGuidStr().c_str());
+        return;
+    }
 
-    DEBUG_LOG("Sending SMSG_INIT_WORLD_STATES to Map:%u, Zone: %u", mapid, zoneid);
+    DEBUG_LOG("Player::SendInitWorldStates sending SMSG_INIT_WORLD_STATES to Map:%u (instance %u), zone: %u, area %u, WorldStates count %u", GetMapId(), GetInstanceId(), zoneid, areaid, wsSet->count());
 
-    uint32 count = 0;                                       // count of world states in packet
+    WorldPacket data(SMSG_INIT_WORLD_STATES, (4+4+4+2+wsSet->count()*8));
 
-    WorldPacket data(SMSG_INIT_WORLD_STATES, (4+4+4+2+8*8));// guess
-    data << uint32(mapid);                                  // mapid
+    data << uint32(GetMapId());                             // mapid
     data << uint32(zoneid);                                 // zone id
     data << uint32(areaid);                                 // area id, new 2.1.0
-    size_t count_pos = data.wpos();
-    data << uint16(0);                                      // count of uint64 blocks, placeholder
-
-    // common fields
-    FillInitialWorldState(data, count, 0x8d8, 0x0);         // 2264 1
-    FillInitialWorldState(data, count, 0x8d7, 0x0);         // 2263 2
-    FillInitialWorldState(data, count, 0x8d6, 0x0);         // 2262 3
-    FillInitialWorldState(data, count, 0x8d5, 0x0);         // 2261 4
-    FillInitialWorldState(data, count, 0x8d4, 0x0);         // 2260 5
-    FillInitialWorldState(data, count, 0x8d3, 0x0);         // 2259 6
-                                                            // 3191 7 Current arena season
-    FillInitialWorldState(data, count, 0xC77, sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_ID));
-                                                            // 3901 8 Previous arena season
-    FillInitialWorldState(data, count, 0xF3D, sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_PREVIOUS_ID));
-    FillInitialWorldState(data, count, 0xED9, 1);           // 3801 9  0 - Battle for Wintergrasp in progress, 1 - otherwise
-                                                            // 4354 10 Time when next Battle for Wintergrasp starts
-    FillInitialWorldState(data, count, 0x1102, uint32(time(NULL) + 9000));
-
-    if(mapid == 530)                                        // Outland
-    {
-        FillInitialWorldState(data, count, 0x9bf, 0x0);     // 2495
-        FillInitialWorldState(data, count, 0x9bd, 0xF);     // 2493
-        FillInitialWorldState(data, count, 0x9bb, 0xF);     // 2491
-    }
-    switch(zoneid)
-    {
-        case 1:
-        case 11:
-        case 12:
-        case 38:
-        case 40:
-        case 51:
-        case 1519:
-        case 1537:
-        case 2257:
-            break;
-        case 2597:                                          // AV
-            if (bg && bg->GetTypeID() == BATTLEGROUND_AV)
-                bg->FillInitialWorldStates(data, count);
-            else
-                FillInitialWorldState(data,count, AV_world_states);
-            break;
-        case 3277:                                          // WS
-            if (bg && bg->GetTypeID() == BATTLEGROUND_WS)
-                bg->FillInitialWorldStates(data, count);
-            else
-                FillInitialWorldState(data,count, WS_world_states);
-            break;
-        case 3358:                                          // AB
-            if (bg && bg->GetTypeID() == BATTLEGROUND_AB)
-                bg->FillInitialWorldStates(data, count);
-            else
-                FillInitialWorldState(data,count, AB_world_states);
-            break;
-        case 3820:                                          // EY
-            if (bg && bg->GetTypeID() == BATTLEGROUND_EY)
-                bg->FillInitialWorldStates(data, count);
-            else
-                FillInitialWorldState(data,count, EY_world_states);
-            break;
-        case 3483:                                          // Hellfire Peninsula
-            FillInitialWorldState(data,count, HP_world_states);
-            break;
-        case 3519:                                          // Terokkar Forest
-            FillInitialWorldState(data,count, TF_world_states);
-            break;
-        case 3521:                                          // Zangarmarsh
-            FillInitialWorldState(data,count, ZM_world_states);
-            break;
-        case 3698:                                          // Nagrand Arena
-            if (bg && bg->GetTypeID() == BATTLEGROUND_NA)
-                bg->FillInitialWorldStates(data, count);
-            else
-            {
-                FillInitialWorldState(data,count,0xa0f,0x0);// 2575 7
-                FillInitialWorldState(data,count,0xa10,0x0);// 2576 8
-                FillInitialWorldState(data,count,0xa11,0x0);// 2577 9 show
-            }
-            break;
-        case 3702:                                          // Blade's Edge Arena
-            if (bg && bg->GetTypeID() == BATTLEGROUND_BE)
-                bg->FillInitialWorldStates(data, count);
-            else
-            {
-                FillInitialWorldState(data,count,0x9f0,0x0);// 2544 7 gold
-                FillInitialWorldState(data,count,0x9f1,0x0);// 2545 8 green
-                FillInitialWorldState(data,count,0x9f3,0x0);// 2547 9 show
-            }
-            break;
-        case 3968:                                          // Ruins of Lordaeron
-            if (bg && bg->GetTypeID() == BATTLEGROUND_RL)
-                bg->FillInitialWorldStates(data, count);
-            else
-            {
-                FillInitialWorldState(data,count,0xbb8,0x0);// 3000 7 gold
-                FillInitialWorldState(data,count,0xbb9,0x0);// 3001 8 green
-                FillInitialWorldState(data,count,0xbba,0x0);// 3002 9 show
-            }
-            break;
-        case 3703:                                          // Shattrath City
-            break;
-        default:
-            FillInitialWorldState(data,count, 0x914, 0x0);  // 2324 7
-            FillInitialWorldState(data,count, 0x913, 0x0);  // 2323 8
-            FillInitialWorldState(data,count, 0x912, 0x0);  // 2322 9
-            FillInitialWorldState(data,count, 0x915, 0x0);  // 2325 10
-            break;
-    }
-
-    FillBGWeekendWorldStates(data,count);
 
-    data.put<uint16>(count_pos,count);                      // set actual world state amount
+    data << uint16(wsSet->count());
 
-    GetSession()->SendPacket(&data);
-}
-
-void Player::FillBGWeekendWorldStates(WorldPacket& data, uint32& count)
-{
-    for(uint32 i = 1; i < sBattlemasterListStore.GetNumRows(); ++i)
+    for (uint8 i = 0; i < wsSet->count(); ++i)
     {
-        BattlemasterListEntry const * bl = sBattlemasterListStore.LookupEntry(i);
-        if (bl && bl->HolidayWorldStateId)
-        {
-            if (BattleGroundMgr::IsBGWeekend(BattleGroundTypeId(bl->id)))
-                FillInitialWorldState(data, count, bl->HolidayWorldStateId, 1);
-            else
-                FillInitialWorldState(data, count, bl->HolidayWorldStateId, 0);
-        }
+        WorldState* ws = (*wsSet)[i];
+        data << uint32(ws->GetId());
+        data << uint32(ws->GetValue());
     }
+    delete wsSet;
+
+    GetSession()->SendPacket(&data);
 }
 
 uint32 Player::GetXPRestBonus(uint32 xp)
 {
-    uint32 rested_bonus = (uint32)GetRestBonus();           // xp for each rested bonus
+    uint32 rested_bonus = uint32(GetRestBonus());            // xp for each rested bonus
 
-    if(rested_bonus > xp)                                   // max rested_bonus == xp or (r+x) = 200% xp
+    if (rested_bonus > xp)                                   // max rested_bonus == xp or (r+x) = 200% xp
         rested_bonus = xp;
 
-    SetRestBonus( GetRestBonus() - rested_bonus);
+    SetRestBonus(GetRestBonus() - rested_bonus);
 
     DETAIL_LOG("Player gain %u xp (+ %u Rested Bonus). Rested points=%f",xp+rested_bonus,rested_bonus,GetRestBonus());
     return rested_bonus;
@@ -8756,82 +8894,93 @@ void Player::SetBindPoint(ObjectGuid guid)
 {
     WorldPacket data(SMSG_BINDER_CONFIRM, 8);
     data << ObjectGuid(guid);
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
 void Player::SendTalentWipeConfirm(ObjectGuid guid)
 {
-    WorldPacket data(MSG_TALENT_WIPE_CONFIRM, (8+4));
+    WorldPacket data(MSG_TALENT_WIPE_CONFIRM, 8 + 4);
     data << ObjectGuid(guid);
     data << uint32(resetTalentsCost());
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
 void Player::SendPetSkillWipeConfirm()
 {
     Pet* pet = GetPet();
-    if(!pet)
+    if (!pet)
+        return;
+
+    if (pet->getPetType() != HUNTER_PET || pet->m_usedTalentCount == 0)
+        return;
+
+    CharmInfo* charmInfo = pet->GetCharmInfo();
+    if (!charmInfo)
+    {
+        sLog.outError("WorldSession::HandlePetUnlearnOpcode: %s is considered pet-like but doesn't have a charminfo!", pet->GetGuidStr().c_str());
         return;
-    WorldPacket data(SMSG_PET_UNLEARN_CONFIRM, (8+4));
-    data << ObjectGuid(pet->GetObjectGuid());
-    data << uint32(pet->resetTalentsCost());
-    GetSession()->SendPacket( &data );
+    }
+    pet->resetTalents();
+    SendTalentsInfoData(true);
+
 }
 
 /*********************************************************/
 /***                    STORAGE SYSTEM                 ***/
 /*********************************************************/
 
-void Player::SetVirtualItemSlot( uint8 i, Item* item)
+void Player::SetVirtualItemSlot(uint8 i, Item* item)
 {
     MANGOS_ASSERT(i < 3);
-    if(i < 2 && item)
+    if (i < 2 && item)
     {
-        if(!item->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT))
+        if (!item->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT))
             return;
+
         uint32 charges = item->GetEnchantmentCharges(TEMP_ENCHANTMENT_SLOT);
-        if(charges == 0)
+        if (charges == 0)
             return;
-        if(charges > 1)
-            item->SetEnchantmentCharges(TEMP_ENCHANTMENT_SLOT,charges-1);
-        else if(charges <= 1)
+
+        if (charges > 1)
+            item->SetEnchantmentCharges(TEMP_ENCHANTMENT_SLOT, charges - 1);
+        else if (charges <= 1)
         {
-            ApplyEnchantment(item,TEMP_ENCHANTMENT_SLOT,false);
+            ApplyEnchantment(item, TEMP_ENCHANTMENT_SLOT, false);
             item->ClearEnchantment(TEMP_ENCHANTMENT_SLOT);
         }
     }
 }
 
-void Player::SetSheath( SheathState sheathed )
+void Player::SetSheath(SheathState sheathed)
 {
     switch (sheathed)
     {
         case SHEATH_STATE_UNARMED:                          // no prepared weapon
-            SetVirtualItemSlot(0,NULL);
-            SetVirtualItemSlot(1,NULL);
-            SetVirtualItemSlot(2,NULL);
+            SetVirtualItemSlot(0, NULL);
+            SetVirtualItemSlot(1, NULL);
+            SetVirtualItemSlot(2, NULL);
             break;
         case SHEATH_STATE_MELEE:                            // prepared melee weapon
         {
-            SetVirtualItemSlot(0,GetWeaponForAttack(BASE_ATTACK,true,true));
-            SetVirtualItemSlot(1,GetWeaponForAttack(OFF_ATTACK,true,true));
-            SetVirtualItemSlot(2,NULL);
+            SetVirtualItemSlot(0, GetWeaponForAttack(BASE_ATTACK, true, true));
+            SetVirtualItemSlot(1, GetWeaponForAttack(OFF_ATTACK, true, true));
+            SetVirtualItemSlot(2, NULL);
         };  break;
         case SHEATH_STATE_RANGED:                           // prepared ranged weapon
-            SetVirtualItemSlot(0,NULL);
-            SetVirtualItemSlot(1,NULL);
-            SetVirtualItemSlot(2,GetWeaponForAttack(RANGED_ATTACK,true,true));
+            SetVirtualItemSlot(0, NULL);
+            SetVirtualItemSlot(1, NULL);
+            SetVirtualItemSlot(2, GetWeaponForAttack(RANGED_ATTACK, true, true));
             break;
         default:
-            SetVirtualItemSlot(0,NULL);
-            SetVirtualItemSlot(1,NULL);
-            SetVirtualItemSlot(2,NULL);
+            SetVirtualItemSlot(0, NULL);
+            SetVirtualItemSlot(1, NULL);
+            SetVirtualItemSlot(2, NULL);
             break;
     }
     Unit::SetSheath(sheathed);                              // this must visualize Sheath changing for other players...
 }
 
-uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap ) const
+uint8 Player::FindEquipSlot(ItemPrototype const* proto, uint32 slot, bool swap) const
 {
     uint8 pClass = getClass();
 
@@ -8840,7 +8989,7 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
     slots[1] = NULL_SLOT;
     slots[2] = NULL_SLOT;
     slots[3] = NULL_SLOT;
-    switch( proto->InventoryType )
+    switch (proto->InventoryType)
     {
         case INVTYPE_HEAD:
             slots[0] = EQUIPMENT_SLOT_HEAD;
@@ -8892,10 +9041,10 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
 
             // suggest offhand slot only if know dual wielding
             // (this will be replace mainhand weapon at auto equip instead unwonted "you don't known dual wielding" ...
-            if(CanDualWield())
+            if (CanDualWield())
                 slots[1] = EQUIPMENT_SLOT_OFFHAND;
             break;
-        };
+        }
         case INVTYPE_SHIELD:
             slots[0] = EQUIPMENT_SLOT_OFFHAND;
             break;
@@ -8933,7 +9082,7 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
             break;
         case INVTYPE_RELIC:
         {
-            switch(proto->SubClass)
+            switch (proto->SubClass)
             {
                 case ITEM_SUBCLASS_ARMOR_LIBRAM:
                     if (pClass == CLASS_PALADIN)
@@ -8962,13 +9111,13 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
             return NULL_SLOT;
     }
 
-    if( slot != NULL_SLOT )
+    if (slot != NULL_SLOT)
     {
-        if( swap || !GetItemByPos( INVENTORY_SLOT_BAG_0, slot ) )
+        if (swap || !GetItemByPos(INVENTORY_SLOT_BAG_0, slot))
         {
             for (int i = 0; i < 4; ++i)
             {
-                if ( slots[i] == slot )
+                if (slots[i] == slot)
                     return slot;
             }
         }
@@ -8978,10 +9127,10 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
         // search free slot at first
         for (int i = 0; i < 4; ++i)
         {
-            if ( slots[i] != NULL_SLOT && !GetItemByPos( INVENTORY_SLOT_BAG_0, slots[i] ) )
+            if (slots[i] != NULL_SLOT && !GetItemByPos(INVENTORY_SLOT_BAG_0, slots[i]))
             {
                 // in case 2hand equipped weapon (without titan grip) offhand slot empty but not free
-                if(slots[i]!=EQUIPMENT_SLOT_OFFHAND || !IsTwoHandUsed())
+                if (slots[i] != EQUIPMENT_SLOT_OFFHAND || !IsTwoHandUsed())
                     return slots[i];
             }
         }
@@ -8989,7 +9138,7 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
         // if not found free and can swap return first appropriate from used
         for (int i = 0; i < 4; ++i)
         {
-            if ( slots[i] != NULL_SLOT && swap )
+            if (slots[i] != NULL_SLOT && swap)
                 return slots[i];
         }
     }
@@ -8998,62 +9147,64 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
     return NULL_SLOT;
 }
 
-InventoryResult Player::CanUnequipItems( uint32 item, uint32 count ) const
+InventoryResult Player::CanUnequipItems(uint32 item, uint32 count) const
 {
-    Item *pItem;
+    Item* pItem;
     uint32 tempcount = 0;
 
     InventoryResult res = EQUIP_ERR_OK;
 
-    for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; ++i)
+    for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-        if( pItem && pItem->GetEntry() == item )
+        pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+        if (pItem && pItem->GetEntry() == item)
         {
             InventoryResult ires = CanUnequipItem(INVENTORY_SLOT_BAG_0 << 8 | i, false);
-            if(ires == EQUIP_ERR_OK)
+            if (ires == EQUIP_ERR_OK)
             {
                 tempcount += pItem->GetCount();
-                if( tempcount >= count )
+                if (tempcount >= count)
                     return EQUIP_ERR_OK;
             }
             else
                 res = ires;
         }
     }
-    for(int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+
+    for (int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
     {
-        pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-        if( pItem && pItem->GetEntry() == item )
+        pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+        if (pItem && pItem->GetEntry() == item)
         {
             tempcount += pItem->GetCount();
-            if( tempcount >= count )
+            if (tempcount >= count)
                 return EQUIP_ERR_OK;
         }
     }
-    for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+
+    for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
     {
-        pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-        if( pItem && pItem->GetEntry() == item )
+        pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+        if (pItem && pItem->GetEntry() == item)
         {
             tempcount += pItem->GetCount();
-            if( tempcount >= count )
+            if (tempcount >= count)
                 return EQUIP_ERR_OK;
         }
     }
-    Bag *pBag;
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+
+    Bag* pBag;
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-        if( pBag )
+        if (pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
         {
-            for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+            for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
             {
-                pItem = GetItemByPos( i, j );
-                if( pItem && pItem->GetEntry() == item )
+                pItem = GetItemByPos(i, j);
+                if (pItem && pItem->GetEntry() == item)
                 {
                     tempcount += pItem->GetCount();
-                    if( tempcount >= count )
+                    if (tempcount >= count)
                         return EQUIP_ERR_OK;
                 }
             }
@@ -9067,56 +9218,59 @@ InventoryResult Player::CanUnequipItems( uint32 item, uint32 count ) const
 uint32 Player::GetItemCount(uint32 item, bool inBankAlso, Item* skipItem) const
 {
     uint32 count = 0;
-    for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+    for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
     {
-        Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-        if( pItem && pItem != skipItem &&  pItem->GetEntry() == item )
+        Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+        if (pItem && pItem != skipItem && pItem->GetEntry() == item)
             count += pItem->GetCount();
     }
-    for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+
+    for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
     {
-        Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-        if( pItem && pItem != skipItem && pItem->GetEntry() == item )
+        Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+        if (pItem && pItem != skipItem && pItem->GetEntry() == item)
             count += pItem->GetCount();
     }
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-        if( pBag )
+        if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             count += pBag->GetItemCount(item,skipItem);
     }
 
-    if(skipItem && skipItem->GetProto()->GemProperties)
+    if (skipItem && skipItem->GetProto()->GemProperties)
     {
-        for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+        for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
         {
-            Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-            if( pItem && pItem != skipItem && pItem->GetProto()->Socket[0].Color )
+            Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+            if (pItem && pItem != skipItem && pItem->GetProto()->Socket[0].Color)
                 count += pItem->GetGemCountWithID(item);
         }
     }
 
-    if(inBankAlso)
+    if (inBankAlso)
     {
-        for(int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
+        for (int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
         {
-            Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-            if( pItem && pItem != skipItem && pItem->GetEntry() == item )
+            Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+            if (pItem && pItem != skipItem && pItem->GetEntry() == item)
                 count += pItem->GetCount();
         }
-        for(int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+
+        for (int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
         {
-            Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-            if( pBag )
+            Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+            if (pItem && pItem != skipItem && pItem->GetEntry() == item)
+                count += pItem->GetCount();
+            if (Bag* pBag = (Bag*)pItem)
                 count += pBag->GetItemCount(item,skipItem);
         }
 
-        if(skipItem && skipItem->GetProto()->GemProperties)
+        if (skipItem && skipItem->GetProto()->GemProperties)
         {
-            for(int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
+            for (int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
             {
-                Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-                if( pItem && pItem != skipItem && pItem->GetProto()->Socket[0].Color )
+                Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+                if (pItem && pItem != skipItem && pItem->GetProto()->Socket[0].Color)
                     count += pItem->GetGemCountWithID(item);
             }
         }
@@ -9125,49 +9279,49 @@ uint32 Player::GetItemCount(uint32 item, bool inBankAlso, Item* skipItem) const
     return count;
 }
 
-uint32 Player::GetItemCountWithLimitCategory( uint32 limitCategory, Item* skipItem) const
+uint32 Player::GetItemCountWithLimitCategory(uint32 limitCategory, Item* skipItem) const
 {
     uint32 count = 0;
-    for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
-        if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+    for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetProto()->ItemLimitCategory == limitCategory && pItem != skipItem)
                 count += pItem->GetCount();
 
-    for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
-        if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+    for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetProto()->ItemLimitCategory == limitCategory && pItem != skipItem)
                 count += pItem->GetCount();
 
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
         if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             count += pBag->GetItemCountWithLimitCategory(limitCategory, skipItem);
 
-    for(int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
-        if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+    for (int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetProto()->ItemLimitCategory == limitCategory && pItem != skipItem)
                 count += pItem->GetCount();
 
-    for(int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+    for (int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
         if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             count += pBag->GetItemCountWithLimitCategory(limitCategory, skipItem);
 
     return count;
 }
 
-Item* Player::GetItemByEntry( uint32 item ) const
+Item* Player::GetItemByEntry(uint32 item) const
 {
-    for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
-        if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+    for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetEntry() == item)
                 return pItem;
 
-    for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
-        if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+    for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetEntry() == item)
                 return pItem;
 
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
-        if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i))
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (Item* itemPtr = pBag->GetItemByEntry(item))
                 return itemPtr;
 
@@ -9176,18 +9330,18 @@ Item* Player::GetItemByEntry( uint32 item ) const
 
 Item* Player::GetItemByLimitedCategory(uint32 limitedCategory) const
 {
-    for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
-        if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+    for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetProto()->ItemLimitCategory == limitedCategory)
                 return pItem;
 
-    for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
-        if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+    for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetProto()->ItemLimitCategory == limitedCategory)
                 return pItem;
 
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
-        if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i))
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (Item* itemPtr = pBag->GetItemByLimitedCategory(limitedCategory))
                 return itemPtr;
 
@@ -9196,54 +9350,67 @@ Item* Player::GetItemByLimitedCategory(uint32 limitedCategory) const
 
 Item* Player::GetItemByGuid(ObjectGuid guid) const
 {
-    for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
-        if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+    for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetObjectGuid() == guid)
                 return pItem;
 
-    for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
-        if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+    for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetObjectGuid() == guid)
                 return pItem;
 
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
-        if (Bag *pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
-            for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
                 if (Item* pItem = pBag->GetItemByPos(j))
                     if (pItem->GetObjectGuid() == guid)
                         return pItem;
 
-    for(int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
-        if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+    for (int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetObjectGuid() == guid)
                 return pItem;
 
-    for(int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
-        if (Bag *pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
-            for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
-                if (Item* pItem = pBag->GetItemByPos(j))
-                    if (pItem->GetObjectGuid() == guid)
-                        return pItem;
+    for (int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+    {
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+        {
+            if (pItem->GetObjectGuid() == guid)
+                return pItem;
+            if (Bag* pBag = (Bag*)pItem)
+            {
+                for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
+                {
+                    if (Item* pItem = pBag->GetItemByPos(j))
+                    {
+                        if (pItem->GetObjectGuid() == guid)
+                            return pItem;
+                    }
+                }
+            }
+        }
+    }
 
     return NULL;
 }
 
-Item* Player::GetItemByPos( uint16 pos ) const
+Item* Player::GetItemByPos(uint16 pos) const
 {
     uint8 bag = pos >> 8;
     uint8 slot = pos & 255;
-    return GetItemByPos( bag, slot );
+    return GetItemByPos(bag, slot);
 }
 
-Item* Player::GetItemByPos( uint8 bag, uint8 slot ) const
+Item* Player::GetItemByPos(uint8 bag, uint8 slot) const
 {
-    if( bag == INVENTORY_SLOT_BAG_0 && ( slot < BANK_SLOT_BAG_END || (slot >= KEYRING_SLOT_START && slot < CURRENCYTOKEN_SLOT_END )) )
+    if (bag == INVENTORY_SLOT_BAG_0 && (slot < BANK_SLOT_BAG_END || (slot >= KEYRING_SLOT_START && slot < CURRENCYTOKEN_SLOT_END)))
         return m_items[slot];
     else if ((bag >= INVENTORY_SLOT_BAG_START && bag < INVENTORY_SLOT_BAG_END)
-        || (bag >= BANK_SLOT_BAG_START && bag < BANK_SLOT_BAG_END) )
+        || (bag >= BANK_SLOT_BAG_START && bag < BANK_SLOT_BAG_END))
     {
-        Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag );
-        if ( pBag )
+        Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, bag);
+        if (pBag)
             return pBag->GetItemByPos(slot);
     }
     return NULL;
@@ -9252,7 +9419,6 @@ Item* Player::GetItemByPos( uint8 bag, uint8 slot ) const
 uint32 Player::GetItemDisplayIdInSlot(uint8 bag, uint8 slot) const
 {
     const Item* pItem = GetItemByPos(bag, slot);
-
     if (!pItem)
         return 0;
 
@@ -9298,9 +9464,9 @@ Item* Player::GetShield(bool useable) const
     return item;
 }
 
-uint32 Player::GetAttackBySlot( uint8 slot )
+uint32 Player::GetAttackBySlot(uint8 slot)
 {
-    switch(slot)
+    switch (slot)
     {
         case EQUIPMENT_SLOT_MAINHAND: return BASE_ATTACK;
         case EQUIPMENT_SLOT_OFFHAND:  return OFF_ATTACK;
@@ -9309,54 +9475,54 @@ uint32 Player::GetAttackBySlot( uint8 slot )
     }
 }
 
-bool Player::IsInventoryPos( uint8 bag, uint8 slot )
+bool Player::IsInventoryPos(uint8 bag, uint8 slot)
 {
-    if( bag == INVENTORY_SLOT_BAG_0 && slot == NULL_SLOT )
+    if (bag == INVENTORY_SLOT_BAG_0 && slot == NULL_SLOT)
         return true;
-    if( bag == INVENTORY_SLOT_BAG_0 && ( slot >= INVENTORY_SLOT_ITEM_START && slot < INVENTORY_SLOT_ITEM_END ) )
+    if (bag == INVENTORY_SLOT_BAG_0 && (slot >= INVENTORY_SLOT_ITEM_START && slot < INVENTORY_SLOT_ITEM_END))
         return true;
-    if( bag >= INVENTORY_SLOT_BAG_START && bag < INVENTORY_SLOT_BAG_END )
+    if (bag >= INVENTORY_SLOT_BAG_START && bag < INVENTORY_SLOT_BAG_END)
         return true;
-    if( bag == INVENTORY_SLOT_BAG_0 && ( slot >= KEYRING_SLOT_START && slot < CURRENCYTOKEN_SLOT_END ) )
+    if (bag == INVENTORY_SLOT_BAG_0 && (slot >= KEYRING_SLOT_START && slot < CURRENCYTOKEN_SLOT_END))
         return true;
     return false;
 }
 
-bool Player::IsEquipmentPos( uint8 bag, uint8 slot )
+bool Player::IsEquipmentPos(uint8 bag, uint8 slot)
 {
-    if( bag == INVENTORY_SLOT_BAG_0 && ( slot < EQUIPMENT_SLOT_END ) )
+    if (bag == INVENTORY_SLOT_BAG_0 && (slot < EQUIPMENT_SLOT_END))
         return true;
-    if( bag == INVENTORY_SLOT_BAG_0 && ( slot >= INVENTORY_SLOT_BAG_START && slot < INVENTORY_SLOT_BAG_END ) )
+    if (bag == INVENTORY_SLOT_BAG_0 && (slot >= INVENTORY_SLOT_BAG_START && slot < INVENTORY_SLOT_BAG_END))
         return true;
     return false;
 }
 
-bool Player::IsBankPos( uint8 bag, uint8 slot )
+bool Player::IsBankPos(uint8 bag, uint8 slot)
 {
-    if( bag == INVENTORY_SLOT_BAG_0 && ( slot >= BANK_SLOT_ITEM_START && slot < BANK_SLOT_ITEM_END ) )
+    if (bag == INVENTORY_SLOT_BAG_0 && (slot >= BANK_SLOT_ITEM_START && slot < BANK_SLOT_ITEM_END))
         return true;
-    if( bag == INVENTORY_SLOT_BAG_0 && ( slot >= BANK_SLOT_BAG_START && slot < BANK_SLOT_BAG_END ) )
+    if (bag == INVENTORY_SLOT_BAG_0 && (slot >= BANK_SLOT_BAG_START && slot < BANK_SLOT_BAG_END))
         return true;
-    if( bag >= BANK_SLOT_BAG_START && bag < BANK_SLOT_BAG_END )
+    if (bag >= BANK_SLOT_BAG_START && bag < BANK_SLOT_BAG_END)
         return true;
     return false;
 }
 
-bool Player::IsBagPos( uint16 pos )
+bool Player::IsBagPos(uint16 pos)
 {
     uint8 bag = pos >> 8;
     uint8 slot = pos & 255;
-    if( bag == INVENTORY_SLOT_BAG_0 && ( slot >= INVENTORY_SLOT_BAG_START && slot < INVENTORY_SLOT_BAG_END ) )
+    if (bag == INVENTORY_SLOT_BAG_0 && (slot >= INVENTORY_SLOT_BAG_START && slot < INVENTORY_SLOT_BAG_END))
         return true;
-    if( bag == INVENTORY_SLOT_BAG_0 && ( slot >= BANK_SLOT_BAG_START && slot < BANK_SLOT_BAG_END ) )
+    if (bag == INVENTORY_SLOT_BAG_0 && (slot >= BANK_SLOT_BAG_START && slot < BANK_SLOT_BAG_END))
         return true;
     return false;
 }
 
-bool Player::IsValidPos( uint8 bag, uint8 slot, bool explicit_pos ) const
+bool Player::IsValidPos(uint8 bag, uint8 slot, bool explicit_pos) const
 {
     // post selected
-    if(bag == NULL_BAG && !explicit_pos)
+    if (bag == NULL_BAG && !explicit_pos)
         return true;
 
     if (bag == INVENTORY_SLOT_BAG_0)
@@ -9395,8 +9561,8 @@ bool Player::IsValidPos( uint8 bag, uint8 slot, bool explicit_pos ) const
     // bag content slots
     if (bag >= INVENTORY_SLOT_BAG_START && bag < INVENTORY_SLOT_BAG_END)
     {
-        Bag* pBag = (Bag*)GetItemByPos (INVENTORY_SLOT_BAG_0, bag);
-        if(!pBag)
+        Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, bag);
+        if (!pBag)
             return false;
 
         // any post selected
@@ -9407,10 +9573,10 @@ bool Player::IsValidPos( uint8 bag, uint8 slot, bool explicit_pos ) const
     }
 
     // bank bag content slots
-    if( bag >= BANK_SLOT_BAG_START && bag < BANK_SLOT_BAG_END )
+    if (bag >= BANK_SLOT_BAG_START && bag < BANK_SLOT_BAG_END)
     {
-        Bag* pBag = (Bag*)GetItemByPos (INVENTORY_SLOT_BAG_0, bag);
-        if(!pBag)
+        Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, bag);
+        if (!pBag)
             return false;
 
         // any post selected
@@ -9424,13 +9590,12 @@ bool Player::IsValidPos( uint8 bag, uint8 slot, bool explicit_pos ) const
     return false;
 }
 
-
-bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const
+bool Player::HasItemCount(uint32 item, uint32 count, bool inBankAlso) const
 {
     uint32 tempcount = 0;
-    for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+    for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
     {
-        Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
+        Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
         if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
         {
             tempcount += pItem->GetCount();
@@ -9438,9 +9603,9 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const
                 return true;
         }
     }
-    for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+    for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
     {
-        Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
+        Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
         if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
         {
             tempcount += pItem->GetCount();
@@ -9448,13 +9613,13 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const
                 return true;
         }
     }
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
+        if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
         {
-            for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+            for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
             {
-                Item* pItem = GetItemByPos( i, j );
+                Item* pItem = GetItemByPos(i, j);
                 if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
                 {
                     tempcount += pItem->GetCount();
@@ -9465,11 +9630,11 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const
         }
     }
 
-    if(inBankAlso)
+    if (inBankAlso)
     {
-        for(int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
+        for (int i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
         {
-            Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
+            Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
             if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
             {
                 tempcount += pItem->GetCount();
@@ -9477,13 +9642,13 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const
                     return true;
             }
         }
-        for(int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+        for (int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
         {
-            if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
+            if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             {
-                for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+                for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
                 {
-                    Item* pItem = GetItemByPos( i, j );
+                    Item* pItem = GetItemByPos(i, j);
                     if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
                     {
                         tempcount += pItem->GetCount();
@@ -9498,36 +9663,36 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const
     return false;
 }
 
-bool Player::HasItemOrGemWithIdEquipped( uint32 item, uint32 count, uint8 except_slot ) const
+bool Player::HasItemOrGemWithIdEquipped(uint32 item, uint32 count, uint8 except_slot) const
 {
     uint32 tempcount = 0;
-    for(int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+    for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
     {
-        if(i==int(except_slot))
+        if (i == int(except_slot))
             continue;
 
-        Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-        if( pItem && pItem->GetEntry() == item)
+        Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+        if (pItem && pItem->GetEntry() == item)
         {
             tempcount += pItem->GetCount();
-            if( tempcount >= count )
+            if (tempcount >= count)
                 return true;
         }
     }
 
-    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(item);
+    ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(item);
     if (pProto && pProto->GemProperties)
     {
-        for(int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+        for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
         {
-            if(i==int(except_slot))
+            if (i == int(except_slot))
                 continue;
 
-            Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-            if( pItem && pItem->GetProto()->Socket[0].Color)
+            Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+            if (pItem && (pItem->GetProto()->Socket[0].Color || pItem->GetEnchantmentId(PRISMATIC_ENCHANTMENT_SLOT)))
             {
                 tempcount += pItem->GetGemCountWithID(item);
-                if( tempcount >= count )
+                if (tempcount >= count)
                     return true;
             }
         }
@@ -9536,33 +9701,33 @@ bool Player::HasItemOrGemWithIdEquipped( uint32 item, uint32 count, uint8 except
     return false;
 }
 
-bool Player::HasItemOrGemWithLimitCategoryEquipped( uint32 limitCategory, uint32 count, uint8 except_slot ) const
+bool Player::HasItemOrGemWithLimitCategoryEquipped(uint32 limitCategory, uint32 count, uint8 except_slot) const
 {
     uint32 tempcount = 0;
-    for(int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+    for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
     {
-        if(i==int(except_slot))
+        if (i == int(except_slot))
             continue;
 
-        Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
+        Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
         if (!pItem)
             continue;
 
-        ItemPrototype const *pProto = pItem->GetProto();
+        ItemPrototype const* pProto = pItem->GetProto();
         if (!pProto)
             continue;
 
         if (pProto->ItemLimitCategory == limitCategory)
         {
             tempcount += pItem->GetCount();
-            if( tempcount >= count )
+            if (tempcount >= count)
                 return true;
         }
 
-        if( pProto->Socket[0].Color)
+        if (pProto->Socket[0].Color)
         {
             tempcount += pItem->GetGemCountWithLimitCategory(limitCategory);
-            if( tempcount >= count )
+            if (tempcount >= count)
                 return true;
         }
     }
@@ -9572,7 +9737,7 @@ bool Player::HasItemOrGemWithLimitCategoryEquipped( uint32 limitCategory, uint32
 
 InventoryResult Player::_CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count) const
 {
-    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(entry);
+    ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(entry);
     if (!pProto)
     {
         if (no_space_count)
@@ -9588,7 +9753,7 @@ InventoryResult Player::_CanTakeMoreSimilarItems(uint32 entry, uint32 count, Ite
         if (curcount + count > uint32(pProto->MaxCount))
         {
             if (no_space_count)
-                *no_space_count = count +curcount - pProto->MaxCount;
+                *no_space_count = count + curcount - pProto->MaxCount;
             return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
         }
     }
@@ -9599,7 +9764,7 @@ InventoryResult Player::_CanTakeMoreSimilarItems(uint32 entry, uint32 count, Ite
         ItemLimitCategoryEntry const* limitEntry = sItemLimitCategoryStore.LookupEntry(pProto->ItemLimitCategory);
         if (!limitEntry)
         {
-            if(no_space_count)
+            if (no_space_count)
                 *no_space_count = count;
             return EQUIP_ERR_ITEM_CANT_BE_EQUIPPED;
         }
@@ -9620,29 +9785,29 @@ InventoryResult Player::_CanTakeMoreSimilarItems(uint32 entry, uint32 count, Ite
     return EQUIP_ERR_OK;
 }
 
-bool Player::HasItemTotemCategory( uint32 TotemCategory ) const
+bool Player::HasItemTotemCategory(uint32 TotemCategory) const
 {
-    Item *pItem;
-    for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+    Item* pItem;
+    for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
     {
-        pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-        if( pItem && IsTotemCategoryCompatiableWith(pItem->GetProto()->TotemCategory,TotemCategory ))
+        pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+        if (pItem && IsTotemCategoryCompatiableWith(pItem->GetProto()->TotemCategory, TotemCategory))
             return true;
     }
-    for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+    for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
     {
-        pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-        if( pItem && IsTotemCategoryCompatiableWith(pItem->GetProto()->TotemCategory,TotemCategory ))
+        pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+        if (pItem && IsTotemCategoryCompatiableWith(pItem->GetProto()->TotemCategory, TotemCategory))
             return true;
     }
-    for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+    for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        if(Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
+        if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
         {
-            for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+            for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
             {
-                pItem = GetItemByPos( i, j );
-                if( pItem && IsTotemCategoryCompatiableWith(pItem->GetProto()->TotemCategory,TotemCategory ))
+                pItem = GetItemByPos(i, j);
+                if (pItem && IsTotemCategoryCompatiableWith(pItem->GetProto()->TotemCategory, TotemCategory))
                     return true;
             }
         }
@@ -9650,12 +9815,12 @@ bool Player::HasItemTotemCategory( uint32 TotemCategory ) const
     return false;
 }
 
-InventoryResult Player::_CanStoreItem_InSpecificSlot( uint8 bag, uint8 slot, ItemPosCountVec &dest, ItemPrototype const *pProto, uint32& count, bool swap, Item* pSrcItem ) const
+InventoryResult Player::_CanStoreItem_InSpecificSlot(uint8 bag, uint8 slot, ItemPosCountVec& dest, ItemPrototype const* pProto, uint32& count, bool swap, Item* pSrcItem) const
 {
-    Item* pItem2 = GetItemByPos( bag, slot );
+    Item* pItem2 = GetItemByPos(bag, slot);
 
     // ignore move item (this slot will be empty at move)
-    if (pItem2==pSrcItem)
+    if (pItem2 == pSrcItem)
         pItem2 = NULL;
 
     uint32 need_space;
@@ -9666,7 +9831,7 @@ InventoryResult Player::_CanStoreItem_InSpecificSlot( uint8 bag, uint8 slot, Ite
         if (bag == INVENTORY_SLOT_BAG_0)
         {
             // keyring case
-            if (slot >= KEYRING_SLOT_START && slot < KEYRING_SLOT_START+GetMaxKeyringSize() && !(pProto->BagFamily & BAG_FAMILY_MASK_KEYS))
+            if (slot >= KEYRING_SLOT_START && slot < KEYRING_SLOT_START + GetMaxKeyringSize() && !(pProto->BagFamily & BAG_FAMILY_MASK_KEYS))
                 return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
 
             // currencytoken case
@@ -9679,7 +9844,7 @@ InventoryResult Player::_CanStoreItem_InSpecificSlot( uint8 bag, uint8 slot, Ite
         }
         else
         {
-            Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag );
+            Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, bag);
             if (!pBag)
                 return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
 
@@ -9690,7 +9855,7 @@ InventoryResult Player::_CanStoreItem_InSpecificSlot( uint8 bag, uint8 slot, Ite
             if (slot >= pBagProto->ContainerSlots)
                 return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
 
-            if (!ItemCanGoIntoBag(pProto,pBagProto))
+            if (!ItemCanGoIntoBag(pProto, pBagProto))
                 return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
         }
 
@@ -9721,15 +9886,15 @@ InventoryResult Player::_CanStoreItem_InSpecificSlot( uint8 bag, uint8 slot, Ite
     return EQUIP_ERR_OK;
 }
 
-InventoryResult Player::_CanStoreItem_InBag( uint8 bag, ItemPosCountVec &dest, ItemPrototype const *pProto, uint32& count, bool merge, bool non_specialized, Item* pSrcItem, uint8 skip_bag, uint8 skip_slot ) const
+InventoryResult Player::_CanStoreItem_InBag(uint8 bag, ItemPosCountVec& dest, ItemPrototype const* pProto, uint32& count, bool merge, bool non_specialized, Item* pSrcItem, uint8 skip_bag, uint8 skip_slot) const
 {
     // skip specific bag already processed in first called _CanStoreItem_InBag
     if (bag == skip_bag)
         return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
 
     // skip nonexistent bag or self targeted bag
-    Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag );
-    if (!pBag || pBag==pSrcItem)
+    Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, bag);
+    if (!pBag || pBag == pSrcItem)
         return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
 
     ItemPrototype const* pBagProto = pBag->GetProto();
@@ -9740,16 +9905,16 @@ InventoryResult Player::_CanStoreItem_InBag( uint8 bag, ItemPosCountVec &dest, I
     if (non_specialized != (pBagProto->Class == ITEM_CLASS_CONTAINER && pBagProto->SubClass == ITEM_SUBCLASS_CONTAINER))
         return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
 
-    if (!ItemCanGoIntoBag(pProto,pBagProto))
+    if (!ItemCanGoIntoBag(pProto, pBagProto))
         return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
 
-    for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+    for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
     {
         // skip specific slot already processed in first called _CanStoreItem_InSpecificSlot
-        if (j==skip_slot)
+        if (j == skip_slot)
             continue;
 
-        Item* pItem2 = GetItemByPos( bag, j );
+        Item* pItem2 = GetItemByPos(bag, j);
 
         // ignore move item (this slot will be empty at move)
         if (pItem2 == pSrcItem)
@@ -9781,22 +9946,22 @@ InventoryResult Player::_CanStoreItem_InBag( uint8 bag, ItemPosCountVec &dest, I
             dest.push_back(newPosition);
             count -= need_space;
 
-            if (count==0)
+            if (count == 0)
                 return EQUIP_ERR_OK;
         }
     }
     return EQUIP_ERR_OK;
 }
 
-InventoryResult Player::_CanStoreItem_InInventorySlots( uint8 slot_begin, uint8 slot_end, ItemPosCountVec &dest, ItemPrototype const *pProto, uint32& count, bool merge, Item* pSrcItem, uint8 skip_bag, uint8 skip_slot ) const
+InventoryResult Player::_CanStoreItem_InInventorySlots(uint8 slot_begin, uint8 slot_end, ItemPosCountVec& dest, ItemPrototype const* pProto, uint32& count, bool merge, Item* pSrcItem, uint8 skip_bag, uint8 skip_slot) const
 {
-    for(uint32 j = slot_begin; j < slot_end; ++j)
+    for (uint32 j = slot_begin; j < slot_end; ++j)
     {
         // skip specific slot already processed in first called _CanStoreItem_InSpecificSlot
-        if (INVENTORY_SLOT_BAG_0==skip_bag && j==skip_slot)
+        if (INVENTORY_SLOT_BAG_0 == skip_bag && j == skip_slot)
             continue;
 
-        Item* pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, j );
+        Item* pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, j);
 
         // ignore move item (this slot will be empty at move)
         if (pItem2 == pSrcItem)
@@ -9815,7 +9980,7 @@ InventoryResult Player::_CanStoreItem_InInventorySlots( uint8 slot_begin, uint8
             if (res != EQUIP_ERR_OK)
                 continue;
 
-            // descrease at current stacksize
+            // decrease at current stacksize
             need_space -= pItem2->GetCount();
         }
 
@@ -9828,23 +9993,23 @@ InventoryResult Player::_CanStoreItem_InInventorySlots( uint8 slot_begin, uint8
             dest.push_back(newPosition);
             count -= need_space;
 
-            if (count==0)
+            if (count == 0)
                 return EQUIP_ERR_OK;
         }
     }
     return EQUIP_ERR_OK;
 }
 
-InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint32 entry, uint32 count, Item *pItem, bool swap, uint32* no_space_count ) const
+InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 entry, uint32 count, Item* pItem, bool swap, uint32* no_space_count) const
 {
-    DEBUG_LOG( "STORAGE: CanStoreItem bag = %u, slot = %u, item = %u, count = %u", bag, slot, entry, count);
+    DEBUG_LOG("STORAGE: CanStoreItem bag = %u, slot = %u, item = %u, count = %u", bag, slot, entry, count);
 
-    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(entry);
+    ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(entry);
     if (!pProto)
     {
         if (no_space_count)
             *no_space_count = count;
-        return swap ? EQUIP_ERR_ITEMS_CANT_BE_SWAPPED :EQUIP_ERR_ITEM_NOT_FOUND;
+        return swap ? EQUIP_ERR_ITEMS_CANT_BE_SWAPPED : EQUIP_ERR_ITEM_NOT_FOUND;
     }
 
     if (pItem)
@@ -9867,7 +10032,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
 
     // check count of items (skip for auto move for same player from bank)
     uint32 no_similar_count = 0;                            // can't store this amount similar items
-    InventoryResult res = _CanTakeMoreSimilarItems(entry,count,pItem,&no_similar_count);
+    InventoryResult res = _CanTakeMoreSimilarItems(entry, count, pItem, &no_similar_count);
     if (res != EQUIP_ERR_OK)
     {
         if (count == no_similar_count)
@@ -9882,7 +10047,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
     // in specific slot
     if (bag != NULL_BAG && slot != NULL_SLOT)
     {
-        res = _CanStoreItem_InSpecificSlot(bag,slot,dest,pProto,count,swap,pItem);
+        res = _CanStoreItem_InSpecificSlot(bag, slot, dest, pProto, count, swap, pItem);
         if (res != EQUIP_ERR_OK)
         {
             if (no_space_count)
@@ -9911,7 +10076,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
         {
             if (bag == INVENTORY_SLOT_BAG_0)               // inventory
             {
-                res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START,CURRENCYTOKEN_SLOT_END,dest,pProto,count,true,pItem,bag,slot);
+                res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START, CURRENCYTOKEN_SLOT_END, dest, pProto, count, true, pItem, bag, slot);
                 if (res != EQUIP_ERR_OK)
                 {
                     if (no_space_count)
@@ -9929,7 +10094,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
                     return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
                 }
 
-                res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot);
+                res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START, INVENTORY_SLOT_ITEM_END, dest, pProto, count, true, pItem, bag, slot);
                 if (res != EQUIP_ERR_OK)
                 {
                     if (no_space_count)
@@ -9950,9 +10115,9 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
             else                                            // equipped bag
             {
                 // we need check 2 time (specialized/non_specialized), use NULL_BAG to prevent skipping bag
-                res = _CanStoreItem_InBag(bag,dest,pProto,count,true,false,pItem,NULL_BAG,slot);
+                res = _CanStoreItem_InBag(bag, dest, pProto, count, true, false, pItem, NULL_BAG, slot);
                 if (res != EQUIP_ERR_OK)
-                    res = _CanStoreItem_InBag(bag,dest,pProto,count,true,true,pItem,NULL_BAG,slot);
+                    res = _CanStoreItem_InBag(bag, dest, pProto, count, true, true, pItem, NULL_BAG, slot);
 
                 if (res != EQUIP_ERR_OK)
                 {
@@ -9974,14 +10139,14 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
         }
 
         // search free slot in bag for place to
-        if(bag == INVENTORY_SLOT_BAG_0)                     // inventory
+        if (bag == INVENTORY_SLOT_BAG_0)                    // inventory
         {
             // search free slot - keyring case
             if (pProto->BagFamily & BAG_FAMILY_MASK_KEYS)
             {
                 uint32 keyringSize = GetMaxKeyringSize();
-                res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START,KEYRING_SLOT_START+keyringSize,dest,pProto,count,false,pItem,bag,slot);
-                if (res!=EQUIP_ERR_OK)
+                res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START, KEYRING_SLOT_START + keyringSize, dest, pProto, count, false, pItem, bag, slot);
+                if (res != EQUIP_ERR_OK)
                 {
                     if (no_space_count)
                         *no_space_count = count + no_similar_count;
@@ -9990,7 +10155,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
 
                 if (count == 0)
                 {
-                    if (no_similar_count==0)
+                    if (no_similar_count == 0)
                         return EQUIP_ERR_OK;
 
                     if (no_space_count)
@@ -9998,7 +10163,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
                     return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
                 }
 
-                res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START,CURRENCYTOKEN_SLOT_END,dest,pProto,count,false,pItem,bag,slot);
+                res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START, CURRENCYTOKEN_SLOT_END, dest, pProto, count, false, pItem, bag, slot);
                 if (res != EQUIP_ERR_OK)
                 {
                     if (no_space_count)
@@ -10018,8 +10183,8 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
             }
             else if (pProto->BagFamily & BAG_FAMILY_MASK_CURRENCY_TOKENS)
             {
-                res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START,CURRENCYTOKEN_SLOT_END,dest,pProto,count,false,pItem,bag,slot);
-                if (res!=EQUIP_ERR_OK)
+                res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START, CURRENCYTOKEN_SLOT_END, dest, pProto, count, false, pItem, bag, slot);
+                if (res != EQUIP_ERR_OK)
                 {
                     if (no_space_count)
                         *no_space_count = count + no_similar_count;
@@ -10037,7 +10202,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
                 }
             }
 
-            res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot);
+            res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START, INVENTORY_SLOT_ITEM_END, dest, pProto, count, false, pItem, bag, slot);
             if (res != EQUIP_ERR_OK)
             {
                 if (no_space_count)
@@ -10057,9 +10222,9 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
         }
         else                                                // equipped bag
         {
-            res = _CanStoreItem_InBag(bag,dest,pProto,count,false,false,pItem,NULL_BAG,slot);
+            res = _CanStoreItem_InBag(bag, dest, pProto, count, false, false, pItem, NULL_BAG, slot);
             if (res != EQUIP_ERR_OK)
-                res = _CanStoreItem_InBag(bag,dest,pProto,count,false,true,pItem,NULL_BAG,slot);
+                res = _CanStoreItem_InBag(bag, dest, pProto, count, false, true, pItem, NULL_BAG, slot);
 
             if (res != EQUIP_ERR_OK)
             {
@@ -10085,7 +10250,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
     // search stack for merge to
     if (pProto->Stackable != 1)
     {
-        res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START,CURRENCYTOKEN_SLOT_END,dest,pProto,count,true,pItem,bag,slot);
+        res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START, CURRENCYTOKEN_SLOT_END, dest, pProto, count, true, pItem, bag, slot);
         if (res != EQUIP_ERR_OK)
         {
             if (no_space_count)
@@ -10103,7 +10268,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
             return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
         }
 
-        res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot);
+        res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START, INVENTORY_SLOT_ITEM_END, dest, pProto, count, true, pItem, bag, slot);
         if (res != EQUIP_ERR_OK)
         {
             if (no_space_count)
@@ -10123,9 +10288,9 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
 
         if (pProto->BagFamily)
         {
-            for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+            for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
             {
-                res = _CanStoreItem_InBag(i,dest,pProto,count,true,false,pItem,bag,slot);
+                res = _CanStoreItem_InBag(i, dest, pProto, count, true, false, pItem, bag, slot);
                 if (res != EQUIP_ERR_OK)
                     continue;
 
@@ -10141,15 +10306,15 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
             }
         }
 
-        for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
         {
-            res = _CanStoreItem_InBag(i,dest,pProto,count,true,true,pItem,bag,slot);
+            res = _CanStoreItem_InBag(i, dest, pProto, count, true, true, pItem, bag, slot);
             if (res != EQUIP_ERR_OK)
                 continue;
 
             if (count == 0)
             {
-                if (no_similar_count==0)
+                if (no_similar_count == 0)
                     return EQUIP_ERR_OK;
 
                 if (no_space_count)
@@ -10165,7 +10330,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
         if (pProto->BagFamily & BAG_FAMILY_MASK_KEYS)
         {
             uint32 keyringSize = GetMaxKeyringSize();
-            res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START,KEYRING_SLOT_START+keyringSize,dest,pProto,count,false,pItem,bag,slot);
+            res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START, KEYRING_SLOT_START + keyringSize, dest, pProto, count, false, pItem, bag, slot);
             if (res != EQUIP_ERR_OK)
             {
                 if (no_space_count)
@@ -10185,7 +10350,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
         }
         else if (pProto->BagFamily & BAG_FAMILY_MASK_CURRENCY_TOKENS)
         {
-            res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START,CURRENCYTOKEN_SLOT_END,dest,pProto,count,false,pItem,bag,slot);
+            res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START, CURRENCYTOKEN_SLOT_END, dest, pProto, count, false, pItem, bag, slot);
             if (res != EQUIP_ERR_OK)
             {
                 if (no_space_count)
@@ -10204,15 +10369,15 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
             }
         }
 
-        for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
         {
-            res = _CanStoreItem_InBag(i,dest,pProto,count,false,false,pItem,bag,slot);
+            res = _CanStoreItem_InBag(i, dest, pProto, count, false, false, pItem, bag, slot);
             if (res != EQUIP_ERR_OK)
                 continue;
 
             if (count == 0)
             {
-                if (no_similar_count==0)
+                if (no_similar_count == 0)
                     return EQUIP_ERR_OK;
 
                 if (no_space_count)
@@ -10227,7 +10392,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
         return EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG;
 
     // search free slot
-    res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot);
+    res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START, INVENTORY_SLOT_ITEM_END, dest, pProto, count, false, pItem, bag, slot);
     if (res != EQUIP_ERR_OK)
     {
         if (no_space_count)
@@ -10237,7 +10402,7 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
 
     if (count == 0)
     {
-        if (no_similar_count==0)
+        if (no_similar_count == 0)
             return EQUIP_ERR_OK;
 
         if (no_space_count)
@@ -10245,9 +10410,9 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
         return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
     }
 
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        res = _CanStoreItem_InBag(i,dest,pProto,count,false,true,pItem,bag,slot);
+        res = _CanStoreItem_InBag(i, dest, pProto, count, false, true, pItem, bag, slot);
         if (res != EQUIP_ERR_OK)
             continue;
 
@@ -10269,61 +10434,61 @@ InventoryResult Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &d
 }
 
 //////////////////////////////////////////////////////////////////////////
-InventoryResult Player::CanStoreItems( Item **pItems,int count) const
+InventoryResult Player::CanStoreItems(Item** pItems, int count) const
 {
-    Item    *pItem2;
+    Item* pItem2;
 
     // fill space table
-    int inv_slot_items[INVENTORY_SLOT_ITEM_END-INVENTORY_SLOT_ITEM_START];
-    int inv_bags[INVENTORY_SLOT_BAG_END-INVENTORY_SLOT_BAG_START][MAX_BAG_SIZE];
-    int inv_keys[KEYRING_SLOT_END-KEYRING_SLOT_START];
-    int inv_tokens[CURRENCYTOKEN_SLOT_END-CURRENCYTOKEN_SLOT_START];
+    int inv_slot_items[INVENTORY_SLOT_ITEM_END - INVENTORY_SLOT_ITEM_START];
+    int inv_bags[INVENTORY_SLOT_BAG_END - INVENTORY_SLOT_BAG_START][MAX_BAG_SIZE];
+    int inv_keys[KEYRING_SLOT_END - KEYRING_SLOT_START];
+    int inv_tokens[CURRENCYTOKEN_SLOT_END - CURRENCYTOKEN_SLOT_START];
 
-    memset(inv_slot_items,0,sizeof(int)*(INVENTORY_SLOT_ITEM_END-INVENTORY_SLOT_ITEM_START));
-    memset(inv_bags,0,sizeof(int)*(INVENTORY_SLOT_BAG_END-INVENTORY_SLOT_BAG_START)*MAX_BAG_SIZE);
-    memset(inv_keys,0,sizeof(int)*(KEYRING_SLOT_END-KEYRING_SLOT_START));
-    memset(inv_tokens,0,sizeof(int)*(CURRENCYTOKEN_SLOT_END-CURRENCYTOKEN_SLOT_START));
+    memset(inv_slot_items, 0, sizeof(int) * (INVENTORY_SLOT_ITEM_END - INVENTORY_SLOT_ITEM_START));
+    memset(inv_bags, 0, sizeof(int) * (INVENTORY_SLOT_BAG_END - INVENTORY_SLOT_BAG_START)*MAX_BAG_SIZE);
+    memset(inv_keys, 0, sizeof(int) * (KEYRING_SLOT_END - KEYRING_SLOT_START));
+    memset(inv_tokens, 0, sizeof(int) * (CURRENCYTOKEN_SLOT_END - CURRENCYTOKEN_SLOT_START));
 
-    for(int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+    for (int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
     {
-        pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
+        pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
 
         if (pItem2 && !pItem2->IsInTrade())
         {
-            inv_slot_items[i-INVENTORY_SLOT_ITEM_START] = pItem2->GetCount();
+            inv_slot_items[i - INVENTORY_SLOT_ITEM_START] = pItem2->GetCount();
         }
     }
 
-    for(int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; ++i)
+    for (int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; ++i)
     {
-        pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
+        pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
 
         if (pItem2 && !pItem2->IsInTrade())
         {
-            inv_keys[i-KEYRING_SLOT_START] = pItem2->GetCount();
+            inv_keys[i - KEYRING_SLOT_START] = pItem2->GetCount();
         }
     }
 
-    for(int i = CURRENCYTOKEN_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+    for (int i = CURRENCYTOKEN_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
     {
-        pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
+        pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
 
         if (pItem2 && !pItem2->IsInTrade())
         {
-            inv_tokens[i-CURRENCYTOKEN_SLOT_START] = pItem2->GetCount();
+            inv_tokens[i - CURRENCYTOKEN_SLOT_START] = pItem2->GetCount();
         }
     }
 
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
     {
-        if(Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
+        if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
         {
-            for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+            for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
             {
-                pItem2 = GetItemByPos( i, j );
+                pItem2 = GetItemByPos(i, j);
                 if (pItem2 && !pItem2->IsInTrade())
                 {
-                    inv_bags[i-INVENTORY_SLOT_BAG_START][j] = pItem2->GetCount();
+                    inv_bags[i - INVENTORY_SLOT_BAG_START][j] = pItem2->GetCount();
                 }
             }
         }
@@ -10332,13 +10497,13 @@ InventoryResult Player::CanStoreItems( Item **pItems,int count) const
     // check free space for all items
     for (int k = 0; k < count; ++k)
     {
-        Item  *pItem = pItems[k];
+        Item* pItem = pItems[k];
 
         // no item
         if (!pItem)  continue;
 
-        DEBUG_LOG( "STORAGE: CanStoreItems %i. item = %u, count = %u", k+1, pItem->GetEntry(), pItem->GetCount());
-        ItemPrototype const *pProto = pItem->GetProto();
+        DEBUG_LOG("STORAGE: CanStoreItems %i. item = %u, count = %u", k + 1, pItem->GetEntry(), pItem->GetCount());
+        ItemPrototype const* pProto = pItem->GetProto();
 
         // strange item
         if (!pProto)
@@ -10352,8 +10517,8 @@ InventoryResult Player::CanStoreItems( Item **pItems,int count) const
         if (pItem->IsBindedNotWith(this))
             return EQUIP_ERR_DONT_OWN_THAT_ITEM;
 
-        Bag *pBag;
-        ItemPrototype const *pBagProto;
+        Bag* pBag;
+        ItemPrototype const* pBagProto;
 
         // item is 'one item only'
         InventoryResult res = CanTakeMoreSimilarItems(pItem);
@@ -10365,53 +10530,53 @@ InventoryResult Player::CanStoreItems( Item **pItems,int count) const
         {
             bool b_found = false;
 
-            for(int t = KEYRING_SLOT_START; t < KEYRING_SLOT_END; ++t)
+            for (int t = KEYRING_SLOT_START; t < KEYRING_SLOT_END; ++t)
             {
-                pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, t );
-                if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_keys[t-KEYRING_SLOT_START] + pItem->GetCount() <= pProto->GetMaxStackSize())
+                pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, t);
+                if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_keys[t - KEYRING_SLOT_START] + pItem->GetCount() <= pProto->GetMaxStackSize())
                 {
-                    inv_keys[t-KEYRING_SLOT_START] += pItem->GetCount();
+                    inv_keys[t - KEYRING_SLOT_START] += pItem->GetCount();
                     b_found = true;
                     break;
                 }
             }
             if (b_found) continue;
 
-            for(int t = CURRENCYTOKEN_SLOT_START; t < CURRENCYTOKEN_SLOT_END; ++t)
+            for (int t = CURRENCYTOKEN_SLOT_START; t < CURRENCYTOKEN_SLOT_END; ++t)
             {
-                pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, t );
-                if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_tokens[t-CURRENCYTOKEN_SLOT_START] + pItem->GetCount() <= pProto->GetMaxStackSize())
+                pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, t);
+                if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_tokens[t - CURRENCYTOKEN_SLOT_START] + pItem->GetCount() <= pProto->GetMaxStackSize())
                 {
-                    inv_tokens[t-CURRENCYTOKEN_SLOT_START] += pItem->GetCount();
+                    inv_tokens[t - CURRENCYTOKEN_SLOT_START] += pItem->GetCount();
                     b_found = true;
                     break;
                 }
             }
             if (b_found) continue;
 
-            for(int t = INVENTORY_SLOT_ITEM_START; t < INVENTORY_SLOT_ITEM_END; ++t)
+            for (int t = INVENTORY_SLOT_ITEM_START; t < INVENTORY_SLOT_ITEM_END; ++t)
             {
-                pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, t );
-                if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_slot_items[t-INVENTORY_SLOT_ITEM_START] + pItem->GetCount() <= pProto->GetMaxStackSize())
+                pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, t);
+                if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_slot_items[t - INVENTORY_SLOT_ITEM_START] + pItem->GetCount() <= pProto->GetMaxStackSize())
                 {
-                    inv_slot_items[t-INVENTORY_SLOT_ITEM_START] += pItem->GetCount();
+                    inv_slot_items[t - INVENTORY_SLOT_ITEM_START] += pItem->GetCount();
                     b_found = true;
                     break;
                 }
             }
             if (b_found) continue;
 
-            for(int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
+            for (int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
             {
-                pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, t );
+                pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, t);
                 if (pBag)
                 {
-                    for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+                    for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
                     {
-                        pItem2 = GetItemByPos( t, j );
-                        if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_bags[t-INVENTORY_SLOT_BAG_START][j] + pItem->GetCount() <= pProto->GetMaxStackSize())
+                        pItem2 = GetItemByPos(t, j);
+                        if (pItem2 && pItem2->CanBeMergedPartlyWith(pProto) == EQUIP_ERR_OK && inv_bags[t - INVENTORY_SLOT_BAG_START][j] + pItem->GetCount() <= pProto->GetMaxStackSize())
                         {
-                            inv_bags[t-INVENTORY_SLOT_BAG_START][j] += pItem->GetCount();
+                            inv_bags[t - INVENTORY_SLOT_BAG_START][j] += pItem->GetCount();
                             b_found = true;
                             break;
                         }
@@ -10428,11 +10593,11 @@ InventoryResult Player::CanStoreItems( Item **pItems,int count) const
             if (pProto->BagFamily & BAG_FAMILY_MASK_KEYS)
             {
                 uint32 keyringSize = GetMaxKeyringSize();
-                for(uint32 t = KEYRING_SLOT_START; t < KEYRING_SLOT_START+keyringSize; ++t)
+                for (uint32 t = KEYRING_SLOT_START; t < KEYRING_SLOT_START + keyringSize; ++t)
                 {
-                    if (inv_keys[t-KEYRING_SLOT_START] == 0)
+                    if (inv_keys[t - KEYRING_SLOT_START] == 0)
                     {
-                        inv_keys[t-KEYRING_SLOT_START] = 1;
+                        inv_keys[t - KEYRING_SLOT_START] = 1;
                         b_found = true;
                         break;
                     }
@@ -10443,11 +10608,11 @@ InventoryResult Player::CanStoreItems( Item **pItems,int count) const
 
             if (pProto->BagFamily & BAG_FAMILY_MASK_CURRENCY_TOKENS)
             {
-                for(uint32 t = CURRENCYTOKEN_SLOT_START; t < CURRENCYTOKEN_SLOT_END; ++t)
+                for (uint32 t = CURRENCYTOKEN_SLOT_START; t < CURRENCYTOKEN_SLOT_END; ++t)
                 {
-                    if (inv_tokens[t-CURRENCYTOKEN_SLOT_START] == 0)
+                    if (inv_tokens[t - CURRENCYTOKEN_SLOT_START] == 0)
                     {
-                        inv_tokens[t-CURRENCYTOKEN_SLOT_START] = 1;
+                        inv_tokens[t - CURRENCYTOKEN_SLOT_START] = 1;
                         b_found = true;
                         break;
                     }
@@ -10456,22 +10621,22 @@ InventoryResult Player::CanStoreItems( Item **pItems,int count) const
 
             if (b_found) continue;
 
-            for(int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
+            for (int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
             {
-                pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, t );
+                pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, t);
                 if (pBag)
                 {
                     pBagProto = pBag->GetProto();
 
                     // not plain container check
                     if (pBagProto && (pBagProto->Class != ITEM_CLASS_CONTAINER || pBagProto->SubClass != ITEM_SUBCLASS_CONTAINER) &&
-                        ItemCanGoIntoBag(pProto,pBagProto) )
+                        ItemCanGoIntoBag(pProto,pBagProto))
                     {
-                        for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+                        for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
                         {
-                            if (inv_bags[t-INVENTORY_SLOT_BAG_START][j] == 0)
+                            if (inv_bags[t - INVENTORY_SLOT_BAG_START][j] == 0)
                             {
-                                inv_bags[t-INVENTORY_SLOT_BAG_START][j] = 1;
+                                inv_bags[t - INVENTORY_SLOT_BAG_START][j] = 1;
                                 b_found = true;
                                 break;
                             }
@@ -10484,11 +10649,11 @@ InventoryResult Player::CanStoreItems( Item **pItems,int count) const
 
         // search free slot
         bool b_found = false;
-        for(int t = INVENTORY_SLOT_ITEM_START; t < INVENTORY_SLOT_ITEM_END; ++t)
+        for (int t = INVENTORY_SLOT_ITEM_START; t < INVENTORY_SLOT_ITEM_END; ++t)
         {
-            if (inv_slot_items[t-INVENTORY_SLOT_ITEM_START] == 0)
+            if (inv_slot_items[t - INVENTORY_SLOT_ITEM_START] == 0)
             {
-                inv_slot_items[t-INVENTORY_SLOT_ITEM_START] = 1;
+                inv_slot_items[t - INVENTORY_SLOT_ITEM_START] = 1;
                 b_found = true;
                 break;
             }
@@ -10496,9 +10661,9 @@ InventoryResult Player::CanStoreItems( Item **pItems,int count) const
         if (b_found) continue;
 
         // search free slot in bags
-        for(int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
+        for (int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
         {
-            pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, t );
+            pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, t);
             if (pBag)
             {
                 pBagProto = pBag->GetProto();
@@ -10507,11 +10672,11 @@ InventoryResult Player::CanStoreItems( Item **pItems,int count) const
                 if (pBagProto && (pBagProto->Class != ITEM_CLASS_CONTAINER || pBagProto->SubClass != ITEM_SUBCLASS_CONTAINER))
                     continue;
 
-                for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+                for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
                 {
-                    if (inv_bags[t-INVENTORY_SLOT_BAG_START][j] == 0)
+                    if (inv_bags[t - INVENTORY_SLOT_BAG_START][j] == 0)
                     {
-                        inv_bags[t-INVENTORY_SLOT_BAG_START][j] = 1;
+                        inv_bags[t - INVENTORY_SLOT_BAG_START][j] = 1;
                         b_found = true;
                         break;
                     }
@@ -10528,13 +10693,13 @@ InventoryResult Player::CanStoreItems( Item **pItems,int count) const
 }
 
 //////////////////////////////////////////////////////////////////////////
-InventoryResult Player::CanEquipNewItem( uint8 slot, uint16 &dest, uint32 item, bool swap ) const
+InventoryResult Player::CanEquipNewItem(uint8 slot, uint16& dest, uint32 item, bool swap) const
 {
     dest = 0;
-    Item *pItem = Item::CreateItem( item, 1, this );
+    Item* pItem = Item::CreateItem(item, 1, this);
     if (pItem)
     {
-        InventoryResult result = CanEquipItem(slot, dest, pItem, swap );
+        InventoryResult result = CanEquipItem(slot, dest, pItem, swap);
         delete pItem;
         return result;
     }
@@ -10542,13 +10707,13 @@ InventoryResult Player::CanEquipNewItem( uint8 slot, uint16 &dest, uint32 item,
     return EQUIP_ERR_ITEM_NOT_FOUND;
 }
 
-InventoryResult Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bool direct_action ) const
+InventoryResult Player::CanEquipItem(uint8 slot, uint16& dest, Item* pItem, bool swap, bool direct_action) const
 {
     dest = 0;
     if (pItem)
     {
-        DEBUG_LOG( "STORAGE: CanEquipItem slot = %u, item = %u, count = %u", slot, pItem->GetEntry(), pItem->GetCount());
-        ItemPrototype const *pProto = pItem->GetProto();
+        DEBUG_LOG("STORAGE: CanEquipItem slot = %u, item = %u, count = %u", slot, pItem->GetEntry(), pItem->GetCount());
+        ItemPrototype const* pProto = pItem->GetProto();
         if (pProto)
         {
             // item used
@@ -10588,22 +10753,26 @@ InventoryResult Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, boo
                 if (GetSession()->isLogingOut())
                     return EQUIP_ERR_YOU_ARE_STUNNED;
 
-                if (isInCombat()&& pProto->Class == ITEM_CLASS_WEAPON && m_weaponChangeTimer != 0)
-                    return EQUIP_ERR_CANT_DO_RIGHT_NOW;         // maybe exist better err
+                if (isInCombat() && pProto->Class == ITEM_CLASS_WEAPON && m_weaponChangeTimer != 0)
+                    return EQUIP_ERR_CANT_DO_RIGHT_NOW;     // maybe exist better err
 
                 if (IsNonMeleeSpellCasted(false))
                     return EQUIP_ERR_CANT_DO_RIGHT_NOW;
             }
 
-            ScalingStatDistributionEntry const *ssd = pProto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(pProto->ScalingStatDistribution) : 0;
+            ScalingStatDistributionEntry const* ssd = pProto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(pProto->ScalingStatDistribution) : 0;
             // check allowed level (extend range to upper values if MaxLevel more or equal max player level, this let GM set high level with 1...max range items)
             if (ssd && ssd->MaxLevel < DEFAULT_MAX_LEVEL && ssd->MaxLevel < getLevel())
                 return EQUIP_ERR_ITEM_CANT_BE_EQUIPPED;
 
-            uint8 eslot = FindEquipSlot( pProto, slot, swap );
+            uint8 eslot = FindEquipSlot(pProto, slot, swap);
             if (eslot == NULL_SLOT)
                 return EQUIP_ERR_ITEM_CANT_BE_EQUIPPED;
 
+            // jewelcrafting gem check
+            if (InventoryResult res2 = CanEquipMoreJewelcraftingGems(pItem->GetJewelcraftingGemCount(), swap ? eslot : NULL_SLOT))
+                return res2;
+
             InventoryResult msg = CanUseItem(pItem , direct_action);
             if (msg != EQUIP_ERR_OK)
                 return msg;
@@ -10668,11 +10837,11 @@ InventoryResult Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, boo
                 if (!CanTitanGrip())
                 {
                     // offhand item must can be stored in inventory for offhand item and it also must be unequipped
-                    Item *offItem = GetItemByPos( INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND );
+                    Item* offItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
                     ItemPosCountVec off_dest;
                     if (offItem && (!direct_action ||
                         CanUnequipItem(uint16(INVENTORY_SLOT_BAG_0) << 8 | EQUIPMENT_SLOT_OFFHAND,false) !=  EQUIP_ERR_OK ||
-                        CanStoreItem( NULL_BAG, NULL_SLOT, off_dest, offItem, false ) !=  EQUIP_ERR_OK ))
+                        CanStoreItem(NULL_BAG, NULL_SLOT, off_dest, offItem, false) !=  EQUIP_ERR_OK))
                         return swap ? EQUIP_ERR_ITEMS_CANT_BE_SWAPPED : EQUIP_ERR_INVENTORY_FULL;
                 }
             }
@@ -10684,7 +10853,7 @@ InventoryResult Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, boo
     return !swap ? EQUIP_ERR_ITEM_NOT_FOUND : EQUIP_ERR_ITEMS_CANT_BE_SWAPPED;
 }
 
-InventoryResult Player::CanUnequipItem( uint16 pos, bool swap ) const
+InventoryResult Player::CanUnequipItem(uint16 pos, bool swap) const
 {
     // Applied only to equipped items and bank bags
     if (!IsEquipmentPos(pos) && !IsBagPos(pos))
@@ -10696,9 +10865,9 @@ InventoryResult Player::CanUnequipItem( uint16 pos, bool swap ) const
     if (!pItem)
         return EQUIP_ERR_OK;
 
-    DEBUG_LOG( "STORAGE: CanUnequipItem slot = %u, item = %u, count = %u", pos, pItem->GetEntry(), pItem->GetCount());
+    DEBUG_LOG("STORAGE: CanUnequipItem slot = %u, item = %u, count = %u", pos, pItem->GetEntry(), pItem->GetCount());
 
-    ItemPrototype const *pProto = pItem->GetProto();
+    ItemPrototype const* pProto = pItem->GetProto();
     if (!pProto)
         return EQUIP_ERR_ITEM_NOT_FOUND;
 
@@ -10709,13 +10878,13 @@ InventoryResult Player::CanUnequipItem( uint16 pos, bool swap ) const
     // do not allow unequipping gear except weapons, offhands, projectiles, relics in
     // - combat
     // - in-progress arenas
-    if( !pProto->CanChangeEquipStateInCombat() )
+    if (!pProto->CanChangeEquipStateInCombat())
     {
-        if( isInCombat() )
+        if (isInCombat())
             return EQUIP_ERR_NOT_IN_COMBAT;
 
-        if(BattleGround* bg = GetBattleGround())
-            if( bg->isArena() && bg->GetStatus() == STATUS_IN_PROGRESS )
+        if (BattleGround* bg = GetBattleGround())
+            if (bg->isArena() && bg->GetStatus() == STATUS_IN_PROGRESS)
                 return EQUIP_ERR_NOT_DURING_ARENA_MATCH;
     }
 
@@ -10723,21 +10892,21 @@ InventoryResult Player::CanUnequipItem( uint16 pos, bool swap ) const
     if (GetSession()->isLogingOut())
         return EQUIP_ERR_YOU_ARE_STUNNED;
 
-    if(!swap && pItem->IsBag() && !((Bag*)pItem)->IsEmpty())
+    if (!swap && pItem->IsBag() && !((Bag*)pItem)->IsEmpty())
         return EQUIP_ERR_CAN_ONLY_DO_WITH_EMPTY_BAGS;
 
     return EQUIP_ERR_OK;
 }
 
-InventoryResult Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *pItem, bool swap, bool not_loading ) const
+InventoryResult Player::CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, Item* pItem, bool swap, bool not_loading) const
 {
     if (!pItem)
         return swap ? EQUIP_ERR_ITEMS_CANT_BE_SWAPPED : EQUIP_ERR_ITEM_NOT_FOUND;
 
     uint32 count = pItem->GetCount();
 
-    DEBUG_LOG( "STORAGE: CanBankItem bag = %u, slot = %u, item = %u, count = %u", bag, slot, pItem->GetEntry(), pItem->GetCount());
-    ItemPrototype const *pProto = pItem->GetProto();
+    DEBUG_LOG("STORAGE: CanBankItem bag = %u, slot = %u, item = %u, count = %u", bag, slot, pItem->GetEntry(), pItem->GetCount());
+    ItemPrototype const* pProto = pItem->GetProto();
     if (!pProto)
         return swap ? EQUIP_ERR_ITEMS_CANT_BE_SWAPPED : EQUIP_ERR_ITEM_NOT_FOUND;
 
@@ -10764,77 +10933,77 @@ InventoryResult Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &des
             if (slot - BANK_SLOT_BAG_START >= GetBankBagSlotCount())
                 return EQUIP_ERR_MUST_PURCHASE_THAT_BAG_SLOT;
 
-            res = CanUseItem( pItem, not_loading );
+            res = CanUseItem(pItem, not_loading);
             if (res != EQUIP_ERR_OK)
                 return res;
         }
 
-        res = _CanStoreItem_InSpecificSlot(bag,slot,dest,pProto,count,swap,pItem);
-        if (res!=EQUIP_ERR_OK)
+        res = _CanStoreItem_InSpecificSlot(bag, slot, dest, pProto, count, swap, pItem);
+        if (res != EQUIP_ERR_OK)
             return res;
 
-        if (count==0)
+        if (count == 0)
             return EQUIP_ERR_OK;
     }
 
     // not specific slot or have space for partly store only in specific slot
 
     // in specific bag
-    if( bag != NULL_BAG )
+    if (bag != NULL_BAG)
     {
-        if( pProto->InventoryType == INVTYPE_BAG )
+        if (pProto->InventoryType == INVTYPE_BAG)
         {
-            Bag *pBag = (Bag*)pItem;
-            if( pBag && !pBag->IsEmpty() )
+            Bag* pBag = (Bag*)pItem;
+            if (pBag && !pBag->IsEmpty())
                 return EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG;
         }
 
         // search stack in bag for merge to
-        if( pProto->Stackable != 1 )
+        if (pProto->Stackable != 1)
         {
-            if( bag == INVENTORY_SLOT_BAG_0 )
+            if (bag == INVENTORY_SLOT_BAG_0)
             {
-                res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot);
-                if(res!=EQUIP_ERR_OK)
+                res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START, BANK_SLOT_ITEM_END, dest, pProto, count, true, pItem, bag, slot);
+                if (res != EQUIP_ERR_OK)
                     return res;
 
-                if(count==0)
+                if (count == 0)
                     return EQUIP_ERR_OK;
             }
             else
             {
-                res = _CanStoreItem_InBag(bag,dest,pProto,count,true,false,pItem,NULL_BAG,slot);
-                if(res!=EQUIP_ERR_OK)
-                    res = _CanStoreItem_InBag(bag,dest,pProto,count,true,true,pItem,NULL_BAG,slot);
+                res = _CanStoreItem_InBag(bag, dest, pProto, count, true, false, pItem, NULL_BAG, slot);
+                if (res != EQUIP_ERR_OK)
+                    res = _CanStoreItem_InBag(bag, dest, pProto, count, true, true, pItem, NULL_BAG, slot);
 
-                if(res!=EQUIP_ERR_OK)
+                if (res != EQUIP_ERR_OK)
                     return res;
 
-                if(count==0)
+                if (count == 0)
                     return EQUIP_ERR_OK;
             }
         }
 
         // search free slot in bag
-        if( bag == INVENTORY_SLOT_BAG_0 )
+        if (bag == INVENTORY_SLOT_BAG_0)
         {
-            res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot);
-            if(res!=EQUIP_ERR_OK)
+            res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START, BANK_SLOT_ITEM_END, dest, pProto, count, false, pItem, bag, slot);
+            if (res != EQUIP_ERR_OK)
                 return res;
 
-            if(count==0)
+            if (count == 0)
                 return EQUIP_ERR_OK;
         }
         else
         {
             res = _CanStoreItem_InBag(bag, dest, pProto, count, false, false, pItem, NULL_BAG, slot);
-            if(res != EQUIP_ERR_OK)
+            if (res != EQUIP_ERR_OK)
                 res = _CanStoreItem_InBag(bag, dest, pProto, count, false, true, pItem, NULL_BAG, slot);
 
-            if(res != EQUIP_ERR_OK)
+            if (res != EQUIP_ERR_OK)
                 return res;
 
-            if(count == 0)
+            if (count == 0)
                 return EQUIP_ERR_OK;
         }
     }
@@ -10842,88 +11011,88 @@ InventoryResult Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &des
     // not specific bag or have space for partly store only in specific bag
 
     // search stack for merge to
-    if( pProto->Stackable != 1 )
+    if (pProto->Stackable != 1)
     {
         // in slots
-        res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot);
-        if(res != EQUIP_ERR_OK)
+        res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START, BANK_SLOT_ITEM_END, dest, pProto, count, true, pItem, bag, slot);
+        if (res != EQUIP_ERR_OK)
             return res;
 
-        if(count == 0)
+        if (count == 0)
             return EQUIP_ERR_OK;
 
         // in special bags
-        if( pProto->BagFamily )
+        if (pProto->BagFamily)
         {
-            for(int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+            for (int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
             {
-                res = _CanStoreItem_InBag(i,dest,pProto,count,true,false,pItem,bag,slot);
-                if(res!=EQUIP_ERR_OK)
+                res = _CanStoreItem_InBag(i, dest, pProto, count, true, false, pItem, bag, slot);
+                if (res != EQUIP_ERR_OK)
                     continue;
 
-                if(count==0)
+                if (count == 0)
                     return EQUIP_ERR_OK;
             }
         }
 
-        for(int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+        for (int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
         {
-            res = _CanStoreItem_InBag(i,dest,pProto,count,true,true,pItem,bag,slot);
-            if(res!=EQUIP_ERR_OK)
+            res = _CanStoreItem_InBag(i, dest, pProto, count, true, true, pItem, bag, slot);
+            if (res != EQUIP_ERR_OK)
                 continue;
 
-            if(count==0)
+            if (count == 0)
                 return EQUIP_ERR_OK;
         }
     }
 
     // search free place in special bag
-    if( pProto->BagFamily )
+    if (pProto->BagFamily)
     {
-        for(int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+        for (int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
         {
-            res = _CanStoreItem_InBag(i,dest,pProto,count,false,false,pItem,bag,slot);
-            if(res!=EQUIP_ERR_OK)
+            res = _CanStoreItem_InBag(i, dest, pProto, count, false, false, pItem, bag, slot);
+            if (res != EQUIP_ERR_OK)
                 continue;
 
-            if(count==0)
+            if (count == 0)
                 return EQUIP_ERR_OK;
         }
     }
 
     // search free space
-    res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot);
-    if(res!=EQUIP_ERR_OK)
+    res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START, BANK_SLOT_ITEM_END, dest, pProto, count, false, pItem, bag, slot);
+    if (res != EQUIP_ERR_OK)
         return res;
 
-    if(count==0)
+    if (count == 0)
         return EQUIP_ERR_OK;
 
-    for(int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+    for (int i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
     {
-        res = _CanStoreItem_InBag(i,dest,pProto,count,false,true,pItem,bag,slot);
-        if(res!=EQUIP_ERR_OK)
+        res = _CanStoreItem_InBag(i, dest, pProto, count, false, true, pItem, bag, slot);
+        if (res != EQUIP_ERR_OK)
             continue;
 
-        if(count==0)
+        if (count == 0)
             return EQUIP_ERR_OK;
     }
     return EQUIP_ERR_BANK_FULL;
 }
 
-InventoryResult Player::CanUseItem(Item *pItem, bool direct_action) const
+InventoryResult Player::CanUseItem(Item* pItem, bool direct_action) const
 {
     if (pItem)
     {
-        DEBUG_LOG( "STORAGE: CanUseItem item = %u", pItem->GetEntry());
+        DEBUG_LOG("STORAGE: CanUseItem item = %u", pItem->GetEntry());
 
         if (!isAlive() && direct_action)
             return EQUIP_ERR_YOU_ARE_DEAD;
 
-        //if (isStunned())
+        // if (isStunned())
         //    return EQUIP_ERR_YOU_ARE_STUNNED;
 
-        ItemPrototype const *pProto = pItem->GetProto();
+        ItemPrototype const* pProto = pItem->GetProto();
         if (pProto)
         {
             if (pItem->IsBindedNotWith(this))
@@ -10941,14 +11110,14 @@ InventoryResult Player::CanUseItem(Item *pItem, bool direct_action) const
                     if (pProto->Class != ITEM_CLASS_ARMOR)
                         return EQUIP_ERR_NO_REQUIRED_PROFICIENCY;
 
-                    ScalingStatDistributionEntry const *ssd = pProto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(pProto->ScalingStatDistribution) : NULL;
+                    ScalingStatDistributionEntry const* ssd = pProto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(pProto->ScalingStatDistribution) : NULL;
                     if (!ssd)
                         return EQUIP_ERR_NO_REQUIRED_PROFICIENCY;
 
                     bool allowScaleSkill = false;
                     for (uint32 i = 0; i < sSkillLineAbilityStore.GetNumRows(); ++i)
                     {
-                        SkillLineAbilityEntry const *skillInfo = sSkillLineAbilityStore.LookupEntry(i);
+                        SkillLineAbilityEntry const* skillInfo = sSkillLineAbilityStore.LookupEntry(i);
                         if (!skillInfo)
                             continue;
 
@@ -10980,33 +11149,36 @@ InventoryResult Player::CanUseItem(Item *pItem, bool direct_action) const
     return EQUIP_ERR_ITEM_NOT_FOUND;
 }
 
-InventoryResult Player::CanUseItem( ItemPrototype const *pProto ) const
+InventoryResult Player::CanUseItem(ItemPrototype const* pProto) const
 {
     // Used by group, function NeedBeforeGreed, to know if a prototype can be used by a player
 
-    if( pProto )
+    if (pProto)
     {
-        if ((pProto->Flags2 & ITEM_FLAG2_HORDE_ONLY) && GetTeam() != HORDE)
-            return EQUIP_ERR_YOU_CAN_NEVER_USE_THAT_ITEM;
+        if (!sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GROUP))
+        {
+            if ((pProto->Flags2 & ITEM_FLAG2_HORDE_ONLY) && GetTeam() != HORDE)
+                return EQUIP_ERR_YOU_CAN_NEVER_USE_THAT_ITEM;
 
-        if ((pProto->Flags2 & ITEM_FLAG2_ALLIANCE_ONLY) && GetTeam() != ALLIANCE)
-            return EQUIP_ERR_YOU_CAN_NEVER_USE_THAT_ITEM;
+            if ((pProto->Flags2 & ITEM_FLAG2_ALLIANCE_ONLY) && GetTeam() != ALLIANCE)
+                return EQUIP_ERR_YOU_CAN_NEVER_USE_THAT_ITEM;
+        }
 
         if ((pProto->AllowableClass & getClassMask()) == 0 || (pProto->AllowableRace & getRaceMask()) == 0)
             return EQUIP_ERR_YOU_CAN_NEVER_USE_THAT_ITEM;
 
-        if( pProto->RequiredSkill != 0  )
+        if (pProto->RequiredSkill != 0)
         {
-            if( GetSkillValue( pProto->RequiredSkill ) == 0 )
+            if (GetSkillValue(pProto->RequiredSkill) == 0)
                 return EQUIP_ERR_NO_REQUIRED_PROFICIENCY;
-            else if( GetSkillValue( pProto->RequiredSkill ) < pProto->RequiredSkillRank )
+            else if (GetSkillValue(pProto->RequiredSkill) < pProto->RequiredSkillRank)
                 return EQUIP_ERR_CANT_EQUIP_SKILL;
         }
 
-        if( pProto->RequiredSpell != 0 && !HasSpell( pProto->RequiredSpell ) )
+        if (pProto->RequiredSpell != 0 && !HasSpell(pProto->RequiredSpell))
             return EQUIP_ERR_NO_REQUIRED_PROFICIENCY;
 
-        if( getLevel() < pProto->RequiredLevel )
+        if (getLevel() < pProto->RequiredLevel)
             return EQUIP_ERR_CANT_EQUIP_LEVEL_I;
 
         return EQUIP_ERR_OK;
@@ -11014,29 +11186,29 @@ InventoryResult Player::CanUseItem( ItemPrototype const *pProto ) const
     return EQUIP_ERR_ITEM_NOT_FOUND;
 }
 
-InventoryResult Player::CanUseAmmo( uint32 item ) const
+InventoryResult Player::CanUseAmmo(uint32 item) const
 {
-    DEBUG_LOG( "STORAGE: CanUseAmmo item = %u", item);
-    if( !isAlive() )
+    DEBUG_LOG("STORAGE: CanUseAmmo item = %u", item);
+    if (!isAlive())
         return EQUIP_ERR_YOU_ARE_DEAD;
-    //if( isStunned() )
+    // if (isStunned())
     //    return EQUIP_ERR_YOU_ARE_STUNNED;
-    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype( item );
-    if( pProto )
+    ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(item);
+    if (pProto)
     {
-        if( pProto->InventoryType!= INVTYPE_AMMO )
+        if (pProto->InventoryType != INVTYPE_AMMO)
             return EQUIP_ERR_ONLY_AMMO_CAN_GO_HERE;
 
         InventoryResult msg = CanUseItem(pProto);
         if (msg != EQUIP_ERR_OK)
             return msg;
 
-        /*if ( GetReputationMgr().GetReputation() < pProto->RequiredReputation )
+        /*if (GetReputationMgr().GetReputation() < pProto->RequiredReputation)
         return EQUIP_ERR_CANT_EQUIP_REPUTATION;
         */
 
         // Requires No Ammo
-        if(GetDummyAura(46699))
+        if (GetDummyAura(46699))
             return EQUIP_ERR_BAG_FULL6;
 
         return EQUIP_ERR_OK;
@@ -11044,19 +11216,19 @@ InventoryResult Player::CanUseAmmo( uint32 item ) const
     return EQUIP_ERR_ITEM_NOT_FOUND;
 }
 
-void Player::SetAmmo( uint32 item )
+void Player::SetAmmo(uint32 item)
 {
-    if(!item)
+    if (!item)
         return;
 
     // already set
-    if( GetUInt32Value(PLAYER_AMMO_ID) == item )
+    if (GetUInt32Value(PLAYER_AMMO_ID) == item)
         return;
 
     // check ammo
     if (item)
     {
-        InventoryResult msg = CanUseAmmo( item );
+        InventoryResult msg = CanUseAmmo(item);
         if (msg != EQUIP_ERR_OK)
         {
             SendEquipError(msg, NULL, NULL, item);
@@ -11080,62 +11252,66 @@ void Player::RemoveAmmo()
 }
 
 // Return stored item (if stored to stack, it can diff. from pItem). And pItem ca be deleted in this case.
-Item* Player::StoreNewItem( ItemPosCountVec const& dest, uint32 item, bool update,int32 randomPropertyId )
+Item* Player::StoreNewItem(ItemPosCountVec const& dest, uint32 item, bool update, int32 randomPropertyId, AllowedLooterSet* allowedLooters)
 {
     uint32 count = 0;
-    for(ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr)
+    for (ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr)
         count += itr->count;
 
-    Item *pItem = Item::CreateItem(item, count, this, randomPropertyId);
+    Item* pItem = Item::CreateItem(item, count, this, randomPropertyId);
     if (pItem)
     {
-        ItemAddedQuestCheck( item, count );
+        ResetCachedGearScore();
+        ItemAddedQuestCheck(item, count);
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_RECEIVE_EPIC_ITEM, item, count);
-        pItem = StoreItem( dest, pItem, update );
+        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM, item, count);
+        pItem = StoreItem(dest, pItem, update);
+
+        if (pItem->IsEligibleForSoulboundTrade(allowedLooters))
+            pItem->SetSoulboundTradeable(this, allowedLooters);
+
     }
     return pItem;
 }
 
-Item* Player::StoreItem( ItemPosCountVec const& dest, Item* pItem, bool update )
+Item* Player::StoreItem(ItemPosCountVec const& dest, Item* pItem, bool update)
 {
-    if( !pItem )
+    if (!pItem)
         return NULL;
 
     Item* lastItem = pItem;
-    uint32 entry = pItem->GetEntry();
 
-    for(ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); )
+    for (ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end();)
     {
         uint16 pos = itr->pos;
         uint32 count = itr->count;
 
         ++itr;
 
-        if(itr == dest.end())
+        if (itr == dest.end())
         {
-            lastItem = _StoreItem(pos,pItem,count,false,update);
+            lastItem = _StoreItem(pos, pItem, count, false, update);
             break;
         }
 
-        lastItem = _StoreItem(pos,pItem,count,true,update);
+        lastItem = _StoreItem(pos, pItem, count, true, update);
     }
 
-    GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM, entry);
     return lastItem;
 }
 
 // Return stored item (if stored to stack, it can diff. from pItem). And pItem ca be deleted in this case.
-Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, bool update )
+Item* Player::_StoreItem(uint16 pos, Item* pItem, uint32 count, bool clone, bool update)
 {
-    if( !pItem )
+    if (!pItem)
         return NULL;
 
     uint8 bag = pos >> 8;
     uint8 slot = pos & 255;
 
-    DEBUG_LOG( "STORAGE: StoreItem bag = %u, slot = %u, item = %u, count = %u", bag, slot, pItem->GetEntry(), count);
+    DEBUG_LOG("STORAGE: StoreItem bag = %u, slot = %u, item = %u, count = %u", bag, slot, pItem->GetEntry(), count);
 
-    Item *pItem2 = GetItemByPos( bag, slot );
+    Item* pItem2 = GetItemByPos(bag, slot);
 
     if (!pItem2)
     {
@@ -11150,7 +11326,7 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
         if (pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP ||
             pItem->GetProto()->Bonding == BIND_QUEST_ITEM ||
             (pItem->GetProto()->Bonding == BIND_WHEN_EQUIPPED && IsBagPos(pos)))
-            pItem->SetBinding( true );
+            pItem->SetBinding(true);
 
         if (bag == INVENTORY_SLOT_BAG_0)
         {
@@ -11159,8 +11335,8 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
             pItem->SetGuidValue(ITEM_FIELD_CONTAINED, GetObjectGuid());
             pItem->SetGuidValue(ITEM_FIELD_OWNER, GetObjectGuid());
 
-            pItem->SetSlot( slot );
-            pItem->SetContainer( NULL );
+            pItem->SetSlot(slot);
+            pItem->SetContainer(NULL);
 
             // need update known currency
             if (slot >= CURRENCYTOKEN_SLOT_START && slot < CURRENCYTOKEN_SLOT_END)
@@ -11169,18 +11345,18 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
             if (IsInWorld() && update)
             {
                 pItem->AddToWorld();
-                pItem->SendCreateUpdateToPlayer( this );
+                pItem->SendCreateUpdateToPlayer(this);
             }
 
             pItem->SetState(ITEM_CHANGED, this);
         }
-        else if (Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag ))
+        else if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, bag))
         {
-            pBag->StoreItem( slot, pItem, update );
+            pBag->StoreItem(slot, pItem, update);
             if (IsInWorld() && update)
             {
                 pItem->AddToWorld();
-                pItem->SendCreateUpdateToPlayer( this );
+                pItem->SendCreateUpdateToPlayer(this);
             }
             pItem->SetState(ITEM_CHANGED, this);
             pBag->SetState(ITEM_CHANGED, this);
@@ -11201,23 +11377,26 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
             (pItem2->GetProto()->Bonding == BIND_WHEN_EQUIPPED && IsBagPos(pos)))
             pItem2->SetBinding(true);
 
-        pItem2->SetCount( pItem2->GetCount() + count );
+        pItem2->SetCount(pItem2->GetCount() + count);
         if (IsInWorld() && update)
-            pItem2->SendCreateUpdateToPlayer( this );
+            pItem2->SendCreateUpdateToPlayer(this);
 
         if (!clone)
         {
             // delete item (it not in any slot currently)
             if (IsInWorld() && update)
             {
-                pItem->RemoveFromWorld();
-                pItem->DestroyForPlayer( this );
+                pItem->RemoveFromWorld(false);
+                pItem->DestroyForPlayer(this);
             }
 
             RemoveEnchantmentDurations(pItem);
             RemoveItemDurations(pItem);
 
             pItem->SetOwnerGuid(GetObjectGuid());           // prevent error at next SetState in case trade/mail/buy from vendor
+            pItem->SetNotSoulboundTradeable(this);
+            pItem->SetNotRefundable(this);
+
             pItem->SetState(ITEM_REMOVED, this);
         }
 
@@ -11230,19 +11409,20 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
     }
 }
 
-Item* Player::EquipNewItem( uint16 pos, uint32 item, bool update )
+Item* Player::EquipNewItem(uint16 pos, uint32 item, bool update)
 {
-    if (Item *pItem = Item::CreateItem(item, 1, this))
+    if (Item* pItem = Item::CreateItem(item, 1, this))
     {
-        ItemAddedQuestCheck( item, 1 );
+        ResetCachedGearScore();
+        ItemAddedQuestCheck(item, 1);
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_RECEIVE_EPIC_ITEM, item, 1);
-        return EquipItem( pos, pItem, update );
+        return EquipItem(pos, pItem, update);
     }
 
     return NULL;
 }
 
-Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
+Item* Player::EquipItem(uint16 pos, Item* pItem, bool update)
 {
     AddEnchantmentDurations(pItem);
     AddItemDurations(pItem);
@@ -11250,14 +11430,14 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
     uint8 bag = pos >> 8;
     uint8 slot = pos & 255;
 
-    Item *pItem2 = GetItemByPos(bag, slot);
+    Item* pItem2 = GetItemByPos(bag, slot);
     if (!pItem2)
     {
-        VisualizeItem( slot, pItem);
+        VisualizeItem(slot, pItem);
 
         if (isAlive())
         {
-            ItemPrototype const *pProto = pItem->GetProto();
+            ItemPrototype const* pProto = pItem->GetProto();
 
             // item set bonuses applied only at equip and removed at unequip, and still active for broken items
             if (pProto && pProto->ItemSet)
@@ -11283,7 +11463,7 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
                 {
                     m_weaponChangeTimer = spellProto->StartRecoveryTime;
 
-                    WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+4);
+                    WorldPacket data(SMSG_SPELL_COOLDOWN, 8 + 1 + 4);
                     data << GetObjectGuid();
                     data << uint8(1);
                     data << uint32(cooldownSpell);
@@ -11296,17 +11476,17 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
         if (IsInWorld() && update)
         {
             pItem->AddToWorld();
-            pItem->SendCreateUpdateToPlayer( this );
+            pItem->SendCreateUpdateToPlayer(this);
         }
 
         ApplyEquipCooldown(pItem);
 
-        if( slot == EQUIPMENT_SLOT_MAINHAND )
+        if (slot == EQUIPMENT_SLOT_MAINHAND)
         {
             UpdateExpertise(BASE_ATTACK);
             UpdateArmorPenetration();
         }
-        else if( slot == EQUIPMENT_SLOT_OFFHAND )
+        else if (slot == EQUIPMENT_SLOT_OFFHAND)
         {
             UpdateExpertise(OFF_ATTACK);
             UpdateArmorPenetration();
@@ -11314,22 +11494,25 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
     }
     else
     {
-        pItem2->SetCount( pItem2->GetCount() + pItem->GetCount() );
+        pItem2->SetCount(pItem2->GetCount() + pItem->GetCount());
         if (IsInWorld() && update)
-            pItem2->SendCreateUpdateToPlayer( this );
+            pItem2->SendCreateUpdateToPlayer(this);
 
         // delete item (it not in any slot currently)
-        //pItem->DeleteFromDB();
+        // pItem->DeleteFromDB();
         if (IsInWorld() && update)
         {
-            pItem->RemoveFromWorld();
-            pItem->DestroyForPlayer( this );
+            pItem->RemoveFromWorld(false);
+            pItem->DestroyForPlayer(this);
         }
 
         RemoveEnchantmentDurations(pItem);
         RemoveItemDurations(pItem);
 
         pItem->SetOwnerGuid(GetObjectGuid());               // prevent error at next SetState in case trade/mail/buy from vendor
+        pItem->SetNotSoulboundTradeable(this);
+        pItem->SetNotRefundable(this);
+
         pItem->SetState(ITEM_REMOVED, this);
         pItem2->SetState(ITEM_CHANGED, this);
 
@@ -11343,39 +11526,39 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
 
     // only for full equip instead adding to stack
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM, pItem->GetEntry());
-    GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM, slot+1);
+    GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM, slot + 1);
 
     return pItem;
 }
 
-void Player::QuickEquipItem( uint16 pos, Item *pItem)
+void Player::QuickEquipItem(uint16 pos, Item* pItem)
 {
-    if( pItem )
+    if (pItem)
     {
         AddEnchantmentDurations(pItem);
         AddItemDurations(pItem);
         ApplyItemOnStoreSpell(pItem, true);
 
         uint8 slot = pos & 255;
-        VisualizeItem( slot, pItem);
+        VisualizeItem(slot, pItem);
 
-        if( IsInWorld() )
+        if (IsInWorld())
         {
             pItem->AddToWorld();
-            pItem->SendCreateUpdateToPlayer( this );
+            pItem->SendCreateUpdateToPlayer(this);
         }
         // Apply Titan's Grip damage penalty if necessary
         if ((slot == EQUIPMENT_SLOT_MAINHAND || slot == EQUIPMENT_SLOT_OFFHAND) && CanTitanGrip() && HasTwoHandWeaponInOneHand() && !HasAura(49152))
             CastSpell(this, 49152, true);
 
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM, pItem->GetEntry());
-        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM, slot+1);
+        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM, slot + 1);
     }
 }
 
-void Player::SetVisibleItemSlot(uint8 slot, Item *pItem)
+void Player::SetVisibleItemSlot(uint8 slot, Item* pItem)
 {
-    if(pItem)
+    if (pItem)
     {
         SetUInt32Value(PLAYER_VISIBLE_ITEM_1_ENTRYID + (slot * 2), pItem->GetEntry());
         SetUInt16Value(PLAYER_VISIBLE_ITEM_1_ENCHANTMENT + (slot * 2), 0, pItem->GetEnchantmentId(PERM_ENCHANTMENT_SLOT));
@@ -11388,63 +11571,63 @@ void Player::SetVisibleItemSlot(uint8 slot, Item *pItem)
     }
 }
 
-void Player::VisualizeItem( uint8 slot, Item *pItem)
+void Player::VisualizeItem(uint8 slot, Item* pItem)
 {
-    if(!pItem)
+    if (!pItem)
         return;
 
     // check also  BIND_WHEN_PICKED_UP and BIND_QUEST_ITEM for .additem or .additemset case by GM (not binded at adding to inventory)
-    if( pItem->GetProto()->Bonding == BIND_WHEN_EQUIPPED || pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP || pItem->GetProto()->Bonding == BIND_QUEST_ITEM )
-        pItem->SetBinding( true );
+    if (pItem->GetProto()->Bonding == BIND_WHEN_EQUIPPED || pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP || pItem->GetProto()->Bonding == BIND_QUEST_ITEM)
+        pItem->SetBinding(true);
 
-    DEBUG_LOG( "STORAGE: EquipItem slot = %u, item = %u", slot, pItem->GetEntry());
+    DEBUG_LOG("STORAGE: EquipItem slot = %u, item = %u", slot, pItem->GetEntry());
 
     m_items[slot] = pItem;
     SetGuidValue(PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), pItem->GetObjectGuid());
     pItem->SetGuidValue(ITEM_FIELD_CONTAINED, GetObjectGuid());
     pItem->SetGuidValue(ITEM_FIELD_OWNER, GetObjectGuid());
-    pItem->SetSlot( slot );
-    pItem->SetContainer( NULL );
+    pItem->SetSlot(slot);
+    pItem->SetContainer(NULL);
 
-    if( slot < EQUIPMENT_SLOT_END )
+    if (slot < EQUIPMENT_SLOT_END)
         SetVisibleItemSlot(slot, pItem);
 
     pItem->SetState(ITEM_CHANGED, this);
 }
 
-void Player::RemoveItem( uint8 bag, uint8 slot, bool update )
+void Player::RemoveItem(uint8 bag, uint8 slot, bool update)
 {
     // note: removeitem does not actually change the item
     // it only takes the item out of storage temporarily
     // note2: if removeitem is to be used for delinking
     // the item must be removed from the player's updatequeue
 
-    if (Item *pItem = GetItemByPos(bag, slot))
+    if (Item* pItem = GetItemByPos(bag, slot))
     {
-        DEBUG_LOG( "STORAGE: RemoveItem bag = %u, slot = %u, item = %u", bag, slot, pItem->GetEntry());
+        DEBUG_LOG("STORAGE: RemoveItem bag = %u, slot = %u, item = %u", bag, slot, pItem->GetEntry());
 
         RemoveEnchantmentDurations(pItem);
         RemoveItemDurations(pItem);
 
-        if( bag == INVENTORY_SLOT_BAG_0 )
+        if (bag == INVENTORY_SLOT_BAG_0)
         {
-            if ( slot < INVENTORY_SLOT_BAG_END )
+            if (slot < INVENTORY_SLOT_BAG_END)
             {
-                ItemPrototype const *pProto = pItem->GetProto();
+                ItemPrototype const* pProto = pItem->GetProto();
                 // item set bonuses applied only at equip and removed at unequip, and still active for broken items
 
-                if(pProto && pProto->ItemSet)
+                if (pProto && pProto->ItemSet)
                     RemoveItemsSetItem(this, pProto);
 
                 _ApplyItemMods(pItem, slot, false);
 
                 // remove item dependent auras and casts (only weapon and armor slots)
-                if(slot < EQUIPMENT_SLOT_END)
+                if (slot < EQUIPMENT_SLOT_END)
                 {
                     RemoveItemDependentAurasAndCasts(pItem);
 
                     // remove held enchantments, update expertise
-                    if ( slot == EQUIPMENT_SLOT_MAINHAND )
+                    if (slot == EQUIPMENT_SLOT_MAINHAND)
                     {
                         if (pItem->GetItemSuffixFactor())
                         {
@@ -11460,7 +11643,7 @@ void Player::RemoveItem( uint8 bag, uint8 slot, bool update )
                         UpdateExpertise(BASE_ATTACK);
                         UpdateArmorPenetration();
                     }
-                    else if( slot == EQUIPMENT_SLOT_OFFHAND )
+                    else if (slot == EQUIPMENT_SLOT_OFFHAND)
                     {
                         UpdateExpertise(OFF_ATTACK);
                         UpdateArmorPenetration();
@@ -11474,7 +11657,7 @@ void Player::RemoveItem( uint8 bag, uint8 slot, bool update )
             m_items[slot] = NULL;
             SetGuidValue(PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), ObjectGuid());
 
-            if ( slot < EQUIPMENT_SLOT_END )
+            if (slot < EQUIPMENT_SLOT_END)
             {
                 SetVisibleItemSlot(slot, NULL);
                 // Remove Titan's Grip damage penalty if necessary
@@ -11484,38 +11667,43 @@ void Player::RemoveItem( uint8 bag, uint8 slot, bool update )
         }
         else
         {
-            Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag );
-            if( pBag )
+            Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, bag);
+            if (pBag)
+            {
                 pBag->RemoveItem(slot, update);
+                pBag->SetState(ITEM_CHANGED, this);
+            }
         }
         pItem->SetGuidValue(ITEM_FIELD_CONTAINED, ObjectGuid());
         // pItem->SetGuidValue(ITEM_FIELD_OWNER, ObjectGuid()); not clear owner at remove (it will be set at store). This used in mail and auction code
-        pItem->SetSlot( NULL_SLOT );
+        pItem->SetSlot(NULL_SLOT);
 
-        //ApplyItemOnStoreSpell, for avoid re-apply will remove at _adding_ to not appropriate slot
+        // ApplyItemOnStoreSpell, for avoid re-apply will remove at _adding_ to not appropriate slot
 
         if (IsInWorld() && update)
-            pItem->SendCreateUpdateToPlayer( this );
+            pItem->SendCreateUpdateToPlayer(this);
     }
 }
 
 // Common operation need to remove item from inventory without delete in trade, auction, guild bank, mail....
 void Player::MoveItemFromInventory(uint8 bag, uint8 slot, bool update)
 {
-    if(Item* it = GetItemByPos(bag,slot))
+    if (Item* it = GetItemByPos(bag,slot))
     {
         ItemRemovedQuestCheck(it->GetEntry(), it->GetCount());
         RemoveItem(bag, slot, update);
 
+        it->SetNotRefundable(this, false);
+
         // item atStore spell not removed in RemoveItem (for avoid reappaly in slots changes), so do it directly
         if (IsEquipmentPos(bag, slot) || IsInventoryPos(bag, slot))
             ApplyItemOnStoreSpell(it, false);
 
         it->RemoveFromUpdateQueueOf(this);
-        if(it->IsInWorld())
+        if (it->IsInWorld())
         {
-            it->RemoveFromWorld();
-            it->DestroyForPlayer( this );
+            it->RemoveFromWorld(false);
+            it->DestroyForPlayer(this);
         }
     }
 }
@@ -11531,24 +11719,27 @@ void Player::MoveItemToInventory(ItemPosCountVec const& dest, Item* pItem, bool
     Item* pLastItem = StoreItem(dest, pItem, update);
 
     // only set if not merged to existing stack (pItem can be deleted already but we can compare pointers any way)
-    if(pLastItem == pItem)
+    if (pLastItem == pItem)
     {
         // update owner for last item (this can be original item with wrong owner
-        if(pLastItem->GetOwnerGuid() != GetObjectGuid())
+        if (pLastItem->GetOwnerGuid() != GetObjectGuid())
             pLastItem->SetOwnerGuid(GetObjectGuid());
 
         // if this original item then it need create record in inventory
         // in case trade we already have item in other player inventory
         pLastItem->SetState(in_characterInventoryDB ? ITEM_CHANGED : ITEM_NEW, this);
     }
+
+    if (pLastItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE))
+        AddItemWithTimeCheck(pLastItem->GetGUIDLow());
 }
 
-void Player::DestroyItem( uint8 bag, uint8 slot, bool update )
+void Player::DestroyItem(uint8 bag, uint8 slot, bool update)
 {
-    Item *pItem = GetItemByPos( bag, slot );
-    if( pItem )
+    Item* pItem = GetItemByPos(bag, slot);
+    if (pItem)
     {
-        DEBUG_LOG( "STORAGE: DestroyItem bag = %u, slot = %u, item = %u", bag, slot, pItem->GetEntry());
+        DEBUG_LOG("STORAGE: DestroyItem bag = %u, slot = %u, item = %u", bag, slot, pItem->GetEntry());
 
         // start from destroy contained items (only equipped bag can have its)
         if (pItem->IsBag() && pItem->IsEquipped())          // this also prevent infinity loop if empty bag stored in bag==slot
@@ -11558,49 +11749,47 @@ void Player::DestroyItem( uint8 bag, uint8 slot, bool update )
         }
 
         if (pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_WRAPPED))
-        {
-            static SqlStatementID delGifts ;
-
-            SqlStatement stmt = CharacterDatabase.CreateStatement(delGifts, "DELETE FROM character_gifts WHERE item_guid = ?");
-            stmt.PExecute(pItem->GetGUIDLow());
-        }
+            pItem->DeleteGiftsFromDB();
 
         RemoveEnchantmentDurations(pItem);
         RemoveItemDurations(pItem);
 
+        pItem->SetNotSoulboundTradeable(this);
+        pItem->SetNotRefundable(this);
+
         if (IsEquipmentPos(bag, slot) || IsInventoryPos(bag, slot))
             ApplyItemOnStoreSpell(pItem, false);
 
-        ItemRemovedQuestCheck( pItem->GetEntry(), pItem->GetCount() );
+        ItemRemovedQuestCheck(pItem->GetEntry(), pItem->GetCount());
 
-        if( bag == INVENTORY_SLOT_BAG_0 )
+        if (bag == INVENTORY_SLOT_BAG_0)
         {
             SetGuidValue(PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), ObjectGuid());
 
             // equipment and equipped bags can have applied bonuses
-            if ( slot < INVENTORY_SLOT_BAG_END )
+            if (slot < INVENTORY_SLOT_BAG_END)
             {
-                ItemPrototype const *pProto = pItem->GetProto();
+                ItemPrototype const* pProto = pItem->GetProto();
 
                 // item set bonuses applied only at equip and removed at unequip, and still active for broken items
-                if(pProto && pProto->ItemSet)
+                if (pProto && pProto->ItemSet)
                     RemoveItemsSetItem(this, pProto);
 
                 _ApplyItemMods(pItem, slot, false);
             }
 
-            if ( slot < EQUIPMENT_SLOT_END )
+            if (slot < EQUIPMENT_SLOT_END)
             {
                 // remove item dependent auras and casts (only weapon and armor slots)
                 RemoveItemDependentAurasAndCasts(pItem);
 
                 // update expertise
-                if( slot == EQUIPMENT_SLOT_MAINHAND )
+                if (slot == EQUIPMENT_SLOT_MAINHAND)
                 {
                     UpdateExpertise(BASE_ATTACK);
                     UpdateArmorPenetration();
                 }
-                else if( slot == EQUIPMENT_SLOT_OFFHAND )
+                else if (slot == EQUIPMENT_SLOT_OFFHAND)
                 {
                     UpdateExpertise(OFF_ATTACK);
                     UpdateArmorPenetration();
@@ -11615,18 +11804,18 @@ void Player::DestroyItem( uint8 bag, uint8 slot, bool update )
 
             m_items[slot] = NULL;
         }
-        else if(Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag ))
+        else if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, bag))
             pBag->RemoveItem(slot, update);
 
         if (IsInWorld() && update)
         {
-            pItem->RemoveFromWorld();
+            pItem->RemoveFromWorld(false);
             pItem->DestroyForPlayer(this);
         }
 
         //pItem->SetOwnerGUID(0);
         pItem->SetGuidValue(ITEM_FIELD_CONTAINED, ObjectGuid());
-        pItem->SetSlot( NULL_SLOT );
+        pItem->SetSlot(NULL_SLOT);
         pItem->SetState(ITEM_REMOVED, this);
     }
 }
@@ -11819,88 +12008,88 @@ void Player::DestroyItemCount(uint32 item, uint32 count, bool update, bool unequ
     }
 }
 
-void Player::DestroyZoneLimitedItem( bool update, uint32 new_zone )
+void Player::DestroyZoneLimitedItem(bool update, uint32 new_zone)
 {
-    DEBUG_LOG( "STORAGE: DestroyZoneLimitedItem in map %u and area %u", GetMapId(), new_zone );
+    DEBUG_LOG("STORAGE: DestroyZoneLimitedItem in map %u and area %u", GetMapId(), new_zone);
 
     // in inventory
-    for(int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
-        if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
+    for (int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone))
-                DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
+                DestroyItem(INVENTORY_SLOT_BAG_0, i, update);
 
-    for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
-        if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
+    for (int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone))
-                DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
+                DestroyItem(INVENTORY_SLOT_BAG_0, i, update);
 
     // in inventory bags
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
-        if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
-            for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
                 if (Item* pItem = pBag->GetItemByPos(j))
                     if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone))
                         DestroyItem(i, j, update);
 
     // in equipment and bag list
-    for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; ++i)
-        if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
+    for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone))
-                DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
+                DestroyItem(INVENTORY_SLOT_BAG_0, i, update);
 }
 
-void Player::DestroyConjuredItems( bool update )
+void Player::DestroyConjuredItems(bool update)
 {
     // used when entering arena
     // destroys all conjured items
-    DEBUG_LOG( "STORAGE: DestroyConjuredItems" );
+    DEBUG_LOG("STORAGE: DestroyConjuredItems");
 
     // in inventory
-    for(int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
-        if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
+    for (int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->IsConjuredConsumable())
-                DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
+                DestroyItem(INVENTORY_SLOT_BAG_0, i, update);
 
     // in inventory bags
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
-        if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
-            for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
                 if (Item* pItem = pBag->GetItemByPos(j))
                     if (pItem->IsConjuredConsumable())
-                        DestroyItem( i, j, update);
+                        DestroyItem(i, j, update);
 
     // in equipment and bag list
-    for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; ++i)
-        if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
+    for (int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->IsConjuredConsumable())
-                DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
+                DestroyItem(INVENTORY_SLOT_BAG_0, i, update);
 }
 
-void Player::DestroyItemCount( Item* pItem, uint32 &count, bool update )
+void Player::DestroyItemCount(Item* pItem, uint32& count, bool update)
 {
-    if(!pItem)
+    if (!pItem)
         return;
 
-    DEBUG_LOG( "STORAGE: DestroyItemCount item (GUID: %u, Entry: %u) count = %u", pItem->GetGUIDLow(),pItem->GetEntry(), count);
+    DEBUG_LOG("STORAGE: DestroyItemCount item (GUID: %u, Entry: %u) count = %u", pItem->GetGUIDLow(), pItem->GetEntry(), count);
 
-    if( pItem->GetCount() <= count )
+    if (pItem->GetCount() <= count)
     {
         count -= pItem->GetCount();
 
-        DestroyItem( pItem->GetBagSlot(),pItem->GetSlot(), update);
+        DestroyItem(pItem->GetBagSlot(), pItem->GetSlot(), update);
     }
     else
     {
-        ItemRemovedQuestCheck( pItem->GetEntry(), count);
-        pItem->SetCount( pItem->GetCount() - count );
+        ItemRemovedQuestCheck(pItem->GetEntry(), count);
+        pItem->SetCount(pItem->GetCount() - count);
         count = 0;
         if (IsInWorld() && update)
-            pItem->SendCreateUpdateToPlayer( this );
+            pItem->SendCreateUpdateToPlayer(this);
         pItem->SetState(ITEM_CHANGED, this);
     }
 }
 
-void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
+void Player::SplitItem(uint16 src, uint16 dst, uint32 count)
 {
     uint8 srcbag = src >> 8;
     uint8 srcslot = src & 255;
@@ -11908,106 +12097,106 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
     uint8 dstbag = dst >> 8;
     uint8 dstslot = dst & 255;
 
-    Item *pSrcItem = GetItemByPos( srcbag, srcslot );
+    Item* pSrcItem = GetItemByPos(srcbag, srcslot);
     if (!pSrcItem)
     {
-        SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, pSrcItem, NULL );
+        SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, pSrcItem, NULL);
         return;
     }
 
     if (pSrcItem->HasGeneratedLoot())                       // prevent split looting item (stackable items can has only temporary loot and this meaning that loot window open)
     {
-        //best error message found for attempting to split while looting
-        SendEquipError( EQUIP_ERR_COULDNT_SPLIT_ITEMS, pSrcItem, NULL );
+        // best error message found for attempting to split while looting
+        SendEquipError(EQUIP_ERR_COULDNT_SPLIT_ITEMS, pSrcItem, NULL);
         return;
     }
 
     // not let split all items (can be only at cheating)
     if (pSrcItem->GetCount() == count)
     {
-        SendEquipError( EQUIP_ERR_COULDNT_SPLIT_ITEMS, pSrcItem, NULL );
+        SendEquipError(EQUIP_ERR_COULDNT_SPLIT_ITEMS, pSrcItem, NULL);
         return;
     }
 
     // not let split more existing items (can be only at cheating)
     if (pSrcItem->GetCount() < count)
     {
-        SendEquipError( EQUIP_ERR_TRIED_TO_SPLIT_MORE_THAN_COUNT, pSrcItem, NULL );
+        SendEquipError(EQUIP_ERR_TRIED_TO_SPLIT_MORE_THAN_COUNT, pSrcItem, NULL);
         return;
     }
 
-    DEBUG_LOG( "STORAGE: SplitItem bag = %u, slot = %u, item = %u, count = %u", dstbag, dstslot, pSrcItem->GetEntry(), count);
-    Item *pNewItem = pSrcItem->CloneItem( count, this );
+    DEBUG_LOG("STORAGE: SplitItem bag = %u, slot = %u, item = %u, count = %u", dstbag, dstslot, pSrcItem->GetEntry(), count);
+    Item* pNewItem = pSrcItem->CloneItem(count, this);
     if (!pNewItem)
     {
-        SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, pSrcItem, NULL );
+        SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, pSrcItem, NULL);
         return;
     }
 
     if (IsInventoryPos(dst))
     {
         // change item amount before check (for unique max count check)
-        pSrcItem->SetCount( pSrcItem->GetCount() - count );
+        pSrcItem->SetCount(pSrcItem->GetCount() - count);
 
         ItemPosCountVec dest;
-        InventoryResult msg = CanStoreItem( dstbag, dstslot, dest, pNewItem, false );
+        InventoryResult msg = CanStoreItem(dstbag, dstslot, dest, pNewItem, false);
         if (msg != EQUIP_ERR_OK)
         {
             delete pNewItem;
-            pSrcItem->SetCount( pSrcItem->GetCount() + count );
-            SendEquipError( msg, pSrcItem, NULL );
+            pSrcItem->SetCount(pSrcItem->GetCount() + count);
+            SendEquipError(msg, pSrcItem, NULL);
             return;
         }
 
         if (IsInWorld())
-            pSrcItem->SendCreateUpdateToPlayer( this );
+            pSrcItem->SendCreateUpdateToPlayer(this);
         pSrcItem->SetState(ITEM_CHANGED, this);
-        StoreItem( dest, pNewItem, true);
+        StoreItem(dest, pNewItem, true);
     }
-    else if (IsBankPos (dst))
+    else if (IsBankPos(dst))
     {
         // change item amount before check (for unique max count check)
-        pSrcItem->SetCount( pSrcItem->GetCount() - count );
+        pSrcItem->SetCount(pSrcItem->GetCount() - count);
 
         ItemPosCountVec dest;
-        InventoryResult msg = CanBankItem( dstbag, dstslot, dest, pNewItem, false );
-        if( msg != EQUIP_ERR_OK )
+        InventoryResult msg = CanBankItem(dstbag, dstslot, dest, pNewItem, false);
+        if (msg != EQUIP_ERR_OK)
         {
             delete pNewItem;
-            pSrcItem->SetCount( pSrcItem->GetCount() + count );
-            SendEquipError( msg, pSrcItem, NULL );
+            pSrcItem->SetCount(pSrcItem->GetCount() + count);
+            SendEquipError(msg, pSrcItem, NULL);
             return;
         }
 
         if (IsInWorld())
-            pSrcItem->SendCreateUpdateToPlayer( this );
+            pSrcItem->SendCreateUpdateToPlayer(this);
         pSrcItem->SetState(ITEM_CHANGED, this);
-        BankItem( dest, pNewItem, true);
+        BankItem(dest, pNewItem, true);
     }
-    else if (IsEquipmentPos (dst))
+    else if (IsEquipmentPos(dst))
     {
         // change item amount before check (for unique max count check), provide space for splitted items
-        pSrcItem->SetCount( pSrcItem->GetCount() - count );
+        pSrcItem->SetCount(pSrcItem->GetCount() - count);
 
         uint16 dest;
-        InventoryResult msg = CanEquipItem( dstslot, dest, pNewItem, false );
+        InventoryResult msg = CanEquipItem(dstslot, dest, pNewItem, false);
         if (msg != EQUIP_ERR_OK)
         {
             delete pNewItem;
-            pSrcItem->SetCount( pSrcItem->GetCount() + count );
-            SendEquipError( msg, pSrcItem, NULL );
+            pSrcItem->SetCount(pSrcItem->GetCount() + count);
+            SendEquipError(msg, pSrcItem, NULL);
             return;
         }
 
         if (IsInWorld())
-            pSrcItem->SendCreateUpdateToPlayer( this );
+            pSrcItem->SendCreateUpdateToPlayer(this);
         pSrcItem->SetState(ITEM_CHANGED, this);
-        EquipItem( dest, pNewItem, true);
+        EquipItem(dest, pNewItem, true);
         AutoUnequipOffhandIfNeed();
     }
 }
 
-void Player::SwapItem( uint16 src, uint16 dst )
+void Player::SwapItem(uint16 src, uint16 dst)
 {
     uint8 srcbag = src >> 8;
     uint8 srcslot = src & 255;
@@ -12015,17 +12204,17 @@ void Player::SwapItem( uint16 src, uint16 dst )
     uint8 dstbag = dst >> 8;
     uint8 dstslot = dst & 255;
 
-    Item *pSrcItem = GetItemByPos( srcbag, srcslot );
-    Item *pDstItem = GetItemByPos( dstbag, dstslot );
+    Item* pSrcItem = GetItemByPos(srcbag, srcslot);
+    Item* pDstItem = GetItemByPos(dstbag, dstslot);
 
     if (!pSrcItem)
         return;
 
-    DEBUG_LOG( "STORAGE: SwapItem bag = %u, slot = %u, item = %u", dstbag, dstslot, pSrcItem->GetEntry());
+    DEBUG_LOG("STORAGE: SwapItem bag = %u, slot = %u, item = %u", dstbag, dstslot, pSrcItem->GetEntry());
 
     if (!isAlive())
     {
-        SendEquipError( EQUIP_ERR_YOU_ARE_DEAD, pSrcItem, pDstItem );
+        SendEquipError(EQUIP_ERR_YOU_ARE_DEAD, pSrcItem, pDstItem);
         return;
     }
 
@@ -12035,10 +12224,10 @@ void Player::SwapItem( uint16 src, uint16 dst )
     if (IsEquipmentPos(src) || IsBagPos(src))
     {
         // bags can be swapped with empty bag slots, or with empty bag (items move possibility checked later)
-        InventoryResult msg = CanUnequipItem( src, !IsBagPos ( src ) || IsBagPos ( dst ) || (pDstItem && pDstItem->IsBag() && ((Bag*)pDstItem)->IsEmpty()));
+        InventoryResult msg = CanUnequipItem(src, !IsBagPos(src) || IsBagPos(dst) || (pDstItem && pDstItem->IsBag() && ((Bag*)pDstItem)->IsEmpty()));
         if (msg != EQUIP_ERR_OK)
         {
-            SendEquipError( msg, pSrcItem, pDstItem );
+            SendEquipError(msg, pSrcItem, pDstItem);
             return;
         }
     }
@@ -12046,14 +12235,14 @@ void Player::SwapItem( uint16 src, uint16 dst )
     // prevent put equipped/bank bag in self
     if (IsBagPos(src) && srcslot == dstbag)
     {
-        SendEquipError( EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG, pSrcItem, pDstItem );
+        SendEquipError(EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG, pSrcItem, pDstItem);
         return;
     }
 
     // prevent put equipped/bank bag in self
     if (IsBagPos(dst) && dstslot == srcbag)
     {
-        SendEquipError( EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG, pDstItem, pSrcItem );
+        SendEquipError(EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG, pDstItem, pSrcItem);
         return;
     }
 
@@ -12062,13 +12251,13 @@ void Player::SwapItem( uint16 src, uint16 dst )
     if (pDstItem)
     {
         // check unequip potability for equipped items and bank bags
-        if(IsEquipmentPos ( dst ) || IsBagPos ( dst ))
+        if (IsEquipmentPos(dst) || IsBagPos(dst))
         {
             // bags can be swapped with empty bag slots, or with empty bag (items move possibility checked later)
-            InventoryResult msg = CanUnequipItem( dst, !IsBagPos ( dst ) || IsBagPos ( src ) || (pSrcItem->IsBag() && ((Bag*)pSrcItem)->IsEmpty()));
-            if(msg != EQUIP_ERR_OK)
+            InventoryResult msg = CanUnequipItem(dst, !IsBagPos(dst) || IsBagPos(src) || (pSrcItem->IsBag() && ((Bag*)pSrcItem)->IsEmpty()));
+            if (msg != EQUIP_ERR_OK)
             {
-                SendEquipError( msg, pSrcItem, pDstItem );
+                SendEquipError(msg, pSrcItem, pDstItem);
                 return;
             }
         }
@@ -12078,41 +12267,41 @@ void Player::SwapItem( uint16 src, uint16 dst )
     // or swap empty bag with another empty or not empty bag (with items exchange)
 
     // Move case
-    if( !pDstItem )
+    if (!pDstItem)
     {
-        if( IsInventoryPos( dst ) )
+        if (IsInventoryPos(dst))
         {
             ItemPosCountVec dest;
-            InventoryResult msg = CanStoreItem( dstbag, dstslot, dest, pSrcItem, false );
-            if( msg != EQUIP_ERR_OK )
+            InventoryResult msg = CanStoreItem(dstbag, dstslot, dest, pSrcItem, false);
+            if (msg != EQUIP_ERR_OK)
             {
-                SendEquipError( msg, pSrcItem, NULL );
+                SendEquipError(msg, pSrcItem, NULL);
                 return;
             }
 
             RemoveItem(srcbag, srcslot, true);
-            StoreItem( dest, pSrcItem, true);
+            StoreItem(dest, pSrcItem, true);
         }
-        else if( IsBankPos ( dst ) )
+        else if (IsBankPos(dst))
         {
             ItemPosCountVec dest;
-            InventoryResult msg = CanBankItem( dstbag, dstslot, dest, pSrcItem, false);
-            if( msg != EQUIP_ERR_OK )
+            InventoryResult msg = CanBankItem(dstbag, dstslot, dest, pSrcItem, false);
+            if (msg != EQUIP_ERR_OK)
             {
-                SendEquipError( msg, pSrcItem, NULL );
+                SendEquipError(msg, pSrcItem, NULL);
                 return;
             }
 
             RemoveItem(srcbag, srcslot, true);
-            BankItem( dest, pSrcItem, true);
+            BankItem(dest, pSrcItem, true);
         }
-        else if( IsEquipmentPos ( dst ) )
+        else if (IsEquipmentPos(dst))
         {
             uint16 dest;
-            InventoryResult msg = CanEquipItem( dstslot, dest, pSrcItem, false );
-            if( msg != EQUIP_ERR_OK )
+            InventoryResult msg = CanEquipItem(dstslot, dest, pSrcItem, false);
+            if (msg != EQUIP_ERR_OK)
             {
-                SendEquipError( msg, pSrcItem, NULL );
+                SendEquipError(msg, pSrcItem, NULL);
                 return;
             }
 
@@ -12125,122 +12314,130 @@ void Player::SwapItem( uint16 src, uint16 dst )
     }
 
     // attempt merge to / fill target item
-    if(!pSrcItem->IsBag() && !pDstItem->IsBag())
+    if (!pSrcItem->IsBag() && !pDstItem->IsBag())
     {
         InventoryResult msg;
         ItemPosCountVec sDest;
         uint16 eDest;
-        if( IsInventoryPos( dst ) )
-            msg = CanStoreItem( dstbag, dstslot, sDest, pSrcItem, false );
-        else if( IsBankPos ( dst ) )
-            msg = CanBankItem( dstbag, dstslot, sDest, pSrcItem, false );
-        else if( IsEquipmentPos ( dst ) )
-            msg = CanEquipItem( dstslot, eDest, pSrcItem, false );
+        if (IsInventoryPos(dst))
+            msg = CanStoreItem(dstbag, dstslot, sDest, pSrcItem, false);
+        else if (IsBankPos(dst))
+            msg = CanBankItem(dstbag, dstslot, sDest, pSrcItem, false);
+        else if (IsEquipmentPos(dst))
+            msg = CanEquipItem(dstslot, eDest, pSrcItem, false);
         else
             return;
 
+        if (pSrcItem->GetCount() > pSrcItem->GetProto()->GetMaxStackSize() || pDstItem->GetCount() > pDstItem->GetProto()->GetMaxStackSize())
+        {
+            SendEquipError(EQUIP_ERR_TRIED_TO_SPLIT_MORE_THAN_COUNT, pSrcItem, NULL);
+            return;
+        }
+
         // can be merge/fill
-        if(msg == EQUIP_ERR_OK)
+        if (msg == EQUIP_ERR_OK)
         {
-            if( pSrcItem->GetCount() + pDstItem->GetCount() <= pSrcItem->GetProto()->GetMaxStackSize())
+            if (pSrcItem->GetCount() + pDstItem->GetCount() <= pSrcItem->GetProto()->GetMaxStackSize() && pSrcItem->GetCount() + pDstItem->GetCount() <= pDstItem->GetProto()->GetMaxStackSize())
             {
                 RemoveItem(srcbag, srcslot, true);
 
-                if( IsInventoryPos( dst ) )
-                    StoreItem( sDest, pSrcItem, true);
-                else if( IsBankPos ( dst ) )
-                    BankItem( sDest, pSrcItem, true);
-                else if( IsEquipmentPos ( dst ) )
+                if (IsInventoryPos(dst))
+                    StoreItem(sDest, pSrcItem, true);
+                else if (IsBankPos(dst))
+                    BankItem(sDest, pSrcItem, true);
+                else if (IsEquipmentPos(dst))
                 {
-                    EquipItem( eDest, pSrcItem, true);
+                    EquipItem(eDest, pSrcItem, true);
                     AutoUnequipOffhandIfNeed();
                 }
             }
             else
             {
-                pSrcItem->SetCount( pSrcItem->GetCount() + pDstItem->GetCount() - pSrcItem->GetProto()->GetMaxStackSize());
-                pDstItem->SetCount( pSrcItem->GetProto()->GetMaxStackSize());
+                pSrcItem->SetCount(pSrcItem->GetCount() + pDstItem->GetCount() - pSrcItem->GetProto()->GetMaxStackSize());
+                pDstItem->SetCount(pSrcItem->GetProto()->GetMaxStackSize());
                 pSrcItem->SetState(ITEM_CHANGED, this);
                 pDstItem->SetState(ITEM_CHANGED, this);
-                if( IsInWorld() )
+                if (IsInWorld())
                 {
-                    pSrcItem->SendCreateUpdateToPlayer( this );
-                    pDstItem->SendCreateUpdateToPlayer( this );
+                    pSrcItem->SendCreateUpdateToPlayer(this);
+                    pDstItem->SendCreateUpdateToPlayer(this);
                 }
             }
+
+            SendRefundInfo(pDstItem);
             return;
         }
     }
 
     // impossible merge/fill, do real swap
-    InventoryResult msg;
+    InventoryResult msg = EQUIP_ERR_OK2;
 
     // check src->dest move possibility
     ItemPosCountVec sDest;
     uint16 eDest = 0;
-    if( IsInventoryPos( dst ) )
-        msg = CanStoreItem( dstbag, dstslot, sDest, pSrcItem, true );
-    else if( IsBankPos( dst ) )
-        msg = CanBankItem( dstbag, dstslot, sDest, pSrcItem, true );
-    else if( IsEquipmentPos( dst ) )
+    if (IsInventoryPos(dst))
+        msg = CanStoreItem(dstbag, dstslot, sDest, pSrcItem, true);
+    else if (IsBankPos(dst))
+        msg = CanBankItem(dstbag, dstslot, sDest, pSrcItem, true);
+    else if (IsEquipmentPos(dst))
     {
-        msg = CanEquipItem( dstslot, eDest, pSrcItem, true );
-        if( msg == EQUIP_ERR_OK )
-            msg = CanUnequipItem( eDest, true );
+        msg = CanEquipItem(dstslot, eDest, pSrcItem, true);
+        if (msg == EQUIP_ERR_OK)
+            msg = CanUnequipItem(eDest, true);
     }
 
-    if( msg != EQUIP_ERR_OK )
+    if (msg != EQUIP_ERR_OK)
     {
-        SendEquipError( msg, pSrcItem, pDstItem );
+        SendEquipError(msg, pSrcItem, pDstItem);
         return;
     }
 
     // check dest->src move possibility
     ItemPosCountVec sDest2;
     uint16 eDest2 = 0;
-    if( IsInventoryPos( src ) )
-        msg = CanStoreItem( srcbag, srcslot, sDest2, pDstItem, true );
-    else if( IsBankPos( src ) )
-        msg = CanBankItem( srcbag, srcslot, sDest2, pDstItem, true );
-    else if( IsEquipmentPos( src ) )
+    if (IsInventoryPos(src))
+        msg = CanStoreItem(srcbag, srcslot, sDest2, pDstItem, true);
+    else if (IsBankPos(src))
+        msg = CanBankItem(srcbag, srcslot, sDest2, pDstItem, true);
+    else if (IsEquipmentPos(src))
     {
-        msg = CanEquipItem( srcslot, eDest2, pDstItem, true);
-        if( msg == EQUIP_ERR_OK )
-            msg = CanUnequipItem( eDest2, true);
+        msg = CanEquipItem(srcslot, eDest2, pDstItem, true);
+        if (msg == EQUIP_ERR_OK)
+            msg = CanUnequipItem(eDest2, true);
     }
 
-    if( msg != EQUIP_ERR_OK )
+    if (msg != EQUIP_ERR_OK)
     {
-        SendEquipError( msg, pDstItem, pSrcItem );
+        SendEquipError(msg, pDstItem, pSrcItem);
         return;
     }
 
     // Check bag swap with item exchange (one from empty in not bag possition (equipped (not possible in fact) or store)
-    if(pSrcItem->IsBag() && pDstItem->IsBag())
+    if (pSrcItem->IsBag() && pDstItem->IsBag())
     {
         Bag* emptyBag = NULL;
         Bag* fullBag = NULL;
-        if(((Bag*)pSrcItem)->IsEmpty() && !IsBagPos(src))
+        if (((Bag*)pSrcItem)->IsEmpty() && !IsBagPos(src))
         {
             emptyBag = (Bag*)pSrcItem;
             fullBag  = (Bag*)pDstItem;
         }
-        else if(((Bag*)pDstItem)->IsEmpty() && !IsBagPos(dst))
+        else if (((Bag*)pDstItem)->IsEmpty() && !IsBagPos(dst))
         {
             emptyBag = (Bag*)pDstItem;
             fullBag  = (Bag*)pSrcItem;
         }
 
         // bag swap (with items exchange) case
-        if(emptyBag && fullBag)
+        if (emptyBag && fullBag)
         {
             ItemPrototype const* emotyProto = emptyBag->GetProto();
 
             uint32 count = 0;
 
-            for(uint32 i=0; i < fullBag->GetBagSize(); ++i)
+            for (uint32 i = 0; i < fullBag->GetBagSize(); ++i)
             {
-                Item *bagItem = fullBag->GetItemByPos(i);
+                Item* bagItem = fullBag->GetItemByPos(i);
                 if (!bagItem)
                     continue;
 
@@ -12248,7 +12445,7 @@ void Player::SwapItem( uint16 src, uint16 dst )
                 if (!bagItemProto || !ItemCanGoIntoBag(bagItemProto, emotyProto))
                 {
                     // one from items not go to empty target bag
-                    SendEquipError( EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG, pSrcItem, pDstItem );
+                    SendEquipError(EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG, pSrcItem, pDstItem);
                     return;
                 }
 
@@ -12258,15 +12455,15 @@ void Player::SwapItem( uint16 src, uint16 dst )
             if (count > emptyBag->GetBagSize())
             {
                 // too small targeted bag
-                SendEquipError( EQUIP_ERR_ITEMS_CANT_BE_SWAPPED, pSrcItem, pDstItem );
+                SendEquipError(EQUIP_ERR_ITEMS_CANT_BE_SWAPPED, pSrcItem, pDstItem);
                 return;
             }
 
             // Items swap
             count = 0;                                      // will pos in new bag
-            for(uint32 i = 0; i< fullBag->GetBagSize(); ++i)
+            for (uint32 i = 0; i < fullBag->GetBagSize(); ++i)
             {
-                Item *bagItem = fullBag->GetItemByPos(i);
+                Item* bagItem = fullBag->GetItemByPos(i);
                 if (!bagItem)
                     continue;
 
@@ -12302,7 +12499,7 @@ void Player::SwapItem( uint16 src, uint16 dst )
     AutoUnequipOffhandIfNeed();
 }
 
-void Player::AddItemToBuyBackSlot( Item *pItem )
+void Player::AddItemToBuyBackSlot(Item* pItem)
 {
     if (pItem)
     {
@@ -12310,10 +12507,10 @@ void Player::AddItemToBuyBackSlot( Item *pItem )
         // if current back slot non-empty search oldest or free
         if (m_items[slot])
         {
-            uint32 oldest_time = GetUInt32Value( PLAYER_FIELD_BUYBACK_TIMESTAMP_1 );
+            uint32 oldest_time = GetUInt32Value(PLAYER_FIELD_BUYBACK_TIMESTAMP_1);
             uint32 oldest_slot = BUYBACK_SLOT_START;
 
-            for(uint32 i = BUYBACK_SLOT_START+1; i < BUYBACK_SLOT_END; ++i )
+            for (uint32 i = BUYBACK_SLOT_START + 1; i < BUYBACK_SLOT_END; ++i)
             {
                 // found empty
                 if (!m_items[i])
@@ -12322,7 +12519,7 @@ void Player::AddItemToBuyBackSlot( Item *pItem )
                     break;
                 }
 
-                uint32 i_time = GetUInt32Value( PLAYER_FIELD_BUYBACK_TIMESTAMP_1 + i - BUYBACK_SLOT_START);
+                uint32 i_time = GetUInt32Value(PLAYER_FIELD_BUYBACK_TIMESTAMP_1 + i - BUYBACK_SLOT_START);
 
                 if (oldest_time > i_time)
                 {
@@ -12335,8 +12532,8 @@ void Player::AddItemToBuyBackSlot( Item *pItem )
             slot = oldest_slot;
         }
 
-        RemoveItemFromBuyBackSlot( slot, true );
-        DEBUG_LOG( "STORAGE: AddItemToBuyBackSlot item = %u, slot = %u", pItem->GetEntry(), slot);
+        RemoveItemFromBuyBackSlot(slot, true);
+        DEBUG_LOG("STORAGE: AddItemToBuyBackSlot item = %u, slot = %u", pItem->GetEntry(), slot);
 
         m_items[slot] = pItem;
         time_t base = time(NULL);
@@ -12344,11 +12541,11 @@ void Player::AddItemToBuyBackSlot( Item *pItem )
         uint32 eslot = slot - BUYBACK_SLOT_START;
 
         SetGuidValue(PLAYER_FIELD_VENDORBUYBACK_SLOT_1 + (eslot * 2), pItem->GetObjectGuid());
-        if (ItemPrototype const *pProto = pItem->GetProto())
-            SetUInt32Value( PLAYER_FIELD_BUYBACK_PRICE_1 + eslot, pProto->SellPrice * pItem->GetCount() );
+        if (ItemPrototype const* pProto = pItem->GetProto())
+            SetUInt32Value(PLAYER_FIELD_BUYBACK_PRICE_1 + eslot, pProto->SellPrice * pItem->GetCount());
         else
-            SetUInt32Value( PLAYER_FIELD_BUYBACK_PRICE_1 + eslot, 0 );
-        SetUInt32Value( PLAYER_FIELD_BUYBACK_TIMESTAMP_1 + eslot, (uint32)etime );
+            SetUInt32Value(PLAYER_FIELD_BUYBACK_PRICE_1 + eslot, 0);
+        SetUInt32Value(PLAYER_FIELD_BUYBACK_TIMESTAMP_1 + eslot, (uint32)etime);
 
         // move to next (for non filled list is move most optimized choice)
         if (m_currentBuybackSlot < BUYBACK_SLOT_END - 1)
@@ -12356,24 +12553,25 @@ void Player::AddItemToBuyBackSlot( Item *pItem )
     }
 }
 
-Item* Player::GetItemFromBuyBackSlot( uint32 slot )
+Item* Player::GetItemFromBuyBackSlot(uint32 slot)
 {
-    DEBUG_LOG( "STORAGE: GetItemFromBuyBackSlot slot = %u", slot);
+    DEBUG_LOG("STORAGE: GetItemFromBuyBackSlot slot = %u", slot);
     if (slot >= BUYBACK_SLOT_START && slot < BUYBACK_SLOT_END)
         return m_items[slot];
     return NULL;
 }
 
-void Player::RemoveItemFromBuyBackSlot( uint32 slot, bool del )
+void Player::RemoveItemFromBuyBackSlot(uint32 slot, bool del)
 {
-    DEBUG_LOG( "STORAGE: RemoveItemFromBuyBackSlot slot = %u", slot);
+    DEBUG_LOG("STORAGE: RemoveItemFromBuyBackSlot slot = %u", slot);
     if (slot >= BUYBACK_SLOT_START && slot < BUYBACK_SLOT_END)
     {
-        Item *pItem = m_items[slot];
+        Item* pItem = m_items[slot];
         if (pItem)
         {
-            pItem->RemoveFromWorld();
-            if(del) pItem->SetState(ITEM_REMOVED, this);
+            pItem->RemoveFromWorld(false);
+            if (del)
+                pItem->SetState(ITEM_REMOVED, this);
         }
 
         m_items[slot] = NULL;
@@ -12389,10 +12587,10 @@ void Player::RemoveItemFromBuyBackSlot( uint32 slot, bool del )
     }
 }
 
-void Player::SendEquipError( InventoryResult msg, Item* pItem, Item *pItem2, uint32 itemid /*= 0*/ ) const
+void Player::SendEquipError(InventoryResult msg, Item* pItem, Item* pItem2, uint32 itemid /*= 0*/) const
 {
-    DEBUG_LOG( "WORLD: Sent SMSG_INVENTORY_CHANGE_FAILURE (%u)", msg);
-    WorldPacket data(SMSG_INVENTORY_CHANGE_FAILURE, 1+8+8+1);
+    DEBUG_LOG("WORLD: Sent SMSG_INVENTORY_CHANGE_FAILURE (%u)", msg);
+    WorldPacket data(SMSG_INVENTORY_CHANGE_FAILURE, 1 + 8 + 8 + 1);
     data << uint8(msg);
 
     if (msg != EQUIP_ERR_OK)
@@ -12401,7 +12599,7 @@ void Player::SendEquipError( InventoryResult msg, Item* pItem, Item *pItem2, uin
         data << (pItem2 ? pItem2->GetObjectGuid() : ObjectGuid());
         data << uint8(0);                                   // bag type subclass, used with EQUIP_ERR_EVENT_AUTOEQUIP_BIND_CONFIRM and EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG2
 
-        switch(msg)
+        switch (msg)
         {
             case EQUIP_ERR_CANT_EQUIP_LEVEL_I:
             case EQUIP_ERR_PURCHASE_LEVEL_TOO_LOW:
@@ -12422,7 +12620,34 @@ void Player::SendEquipError( InventoryResult msg, Item* pItem, Item *pItem2, uin
             case EQUIP_ERR_ITEM_MAX_LIMIT_CATEGORY_EQUIPPED_EXCEEDED_IS:
             {
                 ItemPrototype const* proto = pItem ? pItem->GetProto() : ObjectMgr::GetItemPrototype(itemid);
-                data << uint32(proto ? proto->ItemLimitCategory : 0);
+                uint32 LimitCategory = proto ? proto->ItemLimitCategory : 0;
+                if (pItem)
+                    // check unique-equipped on gems
+                    for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
+                    {
+                        uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(enchant_slot));
+                        if (!enchant_id)
+                            continue;
+                        SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+                        if (!enchantEntry)
+                            continue;
+
+                        ItemPrototype const* pGem = ObjectMgr::GetItemPrototype(enchantEntry->GemID);
+                        if (!pGem)
+                            continue;
+
+                        // include for check equip another gems with same limit category for not equipped item (and then not counted)
+                        uint32 gem_limit_count = !pItem->IsEquipped() && pGem->ItemLimitCategory
+                            ? pItem->GetGemCountWithLimitCategory(pGem->ItemLimitCategory) : 1;
+
+                        if (msg == CanEquipUniqueItem(pGem, pItem->GetSlot(),gem_limit_count))
+                        {
+                            LimitCategory=pGem->ItemLimitCategory;
+                            break;
+                        }
+                    }
+
+                data << uint32(LimitCategory);
                 break;
             }
             default:
@@ -12432,10 +12657,10 @@ void Player::SendEquipError( InventoryResult msg, Item* pItem, Item *pItem2, uin
     GetSession()->SendPacket(&data);
 }
 
-void Player::SendBuyError( BuyResult msg, Creature* pCreature, uint32 item, uint32 param )
+void Player::SendBuyError(BuyResult msg, Creature* pCreature, uint32 item, uint32 param)
 {
-    DEBUG_LOG( "WORLD: Sent SMSG_BUY_FAILED" );
-    WorldPacket data( SMSG_BUY_FAILED, (8+4+4+1) );
+    DEBUG_LOG("WORLD: Sent SMSG_BUY_FAILED");
+    WorldPacket data(SMSG_BUY_FAILED, 8 + 4 + 4 + 1);
     data << (pCreature ? pCreature->GetObjectGuid() : ObjectGuid());
     data << uint32(item);
     if (param > 0)
@@ -12444,10 +12669,10 @@ void Player::SendBuyError( BuyResult msg, Creature* pCreature, uint32 item, uint
     GetSession()->SendPacket(&data);
 }
 
-void Player::SendSellError( SellResult msg, Creature* pCreature, ObjectGuid itemGuid, uint32 param )
+void Player::SendSellError(SellResult msg, Creature* pCreature, ObjectGuid itemGuid, uint32 param)
 {
-    DEBUG_LOG( "WORLD: Sent SMSG_SELL_ITEM" );
-    WorldPacket data( SMSG_SELL_ITEM,(8+8+(param?4:0)+1));  // last check 2.0.10
+    DEBUG_LOG("WORLD: Sent SMSG_SELL_ITEM");
+    WorldPacket data(SMSG_SELL_ITEM, 8 + 8 + (param ? 4 : 0) + 1);   // last check 2.0.10
     data << (pCreature ? pCreature->GetObjectGuid() : ObjectGuid());
     data << ObjectGuid(itemGuid);
     if (param > 0)
@@ -12483,19 +12708,19 @@ void Player::UpdateItemDuration(uint32 time, bool realtimeonly)
 
     DEBUG_LOG("Player::UpdateItemDuration(%u,%u)", time, realtimeonly);
 
-    for(ItemDurationList::const_iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end(); )
+    for (ItemDurationList::const_iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end();)
     {
         Item* item = *itr;
         ++itr;                                              // current element can be erased in UpdateDuration
 
         if ((realtimeonly && (item->GetProto()->ExtraFlags & ITEM_EXTRA_REAL_TIME_DURATION)) || !realtimeonly)
-            item->UpdateDuration(this,time);
+            item->UpdateDuration(this, time);
     }
 }
 
 void Player::UpdateEnchantTime(uint32 time)
 {
-    for(EnchantDurationList::iterator itr = m_enchantDuration.begin(),next;itr != m_enchantDuration.end();itr=next)
+    for (EnchantDurationList::iterator itr = m_enchantDuration.begin(), next; itr != m_enchantDuration.end(); itr = next)
     {
         MANGOS_ASSERT(itr->item);
         next = itr;
@@ -12517,9 +12742,9 @@ void Player::UpdateEnchantTime(uint32 time)
     }
 }
 
-void Player::AddEnchantmentDurations(Item *item)
+void Player::AddEnchantmentDurations(Item* item)
 {
-    for(int x = 0; x < MAX_ENCHANTMENT_SLOT; ++x)
+    for (int x = 0; x < MAX_ENCHANTMENT_SLOT; ++x)
     {
         if (!item->GetEnchantmentId(EnchantmentSlot(x)))
             continue;
@@ -12530,9 +12755,9 @@ void Player::AddEnchantmentDurations(Item *item)
     }
 }
 
-void Player::RemoveEnchantmentDurations(Item *item)
+void Player::RemoveEnchantmentDurations(Item* item)
 {
-    for(EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end();)
+    for (EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end();)
     {
         if (itr->item == item)
         {
@@ -12548,7 +12773,7 @@ void Player::RemoveEnchantmentDurations(Item *item)
 void Player::RemoveAllEnchantments(EnchantmentSlot slot)
 {
     // remove enchantments from equipped items first to clean up the m_enchantDuration list
-    for(EnchantDurationList::iterator itr = m_enchantDuration.begin(), next; itr != m_enchantDuration.end(); itr = next)
+    for (EnchantDurationList::iterator itr = m_enchantDuration.begin(), next; itr != m_enchantDuration.end(); itr = next)
     {
         next = itr;
         if (itr->slot == slot)
@@ -12570,22 +12795,22 @@ void Player::RemoveAllEnchantments(EnchantmentSlot slot)
     // remove enchants from inventory items
     // NOTE: no need to remove these from stats, since these aren't equipped
     // in inventory
-    for(int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+    for (int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
         if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetEnchantmentId(slot))
                 pItem->ClearEnchantment(slot);
 
     // in inventory bags
-    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
-        if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
-            for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+    for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
                 if (Item* pItem = pBag->GetItemByPos(j))
                     if (pItem->GetEnchantmentId(slot))
                         pItem->ClearEnchantment(slot);
 }
 
 // duration == 0 will remove item enchant
-void Player::AddEnchantmentDuration(Item *item,EnchantmentSlot slot,uint32 duration)
+void Player::AddEnchantmentDuration(Item* item, EnchantmentSlot slot, uint32 duration)
 {
     if (!item)
         return;
@@ -12593,7 +12818,7 @@ void Player::AddEnchantmentDuration(Item *item,EnchantmentSlot slot,uint32 durat
     if (slot >= MAX_ENCHANTMENT_SLOT)
         return;
 
-    for(EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr)
+    for (EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr)
     {
         if (itr->item == item && itr->slot == slot)
         {
@@ -12602,20 +12827,20 @@ void Player::AddEnchantmentDuration(Item *item,EnchantmentSlot slot,uint32 durat
             break;
         }
     }
-    if (item && duration > 0 )
+    if (item && duration > 0)
     {
-        GetSession()->SendItemEnchantTimeUpdate(GetObjectGuid(), item->GetObjectGuid(), slot, uint32(duration/1000));
+        GetSession()->SendItemEnchantTimeUpdate(GetObjectGuid(), item->GetObjectGuid(), slot, uint32(duration / 1000));
         m_enchantDuration.push_back(EnchantDuration(item, slot, duration));
     }
 }
 
-void Player::ApplyEnchantment(Item *item,bool apply)
+void Player::ApplyEnchantment(Item* item, bool apply)
 {
-    for(uint32 slot = 0; slot < MAX_ENCHANTMENT_SLOT; ++slot)
+    for (uint32 slot = 0; slot < MAX_ENCHANTMENT_SLOT; ++slot)
         ApplyEnchantment(item, EnchantmentSlot(slot), apply);
 }
 
-void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool apply_dur, bool ignore_condition)
+void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool apply_dur, bool ignore_condition)
 {
     if (!item)
         return;
@@ -12623,6 +12848,11 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
     if (!item->IsEquipped())
         return;
 
+    // Don't apply ANY enchantment if item is broken! It's offlike and avoid many exploits with broken items.
+    // Not removing enchantments from broken items - not need.
+    if (item->IsBroken())
+        return;
+
     if (slot >= MAX_ENCHANTMENT_SLOT)
         return;
 
@@ -12630,12 +12860,21 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
     if (!enchant_id)
         return;
 
-    SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+    SpellItemEnchantmentEntry const* pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
     if (!pEnchant)
         return;
 
-    if (!ignore_condition && pEnchant->EnchantmentCondition && !((Player*)this)->EnchantmentFitsRequirements(pEnchant->EnchantmentCondition, -1))
+    if (!ignore_condition && pEnchant->EnchantmentCondition && !EnchantmentFitsRequirements(pEnchant->EnchantmentCondition, -1))
+        return;
+
+    if (pEnchant->requiredLevel > getLevel())
+        return;
+
+    if ((pEnchant->requiredSkill) > 0)
+    {
+       if (pEnchant->requiredSkillValue > GetSkillValue(pEnchant->requiredSkill))
         return;
+    }
 
     if (!item->IsBroken())
     {
@@ -12645,7 +12884,7 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
             uint32 enchant_amount = pEnchant->amount[s];
             uint32 enchant_spell_id = pEnchant->spellid[s];
 
-            switch(enchant_display_type)
+            switch (enchant_display_type)
             {
                 case ITEM_ENCHANTMENT_TYPE_NONE:
                     break;
@@ -12670,21 +12909,21 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
                             // Random Property Exist - try found basepoints for spell (basepoints depends from item suffix factor)
                             if (item->GetItemRandomPropertyId())
                             {
-                                ItemRandomSuffixEntry const *item_rand = sItemRandomSuffixStore.LookupEntry(abs(item->GetItemRandomPropertyId()));
+                                ItemRandomSuffixEntry const* item_rand = sItemRandomSuffixStore.LookupEntry(abs(item->GetItemRandomPropertyId()));
                                 if (item_rand)
                                 {
                                     // Search enchant_amount
                                     for (int k = 0; k < 3; ++k)
                                     {
-                                        if(item_rand->enchant_id[k] == enchant_id)
+                                        if (item_rand->enchant_id[k] == enchant_id)
                                         {
-                                            basepoints = int32((item_rand->prefix[k] * item->GetItemSuffixFactor()) / 10000 );
+                                            basepoints = int32((item_rand->prefix[k] * item->GetItemSuffixFactor()) / 10000);
                                             break;
                                         }
                                     }
                                 }
                             }
-                            // Cast custom spell vs all equal basepoints getted from enchant_amount
+                            // Cast custom spell vs all equal basepoints got from enchant_amount
                             if (basepoints)
                                 CastCustomSpell(this, enchant_spell_id, &basepoints, &basepoints, &basepoints, true, item);
                             else
@@ -12698,14 +12937,14 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
                 case ITEM_ENCHANTMENT_TYPE_RESISTANCE:
                     if (!enchant_amount)
                     {
-                        ItemRandomSuffixEntry const *item_rand = sItemRandomSuffixStore.LookupEntry(abs(item->GetItemRandomPropertyId()));
-                        if(item_rand)
+                        ItemRandomSuffixEntry const* item_rand = sItemRandomSuffixStore.LookupEntry(abs(item->GetItemRandomPropertyId()));
+                        if (item_rand)
                         {
                             for (int k = 0; k < 3; ++k)
                             {
-                                if(item_rand->enchant_id[k] == enchant_id)
+                                if (item_rand->enchant_id[k] == enchant_id)
                                 {
-                                    enchant_amount = uint32((item_rand->prefix[k] * item->GetItemSuffixFactor()) / 10000 );
+                                    enchant_amount = uint32((item_rand->prefix[k] * item->GetItemSuffixFactor()) / 10000);
                                     break;
                                 }
                             }
@@ -12718,162 +12957,162 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
                 {
                     if (!enchant_amount)
                     {
-                        ItemRandomSuffixEntry const *item_rand_suffix = sItemRandomSuffixStore.LookupEntry(abs(item->GetItemRandomPropertyId()));
-                        if(item_rand_suffix)
+                        ItemRandomSuffixEntry const* item_rand_suffix = sItemRandomSuffixStore.LookupEntry(abs(item->GetItemRandomPropertyId()));
+                        if (item_rand_suffix)
                         {
                             for (int k = 0; k < 3; ++k)
                             {
-                                if(item_rand_suffix->enchant_id[k] == enchant_id)
+                                if (item_rand_suffix->enchant_id[k] == enchant_id)
                                 {
-                                    enchant_amount = uint32((item_rand_suffix->prefix[k] * item->GetItemSuffixFactor()) / 10000 );
+                                    enchant_amount = uint32((item_rand_suffix->prefix[k] * item->GetItemSuffixFactor()) / 10000);
                                     break;
                                 }
                             }
                         }
                     }
 
-                    DEBUG_LOG("Adding %u to stat nb %u",enchant_amount,enchant_spell_id);
+                    DEBUG_LOG("Adding %u to stat nb %u", enchant_amount, enchant_spell_id);
                     switch (enchant_spell_id)
                     {
                         case ITEM_MOD_MANA:
-                            DEBUG_LOG("+ %u MANA",enchant_amount);
+                            DEBUG_LOG("+ %u MANA", enchant_amount);
                             HandleStatModifier(UNIT_MOD_MANA, BASE_VALUE, float(enchant_amount), apply);
                             break;
                         case ITEM_MOD_HEALTH:
-                            DEBUG_LOG("+ %u HEALTH",enchant_amount);
+                            DEBUG_LOG("+ %u HEALTH", enchant_amount);
                             HandleStatModifier(UNIT_MOD_HEALTH, BASE_VALUE, float(enchant_amount), apply);
                             break;
                         case ITEM_MOD_AGILITY:
-                            DEBUG_LOG("+ %u AGILITY",enchant_amount);
+                            DEBUG_LOG("+ %u AGILITY", enchant_amount);
                             HandleStatModifier(UNIT_MOD_STAT_AGILITY, TOTAL_VALUE, float(enchant_amount), apply);
                             ApplyStatBuffMod(STAT_AGILITY, float(enchant_amount), apply);
                             break;
                         case ITEM_MOD_STRENGTH:
-                            DEBUG_LOG("+ %u STRENGTH",enchant_amount);
+                            DEBUG_LOG("+ %u STRENGTH", enchant_amount);
                             HandleStatModifier(UNIT_MOD_STAT_STRENGTH, TOTAL_VALUE, float(enchant_amount), apply);
                             ApplyStatBuffMod(STAT_STRENGTH, float(enchant_amount), apply);
                             break;
                         case ITEM_MOD_INTELLECT:
-                            DEBUG_LOG("+ %u INTELLECT",enchant_amount);
+                            DEBUG_LOG("+ %u INTELLECT", enchant_amount);
                             HandleStatModifier(UNIT_MOD_STAT_INTELLECT, TOTAL_VALUE, float(enchant_amount), apply);
                             ApplyStatBuffMod(STAT_INTELLECT, float(enchant_amount), apply);
                             break;
                         case ITEM_MOD_SPIRIT:
-                            DEBUG_LOG("+ %u SPIRIT",enchant_amount);
+                            DEBUG_LOG("+ %u SPIRIT", enchant_amount);
                             HandleStatModifier(UNIT_MOD_STAT_SPIRIT, TOTAL_VALUE, float(enchant_amount), apply);
                             ApplyStatBuffMod(STAT_SPIRIT, float(enchant_amount), apply);
                             break;
                         case ITEM_MOD_STAMINA:
-                            DEBUG_LOG("+ %u STAMINA",enchant_amount);
+                            DEBUG_LOG("+ %u STAMINA", enchant_amount);
                             HandleStatModifier(UNIT_MOD_STAT_STAMINA, TOTAL_VALUE, float(enchant_amount), apply);
                             ApplyStatBuffMod(STAT_STAMINA, float(enchant_amount), apply);
                             break;
                         case ITEM_MOD_DEFENSE_SKILL_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_DEFENSE_SKILL, enchant_amount, apply);
+                            ApplyRatingMod(CR_DEFENSE_SKILL, enchant_amount, apply);
                             DEBUG_LOG("+ %u DEFENCE", enchant_amount);
                             break;
                         case  ITEM_MOD_DODGE_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_DODGE, enchant_amount, apply);
+                            ApplyRatingMod(CR_DODGE, enchant_amount, apply);
                             DEBUG_LOG("+ %u DODGE", enchant_amount);
                             break;
                         case ITEM_MOD_PARRY_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_PARRY, enchant_amount, apply);
+                            ApplyRatingMod(CR_PARRY, enchant_amount, apply);
                             DEBUG_LOG("+ %u PARRY", enchant_amount);
                             break;
                         case ITEM_MOD_BLOCK_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_BLOCK, enchant_amount, apply);
+                            ApplyRatingMod(CR_BLOCK, enchant_amount, apply);
                             DEBUG_LOG("+ %u SHIELD_BLOCK", enchant_amount);
                             break;
                         case ITEM_MOD_HIT_MELEE_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_HIT_MELEE, enchant_amount, apply);
+                            ApplyRatingMod(CR_HIT_MELEE, enchant_amount, apply);
                             DEBUG_LOG("+ %u MELEE_HIT", enchant_amount);
                             break;
                         case ITEM_MOD_HIT_RANGED_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_HIT_RANGED, enchant_amount, apply);
+                            ApplyRatingMod(CR_HIT_RANGED, enchant_amount, apply);
                             DEBUG_LOG("+ %u RANGED_HIT", enchant_amount);
                             break;
                         case ITEM_MOD_HIT_SPELL_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_HIT_SPELL, enchant_amount, apply);
+                            ApplyRatingMod(CR_HIT_SPELL, enchant_amount, apply);
                             DEBUG_LOG("+ %u SPELL_HIT", enchant_amount);
                             break;
                         case ITEM_MOD_CRIT_MELEE_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_CRIT_MELEE, enchant_amount, apply);
+                            ApplyRatingMod(CR_CRIT_MELEE, enchant_amount, apply);
                             DEBUG_LOG("+ %u MELEE_CRIT", enchant_amount);
                             break;
                         case ITEM_MOD_CRIT_RANGED_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_CRIT_RANGED, enchant_amount, apply);
+                            ApplyRatingMod(CR_CRIT_RANGED, enchant_amount, apply);
                             DEBUG_LOG("+ %u RANGED_CRIT", enchant_amount);
                             break;
                         case ITEM_MOD_CRIT_SPELL_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_CRIT_SPELL, enchant_amount, apply);
+                            ApplyRatingMod(CR_CRIT_SPELL, enchant_amount, apply);
                             DEBUG_LOG("+ %u SPELL_CRIT", enchant_amount);
                             break;
 //                        Values from ITEM_STAT_MELEE_HA_RATING to ITEM_MOD_HASTE_RANGED_RATING are never used
 //                        in Enchantments
 //                        case ITEM_MOD_HIT_TAKEN_MELEE_RATING:
-//                            ((Player*)this)->ApplyRatingMod(CR_HIT_TAKEN_MELEE, enchant_amount, apply);
+//                            ApplyRatingMod(CR_HIT_TAKEN_MELEE, enchant_amount, apply);
 //                            break;
 //                        case ITEM_MOD_HIT_TAKEN_RANGED_RATING:
-//                            ((Player*)this)->ApplyRatingMod(CR_HIT_TAKEN_RANGED, enchant_amount, apply);
+//                            ApplyRatingMod(CR_HIT_TAKEN_RANGED, enchant_amount, apply);
 //                            break;
 //                        case ITEM_MOD_HIT_TAKEN_SPELL_RATING:
-//                            ((Player*)this)->ApplyRatingMod(CR_HIT_TAKEN_SPELL, enchant_amount, apply);
+//                            ApplyRatingMod(CR_HIT_TAKEN_SPELL, enchant_amount, apply);
 //                            break;
 //                        case ITEM_MOD_CRIT_TAKEN_MELEE_RATING:
-//                            ((Player*)this)->ApplyRatingMod(CR_CRIT_TAKEN_MELEE, enchant_amount, apply);
+//                            ApplyRatingMod(CR_CRIT_TAKEN_MELEE, enchant_amount, apply);
 //                            break;
 //                        case ITEM_MOD_CRIT_TAKEN_RANGED_RATING:
-//                            ((Player*)this)->ApplyRatingMod(CR_CRIT_TAKEN_RANGED, enchant_amount, apply);
+//                            ApplyRatingMod(CR_CRIT_TAKEN_RANGED, enchant_amount, apply);
 //                            break;
 //                        case ITEM_MOD_CRIT_TAKEN_SPELL_RATING:
-//                            ((Player*)this)->ApplyRatingMod(CR_CRIT_TAKEN_SPELL, enchant_amount, apply);
+//                            ApplyRatingMod(CR_CRIT_TAKEN_SPELL, enchant_amount, apply);
 //                            break;
 //                        case ITEM_MOD_HASTE_MELEE_RATING:
-//                            ((Player*)this)->ApplyRatingMod(CR_HASTE_MELEE, enchant_amount, apply);
+//                            ApplyRatingMod(CR_HASTE_MELEE, enchant_amount, apply);
 //                            break;
 //                        case ITEM_MOD_HASTE_RANGED_RATING:
-//                            ((Player*)this)->ApplyRatingMod(CR_HASTE_RANGED, enchant_amount, apply);
+//                            ApplyRatingMod(CR_HASTE_RANGED, enchant_amount, apply);
 //                            break;
                         case ITEM_MOD_HASTE_SPELL_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_HASTE_SPELL, enchant_amount, apply);
+                            ApplyRatingMod(CR_HASTE_SPELL, enchant_amount, apply);
                             break;
                         case ITEM_MOD_HIT_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_HIT_MELEE, enchant_amount, apply);
-                            ((Player*)this)->ApplyRatingMod(CR_HIT_RANGED, enchant_amount, apply);
-                            ((Player*)this)->ApplyRatingMod(CR_HIT_SPELL, enchant_amount, apply);
+                            ApplyRatingMod(CR_HIT_MELEE, enchant_amount, apply);
+                            ApplyRatingMod(CR_HIT_RANGED, enchant_amount, apply);
+                            ApplyRatingMod(CR_HIT_SPELL, enchant_amount, apply);
                             DEBUG_LOG("+ %u HIT", enchant_amount);
                             break;
                         case ITEM_MOD_CRIT_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_CRIT_MELEE, enchant_amount, apply);
-                            ((Player*)this)->ApplyRatingMod(CR_CRIT_RANGED, enchant_amount, apply);
-                            ((Player*)this)->ApplyRatingMod(CR_CRIT_SPELL, enchant_amount, apply);
+                            ApplyRatingMod(CR_CRIT_MELEE, enchant_amount, apply);
+                            ApplyRatingMod(CR_CRIT_RANGED, enchant_amount, apply);
+                            ApplyRatingMod(CR_CRIT_SPELL, enchant_amount, apply);
                             DEBUG_LOG("+ %u CRITICAL", enchant_amount);
                             break;
 //                        Values ITEM_MOD_HIT_TAKEN_RATING and ITEM_MOD_CRIT_TAKEN_RATING are never used in Enchantment
 //                        case ITEM_MOD_HIT_TAKEN_RATING:
-//                            ((Player*)this)->ApplyRatingMod(CR_HIT_TAKEN_MELEE, enchant_amount, apply);
-//                            ((Player*)this)->ApplyRatingMod(CR_HIT_TAKEN_RANGED, enchant_amount, apply);
-//                            ((Player*)this)->ApplyRatingMod(CR_HIT_TAKEN_SPELL, enchant_amount, apply);
+//                            ApplyRatingMod(CR_HIT_TAKEN_MELEE, enchant_amount, apply);
+//                            ApplyRatingMod(CR_HIT_TAKEN_RANGED, enchant_amount, apply);
+//                            ApplyRatingMod(CR_HIT_TAKEN_SPELL, enchant_amount, apply);
 //                            break;
 //                        case ITEM_MOD_CRIT_TAKEN_RATING:
-//                            ((Player*)this)->ApplyRatingMod(CR_CRIT_TAKEN_MELEE, enchant_amount, apply);
-//                            ((Player*)this)->ApplyRatingMod(CR_CRIT_TAKEN_RANGED, enchant_amount, apply);
-//                            ((Player*)this)->ApplyRatingMod(CR_CRIT_TAKEN_SPELL, enchant_amount, apply);
+//                            ApplyRatingMod(CR_CRIT_TAKEN_MELEE, enchant_amount, apply);
+//                            ApplyRatingMod(CR_CRIT_TAKEN_RANGED, enchant_amount, apply);
+//                            ApplyRatingMod(CR_CRIT_TAKEN_SPELL, enchant_amount, apply);
 //                            break;
                         case ITEM_MOD_RESILIENCE_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_CRIT_TAKEN_MELEE, enchant_amount, apply);
-                            ((Player*)this)->ApplyRatingMod(CR_CRIT_TAKEN_RANGED, enchant_amount, apply);
-                            ((Player*)this)->ApplyRatingMod(CR_CRIT_TAKEN_SPELL, enchant_amount, apply);
+                            ApplyRatingMod(CR_CRIT_TAKEN_MELEE, enchant_amount, apply);
+                            ApplyRatingMod(CR_CRIT_TAKEN_RANGED, enchant_amount, apply);
+                            ApplyRatingMod(CR_CRIT_TAKEN_SPELL, enchant_amount, apply);
                             DEBUG_LOG("+ %u RESILIENCE", enchant_amount);
                             break;
                         case ITEM_MOD_HASTE_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_HASTE_MELEE, enchant_amount, apply);
-                            ((Player*)this)->ApplyRatingMod(CR_HASTE_RANGED, enchant_amount, apply);
-                            ((Player*)this)->ApplyRatingMod(CR_HASTE_SPELL, enchant_amount, apply);
+                            ApplyRatingMod(CR_HASTE_MELEE, enchant_amount, apply);
+                            ApplyRatingMod(CR_HASTE_RANGED, enchant_amount, apply);
+                            ApplyRatingMod(CR_HASTE_SPELL, enchant_amount, apply);
                             DEBUG_LOG("+ %u HASTE", enchant_amount);
                             break;
                         case ITEM_MOD_EXPERTISE_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_EXPERTISE, enchant_amount, apply);
+                            ApplyRatingMod(CR_EXPERTISE, enchant_amount, apply);
                             DEBUG_LOG("+ %u EXPERTISE", enchant_amount);
                             break;
                         case ITEM_MOD_ATTACK_POWER:
@@ -12886,17 +13125,21 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
                             DEBUG_LOG("+ %u RANGED_ATTACK_POWER", enchant_amount);
                             break;
                         case ITEM_MOD_MANA_REGENERATION:
-                            ((Player*)this)->ApplyManaRegenBonus(enchant_amount, apply);
+                            ApplyManaRegenBonus(enchant_amount, apply);
                             DEBUG_LOG("+ %u MANA_REGENERATION", enchant_amount);
                             break;
                         case ITEM_MOD_ARMOR_PENETRATION_RATING:
-                            ((Player*)this)->ApplyRatingMod(CR_ARMOR_PENETRATION, enchant_amount, apply);
+                            ApplyRatingMod(CR_ARMOR_PENETRATION, enchant_amount, apply);
                             DEBUG_LOG("+ %u ARMOR PENETRATION", enchant_amount);
                             break;
                         case ITEM_MOD_SPELL_POWER:
-                            ((Player*)this)->ApplySpellPowerBonus(enchant_amount, apply);
+                            ApplySpellPowerBonus(enchant_amount, apply);
                             DEBUG_LOG("+ %u SPELL_POWER", enchant_amount);
                             break;
+                        case ITEM_MOD_HEALTH_REGEN:
+                            ApplyHealthRegenBonus(enchant_amount, apply);
+                            DEBUG_LOG("+ %u HEALTH_REGENERATION", enchant_amount);
+                            break;
                         case ITEM_MOD_BLOCK_VALUE:
                             HandleBaseModValue(SHIELD_BLOCK_VALUE, FLAT_MOD, float(enchant_amount), apply);
                             break;
@@ -12910,15 +13153,15 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
                 }
                 case ITEM_ENCHANTMENT_TYPE_TOTEM:           // Shaman Rockbiter Weapon
                 {
-                    if(getClass() == CLASS_SHAMAN)
+                    if (getClass() == CLASS_SHAMAN)
                     {
                         float addValue = 0.0f;
-                        if(item->GetSlot() == EQUIPMENT_SLOT_MAINHAND)
+                        if (item->GetSlot() == EQUIPMENT_SLOT_MAINHAND)
                         {
                             addValue = float(enchant_amount * item->GetProto()->Delay / 1000.0f);
                             HandleStatModifier(UNIT_MOD_DAMAGE_MAINHAND, TOTAL_VALUE, addValue, apply);
                         }
-                        else if(item->GetSlot() == EQUIPMENT_SLOT_OFFHAND )
+                        else if (item->GetSlot() == EQUIPMENT_SLOT_OFFHAND)
                         {
                             addValue = float(enchant_amount * item->GetProto()->Delay / 1000.0f);
                             HandleStatModifier(UNIT_MOD_DAMAGE_OFFHAND, TOTAL_VALUE, addValue, apply);
@@ -12940,20 +13183,19 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
     }
 
     // visualize enchantment at player and equipped items
-    if(slot == PERM_ENCHANTMENT_SLOT)
+    if (slot == PERM_ENCHANTMENT_SLOT)
         SetUInt16Value(PLAYER_VISIBLE_ITEM_1_ENCHANTMENT + (item->GetSlot() * 2), 0, apply ? item->GetEnchantmentId(slot) : 0);
 
-    if(slot == TEMP_ENCHANTMENT_SLOT)
+    if (slot == TEMP_ENCHANTMENT_SLOT)
         SetUInt16Value(PLAYER_VISIBLE_ITEM_1_ENCHANTMENT + (item->GetSlot() * 2), 1, apply ? item->GetEnchantmentId(slot) : 0);
 
-
-    if(apply_dur)
+    if (apply_dur)
     {
-        if(apply)
+        if (apply)
         {
             // set duration
             uint32 duration = item->GetEnchantmentDuration(slot);
-            if(duration > 0)
+            if (duration > 0)
                 AddEnchantmentDuration(item, slot, duration);
         }
         else
@@ -12966,7 +13208,7 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
 
 void Player::SendEnchantmentDurations()
 {
-    for(EnchantDurationList::const_iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr)
+    for (EnchantDurationList::const_iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr)
     {
         GetSession()->SendItemEnchantTimeUpdate(GetObjectGuid(), itr->item->GetObjectGuid(), itr->slot, uint32(itr->leftduration) / 1000);
     }
@@ -12974,19 +13216,19 @@ void Player::SendEnchantmentDurations()
 
 void Player::SendItemDurations()
 {
-    for(ItemDurationList::const_iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end(); ++itr)
+    for (ItemDurationList::const_iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end(); ++itr)
     {
         (*itr)->SendTimeUpdate(this);
     }
 }
 
-void Player::SendNewItem(Item *item, uint32 count, bool received, bool created, bool broadcast)
+void Player::SendNewItem(Item* item, uint32 count, bool received, bool created, bool broadcast)
 {
-    if(!item)                                               // prevent crash
+    if (!item)                                              // prevent crash
         return;
 
-                                                            // last check 2.0.10
-    WorldPacket data( SMSG_ITEM_PUSH_RESULT, (8+4+4+4+1+4+4+4+4+4) );
+    // last check 2.0.10
+    WorldPacket data(SMSG_ITEM_PUSH_RESULT, 8 + 4 + 4 + 4 + 1 + 4 + 4 + 4 + 4 + 4);
     data << GetObjectGuid();                                // player GUID
     data << uint32(received);                               // 0=looted, 1=from npc
     data << uint32(created);                                // 0=received, 1=created
@@ -13010,7 +13252,7 @@ void Player::SendNewItem(Item *item, uint32 count, bool received, bool created,
 /***                    GOSSIP SYSTEM                  ***/
 /*********************************************************/
 
-void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId)
+void Player::PrepareGossipMenu(WorldObject* pSource, uint32 menuId)
 {
     PlayerMenu* pMenu = PlayerTalkClass;
     pMenu->ClearMenus();
@@ -13026,59 +13268,35 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId)
     if (pMenuItemBounds.first == pMenuItemBounds.second && canSeeQuests)
         pMenuItemBounds = sObjectMgr.GetGossipMenuItemsMapBounds(0);
 
-    bool canTalkToCredit = pSource->GetTypeId() == TYPEID_UNIT;
-
-    for(GossipMenuItemsMap::const_iterator itr = pMenuItemBounds.first; itr != pMenuItemBounds.second; ++itr)
+    for (GossipMenuItemsMap::const_iterator itr = pMenuItemBounds.first; itr != pMenuItemBounds.second; ++itr)
     {
         bool hasMenuItem = true;
+        bool isGMSkipConditionCheck = false;
 
-        if (!isGameMaster())                                // Let GM always see menu items regardless of conditions
+        if (itr->second.conditionId && !sObjectMgr.IsPlayerMeetToCondition(itr->second.conditionId, this, GetMap(), pSource, CONDITION_FROM_GOSSIP_OPTION))
         {
-            if (itr->second.conditionId && !sObjectMgr.IsPlayerMeetToNEWCondition(this, itr->second.conditionId))
-            {
-                if (itr->second.option_id == GOSSIP_OPTION_QUESTGIVER)
-                    canSeeQuests = false;
-                continue;
-            }
-            else if (!itr->second.conditionId)
-        {
-            if (itr->second.cond_1 && !sObjectMgr.IsPlayerMeetToCondition(this, itr->second.cond_1))
-            {
-                if (itr->second.option_id == GOSSIP_OPTION_QUESTGIVER)
-                    canSeeQuests = false;
-                continue;
-            }
-
-            if (itr->second.cond_2 && !sObjectMgr.IsPlayerMeetToCondition(this, itr->second.cond_2))
-            {
-                if (itr->second.option_id == GOSSIP_OPTION_QUESTGIVER)
-                    canSeeQuests = false;
-                continue;
-            }
-
-            if (itr->second.cond_3 && !sObjectMgr.IsPlayerMeetToCondition(this, itr->second.cond_3))
+            if (isGameMaster())                             // Let GM always see menu items regardless of conditions
+                isGMSkipConditionCheck = true;
+            else
             {
                 if (itr->second.option_id == GOSSIP_OPTION_QUESTGIVER)
                     canSeeQuests = false;
-                continue;
+                continue;                                   // Skip this option
             }
         }
-        }
 
         if (pSource->GetTypeId() == TYPEID_UNIT)
         {
-            Creature *pCreature = (Creature*)pSource;
+            Creature* pCreature = (Creature*)pSource;
 
             uint32 npcflags = pCreature->GetUInt32Value(UNIT_NPC_FLAGS);
 
             if (!(itr->second.npc_option_npcflag & npcflags))
                 continue;
 
-            switch(itr->second.option_id)
+            switch (itr->second.option_id)
             {
                 case GOSSIP_OPTION_GOSSIP:
-                    if (itr->second.action_menu_id != 0)    // has sub menu (or close gossip), so do not "talk" with this NPC yet
-                        canTalkToCredit = false;
                     break;
                 case GOSSIP_OPTION_QUESTGIVER:
                     hasMenuItem = false;
@@ -13115,9 +13333,9 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId)
                         hasMenuItem = false;
                     break;
                 case GOSSIP_OPTION_UNLEARNPETSKILLS:
-                    if (pCreature->GetCreatureInfo()->trainer_type != TRAINER_TYPE_PETS || pCreature->GetCreatureInfo()->trainer_class != CLASS_HUNTER)
+                    if (pCreature->GetCreatureInfo()->TrainerType != TRAINER_TYPE_PETS || pCreature->GetCreatureInfo()->TrainerClass != CLASS_HUNTER)
                         hasMenuItem = false;
-                    else if (Pet * pet = GetPet())
+                    else if (Pet* pet = GetPet())
                     {
                         if (pet->getPetType() != HUNTER_PET || pet->m_spells.size() <= 1)
                             hasMenuItem = false;
@@ -13153,9 +13371,9 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId)
         }
         else if (pSource->GetTypeId() == TYPEID_GAMEOBJECT)
         {
-            GameObject *pGo = (GameObject*)pSource;
+            GameObject* pGo = (GameObject*)pSource;
 
-            switch(itr->second.option_id)
+            switch (itr->second.option_id)
             {
                 case GOSSIP_OPTION_QUESTGIVER:
                     hasMenuItem = false;
@@ -13181,7 +13399,7 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId)
             {
                 uint32 idxEntry = MAKE_PAIR32(menuId, itr->second.id);
 
-                if (GossipMenuItemsLocale const *no = sObjectMgr.GetGossipMenuItemsLocale(idxEntry))
+                if (GossipMenuItemsLocale const* no = sObjectMgr.GetGossipMenuItemsLocale(idxEntry))
                 {
                     if (no->OptionText.size() > (size_t)loc_idx && !no->OptionText[loc_idx].empty())
                         strOptionText = no->OptionText[loc_idx];
@@ -13191,6 +13409,13 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId)
                 }
             }
 
+            if (isGMSkipConditionCheck)
+            {
+                strOptionText.append(" (");
+                strOptionText.append(GetSession()->GetMangosString(LANG_GM_ON));
+                strOptionText.append(")");
+            }
+
             pMenu->GetGossipMenu().AddMenuItem(itr->second.option_icon, strOptionText, 0, itr->second.option_id, strBoxText, itr->second.box_money, itr->second.box_coded);
             pMenu->GetGossipMenu().AddGossipMenuItemData(itr->second.action_menu_id, itr->second.action_poi_id, itr->second.action_script_id);
         }
@@ -13199,12 +13424,6 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId)
     if (canSeeQuests)
         PrepareQuestMenu(pSource->GetObjectGuid());
 
-    if (canTalkToCredit)
-    {
-        if (pSource->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP) && !(((Creature*)pSource)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_TALKTO_CREDIT))
-            TalkedToCreature(pSource->GetEntry(), pSource->GetObjectGuid());
-    }
-
     // some gossips aren't handled in normal way ... so we need to do it this way .. TODO: handle it in normal way ;-)
     /*if (pMenu->Empty())
     {
@@ -13222,7 +13441,7 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId)
     }*/
 }
 
-void Player::SendPreparedGossip(WorldObject *pSource)
+void Player::SendPreparedGossip(WorldObject* pSource)
 {
     if (!pSource)
         return;
@@ -13230,7 +13449,7 @@ void Player::SendPreparedGossip(WorldObject *pSource)
     if (pSource->GetTypeId() == TYPEID_UNIT)
     {
         // in case no gossip flag and quest menu not empty, open quest menu (client expect gossip menu with this flag)
-        if (!((Creature*)pSource)->HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_GOSSIP) && !PlayerTalkClass->GetQuestMenu().Empty())
+        if (!((Creature*)pSource)->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP) && !PlayerTalkClass->GetQuestMenu().Empty())
         {
             SendPreparedQuest(pSource->GetObjectGuid());
             return;
@@ -13312,7 +13531,6 @@ void Player::OnGossipSelect(WorldObject* pSource, uint32 gossipListId, uint32 me
                 PlayerTalkClass->CloseGossip();
                 TalkedToCreature(pSource->GetEntry(), pSource->GetObjectGuid());
             }
-
             break;
         }
         case GOSSIP_OPTION_SPIRITHEALER:
@@ -13388,13 +13606,13 @@ void Player::OnGossipSelect(WorldObject* pSource, uint32 gossipListId, uint32 me
     if (pMenuData.m_gAction_script)
     {
         if (pSource->GetTypeId() == TYPEID_UNIT)
-            GetMap()->ScriptsStart(sGossipScripts, pMenuData.m_gAction_script, pSource, this);
+            GetMap()->ScriptsStart(sGossipScripts, pMenuData.m_gAction_script, pSource, this, Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE);
         else if (pSource->GetTypeId() == TYPEID_GAMEOBJECT)
-            GetMap()->ScriptsStart(sGossipScripts, pMenuData.m_gAction_script, this, pSource);
+            GetMap()->ScriptsStart(sGossipScripts, pMenuData.m_gAction_script, this, pSource, Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_TARGET);
     }
 }
 
-uint32 Player::GetGossipTextId(WorldObject *pSource)
+uint32 Player::GetGossipTextId(WorldObject* pSource)
 {
     if (!pSource || pSource->GetTypeId() != TYPEID_UNIT)
         return DEFAULT_GOSSIP_MESSAGE;
@@ -13412,37 +13630,31 @@ uint32 Player::GetGossipTextId(uint32 menuId, WorldObject* pSource)
     if (!menuId)
         return textId;
 
-    GossipMenusMapBounds pMenuBounds = sObjectMgr.GetGossipMenusMapBounds(menuId);
+    uint32 scriptId = 0;
+    uint32 lastConditionId = 0;
 
+    GossipMenusMapBounds pMenuBounds = sObjectMgr.GetGossipMenusMapBounds(menuId);
     for (GossipMenusMap::const_iterator itr = pMenuBounds.first; itr != pMenuBounds.second; ++itr)
     {
-        if (itr->second.conditionId && sObjectMgr.IsPlayerMeetToNEWCondition(this, itr->second.conditionId))
-        {
-            textId = itr->second.text_id;
-
-            // Start related script
-            if (itr->second.script_id)
-                GetMap()->ScriptsStart(sGossipScripts, itr->second.script_id, this, pSource);
-            break;
-        }
-        else if (!itr->second.conditionId)
-    {
-        if (sObjectMgr.IsPlayerMeetToCondition(this, itr->second.cond_1) && sObjectMgr.IsPlayerMeetToCondition(this, itr->second.cond_2))
+        // Take the text that has the highest conditionId of all fitting
+        // No condition and no text with condition found OR higher and fitting condition found
+        if ((!itr->second.conditionId && !lastConditionId) ||
+                (itr->second.conditionId > lastConditionId && sObjectMgr.IsPlayerMeetToCondition(itr->second.conditionId, this, GetMap(), pSource, CONDITION_FROM_GOSSIP_MENU)))
         {
+            lastConditionId = itr->second.conditionId;
             textId = itr->second.text_id;
-
-            // Start related script
-            if (itr->second.script_id)
-                GetMap()->ScriptsStart(sGossipScripts, itr->second.script_id, this, pSource);
-            break;
+            scriptId = itr->second.script_id;
         }
     }
-    }
+
+    // Start related script
+    if (scriptId)
+        GetMap()->ScriptsStart(sGossipScripts, scriptId, this, pSource, Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_TARGET);
 
     return textId;
 }
 
-uint32 Player::GetDefaultGossipMenuForSource(WorldObject *pSource)
+uint32 Player::GetDefaultGossipMenuForSource(WorldObject* pSource)
 {
     if (pSource->GetTypeId() == TYPEID_UNIT)
         return ((Creature*)pSource)->GetCreatureInfo()->GossipMenuId;
@@ -13462,19 +13674,19 @@ void Player::PrepareQuestMenu(ObjectGuid guid)
     QuestRelationsMapBounds irbounds;
 
     // pets also can have quests
-    if (Creature *pCreature = GetMap()->GetAnyTypeCreature(guid))
+    if (Creature* pCreature = GetMap()->GetAnyTypeCreature(guid))
     {
         rbounds = sObjectMgr.GetCreatureQuestRelationsMapBounds(pCreature->GetEntry());
         irbounds = sObjectMgr.GetCreatureQuestInvolvedRelationsMapBounds(pCreature->GetEntry());
     }
     else
     {
-        //we should obtain map pointer from GetMap() in 99% of cases. Special case
-        //only for quests which cast teleport spells on player
-        Map * _map = IsInWorld() ? GetMap() : sMapMgr.FindMap(GetMapId(), GetInstanceId());
-        MANGOS_ASSERT(_map);
+        // we should obtain map pointer from GetMap() in 99% of cases. Special case
+        // only for quests which cast teleport spells on player
+        Map* pMap = IsInWorld() ? GetMap() : sMapMgr.FindMap(GetMapId(), GetInstanceId());
+        MANGOS_ASSERT(pMap);
 
-        if (GameObject *pGameObject = _map->GetGameObject(guid))
+        if (GameObject* pGameObject = pMap->GetGameObject(guid))
         {
             rbounds = sObjectMgr.GetGOQuestRelationsMapBounds(pGameObject->GetEntry());
             irbounds = sObjectMgr.GetGOQuestInvolvedRelationsMapBounds(pGameObject->GetEntry());
@@ -13483,10 +13695,10 @@ void Player::PrepareQuestMenu(ObjectGuid guid)
             return;
     }
 
-    QuestMenu &qm = PlayerTalkClass->GetQuestMenu();
+    QuestMenu& qm = PlayerTalkClass->GetQuestMenu();
     qm.ClearMenu();
 
-    for(QuestRelationsMap::const_iterator itr = irbounds.first; itr != irbounds.second; ++itr)
+    for (QuestRelationsMap::const_iterator itr = irbounds.first; itr != irbounds.second; ++itr)
     {
         uint32 quest_id = itr->second;
 
@@ -13505,7 +13717,7 @@ void Player::PrepareQuestMenu(ObjectGuid guid)
             qm.AddMenuItem(quest_id, 2);
     }
 
-    for(QuestRelationsMap::const_iterator itr = rbounds.first; itr != rbounds.second; ++itr)
+    for (QuestRelationsMap::const_iterator itr = rbounds.first; itr != rbounds.second; ++itr)
     {
         uint32 quest_id = itr->second;
 
@@ -13564,15 +13776,15 @@ void Player::SendPreparedQuest(ObjectGuid guid)
         std::string title = "";
 
         // need pet case for some quests
-        if (Creature *pCreature = GetMap()->GetAnyTypeCreature(guid))
+        if (Creature* pCreature = GetMap()->GetAnyTypeCreature(guid))
         {
             uint32 textid = GetGossipTextId(pCreature);
 
             GossipText const* gossiptext = sObjectMgr.GetGossipText(textid);
             if (!gossiptext)
             {
-                qe._Delay = 0;                              //TEXTEMOTE_MESSAGE;              //zyg: player emote
-                qe._Emote = 0;                              //TEXTEMOTE_HELLO;                //zyg: NPC emote
+                qe._Delay = 0;                              // TEXTEMOTE_MESSAGE;              // zyg: player emote
+                qe._Emote = 0;                              // TEXTEMOTE_HELLO;                // zyg: NPC emote
                 title = "";
             }
             else
@@ -13592,7 +13804,7 @@ void Player::SendPreparedQuest(ObjectGuid guid)
     }
 }
 
-bool Player::IsActiveQuest( uint32 quest_id ) const
+bool Player::IsActiveQuest(uint32 quest_id) const
 {
     QuestStatusMap::const_iterator itr = mQuestStatus.find(quest_id);
 
@@ -13616,11 +13828,11 @@ bool Player::IsCurrentQuest(uint32 quest_id, uint8 completed_or_not) const
     }
 }
 
-Quest const* Player::GetNextQuest(ObjectGuid guid, Quest const *pQuest)
+Quest const* Player::GetNextQuest(ObjectGuid guid, Quest const* pQuest)
 {
     QuestRelationsMapBounds rbounds;
 
-    if (Creature *pCreature = GetMap()->GetAnyTypeCreature(guid))
+    if (Creature* pCreature = GetMap()->GetAnyTypeCreature(guid))
     {
         rbounds = sObjectMgr.GetCreatureQuestRelationsMapBounds(pCreature->GetEntry());
     }
@@ -13628,10 +13840,10 @@ Quest const* Player::GetNextQuest(ObjectGuid guid, Quest const *pQuest)
     {
         //we should obtain map pointer from GetMap() in 99% of cases. Special case
         //only for quests which cast teleport spells on player
-        Map * _map = IsInWorld() ? GetMap() : sMapMgr.FindMap(GetMapId(), GetInstanceId());
-        MANGOS_ASSERT(_map);
+        Map * pMap = IsInWorld() ? GetMap() : sMapMgr.FindMap(GetMapId(), GetInstanceId());
+        MANGOS_ASSERT(pMap);
 
-        if (GameObject *pGameObject = _map->GetGameObject(guid))
+        if (GameObject* pGameObject = pMap->GetGameObject(guid))
         {
             rbounds = sObjectMgr.GetGOQuestRelationsMapBounds(pGameObject->GetEntry());
         }
@@ -13640,7 +13852,7 @@ Quest const* Player::GetNextQuest(ObjectGuid guid, Quest const *pQuest)
     }
 
     uint32 nextQuestID = pQuest->GetNextQuestInChain();
-    for(QuestRelationsMap::const_iterator itr = rbounds.first; itr != rbounds.second; ++itr)
+    for (QuestRelationsMap::const_iterator itr = rbounds.first; itr != rbounds.second; ++itr)
     {
         if (itr->second == nextQuestID)
             return sObjectMgr.GetQuestTemplate(nextQuestID);
@@ -13649,7 +13861,12 @@ Quest const* Player::GetNextQuest(ObjectGuid guid, Quest const *pQuest)
     return NULL;
 }
 
-bool Player::CanSeeStartQuest(Quest const *pQuest) const
+/**
+ * Check if a player could see a start quest
+ * Basic Quest-taking requirements: Class, Race, Skill, Quest-Line, ...
+ * Check if the quest-level is not too high (related config value CONFIG_INT32_QUEST_HIGH_LEVEL_HIDE_DIFF)
+ */
+bool Player::CanSeeStartQuest(Quest const* pQuest) const
 {
     if (SatisfyQuestClass(pQuest, false) && SatisfyQuestRace(pQuest, false) && SatisfyQuestSkill(pQuest, false) &&
         SatisfyQuestExclusiveGroup(pQuest, false) && SatisfyQuestReputation(pQuest, false) &&
@@ -13658,13 +13875,16 @@ bool Player::CanSeeStartQuest(Quest const *pQuest) const
         SatisfyQuestMonth(pQuest, false) &&
         pQuest->IsActive())
     {
-        return int32(getLevel()) + sWorld.getConfig(CONFIG_INT32_QUEST_HIGH_LEVEL_HIDE_DIFF) >= int32(pQuest->GetMinLevel());
+        int32 highLevelDiff = sWorld.getConfig(CONFIG_INT32_QUEST_HIGH_LEVEL_HIDE_DIFF);
+        if (highLevelDiff < 0)
+            return true;
+        return getLevel() + uint32(highLevelDiff) >= pQuest->GetMinLevel();
     }
 
     return false;
 }
 
-bool Player::CanTakeQuest(Quest const *pQuest, bool msg) const
+bool Player::CanTakeQuest(Quest const* pQuest, bool msg) const
 {
     return SatisfyQuestStatus(pQuest, msg) && SatisfyQuestExclusiveGroup(pQuest, msg) &&
         SatisfyQuestClass(pQuest, msg) && SatisfyQuestRace(pQuest, msg) && SatisfyQuestLevel(pQuest, msg) &&
@@ -13675,7 +13895,7 @@ bool Player::CanTakeQuest(Quest const *pQuest, bool msg) const
         pQuest->IsActive();
 }
 
-bool Player::CanAddQuest(Quest const *pQuest, bool msg) const
+bool Player::CanAddQuest(Quest const* pQuest, bool msg) const
 {
     if (!SatisfyQuestLog(msg))
         return false;
@@ -13715,6 +13935,19 @@ bool Player::CanCompleteQuest(uint32 quest_id) const
         return false;
     }
 
+    // Anti WPE for client command /script CompleteQuest() on quests with AutoComplete flag
+    if (status == QUEST_STATUS_NONE)
+    {
+        for (uint32 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
+        {
+            if (qInfo->ReqItemCount[i] != 0 &&
+                GetItemCount(qInfo->ReqItemId[i]) < qInfo->ReqItemCount[i])
+            {
+                return false;
+            }
+        }
+    }
+
     // auto complete quest
     if (qInfo->IsAutoComplete() && CanTakeQuest(qInfo, false))
         return true;
@@ -13727,7 +13960,7 @@ bool Player::CanCompleteQuest(uint32 quest_id) const
 
     if (qInfo->HasSpecialFlag(QUEST_SPECIAL_FLAG_DELIVER))
     {
-        for(int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
+        for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
         {
             if (qInfo->ReqItemCount[i] != 0 && q_status.m_itemcount[i] < qInfo->ReqItemCount[i])
                 return false;
@@ -13736,7 +13969,7 @@ bool Player::CanCompleteQuest(uint32 quest_id) const
 
     if (qInfo->HasSpecialFlag(QuestSpecialFlags(QUEST_SPECIAL_FLAG_KILL_OR_CAST | QUEST_SPECIAL_FLAG_SPEAKTO)))
     {
-        for(int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
+        for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
         {
             if (qInfo->ReqCreatureOrGOId[i] == 0)
                 continue;
@@ -13765,7 +13998,7 @@ bool Player::CanCompleteQuest(uint32 quest_id) const
     return true;
 }
 
-bool Player::CanCompleteRepeatableQuest(Quest const *pQuest) const
+bool Player::CanCompleteRepeatableQuest(Quest const* pQuest) const
 {
     // Solve problem that player don't have the quest and try complete it.
     // if repeatable she must be able to complete event if player don't have it.
@@ -13774,7 +14007,7 @@ bool Player::CanCompleteRepeatableQuest(Quest const *pQuest) const
         return false;
 
     if (pQuest->HasSpecialFlag(QUEST_SPECIAL_FLAG_DELIVER))
-        for(int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
+        for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
             if (pQuest->ReqItemId[i] && pQuest->ReqItemCount[i] && !HasItemCount(pQuest->ReqItemId[i], pQuest->ReqItemCount[i]))
                 return false;
 
@@ -13784,7 +14017,7 @@ bool Player::CanCompleteRepeatableQuest(Quest const *pQuest) const
     return true;
 }
 
-bool Player::CanRewardQuest(Quest const *pQuest, bool msg) const
+bool Player::CanRewardQuest(Quest const* pQuest, bool msg) const
 {
     // not auto complete quest and not completed quest (only cheating case, then ignore without message)
     if (!pQuest->IsAutoComplete() && GetQuestStatus(pQuest->GetQuestId()) != QUEST_STATUS_COMPLETE)
@@ -13801,7 +14034,7 @@ bool Player::CanRewardQuest(Quest const *pQuest, bool msg) const
     // prevent receive reward with quest items in bank
     if (pQuest->HasSpecialFlag(QUEST_SPECIAL_FLAG_DELIVER))
     {
-        for(int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
+        for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
         {
             if (pQuest->ReqItemCount[i] != 0 &&
                 GetItemCount(pQuest->ReqItemId[i]) < pQuest->ReqItemCount[i])
@@ -13821,18 +14054,19 @@ bool Player::CanRewardQuest(Quest const *pQuest, bool msg) const
     return true;
 }
 
-bool Player::CanRewardQuest(Quest const *pQuest, uint32 reward, bool msg) const
+bool Player::CanRewardQuest(Quest const* pQuest, uint32 reward, bool msg) const
 {
     // prevent receive reward with quest items in bank or for not completed quest
-    if (!CanRewardQuest(pQuest,msg))
+    if (!CanRewardQuest(pQuest, msg))
         return false;
 
+    ItemPosCountVec dest;
+
     if (pQuest->GetRewChoiceItemsCount() > 0)
     {
         if (pQuest->RewChoiceItemId[reward])
         {
-            ItemPosCountVec dest;
-            InventoryResult res = CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, pQuest->RewChoiceItemId[reward], pQuest->RewChoiceItemCount[reward] );
+            InventoryResult res = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, pQuest->RewChoiceItemId[reward], pQuest->RewChoiceItemCount[reward]);
             if (res != EQUIP_ERR_OK)
             {
                 SendEquipError(res, NULL, NULL, pQuest->RewChoiceItemId[reward]);
@@ -13847,8 +14081,7 @@ bool Player::CanRewardQuest(Quest const *pQuest, uint32 reward, bool msg) const
         {
             if (pQuest->RewItemId[i])
             {
-                ItemPosCountVec dest;
-                InventoryResult res = CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, pQuest->RewItemId[i], pQuest->RewItemCount[i] );
+                InventoryResult res = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, pQuest->RewItemId[i], pQuest->RewItemCount[i]);
                 if (res != EQUIP_ERR_OK)
                 {
                     SendEquipError(res, NULL, NULL);
@@ -13868,9 +14101,9 @@ void Player::SendPetTameFailure(PetTameFailureReason reason)
     GetSession()->SendPacket(&data);
 }
 
-void Player::AddQuest( Quest const *pQuest, Object *questGiver )
+void Player::AddQuest(Quest const* pQuest, Object* questGiver)
 {
-    uint16 log_slot = FindQuestSlot( 0 );
+    uint16 log_slot = FindQuestSlot(0);
     MANGOS_ASSERT(log_slot < MAX_QUEST_LOG_SIZE);
 
     uint32 quest_id = pQuest->GetQuestId();
@@ -13884,18 +14117,18 @@ void Player::AddQuest( Quest const *pQuest, Object *questGiver )
 
     if (pQuest->HasSpecialFlag(QUEST_SPECIAL_FLAG_DELIVER))
     {
-        for(int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
+        for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
             questStatusData.m_itemcount[i] = 0;
     }
 
     if (pQuest->HasSpecialFlag(QuestSpecialFlags(QUEST_SPECIAL_FLAG_KILL_OR_CAST | QUEST_SPECIAL_FLAG_SPEAKTO)))
     {
-        for(int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
+        for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
             questStatusData.m_creatureOrGOcount[i] = 0;
     }
 
-    if( pQuest->GetRepObjectiveFaction() )
-        if(FactionEntry const* factionEntry = sFactionStore.LookupEntry(pQuest->GetRepObjectiveFaction()))
+    if (pQuest->GetRepObjectiveFaction())
+        if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(pQuest->GetRepObjectiveFaction()))
             GetReputationMgr().SetVisible(factionEntry);
 
     uint32 qtime = 0;
@@ -13904,10 +14137,11 @@ void Player::AddQuest( Quest const *pQuest, Object *questGiver )
         uint32 limittime = pQuest->GetLimitTime();
 
         // shared timed quest
-        if(questGiver && questGiver->GetTypeId()==TYPEID_PLAYER)
-            limittime = ((Player*)questGiver)->getQuestStatusMap()[quest_id].m_timer / IN_MILLISECONDS;
+        if (questGiver && questGiver->GetTypeId() == TYPEID_PLAYER)
+            if (QuestStatusData* data = ((Player*)questGiver)->GetQuestStatusData(quest_id))
+                limittime = data->m_timer / IN_MILLISECONDS;
 
-        AddTimedQuest( quest_id );
+        AddTimedQuest(quest_id);
         questStatusData.m_timer = limittime * IN_MILLISECONDS;
         qtime = static_cast<uint32>(time(NULL)) + limittime;
     }
@@ -13938,8 +14172,7 @@ void Player::AddQuest( Quest const *pQuest, Object *questGiver )
 
         // starting initial DB quest script
         if (pQuest->GetQuestStartScript() != 0)
-            GetMap()->ScriptsStart(sQuestStartScripts, pQuest->GetQuestStartScript(), questGiver, this);
-
+            GetMap()->ScriptsStart(sQuestStartScripts, pQuest->GetQuestStartScript(), questGiver, this, Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE);
     }
 
     // remove start item if not need
@@ -13947,7 +14180,7 @@ void Player::AddQuest( Quest const *pQuest, Object *questGiver )
     {
         // destroy not required for quest finish quest starting item
         bool notRequiredItem = true;
-        for(int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
+        for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
         {
             if (pQuest->ReqItemId[i] == questGiver->GetEntry())
             {
@@ -13965,20 +14198,23 @@ void Player::AddQuest( Quest const *pQuest, Object *questGiver )
 
     GiveQuestSourceItemIfNeed(pQuest);
 
-    AdjustQuestReqItemCount( pQuest, questStatusData );
+    AdjustQuestReqItemCount(pQuest, questStatusData);
 
     // Some spells applied at quest activation
-    SpellAreaForQuestMapBounds saBounds = sSpellMgr.GetSpellAreaForQuestMapBounds(quest_id,true);
-    if(saBounds.first != saBounds.second)
+    uint32 zone, area;
+    GetZoneAndAreaId(zone, area);
+    SpellAreaForAreaMapBounds saBounds = sSpellMgr.GetSpellAreaForAreaMapBounds(zone);
+    for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
+        itr->second->ApplyOrRemoveSpellIfCan(this, zone, area, true);
+    if (area != zone)
     {
-        uint32 zone, area;
-        GetZoneAndAreaId(zone,area);
-
-        for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
-            if(itr->second->autocast && itr->second->IsFitToRequirements(this,zone,area))
-                if (!HasAura(itr->second->spellId, EFFECT_INDEX_0) )
-                    CastSpell(this,itr->second->spellId,true);
+        saBounds = sSpellMgr.GetSpellAreaForAreaMapBounds(area);
+        for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
+            itr->second->ApplyOrRemoveSpellIfCan(this, zone, area, true);
     }
+    saBounds = sSpellMgr.GetSpellAreaForAreaMapBounds(0);
+    for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
+        itr->second->ApplyOrRemoveSpellIfCan(this, zone, area, true);
 
     UpdateForQuestWorldObjects();
 }
@@ -14007,20 +14243,23 @@ void Player::IncompleteQuest(uint32 quest_id)
     {
         SetQuestStatus(quest_id, QUEST_STATUS_INCOMPLETE);
 
-        uint16 log_slot = FindQuestSlot( quest_id );
+        uint16 log_slot = FindQuestSlot(quest_id);
         if (log_slot < MAX_QUEST_LOG_SIZE)
             RemoveQuestSlotState(log_slot, QUEST_STATE_COMPLETE);
     }
 }
 
-void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver, bool announce)
+void Player::RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, bool announce)
 {
     uint32 quest_id = pQuest->GetQuestId();
 
     for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
     {
-        if (pQuest->ReqItemId[i])
-            DestroyItemCount(pQuest->ReqItemId[i], pQuest->ReqItemCount[i], true);
+        uint32 reqItemId = pQuest->ReqItemId[i];
+        uint32 reqItemCount = pQuest->ReqItemCount[i];
+
+        if (reqItemId && reqItemCount)
+            DestroyItemCount(reqItemId, reqItemCount, true);
     }
 
     for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
@@ -14036,7 +14275,7 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
     RemoveTimedQuest(quest_id);
 
     if (BattleGround* bg = GetBattleGround())
-        if (bg->GetTypeID() == BATTLEGROUND_AV)
+        if (bg->GetTypeID(true) == BATTLEGROUND_AV)
             ((BattleGroundAV*)bg)->HandleQuestComplete(pQuest->GetQuestId(), this);
 
     if (pQuest->GetRewChoiceItemsCount() > 0)
@@ -14046,7 +14285,7 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
             ItemPosCountVec dest;
             if (CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, pQuest->RewChoiceItemCount[reward]) == EQUIP_ERR_OK)
             {
-                Item* item = StoreNewItem( dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId));
+                Item* item = StoreNewItem(dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId));
                 SendNewItem(item, pQuest->RewChoiceItemCount[reward], true, false);
             }
         }
@@ -14054,14 +14293,14 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
 
     if (pQuest->GetRewItemsCount() > 0)
     {
-        for (uint32 i=0; i < pQuest->GetRewItemsCount(); ++i)
+        for (uint32 i = 0; i < pQuest->GetRewItemsCount(); ++i)
         {
             if (uint32 itemId = pQuest->RewItemId[i])
             {
                 ItemPosCountVec dest;
                 if (CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, pQuest->RewItemCount[i]) == EQUIP_ERR_OK)
                 {
-                    Item* item = StoreNewItem( dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId));
+                    Item* item = StoreNewItem(dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId));
                     SendNewItem(item, pQuest->RewItemCount[i], true, false);
                 }
             }
@@ -14072,7 +14311,7 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
 
     uint16 log_slot = FindQuestSlot(quest_id);
     if (log_slot < MAX_QUEST_LOG_SIZE)
-        SetQuestSlot(log_slot,0);
+        SetQuestSlot(log_slot, 0);
 
     QuestStatusData& q_status = mQuestStatus[quest_id];
 
@@ -14087,20 +14326,14 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
         if (pQuest->GetRewOrReqMoney() > 0)
         {
             ModifyMoney(pQuest->GetRewOrReqMoney());
-            GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD, pQuest->GetRewOrReqMoney());
+            GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD, uint32(pQuest->GetRewOrReqMoney()));
         }
     }
     else
     {
         // reward money for max level already included in pQuest->GetRewMoneyMaxLevel()
-        uint32 money = uint32(pQuest->GetRewMoneyMaxLevel() * sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_MONEY));
-
-        // reward money used if > xp replacement money
-        if (pQuest->GetRewOrReqMoney() > int32(money))
-            money = pQuest->GetRewOrReqMoney();
-
-        ModifyMoney(money);
-        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD, money);
+        ModifyMoney(int32(pQuest->GetRewMoneyMaxLevel()));
+        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD, pQuest->GetRewMoneyMaxLevel());
     }
 
     // req money case
@@ -14153,19 +14386,21 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
         SendQuestReward(pQuest, xp, questGiver);
 
     bool handled = false;
-
-    switch(questGiver->GetTypeId())
+    if (questGiver)
     {
-        case TYPEID_UNIT:
-            handled = sScriptMgr.OnQuestRewarded(this, (Creature*)questGiver, pQuest);
-            break;
-        case TYPEID_GAMEOBJECT:
-            handled = sScriptMgr.OnQuestRewarded(this, (GameObject*)questGiver, pQuest);
-            break;
+        switch (questGiver->GetTypeId())
+        {
+            case TYPEID_UNIT:
+                handled = sScriptMgr.OnQuestRewarded(this, (Creature*)questGiver, pQuest);
+                break;
+            case TYPEID_GAMEOBJECT:
+                handled = sScriptMgr.OnQuestRewarded(this, (GameObject*)questGiver, pQuest);
+                break;
+        }
     }
 
     if (!handled && pQuest->GetQuestCompleteScript() != 0)
-        GetMap()->ScriptsStart(sQuestEndScripts, pQuest->GetQuestCompleteScript(), questGiver, this);
+        GetMap()->ScriptsStart(sQuestEndScripts, pQuest->GetQuestCompleteScript(), questGiver, this, Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE);
 
     // cast spells after mark quest complete (some spells have quest completed state reqyurements in spell_area data)
     if (pQuest->GetRewSpellCast() > 0)
@@ -14179,32 +14414,22 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST_COUNT);
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST, pQuest->GetQuestId());
 
-    uint32 zone = 0;
-    uint32 area = 0;
-
     // remove auras from spells with quest reward state limitations
-    SpellAreaForQuestMapBounds saEndBounds = sSpellMgr.GetSpellAreaForQuestEndMapBounds(quest_id);
-    if (saEndBounds.first != saEndBounds.second)
-    {
-        GetZoneAndAreaId(zone,area);
-
-        for(SpellAreaForAreaMap::const_iterator itr = saEndBounds.first; itr != saEndBounds.second; ++itr)
-            if (!itr->second->IsFitToRequirements(this, zone, area))
-                RemoveAurasDueToSpell(itr->second->spellId);
-    }
-
     // Some spells applied at quest reward
-    SpellAreaForQuestMapBounds saBounds = sSpellMgr.GetSpellAreaForQuestMapBounds(quest_id, false);
-    if (saBounds.first != saBounds.second)
+    uint32 zone, area;
+    GetZoneAndAreaId(zone, area);
+    SpellAreaForAreaMapBounds saBounds = sSpellMgr.GetSpellAreaForAreaMapBounds(zone);
+    for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
+        itr->second->ApplyOrRemoveSpellIfCan(this, zone, area, false);
+    if (area != zone)
     {
-        if (!zone || !area)
-            GetZoneAndAreaId(zone, area);
-
-        for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
-            if (itr->second->autocast && itr->second->IsFitToRequirements(this, zone, area))
-                if (!HasAura(itr->second->spellId, EFFECT_INDEX_0))
-                    CastSpell(this, itr->second->spellId, true);
+        saBounds = sSpellMgr.GetSpellAreaForAreaMapBounds(area);
+        for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
+            itr->second->ApplyOrRemoveSpellIfCan(this, zone, area, false);
     }
+    saBounds = sSpellMgr.GetSpellAreaForAreaMapBounds(0);
+    for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
+        itr->second->ApplyOrRemoveSpellIfCan(this, zone, area, false);
 }
 
 void Player::FailQuest(uint32 questId)
@@ -14289,7 +14514,7 @@ bool Player::SatisfyQuestPreviousQuest(Quest const* qInfo, bool msg) const
     if (qInfo->prevQuests.empty())
         return true;
 
-    for(Quest::PrevQuests::const_iterator iter = qInfo->prevQuests.begin(); iter != qInfo->prevQuests.end(); ++iter)
+    for (Quest::PrevQuests::const_iterator iter = qInfo->prevQuests.begin(); iter != qInfo->prevQuests.end(); ++iter)
     {
         uint32 prevId = abs(*iter);
 
@@ -14311,7 +14536,7 @@ bool Player::SatisfyQuestPreviousQuest(Quest const* qInfo, bool msg) const
 
                 MANGOS_ASSERT(bounds.first != bounds.second); // always must be found if qPrevInfo->ExclusiveGroup != 0
 
-                for(ExclusiveQuestGroupsMap::const_iterator iter2 = bounds.first; iter2 != bounds.second; ++iter2)
+                for (ExclusiveQuestGroupsMap::const_iterator iter2 = bounds.first; iter2 != bounds.second; ++iter2)
                 {
                     uint32 exclude_Id = iter2->second;
 
@@ -14345,7 +14570,7 @@ bool Player::SatisfyQuestPreviousQuest(Quest const* qInfo, bool msg) const
 
                 MANGOS_ASSERT(bounds.first != bounds.second); // always must be found if qPrevInfo->ExclusiveGroup != 0
 
-                for(ExclusiveQuestGroupsMap::const_iterator iter2 = bounds.first; iter2 != bounds.second; ++iter2)
+                for (ExclusiveQuestGroupsMap::const_iterator iter2 = bounds.first; iter2 != bounds.second; ++iter2)
                 {
                     uint32 exclude_Id = iter2->second;
 
@@ -14413,7 +14638,7 @@ bool Player::SatisfyQuestRace(Quest const* qInfo, bool msg) const
 
 bool Player::SatisfyQuestReputation(Quest const* qInfo, bool msg) const
 {
-    uint32 fIdMin = qInfo->GetRequiredMinRepFaction();      //Min required rep
+    uint32 fIdMin = qInfo->GetRequiredMinRepFaction();      // Min required rep
     if (fIdMin && GetReputationMgr().GetReputation(fIdMin) < qInfo->GetRequiredMinRepValue())
     {
         if (msg)
@@ -14422,7 +14647,7 @@ bool Player::SatisfyQuestReputation(Quest const* qInfo, bool msg) const
         return false;
     }
 
-    uint32 fIdMax = qInfo->GetRequiredMaxRepFaction();      //Max required rep
+    uint32 fIdMax = qInfo->GetRequiredMaxRepFaction();      // Max required rep
     if (fIdMax && GetReputationMgr().GetReputation(fIdMax) >= qInfo->GetRequiredMaxRepValue())
     {
         if (msg)
@@ -14472,7 +14697,7 @@ bool Player::SatisfyQuestExclusiveGroup(Quest const* qInfo, bool msg) const
 
     MANGOS_ASSERT(bounds.first != bounds.second);           // must always be found if qInfo->ExclusiveGroup != 0
 
-    for(ExclusiveQuestGroupsMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+    for (ExclusiveQuestGroupsMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
     {
         uint32 exclude_Id = iter->second;
 
@@ -14524,7 +14749,7 @@ bool Player::SatisfyQuestNextChain(Quest const* qInfo, bool msg) const
 
     // check for all quests further up the chain
     // only necessary if there are quest chains with more than one quest that can be skipped
-    //return SatisfyQuestNextChain( qInfo->GetNextQuestInChain(), msg );
+    // return SatisfyQuestNextChain( qInfo->GetNextQuestInChain(), msg );
     return true;
 }
 
@@ -14534,7 +14759,7 @@ bool Player::SatisfyQuestPrevChain(Quest const* qInfo, bool msg) const
     if (qInfo->prevChainQuests.empty())
         return true;
 
-    for(Quest::PrevChainQuests::const_iterator iter = qInfo->prevChainQuests.begin(); iter != qInfo->prevChainQuests.end(); ++iter)
+    for (Quest::PrevChainQuests::const_iterator iter = qInfo->prevChainQuests.begin(); iter != qInfo->prevChainQuests.end(); ++iter)
     {
         uint32 prevId = *iter;
 
@@ -14549,7 +14774,7 @@ bool Player::SatisfyQuestPrevChain(Quest const* qInfo, bool msg) const
 
         // check for all quests further down the chain
         // only necessary if there are quest chains with more than one quest that can be skipped
-        //if( !SatisfyQuestPrevChain( prevId, msg ) )
+        //if (!SatisfyQuestPrevChain(prevId, msg))
         //    return false;
     }
 
@@ -14563,10 +14788,10 @@ bool Player::SatisfyQuestDay(Quest const* qInfo, bool msg) const
         return true;
 
     bool have_slot = false;
-    for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
+    for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
     {
-        uint32 id = GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx);
-        if (qInfo->GetQuestId()==id)
+        uint32 id = GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1 + quest_daily_idx);
+        if (qInfo->GetQuestId() == id)
             return false;
 
         if (!id)
@@ -14602,7 +14827,7 @@ bool Player::SatisfyQuestMonth(Quest const* qInfo, bool msg) const
     return m_monthlyquests.find(qInfo->GetQuestId()) == m_monthlyquests.end();
 }
 
-bool Player::CanGiveQuestSourceItemIfNeed( Quest const *pQuest, ItemPosCountVec* dest) const
+bool Player::CanGiveQuestSourceItemIfNeed(Quest const* pQuest, ItemPosCountVec* dest) const
 {
     if (uint32 srcitem = pQuest->GetSrcItemId())
     {
@@ -14619,55 +14844,54 @@ bool Player::CanGiveQuestSourceItemIfNeed( Quest const *pQuest, ItemPosCountVec*
         if (!dest)
         {
             ItemPosCountVec destTemp;
-            msg = CanStoreNewItem( NULL_BAG, NULL_SLOT, destTemp, srcitem, count );
+            msg = CanStoreNewItem(NULL_BAG, NULL_SLOT, destTemp, srcitem, count);
         }
         else
-            msg = CanStoreNewItem( NULL_BAG, NULL_SLOT, *dest, srcitem, count );
+            msg = CanStoreNewItem(NULL_BAG, NULL_SLOT, *dest, srcitem, count);
 
         if (msg == EQUIP_ERR_OK)
             return true;
         else
-            SendEquipError( msg, NULL, NULL, srcitem );
+            SendEquipError(msg, NULL, NULL, srcitem);
         return false;
     }
 
     return true;
 }
 
-void Player::GiveQuestSourceItemIfNeed(Quest const *pQuest)
+void Player::GiveQuestSourceItemIfNeed(Quest const* pQuest)
 {
     ItemPosCountVec dest;
     if (CanGiveQuestSourceItemIfNeed(pQuest, &dest) && !dest.empty())
     {
         uint32 count = 0;
-        for(ItemPosCountVec::const_iterator c_itr = dest.begin(); c_itr != dest.end(); ++c_itr)
+        for (ItemPosCountVec::const_iterator c_itr = dest.begin(); c_itr != dest.end(); ++c_itr)
             count += c_itr->count;
 
-        Item * item = StoreNewItem(dest, pQuest->GetSrcItemId(), true);
+        Item* item = StoreNewItem(dest, pQuest->GetSrcItemId(), true);
         SendNewItem(item, count, true, false);
     }
 }
 
-
-bool Player::TakeQuestSourceItem( uint32 quest_id, bool msg )
+bool Player::TakeQuestSourceItem(uint32 quest_id, bool msg)
 {
     Quest const* qInfo = sObjectMgr.GetQuestTemplate(quest_id);
-    if( qInfo )
+    if (qInfo)
     {
         uint32 srcitem = qInfo->GetSrcItemId();
-        if( srcitem > 0 )
+        if (srcitem > 0)
         {
             uint32 count = qInfo->GetSrcItemCount();
-            if( count <= 0 )
+            if (count <= 0)
                 count = 1;
 
             // exist one case when destroy source quest item not possible:
             // non un-equippable item (equipped non-empty bag, for example)
-            InventoryResult res = CanUnequipItems(srcitem,count);
-            if(res != EQUIP_ERR_OK)
+            InventoryResult res = CanUnequipItems(srcitem, count);
+            if (res != EQUIP_ERR_OK)
             {
-                if(msg)
-                    SendEquipError( res, NULL, NULL, srcitem );
+                if (msg)
+                    SendEquipError(res, NULL, NULL, srcitem);
                 return false;
             }
 
@@ -14677,15 +14901,15 @@ bool Player::TakeQuestSourceItem( uint32 quest_id, bool msg )
     return true;
 }
 
-bool Player::GetQuestRewardStatus( uint32 quest_id ) const
+bool Player::GetQuestRewardStatus(uint32 quest_id) const
 {
     Quest const* qInfo = sObjectMgr.GetQuestTemplate(quest_id);
-    if( qInfo )
+    if (qInfo)
     {
         // for repeatable quests: rewarded field is set after first reward only to prevent getting XP more than once
-        QuestStatusMap::const_iterator itr = mQuestStatus.find( quest_id );
-        if( itr != mQuestStatus.end() && itr->second.m_status != QUEST_STATUS_NONE
-            && !qInfo->IsRepeatable() )
+        QuestStatusMap::const_iterator itr = mQuestStatus.find(quest_id);
+        if (itr != mQuestStatus.end() && itr->second.m_status != QUEST_STATUS_NONE
+            && !qInfo->IsRepeatable())
             return itr->second.m_rewarded;
 
         return false;
@@ -14693,17 +14917,23 @@ bool Player::GetQuestRewardStatus( uint32 quest_id ) const
     return false;
 }
 
-QuestStatus Player::GetQuestStatus( uint32 quest_id ) const
+QuestStatus Player::GetQuestStatus(uint32 quest_id) const
 {
-    if( quest_id )
+    if (quest_id)
     {
-        QuestStatusMap::const_iterator itr = mQuestStatus.find( quest_id );
-        if( itr != mQuestStatus.end() )
+        QuestStatusMap::const_iterator itr = mQuestStatus.find(quest_id);
+        if (itr != mQuestStatus.end())
             return itr->second.m_status;
     }
     return QUEST_STATUS_NONE;
 }
 
+QuestStatusData* Player::GetQuestStatusData(uint32 questId)
+{
+    QuestStatusMap::iterator itr = mQuestStatus.find(questId);
+    return itr == mQuestStatus.end() ? NULL : &itr->second;
+}
+
 bool Player::CanShareQuest(uint32 quest_id) const
 {
     if (Quest const* qInfo = sObjectMgr.GetQuestTemplate(quest_id))
@@ -14732,24 +14962,24 @@ void Player::SetQuestStatus(uint32 quest_id, QuestStatus status)
 uint32 Player::GetReqKillOrCastCurrentCount(uint32 quest_id, int32 entry)
 {
     Quest const* qInfo = sObjectMgr.GetQuestTemplate(quest_id);
-    if( !qInfo )
+    if (!qInfo)
         return 0;
 
     for (int j = 0; j < QUEST_OBJECTIVES_COUNT; ++j)
-        if ( qInfo->ReqCreatureOrGOId[j] == entry )
+        if (qInfo->ReqCreatureOrGOId[j] == entry)
             return mQuestStatus[quest_id].m_creatureOrGOcount[j];
 
     return 0;
 }
 
-void Player::AdjustQuestReqItemCount( Quest const* pQuest, QuestStatusData& questStatusData )
+void Player::AdjustQuestReqItemCount(Quest const* pQuest, QuestStatusData& questStatusData)
 {
     if (pQuest->HasSpecialFlag(QUEST_SPECIAL_FLAG_DELIVER))
     {
-        for(int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
+        for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
         {
             uint32 reqitemcount = pQuest->ReqItemCount[i];
-            if( reqitemcount != 0 )
+            if (reqitemcount != 0)
             {
                 uint32 curitemcount = GetItemCount(pQuest->ReqItemId[i], true);
 
@@ -14760,25 +14990,25 @@ void Player::AdjustQuestReqItemCount( Quest const* pQuest, QuestStatusData& ques
     }
 }
 
-uint16 Player::FindQuestSlot( uint32 quest_id ) const
+uint16 Player::FindQuestSlot(uint32 quest_id) const
 {
-    for ( uint16 i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
-        if ( GetQuestSlotQuestId(i) == quest_id )
+    for (uint16 i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
+        if (GetQuestSlotQuestId(i) == quest_id)
             return i;
 
     return MAX_QUEST_LOG_SIZE;
 }
 
-void Player::AreaExploredOrEventHappens( uint32 questId )
+void Player::AreaExploredOrEventHappens(uint32 questId)
 {
-    if( questId )
+    if (questId)
     {
-        uint16 log_slot = FindQuestSlot( questId );
-        if( log_slot < MAX_QUEST_LOG_SIZE)
+        uint16 log_slot = FindQuestSlot(questId);
+        if (log_slot < MAX_QUEST_LOG_SIZE)
         {
             QuestStatusData& q_status = mQuestStatus[questId];
 
-            if(!q_status.m_explored)
+            if (!q_status.m_explored)
             {
                 SetQuestSlotState(log_slot, QUEST_STATE_COMPLETE);
                 SendQuestCompleteEvent(questId);
@@ -14788,22 +15018,24 @@ void Player::AreaExploredOrEventHappens( uint32 questId )
                     q_status.uState = QUEST_CHANGED;
             }
         }
-        if( CanCompleteQuest( questId ) )
-            CompleteQuest( questId );
+        if (CanCompleteQuest(questId))
+            CompleteQuest(questId);
     }
 }
 
-//not used in mangosd, function for external script library
-void Player::GroupEventHappens( uint32 questId, WorldObject const* pEventObject )
+// not used in mangosd, function for external script library
+void Player::GroupEventHappens(uint32 questId, WorldObject const* pEventObject)
 {
-    if( Group *pGroup = GetGroup() )
+    if (Group* pGroup = GetGroup())
     {
-        for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
-            Player *pGroupGuy = itr->getSource();
+            Player* pGroupGuy = itr->getSource();
+            if (!pGroupGuy)
+                continue;
 
             // for any leave or dead (with not released body) group member at appropriate distance
-            if( pGroupGuy && pGroupGuy->IsAtGroupRewardDistance(pEventObject) && !pGroupGuy->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST) )
+            if (pGroupGuy->IsAtGroupRewardDistance(pEventObject) && !pGroupGuy->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
                 pGroupGuy->AreaExploredOrEventHappens(questId);
         }
     }
@@ -14811,17 +15043,17 @@ void Player::GroupEventHappens( uint32 questId, WorldObject const* pEventObject
         AreaExploredOrEventHappens(questId);
 }
 
-void Player::ItemAddedQuestCheck( uint32 entry, uint32 count )
+void Player::ItemAddedQuestCheck(uint32 entry, uint32 count)
 {
-    for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
+    for (int i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
     {
         uint32 questid = GetQuestSlotQuestId(i);
-        if ( questid == 0 )
+        if (questid == 0)
             continue;
 
         QuestStatusData& q_status = mQuestStatus[questid];
 
-        if ( q_status.m_status != QUEST_STATUS_INCOMPLETE )
+        if (q_status.m_status != QUEST_STATUS_INCOMPLETE)
             continue;
 
         Quest const* qInfo = sObjectMgr.GetQuestTemplate(questid);
@@ -14831,19 +15063,19 @@ void Player::ItemAddedQuestCheck( uint32 entry, uint32 count )
         for (int j = 0; j < QUEST_ITEM_OBJECTIVES_COUNT; ++j)
         {
             uint32 reqitem = qInfo->ReqItemId[j];
-            if ( reqitem == entry )
+            if (reqitem == entry)
             {
                 uint32 reqitemcount = qInfo->ReqItemCount[j];
                 uint32 curitemcount = q_status.m_itemcount[j];
-                if ( curitemcount < reqitemcount )
+                if (curitemcount < reqitemcount)
                 {
-                    uint32 additemcount = ( curitemcount + count <= reqitemcount ? count : reqitemcount - curitemcount);
+                    uint32 additemcount = (curitemcount + count <= reqitemcount ? count : reqitemcount - curitemcount);
                     q_status.m_itemcount[j] += additemcount;
                     if (q_status.uState != QUEST_NEW)
                         q_status.uState = QUEST_CHANGED;
                 }
-                if ( CanCompleteQuest( questid ) )
-                    CompleteQuest( questid );
+                if (CanCompleteQuest(questid))
+                    CompleteQuest(questid);
                 return;
             }
         }
@@ -14851,15 +15083,15 @@ void Player::ItemAddedQuestCheck( uint32 entry, uint32 count )
     UpdateForQuestWorldObjects();
 }
 
-void Player::ItemRemovedQuestCheck( uint32 entry, uint32 count )
+void Player::ItemRemovedQuestCheck(uint32 entry, uint32 count)
 {
-    for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
+    for (int i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
     {
         uint32 questid = GetQuestSlotQuestId(i);
-        if(!questid)
+        if (!questid)
             continue;
         Quest const* qInfo = sObjectMgr.GetQuestTemplate(questid);
-        if ( !qInfo )
+        if (!qInfo)
             continue;
         if (!qInfo->HasSpecialFlag(QUEST_SPECIAL_FLAG_DELIVER))
             continue;
@@ -14867,23 +15099,23 @@ void Player::ItemRemovedQuestCheck( uint32 entry, uint32 count )
         for (int j = 0; j < QUEST_ITEM_OBJECTIVES_COUNT; ++j)
         {
             uint32 reqitem = qInfo->ReqItemId[j];
-            if ( reqitem == entry )
+            if (reqitem == entry)
             {
                 QuestStatusData& q_status = mQuestStatus[questid];
 
                 uint32 reqitemcount = qInfo->ReqItemCount[j];
                 uint32 curitemcount;
-                if( q_status.m_status != QUEST_STATUS_COMPLETE )
+                if (q_status.m_status != QUEST_STATUS_COMPLETE)
                     curitemcount = q_status.m_itemcount[j];
                 else
                     curitemcount = GetItemCount(entry, true);
-                if ( curitemcount < reqitemcount + count )
+                if (curitemcount < reqitemcount + count)
                 {
-                    uint32 remitemcount = ( curitemcount <= reqitemcount ? count : count + reqitemcount - curitemcount);
+                    uint32 remitemcount = (curitemcount <= reqitemcount ? count : count + reqitemcount - curitemcount);
                     q_status.m_itemcount[j] = curitemcount - remitemcount;
                     if (q_status.uState != QUEST_NEW) q_status.uState = QUEST_CHANGED;
 
-                    IncompleteQuest( questid );
+                    IncompleteQuest(questid);
                 }
                 return;
             }
@@ -14892,25 +15124,25 @@ void Player::ItemRemovedQuestCheck( uint32 entry, uint32 count )
     UpdateForQuestWorldObjects();
 }
 
-void Player::KilledMonster( CreatureInfo const* cInfo, ObjectGuid guid )
+void Player::KilledMonster(CreatureInfo const* cInfo, ObjectGuid guid)
 {
-    if(cInfo->Entry)
+    if (cInfo->Entry)
         KilledMonsterCredit(cInfo->Entry, guid);
 
-    for(int i = 0; i < MAX_KILL_CREDIT; ++i)
-        if(cInfo->KillCredit[i])
+    for (int i = 0; i < MAX_KILL_CREDIT; ++i)
+        if (cInfo->KillCredit[i])
             KilledMonsterCredit(cInfo->KillCredit[i], guid);
 }
 
-void Player::KilledMonsterCredit( uint32 entry, ObjectGuid guid )
+void Player::KilledMonsterCredit(uint32 entry, ObjectGuid guid)
 {
     uint32 addkillcount = 1;
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, entry, addkillcount);
 
-    for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
+    for (int i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
     {
         uint32 questid = GetQuestSlotQuestId(i);
-        if(!questid)
+        if (!questid)
             continue;
 
         Quest const* qInfo = sObjectMgr.GetQuestTemplate(questid);
@@ -14925,11 +15157,11 @@ void Player::KilledMonsterCredit( uint32 entry, ObjectGuid guid )
                 for (int j = 0; j < QUEST_OBJECTIVES_COUNT; ++j)
                 {
                     // skip GO activate objective or none
-                    if (qInfo->ReqCreatureOrGOId[j] <=0)
+                    if (qInfo->ReqCreatureOrGOId[j] <= 0)
                         continue;
 
                     // skip Cast at creature objective
-                    if (qInfo->ReqSpell[j] !=0 )
+                    if (qInfo->ReqSpell[j] != 0)
                         continue;
 
                     uint32 reqkill = qInfo->ReqCreatureOrGOId[j];
@@ -14944,11 +15176,11 @@ void Player::KilledMonsterCredit( uint32 entry, ObjectGuid guid )
                             if (q_status.uState != QUEST_NEW)
                                 q_status.uState = QUEST_CHANGED;
 
-                            SendQuestUpdateAddCreatureOrGo( qInfo, guid, j, q_status.m_creatureOrGOcount[j]);
+                            SendQuestUpdateAddCreatureOrGo(qInfo, guid, j, q_status.m_creatureOrGOcount[j]);
                         }
 
-                        if (CanCompleteQuest( questid ))
-                            CompleteQuest( questid );
+                        if (CanCompleteQuest(questid))
+                            CompleteQuest(questid);
 
                         // same objective target can be in many active quests, but not in 2 objectives for single quest (code optimization).
                         continue;
@@ -14959,12 +15191,12 @@ void Player::KilledMonsterCredit( uint32 entry, ObjectGuid guid )
     }
 }
 
-void Player::CastedCreatureOrGO( uint32 entry, ObjectGuid guid, uint32 spell_id, bool original_caster )
+void Player::CastedCreatureOrGO(uint32 entry, ObjectGuid guid, uint32 spell_id, bool original_caster)
 {
     bool isCreature = guid.IsCreatureOrVehicle();
 
     uint32 addCastCount = 1;
-    for(int i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
+    for (int i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
     {
         uint32 questid = GetQuestSlotQuestId(i);
         if (!questid)
@@ -15020,7 +15252,7 @@ void Player::CastedCreatureOrGO( uint32 entry, ObjectGuid guid, uint32 spell_id,
                 if (q_status.uState != QUEST_NEW)
                     q_status.uState = QUEST_CHANGED;
 
-                SendQuestUpdateAddCreatureOrGo( qInfo, guid, j, q_status.m_creatureOrGOcount[j]);
+                SendQuestUpdateAddCreatureOrGo(qInfo, guid, j, q_status.m_creatureOrGOcount[j]);
             }
 
             if (CanCompleteQuest(questid))
@@ -15032,52 +15264,52 @@ void Player::CastedCreatureOrGO( uint32 entry, ObjectGuid guid, uint32 spell_id,
     }
 }
 
-void Player::TalkedToCreature( uint32 entry, ObjectGuid guid )
+void Player::TalkedToCreature(uint32 entry, ObjectGuid guid)
 {
     uint32 addTalkCount = 1;
-    for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
+    for (int i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
     {
         uint32 questid = GetQuestSlotQuestId(i);
-        if(!questid)
+        if (!questid)
             continue;
 
         Quest const* qInfo = sObjectMgr.GetQuestTemplate(questid);
-        if ( !qInfo )
+        if (!qInfo)
             continue;
 
         QuestStatusData& q_status = mQuestStatus[questid];
 
-        if ( q_status.m_status == QUEST_STATUS_INCOMPLETE )
+        if (q_status.m_status == QUEST_STATUS_INCOMPLETE)
         {
             if (qInfo->HasSpecialFlag(QuestSpecialFlags(QUEST_SPECIAL_FLAG_KILL_OR_CAST | QUEST_SPECIAL_FLAG_SPEAKTO)))
             {
                 for (int j = 0; j < QUEST_OBJECTIVES_COUNT; ++j)
                 {
                                                             // skip spell casts and Gameobject objectives
-                    if(qInfo->ReqSpell[j] > 0 || qInfo->ReqCreatureOrGOId[j] < 0)
+                    if (qInfo->ReqSpell[j] > 0 || qInfo->ReqCreatureOrGOId[j] < 0)
                         continue;
 
                     uint32 reqTarget = 0;
 
-                    if(qInfo->ReqCreatureOrGOId[j] > 0)     // creature activate objectives
+                    if (qInfo->ReqCreatureOrGOId[j] > 0)     // creature activate objectives
                                                             // checked at quest_template loading
                         reqTarget = qInfo->ReqCreatureOrGOId[j];
                     else
                         continue;
 
-                    if ( reqTarget == entry )
+                    if (reqTarget == entry)
                     {
                         uint32 reqTalkCount = qInfo->ReqCreatureOrGOCount[j];
                         uint32 curTalkCount = q_status.m_creatureOrGOcount[j];
-                        if ( curTalkCount < reqTalkCount )
+                        if (curTalkCount < reqTalkCount)
                         {
                             q_status.m_creatureOrGOcount[j] = curTalkCount + addTalkCount;
                             if (q_status.uState != QUEST_NEW) q_status.uState = QUEST_CHANGED;
 
-                            SendQuestUpdateAddCreatureOrGo( qInfo, guid, j, q_status.m_creatureOrGOcount[j]);
+                            SendQuestUpdateAddCreatureOrGo(qInfo, guid, j, q_status.m_creatureOrGOcount[j]);
                         }
-                        if ( CanCompleteQuest( questid ) )
-                            CompleteQuest( questid );
+                        if (CanCompleteQuest(questid))
+                            CompleteQuest(questid);
 
                         // same objective target can be in many active quests, but not in 2 objectives for single quest (code optimization).
                         continue;
@@ -15088,57 +15320,57 @@ void Player::TalkedToCreature( uint32 entry, ObjectGuid guid )
     }
 }
 
-void Player::MoneyChanged( uint32 count )
+void Player::MoneyChanged(uint32 count)
 {
-    for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
+    for (int i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
     {
         uint32 questid = GetQuestSlotQuestId(i);
         if (!questid)
             continue;
 
         Quest const* qInfo = sObjectMgr.GetQuestTemplate(questid);
-        if( qInfo && qInfo->GetRewOrReqMoney() < 0 )
+        if (qInfo && qInfo->GetRewOrReqMoney() < 0)
         {
             QuestStatusData& q_status = mQuestStatus[questid];
 
-            if( q_status.m_status == QUEST_STATUS_INCOMPLETE )
+            if (q_status.m_status == QUEST_STATUS_INCOMPLETE)
             {
-                if(int32(count) >= -qInfo->GetRewOrReqMoney())
+                if (int32(count) >= -qInfo->GetRewOrReqMoney())
                 {
-                    if ( CanCompleteQuest( questid ) )
-                        CompleteQuest( questid );
+                    if (CanCompleteQuest(questid))
+                        CompleteQuest(questid);
                 }
             }
-            else if( q_status.m_status == QUEST_STATUS_COMPLETE )
+            else if (q_status.m_status == QUEST_STATUS_COMPLETE)
             {
-                if(int32(count) < -qInfo->GetRewOrReqMoney())
-                    IncompleteQuest( questid );
+                if (int32(count) < -qInfo->GetRewOrReqMoney())
+                    IncompleteQuest(questid);
             }
         }
     }
 }
 
-void Player::ReputationChanged(FactionEntry const* factionEntry )
+void Player::ReputationChanged(FactionEntry const* factionEntry)
 {
-    for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
+    for (int i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
     {
-        if(uint32 questid = GetQuestSlotQuestId(i))
+        if (uint32 questid = GetQuestSlotQuestId(i))
         {
-            if(Quest const* qInfo = sObjectMgr.GetQuestTemplate(questid))
+            if (Quest const* qInfo = sObjectMgr.GetQuestTemplate(questid))
             {
-                if(qInfo->GetRepObjectiveFaction() == factionEntry->ID )
+                if (qInfo->GetRepObjectiveFaction() == factionEntry->ID)
                 {
                     QuestStatusData& q_status = mQuestStatus[questid];
-                    if( q_status.m_status == QUEST_STATUS_INCOMPLETE )
+                    if (q_status.m_status == QUEST_STATUS_INCOMPLETE)
                     {
-                        if(GetReputationMgr().GetReputation(factionEntry) >= qInfo->GetRepObjectiveValue())
-                            if ( CanCompleteQuest( questid ) )
-                                CompleteQuest( questid );
+                        if (GetReputationMgr().GetReputation(factionEntry) >= qInfo->GetRepObjectiveValue())
+                            if (CanCompleteQuest(questid))
+                                CompleteQuest(questid);
                     }
-                    else if( q_status.m_status == QUEST_STATUS_COMPLETE )
+                    else if (q_status.m_status == QUEST_STATUS_COMPLETE)
                     {
-                        if(GetReputationMgr().GetReputation(factionEntry) < qInfo->GetRepObjectiveValue())
-                            IncompleteQuest( questid );
+                        if (GetReputationMgr().GetReputation(factionEntry) < qInfo->GetRepObjectiveValue())
+                            IncompleteQuest(questid);
                     }
                 }
             }
@@ -15146,16 +15378,16 @@ void Player::ReputationChanged(FactionEntry const* factionEntry )
     }
 }
 
-bool Player::HasQuestForItem( uint32 itemid ) const
+bool Player::HasQuestForItem(uint32 itemid) const
 {
-    for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
+    for (int i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
     {
         uint32 questid = GetQuestSlotQuestId(i);
-        if ( questid == 0 )
+        if (questid == 0)
             continue;
 
         QuestStatusMap::const_iterator qs_itr = mQuestStatus.find(questid);
-        if(qs_itr == mQuestStatus.end())
+        if (qs_itr == mQuestStatus.end())
             continue;
 
         QuestStatusData const& q_status = qs_itr->second;
@@ -15163,7 +15395,7 @@ bool Player::HasQuestForItem( uint32 itemid ) const
         if (q_status.m_status == QUEST_STATUS_INCOMPLETE)
         {
             Quest const* qinfo = sObjectMgr.GetQuestTemplate(questid);
-            if(!qinfo)
+            if (!qinfo)
                 continue;
 
             // hide quest if player is in raid-group and quest is no raid quest
@@ -15174,7 +15406,7 @@ bool Player::HasQuestForItem( uint32 itemid ) const
             // This part for ReqItem drop
             for (int j = 0; j < QUEST_ITEM_OBJECTIVES_COUNT; ++j)
             {
-                if(itemid == qinfo->ReqItemId[j] && q_status.m_itemcount[j] < qinfo->ReqItemCount[j] )
+                if (itemid == qinfo->ReqItemId[j] && q_status.m_itemcount[j] < qinfo->ReqItemCount[j])
                     return true;
             }
             // This part - for ReqSource
@@ -15183,18 +15415,19 @@ bool Player::HasQuestForItem( uint32 itemid ) const
                 // examined item is a source item
                 if (qinfo->ReqSourceId[j] == itemid)
                 {
-                    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(itemid);
+                    ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemid);
 
                     // 'unique' item
-                    if (pProto->MaxCount && (int32)GetItemCount(itemid,true) < pProto->MaxCount)
+                    if (pProto->MaxCount && (int32)GetItemCount(itemid, true) < pProto->MaxCount)
                         return true;
 
                     // allows custom amount drop when not 0
                     if (qinfo->ReqSourceCount[j])
                     {
-                        if (GetItemCount(itemid,true) < qinfo->ReqSourceCount[j])
+                        if (GetItemCount(itemid, true) < qinfo->ReqSourceCount[j])
                             return true;
-                    } else if ((int32)GetItemCount(itemid,true) < pProto->Stackable)
+                    }
+                    else if ((int32)GetItemCount(itemid, true) < pProto->Stackable)
                         return true;
                 }
             }
@@ -15215,14 +15448,14 @@ void Player::SendQuestCompleteEvent(uint32 quest_id)
     }
 }
 
-void Player::SendQuestReward( Quest const *pQuest, uint32 XP, Object * questGiver )
+void Player::SendQuestReward(Quest const* pQuest, uint32 XP, Object * questGiver)
 {
     uint32 questid = pQuest->GetQuestId();
-    DEBUG_LOG( "WORLD: Sent SMSG_QUESTGIVER_QUEST_COMPLETE quest = %u", questid );
-    WorldPacket data( SMSG_QUESTGIVER_QUEST_COMPLETE, (4+4+4+4+4) );
+    DEBUG_LOG("WORLD: Sent SMSG_QUESTGIVER_QUEST_COMPLETE quest = %u", questid);
+    WorldPacket data(SMSG_QUESTGIVER_QUEST_COMPLETE, (4+4+4+4+4));
     data << uint32(questid);
 
-    if ( getLevel() < sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL) )
+    if (getLevel() < sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
     {
         data << uint32(XP);
         data << uint32(pQuest->GetRewOrReqMoney());
@@ -15230,43 +15463,43 @@ void Player::SendQuestReward( Quest const *pQuest, uint32 XP, Object * questGive
     else
     {
         data << uint32(0);
-        data << uint32(pQuest->GetRewOrReqMoney() + int32(pQuest->GetRewMoneyMaxLevel() * sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_MONEY)));
+        data << uint32(pQuest->GetRewMoneyMaxLevel());
     }
 
-    data << uint32(10*MaNGOS::Honor::hk_honor_at_level(getLevel(), pQuest->GetRewHonorAddition()));
+    data << uint32(10 * MaNGOS::Honor::hk_honor_at_level(getLevel(), pQuest->GetRewHonorAddition()));
     data << uint32(pQuest->GetBonusTalents());              // bonus talents
     data << uint32(0);                                      // arena points
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
-void Player::SendQuestFailed( uint32 quest_id, InventoryResult reason)
+void Player::SendQuestFailed(uint32 quest_id, InventoryResult reason)
 {
-    if( quest_id )
+    if (quest_id)
     {
-        WorldPacket data( SMSG_QUESTGIVER_QUEST_FAILED, 4+4 );
+        WorldPacket data(SMSG_QUESTGIVER_QUEST_FAILED, 4 + 4);
         data << uint32(quest_id);
         data << uint32(reason);                             // failed reason (valid reasons: 4, 16, 50, 17, 74, other values show default message)
-        GetSession()->SendPacket( &data );
+        GetSession()->SendPacket(&data);
         DEBUG_LOG("WORLD: Sent SMSG_QUESTGIVER_QUEST_FAILED");
     }
 }
 
-void Player::SendQuestTimerFailed( uint32 quest_id )
+void Player::SendQuestTimerFailed(uint32 quest_id)
 {
-    if( quest_id )
+    if (quest_id)
     {
-        WorldPacket data( SMSG_QUESTUPDATE_FAILEDTIMER, 4 );
+        WorldPacket data(SMSG_QUESTUPDATE_FAILEDTIMER, 4);
         data << uint32(quest_id);
-        GetSession()->SendPacket( &data );
+        GetSession()->SendPacket(&data);
         DEBUG_LOG("WORLD: Sent SMSG_QUESTUPDATE_FAILEDTIMER");
     }
 }
 
-void Player::SendCanTakeQuestResponse( uint32 msg ) const
+void Player::SendCanTakeQuestResponse(uint32 msg) const
 {
-    WorldPacket data( SMSG_QUESTGIVER_QUEST_INVALID, 4 );
+    WorldPacket data(SMSG_QUESTGIVER_QUEST_INVALID, 4);
     data << uint32(msg);
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
     DEBUG_LOG("WORLD: Sent SMSG_QUESTGIVER_QUEST_INVALID");
 }
 
@@ -15288,19 +15521,19 @@ void Player::SendQuestConfirmAccept(const Quest* pQuest, Player* pReceiver)
     }
 }
 
-void Player::SendPushToPartyResponse( Player *pPlayer, uint32 msg )
+void Player::SendPushToPartyResponse(Player* pPlayer, uint32 msg)
 {
-    if( pPlayer )
+    if (pPlayer)
     {
-        WorldPacket data( MSG_QUEST_PUSH_RESULT, (8+1) );
+        WorldPacket data(MSG_QUEST_PUSH_RESULT, 8 + 1);
         data << pPlayer->GetObjectGuid();
         data << uint8(msg);                                 // valid values: 0-8
-        GetSession()->SendPacket( &data );
+        GetSession()->SendPacket(&data);
         DEBUG_LOG("WORLD: Sent MSG_QUEST_PUSH_RESULT");
     }
 }
 
-void Player::SendQuestUpdateAddCreatureOrGo( Quest const* pQuest, ObjectGuid guid, uint32 creatureOrGO_idx, uint32 count)
+void Player::SendQuestUpdateAddCreatureOrGo(Quest const* pQuest, ObjectGuid guid, uint32 creatureOrGO_idx, uint32 count)
 {
     MANGOS_ASSERT(count < 65536 && "mob/GO count store in 16 bits 2^16 = 65536 (0..65536)");
 
@@ -15309,8 +15542,8 @@ void Player::SendQuestUpdateAddCreatureOrGo( Quest const* pQuest, ObjectGuid gui
         // client expected gameobject template id in form (id|0x80000000)
         entry = (-entry) | 0x80000000;
 
-    WorldPacket data( SMSG_QUESTUPDATE_ADD_KILL, (4*4+8) );
-    DEBUG_LOG( "WORLD: Sent SMSG_QUESTUPDATE_ADD_KILL" );
+    WorldPacket data(SMSG_QUESTUPDATE_ADD_KILL, 4 * 4 + 8);
+    DEBUG_LOG("WORLD: Sent SMSG_QUESTUPDATE_ADD_KILL");
     data << uint32(pQuest->GetQuestId());
     data << uint32(entry);
     data << uint32(count);
@@ -15318,7 +15551,7 @@ void Player::SendQuestUpdateAddCreatureOrGo( Quest const* pQuest, ObjectGuid gui
     data << guid;
     GetSession()->SendPacket(&data);
 
-    uint16 log_slot = FindQuestSlot( pQuest->GetQuestId() );
+    uint16 log_slot = FindQuestSlot(pQuest->GetQuestId());
     if (log_slot < MAX_QUEST_LOG_SIZE)
         SetQuestSlotCounter(log_slot, creatureOrGO_idx, count);
 }
@@ -15329,21 +15562,22 @@ void Player::SendQuestUpdateAddCreatureOrGo( Quest const* pQuest, ObjectGuid gui
 
 void Player::_LoadDeclinedNames(QueryResult* result)
 {
-    if(!result)
+    if (!result)
         return;
 
-    if(m_declinedname)
+    if (m_declinedname)
         delete m_declinedname;
 
     m_declinedname = new DeclinedName;
-    Field *fields = result->Fetch();
-    for(int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
+
+    Field* fields = result->Fetch();
+    for (int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
         m_declinedname->name[i] = fields[i].GetCppString();
 
     delete result;
 }
 
-void Player::_LoadArenaTeamInfo(QueryResult *result)
+void Player::_LoadArenaTeamInfo(QueryResult* result)
 {
     // arenateamid, played_week, played_season, personal_rating
     memset((void*)&m_uint32Values[PLAYER_FIELD_ARENA_TEAM_INFO_1_1], 0, sizeof(uint32) * MAX_ARENA_SLOT * ARENA_TEAM_END);
@@ -15352,7 +15586,7 @@ void Player::_LoadArenaTeamInfo(QueryResult *result)
 
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
 
         uint32 arenateamid     = fields[0].GetUInt32();
         uint32 played_week     = fields[1].GetUInt32();
@@ -15361,7 +15595,7 @@ void Player::_LoadArenaTeamInfo(QueryResult *result)
         uint32 personal_rating = fields[4].GetUInt32();
 
         ArenaTeam* aTeam = sObjectMgr.GetArenaTeamById(arenateamid);
-        if(!aTeam)
+        if (!aTeam)
         {
             sLog.outError("Player::_LoadArenaTeamInfo: couldn't load arenateam %u", arenateamid);
             continue;
@@ -15380,7 +15614,7 @@ void Player::_LoadArenaTeamInfo(QueryResult *result)
     delete result;
 }
 
-void Player::_LoadEquipmentSets(QueryResult *result)
+void Player::_LoadEquipmentSets(QueryResult* result)
 {
     // SetPQuery(PLAYER_LOGIN_QUERY_LOADEQUIPMENTSETS,   "SELECT setguid, setindex, name, iconname, ignore_mask, item0, item1, item2, item3, item4, item5, item6, item7, item8, item9, item10, item11, item12, item13, item14, item15, item16, item17, item18 FROM character_equipmentsets WHERE guid = '%u' ORDER BY setindex", GUID_LOPART(m_guid));
     if (!result)
@@ -15389,7 +15623,7 @@ void Player::_LoadEquipmentSets(QueryResult *result)
     uint32 count = 0;
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
 
         EquipmentSet eqSet;
 
@@ -15400,16 +15634,17 @@ void Player::_LoadEquipmentSets(QueryResult *result)
         eqSet.IgnoreMask    = fields[4].GetUInt32();
         eqSet.state         = EQUIPMENT_SET_UNCHANGED;
 
-        for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
-            eqSet.Items[i] = fields[5+i].GetUInt32();
+        for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
+            eqSet.Items[i] = fields[5 + i].GetUInt32();
 
         m_EquipmentSets[index] = eqSet;
 
         ++count;
 
-        if(count >= MAX_EQUIPMENT_SET_INDEX)                // client limit
+        if (count >= MAX_EQUIPMENT_SET_INDEX)               // client limit
             break;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 }
 
@@ -15419,7 +15654,7 @@ void Player::_LoadBGData(QueryResult* result)
         return;
 
     // Expecting only one row
-    Field *fields = result->Fetch();
+    Field* fields = result->Fetch();
     /* bgInstanceID, bgTeam, x, y, z, o, map, taxi[0], taxi[1], mountSpell */
     m_bgData.bgInstanceID = fields[0].GetUInt32();
     m_bgData.bgTeam       = Team(fields[1].GetUInt32());
@@ -15437,11 +15672,11 @@ void Player::_LoadBGData(QueryResult* result)
 
 bool Player::LoadPositionFromDB(ObjectGuid guid, uint32& mapid, float& x, float& y, float& z, float& o, bool& in_flight)
 {
-    QueryResult *result = CharacterDatabase.PQuery("SELECT position_x,position_y,position_z,orientation,map,taxi_path FROM characters WHERE guid = '%u'", guid.GetCounter());
-    if(!result)
+    QueryResult* result = CharacterDatabase.PQuery("SELECT position_x, position_y, position_z, orientation, map, taxi_path FROM characters WHERE guid = %u", guid.GetCounter());
+    if (!result)
         return false;
 
-    Field *fields = result->Fetch();
+    Field* fields = result->Fetch();
 
     x = fields[0].GetFloat();
     y = fields[1].GetFloat();
@@ -15456,23 +15691,19 @@ bool Player::LoadPositionFromDB(ObjectGuid guid, uint32& mapid, float& x, float&
 
 void Player::_LoadIntoDataField(const char* data, uint32 startOffset, uint32 count)
 {
-    if(!data)
+    if (!data)
         return;
 
-    Tokens tokens = StrSplit(data, " ");
+    Tokens tokens(data, ' ', count);
 
-    if(tokens.size() != count)
+    if (tokens.size() != count)
         return;
 
-    Tokens::iterator iter;
-    uint32 index;
-    for (iter = tokens.begin(), index = 0; index < count; ++iter, ++index)
-    {
-        m_uint32Values[startOffset + index] = atol((*iter).c_str());
-    }
+    for (uint32 index = 0; index < count; ++index)
+        m_uint32Values[startOffset + index] = atol(tokens[index]);
 }
 
-bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
+bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder* holder)
 {
     //       0     1        2     3     4      5       6      7   8      9            10            11
     //SELECT guid, account, name, race, class, gender, level, xp, money, playerBytes, playerBytes2, playerFlags,"
@@ -15482,23 +15713,23 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
     //"resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, dungeon_difficulty,"
     // 39           40                41                42                    43          44          45              46           47               48              49
     //"arenaPoints, totalHonorPoints, todayHonorPoints, yesterdayHonorPoints, totalKills, todayKills, yesterdayKills, chosenTitle, knownCurrencies, watchedFaction, drunk,"
-    // 50      51      52      53      54      55      56      57      58         59          60             61              62      63           64
-    //"health, power1, power2, power3, power4, power5, power6, power7, specCount, activeSpec, exploredZones, equipmentCache, ammoId, knownTitles, actionBars  FROM characters WHERE guid = '%u'", GUID_LOPART(m_guid));
-    QueryResult *result = holder->GetResult(PLAYER_LOGIN_QUERY_LOADFROM);
+    // 50      51      52      53      54      55      56      57      58         59          60             61              62      63           64          65
+    //"health, power1, power2, power3, power4, power5, power6, power7, specCount, activeSpec, exploredZones, equipmentCache, ammoId, knownTitles, actionBars, grantableLevels  FROM characters WHERE guid = '%u'", GUID_LOPART(m_guid));
+    QueryResult* result = holder->GetResult(PLAYER_LOGIN_QUERY_LOADFROM);
 
-    if(!result)
+    if (!result)
     {
         sLog.outError("%s not found in table `characters`, can't load. ", guid.GetString().c_str());
         return false;
     }
 
-    Field *fields = result->Fetch();
+    Field* fields = result->Fetch();
 
     uint32 dbAccountId = fields[1].GetUInt32();
 
     // check if the character's account in the db and the logged in account match.
     // player should be able to load/delete character only with correct account!
-    if( dbAccountId != GetSession()->GetAccountId() )
+    if (dbAccountId != GetSession()->GetAccountId())
     {
         sLog.outError("%s loading from wrong account (is: %u, should be: %u)",
             guid.GetString().c_str(), GetSession()->GetAccountId(), dbAccountId);
@@ -15506,7 +15737,7 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
         return false;
     }
 
-    Object::_Create(guid.GetCounter(), 0, HIGHGUID_PLAYER );
+    Object::_Create(guid);
 
     m_name = fields[2].GetCppString();
 
@@ -15515,13 +15746,22 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
         (GetSession()->GetSecurity() == SEC_PLAYER && sObjectMgr.IsReservedName(m_name)))
     {
         delete result;
-        CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid ='%u'",
+        CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | %u WHERE guid = %u",
             uint32(AT_LOGIN_RENAME), guid.GetCounter());
         return false;
     }
 
-    // overwrite possible wrong/corrupted guid
-    SetGuidValue(OBJECT_FIELD_GUID, guid);
+    m_atLoginFlags = fields[33].GetUInt32();
+
+    if (HasAtLoginFlag(AT_LOGIN_RENAME))
+    {
+        delete result;
+        sLog.outError("Player::LoadFromDB: %s tried to login while forced to rename, can't load.", GetGuidStr().c_str());
+        return false;
+    }
+
+    // overwrite possible wrong/corrupted guid
+    SetGuidValue(OBJECT_FIELD_GUID, guid);
 
     // overwrite some data fields
     SetByteValue(UNIT_FIELD_BYTES_0,0,fields[3].GetUInt8());// race
@@ -15545,16 +15785,15 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
     m_achievementMgr.LoadFromDB(holder->GetResult(PLAYER_LOGIN_QUERY_LOADACHIEVEMENTS), holder->GetResult(PLAYER_LOGIN_QUERY_LOADCRITERIAPROGRESS));
 
     uint32 money = fields[8].GetUInt32();
-    if(money > MAX_MONEY_AMOUNT)
+    if (money > MAX_MONEY_AMOUNT)
         money = MAX_MONEY_AMOUNT;
     SetMoney(money);
 
     SetUInt32Value(PLAYER_BYTES, fields[9].GetUInt32());
     SetUInt32Value(PLAYER_BYTES_2, fields[10].GetUInt32());
 
-    m_drunk = fields[49].GetUInt16();
-
-    SetUInt16Value(PLAYER_BYTES_3, 0, (m_drunk & 0xFFFE) | gender);
+    SetByteValue(PLAYER_BYTES_3, 0, gender);
+    SetByteValue(PLAYER_BYTES_3, 1, fields[49].GetUInt8());
 
     SetUInt32Value(PLAYER_FLAGS, fields[11].GetUInt32());
     SetInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, fields[48].GetInt32());
@@ -15567,7 +15806,7 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
     SetByteValue(PLAYER_FIELD_BYTES, 2, fields[64].GetUInt8());
 
     // cleanup inventory related item value fields (its will be filled correctly in _LoadInventory)
-    for(uint8 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot)
+    for (uint8 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot)
     {
         SetGuidValue(PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), ObjectGuid());
         SetVisibleItemSlot(slot, NULL);
@@ -15582,13 +15821,13 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
     DEBUG_FILTER_LOG(LOG_FILTER_PLAYER_STATS, "Load Basic value of player %s is: ", m_name.c_str());
     outDebugStatsValues();
 
-    //Need to call it to initialize m_team (m_team can be calculated from race)
-    //Other way is to saves m_team into characters table.
+    // Need to call it to initialize m_team (m_team can be calculated from race)
+    // Other way is to saves m_team into characters table.
     setFactionForRace(getRace());
     SetCharm(NULL);
 
     // load home bind and check in same time class/race pair, it used later for restore broken positions
-    if(!_LoadHomeBind(holder->GetResult(PLAYER_LOGIN_QUERY_LOADHOMEBIND)))
+    if (!_LoadHomeBind(holder->GetResult(PLAYER_LOGIN_QUERY_LOADHOMEBIND)))
     {
         delete result;
         return false;
@@ -15598,13 +15837,18 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
 
     // init saved position, and fix it later if problematic
     uint32 transGUID = fields[30].GetUInt32();
-    Relocate(fields[12].GetFloat(),fields[13].GetFloat(),fields[14].GetFloat(),fields[16].GetFloat());
-    SetLocationMapId(fields[15].GetUInt32());
+    // Relocate(fields[12].GetFloat(),fields[13].GetFloat(),fields[14].GetFloat(),fields[16].GetFloat());
+    // SetLocationMapId(fields[15].GetUInt32());
+
+    WorldLocation savedLocation = WorldLocation(fields[15].GetUInt32(),fields[12].GetFloat(),fields[13].GetFloat(),fields[14].GetFloat(),fields[16].GetFloat());
+
+    m_Difficulty = fields[38].GetUInt32();                  // may be changed in _LoadGroup
+
+    if (GetDungeonDifficulty() >= MAX_DUNGEON_DIFFICULTY)
+        SetDungeonDifficulty(DUNGEON_DIFFICULTY_NORMAL);
 
-    uint32 difficulty = fields[38].GetUInt32();
-    if(difficulty >= MAX_DUNGEON_DIFFICULTY)
-        difficulty = DUNGEON_DIFFICULTY_NORMAL;
-    SetDungeonDifficulty(Difficulty(difficulty));           // may be changed in _LoadGroup
+    if (GetRaidDifficulty() >= MAX_RAID_DIFFICULTY)
+        SetRaidDifficulty(RAID_DIFFICULTY_10MAN_NORMAL);
 
     _LoadGroup(holder->GetResult(PLAYER_LOGIN_QUERY_LOADGROUP));
 
@@ -15613,7 +15857,7 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
     SetArenaPoints(fields[39].GetUInt32());
 
     // check arena teams integrity
-    for(uint32 arena_slot = 0; arena_slot < MAX_ARENA_SLOT; ++arena_slot)
+    for (uint32 arena_slot = 0; arena_slot < MAX_ARENA_SLOT; ++arena_slot)
     {
         uint32 arena_team_id = GetArenaTeamId(arena_slot);
         if (!arena_team_id)
@@ -15624,7 +15868,7 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
                 continue;
 
         // arena team not exist or not member, cleanup fields
-        for(int j = 0; j < ARENA_TEAM_END; ++j)
+        for (int j = 0; j < ARENA_TEAM_END; ++j)
             SetArenaTeamInfoField(arena_slot, ArenaTeamInfoType(j), 0);
     }
 
@@ -15638,24 +15882,42 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
 
     _LoadBoundInstances(holder->GetResult(PLAYER_LOGIN_QUERY_LOADBOUNDINSTANCES));
 
-    if (!IsPositionValid())
-    {
-        sLog.outError("%s have invalid coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",
-            guid.GetString().c_str(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
+    MapEntry const* mapEntry = sMapStore.LookupEntry(savedLocation.GetMapId());
+
+    if (!mapEntry || !MapManager::IsValidMapCoord(savedLocation) ||
+        // client without expansion support
+        GetSession()->Expansion() < mapEntry->Expansion())
+    {
+        sLog.outError("Player::LoadFromDB: %s have invalid coordinates (map: %u X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",
+            guid.GetString().c_str(),
+            savedLocation.GetMapId(),
+            savedLocation.x,
+            savedLocation.y,
+            savedLocation.z,
+            savedLocation.orientation);
         RelocateToHomebind();
 
+        savedLocation = GetPosition();                          // reset saved position to homebind
+
         transGUID = 0;
 
         m_movementInfo.ClearTransportData();
+        ClearTransportData();
     }
 
     _LoadBGData(holder->GetResult(PLAYER_LOGIN_QUERY_LOADBGDATA));
 
+    bool player_at_bg = false;
+
+    // player bounded instance saves loaded in _LoadBoundInstances, group versions at group loading
+    DungeonPersistentState* state = GetBoundInstanceSaveForSelfOrGroup(savedLocation.GetMapId());
+//    Map* targetMap = sMapMgr.FindMap(savedLocation.GetMapId(), state ? state->GetInstanceId() : 0);
+
     if (m_bgData.bgInstanceID)                              //saved in BattleGround
     {
-        BattleGround *currentBg = sBattleGroundMgr.GetBattleGround(m_bgData.bgInstanceID, BATTLEGROUND_TYPE_NONE);
+        BattleGround* currentBg = sBattleGroundMgr.GetBattleGround(m_bgData.bgInstanceID, BATTLEGROUND_TYPE_NONE);
 
-        bool player_at_bg = currentBg && currentBg->IsPlayerInBattleGround(GetObjectGuid());
+        player_at_bg = currentBg && currentBg->IsPlayerInBattleGround(GetObjectGuid());
 
         if (player_at_bg && currentBg->GetStatus() != STATUS_WAIT_LEAVE)
         {
@@ -15664,127 +15926,149 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
 
             m_bgData.bgTypeID = currentBg->GetTypeID();     // bg data not marked as modified
 
-            //join player to battleground group
+            // join player to battleground group
             currentBg->EventPlayerLoggedIn(this, GetObjectGuid());
             currentBg->AddOrSetPlayerToCorrectBgGroup(this, GetObjectGuid(), m_bgData.bgTeam);
 
-            SetInviteForBattleGroundQueueType(bgQueueTypeId,currentBg->GetInstanceID());
+            SetInviteForBattleGroundQueueType(bgQueueTypeId, currentBg->GetInstanceID());
+
+            SetLocationMapId(savedLocation.GetMapId());
+            Relocate(savedLocation);
         }
         else
         {
-            // leave bg
-            if (player_at_bg)
+            if (player_at_bg) // if player at bg and bg status is STATUS_WAIT_LEAVE
+            {
                 currentBg->RemovePlayerAtLeave(GetObjectGuid(), false, true);
+                player_at_bg = false;
+            }
 
             // move to bg enter point
             const WorldLocation& _loc = GetBattleGroundEntryPoint();
-            SetLocationMapId(_loc.mapid);
-            Relocate(_loc.coord_x, _loc.coord_y, _loc.coord_z, _loc.orientation);
+            SetLocationMapId(_loc.GetMapId());
+            Relocate(_loc);
 
             // We are not in BG anymore
             SetBattleGroundId(0, BATTLEGROUND_TYPE_NONE);
             // remove outdated DB data in DB
-            _SaveBGData();
+            _SaveBGData(true);
         }
     }
     else
     {
-        MapEntry const* mapEntry = sMapStore.LookupEntry(GetMapId());
+        mapEntry = sMapStore.LookupEntry(savedLocation.GetMapId());
         // if server restart after player save in BG or area
         // player can have current coordinates in to BG/Arena map, fix this
-        if(!mapEntry || mapEntry->IsBattleGroundOrArena())
+        if (mapEntry->IsBattleGroundOrArena())
         {
             const WorldLocation& _loc = GetBattleGroundEntryPoint();
-            SetLocationMapId(_loc.mapid);
-            Relocate(_loc.coord_x, _loc.coord_y, _loc.coord_z, _loc.orientation);
+            if (!MapManager::IsValidMapCoord(_loc))
+            {
+                RelocateToHomebind();
+                transGUID = 0;
+                m_movementInfo.ClearTransportData();
+            }
+            else
+            {
+                SetLocationMapId(_loc.GetMapId());
+                Relocate(_loc);
+            }
 
             // We are not in BG anymore
             SetBattleGroundId(0, BATTLEGROUND_TYPE_NONE);
             // remove outdated DB data in DB
-            _SaveBGData();
+            _SaveBGData(true);
         }
-    }
-
-    if (transGUID != 0)
-    {
-        m_movementInfo.SetTransportData(ObjectGuid(HIGHGUID_MO_TRANSPORT,transGUID), fields[26].GetFloat(), fields[27].GetFloat(), fields[28].GetFloat(), fields[29].GetFloat(), 0, -1);
-
-        if( !MaNGOS::IsValidMapCoord(
-            GetPositionX() + m_movementInfo.GetTransportPos()->x, GetPositionY() + m_movementInfo.GetTransportPos()->y,
-            GetPositionZ() + m_movementInfo.GetTransportPos()->z, GetOrientation() + m_movementInfo.GetTransportPos()->o) ||
-            // transport size limited
-            m_movementInfo.GetTransportPos()->x > 50 || m_movementInfo.GetTransportPos()->y > 50 || m_movementInfo.GetTransportPos()->z > 50 )
+        // Cleanup LFG BG data, if char not in dungeon.
+        else if (!mapEntry->IsDungeon())
         {
-            sLog.outError("%s have invalid transport coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",
-                guid.GetString().c_str(), GetPositionX() + m_movementInfo.GetTransportPos()->x, GetPositionY() + m_movementInfo.GetTransportPos()->y,
-                GetPositionZ() + m_movementInfo.GetTransportPos()->z, GetOrientation() + m_movementInfo.GetTransportPos()->o);
-
-            RelocateToHomebind();
-
-            m_movementInfo.ClearTransportData();
+            _SaveBGData(true);
+            // Saved location checked before
+            SetLocationMapId(savedLocation.GetMapId());
+            Relocate(savedLocation);
+        }
+        else if (mapEntry->IsDungeon())
+        {
+            AreaTrigger const* at = sObjectMgr.GetMapEntranceTrigger(savedLocation.GetMapId());
 
-            transGUID = 0;
+            if (at)
+            {
+                if (state && time(NULL) - time_t(fields[22].GetUInt64()) < 30)
+                {
+                    SetLocationMapId(savedLocation.GetMapId());
+                    Relocate(savedLocation);
+                }
+                else
+                {
+                    SetLocationMapId(at->loc.GetMapId());
+                    Relocate(at->loc);
+                }
+            }
+            else
+            {
+                sLog.outError("Player::LoadFromDB %s logged in to a reset instance (map: %u, difficulty %u) and there is no area-trigger leading to this map. Thus he can't be ported back to the entrance. This _might_ be an exploit attempt.", GetObjectGuid().GetString().c_str(), savedLocation.GetMapId(), GetDifficulty());
+                transGUID = 0;
+                m_movementInfo.ClearTransportData();
+                RelocateToHomebind();
+            }
         }
     }
 
     if (transGUID != 0)
     {
-        for (MapManager::TransportSet::const_iterator iter = sMapMgr.m_Transports.begin(); iter != sMapMgr.m_Transports.end(); ++iter)
+        ObjectGuid transportGuid = ObjectGuid(HIGHGUID_MO_TRANSPORT,transGUID);
+        Transport* transport = sObjectMgr.GetTransportByGuid(transportGuid);
+
+        if (transport)
         {
-            if( (*iter)->GetGUIDLow() == transGUID)
+            MapEntry const* transMapEntry = sMapStore.LookupEntry(transport->GetMapId());
+            // client without expansion support
+            if (GetSession()->Expansion() < transMapEntry->Expansion())
             {
-                MapEntry const* transMapEntry = sMapStore.LookupEntry((*iter)->GetMapId());
-                // client without expansion support
-                if(GetSession()->Expansion() < transMapEntry->Expansion())
-                {
-                    DEBUG_LOG("Player %s using client without required expansion tried login at transport at non accessible map %u", GetName(), (*iter)->GetMapId());
-                    break;
-                }
+                DEBUG_LOG("Player %s using client without required expansion tried login at transport at non accessible map %u", GetName(), transport->GetMapId());
+            }
+            else
+            {
+                Relocate(transport->GetPosition());
+                SetLocationMapId(transport->GetMapId());
+                // AddPassenger not used, becoze need add passenger in correct position on transport
+                Position t_pos = Position(fields[26].GetFloat(), fields[27].GetFloat(), fields[28].GetFloat(), fields[29].GetFloat());
+                transport->AddPassenger(this, t_pos);
+            }
 
-                m_transport = *iter;
-                m_transport->AddPassenger(this);
-                SetLocationMapId(m_transport->GetMapId());
-                break;
+            if (!MaNGOS::IsValidMapCoord(
+                GetPositionX() + m_movementInfo.GetTransportPos()->x, GetPositionY() + m_movementInfo.GetTransportPos()->y,
+                GetPositionZ() + m_movementInfo.GetTransportPos()->z, GetOrientation() + m_movementInfo.GetTransportPos()->o) ||
+                // transport size limited
+                m_movementInfo.GetTransportPos()->x > 50 || m_movementInfo.GetTransportPos()->y > 50 || m_movementInfo.GetTransportPos()->z > 50)
+            {
+                sLog.outError("%s have invalid transport coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",
+                    guid.GetString().c_str(), GetPositionX() + m_movementInfo.GetTransportPos()->x, GetPositionY() + m_movementInfo.GetTransportPos()->y,
+                    GetPositionZ() + m_movementInfo.GetTransportPos()->z, GetOrientation() + m_movementInfo.GetTransportPos()->o);
+
+                transport->RemovePassenger(this);
             }
         }
 
-        if(!m_transport)
+        if (!IsOnTransport())
         {
             sLog.outError("%s have problems with transport guid (%u). Teleport to default race/class locations.",
                 guid.GetString().c_str(), transGUID);
 
-            RelocateToHomebind();
-
+            ClearTransportData();
             m_movementInfo.ClearTransportData();
-
             transGUID = 0;
-        }
-    }
-    else                                                    // not transport case
-    {
-        MapEntry const* mapEntry = sMapStore.LookupEntry(GetMapId());
-        // client without expansion support
-        if(GetSession()->Expansion() < mapEntry->Expansion())
-        {
-            DEBUG_LOG("Player %s using client without required expansion tried login at non accessible map %u", GetName(), GetMapId());
             RelocateToHomebind();
         }
     }
 
-    // player bounded instance saves loaded in _LoadBoundInstances, group versions at group loading
-    DungeonPersistentState* state = GetBoundInstanceSaveForSelfOrGroup(GetMapId());
-
     // load the player's map here if it's not already loaded
-    SetMap(sMapMgr.CreateMap(GetMapId(), this));
-
-    // if the player is in an instance and it has been reset in the meantime teleport him to the entrance
-    if(GetInstanceId() && !state)
+    if (!GetMap())
     {
-        AreaTrigger const* at = sObjectMgr.GetMapEntranceTrigger(GetMapId());
-        if(at)
-            Relocate(at->target_X, at->target_Y, at->target_Z, at->target_Orientation);
+        if (Map* map = sMapMgr.CreateMap(GetMapId(), this))
+            SetMap(map);
         else
-            sLog.outError("Player %s(GUID: %u) logged in to a reset instance (map: %u) and there is no area-trigger leading to this map. Thus he can't be ported back to the entrance. This _might_ be an exploit attempt.", GetName(), GetGUIDLow(), GetMapId());
+            RelocateToHomebind();
     }
 
     SaveRecallPosition();
@@ -15797,47 +16081,43 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
 
     // set value, including drunk invisibility detection
     // calculate sobering. after 15 minutes logged out, the player will be sober again
-    float soberFactor;
-    if(time_diff > 15*MINUTE)
-        soberFactor = 0;
-    else
-        soberFactor = 1-time_diff/(15.0f*MINUTE);
-    uint16 newDrunkenValue = uint16(soberFactor* m_drunk);
-    SetDrunkValue(newDrunkenValue);
+    uint8 newDrunkValue = 0;
+    if (time_diff < uint32(GetDrunkValue()) * 9)
+        newDrunkValue = GetDrunkValue() - time_diff / 9;
+
+    SetDrunkValue(newDrunkValue);
 
     m_cinematic = fields[18].GetUInt32();
-    m_Played_time[PLAYED_TIME_TOTAL]= fields[19].GetUInt32();
-    m_Played_time[PLAYED_TIME_LEVEL]= fields[20].GetUInt32();
+    m_Played_time[PLAYED_TIME_TOTAL] = fields[19].GetUInt32();
+    m_Played_time[PLAYED_TIME_LEVEL] = fields[20].GetUInt32();
 
     m_resetTalentsCost = fields[24].GetUInt32();
     m_resetTalentsTime = time_t(fields[25].GetUInt64());
 
     // reserve some flags
-    uint32 old_safe_flags = GetUInt32Value(PLAYER_FLAGS) & ( PLAYER_FLAGS_HIDE_CLOAK | PLAYER_FLAGS_HIDE_HELM );
+    uint32 old_safe_flags = GetUInt32Value(PLAYER_FLAGS) & (PLAYER_FLAGS_HIDE_CLOAK | PLAYER_FLAGS_HIDE_HELM);
 
-    if( HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM) )
+    if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM))
         SetUInt32Value(PLAYER_FLAGS, 0 | old_safe_flags);
 
-    m_taxi.LoadTaxiMask( fields[17].GetString() );          // must be before InitTaxiNodesForLevel
+    m_taxi.LoadTaxiMask(fields[17].GetString());          // must be before InitTaxiNodesForLevel
 
     uint32 extraflags = fields[31].GetUInt32();
 
     m_stableSlots = fields[32].GetUInt32();
-    if(m_stableSlots > MAX_PET_STABLES)
+    if (m_stableSlots > MAX_PET_STABLES)
     {
-        sLog.outError("Player can have not more %u stable slots, but have in DB %u",MAX_PET_STABLES,uint32(m_stableSlots));
+        sLog.outError("Player can have not more %u stable slots, but have in DB %u", MAX_PET_STABLES, uint32(m_stableSlots));
         m_stableSlots = MAX_PET_STABLES;
     }
 
-    m_atLoginFlags = fields[33].GetUInt32();
-
     // Honor system
     // Update Honor kills data
     m_lastHonorUpdateTime = logoutTime;
     UpdateHonorFields();
 
     m_deathExpireTime = (time_t)fields[36].GetUInt64();
-    if(m_deathExpireTime > now+MAX_DEATH_COUNT*DEATH_EXPIRE_STEP)
+    if (m_deathExpireTime > now+MAX_DEATH_COUNT*DEATH_EXPIRE_STEP)
         m_deathExpireTime = now+MAX_DEATH_COUNT*DEATH_EXPIRE_STEP-1;
 
     std::string taxi_nodes = fields[37].GetCppString();
@@ -15857,8 +16137,8 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
     // reset some aura modifiers before aura apply
 
     SetGuidValue(PLAYER_FARSIGHT, ObjectGuid());
-    SetUInt32Value(PLAYER_TRACK_CREATURES, 0 );
-    SetUInt32Value(PLAYER_TRACK_RESOURCES, 0 );
+    SetUInt32Value(PLAYER_TRACK_CREATURES, 0);
+    SetUInt32Value(PLAYER_TRACK_RESOURCES, 0);
 
     // cleanup aura list explicitly before skill load where some spells can be applied
     RemoveAllAuras();
@@ -15905,13 +16185,24 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
     m_specsCount = fields[58].GetUInt8();
     m_activeSpec = fields[59].GetUInt8();
 
+    m_GrantableLevelsCount = fields[65].GetUInt32();
+
+    // refer-a-friend flag - maybe wrong and hacky
+    LoadAccountLinkedState();
+    if (GetAccountLinkedState() != STATE_NOT_LINKED)
+        SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_REFER_A_FRIEND);
+
+    // set grant flag
+    if (m_GrantableLevelsCount > 0)
+        SetByteValue(PLAYER_FIELD_BYTES, 1, 0x01);
+
     _LoadGlyphs(holder->GetResult(PLAYER_LOGIN_QUERY_LOADGLYPHS));
 
     _LoadAuras(holder->GetResult(PLAYER_LOGIN_QUERY_LOADAURAS), time_diff);
     ApplyGlyphs(true);
 
     // add ghost flag (must be after aura load: PLAYER_FLAGS_GHOST set in aura)
-    if( HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST) )
+    if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
         m_deathState = DEAD;
 
     _LoadSpells(holder->GetResult(PLAYER_LOGIN_QUERY_LOADSPELLS));
@@ -15922,6 +16213,8 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
     _LoadWeeklyQuestStatus(holder->GetResult(PLAYER_LOGIN_QUERY_LOADWEEKLYQUESTSTATUS));
     _LoadMonthlyQuestStatus(holder->GetResult(PLAYER_LOGIN_QUERY_LOADMONTHLYQUESTSTATUS));
 
+    _LoadRandomBGStatus(holder->GetResult(PLAYER_LOGIN_QUERY_LOADRANDOMBG));
+
     _LoadTalents(holder->GetResult(PLAYER_LOGIN_QUERY_LOADTALENTS));
 
     // after spell and quest load
@@ -15953,8 +16246,11 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
     if (m_bgData.HasTaxiPath())
     {
         m_taxi.ClearTaxiDestinations();
-        for (int i = 0; i < 2; ++i)
-            m_taxi.AddTaxiDestination(m_bgData.taxiPath[i]);
+        if (!player_at_bg)
+        {
+            for (int i = 0; i < 2; ++i)
+                m_taxi.AddTaxiDestination(m_bgData.taxiPath[i]);
+        }
     }
     else if (!m_taxi.LoadTaxiDestinationsFromString(taxi_nodes, GetTeam()))
     {
@@ -15971,28 +16267,27 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
         else                                                // have start node, to it
         {
             sLog.outError("Character %u have too short taxi destination list, teleport to original node.",GetGUIDLow());
-            SetLocationMapId(nodeEntry->map_id);
-            Relocate(nodeEntry->x, nodeEntry->y, nodeEntry->z,0.0f);
+            Relocate(WorldLocation(nodeEntry->map_id, nodeEntry->x, nodeEntry->y, nodeEntry->z, 0.0f, GetPhaseMask()));
         }
 
         //we can be relocated from taxi and still have an outdated Map pointer!
         //so we need to get a new Map pointer!
-        SetMap(sMapMgr.CreateMap(GetMapId(), this));
+        if (Map* map = sMapMgr.CreateMap(GetMapId(), this))
+            SetMap(map);
+        else
+            RelocateToHomebind();
+
         SaveRecallPosition();                           // save as recall also to prevent recall and fall from sky
 
         m_taxi.ClearTaxiDestinations();
     }
 
-    if(uint32 node_id = m_taxi.GetTaxiSource())
+    if (uint32 node_id = m_taxi.GetTaxiSource())
     {
         // save source node as recall coord to prevent recall and fall from sky
         TaxiNodesEntry const* nodeEntry = sTaxiNodesStore.LookupEntry(node_id);
         MANGOS_ASSERT(nodeEntry);                           // checked in m_taxi.LoadTaxiDestinationsFromString
-        m_recallMap = nodeEntry->map_id;
-        m_recallX = nodeEntry->x;
-        m_recallY = nodeEntry->y;
-        m_recallZ = nodeEntry->z;
-
+        m_recall = WorldLocation(nodeEntry->map_id, nodeEntry->x, nodeEntry->y, nodeEntry->z);
         // flight will started later
     }
 
@@ -16003,7 +16298,7 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
 
     // Spell code allow apply any auras to dead character in load time in aura/spell/item loading
     // Do now before stats re-calculation cleanup for ghost state unexpected auras
-    if(!isAlive())
+    if (!isAlive())
         RemoveAllAurasOnDeath();
 
     //apply all stat bonuses from items and auras
@@ -16013,10 +16308,10 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
     // restore remembered power/health values (but not more max values)
     uint32 savedhealth = fields[50].GetUInt32();
     SetHealth(savedhealth > GetMaxHealth() ? GetMaxHealth() : savedhealth);
-    for(uint32 i = 0; i < MAX_POWERS; ++i)
+    for (uint32 i = 0; i < MAX_POWERS; ++i)
     {
         uint32 savedpower = fields[51+i].GetUInt32();
-        SetPower(Powers(i),savedpower > GetMaxPower(Powers(i)) ? GetMaxPower(Powers(i)) : savedpower);
+        SetPower(Powers(i), savedpower > GetMaxPower(Powers(i)) ? GetMaxPower(Powers(i)) : savedpower);
     }
 
     DEBUG_FILTER_LOG(LOG_FILTER_PLAYER_STATS, "The value of player %s after load item and aura is: ", m_name.c_str());
@@ -16026,59 +16321,59 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
     delete result;
 
     // GM state
-    if(GetSession()->GetSecurity() > SEC_PLAYER)
+    if (GetSession()->GetSecurity() > SEC_PLAYER)
     {
-        switch(sWorld.getConfig(CONFIG_UINT32_GM_LOGIN_STATE))
+        switch (sWorld.getConfig(CONFIG_UINT32_GM_LOGIN_STATE))
         {
             default:
             case 0:                      break;             // disable
             case 1: SetGameMaster(true); break;             // enable
             case 2:                                         // save state
-                if(extraflags & PLAYER_EXTRA_GM_ON)
+                if (extraflags & PLAYER_EXTRA_GM_ON)
                     SetGameMaster(true);
                 break;
         }
 
-        switch(sWorld.getConfig(CONFIG_UINT32_GM_VISIBLE_STATE))
+        switch (sWorld.getConfig(CONFIG_UINT32_GM_VISIBLE_STATE))
         {
             default:
             case 0: SetGMVisible(false); break;             // invisible
             case 1:                      break;             // visible
             case 2:                                         // save state
-                if(extraflags & PLAYER_EXTRA_GM_INVISIBLE)
+                if (extraflags & PLAYER_EXTRA_GM_INVISIBLE)
                     SetGMVisible(false);
                 break;
         }
 
-        switch(sWorld.getConfig(CONFIG_UINT32_GM_ACCEPT_TICKETS))
+        switch (sWorld.getConfig(CONFIG_UINT32_GM_ACCEPT_TICKETS))
         {
             default:
             case 0:                        break;           // disable
             case 1: SetAcceptTicket(true); break;           // enable
             case 2:                                         // save state
-            if(extraflags & PLAYER_EXTRA_GM_ACCEPT_TICKETS)
+            if (extraflags & PLAYER_EXTRA_GM_ACCEPT_TICKETS)
                 SetAcceptTicket(true);
             break;
         }
 
-        switch(sWorld.getConfig(CONFIG_UINT32_GM_CHAT))
+        switch (sWorld.getConfig(CONFIG_UINT32_GM_CHAT))
         {
             default:
             case 0:                  break;                 // disable
             case 1: SetGMChat(true); break;                 // enable
             case 2:                                         // save state
-                if(extraflags & PLAYER_EXTRA_GM_CHAT)
+                if (extraflags & PLAYER_EXTRA_GM_CHAT)
                     SetGMChat(true);
                 break;
         }
 
-        switch(sWorld.getConfig(CONFIG_UINT32_GM_WISPERING_TO))
+        switch (sWorld.getConfig(CONFIG_UINT32_GM_WISPERING_TO))
         {
             default:
             case 0:                          break;         // disable
             case 1: SetAcceptWhispers(true); break;         // enable
             case 2:                                         // save state
-                if(extraflags & PLAYER_EXTRA_ACCEPT_WHISPERS)
+                if (extraflags & PLAYER_EXTRA_ACCEPT_WHISPERS)
                     SetAcceptWhispers(true);
                 break;
         }
@@ -16090,6 +16385,12 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
 
     _LoadEquipmentSets(holder->GetResult(PLAYER_LOGIN_QUERY_LOADEQUIPMENTSETS));
 
+    sLFGMgr.CreateLFGState(GetObjectGuid());
+    if (!GetGroup() || !GetGroup()->isLFDGroup())
+    {
+        sLFGMgr.RemoveMemberFromLFDGroup(GetGroup(),GetObjectGuid());
+    }
+
     return true;
 }
 
@@ -16119,51 +16420,51 @@ bool Player::isAllowedToLoot(Creature* creature)
         return !creature->HasLootRecipient();
 }
 
-void Player::_LoadActions(QueryResult *result)
+void Player::_LoadActions(QueryResult* result)
 {
-    for(int i = 0; i < MAX_TALENT_SPEC_COUNT; ++i)
+    for (int i = 0; i < MAX_TALENT_SPEC_COUNT; ++i)
         m_actionButtons[i].clear();
 
     //QueryResult *result = CharacterDatabase.PQuery("SELECT spec, button,action,type FROM character_action WHERE guid = '%u' ORDER BY button",GetGUIDLow());
 
-    if(result)
+    if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             uint8 spec = fields[0].GetUInt8();
             uint8 button = fields[1].GetUInt8();
             uint32 action = fields[2].GetUInt32();
             uint8 type = fields[3].GetUInt8();
 
-            if(ActionButton* ab = addActionButton(spec, button, action, type))
+            if (ActionButton* ab = addActionButton(spec, button, action, type))
                 ab->uState = ACTIONBUTTON_UNCHANGED;
             else
             {
-                sLog.outError( "  ...at loading, and will deleted in DB also");
+                sLog.outError("  ...at loading, and will deleted in DB also");
 
                 // Will deleted in DB at next save (it can create data until save but marked as deleted)
                 m_actionButtons[spec][button].uState = ACTIONBUTTON_DELETED;
             }
         }
-        while( result->NextRow() );
+        while (result->NextRow());
 
         delete result;
     }
 }
 
-void Player::_LoadAuras(QueryResult *result, uint32 timediff)
+void Player::_LoadAuras(QueryResult* result, uint32 timediff)
 {
     //RemoveAllAuras(); -- some spells casted before aura load, for example in LoadSkills, aura list explicitly cleaned early
 
     //QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid,item_guid,spell,stackcount,remaincharges,basepoints0,basepoints1,basepoints2,periodictime0,periodictime1,periodictime2,maxduration,remaintime,effIndexMask FROM character_aura WHERE guid = '%u'",GetGUIDLow());
 
-    if(result)
+    if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             ObjectGuid caster_guid = ObjectGuid(fields[0].GetUInt64());
             uint32 item_lowguid = fields[1].GetUInt32();
             uint32 spellid = fields[2].GetUInt32();
@@ -16189,6 +16490,12 @@ void Player::_LoadAuras(QueryResult *result, uint32 timediff)
                 continue;
             }
 
+            if (caster_guid.IsEmpty() || !caster_guid.IsUnit())
+            {
+                sLog.outError("Player::LoadAuras Unknown caster %lu, ignore.",fields[0].GetUInt64());
+                continue;
+            }
+
             if (remaintime != -1 && !IsPositiveSpell(spellproto))
             {
                 if (remaintime/IN_MILLISECONDS <= int32(timediff))
@@ -16208,7 +16515,7 @@ void Player::_LoadAuras(QueryResult *result, uint32 timediff)
             else if (!stackcount)
                 stackcount = 1;
 
-            SpellAuraHolder *holder = CreateSpellAuraHolder(spellproto, this, NULL);
+            SpellAuraHolderPtr holder = CreateSpellAuraHolder(spellproto, this, NULL);
             holder->SetLoadedState(caster_guid, ObjectGuid(HIGHGUID_ITEM, item_lowguid), stackcount, remaincharges, maxduration, remaintime);
 
             for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
@@ -16216,37 +16523,35 @@ void Player::_LoadAuras(QueryResult *result, uint32 timediff)
                 if ((effIndexMask & (1 << i)) == 0)
                     continue;
 
-                Aura* aura = CreateAura(spellproto, SpellEffectIndex(i), NULL, holder, this);
+                Aura* aura = holder->CreateAura(spellproto, SpellEffectIndex(i), NULL, holder, this, NULL, NULL);
+
                 if (!damage[i])
                     damage[i] = aura->GetModifier()->m_amount;
 
                 aura->SetLoadedState(damage[i], periodicTime[i]);
-                holder->AddAura(aura, SpellEffectIndex(i));
             }
 
             if (!holder->IsEmptyHolder())
             {
                 // reset stolen single target auras
-                if (caster_guid != GetObjectGuid() && holder->IsSingleTarget())
-                    holder->SetIsSingleTarget(false);
+                if (caster_guid != GetObjectGuid() && holder->GetTrackedAuraType() == TRACK_AURA_TYPE_SINGLE_TARGET)
+                    holder->SetTrackedAuraType(TRACK_AURA_TYPE_NOT_TRACKED);
 
                 AddSpellAuraHolder(holder);
                 DETAIL_LOG("Added auras from spellid %u", spellproto->Id);
             }
-            else
-                delete holder;
         }
-        while( result->NextRow() );
+        while(result->NextRow());
         delete result;
     }
 
-    if(getClass() == CLASS_WARRIOR && !HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
-        CastSpell(this,SPELL_ID_PASSIVE_BATTLE_STANCE,true);
+    if (getClass() == CLASS_WARRIOR && !HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
+        CastSpell(this, SPELL_ID_PASSIVE_BATTLE_STANCE, true);
 }
 
 void Player::_LoadGlyphs(QueryResult *result)
 {
-    if(!result)
+    if (!result)
         return;
 
     //         0     1     2
@@ -16254,26 +16559,26 @@ void Player::_LoadGlyphs(QueryResult *result)
 
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         uint8 spec = fields[0].GetUInt8();
         uint8 slot = fields[1].GetUInt8();
         uint32 glyph = fields[2].GetUInt32();
 
-        GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph);
-        if(!gp)
+        GlyphPropertiesEntry const* gp = sGlyphPropertiesStore.LookupEntry(glyph);
+        if (!gp)
         {
             sLog.outError("Player %s has not existing glyph entry %u on index %u, spec %u", m_name.c_str(), glyph, slot, spec);
             continue;
         }
 
-        GlyphSlotEntry const *gs = sGlyphSlotStore.LookupEntry(GetGlyphSlot(slot));
+        GlyphSlotEntry const* gs = sGlyphSlotStore.LookupEntry(GetGlyphSlot(slot));
         if (!gs)
         {
             sLog.outError("Player %s has not existing glyph slot entry %u on index %u, spec %u", m_name.c_str(), GetGlyphSlot(slot), slot, spec);
             continue;
         }
 
-        if(gp->TypeFlags != gs->TypeFlags)
+        if (gp->TypeFlags != gs->TypeFlags)
         {
             sLog.outError("Player %s has glyph with typeflags %u in slot with typeflags %u, removing.", m_name.c_str(), gp->TypeFlags, gs->TypeFlags);
             continue;
@@ -16281,229 +16586,244 @@ void Player::_LoadGlyphs(QueryResult *result)
 
         m_glyphs[spec][slot].id = glyph;
 
-    } while( result->NextRow() );
-
+    }
+    while (result->NextRow());
     delete result;
-
-
 }
 
 void Player::LoadCorpse()
 {
-    if( isAlive() )
+    if (isAlive())
     {
         sObjectAccessor.ConvertCorpseForPlayer(GetObjectGuid());
     }
     else
     {
-        if(Corpse *corpse = GetCorpse())
+        if (Corpse* corpse = GetCorpse())
         {
-            ApplyModByteFlag(PLAYER_FIELD_BYTES, 0, PLAYER_FIELD_BYTE_RELEASE_TIMER, corpse && !sMapStore.LookupEntry(corpse->GetMapId())->Instanceable() );
+            ApplyModByteFlag(PLAYER_FIELD_BYTES, 0, PLAYER_FIELD_BYTE_RELEASE_TIMER, corpse && !sMapStore.LookupEntry(corpse->GetMapId())->Instanceable());
         }
         else
         {
-            //Prevent Dead Player login without corpse
-            ResurrectPlayer(0.5f);
+            // Prevent Dead Player login without corpse
+            ResurrectPlayer(50);
         }
     }
 }
 
-void Player::_LoadInventory(QueryResult *result, uint32 timediff)
+void Player::_LoadInventory(QueryResult* result, uint32 timediff)
 {
-    //QueryResult *result = CharacterDatabase.PQuery("SELECT data,text,bag,slot,item,item_template FROM character_inventory JOIN item_instance ON character_inventory.item = item_instance.guid WHERE character_inventory.guid = '%u' ORDER BY bag,slot", GetGUIDLow());
-    std::map<uint32, Bag*> bagMap;                          // fast guid lookup for bags
-    //NOTE: the "order by `bag`" is important because it makes sure
-    //the bagMap is filled before items in the bags are loaded
-    //NOTE2: the "order by `slot`" is needed because mainhand weapons are (wrongly?)
-    //expected to be equipped before offhand items (TODO: fixme)
+    // QueryResult *result = CharacterDatabase.PQuery("SELECT data,text,bag,slot,item,item_template FROM character_inventory JOIN item_instance ON character_inventory.item = item_instance.guid WHERE character_inventory.guid = '%u' ORDER BY bag,slot", GetGUIDLow());
+    // NOTE: the "order by `bag`" is important because it makes sure
+    // the bagMap is filled before items in the bags are loaded
+    // NOTE2: the "order by `slot`" is needed because mainhand weapons are (wrongly?)
+    // expected to be equipped before offhand items (TODO: fixme)
+    if (!result)
+    {
+        _ApplyAllItemMods();
+        return;
+    }
 
-    uint32 zone = GetZoneId();
+    std::map<uint32, Bag*> bagMap;                          // fast guid lookup for bags
+    std::list<Item*> problematicItems;
+    std::list<Item*> problematicArenaItems;
 
-    if (result)
+    // prevent items from being added to the queue when stored
+    m_itemUpdateQueueBlocked = true;
+    do
     {
-        std::list<Item*> problematicItems;
+        Field* fields      = result->Fetch();
+        uint32 itemLowGuid = fields[4].GetUInt32();
+        uint32 itemId      = fields[5].GetUInt32();
 
-        // prevent items from being added to the queue when stored
-        m_itemUpdateQueueBlocked = true;
-        do
+        ItemPrototype const* proto = ObjectMgr::GetItemPrototype(itemId);
+        if (!proto)
         {
-            Field *fields = result->Fetch();
-            uint32 bag_guid  = fields[2].GetUInt32();
-            uint8  slot      = fields[3].GetUInt8();
-            uint32 item_lowguid = fields[4].GetUInt32();
-            uint32 item_id   = fields[5].GetUInt32();
-
-            ItemPrototype const * proto = ObjectMgr::GetItemPrototype(item_id);
-
-            if (!proto)
-            {
-                CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_lowguid);
-                CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid = '%u'", item_lowguid);
-                sLog.outError( "Player::_LoadInventory: Player %s has an unknown item (id: #%u) in inventory, deleted.", GetName(),item_id );
-                continue;
-            }
+            sLog.outError("Player::_LoadInventory: %s has an unknown item (GUID: %u, Entry: %u) in inventory, deleted.", GetGuidStr().c_str(), itemLowGuid, itemId);
+            Item::DeleteFromInventoryDB(itemLowGuid);
+            Item::DeleteFromDB(itemLowGuid);
+            continue;
+        }
 
-            Item *item = NewItemOrBag(proto);
+        bool removeItem = false;
 
-            if (!item->LoadFromDB(item_lowguid, fields, GetObjectGuid()))
-            {
-                sLog.outError( "Player::_LoadInventory: Player %s has broken item (id: #%u) in inventory, deleted.", GetName(),item_id );
-                CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_lowguid);
-                item->FSetState(ITEM_REMOVED);
-                item->SaveToDB();                           // it also deletes item object !
-                continue;
-            }
+        Item* item = NewItemOrBag(proto);
+        if (!item->LoadFromDB(itemLowGuid, fields, GetObjectGuid()))
+        {
+            sLog.outError("Player::_LoadInventory: %s has broken item (GUID: %u, Entry: %u) in inventory, deleted.", GetGuidStr().c_str(), itemLowGuid, itemId);
+            removeItem = true;
+        }
+        // Not allow have in alive state item limited to another map/zone
+        else if (isAlive() && item->IsLimitedToAnotherMapOrZone(GetMapId(), GetZoneId()))
+        {
+            sLog.outError("Player::_LoadInventory: %s has item (GUID: %u, Entry: %u) limited to another map (%u) or zone (%u), deleted.", GetGuidStr().c_str(), itemLowGuid, itemId, GetMapId(), GetZoneId());
+            removeItem = true;
+        }
+        // "Conjured items disappear if you are logged out for more than 15 minutes"
+        else if ((proto->Flags & ITEM_FLAG_CONJURED) && timediff > 15 * MINUTE)
+        {
+            DEBUG_LOG("Player::_LoadInventory: %s has conjured item (GUID: %u, Entry: %u) with expired lifetime (15 minutes), deleted.", GetGuidStr().c_str(), itemLowGuid, itemId);
+            removeItem = true;
+        }
+        // Delete items from not active holiday
+        else if (proto->HolidayId && !IsHolidayActive(HolidayIds(proto->HolidayId)))
+        {
+            DEBUG_LOG("Player::_LoadInventory: %s has item (GUID: %u, Entry: %u) with not active HolidayId (%u), deleted.", GetGuidStr().c_str(), itemId, itemLowGuid, proto->HolidayId);
+            removeItem = true;
+        }
 
-            // not allow have in alive state item limited to another map/zone
-            if (isAlive() && item->IsLimitedToAnotherMapOrZone(GetMapId(),zone))
+        if (!removeItem)
+        {
+            if (item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE))
             {
-                CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_lowguid);
-                item->FSetState(ITEM_REMOVED);
-                item->SaveToDB();                           // it also deletes item object !
-                continue;
+                if (!item->LoadRefundDataFromDB(this))
+                    DEBUG_LOG("Player::_LoadInventory: %s has item (GUID: %u, Entry: %u) with refundable flags, but without data in item_refund_instance, remove flag.", GetGuidStr().c_str(), itemLowGuid, itemId);
             }
-
-            // "Conjured items disappear if you are logged out for more than 15 minutes"
-            if (timediff > 15*MINUTE && (item->GetProto()->Flags & ITEM_FLAG_CONJURED))
+            else if (item->HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE))
             {
-                CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_lowguid);
-                item->FSetState(ITEM_REMOVED);
-                item->SaveToDB();                           // it also deletes item object !
-                continue;
+                if (!item->LoadSoulboundTradeableDataFromDB(this))
+                    DEBUG_LOG("Player::_LoadInventory: %s has item (GUID: %u, Entry: %u) with soulbound tradeable flag, but without data in item_soulbound_trade_data, remove flag.", GetGuidStr().c_str(), itemLowGuid, itemId);
             }
+		}
+        else
+        {
+            item->DeleteFromInventoryDB();
+            item->FSetState(ITEM_REMOVED);
+            item->SaveToDB();                           // It also deletes item object!
+            continue;
+        }
 
-            bool success = true;
+        uint32 bagLowGuid = fields[2].GetUInt32();
+        uint8  slot       = fields[3].GetUInt8();
 
-            // the item/bag is not in a bag
-            if (!bag_guid)
-            {
-                item->SetContainer( NULL );
-                item->SetSlot(slot);
+        bool success = true;
 
-                if (IsInventoryPos( INVENTORY_SLOT_BAG_0, slot))
-                {
-                    ItemPosCountVec dest;
-                    if (CanStoreItem( INVENTORY_SLOT_BAG_0, slot, dest, item, false) == EQUIP_ERR_OK)
-                        item = StoreItem(dest, item, true);
-                    else
-                        success = false;
-                }
-                else if (IsEquipmentPos( INVENTORY_SLOT_BAG_0, slot))
-                {
-                    uint16 dest;
-                    if (CanEquipItem( slot, dest, item, false, false ) == EQUIP_ERR_OK)
-                        QuickEquipItem(dest, item);
-                    else
-                        success = false;
-                }
-                else if (IsBankPos( INVENTORY_SLOT_BAG_0, slot))
-                {
-                    ItemPosCountVec dest;
-                    if (CanBankItem( INVENTORY_SLOT_BAG_0, slot, dest, item, false, false ) == EQUIP_ERR_OK)
-                        item = BankItem(dest, item, true);
-                    else
-                        success = false;
-                }
+        // the item/bag is not in a bag
+        if (!bagLowGuid)
+        {
+            item->SetContainer(NULL);
+            item->SetSlot(slot);
 
-                if (success)
-                {
-                    // store bags that may contain items in them
-                    if (item->IsBag() && IsBagPos(item->GetPos()))
-                        bagMap[item_lowguid] = (Bag*)item;
-                }
+            if (IsInventoryPos(INVENTORY_SLOT_BAG_0, slot))
+            {
+                ItemPosCountVec dest;
+                if (CanStoreItem(INVENTORY_SLOT_BAG_0, slot, dest, item, false) == EQUIP_ERR_OK)
+                    item = StoreItem(dest, item, true);
+                else
+                    success = false;
             }
-            // the item/bag in a bag
-            else
+            else if (IsEquipmentPos(INVENTORY_SLOT_BAG_0, slot))
             {
-                item->SetSlot(NULL_SLOT);
-                // the item is in a bag, find the bag
-                std::map<uint32, Bag*>::const_iterator itr = bagMap.find(bag_guid);
-                if (itr != bagMap.end() && slot < itr->second->GetBagSize())
-                {
-                    ItemPosCountVec dest;
-                    if (CanStoreItem(itr->second->GetSlot(), slot, dest, item, false) == EQUIP_ERR_OK)
-                        item = StoreItem(dest, item, true);
-                    else
-                        success = false;
-                }
+                uint16 dest;
+                if (CanEquipItem(slot, dest, item, false, false) == EQUIP_ERR_OK)
+                    QuickEquipItem(dest, item);
+                else
+                    success = false;
+            }
+            else if (IsBankPos(INVENTORY_SLOT_BAG_0, slot))
+            {
+                ItemPosCountVec dest;
+                if (CanBankItem(INVENTORY_SLOT_BAG_0, slot, dest, item, false, false) == EQUIP_ERR_OK)
+                    item = BankItem(dest, item, true);
                 else
                     success = false;
             }
 
-            // item's state may have changed after stored
             if (success)
             {
-                item->SetState(ITEM_UNCHANGED, this);
-
-                // restore container unchanged state also
-                if (item->GetContainer())
-                    item->GetContainer()->SetState(ITEM_UNCHANGED, this);
-
-                // recharged mana gem
-                if (timediff > 15*MINUTE && proto->ItemLimitCategory ==ITEM_LIMIT_CATEGORY_MANA_GEM)
-                    item->RestoreCharges();
+                // store bags that may contain items in them
+                if (item->IsBag() && IsBagPos(item->GetPos()))
+                    bagMap[itemLowGuid] = (Bag*)item;
             }
-            else
+        }
+        // the item/bag in a bag
+        else
+        {
+            item->SetSlot(NULL_SLOT);
+            // the item is in a bag, find the bag
+            std::map<uint32, Bag*>::const_iterator itr = bagMap.find(bagLowGuid);
+            if (itr != bagMap.end() && slot < itr->second->GetBagSize())
             {
-                sLog.outError("Player::_LoadInventory: Player %s has item (GUID: %u Entry: %u) can't be loaded to inventory (Bag GUID: %u Slot: %u) by some reason, will send by mail.", GetName(),item_lowguid, item_id, bag_guid, slot);
-                CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_lowguid);
-                problematicItems.push_back(item);
+                ItemPosCountVec dest;
+                if (CanStoreItem(itr->second->GetSlot(), slot, dest, item, false) == EQUIP_ERR_OK)
+                    item = StoreItem(dest, item, true);
+                else
+                    success = false;
             }
-        } while (result->NextRow());
+            else
+                success = false;
+        }
 
-        delete result;
-        m_itemUpdateQueueBlocked = false;
+        // item's state may have changed after stored
+        if (success)
+        {
+            item->SetState(ITEM_UNCHANGED, this);
 
-        // send by mail problematic items
-        while(!problematicItems.empty())
+            // restore container unchanged state also
+            if (item->GetContainer())
+                item->GetContainer()->SetState(ITEM_UNCHANGED, this);
+
+            // recharged mana gem
+            if (timediff > 15 * MINUTE && proto->ItemLimitCategory == ITEM_LIMIT_CATEGORY_MANA_GEM)
+                item->RestoreCharges();
+        }
+        else
         {
-            std::string subject = GetSession()->GetMangosString(LANG_NOT_EQUIPPED_ITEM);
+            sLog.outError("Player::_LoadInventory: %s has item (GUID: %u, Entry: %u) can't be loaded to inventory (Bag GUID: %u, Slot: %u) by some reason, will send by mail.", GetGuidStr().c_str(), itemLowGuid, itemId, bagLowGuid, slot);
+            item->DeleteFromInventoryDB();
+            problematicItems.push_back(item);
+        }
+    }
+    while (result->NextRow());
+    delete result;
+    m_itemUpdateQueueBlocked = false;
 
-            // fill mail
-            MailDraft draft(subject, "There's were problems with equipping item(s).");
+    // send by mail problematic items
+    while (!problematicItems.empty())
+    {
+        std::string subject = GetSession()->GetMangosString(LANG_NOT_EQUIPPED_ITEM);
 
-            for(int i = 0; !problematicItems.empty() && i < MAX_MAIL_ITEMS; ++i)
-            {
-                Item* item = problematicItems.front();
-                problematicItems.pop_front();
+        // fill mail
+        MailDraft draft(subject, "There's were problems with equipping item(s).");
 
-                draft.AddItem(item);
-            }
+        for (int i = 0; !problematicItems.empty() && i < MAX_MAIL_ITEMS; ++i)
+        {
+            Item* item = problematicItems.front();
+            problematicItems.pop_front();
 
-            draft.SendMailTo(this, MailSender(this, MAIL_STATIONERY_GM), MAIL_CHECK_MASK_COPIED);
+            draft.AddItem(item);
         }
+
+        draft.SendMailTo(this, MailSender(this, MAIL_STATIONERY_GM), MAIL_CHECK_MASK_COPIED);
     }
 
-    //if(isAlive())
     _ApplyAllItemMods();
 }
 
-void Player::_LoadItemLoot(QueryResult *result)
+void Player::_LoadItemLoot(QueryResult* result)
 {
-    //QueryResult *result = CharacterDatabase.PQuery("SELECT guid,itemid,amount,suffix,property FROM item_loot WHERE guid = '%u'", GetGUIDLow());
+    // QueryResult* result = CharacterDatabase.PQuery("SELECT guid,itemid,amount,suffix,property FROM item_loot WHERE guid = '%u'", GetGUIDLow());
+    if (!result)
+        return;
 
-    if (result)
+    do
     {
-        do
-        {
-            Field *fields = result->Fetch();
-            uint32 item_guid   = fields[0].GetUInt32();
-
-            Item* item = GetItemByGuid(ObjectGuid(HIGHGUID_ITEM, item_guid));
-
-            if (!item)
-            {
-                CharacterDatabase.PExecute("DELETE FROM item_loot WHERE guid = '%u'", item_guid);
-                sLog.outError("Player::_LoadItemLoot: Player %s has loot for nonexistent item (GUID: %u) in `item_loot`, deleted.", GetName(), item_guid );
-                continue;
-            }
-
-            item->LoadLootFromDB(fields);
+        Field* fields = result->Fetch();
+        uint32 itemLowGuid = fields[0].GetUInt32();
 
-        } while (result->NextRow());
+        Item* item = GetItemByGuid(ObjectGuid(HIGHGUID_ITEM, itemLowGuid));
+        if (!item)
+        {
+            Item::DeleteLootFromDB(itemLowGuid);
+            sLog.outError("Player::_LoadItemLoot: %s has loot for nonexistent item (GUID: %u) in `item_loot`, deleted.", GetGuidStr().c_str(), itemLowGuid);
+            continue;
+        }
 
-        delete result;
+        item->LoadLootFromDB(fields);
     }
+    while (result->NextRow());
+
+    delete result;
 }
 
 // load mailed item which should receive current player
@@ -16512,7 +16832,7 @@ void Player::_LoadMailedItems(QueryResult *result)
     // data needs to be at first place for Item::LoadFromDB
     //         0     1     2        3          4
     // "SELECT data, text, mail_id, item_guid, item_template FROM mail_items JOIN item_instance ON item_guid = guid WHERE receiver = '%u'", GUID_LOPART(m_guid)
-    if(!result)
+    if (!result)
         return;
 
     do
@@ -16523,15 +16843,15 @@ void Player::_LoadMailedItems(QueryResult *result)
         uint32 item_template = fields[4].GetUInt32();
 
         Mail* mail = GetMail(mail_id);
-        if(!mail)
+        if (!mail)
             continue;
         mail->AddItem(item_guid_low, item_template);
 
-        ItemPrototype const *proto = ObjectMgr::GetItemPrototype(item_template);
+        ItemPrototype const* proto = ObjectMgr::GetItemPrototype(item_template);
 
-        if(!proto)
+        if (!proto)
         {
-            sLog.outError( "Player %u has unknown item_template (ProtoType) in mailed items(GUID: %u template: %u) in mail (%u), deleted.", GetGUIDLow(), item_guid_low, item_template,mail->messageID);
+            sLog.outError("Player %u has unknown item_template (ProtoType) in mailed items(GUID: %u template: %u) in mail (%u), deleted.", GetGUIDLow(), item_guid_low, item_template,mail->messageID);
             CharacterDatabase.PExecute("DELETE FROM mail_items WHERE item_guid = '%u'", item_guid_low);
             CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid = '%u'", item_guid_low);
             continue;
@@ -16541,7 +16861,7 @@ void Player::_LoadMailedItems(QueryResult *result)
 
         if (!item->LoadFromDB(item_guid_low, fields, GetObjectGuid()))
         {
-            sLog.outError( "Player::_LoadMailedItems - Item in mail (%u) doesn't exist !!!! - item guid: %u, deleted from mail", mail->messageID, item_guid_low);
+            sLog.outError("Player::_LoadMailedItems - Item in mail (%u) doesn't exist !!!! - item guid: %u, deleted from mail", mail->messageID, item_guid_low);
             CharacterDatabase.PExecute("DELETE FROM mail_items WHERE item_guid = '%u'", item_guid_low);
             item->FSetState(ITEM_REMOVED);
             item->SaveToDB();                               // it also deletes item object !
@@ -16559,12 +16879,12 @@ void Player::_LoadMails(QueryResult *result)
     m_mail.clear();
     //        0  1           2      3        4       5    6           7            8     9   10      11         12             13
     //"SELECT id,messageType,sender,receiver,subject,body,expire_time,deliver_time,money,cod,checked,stationery,mailTemplateId,has_items FROM mail WHERE receiver = '%u' ORDER BY id DESC", GetGUIDLow()
-    if(!result)
+    if (!result)
         return;
 
     do
     {
-        Field *fields = result->Fetch();
+        Field* fields = result->Fetch();
         Mail *m = new Mail;
         m->messageID = fields[0].GetUInt32();
         m->messageType = fields[1].GetUInt8();
@@ -16583,7 +16903,7 @@ void Player::_LoadMails(QueryResult *result)
 
         if (m->mailTemplateId && !sMailTemplateStore.LookupEntry(m->mailTemplateId))
         {
-            sLog.outError( "Player::_LoadMail - Mail (%u) have nonexistent MailTemplateId (%u), remove at load", m->messageID, m->mailTemplateId);
+            sLog.outError("Player::_LoadMail - Mail (%u) have nonexistent MailTemplateId (%u), remove at load", m->messageID, m->mailTemplateId);
             m->mailTemplateId = 0;
         }
 
@@ -16594,7 +16914,7 @@ void Player::_LoadMails(QueryResult *result)
         if (m->mailTemplateId && !m->has_items)
             m->prepareTemplateItems(this);
 
-    } while( result->NextRow() );
+    } while(result->NextRow());
     delete result;
 }
 
@@ -16602,39 +16922,115 @@ void Player::LoadPet()
 {
     // fixme: the pet should still be loaded if the player is not in world
     // just not added to the map
-    if(IsInWorld())
+    if (IsInWorld())
     {
-        Pet *pet = new Pet;
-        if(!pet->LoadPetFromDB(this, 0, 0, true))
-            delete pet;
-    }
-}
+        if (!sWorld.getConfig(CONFIG_BOOL_PET_SAVE_ALL))
+        {
+            Pet* pet = new Pet;
+            pet->SetPetCounter(0);
+            if (!pet->LoadPetFromDB(this, 0, 0, true))
+            {
+                delete pet;
+                return;
+            }
+        }
+        else
+        {
+            QueryResult* result = CharacterDatabase.PQuery("SELECT id, PetType, CreatedBySpell, savetime FROM character_pet WHERE owner = %u AND entry = (SELECT entry FROM character_pet WHERE owner = %u AND slot = %u) ORDER BY slot ASC",
+                GetGUIDLow(), GetGUIDLow(), PET_SAVE_AS_CURRENT);
 
-void Player::_LoadQuestStatus(QueryResult *result)
-{
-    mQuestStatus.clear();
+            std::vector<uint32> petnumber;
+            uint32 _PetType = 0;
+            uint32 _CreatedBySpell = 0;
+            uint64 _saveTime = 0;
 
-    uint32 slot = 0;
+            if (result)
+            {
+                do
+                {
+                    Field* fields = result->Fetch();
+                    uint32 petnum = fields[0].GetUInt32();
+                    if (petnum)
+                        petnumber.push_back(petnum);
+                    if (!_PetType)
+                        _PetType = fields[1].GetUInt32();
+                    if (!_CreatedBySpell)
+                        _CreatedBySpell = fields[2].GetUInt32();
+                    if (!_saveTime)
+                        _saveTime = fields[3].GetUInt64();
+                }
+                while (result->NextRow());
+                delete result;
+            }
+            else
+                return;
 
-    ////                                                     0      1       2         3         4      5          6          7          8          9           10          11          12          13          14
-    //QueryResult *result = CharacterDatabase.PQuery("SELECT quest, status, rewarded, explored, timer, mobcount1, mobcount2, mobcount3, mobcount4, itemcount1, itemcount2, itemcount3, itemcount4, itemcount5, itemcount6 FROM character_queststatus WHERE guid = '%u'", GetGUIDLow());
+            if (petnumber.empty())
+                return;
 
-    if(result)
-    {
-        do
-        {
-            Field *fields = result->Fetch();
+            if (_CreatedBySpell != 13481 && !HasSpell(_CreatedBySpell))
+                return;
 
-            uint32 quest_id = fields[0].GetUInt32();
-                                                            // used to be new, no delete?
-            Quest const* pQuest = sObjectMgr.GetQuestTemplate(quest_id);
-            if( pQuest )
-            {
-                // find or create
-                QuestStatusData& questStatusData = mQuestStatus[quest_id];
+            SpellEntry const* spellInfo = sSpellStore.LookupEntry(_CreatedBySpell);
+            if (!spellInfo)
+                return;
+
+            uint32 count = 1;
+
+            if (_CreatedBySpell == 51533 || _CreatedBySpell == 33831)
+                count = spellInfo->CalculateSimpleValue(EFFECT_INDEX_0);
+
+            petnumber.resize(count);
+
+            if (GetSpellDuration(spellInfo) > 0)
+                if (uint64(time(NULL)) - GetSpellDuration(spellInfo) / IN_MILLISECONDS > _saveTime)
+                    return;
+
+            if (_CreatedBySpell != 13481 && !HasSpell(_CreatedBySpell))
+                return;
+
+            if (!petnumber.empty())
+            {
+                for (uint8 i = 0; i < petnumber.size(); ++i)
+                {
+                    if (petnumber[i] == 0)
+                        continue;
+
+                    Pet* _pet = new Pet;
+                    _pet->SetPetCounter(petnumber.size() - i - 1);
+                    if (!_pet->LoadPetFromDB(this, 0, petnumber[i], true))
+                        delete _pet;
+                }
+            }
+        }
+    }
+}
+
+void Player::_LoadQuestStatus(QueryResult *result)
+{
+    mQuestStatus.clear();
+
+    uint32 slot = 0;
+
+    ////                                                     0      1       2         3         4      5          6          7          8          9           10          11          12          13          14
+    //QueryResult *result = CharacterDatabase.PQuery("SELECT quest, status, rewarded, explored, timer, mobcount1, mobcount2, mobcount3, mobcount4, itemcount1, itemcount2, itemcount3, itemcount4, itemcount5, itemcount6 FROM character_queststatus WHERE guid = '%u'", GetGUIDLow());
+
+    if (result)
+    {
+        do
+        {
+            Field* fields = result->Fetch();
+
+            uint32 quest_id = fields[0].GetUInt32();
+                                                            // used to be new, no delete?
+            Quest const* pQuest = sObjectMgr.GetQuestTemplate(quest_id);
+            if (pQuest)
+            {
+                // find or create
+                QuestStatusData& questStatusData = mQuestStatus[quest_id];
 
                 uint32 qstatus = fields[1].GetUInt32();
-                if(qstatus < MAX_QUEST_STATUS)
+                if (qstatus < MAX_QUEST_STATUS)
                     questStatusData.m_status = QuestStatus(qstatus);
                 else
                 {
@@ -16642,14 +17038,14 @@ void Player::_LoadQuestStatus(QueryResult *result)
                     sLog.outError("Player %s have invalid quest %d status (%d), replaced by QUEST_STATUS_NONE(0).",GetName(),quest_id,qstatus);
                 }
 
-                questStatusData.m_rewarded = ( fields[2].GetUInt8() > 0 );
-                questStatusData.m_explored = ( fields[3].GetUInt8() > 0 );
+                questStatusData.m_rewarded = (fields[2].GetUInt8() > 0);
+                questStatusData.m_explored = (fields[3].GetUInt8() > 0);
 
                 time_t quest_time = time_t(fields[4].GetUInt64());
 
                 if (pQuest->HasSpecialFlag(QUEST_SPECIAL_FLAG_TIMED) && !GetQuestRewardStatus(quest_id) && questStatusData.m_status != QUEST_STATUS_NONE)
                 {
-                    AddTimedQuest( quest_id );
+                    AddTimedQuest(quest_id);
 
                     if (quest_time <= sWorld.GetGameTime())
                         questStatusData.m_timer = 1;
@@ -16690,67 +17086,67 @@ void Player::_LoadQuestStatus(QueryResult *result)
                     if (questStatusData.m_status == QUEST_STATUS_FAILED)
                         SetQuestSlotState(slot, QUEST_STATE_FAIL);
 
-                    for(uint8 idx = 0; idx < QUEST_OBJECTIVES_COUNT; ++idx)
-                        if(questStatusData.m_creatureOrGOcount[idx])
+                    for (uint8 idx = 0; idx < QUEST_OBJECTIVES_COUNT; ++idx)
+                        if (questStatusData.m_creatureOrGOcount[idx])
                             SetQuestSlotCounter(slot, idx, questStatusData.m_creatureOrGOcount[idx]);
 
                     ++slot;
                 }
 
-                if(questStatusData.m_rewarded)
+                if (questStatusData.m_rewarded)
                 {
                     // learn rewarded spell if unknown
                     learnQuestRewardedSpells(pQuest);
 
                     // set rewarded title if any
-                    if(pQuest->GetCharTitleId())
+                    if (pQuest->GetCharTitleId())
                     {
-                        if(CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(pQuest->GetCharTitleId()))
+                        if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(pQuest->GetCharTitleId()))
                             SetTitle(titleEntry);
                     }
 
-                    if(pQuest->GetBonusTalents())
+                    if (pQuest->GetBonusTalents())
                         m_questRewardTalentCount += pQuest->GetBonusTalents();
                 }
 
                 DEBUG_LOG("Quest status is {%u} for quest {%u} for player (GUID: %u)", questStatusData.m_status, quest_id, GetGUIDLow());
             }
         }
-        while( result->NextRow() );
+        while (result->NextRow());
 
         delete result;
     }
 
     // clear quest log tail
-    for ( uint16 i = slot; i < MAX_QUEST_LOG_SIZE; ++i )
+    for (uint16 i = slot; i < MAX_QUEST_LOG_SIZE; ++i)
         SetQuestSlot(i, 0);
 }
 
 void Player::_LoadDailyQuestStatus(QueryResult *result)
 {
-    for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
+    for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
         SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,0);
 
     //QueryResult *result = CharacterDatabase.PQuery("SELECT quest FROM character_queststatus_daily WHERE guid = '%u'", GetGUIDLow());
 
-    if(result)
+    if (result)
     {
         uint32 quest_daily_idx = 0;
 
         do
         {
-            if(quest_daily_idx >= PLAYER_MAX_DAILY_QUESTS)  // max amount with exist data in query
+            if (quest_daily_idx >= PLAYER_MAX_DAILY_QUESTS)  // max amount with exist data in query
             {
                 sLog.outError("Player (GUID: %u) have more 25 daily quest records in `charcter_queststatus_daily`",GetGUIDLow());
                 break;
             }
 
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             uint32 quest_id = fields[0].GetUInt32();
 
             Quest const* pQuest = sObjectMgr.GetQuestTemplate(quest_id);
-            if( !pQuest )
+            if (!pQuest)
                 continue;
 
             SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,quest_id);
@@ -16758,7 +17154,7 @@ void Player::_LoadDailyQuestStatus(QueryResult *result)
 
             DEBUG_LOG("Daily quest {%u} cooldown for player (GUID: %u)", quest_id, GetGUIDLow());
         }
-        while( result->NextRow() );
+        while (result->NextRow());
 
         delete result;
     }
@@ -16776,7 +17172,7 @@ void Player::_LoadWeeklyQuestStatus(QueryResult *result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             uint32 quest_id = fields[0].GetUInt32();
 
@@ -16788,7 +17184,7 @@ void Player::_LoadWeeklyQuestStatus(QueryResult *result)
 
             DEBUG_LOG("Weekly quest {%u} cooldown for player (GUID: %u)", quest_id, GetGUIDLow());
         }
-        while( result->NextRow() );
+        while (result->NextRow());
 
         delete result;
     }
@@ -16805,7 +17201,7 @@ void Player::_LoadMonthlyQuestStatus(QueryResult *result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             uint32 quest_id = fields[0].GetUInt32();
 
@@ -16817,7 +17213,7 @@ void Player::_LoadMonthlyQuestStatus(QueryResult *result)
 
             DEBUG_LOG("Monthly quest {%u} cooldown for player (GUID: %u)", quest_id, GetGUIDLow());
         }
-        while( result->NextRow() );
+        while (result->NextRow());
 
         delete result;
     }
@@ -16829,26 +17225,26 @@ void Player::_LoadSpells(QueryResult *result)
 {
     //QueryResult *result = CharacterDatabase.PQuery("SELECT spell,active,disabled FROM character_spell WHERE guid = '%u'",GetGUIDLow());
 
-    if(result)
+    if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             uint32 spell_id = fields[0].GetUInt32();
 
             // skip talents & drop unneeded data
-            if(GetTalentSpellPos(spell_id))
+            if (GetTalentSpellPos(spell_id))
             {
                 sLog.outError("Player::_LoadSpells: %s has talent spell %u in character_spell, removing it.",
                     GetGuidStr().c_str(), spell_id);
-                CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = '%u'", spell_id);
+                CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = %u", spell_id);
                 continue;
             }
 
             addSpell(spell_id, fields[1].GetBool(), false, false, fields[2].GetBool());
         }
-        while( result->NextRow() );
+        while (result->NextRow());
 
         delete result;
     }
@@ -16861,15 +17257,15 @@ void Player::_LoadTalents(QueryResult *result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             uint32 talent_id = fields[0].GetUInt32();
             TalentEntry const* talentInfo = sTalentStore.LookupEntry(talent_id);
 
             if (!talentInfo)
             {
-                sLog.outError("Player::_LoadTalents:Player (GUID: %u) has invalid talent_id: %u , this talent will be deleted from character_talent",GetGUIDLow(), talent_id );
-                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE talent_id = '%u'", talent_id);
+                sLog.outError("Player::_LoadTalents:Player (GUID: %u) has invalid talent_id: %u , this talent will be deleted from character_talent",GetGUIDLow(), talent_id);
+                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE talent_id = %u", talent_id);
                 continue;
             }
 
@@ -16877,16 +17273,16 @@ void Player::_LoadTalents(QueryResult *result)
 
             if (!talentTabInfo)
             {
-                sLog.outError("Player::_LoadTalents:Player (GUID: %u) has invalid talentTabInfo: %u for talentID: %u , this talent will be deleted from character_talent",GetGUIDLow(), talentInfo->TalentTab, talentInfo->TalentID );
-                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE talent_id = '%u'", talent_id);
+                sLog.outError("Player::_LoadTalents:Player (GUID: %u) has invalid talentTabInfo: %u for talentID: %u , this talent will be deleted from character_talent",GetGUIDLow(), talentInfo->TalentTab, talentInfo->TalentID);
+                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE talent_id = %u", talent_id);
                 continue;
             }
 
             // prevent load talent for different class (cheating)
             if ((getClassMask() & talentTabInfo->ClassMask) == 0)
             {
-                sLog.outError("Player::_LoadTalents:Player (GUID: %u) has talent with ClassMask: %u , but Player's ClassMask is: %u , talentID: %u , this talent will be deleted from character_talent",GetGUIDLow(), talentTabInfo->ClassMask, getClassMask() ,talentInfo->TalentID );
-                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = '%u' AND talent_id = '%u'", GetGUIDLow(), talent_id);
+                sLog.outError("Player::_LoadTalents:Player (GUID: %u) has talent with ClassMask: %u , but Player's ClassMask is: %u , talentID: %u , this talent will be deleted from character_talent",GetGUIDLow(), talentTabInfo->ClassMask, getClassMask() ,talentInfo->TalentID);
+                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = %u AND talent_id = %u", GetGUIDLow(), talent_id);
                 continue;
             }
 
@@ -16894,8 +17290,8 @@ void Player::_LoadTalents(QueryResult *result)
 
             if (currentRank > MAX_TALENT_RANK || talentInfo->RankID[currentRank] == 0)
             {
-                sLog.outError("Player::_LoadTalents:Player (GUID: %u) has invalid talent rank: %u , talentID: %u , this talent will be deleted from character_talent",GetGUIDLow(), currentRank, talentInfo->TalentID );
-                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = '%u' AND talent_id = '%u'", GetGUIDLow(), talent_id);
+                sLog.outError("Player::_LoadTalents:Player (GUID: %u) has invalid talent rank: %u , talentID: %u , this talent will be deleted from character_talent",GetGUIDLow(), currentRank, talentInfo->TalentID);
+                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = %u AND talent_id = %u", GetGUIDLow(), talent_id);
                 continue;
             }
 
@@ -16904,14 +17300,14 @@ void Player::_LoadTalents(QueryResult *result)
             if (spec > MAX_TALENT_SPEC_COUNT)
             {
                 sLog.outError("Player::_LoadTalents:Player (GUID: %u) has invalid talent spec: %u, spec will be deleted from character_talent", GetGUIDLow(), spec);
-                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE spec = '%u' ", spec);
+                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE spec = %u", spec);
                 continue;
             }
 
             if (spec >= m_specsCount)
             {
                 sLog.outError("Player::_LoadTalents:Player (GUID: %u) has invalid talent spec: %u , this spec will be deleted from character_talent.", GetGUIDLow(), spec);
-                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = '%u' AND spec = '%u' ", GetGUIDLow(), spec);
+                CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = %u AND spec = %u", GetGUIDLow(), spec);
                 continue;
             }
 
@@ -16931,87 +17327,109 @@ void Player::_LoadTalents(QueryResult *result)
     }
 }
 
-void Player::_LoadGroup(QueryResult *result)
+void Player::_LoadGroup(QueryResult* result)
 {
     //QueryResult *result = CharacterDatabase.PQuery("SELECT groupId FROM group_member WHERE memberGuid='%u'", GetGUIDLow());
     if (result)
     {
         uint32 groupId = (*result)[0].GetUInt32();
+        ObjectGuid groupGuid = ObjectGuid(HIGHGUID_GROUP, groupId);
         delete result;
-
-        if (Group* group = sObjectMgr.GetGroupById(groupId))
+        Group* group = sObjectMgr.GetGroup(groupGuid);
+        if (group)
         {
+            if (group->IsLeader(GetObjectGuid()))
+                SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GROUP_LEADER);
+
             uint8 subgroup = group->GetMemberGroup(GetObjectGuid());
-            SetGroup(group, subgroup);
+            SetGroup(groupGuid, subgroup);
             if (getLevel() >= LEVELREQUIREMENT_HEROIC)
             {
                 // the group leader may change the instance difficulty while the player is offline
                 SetDungeonDifficulty(group->GetDungeonDifficulty());
                 SetRaidDifficulty(group->GetRaidDifficulty());
             }
+            if (group->isLFDGroup())
+                sLFGMgr.LoadLFDGroupPropertiesForPlayer(this);
         }
     }
+
+    if (!GetGroup() || !GetGroup()->IsLeader(GetObjectGuid()))
+        RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_GROUP_LEADER);
 }
 
-void Player::_LoadBoundInstances(QueryResult *result)
+void Player::_LoadBoundInstances(QueryResult* result)
 {
-    for(uint8 i = 0; i < MAX_DIFFICULTY; ++i)
+    for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
         m_boundInstances[i].clear();
 
-    Group *group = GetGroup();
+    Group* group = GetGroup();
 
-    //QueryResult *result = CharacterDatabase.PQuery("SELECT id, permanent, map, difficulty, resettime FROM character_instance LEFT JOIN instance ON instance = id WHERE guid = '%u'", GUID_LOPART(m_guid));
-    if(result)
+    //QueryResult *result = CharacterDatabase.PQuery("SELECT id, permanent, map, difficulty, extend, resettime FROM character_instance LEFT JOIN instance ON instance = id WHERE guid = '%u'", GUID_LOPART(m_guid));
+    if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
-            bool perm = fields[1].GetBool();
-            uint32 mapId = fields[2].GetUInt32();
+            Field* fields = result->Fetch();
             uint32 instanceId = fields[0].GetUInt32();
-            uint8 difficulty = fields[3].GetUInt8();
-
-            time_t resetTime = (time_t)fields[4].GetUInt64();
+            bool perm         = fields[1].GetBool();
+            uint32 mapId      = fields[2].GetUInt32();
+            uint8 difficulty  = fields[3].GetUInt8();
+            bool extend       = fields[4].GetBool();
+            time_t resetTime  = (time_t)fields[5].GetUInt64();
             // the resettime for normal instances is only saved when the InstanceSave is unloaded
             // so the value read from the DB may be wrong here but only if the InstanceSave is loaded
             // and in that case it is not used
 
+            bool checkFailed = false;
+
             MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
-            if(!mapEntry || !mapEntry->IsDungeon())
+            if (!mapEntry || !mapEntry->IsDungeon())
             {
-                sLog.outError("_LoadBoundInstances: player %s(%d) has bind to nonexistent or not dungeon map %d", GetName(), GetGUIDLow(), mapId);
-                CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u' AND instance = '%u'", GetGUIDLow(), instanceId);
-                continue;
+                sLog.outError("Player::_LoadBoundInstances: %s has bind to nonexistent or not dungeon map %d", GetGuidStr().c_str(), mapId);
+                checkFailed = true;
             }
 
-            if(difficulty >= MAX_DIFFICULTY)
+            if (!checkFailed && difficulty >= MAX_DIFFICULTY)
             {
-                sLog.outError("_LoadBoundInstances: player %s(%d) has bind to nonexistent difficulty %d instance for map %u", GetName(), GetGUIDLow(), difficulty, mapId);
-                CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u' AND instance = '%u'", GetGUIDLow(), instanceId);
-                continue;
+                sLog.outError("Player::_LoadBoundInstances: %s has bind to nonexistent difficulty %d instance for map %u", GetGuidStr().c_str(), difficulty, mapId);
+                checkFailed = true;
             }
 
-            MapDifficulty const* mapDiff = GetMapDifficultyData(mapId,Difficulty(difficulty));
-            if(!mapDiff)
+            if (!checkFailed)
             {
-                sLog.outError("_LoadBoundInstances: player %s(%d) has bind to nonexistent difficulty %d instance for map %u", GetName(), GetGUIDLow(), difficulty, mapId);
-                CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u' AND instance = '%u'", GetGUIDLow(), instanceId);
-                continue;
+                MapDifficultyEntry const* mapDiff = GetMapDifficultyData(mapId, Difficulty(difficulty));
+                if (!mapDiff)
+                {
+                    sLog.outError("Player::_LoadBoundInstances: %s has bind to nonexistent difficulty %d instance for map %u", GetGuidStr().c_str(), difficulty, mapId);
+                    checkFailed = true;
+                }
+            }
+
+            if (!checkFailed && !perm && group)
+            {
+                if (GetSession()->GetRemoteAddress() != "bot")
+                {
+                    sLog.outError("Player::_LoadBoundInstances: %s is in group (Id: %d) but has a non-permanent character bind to map %d, %d, %d",
+                        GetGuidStr().c_str(), group->GetId(), mapId, instanceId, difficulty);
+                }
+                checkFailed = true;
             }
 
-            if(!perm && group)
+            if (checkFailed)
             {
-                sLog.outError("_LoadBoundInstances: %s is in group (Id: %d) but has a non-permanent character bind to map %d,%d,%d",
-                    GetGuidStr().c_str(), group->GetId(), mapId, instanceId, difficulty);
-                CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u' AND instance = '%u'",
-                    GetGUIDLow(), instanceId);
+                static SqlStatementID delFromInst;
+                CharacterDatabase.CreateStatement(delFromInst, "DELETE FROM character_instance WHERE guid = ? AND instance = ?")
+                    .PExecute(GetGUIDLow(), instanceId);
                 continue;
             }
 
             // since non permanent binds are always solo bind, they can always be reset
             DungeonPersistentState *state = (DungeonPersistentState*)sMapPersistentStateMgr.AddPersistentState(mapEntry, instanceId, Difficulty(difficulty), resetTime, !perm, true);
-            if(state) BindToInstance(state, perm, true);
-        } while(result->NextRow());
+            if (state)
+                BindToInstance(state, perm, true, extend);
+        }
+        while (result->NextRow());
         delete result;
     }
 }
@@ -17019,12 +17437,13 @@ void Player::_LoadBoundInstances(QueryResult *result)
 InstancePlayerBind* Player::GetBoundInstance(uint32 mapid, Difficulty difficulty)
 {
     // some instances only have one difficulty
-    MapDifficulty const* mapDiff = GetMapDifficultyData(mapid,difficulty);
-    if(!mapDiff)
+    MapDifficultyEntry const* mapDiff = GetMapDifficultyData(mapid, difficulty);
+    if (!mapDiff)
         return NULL;
 
+    MAPLOCK_READ(this, MAP_LOCK_TYPE_DEFAULT);
     BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(mapid);
-    if(itr != m_boundInstances[difficulty].end())
+    if (itr != m_boundInstances[difficulty].end())
         return &itr->second;
     else
         return NULL;
@@ -17032,47 +17451,67 @@ InstancePlayerBind* Player::GetBoundInstance(uint32 mapid, Difficulty difficulty
 
 void Player::UnbindInstance(uint32 mapid, Difficulty difficulty, bool unload)
 {
+    MAPLOCK_WRITE(this, MAP_LOCK_TYPE_DEFAULT);
     BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(mapid);
     UnbindInstance(itr, difficulty, unload);
 }
 
-void Player::UnbindInstance(BoundInstancesMap::iterator &itr, Difficulty difficulty, bool unload)
+void Player::UnbindInstance(BoundInstancesMap::iterator& itr, Difficulty difficulty, bool unload)
 {
-    if(itr != m_boundInstances[difficulty].end())
+    if (itr != m_boundInstances[difficulty].end())
     {
         if (!unload)
-            CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u' AND instance = '%u'",
-                GetGUIDLow(), itr->second.state->GetInstanceId());
-        itr->second.state->RemovePlayer(this);              // state can become invalid
+        {
+            static SqlStatementID delFromInst;
+            CharacterDatabase.CreateStatement(delFromInst, "DELETE FROM character_instance WHERE guid = ? AND instance = ? AND extend = 0")
+                .PExecute(GetGUIDLow(), itr->second.state->GetInstanceId());
+        }
+
+        sCalendarMgr.SendCalendarRaidLockoutRemove(GetObjectGuid(), itr->second.state);
+
+        itr->second.state->RemoveFromBindList(GetObjectGuid());  // state can become invalid
         m_boundInstances[difficulty].erase(itr++);
     }
 }
 
-InstancePlayerBind* Player::BindToInstance(DungeonPersistentState *state, bool permanent, bool load)
+InstancePlayerBind* Player::BindToInstance(DungeonPersistentState* state, bool permanent, bool load, bool extend)
 {
     if (state)
     {
+        MAPLOCK_READ(this, MAP_LOCK_TYPE_DEFAULT);
         InstancePlayerBind& bind = m_boundInstances[state->GetDifficulty()][state->GetMapId()];
-        if (bind.state)
-        {
-            // update the state when the group kills a boss
-            if(permanent != bind.perm || state != bind.state)
-                if (!load)
-                    CharacterDatabase.PExecute("UPDATE character_instance SET instance = '%u', permanent = '%u' WHERE guid = '%u' AND instance = '%u'",
-                        state->GetInstanceId(), permanent, GetGUIDLow(), bind.state->GetInstanceId());
-        }
-        else
+
+        if (!load)
         {
-            if (!load)
-                CharacterDatabase.PExecute("INSERT INTO character_instance (guid, instance, permanent) VALUES ('%u', '%u', '%u')",
-                    GetGUIDLow(), state->GetInstanceId(), permanent);
+            if (bind.state)
+            {
+                // update the state when the group kills a boss
+                if (permanent != bind.perm || state != bind.state || extend != bind.extend)
+                {
+                    static SqlStatementID updInst;
+                    SqlStatement stmt = CharacterDatabase.CreateStatement(updInst, "UPDATE character_instance SET instance = ?, permanent = ?, extend = ? WHERE guid = ? AND instance = ?");
+                    stmt.addUInt32(state->GetInstanceId());
+                    stmt.addBool(permanent);
+                    stmt.addBool(extend);
+                    stmt.addUInt32(GetGUIDLow());
+                    stmt.addUInt32(bind.state->GetInstanceId());
+                    stmt.Execute();
+                }
+            }
+            else
+            {
+                static SqlStatementID insInst;
+                CharacterDatabase.CreateStatement(insInst, "INSERT INTO character_instance (guid, instance, permanent, extend) VALUES (?, ?, ?, ?)")
+                    .PExecute(GetGUIDLow(), state->GetInstanceId(), permanent, extend);
+            }
         }
 
         if (bind.state != state)
         {
             if (bind.state)
-                bind.state->RemovePlayer(this);
-            state->AddPlayer(this);
+                bind.state->RemoveFromBindList(GetObjectGuid());
+
+            state->AddToBindList(GetObjectGuid());
         }
 
         if (permanent)
@@ -17080,9 +17519,11 @@ InstancePlayerBind* Player::BindToInstance(DungeonPersistentState *state, bool p
 
         bind.state = state;
         bind.perm = permanent;
+        bind.extend = extend;
+
         if (!load)
-            DEBUG_LOG("Player::BindToInstance: %s(%d) is now bound to map %d, instance %d, difficulty %d",
-                GetName(), GetGUIDLow(), state->GetMapId(), state->GetInstanceId(), state->GetDifficulty());
+            DEBUG_LOG("Player::BindToInstance: %s is now bound to map %d, instance %d, difficulty %d", GetGuidStr().c_str(), state->GetMapId(), state->GetInstanceId(), state->GetDifficulty());
+
         return &bind;
     }
     else
@@ -17102,16 +17543,24 @@ DungeonPersistentState* Player::GetBoundInstanceSaveForSelfOrGroup(uint32 mapid)
     // then the player's group bind and finally the solo bind.
     if (!pBind || !pBind->perm)
     {
-        InstanceGroupBind *groupBind = NULL;
         // use the player's difficulty setting (it may not be the same as the group's)
         if (Group *group = GetGroup())
-            if (groupBind = group->GetBoundInstance(mapid, this))
+            if (InstanceGroupBind* groupBind = group->GetBoundInstance(mapid, this))
                 state = groupBind->state;
     }
 
     return state;
 }
 
+void Player::BindToInstance()
+{
+    WorldPacket data(SMSG_INSTANCE_SAVE_CREATED, 4);
+    data << uint32(0);
+    GetSession()->SendPacket(&data);
+    BindToInstance(_pendingBind, true);
+    sCalendarMgr.SendCalendarRaidLockoutAdd(GetObjectGuid(), _pendingBind);
+}
+
 void Player::SendRaidInfo()
 {
     uint32 counter = 0;
@@ -17123,19 +17572,20 @@ void Player::SendRaidInfo()
 
     time_t now = time(NULL);
 
-    for(int i = 0; i < MAX_DIFFICULTY; ++i)
+    for (int i = 0; i < MAX_DIFFICULTY; ++i)
     {
         for (BoundInstancesMap::const_iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ++itr)
         {
             if (itr->second.perm)
             {
-                DungeonPersistentState *state = itr->second.state;
-                data << uint32(state->GetMapId());          // map id
-                data << uint32(state->GetDifficulty());     // difficulty
-                data << ObjectGuid(state->GetInstanceGuid());// instance guid
-                data << uint8(1);                           // expired = 0
-                data << uint8(0);                           // extended = 1
-                data << uint32(state->GetResetTime() - now);// reset time
+                DungeonPersistentState* state = itr->second.state;
+                data << uint32(state->GetMapId());              // map id
+                data << uint32(state->GetDifficulty());         // difficulty
+                data << ObjectGuid(state->GetInstanceGuid());   // instance guid
+                data << uint8((state->GetRealResetTime() > now) ? 1 : 0);   // expired = 0
+                data << uint8(itr->second.extend ? 1 : 0);      // extended = 1
+                data << uint32(state->GetRealResetTime() > now ? state->GetRealResetTime() - now
+                    : DungeonResetScheduler::CalculateNextResetTime(GetMapDifficultyData(state->GetMapId(), state->GetDifficulty())));    // reset time
                 ++counter;
             }
         }
@@ -17150,13 +17600,11 @@ void Player::SendRaidInfo()
 void Player::SendSavedInstances()
 {
     bool hasBeenSaved = false;
-    WorldPacket data;
-
-    for(uint8 i = 0; i < MAX_DIFFICULTY; ++i)
+    for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
     {
         for (BoundInstancesMap::const_iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ++itr)
         {
-            if(itr->second.perm)                                // only permanent binds are sent
+            if (itr->second.perm)                                // only permanent binds are sent
             {
                 hasBeenSaved = true;
                 break;
@@ -17164,21 +17612,21 @@ void Player::SendSavedInstances()
         }
     }
 
-    //Send opcode 811. true or false means, whether you have current raid/heroic instances
-    data.Initialize(SMSG_UPDATE_INSTANCE_OWNERSHIP);
+    // Send opcode 811. true or false means, whether you have current raid/heroic instances
+    WorldPacket data(SMSG_UPDATE_INSTANCE_OWNERSHIP, 4);
     data << uint32(hasBeenSaved);
     GetSession()->SendPacket(&data);
 
-    if(!hasBeenSaved)
+    if (!hasBeenSaved)
         return;
 
-    for(uint8 i = 0; i < MAX_DIFFICULTY; ++i)
+    for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
     {
         for (BoundInstancesMap::const_iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ++itr)
         {
-            if(itr->second.perm)
+            if (itr->second.perm)
             {
-                data.Initialize(SMSG_UPDATE_LAST_INSTANCE);
+                data.Initialize(SMSG_UPDATE_LAST_INSTANCE, 4);
                 data << uint32(itr->second.state->GetMapId());
                 GetSession()->SendPacket(&data);
             }
@@ -17187,7 +17635,7 @@ void Player::SendSavedInstances()
 }
 
 /// convert the player's binds to the group
-void Player::ConvertInstancesToGroup(Player *player, Group *group, ObjectGuid player_guid)
+void Player::ConvertInstancesToGroup(Player* player, Group* group, ObjectGuid player_guid)
 {
     bool has_binds = false;
     bool has_solo = false;
@@ -17206,7 +17654,7 @@ void Player::ConvertInstancesToGroup(Player *player, Group *group, ObjectGuid pl
 
     if (player)
     {
-        for(uint8 i = 0; i < MAX_DIFFICULTY; ++i)
+        for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
         {
             for (BoundInstancesMap::iterator itr = player->m_boundInstances[i].begin(); itr != player->m_boundInstances[i].end();)
             {
@@ -17232,17 +17680,25 @@ void Player::ConvertInstancesToGroup(Player *player, Group *group, ObjectGuid pl
 
     // if the player's not online we don't know what binds it has
     if (!player || !group || has_binds)
-        CharacterDatabase.PExecute("INSERT INTO group_instance SELECT guid, instance, permanent FROM character_instance WHERE guid = '%u'", player_lowguid);
+    {
+        static SqlStatementID repData;
+        CharacterDatabase.CreateStatement(repData, "REPLACE INTO group_instance SELECT guid, instance, permanent FROM character_instance WHERE guid = ?")
+            .PExecute(player_lowguid);
+    }
 
     // the following should not get executed when changing leaders
     if (!player || has_solo)
-        CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u' AND permanent = 0", player_lowguid);
+    {
+        static SqlStatementID delData;
+        CharacterDatabase.CreateStatement(delData, "DELETE FROM character_instance WHERE guid = ? AND permanent = 0 AND extend = 0")
+            .PExecute(player_lowguid);
+    }
 }
 
-bool Player::_LoadHomeBind(QueryResult *result)
+bool Player::_LoadHomeBind(QueryResult* result)
 {
-    PlayerInfo const *info = sObjectMgr.GetPlayerInfo(getRace(), getClass());
-    if(!info)
+    PlayerInfo const* info = sObjectMgr.GetPlayerInfo(getRace(), getClass());
+    if (!info)
     {
         sLog.outError("Player have incorrect race/class pair. Can't be loaded.");
         return false;
@@ -17252,39 +17708,28 @@ bool Player::_LoadHomeBind(QueryResult *result)
     //QueryResult *result = CharacterDatabase.PQuery("SELECT map,zone,position_x,position_y,position_z FROM character_homebind WHERE guid = '%u'", GUID_LOPART(playerGuid));
     if (result)
     {
-        Field *fields = result->Fetch();
-        m_homebindMapId = fields[0].GetUInt32();
-        m_homebindAreaId = fields[1].GetUInt16();
-        m_homebindX = fields[2].GetFloat();
-        m_homebindY = fields[3].GetFloat();
-        m_homebindZ = fields[4].GetFloat();
+        Field* fields = result->Fetch();
+        m_homebind  = WorldLocation(fields[0].GetUInt32(), fields[2].GetFloat(), fields[3].GetFloat(), fields[4].GetFloat());
+        // m_homebindAreaId = fields[1].GetUInt16();
         delete result;
 
-        MapEntry const* bindMapEntry = sMapStore.LookupEntry(m_homebindMapId);
+        MapEntry const* bindMapEntry = sMapStore.LookupEntry(m_homebind.GetMapId());
 
         // accept saved data only for valid position (and non instanceable), and accessable
-        if( MapManager::IsValidMapCoord(m_homebindMapId,m_homebindX,m_homebindY,m_homebindZ) &&
+        if (MapManager::IsValidMapCoord(m_homebind) &&
             !bindMapEntry->Instanceable() && GetSession()->Expansion() >= bindMapEntry->Expansion())
         {
             ok = true;
         }
         else
-            CharacterDatabase.PExecute("DELETE FROM character_homebind WHERE guid = '%u'", GetGUIDLow());
+            CharacterDatabase.PExecute("DELETE FROM character_homebind WHERE guid = %u", GetGUIDLow());
     }
 
-    if(!ok)
-    {
-        m_homebindMapId = info->mapId;
-        m_homebindAreaId = info->areaId;
-        m_homebindX = info->positionX;
-        m_homebindY = info->positionY;
-        m_homebindZ = info->positionZ;
-
-        CharacterDatabase.PExecute("INSERT INTO character_homebind (guid,map,zone,position_x,position_y,position_z) VALUES ('%u', '%u', '%u', '%f', '%f', '%f')", GetGUIDLow(), m_homebindMapId, (uint32)m_homebindAreaId, m_homebindX, m_homebindY, m_homebindZ);
-    }
+    if (!ok)
+        SetHomebindToLocation(WorldLocation(info->mapId, info->positionX, info->positionY, info->positionZ));
 
     DEBUG_LOG("Setting player home position: mapid is: %u, zoneid is %u, X is %f, Y is %f, Z is %f",
-        m_homebindMapId, m_homebindAreaId, m_homebindX, m_homebindY, m_homebindZ);
+        m_homebind.GetMapId(), m_homebind.GetAreaId(), m_homebind.x, m_homebind.y, m_homebind.z);
 
     return true;
 }
@@ -17300,7 +17745,7 @@ void Player::SaveToDB()
     m_nextSave = sWorld.getConfig(CONFIG_UINT32_INTERVAL_SAVE);
 
     //lets allow only players in world to be saved
-    if(IsBeingTeleportedFar())
+    if (IsBeingTeleportedFar())
     {
         ScheduleDelayedOperation(DELAYED_SAVE_PLAYER);
         return;
@@ -17327,7 +17772,7 @@ void Player::SaveToDB()
         "trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, "
         "death_expire_time, taxi_path, arenaPoints, totalHonorPoints, todayHonorPoints, yesterdayHonorPoints, totalKills, "
         "todayKills, yesterdayKills, chosenTitle, knownCurrencies, watchedFaction, drunk, health, power1, power2, power3, "
-        "power4, power5, power6, power7, specCount, activeSpec, exploredZones, equipmentCache, ammoId, knownTitles, actionBars) "
+        "power4, power5, power6, power7, specCount, activeSpec, exploredZones, equipmentCache, ammoId, knownTitles, actionBars, grantableLevels) "
         "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
         "?, ?, ?, ?, ?, ?, "
         "?, ?, ?, "
@@ -17335,7 +17780,7 @@ void Player::SaveToDB()
         "?, ?, ?, ?, ?, ?, ?, ?, ?, "
         "?, ?, ?, ?, ?, ?, ?, "
         "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
-        "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ");
+        "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ");
 
     uberInsert.addUInt32(GetGUIDLow());
     uberInsert.addUInt32(GetSession()->GetAccountId());
@@ -17350,10 +17795,10 @@ void Player::SaveToDB()
     uberInsert.addUInt32(GetUInt32Value(PLAYER_BYTES_2));
     uberInsert.addUInt32(GetUInt32Value(PLAYER_FLAGS));
 
-    if(!IsBeingTeleported())
+    if (!IsBeingTeleported() && !IsBeingTeleportedDelayEvent())
     {
         uberInsert.addUInt32(GetMapId());
-        uberInsert.addUInt32(uint32(GetDungeonDifficulty()));
+        uberInsert.addUInt32(GetDifficulty());
         uberInsert.addFloat(finiteAlways(GetPositionX()));
         uberInsert.addFloat(finiteAlways(GetPositionY()));
         uberInsert.addFloat(finiteAlways(GetPositionZ()));
@@ -17361,16 +17806,17 @@ void Player::SaveToDB()
     }
     else
     {
-        uberInsert.addUInt32(GetTeleportDest().mapid);
-        uberInsert.addUInt32(uint32(GetDungeonDifficulty()));
-        uberInsert.addFloat(finiteAlways(GetTeleportDest().coord_x));
-        uberInsert.addFloat(finiteAlways(GetTeleportDest().coord_y));
-        uberInsert.addFloat(finiteAlways(GetTeleportDest().coord_z));
-        uberInsert.addFloat(finiteAlways(GetTeleportDest().orientation));
+        uberInsert.addUInt32(GetTeleportDest().GetMapId());
+        uberInsert.addUInt32(GetDifficulty());
+        uberInsert.addFloat(finiteAlways(GetTeleportDest().getX()));
+        uberInsert.addFloat(finiteAlways(GetTeleportDest().getY()));
+        uberInsert.addFloat(finiteAlways(GetTeleportDest().getZ()));
+        uberInsert.addFloat(finiteAlways(GetTeleportDest().getO()));
     }
 
     std::ostringstream ss;
-    ss << m_taxi;                                   // string with TaxiMaskSize numbers
+
+    ss << m_taxi;                                           // string with TaxiMaskSize numbers
     uberInsert.addString(ss);
 
     uberInsert.addUInt32(IsInWorld() ? 1 : 0);
@@ -17383,8 +17829,8 @@ void Player::SaveToDB()
     uberInsert.addFloat(finiteAlways(m_rest_bonus));
     uberInsert.addUInt64(uint64(time(NULL)));
     uberInsert.addUInt32(HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) ? 1 : 0);
-                                                            //save, far from tavern/city
-                                                            //save, but in tavern/city
+                                                            // save, far from tavern/city
+                                                            // save, but in tavern/city
     uberInsert.addUInt32(m_resetTalentsCost);
     uberInsert.addUInt64(uint64(m_resetTalentsTime));
 
@@ -17392,14 +17838,14 @@ void Player::SaveToDB()
     uberInsert.addFloat(finiteAlways(m_movementInfo.GetTransportPos()->y));
     uberInsert.addFloat(finiteAlways(m_movementInfo.GetTransportPos()->z));
     uberInsert.addFloat(finiteAlways(m_movementInfo.GetTransportPos()->o));
-    if (m_transport)
-        uberInsert.addUInt32(m_transport->GetGUIDLow());
+    if (IsOnTransport())
+        uberInsert.addUInt32(GetTransport()->GetGUIDLow());
     else
         uberInsert.addUInt32(0);
 
     uberInsert.addUInt32(m_ExtraFlags);
 
-    uberInsert.addUInt32(uint32(m_stableSlots));                    // to prevent save uint8 as char
+    uberInsert.addUInt32(uint32(m_stableSlots));            // to prevent save uint8 as char
 
     uberInsert.addUInt32(uint32(m_atLoginFlags));
 
@@ -17407,14 +17853,14 @@ void Player::SaveToDB()
 
     uberInsert.addUInt64(uint64(m_deathExpireTime));
 
-    ss << m_taxi.SaveTaxiDestinationsToString();       //string
+    ss << m_taxi.SaveTaxiDestinationsToString();            // string
     uberInsert.addString(ss);
 
     uberInsert.addUInt32(GetArenaPoints());
 
     uberInsert.addUInt32(GetHonorPoints());
 
-    uberInsert.addUInt32(GetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION) );
+    uberInsert.addUInt32(GetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION));
 
     uberInsert.addUInt32(GetUInt32Value(PLAYER_FIELD_YESTERDAY_CONTRIBUTION));
 
@@ -17431,38 +17877,46 @@ void Player::SaveToDB()
     // FIXME: at this moment send to DB as unsigned, including unit32(-1)
     uberInsert.addUInt32(GetUInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX));
 
-    uberInsert.addUInt16(uint16(GetUInt32Value(PLAYER_BYTES_3) & 0xFFFE));
+    uberInsert.addUInt8(GetDrunkValue());
 
     uberInsert.addUInt32(GetHealth());
 
-    for(uint32 i = 0; i < MAX_POWERS; ++i)
+    for (uint32 i = 0; i < MAX_POWERS; ++i)
         uberInsert.addUInt32(GetPower(Powers(i)));
 
     uberInsert.addUInt32(uint32(m_specsCount));
     uberInsert.addUInt32(uint32(m_activeSpec));
 
-    for(uint32 i = 0; i < PLAYER_EXPLORED_ZONES_SIZE; ++i )         //string
+    bool needDelimiter = false;
+    for (uint32 i = 0; i < PLAYER_EXPLORED_ZONES_SIZE; ++i) // string
     {
-        ss << GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + i) << " ";
+        needDelimiter ? ss << ' ' : needDelimiter = true;
+        ss << GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + i);
     }
     uberInsert.addString(ss);
 
-    for(uint32 i = 0; i < EQUIPMENT_SLOT_END * 2; ++i )             //string
+    needDelimiter = false;
+    for (uint32 i = 0; i < EQUIPMENT_SLOT_END * 2; ++i)     // string
     {
-        ss << GetUInt32Value(PLAYER_VISIBLE_ITEM_1_ENTRYID + i) << " ";
+        needDelimiter ? ss << ' ' : needDelimiter = true;
+        ss << GetUInt32Value(PLAYER_VISIBLE_ITEM_1_ENTRYID + i);
     }
     uberInsert.addString(ss);
 
     uberInsert.addUInt32(GetUInt32Value(PLAYER_AMMO_ID));
 
-    for(uint32 i = 0; i < KNOWN_TITLES_SIZE*2; ++i )                //string
+    needDelimiter = false;
+    for (uint32 i = 0; i < KNOWN_TITLES_SIZE * 2; ++i)      // string
     {
-        ss << GetUInt32Value(PLAYER__FIELD_KNOWN_TITLES + i) << " ";
+        needDelimiter ? ss << ' ' : needDelimiter = true;
+        ss << GetUInt32Value(PLAYER__FIELD_KNOWN_TITLES + i);
     }
     uberInsert.addString(ss);
 
     uberInsert.addUInt32(uint32(GetByteValue(PLAYER_FIELD_BYTES, 2)));
 
+    uberInsert.addUInt32(uint32(m_GrantableLevelsCount));
+
     uberInsert.Execute();
 
     if (m_mailsUpdated)                                     //save mails only when needed
@@ -17488,6 +17942,30 @@ void Player::SaveToDB()
 
     CharacterDatabase.CommitTransaction();
 
+    // wow armory begin
+    // Place this code AFTER CharacterDatabase.CommitTransaction(); to avoid some character saving errors.
+    // Wowarmory feeds
+    std::ostringstream sWowarmory;
+    for (WowarmoryFeeds::iterator iter = m_wowarmory_feeds.begin(); iter < m_wowarmory_feeds.end(); ++iter) {
+        sWowarmory << "INSERT IGNORE INTO character_feed_log (guid,type,data,date,counter,difficulty,item_guid,item_quality) VALUES ";
+        //                      guid                    type                        data                    date                            counter                   difficulty                        item_guid                      item_quality
+        sWowarmory << "(" << (*iter).guid << ", " << (*iter).type << ", " << (*iter).data << ", " << uint64((*iter).date) << ", " << (*iter).counter << ", " << uint32((*iter).difficulty) << ", " << (*iter).item_guid << ", " << (*iter).item_quality <<  ");";
+        CharacterDatabase.PExecute(sWowarmory.str().c_str());
+        sWowarmory.str("");
+    }
+    // Clear old saved feeds from storage - they are not required for server core.
+    InitWowarmoryFeeds();
+    // Character stats
+    std::ostringstream ps;
+    time_t t = time(NULL);
+    CharacterDatabase.PExecute("DELETE FROM armory_character_stats WHERE guid = %u", GetGUIDLow());
+    ps << "INSERT INTO armory_character_stats (guid, data, save_date) VALUES (" << GetGUIDLow() << ", '";
+    for (uint16 i = 0; i < m_valuesCount; ++i)
+        ps << GetUInt32Value(i) << " ";
+    ps << "', " << uint64(t) << ");";
+    CharacterDatabase.PExecute(ps.str().c_str());
+    // wow armory end
+
     // check if stats should only be saved on logout
     // save stats can be out of transaction
     if (m_session->isLogingOut() || !sWorld.getConfig(CONFIG_BOOL_STATS_SAVE_ONLY_ON_LOGOUT))
@@ -17507,10 +17985,9 @@ void Player::SaveInventoryAndGoldToDB()
 
 void Player::SaveGoldToDB()
 {
-    static SqlStatementID updateGold ;
-
-    SqlStatement stmt = CharacterDatabase.CreateStatement(updateGold, "UPDATE characters SET money = ? WHERE guid = ?");
-    stmt.PExecute(GetMoney(), GetGUIDLow());
+    static SqlStatementID updateGold;
+    CharacterDatabase.CreateStatement(updateGold, "UPDATE characters SET money = ? WHERE guid = ?")
+        .PExecute(GetMoney(), GetGUIDLow());
 }
 
 void Player::_SaveActions()
@@ -17519,9 +17996,9 @@ void Player::_SaveActions()
     static SqlStatementID updateAction ;
     static SqlStatementID deleteAction ;
 
-    for(int i = 0; i < MAX_TALENT_SPEC_COUNT; ++i)
+    for (int i = 0; i < MAX_TALENT_SPEC_COUNT; ++i)
     {
-        for(ActionButtonList::iterator itr = m_actionButtons[i].begin(); itr != m_actionButtons[i].end(); )
+        for (ActionButtonList::iterator itr = m_actionButtons[i].begin(); itr != m_actionButtons[i].end();)
         {
             switch (itr->second.uState)
             {
@@ -17574,24 +18051,28 @@ void Player::_SaveAuras()
     static SqlStatementID deleteAuras ;
     static SqlStatementID insertAuras ;
 
-    SqlStatement stmt = CharacterDatabase.CreateStatement(deleteAuras, "DELETE FROM character_aura WHERE guid = ?");
-    stmt.PExecute(GetGUIDLow());
+    MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+
+    SqlStatement stmt0 = CharacterDatabase.CreateStatement(deleteAuras, "DELETE FROM character_aura WHERE guid = ?");
+    stmt0.PExecute(GetGUIDLow());
 
     SpellAuraHolderMap const& auraHolders = GetSpellAuraHolderMap();
 
     if (auraHolders.empty())
         return;
 
-    stmt = CharacterDatabase.CreateStatement(insertAuras, "INSERT INTO character_aura (guid, caster_guid, item_guid, spell, stackcount, remaincharges, "
+    SqlStatement stmt = CharacterDatabase.CreateStatement(insertAuras, "INSERT INTO character_aura (guid, caster_guid, item_guid, spell, stackcount, remaincharges, "
         "basepoints0, basepoints1, basepoints2, periodictime0, periodictime1, periodictime2, maxduration, remaintime, effIndexMask) "
         "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
 
-    for(SpellAuraHolderMap::const_iterator itr = auraHolders.begin(); itr != auraHolders.end(); ++itr)
+    for (SpellAuraHolderMap::const_iterator itr = auraHolders.begin(); itr != auraHolders.end(); ++itr)
     {
-        SpellAuraHolder *holder = itr->second;
-        //skip all holders from spells that are passive or channeled
-        //do not save single target holders (unless they were cast by the player)
-        if (!holder->IsPassive() && !IsChanneledSpell(holder->GetSpellProto()) && (holder->GetCasterGuid() == GetObjectGuid() || !holder->IsSingleTarget()))
+        // skip all holders from spells that are passive or channeled
+        // save singleTarget auras if self cast.
+        bool selfCastHolder = itr->second->GetCasterGuid() == GetObjectGuid();
+        TrackedAuraType trackedType = itr->second->GetTrackedAuraType();
+        if (!itr->second->IsPassive() && !IsChanneledSpell(itr->second->GetSpellProto()) &&
+               (trackedType == TRACK_AURA_TYPE_NOT_TRACKED || (trackedType == TRACK_AURA_TYPE_SINGLE_TARGET && selfCastHolder)))
         {
             int32  damage[MAX_EFFECT_INDEX];
             uint32 periodicTime[MAX_EFFECT_INDEX];
@@ -17602,10 +18083,10 @@ void Player::_SaveAuras()
                 damage[i] = 0;
                 periodicTime[i] = 0;
 
-                if (Aura *aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i)))
+                if (Aura *aur = itr->second->GetAuraByEffectIndex(SpellEffectIndex(i)))
                 {
                     // don't save not own area auras
-                    if (aur->IsAreaAura() && holder->GetCasterGuid() != GetObjectGuid())
+                    if (aur->IsAreaAura() && itr->second->GetCasterGuid() != GetObjectGuid())
                         continue;
 
                     damage[i] = aur->GetModifier()->m_amount;
@@ -17618,11 +18099,11 @@ void Player::_SaveAuras()
                 continue;
 
             stmt.addUInt32(GetGUIDLow());
-            stmt.addUInt64(holder->GetCasterGuid().GetRawValue());
-            stmt.addUInt32(holder->GetCastItemGuid().GetCounter());
-            stmt.addUInt32(holder->GetId());
-            stmt.addUInt32(holder->GetStackAmount());
-            stmt.addUInt8(holder->GetAuraCharges());
+            stmt.addUInt64(itr->second->GetCasterGuid().GetRawValue());
+            stmt.addUInt32(itr->second->GetCastItemGuid().GetCounter());
+            stmt.addUInt32(itr->second->GetId());
+            stmt.addUInt32(itr->second->GetStackAmount());
+            stmt.addUInt8(itr->second->GetAuraCharges());
 
             for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
                 stmt.addInt32(damage[i]);
@@ -17630,8 +18111,8 @@ void Player::_SaveAuras()
             for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
                 stmt.addUInt32(periodicTime[i]);
 
-            stmt.addInt32(holder->GetAuraMaxDuration());
-            stmt.addInt32(holder->GetAuraDuration());
+            stmt.addInt32(itr->second->GetAuraMaxDuration());
+            stmt.addInt32(itr->second->GetAuraDuration());
             stmt.addUInt32(effIndexMask);
             stmt.Execute();
         }
@@ -17648,26 +18129,26 @@ void Player::_SaveGlyphs()
     {
         for (uint8 slot = 0; slot < MAX_GLYPH_SLOT_INDEX; ++slot)
         {
-            switch(m_glyphs[spec][slot].uState)
+            switch (m_glyphs[spec][slot].uState)
             {
                 case GLYPH_NEW:
-                    {
-                        SqlStatement stmt = CharacterDatabase.CreateStatement(insertGlyph, "INSERT INTO character_glyphs (guid, spec, slot, glyph) VALUES (?, ?, ?, ?)");
-                        stmt.PExecute(GetGUIDLow(), spec, slot, m_glyphs[spec][slot].GetId());
-                    }
+                {
+                    CharacterDatabase.CreateStatement(insertGlyph, "INSERT INTO character_glyphs (guid, spec, slot, glyph) VALUES (?, ?, ?, ?)")
+                        .PExecute(GetGUIDLow(), spec, slot, m_glyphs[spec][slot].GetId());
                     break;
+                }
                 case GLYPH_CHANGED:
-                    {
-                        SqlStatement stmt = CharacterDatabase.CreateStatement(updateGlyph, "UPDATE character_glyphs SET glyph = ? WHERE guid = ? AND spec = ? AND slot = ?");
-                        stmt.PExecute(m_glyphs[spec][slot].GetId(), GetGUIDLow(), spec, slot);
-                    }
+                {
+                    CharacterDatabase.CreateStatement(updateGlyph, "UPDATE character_glyphs SET glyph = ? WHERE guid = ? AND spec = ? AND slot = ?")
+                        .PExecute(m_glyphs[spec][slot].GetId(), GetGUIDLow(), spec, slot);
                     break;
+                }
                 case GLYPH_DELETED:
-                    {
-                        SqlStatement stmt = CharacterDatabase.CreateStatement(deleteGlyph, "DELETE FROM character_glyphs WHERE guid = ? AND spec = ? AND slot = ?");
-                        stmt.PExecute(GetGUIDLow(), spec, slot);
-                    }
+                {
+                    CharacterDatabase.CreateStatement(deleteGlyph, "DELETE FROM character_glyphs WHERE guid = ? AND spec = ? AND slot = ?")
+                        .PExecute(GetGUIDLow(), spec, slot);
                     break;
+                }
                 case GLYPH_UNCHANGED:
                     break;
             }
@@ -17682,46 +18163,49 @@ void Player::_SaveInventory()
     // and remove those that aren't already
     for (uint8 i = BUYBACK_SLOT_START; i < BUYBACK_SLOT_END; ++i)
     {
-        Item *item = m_items[i];
-        if (!item || item->GetState() == ITEM_NEW) continue;
-
-        static SqlStatementID delInv ;
-        static SqlStatementID delItemInst ;
-
-        SqlStatement stmt = CharacterDatabase.CreateStatement(delInv, "DELETE FROM character_inventory WHERE item = ?");
-        stmt.PExecute(item->GetGUIDLow());
+        Item* item = m_items[i];
+        if (!item || item->GetState() == ITEM_NEW)
+            continue;
 
-        stmt = CharacterDatabase.CreateStatement(delItemInst, "DELETE FROM item_instance WHERE guid = ?");
-        stmt.PExecute(item->GetGUIDLow());
+        item->DeleteFromInventoryDB();
+        item->DeleteFromDB();
 
         m_items[i]->FSetState(ITEM_NEW);
     }
 
+    // Update refund or soulbound traded items
+    UpdateItemsWithTimeCheck();
+
     // update enchantment durations
-    for(EnchantDurationList::const_iterator itr = m_enchantDuration.begin();itr != m_enchantDuration.end();++itr)
+    for (EnchantDurationList::const_iterator itr = m_enchantDuration.begin();itr != m_enchantDuration.end();++itr)
     {
         itr->item->SetEnchantmentDuration(itr->slot,itr->leftduration);
     }
 
     // if no changes
-    if (m_itemUpdateQueue.empty()) return;
+    if (m_itemUpdateQueue.empty())
+        return;
 
     // do not save if the update queue is corrupt
     bool error = false;
-    for(size_t i = 0; i < m_itemUpdateQueue.size(); ++i)
+    for (size_t i = 0; i < m_itemUpdateQueue.size(); ++i)
     {
-        Item *item = m_itemUpdateQueue[i];
-        if(!item || item->GetState() == ITEM_REMOVED) continue;
-        Item *test = GetItemByPos( item->GetBagSlot(), item->GetSlot());
+        Item* item = m_itemUpdateQueue[i];
+        if (!item || item->GetState() == ITEM_REMOVED)
+            continue;
+
+        Item* test = GetItemByPos(item->GetBagSlot(), item->GetSlot());
+
+        GetAntiCheat()->DoAntiCheatCheck(CHECK_ITEM_UPDATE, item, test);
 
         if (test == NULL)
         {
-            sLog.outError("Player(GUID: %u Name: %s)::_SaveInventory - the bag(%d) and slot(%d) values for the item with guid %d are incorrect, the player doesn't have an item at that position!", GetGUIDLow(), GetName(), item->GetBagSlot(), item->GetSlot(), item->GetGUIDLow());
+            sLog.outError("Player::_SaveInventory: %s - the bag (%d) and slot (%d) values for the %s are incorrect, the player doesn't have an item at that position!", GetGuidStr().c_str(), item->GetBagSlot(), item->GetSlot(), item->GetGuidStr().c_str());
             error = true;
         }
         else if (test != item)
         {
-            sLog.outError("Player(GUID: %u Name: %s)::_SaveInventory - the bag(%d) and slot(%d) values for the item with guid %d are incorrect, the item with guid %d is there instead!", GetGUIDLow(), GetName(), item->GetBagSlot(), item->GetSlot(), item->GetGUIDLow(), test->GetGUIDLow());
+            sLog.outError("Player::_SaveInventory: %s - the bag (%d) and slot (%d) values for the %s are incorrect, the %s is there instead!", GetGuidStr().c_str(), item->GetBagSlot(), item->GetSlot(), item->GetGuidStr().c_str(), test->GetGuidStr().c_str());
             error = true;
         }
     }
@@ -17733,48 +18217,47 @@ void Player::_SaveInventory()
         return;
     }
 
-    static SqlStatementID insertInventory ;
-    static SqlStatementID updateInventory ;
-    static SqlStatementID deleteInventory ;
+    static SqlStatementID insertInventory;
+    static SqlStatementID updateInventory;
 
-    for(size_t i = 0; i < m_itemUpdateQueue.size(); ++i)
+    for (size_t i = 0; i < m_itemUpdateQueue.size(); ++i)
     {
-        Item *item = m_itemUpdateQueue[i];
-        if(!item) continue;
+        Item* item = m_itemUpdateQueue[i];
+        if (!item)
+            continue;
 
-        Bag *container = item->GetContainer();
+        Bag* container = item->GetContainer();
         uint32 bag_guid = container ? container->GetGUIDLow() : 0;
 
-        switch(item->GetState())
+        switch (item->GetState())
         {
             case ITEM_NEW:
-                {
-                    SqlStatement stmt = CharacterDatabase.CreateStatement(insertInventory, "INSERT INTO character_inventory (guid,bag,slot,item,item_template) VALUES (?, ?, ?, ?, ?)");
-                    stmt.addUInt32(GetGUIDLow());
-                    stmt.addUInt32(bag_guid);
-                    stmt.addUInt8(item->GetSlot());
-                    stmt.addUInt32(item->GetGUIDLow());
-                    stmt.addUInt32(item->GetEntry());
-                    stmt.Execute();
-                }
+            {
+                SqlStatement stmt = CharacterDatabase.CreateStatement(insertInventory, "INSERT INTO character_inventory (guid,bag,slot,item,item_template) VALUES (?, ?, ?, ?, ?)");
+                stmt.addUInt32(GetGUIDLow());
+                stmt.addUInt32(bag_guid);
+                stmt.addUInt8(item->GetSlot());
+                stmt.addUInt32(item->GetGUIDLow());
+                stmt.addUInt32(item->GetEntry());
+                stmt.Execute();
                 break;
+            }
             case ITEM_CHANGED:
-                {
-                    SqlStatement stmt = CharacterDatabase.CreateStatement(updateInventory, "UPDATE character_inventory SET guid = ?, bag = ?, slot = ?, item_template = ? WHERE item = ?");
-                    stmt.addUInt32(GetGUIDLow());
-                    stmt.addUInt32(bag_guid);
-                    stmt.addUInt8(item->GetSlot());
-                    stmt.addUInt32(item->GetEntry());
-                    stmt.addUInt32(item->GetGUIDLow());
-                    stmt.Execute();
-                }
+            {
+                SqlStatement stmt = CharacterDatabase.CreateStatement(updateInventory, "UPDATE character_inventory SET guid = ?, bag = ?, slot = ?, item_template = ? WHERE item = ?");
+                stmt.addUInt32(GetGUIDLow());
+                stmt.addUInt32(bag_guid);
+                stmt.addUInt8(item->GetSlot());
+                stmt.addUInt32(item->GetEntry());
+                stmt.addUInt32(item->GetGUIDLow());
+                stmt.Execute();
                 break;
+            }
             case ITEM_REMOVED:
-                {
-                    SqlStatement stmt = CharacterDatabase.CreateStatement(deleteInventory, "DELETE FROM character_inventory WHERE item = ?");
-                    stmt.PExecute(item->GetGUIDLow());
-                }
+            {
+                item->DeleteFromInventoryDB();
                 break;
+            }
             case ITEM_UNCHANGED:
                 break;
         }
@@ -17786,16 +18269,16 @@ void Player::_SaveInventory()
 
 void Player::_SaveMail()
 {
-    static SqlStatementID updateMail ;
-    static SqlStatementID deleteMailItems ;
+    static SqlStatementID updateMail;
+    static SqlStatementID deleteMailItems;
 
-    static SqlStatementID deleteItem ;
-    static SqlStatementID deleteMain ;
-    static SqlStatementID deleteItems ;
+    static SqlStatementID deleteItem;
+    static SqlStatementID deleteMain;
+    static SqlStatementID deleteItems;
 
     for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr)
     {
-        Mail *m = (*itr);
+        Mail* m = (*itr);
         if (m->state == MAIL_STATE_CHANGED)
         {
             SqlStatement stmt = CharacterDatabase.CreateStatement(updateMail, "UPDATE mail SET has_items = ?, expire_time = ?, deliver_time = ?, money = ?, cod = ?, checked = ? WHERE id = ?");
@@ -17808,11 +18291,11 @@ void Player::_SaveMail()
             stmt.addUInt32(m->messageID);
             stmt.Execute();
 
-            if(m->removedItems.size())
+            if (!m->removedItems.empty())
             {
                 stmt = CharacterDatabase.CreateStatement(deleteMailItems, "DELETE FROM mail_items WHERE item_guid = ?");
 
-                for(std::vector<uint32>::const_iterator itr2 = m->removedItems.begin(); itr2 != m->removedItems.end(); ++itr2)
+                for (std::vector<uint32>::const_iterator itr2 = m->removedItems.begin(); itr2 != m->removedItems.end(); ++itr2)
                     stmt.PExecute(*itr2);
 
                 m->removedItems.clear();
@@ -17824,7 +18307,7 @@ void Player::_SaveMail()
             if (m->HasItems())
             {
                 SqlStatement stmt = CharacterDatabase.CreateStatement(deleteItem, "DELETE FROM item_instance WHERE guid = ?");
-                for(MailItemInfoVec::const_iterator itr2 = m->items.begin(); itr2 != m->items.end(); ++itr2)
+                for (MailItemInfoVec::const_iterator itr2 = m->items.begin(); itr2 != m->items.end(); ++itr2)
                     stmt.PExecute(itr2->item_guid);
             }
 
@@ -17836,8 +18319,8 @@ void Player::_SaveMail()
         }
     }
 
-    //deallocate deleted mails...
-    for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); )
+    // deallocate deleted mails...
+    for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end();)
     {
         if ((*itr)->state == MAIL_STATE_DELETED)
         {
@@ -17855,55 +18338,66 @@ void Player::_SaveMail()
 
 void Player::_SaveQuestStatus()
 {
-    static SqlStatementID insertQuestStatus ;
-
-    static SqlStatementID updateQuestStatus ;
+    static SqlStatementID insertQuestStatus;
+    static SqlStatementID updateQuestStatus;
 
     // we don't need transactions here.
-    for( QuestStatusMap::iterator i = mQuestStatus.begin( ); i != mQuestStatus.end( ); ++i )
+    for (QuestStatusMap::const_iterator i = GetQuestStatusMap().begin(); i != GetQuestStatusMap().end(); ++i)
     {
-        switch (i->second.uState)
+        QuestStatusData const* data = &i->second;
+        if (!data)
+            continue;
+        uint32 questID              = i->first;
+
+        switch (data->uState)
         {
-            case QUEST_NEW :
-                {
-                    SqlStatement stmt = CharacterDatabase.CreateStatement(insertQuestStatus, "INSERT INTO character_queststatus (guid,quest,status,rewarded,explored,timer,mobcount1,mobcount2,mobcount3,mobcount4,itemcount1,itemcount2,itemcount3,itemcount4,itemcount5,itemcount6) "
-                        "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+            case QUEST_NEW:
+            {
+                SqlStatement stmt = CharacterDatabase.CreateStatement(insertQuestStatus, "INSERT INTO character_queststatus (guid,quest,status,rewarded,explored,timer,mobcount1,mobcount2,mobcount3,mobcount4,itemcount1,itemcount2,itemcount3,itemcount4,itemcount5,itemcount6) "
+                    "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+
+                stmt.addUInt32(GetGUIDLow());
+                stmt.addUInt32(questID);
+                stmt.addUInt8(data->m_status);
+                stmt.addUInt8(data->m_rewarded);
+                stmt.addUInt8(data->m_explored);
+                stmt.addUInt64(uint64(data->m_timer / IN_MILLISECONDS + sWorld.GetGameTime()));
+                for (int k = 0; k < QUEST_OBJECTIVES_COUNT; ++k)
+                    stmt.addUInt32(data->m_creatureOrGOcount[k]);
+                for (int k = 0; k < QUEST_ITEM_OBJECTIVES_COUNT; ++k)
+                    stmt.addUInt32(data->m_itemcount[k]);
+                stmt.Execute();
+
+                if (QuestStatusData* _data = GetQuestStatusData(questID))
+                    _data->uState = QUEST_UNCHANGED;
 
-                    stmt.addUInt32(GetGUIDLow());
-                    stmt.addUInt32(i->first);
-                    stmt.addUInt8(i->second.m_status);
-                    stmt.addUInt8(i->second.m_rewarded);
-                    stmt.addUInt8(i->second.m_explored);
-                    stmt.addUInt64(uint64(i->second.m_timer / IN_MILLISECONDS+ sWorld.GetGameTime()));
-                    for (int k = 0; k < QUEST_OBJECTIVES_COUNT; ++k)
-                        stmt.addUInt32(i->second.m_creatureOrGOcount[k]);
-                    for (int k = 0; k < QUEST_ITEM_OBJECTIVES_COUNT; ++k)
-                        stmt.addUInt32(i->second.m_itemcount[k]);
-                    stmt.Execute();
-                }
                 break;
-            case QUEST_CHANGED :
-                {
-                    SqlStatement stmt = CharacterDatabase.CreateStatement(updateQuestStatus, "UPDATE character_queststatus SET status = ?,rewarded = ?,explored = ?,timer = ?,"
-                        "mobcount1 = ?,mobcount2 = ?,mobcount3 = ?,mobcount4 = ?,itemcount1 = ?,itemcount2 = ?,itemcount3 = ?,itemcount4 = ?,itemcount5 = ?,itemcount6 = ? WHERE guid = ? AND quest = ?");
-
-                    stmt.addUInt8(i->second.m_status);
-                    stmt.addUInt8(i->second.m_rewarded);
-                    stmt.addUInt8(i->second.m_explored);
-                    stmt.addUInt64(uint64(i->second.m_timer / IN_MILLISECONDS + sWorld.GetGameTime()));
-                    for (int k = 0; k < QUEST_OBJECTIVES_COUNT; ++k)
-                        stmt.addUInt32(i->second.m_creatureOrGOcount[k]);
-                    for (int k = 0; k < QUEST_ITEM_OBJECTIVES_COUNT; ++k)
-                        stmt.addUInt32(i->second.m_itemcount[k]);
-                    stmt.addUInt32(GetGUIDLow());
-                    stmt.addUInt32(i->first);
-                    stmt.Execute();
-                }
+            }
+            case QUEST_CHANGED:
+            {
+                SqlStatement stmt = CharacterDatabase.CreateStatement(updateQuestStatus, "UPDATE character_queststatus SET status = ?,rewarded = ?,explored = ?,timer = ?,"
+                    "mobcount1 = ?,mobcount2 = ?,mobcount3 = ?,mobcount4 = ?,itemcount1 = ?,itemcount2 = ?,itemcount3 = ?,itemcount4 = ?,itemcount5 = ?,itemcount6 = ? WHERE guid = ? AND quest = ?");
+
+                stmt.addUInt8(data->m_status);
+                stmt.addUInt8(data->m_rewarded);
+                stmt.addUInt8(data->m_explored);
+                stmt.addUInt64(uint64(data->m_timer / IN_MILLISECONDS + sWorld.GetGameTime()));
+                for (int k = 0; k < QUEST_OBJECTIVES_COUNT; ++k)
+                    stmt.addUInt32(data->m_creatureOrGOcount[k]);
+                for (int k = 0; k < QUEST_ITEM_OBJECTIVES_COUNT; ++k)
+                    stmt.addUInt32(data->m_itemcount[k]);
+                stmt.addUInt32(GetGUIDLow());
+                stmt.addUInt32(questID);
+                stmt.Execute();
+
+                if (QuestStatusData* _data = GetQuestStatusData(questID))
+                    _data->uState = QUEST_UNCHANGED;
                 break;
+            }
             case QUEST_UNCHANGED:
+            default:
                 break;
-        };
-        i->second.uState = QUEST_UNCHANGED;
+        }
     }
 }
 
@@ -17913,15 +18407,14 @@ void Player::_SaveDailyQuestStatus()
         return;
 
     // we don't need transactions here.
-    static SqlStatementID delQuestStatus ;
-    static SqlStatementID insQuestStatus ;
+    static SqlStatementID delQuestStatus;
+    CharacterDatabase.CreateStatement(delQuestStatus, "DELETE FROM character_queststatus_daily WHERE guid = ?")
+        .PExecute(GetGUIDLow());
 
-    SqlStatement stmtDel = CharacterDatabase.CreateStatement(delQuestStatus, "DELETE FROM character_queststatus_daily WHERE guid = ?");
+    static SqlStatementID insQuestStatus;
     SqlStatement stmtIns = CharacterDatabase.CreateStatement(insQuestStatus, "INSERT INTO character_queststatus_daily (guid,quest) VALUES (?, ?)");
 
-    stmtDel.PExecute(GetGUIDLow());
-
-    for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
+    for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
         if (GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx))
             stmtIns.PExecute(GetGUIDLow(), GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx));
 
@@ -17934,17 +18427,16 @@ void Player::_SaveWeeklyQuestStatus()
         return;
 
     // we don't need transactions here.
-    static SqlStatementID delQuestStatus ;
-    static SqlStatementID insQuestStatus  ;
-
-    SqlStatement stmtDel = CharacterDatabase.CreateStatement(delQuestStatus, "DELETE FROM character_queststatus_weekly WHERE guid = ?");
-    SqlStatement stmtIns =  CharacterDatabase.CreateStatement(insQuestStatus, "INSERT INTO character_queststatus_weekly (guid,quest) VALUES (?, ?)");
+    static SqlStatementID delQuestStatus;
+    CharacterDatabase.CreateStatement(delQuestStatus, "DELETE FROM character_queststatus_weekly WHERE guid = ?")
+        .PExecute(GetGUIDLow());
 
-    stmtDel.PExecute(GetGUIDLow());
+    static SqlStatementID insQuestStatus;
+    SqlStatement stmtIns = CharacterDatabase.CreateStatement(insQuestStatus, "INSERT INTO character_queststatus_weekly (guid, quest) VALUES (?, ?)");
 
     for (QuestSet::const_iterator iter = m_weeklyquests.begin(); iter != m_weeklyquests.end(); ++iter)
     {
-        uint32 quest_id  = *iter;
+        uint32 quest_id = *iter;
         stmtIns.PExecute(GetGUIDLow(), quest_id);
     }
 
@@ -17957,14 +18449,13 @@ void Player::_SaveMonthlyQuestStatus()
         return;
 
     // we don't need transactions here.
-    static SqlStatementID deleteQuest ;
-    static SqlStatementID insertQuest ;
+    static SqlStatementID deleteQuest;
+    CharacterDatabase.CreateStatement(deleteQuest, "DELETE FROM character_queststatus_monthly WHERE guid = ?")
+        .PExecute(GetGUIDLow());
 
-    SqlStatement stmtDel = CharacterDatabase.CreateStatement(deleteQuest, "DELETE FROM character_queststatus_monthly WHERE guid = ?");
+    static SqlStatementID insertQuest;
     SqlStatement stmtIns = CharacterDatabase.CreateStatement(insertQuest, "INSERT INTO character_queststatus_monthly (guid, quest) VALUES (?, ?)");
 
-    stmtDel.PExecute(GetGUIDLow());
-
     for (QuestSet::const_iterator iter = m_monthlyquests.begin(); iter != m_monthlyquests.end(); ++iter)
     {
         uint32 quest_id = *iter;
@@ -17976,23 +18467,23 @@ void Player::_SaveMonthlyQuestStatus()
 
 void Player::_SaveSkills()
 {
-    static SqlStatementID delSkills ;
-    static SqlStatementID insSkills ;
-    static SqlStatementID updSkills ;
+    static SqlStatementID delSkills;
+    static SqlStatementID insSkills;
+    static SqlStatementID updSkills;
 
     // we don't need transactions here.
-    for( SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); )
+    for (SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end();)
     {
-        if(itr->second.uState == SKILL_UNCHANGED)
+        if (itr->second.uState == SKILL_UNCHANGED)
         {
             ++itr;
             continue;
         }
 
-        if(itr->second.uState == SKILL_DELETED)
+        if (itr->second.uState == SKILL_DELETED)
         {
             SqlStatement stmt = CharacterDatabase.CreateStatement(delSkills, "DELETE FROM character_skills WHERE guid = ? AND skill = ?");
-            stmt.PExecute(GetGUIDLow(), itr->first );
+            stmt.PExecute(GetGUIDLow(), itr->first);
             mSkillStatus.erase(itr++);
             continue;
         }
@@ -18004,22 +18495,22 @@ void Player::_SaveSkills()
         switch (itr->second.uState)
         {
             case SKILL_NEW:
-                {
-                    SqlStatement stmt = CharacterDatabase.CreateStatement(insSkills, "INSERT INTO character_skills (guid, skill, value, max) VALUES (?, ?, ?, ?)");
-                    stmt.PExecute(GetGUIDLow(), itr->first, value, max);
-                }
+            {
+                SqlStatement stmt = CharacterDatabase.CreateStatement(insSkills, "INSERT INTO character_skills (guid, skill, value, max) VALUES (?, ?, ?, ?)");
+                stmt.PExecute(GetGUIDLow(), itr->first, value, max);
                 break;
+            }
             case SKILL_CHANGED:
-                {
-                    SqlStatement stmt = CharacterDatabase.CreateStatement(updSkills, "UPDATE character_skills SET value = ?, max = ? WHERE guid = ? AND skill = ?");
-                    stmt.PExecute(value, max, GetGUIDLow(), itr->first );
-                }
+            {
+                SqlStatement stmt = CharacterDatabase.CreateStatement(updSkills, "UPDATE character_skills SET value = ?, max = ? WHERE guid = ? AND skill = ?");
+                stmt.PExecute(value, max, GetGUIDLow(), itr->first);
                 break;
+            }
             case SKILL_UNCHANGED:
             case SKILL_DELETED:
                 MANGOS_ASSERT(false);
                 break;
-        };
+        }
         itr->second.uState = SKILL_UNCHANGED;
 
         ++itr;
@@ -18028,8 +18519,8 @@ void Player::_SaveSkills()
 
 void Player::_SaveSpells()
 {
-    static SqlStatementID delSpells ;
-    static SqlStatementID insSpells ;
+    static SqlStatementID delSpells;
+    static SqlStatementID insSpells;
 
     SqlStatement stmtDel = CharacterDatabase.CreateStatement(delSpells, "DELETE FROM character_spell WHERE guid = ? and spell = ?");
     SqlStatement stmtIns = CharacterDatabase.CreateStatement(insSpells, "INSERT INTO character_spell (guid,spell,active,disabled) VALUES (?, ?, ?, ?)");
@@ -18049,20 +18540,19 @@ void Player::_SaveSpells()
         }
 
         if (itr->second.state == PLAYERSPELL_REMOVED)
-            m_spells.erase(itr++);
+            itr = m_spells.erase(itr);
         else
         {
             itr->second.state = PLAYERSPELL_UNCHANGED;
             ++itr;
         }
-
     }
 }
 
 void Player::_SaveTalents()
 {
-    static SqlStatementID delTalents ;
-    static SqlStatementID insTalents ;
+    static SqlStatementID delTalents;
+    static SqlStatementID insTalents;
 
     SqlStatement stmtDel = CharacterDatabase.CreateStatement(delTalents, "DELETE FROM character_talent WHERE guid = ? and talent_id = ? and spec = ?");
     SqlStatement stmtIns = CharacterDatabase.CreateStatement(insTalents, "INSERT INTO character_talent (guid, talent_id, current_rank , spec) VALUES (?, ?, ?, ?)");
@@ -18094,28 +18584,32 @@ void Player::_SaveTalents()
 void Player::_SaveStats()
 {
     // check if stat saving is enabled and if char level is high enough
-    if(!sWorld.getConfig(CONFIG_UINT32_MIN_LEVEL_STAT_SAVE) || getLevel() < sWorld.getConfig(CONFIG_UINT32_MIN_LEVEL_STAT_SAVE))
+    if (!sWorld.getConfig(CONFIG_UINT32_MIN_LEVEL_STAT_SAVE) || getLevel() < sWorld.getConfig(CONFIG_UINT32_MIN_LEVEL_STAT_SAVE))
         return;
 
-    static SqlStatementID delStats ;
-    static SqlStatementID insertStats ;
-
-    SqlStatement stmt = CharacterDatabase.CreateStatement(delStats, "DELETE FROM character_stats WHERE guid = ?");
-    stmt.PExecute(GetGUIDLow());
+    static SqlStatementID delStats;
+    CharacterDatabase.CreateStatement(delStats, "DELETE FROM character_stats WHERE guid = ?")
+        .PExecute(GetGUIDLow());
 
-    stmt = CharacterDatabase.CreateStatement(insertStats, "INSERT INTO character_stats (guid, maxhealth, maxpower1, maxpower2, maxpower3, maxpower4, maxpower5, maxpower6, maxpower7, "
+    static SqlStatementID insertStats;
+    SqlStatement stmt = CharacterDatabase.CreateStatement(insertStats, "INSERT INTO character_stats (guid, maxhealth, maxpower1, maxpower2, maxpower3, maxpower4, maxpower5, maxpower6, maxpower7, "
         "strength, agility, stamina, intellect, spirit, armor, resHoly, resFire, resNature, resFrost, resShadow, resArcane, "
-        "blockPct, dodgePct, parryPct, critPct, rangedCritPct, spellCritPct, attackPower, rangedAttackPower, spellPower) "
-        "VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+        "blockPct, dodgePct, parryPct, critPct, rangedCritPct, spellCritPct, attackPower, rangedAttackPower, spellPower, "
+        "apmelee, ranged, blockrating, defrating, dodgerating, parryrating, resilience, manaregen, "
+        "melee_hitrating, melee_critrating, melee_hasterating, melee_mainmindmg, melee_mainmaxdmg, "
+        "melee_offmindmg, melee_offmaxdmg, melee_maintime, melee_offtime, ranged_critrating, ranged_hasterating, "
+        "ranged_hitrating, ranged_mindmg, ranged_maxdmg, ranged_attacktime, "
+        "spell_hitrating, spell_critrating, spell_hasterating, spell_bonusdmg, spell_bonusheal, spell_critproc, account, name, race, class, gender, level, map, money, totaltime, online, arenaPoints, totalHonorPoints, totalKills, equipmentCache, specCount, activeSpec, data) "
+        "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
 
     stmt.addUInt32(GetGUIDLow());
     stmt.addUInt32(GetMaxHealth());
-    for(int i = 0; i < MAX_POWERS; ++i)
+    for (int i = 0; i < MAX_POWERS; ++i)
         stmt.addUInt32(GetMaxPower(Powers(i)));
-    for(int i = 0; i < MAX_STATS; ++i)
+    for (int i = 0; i < MAX_STATS; ++i)
         stmt.addFloat(GetStat(Stats(i)));
     // armor + school resistances
-    for(int i = 0; i < MAX_SPELL_SCHOOL; ++i)
+    for (int i = 0; i < MAX_SPELL_SCHOOL; ++i)
         stmt.addUInt32(GetResistance(SpellSchools(i)));
     stmt.addFloat(GetFloatValue(PLAYER_BLOCK_PERCENTAGE));
     stmt.addFloat(GetFloatValue(PLAYER_DODGE_PERCENTAGE));
@@ -18126,6 +18620,65 @@ void Player::_SaveStats()
     stmt.addUInt32(GetUInt32Value(UNIT_FIELD_ATTACK_POWER));
     stmt.addUInt32(GetUInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER));
     stmt.addUInt32(GetBaseSpellPowerBonus());
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_AP_MELEE_1)+GetUInt32Value(MANGOSR2_AP_MELEE_2));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_AP_RANGED_1)+GetUInt32Value(MANGOSR2_AP_RANGED_2));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_BLOCKRATING));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_DEFRATING));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_DODGERATING));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_PARRYRATING));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_RESILIENCE));
+    stmt.addFloat(GetFloatValue(MANGOSR2_MANAREGEN));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_MELEE_HITRATING));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_MELEE_CRITRATING));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_MELEE_HASTERATING));
+    stmt.addFloat(GetFloatValue(MANGOSR2_MELEE_MAINMINDMG));
+    stmt.addFloat(GetFloatValue(MANGOSR2_MELEE_MAINMAXDMG));
+    stmt.addFloat(GetFloatValue(MANGOSR2_MELEE_OFFMINDMG));
+    stmt.addFloat(GetFloatValue(MANGOSR2_MELEE_OFFMAXDMG));
+    stmt.addFloat(GetFloatValue(MANGOSR2_MELLE_MAINTIME));
+    stmt.addFloat(GetFloatValue(MANGOSR2_MELLE_OFFTIME));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_RANGED_CRITRATING));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_RANGED_HASTERATING));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_RANGED_HITRATING));
+    stmt.addFloat(GetFloatValue(MANGOSR2_RANGED_MINDMG));
+    stmt.addFloat(GetFloatValue(MANGOSR2_RANGED_MAXDMG));
+    stmt.addFloat(GetFloatValue(MANGOSR2_RANGED_ATTACKTIME));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_SPELL_HITRATING));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_SPELL_CRITRATING));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_SPELL_HASTERATING));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_SPELL_BONUSDMG));
+    stmt.addUInt32(GetUInt32Value(MANGOSR2_SPELL_BONUSHEAL));
+    stmt.addFloat(GetFloatValue(MANGOSR2_SPELL_CRITPROC));
+    stmt.addUInt32(GetSession()->GetAccountId());
+    stmt.addString(m_name); // duh
+    stmt.addUInt32((uint32)getRace());
+    stmt.addUInt32((uint32)getClass());
+    stmt.addUInt32((uint32)getGender());
+    stmt.addUInt32(getLevel());
+    stmt.addUInt32(GetMapId());
+    stmt.addUInt32(GetMoney());
+    stmt.addUInt32(m_Played_time[PLAYED_TIME_TOTAL]);
+    stmt.addUInt32(IsInWorld() ? 1 : 0);
+    stmt.addUInt32(GetArenaPoints());
+    stmt.addUInt32(GetHonorPoints());
+    stmt.addUInt32(GetUInt32Value(PLAYER_FIELD_LIFETIME_HONORBALE_KILLS));
+
+    std::ostringstream ss; // duh
+    for (uint32 i = 0; i < EQUIPMENT_SLOT_END * 2; ++i)             // EquipmentCache string
+    {
+        ss << GetUInt32Value(PLAYER_VISIBLE_ITEM_1_ENTRYID + i) << " ";
+    }
+    stmt.addString(ss);     // equipment cache string
+
+    stmt.addUInt32(uint32(m_specsCount));
+    stmt.addUInt32(uint32(m_activeSpec));
+
+    std::ostringstream ps; // duh
+    for (uint16 i = 0; i < m_valuesCount; ++i)  //data string
+    {
+        ps << GetUInt32Value(i) << " ";
+    }
+    stmt.addString(ps);   //data string
 
     stmt.Execute();
 }
@@ -18133,7 +18686,7 @@ void Player::_SaveStats()
 void Player::outDebugStatsValues() const
 {
     // optimize disabled debug output
-    if(!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG) || sLog.HasLogFilter(LOG_FILTER_PLAYER_STATS))
+    if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG) || sLog.HasLogFilter(LOG_FILTER_PLAYER_STATS))
         return;
 
     sLog.outDebug("HP is: \t\t\t%u\t\tMP is: \t\t\t%u",GetMaxHealth(), GetMaxPower(POWER_MANA));
@@ -18157,22 +18710,22 @@ void Player::outDebugStatsValues() const
 void Player::UpdateSpeakTime()
 {
     // ignore chat spam protection for GMs in any mode
-    if(GetSession()->GetSecurity() > SEC_PLAYER)
+    if (GetSession()->GetSecurity() > SEC_PLAYER)
         return;
 
-    time_t current = time (NULL);
-    if(m_speakTime > current)
+    time_t current = time(NULL);
+    if (m_speakTime > current)
     {
         uint32 max_count = sWorld.getConfig(CONFIG_UINT32_CHATFLOOD_MESSAGE_COUNT);
-        if(!max_count)
+        if (!max_count)
             return;
 
         ++m_speakCount;
-        if(m_speakCount >= max_count)
+        if (m_speakCount >= max_count)
         {
             // prevent overwrite mute time, if message send just before mutes set, for example.
             time_t new_mute = current + sWorld.getConfig(CONFIG_UINT32_CHATFLOOD_MUTE_TIME);
-            if(GetSession()->m_muteTime < new_mute)
+            if (GetSession()->m_muteTime < new_mute)
                 GetSession()->m_muteTime = new_mute;
 
             m_speakCount = 0;
@@ -18186,7 +18739,7 @@ void Player::UpdateSpeakTime()
 
 bool Player::CanSpeak() const
 {
-    return  GetSession()->m_muteTime <= time (NULL);
+    return GetSession()->m_muteTime <= time(NULL);
 }
 
 /*********************************************************/
@@ -18196,7 +18749,7 @@ bool Player::CanSpeak() const
 void Player::SendAttackSwingNotInRange()
 {
     WorldPacket data(SMSG_ATTACKSWING_NOTINRANGE, 0);
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
 void Player::SavePositionInDB(ObjectGuid guid, uint32 mapid, float x, float y, float z, float o, uint32 zone)
@@ -18213,9 +18766,9 @@ void Player::SavePositionInDB(ObjectGuid guid, uint32 mapid, float x, float y, f
 void Player::SetUInt32ValueInArray(Tokens& tokens,uint16 index, uint32 value)
 {
     char buf[11];
-    snprintf(buf,11,"%u",value);
+    snprintf(buf, 11, "%u", value);
 
-    if(index >= tokens.size())
+    if (index >= tokens.size())
         return;
 
     tokens[index] = buf;
@@ -18224,7 +18777,7 @@ void Player::SetUInt32ValueInArray(Tokens& tokens,uint16 index, uint32 value)
 void Player::Customize(ObjectGuid guid, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair)
 {
     //                                                     0
-    QueryResult* result = CharacterDatabase.PQuery("SELECT playerBytes2 FROM characters WHERE guid = '%u'", guid.GetCounter());
+    QueryResult* result = CharacterDatabase.PQuery("SELECT playerBytes2 FROM characters WHERE guid = %u", guid.GetCounter());
     if (!result)
         return;
 
@@ -18234,7 +18787,7 @@ void Player::Customize(ObjectGuid guid, uint8 gender, uint8 skin, uint8 face, ui
     player_bytes2 &= ~0xFF;
     player_bytes2 |= facialHair;
 
-    CharacterDatabase.PExecute("UPDATE characters SET gender = '%u', playerBytes = '%u', playerBytes2 = '%u' WHERE guid = '%u'", gender, skin | (face << 8) | (hairStyle << 16) | (hairColor << 24), player_bytes2, guid.GetCounter());
+    CharacterDatabase.PExecute("UPDATE characters SET gender = %u, playerBytes = %u, playerBytes2 = %u WHERE guid = %u", gender, skin | (face << 8) | (hairStyle << 16) | (hairColor << 24), player_bytes2, guid.GetCounter());
 
     delete result;
 }
@@ -18242,37 +18795,37 @@ void Player::Customize(ObjectGuid guid, uint8 gender, uint8 skin, uint8 face, ui
 void Player::SendAttackSwingDeadTarget()
 {
     WorldPacket data(SMSG_ATTACKSWING_DEADTARGET, 0);
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
 void Player::SendAttackSwingCantAttack()
 {
     WorldPacket data(SMSG_ATTACKSWING_CANT_ATTACK, 0);
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
 void Player::SendAttackSwingCancelAttack()
 {
     WorldPacket data(SMSG_CANCEL_COMBAT, 0);
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
 void Player::SendAttackSwingBadFacingAttack()
 {
     WorldPacket data(SMSG_ATTACKSWING_BADFACING, 0);
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
 void Player::SendAutoRepeatCancel(Unit *target)
 {
     WorldPacket data(SMSG_CANCEL_AUTO_REPEAT, target->GetPackGUID().size());
     data << target->GetPackGUID();
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 }
 
 void Player::SendExplorationExperience(uint32 Area, uint32 Experience)
 {
-    WorldPacket data( SMSG_EXPLORATION_EXPERIENCE, 8 );
+    WorldPacket data(SMSG_EXPLORATION_EXPERIENCE, 8);
     data << uint32(Area);
     data << uint32(Experience);
     GetSession()->SendPacket(&data);
@@ -18334,7 +18887,7 @@ void Player::ResetInstances(InstanceResetMethod method, bool isRaid)
         }
 
         // if the map is loaded, reset it
-        if (Map *map = sMapMgr.FindMap(state->GetMapId(), state->GetInstanceId()))
+        if (Map* map = sMapMgr.FindMap(state->GetMapId(), state->GetInstanceId()))
             if (map->IsDungeon())
                 ((DungeonMap*)map)->Reset(method);
 
@@ -18346,7 +18899,7 @@ void Player::ResetInstances(InstanceResetMethod method, bool isRaid)
         m_boundInstances[diff].erase(itr++);
 
         // the following should remove the instance save from the manager and delete it as well
-        state->RemovePlayer(this);
+        state->RemoveFromBindList(GetObjectGuid());
     }
 }
 
@@ -18373,30 +18926,30 @@ void Player::SendResetInstanceFailed(uint32 reason, uint32 MapId)
 ///checks the 15 afk reports per 5 minutes limit
 void Player::UpdateAfkReport(time_t currTime)
 {
-    if(m_bgData.bgAfkReportedTimer <= currTime)
+    if (m_bgData.bgAfkReportedTimer <= currTime)
     {
         m_bgData.bgAfkReportedCount = 0;
-        m_bgData.bgAfkReportedTimer = currTime+5*MINUTE;
+        m_bgData.bgAfkReportedTimer = currTime + 5 * MINUTE;
     }
 }
 
 void Player::UpdateContestedPvP(uint32 diff)
 {
-    if(!m_contestedPvPTimer||isInCombat())
+    if (!m_contestedPvPTimer || isInCombat())
         return;
-    if(m_contestedPvPTimer <= diff)
-    {
+
+    if (m_contestedPvPTimer <= diff)
         ResetContestedPvP();
-    }
     else
         m_contestedPvPTimer -= diff;
 }
 
 void Player::UpdatePvPFlag(time_t currTime)
 {
-    if(!IsPvP())
+    if (!IsPvP())
         return;
-    if(pvpInfo.endTimer == 0 || currTime < (pvpInfo.endTimer + 300))
+
+    if (pvpInfo.endTimer == 0 || currTime < (pvpInfo.endTimer + 300) || pvpInfo.inHostileArea)
         return;
 
     UpdatePvP(false);
@@ -18404,7 +18957,7 @@ void Player::UpdatePvPFlag(time_t currTime)
 
 void Player::UpdateDuelFlag(time_t currTime)
 {
-    if(!duel || duel->startTimer == 0 ||currTime < duel->startTimer + 3)
+    if (!duel || duel->startTimer == 0 || currTime < duel->startTimer + 3)
         return;
 
     SetUInt32Value(PLAYER_DUEL_TEAM, 1);
@@ -18418,41 +18971,34 @@ void Player::UpdateDuelFlag(time_t currTime)
 
 void Player::RemovePet(PetSaveMode mode)
 {
-    if (Pet* pet = GetPet())
-        pet->Unsummon(mode, this);
-}
-
-void Player::BuildPlayerChat(WorldPacket *data, uint8 msgtype, const std::string& text, uint32 language) const
-{
-    *data << uint8(msgtype);
-    *data << uint32(language);
-    *data << ObjectGuid(GetObjectGuid());
-    *data << uint32(language);                              //language 2.1.0 ?
-    *data << ObjectGuid(GetObjectGuid());
-    *data << uint32(text.length()+1);
-    *data << text;
-    *data << uint8(chatTag());
+    GuidSet groupPetsCopy = GetPets();
+    if (!groupPetsCopy.empty())
+    {
+        for (GuidSet::const_iterator itr = groupPetsCopy.begin(); itr != groupPetsCopy.end(); ++itr)
+             if (Pet* pPet = GetMap()->GetPet(*itr))
+                 pPet->Unsummon(mode, this);
+    }
 }
 
 void Player::Say(const std::string& text, const uint32 language)
 {
-    WorldPacket data(SMSG_MESSAGECHAT, 200);
-    BuildPlayerChat(&data, CHAT_MSG_SAY, text, language);
-    SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_SAY),true);
+    WorldPacket data;
+    ChatHandler::BuildChatPacket(data, CHAT_MSG_SAY, text.c_str(), Language(language), GetChatTag(), GetObjectGuid(), GetName());
+    SendMessageToSetInRange(&data, sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_SAY), true);
 }
 
 void Player::Yell(const std::string& text, const uint32 language)
 {
-    WorldPacket data(SMSG_MESSAGECHAT, 200);
-    BuildPlayerChat(&data, CHAT_MSG_YELL, text, language);
-    SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_YELL),true);
+    WorldPacket data;
+    ChatHandler::BuildChatPacket(data, CHAT_MSG_YELL, text.c_str(), Language(language), GetChatTag(), GetObjectGuid(), GetName());
+    SendMessageToSetInRange(&data, sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_YELL), true);
 }
 
 void Player::TextEmote(const std::string& text)
 {
-    WorldPacket data(SMSG_MESSAGECHAT, 200);
-    BuildPlayerChat(&data, CHAT_MSG_EMOTE, text, LANG_UNIVERSAL);
-    SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_TEXTEMOTE),true, !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHAT) );
+    WorldPacket data;
+    ChatHandler::BuildChatPacket(data, CHAT_MSG_EMOTE, text.c_str(), LANG_UNIVERSAL, GetChatTag(), GetObjectGuid(), GetName());
+    SendMessageToSetInRange(&data, sWorld.getConfig(CONFIG_FLOAT_LISTEN_RANGE_TEXTEMOTE), true, !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHAT));
 }
 
 void Player::Whisper(const std::string& text, uint32 language, ObjectGuid receiver)
@@ -18460,17 +19006,17 @@ void Player::Whisper(const std::string& text, uint32 language, ObjectGuid receiv
     if (language != LANG_ADDON)                             // if not addon data
         language = LANG_UNIVERSAL;                          // whispers should always be readable
 
-    Player *rPlayer = sObjectMgr.GetPlayer(receiver);
+    Player* rPlayer = sObjectMgr.GetPlayer(receiver);
 
-    WorldPacket data(SMSG_MESSAGECHAT, 200);
-    BuildPlayerChat(&data, CHAT_MSG_WHISPER, text, language);
+    WorldPacket data;
+    ChatHandler::BuildChatPacket(data, CHAT_MSG_WHISPER, text.c_str(), Language(language), GetChatTag(), GetObjectGuid(), GetName());
     rPlayer->GetSession()->SendPacket(&data);
 
     // not send confirmation for addon messages
     if (language != LANG_ADDON)
     {
-        data.Initialize(SMSG_MESSAGECHAT, 200);
-        rPlayer->BuildPlayerChat(&data, CHAT_MSG_WHISPER_INFORM, text, language);
+        data.clear();
+        ChatHandler::BuildChatPacket(data, CHAT_MSG_WHISPER_INFORM, text.c_str(), Language(language), CHAT_TAG_NONE, rPlayer->GetObjectGuid());
         GetSession()->SendPacket(&data);
     }
 
@@ -18490,19 +19036,20 @@ void Player::Whisper(const std::string& text, uint32 language, ObjectGuid receiv
 void Player::PetSpellInitialize()
 {
     Pet* pet = GetPet();
-
-    if(!pet)
+    if (!pet)
         return;
 
     DEBUG_LOG("Pet Spells Groups");
 
-    CharmInfo *charmInfo = pet->GetCharmInfo();
+    CharmInfo* charmInfo = pet->GetCharmInfo();
+    if (!charmInfo)
+        return;
 
     WorldPacket data(SMSG_PET_SPELLS, 8+2+4+4+4*MAX_UNIT_ACTION_BAR_INDEX+1+1);
     data << pet->GetObjectGuid();
-    data << uint16(pet->GetCreatureInfo()->family);         // creature family (required for pet talents)
+    data << uint16(pet->GetCreatureInfo()->Family);         // creature family (required for pet talents)
     data << uint32(0);
-    data << uint8(charmInfo->GetReactState()) << uint8(charmInfo->GetCommandState()) << uint16(0);
+    data << uint32(charmInfo->GetState());
 
     // action bar loop
     charmInfo->BuildActionBar(&data);
@@ -18518,39 +19065,42 @@ void Player::PetSpellInitialize()
         // spells loop
         for (PetSpellMap::const_iterator itr = pet->m_spells.begin(); itr != pet->m_spells.end(); ++itr)
         {
-            if(itr->second.state == PETSPELL_REMOVED)
+            if (itr->second.state == PETSPELL_REMOVED)
                 continue;
 
-            data << uint32(MAKE_UNIT_ACTION_BUTTON(itr->first,itr->second.active));
+            data << uint32(MAKE_UNIT_ACTION_BUTTON(itr->first, itr->second.active));
             ++addlist;
         }
     }
 
     data.put<uint8>(spellsCountPos, addlist);
 
-    uint8 cooldownsCount = pet->m_CreatureSpellCooldowns.size() + pet->m_CreatureCategoryCooldowns.size();
+    uint8 cooldownsCount = pet->GetSpellCooldownMap()->size();
     data << uint8(cooldownsCount);
 
     time_t curTime = time(NULL);
 
-    for(CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureSpellCooldowns.begin(); itr != pet->m_CreatureSpellCooldowns.end(); ++itr)
+    for (SpellCooldowns::const_iterator itr = pet->GetSpellCooldownMap()->begin(); itr != pet->GetSpellCooldownMap()->end(); ++itr)
     {
-        time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILLISECONDS : 0;
-
-        data << uint32(itr->first);                         // spellid
-        data << uint16(0);                                  // spell category?
-        data << uint32(cooldown);                           // cooldown
-        data << uint32(0);                                  // category cooldown
-    }
+        SpellEntry const* sEntry = sSpellStore.LookupEntry(itr->first);
+        if (!sEntry)
+            continue;
 
-    for(CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureCategoryCooldowns.begin(); itr != pet->m_CreatureCategoryCooldowns.end(); ++itr)
-    {
-        time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILLISECONDS : 0;
+        time_t cooldown = (itr->second.end > curTime) ? (itr->second.end - curTime) * IN_MILLISECONDS : 0;
 
         data << uint32(itr->first);                         // spellid
-        data << uint16(0);                                  // spell category?
-        data << uint32(0);                                  // cooldown
-        data << uint32(cooldown);                           // category cooldown
+        data << uint16(sEntry->Category);                   // spell category
+
+        if (sEntry->Category)                               // may be wrong, but anyway better than nothing...
+        {
+            data << uint32(0);                              // cooldown
+            data << uint32(cooldown);                       // category cooldown
+        }
+        else
+        {
+            data << uint32(cooldown);                       // cooldown
+            data << uint32(0);                              // category cooldown
+        }
     }
 
     GetSession()->SendPacket(&data);
@@ -18558,13 +19108,14 @@ void Player::PetSpellInitialize()
 
 void Player::SendPetGUIDs()
 {
-    if (!GetPetGuid())
-        return;
-
-    // Later this function might get modified for multiple guids
-    WorldPacket data(SMSG_PET_GUIDS, 12);
-    data << uint32(1);                      // count
-    data << ObjectGuid(GetPetGuid());
+    GuidSet const& groupPets = GetPets();
+    WorldPacket data(SMSG_PET_GUIDS, 4 + 8 * groupPets.size());
+    data << uint32(groupPets.size());                      // count
+    if (!groupPets.empty())
+    {
+        for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+            data << (*itr);
+    }
     GetSession()->SendPacket(&data);
 }
 
@@ -18572,22 +19123,22 @@ void Player::PossessSpellInitialize()
 {
     Unit* charm = GetCharm();
 
-    if(!charm)
+    if (!charm)
         return;
 
-    CharmInfo *charmInfo = charm->GetCharmInfo();
+    CharmInfo* charmInfo = charm->GetCharmInfo();
 
-    if(!charmInfo)
+    if (!charmInfo)
     {
-        sLog.outError("Player::PossessSpellInitialize(): charm (GUID: %u TypeId: %u) has no charminfo!", charm->GetGUIDLow(),charm->GetTypeId());
+        sLog.outError("Player::PossessSpellInitialize(): charm (GUID: %u TypeId: %u) has no charminfo!", charm->GetGUIDLow(), charm->GetTypeId());
         return;
     }
 
     WorldPacket data(SMSG_PET_SPELLS, 8+2+4+4+4*MAX_UNIT_ACTION_BAR_INDEX+1+1);
     data << charm->GetObjectGuid();
-    data << uint16(0);
-    data << uint32(0);
+    data << uint16(charm->GetObjectGuid().IsAnyTypeCreature() ? ((Creature*)charm)->GetCreatureInfo()->Family : 0);
     data << uint32(0);
+    data << uint32(charmInfo->GetState());
 
     charmInfo->BuildActionBar(&data);
 
@@ -18597,56 +19148,104 @@ void Player::PossessSpellInitialize()
     GetSession()->SendPacket(&data);
 }
 
-void Player::CharmSpellInitialize()
+void Player::VehicleSpellInitialize()
 {
-    Unit* charm = GetCharm();
-
-    if(!charm)
+    Creature* charm = (Creature*)GetCharm();
+    if (!charm)
         return;
 
-    CharmInfo *charmInfo = charm->GetCharmInfo();
-    if(!charmInfo)
+    CharmInfo* charmInfo = charm->GetCharmInfo();
+    if (!charmInfo)
     {
-        sLog.outError("Player::CharmSpellInitialize(): the player's charm (GUID: %u TypeId: %u) has no charminfo!", charm->GetGUIDLow(),charm->GetTypeId());
+        sLog.outError("Player::VehicleSpellInitialize(): vehicle (GUID: %u) has no charminfo!", charm->GetGUIDLow());
         return;
     }
 
-    uint8 addlist = 0;
+    size_t cooldownsCount = charm->GetSpellCooldownMap()->size() + charm->GetSpellCooldownMap()->size();
 
-    if(charm->GetTypeId() != TYPEID_PLAYER)
-    {
-        CreatureInfo const *cinfo = ((Creature*)charm)->GetCreatureInfo();
+    WorldPacket data(SMSG_PET_SPELLS, 8+2+4+4+4*MAX_UNIT_ACTION_BAR_INDEX+1+1+cooldownsCount*(4+2+4+4));
+    data << charm->GetObjectGuid();
+    data << uint16(((Creature*)charm)->GetCreatureInfo()->Family);
+    data << uint32(0);
+    data << uint32(charmInfo->GetState());
 
-        if(cinfo && cinfo->type == CREATURE_TYPE_DEMON && getClass() == CLASS_WARLOCK)
-        {
-            for(uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i)
-            {
-                if(charmInfo->GetCharmSpell(i)->GetAction())
-                    ++addlist;
-            }
+    charmInfo->BuildActionBar(&data);
+
+    data << uint8(0);                                       // additional spells count
+    data << uint8(cooldownsCount);
+
+    time_t curTime = time(NULL);
+
+    for (SpellCooldowns::const_iterator itr = charm->GetSpellCooldownMap()->begin(); itr != charm->GetSpellCooldownMap()->end(); ++itr)
+    {
+        SpellEntry const* sEntry = sSpellStore.LookupEntry(itr->first);
+        if (!sEntry)
+            continue;
+
+        time_t cooldown = (itr->second.end > curTime) ? (itr->second.end - curTime) * IN_MILLISECONDS : 0;
+
+        data << uint32(itr->first);                         // spellid
+        data << uint16(sEntry->Category);                   // spell category
+
+        if (sEntry->Category)                               // may be wrong, but anyway better than nothing...
+        {
+            data << uint32(0);                              // cooldown
+            data << uint32(cooldown);                       // category cooldown
+        }
+        else
+        {
+            data << uint32(cooldown);                       // cooldown
+            data << uint32(0);                              // category cooldown
+        }
+    }
+
+    GetSession()->SendPacket(&data);
+}
+
+void Player::CharmSpellInitialize()
+{
+    Unit* charm = GetCharm();
+    if (!charm)
+        return;
+
+    CharmInfo* charmInfo = charm->GetCharmInfo();
+    if (!charmInfo)
+    {
+        sLog.outError("Player::CharmSpellInitialize(): the player's charm (GUID: %u TypeId: %u) has no charminfo!", charm->GetGUIDLow(),charm->GetTypeId());
+        return;
+    }
+
+    uint8 addlist = 0;
+
+    if (charm->GetTypeId() != TYPEID_PLAYER)
+    {
+        CreatureInfo const* cinfo = ((Creature*)charm)->GetCreatureInfo();
+        if (cinfo && cinfo->CreatureType == CREATURE_TYPE_DEMON && getClass() == CLASS_WARLOCK)
+        {
+            for (uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i)
+            {
+                if (charmInfo->GetCharmSpell(i)->GetAction())
+                    ++addlist;
+            }
         }
     }
 
     WorldPacket data(SMSG_PET_SPELLS, 8+2+4+4+4*MAX_UNIT_ACTION_BAR_INDEX+1+4*addlist+1);
     data << charm->GetObjectGuid();
-    data << uint16(0);
+    data << uint16(charm->GetObjectGuid().IsAnyTypeCreature() ? ((Creature*)charm)->GetCreatureInfo()->Family : 0);
     data << uint32(0);
-
-    if(charm->GetTypeId() != TYPEID_PLAYER)
-        data << uint8(charmInfo->GetReactState()) << uint8(charmInfo->GetCommandState()) << uint16(0);
-    else
-        data << uint8(0) << uint8(0) << uint16(0);
+    data << uint32(charmInfo->GetState());
 
     charmInfo->BuildActionBar(&data);
 
     data << uint8(addlist);
 
-    if(addlist)
+    if (addlist)
     {
-        for(uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i)
+        for (uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i)
         {
-            CharmSpellEntry *cspell = charmInfo->GetCharmSpell(i);
-            if(cspell->GetAction())
+            CharmSpellEntry* cspell = charmInfo->GetCharmSpell(i);
+            if (cspell->GetAction())
                 data << uint32(cspell->packedData);
         }
     }
@@ -18666,28 +19265,26 @@ void Player::RemovePetActionBar()
 void Player::AddSpellMod(Aura* aura, bool apply)
 {
     Modifier const* mod = aura->GetModifier();
-    uint16 Opcode= (mod->m_auraname == SPELL_AURA_ADD_FLAT_MODIFIER) ? SMSG_SET_FLAT_SPELL_MODIFIER : SMSG_SET_PCT_SPELL_MODIFIER;
+    Opcodes opcode = (mod->m_auraname == SPELL_AURA_ADD_FLAT_MODIFIER) ? SMSG_SET_FLAT_SPELL_MODIFIER : SMSG_SET_PCT_SPELL_MODIFIER;
 
-    for(int eff = 0; eff < 96; ++eff)
+    for (uint8 eff = 0; eff < 96; ++eff)
     {
-        uint64 _mask = 0;
-        uint32 _mask2= 0;
-
-        if (eff < 64)
-            _mask = uint64(1) << (eff - 0);
-        else
-            _mask2= uint32(1) << (eff - 64);
-
-        if (aura->GetAuraSpellClassMask().IsFitToFamilyMask(_mask, _mask2))
+        if (aura->GetAuraSpellClassMask().test(eff))
         {
             int32 val = 0;
             for (AuraList::const_iterator itr = m_spellMods[mod->m_miscvalue].begin(); itr != m_spellMods[mod->m_miscvalue].end(); ++itr)
             {
-                if ((*itr)->GetModifier()->m_auraname == mod->m_auraname && ((*itr)->GetAuraSpellClassMask().IsFitToFamilyMask(_mask, _mask2)))
+                if (itr->IsEmpty())
+                    continue;
+
+                if ((*itr)->GetModifier()->m_auraname == mod->m_auraname && ((*itr)->GetAuraSpellClassMask().test(eff)))
                     val += (*itr)->GetModifier()->m_amount;
             }
-            val += apply ? mod->m_amount : -(mod->m_amount);
-            WorldPacket data(Opcode, (1+1+4));
+
+            // Not need manually remove m_amount from total value - his already removed from calculation due to removed from SpellAuraHolder (IsEmpty() method)
+            val += apply ? mod->m_amount : 0;
+
+            WorldPacket data(opcode, (1+1+4));
             data << uint8(eff);
             data << uint8(mod->m_miscvalue);
             data << int32(val);
@@ -18701,7 +19298,7 @@ void Player::AddSpellMod(Aura* aura, bool apply)
         m_spellMods[mod->m_miscvalue].remove(aura);
 }
 
-template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue, Spell const* spell)
+template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue)
 {
     SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
     if (!spellInfo)
@@ -18709,20 +19306,21 @@ template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &bas
 
     int32 totalpct = 0;
     int32 totalflat = 0;
-    for (AuraList::iterator itr = m_spellMods[op].begin(); itr != m_spellMods[op].end(); ++itr)
+    for (AuraList::const_iterator itr = m_spellMods[op].begin(); itr != m_spellMods[op].end(); ++itr)
     {
-        Aura *aura = *itr;
+        if (itr->IsEmpty())
+            continue;
 
-        Modifier const* mod = aura->GetModifier();
+        Modifier const* mod = (*itr)->GetModifier();
 
-        if (!aura->isAffectedOnSpell(spellInfo))
+        if (!(*itr)->isAffectedOnSpell(spellInfo))
             continue;
 
         if (mod->m_auraname == SPELL_AURA_ADD_FLAT_MODIFIER)
             totalflat += mod->m_amount;
         else
         {
-            // skip percent mods for null basevalue (most important for spell mods with charges )
+            // skip percent mods for null basevalue (most important for spell mods with charges)
             if (basevalue == T(0))
                 continue;
 
@@ -18740,79 +19338,82 @@ template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &bas
     return T(diff);
 }
 
-template int32 Player::ApplySpellMod<int32>(uint32 spellId, SpellModOp op, int32 &basevalue, Spell const* spell);
-template uint32 Player::ApplySpellMod<uint32>(uint32 spellId, SpellModOp op, uint32 &basevalue, Spell const* spell);
-template float Player::ApplySpellMod<float>(uint32 spellId, SpellModOp op, float &basevalue, Spell const* spell);
+template int32 Player::ApplySpellMod<int32>(uint32 spellId, SpellModOp op, int32 &basevalue);
+template uint32 Player::ApplySpellMod<uint32>(uint32 spellId, SpellModOp op, uint32 &basevalue);
+template float Player::ApplySpellMod<float>(uint32 spellId, SpellModOp op, float &basevalue);
 
 // send Proficiency
 void Player::SendProficiency(ItemClass itemClass, uint32 itemSubclassMask)
 {
     WorldPacket data(SMSG_SET_PROFICIENCY, 1 + 4);
-    data << uint8(itemClass) << uint32(itemSubclassMask);
+    data << uint8(itemClass);
+    data << uint32(itemSubclassMask);
     GetSession()->SendPacket (&data);
 }
 
 void Player::RemovePetitionsAndSigns(ObjectGuid guid, uint32 type)
 {
-    uint32 lowguid = guid.GetCounter();
+    uint32 lowGuid = guid.GetCounter();
 
-    QueryResult *result = NULL;
-    if(type == 10)
-        result = CharacterDatabase.PQuery("SELECT ownerguid,petitionguid FROM petition_sign WHERE playerguid = '%u'", lowguid);
+    QueryResult* result = NULL;
+    if (type == 10)
+        result = CharacterDatabase.PQuery("SELECT ownerguid, petitionguid FROM petition_sign WHERE playerguid = %u", lowGuid);
     else
-        result = CharacterDatabase.PQuery("SELECT ownerguid,petitionguid FROM petition_sign WHERE playerguid = '%u' AND type = '%u'", lowguid, type);
-    if(result)
+        result = CharacterDatabase.PQuery("SELECT ownerguid, petitionguid FROM petition_sign WHERE playerguid = %u AND type = %u", lowGuid, type);
+    if (result)
     {
         do                                                  // this part effectively does nothing, since the deletion / modification only takes place _after_ the PetitionQuery. Though I don't know if the result remains intact if I execute the delete query beforehand.
         {                                                   // and SendPetitionQueryOpcode reads data from the DB
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             ObjectGuid ownerguid   = ObjectGuid(HIGHGUID_PLAYER, fields[0].GetUInt32());
             ObjectGuid petitionguid = ObjectGuid(HIGHGUID_ITEM, fields[1].GetUInt32());
 
             // send update if charter owner in game
             Player* owner = sObjectMgr.GetPlayer(ownerguid);
-            if(owner)
+            if (owner)
                 owner->GetSession()->SendPetitionQueryOpcode(petitionguid);
 
-        } while ( result->NextRow() );
+        } while (result->NextRow());
 
         delete result;
 
-        if(type==10)
-            CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE playerguid = '%u'", lowguid);
+        if (type==10)
+            CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE playerguid = %u", lowGuid);
         else
-            CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE playerguid = '%u' AND type = '%u'", lowguid, type);
+            CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE playerguid = %u AND type = %u", lowGuid, type);
     }
 
     CharacterDatabase.BeginTransaction();
-    if(type == 10)
+    if (type == 10)
     {
-        CharacterDatabase.PExecute("DELETE FROM petition WHERE ownerguid = '%u'", lowguid);
-        CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE ownerguid = '%u'", lowguid);
+        CharacterDatabase.PExecute("DELETE FROM petition WHERE ownerguid = %u", lowGuid);
+        CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE ownerguid = %u", lowGuid);
     }
     else
     {
-        CharacterDatabase.PExecute("DELETE FROM petition WHERE ownerguid = '%u' AND type = '%u'", lowguid, type);
-        CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE ownerguid = '%u' AND type = '%u'", lowguid, type);
+        CharacterDatabase.PExecute("DELETE FROM petition WHERE ownerguid = %u AND type = %u", lowGuid, type);
+        CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE ownerguid = %u AND type = %u", lowGuid, type);
     }
     CharacterDatabase.CommitTransaction();
 }
 
 void Player::LeaveAllArenaTeams(ObjectGuid guid)
 {
-    uint32 lowguid = guid.GetCounter();
-    QueryResult *result = CharacterDatabase.PQuery("SELECT arena_team_member.arenateamid FROM arena_team_member JOIN arena_team ON arena_team_member.arenateamid = arena_team.arenateamid WHERE guid='%u'", lowguid);
+    uint32 lowGuid = guid.GetCounter();
+    QueryResult* result = CharacterDatabase.PQuery("SELECT arena_team_member.arenateamid FROM arena_team_member JOIN arena_team ON arena_team_member.arenateamid = arena_team.arenateamid WHERE guid = %u", lowGuid);
     if (!result)
         return;
 
     do
     {
-        Field *fields = result->Fetch();
-        if (uint32 at_id = fields[0].GetUInt32())
-            if (ArenaTeam * at = sObjectMgr.GetArenaTeamById(at_id))
+        if (uint32 at_id = result->Fetch()[0].GetUInt32())
+        {
+            if (ArenaTeam* at = sObjectMgr.GetArenaTeamById(at_id))
                 at->DelMember(guid);
+        }
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 }
@@ -18820,24 +19421,29 @@ void Player::LeaveAllArenaTeams(ObjectGuid guid)
 void Player::SetRestBonus (float rest_bonus_new)
 {
     // Prevent resting on max level
-    if(getLevel() >= sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
+    if (getLevel() >= sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
         rest_bonus_new = 0;
 
-    if(rest_bonus_new < 0)
+    if (rest_bonus_new < 0)
         rest_bonus_new = 0;
 
     float rest_bonus_max = (float)GetUInt32Value(PLAYER_NEXT_LEVEL_XP)*1.5f/2.0f;
 
-    if(rest_bonus_new > rest_bonus_max)
+    if (rest_bonus_new > rest_bonus_max)
         m_rest_bonus = rest_bonus_max;
     else
         m_rest_bonus = rest_bonus_new;
 
     // update data for client
-    if(m_rest_bonus>10)
-        SetByteValue(PLAYER_BYTES_2, 3, 0x01);              // Set Reststate = Rested
-    else if(m_rest_bonus<=1)
-        SetByteValue(PLAYER_BYTES_2, 3, 0x02);              // Set Reststate = Normal
+    if (GetAccountLinkedState() != STATE_NOT_LINKED)
+        SetByteValue(PLAYER_BYTES_2, 3, REST_STATE_NORMAL | REST_STATE_RAF_LINKED);
+    else
+    {
+        if (m_rest_bonus > 10)
+            SetByteValue(PLAYER_BYTES_2, 3, REST_STATE_RESTED);
+        else if (m_rest_bonus <= 1)
+            SetByteValue(PLAYER_BYTES_2, 3, REST_STATE_NORMAL);
+    }
 
     //RestTickUpdate
     SetUInt32Value(PLAYER_REST_STATE_EXPERIENCE, uint32(m_rest_bonus));
@@ -18851,38 +19457,38 @@ void Player::HandleStealthedUnitsDetection()
     MaNGOS::UnitListSearcher<MaNGOS::AnyStealthedCheck > searcher(stealthedUnits, u_check);
     Cell::VisitAllObjects(this, searcher, MAX_PLAYER_STEALTH_DETECT_RANGE);
 
-    WorldObject const* viewPoint = GetCamera().GetBody();
+    WorldObject const* viewPoint = GetCamera()->GetBody();
 
     for (std::list<Unit*>::const_iterator i = stealthedUnits.begin(); i != stealthedUnits.end(); ++i)
     {
-        if((*i)==this)
+        if ((*i) == this)
             continue;
 
-        bool hasAtClient = HaveAtClient((*i));
+        bool hasAtClient = HaveAtClient((*i)->GetObjectGuid());
         bool hasDetected = (*i)->isVisibleForOrDetect(this, viewPoint, true);
 
         if (hasDetected)
         {
-            if(!hasAtClient)
+            if (!hasAtClient)
             {
                 ObjectGuid i_guid = (*i)->GetObjectGuid();
                 (*i)->SendCreateUpdateToPlayer(this);
-                m_clientGUIDs.insert(i_guid);
+                AddClientGuid(i_guid);
 
                 DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "%s is detected in stealth by player %u. Distance = %f",i_guid.GetString().c_str(),GetGUIDLow(),GetDistance(*i));
 
                 // target aura duration for caster show only if target exist at caster client
                 // send data at target visibility change (adding to client)
-                if((*i)!=this && (*i)->isType(TYPEMASK_UNIT))
+                if ((*i) != this && (*i)->isType(TYPEMASK_UNIT))
                     SendAurasForTarget(*i);
             }
         }
         else
         {
-            if(hasAtClient)
+            if (hasAtClient)
             {
                 (*i)->DestroyForPlayer(this);
-                m_clientGUIDs.erase((*i)->GetObjectGuid());
+                RemoveClientGuid((*i)->GetObjectGuid());
             }
         }
     }
@@ -18890,47 +19496,39 @@ void Player::HandleStealthedUnitsDetection()
 
 bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc /*= NULL*/, uint32 spellid /*= 0*/)
 {
-    if(nodes.size() < 2)
+    if (nodes.size() < 2)
         return false;
 
     // not let cheating with start flight in time of logout process || if casting not finished || while in combat || if not use Spell's with EffectSendTaxi
-    if(GetSession()->isLogingOut() || isInCombat())
+    if (GetSession()->isLogingOut() || isInCombat())
     {
-        WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
-        data << uint32(ERR_TAXIPLAYERBUSY);
-        GetSession()->SendPacket(&data);
+        GetSession()->SendActivateTaxiReply(ERR_TAXIPLAYERBUSY);
         return false;
     }
 
-    if(HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE))
+    if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE))
         return false;
 
     // taximaster case
     if (npc)
     {
         // not let cheating with start flight mounted
-        if (IsMounted())
+        if (IsMounted() || GetVehicle())
         {
-            WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
-            data << uint32(ERR_TAXIPLAYERALREADYMOUNTED);
-            GetSession()->SendPacket(&data);
+            GetSession()->SendActivateTaxiReply(ERR_TAXIPLAYERALREADYMOUNTED);
             return false;
         }
 
         if (IsInDisallowedMountForm())
         {
-            WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
-            data << uint32(ERR_TAXIPLAYERSHAPESHIFTED);
-            GetSession()->SendPacket(&data);
+            GetSession()->SendActivateTaxiReply(ERR_TAXIPLAYERSHAPESHIFTED);
             return false;
         }
 
         // not let cheating with start flight in time of logout process || if casting not finished || while in combat || if not use Spell's with EffectSendTaxi
-        if(IsNonMeleeSpellCasted(false))
+        if (IsNonMeleeSpellCasted(false))
         {
-            WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
-            data << uint32(ERR_TAXIPLAYERBUSY);
-            GetSession()->SendPacket(&data);
+            GetSession()->SendActivateTaxiReply(ERR_TAXIPLAYERBUSY);
             return false;
         }
     }
@@ -18938,19 +19536,24 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
     else
     {
         RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+        ExitVehicle();
 
         if (IsInDisallowedMountForm())
             RemoveSpellsCausingAura(SPELL_AURA_MOD_SHAPESHIFT);
 
         if (Spell* spell = GetCurrentSpell(CURRENT_GENERIC_SPELL))
+        {
             if (spell->m_spellInfo->Id != spellid)
-                InterruptSpell(CURRENT_GENERIC_SPELL,false);
+                InterruptSpell(CURRENT_GENERIC_SPELL, false);
+        }
 
         InterruptSpell(CURRENT_AUTOREPEAT_SPELL,false);
 
         if (Spell* spell = GetCurrentSpell(CURRENT_CHANNELED_SPELL))
+        {
             if (spell->m_spellInfo->Id != spellid)
-                InterruptSpell(CURRENT_CHANNELED_SPELL,true);
+                InterruptSpell(CURRENT_CHANNELED_SPELL, true);
+        }
     }
 
     uint32 sourcenode = nodes[0];
@@ -18959,33 +19562,27 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
     TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(sourcenode);
     if (!node)
     {
-        WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
-        data << uint32(ERR_TAXINOSUCHPATH);
-        GetSession()->SendPacket(&data);
+        GetSession()->SendActivateTaxiReply(ERR_TAXINOSUCHPATH);
         return false;
     }
 
     // check node starting pos data set case if provided
-    if (node->x != 0.0f || node->y != 0.0f || node->z != 0.0f)
+    if (fabs(node->x) > M_NULL_F || fabs(node->y) > M_NULL_F || fabs(node->z) > M_NULL_F)
     {
         if (node->map_id != GetMapId() ||
-            (node->x - GetPositionX())*(node->x - GetPositionX())+
-            (node->y - GetPositionY())*(node->y - GetPositionY())+
-            (node->z - GetPositionZ())*(node->z - GetPositionZ()) >
-            (2*INTERACTION_DISTANCE)*(2*INTERACTION_DISTANCE)*(2*INTERACTION_DISTANCE))
+            (node->x - GetPositionX()) * (node->x - GetPositionX()) +
+            (node->y - GetPositionY()) * (node->y - GetPositionY()) +
+            (node->z - GetPositionZ()) * (node->z - GetPositionZ()) >
+            (2 * INTERACTION_DISTANCE) *(2 * INTERACTION_DISTANCE) * (2 * INTERACTION_DISTANCE))
         {
-            WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
-            data << uint32(ERR_TAXITOOFARAWAY);
-            GetSession()->SendPacket(&data);
+            GetSession()->SendActivateTaxiReply(ERR_TAXITOOFARAWAY);
             return false;
         }
     }
     // node must have pos if taxi master case (npc != NULL)
     else if (npc)
     {
-        WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
-        data << uint32(ERR_TAXIUNSPECIFIEDSERVERERROR);
-        GetSession()->SendPacket(&data);
+        GetSession()->SendActivateTaxiReply(ERR_TAXIUNSPECIFIEDSERVERERROR);
         return false;
     }
 
@@ -19010,14 +19607,14 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
     uint32 prevnode = sourcenode;
     uint32 lastnode = 0;
 
-    for(uint32 i = 1; i < nodes.size(); ++i)
+    for (uint32 i = 1; i < nodes.size(); ++i)
     {
         uint32 path, cost;
 
         lastnode = nodes[i];
         sObjectMgr.GetTaxiPath(prevnode, lastnode, path, cost);
 
-        if(!path)
+        if (!path)
         {
             m_taxi.ClearTaxiDestinations();
             return false;
@@ -19025,7 +19622,7 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
 
         totalcost += cost;
 
-        if(prevnode == sourcenode)
+        if (prevnode == sourcenode)
             sourcepath = path;
 
         m_taxi.AddTaxiDestination(lastnode);
@@ -19039,9 +19636,8 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
     // in spell case allow 0 model
     if ((mount_display_id == 0 && spellid == 0) || sourcepath == 0)
     {
-        WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
-        data << uint32(ERR_TAXIUNSPECIFIEDSERVERERROR);
-        GetSession()->SendPacket(&data);
+        GetSession()->SendActivateTaxiReply(ERR_TAXIUNSPECIFIEDSERVERERROR);
+
         m_taxi.ClearTaxiDestinations();
         return false;
     }
@@ -19051,11 +19647,10 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
     if (npc)
         totalcost = (uint32)ceil(totalcost*GetReputationPriceDiscount(npc));
 
-    if(money < totalcost)
+    if (money < totalcost)
     {
-        WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
-        data << uint32(ERR_TAXINOTENOUGHMONEY);
-        GetSession()->SendPacket(&data);
+        GetSession()->SendActivateTaxiReply(ERR_TAXINOTENOUGHMONEY);
+
         m_taxi.ClearTaxiDestinations();
         return false;
     }
@@ -19068,21 +19663,16 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
     // prevent stealth flight
     RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
 
-    WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
-    data << uint32(ERR_TAXIOK);
-    GetSession()->SendPacket(&data);
-
-    DEBUG_LOG("WORLD: Sent SMSG_ACTIVATETAXIREPLY");
-
+    GetSession()->SendActivateTaxiReply(ERR_TAXIOK);
     GetSession()->SendDoFlight(mount_display_id, sourcepath);
 
     return true;
 }
 
-bool Player::ActivateTaxiPathTo( uint32 taxi_path_id, uint32 spellid /*= 0*/ )
+bool Player::ActivateTaxiPathTo(uint32 taxi_path_id, uint32 spellid /*= 0*/)
 {
     TaxiPathEntry const* entry = sTaxiPathStore.LookupEntry(taxi_path_id);
-    if(!entry)
+    if (!entry)
         return false;
 
     std::vector<uint32> nodes;
@@ -19091,7 +19681,7 @@ bool Player::ActivateTaxiPathTo( uint32 taxi_path_id, uint32 spellid /*= 0*/ )
     nodes[0] = entry->from;
     nodes[1] = entry->to;
 
-    return ActivateTaxiPathTo(nodes,NULL,spellid);
+    return ActivateTaxiPathTo(nodes, NULL, spellid);
 }
 
 void Player::ContinueTaxiFlight()
@@ -19100,7 +19690,7 @@ void Player::ContinueTaxiFlight()
     if (!sourceNode)
         return;
 
-    DEBUG_LOG( "WORLD: Restart character %u taxi flight", GetGUIDLow() );
+    DEBUG_LOG("WORLD: Restart character %u taxi flight", GetGUIDLow());
 
     uint32 mountDisplayId = sObjectMgr.GetTaxiMountDisplayId(sourceNode, GetTeam(), true);
     uint32 path = m_taxi.GetCurrentTaxiPath();
@@ -19110,13 +19700,13 @@ void Player::ContinueTaxiFlight()
 
     TaxiPathNodeList const& nodeList = sTaxiPathNodesByPath[path];
 
-    float distPrev = MAP_SIZE*MAP_SIZE;
+    float distPrev = MAP_SIZE * MAP_SIZE;
     float distNext =
-        (nodeList[0].x-GetPositionX())*(nodeList[0].x-GetPositionX())+
-        (nodeList[0].y-GetPositionY())*(nodeList[0].y-GetPositionY())+
-        (nodeList[0].z-GetPositionZ())*(nodeList[0].z-GetPositionZ());
+        (nodeList[0].x - GetPositionX()) * (nodeList[0].x - GetPositionX()) +
+        (nodeList[0].y - GetPositionY()) * (nodeList[0].y - GetPositionY()) +
+        (nodeList[0].z - GetPositionZ()) * (nodeList[0].z - GetPositionZ());
 
-    for(uint32 i = 1; i < nodeList.size(); ++i)
+    for (uint32 i = 1; i < nodeList.size(); ++i)
     {
         TaxiPathNodeEntry const& node = nodeList[i];
         TaxiPathNodeEntry const& prevNode = nodeList[i-1];
@@ -19147,19 +19737,19 @@ void Player::ContinueTaxiFlight()
     GetSession()->SendDoFlight(mountDisplayId, path, startNode);
 }
 
-void Player::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs )
+void Player::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs)
 {
                                                             // last check 2.0.10
     WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+m_spells.size()*8);
     data << GetObjectGuid();
     data << uint8(0x0);                                     // flags (0x1, 0x2)
     time_t curTime = time(NULL);
-    for(PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr)
+    for (PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr)
     {
         if (itr->second.state == PLAYERSPELL_REMOVED)
             continue;
         uint32 unSpellId = itr->first;
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(unSpellId);
+        SpellEntry const* spellInfo = sSpellStore.LookupEntry(unSpellId);
         if (!spellInfo)
         {
             MANGOS_ASSERT(spellInfo);
@@ -19170,22 +19760,45 @@ void Player::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs )
         if (spellInfo->HasAttribute(SPELL_ATTR_DISABLED_WHILE_ACTIVE))
             continue;
 
-        if((idSchoolMask & GetSpellSchoolMask(spellInfo)) && GetSpellCooldownDelay(unSpellId) < unTimeMs )
+        if ((idSchoolMask & GetSpellSchoolMask(spellInfo)) && GetSpellCooldownDelay(spellInfo) < unTimeMs)
         {
             data << uint32(unSpellId);
             data << uint32(unTimeMs);                       // in m.secs
-            AddSpellCooldown(unSpellId, 0, curTime + unTimeMs/IN_MILLISECONDS);
+            AddSpellCooldown(unSpellId, 0, curTime + unTimeMs / IN_MILLISECONDS);
         }
     }
     GetSession()->SendPacket(&data);
 }
 
+void Player::SendModifyCooldown(uint32 spell_id, int32 delta)
+{
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell_id);
+    if (!spellInfo)
+        return;
+
+    uint32 cooldown = GetSpellCooldownDelay(spellInfo);
+    if (cooldown == 0 && delta < 0)
+        return;
+
+    int32 result = int32(cooldown * IN_MILLISECONDS + delta);
+    if (result < 0)
+        result = 0;
+
+    AddSpellCooldown(spell_id, 0, uint32(time(NULL) + int32(result / IN_MILLISECONDS)));
+
+    WorldPacket data(SMSG_MODIFY_COOLDOWN, 4 + 8 + 4);
+    data << uint32(spell_id);
+    data << GetObjectGuid();
+    data << int32(result > 0 ? delta : result - cooldown * IN_MILLISECONDS);
+    GetSession()->SendPacket(&data);
+}
+
 void Player::InitDataForForm(bool reapplyMods)
 {
     ShapeshiftForm form = GetShapeshiftForm();
 
     SpellShapeshiftFormEntry const* ssEntry = sSpellShapeshiftFormStore.LookupEntry(form);
-    if(ssEntry && ssEntry->attackSpeed)
+    if (ssEntry && ssEntry->attackSpeed)
     {
         SetAttackTime(BASE_ATTACK,ssEntry->attackSpeed);
         SetAttackTime(OFF_ATTACK,ssEntry->attackSpeed);
@@ -19194,26 +19807,26 @@ void Player::InitDataForForm(bool reapplyMods)
     else
         SetRegularAttackTime();
 
-    switch(form)
+    switch (form)
     {
         case FORM_CAT:
         {
-            if(getPowerType()!=POWER_ENERGY)
-                setPowerType(POWER_ENERGY);
+            if (GetPowerType() != POWER_ENERGY)
+                SetPowerType(POWER_ENERGY);
             break;
         }
         case FORM_BEAR:
         case FORM_DIREBEAR:
         {
-            if(getPowerType()!=POWER_RAGE)
-                setPowerType(POWER_RAGE);
+            if (GetPowerType() != POWER_RAGE)
+                SetPowerType(POWER_RAGE);
             break;
         }
         default:                                            // 0, for example
         {
             ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(getClass());
-            if(cEntry && cEntry->powerType < MAX_POWERS && uint32(getPowerType()) != cEntry->powerType)
-                setPowerType(Powers(cEntry->powerType));
+            if (cEntry && cEntry->powerType < MAX_POWERS && uint32(GetPowerType()) != cEntry->powerType)
+                SetPowerType(Powers(cEntry->powerType));
             break;
         }
     }
@@ -19229,7 +19842,7 @@ void Player::InitDataForForm(bool reapplyMods)
 void Player::InitDisplayIds()
 {
     PlayerInfo const *info = sObjectMgr.GetPlayerInfo(getRace(), getClass());
-    if(!info)
+    if (!info)
     {
         sLog.outError("Player %u has incorrect race/class pair. Can't init display ids.", GetGUIDLow());
         return;
@@ -19239,15 +19852,15 @@ void Player::InitDisplayIds()
     SetObjectScale(DEFAULT_OBJECT_SCALE);
 
     uint8 gender = getGender();
-    switch(gender)
+    switch (gender)
     {
         case GENDER_FEMALE:
-            SetDisplayId(info->displayId_f );
-            SetNativeDisplayId(info->displayId_f );
+            SetDisplayId(info->displayId_f);
+            SetNativeDisplayId(info->displayId_f);
             break;
         case GENDER_MALE:
-            SetDisplayId(info->displayId_m );
-            SetNativeDisplayId(info->displayId_m );
+            SetDisplayId(info->displayId_m);
+            SetNativeDisplayId(info->displayId_m);
             break;
         default:
             sLog.outError("Invalid gender %u for player",gender);
@@ -19271,51 +19884,106 @@ void Player::TakeExtendedCost(uint32 extendedCostId, uint32 count)
     }
 }
 
+bool Player::_StoreOrEquipNewItem(uint32 vendorSlot, uint32 item, uint8 count, uint8 bag, uint8 slot, int32 price, ItemPrototype const* pProto, Creature* pVendor, VendorItem const* crItem, bool store)
+{
+    uint32 totalCount = pProto->BuyCount * count;
+
+    InventoryResult msg;
+    ItemPosCountVec dest;
+    uint16 pos;
+
+    msg = store ? CanStoreNewItem(bag, slot, dest, item, totalCount) : CanEquipNewItem(slot, pos, item, false);
+    if (msg != EQUIP_ERR_OK)
+    {
+        SendEquipError(msg, NULL, NULL, item);
+        return false;
+    }
+
+    ModifyMoney(-int32(price));
+
+    if (crItem->ExtendedCost)
+        TakeExtendedCost(crItem->ExtendedCost, count);
+
+    Item* newItem = store ? StoreNewItem(dest, item, true) : EquipNewItem(pos, item, true);
+
+    if (newItem)
+    {
+        uint32 new_count = pVendor->UpdateVendorItemCurrentCount(crItem, totalCount);
+
+        WorldPacket data(SMSG_BUY_ITEM, 8+4+4+4);
+        data << pVendor->GetObjectGuid();
+        data << uint32(vendorSlot + 1);                   // numbered from 1 at client
+        data << uint32(crItem->maxcount > 0 ? new_count : 0xFFFFFFFF);
+        data << uint32(count);
+        GetSession()->SendPacket(&data);
+
+        SendNewItem(newItem, totalCount, true, false, false);
+
+        if (!store)
+            AutoUnequipOffhandIfNeed();
+
+        if (newItem->IsEligibleForRefund() && crItem->ExtendedCost)
+            newItem->SetRefundable(this, price, crItem->ExtendedCost);
+    }
+
+    return true;
+}
+
 // Return true is the bought item has a max count to force refresh of window by caller
 bool Player::BuyItemFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot, uint32 item, uint8 count, uint8 bag, uint8 slot)
 {
-    // cheating attempt
-    if (count < 1) count = 1;
-
     if (!isAlive())
         return false;
 
-    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(item);
+    // cheating attempt
+    if (count < 1)
+        count = 1;
+
+    ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(item);
     if (!pProto)
     {
         SendBuyError(BUY_ERR_CANT_FIND_ITEM, NULL, item, 0);
         return false;
     }
 
-    Creature *pCreature = GetNPCIfCanInteractWith(vendorGuid, UNIT_NPC_FLAG_VENDOR);
-    if (!pCreature)
+    if (!(pProto->AllowableClass & getClassMask()) && pProto->Bonding == BIND_WHEN_PICKED_UP && !isGameMaster())
+    {
+        SendBuyError(BUY_ERR_CANT_FIND_ITEM, NULL, item, 0);
+        return false;
+    }
+
+    if (!isGameMaster() && ((pProto->Flags2 & ITEM_FLAG2_HORDE_ONLY && GetTeam() == ALLIANCE) || (pProto->Flags2 == ITEM_FLAG2_ALLIANCE_ONLY && GetTeam() == HORDE)))
+        return false;
+
+    Creature* pVendor = GetNPCIfCanInteractWith(vendorGuid, UNIT_NPC_FLAG_VENDOR);
+    if (!pVendor)
     {
         DEBUG_LOG("WORLD: BuyItemFromVendor - %s not found or you can't interact with him.", vendorGuid.GetString().c_str());
         SendBuyError(BUY_ERR_DISTANCE_TOO_FAR, NULL, item, 0);
         return false;
     }
 
-    VendorItemData const* vItems = pCreature->GetVendorItems();
-    VendorItemData const* tItems = pCreature->GetVendorTemplateItems();
+    VendorItemData const* vItems = pVendor->GetVendorItems();
+    VendorItemData const* tItems = pVendor->GetVendorTemplateItems();
     if ((!vItems || vItems->Empty()) && (!tItems || tItems->Empty()))
     {
-        SendBuyError(BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0);
+        SendBuyError(BUY_ERR_CANT_FIND_ITEM, pVendor, item, 0);
         return false;
     }
 
     uint32 vCount = vItems ? vItems->GetItemCount() : 0;
     uint32 tCount = tItems ? tItems->GetItemCount() : 0;
 
-    if (vendorslot >= vCount+tCount)
+    if (vendorslot >= vCount + tCount)
     {
-        SendBuyError(BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0);
+        SendBuyError(BUY_ERR_CANT_FIND_ITEM, pVendor, item, 0);
         return false;
     }
 
     VendorItem const* crItem = vendorslot < vCount ? vItems->GetItem(vendorslot) : tItems->GetItem(vendorslot - vCount);
     if (!crItem)                                            // store diff item (cheating)
     {
-        SendBuyError(BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0);
+        SendBuyError(BUY_ERR_CANT_FIND_ITEM, pVendor, item, 0);
         return false;
     }
 
@@ -19325,13 +19993,13 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot, uin
 
         // possible item converted for BoA case
         ItemPrototype const* crProto = ObjectMgr::GetItemPrototype(crItem->item);
-        if (crProto->Flags & ITEM_FLAG_BOA && crProto->RequiredReputationFaction &&
+        if ((crProto->Flags & ITEM_FLAG_BOA) && crProto->RequiredReputationFaction &&
             uint32(GetReputationRank(crProto->RequiredReputationFaction)) >= crProto->RequiredReputationRank)
             converted = (sObjectMgr.GetItemConvert(crItem->item, getRaceMask()) != 0);
 
         if (!converted)
         {
-            SendBuyError(BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0);
+            SendBuyError(BUY_ERR_CANT_FIND_ITEM, pVendor, item, 0);
             return false;
         }
     }
@@ -19341,16 +20009,16 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot, uin
     // check current item amount if it limited
     if (crItem->maxcount != 0)
     {
-        if (pCreature->GetVendorItemCurrentCount(crItem) < totalCount)
+        if (pVendor->GetVendorItemCurrentCount(crItem) < totalCount)
         {
-            SendBuyError(BUY_ERR_ITEM_ALREADY_SOLD, pCreature, item, 0);
+            SendBuyError(BUY_ERR_ITEM_ALREADY_SOLD, pVendor, item, 0);
             return false;
         }
     }
 
     if (uint32(GetReputationRank(pProto->RequiredReputationFaction)) < pProto->RequiredReputationRank)
     {
-        SendBuyError(BUY_ERR_REPUTATION_REQUIRE, pCreature, item, 0);
+        SendBuyError(BUY_ERR_REPUTATION_REQUIRE, pVendor, item, 0);
         return false;
     }
 
@@ -19396,36 +20064,28 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot, uin
         }
     }
 
-    uint32 price = (crItem->ExtendedCost == 0 || pProto->Flags2 & ITEM_FLAG2_EXT_COST_REQUIRES_GOLD) ? pProto->BuyPrice * count : 0;
+    if (crItem->conditionId && !isGameMaster() && !sObjectMgr.IsPlayerMeetToCondition(crItem->conditionId, this, pVendor->GetMap(), pVendor, CONDITION_FROM_VENDOR))
+    {
+        SendBuyError(BUY_ERR_CANT_FIND_ITEM, pVendor, item, 0);
+        return false;
+    }
+
+    uint32 price = (crItem->ExtendedCost == 0 || (pProto->Flags2 & ITEM_FLAG2_EXT_COST_REQUIRES_GOLD)) ? pProto->BuyPrice * count : 0;
 
     // reputation discount
     if (price)
-        price = uint32(floor(price * GetReputationPriceDiscount(pCreature)));
+        price = uint32(floor(price * GetReputationPriceDiscount(pVendor)));
 
     if (GetMoney() < price)
     {
-        SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, item, 0);
+        SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pVendor, item, 0);
         return false;
     }
 
-    Item* pItem = NULL;
-
     if ((bag == NULL_BAG && slot == NULL_SLOT) || IsInventoryPos(bag, slot))
     {
-        ItemPosCountVec dest;
-        InventoryResult msg = CanStoreNewItem(bag, slot, dest, item, totalCount);
-        if (msg != EQUIP_ERR_OK)
-        {
-            SendEquipError(msg, NULL, NULL, item);
+        if (!_StoreOrEquipNewItem(vendorslot, item, count, bag, slot, price, pProto, pVendor, crItem, true))
             return false;
-        }
-
-        ModifyMoney(-int32(price));
-
-        if (crItem->ExtendedCost)
-            TakeExtendedCost(crItem->ExtendedCost, count);
-
-        pItem = StoreNewItem(dest, item, true);
     }
     else if (IsEquipmentPos(bag, slot))
     {
@@ -19435,23 +20095,8 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot, uin
             return false;
         }
 
-        uint16 dest;
-        InventoryResult msg = CanEquipNewItem(slot, dest, item, false);
-        if (msg != EQUIP_ERR_OK)
-        {
-            SendEquipError(msg, NULL, NULL, item);
+        if (!_StoreOrEquipNewItem(vendorslot, item, count, bag, slot, price, pProto, pVendor, crItem, false))
             return false;
-        }
-
-        ModifyMoney(-int32(price));
-
-        if (crItem->ExtendedCost)
-            TakeExtendedCost(crItem->ExtendedCost, count);
-
-        pItem = EquipNewItem(dest, item, true);
-
-        if (pItem)
-            AutoUnequipOffhandIfNeed();
     }
     else
     {
@@ -19459,20 +20104,6 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot, uin
         return false;
     }
 
-    if (!pItem)
-        return false;
-
-    uint32 new_count = pCreature->UpdateVendorItemCurrentCount(crItem, totalCount);
-
-    WorldPacket data(SMSG_BUY_ITEM, 8+4+4+4);
-    data << pCreature->GetObjectGuid();
-    data << uint32(vendorslot + 1);                 // numbered from 1 at client
-    data << uint32(crItem->maxcount > 0 ? new_count : 0xFFFFFFFF);
-    data << uint32(count);
-    GetSession()->SendPacket(&data);
-
-    SendNewItem(pItem, totalCount, true, false, false);
-
     return crItem->maxcount != 0;
 }
 
@@ -19482,14 +20113,14 @@ uint32 Player::GetMaxPersonalArenaRatingRequirement(uint32 minarenaslot)
     // the personal rating of the arena team must match the required limit as well
     // so return max[in arenateams](min(personalrating[teamtype], teamrating[teamtype]))
     uint32 max_personal_rating = 0;
-    for(int i = minarenaslot; i < MAX_ARENA_SLOT; ++i)
+    for (int i = minarenaslot; i < MAX_ARENA_SLOT; ++i)
     {
-        if(ArenaTeam * at = sObjectMgr.GetArenaTeamById(GetArenaTeamId(i)))
+        if (ArenaTeam * at = sObjectMgr.GetArenaTeamById(GetArenaTeamId(i)))
         {
             uint32 p_rating = GetArenaPersonalRating(i);
             uint32 t_rating = at->GetRating();
             p_rating = p_rating < t_rating ? p_rating : t_rating;
-            if(max_personal_rating < p_rating)
+            if (max_personal_rating < p_rating)
                 max_personal_rating = p_rating;
         }
     }
@@ -19501,10 +20132,10 @@ void Player::UpdateHomebindTime(uint32 time)
     // GMs never get homebind timer online
     if (m_InstanceValid || isGameMaster())
     {
-        if(m_HomebindTimer)                                 // instance valid, but timer not reset
+        if (m_HomebindTimer)                                 // instance valid, but timer not reset
         {
             // hide reminder
-            WorldPacket data(SMSG_RAID_GROUP_ONLY, 4+4);
+            WorldPacket data(SMSG_RAID_GROUP_ONLY, 4 + 4);
             data << uint32(0);
             data << uint32(ERR_RAID_GROUP_NONE);            // error used only when timer = 0
             GetSession()->SendPacket(&data);
@@ -19525,7 +20156,7 @@ void Player::UpdateHomebindTime(uint32 time)
     else
     {
         // instance is invalid, start homebind timer
-        m_HomebindTimer = 60000;
+        m_HomebindTimer = 15000;
         // send message to player
         WorldPacket data(SMSG_RAID_GROUP_ONLY, 4+4);
         data << uint32(m_HomebindTimer);
@@ -19535,133 +20166,29 @@ void Player::UpdateHomebindTime(uint32 time)
     }
 }
 
-void Player::UpdatePvP(bool state, bool ovrride)
+void Player::UpdatePvP(bool state, bool bOverride)
 {
-    if(!state || ovrride)
+    if (!state || bOverride)
     {
         SetPvP(state);
         pvpInfo.endTimer = 0;
     }
     else
     {
-        if(pvpInfo.endTimer != 0)
+        if (pvpInfo.endTimer != 0)
             pvpInfo.endTimer = time(NULL);
         else
             SetPvP(state);
     }
 }
 
-void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 itemId, Spell* spell, bool infinityCooldown)
-{
-    // init cooldown values
-    uint32 cat   = 0;
-    int32 rec    = -1;
-    int32 catrec = -1;
-
-    // some special item spells without correct cooldown in SpellInfo
-    // cooldown information stored in item prototype
-    // This used in same way in WorldSession::HandleItemQuerySingleOpcode data sending to client.
-
-    if (itemId)
-    {
-        if (ItemPrototype const* proto = ObjectMgr::GetItemPrototype(itemId))
-        {
-            for(int idx = 0; idx < MAX_ITEM_PROTO_SPELLS; ++idx)
-            {
-                if (proto->Spells[idx].SpellId == spellInfo->Id)
-                {
-                    cat    = proto->Spells[idx].SpellCategory;
-                    rec    = proto->Spells[idx].SpellCooldown;
-                    catrec = proto->Spells[idx].SpellCategoryCooldown;
-                    break;
-                }
-            }
-        }
-    }
-
-    // if no cooldown found above then base at DBC data
-    if (rec < 0 && catrec < 0)
-    {
-        cat = spellInfo->Category;
-        rec = spellInfo->RecoveryTime;
-        catrec = spellInfo->CategoryRecoveryTime;
-    }
-
-    time_t curTime = time(NULL);
-
-    time_t catrecTime;
-    time_t recTime;
-
-    // overwrite time for selected category
-    if (infinityCooldown)
-    {
-        // use +MONTH as infinity mark for spell cooldown (will checked as MONTH/2 at save ans skipped)
-        // but not allow ignore until reset or re-login
-        catrecTime = catrec > 0 ? curTime+infinityCooldownDelay : 0;
-        recTime    = rec    > 0 ? curTime+infinityCooldownDelay : catrecTime;
-    }
-    else
-    {
-        // shoot spells used equipped item cooldown values already assigned in GetAttackTime(RANGED_ATTACK)
-        // prevent 0 cooldowns set by another way
-        if (rec <= 0 && catrec <= 0 && (cat == 76 || (IsAutoRepeatRangedSpell(spellInfo) && spellInfo->Id != SPELL_ID_AUTOSHOT)))
-            rec = GetAttackTime(RANGED_ATTACK);
-
-        // Now we have cooldown data (if found any), time to apply mods
-        if (rec > 0)
-            ApplySpellMod(spellInfo->Id, SPELLMOD_COOLDOWN, rec, spell);
-
-        if (catrec > 0)
-            ApplySpellMod(spellInfo->Id, SPELLMOD_COOLDOWN, catrec, spell);
-
-        // replace negative cooldowns by 0
-        if (rec < 0) rec = 0;
-        if (catrec < 0) catrec = 0;
-
-        // no cooldown after applying spell mods
-        if (rec == 0 && catrec == 0)
-            return;
-
-        catrecTime = catrec ? curTime+catrec/IN_MILLISECONDS : 0;
-        recTime    = rec ? curTime+rec/IN_MILLISECONDS : catrecTime;
-    }
-
-    // self spell cooldown
-    if (recTime > 0)
-        AddSpellCooldown(spellInfo->Id, itemId, recTime);
-
-    // category spells
-    if (cat && catrec > 0)
-    {
-        SpellCategoryStore::const_iterator i_scstore = sSpellCategoryStore.find(cat);
-        if (i_scstore != sSpellCategoryStore.end())
-        {
-            for(SpellCategorySet::const_iterator i_scset = i_scstore->second.begin(); i_scset != i_scstore->second.end(); ++i_scset)
-            {
-                if (*i_scset == spellInfo->Id)              // skip main spell, already handled above
-                    continue;
-
-                AddSpellCooldown(*i_scset, itemId, catrecTime);
-            }
-        }
-    }
-}
-
-void Player::AddSpellCooldown(uint32 spellid, uint32 itemid, time_t end_time)
-{
-    SpellCooldown sc;
-    sc.end = end_time;
-    sc.itemid = itemid;
-    m_spellCooldowns[spellid] = sc;
-}
-
-void Player::SendCooldownEvent(SpellEntry const *spellInfo, uint32 itemId, Spell* spell)
+void Player::SendCooldownEvent(SpellEntry const* spellInfo, uint32 itemId)
 {
     // start cooldowns at server side, if any
-    AddSpellAndCategoryCooldowns(spellInfo, itemId, spell);
+    AddSpellAndCategoryCooldowns(spellInfo, itemId);
 
     // Send activate cooldown timer (possible 0) at client side
-    WorldPacket data(SMSG_COOLDOWN_EVENT, (4+8));
+    WorldPacket data(SMSG_COOLDOWN_EVENT, 4 + 8);
     data << uint32(spellInfo->Id);
     data << GetObjectGuid();
     SendDirectMessage(&data);
@@ -19670,22 +20197,28 @@ void Player::SendCooldownEvent(SpellEntry const *spellInfo, uint32 itemId, Spell
 void Player::UpdatePotionCooldown(Spell* spell)
 {
     // no potion used in combat or still in combat
-    if(!m_lastPotionId || isInCombat())
+    if (!m_lastPotionId || isInCombat())
         return;
 
     // Call not from spell cast, send cooldown event for item spells if no in combat
-    if(!spell)
+    if (!spell)
     {
         // spell/item pair let set proper cooldown (except nonexistent charged spell cooldown spellmods for potions)
-        if(ItemPrototype const* proto = ObjectMgr::GetItemPrototype(m_lastPotionId))
-            for(int idx = 0; idx < 5; ++idx)
-                if(proto->Spells[idx].SpellId && proto->Spells[idx].SpellTrigger == ITEM_SPELLTRIGGER_ON_USE)
-                    if(SpellEntry const* spellInfo = sSpellStore.LookupEntry(proto->Spells[idx].SpellId))
-                        SendCooldownEvent(spellInfo,m_lastPotionId);
+        if (ItemPrototype const* proto = ObjectMgr::GetItemPrototype(m_lastPotionId))
+        {
+            for (int idx = 0; idx < 5; ++idx)
+            {
+                if (proto->Spells[idx].SpellId && proto->Spells[idx].SpellTrigger == ITEM_SPELLTRIGGER_ON_USE)
+                {
+                    if (SpellEntry const* spellInfo = sSpellStore.LookupEntry(proto->Spells[idx].SpellId))
+                        SendCooldownEvent(spellInfo, m_lastPotionId);
+                }
+            }
+        }
     }
     // from spell cases (m_lastPotionId set in Spell::SendSpellCooldown)
     else
-        SendCooldownEvent(spell->m_spellInfo,m_lastPotionId,spell);
+        SendCooldownEvent(spell->m_spellInfo,m_lastPotionId);
 
     m_lastPotionId = 0;
 }
@@ -19693,51 +20226,51 @@ void Player::UpdatePotionCooldown(Spell* spell)
                                                             //slot to be excluded while counting
 bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot)
 {
-    if(!enchantmentcondition)
+    if (!enchantmentcondition)
         return true;
 
     SpellItemEnchantmentConditionEntry const *Condition = sSpellItemEnchantmentConditionStore.LookupEntry(enchantmentcondition);
 
-    if(!Condition)
+    if (!Condition)
         return true;
 
     uint8 curcount[4] = {0, 0, 0, 0};
 
     //counting current equipped gem colors
-    for(uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+    for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
     {
-        if(i == slot)
+        if (i == slot)
             continue;
-        Item *pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-        if(pItem2 && !pItem2->IsBroken() && pItem2->GetProto()->Socket[0].Color)
+        Item* pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+        if (pItem2 && !pItem2->IsBroken() && pItem2->GetProto()->Socket[0].Color)
         {
-            for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
+            for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
             {
                 uint32 enchant_id = pItem2->GetEnchantmentId(EnchantmentSlot(enchant_slot));
-                if(!enchant_id)
+                if (!enchant_id)
                     continue;
 
                 SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
-                if(!enchantEntry)
+                if (!enchantEntry)
                     continue;
 
                 uint32 gemid = enchantEntry->GemID;
-                if(!gemid)
+                if (!gemid)
                     continue;
 
                 ItemPrototype const* gemProto = sItemStorage.LookupEntry<ItemPrototype>(gemid);
-                if(!gemProto)
+                if (!gemProto)
                     continue;
 
                 GemPropertiesEntry const* gemProperty = sGemPropertiesStore.LookupEntry(gemProto->GemProperties);
-                if(!gemProperty)
+                if (!gemProperty)
                     continue;
 
                 uint8 GemColor = gemProperty->color;
 
-                for(uint8 b = 0, tmpcolormask = 1; b < 4; b++, tmpcolormask <<= 1)
+                for (uint8 b = 0, tmpcolormask = 1; b < 4; b++, tmpcolormask <<= 1)
                 {
-                    if(tmpcolormask & GemColor)
+                    if (tmpcolormask & GemColor)
                         ++curcount[b];
                 }
             }
@@ -19746,9 +20279,9 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot)
 
     bool activate = true;
 
-    for(int i = 0; i < 5; ++i)
+    for (int i = 0; i < 5; ++i)
     {
-        if(!Condition->Color[i])
+        if (!Condition->Color[i])
             continue;
 
         uint32 _cur_gem = curcount[Condition->Color[i] - 1];
@@ -19756,7 +20289,7 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot)
         // if have <CompareColor> use them as count, else use <value> from Condition
         uint32 _cmp_gem = Condition->CompareColor[i] ? curcount[Condition->CompareColor[i] - 1]: Condition->Value[i];
 
-        switch(Condition->Comparator[i])
+        switch (Condition->Comparator[i])
         {
             case 2:                                         // requires less <color> than (<value> || <comparecolor>) gems
                 activate &= (_cur_gem < _cmp_gem) ? true : false;
@@ -19778,34 +20311,34 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot)
 void Player::CorrectMetaGemEnchants(uint8 exceptslot, bool apply)
 {
                                                             //cycle all equipped items
-    for(uint32 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot)
+    for (uint32 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot)
     {
         //enchants for the slot being socketed are handled by Player::ApplyItemMods
-        if(slot == exceptslot)
+        if (slot == exceptslot)
             continue;
 
-        Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, slot );
+        Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, slot);
 
-        if(!pItem || !pItem->GetProto()->Socket[0].Color)
+        if (!pItem || !pItem->GetProto()->Socket[0].Color)
             continue;
 
-        for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
+        for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
         {
             uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(enchant_slot));
-            if(!enchant_id)
+            if (!enchant_id)
                 continue;
 
             SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
-            if(!enchantEntry)
+            if (!enchantEntry)
                 continue;
 
             uint32 condition = enchantEntry->EnchantmentCondition;
-            if(condition)
+            if (condition)
             {
                                                             //was enchant active with/without item?
                 bool wasactive = EnchantmentFitsRequirements(condition, apply ? exceptslot : -1);
                                                             //should it now be?
-                if(wasactive != EnchantmentFitsRequirements(condition, apply ? -1 : exceptslot))
+                if (wasactive != EnchantmentFitsRequirements(condition, apply ? -1 : exceptslot))
                 {
                     // ignore item gem conditions
                                                             //if state changed, (dis)apply enchant
@@ -19820,38 +20353,39 @@ void Player::CorrectMetaGemEnchants(uint8 exceptslot, bool apply)
 void Player::ToggleMetaGemsActive(uint8 exceptslot, bool apply)
 {
     //cycle all equipped items
-    for(int slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot)
+    for (int slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot)
     {
         //enchants for the slot being socketed are handled by WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
-        if(slot == exceptslot)
+        if (slot == exceptslot)
             continue;
 
-        Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, slot );
+        Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, slot);
 
-        if(!pItem || !pItem->GetProto()->Socket[0].Color)   //if item has no sockets or no item is equipped go to next item
+        if (!pItem || !pItem->GetProto()->Socket[0].Color)   //if item has no sockets or no item is equipped go to next item
             continue;
 
         //cycle all (gem)enchants
-        for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
+        for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
         {
             uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(enchant_slot));
-            if(!enchant_id)                                 //if no enchant go to next enchant(slot)
+            if (!enchant_id)                                 //if no enchant go to next enchant(slot)
                 continue;
 
             SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
-            if(!enchantEntry)
+            if (!enchantEntry)
                 continue;
 
             //only metagems to be (de)activated, so only enchants with condition
             uint32 condition = enchantEntry->EnchantmentCondition;
-            if(condition)
+            if (condition)
                 ApplyEnchantment(pItem,EnchantmentSlot(enchant_slot), apply);
         }
     }
 }
 
-void Player::SetBattleGroundEntryPoint()
+void Player::SetBattleGroundEntryPoint(bool forLFG)
 {
+    m_bgData.forLFG = forLFG;
     // Taxi path store
     if (!m_taxi.empty())
     {
@@ -19879,7 +20413,7 @@ void Player::SetBattleGroundEntryPoint()
             m_bgData.mountSpell = 0;
 
         // If map is dungeon find linked graveyard
-        if(GetMap()->IsDungeon())
+        if (GetMap()->IsDungeon())
         {
             if (const WorldSafeLocsEntry* entry = sObjectMgr.GetClosestGraveYard(GetPositionX(), GetPositionY(), GetPositionZ(), GetMapId(), GetTeam()))
             {
@@ -19900,23 +20434,23 @@ void Player::SetBattleGroundEntryPoint()
     }
 
     // In error cases use homebind position
-    m_bgData.joinPos = WorldLocation(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, 0.0f);
+    m_bgData.joinPos = m_homebind;
     m_bgData.m_needSave = true;
 }
 
 void Player::LeaveBattleground(bool teleportToEntryPoint)
 {
-    if(BattleGround *bg = GetBattleGround())
+    if (BattleGround* bg = GetBattleGround())
     {
         bg->RemovePlayerAtLeave(GetObjectGuid(), teleportToEntryPoint, true);
 
         // call after remove to be sure that player resurrected for correct cast
-        if( bg->isBattleGround() && !isGameMaster() && sWorld.getConfig(CONFIG_BOOL_BATTLEGROUND_CAST_DESERTER) )
+        if (bg->isBattleGround() && !isGameMaster() && sWorld.getConfig(CONFIG_BOOL_BATTLEGROUND_CAST_DESERTER))
         {
-            if( bg->GetStatus() == STATUS_IN_PROGRESS || bg->GetStatus() == STATUS_WAIT_JOIN )
+            if (bg->GetStatus() == STATUS_IN_PROGRESS || bg->GetStatus() == STATUS_WAIT_JOIN)
             {
                 //lets check if player was teleported from BG and schedule delayed Deserter spell cast
-                if(IsBeingTeleportedFar())
+                if (IsBeingTeleportedFar())
                 {
                     ScheduleDelayedOperation(DELAYED_SPELL_CAST_DESERTER);
                     return;
@@ -19925,13 +20459,17 @@ void Player::LeaveBattleground(bool teleportToEntryPoint)
                 CastSpell(this, 26013, true);               // Deserter
             }
         }
+
+        // Prevent more execute BG update codes
+        if (bg->isBattleGround() && bg->GetStatus() == STATUS_IN_PROGRESS && !bg->GetPlayersSize())
+            bg->SetStatus(STATUS_WAIT_LEAVE);
     }
 }
 
 bool Player::CanJoinToBattleground() const
 {
     // check Deserter debuff
-    if(GetDummyAura(26013))
+    if (GetDummyAura(26013))
         return false;
 
     return true;
@@ -19940,7 +20478,7 @@ bool Player::CanJoinToBattleground() const
 bool Player::CanReportAfkDueToLimit()
 {
     // a player can complain about 15 people per 5 minutes
-    if(m_bgData.bgAfkReportedCount++ >= 15)
+    if (m_bgData.bgAfkReportedCount++ >= 15)
         return false;
 
     return true;
@@ -19949,16 +20487,17 @@ bool Player::CanReportAfkDueToLimit()
 ///This player has been blamed to be inactive in a battleground
 void Player::ReportedAfkBy(Player* reporter)
 {
-    BattleGround *bg = GetBattleGround();
-    if(!bg || bg != reporter->GetBattleGround() || GetTeam() != reporter->GetTeam())
+    BattleGround* bg = GetBattleGround();
+    // Battleground also must be in progress!
+    if (!bg || bg != reporter->GetBattleGround() || GetTeam() != reporter->GetTeam() || bg->GetStatus() != STATUS_IN_PROGRESS)
         return;
 
     // check if player has 'Idle' or 'Inactive' debuff
-    if(m_bgData.bgAfkReporter.find(reporter->GetGUIDLow()) == m_bgData.bgAfkReporter.end() && !HasAura(43680, EFFECT_INDEX_0) && !HasAura(43681, EFFECT_INDEX_0) && reporter->CanReportAfkDueToLimit())
+    if (m_bgData.bgAfkReporter.find(reporter->GetGUIDLow()) == m_bgData.bgAfkReporter.end() && !HasAura(43680, EFFECT_INDEX_0) && !HasAura(43681, EFFECT_INDEX_0) && reporter->CanReportAfkDueToLimit())
     {
         m_bgData.bgAfkReporter.insert(reporter->GetGUIDLow());
         // 3 players have to complain to apply debuff
-        if(m_bgData.bgAfkReporter.size() >= 3)
+        if (m_bgData.bgAfkReporter.size() >= 3)
         {
             // cast 'Idle' spell
             CastSpell(this, 43680, true);
@@ -19967,7 +20506,7 @@ void Player::ReportedAfkBy(Player* reporter)
     }
 }
 
-bool Player::IsVisibleInGridForPlayer( Player* pl ) const
+bool Player::IsVisibleInGridForPlayer(Player* pl) const
 {
     // gamemaster in GM mode see all, including ghosts
     if (pl->isGameMaster() && GetSession()->GetSecurity() <= pl->GetSession()->GetSecurity())
@@ -19988,10 +20527,10 @@ bool Player::IsVisibleInGridForPlayer( Player* pl ) const
     // Dead player see live players near own corpse
     if (isAlive())
     {
-        if (Corpse *corpse = pl->GetCorpse())
+        if (Corpse* corpse = pl->GetCorpse())
         {
             // 20 - aggro distance for same level, 25 - max additional distance if player level less that creature level
-            if (corpse->IsWithinDistInMap(this, (20 + 25) * sWorld.getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO)))
+            if (corpse->IsWithinDistInMap(this, (20.0f + 25.0f) * sWorld.GetCreatureAggroRate(this)))
                 return true;
         }
     }
@@ -20000,13 +20539,13 @@ bool Player::IsVisibleInGridForPlayer( Player* pl ) const
     return false;
 }
 
-bool Player::IsVisibleGloballyFor( Player* u ) const
+bool Player::IsVisibleGloballyFor(Player* u) const
 {
     if (!u)
         return false;
 
     // Always can see self
-    if (u==this)
+    if (u == this)
         return true;
 
     // Visible units, always are visible for all players
@@ -20025,29 +20564,53 @@ bool Player::IsVisibleGloballyFor( Player* u ) const
     return true;
 }
 
-template<class T>
-inline void BeforeVisibilityDestroy(T* /*t*/, Player* /*p*/)
+bool Player::HaveAtClient(ObjectGuid const& guid) const
+{
+    return  guid == GetObjectGuid() ||
+            (IsBoarded() && GetTransportInfo()->GetTransportGuid() == guid) ||
+            HasClientGuid(guid);
+}
+
+void Player::AddClientGuid(ObjectGuid const& guid)
+{
+    MAPLOCK_WRITE(this,MAP_LOCK_TYPE_MAPOBJECTS);
+    m_clientGUIDs.insert(guid);
+}
+
+void Player::RemoveClientGuid(ObjectGuid const& guid)
+{
+    MAPLOCK_WRITE(this,MAP_LOCK_TYPE_MAPOBJECTS);
+    m_clientGUIDs.erase(guid);
+}
+
+bool Player::HasClientGuid(ObjectGuid const& guid) const
 {
+    MAPLOCK_READ(const_cast<Player*>(this),MAP_LOCK_TYPE_MAPOBJECTS);
+    return (m_clientGUIDs.find(guid) != m_clientGUIDs.end());
 }
 
-template<>
-inline void BeforeVisibilityDestroy<Creature>(Creature* t, Player* p)
+void Player::BeforeVisibilityDestroy(WorldObject* t)
 {
-    if (p->GetPetGuid() == t->GetObjectGuid() && ((Creature*)t)->IsPet())
+    if (GetPetGuid() == t->GetObjectGuid() && ((Creature*)t)->IsPet())
         ((Pet*)t)->Unsummon(PET_SAVE_REAGENTS);
 }
 
 void Player::UpdateVisibilityOf(WorldObject const* viewPoint, WorldObject* target)
 {
-    if(HaveAtClient(target))
+    if (HaveAtClient(target->GetObjectGuid()))
     {
-        if(!target->isVisibleForInState(this, viewPoint, true))
+        if (!target->isVisibleForInState(this, viewPoint, true))
         {
             ObjectGuid t_guid = target->GetObjectGuid();
 
-            if (target->GetTypeId()==TYPEID_UNIT)
+            if (GetMap()->IsVisibleGlobally(t_guid))
             {
-                BeforeVisibilityDestroy<Creature>((Creature*)target,this);
+            // FIXME - this code block temporary, only on test phase (seems as not need, but...)
+                target->AddNotifiedClient(GetObjectGuid());
+            }
+            else if (target->GetTypeId() == TYPEID_UNIT)
+            {
+                BeforeVisibilityDestroy(target);
 
                 // at remove from map (destroy) show kill animation (in different out of range/stealth case)
                 target->DestroyForPlayer(this, !target->IsInWorld() && ((Creature*)target)->isDead());
@@ -20055,78 +20618,60 @@ void Player::UpdateVisibilityOf(WorldObject const* viewPoint, WorldObject* targe
             else
                 target->DestroyForPlayer(this);
 
-            m_clientGUIDs.erase(t_guid);
+            RemoveClientGuid(t_guid);
 
-            DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "%s out of range for player %u. Distance = %f",t_guid.GetString().c_str(),GetGUIDLow(),GetDistance(target));
+            DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "Player::UpdateVisibilityOf (by viewPoint) %s out of range for %s, distance = %f",t_guid.GetString().c_str(),GetObjectGuid().GetString().c_str(), GetDistance(target));
         }
     }
     else
     {
-        if(target->isVisibleForInState(this, viewPoint, false))
+        if (target->isVisibleForInState(this, viewPoint, false))
         {
-            target->SendCreateUpdateToPlayer(this);
-            if(target->GetTypeId()!=TYPEID_GAMEOBJECT||!((GameObject*)target)->IsTransport())
-                m_clientGUIDs.insert(target->GetObjectGuid());
+            if (!GetMap()->IsVisibleGlobally(target->GetObjectGuid()))
+            {
+                target->SendCreateUpdateToPlayer(this);
+                AddClientGuid(target->GetObjectGuid());
 
-            DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "Object %u (Type: %u) is visible now for player %u. Distance = %f",target->GetGUIDLow(),target->GetTypeId(),GetGUIDLow(),GetDistance(target));
+                DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "Player::UpdateVisibilityOf (by viewPoint) %s is visible now for %s, distance = %f", target->GetObjectGuid().GetString().c_str(), GetObjectGuid().GetString().c_str(), GetDistance(target));
 
-            // target aura duration for caster show only if target exist at caster client
-            // send data at target visibility change (adding to client)
-            if(target!=this && target->isType(TYPEMASK_UNIT))
-                SendAurasForTarget((Unit*)target);
+                // target aura duration for caster show only if target exist at caster client
+                // send data at target visibility change (adding to client)
+                if (target != this && target->isType(TYPEMASK_UNIT))
+                    SendAurasForTarget((Unit*)target);
+            }
         }
     }
 }
 
-template<class T>
-inline void UpdateVisibilityOf_helper(ObjectGuidSet& s64, T* target)
-{
-    s64.insert(target->GetObjectGuid());
-}
-
-template<>
-inline void UpdateVisibilityOf_helper(ObjectGuidSet& s64, GameObject* target)
-{
-    if(!target->IsTransport())
-        s64.insert(target->GetObjectGuid());
-}
-
-template<class T>
-void Player::UpdateVisibilityOf(WorldObject const* viewPoint, T* target, UpdateData& data, std::set<WorldObject*>& visibleNow)
+void Player::UpdateVisibilityOf(WorldObject const* viewPoint, WorldObject* target, UpdateData& data, WorldObjectSet& visibleNow)
 {
-    if(HaveAtClient(target))
+    if (HaveAtClient(target->GetObjectGuid()))
     {
-        if(!target->isVisibleForInState(this,viewPoint,true))
+        if (!target->isVisibleForInState(this,viewPoint,true))
         {
-            BeforeVisibilityDestroy<T>(target,this);
+            BeforeVisibilityDestroy(target);
 
             ObjectGuid t_guid = target->GetObjectGuid();
 
             target->BuildOutOfRangeUpdateBlock(&data);
-            m_clientGUIDs.erase(t_guid);
+            RemoveClientGuid(t_guid);
 
-            DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "%s is out of range for %s. Distance = %f", t_guid.GetString().c_str(), GetGuidStr().c_str(), GetDistance(target));
+            DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "Player::UpdateVisibilityOf %s is out of range for %s, distance = %f", t_guid.GetString().c_str(), GetGuidStr().c_str(), GetDistance(target));
         }
     }
     else
     {
-        if(target->isVisibleForInState(this,viewPoint,false))
+        if (target->isVisibleForInState(this,viewPoint,false))
         {
             visibleNow.insert(target);
             target->BuildCreateUpdateBlockForPlayer(&data, this);
-            UpdateVisibilityOf_helper(m_clientGUIDs,target);
+            AddClientGuid(target->GetObjectGuid());
 
-            DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "%s is visible now for %s. Distance = %f", target->GetGuidStr().c_str(), GetGuidStr().c_str(), GetDistance(target));
+            DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "Player::UpdateVisibilityOf %s is visible now for %s, distance = %f", target->GetGuidStr().c_str(), GetGuidStr().c_str(), GetDistance(target));
         }
     }
 }
 
-template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, Player*        target, UpdateData& data, std::set<WorldObject*>& visibleNow);
-template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, Creature*      target, UpdateData& data, std::set<WorldObject*>& visibleNow);
-template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, Corpse*        target, UpdateData& data, std::set<WorldObject*>& visibleNow);
-template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, GameObject*    target, UpdateData& data, std::set<WorldObject*>& visibleNow);
-template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, DynamicObject* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
-
 void Player::SetPhaseMask(uint32 newPhaseMask, bool update)
 {
     // GM-mode have mask PHASEMASK_ANYWHERE always
@@ -20134,7 +20679,7 @@ void Player::SetPhaseMask(uint32 newPhaseMask, bool update)
         newPhaseMask = PHASEMASK_ANYWHERE;
 
     // phase auras normally not expected at BG but anyway better check
-    if (BattleGround *bg = GetBattleGround())
+    if (BattleGround* bg = GetBattleGround())
         bg->EventPlayerDroppedFlag(this);
 
     Unit::SetPhaseMask(newPhaseMask, update);
@@ -20148,14 +20693,14 @@ void Player::InitPrimaryProfessions()
     SetFreePrimaryProfessions(maxProfs);
 }
 
-void Player::SendComboPoints()
+void Player::SendComboPoints(ObjectGuid targetGuid, uint8 combopoints)
 {
-    Unit *combotarget = ObjectAccessor::GetUnit(*this, m_comboTargetGuid);
+    Unit* combotarget = GetMap()->GetUnit(targetGuid);
     if (combotarget)
     {
-        WorldPacket data(SMSG_UPDATE_COMBO_POINTS, combotarget->GetPackGUID().size()+1);
+        WorldPacket data(SMSG_UPDATE_COMBO_POINTS, combotarget->GetPackGUID().size() + 1);
         data << combotarget->GetPackGUID();
-        data << uint8(m_comboPoints);
+        data << uint8(combopoints);
         GetSession()->SendPacket(&data);
     }
     /*else
@@ -20167,76 +20712,62 @@ void Player::SendComboPoints()
     }*/
 }
 
-void Player::AddComboPoints(Unit* target, int8 count)
+void Player::SendPetComboPoints(Unit* pet, ObjectGuid targetGuid, uint8 combopoints)
 {
-    if(!count)
-        return;
-
-    // without combo points lost (duration checked in aura)
-    RemoveSpellsCausingAura(SPELL_AURA_RETAIN_COMBO_POINTS);
-
-    if(target->GetObjectGuid() == m_comboTargetGuid)
+    Unit* combotarget = pet ? pet->GetMap()->GetUnit(targetGuid) : NULL;
+    if (pet && combotarget)
     {
-        m_comboPoints += count;
+        WorldPacket data(SMSG_PET_UPDATE_COMBO_POINTS, pet->GetPackGUID().size() + combotarget->GetPackGUID().size() + 1);
+        data << pet->GetPackGUID();
+        data << combotarget->GetPackGUID();
+        data << uint8(combopoints);
+        GetSession()->SendPacket(&data);
     }
-    else
-    {
-        if (m_comboTargetGuid)
-            if(Unit* target2 = ObjectAccessor::GetUnit(*this, m_comboTargetGuid))
-                target2->RemoveComboPointHolder(GetGUIDLow());
+}
 
-        m_comboTargetGuid = target->GetObjectGuid();
-        m_comboPoints = count;
+void Player::SetGroup(ObjectGuid const& guid, int8 subgroup)
+{
+    m_groupGuid.Clear();
+    m_group.unlink();
 
-        target->AddComboPointHolder(GetGUIDLow());
-    }
-
-    if (m_comboPoints > 5) m_comboPoints = 5;
-    if (m_comboPoints < 0) m_comboPoints = 0;
-
-    SendComboPoints();
-}
+    Group* group = sObjectMgr.GetGroup(guid);
 
-void Player::ClearComboPoints()
-{
-    if (!m_comboTargetGuid)
+    if (!group)
         return;
 
-    // without combopoints lost (duration checked in aura)
-    RemoveSpellsCausingAura(SPELL_AURA_RETAIN_COMBO_POINTS);
-
-    m_comboPoints = 0;
+    m_groupGuid = guid;
 
-    SendComboPoints();
+    // never use SetGroup without a subgroup unless you specify NULL for group
+    MANGOS_ASSERT(subgroup >= 0);
+    m_group.link(group, this);
+    m_group.setSubGroup((uint8)subgroup);
+}
 
-    if(Unit* target = ObjectAccessor::GetUnit(*this,m_comboTargetGuid))
-        target->RemoveComboPointHolder(GetGUIDLow());
+Group* Player::GetGroup()
+{
+    return sObjectMgr.GetGroup(GetGroupGuid());
+}
 
-    m_comboTargetGuid.Clear();
+Group const* Player::GetGroup() const
+{
+    return (Group const*)sObjectMgr.GetGroup(GetGroupGuid());
 }
 
-void Player::SetGroup(Group *group, int8 subgroup)
+Group* Player::GetOriginalGroup()
 {
-    if(group == NULL)
-        m_group.unlink();
-    else
-    {
-        // never use SetGroup without a subgroup unless you specify NULL for group
-        MANGOS_ASSERT(subgroup >= 0);
-        m_group.link(group, this);
-        m_group.setSubGroup((uint8)subgroup);
-    }
+    return sObjectMgr.GetGroup(GetOriginalGroupGuid());
 }
 
+
 void Player::SendInitialPacketsBeforeAddToMap()
 {
     GetSocial()->SendSocialList();
 
     // Homebind
-    WorldPacket data(SMSG_BINDPOINTUPDATE, 5*4);
-    data << m_homebindX << m_homebindY << m_homebindZ;
-    data << (uint32) m_homebindMapId;
-    data << (uint32) m_homebindAreaId;
+    WorldPacket data(SMSG_BINDPOINTUPDATE, 5 * 4);
+    data << m_homebind.x << m_homebind.y << m_homebind.z;
+    data << uint32(m_homebind.GetMapId());
+    data << uint32(m_homebind.GetAreaId());
     GetSession()->SendPacket(&data);
 
     // SMSG_SET_PROFICIENCY
@@ -20245,7 +20776,7 @@ void Player::SendInitialPacketsBeforeAddToMap()
 
     SendTalentsInfoData(false);
 
-    data.Initialize(SMSG_INSTANCE_DIFFICULTY, 4+4);
+    data.Initialize(SMSG_INSTANCE_DIFFICULTY, 4 + 4);
     data << uint32(GetMap()->GetDifficulty());
     data << uint32(0);
     GetSession()->SendPacket(&data);
@@ -20253,13 +20784,13 @@ void Player::SendInitialPacketsBeforeAddToMap()
     SendInitialSpells();
 
     data.Initialize(SMSG_SEND_UNLEARN_SPELLS, 4);
-    data << uint32(0);                                      // count, for(count) uint32;
+    data << uint32(0);                                      // count, for (count) uint32;
     GetSession()->SendPacket(&data);
 
     SendInitialActionButtons();
     m_reputationMgr.SendInitialReputations();
 
-    if(!isAlive())
+    if (!isAlive())
         SendCorpseReclaimDelay(true);
 
     SendInitWorldStates(GetZoneId(), GetAreaId());
@@ -20269,10 +20800,10 @@ void Player::SendInitialPacketsBeforeAddToMap()
     m_achievementMgr.SendAllAchievementData();
 
     data.Initialize(SMSG_LOGIN_SETTIMESPEED, 4 + 4 + 4);
-    data << uint32(secsToTimeBitFields(sWorld.GetGameTime()));
+    data.AppendPackedTime(sWorld.GetGameTime());
     data << (float)0.01666667f;                             // game speed
     data << uint32(0);                                      // added in 3.1.2
-    GetSession()->SendPacket( &data );
+    GetSession()->SendPacket(&data);
 
     // SMSG_TALENTS_INFO x 2 for pet (unspent points and talents in separate packets...)
     // SMSG_PET_GUIDS
@@ -20283,6 +20814,7 @@ void Player::SendInitialPacketsBeforeAddToMap()
         m_movementInfo.AddMovementFlag(MOVEFLAG_FLYING);
 
     SetMover(this);
+    SetViewPoint(NULL);
 }
 
 void Player::SendInitialPacketsAfterAddToMap()
@@ -20306,68 +20838,60 @@ void Player::SendInitialPacketsAfterAddToMap()
         SPELL_AURA_FEATHER_FALL, SPELL_AURA_HOVER,                     SPELL_AURA_SAFE_FALL,
         SPELL_AURA_FLY,          SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED,  SPELL_AURA_NONE
     };
-    for(AuraType const* itr = &auratypes[0]; itr && itr[0] != SPELL_AURA_NONE; ++itr)
+
+    for (AuraType const* itr = &auratypes[0]; itr && itr[0] != SPELL_AURA_NONE; ++itr)
     {
-        Unit::AuraList const& auraList = GetAurasByType(*itr);
-        if(!auraList.empty())
-            auraList.front()->ApplyModifier(true,true);
+        Unit::AuraList& auraList = GetAurasByType(*itr);
+        if (!auraList.empty())
+            auraList.front()->ApplyModifier(true, true);
     }
 
-    if(HasAuraType(SPELL_AURA_MOD_STUN))
-        SetMovement(MOVE_ROOT);
+    if (HasAuraType(SPELL_AURA_MOD_STUN))
+        SetRoot(true);
 
     // manual send package (have code in ApplyModifier(true,true); that don't must be re-applied.
-    if(HasAuraType(SPELL_AURA_MOD_ROOT))
+    if (HasAuraType(SPELL_AURA_MOD_ROOT) || GetVehicle())
     {
-        WorldPacket data2(SMSG_FORCE_MOVE_ROOT, 10);
-        data2 << GetPackGUID();
-        data2 << (uint32)2;
-        SendMessageToSet(&data2,true);
+        SetRoot(true);
     }
 
     SendAurasForTarget(this);
     SendEnchantmentDurations();                             // must be after add to map
     SendItemDurations();                                    // must be after add to map
+
+    // only grid activating
+    GetMap()->ActivateGrid(GetPosition());
 }
 
 void Player::SendUpdateToOutOfRangeGroupMembers()
 {
     if (m_groupUpdateMask == GROUP_UPDATE_FLAG_NONE)
         return;
-    if(Group* group = GetGroup())
+
+    if (Group* group = GetGroup())
         group->UpdatePlayerOutOfRange(this);
 
     m_groupUpdateMask = GROUP_UPDATE_FLAG_NONE;
     m_auraUpdateMask = 0;
-    if(Pet *pet = GetPet())
+    if (Pet* pet = GetPet())
         pet->ResetAuraUpdateMask();
 }
 
 void Player::SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg)
 {
-    WorldPacket data(SMSG_TRANSFER_ABORTED, 4+2);
-    data << uint32(mapid);
-    data << uint8(reason);                                  // transfer abort reason
-    switch(reason)
-    {
-        case TRANSFER_ABORT_INSUF_EXPAN_LVL:
-        case TRANSFER_ABORT_DIFFICULTY:
-        case TRANSFER_ABORT_UNIQUE_MESSAGE:
-            data << uint8(arg);
-            break;
-    }
-    GetSession()->SendPacket(&data);
+    if (GetSession())
+        GetSession()->SendTransferAborted(mapid, reason, arg);
 }
 
-void Player::SendInstanceResetWarning( uint32 mapid, Difficulty difficulty, uint32 time )
+void Player::SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint32 time)
 {
     // type of warning, based on the time remaining until reset
     uint32 type;
-    if(time > 3600)
+    if (time > 3600)
         type = RAID_INSTANCE_WELCOME;
-    else if(time > 900 && time <= 3600)
+    else if (time > 900 && time <= 3600)
         type = RAID_INSTANCE_WARNING_HOURS;
-    else if(time > 300 && time <= 900)
+    else if (time > 300 && time <= 900)
         type = RAID_INSTANCE_WARNING_MIN;
     else
         type = RAID_INSTANCE_WARNING_MIN_SOON;
@@ -20377,7 +20901,7 @@ void Player::SendInstanceResetWarning( uint32 mapid, Difficulty difficulty, uint
     data << uint32(mapid);
     data << uint32(difficulty);                             // difficulty
     data << uint32(time);
-    if(type == RAID_INSTANCE_WELCOME)
+    if (type == RAID_INSTANCE_WELCOME)
     {
         data << uint8(0);                                   // is your (1)
         data << uint8(0);                                   // is extended (1), ignored if prev field is 0
@@ -20385,21 +20909,21 @@ void Player::SendInstanceResetWarning( uint32 mapid, Difficulty difficulty, uint
     GetSession()->SendPacket(&data);
 }
 
-void Player::ApplyEquipCooldown( Item * pItem )
+void Player::ApplyEquipCooldown(Item * pItem)
 {
     if (pItem->GetProto()->Flags & ITEM_FLAG_NO_EQUIP_COOLDOWN)
         return;
 
-    for(int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
+    for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
     {
         _Spell const& spellData = pItem->GetProto()->Spells[i];
 
         // no spell
-        if( !spellData.SpellId )
+        if (!spellData.SpellId)
             continue;
 
         // wrong triggering type (note: ITEM_SPELLTRIGGER_ON_NO_DELAY_USE not have cooldown)
-        if( spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_USE )
+        if (spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_USE)
             continue;
 
         AddSpellCooldown(spellData.SpellId, pItem->GetEntry(), time(NULL) + 30);
@@ -20414,14 +20938,14 @@ void Player::ApplyEquipCooldown( Item * pItem )
 void Player::resetSpells()
 {
     // not need after this call
-    if(HasAtLoginFlag(AT_LOGIN_RESET_SPELLS))
+    if (HasAtLoginFlag(AT_LOGIN_RESET_SPELLS))
         RemoveAtLoginFlag(AT_LOGIN_RESET_SPELLS,true);
 
     // make full copy of map (spells removed and marked as deleted at another spell remove
     // and we can't use original map for safe iterative with visit each spell at loop end
     PlayerSpellMap smap = GetSpellMap();
 
-    for(PlayerSpellMap::const_iterator iter = smap.begin();iter != smap.end(); ++iter)
+    for (PlayerSpellMap::const_iterator iter = smap.begin();iter != smap.end(); ++iter)
         removeSpell(iter->first,false,false);               // only iter->first can be accessed, object by iter->second can be deleted already
 
     learnDefaultSpells();
@@ -20436,7 +20960,7 @@ void Player::learnDefaultSpells()
     {
         uint32 tspell = *itr;
         DEBUG_LOG("PLAYER (Class: %u Race: %u): Adding initial spell, id = %u",uint32(getClass()),uint32(getRace()), tspell);
-        if(!IsInWorld())                                    // will send in INITIAL_SPELLS in list anyway at map add
+        if (!IsInWorld())                                    // will send in INITIAL_SPELLS in list anyway at map add
             addSpell(tspell, true, true, true, false);
         else                                                // but send in normal spell in game learn case
             learnSpell(tspell, true);
@@ -20448,18 +20972,18 @@ void Player::learnQuestRewardedSpells(Quest const* quest)
     uint32 spell_id = quest->GetRewSpellCast();
 
     // skip quests without rewarded spell
-    if( !spell_id )
+    if (!spell_id)
         return;
 
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
-    if(!spellInfo)
+    if (!spellInfo)
         return;
 
     // check learned spells state
     bool found = false;
-    for(int i=0; i < MAX_EFFECT_INDEX; ++i)
+    for (int i=0; i < MAX_EFFECT_INDEX; ++i)
     {
-        if(spellInfo->Effect[i] == SPELL_EFFECT_LEARN_SPELL && !HasSpell(spellInfo->EffectTriggerSpell[i]))
+        if (spellInfo->Effect[i] == SPELL_EFFECT_LEARN_SPELL && !HasSpell(spellInfo->EffectTriggerSpell[i]))
         {
             found = true;
             break;
@@ -20467,33 +20991,34 @@ void Player::learnQuestRewardedSpells(Quest const* quest)
     }
 
     // skip quests with not teaching spell or already known spell
-    if(!found)
+    if (!found)
         return;
 
     // prevent learn non first rank unknown profession and second specialization for same profession)
     uint32 learned_0 = spellInfo->EffectTriggerSpell[EFFECT_INDEX_0];
-    if( sSpellMgr.GetSpellRank(learned_0) > 1 && !HasSpell(learned_0) )
+    if (sSpellMgr.GetSpellRank(learned_0) > 1 && !HasSpell(learned_0))
     {
         // not have first rank learned (unlearned prof?)
         uint32 first_spell = sSpellMgr.GetFirstSpellInChain(learned_0);
-        if( !HasSpell(first_spell) )
+        uint32 prev_spell = sSpellMgr.GetPrevSpellInChain(learned_0);
+        if (!HasSpell(first_spell) || !HasSpell(prev_spell))
             return;
 
         SpellEntry const *learnedInfo = sSpellStore.LookupEntry(learned_0);
-        if(!learnedInfo)
+        if (!learnedInfo)
             return;
 
         // specialization
         if (learnedInfo->Effect[EFFECT_INDEX_0] == SPELL_EFFECT_TRADE_SKILL && learnedInfo->Effect[EFFECT_INDEX_1] == 0)
         {
             // search other specialization for same prof
-            for(PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr)
+            for (PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr)
             {
-                if(itr->second.state == PLAYERSPELL_REMOVED || itr->first==learned_0)
+                if (itr->second.state == PLAYERSPELL_REMOVED || itr->first==learned_0)
                     continue;
 
                 SpellEntry const *itrInfo = sSpellStore.LookupEntry(itr->first);
-                if(!itrInfo)
+                if (!itrInfo)
                     return;
 
                 // compare only specializations
@@ -20501,37 +21026,37 @@ void Player::learnQuestRewardedSpells(Quest const* quest)
                     continue;
 
                 // compare same chain spells
-                if(sSpellMgr.GetFirstSpellInChain(itr->first) != first_spell)
+                if (sSpellMgr.GetFirstSpellInChain(itr->first) != first_spell)
                     continue;
 
                 // now we have 2 specialization, learn possible only if found is lesser specialization rank
-                if(!sSpellMgr.IsHighRankOfSpell(learned_0,itr->first))
+                if (!sSpellMgr.IsHighRankOfSpell(learned_0,itr->first))
                     return;
             }
         }
     }
 
-    CastSpell( this, spell_id, true);
+    CastSpell(this, spell_id, true);
 }
 
 void Player::learnQuestRewardedSpells()
 {
     // learn spells received from quest completing
-    for(QuestStatusMap::const_iterator itr = mQuestStatus.begin(); itr != mQuestStatus.end(); ++itr)
+    for (QuestStatusMap::const_iterator itr = mQuestStatus.begin(); itr != mQuestStatus.end(); ++itr)
     {
         // skip no rewarded quests
-        if(!itr->second.m_rewarded)
+        if (!itr->second.m_rewarded)
             continue;
 
         Quest const* quest = sObjectMgr.GetQuestTemplate(itr->first);
-        if( !quest )
+        if (!quest)
             continue;
 
         learnQuestRewardedSpells(quest);
     }
 }
 
-void Player::learnSkillRewardedSpells(uint32 skill_id, uint32 skill_value )
+void Player::learnSkillRewardedSpells(uint32 skill_id, uint32 skill_value)
 {
     uint32 raceMask  = getRaceMask();
     uint32 classMask = getClassMask();
@@ -20561,36 +21086,43 @@ void Player::learnSkillRewardedSpells(uint32 skill_id, uint32 skill_value )
     }
 }
 
-void Player::SendAurasForTarget(Unit *target)
+void Player::SendAurasForTarget(Unit* target)
 {
+    if (!target)
+        return;
+
     WorldPacket data(SMSG_AURA_UPDATE_ALL);
     data << target->GetPackGUID();
 
-    Unit::VisibleAuraMap const& visibleAuras = target->GetVisibleAuras();
-    for (Unit::VisibleAuraMap::const_iterator itr = visibleAuras.begin(); itr != visibleAuras.end(); ++itr)
+    for (uint8 slot = 0; slot < MAX_AURAS; ++slot)
     {
-        SpellAuraHolderConstBounds bounds = target->GetSpellAuraHolderBounds(itr->second);
-        for (SpellAuraHolderMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
-            iter->second->BuildUpdatePacket(data);
+        SpellAuraHolderPtr const vAura = target->GetVisibleAura(slot);
+        if (vAura)
+            vAura->BuildUpdatePacket(data);
     }
 
     GetSession()->SendPacket(&data);
 }
 
-void Player::SetDailyQuestStatus( uint32 quest_id )
+void Player::SetDailyQuestStatus(uint32 quest_id)
 {
-    for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
+    uint32 quest_daily_idx;
+    for (quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
     {
-        if(!GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx))
+        if (!GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1 + quest_daily_idx))
         {
-            SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,quest_id);
+            SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1 + quest_daily_idx, quest_id);
             m_DailyQuestChanged = true;
             break;
         }
     }
+
+    // if first daily quest at curent day
+    if (!quest_daily_idx)
+        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY, 1);
 }
 
-void Player::SetWeeklyQuestStatus( uint32 quest_id )
+void Player::SetWeeklyQuestStatus(uint32 quest_id)
 {
     m_weeklyquests.insert(quest_id);
     m_WeeklyQuestChanged = true;
@@ -20604,8 +21136,18 @@ void Player::SetMonthlyQuestStatus(uint32 quest_id)
 
 void Player::ResetDailyQuestStatus()
 {
-    for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
-        SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,0);
+    uint32 dailyQuestCount = 0;
+    for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
+    {
+        if (GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1 + quest_daily_idx))
+            ++dailyQuestCount;
+
+         SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1 + quest_daily_idx, 0);
+    }
+
+    // Reset daily_quest_daily if there are no daily quest last day
+    if (!dailyQuestCount)
+        GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY, ACHIEVEMENT_CRITERIA_CONDITION_DAILY);
 
     // DB data deleted in caller
     m_DailyQuestChanged = false;
@@ -20633,7 +21175,7 @@ void Player::ResetMonthlyQuestStatus()
 
 BattleGround* Player::GetBattleGround() const
 {
-    if(GetBattleGroundId()==0)
+    if (GetBattleGroundId()==0)
         return NULL;
 
     return sBattleGroundMgr.GetBattleGround(GetBattleGroundId(), m_bgData.bgTypeID);
@@ -20642,7 +21184,7 @@ BattleGround* Player::GetBattleGround() const
 bool Player::InArena() const
 {
     BattleGround *bg = GetBattleGround();
-    if(!bg || !bg->isArena())
+    if (!bg || !bg->isArena())
         return false;
 
     return true;
@@ -20652,7 +21194,7 @@ bool Player::GetBGAccessByLevel(BattleGroundTypeId bgTypeId) const
 {
     // get a template bg instead of running one
     BattleGround *bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
-    if(!bg)
+    if (!bg)
         return false;
 
     // limit check leel to dbc compatible level range
@@ -20660,20 +21202,20 @@ bool Player::GetBGAccessByLevel(BattleGroundTypeId bgTypeId) const
     if (level > DEFAULT_MAX_LEVEL)
         level = DEFAULT_MAX_LEVEL;
 
-    if(level < bg->GetMinLevel() || level > bg->GetMaxLevel())
+    if (level < bg->GetMinLevel() || level > bg->GetMaxLevel())
         return false;
 
     return true;
 }
 
-float Player::GetReputationPriceDiscount( Creature const* pCreature ) const
+float Player::GetReputationPriceDiscount(Creature const* pCreature) const
 {
     FactionTemplateEntry const* vendor_faction = pCreature->getFactionTemplateEntry();
-    if(!vendor_faction || !vendor_faction->faction)
+    if (!vendor_faction || !vendor_faction->faction)
         return 1.0f;
 
     ReputationRank rank = GetReputationRank(vendor_faction->faction);
-    if(rank <= REP_NEUTRAL)
+    if (rank <= REP_NEUTRAL)
         return 1.0f;
 
     return 1.0f - 0.05f* (rank - REP_NEUTRAL);
@@ -20694,7 +21236,7 @@ bool Player::IsSpellFitByClassAndRace(uint32 spell_id, uint32* pReqlevel /*= NUL
     uint32 classmask = getClassMask();
 
     SkillLineAbilityMapBounds bounds = sSpellMgr.GetSkillLineAbilityMapBounds(spell_id);
-    if (bounds.first==bounds.second)
+    if (bounds.first == bounds.second)
         return true;
 
     for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
@@ -20741,14 +21283,14 @@ bool Player::IsSpellFitByClassAndRace(uint32 spell_id, uint32* pReqlevel /*= NUL
 
 bool Player::HasQuestForGO(int32 GOId) const
 {
-    for( int i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
+    for (int i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
     {
         uint32 questid = GetQuestSlotQuestId(i);
-        if ( questid == 0 )
+        if (questid == 0)
             continue;
 
         QuestStatusMap::const_iterator qs_itr = mQuestStatus.find(questid);
-        if(qs_itr == mQuestStatus.end())
+        if (qs_itr == mQuestStatus.end())
             continue;
 
         QuestStatusData const& qs = qs_itr->second;
@@ -20756,10 +21298,10 @@ bool Player::HasQuestForGO(int32 GOId) const
         if (qs.m_status == QUEST_STATUS_INCOMPLETE)
         {
             Quest const* qinfo = sObjectMgr.GetQuestTemplate(questid);
-            if(!qinfo)
+            if (!qinfo)
                 continue;
 
-            if(GetGroup() && GetGroup()->isRaidGroup() && !qinfo->IsAllowedInRaid())
+            if (GetGroup() && GetGroup()->isRaidGroup() && !qinfo->IsAllowedInRaid())
                 continue;
 
             for (int j = 0; j < QUEST_OBJECTIVES_COUNT; ++j)
@@ -20767,7 +21309,7 @@ bool Player::HasQuestForGO(int32 GOId) const
                 if (qinfo->ReqCreatureOrGOId[j]>=0)         //skip non GO case
                     continue;
 
-                if((-1)*GOId == qinfo->ReqCreatureOrGOId[j] && qs.m_creatureOrGOcount[j] < qinfo->ReqCreatureOrGOCount[j])
+                if ((-1)*GOId == qinfo->ReqCreatureOrGOId[j] && qs.m_creatureOrGOcount[j] < qinfo->ReqCreatureOrGOCount[j])
                     return true;
             }
         }
@@ -20777,12 +21319,12 @@ bool Player::HasQuestForGO(int32 GOId) const
 
 void Player::UpdateForQuestWorldObjects()
 {
-    if(m_clientGUIDs.empty())
+    if (GetClientGuids().empty() || !GetMap())
         return;
 
     UpdateData udata;
     WorldPacket packet;
-    for(ObjectGuidSet::const_iterator itr=m_clientGUIDs.begin(); itr!=m_clientGUIDs.end(); ++itr)
+    for (GuidSet::const_iterator itr = GetClientGuids().begin(); itr != GetClientGuids().end(); ++itr)
     {
         if (itr->IsGameObject())
         {
@@ -20791,18 +21333,18 @@ void Player::UpdateForQuestWorldObjects()
         }
         else if (itr->IsCreatureOrVehicle())
         {
-            Creature *obj = GetMap()->GetAnyTypeCreature(*itr);
-            if(!obj)
+            Creature* obj = GetMap()->GetAnyTypeCreature(*itr);
+            if (!obj)
                 continue;
 
             // check if this unit requires quest specific flags
-            if(!obj->HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_SPELLCLICK))
+            if (!obj->HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_SPELLCLICK))
                 continue;
 
             SpellClickInfoMapBounds clickPair = sObjectMgr.GetSpellClickInfoMapBounds(obj->GetEntry());
-            for(SpellClickInfoMap::const_iterator _itr = clickPair.first; _itr != clickPair.second; ++_itr)
+            for (SpellClickInfoMap::const_iterator _itr = clickPair.first; _itr != clickPair.second; ++_itr)
             {
-                if(_itr->second.questStart || _itr->second.questEnd)
+                if (_itr->second.questStart || _itr->second.questEnd)
                 {
                     obj->BuildCreateUpdateBlockForPlayer(&udata,this);
                     break;
@@ -20816,40 +21358,41 @@ void Player::UpdateForQuestWorldObjects()
 
 void Player::SummonIfPossible(bool agree)
 {
-    if(!agree)
+    if (!agree)
     {
         m_summon_expire = 0;
         return;
     }
 
     // expire and auto declined
-    if(m_summon_expire < time(NULL))
+    if (m_summon_expire < time(NULL))
         return;
 
     // stop taxi flight at summon
-    if(IsTaxiFlying())
+    if (IsTaxiFlying())
     {
-        GetMotionMaster()->MovementExpired();
+        GetMotionMaster()->MoveIdle();
         m_taxi.ClearTaxiDestinations();
     }
 
     // drop flag at summon
     // this code can be reached only when GM is summoning player who carries flag, because player should be immune to summoning spells when he carries flag
-    if(BattleGround *bg = GetBattleGround())
+    if (BattleGround* bg = GetBattleGround())
         bg->EventPlayerDroppedFlag(this);
 
     m_summon_expire = 0;
 
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ACCEPTED_SUMMONINGS, 1);
 
-    TeleportTo(m_summon_mapid, m_summon_x, m_summon_y, m_summon_z,GetOrientation());
+    m_summon_loc.SetOrientation(GetOrientation());
+    TeleportTo(m_summon_loc);
 }
 
-void Player::RemoveItemDurations( Item *item )
+void Player::RemoveItemDurations(Item* item)
 {
-    for(ItemDurationList::iterator itr = m_itemDuration.begin();itr != m_itemDuration.end(); ++itr)
+    for (ItemDurationList::iterator itr = m_itemDuration.begin();itr != m_itemDuration.end(); ++itr)
     {
-        if(*itr==item)
+        if (*itr == item)
         {
             m_itemDuration.erase(itr);
             break;
@@ -20857,9 +21400,9 @@ void Player::RemoveItemDurations( Item *item )
     }
 }
 
-void Player::AddItemDurations( Item *item )
+void Player::AddItemDurations(Item* item)
 {
-    if(item->GetUInt32Value(ITEM_FIELD_DURATION))
+    if (item->GetUInt32Value(ITEM_FIELD_DURATION))
     {
         m_itemDuration.push_back(item);
         item->SendTimeUpdate(this);
@@ -20868,8 +21411,8 @@ void Player::AddItemDurations( Item *item )
 
 void Player::AutoUnequipOffhandIfNeed()
 {
-    Item *offItem = GetItemByPos( INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND );
-    if(!offItem)
+    Item* offItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
+    if (!offItem)
         return;
 
     // need unequip offhand for 2h-weapon without TitanGrip (in any from hands)
@@ -20878,11 +21421,11 @@ void Player::AutoUnequipOffhandIfNeed()
         return;
 
     ItemPosCountVec off_dest;
-    uint8 off_msg = CanStoreItem( NULL_BAG, NULL_SLOT, off_dest, offItem, false );
-    if( off_msg == EQUIP_ERR_OK )
+    uint8 off_msg = CanStoreItem(NULL_BAG, NULL_SLOT, off_dest, offItem, false);
+    if (off_msg == EQUIP_ERR_OK)
     {
         RemoveItem(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND, true);
-        StoreItem( off_dest, offItem, true );
+        StoreItem(off_dest, offItem, true);
     }
     else
     {
@@ -20899,37 +21442,37 @@ void Player::AutoUnequipOffhandIfNeed()
 
 bool Player::HasItemFitToSpellReqirements(SpellEntry const* spellInfo, Item const* ignoreItem)
 {
-    if(spellInfo->EquippedItemClass < 0)
+    if (spellInfo->EquippedItemClass < 0)
         return true;
 
     // scan other equipped items for same requirements (mostly 2 daggers/etc)
     // for optimize check 2 used cases only
-    switch(spellInfo->EquippedItemClass)
+    switch (spellInfo->EquippedItemClass)
     {
         case ITEM_CLASS_WEAPON:
         {
-            for(int i= EQUIPMENT_SLOT_MAINHAND; i < EQUIPMENT_SLOT_TABARD; ++i)
-                if(Item *item = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
-                    if(item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo))
+            for (int i= EQUIPMENT_SLOT_MAINHAND; i < EQUIPMENT_SLOT_TABARD; ++i)
+                if (Item *item = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                    if (item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo))
                         return true;
             break;
         }
         case ITEM_CLASS_ARMOR:
         {
             // tabard not have dependent spells
-            for(int i= EQUIPMENT_SLOT_START; i< EQUIPMENT_SLOT_MAINHAND; ++i)
-                if(Item *item = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
-                    if(item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo))
+            for (int i= EQUIPMENT_SLOT_START; i< EQUIPMENT_SLOT_MAINHAND; ++i)
+                if (Item *item = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                    if (item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo))
                         return true;
 
             // shields can be equipped to offhand slot
-            if(Item *item = GetItemByPos( INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
-                if(item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo))
+            if (Item *item = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
+                if (item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo))
                     return true;
 
             // ranged slot can have some armor subclasses
-            if(Item *item = GetItemByPos( INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED))
-                if(item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo))
+            if (Item *item = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED))
+                if (item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo))
                     return true;
 
             break;
@@ -20942,6 +21485,88 @@ bool Player::HasItemFitToSpellReqirements(SpellEntry const* spellInfo, Item cons
     return false;
 }
 
+bool Player::HasItemFitToAreaTriggerReqirements(AreaTrigger const* at) const
+{
+    if (at->requiredItem)
+    {
+        if (!HasItemCount(at->requiredItem, 1) && (!at->requiredItem2 || !HasItemCount(at->requiredItem2, 1)))
+            return false;
+    }
+    else if (at->requiredItem2 && !HasItemCount(at->requiredItem2, 1))
+        return false;
+
+    return true;
+}
+
+bool Player::HasHeroicKeyFitToAreaTriggerReqirements(AreaTrigger const* at) const
+{
+    if (at->heroicKey)
+    {
+        if (!HasItemCount(at->heroicKey, 1) && (!at->heroicKey2 || !HasItemCount(at->heroicKey2, 1)))
+            return false;
+    }
+    else if (at->heroicKey2 && !HasItemCount(at->heroicKey2, 1))
+        return false;
+
+    return true;
+}
+
+bool Player::HasQuestFitToAreaTriggerReqirements(AreaTrigger const* at, bool isRegularTargetMap) const
+{
+    if (GetTeam() == ALLIANCE)
+    {
+        if ((!isRegularTargetMap &&
+            (at->requiredQuestHeroicA && !GetQuestRewardStatus(at->requiredQuestHeroicA))) ||
+            (isRegularTargetMap &&
+            (at->requiredQuestA && !GetQuestRewardStatus(at->requiredQuestA))))
+        {
+            return false;
+        }
+    }
+    else if (GetTeam() == HORDE)
+    {
+        if ((!isRegularTargetMap &&
+            (at->requiredQuestHeroicH && !GetQuestRewardStatus(at->requiredQuestHeroicH))) ||
+            (isRegularTargetMap &&
+            (at->requiredQuestH && !GetQuestRewardStatus(at->requiredQuestH))))
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool Player::HasAchievementFitToAreaTriggerReqirements(AreaTrigger const* at, Difficulty difficulty)
+{
+    uint32 uiAchievementID = 0;
+    if (difficulty == RAID_DIFFICULTY_10MAN_HEROIC)
+        uiAchievementID = at->achiev0;
+    else if (difficulty == RAID_DIFFICULTY_25MAN_HEROIC)
+        uiAchievementID = at->achiev1;
+
+    if (!uiAchievementID)
+        return true;
+
+    if (GetAchievementMgr().HasAchievement(uiAchievementID))
+        return true;
+
+    if (Group* group = GetGroup())
+    {
+        for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player* member = itr->getSource();
+            if (member && member->IsInWorld())
+            {
+                if (member->GetAchievementMgr().HasAchievement(uiAchievementID))
+                    return true;
+            }
+        }
+    }
+
+    return false;
+}
+
 bool Player::CanNoReagentCast(SpellEntry const* spellInfo) const
 {
     // don't take reagents for spells with SPELL_ATTR_EX5_NO_REAGENT_WHILE_PREP
@@ -20949,45 +21574,65 @@ bool Player::CanNoReagentCast(SpellEntry const* spellInfo) const
         return true;
 
     // Check no reagent use mask
-    uint64 noReagentMask_0_1 = GetUInt64Value(PLAYER_NO_REAGENT_COST_1);
-    uint32 noReagentMask_2   = GetUInt32Value(PLAYER_NO_REAGENT_COST_1+2);
-    if (spellInfo->IsFitToFamilyMask(noReagentMask_0_1, noReagentMask_2))
+    ClassFamilyMask noReagentMask(GetUInt64Value(PLAYER_NO_REAGENT_COST_1), GetUInt32Value(PLAYER_NO_REAGENT_COST_1+2));
+    if (spellInfo->IsFitToFamilyMask(noReagentMask))
         return true;
 
     return false;
 }
 
-void Player::RemoveItemDependentAurasAndCasts( Item * pItem )
+void Player::RemoveItemDependentAurasAndCasts(Item * pItem)
 {
     SpellAuraHolderMap& auras = GetSpellAuraHolderMap();
-    for(SpellAuraHolderMap::const_iterator itr = auras.begin(); itr != auras.end(); )
+    for (SpellAuraHolderMap::const_iterator itr = auras.begin(); itr != auras.end();)
     {
-        SpellAuraHolder* holder = itr->second;
-
         // skip passive (passive item dependent spells work in another way) and not self applied auras
-        SpellEntry const* spellInfo = holder->GetSpellProto();
-        if(holder->IsPassive() ||  holder->GetCasterGuid() != GetObjectGuid())
+        SpellEntry const* spellInfo = itr->second->GetSpellProto();
+        if (itr->second->IsPassive() ||  itr->second->GetCasterGuid() != GetObjectGuid())
         {
             ++itr;
             continue;
         }
 
+        // Remove spells triggered by equipped item auras
+        if (pItem->HasTriggeredByAuraSpell(spellInfo))
+        {
+            RemoveAurasDueToSpell(itr->second->GetId());
+            itr = auras.begin();
+            continue;
+        }
+
+        // Shadowmourne visual
+        if ((itr->second->GetId() == 72521 || itr->second->GetId() == 72523) && pItem->GetEntry() == 49623)
+        {
+            RemoveAurasDueToSpell(itr->second->GetId());
+            itr = auras.begin();
+            continue;
+        }
+
         // skip if not item dependent or have alternative item
-        if(HasItemFitToSpellReqirements(spellInfo,pItem))
+        if (HasItemFitToSpellReqirements(spellInfo,pItem))
+        {
+            ++itr;
+            continue;
+        }
+
+        // Bladestorm
+        if (itr->second->GetId() == 46924)
         {
             ++itr;
             continue;
         }
 
         // no alt item, remove aura, restart check
-        RemoveAurasDueToSpell(holder->GetId());
+        RemoveAurasDueToSpell(itr->second->GetId());
         itr = auras.begin();
     }
 
     // currently casted spells can be dependent from item
     for (uint32 i = 0; i < CURRENT_MAX_SPELL; ++i)
         if (Spell* spell = GetCurrentSpell(CurrentSpellTypes(i)))
-            if (spell->getState()!=SPELL_STATE_DELAYED && !HasItemFitToSpellReqirements(spell->m_spellInfo,pItem) )
+            if (spell->getState()!=SPELL_STATE_DELAYED && !HasItemFitToSpellReqirements(spell->m_spellInfo,pItem))
                 InterruptSpell(CurrentSpellTypes(i));
 }
 
@@ -20997,10 +21642,10 @@ uint32 Player::GetResurrectionSpellId()
     uint32 prio = 0;
     uint32 spell_id = 0;
     AuraList const& dummyAuras = GetAurasByType(SPELL_AURA_DUMMY);
-    for(AuraList::const_iterator itr = dummyAuras.begin(); itr != dummyAuras.end(); ++itr)
+    for (AuraList::const_iterator itr = dummyAuras.begin(); itr != dummyAuras.end(); ++itr)
     {
         // Soulstone Resurrection                           // prio: 3 (max, non death persistent)
-        if( prio < 2 && (*itr)->GetSpellProto()->SpellVisual[0] == 99 && (*itr)->GetSpellProto()->SpellIconID == 92 )
+        if (prio < 2 && (*itr)->GetSpellProto()->GetSpellVisual() == 99 && (*itr)->GetSpellProto()->GetSpellIconID() == 92)
         {
             switch((*itr)->GetId())
             {
@@ -21019,7 +21664,7 @@ uint32 Player::GetResurrectionSpellId()
             prio = 3;
         }
         // Twisting Nether                                  // prio: 2 (max)
-        else if((*itr)->GetId()==23701 && roll_chance_i(10))
+        else if ((*itr)->GetId() == 23701 && roll_chance_i(10))
         {
             prio = 2;
             spell_id = 23700;
@@ -21037,55 +21682,72 @@ uint32 Player::GetResurrectionSpellId()
 // Used in triggers for check "Only to targets that grant experience or honor" req
 bool Player::isHonorOrXPTarget(Unit* pVictim) const
 {
+    if (!pVictim)
+        return false;
+
     uint32 v_level = pVictim->getLevel();
     uint32 k_grey  = MaNGOS::XP::GetGrayLevel(getLevel());
 
     // Victim level less gray level
-    if(v_level<=k_grey)
+    if (v_level <= k_grey)
         return false;
 
-    if(pVictim->GetTypeId() == TYPEID_UNIT)
+    if (pVictim->GetTypeId() == TYPEID_UNIT)
     {
         if (((Creature*)pVictim)->IsTotem() ||
-            ((Creature*)pVictim)->IsPet() ||
-            ((Creature*)pVictim)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL)
-                return false;
+                ((Creature*)pVictim)->IsPet() ||
+                ((Creature*)pVictim)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL)
+            return false;
     }
     return true;
 }
 
 void Player::RewardSinglePlayerAtKill(Unit* pVictim)
 {
+    if (!pVictim)
+        return;
+
     bool PvP = pVictim->isCharmedOwnedByPlayerOrPlayer();
     uint32 xp = PvP ? 0 : MaNGOS::XP::Gain(this, pVictim);
 
     // honor can be in PvP and !PvP (racial leader) cases
-    RewardHonor(pVictim,1);
+    RewardHonor(pVictim, 1);
+
+    GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, 1, 0, pVictim);
 
     // xp and reputation only in !PvP case
-    if(!PvP)
+    if (!PvP)
     {
-        RewardReputation(pVictim,1);
+        RewardReputation(pVictim, 1.0f);
         GiveXP(xp, pVictim);
 
-        if(Pet* pet = GetPet())
+        if (Pet* pet = GetPet())
             pet->GivePetXP(xp);
 
         // normal creature (not pet/etc) can be only in !PvP case
-        if(pVictim->GetTypeId()==TYPEID_UNIT)
-            if(CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(pVictim->GetEntry()))
+        if (pVictim->GetTypeId() == TYPEID_UNIT)
+        {
+            if (CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(pVictim->GetEntry()))
+            {
                 KilledMonster(normalInfo, pVictim->GetObjectGuid());
+
+                if (uint32 normalType = normalInfo->CreatureType)
+                    GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE, normalType, xp);
+            }
+        }
     }
 }
 
 void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewardSource)
 {
+    MANGOS_ASSERT((!GetGroup() || pRewardSource) && "Player::RewardPlayerAndGroupAtEvent called for Group-Case but no source for range searching provided");
+
     ObjectGuid creature_guid = pRewardSource && pRewardSource->GetTypeId() == TYPEID_UNIT ? pRewardSource->GetObjectGuid() : ObjectGuid();
 
     // prepare data for near group iteration
-    if (Group *pGroup = GetGroup())
+    if (Group* pGroup = GetGroup())
     {
-        for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player* pGroupGuy = itr->getSource();
             if (!pGroupGuy)
@@ -21095,7 +21757,7 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar
                 continue;                               // member (alive or dead) or his corpse at req. distance
 
             // quest objectives updated only for alive group member or dead but with not released body
-            if (pGroupGuy->isAlive()|| !pGroupGuy->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
+            if (pGroupGuy->isAlive() || !pGroupGuy->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
                 pGroupGuy->KilledMonsterCredit(creature_id, creature_guid);
         }
     }
@@ -21106,19 +21768,19 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar
 void Player::RewardPlayerAndGroupAtCast(WorldObject* pRewardSource, uint32 spellid)
 {
     // prepare data for near group iteration
-    if(Group *pGroup = GetGroup())
+    if (Group* pGroup = GetGroup())
     {
-        for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player* pGroupGuy = itr->getSource();
-            if(!pGroupGuy)
+            if (!pGroupGuy)
                 continue;
 
-            if(!pGroupGuy->IsAtGroupRewardDistance(pRewardSource))
+            if (!pGroupGuy->IsAtGroupRewardDistance(pRewardSource))
                 continue;                               // member (alive or dead) or his corpse at req. distance
 
             // quest objectives updated only for alive group member or dead but with not released body
-            if(pGroupGuy->isAlive()|| !pGroupGuy->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
+            if (pGroupGuy->isAlive()|| !pGroupGuy->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
                 pGroupGuy->CastedCreatureOrGO(pRewardSource->GetEntry(), pRewardSource->GetObjectGuid(), spellid, pGroupGuy == this);
         }
     }
@@ -21128,7 +21790,11 @@ void Player::RewardPlayerAndGroupAtCast(WorldObject* pRewardSource, uint32 spell
 
 bool Player::IsAtGroupRewardDistance(WorldObject const* pRewardSource) const
 {
-    if (pRewardSource->IsWithinDistInMap(this,sWorld.getConfig(CONFIG_FLOAT_GROUP_XP_DISTANCE)))
+
+    if (!pRewardSource)
+        return false;
+
+    if (pRewardSource->IsWithinDistInMap(this, sWorld.getConfig(CONFIG_FLOAT_GROUP_XP_DISTANCE)))
         return true;
 
     if (isAlive())
@@ -21138,7 +21804,7 @@ bool Player::IsAtGroupRewardDistance(WorldObject const* pRewardSource) const
     if (!corpse)
         return false;
 
-    return pRewardSource->IsWithinDistInMap(corpse,sWorld.getConfig(CONFIG_FLOAT_GROUP_XP_DISTANCE));
+    return pRewardSource->IsWithinDistInMap(corpse, sWorld.getConfig(CONFIG_FLOAT_GROUP_XP_DISTANCE));
 }
 
 uint32 Player::GetBaseWeaponSkillValue (WeaponAttackType attType) const
@@ -21146,11 +21812,11 @@ uint32 Player::GetBaseWeaponSkillValue (WeaponAttackType attType) const
     Item* item = GetWeaponForAttack(attType,true,true);
 
     // unarmed only with base attack
-    if(attType != BASE_ATTACK && !item)
+    if (attType != BASE_ATTACK && !item)
         return 0;
 
     // weapon skill or (unarmed for base attack)
-    uint32  skill = item ? item->GetSkill() : uint32(SKILL_UNARMED);
+    uint32 skill = item ? item->GetSkill() : uint32(SKILL_UNARMED);
     return GetBaseSkillValue(skill);
 }
 
@@ -21162,34 +21828,37 @@ void Player::ResurectUsingRequestData()
 
     //we cannot resurrect player when we triggered far teleport
     //player will be resurrected upon teleportation
-    if(IsBeingTeleportedFar())
+    if (IsBeingTeleportedFar())
     {
         ScheduleDelayedOperation(DELAYED_RESURRECT_PLAYER);
         return;
     }
 
-    ResurrectPlayer(0.0f,false);
+    ResurrectPlayer(0, false);
 
-    if(GetMaxHealth() > m_resurrectHealth)
-        SetHealth( m_resurrectHealth );
+    if (GetMaxHealth() > m_resurrectHealth)
+        SetHealth(m_resurrectHealth);
     else
-        SetHealth( GetMaxHealth() );
+        SetHealth(GetMaxHealth());
 
-    if(GetMaxPower(POWER_MANA) > m_resurrectMana)
-        SetPower(POWER_MANA, m_resurrectMana );
+    if (GetMaxPower(POWER_MANA) > m_resurrectMana)
+        SetPower(POWER_MANA, m_resurrectMana);
     else
-        SetPower(POWER_MANA, GetMaxPower(POWER_MANA) );
+        SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
 
-    SetPower(POWER_RAGE, 0 );
+    SetPower(POWER_RAGE, 0);
 
-    SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY) );
+    SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY));
 
     SpawnCorpseBones();
 }
 
 void Player::SetClientControl(Unit* target, uint8 allowMove)
 {
-    WorldPacket data(SMSG_CLIENT_CONTROL_UPDATE, target->GetPackGUID().size()+1);
+    if (!GetSession())
+       return;
+
+    WorldPacket data(SMSG_CLIENT_CONTROL_UPDATE, target->GetPackGUID().size() + 1);
     data << target->GetPackGUID();
     data << uint8(allowMove);
     GetSession()->SendPacket(&data);
@@ -21199,33 +21868,33 @@ void Player::UpdateZoneDependentAuras()
 {
     // Some spells applied at enter into zone (with subzones), aura removed in UpdateAreaDependentAuras that called always at zone->area update
     SpellAreaForAreaMapBounds saBounds = sSpellMgr.GetSpellAreaForAreaMapBounds(m_zoneUpdateId);
-    for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
-        if(itr->second->autocast && itr->second->IsFitToRequirements(this, m_zoneUpdateId, 0))
-            if (!HasAura(itr->second->spellId, EFFECT_INDEX_0))
-                CastSpell(this,itr->second->spellId,true);
+    for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
+        itr->second->ApplyOrRemoveSpellIfCan(this, m_zoneUpdateId, 0, true);
 }
 
 void Player::UpdateAreaDependentAuras()
 {
     // remove auras from spells with area limitations
-    for(SpellAuraHolderMap::iterator iter = m_spellAuraHolders.begin(); iter != m_spellAuraHolders.end();)
+    SpellIdSet toRemoveSpellList;
     {
-        // use m_zoneUpdateId for speed: UpdateArea called from UpdateZone or instead UpdateZone in both cases m_zoneUpdateId up-to-date
-        if(sSpellMgr.GetSpellAllowedInLocationError(iter->second->GetSpellProto(), GetMapId(), m_zoneUpdateId, m_areaUpdateId, this) != SPELL_CAST_OK)
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        SpellAuraHolderMap const& holdersMap = GetSpellAuraHolderMap();
+        for (SpellAuraHolderMap::const_iterator iter = holdersMap.begin(); iter != holdersMap.end(); ++iter)
         {
-            RemoveSpellAuraHolder(iter->second);
-            iter = m_spellAuraHolders.begin();
+            // use m_zoneUpdateId for speed: UpdateArea called from UpdateZone or instead UpdateZone in both cases m_zoneUpdateId up-to-date
+            if (iter->second && (sSpellMgr.GetSpellAllowedInLocationError(iter->second->GetSpellProto(), GetMapId(), m_zoneUpdateId, m_areaUpdateId, this) != SPELL_CAST_OK))
+                toRemoveSpellList.insert(iter->first);
         }
-        else
-            ++iter;
     }
 
+    if (!toRemoveSpellList.empty())
+        for (SpellIdSet::iterator i = toRemoveSpellList.begin(); i != toRemoveSpellList.end(); ++i)
+            RemoveAurasDueToSpell(*i);
+
     // some auras applied at subzone enter
     SpellAreaForAreaMapBounds saBounds = sSpellMgr.GetSpellAreaForAreaMapBounds(m_areaUpdateId);
-    for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
-        if(itr->second->autocast && itr->second->IsFitToRequirements(this, m_zoneUpdateId, m_areaUpdateId))
-            if (!HasAura(itr->second->spellId, EFFECT_INDEX_0))
-                CastSpell(this,itr->second->spellId,true);
+    for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
+        itr->second->ApplyOrRemoveSpellIfCan(this, m_zoneUpdateId, m_areaUpdateId, true);
 }
 
 struct UpdateZoneDependentPetsHelper
@@ -21234,10 +21903,16 @@ struct UpdateZoneDependentPetsHelper
     void operator()(Unit* unit) const
     {
         if (unit->GetTypeId() == TYPEID_UNIT && ((Creature*)unit)->IsPet() && !((Pet*)unit)->IsPermanentPetFor(owner))
+        {
             if (uint32 spell_id = unit->GetUInt32Value(UNIT_CREATED_BY_SPELL))
+            {
                 if (SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell_id))
+                {
                     if (sSpellMgr.GetSpellAllowedInLocationError(spellEntry, owner->GetMapId(), zone_id, area_id, owner) != SPELL_CAST_OK)
                       ((Pet*)unit)->Unsummon(PET_SAVE_AS_DELETED, owner);
+                }
+            }
+        }
     }
     Player* owner;
     uint32 zone_id;
@@ -21253,15 +21928,15 @@ void Player::UpdateZoneDependentPets()
 uint32 Player::GetCorpseReclaimDelay(bool pvp) const
 {
     if ((pvp && !sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVP)) ||
-       (!pvp && !sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVE) ))
+       (!pvp && !sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVE)))
     {
-        return copseReclaimDelay[0];
+        return corpseReclaimDelay[0];
     }
 
     time_t now = time(NULL);
     // 0..2 full period
-    uint32 count = (now < m_deathExpireTime) ? uint32((m_deathExpireTime - now)/DEATH_EXPIRE_STEP) : 0;
-    return copseReclaimDelay[count];
+    uint32 count = (now < m_deathExpireTime) ? uint32((m_deathExpireTime - now) / DEATH_EXPIRE_STEP) : 0;
+    return corpseReclaimDelay[count];
 }
 
 void Player::UpdateCorpseReclaimDelay()
@@ -21269,15 +21944,15 @@ void Player::UpdateCorpseReclaimDelay()
     bool pvp = m_ExtraFlags & PLAYER_EXTRA_PVP_DEATH;
 
     if ((pvp && !sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVP)) ||
-       (!pvp && !sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVE) ))
+       (!pvp && !sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVE)))
         return;
 
     time_t now = time(NULL);
-    if(now < m_deathExpireTime)
+    if (now < m_deathExpireTime)
     {
         // full and partly periods 1..3
         uint32 count = uint32((m_deathExpireTime - now)/DEATH_EXPIRE_STEP +1);
-        if(count < MAX_DEATH_COUNT)
+        if (count < MAX_DEATH_COUNT)
             m_deathExpireTime = now+(count+1)*DEATH_EXPIRE_STEP;
         else
             m_deathExpireTime = now+MAX_DEATH_COUNT*DEATH_EXPIRE_STEP;
@@ -21298,20 +21973,20 @@ void Player::SendCorpseReclaimDelay(bool load)
         if (corpse->GetGhostTime() > m_deathExpireTime)
             return;
 
-        bool pvp = corpse->GetType()==CORPSE_RESURRECTABLE_PVP;
+        bool pvp = corpse->GetType() == CORPSE_RESURRECTABLE_PVP;
 
         uint32 count;
         if ((pvp && sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVP)) ||
             (!pvp && sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVE)))
         {
             count = uint32(m_deathExpireTime-corpse->GetGhostTime())/DEATH_EXPIRE_STEP;
-            if (count>=MAX_DEATH_COUNT)
+            if (count >= MAX_DEATH_COUNT)
                 count = MAX_DEATH_COUNT-1;
         }
         else
-            count=0;
+            count = 0;
 
-        time_t expected_time = corpse->GetGhostTime()+copseReclaimDelay[count];
+        time_t expected_time = corpse->GetGhostTime() + corpseReclaimDelay[count];
 
         time_t now = time(NULL);
         if (now >= expected_time)
@@ -21324,39 +21999,37 @@ void Player::SendCorpseReclaimDelay(bool load)
 
     //! corpse reclaim delay 30 * 1000ms or longer at often deaths
     WorldPacket data(SMSG_CORPSE_RECLAIM_DELAY, 4);
-    data << uint32(delay*IN_MILLISECONDS);
-    GetSession()->SendPacket( &data );
+    data << uint32(delay * IN_MILLISECONDS);
+    GetSession()->SendPacket(&data);
 }
 
-Player* Player::GetNextRandomRaidMember(float radius)
+Player* Player::GetNextRandomRaidMember(float radius, bool onlyAlive)
 {
-    Group *pGroup = GetGroup();
-    if(!pGroup)
+    Group* pGroup = GetGroup();
+    if (!pGroup)
         return NULL;
 
     std::vector<Player*> nearMembers;
     nearMembers.reserve(pGroup->GetMembersCount());
 
-    for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+    for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
     {
-        Player* Target = itr->getSource();
+        Player* pMember = itr->getSource();
 
         // IsHostileTo check duel and controlled by enemy
-        if( Target && Target != this && IsWithinDistInMap(Target, radius) &&
-            !Target->HasInvisibilityAura() && !IsHostileTo(Target) )
-            nearMembers.push_back(Target);
+        if (pMember && pMember != this &&
+            (!onlyAlive || pMember->isAlive()) &&
+            IsWithinDistInMap(pMember, radius) &&
+            !pMember->HasInvisibilityAura() && !IsHostileTo(pMember))
+            nearMembers.push_back(pMember);
     }
 
-    if (nearMembers.empty())
-        return NULL;
-
-    uint32 randTarget = urand(0,nearMembers.size()-1);
-    return nearMembers[randTarget];
+    return nearMembers.empty() ? NULL : nearMembers[urand(0, nearMembers.size() - 1)];
 }
 
 PartyResult Player::CanUninviteFromGroup() const
 {
-    const Group* grp = GetGroup();
+    Group const* grp = GetGroup();
     if (!grp)
         return ERR_NOT_IN_GROUP;
 
@@ -21369,99 +22042,191 @@ PartyResult Player::CanUninviteFromGroup() const
     return ERR_PARTY_RESULT_OK;
 }
 
-void Player::SetBattleGroundRaid(Group* group, int8 subgroup)
+void Player::SetBattleGroundRaid(ObjectGuid const& guid, int8 subgroup)
 {
-    //we must move references from m_group to m_originalGroup
-    SetOriginalGroup(GetGroup(), GetSubGroup());
+    if (!guid || !guid.IsGroup())
+        return;
 
-    m_group.unlink();
-    m_group.link(group, this);
-    m_group.setSubGroup((uint8)subgroup);
+    //we must move references from m_group to m_originalGroup
+    SetOriginalGroup(GetGroupGuid(), GetSubGroup());
+    SetGroup(guid, subgroup);
 }
 
 void Player::RemoveFromBattleGroundRaid()
 {
     //remove existing reference
-    m_group.unlink();
-    if( Group* group = GetOriginalGroup() )
-    {
-        m_group.link(group, this);
-        m_group.setSubGroup(GetOriginalSubGroup());
-    }
-    SetOriginalGroup(NULL);
+    SetGroup(GetOriginalGroupGuid(), GetOriginalSubGroup());
+    SetOriginalGroup(ObjectGuid());
 }
 
-void Player::SetOriginalGroup(Group *group, int8 subgroup)
+void Player::SetOriginalGroup(ObjectGuid const& guid, int8 subgroup)
 {
-    if( group == NULL )
-        m_originalGroup.unlink();
-    else
-    {
-        // never use SetOriginalGroup without a subgroup unless you specify NULL for group
-        MANGOS_ASSERT(subgroup >= 0);
-        m_originalGroup.link(group, this);
-        m_originalGroup.setSubGroup((uint8)subgroup);
-    }
+    m_originalGroupGuid.Clear();
+    m_originalGroup.unlink();
+
+    Group* group = sObjectMgr.GetGroup(guid);
+
+    if (!group)
+        return;
+
+    m_originalGroupGuid = guid;
+
+    // never use SetOriginalGroup without a subgroup unless you specify NULL for group
+    MANGOS_ASSERT(subgroup >= 0);
+    m_originalGroup.link(group, this);
+    m_originalGroup.setSubGroup((uint8)subgroup);
 }
 
-void Player::UpdateUnderwaterState( Map* m, float x, float y, float z )
+void Player::UpdateUnderwaterState(Map* m, float x, float y, float z)
 {
     GridMapLiquidData liquid_status;
     GridMapLiquidStatus res = m->GetTerrain()->getLiquidStatus(x, y, z, MAP_ALL_LIQUIDS, &liquid_status);
     if (!res)
     {
-        m_MirrorTimerFlags &= ~(UNDERWATER_INWATER|UNDERWATER_INLAVA|UNDERWATER_INSLIME|UNDERWATER_INDARKWATER);
-        // Small hack for enable breath in WMO
-        /* if (IsInWater())
-            m_MirrorTimerFlags|=UNDERWATER_INWATER; */
+        m_MirrorTimerFlags &= ~(UNDERWATER_INWATER | UNDERWATER_INLAVA | UNDERWATER_INSLIME | UNDERWATER_INDARKWATER);
+        if (m_lastLiquid && m_lastLiquid->SpellId)
+        {
+            RemoveAurasDueToSpell(m_lastLiquid->SpellId == 37025 ? 37284 : m_lastLiquid->SpellId);
+            if (GetVehicle() && GetVehicle()->GetBase())
+            {
+                GetVehicle()->GetBase()->RemoveAurasDueToSpell(m_lastLiquid->SpellId == 37025 ? 37284 : m_lastLiquid->SpellId);
+            }
+        }
+        m_lastLiquid = NULL;
         return;
     }
 
+    if (uint32 liqEntry = liquid_status.entry)
+    {
+        LiquidTypeEntry const* liquid = sLiquidTypeStore.LookupEntry(liqEntry);
+
+        // Player change LiquidTypeEntry
+        if (m_lastLiquid && m_lastLiquid->SpellId && m_lastLiquid->Id != liqEntry)
+        {
+            RemoveAurasDueToSpell(m_lastLiquid->SpellId);
+            if (GetVehicle() && GetVehicle()->GetBase())
+            {
+                GetVehicle()->GetBase()->RemoveAurasDueToSpell(m_lastLiquid->SpellId);
+            }
+        }
+
+        if (liquid && liquid->SpellId)
+        {
+            // Exception for SSC water
+            uint32 liquidSpellId = liquid->SpellId == 37025 ? 37284 : liquid->SpellId;
+
+            if (res & (LIQUID_MAP_UNDER_WATER | LIQUID_MAP_IN_WATER))
+            {
+                if (SpellEntry const* pSpellEntry = sSpellStore.LookupEntry(liquidSpellId))
+                {
+                    // check aura for no double cast (FIXME! seems as big hack...)
+                    if (!HasAura(liquidSpellId))
+                    {
+                        // Handle exception for SSC water
+                        if (liquid->SpellId == 37025)
+                        {
+                            if (InstanceData* pInst = GetInstanceData())
+                            {
+                                if (pInst->CheckConditionCriteriaMeet(this, INSTANCE_CONDITION_ID_LURKER, NULL, CONDITION_FROM_HARDCODED))
+                                {
+                                    if (pInst->CheckConditionCriteriaMeet(this, INSTANCE_CONDITION_ID_SCALDING_WATER, NULL, CONDITION_FROM_HARDCODED))
+                                        CastSpell(this, liquidSpellId, true);
+                                    else
+                                    {
+                                        SummonCreature(21508, TEMPSUMMON_TIMED_OOC_DESPAWN, 2000);
+                                        // Special update timer for the SSC water
+                                        m_positionStatusUpdateTimer = 2000;
+                                    }
+                                }
+                            }
+                        }
+                        else if (SpellMgr::IsTargetMatchedWithCreatureType(pSpellEntry, this))
+                        {
+                            CastSpell(this, pSpellEntry, true);
+                        }
+                    }
+
+                    if (GetVehicle() && GetVehicle()->GetBase())
+                    {
+                        if (!GetVehicle()->GetBase()->HasAura(liquidSpellId))
+                        {
+                            if (SpellMgr::IsTargetMatchedWithCreatureType(pSpellEntry, GetVehicle()->GetBase()))
+                            {
+                                GetVehicle()->GetBase()->CastSpell(GetVehicle()->GetBase(), pSpellEntry, true);
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // Player is above Water or walk on Water
+                RemoveAurasDueToSpell(liquidSpellId);
+                if (GetVehicle() && GetVehicle()->GetBase())
+                {
+                    GetVehicle()->GetBase()->RemoveAurasDueToSpell(liquidSpellId);
+                }
+            }
+        }
+
+        m_lastLiquid = liquid;
+    }
+    else if (m_lastLiquid && m_lastLiquid->SpellId)
+    {
+        // Player change to no specific LiquidEntry (= 0)
+        RemoveAurasDueToSpell(m_lastLiquid->SpellId == 37025 ? 37284 : m_lastLiquid->SpellId);
+        if (GetVehicle() && GetVehicle()->GetBase())
+        {
+            GetVehicle()->GetBase()->RemoveAurasDueToSpell(m_lastLiquid->SpellId == 37025 ? 37284 : m_lastLiquid->SpellId);
+        }
+        m_lastLiquid = NULL;
+    }
+
     // All liquids type - check under water position
-    if (liquid_status.type&(MAP_LIQUID_TYPE_WATER|MAP_LIQUID_TYPE_OCEAN|MAP_LIQUID_TYPE_MAGMA|MAP_LIQUID_TYPE_SLIME))
+    if (liquid_status.type_flags&(MAP_LIQUID_TYPE_WATER | MAP_LIQUID_TYPE_OCEAN | MAP_LIQUID_TYPE_MAGMA | MAP_LIQUID_TYPE_SLIME))
     {
-        if ( res & LIQUID_MAP_UNDER_WATER)
+        if (res & LIQUID_MAP_UNDER_WATER)
             m_MirrorTimerFlags |= UNDERWATER_INWATER;
         else
             m_MirrorTimerFlags &= ~UNDERWATER_INWATER;
     }
 
     // Allow travel in dark water on taxi or transport
-    if ((liquid_status.type & MAP_LIQUID_TYPE_DARK_WATER) && !IsTaxiFlying() && !GetTransport())
+    if ((liquid_status.type_flags & MAP_LIQUID_TYPE_DARK_WATER) && !IsTaxiFlying() && !IsOnTransport())
         m_MirrorTimerFlags |= UNDERWATER_INDARKWATER;
     else
         m_MirrorTimerFlags &= ~UNDERWATER_INDARKWATER;
 
     // in lava check, anywhere in lava level
-    if (liquid_status.type&MAP_LIQUID_TYPE_MAGMA)
+    if (liquid_status.type_flags&MAP_LIQUID_TYPE_MAGMA)
     {
-        if (res & (LIQUID_MAP_UNDER_WATER|LIQUID_MAP_IN_WATER|LIQUID_MAP_WATER_WALK))
+        if (res & (LIQUID_MAP_UNDER_WATER | LIQUID_MAP_IN_WATER | LIQUID_MAP_WATER_WALK))
             m_MirrorTimerFlags |= UNDERWATER_INLAVA;
         else
             m_MirrorTimerFlags &= ~UNDERWATER_INLAVA;
     }
     // in slime check, anywhere in slime level
-    if (liquid_status.type&MAP_LIQUID_TYPE_SLIME)
+    if (liquid_status.type_flags&MAP_LIQUID_TYPE_SLIME)
     {
-        if (res & (LIQUID_MAP_UNDER_WATER|LIQUID_MAP_IN_WATER|LIQUID_MAP_WATER_WALK))
+        if (res & (LIQUID_MAP_UNDER_WATER | LIQUID_MAP_IN_WATER | LIQUID_MAP_WATER_WALK))
             m_MirrorTimerFlags |= UNDERWATER_INSLIME;
         else
             m_MirrorTimerFlags &= ~UNDERWATER_INSLIME;
     }
 }
 
-void Player::SetCanParry( bool value )
+void Player::SetCanParry(bool value)
 {
-    if(m_canParry==value)
+    if (m_canParry==value)
         return;
 
     m_canParry = value;
     UpdateParryPercentage();
 }
 
-void Player::SetCanBlock( bool value )
+void Player::SetCanBlock(bool value)
 {
-    if(m_canBlock==value)
+    if (m_canBlock==value)
         return;
 
     m_canBlock = value;
@@ -21470,9 +22235,11 @@ void Player::SetCanBlock( bool value )
 
 bool ItemPosCount::isContainedIn(ItemPosCountVec const& vec) const
 {
-    for(ItemPosCountVec::const_iterator itr = vec.begin(); itr != vec.end();++itr)
-        if(itr->pos == pos)
+    for (ItemPosCountVec::const_iterator itr = vec.begin(); itr != vec.end();++itr)
+    {
+        if (itr->pos == pos)
             return true;
+    }
 
     return false;
 }
@@ -21482,79 +22249,76 @@ bool Player::CanUseBattleGroundObject()
     // TODO : some spells gives player ForceReaction to one faction (ReputationMgr::ApplyForceReaction)
     // maybe gameobject code should handle that ForceReaction usage
     // BUG: sometimes when player clicks on flag in AB - client won't send gameobject_use, only gameobject_report_use packet
-    return ( //InBattleGround() &&                          // in battleground - not need, check in other cases
-             //!IsMounted() && - not correct, player is dismounted when he clicks on flag
-             //player cannot use object when he is invulnerable (immune)
-             !isTotalImmune() &&                            // not totally immune
-             //i'm not sure if these two are correct, because invisible players should get visible when they click on flag
-             !HasStealthAura() &&                           // not stealthed
-             !HasInvisibilityAura() &&                      // not invisible
-             !HasAura(SPELL_RECENTLY_DROPPED_FLAG, EFFECT_INDEX_0) &&// can't pickup
-             isAlive()                                      // live player
-           );
-}
-
-bool Player::CanCaptureTowerPoint()
-{
-    return ( !HasStealthAura() &&                           // not stealthed
-             !HasInvisibilityAura() &&                      // not invisible
-             isAlive()                                      // live player
-           );
+    return (isAlive() &&                                    // living
+            // the following two are incorrect, because invisible/stealthed players should get visible when they click on flag
+            !HasStealthAura() &&                            // not stealthed
+            !HasInvisibilityAura() &&                       // visible
+            !isTotalImmune() &&                             // vulnerable (not immune)
+            !HasAura(SPELL_RECENTLY_DROPPED_FLAG, EFFECT_INDEX_0));
 }
 
-uint32 Player::GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 newfacialhair)
+uint32 Player::GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 newfacialhair, uint8 newskintone)
 {
     uint32 level = getLevel();
 
-    if(level > GT_MAX_LEVEL)
+    if (level > GT_MAX_LEVEL)
         level = GT_MAX_LEVEL;                               // max level in this dbc
 
     uint8 hairstyle = GetByteValue(PLAYER_BYTES, 2);
     uint8 haircolor = GetByteValue(PLAYER_BYTES, 3);
     uint8 facialhair = GetByteValue(PLAYER_BYTES_2, 0);
+    uint8 skintone = GetByteValue(PLAYER_BYTES, 0);
 
-    if((hairstyle == newhairstyle) && (haircolor == newhaircolor) && (facialhair == newfacialhair))
+    if ((hairstyle == newhairstyle) && (haircolor == newhaircolor) && (facialhair == newfacialhair) &&
+        ((skintone == newskintone) || (newskintone == -1)))
         return 0;
 
     GtBarberShopCostBaseEntry const *bsc = sGtBarberShopCostBaseStore.LookupEntry(level - 1);
 
-    if(!bsc)                                                // shouldn't happen
+    if (!bsc)                                                // shouldn't happen
         return 0xFFFFFFFF;
 
     float cost = 0;
 
-    if(hairstyle != newhairstyle)
+    if (hairstyle != newhairstyle)
         cost += bsc->cost;                                  // full price
 
-    if((haircolor != newhaircolor) && (hairstyle == newhairstyle))
+    if ((haircolor != newhaircolor) && (hairstyle == newhairstyle))
         cost += bsc->cost * 0.5f;                           // +1/2 of price
 
-    if(facialhair != newfacialhair)
+    if (facialhair != newfacialhair)
         cost += bsc->cost * 0.75f;                          // +3/4 of price
 
+    if (skintone != newskintone && newskintone != -1)       // +1/2 of price
+        cost += bsc->cost * 0.5f;
+
     return uint32(cost);
 }
 
 void Player::InitGlyphsForLevel()
 {
-    for(uint32 i = 0; i < sGlyphSlotStore.GetNumRows(); ++i)
-        if(GlyphSlotEntry const * gs = sGlyphSlotStore.LookupEntry(i))
-            if(gs->Order)
+    for (uint32 i = 0; i < sGlyphSlotStore.GetNumRows(); ++i)
+    {
+        if (GlyphSlotEntry const * gs = sGlyphSlotStore.LookupEntry(i))
+        {
+            if (gs->Order)
                 SetGlyphSlot(gs->Order - 1, gs->Id);
+        }
+    }
 
     uint32 level = getLevel();
     uint32 value = 0;
 
     // 0x3F = 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 for 80 level
-    if(level >= 15)
+    if (level >= 15)
         value |= (0x01 | 0x02);
-    if(level >= 30)
+    if (level >= 30)
         value |= 0x08;
-    if(level >= 50)
+    if (level >= 50)
         value |= 0x04;
-    if(level >= 70)
+    if (level >= 70)
         value |= 0x10;
-    if(level >= 80)
+    if (level >= 80)
         value |= 0x20;
 
     SetUInt32Value(PLAYER_GLYPHS_ENABLED, value);
@@ -21564,9 +22328,9 @@ void Player::ApplyGlyph(uint8 slot, bool apply)
 {
     if (uint32 glyph = GetGlyph(slot))
     {
-        if(GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph))
+        if (GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph))
         {
-            if(apply)
+            if (apply)
             {
                 CastSpell(this, gp->SpellId, true);
                 SetUInt32Value(PLAYER_FIELD_GLYPHS_1 + slot, glyph);
@@ -21591,10 +22355,10 @@ bool Player::isTotalImmune()
     AuraList const& immune = GetAurasByType(SPELL_AURA_SCHOOL_IMMUNITY);
 
     uint32 immuneMask = 0;
-    for(AuraList::const_iterator itr = immune.begin(); itr != immune.end(); ++itr)
+    for (AuraList::const_iterator itr = immune.begin(); itr != immune.end(); ++itr)
     {
         immuneMask |= (*itr)->GetModifier()->m_miscvalue;
-        if( immuneMask & SPELL_SCHOOL_MASK_ALL )            // total immunity
+        if (immuneMask & SPELL_SCHOOL_MASK_ALL)            // total immunity
             return true;
     }
     return false;
@@ -21615,16 +22379,16 @@ void Player::SetTitle(CharTitlesEntry const* title, bool lost)
     uint32 fieldIndexOffset = title->bit_index / 32;
     uint32 flag = 1 << (title->bit_index % 32);
 
-    if(lost)
+    if (lost)
     {
-        if(!HasFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag))
+        if (!HasFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag))
             return;
 
         RemoveFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag);
     }
     else
     {
-        if(HasFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag))
+        if (HasFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag))
             return;
 
         SetFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag);
@@ -21636,10 +22400,13 @@ void Player::SetTitle(CharTitlesEntry const* title, bool lost)
     GetSession()->SendPacket(&data);
 }
 
-void Player::ConvertRune(uint8 index, RuneType newType)
+void Player::ConvertRune(uint8 index, RuneType newType, uint32 spellid)
 {
     SetCurrentRune(index, newType);
 
+    if (spellid != 0)
+        SetConvertedBy(index, spellid);
+
     WorldPacket data(SMSG_CONVERT_RUNE, 2);
     data << uint8(index);
     data << uint8(newType);
@@ -21649,9 +22416,9 @@ void Player::ConvertRune(uint8 index, RuneType newType)
 bool Player::ActivateRunes(RuneType type, uint32 count)
 {
     bool modify = false;
-    for(uint32 j = 0; count > 0 && j < MAX_RUNES; ++j)
+    for (uint32 j = 0; count > 0 && j < MAX_RUNES; ++j)
     {
-        if (GetRuneCooldown(j) && GetCurrentRune(j) == type)
+        if (GetCurrentRune(j) == type && GetRuneCooldown(j) > 0)
         {
             SetRuneCooldown(j, 0);
             --count;
@@ -21666,7 +22433,7 @@ void Player::ResyncRunes()
 {
     WorldPacket data(SMSG_RESYNC_RUNES, 4 + MAX_RUNES * 2);
     data << uint32(MAX_RUNES);
-    for(uint32 i = 0; i < MAX_RUNES; ++i)
+    for (uint32 i = 0; i < MAX_RUNES; ++i)
     {
         data << uint8(GetCurrentRune(i));                   // rune type
         data << uint8(255 - ((GetRuneCooldown(i) / REGEN_TIME_FULL) * 51));     // passed cooldown time (0-255)
@@ -21692,39 +22459,41 @@ static RuneType runeSlotTypes[MAX_RUNES] = {
 
 void Player::InitRunes()
 {
-    if(getClass() != CLASS_DEATH_KNIGHT)
+    if (getClass() != CLASS_DEATH_KNIGHT)
         return;
 
     m_runes = new Runes;
 
     m_runes->runeState = 0;
+    m_runes->needConvert = 0;
 
-    for(uint32 i = 0; i < MAX_RUNES; ++i)
+    for (uint32 i = 0; i < MAX_RUNES; ++i)
     {
         SetBaseRune(i, runeSlotTypes[i]);                   // init base types
         SetCurrentRune(i, runeSlotTypes[i]);                // init current types
         SetRuneCooldown(i, 0);                              // reset cooldowns
+        SetConvertedBy(i, 0);                               // init spellid
         m_runes->SetRuneState(i);
     }
 
-    for(uint32 i = 0; i < NUM_RUNE_TYPES; ++i)
+    for (uint32 i = 0; i < NUM_RUNE_TYPES; ++i)
         SetFloatValue(PLAYER_RUNE_REGEN_1 + i, 0.1f);
 }
 
 
-bool Player::IsBaseRuneSlotsOnCooldown( RuneType runeType ) const
+bool Player::IsBaseRuneSlotsOnCooldown(RuneType runeType) const
 {
-    for(uint32 i = 0; i < MAX_RUNES; ++i)
+    for (uint32 i = 0; i < MAX_RUNES; ++i)
         if (GetBaseRune(i) == runeType && GetRuneCooldown(i) == 0)
             return false;
 
     return true;
 }
 
-void Player::AutoStoreLoot(uint32 loot_id, LootStore const& store, bool broadcast, uint8 bag, uint8 slot)
+void Player::AutoStoreLoot(WorldObject const* lootTarget, uint32 loot_id, LootStore const& store, bool broadcast, uint8 bag, uint8 slot)
 {
-    Loot loot;
-    loot.FillLoot (loot_id, store, this, true);
+    Loot loot(lootTarget);
+    loot.FillLoot(loot_id, store, this, true);
 
     AutoStoreLoot(loot, broadcast, bag, slot);
 }
@@ -21732,19 +22501,22 @@ void Player::AutoStoreLoot(uint32 loot_id, LootStore const& store, bool broadcas
 void Player::AutoStoreLoot(Loot& loot, bool broadcast, uint8 bag, uint8 slot)
 {
     uint32 max_slot = loot.GetMaxSlotInLootFor(this);
-    for(uint32 i = 0; i < max_slot; ++i)
+    for (uint32 i = 0; i < max_slot; ++i)
     {
         LootItem* lootItem = loot.LootItemInSlot(i,this);
 
+        if (!lootItem)
+            continue;
+
         ItemPosCountVec dest;
-        InventoryResult msg = CanStoreNewItem(bag,slot,dest,lootItem->itemid,lootItem->count);
-        if(msg != EQUIP_ERR_OK && slot != NULL_SLOT)
-            msg = CanStoreNewItem( bag, NULL_SLOT,dest,lootItem->itemid,lootItem->count);
-        if( msg != EQUIP_ERR_OK && bag != NULL_BAG)
-            msg = CanStoreNewItem( NULL_BAG, NULL_SLOT,dest,lootItem->itemid,lootItem->count);
-        if(msg != EQUIP_ERR_OK)
-        {
-            SendEquipError( msg, NULL, NULL, lootItem->itemid );
+        InventoryResult msg = CanStoreNewItem(bag,slot, dest, lootItem->itemid, lootItem->count);
+        if (msg != EQUIP_ERR_OK && slot != NULL_SLOT)
+            msg = CanStoreNewItem(bag, NULL_SLOT, dest,lootItem->itemid, lootItem->count);
+        if (msg != EQUIP_ERR_OK && bag != NULL_BAG)
+            msg = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest,lootItem->itemid, lootItem->count);
+        if (msg != EQUIP_ERR_OK)
+        {
+            SendEquipError(msg, NULL, NULL, lootItem->itemid);
             continue;
         }
 
@@ -21784,7 +22556,7 @@ Item* Player::ConvertItem(Item* item, uint32 newItemId)
         if (msg == EQUIP_ERR_OK)
         {
             DestroyItem(item->GetBagSlot(), item->GetSlot(), true);
-            return StoreItem( dest, pNewItem, true);
+            return StoreItem(dest, pNewItem, true);
         }
     }
     else if (IsBankPos(pos))
@@ -21831,6 +22603,7 @@ bool Player::CanStartFlyInArea(uint32 mapid, uint32 zone, uint32 area) const
 {
     if (isGameMaster())
         return true;
+
     // continent checked in SpellMgr::GetSpellAllowedInLocationError at cast and area update
     uint32 v_map = GetVirtualMapForMapAndZone(mapid, zone);
 
@@ -21862,7 +22635,7 @@ void Player::learnSpellHighRank(uint32 spellid)
     sSpellMgr.doForHighRanks(spellid, worker);
 }
 
-void Player::_LoadSkills(QueryResult *result)
+void Player::_LoadSkills(QueryResult* result)
 {
     //                                                           0      1      2
     // SetPQuery(PLAYER_LOGIN_QUERY_LOADSKILLS,          "SELECT skill, value, max FROM character_skills WHERE guid = '%u'", GUID_LOPART(m_guid));
@@ -21872,21 +22645,21 @@ void Player::_LoadSkills(QueryResult *result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
-            uint16 skill    = fields[0].GetUInt16();
-            uint16 value    = fields[1].GetUInt16();
-            uint16 max      = fields[2].GetUInt16();
+            uint16 skill  = fields[0].GetUInt16();
+            uint16 value  = fields[1].GetUInt16();
+            uint16 max    = fields[2].GetUInt16();
 
-            SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(skill);
-            if(!pSkill)
+            SkillLineEntry const* pSkill = sSkillLineStore.LookupEntry(skill);
+            if (!pSkill)
             {
-                sLog.outError("Character %u has skill %u that does not exist.", GetGUIDLow(), skill);
+                sLog.outError("Player::_LoadSkills: %s has skill (id: %u) that does not exist.", GetGuidStr().c_str(), skill);
                 continue;
             }
 
             // set fixed skill ranges
-            switch(GetSkillRangeType(pSkill,false))
+            switch (GetSkillRangeType(pSkill, false))
             {
                 case SKILL_RANGE_LANGUAGE:                      // 300..300
                     value = max = 300;
@@ -21898,16 +22671,16 @@ void Player::_LoadSkills(QueryResult *result)
                     break;
             }
 
-            if(value == 0)
+            if (value == 0)
             {
-                sLog.outError("Character %u has skill %u with value 0. Will be deleted.", GetGUIDLow(), skill);
-                CharacterDatabase.PExecute("DELETE FROM character_skills WHERE guid = '%u' AND skill = '%u' ", GetGUIDLow(), skill );
+                sLog.outError("Player::_LoadSkills: %s has skill (id: %u) with value 0. Will be deleted.", GetGuidStr().c_str(), skill);
+                CharacterDatabase.PExecute("DELETE FROM character_skills WHERE guid = %u AND skill = %u", GetGUIDLow(), skill);
                 continue;
             }
 
-            SetUInt32Value(PLAYER_SKILL_INDEX(count), MAKE_PAIR32(skill,0));
-            SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(count),MAKE_SKILL_VALUE(value, max));
-            SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(count),0);
+            SetUInt32Value(PLAYER_SKILL_INDEX(count), MAKE_PAIR32(skill, 0));
+            SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(count), MAKE_SKILL_VALUE(value, max));
+            SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(count), 0);
 
             mSkillStatus.insert(SkillStatusMap::value_type(skill, SkillStatusData(count, SKILL_UNCHANGED)));
 
@@ -21915,12 +22688,13 @@ void Player::_LoadSkills(QueryResult *result)
 
             ++count;
 
-            if(count >= PLAYER_MAX_SKILLS)                      // client limit
+            if (count >= PLAYER_MAX_SKILLS)                      // client limit
             {
-                sLog.outError("Character %u has more than %u skills.", GetGUIDLow(), PLAYER_MAX_SKILLS);
+                sLog.outError("Player::_LoadSkills: %s has more than %u skills.", GetGuidStr().c_str(), PLAYER_MAX_SKILLS);
                 break;
             }
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
         delete result;
     }
 
@@ -21932,30 +22706,31 @@ void Player::_LoadSkills(QueryResult *result)
     }
 
     // special settings
-    if(getClass()==CLASS_DEATH_KNIGHT)
+    if (getClass() == CLASS_DEATH_KNIGHT)
     {
-        uint32 base_level = std::min(getLevel(),sWorld.getConfig (CONFIG_UINT32_START_HEROIC_PLAYER_LEVEL));
-        if(base_level < 1)
+        uint32 base_level = std::min(getLevel(), sWorld.getConfig (CONFIG_UINT32_START_HEROIC_PLAYER_LEVEL));
+        if (base_level < 1)
             base_level = 1;
-        uint32 base_skill = (base_level-1)*5;               // 270 at starting level 55
-        if(base_skill < 1)
+
+        uint32 base_skill = (base_level - 1) * 5;           // 270 at starting level 55
+        if (base_skill < 1)
             base_skill = 1;                                 // skill mast be known and then > 0 in any case
 
-        if(GetPureSkillValue (SKILL_FIRST_AID) < base_skill)
+        if (GetPureSkillValue(SKILL_FIRST_AID) < base_skill)
             SetSkill(SKILL_FIRST_AID, base_skill, base_skill);
-        if(GetPureSkillValue (SKILL_AXES) < base_skill)
+        if (GetPureSkillValue(SKILL_AXES) < base_skill)
             SetSkill(SKILL_AXES, base_skill, base_skill);
-        if(GetPureSkillValue (SKILL_DEFENSE) < base_skill)
+        if (GetPureSkillValue(SKILL_DEFENSE) < base_skill)
             SetSkill(SKILL_DEFENSE, base_skill, base_skill);
-        if(GetPureSkillValue (SKILL_POLEARMS) < base_skill)
+        if (GetPureSkillValue(SKILL_POLEARMS) < base_skill)
             SetSkill(SKILL_POLEARMS, base_skill, base_skill);
-        if(GetPureSkillValue (SKILL_SWORDS) < base_skill)
+        if (GetPureSkillValue(SKILL_SWORDS) < base_skill)
             SetSkill(SKILL_SWORDS, base_skill, base_skill);
-        if(GetPureSkillValue (SKILL_2H_AXES) < base_skill)
+        if (GetPureSkillValue(SKILL_2H_AXES) < base_skill)
             SetSkill(SKILL_2H_AXES, base_skill, base_skill);
-        if(GetPureSkillValue (SKILL_2H_SWORDS) < base_skill)
+        if (GetPureSkillValue(SKILL_2H_SWORDS) < base_skill)
             SetSkill(SKILL_2H_SWORDS, base_skill, base_skill);
-        if(GetPureSkillValue (SKILL_UNARMED) < base_skill)
+        if (GetPureSkillValue(SKILL_UNARMED) < base_skill)
             SetSkill(SKILL_UNARMED, base_skill, base_skill);
     }
 }
@@ -21963,17 +22738,17 @@ void Player::_LoadSkills(QueryResult *result)
 uint32 Player::GetPhaseMaskForSpawn() const
 {
     uint32 phase = PHASEMASK_NORMAL;
-    if(!isGameMaster())
+    if (!isGameMaster())
         phase = GetPhaseMask();
     else
     {
         AuraList const& phases = GetAurasByType(SPELL_AURA_PHASE);
-        if(!phases.empty())
+        if (!phases.empty())
             phase = phases.front()->GetMiscValue();
     }
 
     // some aura phases include 1 normal map in addition to phase itself
-    if(uint32 n_phase = phase & ~PHASEMASK_NORMAL)
+    if (uint32 n_phase = phase & ~PHASEMASK_NORMAL)
         return n_phase;
 
     return PHASEMASK_NORMAL;
@@ -21984,41 +22759,42 @@ InventoryResult Player::CanEquipUniqueItem(Item* pItem, uint8 eslot, uint32 limi
     ItemPrototype const* pProto = pItem->GetProto();
 
     // proto based limitations
-    if(InventoryResult res = CanEquipUniqueItem(pProto,eslot,limit_count))
+    if (InventoryResult res = CanEquipUniqueItem(pProto, eslot, limit_count))
         return res;
 
     // check unique-equipped on gems
-    for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
+    for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
     {
         uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(enchant_slot));
-        if(!enchant_id)
+        if (!enchant_id)
             continue;
+
         SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
-        if(!enchantEntry)
+        if (!enchantEntry)
             continue;
 
         ItemPrototype const* pGem = ObjectMgr::GetItemPrototype(enchantEntry->GemID);
-        if(!pGem)
+        if (!pGem)
             continue;
 
         // include for check equip another gems with same limit category for not equipped item (and then not counted)
         uint32 gem_limit_count = !pItem->IsEquipped() && pGem->ItemLimitCategory
             ? pItem->GetGemCountWithLimitCategory(pGem->ItemLimitCategory) : 1;
 
-        if(InventoryResult res = CanEquipUniqueItem(pGem, eslot,gem_limit_count))
+        if (InventoryResult res = CanEquipUniqueItem(pGem, eslot, gem_limit_count))
             return res;
     }
 
     return EQUIP_ERR_OK;
 }
 
-InventoryResult Player::CanEquipUniqueItem( ItemPrototype const* itemProto, uint8 except_slot, uint32 limit_count) const
+InventoryResult Player::CanEquipUniqueItem(ItemPrototype const* itemProto, uint8 except_slot, uint32 limit_count) const
 {
     // check unique-equipped on item
     if (itemProto->Flags & ITEM_FLAG_UNIQUE_EQUIPPED)
     {
         // there is an equip limit on this item
-        if(HasItemOrGemWithIdEquipped(itemProto->ItemId,1,except_slot))
+        if (HasItemOrGemWithIdEquipped(itemProto->ItemId, 1, except_slot))
             return EQUIP_ERR_ITEM_UNIQUE_EQUIPABLE;
     }
 
@@ -22026,18 +22802,43 @@ InventoryResult Player::CanEquipUniqueItem( ItemPrototype const* itemProto, uint
     if (itemProto->ItemLimitCategory)
     {
         ItemLimitCategoryEntry const* limitEntry = sItemLimitCategoryStore.LookupEntry(itemProto->ItemLimitCategory);
-        if(!limitEntry)
+        if (!limitEntry)
             return EQUIP_ERR_ITEM_CANT_BE_EQUIPPED;
 
         // NOTE: limitEntry->mode not checked because if item have have-limit then it applied and to equip case
 
-        if(limit_count > limitEntry->maxCount)
+        if (limit_count > limitEntry->maxCount)
             return EQUIP_ERR_ITEM_MAX_LIMIT_CATEGORY_EQUIPPED_EXCEEDED_IS;
 
         // there is an equip limit on this item
-        if(HasItemOrGemWithLimitCategoryEquipped(itemProto->ItemLimitCategory,limitEntry->maxCount-limit_count+1,except_slot))
+        if (HasItemOrGemWithLimitCategoryEquipped(itemProto->ItemLimitCategory,limitEntry->maxCount-limit_count+1,except_slot))
             return EQUIP_ERR_ITEM_MAX_LIMIT_CATEGORY_EQUIPPED_EXCEEDED_IS;
     }
+    return EQUIP_ERR_OK;
+}
+
+InventoryResult Player::CanEquipMoreJewelcraftingGems(uint32 count, uint8 except_slot) const
+{
+    for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+    {
+        if (i == int(except_slot))
+            continue;
+
+        Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
+        if (!pItem)
+            continue;
+
+        ItemPrototype const* pProto = pItem->GetProto();
+        if (!pProto)
+            continue;
+
+        if (pProto->Socket[0].Color || pItem->GetEnchantmentId(PRISMATIC_ENCHANTMENT_SLOT))
+        {
+            count += pItem->GetJewelcraftingGemCount();
+            if (count > MAX_JEWELCRAFTING_GEMS)
+                return EQUIP_ERR_ITEM_MAX_COUNT_EQUIPPED_SOCKETED;
+        }
+    }
 
     return EQUIP_ERR_OK;
 }
@@ -22048,49 +22849,50 @@ void Player::HandleFall(MovementInfo const& movementInfo)
     float z_diff = m_lastFallZ - movementInfo.GetPos()->z;
     DEBUG_LOG("zDiff = %f", z_diff);
 
-    //Players with low fall distance, Feather Fall or physical immunity (charges used) are ignored
+    // Players with low fall distance, Feather Fall or physical immunity (charges used) are ignored
     // 14.57 can be calculated by resolving damageperc formula below to 0
     if (z_diff >= 14.57f && !isDead() && !isGameMaster() &&
         !HasAuraType(SPELL_AURA_HOVER) && !HasAuraType(SPELL_AURA_FEATHER_FALL) &&
-        !HasAuraType(SPELL_AURA_FLY) && !IsImmunedToDamage(SPELL_SCHOOL_MASK_NORMAL) )
+        !HasAuraType(SPELL_AURA_FLY) && !IsImmunedToDamage(SPELL_SCHOOL_MASK_NORMAL))
     {
-        //Safe fall, fall height reduction
+        // Safe fall, fall height reduction
         int32 safe_fall = GetTotalAuraModifier(SPELL_AURA_SAFE_FALL);
 
-        float damageperc = 0.018f*(z_diff-safe_fall)-0.2426f;
+        float damageperc = 0.018f * (z_diff - safe_fall) - 0.2426f;
 
-        if(damageperc >0 )
+        if (damageperc > 0)
         {
-            uint32 damage = (uint32)(damageperc * GetMaxHealth()*sWorld.getConfig(CONFIG_FLOAT_RATE_DAMAGE_FALL));
+            uint32 damage = (uint32)(damageperc * GetMaxHealth() * sWorld.getConfig(CONFIG_FLOAT_RATE_DAMAGE_FALL));
 
             float height = movementInfo.GetPos()->z;
             UpdateAllowedPositionZ(movementInfo.GetPos()->x, movementInfo.GetPos()->y, height);
 
             if (damage > 0)
             {
-                //Prevent fall damage from being more than the player maximum health
+                // Prevent fall damage from being more than the player maximum health
                 if (damage > GetMaxHealth())
                     damage = GetMaxHealth();
 
                 // Gust of Wind
                 if (GetDummyAura(43621))
-                    damage = GetMaxHealth()/2;
+                    damage = GetMaxHealth() / 2;
 
                 uint32 original_health = GetHealth();
                 uint32 final_damage = EnvironmentalDamage(DAMAGE_FALL, damage);
 
                 // recheck alive, might have died of EnvironmentalDamage, avoid cases when player die in fact like Spirit of Redemption case
                 if (isAlive() && final_damage < original_health)
-                    GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_FALL_WITHOUT_DYING, uint32(z_diff*100));
+                    GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_FALL_WITHOUT_DYING, uint32(z_diff * 100));
             }
 
             //Z given by moveinfo, LastZ, FallTime, WaterZ, MapZ, Damage, Safefall reduction
             DEBUG_LOG("FALLDAMAGE z=%f sz=%f pZ=%f FallTime=%d mZ=%f damage=%d SF=%d" , movementInfo.GetPos()->z, height, GetPositionZ(), movementInfo.GetFallTime(), height, damage, safe_fall);
         }
     }
+    RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LANDING);     // Remove auras that should be removed at landing
 }
 
-void Player::UpdateAchievementCriteria( AchievementCriteriaTypes type, uint32 miscvalue1/*=0*/, uint32 miscvalue2/*=0*/, Unit *unit/*=NULL*/, uint32 time/*=0*/ )
+void Player::UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1/*=0*/, uint32 miscvalue2/*=0*/, Unit *unit/*=NULL*/, uint32 time/*=0*/)
 {
     GetAchievementMgr().UpdateAchievementCriteria(type, miscvalue1,miscvalue2,unit,time);
 }
@@ -22121,7 +22923,7 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank)
 {
     uint32 CurTalentPoints = GetFreeTalentPoints();
 
-    if(CurTalentPoints == 0)
+    if (CurTalentPoints == 0)
         return;
 
     if (talentRank >= MAX_TALENT_RANK)
@@ -22129,16 +22931,16 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank)
 
     TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId);
 
-    if(!talentInfo)
+    if (!talentInfo)
         return;
 
     TalentTabEntry const* talentTabInfo = sTalentTabStore.LookupEntry(talentInfo->TalentTab);
 
-    if(!talentTabInfo)
+    if (!talentTabInfo)
         return;
 
     // prevent learn talent for different class (cheating)
-    if( (getClassMask() & talentTabInfo->ClassMask) == 0 )
+    if ((getClassMask() & talentTabInfo->ClassMask) == 0)
         return;
 
     // find current max talent rank
@@ -22147,17 +22949,17 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank)
         curtalent_maxrank = talent->currentRank + 1;
 
     // we already have same or higher talent rank learned
-    if(curtalent_maxrank >= (talentRank + 1))
+    if (curtalent_maxrank >= (talentRank + 1))
         return;
 
     // check if we have enough talent points
-    if(CurTalentPoints < (talentRank - curtalent_maxrank + 1))
+    if (CurTalentPoints < (talentRank - curtalent_maxrank + 1))
         return;
 
     // Check if it requires another talent
     if (talentInfo->DependsOn > 0)
     {
-        if(TalentEntry const *depTalentInfo = sTalentStore.LookupEntry(talentInfo->DependsOn))
+        if (TalentEntry const *depTalentInfo = sTalentStore.LookupEntry(talentInfo->DependsOn))
         {
             bool hasEnoughRank = false;
             PlayerTalentMap::iterator dependsOnTalent = m_talents[m_activeSpec].find(depTalentInfo->TalentID);
@@ -22185,19 +22987,19 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank)
     }
 
     // not have required min points spent in talent tree
-    if(spentPoints < (talentInfo->Row * MAX_TALENT_RANK))
+    if (spentPoints < (talentInfo->Row * MAX_TALENT_RANK))
         return;
 
     // spell not set in talent.dbc
     uint32 spellid = talentInfo->RankID[talentRank];
-    if( spellid == 0 )
+    if (spellid == 0)
     {
         sLog.outError("Talent.dbc have for talent: %u Rank: %u spell id = 0", talentId, talentRank);
         return;
     }
 
     // already known
-    if(HasSpell(spellid))
+    if (HasSpell(spellid))
         return;
 
     // learn! (other talent ranks will unlearned at learning)
@@ -22216,7 +23018,7 @@ void Player::LearnPetTalent(ObjectGuid petGuid, uint32 talentId, uint32 talentRa
 
     uint32 CurTalentPoints = pet->GetFreeTalentPoints();
 
-    if(CurTalentPoints == 0)
+    if (CurTalentPoints == 0)
         return;
 
     if (talentRank >= MAX_PET_TALENT_RANK)
@@ -22224,36 +23026,36 @@ void Player::LearnPetTalent(ObjectGuid petGuid, uint32 talentId, uint32 talentRa
 
     TalentEntry const *talentInfo = sTalentStore.LookupEntry(talentId);
 
-    if(!talentInfo)
+    if (!talentInfo)
         return;
 
     TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry(talentInfo->TalentTab);
 
-    if(!talentTabInfo)
+    if (!talentTabInfo)
         return;
 
     CreatureInfo const *ci = pet->GetCreatureInfo();
 
-    if(!ci)
+    if (!ci)
         return;
 
-    CreatureFamilyEntry const *pet_family = sCreatureFamilyStore.LookupEntry(ci->family);
+    CreatureFamilyEntry const* pet_family = sCreatureFamilyStore.LookupEntry(ci->Family);
 
-    if(!pet_family)
+    if (!pet_family)
         return;
 
-    if(pet_family->petTalentType < 0)                       // not hunter pet
+    if (pet_family->petTalentType < 0)                       // not hunter pet
         return;
 
     // prevent learn talent for different family (cheating)
-    if(!((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask))
+    if (!((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask))
         return;
 
     // find current max talent rank
     int32 curtalent_maxrank = 0;
-    for(int32 k = MAX_TALENT_RANK-1; k > -1; --k)
+    for (int32 k = MAX_TALENT_RANK-1; k > -1; --k)
     {
-        if(talentInfo->RankID[k] && pet->HasSpell(talentInfo->RankID[k]))
+        if (talentInfo->RankID[k] && pet->HasSpell(talentInfo->RankID[k]))
         {
             curtalent_maxrank = k + 1;
             break;
@@ -22261,17 +23063,17 @@ void Player::LearnPetTalent(ObjectGuid petGuid, uint32 talentId, uint32 talentRa
     }
 
     // we already have same or higher talent rank learned
-    if(curtalent_maxrank >= int32(talentRank + 1))
+    if (curtalent_maxrank >= int32(talentRank + 1))
         return;
 
     // check if we have enough talent points
-    if(CurTalentPoints < (talentRank - curtalent_maxrank + 1))
+    if (CurTalentPoints < (talentRank - curtalent_maxrank + 1))
         return;
 
     // Check if it requires another talent
     if (talentInfo->DependsOn > 0)
     {
-        if(TalentEntry const *depTalentInfo = sTalentStore.LookupEntry(talentInfo->DependsOn))
+        if (TalentEntry const *depTalentInfo = sTalentStore.LookupEntry(talentInfo->DependsOn))
         {
             bool hasEnoughRank = false;
             for (int i = talentInfo->DependsOnRank; i < MAX_TALENT_RANK; ++i)
@@ -22316,19 +23118,19 @@ void Player::LearnPetTalent(ObjectGuid petGuid, uint32 talentId, uint32 talentRa
     }
 
     // not have required min points spent in talent tree
-    if(spentPoints < (talentInfo->Row * MAX_PET_TALENT_RANK))
+    if (spentPoints < (talentInfo->Row * MAX_PET_TALENT_RANK))
         return;
 
     // spell not set in talent.dbc
     uint32 spellid = talentInfo->RankID[talentRank];
-    if( spellid == 0 )
+    if (spellid == 0)
     {
         sLog.outError("Talent.dbc have for talent: %u Rank: %u spell id = 0", talentId, talentRank);
         return;
     }
 
     // already known
-    if(pet->HasSpell(spellid))
+    if (pet->HasSpell(spellid))
         return;
 
     // learn! (other talent ranks will unlearned at learning)
@@ -22338,61 +23140,115 @@ void Player::LearnPetTalent(ObjectGuid petGuid, uint32 talentId, uint32 talentRa
 
 void Player::UpdateKnownCurrencies(uint32 itemId, bool apply)
 {
-    if(CurrencyTypesEntry const* ctEntry = sCurrencyTypesStore.LookupEntry(itemId))
+    if (CurrencyTypesEntry const* ctEntry = sCurrencyTypesStore.LookupEntry(itemId))
     {
-        if(apply)
+        if (apply)
             SetFlag64(PLAYER_FIELD_KNOWN_CURRENCIES, (UI64LIT(1) << (ctEntry->BitIndex - 1)));
         else
             RemoveFlag64(PLAYER_FIELD_KNOWN_CURRENCIES, (UI64LIT(1) << (ctEntry->BitIndex - 1)));
     }
 }
 
-void Player::UpdateFallInformationIfNeed( MovementInfo const& minfo,uint16 opcode )
+void Player::UpdateFallInformationIfNeed(MovementInfo const& minfo, uint16 opcode)
 {
     if (m_lastFallTime >= minfo.GetFallTime() || m_lastFallZ <= minfo.GetPos()->z || opcode == MSG_MOVE_FALL_LAND)
         SetFallInformation(minfo.GetFallTime(), minfo.GetPos()->z);
 }
 
-void Player::UnsummonPetTemporaryIfAny()
+void Player::UnsummonPetTemporaryIfAny(bool full)
 {
+    Pet* minipet = GetMiniPet();
+
+    if (full && minipet)
+        minipet->Unsummon(PET_SAVE_AS_DELETED, this);
+
     Pet* pet = GetPet();
-    if(!pet)
+    if (!pet)
         return;
 
-    if(!m_temporaryUnsummonedPetNumber && pet->isControlled() && !pet->isTemporarySummoned() )
-        m_temporaryUnsummonedPetNumber = pet->GetCharmInfo()->GetPetNumber();
+    Map* petmap = pet->GetMap();
+    if (!petmap)
+        return;
 
-    pet->Unsummon(PET_SAVE_AS_CURRENT, this);
-}
+    GuidSet groupPetsCopy = GetPets();  // Original list may be modified in this function
+    if (groupPetsCopy.empty())
+        return;
+
+    for (GuidSet::const_iterator itr = groupPetsCopy.begin(); itr != groupPetsCopy.end(); ++itr)
+    {
+        if (Pet* pet = petmap->GetPet(*itr))
+        {
+            if (!sWorld.getConfig(CONFIG_BOOL_PET_SAVE_ALL))
+            {
+                if (!GetTemporaryUnsummonedPetCount() && pet->isControlled() && !pet->isTemporarySummoned() && !pet->GetPetCounter())
+                {
+                    SetTemporaryUnsummonedPetNumber(pet->GetCharmInfo()->GetPetNumber());
+                    pet->Unsummon(PET_SAVE_AS_CURRENT, this);
+                }
+                else
+                    if (full)
+                        pet->Unsummon(PET_SAVE_NOT_IN_SLOT, this);
+            }
+            else
+            {
+                SetTemporaryUnsummonedPetNumber(pet->GetCharmInfo()->GetPetNumber(), pet->GetPetCounter());
+                if (!pet->GetPetCounter() && pet->getPetType() == HUNTER_PET)
+                    pet->Unsummon(PET_SAVE_AS_CURRENT, this);
+                else
+                    pet->Unsummon(PET_SAVE_NOT_IN_SLOT, this);
+            }
+            DEBUG_LOG("Player::UnsummonPetTemporaryIfAny tempusummon pet %s ", (*itr).GetString().c_str());
+        }
+    }
+}
 
 void Player::ResummonPetTemporaryUnSummonedIfAny()
 {
-    if (!m_temporaryUnsummonedPetNumber)
+    if (!GetTemporaryUnsummonedPetCount())
         return;
 
     // not resummon in not appropriate state
     if (IsPetNeedBeTemporaryUnsummoned())
         return;
 
-    if (GetPetGuid())
-        return;
+//    if (GetPetGuid())
+//        return;
 
-    Pet* NewPet = new Pet;
-    if(!NewPet->LoadPetFromDB(this, 0, m_temporaryUnsummonedPetNumber, true))
-        delete NewPet;
+    // sort petlist - 0 must be _last_
+    for (uint8 count = GetTemporaryUnsummonedPetCount(); count != 0; --count)
+    {
+        uint32 petnum = GetTemporaryUnsummonedPetNumber(count - 1);
+        if (petnum == 0)
+            continue;
+
+        DEBUG_LOG("Player::ResummonPetTemporaryUnSummonedIfAny summon pet %u count %u",petnum, count-1);
+
+        Pet* NewPet = new Pet;
+        NewPet->SetPetCounter(count - 1);
 
-    m_temporaryUnsummonedPetNumber = 0;
+        if (!NewPet->LoadPetFromDB(this, 0, petnum))
+            delete NewPet;
+    }
+    ClearTemporaryUnsummonedPetStorage();
+}
+
+uint32 Player::GetTemporaryUnsummonedPetNumber(uint8 count)
+{
+    PetNumberList::const_iterator itr = m_temporaryUnsummonedPetNumber.find(count);
+    return itr != m_temporaryUnsummonedPetNumber.end() ? itr->second : 0;
 }
 
 bool Player::canSeeSpellClickOn(Creature const *c) const
 {
-    if(!c->HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_SPELLCLICK))
+    if (!c->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK))
         return false;
 
     SpellClickInfoMapBounds clickPair = sObjectMgr.GetSpellClickInfoMapBounds(c->GetEntry());
-    for(SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr)
-        if(itr->second.IsFitToRequirements(this))
+    for (SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr)
+    {
+        if (itr->second.IsFitToRequirements(this, c))
             return true;
+    }
 
     return false;
 }
@@ -22403,10 +23259,10 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket *data)
     *data << uint8(m_specsCount);                           // talent group count (0, 1 or 2)
     *data << uint8(m_activeSpec);                           // talent group index (0 or 1)
 
-    if(m_specsCount)
+    if (m_specsCount)
     {
         // loop through all specs (only 1 for now)
-        for(uint32 specIdx = 0; specIdx < m_specsCount; ++specIdx)
+        for (uint32 specIdx = 0; specIdx < m_specsCount; ++specIdx)
         {
             uint8 talentIdCount = 0;
             size_t pos = data->wpos();
@@ -22415,10 +23271,10 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket *data)
             // find class talent tabs (all players have 3 talent tabs)
             uint32 const* talentTabIds = GetTalentTabPages(getClass());
 
-            for(uint32 i = 0; i < 3; ++i)
+            for (uint32 i = 0; i < 3; ++i)
             {
                 uint32 talentTabId = talentTabIds[i];
-                for(PlayerTalentMap::iterator iter = m_talents[specIdx].begin(); iter != m_talents[specIdx].end(); ++iter)
+                for (PlayerTalentMap::iterator iter = m_talents[specIdx].begin(); iter != m_talents[specIdx].end(); ++iter)
                 {
                     PlayerTalent talent = (*iter).second;
 
@@ -22441,7 +23297,7 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket *data)
             *data << uint8(MAX_GLYPH_SLOT_INDEX);           // glyphs count
 
             // GlyphProperties.dbc
-            for(uint8 i = 0; i < MAX_GLYPH_SLOT_INDEX; ++i)
+            for (uint8 i = 0; i < MAX_GLYPH_SLOT_INDEX; ++i)
                 *data << uint16(m_glyphs[specIdx][i].GetId());
         }
     }
@@ -22457,8 +23313,8 @@ void Player::BuildPetTalentsInfoData(WorldPacket *data)
     size_t countPos = data->wpos();
     *data << uint8(talentIdCount);                          // [PH], talentIdCount
 
-    Pet *pet = GetPet();
-    if(!pet)
+    Pet* pet = GetPet();
+    if (!pet)
         return;
 
     unspentTalentPoints = pet->GetFreeTalentPoints();
@@ -22466,37 +23322,37 @@ void Player::BuildPetTalentsInfoData(WorldPacket *data)
     data->put<uint32>(pointsPos, unspentTalentPoints);      // put real points
 
     CreatureInfo const *ci = pet->GetCreatureInfo();
-    if(!ci)
+    if (!ci)
         return;
 
-    CreatureFamilyEntry const *pet_family = sCreatureFamilyStore.LookupEntry(ci->family);
-    if(!pet_family || pet_family->petTalentType < 0)
+    CreatureFamilyEntry const* pet_family = sCreatureFamilyStore.LookupEntry(ci->Family);
+    if (!pet_family || pet_family->petTalentType < 0)
         return;
 
-    for(uint32 talentTabId = 1; talentTabId < sTalentTabStore.GetNumRows(); ++talentTabId)
+    for (uint32 talentTabId = 1; talentTabId < sTalentTabStore.GetNumRows(); ++talentTabId)
     {
-        TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentTabId );
-        if(!talentTabInfo)
+        TalentTabEntry const* talentTabInfo = sTalentTabStore.LookupEntry(talentTabId);
+        if (!talentTabInfo)
             continue;
 
-        if(!((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask))
+        if (!((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask))
             continue;
 
-        for(uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId)
+        for (uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId)
         {
             TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId);
-            if(!talentInfo)
+            if (!talentInfo)
                 continue;
 
             // skip another tab talents
-            if(talentInfo->TalentTab != talentTabId)
+            if (talentInfo->TalentTab != talentTabId)
                 continue;
 
             // find max talent rank
             int32 curtalent_maxrank = -1;
-            for(int32 k = 4; k > -1; --k)
+            for (int32 k = 4; k > -1; --k)
             {
-                if(talentInfo->RankID[k] && pet->HasSpell(talentInfo->RankID[k]))
+                if (talentInfo->RankID[k] && pet->HasSpell(talentInfo->RankID[k]))
                 {
                     curtalent_maxrank = k;
                     break;
@@ -22504,7 +23360,7 @@ void Player::BuildPetTalentsInfoData(WorldPacket *data)
             }
 
             // not learned talent
-            if(curtalent_maxrank < 0)
+            if (curtalent_maxrank < 0)
                 continue;
 
             *data << uint32(talentInfo->TalentID);          // Talent.dbc
@@ -22523,7 +23379,7 @@ void Player::SendTalentsInfoData(bool pet)
 {
     WorldPacket data(SMSG_TALENT_UPDATE, 50);
     data << uint8(pet ? 1 : 0);
-    if(pet)
+    if (pet)
         BuildPetTalentsInfoData(&data);
     else
         BuildPlayerTalentsInfoData(&data);
@@ -22536,11 +23392,11 @@ void Player::BuildEnchantmentsInfoData(WorldPacket *data)
     size_t slotUsedMaskPos = data->wpos();
     *data << uint32(slotUsedMask);                          // slotUsedMask < 0x80000
 
-    for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
+    for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
     {
         Item *item = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
 
-        if(!item)
+        if (!item)
             continue;
 
         slotUsedMask |= (1 << i);
@@ -22551,11 +23407,11 @@ void Player::BuildEnchantmentsInfoData(WorldPacket *data)
         size_t enchantmentMaskPos = data->wpos();
         *data << uint16(enchantmentMask);                   // enchantmentMask < 0x1000
 
-        for(uint32 j = 0; j < MAX_ENCHANTMENT_SLOT; ++j)
+        for (uint32 j = 0; j < MAX_ENCHANTMENT_SLOT; ++j)
         {
             uint32 enchId = item->GetEnchantmentId(EnchantmentSlot(j));
 
-            if(!enchId)
+            if (!enchId)
                 continue;
 
             enchantmentMask |= (1 << j);
@@ -22579,15 +23435,18 @@ void Player::SendEquipmentSetList()
     WorldPacket data(SMSG_LOAD_EQUIPMENT_SET, 4);
     size_t count_pos = data.wpos();
     data << uint32(count);                                  // count placeholder
-    for(EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr)
+
+    for (EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr)
     {
-        if(itr->second.state==EQUIPMENT_SET_DELETED)
+        if (itr->second.state == EQUIPMENT_SET_DELETED)
             continue;
+
         data.appendPackGUID(itr->second.Guid);
         data << uint32(itr->first);
         data << itr->second.Name;
         data << itr->second.IconName;
-        for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
+
+        for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
         {
             // ignored slots stored in IgnoreMask, client wants "1" as raw GUID, so no HIGHGUID_ITEM
             if (itr->second.IgnoreMask & (1 << i))
@@ -22604,22 +23463,22 @@ void Player::SendEquipmentSetList()
 
 void Player::SetEquipmentSet(uint32 index, EquipmentSet eqset)
 {
-    if(eqset.Guid != 0)
+    if (eqset.Guid != 0)
     {
         bool found = false;
 
-        for(EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr)
+        for (EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr)
         {
-            if((itr->second.Guid == eqset.Guid) && (itr->first == index))
+            if ((itr->second.Guid == eqset.Guid) && (itr->first == index))
             {
                 found = true;
                 break;
             }
         }
 
-        if(!found)                                          // something wrong...
+        if (!found)                                          // something wrong...
         {
-            sLog.outError("Player %s tried to save equipment set "UI64FMTD" (index %u), but that equipment set not found!", GetName(), eqset.Guid, index);
+            sLog.outError("Player %s tried to save equipment set " UI64FMTD " (index %u), but that equipment set not found!", GetName(), eqset.Guid, index);
             return;
         }
     }
@@ -22630,7 +23489,7 @@ void Player::SetEquipmentSet(uint32 index, EquipmentSet eqset)
 
     eqslot = eqset;
 
-    if(eqset.Guid == 0)
+    if (eqset.Guid == 0)
     {
         eqslot.Guid = sObjectMgr.GenerateEquipmentSetGuid();
 
@@ -22649,11 +23508,11 @@ void Player::_SaveEquipmentSets()
     static SqlStatementID insSets ;
     static SqlStatementID delSets ;
 
-    for(EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end();)
+    for (EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end();)
     {
         uint32 index = itr->first;
         EquipmentSet& eqset = itr->second;
-        switch(eqset.state)
+        switch (eqset.state)
         {
             case EQUIPMENT_SET_UNCHANGED:
                 ++itr;
@@ -22711,31 +23570,32 @@ void Player::_SaveEquipmentSets()
     }
 }
 
-void Player::_SaveBGData()
+void Player::_SaveBGData(bool forceClean)
 {
+    if (forceClean)
+        m_bgData = BGData();
     // nothing save
-    if (!m_bgData.m_needSave)
+    else if (!m_bgData.m_needSave)
         return;
 
-    static SqlStatementID delBGData ;
-    static SqlStatementID insBGData ;
-
-    SqlStatement stmt =  CharacterDatabase.CreateStatement(delBGData, "DELETE FROM character_battleground_data WHERE guid = ?");
-
-    stmt.PExecute(GetGUIDLow());
+    static SqlStatementID delBGData;
+    CharacterDatabase.CreateStatement(delBGData, "DELETE FROM character_battleground_data WHERE guid = ?")
+        .PExecute(GetGUIDLow());
 
-    if (m_bgData.bgInstanceID)
+    if (m_bgData.bgInstanceID || m_bgData.forLFG)
     {
-        stmt = CharacterDatabase.CreateStatement(insBGData, "INSERT INTO character_battleground_data VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+        static SqlStatementID insBGData;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(insBGData, "INSERT INTO character_battleground_data VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+
         /* guid, bgInstanceID, bgTeam, x, y, z, o, map, taxi[0], taxi[1], mountSpell */
         stmt.addUInt32(GetGUIDLow());
         stmt.addUInt32(m_bgData.bgInstanceID);
         stmt.addUInt32(uint32(m_bgData.bgTeam));
-        stmt.addFloat(m_bgData.joinPos.coord_x);
-        stmt.addFloat(m_bgData.joinPos.coord_y);
-        stmt.addFloat(m_bgData.joinPos.coord_z);
+        stmt.addFloat(m_bgData.joinPos.x);
+        stmt.addFloat(m_bgData.joinPos.y);
+        stmt.addFloat(m_bgData.joinPos.z);
         stmt.addFloat(m_bgData.joinPos.orientation);
-        stmt.addUInt32(m_bgData.joinPos.mapid);
+        stmt.addUInt32(m_bgData.joinPos.GetMapId());
         stmt.addUInt32(m_bgData.taxiPath[0]);
         stmt.addUInt32(m_bgData.taxiPath[1]);
         stmt.addUInt32(m_bgData.mountSpell);
@@ -22748,11 +23608,11 @@ void Player::_SaveBGData()
 
 void Player::DeleteEquipmentSet(uint64 setGuid)
 {
-    for(EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr)
+    for (EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr)
     {
-        if(itr->second.Guid == setGuid)
+        if (itr->second.Guid == setGuid)
         {
-            if(itr->second.state == EQUIPMENT_SET_NEW)
+            if (itr->second.state == EQUIPMENT_SET_NEW)
                 m_EquipmentSets.erase(itr);
             else
                 itr->second.state = EQUIPMENT_SET_DELETED;
@@ -22763,20 +23623,21 @@ void Player::DeleteEquipmentSet(uint64 setGuid)
 
 void Player::ActivateSpec(uint8 specNum)
 {
-    if(GetActiveSpec() == specNum)
+    if (GetActiveSpec() == specNum || specNum >= GetSpecsCount())
         return;
 
-    if(specNum >= GetSpecsCount())
-        return;
 
-    UnsummonPetTemporaryIfAny();
+    if (Pet* pet = GetPet())
+        pet->Unsummon(PET_SAVE_REAGENTS, this);
+
+    SendActionButtons(2);
 
     // prevent deletion of action buttons by client at spell unlearn or by player while spec change in progress
     SendLockActionButtons();
 
     ApplyGlyphs(false);
 
-    // copy of new talent spec (we will use it as model for converting current tlanet state to new)
+    // copy of new talent spec (we will use it as model for converting current talent state to new)
     PlayerTalentMap tempSpec = m_talents[specNum];
 
     // copy old spec talents to new one, must be before spec switch to have previous spec num(as m_activeSpec)
@@ -22800,12 +23661,56 @@ void Player::ActivateSpec(uint8 specNum)
         // remove any talent rank if talent not listed in temp spec
         if (iterTempSpec == tempSpec.end() || iterTempSpec->second.state == PLAYERSPELL_REMOVED)
         {
-            TalentEntry const *talentInfo = talent.talentEntry;
+            TalentEntry const* talentInfo = talent.talentEntry;
 
-            for(int r = 0; r < MAX_TALENT_RANK; ++r)
+            for (int r = 0; r < MAX_TALENT_RANK; ++r)
+            {
                 if (talentInfo->RankID[r])
+                {
                     removeSpell(talentInfo->RankID[r],!IsPassiveSpell(talentInfo->RankID[r]),false);
 
+                    SpellEntry const* spellInfo = sSpellStore.LookupEntry(talentInfo->RankID[r]);
+                    for (int k = 0; k < MAX_EFFECT_INDEX; ++k)
+                    {
+                        if (spellInfo->EffectTriggerSpell[k])
+                            removeSpell(spellInfo->EffectTriggerSpell[k]);
+                    }
+
+                    if (Group* group = GetGroup())
+                    {
+                        // if spell is a buff, remove it from group members
+                        if (SpellEntry const* spellInfo = sSpellStore.LookupEntry(talentInfo->RankID[r]))
+                        {
+                            bool bRemoveAura = false;
+                            for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+                            {
+                                if ((spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA ||
+                                    spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AREA_AURA_RAID) &&
+                                    IsPositiveEffect(spellInfo, SpellEffectIndex(i)))
+                                {
+                                    bRemoveAura = true;
+                                    break;
+                                }
+                            }
+
+                            if (bRemoveAura)
+                            {
+                                for(GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+                                {
+                                    if (Player* pGroupGuy = itr->getSource())
+                                    {
+                                        if (pGroupGuy->GetObjectGuid() == GetObjectGuid())
+                                            continue;
+
+                                        if (SpellAuraHolderPtr holder = pGroupGuy->GetSpellAuraHolder(talentInfo->RankID[r], GetObjectGuid()))
+                                            pGroupGuy->RemoveSpellAuraHolder(holder);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
             specIter = m_talents[m_activeSpec].begin();
         }
         else
@@ -22859,7 +23764,7 @@ void Player::ActivateSpec(uint8 specNum)
 
     // recheck action buttons (not checked at loading/spec copy)
     ActionButtonList const& currentActionButtonList = m_actionButtons[m_activeSpec];
-    for(ActionButtonList::const_iterator itr = currentActionButtonList.begin(); itr != currentActionButtonList.end(); )
+    for (ActionButtonList::const_iterator itr = currentActionButtonList.begin(); itr != currentActionButtonList.end();)
     {
         if (itr->second.uState != ACTIONBUTTON_DELETED)
         {
@@ -22874,17 +23779,18 @@ void Player::ActivateSpec(uint8 specNum)
         ++itr;
     }
 
+    AutoUnequipOffhandIfNeed();
     ResummonPetTemporaryUnSummonedIfAny();
 
     ApplyGlyphs(true);
 
     SendInitialActionButtons();
 
-    Powers pw = getPowerType();
-    if(pw != POWER_MANA)
+    Powers powerType = GetPowerType();
+    if (powerType != POWER_MANA)
         SetPower(POWER_MANA, 0);
 
-    SetPower(pw, 0);
+    SetPower(powerType, 0);
 }
 
 void Player::UpdateSpecCount(uint8 count)
@@ -22903,11 +23809,11 @@ void Player::UpdateSpecCount(uint8 count)
         // copy action buttons from active spec (more easy in this case iterate first by button)
         ActionButtonList const& currentActionButtonList = m_actionButtons[m_activeSpec];
 
-        for(ActionButtonList::const_iterator itr = currentActionButtonList.begin(); itr != currentActionButtonList.end(); ++itr)
+        for (ActionButtonList::const_iterator itr = currentActionButtonList.begin(); itr != currentActionButtonList.end(); ++itr)
         {
             if (itr->second.uState != ACTIONBUTTON_DELETED)
             {
-                for(uint8 spec = curCount; spec < count; ++spec)
+                for (uint8 spec = curCount; spec < count; ++spec)
                     addActionButton(spec,itr->first,itr->second.GetAction(),itr->second.GetType());
             }
         }
@@ -22916,10 +23822,10 @@ void Player::UpdateSpecCount(uint8 count)
     else if (count < curCount)
     {
         // delete action buttons for removed spec
-        for(uint8 spec = count; spec < curCount; ++spec)
+        for (uint8 spec = count; spec < curCount; ++spec)
         {
             // delete action buttons for removed spec
-            for(uint8 button = 0; button < MAX_ACTION_BUTTONS; ++button)
+            for (uint8 button = 0; button < MAX_ACTION_BUTTONS; ++button)
                 removeActionButton(spec,button);
         }
     }
@@ -22929,17 +23835,20 @@ void Player::UpdateSpecCount(uint8 count)
     SendTalentsInfoData(false);
 }
 
-void Player::RemoveAtLoginFlag( AtLoginFlags f, bool in_db_also /*= false*/ )
+void Player::RemoveAtLoginFlag(AtLoginFlags f, bool in_db_also /*= false*/)
 {
     m_atLoginFlags &= ~f;
 
-    if(in_db_also)
+    if (in_db_also)
         CharacterDatabase.PExecute("UPDATE characters set at_login = at_login & ~ %u WHERE guid ='%u'", uint32(f), GetGUIDLow());
 }
 
-void Player::SendClearCooldown( uint32 spell_id, Unit* target )
+void Player::SendClearCooldown(uint32 spell_id, Unit* target)
 {
-    WorldPacket data(SMSG_CLEAR_COOLDOWN, 4+8);
+    if (!target)
+        return;
+
+    WorldPacket data(SMSG_CLEAR_COOLDOWN, 4 + 8);
     data << uint32(spell_id);
     data << target->GetObjectGuid();
     SendDirectMessage(&data);
@@ -22956,7 +23865,7 @@ void Player::BuildTeleportAckMsg(WorldPacket& data, float x, float y, float z, f
     data << mi;
 }
 
-bool Player::HasMovementFlag( MovementFlags f ) const
+bool Player::HasMovementFlag(MovementFlags f) const
 {
     return m_movementInfo.HasMovementFlag(f);
 }
@@ -22987,16 +23896,21 @@ void Player::SendDuelCountdown(uint32 counter)
     GetSession()->SendPacket(&data);
 }
 
+bool Player::IsImmuneToSpell(SpellEntry const* spellInfo, bool isFriendly) const
+{
+    return Unit::IsImmuneToSpell(spellInfo, isFriendly);
+}
+
 bool Player::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex index) const
 {
-    switch(spellInfo->Effect[index])
+    switch (spellInfo->Effect[index])
     {
         case SPELL_EFFECT_ATTACK_ME:
             return true;
         default:
             break;
     }
-    switch(spellInfo->EffectApplyAuraName[index])
+    switch (spellInfo->EffectApplyAuraName[index])
     {
         case SPELL_AURA_MOD_TAUNT:
             return true;
@@ -23006,22 +23920,26 @@ bool Player::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex
     return Unit::IsImmuneToSpellEffect(spellInfo, index);
 }
 
-void Player::SetHomebindToLocation(WorldLocation const& loc, uint32 area_id)
+void Player::SetHomebindToLocation(WorldLocation const& loc)
 {
-    m_homebindMapId = loc.mapid;
-    m_homebindAreaId = area_id;
-    m_homebindX = loc.coord_x;
-    m_homebindY = loc.coord_y;
-    m_homebindZ = loc.coord_z;
+    m_homebind = loc;
 
     // update sql homebind
-    CharacterDatabase.PExecute("UPDATE character_homebind SET map = '%u', zone = '%u', position_x = '%f', position_y = '%f', position_z = '%f' WHERE guid = '%u'",
-        m_homebindMapId, m_homebindAreaId, m_homebindX, m_homebindY, m_homebindZ, GetGUIDLow());
+    static SqlStatementID saveHomebind;
+    SqlStatement stmt = CharacterDatabase.CreateStatement(saveHomebind, "REPLACE INTO character_homebind (guid, map, zone, position_x, position_y, position_z) VALUES (?, ?, ?, ?, ?, ?)");
+
+    stmt.addUInt32(GetGUIDLow());
+    stmt.addUInt32(m_homebind.GetMapId());
+    stmt.addUInt32(m_homebind.GetAreaId());
+    stmt.addFloat(m_homebind.x);
+    stmt.addFloat(m_homebind.y);
+    stmt.addFloat(m_homebind.z);
+    stmt.Execute();
 }
 
 Object* Player::GetObjectByTypeMask(ObjectGuid guid, TypeMask typemask)
 {
-    switch(guid.GetHigh())
+    switch (guid.GetHigh())
     {
         case HIGHGUID_ITEM:
             if (typemask & TYPEMASK_ITEM)
@@ -23062,7 +23980,24 @@ Object* Player::GetObjectByTypeMask(ObjectGuid guid, TypeMask typemask)
     return NULL;
 }
 
-void Player::SetRestType( RestType n_r_type, uint32 areaTriggerId /*= 0*/)
+void Player::CompletedAchievement(AchievementEntry const* entry)
+{
+    GetAchievementMgr().CompletedAchievement(entry);
+}
+
+void Player::CompletedAchievement(uint32 uiAchievementID)
+{
+    AchievementEntry const* achievement = sAchievementStore.LookupEntry(uiAchievementID);
+    if (achievement)
+    {
+        if (!GetAchievementMgr().HasAchievement(uiAchievementID))
+            GetAchievementMgr().CompletedAchievement(achievement);
+    }
+    else
+        sLog.outErrorDb("Player::CompletedAchievement: achievement (ID: %u) not found in sAchievementStore.", uiAchievementID);
+}
+
+void Player::SetRestType(RestType n_r_type, uint32 areaTriggerId /*= 0*/)
 {
     rest_type = n_r_type;
 
@@ -23071,7 +24006,7 @@ void Player::SetRestType( RestType n_r_type, uint32 areaTriggerId /*= 0*/)
         RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);
 
         // Set player to FFA PVP when not in rested environment.
-        if(sWorld.IsFFAPvPRealm())
+        if (sWorld.IsFFAPvPRealm())
             SetFFAPvP(true);
     }
     else
@@ -23081,137 +24016,654 @@ void Player::SetRestType( RestType n_r_type, uint32 areaTriggerId /*= 0*/)
         inn_trigger_id = areaTriggerId;
         time_inn_enter = time(NULL);
 
-        if(sWorld.IsFFAPvPRealm())
+        if (sWorld.IsFFAPvPRealm())
             SetFFAPvP(false);
     }
 }
 
-uint32 Player::GetEquipGearScore(bool withBags, bool withBank)
+void Player::SetRandomBGWinner(bool winner)
 {
-    if (withBags && withBank && m_cachedGS > 0)
-        return m_cachedGS;
+    m_isRandomBGWinner = winner;
 
-    GearScoreVec gearScore (EQUIPMENT_SLOT_END);
-    uint32 twoHandScore = 0;
+    if (m_isRandomBGWinner)
+    {
+        static SqlStatementID insGuid;
+        CharacterDatabase.CreateStatement(insGuid, "INSERT INTO character_battleground_random (guid) VALUES (?)")
+            .PExecute(GetGUIDLow());
+    }
+}
 
-    for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+void Player::_LoadRandomBGStatus(QueryResult* result)
+{
+    // QueryResult* result = CharacterDatabase.PQuery("SELECT guid FROM character_battleground_random WHERE guid = '%u'", GetGUIDLow());
+    if (result)
     {
-        if (Item* item = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
-            _fillGearScoreData(item, &gearScore, twoHandScore);
+        m_isRandomBGWinner = true;
+        delete result;
     }
+}
 
-    if (withBags)
+// Refer-A-Friend
+void Player::SendReferFriendError(ReferAFriendError err, Player * target)
+{
+    WorldPacket data(SMSG_REFER_A_FRIEND_ERROR, 24);
+    data << uint32(err);
+    if (target && (err == ERR_REFER_A_FRIEND_NOT_IN_GROUP || err == ERR_REFER_A_FRIEND_SUMMON_OFFLINE_S))
+        data << target->GetName();
+
+    GetSession()->SendPacket(&data);
+}
+
+ReferAFriendError Player::GetReferFriendError(Player * target, bool summon)
+{
+    if (!target || target->GetTypeId() != TYPEID_PLAYER)
+        return summon ? ERR_REFER_A_FRIEND_SUMMON_OFFLINE_S : ERR_REFER_A_FRIEND_NO_TARGET;
+
+    if (!IsReferAFriendLinked(target))
+        return ERR_REFER_A_FRIEND_NOT_REFERRED_BY;
+
+    if (Group * gr1 = GetGroup())
     {
-        // check inventory
-        for(int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
-        {
-            if (Item* item = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
-                _fillGearScoreData(item, &gearScore, twoHandScore);
-        }
+        Group * gr2 = target->GetGroup();
 
-        // check bags
-        for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
-        {
-            if(Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
-            {
-                for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
-                {
-                    if (Item* item2 = pBag->GetItemByPos(j))
-                        _fillGearScoreData(item2, &gearScore, twoHandScore);
-                }
-            }
-        }
+        if (!gr2 || gr1->GetId() != gr2->GetId())
+            return ERR_REFER_A_FRIEND_NOT_IN_GROUP;
     }
 
-    if (withBank)
+    if (summon)
     {
-        for (uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
-        {
-            if (Item* item = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
-                _fillGearScoreData(item, &gearScore, twoHandScore);
-        }
+        if (HasSpellCooldown(45927))
+            return ERR_REFER_A_FRIEND_SUMMON_COOLDOWN;
+        if (target->getLevel() > sWorld.getConfig(CONFIG_UINT32_RAF_MAXGRANTLEVEL))
+            return ERR_REFER_A_FRIEND_SUMMON_LEVEL_MAX_I;
 
-        for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+        if (MapEntry const* mEntry = sMapStore.LookupEntry(GetMapId()))
+            if (mEntry->Expansion() > target->GetSession()->Expansion())
+                return ERR_REFER_A_FRIEND_INSUF_EXPAN_LVL;
+    }
+    else
+    {
+        if (GetTeam() != target->GetTeam() && !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GROUP))
+            return ERR_REFER_A_FRIEND_DIFFERENT_FACTION;
+        if (getLevel() <= target->getLevel())
+            return ERR_REFER_A_FRIEND_TARGET_TOO_HIGH;
+        if (!GetGrantableLevels())
+            return ERR_REFER_A_FRIEND_INSUFFICIENT_GRANTABLE_LEVELS;
+        if (GetDistance(target) > DEFAULT_VISIBILITY_DISTANCE || !target->IsVisibleGloballyFor(this))
+            return ERR_REFER_A_FRIEND_TOO_FAR;
+        if (target->getLevel() >= sWorld.getConfig(CONFIG_UINT32_RAF_MAXGRANTLEVEL))
+            return ERR_REFER_A_FRIEND_GRANT_LEVEL_MAX_I;
+    }
+
+    return ERR_REFER_A_FRIEND_NONE;
+}
+
+void Player::ChangeGrantableLevels(uint8 increase)
+{
+    if (increase)
+    {
+        if (m_GrantableLevelsCount <= int32(sWorld.getConfig(CONFIG_UINT32_RAF_MAXGRANTLEVEL) * sWorld.getConfig(CONFIG_FLOAT_RATE_RAF_LEVELPERLEVEL)))
+            m_GrantableLevelsCount += increase;
+    }
+    else
+    {
+        m_GrantableLevelsCount -= 1;
+
+        if (m_GrantableLevelsCount < 0)
+            m_GrantableLevelsCount = 0;
+    }
+
+    // set/unset flag - granted levels
+    if (m_GrantableLevelsCount > 0)
+    {
+        if (!HasByteFlag(PLAYER_FIELD_BYTES, 1, 0x01))
+            SetByteFlag(PLAYER_FIELD_BYTES, 1, 0x01);
+    }
+    else
+    {
+        if (HasByteFlag(PLAYER_FIELD_BYTES, 1, 0x01))
+            RemoveByteFlag(PLAYER_FIELD_BYTES, 1, 0x01);
+    }
+
+}
+
+bool Player::CheckRAFConditions()
+{
+    if (Group * grp = GetGroup())
+    {
+        for (GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
         {
-            if (Item* item = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
-            {
-                if (item->IsBag())
-                {
-                    Bag* bag = (Bag*)item;
-                    for (uint8 j = 0; j < bag->GetBagSize(); ++j)
-                    {
-                        if (Item* item2 = bag->GetItemByPos(j))
-                            _fillGearScoreData(item2, &gearScore, twoHandScore);
-                    }
-                }
-            }
+            Player* member = itr->getSource();
+
+            if (!member || !member->isAlive())
+                continue;
+
+            if (GetObjectGuid() == member->GetObjectGuid())
+                continue;
+
+            if (member->GetAccountLinkedState() == STATE_NOT_LINKED)
+                continue;
+
+            if (sAccountMgr.GetPlayerAccountIdByGUID(GetObjectGuid()) == sAccountMgr.GetPlayerAccountIdByGUID(member->GetObjectGuid()))
+                continue;
+
+            if (!IsReferAFriendLinked(member))
+                continue;
+
+            if (GetDistance(member) < 100 && (getLevel() <= member->getLevel() + 4))
+                return true;
         }
     }
 
-    uint8 count = EQUIPMENT_SLOT_END - 2;   // ignore body and tabard slots
-    uint32 sum = 0;
+    return false;
+}
 
-    // check if 2h hand is higher level than main hand + off hand
-    if (gearScore[EQUIPMENT_SLOT_MAINHAND] + gearScore[EQUIPMENT_SLOT_OFFHAND] < twoHandScore * 2)
+AccountLinkedState Player::GetAccountLinkedState()
+{
+    RafLinkedList const* referredAccounts = sAccountMgr.GetRAFAccounts(GetSession()->GetAccountId(), true);
+    RafLinkedList const* referalAccounts  = sAccountMgr.GetRAFAccounts(GetSession()->GetAccountId(), false);
+
+    if (!referredAccounts || !referalAccounts)
+        return STATE_NOT_LINKED;
+
+    if (!referredAccounts->empty() && !referalAccounts->empty())
+        return STATE_DUAL;
+
+    if (!referredAccounts->empty())
+        return STATE_REFER;
+
+    if (!referalAccounts->empty())
+        return STATE_REFERRAL;
+
+    return STATE_NOT_LINKED;
+}
+
+void Player::LoadAccountLinkedState()
+{
+    RafLinkedList const* referredAccounts = sAccountMgr.GetRAFAccounts(GetSession()->GetAccountId(), true);
+    if (referredAccounts)
     {
-        gearScore[EQUIPMENT_SLOT_OFFHAND] = 0;  // off hand is ignored in calculations if 2h weapon has higher score
-        --count;
-        gearScore[EQUIPMENT_SLOT_MAINHAND] = twoHandScore;
+        if (referredAccounts->size() > sWorld.getConfig(CONFIG_UINT32_RAF_MAXREFERERS))
+            sLog.outError("Player:RAF:Warning: loaded " SIZEFMTD " referred accounts instead of %u for player %s",referredAccounts->size(),sWorld.getConfig(CONFIG_UINT32_RAF_MAXREFERERS),GetObjectGuid().GetString().c_str());
+        else
+            DEBUG_LOG("Player:RAF: loaded " SIZEFMTD " referred accounts for player %s",referredAccounts->size(),GetObjectGuid().GetString().c_str());
     }
 
-    for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+    RafLinkedList const* referalAccounts = sAccountMgr.GetRAFAccounts(GetSession()->GetAccountId(), false);
+    if (referalAccounts)
     {
-       sum += gearScore[i];
+        if (referalAccounts->size() > sWorld.getConfig(CONFIG_UINT32_RAF_MAXREFERALS))
+            sLog.outError("Player:RAF:Warning: loaded " SIZEFMTD " referal accounts instead of %u for player %s",referalAccounts->size(),sWorld.getConfig(CONFIG_UINT32_RAF_MAXREFERALS),GetObjectGuid().GetString().c_str());
+        else
+            DEBUG_LOG("Player:RAF: loaded " SIZEFMTD " referal accounts for player %s",referalAccounts->size(),GetObjectGuid().GetString().c_str());
     }
+}
 
-    if (count)
+bool Player::IsReferAFriendLinked(Player* target)
+{
+    // check link this(refer) - target(referral)
+    RafLinkedList const* referalAccounts = sAccountMgr.GetRAFAccounts(GetSession()->GetAccountId(), false);
+    if (referalAccounts)
     {
-        uint32 res = uint32(sum / count);
-        DEBUG_LOG("Player: calculating gear score for %u. Result is %u", GetObjectGuid().GetCounter(), res);
-
-        if (withBags && withBank)
-            m_cachedGS = res;
+        for (RafLinkedList::const_iterator itr = referalAccounts->begin(); itr != referalAccounts->end(); ++itr)
+            if ((*itr) == target->GetSession()->GetAccountId())
+               return true;
+    }
 
-        return res;
+    // check link target(refer) - this(referral)
+    RafLinkedList const* referredAccounts = sAccountMgr.GetRAFAccounts(GetSession()->GetAccountId(), true);
+    if (referredAccounts)
+    {
+        for (RafLinkedList::const_iterator itr = referredAccounts->begin(); itr != referredAccounts->end(); ++itr)
+            if ((*itr) == target->GetSession()->GetAccountId())
+                return true;
     }
-    else
-        return 0;
+
+    return false;
 }
 
-void Player::_fillGearScoreData(Item* item, GearScoreVec* gearScore, uint32& twoHandScore)
+AreaLockStatus Player::GetAreaTriggerLockStatus(AreaTrigger const* at, Difficulty difficulty)
 {
-    if (!item)
-        return;
+    if (!at)
+        return AREA_LOCKSTATUS_UNKNOWN_ERROR;
 
-    if (CanUseItem(item->GetProto()) != EQUIP_ERR_OK)
-        return;
+    MapEntry const* mapEntry = sMapStore.LookupEntry(at->loc.GetMapId());
+    if (!mapEntry)
+        return AREA_LOCKSTATUS_UNKNOWN_ERROR;
 
-    uint8 type   = item->GetProto()->InventoryType;
-    uint32 level = item->GetProto()->ItemLevel;
+    MapDifficultyEntry const* mapDiff = GetMapDifficultyData(at->loc.GetMapId(), difficulty);
+    if (mapEntry->IsDungeon() && !mapDiff)
+        return AREA_LOCKSTATUS_MISSING_DIFFICULTY;
 
-    switch (type)
+    if (isGameMaster())
+        return AREA_LOCKSTATUS_OK;
+
+    if (GetSession()->Expansion() < mapEntry->Expansion())
+        return AREA_LOCKSTATUS_INSUFFICIENT_EXPANSION;
+
+    if (getLevel() < at->requiredLevel && !sWorld.getConfig(CONFIG_BOOL_INSTANCE_IGNORE_LEVEL))
+        return AREA_LOCKSTATUS_TOO_LOW_LEVEL;
+
+    if (mapEntry->IsDungeon() && mapEntry->IsRaid() && !sWorld.getConfig(CONFIG_BOOL_INSTANCE_IGNORE_RAID))
+        if (!GetGroup() || !GetGroup()->isRaidGroup())
+            return AREA_LOCKSTATUS_RAID_LOCKED;
+
+    // must have one or the other, report the first one that's missing
+    if (!HasItemFitToAreaTriggerReqirements(at))
+        return AREA_LOCKSTATUS_MISSING_ITEM;
+
+    bool isRegularTargetMap = GetDifficulty(mapEntry->IsRaid()) == REGULAR_DIFFICULTY;
+
+    if (!isRegularTargetMap && !HasHeroicKeyFitToAreaTriggerReqirements(at))
+        return AREA_LOCKSTATUS_MISSING_ITEM;
+
+    if (!HasQuestFitToAreaTriggerReqirements(at, isRegularTargetMap))
+        return AREA_LOCKSTATUS_QUEST_NOT_COMPLETED;
+
+    if (!HasAchievementFitToAreaTriggerReqirements(at, difficulty))
+        return AREA_LOCKSTATUS_QUEST_NOT_COMPLETED;
+
+    // If the map is not created, assume it is possible to enter it.
+    DungeonPersistentState* state = GetBoundInstanceSaveForSelfOrGroup(at->loc.GetMapId());
+    Map* map = sMapMgr.FindMap(at->loc.GetMapId(), state ? state->GetInstanceId() : 0);
+
+    if (map && at->combatMode == 1)
     {
-        case INVTYPE_2HWEAPON:
-            twoHandScore = std::max(twoHandScore, level);
-            break;
-        case INVTYPE_WEAPON:
-        case INVTYPE_WEAPONMAINHAND:
-            (*gearScore)[SLOT_MAIN_HAND] = std::max((*gearScore)[SLOT_MAIN_HAND], level);
-            break;
-        case INVTYPE_SHIELD:
-        case INVTYPE_WEAPONOFFHAND:
-            (*gearScore)[EQUIPMENT_SLOT_OFFHAND] = std::max((*gearScore)[EQUIPMENT_SLOT_OFFHAND], level);
-            break;
-        case INVTYPE_THROWN:
-        case INVTYPE_RANGEDRIGHT:
-        case INVTYPE_RANGED:
-        case INVTYPE_QUIVER:
-        case INVTYPE_RELIC:
-            (*gearScore)[EQUIPMENT_SLOT_RANGED] = std::max((*gearScore)[EQUIPMENT_SLOT_RANGED], level);
-            break;
-        case INVTYPE_HEAD:
-            (*gearScore)[EQUIPMENT_SLOT_HEAD] = std::max((*gearScore)[EQUIPMENT_SLOT_HEAD], level);
-            break;
+        if (map->GetInstanceData() && map->GetInstanceData()->IsEncounterInProgress())
+        {
+            DEBUG_LOG("MAP: Player '%s' can't enter instance '%s' while an encounter is in progress.", GetObjectGuid().GetString().c_str(), map->GetMapName());
+            return AREA_LOCKSTATUS_ZONE_IN_COMBAT;
+        }
+    }
+    if (map && map->IsDungeon())
+    {
+        // cannot enter if the instance is full (player cap), GMs don't count
+        if (((DungeonMap*)map)->isFull())
+            return AREA_LOCKSTATUS_INSTANCE_IS_FULL;
+
+        InstancePlayerBind* pBind = GetBoundInstance(at->loc.GetMapId(), GetDifficulty(mapEntry->IsRaid()));
+        if (pBind && pBind->perm && pBind->state != state)
+            return AREA_LOCKSTATUS_HAS_BIND;
+
+        if (pBind && pBind->perm && pBind->state != map->GetPersistentState())
+            return AREA_LOCKSTATUS_HAS_BIND;
+    }
+
+    return AREA_LOCKSTATUS_OK;
+};
+
+AreaLockStatus Player::GetAreaLockStatus(uint32 mapId, Difficulty difficulty)
+{
+    return GetAreaTriggerLockStatus(sObjectMgr.GetMapEntranceTrigger(mapId), difficulty);
+};
+
+bool Player::CheckTransferPossibility(uint32 mapId)
+{
+    if (mapId == GetMapId())
+        return true;
+
+    MapEntry const* targetMapEntry = sMapStore.LookupEntry(mapId);
+    if (!targetMapEntry)
+    {
+        sLog.outError("Player::CheckTransferPossibility: player %s try teleport to map %u, but map not exists!", GetGuidStr().c_str(), mapId);
+        return false;
+    }
+
+    // Battleground requirements checked in another place
+    if (InBattleGround() && targetMapEntry->IsBattleGroundOrArena())
+        return true;
+
+    AreaTrigger const* at = sObjectMgr.GetMapEntranceTrigger(mapId);
+    if (!at)
+    {
+        if (isGameMaster())
+        {
+            sLog.outDetail("Player::CheckTransferPossibility: gamemaster %s try teleport to map %u, but entrance trigger not exists (possible for some test maps).", GetGuidStr().c_str(), mapId);
+            return true;
+        }
+
+        if (targetMapEntry->IsContinent())
+        {
+            if (GetSession()->Expansion() < targetMapEntry->Expansion())
+            {
+                sLog.outError("Player::CheckTransferPossibility: player %s try teleport to map %u, but not has sufficient expansion (%u instead of %u)", GetGuidStr().c_str(), mapId, GetSession()->Expansion(), targetMapEntry->Expansion());
+                return false;
+            }
+            return true;
+        }
+        sLog.outError("Player::CheckTransferPossibility: player %s try teleport to map %u, but entrance trigger not exists!", GetGuidStr().c_str(), mapId);
+        return false;
+    }
+
+    return CheckTransferPossibility(at, targetMapEntry->IsContinent());
+}
+
+bool Player::CheckTransferPossibility(AreaTrigger const*& at, bool b_onlyMainReq)
+{
+    if (!at)
+        return false;
+
+    if (at->loc.GetMapId() == GetMapId())
+        return true;
+
+    MapEntry const* targetMapEntry = sMapStore.LookupEntry(at->loc.GetMapId());
+
+    if (!targetMapEntry)
+        return false;
+
+    if (!isGameMaster())
+    {
+        // ghost resurrected at enter attempt to dungeon with corpse (including fail enter cases)
+        if (!isAlive() && targetMapEntry->IsDungeon())
+        {
+            uint32 corpseMapId = 0;
+            if (Corpse* corpse = GetCorpse())
+                corpseMapId = corpse->GetMapId();
+
+            // check back way from corpse to entrance
+            uint32 instance_map = corpseMapId;
+            do
+            {
+                // most often fast case
+                if (instance_map == targetMapEntry->MapID)
+                    break;
+
+                InstanceTemplate const* instance = ObjectMgr::GetInstanceTemplate(instance_map);
+                instance_map = instance ? instance->parent : 0;
+            }
+            while (instance_map);
+
+            // corpse not in dungeon or some linked deep dungeons
+            if (!instance_map)
+            {
+                WorldPacket data(SMSG_AREA_TRIGGER_NO_CORPSE);
+                GetSession()->SendPacket(&data);
+                return false;
+            }
+
+            // need find areatrigger to inner dungeon for landing point
+            if (at->loc.GetMapId() != corpseMapId)
+            {
+                if (AreaTrigger const* corpseAt = sObjectMgr.GetMapEntranceTrigger(corpseMapId))
+                {
+                    targetMapEntry = sMapStore.LookupEntry(corpseAt->loc.GetMapId());
+                    at = corpseAt;
+                }
+            }
+
+            // now we can resurrect player, and then check teleport requirements
+            ResurrectPlayer(50);
+            SpawnCorpseBones();
+        }
+    }
+
+    AreaLockStatus status = GetAreaTriggerLockStatus(at, GetDifficulty(targetMapEntry->IsRaid()));
+
+    DEBUG_LOG("Player::CheckTransferPossibility %s check lock status of map %u (difficulty %u), result is %u", GetGuidStr().c_str(), at->loc.GetMapId(), GetDifficulty(targetMapEntry->IsRaid()), status);
+
+    if (b_onlyMainReq)
+    {
+        switch (status)
+        {
+            case AREA_LOCKSTATUS_MISSING_ITEM:
+            case AREA_LOCKSTATUS_QUEST_NOT_COMPLETED:
+            case AREA_LOCKSTATUS_INSTANCE_IS_FULL:
+            case AREA_LOCKSTATUS_ZONE_IN_COMBAT:
+            case AREA_LOCKSTATUS_TOO_LOW_LEVEL:
+                return true;
+            default:
+                break;
+        }
+    }
+
+    switch (status)
+    {
+        case AREA_LOCKSTATUS_OK:
+            return true;
+        case AREA_LOCKSTATUS_TOO_LOW_LEVEL:
+            GetSession()->SendAreaTriggerMessage(GetSession()->GetMangosString(LANG_LEVEL_MINREQUIRED), at->requiredLevel);
+            return false;
+        case AREA_LOCKSTATUS_ZONE_IN_COMBAT:
+            SendTransferAborted(at->loc.GetMapId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
+            return false;
+        case AREA_LOCKSTATUS_INSTANCE_IS_FULL:
+            SendTransferAborted(at->loc.GetMapId(), TRANSFER_ABORT_MAX_PLAYERS);
+            return false;
+        case AREA_LOCKSTATUS_QUEST_NOT_COMPLETED:
+            if (at->loc.GetMapId() == 269)
+            {
+                GetSession()->SendAreaTriggerMessage(GetSession()->GetMangosString(LANG_TELEREQ_QUEST_BLACK_MORASS));
+                return false;
+            }
+            // No break here!
+        case AREA_LOCKSTATUS_MISSING_ITEM:
+            {
+                MapDifficultyEntry const* mapDiff = GetMapDifficultyData(targetMapEntry->MapID, GetDifficulty(targetMapEntry->IsRaid()));
+                if (mapDiff && (mapDiff->mapDifficultyFlags & MAP_DIFFICULTY_FLAG_CONDITION))
+                {
+                    GetSession()->SendAreaTriggerMessage("%s", mapDiff->areaTriggerText[GetSession()->GetSessionDbcLocale()]);
+                }
+                // do not report anything for quest areatriggers
+                DEBUG_LOG("HandleAreaTriggerOpcode: LockAreaStatus %u, do action", uint8(GetAreaTriggerLockStatus(at, GetDifficulty(targetMapEntry->IsRaid()))));
+                return false;
+            }
+        case AREA_LOCKSTATUS_MISSING_DIFFICULTY:
+            {
+                Difficulty difficulty = GetDifficulty(targetMapEntry->IsRaid());
+                SendTransferAborted(at->loc.GetMapId(), TRANSFER_ABORT_DIFFICULTY, difficulty > RAID_DIFFICULTY_10MAN_HEROIC ? RAID_DIFFICULTY_10MAN_HEROIC : difficulty);
+                return false;
+            }
+        case AREA_LOCKSTATUS_INSUFFICIENT_EXPANSION:
+            SendTransferAborted(at->loc.GetMapId(), TRANSFER_ABORT_INSUF_EXPAN_LVL, targetMapEntry->Expansion());
+            return false;
+        case AREA_LOCKSTATUS_NOT_ALLOWED:
+        case AREA_LOCKSTATUS_HAS_BIND:
+            SendTransferAborted(at->loc.GetMapId(), TRANSFER_ABORT_MAP_NOT_ALLOWED);
+            return false;
+        // TODO: messages for other cases
+        case AREA_LOCKSTATUS_RAID_LOCKED:
+            SendTransferAborted(at->loc.GetMapId(), TRANSFER_ABORT_NEED_GROUP);
+            return false;
+        // TODO: messages for other cases
+        case AREA_LOCKSTATUS_UNKNOWN_ERROR:
+        default:
+            SendTransferAborted(at->loc.GetMapId(), TRANSFER_ABORT_ERROR);
+            sLog.outError("Player::CheckTransferPossibility player %s has unhandled AreaLockStatus %u in map %u (difficulty %u), do nothing", GetGuidStr().c_str(), status, at->loc.GetMapId(), GetDifficulty(targetMapEntry->IsRaid()));
+            return false;
+    }
+
+    return false;
+};
+
+bool Player::NeedEjectFromThisMap()
+{
+    MapEntry const* mapEntry = sMapStore.LookupEntry(GetMapId());
+
+    if (!mapEntry)
+    {
+        sLog.outError("Player::NeedGoingToHomebind %s are in (map: %u) and there is no MapEntry to this map.", GetObjectGuid().GetString().c_str(), GetMapId());
+        return true;
+    }
+
+    Map* map = GetMap();
+
+    if (!map)
+    {
+        sLog.outError("Player::NeedGoingToHomebind %s are in (map: %u) and there is no Map to this player.", GetObjectGuid().GetString().c_str(), GetMapId());
+        return true;
+    }
+
+    if (isGameMaster())
+        return false;
+
+    if (GetSession()->Expansion() < mapEntry->Expansion())
+        return true;
+
+    if (map->IsDungeon())
+    {
+        // Dead player going to Graveyard in other case
+        if (!isAlive())
+            return false;
+
+        if (((DungeonMap*)map)->isFull())
+            return true;
+
+        InstancePlayerBind* pBind = GetBoundInstance(GetMapId(), GetDifficulty(mapEntry->IsRaid()));
+        if (pBind && pBind->perm && pBind->state != map->GetPersistentState())
+            return true;
+
+        if ((mapEntry->IsRaid() && !sWorld.getConfig(CONFIG_BOOL_INSTANCE_IGNORE_RAID)) && (!GetGroup() || !GetGroup()->isRaidGroup()))
+            return true;
+
+        AreaTrigger const* at = sObjectMgr.GetMapEntranceTrigger(GetMapId());
+        if (at)
+        {
+            if (!HasItemFitToAreaTriggerReqirements(at))
+                return true;
+
+            Difficulty difficulty = GetDifficulty(mapEntry->IsRaid());
+
+            if (difficulty != REGULAR_DIFFICULTY && !HasHeroicKeyFitToAreaTriggerReqirements(at))
+                return true;
+
+            if (!HasQuestFitToAreaTriggerReqirements(at, difficulty == REGULAR_DIFFICULTY))
+                return true;
+
+            if (!HasAchievementFitToAreaTriggerReqirements(at, difficulty))
+                return true;
+        }
+
+    }
+
+    return false;
+}
+
+uint32 Player::GetEquipGearScore(bool withBags, bool withBank)
+{
+    if (withBags && withBank && m_cachedGS > 0)
+        return m_cachedGS;
+
+    GearScoreVec gearScore(EQUIPMENT_SLOT_END);
+    uint32 twoHandScore = 0;
+
+    for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+    {
+        if (Item* item = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            _fillGearScoreData(item, &gearScore, twoHandScore);
+    }
+
+    if (withBags)
+    {
+        // check inventory
+        for (int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+        {
+            if (Item* item = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                _fillGearScoreData(item, &gearScore, twoHandScore);
+        }
+
+        // check bags
+        for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        {
+            if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            {
+                for (uint32 j = 0; j < pBag->GetBagSize(); ++j)
+                {
+                    if (Item* item2 = pBag->GetItemByPos(j))
+                        _fillGearScoreData(item2, &gearScore, twoHandScore);
+                }
+            }
+        }
+    }
+
+    if (withBank)
+    {
+        for (uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; ++i)
+        {
+            if (Item* item = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+                _fillGearScoreData(item, &gearScore, twoHandScore);
+        }
+
+        for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; ++i)
+        {
+            if (Item* item = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            {
+                if (item->IsBag())
+                {
+                    Bag* bag = (Bag*)item;
+                    for (uint8 j = 0; j < bag->GetBagSize(); ++j)
+                    {
+                        if (Item* item2 = bag->GetItemByPos(j))
+                            _fillGearScoreData(item2, &gearScore, twoHandScore);
+                    }
+                }
+            }
+        }
+    }
+
+    uint8 count = EQUIPMENT_SLOT_END - 2;   // ignore body and tabard slots
+    uint32 sum = 0;
+
+    // check if 2h hand is higher level than main hand + off hand
+    if (gearScore[EQUIPMENT_SLOT_MAINHAND] + gearScore[EQUIPMENT_SLOT_OFFHAND] < twoHandScore * 2)
+    {
+        gearScore[EQUIPMENT_SLOT_OFFHAND] = 0;  // off hand is ignored in calculations if 2h weapon has higher score
+        --count;
+        gearScore[EQUIPMENT_SLOT_MAINHAND] = twoHandScore;
+    }
+
+    for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
+    {
+       sum += gearScore[i];
+    }
+
+    if (count)
+    {
+        uint32 res = uint32(sum / count);
+        DEBUG_LOG("Player: calculating gear score for %u. Result is %u", GetObjectGuid().GetCounter(), res);
+
+        if (withBags && withBank)
+            m_cachedGS = res;
+
+        return res;
+    }
+    else
+        return 0;
+}
+
+void Player::_fillGearScoreData(Item* item, GearScoreVec* gearScore, uint32& twoHandScore)
+{
+    if (!item)
+        return;
+
+    if (CanUseItem(item->GetProto()) != EQUIP_ERR_OK)
+        return;
+
+    uint8 type   = item->GetProto()->InventoryType;
+    uint32 level = item->GetProto()->ItemLevel;
+
+    switch (type)
+    {
+        case INVTYPE_2HWEAPON:
+            twoHandScore = std::max(twoHandScore, level);
+            break;
+        case INVTYPE_WEAPON:
+        case INVTYPE_WEAPONMAINHAND:
+            (*gearScore)[SLOT_MAIN_HAND] = std::max((*gearScore)[SLOT_MAIN_HAND], level);
+            break;
+        case INVTYPE_SHIELD:
+        case INVTYPE_WEAPONOFFHAND:
+            (*gearScore)[EQUIPMENT_SLOT_OFFHAND] = std::max((*gearScore)[EQUIPMENT_SLOT_OFFHAND], level);
+            break;
+        case INVTYPE_THROWN:
+        case INVTYPE_RANGEDRIGHT:
+        case INVTYPE_RANGED:
+        case INVTYPE_QUIVER:
+        case INVTYPE_RELIC:
+            (*gearScore)[EQUIPMENT_SLOT_RANGED] = std::max((*gearScore)[EQUIPMENT_SLOT_RANGED], level);
+            break;
+        case INVTYPE_HEAD:
+            (*gearScore)[EQUIPMENT_SLOT_HEAD] = std::max((*gearScore)[EQUIPMENT_SLOT_HEAD], level);
+            break;
         case INVTYPE_NECK:
             (*gearScore)[EQUIPMENT_SLOT_NECK] = std::max((*gearScore)[EQUIPMENT_SLOT_NECK], level);
             break;
@@ -23270,3 +24722,470 @@ void Player::_fillGearScoreData(Item* item, GearScoreVec* gearScore, uint32& two
             break;
     }
 }
+
+void Player::InitWowarmoryFeeds() {
+    // Clear feeds
+    m_wowarmory_feeds.clear();
+}
+
+void Player::CreateWowarmoryFeed(uint32 type, uint32 data, uint32 item_guid, uint32 item_quality) {
+    /*
+        1 - TYPE_ACHIEVEMENT_FEED
+        2 - TYPE_ITEM_FEED
+        3 - TYPE_BOSS_FEED
+    */
+    sLog.outDebug("[Wowarmory]: entering Player::CreateWowarmoryFeed(%d, %u, %u, %u)", type, data, item_guid, item_quality); // For debugging
+    if (GetGUIDLow() == 0)
+    {
+        sLog.outError("[Wowarmory]: player is not initialized, unable to create log entry!");
+        return;
+    }
+    if (type <= 0 || type > 3)
+    {
+        sLog.outError("[Wowarmory]: unknown feed type: %d, ignore.", type);
+        return;
+    }
+    if (data == 0)
+    {
+        sLog.outError("[Wowarmory]: empty data (GUID: %u), ignore.", GetGUIDLow());
+        return;
+    }
+    WowarmoryFeedEntry feed;
+    feed.guid = GetGUIDLow();
+    feed.type = type;
+    feed.data = data;
+    feed.difficulty = type == 3 ? GetMap()->GetDifficulty() : 0;
+    feed.item_guid  = item_guid;
+    feed.item_quality = item_quality;
+    feed.counter = 0;
+    feed.date = time(NULL);
+    sLog.outDebug("[Wowarmory]: create wowarmory feed (GUID: %u, type: %d, data: %u).", feed.guid, feed.type, feed.data);
+    m_wowarmory_feeds.push_back(feed);
+}
+
+
+uint8 Player::GetTalentsCount(uint8 tab)
+{
+    if (tab > 2)
+        return 0;
+
+    if (m_cachedTC[tab] > 0)
+        return m_cachedTC[tab];
+
+    uint8 talentCount = 0;
+
+    uint32 const* talentTabIds = GetTalentTabPages(getClass());
+
+    uint32 talentTabId = talentTabIds[tab];
+
+    for (PlayerTalentMap::iterator iter = m_talents[m_activeSpec].begin(); iter != m_talents[m_activeSpec].end(); ++iter)
+    {
+        PlayerTalent talent = (*iter).second;
+
+        if (talent.state == PLAYERSPELL_REMOVED)
+            continue;
+
+        // skip another tab talents
+        if (talent.talentEntry->TalentTab != talentTabId)
+            continue;
+
+        talentCount += talent.currentRank + 1;
+    }
+    m_cachedTC[tab] = talentCount;
+    return talentCount;
+}
+
+uint32 Player::GetModelForForm(SpellShapeshiftFormEntry const* ssEntry) const
+{
+    ShapeshiftForm form = ShapeshiftForm(ssEntry->ID);
+    Team team = TeamForRace(getRace());
+    uint32 modelid = 0;
+
+    // The following are the different shapeshifting models for cat/bear forms according
+    // to hair color for druids and skin tone for tauren introduced in patch 3.2
+    if (form == FORM_CAT || form == FORM_BEAR || form == FORM_DIREBEAR)
+    {
+        if (team == ALLIANCE)
+        {
+            uint8 hairColour = GetByteValue(PLAYER_BYTES, 3);
+            if (form == FORM_CAT)
+            {
+                if (hairColour >= 0 && hairColour <= 2) modelid = 29407;
+                else if (hairColour == 3 || hairColour == 5) modelid = 29405;
+                else if (hairColour == 4) modelid = 29408;
+                else if (hairColour == 6) modelid = 892;
+                else if (hairColour == 7) modelid = 29406;
+            }
+            else // form == FORM_BEAR || form == FORM_DIREBEAR
+            {
+                if (hairColour >= 0 && hairColour <= 2) modelid = 29413;
+                else if (hairColour == 3 || hairColour == 5) modelid = 29415;
+                else if (hairColour == 4) modelid = 29416;
+                else if (hairColour == 6) modelid = 29414;
+                else if (hairColour == 7) modelid = 29417;
+            }
+        }
+        else if (team == HORDE)
+        {
+            uint8 skinColour = GetByteValue(PLAYER_BYTES, 0);
+            if (getGender() == GENDER_MALE)
+            {
+                if (form == FORM_CAT)
+                {
+                    if (skinColour >= 0 && skinColour <= 5) modelid = 29412;
+                    else if (skinColour >= 6 && skinColour <= 8) modelid = 29411;
+                    else if (skinColour >= 9 && skinColour <= 11) modelid = 29410;
+                    else if ((skinColour >= 12 && skinColour <= 14) || skinColour == 18) modelid = 29409;
+                    else if (skinColour >= 15 && skinColour <= 17) modelid = 8571;
+                }
+                else // form == FORM_BEAR || form == FORM_DIREBEAR
+                {
+                    if (skinColour >= 0 && skinColour <= 2) modelid = 29418;
+                    else if ((skinColour >= 3 && skinColour <= 5) || (skinColour >= 12 && skinColour <= 14)) modelid = 29419;
+                    else if ((skinColour >= 9 && skinColour <= 11) || (skinColour >= 15 && skinColour <= 17)) modelid = 29420;
+                    else if (skinColour >= 6 && skinColour <= 8) modelid = 2289;
+                    else if (skinColour == 18) modelid = 29421;
+                }
+            }
+            else // getGender() == GENDER_FEMALE
+            {
+                if (form == FORM_CAT)
+                {
+                    if (skinColour >= 0 && skinColour <= 3) modelid = 29412;
+                    else if (skinColour == 4 || skinColour == 5) modelid = 29411;
+                    else if (skinColour == 6 || skinColour == 7) modelid = 29410;
+                    else if (skinColour == 8 || skinColour == 9) modelid = 8571;
+                    else if (skinColour == 10) modelid = 29409;
+                }
+                else // form == FORM_BEAR || form == FORM_DIREBEAR
+                {
+                    if (skinColour == 0 || skinColour == 1) modelid = 29418;
+                    else if (skinColour == 2 || skinColour == 3) modelid = 29419;
+                    else if (skinColour == 4 || skinColour == 5) modelid = 2289;
+                    else if (skinColour >= 6 && skinColour <= 9) modelid = 29420;
+                    else if (skinColour == 10) modelid = 29421;
+                }
+            }
+        }
+    }
+    else if (team == HORDE)
+    {
+        if (ssEntry->modelID_H)
+            modelid = ssEntry->modelID_H;           // 3.2.3 only the moonkin form has this information
+        else                                        // get model for race
+            modelid = sObjectMgr.GetModelForRace(ssEntry->modelID_A, getRaceMask());
+    }
+    // nothing found in above, so use default
+    if (!modelid)
+        modelid = ssEntry->modelID_A;
+    return modelid;
+}
+
+float Player::GetCollisionHeight(bool mounted)
+{
+    if (mounted)
+    {
+        CreatureDisplayInfoEntry const* mountDisplayInfo = sCreatureDisplayInfoStore.LookupEntry(GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID));
+        if (!mountDisplayInfo)
+            return GetCollisionHeight(false);
+
+        CreatureModelDataEntry const* mountModelData = sCreatureModelDataStore.LookupEntry(mountDisplayInfo->ModelId);
+        if (!mountModelData)
+            return GetCollisionHeight(false);
+
+        CreatureDisplayInfoEntry const* displayInfo = sCreatureDisplayInfoStore.LookupEntry(GetNativeDisplayId());
+        MANGOS_ASSERT(displayInfo);
+        CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelId);
+        MANGOS_ASSERT(modelData);
+
+        float scaleMod = GetFloatValue(OBJECT_FIELD_SCALE_X); // 99% sure about this
+
+        return scaleMod * mountModelData->MountHeight + modelData->CollisionHeight * 0.5f;
+    }
+    else
+    {
+        //! Dismounting case - use basic default model data
+        CreatureDisplayInfoEntry const* displayInfo = sCreatureDisplayInfoStore.LookupEntry(GetNativeDisplayId());
+        MANGOS_ASSERT(displayInfo);
+        CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelId);
+        MANGOS_ASSERT(modelData);
+
+        return modelData->CollisionHeight;
+    }
+}
+
+void Player::InterruptTaxiFlying()
+{
+    // stop flight if need
+    if (IsTaxiFlying())
+    {
+        GetUnitStateMgr().DropAction(UNIT_ACTION_TAXI);
+        m_taxi.ClearTaxiDestinations();
+        GetUnitStateMgr().InitDefaults(false);
+    }
+    // save only in non-flight case
+    else
+        SaveRecallPosition();
+}
+
+Object* Player::GetDependentObject(ObjectGuid const& guid)
+{
+    // Currently only items dependent from player.
+    if (guid.IsEmpty() || !guid.IsItem())
+        return NULL;
+    return (Object*)GetItemByGuid(guid);
+}
+
+void Player::AddUpdateObject(ObjectGuid const& guid)
+{
+    i_objectsToClientUpdate.insert(guid);
+
+    // Not need add owner to update queue if owner already marked for update.
+    if (!IsMarkedForClientUpdate() && GetMap())
+        GetMap()->AddUpdateObject(GetObjectGuid());
+}
+
+void Player::RemoveUpdateObject(ObjectGuid const& guid)
+{
+    // possible required remove player from update queue also.
+    i_objectsToClientUpdate.erase(guid);
+}
+
+void Player::AddItemWithTimeCheck(uint32 lowGuid)
+{
+    m_itemsWithTimeCheck.insert(lowGuid);
+}
+
+void Player::RemoveItemWithTimeCheck(uint32 lowGuid)
+{
+    std::set<uint32>::iterator itr = m_itemsWithTimeCheck.find(lowGuid);
+    if (itr != m_itemsWithTimeCheck.end())
+        m_itemsWithTimeCheck.erase(lowGuid);
+}
+
+void Player::UpdateItemsWithTimeCheck()
+{
+    if (m_itemsWithTimeCheck.empty())
+        return;
+
+    std::set<uint32>::iterator i_next;
+    for (std::set<uint32>::iterator itr = m_itemsWithTimeCheck.begin(); itr != m_itemsWithTimeCheck.end(); itr = i_next)
+    {
+        i_next = itr;
+        ++i_next;
+
+        bool erase = false;
+
+        if (Item* item = GetItemByGuid(ObjectGuid(HIGHGUID_ITEM, *itr)))
+        {
+            erase = item->GetOwnerGuid() != GetObjectGuid();
+            if (!erase)
+            {
+                if (item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE))
+                    item->CheckRefundExpired(this);
+                else if (item->HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE))
+                    item->CheckSoulboundTradeExpire(this);
+                else
+                    erase = true;
+            }
+        }
+        else
+        {
+            sLog.outError("Player::UpdateItemsWithTimeCheck: Can't find item (Guid: %u) but is in update storage for %s. Removing.", *itr, GetGuidStr().c_str());
+            erase = true;
+        }
+
+        if (erase)
+            m_itemsWithTimeCheck.erase(itr);
+    }
+}
+
+void Player::SendRefundInfo(Item* item)
+{
+    item->CheckRefundExpired(this);
+
+    if (!item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE))
+    {
+        DEBUG_LOG("Player::SendRefundInfo: Item not refundable!");
+        return;
+    }
+
+    if (GetObjectGuid() != item->GetOwnerGuid())    // Formerly refundable item got traded
+    {
+        DEBUG_LOG("Player::SendRefundInfo: Item was traded!");
+        item->SetNotRefundable(this);
+        return;
+    }
+
+    ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(item->GetPaidExtendedCost());
+    if (!iece)
+    {
+        DEBUG_LOG("Player::SendRefundInfo: Cannot find extendedcost data.");
+        return;
+    }
+
+    WorldPacket data(SMSG_ITEM_REFUND_INFO_RESPONSE, 8+4+4+4+4*4+4*4+4+4);
+    data << item->GetObjectGuid();                  // item guid
+    data << uint32(item->GetPaidMoney());           // money cost
+    data << uint32(iece->reqhonorpoints);           // honor point cost
+    data << uint32(iece->reqarenapoints);           // arena point cost
+    for (uint32 i = 0; i < MAX_EXTENDED_COST_ITEMS; ++i)   // item cost data
+    {
+        data << uint32(iece->reqitem[i]);
+        data << uint32(iece->reqitemcount[i]);
+    }
+    data << uint32(0);
+    data << uint32(item->GetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME));
+    GetSession()->SendPacket(&data);
+}
+
+void Player::RefundItem(Item* item)
+{
+    if (!item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE))
+    {
+        DEBUG_LOG("Player::RefundItem: Item not refundable!");
+        return;
+    }
+
+    if (item->CheckRefundExpired(this))             // item refund has expired
+    {
+        WorldPacket data(SMSG_ITEM_REFUND_RESULT, 8+4);
+        data << item->GetObjectGuid();              // Guid
+        data << uint32(10);                         // Error!
+        GetSession()->SendPacket(&data);
+        return;
+    }
+
+    if (GetObjectGuid() != item->GetOwnerGuid())    // Formerly refundable item got traded
+    {
+        DEBUG_LOG("Player::RefundItem: Item was traded!");
+        item->SetNotRefundable(this);
+        return;
+    }
+
+    ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(item->GetPaidExtendedCost());
+    if (!iece)
+    {
+        DEBUG_LOG("Player::RefundItem: Cannot find extendedcost data.");
+        return;
+    }
+
+    bool storeError = false;
+    for (uint32 i = 0; i < MAX_EXTENDED_COST_ITEMS; ++i)
+    {
+        uint32 count = iece->reqitemcount[i];
+        uint32 itemid = iece->reqitem[i];
+
+        if (count && itemid)
+        {
+            ItemPosCountVec dest;
+            InventoryResult msg = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemid, count);
+            if (msg != EQUIP_ERR_OK)
+            {
+                storeError = true;
+                break;
+            }
+         }
+    }
+
+    if (storeError)
+    {
+        WorldPacket data(SMSG_ITEM_REFUND_RESULT, 8+4);
+        data << item->GetObjectGuid();                   // Guid
+        data << uint32(10);                              // Error!
+        GetSession()->SendPacket(&data);
+        return;
+    }
+
+    WorldPacket data(SMSG_ITEM_REFUND_RESULT, 8+4+4+4+4+4*4+4*4);
+    data << item->GetObjectGuid();                      // item guid
+    data << uint32(0);                                  // 0, or error code
+    data << uint32(item->GetPaidMoney());               // money cost
+    data << uint32(iece->reqhonorpoints);               // honor point cost
+    data << uint32(iece->reqarenapoints);               // arena point cost
+    for (uint32 i = 0; i < MAX_EXTENDED_COST_ITEMS; ++i) // item cost data
+    {
+        data << uint32(iece->reqitem[i]);
+        data << uint32(iece->reqitemcount[i]);
+    }
+    GetSession()->SendPacket(&data);
+
+    uint32 moneyRefund = item->GetPaidMoney();  // item-> will be invalidated in DestroyItem
+
+    // Save all relevant data to DB to prevent desynchronisation exploits
+    CharacterDatabase.BeginTransaction();
+
+    // Delete any references to the refund data
+    item->SetNotRefundable(this);
+
+    // Destroy item
+    DestroyItem(item->GetBagSlot(), item->GetSlot(), true);
+
+    // Grant back extendedcost items
+    for (uint8 i = 0; i < MAX_EXTENDED_COST_ITEMS; ++i)
+    {
+        uint32 count = iece->reqitemcount[i];
+        uint32 itemid = iece->reqitem[i];
+        if (count && itemid)
+        {
+            ItemPosCountVec dest;
+            InventoryResult msg = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemid, count);
+            MANGOS_ASSERT(msg == EQUIP_ERR_OK); // Already checked before
+            Item* it = StoreNewItem(dest, itemid, true);
+            SendNewItem(it, count, true, false, true);
+        }
+    }
+
+    // Grant back money
+    if (moneyRefund)
+        ModifyMoney(int32(moneyRefund)); // Saved in SaveInventoryAndGoldToDB
+
+    // Grant back Honor points
+    if (uint32 honorRefund = iece->reqhonorpoints)
+        ModifyHonorPoints(int32(honorRefund));
+
+    // Grant back Arena points
+    if (uint32 arenaRefund = iece->reqarenapoints)
+        ModifyArenaPoints(int32(arenaRefund));
+
+    SaveInventoryAndGoldToDB();
+
+    CharacterDatabase.CommitTransaction();
+}
+
+void Player::SetViewPoint(WorldObject* target, bool immediate, bool update_far_sight_field)
+{
+    if (!GetCamera())
+        return;
+
+    if (target && target->IsInWorld())
+    {
+        if (immediate && (HasExternalViewPoint() && GetCamera()->GetBody() != target))
+        {
+            WorldPacket data(SMSG_CLEAR_FAR_SIGHT_IMMEDIATE, 0);
+            GetSession()->SendPacket(&data);
+        }
+
+        if (target->GetObjectGuid().IsUnit() && target->GetObjectGuid() != GetObjectGuid())
+        {
+            if (((Unit*)target)->IsLevitating() || (target->GetObjectGuid().IsPlayer() && ((Player*)target)->IsFlying()))
+            {
+                WorldPacket data(SMSG_MOVE_SET_CAN_FLY, target->GetPackGUID().size() + 4);
+                data << target->GetPackGUID();
+                data << uint32(0);
+                target->SendMessageToSet(&data, false);
+            }
+        }
+
+        GetCamera()->SetView(target, update_far_sight_field);
+    }
+    else
+    {
+        if (immediate && HasExternalViewPoint())
+        {
+            WorldPacket data(SMSG_CLEAR_FAR_SIGHT_IMMEDIATE, 0);
+            GetSession()->SendPacket(&data);
+        }
+        GetCamera()->ResetView(update_far_sight_field);
+    }
+}
diff --git a/src/game/Player.h b/src/game/Player.h
index 8fa5fb48f26..d84dc231542 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -35,9 +35,12 @@
 #include "Util.h"                                           // for Tokens typedef
 #include "AchievementMgr.h"
 #include "ReputationMgr.h"
-#include "BattleGround.h"
-#include "DBCStores.h"
+#include "BattleGround/BattleGround.h"
 #include "SharedDefines.h"
+#include "Chat.h"
+#include "LFG.h"
+#include "AntiCheat.h"
+#include "AccountMgr.h"
 
 #include<string>
 #include<vector>
@@ -47,13 +50,18 @@ class Channel;
 class DynamicObject;
 class Creature;
 class PlayerMenu;
-class Transport;
 class UpdateMask;
 class SpellCastTargets;
 class PlayerSocial;
 class DungeonPersistentState;
 class Spell;
 class Item;
+struct AreaTrigger;
+class OutdoorPvP;
+
+// Playerbot mod
+class PlayerbotAI;
+class PlayerbotMgr;
 
 typedef std::deque<Mail*> PlayerMails;
 
@@ -114,14 +122,6 @@ struct PlayerTalent
 typedef UNORDERED_MAP<uint32, PlayerSpell> PlayerSpellMap;
 typedef UNORDERED_MAP<uint32, PlayerTalent> PlayerTalentMap;
 
-struct SpellCooldown
-{
-    time_t end;
-    uint16 itemid;
-};
-
-typedef std::map<uint32, SpellCooldown> SpellCooldowns;
-
 enum TrainerSpellState
 {
     TRAINER_SPELL_GREEN = 0,
@@ -154,7 +154,7 @@ enum ActionButtonType
 
 struct ActionButton
 {
-    ActionButton() : packedData(0), uState( ACTIONBUTTON_NEW ) {}
+    ActionButton() : packedData(0), uState(ACTIONBUTTON_NEW) {}
 
     uint32 packedData;
     ActionButtonUpdateState uState;
@@ -203,16 +203,16 @@ struct Glyph
 
     void SetId(uint32 newId)
     {
-        if(newId == id)
+        if (newId == id)
             return;
 
-        if(id == 0 && uState == GLYPH_UNCHANGED)            // not exist yet in db and already saved
+        if (id == 0 && uState == GLYPH_UNCHANGED)            // not exist yet in db and already saved
         {
             uState = GLYPH_NEW;
         }
         else if (newId == 0)
         {
-            if(uState == GLYPH_NEW)                         // delete before add new -> no change
+            if (uState == GLYPH_NEW)                         // delete before add new -> no change
                 uState = GLYPH_UNCHANGED;
             else                                            // delete existing data
                 uState = GLYPH_DELETED;
@@ -252,7 +252,7 @@ struct PlayerClassInfo
 
 struct PlayerLevelInfo
 {
-    PlayerLevelInfo() { for(int i=0; i < MAX_STATS; ++i ) stats[i] = 0; }
+    PlayerLevelInfo() { for (int i = 0; i < MAX_STATS; ++i) stats[i] = 0; }
 
     uint8 stats[MAX_STATS];
 };
@@ -339,20 +339,33 @@ struct RuneInfo
     uint8  BaseRune;
     uint8  CurrentRune;
     uint16 Cooldown;                                        // msec
+    uint32 ConvertedBy;
 };
 
 struct Runes
 {
     RuneInfo runes[MAX_RUNES];
     uint8 runeState;                                        // mask of available runes
+    uint8 needConvert;                                      // mask of runes that need to be converted
 
     void SetRuneState(uint8 index, bool set = true)
     {
-        if(set)
+        if (set)
             runeState |= (1 << index);                      // usable
         else
             runeState &= ~(1 << index);                     // on cooldown
     }
+
+    bool IsRuneNeedsConvert(uint8 index)
+    {
+        if (!needConvert)
+            return false;
+
+        if (needConvert & (1 << index))
+            return true;
+        else
+            return false;
+    }
 };
 
 struct EnchantDuration
@@ -368,14 +381,6 @@ struct EnchantDuration
 typedef std::list<EnchantDuration> EnchantDurationList;
 typedef std::list<Item*> ItemDurationList;
 
-enum LfgRoles
-{
-    LEADER  = 0x01,
-    TANK    = 0x02,
-    HEALER  = 0x04,
-    DAMAGE  = 0x08
-};
-
 enum RaidGroupError
 {
     ERR_RAID_GROUP_NONE                 = 0,
@@ -385,14 +390,6 @@ enum RaidGroupError
     ERR_RAID_GROUP_REQUIREMENTS_UNMATCH = 4
 };
 
-enum PlayerMovementType
-{
-    MOVE_ROOT       = 1,
-    MOVE_UNROOT     = 2,
-    MOVE_WATER_WALK = 3,
-    MOVE_LAND_WALK  = 4
-};
-
 enum DrunkenState
 {
     DRUNKEN_SOBER   = 0,
@@ -502,23 +499,6 @@ enum PlayerFieldByte2Flags
     PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW = 0x40
 };
 
-enum ActivateTaxiReplies
-{
-    ERR_TAXIOK                      = 0,
-    ERR_TAXIUNSPECIFIEDSERVERERROR  = 1,
-    ERR_TAXINOSUCHPATH              = 2,
-    ERR_TAXINOTENOUGHMONEY          = 3,
-    ERR_TAXITOOFARAWAY              = 4,
-    ERR_TAXINOVENDORNEARBY          = 5,
-    ERR_TAXINOTVISITED              = 6,
-    ERR_TAXIPLAYERBUSY              = 7,
-    ERR_TAXIPLAYERALREADYMOUNTED    = 8,
-    ERR_TAXIPLAYERSHAPESHIFTED      = 9,
-    ERR_TAXIPLAYERMOVING            = 10,
-    ERR_TAXISAMENODE                = 11,
-    ERR_TAXINOTSTANDING             = 12
-};
-
 enum MirrorTimerType
 {
     FATIGUE_TIMER      = 0,
@@ -555,6 +535,9 @@ enum AtLoginFlags
     AT_LOGIN_CUSTOMIZE         = 0x08,
     AT_LOGIN_RESET_PET_TALENTS = 0x10,
     AT_LOGIN_FIRST             = 0x20,
+    AT_LOGIN_CHANGE_FACTION    = 0x40,
+    AT_LOGIN_CHANGE_RACE       = 0x80,
+    AT_LOGIN_CHECK_TITLES      = 0x100
 };
 
 typedef std::map<uint32, QuestStatusData> QuestStatusMap;
@@ -738,6 +721,32 @@ enum TransferAbortReason
     TRANSFER_ABORT_MAP_NOT_ALLOWED              = 0x10,     // Map can't be entered at this time.
 };
 
+enum ReferAFriendError
+{
+    ERR_REFER_A_FRIEND_NONE                          = 0x00,
+    ERR_REFER_A_FRIEND_NOT_REFERRED_BY               = 0x01,
+    ERR_REFER_A_FRIEND_TARGET_TOO_HIGH               = 0x02,
+    ERR_REFER_A_FRIEND_INSUFFICIENT_GRANTABLE_LEVELS = 0x03,
+    ERR_REFER_A_FRIEND_TOO_FAR                       = 0x04,
+    ERR_REFER_A_FRIEND_DIFFERENT_FACTION             = 0x05,
+    ERR_REFER_A_FRIEND_NOT_NOW                       = 0x06,
+    ERR_REFER_A_FRIEND_GRANT_LEVEL_MAX_I             = 0x07,
+    ERR_REFER_A_FRIEND_NO_TARGET                     = 0x08,
+    ERR_REFER_A_FRIEND_NOT_IN_GROUP                  = 0x09,
+    ERR_REFER_A_FRIEND_SUMMON_LEVEL_MAX_I            = 0x0A,
+    ERR_REFER_A_FRIEND_SUMMON_COOLDOWN               = 0x0B,
+    ERR_REFER_A_FRIEND_INSUF_EXPAN_LVL               = 0x0C,
+    ERR_REFER_A_FRIEND_SUMMON_OFFLINE_S              = 0x0D
+};
+
+enum AccountLinkedState
+{
+    STATE_NOT_LINKED = 0x00,
+    STATE_REFER      = 0x01,
+    STATE_REFERRAL   = 0x02,
+    STATE_DUAL       = 0x04,
+};
+
 enum InstanceResetWarningType
 {
     RAID_INSTANCE_WARNING_HOURS     = 1,                    // WARNING! %s is scheduled to reset in %d hour(s).
@@ -762,16 +771,17 @@ enum ArenaTeamInfoType
 
 enum RestType
 {
-    REST_TYPE_NO        = 0,
-    REST_TYPE_IN_TAVERN = 1,
-    REST_TYPE_IN_CITY   = 2
+    REST_TYPE_NO                = 0,
+    REST_TYPE_IN_TAVERN         = 1,
+    REST_TYPE_IN_CITY           = 2,
+    REST_TYPE_IN_FACTION_AREA   = 3                         // used with AREA_FLAG_REST_ZONE_*
 };
 
 enum DuelCompleteType
 {
-    DUEL_INTERUPTED = 0,
-    DUEL_WON        = 1,
-    DUEL_FLED       = 2
+    DUEL_INTERRUPTED            = 0,
+    DUEL_WON                    = 1,
+    DUEL_FLED                   = 2
 };
 
 enum TeleportToOptions
@@ -781,24 +791,26 @@ enum TeleportToOptions
     TELE_TO_NOT_LEAVE_COMBAT    = 0x04,
     TELE_TO_NOT_UNSUMMON_PET    = 0x08,
     TELE_TO_SPELL               = 0x10,
+    TELE_TO_CHECKED             = 0x1000,
+    TELE_TO_NODELAY             = 0x2000,
 };
 
 /// Type of environmental damages
 enum EnviromentalDamage
 {
-    DAMAGE_EXHAUSTED = 0,
-    DAMAGE_DROWNING  = 1,
-    DAMAGE_FALL      = 2,
-    DAMAGE_LAVA      = 3,
-    DAMAGE_SLIME     = 4,
-    DAMAGE_FIRE      = 5,
-    DAMAGE_FALL_TO_VOID = 6                                 // custom case for fall without durability loss
+    DAMAGE_EXHAUSTED            = 0,
+    DAMAGE_DROWNING             = 1,
+    DAMAGE_FALL                 = 2,
+    DAMAGE_LAVA                 = 3,
+    DAMAGE_SLIME                = 4,
+    DAMAGE_FIRE                 = 5,
+    DAMAGE_FALL_TO_VOID         = 6                         // custom case for fall without durability loss
 };
 
 enum PlayedTimeIndex
 {
-    PLAYED_TIME_TOTAL = 0,
-    PLAYED_TIME_LEVEL = 1
+    PLAYED_TIME_TOTAL           = 0,
+    PLAYED_TIME_LEVEL           = 1
 };
 
 #define MAX_PLAYED_TIME_INDEX 2
@@ -835,6 +847,7 @@ enum PlayerLoginQueryIndex
     PLAYER_LOGIN_QUERY_LOADTALENTS,
     PLAYER_LOGIN_QUERY_LOADWEEKLYQUESTSTATUS,
     PLAYER_LOGIN_QUERY_LOADMONTHLYQUESTSTATUS,
+    PLAYER_LOGIN_QUERY_LOADRANDOMBG,
 
     MAX_PLAYER_LOGIN_QUERY
 };
@@ -864,10 +877,18 @@ struct InstancePlayerBind
 {
     DungeonPersistentState *state;
     bool perm;
+    bool extend;
     /* permanent PlayerInstanceBinds are created in Raid/Heroic instances for players
        that aren't already permanently bound when they are inside when a boss is killed
        or when they enter an instance that the group leader is permanently bound to. */
-    InstancePlayerBind() : state(NULL), perm(false) {}
+    InstancePlayerBind() : state(NULL), perm(false), extend(false) {}
+};
+
+enum PlayerRestState
+{
+    REST_STATE_RESTED       = 0x01,
+    REST_STATE_NORMAL       = 0x02,
+    REST_STATE_RAF_LINKED   = 0x04                          // Exact use unknown
 };
 
 class MANGOS_DLL_SPEC PlayerTaxi
@@ -927,7 +948,7 @@ std::ostringstream& operator<< (std::ostringstream& ss, PlayerTaxi const& taxi);
 struct BGData
 {
     BGData() : bgInstanceID(0), bgTypeID(BATTLEGROUND_TYPE_NONE), bgAfkReportedCount(0), bgAfkReportedTimer(0),
-        bgTeam(TEAM_NONE), mountSpell(0), m_needSave(false) { ClearTaxiPath(); }
+        bgTeam(TEAM_NONE), mountSpell(0), m_needSave(false), forLFG(false) { ClearTaxiPath(); }
 
     uint32 bgInstanceID;                                    ///< This variable is set to bg->m_InstanceID, saved
                                                             ///  when player is teleported to BG - (it is battleground's GUID)
@@ -947,6 +968,8 @@ struct BGData
 
     bool m_needSave;                                        ///< true, if saved to DB fields modified after prev. save (marked as "saved" above)
 
+    bool forLFG;                                            // true, if data used for LFG entry point set ( fields modified after prev. save (instanceID = 0!)
+
     void ClearTaxiPath()     { taxiPath[0] = taxiPath[1] = 0; }
     bool HasTaxiPath() const { return taxiPath[0] && taxiPath[1]; }
 };
@@ -1005,6 +1028,22 @@ class TradeData
         ObjectGuid m_items[TRADE_SLOT_COUNT];               // traded itmes from m_player side including non-traded slot
 };
 
+// wow armory begin
+struct WowarmoryFeedEntry {
+    uint32 guid;         // Player GUID
+    time_t date;         // Log date
+    uint32 type;         // TYPE_ACHIEVEMENT_FEED, TYPE_ITEM_FEED, TYPE_BOSS_FEED
+    uint32 data;         // TYPE_ITEM_FEED: item_entry, TYPE_BOSS_FEED: creature_entry
+    uint32 item_guid;    // Can be 0
+    uint32 item_quality; // Can be 0
+    uint8  difficulty;   // Can be 0
+    int    counter;      // Can be 0
+};
+
+typedef std::vector<WowarmoryFeedEntry> WowarmoryFeeds;
+// wow armory end
+
+
 class MANGOS_DLL_SPEC Player : public Unit
 {
     friend class WorldSession;
@@ -1012,38 +1051,36 @@ class MANGOS_DLL_SPEC Player : public Unit
     friend void Item::RemoveFromUpdateQueueOf(Player *player);
     public:
         explicit Player (WorldSession *session);
-        ~Player ( );
-
-        void CleanupsBeforeDelete();
+        ~Player ();
 
-        static UpdateMask updateVisualBits;
-        static void InitVisibleBits();
+        virtual void CleanupsBeforeDelete() override;
 
         void AddToWorld();
-        void RemoveFromWorld();
+        virtual void RemoveFromWorld(bool remove) override;
+        virtual void SetMap(Map* map) override;
+        virtual void ResetMap() override;
+        // Used for lock map from unloading. Use with caution!
+        MapPtr GetMapPtr() { return m_mapPtr; };
 
-        bool TeleportTo(uint32 mapid, float x, float y, float z, float orientation, uint32 options = 0);
-
-        bool TeleportTo(WorldLocation const &loc, uint32 options = 0)
+        bool TeleportTo(uint32 mapid, float x, float y, float z, float orientation, uint32 options = 0)
         {
-            return TeleportTo(loc.mapid, loc.coord_x, loc.coord_y, loc.coord_z, loc.orientation, options);
+            return TeleportTo(WorldLocation(mapid, x, y, z, orientation, GetPhaseMask()), options);
         }
 
+        bool TeleportTo(WorldLocation const& loc, uint32 options = 0);
+
         bool TeleportToBGEntryPoint();
 
-        void SetSummonPoint(uint32 mapid, float x, float y, float z)
+        void SetSummonPoint(WorldLocation const& loc)
         {
             m_summon_expire = time(NULL) + MAX_PLAYER_SUMMON_DELAY;
-            m_summon_mapid = mapid;
-            m_summon_x = x;
-            m_summon_y = y;
-            m_summon_z = z;
+            m_summon_loc = loc;
         }
         void SummonIfPossible(bool agree);
 
         bool Create( uint32 guidlow, const std::string& name, uint8 race, uint8 class_, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 outfitId );
 
-        void Update(uint32 update_diff, uint32 time) override;
+        virtual void Update(uint32 update_diff, uint32 time) override;
 
         static bool BuildEnumData( QueryResult * result,  WorldPacket * p_data );
 
@@ -1064,10 +1101,10 @@ class MANGOS_DLL_SPEC Player : public Unit
         void ToggleDND();
         bool isAFK() const { return HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK); }
         bool isDND() const { return HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_DND); }
-        uint8 chatTag() const;
+        ChatTagFlags GetChatTag() const;
         std::string autoReplyMsg;
 
-        uint32 GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 newfacialhair);
+        uint32 GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 newfacialhair, uint8 newskintone);
 
         PlayerSocial *GetSocial() { return m_social; }
 
@@ -1078,18 +1115,18 @@ class MANGOS_DLL_SPEC Player : public Unit
                                                             // mount_id can be used in scripting calls
         void ContinueTaxiFlight();
         bool isAcceptTickets() const { return GetSession()->GetSecurity() >= SEC_GAMEMASTER && (m_ExtraFlags & PLAYER_EXTRA_GM_ACCEPT_TICKETS); }
-        void SetAcceptTicket(bool on) { if(on) m_ExtraFlags |= PLAYER_EXTRA_GM_ACCEPT_TICKETS; else m_ExtraFlags &= ~PLAYER_EXTRA_GM_ACCEPT_TICKETS; }
+        void SetAcceptTicket(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_GM_ACCEPT_TICKETS; else m_ExtraFlags &= ~PLAYER_EXTRA_GM_ACCEPT_TICKETS; }
         bool isAcceptWhispers() const { return m_ExtraFlags & PLAYER_EXTRA_ACCEPT_WHISPERS; }
-        void SetAcceptWhispers(bool on) { if(on) m_ExtraFlags |= PLAYER_EXTRA_ACCEPT_WHISPERS; else m_ExtraFlags &= ~PLAYER_EXTRA_ACCEPT_WHISPERS; }
+        void SetAcceptWhispers(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_ACCEPT_WHISPERS; else m_ExtraFlags &= ~PLAYER_EXTRA_ACCEPT_WHISPERS; }
         bool isGameMaster() const { return m_ExtraFlags & PLAYER_EXTRA_GM_ON; }
         void SetGameMaster(bool on);
         bool isGMChat() const { return GetSession()->GetSecurity() >= SEC_MODERATOR && (m_ExtraFlags & PLAYER_EXTRA_GM_CHAT); }
-        void SetGMChat(bool on) { if(on) m_ExtraFlags |= PLAYER_EXTRA_GM_CHAT; else m_ExtraFlags &= ~PLAYER_EXTRA_GM_CHAT; }
+        void SetGMChat(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_GM_CHAT; else m_ExtraFlags &= ~PLAYER_EXTRA_GM_CHAT; }
         bool isTaxiCheater() const { return m_ExtraFlags & PLAYER_EXTRA_TAXICHEAT; }
-        void SetTaxiCheater(bool on) { if(on) m_ExtraFlags |= PLAYER_EXTRA_TAXICHEAT; else m_ExtraFlags &= ~PLAYER_EXTRA_TAXICHEAT; }
+        void SetTaxiCheater(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_TAXICHEAT; else m_ExtraFlags &= ~PLAYER_EXTRA_TAXICHEAT; }
         bool isGMVisible() const { return !(m_ExtraFlags & PLAYER_EXTRA_GM_INVISIBLE); }
         void SetGMVisible(bool on);
-        void SetPvPDeath(bool on) { if(on) m_ExtraFlags |= PLAYER_EXTRA_PVP_DEATH; else m_ExtraFlags &= ~PLAYER_EXTRA_PVP_DEATH; }
+        void SetPvPDeath(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_PVP_DEATH; else m_ExtraFlags &= ~PLAYER_EXTRA_PVP_DEATH; }
 
         // 0 = own auction, -1 = enemy auction, 1 = goblin auction
         int GetAuctionAccessMode() const { return m_ExtraFlags & PLAYER_EXTRA_AUCTION_ENEMY ? -1 : (m_ExtraFlags & PLAYER_EXTRA_AUCTION_NEUTRAL ? 1 : 0); }
@@ -1097,9 +1134,9 @@ class MANGOS_DLL_SPEC Player : public Unit
         {
             m_ExtraFlags &= ~ (PLAYER_EXTRA_AUCTION_ENEMY|PLAYER_EXTRA_AUCTION_NEUTRAL);
 
-            if(state < 0)
+            if (state < 0)
                 m_ExtraFlags |= PLAYER_EXTRA_AUCTION_ENEMY;
-            else if( state > 0)
+            else if ( state > 0)
                 m_ExtraFlags |= PLAYER_EXTRA_AUCTION_NEUTRAL;
         }
 
@@ -1139,123 +1176,126 @@ class MANGOS_DLL_SPEC Player : public Unit
         void Yell(const std::string& text, const uint32 language);
         void TextEmote(const std::string& text);
         void Whisper(const std::string& text, const uint32 language, ObjectGuid receiver);
-        void BuildPlayerChat(WorldPacket *data, uint8 msgtype, const std::string& text, uint32 language) const;
 
         /*********************************************************/
         /***                    STORAGE SYSTEM                 ***/
         /*********************************************************/
 
-        void SetVirtualItemSlot( uint8 i, Item* item);
-        void SetSheath( SheathState sheathed );             // overwrite Unit version
+        void SetVirtualItemSlot(uint8 i, Item* item);
+        void SetSheath(SheathState sheathed);             // overwrite Unit version
         uint8 FindEquipSlot(ItemPrototype const* proto, uint32 slot, bool swap) const;
         uint32 GetItemCount(uint32 item, bool inBankAlso = false, Item* skipItem = NULL) const;
         uint32 GetItemCountWithLimitCategory(uint32 limitCategory, Item* skipItem = NULL) const;
         Item* GetItemByGuid(ObjectGuid guid) const;
         Item* GetItemByEntry(uint32 item) const;            // only for special cases
         Item* GetItemByLimitedCategory(uint32 limitedCategory) const;
-        Item* GetItemByPos( uint16 pos ) const;
-        Item* GetItemByPos( uint8 bag, uint8 slot ) const;
+        Item* GetItemByPos(uint16 pos) const;
+        Item* GetItemByPos(uint8 bag, uint8 slot) const;
         uint32 GetItemDisplayIdInSlot(uint8 bag, uint8 slot) const;
         Item* GetWeaponForAttack(WeaponAttackType attackType) const { return GetWeaponForAttack(attackType,false,false); }
         Item* GetWeaponForAttack(WeaponAttackType attackType, bool nonbroken, bool useable) const;
         Item* GetShield(bool useable = false) const;
-        static uint32 GetAttackBySlot( uint8 slot );        // MAX_ATTACK if not weapon slot
+        static uint32 GetAttackBySlot(uint8 slot);        // MAX_ATTACK if not weapon slot
         std::vector<Item *> &GetItemUpdateQueue() { return m_itemUpdateQueue; }
-        static bool IsInventoryPos( uint16 pos ) { return IsInventoryPos(pos >> 8, pos & 255); }
-        static bool IsInventoryPos( uint8 bag, uint8 slot );
-        static bool IsEquipmentPos( uint16 pos ) { return IsEquipmentPos(pos >> 8, pos & 255); }
-        static bool IsEquipmentPos( uint8 bag, uint8 slot );
-        static bool IsBagPos( uint16 pos );
-        static bool IsBankPos( uint16 pos ) { return IsBankPos(pos >> 8, pos & 255); }
-        static bool IsBankPos( uint8 bag, uint8 slot );
-        bool IsValidPos( uint16 pos, bool explicit_pos ) const { return IsValidPos(pos >> 8, pos & 255, explicit_pos); }
-        bool IsValidPos( uint8 bag, uint8 slot, bool explicit_pos ) const;
+        static bool IsInventoryPos(uint16 pos) { return IsInventoryPos(pos >> 8, pos & 255); }
+        static bool IsInventoryPos(uint8 bag, uint8 slot);
+        static bool IsEquipmentPos(uint16 pos) { return IsEquipmentPos(pos >> 8, pos & 255); }
+        static bool IsEquipmentPos(uint8 bag, uint8 slot);
+        static bool IsBagPos(uint16 pos);
+        static bool IsBankPos(uint16 pos) { return IsBankPos(pos >> 8, pos & 255); }
+        static bool IsBankPos(uint8 bag, uint8 slot);
+        bool IsValidPos(uint16 pos, bool explicit_pos) const { return IsValidPos(pos >> 8, pos & 255, explicit_pos); }
+        bool IsValidPos(uint8 bag, uint8 slot, bool explicit_pos) const;
         uint8 GetBankBagSlotCount() const { return GetByteValue(PLAYER_BYTES_2, 2); }
         void SetBankBagSlotCount(uint8 count) { SetByteValue(PLAYER_BYTES_2, 2, count); }
-        bool HasItemCount( uint32 item, uint32 count, bool inBankAlso = false) const;
+        bool HasItemCount(uint32 item, uint32 count, bool inBankAlso = false) const;
         bool HasItemFitToSpellReqirements(SpellEntry const* spellInfo, Item const* ignoreItem = NULL);
+        bool HasItemFitToAreaTriggerReqirements(AreaTrigger const* at) const;
+        bool HasHeroicKeyFitToAreaTriggerReqirements(AreaTrigger const* at) const;
+        bool HasQuestFitToAreaTriggerReqirements(AreaTrigger const* at, bool isRegularTargetMap) const;
+        bool HasAchievementFitToAreaTriggerReqirements(AreaTrigger const* at, Difficulty difficulty);
         bool CanNoReagentCast(SpellEntry const* spellInfo) const;
-        bool HasItemOrGemWithIdEquipped( uint32 item, uint32 count, uint8 except_slot = NULL_SLOT) const;
-        bool HasItemOrGemWithLimitCategoryEquipped( uint32 limitCategory, uint32 count, uint8 except_slot = NULL_SLOT) const;
+        bool HasItemOrGemWithIdEquipped(uint32 item, uint32 count, uint8 except_slot = NULL_SLOT) const;
+        bool HasItemOrGemWithLimitCategoryEquipped(uint32 limitCategory, uint32 count, uint8 except_slot = NULL_SLOT) const;
         InventoryResult CanTakeMoreSimilarItems(Item* pItem) const { return _CanTakeMoreSimilarItems(pItem->GetEntry(), pItem->GetCount(), pItem); }
         InventoryResult CanTakeMoreSimilarItems(uint32 entry, uint32 count) const { return _CanTakeMoreSimilarItems(entry, count, NULL); }
-        InventoryResult CanStoreNewItem( uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 item, uint32 count, uint32* no_space_count = NULL ) const
+        InventoryResult CanStoreNewItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 item, uint32 count, uint32* no_space_count = NULL) const
         {
-            return _CanStoreItem(bag, slot, dest, item, count, NULL, false, no_space_count );
+            return _CanStoreItem(bag, slot, dest, item, count, NULL, false, no_space_count);
         }
-        InventoryResult CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec& dest, Item *pItem, bool swap = false ) const
+        InventoryResult CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, Item *pItem, bool swap = false) const
         {
-            if(!pItem)
+            if (!pItem)
                 return EQUIP_ERR_ITEM_NOT_FOUND;
             uint32 count = pItem->GetCount();
-            return _CanStoreItem( bag, slot, dest, pItem->GetEntry(), count, pItem, swap, NULL );
+            return _CanStoreItem(bag, slot, dest, pItem->GetEntry(), count, pItem, swap, NULL);
 
         }
         InventoryResult CanStoreItems(Item **pItem,int count) const;
         InventoryResult CanEquipNewItem(uint8 slot, uint16 &dest, uint32 item, bool swap) const;
         InventoryResult CanEquipItem(uint8 slot, uint16 &dest, Item *pItem, bool swap, bool direct_action = true) const;
 
-        InventoryResult CanEquipUniqueItem( Item * pItem, uint8 except_slot = NULL_SLOT, uint32 limit_count = 1 ) const;
-        InventoryResult CanEquipUniqueItem( ItemPrototype const* itemProto, uint8 except_slot = NULL_SLOT, uint32 limit_count = 1 ) const;
-        InventoryResult CanUnequipItems( uint32 item, uint32 count ) const;
-        InventoryResult CanUnequipItem( uint16 src, bool swap ) const;
-        InventoryResult CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec& dest, Item *pItem, bool swap, bool not_loading = true ) const;
+        InventoryResult CanEquipUniqueItem(Item * pItem, uint8 except_slot = NULL_SLOT, uint32 limit_count = 1) const;
+        InventoryResult CanEquipUniqueItem(ItemPrototype const* itemProto, uint8 except_slot = NULL_SLOT, uint32 limit_count = 1) const;
+        InventoryResult CanEquipMoreJewelcraftingGems(uint32 count, uint8 except_slot) const;
+        InventoryResult CanUnequipItems(uint32 item, uint32 count) const;
+        InventoryResult CanUnequipItem(uint16 src, bool swap) const;
+        InventoryResult CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, Item *pItem, bool swap, bool not_loading = true) const;
         InventoryResult CanUseItem(Item *pItem, bool direct_action = true) const;
         bool HasItemTotemCategory(uint32 TotemCategory) const;
         InventoryResult CanUseItem(ItemPrototype const *pItem) const;
-        InventoryResult CanUseAmmo( uint32 item ) const;
-        Item* StoreNewItem( ItemPosCountVec const& pos, uint32 item, bool update,int32 randomPropertyId = 0 );
-        Item* StoreItem( ItemPosCountVec const& pos, Item *pItem, bool update );
-        Item* EquipNewItem( uint16 pos, uint32 item, bool update );
-        Item* EquipItem( uint16 pos, Item *pItem, bool update );
+        InventoryResult CanUseAmmo(uint32 item) const;
+        Item* StoreNewItem(ItemPosCountVec const& pos, uint32 item, bool update,int32 randomPropertyId = 0, AllowedLooterSet* allowedLooters = NULL);
+        Item* StoreItem(ItemPosCountVec const& pos, Item *pItem, bool update);
+        Item* EquipNewItem(uint16 pos, uint32 item, bool update);
+        Item* EquipItem(uint16 pos, Item *pItem, bool update);
         void AutoUnequipOffhandIfNeed();
         bool StoreNewItemInBestSlots(uint32 item_id, uint32 item_count);
         Item* StoreNewItemInInventorySlot(uint32 itemEntry, uint32 amount);
 
-        void AutoStoreLoot(uint32 loot_id, LootStore const& store, bool broadcast = false, uint8 bag = NULL_BAG, uint8 slot = NULL_SLOT);
+        void AutoStoreLoot(WorldObject const* lootTarget, uint32 loot_id, LootStore const& store, bool broadcast = false, uint8 bag = NULL_BAG, uint8 slot = NULL_SLOT);
         void AutoStoreLoot(Loot& loot, bool broadcast = false, uint8 bag = NULL_BAG, uint8 slot = NULL_SLOT);
 
         Item* ConvertItem(Item* item, uint32 newItemId);
 
         InventoryResult _CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count = NULL) const;
-        InventoryResult _CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 entry, uint32 count, Item *pItem = NULL, bool swap = false, uint32* no_space_count = NULL ) const;
+        InventoryResult _CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 entry, uint32 count, Item *pItem = NULL, bool swap = false, uint32* no_space_count = NULL) const;
 
-        void ApplyEquipCooldown( Item * pItem );
-        void SetAmmo( uint32 item );
+        void ApplyEquipCooldown(Item * pItem);
+        void SetAmmo(uint32 item);
         void RemoveAmmo();
         float GetAmmoDPS() const { return m_ammoDPS; }
         bool CheckAmmoCompatibility(const ItemPrototype *ammo_proto) const;
-        void QuickEquipItem( uint16 pos, Item *pItem);
-        void VisualizeItem( uint8 slot, Item *pItem);
+        void QuickEquipItem(uint16 pos, Item *pItem);
+        void VisualizeItem(uint8 slot, Item *pItem);
         void SetVisibleItemSlot(uint8 slot, Item *pItem);
-        Item* BankItem( ItemPosCountVec const& dest, Item *pItem, bool update )
+        Item* BankItem(ItemPosCountVec const& dest, Item *pItem, bool update)
         {
-            return StoreItem( dest, pItem, update);
+            return StoreItem(dest, pItem, update);
         }
-        Item* BankItem(uint16 pos, Item *pItem, bool update);
-        void RemoveItem(uint8 bag, uint8 slot, bool update);// see ApplyItemOnStoreSpell notes
+        void RemoveItem(uint8 bag, uint8 slot, bool update);
         void MoveItemFromInventory(uint8 bag, uint8 slot, bool update);
                                                             // in trade, auction, guild bank, mail....
         void MoveItemToInventory(ItemPosCountVec const& dest, Item* pItem, bool update, bool in_characterInventoryDB = false);
                                                             // in trade, guild bank, mail....
-        void RemoveItemDependentAurasAndCasts( Item * pItem );
-        void DestroyItem( uint8 bag, uint8 slot, bool update );
+        void RemoveItemDependentAurasAndCasts(Item * pItem);
+        void DestroyItem(uint8 bag, uint8 slot, bool update);
         void DestroyItemCount(uint32 item, uint32 count, bool update, bool unequip_check = false, bool inBankAlso = false);
-        void DestroyItemCount( Item* item, uint32& count, bool update );
-        void DestroyConjuredItems( bool update );
-        void DestroyZoneLimitedItem( bool update, uint32 new_zone );
-        void SplitItem( uint16 src, uint16 dst, uint32 count );
-        void SwapItem( uint16 src, uint16 dst );
-        void AddItemToBuyBackSlot( Item *pItem );
-        Item* GetItemFromBuyBackSlot( uint32 slot );
-        void RemoveItemFromBuyBackSlot( uint32 slot, bool del );
+        void DestroyItemCount(Item* item, uint32& count, bool update);
+        void DestroyConjuredItems(bool update);
+        void DestroyZoneLimitedItem(bool update, uint32 new_zone);
+        void SplitItem(uint16 src, uint16 dst, uint32 count);
+        void SwapItem(uint16 src, uint16 dst);
+        void AddItemToBuyBackSlot(Item *pItem);
+        Item* GetItemFromBuyBackSlot(uint32 slot);
+        void RemoveItemFromBuyBackSlot(uint32 slot, bool del);
 
         void TakeExtendedCost(uint32 extendedCostId, uint32 count);
 
         uint32 GetMaxKeyringSize() const { return KEYRING_SLOT_END-KEYRING_SLOT_START; }
-        void SendEquipError( InventoryResult msg, Item* pItem, Item *pItem2 = NULL, uint32 itemid = 0 ) const;
-        void SendBuyError( BuyResult msg, Creature* pCreature, uint32 item, uint32 param );
-        void SendSellError( SellResult msg, Creature* pCreature, ObjectGuid itemGuid, uint32 param );
+        void SendEquipError(InventoryResult msg, Item* pItem, Item *pItem2 = NULL, uint32 itemid = 0) const;
+        void SendBuyError(BuyResult msg, Creature* pCreature, uint32 item, uint32 param);
+        void SendSellError(SellResult msg, Creature* pCreature, ObjectGuid itemGuid, uint32 param);
         void AddWeaponProficiency(uint32 newflag) { m_WeaponProficiency |= newflag; }
         void AddArmorProficiency(uint32 newflag) { m_ArmorProficiency |= newflag; }
         uint32 GetWeaponProficiency() const { return m_WeaponProficiency; }
@@ -1271,17 +1311,27 @@ class MANGOS_DLL_SPEC Player : public Unit
             Item* mainItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
             return offItem && ((mainItem && mainItem->GetProto()->InventoryType == INVTYPE_2HWEAPON) || offItem->GetProto()->InventoryType == INVTYPE_2HWEAPON);
         }
-        void SendNewItem( Item *item, uint32 count, bool received, bool created, bool broadcast = false );
+        bool IsUsingEquippedWeapon(bool mainhand) const
+        {
+            return !IsInFeralForm() && (!mainhand || !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISARMED));
+        }
+        void SendNewItem(Item* item, uint32 count, bool received, bool created, bool broadcast = false);
+        bool _StoreOrEquipNewItem(uint32 vendorSlot, uint32 item, uint8 count, uint8 bag, uint8 slot, int32 price, ItemPrototype const* pProto, Creature* pVendor, VendorItem const* crItem, bool store);
         bool BuyItemFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorslot, uint32 item, uint8 count, uint8 bag, uint8 slot);
 
-        float GetReputationPriceDiscount( Creature const* pCreature ) const;
+        float GetReputationPriceDiscount(Creature const* pCreature) const;
 
         Player* GetTrader() const { return m_trade ? m_trade->GetTrader() : NULL; }
         TradeData* GetTradeData() const { return m_trade; }
         void TradeCancel(bool sendback);
 
         void UpdateEnchantTime(uint32 time);
-        void UpdateItemDuration(uint32 time, bool realtimeonly=false);
+
+        void AddItemWithTimeCheck(uint32 lowGuid);
+        void RemoveItemWithTimeCheck(uint32 lowGuid);
+        void UpdateItemsWithTimeCheck();
+
+        void UpdateItemDuration(uint32 time, bool realtimeonly = false);
         void AddEnchantmentDurations(Item *item);
         void RemoveEnchantmentDurations(Item *item);
         void RemoveAllEnchantments(EnchantmentSlot slot);
@@ -1321,9 +1371,9 @@ class MANGOS_DLL_SPEC Player : public Unit
         // Return player level when QuestLevel is dynamic (-1)
         uint32 GetQuestLevelForPlayer(Quest const* pQuest) const { return pQuest && (pQuest->GetQuestLevel() > 0) ? (uint32)pQuest->GetQuestLevel() : getLevel(); }
 
-        void PrepareQuestMenu(ObjectGuid guid );
+        void PrepareQuestMenu(ObjectGuid guid);
         void SendPreparedQuest(ObjectGuid guid);
-        bool IsActiveQuest( uint32 quest_id ) const;        // can be taken or taken
+        bool IsActiveQuest(uint32 quest_id) const;        // can be taken or taken
 
         // Quest is taken and not yet rewarded
         // if completed_or_not = 0 (or any other value except 1 or 2) - returns true, if quest is taken and doesn't depend if quest is completed or not
@@ -1331,50 +1381,50 @@ class MANGOS_DLL_SPEC Player : public Unit
         // if completed_or_not = 2 - returns true, if quest is taken and already completed
         bool IsCurrentQuest(uint32 quest_id, uint8 completed_or_not = 0) const; // taken and not yet rewarded
 
-        Quest const *GetNextQuest(ObjectGuid guid, Quest const *pQuest );
-        bool CanSeeStartQuest( Quest const *pQuest ) const;
-        bool CanTakeQuest( Quest const *pQuest, bool msg ) const;
-        bool CanAddQuest( Quest const *pQuest, bool msg ) const;
-        bool CanCompleteQuest( uint32 quest_id ) const;
+        Quest const *GetNextQuest(ObjectGuid guid, Quest const *pQuest);
+        bool CanSeeStartQuest(Quest const *pQuest) const;
+        bool CanTakeQuest(Quest const *pQuest, bool msg) const;
+        bool CanAddQuest(Quest const *pQuest, bool msg) const;
+        bool CanCompleteQuest(uint32 quest_id) const;
         bool CanCompleteRepeatableQuest(Quest const *pQuest) const;
-        bool CanRewardQuest( Quest const *pQuest, bool msg ) const;
-        bool CanRewardQuest( Quest const *pQuest, uint32 reward, bool msg ) const;
-        void AddQuest( Quest const *pQuest, Object *questGiver );
-        void CompleteQuest( uint32 quest_id );
-        void IncompleteQuest( uint32 quest_id );
-        void RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver, bool announce = true);
-
-        void FailQuest( uint32 quest_id );
+        bool CanRewardQuest(Quest const *pQuest, bool msg) const;
+        bool CanRewardQuest(Quest const *pQuest, uint32 reward, bool msg) const;
+        void AddQuest(Quest const *pQuest, Object *questGiver);
+        void CompleteQuest(uint32 quest_id);
+        void IncompleteQuest(uint32 quest_id);
+        void RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, bool announce = true);
+
+        void FailQuest(uint32 quest_id);
         bool SatisfyQuestSkill(Quest const* qInfo, bool msg) const;
-        bool SatisfyQuestLevel( Quest const* qInfo, bool msg ) const;
-        bool SatisfyQuestLog( bool msg ) const;
-        bool SatisfyQuestPreviousQuest( Quest const* qInfo, bool msg ) const;
+        bool SatisfyQuestLevel(Quest const* qInfo, bool msg) const;
+        bool SatisfyQuestLog(bool msg) const;
+        bool SatisfyQuestPreviousQuest(Quest const* qInfo, bool msg) const;
         bool SatisfyQuestClass(Quest const* qInfo, bool msg) const;
-        bool SatisfyQuestRace( Quest const* qInfo, bool msg ) const;
-        bool SatisfyQuestReputation( Quest const* qInfo, bool msg ) const;
-        bool SatisfyQuestStatus( Quest const* qInfo, bool msg ) const;
-        bool SatisfyQuestTimed( Quest const* qInfo, bool msg ) const;
-        bool SatisfyQuestExclusiveGroup( Quest const* qInfo, bool msg ) const;
-        bool SatisfyQuestNextChain( Quest const* qInfo, bool msg ) const;
-        bool SatisfyQuestPrevChain( Quest const* qInfo, bool msg ) const;
-        bool SatisfyQuestDay( Quest const* qInfo, bool msg ) const;
-        bool SatisfyQuestWeek( Quest const* qInfo, bool msg ) const;
+        bool SatisfyQuestRace(Quest const* qInfo, bool msg) const;
+        bool SatisfyQuestReputation(Quest const* qInfo, bool msg) const;
+        bool SatisfyQuestStatus(Quest const* qInfo, bool msg) const;
+        bool SatisfyQuestTimed(Quest const* qInfo, bool msg) const;
+        bool SatisfyQuestExclusiveGroup(Quest const* qInfo, bool msg) const;
+        bool SatisfyQuestNextChain(Quest const* qInfo, bool msg) const;
+        bool SatisfyQuestPrevChain(Quest const* qInfo, bool msg) const;
+        bool SatisfyQuestDay(Quest const* qInfo, bool msg) const;
+        bool SatisfyQuestWeek(Quest const* qInfo, bool msg) const;
         bool SatisfyQuestMonth(Quest const* qInfo, bool msg) const;
-        bool CanGiveQuestSourceItemIfNeed( Quest const *pQuest, ItemPosCountVec* dest = NULL) const;
+        bool CanGiveQuestSourceItemIfNeed(Quest const *pQuest, ItemPosCountVec* dest = NULL) const;
         void GiveQuestSourceItemIfNeed(Quest const *pQuest);
-        bool TakeQuestSourceItem( uint32 quest_id, bool msg );
-        bool GetQuestRewardStatus( uint32 quest_id ) const;
-        QuestStatus GetQuestStatus( uint32 quest_id ) const;
-        void SetQuestStatus( uint32 quest_id, QuestStatus status );
+        bool TakeQuestSourceItem(uint32 quest_id, bool msg);
+        bool GetQuestRewardStatus(uint32 quest_id) const;
+        QuestStatus GetQuestStatus(uint32 quest_id) const;
+        void SetQuestStatus(uint32 quest_id, QuestStatus status);
 
-        void SetDailyQuestStatus( uint32 quest_id );
-        void SetWeeklyQuestStatus( uint32 quest_id );
+        void SetDailyQuestStatus(uint32 quest_id);
+        void SetWeeklyQuestStatus(uint32 quest_id);
         void SetMonthlyQuestStatus(uint32 quest_id);
         void ResetDailyQuestStatus();
         void ResetWeeklyQuestStatus();
         void ResetMonthlyQuestStatus();
 
-        uint16 FindQuestSlot( uint32 quest_id ) const;
+        uint16 FindQuestSlot(uint32 quest_id) const;
         uint32 GetQuestSlotQuestId(uint16 slot) const { return GetUInt32Value(PLAYER_QUEST_LOG_1_1 + slot * MAX_QUEST_OFFSET + QUEST_ID_OFFSET); }
         void SetQuestSlot(uint16 slot, uint32 quest_id, uint32 timer = 0)
         {
@@ -1406,28 +1456,28 @@ class MANGOS_DLL_SPEC Player : public Unit
             }
         }
         uint32 GetReqKillOrCastCurrentCount(uint32 quest_id, int32 entry);
-        void AreaExploredOrEventHappens( uint32 questId );
-        void GroupEventHappens( uint32 questId, WorldObject const* pEventObject );
-        void ItemAddedQuestCheck( uint32 entry, uint32 count );
-        void ItemRemovedQuestCheck( uint32 entry, uint32 count );
-        void KilledMonster( CreatureInfo const* cInfo, ObjectGuid guid );
-        void KilledMonsterCredit( uint32 entry, ObjectGuid guid = ObjectGuid());
-        void CastedCreatureOrGO( uint32 entry, ObjectGuid guid, uint32 spell_id, bool original_caster = true );
-        void TalkedToCreature( uint32 entry, ObjectGuid guid );
-        void MoneyChanged( uint32 value );
-        void ReputationChanged(FactionEntry const* factionEntry );
-        bool HasQuestForItem( uint32 itemid ) const;
+        void AreaExploredOrEventHappens(uint32 questId);
+        void GroupEventHappens(uint32 questId, WorldObject const* pEventObject);
+        void ItemAddedQuestCheck(uint32 entry, uint32 count);
+        void ItemRemovedQuestCheck(uint32 entry, uint32 count);
+        void KilledMonster(CreatureInfo const* cInfo, ObjectGuid guid);
+        void KilledMonsterCredit(uint32 entry, ObjectGuid guid = ObjectGuid());
+        void CastedCreatureOrGO(uint32 entry, ObjectGuid guid, uint32 spell_id, bool original_caster = true);
+        void TalkedToCreature(uint32 entry, ObjectGuid guid);
+        void MoneyChanged(uint32 value);
+        void ReputationChanged(FactionEntry const* factionEntry);
+        bool HasQuestForItem(uint32 itemid) const;
         bool HasQuestForGO(int32 GOId) const;
         void UpdateForQuestWorldObjects();
         bool CanShareQuest(uint32 quest_id) const;
 
         void SendQuestCompleteEvent(uint32 quest_id);
-        void SendQuestReward( Quest const *pQuest, uint32 XP, Object* questGiver );
-        void SendQuestFailed( uint32 quest_id, InventoryResult reason = EQUIP_ERR_OK);
-        void SendQuestTimerFailed( uint32 quest_id );
-        void SendCanTakeQuestResponse( uint32 msg ) const;
+        void SendQuestReward(Quest const *pQuest, uint32 XP, Object* questGiver);
+        void SendQuestFailed(uint32 quest_id, InventoryResult reason = EQUIP_ERR_OK);
+        void SendQuestTimerFailed(uint32 quest_id);
+        void SendCanTakeQuestResponse(uint32 msg) const;
         void SendQuestConfirmAccept(Quest const* pQuest, Player* pReceiver);
-        void SendPushToPartyResponse( Player *pPlayer, uint32 msg );
+        void SendPushToPartyResponse(Player *pPlayer, uint32 msg);
         void SendQuestUpdateAddCreatureOrGo(Quest const* pQuest, ObjectGuid guid, uint32 creatureOrGO_idx, uint32 count);
 
         ObjectGuid GetDividerGuid() const { return m_dividerGuid; }
@@ -1436,16 +1486,22 @@ class MANGOS_DLL_SPEC Player : public Unit
 
         uint32 GetInGameTime() { return m_ingametime; }
 
-        void SetInGameTime( uint32 time ) { m_ingametime = time; }
+        void SetInGameTime(uint32 time) { m_ingametime = time; }
+        void AddTimedQuest(uint32 quest_id) { m_timedquests.insert(quest_id); }
+        void RemoveTimedQuest(uint32 quest_id) { m_timedquests.erase(quest_id); }
+        void MakeTalentGlyphLink(std::ostringstream &out);
 
-        void AddTimedQuest( uint32 quest_id ) { m_timedquests.insert(quest_id); }
-        void RemoveTimedQuest( uint32 quest_id ) { m_timedquests.erase(quest_id); }
+        void chompAndTrim(std::string& str);
+        bool getNextQuestId(const std::string& pString, unsigned int& pStartPos, unsigned int& pId);
+        void skill(std::list<uint32>& m_spellsToLearn);
+        bool requiredQuests(const char* pQuestIdString);
 
         /*********************************************************/
         /***                   LOAD SYSTEM                     ***/
         /*********************************************************/
 
         bool LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder);
+        bool MinimalLoadFromDB(QueryResult *result, uint32 guid);
 
         static uint32 GetZoneIdFromDB(ObjectGuid guid);
         static uint32 GetLevelFromDB(ObjectGuid guid);
@@ -1473,9 +1529,9 @@ class MANGOS_DLL_SPEC Player : public Unit
 
         void SetBindPoint(ObjectGuid guid);
         void SendTalentWipeConfirm(ObjectGuid guid);
-        void RewardRage( uint32 damage, uint32 weaponSpeedHitFactor, bool attacker );
+        void RewardRage(uint32 damage, uint32 weaponSpeedHitFactor, bool attacker);
         void SendPetSkillWipeConfirm();
-        void CalcRage( uint32 damage,bool attacker );
+        void CalcRage(uint32 damage,bool attacker);
         void RegenerateAll(uint32 diff = REGEN_TIME_FULL);
         void Regenerate(Powers power, uint32 diff);
         void RegenerateHealth(uint32 diff);
@@ -1483,35 +1539,34 @@ class MANGOS_DLL_SPEC Player : public Unit
         void setWeaponChangeTimer(uint32 time) {m_weaponChangeTimer = time;}
 
         uint32 GetMoney() const { return GetUInt32Value (PLAYER_FIELD_COINAGE); }
-        void ModifyMoney( int32 d )
+        void ModifyMoney(int32 d)
         {
-            if(d < 0)
+            if (d < 0)
                 SetMoney (GetMoney() > uint32(-d) ? GetMoney() + d : 0);
             else
                 SetMoney (GetMoney() < uint32(MAX_MONEY_AMOUNT - d) ? GetMoney() + d : MAX_MONEY_AMOUNT);
 
             // "At Gold Limit"
-            if(GetMoney() >= MAX_MONEY_AMOUNT)
+            if (GetMoney() >= MAX_MONEY_AMOUNT)
                 SendEquipError(EQUIP_ERR_TOO_MUCH_GOLD,NULL,NULL);
         }
-        void SetMoney( uint32 value )
+        void SetMoney(uint32 value)
         {
             SetUInt32Value (PLAYER_FIELD_COINAGE, value);
-            MoneyChanged( value );
+            MoneyChanged(value);
             UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_GOLD_VALUE_OWNED);
         }
 
-        QuestStatusMap& getQuestStatusMap() { return mQuestStatus; };
+        QuestStatusMap const& GetQuestStatusMap() { return mQuestStatus; };
+        QuestStatusData* GetQuestStatusData(uint32 questId);
 
-        ObjectGuid const& GetSelectionGuid( ) const { return m_curSelectionGuid; }
+        ObjectGuid const& GetSelectionGuid() const { return m_curSelectionGuid; }
         void SetSelectionGuid(ObjectGuid guid) { m_curSelectionGuid = guid; SetTargetGuid(guid); }
 
-        uint8 GetComboPoints() const { return m_comboPoints; }
-        ObjectGuid const& GetComboTargetGuid() const { return m_comboTargetGuid; }
+        void SendComboPoints(ObjectGuid targetGuid, uint8 combopoints);
+        void SendPetComboPoints(Unit* pet, ObjectGuid targetGuid, uint8 combopoints);
 
-        void AddComboPoints(Unit* target, int8 count);
-        void ClearComboPoints();
-        void SendComboPoints();
+        void SendCalendarResult(CalendarResponseResult result, std::string str);
 
         void SendMailResult(uint32 mailId, MailResponseType mailAction, MailResponseResult mailError, uint32 equipError = 0, uint32 item_guid = 0, uint32 item_count = 0);
         void SendNewMail();
@@ -1546,7 +1601,7 @@ class MANGOS_DLL_SPEC Player : public Unit
 
         void AddMItem(Item* it)
         {
-            MANGOS_ASSERT( it );
+            MANGOS_ASSERT(it);
             //ASSERT deleted, because items can be added before loading
             mMitems[it->GetGUIDLow()] = it;
         }
@@ -1560,6 +1615,7 @@ class MANGOS_DLL_SPEC Player : public Unit
         void SendPetGUIDs();
         void CharmSpellInitialize();
         void PossessSpellInitialize();
+        void VehicleSpellInitialize();
         void RemovePetActionBar();
 
         bool HasSpell(uint32 spell) const;
@@ -1567,6 +1623,7 @@ class MANGOS_DLL_SPEC Player : public Unit
         TrainerSpellState GetTrainerSpellState(TrainerSpell const* trainer_spell, uint32 reqLevel) const;
         bool IsSpellFitByClassAndRace(uint32 spell_id, uint32* pReqlevel = NULL) const;
         bool IsNeedCastPassiveLikeSpellAtLearn(SpellEntry const* spellInfo) const;
+        bool IsImmuneToSpell(SpellEntry const* spellInfo, bool isFriendly) const;
         bool IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex index) const;
 
         void SendProficiency(ItemClass itemClass, uint32 itemSubclassMask);
@@ -1617,39 +1674,20 @@ class MANGOS_DLL_SPEC Player : public Unit
         PlayerSpellMap const& GetSpellMap() const { return m_spells; }
         PlayerSpellMap      & GetSpellMap()       { return m_spells; }
 
-        SpellCooldowns const& GetSpellCooldownMap() const { return m_spellCooldowns; }
-
         PlayerTalent const* GetKnownTalentById(int32 talentId) const;
         SpellEntry const* GetKnownTalentRankById(int32 talentId) const;
 
         void AddSpellMod(Aura* aura, bool apply);
-        template <class T> T ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue, Spell const* spell = NULL);
+        template <class T> T ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue);
 
-        static uint32 const infinityCooldownDelay = MONTH;  // used for set "infinity cooldowns" for spells and check
-        static uint32 const infinityCooldownDelayCheck = MONTH/2;
-        bool HasSpellCooldown(uint32 spell_id) const
-        {
-            SpellCooldowns::const_iterator itr = m_spellCooldowns.find(spell_id);
-            return itr != m_spellCooldowns.end() && itr->second.end > time(NULL);
-        }
-        time_t GetSpellCooldownDelay(uint32 spell_id) const
-        {
-            SpellCooldowns::const_iterator itr = m_spellCooldowns.find(spell_id);
-            time_t t = time(NULL);
-            return itr != m_spellCooldowns.end() && itr->second.end > t ? itr->second.end - t : 0;
-        }
-        void AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 itemId, Spell* spell = NULL, bool infinityCooldown = false );
-        void AddSpellCooldown(uint32 spell_id, uint32 itemid, time_t end_time);
-        void SendCooldownEvent(SpellEntry const *spellInfo, uint32 itemId = 0, Spell* spell = NULL);
-        void ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs );
-        void RemoveSpellCooldown(uint32 spell_id, bool update = false);
-        void RemoveSpellCategoryCooldown(uint32 cat, bool update = false);
-        void SendClearCooldown( uint32 spell_id, Unit* target );
+        void SendCooldownEvent(SpellEntry const *spellInfo, uint32 itemId = 0);
+        void ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs);
+        void SendClearCooldown(uint32 spell_id, Unit* target);
+        void SendModifyCooldown(uint32 spell_id, int32 delta);
 
         GlobalCooldownMgr& GetGlobalCooldownMgr() { return m_GlobalCooldownMgr; }
 
         void RemoveArenaSpellCooldowns();
-        void RemoveAllSpellCooldown();
         void _LoadSpellCooldowns(QueryResult *result);
         void _SaveSpellCooldowns();
         void SetLastPotionId(uint32 item_id) { m_lastPotionId = item_id; }
@@ -1677,13 +1715,14 @@ class MANGOS_DLL_SPEC Player : public Unit
         static bool IsActionButtonDataValid(uint8 button, uint32 action, uint8 type, Player* player, bool msg = true);
         ActionButton* addActionButton(uint8 spec, uint8 button, uint32 action, uint8 type);
         void removeActionButton(uint8 spec, uint8 button);
-        void SendInitialActionButtons() const;
+        void SendActionButtons(uint32 state) const;
+        void SendInitialActionButtons() const { SendActionButtons(1); }
         void SendLockActionButtons() const;
         ActionButton const* GetActionButton(uint8 button);
 
         PvPInfo pvpInfo;
-        void UpdatePvP(bool state, bool ovrride=false);
-        void UpdateZone(uint32 newZone,uint32 newArea);
+        void UpdatePvP(bool state, bool bOverride = false);
+        void UpdateZone(uint32 newZone, uint32 newArea);
         void UpdateArea(uint32 newArea);
         uint32 GetCachedZoneId() const { return m_zoneUpdateId; }
 
@@ -1712,10 +1751,9 @@ class MANGOS_DLL_SPEC Player : public Unit
 
         bool IsGroupVisibleFor(Player* p) const;
         bool IsInSameGroupWith(Player const* p) const;
-        bool IsInSameRaidWith(Player const* p) const { return p==this || (GetGroup() != NULL && GetGroup() == p->GetGroup()); }
+        bool IsInSameRaidWith(Player const* p) const { return p == this || (GetGroupGuid() && GetGroupGuid() == p->GetGroupGuid()); }
         void UninviteFromGroup();
-        static void RemoveFromGroup(Group* group, ObjectGuid guid);
-        void RemoveFromGroup() { RemoveFromGroup(GetGroup(), GetObjectGuid()); }
+        void RemoveFromGroup(bool logout = false);
         void SendUpdateToOutOfRangeGroupMembers();
         void SetAllowLowLevelRaid(bool allow) { ApplyModFlag(PLAYER_FLAGS, PLAYER_FLAGS_ENABLE_LOW_LEVEL_RAID, allow); }
         bool GetAllowLowLevelRaid() const { return HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_ENABLE_LOW_LEVEL_RAID); }
@@ -1747,11 +1785,13 @@ class MANGOS_DLL_SPEC Player : public Unit
         uint32 GetArenaTeamIdInvited() { return m_ArenaTeamIdInvited; }
         static void LeaveAllArenaTeams(ObjectGuid guid);
 
-        Difficulty GetDifficulty(bool isRaid) const { return isRaid ? m_raidDifficulty : m_dungeonDifficulty; }
-        Difficulty GetDungeonDifficulty() const { return m_dungeonDifficulty; }
-        Difficulty GetRaidDifficulty() const { return m_raidDifficulty; }
-        void SetDungeonDifficulty(Difficulty dungeon_difficulty) { m_dungeonDifficulty = dungeon_difficulty; }
-        void SetRaidDifficulty(Difficulty raid_difficulty) { m_raidDifficulty = raid_difficulty; }
+        Difficulty GetDifficulty(bool isRaid) const { return isRaid ? GetRaidDifficulty() : GetDungeonDifficulty(); }
+        uint32 GetDifficulty() const { return m_Difficulty; }
+        Difficulty GetDungeonDifficulty() const { return Difficulty(m_Difficulty & 0x00FF); }
+        Difficulty GetRaidDifficulty() const { return Difficulty((m_Difficulty & 0xFF00) >> 8);}
+
+        void SetDungeonDifficulty(Difficulty difficulty) { m_Difficulty = (m_Difficulty & 0xFF00) | uint32(difficulty); }
+        void SetRaidDifficulty(Difficulty difficulty) { m_Difficulty = (m_Difficulty & 0x00FF) | (uint32(difficulty) << 8); }
 
         bool UpdateSkill(uint32 skill_id, uint32 step);
         bool UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step);
@@ -1812,6 +1852,7 @@ class MANGOS_DLL_SPEC Player : public Unit
         void UpdateArmorPenetration();
         void ApplyManaRegenBonus(int32 amount, bool apply);
         void UpdateManaRegen();
+        void ApplyHealthRegenBonus(int32 amount, bool apply);
 
         ObjectGuid const& GetLootGuid() const { return m_lootGuid; }
         void SetLootGuid(ObjectGuid const& guid) { m_lootGuid = guid; }
@@ -1821,9 +1862,9 @@ class MANGOS_DLL_SPEC Player : public Unit
         WorldSession* GetSession() const { return m_session; }
         void SetSession(WorldSession *s) { m_session = s; }
 
-        void BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const;
-        void DestroyForPlayer( Player *target, bool anim = false ) const;
-        void SendLogXPGain(uint32 GivenXP,Unit* victim,uint32 RestXP);
+        void BuildCreateUpdateBlockForPlayer(UpdateData *data, Player *target) const;
+        void DestroyForPlayer(Player *target, bool anim = false) const;
+        void SendLogXPGain(uint32 GivenXP,Unit* victim,uint32 BonusXP, bool ReferAFriend);
 
         uint8 LastSwingErrorMsg() const { return m_swingErrorMsg; }
         void SwingErrorMsg(uint8 val) { m_swingErrorMsg = val; }
@@ -1844,20 +1885,20 @@ class MANGOS_DLL_SPEC Player : public Unit
         void SendResetInstanceFailed(uint32 reason, uint32 MapId);
         void SendResetFailedNotify(uint32 mapid);
 
-        bool SetPosition(float x, float y, float z, float orientation, bool teleport = false);
-        void UpdateUnderwaterState( Map * m, float x, float y, float z );
+        bool SetPosition(Position const& pos, bool teleport = false);
+        void UpdateUnderwaterState(Map * m, float x, float y, float z);
 
-        void SendMessageToSet(WorldPacket *data, bool self);// overwrite Object::SendMessageToSet
-        void SendMessageToSetInRange(WorldPacket *data, float fist, bool self);
-                                                            // overwrite Object::SendMessageToSetInRange
-        void SendMessageToSetInRange(WorldPacket *data, float dist, bool self, bool own_team_only);
+        void SendMessageToSet(WorldPacket* data, bool self) const override;// overwrite Object::SendMessageToSet
+        void SendMessageToSetInRange(WorldPacket* data, float fist, bool self) const override;
+        // overwrite Object::SendMessageToSetInRange
+        void SendMessageToSetInRange(WorldPacket* data, float dist, bool self, bool own_team_only) const;
 
         Corpse *GetCorpse() const;
         void SpawnCorpseBones();
         Corpse* CreateCorpse();
         void KillPlayer();
         uint32 GetResurrectionSpellId();
-        void ResurrectPlayer(float restore_percent, bool applySickness = false);
+        void ResurrectPlayer(uint32 restorePercent, bool applySickness = false);
         void BuildPlayerRepop();
         void RepopAtGraveyard();
 
@@ -1877,13 +1918,15 @@ class MANGOS_DLL_SPEC Player : public Unit
             StopMirrorTimer(FIRE_TIMER);
         }
 
-        void SetMovement(PlayerMovementType pType);
+        void SetRoot(bool enable) override;
+        void SetWaterWalk(bool enable) override;
 
         void JoinedChannel(Channel *c);
         void LeftChannel(Channel *c);
         void CleanupChannels();
-        void UpdateLocalChannels( uint32 newZone );
+        void UpdateLocalChannels(uint32 newZone);
         void LeaveLFGChannel();
+        void JoinLFGChannel();
 
         void UpdateDefense();
         void UpdateWeaponSkill (WeaponAttackType attType);
@@ -1904,11 +1947,13 @@ class MANGOS_DLL_SPEC Player : public Unit
         bool IsBeingTeleported() const { return mSemaphoreTeleport_Near || mSemaphoreTeleport_Far; }
         bool IsBeingTeleportedNear() const { return mSemaphoreTeleport_Near; }
         bool IsBeingTeleportedFar() const { return mSemaphoreTeleport_Far; }
+        bool IsBeingTeleportedDelayEvent() const { return mSemaphoreTeleport_DelayEvent; }
         void SetSemaphoreTeleportNear(bool semphsetting) { mSemaphoreTeleport_Near = semphsetting; }
         void SetSemaphoreTeleportFar(bool semphsetting) { mSemaphoreTeleport_Far = semphsetting; }
+        void SetSemaphoreTeleportDelayEvent(bool semphsetting) { mSemaphoreTeleport_DelayEvent = semphsetting; }
         void ProcessDelayedOperations();
 
-        void CheckAreaExploreAndOutdoor(void);
+        void CheckAreaExploreAndOutdoor();
 
         static Team TeamForRace(uint8 race);
         Team GetTeam() const { return m_team; }
@@ -1951,9 +1996,9 @@ class MANGOS_DLL_SPEC Player : public Unit
 
         //End of PvP System
 
-        void SetDrunkValue(uint16 newDrunkValue, uint32 itemid=0);
-        uint16 GetDrunkValue() const { return m_drunk; }
-        static DrunkenState GetDrunkenstateByValue(uint16 value);
+        void SetDrunkValue(uint8 newDrunkValue, uint32 itemId = 0);
+        uint8 GetDrunkValue() const { return GetByteValue(PLAYER_BYTES_3, 1); }
+        static DrunkenState GetDrunkenstateByValue(uint8 value);
 
         uint32 GetDeathTimer() const { return m_deathTimer; }
         uint32 GetCorpseReclaimDelay(bool pvp) const;
@@ -2012,8 +2057,13 @@ class MANGOS_DLL_SPEC Player : public Unit
 
         void SendInitWorldStates(uint32 zone, uint32 area);
         void SendUpdateWorldState(uint32 Field, uint32 Value);
-        void SendDirectMessage(WorldPacket *data);
-        void FillBGWeekendWorldStates(WorldPacket& data, uint32& count);
+        void _SendUpdateWorldState(uint32 Field, uint32 Value);
+        void UpdateWorldState(uint32 state, uint32 value);
+        void SendUpdatedWorldStates(bool force = false);
+        time_t const& GetLastWorldStateUpdateTime() { return m_lastWSUpdateTime; };
+        void SetLastWorldStateUpdateTime(time_t _time)   { m_lastWSUpdateTime = _time; };
+
+        void SendDirectMessage(WorldPacket* data) const;
 
         void SendAurasForTarget(Unit *target);
 
@@ -2021,7 +2071,7 @@ class MANGOS_DLL_SPEC Player : public Unit
         std::vector<ItemSetEffect *> ItemSetEff;
 
         void SendLoot(ObjectGuid guid, LootType loot_type);
-        void SendLootRelease(ObjectGuid guid );
+        void SendLootRelease(ObjectGuid guid);
         void SendNotifyLootItemRemoved(uint8 lootSlot);
         void SendNotifyLootMoneyRemoved();
 
@@ -2115,7 +2165,7 @@ class MANGOS_DLL_SPEC Player : public Unit
             return false;
         }
         WorldLocation const& GetBattleGroundEntryPoint() const { return m_bgData.joinPos; }
-        void SetBattleGroundEntryPoint();
+        void SetBattleGroundEntryPoint(bool forLFG = false);
 
         void SetBGTeam(Team team) { m_bgData.bgTeam = team; m_bgData.m_needSave = true; }
         Team GetBGTeam() const { return m_bgData.bgTeam ? m_bgData.bgTeam : GetTeam(); }
@@ -2129,7 +2179,18 @@ class MANGOS_DLL_SPEC Player : public Unit
         bool GetBGAccessByLevel(BattleGroundTypeId bgTypeId) const;
         bool CanUseBattleGroundObject();
         bool isTotalImmune();
-        bool CanCaptureTowerPoint();
+
+        void SetRandomBGWinner(bool winner);
+        bool IsRandomBGWinner() { return m_isRandomBGWinner; }
+
+        /*********************************************************/
+        /***                 OUTDOOR PVP SYSTEM                ***/
+        /*********************************************************/
+
+        // returns true if the player is in active state for capture point capturing
+        bool CanUseCapturePoint();
+        bool IsOutdoorPvPActive();
+        virtual void HandleObjectiveComplete(Player* /*pPlayer*/) {};
 
         /*********************************************************/
         /***                    REST SYSTEM                    ***/
@@ -2154,12 +2215,26 @@ class MANGOS_DLL_SPEC Player : public Unit
         bool CanSpeak() const;
         void ChangeSpeakTime(int utime);
 
+        /*********************************************************/
+        /*** REFER-A-FRIEND SYSTEM ***/
+        /*********************************************************/
+        void SendReferFriendError(ReferAFriendError err, Player * target = NULL);
+        ReferAFriendError GetReferFriendError(Player * target, bool summon);
+        void AccessGrantableLevel(ObjectGuid guid) { m_curGrantLevelGiverGuid = guid; }
+        bool IsAccessGrantableLevel(ObjectGuid guid) { return m_curGrantLevelGiverGuid == guid; }
+        uint32 GetGrantableLevels() { return m_GrantableLevelsCount; }
+        void ChangeGrantableLevels(uint8 increase = 0);
+        bool CheckRAFConditions();
+        AccountLinkedState GetAccountLinkedState();
+        bool IsReferAFriendLinked(Player * target);
+        void LoadAccountLinkedState();
+
         /*********************************************************/
         /***                 VARIOUS SYSTEMS                   ***/
         /*********************************************************/
         bool HasMovementFlag(MovementFlags f) const;        // for script access to m_movementInfo.HasMovementFlag
         void UpdateFallInformationIfNeed(MovementInfo const& minfo,uint16 opcode);
-        void SetFallInformation(uint32 time, float z)
+        void SetFallInformation(uint32 time, float z) override
         {
             m_lastFallTime = time;
             m_lastFallZ = z;
@@ -2171,6 +2246,8 @@ class MANGOS_DLL_SPEC Player : public Unit
         bool isMoving() const { return m_movementInfo.HasMovementFlag(movementFlagsMask); }
         bool isMovingOrTurning() const { return m_movementInfo.HasMovementFlag(movementOrTurningFlagsMask); }
 
+        AntiCheat* GetAntiCheat() { return m_anticheat; }
+
         bool CanFly() const { return m_movementInfo.HasMovementFlag(MOVEFLAG_CAN_FLY); }
         bool IsFlying() const { return m_movementInfo.HasMovementFlag(MOVEFLAG_FLYING); }
         bool IsFreeFlying() const { return HasAuraType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED) || HasAuraType(SPELL_AURA_FLY); }
@@ -2180,55 +2257,42 @@ class MANGOS_DLL_SPEC Player : public Unit
         void SetMover(Unit* target) { m_mover = target ? target : this; }
         Unit* GetMover() const { return m_mover; }
         bool IsSelfMover() const { return m_mover == this; }// normal case for player not controlling other unit
+        void InterruptTaxiFlying();
 
         ObjectGuid const& GetFarSightGuid() const { return GetGuidValue(PLAYER_FARSIGHT); }
-
-        // Transports
-        Transport * GetTransport() const { return m_transport; }
-        void SetTransport(Transport * t) { m_transport = t; }
-
-        float GetTransOffsetX() const { return m_movementInfo.GetTransportPos()->x; }
-        float GetTransOffsetY() const { return m_movementInfo.GetTransportPos()->y; }
-        float GetTransOffsetZ() const { return m_movementInfo.GetTransportPos()->z; }
-        float GetTransOffsetO() const { return m_movementInfo.GetTransportPos()->o; }
-        uint32 GetTransTime() const { return m_movementInfo.GetTransportTime(); }
-        int8 GetTransSeat() const { return m_movementInfo.GetTransportSeat(); }
+        Camera* GetCamera() { return m_camera; }
+        void    SetViewPoint(WorldObject* target, bool immediate = false, bool update_far_sight_field = true);
+        bool    HasExternalViewPoint() const { return m_camera->GetBody() != (WorldObject*)this; };
 
         uint32 GetSaveTimer() const { return m_nextSave; }
         void   SetSaveTimer(uint32 timer) { m_nextSave = timer; }
 
         // Recall position
-        uint32 m_recallMap;
-        float  m_recallX;
-        float  m_recallY;
-        float  m_recallZ;
-        float  m_recallO;
+        WorldLocation m_recall;
         void   SaveRecallPosition();
 
-        void SetHomebindToLocation(WorldLocation const& loc, uint32 area_id);
-        void RelocateToHomebind() { SetLocationMapId(m_homebindMapId); Relocate(m_homebindX, m_homebindY, m_homebindZ); }
-        bool TeleportToHomebind(uint32 options = 0) { return TeleportTo(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, GetOrientation(), options); }
+        void SetHomebindToLocation(WorldLocation const& loc);
+        void RelocateToHomebind() { SetLocationMapId(m_homebind.GetMapId()); Relocate(m_homebind); }
+        bool TeleportToHomebind(uint32 options = TELE_TO_CHECKED) { return TeleportTo(m_homebind, options); }
 
         Object* GetObjectByTypeMask(ObjectGuid guid, TypeMask typemask);
 
-        // currently visible objects at player client
-        ObjectGuidSet m_clientGUIDs;
-
-        bool HaveAtClient(WorldObject const* u) { return u==this || m_clientGUIDs.find(u->GetObjectGuid())!=m_clientGUIDs.end(); }
+        // list of currently visible objects, stored at player client
+        GuidSet const& GetClientGuids() { return m_clientGUIDs; };
+        bool HaveAtClient(ObjectGuid const& guid) const;
+        void AddClientGuid(ObjectGuid const& guid);
+        void RemoveClientGuid(ObjectGuid const& guid);
+        bool HasClientGuid(ObjectGuid const& guid) const;
 
         bool IsVisibleInGridForPlayer(Player* pl) const;
         bool IsVisibleGloballyFor(Player* pl) const;
-
+        void BeforeVisibilityDestroy(WorldObject* obj);
         void UpdateVisibilityOf(WorldObject const* viewPoint, WorldObject* target);
-
-        template<class T>
-            void UpdateVisibilityOf(WorldObject const* viewPoint,T* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
+        void UpdateVisibilityOf(WorldObject const* viewPoint, WorldObject* target, UpdateData& data, WorldObjectSet& visibleNow);
 
         // Stealth detection system
         void HandleStealthedUnitsDetection();
 
-        Camera& GetCamera() { return m_camera; }
-
         virtual void SetPhaseMask(uint32 newPhaseMask, bool update);// overwrite Unit::SetPhaseMask
 
         uint8 m_forced_speed_changes[MAX_MOVE_TYPE];
@@ -2238,15 +2302,26 @@ class MANGOS_DLL_SPEC Player : public Unit
         void RemoveAtLoginFlag(AtLoginFlags f, bool in_db_also = false);
 
         // Temporarily removed pet cache
-        uint32 GetTemporaryUnsummonedPetNumber() const { return m_temporaryUnsummonedPetNumber; }
-        void SetTemporaryUnsummonedPetNumber(uint32 petnumber) { m_temporaryUnsummonedPetNumber = petnumber; }
-        void UnsummonPetTemporaryIfAny();
+        uint8 GetTemporaryUnsummonedPetCount() const { return m_temporaryUnsummonedPetNumber.size(); }
+        void SetTemporaryUnsummonedPetNumber(uint32 petnumber, uint8 count = 0) { m_temporaryUnsummonedPetNumber.insert(PetNumberList::value_type(count,petnumber)); }
+        uint32 GetTemporaryUnsummonedPetNumber(uint8 count = 0);
+        void ClearTemporaryUnsummonedPetStorage() { m_temporaryUnsummonedPetNumber.clear(); }
+        void UnsummonPetTemporaryIfAny(bool full = true);
         void ResummonPetTemporaryUnSummonedIfAny();
         bool IsPetNeedBeTemporaryUnsummoned() const { return !IsInWorld() || !isAlive() || IsMounted() /*+in flight*/; }
 
         void SendCinematicStart(uint32 CinematicSequenceId);
         void SendMovieStart(uint32 MovieId);
 
+        // select modelid depending on hair color or skin tone
+        uint32 GetModelForForm(SpellShapeshiftFormEntry const* ssEntry) const;
+
+        // wow armory begin
+        void CreateWowarmoryFeed(uint32 type, uint32 data, uint32 item_guid, uint32 item_quality);
+        void InitWowarmoryFeeds();
+        WowarmoryFeeds m_wowarmory_feeds;
+        // wow armory end
+
         /*********************************************************/
         /***                 INSTANCE SYSTEM                   ***/
         /*********************************************************/
@@ -2263,36 +2338,54 @@ class MANGOS_DLL_SPEC Player : public Unit
         BoundInstancesMap& GetBoundInstances(Difficulty difficulty) { return m_boundInstances[difficulty]; }
         void UnbindInstance(uint32 mapid, Difficulty difficulty, bool unload = false);
         void UnbindInstance(BoundInstancesMap::iterator &itr, Difficulty difficulty, bool unload = false);
-        InstancePlayerBind* BindToInstance(DungeonPersistentState *save, bool permanent, bool load = false);
+        void BindToInstance();
+        void SetPendingBind(DungeonPersistentState* save, uint32 bindTimer) { _pendingBind = save; _pendingBindTimer = bindTimer; }
+        bool HasPendingBind() const { return _pendingBind != NULL; }
+        InstancePlayerBind* BindToInstance(DungeonPersistentState *save, bool permanent, bool load = false, bool extend = false);
         void SendRaidInfo();
         void SendSavedInstances();
         static void ConvertInstancesToGroup(Player *player, Group *group = NULL, ObjectGuid player_guid = ObjectGuid());
         DungeonPersistentState* GetBoundInstanceSaveForSelfOrGroup(uint32 mapid);
 
+        AreaLockStatus GetAreaLockStatus(uint32 mapId, Difficulty difficulty);
+        AreaLockStatus GetAreaTriggerLockStatus(AreaTrigger const* at, Difficulty difficulty);
+        bool CanEnterToArea(uint32 mapId, Difficulty difficulty) { return GetAreaLockStatus(mapId, difficulty) == AREA_LOCKSTATUS_OK; };
+        bool CanUseAreaTrigger(AreaTrigger const* at, Difficulty difficulty) { return GetAreaTriggerLockStatus(at, difficulty) == AREA_LOCKSTATUS_OK; };
+        bool CheckTransferPossibility(uint32 mapId);
+        bool CheckTransferPossibility(AreaTrigger const*& at, bool b_onlyMainReq = false);
+
+        bool NeedEjectFromThisMap();
+
+        uint8 GetTalentsCount(uint8 tab);
+        void ResetTalentsCount() { m_cachedTC[0] = 0; m_cachedTC[1] = 0; m_cachedTC[2] = 0; }
+
         /*********************************************************/
         /***                   GROUP SYSTEM                    ***/
         /*********************************************************/
 
-        Group * GetGroupInvite() { return m_groupInvite; }
-        void SetGroupInvite(Group *group) { m_groupInvite = group; }
-        Group * GetGroup() { return m_group.getTarget(); }
-        const Group * GetGroup() const { return (const Group*)m_group.getTarget(); }
+        ObjectGuid const& GetGroupInvite() { return m_groupInviteGuid; }
+        void SetGroupInvite(ObjectGuid const& groupGuid) { m_groupInviteGuid = groupGuid; }
+        ObjectGuid const& GetGroupGuid() const { return m_groupGuid; };
+        ObjectGuid const& GetOriginalGroupGuid() const { return m_originalGroupGuid; };
+        Group* GetGroup();
+        Group const* GetGroup() const;
         GroupReference& GetGroupRef() { return m_group; }
-        void SetGroup(Group *group, int8 subgroup = -1);
+        void SetGroup(ObjectGuid const& groupGuid, int8 subgroup = -1);
         uint8 GetSubGroup() const { return m_group.getSubGroup(); }
         uint32 GetGroupUpdateFlag() const { return m_groupUpdateMask; }
         void SetGroupUpdateFlag(uint32 flag) { m_groupUpdateMask |= flag; }
         const uint64& GetAuraUpdateMask() const { return m_auraUpdateMask; }
         void SetAuraUpdateMask(uint8 slot) { m_auraUpdateMask |= (uint64(1) << slot); }
-        Player* GetNextRandomRaidMember(float radius);
+        Player* GetNextRandomRaidMember(float radius, bool onlyAlive);
         PartyResult CanUninviteFromGroup() const;
         // BattleGround Group System
-        void SetBattleGroundRaid(Group *group, int8 subgroup = -1);
+        void SetBattleGroundRaid(ObjectGuid const& guid, int8 subgroup = -1);
         void RemoveFromBattleGroundRaid();
-        Group * GetOriginalGroup() { return m_originalGroup.getTarget(); }
+        // Original group mechanic
+        Group* GetOriginalGroup();
         GroupReference& GetOriginalGroupRef() { return m_originalGroup; }
         uint8 GetOriginalSubGroup() const { return m_originalGroup.getSubGroup(); }
-        void SetOriginalGroup(Group *group, int8 subgroup = -1);
+        void SetOriginalGroup(ObjectGuid const& guid, int8 subgroup = -1);
 
         GridReference<Player> &GetGridRef() { return m_gridRef; }
         MapReference &GetMapRef() { return m_mapRef; }
@@ -2310,7 +2403,20 @@ class MANGOS_DLL_SPEC Player : public Unit
         void SetBaseRune(uint8 index, RuneType baseRune) { m_runes->runes[index].BaseRune = baseRune; }
         void SetCurrentRune(uint8 index, RuneType currentRune) { m_runes->runes[index].CurrentRune = currentRune; }
         void SetRuneCooldown(uint8 index, uint16 cooldown) { m_runes->runes[index].Cooldown = cooldown; m_runes->SetRuneState(index, (cooldown == 0) ? true : false); }
-        void ConvertRune(uint8 index, RuneType newType);
+        void ConvertRune(uint8 index, RuneType newType, uint32 spellid = 0);
+        void SetConvertedBy(uint8 index, uint32 spellid) { m_runes->runes[index].ConvertedBy = spellid; }
+        void ClearConvertedBy(uint8 index) { m_runes->runes[index].ConvertedBy = 0; }
+        bool IsRuneConvertedBy(uint8 index, uint32 spellid) { return m_runes->runes[index].ConvertedBy == spellid; }
+        void SetNeedConvertRune(uint8 index, bool convert, uint32 spellid = 0)
+        {
+            if (convert)
+                m_runes->needConvert |= (1 << index);                      // need convert
+            else
+                m_runes->needConvert &= ~(1 << index);                     // removed from convert
+
+            if (spellid != 0)
+                SetConvertedBy(index, spellid);
+        }
         bool ActivateRunes(RuneType type, uint32 count);
         void ResyncRunes();
         void AddRunePower(uint8 index);
@@ -2319,14 +2425,36 @@ class MANGOS_DLL_SPEC Player : public Unit
         AchievementMgr const& GetAchievementMgr() const { return m_achievementMgr; }
         AchievementMgr& GetAchievementMgr() { return m_achievementMgr; }
         void UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1=0, uint32 miscvalue2=0, Unit *unit=NULL, uint32 time=0);
+        void CompletedAchievement(AchievementEntry const* entry);
+        void CompletedAchievement(uint32 uiAchievementID);
         void StartTimedAchievementCriteria(AchievementCriteriaTypes type, uint32 timedRequirementId, time_t startTime = 0);
 
-
         bool HasTitle(uint32 bitIndex) const;
         bool HasTitle(CharTitlesEntry const* title) const { return HasTitle(title->bit_index); }
         void SetTitle(CharTitlesEntry const* title, bool lost = false);
 
         bool canSeeSpellClickOn(Creature const* creature) const;
+
+        // Playerbot mod:
+        // A Player can either have a playerbotMgr (to manage its bots), or have playerbotAI (if it is a bot), or
+        // neither. Code that enables bots must create the playerbotMgr and set it using SetPlayerbotMgr.
+        EquipmentSets& GetEquipmentSets() { return m_EquipmentSets; }
+        void SetPlayerbotAI(PlayerbotAI* ai) { assert(!m_playerbotAI && !m_playerbotMgr); m_playerbotAI=ai; }
+        PlayerbotAI* GetPlayerbotAI() { return m_playerbotAI; }
+        void SetPlayerbotMgr(PlayerbotMgr* mgr) { assert(!m_playerbotAI && !m_playerbotMgr); m_playerbotMgr=mgr; }
+        PlayerbotMgr* GetPlayerbotMgr() { return m_playerbotMgr; }
+        void SetBotDeathTimer() { m_deathTimer = 0; }
+        PlayerTalentMap& GetTalentMap(uint8 spec) { return m_talents[spec]; }
+
+		// Return collision height sent to client
+        float GetCollisionHeight(bool mounted);
+
+        // Parent objects (items currently) update system
+        virtual Object* GetDependentObject(ObjectGuid const& guid) override;
+        virtual GuidSet const* GetObjectsUpdateQueue() override { return &i_objectsToClientUpdate; };
+        virtual void AddUpdateObject(ObjectGuid const& guid) override;
+        virtual void RemoveUpdateObject(ObjectGuid const& guid) override;
+
     protected:
 
         uint32 m_contestedPvPTimer;
@@ -2347,6 +2475,8 @@ class MANGOS_DLL_SPEC Player : public Unit
         BgBattleGroundQueueID_Rec m_bgBattleGroundQueueID[PLAYER_MAX_BATTLEGROUND_QUEUES];
         BGData                    m_bgData;
 
+        bool m_isRandomBGWinner;
+
         /*********************************************************/
         /***                    QUEST SYSTEM                   ***/
         /*********************************************************/
@@ -2375,6 +2505,7 @@ class MANGOS_DLL_SPEC Player : public Unit
         void _LoadDailyQuestStatus(QueryResult *result);
         void _LoadWeeklyQuestStatus(QueryResult *result);
         void _LoadMonthlyQuestStatus(QueryResult *result);
+        void _LoadRandomBGStatus(QueryResult *result);
         void _LoadGroup(QueryResult *result);
         void _LoadSkills(QueryResult *result);
         void _LoadSpells(QueryResult *result);
@@ -2403,14 +2534,11 @@ class MANGOS_DLL_SPEC Player : public Unit
         void _SaveSkills();
         void _SaveSpells();
         void _SaveEquipmentSets();
-        void _SaveBGData();
+        void _SaveBGData(bool forceClean = false);
         void _SaveGlyphs();
         void _SaveTalents();
         void _SaveStats();
 
-        void _SetCreateBits(UpdateMask *updateMask, Player *target) const;
-        void _SetUpdateBits(UpdateMask *updateMask, Player *target) const;
-
         /*********************************************************/
         /***              ENVIRONMENTAL SYSTEM                 ***/
         /*********************************************************/
@@ -2432,8 +2560,8 @@ class MANGOS_DLL_SPEC Player : public Unit
         uint32 m_nextSave;
         time_t m_speakTime;
         uint32 m_speakCount;
-        Difficulty m_dungeonDifficulty;
-        Difficulty m_raidDifficulty;
+
+        uint32 m_Difficulty;                             // contains both dungeon (first byte) and raid (second byte) difficultyes of player. bytes 2,3 not used.
 
         uint32 m_atLoginFlags;
 
@@ -2446,9 +2574,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         uint32 m_ExtraFlags;
         ObjectGuid m_curSelectionGuid;
 
-        ObjectGuid m_comboTargetGuid;
-        int8 m_comboPoints;
-
         QuestStatusMap mQuestStatus;
 
         SkillStatusMap mSkillStatus;
@@ -2459,7 +2584,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         PlayerMails m_mail;
         PlayerSpellMap m_spells;
         PlayerTalentMap m_talents[MAX_TALENT_SPEC_COUNT];
-        SpellCooldowns m_spellCooldowns;
         uint32 m_lastPotionId;                              // last used health/mana potion in combat, that block next potion use
 
         GlobalCooldownMgr m_GlobalCooldownMgr;
@@ -2476,6 +2600,7 @@ class MANGOS_DLL_SPEC Player : public Unit
         uint16 m_baseSpellPower;
         uint16 m_baseFeralAP;
         uint16 m_baseManaRegen;
+        uint16 m_baseHealthRegen;
         float m_armorPenetrationPct;
         int32 m_spellPenetrationItemMod;
 
@@ -2502,16 +2627,18 @@ class MANGOS_DLL_SPEC Player : public Unit
         bool   m_MonthlyQuestChanged;
 
         uint32 m_drunkTimer;
-        uint16 m_drunk;
         uint32 m_weaponChangeTimer;
 
         uint32 m_zoneUpdateId;
         uint32 m_zoneUpdateTimer;
         uint32 m_areaUpdateId;
+        uint32 m_positionStatusUpdateTimer;
 
         uint32 m_deathTimer;
         time_t m_deathExpireTime;
 
+        time_t m_lastWSUpdateTime;
+
         uint32 m_restTime;
 
         uint32 m_WeaponProficiency;
@@ -2530,8 +2657,7 @@ class MANGOS_DLL_SPEC Player : public Unit
         RestType rest_type;
         ////////////////////Rest System/////////////////////
 
-        // Transports
-        Transport * m_transport;
+        AntiCheat* m_anticheat;
 
         uint32 m_resetTalentsCost;
         time_t m_resetTalentsTime;
@@ -2542,36 +2668,43 @@ class MANGOS_DLL_SPEC Player : public Unit
         PlayerSocial *m_social;
 
         // Groups
+        ObjectGuid m_groupInviteGuid;
+        ObjectGuid m_groupGuid;
         GroupReference m_group;
-        GroupReference m_originalGroup;
-        Group *m_groupInvite;
         uint32 m_groupUpdateMask;
         uint64 m_auraUpdateMask;
 
+        ObjectGuid m_originalGroupGuid;
+        GroupReference m_originalGroup;
+
         // Player summoning
         time_t m_summon_expire;
-        uint32 m_summon_mapid;
-        float  m_summon_x;
-        float  m_summon_y;
-        float  m_summon_z;
+        WorldLocation m_summon_loc;
 
-        DeclinedName *m_declinedname;
-        Runes *m_runes;
+        DeclinedName* m_declinedname;
+        Runes* m_runes;
         EquipmentSets m_EquipmentSets;
 
+        // Parent objects (items currently) update system
+        GuidSet i_objectsToClientUpdate;
+
+        // Refer-A-Friend
+        ObjectGuid m_curGrantLevelGiverGuid;
+        int32 m_GrantableLevelsCount;
+
         /// class dependent melee diminishing constant for dodge/parry/missed chances
         static const float m_diminishing_k[MAX_CLASSES];
 
     private:
         void _HandleDeadlyPoison(Unit* Target, WeaponAttackType attType, SpellEntry const *spellInfo);
         // internal common parts for CanStore/StoreItem functions
-        InventoryResult _CanStoreItem_InSpecificSlot( uint8 bag, uint8 slot, ItemPosCountVec& dest, ItemPrototype const *pProto, uint32& count, bool swap, Item *pSrcItem ) const;
-        InventoryResult _CanStoreItem_InBag( uint8 bag, ItemPosCountVec& dest, ItemPrototype const *pProto, uint32& count, bool merge, bool non_specialized, Item *pSrcItem, uint8 skip_bag, uint8 skip_slot ) const;
-        InventoryResult _CanStoreItem_InInventorySlots( uint8 slot_begin, uint8 slot_end, ItemPosCountVec& dest, ItemPrototype const *pProto, uint32& count, bool merge, Item *pSrcItem, uint8 skip_bag, uint8 skip_slot ) const;
-        Item* _StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, bool update );
+        InventoryResult _CanStoreItem_InSpecificSlot(uint8 bag, uint8 slot, ItemPosCountVec& dest, ItemPrototype const *pProto, uint32& count, bool swap, Item *pSrcItem) const;
+        InventoryResult _CanStoreItem_InBag(uint8 bag, ItemPosCountVec& dest, ItemPrototype const *pProto, uint32& count, bool merge, bool non_specialized, Item *pSrcItem, uint8 skip_bag, uint8 skip_slot) const;
+        InventoryResult _CanStoreItem_InInventorySlots(uint8 slot_begin, uint8 slot_end, ItemPosCountVec& dest, ItemPrototype const *pProto, uint32& count, bool merge, Item *pSrcItem, uint8 skip_bag, uint8 skip_slot) const;
+        Item* _StoreItem(uint16 pos, Item *pItem, uint32 count, bool clone, bool update);
 
         void UpdateKnownCurrencies(uint32 itemId, bool apply);
-        void AdjustQuestReqItemCount( Quest const* pQuest, QuestStatusData& questStatusData );
+        void AdjustQuestReqItemCount(Quest const* pQuest, QuestStatusData& questStatusData);
 
         void SetCanDelayTeleport(bool setting) { m_bCanDelayTeleport = setting; }
         bool IsHasDelayedTeleport() const
@@ -2596,22 +2729,31 @@ class MANGOS_DLL_SPEC Player : public Unit
 
         void _fillGearScoreData(Item* item, GearScoreVec* gearScore, uint32& twoHandScore);
 
-        Unit *m_mover;
-        Camera m_camera;
+        std::set<uint32> m_itemsWithTimeCheck;
+
+        void SendRefundInfo(Item* item);
+        void RefundItem(Item* item);
+
+        Unit* m_mover;
+        Camera* m_camera;
 
         GridReference<Player> m_gridRef;
         MapReference m_mapRef;
 
+        MapPtr m_mapPtr;
+
+        // Playerbot mod:
+        PlayerbotAI* m_playerbotAI;
+        PlayerbotMgr* m_playerbotMgr;
+
         // Homebind coordinates
-        uint32 m_homebindMapId;
-        uint16 m_homebindAreaId;
-        float m_homebindX;
-        float m_homebindY;
-        float m_homebindZ;
+        WorldLocation m_homebind;
 
         uint32 m_lastFallTime;
         float  m_lastFallZ;
 
+        LiquidTypeEntry const* m_lastLiquid;
+
         int32 m_MirrorTimer[MAX_TIMERS];
         uint8 m_MirrorTimerFlags;
         uint8 m_MirrorTimerFlagsLast;
@@ -2622,6 +2764,7 @@ class MANGOS_DLL_SPEC Player : public Unit
         uint32 m_teleport_options;
         bool mSemaphoreTeleport_Near;
         bool mSemaphoreTeleport_Far;
+        bool mSemaphoreTeleport_DelayEvent;
 
         uint32 m_DelayedOperations;
         bool m_bCanDelayTeleport;
@@ -2630,8 +2773,11 @@ class MANGOS_DLL_SPEC Player : public Unit
 
         uint32 m_DetectInvTimer;
 
+        // Visible object storage
+        GuidSet m_clientGUIDs;
+
         // Temporary removed pet cache
-        uint32 m_temporaryUnsummonedPetNumber;
+        PetNumberList m_temporaryUnsummonedPetNumber;
 
         AchievementMgr m_achievementMgr;
         ReputationMgr  m_reputationMgr;
@@ -2641,10 +2787,15 @@ class MANGOS_DLL_SPEC Player : public Unit
         uint32 m_timeSyncClient;
         uint32 m_timeSyncServer;
 
+        DungeonPersistentState* _pendingBind;
+        uint32 _pendingBindTimer;
+
+        uint8  m_cachedTC[3];
+
         uint32 m_cachedGS;
 };
 
-void AddItemsSetItem(Player*player,Item *item);
-void RemoveItemsSetItem(Player*player,ItemPrototype const *proto);
+void AddItemsSetItem(Player* player, Item* item);
+void RemoveItemsSetItem(Player* player, ItemPrototype const* proto);
 
 #endif
diff --git a/src/game/PlayerDump.cpp b/src/game/PlayerDump.cpp
index c11c7ed782c..52218e26165 100644
--- a/src/game/PlayerDump.cpp
+++ b/src/game/PlayerDump.cpp
@@ -327,7 +327,7 @@ void PlayerDumpWriter::DumpTableContent(std::string& dump, uint32 guid, char con
                 case DTT_PET:
                     StoreGUID(result,0,pets);  break;       // pet petnumber collection (character_pet.id)
                 case DTT_MAIL:
-                    StoreGUID(result,0,mails);              // mail id collection (mail.id)
+                    StoreGUID(result,0,mails); break;       // mail id collection (mail.id)
                 case DTT_MAIL_ITEM:
                     StoreGUID(result,1,items); break;       // item guid collection (mail_items.item_guid)
                 default:                       break;
@@ -389,7 +389,7 @@ std::string PlayerDumpWriter::GetDump(uint32 guid)
 
 DumpReturn PlayerDumpWriter::WriteDump(const std::string& file, uint32 guid)
 {
-    FILE *fout = fopen(file.c_str(), "w");
+    FILE *fout = fopen(file.c_str(), "wb");
     if (!fout)
         return DUMP_FILE_OPEN_ERROR;
 
diff --git a/src/game/PointMovementGenerator.cpp b/src/game/PointMovementGenerator.cpp
deleted file mode 100644
index 2abe26750a0..00000000000
--- a/src/game/PointMovementGenerator.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "PointMovementGenerator.h"
-#include "Errors.h"
-#include "Creature.h"
-#include "CreatureAI.h"
-#include "TemporarySummon.h"
-#include "World.h"
-#include "movement/MoveSplineInit.h"
-#include "movement/MoveSpline.h"
-
-//----- Point Movement Generator
-template<class T>
-void PointMovementGenerator<T>::Initialize(T &unit)
-{
-    if (!unit.IsStopped())
-        unit.StopMoving();
-
-    unit.addUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-    Movement::MoveSplineInit init(unit);
-    init.MoveTo(i_x, i_y, i_z, m_generatePath);
-    init.Launch();
-}
-
-template<class T>
-void PointMovementGenerator<T>::Finalize(T &unit)
-{
-    unit.clearUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-
-    if (unit.movespline->Finalized())
-        MovementInform(unit);
-}
-
-template<class T>
-void PointMovementGenerator<T>::Interrupt(T &unit)
-{
-    unit.clearUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-}
-
-template<class T>
-void PointMovementGenerator<T>::Reset(T &unit)
-{
-    if (!unit.IsStopped())
-        unit.StopMoving();
-
-    unit.addUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-}
-
-template<class T>
-bool PointMovementGenerator<T>::Update(T &unit, const uint32 &diff)
-{
-    if(!&unit)
-        return false;
-
-    if(unit.hasUnitState(UNIT_STAT_CAN_NOT_MOVE))
-    {
-        unit.clearUnitState(UNIT_STAT_ROAMING_MOVE);
-        return true;
-    }
-
-    unit.addUnitState(UNIT_STAT_ROAMING_MOVE);
-    return !unit.movespline->Finalized();
-}
-
-template<>
-void PointMovementGenerator<Player>::MovementInform(Player&)
-{
-}
-
-template <>
-void PointMovementGenerator<Creature>::MovementInform(Creature &unit)
-{
-    if (unit.AI())
-        unit.AI()->MovementInform(POINT_MOTION_TYPE, id);
-
-    if (unit.IsTemporarySummon())
-    {
-        TemporarySummon* pSummon = (TemporarySummon*)(&unit);
-        if (pSummon->GetSummonerGuid().IsCreatureOrVehicle())
-            if(Creature* pSummoner = unit.GetMap()->GetCreature(pSummon->GetSummonerGuid()))
-                if (pSummoner->AI())
-                    pSummoner->AI()->SummonedMovementInform(&unit, POINT_MOTION_TYPE, id);
-    }
-}
-
-template void PointMovementGenerator<Player>::Initialize(Player&);
-template void PointMovementGenerator<Creature>::Initialize(Creature&);
-template void PointMovementGenerator<Player>::Finalize(Player&);
-template void PointMovementGenerator<Creature>::Finalize(Creature&);
-template void PointMovementGenerator<Player>::Interrupt(Player&);
-template void PointMovementGenerator<Creature>::Interrupt(Creature&);
-template void PointMovementGenerator<Player>::Reset(Player&);
-template void PointMovementGenerator<Creature>::Reset(Creature&);
-template bool PointMovementGenerator<Player>::Update(Player &, const uint32 &diff);
-template bool PointMovementGenerator<Creature>::Update(Creature&, const uint32 &diff);
-
-void AssistanceMovementGenerator::Finalize(Unit &unit)
-{
-    unit.clearUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-
-    ((Creature*)&unit)->SetNoCallAssistance(false);
-    ((Creature*)&unit)->CallAssistance();
-    if (unit.isAlive())
-        unit.GetMotionMaster()->MoveSeekAssistanceDistract(sWorld.getConfig(CONFIG_UINT32_CREATURE_FAMILY_ASSISTANCE_DELAY));
-}
-
-bool EffectMovementGenerator::Update(Unit &unit, const uint32 &)
-{
-    return !unit.movespline->Finalized();
-}
-
-void EffectMovementGenerator::Finalize(Unit &unit)
-{
-    if (unit.GetTypeId() != TYPEID_UNIT)
-        return;
-
-    if (((Creature&)unit).AI() && unit.movespline->Finalized())
-        ((Creature&)unit).AI()->MovementInform(EFFECT_MOTION_TYPE, m_Id);
-    // Need restore previous movement since we have no proper states system
-    if (unit.isAlive() && !unit.hasUnitState(UNIT_STAT_CONFUSED|UNIT_STAT_FLEEING))
-    {
-        if (Unit * victim = unit.getVictim())
-            unit.GetMotionMaster()->MoveChase(victim);
-        else
-            unit.GetMotionMaster()->Initialize();
-    }
-}
diff --git a/src/game/PointMovementGenerator.h b/src/game/PointMovementGenerator.h
deleted file mode 100644
index 6e972b0f852..00000000000
--- a/src/game/PointMovementGenerator.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef MANGOS_POINTMOVEMENTGENERATOR_H
-#define MANGOS_POINTMOVEMENTGENERATOR_H
-
-#include "MovementGenerator.h"
-#include "FollowerReference.h"
-#include "Creature.h"
-
-template<class T>
-class MANGOS_DLL_SPEC PointMovementGenerator
-: public MovementGeneratorMedium< T, PointMovementGenerator<T> >
-{
-    public:
-        PointMovementGenerator(uint32 _id, float _x, float _y, float _z, bool _generatePath) :
-          id(_id), i_x(_x), i_y(_y), i_z(_z), m_generatePath(_generatePath) {}
-
-        void Initialize(T &);
-        void Finalize(T &);
-        void Interrupt(T &);
-        void Reset(T &unit);
-        bool Update(T &, const uint32 &diff);
-
-        void MovementInform(T &);
-
-        MovementGeneratorType GetMovementGeneratorType() const { return POINT_MOTION_TYPE; }
-
-        bool GetDestination(float& x, float& y, float& z) const { x=i_x; y=i_y; z=i_z; return true; }
-    private:
-        uint32 id;
-        float i_x,i_y,i_z;
-        bool m_generatePath;
-};
-
-class MANGOS_DLL_SPEC AssistanceMovementGenerator
-: public PointMovementGenerator<Creature>
-{
-    public:
-        AssistanceMovementGenerator(float _x, float _y, float _z) :
-            PointMovementGenerator<Creature>(0, _x, _y, _z, true) {}
-
-        MovementGeneratorType GetMovementGeneratorType() const { return ASSISTANCE_MOTION_TYPE; }
-        void Finalize(Unit &);
-};
-
-// Does almost nothing - just doesn't allows previous movegen interrupt current effect. Can be reused for charge effect
-class EffectMovementGenerator : public MovementGenerator
-{
-    public:
-        explicit EffectMovementGenerator(uint32 Id) : m_Id(Id) {}
-        void Initialize(Unit &) {}
-        void Finalize(Unit &unit);
-        void Interrupt(Unit &) {}
-        void Reset(Unit &) {}
-        bool Update(Unit &u, const uint32 &);
-        MovementGeneratorType GetMovementGeneratorType() const { return EFFECT_MOTION_TYPE; }
-    private:
-        uint32 m_Id;
-};
-
-#endif
diff --git a/src/game/PoolManager.cpp b/src/game/PoolManager.cpp
index cd406cd3427..c33d49fb830 100644
--- a/src/game/PoolManager.cpp
+++ b/src/game/PoolManager.cpp
@@ -24,7 +24,7 @@
 #include "MapPersistentStateMgr.h"
 #include "MapManager.h"
 #include "World.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 INSTANTIATE_SINGLETON_1(PoolManager);
 
@@ -148,7 +148,7 @@ void PoolGroup<T>::AddEntry(PoolObject& poolitem, uint32 maxentries)
 template <class T>
 bool PoolGroup<T>::CheckPool() const
 {
-    if (EqualChanced.size() == 0)
+    if (EqualChanced.empty())
     {
         float chance = 0;
         for (uint32 i=0; i<ExplicitlyChanced.size(); ++i)
@@ -163,11 +163,11 @@ bool PoolGroup<T>::CheckPool() const
 template <class T>
 void PoolGroup<T>::CheckEventLinkAndReport(int16 event_id, std::map<uint32, int16> const& creature2event, std::map<uint32, int16> const& go2event) const
 {
-    for (uint32 i=0; i < EqualChanced.size(); ++i)
-        EqualChanced[i].CheckEventLinkAndReport<T>(poolId, event_id, creature2event, go2event);
+    for (uint32 i = 0; i < EqualChanced.size(); ++i)
+        EqualChanced[i].template CheckEventLinkAndReport<T>(poolId, event_id, creature2event, go2event);
 
-    for (uint32 i=0; i<ExplicitlyChanced.size(); ++i)
-        ExplicitlyChanced[i].CheckEventLinkAndReport<T>(poolId, event_id, creature2event, go2event);
+    for (uint32 i = 0; i < ExplicitlyChanced.size(); ++i)
+        ExplicitlyChanced[i].template CheckEventLinkAndReport<T>(poolId, event_id, creature2event, go2event);
 }
 
 template <class T>
@@ -264,7 +264,8 @@ void PoolGroup<Creature>::Despawn1Object(MapPersistentState& mapState, uint32 gu
     if (CreatureData const* data = sObjectMgr.GetCreatureData(guid))
     {
         // for non-instanceable maps pool spawn can be at different map from provided mapState
-        if (MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0))
+        MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0);
+        if (dataMapState)
         {
             dataMapState->RemoveCreatureFromGrid(guid, data);
 
@@ -282,7 +283,8 @@ void PoolGroup<GameObject>::Despawn1Object(MapPersistentState& mapState, uint32
     if (GameObjectData const* data = sObjectMgr.GetGOData(guid))
     {
         // for non-instanceable maps pool spawn can be at different map from provided mapState
-        if (MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0))
+        MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0);
+        if (dataMapState)
         {
             dataMapState->RemoveGameobjectFromGrid(guid, data);
 
@@ -379,7 +381,8 @@ void PoolGroup<Creature>::Spawn1Object(MapPersistentState& mapState, PoolObject*
     if (CreatureData const* data = sObjectMgr.GetCreatureData(obj->guid))
     {
         // for non-instanceable maps pool spawn can be at different map from provided mapState
-        if (MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0))
+        MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0);
+        if (dataMapState)
         {
             dataMapState->AddCreatureToGrid(obj->guid, data);
 
@@ -423,7 +426,8 @@ void PoolGroup<GameObject>::Spawn1Object(MapPersistentState& mapState, PoolObjec
     if (GameObjectData const* data = sObjectMgr.GetGOData(obj->guid))
     {
         // for non-instanceable maps pool spawn can be at different map from provided mapState
-        if (MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0))
+        MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0);
+        if (dataMapState)
         {
             dataMapState->AddGameobjectToGrid(obj->guid, data);
 
@@ -479,7 +483,8 @@ void PoolGroup<Creature>::ReSpawn1Object(MapPersistentState& mapState, PoolObjec
     if (CreatureData const* data = sObjectMgr.GetCreatureData(obj->guid))
     {
         // for non-instanceable maps pool spawn can be at different map from provided mapState
-        if (MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0))
+        MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0);
+        if (dataMapState)
             if (Map* dataMap = dataMapState->GetMap())
                 if (Creature* pCreature = dataMap->GetCreature(data->GetObjectGuid(obj->guid)))
                     pCreature->GetMap()->Add(pCreature);
@@ -493,7 +498,8 @@ void PoolGroup<GameObject>::ReSpawn1Object(MapPersistentState& mapState, PoolObj
     if (GameObjectData const* data = sObjectMgr.GetGOData(obj->guid))
     {
         // for non-instanceable maps pool spawn can be at different map from provided mapState
-        if (MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0))
+        MapPersistentState* dataMapState = mapState.GetMapId() == data->mapid ? &mapState : sMapPersistentStateMgr.GetPersistentState(data->mapid, 0);
+        if (dataMapState)
             if (Map* dataMap = dataMapState->GetMap())
                 if (GameObject* pGameobject = dataMap->GetGameObject(ObjectGuid(HIGHGUID_GAMEOBJECT, data->id, obj->guid)))
                     pGameobject->GetMap()->Add(pGameobject);
@@ -792,7 +798,8 @@ void PoolManager::LoadFromDB()
             GameObjectInfo const* goinfo = ObjectMgr::GetGameObjectInfo(data->id);
             if (goinfo->type != GAMEOBJECT_TYPE_CHEST &&
                 goinfo->type != GAMEOBJECT_TYPE_GOOBER &&
-                goinfo->type != GAMEOBJECT_TYPE_FISHINGHOLE)
+                goinfo->type != GAMEOBJECT_TYPE_FISHINGHOLE &&
+                goinfo->type != GAMEOBJECT_TYPE_TRAP)
             {
                 sLog.outErrorDb("`pool_gameobject` has a not lootable gameobject spawn (GUID: %u, type: %u) defined for pool id (%u), skipped.", guid, goinfo->type, pool_id );
                 continue;
@@ -864,7 +871,8 @@ void PoolManager::LoadFromDB()
             GameObjectInfo const* goinfo = ObjectMgr::GetGameObjectInfo(data->id);
             if (goinfo->type != GAMEOBJECT_TYPE_CHEST &&
                 goinfo->type != GAMEOBJECT_TYPE_GOOBER &&
-                goinfo->type != GAMEOBJECT_TYPE_FISHINGHOLE)
+                goinfo->type != GAMEOBJECT_TYPE_FISHINGHOLE &&
+                goinfo->type != GAMEOBJECT_TYPE_TRAP)
             {
                 sLog.outErrorDb("`pool_gameobject_template` has a not lootable gameobject spawn (GUID: %u Entry %u Type: %u) defined for pool id (%u), skipped.", guid, entry_id, goinfo->type, pool_id);
                 continue;
diff --git a/src/game/PoolManager.h b/src/game/PoolManager.h
index 965464202f3..e87a3698d9e 100644
--- a/src/game/PoolManager.h
+++ b/src/game/PoolManager.h
@@ -42,7 +42,7 @@ struct PoolTemplateData
     // helpers
     bool CanBeSpawnedAtMap(MapEntry const* entry) const
     {
-        return mapEntry && (mapEntry == entry || !entry->Instanceable() && !mapEntry->Instanceable());
+        return mapEntry && (mapEntry == entry || (!entry->Instanceable() && !mapEntry->Instanceable()));
     }
 };
 
diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp
index 15cbccfca01..4f40e6788e7 100644
--- a/src/game/QueryHandler.cpp
+++ b/src/game/QueryHandler.cpp
@@ -32,6 +32,7 @@
 #include "NPCHandler.h"
 #include "Pet.h"
 #include "MapManager.h"
+#include "SQLStorages.h"
 
 void WorldSession::SendNameQueryOpcode(Player *p)
 {
@@ -168,22 +169,22 @@ void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data )
         data << uint8(0) << uint8(0) << uint8(0);           // name2, name3, name4, always empty
         data << subName;
         data << ci->IconName;                               // "Directions" for guard, string for Icons 2.3.0
-        data << uint32(ci->type_flags);                     // flags
-        data << uint32(ci->type);                           // CreatureType.dbc
-        data << uint32(ci->family);                         // CreatureFamily.dbc
-        data << uint32(ci->rank);                           // Creature Rank (elite, boss, etc)
+        data << uint32(ci->CreatureTypeFlags);              // flags
+        data << uint32(ci->CreatureType);                   // CreatureType.dbc
+        data << uint32(ci->Family);                         // CreatureFamily.dbc
+        data << uint32(ci->Rank);                           // Creature Rank (elite, boss, etc)
         data << uint32(ci->KillCredit[0]);                  // new in 3.1, kill credit
         data << uint32(ci->KillCredit[1]);                  // new in 3.1, kill credit
 
         for(int i = 0; i < MAX_CREATURE_MODEL; ++i)
             data << uint32(ci->ModelId[i]);
 
-        data << float(ci->unk16);                           // health modifier
-        data << float(ci->unk17);                           // power modifier
+        data << float(ci->HealthMultiplier);                // health multiplier
+        data << float(ci->PowerMultiplier);                 // power multiplier
         data << uint8(ci->RacialLeader);
         for(uint32 i = 0; i < 6; ++i)
-            data << uint32(ci->questItems[i]);              // itemId[6], quest drop
-        data << uint32(ci->movementId);                     // CreatureMovementInfo.dbc
+            data << uint32(ci->QuestItems[i]);              // itemId[6], quest drop
+        data << uint32(ci->MovementTemplateId);             // CreatureMovementInfo.dbc
         SendPacket( &data );
         DEBUG_LOG( "WORLD: Sent SMSG_CREATURE_QUERY_RESPONSE" );
     }
@@ -286,12 +287,12 @@ void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recv_data*/)
             if (corpseMapEntry->IsDungeon() && corpseMapEntry->ghost_entrance_map >= 0)
             {
                 // if corpse map have entrance
-                if(TerrainInfo const* entranceMap = sTerrainMgr.LoadTerrain(corpseMapEntry->ghost_entrance_map))
+                if(TerrainInfoPtr entranceMap = sTerrainMgr.LoadTerrain(corpseMapEntry->ghost_entrance_map))
                 {
                     mapid = corpseMapEntry->ghost_entrance_map;
                     x = corpseMapEntry->ghost_entrance_x;
                     y = corpseMapEntry->ghost_entrance_y;
-                    z = entranceMap->GetHeight(x, y, MAX_HEIGHT);
+                    z = entranceMap->GetHeightStatic(x, y, MAX_HEIGHT);
                 }
             }
         }
@@ -322,7 +323,7 @@ void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data )
 
     GossipText const* pGossip = sObjectMgr.GetGossipText(textID);
 
-    WorldPacket data( SMSG_NPC_TEXT_UPDATE, 100 );          // guess size
+    WorldPacket data( SMSG_NPC_TEXT_UPDATE, 100 );         // guess size
     data << textID;
 
     if (!pGossip)
@@ -452,7 +453,7 @@ void WorldSession::HandleQueryQuestsCompletedOpcode( WorldPacket & /*recv_data *
     WorldPacket data(SMSG_ALL_QUESTS_COMPLETED, 4+4*count);
     data << uint32(count);
 
-    for(QuestStatusMap::const_iterator itr = _player->getQuestStatusMap().begin(); itr != _player->getQuestStatusMap().end(); ++itr)
+    for(QuestStatusMap::const_iterator itr = _player->GetQuestStatusMap().begin(); itr != _player->GetQuestStatusMap().end(); ++itr)
     {
         if(itr->second.m_rewarded)
         {
diff --git a/src/game/QuestDef.cpp b/src/game/QuestDef.cpp
index 31e647e0d2b..b00d5bc30ca 100644
--- a/src/game/QuestDef.cpp
+++ b/src/game/QuestDef.cpp
@@ -257,14 +257,22 @@ uint32 Quest::XPValue(Player *pPlayer) const
     return 0;
 }
 
-int32  Quest::GetRewOrReqMoney() const
+int32 Quest::GetRewOrReqMoney() const
 {
-    if(RewOrReqMoney <=0)
+    if (RewOrReqMoney <=0)
         return RewOrReqMoney;
 
     return int32(RewOrReqMoney * sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_MONEY));
 }
 
+uint32 Quest::GetRewMoneyMaxLevel() const
+{
+    if ((int32)RewMoneyMaxLevel < RewOrReqMoney)
+        return uint32(RewOrReqMoney * sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_MONEY));
+
+    return uint32(RewMoneyMaxLevel * sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_MONEY));
+}
+
 bool Quest::IsAllowedInRaid() const
 {
     if (Type == QUEST_TYPE_RAID || Type == QUEST_TYPE_RAID_10 || Type == QUEST_TYPE_RAID_25)
diff --git a/src/game/QuestDef.h b/src/game/QuestDef.h
index fad0d879e29..df82e607b2f 100644
--- a/src/game/QuestDef.h
+++ b/src/game/QuestDef.h
@@ -115,7 +115,8 @@ enum __QuestGiverStatus
     DIALOG_STATUS_AVAILABLE_REP            = 7,
     DIALOG_STATUS_AVAILABLE                = 8,
     DIALOG_STATUS_REWARD2                  = 9,             // no yellow dot on minimap
-    DIALOG_STATUS_REWARD                   = 10             // yellow dot on minimap
+    DIALOG_STATUS_REWARD                   = 10,            // yellow dot on minimap
+    DIALOG_STATUS_UNDEFINED                = 100            // Used as result for unassigned ScriptCall
 };
 
 // values based at QuestInfo.dbc
@@ -245,7 +246,7 @@ class Quest
         int32  GetRewOrReqMoney() const;
         uint32 GetRewHonorAddition() const { return RewHonorAddition; }
         float GetRewHonorMultiplier() const { return RewHonorMultiplier; }
-        uint32 GetRewMoneyMaxLevel() const { return RewMoneyMaxLevel; }
+        uint32 GetRewMoneyMaxLevel() const;
                                                             // use in XP calculation at client
         uint32 GetRewSpell() const { return RewSpell; }
         uint32 GetRewSpellCast() const { return RewSpellCast; }
diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp
index aedfa968671..548466f87dd 100644
--- a/src/game/QuestHandler.cpp
+++ b/src/game/QuestHandler.cpp
@@ -56,7 +56,7 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket & recv_data)
             {
                 dialogStatus = sScriptMgr.GetDialogStatus(_player, cr_questgiver);
 
-                if (dialogStatus > DIALOG_STATUS_REWARD_REP)
+                if (dialogStatus == DIALOG_STATUS_UNDEFINED)
                     dialogStatus = getDialogStatus(_player, cr_questgiver, DIALOG_STATUS_NONE);
             }
             break;
@@ -66,7 +66,7 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket & recv_data)
             GameObject* go_questgiver = (GameObject*)questgiver;
             dialogStatus = sScriptMgr.GetDialogStatus(_player, go_questgiver);
 
-            if (dialogStatus > DIALOG_STATUS_REWARD_REP)
+            if (dialogStatus == DIALOG_STATUS_UNDEFINED)
                 dialogStatus = getDialogStatus(_player, go_questgiver, DIALOG_STATUS_NONE);
 
             break;
@@ -99,8 +99,7 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket & recv_data)
         GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
 
     // Stop the npc if moving
-    if (!pCreature->IsStopped())
-        pCreature->StopMoving();
+    pCreature->StopMoving();
 
     if (sScriptMgr.OnGossipHello(_player, pCreature))
         return;
@@ -238,7 +237,7 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recv_data)
 
     if(reward >= QUEST_REWARD_CHOICES_COUNT)
     {
-        sLog.outError("Error in CMSG_QUESTGIVER_CHOOSE_REWARD - %s tried to get invalid reward (%u) (probably packet hacking)", _player->GetGuidStr().c_str(), _player->GetGUIDLow(), reward);
+        sLog.outError("Error in CMSG_QUESTGIVER_CHOOSE_REWARD - %s ID: %u tried to get invalid reward (%u) (probably packet hacking)", _player->GetGuidStr().c_str(), _player->GetGUIDLow(), reward);
         return;
     }
 
@@ -475,8 +474,8 @@ void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket)
                     continue;
                 }
 
-                pPlayer->PlayerTalkClass->SendQuestGiverQuestDetails(pQuest, _player->GetObjectGuid(), true);
                 pPlayer->SetDividerGuid(_player->GetObjectGuid());
+                pPlayer->PlayerTalkClass->SendQuestGiverQuestDetails(pQuest, _player->GetObjectGuid(), true);
             }
         }
     }
@@ -500,12 +499,20 @@ void WorldSession::HandleQuestPushResult(WorldPacket& recvPacket)
     }
 }
 
-uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32 defstatus)
+/**
+ * What - if any - kind of explanation mark or question-mark should a quest-giver display for a player
+ * @param pPlayer - for whom
+ * @param questgiver - from whom
+ * @param defstatus - initial set status (usually it will be called with DIALOG_STATUS_NONE) - must not be DIALOG_STATUS_UNDEFINED
+ */
+uint32 WorldSession::getDialogStatus(Player* pPlayer, Object* questgiver, uint32 defstatus)
 {
+    MANGOS_ASSERT(defstatus != DIALOG_STATUS_UNDEFINED);
+
     uint32 dialogStatus = defstatus;
 
-    QuestRelationsMapBounds rbounds;
-    QuestRelationsMapBounds irbounds;
+    QuestRelationsMapBounds rbounds;                        // QuestRelations (quest-giver)
+    QuestRelationsMapBounds irbounds;                       // InvolvedRelations (quest-finisher)
 
     switch(questgiver->GetTypeId())
     {
@@ -527,9 +534,10 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
             return DIALOG_STATUS_NONE;
     }
 
-    for(QuestRelationsMap::const_iterator itr = irbounds.first; itr != irbounds.second; ++itr)
+    // Check markings for quest-finisher
+    for (QuestRelationsMap::const_iterator itr = irbounds.first; itr != irbounds.second; ++itr)
     {
-        uint32 dialogStatusNew = 0;
+        uint32 dialogStatusNew = DIALOG_STATUS_NONE;
         uint32 quest_id = itr->second;
         Quest const *pQuest = sObjectMgr.GetQuestTemplate(quest_id);
 
@@ -553,9 +561,10 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
             dialogStatus = dialogStatusNew;
     }
 
-    for(QuestRelationsMap::const_iterator itr = rbounds.first; itr != rbounds.second; ++itr)
+    // check markings for quest-giver
+    for (QuestRelationsMap::const_iterator itr = rbounds.first; itr != rbounds.second; ++itr)
     {
-        uint32 dialogStatusNew = 0;
+        uint32 dialogStatusNew = DIALOG_STATUS_NONE;
         uint32 quest_id = itr->second;
         Quest const *pQuest = sObjectMgr.GetQuestTemplate(quest_id);
 
@@ -564,24 +573,25 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
 
         QuestStatus status = pPlayer->GetQuestStatus(quest_id);
 
-        if (status == QUEST_STATUS_NONE)
+        if (status == QUEST_STATUS_NONE)                    // For all other cases the mark is handled either at some place else, or with involved-relations already
         {
             if (pPlayer->CanSeeStartQuest(pQuest))
             {
                 if (pPlayer->SatisfyQuestLevel(pQuest, false))
                 {
-                    if (pQuest->IsAutoComplete() || (pQuest->IsRepeatable() && pPlayer->getQuestStatusMap()[quest_id].m_rewarded))
+                    int32 lowLevelDiff = sWorld.getConfig(CONFIG_INT32_QUEST_LOW_LEVEL_HIDE_DIFF);
+                    if (pQuest->IsAutoComplete() || (pQuest->IsRepeatable() && pPlayer->GetQuestStatusData(quest_id) && pPlayer->GetQuestStatusData(quest_id)->m_rewarded))
                     {
                         dialogStatusNew = DIALOG_STATUS_REWARD_REP;
                     }
-                    else if (int32(pPlayer->getLevel()) <= int32(pPlayer->GetQuestLevelForPlayer(pQuest)) + sWorld.getConfig(CONFIG_INT32_QUEST_LOW_LEVEL_HIDE_DIFF))
+                    else if (lowLevelDiff < 0 || pPlayer->getLevel() <= pPlayer->GetQuestLevelForPlayer(pQuest) + uint32(lowLevelDiff))
                     {
                         if (pQuest->HasQuestFlag(QUEST_FLAGS_DAILY) || pQuest->HasQuestFlag(QUEST_FLAGS_WEEKLY))
                             dialogStatusNew = DIALOG_STATUS_AVAILABLE_REP;
                         else
                             dialogStatusNew = DIALOG_STATUS_AVAILABLE;
                     }
-                    else
+                    else                                    // player level much higher then quest-level
                         dialogStatusNew = DIALOG_STATUS_LOW_LEVEL_AVAILABLE;
                 }
                 else
@@ -605,14 +615,18 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket
     WorldPacket data(SMSG_QUESTGIVER_STATUS_MULTIPLE, 4);
     data << uint32(count);                                  // placeholder
 
-    for(ObjectGuidSet::const_iterator itr = _player->m_clientGUIDs.begin(); itr != _player->m_clientGUIDs.end(); ++itr)
+    for(GuidSet::const_iterator itr = _player->GetClientGuids().begin(); itr != _player->GetClientGuids().end(); ++itr)
     {
         uint8 dialogStatus = DIALOG_STATUS_NONE;
 
-        if (itr->IsAnyTypeCreature())
+        ObjectGuid guid = *itr;
+        if (guid.IsEmpty())
+            continue;
+
+        if (guid.IsAnyTypeCreature())
         {
             // need also pet quests case support
-            Creature *questgiver = GetPlayer()->GetMap()->GetAnyTypeCreature(*itr);
+            Creature* questgiver = GetPlayer()->GetMap() ? GetPlayer()->GetMap()->GetAnyTypeCreature(guid) : NULL;
 
             if (!questgiver || questgiver->IsHostileTo(_player))
                 continue;
@@ -622,16 +636,16 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket
 
             dialogStatus = sScriptMgr.GetDialogStatus(_player, questgiver);
 
-            if (dialogStatus > DIALOG_STATUS_REWARD_REP)
+            if (dialogStatus == DIALOG_STATUS_UNDEFINED)
                 dialogStatus = getDialogStatus(_player, questgiver, DIALOG_STATUS_NONE);
 
-            data << questgiver->GetObjectGuid();
+            data << guid;
             data << uint8(dialogStatus);
             ++count;
         }
-        else if (itr->IsGameObject())
+        else if (guid.IsGameObject())
         {
-            GameObject *questgiver = GetPlayer()->GetMap()->GetGameObject(*itr);
+            GameObject* questgiver = GetPlayer()->GetMap() ? GetPlayer()->GetMap()->GetGameObject(guid) : NULL;
 
             if (!questgiver)
                 continue;
@@ -641,10 +655,10 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket
 
             dialogStatus = sScriptMgr.GetDialogStatus(_player, questgiver);
 
-            if (dialogStatus > DIALOG_STATUS_REWARD_REP)
+            if (dialogStatus == DIALOG_STATUS_UNDEFINED)
                 dialogStatus = getDialogStatus(_player, questgiver, DIALOG_STATUS_NONE);
 
-            data << questgiver->GetObjectGuid();
+            data << guid;
             data << uint8(dialogStatus);
             ++count;
         }
diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp
deleted file mode 100644
index 40684d1b103..00000000000
--- a/src/game/RandomMovementGenerator.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Creature.h"
-#include "MapManager.h"
-#include "RandomMovementGenerator.h"
-#include "Map.h"
-#include "Util.h"
-#include "movement/MoveSplineInit.h"
-#include "movement/MoveSpline.h"
-
-template<>
-void RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature)
-{
-    float respX, respY, respZ, respO, wander_distance;
-    creature.GetRespawnCoord(respX, respY, respZ, &respO, &wander_distance);
-
-    const float angle = rand_norm_f() * (M_PI_F*2.0f);
-    const float range = rand_norm_f() * wander_distance;
-
-    float destX = respX + range * cos(angle);
-    float destY = respY + range * sin(angle);
-    float destZ = creature.GetPositionZ();
-    creature.UpdateAllowedPositionZ(destX, destY, destZ);
-
-    creature.addUnitState(UNIT_STAT_ROAMING_MOVE);
-
-    Movement::MoveSplineInit init(creature);
-    init.MoveTo(destX, destY, destZ, true);
-    init.SetWalk(true);
-    init.Launch();
-
-    if (creature.CanFly())
-        i_nextMoveTime.Reset(0);
-    else
-        i_nextMoveTime.Reset(urand(500, 10000));
-}
-
-template<>
-void RandomMovementGenerator<Creature>::Initialize(Creature &creature)
-{
-    if (!creature.isAlive())
-        return;
-
-    creature.addUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-    _setRandomLocation(creature);
-}
-
-template<>
-void RandomMovementGenerator<Creature>::Reset(Creature &creature)
-{
-    Initialize(creature);
-}
-
-template<>
-void RandomMovementGenerator<Creature>::Interrupt(Creature &creature)
-{
-    creature.clearUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-    creature.SetWalk(false);
-}
-
-template<>
-void RandomMovementGenerator<Creature>::Finalize(Creature &creature)
-{
-    creature.clearUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-    creature.SetWalk(false);
-}
-
-template<>
-bool RandomMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff)
-{
-    if (creature.hasUnitState(UNIT_STAT_NOT_MOVE))
-    {
-        i_nextMoveTime.Reset(0);  // Expire the timer
-        creature.clearUnitState(UNIT_STAT_ROAMING_MOVE);
-        return true;
-    }
-
-    if (creature.movespline->Finalized())
-    {
-        i_nextMoveTime.Update(diff);
-        if (i_nextMoveTime.Passed())
-            _setRandomLocation(creature);
-    }
-    return true;
-}
-
-template<>
-bool RandomMovementGenerator<Creature>::GetResetPosition(Creature& c, float& x, float& y, float& z)
-{
-    float radius;
-    c.GetRespawnCoord(x, y, z, NULL, &radius);
-
-    // use current if in range
-    if (c.IsWithinDist2d(x,y,radius))
-        c.GetPosition(x,y,z);
-
-    return true;
-}
diff --git a/src/game/RandomMovementGenerator.h b/src/game/RandomMovementGenerator.h
deleted file mode 100644
index ec1ac076d7d..00000000000
--- a/src/game/RandomMovementGenerator.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef MANGOS_RANDOMMOTIONGENERATOR_H
-#define MANGOS_RANDOMMOTIONGENERATOR_H
-
-#include "MovementGenerator.h"
-
-template<class T>
-class MANGOS_DLL_SPEC RandomMovementGenerator
-: public MovementGeneratorMedium< T, RandomMovementGenerator<T> >
-{
-    public:
-        explicit RandomMovementGenerator(const Unit &) : i_nextMoveTime(0) {}
-
-        void _setRandomLocation(T &);
-        void Initialize(T &);
-        void Finalize(T &);
-        void Interrupt(T &);
-        void Reset(T &);
-        bool Update(T &, const uint32 &);
-        MovementGeneratorType GetMovementGeneratorType() const { return RANDOM_MOTION_TYPE; }
-
-        bool GetResetPosition(T&, float& x, float& y, float& z);
-    private:
-        ShortTimeTracker i_nextMoveTime;
-        uint32 i_nextMove;
-};
-
-#endif
diff --git a/src/game/ReactorAI.cpp b/src/game/ReactorAI.cpp
index 7499a03efbf..3bf2ca39ead 100644
--- a/src/game/ReactorAI.cpp
+++ b/src/game/ReactorAI.cpp
@@ -54,7 +54,7 @@ ReactorAI::AttackStart(Unit *p)
         m_creature->SetInCombatWith(p);
         p->SetInCombatWith(m_creature);
 
-        m_creature->GetMotionMaster()->MoveChase(p);
+        HandleMovementOnAttackStart(p);
     }
 }
 
@@ -82,7 +82,6 @@ ReactorAI::EnterEvadeMode()
     if (!m_creature->isAlive())
     {
         DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Creature stopped attacking, he is dead [guid=%u]", m_creature->GetGUIDLow());
-        m_creature->GetMotionMaster()->MovementExpired();
         m_creature->GetMotionMaster()->MoveIdle();
         i_victimGuid.Clear();
         m_creature->CombatStop(true);
@@ -109,13 +108,10 @@ ReactorAI::EnterEvadeMode()
         DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Creature stopped attacking, victim %s [guid=%u]", victim->isAlive() ? "out run him" : "is dead", m_creature->GetGUIDLow());
     }
 
-    m_creature->RemoveAllAuras();
+    m_creature->ExitVehicle();
+    m_creature->RemoveAllAurasOnEvade();
     m_creature->DeleteThreatList();
     i_victimGuid.Clear();
     m_creature->CombatStop(true);
     m_creature->SetLootRecipient(NULL);
-
-    // Remove ChaseMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead
-    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
-        m_creature->GetMotionMaster()->MoveTargetedHome();
 }
diff --git a/src/game/ReputationMgr.cpp b/src/game/ReputationMgr.cpp
index 2a2202cc6db..3f96e99f055 100644
--- a/src/game/ReputationMgr.cpp
+++ b/src/game/ReputationMgr.cpp
@@ -120,19 +120,19 @@ void ReputationMgr::SendForceReactions()
     m_player->SendDirectMessage(&data);
 }
 
-void ReputationMgr::SendState(FactionState const* faction)
+void ReputationMgr::SendState(FactionState const* faction, bool anyRankIncreased)
 {
     uint32 count = 1;
 
-    WorldPacket data(SMSG_SET_FACTION_STANDING, (16));      // last check 2.4.0
-    data << (float) 0;                                      // unk 2.4.0
-    data << (uint8) 0;                                      // wotlk 8634
+    WorldPacket data(SMSG_SET_FACTION_STANDING, 17);
+    data << float(0);                                       // refer-a-friend bonus reputation
+    data << uint8(anyRankIncreased ? 1 : 0);                // display visual effect
 
     size_t p_count = data.wpos();
-    data << (uint32) count;                                 // placeholder
+    data << uint32(count);                                  // placeholder
 
-    data << (uint32) faction->ReputationListID;
-    data << (uint32) faction->Standing;
+    data << uint32(faction->ReputationListID);
+    data << uint32(faction->Standing);
 
     for(FactionStateList::iterator itr = m_factions.begin(); itr != m_factions.end(); ++itr)
     {
@@ -141,8 +141,8 @@ void ReputationMgr::SendState(FactionState const* faction)
             itr->second.needSend = false;
             if (itr->second.ReputationListID != faction->ReputationListID)
             {
-                data << (uint32) itr->second.ReputationListID;
-                data << (uint32) itr->second.Standing;
+                data << uint32(itr->second.ReputationListID);
+                data << uint32(itr->second.Standing);
 
                 ++count;
             }
@@ -231,9 +231,10 @@ void ReputationMgr::Initialize()
     }
 }
 
-bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standing, bool incremental)
+void ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standing, bool incremental)
 {
-    bool res = false;
+    bool anyRankIncreased = false;
+
     // if spillover definition exists in DB, override DBC
     if (const RepSpilloverTemplate *repTemplate = sObjectMgr.GetRepSpilloverTemplate(factionEntry->ID))
     {
@@ -245,7 +246,8 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
                 {
                     // bonuses are already given, so just modify standing by rate
                     int32 spilloverRep = standing * repTemplate->faction_rate[i];
-                    SetOneFactionReputation(sFactionStore.LookupEntry(repTemplate->faction[i]), spilloverRep, incremental);
+                    if (SetOneFactionReputation(sFactionStore.LookupEntry(repTemplate->faction[i]), spilloverRep, incremental))
+                        anyRankIncreased = true;
                 }
             }
         }
@@ -256,7 +258,7 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
         // check for sub-factions that receive spillover
         SimpleFactionsList const* flist = GetFactionTeamList(factionEntry->ID);
         // if has no sub-factions, check for factions with same parent
-        if (!flist && factionEntry->team && factionEntry->spilloverRateOut != 0.0f)
+        if (!flist && factionEntry->team && fabs(factionEntry->spilloverRateOut) > M_NULL_F)
         {
             spillOverRepOut *= factionEntry->spilloverRateOut;
             if (FactionEntry const *parent = sFactionStore.LookupEntry(factionEntry->team))
@@ -265,7 +267,8 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
                 // some team factions have own reputation standing, in this case do not spill to other sub-factions
                 if (parentState != m_factions.end() && (parentState->second.Flags & FACTION_FLAG_TEAM_REPUTATION))
                 {
-                    SetOneFactionReputation(parent, int32(spillOverRepOut), incremental);
+                    if (SetOneFactionReputation(parent, int32(spillOverRepOut), incremental))
+                        anyRankIncreased = true;
                 }
                 else    // spill to "sister" factions
                 {
@@ -282,9 +285,11 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
                 {
                     if (factionEntryCalc == factionEntry || GetRank(factionEntryCalc) > ReputationRank(factionEntryCalc->spilloverMaxRankIn))
                         continue;
+
                     int32 spilloverRep = int32(spillOverRepOut * factionEntryCalc->spilloverRateIn);
                     if (spilloverRep != 0 || !incremental)
-                        res = SetOneFactionReputation(factionEntryCalc, spilloverRep, incremental);
+                        if (SetOneFactionReputation(factionEntryCalc, spilloverRep, incremental))
+                            anyRankIncreased = true;
                 }
             }
         }
@@ -293,11 +298,12 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
     FactionStateList::iterator faction = m_factions.find(factionEntry->reputationListID);
     if (faction != m_factions.end())
     {
-        res = SetOneFactionReputation(factionEntry, standing, incremental);
+        if (SetOneFactionReputation(factionEntry, standing, incremental))
+            anyRankIncreased = true;
+
         // only this faction gets reported to client, even if it has no own visible standing
-        SendState(&faction->second);
+        SendState(&faction->second, anyRankIncreased);
     }
-    return res;
 }
 
 bool ReputationMgr::SetOneFactionReputation(FactionEntry const* factionEntry, int32 standing, bool incremental)
@@ -336,7 +342,8 @@ bool ReputationMgr::SetOneFactionReputation(FactionEntry const* factionEntry, in
         m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_REVERED_REPUTATION,factionEntry->ID);
         m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_HONORED_REPUTATION,factionEntry->ID);
 
-        return true;
+        if (new_rank > old_rank)
+            return true;
     }
     return false;
 }
diff --git a/src/game/ReputationMgr.h b/src/game/ReputationMgr.h
index 303c371d8d2..60cf6a6f72a 100644
--- a/src/game/ReputationMgr.h
+++ b/src/game/ReputationMgr.h
@@ -103,13 +103,13 @@ class ReputationMgr
         }
 
     public:                                                 // modifiers
-        bool SetReputation(FactionEntry const* factionEntry, int32 standing)
+        void SetReputation(FactionEntry const* factionEntry, int32 standing)
         {
-            return SetReputation(factionEntry, standing, false);
+            SetReputation(factionEntry, standing, false);
         }
-        bool ModifyReputation(FactionEntry const* factionEntry, int32 standing)
+        void ModifyReputation(FactionEntry const* factionEntry, int32 standing)
         {
-            return SetReputation(factionEntry, standing, true);
+            SetReputation(factionEntry, standing, true);
         }
 
         void SetVisible(FactionTemplateEntry const* factionTemplateEntry);
@@ -122,12 +122,12 @@ class ReputationMgr
     public:                                                 // senders
         void SendInitialReputations();
         void SendForceReactions();
-        void SendState(FactionState const* faction);
+        void SendState(FactionState const* faction, bool anyRankIncreased);
 
     private:                                                // internal helper functions
         void Initialize();
-        uint32 GetDefaultStateFlags(const FactionEntry *factionEntry) const;
-        bool SetReputation(FactionEntry const* factionEntry, int32 standing, bool incremental);
+        uint32 GetDefaultStateFlags(const FactionEntry* factionEntry) const;
+        void SetReputation(FactionEntry const* factionEntry, int32 standing, bool incremental);
         bool SetOneFactionReputation(FactionEntry const* factionEntry, int32 standing, bool incremental);
         void SetVisible(FactionState* faction);
         void SetAtWar(FactionState* faction, bool atWar);
diff --git a/src/game/SQLStorages.cpp b/src/game/SQLStorages.cpp
index f703763afbb..7d9e293d5e4 100644
--- a/src/game/SQLStorages.cpp
+++ b/src/game/SQLStorages.cpp
@@ -17,42 +17,54 @@
  */
 
 #include "SQLStorages.h"
-#include "Database/SQLStorage.h"
-#include "Database/SQLStorageImpl.h"
-#include "Database/DatabaseEnv.h"
 
-const char CreatureInfosrcfmt[]="iiiiiiiiiisssiiiiiiiiiiifffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiiiliiiiiis";
-const char CreatureInfodstfmt[]="iiiiiiiiiisssiiiiiiiiiiifffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiiiliiiiiii";
-const char CreatureDataAddonInfofmt[]="iiibbiis";
-const char CreatureModelfmt[]="iffbii";
-const char CreatureInfoAddonInfofmt[]="iiibbiis";
-const char GameObjectInfoAddonInfofmt[]="iffff";
-const char EquipmentInfofmt[]="iiii";
-const char GameObjectInfosrcfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiis";
-const char GameObjectInfodstfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii";
-const char ItemPrototypesrcfmt[]="iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiisiiiii";
-const char ItemPrototypedstfmt[]="iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiiiiiiii";
-const char PageTextfmt[]="isi";
-const char InstanceTemplatesrcfmt[]="iiiis";
-const char InstanceTemplatedstfmt[]="iiiii";
-const char WorldTemplatesrcfmt[]="is";
-const char WorldTemplatedstfmt[]="ii";
-const char ConditionsSrcFmt[]="iiii";
-const char ConditionsDstFmt[]="iiii";
-const char SpellTemplatesrcfmt[]="iiiiiiiiiix";
-//                                0         10        20        30        40        50        60        70        80        90        100       110       120       130       140       150       160     170       180  185
-const char SpellTemplatedstfmt[]="ixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiixxxxixxxxxxFxxxxxxxxxxxxxxxxxxxxxxixxxxxFFFxxxxxxixxxxxixxixxxxxFFFxxxxxxixxxxxixxFFFxxxxxxxxxxxxxppppppppppppppppppppppppppppppppxxxxxxxxxxxFFFxxxxxx";
-//                                Id                              proc  DurationIndex                 Effect0        tarA0    effectAura0          triggerSpell0      SpellName[16]   Rank[16]
-SQLStorage sCreatureStorage(CreatureInfosrcfmt, CreatureInfodstfmt, "entry","creature_template");
-SQLStorage sCreatureDataAddonStorage(CreatureDataAddonInfofmt,"guid","creature_addon");
-SQLStorage sCreatureModelStorage(CreatureModelfmt,"modelid","creature_model_info");
-SQLStorage sCreatureInfoAddonStorage(CreatureInfoAddonInfofmt,"entry","creature_template_addon");
-SQLStorage sGameObjectDataAddonStorage(GameObjectInfoAddonInfofmt,"guid","gameobject_addon");
-SQLStorage sEquipmentStorage(EquipmentInfofmt,"entry","creature_equip_template");
-SQLStorage sGOStorage(GameObjectInfosrcfmt, GameObjectInfodstfmt, "entry","gameobject_template");
-SQLStorage sItemStorage(ItemPrototypesrcfmt, ItemPrototypedstfmt, "entry","item_template");
-SQLStorage sPageTextStore(PageTextfmt,"entry","page_text");
-SQLStorage sInstanceTemplate(InstanceTemplatesrcfmt, InstanceTemplatedstfmt, "map","instance_template");
-SQLStorage sWorldTemplate(WorldTemplatesrcfmt, WorldTemplatedstfmt, "map","world_template");
+const char CreatureInfosrcfmt[] = "isssiiiiiiiiiiifiiiiliiiiiffiiiffffffiiiiffffiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiss";
+const char CreatureInfodstfmt[] = "isssiiiiiiiiiiifiiiiliiiiiffiiiffffffiiiiffffiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiisi";
+const char CreatureDataAddonInfofmt[] = "iiibbiis";
+const char CreatureModelfmt[] = "iffbii";
+const char CreatureInfoAddonInfofmt[] = "iiibbiis";
+const char GameObjectInfoAddonInfofmt[] = "iffff";
+const char EquipmentInfofmt[] = "iiii";
+const char GameObjectInfosrcfmt[] = "iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiis";
+const char GameObjectInfodstfmt[] = "iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii";
+const char ItemPrototypesrcfmt[] = "iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiisiiiii";
+const char ItemPrototypedstfmt[] = "iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiiiiiiii";
+const char PageTextfmt[] = "isi";
+const char InstanceTemplatesrcfmt[] = "iiiis";
+const char InstanceTemplatedstfmt[] = "iiiii";
+const char WorldTemplatesrcfmt[] = "is";
+const char WorldTemplatedstfmt[] = "ii";
+const char ConditionsSrcFmt[] = "iiii";
+const char ConditionsDstFmt[] = "iiii";
+const char SpellTemplatesrcfmt[] = "iiiiiiiiiiiiiiiix";
+//                                  0         10        20        30        40        50        60        70        80        90        100       110       120       130       140       150       160     170       180  185
+const char SpellTemplatedstfmt[] = "ixxxiiiixxxxxxxxxxxxxxxxxxxxxxxxiixxxxixxxxxxFxxxxxxxxxxxxxxxxxxxxxxixxxxxFFFxxxxxxixxixxixxixxxxxFFFxxxxxxixxixxixxFFFxxxxxxxxxxxxxppppppppppppppppppppppppppppppppxxxxxxxxxxxFFFxxxxxx";
+//                                  Id  attr                        proc  DurationIndex                 Effect0        tarA0    effectAura0          triggerSpell0      SpellName[16]   Rank[16]
+
+//                                     0         10        20        30        40        50        60        70        80        90        100       110       120
+const char SpellDbcTemplatesrcfmt[] = "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifiiiiiiiiiifffiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifffiiix";
+const char SpellDbcTemplatedstfmt[] = "iiiiiiiiiiiiiiixixiiiiiiiiiiiiixiiiiiiiiiiiiifixxxxxxxxxxxxxxxxxxiiiiiiiiifffiiiiiiiiiiiiiiiiiiiiifffxxxiixiiiiiiiiiFFFiiiiiiiiixxixppppppppppppppppppppppppppppppppiiiiiiiiiiifffxxiiiFFFx";
+
+const char VehicleAccessorySrcFmt[] = "iiiiffffx";
+const char VehicleAccessoryDstFmt[] = "iiiiffff";
+const char SpellScriptTargetFmt[] = "iiii";
+
+SQLStorage sCreatureStorage(CreatureInfosrcfmt, CreatureInfodstfmt, "entry", "creature_template");
+SQLStorage sCreatureDataAddonStorage(CreatureDataAddonInfofmt, "guid", "creature_addon");
+SQLStorage sCreatureModelStorage(CreatureModelfmt, "modelid", "creature_model_info");
+SQLStorage sCreatureInfoAddonStorage(CreatureInfoAddonInfofmt, "entry", "creature_template_addon");
+SQLStorage sEquipmentStorage(EquipmentInfofmt, "entry", "creature_equip_template");
+SQLStorage sItemStorage(ItemPrototypesrcfmt, ItemPrototypedstfmt, "entry", "item_template");
+SQLStorage sPageTextStore(PageTextfmt, "entry", "page_text");
+SQLStorage sInstanceTemplate(InstanceTemplatesrcfmt, InstanceTemplatedstfmt, "map", "instance_template");
+SQLStorage sWorldTemplate(WorldTemplatesrcfmt, WorldTemplatedstfmt, "map", "world_template");
 SQLStorage sConditionStorage(ConditionsSrcFmt, ConditionsDstFmt, "condition_entry", "conditions");
-SQLStorage sSpellTemplate(SpellTemplatesrcfmt, SpellTemplatedstfmt, "id", "spell_template");
+
+SQLHashStorage sGameObjectDataAddonStorage(GameObjectInfoAddonInfofmt, "guid", "gameobject_addon");
+SQLHashStorage sSpellDbcTemplate(SpellDbcTemplatesrcfmt, SpellDbcTemplatedstfmt, "Id", "spell_dbc");
+SQLMultiStorage sVehicleAccessoryStorage(VehicleAccessorySrcFmt, VehicleAccessoryDstFmt, "vehicle_entry", "vehicle_accessory");
+SQLHashStorage sGOStorage(GameObjectInfosrcfmt, GameObjectInfodstfmt, "entry", "gameobject_template");
+SQLHashStorage sSpellTemplate(SpellTemplatesrcfmt, SpellTemplatedstfmt, "id", "spell_template");
+//SQLHashStorage sCreatureTemplateSpellsStorage(CreatureTemplateSpellsFmt, "entry", "creature_template_spells");
+
+SQLMultiStorage sSpellScriptTargetStorage(SpellScriptTargetFmt, "entry", "spell_script_target");
diff --git a/src/game/SQLStorages.h b/src/game/SQLStorages.h
index efb8bc242f2..2102c93e0d5 100644
--- a/src/game/SQLStorages.h
+++ b/src/game/SQLStorages.h
@@ -26,14 +26,19 @@ extern SQLStorage sCreatureStorage;
 extern SQLStorage sCreatureDataAddonStorage;
 extern SQLStorage sCreatureInfoAddonStorage;
 extern SQLStorage sCreatureModelStorage;
-extern SQLStorage sGameObjectDataAddonStorage;
 extern SQLStorage sEquipmentStorage;
-extern SQLStorage sGOStorage;
 extern SQLStorage sPageTextStore;
 extern SQLStorage sItemStorage;
 extern SQLStorage sInstanceTemplate;
 extern SQLStorage sWorldTemplate;
 extern SQLStorage sConditionStorage;
-extern SQLStorage sSpellTemplate;
+
+extern SQLHashStorage sSpellTemplate;
+extern SQLHashStorage sGOStorage;
+extern SQLHashStorage sGameObjectDataAddonStorage;
+extern SQLHashStorage sSpellDbcTemplate;
+
+extern SQLMultiStorage sVehicleAccessoryStorage;
+extern SQLMultiStorage sSpellScriptTargetStorage;
 
 #endif
diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp
index ba40d341f9f..9c55b2a14d0 100644
--- a/src/game/ScriptMgr.cpp
+++ b/src/game/ScriptMgr.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ScriptMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Log.h"
 #include "ProgressBar.h"
 #include "ObjectMgr.h"
@@ -27,6 +27,10 @@
 #include "GridNotifiersImpl.h"
 #include "Cell.h"
 #include "CellImpl.h"
+#include "SQLStorages.h"
+#include "BattleGround/BattleGround.h"
+#include "OutdoorPvP/OutdoorPvP.h"
+#include "movementGenerators/WaypointMovementGenerator.h"
 
 #include "revision_nr.h"
 
@@ -37,12 +41,14 @@ ScriptMapMapName sGameObjectScripts;
 ScriptMapMapName sGameObjectTemplateScripts;
 ScriptMapMapName sEventScripts;
 ScriptMapMapName sGossipScripts;
+ScriptMapMapName sCreatureDeathScripts;
 ScriptMapMapName sCreatureMovementScripts;
 
 INSTANTIATE_SINGLETON_1(ScriptMgr);
 
 ScriptMgr::ScriptMgr() :
     m_hScriptLib(NULL),
+    m_scheduledScripts(0),
 
     m_pOnInitScriptLibrary(NULL),
     m_pOnFreeScriptLibrary(NULL),
@@ -71,9 +77,8 @@ ScriptMgr::ScriptMgr() :
     m_pOnEffectDummyCreature(NULL),
     m_pOnEffectDummyGO(NULL),
     m_pOnEffectDummyItem(NULL),
-    m_pOnAuraDummy(NULL),
-
-    m_scheduledScripts(0)
+    m_pOnEffectScriptEffectCreature(NULL),
+    m_pOnAuraDummy(NULL)
 {
 }
 
@@ -163,7 +168,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
         tmp.raw.data[0]  = fields[3].GetUInt32();
         tmp.raw.data[1]  = fields[4].GetUInt32();
         tmp.buddyEntry   = fields[5].GetUInt32();
-        tmp.searchRadius = fields[6].GetUInt32();
+        tmp.searchRadiusOrGuid = fields[6].GetUInt32();
         tmp.data_flags   = fields[7].GetUInt8();
         tmp.textId[0]    = fields[8].GetInt32();
         tmp.textId[1]    = fields[9].GetInt32();
@@ -175,7 +180,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
         tmp.o            = fields[15].GetFloat();
 
         // generic command args check
-        if (tmp.buddyEntry)                                 // Check Buddy args
+        if (tmp.buddyEntry && !(tmp.data_flags & SCRIPT_FLAG_BUDDY_BY_GUID))
         {
             if (tmp.IsCreatureBuddy() && !ObjectMgr::GetCreatureTemplate(tmp.buddyEntry))
             {
@@ -187,7 +192,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                 sLog.outErrorDb("Table `%s` has buddyEntry = %u in command %u for script id %u, but this gameobject_template does not exist, skipping.", tablename, tmp.buddyEntry, tmp.command, tmp.id);
                 continue;
             }
-            if (!tmp.searchRadius)
+            if (!tmp.searchRadiusOrGuid)
             {
                 sLog.outErrorDb("Table `%s` has searchRadius = 0 in command %u for script id %u for buddy %u, skipping.", tablename, tmp.command, tmp.id, tmp.buddyEntry);
                 continue;
@@ -196,39 +201,58 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
 
         if (tmp.data_flags)                                 // Check flags
         {
-            if (tmp.data_flags & ~(SCRIPT_FLAG_COMMAND_ADDITIONAL*2 - 1))
+            if (tmp.data_flags & ~MAX_SCRIPT_FLAG_VALID)
             {
                 sLog.outErrorDb("Table `%s` has invalid data_flags %u in command %u for script id %u, skipping.", tablename, tmp.data_flags, tmp.command, tmp.id);
                 continue;
             }
-            if (!tmp.HasAdditionalScriptFlag() && tmp.data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
+            if (!tmp.HasAdditionalScriptFlag() && (tmp.data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL))
             {
                 sLog.outErrorDb("Table `%s` has invalid data_flags %u in command %u for script id %u, skipping.", tablename, tmp.data_flags, tmp.command, tmp.id);
                 continue;
             }
-            if (tmp.data_flags & SCRIPT_FLAG_BUDDY_AS_TARGET && ! tmp.buddyEntry)
+            if ((tmp.data_flags & SCRIPT_FLAG_BUDDY_AS_TARGET) && ! tmp.buddyEntry)
             {
                 sLog.outErrorDb("Table `%s` has buddy required in data_flags %u in command %u for script id %u, but no buddy defined, skipping.", tablename, tmp.data_flags, tmp.command, tmp.id);
                 continue;
             }
-        }
-
-        switch (tmp.command)
-        {
-            case SCRIPT_COMMAND_TALK:                       // 0
+            if (tmp.data_flags & SCRIPT_FLAG_BUDDY_BY_GUID) // Check guid
             {
-                if (tmp.talk.chatType > CHAT_TYPE_ZONE_YELL)
+                if (tmp.IsCreatureBuddy())
                 {
-                    sLog.outErrorDb("Table `%s` has invalid CHAT_TYPE_ (datalong = %u) in SCRIPT_COMMAND_TALK for script id %u", tablename, tmp.talk.chatType, tmp.id);
-                    continue;
+                    CreatureData const* data = sObjectMgr.GetCreatureData(tmp.searchRadiusOrGuid);
+                    if (!data)
+                    {
+                        sLog.outErrorDb("Table `%s` has buddy defined by guid (SCRIPT_FLAG_BUDDY_BY_GUID %u set) but no npc spawned with guid %u, skipping.", tablename, SCRIPT_FLAG_BUDDY_BY_GUID,  tmp.searchRadiusOrGuid);
+                        continue;
+                    }
+                    if (data->id != tmp.buddyEntry)
+                    {
+                        sLog.outErrorDb("Table `%s` has buddy defined by guid (SCRIPT_FLAG_BUDDY_BY_GUID %u set) but spawned npc with guid %u has entry %u, expected buddy_entry is %u, skipping.", tablename, SCRIPT_FLAG_BUDDY_BY_GUID,  tmp.searchRadiusOrGuid, data->id, tmp.buddyEntry);
+                        continue;
+                    }
                 }
-
-                if (!GetLanguageDescByID(tmp.talk.language))
+                else
                 {
-                    sLog.outErrorDb("Table `%s` has datalong2 = %u in SCRIPT_COMMAND_TALK for script id %u, but this language does not exist.", tablename, tmp.talk.language, tmp.id);
-                    continue;
+                    GameObjectData const* data = sObjectMgr.GetGOData(tmp.searchRadiusOrGuid);
+                    if (!data)
+                    {
+                        sLog.outErrorDb("Table `%s` has go-buddy defined by guid (SCRIPT_FLAG_BUDDY_BY_GUID %u set) but no go spawned with guid %u, skipping.", tablename, SCRIPT_FLAG_BUDDY_BY_GUID,  tmp.searchRadiusOrGuid);
+                        continue;
+                    }
+                    if (data->id != tmp.buddyEntry)
+                    {
+                        sLog.outErrorDb("Table `%s` has go-buddy defined by guid (SCRIPT_FLAG_BUDDY_BY_GUID %u set) but spawned go with guid %u has entry %u, expected buddy_entry is %u, skipping.", tablename, SCRIPT_FLAG_BUDDY_BY_GUID,  tmp.searchRadiusOrGuid, data->id, tmp.buddyEntry);
+                        continue;
+                    }
                 }
+            }
+        }
 
+        switch (tmp.command)
+        {
+            case SCRIPT_COMMAND_TALK:                       // 0
+            {
                 if (tmp.textId[0] == 0)
                 {
                     sLog.outErrorDb("Table `%s` has invalid talk text id (dataint = %i) in SCRIPT_COMMAND_TALK for script id %u", tablename, tmp.textId[0], tmp.id);
@@ -239,7 +263,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                 {
                     if (tmp.textId[i] && (tmp.textId[i] < MIN_DB_SCRIPT_STRING_ID || tmp.textId[i] >= MAX_DB_SCRIPT_STRING_ID))
                     {
-                        sLog.outErrorDb("Table `%s` has out of range text id (dataint = %i expected %u-%u) in SCRIPT_COMMAND_TALK for script id %u", tablename, tmp.textId[i], MIN_DB_SCRIPT_STRING_ID, MAX_DB_SCRIPT_STRING_ID, tmp.id);
+                        sLog.outErrorDb("Table `%s` has out of range text_id%u (dataint = %i expected %u-%u) in SCRIPT_COMMAND_TALK for script id %u", tablename, i + 1, tmp.textId[i], MIN_DB_SCRIPT_STRING_ID, MAX_DB_SCRIPT_STRING_ID, tmp.id);
                         continue;
                     }
                 }
@@ -254,6 +278,14 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                     sLog.outErrorDb("Table `%s` has invalid emote id (datalong = %u) in SCRIPT_COMMAND_EMOTE for script id %u", tablename, tmp.emote.emoteId, tmp.id);
                     continue;
                 }
+                for (int i = 0; i < MAX_TEXT_ID; ++i)
+                {
+                    if (tmp.textId[i] && !sEmotesStore.LookupEntry(tmp.textId[i]))
+                    {
+                        sLog.outErrorDb("Table `%s` has invalid emote id (text_id%u = %u) in SCRIPT_COMMAND_EMOTE for script id %u", tablename, i + 1, tmp.textId[i], tmp.id);
+                        continue;
+                    }
+                }
                 break;
             }
             case SCRIPT_COMMAND_FIELD_SET:                  // 2
@@ -364,7 +396,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                     info->type == GAMEOBJECT_TYPE_BUTTON      ||
                     info->type == GAMEOBJECT_TYPE_TRAP)
                 {
-                    sLog.outErrorDb("Table `%s` have gameobject type (%u) unsupported by command SCRIPT_COMMAND_RESPAWN_GAMEOBJECT for script id %u", tablename, info->id, tmp.id);
+                    sLog.outErrorDb("Table `%s` have gameobject type (%u) unsupported by command SCRIPT_COMMAND_RESPAWN_GAMEOBJECT for script id %u", tablename, info->type, tmp.id);
                     continue;
                 }
                 break;
@@ -454,6 +486,11 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                         tablename, tmp.playSound.soundId, tmp.id);
                     continue;
                 }
+                // bitmask: 0/1=target-player, 0/2=with distance dependent, 0/4=map wide, 0/8=zone wide
+                if (tmp.playSound.flags & ~(1 | 2 | 4 | 8))
+                    sLog.outErrorDb("Table `%s` using unsupported sound flags (datalong2: %u) in SCRIPT_COMMAND_PLAY_SOUND for script id %u, unsupported flags will be ignored", tablename, tmp.playSound.flags, tmp.id);
+                if ((tmp.playSound.flags & (1 | 2)) > 0 && (tmp.playSound.flags & (4 | 8)) > 0)
+                    sLog.outErrorDb("Table `%s` uses sound flags (datalong2: %u) in SCRIPT_COMMAND_PLAY_SOUND for script id %u, combining (1|2) with (4|8) makes no sense", tablename, tmp.playSound.flags, tmp.id);
                 break;
             }
             case SCRIPT_COMMAND_CREATE_ITEM:                // 17
@@ -598,7 +635,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                         if (SpellEntry const* spell = sSpellStore.LookupEntry(i))
                             for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
                             {
-                                if (spell->Effect[j] == SPELL_EFFECT_SEND_TAXI && spell->EffectMiscValue[j] == tmp.sendTaxiPath.taxiPathId)
+                                if (spell->Effect[j] == SPELL_EFFECT_SEND_TAXI && spell->EffectMiscValue[j] == int32(tmp.sendTaxiPath.taxiPathId))
                                 {
                                     taxiSpell = i;
                                     break;
@@ -614,6 +651,33 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                 }
                 break;
             }
+            case SCRIPT_COMMAND_TERMINATE_SCRIPT:           // 31
+            {
+                if (tmp.terminateScript.npcEntry && !ObjectMgr::GetCreatureTemplate(tmp.terminateScript.npcEntry))
+                {
+                    sLog.outErrorDb("Table `%s` has datalong = %u in SCRIPT_COMMAND_TERMINATE_SCRIPT for script id %u, but this npc entry does not exist.", tablename, tmp.sendTaxiPath.taxiPathId, tmp.id);
+                    continue;
+                }
+                break;
+            }
+            case SCRIPT_COMMAND_PAUSE_WAYPOINTS:            // 32
+                break;
+            case SCRIPT_COMMAND_XP_USER:                    // 33
+                break;
+            case SCRIPT_COMMAND_TERMINATE_COND:             // 34
+            {
+                if (!sConditionStorage.LookupEntry<PlayerCondition>(tmp.terminateCond.conditionId))
+                {
+                    sLog.outErrorDb("Table `%s` has datalong = %u in SCRIPT_COMMAND_TERMINATE_COND for script id %u, but this condition_id does not exist.", tablename, tmp.terminateCond.conditionId, tmp.id);
+                    continue;
+                }
+                if (tmp.terminateCond.failQuest && !sObjectMgr.GetQuestTemplate(tmp.terminateCond.failQuest))
+                {
+                    sLog.outErrorDb("Table `%s` has datalong2 = %u in SCRIPT_COMMAND_TERMINATE_COND for script id %u, but this questId does not exist.", tablename, tmp.terminateCond.failQuest, tmp.id);
+                    continue;
+                }
+                break;
+            }
             default:
             {
                 sLog.outErrorDb("Table `%s` unknown command %u, skipping.", tablename, tmp.command);
@@ -639,55 +703,55 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
 
 void ScriptMgr::LoadGameObjectScripts()
 {
-    LoadScripts(sGameObjectScripts, "gameobject_scripts");
+    LoadScripts(sGameObjectScripts, "dbscripts_on_go_use");
 
     // check ids
     for(ScriptMapMap::const_iterator itr = sGameObjectScripts.second.begin(); itr != sGameObjectScripts.second.end(); ++itr)
     {
         if (!sObjectMgr.GetGOData(itr->first))
-            sLog.outErrorDb("Table `gameobject_scripts` has not existing gameobject (GUID: %u) as script id", itr->first);
+            sLog.outErrorDb("Table `dbscripts_on_go_use` has not existing gameobject (GUID: %u) as script id", itr->first);
     }
 }
 
 void ScriptMgr::LoadGameObjectTemplateScripts()
 {
-    LoadScripts(sGameObjectTemplateScripts, "gameobject_template_scripts");
+    LoadScripts(sGameObjectTemplateScripts, "dbscripts_on_go_template_use");
 
     // check ids
     for (ScriptMapMap::const_iterator itr = sGameObjectTemplateScripts.second.begin(); itr != sGameObjectTemplateScripts.second.end(); ++itr)
     {
         if (!sObjectMgr.GetGameObjectInfo(itr->first))
-            sLog.outErrorDb("Table `gameobject_template_scripts` has not existing gameobject (Entry: %u) as script id", itr->first);
+            sLog.outErrorDb("Table `dbscripts_on_go_template_use` has not existing gameobject (Entry: %u) as script id", itr->first);
     }
 }
 
 void ScriptMgr::LoadQuestEndScripts()
 {
-    LoadScripts(sQuestEndScripts, "quest_end_scripts");
+    LoadScripts(sQuestEndScripts, "dbscripts_on_quest_end");
 
     // check ids
     for(ScriptMapMap::const_iterator itr = sQuestEndScripts.second.begin(); itr != sQuestEndScripts.second.end(); ++itr)
     {
         if (!sObjectMgr.GetQuestTemplate(itr->first))
-            sLog.outErrorDb("Table `quest_end_scripts` has not existing quest (Id: %u) as script id", itr->first);
+            sLog.outErrorDb("Table `dbscripts_on_quest_end` has not existing quest (Id: %u) as script id", itr->first);
     }
 }
 
 void ScriptMgr::LoadQuestStartScripts()
 {
-    LoadScripts(sQuestStartScripts, "quest_start_scripts");
+    LoadScripts(sQuestStartScripts, "dbscripts_on_quest_start");
 
     // check ids
     for(ScriptMapMap::const_iterator itr = sQuestStartScripts.second.begin(); itr != sQuestStartScripts.second.end(); ++itr)
     {
         if (!sObjectMgr.GetQuestTemplate(itr->first))
-            sLog.outErrorDb("Table `quest_start_scripts` has not existing quest (Id: %u) as script id", itr->first);
+            sLog.outErrorDb("Table `dbscripts_on_quest_start` has not existing quest (Id: %u) as script id", itr->first);
     }
 }
 
 void ScriptMgr::LoadSpellScripts()
 {
-    LoadScripts(sSpellScripts, "spell_scripts");
+    LoadScripts(sSpellScripts, "dbscripts_on_spell");
 
     // check ids
     for (ScriptMapMap::const_iterator itr = sSpellScripts.second.begin(); itr != sSpellScripts.second.end(); ++itr)
@@ -695,7 +759,7 @@ void ScriptMgr::LoadSpellScripts()
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(itr->first);
         if (!spellInfo)
         {
-            sLog.outErrorDb("Table `spell_scripts` has not existing spell (Id: %u) as script id", itr->first);
+            sLog.outErrorDb("Table `dbscripts_on_spell` has not existing spell (Id: %u) as script id", itr->first);
             continue;
         }
 
@@ -711,96 +775,56 @@ void ScriptMgr::LoadSpellScripts()
         }
 
         if (!found)
-            sLog.outErrorDb("Table `spell_scripts` has unsupported spell (Id: %u)", itr->first);
+            sLog.outErrorDb("Table `dbscripts_on_spell` has unsupported spell (Id: %u)", itr->first);
     }
 }
 
 void ScriptMgr::LoadEventScripts()
 {
-    LoadScripts(sEventScripts, "event_scripts");
-
-    std::set<uint32> evt_scripts;
-
-    // Load all possible script entries from gameobjects
-    for(uint32 i = 1; i < sGOStorage.MaxEntry; ++i)
-    {
-        if (GameObjectInfo const* goInfo = sGOStorage.LookupEntry<GameObjectInfo>(i))
-        {
-            if (uint32 eventId = goInfo->GetEventScriptId())
-                evt_scripts.insert(eventId);
-
-            if (goInfo->type == GAMEOBJECT_TYPE_CAPTURE_POINT)
-            {
-                evt_scripts.insert(goInfo->capturePoint.neutralEventID1);
-                evt_scripts.insert(goInfo->capturePoint.neutralEventID2);
-                evt_scripts.insert(goInfo->capturePoint.contestedEventID1);
-                evt_scripts.insert(goInfo->capturePoint.contestedEventID2);
-                evt_scripts.insert(goInfo->capturePoint.progressEventID1);
-                evt_scripts.insert(goInfo->capturePoint.progressEventID2);
-                evt_scripts.insert(goInfo->capturePoint.winEventID1);
-                evt_scripts.insert(goInfo->capturePoint.winEventID2);
-            }
-        }
-    }
-
-    // Load all possible script entries from spells
-    for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
-    {
-        SpellEntry const* spell = sSpellStore.LookupEntry(i);
-        if (spell)
-        {
-            for(int j = 0; j < MAX_EFFECT_INDEX; ++j)
-            {
-                if (spell->Effect[j] == SPELL_EFFECT_SEND_EVENT)
-                {
-                    if (spell->EffectMiscValue[j])
-                        evt_scripts.insert(spell->EffectMiscValue[j]);
-                }
-            }
-        }
-    }
-
-    for(size_t path_idx = 0; path_idx < sTaxiPathNodesByPath.size(); ++path_idx)
-    {
-        for(size_t node_idx = 0; node_idx < sTaxiPathNodesByPath[path_idx].size(); ++node_idx)
-        {
-            TaxiPathNodeEntry const& node = sTaxiPathNodesByPath[path_idx][node_idx];
-
-            if (node.arrivalEventID)
-                evt_scripts.insert(node.arrivalEventID);
+    LoadScripts(sEventScripts, "dbscripts_on_event");
 
-            if (node.departureEventID)
-                evt_scripts.insert(node.departureEventID);
-        }
-    }
+    std::set<uint32> eventIds;                              // Store possible event ids
+    CollectPossibleEventIds(eventIds);
 
     // Then check if all scripts are in above list of possible script entries
     for(ScriptMapMap::const_iterator itr = sEventScripts.second.begin(); itr != sEventScripts.second.end(); ++itr)
     {
-        std::set<uint32>::const_iterator itr2 = evt_scripts.find(itr->first);
-        if (itr2 == evt_scripts.end())
-            sLog.outErrorDb("Table `event_scripts` has script (Id: %u) not referring to any gameobject_template type 10 data2 field, type 3 data6 field, type 13 data 2 field, type 29 or any spell effect %u or path taxi node data",
-                itr->first, SPELL_EFFECT_SEND_EVENT);
+        std::set<uint32>::const_iterator itr2 = eventIds.find(itr->first);
+        if (itr2 == eventIds.end())
+            sLog.outErrorDb("Table `dbscripts_on_event` has script (Id: %u) not referring to any fitting gameobject_template or any spell effect %u or path taxi node data",
+                            itr->first, SPELL_EFFECT_SEND_EVENT);
     }
 }
 
 void ScriptMgr::LoadGossipScripts()
 {
-    LoadScripts(sGossipScripts, "gossip_scripts");
+    LoadScripts(sGossipScripts, "dbscripts_on_gossip");
 
     // checks are done in LoadGossipMenuItems and LoadGossipMenu
 }
 
 void ScriptMgr::LoadCreatureMovementScripts()
 {
-    LoadScripts(sCreatureMovementScripts, "creature_movement_scripts");
+    LoadScripts(sCreatureMovementScripts, "dbscripts_on_creature_movement");
 
     // checks are done in WaypointManager::Load
 }
 
+void ScriptMgr::LoadCreatureDeathScripts()
+{
+    LoadScripts(sCreatureDeathScripts, "dbscripts_on_creature_death");
+
+    // check ids
+    for(ScriptMapMap::const_iterator itr = sCreatureDeathScripts.second.begin(); itr != sCreatureDeathScripts.second.end(); ++itr)
+    {
+        if (!sObjectMgr.GetCreatureTemplate(itr->first))
+            sLog.outErrorDb("Table `dbscripts_on_creature_death` has not existing creature (Entry: %u) as script id", itr->first);
+    }
+}
+
 void ScriptMgr::LoadDbScriptStrings()
 {
-    sObjectMgr.LoadMangosStrings(WorldDatabase, "db_script_string", MIN_DB_SCRIPT_STRING_ID, MAX_DB_SCRIPT_STRING_ID);
+    sObjectMgr.LoadMangosStrings(WorldDatabase, "db_script_string", MIN_DB_SCRIPT_STRING_ID, MAX_DB_SCRIPT_STRING_ID, true);
 
     std::set<int32> ids;
 
@@ -815,6 +839,7 @@ void ScriptMgr::LoadDbScriptStrings()
     CheckScriptTexts(sGameObjectTemplateScripts, ids);
     CheckScriptTexts(sEventScripts, ids);
     CheckScriptTexts(sGossipScripts, ids);
+    CheckScriptTexts(sCreatureDeathScripts, ids);
     CheckScriptTexts(sCreatureMovementScripts, ids);
 
     sWaypointMgr.CheckTextsExistance(ids);
@@ -886,8 +911,9 @@ bool ScriptAction::GetScriptCommandObject(const ObjectGuid guid, bool includeIte
             }
             // else no break, but display error message
         }
+        /* no break */
         default:
-            sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u with unsupported guid %s, skipping", m_table, m_script->id, m_script->command, guid.GetString().c_str());
+            sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u with unsupported guid %s, skipping", m_table, m_script->id, m_script->command, guid.GetString().c_str());
             return false;
     }
 
@@ -905,42 +931,81 @@ bool ScriptAction::GetScriptProcessTargets(WorldObject* pOrigSource, WorldObject
 
     if (m_script->buddyEntry)
     {
-        if (!pOrigSource && !pOrigTarget)
+        if (m_script->data_flags & SCRIPT_FLAG_BUDDY_BY_GUID)
         {
-            sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u called without buddy %u, but no source for search available, skipping.", m_table, m_script->id, m_script->command, m_script->buddyEntry);
-            return false;
+            if (m_script->IsCreatureBuddy())
+            {
+                CreatureInfo const* cinfo = ObjectMgr::GetCreatureTemplate(m_script->buddyEntry);
+                pBuddy = m_map->GetCreature(cinfo->GetObjectGuid(m_script->searchRadiusOrGuid));
+
+                if (pBuddy && !((Creature*)pBuddy)->isAlive())
+                {
+                    sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u has buddy %u by guid %u but buddy is dead, skipping.", m_table, m_script->id, m_script->command, m_script->buddyEntry, m_script->searchRadiusOrGuid);
+                    return false;
+                }
+            }
+            else
+            {
+                // GameObjectInfo const* ginfo = ObjectMgr::GetGameObjectInfo(m_script->buddyEntry);
+                pBuddy = m_map->GetGameObject(ObjectGuid(HIGHGUID_GAMEOBJECT, m_script->buddyEntry, m_script->searchRadiusOrGuid));
+            }
+            // TODO Maybe load related grid if not already done? How to handle multi-map case?
+            if (!pBuddy)
+            {
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u has buddy %u by guid %u not loaded in map %u (data-flags %u), skipping.", m_table, m_script->id, m_script->command, m_script->buddyEntry, m_script->searchRadiusOrGuid, m_map->GetId(), m_script->data_flags);
+                return false;
+            }
         }
+        else                                                // Buddy by entry
+        {
+            if (!pOrigSource && !pOrigTarget)
+            {
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u called without buddy %u, but no source for search available, skipping.", m_table, m_script->id, m_script->command, m_script->buddyEntry);
+                return false;
+            }
 
-        // Prefer non-players as searcher
-        WorldObject* pSearcher = pOrigSource ? pOrigSource : pOrigTarget;
-        if (pSearcher->GetTypeId() == TYPEID_PLAYER && pOrigTarget && pOrigTarget->GetTypeId() != TYPEID_PLAYER)
-            pSearcher = pOrigTarget;
+            // Prefer non-players as searcher
+            WorldObject* pSearcher = pOrigSource ? pOrigSource : pOrigTarget;
+            if (pSearcher->GetTypeId() == TYPEID_PLAYER && pOrigTarget && pOrigTarget->GetTypeId() != TYPEID_PLAYER)
+                pSearcher = pOrigTarget;
 
-        if (m_script->IsCreatureBuddy())
-        {
-            Creature* pCreatureBuddy = NULL;
+            if (m_script->IsCreatureBuddy())
+            {
+                Creature* pCreatureBuddy = NULL;
 
-            MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*pSearcher, m_script->buddyEntry, true, false, m_script->searchRadius);
-            MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(pCreatureBuddy, u_check);
+                MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*pSearcher, m_script->buddyEntry, true, false, m_script->searchRadiusOrGuid, true);
+                MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(pCreatureBuddy, u_check);
 
-            Cell::VisitGridObjects(pSearcher, searcher, m_script->searchRadius);
-            pBuddy = pCreatureBuddy;
-        }
-        else
-        {
-            GameObject* pGOBuddy = NULL;
+                if (m_script->data_flags & SCRIPT_FLAG_BUDDY_IS_PET)
+                    Cell::VisitWorldObjects(pSearcher, searcher, m_script->searchRadiusOrGuid);
+                else                                        // Normal Creature
+                    Cell::VisitGridObjects(pSearcher, searcher, m_script->searchRadiusOrGuid);
 
-            MaNGOS::NearestGameObjectEntryInObjectRangeCheck u_check(*pSearcher, m_script->buddyEntry, m_script->searchRadius);
-            MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck> searcher(pGOBuddy, u_check);
+                pBuddy = pCreatureBuddy;
 
-            Cell::VisitGridObjects(pSearcher, searcher, m_script->searchRadius);
-            pBuddy = pGOBuddy;
-        }
+                // TODO: Remove this extra check output after a while - it might have false effects
+                if (!pBuddy && pSearcher->GetEntry() == m_script->buddyEntry)
+                {
+                    sLog.outErrorDb(" DB-SCRIPTS: WARNING: Process table `%s` id %u, command %u has no OTHER buddy %u found - maybe you need to update the script?", m_table, m_script->id, m_script->command, m_script->buddyEntry);
+                    pBuddy = pSearcher;
+                }
+            }
+            else
+            {
+                GameObject* pGOBuddy = NULL;
 
-        if (!pBuddy)
-        {
-            sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u has buddy %u not found in range %u of searcher %s (data-flags %u), skipping.", m_table, m_script->id, m_script->command, m_script->buddyEntry, m_script->searchRadius, pSearcher->GetGuidStr().c_str(), m_script->data_flags);
-            return false;
+                MaNGOS::NearestGameObjectEntryInObjectRangeCheck u_check(*pSearcher, m_script->buddyEntry, m_script->searchRadiusOrGuid);
+                MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck> searcher(pGOBuddy, u_check);
+
+                Cell::VisitGridObjects(pSearcher, searcher, m_script->searchRadiusOrGuid);
+                pBuddy = pGOBuddy;
+            }
+
+            if (!pBuddy)
+            {
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u has buddy %u not found in range %u of searcher %s (data-flags %u), skipping.", m_table, m_script->id, m_script->command, m_script->buddyEntry, m_script->searchRadiusOrGuid, pSearcher->GetGuidStr().c_str(), m_script->data_flags);
+                return false;
+            }
         }
     }
 
@@ -969,7 +1034,7 @@ bool ScriptAction::LogIfNotCreature(WorldObject* pWorldObject)
 {
     if (!pWorldObject || pWorldObject->GetTypeId() != TYPEID_UNIT)
     {
-        sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u call for non-creature, skipping.", m_table, m_script->id, m_script->command);
+        sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u call for non-creature, skipping.", m_table, m_script->id, m_script->command);
         return true;
     }
     return false;
@@ -978,7 +1043,7 @@ bool ScriptAction::LogIfNotUnit(WorldObject* pWorldObject)
 {
     if (!pWorldObject || !pWorldObject->isType(TYPEMASK_UNIT))
     {
-        sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u call for non-unit, skipping.", m_table, m_script->id, m_script->command);
+        sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u call for non-unit, skipping.", m_table, m_script->id, m_script->command);
         return true;
     }
     return false;
@@ -987,7 +1052,7 @@ bool ScriptAction::LogIfNotGameObject(WorldObject* pWorldObject)
 {
     if (!pWorldObject || pWorldObject->GetTypeId() != TYPEID_GAMEOBJECT)
     {
-        sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u call for non-gameobject, skipping.", m_table, m_script->id, m_script->command);
+        sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u call for non-gameobject, skipping.", m_table, m_script->id, m_script->command);
         return true;
     }
     return false;
@@ -998,7 +1063,7 @@ Player* ScriptAction::GetPlayerTargetOrSourceAndLog(WorldObject* pSource, WorldO
 {
     if ((!pTarget || pTarget->GetTypeId() != TYPEID_PLAYER) && (!pSource || pSource->GetTypeId() != TYPEID_PLAYER))
     {
-        sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u call for non player, skipping.", m_table, m_script->id, m_script->command);
+        sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u call for non player, skipping.", m_table, m_script->id, m_script->command);
         return NULL;
     }
 
@@ -1006,23 +1071,32 @@ Player* ScriptAction::GetPlayerTargetOrSourceAndLog(WorldObject* pSource, WorldO
 }
 
 /// Handle one Script Step
-void ScriptAction::HandleScriptStep()
+// Return true if and only if further parts of this script shall be skipped
+bool ScriptAction::HandleScriptStep()
 {
-    Object* source = NULL;
-    Object* target = NULL;
-    if (!GetScriptCommandObject(m_sourceGuid, true, source))
-        return;
-    if (!GetScriptCommandObject(m_targetGuid, false, target))
-        return;
+    WorldObject* pSource;
+    WorldObject* pTarget;
+    Object* pSourceOrItem;                                  // Stores a provided pSource (if exists as WorldObject) or source-item
+
+    {                                                       // Add scope for source & target variables so that they are not used below
+        Object* source = NULL;
+        Object* target = NULL;
+        if (!GetScriptCommandObject(m_sourceGuid, true, source))
+            return false;
+        if (!GetScriptCommandObject(m_targetGuid, false, target))
+            return false;
 
-    // Give some debug log output for easier use
-    DEBUG_LOG("DB-SCRIPTS: Process table `%s` id %u, command %u for source %s (%sin world), target %s (%sin world)", m_table, m_script->id, m_script->command, m_sourceGuid.GetString().c_str(), source ? "" : "not ", m_targetGuid.GetString().c_str(), target ? "" : "not ");
+        // Give some debug log output for easier use
+        DEBUG_LOG("DB-SCRIPTS: Process table `%s` id %u, command %u for source %s (%sin world), target %s (%sin world)", m_table, m_script->id, m_script->command, m_sourceGuid.GetString().c_str(), source ? "" : "not ", m_targetGuid.GetString().c_str(), target ? "" : "not ");
 
-    // Get expected source and target (if defined with buddy)
-    WorldObject* pSource = source && source->isType(TYPEMASK_WORLDOBJECT) ? (WorldObject*)source : NULL;
-    WorldObject* pTarget = target && target->isType(TYPEMASK_WORLDOBJECT) ? (WorldObject*)target : NULL;
-    if (!GetScriptProcessTargets(pSource, pTarget, pSource, pTarget))
-        return;
+        // Get expected source and target (if defined with buddy)
+        pSource = source && source->isType(TYPEMASK_WORLDOBJECT) ? (WorldObject*)source : NULL;
+        pTarget = target && target->isType(TYPEMASK_WORLDOBJECT) ? (WorldObject*)target : NULL;
+        if (!GetScriptProcessTargets(pSource, pTarget, pSource, pTarget))
+            return false;
+
+        pSourceOrItem = pSource ? pSource : (source && source->isType(TYPEMASK_ITEM) ? source : NULL);
+    }
 
     switch (m_script->command)
     {
@@ -1030,7 +1104,7 @@ void ScriptAction::HandleScriptStep()
         {
             if (!pSource)
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u found no worldobject as source, skipping.", m_table, m_script->id, m_script->command);
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u found no worldobject as source, skipping.", m_table, m_script->id, m_script->command);
                 break;
             }
 
@@ -1051,42 +1125,8 @@ void ScriptAction::HandleScriptStep()
                 textId = m_script->textId[urand(0, i-1)];
             }
 
-            switch (m_script->talk.chatType)
-            {
-                case CHAT_TYPE_SAY:
-                    pSource->MonsterSay(textId, m_script->talk.language, unitTarget);
-                    break;
-                case CHAT_TYPE_YELL:
-                    pSource->MonsterYell(textId, m_script->talk.language, unitTarget);
-                    break;
-                case CHAT_TYPE_TEXT_EMOTE:
-                    pSource->MonsterTextEmote(textId, unitTarget);
-                    break;
-                case CHAT_TYPE_BOSS_EMOTE:
-                    pSource->MonsterTextEmote(textId, unitTarget, true);
-                    break;
-                case CHAT_TYPE_WHISPER:
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
-                    {
-                        sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u attempt to whisper (%u) to %s, skipping.", m_table, m_script->id, m_script->command, m_script->talk.chatType, unitTarget ? unitTarget->GetGuidStr().c_str() : "<no target>");
-                        break;
-                    }
-                    pSource->MonsterWhisper(textId, unitTarget);
-                    break;
-                case CHAT_TYPE_BOSS_WHISPER:
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
-                    {
-                        sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u attempt to whisper (%u) to %s, skipping.", m_table, m_script->id, m_script->command, m_script->talk.chatType, unitTarget ? unitTarget->GetGuidStr().c_str() : "<no target>");
-                        break;
-                    }
-                    pSource->MonsterWhisper(textId, unitTarget, true);
-                    break;
-                case CHAT_TYPE_ZONE_YELL:
-                    pSource->MonsterYellToZone(textId, m_script->talk.language, unitTarget);
-                    break;
-                default:
-                    break;                                  // must be already checked at load
-            }
+            if (!DoDisplayText(pSource, textId, unitTarget))
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, could not display text %i properly", m_table, m_script->id, textId);
             break;
         }
         case SCRIPT_COMMAND_EMOTE:                          // 1
@@ -1094,24 +1134,31 @@ void ScriptAction::HandleScriptStep()
             if (LogIfNotUnit(pSource))
                 break;
 
-            ((Unit*)pSource)->HandleEmote(m_script->emote.emoteId);
+            std::vector<uint32> emotes;
+            emotes.push_back(m_script->emote.emoteId);
+            for (int i = 0; i < MAX_TEXT_ID; ++i)
+            {
+                if (!m_script->textId[i])
+                    break;
+                emotes.push_back(uint32(m_script->textId[i]));
+            }
+
+            ((Unit*)pSource)->HandleEmote(emotes[urand(0, emotes.size() - 1)]);
             break;
         }
         case SCRIPT_COMMAND_FIELD_SET:                      // 2
-            // TODO
-            if (!source)
+            if (!pSourceOrItem)
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u call for NULL object.", m_table, m_script->id, m_script->command);
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u call for NULL object.", m_table, m_script->id, m_script->command);
                 break;
             }
-
-            if (m_script->setField.fieldId <= OBJECT_FIELD_ENTRY || m_script->setField.fieldId >= source->GetValuesCount())
+            if (m_script->setField.fieldId <= OBJECT_FIELD_ENTRY || m_script->setField.fieldId >= pSourceOrItem->GetValuesCount())
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u call for wrong field %u (max count: %u) in object (TypeId: %u).", m_table, m_script->id, m_script->command, m_script->setField.fieldId, source->GetValuesCount(), source->GetTypeId());
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u call for wrong field %u (max count: %u) in %s.",
+                                m_table, m_script->id, m_script->command, m_script->setField.fieldId, pSourceOrItem->GetValuesCount(), pSourceOrItem->GetGuidStr().c_str());
                 break;
             }
-
-            source->SetUInt32Value(m_script->setField.fieldId, m_script->setField.fieldValue);
+            pSourceOrItem->SetUInt32Value(m_script->setField.fieldId, m_script->setField.fieldValue);
             break;
         case SCRIPT_COMMAND_MOVE_TO:                        // 3
         {
@@ -1119,7 +1166,7 @@ void ScriptAction::HandleScriptStep()
                 break;
 
             // Just turn around
-            if (m_script->x == 0.0f && m_script->y == 0.0f && m_script->z == 0.0f ||
+            if ((m_script->x == 0.0f && m_script->y == 0.0f && m_script->z == 0.0f) ||
                 // Check point-to-point distance, hence revert effect of bounding radius
                 ((Unit*)pSource)->IsWithinDist3d(m_script->x, m_script->y, m_script->z, 0.01f - ((Unit*)pSource)->GetObjectBoundingRadius()))
             {
@@ -1145,36 +1192,32 @@ void ScriptAction::HandleScriptStep()
             break;
         }
         case SCRIPT_COMMAND_FLAG_SET:                       // 4
-            // TODO
-            if (!source)
+            if (!pSourceOrItem)
             {
-                sLog.outError("SCRIPT_COMMAND_FLAG_SET (script id %u) call for NULL object.", m_script->id);
+                sLog.outErrorDb("SCRIPT_COMMAND_FLAG_SET (script id %u) call for NULL object.", m_script->id);
                 break;
             }
-            if (m_script->setFlag.fieldId <= OBJECT_FIELD_ENTRY || m_script->setFlag.fieldId >= source->GetValuesCount())
+            if (m_script->setFlag.fieldId <= OBJECT_FIELD_ENTRY || m_script->setFlag.fieldId >= pSourceOrItem->GetValuesCount())
             {
-                sLog.outError("SCRIPT_COMMAND_FLAG_SET (script id %u) call for wrong field %u (max count: %u) in object (TypeId: %u).",
-                    m_script->id, m_script->setFlag.fieldId, source->GetValuesCount(), source->GetTypeId());
+                sLog.outErrorDb("SCRIPT_COMMAND_FLAG_SET (script id %u) call for wrong field %u (max count: %u) in %s.",
+                                m_script->id, m_script->setFlag.fieldId, pSourceOrItem->GetValuesCount(), pSourceOrItem->GetGuidStr().c_str());
                 break;
             }
-
-            source->SetFlag(m_script->setFlag.fieldId, m_script->setFlag.fieldValue);
+            pSourceOrItem->SetFlag(m_script->setFlag.fieldId, m_script->setFlag.fieldValue);
             break;
         case SCRIPT_COMMAND_FLAG_REMOVE:                    // 5
-            // TODO
-            if (!source)
+            if (!pSourceOrItem)
             {
-                sLog.outError("SCRIPT_COMMAND_FLAG_REMOVE (script id %u) call for NULL object.", m_script->id);
+                sLog.outErrorDb("SCRIPT_COMMAND_FLAG_REMOVE (script id %u) call for NULL object.", m_script->id);
                 break;
             }
-            if (m_script->removeFlag.fieldId <= OBJECT_FIELD_ENTRY || m_script->removeFlag.fieldId >= source->GetValuesCount())
+            if (m_script->removeFlag.fieldId <= OBJECT_FIELD_ENTRY || m_script->removeFlag.fieldId >= pSourceOrItem->GetValuesCount())
             {
-                sLog.outError("SCRIPT_COMMAND_FLAG_REMOVE (script id %u) call for wrong field %u (max count: %u) in object (TypeId: %u).",
-                    m_script->id, m_script->removeFlag.fieldId, source->GetValuesCount(), source->GetTypeId());
+                sLog.outErrorDb("SCRIPT_COMMAND_FLAG_REMOVE (script id %u) call for wrong field %u (max count: %u) in %s.",
+                                m_script->id, m_script->removeFlag.fieldId, pSourceOrItem->GetValuesCount(), pSourceOrItem->GetGuidStr().c_str());
                 break;
             }
-
-            source->RemoveFlag(m_script->removeFlag.fieldId, m_script->removeFlag.fieldValue);
+            pSourceOrItem->RemoveFlag(m_script->removeFlag.fieldId, m_script->removeFlag.fieldValue);
             break;
         case SCRIPT_COMMAND_TELEPORT_TO:                    // 6
         {
@@ -1200,7 +1243,7 @@ void ScriptAction::HandleScriptStep()
             // if we have a distance, we must have a worldobject
             if (m_script->questExplored.distance != 0 && !pWorldObject)
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u called without source worldobject, skipping.", m_table, m_script->id, m_script->command);
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u called without source worldobject, skipping.", m_table, m_script->id, m_script->command);
                 break;
             }
 
@@ -1226,7 +1269,7 @@ void ScriptAction::HandleScriptStep()
                 break;
 
             uint32 creatureEntry = m_script->killCredit.creatureEntry;
-            WorldObject* pRewardSource = pSource && pSource->GetTypeId() == TYPEID_UNIT ? pSource : (pTarget && pTarget->GetTypeId() == TYPEID_UNIT ? pTarget : NULL);
+            WorldObject* pRewardSource = (pSource && pSource->GetTypeId() == TYPEID_UNIT) ? pSource : ((pTarget && pTarget->GetTypeId() == TYPEID_UNIT) ? pTarget : NULL);
 
             // dynamic effect, take entry of reward Source
             if (!creatureEntry)
@@ -1235,13 +1278,18 @@ void ScriptAction::HandleScriptStep()
                     creatureEntry =  pRewardSource->GetEntry();
                 else
                 {
-                    sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u called for dynamic killcredit without creature partner, skipping.", m_table, m_script->id, m_script->command);
+                    sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u called for dynamic killcredit without creature partner, skipping.", m_table, m_script->id, m_script->command);
                     break;
                 }
             }
 
             if (m_script->killCredit.isGroupCredit)
-                pPlayer->RewardPlayerAndGroupAtEvent(creatureEntry, pRewardSource);
+            {
+                WorldObject* pSearcher = pRewardSource ? pRewardSource : (pSource ? pSource : pTarget);
+                if (pSearcher != pRewardSource)
+                    sLog.outDebug(" DB-SCRIPTS: Process table `%s` id %u, SCRIPT_COMMAND_KILL_CREDIT called for groupCredit without creature as searcher, script might need adjustment.", m_table, m_script->id);
+                pPlayer->RewardPlayerAndGroupAtEvent(creatureEntry, pSearcher);
+            }
             else
                 pPlayer->KilledMonsterCredit(creatureEntry, pRewardSource ? pRewardSource->GetObjectGuid() : ObjectGuid());
 
@@ -1271,7 +1319,7 @@ void ScriptAction::HandleScriptStep()
 
             if (!pGo)
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u failed for gameobject(guid: %u, buddyEntry: %u).", m_table, m_script->id, m_script->command, m_script->respawnGo.goGuid, m_script->buddyEntry);
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u failed for gameobject(guid: %u, buddyEntry: %u).", m_table, m_script->id, m_script->command, m_script->respawnGo.goGuid, m_script->buddyEntry);
                 break;
             }
 
@@ -1280,7 +1328,7 @@ void ScriptAction::HandleScriptStep()
                 pGo->GetGoType()==GAMEOBJECT_TYPE_BUTTON      ||
                 pGo->GetGoType()==GAMEOBJECT_TYPE_TRAP)
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u can not be used with gameobject of type %u (guid: %u, buddyEntry: %u).", m_table, m_script->id, m_script->command, uint32(pGo->GetGoType()), m_script->respawnGo.goGuid, m_script->buddyEntry);
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u can not be used with gameobject of type %u (guid: %u, buddyEntry: %u).", m_table, m_script->id, m_script->command, uint32(pGo->GetGoType()), m_script->respawnGo.goGuid, m_script->buddyEntry);
                 break;
             }
 
@@ -1296,7 +1344,7 @@ void ScriptAction::HandleScriptStep()
         {
             if (!pSource)
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u found no worldobject as source, skipping.", m_table, m_script->id, m_script->command);
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u found no worldobject as source, skipping.", m_table, m_script->id, m_script->command);
                 break;
             }
 
@@ -1305,10 +1353,10 @@ void ScriptAction::HandleScriptStep()
             float z = m_script->z;
             float o = m_script->o;
 
-            Creature* pCreature = pSource->SummonCreature(m_script->summonCreature.creatureEntry, x, y, z, o, m_script->summonCreature.despawnDelay ? TEMPSUMMON_TIMED_OR_DEAD_DESPAWN : TEMPSUMMON_DEAD_DESPAWN, m_script->summonCreature.despawnDelay, (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL) ? true: false);
+            Creature* pCreature = pSource->SummonCreature(m_script->summonCreature.creatureEntry, x, y, z, o, m_script->summonCreature.despawnDelay ? TEMPSUMMON_TIMED_OR_DEAD_OR_LOST_UNIQUENESS_DESPAWN : TEMPSUMMON_DEAD_OR_LOST_UNIQUENESS_DESPAWN, m_script->summonCreature.despawnDelay, (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL) ? true: false);
             if (!pCreature)
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u failed for creature (entry: %u).", m_table, m_script->id, m_script->command, m_script->summonCreature.creatureEntry);
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u failed for creature (entry: %u).", m_table, m_script->id, m_script->command, m_script->summonCreature.creatureEntry);
                 break;
             }
 
@@ -1339,24 +1387,24 @@ void ScriptAction::HandleScriptStep()
 
             if (!pDoor)
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u failed for gameobject(guid: %u, buddyEntry: %u).", m_table, m_script->id, m_script->command, m_script->changeDoor.goGuid, m_script->buddyEntry);
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u failed for gameobject(guid: %u, buddyEntry: %u).", m_table, m_script->id, m_script->command, m_script->changeDoor.goGuid, m_script->buddyEntry);
                 break;
             }
 
             if (pDoor->GetGoType() != GAMEOBJECT_TYPE_DOOR)
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u failed for non-door(GoType: %u).", m_table, m_script->id, m_script->command, pDoor->GetGoType());
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u failed for non-door(GoType: %u).", m_table, m_script->id, m_script->command, pDoor->GetGoType());
                 break;
             }
 
-            if (m_script->command == SCRIPT_COMMAND_OPEN_DOOR && pDoor->GetGoState() != GO_STATE_READY ||
-                m_script->command == SCRIPT_COMMAND_CLOSE_DOOR && pDoor->GetGoState() == GO_STATE_READY)
+            if ((m_script->command == SCRIPT_COMMAND_OPEN_DOOR && pDoor->GetGoState() != GO_STATE_READY) ||
+                (m_script->command == SCRIPT_COMMAND_CLOSE_DOOR && pDoor->GetGoState() == GO_STATE_READY))
                 break;                                      // to be opened door already open, or to be closed door already closed
 
             pDoor->UseDoorOrButton(time_to_reset);
 
             if (pTarget && pTarget->isType(TYPEMASK_GAMEOBJECT) && ((GameObject*)pTarget)->GetGoType() == GAMEOBJECT_TYPE_BUTTON)
-                ((GameObject*)target)->UseDoorOrButton(time_to_reset);
+                ((GameObject*)pTarget)->UseDoorOrButton(time_to_reset);
 
             break;
         }
@@ -1380,49 +1428,45 @@ void ScriptAction::HandleScriptStep()
         }
         case SCRIPT_COMMAND_CAST_SPELL:                     // 15
         {
-            if (LogIfNotUnit(pSource))
+            if (LogIfNotUnit(pTarget))                      // TODO - Change when support for casting without victim will be supported
                 break;
-            if (LogIfNotUnit(pTarget))
+
+            // TODO: when GO cast implemented, code below must be updated accordingly to also allow GO spell cast
+            if (pSource && pSource->GetTypeId() == TYPEID_GAMEOBJECT)
+            {
+                ((Unit*)pTarget)->CastSpell(((Unit*)pTarget), m_script->castSpell.spellId, true, NULL, NULL, pSource->GetObjectGuid());
                 break;
+            }
 
-            //TODO: when GO cast implemented, code below must be updated accordingly to also allow GO spell cast
+            if (LogIfNotUnit(pSource))
+                break;
             ((Unit*)pSource)->CastSpell(((Unit*)pTarget), m_script->castSpell.spellId, (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL) != 0);
 
             break;
         }
-        case SCRIPT_COMMAND_PLAY_SOUND:                     // 16 // TODO
+        case SCRIPT_COMMAND_PLAY_SOUND:                     // 16
         {
             if (!pSource)
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u could not find proper source", m_table, m_script->id, m_script->command);
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u could not find proper source", m_table, m_script->id, m_script->command);
                 break;
             }
 
-            // bitmask: 0/1=anyone/target, 0/2=with distance dependent
-            Player* pTarget = NULL;
-
+            // bitmask: 0/1=target-player, 0/2=with distance dependent, 0/4=map wide, 0/8=zone wide
+            Player* pSoundTarget = NULL;
             if (m_script->playSound.flags & 1)
             {
-                if (!target)
-                {
-                    sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u in targeted mode call for NULL target.", m_table, m_script->id, m_script->command);
-                    break;
-                }
-
-                if (target->GetTypeId() != TYPEID_PLAYER)
-                {
-                    sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u in targeted mode call for non-player (TypeId: %u), skipping.", m_table, m_script->id, m_script->command, target->GetTypeId());
+                pSoundTarget = GetPlayerTargetOrSourceAndLog(pSource, pTarget);
+                if (!pSoundTarget)
                     break;
-                }
-
-                pTarget = (Player*)target;
             }
 
-            // bitmask: 0/1=anyone/target, 0/2=with distance dependent
             if (m_script->playSound.flags & 2)
-                pSource->PlayDistanceSound(m_script->playSound.soundId, pTarget);
+                pSource->PlayDistanceSound(m_script->playSound.soundId, pSoundTarget);
+            else if (m_script->playSound.flags & (4 | 8))
+                m_map->PlayDirectSoundToMap(m_script->playSound.soundId, m_script->playSound.flags & 8 ? pSource->GetZoneId() : 0);
             else
-                pSource->PlayDirectSound(m_script->playSound.soundId, pTarget);
+                pSource->PlayDirectSound(m_script->playSound.soundId, pSoundTarget);
 
             break;
         }
@@ -1477,7 +1521,15 @@ void ScriptAction::HandleScriptStep()
                     ((Creature*)pSource)->GetMotionMaster()->MoveIdle();
                     break;
                 case RANDOM_MOTION_TYPE:
-                    ((Creature*)pSource)->GetMotionMaster()->MoveRandom();
+                    if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
+                        ((Creature*)pSource)->GetMotionMaster()->MoveRandomAroundPoint(pSource->GetPositionX(), pSource->GetPositionY(), pSource->GetPositionZ(), float(m_script->movement.wanderDistance));
+                    else
+                    {
+                        float respX, respY, respZ, respO, wander_distance;
+                        ((Creature*)pSource)->GetRespawnCoord(respX, respY, respZ, &respO, &wander_distance);
+                        wander_distance = m_script->movement.wanderDistance ? m_script->movement.wanderDistance : wander_distance;
+                        ((Creature*)pSource)->GetMotionMaster()->MoveRandomAroundPoint(respX, respY, respZ, wander_distance);
+                    }
                     break;
                 case WAYPOINT_MOTION_TYPE:
                     ((Creature*)pSource)->GetMotionMaster()->MoveWaypoint();
@@ -1549,7 +1601,7 @@ void ScriptAction::HandleScriptStep()
             if (LogIfNotCreature(pSource))
                 break;
 
-            ((Creature*)pSource)->SetWalk(!m_script->run.run);
+            ((Creature*)pSource)->SetWalk(!m_script->run.run, true);
 
             break;
         }
@@ -1560,16 +1612,35 @@ void ScriptAction::HandleScriptStep()
             if (LogIfNotUnit(pTarget))
                 break;
 
-            Creature* pAttacker = static_cast<Creature*>(pSource);
-            Unit* unitTarget = static_cast<Unit*>(target);
+            ObjectGuid sourceGuid = pSource->GetObjectGuid();
+            ObjectGuid targetGuid = pTarget->GetObjectGuid();
+
+            if (sourceGuid == targetGuid)
+            {
+                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u attacker try attack self, can not attack (Attacker: %s, Target: %s)", m_table, m_script->id, m_script->command, sourceGuid.GetString().c_str(), targetGuid.GetString().c_str());
+                break;
+            }
+
+            // fix for possible not-in-map script objects
+            Creature* pAttacker  = m_map->GetCreature(sourceGuid);
+            Unit* unitTarget     = m_map->GetUnit(targetGuid);
+
+            if (!unitTarget || !pAttacker ||
+                !unitTarget->IsInWorld() || !pAttacker->IsInWorld() ||
+                !unitTarget->isInAccessablePlaceFor(pAttacker))
+            {
+                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u target not accessable to attacker by some reason, can not attack (Attacker: %s, Target: %s)", m_table, m_script->id, m_script->command, sourceGuid.GetString().c_str(), targetGuid.GetString().c_str());
+                break;
+            }
 
             if (pAttacker->IsFriendlyTo(unitTarget))
             {
-                sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u attacker is friendly to target, can not attack (Attacker: %s, Target: %s)", m_table, m_script->id, m_script->command, pAttacker->GetGuidStr().c_str(), unitTarget->GetGuidStr().c_str());
+                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u attacker is friendly to target, can not attack (Attacker: %s, Target: %s)", m_table, m_script->id, m_script->command, pAttacker->GetGuidStr().c_str(), unitTarget->GetGuidStr().c_str());
                 break;
             }
 
-            pAttacker->AI()->AttackStart(unitTarget);
+            if (pAttacker->AI())
+                pAttacker->AI()->AttackStart(unitTarget);
 
             break;
         }
@@ -1597,6 +1668,7 @@ void ScriptAction::HandleScriptStep()
                 pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
             else if (m_script->goLockState.lockState & 0x08)
                 pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+            break;
         }
         case SCRIPT_COMMAND_STAND_STATE:                    // 28
         {
@@ -1639,10 +1711,115 @@ void ScriptAction::HandleScriptStep()
             pPlayer->ActivateTaxiPathTo(m_script->sendTaxiPath.taxiPathId);
             break;
         }
+        case SCRIPT_COMMAND_TERMINATE_SCRIPT:               // 31
+        {
+            bool result = false;
+            if (m_script->terminateScript.npcEntry)
+            {
+                WorldObject* pSearcher = pSource ? pSource : pTarget;
+                if (pSearcher->GetTypeId() == TYPEID_PLAYER && pTarget && pTarget->GetTypeId() != TYPEID_PLAYER)
+                    pSearcher = pTarget;
+
+                Creature* pCreatureBuddy = NULL;
+                MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*pSearcher, m_script->terminateScript.npcEntry, true, false, m_script->terminateScript.searchDist, true);
+                MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(pCreatureBuddy, u_check);
+                Cell::VisitGridObjects(pSearcher, searcher, m_script->terminateScript.searchDist);
+
+                if (!(m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL) && !pCreatureBuddy)
+                {
+                    DEBUG_LOG("DB-SCRIPTS: Process table `%s` id %u, terminate further steps of this script! (as searched other npc %u was not found alive)", m_table, m_script->id, m_script->terminateScript.npcEntry);
+                    result = true;
+                }
+                else if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL && pCreatureBuddy)
+                {
+                    DEBUG_LOG("DB-SCRIPTS: Process table `%s` id %u, terminate further steps of this script! (as searched other npc %u was found alive)", m_table, m_script->id, m_script->terminateScript.npcEntry);
+                    result = true;
+                }
+            }
+            else
+                result = true;
+
+            if (result)                                    // Terminate further steps of this script
+            {
+                if (m_script->textId[0] && !LogIfNotCreature(pSource))
+                {
+                    Creature* cSource = static_cast<Creature*>(pSource);
+                    if (cSource->IsInUnitState(UNIT_ACTION_DOWAYPOINTS))
+                        (static_cast<WaypointMovementGenerator<Creature>* >(cSource->GetMotionMaster()->CurrentMovementGenerator()))->AddToWaypointPauseTime(m_script->textId[0]);
+                }
+
+                return true;
+            }
+
+            break;
+        }
+        case SCRIPT_COMMAND_PAUSE_WAYPOINTS:                // 32
+        {
+            if (LogIfNotCreature(pSource))
+                return false;
+            if (m_script->pauseWaypoint.doPause)
+                ((Creature*)pSource)->addUnitState(UNIT_STAT_WAYPOINT_PAUSED);
+            else
+                ((Creature*)pSource)->clearUnitState(UNIT_STAT_WAYPOINT_PAUSED);
+            break;
+        }
+        case SCRIPT_COMMAND_XP_USER:                        // 33
+        {
+            Player* pPlayer = GetPlayerTargetOrSourceAndLog(pSource, pTarget);
+            if (!pPlayer)
+                break;
+
+            if (m_script->xpDisabled.flags)
+                pPlayer->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_XP_USER_DISABLED);
+            else
+                pPlayer->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_XP_USER_DISABLED);
+            break;
+        }
+        case SCRIPT_COMMAND_TERMINATE_COND:
+        {
+            Player* player = NULL;
+            WorldObject* second = pSource;
+            // First case: target is player
+            if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
+                player = static_cast<Player*>(pTarget);
+            // Second case: source is player
+            else if (pSource && pSource->GetTypeId() == TYPEID_PLAYER)
+            {
+                player = static_cast<Player*>(pSource);
+                second = pTarget;
+            }
+
+            bool terminateResult;
+            if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
+                terminateResult = !sObjectMgr.IsPlayerMeetToCondition(m_script->terminateCond.conditionId, player, m_map, second, CONDITION_FROM_DBSCRIPTS);
+            else
+                terminateResult = sObjectMgr.IsPlayerMeetToCondition(m_script->terminateCond.conditionId, player, m_map, second, CONDITION_FROM_DBSCRIPTS);
+
+            if (terminateResult && m_script->terminateCond.failQuest && player)
+            {
+                if (Group* group = player->GetGroup())
+                {
+                    for (GroupReference* groupRef = group->GetFirstMember(); groupRef != NULL; groupRef = groupRef->next())
+                    {
+                        Player* member = groupRef->getSource();
+                        if (member->GetQuestStatus(m_script->terminateCond.failQuest) == QUEST_STATUS_INCOMPLETE)
+                            member->FailQuest(m_script->terminateCond.failQuest);
+                    }
+                }
+                else
+                {
+                    if (player->GetQuestStatus(m_script->terminateCond.failQuest) == QUEST_STATUS_INCOMPLETE)
+                        player->FailQuest(m_script->terminateCond.failQuest);
+                }
+            }
+            return terminateResult;
+        }
         default:
-            sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u unknown command used.", m_table, m_script->id, m_script->command);
+            sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u unknown command used.", m_table, m_script->id, m_script->command);
             break;
     }
+
+    return false;
 }
 
 // /////////////////////////////////////////////////////////
@@ -1712,62 +1889,8 @@ void ScriptMgr::LoadEventIdScripts()
 
     BarGoLink bar(result->GetRowCount());
 
-    // TODO: remove duplicate code below, same way to collect event id's used in LoadEventScripts()
-    std::set<uint32> evt_scripts;
-
-    // Load all possible event entries from gameobjects
-    for (uint32 i = 1; i < sGOStorage.MaxEntry; ++i)
-    {
-        if (GameObjectInfo const* goInfo = sGOStorage.LookupEntry<GameObjectInfo>(i))
-        {
-            if (uint32 eventId = goInfo->GetEventScriptId())
-                evt_scripts.insert(eventId);
-
-            if (goInfo->type == GAMEOBJECT_TYPE_CAPTURE_POINT)
-            {
-                evt_scripts.insert(goInfo->capturePoint.neutralEventID1);
-                evt_scripts.insert(goInfo->capturePoint.neutralEventID2);
-                evt_scripts.insert(goInfo->capturePoint.contestedEventID1);
-                evt_scripts.insert(goInfo->capturePoint.contestedEventID2);
-                evt_scripts.insert(goInfo->capturePoint.progressEventID1);
-                evt_scripts.insert(goInfo->capturePoint.progressEventID2);
-                evt_scripts.insert(goInfo->capturePoint.winEventID1);
-                evt_scripts.insert(goInfo->capturePoint.winEventID2);
-            }
-        }
-    }
-
-    // Load all possible event entries from spells
-    for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
-    {
-        SpellEntry const* spell = sSpellStore.LookupEntry(i);
-        if (spell)
-        {
-            for(int j = 0; j < MAX_EFFECT_INDEX; ++j)
-            {
-                if (spell->Effect[j] == SPELL_EFFECT_SEND_EVENT)
-                {
-                    if (spell->EffectMiscValue[j])
-                        evt_scripts.insert(spell->EffectMiscValue[j]);
-                }
-            }
-        }
-    }
-
-    // Load all possible event entries from taxi path nodes
-    for(size_t path_idx = 0; path_idx < sTaxiPathNodesByPath.size(); ++path_idx)
-    {
-        for(size_t node_idx = 0; node_idx < sTaxiPathNodesByPath[path_idx].size(); ++node_idx)
-        {
-            TaxiPathNodeEntry const& node = sTaxiPathNodesByPath[path_idx][node_idx];
-
-            if (node.arrivalEventID)
-                evt_scripts.insert(node.arrivalEventID);
-
-            if (node.departureEventID)
-                evt_scripts.insert(node.departureEventID);
-        }
-    }
+    std::set<uint32> eventIds;                              // Store possible event ids
+    CollectPossibleEventIds(eventIds);
 
     do
     {
@@ -1779,8 +1902,8 @@ void ScriptMgr::LoadEventIdScripts()
         uint32 eventId          = fields[0].GetUInt32();
         const char *scriptName  = fields[1].GetString();
 
-        std::set<uint32>::const_iterator itr = evt_scripts.find(eventId);
-        if (itr == evt_scripts.end())
+        std::set<uint32>::const_iterator itr = eventIds.find(eventId);
+        if (itr == eventIds.end())
             sLog.outErrorDb("Table `scripted_event_id` has id %u not referring to any gameobject_template type 10 data2 field, type 3 data6 field, type 13 data 2 field, type 29 or any spell effect %u or path taxi node data",
                 eventId, SPELL_EFFECT_SEND_EVENT);
 
@@ -1948,7 +2071,7 @@ bool ScriptMgr::OnQuestRewarded(Player* pPlayer, GameObject* pGameObject, Quest
 uint32 ScriptMgr::GetDialogStatus(Player* pPlayer, Creature* pCreature)
 {
     if (!m_pGetNPCDialogStatus)
-        return 100;
+        return DIALOG_STATUS_UNDEFINED;
 
     return m_pGetNPCDialogStatus(pPlayer, pCreature);
 }
@@ -1956,7 +2079,7 @@ uint32 ScriptMgr::GetDialogStatus(Player* pPlayer, Creature* pCreature)
 uint32 ScriptMgr::GetDialogStatus(Player* pPlayer, GameObject* pGameObject)
 {
     if (!m_pGetGODialogStatus)
-        return 100;
+        return DIALOG_STATUS_UNDEFINED;
 
     return m_pGetGODialogStatus(pPlayer, pGameObject);
 }
@@ -1981,19 +2104,24 @@ bool ScriptMgr::OnProcessEvent(uint32 eventId, Object* pSource, Object* pTarget,
     return m_pOnProcessEvent != NULL && m_pOnProcessEvent(eventId, pSource, pTarget, isStart);
 }
 
-bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget)
+bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget, ObjectGuid originalCasterGuid)
 {
-    return m_pOnEffectDummyCreature != NULL && m_pOnEffectDummyCreature(pCaster, spellId, effIndex, pTarget);
+    return m_pOnEffectDummyCreature != NULL && m_pOnEffectDummyCreature(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
 }
 
-bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, GameObject* pTarget)
+bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, GameObject* pTarget, ObjectGuid originalCasterGuid)
 {
-    return m_pOnEffectDummyGO != NULL && m_pOnEffectDummyGO(pCaster, spellId, effIndex, pTarget);
+    return m_pOnEffectDummyGO != NULL && m_pOnEffectDummyGO(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
 }
 
-bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Item* pTarget)
+bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Item* pTarget, ObjectGuid originalCasterGuid)
 {
-    return m_pOnEffectDummyItem != NULL && m_pOnEffectDummyItem(pCaster, spellId, effIndex, pTarget);
+    return m_pOnEffectDummyItem != NULL && m_pOnEffectDummyItem(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
+}
+
+bool ScriptMgr::OnEffectScriptEffect(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget, ObjectGuid originalCasterGuid)
+{
+    return m_pOnEffectScriptEffectCreature != NULL && m_pOnEffectScriptEffectCreature(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
 }
 
 bool ScriptMgr::OnAuraDummy(Aura const* pAura, bool apply)
@@ -2010,6 +2138,8 @@ ScriptLoadResult ScriptMgr::LoadScriptLibrary(const char* libName)
 
     m_hScriptLib = MANGOS_LOAD_LIBRARY(name.c_str());
 
+    sLog.outString( ">> Loading %s Script library", name.c_str());
+
     if (!m_hScriptLib)
         return SCRIPT_LOAD_ERR_NOT_FOUND;
 
@@ -2017,6 +2147,7 @@ ScriptLoadResult ScriptMgr::LoadScriptLibrary(const char* libName)
         GetScriptHookPtr((P), (N));             \
         if (!(P))                               \
         {                                       \
+            sLog.outError("ScriptMgr::LoadScriptLibrary(): function %s not found!", N); \
             /* prevent call before init */      \
             m_pOnFreeScriptLibrary = NULL;      \
             UnloadScriptLibrary();              \
@@ -2055,6 +2186,7 @@ ScriptLoadResult ScriptMgr::LoadScriptLibrary(const char* libName)
     GET_SCRIPT_HOOK_PTR(m_pOnEffectDummyCreature,      "EffectDummyCreature");
     GET_SCRIPT_HOOK_PTR(m_pOnEffectDummyGO,            "EffectDummyGameObject");
     GET_SCRIPT_HOOK_PTR(m_pOnEffectDummyItem,          "EffectDummyItem");
+    GET_SCRIPT_HOOK_PTR(m_pOnEffectScriptEffectCreature, "EffectScriptEffectCreature");
     GET_SCRIPT_HOOK_PTR(m_pOnAuraDummy,                "AuraDummy");
 
 #   undef GET_SCRIPT_HOOK_PTR
@@ -2108,9 +2240,128 @@ void ScriptMgr::UnloadScriptLibrary()
     m_pOnEffectDummyCreature    = NULL;
     m_pOnEffectDummyGO          = NULL;
     m_pOnEffectDummyItem        = NULL;
+    m_pOnEffectScriptEffectCreature = NULL;
     m_pOnAuraDummy              = NULL;
 }
 
+void ScriptMgr::CollectPossibleEventIds(std::set<uint32>& eventIds)
+{
+    // Load all possible script entries from gameobjects
+    for (SQLStorageBase::SQLSIterator<GameObjectInfo> itr = sGOStorage.getDataBegin<GameObjectInfo>(); itr < sGOStorage.getDataEnd<GameObjectInfo>(); ++itr)
+    {
+        switch (itr->type)
+        {
+            case GAMEOBJECT_TYPE_GOOBER:
+                eventIds.insert(itr->goober.eventId);
+                break;
+            case GAMEOBJECT_TYPE_CHEST:
+                eventIds.insert(itr->chest.eventId);
+                break;
+            case GAMEOBJECT_TYPE_CAMERA:
+                eventIds.insert(itr->camera.eventID);
+                break;
+            case GAMEOBJECT_TYPE_CAPTURE_POINT:
+                eventIds.insert(itr->capturePoint.neutralEventID1);
+                eventIds.insert(itr->capturePoint.neutralEventID2);
+                eventIds.insert(itr->capturePoint.contestedEventID1);
+                eventIds.insert(itr->capturePoint.contestedEventID2);
+                eventIds.insert(itr->capturePoint.progressEventID1);
+                eventIds.insert(itr->capturePoint.progressEventID2);
+                eventIds.insert(itr->capturePoint.winEventID1);
+                eventIds.insert(itr->capturePoint.winEventID2);
+                break;
+            case GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING:
+                eventIds.insert(itr->destructibleBuilding.damagedEvent);
+                eventIds.insert(itr->destructibleBuilding.destroyedEvent);
+                eventIds.insert(itr->destructibleBuilding.intactEvent);
+                eventIds.insert(itr->destructibleBuilding.rebuildingEvent);
+                break;
+            default:
+                break;
+        }
+    }
+
+    // Load all possible script entries from spells
+    for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
+    {
+        SpellEntry const* spell = sSpellStore.LookupEntry(i);
+        if (spell)
+        {
+            for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
+            {
+                if (spell->Effect[j] == SPELL_EFFECT_SEND_EVENT)
+                {
+                    if (spell->EffectMiscValue[j])
+                        eventIds.insert(spell->EffectMiscValue[j]);
+                }
+            }
+        }
+    }
+
+    // Load all possible event entries from taxi path nodes
+    for (size_t path_idx = 0; path_idx < sTaxiPathNodesByPath.size(); ++path_idx)
+    {
+        for (size_t node_idx = 0; node_idx < sTaxiPathNodesByPath[path_idx].size(); ++node_idx)
+        {
+            TaxiPathNodeEntry const& node = sTaxiPathNodesByPath[path_idx][node_idx];
+
+            if (node.arrivalEventID)
+                eventIds.insert(node.arrivalEventID);
+
+            if (node.departureEventID)
+                eventIds.insert(node.departureEventID);
+        }
+    }
+}
+
+// Starters for events
+bool StartEvents_Event(Map* map, uint32 id, Object* source, Object* target, bool isStart/*=true*/, Unit* forwardToPvp/*=NULL*/)
+{
+    if (!map)
+        return false;
+
+    MANGOS_ASSERT(source);
+
+    // Handle SD2 script
+    if (sScriptMgr.OnProcessEvent(id, source, target, isStart))
+        return true;
+
+    // Handle PvP Calls
+    if (forwardToPvp && source->GetTypeId() == TYPEID_GAMEOBJECT)
+    {
+        BattleGround* bg = NULL;
+        OutdoorPvP* opvp = NULL;
+        if (forwardToPvp->GetTypeId() == TYPEID_PLAYER)
+        {
+            bg = ((Player*)forwardToPvp)->GetBattleGround();
+            if (!bg)
+                opvp = sOutdoorPvPMgr.GetScript(((Player*)forwardToPvp)->GetCachedZoneId());
+        }
+        else
+        {
+            if (map->IsBattleGroundOrArena())
+                bg = ((BattleGroundMap*)map)->GetBG();
+            else                                            // Use the go, because GOs don't move
+                opvp = sOutdoorPvPMgr.GetScript(((GameObject*)source)->GetZoneId());
+        }
+
+        if (bg && bg->HandleEvent(id, static_cast<GameObject*>(source)))
+            return true;
+
+        if (opvp && opvp->HandleEvent(id, static_cast<GameObject*>(source)))
+            return true;
+    }
+
+    Map::ScriptExecutionParam execParam = Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE_TARGET;
+    if (source->isType(TYPEMASK_CREATURE_OR_GAMEOBJECT))
+        execParam = Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE;
+    else if (target && target->isType(TYPEMASK_CREATURE_OR_GAMEOBJECT))
+        execParam = Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_TARGET;
+
+    return map->ScriptsStart(sEventScripts, id, source, target, execParam);
+}
+
+// Wrappers
 uint32 GetAreaTriggerScriptId(uint32 triggerId)
 {
     return sScriptMgr.GetAreaTriggerScriptId(triggerId);
@@ -2135,4 +2386,3 @@ uint32 GetScriptIdsCount()
 {
     return sScriptMgr.GetScriptIdsCount();
 }
-
diff --git a/src/game/ScriptMgr.h b/src/game/ScriptMgr.h
index 53dc05734c7..3669343bdf0 100644
--- a/src/game/ScriptMgr.h
+++ b/src/game/ScriptMgr.h
@@ -44,10 +44,9 @@ class WorldObject;
 enum ScriptCommand                                          // resSource, resTarget are the resulting Source/ Target after buddy search is done
 {
     SCRIPT_COMMAND_TALK                     = 0,            // resSource = WorldObject, resTarget = Unit/none
-                                                            // datalong1 (see enum ChatType for supported CHAT_TYPE_'s), datalong2 = language
                                                             // dataint = text entry from db_script_string -table. dataint2-4 optional for random selected texts.
     SCRIPT_COMMAND_EMOTE                    = 1,            // resSource = Unit, resTarget = Unit/none
-                                                            // datalong1 = emote_id
+                                                            // datalong1 = emote_id, dataint1-4 optional for random selected emotes
     SCRIPT_COMMAND_FIELD_SET                = 2,            // source = any, datalong = field_id, datalong2 = value
     SCRIPT_COMMAND_MOVE_TO                  = 3,            // resSource = Creature, datalong2 = travel_speed*100, x/y/z
                                                             // data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL: teleport unit to position
@@ -66,11 +65,12 @@ enum ScriptCommand                                          // resSource, resTar
     SCRIPT_COMMAND_CAST_SPELL               = 15,           // resSource = Unit, cast spell at resTarget = Unit
                                                             // datalong=spellid
                                                             // data_flags &  SCRIPT_FLAG_COMMAND_ADDITIONAL = cast triggered
-    SCRIPT_COMMAND_PLAY_SOUND               = 16,           // resSource = WorldObject, target=any/player, datalong (sound_id), datalong2 (bitmask: 0/1=anyone/target, 0/2=with distance dependent, so 1|2 = 3 is target with distance dependent)
+    SCRIPT_COMMAND_PLAY_SOUND               = 16,           // resSource = WorldObject, target=any/player, datalong (sound_id), datalong2 (bitmask: 0/1=target-player, 0/2=with distance dependent, 0/4=map wide, 0/8=zone wide; so 1|2 = 3 is target with distance dependent)
     SCRIPT_COMMAND_CREATE_ITEM              = 17,           // source or target must be player, datalong = item entry, datalong2 = amount
     SCRIPT_COMMAND_DESPAWN_SELF             = 18,           // resSource = Creature, datalong = despawn delay
     SCRIPT_COMMAND_PLAY_MOVIE               = 19,           // target can only be a player, datalog = movie id
-    SCRIPT_COMMAND_MOVEMENT                 = 20,           // resSource = Creature. datalong = MovementType (0:idle, 1:random or 2:waypoint)
+    SCRIPT_COMMAND_MOVEMENT                 = 20,           // resSource = Creature. datalong = MovementType (0:idle, 1:random or 2:waypoint), datalong2 = wander-distance
+                                                            // data_flags &  SCRIPT_FLAG_COMMAND_ADDITIONAL = Random-movement around current position
     SCRIPT_COMMAND_SET_ACTIVEOBJECT         = 21,           // resSource = Creature
                                                             // datalong=bool 0=off, 1=on
     SCRIPT_COMMAND_SET_FACTION              = 22,           // resSource = Creature
@@ -90,6 +90,16 @@ enum ScriptCommand                                          // resSource, resTar
                                                             // datalong=NPCFlags
                                                             // datalong2:0x00=toggle, 0x01=add, 0x02=remove
     SCRIPT_COMMAND_SEND_TAXI_PATH           = 30,           // datalong = taxi path id (source or target must be player)
+    SCRIPT_COMMAND_TERMINATE_SCRIPT         = 31,           // datalong = search for npc entry if provided
+                                                            // datalong2= search distance
+                                                            // data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL: terminate steps of this script if npc found
+                                                            //                                        ELSE: terminate steps of this script if npc not found
+                                                            // dataint=diff to change a waittime of current Waypoint Movement
+    SCRIPT_COMMAND_PAUSE_WAYPOINTS          = 32,           // resSource = Creature
+                                                            // datalong = 0: unpause waypoint 1: pause waypoint
+    SCRIPT_COMMAND_XP_USER                  = 33,           // source or target with Player, datalong = bool (0=off, 1=on)
+    SCRIPT_COMMAND_TERMINATE_COND           = 34,           // datalong = condition_id, datalong2 = if != 0 then quest_id of quest that will be failed for player's group if the script is terminated
+                                                            // data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL terminate when condition is false ELSE terminate when condition is true
 };
 
 #define MAX_TEXT_ID 4                                       // used for SCRIPT_COMMAND_TALK
@@ -100,7 +110,10 @@ enum ScriptInfoDataFlags
     SCRIPT_FLAG_REVERSE_DIRECTION           = 0x02,         // t* -> s* (* result after previous flag is evaluated)
     SCRIPT_FLAG_SOURCE_TARGETS_SELF         = 0x04,         // s* -> s* (* result after previous flag is evaluated)
     SCRIPT_FLAG_COMMAND_ADDITIONAL          = 0x08,         // command dependend
+    SCRIPT_FLAG_BUDDY_BY_GUID               = 0x10,         // take the buddy by guid
+    SCRIPT_FLAG_BUDDY_IS_PET                = 0x20,         // buddy is a pet
 };
+#define MAX_SCRIPT_FLAG_VALID               (2 * SCRIPT_FLAG_BUDDY_IS_PET - 1)
 
 struct ScriptInfo
 {
@@ -110,11 +123,7 @@ struct ScriptInfo
 
     union
     {
-        struct                                              // SCRIPT_COMMAND_TALK (0)
-        {
-            uint32 chatType;                                // datalong
-            uint32 language;                                // datalong2
-        } talk;
+        // datalong unused                                  // SCRIPT_COMMAND_TALK (0)
 
         struct                                              // SCRIPT_COMMAND_EMOTE (1)
         {
@@ -176,7 +185,8 @@ struct ScriptInfo
             uint32 despawnDelay;                            // datalong2
         } summonCreature;
 
-                                                            // SCRIPT_COMMAND_OPEN_DOOR (11)
+        // datalong unused                                  // SCRIPT_COMMAND_OPEN_DOOR (11)
+
         struct                                              // SCRIPT_COMMAND_CLOSE_DOOR (12)
         {
             uint32 goGuid;                                  // datalong
@@ -228,7 +238,7 @@ struct ScriptInfo
         struct                                              // SCRIPT_COMMAND_MOVEMENT (20)
         {
             uint32 movementType;                            // datalong
-            uint32 empty;                                   // datalong2
+            uint32 wanderDistance;                          // datalong2
         } movement;
 
         struct                                              // SCRIPT_COMMAND_SET_ACTIVEOBJECT (21)
@@ -261,11 +271,7 @@ struct ScriptInfo
             uint32 empty;                                   // datalong2
         } run;
 
-        struct                                              // SCRIPT_COMMAND_ATTACK_START (26)
-        {
-            uint32 empty1;                                  // datalong
-            uint32 empty2;                                  // datalong2
-        } attack;
+        // datalong unused                                  // SCRIPT_COMMAND_ATTACK_START (26)
 
         struct                                              // SCRIPT_COMMAND_GO_LOCK_STATE (27)
         {
@@ -285,12 +291,37 @@ struct ScriptInfo
             uint32 change_flag;                             // datalong2
         } npcFlag;
 
-        struct
+        struct                                              // SCRIPT_COMMAND_SEND_TAXI_PATH (30)
         {
             uint32 taxiPathId;                              // datalong
             uint32 empty;
         } sendTaxiPath;
 
+        struct                                              // SCRIPT_COMMAND_TERMINATE_SCRIPT (31)
+        {
+            uint32 npcEntry;                                // datalong
+            uint32 searchDist;                              // datalong2
+            // changeWaypointWaitTime                       // dataint
+        } terminateScript;
+
+        struct                                              // SCRIPT_COMMAND_PAUSE_WAYPOINTS (32)
+        {
+            uint32 doPause;                                 // datalong
+            uint32 empty;
+        } pauseWaypoint;
+
+        struct                                              // SCRIPT_COMMAND_XP_USER (33)
+        {
+            uint32 flags;                                   // datalong
+            uint32 empty;                                   // datalong2
+        } xpDisabled;
+
+        struct                                              // SCRIPT_COMMAND_TERMINATE_COND (34)
+        {
+            uint32 conditionId;                             // datalong
+            uint32 failQuest;                               // datalong2
+        } terminateCond;
+
         struct
         {
             uint32 data[2];
@@ -298,8 +329,8 @@ struct ScriptInfo
     };
 
     // Buddy system (entry can be npc or go entry, depending on command)
-    uint32 buddyEntry;                                      // datalong3 -> buddy_entry
-    uint32 searchRadius;                                    // datalong4 -> search_radius
+    uint32 buddyEntry;                                      // buddy_entry
+    uint32 searchRadiusOrGuid;                              // search_radius (can also be guid in case of SCRIPT_FLAG_BUDDY_BY_GUID)
     uint8 data_flags;                                       // data_flags
 
     int32 textId[MAX_TEXT_ID];                              // dataint to dataint4
@@ -346,8 +377,11 @@ struct ScriptInfo
             case SCRIPT_COMMAND_MOVE_TO:
             case SCRIPT_COMMAND_TEMP_SUMMON_CREATURE:
             case SCRIPT_COMMAND_CAST_SPELL:
+            case SCRIPT_COMMAND_MOVEMENT:
             case SCRIPT_COMMAND_MORPH_TO_ENTRY_OR_MODEL:
             case SCRIPT_COMMAND_MOUNT_TO_ENTRY_OR_MODEL:
+            case SCRIPT_COMMAND_TERMINATE_SCRIPT:
+            case SCRIPT_COMMAND_TERMINATE_COND:
                 return true;
             default:
                 return false;
@@ -362,15 +396,29 @@ class ScriptAction
             m_table(_table), m_map(_map), m_sourceGuid(_sourceGuid), m_targetGuid(_targetGuid), m_ownerGuid(_ownerGuid), m_script(_script)
         {}
 
-        void HandleScriptStep();
+        bool HandleScriptStep();                            // return true IF AND ONLY IF the script should be terminated
+
+        const char* GetTableName() const { return m_table; }
+        uint32 GetId() const { return m_script->id; }
+        ObjectGuid GetSourceGuid() const { return m_sourceGuid; }
+        ObjectGuid GetTargetGuid() const { return m_targetGuid; }
+        ObjectGuid GetOwnerGuid() const { return m_ownerGuid; }
+
+        bool IsSameScript(const char* table, uint32 id, ObjectGuid sourceGuid, ObjectGuid targetGuid, ObjectGuid ownerGuid) const
+        {
+            return table == m_table && id == GetId() &&
+                (sourceGuid == m_sourceGuid || !sourceGuid) &&
+                (targetGuid == m_targetGuid || !targetGuid) &&
+                (ownerGuid == m_ownerGuid || !ownerGuid);
+        }
 
     private:
+        const char* m_table;                                // of which table the script was started
+        Map* m_map;                                         // Map on which the action will be executed
         ObjectGuid m_sourceGuid;
         ObjectGuid m_targetGuid;
         ObjectGuid m_ownerGuid;                             // owner of source if source is item
-        const char* m_table;                                // of which table the script was started
         ScriptInfo const* m_script;                         // pointer to static script data
-        Map* m_map;                                         // Map on which the action will be executed
 
         // Helper functions
         bool GetScriptCommandObject(const ObjectGuid guid, bool includeItem, Object*& resultObject);
@@ -392,6 +440,7 @@ extern ScriptMapMapName sGameObjectScripts;
 extern ScriptMapMapName sGameObjectTemplateScripts;
 extern ScriptMapMapName sEventScripts;
 extern ScriptMapMapName sGossipScripts;
+extern ScriptMapMapName sCreatureDeathScripts;
 extern ScriptMapMapName sCreatureMovementScripts;
 
 enum ScriptLoadResult
@@ -415,6 +464,7 @@ class ScriptMgr
         void LoadEventScripts();
         void LoadSpellScripts();
         void LoadGossipScripts();
+        void LoadCreatureDeathScripts();
         void LoadCreatureMovementScripts();
 
         void LoadDbScriptStrings();
@@ -456,15 +506,18 @@ class ScriptMgr
         uint32 GetDialogStatus(Player* pPlayer, Creature* pCreature);
         uint32 GetDialogStatus(Player* pPlayer, GameObject* pGameObject);
         bool OnGameObjectUse(Player* pPlayer, GameObject* pGameObject);
+        bool OnGameObjectDestroyed(Unit* pWho, GameObject* pGameObject);
         bool OnItemUse(Player* pPlayer, Item* pItem, SpellCastTargets const& targets);
         bool OnAreaTrigger(Player* pPlayer, AreaTriggerEntry const* atEntry);
         bool OnProcessEvent(uint32 eventId, Object* pSource, Object* pTarget, bool isStart);
-        bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget);
-        bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, GameObject* pTarget);
-        bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Item* pTarget);
+        bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget, ObjectGuid originalCasterGuid);
+        bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, GameObject* pTarget, ObjectGuid originalCasterGuid);
+        bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Item* pTarget, ObjectGuid originalCasterGuid);
+        bool OnEffectScriptEffect(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget, ObjectGuid originalCasterGuid);
         bool OnAuraDummy(Aura const* pAura, bool apply);
 
     private:
+        void CollectPossibleEventIds(std::set<uint32>& eventIds);
         void LoadScripts(ScriptMapMapName& scripts, const char* tablename);
         void CheckScriptTexts(ScriptMapMapName const& scripts, std::set<int32>& ids);
 
@@ -485,7 +538,7 @@ class ScriptMgr
         MANGOS_LIBRARY_HANDLE   m_hScriptLib;
 
         //atomic op counter for active scripts amount
-        ACE_Atomic_Op<ACE_Thread_Mutex, long> m_scheduledScripts;
+        ACE_Atomic_Op<MANGOSR2_MUTEX_MODEL_2, uint32> m_scheduledScripts;
 
         void (MANGOS_IMPORT* m_pOnInitScriptLibrary)();
         void (MANGOS_IMPORT* m_pOnFreeScriptLibrary)();
@@ -511,12 +564,16 @@ class ScriptMgr
         bool (MANGOS_IMPORT* m_pOnItemUse) (Player*, Item*, SpellCastTargets const&);
         bool (MANGOS_IMPORT* m_pOnAreaTrigger) (Player*, AreaTriggerEntry const*);
         bool (MANGOS_IMPORT* m_pOnProcessEvent) (uint32, Object*, Object*, bool);
-        bool (MANGOS_IMPORT* m_pOnEffectDummyCreature) (Unit*, uint32, SpellEffectIndex, Creature*);
-        bool (MANGOS_IMPORT* m_pOnEffectDummyGO) (Unit*, uint32, SpellEffectIndex, GameObject*);
-        bool (MANGOS_IMPORT* m_pOnEffectDummyItem) (Unit*, uint32, SpellEffectIndex, Item*);
+        bool (MANGOS_IMPORT* m_pOnEffectDummyCreature) (Unit*, uint32, SpellEffectIndex, Creature*, ObjectGuid);
+        bool (MANGOS_IMPORT* m_pOnEffectDummyGO) (Unit*, uint32, SpellEffectIndex, GameObject*, ObjectGuid);
+        bool (MANGOS_IMPORT* m_pOnEffectDummyItem) (Unit*, uint32, SpellEffectIndex, Item*, ObjectGuid);
+        bool (MANGOS_IMPORT* m_pOnEffectScriptEffectCreature)(Unit*, uint32, SpellEffectIndex, Creature*, ObjectGuid);
         bool (MANGOS_IMPORT* m_pOnAuraDummy) (Aura const*, bool);
 };
 
+// Starters for events
+bool StartEvents_Event(Map* map, uint32 id, Object* source, Object* target, bool isStart = true, Unit* forwardToPvp = NULL);
+
 #define sScriptMgr MaNGOS::Singleton<ScriptMgr>::Instance()
 
 MANGOS_DLL_SPEC uint32 GetAreaTriggerScriptId(uint32 triggerId);
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index 878b8a2c898..9cda8047420 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -101,6 +101,11 @@ enum Classes
     (1<<(CLASS_DEATH_KNIGHT-1)) )
 
 #define CLASSMASK_ALL_CREATURES ((1<<(CLASS_WARRIOR-1)) | (1<<(CLASS_PALADIN-1)) | (1<<(CLASS_ROGUE-1)) | (1<<(CLASS_MAGE-1)) )
+#define MAX_CREATURE_CLASS 4
+
+// array index could be used to store class data only Warrior, Paladin, Rogue and Mage are indexed for creature
+//                                                  W  P     R           M
+static const uint8 classToIndex[MAX_CLASSES] = { 0, 0, 1, 0, 2, 0, 0, 0, 3, 0, 0, 0 };
 
 #define CLASSMASK_WAND_USERS ((1<<(CLASS_PRIEST-1))|(1<<(CLASS_MAGE-1))|(1<<(CLASS_WARLOCK-1)))
 
@@ -143,17 +148,32 @@ enum Stats
 
 enum Powers
 {
-    POWER_MANA                          = 0,
-    POWER_RAGE                          = 1,
-    POWER_FOCUS                         = 2,
-    POWER_ENERGY                        = 3,
-    POWER_HAPPINESS                     = 4,
-    POWER_RUNE                          = 5,
-    POWER_RUNIC_POWER                   = 6,
+    POWER_MANA                          = 0,            // UNIT_FIELD_POWER1
+    POWER_RAGE                          = 1,            // UNIT_FIELD_POWER2
+    POWER_FOCUS                         = 2,            // UNIT_FIELD_POWER3
+    POWER_ENERGY                        = 3,            // UNIT_FIELD_POWER4
+    POWER_HAPPINESS                     = 4,            // UNIT_FIELD_POWER5
+    POWER_RUNE                          = 5,            // UNIT_FIELD_POWER6
+    POWER_RUNIC_POWER                   = 6,            // UNIT_FIELD_POWER7
+    POWER_SOUL_SHARDS                   = 7,
+    POWER_ECLIPSE                       = 8,
+    POWER_HOLY_POWER                    = 9,
+    POWER_ALTERNATIVE                   = 10,
+    MAX_POWERS                          = 7,            // in 3.xx client only 7 power types
     POWER_HEALTH                        = 0xFFFFFFFE    // (-2 as signed value)
 };
 
-#define MAX_POWERS                        7
+enum EnergyType
+{
+    ENERGY_TYPE_UNK0      = 0,                          // Possible mana or flat energy.
+    ENERGY_TYPE_UNK1      = 1,                          // 2 vehicles in 3.3.5a
+    ENERGY_TYPE_PYRITE    = 41,                         // 2 vehicles in 3.3.5a
+    ENERGY_TYPE_STEAM     = 61,                         // 9 vehicles in 3.3.5a
+    ENERGY_TYPE_HEAT      = 101,
+    ENERGY_TYPE_OOZE      = 121,                        // 1 vehicle  in 3.3.5a
+    ENERGY_TYPE_BLOOD     = 141,                        // 1 vehicle  in 3.3.5a
+    ENERGY_TYPE_WRATH     = 142,                        // 1 vehicle  in 3.3.5a
+};
 
 enum SpellSchools
 {
@@ -230,18 +250,21 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
 // Spell Attributes definitions
 // ***********************************
 
+#define SpellAttributesEx1 SpellAttributesEx
+#define SpellAttributesEx0 SpellAttributes
+
 enum SpellAttributes
 {
     SPELL_ATTR_UNK0                            = 0x00000001,            // 0
     SPELL_ATTR_RANGED                          = 0x00000002,            // 1 All ranged abilites have this flag
     SPELL_ATTR_ON_NEXT_SWING_1                 = 0x00000004,            // 2 on next swing
     SPELL_ATTR_UNK3                            = 0x00000008,            // 3 not set in 3.0.3
-    SPELL_ATTR_UNK4                            = 0x00000010,            // 4 isAbility
+    SPELL_ATTR_ABILITY                         = 0x00000010,            // 4 client puts 'ability' instead of 'spell' in game strings for these spells
     SPELL_ATTR_TRADESPELL                      = 0x00000020,            // 5 trade spells, will be added by client to a sublist of profession spell
     SPELL_ATTR_PASSIVE                         = 0x00000040,            // 6 Passive spell
-    SPELL_ATTR_UNK7                            = 0x00000080,            // 7 can't be linked in chat?
-    SPELL_ATTR_UNK8                            = 0x00000100,            // 8 hide created item in tooltip (for effect=24)
-    SPELL_ATTR_UNK9                            = 0x00000200,            // 9
+    SPELL_ATTR_HIDDEN_CLIENTSIDE               = 0x00000080,            // 7 Spells with this attribute are not visible in spellbook or aura bar
+    SPELL_ATTR_HIDE_IN_COMBAT_LOG              = 0x00000100,            // 8 This attribite controls whether spell appears in combat logs
+    SPELL_ATTR_TARGET_MAINHAND_ITEM            = 0x00000200,            // 9 Client automatically selects item from mainhand slot as a cast target
     SPELL_ATTR_ON_NEXT_SWING_2                 = 0x00000400,            // 10 on next swing 2
     SPELL_ATTR_UNK11                           = 0x00000800,            // 11
     SPELL_ATTR_DAYTIME_ONLY                    = 0x00001000,            // 12 only useable at daytime, not set in 2.4.2
@@ -255,14 +278,14 @@ enum SpellAttributes
     SPELL_ATTR_STOP_ATTACK_TARGET              = 0x00100000,            // 20 Stop attack after use this spell (and not begin attack if use)
     SPELL_ATTR_IMPOSSIBLE_DODGE_PARRY_BLOCK    = 0x00200000,            // 21 Cannot be dodged/parried/blocked
     SPELL_ATTR_SET_TRACKING_TARGET             = 0x00400000,            // 22 SetTrackingTarget
-    SPELL_ATTR_UNK23                           = 0x00800000,            // 23 castable while dead?
+    SPELL_ATTR_CASTABLE_WHILE_DEAD             = 0x00800000,            // 23 castable while dead or not spawned/invisible (for creatures)
     SPELL_ATTR_CASTABLE_WHILE_MOUNTED          = 0x01000000,            // 24 castable while mounted
     SPELL_ATTR_DISABLED_WHILE_ACTIVE           = 0x02000000,            // 25 Activate and start cooldown after aura fade or remove summoned creature or go
     SPELL_ATTR_UNK26                           = 0x04000000,            // 26
     SPELL_ATTR_CASTABLE_WHILE_SITTING          = 0x08000000,            // 27 castable while sitting
     SPELL_ATTR_CANT_USED_IN_COMBAT             = 0x10000000,            // 28 Cannot be used in combat
     SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY   = 0x20000000,            // 29 unaffected by invulnerability (hmm possible not...)
-    SPELL_ATTR_UNK30                           = 0x40000000,            // 30 breakable by damage?
+    SPELL_ATTR_BREAKABLE_BY_DAMAGE             = 0x40000000,            // 30 breakable by damage?
     SPELL_ATTR_CANT_CANCEL                     = 0x80000000,            // 31 positive aura can't be canceled
 };
 
@@ -271,7 +294,7 @@ enum SpellAttributesEx
     SPELL_ATTR_EX_UNK0                         = 0x00000001,            // 0
     SPELL_ATTR_EX_DRAIN_ALL_POWER              = 0x00000002,            // 1 use all power (Only paladin Lay of Hands and Bunyanize)
     SPELL_ATTR_EX_CHANNELED_1                  = 0x00000004,            // 2 channeled 1
-    SPELL_ATTR_EX_UNK3                         = 0x00000008,            // 3
+    SPELL_ATTR_EX_CANT_REFLECTED               = 0x00000008,            // 3 used for detect can or not spell reflected
     SPELL_ATTR_EX_UNK4                         = 0x00000010,            // 4
     SPELL_ATTR_EX_NOT_BREAK_STEALTH            = 0x00000020,            // 5 Not break stealth
     SPELL_ATTR_EX_CHANNELED_2                  = 0x00000040,            // 6 channeled 2
@@ -281,12 +304,12 @@ enum SpellAttributesEx
     SPELL_ATTR_EX_NO_THREAT                    = 0x00000400,            // 10 no generates threat on cast 100%
     SPELL_ATTR_EX_UNK11                        = 0x00000800,            // 11
     SPELL_ATTR_EX_UNK12                        = 0x00001000,            // 12
-    SPELL_ATTR_EX_UNK13                        = 0x00002000,            // 13
-    SPELL_ATTR_EX_UNK14                        = 0x00004000,            // 14
+    SPELL_ATTR_EX_FARSIGHT                     = 0x00002000,            // 13 related to farsight (this not fully correct, but used in mangos. /dev/rsa)
+    SPELL_ATTR_EX_CHANNEL_TRACKING_TARGET      = 0x00004000,            // 14 Client automatically forces player to face target when channeling
     SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY     = 0x00008000,            // 15 remove auras on immunity
     SPELL_ATTR_EX_UNAFFECTED_BY_SCHOOL_IMMUNE  = 0x00010000,            // 16 unaffected by school immunity
     SPELL_ATTR_EX_UNK17                        = 0x00020000,            // 17 for auras SPELL_AURA_TRACK_CREATURES, SPELL_AURA_TRACK_RESOURCES and SPELL_AURA_TRACK_STEALTHED select non-stacking tracking spells
-    SPELL_ATTR_EX_UNK18                        = 0x00040000,            // 18
+    SPELL_ATTR_EX_BREAKABLE_BY_ANY_DAMAGE      = 0x00040000,            // 18 auras with this attribute breaked by any damage (not CrowdControl auras)
     SPELL_ATTR_EX_UNK19                        = 0x00080000,            // 19
     SPELL_ATTR_EX_REQ_TARGET_COMBO_POINTS      = 0x00100000,            // 20 Req combo points on target
     SPELL_ATTR_EX_UNK21                        = 0x00200000,            // 21
@@ -296,17 +319,17 @@ enum SpellAttributesEx
     SPELL_ATTR_EX_UNK25                        = 0x02000000,            // 25
     SPELL_ATTR_EX_UNK26                        = 0x04000000,            // 26
     SPELL_ATTR_EX_UNK27                        = 0x08000000,            // 27
-    SPELL_ATTR_EX_UNK28                        = 0x10000000,            // 28
-    SPELL_ATTR_EX_UNK29                        = 0x20000000,            // 29
+    SPELL_ATTR_EX_HIDDEN_AURA                  = 0x10000000,            // 28 client doesn't display these spells in aura bar (special and server-side spells)
+    SPELL_ATTR_EX_CHANNEL_DISPLAY_SPELL_NAME   = 0x20000000,            // 29 spell name is displayed in cast bar instead of 'channeling' text
     SPELL_ATTR_EX_UNK30                        = 0x40000000,            // 30 overpower
     SPELL_ATTR_EX_UNK31                        = 0x80000000,            // 31
 };
 
 enum SpellAttributesEx2
 {
-    SPELL_ATTR_EX2_UNK0                        = 0x00000001,            // 0
+    SPELL_ATTR_EX2_ALLOW_DEAD_TARGET           = 0x00000001,            // 0
     SPELL_ATTR_EX2_UNK1                        = 0x00000002,            // 1
-    SPELL_ATTR_EX2_CANT_REFLECTED              = 0x00000004,            // 2 ? used for detect can or not spell reflected // do not need LOS (e.g. 18220 since 3.3.3)
+    SPELL_ATTR_EX2_IGNORE_LOS                  = 0x00000004,            // 2 do not need LOS (e.g. 18220 since 3.3.3)
     SPELL_ATTR_EX2_UNK3                        = 0x00000008,            // 3 auto targeting? (e.g. fishing skill enhancement items since 3.3.3)
     SPELL_ATTR_EX2_UNK4                        = 0x00000010,            // 4
     SPELL_ATTR_EX2_AUTOREPEAT_FLAG             = 0x00000020,            // 5
@@ -321,7 +344,7 @@ enum SpellAttributesEx2
     SPELL_ATTR_EX2_UNK14                       = 0x00004000,            // 14
     SPELL_ATTR_EX2_UNK15                       = 0x00008000,            // 15 not set in 3.0.3
     SPELL_ATTR_EX2_UNK16                       = 0x00010000,            // 16
-    SPELL_ATTR_EX2_UNK17                       = 0x00020000,            // 17 suspend weapon timer instead of resetting it, (?Hunters Shot and Stings only have this flag?)
+    SPELL_ATTR_EX2_NOT_RESET_AUTOSHOT          = 0x00020000,            // 17 Hunters Shot and Stings only have this flag
     SPELL_ATTR_EX2_UNK18                       = 0x00040000,            // 18 Only Revive pet - possible req dead pet
     SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT         = 0x00080000,            // 19 does not necessarly need shapeshift
     SPELL_ATTR_EX2_UNK20                       = 0x00100000,            // 20
@@ -343,12 +366,12 @@ enum SpellAttributesEx3
     SPELL_ATTR_EX3_UNK0                        = 0x00000001,            // 0
     SPELL_ATTR_EX3_UNK1                        = 0x00000002,            // 1
     SPELL_ATTR_EX3_UNK2                        = 0x00000004,            // 2
-    SPELL_ATTR_EX3_UNK3                        = 0x00000008,            // 3
-    SPELL_ATTR_EX3_UNK4                        = 0x00000010,            // 4 Druid Rebirth only this spell have this flag
+    SPELL_ATTR_EX3_MELEE                       = 0x00000008,            // 3
+    SPELL_ATTR_EX3_IGNORE_RESURRECTION_TIMER   = 0x00000010,            // 4 you don't have to wait to be resurrected with these spells
     SPELL_ATTR_EX3_UNK5                        = 0x00000020,            // 5
     SPELL_ATTR_EX3_UNK6                        = 0x00000040,            // 6
-    SPELL_ATTR_EX3_UNK7                        = 0x00000080,            // 7 create a separate (de)buff stack for each caster
-    SPELL_ATTR_EX3_UNK8                        = 0x00000100,            // 8
+    SPELL_ATTR_EX3_STACK_FOR_DIFF_CASTERS      = 0x00000080,            // 7 create a separate (de)buff stack for each caster
+    SPELL_ATTR_EX3_TARGET_ONLY_PLAYER          = 0x00000100,            // 8 Can target only player
     SPELL_ATTR_EX3_UNK9                        = 0x00000200,            // 9
     SPELL_ATTR_EX3_MAIN_HAND                   = 0x00000400,            // 10 Main hand weapon required
     SPELL_ATTR_EX3_BATTLEGROUND                = 0x00000800,            // 11 Can casted only on battleground
@@ -356,41 +379,41 @@ enum SpellAttributesEx3
     SPELL_ATTR_EX3_UNK13                       = 0x00002000,            // 13
     SPELL_ATTR_EX3_UNK14                       = 0x00004000,            // 14 "Honorless Target" only this spells have this flag
     SPELL_ATTR_EX3_UNK15                       = 0x00008000,            // 15 Auto Shoot, Shoot, Throw,  - this is autoshot flag
-    SPELL_ATTR_EX3_UNK16                       = 0x00010000,            // 16 no triggers effects that trigger on casting a spell??
+    SPELL_ATTR_EX3_CANT_TRIGGER_PROC           = 0x00010000,            // 16 no triggers effects that trigger on casting a spell??
     SPELL_ATTR_EX3_NO_INITIAL_AGGRO            = 0x00020000,            // 17 Causes no aggro if not missed
     SPELL_ATTR_EX3_CANT_MISS                   = 0x00040000,            // 18 Spell should always hit its target
-    SPELL_ATTR_EX3_UNK19                       = 0x00080000,            // 19
+    SPELL_ATTR_EX3_IMPROVER                    = 0x00080000,            // 19 only spells, that improve other spells
     SPELL_ATTR_EX3_DEATH_PERSISTENT            = 0x00100000,            // 20 Death persistent spells
     SPELL_ATTR_EX3_UNK21                       = 0x00200000,            // 21
     SPELL_ATTR_EX3_REQ_WAND                    = 0x00400000,            // 22 Req wand
     SPELL_ATTR_EX3_UNK23                       = 0x00800000,            // 23
     SPELL_ATTR_EX3_REQ_OFFHAND                 = 0x01000000,            // 24 Req offhand weapon
     SPELL_ATTR_EX3_UNK25                       = 0x02000000,            // 25 no cause spell pushback ?
-    SPELL_ATTR_EX3_UNK26                       = 0x04000000,            // 26
+    SPELL_ATTR_EX3_CAN_PROC_WITH_TRIGGERED     = 0x04000000,            // 26 auras with this attribute can proc from triggered spell casts (?)
     SPELL_ATTR_EX3_UNK27                       = 0x08000000,            // 27
     SPELL_ATTR_EX3_UNK28                       = 0x10000000,            // 28
-    SPELL_ATTR_EX3_UNK29                       = 0x20000000,            // 29
-    SPELL_ATTR_EX3_UNK30                       = 0x40000000,            // 30
+    SPELL_ATTR_EX3_DISABLE_MODS                = 0x20000000,            // 29 Client doesn't apply spellmods for those spells (mostly mounting and like this spells)
+    SPELL_ATTR_EX3_DONT_DISPLAY_RANGE          = 0x40000000,            // 30 client doesn't display range in tooltip for those spells
     SPELL_ATTR_EX3_UNK31                       = 0x80000000,            // 31
 };
 
 enum SpellAttributesEx4
 {
-    SPELL_ATTR_EX4_UNK0                        = 0x00000001,            // 0
+    SPELL_ATTR_EX4_IGNORE_RESISTANCES          = 0x00000001,            // 0 not may be resisted (in magic case) and have binary resistance method (in melee case).
     SPELL_ATTR_EX4_UNK1                        = 0x00000002,            // 1 proc on finishing move?
     SPELL_ATTR_EX4_UNK2                        = 0x00000004,            // 2
     SPELL_ATTR_EX4_UNK3                        = 0x00000008,            // 3
     SPELL_ATTR_EX4_UNK4                        = 0x00000010,            // 4 This will no longer cause guards to attack on use??
     SPELL_ATTR_EX4_UNK5                        = 0x00000020,            // 5
     SPELL_ATTR_EX4_NOT_STEALABLE               = 0x00000040,            // 6 although such auras might be dispellable, they cannot be stolen
-    SPELL_ATTR_EX4_UNK7                        = 0x00000080,            // 7
+    SPELL_ATTR_EX4_FORCE_TRIGGERED             = 0x00000080,            // 7 forced triggered?
     SPELL_ATTR_EX4_STACK_DOT_MODIFIER          = 0x00000100,            // 8 no effect on non DoTs?
     SPELL_ATTR_EX4_UNK9                        = 0x00000200,            // 9
     SPELL_ATTR_EX4_SPELL_VS_EXTEND_COST        = 0x00000400,            // 10 Rogue Shiv have this flag
     SPELL_ATTR_EX4_UNK11                       = 0x00000800,            // 11
     SPELL_ATTR_EX4_UNK12                       = 0x00001000,            // 12
     SPELL_ATTR_EX4_UNK13                       = 0x00002000,            // 13
-    SPELL_ATTR_EX4_UNK14                       = 0x00004000,            // 14
+    SPELL_ATTR_EX4_DAMAGE_DOESNT_BREAK_AURAS   = 0x00004000,            // 14 doesn't break auras by damage from these spells
     SPELL_ATTR_EX4_UNK15                       = 0x00008000,            // 15
     SPELL_ATTR_EX4_NOT_USABLE_IN_ARENA         = 0x00010000,            // 16 not usable in arena
     SPELL_ATTR_EX4_USABLE_IN_ARENA             = 0x00020000,            // 17 usable in arena
@@ -401,7 +424,7 @@ enum SpellAttributesEx4
     SPELL_ATTR_EX4_UNK22                       = 0x00400000,            // 22
     SPELL_ATTR_EX4_UNK23                       = 0x00800000,            // 23
     SPELL_ATTR_EX4_UNK24                       = 0x01000000,            // 24
-    SPELL_ATTR_EX4_UNK25                       = 0x02000000,            // 25 pet scaling auras
+    SPELL_ATTR_EX4_PET_SCALING_AURA            = 0x02000000,            // 25 pet scaling auras
     SPELL_ATTR_EX4_CAST_ONLY_IN_OUTLAND        = 0x04000000,            // 26 Can only be used in Outland.
     SPELL_ATTR_EX4_UNK27                       = 0x08000000,            // 27
     SPELL_ATTR_EX4_UNK28                       = 0x10000000,            // 28
@@ -412,9 +435,9 @@ enum SpellAttributesEx4
 
 enum SpellAttributesEx5
 {
-    SPELL_ATTR_EX5_UNK0                        = 0x00000001,            // 0
+    SPELL_ATTR_EX5_UNK0                        = 0x00000001,            // 0 possible no interrupt from channel spell when caster move
     SPELL_ATTR_EX5_NO_REAGENT_WHILE_PREP       = 0x00000002,            // 1 not need reagents if UNIT_FLAG_PREPARATION
-    SPELL_ATTR_EX5_UNK2                        = 0x00000004,            // 2 removed at enter arena (e.g. 31850 since 3.3.3)
+    SPELL_ATTR_EX5_REMOVE_AT_ENTER_ARENA       = 0x00000004,            // 2 removed at enter arena (e.g. 31850 since 3.3.3)
     SPELL_ATTR_EX5_USABLE_WHILE_STUNNED        = 0x00000008,            // 3 usable while stunned
     SPELL_ATTR_EX5_UNK4                        = 0x00000010,            // 4
     SPELL_ATTR_EX5_SINGLE_TARGET_SPELL         = 0x00000020,            // 5 Only one target can be apply at a time
@@ -422,10 +445,10 @@ enum SpellAttributesEx5
     SPELL_ATTR_EX5_UNK7                        = 0x00000080,            // 7
     SPELL_ATTR_EX5_UNK8                        = 0x00000100,            // 8
     SPELL_ATTR_EX5_START_PERIODIC_AT_APPLY     = 0x00000200,            // 9  begin periodic tick at aura apply
-    SPELL_ATTR_EX5_UNK10                       = 0x00000400,            // 10
+    SPELL_ATTR_EX5_NO_DURATION                 = 0x00000400,            // 10 not send duration to client
     SPELL_ATTR_EX5_UNK11                       = 0x00000800,            // 11
     SPELL_ATTR_EX5_UNK12                       = 0x00001000,            // 12
-    SPELL_ATTR_EX5_UNK13                       = 0x00002000,            // 13 haste affects duration (e.g. 8050 since 3.3.3)
+    SPELL_ATTR_EX5_AFFECTED_BY_HASTE           = 0x00002000,            // 13 haste affects duration (e.g. 8050 since 3.3.3)
     SPELL_ATTR_EX5_UNK14                       = 0x00004000,            // 14
     SPELL_ATTR_EX5_UNK15                       = 0x00008000,            // 15
     SPELL_ATTR_EX5_UNK16                       = 0x00010000,            // 16
@@ -456,12 +479,12 @@ enum SpellAttributesEx6
     SPELL_ATTR_EX6_UNK5                        = 0x00000020,            // 5
     SPELL_ATTR_EX6_UNK6                        = 0x00000040,            // 6
     SPELL_ATTR_EX6_UNK7                        = 0x00000080,            // 7
-    SPELL_ATTR_EX6_UNK8                        = 0x00000100,            // 8
-    SPELL_ATTR_EX6_UNK9                        = 0x00000200,            // 9
-    SPELL_ATTR_EX6_UNK10                       = 0x00000400,            // 10
+    SPELL_ATTR_EX6_IGNORE_CCED_TARGETS         = 0x00000100,            // 8
+    SPELL_ATTR_EX6_IGNORE_DETECTION            = 0x00000200,            // 9 many spells, ignored unit detections/phasing.
+    SPELL_ATTR_EX6_NORMAL_DIFFICULTY           = 0x00000400,            // 10 this spells not have heroic difficulty versions in DBC (may be only one from effects?)
     SPELL_ATTR_EX6_NOT_IN_RAID_INSTANCE        = 0x00000800,            // 11 not usable in raid instance
-    SPELL_ATTR_EX6_UNK12                       = 0x00001000,            // 12 for auras SPELL_AURA_TRACK_CREATURES, SPELL_AURA_TRACK_RESOURCES and SPELL_AURA_TRACK_STEALTHED select non-stacking tracking spells
-    SPELL_ATTR_EX6_UNK13                       = 0x00002000,            // 13
+    SPELL_ATTR_EX6_CASTABLE_ON_VEHICLE         = 0x00001000,            // 12 for auras SPELL_AURA_TRACK_CREATURES, SPELL_AURA_TRACK_RESOURCES and SPELL_AURA_TRACK_STEALTHED select non-stacking tracking spells
+    SPELL_ATTR_EX6_CAN_TARGET_INVISIBLE        = 0x00002000,            // 13 ignore visibility requirement for spell target (phases, invisibility, etc.)
     SPELL_ATTR_EX6_UNK14                       = 0x00004000,            // 14
     SPELL_ATTR_EX6_UNK15                       = 0x00008000,            // 15 not set in 3.0.3
     SPELL_ATTR_EX6_UNK16                       = 0x00010000,            // 16
@@ -469,12 +492,12 @@ enum SpellAttributesEx6
     SPELL_ATTR_EX6_UNK18                       = 0x00040000,            // 18
     SPELL_ATTR_EX6_UNK19                       = 0x00080000,            // 19
     SPELL_ATTR_EX6_UNK20                       = 0x00100000,            // 20
-    SPELL_ATTR_EX6_UNK21                       = 0x00200000,            // 21
-    SPELL_ATTR_EX6_UNK22                       = 0x00400000,            // 22
-    SPELL_ATTR_EX6_UNK23                       = 0x00800000,            // 23 not set in 3.0.3
+    SPELL_ATTR_EX6_EXPLICIT_NO_BINARY_RESIST   = 0x00200000,            // 21
+    SPELL_ATTR_EX6_PCT_ABSORB                  = 0x00400000,            // 22
+    SPELL_ATTR_EX6_NO_STACK_DEBUFF_MAJOR       = 0x00800000,            // 23 only debuff and debuff-like spells in 3.3.5a
     SPELL_ATTR_EX6_UNK24                       = 0x01000000,            // 24 not set in 3.0.3
     SPELL_ATTR_EX6_UNK25                       = 0x02000000,            // 25 not set in 3.0.3
-    SPELL_ATTR_EX6_UNK26                       = 0x04000000,            // 26 not set in 3.0.3
+    SPELL_ATTR_EX6_NO_STACK_BUFF               = 0x04000000,            // 26 not set in 3.0.3
     SPELL_ATTR_EX6_UNK27                       = 0x08000000,            // 27 not set in 3.0.3
     SPELL_ATTR_EX6_UNK28                       = 0x10000000,            // 28 not set in 3.0.3
     SPELL_ATTR_EX6_NO_DMG_MODS                 = 0x20000000,            // 29 do not apply damage mods (usually in cases where it has already been applied)
@@ -487,23 +510,23 @@ enum SpellAttributesEx7
     SPELL_ATTR_EX7_UNK0                        = 0x00000001,            // 0
     SPELL_ATTR_EX7_UNK1                        = 0x00000002,            // 1
     SPELL_ATTR_EX7_PALADIN_AURA                = 0x00000004,            // 2
-    SPELL_ATTR_EX7_UNK3                        = 0x00000008,            // 3
+    SPELL_ATTR_EX7_GM_ONLY                     = 0x00000008,            // 3 Cannot cast if caster doesn't have UnitFlag2 & UNIT_FLAG2_GM_MODE
     SPELL_ATTR_EX7_UNK4                        = 0x00000010,            // 4
     SPELL_ATTR_EX7_TOTEM_SPELL                 = 0x00000020,            // 5  shaman summon totem spells
     SPELL_ATTR_EX7_UNK6                        = 0x00000040,            // 6
     SPELL_ATTR_EX7_UNK7                        = 0x00000080,            // 7
     SPELL_ATTR_EX7_UNK8                        = 0x00000100,            // 8
     SPELL_ATTR_EX7_UNK9                        = 0x00000200,            // 9
-    SPELL_ATTR_EX7_UNK10                       = 0x00000400,            // 10
-    SPELL_ATTR_EX7_UNK11                       = 0x00000800,            // 11
+    SPELL_ATTR_EX7_DISPEL_CHARGES              = 0x00000400,            // 10 Dispel and Spellsteal individual charges instead of whole aura.
+    SPELL_ATTR_EX7_INTERRUPT_ONLY_NONPLAYER    = 0x00000800,            // 11 Only non-player casts interrupt, though Feral Charge - Bear has it.
     SPELL_ATTR_EX7_UNK12                       = 0x00001000,            // 12
     SPELL_ATTR_EX7_UNK13                       = 0x00002000,            // 13
     SPELL_ATTR_EX7_UNK14                       = 0x00004000,            // 14
     SPELL_ATTR_EX7_UNK15                       = 0x00008000,            // 15
     SPELL_ATTR_EX7_UNK16                       = 0x00010000,            // 16
     SPELL_ATTR_EX7_UNK17                       = 0x00020000,            // 17
-    SPELL_ATTR_EX7_UNK18                       = 0x00040000,            // 18
-    SPELL_ATTR_EX7_UNK19                       = 0x00080000,            // 19
+    SPELL_ATTR_EX7_HAS_CHARGE_EFFECT           = 0x00040000,            // 18 Only spell with Charge effect (used for calculate traectory/delay)
+    SPELL_ATTR_EX7_ZONE_TELEPORT               = 0x00080000,            // 19 Teleports to specific zones.
     SPELL_ATTR_EX7_UNK20                       = 0x00100000,            // 20
     SPELL_ATTR_EX7_UNK21                       = 0x00200000,            // 21
     SPELL_ATTR_EX7_UNK22                       = 0x00400000,            // 22
@@ -512,12 +535,13 @@ enum SpellAttributesEx7
     SPELL_ATTR_EX7_UNK25                       = 0x02000000,            // 25
     SPELL_ATTR_EX7_UNK26                       = 0x04000000,            // 26
     SPELL_ATTR_EX7_UNK27                       = 0x08000000,            // 27
-    SPELL_ATTR_EX7_UNK28                       = 0x10000000,            // 28
+    SPELL_ATTR_EX7_REPLACEABLE_AURA            = 0x10000000,            // 28
     SPELL_ATTR_EX7_UNK29                       = 0x20000000,            // 29
     SPELL_ATTR_EX7_UNK30                       = 0x40000000,            // 30
     SPELL_ATTR_EX7_UNK31                       = 0x80000000,            // 31
 };
 
+
 #define MAX_TALENT_SPEC_COUNT   2
 #define MAX_GLYPH_SLOT_INDEX    6
 
@@ -588,10 +612,23 @@ enum Language
 enum Team
 {
     TEAM_NONE           = 0,                                // used when team value unknown or not set, 0 is also meaning that can be used !team check
+    TEAM_BOTH_ALLOWED   = 0,                                // used when a check should evaluate true for both teams
+    TEAM_INVALID        = 1,                                // used to invalidate some team depending checks (means not for both teams)
     HORDE               = 67,
     ALLIANCE            = 469,
 };
 
+enum TeamIndex
+{
+    TEAM_INDEX_ALLIANCE = 0,
+    TEAM_INDEX_HORDE,
+    TEAM_INDEX_NEUTRAL,
+};
+
+#define PVP_TEAM_COUNT    2
+
+static inline TeamIndex GetTeamIndex(Team team) { return team == ALLIANCE ? TEAM_INDEX_ALLIANCE : ( team == HORDE ? TEAM_INDEX_HORDE : TEAM_INDEX_NEUTRAL); }
+
 enum SpellEffects
 {
     SPELL_EFFECT_NONE                      = 0,
@@ -716,7 +753,7 @@ enum SpellEffects
     SPELL_EFFECT_APPLY_AREA_AURA_PET       = 119,
     SPELL_EFFECT_TELEPORT_GRAVEYARD        = 120,
     SPELL_EFFECT_NORMALIZED_WEAPON_DMG     = 121,
-    SPELL_EFFECT_122                       = 122,
+    SPELL_EFFECT_SERVER_SIDE               = 122,
     SPELL_EFFECT_SEND_TAXI                 = 123,
     SPELL_EFFECT_PLAYER_PULL               = 124,
     SPELL_EFFECT_MODIFY_THREAT_PERCENT     = 125,
@@ -735,18 +772,18 @@ enum SpellEffects
     SPELL_EFFECT_LEAP_BACK                 = 138,
     SPELL_EFFECT_CLEAR_QUEST               = 139,
     SPELL_EFFECT_FORCE_CAST                = 140,
-    SPELL_EFFECT_141                       = 141,
+    SPELL_EFFECT_FORCE_CAST_WITH_VALUE     = 141,
     SPELL_EFFECT_TRIGGER_SPELL_WITH_VALUE  = 142,
     SPELL_EFFECT_APPLY_AREA_AURA_OWNER     = 143,
-    SPELL_EFFECT_144                       = 144,
-    SPELL_EFFECT_145                       = 145,
+    SPELL_EFFECT_KNOCKBACK_FROM_POSITION   = 144,
+    SPELL_EFFECT_SUSPEND_GRAVITY           = 145,
     SPELL_EFFECT_ACTIVATE_RUNE             = 146,
     SPELL_EFFECT_QUEST_FAIL                = 147,
-    SPELL_EFFECT_148                       = 148,
+    SPELL_EFFECT_TRIGGER_MISSILE_2         = 148,
     SPELL_EFFECT_CHARGE2                   = 149,
     SPELL_EFFECT_QUEST_OFFER               = 150,
     SPELL_EFFECT_TRIGGER_SPELL_2           = 151,
-    SPELL_EFFECT_152                       = 152,
+    SPELL_EFFECT_FRIEND_SUMMON             = 152,
     SPELL_EFFECT_CREATE_PET                = 153,
     SPELL_EFFECT_TEACH_TAXI_NODE           = 154,
     SPELL_EFFECT_TITAN_GRIP                = 155,
@@ -1085,48 +1122,48 @@ enum AuraState
     AURA_STATE_DEADLY_POISON                = 16,           //   T |
     AURA_STATE_ENRAGE                       = 17,           // C   |
     AURA_STATE_BLEEDING                     = 18,           // C  t|
-    //AURA_STATE_UNKNOWN19                  = 19,           //     | not used
+    AURA_STATE_DARK_TARGET                  = 19,           //     | targeting for light/Gas spells
     //AURA_STATE_UNKNOWN20                  = 20,           //  c  | only (45317 Suicide)
-    //AURA_STATE_UNKNOWN21                  = 21,           //     | not used
-    //AURA_STATE_UNKNOWN22                  = 22,           // C   | not implemented yet (Requires Evasive Charges to use)
+    AURA_STATE_SPELLFIRE                    = 21,           //     | Spellfire (targeting, NYI)
+    AURA_STATE_LIGHT_TARGET                 = 22,           // C   | targeting for dark/Ooze spells
     AURA_STATE_HEALTH_ABOVE_75_PERCENT      = 23,           // C   |
 };
 
 // Spell mechanics
 enum Mechanics
 {
-    MECHANIC_NONE             = 0,
-    MECHANIC_CHARM            = 1,
-    MECHANIC_DISORIENTED      = 2,
-    MECHANIC_DISARM           = 3,
-    MECHANIC_DISTRACT         = 4,
-    MECHANIC_FEAR             = 5,
-    MECHANIC_GRIP             = 6,
-    MECHANIC_ROOT             = 7,
-    MECHANIC_PACIFY           = 8,                          //0 spells use this mechanic
-    MECHANIC_SILENCE          = 9,
-    MECHANIC_SLEEP            = 10,
-    MECHANIC_SNARE            = 11,
-    MECHANIC_STUN             = 12,
-    MECHANIC_FREEZE           = 13,
-    MECHANIC_KNOCKOUT         = 14,
-    MECHANIC_BLEED            = 15,
-    MECHANIC_BANDAGE          = 16,
-    MECHANIC_POLYMORPH        = 17,
-    MECHANIC_BANISH           = 18,
-    MECHANIC_SHIELD           = 19,
-    MECHANIC_SHACKLE          = 20,
-    MECHANIC_MOUNT            = 21,
-    MECHANIC_INFECTED         = 22,
-    MECHANIC_TURN             = 23,
-    MECHANIC_HORROR           = 24,
-    MECHANIC_INVULNERABILITY  = 25,
-    MECHANIC_INTERRUPT        = 26,
-    MECHANIC_DAZE             = 27,
-    MECHANIC_DISCOVERY        = 28,
-    MECHANIC_IMMUNE_SHIELD    = 29,                         // Divine (Blessing) Shield/Protection and Ice Block
-    MECHANIC_SAPPED           = 30,
-    MECHANIC_ENRAGED          = 31
+    MECHANIC_NONE             = 0,  // 0x00000000
+    MECHANIC_CHARM            = 1,  // 0x00000001
+    MECHANIC_DISORIENTED      = 2,  // 0x00000002
+    MECHANIC_DISARM           = 3,  // 0x00000004
+    MECHANIC_DISTRACT         = 4,  // 0x00000008
+    MECHANIC_FEAR             = 5,  // 0x00000010
+    MECHANIC_GRIP             = 6,  // 0x00000020
+    MECHANIC_ROOT             = 7,  // 0x00000040
+    MECHANIC_SLOWATTACK       = 8,  // 0x00000080           //0 spells use this mechanic, but some SPELL_AURA_MOD_HASTE and SPELL_AURA_MOD_RANGED_HASTE use as effect mechanic
+    MECHANIC_SILENCE          = 9,  // 0x00000100
+    MECHANIC_SLEEP            = 10, // 0x00000200
+    MECHANIC_SNARE            = 11, // 0x00000400
+    MECHANIC_STUN             = 12, // 0x00000800
+    MECHANIC_FREEZE           = 13, // 0x00001000
+    MECHANIC_KNOCKOUT         = 14, // 0x00002000
+    MECHANIC_BLEED            = 15, // 0x00004000
+    MECHANIC_BANDAGE          = 16, // 0x00008000
+    MECHANIC_POLYMORPH        = 17, // 0x00010000
+    MECHANIC_BANISH           = 18, // 0x00020000
+    MECHANIC_SHIELD           = 19, // 0x00040000
+    MECHANIC_SHACKLE          = 20, // 0x00080000
+    MECHANIC_MOUNT            = 21, // 0x00100000
+    MECHANIC_INFECTED         = 22, // 0x00200000
+    MECHANIC_TURN             = 23, // 0x00400000
+    MECHANIC_HORROR           = 24, // 0x00800000
+    MECHANIC_INVULNERABILITY  = 25, // 0x01000000
+    MECHANIC_INTERRUPT        = 26, // 0x02000000
+    MECHANIC_DAZE             = 27, // 0x04000000
+    MECHANIC_DISCOVERY        = 28, // 0x08000000
+    MECHANIC_IMMUNE_SHIELD    = 29, // 0x10000000           // Divine (Blessing) Shield/Protection and Ice Block
+    MECHANIC_SAPPED           = 30, // 0x20000000
+    MECHANIC_ENRAGED          = 31  // 0x40000000
 };
 
 #define FIRST_MECHANIC          1
@@ -1135,7 +1172,7 @@ enum Mechanics
 // Used for spell 42292 Immune Movement Impairment and Loss of Control (0x49967da6)
 #define IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK ( \
     (1<<(MECHANIC_CHARM   -1))|(1<<(MECHANIC_DISORIENTED-1))|(1<<(MECHANIC_FEAR  -1))| \
-    (1<<(MECHANIC_ROOT    -1))|(1<<(MECHANIC_PACIFY     -1))|(1<<(MECHANIC_SLEEP -1))| \
+    (1<<(MECHANIC_ROOT    -1))|(1<<(MECHANIC_SLOWATTACK -1))|(1<<(MECHANIC_SLEEP -1))| \
     (1<<(MECHANIC_SNARE   -1))|(1<<(MECHANIC_STUN       -1))|(1<<(MECHANIC_FREEZE-1))| \
     (1<<(MECHANIC_KNOCKOUT-1))|(1<<(MECHANIC_POLYMORPH  -1))|(1<<(MECHANIC_BANISH-1))| \
     (1<<(MECHANIC_SHACKLE -1))|(1<<(MECHANIC_TURN       -1))|(1<<(MECHANIC_HORROR-1))| \
@@ -1155,10 +1192,13 @@ enum Mechanics
 
 // Daze and all croud control spells except polymorph are not removed
 #define MECHANIC_NOT_REMOVED_BY_SHAPESHIFT ( \
-    (1<<(MECHANIC_CHARM -1))|(1<<(MECHANIC_DISORIENTED-1))|(1<<(MECHANIC_FEAR  -1))| \
-    (1<<(MECHANIC_PACIFY-1))|(1<<(MECHANIC_STUN       -1))|(1<<(MECHANIC_FREEZE-1))| \
-    (1<<(MECHANIC_BANISH-1))|(1<<(MECHANIC_SHACKLE    -1))|(1<<(MECHANIC_HORROR-1))| \
-    (1<<(MECHANIC_TURN  -1))|(1<<(MECHANIC_DAZE       -1))|(1<<(MECHANIC_SAPPED-1)))
+    (1<<(MECHANIC_CHARM  -1))|(1<<(MECHANIC_DISORIENTED-1))|(1<<(MECHANIC_FEAR  -1))| \
+    (1<<(MECHANIC_STUN   -1))|(1<<(MECHANIC_FREEZE     -1))|(1<<(MECHANIC_BANISH-1))| \
+    (1<<(MECHANIC_SHACKLE-1))|(1<<(MECHANIC_HORROR     -1))|(1<<(MECHANIC_TURN  -1))| \
+    (1<<(MECHANIC_DAZE   -1))|(1<<(MECHANIC_SAPPED     -1)))
+
+#define IMMUNE_BY_UNVULNERABILITY_MASK ( \
+    (1<<(MECHANIC_SHIELD-1))|(1<<(MECHANIC_INVULNERABILITY-1))|(1<<(MECHANIC_IMMUNE_SHIELD-1)))
 
 // Spell dispell type
 enum DispelType
@@ -1174,11 +1214,29 @@ enum DispelType
     DISPEL_SPE_NPC_ONLY = 8,
     DISPEL_ENRAGE       = 9,
     DISPEL_ZG_TICKET    = 10,
-    DESPEL_OLD_UNUSED   = 11
+    DISPEL_OLD_UNUSED   = 11
 };
 
 #define DISPEL_ALL_MASK ( (1<<DISPEL_MAGIC) | (1<<DISPEL_CURSE) | (1<<DISPEL_DISEASE) | (1<<DISPEL_POISON) )
 
+enum InvisibilityType
+{
+    INVISIBILITY_GENERAL     = 0,
+    INVISIBILITY_UNK1        = 1,
+    INVISIBILITY_UNK2        = 2,
+    INVISIBILITY_TRAP        = 3,
+    INVISIBILITY_UNK4        = 4,
+    INVISIBILITY_UNK5        = 5,
+    INVISIBILITY_DRUNK       = 6,
+    INVISIBILITY_UNK7        = 7,
+    INVISIBILITY_UNK8        = 8,
+    INVISIBILITY_UNK9        = 9,
+    INVISIBILITY_UNK10       = 10,
+    INVISIBILITY_UNK11       = 11,
+
+    TOTAL_INVISIBILITY_TYPES = 12
+};
+
 //To all Immune system,if target has immunes,
 //some spell that related to ImmuneToDispel or ImmuneToSchool or ImmuneToDamage type can't cast to it,
 //some spell_effects that related to ImmuneToEffect<effect>(only this effect in the spell) can't cast to it,
@@ -1199,88 +1257,133 @@ enum WeaponAttackType
 {
     BASE_ATTACK   = 0,
     OFF_ATTACK    = 1,
-    RANGED_ATTACK = 2
+    RANGED_ATTACK = 2,
+
+    // leave these greater than or equal to MAX_ATTACK
+    NONSTACKING_POS_MOD_MELEE = 3,
+    NONSTACKING_NEG_MOD_MELEE = 4,
+    NONSTACKING_MOD_ALL = 5
 };
 
 #define MAX_ATTACK  3
+#define MAX_ATTACK_MOD  (MAX_ATTACK + 3)
 
 enum Targets
 {
-    TARGET_NONE                        = 0,
-    TARGET_SELF                        = 1,
-    TARGET_RANDOM_ENEMY_CHAIN_IN_AREA  = 2,                 // only one spell has that, but regardless, it's a target type after all
-    TARGET_RANDOM_FRIEND_CHAIN_IN_AREA = 3,
-    TARGET_PET                         = 5,
-    TARGET_CHAIN_DAMAGE                = 6,
-    TARGET_AREAEFFECT_INSTANT          = 7,                 // targets around provided destination point
-    TARGET_AREAEFFECT_CUSTOM           = 8,
-    TARGET_INNKEEPER_COORDINATES       = 9,                 // uses in teleport to innkeeper spells
-    TARGET_ALL_ENEMY_IN_AREA           = 15,
-    TARGET_ALL_ENEMY_IN_AREA_INSTANT   = 16,
-    TARGET_TABLE_X_Y_Z_COORDINATES     = 17,                // uses in teleport spells and some other
-    TARGET_EFFECT_SELECT               = 18,                // highly depends on the spell effect
-    TARGET_ALL_PARTY_AROUND_CASTER     = 20,
-    TARGET_SINGLE_FRIEND               = 21,
-    TARGET_CASTER_COORDINATES          = 22,                // used only in TargetA, target selection dependent from TargetB
-    TARGET_GAMEOBJECT                  = 23,
-    TARGET_IN_FRONT_OF_CASTER          = 24,
-    TARGET_DUELVSPLAYER                = 25,
-    TARGET_GAMEOBJECT_ITEM             = 26,
-    TARGET_MASTER                      = 27,
-    TARGET_ALL_ENEMY_IN_AREA_CHANNELED = 28,
-    TARGET_ALL_FRIENDLY_UNITS_AROUND_CASTER = 30,           // select friendly for caster object faction (in different original caster faction) in TargetB used only with TARGET_ALL_AROUND_CASTER and in self casting range in TargetA
-    TARGET_ALL_FRIENDLY_UNITS_IN_AREA  = 31,
-    TARGET_MINION                      = 32,
-    TARGET_ALL_PARTY                   = 33,
-    TARGET_ALL_PARTY_AROUND_CASTER_2   = 34,                // used in Tranquility
-    TARGET_SINGLE_PARTY                = 35,
-    TARGET_ALL_HOSTILE_UNITS_AROUND_CASTER = 36,
-    TARGET_AREAEFFECT_PARTY            = 37,
-    TARGET_SCRIPT                      = 38,
-    TARGET_SELF_FISHING                = 39,
-    TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT= 40,
-    TARGET_TOTEM_EARTH                 = 41,
-    TARGET_TOTEM_WATER                 = 42,
-    TARGET_TOTEM_AIR                   = 43,
-    TARGET_TOTEM_FIRE                  = 44,
-    TARGET_CHAIN_HEAL                  = 45,
-    TARGET_SCRIPT_COORDINATES          = 46,
-    TARGET_DYNAMIC_OBJECT_FRONT        = 47,
-    TARGET_DYNAMIC_OBJECT_BEHIND       = 48,
-    TARGET_DYNAMIC_OBJECT_LEFT_SIDE    = 49,
-    TARGET_DYNAMIC_OBJECT_RIGHT_SIDE   = 50,
-    TARGET_AREAEFFECT_GO_AROUND_SOURCE = 51,
-    TARGET_AREAEFFECT_GO_AROUND_DEST   = 52,                // gameobject around destination, select by spell_script_target
-    TARGET_CURRENT_ENEMY_COORDINATES   = 53,                // set unit coordinates as dest, only 16 target B imlemented
-    TARGET_LARGE_FRONTAL_CONE          = 54,
-    TARGET_ALL_RAID_AROUND_CASTER      = 56,
-    TARGET_SINGLE_FRIEND_2             = 57,
-    TARGET_NARROW_FRONTAL_CONE         = 60,
-    TARGET_AREAEFFECT_PARTY_AND_CLASS  = 61,
-    TARGET_DUELVSPLAYER_COORDINATES    = 63,
-    TARGET_INFRONT_OF_VICTIM           = 64,
-    TARGET_BEHIND_VICTIM               = 65,                // used in teleport behind spells, caster/target dependent from spell effect
-    TARGET_RIGHT_FROM_VICTIM           = 66,
-    TARGET_LEFT_FROM_VICTIM            = 67,
-    TARGET_RANDOM_NEARBY_LOC           = 72,                // used in teleport onto nearby locations
-    TARGET_RANDOM_CIRCUMFERENCE_POINT  = 73,
-    TARGET_DYNAMIC_OBJECT_COORDINATES  = 76,
-    TARGET_SINGLE_ENEMY                = 77,
-    TARGET_POINT_AT_NORTH              = 78,                // 78-85 possible _COORDINATES at radius with pi/4 step around target in unknown order, N?
-    TARGET_POINT_AT_SOUTH              = 79,                // S?
-    TARGET_POINT_AT_EAST               = 80,                // 80/81 must be symmetric from line caster->target, E (base at 82/83, 84/85 order) ?
-    TARGET_POINT_AT_WEST               = 81,                // 80/81 must be symmetric from line caster->target, W (base at 82/83, 84/85 order) ?
-    TARGET_POINT_AT_NE                 = 82,                // from spell desc: "(NE)"
-    TARGET_POINT_AT_NW                 = 83,                // from spell desc: "(NW)"
-    TARGET_POINT_AT_SE                 = 84,                // from spell desc: "(SE)"
-    TARGET_POINT_AT_SW                 = 85,                // from spell desc: "(SW)"
-    TARGET_RANDOM_NEARBY_DEST          = 86,                // "Test Nearby Dest Random" - random around selected destination
-    TARGET_SELF2                       = 87,
-    TARGET_DIRECTLY_FORWARD            = 89,
-    TARGET_NONCOMBAT_PET               = 90,
-    TARGET_91                          = 91,
-    TARGET_IN_FRONT_OF_CASTER_30       = 104,
-};
+    TARGET_NONE                             = 0,
+    TARGET_SELF                             = 1,
+    TARGET_RANDOM_ENEMY_CHAIN_IN_AREA       = 2,                 // only one spell has that, but regardless, it's a target type after all
+    TARGET_RANDOM_FRIEND_CHAIN_IN_AREA      = 3,
+    TARGET_RANDOM_UNIT_CHAIN_IN_AREA        = 4,                 // targets - any enemies and friends
+    TARGET_PET                              = 5,
+    TARGET_CHAIN_DAMAGE                     = 6,
+    TARGET_AREAEFFECT_INSTANT               = 7,                 // targets around provided destination point
+    TARGET_AREAEFFECT_CUSTOM                = 8,
+    TARGET_INNKEEPER_COORDINATES            = 9,                 // uses in teleport to innkeeper spells
+    TARGET_10                               = 10,
+    TARGET_11                               = 11,
+    TARGET_12                               = 12,
+    TARGET_13                               = 13,
+    TARGET_14                               = 14,
+    TARGET_ALL_ENEMY_IN_AREA                = 15,
+    TARGET_ALL_ENEMY_IN_AREA_INSTANT        = 16,
+    TARGET_TABLE_X_Y_Z_COORDINATES          = 17,                // uses in teleport spells and some other
+    TARGET_EFFECT_SELECT                    = 18,                // highly depends on the spell effect
+    TARGET_19                               = 19,
+    TARGET_ALL_PARTY_AROUND_CASTER          = 20,
+    TARGET_SINGLE_FRIEND                    = 21,
+    TARGET_CASTER_COORDINATES               = 22,                // used only in TargetA, target selection dependent from TargetB
+    TARGET_GAMEOBJECT                       = 23,
+    TARGET_IN_FRONT_OF_CASTER               = 24,
+    TARGET_DUELVSPLAYER                     = 25,
+    TARGET_GAMEOBJECT_ITEM                  = 26,
+    TARGET_MASTER                           = 27,
+    TARGET_ALL_ENEMY_IN_AREA_CHANNELED      = 28,
+    TARGET_29                               = 29,
+    TARGET_ALL_FRIENDLY_UNITS_AROUND_CASTER = 30,                // select friendly for caster object faction (in different original caster faction) in TargetB used only with TARGET_ALL_AROUND_CASTER and in self casting range in TargetA
+    TARGET_ALL_FRIENDLY_UNITS_IN_AREA       = 31,
+    TARGET_MINION                           = 32,
+    TARGET_ALL_PARTY                        = 33,
+    TARGET_ALL_PARTY_AROUND_CASTER_2        = 34,                // used in Tranquility
+    TARGET_SINGLE_PARTY                     = 35,
+    TARGET_ALL_HOSTILE_UNITS_AROUND_CASTER  = 36,
+    TARGET_AREAEFFECT_PARTY                 = 37,
+    TARGET_SCRIPT                           = 38,
+    TARGET_SELF_FISHING                     = 39,
+    TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT     = 40,
+    TARGET_TOTEM_EARTH                      = 41,
+    TARGET_TOTEM_WATER                      = 42,
+    TARGET_TOTEM_AIR                        = 43,
+    TARGET_TOTEM_FIRE                       = 44,
+    TARGET_CHAIN_HEAL                       = 45,
+    TARGET_SCRIPT_COORDINATES               = 46,
+    TARGET_DYNAMIC_OBJECT_FRONT             = 47,
+    TARGET_DYNAMIC_OBJECT_BEHIND            = 48,
+    TARGET_DYNAMIC_OBJECT_LEFT_SIDE         = 49,
+    TARGET_DYNAMIC_OBJECT_RIGHT_SIDE        = 50,
+    TARGET_AREAEFFECT_GO_AROUND_SOURCE      = 51,
+    TARGET_AREAEFFECT_GO_AROUND_DEST        = 52,                // gameobject around destination, select by spell_script_target
+    TARGET_CURRENT_ENEMY_COORDINATES        = 53,                // set unit coordinates as dest, only 16 target B imlemented
+    TARGET_LARGE_FRONTAL_CONE               = 54,
+    TARGET_LEAP_FORWARD                     = 55,                // Target point must be calculated in target selection
+    TARGET_ALL_RAID_AROUND_CASTER           = 56,
+    TARGET_SINGLE_FRIEND_2                  = 57,
+    TARGET_58                               = 58,
+    TARGET_FRIENDLY_FRONTAL_CONE            = 59,
+    TARGET_NARROW_FRONTAL_CONE              = 60,
+    TARGET_AREAEFFECT_PARTY_AND_CLASS       = 61,
+    TARGET_62                               = 62,
+    TARGET_DUELVSPLAYER_COORDINATES         = 63,
+    TARGET_INFRONT_OF_VICTIM                = 64,
+    TARGET_BEHIND_VICTIM                    = 65,                // used in teleport behind spells, caster/target dependent from spell effect
+    TARGET_RIGHT_FROM_VICTIM                = 66,
+    TARGET_LEFT_FROM_VICTIM                 = 67,
+    TARGET_68                               = 68,
+    TARGET_69                               = 69,
+    TARGET_SINGLE_ENEMY_2                   = 70,
+    TARGET_71                               = 71,
+    TARGET_RANDOM_NEARBY_LOC                = 72,                // used in teleport onto nearby locations
+    TARGET_RANDOM_CIRCUMFERENCE_POINT       = 73,
+    TARGET_RANDOM_POINT_NEAR_TARGET         = 74,                // Target point must be calculated in target selection
+    TARGET_RANDOM_POINT_NEAR_TARGET_2       = 75,                // Target point must be calculated in target selection
+    TARGET_DYNAMIC_OBJECT_COORDINATES       = 76,
+    TARGET_SINGLE_ENEMY                     = 77,
+    TARGET_POINT_AT_NORTH                   = 78,                // 78-85 possible _COORDINATES at radius with pi/4 step around target in unknown order, N?
+    TARGET_POINT_AT_SOUTH                   = 79,                // S?
+    TARGET_POINT_AT_EAST                    = 80,                // 80/81 must be symmetric from line caster->target, E (base at 82/83, 84/85 order) ?
+    TARGET_POINT_AT_WEST                    = 81,                // 80/81 must be symmetric from line caster->target, W (base at 82/83, 84/85 order) ?
+    TARGET_POINT_AT_NE                      = 82,                // from spell desc: "(NE)"
+    TARGET_POINT_AT_NW                      = 83,                // from spell desc: "(NW)"
+    TARGET_POINT_AT_SE                      = 84,                // from spell desc: "(SE)"
+    TARGET_POINT_AT_SW                      = 85,                // from spell desc: "(SW)"
+    TARGET_RANDOM_NEARBY_DEST               = 86,                // "Test Nearby Dest Random" - random around selected destination
+    TARGET_SELF2                            = 87,
+    TARGET_88                               = 88,
+    TARGET_DIRECTLY_FORWARD                 = 89,
+    TARGET_NONCOMBAT_PET                    = 90,
+    TARGET_DEST_RADIUS                      = 91,
+    TARGET_UNIT_CREATOR                     = 92,
+    TARGET_93                               = 93,
+    TARGET_OWNED_VEHICLE                    = 94,
+    TARGET_UNIT_DRIVER                      = 95,
+    TARGET_UNIT_PASSENGER_0                 = 96,
+    TARGET_UNIT_PASSENGER_1                 = 97,
+    TARGET_UNIT_PASSENGER_2                 = 98,
+    TARGET_UNIT_PASSENGER_3                 = 99,
+    TARGET_UNIT_PASSENGER_4                 = 100,
+    TARGET_UNIT_PASSENGER_5                 = 101,
+    TARGET_UNIT_PASSENGER_6                 = 102,
+    TARGET_UNIT_PASSENGER_7                 = 103,
+    TARGET_IN_FRONT_OF_CASTER_30            = 104,
+    TARGET_105                              = 105,
+    TARGET_106                              = 106,
+    TARGET_107                              = 107,
+    TARGET_GO_IN_FRONT_OF_CASTER_90         = 108,
+    TARGET_109                              = 109,
+    TARGET_110                              = 110,
+};
+
+#define MAX_SPELL_TARGET               111
 
 enum SpellMissInfo
 {
@@ -1338,7 +1441,8 @@ enum DamageEffectType
     DOT                     = 2,
     HEAL                    = 3,
     NODAMAGE                = 4,                            // used also in case when damage applied to health but not applied to spell channelInterruptFlags/etc
-    SELF_DAMAGE             = 5
+    SELF_DAMAGE_ROGUE_FALL  = 5,                            //< used to avoid rogue loosing stealth on falling damage
+    SELF_DAMAGE             = 6
 };
 
 enum GameobjectTypes
@@ -1394,16 +1498,18 @@ enum GameObjectFlags
     GO_FLAG_TRIGGERED       = 0x00000040,                   //typically, summoned objects. Triggered by spell or other events
     GO_FLAG_UNK_8           = 0x00000080,
     GO_FLAG_UNK_9           = 0x00000100,                   //? Seen on type 33, possible meaning "destruct in progress"
-    GO_FLAG_UNK_10          = 0x00000200,                   //? Seen on type 33
-    GO_FLAG_UNK_11          = 0x00000400                    //? Seen on type 33, possibly meaning "destructed"
+    GO_FLAG_DAMAGED         = 0x00000200,                   //Seen on type 33
+    GO_FLAG_DESTROYED       = 0x00000400                    //Seen on type 33, meaning "destroyed"
 };
 
 enum GameObjectDynamicLowFlags
 {
+    GO_DYNFLAG_LO_NONE              = 0x00,                 // no low flags
     GO_DYNFLAG_LO_ACTIVATE          = 0x01,                 // enables interaction with GO
     GO_DYNFLAG_LO_ANIMATE           = 0x02,                 // possibly more distinct animation of GO
     GO_DYNFLAG_LO_NO_INTERACT       = 0x04,                 // appears to disable interaction (not fully verified)
     GO_DYNFLAG_LO_SPARKLE           = 0x08,                 // makes GO sparkle
+    GO_DYNFLAG_LO_TRANSPORT_STOP    = 0x10,                 // Transport/MOTransport stopped
 };
 
 enum TextEmotes
@@ -2050,9 +2156,14 @@ enum CreatureType
     CREATURE_TYPE_GAS_CLOUD        = 13
 };
 
-uint32 const CREATURE_TYPEMASK_DEMON_OR_UNDEAD = (1 << (CREATURE_TYPE_DEMON-1)) | (1 << (CREATURE_TYPE_UNDEAD-1));
-uint32 const CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD = (1 << (CREATURE_TYPE_HUMANOID-1)) | (1 << (CREATURE_TYPE_UNDEAD-1));
-uint32 const CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL = (1 << (CREATURE_TYPE_MECHANICAL-1)) | (1 << (CREATURE_TYPE_ELEMENTAL-1));
+// Unions of CreatureType
+enum CreatureTypeMask
+{
+    CREATURE_TYPEMASK_NONE                    = 0,                                                                       // In this typemask fits players only
+    CREATURE_TYPEMASK_DEMON_OR_UNDEAD         = (1 << (CREATURE_TYPE_DEMON-1))      | (1 << (CREATURE_TYPE_UNDEAD-1)),
+    CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD      = (1 << (CREATURE_TYPE_HUMANOID-1))   | (1 << (CREATURE_TYPE_UNDEAD-1)),
+    CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL = (1 << (CREATURE_TYPE_MECHANICAL-1)) | (1 << (CREATURE_TYPE_ELEMENTAL-1)),
+};
 
 // CreatureFamily.dbc
 enum CreatureFamily
@@ -2113,7 +2224,7 @@ enum CreatureTypeFlags
     CREATURE_TYPEFLAGS_HERBLOOT         = 0x00000100,       // Can be looted by herbalist
     CREATURE_TYPEFLAGS_MININGLOOT       = 0x00000200,       // Can be looted by miner
     CREATURE_TYPEFLAGS_UNK11            = 0x00000400,       // no idea, but it used by client
-    CREATURE_TYPEFLAGS_UNK12            = 0x00000800,       // related to possibility to cast spells while mounted
+    CREATURE_TYPEFLAGS_MOUNTED_COMBAT   = 0x00000800,       // Creature can remain mounted when entering combat
     CREATURE_TYPEFLAGS_CAN_ASSIST       = 0x00001000,       // Can aid any player (and group) in combat. Typically seen for escorting NPC's
     CREATURE_TYPEFLAGS_UNK14            = 0x00002000,       // checked from calls in Lua_PetHasActionBar
     CREATURE_TYPEFLAGS_UNK15            = 0x00004000,       // Lua_UnitGUID, client does guid_low &= 0xFF000000 if this flag is set
@@ -2174,7 +2285,9 @@ enum HolidayIds
     HOLIDAY_PILGRIMS_BOUNTY          = 404,
     HOLIDAY_WOTLK_LAUNCH             = 406,
     HOLIDAY_DAY_OF_DEAD              = 409,
-    HOLIDAY_CALL_TO_ARMS_ISLE_OF_C   = 420
+    HOLIDAY_CALL_TO_ARMS_ISLE_OF_C   = 420,
+    //HOLIDAY_LOVE_IS_IN_THE_AIR       = 423,
+    HOLIDAY_KALU_AK_FISHING_DERBY    = 424,
 };
 
 // values based at QuestSort.dbc
@@ -2279,8 +2392,8 @@ enum SkillType
     SKILL_SURVIVAL2                = 142,
     SKILL_RIDING_HORSE             = 148,
     SKILL_RIDING_WOLF              = 149,
-    SKILL_RIDING_RAM               = 152,
     SKILL_RIDING_TIGER             = 150,
+    SKILL_RIDING_RAM               = 152,
     SKILL_SWIMING                  = 155,
     SKILL_2H_MACES                 = 160,
     SKILL_UNARMED                  = 162,
@@ -2485,6 +2598,7 @@ enum CorpseDynFlags
 #define SPELL_ID_WEAPON_SWITCH_COOLDOWN_1_0s    6123
 #define SPELL_ID_AUTOSHOT                       75          // used for checks in other spells interruption
 #define SPELL_ID_SHADOWMELD                     58984       // used for check ignore stealth stance state
+#define SPELL_ID_HONORLESS_TARGET               2479
 
 enum WeatherType
 {
@@ -2607,7 +2721,8 @@ enum DiminishingReturnsType
 {
     DRTYPE_NONE         = 0,                                // this spell is not diminished, but may have limited it's duration to 10s
     DRTYPE_PLAYER       = 1,                                // this spell is diminished only when applied on players
-    DRTYPE_ALL          = 2                                 // this spell is diminished in every case
+    DRTYPE_ALL          = 2,                                // this spell is diminished in every case
+    DRTYPE_TAUNT        = 3,                                // this spell is diminished as Taunt Diminishing Returns (http://eu.battle.net/wow/en/game/patch-notes/3-3-0)
 };
 
 // Diminishing Return Groups
@@ -2630,7 +2745,14 @@ enum DiminishingGroup
     DIMINISHING_SILENCE,                                    // From 2.3.0
     DIMINISHING_FREEZE_SLEEP,                               // Hunter's Freezing Trap
     DIMINISHING_BANISH,
+    // Warrior Specific
+    DIMINISHING_CHARGE,
     // Other
+    DIMINISHING_TAUNT,
+    DIMINISHING_DRAGONS_BREATH,
+    DIMINISHING_MIND_CONTROL,
+    DIMINISHING_ENTRAPMENT,
+    DIMINISHING_SCATTER_SHOT,
     // Don't Diminish, but limit duration to 10s
     DIMINISHING_LIMITONLY
 };
@@ -2834,6 +2956,23 @@ enum BattleGroundTypeId
 };
 #define MAX_BATTLEGROUND_TYPE_ID 33
 
+// handle the queue types and bg types separately to enable joining queue for different sized arenas at the same time
+enum BattleGroundQueueTypeId
+{
+    BATTLEGROUND_QUEUE_NONE     = 0,
+    BATTLEGROUND_QUEUE_AV       = 1,    // Alterac Vally
+    BATTLEGROUND_QUEUE_WS       = 2,    // Warsong Gulch
+    BATTLEGROUND_QUEUE_AB       = 3,    // Arathi basin
+    BATTLEGROUND_QUEUE_EY       = 4,    // Eye of the Storm
+    BATTLEGROUND_QUEUE_SA       = 5,    // Strand of the Ancients
+    BATTLEGROUND_QUEUE_IC       = 6,    // Isle of Conquest
+    BATTLEGROUND_QUEUE_RB       = 7,
+    BATTLEGROUND_QUEUE_2v2      = 8,
+    BATTLEGROUND_QUEUE_3v3      = 9,
+    BATTLEGROUND_QUEUE_5v5      = 10
+};
+#define MAX_BATTLEGROUND_QUEUE_TYPES 11
+
 enum ArenaType
 {
     ARENA_TYPE_NONE         = 0,                            // used for mark non-arenas or problematic cases
@@ -2872,6 +3011,44 @@ enum MailResponseResult
     MAIL_ERR_ITEM_HAS_EXPIRED          = 21,
 };
 
+enum CalendarResponseResult
+{
+    CALENDAR_ERROR_GUILD_EVENTS_EXCEEDED        = 1,
+    CALENDAR_ERROR_EVENTS_EXCEEDED              = 2,        // max of 20 (?) exceeded
+    CALENDAR_ERROR_SELF_INVITES_EXCEEDED        = 3,
+    CALENDAR_ERROR_OTHER_INVITES_EXCEEDED       = 4,        // std::string
+    CALENDAR_ERROR_PERMISSIONS                  = 5,
+    CALENDAR_ERROR_EVENT_INVALID                = 6,        // Event not found.
+    CALENDAR_ERROR_NOT_INVITED                  = 7,
+    CALENDAR_ERROR_INTERNAL                     = 8,
+    CALENDAR_ERROR_GUILD_PLAYER_NOT_IN_GUILD    = 9,
+    CALENDAR_ERROR_ALREADY_INVITED_TO_EVENT_S   = 10,       // std::string
+    CALENDAR_ERROR_PLAYER_NOT_FOUND             = 11,
+    CALENDAR_ERROR_NOT_ALLIED                   = 12,
+    CALENDAR_ERROR_IGNORING_YOU_S               = 13,       // std::string
+    CALENDAR_ERROR_INVITES_EXCEEDED             = 14,
+    // 15 ?
+    CALENDAR_ERROR_INVALID_DATE                 = 16,
+    CALENDAR_ERROR_INVALID_TIME                 = 17,
+    // 18 ?
+    CALENDAR_ERROR_NEEDS_TITLE                  = 19,
+    CALENDAR_ERROR_EVENT_PASSED                 = 20,
+    CALENDAR_ERROR_EVENT_LOCKED                 = 21,
+    CALENDAR_ERROR_DELETE_CREATOR_FAILED        = 22,
+    CALENDAR_ERROR_SYSTEM_DISABLED              = 24,
+    CALENDAR_ERROR_RESTRICTED_ACCOUNT           = 25,
+    CALENDAR_ERROR_ARENA_EVENTS_EXCEEDED        = 26,
+    CALENDAR_ERROR_RESTRICTED_LEVEL             = 27,
+    CALENDAR_ERROR_USER_SQUELCHED               = 28,
+    CALENDAR_ERROR_NO_INVITE                    = 29,
+    // 30-35 ?
+    CALENDAR_ERROR_EVENT_WRONG_SERVER           = 36,
+    CALENDAR_ERROR_INVITE_WRONG_SERVER          = 37,
+    CALENDAR_ERROR_NO_GUILD_INVITES             = 38,
+    CALENDAR_ERROR_INVALID_SIGNUP               = 39,
+    CALENDAR_ERROR_NO_MODERATOR                 = 40,
+};
+
 // reasons for why pet tame may fail
 // in fact, these are also used elsewhere
 enum PetTameFailureReason
@@ -2928,7 +3105,8 @@ enum TradeStatus
     TRADE_STATUS_YOU_LOGOUT     = 19,
     TRADE_STATUS_TARGET_LOGOUT  = 20,
     TRADE_STATUS_TRIAL_ACCOUNT  = 21,                       // Trial accounts can not perform that action
-    TRADE_STATUS_ONLY_CONJURED  = 22                        // You can only trade conjured items... (cross realm BG related).
+    TRADE_STATUS_ONLY_CONJURED  = 22,                       // You can only trade conjured items... (cross realm BG related).
+    TRADE_STATUS_NOT_ELIGIBLE   = 23                        // Related to trading soulbound loot items
 };
 
 enum EncounterCreditType
@@ -2937,17 +3115,145 @@ enum EncounterCreditType
     ENCOUNTER_CREDIT_CAST_SPELL     = 1
 };
 
-// we need to stick to 1 version or half of the stuff will work for someone
-// others will not and opposite
-// will only support WoW, WoW:TBC and WoW:WotLK 3.3.5a client build 12340...
-
-#define EXPECTED_MANGOSD_CLIENT_BUILD        {12340, 0}
+enum EncounterFrameCommand
+{
+    ENCOUNTER_FRAME_ENGAGE              = 0,
+    ENCOUNTER_FRAME_DISENGAGE           = 1,
+    ENCOUNTER_FRAME_UPDATE_PRIORITY     = 2,
+    ENCOUNTER_FRAME_ADD_TIMER           = 3,
+    ENCOUNTER_FRAME_ENABLE_OBJECTIVE    = 4,
+    ENCOUNTER_FRAME_UPDATE_OBJECTIVE    = 5,
+    ENCOUNTER_FRAME_DISABLE_OBJECTIVE   = 6,
+    ENCOUNTER_FRAME_UNK7                = 7,    // Seems to have something to do with sorting the encounter units
+    ENCOUNTER_FRAME_MAX
+};
+
+enum AreaLockStatus
+{
+    AREA_LOCKSTATUS_OK                        = 0,
+    AREA_LOCKSTATUS_UNKNOWN_ERROR             = 1,
+    AREA_LOCKSTATUS_INSUFFICIENT_EXPANSION    = 2,
+    AREA_LOCKSTATUS_TOO_LOW_LEVEL             = 3,
+    AREA_LOCKSTATUS_TOO_HIGH_LEVEL            = 4,
+    AREA_LOCKSTATUS_RAID_LOCKED               = 5,
+    AREA_LOCKSTATUS_QUEST_NOT_COMPLETED       = 6,
+    AREA_LOCKSTATUS_MISSING_ITEM              = 7,
+    AREA_LOCKSTATUS_MISSING_DIFFICULTY        = 8,
+    AREA_LOCKSTATUS_ZONE_IN_COMBAT            = 9,
+    AREA_LOCKSTATUS_INSTANCE_IS_FULL          = 10,
+    AREA_LOCKSTATUS_NOT_ALLOWED               = 11,
+    AREA_LOCKSTATUS_HAS_BIND                  = 12,
+};
+
+#define CONTACT_DISTANCE            0.5f
+#define INTERACTION_DISTANCE        5.0f
+#define ATTACK_DISTANCE             5.0f
+#define MAX_VISIBILITY_DISTANCE     500.0f      // max distance for visible object show, limited in 500 yards
+#define DEFAULT_VISIBILITY_DISTANCE 90.0f       // default visible distance, 90 yards on continents
+#define DEFAULT_VISIBILITY_INSTANCE 120.0f      // default visible distance in instances, 120 yards
+#define DEFAULT_VISIBILITY_BGARENAS 180.0f      // default visible distance in BG/Arenas, 180 yards
+
+enum PhaseMasks
+{
+    PHASEMASK_NONE     = 0,
+    PHASEMASK_NORMAL   = 0x00000001,
+    PHASEMASK_ANYWHERE = 0xFFFFFFFF
+};
+
+enum ActivateTaxiReply
+{
+    ERR_TAXIOK                      = 0,
+    ERR_TAXIUNSPECIFIEDSERVERERROR  = 1,
+    ERR_TAXINOSUCHPATH              = 2,
+    ERR_TAXINOTENOUGHMONEY          = 3,
+    ERR_TAXITOOFARAWAY              = 4,
+    ERR_TAXINOVENDORNEARBY          = 5,
+    ERR_TAXINOTVISITED              = 6,
+    ERR_TAXIPLAYERBUSY              = 7,
+    ERR_TAXIPLAYERALREADYMOUNTED    = 8,
+    ERR_TAXIPLAYERSHAPESHIFTED      = 9,
+    ERR_TAXIPLAYERMOVING            = 10,
+    ERR_TAXISAMENODE                = 11,
+    ERR_TAXINOTSTANDING             = 12
+};
+
+
+enum TrackedAuraType
+{
+    TRACK_AURA_TYPE_NOT_TRACKED                 = 0,        // relation - caster : target is n:m (usual case)
+    TRACK_AURA_TYPE_SINGLE_TARGET               = 1,        // relation - caster : target is 1:1. Might get stolen
+    TRACK_AURA_TYPE_CONTROL_VEHICLE             = 2,        // relation - caster : target is N:1.
+    MAX_TRACKED_AURA_TYPES
+};
+
+enum ConditionSource                                        // From where was the condition called?
+{
+    CONDITION_FROM_LOOT             = 0,                    // Used to check a *_loot_template entry
+    CONDITION_FROM_REFERING_LOOT    = 1,                    // Used to check a entry refering to a reference_loot_template entry
+    CONDITION_FROM_GOSSIP_MENU      = 2,                    // Used to check a gossip menu menu-text
+    CONDITION_FROM_GOSSIP_OPTION    = 3,                    // Used to check a gossip menu option-item
+    CONDITION_FROM_EVENTAI          = 4,                    // Used to check EventAI Event "On Receive Emote"
+    CONDITION_FROM_HARDCODED        = 5,                    // Used to check a hardcoded event - not actually a condition
+    CONDITION_FROM_VENDOR           = 6,                    // Used to check a condition from a vendor
+    CONDITION_FROM_SPELL_AREA       = 7,                    // Used to check a condition from spell_area table
+    CONDITION_FROM_SPELLCLICK       = 8,                    // Used to check a condition from npc_spellclick_spells table
+    CONDITION_FROM_DBSCRIPTS        = 9,                    // Used to check a condition from DB Scripts Engine
+};
+
+enum AIEventType
+{
+    // Usable with Event AI
+    AI_EVENT_JUST_DIED          = 0,                        // Sender = Killed Npc, Invoker = Killer
+    AI_EVENT_CRITICAL_HEALTH    = 1,                        // Sender = Hurt Npc, Invoker = DamageDealer - Expected to be sent by 10% health
+    AI_EVENT_LOST_HEALTH        = 2,                        // Sender = Hurt Npc, Invoker = DamageDealer - Expected to be sent by 50% health
+    AI_EVENT_LOST_SOME_HEALTH   = 3,                        // Sender = Hurt Npc, Invoker = DamageDealer - Expected to be sent by 90% health
+    AI_EVENT_GOT_FULL_HEALTH    = 4,                        // Sender = Healed Npc, Invoker = Healer
+    AI_EVENT_CUSTOM_EVENTAI_A   = 5,                        // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
+    AI_EVENT_CUSTOM_EVENTAI_B   = 6,                        // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
+    AI_EVENT_GOT_CCED           = 7,                        // Sender = CCed Npc, Invoker = Caster that CCed
+    MAXIMAL_AI_EVENT_EVENTAI    = 8,
+
+    // Internal Use
+    AI_EVENT_CALL_ASSISTANCE    = 10,                       // Sender = Attacked Npc, Invoker = Enemy
+
+    // Predefined for SD2
+    AI_EVENT_START_ESCORT       = 100,                      // Invoker = Escorting Player
+    AI_EVENT_START_ESCORT_B     = 101,                      // Invoker = Escorting Player
+    AI_EVENT_START_EVENT        = 102,                      // Invoker = EventStarter
+    AI_EVENT_START_EVENT_A      = 103,                      // Invoker = EventStarter
+    AI_EVENT_START_EVENT_B      = 104,                      // Invoker = EventStarter
+
+    // Some IDs for special cases in SD2
+    AI_EVENT_CUSTOM_A           = 1000,
+    AI_EVENT_CUSTOM_B           = 1001,
+    AI_EVENT_CUSTOM_C           = 1002,
+    AI_EVENT_CUSTOM_D           = 1003,
+    AI_EVENT_CUSTOM_E           = 1004,
+    AI_EVENT_CUSTOM_F           = 1005,
+};
+
+enum Expansions
+{
+    EXPANSION_NONE                      = 0,                // classic
+    EXPANSION_TBC                       = 1,                // TBC
+    EXPANSION_WOTLK                     = 2,                // WotLK
+    EXPANSION_CATA                      = 3,                // Cata
+    EXPANSION_MOP                       = 4,                // MoP
+};
 
-// max supported expansion level in mangosd
-// NOTE: not set it more that supported by targeted client version with all expansions installed
-// account with expansion > client supported will rejected at connection by client
-// because if client receive unsupported expansion level it think
-// that it not have expansion installed and reject
 #define MAX_EXPANSION 2
 
+// Maxlevel for expansion
+enum MaxLevel
+{
+    MAX_LEVEL_CLASSIC                   = 60,
+    MAX_LEVEL_TBC                       = 70,
+    MAX_LEVEL_WOTLK                     = 80,
+};
+
+static const MaxLevel maxLevelForExpansion[MAX_EXPANSION + 1] = { MAX_LEVEL_CLASSIC, MAX_LEVEL_TBC, MAX_LEVEL_WOTLK };
+
+// Max creature level (included some bosses and elite)
+#define DEFAULT_MAX_CREATURE_LEVEL 85
+
 #endif
diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp
deleted file mode 100644
index ad11325acb9..00000000000
--- a/src/game/SkillDiscovery.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Database/DatabaseEnv.h"
-#include "Log.h"
-#include "ProgressBar.h"
-#include "Policies/SingletonImp.h"
-#include "World.h"
-#include "Util.h"
-#include "SkillDiscovery.h"
-#include "SpellMgr.h"
-#include "Player.h"
-#include <map>
-
-struct SkillDiscoveryEntry
-{
-    uint32  spellId;                                        // discavered spell
-    uint32  reqSkillValue;                                  // skill level limitation
-    float   chance;                                         // chance
-
-    SkillDiscoveryEntry()
-        : spellId(0), reqSkillValue(0), chance(0) {}
-
-    SkillDiscoveryEntry(uint32 _spellId, uint32 req_skill_val, float _chance)
-        : spellId(_spellId), reqSkillValue(req_skill_val), chance(_chance) {}
-};
-
-typedef std::list<SkillDiscoveryEntry> SkillDiscoveryList;
-typedef UNORDERED_MAP<int32, SkillDiscoveryList> SkillDiscoveryMap;
-
-static SkillDiscoveryMap SkillDiscoveryStore;
-
-void LoadSkillDiscoveryTable()
-{
-
-    SkillDiscoveryStore.clear();                            // need for reload
-
-    uint32 count = 0;
-
-    //                                                0        1         2              3
-    QueryResult *result = WorldDatabase.Query("SELECT spellId, reqSpell, reqSkillValue, chance FROM skill_discovery_template");
-
-    if (!result)
-    {
-        sLog.outString();
-        sLog.outString( ">> Loaded 0 skill discovery definitions. DB table `skill_discovery_template` is empty." );
-        return;
-    }
-
-    BarGoLink bar(result->GetRowCount());
-
-    std::ostringstream ssNonDiscoverableEntries;
-    std::set<uint32> reportedReqSpells;
-
-    do
-    {
-        Field *fields = result->Fetch();
-        bar.step();
-
-        uint32 spellId         = fields[0].GetUInt32();
-        int32  reqSkillOrSpell = fields[1].GetInt32();
-        uint32 reqSkillValue   = fields[2].GetInt32();
-        float  chance          = fields[3].GetFloat();
-
-        if (chance <= 0)                                    // chance
-        {
-            ssNonDiscoverableEntries << "spellId = " << spellId << " reqSkillOrSpell = " << reqSkillOrSpell
-                << " reqSkillValue = " << reqSkillValue << " chance = " << chance << "(chance problem)\n";
-            continue;
-        }
-
-        if (reqSkillOrSpell > 0)                            // spell case
-        {
-            SpellEntry const* reqSpellEntry = sSpellStore.LookupEntry(reqSkillOrSpell);
-            if (!reqSpellEntry)
-            {
-                if (reportedReqSpells.find(reqSkillOrSpell) == reportedReqSpells.end())
-                {
-                    sLog.outErrorDb("Spell (ID: %u) have nonexistent spell (ID: %i) in `reqSpell` field in `skill_discovery_template` table",spellId,reqSkillOrSpell);
-                    reportedReqSpells.insert(reqSkillOrSpell);
-                }
-                continue;
-            }
-
-            // mechanic discovery
-            if (reqSpellEntry->Mechanic != MECHANIC_DISCOVERY &&
-                // explicit discovery ability
-                !IsExplicitDiscoverySpell(reqSpellEntry))
-            {
-                if (reportedReqSpells.find(reqSkillOrSpell) == reportedReqSpells.end())
-                {
-                    sLog.outErrorDb("Spell (ID: %u) not have MECHANIC_DISCOVERY (28) value in Mechanic field in spell.dbc"
-                        " and not 100%% chance random discovery ability but listed for spellId %u (and maybe more) in `skill_discovery_template` table",
-                        reqSkillOrSpell,spellId);
-                    reportedReqSpells.insert(reqSkillOrSpell);
-                }
-                continue;
-            }
-
-            SkillDiscoveryStore[reqSkillOrSpell].push_back( SkillDiscoveryEntry(spellId, reqSkillValue, chance) );
-        }
-        else if (reqSkillOrSpell == 0)                      // skill case
-        {
-            SkillLineAbilityMapBounds bounds = sSpellMgr.GetSkillLineAbilityMapBounds(spellId);
-
-            if (bounds.first==bounds.second)
-            {
-                sLog.outErrorDb("Spell (ID: %u) not listed in `SkillLineAbility.dbc` but listed with `reqSpell`=0 in `skill_discovery_template` table",spellId);
-                continue;
-            }
-
-            for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
-                SkillDiscoveryStore[-int32(_spell_idx->second->skillId)].push_back( SkillDiscoveryEntry(spellId, reqSkillValue, chance) );
-        }
-        else
-        {
-            sLog.outErrorDb("Spell (ID: %u) have negative value in `reqSpell` field in `skill_discovery_template` table",spellId);
-            continue;
-        }
-
-        ++count;
-    } while (result->NextRow());
-
-    delete result;
-
-    sLog.outString();
-    sLog.outString( ">> Loaded %u skill discovery definitions", count );
-    if (!ssNonDiscoverableEntries.str().empty())
-        sLog.outErrorDb("Some items can't be successfully discovered: have in chance field value < 0.000001 in `skill_discovery_template` DB table . List:\n%s",ssNonDiscoverableEntries.str().c_str());
-
-    // report about empty data for explicit discovery spells
-    for(uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id)
-    {
-        SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell_id);
-        if (!spellEntry)
-            continue;
-
-        // skip not explicit discovery spells
-        if (!IsExplicitDiscoverySpell(spellEntry))
-            continue;
-
-        if (SkillDiscoveryStore.find(spell_id)==SkillDiscoveryStore.end())
-            sLog.outErrorDb("Spell (ID: %u) is 100%% chance random discovery ability but not have data in `skill_discovery_template` table",spell_id);
-    }
-}
-
-uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player)
-{
-    // explicit discovery spell chances (always success if case exist)
-    // in this case we have both skill and spell
-    SkillDiscoveryMap::const_iterator tab = SkillDiscoveryStore.find(spellId);
-    if (tab == SkillDiscoveryStore.end())
-        return 0;
-
-    SkillLineAbilityMapBounds bounds = sSpellMgr.GetSkillLineAbilityMapBounds(spellId);
-    uint32 skillvalue = bounds.first != bounds.second ? player->GetSkillValue(bounds.first->second->skillId) : 0;
-
-    float full_chance = 0;
-    for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
-        if (item_iter->reqSkillValue <= skillvalue)
-            if (!player->HasSpell(item_iter->spellId))
-                full_chance += item_iter->chance;
-
-    float rate = full_chance / 100.0f;
-    float roll = rand_chance_f() * rate;                    // roll now in range 0..full_chance
-
-    for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
-    {
-        if (item_iter->reqSkillValue > skillvalue)
-            continue;
-
-        if (player->HasSpell(item_iter->spellId))
-            continue;
-
-        if (item_iter->chance > roll)
-            return item_iter->spellId;
-
-        roll -= item_iter->chance;
-    }
-
-    return 0;
-}
-
-uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player)
-{
-    uint32 skillvalue = skillId ? player->GetSkillValue(skillId) : 0;
-
-    // check spell case
-    SkillDiscoveryMap::const_iterator tab = SkillDiscoveryStore.find(spellId);
-
-    if (tab != SkillDiscoveryStore.end())
-    {
-        for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
-        {
-            if (roll_chance_f(item_iter->chance * sWorld.getConfig(CONFIG_FLOAT_RATE_SKILL_DISCOVERY)) &&
-                item_iter->reqSkillValue <= skillvalue &&
-                !player->HasSpell(item_iter->spellId))
-                return item_iter->spellId;
-        }
-
-        return 0;
-    }
-
-    if (!skillId)
-        return 0;
-
-    // check skill line case
-    tab = SkillDiscoveryStore.find(-(int32)skillId);
-    if (tab != SkillDiscoveryStore.end())
-    {
-        for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
-        {
-            if (roll_chance_f(item_iter->chance * sWorld.getConfig(CONFIG_FLOAT_RATE_SKILL_DISCOVERY)) &&
-                item_iter->reqSkillValue <= skillvalue &&
-                !player->HasSpell(item_iter->spellId))
-                return item_iter->spellId;
-        }
-
-        return 0;
-    }
-
-    return 0;
-}
diff --git a/src/game/SkillDiscovery.h b/src/game/SkillDiscovery.h
deleted file mode 100644
index bf02b6b13f4..00000000000
--- a/src/game/SkillDiscovery.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef MANGOS_SKILLDISCOVERY_H
-#define MANGOS_SKILLDISCOVERY_H
-
-#include "Common.h"
-
-class Player;
-
-void LoadSkillDiscoveryTable();
-uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player);
-uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player);
-#endif
diff --git a/src/game/SkillExtraItems.cpp b/src/game/SkillExtraItems.cpp
deleted file mode 100644
index cfa4256f531..00000000000
--- a/src/game/SkillExtraItems.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "SkillExtraItems.h"
-#include "Database/DatabaseEnv.h"
-#include "Log.h"
-#include "ProgressBar.h"
-#include "Player.h"
-#include <map>
-
-// some type definitions
-// no use putting them in the header file, they're only used in this .cpp
-
-// struct to store information about extra item creation
-// one entry for every spell that is able to create an extra item
-struct SkillExtraItemEntry
-{
-    // the spell id of the specialization required to create extra items
-    uint32 requiredSpecialization;
-    // the chance to create one additional item
-    float additionalCreateChance;
-    // maximum number of extra items created per crafting
-    uint8 additionalMaxNum;
-
-    SkillExtraItemEntry()
-        : requiredSpecialization(0), additionalCreateChance(0.0f), additionalMaxNum(0) {}
-
-    SkillExtraItemEntry(uint32 rS, float aCC, uint8 aMN)
-        : requiredSpecialization(rS), additionalCreateChance(aCC), additionalMaxNum(aMN) {}
-};
-
-// map to store the extra item creation info, the key is the spellId of the creation spell, the mapped value is the assigned SkillExtraItemEntry
-typedef std::map<uint32,SkillExtraItemEntry> SkillExtraItemMap;
-
-SkillExtraItemMap SkillExtraItemStore;
-
-// loads the extra item creation info from DB
-void LoadSkillExtraItemTable()
-{
-    uint32 count = 0;
-
-    SkillExtraItemStore.clear();                            // need for reload
-
-    //                                                 0        1                       2                       3
-    QueryResult *result = WorldDatabase.Query("SELECT spellId, requiredSpecialization, additionalCreateChance, additionalMaxNum FROM skill_extra_item_template");
-
-    if (result)
-    {
-        BarGoLink bar(result->GetRowCount());
-
-        do
-        {
-            Field *fields = result->Fetch();
-            bar.step();
-
-            uint32 spellId = fields[0].GetUInt32();
-
-            if (!sSpellStore.LookupEntry(spellId))
-            {
-                sLog.outError("Skill specialization %u has nonexistent spell id in `skill_extra_item_template`!", spellId);
-                continue;
-            }
-
-            uint32 requiredSpecialization = fields[1].GetUInt32();
-            if (!sSpellStore.LookupEntry(requiredSpecialization))
-            {
-                sLog.outError("Skill specialization %u have nonexistent required specialization spell id %u in `skill_extra_item_template`!", spellId,requiredSpecialization);
-                continue;
-            }
-
-            float additionalCreateChance = fields[2].GetFloat();
-            if (additionalCreateChance <= 0.0f)
-            {
-                sLog.outError("Skill specialization %u has too low additional create chance in `skill_extra_item_template`!", spellId);
-                continue;
-            }
-
-            uint8 additionalMaxNum = fields[3].GetUInt8();
-            if (!additionalMaxNum)
-            {
-                sLog.outError("Skill specialization %u has 0 max number of extra items in `skill_extra_item_template`!", spellId);
-                continue;
-            }
-
-            SkillExtraItemEntry& skillExtraItemEntry = SkillExtraItemStore[spellId];
-
-            skillExtraItemEntry.requiredSpecialization = requiredSpecialization;
-            skillExtraItemEntry.additionalCreateChance = additionalCreateChance;
-            skillExtraItemEntry.additionalMaxNum       = additionalMaxNum;
-
-            ++count;
-        } while (result->NextRow());
-
-        delete result;
-
-        sLog.outString();
-        sLog.outString(">> Loaded %u spell specialization definitions", count);
-    }
-    else
-    {
-        sLog.outString();
-        sLog.outString( ">> Loaded 0 spell specialization definitions. DB table `skill_extra_item_template` is empty." );
-    }
-}
-
-bool canCreateExtraItems(Player * player, uint32 spellId, float &additionalChance, uint8 &additionalMax)
-{
-    // get the info for the specified spell
-    SkillExtraItemMap::const_iterator ret = SkillExtraItemStore.find(spellId);
-    if(ret==SkillExtraItemStore.end())
-        return false;
-
-    SkillExtraItemEntry const* specEntry = &ret->second;
-
-    // if no entry, then no extra items can be created
-    if(!specEntry)
-        return false;
-
-    // the player doesn't have the required specialization, return false
-    if(!player->HasSpell(specEntry->requiredSpecialization))
-        return false;
-
-    // set the arguments to the appropriate values
-    additionalChance = specEntry->additionalCreateChance;
-    additionalMax = specEntry->additionalMaxNum;
-
-    // enable extra item creation
-    return true;
-}
diff --git a/src/game/SkillExtraItems.h b/src/game/SkillExtraItems.h
deleted file mode 100644
index 7bfd5afc414..00000000000
--- a/src/game/SkillExtraItems.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef MANGOS_SKILL_EXTRA_ITEMS_H
-#define MANGOS_SKILL_EXTRA_ITEMS_H
-
-#include "Common.h"
-
-// predef classes used in functions
-class Player;
-// returns true and sets the appropriate info if the player can create extra items with the given spellId
-bool canCreateExtraItems(Player * player, uint32 spellId, float &additionalChance, uint8 &additionalMax);
-// function to load the extra item creation info from DB
-void LoadSkillExtraItemTable();
-#endif
diff --git a/src/game/SkillHandler.cpp b/src/game/SkillHandler.cpp
index df4dd759a53..dafef040b79 100644
--- a/src/game/SkillHandler.cpp
+++ b/src/game/SkillHandler.cpp
@@ -23,6 +23,7 @@
 #include "Player.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
+#include "SpellMgr.h"
 #include "UpdateMask.h"
 
 void WorldSession::HandleLearnTalentOpcode( WorldPacket & recv_data )
@@ -87,5 +88,9 @@ void WorldSession::HandleUnlearnSkillOpcode(WorldPacket & recv_data)
 {
     uint32 skill_id;
     recv_data >> skill_id;
+
+    if (!IsPrimaryProfessionSkill(skill_id))
+        return;
+
     GetPlayer()->SetSkill(skill_id, 0, 0);
 }
diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp
index be12f4e13ca..497c74ef460 100644
--- a/src/game/SocialMgr.cpp
+++ b/src/game/SocialMgr.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "SocialMgr.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
@@ -48,7 +48,7 @@ uint32 PlayerSocial::GetNumberOfSocialsWithFlag(SocialFlag flag)
     return counter;
 }
 
-bool PlayerSocial::AddToSocialList(ObjectGuid friend_guid, bool ignore)
+bool PlayerSocial::AddToSocialList(ObjectGuid const& friend_guid, bool ignore)
 {
     // check client limits
     if(ignore)
@@ -62,29 +62,22 @@ bool PlayerSocial::AddToSocialList(ObjectGuid friend_guid, bool ignore)
             return false;
     }
 
-    uint32 flag = SOCIAL_FLAG_FRIEND;
-    if(ignore)
-        flag = SOCIAL_FLAG_IGNORED;
+    FriendInfo& fi = m_playerSocialMap[friend_guid];
+
+    fi.Flags |= (ignore ? SOCIAL_FLAG_IGNORED : SOCIAL_FLAG_FRIEND);
+    fi.Flags &= ~(ignore ? SOCIAL_FLAG_FRIEND  : SOCIAL_FLAG_IGNORED);
+
+    // FIXME - need make this asynchronows, like all other DB save methods
+    CharacterDatabase.BeginTransaction();
+    SaveFriendInfo(friend_guid, fi);
+    CharacterDatabase.CommitTransaction();
 
-    PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(friend_guid.GetCounter());
-    if(itr != m_playerSocialMap.end())
-    {
-        CharacterDatabase.PExecute("UPDATE character_social SET flags = (flags | %u) WHERE guid = '%u' AND friend = '%u'", flag, m_playerLowGuid, friend_guid.GetCounter());
-        m_playerSocialMap[friend_guid.GetCounter()].Flags |= flag;
-    }
-    else
-    {
-        CharacterDatabase.PExecute("INSERT INTO character_social (guid, friend, flags) VALUES ('%u', '%u', '%u')", m_playerLowGuid, friend_guid.GetCounter(), flag);
-        FriendInfo fi;
-        fi.Flags |= flag;
-        m_playerSocialMap[friend_guid.GetCounter()] = fi;
-    }
     return true;
 }
 
-void PlayerSocial::RemoveFromSocialList(ObjectGuid friend_guid, bool ignore)
+void PlayerSocial::RemoveFromSocialList(ObjectGuid const& friend_guid, bool ignore, bool isBatch)
 {
-    PlayerSocialMap::iterator itr = m_playerSocialMap.find(friend_guid.GetCounter());
+    PlayerSocialMap::iterator itr = m_playerSocialMap.find(friend_guid);
     if(itr == m_playerSocialMap.end())                      // not exist
         return;
 
@@ -93,34 +86,37 @@ void PlayerSocial::RemoveFromSocialList(ObjectGuid friend_guid, bool ignore)
         flag = SOCIAL_FLAG_IGNORED;
 
     itr->second.Flags &= ~flag;
-    if(itr->second.Flags == 0)
-    {
-        CharacterDatabase.PExecute("DELETE FROM character_social WHERE guid = '%u' AND friend = '%u'", m_playerLowGuid, friend_guid.GetCounter());
+
+    // FIXME - need make this asynchronows, like all other DB save methods
+    if (!isBatch)
+        CharacterDatabase.BeginTransaction();
+    SaveFriendInfo(friend_guid, itr->second);
+    if (!isBatch)
+        CharacterDatabase.CommitTransaction();
+
+    if (itr->second.Flags == SOCIAL_FLAG_NONE)
         m_playerSocialMap.erase(itr);
-    }
-    else
-    {
-        CharacterDatabase.PExecute("UPDATE character_social SET flags = (flags & ~%u) WHERE guid = '%u' AND friend = '%u'", flag, m_playerLowGuid, friend_guid.GetCounter());
-    }
 }
 
-void PlayerSocial::SetFriendNote(ObjectGuid friend_guid, std::string note)
+void PlayerSocial::SetFriendNote(ObjectGuid const& friend_guid, std::string note)
 {
-    PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(friend_guid.GetCounter());
+    PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(friend_guid);
     if(itr == m_playerSocialMap.end())                      // not exist
         return;
 
     utf8truncate(note,48);                                  // DB and client size limitation
+    CharacterDatabase.escape_string(note);
+    m_playerSocialMap[friend_guid].Note = note;
 
-    std::string safe_note = note;
-    CharacterDatabase.escape_string(safe_note);
-    CharacterDatabase.PExecute("UPDATE character_social SET note = '%s' WHERE guid = '%u' AND friend = '%u'", safe_note.c_str(), m_playerLowGuid, friend_guid.GetCounter());
-    m_playerSocialMap[friend_guid.GetCounter()].Note = note;
+    // FIXME - need make this asynchronows, like all other DB save methods
+    CharacterDatabase.BeginTransaction();
+    SaveFriendInfo(friend_guid, m_playerSocialMap[friend_guid]);
+    CharacterDatabase.CommitTransaction();
 }
 
 void PlayerSocial::SendSocialList()
 {
-    Player *plr = sObjectMgr.GetPlayer(ObjectGuid(HIGHGUID_PLAYER, m_playerLowGuid));
+    Player *plr = sObjectMgr.GetPlayer(m_playerGuid);
     if(!plr)
         return;
 
@@ -130,84 +126,103 @@ void PlayerSocial::SendSocialList()
     data << uint32(7);                                      // unk flag (0x1, 0x2, 0x4), 0x7 if it include ignore list
     data << uint32(size);                                   // friends count
 
-    for(PlayerSocialMap::iterator itr = m_playerSocialMap.begin(); itr != m_playerSocialMap.end(); ++itr)
+    for (PlayerSocialMap::iterator itr = m_playerSocialMap.begin(); itr != m_playerSocialMap.end(); ++itr)
     {
-        sSocialMgr.GetFriendInfo(plr, itr->first, itr->second);
+        FriendInfo friendInfo;
+        if (itr->second.Flags & SOCIAL_FLAG_FRIEND)         // if IsFriend()
+            friendInfo = sSocialMgr.GetFriendInfo(plr, itr->first);
 
-        data << ObjectGuid(HIGHGUID_PLAYER, itr->first);    // player guid
+        data << itr->first;                                 // player guid
         data << uint32(itr->second.Flags);                  // player flag (0x1-friend?, 0x2-ignored?, 0x4-muted?)
-        data << itr->second.Note;                           // string note
-        if(itr->second.Flags & SOCIAL_FLAG_FRIEND)          // if IsFriend()
+        data << friendInfo.Note;                            // string note
+        if (itr->second.Flags & SOCIAL_FLAG_FRIEND)         // if IsFriend()
         {
-            data << uint8(itr->second.Status);              // online/offline/etc?
-            if(itr->second.Status)                          // if online
+            data << uint8(friendInfo.Status);               // online/offline/etc?
+            if (friendInfo.Status)                          // if online
             {
-                data << uint32(itr->second.Area);           // player area
-                data << uint32(itr->second.Level);          // player level
-                data << uint32(itr->second.Class);          // player class
+                data << uint32(friendInfo.Area);            // player area
+                data << uint32(friendInfo.Level);           // player level
+                data << uint32(friendInfo.Class);           // player class
             }
         }
     }
 
     plr->GetSession()->SendPacket(&data);
-    DEBUG_LOG("WORLD: Sent SMSG_CONTACT_LIST");
+    DEBUG_LOG("WORLD: Sent SMSG_CONTACT_LIST size = %u", size);
 }
 
-bool PlayerSocial::HasFriend(ObjectGuid friend_guid)
+bool PlayerSocial::HasFriend(ObjectGuid const& friend_guid)
 {
-    PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(friend_guid.GetCounter());
+    PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(friend_guid);
     if(itr != m_playerSocialMap.end())
-        return itr->second.Flags & SOCIAL_FLAG_FRIEND;
+        return (itr->second.Flags & SOCIAL_FLAG_FRIEND);
     return false;
 }
 
-bool PlayerSocial::HasIgnore(ObjectGuid ignore_guid)
+bool PlayerSocial::HasIgnore(ObjectGuid const& ignore_guid)
 {
-    PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(ignore_guid.GetCounter());
+    PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(ignore_guid);
     if(itr != m_playerSocialMap.end())
-        return itr->second.Flags & SOCIAL_FLAG_IGNORED;
+        return (itr->second.Flags & SOCIAL_FLAG_IGNORED);
     return false;
 }
 
-SocialMgr::SocialMgr()
+void PlayerSocial::SaveFriendInfo(ObjectGuid const& friend_guid, FriendInfo const& fi)
 {
+    static SqlStatementID delstmtId;
+    SqlStatement delstmt    = CharacterDatabase.CreateStatement(delstmtId, "DELETE FROM character_social WHERE guid = ? AND friend = ?");
+    static SqlStatementID insSocialId;
+    SqlStatement insertstmt = CharacterDatabase.CreateStatement(insSocialId, "INSERT INTO character_social (guid, friend, flags, note) VALUES (?, ?, ?, ?)" );
 
+    delstmt.PExecute(m_playerGuid.GetCounter(), friend_guid.GetCounter());
+
+    if (fi.Flags != SOCIAL_FLAG_NONE)
+        insertstmt.PExecute(m_playerGuid.GetCounter(), friend_guid.GetCounter(), fi.Flags, fi.Note.c_str());
 }
 
-SocialMgr::~SocialMgr()
+SocialMgr::SocialMgr()
 {
+}
 
+SocialMgr::~SocialMgr()
+{
 }
 
-void SocialMgr::GetFriendInfo(Player *player, uint32 friend_lowguid, FriendInfo &friendInfo)
+FriendInfo SocialMgr::GetFriendInfo(Player* player, ObjectGuid const& friend_guid)
 {
+    FriendInfo friendInfo;
+
     if(!player)
-        return;
+        return friendInfo;
 
-    Player *pFriend = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, friend_lowguid));
+    Player* pFriend = ObjectAccessor::FindPlayer(friend_guid);
 
     Team team = player->GetTeam();
     AccountTypes security = player->GetSession()->GetSecurity();
     bool allowTwoSideWhoList = sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_WHO_LIST);
     AccountTypes gmLevelInWhoList = AccountTypes (sWorld.getConfig(CONFIG_UINT32_GM_LEVEL_IN_WHO_LIST));
 
-    PlayerSocialMap::iterator itr = player->GetSocial()->m_playerSocialMap.find(friend_lowguid);
+    PlayerSocialMap::iterator itr = player->GetSocial()->m_playerSocialMap.find(friend_guid);
     if(itr != player->GetSocial()->m_playerSocialMap.end())
         friendInfo.Note = itr->second.Note;
 
     // PLAYER see his team only and PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
     // MODERATOR, GAME MASTER, ADMINISTRATOR can see all
-    if (pFriend && pFriend->GetName() &&
-        (security > SEC_PLAYER ||
-        ((pFriend->GetTeam() == team || allowTwoSideWhoList) && (pFriend->GetSession()->GetSecurity() <= gmLevelInWhoList))) &&
+    if (pFriend && 
+        pFriend->IsInWorld() &&
+        pFriend->GetName() &&
+        ((security > SEC_PLAYER && security > pFriend->GetSession()->GetSecurity()) ||
+        ((pFriend->GetTeam() == team || allowTwoSideWhoList) && 
+        (pFriend->GetSession()->GetSecurity() <= gmLevelInWhoList))) &&
         pFriend->IsVisibleGloballyFor(player))
     {
-        friendInfo.Status = FRIEND_STATUS_ONLINE;
-        if(pFriend->isAFK())
-            friendInfo.Status = FRIEND_STATUS_AFK;
-        if(pFriend->isDND())
-            friendInfo.Status = FRIEND_STATUS_DND;
-        friendInfo.Area = pFriend->GetZoneId();
+        friendInfo.Status |= FRIEND_STATUS_ONLINE;
+
+        pFriend->isAFK() ? friendInfo.Status |= FRIEND_STATUS_AFK : friendInfo.Status &= ~FRIEND_STATUS_AFK;
+        pFriend->isDND() ? friendInfo.Status |= FRIEND_STATUS_DND : friendInfo.Status &= ~FRIEND_STATUS_DND;
+        pFriend->IsReferAFriendLinked(player) ? friendInfo.Status |= FRIEND_STATUS_RAF : friendInfo.Status &= ~FRIEND_STATUS_RAF;
+
+        friendInfo.Area  = pFriend->GetMap() ? pFriend->GetZoneId() : 0;
         friendInfo.Level = pFriend->getLevel();
         friendInfo.Class = pFriend->getClass();
     }
@@ -218,24 +233,24 @@ void SocialMgr::GetFriendInfo(Player *player, uint32 friend_lowguid, FriendInfo
         friendInfo.Level = 0;
         friendInfo.Class = 0;
     }
+    return friendInfo;
 }
 
-void SocialMgr::MakeFriendStatusPacket(FriendsResult result, uint32 guid, WorldPacket *data)
+void SocialMgr::MakeFriendStatusPacket(FriendsResult result, ObjectGuid const& guid, WorldPacket* data)
 {
     data->Initialize(SMSG_FRIEND_STATUS, 5);
     *data << uint8(result);
-    *data << ObjectGuid(HIGHGUID_PLAYER, guid);
+    *data << guid;
 }
 
-void SocialMgr::SendFriendStatus(Player *player, FriendsResult result, ObjectGuid friend_guid, bool broadcast)
+void SocialMgr::SendFriendStatus(Player* player, FriendsResult result, ObjectGuid const& friend_guid, bool broadcast)
 {
-    uint32 friend_lowguid = friend_guid.GetCounter();
+    WorldPacket data;
 
-    FriendInfo fi;
+    MakeFriendStatusPacket(result, friend_guid, &data);
+
+    FriendInfo fi = GetFriendInfo(player, friend_guid);
 
-    WorldPacket data;
-    MakeFriendStatusPacket(result, friend_lowguid, &data);
-    GetFriendInfo(player, friend_lowguid, fi);
     switch(result)
     {
         case FRIEND_ADDED_OFFLINE:
@@ -265,14 +280,14 @@ void SocialMgr::SendFriendStatus(Player *player, FriendsResult result, ObjectGui
         player->GetSession()->SendPacket(&data);
 }
 
-void SocialMgr::BroadcastToFriendListers(Player *player, WorldPacket *packet)
+void SocialMgr::BroadcastToFriendListers(Player* player, WorldPacket* packet)
 {
     if(!player)
         return;
 
     Team team = player->GetTeam();
     AccountTypes security = player->GetSession()->GetSecurity();
-    uint32 guid     = player->GetGUIDLow();
+    ObjectGuid guid     = player->GetObjectGuid();
     AccountTypes gmLevelInWhoList = AccountTypes(sWorld.getConfig(CONFIG_UINT32_GM_LEVEL_IN_WHO_LIST));
     bool allowTwoSideWhoList = sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_WHO_LIST);
 
@@ -281,7 +296,7 @@ void SocialMgr::BroadcastToFriendListers(Player *player, WorldPacket *packet)
         PlayerSocialMap::const_iterator itr2 = itr->second.m_playerSocialMap.find(guid);
         if(itr2 != itr->second.m_playerSocialMap.end() && (itr2->second.Flags & SOCIAL_FLAG_FRIEND))
         {
-            Player *pFriend = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
+            Player* pFriend = ObjectAccessor::FindPlayer(itr->first);
 
             // PLAYER see his team only and PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
             // MODERATOR, GAME MASTER, ADMINISTRATOR can see all
@@ -296,15 +311,15 @@ void SocialMgr::BroadcastToFriendListers(Player *player, WorldPacket *packet)
     }
 }
 
-PlayerSocial *SocialMgr::LoadFromDB(QueryResult *result, ObjectGuid guid)
+PlayerSocial* SocialMgr::LoadFromDB(QueryResult* result, ObjectGuid const& guid)
 {
-    PlayerSocial *social = &m_socialMap[guid.GetCounter()];
+    PlayerSocial* social = &m_socialMap[guid];
     social->SetPlayerGuid(guid);
 
     if(!result)
         return social;
 
-    uint32 friend_guid = 0;
+    ObjectGuid friend_guid;
     uint32 flags = 0;
     std::string note = "";
 
@@ -313,9 +328,10 @@ PlayerSocial *SocialMgr::LoadFromDB(QueryResult *result, ObjectGuid guid)
 
     do
     {
-        Field *fields  = result->Fetch();
+        Field* fields  = result->Fetch();
+
+        friend_guid = ObjectGuid(HIGHGUID_PLAYER,fields[0].GetUInt32());
 
-        friend_guid = fields[0].GetUInt32();
         flags = fields[1].GetUInt32();
         note = fields[2].GetCppString();
 
diff --git a/src/game/SocialMgr.h b/src/game/SocialMgr.h
index 81f94fd5c97..af501094b85 100644
--- a/src/game/SocialMgr.h
+++ b/src/game/SocialMgr.h
@@ -30,53 +30,51 @@ class WorldPacket;
 
 enum FriendStatus
 {
-    FRIEND_STATUS_OFFLINE   = 0,
-    FRIEND_STATUS_ONLINE    = 1,
-    FRIEND_STATUS_AFK       = 2,
-    FRIEND_STATUS_UNK3      = 3,
-    FRIEND_STATUS_DND       = 4
+    FRIEND_STATUS_OFFLINE   = 0x00,
+    FRIEND_STATUS_ONLINE    = 0x01,
+    FRIEND_STATUS_AFK       = 0x02,
+    FRIEND_STATUS_DND       = 0x04,
+    FRIEND_STATUS_RAF       = 0x08,
 };
 
 enum SocialFlag
 {
+    SOCIAL_FLAG_NONE        = 0,
     SOCIAL_FLAG_FRIEND      = 0x01,
     SOCIAL_FLAG_IGNORED     = 0x02,
     SOCIAL_FLAG_MUTED       = 0x04,                         // guessed
-    SOCIAL_FLAG_RAF         = 0x08                          // Recruit-A-Friend
 };
 
 struct FriendInfo
 {
-    FriendStatus Status;
+    uint8  Status;
     uint32 Flags;
     uint32 Area;
     uint32 Level;
     uint32 Class;
     std::string Note;
 
-    FriendInfo()
-    {
-        Status = FRIEND_STATUS_OFFLINE;
-        Flags = 0;
-        Area = 0;
-        Level = 0;
-        Class = 0;
-        Note = "";
-    }
-
-    FriendInfo(uint32 flags, const std::string& note)
-    {
-        Status = FRIEND_STATUS_OFFLINE;
-        Flags = flags;
-        Area = 0;
-        Level = 0;
-        Class = 0;
-        Note = note;
-    }
+    FriendInfo() :
+        Status(FRIEND_STATUS_OFFLINE),
+        Flags(0),
+        Area(0),
+        Level(0),
+        Class(0),
+        Note("")
+    {}
+
+    FriendInfo(uint32 flags, const std::string& note) :
+        Status(FRIEND_STATUS_OFFLINE),
+        Flags(flags),
+        Area(0),
+        Level(0),
+        Class(0),
+        Note(note)
+    {}
 };
 
-typedef std::map<uint32, FriendInfo> PlayerSocialMap;
-typedef std::map<uint32, PlayerSocial> SocialMap;
+typedef UNORDERED_MAP<ObjectGuid, FriendInfo> PlayerSocialMap;
+typedef UNORDERED_MAP<ObjectGuid, PlayerSocial> SocialMap;
 
 /// Results of friend related commands
 enum FriendsResult
@@ -120,19 +118,23 @@ class PlayerSocial
         PlayerSocial();
         ~PlayerSocial();
         // adding/removing
-        bool AddToSocialList(ObjectGuid friend_guid, bool ignore);
-        void RemoveFromSocialList(ObjectGuid friend_guid, bool ignore);
-        void SetFriendNote(ObjectGuid friend_guid, std::string note);
+        bool AddToSocialList(ObjectGuid const& friend_guid, bool ignore);
+        void RemoveFromSocialList(ObjectGuid const& friend_guid, bool ignore, bool isBatch = false);
+        void SetFriendNote(ObjectGuid const& friend_guid, std::string note);
         // Packet send's
         void SendSocialList();
         // Misc
-        bool HasFriend(ObjectGuid friend_guid);
-        bool HasIgnore(ObjectGuid ignore_guid);
-        void SetPlayerGuid(ObjectGuid guid) { m_playerLowGuid = guid.GetCounter(); }
+        bool HasFriend(ObjectGuid const& friend_guid);
+        bool HasIgnore(ObjectGuid const& ignore_guid);
+        void SetPlayerGuid(ObjectGuid const& guid) { m_playerGuid = guid; }
         uint32 GetNumberOfSocialsWithFlag(SocialFlag flag);
+
+        // Saving
+        void SaveFriendInfo(ObjectGuid const& friend_guid, FriendInfo const& fi);
+
     private:
         PlayerSocialMap m_playerSocialMap;
-        uint32 m_playerLowGuid;
+        ObjectGuid m_playerGuid;
 };
 
 class SocialMgr
@@ -141,15 +143,15 @@ class SocialMgr
         SocialMgr();
         ~SocialMgr();
         // Misc
-        void RemovePlayerSocial(uint32 guid) { m_socialMap.erase(guid); }
+        void RemovePlayerSocial(ObjectGuid const& guid) { m_socialMap.erase(guid); }
 
-        void GetFriendInfo(Player *player, uint32 friendGUID, FriendInfo &friendInfo);
+        FriendInfo GetFriendInfo(Player* player, ObjectGuid const& friendGUID);
         // Packet management
-        void MakeFriendStatusPacket(FriendsResult result, uint32 friend_guid, WorldPacket *data);
-        void SendFriendStatus(Player *player, FriendsResult result, ObjectGuid friend_guid, bool broadcast);
-        void BroadcastToFriendListers(Player *player, WorldPacket *packet);
+        void MakeFriendStatusPacket(FriendsResult result, ObjectGuid const& friend_guid, WorldPacket *data);
+        void SendFriendStatus(Player* player, FriendsResult result, ObjectGuid const& friend_guid, bool broadcast);
+        void BroadcastToFriendListers(Player* player, WorldPacket* packet);
         // Loading
-        PlayerSocial *LoadFromDB(QueryResult *result, ObjectGuid guid);
+        PlayerSocial* LoadFromDB(QueryResult *result, ObjectGuid const& guid);
     private:
         SocialMap m_socialMap;
 };
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index bf328ad1997..094d92e041a 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -30,6 +30,7 @@
 #include "SpellMgr.h"
 #include "Player.h"
 #include "Pet.h"
+#include "TemporarySummon.h"
 #include "Unit.h"
 #include "DynamicObject.h"
 #include "Group.h"
@@ -37,12 +38,13 @@
 #include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "CellImpl.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "SharedDefines.h"
 #include "LootMgr.h"
 #include "VMapFactory.h"
-#include "BattleGround.h"
+#include "BattleGround/BattleGround.h"
 #include "Util.h"
+#include "Vehicle.h"
 #include "Chat.h"
 
 extern pEffect SpellEffects[TOTAL_SPELL_EFFECTS];
@@ -77,7 +79,10 @@ class PrioritizeHealthUnitWraper
 public:
     explicit PrioritizeHealthUnitWraper(Unit* unit) : i_unit(unit)
     {
-        i_percent = unit->GetHealth() * 100 / unit->GetMaxHealth();
+        if (!unit || unit->GetMaxHealth() == 0)
+            i_percent = 100;
+        else
+            i_percent = unit->GetHealth() * 100 / unit->GetMaxHealth();
     }
     Unit* getUnit() const { return i_unit; }
     uint32 getPercent() const { return i_percent; }
@@ -114,41 +119,50 @@ SpellCastTargets::SpellCastTargets()
 
     m_itemTargetEntry  = 0;
 
-    m_srcX = m_srcY = m_srcZ = m_destX = m_destY = m_destZ = 0.0f;
+    m_src = m_dest = WorldLocation();
     m_strTarget = "";
     m_targetMask = 0;
+    SetElevation(0.0f);
+    SetSpeed(0.0f);
 }
 
 SpellCastTargets::~SpellCastTargets()
 {
 }
 
-void SpellCastTargets::setUnitTarget(Unit *target)
+void SpellCastTargets::setUnitTarget(Unit* target)
 {
-    if (!target)
+
+    if (target && !(target->isType(TYPEMASK_UNIT)))
         return;
 
-    m_destX = target->GetPositionX();
-    m_destY = target->GetPositionY();
-    m_destZ = target->GetPositionZ();
+    if (target && !(m_targetMask & TARGET_FLAG_DEST_LOCATION))
+        m_dest = WorldLocation(target->GetPosition());
+
     m_unitTarget = target;
-    m_unitTargetGUID = target->GetObjectGuid();
-    m_targetMask |= TARGET_FLAG_UNIT;
+
+    if (target)
+    {
+        m_unitTargetGUID = target->GetObjectGuid();
+        if (!(m_targetMask & TARGET_FLAG_DEST_LOCATION))
+            m_targetMask |= TARGET_FLAG_UNIT;
+    }
+    else
+    {
+        m_unitTargetGUID = ObjectGuid();
+        m_targetMask &= ~TARGET_FLAG_UNIT;
+    }
 }
 
-void SpellCastTargets::setDestination(float x, float y, float z)
+void SpellCastTargets::setDestination(WorldLocation const& loc)
 {
-    m_destX = x;
-    m_destY = y;
-    m_destZ = z;
+    m_dest = loc;
     m_targetMask |= TARGET_FLAG_DEST_LOCATION;
 }
 
-void SpellCastTargets::setSource(float x, float y, float z)
+void SpellCastTargets::setSource(WorldLocation const& loc)
 {
-    m_srcX = x;
-    m_srcY = y;
-    m_srcZ = z;
+    m_src = loc;
     m_targetMask |= TARGET_FLAG_SOURCE_LOCATION;
 }
 
@@ -187,8 +201,10 @@ void SpellCastTargets::setCorpseTarget(Corpse* corpse)
 void SpellCastTargets::Update(Unit* caster)
 {
     m_GOTarget   = m_GOTargetGUID ? caster->GetMap()->GetGameObject(m_GOTargetGUID) : NULL;
-    m_unitTarget = m_unitTargetGUID ?
-        ( m_unitTargetGUID == caster->GetObjectGuid() ? caster : ObjectAccessor::GetUnit(*caster, m_unitTargetGUID) ) :
+    m_unitTarget = (m_unitTargetGUID && caster->GetMap()) ?
+        (m_unitTargetGUID == caster->GetObjectGuid() ?
+            caster :
+            caster->GetMap()->GetUnit(m_unitTargetGUID)) :
         NULL;
 
     m_itemTarget = NULL;
@@ -210,50 +226,66 @@ void SpellCastTargets::Update(Unit* caster)
     }
 }
 
-void SpellCastTargets::read( ByteBuffer& data, Unit *caster )
+void SpellCastTargets::read(ByteBuffer& data, Unit* caster)
 {
     data >> m_targetMask;
 
-    if(m_targetMask == TARGET_FLAG_SELF)
+    if (m_targetMask == TARGET_FLAG_SELF)
     {
-        m_destX = caster->GetPositionX();
-        m_destY = caster->GetPositionY();
-        m_destZ = caster->GetPositionZ();
+        m_dest = caster->GetPosition();
         m_unitTarget = caster;
         m_unitTargetGUID = caster->GetObjectGuid();
         return;
     }
 
     // TARGET_FLAG_UNK2 is used for non-combat pets, maybe other?
-    if( m_targetMask & ( TARGET_FLAG_UNIT | TARGET_FLAG_UNK2 ))
+    if ( m_targetMask & ( TARGET_FLAG_UNIT | TARGET_FLAG_UNK2 ))
         data >> m_unitTargetGUID.ReadAsPacked();
 
-    if( m_targetMask & ( TARGET_FLAG_OBJECT ))
+    if ( m_targetMask & ( TARGET_FLAG_OBJECT ))
         data >> m_GOTargetGUID.ReadAsPacked();
 
     if(( m_targetMask & ( TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM )) && caster->GetTypeId() == TYPEID_PLAYER)
         data >> m_itemTargetGUID.ReadAsPacked();
 
-    if( m_targetMask & (TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE ) )
+    if ( m_targetMask & (TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE ) )
         data >> m_CorpseTargetGUID.ReadAsPacked();
 
     if (m_targetMask & TARGET_FLAG_SOURCE_LOCATION)
     {
-        data >> m_srcTransportGUID.ReadAsPacked();
-        data >> m_srcX >> m_srcY >> m_srcZ;
-        if(!MaNGOS::IsValidMapCoord(m_srcX, m_srcY, m_srcZ))
+        m_src = caster->GetPosition();
+        ObjectGuid transGuid;
+        data >> transGuid.ReadAsPacked();
+        if (transGuid)
+        {
+            m_src.SetTransportGuid(transGuid);
+            data >> m_src.GetTransportPosition().x >> m_src.GetTransportPosition().y >> m_src.GetTransportPosition().z;
+        }
+        else
+            data >> m_src.x >> m_src.y >> m_src.z;
+
+        if(!MaNGOS::IsValidMapCoord(getSource().getX(), getSource().getY(), getSource().getZ()))
             throw ByteBufferException(false, data.rpos(), 0, data.size());
     }
 
     if (m_targetMask & TARGET_FLAG_DEST_LOCATION)
     {
-        data >> m_destTransportGUID.ReadAsPacked();
-        data >> m_destX >> m_destY >> m_destZ;
-        if(!MaNGOS::IsValidMapCoord(m_destX, m_destY, m_destZ))
+        m_dest = caster->GetPosition();
+        ObjectGuid transGuid;
+        data >> transGuid.ReadAsPacked();
+        if (transGuid)
+        {
+            m_dest.SetTransportGuid(transGuid);
+            data >> m_dest.GetTransportPosition().x >> m_dest.GetTransportPosition().y >> m_dest.GetTransportPosition().z;
+        }
+        else
+            data >> m_dest.x >> m_dest.y >> m_dest.z;
+
+        if(!MaNGOS::IsValidMapCoord(getDestination().getX(), getDestination().getY(), getDestination().getZ()))
             throw ByteBufferException(false, data.rpos(), 0, data.size());
     }
 
-    if( m_targetMask & TARGET_FLAG_STRING )
+    if ( m_targetMask & TARGET_FLAG_STRING )
         data >> m_strTarget;
 
     // find real units/GOs
@@ -264,31 +296,31 @@ void SpellCastTargets::write( ByteBuffer& data ) const
 {
     data << uint32(m_targetMask);
 
-    if( m_targetMask & ( TARGET_FLAG_UNIT | TARGET_FLAG_PVP_CORPSE | TARGET_FLAG_OBJECT | TARGET_FLAG_CORPSE | TARGET_FLAG_UNK2 ) )
+    if ( m_targetMask & ( TARGET_FLAG_UNIT | TARGET_FLAG_PVP_CORPSE | TARGET_FLAG_OBJECT | TARGET_FLAG_CORPSE | TARGET_FLAG_UNK2 ) )
     {
-        if(m_targetMask & TARGET_FLAG_UNIT)
+        if (m_targetMask & TARGET_FLAG_UNIT)
         {
-            if(m_unitTarget)
+            if (m_unitTarget)
                 data << m_unitTarget->GetPackGUID();
             else
                 data << uint8(0);
         }
-        else if( m_targetMask & TARGET_FLAG_OBJECT )
+        else if ( m_targetMask & TARGET_FLAG_OBJECT )
         {
-            if(m_GOTarget)
+            if (m_GOTarget)
                 data << m_GOTarget->GetPackGUID();
             else
                 data << uint8(0);
         }
-        else if( m_targetMask & ( TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE ) )
+        else if ( m_targetMask & ( TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE ) )
             data << m_CorpseTargetGUID.WriteAsPacked();
         else
             data << uint8(0);
     }
 
-    if( m_targetMask & ( TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM ) )
+    if ( m_targetMask & ( TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM ) )
     {
-        if(m_itemTarget)
+        if (m_itemTarget)
             data << m_itemTarget->GetPackGUID();
         else
             data << uint8(0);
@@ -296,20 +328,67 @@ void SpellCastTargets::write( ByteBuffer& data ) const
 
     if (m_targetMask & TARGET_FLAG_SOURCE_LOCATION)
     {
-        data << m_srcTransportGUID.WriteAsPacked();
-        data << m_srcX << m_srcY << m_srcZ;
+        ObjectGuid transGuid = m_src.GetTransportGuid();
+        data << transGuid.WriteAsPacked();
+        if (transGuid)
+            data << m_src.GetTransportPos().getX() << m_src.GetTransportPos().getY() << m_src.GetTransportPos().getZ();
+        else
+            data << m_src.getX() << m_src.getY() << m_src.getZ();
     }
 
     if (m_targetMask & TARGET_FLAG_DEST_LOCATION)
     {
-        data << m_destTransportGUID.WriteAsPacked();
-        data << m_destX << m_destY << m_destZ;
+        ObjectGuid transGuid = m_dest.GetTransportGuid();
+        data << transGuid.WriteAsPacked();
+        if (transGuid)
+            data << m_dest.GetTransportPos().getX() << m_dest.GetTransportPos().getY() << m_dest.GetTransportPos().getZ();
+        else
+            data << m_dest.x << m_dest.y << m_dest.z;
     }
 
-    if( m_targetMask & TARGET_FLAG_STRING )
+    if ( m_targetMask & TARGET_FLAG_STRING )
         data << m_strTarget;
 }
 
+void SpellCastTargets::ReadAdditionalData(ByteBuffer& data)
+{
+    data >> m_elevation;
+    data >> m_speed;
+
+    uint8 moveFlag;
+    data >> moveFlag;
+
+    if (moveFlag)
+    {
+        ObjectGuid guid;                                // unk guid (possible - active mover) - unused
+        MovementInfo movementInfo;                      // MovementInfo
+
+        data >> Unused<uint32>();                       // >> MSG_MOVE_STOP
+        data >> guid.ReadAsPacked();
+        data >> movementInfo;
+        //setSource(movementInfo.GetPos());
+    }
+}
+
+bool SpellCastTargets::HasLocation() const
+{
+    if (m_targetMask & TARGET_FLAG_DEST_LOCATION)
+        return !getDestination().IsEmpty();
+    else if (m_targetMask & TARGET_FLAG_SOURCE_LOCATION)
+        return !getSource().IsEmpty();
+    return false;
+};
+
+WorldLocation const& SpellCastTargets::GetLocation() const
+{
+    if (m_targetMask & TARGET_FLAG_DEST_LOCATION)
+        return getDestination();
+    else if (m_targetMask & TARGET_FLAG_SOURCE_LOCATION)
+        return getSource();
+    // Possible need substitution for another cases
+    return WorldLocation::Null;
+}
+
 Spell::Spell( Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid originalCasterGUID, SpellEntry const* triggeredBy )
 {
     MANGOS_ASSERT( caster != NULL && info != NULL );
@@ -332,6 +411,8 @@ Spell::Spell( Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid o
     m_executedCurrently = false;
     m_delayStart = 0;
     m_delayAtDamageCount = 0;
+    m_damage = 0;
+    damage = 0;
 
     m_applyMultiplierMask = 0;
 
@@ -340,31 +421,42 @@ Spell::Spell( Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid o
 
     m_spellSchoolMask = GetSpellSchoolMask(info);           // Can be override for some spell (wand shoot for example)
 
-    if(m_attackType == RANGED_ATTACK)
+    if (m_attackType == RANGED_ATTACK)
     {
         // wand case
         if((m_caster->getClassMask() & CLASSMASK_WAND_USERS) != 0 && m_caster->GetTypeId() == TYPEID_PLAYER)
         {
-            if(Item* pItem = ((Player*)m_caster)->GetWeaponForAttack(RANGED_ATTACK))
+            if (Item* pItem = ((Player*)m_caster)->GetWeaponForAttack(RANGED_ATTACK))
                 m_spellSchoolMask = SpellSchoolMask(1 << pItem->GetProto()->Damage[0].DamageType);
         }
     }
     // Set health leech amount to zero
     m_healthLeech = 0;
 
-    m_originalCasterGUID = originalCasterGUID ? originalCasterGUID : m_caster->GetObjectGuid();
+    m_originalCasterGuid = originalCasterGUID ? originalCasterGUID : m_caster->GetObjectGuid();
 
     UpdateOriginalCasterPointer();
 
-    for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
-        m_currentBasePoints[i] = m_spellInfo->CalculateSimpleValue(SpellEffectIndex(i));
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        if (m_spellInfo->Effect[i] != SPELL_EFFECT_NONE)
+            m_currentBasePoints[i] = m_spellInfo->CalculateSimpleValue(SpellEffectIndex(i));
+        else
+        {
+            // We must make check for use NONE effects in spell.dbc instead of this hack (this - from clean mangos).
+            m_currentBasePoints[i] = m_spellInfo->CalculateSimpleValue(SpellEffectIndex(i));
+        }
+
+        m_effectExecuteData[i].clear();
+    }
 
     m_spellState = SPELL_STATE_PREPARING;
 
     m_castPositionX = m_castPositionY = m_castPositionZ = 0;
-    m_TriggerSpells.clear();
     m_preCastSpells.clear();
-    m_IsTriggeredSpell = triggered;
+    m_TriggerSpells.clear();
+    m_NotTriggerSpells.clear();
+    m_IsTriggeredSpell = m_spellInfo->HasAttribute(SPELL_ATTR_EX4_FORCE_TRIGGERED) ? true : triggered;
     //m_AreaAura = false;
     m_CastItem = NULL;
 
@@ -387,30 +479,7 @@ Spell::Spell( Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid o
 
     m_needAliveTargetMask = 0;
 
-    // determine reflection
-    m_canReflect = false;
-
     m_spellFlags = SPELL_FLAG_NORMAL;
-
-    if(m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MAGIC && !m_spellInfo->HasAttribute(SPELL_ATTR_EX2_CANT_REFLECTED))
-    {
-        for(int j = 0; j < MAX_EFFECT_INDEX; ++j)
-        {
-            if (m_spellInfo->Effect[j] == 0)
-                continue;
-
-            if(!IsPositiveTarget(m_spellInfo->EffectImplicitTargetA[j], m_spellInfo->EffectImplicitTargetB[j]))
-                m_canReflect = true;
-            else
-                m_canReflect = m_spellInfo->HasAttribute(SPELL_ATTR_EX_NEGATIVE);
-
-            if(m_canReflect)
-                continue;
-            else
-                break;
-        }
-    }
-
     CleanupTargetList();
 }
 
@@ -418,33 +487,226 @@ Spell::~Spell()
 {
 }
 
-template<typename T>
-WorldObject* Spell::FindCorpseUsing()
+template<typename T> WorldObject* Spell::FindCorpseUsing(uint32 corpseTypeMask)
 {
     // non-standard target selection
-    SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex);
+    SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex());
     float max_range = GetSpellMaxRange(srange);
 
     WorldObject* result = NULL;
 
-    T u_check(m_caster, max_range);
+    T u_check(m_caster, max_range, corpseTypeMask);
     MaNGOS::WorldObjectSearcher<T> searcher(result, u_check);
 
-    Cell::VisitGridObjects(m_caster, searcher, max_range);
+    // Search for creature corpse only if typemask found
+    if (corpseTypeMask != CREATURE_TYPEMASK_NONE)
+        Cell::VisitGridObjects(m_caster, searcher, max_range);
 
+    // Players corpse be searched only if no creatures corpse found
     if (!result)
         Cell::VisitWorldObjects(m_caster, searcher, max_range);
 
     return result;
 }
 
+template<class T>
+bool Spell::CheckTargetBeforeLimitation(T* target, SpellEffectIndex eff)
+{
+    DETAIL_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::CheckTargetBeforeLimitation unhandled target check call, spell %u caster %s, target %s",
+        m_spellInfo->Id,
+        m_caster ? m_caster->GetObjectGuid().GetString().c_str() : "<none>",
+        target ? target->GetObjectGuid().GetString().c_str() : "<none>");
+    return false;
+};
+
+
+template<>
+bool Spell::CheckTargetBeforeLimitation(Unit* target, SpellEffectIndex eff)
+{
+    if (!target)
+        return false;
+    // check right target                                                                                       // should activ for spells 72034, 72096
+    if (!target->isAlive() && !IsSpellAllowDeadTarget(m_spellInfo))
+        return false;
+    if (m_spellInfo->HasAttribute(SPELL_ATTR_EX3_TARGET_ONLY_PLAYER) && target->GetTypeId() != TYPEID_PLAYER &&
+        m_spellInfo->EffectImplicitTargetA[eff] != TARGET_SCRIPT && m_spellInfo->EffectImplicitTargetA[eff] != TARGET_SELF)
+    {
+        return false;
+    }
+    // Check Aura spell req (need for AoE spells)
+    if (m_spellInfo->targetAuraSpell && !target->HasAura(m_spellInfo->targetAuraSpell))
+        return false;
+    if (m_spellInfo->excludeTargetAuraSpell && target->HasAura(m_spellInfo->excludeTargetAuraSpell))
+        return false;
+    if (m_spellInfo->TargetAuraStateNot && target->HasAura(m_spellInfo->TargetAuraStateNot))
+        return false;
+    return true;
+}
+
+template<class T>
+bool Spell::CheckTarget(T* target, SpellEffectIndex eff)
+{
+
+    DETAIL_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::CheckTarget unhandled target check call, spell %u, caster %s, target %s",
+        m_spellInfo->Id,
+        m_caster ? m_caster->GetObjectGuid().GetString().c_str() : "<none>",
+        target ? target->GetObjectGuid().GetString().c_str() : "<none>");
+
+    return false;
+};
+
+template <>
+bool Spell::CheckTarget(Unit* target, SpellEffectIndex eff)
+{
+    if (!target)
+        return false;
+
+    // Check targets for creature type mask and remove not appropriate (skip explicit self target case, maybe need other explicit targets)
+    if (m_spellInfo->EffectImplicitTargetA[eff] != TARGET_SELF)
+    {
+        if (!SpellMgr::IsTargetMatchedWithCreatureType(m_spellInfo, target))
+            return false;
+    }
+
+    // check right target                                                                                       // should activ for spells 72034, 72096
+    if (m_spellInfo->HasAttribute(SPELL_ATTR_EX3_TARGET_ONLY_PLAYER) && target->GetTypeId() != TYPEID_PLAYER &&
+        m_spellInfo->EffectImplicitTargetA[eff] != TARGET_SCRIPT && m_spellInfo->EffectImplicitTargetA[eff] != TARGET_SELF)
+    {
+        return false;
+    }
+    // Check Aura spell req (need for AoE spells)
+    if (m_spellInfo->targetAuraSpell && !target->HasAura(m_spellInfo->targetAuraSpell))
+        return false;
+
+    if (m_spellInfo->excludeTargetAuraSpell && target->HasAura(m_spellInfo->excludeTargetAuraSpell))
+        return false;
+
+    if (m_spellInfo->TargetAuraStateNot && target->HasAura(m_spellInfo->TargetAuraStateNot))
+        return false;
+
+    // Check targets for not_selectable unit flag and remove
+    // A player can cast spells on his pet (or other controlled unit) though in any state
+    if (target != m_caster && target->isType(TYPEMASK_UNIT) && target->GetCharmerOrOwnerGuid() != m_caster->GetObjectGuid())
+    {
+        // any unattackable target skipped
+        if (target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE) && target->GetObjectGuid() != m_caster->GetCharmerOrOwnerGuid())
+            return false;
+
+        // unselectable targets skipped in all cases except TARGET_SCRIPT targeting
+        // in case TARGET_SCRIPT target selected by server always and can't be cheated
+        if ((!m_IsTriggeredSpell || target != m_targets.getUnitTarget()) &&
+            target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE) &&
+            m_spellInfo->EffectImplicitTargetA[eff] != TARGET_SCRIPT &&
+            m_spellInfo->EffectImplicitTargetB[eff] != TARGET_SCRIPT &&
+            m_spellInfo->EffectImplicitTargetA[eff] != TARGET_AREAEFFECT_INSTANT &&
+            m_spellInfo->EffectImplicitTargetB[eff] != TARGET_AREAEFFECT_INSTANT &&
+            m_spellInfo->EffectImplicitTargetA[eff] != TARGET_AREAEFFECT_CUSTOM &&
+            m_spellInfo->EffectImplicitTargetB[eff] != TARGET_AREAEFFECT_CUSTOM)
+            return false;
+    }
+
+    if (target != m_caster && m_caster->GetCharmerOrOwnerGuid() == target->GetObjectGuid())
+    {
+        if (m_spellInfo->EffectImplicitTargetA[eff] == TARGET_MASTER ||
+            m_spellInfo->EffectImplicitTargetB[eff] == TARGET_MASTER)
+            return true;
+    }
+
+    // Check player targets and remove if in GM mode or GM invisibility (for not self casting case)
+    if (target != m_caster && target->GetTypeId() == TYPEID_PLAYER &&
+        !(((Player*)target)->isGameMaster() && target->IsVehicle()))
+    {
+        if (((Player*)target)->GetVisibility() == VISIBILITY_OFF)
+            return false;
+
+        if (((Player*)target)->isGameMaster() && !IsPositiveSpell(m_spellInfo->Id))
+            return false;
+    }
+
+    // Check Sated & Exhaustion debuffs
+    if (((m_spellInfo->Id == 2825) && (target->HasAura(57724) || target->HasAura(57723))) ||
+        ((m_spellInfo->Id == 32182) && (target->HasAura(57724)|| target->HasAura(57723))))
+        return false;
+
+    // Check vampiric bite
+    if (m_spellInfo->Id == 70946 && target->HasAura(70867))
+        return false;
+
+    if (m_spellInfo->EffectImplicitTargetA[eff] == TARGET_ALL_RAID_AROUND_CASTER ||
+        m_spellInfo->EffectImplicitTargetB[eff] == TARGET_ALL_RAID_AROUND_CASTER)
+        return true;
+
+    // Check targets for LOS visibility (except spells without range limitations)
+    switch (m_spellInfo->Effect[eff])
+    {
+        case SPELL_EFFECT_FRIEND_SUMMON:
+        case SPELL_EFFECT_SUMMON_PLAYER:                    // from anywhere
+            break;
+        case SPELL_EFFECT_DUMMY:
+            break;
+        case SPELL_EFFECT_RESURRECT_NEW:
+            // player far away, maybe his corpse near?
+            if (target != m_caster && !target->IsVisibleTargetForSpell(m_caster, m_spellInfo))
+            {
+                if (!m_targets.getCorpseTargetGuid())
+                    return false;
+
+                Corpse* corpse = m_caster->GetMap()->GetCorpse(m_targets.getCorpseTargetGuid());
+                if (!corpse)
+                    return false;
+
+                if (target->GetObjectGuid() != corpse->GetOwnerGuid())
+                    return false;
+
+                if (!m_spellInfo->HasAttribute(SPELL_ATTR_EX2_IGNORE_LOS) && !corpse->IsWithinLOSInMap(m_caster))
+                    return false;
+            }
+
+            // all ok by some way or another, skip normal check
+            break;
+        default:                                            // normal case
+            // Get GO cast coordinates if original caster -> GO
+            if (target != m_caster)
+            {
+                if (DynamicObject* dynObj = m_caster->GetDynObject(m_triggeredByAuraSpell ? m_triggeredByAuraSpell->Id : m_spellInfo->Id))
+                {
+                    if (!target->IsVisibleTargetForSpell(dynObj, m_spellInfo))
+                        return false;
+                }
+                else if (WorldObject* caster = GetCastingObject())
+                {
+                    if (!target->IsVisibleTargetForSpell(caster, m_spellInfo))
+                        return false;
+                }
+            }
+            break;
+    }
+
+    switch (m_spellInfo->Id)
+    {
+        case 37433:                                         // Spout (The Lurker Below), only players affected if its not in water
+            if (target->GetTypeId() != TYPEID_PLAYER || target->IsInWater())
+                return false;
+            break;
+        case 68921:                                         // Soulstorm (FoS), only targets farer than 10 away
+        case 69049:                                         // Soulstorm            - = -
+            if (m_caster->IsWithinDist(target, 10.0f, false))
+                return false;
+            break;
+        default:
+            break;
+    }
+
+    return true;
+}
+
 void Spell::FillTargetMap()
 {
     // TODO: ADD the correct target FILLS!!!!!!
 
     UnitList tmpUnitLists[MAX_EFFECT_INDEX];                // Stores the temporary Target Lists for each effect
     uint8 effToIndex[MAX_EFFECT_INDEX] = {0, 1, 2};         // Helper array, to link to another tmpUnitList, if the targets for both effects match
-    for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
+    for(int i = EFFECT_INDEX_0; i < MAX_EFFECT_INDEX; ++i)
     {
         // not call for empty effect.
         // Also some spells use not used effect targets for store targets for dummy effect in triggered spells
@@ -466,12 +728,15 @@ void Spell::FillTargetMap()
             AddUnitTarget(m_caster, SpellEffectIndex(i));
 
         // no double fill for same targets
-        for (int j = 0; j < i; ++j)
+        for (uint8 j = EFFECT_INDEX_0; j < i; ++j)
         {
+            if (m_spellInfo->Effect[j] == SPELL_EFFECT_NONE)
+                continue;
+
             // Check if same target, but handle i.e. AreaAuras different
-            if (m_spellInfo->EffectImplicitTargetA[i] == m_spellInfo->EffectImplicitTargetA[j] && m_spellInfo->EffectImplicitTargetB[i] == m_spellInfo->EffectImplicitTargetB[j]
-                && m_spellInfo->Effect[j] != SPELL_EFFECT_NONE
-                && !IsAreaAuraEffect(m_spellInfo->Effect[i]) && !IsAreaAuraEffect(m_spellInfo->Effect[j]))
+            if (m_spellInfo->EffectImplicitTargetA[i] == m_spellInfo->EffectImplicitTargetA[j] &&
+                m_spellInfo->EffectImplicitTargetB[i] == m_spellInfo->EffectImplicitTargetB[j] &&
+                !IsAreaAuraEffect(m_spellInfo->Effect[i]) && !IsAreaAuraEffect(m_spellInfo->Effect[j]))
                 // Add further conditions here if required
             {
                 effToIndex[i] = j;                          // effect i has same targeting list as effect j
@@ -479,7 +744,8 @@ void Spell::FillTargetMap()
             }
         }
 
-        if (effToIndex[i] == i)                             // New target combination
+        // New target combination and fail custom fill method
+        if (!FillCustomTargetMap(SpellEffectIndex(i),tmpUnitLists[i], effToIndex[i]) && effToIndex[i] == i)
         {
             // TargetA/TargetB dependent from each other, we not switch to full support this dependences
             // but need it support in some know cases
@@ -489,7 +755,7 @@ void Spell::FillTargetMap()
                     switch(m_spellInfo->EffectImplicitTargetB[i])
                     {
                         case TARGET_NONE:
-                            if (m_caster->GetObjectGuid().IsPet())
+                            if (m_caster->GetObjectGuid().IsPet() && m_spellInfo->TargetCreatureType == CREATURE_TYPEMASK_NONE)
                                 SetTargetMap(SpellEffectIndex(i), TARGET_SELF, tmpUnitLists[i /*==effToIndex[i]*/]);
                             else
                                 SetTargetMap(SpellEffectIndex(i), TARGET_EFFECT_SELECT, tmpUnitLists[i /*==effToIndex[i]*/]);
@@ -508,7 +774,7 @@ void Spell::FillTargetMap()
                             break;
                         case TARGET_AREAEFFECT_INSTANT:         // use B case that not dependent from from A in fact
                             if((m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) == 0)
-                                m_targets.setDestination(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ());
+                                m_targets.setDestination(m_caster->GetPosition());
                             SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetB[i], tmpUnitLists[i /*==effToIndex[i]*/]);
                             break;
                         case TARGET_BEHIND_VICTIM:              // use B case that not dependent from from A in fact
@@ -535,11 +801,10 @@ void Spell::FillTargetMap()
                         case TARGET_ALL_ENEMY_IN_AREA_CHANNELED:
                         case TARGET_ALL_FRIENDLY_UNITS_IN_AREA:
                         case TARGET_AREAEFFECT_GO_AROUND_DEST:
-                        case TARGET_RANDOM_NEARBY_DEST:
                             // triggered spells get dest point from default target set, ignore it
                             if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) || m_IsTriggeredSpell)
                                 if (WorldObject* castObject = GetCastingObject())
-                                    m_targets.setDestination(castObject->GetPositionX(), castObject->GetPositionY(), castObject->GetPositionZ());
+                                    m_targets.setDestination(castObject->GetPosition());
                             SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetB[i], tmpUnitLists[i /*==effToIndex[i]*/]);
                             break;
                         // target pre-selection required
@@ -558,6 +823,7 @@ void Spell::FillTargetMap()
                         case TARGET_POINT_AT_NW:
                         case TARGET_POINT_AT_SE:
                         case TARGET_POINT_AT_SW:
+                        case TARGET_RANDOM_NEARBY_DEST:
                             // need some target for processing
                             SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetA[i], tmpUnitLists[i /*==effToIndex[i]*/]);
                             SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetB[i], tmpUnitLists[i /*==effToIndex[i]*/]);
@@ -576,7 +842,7 @@ void Spell::FillTargetMap()
                             // currently each enemy selected explicitly and self cast damage
                             if (m_spellInfo->Effect[i] == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE)
                             {
-                                if(m_targets.getUnitTarget())
+                                if (m_targets.getUnitTarget())
                                     tmpUnitLists[i /*==effToIndex[i]*/].push_back(m_targets.getUnitTarget());
                             }
                             else
@@ -600,7 +866,6 @@ void Spell::FillTargetMap()
                     {
                         case TARGET_NONE:
                             SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetA[i], tmpUnitLists[i /*==effToIndex[i]*/]);
-
                             // need some target for processing
                             SetTargetMap(SpellEffectIndex(i), TARGET_EFFECT_SELECT, tmpUnitLists[i /*==effToIndex[i]*/]);
                             break;
@@ -620,6 +885,16 @@ void Spell::FillTargetMap()
                         case TARGET_EFFECT_SELECT:
                             SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetA[i], tmpUnitLists[i /*==effToIndex[i]*/]);
                             break;
+                        case TARGET_RANDOM_NEARBY_DEST:
+                            SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetA[i], tmpUnitLists[i /*==effToIndex[i]*/]);
+                        break;
+                        case TARGET_AREAEFFECT_CUSTOM:
+                            // triggered spells get dest point from default target set, ignore it
+                            if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) || m_IsTriggeredSpell)
+                                if (WorldObject* castObject = GetCastingObject())
+                                    m_targets.setDestination(castObject->GetPosition());
+                            SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetB[i], tmpUnitLists[i /*==effToIndex[i]*/]);
+                            break;
                         // most A/B target pairs is self->negative and not expect adding caster to target list
                         default:
                             SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetB[i], tmpUnitLists[i /*==effToIndex[i]*/]);
@@ -641,6 +916,8 @@ void Spell::FillTargetMap()
                             break;
                     }
                     break;
+                case TARGET_AREAEFFECT_CUSTOM:
+                case TARGET_DUELVSPLAYER:
                 default:
                     switch(m_spellInfo->EffectImplicitTargetB[i])
                     {
@@ -660,34 +937,38 @@ void Spell::FillTargetMap()
             }
         }
 
-        if (m_caster->GetTypeId() == TYPEID_PLAYER)
+        if (tmpUnitLists[effToIndex[i]].size() == 1 && *tmpUnitLists[effToIndex[i]].begin() == m_caster->getVictim())
         {
-            Player* me = (Player*)m_caster;
-            for (UnitList::const_iterator itr = tmpUnitLists[effToIndex[i]].begin(); itr != tmpUnitLists[effToIndex[i]].end(); ++itr)
+            if (Unit* pMagnetTarget = m_caster->SelectMagnetTarget(*tmpUnitLists[effToIndex[i]].begin(), this, SpellEffectIndex(i)))
             {
-                Player *targetOwner = (*itr)->GetCharmerOrOwnerPlayerOrPlayerItself();
-                if (targetOwner && targetOwner != me && targetOwner->IsPvP() && !me->IsInDuelWith(targetOwner))
+                if (pMagnetTarget != *tmpUnitLists[effToIndex[i]].begin())
                 {
-                    me->UpdatePvP(true);
-                    me->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
-                    break;
+                    tmpUnitLists[effToIndex[i]].clear();
+                    tmpUnitLists[effToIndex[i]].push_back(pMagnetTarget);
+                    m_spellFlags |= SPELL_FLAG_REDIRECTED;
                 }
             }
         }
-
+        GuidList currentTargets;
         for (UnitList::iterator itr = tmpUnitLists[effToIndex[i]].begin(); itr != tmpUnitLists[effToIndex[i]].end();)
         {
-            if (!CheckTarget (*itr, SpellEffectIndex(i)))
+            if (!CheckTarget(*itr, SpellEffectIndex(i)))
             {
                 itr = tmpUnitLists[effToIndex[i]].erase(itr);
                 continue;
             }
             else
+            {
+                currentTargets.push_back((*itr)->GetObjectGuid());
                 ++itr;
+            }
         }
 
-        for (UnitList::const_iterator iunit = tmpUnitLists[effToIndex[i]].begin(); iunit != tmpUnitLists[effToIndex[i]].end(); ++iunit)
-            AddUnitTarget((*iunit), SpellEffectIndex(i));
+        if (!currentTargets.empty())
+        {
+            for (GuidList::const_iterator iguid = currentTargets.begin(); iguid != currentTargets.end(); ++iguid)
+                AddTarget((*iguid), SpellEffectIndex(i));
+        }
     }
 }
 
@@ -715,40 +996,42 @@ void Spell::prepareDataForTriggerSystem()
         {
             case SPELLFAMILY_MAGE:
                 // Arcane Missiles / Blizzard triggers need do it
-                if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0000000000200080)))
+                if (m_spellInfo->GetSpellFamilyFlags().test<CF_MAGE_BLIZZARD, CF_MAGE_ARCANE_MISSILES2>() || m_spellInfo->GetSpellIconID() == 212)
                     m_canTrigger = true;
                 // Clearcasting trigger need do it
-                else if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0000000200000000)))
-                    m_canTrigger = true;
                 // Replenish Mana, item spell with triggered cases (Mana Agate, etc mana gems)
-                else if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0000010000000000)))
+                // Fingers of Frost: triggered by Frost/Ice Armor
+                // Living Bomb - can trigger Hot Streak
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_MAGE_CLEARCASTING, CF_MAGE_REPLENISH_MANA, CF_MAGE_CHILLED, CF_MAGE_LIVING_BOMB_AOE>())
                     m_canTrigger = true;
                 break;
             case SPELLFAMILY_WARLOCK:
                 // For Hellfire Effect / Rain of Fire / Seed of Corruption triggers need do it
-                if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0000800000000060)))
+                if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARLOCK_RAIN_OF_FIRE, CF_WARLOCK_HELLFIRE, CF_WARLOCK_SEED_OF_CORRUPTION2>())
                     m_canTrigger = true;
                 break;
             case SPELLFAMILY_PRIEST:
-                // For Penance,Mind Sear,Mind Flay heal/damage triggers need do it
-                if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0001800000800000), 0x00000040))
+                // For Penance,Mind Sear,Mind Flay,Improved Devouring Plague heal/damage triggers need do it
+                if (m_spellInfo->GetSpellFamilyFlags().test<CF_PRIEST_MIND_FLAY1, CF_PRIEST_PENANCE_DMG, CF_PRIEST_PENANCE_HEAL, CF_PRIEST_IMP_DEVOURING_PLAGUE, CF_PRIEST_MIND_FLAY2>())
                     m_canTrigger = true;
                 break;
             case SPELLFAMILY_ROGUE:
                 // For poisons need do it
-                if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x000000101001E000)))
+                if (m_spellInfo->GetSpellFamilyFlags().test<CF_ROGUE_INSTANT_POISON, CF_ROGUE_CRIPPLING_POISON, CF_ROGUE_MIND_NUMBING_POISON, CF_ROGUE_DEADLY_POISON, CF_ROGUE_WOUND_POISON, CF_ROGUE_ANESTHETIC_POISON>())
                     m_canTrigger = true;
                 break;
             case SPELLFAMILY_HUNTER:
                 // Hunter Rapid Killing/Explosive Trap Effect/Immolation Trap Effect/Frost Trap Aura/Snake Trap Effect/Explosive Shot
-                if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0100200000000214), 0x00000200))
+                if (m_spellInfo->GetSpellFamilyFlags().test<CF_HUNTER_FIRE_TRAP_EFFECTS, CF_HUNTER_FROST_TRAP_EFFECTS, CF_HUNTER_SNAKE_TRAP_EFFECT, CF_HUNTER_RAPID_KILLING, CF_HUNTER_EXPLOSIVE_SHOT2>())
                     m_canTrigger = true;
                 break;
             case SPELLFAMILY_PALADIN:
                 // For Judgements (all) / Holy Shock triggers need do it
-                if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0001000900B80400)))
+                if (m_spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_JUDGEMENT_OF_RIGHT, CF_PALADIN_JUDGEMENT_OF_WISDOM_LIGHT, CF_PALADIN_JUDGEMENT_OF_JUSTICE, CF_PALADIN_HOLY_SHOCK1, CF_PALADIN_JUDGEMENT_ACTIVATE, CF_PALADIN_JUDGEMENT_OF_LIGHT, CF_PALADIN_JUDGEMENT_OF_BLOOD_MARTYR, CF_PALADIN_HOLY_SHOCK>())
                     m_canTrigger = true;
                 break;
+            case SPELLFAMILY_WARRIOR:
+                break;
             default:
                 break;
         }
@@ -802,9 +1085,9 @@ void Spell::prepareDataForTriggerSystem()
         if (!IsPositiveEffect(m_spellInfo, SpellEffectIndex(i)))
             m_negativeEffectMask |= (1<<i);
 
-    // Hunter traps spells (for Entrapment trigger)
-    // Gives your Immolation Trap, Frost Trap, Explosive Trap, and Snake Trap ....
-    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && (m_spellInfo->SpellFamilyFlags & UI64LIT(0x000020000000001C)))
+    // Hunter traps spells: Immolation Trap Effect, Frost Trap (triggering spell!!),
+    // Freezing Trap Effect(+ Freezing Arrow Effect), Explosive Trap Effect, Snake Trap Effect
+    if (m_spellInfo->IsFitToFamily<SPELLFAMILY_HUNTER, CF_HUNTER_FREEZING_TRAP_EFFECT, CF_HUNTER_MISC_TRAPS, CF_HUNTER_SNAKE_TRAP_EFFECT, CF_HUNTER_EXPLOSIVE_TRAP_EFFECT, CF_HUNTER_IMMOLATION_TRAP, CF_HUNTER_FROST_TRAP>())
         m_procAttacker |= PROC_FLAG_ON_TRAP_ACTIVATION;
 }
 
@@ -818,7 +1101,7 @@ void Spell::CleanupTargetList()
 
 void Spell::AddUnitTarget(Unit* pVictim, SpellEffectIndex effIndex)
 {
-    if (m_spellInfo->Effect[effIndex] == 0)
+    if (m_spellInfo->Effect[effIndex] == SPELL_EFFECT_NONE || !pVictim)
         return;
 
     // Check for effect immune skip if immuned
@@ -849,32 +1132,64 @@ void Spell::AddUnitTarget(Unit* pVictim, SpellEffectIndex effIndex)
     target.processed  = false;                              // Effects not applied on target
 
     // Calculate hit result
-    target.missCondition = m_caster->SpellHitResult(pVictim, m_spellInfo, m_canReflect);
+    target.missCondition = m_caster->SpellHitResult(pVictim, m_spellInfo);
 
     // spell fly from visual cast object
     WorldObject* affectiveObject = GetAffectiveCasterObject();
 
+    // Speed possible inherited from triggering spell
+    float speed_proto = GetBaseSpellSpeed();
+
+    // Spell have trajectory - need calculate incoming time
+    if (affectiveObject && (m_targets.GetSpeed() > M_NULL_F))
+    {
+        float dist = 5.0f;
+        if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
+            dist = affectiveObject->GetDistance(m_targets.getDestination());
+        else
+            dist = affectiveObject->GetDistance(pVictim->GetPosition());
+        float speed = m_targets.GetSpeed() * cos(m_targets.GetElevation());
+
+        target.timeDelay = (uint64) floor(dist / speed * 1000.0f);
+    }
     // Spell have speed - need calculate incoming time
-    if (m_spellInfo->speed > 0.0f && affectiveObject && pVictim != affectiveObject)
+    else if ((speed_proto > M_NULL_F) && affectiveObject && (pVictim != affectiveObject))
     {
         // calculate spell incoming interval
         float dist = affectiveObject->GetDistance(pVictim->GetPositionX(), pVictim->GetPositionY(), pVictim->GetPositionZ());
         if (dist < 5.0f)
             dist = 5.0f;
-        target.timeDelay = (uint64) floor(dist / m_spellInfo->speed * 1000.0f);
+        target.timeDelay = (uint64) floor(dist / speed_proto * 1000.0f);
+/*
+this piece of code make delayed stun and other effects for charge-like spells. seems not offlike...
+        if (m_spellInfo->GetAttributesEx7() & SPELL_ATTR_EX7_HAS_CHARGE_EFFECT)
+        {
+            if (target.timeDelay > GetDelayStart())
+                SetDelayStart(target.timeDelay);
+        }
+*/
+    }
+    // Spell cast on self - mostly TRIGGER_MISSILE code
+    else if ((speed_proto > M_NULL_F) && affectiveObject && (pVictim == affectiveObject))
+    {
+        float dist = 0.0f;
+        if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
+            dist = affectiveObject->GetDistance(m_targets.getDestination());
 
-        // Calculate minimum incoming time
-        if (m_delayMoment == 0 || m_delayMoment>target.timeDelay)
-            m_delayMoment = target.timeDelay;
+        target.timeDelay = (uint64) floor(dist / speed_proto * 1000.0f);
     }
     else
         target.timeDelay = UI64LIT(0);
 
+    // Calculate minimum incoming time
+    if (m_delayMoment == 0 || m_delayMoment > target.timeDelay)
+        m_delayMoment = target.timeDelay;
+
     // If target reflect spell back to caster
     if (target.missCondition == SPELL_MISS_REFLECT)
     {
         // Calculate reflected spell result on caster
-        target.reflectResult =  m_caster->SpellHitResult(m_caster, m_spellInfo, m_canReflect);
+        target.reflectResult =  m_caster->SpellHitResult(m_caster, m_spellInfo);
 
         if (target.reflectResult == SPELL_MISS_REFLECT)     // Impossible reflect again, so simply deflect spell
             target.reflectResult = SPELL_MISS_PARRY;
@@ -888,13 +1203,52 @@ void Spell::AddUnitTarget(Unit* pVictim, SpellEffectIndex effIndex)
         target.reflectResult = SPELL_MISS_NONE;
 
     // Add target to list
+    // valgrind says, that memleak here. need research...
     m_UniqueTargetInfo.push_back(target);
 }
 
-void Spell::AddUnitTarget(ObjectGuid unitGuid, SpellEffectIndex effIndex)
+void Spell::AddTarget(ObjectGuid targetGuid, SpellEffectIndex effIndex)
 {
-    if (Unit* unit = m_caster->GetObjectGuid() == unitGuid ? m_caster : ObjectAccessor::GetUnit(*m_caster, unitGuid))
-        AddUnitTarget(unit, effIndex);
+    if (targetGuid.IsEmpty())
+        return;
+
+    switch(targetGuid.GetHigh())
+    {
+        case HIGHGUID_UNIT:
+        case HIGHGUID_VEHICLE:
+        case HIGHGUID_PET:
+        case HIGHGUID_PLAYER:
+        {
+            // Only for speedup (may be removed later)
+            if (m_caster->GetObjectGuid() == targetGuid)
+                AddUnitTarget(m_caster, effIndex);
+            else if (Unit* unit = ObjectAccessor::GetUnit(*m_caster, targetGuid))
+                AddUnitTarget(unit, effIndex);
+            break;
+        }
+        case HIGHGUID_GAMEOBJECT:
+        case HIGHGUID_TRANSPORT:
+        case HIGHGUID_DYNAMICOBJECT:
+        case HIGHGUID_MO_TRANSPORT:
+        {
+            if (GameObject* object = m_caster->GetMap()->GetGameObject(targetGuid))
+                AddGOTarget(object, effIndex);
+            break;
+        }
+        case HIGHGUID_CORPSE:
+        case HIGHGUID_ITEM:
+        {
+            sLog.outError("Spell::AddTarget currently this type of targets (%s) supported by another way!", targetGuid.GetString().c_str());
+            break;
+        }
+/*
+        HIGHGUID_INSTANCE:
+        HIGHGUID_GROUP:
+*/
+        default:
+            sLog.outError("Spell::AddTarget unhandled type of spell target (%s)!", targetGuid.GetString().c_str());
+            break;
+    }
 }
 
 void Spell::AddGOTarget(GameObject* pVictim, SpellEffectIndex effIndex)
@@ -904,6 +1258,20 @@ void Spell::AddGOTarget(GameObject* pVictim, SpellEffectIndex effIndex)
 
     ObjectGuid targetGUID = pVictim->GetObjectGuid();
 
+    // Check target is effectible to this effect ?
+    GameobjectTypes gameobjectType = pVictim->GetGoType();
+    switch(m_spellInfo->Effect[effIndex])
+    {
+        case SPELL_EFFECT_WMO_DAMAGE:
+        case SPELL_EFFECT_WMO_REPAIR:
+        case SPELL_EFFECT_WMO_CHANGE:
+            if (gameobjectType != GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING)
+                return;
+            break;
+        default:
+            break;
+    }
+
     // Lookup target in already in list
     for(GOTargetList::iterator ihit = m_UniqueGOTargetInfo.begin(); ihit != m_UniqueGOTargetInfo.end(); ++ihit)
     {
@@ -924,30 +1292,41 @@ void Spell::AddGOTarget(GameObject* pVictim, SpellEffectIndex effIndex)
     // spell fly from visual cast object
     WorldObject* affectiveObject = GetAffectiveCasterObject();
 
-    // Spell have speed - need calculate incoming time
-    if (m_spellInfo->speed > 0.0f && affectiveObject && pVictim != affectiveObject)
+    // Speed possible inherited from triggering spell
+    float speed_proto = GetBaseSpellSpeed();
+
+    // Spell have trajectory - need calculate incoming time
+    if (affectiveObject && m_targets.GetSpeed() > M_NULL_F)
+    {
+        float dist = 5.0f;
+        if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
+            dist = affectiveObject->GetDistance(m_targets.getDestination());
+        else
+            dist = affectiveObject->GetDistance(pVictim->GetPosition());
+
+        float speed = m_targets.GetSpeed() * cos(m_targets.GetElevation());
+
+        target.timeDelay = (uint64) floor(dist / speed * 1000.0f);
+    }
+    // Spell have speed - need calculate incoming time
+    else if (speed_proto > M_NULL_F && affectiveObject && pVictim != affectiveObject)
     {
         // calculate spell incoming interval
         float dist = affectiveObject->GetDistance(pVictim->GetPositionX(), pVictim->GetPositionY(), pVictim->GetPositionZ());
         if (dist < 5.0f)
             dist = 5.0f;
-        target.timeDelay = (uint64) floor(dist / m_spellInfo->speed * 1000.0f);
-        if (m_delayMoment == 0 || m_delayMoment > target.timeDelay)
-            m_delayMoment = target.timeDelay;
+        target.timeDelay = (uint64) floor(dist / speed_proto * 1000.0f);
     }
     else
         target.timeDelay = UI64LIT(0);
 
+    if (m_delayMoment == 0 || m_delayMoment > target.timeDelay)
+        m_delayMoment = target.timeDelay;
+
     // Add target to list
     m_UniqueGOTargetInfo.push_back(target);
 }
 
-void Spell::AddGOTarget(ObjectGuid goGuid, SpellEffectIndex effIndex)
-{
-    if (GameObject* go = m_caster->GetMap()->GetGameObject(goGuid))
-        AddGOTarget(go, effIndex);
-}
-
 void Spell::AddItemTarget(Item* pitem, SpellEffectIndex effIndex)
 {
     if (m_spellInfo->Effect[effIndex] == 0)
@@ -971,23 +1350,27 @@ void Spell::AddItemTarget(Item* pitem, SpellEffectIndex effIndex)
     m_UniqueItemInfo.push_back(target);
 }
 
-void Spell::DoAllEffectOnTarget(TargetInfo *target)
+void Spell::DoAllEffectOnTarget(TargetInfo* target)
 {
-    if (target->processed)                                  // Check target
+    if (!target || target->processed)                       // Check target
         return;
+
     target->processed = true;                               // Target checked in apply effects procedure
 
     // Get mask of effects for target
     uint32 mask = target->effectMask;
 
-    Unit* unit = m_caster->GetObjectGuid() == target->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, target->targetGUID);
+    Unit* unit = (m_caster->GetObjectGuid() == target->targetGUID) ?
+                    m_caster :
+                    ObjectAccessor::GetUnit(*m_caster, target->targetGUID);
+
     if (!unit)
         return;
 
     // Get original caster (if exist) and calculate damage/healing from him data
     Unit *real_caster = GetAffectiveCaster();
     // FIXME: in case wild GO heal/damage spells will be used target bonuses
-    Unit *caster = real_caster ? real_caster : m_caster;
+    Unit* caster = real_caster ? real_caster : m_caster;
 
     SpellMissInfo missInfo = target->missCondition;
     // Need init unitTarget by default unit (can changed in code on reflect)
@@ -998,21 +1381,26 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
     ResetEffectDamageAndHeal();
 
     // Fill base trigger info
-    uint32 procAttacker = m_procAttacker;
-    uint32 procVictim   = m_procVictim;
-    uint32 procEx       = PROC_EX_NONE;
+    DamageInfo damageInfo(caster, unitTarget, m_spellInfo);
+    damageInfo.procAttacker = m_procAttacker;
+    damageInfo.procVictim   = m_procVictim;
+    damageInfo.procEx       = PROC_EX_NONE;
+    damageInfo.attackType   = m_attackType;
 
     // drop proc flags in case target not affected negative effects in negative spell
     // for example caster bonus or animation,
     // except miss case where will assigned PROC_EX_* flags later
-    if (((procAttacker | procVictim) & NEGATIVE_TRIGGER_MASK) &&
+    if (((damageInfo.procAttacker | damageInfo.procVictim) & NEGATIVE_TRIGGER_MASK) &&
         !(target->effectMask & m_negativeEffectMask) && missInfo == SPELL_MISS_NONE)
     {
-        procAttacker = PROC_FLAG_NONE;
-        procVictim   = PROC_FLAG_NONE;
+        damageInfo.procAttacker = PROC_FLAG_NONE;
+        damageInfo.procVictim   = PROC_FLAG_NONE;
     }
 
-    if (m_spellInfo->speed > 0)
+    // Speed possible inherited from triggering spell
+    // float speed_proto = GetBaseSpellSpeed();
+
+    if (m_spellInfo->GetSpeed() > M_NULL_F || GetDelayStart())
     {
         // mark effects that were already handled in Spell::HandleDelayedSpellLaunch on spell launch as processed
         for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
@@ -1023,6 +1411,17 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
         m_damage += target->damage;
     }
 
+    // recheck for availability/visibility of target
+    if (((m_spellInfo->GetSpeed() > M_NULL_F ||
+        (m_spellInfo->EffectImplicitTargetA[0] == TARGET_CHAIN_DAMAGE &&
+        GetSpellCastTime(m_spellInfo, this) > 0)) &&
+        (!unit->isVisibleForOrDetect(m_caster, m_caster, false) && !m_IsTriggeredSpell)))
+    {
+        caster->SendSpellMiss(unit, m_spellInfo->Id, SPELL_MISS_EVADE);
+        missInfo = SPELL_MISS_EVADE;
+        return;
+    }
+
     if (missInfo==SPELL_MISS_NONE)                          // In case spell hit target, do all effect on that target
         DoSpellHitOnUnit(unit, mask);
     else if (missInfo == SPELL_MISS_REFLECT)                // In case spell reflect from target, do all effect on caster (if hit)
@@ -1030,52 +1429,54 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
         if (target->reflectResult == SPELL_MISS_NONE)       // If reflected spell hit caster -> do all effect on him
         {
             DoSpellHitOnUnit(m_caster, mask);
+            damageInfo.target = m_caster;
             unitTarget = m_caster;
         }
     }
-    else if(missInfo == SPELL_MISS_MISS || missInfo == SPELL_MISS_RESIST)
+    else if (missInfo == SPELL_MISS_MISS || missInfo == SPELL_MISS_RESIST)
     {
-        if(real_caster && real_caster != unit)
+        if (unit && real_caster && real_caster != unit)
         {
             // can cause back attack (if detected)
-            if (!m_spellInfo->HasAttribute(SPELL_ATTR_EX3_NO_INITIAL_AGGRO) && !IsPositiveSpell(m_spellInfo->Id) &&
-                m_caster->isVisibleForOrDetect(unit, unit, false))
+            if (!m_spellInfo->HasAttribute(SPELL_ATTR_EX3_NO_INITIAL_AGGRO)
+                && !m_spellInfo->HasAttribute(SPELL_ATTR_EX_NO_THREAT)
+                && (!IsPositiveSpell(m_spellInfo->Id) || (IsNonPositiveSpell(m_spellInfo) && !real_caster->IsFriendlyTo(unit)))
+                && real_caster->isVisibleForOrDetect(unit, unit, false))
             {
-                if (!unit->isInCombat() && unit->GetTypeId() != TYPEID_PLAYER && ((Creature*)unit)->AI())
-                    ((Creature*)unit)->AI()->AttackedBy(real_caster);
-
-                unit->AddThreat(real_caster);
-                unit->SetInCombatWith(real_caster);
-                real_caster->SetInCombatWith(unit);
+                unit->AttackedBy(real_caster);
             }
         }
     }
 
+
     // All calculated do it!
     // Do healing and triggers
     if (m_healing)
     {
         bool crit = real_caster && real_caster->IsSpellCrit(unitTarget, m_spellInfo, m_spellSchoolMask);
-        uint32 addhealth = m_healing;
+        damageInfo.damage = m_healing;
         if (crit)
         {
-            procEx |= PROC_EX_CRITICAL_HIT;
-            addhealth = caster->SpellCriticalHealingBonus(m_spellInfo, addhealth, NULL);
+            damageInfo.procEx |= PROC_EX_CRITICAL_HIT;
+            damageInfo.damage  = caster->SpellCriticalHealingBonus(m_spellInfo, damageInfo.damage, NULL);
         }
         else
-            procEx |= PROC_EX_NORMAL_HIT;
+            damageInfo.procEx |= PROC_EX_NORMAL_HIT;
 
-        uint32 absorb = 0;
-        unitTarget->CalculateHealAbsorb(addhealth, &absorb);
-        addhealth -= absorb;
+        damageInfo.SetAbsorb(0);
+        damageInfo.target->CalculateHealAbsorb(damageInfo.damage, &damageInfo.absorb);
+        damageInfo.damage -= damageInfo.GetAbsorb();
 
         // Do triggers for unit (reflect triggers passed on hit phase for correct drop charge)
         if (m_canTrigger && missInfo != SPELL_MISS_REFLECT)
         {
-            caster->ProcDamageAndSpell(unitTarget, real_caster ? procAttacker : PROC_FLAG_NONE, procVictim, procEx, addhealth, m_attackType, m_spellInfo);
+            uint32 saveAttacker = damageInfo.procAttacker;
+            damageInfo.procAttacker = real_caster ? damageInfo.procAttacker : PROC_FLAG_NONE;
+            damageInfo.attacker->ProcDamageAndSpell(&damageInfo);
+            damageInfo.procAttacker = saveAttacker;
         }
 
-        int32 gain = caster->DealHeal(unitTarget, addhealth, m_spellInfo, crit, absorb);
+        int32 gain = damageInfo.attacker->DealHeal(&damageInfo, crit);
 
         if (real_caster)
             unitTarget->getHostileRefManager().threatAssist(real_caster, float(gain) * 0.5f * sSpellMgr.GetSpellThreatMultiplier(m_spellInfo), m_spellInfo);
@@ -1084,30 +1485,46 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
     else if (m_damage)
     {
         // Fill base damage struct (unitTarget - is real spell target)
-        SpellNonMeleeDamage damageInfo(caster, unitTarget, m_spellInfo->Id, m_spellSchoolMask);
 
-        if (m_spellInfo->speed > 0)
+        if (m_spellInfo->GetSpeed() > M_NULL_F)
         {
             damageInfo.damage = m_damage;
             damageInfo.HitInfo = target->HitInfo;
         }
         // Add bonuses and fill damageInfo struct
         else
-            caster->CalculateSpellDamage(&damageInfo, m_damage, m_spellInfo, m_attackType);
+        {
+            float dmgMultiplier = 1.0f;
+            if (m_damageIndex >= 0 && (m_applyMultiplierMask & (1 << m_damageIndex)))
+                dmgMultiplier = m_damageMultipliers[m_damageIndex];
+
+            damageInfo.damage = m_damage;
+            caster->CalculateSpellDamage(&damageInfo, dmgMultiplier);
+        }
 
         unitTarget->CalculateAbsorbResistBlock(caster, &damageInfo, m_spellInfo);
 
-        caster->DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb);
+        caster->DealDamageMods(&damageInfo);
 
         // Send log damage message to client
         caster->SendSpellNonMeleeDamageLog(&damageInfo);
 
-        procEx = createProcExtendMask(&damageInfo, missInfo);
-        procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
+        damageInfo.procEx = createProcExtendMask(&damageInfo, missInfo);
+        damageInfo.procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
+
+        if (damageInfo.GetAbsorb() && damageInfo.damage == 0)
+            damageInfo.procEx &= ~PROC_EX_DIRECT_DAMAGE;
+        else if (damageInfo.damage > 0)
+            damageInfo.procEx |= PROC_EX_DIRECT_DAMAGE;
 
         // Do triggers for unit (reflect triggers passed on hit phase for correct drop charge)
         if (m_canTrigger && missInfo != SPELL_MISS_REFLECT)
-            caster->ProcDamageAndSpell(unitTarget, real_caster ? procAttacker : PROC_FLAG_NONE, procVictim, procEx, damageInfo.damage, m_attackType, m_spellInfo);
+        {
+            uint32 saveAttacker = damageInfo.procAttacker;
+            damageInfo.procAttacker = real_caster ? damageInfo.procAttacker : PROC_FLAG_NONE;
+            caster->ProcDamageAndSpell(&damageInfo);
+            damageInfo.procAttacker = saveAttacker;
+        }
 
         // trigger weapon enchants for weapon based spells; exclude spells that stop attack, because may break CC
         if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->EquippedItemClass == ITEM_CLASS_WEAPON &&
@@ -1116,21 +1533,25 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
 
         // Haunt (NOTE: for avoid use additional field damage stored in dummy value (replace unused 100%)
         // apply before deal damage because aura can be removed at target kill
-        if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->SpellIconID == 3172 &&
-            (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0004000000000000)))
-            if(Aura* dummy = unitTarget->GetDummyAura(m_spellInfo->Id))
-                dummy->GetModifier()->m_amount = damageInfo.damage;
+        if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->GetSpellIconID() == 3172 &&
+            m_spellInfo->GetSpellFamilyFlags().test<CF_WARLOCK_HAUNT>())
+            if (Aura const* dummy = unitTarget->GetDummyAura(m_spellInfo->Id))
+                dummy->GetModifier()->m_amount = damageInfo.damage + damageInfo.GetAbsorb();
+
+        /* process anticheat check */
+        if (caster->GetObjectGuid().IsPlayer())
+            ((Player*)caster)->GetAntiCheat()->DoAntiCheatCheck(CHECK_DAMAGE_SPELL, m_spellInfo->Id, 0, damageInfo.damage);
 
         caster->DealSpellDamage(&damageInfo, true);
 
         // Scourge Strike, here because needs to use final damage in second part of the spell
-        if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellInfo->SpellFamilyFlags & UI64LIT(0x0800000000000000))
+        if (m_spellInfo->IsFitToFamily<SPELLFAMILY_DEATHKNIGHT, CF_DEATHKNIGHT_SCOURGE_STRIKE>())
         {
             uint32 count = 0;
             Unit::SpellAuraHolderMap const& auras = unitTarget->GetSpellAuraHolderMap();
             for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
             {
-                if(itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE &&
+                if (itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE &&
                     itr->second->GetCasterGuid() == caster->GetObjectGuid())
                     ++count;
             }
@@ -1138,22 +1559,42 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
             if (count)
             {
                 int32 bp = count * CalculateDamage(EFFECT_INDEX_2, unitTarget) * damageInfo.damage / 100;
+                if (Aura const* dummy = caster->GetDummyAura(64736)) // Item - Death Knight T8 Melee 4P Bonus
+                    bp *= ((dummy->GetModifier()->m_amount * count) + 100.0f) / 100.0f;
+
                 if (bp)
                     caster->CastCustomSpell(unitTarget, 70890, &bp, NULL, NULL, true);
             }
         }
     }
     // Passive spell hits/misses or active spells only misses (only triggers if proc flags set)
-    else if (procAttacker || procVictim)
+    else if (damageInfo.procAttacker || damageInfo.procVictim)
     {
         // Fill base damage struct (unitTarget - is real spell target)
-        SpellNonMeleeDamage damageInfo(caster, unitTarget, m_spellInfo->Id, m_spellSchoolMask);
-        procEx = createProcExtendMask(&damageInfo, missInfo);
+        damageInfo.procEx = createProcExtendMask(&damageInfo, missInfo);
         // Do triggers for unit (reflect triggers passed on hit phase for correct drop charge)
         if (m_canTrigger && missInfo != SPELL_MISS_REFLECT)
-            caster->ProcDamageAndSpell(unit, real_caster ? procAttacker : PROC_FLAG_NONE, procVictim, procEx, 0, m_attackType, m_spellInfo);
+        {
+            uint32 saveAttacker = damageInfo.procAttacker;
+            damageInfo.procAttacker = real_caster ? damageInfo.procAttacker : PROC_FLAG_NONE;
+            caster->ProcDamageAndSpell(&damageInfo);
+            damageInfo.procAttacker = saveAttacker;
+        }
     }
 
+    // Update damage multipliers
+    for (uint8 effectNumber = 0; effectNumber < MAX_EFFECT_INDEX; ++effectNumber)
+        if ((mask & (1 << effectNumber)) && (m_applyMultiplierMask & (1 << effectNumber)))
+        {
+            // Get multiplier
+            float multiplier = m_spellInfo->DmgMultiplier[effectNumber];
+            // Apply multiplier mods
+            if (real_caster)
+                if (Player* modOwner = real_caster->GetSpellModOwner())
+                    modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_EFFECT_PAST_FIRST, multiplier);
+            m_damageMultipliers[effectNumber] *= multiplier;
+        }
+
     // Call scripted function for AI if this spell is casted upon a creature
     if (unit->GetTypeId() == TYPEID_UNIT)
     {
@@ -1174,17 +1615,35 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
         ((Creature*)real_caster)->AI()->SpellHitTarget(unit, m_spellInfo);
 }
 
-void Spell::DoSpellHitOnUnit(Unit *unit, uint32 effectMask)
+void Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask)
 {
-    if (!unit || !effectMask)
+    if (!unit || !unit->isType(TYPEMASK_UNIT) || (!effectMask && !damage))
         return;
 
     Unit* realCaster = GetAffectiveCaster();
 
+    // Speed possible inherited from triggering spell
+    // float speed_proto = GetBaseSpellSpeed();
+
+    // Recheck effect immune (only for delayed spells)
+    if (m_spellInfo->GetSpeed() > M_NULL_F)
+    {
+        for (int effectNumber = 0; effectNumber < MAX_EFFECT_INDEX; ++effectNumber)
+        {
+            if (effectMask & (1 << effectNumber))
+            {
+                // don't handle effect to which target is immuned
+                if (unit->IsImmuneToSpellEffect(m_spellInfo, SpellEffectIndex(effectNumber)))
+                    effectMask &= ~(1 << effectNumber);
+            }
+        }
+    }
+
     // Recheck immune (only for delayed spells)
-    if (m_spellInfo->speed && (
-        unit->IsImmunedToDamage(GetSpellSchoolMask(m_spellInfo)) ||
-        unit->IsImmuneToSpell(m_spellInfo)))
+    if (m_spellInfo->GetSpeed() > M_NULL_F && (
+        (IsSpellCauseDamage(m_spellInfo) && unit->IsImmunedToDamage(GetSpellSchoolMask(m_spellInfo))) ||
+        unit->IsImmuneToSpell(m_spellInfo, GetAffectiveUnitCaster()->IsFriendlyTo(unit))) &&
+        !m_spellInfo->HasAttribute(SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY))
     {
         if (realCaster)
             realCaster->SendSpellMiss(unit, m_spellInfo->Id, SPELL_MISS_IMMUNE);
@@ -1193,19 +1652,19 @@ void Spell::DoSpellHitOnUnit(Unit *unit, uint32 effectMask)
         return;
     }
 
-    if (unit->GetTypeId() == TYPEID_PLAYER)
+    if (unit->GetTypeId() == TYPEID_PLAYER && unit->IsInWorld())
     {
         ((Player*)unit)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, m_spellInfo->Id);
         ((Player*)unit)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, m_spellInfo->Id);
     }
 
-    if (realCaster && realCaster->GetTypeId() == TYPEID_PLAYER)
+    if (realCaster && realCaster->GetTypeId() == TYPEID_PLAYER && realCaster->IsInWorld())
         ((Player*)realCaster)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL2, m_spellInfo->Id, 0, unit);
 
     if (realCaster && realCaster != unit)
     {
         // Recheck  UNIT_FLAG_NON_ATTACKABLE for delayed spells
-        if (m_spellInfo->speed > 0.0f &&
+        if (m_spellInfo->GetSpeed() > M_NULL_F &&
             unit->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE) &&
             unit->GetCharmerOrOwnerGuid() != m_caster->GetObjectGuid())
         {
@@ -1217,47 +1676,29 @@ void Spell::DoSpellHitOnUnit(Unit *unit, uint32 effectMask)
         if (!realCaster->IsFriendlyTo(unit))
         {
             // for delayed spells ignore not visible explicit target
-            if (m_spellInfo->speed > 0.0f && unit == m_targets.getUnitTarget() &&
-                !unit->isVisibleForOrDetect(m_caster, m_caster, false))
+            if (m_spellInfo->GetSpeed() > M_NULL_F && unit == m_targets.getUnitTarget() &&
+                (!unit->isVisibleForOrDetect(m_caster, m_caster, false) && !m_IsTriggeredSpell))
             {
                 realCaster->SendSpellMiss(unit, m_spellInfo->Id, SPELL_MISS_EVADE);
                 ResetEffectDamageAndHeal();
                 return;
             }
 
-            // not break stealth by cast targeting
-            if (!m_spellInfo->HasAttribute(SPELL_ATTR_EX_NOT_BREAK_STEALTH))
-                unit->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
-
-            // can cause back attack (if detected), stealth removed at Spell::cast if spell break it
-            if (!m_spellInfo->HasAttribute(SPELL_ATTR_EX3_NO_INITIAL_AGGRO) && !IsPositiveSpell(m_spellInfo->Id) &&
-                m_caster->isVisibleForOrDetect(unit, unit, false))
+            if (!m_spellInfo->HasAttribute(SPELL_ATTR_EX3_NO_INITIAL_AGGRO)
+                && !m_spellInfo->HasAttribute(SPELL_ATTR_EX_NO_THREAT)
+                && (!IsPositiveSpell(m_spellInfo->Id) || IsNonPositiveSpell(m_spellInfo))
+                && realCaster->isVisibleForOrDetect(unit, unit, false))
             {
-                // use speedup check to avoid re-remove after above lines
-                if (m_spellInfo->HasAttribute(SPELL_ATTR_EX_NOT_BREAK_STEALTH))
-                    unit->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
-
-                // caster can be detected but have stealth aura
-                m_caster->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
-
                 if (!unit->IsStandState() && !unit->hasUnitState(UNIT_STAT_STUNNED))
                     unit->SetStandState(UNIT_STAND_STATE_STAND);
 
-                if (!unit->isInCombat() && unit->GetTypeId() != TYPEID_PLAYER && ((Creature*)unit)->AI())
-                    unit->AttackedBy(realCaster);
-
-                unit->AddThreat(realCaster);
-                unit->SetInCombatWith(realCaster);
-                realCaster->SetInCombatWith(unit);
-
-                if (Player *attackedPlayer = unit->GetCharmerOrOwnerPlayerOrPlayerItself())
-                    realCaster->SetContestedPvP(attackedPlayer);
+                unit->AttackedBy(realCaster);
             }
         }
         else
         {
             // for delayed spells ignore negative spells (after duel end) for friendly targets
-            if (m_spellInfo->speed > 0.0f && !IsPositiveSpell(m_spellInfo->Id))
+            if (m_spellInfo->GetSpeed() > M_NULL_F && !IsPositiveSpell(m_spellInfo->Id))
             {
                 realCaster->SendSpellMiss(unit, m_spellInfo->Id, SPELL_MISS_EVADE);
                 ResetEffectDamageAndHeal();
@@ -1277,12 +1718,16 @@ void Spell::DoSpellHitOnUnit(Unit *unit, uint32 effectMask)
     }
 
     // Get Data Needed for Diminishing Returns, some effects may have multiple auras, so this must be done on spell hit, not aura add
-    m_diminishGroup = GetDiminishingReturnsGroupForSpell(m_spellInfo,m_triggeredByAuraSpell);
-    m_diminishLevel = unit->GetDiminishing(m_diminishGroup);
-    // Increase Diminishing on unit, current informations for actually casts will use values above
-    if ((GetDiminishingReturnsGroupType(m_diminishGroup) == DRTYPE_PLAYER && unit->GetTypeId() == TYPEID_PLAYER) ||
-        GetDiminishingReturnsGroupType(m_diminishGroup) == DRTYPE_ALL)
-        unit->IncrDiminishing(m_diminishGroup);
+    // Diminishing must not affect spells, casted on self
+    if ((realCaster && unit && realCaster != unit) || (m_spellFlags & SPELL_FLAG_REFLECTED))
+    {
+        m_diminishGroup = GetDiminishingReturnsGroupForSpell(m_spellInfo,m_triggeredByAuraSpell);
+        m_diminishLevel = unit->GetDiminishing(m_diminishGroup);
+        // Increase Diminishing on unit, current informations for actually casts will use values above
+        if ((GetDiminishingReturnsGroupType(m_diminishGroup) == DRTYPE_PLAYER && unit->GetCharmerOrOwnerPlayerOrPlayerItself()) ||
+            GetDiminishingReturnsGroupType(m_diminishGroup) >= DRTYPE_ALL)
+            unit->IncrDiminishing(m_diminishGroup);
+    }
 
     // Apply additional spell effects to target
     CastPreCastSpells(unit);
@@ -1292,29 +1737,17 @@ void Spell::DoSpellHitOnUnit(Unit *unit, uint32 effectMask)
         m_spellAuraHolder = CreateSpellAuraHolder(m_spellInfo, unit, realCaster, m_CastItem);
         m_spellAuraHolder->setDiminishGroup(m_diminishGroup);
     }
-    else
-        m_spellAuraHolder = NULL;
 
     for(int effectNumber = 0; effectNumber < MAX_EFFECT_INDEX; ++effectNumber)
     {
         if (effectMask & (1 << effectNumber))
         {
-            HandleEffects(unit, NULL, NULL, SpellEffectIndex(effectNumber), m_damageMultipliers[effectNumber]);
-            if ( m_applyMultiplierMask & (1 << effectNumber) )
-            {
-                // Get multiplier
-                float multiplier = m_spellInfo->DmgMultiplier[effectNumber];
-                // Apply multiplier mods
-                if (realCaster)
-                    if(Player* modOwner = realCaster->GetSpellModOwner())
-                        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_EFFECT_PAST_FIRST, multiplier, this);
-                m_damageMultipliers[effectNumber] *= multiplier;
-            }
+            HandleEffects(unit, NULL, NULL, SpellEffectIndex(effectNumber));
         }
     }
 
     // now apply all created auras
-    if (m_spellAuraHolder)
+    if (m_spellAuraHolder && m_spellAuraHolder->GetTarget() == unit)
     {
         // normally shouldn't happen
         if (!m_spellAuraHolder->IsEmptyHolder())
@@ -1330,7 +1763,6 @@ void Spell::DoSpellHitOnUnit(Unit *unit, uint32 effectMask)
                 // Fully diminished
                 if (duration == 0)
                 {
-                    delete m_spellAuraHolder;
                     return;
                 }
             }
@@ -1345,15 +1777,22 @@ void Spell::DoSpellHitOnUnit(Unit *unit, uint32 effectMask)
 
             unit->AddSpellAuraHolder(m_spellAuraHolder);
         }
-        else
-            delete m_spellAuraHolder;
+    }
+    else if (m_spellAuraHolder)
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST,"Spell::DoSpellHitOnUnit spell %u caster %s cannot apply spellauraholder to %s due to different targets.",
+            m_spellInfo->Id,
+            realCaster->GetObjectGuid().GetString().c_str(),
+            unit->GetObjectGuid().GetString().c_str());
     }
 }
 
 void Spell::DoAllEffectOnTarget(GOTargetInfo *target)
 {
-    if (target->processed)                                  // Check target
+
+    if (!target || target->processed)                       // Check target
         return;
+
     target->processed = true;                               // Target checked in apply effects procedure
 
     uint32 effectMask = target->effectMask;
@@ -1370,7 +1809,7 @@ void Spell::DoAllEffectOnTarget(GOTargetInfo *target)
 
     // cast at creature (or GO) quest objectives update at successful cast finished (+channel finished)
     // ignore autorepeat/melee casts for speed (not exist quest for spells (hm... )
-    if( !IsAutoRepeat() && !IsNextMeleeSwingSpell() && !IsChannelActive() )
+    if ( !IsAutoRepeat() && !IsNextMeleeSwingSpell() && !IsChannelActive() )
     {
         if ( Player* p = m_caster->GetCharmerOrOwnerPlayerOrPlayerItself() )
             p->RewardPlayerAndGroupAtCast(go, m_spellInfo->Id);
@@ -1408,35 +1847,52 @@ void Spell::HandleDelayedSpellLaunch(TargetInfo *target)
     unitTarget = unit;
 
     // Reset damage/healing counter
-    m_damage = 0;
-    m_healing = 0; // healing maybe not needed at this point
+    ResetEffectDamageAndHeal(); // healing maybe not needed at this point
 
     // Fill base damage struct (unitTarget - is real spell target)
-    SpellNonMeleeDamage damageInfo(caster, unitTarget, m_spellInfo->Id, m_spellSchoolMask);
+    DamageInfo damageInfo(caster, unitTarget, m_spellInfo);
+    damageInfo.attackType = m_attackType;
 
     // keep damage amount for reflected spells
     if (missInfo == SPELL_MISS_NONE || (missInfo == SPELL_MISS_REFLECT && target->reflectResult == SPELL_MISS_NONE))
     {
+        std::bitset<MAX_EFFECT_INDEX> update_mult;
+
         for (int32 effectNumber = 0; effectNumber < MAX_EFFECT_INDEX; ++effectNumber)
         {
-            if (mask & (1 << effectNumber) && IsEffectHandledOnDelayedSpellLaunch(m_spellInfo, SpellEffectIndex(effectNumber)))
+            if ((mask & (1 << effectNumber)) && IsEffectHandledOnDelayedSpellLaunch(m_spellInfo, SpellEffectIndex(effectNumber)))
             {
-                HandleEffects(unit, NULL, NULL, SpellEffectIndex(effectNumber), m_damageMultipliers[effectNumber]);
+                HandleEffects(unit, NULL, NULL, SpellEffectIndex(effectNumber));
                 if ( m_applyMultiplierMask & (1 << effectNumber) )
                 {
-                    // Get multiplier
-                    float multiplier = m_spellInfo->DmgMultiplier[effectNumber];
-                    // Apply multiplier mods
-                    if (real_caster)
-                        if(Player* modOwner = real_caster->GetSpellModOwner())
-                            modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_EFFECT_PAST_FIRST, multiplier, this);
-                    m_damageMultipliers[effectNumber] *= multiplier;
+                    update_mult[effectNumber] = true;
                 }
             }
         }
 
         if (m_damage > 0)
-            caster->CalculateSpellDamage(&damageInfo, m_damage, m_spellInfo, m_attackType);
+        {
+            float dmgMultiplier = 1.0f;
+            if (m_damageIndex >= 0 && (m_applyMultiplierMask & (1 << m_damageIndex)))
+                dmgMultiplier = m_damageMultipliers[m_damageIndex];
+            damageInfo.damage = m_damage;
+            caster->CalculateSpellDamage(&damageInfo, dmgMultiplier);
+        }
+
+        // Update damage multipliers
+        for (int32 effectNumber = 0; effectNumber < MAX_EFFECT_INDEX; ++effectNumber)
+        {
+            if (update_mult[effectNumber])
+            {
+                // Get multiplier
+                float multiplier = m_spellInfo->DmgMultiplier[effectNumber];
+                // Apply multiplier mods
+                if (real_caster)
+                    if (Player* modOwner = real_caster->GetSpellModOwner())
+                        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_EFFECT_PAST_FIRST, multiplier);
+                m_damageMultipliers[effectNumber] *= multiplier;
+            }
+        }
     }
 
     target->damage = damageInfo.damage;
@@ -1452,11 +1908,11 @@ void Spell::InitializeDamageMultipliers()
 
         uint32 EffectChainTarget = m_spellInfo->EffectChainTarget[i];
         if (Unit* realCaster = GetAffectiveCaster())
-            if(Player* modOwner = realCaster->GetSpellModOwner())
-                modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_JUMP_TARGETS, EffectChainTarget, this);
+            if (Player* modOwner = realCaster->GetSpellModOwner())
+                modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_JUMP_TARGETS, EffectChainTarget);
 
         m_damageMultipliers[i] = 1.0f;
-        if( (m_spellInfo->EffectImplicitTargetA[i] == TARGET_CHAIN_DAMAGE || m_spellInfo->EffectImplicitTargetA[i] == TARGET_CHAIN_HEAL) &&
+        if ( (m_spellInfo->EffectImplicitTargetA[i] == TARGET_CHAIN_DAMAGE || m_spellInfo->EffectImplicitTargetA[i] == TARGET_CHAIN_HEAL) &&
             (EffectChainTarget > 1) )
             m_applyMultiplierMask |= (1 << i);
     }
@@ -1556,282 +2012,125 @@ struct TargetDistanceOrderFarAway : public std::binary_function<const Unit, cons
 
 void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& targetUnitMap)
 {
-    float radius;
-    if (m_spellInfo->EffectRadiusIndex[effIndex])
-        radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[effIndex]));
-    else
-        radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex));
-
-    uint32 EffectChainTarget = m_spellInfo->EffectChainTarget[effIndex];
-
-    if (Unit* realCaster = GetAffectiveCaster())
-    {
-        if(Player* modOwner = realCaster->GetSpellModOwner())
-        {
-            modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius, this);
-            modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_JUMP_TARGETS, EffectChainTarget, this);
-        }
-    }
-
-    // Get spell max affected targets
-    uint32 unMaxTargets = m_spellInfo->MaxAffectedTargets;
-
-    // custom target amount cases
-    switch(m_spellInfo->SpellFamilyName)
-    {
-        case SPELLFAMILY_GENERIC:
-        {
-            switch(m_spellInfo->Id)
-            {
-                case 802:                                   // Mutate Bug
-                case 804:                                   // Explode Bug
-                case 23138:                                 // Gate of Shazzrah
-                case 28560:                                 // Summon Blizzard
-                case 31347:                                 // Doom TODO: exclude top threat target from target selection
-                case 33711:                                 // Murmur's Touch
-                case 38794:                                 // Murmur's Touch (h)
-                case 44869:                                 // Spectral Blast
-                case 45976:                                 // Open Portal
-                case 47669:                                 // Awaken Subboss
-                case 48278:                                 // Paralyze (Utgarde Pinnacle)
-                case 50988:                                 // Glare of the Tribunal (Halls of Stone)
-                case 54148:                                 // Ritual of the Sword (Utgarde Pinnacle, Svala)
-                case 55479:                                 // Forced Obedience (Naxxramas, Razovius)
-                case 59870:                                 // Glare of the Tribunal (h) (Halls of Stone)
-                case 62016:                                 // Charge Orb (Ulduar, Thorim)
-                case 62301:                                 // Cosmic Smash (Ulduar, Algalon)
-                case 62488:                                 // Activate Construct (Ulduar, Ignis)
-                case 63018:                                 // Searing Light
-                case 63024:                                 // Gravity Bomb (Ulduar, XT-002)
-                case 63387:                                 // Rapid Burst
-                case 63795:                                 // Psychosis (Ulduar, Yogg-Saron)
-                case 62042:                                 // Stormhammer (Ulduar, Thorim)
-                case 64218:                                 // Overcharge
-                case 64234:                                 // Gravity Bomb (h) (Ulduar, XT-002)
-                case 64531:                                 // Rapid Burst (h)
-                case 65121:                                 // Searing Light (h)
-                case 65301:                                 // Psychosis (Ulduar, Yogg-Saron)
-                case 65950:                                 // Touch of Light (ToCrusader, Val'kyr Twins)
-                case 66001:                                 // Touch of Darkness (ToCrusader, Val'kyr Twins)
-                case 66152:                                 // Bullet Controller Summon Periodic Trigger Light (ToCrusader)
-                case 66153:                                 // Bullet Controller Summon Periodic Trigger Dark (ToCrusader)
-                case 66332:                                 // Nerubian Burrower (Mode 0) (ToCrusader, Anub'arak)
-                case 66336:                                 // Mistress' Kiss (ToCrusader, Jaraxxus)
-                case 66339:                                 // Summon Scarab (ToCrusader, Anub'arak)
-                case 67077:                                 // Mistress' Kiss (Mode 2) (ToCrusader, Jaraxxus)
-                case 67281:                                 // Touch of Darkness (Mode 1)
-                case 67282:                                 // Touch of Darkness (Mode 2)
-                case 67283:                                 // Touch of Darkness (Mode 3)
-                case 67296:                                 // Touch of Light (Mode 1)
-                case 67297:                                 // Touch of Light (Mode 2)
-                case 67298:                                 // Touch of Light (Mode 3)
-                case 68950:                                 // Fear (FoS)
-                case 68912:                                 // Wailing Souls (FoS)
-                case 69048:                                 // Mirrored Soul (FoS)
-                case 69140:                                 // Coldflame (ICC, Marrowgar)
-                case 69674:                                 // Mutated Infection (ICC, Rotface)
-                case 70882:                                 // Slime Spray Summon Trigger (ICC, Rotface)
-                case 70920:                                 // Unbound Plague Search Effect (ICC, Putricide)
-                case 71224:                                 // Mutated Infection (Mode 1)
-                case 72091:                                 // Frozen Orb (Vault of Archavon, Toravon)
-                case 73022:                                 // Mutated Infection (Mode 2)
-                case 73023:                                 // Mutated Infection (Mode 3)
-                case 51146:                                 // Searching Gaze (Halls Of Stone)
-                    unMaxTargets = 1;
-                    break;
-                case 28542:                                 // Life Drain
-                case 66013:                                 // Penetrating Cold (10 man)
-                case 67755:                                 // Nerubian Burrower (Mode 1) (ToCrusader, Anub'arak)
-                case 67756:                                 // Nerubian Burrower (Mode 2) (ToCrusader, Anub'arak)
-                case 68509:                                 // Penetrating Cold (10 man heroic)
-                case 69055:                                 // Bone Slice (ICC, Lord Marrowgar)
-                case 69278:                                 // Gas spore (ICC, Festergut)
-                case 70341:                                 // Slime Puddle (ICC, Putricide)
-                case 71336:                                 // Pact of the Darkfallen
-                case 71390:                                 // Pact of the Darkfallen
-                    unMaxTargets = 2;
-                    break;
-                case 28796:                                 // Poison Bolt Volley
-                case 29213:                                 // Curse of the Plaguebringer
-                case 31298:                                 // Sleep
-                case 39992:                                 // Needle Spine Targeting (BT, Warlord Najentus)
-                case 51904:                                 // Limiting the count of Summoned Ghouls
-                case 54522:
-                case 60936:                                 // Surge of Power (h) (Malygos)
-                case 61693:                                 // Arcane Storm (Malygos)
-                case 64598:                                 // Cosmic Smash (h) (Ulduar, Algalon)
-                case 70814:                                 // Bone Slice (ICC, Lord Marrowgar, heroic)
-                case 72095:                                 // Frozen Orb (h) (Vault of Archavon, Toravon)
-                    unMaxTargets = 3;
-                    break;
-                case 67757:                                 // Nerubian Burrower (Mode 3) (ToCrusader, Anub'arak)
-                case 71221:                                 // Gas spore (Mode 1) (ICC, Festergut)
-                    unMaxTargets = 4;
-                    break;
-                case 30843:                                 // Enfeeble
-                case 42005:                                 // Bloodboil
-                case 45641:                                 // Fire Bloom (SWP, Kil'jaeden)
-                case 55665:                                 // Life Drain (h)
-                case 58917:                                 // Consume Minions
-                case 64604:                                 // Nature Bomb (Ulduar, Freya)
-                case 67076:                                 // Mistress' Kiss (Mode 1) (ToCrusader, Jaraxxus)
-                case 67078:                                 // Mistress' Kiss (Mode 3) (ToCrusader, Jaraxxus)
-                case 67700:                                 // Penetrating Cold (25 man)
-                case 68510:                                 // Penetrating Cold (25 man, heroic)
-                    unMaxTargets = 5;
-                    break;
-                case 61694:                                 // Arcane Storm (h) (Malygos)
-                    unMaxTargets = 7;
-                    break;
-                case 54098:                                 // Poison Bolt Volley (h)
-                case 54835:                                 // Curse of the Plaguebringer (h)
-                    unMaxTargets = 10;
-                    break;
-                case 25991:                                 // Poison Bolt Volley (Pincess Huhuran)
-                    unMaxTargets = 15;
-                    break;
-                case 61916:                                 // Lightning Whirl (Ulduar, Stormcaller Brundir)
-                    unMaxTargets = urand(2, 3);
-                    break;
-                case 46771:                                 // Flame Sear (SWP, Grand Warlock Alythess)
-                    unMaxTargets = urand(3, 5);
-                    break;
-                case 63482:                                 // Lightning Whirl (h) (Ulduar, Stormcaller Brundir)
-                    unMaxTargets = urand(3, 6);
-                    break;
-                default:
-                    break;
-            }
-            break;
-        }
-        case SPELLFAMILY_MAGE:
-        {
-            if (m_spellInfo->Id == 38194)                   // Blink
-                unMaxTargets = 1;
-            break;
-        }
-        case SPELLFAMILY_WARRIOR:
-        {
-            // Sunder Armor (main spell)
-            if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0000000000004000), 0x00000000) && m_spellInfo->SpellVisual[0] == 406)
-                if (m_caster->HasAura(58387))               // Glyph of Sunder Armor
-                    EffectChainTarget = 2;
-            break;
-        }
-        case SPELLFAMILY_DRUID:
-        {
-            // Starfall
-            if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0000000000000000), 0x00000100))
-                unMaxTargets = 2;
-            break;
-        }
-        case SPELLFAMILY_DEATHKNIGHT:
-        {
-            if (m_spellInfo->SpellIconID == 1737)           // Corpse Explosion // TODO - spell 50445?
-                unMaxTargets = 1;
-            break;
-        }
-        case SPELLFAMILY_PALADIN:
-            if (m_spellInfo->Id == 20424)                   // Seal of Command (2 more target for single targeted spell)
-            {
-                // overwrite EffectChainTarget for non single target spell
-                if (Spell* currSpell = m_caster->GetCurrentSpell(CURRENT_GENERIC_SPELL))
-                    if (currSpell->m_spellInfo->MaxAffectedTargets > 0 ||
-                        currSpell->m_spellInfo->EffectChainTarget[EFFECT_INDEX_0] > 0 ||
-                        currSpell->m_spellInfo->EffectChainTarget[EFFECT_INDEX_1] > 0 ||
-                        currSpell->m_spellInfo->EffectChainTarget[EFFECT_INDEX_2] > 0)
-                        EffectChainTarget = 0;              // no chain targets
-            }
-            break;
-        default:
-            break;
-    }
-
-    // custom radius cases
-    switch (m_spellInfo->SpellFamilyName)
-    {
-        case SPELLFAMILY_GENERIC:
-        {
-            switch (m_spellInfo->Id)
-            {
-                case 24811:                                 // Draw Spirit (Lethon)
-                {
-                    if (effIndex == EFFECT_INDEX_0)         // Copy range from EFF_1 to 0
-                        radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[EFFECT_INDEX_1]));
-                    break;
-                }
-                case 28241:                                 // Poison (Naxxramas, Grobbulus Cloud)
-                case 54363:                                 // Poison (Naxxramas, Grobbulus Cloud) (H)
-                {
-                    uint32 auraId = (m_spellInfo->Id == 28241 ? 28158 : 54362);
-                    if (SpellAuraHolder* auraHolder = m_caster->GetSpellAuraHolder(auraId))
-                        radius = 0.5f * (60000 - auraHolder->GetAuraDuration()) * 0.001f;
-                    break;
-                }
-                case 66881:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale)
-                case 67638:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale) (Mode 1)
-                case 67639:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale) (Mode 2)
-                case 67640:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale) (Mode 3)
-                    if (SpellAuraHolder* auraHolder = m_caster->GetSpellAuraHolder(66882))
-                        radius = 0.5f * (60000 - auraHolder->GetAuraDuration()) * 0.001f;
-                    break;
-                default:
-                    break;
-            }
-            break;
-        }
-        default:
-            break;
-    }
-
-    Unit::AuraList const& mod = m_caster->GetAurasByType(SPELL_AURA_MOD_MAX_AFFECTED_TARGETS);
-    for(Unit::AuraList::const_iterator m = mod.begin(); m != mod.end(); ++m)
-    {
-        if (!(*m)->isAffectedOnSpell(m_spellInfo))
-            continue;
-        unMaxTargets += (*m)->GetModifier()->m_amount;
-    }
+    float radius = SpellMgr::GetSpellRadiusWithCustom(m_spellInfo, GetAffectiveUnitCaster(), effIndex);
+    uint32 unMaxTargets = SpellMgr::GetSpellMaxTargetsWithCustom(m_spellInfo, GetAffectiveUnitCaster());
+    uint32 unEffectChainTarget = SpellMgr::GetSpellTargetsForChainWithCustom(m_spellInfo, GetAffectiveUnitCaster(), effIndex);
 
     std::list<GameObject*> tempTargetGOList;
 
     switch (targetMode)
     {
         case TARGET_RANDOM_NEARBY_LOC:
+            // special case for Fatal Attraction (BT, Mother Shahraz)
+            if (m_spellInfo->Id == 40869)
+                radius = 30.0f;
+
             // Get a random point in circle. Use sqrt(rand) to correct distribution when converting polar to Cartesian coordinates.
-            radius *= sqrtf(rand_norm_f());
-            // no 'break' expected since we use code in case TARGET_RANDOM_CIRCUMFERENCE_POINT!!!
+            radius *= sqrt(rand_norm_f());
+            /* no break expected since we use code in case TARGET_RANDOM_CIRCUMFERENCE_POINT!!!*/
         case TARGET_RANDOM_CIRCUMFERENCE_POINT:
         {
             // Get a random point AT the circumference
             float angle = 2.0f * M_PI_F * rand_norm_f();
-            float dest_x, dest_y, dest_z;
-            m_caster->GetClosePoint(dest_x, dest_y, dest_z, 0.0f, radius, angle);
-            m_targets.setDestination(dest_x, dest_y, dest_z);
+            if (m_targets.getUnitTarget() && m_targets.getUnitTarget() != m_caster)
+                angle = MapManager::NormalizeOrientation(m_caster->GetAngle(m_targets.getUnitTarget()) - m_caster->GetOrientation());
 
-            targetUnitMap.push_back(m_caster);
+            m_targets.setDestination(m_caster->GetClosePoint(m_caster->GetObjectBoundingRadius(), radius, angle));
+
+            // This targetMode is often used as 'last' implicitTarget for positive spells, that just require coordinates
+            // and no unitTarget (e.g. summon effects). As MaNGOS always needs a unitTarget we add just the caster here.
+            // Logic: This is first target, and no second target => use m_caster -- This is second target: use m_caster if the spell is positive or a summon spell
+            if ((m_spellInfo->EffectImplicitTargetA[effIndex] == targetMode && m_spellInfo->EffectImplicitTargetB[effIndex] == TARGET_NONE) ||
+                (m_spellInfo->EffectImplicitTargetB[effIndex] == targetMode && (IsPositiveSpell(m_spellInfo) || m_spellInfo->Effect[effIndex] == SPELL_EFFECT_SUMMON)))
+                targetUnitMap.push_back(m_caster);
             break;
         }
-        case TARGET_91:
+        case TARGET_DEST_RADIUS:
         case TARGET_RANDOM_NEARBY_DEST:
         {
             // Get a random point IN the CIRCEL around current M_TARGETS COORDINATES(!).
             if (radius > 0.0f)
             {
                 // Use sqrt(rand) to correct distribution when converting polar to Cartesian coordinates.
-                radius *= sqrtf(rand_norm_f());
+                radius *= sqrt(rand_norm_f());
                 float angle = 2.0f * M_PI_F * rand_norm_f();
-                float dest_x = m_targets.m_destX + cos(angle) * radius;
-                float dest_y = m_targets.m_destY + sin(angle) * radius;
-                float dest_z = m_caster->GetPositionZ();
-                m_caster->UpdateGroundPositionZ(dest_x, dest_y, dest_z);
-                m_targets.setDestination(dest_x, dest_y, dest_z);
+                WorldLocation loc = m_targets.getDestination();
+                loc.x += cos(angle) * radius;
+                loc.y += sin(angle) * radius;
+                loc.z = m_caster->GetPositionZ();
+                m_caster->UpdateGroundPositionZ(loc.x, loc.y, loc.z);
+                m_targets.setDestination(loc);
             }
 
             // This targetMode is often used as 'last' implicitTarget for positive spells, that just require coordinates
             // and no unitTarget (e.g. summon effects). As MaNGOS always needs a unitTarget we add just the caster here.
-            if (IsPositiveSpell(m_spellInfo))
+            // Logic: This is first target, and no second target => use m_caster -- This is second target: use m_caster if the spell is positive or a summon spell
+            if ((m_spellInfo->EffectImplicitTargetA[effIndex] == targetMode && m_spellInfo->EffectImplicitTargetB[effIndex] == TARGET_NONE) ||
+                (m_spellInfo->EffectImplicitTargetB[effIndex] == targetMode && (IsPositiveSpell(m_spellInfo) || m_spellInfo->Effect[effIndex] == SPELL_EFFECT_SUMMON)))
                 targetUnitMap.push_back(m_caster);
 
+            // Prevent multiple summons
+            if (m_spellInfo->Effect[effIndex] == SPELL_EFFECT_SUMMON || m_spellInfo->Effect[effIndex] == SPELL_EFFECT_SUMMON_OBJECT_WILD)
+                unMaxTargets = m_spellInfo->CalculateSimpleValue(effIndex);
+
+            break;
+        }
+        case TARGET_LEAP_FORWARD:
+        {
+            Unit* target = m_targets.getUnitTarget();
+            if (!target)
+                target = m_caster;
+
+            WorldLocation loc  = target->GetPosition();
+            WorldLocation dest = target->GetPosition();
+
+            float distance = radius;
+
+            //Glyph of blink or etc this type
+            if (m_caster->GetTypeId() == TYPEID_PLAYER)
+                ((Player*)m_caster)->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, distance);
+
+            dest.x += distance * cos(loc.o);
+            dest.y += distance * sin(loc.o);
+
+            MaNGOS::NormalizeMapCoord(dest.x);
+            MaNGOS::NormalizeMapCoord(dest.y);
+
+            float fz = std::max(loc.z, m_caster->GetTerrain()->GetWaterOrGroundLevel(dest.x, dest.y, dest.z + 8.0f));
+
+            Map* pMap = target->GetMap();
+            if (pMap)
+            {
+                if (!pMap->GetHitPosition(loc.x, loc.y, loc.z + 2.0f, dest.x, dest.y, dest.z, target->GetPhaseMask(), -0.5f))
+                    DEBUG_LOG("Spell::EffectLeap/Teleport unit %u forwarded on %f", target->GetObjectGuid().GetCounter(), target->GetDistance(dest));
+                else
+                    DEBUG_LOG("Spell::EffectLeap/Teleport unit %u NOT forwarded on %f, real distance is %f", target->GetObjectGuid().GetCounter(), distance, target->GetDistance(dest));
+            }
+
+            m_targets.setDestination(dest);
+            break;
+        }
+        case TARGET_RANDOM_POINT_NEAR_TARGET:
+        case TARGET_RANDOM_POINT_NEAR_TARGET_2:
+        {
+            // First effect already may set TARGET_FLAG_DEST_LOCATION - use his for source (and set source point)
+            if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
+            {
+                m_targets.setSource(m_targets.getDestination());
+                WorldLocation loc = m_targets.getDestination();
+                m_caster->GetRandomPoint(m_targets.getDestination().getX(), m_targets.getDestination().getY(), m_targets.getDestination().getZ(), radius, loc.x, loc.y, loc.z);
+                m_targets.setDestination(loc);
+                targetUnitMap.push_back(m_caster);
+            }
+            else
+            {
+                Unit* target = m_targets.getUnitTarget();
+                if (!target)
+                    target = m_caster;
+                float angle = 2.0f * M_PI_F * rand_norm_f();
+                m_targets.setDestination(target->GetClosePoint(0.0f, radius, angle));
+                targetUnitMap.push_back(target);
+            }
             break;
         }
         case TARGET_TOTEM_EARTH:
@@ -1842,21 +2141,28 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             float angle = m_caster->GetOrientation();
             switch (targetMode)
             {
-                case TARGET_TOTEM_EARTH:                         break;
-                case TARGET_TOTEM_WATER: angle += M_PI_F;        break;
-                case TARGET_TOTEM_AIR:   angle += M_PI_F * 0.5f; break;
-                case TARGET_TOTEM_FIRE:  angle += M_PI_F * 1.5f; break;
+                case TARGET_TOTEM_FIRE:  angle += M_PI_F * 0.25f; break;            // front - left
+                case TARGET_TOTEM_AIR:   angle += M_PI_F * 0.75f; break;            // back  - left
+                case TARGET_TOTEM_WATER: angle += M_PI_F * 1.25f; break;            // back  - right
+                case TARGET_TOTEM_EARTH: angle += M_PI_F * 1.75f; break;            // front - right
             }
+            WorldLocation loc = m_caster->GetClosePoint(radius > M_NULL_F ? radius - m_caster->GetObjectBoundingRadius() + 0.01f : 2.0f, angle);
+            m_caster->UpdateAllowedPositionZ(loc.x, loc.y, loc.z);
+            m_targets.setDestination(loc);
 
-            float x, y;
-            float z = m_caster->GetPositionZ();
-            // Ignore the BOUNDING_RADIUS for spells with radius (add a small value to prevent < 0 rounding errors)
-            m_caster->GetNearPoint2D(x, y, radius > 0.001f ? radius - m_caster->GetObjectBoundingRadius() + 0.01f : 2.0f, angle);
-            m_caster->UpdateAllowedPositionZ(x, y, z);
-            m_targets.setDestination(x, y, z);
+            if (radius > M_NULL_F)
+            {
+                // caster included here?
+                FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_ALL);
 
-            // Add Summoner
-            targetUnitMap.push_back(m_caster);
+                if (targetUnitMap.empty())
+                    targetUnitMap.push_back(m_caster);
+            }
+            else if (IsPositiveSpell(m_spellInfo->Id))
+                    targetUnitMap.push_back(m_caster);
+
+            if (m_spellInfo->Effect[effIndex] == SPELL_EFFECT_SUMMON || m_spellInfo->Effect[effIndex] == SPELL_EFFECT_SUMMON_OBJECT_WILD)
+                unMaxTargets = m_spellInfo->CalculateSimpleValue(effIndex);
             break;
         }
         case TARGET_SELF:
@@ -1864,205 +2170,207 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             targetUnitMap.push_back(m_caster);
             break;
         case TARGET_RANDOM_ENEMY_CHAIN_IN_AREA:
+        case TARGET_RANDOM_FRIEND_CHAIN_IN_AREA:
+        case TARGET_RANDOM_UNIT_CHAIN_IN_AREA:
         {
             m_targets.m_targetMask = 0;
-            unMaxTargets = EffectChainTarget;
-            float max_range = radius + unMaxTargets * CHAIN_SPELL_JUMP_RADIUS;
+            unMaxTargets = unEffectChainTarget;
+            float maxRange = radius + unMaxTargets * CHAIN_SPELL_JUMP_RADIUS;
 
             UnitList tempTargetUnitMap;
-
+            switch (targetMode)
             {
-                MaNGOS::AnyAoETargetUnitInObjectRangeCheck u_check(m_caster, max_range);
-                MaNGOS::UnitListSearcher<MaNGOS::AnyAoETargetUnitInObjectRangeCheck> searcher(tempTargetUnitMap, u_check);
-                Cell::VisitAllObjects(m_caster, searcher, max_range);
+                case TARGET_RANDOM_ENEMY_CHAIN_IN_AREA:
+                {
+                    MaNGOS::AnyAoETargetUnitInObjectRangeCheck u_check(m_caster, maxRange);
+                    MaNGOS::UnitListSearcher<MaNGOS::AnyAoETargetUnitInObjectRangeCheck> searcher(tempTargetUnitMap, u_check);
+                    Cell::VisitAllObjects(m_caster, searcher, maxRange);
+                    break;
+                }
+                case TARGET_RANDOM_FRIEND_CHAIN_IN_AREA:
+                {
+                    MaNGOS::AnyFriendlyUnitInObjectRangeCheck u_check(m_caster, maxRange);
+                    MaNGOS::UnitListSearcher<MaNGOS::AnyFriendlyUnitInObjectRangeCheck> searcher(tempTargetUnitMap, u_check);
+                    Cell::VisitAllObjects(m_caster, searcher, maxRange);
+                    break;
+                }
+                case TARGET_RANDOM_UNIT_CHAIN_IN_AREA:
+                {
+                    MaNGOS::AnyUnitInObjectRangeCheck u_check(m_caster, maxRange);
+                    MaNGOS::UnitListSearcher<MaNGOS::AnyUnitInObjectRangeCheck> searcher(tempTargetUnitMap, u_check);
+                    Cell::VisitAllObjects(m_caster, searcher, maxRange);
+                    break;
+                }
             }
 
-            if(tempTargetUnitMap.empty())
+            uint32 numTargets = tempTargetUnitMap.size();
+            if (!numTargets)
                 break;
 
-            tempTargetUnitMap.sort(TargetDistanceOrderNear(m_caster));
+            if (numTargets > 1)
+                tempTargetUnitMap.sort(TargetDistanceOrderNear(m_caster));
 
-            //Now to get us a random target that's in the initial range of the spell
-            uint32 t = 0;
-            UnitList::iterator itr = tempTargetUnitMap.begin();
-            while(itr!= tempTargetUnitMap.end() && (*itr)->IsWithinDist(m_caster, radius))
-                ++t, ++itr;
+            // Now to get us a random target that's in the initial range of the spell
+            numTargets = 0;
+            for (UnitList::const_iterator itr = tempTargetUnitMap.begin(); itr != tempTargetUnitMap.end(); ++itr)
+            {
+                if ((*itr)->IsWithinDist(m_caster, radius))
+                    ++numTargets;
+            }
+
+            if (!numTargets)
+                break;
 
-            if(!t)
+            if (numTargets == 1)
+            {
+                targetUnitMap.push_back(*tempTargetUnitMap.begin());
                 break;
+            }
+
+            UnitList::iterator itr = tempTargetUnitMap.begin();
+            std::advance(itr, urand(0, numTargets - 1));
 
-            itr = tempTargetUnitMap.begin();
-            std::advance(itr, rand() % t);
-            Unit *pUnitTarget = *itr;
+            Unit* pUnitTarget = *itr;
             targetUnitMap.push_back(pUnitTarget);
 
             tempTargetUnitMap.erase(itr);
-
             tempTargetUnitMap.sort(TargetDistanceOrderNear(pUnitTarget));
 
-            t = unMaxTargets - 1;
-            Unit *prev = pUnitTarget;
-            UnitList::iterator next = tempTargetUnitMap.begin();
+            numTargets = unMaxTargets - 1;
+            bool checkLOS = !m_spellInfo->HasAttribute(SPELL_ATTR_EX2_IGNORE_LOS);
+            Unit* prevUnit = pUnitTarget;
 
-            while(t && next != tempTargetUnitMap.end())
+            UnitList::iterator nextItr = tempTargetUnitMap.begin();
+            while (numTargets && nextItr != tempTargetUnitMap.end())
             {
-                if(!prev->IsWithinDist(*next, CHAIN_SPELL_JUMP_RADIUS))
+                if (!prevUnit->IsWithinDist(*nextItr, CHAIN_SPELL_JUMP_RADIUS))
                     break;
 
-                if(!prev->IsWithinLOSInMap(*next))
+                if (checkLOS && !prevUnit->IsWithinLOSInMap(*nextItr))
                 {
-                    ++next;
+                    ++nextItr;
                     continue;
                 }
 
-                prev = *next;
-                targetUnitMap.push_back(prev);
-                tempTargetUnitMap.erase(next);
-                tempTargetUnitMap.sort(TargetDistanceOrderNear(prev));
-                next = tempTargetUnitMap.begin();
+                prevUnit = *nextItr;
+                targetUnitMap.push_back(prevUnit);
+
+                tempTargetUnitMap.erase(nextItr);
+                if (tempTargetUnitMap.size() > 1)
+                    tempTargetUnitMap.sort(TargetDistanceOrderNear(prevUnit));
 
-                --t;
+                nextItr = tempTargetUnitMap.begin();
+                --numTargets;
             }
             break;
         }
-        case TARGET_RANDOM_FRIEND_CHAIN_IN_AREA:
+        case TARGET_PET:
         {
-            m_targets.m_targetMask = 0;
-            unMaxTargets = EffectChainTarget;
-            float max_range = radius + unMaxTargets * CHAIN_SPELL_JUMP_RADIUS;
-            UnitList tempTargetUnitMap;
+            GuidSet const& groupPets = m_caster->GetPets();
+            if (!groupPets.empty())
+            {
+                for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                    if (Pet* pPet = m_caster->GetMap()->GetPet(*itr))
+                        targetUnitMap.push_back(pPet);
+            }
+            break;
+        }
+        case TARGET_CHAIN_DAMAGE:
+        {
+            if (unEffectChainTarget <= 1)
             {
-                MaNGOS::AnyFriendlyUnitInObjectRangeCheck u_check(m_caster, max_range);
-                MaNGOS::UnitListSearcher<MaNGOS::AnyFriendlyUnitInObjectRangeCheck> searcher(tempTargetUnitMap, u_check);
-                Cell::VisitAllObjects(m_caster, searcher, max_range);
+                if (Unit* pUnitTarget = m_caster->SelectMagnetTarget(m_targets.getUnitTarget(), this, effIndex))
+                {
+                    if (m_targets.getUnitTarget() != pUnitTarget)
+                    {
+                        m_targets.setUnitTarget(pUnitTarget);
+                        m_spellFlags |= SPELL_FLAG_REDIRECTED;
+                    }
+                    targetUnitMap.push_back(pUnitTarget);
+                }
+                break;
             }
 
-            if(tempTargetUnitMap.empty())
+            Unit* pUnitTarget = m_targets.getUnitTarget();
+            WorldObject* originalCaster = GetAffectiveCasterObject();
+            if (!pUnitTarget || !originalCaster)
                 break;
 
-            tempTargetUnitMap.sort(TargetDistanceOrderNear(m_caster));
+            unMaxTargets = unEffectChainTarget;
 
-            //Now to get us a random target that's in the initial range of the spell
-            uint32 t = 0;
-            UnitList::iterator itr = tempTargetUnitMap.begin();
-            while(itr != tempTargetUnitMap.end() && (*itr)->IsWithinDist(m_caster, radius))
-                ++t, ++itr;
+            float maxRange;
+            if (m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE)
+                maxRange = radius;
+            else
+                // FIXME: This very like horrible hack and wrong for most spells
+                maxRange = radius + unMaxTargets * CHAIN_SPELL_JUMP_RADIUS;
 
-            if(!t)
+            UnitList tempTargetUnitMap;
+            {
+                MaNGOS::AnyAoEVisibleTargetUnitInObjectRangeCheck u_check(pUnitTarget, originalCaster, maxRange);
+                MaNGOS::UnitListSearcher<MaNGOS::AnyAoEVisibleTargetUnitInObjectRangeCheck> searcher(tempTargetUnitMap, u_check);
+                Cell::VisitAllObjects(m_caster, searcher, maxRange);
+            }
+
+            uint32 numTargets = tempTargetUnitMap.size();
+            if (!numTargets)
                 break;
 
-            itr = tempTargetUnitMap.begin();
-            std::advance(itr, rand() % t);
-            Unit *pUnitTarget = *itr;
-            targetUnitMap.push_back(pUnitTarget);
+            if (numTargets > 1)
+                tempTargetUnitMap.sort(TargetDistanceOrderNear(pUnitTarget));
 
-            tempTargetUnitMap.erase(itr);
+            targetUnitMap.push_back(pUnitTarget);
 
-            tempTargetUnitMap.sort(TargetDistanceOrderNear(pUnitTarget));
-
-            t = unMaxTargets - 1;
-            Unit *prev = pUnitTarget;
-            UnitList::iterator next = tempTargetUnitMap.begin();
-
-            while(t && next != tempTargetUnitMap.end())
+            if (*tempTargetUnitMap.begin() == pUnitTarget)
             {
-                if(!prev->IsWithinDist(*next, CHAIN_SPELL_JUMP_RADIUS))
+                tempTargetUnitMap.erase(tempTargetUnitMap.begin());
+                if (tempTargetUnitMap.empty())
                     break;
-
-                if(!prev->IsWithinLOSInMap(*next))
-                {
-                    ++next;
-                    continue;
-                }
-                prev = *next;
-                targetUnitMap.push_back(prev);
-                tempTargetUnitMap.erase(next);
-                tempTargetUnitMap.sort(TargetDistanceOrderNear(prev));
-                next = tempTargetUnitMap.begin();
-                --t;
-            }
-            break;
-        }
-        case TARGET_PET:
-        {
-            Pet* tmpUnit = m_caster->GetPet();
-            if (!tmpUnit) break;
-            targetUnitMap.push_back(tmpUnit);
-            break;
-        }
-        case TARGET_CHAIN_DAMAGE:
-        {
-            if (EffectChainTarget <= 1)
-            {
-                if(Unit* pUnitTarget = m_caster->SelectMagnetTarget(m_targets.getUnitTarget(), this, effIndex))
-                {
-                    m_targets.setUnitTarget(pUnitTarget);
-                    m_spellFlags |= SPELL_FLAG_REDIRECTED;
-                    targetUnitMap.push_back(pUnitTarget);
-                }
             }
-            else
-            {
-                Unit* pUnitTarget = m_targets.getUnitTarget();
-                WorldObject* originalCaster = GetAffectiveCasterObject();
-                if(!pUnitTarget || !originalCaster)
-                    break;
-
-                unMaxTargets = EffectChainTarget;
-
-                float max_range;
-                if(m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE)
-                    max_range = radius;
-                else
-                    //FIXME: This very like horrible hack and wrong for most spells
-                    max_range = radius + unMaxTargets * CHAIN_SPELL_JUMP_RADIUS;
 
-                UnitList tempTargetUnitMap;
-                {
-                    MaNGOS::AnyAoEVisibleTargetUnitInObjectRangeCheck u_check(pUnitTarget, originalCaster, max_range);
-                    MaNGOS::UnitListSearcher<MaNGOS::AnyAoEVisibleTargetUnitInObjectRangeCheck> searcher(tempTargetUnitMap, u_check);
-                    Cell::VisitAllObjects(m_caster, searcher, max_range);
-                }
+            numTargets = unMaxTargets - 1;
+            bool checkLOS = !m_spellInfo->HasAttribute(SPELL_ATTR_EX2_IGNORE_LOS);
+            bool checkCC = m_spellInfo->HasAttribute(SPELL_ATTR_EX6_IGNORE_CCED_TARGETS);
+            Unit* prevUnit = pUnitTarget;
 
-                if (tempTargetUnitMap.empty())
+            UnitList::iterator nextItr = tempTargetUnitMap.begin();
+            while (numTargets && nextItr != tempTargetUnitMap.end())
+            {
+                if (!prevUnit->IsWithinDist(*nextItr, CHAIN_SPELL_JUMP_RADIUS))
                     break;
 
-                tempTargetUnitMap.sort(TargetDistanceOrderNear(pUnitTarget));
-
-                if (*tempTargetUnitMap.begin() == pUnitTarget)
-                    tempTargetUnitMap.erase(tempTargetUnitMap.begin());
-
-                targetUnitMap.push_back(pUnitTarget);
-                uint32 t = unMaxTargets - 1;
-                Unit *prev = pUnitTarget;
-                UnitList::iterator next = tempTargetUnitMap.begin();
+                if (prevUnit == (Unit*)m_caster)
+                    break;
 
-                while (t && next != tempTargetUnitMap.end())
+                if ((checkLOS && !prevUnit->IsWithinLOSInMap(*nextItr)) || (checkCC && !(*nextItr)->CanFreeMove()))
                 {
-                    if (!prev->IsWithinDist(*next,CHAIN_SPELL_JUMP_RADIUS))
-                        break;
+                    ++nextItr;
+                    continue;
+                }
 
-                    if (!prev->IsWithinLOSInMap(*next))
-                    {
-                        ++next;
-                        continue;
-                    }
+                prevUnit = *nextItr;
+                targetUnitMap.push_back(prevUnit);
 
-                    prev = *next;
-                    targetUnitMap.push_back(prev);
-                    tempTargetUnitMap.erase(next);
-                    tempTargetUnitMap.sort(TargetDistanceOrderNear(prev));
-                    next = tempTargetUnitMap.begin();
+                tempTargetUnitMap.erase(nextItr);
+                if (tempTargetUnitMap.size() > 1)
+                    tempTargetUnitMap.sort(TargetDistanceOrderNear(prevUnit));
 
-                    --t;
-                }
+                nextItr = tempTargetUnitMap.begin();
+                --numTargets;
             }
             break;
         }
         case TARGET_ALL_ENEMY_IN_AREA:
+        {
             FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
-
-            if (m_spellInfo->Id == 42005)                   // Bloodboil (spell hits only the 5 furthest away targets)
+            if (m_spellInfo->Id == 62240 || m_spellInfo->Id == 62920)      // Solar Flare
+            {
+                if (SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(62239))
+                    unMaxTargets = holder->GetStackAmount();
+                else
+                    unMaxTargets = 1;
+            }
+            else if (m_spellInfo->Id == 42005)                   // Bloodboil (spell hits only the 5 furthest away targets)
             {
                 if (targetUnitMap.size() > unMaxTargets)
                 {
@@ -2070,26 +2378,55 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     targetUnitMap.resize(unMaxTargets);
                 }
             }
-            else if (m_spellInfo->Id == 30843)              // Enfeeble (do not target current victim)
+            else
             {
-                if (Unit* pVictim = m_caster->getVictim())
-                    targetUnitMap.remove(pVictim);
+                switch (m_spellInfo->Id)
+                {
+                    case 30843:                                             // Enfeeble
+                    case 31347:                                             // Doom
+                    case 37676:                                             // Insidious Whisper
+                    case 38028:                                             // Watery Grave
+                    case 40618:                                             // Insignificance
+                    case 41376:                                             // Spite
+                    case 62166:                                             // Stone Grip nh
+                    case 63981:                                             // Stone Grip h
+                    case 69674:                                             // Mutated Infection (ICC, Rotface)
+                    case 71224:                                             // Mutated Infection
+                    case 73022:                                             // Mutated Infection
+                    case 73023:                                             // Mutated Infection
+                        if (Unit* pVictim = m_caster->getVictim())
+                            targetUnitMap.remove(pVictim);
+                        break;
+                    default:
+                        break;
+                }
             }
             break;
+        }
         case TARGET_AREAEFFECT_INSTANT:
         {
-            SpellTargets targetB = SPELL_TARGETS_AOE_DAMAGE;
-
-            // Select friendly targets for positive effect
-            if (IsPositiveEffect(m_spellInfo, effIndex))
-                targetB = SPELL_TARGETS_FRIENDLY;
+            SpellTargets targetB;
+            switch (m_spellInfo->Effect[effIndex])
+            {
+                case SPELL_EFFECT_QUEST_COMPLETE:
+                case SPELL_EFFECT_KILL_CREDIT_PERSONAL:
+                case SPELL_EFFECT_KILL_CREDIT_GROUP:
+                    targetB = SPELL_TARGETS_ALL;
+                    break;
+                default:
+                    // Select friendly targets for positive effect
+                    if (IsPositiveEffect(m_spellInfo, effIndex))
+                        targetB = SPELL_TARGETS_FRIENDLY;
+                    else
+                        targetB = SPELL_TARGETS_AOE_DAMAGE;
+            }
 
             UnitList tempTargetUnitMap;
-            SpellScriptTargetBounds bounds = sSpellMgr.GetSpellScriptTargetBounds(m_spellInfo->Id);
+            SQLMultiStorage::SQLMSIteratorBounds<SpellTargetEntry> bounds = sSpellScriptTargetStorage.getBounds<SpellTargetEntry>(m_spellInfo->Id);
 
             // fill real target list if no spell script target defined
             FillAreaTargets(bounds.first != bounds.second ? tempTargetUnitMap : targetUnitMap,
-                radius, PUSH_DEST_CENTER, bounds.first != bounds.second ? SPELL_TARGETS_ALL : targetB);
+                radius, PUSH_INHERITED_CENTER, bounds.first != bounds.second ? SPELL_TARGETS_ALL : targetB);
 
             if (!tempTargetUnitMap.empty())
             {
@@ -2098,19 +2435,22 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     if ((*iter)->GetTypeId() != TYPEID_UNIT)
                         continue;
 
-                    for(SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST)
+                    for (SQLMultiStorage::SQLMultiSIterator<SpellTargetEntry> i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST)
                     {
+                        if (i_spellST->CanNotHitWithSpellEffect(effIndex))
+                            continue;
+
                         // only creature entries supported for this target type
-                        if (i_spellST->second.type == SPELL_TARGET_TYPE_GAMEOBJECT)
+                        if (i_spellST->type == SPELL_TARGET_TYPE_GAMEOBJECT)
                             continue;
 
-                        if ((*iter)->GetEntry() == i_spellST->second.targetEntry)
+                        if ((*iter)->GetEntry() == i_spellST->targetEntry)
                         {
-                            if (i_spellST->second.type == SPELL_TARGET_TYPE_DEAD && ((Creature*)(*iter))->IsCorpse())
+                            if (i_spellST->type == SPELL_TARGET_TYPE_DEAD && ((Creature*)(*iter))->IsCorpse())
                             {
                                 targetUnitMap.push_back((*iter));
                             }
-                            else if (i_spellST->second.type == SPELL_TARGET_TYPE_CREATURE && (*iter)->isAlive())
+                            else if (i_spellST->type == SPELL_TARGET_TYPE_CREATURE && (*iter)->isAlive())
                             {
                                 targetUnitMap.push_back((*iter));
                             }
@@ -2136,7 +2476,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             }
 
             UnitList tempTargetUnitMap;
-            SpellScriptTargetBounds bounds = sSpellMgr.GetSpellScriptTargetBounds(m_spellInfo->Id);
+            SQLMultiStorage::SQLMSIteratorBounds<SpellTargetEntry> bounds = sSpellScriptTargetStorage.getBounds<SpellTargetEntry>(m_spellInfo->Id);
             // fill real target list if no spell script target defined
             FillAreaTargets(bounds.first != bounds.second ? tempTargetUnitMap : targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_ALL);
 
@@ -2147,19 +2487,22 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     if ((*iter)->GetTypeId() != TYPEID_UNIT)
                         continue;
 
-                    for(SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST)
+                    for (SQLMultiStorage::SQLMultiSIterator<SpellTargetEntry> i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST)
                     {
+                        if (i_spellST->CanNotHitWithSpellEffect(effIndex))
+                            continue;
+
                         // only creature entries supported for this target type
-                        if (i_spellST->second.type == SPELL_TARGET_TYPE_GAMEOBJECT)
+                        if (i_spellST->type == SPELL_TARGET_TYPE_GAMEOBJECT)
                             continue;
 
-                        if ((*iter)->GetEntry() == i_spellST->second.targetEntry)
+                        if ((*iter)->GetEntry() == i_spellST->targetEntry)
                         {
-                            if (i_spellST->second.type == SPELL_TARGET_TYPE_DEAD && ((Creature*)(*iter))->IsCorpse())
+                            if (i_spellST->type == SPELL_TARGET_TYPE_DEAD && ((Creature*)(*iter))->IsCorpse())
                             {
                                 targetUnitMap.push_back((*iter));
                             }
-                            else if (i_spellST->second.type == SPELL_TARGET_TYPE_CREATURE && (*iter)->isAlive())
+                            else if (i_spellST->type == SPELL_TARGET_TYPE_CREATURE && (*iter)->isAlive())
                             {
                                 targetUnitMap.push_back((*iter));
                             }
@@ -2182,46 +2525,74 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             }
             break;
         }
+        case TARGET_GO_IN_FRONT_OF_CASTER_90:
         case TARGET_AREAEFFECT_GO_AROUND_SOURCE:
         case TARGET_AREAEFFECT_GO_AROUND_DEST:
         {
-            float x, y, z;
+            WorldLocation loc;
             if (targetMode == TARGET_AREAEFFECT_GO_AROUND_SOURCE)
             {
                 if (m_targets.m_targetMask & TARGET_FLAG_SOURCE_LOCATION)
-                {
-                    x = m_targets.m_srcX;
-                    y = m_targets.m_srcY;
-                    z = m_targets.m_srcZ;
-                }
+                    loc = m_targets.getSource();
                 else
-                    m_caster->GetPosition(x, y, z);
+                    loc = m_caster->GetPosition();
             }
-            else
+            else if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
             {
-                x = m_targets.m_destX;
-                y = m_targets.m_destY;
-                z = m_targets.m_destZ;
+                loc = m_targets.getDestination();
             }
+            else
+                loc = m_caster->GetPosition();
 
             // It may be possible to fill targets for some spell effects
             // automatically (SPELL_EFFECT_WMO_REPAIR(88) for example) but
             // for some/most spells we clearly need/want to limit with spell_target_script
-
             // Some spells untested, for affected GO type 33. May need further adjustments for spells related.
 
-            SpellScriptTargetBounds bounds = sSpellMgr.GetSpellScriptTargetBounds(m_spellInfo->Id);
-            for (SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST)
+            std::list<GameObject*> tempTargetGOList;
+            float fSearchDistance = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex()));
+            SQLMultiStorage::SQLMSIteratorBounds<SpellTargetEntry> bounds = sSpellScriptTargetStorage.getBounds<SpellTargetEntry>(m_spellInfo->Id);
+            if (bounds.first !=  bounds.second)
             {
-                if (i_spellST->second.type == SPELL_TARGET_TYPE_GAMEOBJECT)
+                for (SQLMultiStorage::SQLMultiSIterator<SpellTargetEntry> i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST)
                 {
-                    // search all GO's with entry, within range of m_destN
-                    MaNGOS::GameObjectEntryInPosRangeCheck go_check(*m_caster, i_spellST->second.targetEntry, x, y, z, radius);
-                    MaNGOS::GameObjectListSearcher<MaNGOS::GameObjectEntryInPosRangeCheck> checker(tempTargetGOList, go_check);
-                    Cell::VisitGridObjects(m_caster, checker, radius);
+                    if (i_spellST->CanNotHitWithSpellEffect(effIndex))
+                        continue;
+
+                    if (i_spellST->type == SPELL_TARGET_TYPE_GAMEOBJECT)
+                    {
+                        // search all GO's with entry, within range of m_destN
+                        MaNGOS::GameObjectEntryInPosRangeCheck go_check(*m_caster, i_spellST->targetEntry, loc.x, loc.y, loc.z, radius);
+                        MaNGOS::GameObjectListSearcher<MaNGOS::GameObjectEntryInPosRangeCheck> checker(tempTargetGOList, go_check);
+                        Cell::VisitGridObjects(m_caster, checker, radius + fSearchDistance);
+                    }
                 }
             }
+            else
+            {
+                MaNGOS::GameObjectInRangeCheck check(m_caster, loc.x, loc.y, loc.z, radius);
+                MaNGOS::GameObjectListSearcher<MaNGOS::GameObjectInRangeCheck> searcher(tempTargetGOList, check);
+                Cell::VisitAllObjects(m_caster, searcher, radius + fSearchDistance );
+            }
 
+            if (!tempTargetGOList.empty())
+            {
+                for (std::list<GameObject*>::iterator iter = tempTargetGOList.begin(); iter != tempTargetGOList.end(); ++iter)
+                {
+                    switch (targetMode)
+                    {
+                        case TARGET_GO_IN_FRONT_OF_CASTER_90:
+                            if (m_caster->isInFront(*iter, radius, M_PI_F/2))
+                                AddGOTarget(*iter, effIndex);
+                            break;
+                        case TARGET_AREAEFFECT_GO_AROUND_SOURCE:
+                        case TARGET_AREAEFFECT_GO_AROUND_DEST:
+                        default:
+                            AddGOTarget(*iter, effIndex);
+                            break;
+                    }
+                }
+            }
             break;
         }
         case TARGET_ALL_ENEMY_IN_AREA_INSTANT:
@@ -2236,20 +2607,14 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     break;
                 default:
                     FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
-
-                    // Mind Sear, triggered
-                    if (m_spellInfo->IsFitToFamily(SPELLFAMILY_PRIEST, UI64LIT(0x0008000000000000)))
-                        if (Unit* unitTarget = m_targets.getUnitTarget())
-                            targetUnitMap.remove(unitTarget);
-
                     break;
             }
             break;
         }
         case TARGET_DUELVSPLAYER_COORDINATES:
         {
-            if(Unit* currentTarget = m_targets.getUnitTarget())
-                m_targets.setDestination(currentTarget->GetPositionX(), currentTarget->GetPositionY(), currentTarget->GetPositionZ());
+            if (Unit* currentTarget = m_targets.getUnitTarget())
+                m_targets.setDestination(currentTarget->GetPosition());
             break;
         }
         case TARGET_ALL_PARTY_AROUND_CASTER:
@@ -2275,7 +2640,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
         }
         case TARGET_ALL_RAID_AROUND_CASTER:
         {
-            if(m_spellInfo->Id == 57669)                    // Replenishment (special target selection)
+            if (m_spellInfo->Id == 57669)                    // Replenishment (special target selection)
             {
                 // in arena, target should be only caster
                 if (m_caster->GetMap()->IsBattleArena())
@@ -2285,25 +2650,85 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             }
             else if (m_spellInfo->Id==52759)                // Ancestral Awakening (special target selection)
                 FillRaidOrPartyHealthPriorityTargets(targetUnitMap, m_caster, m_caster, radius, 1, true, false, true);
+            else if (m_spellInfo->Id == 54171)              // Divine Storm
+                FillRaidOrPartyHealthPriorityTargets(targetUnitMap, m_caster, m_caster, radius, 3, true, false, true);
+            else if (m_spellInfo->Id == 59725)              // Improved Spell Reflection
+            {
+                if (m_caster->HasAura(23920, EFFECT_INDEX_0) )
+                    m_caster->RemoveAurasDueToSpell(23920); // will be replaced by imp. spell refl. aura
+
+                Unit::AuraList const& lDummyAuras = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
+                for(Unit::AuraList::const_iterator i = lDummyAuras.begin(); i != lDummyAuras.end(); ++i)
+                {
+                    if((*i)->GetSpellProto()->GetSpellIconID() == 1935)
+                    {
+                        unMaxTargets = (*i)->GetModifier()->m_amount + 1;   // +1 because we are also applying this to the caster
+                        break;
+                    }
+                }
+
+                radius = 20.0f;     // as mentioned in the spell's tooltip (data doesn't appear in dbc)
+
+                FillRaidOrPartyTargets(targetUnitMap, m_caster, m_caster, radius, false, false, true);
+                targetUnitMap.sort(TargetDistanceOrderNear(m_caster));
+                if (targetUnitMap.size() > unMaxTargets)
+                    targetUnitMap.resize(unMaxTargets);
+                break;
+            }
             else
                 FillRaidOrPartyTargets(targetUnitMap, m_caster, m_caster, radius, true, true, IsPositiveSpell(m_spellInfo->Id));
             break;
         }
         case TARGET_SINGLE_FRIEND:
         case TARGET_SINGLE_FRIEND_2:
-            if(m_targets.getUnitTarget())
+            if (m_targets.getUnitTarget())
                 targetUnitMap.push_back(m_targets.getUnitTarget());
+            else if (IsSpellWithCasterSourceTargetsOnly(m_spellInfo))
+                targetUnitMap.push_back(GetCaster());
             break;
         case TARGET_NONCOMBAT_PET:
-            if(Unit* target = m_targets.getUnitTarget())
-                if( target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->IsPet() && ((Pet*)target)->getPetType() == MINI_PET)
+            if (Unit* target = m_targets.getUnitTarget())
+                if ( target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->IsPet() && ((Pet*)target)->getPetType() == MINI_PET)
+                    targetUnitMap.push_back(target);
+            break;
+        case TARGET_UNIT_CREATOR:
+        {
+            WorldObject* caster = GetAffectiveCasterObject();
+            if (!caster)
+                return;
+
+            if (caster->GetTypeId() == TYPEID_UNIT && ((Creature*)caster)->IsTemporarySummon())
+                targetUnitMap.push_back(((TemporarySummon*)(Creature*)caster)->GetSummoner());
+            else if (caster->GetTypeId() == TYPEID_GAMEOBJECT && !((GameObject*)caster)->HasStaticDBSpawnData())
+                targetUnitMap.push_back(((GameObject*)caster)->GetOwner());
+            else if (Unit* target = m_caster->GetCreator())
+                targetUnitMap.push_back(target);
+             else
+                sLog.outError("Spell::SetTargetMap: Spell ID %u with target ID %u was used by unhandled object %s.", m_spellInfo->Id, targetMode, caster->GetGuidStr().c_str());
+            break;
+        }
+        case TARGET_OWNED_VEHICLE:
+            if (VehicleKitPtr vehicle = m_caster->GetVehicle())
+                if (Unit* target = vehicle->GetBase())
                     targetUnitMap.push_back(target);
             break;
+        case TARGET_UNIT_PASSENGER_0:
+        case TARGET_UNIT_PASSENGER_1:
+        case TARGET_UNIT_PASSENGER_2:
+        case TARGET_UNIT_PASSENGER_3:
+        case TARGET_UNIT_PASSENGER_4:
+        case TARGET_UNIT_PASSENGER_5:
+        case TARGET_UNIT_PASSENGER_6:
+        case TARGET_UNIT_PASSENGER_7:
+            if (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->IsVehicle())
+                if (Unit* unit = m_caster->GetVehicleKit()->GetPassenger(targetMode - TARGET_UNIT_PASSENGER_0))
+                    targetUnitMap.push_back(unit);
+            break;
         case TARGET_CASTER_COORDINATES:
         {
-            // Check original caster is GO - set its coordinates as dst cast
-            if (WorldObject *caster = GetCastingObject())
-                m_targets.setDestination(caster->GetPositionX(), caster->GetPositionY(), caster->GetPositionZ());
+            // Check original caster is GO - set its coordinates as src cast
+            if (WorldObject* caster = GetCastingObject())
+                m_targets.setSource(caster->GetPosition());
             break;
         }
         case TARGET_ALL_HOSTILE_UNITS_AROUND_CASTER:
@@ -2312,10 +2737,20 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
         case TARGET_ALL_FRIENDLY_UNITS_AROUND_CASTER:
             switch (m_spellInfo->Id)
             {
+                case 54171:                                 // Divine Storm
+                    FillRaidOrPartyHealthPriorityTargets(targetUnitMap, m_caster, m_caster, radius, 3, true, false, true);
+                    break;
                 case 56153:                                 // Guardian Aura - Ahn'Kahet
+                case 50811:                                 // Shatter Dmg N - Krystallus
+                case 61547:                                 // Shatter Dmg H - Krystallus
                     FillAreaTargets(targetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_FRIENDLY);
                     targetUnitMap.remove(m_caster);
                     break;
+                case 63881:                                 // Malady of the Mind   Ulduar Yogg Saron
+                case 70920:                                 // Unbound Plague Search Effect (ICC -Putricide)
+                    FillAreaTargets(targetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_FRIENDLY, GetCastingObject());
+                    targetUnitMap.remove(m_caster);
+                    break;
                 case 64844:                                 // Divine Hymn
                     // target amount stored in parent spell dummy effect but hard to access
                     FillRaidOrPartyHealthPriorityTargets(targetUnitMap, m_caster, m_caster, radius, 3, true, false, true);
@@ -2331,16 +2766,8 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             }
             break;
         case TARGET_ALL_FRIENDLY_UNITS_IN_AREA:
-            // Death Pact (in fact selection by player selection)
-            if (m_spellInfo->Id == 48743)
-            {
-                // checked in Spell::CheckCast
-                if (m_caster->GetTypeId()==TYPEID_PLAYER)
-                    if (Unit* target = m_caster->GetMap()->GetPet(((Player*)m_caster)->GetSelectionGuid()))
-                        targetUnitMap.push_back(target);
-            }
             // Circle of Healing
-            else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PRIEST && m_spellInfo->SpellVisual[0] == 8253)
+            if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PRIEST && m_spellInfo->GetSpellVisual() == 8253)
             {
                 Unit* target = m_targets.getUnitTarget();
                 if(!target)
@@ -2348,13 +2775,13 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
 
                 uint32 count = 5;
                 // Glyph of Circle of Healing
-                if(Aura const* glyph = m_caster->GetDummyAura(55675))
+                if (Aura const* glyph = m_caster->GetDummyAura(55675))
                     count += glyph->GetModifier()->m_amount;
 
                 FillRaidOrPartyHealthPriorityTargets(targetUnitMap, m_caster, target, radius, count, true, false, true);
             }
             // Wild Growth
-            else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellIconID == 2864)
+            else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->GetSpellIconID() == 2864)
             {
                 Unit* target = m_targets.getUnitTarget();
                 if(!target)
@@ -2363,6 +2790,11 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
 
                 FillRaidOrPartyHealthPriorityTargets(targetUnitMap, m_caster, target, radius, count, true, false, true);
             }
+            // Item - Icecrown 25 Heroic/Normal Healer Trinket 2
+            else if (m_spellInfo->Id == 71641 || m_spellInfo->Id == 71610)
+            {
+                FillRaidOrPartyHealthPriorityTargets(targetUnitMap, m_caster, m_caster, radius, 1, true, false, false);
+            }
             else
                 FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_FRIENDLY);
             break;
@@ -2371,18 +2803,18 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
         {
             Unit *target = m_targets.getUnitTarget();
             // Those spells apparently can't be casted on the caster.
-            if( target && target != m_caster)
+            if ( target && target != m_caster)
             {
                 // Can only be casted on group's members or its pets
                 Group  *pGroup = NULL;
 
                 Unit* owner = m_caster->GetCharmerOrOwner();
                 Unit *targetOwner = target->GetCharmerOrOwner();
-                if(owner)
+                if (owner)
                 {
-                    if(owner->GetTypeId() == TYPEID_PLAYER)
+                    if (owner->GetTypeId() == TYPEID_PLAYER)
                     {
-                        if( target == owner )
+                        if ( target == owner )
                         {
                             targetUnitMap.push_back(target);
                             break;
@@ -2392,7 +2824,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                 }
                 else if (m_caster->GetTypeId() == TYPEID_PLAYER)
                 {
-                    if( targetOwner == m_caster && target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->IsPet())
+                    if ( targetOwner == m_caster && target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->IsPet())
                     {
                         targetUnitMap.push_back(target);
                         break;
@@ -2400,12 +2832,12 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     pGroup = ((Player*)m_caster)->GetGroup();
                 }
 
-                if(pGroup)
+                if (pGroup)
                 {
                     // Our target can also be a player's pet who's grouped with us or our pet. But can't be controlled player
-                    if(targetOwner)
+                    if (targetOwner)
                     {
-                        if( targetOwner->GetTypeId() == TYPEID_PLAYER &&
+                        if ( targetOwner->GetTypeId() == TYPEID_PLAYER &&
                             target->GetTypeId() == TYPEID_UNIT && (((Creature*)target)->IsPet()) &&
                             target->GetOwnerGuid() == targetOwner->GetObjectGuid() &&
                             pGroup->IsMember(((Player*)targetOwner)->GetObjectGuid()))
@@ -2423,39 +2855,52 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             break;
         }
         case TARGET_GAMEOBJECT:
-            if(m_targets.getGOTarget())
+            if (m_targets.getGOTarget())
                 AddGOTarget(m_targets.getGOTarget(), effIndex);
             break;
         case TARGET_IN_FRONT_OF_CASTER:
         {
-            bool inFront = m_spellInfo->SpellVisual[0] != 3879;
-            FillAreaTargets(targetUnitMap, radius, inFront ? PUSH_IN_FRONT : PUSH_IN_BACK, SPELL_TARGETS_AOE_DAMAGE);
+            SpellNotifyPushType pushType = PUSH_IN_FRONT;
+            switch (m_spellInfo->GetSpellVisual())            // Some spell require a different target fill
+            {
+                case 3879: pushType = PUSH_IN_BACK;     break;
+                case 7441: pushType = PUSH_IN_FRONT_15; break;
+                case 8669: pushType = PUSH_IN_FRONT_15; break;
+            }
+            FillAreaTargets(targetUnitMap, radius, pushType, SPELL_TARGETS_AOE_DAMAGE);
             break;
         }
         case TARGET_LARGE_FRONTAL_CONE:
             FillAreaTargets(targetUnitMap, radius, PUSH_IN_FRONT_90, SPELL_TARGETS_AOE_DAMAGE);
             break;
+        case TARGET_FRIENDLY_FRONTAL_CONE:
+            FillAreaTargets(targetUnitMap, radius, PUSH_IN_FRONT_30, SPELL_TARGETS_FRIENDLY);
+            break;
         case TARGET_NARROW_FRONTAL_CONE:
             FillAreaTargets(targetUnitMap, radius, PUSH_IN_FRONT_15, SPELL_TARGETS_AOE_DAMAGE);
             break;
         case TARGET_IN_FRONT_OF_CASTER_30:
-            FillAreaTargets(targetUnitMap, radius, PUSH_IN_FRONT_30, SPELL_TARGETS_AOE_DAMAGE);
+            // Incorrect name for target. Must be _FRONTAL_CONE_90
+            FillAreaTargets(targetUnitMap, radius, PUSH_IN_FRONT_90, SPELL_TARGETS_AOE_DAMAGE);
             break;
         case TARGET_DUELVSPLAYER:
         {
             Unit *target = m_targets.getUnitTarget();
-            if(target)
+            if (target)
             {
-                if(m_caster->IsFriendlyTo(target))
+                if (m_caster->IsFriendlyTo(target))
                 {
                     targetUnitMap.push_back(target);
                 }
                 else
                 {
-                    if(Unit* pUnitTarget = m_caster->SelectMagnetTarget(m_targets.getUnitTarget(), this, effIndex))
+                    if (Unit* pUnitTarget = m_caster->SelectMagnetTarget(m_targets.getUnitTarget(), this, effIndex))
                     {
-                        m_targets.setUnitTarget(pUnitTarget);
-                        m_spellFlags |= SPELL_FLAG_REDIRECTED;
+                        if (m_targets.getUnitTarget() != pUnitTarget)
+                        {
+                            m_targets.setUnitTarget(pUnitTarget);
+                            m_spellFlags |= SPELL_FLAG_REDIRECTED;
+                        }
                         targetUnitMap.push_back(pUnitTarget);
                     }
                 }
@@ -2469,7 +2914,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                 AddItemTarget(m_targets.getItemTarget(), effIndex);
             break;
         case TARGET_MASTER:
-            if(Unit* owner = m_caster->GetCharmerOrOwner())
+            if (Unit* owner = m_caster->GetCharmerOrOwner())
                 targetUnitMap.push_back(owner);
             break;
         case TARGET_ALL_ENEMY_IN_AREA_CHANNELED:
@@ -2478,15 +2923,19 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                 FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
             break;
         case TARGET_MINION:
-            if(m_spellInfo->Effect[effIndex] != SPELL_EFFECT_DUEL)
+            if (m_spellInfo->Effect[effIndex] != SPELL_EFFECT_DUEL)
                 targetUnitMap.push_back(m_caster);
             break;
+        case TARGET_SINGLE_ENEMY_2:
         case TARGET_SINGLE_ENEMY:
         {
-            if(Unit* pUnitTarget = m_caster->SelectMagnetTarget(m_targets.getUnitTarget(), this, effIndex))
+            if (Unit* pUnitTarget = m_caster->SelectMagnetTarget(m_targets.getUnitTarget(), this, effIndex))
             {
-                m_targets.setUnitTarget(pUnitTarget);
-                m_spellFlags |= SPELL_FLAG_REDIRECTED;
+                if (m_targets.getUnitTarget() != pUnitTarget)
+                {
+                    m_targets.setUnitTarget(pUnitTarget);
+                    m_spellFlags |= SPELL_FLAG_REDIRECTED;
+                }
                 targetUnitMap.push_back(pUnitTarget);
             }
             break;
@@ -2496,22 +2945,22 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             Unit* owner = m_caster->GetCharmerOrOwner();
             Player *pTarget = NULL;
 
-            if(owner)
+            if (owner)
             {
                 targetUnitMap.push_back(m_caster);
-                if(owner->GetTypeId() == TYPEID_PLAYER)
+                if (owner->GetTypeId() == TYPEID_PLAYER)
                     pTarget = (Player*)owner;
             }
             else if (m_caster->GetTypeId() == TYPEID_PLAYER)
             {
-                if(Unit* target = m_targets.getUnitTarget())
+                if (Unit* target = m_targets.getUnitTarget())
                 {
-                    if( target->GetTypeId() != TYPEID_PLAYER)
+                    if ( target->GetTypeId() != TYPEID_PLAYER)
                     {
                         if(((Creature*)target)->IsPet())
                         {
                             Unit *targetOwner = target->GetOwner();
-                            if(targetOwner->GetTypeId() == TYPEID_PLAYER)
+                            if (targetOwner->GetTypeId() == TYPEID_PLAYER)
                                 pTarget = (Player*)targetOwner;
                         }
                     }
@@ -2521,47 +2970,51 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             }
 
             Group* pGroup = pTarget ? pTarget->GetGroup() : NULL;
-
-            if(pGroup)
+            if (pGroup)
             {
                 uint8 subgroup = pTarget->GetSubGroup();
 
-                for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+                for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
                 {
                     Player* Target = itr->getSource();
 
                     // IsHostileTo check duel and controlled by enemy
-                    if(Target && Target->GetSubGroup() == subgroup && !m_caster->IsHostileTo(Target))
+                    if (Target && Target->GetSubGroup() == subgroup && !m_caster->IsHostileTo(Target))
                     {
-                        if( pTarget->IsWithinDistInMap(Target, radius) )
+                        if (pTarget->IsWithinDistInMap(Target, radius))
                             targetUnitMap.push_back(Target);
 
-                        if(Pet* pet = Target->GetPet())
-                            if( pTarget->IsWithinDistInMap(pet, radius) )
-                                targetUnitMap.push_back(pet);
+                        GuidSet const& groupPets = Target->GetPets();
+                        if (!groupPets.empty())
+                        {
+                            for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                                if (Pet* pPet = Target->GetMap()->GetPet(*itr))
+                                    if (pTarget->IsWithinDistInMap(pPet, radius))
+                                        targetUnitMap.push_back(pPet);
+                        }
                     }
                 }
             }
             else if (owner)
             {
-                if(m_caster->IsWithinDistInMap(owner, radius))
+                if (m_caster->IsWithinDistInMap(owner, radius))
                     targetUnitMap.push_back(owner);
             }
-            else if(pTarget)
+            else if (pTarget)
             {
                 targetUnitMap.push_back(pTarget);
 
-                if(Pet* pet = pTarget->GetPet())
-                    if( m_caster->IsWithinDistInMap(pet, radius) )
+                if (Pet* pet = pTarget->GetPet())
+                    if (m_caster->IsWithinDistInMap(pet, radius))
                         targetUnitMap.push_back(pet);
             }
             break;
         }
         case TARGET_SCRIPT:
         {
-            if(m_targets.getUnitTarget())
+            if (m_targets.getUnitTarget())
                 targetUnitMap.push_back(m_targets.getUnitTarget());
-            if(m_targets.getItemTarget())
+            if (m_targets.getItemTarget())
                 AddItemTarget(m_targets.getItemTarget(), effIndex);
             break;
         }
@@ -2571,71 +3024,81 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
         case TARGET_CHAIN_HEAL:
         {
             Unit* pUnitTarget = m_targets.getUnitTarget();
-            if(!pUnitTarget)
+            if (!pUnitTarget)
                 break;
 
-            if (EffectChainTarget <= 1)
-                targetUnitMap.push_back(pUnitTarget);
-            else
+            if (unEffectChainTarget <= 1)
             {
-                unMaxTargets = EffectChainTarget;
-                float max_range = radius + unMaxTargets * CHAIN_SPELL_JUMP_RADIUS;
+                targetUnitMap.push_back(pUnitTarget);
+                break;
+            }
+
+            unMaxTargets = unEffectChainTarget;
+            float maxRange = radius + unMaxTargets * CHAIN_SPELL_JUMP_RADIUS;
 
-                UnitList tempTargetUnitMap;
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, maxRange, PUSH_SELF_CENTER, SPELL_TARGETS_FRIENDLY);
 
-                FillAreaTargets(tempTargetUnitMap, max_range, PUSH_SELF_CENTER, SPELL_TARGETS_FRIENDLY);
+            if (m_caster != pUnitTarget && std::find(tempTargetUnitMap.begin(), tempTargetUnitMap.end(), m_caster) == tempTargetUnitMap.end())
+                tempTargetUnitMap.push_front(m_caster);
 
-                if (m_caster != pUnitTarget && std::find(tempTargetUnitMap.begin(), tempTargetUnitMap.end(), m_caster) == tempTargetUnitMap.end())
-                    tempTargetUnitMap.push_front(m_caster);
+            uint32 numTargets = tempTargetUnitMap.size();
+            if (!numTargets)
+                break;
 
+            if (numTargets > 1)
                 tempTargetUnitMap.sort(TargetDistanceOrderNear(pUnitTarget));
 
+            targetUnitMap.push_back(pUnitTarget);
+
+            if (*tempTargetUnitMap.begin() == pUnitTarget)
+            {
+                tempTargetUnitMap.erase(tempTargetUnitMap.begin());
                 if (tempTargetUnitMap.empty())
                     break;
+            }
 
-                if (*tempTargetUnitMap.begin() == pUnitTarget)
-                    tempTargetUnitMap.erase(tempTargetUnitMap.begin());
+            numTargets = unMaxTargets - 1;
+            bool checkLOS = !m_spellInfo->HasAttribute(SPELL_ATTR_EX2_IGNORE_LOS);
+            Unit* prevUnit = pUnitTarget;
 
-                targetUnitMap.push_back(pUnitTarget);
-                uint32 t = unMaxTargets - 1;
-                Unit *prev = pUnitTarget;
-                UnitList::iterator next = tempTargetUnitMap.begin();
+            UnitList::iterator nextItr = tempTargetUnitMap.begin();
+            while (numTargets && nextItr != tempTargetUnitMap.end())
+            {
+                if (!prevUnit->IsWithinDist(*nextItr, CHAIN_SPELL_JUMP_RADIUS))
+                    break;
 
-                while(t && next != tempTargetUnitMap.end())
+                if (checkLOS && !prevUnit->IsWithinLOSInMap(*nextItr))
                 {
-                    if(!prev->IsWithinDist(*next, CHAIN_SPELL_JUMP_RADIUS))
-                        break;
+                    ++nextItr;
+                    continue;
+                }
 
-                    if(!prev->IsWithinLOSInMap(*next))
-                    {
-                        ++next;
-                        continue;
-                    }
+                if ((*nextItr)->GetHealth() == (*nextItr)->GetMaxHealth())
+                {
+                    nextItr = tempTargetUnitMap.erase(nextItr);
+                    continue;
+                }
 
-                    if((*next)->GetHealth() == (*next)->GetMaxHealth())
-                    {
-                        next = tempTargetUnitMap.erase(next);
-                        continue;
-                    }
+                prevUnit = *nextItr;
+                targetUnitMap.push_back(prevUnit);
 
-                    prev = *next;
-                    targetUnitMap.push_back(prev);
-                    tempTargetUnitMap.erase(next);
-                    tempTargetUnitMap.sort(TargetDistanceOrderNear(prev));
-                    next = tempTargetUnitMap.begin();
+                tempTargetUnitMap.erase(nextItr);
+                if (tempTargetUnitMap.size() > 1)
+                    tempTargetUnitMap.sort(TargetDistanceOrderNear(prevUnit));
 
-                    --t;
-                }
+                nextItr = tempTargetUnitMap.begin();
+                --numTargets;
             }
             break;
         }
         case TARGET_CURRENT_ENEMY_COORDINATES:
         {
             Unit* currentTarget = m_targets.getUnitTarget();
-            if(currentTarget)
+            if (currentTarget)
             {
                 targetUnitMap.push_back(currentTarget);
-                m_targets.setDestination(currentTarget->GetPositionX(), currentTarget->GetPositionY(), currentTarget->GetPositionZ());
+                m_targets.setDestination(currentTarget->GetPosition());
             }
             break;
         }
@@ -2645,14 +3108,14 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                 ? (Player*)m_targets.getUnitTarget() : NULL;
 
             Group* pGroup = targetPlayer ? targetPlayer->GetGroup() : NULL;
-            if(pGroup)
+            if (pGroup)
             {
                 for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
                 {
                     Player* Target = itr->getSource();
 
                     // IsHostileTo check duel and controlled by enemy
-                    if( Target && targetPlayer->IsWithinDistInMap(Target, radius) &&
+                    if ( Target && targetPlayer->IsWithinDistInMap(Target, radius) &&
                         targetPlayer->getClass() == Target->getClass() &&
                         !m_caster->IsHostileTo(Target) )
                     {
@@ -2660,25 +3123,24 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     }
                 }
             }
-            else if(m_targets.getUnitTarget())
+            else if (m_targets.getUnitTarget())
                 targetUnitMap.push_back(m_targets.getUnitTarget());
             break;
         }
         case TARGET_TABLE_X_Y_Z_COORDINATES:
         {
-            SpellTargetPosition const* st = sSpellMgr.GetSpellTargetPosition(m_spellInfo->Id);
-            if(st)
+            WorldLocation const* st = sSpellMgr.GetSpellTargetPosition(m_spellInfo->Id);
+            if (st)
             {
-                // teleport spells are handled in another way
-                if (m_spellInfo->Effect[effIndex] == SPELL_EFFECT_TELEPORT_UNITS)
-                    break;
-                if (st->target_mapId == m_caster->GetMapId())
-                    m_targets.setDestination(st->target_X, st->target_Y, st->target_Z);
-                else
-                    sLog.outError( "SPELL: wrong map (%u instead %u) target coordinates for spell ID %u", st->target_mapId, m_caster->GetMapId(), m_spellInfo->Id );
+                m_targets.setDestination(*st);
+                // TODO - maybe use an (internal) value for the map for neat far teleport handling
+
+                // far-teleport spells are handled in SpellEffect, elsewise report an error about an unexpected map (spells are always locally)
+                if (st->GetMapId() != m_caster->GetMapId() && m_spellInfo->Effect[effIndex] != SPELL_EFFECT_TELEPORT_UNITS && m_spellInfo->Effect[effIndex] != SPELL_EFFECT_BIND)
+                    sLog.outError( "SPELL: wrong map (%u instead %u) target coordinates for spell ID %u", st->GetMapId(), m_caster->GetMapId(), m_spellInfo->Id);
             }
             else
-                sLog.outError( "SPELL: unknown target coordinates for spell ID %u", m_spellInfo->Id );
+                sLog.outError("SPELL: unknown target coordinates for spell ID %u", m_spellInfo->Id);
             break;
         }
         case TARGET_INFRONT_OF_VICTIM:
@@ -2686,36 +3148,36 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
         case TARGET_RIGHT_FROM_VICTIM:
         case TARGET_LEFT_FROM_VICTIM:
         {
-            Unit *pTarget = NULL;
+            Unit* pTarget = NULL;
 
             // explicit cast data from client or server-side cast
             // some spell at client send caster
-            if(m_targets.getUnitTarget() && m_targets.getUnitTarget()!=m_caster)
+            if (m_targets.getUnitTarget() && m_targets.getUnitTarget() != m_caster)
                 pTarget = m_targets.getUnitTarget();
-            else if(m_caster->getVictim())
-                pTarget = m_caster->getVictim();
-            else if(m_caster->GetTypeId() == TYPEID_PLAYER)
+            else if (Unit* pVictim = m_caster->getVictim())
+                pTarget = pVictim;
+            else if (m_caster->GetTypeId() == TYPEID_PLAYER)
                 pTarget = ObjectAccessor::GetUnit(*m_caster, ((Player*)m_caster)->GetSelectionGuid());
+            else if (m_targets.getUnitTarget())
+                pTarget = m_caster;
 
-            if(pTarget)
+            if (pTarget)
             {
                 float angle = 0.0f;
-                float dist = (radius && targetMode != TARGET_BEHIND_VICTIM) ? radius : CONTACT_DISTANCE;
 
-                switch(targetMode)
+                switch (targetMode)
                 {
-                    case TARGET_INFRONT_OF_VICTIM:                      break;
+                    case TARGET_INFRONT_OF_VICTIM:                        break;
                     case TARGET_BEHIND_VICTIM:      angle = M_PI_F;       break;
                     case TARGET_RIGHT_FROM_VICTIM:  angle = -M_PI_F / 2;  break;
                     case TARGET_LEFT_FROM_VICTIM:   angle = M_PI_F / 2;   break;
                 }
 
-                float _target_x, _target_y, _target_z;
-                pTarget->GetClosePoint(_target_x, _target_y, _target_z, pTarget->GetObjectBoundingRadius(), dist, angle);
-                if(pTarget->IsWithinLOS(_target_x, _target_y, _target_z))
+                WorldLocation loc = pTarget->GetClosePoint(pTarget->GetObjectBoundingRadius(), radius, angle, m_caster);
+                if (pTarget->IsWithinLOS(loc.x, loc.y, loc.z))
                 {
                     targetUnitMap.push_back(m_caster);
-                    m_targets.setDestination(_target_x, _target_y, _target_z);
+                    m_targets.setDestination(loc);
                 }
             }
             break;
@@ -2723,10 +3185,10 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
         case TARGET_DYNAMIC_OBJECT_COORDINATES:
             // if parent spell create dynamic object extract area from it
             if (DynamicObject* dynObj = m_caster->GetDynObject(m_triggeredByAuraSpell ? m_triggeredByAuraSpell->Id : m_spellInfo->Id))
-                m_targets.setDestination(dynObj->GetPositionX(), dynObj->GetPositionY(), dynObj->GetPositionZ());
+                m_targets.setDestination(dynObj->GetPosition());
             // else use destination of target if no destination set (ie for Mind Sear - 53022)
-            else if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) && m_targets.m_targetMask & TARGET_FLAG_UNIT)
-                m_targets.setDestination(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ);
+            else if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) && (m_targets.m_targetMask & TARGET_FLAG_UNIT))
+                m_targets.setDestination(m_targets.getDestination());
             break;
         case TARGET_DYNAMIC_OBJECT_FRONT:
         case TARGET_DYNAMIC_OBJECT_BEHIND:
@@ -2755,9 +3217,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     case TARGET_DYNAMIC_OBJECT_RIGHT_SIDE:  angle -= M_PI_F / 2;  break;
                 }
 
-                float x, y;
-                m_caster->GetNearPoint2D(x, y, radius, angle);
-                m_targets.setDestination(x, y, m_caster->GetPositionZ());
+                m_targets.setDestination(m_caster->GetClosePoint(m_caster->GetObjectBoundingRadius(), radius, angle));
             }
 
             targetUnitMap.push_back(m_caster);
@@ -2790,9 +3250,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     case TARGET_POINT_AT_SW:    angle += 3*M_PI_F / 4;    break;
                 }
 
-                float x, y;
-                currentTarget->GetNearPoint2D(x, y, radius, angle);
-                m_targets.setDestination(x, y, currentTarget->GetPositionZ());
+                m_targets.setDestination(currentTarget->GetClosePoint(m_caster->GetObjectBoundingRadius(), radius, angle));
             }
             break;
         }
@@ -2800,14 +3258,11 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
         {
             if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
             {
-                SpellRangeEntry const* rEntry = sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex);
+                SpellRangeEntry const* rEntry = sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex());
                 float minRange = GetSpellMinRange(rEntry);
                 float maxRange = GetSpellMaxRange(rEntry);
                 float dist = minRange+ rand_norm_f()*(maxRange-minRange);
-
-                float _target_x, _target_y, _target_z;
-                m_caster->GetClosePoint(_target_x, _target_y, _target_z, m_caster->GetObjectBoundingRadius(), dist);
-                m_targets.setDestination(_target_x, _target_y, _target_z);
+                m_targets.setDestination(m_caster->GetClosePoint(m_caster->GetObjectBoundingRadius(), dist));
             }
 
             targetUnitMap.push_back(m_caster);
@@ -2821,45 +3276,12 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             {
                 case SPELL_EFFECT_DUMMY:
                 {
-                    switch(m_spellInfo->Id)
-                    {
-                        case 20577:                         // Cannibalize
-                        {
-                            WorldObject* result = FindCorpseUsing<MaNGOS::CannibalizeObjectCheck> ();
+                    if (m_targets.getUnitTarget())
+                        targetUnitMap.push_back(m_targets.getUnitTarget());
 
-                            if(result)
-                            {
-                                switch(result->GetTypeId())
-                                {
-                                    case TYPEID_UNIT:
-                                    case TYPEID_PLAYER:
-                                        targetUnitMap.push_back((Unit*)result);
-                                        break;
-                                    case TYPEID_CORPSE:
-                                        m_targets.setCorpseTarget((Corpse*)result);
-                                        if (Player* owner = ObjectAccessor::FindPlayer(((Corpse*)result)->GetOwnerGuid()))
-                                            targetUnitMap.push_back(owner);
-                                        break;
-                                }
-                            }
-                            else
-                            {
-                                // clear cooldown at fail
-                                if (m_caster->GetTypeId() == TYPEID_PLAYER)
-                                    ((Player*)m_caster)->RemoveSpellCooldown(m_spellInfo->Id, true);
-                                SendCastResult(SPELL_FAILED_NO_EDIBLE_CORPSES);
-                                finish(false);
-                            }
-                            break;
-                        }
-                        default:
-                            if (m_targets.getUnitTarget())
-                                targetUnitMap.push_back(m_targets.getUnitTarget());
-                            break;
-                    }
                     // Add AoE target-mask to self, if no target-dest provided already
-                    if ((m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) == 0)
-                        m_targets.setDestination(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ());
+                    if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
+                        m_targets.setDestination(m_caster->GetPosition());
                     break;
                 }
                 case SPELL_EFFECT_BIND:
@@ -2867,6 +3289,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                 case SPELL_EFFECT_PARRY:
                 case SPELL_EFFECT_BLOCK:
                 case SPELL_EFFECT_CREATE_ITEM:
+                case SPELL_EFFECT_WEAPON:
                 case SPELL_EFFECT_TRIGGER_SPELL:
                 case SPELL_EFFECT_TRIGGER_MISSILE:
                 case SPELL_EFFECT_LEARN_SPELL:
@@ -2882,10 +3305,14 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     else if (m_spellInfo->Effect[effIndex] == SPELL_EFFECT_TRIGGER_SPELL)
                         targetUnitMap.push_back(m_caster);
                     break;
+                case SPELL_EFFECT_FRIEND_SUMMON:
                 case SPELL_EFFECT_SUMMON_PLAYER:
                     if (m_caster->GetTypeId()==TYPEID_PLAYER && ((Player*)m_caster)->GetSelectionGuid())
-                        if (Player* target = sObjectMgr.GetPlayer(((Player*)m_caster)->GetSelectionGuid()))
+                    {
+                        Player* target = sObjectMgr.GetPlayer(((Player*)m_caster)->GetSelectionGuid());
+                        if (target)
                             targetUnitMap.push_back(target);
+                    }
                     break;
                 case SPELL_EFFECT_RESURRECT_NEW:
                     if (m_targets.getUnitTarget())
@@ -2912,8 +3339,8 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     targetUnitMap.push_back(m_caster);
                     break;
                 case SPELL_EFFECT_PERSISTENT_AREA_AURA:
-                    if(Unit* currentTarget = m_targets.getUnitTarget())
-                        m_targets.setDestination(currentTarget->GetPositionX(), currentTarget->GetPositionY(), currentTarget->GetPositionZ());
+                    if (Unit* currentTarget = m_targets.getUnitTarget())
+                        m_targets.setDestination(currentTarget->GetPosition());
                     break;
                 case SPELL_EFFECT_LEARN_PET_SPELL:
                     if (Pet* pet = m_caster->GetPet())
@@ -2933,6 +3360,10 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     {
                         case SPELL_AURA_ADD_FLAT_MODIFIER:  // some spell mods auras have 0 target modes instead expected TARGET_SELF(1) (and present for other ranks for same spell for example)
                         case SPELL_AURA_ADD_PCT_MODIFIER:
+                        case SPELL_AURA_MOD_RANGED_ATTACK_POWER:
+                        case SPELL_AURA_MOD_ATTACK_POWER:
+                        case SPELL_AURA_MOD_HEALING_DONE:
+                        case SPELL_AURA_MOD_DAMAGE_DONE:
                             targetUnitMap.push_back(m_caster);
                             break;
                         default:                            // apply to target in other case
@@ -2943,7 +3374,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
                     break;
                 case SPELL_EFFECT_APPLY_AREA_AURA_PARTY:
                     // AreaAura
-                    if ((m_spellInfo->Attributes == (SPELL_ATTR_NOT_SHAPESHIFT | SPELL_ATTR_UNK18 | SPELL_ATTR_CASTABLE_WHILE_MOUNTED | SPELL_ATTR_CASTABLE_WHILE_SITTING)) || (m_spellInfo->Attributes == SPELL_ATTR_NOT_SHAPESHIFT))
+                    if ((m_spellInfo->GetAttributes() == (SPELL_ATTR_NOT_SHAPESHIFT | SPELL_ATTR_UNK18 | SPELL_ATTR_CASTABLE_WHILE_MOUNTED | SPELL_ATTR_CASTABLE_WHILE_SITTING)) || (m_spellInfo->GetAttributes() == SPELL_ATTR_NOT_SHAPESHIFT))
                         SetTargetMap(effIndex, TARGET_AREAEFFECT_PARTY, targetUnitMap);
                     break;
                 case SPELL_EFFECT_SKIN_PLAYER_CORPSE:
@@ -2966,36 +3397,40 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             break;
     }
 
+    if (unMaxTargets && targetUnitMap.size() > unMaxTargets)
+    {
+        // cleanup list for a right solution (without this spells with unMaxTargets = 1 hit possible nothing, if target is not valid with CheckTarget())
+        UnitList::iterator itr = targetUnitMap.begin();
+        while (itr != targetUnitMap.end())
+        {
+            if (!CheckTargetBeforeLimitation(*itr, effIndex))
+                itr = targetUnitMap.erase(itr);
+            else
+                ++itr;
+        }
+    }
+
     if (unMaxTargets && targetUnitMap.size() > unMaxTargets)
     {
         // make sure one unit is always removed per iteration
         uint32 removed_utarget = 0;
-        for (UnitList::iterator itr = targetUnitMap.begin(), next; itr != targetUnitMap.end(); itr = next)
+        UnitList::iterator itr = targetUnitMap.begin();
+        while (itr != targetUnitMap.end())
         {
-            next = itr;
-            ++next;
-            if (!*itr) continue;
             if ((*itr) == m_targets.getUnitTarget())
             {
-                targetUnitMap.erase(itr);
+                itr = targetUnitMap.erase(itr);
                 removed_utarget = 1;
-                //        break;
             }
+            else
+                ++itr;
         }
         // remove random units from the map
         while (targetUnitMap.size() > unMaxTargets - removed_utarget)
         {
-            uint32 poz = urand(0, targetUnitMap.size()-1);
-            for (UnitList::iterator itr = targetUnitMap.begin(); itr != targetUnitMap.end(); ++itr, --poz)
-            {
-                if (!*itr) continue;
-
-                if (!poz)
-                {
-                    targetUnitMap.erase(itr);
-                    break;
-                }
-            }
+            UnitList::iterator iter = targetUnitMap.begin();
+            advance(iter, urand(0, targetUnitMap.size()-1));
+            targetUnitMap.erase(iter);
         }
         // the player's target will always be added to the map
         if (removed_utarget && m_targets.getUnitTarget())
@@ -3041,7 +3476,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
     }
 }
 
-void Spell::prepare(SpellCastTargets const* targets, Aura* triggeredByAura)
+void Spell::prepare(SpellCastTargets const* targets, Aura const* triggeredByAura)
 {
     m_targets = *targets;
 
@@ -3052,28 +3487,46 @@ void Spell::prepare(SpellCastTargets const* targets, Aura* triggeredByAura)
     m_castPositionZ = m_caster->GetPositionZ();
     m_castOrientation = m_caster->GetOrientation();
 
-    if(triggeredByAura)
+    if (triggeredByAura)
         m_triggeredByAuraSpell  = triggeredByAura->GetSpellProto();
 
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::prepare spell %u caster %s %s formal target %s %s preparing.",
+        m_spellInfo->Id,
+        m_caster ? m_caster->GetObjectGuid().GetString().c_str() : "<none>",
+        (m_caster && !m_caster->IsInWorld()) ? "(not in World)" : "",
+        m_targets.getUnitTargetGuid() ? m_targets.getUnitTargetGuid().GetString().c_str() : "<none>",
+        (m_targets.getUnitTarget() && !m_targets.getUnitTarget()->IsInWorld()) ? "(not in world)" : ""
+        );
+
     // create and add update event for this spell
-    SpellEvent* Event = new SpellEvent(this);
-    m_caster->m_Events.AddEvent(Event, m_caster->m_Events.CalculateTime(1));
+    m_caster->AddEvent(new SpellEvent(this), 1);
 
     //Prevent casting at cast another spell (ServerSide check)
-    if(m_caster->IsNonMeleeSpellCasted(false, true, true) && m_cast_count)
+    if (m_caster->IsNonMeleeSpellCasted(false, true, true) && m_cast_count)
     {
         SendCastResult(SPELL_FAILED_SPELL_IN_PROGRESS);
         finish(false);
         return;
     }
 
+    if (uint8 resultDisable = sObjectMgr.IsSpellDisabled(m_spellInfo->Id))
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST,"Spell::prepare  %s try cast a spell %u which was disabled by server administrator",   m_caster ? m_caster->GetObjectGuid().GetString().c_str() : "<none>", m_spellInfo->Id);
+        if (m_caster->GetTypeId() == TYPEID_PLAYER &&resultDisable == 2)
+            sLog.outChar("Player %s cast a spell %u which was disabled by server administrator and marked as CheatSpell",   m_caster->GetObjectGuid().GetString().c_str(), m_spellInfo->Id);
+
+        SendCastResult(SPELL_FAILED_SPELL_UNAVAILABLE);
+        finish(false);
+        return;
+    }
+
     // Fill cost data
     m_powerCost = CalculatePowerCost(m_spellInfo, m_caster, this, m_CastItem);
 
     SpellCastResult result = CheckCast(true);
-    if(result != SPELL_CAST_OK && !IsAutoRepeat())          //always cast autorepeat dummy for triggering
+    if (result != SPELL_CAST_OK && !IsAutoRepeat())          //always cast autorepeat dummy for triggering
     {
-        if(triggeredByAura)
+        if (triggeredByAura)
         {
             SendChannelUpdate(0);
             triggeredByAura->GetHolder()->SetAuraDuration(0);
@@ -3097,8 +3550,8 @@ void Spell::prepare(SpellCastTargets const* targets, Aura* triggeredByAura)
     // skip triggered spell (item equip spell casting and other not explicit character casts/item uses)
     if ( !m_IsTriggeredSpell && isSpellBreakStealth(m_spellInfo) )
     {
-        m_caster->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
-        m_caster->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+        m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CAST);
+        m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_USE);
     }
 
     // add non-triggered (with cast time and without)
@@ -3112,19 +3565,32 @@ void Spell::prepare(SpellCastTargets const* targets, Aura* triggeredByAura)
 
         TriggerGlobalCooldown();
     }
-    // execute triggered without cast time explicitly in call point
-    else if(m_timer == 0)
+    // execute triggered or without cast time explicitly in call point
+    else if (m_timer == 0 || m_IsTriggeredSpell)
         cast(true);
     // else triggered with cast time will execute execute at next tick or later
     // without adding to cast type slot
     // will not show cast bar but will show effects at casting time etc
+
+    if (m_spellInfo->GetSpeed() > 0.0f && GetCastTime())
+    {
+        Unit* procTarget = m_targets.getUnitTarget();
+        if (!procTarget)
+            procTarget = m_caster;
+
+        m_caster->ProcDamageAndSpell(procTarget, m_procAttacker, 0, PROC_EX_CAST_END, 0, m_attackType, m_spellInfo);
+    }
 }
 
-void Spell::cancel()
+void Spell::cancel(bool force)
 {
-    if(m_spellState == SPELL_STATE_FINISHED)
+    if (m_spellState == SPELL_STATE_FINISHED)
         return;
 
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::cancel spell %u caster %s target %s cancelled.",
+        m_spellInfo->Id, (m_caster && m_caster->IsInWorld()) ? m_caster->GetObjectGuid().GetString().c_str() : "<none>",
+        (m_targets.getUnitTarget() && m_targets.getUnitTarget()->IsInWorld()) ? m_targets.getUnitTarget()->GetObjectGuid().GetString().c_str() : "<none>");
+
     // channeled spells don't display interrupted message even if they are interrupted, possible other cases with no "Interrupted" message
     bool sendInterrupt = IsChanneledSpell(m_spellInfo) ? false : true;
 
@@ -3151,7 +3617,7 @@ void Spell::cancel()
                 {
                     Unit* unit = m_caster->GetObjectGuid() == (*ihit).targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, ihit->targetGUID);
                     if (unit && unit->isAlive())
-                        unit->RemoveAurasByCasterSpell(m_spellInfo->Id, m_caster->GetObjectGuid());
+                        unit->RemoveAurasByCasterSpell(m_spellInfo->Id, m_caster->GetObjectGuid(), force ? AURA_REMOVE_BY_DELETE : AURA_REMOVE_BY_DEFAULT);
 
                     // prevent other effects applying if spell is already interrupted
                     // i.e. if effects have different targets and it was interrupted on one of them when
@@ -3203,6 +3669,8 @@ void Spell::cast(bool skipCheck)
         cancel();
         m_caster->DecreaseCastCounter();
         SetExecutedCurrently(false);
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::cast  spell %u caster %s cancelled at lost main target",
+             m_spellInfo->Id, m_caster ? m_caster->GetObjectGuid().GetString().c_str() : "<none>");
         return;
     }
 
@@ -3216,6 +3684,8 @@ void Spell::cast(bool skipCheck)
         finish(false);
         m_caster->DecreaseCastCounter();
         SetExecutedCurrently(false);
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::cast  spell %u caster %s cancelled by unsufficient power (code %u)",
+             m_spellInfo->Id, m_caster ?  m_caster->GetObjectGuid().GetString().c_str() : "<none>", castResult);
         return;
     }
 
@@ -3223,36 +3693,58 @@ void Spell::cast(bool skipCheck)
     if (!skipCheck)
     {
         castResult = CheckCast(false);
-        if(castResult != SPELL_CAST_OK)
+        if (castResult != SPELL_CAST_OK)
         {
             SendCastResult(castResult);
             finish(false);
             m_caster->DecreaseCastCounter();
             SetExecutedCurrently(false);
+            DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::cast  spell %u caster %s cancelled by non-stricted check (code %u)",
+                 m_spellInfo->Id, m_caster ? m_caster->GetObjectGuid().GetString().c_str() : "<none>", castResult);
             return;
         }
     }
 
+    // Hack for Spirit of Redemption because wrong data in dbc
+    if (m_spellInfo->Id == 27827)
+        if (const SpellEntry* spellInfo = sSpellStore.LookupEntry(m_spellInfo->Id))
+            const_cast<SpellEntry*>(spellInfo)->AuraInterruptFlags = 0;
+
     // different triggered (for caster and main target after main cast) and pre-cast (casted before apply effect to each target) cases
-    switch(m_spellInfo->SpellFamilyName)
+    switch (m_spellInfo->SpellFamilyName)
     {
         case SPELLFAMILY_GENERIC:
         {
-            // Bandages
-            if (m_spellInfo->Mechanic == MECHANIC_BANDAGE)
-                AddPrecastSpell(11196);                     // Recently Bandaged
-            // Stoneskin
-            else if (m_spellInfo->Id == 20594)
-                AddTriggeredSpell(65116);                   // Stoneskin - armor 10% for 8 sec
-            // Chaos Bane strength buff
-            else if (m_spellInfo->Id == 71904)
+            if (m_spellInfo->Id == 20594)                  // Stoneskin
+                AddTriggeredSpell(65116);                  // Stoneskin - armor 10% for 8 sec
+            else if (m_spellInfo->Id == 71904)             // Chaos Bane strength buff
                 AddTriggeredSpell(73422);
+            else if (m_spellInfo->Id == 74607)
+                AddTriggeredSpell(74610);                  // Fiery combustion
+            else if (m_spellInfo->Id == 74799)
+                AddTriggeredSpell(74800);                  // Soul consumption
+            else if (m_spellInfo->Id == 61968)             // Flash Freeze (Hodir: Ulduar)
+                AddTriggeredSpell(62148);                  // visual effect
+            else if (m_spellInfo->Id == 69839)             // Unstable Ooze Explosion (Rotface)
+                AddPrecastSpell(69832);                    // cast "cluster" before silence and pacify
+            else if (m_spellInfo->Id == 58672)             // Impale, damage and loose threat effect (Vault of Archavon, Archavon the Stone Watcher)
+                AddPrecastSpell(m_caster->GetMap()->IsRegularDifficulty() ? 58666 : 60882);
+            else if (m_spellInfo->Id == 71265)             // Swarming Shadows DoT (Queen Lana'thel ICC)
+                AddPrecastSpell(71277);
+            else if (m_spellInfo->Id == 70923)             // Uncontrollable Frenzy (Queen Lana'thel ICC)
+                AddTriggeredSpell(70924);                  // health buff etc.
+            else if (m_spellInfo->Mechanic == MECHANIC_MOUNT)
+            {
+               // Festive Holiday Mount
+               if (m_spellInfo->GetSpellIconID() != 1794 && m_caster->HasAura(62061, EFFECT_INDEX_0))
+                   AddTriggeredSpell(25860);               // Reindeer Transformation
+            }
             break;
         }
         case SPELLFAMILY_MAGE:
         {
             // Ice Block
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000008000000000))
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_MAGE_ICE_BLOCK>())
                 AddPrecastSpell(41425);                     // Hypothermia
             // Icy Veins
             else if (m_spellInfo->Id == 12472)
@@ -3264,6 +3756,12 @@ void Spell::cast(bool skipCheck)
                     m_caster->RemoveSpellsCausingAura(SPELL_AURA_HASTE_SPELLS);
                 }
             }
+            // Frostbite
+            else if (m_spellInfo->Id == 12494)
+            {
+                if (m_caster->HasAura(44543) || m_caster->HasAura(44545))
+                    AddTriggeredSpell(44544);   // Fingers of Frost
+            }
             // Fingers of Frost
             else if (m_spellInfo->Id == 44544)
                 AddPrecastSpell(74396);                     // Fingers of Frost
@@ -3272,33 +3770,42 @@ void Spell::cast(bool skipCheck)
         case SPELLFAMILY_WARRIOR:
         {
             // Shield Slam
-            if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000020000000000)) && m_spellInfo->Category==1209)
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_SHIELD_SLAM>() && m_spellInfo->Category==1209)
             {
                 if (m_caster->HasAura(58375))               // Glyph of Blocking
                     AddTriggeredSpell(58374);               // Glyph of Blocking
             }
             // Bloodrage
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000100))
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_BLOODRAGE>())
             {
                 if (m_caster->HasAura(70844))               // Item - Warrior T10 Protection 4P Bonus
                     AddTriggeredSpell(70845);               // Stoicism
             }
             // Bloodsurge (triggered), Sudden Death (triggered)
             else if (m_spellInfo->Id == 46916 || m_spellInfo->Id == 52437)
+            {
                 // Item - Warrior T10 Melee 4P Bonus
                 if (Aura *aur = m_caster->GetAura(70847, EFFECT_INDEX_0))
+                {
                     if (roll_chance_i(aur->GetModifier()->m_amount))
+                    {
                         AddTriggeredSpell(70849);           // Extra Charge!
+                        // Slam! trigger Slam GCD Reduced . Sudden Death trigger Execute GCD Reduced
+                        int32 gcd_spell=m_spellInfo->Id==46916 ? 71072 : 71069;
+                        AddPrecastSpell(gcd_spell);
+                    }
+                }
+            }
             break;
         }
         case SPELLFAMILY_PRIEST:
         {
             // Power Word: Shield
             if (m_spellInfo->Mechanic == MECHANIC_SHIELD &&
-                (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000001)))
+                m_spellInfo->GetSpellFamilyFlags().test<CF_PRIEST_POWER_WORD_SHIELD>())
                 AddPrecastSpell(6788);                      // Weakened Soul
             // Prayer of Mending (jump animation), we need formal caster instead original for correct animation
-            else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000002000000000))
+            else if (m_spellInfo->GetSpellFamilyFlags().test<CF_PRIEST_PRAYER_OF_MENDING>())
                 AddTriggeredSpell(41637);
 
             switch(m_spellInfo->Id)
@@ -3367,24 +3874,30 @@ void Spell::cast(bool skipCheck)
             // Hand of Reckoning
             else if (m_spellInfo->Id == 62124)
             {
-                if (m_targets.getUnitTarget() && m_targets.getUnitTarget()->getVictim() != m_caster)
+                if (!m_targets.getUnitTarget() || m_targets.getUnitTarget()->GetTargetGuid() != m_caster->GetObjectGuid())
                     AddPrecastSpell(67485);                 // Hand of Rekoning (no typos in name ;) )
             }
             // Divine Shield, Divine Protection or Hand of Protection
-            else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000400080))
+            else if (m_spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_HAND_OF_PROTECTION, CF_PALADIN_DIVINE_SHIELD>())
             {
                 AddPrecastSpell(25771);                     // Forbearance
-                AddPrecastSpell(61987);                     // Avenging Wrath Marker
+
+                // only for self cast
+                if (m_caster == m_targets.getUnitTarget())
+                    AddPrecastSpell(61987);                     // Avenging Wrath Marker
             }
             // Lay on Hands
-            else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000008000))
+            else if (m_spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_LAY_ON_HANDS>())
             {
                 // only for self cast
                 if (m_caster == m_targets.getUnitTarget())
+                {
                     AddPrecastSpell(25771);                     // Forbearance
+                    AddPrecastSpell(61987);                     // Avenging Wrath Marker
+                }
             }
             // Avenging Wrath
-            else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000200000000000))
+            else if (m_spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_AVENGING_WRATH>())
                 AddPrecastSpell(61987);                     // Avenging Wrath Marker
             break;
         }
@@ -3400,7 +3913,7 @@ void Spell::cast(bool skipCheck)
             else if (m_spellInfo->Id == 58875)
                 AddPrecastSpell(58876);
             // Totem of Wrath
-            else if (m_spellInfo->Effect[EFFECT_INDEX_0]==SPELL_EFFECT_APPLY_AREA_AURA_RAID && m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000004000000))
+            else if (m_spellInfo->Effect[EFFECT_INDEX_0]==SPELL_EFFECT_APPLY_AREA_AURA_RAID && m_spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_TOTEM_OF_WRATH>())
                 // only for main totem spell cast
                 AddTriggeredSpell(30708);                   // Totem of Wrath
             break;
@@ -3416,25 +3929,65 @@ void Spell::cast(bool skipCheck)
             break;
     }
 
-    // traded items have trade slot instead of guid in m_itemTargetGUID
-    // set to real guid to be sent later to the client
-    m_targets.updateTradeSlotItem();
-
-    if (m_caster->GetTypeId() == TYPEID_PLAYER)
+    // Linked spells (precast chain)
+    SpellLinkedSet linkedSet = sSpellMgr.GetSpellLinked(m_spellInfo->Id, SPELL_LINKED_TYPE_PRECAST);
+    if (linkedSet.size() > 0)
     {
-        if (!m_IsTriggeredSpell && m_CastItem)
-            ((Player*)m_caster)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM, m_CastItem->GetEntry());
-
-        ((Player*)m_caster)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL, m_spellInfo->Id);
+        for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+            AddPrecastSpell(*itr);
     }
 
-    FillTargetMap();
-
-    if(m_spellState == SPELL_STATE_FINISHED)                // stop cast if spell marked as finish somewhere in FillTargetMap
+    // Linked spells (triggered chain)
+    linkedSet = sSpellMgr.GetSpellLinked(m_spellInfo->Id, SPELL_LINKED_TYPE_TRIGGERED);
+    if (linkedSet.size() > 0)
     {
-        m_caster->DecreaseCastCounter();
-        SetExecutedCurrently(false);
-        return;
+        for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+            AddTriggeredSpell(*itr);
+    }
+
+    // Linked spells (not triggered)
+    linkedSet = sSpellMgr.GetSpellLinked(m_spellInfo->Id, SPELL_LINKED_TYPE_NOT_TRIGGERED);
+    if (linkedSet.size() > 0)
+    {
+        for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+            AddNotTriggeredSpell(*itr);
+    }
+
+    // traded items have trade slot instead of guid in m_itemTargetGUID
+    // set to real guid to be sent later to the client
+    m_targets.updateTradeSlotItem();
+
+    FillTargetMap();
+
+    SpellCastResult checkTargetResult = CheckCastTargets();
+
+    if (checkTargetResult != SPELL_CAST_OK)
+    {
+        SendCastResult(checkTargetResult);
+        finish(false);
+        m_caster->DecreaseCastCounter();
+        SetExecutedCurrently(false);
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::cast  spell %u caster %s cancelled by CheckCastTargets check (code %u)",
+             m_spellInfo->Id, m_caster ? m_caster->GetObjectGuid().GetString().c_str() : "<none>", checkTargetResult);
+        return;
+    }
+
+    if (m_caster->GetTypeId() == TYPEID_PLAYER)
+    {
+        if (!m_IsTriggeredSpell && m_CastItem)
+        {
+            ((Player*)m_caster)->GetAchievementMgr().StartTimedAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM, m_CastItem->GetEntry());
+            ((Player*)m_caster)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM, m_CastItem->GetEntry());
+        }
+
+        ((Player*)m_caster)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL, m_spellInfo->Id);
+    }
+
+    if (m_spellState == SPELL_STATE_FINISHED)                // stop cast if spell marked as finish somewhere in FillTargetMap
+    {
+        m_caster->DecreaseCastCounter();
+        SetExecutedCurrently(false);
+        return;
     }
 
     // CAST SPELL
@@ -3442,18 +3995,19 @@ void Spell::cast(bool skipCheck)
 
     TakePower();
     TakeReagents();                                         // we must remove reagents before HandleEffects to allow place crafted item in same slot
+    TakeAmmo();
 
     SendCastResult(castResult);
     SendSpellGo();                                          // we must send smsg_spell_go packet before m_castItem delete in TakeCastItem()...
 
     InitializeDamageMultipliers();
 
-    Unit *procTarget = m_targets.getUnitTarget();
+    Unit* procTarget = m_targets.getUnitTarget();
     if (!procTarget)
         procTarget = m_caster;
 
     // Okay, everything is prepared. Now we need to distinguish between immediate and evented delayed spells
-    if (m_spellInfo->speed > 0.0f)
+    if (m_spellInfo->GetSpeed() > 0.0f || GetDelayStart() > 0)
     {
 
         // Remove used for cast item if need (it can be already NULL after TakeReagents call
@@ -3473,14 +4027,24 @@ void Spell::cast(bool skipCheck)
         // critical hit related part is currently done on hit so proc there,
         // 0 damage since any damage based procs should be on hit
         // 0 victim proc since there is no victim proc dependent on successfull cast for caster
-        m_caster->ProcDamageAndSpell(procTarget, m_procAttacker, 0, PROC_EX_CAST_END, 0, m_attackType, m_spellInfo);
+        // if m_casttime > 0  proc already maked in prepare()
+        if (!GetCastTime())
+            m_caster->ProcDamageAndSpell(procTarget, m_procAttacker, PROC_FLAG_NONE, PROC_EX_CAST_END, 0, m_attackType, m_spellInfo);
     }
     else
     {
-        m_caster->ProcDamageAndSpell(procTarget, m_procAttacker, 0, PROC_EX_CAST_END, 0, m_attackType, m_spellInfo);
+        if (GetCastTime())
+        {
+            m_caster->ProcDamageAndSpell(procTarget, m_procAttacker, PROC_FLAG_NONE, PROC_EX_CAST_END, 0, m_attackType, m_spellInfo);
+            // Immediate spell, no big deal
+            handle_immediate();
+        }
+        else
+        {
+            handle_immediate();
+            m_caster->ProcDamageAndSpell(procTarget, m_procAttacker, PROC_FLAG_NONE, PROC_EX_CAST_END, 0, m_attackType, m_spellInfo);
+        }
 
-        // Immediate spell, no big deal
-        handle_immediate();
     }
 
     m_caster->DecreaseCastCounter();
@@ -3499,11 +4063,17 @@ void Spell::handle_immediate()
         SendChannelStart(m_duration);
     }
 
-    for(TargetList::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
-        DoAllEffectOnTarget(&(*ihit));
+    for(TargetList::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end();)
+    {
+        TargetInfo buffer = *ihit++;
+        DoAllEffectOnTarget(&buffer);
+    }
 
-    for(GOTargetList::iterator ihit = m_UniqueGOTargetInfo.begin(); ihit != m_UniqueGOTargetInfo.end(); ++ihit)
-        DoAllEffectOnTarget(&(*ihit));
+    for(GOTargetList::iterator ihit = m_UniqueGOTargetInfo.begin(); ihit != m_UniqueGOTargetInfo.end();)
+    {
+        GOTargetInfo buffer = *ihit++;
+        DoAllEffectOnTarget(&buffer);
+    }
 
     // spell is finished, perform some last features of the spell here
     _handle_finish_phase();
@@ -3511,7 +4081,7 @@ void Spell::handle_immediate()
     // Remove used for cast item if need (it can be already NULL after TakeReagents call
     TakeCastItem();
 
-    if(m_spellState != SPELL_STATE_CASTING)
+    if (m_spellState != SPELL_STATE_CASTING)
         finish(true);                                       // successfully finish spell cast (not last in case autorepeat or channel spell)
 }
 
@@ -3571,22 +4141,17 @@ void Spell::_handle_immediate_phase()
     // handle some immediate features of the spell here
     HandleThreatSpells();
 
-    m_needSpellLog = IsNeedSendToClient();
     for(int j = 0; j < MAX_EFFECT_INDEX; ++j)
     {
-        if(m_spellInfo->Effect[j] == 0)
+        if (m_spellInfo->Effect[j] == SPELL_EFFECT_NONE)
             continue;
 
         // apply Send Event effect to ground in case empty target lists
-        if( m_spellInfo->Effect[j] == SPELL_EFFECT_SEND_EVENT && !HaveTargetsForEffect(SpellEffectIndex(j)) )
+        if ( m_spellInfo->Effect[j] == SPELL_EFFECT_SEND_EVENT && !HaveTargetsForEffect(SpellEffectIndex(j)) )
         {
             HandleEffects(NULL, NULL, NULL, SpellEffectIndex(j));
             continue;
         }
-
-        // Don't do spell log, if is school damage spell
-        if(m_spellInfo->Effect[j] == SPELL_EFFECT_SCHOOL_DAMAGE || m_spellInfo->Effect[j] == 0)
-            m_needSpellLog = false;
     }
 
     // initialize Diminishing Returns Data
@@ -3595,13 +4160,16 @@ void Spell::_handle_immediate_phase()
 
     // process items
     for(ItemTargetList::iterator ihit = m_UniqueItemInfo.begin(); ihit != m_UniqueItemInfo.end(); ++ihit)
-        DoAllEffectOnTarget(&(*ihit));
+    {
+        ItemTargetInfo buffer = *ihit;
+        DoAllEffectOnTarget(&buffer);
+    }
 
     // process ground
     for(int j = 0; j < MAX_EFFECT_INDEX; ++j)
     {
         // persistent area auras target only the ground
-        if(m_spellInfo->Effect[j] == SPELL_EFFECT_PERSISTENT_AREA_AURA)
+        if (m_spellInfo->Effect[j] == SPELL_EFFECT_PERSISTENT_AREA_AURA)
             HandleEffects(NULL, NULL, NULL, SpellEffectIndex(j));
     }
 }
@@ -3609,30 +4177,28 @@ void Spell::_handle_immediate_phase()
 void Spell::_handle_finish_phase()
 {
     // spell log
-    if(m_needSpellLog)
+    if (IsNeedSendToClient())
         SendLogExecute();
 }
 
 void Spell::SendSpellCooldown()
 {
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
-        return;
-
-    Player* _player = (Player*)m_caster;
-
-    // mana/health/etc potions, disabled by client (until combat out as declarate)
-    if (m_CastItem && m_CastItem->IsPotion())
+    if (m_caster->GetTypeId() == TYPEID_PLAYER)
     {
-        // need in some way provided data for Spell::finish SendCooldownEvent
-        _player->SetLastPotionId(m_CastItem->GetEntry());
-        return;
+        // mana/health/etc potions, disabled by client (until combat out as declarate)
+        if (m_CastItem && m_CastItem->IsPotion())
+        {
+            // need in some way provided data for Spell::finish SendCooldownEvent
+            ((Player*)m_caster)->SetLastPotionId(m_CastItem->GetEntry());
+            return;
+        }
     }
 
     // (1) have infinity cooldown but set at aura apply, (2) passive cooldown at triggering
     if (m_spellInfo->HasAttribute(SPELL_ATTR_DISABLED_WHILE_ACTIVE) || m_spellInfo->HasAttribute(SPELL_ATTR_PASSIVE))
         return;
 
-    _player->AddSpellAndCategoryCooldowns(m_spellInfo, m_CastItem ? m_CastItem->GetEntry() : 0, this);
+    m_caster->AddSpellAndCategoryCooldowns(m_spellInfo, m_CastItem ? m_CastItem->GetEntry() : 0);
 }
 
 void Spell::update(uint32 difftime)
@@ -3646,53 +4212,90 @@ void Spell::update(uint32 difftime)
         return;
     }
 
-    // check if the player caster has moved before the spell finished
-    if ((m_caster->GetTypeId() == TYPEID_PLAYER && m_timer != 0) &&
+    // check if the player caster has moved before the spell finished (exclude casting on vehicles)
+    if (!m_caster->GetVehicle() && (m_caster->GetTypeId() == TYPEID_PLAYER && m_timer != 0) &&
         (m_castPositionX != m_caster->GetPositionX() || m_castPositionY != m_caster->GetPositionY() || m_castPositionZ != m_caster->GetPositionZ()) &&
         (m_spellInfo->Effect[EFFECT_INDEX_0] != SPELL_EFFECT_STUCK || !((Player*)m_caster)->m_movementInfo.HasMovementFlag(MOVEFLAG_FALLINGFAR)))
     {
         // always cancel for channeled spells
-        if( m_spellState == SPELL_STATE_CASTING )
+        if ( m_spellState == SPELL_STATE_CASTING )
             cancel();
         // don't cancel for melee, autorepeat, triggered and instant spells
         else if(!IsNextMeleeSwingSpell() && !IsAutoRepeat() && !m_IsTriggeredSpell && (m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_MOVEMENT))
             cancel();
     }
 
+
     switch(m_spellState)
     {
         case SPELL_STATE_PREPARING:
         {
-            if(m_timer)
+            if (m_timer)
             {
-                if(difftime >= m_timer)
+                if (m_targets.getUnitTarget() && m_targets.getUnitTarget()->isAlive() && !m_targets.getUnitTarget()->isVisibleForOrDetect(m_caster, m_caster, false) && !m_IsTriggeredSpell )
+                    cancel();
+
+                if (difftime >= m_timer)
                     m_timer = 0;
                 else
                     m_timer -= difftime;
             }
 
-            if(m_timer == 0 && !IsNextMeleeSwingSpell() && !IsAutoRepeat())
+            if (m_timer == 0 && !IsNextMeleeSwingSpell() && !IsAutoRepeat())
                 cast();
         } break;
         case SPELL_STATE_CASTING:
         {
-            if(m_timer > 0)
+            if (m_timer > 0)
             {
-                if( m_caster->GetTypeId() == TYPEID_PLAYER )
+                if ( m_caster->GetTypeId() == TYPEID_PLAYER )
                 {
                     // check if player has jumped before the channeling finished
                     if(((Player*)m_caster)->m_movementInfo.HasMovementFlag(MOVEFLAG_FALLING))
                         cancel();
 
                     // check for incapacitating player states
-                    if( m_caster->hasUnitState(UNIT_STAT_CAN_NOT_REACT))
+                    if ( m_caster->hasUnitState(UNIT_STAT_CAN_NOT_REACT))
                         cancel();
 
                     // check if player has turned if flag is set
-                    if( m_spellInfo->ChannelInterruptFlags & CHANNEL_FLAG_TURNING && m_castOrientation != m_caster->GetOrientation() )
+                    if ((m_spellInfo->ChannelInterruptFlags & CHANNEL_FLAG_TURNING) && m_castOrientation != m_caster->GetOrientation())
                         cancel();
                 }
 
+                // check if all targets away range
+                if (!m_IsTriggeredSpell && (difftime >= m_timer))
+                {
+                    SpellCastResult result = CheckRangeForChanneledSpells();
+                    bool checkFailed = false;
+                    switch (result)
+                    {
+                        case SPELL_CAST_OK:
+                            break;
+                        case SPELL_FAILED_TOO_CLOSE:
+                        case SPELL_FAILED_UNIT_NOT_INFRONT:
+                            if (m_spellInfo->HasAttribute(SPELL_ATTR_EX7_HAS_CHARGE_EFFECT))
+                                break;
+                            checkFailed = true;
+                            break;
+                        case SPELL_FAILED_OUT_OF_RANGE:
+                        default:
+                            checkFailed = true;
+                            break;
+                    }
+
+                    if (checkFailed)
+                    {
+                        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::update  spell %u caster %s  target %s cancelled by CheckRange wile cast process continued (code %u)",
+                            m_spellInfo->Id, m_caster ? m_caster->GetObjectGuid().GetString().c_str() : "<none>",
+                            m_targets.getUnitTarget() ? m_targets.getUnitTarget()->GetObjectGuid().GetString().c_str() : "<none>",
+                            result);
+                        SendCastResult(result);
+                        cancel(true);
+                        return;
+                    }
+                }
+
                 // check if there are alive targets left
                 if (!IsAliveUnitPresentInTargetList())
                 {
@@ -3700,20 +4303,20 @@ void Spell::update(uint32 difftime)
                     finish();
                 }
 
-                if(difftime >= m_timer)
+                if (difftime >= m_timer)
                     m_timer = 0;
                 else
                     m_timer -= difftime;
             }
 
-            if(m_timer == 0)
+            if (m_timer == 0)
             {
                 SendChannelUpdate(0);
 
                 // channeled spell processed independently for quest targeting
                 // cast at creature (or GO) quest objectives update at successful cast channel finished
                 // ignore autorepeat/melee casts for speed (not exist quest for spells (hm... )
-                if( !IsAutoRepeat() && !IsNextMeleeSwingSpell() )
+                if ( !IsAutoRepeat() && !IsNextMeleeSwingSpell() )
                 {
                     if ( Player* p = m_caster->GetCharmerOrOwnerPlayerOrPlayerItself() )
                     {
@@ -3767,26 +4370,29 @@ void Spell::finish(bool ok)
         return;
 
     // handle SPELL_AURA_ADD_TARGET_TRIGGER auras
-    Unit::AuraList const& targetTriggers = m_caster->GetAurasByType(SPELL_AURA_ADD_TARGET_TRIGGER);
-    for(Unit::AuraList::const_iterator i = targetTriggers.begin(); i != targetTriggers.end(); ++i)
+    if (Unit* caster = GetAffectiveCaster())
     {
-        if (!(*i)->isAffectedOnSpell(m_spellInfo))
-            continue;
-        for(TargetList::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
+        Unit::AuraList const& targetTriggers = caster->GetAurasByType(SPELL_AURA_ADD_TARGET_TRIGGER);
+        for(Unit::AuraList::const_iterator i = targetTriggers.begin(); i != targetTriggers.end(); ++i)
         {
-            if (ihit->missCondition == SPELL_MISS_NONE)
+            if (!(*i)->isAffectedOnSpell(m_spellInfo))
+                continue;
+            for(TargetList::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
             {
-                // check m_caster->GetGUID() let load auras at login and speedup most often case
-                Unit *unit = m_caster->GetObjectGuid() == ihit->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, ihit->targetGUID);
-                if (unit && unit->isAlive())
+                if (ihit->missCondition == SPELL_MISS_NONE)
                 {
-                    SpellEntry const *auraSpellInfo = (*i)->GetSpellProto();
-                    SpellEffectIndex auraSpellIdx = (*i)->GetEffIndex();
-                    // Calculate chance at that moment (can be depend for example from combo points)
-                    int32 auraBasePoints = (*i)->GetBasePoints();
-                    int32 chance = m_caster->CalculateSpellDamage(unit, auraSpellInfo, auraSpellIdx, &auraBasePoints);
-                    if(roll_chance_i(chance))
-                        m_caster->CastSpell(unit, auraSpellInfo->EffectTriggerSpell[auraSpellIdx], true, NULL, (*i));
+                    // check caster->GetObjectGuid() let load auras at login and speedup most often case
+                    Unit* unit = caster->GetObjectGuid() == ihit->targetGUID ? caster : ObjectAccessor::GetUnit(*m_caster, ihit->targetGUID);
+                    if (unit && unit->isAlive())
+                    {
+                        SpellEntry const* auraSpellInfo = (*i)->GetSpellProto();
+                        SpellEffectIndex auraSpellIdx = (*i)->GetEffIndex();
+                        // Calculate chance at that moment (can be depend for example from combo points)
+                        int32 auraBasePoints = (*i)->GetBasePoints();
+                        int32 chance = caster->CalculateSpellDamage(unit, auraSpellInfo, auraSpellIdx, &auraBasePoints);
+                        if (roll_chance_i(chance))
+                            caster->CastSpell(unit, auraSpellInfo->EffectTriggerSpell[auraSpellIdx], true, NULL, (*i)());
+                    }
                 }
             }
         }
@@ -3803,7 +4409,7 @@ void Spell::finish(bool ok)
     if (IsMeleeAttackResetSpell())
     {
         m_caster->resetAttackTimer(BASE_ATTACK);
-        if(m_caster->haveOffhandWeapon())
+        if (m_caster->haveOffhandWeapon())
             m_caster->resetAttackTimer(OFF_ATTACK);
     }
 
@@ -3811,7 +4417,7 @@ void Spell::finish(bool ok)
         m_caster->resetAttackTimer(RANGED_ATTACK);*/
 
     // Clear combo at finish state
-    if(m_caster->GetTypeId() == TYPEID_PLAYER && NeedsComboPoints(m_spellInfo))
+    if (NeedsComboPoints(m_spellInfo))
     {
         // Not drop combopoints if negative spell and if any miss on enemy exist
         bool needDrop = true;
@@ -3827,7 +4433,7 @@ void Spell::finish(bool ok)
             }
         }
         if (needDrop)
-            ((Player*)m_caster)->ClearComboPoints();
+            m_caster->ClearComboPoints();
     }
 
     // potions disabled by client, send event "not in combat" if need
@@ -3835,22 +4441,34 @@ void Spell::finish(bool ok)
         ((Player*)m_caster)->UpdatePotionCooldown(this);
 
     // call triggered spell only at successful cast (after clear combo points -> for add some if need)
-    if(!m_TriggerSpells.empty())
+    if (!m_TriggerSpells.empty())
         CastTriggerSpells();
 
+    // call not triggered spell only at successful cast
+    if (!m_NotTriggerSpells.empty())
+        CastNotTriggerSpells();
+
     // Stop Attack for some spells
     if (m_spellInfo->HasAttribute(SPELL_ATTR_STOP_ATTACK_TARGET))
         m_caster->AttackStop();
 
+    // Playerbot mob
+    if (!m_caster->GetMapId())
+        return;
+    // end of playerbot mod
+
     // update encounter state if needed
-    Map *map = m_caster->GetMap();
-    if (map->IsDungeon())
-        ((DungeonMap*)map)->GetPersistanceState()->UpdateEncounterState(ENCOUNTER_CREDIT_CAST_SPELL, m_spellInfo->Id);
+    Map* map = m_caster->GetMap();
+    if (map && map->IsDungeon())
+    {
+        if (DungeonPersistentState* state = ((DungeonMap*)map)->GetPersistanceState())
+            state->UpdateEncounterState(ENCOUNTER_CREDIT_CAST_SPELL, m_spellInfo->Id);
+    }
 }
 
 void Spell::SendCastResult(SpellCastResult result)
 {
-    if(result == SPELL_CAST_OK)
+    if (result == SPELL_CAST_OK)
         return;
 
     if (m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -3862,15 +4480,15 @@ void Spell::SendCastResult(SpellCastResult result)
     SendCastResult((Player*)m_caster, m_spellInfo, m_cast_count, result);
 }
 
-void Spell::SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 cast_count, SpellCastResult result)
+void Spell::SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 cast_count, SpellCastResult result, bool isPetCastResult /*=false*/)
 {
-    if(result == SPELL_CAST_OK)
+    if (result == SPELL_CAST_OK)
         return;
 
-    WorldPacket data(SMSG_CAST_FAILED, (4+1+1));
+    WorldPacket data(isPetCastResult ? SMSG_PET_CAST_FAILED : SMSG_CAST_FAILED, (4 + 1 + 2));
     data << uint8(cast_count);                              // single cast or multi 2.3 (0/1)
     data << uint32(spellInfo->Id);
-    data << uint8(result);                                  // problem
+    data << uint8(!IsPassiveSpell(spellInfo) ? result : SPELL_FAILED_DONT_REPORT); // do not report failed passive spells
     switch (result)
     {
         case SPELL_FAILED_NOT_READY:
@@ -3925,7 +4543,11 @@ void Spell::SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 ca
             data << uint32(spellInfo->EquippedItemSubClassMask);// seems correct...
             break;
         case SPELL_FAILED_REAGENTS:
-            data << uint32(0);                              // item id
+            // normally client checks reagents, just some script effects here
+            if (spellInfo->Id == 46584)                      // Raise Dead
+                data << uint32(37201);                      // Corpse Dust
+            else
+                data << uint32(0);                              // item id
             break;
         case SPELL_FAILED_NEED_MORE_ITEMS:
             data << uint32(0);                              // item id
@@ -3961,11 +4583,13 @@ void Spell::SendSpellStart()
     if (m_spellInfo->runeCostID)
         castFlags |= CAST_FLAG_UNKNOWN19;
 
-    WorldPacket data(SMSG_SPELL_START, (8+8+4+4+2));
+    Unit *caster = m_triggeredByAuraSpell && IsChanneledSpell(m_triggeredByAuraSpell) ? GetAffectiveCaster() : m_caster;
+
+    WorldPacket data(SMSG_SPELL_START, 9 + caster->GetPackGUID().size() + 1 + 4 + 4 + 4 + 4 + 1 + 1 + 9 + 4 + 4 + 4);
     if (m_CastItem)
         data << m_CastItem->GetPackGUID();
     else
-        data << m_caster->GetPackGUID();
+        data << caster->GetPackGUID();
 
     data << m_caster->GetPackGUID();
     data << uint8(m_cast_count);                            // pending spell cast
@@ -3987,7 +4611,7 @@ void Spell::SendSpellStart()
         for(uint8 i = 0; i < MAX_RUNES; ++i)
         {
             uint8 m = (1 << i);
-            if(m & v1)                                      // usable before...
+            if (m & v1)                                      // usable before...
                 if(!(m & v2))                               // ...but on cooldown now...
                     data << uint8(0);                       // some unknown byte (time?)
         }
@@ -4024,14 +4648,25 @@ void Spell::SendSpellGo()
         castFlags |= CAST_FLAG_PREDICTED_RUNES;             // rune cooldowns list
     }
 
+    if ((m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) && (m_targets.GetSpeed() > M_NULL_F || m_targets.GetElevation() > M_NULL_F))
+        castFlags |= CAST_FLAG_ADJUST_MISSILE;             // spell has trajectory (guess parameters)
+
+    Unit *caster = m_triggeredByAuraSpell && IsChanneledSpell(m_triggeredByAuraSpell) ? GetAffectiveCaster() : m_caster;
+
+    if (!caster)
+        caster = m_caster;                                  // temporary. TODO - need find source of problem.
+
+    if (m_powerCost)
+        castFlags |= CAST_FLAG_PREDICTED_POWER;             // all powerCost spells have this
+
     WorldPacket data(SMSG_SPELL_GO, 50);                    // guess size
 
     if (m_CastItem)
         data << m_CastItem->GetPackGUID();
     else
-        data << m_caster->GetPackGUID();
+        data << caster->GetPackGUID();
 
-    data << m_caster->GetPackGUID();
+    data << caster->GetPackGUID();
     data << uint8(m_cast_count);                            // pending spell cast?
     data << uint32(m_spellInfo->Id);                        // spellId
     data << uint32(castFlags);                              // cast flags
@@ -4042,7 +4677,7 @@ void Spell::SendSpellGo()
     data << m_targets;
 
     if (castFlags & CAST_FLAG_PREDICTED_POWER)              // predicted power
-        data << uint32(0);
+        data << uint32(m_caster->GetPower((Powers)m_spellInfo->powerType));
 
     if (castFlags & CAST_FLAG_PREDICTED_RUNES)              // predicted runes
     {
@@ -4053,7 +4688,7 @@ void Spell::SendSpellGo()
         for(uint8 i = 0; i < MAX_RUNES; ++i)
         {
             uint8 m = (1 << i);
-            if(m & v1)                                      // usable before...
+            if (m & v1)                                      // usable before...
                 if(!(m & v2))                               // ...but on cooldown now...
                     data << uint8(0);                       // some unknown byte (time?)
         }
@@ -4061,8 +4696,8 @@ void Spell::SendSpellGo()
 
     if (castFlags & CAST_FLAG_ADJUST_MISSILE)               // adjust missile trajectory duration
     {
-        data << float(0);
-        data << uint32(0);
+        data << float(m_targets.GetElevation());            // Elevation of missile
+        data << uint32(m_delayMoment);                      // Calculated trajectory delay time.
     }
 
     if (castFlags & CAST_FLAG_AMMO)                         // projectile info
@@ -4091,6 +4726,16 @@ void Spell::SendSpellGo()
     }
 
     m_caster->SendMessageToSet(&data, true);
+
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST,"Spell::SendSpellGo: %s cast spell %u on %s, targets count (mask %u) " SIZEFMTD " " SIZEFMTD " " SIZEFMTD,
+                m_caster->GetObjectGuid().GetString().c_str(),
+                m_spellInfo->Id,
+                m_targets.getUnitTarget() ? m_targets.getUnitTarget()->GetObjectGuid().GetString().c_str() : "<none>",
+                m_targets.m_targetMask,
+                m_UniqueTargetInfo.size(),
+                m_UniqueGOTargetInfo.size(),
+                m_UniqueItemInfo.size()
+                );
 }
 
 void Spell::WriteAmmoToPacket(WorldPacket* data)
@@ -4101,24 +4746,24 @@ void Spell::WriteAmmoToPacket(WorldPacket* data)
     if (m_caster->GetTypeId() == TYPEID_PLAYER)
     {
         Item *pItem = ((Player*)m_caster)->GetWeaponForAttack( RANGED_ATTACK );
-        if(pItem)
+        if (pItem)
         {
             ammoInventoryType = pItem->GetProto()->InventoryType;
-            if( ammoInventoryType == INVTYPE_THROWN )
+            if ( ammoInventoryType == INVTYPE_THROWN )
                 ammoDisplayID = pItem->GetProto()->DisplayInfoID;
             else
             {
                 uint32 ammoID = ((Player*)m_caster)->GetUInt32Value(PLAYER_AMMO_ID);
-                if(ammoID)
+                if (ammoID)
                 {
                     ItemPrototype const *pProto = ObjectMgr::GetItemPrototype( ammoID );
-                    if(pProto)
+                    if (pProto)
                     {
                         ammoDisplayID = pProto->DisplayInfoID;
                         ammoInventoryType = pProto->InventoryType;
                     }
                 }
-                else if(m_caster->GetDummyAura(46699))      // Requires No Ammo
+                else if (m_caster->GetDummyAura(46699))      // Requires No Ammo
                 {
                     ammoDisplayID = 5996;                   // normal arrow
                     ammoInventoryType = INVTYPE_AMMO;
@@ -4130,11 +4775,11 @@ void Spell::WriteAmmoToPacket(WorldPacket* data)
     {
         for (uint8 i = 0; i < MAX_VIRTUAL_ITEM_SLOT; ++i)
         {
-            if(uint32 item_id = m_caster->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i))
+            if (uint32 item_id = m_caster->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i))
             {
-                if(ItemEntry const * itemEntry = sItemStore.LookupEntry(item_id))
+                if (ItemEntry const * itemEntry = sItemStore.LookupEntry(item_id))
                 {
-                    if(itemEntry->Class == ITEM_CLASS_WEAPON)
+                    if (itemEntry->Class == ITEM_CLASS_WEAPON)
                     {
                         switch(itemEntry->SubClass)
                         {
@@ -4216,123 +4861,145 @@ void Spell::WriteSpellGoTargets(WorldPacket* data)
 
 void Spell::SendLogExecute()
 {
+    uint32 count1 = 0;
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        if (!m_effectExecuteData[i].empty())
+            ++count1;
+    }
+
+    if (!count1)
+        return;
+
     Unit *target = m_targets.getUnitTarget() ? m_targets.getUnitTarget() : m_caster;
 
-    WorldPacket data(SMSG_SPELLLOGEXECUTE, (8+4+4+4+4+8));
+    WorldPacket data(SMSG_SPELLLOGEXECUTE, 9 + 4 + 4 + 4 + 4 + 8);
 
-    if(m_caster->GetTypeId() == TYPEID_PLAYER)
+    if (m_caster->GetTypeId() == TYPEID_PLAYER)
         data << m_caster->GetPackGUID();
     else
         data << target->GetPackGUID();
 
     data << uint32(m_spellInfo->Id);
-    uint32 count1 = 1;
-    data << uint32(count1);                                 // count1 (effect count?)
-    for(uint32 i = 0; i < count1; ++i)
+    data << uint32(count1);                                 // count1 (effects count)
+
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::SendLogExecute() sended spelllog to %s (spell %u, effects count %u)", m_caster->GetObjectGuid().GetString().c_str(), m_spellInfo->Id, count1);
+
+    for (uint32 i = 0; i < count1; ++i)
+    {
+        if (m_effectExecuteData[i].empty())
+            continue;
+
+        data << uint32(m_spellInfo->Effect[i]);             // spell effect
+        data.append(m_effectExecuteData[i]);
+
+        m_effectExecuteData[i].clear();
+    }
+    m_caster->SendMessageToSet(&data, true);
+}
+
+void Spell::SendEffectLogExecute(SpellEffectIndex eff, ObjectGuid targetGuid, uint32 data1, uint32 data2, float data3)
+{
+    if (eff >= MAX_EFFECT_INDEX || m_spellInfo->Effect[eff] == SPELL_EFFECT_NONE)
+        return;
+
+    ByteBuffer& data = m_effectExecuteData[eff];
+    bool isFirst = data.empty();
+
+    switch(m_spellInfo->Effect[eff])
     {
-        data << uint32(m_spellInfo->Effect[EFFECT_INDEX_0]);// spell effect
-        uint32 count2 = 1;
-        data << uint32(count2);                             // count2 (target count?)
-        for(uint32 j = 0; j < count2; ++j)
+        // target guid and some data logged
+        case SPELL_EFFECT_POWER_DRAIN:
         {
-            switch(m_spellInfo->Effect[EFFECT_INDEX_0])
-            {
-                case SPELL_EFFECT_POWER_DRAIN:
-                    if(Unit *unit = m_targets.getUnitTarget())
-                        data << unit->GetPackGUID();
-                    else
-                        data << uint8(0);
-                    data << uint32(0);
-                    data << uint32(0);
-                    data << float(0);
-                    break;
-                case SPELL_EFFECT_ADD_EXTRA_ATTACKS:
-                    if(Unit *unit = m_targets.getUnitTarget())
-                        data << unit->GetPackGUID();
-                    else
-                        data << uint8(0);
-                    data << uint32(0);                      // count?
-                    break;
-                case SPELL_EFFECT_INTERRUPT_CAST:
-                    if(Unit *unit = m_targets.getUnitTarget())
-                        data << unit->GetPackGUID();
-                    else
-                        data << uint8(0);
-                    data << uint32(0);                      // spellid
-                    break;
-                case SPELL_EFFECT_DURABILITY_DAMAGE:
-                    if(Unit *unit = m_targets.getUnitTarget())
-                        data << unit->GetPackGUID();
-                    else
-                        data << uint8(0);
-                    data << uint32(0);
-                    data << uint32(0);
-                    break;
-                case SPELL_EFFECT_OPEN_LOCK:
-                    if(Item *item = m_targets.getItemTarget())
-                        data << item->GetPackGUID();
-                    else
-                        data << uint8(0);
-                    break;
-                case SPELL_EFFECT_CREATE_ITEM:
-                case SPELL_EFFECT_CREATE_ITEM_2:
-                    data << uint32(m_spellInfo->EffectItemType[EFFECT_INDEX_0]);
-                    break;
-                case SPELL_EFFECT_SUMMON:
-                case SPELL_EFFECT_TRANS_DOOR:
-                case SPELL_EFFECT_SUMMON_PET:
-                case SPELL_EFFECT_SUMMON_OBJECT_WILD:
-                case SPELL_EFFECT_CREATE_HOUSE:
-                case SPELL_EFFECT_DUEL:
-                case SPELL_EFFECT_SUMMON_OBJECT_SLOT1:
-                case SPELL_EFFECT_SUMMON_OBJECT_SLOT2:
-                case SPELL_EFFECT_SUMMON_OBJECT_SLOT3:
-                case SPELL_EFFECT_SUMMON_OBJECT_SLOT4:
-                    if (Unit *unit = m_targets.getUnitTarget())
-                        data << unit->GetPackGUID();
-                    else if (m_targets.getItemTargetGuid())
-                        data << m_targets.getItemTargetGuid().WriteAsPacked();
-                    else if (GameObject *go = m_targets.getGOTarget())
-                        data << go->GetPackGUID();
-                    else
-                        data << uint8(0);                   // guid
-                    break;
-                case SPELL_EFFECT_FEED_PET:
-                    data << uint32(m_targets.getItemTargetEntry());
-                    break;
-                case SPELL_EFFECT_DISMISS_PET:
-                    if(Unit *unit = m_targets.getUnitTarget())
-                        data << unit->GetPackGUID();
-                    else
-                        data << uint8(0);
-                    break;
-                case SPELL_EFFECT_RESURRECT:
-                case SPELL_EFFECT_RESURRECT_NEW:
-                    if(Unit *unit = m_targets.getUnitTarget())
-                        data << unit->GetPackGUID();
-                    else
-                        data << uint8(0);
-                    break;
-                default:
-                    return;
-            }
+            // reserve one uint32 for counter, if need
+            if (isFirst)
+                data << uint32(0);
+            data << targetGuid.WriteAsPacked();
+            data << data1;
+            data << data2;
+            data << data3;
+            break;
+        }
+        // target guid and some data logged
+        case SPELL_EFFECT_DURABILITY_DAMAGE:
+        {
+            // reserve one uint32 for counter, if need
+            if (isFirst)
+                data << uint32(0);
+            data << targetGuid.WriteAsPacked();
+            data << data1;
+            data << data2;
+            break;
+        }
+        // target guid and some data logged
+        case SPELL_EFFECT_ADD_EXTRA_ATTACKS:
+        case SPELL_EFFECT_INTERRUPT_CAST:
+        {
+            // reserve one uint32 for counter, if need
+            if (isFirst)
+                data << uint32(0);
+            data << targetGuid.WriteAsPacked();
+            data << data1;
+            break;
+        }
+        // only entry of item used/created
+        case SPELL_EFFECT_CREATE_ITEM:
+        case SPELL_EFFECT_CREATE_ITEM_2:
+        case SPELL_EFFECT_FEED_PET:
+        {
+            // reserve one uint32 for counter, if need
+            if (isFirst)
+                data << uint32(0);
+            data <<    data1;
+            break;
+        }
+        // only ObjectGuid of target logged
+        case SPELL_EFFECT_OPEN_LOCK:
+        case SPELL_EFFECT_SUMMON:
+        case SPELL_EFFECT_TRANS_DOOR:
+        case SPELL_EFFECT_SUMMON_PET:
+        case SPELL_EFFECT_SUMMON_OBJECT_WILD:
+        case SPELL_EFFECT_CREATE_HOUSE:
+        case SPELL_EFFECT_DUEL:
+        case SPELL_EFFECT_SUMMON_OBJECT_SLOT1:
+        case SPELL_EFFECT_SUMMON_OBJECT_SLOT2:
+        case SPELL_EFFECT_SUMMON_OBJECT_SLOT3:
+        case SPELL_EFFECT_SUMMON_OBJECT_SLOT4:
+        case SPELL_EFFECT_DISMISS_PET:
+        case SPELL_EFFECT_RESURRECT:
+        case SPELL_EFFECT_RESURRECT_NEW:
+        {
+            // reserve one uint32 for counter, if need
+            if (isFirst)
+                data << uint32(0);
+            data << targetGuid.WriteAsPacked();
+            break;
+        }
+        // nothing logged, no log data for effect
+        default:
+        {
+            // nothing need
+            return;
         }
     }
-
-    m_caster->SendMessageToSet(&data, true);
+    uint32 count = m_effectExecuteData[eff].read<uint32>(0);
+    m_effectExecuteData[eff].put<uint32>(0, ++count);
 }
 
 void Spell::SendInterrupted(uint8 result)
 {
-    WorldPacket data(SMSG_SPELL_FAILURE, (8+4+1));
+    if (!m_caster || !m_caster->IsInWorld())
+        return;
+
+    WorldPacket data(SMSG_SPELL_FAILURE, m_caster->GetPackGUID().size() + 1 + 4 + 1);
     data << m_caster->GetPackGUID();
     data << uint8(m_cast_count);
     data << uint32(m_spellInfo->Id);
     data << uint8(result);
     m_caster->SendMessageToSet(&data, true);
 
-    data.Initialize(SMSG_SPELL_FAILED_OTHER, (8+4));
-    data << m_caster->GetPackGUID();
+    data.Initialize(SMSG_SPELL_FAILED_OTHER, 8 + 1 + 4 + 1);
+    data << m_caster->GetObjectGuid();
     data << uint8(m_cast_count);
     data << uint32(m_spellInfo->Id);
     data << uint8(result);
@@ -4341,8 +5008,42 @@ void Spell::SendInterrupted(uint8 result)
 
 void Spell::SendChannelUpdate(uint32 time)
 {
-    if(time == 0)
+    if (time == 0)
     {
+        // Temp solution (ha-a-ack...) from cmangos - need rewrite to UnitStates
+        // Reset farsight for some possessing auras of possessed summoned (as they might work with different aura types)
+        if (m_spellInfo->HasAttribute(SPELL_ATTR_EX_FARSIGHT) && m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->GetCharmGuid()
+                && !IsSpellHaveAura(m_spellInfo, SPELL_AURA_MOD_POSSESS) && !IsSpellHaveAura(m_spellInfo, SPELL_AURA_MOD_POSSESS_PET))
+        {
+            Player* player = (Player*)m_caster;
+            // These Auras are applied to self, so get the possessed first
+            Unit* possessed = player->GetCharm();
+
+            player->SetCharm(NULL);
+            if (possessed)
+                player->SetClientControl(possessed, 0);
+            player->SetMover(NULL);
+            player->SetViewPoint(NULL);
+            player->RemovePetActionBar();
+
+            if (possessed)
+            {
+                possessed->clearUnitState(UNIT_STAT_CONTROLLED);
+                possessed->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED);
+                possessed->SetCharmerGuid(ObjectGuid());
+                // TODO - Requires more specials for target?
+
+                // Some possessed might want to despawn?
+                if (possessed->GetUInt32Value(UNIT_CREATED_BY_SPELL) == m_spellInfo->Id && possessed->GetTypeId() == TYPEID_UNIT)
+                    ((Creature*)possessed)->ForcedDespawn();
+            }
+        }
+        else if (m_spellInfo->HasAttribute(SPELL_ATTR_EX_FARSIGHT) && m_caster->GetTypeId() == TYPEID_PLAYER)
+        {
+            if (/*DynamicObject* dynObj = */m_caster->GetDynObject(m_triggeredByAuraSpell ? m_triggeredByAuraSpell->Id : m_spellInfo->Id))
+                ((Player*)m_caster)->SetViewPoint(NULL);
+        }
+
         m_caster->RemoveAurasByCasterSpell(m_spellInfo->Id, m_caster->GetObjectGuid());
 
         ObjectGuid target_guid = m_caster->GetChannelObjectGuid();
@@ -4358,7 +5059,7 @@ void Spell::SendChannelUpdate(uint32 time)
         m_caster->SetUInt32Value(UNIT_CHANNEL_SPELL, 0);
     }
 
-    WorldPacket data( MSG_CHANNEL_UPDATE, 8+4 );
+    WorldPacket data(MSG_CHANNEL_UPDATE, m_caster->GetPackGUID().size() + 4);
     data << m_caster->GetPackGUID();
     data << uint32(time);
     m_caster->SendMessageToSet(&data, true);
@@ -4396,7 +5097,7 @@ void Spell::SendChannelStart(uint32 duration)
         }
     }
 
-    WorldPacket data( MSG_CHANNEL_START, (8+4+4) );
+    WorldPacket data(MSG_CHANNEL_START, m_caster->GetPackGUID().size() + 4 + 4);
     data << m_caster->GetPackGUID();
     data << uint32(m_spellInfo->Id);
     data << uint32(duration);
@@ -4412,40 +5113,32 @@ void Spell::SendChannelStart(uint32 duration)
 
 void Spell::SendResurrectRequest(Player* target)
 {
-    // Both players and NPCs can resurrect using spells - have a look at creature 28487 for example
-    // However, the packet structure differs slightly
+    // get ressurector name for creature resurrections, otherwise packet will be not accepted
+    // for player resurrections the name is looked up by guid
+    char const* resurrectorName = m_caster->GetTypeId() == TYPEID_PLAYER ? "" : m_caster->GetNameForLocaleIdx(target->GetSession()->GetSessionDbLocaleIndex());
 
-    const char* sentName = m_caster->GetTypeId() == TYPEID_PLAYER ? "" : m_caster->GetNameForLocaleIdx(target->GetSession()->GetSessionDbLocaleIndex());
-
-    WorldPacket data(SMSG_RESURRECT_REQUEST, (8+4+strlen(sentName)+1+1+1));
+    WorldPacket data(SMSG_RESURRECT_REQUEST, (8+4+strlen(resurrectorName)+1+1+1+4));
+    // resurrector guid
     data << m_caster->GetObjectGuid();
-    data << uint32(strlen(sentName) + 1);
-
-    data << sentName;
+    data << uint32(strlen(resurrectorName) + 1);
+    data << resurrectorName;
+    // null terminator
     data << uint8(0);
+    data << uint8(m_caster->GetTypeId() == TYPEID_PLAYER ? 0 : 1); // "you'll be afflicted with resurrection sickness"
+    // override delay sent with SMSG_CORPSE_RECLAIM_DELAY, set instant resurrection for spells with this attribute
+    if (m_spellInfo->HasAttribute(SPELL_ATTR_EX3_IGNORE_RESURRECTION_TIMER))
+        data << uint32(0);
 
-    data << uint8(m_caster->GetTypeId() == TYPEID_PLAYER ? 0 : 1);
     target->GetSession()->SendPacket(&data);
 }
 
-void Spell::SendPlaySpellVisual(uint32 SpellID)
-{
-    if (m_caster->GetTypeId() != TYPEID_PLAYER)
-        return;
-
-    WorldPacket data(SMSG_PLAY_SPELL_VISUAL, 8 + 4);
-    data << m_caster->GetObjectGuid();
-    data << uint32(SpellID);                                // spell visual id?
-    ((Player*)m_caster)->GetSession()->SendPacket(&data);
-}
-
 void Spell::TakeCastItem()
 {
     if(!m_CastItem || m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
 
     // not remove cast item at triggered spell (equipping, weapon damage, etc)
-    if(m_IsTriggeredSpell && !(m_targets.m_targetMask & TARGET_FLAG_TRADE_ITEM))
+    if (m_IsTriggeredSpell && !(m_targets.m_targetMask & TARGET_FLAG_TRADE_ITEM))
         return;
 
     ItemPrototype const *proto = m_CastItem->GetProto();
@@ -4500,45 +5193,67 @@ void Spell::TakeCastItem()
 
 void Spell::TakePower()
 {
-    if(m_CastItem || m_triggeredByAuraSpell)
+    if (m_CastItem || m_triggeredByAuraSpell)
         return;
 
     // health as power used
-    if(m_spellInfo->powerType == POWER_HEALTH)
+    if (m_spellInfo->GetPowerType() == POWER_HEALTH)
     {
         m_caster->ModifyHealth( -(int32)m_powerCost );
         return;
     }
 
-    if(m_spellInfo->powerType >= MAX_POWERS)
+    if (m_spellInfo->GetPowerType() >= MAX_POWERS)
     {
-        sLog.outError("Spell::TakePower: Unknown power type '%d'", m_spellInfo->powerType);
+        sLog.outError("Spell::TakePower: Unknown power type '%d'", m_spellInfo->GetPowerType());
         return;
     }
 
-    Powers powerType = Powers(m_spellInfo->powerType);
+    Powers powerType = Powers(m_spellInfo->GetPowerType());
 
-    if(powerType == POWER_RUNE)
+    if (powerType == POWER_RUNE)
     {
         CheckOrTakeRunePower(true);
         return;
     }
 
+    bool needApplyMod = false;
+    for (TargetList::const_iterator itr = m_UniqueTargetInfo.begin(); itr != m_UniqueTargetInfo.end(); ++itr)
+    {
+        if (itr->missCondition != SPELL_MISS_NONE)
+        {
+            needApplyMod = true;
+            break;
+        }
+    }
+
+    if (needApplyMod)
+        if (Player* modOwner = m_caster->GetSpellModOwner())
+            modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_COST_ON_HIT_FAIL, m_powerCost);
+
     m_caster->ModifyPower(powerType, -(int32)m_powerCost);
 
     // Set the five second timer
     if (powerType == POWER_MANA && m_powerCost > 0)
-        m_caster->SetLastManaUse();
+    {
+        uint32 delay = 0;
+        if (m_caster->GetCharmInfo())
+            delay = m_caster->GetCharmInfo()->GetGlobalCooldownMgr().GetGlobalCooldown(m_spellInfo);
+        else if (m_caster->GetTypeId() == TYPEID_PLAYER)
+            delay = ((Player*)m_caster)->GetGlobalCooldownMgr().HasGlobalCooldown(m_spellInfo);
+
+        m_caster->AddEvent(new ManaUseEvent(*m_caster), delay);
+    }
 }
 
 SpellCastResult Spell::CheckOrTakeRunePower(bool take)
 {
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return SPELL_CAST_OK;
 
     Player *plr = (Player*)m_caster;
 
-    if(plr->getClass() != CLASS_DEATH_KNIGHT)
+    if (plr->getClass() != CLASS_DEATH_KNIGHT)
         return SPELL_CAST_OK;
 
     SpellRuneCostEntry const *src = sSpellRuneCostStore.LookupEntry(m_spellInfo->runeCostID);
@@ -4546,7 +5261,7 @@ SpellCastResult Spell::CheckOrTakeRunePower(bool take)
     if(!src)
         return SPELL_CAST_OK;
 
-    if(src->NoRuneCost() && (!take || src->NoRunicPowerGain()))
+    if (src->NoRuneCost() && (!take || src->NoRunicPowerGain()))
         return SPELL_CAST_OK;
 
     if (take)
@@ -4554,8 +5269,8 @@ SpellCastResult Spell::CheckOrTakeRunePower(bool take)
 
     // at this moment for rune cost exist only no cost mods, and no percent mods
     int32 runeCostMod = 10000;
-    if(Player* modOwner = plr->GetSpellModOwner())
-        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_COST, runeCostMod, this);
+    if (Player* modOwner = plr->GetSpellModOwner())
+        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_COST, runeCostMod);
 
     if (runeCostMod > 0)
     {
@@ -4575,7 +5290,7 @@ SpellCastResult Spell::CheckOrTakeRunePower(bool take)
                 continue;
 
             // already used
-            if(plr->GetRuneCooldown(i) != 0)
+            if (plr->GetRuneCooldown(i) != 0)
                 continue;
 
             if (take)
@@ -4586,11 +5301,11 @@ SpellCastResult Spell::CheckOrTakeRunePower(bool take)
 
         // collect all not counted rune costs to death runes cost
         for(uint32 i = 0; i < RUNE_DEATH; ++i)
-            if(runeCost[i] > 0)
+            if (runeCost[i] > 0)
                 runeCost[RUNE_DEATH] += runeCost[i];
 
         // scan death runes
-        if(runeCost[RUNE_DEATH] > 0)
+        if (runeCost[RUNE_DEATH] > 0)
         {
             for(uint32 i = 0; i < MAX_RUNES && runeCost[RUNE_DEATH]; ++i)
             {
@@ -4599,7 +5314,7 @@ SpellCastResult Spell::CheckOrTakeRunePower(bool take)
                     continue;
 
                 // already used
-                if(plr->GetRuneCooldown(i) != 0)
+                if (plr->GetRuneCooldown(i) != 0)
                     continue;
 
                 if (take)
@@ -4608,7 +5323,10 @@ SpellCastResult Spell::CheckOrTakeRunePower(bool take)
                 --runeCost[rune];
 
                 if (take)
+                {
                     plr->ConvertRune(i, plr->GetBaseRune(i));
+                    plr->ClearConvertedBy(i);
+                }
             }
         }
 
@@ -4616,7 +5334,7 @@ SpellCastResult Spell::CheckOrTakeRunePower(bool take)
             return SPELL_FAILED_NO_POWER;                       // not sure if result code is correct
     }
 
-    if(take)
+    if (take)
     {
         // you can gain some runic power when use runes
         float rp = float(src->runePowerGain);
@@ -4627,6 +5345,36 @@ SpellCastResult Spell::CheckOrTakeRunePower(bool take)
     return SPELL_CAST_OK;
 }
 
+void Spell::TakeAmmo()
+{
+    if (m_attackType == RANGED_ATTACK && m_caster->GetTypeId() == TYPEID_PLAYER)
+    {
+        Item* pItem = ((Player*)m_caster)->GetWeaponForAttack(RANGED_ATTACK, true, false);
+
+        // wands don't have ammo
+        if (!pItem || pItem->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_WAND)
+            return;
+
+        if (pItem->GetProto()->InventoryType == INVTYPE_THROWN)
+        {
+            if (pItem->GetMaxStackCount() == 1)
+            {
+                // decrease durability for non-stackable throw weapon
+                ((Player*)m_caster)->DurabilityPointLossForEquipSlot(EQUIPMENT_SLOT_RANGED);
+            }
+            else
+            {
+                // decrease items amount for stackable throw weapon
+                uint32 count = 1;
+                ((Player*)m_caster)->DestroyItemCount(pItem, count, true);
+            }
+        }
+        else if (uint32 ammo = ((Player*)m_caster)->GetUInt32Value(PLAYER_AMMO_ID))
+            ((Player*)m_caster)->DestroyItemCount(ammo, 1, true);
+    }
+}
+
+
 void Spell::TakeReagents()
 {
     if (m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -4641,7 +5389,7 @@ void Spell::TakeReagents()
 
     for(uint32 x = 0; x < MAX_SPELL_REAGENTS; ++x)
     {
-        if(m_spellInfo->Reagent[x] <= 0)
+        if (m_spellInfo->Reagent[x] <= 0)
             continue;
 
         uint32 itemid = m_spellInfo->Reagent[x];
@@ -4651,7 +5399,7 @@ void Spell::TakeReagents()
         if (m_CastItem)
         {
             ItemPrototype const *proto = m_CastItem->GetProto();
-            if( proto && proto->ItemId == itemid )
+            if ( proto && proto->ItemId == itemid )
             {
                 for(int s = 0; s < MAX_ITEM_PROTO_SPELLS; ++s)
                 {
@@ -4683,11 +5431,11 @@ void Spell::HandleThreatSpells()
 
     SpellThreatEntry const* threatEntry = sSpellMgr.GetSpellThreatEntry(m_spellInfo->Id);
 
-    if (!threatEntry || (!threatEntry->threat && threatEntry->ap_bonus == 0.0f))
+    if (!threatEntry || (!threatEntry->threat && fabs(threatEntry->ap_bonus) < M_NULL_F))
         return;
 
     float threat = threatEntry->threat;
-    if (threatEntry->ap_bonus != 0.0f)
+    if (fabs(threatEntry->ap_bonus) > M_NULL_F)
         threat += threatEntry->ap_bonus * m_caster->GetTotalAttackPowerValue(GetWeaponAttackType(m_spellInfo));
 
     bool positive = true;
@@ -4738,7 +5486,7 @@ void Spell::HandleThreatSpells()
     DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell %u added an additional %f threat for %s %u target(s)", m_spellInfo->Id, threat, positive ? "assisting" : "harming", uint32(m_UniqueTargetInfo.size()));
 }
 
-void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTarget,SpellEffectIndex i, float DamageMultiplier)
+void Spell::HandleEffects(Unit *pUnitTarget, Item *pItemTarget, GameObject *pGOTarget, SpellEffectIndex i)
 {
     unitTarget = pUnitTarget;
     itemTarget = pItemTarget;
@@ -4746,7 +5494,7 @@ void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTar
 
     uint8 eff = m_spellInfo->Effect[i];
 
-    damage = int32(CalculateDamage(i, unitTarget) * DamageMultiplier);
+    damage = CalculateDamage(i, unitTarget);
 
     DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell %u Effect%d : %u Targets: %s, %s, %s",
         m_spellInfo->Id, i, eff,
@@ -4754,7 +5502,7 @@ void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTar
         itemTarget ? itemTarget->GetGuidStr().c_str() : "-",
         gameObjTarget ? gameObjTarget->GetGuidStr().c_str() : "-");
 
-    if(eff < TOTAL_SPELL_EFFECTS)
+    if (eff < TOTAL_SPELL_EFFECTS)
     {
         (*this.*SpellEffects[eff])(i);
     }
@@ -4762,56 +5510,87 @@ void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTar
     {
         sLog.outError("WORLD: Spell FX %d > TOTAL_SPELL_EFFECTS ", eff);
     }
+
+    // store effect index who did the damage (for picking correct damage multiplier)
+    if (m_damage > 0)
+        m_damageIndex = i;
 }
 
-void Spell::AddTriggeredSpell( uint32 spellId )
+void Spell::AddPrecastSpell(uint32 spellId)
 {
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
+    if (!spellInfo)
+    {
+        sLog.outError("Spell::AddPrecastSpell: unknown spell id %u used as pre-cast spell for spell %u)", spellId, m_spellInfo->Id);
+        return;
+    }
+    m_preCastSpells.push_back(spellInfo);
+}
 
-    if(!spellInfo)
+void Spell::AddTriggeredSpell(uint32 spellId)
+{
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
+    if (!spellInfo)
     {
         sLog.outError("Spell::AddTriggeredSpell: unknown spell id %u used as triggred spell for spell %u)", spellId, m_spellInfo->Id);
         return;
     }
-
     m_TriggerSpells.push_back(spellInfo);
 }
 
-void Spell::AddPrecastSpell( uint32 spellId )
+void Spell::AddNotTriggeredSpell(uint32 spellId)
 {
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
-
-    if(!spellInfo)
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
+    if (!spellInfo)
     {
-        sLog.outError("Spell::AddPrecastSpell: unknown spell id %u used as pre-cast spell for spell %u)", spellId, m_spellInfo->Id);
+        sLog.outError("Spell::AddNotTriggeredSpell: unknown spell id %u used as not triggred spell for spell %u)", spellId, m_spellInfo->Id);
         return;
     }
+    m_NotTriggerSpells.push_back(spellInfo);
+}
 
-    m_preCastSpells.push_back(spellInfo);
+void Spell::CastPreCastSpells(Unit* target)
+{
+    for (SpellInfoList::const_iterator si = m_preCastSpells.begin(); si != m_preCastSpells.end(); ++si)
+        m_caster->CastSpell(target, (*si), true, m_CastItem);
 }
 
 void Spell::CastTriggerSpells()
 {
-    for(SpellInfoList::const_iterator si = m_TriggerSpells.begin(); si != m_TriggerSpells.end(); ++si)
+    for (SpellInfoList::const_iterator si = m_TriggerSpells.begin(); si != m_TriggerSpells.end(); ++si)
+    {
+        Spell* spell = new Spell(m_caster, (*si), true, m_originalCasterGuid);
+        spell->prepare(&m_targets);                         // use original spell original targets
+    }
+}
+void Spell::CastNotTriggerSpells()
+{
+    for (SpellInfoList::const_iterator si = m_NotTriggerSpells.begin(); si != m_NotTriggerSpells.end(); ++si)
     {
-        Spell* spell = new Spell(m_caster, (*si), true, m_originalCasterGUID);
+        Spell* spell = new Spell(m_caster, (*si), false, m_originalCasterGuid);
         spell->prepare(&m_targets);                         // use original spell original targets
     }
 }
 
-void Spell::CastPreCastSpells(Unit* target)
+Unit* Spell::GetPrefilledUnitTargetOrUnitTarget(SpellEffectIndex effIndex) const
 {
-    for(SpellInfoList::const_iterator si = m_preCastSpells.begin(); si != m_preCastSpells.end(); ++si)
-        m_caster->CastSpell(target, (*si), true, m_CastItem);
+    for (TargetList::const_iterator itr = m_UniqueTargetInfo.begin(); itr != m_UniqueTargetInfo.end(); ++itr)
+        if (itr->effectMask & (1 << effIndex))
+            return m_caster->GetMap()->GetUnit(itr->targetGUID);
+
+    return m_targets.getUnitTarget();
 }
 
 SpellCastResult Spell::CheckCast(bool strict)
 {
+    // Festive Holiday Mount
+    if (m_spellInfo->Id == 62061 && m_caster->HasAura(62061, EFFECT_INDEX_0))
+        return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW;
+
     // check cooldowns to prevent cheating (ignore passive spells, that client side visual only)
-    if (m_caster->GetTypeId()==TYPEID_PLAYER && !m_spellInfo->HasAttribute(SPELL_ATTR_PASSIVE) &&
-        ((Player*)m_caster)->HasSpellCooldown(m_spellInfo->Id))
+    if (!m_spellInfo->HasAttribute(SPELL_ATTR_PASSIVE) && m_caster->HasSpellCooldown(m_spellInfo))
     {
-        if(m_triggeredByAuraSpell)
+        if (m_triggeredByAuraSpell)
             return SPELL_FAILED_DONT_REPORT;
         else
             return SPELL_FAILED_NOT_READY;
@@ -4823,8 +5602,8 @@ SpellCastResult Spell::CheckCast(bool strict)
 
     // only allow triggered spells if at an ended battleground
     if (!m_IsTriggeredSpell && m_caster->GetTypeId() == TYPEID_PLAYER)
-        if(BattleGround * bg = ((Player*)m_caster)->GetBattleGround())
-            if(bg->GetStatus() == STATUS_WAIT_LEAVE)
+        if (BattleGround * bg = ((Player*)m_caster)->GetBattleGround())
+            if (bg->GetStatus() == STATUS_WAIT_LEAVE)
                 return SPELL_FAILED_DONT_REPORT;
 
     if (!m_IsTriggeredSpell && IsNonCombatSpell(m_spellInfo) &&
@@ -4852,7 +5631,7 @@ SpellCastResult Spell::CheckCast(bool strict)
         {
             // Cannot be used in this stance/form
             SpellCastResult shapeError = GetErrorAtShapeshiftedCast(m_spellInfo, m_caster->GetShapeshiftForm());
-            if(shapeError != SPELL_CAST_OK)
+            if (shapeError != SPELL_CAST_OK)
                 return shapeError;
 
             if (m_spellInfo->HasAttribute(SPELL_ATTR_ONLY_STEALTHED) && !(m_caster->HasStealthAura()))
@@ -4861,32 +5640,32 @@ SpellCastResult Spell::CheckCast(bool strict)
     }
 
     // caster state requirements
-    if(m_spellInfo->CasterAuraState && !m_caster->HasAuraState(AuraState(m_spellInfo->CasterAuraState)))
+    if (m_spellInfo->CasterAuraState && !m_caster->HasAuraState(AuraState(m_spellInfo->CasterAuraState)))
         return SPELL_FAILED_CASTER_AURASTATE;
-    if(m_spellInfo->CasterAuraStateNot && m_caster->HasAuraState(AuraState(m_spellInfo->CasterAuraStateNot)))
+    if (m_spellInfo->CasterAuraStateNot && m_caster->HasAuraState(AuraState(m_spellInfo->CasterAuraStateNot)))
         return SPELL_FAILED_CASTER_AURASTATE;
 
     // Caster aura req check if need
-    if(m_spellInfo->casterAuraSpell && !m_caster->HasAura(m_spellInfo->casterAuraSpell))
+    if (m_spellInfo->casterAuraSpell && !m_caster->HasAura(m_spellInfo->casterAuraSpell))
         return SPELL_FAILED_CASTER_AURASTATE;
-    if(m_spellInfo->excludeCasterAuraSpell)
+    if (m_spellInfo->excludeCasterAuraSpell)
     {
         // Special cases of non existing auras handling
-        if(m_spellInfo->excludeCasterAuraSpell == 61988)
+        if (m_spellInfo->excludeCasterAuraSpell == 61988)
         {
             // Avenging Wrath Marker
-            if(m_caster->HasAura(61987))
+            if (m_caster->HasAura(61987))
                 return SPELL_FAILED_CASTER_AURASTATE;
         }
-        else if(m_caster->HasAura(m_spellInfo->excludeCasterAuraSpell))
+        else if (m_caster->HasAura(m_spellInfo->excludeCasterAuraSpell))
             return SPELL_FAILED_CASTER_AURASTATE;
     }
 
-    if (m_caster->GetTypeId() == TYPEID_PLAYER)
+    if (m_caster->isCharmedOwnedByPlayerOrPlayer())
     {
         // cancel autorepeat spells if cast start when moving
         // (not wand currently autorepeat cast delayed to moving stop anyway in spell update code)
-        if (((Player*)m_caster)->isMoving() )
+        if (m_caster->GetTypeId() == TYPEID_PLAYER && ((Player*)m_caster)->isMoving())
         {
             // skip stuck spell to allow use it in falling case and apply spell limitations at movement
             if ((!((Player*)m_caster)->m_movementInfo.HasMovementFlag(MOVEFLAG_FALLINGFAR) || m_spellInfo->Effect[EFFECT_INDEX_0] != SPELL_EFFECT_STUCK) &&
@@ -4894,25 +5673,46 @@ SpellCastResult Spell::CheckCast(bool strict)
                 return SPELL_FAILED_MOVING;
         }
 
-        if (!m_IsTriggeredSpell && NeedsComboPoints(m_spellInfo) && !m_caster->IsIgnoreUnitState(m_spellInfo, IGNORE_UNIT_TARGET_STATE) &&
-            (!m_targets.getUnitTarget() || m_targets.getUnitTarget()->GetObjectGuid() != ((Player*)m_caster)->GetComboTargetGuid()))
-            // warrior not have real combo-points at client side but use this way for mark allow Overpower use
-            return m_caster->getClass() == CLASS_WARRIOR ? SPELL_FAILED_CASTER_AURASTATE : SPELL_FAILED_NO_COMBO_POINTS;
-    }
-
-    if(Unit *target = m_targets.getUnitTarget())
-    {
+        if (m_caster->hasUnitState(UNIT_STAT_STUNNED))
+        {
+            if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PRIEST && m_spellInfo->GetSpellIconID() == 2178)
+            {
+                // Glyph of Desperation
+                if (m_caster->HasAura(63248))
+                    return SPELL_CAST_OK;
+                else return SPELL_FAILED_STUNNED;
+            }
+        }
+
+        // Disengage-like spells allow use only in combat
+        if (m_spellInfo->HasAttribute(SPELL_ATTR_STOP_ATTACK_TARGET) && m_spellInfo->HasAttribute(SPELL_ATTR_EX2_UNK26) && !m_caster->isInCombat())
+            return SPELL_FAILED_CASTER_AURASTATE;
+
+        if (!m_IsTriggeredSpell
+            && NeedsComboPoints(m_spellInfo)
+            && !m_caster->IsIgnoreUnitState(m_spellInfo, IGNORE_UNIT_TARGET_STATE)
+            && (!m_targets.getUnitTarget() || m_targets.getUnitTarget()->GetObjectGuid() != m_caster->GetComboTargetGuid()))
+            // warrior not have real combo-points at client side but use this way for mark allow Overpower use (need really recheck this, for pets alsO)
+            return (m_caster->GetObjectGuid().IsPet() || m_caster->getClass() == CLASS_WARRIOR) ? SPELL_FAILED_CASTER_AURASTATE : SPELL_FAILED_NO_COMBO_POINTS;
+    }
+
+    Unit *target = m_targets.getUnitTarget();
+    if (target && target->IsInWorld())
+    {
         // target state requirements (not allowed state), apply to self also
-        if(m_spellInfo->TargetAuraStateNot && target->HasAuraState(AuraState(m_spellInfo->TargetAuraStateNot)))
-            return SPELL_FAILED_TARGET_AURASTATE;
+        // This check not need - checked in CheckTarget()
+        // if (m_spellInfo->TargetAuraStateNot && target->HasAuraState(AuraState(m_spellInfo->TargetAuraStateNot)))
+        //    return SPELL_FAILED_TARGET_AURASTATE;
 
         if (!m_IsTriggeredSpell && IsDeathOnlySpell(m_spellInfo) && target->isAlive())
             return SPELL_FAILED_TARGET_NOT_DEAD;
 
         // Target aura req check if need
-        if(m_spellInfo->targetAuraSpell && !target->HasAura(m_spellInfo->targetAuraSpell))
-            return SPELL_FAILED_CASTER_AURASTATE;
-        if(m_spellInfo->excludeTargetAuraSpell)
+        // This check fully not need - checked in CheckTarget()
+        // if (m_spellInfo->targetAuraSpell && !target->HasAura(m_spellInfo->targetAuraSpell))
+        //    return SPELL_FAILED_CASTER_AURASTATE;
+
+        if (m_spellInfo->excludeTargetAuraSpell)
         {
             // Special cases of non existing auras handling
             if (m_spellInfo->excludeTargetAuraSpell == 61988)
@@ -4928,26 +5728,27 @@ SpellCastResult Spell::CheckCast(bool strict)
 
         // totem immunity for channeled spells(needs to be before spell cast)
         // spell attribs for player channeled spells
-        if (m_spellInfo->HasAttribute(SPELL_ATTR_EX_UNK14)
-            && m_spellInfo->HasAttribute(SPELL_ATTR_EX5_UNK13)
+        // (from rsa - very strange attributes set...)
+        if ((m_spellInfo->HasAttribute(SPELL_ATTR_EX_CHANNEL_TRACKING_TARGET))
+            && (m_spellInfo->HasAttribute(SPELL_ATTR_EX5_AFFECTED_BY_HASTE))
             && target->GetTypeId() == TYPEID_UNIT
             && ((Creature*)target)->IsTotem())
             return SPELL_FAILED_IMMUNE;
 
         bool non_caster_target = target != m_caster && !IsSpellWithCasterSourceTargetsOnly(m_spellInfo);
 
-        if(non_caster_target)
+        if (non_caster_target)
         {
             // target state requirements (apply to non-self only), to allow cast affects to self like Dirty Deeds
             if (m_spellInfo->TargetAuraState && !target->HasAuraStateForCaster(AuraState(m_spellInfo->TargetAuraState), m_caster->GetObjectGuid()) &&
                 !m_caster->IsIgnoreUnitState(m_spellInfo, m_spellInfo->TargetAuraState == AURA_STATE_FROZEN ? IGNORE_UNIT_TARGET_NON_FROZEN : IGNORE_UNIT_TARGET_STATE))
                 return SPELL_FAILED_TARGET_AURASTATE;
 
-            // Not allow casting on flying player
-            if (target->IsTaxiFlying())
+            // Not allow direct casting on flying player (enable only server-side casts)
+            if (target->IsTaxiFlying() && !m_spellInfo->HasAttribute(SPELL_ATTR_HIDE_IN_COMBAT_LOG))
                 return SPELL_FAILED_BAD_TARGETS;
 
-            if(!m_IsTriggeredSpell && VMAP::VMapFactory::checkSpellForLoS(m_spellInfo->Id) && !m_caster->IsWithinLOSInMap(target))
+            if(!m_IsTriggeredSpell && !target->IsVisibleTargetForSpell(m_caster, m_spellInfo))
                 return SPELL_FAILED_LINE_OF_SIGHT;
 
             // auto selection spell rank implemented in WorldSession::HandleCastSpellOpcode
@@ -4958,6 +5759,25 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if (m_spellInfo != sSpellMgr.SelectAuraRankForLevel(m_spellInfo, target->getLevel()))
                     return SPELL_FAILED_LOWLEVEL;
             }
+
+            if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->Mechanic == MECHANIC_DISARM)
+            {
+                if (target->GetTypeId() == TYPEID_PLAYER)
+                {
+                    Player *player = (Player*)target;
+                    if (m_spellInfo->Id == 51722)                           // Dismantle
+                    {
+                        if (!player->GetWeaponForAttack(BASE_ATTACK) && !player->GetShield() && !player->GetWeaponForAttack(RANGED_ATTACK))
+                            return SPELL_FAILED_TARGET_NO_WEAPONS;
+                    }
+                    else if ((!player->GetWeaponForAttack(BASE_ATTACK) && !player->GetWeaponForAttack(RANGED_ATTACK)) || !player->IsUsingEquippedWeapon(true))
+                    {
+                        return SPELL_FAILED_TARGET_NO_WEAPONS;
+                    }
+                }
+                else if (!target->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID))
+                    return SPELL_FAILED_TARGET_NO_WEAPONS;
+            }
         }
         else if (m_caster == target)
         {
@@ -4981,7 +5801,7 @@ SpellCastResult Spell::CheckCast(bool strict)
 
             // Fire Shield
             if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK &&
-                m_spellInfo->SpellIconID == 16)
+                m_spellInfo->GetSpellIconID() == 16)
                 return SPELL_FAILED_BAD_TARGETS;
 
             // Focus Magic (main spell)
@@ -4990,7 +5810,7 @@ SpellCastResult Spell::CheckCast(bool strict)
 
             // Lay on Hands (self cast)
             if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PALADIN &&
-                m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000008000))
+                m_spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_LAY_ON_HANDS>())
             {
                 if (target->HasAura(25771))                 // Forbearance
                     return SPELL_FAILED_CASTER_AURASTATE;
@@ -5004,27 +5824,27 @@ SpellCastResult Spell::CheckCast(bool strict)
         {
             if (m_spellInfo->EffectImplicitTargetA[j] == TARGET_PET)
             {
-                Pet* pet = m_caster->GetPet();
-                if (!pet)
+                Pet *pet = m_caster->GetPet();
+                if (!pet || (!pet->isAlive() && !IsSpellAllowDeadTarget(m_spellInfo)))
                 {
-                    if (m_triggeredByAuraSpell)             // not report pet not existence for triggered spells
+                    if (m_triggeredByAuraSpell)              // not report pet not existence for triggered spells
                         return SPELL_FAILED_DONT_REPORT;
-                    else
+                    else if (!pet)
                         return SPELL_FAILED_NO_PET;
+                    else
+                        return SPELL_FAILED_TARGETS_DEAD;
                 }
-                else if (!pet->isAlive())
-                    return SPELL_FAILED_TARGETS_DEAD;
                 break;
             }
         }
 
         //check creature type
         //ignore self casts (including area casts when caster selected as target)
-        if(non_caster_target)
+        if (non_caster_target)
         {
-            if(!CheckTargetCreatureType(target))
+            if(!SpellMgr::IsTargetMatchedWithCreatureType(m_spellInfo, target))
             {
-                if(target->GetTypeId() == TYPEID_PLAYER)
+                if (target->GetTypeId() == TYPEID_PLAYER)
                     return SPELL_FAILED_TARGET_IS_PLAYER;
                 else
                     return SPELL_FAILED_BAD_TARGETS;
@@ -5046,7 +5866,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                         target_hostile = m_caster->IsHostileTo(target);
                     }
 
-                    if(target_hostile)
+                    if (target_hostile)
                         return SPELL_FAILED_BAD_TARGETS;
 
                     explicit_target_mode = true;
@@ -5059,7 +5879,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                         target_friendly = m_caster->IsFriendlyTo(target);
                     }
 
-                    if(target_friendly)
+                    if (target_friendly)
                         return SPELL_FAILED_BAD_TARGETS;
 
                     explicit_target_mode = true;
@@ -5067,10 +5887,10 @@ SpellCastResult Spell::CheckCast(bool strict)
             }
             // TODO: this check can be applied and for player to prevent cheating when IsPositiveSpell will return always correct result.
             // check target for pet/charmed casts (not self targeted), self targeted cast used for area effects and etc
-            if (!explicit_target_mode && m_caster->GetTypeId() == TYPEID_UNIT && m_caster->GetCharmerOrOwnerGuid())
+            if (!explicit_target_mode && m_caster->GetTypeId() == TYPEID_UNIT && !m_caster->GetCharmerOrOwnerGuid().IsEmpty() && !IsDispelSpell(m_spellInfo))
             {
                 // check correctness positive/negative cast target (pet cast real check and cheating check)
-                if(IsPositiveSpell(m_spellInfo->Id))
+                if (IsPositiveSpell(m_spellInfo->Id))
                 {
                     if (!target_hostile_checked)
                     {
@@ -5078,7 +5898,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                         target_hostile = m_caster->IsHostileTo(target);
                     }
 
-                    if(target_hostile)
+                    if (target_hostile)
                         return SPELL_FAILED_BAD_TARGETS;
                 }
                 else
@@ -5089,24 +5909,30 @@ SpellCastResult Spell::CheckCast(bool strict)
                         target_friendly = m_caster->IsFriendlyTo(target);
                     }
 
-                    if(target_friendly)
+                    if (target_friendly)
                         return SPELL_FAILED_BAD_TARGETS;
                 }
             }
         }
 
-        if(IsPositiveSpell(m_spellInfo->Id))
-            if(target->IsImmuneToSpell(m_spellInfo))
+        if (IsPositiveSpell(m_spellInfo->Id) && m_caster->IsFriendlyTo(target))
+        {
+            if (!target->IsImmunedToSchool(GetSpellSchoolMask(m_spellInfo)) && target->IsImmuneToSpell(m_spellInfo, true))
                 return SPELL_FAILED_TARGET_AURASTATE;
 
+            if (target->IsInWorld() && target->IsInMap(m_caster))
+                if (target->HasMorePoweredBuff(m_spellInfo->Id))
+                    return m_IsTriggeredSpell ? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_AURA_BOUNCED;
+        }
+
         //Must be behind the target.
-        if (m_spellInfo->AttributesEx2 == SPELL_ATTR_EX2_UNK20 && m_spellInfo->HasAttribute(SPELL_ATTR_EX_UNK9) && target->HasInArc(M_PI_F, m_caster))
+        if (m_spellInfo->GetAttributesEx2() == SPELL_ATTR_EX2_UNK20 && m_spellInfo->HasAttribute(SPELL_ATTR_EX_UNK9) && target->HasInArc(M_PI_F, m_caster))
         {
             // Exclusion for Pounce: Facing Limitation was removed in 2.0.1, but it still uses the same, old Ex-Flags
             // Exclusion for Mutilate:Facing Limitation was removed in 2.0.1 and 3.0.3, but they still use the same, old Ex-Flags
             // Exclusion for Throw: Facing limitation was added in 3.2.x, but that shouldn't be
-            if (!m_spellInfo->IsFitToFamily(SPELLFAMILY_DRUID, UI64LIT(0x0000000000020000)) &&
-                !m_spellInfo->IsFitToFamily(SPELLFAMILY_ROGUE, UI64LIT(0x0020000000000000)) &&
+            if (!m_spellInfo->IsFitToFamily<SPELLFAMILY_DRUID, CF_DRUID_POUNCE>() &&
+                !m_spellInfo->IsFitToFamily<SPELLFAMILY_ROGUE, CF_ROGUE_MUTILATE>() &&
                 m_spellInfo->Id != 2764)
             {
                 SendInterrupted(2);
@@ -5115,7 +5941,7 @@ SpellCastResult Spell::CheckCast(bool strict)
         }
 
         //Target must be facing you.
-        if ((m_spellInfo->Attributes == (SPELL_ATTR_UNK4 | SPELL_ATTR_NOT_SHAPESHIFT | SPELL_ATTR_UNK18 | SPELL_ATTR_STOP_ATTACK_TARGET)) && !target->HasInArc(M_PI_F, m_caster))
+        if ((m_spellInfo->GetAttributes() == (SPELL_ATTR_ABILITY | SPELL_ATTR_NOT_SHAPESHIFT | SPELL_ATTR_UNK18 | SPELL_ATTR_STOP_ATTACK_TARGET)) && !target->HasInArc(M_PI_F, m_caster))
         {
             SendInterrupted(2);
             return SPELL_FAILED_NOT_INFRONT;
@@ -5126,16 +5952,37 @@ SpellCastResult Spell::CheckCast(bool strict)
             return SPELL_FAILED_TARGET_AFFECTING_COMBAT;
     }
     // zone check
+    if (!m_caster->GetMap() || !m_caster->GetTerrain())
+        return SPELL_FAILED_DONT_REPORT;
+
     uint32 zone, area;
     m_caster->GetZoneAndAreaId(zone, area);
 
     SpellCastResult locRes= sSpellMgr.GetSpellAllowedInLocationError(m_spellInfo, m_caster->GetMapId(), zone, area,
         m_caster->GetCharmerOrOwnerPlayerOrPlayerItself());
     if (locRes != SPELL_CAST_OK)
-        return locRes;
+    {
+        if (!m_IsTriggeredSpell)
+            return locRes;
+        else
+            return SPELL_FAILED_DONT_REPORT;
+    }
+
+    bool castOnVehicleAllowed = false;
+
+    if (VehicleKitPtr vehicle = m_caster->GetVehicle())
+    {
+        if (m_spellInfo->HasAttribute(SPELL_ATTR_EX6_CASTABLE_ON_VEHICLE))
+            castOnVehicleAllowed = true;
+
+        if (VehicleSeatEntry const* seatInfo = vehicle->GetSeatInfo(m_caster))
+            if ((seatInfo->m_flags & SEAT_FLAG_CAN_CAST) || (seatInfo->m_flags & SEAT_FLAG_CAN_ATTACK))
+                castOnVehicleAllowed = true;
+    }
+
 
     // not let players cast spells at mount (and let do it to creatures)
-    if (m_caster->IsMounted() && m_caster->GetTypeId()==TYPEID_PLAYER && !m_IsTriggeredSpell &&
+    if ((m_caster->IsMounted() || (m_caster->GetVehicle() && !castOnVehicleAllowed)) && m_caster->GetTypeId() == TYPEID_PLAYER && !m_IsTriggeredSpell &&
         !IsPassiveSpell(m_spellInfo) && !m_spellInfo->HasAttribute(SPELL_ATTR_CASTABLE_WHILE_MOUNTED))
     {
         if (m_caster->IsTaxiFlying())
@@ -5144,14 +5991,28 @@ SpellCastResult Spell::CheckCast(bool strict)
             return SPELL_FAILED_NOT_MOUNTED;
     }
 
-    // always (except passive spells) check items (focus object can be required for any type casts)
+    // always (except passive spells) check items
     if (!IsPassiveSpell(m_spellInfo))
     {
         SpellCastResult castResult = CheckItems();
-        if(castResult != SPELL_CAST_OK)
+        if (castResult != SPELL_CAST_OK)
             return castResult;
     }
 
+    // check spell focus object
+    if (m_spellInfo->RequiresSpellFocus)
+    {
+        GameObject* ok = NULL;
+        MaNGOS::GameObjectFocusCheck go_check(m_caster, m_spellInfo->RequiresSpellFocus);
+        MaNGOS::GameObjectSearcher<MaNGOS::GameObjectFocusCheck> checker(ok, go_check);
+        Cell::VisitGridObjects(m_caster, checker, m_caster->GetMap()->GetVisibilityDistance());
+
+        if (!ok)
+            return SPELL_FAILED_REQUIRES_SPELL_FOCUS;
+
+        focusObject = ok;                                   // game object found in range
+    }
+
     // Database based targets from spell_target_script
     if (m_UniqueTargetInfo.empty())                         // skip second CheckCast apply (for delayed spells for example)
     {
@@ -5164,7 +6025,9 @@ SpellCastResult Spell::CheckCast(bool strict)
                m_spellInfo->EffectImplicitTargetA[j] == TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT)
             {
 
-                SpellScriptTargetBounds bounds = sSpellMgr.GetSpellScriptTargetBounds(m_spellInfo->Id);
+                SQLMultiStorage::SQLMSIteratorBounds<SpellTargetEntry> bounds = sSpellScriptTargetStorage.getBounds<SpellTargetEntry>(m_spellInfo->Id);
+
+                WorldLocation const* targetLoc = sSpellMgr.GetSpellTargetPosition(m_spellInfo->Id);
 
                 if (bounds.first == bounds.second)
                 {
@@ -5172,30 +6035,38 @@ SpellCastResult Spell::CheckCast(bool strict)
                         sLog.outErrorDb("Spell entry %u, effect %i has EffectImplicitTargetA/EffectImplicitTargetB = TARGET_SCRIPT, but creature are not defined in `spell_script_target`", m_spellInfo->Id, j);
 
                     if (m_spellInfo->EffectImplicitTargetA[j] == TARGET_SCRIPT_COORDINATES || m_spellInfo->EffectImplicitTargetB[j] == TARGET_SCRIPT_COORDINATES)
-                        sLog.outErrorDb("Spell entry %u, effect %i has EffectImplicitTargetA/EffectImplicitTargetB = TARGET_SCRIPT_COORDINATES, but gameobject or creature are not defined in `spell_script_target`", m_spellInfo->Id, j);
+                    {
+                        if (!targetLoc)
+                            sLog.outErrorDb("Spell entry %u, effect %i has EffectImplicitTargetA/EffectImplicitTargetB = TARGET_SCRIPT_COORDINATES, but gameobject or creature are not defined in `spell_script_target` and target location not defined in `spell_target_position`", m_spellInfo->Id, j);
+                        else
+                            DEBUG_FILTER_LOG(LOG_FILTER_DB_STRICTED_CHECK,"Spell entry %u, effect %i has EffectImplicitTargetA/EffectImplicitTargetB = TARGET_SCRIPT_COORDINATES, but gameobject or creature are not defined in `spell_script_target` and target location defined in `spell_target_position`", m_spellInfo->Id, j);
+                    }
 
                     if (m_spellInfo->EffectImplicitTargetA[j] == TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT)
                         sLog.outErrorDb("Spell entry %u, effect %i has EffectImplicitTargetA/EffectImplicitTargetB = TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT, but gameobject are not defined in `spell_script_target`", m_spellInfo->Id, j);
                 }
 
-                SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex);
+                SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex());
                 float range = GetSpellMaxRange(srange);
 
                 Creature* targetExplicit = NULL;            // used for cases where a target is provided (by script for example)
                 Creature* creatureScriptTarget = NULL;
                 GameObject* goScriptTarget = NULL;
 
-                for(SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST)
+                for (SQLMultiStorage::SQLMultiSIterator<SpellTargetEntry> i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST)
                 {
-                    switch(i_spellST->second.type)
+                    if (i_spellST->CanNotHitWithSpellEffect(SpellEffectIndex(j)))
+                        continue;
+
+                    switch (i_spellST->type)
                     {
                         case SPELL_TARGET_TYPE_GAMEOBJECT:
                         {
                             GameObject* p_GameObject = NULL;
 
-                            if (i_spellST->second.targetEntry)
+                            if (i_spellST->targetEntry)
                             {
-                                MaNGOS::NearestGameObjectEntryInObjectRangeCheck go_check(*m_caster, i_spellST->second.targetEntry, range);
+                                MaNGOS::NearestGameObjectEntryInObjectRangeCheck go_check(*m_caster, i_spellST->targetEntry, range);
                                 MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck> checker(p_GameObject, go_check);
                                 Cell::VisitGridObjects(m_caster, checker, range);
 
@@ -5223,20 +6094,20 @@ SpellCastResult Spell::CheckCast(bool strict)
                         case SPELL_TARGET_TYPE_DEAD:
                         default:
                         {
-                            Creature *p_Creature = NULL;
+                            Creature* p_Creature = NULL;
 
                             // check if explicit target is provided and check it up against database valid target entry/state
                             if (Unit* pTarget = m_targets.getUnitTarget())
                             {
-                                if (pTarget->GetTypeId() == TYPEID_UNIT && pTarget->GetEntry() == i_spellST->second.targetEntry)
+                                if (pTarget->GetTypeId() == TYPEID_UNIT && pTarget->GetEntry() == i_spellST->targetEntry)
                                 {
-                                    if (i_spellST->second.type == SPELL_TARGET_TYPE_DEAD && ((Creature*)pTarget)->IsCorpse())
+                                    if (i_spellST->type == SPELL_TARGET_TYPE_DEAD && ((Creature*)pTarget)->IsCorpse())
                                     {
                                         // always use spellMaxRange, in case GetLastRange returned different in a previous pass
                                         if (pTarget->IsWithinDistInMap(m_caster, GetSpellMaxRange(srange)))
                                             targetExplicit = (Creature*)pTarget;
                                     }
-                                    else if (i_spellST->second.type == SPELL_TARGET_TYPE_CREATURE && pTarget->isAlive())
+                                    else if (i_spellST->type == SPELL_TARGET_TYPE_CREATURE && pTarget->isAlive())
                                     {
                                         // always use spellMaxRange, in case GetLastRange returned different in a previous pass
                                         if (pTarget->IsWithinDistInMap(m_caster, GetSpellMaxRange(srange)))
@@ -5248,7 +6119,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                             // no target provided or it was not valid, so use closest in range
                             if (!targetExplicit)
                             {
-                                MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*m_caster, i_spellST->second.targetEntry, i_spellST->second.type != SPELL_TARGET_TYPE_DEAD, i_spellST->second.type == SPELL_TARGET_TYPE_DEAD, range);
+                                MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*m_caster, i_spellST->targetEntry, i_spellST->type != SPELL_TARGET_TYPE_DEAD, i_spellST->type == SPELL_TARGET_TYPE_DEAD, range);
                                 MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(p_Creature, u_check);
 
                                 // Visit all, need to find also Pet* objects
@@ -5277,7 +6148,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                     if (m_spellInfo->EffectImplicitTargetA[j] == TARGET_SCRIPT_COORDINATES ||
                         m_spellInfo->EffectImplicitTargetB[j] == TARGET_SCRIPT_COORDINATES)
                     {
-                        m_targets.setDestination(creatureScriptTarget->GetPositionX(),creatureScriptTarget->GetPositionY(),creatureScriptTarget->GetPositionZ());
+                        m_targets.setDestination(creatureScriptTarget->GetPosition());
 
                         if (m_spellInfo->EffectImplicitTargetA[j] == TARGET_SCRIPT_COORDINATES && m_spellInfo->Effect[j] != SPELL_EFFECT_PERSISTENT_AREA_AURA)
                             AddUnitTarget(creatureScriptTarget, SpellEffectIndex(j));
@@ -5296,19 +6167,40 @@ SpellCastResult Spell::CheckCast(bool strict)
                     if (m_spellInfo->EffectImplicitTargetA[j] == TARGET_SCRIPT_COORDINATES ||
                         m_spellInfo->EffectImplicitTargetB[j] == TARGET_SCRIPT_COORDINATES)
                     {
-                        m_targets.setDestination(goScriptTarget->GetPositionX(),goScriptTarget->GetPositionY(),goScriptTarget->GetPositionZ());
+                        m_targets.setDestination(goScriptTarget->GetPosition());
 
                         if (m_spellInfo->EffectImplicitTargetA[j] == TARGET_SCRIPT_COORDINATES && m_spellInfo->Effect[j] != SPELL_EFFECT_PERSISTENT_AREA_AURA)
                             AddGOTarget(goScriptTarget, SpellEffectIndex(j));
                     }
-                    // store explicit target for TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT
+                    // store explicit target for TARGET_SCRIPT and TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT
                     else
                     {
-                        if (m_spellInfo->EffectImplicitTargetA[j] == TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT ||
+                        if (m_spellInfo->EffectImplicitTargetA[j] == TARGET_SCRIPT ||
+                            m_spellInfo->EffectImplicitTargetB[j] == TARGET_SCRIPT ||
+                            m_spellInfo->EffectImplicitTargetA[j] == TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT ||
                             m_spellInfo->EffectImplicitTargetB[j] == TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT)
                             AddGOTarget(goScriptTarget, SpellEffectIndex(j));
                     }
                 }
+                else if (targetLoc)
+                {
+                    // Coordinates for spell stored in `spell_target_position` table.
+                    // store coordinates for TARGET_SCRIPT_COORDINATES
+                    if (m_spellInfo->EffectImplicitTargetA[j] == TARGET_SCRIPT_COORDINATES ||
+                        m_spellInfo->EffectImplicitTargetB[j] == TARGET_SCRIPT_COORDINATES)
+                    {
+                        m_targets.setDestination(*targetLoc);
+                        AddUnitTarget(GetAffectiveCaster(), SpellEffectIndex(j));
+                    }
+                    else
+                    {
+                        // not report target not existence for triggered spells
+                        if (m_triggeredByAuraSpell || m_IsTriggeredSpell)
+                            return SPELL_FAILED_DONT_REPORT;
+                        else
+                            return SPELL_FAILED_BAD_TARGETS;
+                    }
+                }
                 //Missing DB Entry or targets for this spellEffect.
                 else
                 {
@@ -5331,20 +6223,20 @@ SpellCastResult Spell::CheckCast(bool strict)
     if(!m_IsTriggeredSpell)
     {
         SpellCastResult castResult = CheckRange(strict);
-        if(castResult != SPELL_CAST_OK)
+        if (castResult != SPELL_CAST_OK)
             return castResult;
     }
 
     {
         SpellCastResult castResult = CheckPower();
-        if(castResult != SPELL_CAST_OK)
+        if (castResult != SPELL_CAST_OK)
             return castResult;
     }
 
     if(!m_IsTriggeredSpell)                                 // triggered spell not affected by stun/etc
     {
         SpellCastResult castResult = CheckCasterAuras();
-        if(castResult != SPELL_CAST_OK)
+        if (castResult != SPELL_CAST_OK)
             return castResult;
     }
 
@@ -5354,65 +6246,88 @@ SpellCastResult Spell::CheckCast(bool strict)
         switch(m_spellInfo->Effect[i])
         {
             case SPELL_EFFECT_INSTAKILL:
-                // Death Pact
-                if(m_spellInfo->Id == 48743)
-                {
-                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
-                        return SPELL_FAILED_ERROR;
-
-                    if (!((Player*)m_caster)->GetSelectionGuid())
-                        return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
-                    Pet* target = m_caster->GetMap()->GetPet(((Player*)m_caster)->GetSelectionGuid());
-
-                    // alive
-                    if (!target || target->isDead())
-                        return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
-                    // undead
-                    if (target->GetCreatureType() != CREATURE_TYPE_UNDEAD)
-                        return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
-                    // owned
-                    if (target->GetOwnerGuid() != m_caster->GetObjectGuid())
-                        return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
-
-                    float dist = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
-                    if (!target->IsWithinDistInMap(m_caster,dist))
-                        return SPELL_FAILED_OUT_OF_RANGE;
-
-                    // will set in target selection code
-                }
                 break;
             case SPELL_EFFECT_DUMMY:
             {
-                if (m_spellInfo->Id == 51582)               // Rocket Boots Engaged
+                if (m_spellInfo->Id == 51582)          // Rocket Boots Engaged
                 {
                     if (m_caster->IsInWater())
                         return SPELL_FAILED_ONLY_ABOVEWATER;
                 }
-                else if(m_spellInfo->SpellIconID == 156)    // Holy Shock
+                else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_DEATH_COIL>()) // Death Coil (DeathKnight)
+                {
+                    Unit* target = m_targets.getUnitTarget();
+                    if (!target || (target->IsFriendlyTo(m_caster) && target->GetCreatureType() != CREATURE_TYPE_UNDEAD))
+                        return SPELL_FAILED_BAD_TARGETS;
+                }
+                else if (m_spellInfo->Id == 51690)          // Killing Spree
+                {
+                    UnitList targets;
+
+                    float radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex()));
+
+                    MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck unitCheck(m_caster, m_caster, radius);
+                    MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck> checker(targets, unitCheck);
+                    Cell::VisitAllObjects(m_caster, checker, radius);
+
+                    if (targets.empty())
+                        return SPELL_FAILED_OUT_OF_RANGE;
+                }
+                else if (m_spellInfo->GetSpellIconID() == 156)   // Holy Shock
                 {
                     // spell different for friends and enemies
                     // hart version required facing
                     if (m_targets.getUnitTarget() && !m_caster->IsFriendlyTo(m_targets.getUnitTarget()) && !m_caster->HasInArc(M_PI_F, m_targets.getUnitTarget()))
                         return SPELL_FAILED_UNIT_NOT_INFRONT;
                 }
-                // Fire Nova
-                if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->SpellIconID == 33)
+                else if(m_spellInfo->Id == 49576)           // Death Grip
+                {
+                    if(m_caster->m_movementInfo.HasMovementFlag(MovementFlags(MOVEFLAG_FALLING | MOVEFLAG_FALLINGFAR)))
+                        return SPELL_FAILED_MOVING;
+                }
+                else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->GetSpellIconID() == 33) // Fire Nova
                 {
                     // fire totems slot
                     if (!m_caster->GetTotemGuid(TOTEM_SLOT_FIRE))
                         return SPELL_FAILED_TOTEMS;
                 }
+                // Voracious Appetite && Cannibalize && Carrion Feeder
+                else if (m_UniqueTargetInfo.empty() /*only in first check!*/
+                    && (m_spellInfo->Id == 20577 || m_spellInfo->Id == 52749 || m_spellInfo->Id == 54044))
+                {
+                    m_targets.setUnitTarget(NULL);
+                    WorldObject* result = FindCorpseUsing<MaNGOS::CannibalizeObjectCheck>(m_spellInfo->TargetCreatureType);
+                    if (result && result->IsInWorld())
+                    {
+                        switch (result->GetTypeId())
+                        {
+                            case TYPEID_UNIT:
+                            case TYPEID_PLAYER:
+                                m_targets.setUnitTarget((Unit*)result);
+                                break;
+                            case TYPEID_CORPSE:
+                                if (Player* owner = ObjectAccessor::FindPlayer(((Corpse*)result)->GetOwnerGuid()))
+                                    if (owner->IsInMap(m_caster) && !owner->isAlive())
+                                        m_targets.setUnitTarget((Unit*)owner);
+                                break;
+                            default:
+                                return SPELL_FAILED_NO_EDIBLE_CORPSES;
+                        }
+                    }
+                    if (!m_targets.getUnitTarget())
+                        return SPELL_FAILED_NO_EDIBLE_CORPSES;
+                }
                 break;
             }
             case SPELL_EFFECT_SCHOOL_DAMAGE:
             {
                 // Hammer of Wrath
-                if(m_spellInfo->SpellVisual[0] == 7250)
+                if (m_spellInfo->IsFitToFamily<SPELLFAMILY_PALADIN, CF_PALADIN_HAMMER_OF_WRATH>())
                 {
                     if (!m_targets.getUnitTarget())
                         return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
 
-                    if(m_targets.getUnitTarget()->GetHealth() > m_targets.getUnitTarget()->GetMaxHealth()*0.2)
+                    if (m_targets.getUnitTarget()->GetHealth() > m_targets.getUnitTarget()->GetMaxHealth()*0.2)
                         return SPELL_FAILED_BAD_TARGETS;
                 }
                 break;
@@ -5436,7 +6351,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                     return SPELL_FAILED_DONT_REPORT;
                 }
 
-                if(plrCaster->getClass() != CLASS_HUNTER && !gmmode)
+                if (plrCaster->getClass() != CLASS_HUNTER && !gmmode)
                 {
                     plrCaster->SendPetTameFailure(PETTAME_UNITSCANTTAME);
                     return SPELL_FAILED_DONT_REPORT;
@@ -5444,7 +6359,7 @@ SpellCastResult Spell::CheckCast(bool strict)
 
                 Creature* target = (Creature*)m_targets.getUnitTarget();
 
-                if(target->IsPet() || target->isCharmed())
+                if (target->IsPet() || target->isCharmed())
                 {
                     plrCaster->SendPetTameFailure(PETTAME_CREATUREALREADYOWNED);
                     return SPELL_FAILED_DONT_REPORT;
@@ -5478,7 +6393,7 @@ SpellCastResult Spell::CheckCast(bool strict)
             }
             case SPELL_EFFECT_LEARN_SPELL:
             {
-                if(m_spellInfo->EffectImplicitTargetA[i] != TARGET_PET)
+                if (m_spellInfo->EffectImplicitTargetA[i] != TARGET_PET)
                     break;
 
                 Pet* pet = m_caster->GetPet();
@@ -5491,7 +6406,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if(!learn_spellproto)
                     return SPELL_FAILED_NOT_KNOWN;
 
-                if(m_spellInfo->spellLevel > pet->getLevel())
+                if (m_spellInfo->spellLevel > pet->getLevel())
                     return SPELL_FAILED_LOWLEVEL;
 
                 break;
@@ -5508,7 +6423,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if(!learn_spellproto)
                     return SPELL_FAILED_NOT_KNOWN;
 
-                if(m_spellInfo->spellLevel > pet->getLevel())
+                if (m_spellInfo->spellLevel > pet->getLevel())
                     return SPELL_FAILED_LOWLEVEL;
 
                 break;
@@ -5516,8 +6431,8 @@ SpellCastResult Spell::CheckCast(bool strict)
             case SPELL_EFFECT_APPLY_GLYPH:
             {
                 uint32 glyphId = m_spellInfo->EffectMiscValue[i];
-                if(GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyphId))
-                    if(m_caster->HasAura(gp->SpellId))
+                if (GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyphId))
+                    if (m_caster->HasAura(gp->SpellId))
                         return SPELL_FAILED_UNIQUE_GLYPH;
                 break;
             }
@@ -5541,7 +6456,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if(!pet->GetCurrentFoodBenefitLevel(foodItem->GetProto()->ItemLevel))
                     return SPELL_FAILED_FOOD_LOWLEVEL;
 
-                if(pet->isInCombat())
+                if (pet->isInCombat())
                     return SPELL_FAILED_AFFECTING_COMBAT;
 
                 break;
@@ -5552,14 +6467,20 @@ SpellCastResult Spell::CheckCast(bool strict)
                 // Can be area effect, Check only for players and not check if target - caster (spell can have multiply drain/burn effects)
                 if (m_caster->GetTypeId() == TYPEID_PLAYER)
                     if (Unit* target = m_targets.getUnitTarget())
-                        if (target != m_caster && int32(target->getPowerType()) != m_spellInfo->EffectMiscValue[i])
+                        if (target != m_caster && int32(target->GetPowerType()) != m_spellInfo->EffectMiscValue[i])
                             return SPELL_FAILED_BAD_TARGETS;
                 break;
             }
             case SPELL_EFFECT_CHARGE:
             {
                 if (m_caster->hasUnitState(UNIT_STAT_ROOT))
-                    return SPELL_FAILED_ROOTED;
+                {
+                    // Intervene with Warbringer talent
+                    if (m_spellInfo->Id == 3411 && m_caster->HasAura(57499))
+                        m_caster->RemoveAurasAtMechanicImmunity(IMMUNE_TO_ROOT_AND_SNARE_MASK, 0);
+                    else
+                        return SPELL_FAILED_ROOTED;
+                }
 
                 break;
             }
@@ -5586,7 +6507,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                     return SPELL_FAILED_LOW_CASTLEVEL;
 
                 // chance for fail at orange skinning attempt
-                if( (m_selfContainer && (*m_selfContainer) == this) &&
+                if ( (m_selfContainer && (*m_selfContainer) == this) &&
                     skillValue < sWorld.GetConfigMaxSkillValue() &&
                     (ReqValue < 0 ? 0 : ReqValue) > irand(skillValue - 25, skillValue + 37) )
                     return SPELL_FAILED_TRY_AGAIN;
@@ -5610,15 +6531,15 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if (GameObject* go = m_targets.getGOTarget())
                 {
                     // In BattleGround players can use only flags and banners
-                    if( ((Player*)m_caster)->InBattleGround() &&
-                        !((Player*)m_caster)->CanUseBattleGroundObject() )
+                    if ( ((Player*)m_caster)->InBattleGround() &&
+                        !((Player*)m_caster)->CanUseBattleGroundObject() && m_spellInfo->Id!= 1842 ) // Disarm Trap can be used
                         return SPELL_FAILED_TRY_AGAIN;
 
                     lockId = go->GetGOInfo()->GetLockId();
                     if (!lockId)
                         return SPELL_FAILED_ALREADY_OPEN;
                 }
-                else if(Item* item = m_targets.getItemTarget())
+                else if (Item* item = m_targets.getItemTarget())
                 {
                     // not own (trade?)
                     if (item->GetOwner() != m_caster)
@@ -5639,12 +6560,12 @@ SpellCastResult Spell::CheckCast(bool strict)
 
                 // check lock compatibility
                 SpellCastResult res = CanOpenLock(SpellEffectIndex(i), lockId, skillId, reqSkillValue, skillValue);
-                if(res != SPELL_CAST_OK)
+                if (res != SPELL_CAST_OK)
                     return res;
 
                 // chance for fail at orange mining/herb/LockPicking gathering attempt
                 // second check prevent fail at rechecks
-                if(skillId != SKILL_NONE && (!m_selfContainer || ((*m_selfContainer) != this)))
+                if (skillId != SKILL_NONE && (!m_selfContainer || ((*m_selfContainer) != this)))
                 {
                     bool canFailAtMax = skillId != SKILL_HERBALISM && skillId != SKILL_MINING;
 
@@ -5660,7 +6581,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if(!pet)
                     return SPELL_FAILED_NO_PET;
 
-                if(pet->isAlive())
+                if (pet->isAlive())
                     return SPELL_FAILED_ALREADY_HAVE_SUMMON;
 
                 break;
@@ -5668,9 +6589,9 @@ SpellCastResult Spell::CheckCast(bool strict)
             // This is generic summon effect
             case SPELL_EFFECT_SUMMON:
             {
-                if(SummonPropertiesEntry const *summon_prop = sSummonPropertiesStore.LookupEntry(m_spellInfo->EffectMiscValueB[i]))
+                if (SummonPropertiesEntry const *summon_prop = sSummonPropertiesStore.LookupEntry(m_spellInfo->EffectMiscValueB[i]))
                 {
-                    if(summon_prop->Group == SUMMON_PROP_GROUP_PETS)
+                    if (summon_prop->Group == SUMMON_PROP_GROUP_PETS)
                     {
                         if (m_caster->GetPetGuid())
                             return SPELL_FAILED_ALREADY_HAVE_SUMMON;
@@ -5682,6 +6603,17 @@ SpellCastResult Spell::CheckCast(bool strict)
 
                 break;
             }
+            case SPELL_EFFECT_SUMMON_OBJECT_SLOT1:
+            case SPELL_EFFECT_SUMMON_OBJECT_SLOT2:
+            case SPELL_EFFECT_SUMMON_OBJECT_SLOT3:
+            case SPELL_EFFECT_SUMMON_OBJECT_SLOT4:
+            {
+                if (m_caster->GetTypeId() == TYPEID_PLAYER)
+                    if (((Player*)m_caster)->HasMovementFlag(MOVEFLAG_ONTRANSPORT))
+                        return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW;
+
+                break;
+            }
             case SPELL_EFFECT_SUMMON_PET:
             {
                 if (m_caster->GetPetGuid())                 // let warlock do a replacement summon
@@ -5707,15 +6639,20 @@ SpellCastResult Spell::CheckCast(bool strict)
             {
                 if (m_caster->GetTypeId() != TYPEID_PLAYER)
                     return SPELL_FAILED_BAD_TARGETS;
-                if (!((Player*)m_caster)->GetSelectionGuid())
+
+                if(((Player*)m_caster)->GetSelectionGuid().IsEmpty())
                     return SPELL_FAILED_BAD_TARGETS;
 
                 Player* target = sObjectMgr.GetPlayer(((Player*)m_caster)->GetSelectionGuid());
-                if (!target || ((Player*)m_caster) == target || !target->IsInSameRaidWith((Player*)m_caster))
+
+                if ( !target || ((Player*)m_caster) == target)
+                    return SPELL_FAILED_BAD_TARGETS;
+
+                if (!target->IsInSameRaidWith((Player*)m_caster) && m_spellInfo->Id != 48955)
                     return SPELL_FAILED_BAD_TARGETS;
 
                 // check if our map is dungeon
-                if( sMapStore.LookupEntry(m_caster->GetMapId())->IsDungeon() )
+                if ( sMapStore.LookupEntry(m_caster->GetMapId())->IsDungeon() )
                 {
                     InstanceTemplate const* instance = ObjectMgr::GetInstanceTemplate(m_caster->GetMapId());
                     if(!instance)
@@ -5727,27 +6664,48 @@ SpellCastResult Spell::CheckCast(bool strict)
                 }
                 break;
             }
-            case SPELL_EFFECT_LEAP:
-            case SPELL_EFFECT_TELEPORT_UNITS_FACE_CASTER:
+            case SPELL_EFFECT_FRIEND_SUMMON:
             {
-                float dis = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
-                float fx = m_caster->GetPositionX() + dis * cos(m_caster->GetOrientation());
-                float fy = m_caster->GetPositionY() + dis * sin(m_caster->GetOrientation());
-                // teleport a bit above terrain level to avoid falling below it
-                float fz = m_caster->GetTerrain()->GetHeight(fx, fy, m_caster->GetPositionZ(), true);
-                if(fz <= INVALID_HEIGHT)                    // note: this also will prevent use effect in instances without vmaps height enabled
-                    return SPELL_FAILED_TRY_AGAIN;
+                if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                    return SPELL_FAILED_BAD_TARGETS;
 
-                float caster_pos_z = m_caster->GetPositionZ();
-                // Control the caster to not climb or drop when +-fz > 8
-                if(!(fz <= caster_pos_z + 8 && fz >= caster_pos_z - 8))
-                    return SPELL_FAILED_TRY_AGAIN;
+                if(((Player*)m_caster)->GetSelectionGuid().IsEmpty())
+                    return SPELL_FAILED_BAD_TARGETS;
+
+                Player* target = sObjectMgr.GetPlayer(((Player*)m_caster)->GetSelectionGuid());
+
+                if (!target || !target->IsReferAFriendLinked(((Player*)m_caster)))
+                    return SPELL_FAILED_BAD_TARGETS;
+
+                break;
+            }
+            case SPELL_EFFECT_LEAP_BACK:
+            {
+                if (m_spellInfo->Id == 781)
+                    if(!m_caster->isInCombat())
+                        return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW;
+            }
+            // no break here!
+            case SPELL_EFFECT_TELEPORT_UNITS_FACE_CASTER:
+            {
+                // Blink has leap first and then removing of auras with root effect
+                // need further research with this
+                if (m_spellInfo->Effect[i] != SPELL_EFFECT_LEAP)
+                {
+                    if (m_caster->hasUnitState(UNIT_STAT_ROOT))
+                        return SPELL_FAILED_ROOTED;
+                }
 
                 // not allow use this effect at battleground until battleground start
-                if(m_caster->GetTypeId() == TYPEID_PLAYER)
-                    if(BattleGround const *bg = ((Player*)m_caster)->GetBattleGround())
-                        if(bg->GetStatus() != STATUS_IN_PROGRESS)
+                if (m_caster->GetTypeId() == TYPEID_PLAYER)
+                {
+                    if (BattleGround const *bg = ((Player*)m_caster)->GetBattleGround())
+                        if (bg->GetStatus() != STATUS_IN_PROGRESS)
                             return SPELL_FAILED_TRY_AGAIN;
+
+                    if(((Player*)m_caster)->HasMovementFlag(MOVEFLAG_ONTRANSPORT))
+                        return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW;
+                }
                 break;
             }
             case SPELL_EFFECT_STEAL_BENEFICIAL_BUFF:
@@ -5756,13 +6714,34 @@ SpellCastResult Spell::CheckCast(bool strict)
                     return SPELL_FAILED_BAD_TARGETS;
                 break;
             }
-            default:break;
+            case SPELL_EFFECT_JUMP:
+            case SPELL_EFFECT_JUMP2:
+            case SPELL_EFFECT_CHARGE2:
+            {
+                if (m_caster->hasUnitState(UNIT_STAT_ROOT))
+                    return SPELL_FAILED_ROOTED;
+                break;
+            }
+            case SPELL_EFFECT_ADD_FARSIGHT:
+            {
+                if (m_caster->GetTypeId() != TYPEID_PLAYER || ((Player*)m_caster)->HasExternalViewPoint())
+                    return SPELL_FAILED_BAD_TARGETS;
+            }
+            default:
+                break;
         }
     }
 
     for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
     {
-        switch(m_spellInfo->EffectApplyAuraName[i])
+        // Do not check in case of junk in DBC
+        if (!IsAuraApplyEffect(m_spellInfo, SpellEffectIndex(i)))
+            continue;
+
+        // Possible Unit-target for the spell
+        Unit* expectedTarget = GetPrefilledUnitTargetOrUnitTarget(SpellEffectIndex(i));
+
+        switch (m_spellInfo->EffectApplyAuraName[i])
         {
             case SPELL_AURA_DUMMY:
             {
@@ -5787,7 +6766,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if (m_caster->GetTypeId() != TYPEID_PLAYER)
                     return SPELL_FAILED_UNKNOWN;
 
-                if (m_targets.getUnitTarget() == m_caster)
+                if (expectedTarget == m_caster)
                     return SPELL_FAILED_BAD_TARGETS;
 
                 if (m_caster->GetPetGuid())
@@ -5799,20 +6778,20 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if (m_caster->GetCharmerGuid())
                     return SPELL_FAILED_CHARMED;
 
-                if (!m_targets.getUnitTarget())
+                if (!expectedTarget)
                     return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
 
-                if (m_targets.getUnitTarget()->GetCharmerGuid())
+                if (expectedTarget->GetCharmerGuid())
                     return SPELL_FAILED_CHARMED;
 
-                if (int32(m_targets.getUnitTarget()->getLevel()) > CalculateDamage(SpellEffectIndex(i),m_targets.getUnitTarget()))
+                if (int32(expectedTarget->getLevel()) > CalculateDamage(SpellEffectIndex(i), expectedTarget))
                     return SPELL_FAILED_HIGHLEVEL;
 
                 break;
             }
             case SPELL_AURA_MOD_CHARM:
             {
-                if (m_targets.getUnitTarget() == m_caster)
+                if (expectedTarget == m_caster)
                     return SPELL_FAILED_BAD_TARGETS;
 
                 if (m_caster->GetPetGuid())
@@ -5824,13 +6803,13 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if (m_caster->GetCharmerGuid())
                     return SPELL_FAILED_CHARMED;
 
-                if (!m_targets.getUnitTarget())
+                if (!expectedTarget)
                     return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
 
-                if (m_targets.getUnitTarget()->GetCharmerGuid())
+                if (expectedTarget->GetCharmerGuid())
                     return SPELL_FAILED_CHARMED;
 
-                if (int32(m_targets.getUnitTarget()->getLevel()) > CalculateDamage(SpellEffectIndex(i),m_targets.getUnitTarget()))
+                if (int32(expectedTarget->getLevel()) > CalculateDamage(SpellEffectIndex(i), expectedTarget))
                     return SPELL_FAILED_HIGHLEVEL;
 
                 break;
@@ -5860,11 +6839,11 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if (m_caster->IsInWater())
                     return SPELL_FAILED_ONLY_ABOVEWATER;
 
-                if (m_caster->GetTypeId() == TYPEID_PLAYER && ((Player*)m_caster)->GetTransport())
-                    return SPELL_FAILED_NO_MOUNTS_ALLOWED;
-
                 // Ignore map check if spell have AreaId. AreaId already checked and this prevent special mount spells
-                if (m_caster->GetTypeId() == TYPEID_PLAYER && !sMapStore.LookupEntry(m_caster->GetMapId())->IsMountAllowed() && !m_IsTriggeredSpell && !m_spellInfo->AreaGroupId)
+                if (m_caster->GetTypeId() == TYPEID_PLAYER &&
+                        (m_caster->GetMap() && !sMapStore.LookupEntry(m_caster->GetMapId())->IsMountAllowed()) &&
+                        !m_IsTriggeredSpell &&
+                        !m_spellInfo->AreaGroupId)
                     return SPELL_FAILED_NO_MOUNTS_ALLOWED;
 
                 if (m_caster->IsInDisallowedMountForm())
@@ -5874,11 +6853,11 @@ SpellCastResult Spell::CheckCast(bool strict)
             }
             case SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS:
             {
-                if(!m_targets.getUnitTarget())
+                if (!expectedTarget)
                     return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
 
                 // can be casted at non-friendly unit or own pet/charm
-                if(m_caster->IsFriendlyTo(m_targets.getUnitTarget()))
+                if (m_caster->IsFriendlyTo(expectedTarget))
                     return SPELL_FAILED_TARGET_FRIENDLY;
 
                 break;
@@ -5897,18 +6876,36 @@ SpellCastResult Spell::CheckCast(bool strict)
             }
             case SPELL_AURA_PERIODIC_MANA_LEECH:
             {
-                if (!m_targets.getUnitTarget())
+                if (!expectedTarget)
                     return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
 
                 if (m_caster->GetTypeId() != TYPEID_PLAYER || m_CastItem)
                     break;
 
-                if(m_targets.getUnitTarget()->getPowerType() != POWER_MANA)
+                if (expectedTarget->GetPowerType() != POWER_MANA)
                     return SPELL_FAILED_BAD_TARGETS;
 
                 break;
             }
             case SPELL_AURA_MIRROR_IMAGE:
+            {
+                if (!expectedTarget)
+                    return SPELL_FAILED_BAD_TARGETS;
+
+                // Target must be creature. TODO: Check if target can also be player
+                if (expectedTarget->GetTypeId() != TYPEID_UNIT)
+                    return SPELL_FAILED_BAD_TARGETS;
+
+                if (expectedTarget == m_caster)             // Clone self can't be accepted
+                    return SPELL_FAILED_BAD_TARGETS;
+
+                // It is assumed that target can not be cloned if already cloned by same or other clone auras
+                if (expectedTarget->HasAuraType(SPELL_AURA_MIRROR_IMAGE))
+                    return SPELL_FAILED_BAD_TARGETS;
+
+                break;
+            }
+            case SPELL_AURA_CONTROL_VEHICLE:
             {
                 Unit* pTarget = m_targets.getUnitTarget();
 
@@ -5916,26 +6913,52 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if (m_UniqueTargetInfo.size() == 1)
                     pTarget = m_caster->GetMap()->GetAnyTypeCreature(m_UniqueTargetInfo.front().targetGUID);
 
-                if (!pTarget)
+                if (!pTarget || !pTarget->GetVehicleKit())
                     return SPELL_FAILED_BAD_TARGETS;
 
-                if (pTarget->GetTypeId() != TYPEID_UNIT)    // Target must be creature. TODO: Check if target can also be player
+                if (m_currentBasePoints[i] < 0 || m_currentBasePoints[i] > MAX_VEHICLE_SEAT)
                     return SPELL_FAILED_BAD_TARGETS;
 
-                if (pTarget == m_caster)                    // Clone self can't be accepted
-                    return SPELL_FAILED_BAD_TARGETS;
+                // -1 if "first empty seat", seat number (starting from 0) - in other cases
+                int32 seat = m_currentBasePoints[i] - 1;
 
-                // It is assumed that target can not be cloned if already cloned by same or other clone auras
-                if (pTarget->HasAuraType(SPELL_AURA_MIRROR_IMAGE))
-                    return SPELL_FAILED_BAD_TARGETS;
+                if (!pTarget->GetVehicleKit()->HasEmptySeat(seat))
+                {
+                    if (seat == -1)
+                        return SPELL_FAILED_BAD_TARGETS;
 
+                    if (!seat && m_caster->GetTypeId() == TYPEID_PLAYER && !pTarget->GetVehicleKit()->HasEmptySeat(-1))
+                        return SPELL_FAILED_BAD_TARGETS;
+
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return SPELL_FAILED_BAD_TARGETS;
+                }
                 break;
             }
+            case SPELL_AURA_FAR_SIGHT:
+            case SPELL_AURA_BIND_SIGHT:
+            {
+                if (m_caster->GetTypeId() != TYPEID_PLAYER || ((Player*)m_caster)->HasExternalViewPoint())
+                    return SPELL_FAILED_BAD_TARGETS;
+            }
             default:
                 break;
         }
     }
 
+    // and some hacks, as always
+    switch(m_spellInfo->Id)
+    {
+        // spells that dont have direct effects listed above
+        // maybe should check triggered/linked spells?
+        // but not all are implemented in this way
+        case 36554: // Shadowstep
+        case 51690: // Killing Spree
+            if (m_caster->hasUnitState(UNIT_STAT_ROOT))
+                return SPELL_FAILED_ROOTED;
+            break;
+    }
+
     // check trade slot case (last, for allow catch any another cast problems)
     if (m_targets.m_targetMask & TARGET_FLAG_TRADE_ITEM)
     {
@@ -5961,24 +6984,31 @@ SpellCastResult Spell::CheckCast(bool strict)
         }
     }
 
+    // check LOS for ground targeted spells
+    if (!m_spellInfo->HasAttribute(SPELL_ATTR_EX2_IGNORE_LOS) && !m_targets.getUnitTarget() && !m_targets.getGOTarget() && !m_targets.getItemTarget())
+    {
+        if (!m_targets.getDestination().IsEmpty() && !m_caster->IsWithinLOS(m_targets.getDestination().x, m_targets.getDestination().y, m_targets.getDestination().z))
+            return SPELL_FAILED_LINE_OF_SIGHT;
+    }
+
     // all ok
     return SPELL_CAST_OK;
 }
 
 SpellCastResult Spell::CheckPetCast(Unit* target)
 {
-    if(!m_caster->isAlive())
+    if(!m_caster->isAlive() && !m_spellInfo->HasAttribute(SPELL_ATTR_CASTABLE_WHILE_DEAD))
         return SPELL_FAILED_CASTER_DEAD;
 
-    if(m_caster->IsNonMeleeSpellCasted(false))              //prevent spellcast interruption by another spellcast
+    if (m_caster->IsNonMeleeSpellCasted(false))              //prevent spellcast interruption by another spellcast
         return SPELL_FAILED_SPELL_IN_PROGRESS;
-    if(m_caster->isInCombat() && IsNonCombatSpell(m_spellInfo))
+    if (m_caster->isInCombat() && IsNonCombatSpell(m_spellInfo))
         return SPELL_FAILED_AFFECTING_COMBAT;
 
-    if(m_caster->GetTypeId()==TYPEID_UNIT && (((Creature*)m_caster)->IsPet() || m_caster->isCharmed()))
+    if (m_caster->GetTypeId()==TYPEID_UNIT && (((Creature*)m_caster)->IsPet() || m_caster->isCharmed()))
     {
                                                             //dead owner (pets still alive when owners ressed?)
-        if(m_caster->GetCharmerOrOwner() && !m_caster->GetCharmerOrOwner()->isAlive())
+        if (m_caster->GetCharmerOrOwner() && (!m_caster->GetCharmerOrOwner()->isAlive() && !(m_caster->GetCharmerOrOwner()->getDeathState() == GHOULED)))
             return SPELL_FAILED_CASTER_DEAD;
 
         if(!target && m_targets.getUnitTarget())
@@ -5996,41 +7026,73 @@ SpellCastResult Spell::CheckPetCast(Unit* target)
             {
                 need = true;
                 if(!target)
+                {
+                    DEBUG_LOG("Spell::CheckPetCast Charmed creature %s attempt to cast spell %u, but no required target",m_caster->GetObjectGuid().GetString().c_str(),m_spellInfo->Id);
                     return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
+                }
                 break;
             }
         }
-        if(need)
+        if (need)
             m_targets.setUnitTarget(target);
 
         Unit* _target = m_targets.getUnitTarget();
 
-        if(_target)                                         //for target dead/target not valid
+        if (_target)                                         //for target dead/target not valid
         {
-            if (!_target->isTargetableForAttack())
-                return SPELL_FAILED_BAD_TARGETS;            // guessed error
-
-            if(IsPositiveSpell(m_spellInfo->Id))
+            if (IsPositiveSpell(m_spellInfo->Id) && !IsDispelSpell(m_spellInfo))
             {
-                if(m_caster->IsHostileTo(_target))
+                if (m_caster->IsHostileTo(_target))
+                {
+                    DEBUG_LOG("Spell::CheckPetCast Charmed creature %s attempt to cast positive spell %u, but target %s is hostile",m_caster->GetObjectGuid().GetString().c_str(),m_spellInfo->Id, target->GetObjectGuid().GetString().c_str());
                     return SPELL_FAILED_BAD_TARGETS;
+                }
+            }
+            else if (!_target->isTargetableForAttack() ||
+            (!m_IsTriggeredSpell &&
+            (!_target->isVisibleForOrDetect(m_caster,m_caster,true) && (m_caster->GetCharmerOrOwner() && !target->isVisibleForOrDetect(m_caster->GetCharmerOrOwner(),m_caster->GetCharmerOrOwner(),true)))))
+            {
+                DEBUG_LOG("Spell::CheckPetCast Charmed creature %s attempt to cast spell %u, but target %s is not targetable or not detectable",m_caster->GetObjectGuid().GetString().c_str(),m_spellInfo->Id,target->GetObjectGuid().GetString().c_str());
+                return SPELL_FAILED_BAD_TARGETS;            // guessed error
             }
             else
             {
-                bool duelvsplayertar = false;
+                bool dualEffect = false;
                 for(int j = 0; j < MAX_EFFECT_INDEX; ++j)
                 {
-                                                            //TARGET_DUELVSPLAYER is positive AND negative
-                    duelvsplayertar |= (m_spellInfo->EffectImplicitTargetA[j] == TARGET_DUELVSPLAYER);
+                                                            // This effects is positive AND negative. Need for vehicles cast.
+                    dualEffect |= (m_spellInfo->EffectImplicitTargetA[j] == TARGET_DUELVSPLAYER
+                                   || m_spellInfo->EffectImplicitTargetA[j] == TARGET_IN_FRONT_OF_CASTER_30
+                                   || m_spellInfo->EffectImplicitTargetA[j] == TARGET_MASTER
+                                   || m_spellInfo->EffectImplicitTargetA[j] == TARGET_SELF2
+                                   || m_spellInfo->EffectImplicitTargetA[j] == TARGET_IN_FRONT_OF_CASTER
+                                   || m_spellInfo->EffectImplicitTargetA[j] == TARGET_EFFECT_SELECT
+                                   || m_spellInfo->EffectImplicitTargetA[j] == TARGET_CASTER_COORDINATES);
+                }
+                if (!dualEffect && m_caster->getVictim() && (!IsPositiveSpell(m_spellInfo->Id) || IsDispelSpell(m_spellInfo)))
+                {
+                    if (!m_caster->IsHostileTo(_target) && (m_caster->GetCharmerOrOwner() && m_caster->GetCharmerOrOwner()->IsFriendlyTo(_target)))
+                    {
+                        DEBUG_LOG("Spell::CheckPetCast Charmed creature %s attempt to cast negative spell %u, but target %s is friendly",m_caster->GetObjectGuid().GetString().c_str(),m_spellInfo->Id, target->GetObjectGuid().GetString().c_str());
+                        return SPELL_FAILED_BAD_TARGETS;
+                    }
+                }
+                else if (!m_caster->GetVehicleKit() && m_caster->IsFriendlyTo(_target) && !(!m_caster->GetCharmerOrOwner() || !m_caster->GetCharmerOrOwner()->IsFriendlyTo(_target))
+                     && !dualEffect && !IsDispelSpell(m_spellInfo))
+                {
+                    DEBUG_LOG("Spell::CheckPetCast Charmed creature %s attempt to cast spell %u, but target %s is not valid",m_caster->GetObjectGuid().GetString().c_str(),m_spellInfo->Id,_target->GetObjectGuid().GetString().c_str());
+                    return SPELL_FAILED_BAD_TARGETS;
                 }
-                if(m_caster->IsFriendlyTo(target) && !duelvsplayertar)
+
+                if (m_caster->GetObjectGuid() == _target->GetObjectGuid() && !dualEffect && !IsPositiveSpell(m_spellInfo->Id))
                 {
+                    DEBUG_LOG("Spell::CheckPetCast Charmed creature %s attempt to cast negative spell %u on self!",m_caster->GetObjectGuid().GetString().c_str(), m_spellInfo->Id);
                     return SPELL_FAILED_BAD_TARGETS;
                 }
             }
         }
                                                             //cooldown
-        if(((Creature*)m_caster)->HasSpellCooldown(m_spellInfo->Id))
+        if(m_caster->HasSpellCooldown(m_spellInfo))
             return SPELL_FAILED_NOT_READY;
     }
 
@@ -6081,7 +7143,7 @@ SpellCastResult Spell::CheckCasterAuras() const
     if (unitflag & UNIT_FLAG_STUNNED)
     {
         // Pain Suppression (have SPELL_ATTR_EX5_USABLE_WHILE_STUNNED that must be used only with glyph)
-        if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PRIEST && m_spellInfo->SpellIconID == 2178)
+        if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PRIEST && m_spellInfo->GetSpellIconID() == 2178)
         {
             if (!m_caster->HasAura(63248))                  // Glyph of Pain Suppression
                 spellUsableWhileStunned = false;
@@ -6104,15 +7166,15 @@ SpellCastResult Spell::CheckCasterAuras() const
         else
             prevented_reason = SPELL_FAILED_STUNNED;
     }
-    else if (unitflag & UNIT_FLAG_CONFUSED && !m_spellInfo->HasAttribute(SPELL_ATTR_EX5_USABLE_WHILE_CONFUSED))
+    else if ((unitflag & UNIT_FLAG_CONFUSED) && !m_spellInfo->HasAttribute(SPELL_ATTR_EX5_USABLE_WHILE_CONFUSED))
         prevented_reason = SPELL_FAILED_CONFUSED;
-    else if (unitflag & UNIT_FLAG_FLEEING && !m_spellInfo->HasAttribute(SPELL_ATTR_EX5_USABLE_WHILE_FEARED))
+    else if ((unitflag & UNIT_FLAG_FLEEING) && !m_spellInfo->HasAttribute(SPELL_ATTR_EX5_USABLE_WHILE_FEARED))
         prevented_reason = SPELL_FAILED_FLEEING;
-    else if (unitflag & UNIT_FLAG_SILENCED && m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE)
+    else if ((unitflag & UNIT_FLAG_SILENCED) && m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE)
         prevented_reason = SPELL_FAILED_SILENCED;
-    else if (unitflag & UNIT_FLAG_PACIFIED && m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY)
+    else if ((unitflag & UNIT_FLAG_PACIFIED) && m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY)
         prevented_reason = SPELL_FAILED_PACIFIED;
-    else if(m_caster->HasAuraType(SPELL_AURA_ALLOW_ONLY_ABILITY))
+    else if (m_caster->HasAuraType(SPELL_AURA_ALLOW_ONLY_ABILITY))
     {
         Unit::AuraList const& casingLimit = m_caster->GetAurasByType(SPELL_AURA_ALLOW_ONLY_ABILITY);
         for(Unit::AuraList::const_iterator itr = casingLimit.begin(); itr != casingLimit.end(); ++itr)
@@ -6131,11 +7193,11 @@ SpellCastResult Spell::CheckCasterAuras() const
         if (school_immune || mechanic_immune || dispel_immune)
         {
             //Checking auras is needed now, because you are prevented by some state but the spell grants immunity.
+            MAPLOCK_READ(m_caster, MAP_LOCK_TYPE_AURAS);
             Unit::SpellAuraHolderMap const& auras = m_caster->GetSpellAuraHolderMap();
             for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
             {
-                SpellAuraHolder *holder = itr->second;
-                SpellEntry const * pEntry = holder->GetSpellProto();
+                SpellEntry const * pEntry = itr->second->GetSpellProto();
 
                 if ((GetSpellSchoolMask(pEntry) & school_immune) && !pEntry->HasAttribute(SPELL_ATTR_EX_UNAFFECTED_BY_SCHOOL_IMMUNE))
                     continue;
@@ -6144,7 +7206,7 @@ SpellCastResult Spell::CheckCasterAuras() const
 
                 for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
                 {
-                    Aura *aura = holder->GetAuraByEffectIndex(SpellEffectIndex(i));
+                    Aura *aura = itr->second->GetAuraByEffectIndex(SpellEffectIndex(i));
                     if (!aura)
                         continue;
 
@@ -6169,7 +7231,7 @@ SpellCastResult Spell::CheckCasterAuras() const
                         case SPELL_AURA_MOD_SILENCE:
                         case SPELL_AURA_MOD_PACIFY:
                         case SPELL_AURA_MOD_PACIFY_SILENCE:
-                            if( m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY)
+                            if ( m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY)
                                 return SPELL_FAILED_PACIFIED;
                             else if ( m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE)
                                 return SPELL_FAILED_SILENCED;
@@ -6186,116 +7248,217 @@ SpellCastResult Spell::CheckCasterAuras() const
     return SPELL_CAST_OK;
 }
 
-bool Spell::CanAutoCast(Unit* target)
+SpellCastResult Spell::CheckCastTargets() const
+{
+
+    if (!IsSpellRequiresTarget(m_spellInfo) || IsSpellWithCasterSourceTargetsOnly(m_spellInfo))
+        return SPELL_CAST_OK;
+
+    // Spell without any target
+    if ( !m_targets.HasLocation() &&
+        m_UniqueTargetInfo.empty() &&
+        m_UniqueGOTargetInfo.empty() &&
+        m_UniqueItemInfo.empty())
+        return SPELL_FAILED_BAD_TARGETS;
+
+    // recheck by target mask - NY currently
+    /*
+    if (m_targets.m_targetMask & (TARGET_FLAG_DEST_LOCATION | TARGET_FLAG_SRC_LOCATION))
+        if (!m_targets.HasLocation())
+            return SPELL_FAILED_BAD_TARGETS;
+    if (m_targets.m_targetMask & (TARGET_FLAG_SELF | TARGET_FLAG_UNIT))
+        if (m_UniqueTargetInfo.empty())
+            return SPELL_FAILED_BAD_TARGETS;
+    if (m_targets.m_targetMask & TARGET_FLAG_ITEM)
+        if (m_UniqueItemInfo.empty())
+            return SPELL_FAILED_BAD_TARGETS;
+    if (m_targets.m_targetMask & (TARGET_FLAG_OBJECT | TARGET_FLAG_OBJECT_UNK))
+        if (m_UniqueGOTargetInfo.empty())
+            return SPELL_FAILED_BAD_TARGETS;
+    */
+
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        switch (m_spellInfo->Effect[i])
+        {
+            case SPELL_EFFECT_LEAP:
+            {
+                // Destination point checked only in third (CheckTargets) check phase, in first/second his not setted
+                if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
+                {
+                    // spell failed, if distance less then 1.0f
+                    if (m_caster->GetDistance(m_targets.getDestination()) < 1.0f)
+                        return SPELL_FAILED_TOO_CLOSE;
+
+                    if (fabs(m_caster->GetPositionZ() - m_targets.getDestination().getZ()) > 8.0f)
+                        return SPELL_FAILED_NOPATH;
+
+                    float pz  = m_caster->GetMap()->GetHeight(m_caster->GetPhaseMask(), m_targets.getDestination().getX(), m_targets.getDestination().getY(), m_targets.getDestination().getZ());
+
+                    if (fabs(pz - m_targets.getDestination().getZ()) > 8.0f)
+                        return SPELL_FAILED_NOPATH;
+                }
+                else
+                    return SPELL_FAILED_TRY_AGAIN;
+                break;
+            }
+            default:
+                break;
+        }
+    }
+
+    return SPELL_CAST_OK;
+}
+
+SpellCastResult Spell::CanAutoCast(Unit* target)
 {
     ObjectGuid targetguid = target->GetObjectGuid();
 
     for(int j = 0; j < MAX_EFFECT_INDEX; ++j)
     {
-        if(m_spellInfo->Effect[j] == SPELL_EFFECT_APPLY_AURA)
+        if (m_spellInfo->Effect[j] == SPELL_EFFECT_APPLY_AURA)
         {
-            if( m_spellInfo->StackAmount <= 1)
+            if ( m_spellInfo->StackAmount <= 1)
             {
-                if( target->HasAura(m_spellInfo->Id, SpellEffectIndex(j)) )
-                    return false;
+                if (target->HasAura(m_spellInfo->Id, SpellEffectIndex(j)))
+                    return SPELL_FAILED_TARGET_AURASTATE;
             }
             else
             {
-                if(Aura* aura = target->GetAura(m_spellInfo->Id, SpellEffectIndex(j)))
-                    if(aura->GetStackAmount() >= m_spellInfo->StackAmount)
-                        return false;
+                if (Aura* aura = target->GetAura(m_spellInfo->Id, SpellEffectIndex(j)))
+                    if (aura->GetStackAmount() >= m_spellInfo->StackAmount)
+                        return SPELL_FAILED_TARGET_AURASTATE;
             }
         }
-        else if ( IsAreaAuraEffect( m_spellInfo->Effect[j] ))
+        else if (IsAreaAuraEffect( m_spellInfo->Effect[j] ))
         {
-                if( target->HasAura(m_spellInfo->Id, SpellEffectIndex(j)) )
-                    return false;
+            if ( target->HasAura(m_spellInfo->Id, SpellEffectIndex(j)) )
+                return SPELL_FAILED_TARGET_AURASTATE;
         }
     }
 
     SpellCastResult result = CheckPetCast(target);
 
-    if(result == SPELL_CAST_OK || result == SPELL_FAILED_UNIT_NOT_INFRONT)
+    if (result == SPELL_CAST_OK || result == SPELL_FAILED_UNIT_NOT_INFRONT)
     {
         FillTargetMap();
         //check if among target units, our WANTED target is as well (->only self cast spells return false)
-        for(TargetList::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
+        for (TargetList::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
             if (ihit->targetGUID == targetguid)
-                return true;
+                return result;
     }
-    return false;                                           //target invalid
+    return result;                                           //target invalid
 }
 
-SpellCastResult Spell::CheckRange(bool strict)
+SpellCastResult Spell::CheckRange(bool strict) const
 {
-    Unit *target = m_targets.getUnitTarget();
+    // don't check for non strict instant cast spells
+    if (!strict && !m_casttime)
+        return SPELL_CAST_OK;
+
+    // self cast doesn't need range checking -- also for Starshards fix
+    // spells that can be cast anywhere also need no check
+    if (m_spellInfo->GetRangeIndex() == SPELL_RANGE_IDX_SELF_ONLY ||
+        m_spellInfo->GetRangeIndex() == SPELL_RANGE_IDX_ANYWHERE)
+        return SPELL_CAST_OK;
 
-    // special range cases
-    switch(m_spellInfo->rangeIndex)
+    Unit* pTarget = m_targets.getUnitTarget();
+
+    // combat range spells are treated differently
+    if (m_spellInfo->GetRangeIndex() == SPELL_RANGE_IDX_COMBAT && pTarget)
     {
-        // self cast doesn't need range checking -- also for Starshards fix
-        // spells that can be cast anywhere also need no check
-        case SPELL_RANGE_IDX_SELF_ONLY:
-        case SPELL_RANGE_IDX_ANYWHERE:
+        if (pTarget == m_caster)
             return SPELL_CAST_OK;
-        // combat range spells are treated differently
-        case SPELL_RANGE_IDX_COMBAT:
-        {
-            if (target)
-            {
-                if (target == m_caster)
-                    return SPELL_CAST_OK;
 
-                float range_mod = strict ? 0.0f : 5.0f;
-                float base = ATTACK_DISTANCE;
-                if (Player* modOwner = m_caster->GetSpellModOwner())
-                    range_mod += modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, base, this);
+        if (m_caster->GetTypeId() == TYPEID_PLAYER &&
+            (m_spellInfo->FacingCasterFlags & SPELL_FACING_FLAG_INFRONT) && !m_caster->HasInArc(M_PI_F, pTarget))
+            return SPELL_FAILED_UNIT_NOT_INFRONT;
 
-                // with additional 5 dist for non stricted case (some melee spells have delay in apply
-                return m_caster->CanReachWithMeleeAttack(target, range_mod) ? SPELL_CAST_OK : SPELL_FAILED_OUT_OF_RANGE;
-            }
-            break;                                          // let continue in generic way for no target
-        }
+        float rangeMod = (strict ? 0.0f : 5.0f) + sWorld.getConfig(CONFIG_FLOAT_MELEE_DIST_ADDITION);
+
+        if (Player* modOwner = m_caster->GetSpellModOwner())
+            modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, rangeMod);
+
+        // with additional 5 dist for non stricted case (some melee spells have delay in apply
+        return m_caster->CanReachWithMeleeAttack(pTarget, rangeMod) ? SPELL_CAST_OK : SPELL_FAILED_OUT_OF_RANGE;
     }
 
-    //add radius of caster and ~5 yds "give" for non stricred (landing) check
-    float range_mod = strict ? 1.25f : 6.25;
+    // generic way
 
-    SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex);
-    bool friendly = target ? target->IsFriendlyTo(m_caster) : false;
-    float max_range = GetSpellMaxRange(srange, friendly) + range_mod;
+    // add radius of caster and ~5 yds "give" for non stricred (landing) check
+    float add_range = strict ? 1.25f : 6.25f;
+
+    SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex());
+    bool friendly = pTarget ? pTarget->IsFriendlyTo(m_caster) : false;
+    float max_range = GetSpellMaxRange(srange, friendly) + add_range;
     float min_range = GetSpellMinRange(srange, friendly);
 
-    if(Player* modOwner = m_caster->GetSpellModOwner())
-        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, max_range, this);
+    if (Player* modOwner = m_caster->GetSpellModOwner())
+        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, max_range);
 
-    if(target && target != m_caster)
+    if (pTarget && pTarget != m_caster)
     {
         // distance from target in checks
-        float dist = m_caster->GetCombatDistance(target);
+        float dist = m_caster->GetCombatDistance(pTarget, m_spellInfo->GetRangeIndex() == SPELL_RANGE_IDX_COMBAT);
 
-        if(dist > max_range)
+        if (dist > max_range)
             return SPELL_FAILED_OUT_OF_RANGE;
-        if(min_range && dist < min_range)
+        if (min_range && dist < min_range)
             return SPELL_FAILED_TOO_CLOSE;
-        if( m_caster->GetTypeId() == TYPEID_PLAYER &&
-            (m_spellInfo->FacingCasterFlags & SPELL_FACING_FLAG_INFRONT) && !m_caster->HasInArc( M_PI_F, target ) )
+        if (m_caster->GetTypeId() == TYPEID_PLAYER &&
+            (m_spellInfo->FacingCasterFlags & SPELL_FACING_FLAG_INFRONT) && !m_caster->HasInArc(M_PI_F, pTarget))
             return SPELL_FAILED_UNIT_NOT_INFRONT;
     }
 
     // TODO verify that such spells really use bounding radius
-    if(m_targets.m_targetMask == TARGET_FLAG_DEST_LOCATION && m_targets.m_destX != 0 && m_targets.m_destY != 0 && m_targets.m_destZ != 0)
+    if ((m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) && m_targets.HasLocation())
     {
-        if(!m_caster->IsWithinDist3d(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, max_range))
+        WorldLocation const& loc = m_targets.GetLocation();
+
+        if (max_range && !m_caster->IsWithinDist3d(loc, max_range))
             return SPELL_FAILED_OUT_OF_RANGE;
-        if(min_range && m_caster->IsWithinDist3d(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, min_range))
+        if (min_range && m_caster->IsWithinDist3d(loc, min_range))
             return SPELL_FAILED_TOO_CLOSE;
     }
 
     return SPELL_CAST_OK;
 }
 
-uint32 Spell::CalculatePowerCost(SpellEntry const* spellInfo, Unit* caster, Spell const* spell, Item* castItem)
+SpellCastResult Spell::CheckRangeForChanneledSpells() const
+{
+    if (m_spellInfo->GetRangeIndex() == SPELL_RANGE_IDX_SELF_ONLY ||
+        m_spellInfo->GetRangeIndex() == SPELL_RANGE_IDX_ANYWHERE)
+        return SPELL_CAST_OK;
+
+    Unit* pTarget = m_targets.getUnitTarget();
+    if (!pTarget || pTarget == m_caster)
+        return SPELL_CAST_OK;
+
+    // generic way
+    SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex());
+
+    bool friendly = pTarget ? pTarget->IsFriendlyTo(m_caster) : false;
+    float maxRange = GetSpellMaxRange(srange, friendly);
+    float minRange = GetSpellMinRange(srange, friendly);
+
+    if (Player* modOwner = m_caster->GetSpellModOwner())
+        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, maxRange);
+
+    // distance from target in checks
+    float dist = m_caster->GetDistance(pTarget);
+
+    if (dist > maxRange)
+        return SPELL_FAILED_OUT_OF_RANGE;
+    if (minRange && dist < minRange)
+        return SPELL_FAILED_TOO_CLOSE;
+    if (m_caster->GetTypeId() == TYPEID_PLAYER &&
+        (m_spellInfo->FacingCasterFlags & SPELL_FACING_FLAG_INFRONT) && !m_caster->HasInArc(M_PI_F, pTarget))
+        return SPELL_FAILED_UNIT_NOT_INFRONT;
+
+    return SPELL_CAST_OK;
+}
+
+int32 Spell::CalculatePowerCost(SpellEntry const* spellInfo, Unit* caster, Spell const* spell, Item* castItem)
 {
     // item cast not used power
     if (castItem)
@@ -6305,12 +7468,12 @@ uint32 Spell::CalculatePowerCost(SpellEntry const* spellInfo, Unit* caster, Spel
     if (spellInfo->HasAttribute(SPELL_ATTR_EX_DRAIN_ALL_POWER))
     {
         // If power type - health drain all
-        if (spellInfo->powerType == POWER_HEALTH)
+        if (spellInfo->GetPowerType() == POWER_HEALTH)
             return caster->GetHealth();
         // Else drain all power
-        if (spellInfo->powerType < MAX_POWERS)
-            return caster->GetPower(Powers(spellInfo->powerType));
-        sLog.outError("Spell::CalculateManaCost: Unknown power type '%d' in spell %d", spellInfo->powerType, spellInfo->Id);
+        if (spellInfo->GetPowerType() < MAX_POWERS)
+            return caster->GetPower(Powers(spellInfo->GetPowerType()));
+        sLog.outError("Spell::CalculateManaCost: Unknown power type '%d' in spell %d", spellInfo->GetPowerType(), spellInfo->Id);
         return 0;
     }
 
@@ -6319,7 +7482,7 @@ uint32 Spell::CalculatePowerCost(SpellEntry const* spellInfo, Unit* caster, Spel
     // PCT cost from total amount
     if (spellInfo->ManaCostPercentage)
     {
-        switch (spellInfo->powerType)
+        switch (spellInfo->GetPowerType())
         {
             // health as power used
             case POWER_HEALTH:
@@ -6332,14 +7495,14 @@ uint32 Spell::CalculatePowerCost(SpellEntry const* spellInfo, Unit* caster, Spel
             case POWER_FOCUS:
             case POWER_ENERGY:
             case POWER_HAPPINESS:
-                powerCost += spellInfo->ManaCostPercentage * caster->GetMaxPower(Powers(spellInfo->powerType)) / 100;
+                powerCost += spellInfo->ManaCostPercentage * caster->GetMaxPower(Powers(spellInfo->GetPowerType())) / 100;
                 break;
             case POWER_RUNE:
             case POWER_RUNIC_POWER:
                 DEBUG_LOG("Spell::CalculateManaCost: Not implemented yet!");
                 break;
             default:
-                sLog.outError("Spell::CalculateManaCost: Unknown power type '%d' in spell %d", spellInfo->powerType, spellInfo->Id);
+                sLog.outError("Spell::CalculateManaCost: Unknown power type '%d' in spell %d", spellInfo->GetPowerType(), spellInfo->Id);
                 return 0;
         }
     }
@@ -6352,50 +7515,50 @@ uint32 Spell::CalculatePowerCost(SpellEntry const* spellInfo, Unit* caster, Spel
     // Apply cost mod by spell
     if (spell)
         if (Player* modOwner = caster->GetSpellModOwner())
-            modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_COST, powerCost, spell);
+            modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_COST, powerCost);
 
     if (spellInfo->HasAttribute(SPELL_ATTR_LEVEL_DAMAGE_CALCULATION))
         powerCost = int32(powerCost/ (1.117f * spellInfo->spellLevel / caster->getLevel() -0.1327f));
 
     // PCT mod from user auras by school
-    powerCost = int32(powerCost * (1.0f + caster->GetFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER + school)));
-    if (powerCost < 0)
-        powerCost = 0;
+    powerCost = ceil((float)powerCost * (1.0f + caster->GetFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER + school)));
+
     return powerCost;
 }
 
 SpellCastResult Spell::CheckPower()
 {
     // item cast not used power
-    if(m_CastItem)
+    if (m_CastItem)
         return SPELL_CAST_OK;
 
     // Do precise power regen on spell cast
     if (m_powerCost > 0 && m_caster->GetTypeId() == TYPEID_PLAYER)
     {
         Player* playerCaster = (Player*)m_caster;
-        uint32 diff = REGEN_TIME_FULL - m_caster->GetRegenTimer();
+        uint32 lastRegenInterval = playerCaster->IsUnderLastManaUseEffect() ? REGEN_TIME_PRECISE : REGEN_TIME_FULL;
+        int32 diff = lastRegenInterval - m_caster->GetRegenTimer();
         if (diff >= REGEN_TIME_PRECISE)
             playerCaster->RegenerateAll(diff);
     }
 
     // health as power used - need check health amount
-    if (m_spellInfo->powerType == POWER_HEALTH)
+    if (Powers(m_spellInfo->GetPowerType()) == POWER_HEALTH)
     {
-        if (m_caster->GetHealth() <= m_powerCost)
+        if (m_caster->GetHealth() <= uint32(abs(m_powerCost)))
             return SPELL_FAILED_CASTER_AURASTATE;
         return SPELL_CAST_OK;
     }
 
     // Check valid power type
-    if (m_spellInfo->powerType >= MAX_POWERS)
+    if (m_spellInfo->GetPowerType() >= MAX_POWERS)
     {
-        sLog.outError("Spell::CheckMana: Unknown power type '%d'", m_spellInfo->powerType);
+        sLog.outError("Spell::CheckMana: Unknown power type '%d'", m_spellInfo->GetPowerType());
         return SPELL_FAILED_UNKNOWN;
     }
 
     //check rune cost only if a spell has PowerType == POWER_RUNE
-    if (m_spellInfo->powerType == POWER_RUNE)
+    if (m_spellInfo->GetPowerType() == POWER_RUNE)
     {
         SpellCastResult failReason = CheckOrTakeRunePower(false);
         if (failReason != SPELL_CAST_OK)
@@ -6403,8 +7566,7 @@ SpellCastResult Spell::CheckPower()
     }
 
     // Check power amount
-    Powers powerType = Powers(m_spellInfo->powerType);
-    if (m_caster->GetPower(powerType) < m_powerCost)
+    if (m_powerCost > 0 && (int32(m_caster->GetPower(Powers(m_spellInfo->GetPowerType()))) < m_powerCost))
         return SPELL_FAILED_NO_POWER;
 
     return SPELL_CAST_OK;
@@ -6444,13 +7606,13 @@ SpellCastResult Spell::CheckItems()
     bool isVellumTarget = false;
 
     // cast item checks
-    if(m_CastItem)
+    if (m_CastItem)
     {
         if (m_CastItem->IsInTrade())
             return SPELL_FAILED_ITEM_NOT_FOUND;
 
         uint32 itemid = m_CastItem->GetEntry();
-        if( !p_caster->HasItemCount(itemid, 1) )
+        if ( !p_caster->HasItemCount(itemid, 1) )
             return SPELL_FAILED_ITEM_NOT_FOUND;
 
         ItemPrototype const *proto = m_CastItem->GetProto();
@@ -6462,7 +7624,7 @@ SpellCastResult Spell::CheckItems()
 
         for (int i = 0; i < 5; ++i)
             if (proto->Spells[i].SpellCharges)
-                if(m_CastItem->GetSpellCharges(i) == 0)
+                if (m_CastItem->GetSpellCharges(i) == 0)
                     return SPELL_FAILED_NO_CHARGES_REMAIN;
 
         // consumable cast item checks
@@ -6493,13 +7655,40 @@ SpellCastResult Spell::CheckItems()
                 // Mana Potion, Rage Potion, Thistle Tea(Rogue), ...
                 if (m_spellInfo->Effect[i] == SPELL_EFFECT_ENERGIZE)
                 {
-                    if(m_spellInfo->EffectMiscValue[i] < 0 || m_spellInfo->EffectMiscValue[i] >= MAX_POWERS)
+                    if (m_spellInfo->EffectMiscValue[i] < 0 || m_spellInfo->EffectMiscValue[i] >= MAX_POWERS)
                     {
                         failReason = SPELL_FAILED_ALREADY_AT_FULL_POWER;
                         continue;
                     }
 
                     Powers power = Powers(m_spellInfo->EffectMiscValue[i]);
+                    uint8 targetClass = m_targets.getUnitTarget()->getClass();
+
+                    if (power == POWER_MANA)
+                    {
+                        if (targetClass == CLASS_WARRIOR || targetClass == CLASS_ROGUE)
+                        {
+                            failReason = SPELL_FAILED_BAD_TARGETS;
+                            continue;
+                        }
+                    }
+                    else if (power == POWER_RAGE)
+                    {
+                        if (targetClass != CLASS_WARRIOR && targetClass != CLASS_DRUID)
+                        {
+                            failReason = SPELL_FAILED_BAD_TARGETS;
+                            continue;
+                        }
+                    }
+                    else if (power == POWER_ENERGY)
+                    {
+                        if (targetClass != CLASS_ROGUE && targetClass != CLASS_DRUID)
+                        {
+                            failReason = SPELL_FAILED_BAD_TARGETS;
+                            continue;
+                        }
+                    }
+
                     if (m_targets.getUnitTarget()->GetPower(power) == m_targets.getUnitTarget()->GetMaxPower(power))
                     {
                         failReason = SPELL_FAILED_ALREADY_AT_FULL_POWER;
@@ -6512,6 +7701,7 @@ SpellCastResult Spell::CheckItems()
                     }
                 }
             }
+
             if (failReason != SPELL_CAST_OK)
                 return failReason;
         }
@@ -6541,24 +7731,10 @@ SpellCastResult Spell::CheckItems()
     // if not item target then required item must be equipped (for triggered case not report error)
     else
     {
-        if(m_caster->GetTypeId() == TYPEID_PLAYER && !((Player*)m_caster)->HasItemFitToSpellReqirements(m_spellInfo))
+        if (m_caster->GetTypeId() == TYPEID_PLAYER && !((Player*)m_caster)->HasItemFitToSpellReqirements(m_spellInfo))
             return m_IsTriggeredSpell ? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_EQUIPPED_ITEM_CLASS;
     }
 
-    // check spell focus object
-    if(m_spellInfo->RequiresSpellFocus)
-    {
-        GameObject* ok = NULL;
-        MaNGOS::GameObjectFocusCheck go_check(m_caster,m_spellInfo->RequiresSpellFocus);
-        MaNGOS::GameObjectSearcher<MaNGOS::GameObjectFocusCheck> checker(ok, go_check);
-        Cell::VisitGridObjects(m_caster, checker, m_caster->GetMap()->GetVisibilityDistance());
-
-        if(!ok)
-            return SPELL_FAILED_REQUIRES_SPELL_FOCUS;
-
-        focusObject = ok;                                   // game object found in range
-    }
-
     // check reagents (ignore triggered spells with reagents processed by original spell) and special reagent ignore case.
     if (!IgnoreItemRequirements())
     {
@@ -6566,7 +7742,7 @@ SpellCastResult Spell::CheckItems()
         {
             for(uint32 i = 0; i < MAX_SPELL_REAGENTS; ++i)
             {
-                if(m_spellInfo->Reagent[i] <= 0)
+                if (m_spellInfo->Reagent[i] <= 0)
                     continue;
 
                 uint32 itemid    = m_spellInfo->Reagent[i];
@@ -6687,7 +7863,7 @@ SpellCastResult Spell::CheckItems()
                 if(!targetItem)
                     return SPELL_FAILED_ITEM_NOT_FOUND;
 
-                if( targetItem->GetProto()->ItemLevel < m_spellInfo->baseLevel )
+                if ( targetItem->GetProto()->ItemLevel < m_spellInfo->baseLevel )
                     return SPELL_FAILED_LOWLEVEL;
                 // Check if we can store a new scroll, enchanting vellum has implicit SPELL_EFFECT_CREATE_ITEM
                 if (isVellumTarget && m_spellInfo->EffectItemType[i])
@@ -6701,7 +7877,7 @@ SpellCastResult Spell::CheckItems()
                     }
                 }
                 // Not allow enchant in trade slot for some enchant type
-                if( targetItem->GetOwner() != m_caster )
+                if ( targetItem->GetOwner() != m_caster )
                 {
                     uint32 enchant_id = m_spellInfo->EffectMiscValue[i];
                     SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
@@ -6721,7 +7897,7 @@ SpellCastResult Spell::CheckItems()
                 if(!item)
                     return SPELL_FAILED_ITEM_NOT_FOUND;
                 // Not allow enchant in trade slot for some enchant type
-                if( item->GetOwner() != m_caster )
+                if ( item->GetOwner() != m_caster )
                 {
                     uint32 enchant_id = m_spellInfo->EffectMiscValue[i];
                     SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
@@ -6741,7 +7917,7 @@ SpellCastResult Spell::CheckItems()
                     return SPELL_FAILED_CANT_BE_DISENCHANTED;
 
                 // prevent disenchanting in trade slot
-                if( m_targets.getItemTarget()->GetOwnerGuid() != m_caster->GetObjectGuid() )
+                if ( m_targets.getItemTarget()->GetOwnerGuid() != m_caster->GetObjectGuid() )
                     return SPELL_FAILED_CANT_BE_DISENCHANTED;
 
                 ItemPrototype const* itemProto = m_targets.getItemTarget()->GetProto();
@@ -6807,8 +7983,8 @@ SpellCastResult Spell::CheckItems()
             case SPELL_EFFECT_WEAPON_DAMAGE:
             case SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL:
             {
-                if(m_caster->GetTypeId() != TYPEID_PLAYER) return SPELL_FAILED_TARGET_NOT_PLAYER;
-                if( m_attackType != RANGED_ATTACK )
+                if (m_caster->GetTypeId() != TYPEID_PLAYER) return SPELL_FAILED_TARGET_NOT_PLAYER;
+                if ( m_attackType != RANGED_ATTACK )
                     break;
                 Item *pItem = ((Player*)m_caster)->GetWeaponForAttack(m_attackType,true,false);
                 if (!pItem)
@@ -6819,7 +7995,7 @@ SpellCastResult Spell::CheckItems()
                     case ITEM_SUBCLASS_WEAPON_THROWN:
                     {
                         uint32 ammo = pItem->GetEntry();
-                        if( !((Player*)m_caster)->HasItemCount( ammo, 1 ) )
+                        if ( !((Player*)m_caster)->HasItemCount( ammo, 1 ) )
                             return SPELL_FAILED_NO_AMMO;
                     };  break;
                     case ITEM_SUBCLASS_WEAPON_GUN:
@@ -6830,7 +8006,7 @@ SpellCastResult Spell::CheckItems()
                         if(!ammo)
                         {
                             // Requires No Ammo
-                            if(m_caster->GetDummyAura(46699))
+                            if (m_caster->GetDummyAura(46699))
                                 break;                      // skip other checks
 
                             return SPELL_FAILED_NO_AMMO;
@@ -6840,7 +8016,7 @@ SpellCastResult Spell::CheckItems()
                         if(!ammoProto)
                             return SPELL_FAILED_NO_AMMO;
 
-                        if(ammoProto->Class != ITEM_CLASS_PROJECTILE)
+                        if (ammoProto->Class != ITEM_CLASS_PROJECTILE)
                             return SPELL_FAILED_NO_AMMO;
 
                         // check ammo ws. weapon compatibility
@@ -6848,18 +8024,18 @@ SpellCastResult Spell::CheckItems()
                         {
                             case ITEM_SUBCLASS_WEAPON_BOW:
                             case ITEM_SUBCLASS_WEAPON_CROSSBOW:
-                                if(ammoProto->SubClass != ITEM_SUBCLASS_ARROW)
+                                if (ammoProto->SubClass != ITEM_SUBCLASS_ARROW)
                                     return SPELL_FAILED_NO_AMMO;
                                 break;
                             case ITEM_SUBCLASS_WEAPON_GUN:
-                                if(ammoProto->SubClass != ITEM_SUBCLASS_BULLET)
+                                if (ammoProto->SubClass != ITEM_SUBCLASS_BULLET)
                                     return SPELL_FAILED_NO_AMMO;
                                 break;
                             default:
                                 return SPELL_FAILED_NO_AMMO;
                         }
 
-                        if( !((Player*)m_caster)->HasItemCount( ammo, 1 ) )
+                        if ( !((Player*)m_caster)->HasItemCount( ammo, 1 ) )
                             return SPELL_FAILED_NO_AMMO;
                     };  break;
                     case ITEM_SUBCLASS_WEAPON_WAND:
@@ -6884,7 +8060,7 @@ void Spell::Delayed()
     if (m_spellState == SPELL_STATE_DELAYED)
         return;                                             // spell is active and can't be time-backed
 
-    if(isDelayableNoMore())                                 // Spells may only be delayed twice
+    if (isDelayableNoMore())                                 // Spells may only be delayed twice
         return;
 
     // spells not loosing casting time ( slam, dynamites, bombs.. )
@@ -6894,14 +8070,14 @@ void Spell::Delayed()
     // check pushback reduce
     int32 delaytime = 500;                                  // spellcasting delay is normally 500ms
     int32 delayReduce = 100;                                // must be initialized to 100 for percent modifiers
-    ((Player*)m_caster)->ApplySpellMod(m_spellInfo->Id, SPELLMOD_NOT_LOSE_CASTING_TIME, delayReduce, this);
+    ((Player*)m_caster)->ApplySpellMod(m_spellInfo->Id, SPELLMOD_NOT_LOSE_CASTING_TIME, delayReduce);
     delayReduce += m_caster->GetTotalAuraModifier(SPELL_AURA_REDUCE_PUSHBACK) - 100;
-    if(delayReduce >= 100)
+    if (delayReduce >= 100)
         return;
 
     delaytime = delaytime * (100 - delayReduce) / 100;
 
-    if(int32(m_timer) + delaytime > m_casttime)
+    if (int32(m_timer) + delaytime > m_casttime)
     {
         delaytime = m_casttime - m_timer;
         m_timer = m_casttime;
@@ -6911,7 +8087,7 @@ void Spell::Delayed()
 
     DETAIL_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell %u partially interrupted for (%d) ms at damage", m_spellInfo->Id, delaytime);
 
-    WorldPacket data(SMSG_SPELL_DELAYED, 8+4);
+    WorldPacket data(SMSG_SPELL_DELAYED, m_caster->GetPackGUID().size() + 4);
     data << m_caster->GetPackGUID();
     data << uint32(delaytime);
 
@@ -6923,20 +8099,20 @@ void Spell::DelayedChannel()
     if(!m_caster || m_caster->GetTypeId() != TYPEID_PLAYER || getState() != SPELL_STATE_CASTING)
         return;
 
-    if(isDelayableNoMore())                                 // Spells may only be delayed twice
+    if (isDelayableNoMore())                                 // Spells may only be delayed twice
         return;
 
     // check pushback reduce
     int32 delaytime = GetSpellDuration(m_spellInfo) * 25 / 100;// channeling delay is normally 25% of its time per hit
     int32 delayReduce = 100;                                // must be initialized to 100 for percent modifiers
-    ((Player*)m_caster)->ApplySpellMod(m_spellInfo->Id, SPELLMOD_NOT_LOSE_CASTING_TIME, delayReduce, this);
+    ((Player*)m_caster)->ApplySpellMod(m_spellInfo->Id, SPELLMOD_NOT_LOSE_CASTING_TIME, delayReduce);
     delayReduce += m_caster->GetTotalAuraModifier(SPELL_AURA_REDUCE_PUSHBACK) - 100;
-    if(delayReduce >= 100)
+    if (delayReduce >= 100)
         return;
 
     delaytime = delaytime * (100 - delayReduce) / 100;
 
-    if(int32(m_timer) < delaytime)
+    if (int32(m_timer) < delaytime)
     {
         delaytime = m_timer;
         m_timer = 0;
@@ -6967,16 +8143,16 @@ void Spell::DelayedChannel()
 
 void Spell::UpdateOriginalCasterPointer()
 {
-    if(m_originalCasterGUID == m_caster->GetObjectGuid())
+    if (m_originalCasterGuid == m_caster->GetObjectGuid())
         m_originalCaster = m_caster;
-    else if (m_originalCasterGUID.IsGameObject())
+    else if (m_originalCasterGuid.IsGameObject())
     {
-        GameObject* go = m_caster->IsInWorld() ? m_caster->GetMap()->GetGameObject(m_originalCasterGUID) : NULL;
+        GameObject* go = m_caster->IsInWorld() ? m_caster->GetMap()->GetGameObject(m_originalCasterGuid) : NULL;
         m_originalCaster = go ? go->GetOwner() : NULL;
     }
     else
     {
-        Unit* unit = ObjectAccessor::GetUnit(*m_caster, m_originalCasterGUID);
+        Unit* unit = ObjectAccessor::GetUnit(*m_caster, m_originalCasterGuid);
         m_originalCaster = unit && unit->IsInWorld() ? unit : NULL;
     }
 }
@@ -6988,289 +8164,47 @@ void Spell::UpdatePointers()
     m_targets.Update(m_caster);
 }
 
-bool Spell::CheckTargetCreatureType(Unit* target) const
-{
-    uint32 spellCreatureTargetMask = m_spellInfo->TargetCreatureType;
-
-    // Curse of Doom: not find another way to fix spell target check :/
-    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->Category == 1179)
-    {
-        // not allow cast at player
-        if(target->GetTypeId() == TYPEID_PLAYER)
-            return false;
-
-        spellCreatureTargetMask = 0x7FF;
-    }
-
-    // Dismiss Pet and Taming Lesson skipped
-    if(m_spellInfo->Id == 2641 || m_spellInfo->Id == 23356)
-        spellCreatureTargetMask =  0;
-
-    if (spellCreatureTargetMask)
-    {
-        uint32 TargetCreatureType = target->GetCreatureTypeMask();
-
-        return !TargetCreatureType || (spellCreatureTargetMask & TargetCreatureType);
-    }
-    return true;
-}
-
 CurrentSpellTypes Spell::GetCurrentContainer()
 {
     if (IsNextMeleeSwingSpell())
-        return(CURRENT_MELEE_SPELL);
+        return (CURRENT_MELEE_SPELL);
     else if (IsAutoRepeat())
-        return(CURRENT_AUTOREPEAT_SPELL);
+        return (CURRENT_AUTOREPEAT_SPELL);
     else if (IsChanneledSpell(m_spellInfo))
-        return(CURRENT_CHANNELED_SPELL);
+        return (CURRENT_CHANNELED_SPELL);
     else
-        return(CURRENT_GENERIC_SPELL);
+        return (CURRENT_GENERIC_SPELL);
 }
 
-bool Spell::CheckTarget( Unit* target, SpellEffectIndex eff )
-{
-    // Check targets for creature type mask and remove not appropriate (skip explicit self target case, maybe need other explicit targets)
-    if(m_spellInfo->EffectImplicitTargetA[eff] != TARGET_SELF )
-    {
-        if (!CheckTargetCreatureType(target))
-            return false;
-    }
-
-    // Check Aura spell req (need for AoE spells)
-    if(m_spellInfo->targetAuraSpell && !target->HasAura(m_spellInfo->targetAuraSpell))
-        return false;
-    if (m_spellInfo->excludeTargetAuraSpell && target->HasAura(m_spellInfo->excludeTargetAuraSpell))
-        return false;
-
-    // Check targets for not_selectable unit flag and remove
-    // A player can cast spells on his pet (or other controlled unit) though in any state
-    if (target != m_caster && target->GetCharmerOrOwnerGuid() != m_caster->GetObjectGuid())
-    {
-        // any unattackable target skipped
-        if (target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
-            return false;
-
-        // unselectable targets skipped in all cases except TARGET_SCRIPT targeting
-        // in case TARGET_SCRIPT target selected by server always and can't be cheated
-        if ((!m_IsTriggeredSpell || target != m_targets.getUnitTarget()) &&
-            target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE) &&
-            m_spellInfo->EffectImplicitTargetA[eff] != TARGET_SCRIPT &&
-            m_spellInfo->EffectImplicitTargetB[eff] != TARGET_SCRIPT &&
-            m_spellInfo->EffectImplicitTargetA[eff] != TARGET_AREAEFFECT_INSTANT &&
-            m_spellInfo->EffectImplicitTargetB[eff] != TARGET_AREAEFFECT_INSTANT &&
-            m_spellInfo->EffectImplicitTargetA[eff] != TARGET_AREAEFFECT_CUSTOM &&
-            m_spellInfo->EffectImplicitTargetB[eff] != TARGET_AREAEFFECT_CUSTOM )
-            return false;
-    }
-
-    // Check player targets and remove if in GM mode or GM invisibility (for not self casting case)
-    if( target != m_caster && target->GetTypeId() == TYPEID_PLAYER)
-    {
-        if(((Player*)target)->GetVisibility() == VISIBILITY_OFF)
-            return false;
-
-        if(((Player*)target)->isGameMaster() && !IsPositiveSpell(m_spellInfo->Id))
-            return false;
-    }
-
-    // Check targets for LOS visibility (except spells without range limitations )
-    switch(m_spellInfo->Effect[eff])
-    {
-        case SPELL_EFFECT_SUMMON_PLAYER:                    // from anywhere
-            break;
-        case SPELL_EFFECT_DUMMY:
-            if(m_spellInfo->Id != 20577)                    // Cannibalize
-                break;
-            // fall through
-        case SPELL_EFFECT_RESURRECT_NEW:
-            // player far away, maybe his corpse near?
-            if(target != m_caster && !target->IsWithinLOSInMap(m_caster))
-            {
-                if (!m_targets.getCorpseTargetGuid())
-                    return false;
-
-                Corpse *corpse = m_caster->GetMap()->GetCorpse(m_targets.getCorpseTargetGuid());
-                if(!corpse)
-                    return false;
-
-                if(target->GetObjectGuid() != corpse->GetOwnerGuid())
-                    return false;
-
-                if(!corpse->IsWithinLOSInMap(m_caster))
-                    return false;
-            }
-
-            // all ok by some way or another, skip normal check
-            break;
-        default:                                            // normal case
-            // Get GO cast coordinates if original caster -> GO
-            if (target != m_caster)
-                if (WorldObject *caster = GetCastingObject())
-                    if (!target->IsWithinLOSInMap(caster))
-                        return false;
-            break;
-    }
-
-    switch (m_spellInfo->Id)
-    {
-        case 37433:                                         // Spout (The Lurker Below), only players affected if its not in water
-            if (target->GetTypeId() != TYPEID_PLAYER || target->IsInWater())
-                return false;
-        default: break;
-    }
-
-    return true;
-}
 
 bool Spell::IsNeedSendToClient() const
 {
-    return m_spellInfo->SpellVisual[0] || m_spellInfo->SpellVisual[1] || IsChanneledSpell(m_spellInfo) ||
-        m_spellInfo->speed > 0.0f || (!m_triggeredByAuraSpell && !m_IsTriggeredSpell);
+    return m_spellInfo->GetSpellVisual() || m_spellInfo->SpellVisual[1] || IsChanneledSpell(m_spellInfo) ||
+        m_spellInfo->GetSpeed() > 0.0f || (!m_triggeredByAuraSpell && !m_IsTriggeredSpell);
 }
 
-bool Spell::IsTriggeredSpellWithRedundentData() const
+bool Spell::IsTriggeredSpellWithRedundentCastTime() const
 {
-    return m_triggeredByAuraSpell || m_triggeredBySpellInfo ||
-        // possible not need after above check?
-        m_IsTriggeredSpell && (m_spellInfo->manaCost || m_spellInfo->ManaCostPercentage);
+    return m_IsTriggeredSpell && (m_spellInfo->manaCost || m_spellInfo->ManaCostPercentage);
 }
 
 bool Spell::HaveTargetsForEffect(SpellEffectIndex effect) const
 {
     for(TargetList::const_iterator itr = m_UniqueTargetInfo.begin(); itr != m_UniqueTargetInfo.end(); ++itr)
-        if(itr->effectMask & (1 << effect))
+        if (itr->effectMask & (1 << effect))
             return true;
 
     for(GOTargetList::const_iterator itr = m_UniqueGOTargetInfo.begin(); itr != m_UniqueGOTargetInfo.end(); ++itr)
-        if(itr->effectMask & (1 << effect))
+        if (itr->effectMask & (1 << effect))
             return true;
 
     for(ItemTargetList::const_iterator itr = m_UniqueItemInfo.begin(); itr != m_UniqueItemInfo.end(); ++itr)
-        if(itr->effectMask & (1 << effect))
+        if (itr->effectMask & (1 << effect))
             return true;
 
     return false;
 }
 
-SpellEvent::SpellEvent(Spell* spell) : BasicEvent()
-{
-    m_Spell = spell;
-}
-
-SpellEvent::~SpellEvent()
-{
-    if (m_Spell->getState() != SPELL_STATE_FINISHED)
-        m_Spell->cancel();
-
-    if (m_Spell->IsDeletable())
-    {
-        delete m_Spell;
-    }
-    else
-    {
-        sLog.outError("~SpellEvent: %s %u tried to delete non-deletable spell %u. Was not deleted, causes memory leak.",
-            (m_Spell->GetCaster()->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), m_Spell->GetCaster()->GetGUIDLow(), m_Spell->m_spellInfo->Id);
-    }
-}
-
-bool SpellEvent::Execute(uint64 e_time, uint32 p_time)
-{
-    // update spell if it is not finished
-    if (m_Spell->getState() != SPELL_STATE_FINISHED)
-        m_Spell->update(p_time);
-
-    // check spell state to process
-    switch (m_Spell->getState())
-    {
-        case SPELL_STATE_FINISHED:
-        {
-            // spell was finished, check deletable state
-            if (m_Spell->IsDeletable())
-            {
-                // check, if we do have unfinished triggered spells
-                return true;                                // spell is deletable, finish event
-            }
-            // event will be re-added automatically at the end of routine)
-        } break;
-
-        case SPELL_STATE_CASTING:
-        {
-            // this spell is in channeled state, process it on the next update
-            // event will be re-added automatically at the end of routine)
-        } break;
-
-        case SPELL_STATE_DELAYED:
-        {
-            // first, check, if we have just started
-            if (m_Spell->GetDelayStart() != 0)
-            {
-                // no, we aren't, do the typical update
-                // check, if we have channeled spell on our hands
-                if (IsChanneledSpell(m_Spell->m_spellInfo))
-                {
-                    // evented channeled spell is processed separately, casted once after delay, and not destroyed till finish
-                    // check, if we have casting anything else except this channeled spell and autorepeat
-                    if (m_Spell->GetCaster()->IsNonMeleeSpellCasted(false, true, true))
-                    {
-                        // another non-melee non-delayed spell is casted now, abort
-                        m_Spell->cancel();
-                    }
-                    else
-                    {
-                        // do the action (pass spell to channeling state)
-                        m_Spell->handle_immediate();
-                    }
-                    // event will be re-added automatically at the end of routine)
-                }
-                else
-                {
-                    // run the spell handler and think about what we can do next
-                    uint64 t_offset = e_time - m_Spell->GetDelayStart();
-                    uint64 n_offset = m_Spell->handle_delayed(t_offset);
-                    if (n_offset)
-                    {
-                        // re-add us to the queue
-                        m_Spell->GetCaster()->m_Events.AddEvent(this, m_Spell->GetDelayStart() + n_offset, false);
-                        return false;                       // event not complete
-                    }
-                    // event complete
-                    // finish update event will be re-added automatically at the end of routine)
-                }
-            }
-            else
-            {
-                // delaying had just started, record the moment
-                m_Spell->SetDelayStart(e_time);
-                // re-plan the event for the delay moment
-                m_Spell->GetCaster()->m_Events.AddEvent(this, e_time + m_Spell->GetDelayMoment(), false);
-                return false;                               // event not complete
-            }
-        } break;
-
-        default:
-        {
-            // all other states
-            // event will be re-added automatically at the end of routine)
-        } break;
-    }
-
-    // spell processing not complete, plan event on the next update interval
-    m_Spell->GetCaster()->m_Events.AddEvent(this, e_time + 1, false);
-    return false;                                           // event not complete
-}
-
-void SpellEvent::Abort(uint64 /*e_time*/)
-{
-    // oops, the spell we try to do is aborted
-    if (m_Spell->getState() != SPELL_STATE_FINISHED)
-        m_Spell->cancel();
-}
-
-bool SpellEvent::IsDeletable() const
-{
-    return m_Spell->IsDeletable();
-}
-
 SpellCastResult Spell::CanOpenLock(SpellEffectIndex effIndex, uint32 lockId, SkillType& skillId, int32& reqSkillValue, int32& skillValue)
 {
     if(!lockId)                                             // possible case for GO and maybe for items.
@@ -7290,7 +8224,7 @@ SpellCastResult Spell::CanOpenLock(SpellEffectIndex effIndex, uint32 lockId, Ski
         {
             // check key item (many fit cases can be)
             case LOCK_KEY_ITEM:
-                if(lockInfo->Index[j] && m_CastItem && m_CastItem->GetEntry()==lockInfo->Index[j])
+                if (lockInfo->Index[j] && m_CastItem && m_CastItem->GetEntry()==lockInfo->Index[j])
                     return SPELL_CAST_OK;
                 reqKey = true;
                 break;
@@ -7300,7 +8234,7 @@ SpellCastResult Spell::CanOpenLock(SpellEffectIndex effIndex, uint32 lockId, Ski
                 reqKey = true;
 
                 // wrong locktype, skip
-                if(uint32(m_spellInfo->EffectMiscValue[effIndex]) != lockInfo->Index[j])
+                if (uint32(m_spellInfo->EffectMiscValue[effIndex]) != lockInfo->Index[j])
                     continue;
 
                 skillId = SkillByLockType(LockType(lockInfo->Index[j]));
@@ -7327,7 +8261,7 @@ SpellCastResult Spell::CanOpenLock(SpellEffectIndex effIndex, uint32 lockId, Ski
         }
     }
 
-    if(reqKey)
+    if (reqKey)
         return SPELL_FAILED_BAD_TARGETS;
 
     return SPELL_CAST_OK;
@@ -7359,10 +8293,13 @@ void Spell::FillRaidOrPartyTargets(UnitList &targetUnitMap, Unit* member, Unit*
     {
         uint8 subgroup = pMember->GetSubGroup();
 
-        for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player* Target = itr->getSource();
 
+            if (!Target || !Target->IsInWorld() || !Target->GetMap())
+                continue;
+
             // IsHostileTo check duel and controlled by enemy
             if (Target && (raid || subgroup==Target->GetSubGroup())
                 && !m_caster->IsHostileTo(Target))
@@ -7372,10 +8309,21 @@ void Spell::FillRaidOrPartyTargets(UnitList &targetUnitMap, Unit* member, Unit*
                     targetUnitMap.push_back(Target);
 
                 if (withPets)
-                    if (Pet* pet = Target->GetPet())
-                        if ((pet == center || center->IsWithinDistInMap(pet, radius)) &&
-                            (withcaster || pet != m_caster))
-                            targetUnitMap.push_back(pet);
+                {
+                    GuidSet const& groupPets = Target->GetPets();
+                    if (!groupPets.empty())
+                    {
+                        for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                        {
+                            if (Pet* pPet = Target->GetMap()->GetPet(*itr))
+                            {
+                                if ((pPet == center || center->IsWithinDistInMap(pPet, radius)) &&
+                                    (withcaster || pPet != m_caster))
+                                     targetUnitMap.push_back(pPet);
+                            }
+                        }
+                    }
+                }
             }
         }
     }
@@ -7400,7 +8348,7 @@ void Spell::FillRaidOrPartyManaPriorityTargets(UnitList &targetUnitMap, Unit* me
 
     PrioritizeManaUnitQueue manaUsers;
     for(UnitList::const_iterator itr = targetUnitMap.begin(); itr != targetUnitMap.end(); ++itr)
-        if ((*itr)->getPowerType() == POWER_MANA && !(*itr)->isDead())
+        if ((*itr)->GetPowerType() == POWER_MANA && !(*itr)->isDead())
             manaUsers.push(PrioritizeManaUnitWraper(*itr));
 
     targetUnitMap.clear();
@@ -7416,9 +8364,15 @@ void Spell::FillRaidOrPartyHealthPriorityTargets(UnitList &targetUnitMap, Unit*
     FillRaidOrPartyTargets(targetUnitMap, member, center, radius, raid, withPets, withCaster);
 
     PrioritizeHealthUnitQueue healthQueue;
-    for(UnitList::const_iterator itr = targetUnitMap.begin(); itr != targetUnitMap.end(); ++itr)
-        if (!(*itr)->isDead())
-            healthQueue.push(PrioritizeHealthUnitWraper(*itr));
+    for (UnitList::const_iterator itr = targetUnitMap.begin(); itr != targetUnitMap.end(); ++itr)
+    {
+        Unit* unit = *itr;
+        if (!unit)
+            continue;
+        if (unit->isDead() || !unit->IsInWorld())
+            continue;
+        healthQueue.push(PrioritizeHealthUnitWraper(unit));
+    }
 
     targetUnitMap.clear();
     while(!healthQueue.empty() && targetUnitMap.size() < count)
@@ -7430,18 +8384,18 @@ void Spell::FillRaidOrPartyHealthPriorityTargets(UnitList &targetUnitMap, Unit*
 
 WorldObject* Spell::GetAffectiveCasterObject() const
 {
-    if (!m_originalCasterGUID)
+    if (!m_originalCasterGuid)
         return m_caster;
 
-    if (m_originalCasterGUID.IsGameObject() && m_caster->IsInWorld())
-        return m_caster->GetMap()->GetGameObject(m_originalCasterGUID);
+    if (m_originalCasterGuid.IsGameObject() && m_caster->GetMap())
+        return m_caster->GetMap()->GetGameObject(m_originalCasterGuid);
     return m_originalCaster;
 }
 
 WorldObject* Spell::GetCastingObject() const
 {
-    if (m_originalCasterGUID.IsGameObject())
-        return m_caster->IsInWorld() ? m_caster->GetMap()->GetGameObject(m_originalCasterGUID) : NULL;
+    if (m_originalCasterGuid.IsGameObject())
+        return m_caster->GetMap() ? m_caster->GetMap()->GetGameObject(m_originalCasterGuid) : NULL;
     else
         return m_caster;
 }
@@ -7450,6 +8404,7 @@ void Spell::ResetEffectDamageAndHeal()
 {
     m_damage = 0;
     m_healing = 0;
+    m_damageIndex = -1;
 }
 
 void Spell::SelectMountByAreaAndSkill(Unit* target, SpellEntry const* parentSpell, uint32 spellId75, uint32 spellId150, uint32 spellId225, uint32 spellId300, uint32 spellIdSpecial)
@@ -7489,7 +8444,7 @@ void Spell::SelectMountByAreaAndSkill(Unit* target, SpellEntry const* parentSpel
                     SpellEntry const *spellInfo = sSpellStore.LookupEntry(iter->first);
                     for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
                     {
-                        if(spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED)
+                        if (spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED)
                         {
                             int32 mountSpeed = spellInfo->CalculateSimpleValue(SpellEffectIndex(i));
 
@@ -7548,7 +8503,7 @@ void Spell::TriggerGlobalCooldown()
     {
         // gcd modifier auras applied only to self spells and only player have mods for this
         if (m_caster->GetTypeId() == TYPEID_PLAYER)
-            ((Player*)m_caster)->ApplySpellMod(m_spellInfo->Id, SPELLMOD_GLOBAL_COOLDOWN, gcd, this);
+            ((Player*)m_caster)->ApplySpellMod(m_spellInfo->Id, SPELLMOD_GLOBAL_COOLDOWN, gcd);
 
         // apply haste rating
         gcd = int32(float(gcd) * m_caster->GetFloatValue(UNIT_MOD_CAST_SPEED));
@@ -7581,3 +8536,1125 @@ void Spell::CancelGlobalCooldown()
     else if (m_caster->GetTypeId() == TYPEID_PLAYER)
         ((Player*)m_caster)->GetGlobalCooldownMgr().CancelGlobalCooldown(m_spellInfo);
 }
+
+float Spell::GetBaseSpellSpeed()
+{
+    // Speed possible inherited from triggering spell
+    float speed_proto = (fabs(m_spellInfo->GetSpeed()) < M_NULL_F && m_triggeredBySpellInfo) ?
+                            m_triggeredBySpellInfo->GetSpeed() : m_spellInfo->GetSpeed();
+
+    // spell speed calculation for charge-like spells
+    if (m_spellInfo->HasAttribute(SPELL_ATTR_EX7_HAS_CHARGE_EFFECT)
+        && (fabs(speed_proto) < M_NULL_F))
+        speed_proto = BASE_CHARGE_SPEED;
+
+    return speed_proto;
+}
+
+bool Spell::FillCustomTargetMap(SpellEffectIndex i, UnitList& targetUnitMap, uint8& effToIndex)
+{
+    float radius;
+    uint32 unMaxTargets = 0;
+
+    if (m_spellInfo->EffectRadiusIndex[i])
+        radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
+    else
+        radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex()));
+
+    // Resulting effect depends on spell that we want to cast
+    switch (m_spellInfo->Id)
+    {
+        case 19185: // Entrapment
+        case 64803:
+        case 64804:
+        {
+            FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            break;
+        }
+        // Voracious Appetite && Cannibalize && Carrion Feeder additional check
+        case 20577:
+        case 52748:
+        case 54044:
+        {
+            if (m_targets.getUnitTarget() && m_targets.getUnitTarget() != m_caster)
+                targetUnitMap.push_back(m_targets.getUnitTarget());
+            else
+                targetUnitMap.clear();
+            break;
+        }
+        case 28374: // Decimate - Gluth encounter
+        {
+            FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_ALL);
+            targetUnitMap.remove(m_caster);
+            break;
+        }
+        case 43263: // Ghoul Taunt (Army of the Dead)
+        {           // exclude Player and WorldBoss targets
+            FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            for (UnitList::iterator itr = targetUnitMap.begin(); itr != targetUnitMap.end();)
+            {
+                if (!*itr || (*itr)->GetTypeId() == TYPEID_PLAYER || static_cast<Creature*>(*itr)->IsWorldBoss())
+                    itr = targetUnitMap.erase(itr);
+                else
+                    ++itr;
+            }
+            if (!targetUnitMap.empty())
+                return true;
+            break;
+        }
+        case 46584: // Raise Dead
+        {
+            Unit* pCorpseTarget = NULL;
+            WorldObject* result = FindCorpseUsing<MaNGOS::RaiseDeadObjectCheck>(CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD);
+            if (result && result->IsInWorld())
+            {
+                switch (result->GetTypeId())
+                {
+                    case TYPEID_UNIT:
+                    case TYPEID_PLAYER:
+                        pCorpseTarget =(Unit*)result;
+                        break;
+                    case TYPEID_CORPSE:
+                        if (Player* owner = ObjectAccessor::FindPlayer(((Corpse*)result)->GetOwnerGuid()))
+                            if (owner->IsInMap(m_caster) && !owner->isAlive())
+                                pCorpseTarget =(Unit*)owner;
+                        break;
+                    default:
+                        /* pCorpseTarget == NULL;*/
+                        break;
+                }
+            }
+            targetUnitMap.push_back(pCorpseTarget ? pCorpseTarget : (Unit*)m_caster);
+            break;
+        }
+        case 47496: // Ghoul's explode
+        case 50444:
+        {
+            FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            break;
+        }
+        case 48018: // Demonic Circle: Summon
+        case 60854: // Demonic Circle: Clear
+        {
+            targetUnitMap.push_back(m_caster);
+            break;
+        }
+        case 48743: // Death Pact
+        {
+            if (i != EFFECT_INDEX_1)
+                return false;
+
+            Unit* unitTarget = m_targets.getUnitTarget();
+            if (unitTarget && (unitTarget->GetEntry() == 26125 || unitTarget->GetEntry() == 24207) &&
+                unitTarget->GetObjectGuid().IsPet() && unitTarget->GetOwnerGuid() == m_caster->GetObjectGuid())
+            {
+                targetUnitMap.push_back(unitTarget);
+            }
+            else
+            {
+                GuidSet const& guardians = m_caster->GetGuardians();
+                if (!guardians.empty())
+                {
+                    for (GuidSet::const_iterator itr = guardians.begin(); itr != guardians.end(); ++itr)
+                    {
+                        if (Unit* ghoul = m_caster->GetMap()->GetUnit(*itr))
+                            if (ghoul->GetEntry() == 24207 || ghoul->GetEntry() == 26125)
+                                targetUnitMap.push_back(ghoul);
+                    }
+
+                    if (targetUnitMap.size() > 1)
+                    {
+                        targetUnitMap.sort(TargetDistanceOrderNear(m_caster));
+                        targetUnitMap.resize(1);
+                    }
+                }
+
+                if (targetUnitMap.empty())
+                   if (m_caster->GetPet() && m_caster->GetPet()->GetEntry() == 26125)
+                       targetUnitMap.push_back((Unit*)m_caster->GetPet());
+            }
+
+            if (targetUnitMap.empty())
+            {
+                // no valid targets, clear cooldown at fail
+                m_caster->RemoveSpellCooldown(m_spellInfo->Id, true);
+                SendCastResult(SPELL_FAILED_NO_VALID_TARGETS);
+                finish(false);
+            }
+            break;
+
+        }
+        case 49158: // Corpse explosion
+        case 51325:
+        case 51326:
+        case 51327:
+        case 51328:
+        {
+            Unit* unitTarget = NULL;
+
+            targetUnitMap.remove(m_caster);
+            unitTarget = m_targets.getUnitTarget();
+
+            // Cast on corpses...
+            if ((unitTarget &&
+                unitTarget->getDeathState() == CORPSE &&
+                (unitTarget->GetCreatureTypeMask() & CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL) == 0) ||
+                    // ...or own Risen Ghoul pet - self explode effect
+                (unitTarget && unitTarget->GetEntry() == 26125 &&
+                unitTarget->GetCreatorGuid() == m_caster->GetObjectGuid()))
+            {
+                targetUnitMap.push_back(unitTarget);
+            }
+            else
+            {
+                Unit* pCorpseTarget = NULL;
+                MaNGOS::NearestCorpseInObjectRangeCheck u_check(*m_caster, radius);
+                MaNGOS::UnitLastSearcher<MaNGOS::NearestCorpseInObjectRangeCheck> searcher(pCorpseTarget, u_check);
+                Cell::VisitGridObjects(m_caster, searcher, radius);
+
+                if (pCorpseTarget)
+                    targetUnitMap.push_back(pCorpseTarget);
+            }
+
+            if (targetUnitMap.empty())
+            {
+                // no valid targets, clear cooldown at fail
+                m_caster->RemoveSpellCooldown(m_spellInfo->Id, true);
+                SendCastResult(SPELL_FAILED_NO_VALID_TARGETS);
+                finish(false);
+            }
+            break;
+        }
+        case 49821: // Mind Sear
+        case 53022:
+        {
+            Unit* unitTarget = m_targets.getUnitTarget();
+            FillAreaTargets(targetUnitMap, radius, PUSH_INHERITED_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            if  (unitTarget)
+                targetUnitMap.remove(unitTarget);
+            return true;
+        }
+        case 50294: // Starfall triggered in-range damage (all ranks)
+        case 53188:
+        case 53189:
+        case 53190:
+        {
+            Unit* unitTarget = m_targets.getUnitTarget();
+            FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            if  (unitTarget)
+            {
+                targetUnitMap.remove(unitTarget);
+                m_targets.setDestination(unitTarget->GetPosition());
+            }
+            break;
+        }
+        case 57143: // Life Burst (Wyrmrest Skytalon)
+        {
+            // hack - spell is AoE but implicitTargets dont match here :/
+            SetTargetMap(SpellEffectIndex(i), TARGET_ALL_FRIENDLY_UNITS_AROUND_CASTER, targetUnitMap);
+            targetUnitMap.push_back(m_caster);
+            break;
+        }
+        case 57557: // Pyrobuffet (Sartharion encounter) - don't target Range Markered units
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_HOSTILE);
+            if (!tempTargetUnitMap.empty())
+            {
+                for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+                {
+                    if ((*iter) && !(*iter)->HasAura(m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_2)))
+                        targetUnitMap.push_back(*iter);
+                }
+            }
+
+            if (!targetUnitMap.empty())
+                return true;
+
+            break;
+        }
+        case 48278: //Svala - Banshee Paralize
+        {
+            UnitList tmpUnitMap;
+            FillAreaTargets(tmpUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+
+            if (tmpUnitMap.empty())
+                break;
+
+            for (UnitList::const_iterator itr = tmpUnitMap.begin(); itr != tmpUnitMap.end(); ++itr)
+            {
+                 if (!*itr) continue;
+
+                 if ((*itr)->HasAura(48267))
+                     targetUnitMap.push_back(*itr);
+            }
+            break;
+        }
+        case 58912: // Deathstorm
+        {
+            if (!m_caster->GetObjectGuid().IsVehicle())
+                break;
+
+            SetTargetMap(SpellEffectIndex(i), TARGET_RANDOM_ENEMY_CHAIN_IN_AREA, targetUnitMap);
+            break;
+        }
+        case 57496: // Volazj Insanity
+        {
+            UnitList PlayerList;
+            FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+
+            if (targetUnitMap.empty())
+                break;
+
+            for (UnitList::const_iterator itr = targetUnitMap.begin(); itr != targetUnitMap.end(); ++itr)
+            {
+                 if (!*itr) continue;
+
+                 if ((*itr)->GetTypeId() == TYPEID_PLAYER)
+                     PlayerList.push_back(*itr);
+            }
+
+            if (PlayerList.empty() || PlayerList.size() > 5 || PlayerList.size() < 2)
+                break;
+
+            uint32 uiPhaseIndex = 0;
+            uint32 uiSummonIndex;
+            for (UnitList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
+            {
+                if (!*itr) continue;
+
+                (*itr)->CastSpell((*itr), 57508+uiPhaseIndex, true);
+
+                uiSummonIndex = 0;
+                for (UnitList::const_iterator iter = PlayerList.begin(); iter != PlayerList.end(); ++iter)
+                {
+                    if (!*iter) continue;
+
+                    if ((*itr) != (*iter))
+                        (*itr)->CastSpell((*itr), 57500+uiSummonIndex, true);
+                    uiSummonIndex++;
+                }
+                uiPhaseIndex++;
+            }
+            break;
+        }
+        case 58836:  // Initialize Images
+        {
+            if (i != EFFECT_INDEX_0)
+                return false;
+
+            GuidSet const& guardians = m_caster->GetGuardians();
+            if (guardians.empty())
+                return true;
+
+            for (GuidSet::const_iterator itr = guardians.begin(); itr != guardians.end(); ++itr)
+                if (Pet* pPet = m_caster->GetMap()->GetPet(*itr))
+                    targetUnitMap.push_back(pPet);
+
+            break;
+        }
+        case 59754:                    //Rune Tap triggered from Glyph of Rune Tap
+        {
+            FillRaidOrPartyTargets(targetUnitMap, m_caster, m_caster, radius, false, true, false);
+            break;
+        }
+        case 61999: // Raise ally
+        {
+            WorldObject* result = FindCorpseUsing<MaNGOS::RaiseAllyObjectCheck>(CREATURE_TYPEMASK_NONE);
+            if (result && result->GetTypeId() == TYPEID_UNIT)
+                targetUnitMap.push_back((Unit*)result);
+            else
+                targetUnitMap.push_back((Unit*)m_caster);
+            break;
+        }
+        case 62343: // Heat (remove all except active iron constructs)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_ALL);
+
+            for (UnitList::iterator itr = tempTargetUnitMap.begin(),next; itr != tempTargetUnitMap.end(); ++itr)
+            {
+                if ((*itr) && (*itr)->GetEntry() == 33121 &&
+                    !(*itr)->HasAura(62468) && !(*itr)->HasAura(62373) &&
+                    !(*itr)->HasAura(62382) && !(*itr)->HasAura(67114)
+                    )
+                {
+                    targetUnitMap.push_back(*itr);
+                }
+            }
+            break;
+        }
+        case 62488: // Activate Constructs (remove all except inactive constructs)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_NOT_HOSTILE);
+            tempTargetUnitMap.sort(TargetDistanceOrderNear(m_caster));
+            for (UnitList::iterator itr = tempTargetUnitMap.begin(),next; itr != tempTargetUnitMap.end(); ++itr)
+            {
+                if ((*itr) && (*itr)->GetEntry() == 33121 && (*itr)->HasAura(62468)) // check for stun aura
+                {
+                    targetUnitMap.push_back(*itr);
+                    return true;    // only one Construct per Spell
+                }
+            }
+            break;
+        }
+        case 50811: // Shatter (normal&heroic) (Krystallus in Halls of Stone)
+        case 61547:
+        case 63025: // Gravity Bomb (XT-002 in Ulduar) - exclude caster from pull and double damage
+        case 64233:
+        {
+            FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_HOSTILE);
+            targetUnitMap.remove(m_caster);
+            break;
+        }
+        case 52659: // Static Overload (normal&heroic) (Ionar in Halls of Lightning)
+        case 59796:
+        case 63023: // Searing Light (normal&heroic) (XT-002 in Ulduar)
+        case 65120:
+        {
+            FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_HOSTILE);
+            break;
+        }
+        case 63278: // Mark of Faceless
+        {
+            if (i != EFFECT_INDEX_1)
+                return false;
+
+            Unit* currentTarget = m_targets.getUnitTarget();
+            if (currentTarget)
+            {
+                m_targets.setDestination(currentTarget->GetPosition());
+                FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+                targetUnitMap.remove(currentTarget);
+            }
+            break;
+        }
+        case 65044: // Flames
+        case 65045: // Flame of demolisher
+        {
+            FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            break;
+        }
+        case 65919: // Anub'arak Cast Check Ice Spell (Trial of the Crusader - Anub'arak)
+        case 67858:
+        case 67859:
+        case 67860:
+        {
+            m_caster->CastSpell(m_caster, 66181, true);
+            FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            break;
+        }
+        case 67470: // Pursuing Spikes (Check Aura and Summon Spikes) (Trial Of The Crusader - Anub'arak)
+        {
+            UnitList tmpUnitMap;
+            bool m_bOneTargetHaveAura = false;
+
+            FillAreaTargets(tmpUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            if (!tmpUnitMap.empty())
+            {
+                for (UnitList::const_iterator itr = tmpUnitMap.begin(); itr != tmpUnitMap.end(); ++itr)
+                {
+                    if ((*itr)->HasAura(67574))
+                    {
+                        m_bOneTargetHaveAura = true;
+                        break;
+                    }
+                    else
+                    {
+                        if ((*itr)->GetTypeId() == TYPEID_PLAYER)
+                            targetUnitMap.push_back(*itr);
+                    }
+                }
+                if (!m_bOneTargetHaveAura && !targetUnitMap.empty())
+                {
+                    uint32 t = 0;
+                    UnitList::iterator iter = targetUnitMap.begin();
+                    while (iter != targetUnitMap.end() && (*iter)->IsWithinDist(m_caster, radius))
+                    {
+                        ++t;
+                        ++iter;
+                    }
+
+                    iter = targetUnitMap.begin();
+                    std::advance(iter, urand(0, t-1));
+                    if (*iter)
+                        (*iter)->CastSpell((*iter), 67574, true);
+                }
+            }
+            break;
+        }
+        case 68508: // Crushing Leap (IoC bosses)
+        {
+            UnitList tmpUnitMap;
+            FillAreaTargets(tmpUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            for (UnitList::const_iterator itr = tmpUnitMap.begin(); itr != tmpUnitMap.end(); ++itr)
+            {
+                if (*itr && (*itr)->GetTypeId() == TYPEID_PLAYER && !(*itr)->m_movementInfo.HasMovementFlag(MovementFlags(MOVEFLAG_FALLING)))
+                    targetUnitMap.push_back(*itr);
+            }
+            break;
+        }
+        case 66862: // Radiance (Trial of the Champion - Eadric the Pure)
+        case 67681:
+        {
+            UnitList tmpUnitMap;
+            FillAreaTargets(tmpUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            for (UnitList::const_iterator itr = tmpUnitMap.begin(); itr != tmpUnitMap.end(); ++itr)
+            {
+                if (*itr && (*itr)->isInFrontInMap(m_caster, DEFAULT_VISIBILITY_DISTANCE) && (*itr)->IsWithinLOSInMap(m_caster))
+                    targetUnitMap.push_back(*itr);
+            }
+            break;
+        }
+        case 69099: // Ice Pulse (Lich King)
+        case 73776:
+        case 73777:
+        case 73778:
+        {
+            FillAreaTargets(targetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE, GetAffectiveCaster());
+            break;
+        }
+        case 69298: // Cancel Resistant To Blight (Festergut)
+        {
+            UnitList tmpUnitMap;
+            FillAreaTargets(tmpUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            for (UnitList::const_iterator itr = tmpUnitMap.begin(); itr != tmpUnitMap.end(); ++itr)
+            {
+                if ((*itr) && (*itr)->GetTypeId() == TYPEID_PLAYER)
+                    targetUnitMap.push_back(*itr);
+            }
+            break;
+        }
+        case 69782: // Ooze Flood (Rotface)
+        {
+            UnitList tempTargetUnitMap;
+            UnitList oozesMap;
+
+            targetUnitMap.clear();
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            // stalkers in valves
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                // Puddle Stalker
+                if ((*iter)->GetEntry() == 37013 && (*iter)->GetPositionZ() < m_caster->GetPositionZ() + 3.0f)
+                    oozesMap.push_back((*iter));
+            }
+
+            UnitList::iterator itr;
+
+            // 2 random targets
+            if (!oozesMap.empty())
+            {
+                itr = oozesMap.begin();
+                std::advance(itr, urand(0, oozesMap.size() - 1));
+
+                // first Ooze Flood
+                targetUnitMap.push_back(*itr);
+                oozesMap.remove(*itr);
+
+                // now find the second - closest one
+                if (!oozesMap.empty())
+                {
+                    oozesMap.sort(TargetDistanceOrderNear(*itr));
+                    itr = oozesMap.begin();
+                    targetUnitMap.push_back(*itr);
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+        case 69538: // Small Ooze Combine (Rotface)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if ((*iter)->GetEntry() == 36897)
+                    targetUnitMap.push_back((*iter));
+            }
+
+            targetUnitMap.remove(m_caster);
+
+            if (!targetUnitMap.empty())
+                targetUnitMap.resize(1);
+
+            break;
+        }
+        case 69553: // Large Ooze Combine (Rotface)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if ((*iter)->GetEntry() == 36899)
+                    targetUnitMap.push_back((*iter));
+            }
+
+            targetUnitMap.remove(m_caster);
+
+            if (!targetUnitMap.empty())
+                targetUnitMap.resize(1);
+
+            break;
+        }
+        case 69610: // Large Ooze Buff Combine (Rotface)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if ((*iter)->GetEntry() == 36897)
+                    targetUnitMap.push_back((*iter));
+            }
+
+            targetUnitMap.remove(m_caster);
+
+            if (!targetUnitMap.empty())
+                targetUnitMap.resize(1);
+
+            break;
+        }
+        case 69674:                                 // Mutated Infection (Rotface)
+        case 71224:                                 // Mutated Infection (Rotface)
+        case 73023:                                 // Mutated Infection (heroic)
+        case 73022:                                 // Mutated Infection (heroic)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if ((*iter)->GetTypeId() == TYPEID_PLAYER &&
+                    (*iter) != m_caster->getVictim())
+                    targetUnitMap.push_back(*iter);
+            }
+
+            unMaxTargets = 1;
+            break;
+        }
+        case 69762: // Unchained Magic (Sindragosa)
+        {
+            unMaxTargets = 2;
+
+            if (m_caster->GetMap()->GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL ||
+                m_caster->GetMap()->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC)
+            {
+                unMaxTargets = 6;
+            }
+
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if ((*iter)->GetPowerType() == POWER_MANA && (*iter)->GetCharmerOrOwnerPlayerOrPlayerItself())
+                    targetUnitMap.push_back(*iter);
+            }
+            break;
+        }
+        case 69832: // Unstable Ooze Explosion (Rotface)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if ((*iter)->GetEntry() == 38107)
+                    targetUnitMap.push_back((*iter));
+            }
+            targetUnitMap.push_back(m_caster);
+            break;
+        }
+        case 69839: // Unstable Ooze Explosion (Rotface)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if ((*iter)->GetCharmerOrOwnerPlayerOrPlayerItself() || (*iter)->GetEntry() == 36899)
+                    targetUnitMap.push_back((*iter));
+            }
+
+            unMaxTargets = 3;
+            break;
+        }
+        case 70117: // Icy grip (Sindragosa encounter)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if (!(*iter)->GetCharmerOrOwnerPlayerOrPlayerItself())
+                    continue;
+
+                targetUnitMap.push_back((*iter));
+            }
+            break;
+        }
+        case 70127: // Mystic Buffet (Sindragosa)
+        case 72528:
+        case 72529:
+        case 72530:
+        {
+            FillAreaTargets(targetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            targetUnitMap.remove(m_caster);
+            break;
+        }
+        case 70338: // Necrotic Plague
+        case 73785:
+        case 73786:
+        case 73787:
+        {
+            FillAreaTargets(targetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            targetUnitMap.remove(m_caster);
+            for (UnitList::iterator itr = targetUnitMap.begin(); itr != targetUnitMap.end();)
+            {
+                // Lich King has Plague Avoidance aura
+                if (!(*itr) || (*itr)->GetDummyAura(72846))
+                    itr = targetUnitMap.erase(itr);
+                else
+                    ++itr;
+            }
+            if (!targetUnitMap.empty() && targetUnitMap.size() > 1)
+            {
+                targetUnitMap.sort(TargetDistanceOrderNear(m_caster));
+                targetUnitMap.resize(1);
+            }
+            break;
+        }
+        case 70402: // Mutated Transformation (Putricide)
+        case 72511:
+        case 72512:
+        case 72513:
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_FRIENDLY);
+            for (UnitList::iterator itr = tempTargetUnitMap.begin(); itr != tempTargetUnitMap.end(); ++itr)
+            {
+                if ((*itr) && !(*itr)->GetObjectGuid().IsVehicle())
+                    targetUnitMap.push_back(*itr);
+            }
+            break;
+        }
+        case 70447: // Volatile Ooze Adhesive (Putricide)
+        case 72836:
+        case 72837:
+        case 72838:
+        case 70672: // Gaseous Bloat (Putricide)
+        case 72455:
+        case 72832:
+        case 72833:
+        {
+            targetUnitMap.push_back(m_targets.getUnitTarget());
+            break;
+        }
+        case 70499: // Vile Spirits Visual Effect (Lich King)
+        {
+            radius = 100.0f;
+            FillAreaTargets(targetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::iterator itr = targetUnitMap.begin(); itr != targetUnitMap.end();)
+            {
+                if (!(*itr) || (*itr)->GetEntry() != 37799)
+                    itr = targetUnitMap.erase(itr);
+                else
+                    ++itr;
+            }
+
+            unMaxTargets = 1;
+            break;
+        }
+        case 70572: // Grip of Agony
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::iterator itr = tempTargetUnitMap.begin(); itr != tempTargetUnitMap.end(); ++itr)
+            {
+                if (*itr && (*itr)->GetTypeId() == TYPEID_UNIT)
+                {
+                    switch ((*itr)->GetEntry())
+                    {
+                        case 37187: // Overlord Saurfang
+                        case 37920: // Korkron Reaver
+                        case 37200: // Muradin
+                        case 37902: // Alliance Mason
+                            targetUnitMap.push_back(*itr);
+                            break;
+                    }
+                }
+            }
+            break;
+        }
+        case 70701: // Expunged Gas (Putricide)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_FRIENDLY);
+            for (UnitList::iterator itr = tempTargetUnitMap.begin(); itr != tempTargetUnitMap.end(); ++itr)
+            {
+                if ((*itr) && !(*itr)->GetObjectGuid().IsVehicle())
+                    targetUnitMap.push_back(*itr);
+            }
+            break;
+        }
+        case 70728: // Exploit Weakness triggered
+        case 70840: // Devious Minds triggered
+        {
+            targetUnitMap.push_back(m_caster);
+            if (m_caster->GetObjectGuid().IsPet())
+            {
+                if (Unit* owner = m_caster->GetOwner())
+                    targetUnitMap.push_back(owner);
+            }
+            else
+            {
+               GuidSet const& groupPets = m_caster->GetPets();
+               if (!groupPets.empty())
+               {
+                   for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                   {
+                       if (Pet* pPet = m_caster->GetMap()->GetPet(*itr))
+                           targetUnitMap.push_back((Unit*)pPet);
+                   }
+               }
+            }
+            break;
+        }
+        case 70911: // Unbound Plague (Putricide)
+        case 72854:
+        case 72855:
+        case 72856:
+        {
+            if (m_targets.getUnitTarget())
+                targetUnitMap.push_back(m_targets.getUnitTarget());
+
+            break;
+        }
+        case 70920: // Unbound Plague Search Effect (Putricide)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                // target only other players which dont have Mutated Transformation aura on self
+                if ((*iter) && (*iter)->GetTypeId() == TYPEID_PLAYER &&
+                    !(*iter)->GetDummyAura(70308))
+                {
+                    targetUnitMap.push_back(*iter);
+                }
+            }
+
+            targetUnitMap.remove(m_caster);
+            unMaxTargets = 1;
+            break;
+        }
+        case 70961: // Shattered Bones
+        {
+            if (i != EFFECT_INDEX_1)
+                return false;
+
+            effToIndex = EFFECT_INDEX_0;
+            break;
+        }
+        case 71075: // Invocation of Blood (V) Move
+        case 71079: // Invocation of Blood (K) Move
+        case 71082: // Invocation of Blood (T) Move
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                // target the one with Invocation of Blood aura
+                if ((*iter)->HasAura(70952) ||
+                    (*iter)->HasAura(70981) ||
+                    (*iter)->HasAura(70982))
+                {
+                    targetUnitMap.push_back(*iter);
+                    break;
+                }
+            }
+
+            break;
+        }
+        case 71307: // Vile Gas (Festergut)
+        case 71908:
+        case 72270:
+        case 72271:
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if ((*iter)->GetEntry() == 38548)
+                    targetUnitMap.push_back(*iter);
+            }
+
+            unMaxTargets = 1;
+            break;
+        }
+        case 72873: // Malleable Goo (Putricide)
+        case 72874:
+        case 72550:
+        case 72458:
+        case 72549:
+        case 70853:
+        case 72297:
+        case 72548:
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::iterator itr = tempTargetUnitMap.begin(); itr != tempTargetUnitMap.end(); ++itr)
+            {
+                if ((*itr) && !(*itr)->GetObjectGuid().IsVehicle())
+                    targetUnitMap.push_back(*itr);
+            }
+            targetUnitMap.remove(m_caster);
+            break;
+        }
+        case 72038: // Empowered Shock Vortex (Blood Council)
+        case 72815:
+        case 72816:
+        case 72817:
+        {
+            FillAreaTargets(targetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            targetUnitMap.remove(m_caster);
+        }
+        case 72905: // Frostbolt Volley (Lady Deathwhisper)
+        case 72906:
+        case 72907:
+        case 72908:
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if (!(*iter)->GetCharmerOrOwnerPlayerOrPlayerItself())
+                    continue;
+
+                targetUnitMap.push_back((*iter));
+            }
+
+            break;
+        }
+        case 72378: // Blood Nova (Saurfang)
+        case 73058:
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if (!(*iter)->GetObjectGuid().IsPlayer())
+                    continue;
+
+                if (m_caster->GetDistance(*iter) < 10.0f) // stored in 72379 radius?
+                    continue;
+
+                targetUnitMap.push_back((*iter));
+            }
+
+            unMaxTargets = 1;
+            break;
+        }
+        case 72385:                                     // Boiling Blood
+        case 72441:
+        case 72442:
+        case 72443:
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if (!(*iter)->GetObjectGuid().IsPlayer())
+                    continue;
+
+                if ((*iter) == m_caster->getVictim())
+                    continue;
+
+                targetUnitMap.push_back((*iter));
+            }
+
+            unMaxTargets = 1;
+            break;
+        }
+        case 71336:                                     // Pact of the Darkfallen
+        {
+            UnitList tempTargetUnitMap;
+            radius = 100.0f;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if (!(*iter)->GetObjectGuid().IsPlayer() ||
+                    m_caster->getVictim() == (*iter) ||         // don't target the tank
+                    (*iter)->HasAuraOfDifficulty(70451))        // don't target offtank linked with Blood Mirror
+                {
+                    continue;
+                }
+
+                targetUnitMap.push_back((*iter));
+            }
+
+            if (m_caster->GetMap()->GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL ||
+                m_caster->GetMap()->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC)
+            {
+                unMaxTargets = 3;
+            }
+            else
+                unMaxTargets = 2;
+
+            break;
+        }
+        case 71341:                                     // Pact of the Darkfallen (dmg part)
+        case 71390:                                     // Pact of the Darkfallen (visual link part)
+        {
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, 100.0f, PUSH_SELF_CENTER, SPELL_TARGETS_FRIENDLY);
+            for (UnitList::const_iterator iter = tempTargetUnitMap.begin(); iter != tempTargetUnitMap.end(); ++iter)
+            {
+                if ((*iter)->HasAura(71340))
+                    targetUnitMap.push_back((*iter));
+            }
+            break;
+        }
+        case 71445:                                 // Twilight Bloodbolt (Lana'thel)
+        case 71471:
+        {
+            radius = DEFAULT_VISIBILITY_INSTANCE;
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::iterator itr = tempTargetUnitMap.begin(); itr != tempTargetUnitMap.end();++itr)
+            {
+                if ((*itr) && (*itr)->GetTypeId() == TYPEID_PLAYER &&
+                    !(*itr)->HasAuraOfDifficulty(70445) && !(*itr)->HasAuraOfDifficulty(70451)) // Blood Mirror
+                {
+                    targetUnitMap.push_back(*itr);
+                }
+            }
+
+            unMaxTargets = 2;
+            break;
+        }
+        case 71447:                                 // Bloodbolt Splash 10N
+        case 71481:                                 // Bloodbolt Splash 25N
+        case 71482:                                 // Bloodbolt Splash 10H
+        case 71483:                                 // Bloodbolt Splash 25H
+        {
+            FillAreaTargets(targetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_FRIENDLY);
+            targetUnitMap.remove(m_caster);
+            break;
+        }
+        case 72133:                                 // Pain and Suffering (Lich King)
+        case 73788:
+        case 73789:
+        case 73790:
+        {
+            // keep standard chain targeting for dummy effect
+            if (i == EFFECT_INDEX_0)
+                return false;
+
+            FillAreaTargets(targetUnitMap, radius, PUSH_IN_FRONT_15, SPELL_TARGETS_AOE_DAMAGE);
+
+            break;
+        }
+        case 72376:                                 // Raise Dead (Lich King)
+        case 72429:                                 // Mass Resurrection (Lich King)
+        {
+            radius = DEFAULT_VISIBILITY_INSTANCE;
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_ALL);
+            for (UnitList::iterator itr = tempTargetUnitMap.begin(); itr != tempTargetUnitMap.end();++itr)
+            {
+                if ((*itr) && (*itr)->GetTypeId() == TYPEID_PLAYER && !(*itr)->isAlive())
+                    targetUnitMap.push_back(*itr);
+            }
+            break;
+        }
+        case 72454:                                 // Mutated Plague (Putricide)
+        case 72464:
+        case 72506:
+        case 72507:
+        {
+            radius = DEFAULT_VISIBILITY_INSTANCE;
+            UnitList tempTargetUnitMap;
+            FillAreaTargets(tempTargetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE, GetAffectiveCaster());
+            for (UnitList::iterator itr = tempTargetUnitMap.begin(); itr != tempTargetUnitMap.end(); ++itr)
+            {
+                if ((*itr) && !(*itr)->GetObjectGuid().IsVehicle())
+                    targetUnitMap.push_back(*itr);
+            }
+            break;
+        }
+        case 72754:                                     // Defile (Lich King)
+        case 73708:
+        case 73709:
+        case 73710:
+        {
+            // base radius
+            radius = 10.0f;
+
+            // 10man normal - 10% growth
+            if (SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(72756))
+                radius += holder->GetStackAmount() * 1.0f;
+            // 25man normal - 5% growth
+            else if (SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(74162))
+                radius += holder->GetStackAmount() * 0.5f;
+            // 10man heroic - 10% growth
+            else if (SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(74163))
+                radius += holder->GetStackAmount() * 1.0f;
+            // 25man heroic - 5% growth
+            else if (SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(74164))
+                radius += holder->GetStackAmount() * 0.5f;
+
+            FillAreaTargets(targetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            break;
+        }
+        case 73529:                                     // Shadow Trap triggered knockback (Lich King)
+        {
+            radius = 10.0f;
+            FillAreaTargets(targetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            break;
+        }
+        case 74282:                                     // Shadow Trap (search target) (Lich King)
+        {
+            radius = 5.0f;
+            FillAreaTargets(targetUnitMap, radius, PUSH_SELF_CENTER, SPELL_TARGETS_AOE_DAMAGE);
+            break;
+        }
+        case 74960:                                     // Infrigidate
+        {
+            FillAreaTargets(targetUnitMap, 20.0f, PUSH_SELF_CENTER, SPELL_TARGETS_FRIENDLY);
+            targetUnitMap.remove(m_caster);
+
+            if (!targetUnitMap.empty())
+                unMaxTargets = 1;
+            else
+                return false;
+
+            break;
+        }
+        default:
+            return false;
+    }
+
+    if (targetUnitMap.empty())
+        return true;
+
+    // remove NULL targets (weird, but...)
+    for (UnitList::iterator itr = targetUnitMap.begin(); itr != targetUnitMap.end();)
+    {
+        if (!*itr)
+            itr = targetUnitMap.erase(itr);
+        else
+            ++itr;
+    }
+
+    if (!unMaxTargets)
+        return true;
+
+    // random targets
+    while (targetUnitMap.size() > unMaxTargets)
+    {
+        UnitList::iterator itr = targetUnitMap.begin();
+        std::advance(itr, urand(0, targetUnitMap.size() - 1));
+        targetUnitMap.erase(itr);
+    }
+
+    return true;
+}
diff --git a/src/game/Spell.h b/src/game/Spell.h
index 66e72ea8b39..92c646457e6 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -80,6 +80,7 @@ enum SpellNotifyPushType
     PUSH_IN_BACK,
     PUSH_SELF_CENTER,
     PUSH_DEST_CENTER,
+    PUSH_INHERITED_CENTER,
     PUSH_TARGET_CENTER
 };
 
@@ -107,11 +108,13 @@ class SpellCastTargets
         SpellCastTargets();
         ~SpellCastTargets();
 
-        void read( ByteBuffer& data, Unit *caster );
-        void write( ByteBuffer& data ) const;
+        void read(ByteBuffer& data, Unit* caster );
+        void write(ByteBuffer& data ) const;
 
         SpellCastTargetsReader ReadForCaster(Unit* caster) { return SpellCastTargetsReader(*this,caster); }
 
+        void ReadAdditionalData(ByteBuffer& data);
+
         SpellCastTargets& operator=(const SpellCastTargets &target)
         {
             m_unitTarget = target.m_unitTarget;
@@ -122,44 +125,49 @@ class SpellCastTargets
             m_GOTargetGUID      = target.m_GOTargetGUID;
             m_CorpseTargetGUID  = target.m_CorpseTargetGUID;
             m_itemTargetGUID    = target.m_itemTargetGUID;
-            m_srcTransportGUID  = target.m_srcTransportGUID;
-            m_destTransportGUID = target.m_destTransportGUID;
-
             m_itemTargetEntry  = target.m_itemTargetEntry;
 
-            m_srcX = target.m_srcX;
-            m_srcY = target.m_srcY;
-            m_srcZ = target.m_srcZ;
-
-            m_destX = target.m_destX;
-            m_destY = target.m_destY;
-            m_destZ = target.m_destZ;
+            m_src       = target.m_src;
+            m_dest      = target.m_dest;
 
             m_strTarget = target.m_strTarget;
 
             m_targetMask = target.m_targetMask;
 
+            m_elevation = target.m_elevation;
+            m_speed     = target.m_speed;
+
             return *this;
         }
 
+        void setUnitTarget(Unit* target);
         ObjectGuid getUnitTargetGuid() const { return m_unitTargetGUID; }
-        Unit *getUnitTarget() const { return m_unitTarget; }
-        void setUnitTarget(Unit *target);
-        void setDestination(float x, float y, float z);
-        void setSource(float x, float y, float z);
+        Unit* getUnitTarget() const { return m_unitTarget; }
+
+        void setDestination(WorldLocation const& dest);
+        void setSource(WorldLocation const& src);
+
+        WorldLocation const& getDestination() const { return m_dest; }
+        WorldLocation const& getSource() const { return m_src; }
+
+        bool HasLocation() const;
+
+        WorldLocation const& GetLocation() const;
 
+        void setGOTarget(GameObject* target);
         ObjectGuid getGOTargetGuid() const { return m_GOTargetGUID; }
-        GameObject *getGOTarget() const { return m_GOTarget; }
-        void setGOTarget(GameObject *target);
+        GameObject* getGOTarget() const { return m_GOTarget; }
 
-        ObjectGuid getCorpseTargetGuid() const { return m_CorpseTargetGUID; }
         void setCorpseTarget(Corpse* corpse);
+        ObjectGuid getCorpseTargetGuid() const { return m_CorpseTargetGUID; }
 
+        void setItemTarget(Item* item);
         ObjectGuid getItemTargetGuid() const { return m_itemTargetGUID; }
         Item* getItemTarget() const { return m_itemTarget; }
         uint32 getItemTargetEntry() const { return m_itemTargetEntry; }
-        void setItemTarget(Item* item);
+
         void setTradeItemTarget(Player* caster);
+
         void updateTradeSlotItem()
         {
             if(m_itemTarget && (m_targetMask & TARGET_FLAG_TRADE_ITEM))
@@ -173,25 +181,32 @@ class SpellCastTargets
 
         void Update(Unit* caster);
 
-        float m_srcX, m_srcY, m_srcZ;
-        float m_destX, m_destY, m_destZ;
         std::string m_strTarget;
 
+        float GetElevation() const { return m_elevation; }
+        float GetSpeed()     const { return m_speed; }
+
+        void  SetElevation(float elevation) { m_elevation = elevation; }
+        void  SetSpeed(float speed)         { m_speed = speed; }
+
         uint32 m_targetMask;
+
     private:
         // objects (can be used at spell creating and after Update at casting
-        Unit *m_unitTarget;
-        GameObject *m_GOTarget;
-        Item *m_itemTarget;
+        Unit*       m_unitTarget;
+        GameObject* m_GOTarget;
+        Item*       m_itemTarget;
 
         // object GUID/etc, can be used always
         ObjectGuid m_unitTargetGUID;
         ObjectGuid m_GOTargetGUID;
         ObjectGuid m_CorpseTargetGUID;
         ObjectGuid m_itemTargetGUID;
-        ObjectGuid m_srcTransportGUID;
-        ObjectGuid m_destTransportGUID;
         uint32 m_itemTargetEntry;
+
+        WorldLocation m_src, m_dest;
+
+        float m_elevation, m_speed;
 };
 
 inline ByteBuffer& operator<< (ByteBuffer& buf, SpellCastTargets const& targets)
@@ -261,6 +276,7 @@ class Spell
         void EffectProficiency(SpellEffectIndex eff_idx);
         void EffectApplyAreaAura(SpellEffectIndex eff_idx);
         void EffectSummonType(SpellEffectIndex eff_idx);
+        void EffectSummonPossessed(SpellEffectIndex eff_idx);
         void EffectLearnSpell(SpellEffectIndex eff_idx);
         void EffectDispel(SpellEffectIndex eff_idx);
         void EffectDualWield(SpellEffectIndex eff_idx);
@@ -284,6 +300,7 @@ class Spell
         void EffectTriggerMissileSpell(SpellEffectIndex eff_idx);
         void EffectThreat(SpellEffectIndex eff_idx);
         void EffectRestoreItemCharges(SpellEffectIndex eff_idx);
+        void EffectRemoveAura(SpellEffectIndex eff_idx);
         void EffectHealMaxHealth(SpellEffectIndex eff_idx);
         void EffectInterruptCast(SpellEffectIndex eff_idx);
         void EffectSummonObjectWild(SpellEffectIndex eff_idx);
@@ -344,7 +361,12 @@ class Spell
         void EffectQuestFail(SpellEffectIndex eff_idx);
         void EffectQuestOffer(SpellEffectIndex eff_idx);
         void EffectActivateRune(SpellEffectIndex eff_idx);
+        void EffectSuspendGravity(SpellEffectIndex eff_idx);
+        void EffectUntrainTalents(SpellEffectIndex eff_idx);
         void EffectTeachTaxiNode(SpellEffectIndex eff_idx);
+        void EffectWMODamage(SpellEffectIndex eff_idx);
+        void EffectWMORepair(SpellEffectIndex eff_idx);
+        void EffectWMOChange(SpellEffectIndex eff_idx);
         void EffectTitanGrip(SpellEffectIndex eff_idx);
         void EffectEnchantItemPrismatic(SpellEffectIndex eff_idx);
         void EffectPlaySound(SpellEffectIndex eff_idx);
@@ -353,17 +375,22 @@ class Spell
         void EffectActivateSpec(SpellEffectIndex eff_idx);
         void EffectCancelAura(SpellEffectIndex eff_idx);
 
+        void EffectFriendSummon(SpellEffectIndex eff_idx);
+        void EffectServerSide(SpellEffectIndex eff_idx);
+        void EffectKnockBackFromPosition(SpellEffectIndex eff_idx);
+
         Spell(Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid originalCasterGUID = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
         ~Spell();
 
-        void prepare(SpellCastTargets const* targets, Aura* triggeredByAura = NULL);
+        void prepare(SpellCastTargets const* targets, Aura const* triggeredByAura = NULL);
 
-        void cancel();
+        void cancel(bool force = false);
 
         void update(uint32 difftime);
         void cast(bool skipCheck = false);
         void finish(bool ok = true);
         void TakePower();
+        void TakeAmmo();
         void TakeReagents();
         void TakeCastItem();
 
@@ -378,13 +405,15 @@ class Spell
         void _handle_finish_phase();
 
         SpellCastResult CheckItems();
-        SpellCastResult CheckRange(bool strict);
+        SpellCastResult CheckRange(bool strict) const;
+        SpellCastResult CheckRangeForChanneledSpells() const;
         SpellCastResult CheckPower();
         SpellCastResult CheckOrTakeRunePower(bool take);
         SpellCastResult CheckCasterAuras() const;
+        SpellCastResult CheckCastTargets() const;
 
         int32 CalculateDamage(SpellEffectIndex i, Unit* target) { return m_caster->CalculateSpellDamage(target, m_spellInfo, i, &m_currentBasePoints[i]); }
-        static uint32 CalculatePowerCost(SpellEntry const* spellInfo, Unit* caster, Spell const* spell = NULL, Item* castItem = NULL);
+        static int32 CalculatePowerCost(SpellEntry const* spellInfo, Unit* caster, Spell const* spell = NULL, Item* castItem = NULL);
 
         bool HaveTargetsForEffect(SpellEffectIndex effect) const;
         void Delayed();
@@ -393,42 +422,54 @@ class Spell
         void setState(uint32 state) { m_spellState = state; }
 
         void DoCreateItem(SpellEffectIndex eff_idx, uint32 itemtype);
-        void DoSummon(SpellEffectIndex eff_idx);
+        void DoSummonGroupPets(SpellEffectIndex eff_idx);
         void DoSummonWild(SpellEffectIndex eff_idx, uint32 forceFaction = 0);
         void DoSummonGuardian(SpellEffectIndex eff_idx, uint32 forceFaction = 0);
         void DoSummonTotem(SpellEffectIndex eff_idx, uint8 slot_dbc = 0);
         void DoSummonCritter(SpellEffectIndex eff_idx, uint32 forceFaction = 0);
+        void DoSummonSnakes(SpellEffectIndex eff_idx);
+        void DoSummonVehicle(SpellEffectIndex eff_idx, uint32 forceFaction = 0);
 
         void WriteSpellGoTargets(WorldPacket* data);
         void WriteAmmoToPacket(WorldPacket* data);
 
         typedef std::list<Unit*> UnitList;
         void FillTargetMap();
-        void SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList &targetUnitMap);
+        bool FillCustomTargetMap(SpellEffectIndex effIndex, UnitList& targetUnitMap, uint8& effToIndex);
+        void SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& targetUnitMap);
 
         void FillAreaTargets(UnitList &targetUnitMap, float radius, SpellNotifyPushType pushType, SpellTargets spellTargets, WorldObject* originalCaster = NULL);
         void FillRaidOrPartyTargets(UnitList &targetUnitMap, Unit* member, Unit* center, float radius, bool raid, bool withPets, bool withcaster);
         void FillRaidOrPartyManaPriorityTargets(UnitList &targetUnitMap, Unit* member, Unit* center, float radius, uint32 count, bool raid, bool withPets, bool withcaster);
         void FillRaidOrPartyHealthPriorityTargets(UnitList &targetUnitMap, Unit* member, Unit* center, float radius, uint32 count, bool raid, bool withPets, bool withcaster);
 
-        template<typename T> WorldObject* FindCorpseUsing();
+        // Returns a target that was filled by SPELL_SCRIPT_TARGET (or selected victim) Can return NULL
+        Unit* GetPrefilledUnitTargetOrUnitTarget(SpellEffectIndex effIndex) const;
+
+        template<typename T> WorldObject* FindCorpseUsing(uint32 corpseTypeMask);
 
-        bool CheckTarget( Unit* target, SpellEffectIndex eff );
-        bool CanAutoCast(Unit* target);
+        template<class T> bool CheckTarget(T* target, SpellEffectIndex eff);
+        template<class T> bool CheckTargetBeforeLimitation(T* target, SpellEffectIndex eff);
 
-        static void MANGOS_DLL_SPEC SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 cast_count, SpellCastResult result);
+        SpellCastResult CanAutoCast(Unit* target);
+
+        static void MANGOS_DLL_SPEC SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 cast_count, SpellCastResult result, bool isPetCastResult = false);
         void SendCastResult(SpellCastResult result);
         void SendSpellStart();
         void SendSpellGo();
         void SendSpellCooldown();
+
         void SendLogExecute();
+        void SendEffectLogExecute(SpellEffectIndex eff, ObjectGuid targetGuid, uint32 data1 = 0, uint32 data2 = 0, float data3 = 0.0f);
+        ByteBuffer m_effectExecuteData[MAX_EFFECT_INDEX];
+
         void SendInterrupted(uint8 result);
         void SendChannelUpdate(uint32 time);
         void SendChannelStart(uint32 duration);
         void SendResurrectRequest(Player* target);
-        void SendPlaySpellVisual(uint32 SpellID);
 
-        void HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTarget,SpellEffectIndex i, float DamageMultiplier = 1.0);
+
+        void HandleEffects(Unit *pUnitTarget, Item *pItemTarget, GameObject *pGOTarget, SpellEffectIndex i);
         void HandleThreatSpells();
         //void HandleAddAura(Unit* Target);
 
@@ -443,7 +484,7 @@ class Spell
         int32 GetCastTime() const { return m_casttime; }
         uint32 GetCastedTime() { return m_timer; }
         bool IsAutoRepeat() const { return m_autoRepeat; }
-        void SetAutoRepeat(bool rep) { m_autoRepeat = rep; }
+        void SetAutoRepeat(bool rep) { m_autoRepeat = rep; }    
         void ReSetTimer() { m_timer = m_casttime > 0 ? m_casttime : 0; }
         bool IsNextMeleeSwingSpell() const
         {
@@ -460,12 +501,14 @@ class Spell
         bool IsDeletable() const { return !m_referencedFromCurrentSpell && !m_executedCurrently; }
         void SetReferencedFromCurrent(bool yes) { m_referencedFromCurrentSpell = yes; }
         void SetExecutedCurrently(bool yes) { m_executedCurrently = yes; }
+
         uint64 GetDelayStart() const { return m_delayStart; }
         void SetDelayStart(uint64 m_time) { m_delayStart = m_time; }
         uint64 GetDelayMoment() const { return m_delayMoment; }
+        float GetBaseSpellSpeed();
 
         bool IsNeedSendToClient() const;                    // use for hide spell cast for client in case when cast not have client side affect (animation or log entries)
-        bool IsTriggeredSpellWithRedundentData() const;     // use for ignore some spell data for triggered spells like cast time, some triggered spells have redundent copy data from main spell for client use purpose
+        bool IsTriggeredSpellWithRedundentCastTime() const; // use for ignore some spell data for triggered spells like cast time, some triggered spells have redundent copy data from main spell for client use purpose
 
         CurrentSpellTypes GetCurrentContainer();
 
@@ -475,22 +518,26 @@ class Spell
         // real source of cast affects, explicit caster, or DoT/HoT applier, or GO owner, or wild GO itself. Can be NULL
         WorldObject* GetAffectiveCasterObject() const;
         // limited version returning NULL in cases wild gameobject caster object, need for Aura (auras currently not support non-Unit caster)
-        Unit* GetAffectiveCaster() const { return m_originalCasterGUID ? m_originalCaster : m_caster; }
-        // m_originalCasterGUID can store GO guid, and in this case this is visual caster
+        Unit* GetAffectiveCaster() const { return m_originalCasterGuid ? m_originalCaster : m_caster; }
+        // m_originalCasterGuid can store GO guid, and in this case this is visual caster
         WorldObject* GetCastingObject() const;
 
-        uint32 GetPowerCost() const { return m_powerCost; }
+        // Unstead of GetAffectiveCaster() not return NULL if original caster is GameObject.
+        Unit* GetAffectiveUnitCaster() const { return (m_originalCaster ? m_originalCaster : m_caster); }
 
-        void UpdatePointers();                              // must be used at call Spell code after time delay (non triggered spell cast/update spell call/etc)
+        int32 GetPowerCost() const { return m_powerCost; }
 
-        bool CheckTargetCreatureType(Unit* target) const;
+        void UpdatePointers();                              // must be used at call Spell code after time delay (non triggered spell cast/update spell call/etc)
 
-        void AddTriggeredSpell(SpellEntry const* spellInfo) { m_TriggerSpells.push_back(spellInfo); }
         void AddPrecastSpell(SpellEntry const* spellInfo) { m_preCastSpells.push_back(spellInfo); }
-        void AddTriggeredSpell(uint32 spellId);
+        void AddTriggeredSpell(SpellEntry const* spellInfo) { m_TriggerSpells.push_back(spellInfo); }
+        void AddNotTriggeredSpell(SpellEntry const* spellInfo) { m_NotTriggerSpells.push_back(spellInfo); }
         void AddPrecastSpell(uint32 spellId);
+        void AddTriggeredSpell(uint32 spellId);
+        void AddNotTriggeredSpell(uint32 spellId);
         void CastPreCastSpells(Unit* target);
         void CastTriggerSpells();
+        void CastNotTriggerSpells();
 
         void CleanupTargetList();
         void ClearCastItem();
@@ -508,7 +555,7 @@ class Spell
 
         Unit* m_caster;
 
-        ObjectGuid m_originalCasterGUID;                    // real source of cast (aura caster/etc), used for spell targets selection
+        ObjectGuid m_originalCasterGuid;                    // real source of cast (aura caster/etc), used for spell targets selection
                                                             // e.g. damage around area spell trigered by victim aura and da,age emeies of aura caster
         Unit* m_originalCaster;                             // cached pointer for m_originalCaster, updated at Spell::UpdatePointers()
 
@@ -517,10 +564,9 @@ class Spell
         //Spell data
         SpellSchoolMask m_spellSchoolMask;                  // Spell school (can be overwrite for some spells (wand shoot for example)
         WeaponAttackType m_attackType;                      // For weapon based attack
-        uint32 m_powerCost;                                 // Calculated spell cost     initialized only in Spell::prepare
+        int32 m_powerCost;                                  // Calculated spell cost     initialized only in Spell::prepare
         int32 m_casttime;                                   // Calculated spell cast time initialized only in Spell::prepare
         int32 m_duration;
-        bool m_canReflect;                                  // can reflect this spell?
         uint8 m_spellFlags;                                 // for spells whose target was changed in cast i.e. due to reflect
         bool m_autoRepeat;
         uint8 m_runesState;
@@ -543,15 +589,14 @@ class Spell
         // These vars are used in both delayed spell system and modified immediate spell system
         bool m_referencedFromCurrentSpell;                  // mark as references to prevent deleted and access by dead pointers
         bool m_executedCurrently;                           // mark as executed to prevent deleted and access by dead pointers
-        bool m_needSpellLog;                                // need to send spell log?
         uint8 m_applyMultiplierMask;                        // by effect: damage multiplier needed?
-        float m_damageMultipliers[3];                       // by effect: damage multiplier
+        float m_damageMultipliers[MAX_EFFECT_INDEX];        // by effect: damage multiplier
 
         // Current targets, to be used in SpellEffects (MUST BE USED ONLY IN SPELL EFFECTS)
         Unit* unitTarget;
         Item* itemTarget;
         GameObject* gameObjTarget;
-        SpellAuraHolder* m_spellAuraHolder;                 // spell aura holder for current target, created only if spell has aura applying effect
+        SpellAuraHolderPtr m_spellAuraHolder;                 // spell aura holder for current target, created only if spell has aura applying effect
         int32 damage;
 
         // this is set in Spell Hit, but used in Apply Aura handler
@@ -562,9 +607,10 @@ class Spell
         GameObject* focusObject;
 
         // Damage and healing in effects need just calculate
-        int32 m_damage;                                     // Damage   in effects count here
+        int32 m_damage;                                     // Total accumulated damage for all effects
         int32 m_healing;                                    // Healing in effects count here
         int32 m_healthLeech;                                // Health leech in effects for all targets count here
+        int8 m_damageIndex;                                 // Index of last effect that added to m_damage
 
         //******************************************
         // Spell trigger system
@@ -614,11 +660,12 @@ class Spell
         GOTargetList   m_UniqueGOTargetInfo;
         ItemTargetList m_UniqueItemInfo;
 
+        void AddTarget(ObjectGuid targetGuid, SpellEffectIndex effIndex);
+
         void AddUnitTarget(Unit* target, SpellEffectIndex effIndex);
-        void AddUnitTarget(ObjectGuid unitGuid, SpellEffectIndex effIndex);
         void AddGOTarget(GameObject* target, SpellEffectIndex effIndex);
-        void AddGOTarget(ObjectGuid goGuid, SpellEffectIndex effIndex);
         void AddItemTarget(Item* target, SpellEffectIndex effIndex);
+
         void DoAllEffectOnTarget(TargetInfo *target);
         void HandleDelayedSpellLaunch(TargetInfo *target);
         void InitializeDamageMultipliers();
@@ -632,8 +679,9 @@ class Spell
 
         //List For Triggered Spells
         typedef std::list<SpellEntry const*> SpellInfoList;
-        SpellInfoList m_TriggerSpells;                      // casted by caster to same targets settings in m_targets at success finish of current spell
         SpellInfoList m_preCastSpells;                      // casted by caster to each target at spell hit before spell effects apply
+        SpellInfoList m_TriggerSpells;                      // casted by caster to same targets settings in m_targets at success finish of current spell
+        SpellInfoList m_NotTriggerSpells;                   // casted not triggered by caster to same targets settings in m_targets at success finish of current spell
 
         uint32 m_spellState;
         uint32 m_timer;
@@ -688,7 +736,7 @@ namespace MaNGOS
                 if( i_originalCaster->IsFriendlyTo(pPlayer) )
                     continue;
 
-                if( pPlayer->IsWithinDist3d(i_spell.m_targets.m_destX, i_spell.m_targets.m_destY, i_spell.m_targets.m_destZ,i_radius))
+                if( pPlayer->IsWithinDist3d(i_spell.m_targets.getDestination(),i_radius))
                     i_data.push_back(pPlayer);
             }
         }
@@ -697,7 +745,7 @@ namespace MaNGOS
 
     struct MANGOS_DLL_DECL SpellNotifierCreatureAndPlayer
     {
-        Spell::UnitList *i_data;
+        Spell::UnitList* i_data;
         Spell &i_spell;
         SpellNotifyPushType i_push_type;
         float i_radius;
@@ -705,20 +753,23 @@ namespace MaNGOS
         WorldObject* i_originalCaster;
         WorldObject* i_castingObject;
         bool i_playerControlled;
-        float i_centerX;
-        float i_centerY;
-        float i_centerZ;
+        WorldLocation i_center;
 
-        float GetCenterX() const { return i_centerX; }
-        float GetCenterY() const { return i_centerY; }
+        WorldLocation const& GetCenter() const { return i_center; }
+
+        float GetCenterX() const { return i_center.x; }
+        float GetCenterY() const { return i_center.y; }
+        float GetCenterZ() const { return i_center.z; }
 
         SpellNotifierCreatureAndPlayer(Spell &spell, Spell::UnitList &data, float radius, SpellNotifyPushType type,
             SpellTargets TargetType = SPELL_TARGETS_NOT_FRIENDLY, WorldObject* originalCaster = NULL)
             : i_data(&data), i_spell(spell), i_push_type(type), i_radius(radius), i_TargetType(TargetType),
-            i_originalCaster(originalCaster), i_castingObject(i_spell.GetCastingObject())
+            i_originalCaster(originalCaster), i_castingObject(i_spell.GetCastingObject()), i_center(WorldLocation())
         {
             if (!i_originalCaster)
                 i_originalCaster = i_spell.GetAffectiveCasterObject();
+            if (!i_castingObject)
+                i_castingObject = i_spell.m_caster;
             i_playerControlled = i_originalCaster  ? i_originalCaster->IsControlledByPlayer() : false;
 
             switch(i_push_type)
@@ -731,33 +782,26 @@ namespace MaNGOS
                 case PUSH_SELF_CENTER:
                     if (i_castingObject)
                     {
-                        i_centerX = i_castingObject->GetPositionX();
-                        i_centerY = i_castingObject->GetPositionY();
+                        i_center =  WorldLocation(i_castingObject->GetPosition());
                     }
                     break;
                 case PUSH_DEST_CENTER:
-                    if (i_spell.m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
-                    {
-                        i_centerX = i_spell.m_targets.m_destX;
-                        i_centerY = i_spell.m_targets.m_destY;
-                        i_centerZ = i_spell.m_targets.m_destZ;
-                    }
-                    else
-                    {
-                        i_centerX = i_spell.m_targets.m_srcX;
-                        i_centerY = i_spell.m_targets.m_srcY;
-                        i_centerZ = i_spell.m_targets.m_srcZ;
-                    }
+                case PUSH_INHERITED_CENTER:
+                {
+                    i_center = i_spell.m_targets.m_targetMask & TARGET_FLAG_SOURCE_LOCATION ?
+                                                i_spell.m_targets.getSource() :
+                                                i_spell.m_targets.getDestination();
                     break;
+                }
                 case PUSH_TARGET_CENTER:
                     if (Unit* target = i_spell.m_targets.getUnitTarget())
                     {
-                        i_centerX = target->GetPositionX();
-                        i_centerY = target->GetPositionY();
+                        i_center =  WorldLocation(target->GetPosition());
                     }
                     break;
                 default:
                     sLog.outError("SpellNotifierCreatureAndPlayer: unsupported PUSH_* case %u.", i_push_type);
+                    break;
             }
         }
 
@@ -797,7 +841,7 @@ namespace MaNGOS
                         break;
                     case SPELL_TARGETS_AOE_DAMAGE:
                     {
-                        if (itr->getSource()->GetTypeId()==TYPEID_UNIT && ((Creature*)itr->getSource())->IsTotem())
+                        if (itr->getSource()->GetTypeId() == TYPEID_UNIT && ((Creature*)itr->getSource())->IsTotem())
                             continue;
 
                         if (i_playerControlled)
@@ -810,8 +854,11 @@ namespace MaNGOS
                             if (!i_originalCaster->IsHostileTo( itr->getSource() ))
                                 continue;
                         }
+
+                        if (!itr->getSource()->IsVisibleTargetForSpell(i_originalCaster, i_spell.m_spellInfo, &i_center))
+                            continue;
+                        break;
                     }
-                    break;
                     case SPELL_TARGETS_ALL:
                         break;
                     default: continue;
@@ -845,9 +892,23 @@ namespace MaNGOS
                             i_data->push_back(itr->getSource());
                         break;
                     case PUSH_DEST_CENTER:
-                        if (itr->getSource()->IsWithinDist3d(i_centerX, i_centerY, i_centerZ, i_radius))
+                        if (itr->getSource()->IsWithinDist3d(GetCenter(), i_radius))
                             i_data->push_back(itr->getSource());
                         break;
+                    case PUSH_INHERITED_CENTER:
+                    {
+                        if ((i_spell.m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) || (i_spell.m_targets.m_targetMask & TARGET_FLAG_UNIT))
+                        {
+                            if (itr->getSource()->IsWithinDist3d(i_spell.m_targets.getDestination(), i_radius))
+                                i_data->push_back(itr->getSource());
+                        }
+                        else if (i_spell.m_targets.m_targetMask & TARGET_FLAG_SOURCE_LOCATION)
+                        {
+                            if (itr->getSource()->IsWithinDist3d(i_spell.m_targets.getSource(), i_radius))
+                                i_data->push_back(itr->getSource());
+                        }
+                        break;
+                    }
                     case PUSH_TARGET_CENTER:
                         if (i_spell.m_targets.getUnitTarget() && i_spell.m_targets.getUnitTarget()->IsWithinDist((Unit*)(itr->getSource()), i_radius))
                             i_data->push_back(itr->getSource());
@@ -874,16 +935,4 @@ namespace MaNGOS
 
 typedef void(Spell::*pEffect)(SpellEffectIndex eff_idx);
 
-class SpellEvent : public BasicEvent
-{
-    public:
-        SpellEvent(Spell* spell);
-        virtual ~SpellEvent();
-
-        virtual bool Execute(uint64 e_time, uint32 p_time);
-        virtual void Abort(uint64 e_time);
-        virtual bool IsDeletable() const;
-    protected:
-        Spell* m_Spell;
-};
 #endif
diff --git a/src/game/SpellAuraDefines.h b/src/game/SpellAuraDefines.h
index 2071944b58c..ec741183e77 100644
--- a/src/game/SpellAuraDefines.h
+++ b/src/game/SpellAuraDefines.h
@@ -83,7 +83,7 @@ enum AuraType
     SPELL_AURA_TRACK_RESOURCES = 45,
     SPELL_AURA_46 = 46,                                     // Ignore all Gear test spells
     SPELL_AURA_MOD_PARRY_PERCENT = 47,
-    SPELL_AURA_48 = 48,                                     // One periodic spell
+    SPELL_AURA_PERIODIC_TRIGGER_BY_CLIENT = 48,             // Client periodic trigger spell by self (3 spells in 3.3.5a)
     SPELL_AURA_MOD_DODGE_PERCENT = 49,
     SPELL_AURA_MOD_CRITICAL_HEALING_AMOUNT = 50,
     SPELL_AURA_MOD_BLOCK_PERCENT = 51,
@@ -265,7 +265,7 @@ enum AuraType
     SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE = 227,
     SPELL_AURA_DETECT_STEALTH = 228,
     SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE = 229,
-    SPELL_AURA_230 = 230,
+    SPELL_AURA_MOD_PARTY_MAX_HEALTH = 230,
     SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE = 231,
     SPELL_AURA_MECHANIC_DURATION_MOD = 232,
     SPELL_AURA_233 = 233,
@@ -278,7 +278,7 @@ enum AuraType
     SPELL_AURA_MOD_EXPERTISE = 240,
     SPELL_AURA_FORCE_MOVE_FORWARD = 241,
     SPELL_AURA_MOD_SPELL_DAMAGE_FROM_HEALING = 242,
-    SPELL_AURA_243 = 243,
+    SPELL_AURA_FACTION_CHANGE = 243,
     SPELL_AURA_COMPREHEND_LANGUAGE = 244,
     SPELL_AURA_MOD_DURATION_OF_MAGIC_EFFECTS = 245,
     SPELL_AURA_MOD_DURATION_OF_EFFECTS_BY_DISPEL = 246,
@@ -314,12 +314,12 @@ enum AuraType
     SPELL_AURA_276 = 276,                                   // Only "Test Mod Damage % Mechanic" spell, possible mod damage done
     SPELL_AURA_MOD_MAX_AFFECTED_TARGETS = 277,
     SPELL_AURA_MOD_DISARM_RANGED = 278,
-    SPELL_AURA_279 = 279,
+    SPELL_AURA_INITIALIZE_IMAGES = 279,
     SPELL_AURA_MOD_TARGET_ARMOR_PCT = 280,
     SPELL_AURA_MOD_HONOR_GAIN = 281,
     SPELL_AURA_MOD_BASE_HEALTH_PCT = 282,
     SPELL_AURA_MOD_HEALING_RECEIVED = 283,                  // Possibly only for some spell family class spells
-    SPELL_AURA_284,
+    SPELL_AURA_LINKED = 284,
     SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR = 285,
     SPELL_AURA_ABILITY_PERIODIC_CRIT = 286,
     SPELL_AURA_DEFLECT_SPELLS = 287,
@@ -331,14 +331,14 @@ enum AuraType
     SPELL_AURA_ADD_MECHANIC_ABILITIES = 293,
     SPELL_AURA_STOP_NATURAL_MANA_REGEN = 294,
     SPELL_AURA_295 = 295,
-    SPELL_AURA_296 = 296,
+    SPELL_AURA_SET_VEHICLE_ID = 296,
     SPELL_AURA_297 = 297,
     SPELL_AURA_298 = 298,
     SPELL_AURA_299 = 299,
-    SPELL_AURA_300 = 300,
+    SPELL_AURA_SHARE_DAMAGE_PCT = 300,
     SPELL_AURA_HEAL_ABSORB = 301,
     SPELL_AURA_302 = 302,
-    SPELL_AURA_303 = 303,
+    SPELL_AURA_DAMAGE_DONE_VERSUS_AURA_STATE_PCT = 303,
     SPELL_AURA_FAKE_INEBRIATE = 304,
     SPELL_AURA_MOD_MINIMUM_SPEED = 305,
     SPELL_AURA_306 = 306,
@@ -351,7 +351,7 @@ enum AuraType
     SPELL_AURA_313 = 313,
     SPELL_AURA_314 = 314,
     SPELL_AURA_315 = 315,
-    SPELL_AURA_316 = 316,
+    SPELL_AURA_MOD_PERIODIC_HASTE = 316,
     TOTAL_AURAS = 317
 };
 
@@ -364,4 +364,7 @@ enum AreaAuraType
     AREA_AURA_PET,
     AREA_AURA_OWNER
 };
+
+#define NONPERIODIC_AURA_UPDATE_INTERVAL 500
+
 #endif
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 03a9ac1cb7d..93e695e54fe 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -33,11 +33,12 @@
 #include "Group.h"
 #include "UpdateData.h"
 #include "ObjectAccessor.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Totem.h"
 #include "Creature.h"
 #include "Formulas.h"
-#include "BattleGround.h"
+#include "BattleGround/BattleGround.h"
+#include "OutdoorPvP/OutdoorPvP.h"
 #include "CreatureAI.h"
 #include "ScriptMgr.h"
 #include "Util.h"
@@ -45,7 +46,9 @@
 #include "GridNotifiersImpl.h"
 #include "Vehicle.h"
 #include "CellImpl.h"
+#include "InstanceData.h"
 #include "Language.h"
+#include "MapManager.h"
 
 #define NULL_AURA_SLOT 0xFF
 
@@ -79,7 +82,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
     &Aura::HandleAuraModPacify,                             // 25 SPELL_AURA_MOD_PACIFY
     &Aura::HandleAuraModRoot,                               // 26 SPELL_AURA_MOD_ROOT
     &Aura::HandleAuraModSilence,                            // 27 SPELL_AURA_MOD_SILENCE
-    &Aura::HandleNoImmediateEffect,                         // 28 SPELL_AURA_REFLECT_SPELLS        implement in Unit::SpellHitResult
+    &Aura::HandleAuraModReflectSpells,                      // 28 SPELL_AURA_REFLECT_SPELLS    actual reflecting implemented in Unit::SpellHitResult
     &Aura::HandleAuraModStat,                               // 29 SPELL_AURA_MOD_STAT
     &Aura::HandleAuraModSkill,                              // 30 SPELL_AURA_MOD_SKILL
     &Aura::HandleAuraModIncreaseSpeed,                      // 31 SPELL_AURA_MOD_INCREASE_SPEED
@@ -99,7 +102,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
     &Aura::HandleAuraTrackResources,                        // 45 SPELL_AURA_TRACK_RESOURCES
     &Aura::HandleUnused,                                    // 46 SPELL_AURA_46 (used in test spells 54054 and 54058, and spell 48050) (3.0.8a-3.2.2a)
     &Aura::HandleAuraModParryPercent,                       // 47 SPELL_AURA_MOD_PARRY_PERCENT
-    &Aura::HandleNULL,                                      // 48 SPELL_AURA_48 spell Napalm (area damage spell with additional delayed damage effect)
+    &Aura::HandleNoImmediateEffect,                         // 48 SPELL_AURA_PERIODIC_TRIGGER_BY_CLIENT (Client periodic trigger spell by self (3 spells in 3.3.5a)). implemented in pet/player cast chains.
     &Aura::HandleAuraModDodgePercent,                       // 49 SPELL_AURA_MOD_DODGE_PERCENT
     &Aura::HandleNoImmediateEffect,                         // 50 SPELL_AURA_MOD_CRITICAL_HEALING_AMOUNT implemented in Unit::SpellCriticalHealingBonus
     &Aura::HandleAuraModBlockPercent,                       // 51 SPELL_AURA_MOD_BLOCK_PERCENT
@@ -228,7 +231,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
     &Aura::HandleModSpellDamagePercentFromStat,             //174 SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT  implemented in Unit::SpellBaseDamageBonusDone
     &Aura::HandleModSpellHealingPercentFromStat,            //175 SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT implemented in Unit::SpellBaseHealingBonusDone
     &Aura::HandleSpiritOfRedemption,                        //176 SPELL_AURA_SPIRIT_OF_REDEMPTION   only for Spirit of Redemption spell, die at aura end
-    &Aura::HandleNULL,                                      //177 SPELL_AURA_AOE_CHARM (22 spells)
+    &Aura::HandleAuraAoECharm,                              //177 SPELL_AURA_AOE_CHARM (22 spells)
     &Aura::HandleNoImmediateEffect,                         //178 SPELL_AURA_MOD_DEBUFF_RESISTANCE          implemented in Unit::MagicSpellHitResult
     &Aura::HandleNoImmediateEffect,                         //179 SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE implemented in Unit::SpellCriticalBonus
     &Aura::HandleNoImmediateEffect,                         //180 SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS   implemented in Unit::SpellDamageBonusDone
@@ -281,7 +284,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
     &Aura::HandlePeriodicTriggerSpellWithValue,             //227 SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE
     &Aura::HandleNoImmediateEffect,                         //228 SPELL_AURA_DETECT_STEALTH
     &Aura::HandleNoImmediateEffect,                         //229 SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE        implemented in Unit::SpellDamageBonusTaken
-    &Aura::HandleAuraModIncreaseMaxHealth,                  //230 Commanding Shout
+    &Aura::HandleAuraModIncreaseMaxHealth,                  //230 SPELL_AURA_MOD_PARTY_MAX_HEALTH
     &Aura::HandleNoImmediateEffect,                         //231 SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE
     &Aura::HandleNoImmediateEffect,                         //232 SPELL_AURA_MECHANIC_DURATION_MOD           implement in Unit::CalculateAuraDuration
     &Aura::HandleNULL,                                      //233 set model id to the one of the creature with id m_modifier.m_miscvalue
@@ -294,7 +297,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
     &Aura::HandleAuraModExpertise,                          //240 SPELL_AURA_MOD_EXPERTISE
     &Aura::HandleForceMoveForward,                          //241 Forces the caster to move forward
     &Aura::HandleUnused,                                    //242 SPELL_AURA_MOD_SPELL_DAMAGE_FROM_HEALING (only 2 test spels in 3.2.2a)
-    &Aura::HandleNULL,                                      //243 faction reaction override spells
+    &Aura::HandleAuraFactionChange,                         //243 faction change
     &Aura::HandleComprehendLanguage,                        //244 SPELL_AURA_COMPREHEND_LANGUAGE
     &Aura::HandleNoImmediateEffect,                         //245 SPELL_AURA_MOD_DURATION_OF_MAGIC_EFFECTS     implemented in Unit::CalculateAuraDuration
     &Aura::HandleNoImmediateEffect,                         //246 SPELL_AURA_MOD_DURATION_OF_EFFECTS_BY_DISPEL implemented in Unit::CalculateAuraDuration
@@ -322,7 +325,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
     &Aura::HandleAuraModAttackPowerOfStatPercent,           //268 SPELL_AURA_MOD_ATTACK_POWER_OF_STAT_PERCENT
     &Aura::HandleNoImmediateEffect,                         //269 SPELL_AURA_MOD_IGNORE_DAMAGE_REDUCTION_SCHOOL   implemented in Unit::CalcNotIgnoreDamageReduction
     &Aura::HandleUnused,                                    //270 SPELL_AURA_MOD_IGNORE_TARGET_RESIST (unused in 3.2.2a)
-    &Aura::HandleNoImmediateEffect,                         //271 SPELL_AURA_MOD_DAMAGE_FROM_CASTER    implemented in Unit::SpellDamageBonusTaken
+    &Aura::HandleNoImmediateEffect,                         //271 SPELL_AURA_MOD_DAMAGE_FROM_CASTER    implemented in Unit::MeleeDamageBonusTaken and Unit::SpellDamageBonusTaken
     &Aura::HandleNoImmediateEffect,                         //272 SPELL_AURA_MAELSTROM_WEAPON (unclear use for aura, it used in (3.2.2a...3.3.0) in single spell 53817 that spellmode stacked and charged spell expected to be drop as stack
     &Aura::HandleNoImmediateEffect,                         //273 SPELL_AURA_X_RAY (client side implementation)
     &Aura::HandleNULL,                                      //274 proc free shot?
@@ -330,12 +333,12 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
     &Aura::HandleNULL,                                      //276 mod damage % mechanic?
     &Aura::HandleNoImmediateEffect,                         //277 SPELL_AURA_MOD_MAX_AFFECTED_TARGETS Use SpellClassMask for spell select
     &Aura::HandleAuraModDisarm,                             //278 SPELL_AURA_MOD_DISARM_RANGED disarm ranged weapon
-    &Aura::HandleNULL,                                      //279 visual effects? 58836 and 57507
+    &Aura::HandleInitializeImages,                          //279 aura for initialization mirror images (copy name)
     &Aura::HandleModTargetArmorPct,                         //280 SPELL_AURA_MOD_TARGET_ARMOR_PCT
     &Aura::HandleNoImmediateEffect,                         //281 SPELL_AURA_MOD_HONOR_GAIN             implemented in Player::RewardHonor
     &Aura::HandleAuraIncreaseBaseHealthPercent,             //282 SPELL_AURA_INCREASE_BASE_HEALTH_PERCENT
     &Aura::HandleNoImmediateEffect,                         //283 SPELL_AURA_MOD_HEALING_RECEIVED       implemented in Unit::SpellHealingBonusTaken
-    &Aura::HandleNULL,                                      //284 51 spells
+    &Aura::HandleAuraLinked,                                //284 SPELL_AURA_LINKED
     &Aura::HandleAuraModAttackPowerOfArmor,                 //285 SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR  implemented in Player::UpdateAttackPowerAndDamage
     &Aura::HandleNoImmediateEffect,                         //286 SPELL_AURA_ABILITY_PERIODIC_CRIT      implemented in Aura::IsCritFromAbilityAura called from Aura::PeriodicTick
     &Aura::HandleNoImmediateEffect,                         //287 SPELL_AURA_DEFLECT_SPELLS             implemented in Unit::MagicSpellHitResult and Unit::MeleeSpellHitResult
@@ -347,14 +350,14 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
     &Aura::HandleAuraAddMechanicAbilities,                  //293 SPELL_AURA_ADD_MECHANIC_ABILITIES  replaces target's action bars with a predefined spellset
     &Aura::HandleAuraStopNaturalManaRegen,                  //294 SPELL_AURA_STOP_NATURAL_MANA_REGEN implemented in Player:Regenerate
     &Aura::HandleUnused,                                    //295 unused (3.2.2a)
-    &Aura::HandleNULL,                                      //296 2 spells
+    &Aura::HandleAuraSetVehicle,                            //296 SPELL_AURA_SET_VEHICLE_ID sets vehicle on target
     &Aura::HandleNULL,                                      //297 1 spell (counter spell school?)
     &Aura::HandleUnused,                                    //298 unused (3.2.2a)
     &Aura::HandleUnused,                                    //299 unused (3.2.2a)
-    &Aura::HandleNULL,                                      //300 3 spells (share damage?)
+    &Aura::HandleNoImmediateEffect,                         //300 3 spells, share damage (in percent) with aura owner and aura target. implemented in Unit::DealDamage
     &Aura::HandleNULL,                                      //301 SPELL_AURA_HEAL_ABSORB 5 spells
     &Aura::HandleUnused,                                    //302 unused (3.2.2a)
-    &Aura::HandleNULL,                                      //303 17 spells
+    &Aura::HandleNoImmediateEffect,                         //303 SPELL_AURA_DAMAGE_DONE_VERSUS_AURA_STATE_PCT 17 spells implemented in Unit::*DamageBonus
     &Aura::HandleAuraFakeInebriation,                       //304 SPELL_AURA_FAKE_INEBRIATE
     &Aura::HandleAuraModIncreaseSpeed,                      //305 SPELL_AURA_MOD_MINIMUM_SPEED
     &Aura::HandleNULL,                                      //306 1 spell
@@ -367,15 +370,15 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
     &Aura::HandleNULL,                                      //313 0 spells in 3.3
     &Aura::HandleNULL,                                      //314 1 test spell (reduce duration of silince/magic)
     &Aura::HandleNULL,                                      //315 underwater walking
-    &Aura::HandleNULL                                       //316 makes haste affect HOT/DOT ticks
+    &Aura::HandleNoImmediateEffect                          //316 SPELL_AURA_MOD_PERIODIC_HASTE makes haste affect HOT/DOT ticks
 };
 
 static AuraType const frozenAuraTypes[] = { SPELL_AURA_MOD_ROOT, SPELL_AURA_MOD_STUN, SPELL_AURA_NONE };
 
-Aura::Aura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target, Unit *caster, Item* castItem) :
+Aura::Aura(AuraClassType type, SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolderPtr holder, Unit *target, Unit *caster, Item* castItem) :
 m_periodicTimer(0), m_periodicTick(0), m_removeMode(AURA_REMOVE_BY_DEFAULT),
-m_effIndex(eff), m_positive(false), m_isPeriodic(false), m_isAreaAura(false),
-m_isPersistent(false), m_in_use(0), m_spellAuraHolder(holder)
+m_effIndex(eff), m_deleted(false), m_positive(false), m_isPeriodic(false), m_isAreaAura(false),
+m_isPersistent(false), m_isActive(false), m_spellAuraHolder(holder), m_classType(type)
 {
     MANGOS_ASSERT(target);
     MANGOS_ASSERT(spellproto && spellproto == sSpellStore.LookupEntry( spellproto->Id ) && "`info` must be pointer to sSpellStore element");
@@ -404,7 +407,7 @@ m_isPersistent(false), m_in_use(0), m_spellAuraHolder(holder)
                     {
                         for (int t = 0; t < 3; ++t)
                         {
-                            if(pEnchant->spellid[t] != spellproto->Id)
+                            if (pEnchant->spellid[t] != spellproto->Id)
                                 continue;
 
                             damage = uint32((item_rand_suffix->prefix[k]*castItem->GetItemSuffixFactor()) / 10000 );
@@ -429,19 +432,60 @@ m_isPersistent(false), m_in_use(0), m_spellAuraHolder(holder)
 
     // Apply periodic time mod
     if (modOwner && m_modifier.periodictime)
+    {
         modOwner->ApplySpellMod(spellproto->Id, SPELLMOD_ACTIVATION_TIME, m_modifier.periodictime);
+        uint32 newperiodictime  = modOwner->CalculateAuraPeriodicTimeWithHaste(spellproto, m_modifier.periodictime);
+        if (newperiodictime != m_modifier.periodictime)
+            m_modifier.periodictime = newperiodictime;
+    }
 
     // Start periodic on next tick or at aura apply
     if (!spellproto->HasAttribute(SPELL_ATTR_EX5_START_PERIODIC_AT_APPLY))
         m_periodicTimer = m_modifier.periodictime;
+
+    // Calculate CrowdControl damage start value
+    if (IsCrowdControlAura(m_modifier.m_auraname))
+    {
+        if (uint32 cc_base_damage = CalculateCrowdControlBreakDamage())
+            m_modifier.m_baseamount = cc_base_damage;
+    }
+
+    m_stacking = IsEffectStacking();
+
+    switch (type)
+    {
+        case AURA_CLASS_AREA_AURA:
+        {
+            AreaAura(spellproto, eff, currentBasePoints, holder, target, caster, castItem);
+            break;
+        }
+        case AURA_CLASS_PERSISTENT_AREA_AURA:
+        {
+            PersistentAreaAura(spellproto, eff, currentBasePoints, holder, target, caster, castItem);
+            break;
+        }
+        case AURA_CLASS_SINGLE_ENEMY_AURA:
+        {
+            SingleEnemyTargetAura(spellproto, eff, currentBasePoints, holder, target, caster, castItem);
+            break;
+        }
+        case AURA_CLASS_AURA:
+        default:
+            break;
+    }
 }
 
 Aura::~Aura()
 {
 }
 
-AreaAura::AreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target,
-Unit *caster, Item* castItem) : Aura(spellproto, eff, currentBasePoints, holder, target, caster, castItem)
+ObjectGuid const& Aura::GetCastItemGuid() const { return GetHolder() ? GetHolder()->GetCastItemGuid() : ObjectGuid::Null; }
+
+ObjectGuid const& Aura::GetCasterGuid() const { return GetHolder() ? GetHolder()->GetCasterGuid() : ObjectGuid::Null; }
+
+ObjectGuid const& Aura::GetAffectiveCasterGuid() const { return GetHolder() ? GetHolder()->GetAffectiveCasterGuid() : ObjectGuid::Null; }
+
+void Aura::AreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolderPtr holder, Unit *target,Unit *caster, Item* castItem)
 {
     m_isAreaAura = true;
 
@@ -449,16 +493,16 @@ Unit *caster, Item* castItem) : Aura(spellproto, eff, currentBasePoints, holder,
     Unit* caster_ptr = caster ? caster : target;
 
     m_radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(spellproto->EffectRadiusIndex[m_effIndex]));
-    if(Player* modOwner = caster_ptr->GetSpellModOwner())
+    if (Player* modOwner = caster_ptr->GetSpellModOwner())
         modOwner->ApplySpellMod(spellproto->Id, SPELLMOD_RADIUS, m_radius);
 
     switch(spellproto->Effect[eff])
     {
         case SPELL_EFFECT_APPLY_AREA_AURA_PARTY:
-            m_areaAuraType = AREA_AURA_PARTY;
+            m_areaAuraType = caster_ptr->IsCharmerOrOwnerPlayerOrPlayerItself() ? AREA_AURA_PARTY : AREA_AURA_FRIEND;
             break;
         case SPELL_EFFECT_APPLY_AREA_AURA_RAID:
-            m_areaAuraType = AREA_AURA_RAID;
+            m_areaAuraType = caster_ptr->IsCharmerOrOwnerPlayerOrPlayerItself() ? AREA_AURA_RAID : AREA_AURA_FRIEND;
             // Light's Beacon not applied to caster itself (TODO: more generic check for another similar spell if any?)
             if (target == caster_ptr && spellproto->Id == 53651)
                 m_modifier.m_auraname = SPELL_AURA_NONE;
@@ -480,7 +524,7 @@ Unit *caster, Item* castItem) : Aura(spellproto, eff, currentBasePoints, holder,
                 m_modifier.m_auraname = SPELL_AURA_NONE;
             break;
         default:
-            sLog.outError("Wrong spell effect in AreaAura constructor");
+            sLog.outError("Aura::AreaAura Wrong spell effect %u in AreaAura constructor", spellproto->Effect[eff]);
             MANGOS_ASSERT(false);
             break;
     }
@@ -490,54 +534,68 @@ Unit *caster, Item* castItem) : Aura(spellproto, eff, currentBasePoints, holder,
         m_modifier.m_auraname = SPELL_AURA_NONE;
 }
 
-AreaAura::~AreaAura()
-{
-}
-
-PersistentAreaAura::PersistentAreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target,
-Unit *caster, Item* castItem) : Aura(spellproto, eff, currentBasePoints, holder, target, caster, castItem)
+void Aura::PersistentAreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolderPtr holder, Unit *target,Unit *caster, Item* castItem)
 {
     m_isPersistent = true;
 }
 
-PersistentAreaAura::~PersistentAreaAura()
-{
-}
-
-SingleEnemyTargetAura::SingleEnemyTargetAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target,
-Unit *caster, Item* castItem) : Aura(spellproto, eff, currentBasePoints, holder, target, caster, castItem)
+void Aura::SingleEnemyTargetAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolderPtr holder, Unit *target, Unit *caster, Item* castItem)
 {
     if (caster)
         m_castersTargetGuid = caster->GetTypeId()==TYPEID_PLAYER ? ((Player*)caster)->GetSelectionGuid() : caster->GetTargetGuid();
 }
 
-SingleEnemyTargetAura::~SingleEnemyTargetAura()
+Unit* Aura::GetTriggerTarget() const
 {
-}
+    if (GetAuraClassType() != AURA_CLASS_SINGLE_ENEMY_AURA)
+        return m_spellAuraHolder->GetTarget();
+
+    // search for linked dummy aura with the correct target
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+        if (i != GetEffIndex())
+            if (Aura *aur = GetHolder()->GetAuraByEffectIndex(SpellEffectIndex(i)))
+                if (aur->GetSpellProto()->EffectApplyAuraName[i] == SPELL_AURA_DUMMY)
+                    return aur->GetTarget();
 
-Unit* SingleEnemyTargetAura::GetTriggerTarget() const
-{
     return ObjectAccessor::GetUnit(*(m_spellAuraHolder->GetTarget()), m_castersTargetGuid);
 }
 
-Aura* CreateAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target, Unit *caster, Item* castItem)
+Aura* SpellAuraHolder::CreateAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolderPtr holder, Unit *target, Unit *caster, Item* castItem)
 {
-    if (IsAreaAuraEffect(spellproto->Effect[eff]))
-        return new AreaAura(spellproto, eff, currentBasePoints, holder, target, caster, castItem);
+    if (!spellproto || spellproto != m_spellProto)
+        return (Aura*)NULL;
 
     uint32 triggeredSpellId = spellproto->EffectTriggerSpell[eff];
-
-    if(SpellEntry const* triggeredSpellInfo = sSpellStore.LookupEntry(triggeredSpellId))
+    if (IsAreaAuraEffect(spellproto->Effect[eff]))
+    {
+        return CreateAura(AURA_CLASS_AREA_AURA, eff, currentBasePoints, holder, target, caster, castItem);
+    }
+    else if (SpellEntry const* triggeredSpellInfo = sSpellStore.LookupEntry(triggeredSpellId))
+    {
         for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+        {
             if (triggeredSpellInfo->EffectImplicitTargetA[i] == TARGET_SINGLE_ENEMY)
-                return new SingleEnemyTargetAura(spellproto, eff, currentBasePoints, holder, target, caster, castItem);
+            {
+                return CreateAura(AURA_CLASS_SINGLE_ENEMY_AURA, eff, currentBasePoints, holder, target, caster, castItem);
+            }
+        }
+    }
+    // else - normal aura
+
+    return CreateAura(AURA_CLASS_AURA, eff, currentBasePoints, holder, target, caster, castItem);
+}
+
+Aura* SpellAuraHolder::CreateAura(AuraClassType type, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolderPtr holder, Unit* target, Unit* caster, Item* castItem)
+{
+    AddAura(Aura(type, m_spellProto, eff, currentBasePoints, holder, target, caster, castItem),eff);
 
-    return new Aura(spellproto, eff, currentBasePoints, holder, target, caster, castItem);
+    return GetAuraByEffectIndex(eff);
 }
 
-SpellAuraHolder* CreateSpellAuraHolder(SpellEntry const* spellproto, Unit *target, WorldObject *caster, Item *castItem)
+SpellAuraHolderPtr CreateSpellAuraHolder(SpellEntry const* spellproto, Unit *target, WorldObject *caster, Item *castItem)
 {
-    return new SpellAuraHolder(spellproto, target, caster, castItem);
+     SpellAuraHolderPtr holderPtr = SpellAuraHolderPtr(new SpellAuraHolder(spellproto, target, caster, castItem));
+     return holderPtr;
 }
 
 void Aura::SetModifier(AuraType t, int32 a, uint32 pt, int32 miscValue)
@@ -546,6 +604,27 @@ void Aura::SetModifier(AuraType t, int32 a, uint32 pt, int32 miscValue)
     m_modifier.m_amount = a;
     m_modifier.m_miscvalue = miscValue;
     m_modifier.periodictime = pt;
+    m_modifier.m_baseamount = a;
+}
+
+void Aura::UpdateAura(uint32 diff)
+{
+    switch(GetAuraClassType())
+    {
+        case AURA_CLASS_AREA_AURA:
+            AreaAuraUpdate(diff);
+            break;
+        case AURA_CLASS_PERSISTENT_AREA_AURA:
+        {
+            PersistentAreaAuraUpdate(diff);
+            break;
+        }
+        case AURA_CLASS_SINGLE_ENEMY_AURA:
+        case AURA_CLASS_AURA:
+        default:
+            Update(diff);
+            break;
+    }
 }
 
 void Aura::Update(uint32 diff)
@@ -553,7 +632,7 @@ void Aura::Update(uint32 diff)
     if (m_isPeriodic)
     {
         m_periodicTimer -= diff;
-        if(m_periodicTimer <= 0) // tick also at m_periodicTimer==0 to prevent lost last tick in case max m_duration == (max m_periodicTimer)*N
+        if (m_periodicTimer <= 0) // tick also at m_periodicTimer==0 to prevent lost last tick in case max m_duration == (max m_periodicTimer)*N
         {
             // update before applying (aura can be removed in TriggerSpell or PeriodicTick calls)
             m_periodicTimer += m_modifier.periodictime;
@@ -561,244 +640,332 @@ void Aura::Update(uint32 diff)
             PeriodicTick();
         }
     }
+    else
+    {
+        if (m_periodicTimer <= 0)
+        {
+            m_periodicTimer = NONPERIODIC_AURA_UPDATE_INTERVAL;
+            PeriodicCheck();
+        }
+        else
+            m_periodicTimer -= diff;
+    }
 }
 
-void AreaAura::Update(uint32 diff)
+void Aura::AreaAuraUpdate(uint32 diff)
 {
     // update for the caster of the aura
-    if(GetCasterGuid() == GetTarget()->GetObjectGuid())
+    if (GetCasterGuid() == GetTarget()->GetObjectGuid())
     {
         Unit* caster = GetTarget();
 
-        if( !caster->hasUnitState(UNIT_STAT_ISOLATED) )
+        if (!caster || !caster->GetMap())
+            return;
+
+        if (!caster->hasUnitState(UNIT_STAT_ISOLATED))
         {
             Unit* owner = caster->GetCharmerOrOwner();
             if (!owner)
                 owner = caster;
-            Spell::UnitList targets;
 
-            switch(m_areaAuraType)
+            GuidSet targets;
+            Spell::UnitList _targets;
+
+            switch (m_areaAuraType)
             {
                 case AREA_AURA_PARTY:
                 {
-                    Group *pGroup = NULL;
+                    Group* pGroup = NULL;
 
                     if (owner->GetTypeId() == TYPEID_PLAYER)
                         pGroup = ((Player*)owner)->GetGroup();
 
-                    if( pGroup)
+                    if (pGroup)
                     {
                         uint8 subgroup = ((Player*)owner)->GetSubGroup();
-                        for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+                        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
                         {
                             Player* Target = itr->getSource();
-                            if(Target && Target->isAlive() && Target->GetSubGroup()==subgroup && caster->IsFriendlyTo(Target))
+                            if (Target && Target->IsInWorld() && Target->isAlive() && caster->IsInWorld() && Target->GetSubGroup() == subgroup && caster->IsFriendlyTo(Target))
                             {
-                                if(caster->IsWithinDistInMap(Target, m_radius))
-                                    targets.push_back(Target);
-                                Pet *pet = Target->GetPet();
-                                if(pet && pet->isAlive() && caster->IsWithinDistInMap(pet, m_radius))
-                                    targets.push_back(pet);
+                                if (caster->IsWithinDistInMap(Target, m_radius))
+                                    targets.insert(Target->GetObjectGuid());
+
+                                GuidSet const& groupPets = Target->GetPets();
+                                if (!groupPets.empty())
+                                {
+                                    for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                                    {
+                                        if (Pet* pPet = Target->GetMap()->GetPet(*itr))
+                                        {
+                                            if (pPet->IsInWorld() && pPet->isAlive() && caster->IsWithinDistInMap(pPet, m_radius))
+                                                targets.insert(pPet->GetObjectGuid());
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
                     else
                     {
                         // add owner
-                        if( owner != caster && caster->IsWithinDistInMap(owner, m_radius) )
-                            targets.push_back(owner);
-                        // add caster's pet
-                        Unit* pet = caster->GetPet();
-                        if( pet && caster->IsWithinDistInMap(pet, m_radius))
-                            targets.push_back(pet);
+                        if (owner != caster && caster->IsWithinDistInMap(owner, m_radius))
+                            targets.insert(owner->GetObjectGuid());
+
+                        // add caster's pets
+                        GuidSet const& groupPets = caster->GetPets();
+                        if (!groupPets.empty())
+                        {
+                            for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                            {
+                                if (Pet* pPet = caster->GetMap()->GetPet(*itr))
+                                {
+                                    if (pPet->IsInWorld() && caster->IsWithinDistInMap(pPet, m_radius))
+                                        targets.insert(pPet->GetObjectGuid());
+                                }
+                            }
+                        }
                     }
                     break;
                 }
                 case AREA_AURA_RAID:
                 {
-                    Group *pGroup = NULL;
+                    Group* pGroup = NULL;
 
                     if (owner->GetTypeId() == TYPEID_PLAYER)
                         pGroup = ((Player*)owner)->GetGroup();
 
-                    if( pGroup)
+                    if (pGroup)
                     {
-                        for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+                        for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
                         {
                             Player* Target = itr->getSource();
-                            if(Target && Target->isAlive() && caster->IsFriendlyTo(Target))
+                            if (Target && Target->IsInWorld() && Target->isAlive() && caster->IsInWorld() && caster->IsFriendlyTo(Target))
                             {
-                                if(caster->IsWithinDistInMap(Target, m_radius))
-                                    targets.push_back(Target);
-                                Pet *pet = Target->GetPet();
-                                if(pet && pet->isAlive() && caster->IsWithinDistInMap(pet, m_radius))
-                                    targets.push_back(pet);
+                                if (caster->IsWithinDistInMap(Target, m_radius))
+                                    targets.insert(Target->GetObjectGuid());
+
+                                GuidSet const& groupPets = Target->GetPets();
+                                if (!groupPets.empty())
+                                {
+                                    for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                                    {
+                                        if (Pet* pPet = caster->GetMap()->GetPet(*itr))
+                                        {
+                                            if (pPet->IsInWorld() && caster->IsWithinDistInMap(pPet, m_radius))
+                                                targets.insert(pPet->GetObjectGuid());
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
                     else
                     {
                         // add owner
-                        if( owner != caster && caster->IsWithinDistInMap(owner, m_radius) )
-                            targets.push_back(owner);
-                        // add caster's pet
-                        Unit* pet = caster->GetPet();
-                        if( pet && caster->IsWithinDistInMap(pet, m_radius))
-                            targets.push_back(pet);
+                        if (owner != caster && caster->IsWithinDistInMap(owner, m_radius))
+                            targets.insert(owner->GetObjectGuid());
+
+                        // add caster's pets
+                        GuidSet const& groupPets = caster->GetPets();
+                        if (!groupPets.empty())
+                        {
+                            for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                            {
+                                if (Pet* pPet = caster->GetMap()->GetPet(*itr))
+                                {
+                                    if (pPet->IsInWorld() && caster->IsWithinDistInMap(pPet, m_radius))
+                                        targets.insert(pPet->GetObjectGuid());
+                                }
+                            }
+                        }
                     }
                     break;
                 }
                 case AREA_AURA_FRIEND:
                 {
                     MaNGOS::AnyFriendlyUnitInObjectRangeCheck u_check(caster, m_radius);
-                    MaNGOS::UnitListSearcher<MaNGOS::AnyFriendlyUnitInObjectRangeCheck> searcher(targets, u_check);
+                    MaNGOS::UnitListSearcher<MaNGOS::AnyFriendlyUnitInObjectRangeCheck> searcher(_targets, u_check);
                     Cell::VisitAllObjects(caster, searcher, m_radius);
                     break;
                 }
                 case AREA_AURA_ENEMY:
                 {
                     MaNGOS::AnyAoETargetUnitInObjectRangeCheck u_check(caster, m_radius); // No GetCharmer in searcher
-                    MaNGOS::UnitListSearcher<MaNGOS::AnyAoETargetUnitInObjectRangeCheck> searcher(targets, u_check);
+                    MaNGOS::UnitListSearcher<MaNGOS::AnyAoETargetUnitInObjectRangeCheck> searcher(_targets, u_check);
                     Cell::VisitAllObjects(caster, searcher, m_radius);
                     break;
                 }
                 case AREA_AURA_OWNER:
                 case AREA_AURA_PET:
                 {
-                    if(owner != caster && caster->IsWithinDistInMap(owner, m_radius))
-                        targets.push_back(owner);
+                    if (owner != caster && caster->IsInWorld() && caster->IsWithinDistInMap(owner, m_radius))
+                        targets.insert(owner->GetObjectGuid());
                     break;
                 }
+                default:
+                    break;
             }
 
-            for(Spell::UnitList::iterator tIter = targets.begin(); tIter != targets.end(); ++tIter)
+            if (!_targets.empty())
             {
-                // flag for seelction is need apply aura to current iteration target
-                bool apply = true;
+                for (Spell::UnitList::iterator itr = _targets.begin(); itr != _targets.end(); ++itr)
+                    if (*itr)
+                        targets.insert((*itr)->GetObjectGuid());
+            }
 
-                // we need ignore present caster self applied are auras sometime
-                // in cases if this only auras applied for spell effect
-                Unit::SpellAuraHolderBounds spair = (*tIter)->GetSpellAuraHolderBounds(GetId());
-                for(Unit::SpellAuraHolderMap::const_iterator i = spair.first; i != spair.second; ++i)
+            if (!targets.empty())
+            {
+                for (GuidSet::const_iterator tIter = targets.begin(); tIter != targets.end(); tIter++)
                 {
-                    if (i->second->IsDeleted())
+                    // flag for selection is need apply aura to current iteration target
+                    bool apply = true;
+
+                    // we need ignore present caster self applied are auras sometime
+                    // in cases if this only auras applied for spell effect
+                    Unit* i_target = caster->GetMap()->GetUnit(*tIter);
+                    if (!i_target)
                         continue;
 
-                    Aura *aur = i->second->GetAuraByEffectIndex(m_effIndex);
+                    if (i_target->GetTypeId() == TYPEID_PLAYER && ((Player*)i_target)->IsBeingTeleportedFar())
+                        continue;
 
-                    if (!aur)
+                    if (GetSpellProto()->HasAttribute(SPELL_ATTR_EX3_TARGET_ONLY_PLAYER) && i_target->GetTypeId() != TYPEID_PLAYER)
                         continue;
 
-                    switch(m_areaAuraType)
+                    if (i_target->IsImmuneToSpell(GetSpellProto(), GetAffectiveCaster() ? GetAffectiveCaster()->IsFriendlyTo(i_target) : true))
+                        continue;
+                    else
                     {
-                        case AREA_AURA_ENEMY:
-                            // non caster self-casted auras (non stacked)
-                            if(aur->GetModifier()->m_auraname != SPELL_AURA_NONE)
-                                apply = false;
-                            break;
-                        case AREA_AURA_RAID:
-                            // non caster self-casted auras (stacked from diff. casters)
-                            if(aur->GetModifier()->m_auraname != SPELL_AURA_NONE  || i->second->GetCasterGuid() == GetCasterGuid())
-                                apply = false;
-                            break;
-                        default:
-                            // in generic case not allow stacking area auras
-                            apply = false;
-                            break;
-                    }
-
-                    if(!apply)
-                        break;
-                }
+                        MAPLOCK_READ(i_target, MAP_LOCK_TYPE_AURAS);
+                        Unit::SpellAuraHolderBounds spair = i_target->GetSpellAuraHolderBounds(GetId());
+                        for (Unit::SpellAuraHolderMap::const_iterator i = spair.first; i != spair.second; ++i)
+                        {
+                            if (!i->second || i->second->IsDeleted())
+                                continue;
 
-                if(!apply)
-                    continue;
+                            Aura* aura = i->second->GetAuraByEffectIndex(m_effIndex);
 
-                if(SpellEntry const *actualSpellInfo = sSpellMgr.SelectAuraRankForLevel(GetSpellProto(), (*tIter)->getLevel()))
-                {
-                    int32 actualBasePoints = m_currentBasePoints;
-                    // recalculate basepoints for lower rank (all AreaAura spell not use custom basepoints?)
-                    if(actualSpellInfo != GetSpellProto())
-                        actualBasePoints = actualSpellInfo->CalculateSimpleValue(m_effIndex);
+                            if (!aura)
+                                continue;
 
-                    SpellAuraHolder *holder = (*tIter)->GetSpellAuraHolder(actualSpellInfo->Id, GetCasterGuid());
+                            switch(m_areaAuraType)
+                            {
+                                case AREA_AURA_ENEMY:
+                                    // non caster self-casted auras (non stacked)
+                                    if (aura->GetModifier()->m_auraname != SPELL_AURA_NONE)
+                                        apply = false;
+                                    break;
+                                case AREA_AURA_RAID:
+                                    // non caster self-casted auras (stacked from diff. casters)
+                                    if (aura->GetModifier()->m_auraname != SPELL_AURA_NONE  || i->second->GetCasterGuid() == GetAffectiveCasterGuid())
+                                        apply = false;
+                                    break;
+                                default:
+                                    // in generic case not allow stacking area auras
+                                    apply = false;
+                                    break;
+                            }
 
-                    bool addedToExisting = true;
-                    if (!holder)
-                    {
-                        holder = CreateSpellAuraHolder(actualSpellInfo, (*tIter), caster);
-                        addedToExisting = false;
+                            if(!apply)
+                                break;
+                        }
                     }
 
-                    holder->SetAuraDuration(GetAuraDuration());
-
-                    AreaAura *aur = new AreaAura(actualSpellInfo, m_effIndex, &actualBasePoints, holder, (*tIter), caster, NULL);
-                    holder->AddAura(aur, m_effIndex);
+                    if(!apply)
+                        continue;
 
-                    if (addedToExisting)
+                    if (SpellEntry const *actualSpellInfo = sSpellMgr.SelectAuraRankForLevel(GetSpellProto(), i_target->getLevel()))
                     {
-                        (*tIter)->AddAuraToModList(aur);
-                        holder->SetInUse(true);
-                        aur->ApplyModifier(true,true);
-                        holder->SetInUse(false);
+                        int32 actualBasePoints = m_currentBasePoints;
+                        // recalculate basepoints for lower rank (all AreaAura spell not use custom basepoints?)
+                        if (actualSpellInfo != GetSpellProto())
+                            actualBasePoints = actualSpellInfo->CalculateSimpleValue(m_effIndex);
+
+                        SpellAuraHolderPtr holder = i_target->GetSpellAuraHolder(actualSpellInfo->Id, GetAffectiveCasterGuid());
+
+                        if (!holder || holder->IsDeleted())
+                        {
+                            SpellAuraHolderPtr newholder = CreateSpellAuraHolder(actualSpellInfo, i_target,  GetAffectiveCaster());
+                            newholder->SetAuraDuration(GetAuraDuration());
+                            /*Aura* aura = */newholder->CreateAura(AURA_CLASS_AREA_AURA, m_effIndex, &actualBasePoints, newholder, i_target, GetAffectiveCaster(), NULL);
+                            i_target->AddSpellAuraHolder(newholder);
+                        }
+                        else
+                        {
+                            holder->SetAuraDuration(GetAuraDuration());
+                            Aura* aura = holder->GetAuraByEffectIndex(m_effIndex);
+                            if (aura)
+                            {
+                                aura->ApplyModifier(false,true);
+                                aura->GetModifier()->m_amount = actualBasePoints;
+                                aura->ApplyModifier(true,true);
+                            }
+                            else
+                            {
+                                Aura* aura = holder->CreateAura(AURA_CLASS_AREA_AURA, m_effIndex, &actualBasePoints, holder, i_target, GetAffectiveCaster(), NULL);
+                                i_target->AddAuraToModList(aura);
+                                aura->ApplyModifier(true,true);
+                            }
+                        }
                     }
-                    else
-                        (*tIter)->AddSpellAuraHolder(holder);
                 }
             }
         }
-        Aura::Update(diff);
+        Update(diff);
     }
     else                                                    // aura at non-caster
     {
+        Unit* realcaster = GetAffectiveCaster();
         Unit* caster = GetCaster();
         Unit* target = GetTarget();
 
-        Aura::Update(diff);
+        Update(diff);
 
         // remove aura if out-of-range from caster (after teleport for example)
         // or caster is isolated or caster no longer has the aura
         // or caster is (no longer) friendly
         bool needFriendly = (m_areaAuraType == AREA_AURA_ENEMY ? false : true);
-        if( !caster || caster->hasUnitState(UNIT_STAT_ISOLATED) ||
+        if ( !caster || caster->hasUnitState(UNIT_STAT_ISOLATED) ||
+            !realcaster->IsInMap(target)      ||
             !caster->IsWithinDistInMap(target, m_radius)        ||
             !caster->HasAura(GetId(), GetEffIndex())            ||
             caster->IsFriendlyTo(target) != needFriendly
            )
         {
-            target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid());
+            target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetAffectiveCasterGuid());
         }
-        else if( m_areaAuraType == AREA_AURA_PARTY)         // check if in same sub group
+        else if ( m_areaAuraType == AREA_AURA_PARTY)         // check if in same sub group
         {
             // not check group if target == owner or target == pet
-            if (caster->GetCharmerOrOwnerGuid() != target->GetObjectGuid() && caster->GetObjectGuid() != target->GetCharmerOrOwnerGuid())
+            if (realcaster->GetCharmerOrOwnerGuid() != target->GetObjectGuid() && realcaster->GetObjectGuid() != target->GetCharmerOrOwnerGuid())
             {
-                Player* check = caster->GetCharmerOrOwnerPlayerOrPlayerItself();
+                Player* check = realcaster->GetCharmerOrOwnerPlayerOrPlayerItself();
 
                 Group *pGroup = check ? check->GetGroup() : NULL;
-                if( pGroup )
+                if ( pGroup )
                 {
                     Player* checkTarget = target->GetCharmerOrOwnerPlayerOrPlayerItself();
                     if(!checkTarget || !pGroup->SameSubGroup(check, checkTarget))
-                        target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid());
+                        target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetAffectiveCasterGuid());
                 }
                 else
-                    target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid());
+                    target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetAffectiveCasterGuid());
             }
         }
-        else if( m_areaAuraType == AREA_AURA_RAID)          // TODO: fix me!
+        else if ( m_areaAuraType == AREA_AURA_RAID)          // TODO: fix me!
         {
             // not check group if target == owner or target == pet
-            if (caster->GetCharmerOrOwnerGuid() != target->GetObjectGuid() && caster->GetObjectGuid() != target->GetCharmerOrOwnerGuid())
+            if (realcaster->GetCharmerOrOwnerGuid() != target->GetObjectGuid() && realcaster->GetObjectGuid() != target->GetCharmerOrOwnerGuid())
             {
-                Player* check = caster->GetCharmerOrOwnerPlayerOrPlayerItself();
+                Player* check = realcaster->GetCharmerOrOwnerPlayerOrPlayerItself();
 
                 Group *pGroup = check ? check->GetGroup() : NULL;
-                if( pGroup )
+                if ( pGroup )
                 {
                     Player* checkTarget = target->GetCharmerOrOwnerPlayerOrPlayerItself();
                     if(!checkTarget)
-                        target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid());
+                        target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetAffectiveCasterGuid());
                 }
                 else
                     target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid());
@@ -806,38 +973,30 @@ void AreaAura::Update(uint32 diff)
         }
         else if (m_areaAuraType == AREA_AURA_PET || m_areaAuraType == AREA_AURA_OWNER)
         {
-            if (target->GetObjectGuid() != caster->GetCharmerOrOwnerGuid())
-                target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid());
+            if (target->GetObjectGuid() != realcaster->GetCharmerOrOwnerGuid())
+                target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetAffectiveCasterGuid());
         }
     }
 }
 
-void PersistentAreaAura::Update(uint32 diff)
+void Aura::PersistentAreaAuraUpdate(uint32 diff)
 {
     bool remove = false;
 
     // remove the aura if its caster or the dynamic object causing it was removed
     // or if the target moves too far from the dynamic object
-    if(Unit *caster = GetCaster())
+    if (Unit* pCaster = GetCaster())
     {
-        DynamicObject *dynObj = caster->GetDynObject(GetId(), GetEffIndex());
-        if (dynObj)
-        {
-            if (!GetTarget()->IsWithinDistInMap(dynObj, dynObj->GetRadius()))
-            {
-                remove = true;
-                dynObj->RemoveAffected(GetTarget());        // let later reapply if target return to range
-            }
-        }
-        else
+        DynamicObject* dynObj = pCaster->GetEffectiveDynObject(GetId(), GetEffIndex(), GetTarget());
+        if (!dynObj)
             remove = true;
     }
     else
         remove = true;
 
-    Aura::Update(diff);
+    Update(diff);
 
-    if(remove)
+    if (remove)
         GetTarget()->RemoveAura(GetId(), GetEffIndex());
 }
 
@@ -845,14 +1004,15 @@ void Aura::ApplyModifier(bool apply, bool Real)
 {
     AuraType aura = m_modifier.m_auraname;
 
-    GetHolder()->SetInUse(true);
-    SetInUse(true);
-    if(aura < TOTAL_AURAS)
-        (*this.*AuraHandler [aura])(apply, Real);
-    SetInUse(false);
-    GetHolder()->SetInUse(false);
+    MANGOS_ASSERT(aura < TOTAL_AURAS);
+
+    (*this.*AuraHandler [aura])(apply, Real);
+
+    m_isActive = apply;
 }
 
+ClassFamilyMask const& Aura::GetAuraSpellClassMask() const { return  GetHolder() ? GetHolder()->GetSpellProto()->GetEffectSpellClassMask(m_effIndex) : ClassFamilyMask::Null; }
+
 bool Aura::isAffectedOnSpell(SpellEntry const *spell) const
 {
     return spell->IsFitToFamily(SpellFamily(GetSpellProto()->SpellFamilyName), GetAuraSpellClassMask());
@@ -889,12 +1049,14 @@ bool Aura::CanProcFrom(SpellEntry const *spell, uint32 procFlag, uint32 EventPro
                 else
                     return false;
             }
-            else // Passive spells hits here only if resist/reflect/immune/evade
-            {
-                // Passive spells can`t trigger if need hit (exclude cases when procExtra include non-active flags)
-                if ((EventProcEx & (PROC_EX_NORMAL_HIT|PROC_EX_CRITICAL_HIT) & procEx) && !active)
+            // Passive spells hits here only if resist/reflect/immune/evade
+            // Passive spells can`t trigger if need hit (exclude cases when procExtra include non-active flags)
+            else if ((EventProcEx & (PROC_EX_NORMAL_HIT|PROC_EX_CRITICAL_HIT) & procEx) && !active)
                     return false;
-            }
+            // Custom procs with aura apply/fade (must fit in aura mask, if exists, independent from SchoolMask)
+            else if ((procFlag & PROC_FLAG_ON_AURA_APPLY) || (procFlag & PROC_FLAG_ON_AURA_FADE))
+                    if (mask && !isAffectedOnSpell(spell))
+                        return false;
         }
         return true;
     }
@@ -902,33 +1064,43 @@ bool Aura::CanProcFrom(SpellEntry const *spell, uint32 procFlag, uint32 EventPro
     {
         // SpellFamilyName check is performed in SpellMgr::IsSpellProcEventCanTriggeredBy and it is done once for whole holder
         // note: SpellFamilyName is not checked if no spell_proc_event is defined
-        return mask.IsFitToFamilyMask(spell->SpellFamilyFlags);
+        return mask.IsFitToFamilyMask(spell->GetSpellFamilyFlags());
     }
 }
 
 void Aura::ReapplyAffectedPassiveAuras( Unit* target, bool owner_mode )
 {
+    if (!target)
+        return;
+
     // we need store cast item guids for self casted spells
     // expected that not exist permanent auras from stackable auras from different items
     std::map<uint32, ObjectGuid> affectedSelf;
 
-    std::set<uint32> affectedAuraCaster;
+    Unit::SpellIdSet affectedAuraCaster;
 
-    for(Unit::SpellAuraHolderMap::const_iterator itr = target->GetSpellAuraHolderMap().begin(); itr != target->GetSpellAuraHolderMap().end(); ++itr)
     {
-        // permanent passive or permanent area aura
-        // passive spells can be affected only by own or owner spell mods)
-        if ((itr->second->IsPermanent() && (owner_mode && itr->second->IsPassive() || itr->second->IsAreaAura())) &&
-            // non deleted and not same aura (any with same spell id)
-            !itr->second->IsDeleted() && itr->second->GetId() != GetId() &&
-            // and affected by aura
-            isAffectedOnSpell(itr->second->GetSpellProto()))
+        MAPLOCK_READ(target,MAP_LOCK_TYPE_AURAS);
+        Unit::SpellAuraHolderMap const& holderMap = target->GetSpellAuraHolderMap();
+        for (Unit::SpellAuraHolderMap::const_iterator itr = holderMap.begin(); itr != holderMap.end(); ++itr)
         {
-            // only applied by self or aura caster
-            if (itr->second->GetCasterGuid() == target->GetObjectGuid())
-                affectedSelf[itr->second->GetId()] = itr->second->GetCastItemGuid();
-            else if (itr->second->GetCasterGuid() == GetCasterGuid())
-                affectedAuraCaster.insert(itr->second->GetId());
+            if (!itr->second || itr->second->IsDeleted())
+                continue;
+
+            // permanent passive or permanent area aura
+            // passive spells can be affected only by own or owner spell mods)
+            if ((itr->second->IsPermanent() && ((owner_mode && itr->second->IsPassive()) || itr->second->IsAreaAura())) &&
+                // non deleted and not same aura (any with same spell id)
+                itr->second->GetId() != GetId() &&
+                // and affected by aura
+                isAffectedOnSpell(itr->second->GetSpellProto()))
+            {
+                // only applied by self or aura caster
+                if (itr->second->GetCasterGuid() == target->GetObjectGuid())
+                    affectedSelf[itr->second->GetId()] = itr->second->GetCastItemGuid();
+                else if (itr->second->GetCasterGuid() == GetCasterGuid())
+                    affectedAuraCaster.insert(itr->second->GetId());
+            }
         }
     }
 
@@ -947,7 +1119,7 @@ void Aura::ReapplyAffectedPassiveAuras( Unit* target, bool owner_mode )
     if (!affectedAuraCaster.empty())
     {
         Unit* caster = GetCaster();
-        for(std::set<uint32>::const_iterator set_itr = affectedAuraCaster.begin(); set_itr != affectedAuraCaster.end(); ++set_itr)
+        for(Unit::SpellIdSet::const_iterator set_itr = affectedAuraCaster.begin(); set_itr != affectedAuraCaster.end(); ++set_itr)
         {
             target->RemoveAurasDueToSpell(*set_itr);
             if (caster)
@@ -997,15 +1169,114 @@ void Aura::ReapplyAffectedPassiveAuras()
                     ReapplyAffectedPassiveAuras(member, false);
 }
 
+bool Aura::IsEffectStacking()
+{
+    SpellEntry const *spellProto = GetSpellProto();
+
+    // generic check
+    if (spellProto->GetAttributesEx6() & (SPELL_ATTR_EX6_NO_STACK_DEBUFF_MAJOR | SPELL_ATTR_EX6_NO_STACK_BUFF))
+    {
+        // Mark/Gift of the Wild early exception check
+        if (spellProto->IsFitToFamily<SPELLFAMILY_DRUID, CF_DRUID_MARK_OF_THE_WILD>())
+        {
+            // only mod resistance exclusive isn't stacking
+            return (GetModifier()->m_auraname != SPELL_AURA_MOD_RESISTANCE_EXCLUSIVE);
+        }
+        else
+            return false;
+    }
+
+    // scrolls don't stack
+    if (GetSpellSpecific(spellProto->Id) == SPELL_SCROLL)
+        return false;
+
+    // some hardcoded checks are needed (given attrEx6 not present)
+    switch(GetModifier()->m_auraname)
+    {
+        // these effects never stack
+        case SPELL_AURA_MOD_MELEE_HASTE:
+            if (spellProto->SpellFamilyName == SPELLFAMILY_GENERIC)
+                return true;
+            // Icy Talons
+            if (spellProto->IsFitToFamily<SPELLFAMILY_DEATHKNIGHT, CF_DEATHKNIGHT_ICY_TOUCH_TALONS>())
+                return true;
+
+            break;
+        case SPELL_AURA_MOD_RESISTANCE_EXCLUSIVE:
+        case SPELL_AURA_MOD_PARTY_MAX_HEALTH:                                                  // Commanding Shout / Blood Pact
+        case SPELL_AURA_MOD_HEALING_PCT:                                                       // Mortal Strike / Wound Poison / Aimed Shot / Furious Attacks
+        case SPELL_AURA_MOD_STAT:                                                              // various stat buffs
+            return (spellProto->SpellFamilyName == SPELLFAMILY_GENERIC);
+        case SPELL_AURA_MOD_CASTING_SPEED_NOT_STACK:                                           // Wrath of Air Totem / Mind-Numbing Poison and many more
+            return (spellProto->CalculateSimpleValue(m_effIndex) > 0);
+        case SPELL_AURA_MOD_DAMAGE_PERCENT_DONE:                                               // Ferocious Inspiration / Sanctified Retribution
+        case SPELL_AURA_MOD_ATTACKER_SPELL_AND_WEAPON_CRIT_CHANCE:                             // Heart of the Crusader / Totem of Wrath
+            if (spellProto->IsFitToFamily<SPELLFAMILY_PALADIN, CF_PALADIN_RETRIBUTION_AURA, CF_PALADIN_HEART_OF_THE_CRUSADER>()) // Sanctified Retribution / HoC
+            {
+                return false;
+            }
+            break;
+        case SPELL_AURA_MOD_RESISTANCE_PCT:                                                    // Sunder Armor / Sting
+        case SPELL_AURA_HASTE_SPELLS:                                                          // Mind-Numbing Poison
+        case SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN:                                              // Ebon Plague (spell not implemented) / Earth and Moon
+            if (spellProto->IsFitToFamily<SPELLFAMILY_WARRIOR, CF_WARRIOR_SUNDER_ARMOR>() ||   // Sunder Armor (only spell triggering this aura has the flag)
+                spellProto->IsFitToFamily<SPELLFAMILY_HUNTER,  CF_HUNTER_PET_SPELLS>() ||      // Sting (Hunter Pet)
+                (spellProto->SpellFamilyName == SPELLFAMILY_DRUID && spellProto->GetSpellIconID() == 2991) || // Earth and Moon
+                spellProto->IsFitToFamily<SPELLFAMILY_ROGUE,  CF_ROGUE_MIND_NUMBING_POISON>() ||  // Mind-Numbing Poison
+                spellProto->IsFitToFamily<SPELLFAMILY_PRIEST, CF_PRIEST_MISC_TALENTS>())       // Inspiration
+            {
+                return false;
+            }
+            break;
+        case SPELL_AURA_MOD_CRIT_PERCENT:                                                      // Rampage
+            if (spellProto->SpellFamilyName == SPELLFAMILY_WARRIOR && spellProto->GetSpellIconID() == 2006)
+                return false;
+            break;
+        case SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE:                                        // Winter's Chill / Improved Scorch
+            if (spellProto->SpellFamilyName == SPELLFAMILY_MAGE)
+                return false;
+            break;
+        case SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT:                                     // Mangle / Trauma
+            if (spellProto->IsFitToFamily<SPELLFAMILY_DRUID, CF_DRUID_MANGLE_BEAR, CF_DRUID_MANGLE_CAT>() ||   // Mangle
+                spellProto->Id == 46856 || spellProto->Id == 46857)                            // Trauma has SPELLFAMILY_GENERIC and no flags
+            {
+                return false;
+            }
+            break;
+        case SPELL_AURA_MOD_ATTACKER_SPELL_HIT_CHANCE:                  // Misery / Imp. Faerie Fire (must find triggered aura / spell not implemented?)
+            if (spellProto->SpellFamilyName == SPELLFAMILY_PRIEST &&
+                spellProto->GetSpellIconID() == 2211)                        // Misery
+            {
+                return false;
+            }
+            break;
+        case SPELL_AURA_CONTROL_VEHICLE:
+            return true;
+
+        default:
+            break;
+    }
+
+    // almost all area aura raid auras don't stack (exceptions are handled above)
+
+    // Flametongue Totem / Totem of Wrath / Strength of Earth Totem / Fel Intelligence / Leader of the Pack
+    // Moonkin Aura / Mana Spring Totem / Tree of Life Aura / Improved Devotion Aura / Improved Icy Talons / Trueshot Aura
+    // Improved Moonkin Form / Sanctified Retribution Aura / Blood Pact
+    if (spellProto->Effect[m_effIndex] == SPELL_EFFECT_APPLY_AREA_AURA_RAID)
+        return false;
+
+    return true;
+}
+
 /*********************************************************/
 /***               BASIC AURA FUNCTION                 ***/
 /*********************************************************/
 void Aura::HandleAddModifier(bool apply, bool Real)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER || !Real)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER || !Real)
         return;
 
-    if(m_modifier.m_miscvalue >= MAX_SPELLMOD)
+    if (m_modifier.m_miscvalue >= MAX_SPELLMOD)
         return;
 
     if (apply)
@@ -1028,23 +1299,8 @@ void Aura::HandleAddModifier(bool apply, bool Real)
             case 64823:                                     // Elune's Wrath (Balance druid t8 set
                 GetHolder()->SetAuraCharges(1);
                 break;
-        }
-
-        // Everlasting Affliction, overwrite wrong data, if will need more better restore support of spell_affect table
-        if (spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && spellProto->SpellIconID == 3169)
-        {
-            // Corruption and Unstable Affliction
-            // TODO: drop when override will be possible
-            SpellEntry *entry = const_cast<SpellEntry*>(spellProto);
-            entry->EffectSpellClassMask[GetEffIndex()].Flags = UI64LIT(0x0000010000000002);
-        }
-        // Improved Flametongue Weapon, overwrite wrong data, maybe time re-add table
-        else if (spellProto->Id == 37212)
-        {
-            // Flametongue Weapon (Passive)
-            // TODO: drop when override will be possible
-            SpellEntry *entry = const_cast<SpellEntry*>(spellProto);
-            entry->EffectSpellClassMask[GetEffIndex()].Flags = UI64LIT(0x0000000000200000);
+            default:
+                break;
         }
     }
 
@@ -1074,6 +1330,20 @@ void Aura::TriggerSpell()
     // specific code for cases with no trigger spell provided in field
     if (triggeredSpellInfo == NULL)
     {
+        // Server side spells
+        switch (trigger_spell_id)
+        {
+            // Ice Tomb (Sindragosa)
+            case 70159:
+            {
+                if (triggerTarget->HasAura(70157))
+                    return;
+                trigger_spell_id = 70157;
+            }
+            default:
+                break;
+        }
+
         switch(auraSpellInfo->SpellFamilyName)
         {
             case SPELLFAMILY_GENERIC:
@@ -1105,7 +1375,9 @@ void Aura::TriggerSpell()
 //                    // Ranshalla Waiting
 //                    case 18953: break;
 //                    // Inferno
-//                    case 19695: break;
+                    case 19695:
+                        trigger_spell_id = 19698;
+                        break;
 //                    // Frostwolf Muzzle DND
 //                    case 21794: break;
 //                    // Alterac Ram Collar DND
@@ -1220,18 +1492,17 @@ void Aura::TriggerSpell()
                     case 24834:                             // Shadow Bolt Whirl
                     {
                         uint32 spellForTick[8] = { 24820, 24821, 24822, 24823, 24835, 24836, 24837, 24838 };
-                        uint32 tick = GetAuraTicks();
-                        if(tick < 8)
-                        {
-                            trigger_spell_id = spellForTick[tick];
-
-                            // casted in left/right (but triggered spell have wide forward cone)
-                            float forward = target->GetOrientation();
-                            float angle = target->GetOrientation() + ( tick % 2 == 0 ? M_PI_F / 2 : - M_PI_F / 2);
-                            target->SetOrientation(angle);
-                            triggerTarget->CastSpell(triggerTarget, trigger_spell_id, true, NULL, this, casterGUID);
-                            target->SetOrientation(forward);
-                        }
+                        uint32 tick = (GetAuraTicks() + 7/*-1*/) % 8;
+
+                        // casted in left/right (but triggered spell have wide forward cone)
+                        float forward = target->GetOrientation();
+                        if (tick <= 3)
+                            target->SetOrientation(forward + 0.75f * M_PI_F - tick * M_PI_F / 8);       // Left
+                        else
+                            target->SetOrientation(forward - 0.75f * M_PI_F + (8 - tick) * M_PI_F / 8); // Right
+
+                        triggerTarget->CastSpell(triggerTarget, spellForTick[tick], true, NULL, this, casterGUID);
+                        target->SetOrientation(forward);
                         return;
                     }
 //                    // Stink Trap
@@ -1246,10 +1517,23 @@ void Aura::TriggerSpell()
                     }
 //                    // Pain Spike
 //                    case 25572: break;
-//                    // Rotate 360
-//                    case 26009: break;
-//                    // Rotate -360
-//                    case 26136: break;
+                    case 26009:                             // Rotate 360
+                    case 26136:                             // Rotate -360
+                    {
+                        float newAngle = target->GetOrientation();
+
+                        if (auraId == 26009)
+                            newAngle += M_PI_F/40;
+                        else
+                            newAngle -= M_PI_F/40;
+
+                        newAngle = MapManager::NormalizeOrientation(newAngle);
+
+                        target->SetFacingTo(newAngle);
+
+                        target->CastSpell(target, 26029, true);
+                        return;
+                    }
 //                    // Consume
 //                    case 26196: break;
 //                    // Berserk
@@ -1325,8 +1609,11 @@ void Aura::TriggerSpell()
 //                    case 28114: break;
 //                    // Communique Timer, camp
 //                    case 28346: break;
-//                    // Icebolt
-//                    case 28522: break;
+                    case 28522:                             // Icebolt (Sapphiron - Naxxramas)
+                        // dunno if triggered spell id is correct
+                        if (!target->HasAura(45776))
+                            trigger_spell_id = 45776;
+                        break;
 //                    // Silithyst
 //                    case 29519: break;
                     case 29528:                             // Inoculate Nestlewood Owlkin
@@ -1361,17 +1648,17 @@ void Aura::TriggerSpell()
                         if (!caster)
                             return;
                         // move loot to player inventory and despawn target
-                        if (caster->GetTypeId() ==TYPEID_PLAYER &&
-                           triggerTarget->GetTypeId() == TYPEID_UNIT &&
-                           ((Creature*)triggerTarget)->GetCreatureInfo()->type == CREATURE_TYPE_GAS_CLOUD)
+                        if (caster->GetTypeId() == TYPEID_PLAYER &&
+                                triggerTarget->GetTypeId() == TYPEID_UNIT &&
+                                ((Creature*)triggerTarget)->GetCreatureInfo()->CreatureType == CREATURE_TYPE_GAS_CLOUD)
                         {
                             Player* player = (Player*)caster;
                             Creature* creature = (Creature*)triggerTarget;
                             // missing lootid has been reported on startup - just return
-                            if (!creature->GetCreatureInfo()->SkinLootId)
+                            if (!creature->GetCreatureInfo()->SkinningLootId)
                                 return;
 
-                            player->AutoStoreLoot(creature->GetCreatureInfo()->SkinLootId, LootTemplates_Skinning, true);
+                            player->AutoStoreLoot(creature, creature->GetCreatureInfo()->SkinningLootId, LootTemplates_Skinning, true);
 
                             creature->ForcedDespawn();
                         }
@@ -1396,7 +1683,7 @@ void Aura::TriggerSpell()
                     case 31347:                             // Doom
                     {
                         target->CastSpell(target,31350,true);
-                        target->DealDamage(target, target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                        target->KillSelf();
                         return;
                     }
                     case 31373:                             // Spellcloth
@@ -1478,8 +1765,17 @@ void Aura::TriggerSpell()
 //                    case 36556: break;
 //                    // Cursed Scarab Despawn Periodic
 //                    case 36561: break;
-//                    // Vision Guide
-//                    case 36573: break;
+                    case 36573:                             // Vision Guide
+                    {
+                    // FIXME - this must be maked over 37715 reconstruction (spell_dbc)
+                        if (GetAuraTicks() == 10 && target->GetTypeId() == TYPEID_PLAYER)
+                        {
+                            ((Player*)target)->AreaExploredOrEventHappens(10525);
+                            target->RemoveAurasDueToSpell(36573);
+                        }
+
+                        return;
+                    }
 //                    // Cannon Charging (platform)
 //                    case 36785: break;
 //                    // Cannon Charging (self)
@@ -1491,10 +1787,23 @@ void Aura::TriggerSpell()
 //                    case 37125: break;
 //                    // Arcane Flurry
 //                    case 37268: break;
-//                    // Spout
-//                    case 37429: break;
-//                    // Spout
-//                    case 37430: break;
+                    case 37429:                             // Spout (left)
+                    case 37430:                             // Spout (right)
+                    {
+                        float newAngle = target->GetOrientation();
+
+                        if (auraId == 37429)
+                            newAngle += 2*M_PI_F/100;
+                        else
+                            newAngle -= 2*M_PI_F/100;
+
+                        newAngle = MapManager::NormalizeOrientation(newAngle);
+
+                        target->SetFacingTo(newAngle);
+
+                        target->CastSpell(target, 37433, true);
+                        return;
+                    }
 //                    // Karazhan - Chess NPC AI, Snapshot timer
 //                    case 37440: break;
 //                    // Karazhan - Chess NPC AI, action timer
@@ -1608,6 +1917,16 @@ void Aura::TriggerSpell()
 //                    case 46981: break;
 //                    // Dragonblight Ram
 //                    case 47015: break;
+                    case 51121:                             // Time Bomb
+                    case 59376:
+                    {
+                        if (target)
+                        {
+                            int32 healthMissing = target->GetMaxHealth() - target->GetHealth();
+                            target->CastCustomSpell(target, 51132, &healthMissing, NULL, NULL, true);
+                        }
+                        return;
+                    }
 //                    // Party G.R.E.N.A.D.E.
 //                    case 51510: break;
 //                    // Horseman Abilities
@@ -1673,8 +1992,9 @@ void Aura::TriggerSpell()
 //                    // Shield Level 3
 //                    case 63132: break;
 //                    // Food
-//                    case 64345: break;
-//                    // Remove Player from Phase
+                    case 64345:                             // Remove Player from Phase
+                        target->RemoveSpellsCausingAura(SPELL_AURA_PHASE);
+                        return;
 //                    case 64445: break;
 //                    // Food
 //                    case 65418: break;
@@ -1688,14 +2008,49 @@ void Aura::TriggerSpell()
 //                    case 65422: break;
 //                    // Rolling Throw
 //                    case 67546: break;
-//                    // Gunship Cannon Fire
-//                    case 70017: break;
-//                    // Ice Tomb
-//                    case 70157: break;
-//                    // Mana Barrier
-//                    case 70842: break;
-//                    // Summon Timer: Suppresser
-//                    case 70912: break;
+                    case 69012:                             // Explosive Barrage - Krick and Ick
+                    {
+                       // Summon an Exploding Orb for each player in combat with the caster
+                        ThreatList const& threatList = target->getThreatManager().getThreatList();
+                        for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+                        {
+                            if (Unit* expectedTarget = target->GetMap()->GetUnit((*itr)->getUnitGuid()))
+                            {
+                                if (expectedTarget->GetTypeId() == TYPEID_PLAYER)
+                                    target->CastSpell(expectedTarget, 69015, true);
+                            }
+                        }
+                        return;
+                    }
+                    case 70017:                             // Gunship Cannon Fire
+                        trigger_spell_id = 70021;
+                        break;
+                    // Ice Tomb
+                    case 70157:
+                        if (uint32(time(NULL) - GetAuraApplyTime()) >= 20 && !triggerTarget->HasAura(71665))
+                            triggerTarget->CastSpell(triggerTarget, 71665, true);
+                        return;
+                    case 70842:                             // Mana Barrier
+                    {
+                        if (!triggerTarget || triggerTarget->GetPowerType() != POWER_MANA)
+                            return;
+
+                        int32 damage = triggerTarget->GetHealth() - triggerTarget->GetMaxHealth();
+                        if (damage >= 0)
+                            return;
+
+                        if (int32(triggerTarget->GetPower(POWER_MANA)) < abs(damage))
+                        {
+                            damage = -int32(triggerTarget->GetPower(POWER_MANA));
+                            triggerTarget->RemoveAurasDueToSpell(auraId);
+                        }
+
+                        triggerTarget->DealHeal(triggerTarget, -damage, auraSpellInfo);
+                        triggerTarget->ModifyPower(POWER_MANA, damage);
+                        break;
+                    }
+//                    // Summon Timer: Suppresser
+//                    case 70912: break;
 //                    // Aura of Darkness
 //                    case 71110: break;
 //                    // Aura of Darkness
@@ -1864,7 +2219,7 @@ void Aura::TriggerSpell()
                         {
                             SpellEntry const* spell = itr->second->GetSpellProto();
                             if (spell->SpellFamilyName == SPELLFAMILY_SHAMAN &&
-                                (spell->SpellFamilyFlags & UI64LIT(0x0000000000000400)))
+                                spell->GetSpellFamilyFlags().test<CF_SHAMAN_LIGHTNING_SHIELD>())
                                 return;
                         }
                         triggerTarget->RemoveAurasDueToSpell(28820);
@@ -1969,30 +2324,81 @@ void Aura::TriggerSpell()
 
                 break;
             }
+            // Earthen Power (from Earthbind Totem Passive)
+            case 6474:
+            {
+                Unit *owner = target->GetOwner();
+
+                if (!owner)
+                    break;
+
+                Unit::AuraList const& dummyAuras = owner->GetAurasByType(SPELL_AURA_DUMMY);
+                for(Unit::AuraList::const_iterator itr = dummyAuras.begin(); itr != dummyAuras.end(); ++itr)
+                {
+                    if ((*itr)->GetSpellProto()->GetSpellIconID() == 2289 && (*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_SHAMAN)
+                    {
+                        if (!roll_chance_i((*itr)->GetModifier()->m_amount))
+                            break;
+
+                        target->CastSpell(target, 59566, true, NULL, this);
+                        break;
+                    }
+                 }
+                break;
+            }
             case 16191:                                     // Mana Tide
             {
                 triggerTarget->CastCustomSpell(triggerTarget, trigger_spell_id, &m_modifier.m_amount, NULL, NULL, true, NULL, this);
                 return;
             }
+            case 28084:                                     // Negative Charge
+            {
+                if (triggerTarget->HasAura(29660))
+                    triggerTarget->RemoveAurasDueToSpell(29660);
+                break;
+            }
+            case 28059:                                     // Positive Charge
+            {
+                if (triggerTarget->HasAura(29659))
+                    triggerTarget->RemoveAurasDueToSpell(29659);
+                break;
+            }
             case 33525:                                     // Ground Slam
                 triggerTarget->CastSpell(triggerTarget, trigger_spell_id, true, NULL, this, casterGUID);
                 return;
+            case 38280:                                     // Static Charge (Lady Vashj in Serpentshrine Cavern)
+            case 53563:                                     // Beacon of Light
+                // original caster must be target
+                target->CastSpell(target, trigger_spell_id, true, NULL, this, target->GetObjectGuid());
+                return;
             case 38736:                                     // Rod of Purification - for quest 10839 (Veil Skith: Darkstone of Terokk)
             {
                 if (Unit* caster = GetCaster())
                     caster->CastSpell(triggerTarget, trigger_spell_id, true, NULL, this);
                 return;
             }
+            case 43149:                                     // Claw Rage
+            {
+                // Need to provide explicit target for trigger spell target combination
+                target->CastSpell(target->getVictim(), trigger_spell_id, true, NULL, this);
+                return;
+            }
             case 44883:                                     // Encapsulate
+            case 56505:                                     // Surge of Power
             {
                 // Self cast spell, hence overwrite caster (only channeled spell where the triggered spell deals dmg to SELF)
                 triggerCaster = triggerTarget;
                 break;
             }
-            case 53563:                                     // Beacon of Light
-                // original caster must be target (beacon)
-                target->CastSpell(target, trigger_spell_id, true, NULL, this, target->GetObjectGuid());
+            case 48094:                                      // Intense Cold
+                triggerTarget->CastSpell(triggerTarget, trigger_spell_id, true, NULL, this);
                 return;
+            case 58678:                                     // Rock Shards (Vault of Archavon, Archavon)
+            {
+                if (GetAuraTicks() != 1 && GetAuraTicks()%7)
+                    return;
+                break;
+            }
             case 56654:                                     // Rapid Recuperation (triggered energize have baspioints == 0)
             case 58882:
             {
@@ -2000,6 +2406,15 @@ void Aura::TriggerSpell()
                 triggerTarget->CastCustomSpell(triggerTarget, trigger_spell_id, &mana, NULL, NULL, true, NULL, this);
                 return;
             }
+            case 71340:                                     // Pact of the Darkfallen (Lana'thel)
+            {
+                // growing damage, every tenth tick is 1k higher
+                int32 multiplier = GetModifier()->m_miscvalue += 1;
+                int32 bp0 = triggerTarget->GetMap()->GetDifficulty() >= RAID_DIFFICULTY_10MAN_HEROIC ? 4600 : 1610;
+                bp0 = int32(bp0 + (floor(multiplier / 10.0f)) * 1000);
+                triggerTarget->CastCustomSpell(triggerTarget, 71341, &bp0, 0, 0, true);
+                break;
+            }
         }
     }
 
@@ -2016,8 +2431,13 @@ void Aura::TriggerSpell()
     {
         if (Unit* caster = GetCaster())
         {
-            if (triggerTarget->GetTypeId() != TYPEID_UNIT || !sScriptMgr.OnEffectDummy(caster, GetId(), GetEffIndex(), (Creature*)triggerTarget))
-                sLog.outError("Aura::TriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?",GetId(),GetEffIndex());
+            if (triggerTarget->GetTypeId() != TYPEID_UNIT || !sScriptMgr.OnEffectDummy(caster, GetId(), GetEffIndex(), (Creature*)triggerTarget, ObjectGuid()))
+            {
+                if (!trigger_spell_id)
+                    sLog.outError("Aura::TriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?", GetId(), GetEffIndex());
+                else
+                    sLog.outError("Aura::TriggerSpell: Spell %u have server side %u in EffectTriggered[%d], but %u not defined.", GetId(), trigger_spell_id, GetEffIndex(), trigger_spell_id);
+            }
         }
     }
 }
@@ -2136,6 +2556,11 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                         target->RemoveAurasDueToSpell(32346);
                         return;
                     }
+                    case 36587:                             // Vision Guide
+                    {
+                        target->CastSpell(target, 36573, true, NULL, this);
+                        return;
+                    }
                     // Gender spells
                     case 38224:                             // Illidari Agent Illusion
                     case 37096:                             // Blood Elf Illusion
@@ -2146,26 +2571,43 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                         switch (GetId())
                         {
                             case 38224: spellId = (gender == GENDER_MALE ? 38225 : 38227); break;
-                            case 37096: spellId = (gender == GENDER_MALE ? 37092 : 37094); break;
+                            case 37096: spellId = (gender == GENDER_MALE ? 37093 : 37095); break;
                             case 46354: spellId = (gender == GENDER_MALE ? 46355 : 46356); break;
                             default: return;
                         }
                         target->CastSpell(target, spellId, true, NULL, this);
                         return;
                     }
+                    case 39238:                             // Fumping
+                    {
+                        if (!target)
+                            return;
+
+                        if (Unit* caster = GetCaster())
+                            caster->SummonCreature(urand(0,1) ? 22482 : 22483, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000 );
+                        return;
+                    }
                     case 39850:                             // Rocket Blast
+                    {
                         if (roll_chance_i(20))              // backfire stun
                             target->CastSpell(target, 51581, true, NULL, this);
                         return;
+                    }
                     case 43873:                             // Headless Horseman Laugh
+                    case 43881:
+                        target->PlayDistanceSound(11975);
+                        return;
+                    case 43885:                             // Headless Horseman - Horseman Laugh, Maniacal
                         target->PlayDistanceSound(11965);
                         return;
+                    case 43894:                             // Headless Horseman - Horseman Laugh, Low Key
+                        target->PlayDistanceSound(11976);
+                        return;
                     case 45963:                             // Call Alliance Deserter
                     {
                         // Escorting Alliance Deserter
                         if (target->GetMiniPet())
                             target->CastSpell(target, 45957, true);
-
                         return;
                     }
                     case 46699:                             // Requires No Ammo
@@ -2177,6 +2619,30 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                         target->CastSpell(target, 47189, true, NULL, this);
                         // allow script to process further (text)
                         break;
+                    case 47669:                             // Awaken Subboss (Gortok - Utgarde Pinnacle)
+                    {
+                        if (target && target->GetTypeId() == TYPEID_UNIT)
+                        {
+                            target->RemoveAurasDueToSpell(16245);
+                            target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                            ((Creature*)target)->SetInCombatWithZone();
+                        }
+                        break;
+                    }
+                    case 47795:                             // Cold Cleanse
+                    {
+                        if (Unit* Caster = GetCaster())
+                        {
+                            Caster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                            Caster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
+                            Caster->DeleteThreatList();
+                            Caster->CombatStop(true);
+                        }
+                        return;
+                    }
+                    case 47977:                             // Magic Broom
+                        Spell::SelectMountByAreaAndSkill(target, GetSpellProto(), 42680, 42683, 42667, 42668, 0);
+                        return;
                     case 48025:                             // Headless Horseman's Mount
                         Spell::SelectMountByAreaAndSkill(target, GetSpellProto(), 51621, 48024, 51617, 48023, 0);
                         return;
@@ -2184,16 +2650,81 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                         // See Death's Door
                         target->CastSpell(target, 48814, true, NULL, this);
                         return;
+                    case 48276:                             // Svala - Ritual Of Sword
+                        target->CastSpell(target, 54148, true);   //Cast Choose Target
+                        target->CastSpell(target, 48331, true);   //Cast Swirl Sword
+                        target->CastSpell(target, 54159, true);   //Cast Remove Equipment
+                        return;
+                    case 50756:                             // Drakos Shpere Passive
+                        target->CastSpell(target, 50758, true);
+                        return;
                     case 51405:                             // Digging for Treasure
                         target->HandleEmote(EMOTE_STATE_WORK);
                         // Pet will be following owner, this makes him stop
                         target->addUnitState(UNIT_STAT_STUNNED);
                         return;
+                    case 52921:                             // Arc Lightning (Halls of Lighning: Loken)
+                        target->CastSpell(target, 52924, false);
+                        return;
+                    case 54236:                             // Death Touch - Lich King kill Overlord Drakuru
+                        target->CastSpell(target, 54248, false);    // Cast Drakuru Death
+                        return;
+                    case 55328:                                 // Stoneclaw Totem I
+                        target->CastSpell(target, 5728, true);
+                        return;
+                    case 55329:                                 // Stoneclaw Totem II
+                        target->CastSpell(target, 6397, true);
+                        return;
+                    case 55330:                                 // Stoneclaw Totem III
+                        target->CastSpell(target, 6398, true);
+                        return;
+                    case 55332:                                 // Stoneclaw Totem IV
+                        target->CastSpell(target, 6399, true);
+                        return;
+                    case 55333:                                 // Stoneclaw Totem V
+                        target->CastSpell(target, 10425, true);
+                        return;
+                    case 55335:                                 // Stoneclaw Totem VI
+                        target->CastSpell(target, 10426, true);
+                        return;
+                    case 55278:                                 // Stoneclaw Totem VII
+                        target->CastSpell(target, 25513, true);
+                        return;
+                    case 58589:                                 // Stoneclaw Totem VIII
+                        target->CastSpell(target, 58583, true);
+                        return;
+                    case 58590:                                 // Stoneclaw Totem IX
+                        target->CastSpell(target, 58584, true);
+                        return;
+                    case 58591:                                 // Stoneclaw Totem X
+                        target->CastSpell(target, 58585, true);
+                        return;
+                    case 58600:                             // Restricted Flight Area
+                    {
+                        if (!target || target->GetTypeId() != TYPEID_PLAYER)
+                            return;
+                        const char* text = sObjectMgr.GetMangosString(LANG_NO_FLY_ZONE, ((Player*)target)->GetSession()->GetSessionDbLocaleIndex());
+                        target->MonsterWhisper(text, target, true);
+                        return;
+                    }
+                    case 58983:                                 // Big Blizzard Bear
+                        Spell::SelectMountByAreaAndSkill(target, GetSpellProto(), 58997, 58999, 0, 0, 0);
+                        return;
                     case 54729:                             // Winged Steed of the Ebon Blade
                         Spell::SelectMountByAreaAndSkill(target, GetSpellProto(), 0, 0, 54726, 54727, 0);
                         return;
-                    case 58600:                             // Restricted Flight Area
-                        target->MonsterWhisper(LANG_NO_FLY_ZONE, target, true);
+                    case 60444:                                // Lost!
+                        if (target && target->GetTypeId() == TYPEID_PLAYER)
+                        {
+                            uint32 spell_id = (((Player*)target)->GetTeam() == ALLIANCE ? 60323 : 60328);
+                            target->CastSpell(target, spell_id + urand(0, 7), true);
+                            return;
+                        }
+                        break;
+                    case 61187:                             // Twilight Shift (single target)
+                    case 61190:                             // Twilight Shift (many targets)
+                        target->RemoveAurasDueToSpell(57620);
+                        target->CastSpell(target, 61885, true, NULL, this);
                         return;
                     case 62061:                             // Festive Holiday Mount
                         if (target->HasAuraType(SPELL_AURA_MOUNTED))
@@ -2204,11 +2735,31 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                         target->setFaction(1990);           // Ambient (hostile)
                         target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
                         return;
+                    case 63322:                             // Saronite Vapors
+                        if (Unit* caster = GetCaster())
+                        {
+                            int32 damage = 100 << GetStackAmount();
+                            caster->CastCustomSpell(target, 63338, &damage, 0, 0, true); // damage spell
+                            damage = damage >> 1;
+                            caster->CastCustomSpell(target, 63337, &damage, 0, 0, true); // manareg spell
+                        }
+                        return;
                     case 63624:                             // Learn a Second Talent Specialization
                         // Teach Learn Talent Specialization Switches, required for client triggered casts, allow after 30 sec delay
                         if (target->GetTypeId() == TYPEID_PLAYER)
                             ((Player*)target)->learnSpell(63680, false);
                         return;
+                    case 68645:
+                        // Rocket Pack
+                        if (target->GetTypeId() == TYPEID_PLAYER)
+                        {
+                            // Rocket Burst - visual effect
+                            target->CastSpell(target, 69192, true, NULL, this);
+                            // Rocket Pack - causing damage
+                            target->CastSpell(target, 69193, true, NULL, this);
+                            return;
+                        }
+                        return;
                     case 63651:                             // Revert to One Talent Specialization
                         // Teach Learn Talent Specialization Switches, remove
                         if (target->GetTypeId() == TYPEID_PLAYER)
@@ -2223,12 +2774,31 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                             caster->CastSpell(caster, 68899, false);
                         }
                         return;
+                    case 69152:                             // Gaseous Blight (Festergut)
+                        target->RemoveAurasDueToSpell(69126); // previous gas state
+                        return;
+                    case 69154:                             // Gaseous Blight (Festergut)
+                        target->RemoveAurasDueToSpell(69152); // previous gas state
+                    case 70623:                             // Jaina's Call
+                        if (target->GetTypeId() == TYPEID_PLAYER)
+                            target->CastSpell(target, 70525, true, NULL, this);
+                        return;
+                    case 70638:                             // Call of Sylvanas
+                        if (target->GetTypeId() == TYPEID_PLAYER)
+                            target->CastSpell(target, 70639, true, NULL, this);
+                        return;
                     case 71342:                             // Big Love Rocket
                         Spell::SelectMountByAreaAndSkill(target, GetSpellProto(), 71344, 71345, 71346, 71347, 0);
                         return;
                     case 71563:                             // Deadly Precision
                         target->CastSpell(target, 71564, true, NULL, this);
                         return;
+                    case 72087:                             // Kinetic Bomb Knockback
+                        float x, y, z;
+                        target->GetPosition(x, y, z);
+                        target->GetMotionMaster()->Clear();
+                        target->GetMotionMaster()->MovePoint(0, x, y, z + 6.0f * GetStackAmount());
+                        return;
                     case 72286:                             // Invincible
                         Spell::SelectMountByAreaAndSkill(target, GetSpellProto(), 72281, 72282, 72283, 72284, 0);
                         return;
@@ -2353,10 +2923,10 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 }
 
                 // Overpower
-                if (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000000004))
+                if (GetSpellProto()->GetSpellFamilyFlags().test<CF_WARRIOR_OVERPOWER>())
                 {
                     // Must be casting target
-                    if (!target->IsNonMeleeSpellCasted(false))
+                    if (!target->IsNonMeleeSpellCasted(false) || !target->GetObjectGuid().IsPlayerOrPet()) //unrelenting assault don't must affect on pve.
                         return;
 
                     Unit* caster = GetCaster();
@@ -2367,15 +2937,15 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     for(Unit::AuraList::const_iterator itr = modifierAuras.begin(); itr != modifierAuras.end(); ++itr)
                     {
                         // Unrelenting Assault
-                        if ((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARRIOR && (*itr)->GetSpellProto()->SpellIconID == 2775)
+                        if ((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARRIOR && (*itr)->GetSpellProto()->GetSpellIconID() == 2775)
                         {
                             switch ((*itr)->GetSpellProto()->Id)
                             {
                                 case 46859:                 // Unrelenting Assault, rank 1
-                                    target->CastSpell(target,64849,true,NULL,(*itr));
+                                    target->CastSpell(target,64849,true,NULL,(*itr)());
                                     break;
                                 case 46860:                 // Unrelenting Assault, rank 2
-                                    target->CastSpell(target,64850,true,NULL,(*itr));
+                                    target->CastSpell(target,64850,true,NULL,(*itr)());
                                     break;
                                 default:
                                     break;
@@ -2387,8 +2957,42 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 }
                 break;
             }
-            case SPELLFAMILY_MAGE:
+            case SPELLFAMILY_ROGUE:
+            {
+                // Honor Among Thieves
+                if (GetId() == 52916)
+                {
+                    // Get Honor Among Thieves party aura
+                    Unit::AuraList const &procTriggerSpellAuras = target->GetAurasByType(SPELL_AURA_PROC_TRIGGER_SPELL);
+                    for (Unit::AuraList::const_iterator i = procTriggerSpellAuras.begin(); i != procTriggerSpellAuras.end(); ++i)
+                    {
+                        SpellEntry const *spellInfo = (*i)->GetSpellProto();
+
+                        if (!spellInfo)
+                            continue;
+
+                        if (spellInfo->EffectTriggerSpell[0] == 52916)
+                        {
+                            // Get caster of aura
+                            if(!(*i)->GetCaster() || (*i)->GetCaster()->GetTypeId() != TYPEID_PLAYER)
+                                continue;
+
+                            Player *pCaster = (Player*)((*i)->GetCaster());
+
+                            // do not proc if player has CD, or if player has no target, or if player's target is not valid
+                            if (pCaster->HasAura(51699, EFFECT_INDEX_1) || !pCaster->getVictim() || pCaster->IsFriendlyTo(pCaster->getVictim()))
+                                continue;
+                            // give combo point and aura for cooldown on success
+                            else if (roll_chance_i(spellInfo->CalculateSimpleValue(EFFECT_INDEX_0)))
+                                pCaster->CastSpell(pCaster->getVictim(), 51699, true);
+                        }
+                    }
+
+                    // return after loop to make sure all rogues with Honor Among Thieves get the benefit of this proc rather than only first
+                    return;
+                }
                 break;
+            }
             case SPELLFAMILY_HUNTER:
             {
                 switch(GetId())
@@ -2409,7 +3013,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 }
 
                 // Earth Shield
-                if ((GetSpellProto()->SpellFamilyFlags & UI64LIT(0x40000000000)))
+                if (GetSpellProto()->GetSpellFamilyFlags().test<CF_SHAMAN_EARTH_SHIELD>())
                 {
                     // prevent double apply bonuses
                     if (target->GetTypeId() != TYPEID_PLAYER || !((Player*)target)->GetSession()->PlayerLoading())
@@ -2424,6 +3028,19 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 }
                 break;
             }
+            case SPELLFAMILY_DEATHKNIGHT:
+            {
+                // Hungering Cold - disease apply
+                if (GetId() == 51209)
+                {
+                    Unit *caster = GetCaster();
+                    if(!caster)
+                        return;
+
+                    caster->CastSpell(target, 55095, true);
+                }
+                break;
+            }
         }
     }
     // AT REMOVE
@@ -2460,7 +3077,6 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
 
             if (finalSpellId)
                 caster->CastSpell(target, finalSpellId, true, NULL, this);
-
             return;
         }
 
@@ -2492,6 +3108,18 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
 
                 return;
             }
+            case 28059:                                     // Positive Charge (Thaddius)
+            {
+                if (target->HasAura(29659))
+                    target->RemoveAurasDueToSpell(29659);
+                return;
+            }
+            case 28084:                                     // Negative Charge (Thaddius)
+            {
+                if (target->HasAura(29660))
+                    target->RemoveAurasDueToSpell(29660);
+                return;
+            }
             case 28169:                                     // Mutating Injection
             {
                 // Mutagen Explosion
@@ -2504,32 +3132,29 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
             {
                 if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
                     target->CastSpell(target, 32054, true, NULL, this);
-
                 return;
             }
             case 32051:                                     // Soul Charge
             {
                 if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
                     target->CastSpell(target, 32057, true, NULL, this);
-
                 return;
             }
             case 32052:                                     // Soul Charge
             {
                 if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
                     target->CastSpell(target, 32053, true, NULL, this);
-
                 return;
             }
             case 32286:                                     // Focus Target Visual
             {
                 if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
                     target->CastSpell(target, 32301, true, NULL, this);
-
                 return;
             }
             case 35079:                                     // Misdirection, triggered buff
             case 59628:                                     // Tricks of the Trade, triggered buff
+            case 59665:                                     // Vigilance, redirection spell
             {
                 if (Unit* pCaster = GetCaster())
                     pCaster->getHostileRefManager().ResetThreatRedirection();
@@ -2558,6 +3183,11 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 target->RemoveAurasDueToSpell(41105);
                 return;
             }
+            case 42385:                                     // Alcaz Survey Aura
+            {
+                target->CastSpell(target, 42316, true, NULL, this);
+                return;
+            }
             case 42454:                                     // Captured Totem
             {
                 if (m_removeMode == AURA_REMOVE_BY_DEFAULT)
@@ -2574,7 +3204,6 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     if (Player* pPlayer = pCaster->GetCharmerOrOwnerPlayerOrPlayerItself())
                         pPlayer->CastSpell(pPlayer, 42455, true);
                 }
-
                 return;
             }
             case 42517:                                     // Beam to Zelfrax
@@ -2586,11 +3215,13 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
 
                 if (pSummon && pCaster)
                     pSummon->GetMotionMaster()->MovePoint(0, pCaster->GetPositionX(), pCaster->GetPositionY(), pCaster->GetPositionZ());
-
                 return;
             }
             case 43681:                                     // Inactive
             {
+                if (!target || target->GetTypeId() != TYPEID_PLAYER)
+                    return;
+
                 if (m_removeMode == AURA_REMOVE_BY_EXPIRE && target->GetTypeId() == TYPEID_PLAYER)
                     ((Player*)target)->ToggleAFK();
                 return;
@@ -2600,7 +3231,6 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 // Steelfeather Quest Credit, Are there any requirements for this, like area?
                 if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
                     target->CastSpell(target, 43984, true);
-
                 return;
             }
             case 44191:                                     // Flame Strike
@@ -2617,7 +3247,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
             {
                 // Kill target if dispelled
                 if (m_removeMode==AURA_REMOVE_BY_DISPEL)
-                    target->DealDamage(target, target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    target->KillSelf();
                 return;
             }
             case 45963:                                     // Call Alliance Deserter
@@ -2632,17 +3262,99 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 target->CastSpell(target, 47287, true, NULL, this);
                 return;
             }
+            case 46637:                                     // Break Ice
+            {
+                target->CastSpell(target, 46638, true);
+                return;
+            }
+            case 47744:                                     // Rage of Jin'arrak
+            {
+                if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
+                {
+                    if (Unit* caster = GetCaster())
+                    {
+                        caster->CastSpell(caster, 61611, true);
+                        ((Player*)caster)->KilledMonsterCredit(26902);
+                    }
+                    return;
+                }
+                break;
+            }
+            case 47795:                                     // Cold Cleanse
+            {
+                if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
+                {
+                    Unit* Caster = GetCaster();
+
+                    if (Caster->isAlive())
+                    {
+                        Caster->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
+                        Caster->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+                        Creature* pCreature = NULL;
+
+                        MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck creature_check(*Caster,  26591, true, false, 15.0f);
+                        MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(pCreature, creature_check);
+
+                        Cell::VisitGridObjects(Caster, searcher, 15.0f);
+
+                        if (pCreature)
+                        {
+                            float fX, fY, fZ;
+
+                            fX = pCreature->GetPositionX();
+                            fY = pCreature->GetPositionY();
+                            fZ = pCreature->GetPositionZ();
+
+                            Caster->SetSpeedRate(MOVE_RUN, 0.7f);
+                            Caster->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+
+                            switch(urand(0,1))
+                            {
+                                case 0: Caster->MonsterSay("I could sleep forever, mon...", LANG_UNIVERSAL, 0); break;
+                                case 1: Caster->MonsterSay("Finally, I can be restin\'...", LANG_UNIVERSAL, 0); break;
+                            }
+
+                            //This should happen when Caster arive to dest place
+                            pCreature->CastSpell(pCreature, 47798, true);
+                            pCreature->CastSpell(pCreature, 48150, true);
+                            pCreature->ForcedDespawn(15000);
+                            ((Creature*)Caster)->ForcedDespawn(3000);
+                            return;
+                        }
+                    }
+                }
+                break;
+            }
             case 48385:                                     // Create Spirit Fount Beam
             {
                 target->CastSpell(target, target->GetMap()->IsRegularDifficulty() ? 48380 : 59320, true);
                 return;
             }
+            case 49356:                                     // Flesh Decay - Tharonja
+            {
+                if (Unit* caster = GetCaster())
+                {
+                    caster->SetDisplayId(27073);            // Set Skeleton Model
+                    caster->CastSpell(caster, 52509, true); // Cast Gift Of Tharonja
+                    caster->CastSpell(caster, 52582, true); // Cast Transform Visual
+                }
+                return;
+            }
+            case 53463:                                     // Flesh Return - Tharonja
+            {
+                if (Unit* caster = GetCaster())
+                {
+                    caster->SetDisplayId(27072);            // Set Basic Model
+                    caster->CastSpell(caster, 52582, true); // Cast Transform Visual
+                }
+                return;
+            }
             case 50141:                                     // Blood Oath
             {
                 // Blood Oath
                 if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
                     target->CastSpell(target, 50001, true, NULL, this);
-
                 return;
             }
             case 51405:                                     // Digging for Treasure
@@ -2671,7 +3383,12 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
                         pCaster->CastSpell(target, 51872, true, NULL, this);
                 }
-
+                return;
+            }
+            case 34477: //Misdirection
+            case 57934: //Tricks of Trade
+            {
+                // Do nothing - all maked in 1'st effect and on aura remove.
                 return;
             }
             case 52098:                                     // Charge Up
@@ -2705,12 +3422,22 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 target->RemoveAurasDueToSpell(41106);
                 return;
             }
+            case 56150:                                     // Jedoga Sacriface Beam
+            {
+                if (Unit* caster = GetCaster())
+                {
+                    int32 health = target->GetHealthPercent();
+                    int32 mana = target->GetPower(POWER_MANA)*100/target->GetMaxPower(POWER_MANA);
+                    int32 instantkill = 1;
+                    caster->CastCustomSpell(target, 58919, &health, &instantkill, &mana, true);
+                }
+                return;
+            }
             case 56511:                                     // Towers of Certain Doom: Tower Bunny Smoke Flare Effect
             {
                 // Towers of Certain Doom: Skorn Cannonfire
                 if (m_removeMode == AURA_REMOVE_BY_DEFAULT)
                     target->CastSpell(target, 43069, true);
-
                 return;
             }
             case 58600:                                     // Restricted Flight Area
@@ -2732,6 +3459,20 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
 
                 return;
             }
+            case 62483:                                     // Stonebark's Essence Channel
+            case 62484:                                     // Ironbranch's Essence Channel
+            case 62485:                                     // Brightleaf's Essence Channel
+            case 65587:                                     // Brightleaf's Essence Channel (h)
+            case 65588:                                     // Ironbranch's Essence Channel (h)
+            case 65589:                                     // Stonebark's Essence Channel (h)
+            {
+                if (Unit* caster = GetCaster())
+                {
+                    if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
+                        caster->CastSpell(caster, 62467, true);
+                }
+                return;
+            }
             case 68839:                                     // Corrupt Soul
             {
                 // Knockdown Stun
@@ -2740,14 +3481,66 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 target->CastSpell(target, 68846, true, NULL, this);
                 return;
             }
+            case 69766:                                     // Instability (Sindragosa)
+            {
+                // trigger Backlash if aura wears off
+                if (m_removeMode != AURA_REMOVE_BY_EXPIRE)
+                    return;
+
+                int32 damage = GetModifier()->m_amount;
+                target->CastCustomSpell(target, 69770, &damage, 0, 0, true, 0, this, GetCasterGuid(), GetSpellProto());
+                return;
+            }
+            case 70308:                                     // Mutated Transformation (Putricide)
+            {
+                uint32 entry = 37672;
+                if (Creature* pAbomination = target->SummonCreature(entry, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0))
+                {
+                    pAbomination->setFaction(target->getFaction());
+                    target->CastSpell(pAbomination, 46598, true);
+                }
+                return;
+            }
+            case 70955:                                     // Unbound Plague Bounce Protection (Putricide)
+            {
+                target->CastSpell(target, 70917, true); // Search Periodic
+                return;
+            }
+            case 72087:                                     // Kinetic Bomb Knockback
+            {
+                float x, y, z;
+                target->GetPosition(x, y, z);
+                z = target->GetMap()->GetHeight(target->GetPhaseMask(), x, y, z);
+                target->GetMotionMaster()->Clear();
+                target->GetMotionMaster()->MovePoint(0, x, y, z);
+                return;
+            }
+            case 72546:                             // Harvest Soul (Lich King)
+            case 73655:
+            {
+                switch (m_removeMode)
+                {
+                    case AURA_REMOVE_BY_EXPIRE:
+                        target->CastSpell(target, 72627, true); // instakill
+                        // no break
+                    case AURA_REMOVE_BY_DEATH:
+                        target->CastSpell(target, 72679, true); // Harvested Soul buff
+                        break;
+                }
+                return;
+            }
         }
 
         // Living Bomb
-        if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x2000000000000)))
+        if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && GetSpellProto()->GetSpellFamilyFlags().test<CF_MAGE_LIVING_BOMB>())
         {
             if (m_removeMode == AURA_REMOVE_BY_EXPIRE || m_removeMode == AURA_REMOVE_BY_DISPEL)
-                target->CastSpell(target,m_modifier.m_amount,true,NULL,this);
-
+            {
+                if (this->GetCaster())
+                    GetCaster()->CastSpell(target,m_modifier.m_amount,true,NULL,this);
+                else
+                    target->CastSpell(target,m_modifier.m_amount,true,NULL,this);
+            }
             return;
         }
     }
@@ -2859,38 +3652,6 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     }
                     return;
                 }
-                case 40133:                                 //Summon Fire Elemental
-                {
-                    Unit* caster = GetCaster();
-                    if (!caster)
-                        return;
-
-                    Unit *owner = caster->GetOwner();
-                    if (owner && owner->GetTypeId() == TYPEID_PLAYER)
-                    {
-                        if (apply)
-                            owner->CastSpell(owner, 8985, true);
-                        else
-                            ((Player*)owner)->RemovePet(PET_SAVE_REAGENTS);
-                    }
-                    return;
-                }
-                case 40132:                                 //Summon Earth Elemental
-                {
-                    Unit* caster = GetCaster();
-                    if (!caster)
-                        return;
-
-                    Unit *owner = caster->GetOwner();
-                    if (owner && owner->GetTypeId() == TYPEID_PLAYER)
-                    {
-                        if (apply)
-                            owner->CastSpell(owner, 19704, true);
-                        else
-                            ((Player*)owner)->RemovePet(PET_SAVE_REAGENTS);
-                    }
-                    return;
-                }
                 case 40214:                                 //Dragonmaw Illusion
                 {
                     if (apply)
@@ -2916,14 +3677,54 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                         target->CastSpell(target, 42517, true);
                     return;
                 }
+                case 42583:                                 // Claw Rage
+                case 68987:                                 // Pursuit
+                {
+                    Unit* caster = GetCaster();
+                    if (!caster || target->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    if (apply)
+                        caster->FixateTarget(target);
+                    else if (target->GetObjectGuid() == caster->GetFixatedTargetGuid())
+                        caster->FixateTarget(NULL);
+
+                    return;
+                }
                 case 43874:                                 // Scourge Mur'gul Camp: Force Shield Arcane Purple x3
                     target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE, apply);
+
                     if (apply)
                         target->addUnitState(UNIT_STAT_ROOT);
                     return;
                 case 47178:                                 // Plague Effect Self
                     target->SetFeared(apply, GetCasterGuid(), GetId());
                     return;
+                case 53813:                                 // Urom Shield
+                case 50053:                                 // Varos Shield
+                    target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE, apply);
+                    target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE, apply);
+                    return;
+                case 54852:                                 // Drakkari Colossus Stun (Hmmm... I'm lookup all stun effect spell, but not find needed!)
+                    if (apply)
+                    {
+                        target->addUnitState(UNIT_STAT_STUNNED);
+                        target->SetTargetGuid(target->GetObjectGuid());
+                        target->CastSpell(target, 16245, true);
+                    }
+                    else
+                    {
+                        if (target->isAlive())
+                        {
+                            if (Unit* pVictim = target->getVictim())
+                                target->SetTargetGuid(pVictim->GetObjectGuid());
+                        }
+                        target->clearUnitState(UNIT_STAT_STUNNED);
+                        target->RemoveAurasDueToSpell(16245);
+                    }
+                    target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE, apply);
+                    target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED, apply);
+                    return;
                 case 56422:                                 // Nerubian Submerge
                     // not known if there are other things todo, only flag are confirmed valid
                     target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE, apply);
@@ -2947,7 +3748,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                             target->PlayDirectSound(14971, (Player *)target);
                         // Play part 3
                         else
-                            target->PlayDirectSound(14972, (Player *)target);
+                            target->PlayDirectSound(14972, (Player*)target);
                     }
                     return;
                 case 27978:
@@ -2955,8 +3756,22 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     if (apply)
                         target->m_AuraFlags |= UNIT_AURAFLAG_ALIVE_INVISIBLE;
                     else
-                        target->m_AuraFlags |= ~UNIT_AURAFLAG_ALIVE_INVISIBLE;
+                        target->m_AuraFlags &= ~UNIT_AURAFLAG_ALIVE_INVISIBLE;
+                    return;
+                case 70733:                                 // Stoneform (ICC))
+                {
+                    target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE, apply);
+                    target->SetUInt32Value(UNIT_NPC_EMOTESTATE, apply ? EMOTE_STATE_CUSTOM_SPELL_02 : 0);
+                    return;
+                }
+                case 73077:                                 // Rocket Pack (ICC, Gunship Battle)
+                {
+                    if (apply)
+                        target->CastSpell(target, 69188, true);
+                    else
+                        target->RemoveAurasDueToSpell(69188);
                     return;
+                }
             }
             break;
         }
@@ -2965,7 +3780,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
         case SPELLFAMILY_WARLOCK:
         {
             // Haunt
-            if (GetSpellProto()->SpellIconID == 3172 && (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0004000000000000)))
+            if (GetSpellProto()->GetSpellIconID() == 3172 && GetSpellProto()->GetSpellFamilyFlags().test<CF_WARLOCK_HAUNT>())
             {
                 // NOTE: for avoid use additional field damage stored in dummy value (replace unused 100%
                 if (apply)
@@ -2999,7 +3814,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 }
                 case 61336:                                 // Survival Instincts
                 {
-                    if(apply)
+                    if (apply)
                     {
                         if (!target->IsInFeralForm())
                             return;
@@ -3014,7 +3829,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
             }
 
             // Lifebloom
-            if (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x1000000000))
+            if (GetSpellProto()->GetSpellFamilyFlags().test<CF_DRUID_LIFEBLOOM>())
             {
                 if (apply)
                 {
@@ -3023,8 +3838,8 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                         // prevent double apply bonuses
                         if (target->GetTypeId() != TYPEID_PLAYER || !((Player*)target)->GetSession()->PlayerLoading())
                         {
-                            m_modifier.m_amount = caster->SpellHealingBonusDone(target, GetSpellProto(), m_modifier.m_amount, SPELL_DIRECT_DAMAGE);
-                            m_modifier.m_amount = target->SpellHealingBonusTaken(caster, GetSpellProto(), m_modifier.m_amount, SPELL_DIRECT_DAMAGE);
+                            m_modifier.m_amount = caster->SpellHealingBonusDone(target, GetSpellProto(), m_modifier.m_amount, SPELL_DIRECT_DAMAGE, GetStackAmount());
+                            m_modifier.m_amount = target->SpellHealingBonusTaken(caster, GetSpellProto(), m_modifier.m_amount, SPELL_DIRECT_DAMAGE, GetStackAmount());
                         }
                     }
                 }
@@ -3051,14 +3866,14 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
             }
 
             // Predatory Strikes
-            if (target->GetTypeId()==TYPEID_PLAYER && GetSpellProto()->SpellIconID == 1563)
+            if (target->GetTypeId()==TYPEID_PLAYER && GetSpellProto()->GetSpellIconID() == 1563)
             {
                 ((Player*)target)->UpdateAttackPowerAndDamage();
                 return;
             }
 
             // Improved Moonkin Form
-            if (GetSpellProto()->SpellIconID == 2855)
+            if (GetSpellProto()->GetSpellIconID() == 2855)
             {
                 uint32 spell_id;
                 switch(GetId())
@@ -3146,9 +3961,9 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     Totem* totem = target->GetTotem(TOTEM_SLOT_AIR);
 
                     if (totem && apply)
-                        ((Player*)target)->GetCamera().SetView(totem);
+                        ((Player*)target)->SetViewPoint(totem);
                     else
-                        ((Player*)target)->GetCamera().ResetView();
+                        ((Player*)target)->SetViewPoint(NULL);
 
                     return;
                 }
@@ -3167,7 +3982,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
         return;
     }
 
-    if (GetEffIndex() == EFFECT_INDEX_0 && target->GetTypeId() == TYPEID_PLAYER)
+    if (target->GetTypeId() == TYPEID_PLAYER)
     {
         SpellAreaForAreaMapBounds saBounds = sSpellMgr.GetSpellAreaForAuraMapBounds(GetId());
         if (saBounds.first != saBounds.second)
@@ -3175,18 +3990,8 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
             uint32 zone, area;
             target->GetZoneAndAreaId(zone, area);
 
-            for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
-            {
-                // some auras remove at aura remove
-                if (!itr->second->IsFitToRequirements((Player*)target, zone, area))
-                    target->RemoveAurasDueToSpell(itr->second->spellId);
-                // some auras applied at aura apply
-                else if (itr->second->autocast)
-                {
-                    if (!target->HasAura(itr->second->spellId, EFFECT_INDEX_0))
-                        target->CastSpell(target, itr->second->spellId, true);
-                }
-            }
+            for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
+                itr->second->ApplyOrRemoveSpellIfCan((Player*)target, zone, area, false);
         }
     }
 
@@ -3203,7 +4008,7 @@ void Aura::HandleAuraMounted(bool apply, bool Real)
 
     Unit *target = GetTarget();
 
-    if(apply)
+    if (apply)
     {
         CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(m_modifier.m_miscvalue);
         if(!ci)
@@ -3217,7 +4022,7 @@ void Aura::HandleAuraMounted(bool apply, bool Real)
         if (minfo)
             display_id = minfo->modelid;
 
-        target->Mount(display_id, GetId());
+        target->Mount(display_id, GetId(), ci->VehicleTemplateId, GetMiscValue());
     }
     else
     {
@@ -3231,14 +4036,11 @@ void Aura::HandleAuraWaterWalk(bool apply, bool Real)
     if(!Real)
         return;
 
-    WorldPacket data;
-    if(apply)
-        data.Initialize(SMSG_MOVE_WATER_WALK, 8+4);
-    else
-        data.Initialize(SMSG_MOVE_LAND_WALK, 8+4);
-    data << GetTarget()->GetPackGUID();
-    data << uint32(0);
-    GetTarget()->SendMessageToSet(&data, true);
+    // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit
+    if (!apply && GetTarget()->HasAuraType(SPELL_AURA_WATER_WALK))
+        return;
+
+    GetTarget()->SetWaterWalk(apply);
 }
 
 void Aura::HandleAuraFeatherFall(bool apply, bool Real)
@@ -3246,12 +4048,14 @@ void Aura::HandleAuraFeatherFall(bool apply, bool Real)
     // only at real add/remove aura
     if(!Real)
         return;
+
     Unit *target = GetTarget();
-    WorldPacket data;
-    if(apply)
-        data.Initialize(SMSG_MOVE_FEATHER_FALL, 8+4);
-    else
-        data.Initialize(SMSG_MOVE_NORMAL_FALL, 8+4);
+
+    // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit
+    if (!apply && target->HasAuraType(SPELL_AURA_FEATHER_FALL))
+        return;
+
+    WorldPacket data(apply ? SMSG_MOVE_FEATHER_FALL : SMSG_MOVE_NORMAL_FALL, target->GetPackGUID().size() + 4);
     data << target->GetPackGUID();
     data << uint32(0);
     target->SendMessageToSet(&data, true);
@@ -3259,28 +4063,65 @@ void Aura::HandleAuraFeatherFall(bool apply, bool Real)
     // start fall from current height
     if(!apply && target->GetTypeId() == TYPEID_PLAYER)
         ((Player*)target)->SetFallInformation(0, target->GetPositionZ());
+
+    // additional custom cases
+    if(!apply)
+    {
+        switch(GetId())
+        {
+            // Soaring - Test Flight chain
+            case 36812:
+            case 37910:
+            case 37940:
+            case 37962:
+            case 37968:
+            {
+                if (Unit* pCaster = GetCaster())
+                    pCaster->CastSpell(pCaster, 37108, true);
+                return;
+            }
+        }
+    }
 }
 
 void Aura::HandleAuraHover(bool apply, bool Real)
 {
     // only at real add/remove aura
-    if(!Real)
+    if (!Real)
+        return;
+
+    // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit
+    if (!apply && GetTarget()->HasAuraType(SPELL_AURA_HOVER))
         return;
 
     WorldPacket data;
-    if(apply)
-        data.Initialize(SMSG_MOVE_SET_HOVER, 8+4);
+    if (apply)
+    {
+        GetTarget()->m_movementInfo.AddMovementFlag(MOVEFLAG_HOVER);
+        data.Initialize(GetTarget()->GetTypeId() == TYPEID_PLAYER ? SMSG_MOVE_SET_HOVER : SMSG_SPLINE_MOVE_SET_HOVER, GetTarget()->GetPackGUID().size() + 4);
+        data << GetTarget()->GetPackGUID();
+        if (GetTarget()->GetTypeId() == TYPEID_PLAYER)
+            data << uint32(0);
+        else
+            GetTarget()->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_HOVER);
+    }
     else
-        data.Initialize(SMSG_MOVE_UNSET_HOVER, 8+4);
-    data << GetTarget()->GetPackGUID();
-    data << uint32(0);
+    {
+        GetTarget()->m_movementInfo.RemoveMovementFlag(MOVEFLAG_HOVER);
+        data.Initialize(GetTarget()->GetTypeId() == TYPEID_PLAYER ? SMSG_MOVE_UNSET_HOVER : SMSG_SPLINE_MOVE_UNSET_HOVER, GetTarget()->GetPackGUID().size() + 4);
+        data << GetTarget()->GetPackGUID();
+        if (GetTarget()->GetTypeId() == TYPEID_PLAYER)
+            data << uint32(0);
+        else
+            GetTarget()->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_HOVER);
+    }
     GetTarget()->SendMessageToSet(&data, true);
 }
 
 void Aura::HandleWaterBreathing(bool /*apply*/, bool /*Real*/)
 {
     // update timers in client
-    if(GetTarget()->GetTypeId()==TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId()==TYPEID_PLAYER)
         ((Player*)GetTarget())->UpdateMirrorTimers();
 }
 
@@ -3303,28 +4144,7 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
     Unit* target = GetTarget();
 
     if (ssEntry->modelID_A)
-    {
-        // i will asume that creatures will always take the defined model from the dbc
-        // since no field in creature_templates describes wether an alliance or
-        // horde modelid should be used at shapeshifting
-        if (target->GetTypeId() != TYPEID_PLAYER)
-            modelid = ssEntry->modelID_A;
-        else
-        {
-            // players are a bit different since the dbc has seldomly an horde modelid
-            if (Player::TeamForRace(target->getRace()) == HORDE)
-            {
-                if (ssEntry->modelID_H)
-                    modelid = ssEntry->modelID_H;           // 3.2.3 only the moonkin form has this information
-                else                                        // get model for race
-                    modelid = sObjectMgr.GetModelForRace(ssEntry->modelID_A, target->getRaceMask());
-            }
-
-            // nothing found in above, so use default
-            if (!modelid)
-                modelid = ssEntry->modelID_A;
-        }
-    }
+        modelid = target->GetModelForForm(ssEntry);
 
     // remove polymorph before changing display id to keep new display id
     switch (form)
@@ -3341,28 +4161,40 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
         {
             // remove movement affects
             target->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT, GetHolder());
+            std::set<uint32> toRemoveSpellList;
             Unit::AuraList const& slowingAuras = target->GetAurasByType(SPELL_AURA_MOD_DECREASE_SPEED);
-            for (Unit::AuraList::const_iterator iter = slowingAuras.begin(); iter != slowingAuras.end();)
+            for (Unit::AuraList::const_iterator iter = slowingAuras.begin(); iter != slowingAuras.end(); ++iter)
             {
-                SpellEntry const* aurSpellInfo = (*iter)->GetSpellProto();
+                if (iter->IsEmpty())
+                    continue;
+
+                SpellAuraHolderPtr holder = iter->GetHolder();
+                if (!holder || holder->IsDeleted())
+                    continue;
+
+                SpellEntry const* aurSpellInfo = holder->GetSpellProto();
 
                 uint32 aurMechMask = GetAllSpellMechanicMask(aurSpellInfo);
 
                 // If spell that caused this aura has Croud Control or Daze effect
-                if ((aurMechMask & MECHANIC_NOT_REMOVED_BY_SHAPESHIFT) ||
+                if (((aurMechMask & MECHANIC_NOT_REMOVED_BY_SHAPESHIFT) &&
+                    // some non-Daze spells that have MECHANIC_DAZE
+                    aurSpellInfo->Id != 18118 &&    // Aftermath
+                    !aurSpellInfo->IsFitToFamily<SPELLFAMILY_PALADIN, CF_PALADIN_AVENGERS_SHIELD>()) ||
                     // some Daze spells have these parameters instead of MECHANIC_DAZE (skip snare spells)
-                    (aurSpellInfo->SpellIconID == 15 && aurSpellInfo->Dispel == 0 &&
+                    (aurSpellInfo->GetSpellIconID() == 15 && aurSpellInfo->Dispel == 0 &&
                     (aurMechMask & (1 << (MECHANIC_SNARE-1))) == 0))
                 {
-                    ++iter;
                     continue;
                 }
 
                 // All OK, remove aura now
-                target->RemoveAurasDueToSpellByCancel(aurSpellInfo->Id);
-                iter = slowingAuras.begin();
+                toRemoveSpellList.insert(aurSpellInfo->Id);
             }
 
+            for (std::set<uint32>::iterator i = toRemoveSpellList.begin(); i != toRemoveSpellList.end(); ++i)
+                target->RemoveAurasDueToSpellByCancel(*i);
+
             // and polymorphic affects
             if (target->IsPolymorphed())
                 target->RemoveAurasDueToSpell(target->getTransForm());
@@ -3378,9 +4210,6 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
         // remove other shapeshift before applying a new one
         target->RemoveSpellsCausingAura(SPELL_AURA_MOD_SHAPESHIFT, GetHolder());
 
-        // need send to client not form active state, or at re-apply form client go crazy
-        target->SendForcedObjectUpdate();
-
         if (modelid > 0)
             target->SetDisplayId(modelid);
 
@@ -3388,6 +4217,7 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
         switch (form)
         {
             case FORM_CAT:
+            case FORM_SHADOW_DANCE:
                 PowerType = POWER_ENERGY;
                 break;
             case FORM_BEAR:
@@ -3404,8 +4234,8 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
         if (PowerType != POWER_MANA)
         {
             // reset power to default values only at power change
-            if (target->getPowerType() != PowerType)
-                target->setPowerType(PowerType);
+            if (target->GetPowerType() != PowerType)
+                target->SetPowerType(PowerType);
 
             switch (form)
             {
@@ -3418,7 +4248,7 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
                     Unit::AuraList const& mDummy = target->GetAurasByType(SPELL_AURA_DUMMY);
                     for (Unit::AuraList::const_iterator i = mDummy.begin(); i != mDummy.end(); ++i)
                     {
-                        if ((*i)->GetSpellProto()->SpellIconID == 238)
+                        if ((*i)->GetSpellProto()->GetSpellIconID() == 238)
                         {
                             furorChance = (*i)->GetModifier()->m_amount;
                             break;
@@ -3458,7 +4288,7 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
                                 continue;
 
                             SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
-                            if (spellInfo && spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR && spellInfo->SpellIconID == 139)
+                            if (spellInfo && spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR && spellInfo->GetSpellIconID() == 139)
                                 Rage_val += target->CalculateSpellDamage(target, spellInfo, EFFECT_INDEX_0) * 10;
                         }
                     }
@@ -3467,11 +4297,19 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
                         target->SetPower(POWER_RAGE, Rage_val);
                     break;
                 }
+                // Shadow Dance - apply stealth mode stand flag
+                case FORM_SHADOW_DANCE:
+                    target->SetStandFlags(UNIT_STAND_FLAGS_CREEP);
+                    break;
                 default:
                     break;
             }
         }
 
+        // send FORM_STEALTH to client so it uses correct stealth action bar
+        if (form == FORM_SHADOW_DANCE)
+            form = FORM_STEALTH;
+
         target->SetShapeshiftForm(form);
 
         // a form can give the player a new castbar with some spells.. this is a clientside process..
@@ -3487,24 +4325,49 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
             target->SetDisplayId(target->GetNativeDisplayId());
 
         if (target->getClass() == CLASS_DRUID)
-            target->setPowerType(POWER_MANA);
+            target->SetPowerType(POWER_MANA);
 
         target->SetShapeshiftForm(FORM_NONE);
 
-        switch (form)
+        // re-apply transform display with preference negative cases
+        Unit::AuraList& otherTransforms = target->GetAurasByType(SPELL_AURA_TRANSFORM);
+        if (!otherTransforms.empty())
+        {
+            // look for other transform auras
+            Aura* handledAura = (*otherTransforms.begin())();
+            for (Unit::AuraList::iterator itr = otherTransforms.begin(); itr != otherTransforms.end(); ++itr)
+            {
+                if (itr->IsEmpty())
+                    continue;
+
+                // negative auras are preferred
+                if (!IsPositiveSpell((*itr)->GetId()))
+                {
+                    handledAura = (*itr)();
+                    break;
+                }
+            }
+            handledAura->ApplyModifier(true);
+        }
+
+        switch(form)
         {
             // Nordrassil Harness - bonus
             case FORM_BEAR:
             case FORM_DIREBEAR:
             case FORM_CAT:
-                if (Aura* dummy = target->GetDummyAura(37315))
+                if (Aura const* dummy = target->GetDummyAura(37315))
                     target->CastSpell(target, 37316, true, NULL, dummy);
                 break;
             // Nordrassil Regalia - bonus
             case FORM_MOONKIN:
-                if (Aura* dummy = target->GetDummyAura(37324))
+                if (Aura const* dummy = target->GetDummyAura(37324))
                     target->CastSpell(target, 37325, true, NULL, dummy);
                 break;
+            // Shadow Dance - remove stealth mode stand flag
+            case FORM_SHADOW_DANCE:
+                target->RemoveStandFlags(UNIT_STAND_FLAGS_CREEP);
+                break;
             default:
                 break;
         }
@@ -3520,8 +4383,11 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
     // add/remove the shapeshift aura's boosts
     HandleShapeshiftBoosts(apply);
 
+    target->UpdateSpeed(MOVE_RUN, true);
+
     if (target->GetTypeId() == TYPEID_PLAYER)
         ((Player*)target)->InitDataForForm();
+
 }
 
 void Aura::HandleAuraTransform(bool apply, bool Real)
@@ -3529,6 +4395,12 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
     Unit *target = GetTarget();
     if (apply)
     {
+        do { // (to avoid lots of indentation changes)
+
+        // update active transform spell only when transform or shapeshift not set or not overwriting negative by positive case
+        if (target->GetModelForForm() && IsPositiveSpell(GetId()))
+            break;
+
         // special case (spell specific functionality)
         if (m_modifier.m_miscvalue == 0)
         {
@@ -3641,8 +4513,9 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
                     //break;
                 //case 53806:                               // Pygmy Oil
                     //break;
-                //case 62847:                               // NPC Appearance - Valiant 02
-                    //break;
+                case 62847:                                 // NPC Appearance - Valiant 02
+                    target->SetDisplayId(target->getGender() == GENDER_MALE ? 26185 : 26186);
+                    break;
                 //case 62852:                               // NPC Appearance - Champion 01
                     //break;
                 //case 63965:                               // NPC Appearance - Champion 02
@@ -3745,7 +4618,7 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
                     break;
             }
         }
-        else
+        else                                                // m_modifier.m_miscvalue != 0
         {
             uint32 model_id;
 
@@ -3759,22 +4632,24 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
                 model_id = Creature::ChooseDisplayId(ci);   // Will use the default model here
 
             // Polymorph (sheep/penguin case)
-            if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && GetSpellProto()->SpellIconID == 82)
+            if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && GetSpellProto()->GetSpellIconID() == 82)
                 if (Unit* caster = GetCaster())
                     if (caster->HasAura(52648))             // Glyph of the Penguin
                         model_id = 26452;
 
             target->SetDisplayId(model_id);
 
-            // creature case, need to update equipment
+            // creature case, need to update equipment if additional provided
             if (ci && target->GetTypeId() == TYPEID_UNIT)
-                ((Creature*)target)->LoadEquipment(ci->equipmentId, true);
+                ((Creature*)target)->LoadEquipment(ci->EquipmentTemplateId, false);
 
             // Dragonmaw Illusion (set mount model also)
-            if(GetId()==42016 && target->GetMountID() && !target->GetAurasByType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED).empty())
+            if (GetId()==42016 && target->GetMountID() && !target->GetAurasByType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED).empty())
                 target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314);
         }
 
+        } while (0);
+
         // update active transform spell only not set or not overwriting negative by positive case
         if (!target->getTransForm() || !IsPositiveSpell(GetId()) || IsPositiveSpell(target->getTransForm()))
             target->setTransForm(GetId());
@@ -3792,7 +4667,7 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
                 target->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED, GetHolder());
         }
     }
-    else
+    else                                                    // !apply
     {
         // ApplyModifier(true) will reapply it if need
         target->setTransForm(0);
@@ -3800,25 +4675,31 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
 
         // apply default equipment for creature case
         if (target->GetTypeId() == TYPEID_UNIT)
-            ((Creature*)target)->LoadEquipment(((Creature*)target)->GetCreatureInfo()->equipmentId, true);
+            ((Creature*)target)->LoadEquipment(((Creature*)target)->GetCreatureInfo()->EquipmentTemplateId, true);
 
         // re-apply some from still active with preference negative cases
-        Unit::AuraList const& otherTransforms = target->GetAurasByType(SPELL_AURA_TRANSFORM);
+        Unit::AuraList& otherTransforms = target->GetAurasByType(SPELL_AURA_TRANSFORM);
         if (!otherTransforms.empty())
         {
             // look for other transform auras
-            Aura* handledAura = *otherTransforms.begin();
-            for(Unit::AuraList::const_iterator i = otherTransforms.begin();i != otherTransforms.end(); ++i)
+            Aura* handledAura = (*otherTransforms.begin())();
+            for(Unit::AuraList::iterator i = otherTransforms.begin();i != otherTransforms.end(); ++i)
             {
                 // negative auras are preferred
                 if (!IsPositiveSpell((*i)->GetSpellProto()->Id))
                 {
-                    handledAura = *i;
+                    handledAura = (*i)();
                     break;
                 }
             }
             handledAura->ApplyModifier(true);
         }
+        // re-apply shapeshift display if no transform auras remaining
+        else if (target->GetShapeshiftForm())
+        {
+            if (uint32 modelid = target->GetModelForForm())
+                target->SetDisplayId(modelid);
+        }
 
         // Dragonmaw Illusion (restore mount model)
         if (GetId() == 42016 && target->GetMountID() == 16314)
@@ -3842,7 +4723,7 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
 
 void Aura::HandleForceReaction(bool apply, bool Real)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     if(!Real)
@@ -3859,18 +4740,35 @@ void Aura::HandleForceReaction(bool apply, bool Real)
     // stop fighting if at apply forced rank friendly or at remove real rank friendly
     if ((apply && faction_rank >= REP_FRIENDLY) || (!apply && player->GetReputationRank(faction_id) >= REP_FRIENDLY))
         player->StopAttackFaction(faction_id);
+
+    // drop BG flag if player is carrying
+    if (SpellEntry const *spellInfo = GetSpellProto())
+    {
+        switch(spellInfo->Id)
+        {
+            case 1953:                          // Blink
+            case 48020:                         // Demonic Circle
+            case 54861:                         // Nitro Boosts
+                if (player->InBattleGround() && (player->HasAura(23335) || player->HasAura(23333) || player->HasAura(34976)))
+                    if (BattleGround *bg = player->GetBattleGround())
+                        bg->EventPlayerDroppedFlag(player);
+                break;
+            default:
+                break;
+        }
+    }
 }
 
 void Aura::HandleAuraModSkill(bool apply, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     uint32 prot=GetSpellProto()->EffectMiscValue[m_effIndex];
     int32 points = GetModifier()->m_amount;
 
     ((Player*)GetTarget())->ModifySkillBonus(prot, (apply ? points: -points), m_modifier.m_auraname == SPELL_AURA_MOD_SKILL_TALENT);
-    if(prot == SKILL_DEFENSE)
+    if (prot == SKILL_DEFENSE)
         ((Player*)GetTarget())->UpdateDefenseBonusesMod();
 }
 
@@ -3908,7 +4806,7 @@ void Aura::HandleChannelDeathItem(bool apply, bool Real)
 
         ItemPosCountVec dest;
         InventoryResult msg = ((Player*)caster)->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, spellInfo->EffectItemType[m_effIndex], count, &noSpaceForCount);
-        if( msg != EQUIP_ERR_OK )
+        if ( msg != EQUIP_ERR_OK )
         {
             count-=noSpaceForCount;
             ((Player*)caster)->SendEquipError( msg, NULL, NULL, spellInfo->EffectItemType[m_effIndex] );
@@ -3932,14 +4830,14 @@ void Aura::HandleChannelDeathItem(bool apply, bool Real)
 void Aura::HandleBindSight(bool apply, bool /*Real*/)
 {
     Unit* caster = GetCaster();
+
     if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    Camera& camera = ((Player*)caster)->GetCamera();
     if (apply)
-        camera.SetView(GetTarget());
+        ((Player*)caster)->SetViewPoint(GetTarget());
     else
-        camera.ResetView();
+        ((Player*)caster)->SetViewPoint(NULL);
 }
 
 void Aura::HandleFarSight(bool apply, bool /*Real*/)
@@ -3948,11 +4846,10 @@ void Aura::HandleFarSight(bool apply, bool /*Real*/)
     if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    Camera& camera = ((Player*)caster)->GetCamera();
     if (apply)
-        camera.SetView(GetTarget());
+        ((Player*)caster)->SetViewPoint(GetTarget());
     else
-        camera.ResetView();
+        ((Player*)caster)->SetViewPoint(NULL);
 }
 
 void Aura::HandleAuraTrackCreatures(bool apply, bool /*Real*/)
@@ -3985,10 +4882,10 @@ void Aura::HandleAuraTrackResources(bool apply, bool /*Real*/)
 
 void Aura::HandleAuraTrackStealthed(bool apply, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId()!=TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId()!=TYPEID_PLAYER)
         return;
 
-    if(apply)
+    if (apply)
         GetTarget()->RemoveNoStackAurasDueToAuraHolder(GetHolder());
 
     GetTarget()->ApplyModByteFlag(PLAYER_FIELD_BYTES, 0, PLAYER_FIELD_BYTE_TRACK_STEALTHED, apply);
@@ -4016,9 +4913,8 @@ void Aura::HandleModPossess(bool apply, bool Real)
         return;
 
     Player* p_caster = (Player*)caster;
-    Camera& camera = p_caster->GetCamera();
 
-    if( apply )
+    if (apply)
     {
         target->addUnitState(UNIT_STAT_CONTROLLED);
 
@@ -4028,7 +4924,7 @@ void Aura::HandleModPossess(bool apply, bool Real)
 
         // target should became visible at SetView call(if not visible before):
         // otherwise client\p_caster will ignore packets from the target(SetClientControl for example)
-        camera.SetView(target);
+        p_caster->SetViewPoint(target);
 
         p_caster->SetCharm(target);
         p_caster->SetClientControl(target, 1);
@@ -4038,20 +4934,20 @@ void Aura::HandleModPossess(bool apply, bool Real)
         target->DeleteThreatList();
         target->getHostileRefManager().deleteReferences();
 
-        if(CharmInfo *charmInfo = target->InitCharmInfo(target))
+        if (CharmInfo *charmInfo = target->InitCharmInfo(target))
         {
+            charmInfo->SetState(CHARM_STATE_REACT,REACT_PASSIVE);
+            charmInfo->SetState(CHARM_STATE_COMMAND,COMMAND_STAY);
             charmInfo->InitPossessCreateSpells();
-            charmInfo->SetReactState(REACT_PASSIVE);
-            charmInfo->SetCommandState(COMMAND_STAY);
         }
 
         p_caster->PossessSpellInitialize();
 
-        if(target->GetTypeId() == TYPEID_UNIT)
+        if (target->GetTypeId() == TYPEID_UNIT)
         {
             ((Creature*)target)->AIM_Initialize();
         }
-        else if(target->GetTypeId() == TYPEID_PLAYER)
+        else if (target->GetTypeId() == TYPEID_PLAYER && !target->GetVehicle())
         {
             ((Player*)target)->SetClientControl(target, 0);
         }
@@ -4062,16 +4958,16 @@ void Aura::HandleModPossess(bool apply, bool Real)
         p_caster->SetCharm(NULL);
 
         p_caster->SetClientControl(target, 0);
-        p_caster->SetMover(NULL);
+        p_caster->SetMover(p_caster);
 
         // there is a possibility that target became invisible for client\p_caster at ResetView call:
         // it must be called after movement control unapplying, not before! the reason is same as at aura applying
-        camera.ResetView();
+        p_caster->SetViewPoint(NULL);
 
         p_caster->RemovePetActionBar();
 
         // on delete only do caster related effects
-        if(m_removeMode == AURA_REMOVE_BY_DELETE)
+        if (m_removeMode == AURA_REMOVE_BY_DELETE)
             return;
 
         target->clearUnitState(UNIT_STAT_CONTROLLED);
@@ -4084,18 +4980,18 @@ void Aura::HandleModPossess(bool apply, bool Real)
 
         target->SetCharmerGuid(ObjectGuid());
 
-        if(target->GetTypeId() == TYPEID_PLAYER)
+        if (target->GetTypeId() == TYPEID_PLAYER && !target->GetVehicle())
         {
             ((Player*)target)->setFactionForRace(target->getRace());
             ((Player*)target)->SetClientControl(target, 1);
         }
-        else if(target->GetTypeId() == TYPEID_UNIT)
+        else if (target->GetTypeId() == TYPEID_UNIT)
         {
             CreatureInfo const *cinfo = ((Creature*)target)->GetCreatureInfo();
-            target->setFaction(cinfo->faction_A);
+            target->setFaction(cinfo->FactionAlliance);
         }
 
-        if(target->GetTypeId() == TYPEID_UNIT)
+        if (target->GetTypeId() == TYPEID_UNIT)
         {
             ((Creature*)target)->AIM_Initialize();
             target->AttackedBy(caster);
@@ -4117,9 +5013,7 @@ void Aura::HandleModPossessPet(bool apply, bool Real)
         return;
 
     Pet* pet = (Pet*)target;
-
     Player* p_caster = (Player*)caster;
-    Camera& camera = p_caster->GetCamera();
 
     if (apply)
     {
@@ -4127,30 +5021,29 @@ void Aura::HandleModPossessPet(bool apply, bool Real)
 
         // target should became visible at SetView call(if not visible before):
         // otherwise client\p_caster will ignore packets from the target(SetClientControl for example)
-        camera.SetView(pet);
+        p_caster->SetViewPoint(pet);
 
         p_caster->SetCharm(pet);
         p_caster->SetClientControl(pet, 1);
-        ((Player*)caster)->SetMover(pet);
+        p_caster->SetMover(pet);
 
         pet->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED);
 
         pet->StopMoving();
-        pet->GetMotionMaster()->Clear(false);
         pet->GetMotionMaster()->MoveIdle();
     }
     else
     {
         p_caster->SetCharm(NULL);
         p_caster->SetClientControl(pet, 0);
-        p_caster->SetMover(NULL);
+        p_caster->SetMover(p_caster);
 
         // there is a possibility that target became invisible for client\p_caster at ResetView call:
         // it must be called after movement control unapplying, not before! the reason is same as at aura applying
-        camera.ResetView();
+        p_caster->SetViewPoint(NULL);
 
         // on delete only do caster related effects
-        if(m_removeMode == AURA_REMOVE_BY_DELETE)
+        if (m_removeMode == AURA_REMOVE_BY_DELETE)
             return;
 
         pet->clearUnitState(UNIT_STAT_CONTROLLED);
@@ -4166,7 +5059,7 @@ void Aura::HandleModPossessPet(bool apply, bool Real)
         }
         else
         {
-            pet->GetMotionMaster()->MoveFollow(caster, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
+            pet->GetMotionMaster()->MoveTargetedHome();
         }
     }
 }
@@ -4196,7 +5089,7 @@ void Aura::HandleModCharm(bool apply, bool Real)
     if(!caster)
         return;
 
-    if( apply )
+    if ( apply )
     {
         // is it really need after spell check checks?
         target->RemoveSpellsCausingAura(SPELL_AURA_MOD_CHARM, GetHolder());
@@ -4211,25 +5104,25 @@ void Aura::HandleModCharm(bool apply, bool Real)
         target->DeleteThreatList();
         target->getHostileRefManager().deleteReferences();
 
-        if(target->GetTypeId() == TYPEID_UNIT)
+        if (target->GetTypeId() == TYPEID_UNIT)
         {
             ((Creature*)target)->AIM_Initialize();
             CharmInfo *charmInfo = target->InitCharmInfo(target);
+            charmInfo->SetState(CHARM_STATE_REACT,REACT_DEFENSIVE);
             charmInfo->InitCharmCreateSpells();
-            charmInfo->SetReactState( REACT_DEFENSIVE );
 
-            if(caster->GetTypeId() == TYPEID_PLAYER && caster->getClass() == CLASS_WARLOCK)
+            if (caster->GetTypeId() == TYPEID_PLAYER && caster->getClass() == CLASS_WARLOCK)
             {
                 CreatureInfo const *cinfo = ((Creature*)target)->GetCreatureInfo();
-                if(cinfo && cinfo->type == CREATURE_TYPE_DEMON)
+                if (cinfo && cinfo->CreatureType == CREATURE_TYPE_DEMON)
                 {
                     // creature with pet number expected have class set
-                    if(target->GetByteValue(UNIT_FIELD_BYTES_0, 1)==0)
+                    if (target->GetByteValue(UNIT_FIELD_BYTES_0, 1)==0)
                     {
-                        if(cinfo->unit_class==0)
-                            sLog.outErrorDb("Creature (Entry: %u) have unit_class = 0 but used in charmed spell, that will be result client crash.",cinfo->Entry);
+                        if (cinfo->UnitClass == 0)
+                            sLog.outErrorDb("Creature (Entry: %u) have unit_class = 0 but used in charmed spell, that will be result client crash.", cinfo->Entry);
                         else
-                            sLog.outError("Creature (Entry: %u) have unit_class = %u but at charming have class 0!!! that will be result client crash.",cinfo->Entry,cinfo->unit_class);
+                            sLog.outError("Creature (Entry: %u) have unit_class = %u but at charming have class 0!!! that will be result client crash.", cinfo->Entry, cinfo->UnitClass);
 
                         target->SetByteValue(UNIT_FIELD_BYTES_0, 1, CLASS_MAGE);
                     }
@@ -4242,14 +5135,14 @@ void Aura::HandleModCharm(bool apply, bool Real)
             }
         }
 
-        if(caster->GetTypeId() == TYPEID_PLAYER)
+        if (caster->GetTypeId() == TYPEID_PLAYER)
             ((Player*)caster)->CharmSpellInitialize();
     }
     else
     {
         target->SetCharmerGuid(ObjectGuid());
 
-        if(target->GetTypeId() == TYPEID_PLAYER)
+        if (target->GetTypeId() == TYPEID_PLAYER)
             ((Player*)target)->setFactionForRace(target->getRace());
         else
         {
@@ -4258,21 +5151,21 @@ void Aura::HandleModCharm(bool apply, bool Real)
             // restore faction
             if(((Creature*)target)->IsPet())
             {
-                if(Unit* owner = target->GetOwner())
+                if (Unit* owner = ((Pet*)target)->GetOwner())
                     target->setFaction(owner->getFaction());
-                else if(cinfo)
-                    target->setFaction(cinfo->faction_A);
+                else if (cinfo)
+                    target->setFaction(cinfo->FactionAlliance);
             }
-            else if(cinfo)                              // normal creature
-                target->setFaction(cinfo->faction_A);
+            else if (cinfo)                              // normal creature
+                target->setFaction(cinfo->FactionAlliance);
 
             // restore UNIT_FIELD_BYTES_0
-            if(cinfo && caster->GetTypeId() == TYPEID_PLAYER && caster->getClass() == CLASS_WARLOCK && cinfo->type == CREATURE_TYPE_DEMON)
+            if (cinfo && caster->GetTypeId() == TYPEID_PLAYER && caster->getClass() == CLASS_WARLOCK && cinfo->CreatureType == CREATURE_TYPE_DEMON)
             {
                 // DB must have proper class set in field at loading, not req. restore, including workaround case at apply
                 // m_target->SetByteValue(UNIT_FIELD_BYTES_0, 1, cinfo->unit_class);
 
-                if(target->GetCharmInfo())
+                if (target->GetCharmInfo())
                     target->GetCharmInfo()->SetPetNumber(0, true);
                 else
                     sLog.outError("Aura::HandleModCharm: target (GUID: %u TypeId: %u) has a charm aura but no charm info!", target->GetGUIDLow(), target->GetTypeId());
@@ -4281,14 +5174,14 @@ void Aura::HandleModCharm(bool apply, bool Real)
 
         caster->SetCharm(NULL);
 
-        if(caster->GetTypeId() == TYPEID_PLAYER)
+        if (caster->GetTypeId() == TYPEID_PLAYER)
             ((Player*)caster)->RemovePetActionBar();
 
         target->CombatStop(true);
         target->DeleteThreatList();
         target->getHostileRefManager().deleteReferences();
 
-        if(target->GetTypeId() == TYPEID_UNIT)
+        if (target->GetTypeId() == TYPEID_UNIT)
         {
             ((Creature*)target)->AIM_Initialize();
             target->AttackedBy(caster);
@@ -4301,6 +5194,9 @@ void Aura::HandleModConfuse(bool apply, bool Real)
     if(!Real)
         return;
 
+    if(!apply && GetTarget()->HasAuraType(GetModifier()->m_auraname))
+        return;
+
     GetTarget()->SetConfused(apply, GetCasterGuid(), GetId());
 }
 
@@ -4309,6 +5205,9 @@ void Aura::HandleModFear(bool apply, bool Real)
     if (!Real)
         return;
 
+    if(!apply && GetTarget()->HasAuraType(GetModifier()->m_auraname))
+        return;
+
     GetTarget()->SetFeared(apply, GetCasterGuid(), GetId());
 }
 
@@ -4317,6 +5216,9 @@ void Aura::HandleFeignDeath(bool apply, bool Real)
     if(!Real)
         return;
 
+    if(!apply && GetTarget()->HasAuraType(GetModifier()->m_auraname))
+        return;
+
     GetTarget()->SetFeignDeath(apply, GetCasterGuid(), GetId());
 }
 
@@ -4370,7 +5272,9 @@ void Aura::HandleAuraModDisarm(bool apply, bool Real)
         return;
 
     if (apply)
-        target->SetAttackTime(attack_type, BASE_ATTACK_TIME);
+    {
+        target->SetAttackTime(BASE_ATTACK,BASE_ATTACK_TIME);
+    }
     else
         ((Player *)target)->SetRegularAttackTime();
 
@@ -4379,10 +5283,10 @@ void Aura::HandleAuraModDisarm(bool apply, bool Real)
 
 void Aura::HandleAuraModStun(bool apply, bool Real)
 {
-    if(!Real)
+    if (!Real)
         return;
 
-    Unit *target = GetTarget();
+    Unit* target = GetTarget();
 
     if (apply)
     {
@@ -4390,40 +5294,55 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
         if (GetSpellSchoolMask(GetSpellProto()) & SPELL_SCHOOL_MASK_FROST)
             target->ModifyAuraState(AURA_STATE_FROZEN, apply);
 
-        target->addUnitState(UNIT_STAT_STUNNED);
-        target->SetTargetGuid(ObjectGuid());
-
-        target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
         target->CastStop(target->GetObjectGuid() == GetCasterGuid() ? GetId() : 0);
+        target->GetUnitStateMgr().PushAction(UNIT_ACTION_STUN);
 
-        // Creature specific
-        if(target->GetTypeId() != TYPEID_PLAYER)
-            target->StopMoving();
-        else
+        switch (GetId())
         {
-            ((Player*)target)->m_movementInfo.SetMovementFlags(MOVEFLAG_NONE);
-            target->SetStandState(UNIT_STAND_STATE_STAND);// in 1.5 client
-        }
-
-        WorldPacket data(SMSG_FORCE_MOVE_ROOT, 8);
-        data << target->GetPackGUID();
-        data << uint32(0);
-        target->SendMessageToSet(&data, true);
+            case 6358: // Seduction
+            {
+                if (Unit* caster = GetCaster())
+                {
+                    if (caster->GetOwner() && caster->GetOwner()->HasAura(56250)) // Glyph of Seduction
+                    {
+                        target->RemoveSpellsCausingAura(SPELL_AURA_PERIODIC_DAMAGE);
+                        target->RemoveSpellsCausingAura(SPELL_AURA_PERIODIC_DAMAGE_PERCENT);
+                    }
+                }
+                break;
+            }
+            case 39837: // Impaling Spine
+            {
+                // Summon the Naj'entus Spine GameObject on target if spell is Impaling Spine
+                GameObject* pObj = new GameObject;
+                if (pObj->Create(target->GetMap()->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), 185584, target->GetMap(), target->GetPhaseMask(),
+                    target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation()))
+                {
+                    pObj->SetRespawnTime(GetAuraDuration() / IN_MILLISECONDS);
+                    pObj->SetSpellId(GetId());
+                    target->AddGameObject(pObj);
+                    target->GetMap()->Add(pObj);
+                }
+                else
+                    delete pObj;
 
-        // Summon the Naj'entus Spine GameObject on target if spell is Impaling Spine
-        if(GetId() == 39837)
-        {
-            GameObject* pObj = new GameObject;
-            if(pObj->Create(target->GetMap()->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), 185584, target->GetMap(), target->GetPhaseMask(),
-                target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation()))
+                break;
+            }
+            case 44572: // Deep Freeze damage part
             {
-                pObj->SetRespawnTime(GetAuraDuration()/IN_MILLISECONDS);
-                pObj->SetSpellId(GetId());
-                target->AddGameObject(pObj);
-                target->GetMap()->Add(pObj);
+                if (target->IsCharmerOrOwnerPlayerOrPlayerItself() || target->IsVehicle())
+                    return;
+
+                if (target->IsImmuneToSpellEffect(GetSpellProto(), EFFECT_INDEX_0))
+                {
+                    Unit* caster = GetCaster();
+                    if (!caster)
+                        return;
+
+                    caster->CastSpell(target, 71757, true);
+                }
+                break;
             }
-            else
-                delete pObj;
         }
     }
     else
@@ -4432,53 +5351,56 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
         if (GetSpellSchoolMask(GetSpellProto()) & SPELL_SCHOOL_MASK_FROST)
         {
             bool found_another = false;
-            for(AuraType const* itr = &frozenAuraTypes[0]; *itr != SPELL_AURA_NONE; ++itr)
+            for (AuraType const* itr = &frozenAuraTypes[0]; *itr != SPELL_AURA_NONE && !found_another; ++itr)
             {
                 Unit::AuraList const& auras = target->GetAurasByType(*itr);
-                for(Unit::AuraList::const_iterator i = auras.begin(); i != auras.end(); ++i)
+                for (Unit::AuraList::const_iterator i = auras.begin(); i != auras.end(); ++i)
                 {
-                    if( GetSpellSchoolMask((*i)->GetSpellProto()) & SPELL_SCHOOL_MASK_FROST)
+                    if (GetSpellSchoolMask((*i)->GetSpellProto()) & SPELL_SCHOOL_MASK_FROST)
                     {
                         found_another = true;
                         break;
                     }
                 }
-                if(found_another)
-                    break;
             }
 
-            if(!found_another)
+            if (!found_another)
                 target->ModifyAuraState(AURA_STATE_FROZEN, apply);
         }
 
         // Real remove called after current aura remove from lists, check if other similar auras active
-        if(target->HasAuraType(SPELL_AURA_MOD_STUN))
+        if (target->HasAuraType(SPELL_AURA_MOD_STUN))
             return;
 
-        target->clearUnitState(UNIT_STAT_STUNNED);
-        target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
+        target->GetUnitStateMgr().DropAction(UNIT_ACTION_STUN);
 
-        if(!target->hasUnitState(UNIT_STAT_ROOT))         // prevent allow move if have also root effect
+        if (!target->hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_ON_VEHICLE))       // prevent allow move if have also root effect
         {
-            if(target->getVictim() && target->isAlive())
-                target->SetTargetGuid(target->getVictim()->GetObjectGuid());
+            if (target->isAlive())
+            {
+                if (Unit* pVictim = target->getVictim())
+                    target->SetTargetGuid(pVictim->GetObjectGuid());
+            }
 
-            WorldPacket data(SMSG_FORCE_MOVE_UNROOT, 8+4);
-            data << target->GetPackGUID();
-            data << uint32(0);
-            target->SendMessageToSet(&data, true);
+            target->SetRoot(false);
+        }
+
+        if (GetId() == 6358) // Seduction
+        {
+            if (Unit* caster = GetCaster())
+                caster->InterruptSpell(CURRENT_CHANNELED_SPELL, false);
+            return;
         }
 
         // Wyvern Sting
-        if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_HUNTER && GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000100000000000))
+        if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_HUNTER && GetSpellProto()->GetSpellFamilyFlags().test<CF_HUNTER_WYVERN_STING2>())
         {
             Unit* caster = GetCaster();
-            if( !caster || caster->GetTypeId()!=TYPEID_PLAYER )
+            if (!caster || caster->GetTypeId() != TYPEID_PLAYER)
                 return;
 
-            uint32 spell_id = 0;
-
-            switch(GetId())
+            uint32 spell_id;
+            switch (GetId())
             {
                 case 19386: spell_id = 24131; break;
                 case 24132: spell_id = 24134; break;
@@ -4487,16 +5409,11 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
                 case 49011: spell_id = 49009; break;
                 case 49012: spell_id = 49010; break;
                 default:
-                    sLog.outError("Spell selection called for unexpected original spell %u, new spell for this spell family?",GetId());
+                    sLog.outError("Spell selection called for unexpected original spell %u, new spell for this spell family?", GetId());
                     return;
             }
 
-            SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell_id);
-
-            if(!spellInfo)
-                return;
-
-            caster->CastSpell(target,spellInfo,true,NULL,this);
+            caster->CastSpell(target, spell_id, true, NULL, this);
             return;
         }
     }
@@ -4527,20 +5444,20 @@ void Aura::HandleModStealth(bool apply, bool Real)
             }
 
             // apply full stealth period bonuses only at first stealth aura in stack
-            if(target->GetAurasByType(SPELL_AURA_MOD_STEALTH).size()<=1)
+            if (target->GetAurasByType(SPELL_AURA_MOD_STEALTH).size()<=2) // Vanish also triggering Stealth, but all ok, no double auras here possible
             {
                 Unit::AuraList const& mDummyAuras = target->GetAurasByType(SPELL_AURA_DUMMY);
                 for(Unit::AuraList::const_iterator i = mDummyAuras.begin();i != mDummyAuras.end(); ++i)
                 {
                     // Master of Subtlety
-                    if ((*i)->GetSpellProto()->SpellIconID == 2114)
+                    if ((*i)->GetSpellProto()->GetSpellIconID() == 2114 && GetSpellProto()->SpellFamilyName == SPELLFAMILY_ROGUE)
                     {
                         target->RemoveAurasDueToSpell(31666);
                         int32 bp = (*i)->GetModifier()->m_amount;
                         target->CastCustomSpell(target,31665,&bp,NULL,NULL,true);
                     }
                     // Overkill
-                    else if ((*i)->GetId() == 58426 && GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000400000))
+                    else if ((*i)->GetId() == 58426 && GetSpellProto()->GetSpellFamilyFlags().test<CF_ROGUE_STEALTH>())
                     {
                         target->CastSpell(target, 58427, true);
                     }
@@ -4576,12 +5493,12 @@ void Aura::HandleModStealth(bool apply, bool Real)
             for(Unit::AuraList::const_iterator i = mDummyAuras.begin();i != mDummyAuras.end(); ++i)
             {
                 // Master of Subtlety
-                if ((*i)->GetSpellProto()->SpellIconID == 2114)
+                if ((*i)->GetSpellProto()->GetSpellIconID() == 2114)
                     target->CastSpell(target, 31666, true);
                 // Overkill
-                else if ((*i)->GetId() == 58426 && GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000400000))
+                else if ((*i)->GetId() == 58426)//Overkill we should remove anyway
                 {
-                    if (SpellAuraHolder* holder = target->GetSpellAuraHolder(58427))
+                    if (SpellAuraHolderPtr holder = target->GetSpellAuraHolder(58427))
                     {
                         holder->SetAuraMaxDuration(20*IN_MILLISECONDS);
                         holder->RefreshHolder();
@@ -4594,7 +5511,7 @@ void Aura::HandleModStealth(bool apply, bool Real)
 
 void Aura::HandleInvisibility(bool apply, bool Real)
 {
-    Unit *target = GetTarget();
+    Unit* target = GetTarget();
 
     if (apply)
     {
@@ -4602,11 +5519,16 @@ void Aura::HandleInvisibility(bool apply, bool Real)
 
         target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
 
-        if (Real && target->GetTypeId()==TYPEID_PLAYER)
+        if (Real && target->GetTypeId() == TYPEID_PLAYER)
         {
-            // apply glow vision
-            target->SetByteFlag(PLAYER_FIELD_BYTES2, 3, PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW);
-
+            Player* pPlayer = (Player*)target;
+            // do not apply during arena preparation
+            // glow vision shouldn't be active during arena preparation
+            if (!pPlayer->GetMap()->IsBattleArena() || (!pPlayer->GetBattleGround() || !(pPlayer->GetBattleGround()->GetStatus() == STATUS_WAIT_JOIN)))
+            {
+                // apply glow vision
+                target->SetByteFlag(PLAYER_FIELD_BYTES2, 3, PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW);
+            }
         }
 
         // apply only if not in GM invisibility and not stealth
@@ -4622,7 +5544,7 @@ void Aura::HandleInvisibility(bool apply, bool Real)
         // recalculate value at modifier remove (current aura already removed)
         target->m_invisibilityMask = 0;
         Unit::AuraList const& auras = target->GetAurasByType(SPELL_AURA_MOD_INVISIBILITY);
-        for(Unit::AuraList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
+        for (Unit::AuraList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
             target->m_invisibilityMask |= (1 << (*itr)->GetModifier()->m_miscvalue);
 
         // only at real aura remove and if not have different invisibility auras.
@@ -4650,7 +5572,7 @@ void Aura::HandleInvisibilityDetect(bool apply, bool Real)
 {
     Unit *target = GetTarget();
 
-    if(apply)
+    if (apply)
     {
         target->m_detectInvisibilityMask |= (1 << m_modifier.m_miscvalue);
     }
@@ -4662,8 +5584,8 @@ void Aura::HandleInvisibilityDetect(bool apply, bool Real)
         for(Unit::AuraList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
             target->m_detectInvisibilityMask |= (1 << (*itr)->GetModifier()->m_miscvalue);
     }
-    if(Real && target->GetTypeId()==TYPEID_PLAYER)
-        ((Player*)target)->GetCamera().UpdateVisibilityForOwner();
+    if (Real && target->GetTypeId()==TYPEID_PLAYER)
+        ((Player*)target)->GetCamera()->UpdateVisibilityForOwner();
 }
 
 void Aura::HandleDetectAmore(bool apply, bool /*real*/)
@@ -4685,25 +5607,8 @@ void Aura::HandleAuraModRoot(bool apply, bool Real)
         if (GetSpellSchoolMask(GetSpellProto()) & SPELL_SCHOOL_MASK_FROST)
             target->ModifyAuraState(AURA_STATE_FROZEN, apply);
 
-        target->addUnitState(UNIT_STAT_ROOT);
-        target->SetTargetGuid(ObjectGuid());
-
-        //Save last orientation
-        if( target->getVictim() )
-            target->SetOrientation(target->GetAngle(target->getVictim()));
+        target->GetUnitStateMgr().PushAction(UNIT_ACTION_ROOT);
 
-        if(target->GetTypeId() == TYPEID_PLAYER)
-        {
-            WorldPacket data(SMSG_FORCE_MOVE_ROOT, 10);
-            data << target->GetPackGUID();
-            data << (uint32)2;
-            target->SendMessageToSet(&data, true);
-
-            //Clear unit movement flags
-            ((Player*)target)->m_movementInfo.SetMovementFlags(MOVEFLAG_NONE);
-        }
-        else
-            target->StopMoving();
     }
     else
     {
@@ -4716,13 +5621,13 @@ void Aura::HandleAuraModRoot(bool apply, bool Real)
                 Unit::AuraList const& auras = target->GetAurasByType(*itr);
                 for(Unit::AuraList::const_iterator i = auras.begin(); i != auras.end(); ++i)
                 {
-                    if( GetSpellSchoolMask((*i)->GetSpellProto()) & SPELL_SCHOOL_MASK_FROST)
+                    if ( GetSpellSchoolMask((*i)->GetSpellProto()) & SPELL_SCHOOL_MASK_FROST)
                     {
                         found_another = true;
                         break;
                     }
                 }
-                if(found_another)
+                if (found_another)
                     break;
             }
 
@@ -4731,24 +5636,13 @@ void Aura::HandleAuraModRoot(bool apply, bool Real)
         }
 
         // Real remove called after current aura remove from lists, check if other similar auras active
-        if(target->HasAuraType(SPELL_AURA_MOD_ROOT))
+        if (target->HasAuraType(SPELL_AURA_MOD_ROOT))
             return;
 
-        target->clearUnitState(UNIT_STAT_ROOT);
+        target->GetUnitStateMgr().DropAction(UNIT_ACTION_ROOT);
 
-        if(!target->hasUnitState(UNIT_STAT_STUNNED))      // prevent allow move if have also stun effect
-        {
-            if(target->getVictim() && target->isAlive())
-                target->SetTargetGuid(target->getVictim()->GetObjectGuid());
-
-            if(target->GetTypeId() == TYPEID_PLAYER)
-            {
-                WorldPacket data(SMSG_FORCE_MOVE_UNROOT, 10);
-                data << target->GetPackGUID();
-                data << (uint32)2;
-                target->SendMessageToSet(&data, true);
-            }
-        }
+        if (GetSpellProto()->Id == 70980)                   // Web Wrap (Icecrown Citadel, trash mob Nerub'ar Broodkeeper)
+            target->CastSpell(target, 71010, true);
     }
 }
 
@@ -4760,23 +5654,22 @@ void Aura::HandleAuraModSilence(bool apply, bool Real)
 
     Unit *target = GetTarget();
 
-    if(apply)
+    if (apply)
     {
         target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED);
         // Stop cast only spells vs PreventionType == SPELL_PREVENTION_TYPE_SILENCE
         for (uint32 i = CURRENT_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
             if (Spell* spell = target->GetCurrentSpell(CurrentSpellTypes(i)))
-                if(spell->m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE)
+                if (spell->m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE)
                     // Stop spells on prepare or casting state
                     target->InterruptSpell(CurrentSpellTypes(i), false);
     }
     else
     {
         // Real remove called after current aura remove from lists, check if other similar auras active
-        if(target->HasAuraType(SPELL_AURA_MOD_SILENCE))
-            return;
-
-        target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED);
+        if (!target->HasAuraType(SPELL_AURA_MOD_SILENCE) &&
+            !target->HasAuraType(SPELL_AURA_MOD_PACIFY_SILENCE))
+            target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED);
     }
 }
 
@@ -4786,7 +5679,7 @@ void Aura::HandleModThreat(bool apply, bool Real)
     if (!Real)
         return;
 
-    Unit *target = GetTarget();
+    Unit* target = GetTarget();
 
     if (!target->isAlive())
         return;
@@ -4811,9 +5704,13 @@ void Aura::HandleModThreat(bool apply, bool Real)
         m_modifier.m_amount += multiplier * level_diff;
 
     if (target->GetTypeId() == TYPEID_PLAYER)
-        for(int8 x=0;x < MAX_SPELL_SCHOOL;x++)
-            if (m_modifier.m_miscvalue & int32(1<<x))
+    {
+        for (int8 x = 0; x < MAX_SPELL_SCHOOL; ++x)
+        {
+            if (m_modifier.m_miscvalue & int32(1 << x))
                 ApplyPercentModFloatVar(target->m_threatModifier[x], float(m_modifier.m_amount), apply);
+        }
+    }
 }
 
 void Aura::HandleAuraModTotalThreat(bool apply, bool Real)
@@ -4843,9 +5740,9 @@ void Aura::HandleModTaunt(bool apply, bool Real)
     if (!Real)
         return;
 
-    Unit *target = GetTarget();
+    Unit* target = GetTarget();
 
-    if (!target->isAlive() || !target->CanHaveThreatList())
+    if (!target || !target->isAlive() || target->GetTypeId() == TYPEID_PLAYER)
         return;
 
     Unit* caster = GetCaster();
@@ -4854,7 +5751,7 @@ void Aura::HandleModTaunt(bool apply, bool Real)
         return;
 
     if (apply)
-        target->TauntApply(caster);
+        target->TauntApply(caster, false);
     else
     {
         // When taunt aura fades out, mob will switch to previous target if current has less than 1.1 * secondthreat
@@ -4884,63 +5781,63 @@ void Aura::HandleAuraFakeInebriation(bool apply, bool Real)
 /*********************************************************/
 /***                  MODIFY SPEED                     ***/
 /*********************************************************/
-void Aura::HandleAuraModIncreaseSpeed(bool /*apply*/, bool Real)
+
+void Aura::HandleAuraModIncreaseSpeed(bool apply, bool Real)
 {
     // all applied/removed only at real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
-    GetTarget()->UpdateSpeed(MOVE_RUN, true);
+    Unit* target = GetTarget();
+
+    target->UpdateSpeed(MOVE_RUN, true);
+
+    if (apply && GetSpellProto()->Id == 58875)
+        target->CastSpell(target, 58876, true);
 }
 
 void Aura::HandleAuraModIncreaseMountedSpeed(bool apply, bool Real)
 {
     // all applied/removed only at real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
-    Unit *target = GetTarget();
+    Unit* target = GetTarget();
 
     target->UpdateSpeed(MOVE_RUN, true);
 
     // Festive Holiday Mount
-    if (apply && GetSpellProto()->SpellIconID != 1794 && target->HasAura(62061))
-        // Reindeer Transformation
-        target->CastSpell(target, 25860, true, NULL, this);
+    if (!apply && target->HasAura(62061, EFFECT_INDEX_0))
+        target->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
 }
 
 void Aura::HandleAuraModIncreaseFlightSpeed(bool apply, bool Real)
 {
     // all applied/removed only at real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
-    Unit *target = GetTarget();
+    Unit* target = GetTarget();
 
     // Enable Fly mode for flying mounts
     if (m_modifier.m_auraname == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED)
     {
-        WorldPacket data;
-        if(apply)
-            data.Initialize(SMSG_MOVE_SET_CAN_FLY, 12);
-        else
-            data.Initialize(SMSG_MOVE_UNSET_CAN_FLY, 12);
+        WorldPacket data(apply ? SMSG_MOVE_SET_CAN_FLY : SMSG_MOVE_UNSET_CAN_FLY, 8 + 4);
         data << target->GetPackGUID();
         data << uint32(0);                                      // unknown
         target->SendMessageToSet(&data, true);
 
-        //Players on flying mounts must be immune to polymorph
-        if (target->GetTypeId()==TYPEID_PLAYER)
-            target->ApplySpellImmune(GetId(),IMMUNITY_MECHANIC,MECHANIC_POLYMORPH,apply);
+        // Players on flying mounts must be immune to polymorph
+        if (target->GetTypeId() == TYPEID_PLAYER)
+            target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_POLYMORPH, apply);
 
         // Dragonmaw Illusion (overwrite mount model, mounted aura already applied)
         if (apply && target->HasAura(42016, EFFECT_INDEX_0) && target->GetMountID())
-            target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314);
+            target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, 16314);
 
         // Festive Holiday Mount
-        if (apply && GetSpellProto()->SpellIconID != 1794 && target->HasAura(62061))
-            // Reindeer Transformation
-            target->CastSpell(target, 25860, true, NULL, this);
+        if (!apply && target->HasAura(62061, EFFECT_INDEX_0))
+            target->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
     }
 
     // Swift Flight Form check for higher speed flying mounts
@@ -4954,7 +5851,7 @@ void Aura::HandleAuraModIncreaseFlightSpeed(bool apply, bool Real)
                 SpellEntry const *spellInfo = sSpellStore.LookupEntry(iter->first);
                 for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
                 {
-                    if(spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED)
+                    if (spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED)
                     {
                         int32 mountSpeed = spellInfo->CalculateSimpleValue(SpellEffectIndex(i));
                         if (mountSpeed > m_modifier.m_amount)
@@ -5026,10 +5923,6 @@ void Aura::HandleAuraModUseNormalSpeed(bool /*apply*/, bool Real)
 void Aura::HandleModMechanicImmunity(bool apply, bool /*Real*/)
 {
     uint32 misc  = m_modifier.m_miscvalue;
-    // Forbearance
-    // in DBC wrong mechanic immune since 3.0.x
-    if (GetId() == 25771)
-        misc = MECHANIC_IMMUNE_SHIELD;
 
     Unit *target = GetTarget();
 
@@ -5046,8 +5939,19 @@ void Aura::HandleModMechanicImmunity(bool apply, bool /*Real*/)
 
     target->ApplySpellImmune(GetId(),IMMUNITY_MECHANIC,misc,apply);
 
+    // Demonic Circle
+    if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARLOCK && GetSpellProto()->GetSpellIconID() == 3221)
+    {
+        if (target->GetTypeId() != TYPEID_PLAYER)
+            return;
+
+        if (apply)
+            if (GameObject* obj = target->GetGameObject(48018))
+                ((Player*)target)->TeleportTo(obj->GetMapId(),obj->GetPositionX(),obj->GetPositionY(),obj->GetPositionZ(),obj->GetOrientation(), TELE_TO_NOT_LEAVE_COMBAT);
+    }
+
     // Bestial Wrath
-    if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_HUNTER && GetSpellProto()->SpellIconID == 1680)
+    if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_HUNTER && GetSpellProto()->GetSpellIconID() == 1680)
     {
         // The Beast Within cast on owner if talent present
         if (Unit* owner = target->GetOwner())
@@ -5056,7 +5960,7 @@ void Aura::HandleModMechanicImmunity(bool apply, bool /*Real*/)
             Unit::AuraList const& dummyAuras = owner->GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
             for(Unit::AuraList::const_iterator i = dummyAuras.begin(); i != dummyAuras.end(); ++i)
             {
-                if ((*i)->GetSpellProto()->SpellIconID == 2229)
+                if ((*i)->GetSpellProto()->GetSpellIconID() == 2229)
                 {
                     if (apply)
                         owner->CastSpell(owner, 34471, true, NULL, this);
@@ -5068,8 +5972,8 @@ void Aura::HandleModMechanicImmunity(bool apply, bool /*Real*/)
         }
     }
     // Heroic Fury (Intercept cooldown remove)
-    else if (apply && GetSpellProto()->Id == 60970 && target->GetTypeId() == TYPEID_PLAYER)
-        ((Player*)target)->RemoveSpellCooldown(20252, true);
+    else if (apply && GetSpellProto()->Id == 60970)
+        target->RemoveSpellCooldown(20252, true);
 }
 
 void Aura::HandleModMechanicImmunityMask(bool apply, bool /*Real*/)
@@ -5088,11 +5992,16 @@ void Aura::HandleAuraModEffectImmunity(bool apply, bool /*Real*/)
     Unit *target = GetTarget();
 
     // when removing flag aura, handle flag drop
-    if( !apply && target->GetTypeId() == TYPEID_PLAYER
+    if ( !apply && target->GetTypeId() == TYPEID_PLAYER
         && (GetSpellProto()->AuraInterruptFlags & AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION) )
     {
-        if( BattleGround *bg = ((Player*)target)->GetBattleGround() )
-            bg->EventPlayerDroppedFlag(((Player*)target));
+        Player* player = (Player*)target;
+        if (BattleGround* bg = player->GetBattleGround())
+            bg->EventPlayerDroppedFlag(player);
+        else if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(player->GetCachedZoneId()))
+            outdoorPvP->HandleDropFlag(player, GetSpellProto()->Id);
+        else if (InstanceData* mapInstance = player->GetInstanceData())
+            mapInstance->OnPlayerDroppedFlag(player, GetId());
     }
 
     target->ApplySpellImmune(GetId(), IMMUNITY_EFFECT, m_modifier.m_miscvalue, apply);
@@ -5102,17 +6011,17 @@ void Aura::HandleAuraModStateImmunity(bool apply, bool Real)
 {
     if (apply && Real && GetSpellProto()->HasAttribute(SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY))
     {
+        Unit::SpellIdSet toRemoveSpellList;
         Unit::AuraList const& auraList = GetTarget()->GetAurasByType(AuraType(m_modifier.m_miscvalue));
-        for(Unit::AuraList::const_iterator itr = auraList.begin(); itr != auraList.end();)
+        for (Unit::AuraList::const_iterator itr = auraList.begin(); itr != auraList.end(); ++itr)
         {
-            if (auraList.front() != this)                   // skip itself aura (it already added)
-            {
-                GetTarget()->RemoveAurasDueToSpell(auraList.front()->GetId());
-                itr = auraList.begin();
-            }
-            else
-                ++itr;
+            if (itr->IsEmpty() || (*itr)() == this)                   // skip itself aura (it already added)
+                continue;
+            toRemoveSpellList.insert(auraList.front()->GetId());
         }
+
+        for (Unit::SpellIdSet::const_iterator i = toRemoveSpellList.begin(); i != toRemoveSpellList.end(); ++i)
+            GetTarget()->RemoveAurasDueToSpell(*i);
     }
 
     GetTarget()->ApplySpellImmune(GetId(), IMMUNITY_STATE, m_modifier.m_miscvalue, apply);
@@ -5124,37 +6033,40 @@ void Aura::HandleAuraModSchoolImmunity(bool apply, bool Real)
     target->ApplySpellImmune(GetId(), IMMUNITY_SCHOOL, m_modifier.m_miscvalue, apply);
 
     // remove all flag auras (they are positive, but they must be removed when you are immune)
-    if (GetSpellProto()->HasAttribute(SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY) && GetSpellProto()->HasAttribute(SPELL_ATTR_EX2_DAMAGE_REDUCED_SHIELD))
+    if (GetSpellProto()->HasAttribute(SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY)
+        && GetSpellProto()->HasAttribute(SPELL_ATTR_EX2_DAMAGE_REDUCED_SHIELD))
         target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
 
     // TODO: optimalize this cycle - use RemoveAurasWithInterruptFlags call or something else
-    if (Real && apply
-        && GetSpellProto()->HasAttribute(SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY)
-        && IsPositiveSpell(GetId()))                        // Only positive immunity removes auras
+    if (Real && apply &&
+        GetSpellProto()->HasAttribute(SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY) &&
+        IsPositiveSpell(GetId()))                       //Only positive immunity removes auras
     {
+        std::set<uint32> toRemoveSpellList;
         uint32 school_mask = m_modifier.m_miscvalue;
         Unit::SpellAuraHolderMap& Auras = target->GetSpellAuraHolderMap();
-        for(Unit::SpellAuraHolderMap::iterator iter = Auras.begin(), next; iter != Auras.end(); iter = next)
+        for (Unit::SpellAuraHolderMap::iterator iter = Auras.begin(); iter != Auras.end(); ++iter)
         {
-            next = iter;
-            ++next;
-            SpellEntry const *spell = iter->second->GetSpellProto();
-            if ((GetSpellSchoolMask(spell) & school_mask)   // Check for school mask
+            if (!iter->second || iter->second->IsDeleted())
+                continue;
+
+            SpellEntry const* spell = iter->second->GetSpellProto();
+
+            if ((GetSpellSchoolMask(spell) & school_mask)//Check for school mask
                 && !spell->HasAttribute(SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY)   //Spells unaffected by invulnerability
-                && !iter->second->IsPositive()              // Don't remove positive spells
-                && spell->Id != GetId() )                   // Don't remove self
+                && !iter->second->IsPositive()                //Don't remove positive spells
+                && spell->Id != GetId())                //Don't remove self
             {
-                target->RemoveAurasDueToSpell(spell->Id);
-                if(Auras.empty())
-                    break;
-                else
-                    next = Auras.begin();
+                toRemoveSpellList.insert(iter->second->GetId());
             }
         }
+        for (std::set<uint32>::iterator i = toRemoveSpellList.begin(); i != toRemoveSpellList.end(); ++i)
+            target->RemoveAurasDueToSpell(*i);
     }
-    if( Real && GetSpellProto()->Mechanic == MECHANIC_BANISH )
+
+    if ( Real && GetSpellProto()->Mechanic == MECHANIC_BANISH )
     {
-        if( apply )
+        if ( apply )
             target->addUnitState(UNIT_STAT_ISOLATED);
         else
             target->clearUnitState(UNIT_STAT_ISOLATED);
@@ -5186,7 +6098,7 @@ void Aura::HandleAuraProcTriggerSpell(bool apply, bool Real)
     {
         // some spell have charges by functionality not have its in spell data
         case 28200:                                         // Ascendance (Talisman of Ascendance trinket)
-            if(apply)
+            if (apply)
                 GetHolder()->SetAuraCharges(6);
             break;
         case 50720:                                         // Vigilance (threat transfering)
@@ -5198,6 +6110,26 @@ void Aura::HandleAuraProcTriggerSpell(bool apply, bool Real)
             else
                 target->getHostileRefManager().ResetThreatRedirection();
             break;
+        case 72059:                                         // Unstable (Kinetic Bomb - Blood Council encounter)
+            if (!apply)
+            {
+                if (target->GetTypeId() == TYPEID_UNIT)
+                    ((Creature*)target)->ForcedDespawn();
+            }
+            break;
+        case 72451:                                         // Mutated Plague (Putricide)
+        case 72463:
+        case 72671:
+        case 72672:
+            if (!apply)
+            {
+                if (Unit *pCaster = GetCaster())
+                {
+                    if (pCaster->isAlive())
+                        target->CastSpell(pCaster, GetModifier()->m_amount, true); // cast healing spell
+                }
+            }
+            break;
         default:
             break;
     }
@@ -5206,7 +6138,7 @@ void Aura::HandleAuraProcTriggerSpell(bool apply, bool Real)
 void Aura::HandleAuraModStalked(bool apply, bool /*Real*/)
 {
     // used by spells: Hunter's Mark, Mind Vision, Syndicate Tracker (MURP) DND
-    if(apply)
+    if (apply)
         GetTarget()->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TRACK_UNIT);
     else
         GetTarget()->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TRACK_UNIT);
@@ -5230,6 +6162,12 @@ void Aura::HandlePeriodicTriggerSpell(bool apply, bool /*Real*/)
                 if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
                     target->CastSpell(target, 32612, true, NULL, this);
 
+                return;
+            case 28522:                                     // Icebolt (Naxxramas: Sapphiron)
+                if (target->HasAura(45776))                 // Should trigger/remove some kind of iceblock
+                    // not sure about ice block spell id
+                    target->RemoveAurasDueToSpell(45776);
+
                 return;
             case 42783:                                     // Wrath of the Astrom...
                 if (m_removeMode == AURA_REMOVE_BY_EXPIRE && GetEffIndex() + 1 < MAX_EFFECT_INDEX)
@@ -5245,18 +6183,121 @@ void Aura::HandlePeriodicTriggerSpell(bool apply, bool /*Real*/)
                 }
 
                 return;
+            case 51121:                                     // Urom Clocking Bomb
+                if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
+                    target->CastSpell(target, 51132, true);
+                return;
             case 51912:                                     // Ultra-Advanced Proto-Typical Shortening Blaster
+            case 53102:                                     // Scepter of Domination
                 if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
                 {
                     if (Unit* pCaster = GetCaster())
                         pCaster->CastSpell(target, GetSpellProto()->EffectTriggerSpell[GetEffIndex()], true, NULL, this);
                 }
 
+                return;
+            case 52658:                                     // Ionar Static Overload Explode (N)
+                if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
+                    target->CastSpell(target, 53337, true);
+
+                return;
+            case 59795:                                     // Ionar Static Overload Explode (H)
+                if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
+                    target->CastSpell(target, 59798, true);
+
+                return;
+            case 63018:                                     // Searing Light (Ulduar: XT-002)
+            case 65121:                                     // Searing Light (h) (Ulduar: XT-002)
+                if (Unit *pCaster = GetCaster())
+                {
+                    if (pCaster->HasAura(GetModifier()->m_amount))
+                        pCaster->CastSpell(target, 64210, true);
+                }
+
+                return;
+            case 63024:                                     // Gravity Bomb (Ulduar: XT-002)
+            case 64234:                                     // Gravity Bomb (h) (Ulduar: XT-002)
+                if (Unit *pCaster = GetCaster())
+                {
+                    uint32 spellId = GetId() == 63024 ? 64203 : 64235;
+                    if (pCaster->HasAura(GetModifier()->m_amount))
+                        pCaster->CastSpell(target, spellId, true);
+                }
+
+                return;
+            case 66083:                                     // Lightning Arrows (Trial of the Champion encounter)
+                if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
+                {
+                    if (Unit* pCaster = GetCaster())
+                        pCaster->CastSpell(pCaster, 66085, true, NULL, this);
+                }
+
+                return;
+            case 70405:                                     // Mutated Transformation (Putricide)
+            case 72508:
+            case 72509:
+            case 72510:
+                if (target->GetTypeId() == TYPEID_UNIT)
+                    ((Creature*)target)->ForcedDespawn();
+                return;
+            case 71441:                                     // Unstable Ooze Explosion (Rotface)
+                target->CastSpell(target, 67375, true);
                 return;
             default:
                 break;
         }
     }
+
+    switch (GetId())
+    {
+        case 70157:                                     // Ice Tomb (Sindragosa)
+        {
+            if (apply)
+            {
+                if (Creature* pCreature = target->SummonCreature(36980, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_MANUAL_DESPAWN, 0))
+                    pCreature->SetCreatorGuid(target->GetObjectGuid());
+            }
+            else
+            {
+                target->RemoveAurasDueToSpell(71665); // Asphyxiation
+            }
+            return;
+        }
+        case 71530:                                     // Essence of the Blood Queen (Queen Lana'thel)
+        case 71531:
+        case 71532:
+        case 71533:
+        case 71525:
+        case 71473:
+        case 70867:
+        case 70879:
+        case 71265:                                     // Swarming Shadows (Queen Lana'thel)
+        {
+            if (apply)
+            {
+                target->CastSpell(target, 70871, true, 0, this, target->GetObjectGuid()); // add the buff for healing
+
+                if (Unit *pCaster = GetCaster())
+                {
+                    // if we were bitten then we remove Frenzied Bloodthirst aura
+                    SpellAuraHolderPtr holder = pCaster->GetSpellAuraHolder(70877);
+                    if (!holder)
+                        holder = pCaster->GetSpellAuraHolder(71474);
+
+                    if (holder)
+                    {
+                        pCaster->RemoveAurasDueToSpell(70877);
+                        pCaster->CastSpell(pCaster, GetId(), true, 0, 0, holder->GetCasterGuid());
+                    }
+                }
+            }
+            else
+            {
+                target->RemoveAurasDueToSpell(70871); // remove the buff
+            }
+            break;
+        }
+    }
 }
 
 void Aura::HandlePeriodicTriggerSpellWithValue(bool apply, bool /*Real*/)
@@ -5301,9 +6342,23 @@ void Aura::HandlePeriodicEnergize(bool apply, bool Real)
                 m_modifier.m_amount = target->GetCreateMana() * 2 / 100;
                 break;
             case 57669:                                     // Replenishment (0.2% from max)
-            case 61782:                                     // Infinite Replenishment
                 m_modifier.m_amount = target->GetMaxPower(POWER_MANA) * 2 / 1000;
                 break;
+            case 61782:                                     // Infinite Replenishment (0.25% from max)
+                m_modifier.m_amount = target->GetMaxPower(POWER_MANA) * 25 / 10000;
+                break;
+            default:
+                break;
+        }
+    }
+    if (!apply && !loading)
+    {
+        switch (GetId())
+        {
+            case 5229:                                      // Druid Bear Enrage
+                if (target->HasAura(51185))               // King of the Jungle self Enrage bonus with infinity duration
+                    target->RemoveAurasDueToSpell(51185);
+                break;
             default:
                 break;
         }
@@ -5320,7 +6375,7 @@ void Aura::HandleAuraPowerBurn(bool apply, bool /*Real*/)
 void Aura::HandleAuraPeriodicDummy(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     Unit *target = GetTarget();
@@ -5329,11 +6384,127 @@ void Aura::HandleAuraPeriodicDummy(bool apply, bool Real)
     bool loading = (target->GetTypeId() == TYPEID_PLAYER && ((Player*)target)->GetSession()->PlayerLoading());
 
     SpellEntry const*spell = GetSpellProto();
-    switch( spell->SpellFamilyName)
+    switch(spell->SpellFamilyName)
     {
-        case SPELLFAMILY_ROGUE:
+        case SPELLFAMILY_GENERIC:
         {
             switch(spell->Id)
+            {
+                case 25281:                             // Turkey Marker
+                {
+                    if (target && target->GetTypeId() != TYPEID_PLAYER)
+                        break;
+                    if (Aura* aura = target->GetAura(25281, EFFECT_INDEX_0))
+                    if (aura->GetStackAmount() == 15)
+                        target->CastSpell(target, 25285, true);     // Friend or Fowl criteria
+                    break;
+                }
+                case 49555:                             // Corpse Explode (Trollgore - Drak'Tharon Keep Normal)
+                    if (!apply)
+                    {
+                        if (target)
+                        {
+                            if (Unit *caster = GetCaster())
+                            {
+                                target->CastSpell(target, 49618, true, 0, 0, caster->GetObjectGuid());
+                                target->CastSpell(target, 51270, true);
+                                target->SetFloatValue(OBJECT_FIELD_SCALE_X, 1.0f);
+                                target->SetDeathState(JUST_DIED);
+                            }
+                        }
+                    }
+                    break;
+                case 59807:                             // Corpse Explode (Trollgore - Drak'Tharon Keep Hero)
+                    if (!apply)
+                    {
+                        if (target)
+                        {
+                            if (Unit *caster = GetCaster())
+                            {
+                                target->CastSpell(target, 59809, true, 0, 0, caster->GetObjectGuid());
+                                target->CastSpell(target, 51270, true);
+                                target->SetFloatValue(OBJECT_FIELD_SCALE_X, 1.0f);
+                                target->SetDeathState(JUST_DIED);
+                            }
+                        }
+                    }
+                    break;
+                case 55093:                                   // Grip of Slad'ran
+                case 61474:                                   // Grip of Slad'ran (h)
+                {
+                    if (apply)
+                    {
+                        if (target->HasAura(55126) || target->HasAura(61476))
+                        {
+                            target->RemoveSpellAuraHolder(GetHolder());
+                            return;
+                        }
+
+                        if (GetHolder()->GetStackAmount() >= 5)
+                        {
+                            target->RemoveAura(this);
+                            target->CastSpell(target, (spell->Id == 55093) ? 55126 : 61476, true);
+                        }
+                    }
+                    break;
+                }
+                case 62717:                                   // Slag Pot (Ulduar: Ignis)
+                case 63477:
+                {
+                    Unit *caster = GetCaster();
+
+                    if (!caster || !target)
+                        return;
+
+                    // Haste buff (Slag Imbued)
+                    if (!apply)
+                        target->CastSpell(caster, (spell->Id == 62717) ? 62836 : 63536, true);
+
+                    break;
+                }
+                case 63050:                                   // Sanity (Yogg Saron - Ulduar)
+                {
+                                                              // here is the special handling of Sanity
+                    Unit *caster = GetCaster();
+                    if (!caster)
+                    {
+                        target->RemoveAurasDueToSpell(63050);
+                        return;
+                    }
+
+                    if (!caster->isAlive())
+                    {
+                        target->RemoveAurasDueToSpell(63050);
+                        return;
+                    }
+
+                    uint32 stacks = GetHolder()->GetStackAmount();
+
+                    if ((stacks < 30) && !(target->HasAura(63752)))
+                        target->CastSpell(target, 63752, true);
+
+                    if ((stacks > 30) && (target->HasAura(63752)))
+                        target->RemoveAurasDueToSpell(63752);
+
+                    if (target->HasAura(64169))               // sanity well Aura
+                        GetHolder()->ModStackAmount(20);
+                    return;
+                }
+                case 64217:                                 // Overcharged (spell from Emalon adds)
+                {
+                    if (GetHolder()->GetStackAmount() > 11)
+                    {
+                        target->CastSpell(target, 64219, true);
+                        target->KillSelf();
+                    }
+                    return;
+                }
+            }
+            break;
+        }
+        case SPELLFAMILY_ROGUE:
+        {
+            switch (spell->Id)
             {
                 // Master of Subtlety
                 case 31666:
@@ -5341,7 +6512,7 @@ void Aura::HandleAuraPeriodicDummy(bool apply, bool Real)
                     if (apply)
                     {
                         // for make duration visible
-                        if (SpellAuraHolder* holder = target->GetSpellAuraHolder(31665))
+                        if (SpellAuraHolderPtr holder = target->GetSpellAuraHolder(31665))
                         {
                             holder->SetAuraMaxDuration(GetHolder()->GetAuraDuration());
                             holder->RefreshHolder();
@@ -5351,6 +6522,24 @@ void Aura::HandleAuraPeriodicDummy(bool apply, bool Real)
                         target->RemoveAurasDueToSpell(31665);
                     break;
                 }
+                default:
+                    break;
+            }
+            break;
+        }
+        case SPELLFAMILY_WARLOCK:
+        {
+            switch (spell->Id)
+            {
+                case 48018:
+                    if (apply)
+                        target->CastSpell(target, 62388, true);
+                    else
+                    {
+                        target->RemoveGameObject(spell->Id,true);
+                        target->RemoveAurasDueToSpell(62388);
+                    }
+                break;
             }
             break;
         }
@@ -5380,34 +6569,58 @@ void Aura::HandlePeriodicHeal(bool apply, bool /*Real*/)
     // Custom damage calculation after
     if (apply)
     {
-        if(loading)
+        if (loading)
             return;
 
         Unit *caster = GetCaster();
         if (!caster)
             return;
 
-        // Gift of the Naaru (have diff spellfamilies)
-        if (GetSpellProto()->SpellIconID == 329 && GetSpellProto()->SpellVisual[0] == 7625)
+        // Gift of the Naaru (have multiple spellfamilies)
+        if (GetSpellProto()->GetSpellFamilyFlags().test<CF_ALL_GIFT_OF_THE_NAARU>())
         {
-            int32 ap = int32 (0.22f * caster->GetTotalAttackPowerValue(BASE_ATTACK));
-            int32 holy = caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(GetSpellProto()));
-            if  (holy < 0)
-                holy = 0;
-            holy = int32(holy * 377 / 1000);
-            m_modifier.m_amount += ap > holy ? ap : holy;
+            float add = 0.0f;
+            switch (GetSpellProto()->SpellFamilyName)
+            {
+                case SPELLFAMILY_MAGE:
+                case SPELLFAMILY_WARLOCK:
+                case SPELLFAMILY_PRIEST:
+                    add = 1.885f * (float)caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(GetSpellProto()));
+                    break;
+
+                case SPELLFAMILY_PALADIN:
+                case SPELLFAMILY_SHAMAN:
+                    add = std::max(1.885f * (float)caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(GetSpellProto())), 1.1f * (float)caster->GetTotalAttackPowerValue(BASE_ATTACK));
+                    break;
+
+                case SPELLFAMILY_WARRIOR:
+                case SPELLFAMILY_HUNTER:
+                case SPELLFAMILY_DEATHKNIGHT:
+                    add = 1.1f * (float)std::max(caster->GetTotalAttackPowerValue(BASE_ATTACK), caster->GetTotalAttackPowerValue(RANGED_ATTACK));
+                    break;
+
+                case SPELLFAMILY_GENERIC:
+                default:
+                    sLog.outError("Aura::HandlePeriodicHeal unknown type of aura %u",GetId());
+                    break;
+            }
+
+            int32 add_per_tick = floor(add / GetAuraMaxTicks());
+            m_modifier.m_amount += (add_per_tick > 0 ? add_per_tick : 0);
         }
         // Lifeblood
-        else if (GetSpellProto()->SpellIconID == 3088 && GetSpellProto()->SpellVisual[0] == 8145)
+        else if (GetSpellProto()->GetSpellIconID() == 3088 && GetSpellProto()->GetSpellVisual() == 8145)
         {
             int32 healthBonus = int32 (0.0032f * caster->GetMaxHealth());
             m_modifier.m_amount += healthBonus;
         }
-
-        m_modifier.m_amount = caster->SpellHealingBonusDone(target, GetSpellProto(), m_modifier.m_amount, DOT, GetStackAmount());
+        else
+        {
+            m_modifier.m_amount = caster->SpellHealingBonusDone(target, GetSpellProto(), m_modifier.m_amount, DOT, GetStackAmount());
+        }
 
         // Rejuvenation
-        if (GetSpellProto()->IsFitToFamily(SPELLFAMILY_DRUID, UI64LIT(0x0000000000000010)))
+        if (GetSpellProto()->IsFitToFamily<SPELLFAMILY_DRUID, CF_DRUID_REJUVENATION>())
             if (caster->HasAura(64760))                     // Item - Druid T8 Restoration 4P Bonus
                 caster->CastCustomSpell(target, 64801, &m_modifier.m_amount, NULL, NULL, true, NULL);
     }
@@ -5431,7 +6644,7 @@ void Aura::HandleDamagePercentTaken(bool apply, bool Real)
             return;
 
         // Hand of Salvation (only it have this aura and mask)
-        if (GetSpellProto()->IsFitToFamily(SPELLFAMILY_PALADIN, UI64LIT(0x0000000000000100)))
+        if (GetSpellProto()->IsFitToFamily<SPELLFAMILY_PALADIN, CF_PALADIN_HAND_OF_SALVATION1>())
         {
             // Glyph of Salvation
             if (target->GetObjectGuid() == GetCasterGuid())
@@ -5444,7 +6657,7 @@ void Aura::HandleDamagePercentTaken(bool apply, bool Real)
 void Aura::HandlePeriodicDamage(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     m_isPeriodic = apply;
@@ -5458,7 +6671,7 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
     // Custom damage calculation after
     if (apply)
     {
-        if(loading)
+        if (loading)
             return;
 
         Unit *caster = GetCaster();
@@ -5470,7 +6683,7 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
             case SPELLFAMILY_WARRIOR:
             {
                 // Rend
-                if (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000020))
+                if (spellProto->GetSpellFamilyFlags().test<CF_WARRIOR_REND>())
                 {
                     // $0.2*(($MWB+$mwb)/2+$AP/14*$MWS) bonus per tick
                     float ap = caster->GetTotalAttackPowerValue(BASE_ATTACK);
@@ -5482,19 +6695,26 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
                     if (spellProto->CalculateSimpleValue(EFFECT_INDEX_1) !=0 &&
                         target->GetHealth() > target->GetMaxHealth() * spellProto->CalculateSimpleValue(EFFECT_INDEX_1) / 100)
                         m_modifier.m_amount += m_modifier.m_amount * spellProto->CalculateSimpleValue(EFFECT_INDEX_2) / 100;
+
+                    // Improved Rend - Rank 1
+                    if (caster->HasAura(12286))
+                        m_modifier.m_amount += int32(m_modifier.m_amount * 0.1f);
+                    // Improved Rend - Rank 2
+                    if (caster->HasAura(12658))
+                        m_modifier.m_amount += int32(m_modifier.m_amount * 0.2f);
                 }
                 break;
             }
             case SPELLFAMILY_DRUID:
             {
                 // Rip
-                if (spellProto->SpellFamilyFlags & UI64LIT(0x000000000000800000))
+                if (spellProto->GetSpellFamilyFlags().test<CF_DRUID_RIP_BITE>())
                 {
                     if (caster->GetTypeId() != TYPEID_PLAYER)
                         break;
 
                     // 0.01*$AP*cp
-                    uint8 cp = ((Player*)caster)->GetComboPoints();
+                    uint8 cp = caster->GetComboPoints();
 
                     // Idol of Feral Shadows. Cant be handled as SpellMod in SpellAura:Dummy due its dependency from CPs
                     Unit::AuraList const& dummyAuras = caster->GetAurasByType(SPELL_AURA_DUMMY);
@@ -5508,12 +6728,26 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
                     }
                     m_modifier.m_amount += int32(caster->GetTotalAttackPowerValue(BASE_ATTACK) * cp / 100);
                 }
+                // Insect Swarm
+                else if (spellProto->GetSpellFamilyFlags().test<CF_DRUID_INSECT_SWARM>())
+                {
+                    // Idol of the Crying Wind
+                    Unit::AuraList const& dummyAuras = caster->GetAurasByType(SPELL_AURA_DUMMY);
+                    for(Unit::AuraList::const_iterator itr = dummyAuras.begin(); itr != dummyAuras.end(); ++itr)
+                    {
+                        if((*itr)->GetId()==64950)
+                        {
+                            m_modifier.m_amount += (*itr)->GetModifier()->m_amount;
+                            break;
+                        }
+                    }
+                }
                 break;
             }
             case SPELLFAMILY_ROGUE:
             {
                 // Rupture
-                if (spellProto->SpellFamilyFlags & UI64LIT(0x000000000000100000))
+                if (spellProto->GetSpellFamilyFlags().test<CF_ROGUE_RUPTURE>())
                 {
                     if (caster->GetTypeId() != TYPEID_PLAYER)
                         break;
@@ -5523,7 +6757,7 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
                     //4 points: ${($m1+$b1*4+0.03428571*$AP)*7} damage over 14 secs
                     //5 points: ${($m1+$b1*5+0.0375*$AP)*8} damage over 16 secs
                     float AP_per_combo[6] = {0.0f, 0.015f, 0.024f, 0.03f, 0.03428571f, 0.0375f};
-                    uint8 cp = ((Player*)caster)->GetComboPoints();
+                    uint8 cp = caster->GetComboPoints();
                     if (cp > 5) cp = 5;
                     m_modifier.m_amount += int32(caster->GetTotalAttackPowerValue(BASE_ATTACK) * AP_per_combo[cp]);
                 }
@@ -5532,7 +6766,7 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
             case SPELLFAMILY_PALADIN:
             {
                 // Holy Vengeance / Blood Corruption
-                if (spellProto->SpellFamilyFlags & UI64LIT(0x0000080000000000) && spellProto->SpellVisual[0] == 7902)
+                if (spellProto->GetSpellFamilyFlags().test<CF_PALADIN_SEAL_OF_CORRUPT_VENGE>() && spellProto->GetSpellVisual() == 7902)
                 {
                     // AP * 0.025 + SPH * 0.013 bonus per tick
                     float ap = caster->GetTotalAttackPowerValue(BASE_ATTACK);
@@ -5547,51 +6781,112 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
                 break;
         }
 
-        if(m_modifier.m_auraname == SPELL_AURA_PERIODIC_DAMAGE)
+        if (m_modifier.m_auraname == SPELL_AURA_PERIODIC_DAMAGE)
         {
+            DamageInfo damageInfo =  DamageInfo(caster, target, GetSpellProto(), m_modifier.m_amount);
+            damageInfo.damageType = DOT;
             // SpellDamageBonusDone for magic spells
-            if(spellProto->DmgClass == SPELL_DAMAGE_CLASS_NONE || spellProto->DmgClass == SPELL_DAMAGE_CLASS_MAGIC)
-                m_modifier.m_amount = caster->SpellDamageBonusDone(target, GetSpellProto(), m_modifier.m_amount, DOT, GetStackAmount());
+            if (spellProto->DmgClass == SPELL_DAMAGE_CLASS_NONE || spellProto->DmgClass == SPELL_DAMAGE_CLASS_MAGIC)
+            {
+                caster->SpellDamageBonusDone(&damageInfo, GetStackAmount());
+            }
             // MeleeDamagebonusDone for weapon based spells
             else
             {
-                WeaponAttackType attackType = GetWeaponAttackType(GetSpellProto());
-                m_modifier.m_amount = caster->MeleeDamageBonusDone(target, m_modifier.m_amount, attackType, GetSpellProto(), DOT, GetStackAmount());
+                caster->MeleeDamageBonusDone(&damageInfo, GetStackAmount());
             }
+            m_modifier.m_amount = damageInfo.damage;
         }
     }
     // remove time effects
     else
     {
         // Parasitic Shadowfiend - handle summoning of two Shadowfiends on DoT expire
-        if(spellProto->Id == 41917)
+        if (spellProto->Id == 41917)
             target->CastSpell(target, 41915, true);
+        else if (spellProto->Id == 74562) // SPELL_FIERY_COMBUSTION - Ruby sanctum boss Halion
+            target->CastSpell(target, 74607, true, NULL, NULL, GetCasterGuid());
+        else if (spellProto->Id == 74792) // SPELL_SOUL_CONSUMPTION - Ruby sanctum boss Halion
+            target->CastSpell(target, 74799, true, NULL, NULL, GetCasterGuid());
+        // Void Shifted
+        else if (spellProto->Id == 54361 || spellProto->Id == 59743)
+            target->CastSpell(target, 54343, true, NULL, NULL, GetCasterGuid());
     }
-}
-
-void Aura::HandlePeriodicDamagePCT(bool apply, bool /*Real*/)
-{
-    m_isPeriodic = apply;
-}
-
-void Aura::HandlePeriodicLeech(bool apply, bool /*Real*/)
-{
-    m_isPeriodic = apply;
-
-    // For prevent double apply bonuses
-    bool loading = (GetTarget()->GetTypeId() == TYPEID_PLAYER && ((Player*)GetTarget())->GetSession()->PlayerLoading());
 
-    // Custom damage calculation after
-    if (apply)
+    switch (GetId())
     {
-        if(loading)
-            return;
-
-        Unit *caster = GetCaster();
-        if (!caster)
+        case 68980:                             // Harvest Soul(s) (Lich King)
+        case 74295:
+        case 74296:
+        case 74297:
+        case 74325:
+        case 74326:
+        case 74327:
+        case 73654:
+        {
+            if (!apply)
+            {
+                // if died - cast Harvested Soul on Lich King
+                if (m_removeMode == AURA_REMOVE_BY_DEATH)
+                    target->CastSpell(target, 72679, true);
+            }
+
+            break;
+        }
+        case 70911:                             // Unbound Plague (Putricide)
+        case 72854:
+        case 72855:
+        case 72856:
+        {
+            if (apply)
+            {
+                target->CastSpell(target, 70955, true); // Bounce Protection
+                if (Unit *pCaster = GetCaster())
+                {
+                    if (SpellAuraHolderPtr holder = pCaster->GetSpellAuraHolder(GetId()))
+                    {
+                        GetHolder()->SetAuraDuration(holder->GetAuraDuration());
+                        GetHolder()->SendAuraUpdate(false);
+                    }
+                }
+            }
+            else
+            {
+                target->RemoveAurasDueToSpell(70917); // remove Search Periodic
+                target->CastSpell(target, 70953, true); // Plague Sickness
+            }
+
+            break;
+        }
+    }
+}
+
+void Aura::HandlePeriodicDamagePCT(bool apply, bool /*Real*/)
+{
+    m_isPeriodic = apply;
+}
+
+void Aura::HandlePeriodicLeech(bool apply, bool /*Real*/)
+{
+    m_isPeriodic = apply;
+
+    // For prevent double apply bonuses
+    bool loading = (GetTarget()->GetTypeId() == TYPEID_PLAYER && ((Player*)GetTarget())->GetSession()->PlayerLoading());
+
+    // Custom damage calculation after
+    if (apply)
+    {
+        if (loading)
             return;
 
-        m_modifier.m_amount = caster->SpellDamageBonusDone(GetTarget(), GetSpellProto(), m_modifier.m_amount, DOT, GetStackAmount());
+        Unit *caster = GetCaster();
+        if (!caster)
+            return;
+
+        DamageInfo damageInfo =  DamageInfo(caster, GetTarget(), GetSpellProto(), m_modifier.m_amount);
+        damageInfo.damageType = DOT;
+        caster->SpellDamageBonusDone(&damageInfo, GetStackAmount());
+        m_modifier.m_amount = damageInfo.damage;
     }
 }
 
@@ -5610,14 +6905,16 @@ void Aura::HandlePeriodicHealthFunnel(bool apply, bool /*Real*/)
     // Custom damage calculation after
     if (apply)
     {
-        if(loading)
+        if (loading)
             return;
 
-        Unit *caster = GetCaster();
+        Unit* caster = GetCaster();
         if (!caster)
             return;
-
-        m_modifier.m_amount = caster->SpellDamageBonusDone(GetTarget(), GetSpellProto(), m_modifier.m_amount, DOT, GetStackAmount());
+        DamageInfo damageInfo =  DamageInfo(caster, GetTarget(), GetSpellProto(), m_modifier.m_amount);
+        damageInfo.damageType = DOT;
+        caster->SpellDamageBonusDone(&damageInfo, GetStackAmount());
+        m_modifier.m_amount = damageInfo.damage;
     }
 }
 
@@ -5631,44 +6928,43 @@ void Aura::HandlePeriodicHealthFunnel(bool apply, bool /*Real*/)
 
 void Aura::HandleAuraModResistanceExclusive(bool apply, bool /*Real*/)
 {
+    Unit *target = GetTarget();
+
     for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++)
     {
-        if(m_modifier.m_miscvalue & int32(1<<x))
+        //int32 oldMaxValue = 0;
+        if (m_modifier.m_miscvalue & int32(1<<x))
         {
-            GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), BASE_VALUE, float(m_modifier.m_amount), apply);
-            if(GetTarget()->GetTypeId() == TYPEID_PLAYER)
-                GetTarget()->ApplyResistanceBuffModsMod(SpellSchools(x), m_positive, float(m_modifier.m_amount), apply);
+            float change = target->CheckAuraStackingAndApply(this, UnitMods(UNIT_MOD_RESISTANCE_START + x), TOTAL_VALUE, float(m_modifier.m_amount), apply, int32(1<<x));
+            if (change != 0)
+                target->ApplyResistanceBuffModsMod(SpellSchools(x), m_modifier.m_amount > 0, change, true);
         }
     }
 }
 
 void Aura::HandleAuraModResistance(bool apply, bool /*Real*/)
 {
+    Unit *target = GetTarget();
+
     for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++)
     {
-        if(m_modifier.m_miscvalue & int32(1<<x))
+        if (m_modifier.m_miscvalue & int32(1<<x))
         {
-            GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), TOTAL_VALUE, float(m_modifier.m_amount), apply);
-            if(GetTarget()->GetTypeId() == TYPEID_PLAYER || ((Creature*)GetTarget())->IsPet())
-                GetTarget()->ApplyResistanceBuffModsMod(SpellSchools(x), m_positive, float(m_modifier.m_amount), apply);
+            float change = target->CheckAuraStackingAndApply(this, UnitMods(UNIT_MOD_RESISTANCE_START + x), TOTAL_VALUE, float(m_modifier.m_amount), apply);
+            if (change != 0)
+                target->ApplyResistanceBuffModsMod(SpellSchools(x), m_modifier.m_amount > 0, float(m_modifier.m_amount), apply);
         }
     }
 }
 
 void Aura::HandleAuraModBaseResistancePCT(bool apply, bool /*Real*/)
 {
-    // only players have base stats
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
-    {
-        //pets only have base armor
-        if(((Creature*)GetTarget())->IsPet() && (m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL))
-            GetTarget()->HandleStatModifier(UNIT_MOD_ARMOR, BASE_PCT, float(m_modifier.m_amount), apply);
-    }
-    else
+    // only players and pets have base stats
+    if (GetTarget()->GetTypeId() == TYPEID_PLAYER || ((Creature*)GetTarget())->IsPet())
     {
         for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++)
         {
-            if(m_modifier.m_miscvalue & int32(1<<x))
+            if (m_modifier.m_miscvalue & int32(1<<x))
                 GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), BASE_PCT, float(m_modifier.m_amount), apply);
         }
     }
@@ -5680,31 +6976,22 @@ void Aura::HandleModResistancePercent(bool apply, bool /*Real*/)
 
     for(int8 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++)
     {
-        if(m_modifier.m_miscvalue & int32(1<<i))
+        if (m_modifier.m_miscvalue & int32(1<<i))
         {
-            target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_PCT, float(m_modifier.m_amount), apply);
-            if(target->GetTypeId() == TYPEID_PLAYER || ((Creature*)target)->IsPet())
-            {
-                target->ApplyResistanceBuffModsPercentMod(SpellSchools(i), true, float(m_modifier.m_amount), apply);
-                target->ApplyResistanceBuffModsPercentMod(SpellSchools(i), false, float(m_modifier.m_amount), apply);
-            }
+            float change = target->CheckAuraStackingAndApply(this, UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_PCT, float(m_modifier.m_amount), apply, int32(1<<i));
+            if (change)
+                target->ApplyResistanceBuffModsPercentMod(SpellSchools(i), m_modifier.m_amount > 0, change, apply);
         }
     }
 }
 
 void Aura::HandleModBaseResistance(bool apply, bool /*Real*/)
 {
-    // only players have base stats
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
-    {
-        //only pets have base stats
-        if(((Creature*)GetTarget())->IsPet() && (m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL))
-            GetTarget()->HandleStatModifier(UNIT_MOD_ARMOR, TOTAL_VALUE, float(m_modifier.m_amount), apply);
-    }
-    else
+    // only players and pets have base stats
+    if (GetTarget()->GetTypeId() == TYPEID_PLAYER  || ((Creature*)GetTarget())->IsPet())
     {
         for(int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++)
-            if(m_modifier.m_miscvalue & (1<<i))
+            if (m_modifier.m_miscvalue & (1<<i))
                 GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_VALUE, float(m_modifier.m_amount), apply);
     }
 }
@@ -5721,15 +7008,17 @@ void Aura::HandleAuraModStat(bool apply, bool /*Real*/)
         return;
     }
 
+    Unit *target = GetTarget();
+
     for(int32 i = STAT_STRENGTH; i < MAX_STATS; i++)
     {
         // -1 or -2 is all stats ( misc < -2 checked in function beginning )
         if (m_modifier.m_miscvalue < 0 || m_modifier.m_miscvalue == i)
         {
             //m_target->ApplyStatMod(Stats(i), m_modifier.m_amount,apply);
-            GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), TOTAL_VALUE, float(m_modifier.m_amount), apply);
-            if(GetTarget()->GetTypeId() == TYPEID_PLAYER || ((Creature*)GetTarget())->IsPet())
-                GetTarget()->ApplyStatBuffMod(Stats(i), float(m_modifier.m_amount), apply);
+            float change = target->CheckAuraStackingAndApply(this, UnitMods(UNIT_MOD_STAT_START + i), TOTAL_VALUE, float(m_modifier.m_amount), apply, 0, i+1);
+            if (change != 0)
+                target->ApplyStatBuffMod(Stats(i), (change < 0 && !IsStacking() ? -change : change), apply);
         }
     }
 }
@@ -5742,20 +7031,20 @@ void Aura::HandleModPercentStat(bool apply, bool /*Real*/)
         return;
     }
 
-    // only players have base stats
-    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    // only players and pets have base stats
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER && !((Creature*)GetTarget())->IsPet())
         return;
 
     for (int32 i = STAT_STRENGTH; i < MAX_STATS; ++i)
     {
-        if(m_modifier.m_miscvalue == i || m_modifier.m_miscvalue == -1)
+        if (m_modifier.m_miscvalue == i || m_modifier.m_miscvalue == -1)
             GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), BASE_PCT, float(m_modifier.m_amount), apply);
     }
 }
 
 void Aura::HandleModSpellDamagePercentFromStat(bool /*apply*/, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     // Magic damage modifiers implemented in Unit::SpellDamageBonusDone
@@ -5766,7 +7055,7 @@ void Aura::HandleModSpellDamagePercentFromStat(bool /*apply*/, bool /*Real*/)
 
 void Aura::HandleModSpellHealingPercentFromStat(bool /*apply*/, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     // Recalculate bonus
@@ -5775,16 +7064,16 @@ void Aura::HandleModSpellHealingPercentFromStat(bool /*apply*/, bool /*Real*/)
 
 void Aura::HandleAuraModDispelResist(bool apply, bool Real)
 {
-    if(!Real || !apply)
+    if (!Real || !apply)
         return;
 
-    if(GetId() == 33206)
+    if (GetId() == 33206)
         GetTarget()->CastSpell(GetTarget(), 44416, true, NULL, this, GetCasterGuid());
 }
 
 void Aura::HandleModSpellDamagePercentFromAttackPower(bool /*apply*/, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     // Magic damage modifiers implemented in Unit::SpellDamageBonusDone
@@ -5795,7 +7084,7 @@ void Aura::HandleModSpellDamagePercentFromAttackPower(bool /*apply*/, bool /*Rea
 
 void Aura::HandleModSpellHealingPercentFromAttackPower(bool /*apply*/, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     // Recalculate bonus
@@ -5804,7 +7093,7 @@ void Aura::HandleModSpellHealingPercentFromAttackPower(bool /*apply*/, bool /*Re
 
 void Aura::HandleModHealingDone(bool /*apply*/, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
     // implemented in Unit::SpellHealingBonusDone
     // this information is for client side only
@@ -5827,29 +7116,37 @@ void Aura::HandleModTotalPercentStat(bool apply, bool /*Real*/)
 
     for (int32 i = STAT_STRENGTH; i < MAX_STATS; i++)
     {
-        if(m_modifier.m_miscvalue == i || m_modifier.m_miscvalue == -1)
+        if (m_modifier.m_miscvalue == i || m_modifier.m_miscvalue == -1)
         {
             target->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), TOTAL_PCT, float(m_modifier.m_amount), apply);
-            if(target->GetTypeId() == TYPEID_PLAYER || ((Creature*)target)->IsPet())
+            if (target->GetTypeId() == TYPEID_PLAYER || ((Creature*)target)->IsPet())
                 target->ApplyStatPercentBuffMod(Stats(i), float(m_modifier.m_amount), apply );
         }
     }
 
     //recalculate current HP/MP after applying aura modifications (only for spells with 0x10 flag)
-    if (m_modifier.m_miscvalue == STAT_STAMINA && maxHPValue > 0 && GetSpellProto()->HasAttribute(SPELL_ATTR_UNK4))
+    if (m_modifier.m_miscvalue == STAT_STAMINA && maxHPValue > 0 && GetSpellProto()->HasAttribute(SPELL_ATTR_ABILITY))
     {
         // newHP = (curHP / maxHP) * newMaxHP = (newMaxHP * curHP) / maxHP -> which is better because no int -> double -> int conversion is needed
-        uint32 newHPValue = (target->GetMaxHealth() * curHPValue) / maxHPValue;
+        // Multiplication of large numbers cause uint32 overflow so using trick
+        // a*b/c = (a/c) * (b/c) * c + (a%c) * (b%c) / c + (a/c) * (b%c) + (a%c) * (b/c)
+        uint32 max_hp = target->GetMaxHealth();
+        // max_hp * curHPValue / maxHPValue
+        uint32 newHPValue =
+            (max_hp/maxHPValue) * (curHPValue/maxHPValue) * maxHPValue
+            + (max_hp%maxHPValue) * (curHPValue%maxHPValue) / maxHPValue
+            + (max_hp/maxHPValue) * (curHPValue%maxHPValue)
+            + (max_hp%maxHPValue) * (curHPValue/maxHPValue);
         target->SetHealth(newHPValue);
     }
 }
 
 void Aura::HandleAuraModResistenceOfStatPercent(bool /*apply*/, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    if(m_modifier.m_miscvalue != SPELL_SCHOOL_MASK_NORMAL)
+    if (m_modifier.m_miscvalue != SPELL_SCHOOL_MASK_NORMAL)
     {
         // support required adding replace UpdateArmor by loop by UpdateResistence at intellect update
         // and include in UpdateResistence same code as in UpdateArmor for aura mod apply.
@@ -5871,7 +7168,7 @@ void Aura::HandleAuraModTotalHealthPercentRegen(bool apply, bool /*Real*/)
 
 void Aura::HandleAuraModTotalManaPercentRegen(bool apply, bool /*Real*/)
 {
-    if(m_modifier.periodictime == 0)
+    if (m_modifier.periodictime == 0)
         m_modifier.periodictime = 1000;
 
     m_periodicTimer = m_modifier.periodictime;
@@ -5880,7 +7177,7 @@ void Aura::HandleAuraModTotalManaPercentRegen(bool apply, bool /*Real*/)
 
 void Aura::HandleModRegen(bool apply, bool /*Real*/)        // eating
 {
-    if(m_modifier.periodictime == 0)
+    if (m_modifier.periodictime == 0)
         m_modifier.periodictime = 5000;
 
     m_periodicTimer = 5000;
@@ -5892,12 +7189,14 @@ void Aura::HandleModPowerRegen(bool apply, bool Real)       // drinking
     if (!Real)
         return;
 
-    Powers pt = GetTarget()->getPowerType();
-    if(m_modifier.periodictime == 0)
+    Powers powerType = GetTarget()->GetPowerType();
+    if (m_modifier.periodictime == 0)
     {
         // Anger Management (only spell use this aura for rage)
-        if (pt == POWER_RAGE)
+        if (powerType == POWER_RAGE)
             m_modifier.periodictime = 3000;
+        else if (powerType == POWER_RUNIC_POWER)
+            m_modifier.periodictime = 5000;
         else
             m_modifier.periodictime = 2000;
     }
@@ -5913,7 +7212,7 @@ void Aura::HandleModPowerRegen(bool apply, bool Real)       // drinking
 void Aura::HandleModPowerRegenPCT(bool /*apply*/, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
@@ -5927,7 +7226,7 @@ void Aura::HandleModPowerRegenPCT(bool /*apply*/, bool Real)
 void Aura::HandleModManaRegen(bool /*apply*/, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
@@ -5939,7 +7238,7 @@ void Aura::HandleModManaRegen(bool /*apply*/, bool Real)
 
 void Aura::HandleComprehendLanguage(bool apply, bool /*Real*/)
 {
-    if(apply)
+    if (apply)
         GetTarget()->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_COMPREHEND_LANG);
     else
         GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_COMPREHEND_LANG);
@@ -5947,31 +7246,35 @@ void Aura::HandleComprehendLanguage(bool apply, bool /*Real*/)
 
 void Aura::HandleAuraModIncreaseHealth(bool apply, bool Real)
 {
-    Unit *target = GetTarget();
+    Unit* target = GetTarget();
 
     // Special case with temporary increase max/current health
-    switch(GetId())
+    switch (GetId())
     {
-        case 12976:                                         // Warrior Last Stand triggered spell
-        case 28726:                                         // Nightmare Seed ( Nightmare Seed )
-        case 31616:                                         // Nature's Guardian
-        case 34511:                                         // Valor (Bulwark of Kings, Bulwark of the Ancient Kings)
-        case 44055: case 55915: case 55917: case 67596:     // Tremendous Fortitude (Battlemaster's Alacrity)
-        case 50322:                                         // Survival Instincts
-        case 53479:                                         // Hunter pet - Last Stand
+        // Special case with temporary increase max/current health
+            // Cases where we need to manually calculate the amount for the spell (by percentage)
+            // recalculate to full amount at apply for proper remove
         case 54443:                                         // Demonic Empowerment (Voidwalker)
         case 55233:                                         // Vampiric Blood
+        case 61254:                                         // Will of Sartharion (Obsidian Sanctum)
+            if (Real && apply)
+                m_modifier.m_amount = target->GetMaxHealth() * m_modifier.m_amount / 100;
+            // no break here
+
+            // Cases where m_amount already has the correct value (spells cast with CastCustomSpell or absolute values)
+        case 12976:                                         // Warrior Last Stand triggered spell (Cast with percentage-value by CastCustomSpell)
+        case 28726:                                         // Nightmare Seed
+        case 31616:                                         // Nature's Guardian (Cast with percentage-value by CastCustomSpell)
+        case 34511:                                         // Valor (Bulwark of Kings, Bulwark of the Ancient Kings)
+        case 44055: case 55915: case 55917: case 67596:     // Tremendous Fortitude (Battlemaster's Alacrity)
+        case 50322:                                         // Survival Instincts (Cast with percentage-value by CastCustomSpell)
+        case 53479:                                         // Hunter pet - Last Stand (Cast with percentage-value by CastCustomSpell)
         case 59465:                                         // Brood Rage (Ahn'Kahet)
         {
-            if(Real)
+            if (Real)
             {
-                if(apply)
+                if (apply)
                 {
-                    // Demonic Empowerment (Voidwalker) & Vampiric Blood - special cases, store percent in data
-                    // recalculate to full amount at apply for proper remove
-                    if (GetId() == 54443 || GetId() == 55233)
-                        m_modifier.m_amount = target->GetMaxHealth() * m_modifier.m_amount / 100;
-
                     target->HandleStatModifier(UNIT_MOD_HEALTH, TOTAL_VALUE, float(m_modifier.m_amount), apply);
                     target->ModifyHealth(m_modifier.m_amount);
                 }
@@ -5986,10 +7289,13 @@ void Aura::HandleAuraModIncreaseHealth(bool apply, bool Real)
             }
             return;
         }
+        // generic case
+        default:
+            target->HandleStatModifier(UNIT_MOD_HEALTH, TOTAL_VALUE, float(m_modifier.m_amount), apply);
     }
 
     // generic case
-    target->HandleStatModifier(UNIT_MOD_HEALTH, TOTAL_VALUE, float(m_modifier.m_amount), apply);
+    target->CheckAuraStackingAndApply(this, UNIT_MOD_HEALTH, TOTAL_VALUE, float(m_modifier.m_amount), apply);
 }
 
 void  Aura::HandleAuraModIncreaseMaxHealth(bool apply, bool /*Real*/)
@@ -5998,13 +7304,13 @@ void  Aura::HandleAuraModIncreaseMaxHealth(bool apply, bool /*Real*/)
     uint32 oldhealth = target->GetHealth();
     double healthPercentage = (double)oldhealth / (double)target->GetMaxHealth();
 
-    target->HandleStatModifier(UNIT_MOD_HEALTH, TOTAL_VALUE, float(m_modifier.m_amount), apply);
+    target->CheckAuraStackingAndApply(this, UNIT_MOD_HEALTH, TOTAL_VALUE, float(m_modifier.m_amount), apply);
 
     // refresh percentage
-    if(oldhealth > 0)
+    if (oldhealth > 0)
     {
         uint32 newhealth = uint32(ceil((double)target->GetMaxHealth() * healthPercentage));
-        if(newhealth==0)
+        if (newhealth==0)
             newhealth = 1;
 
         target->SetHealth(newhealth);
@@ -6013,56 +7319,79 @@ void  Aura::HandleAuraModIncreaseMaxHealth(bool apply, bool /*Real*/)
 
 void Aura::HandleAuraModIncreaseEnergy(bool apply, bool Real)
 {
-    Unit *target = GetTarget();
-    Powers powerType = target->getPowerType();
-    if(int32(powerType) != m_modifier.m_miscvalue)
+    Unit* target = GetTarget();
+
+    if (!target)
         return;
 
-    UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + powerType);
+    Powers powerType = target->GetPowerType();
 
-    // Special case with temporary increase max/current power (percent)
-    if (GetId()==64904)                                     // Hymn of Hope
+    if (int32(powerType) != m_modifier.m_miscvalue)
     {
-        if(Real)
-        {
-            uint32 val = target->GetPower(powerType);
-            target->HandleStatModifier(unitMod, TOTAL_PCT, float(m_modifier.m_amount), apply);
-            target->SetPower(powerType, apply ? val*(100+m_modifier.m_amount)/100 : val*100/(100+m_modifier.m_amount));
-        }
-        return;
+        DEBUG_LOG("HandleAuraModIncreaseEnergy: unit %u change energy %u but current type %u", target->GetObjectGuid().GetCounter(), m_modifier.m_miscvalue, powerType);
+        powerType = Powers(m_modifier.m_miscvalue);
     }
 
-    // generic flat case
+    UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + powerType);
+
     target->HandleStatModifier(unitMod, TOTAL_VALUE, float(m_modifier.m_amount), apply);
 }
 
 void Aura::HandleAuraModIncreaseEnergyPercent(bool apply, bool /*Real*/)
 {
-    Powers powerType = GetTarget()->getPowerType();
-    if(int32(powerType) != m_modifier.m_miscvalue)
+    Unit* target = GetTarget();
+
+    if (!target)
         return;
 
+    Powers powerType = target->GetPowerType();
+
+    if (int32(powerType) != m_modifier.m_miscvalue)
+    {
+        DEBUG_LOG("HandleAuraModIncreaseEnergy: unit %u change energy %u but current type %u", target->GetObjectGuid().GetCounter(), m_modifier.m_miscvalue, powerType);
+        powerType = Powers(m_modifier.m_miscvalue);
+    }
+
     UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + powerType);
 
-    GetTarget()->HandleStatModifier(unitMod, TOTAL_PCT, float(m_modifier.m_amount), apply);
+    target->HandleStatModifier(unitMod, TOTAL_PCT, float(m_modifier.m_amount), apply);
 }
 
 void Aura::HandleAuraModIncreaseHealthPercent(bool apply, bool /*Real*/)
 {
-    Unit *target = GetTarget();
+    Unit* target = GetTarget();
+
+    if (!target)
+        return;
+
+    uint32 oldhealth = target->GetHealth();
 
     target->HandleStatModifier(UNIT_MOD_HEALTH, TOTAL_PCT, float(m_modifier.m_amount), apply);
 
     // spell special cases when current health set to max value at apply
-    switch (GetId())
+    if (apply)
+    {
+        switch (GetId())
+        {
+            case 60430:                                         // Molten Fury
+            case 61254:                                         // Will of Sartharion
+            case 64193:                                         // Heartbreak
+            case 65737:                                         // Heartbreak
+            case 64582:                                         // Emergency Mode (Ulduar - Mimiron)
+                target->SetHealth(target->GetMaxHealth());
+                break;
+            default:
+                if (oldhealth > target->GetMaxHealth())
+                    target->SetHealth(target->GetMaxHealth());
+                break;
+        }
+    }
+    else
     {
-        case 60430:                                         // Molten Fury
-        case 64193:                                         // Heartbreak
-        case 65737:                                         // Heartbreak
+        if (oldhealth > target->GetMaxHealth())
             target->SetHealth(target->GetMaxHealth());
-            break;
-        default:
-            break;
+        else
+            target->SetHealth(oldhealth);
     }
 }
 
@@ -6077,7 +7406,7 @@ void Aura::HandleAuraIncreaseBaseHealthPercent(bool apply, bool /*Real*/)
 
 void Aura::HandleAuraModParryPercent(bool /*apply*/, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ((Player*)GetTarget())->UpdateParryPercentage();
@@ -6085,7 +7414,7 @@ void Aura::HandleAuraModParryPercent(bool /*apply*/, bool /*Real*/)
 
 void Aura::HandleAuraModDodgePercent(bool /*apply*/, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ((Player*)GetTarget())->UpdateDodgePercentage();
@@ -6094,7 +7423,7 @@ void Aura::HandleAuraModDodgePercent(bool /*apply*/, bool /*Real*/)
 
 void Aura::HandleAuraModBlockPercent(bool /*apply*/, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ((Player*)GetTarget())->UpdateBlockPercentage();
@@ -6104,10 +7433,10 @@ void Aura::HandleAuraModBlockPercent(bool /*apply*/, bool /*Real*/)
 void Aura::HandleAuraModRegenInterrupt(bool /*apply*/, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ((Player*)GetTarget())->UpdateManaRegen();
@@ -6117,14 +7446,14 @@ void Aura::HandleAuraModCritPercent(bool apply, bool Real)
 {
     Unit *target = GetTarget();
 
-    if(target->GetTypeId() != TYPEID_PLAYER)
+    if (target->GetTypeId() != TYPEID_PLAYER)
         return;
 
     // apply item specific bonuses for already equipped weapon
-    if(Real)
+    if (Real)
     {
         for(int i = 0; i < MAX_ATTACK; ++i)
-            if(Item* pItem = ((Player*)target)->GetWeaponForAttack(WeaponAttackType(i),true,false))
+            if (Item* pItem = ((Player*)target)->GetWeaponForAttack(WeaponAttackType(i),true,false))
                 ((Player*)target)->_ApplyWeaponDependentAuraCritMod(pItem, WeaponAttackType(i), this, apply);
     }
 
@@ -6132,11 +7461,43 @@ void Aura::HandleAuraModCritPercent(bool apply, bool Real)
     // with spell->EquippedItemClass and  EquippedItemSubClassMask and EquippedItemInventoryTypeMask
     // m_modifier.m_miscvalue comparison with item generated damage types
 
+    float amount = float(m_modifier.m_amount);
+
     if (GetSpellProto()->EquippedItemClass == -1)
     {
-        ((Player*)target)->HandleBaseModValue(CRIT_PERCENTAGE,         FLAT_MOD, float (m_modifier.m_amount), apply);
-        ((Player*)target)->HandleBaseModValue(OFFHAND_CRIT_PERCENTAGE, FLAT_MOD, float (m_modifier.m_amount), apply);
-        ((Player*)target)->HandleBaseModValue(RANGED_CRIT_PERCENTAGE,  FLAT_MOD, float (m_modifier.m_amount), apply);
+        if(IsStacking())
+        {
+            ((Player*)target)->HandleBaseModValue(CRIT_PERCENTAGE,         FLAT_MOD, amount, apply);
+            ((Player*)target)->HandleBaseModValue(OFFHAND_CRIT_PERCENTAGE, FLAT_MOD, amount, apply);
+            ((Player*)target)->HandleBaseModValue(RANGED_CRIT_PERCENTAGE,  FLAT_MOD, amount, apply);
+        }
+        else
+        {
+            float current = ((Player*)target)->GetBaseModValue(NONSTACKING_CRIT_PERCENTAGE, FLAT_MOD);
+
+            if(amount < current)
+                return;
+
+            // unapply old aura
+            if(current)
+            {
+                ((Player*)target)->HandleBaseModValue(CRIT_PERCENTAGE,         FLAT_MOD, current, false);
+                ((Player*)target)->HandleBaseModValue(OFFHAND_CRIT_PERCENTAGE, FLAT_MOD, current, false);
+                ((Player*)target)->HandleBaseModValue(RANGED_CRIT_PERCENTAGE,  FLAT_MOD, current, false);
+            }
+
+            if(!apply)
+                amount = target->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_CRIT_PERCENT, true);
+
+            if(amount)
+            {
+                ((Player*)target)->HandleBaseModValue(CRIT_PERCENTAGE,         FLAT_MOD, amount, true);
+                ((Player*)target)->HandleBaseModValue(OFFHAND_CRIT_PERCENTAGE, FLAT_MOD, amount, true);
+                ((Player*)target)->HandleBaseModValue(RANGED_CRIT_PERCENTAGE,  FLAT_MOD, amount, true);
+            }
+
+            ((Player*)target)->SetBaseModValue(NONSTACKING_CRIT_PERCENTAGE, FLAT_MOD, amount);
+        }
     }
     else
     {
@@ -6148,21 +7509,22 @@ void Aura::HandleModHitChance(bool apply, bool /*Real*/)
 {
     Unit *target = GetTarget();
 
-    if(target->GetTypeId() == TYPEID_PLAYER)
+    if (target->GetTypeId() == TYPEID_PLAYER)
     {
+        // stacking check is made further
         ((Player*)target)->UpdateMeleeHitChances();
         ((Player*)target)->UpdateRangedHitChances();
     }
     else
     {
-        target->m_modMeleeHitChance += apply ? m_modifier.m_amount : (-m_modifier.m_amount);
-        target->m_modRangedHitChance += apply ? m_modifier.m_amount : (-m_modifier.m_amount);
+        target->m_modMeleeHitChance = target->GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE);
+        target->m_modRangedHitChance = target->GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE);
     }
 }
 
 void Aura::HandleModSpellHitChance(bool apply, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() == TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() == TYPEID_PLAYER)
     {
         ((Player*)GetTarget())->UpdateSpellHitChances();
     }
@@ -6175,10 +7537,10 @@ void Aura::HandleModSpellHitChance(bool apply, bool /*Real*/)
 void Aura::HandleModSpellCritChance(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
-    if(GetTarget()->GetTypeId() == TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() == TYPEID_PLAYER)
     {
         ((Player*)GetTarget())->UpdateAllSpellCritChances();
     }
@@ -6191,10 +7553,10 @@ void Aura::HandleModSpellCritChance(bool apply, bool Real)
 void Aura::HandleModSpellCritChanceShool(bool /*apply*/, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     for(int school = SPELL_SCHOOL_NORMAL; school < MAX_SPELL_SCHOOL; ++school)
@@ -6208,7 +7570,49 @@ void Aura::HandleModSpellCritChanceShool(bool /*apply*/, bool Real)
 
 void Aura::HandleModCastingSpeed(bool apply, bool /*Real*/)
 {
-    GetTarget()->ApplyCastTimePercentMod(float(m_modifier.m_amount),apply);
+    Unit *target = GetTarget();
+
+    if(IsStacking())
+        target->ApplyCastTimePercentMod(float(m_modifier.m_amount),apply);
+    else
+    {
+        float amount = float(m_modifier.m_amount);
+        bool bIsPositive = amount > 0;
+
+        // don't apply weaker aura
+        if((bIsPositive && amount < target->m_modSpellSpeedPctPos) ||
+            (!bIsPositive && amount > target->m_modSpellSpeedPctNeg))
+        {
+            return;
+        }
+
+        // unapply old (weaker) aura
+        if (bIsPositive)
+        {
+            if(target->m_modSpellSpeedPctPos)
+                target->ApplyCastTimePercentMod(target->m_modSpellSpeedPctPos, false);
+        }
+        else
+        {
+            if(target->m_modSpellSpeedPctNeg)
+                target->ApplyCastTimePercentMod(target->m_modSpellSpeedPctNeg, false);
+        }
+
+        if(!apply)
+        {
+            if (bIsPositive)
+                amount = target->GetMaxPositiveAuraModifier(m_modifier.m_auraname, true);
+            else
+                amount = target->GetMaxNegativeAuraModifier(m_modifier.m_auraname, true);
+        }
+
+        target->ApplyCastTimePercentMod(amount, true);
+
+        if (bIsPositive)
+            target->m_modSpellSpeedPctPos = amount;
+        else
+            target->m_modSpellSpeedPctNeg = amount;
+    }
 }
 
 void Aura::HandleModMeleeRangedSpeedPct(bool apply, bool /*Real*/)
@@ -6222,10 +7626,40 @@ void Aura::HandleModMeleeRangedSpeedPct(bool apply, bool /*Real*/)
 void Aura::HandleModCombatSpeedPct(bool apply, bool /*Real*/)
 {
     Unit *target = GetTarget();
-    target->ApplyCastTimePercentMod(float(m_modifier.m_amount), apply);
-    target->ApplyAttackTimePercentMod(BASE_ATTACK, float(m_modifier.m_amount), apply);
-    target->ApplyAttackTimePercentMod(OFF_ATTACK, float(m_modifier.m_amount), apply);
-    target->ApplyAttackTimePercentMod(RANGED_ATTACK, float(m_modifier.m_amount), apply);
+    if(IsStacking())
+    {
+        target->ApplyCastTimePercentMod(m_modifier.m_amount, apply);
+        target->ApplyAttackTimePercentMod(BASE_ATTACK, m_modifier.m_amount, apply);
+        target->ApplyAttackTimePercentMod(OFF_ATTACK, m_modifier.m_amount, apply);
+        target->ApplyAttackTimePercentMod(RANGED_ATTACK, m_modifier.m_amount, apply);
+    }
+    else
+    {
+        // Only positive effects are nonstacking in this handler
+        float amount = float(m_modifier.m_amount);
+
+        if(amount < target->m_modAttackSpeedPct[NONSTACKING_MOD_ALL])
+            return;
+
+        // unapply old aura
+        if(target->m_modAttackSpeedPct[NONSTACKING_MOD_ALL])
+        {
+            target->ApplyCastTimePercentMod(target->m_modAttackSpeedPct[NONSTACKING_MOD_ALL], false);
+            target->ApplyAttackTimePercentMod(BASE_ATTACK, target->m_modAttackSpeedPct[NONSTACKING_MOD_ALL], false);
+            target->ApplyAttackTimePercentMod(OFF_ATTACK, target->m_modAttackSpeedPct[NONSTACKING_MOD_ALL], false);
+            target->ApplyAttackTimePercentMod(RANGED_ATTACK, target->m_modAttackSpeedPct[NONSTACKING_MOD_ALL], false);
+        }
+
+        if(!apply)
+            amount = target->GetMaxPositiveAuraModifier(GetModifier()->m_auraname, true);
+
+        target->ApplyCastTimePercentMod(amount, true);
+        target->ApplyAttackTimePercentMod(BASE_ATTACK, amount, true);
+        target->ApplyAttackTimePercentMod(OFF_ATTACK, amount, true);
+        target->ApplyAttackTimePercentMod(RANGED_ATTACK, amount, true);
+
+        target->m_modAttackSpeedPct[NONSTACKING_MOD_ALL] = amount;
+    }
 }
 
 void Aura::HandleModAttackSpeed(bool apply, bool /*Real*/)
@@ -6236,8 +7670,42 @@ void Aura::HandleModAttackSpeed(bool apply, bool /*Real*/)
 void Aura::HandleModMeleeSpeedPct(bool apply, bool /*Real*/)
 {
     Unit *target = GetTarget();
-    target->ApplyAttackTimePercentMod(BASE_ATTACK, float(m_modifier.m_amount), apply);
-    target->ApplyAttackTimePercentMod(OFF_ATTACK, float(m_modifier.m_amount), apply);
+
+    if (IsStacking())
+    {
+        target->ApplyAttackTimePercentMod(BASE_ATTACK, m_modifier.m_amount, apply);
+        target->ApplyAttackTimePercentMod(OFF_ATTACK, m_modifier.m_amount, apply);
+    }
+    else
+    {
+        bool bIsPositive = m_modifier.m_amount > 0;
+
+        if((bIsPositive && m_modifier.m_amount < target->m_modAttackSpeedPct[NONSTACKING_POS_MOD_MELEE]) ||
+            (!bIsPositive && m_modifier.m_amount > target->m_modAttackSpeedPct[NONSTACKING_NEG_MOD_MELEE]))
+            return;
+
+        float amount = float(m_modifier.m_amount);
+
+        // unapply old aura
+        if(target->m_modAttackSpeedPct[bIsPositive ? NONSTACKING_POS_MOD_MELEE : NONSTACKING_NEG_MOD_MELEE])
+        {
+            target->ApplyAttackTimePercentMod(BASE_ATTACK, target->m_modAttackSpeedPct[bIsPositive ? NONSTACKING_POS_MOD_MELEE : NONSTACKING_NEG_MOD_MELEE], false);
+            target->ApplyAttackTimePercentMod(OFF_ATTACK, target->m_modAttackSpeedPct[bIsPositive ? NONSTACKING_POS_MOD_MELEE : NONSTACKING_NEG_MOD_MELEE], false);
+        }
+
+        if(!apply)
+        {
+            if (bIsPositive)
+                amount = target->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_MELEE_HASTE, true);
+            else
+                amount = target->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_MELEE_HASTE, true);
+        }
+
+        target->ApplyAttackTimePercentMod(BASE_ATTACK, amount, true);
+        target->ApplyAttackTimePercentMod(OFF_ATTACK, amount, true);
+
+        target->m_modAttackSpeedPct[bIsPositive ? NONSTACKING_POS_MOD_MELEE : NONSTACKING_NEG_MOD_MELEE] = amount;
+    }
 }
 
 void Aura::HandleAuraModRangedHaste(bool apply, bool /*Real*/)
@@ -6247,7 +7715,7 @@ void Aura::HandleAuraModRangedHaste(bool apply, bool /*Real*/)
 
 void Aura::HandleRangedAmmoHaste(bool apply, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
     GetTarget()->ApplyAttackTimePercentMod(RANGED_ATTACK, float(m_modifier.m_amount), apply);
 }
@@ -6258,62 +7726,62 @@ void Aura::HandleRangedAmmoHaste(bool apply, bool /*Real*/)
 
 void Aura::HandleAuraModAttackPower(bool apply, bool /*Real*/)
 {
-    GetTarget()->HandleStatModifier(UNIT_MOD_ATTACK_POWER, TOTAL_VALUE, float(m_modifier.m_amount), apply);
+    GetTarget()->CheckAuraStackingAndApply(this, UNIT_MOD_ATTACK_POWER, TOTAL_VALUE, float(m_modifier.m_amount), apply);
 }
 
 void Aura::HandleAuraModRangedAttackPower(bool apply, bool /*Real*/)
 {
-    if((GetTarget()->getClassMask() & CLASSMASK_WAND_USERS)!=0)
+    if ((GetTarget()->getClassMask() & CLASSMASK_WAND_USERS)!=0)
         return;
 
-    GetTarget()->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_VALUE, float(m_modifier.m_amount), apply);
+    GetTarget()->CheckAuraStackingAndApply(this, UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_VALUE, float(m_modifier.m_amount), apply);
 }
 
 void Aura::HandleAuraModAttackPowerPercent(bool apply, bool /*Real*/)
 {
     //UNIT_FIELD_ATTACK_POWER_MULTIPLIER = multiplier - 1
-    GetTarget()->HandleStatModifier(UNIT_MOD_ATTACK_POWER, TOTAL_PCT, float(m_modifier.m_amount), apply);
+    GetTarget()->CheckAuraStackingAndApply(this, UNIT_MOD_ATTACK_POWER, TOTAL_PCT, float(m_modifier.m_amount), apply);
 }
 
 void Aura::HandleAuraModRangedAttackPowerPercent(bool apply, bool /*Real*/)
 {
-    if((GetTarget()->getClassMask() & CLASSMASK_WAND_USERS)!=0)
+    if ((GetTarget()->getClassMask() & CLASSMASK_WAND_USERS)!=0)
         return;
 
     //UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER = multiplier - 1
-    GetTarget()->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_PCT, float(m_modifier.m_amount), apply);
+    GetTarget()->CheckAuraStackingAndApply(this, UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_PCT, float(m_modifier.m_amount), apply);
 }
 
 void Aura::HandleAuraModRangedAttackPowerOfStatPercent(bool /*apply*/, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     // Recalculate bonus
-    if(GetTarget()->GetTypeId() == TYPEID_PLAYER && !(GetTarget()->getClassMask() & CLASSMASK_WAND_USERS))
+    if (GetTarget()->GetTypeId() == TYPEID_PLAYER && !(GetTarget()->getClassMask() & CLASSMASK_WAND_USERS))
         ((Player*)GetTarget())->UpdateAttackPowerAndDamage(true);
 }
 
 void Aura::HandleAuraModAttackPowerOfStatPercent(bool /*apply*/, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     // Recalculate bonus
-    if(GetTarget()->GetTypeId() == TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() == TYPEID_PLAYER)
         ((Player*)GetTarget())->UpdateAttackPowerAndDamage(false);
 }
 
 void Aura::HandleAuraModAttackPowerOfArmor(bool /*apply*/, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     // Recalculate bonus
-    if(GetTarget()->GetTypeId() == TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() == TYPEID_PLAYER)
         ((Player*)GetTarget())->UpdateAttackPowerAndDamage(false);
 }
 /********************************/
@@ -6324,10 +7792,10 @@ void Aura::HandleModDamageDone(bool apply, bool Real)
     Unit *target = GetTarget();
 
     // apply item specific bonuses for already equipped weapon
-    if(Real && target->GetTypeId() == TYPEID_PLAYER)
+    if (Real && target->GetTypeId() == TYPEID_PLAYER)
     {
         for(int i = 0; i < MAX_ATTACK; ++i)
-            if(Item* pItem = ((Player*)target)->GetWeaponForAttack(WeaponAttackType(i),true,false))
+            if (Item* pItem = ((Player*)target)->GetWeaponForAttack(WeaponAttackType(i),true,false))
                 ((Player*)target)->_ApplyWeaponDependentAuraDamageMod(pItem, WeaponAttackType(i), this, apply);
     }
 
@@ -6340,7 +7808,7 @@ void Aura::HandleModDamageDone(bool apply, bool Real)
     // with spell->EquippedItemClass and  EquippedItemSubClassMask and EquippedItemInventoryTypeMask
     // m_modifier.m_miscvalue comparison with item generated damage types
 
-    if((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL) != 0)
+    if ((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL) != 0)
     {
         // apply generic physical damage bonuses including wand case
         if (GetSpellProto()->EquippedItemClass == -1 || target->GetTypeId() != TYPEID_PLAYER)
@@ -6354,20 +7822,20 @@ void Aura::HandleModDamageDone(bool apply, bool Real)
             // done in Player::_ApplyWeaponDependentAuraMods
         }
 
-        if(target->GetTypeId() == TYPEID_PLAYER)
+        if (target->GetTypeId() == TYPEID_PLAYER)
         {
-            if(m_positive)
+            if (m_positive)
                 target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS, m_modifier.m_amount, apply);
             else
-                target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG, m_modifier.m_amount, apply);
+                target->ApplyModInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG, m_modifier.m_amount, apply);
         }
     }
 
     // Skip non magic case for speedup
-    if((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_MAGIC) == 0)
+    if ((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_MAGIC) == 0)
         return;
 
-    if( GetSpellProto()->EquippedItemClass != -1 || GetSpellProto()->EquippedItemInventoryTypeMask != 0 )
+    if (GetSpellProto()->EquippedItemClass != -1 || GetSpellProto()->EquippedItemInventoryTypeMask != 0)
     {
         // wand magic case (skip generic to all item spell bonuses)
         // done in Player::_ApplyWeaponDependentAuraMods
@@ -6378,9 +7846,9 @@ void Aura::HandleModDamageDone(bool apply, bool Real)
 
     // Magic damage modifiers implemented in Unit::SpellDamageBonusDone
     // This information for client side use only
-    if(target->GetTypeId() == TYPEID_PLAYER)
+    if (target->GetTypeId() == TYPEID_PLAYER)
     {
-        if(m_positive)
+        if (m_positive)
         {
             for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
             {
@@ -6393,11 +7861,14 @@ void Aura::HandleModDamageDone(bool apply, bool Real)
             for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
             {
                 if((m_modifier.m_miscvalue & (1<<i)) != 0)
-                    target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + i, m_modifier.m_amount, apply);
+                    target->ApplyModInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + i, m_modifier.m_amount, apply);
             }
         }
+
+        ((Player*)target)->UpdateSpellDamageAndHealingBonus();
+
         Pet* pet = target->GetPet();
-        if(pet)
+        if (pet)
             pet->UpdateAttackPowerAndDamage();
     }
 }
@@ -6408,10 +7879,10 @@ void Aura::HandleModDamagePercentDone(bool apply, bool Real)
     Unit *target = GetTarget();
 
     // apply item specific bonuses for already equipped weapon
-    if(Real && target->GetTypeId() == TYPEID_PLAYER)
+    if (Real && target->GetTypeId() == TYPEID_PLAYER)
     {
         for(int i = 0; i < MAX_ATTACK; ++i)
-            if(Item* pItem = ((Player*)target)->GetWeaponForAttack(WeaponAttackType(i),true,false))
+            if (Item* pItem = ((Player*)target)->GetWeaponForAttack(WeaponAttackType(i),true,false))
                 ((Player*)target)->_ApplyWeaponDependentAuraDamageMod(pItem, WeaponAttackType(i), this, apply);
     }
 
@@ -6424,7 +7895,7 @@ void Aura::HandleModDamagePercentDone(bool apply, bool Real)
     // with spell->EquippedItemClass and  EquippedItemSubClassMask and EquippedItemInventoryTypeMask
     // m_modifier.m_miscvalue comparison with item generated damage types
 
-    if((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL) != 0)
+    if ((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL) != 0)
     {
         // apply generic physical damage bonuses including wand case
         if (GetSpellProto()->EquippedItemClass == -1 || target->GetTypeId() != TYPEID_PLAYER)
@@ -6438,15 +7909,15 @@ void Aura::HandleModDamagePercentDone(bool apply, bool Real)
             // done in Player::_ApplyWeaponDependentAuraMods
         }
         // For show in client
-        if(target->GetTypeId() == TYPEID_PLAYER)
+        if (target->GetTypeId() == TYPEID_PLAYER)
             target->ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT, m_modifier.m_amount/100.0f, apply);
     }
 
     // Skip non magic case for speedup
-    if((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_MAGIC) == 0)
+    if ((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_MAGIC) == 0)
         return;
 
-    if( GetSpellProto()->EquippedItemClass != -1 || GetSpellProto()->EquippedItemInventoryTypeMask != 0 )
+    if (GetSpellProto()->EquippedItemClass != -1 || GetSpellProto()->EquippedItemInventoryTypeMask != 0)
     {
         // wand magic case (skip generic to all item spell bonuses)
         // done in Player::_ApplyWeaponDependentAuraMods
@@ -6457,7 +7928,7 @@ void Aura::HandleModDamagePercentDone(bool apply, bool Real)
 
     // Magic damage percent modifiers implemented in Unit::SpellDamageBonusDone
     // Send info to client
-    if(target->GetTypeId() == TYPEID_PLAYER)
+    if (target->GetTypeId() == TYPEID_PLAYER)
         for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
             target->ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT + i, m_modifier.m_amount/100.0f, apply);
 }
@@ -6465,7 +7936,7 @@ void Aura::HandleModDamagePercentDone(bool apply, bool Real)
 void Aura::HandleModOffhandDamagePercent(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "AURA MOD OFFHAND DAMAGE");
@@ -6480,33 +7951,34 @@ void Aura::HandleModOffhandDamagePercent(bool apply, bool Real)
 void Aura::HandleModPowerCostPCT(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     float amount = m_modifier.m_amount/100.0f;
     for(int i = 0; i < MAX_SPELL_SCHOOL; ++i)
-        if(m_modifier.m_miscvalue & (1<<i))
+        if (m_modifier.m_miscvalue & (1<<i))
             GetTarget()->ApplyModSignedFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER + i, amount, apply);
 }
 
 void Aura::HandleModPowerCost(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     for(int i = 0; i < MAX_SPELL_SCHOOL; ++i)
-        if(m_modifier.m_miscvalue & (1<<i))
+        if (m_modifier.m_miscvalue & (1<<i))
             GetTarget()->ApplyModInt32Value(UNIT_FIELD_POWER_COST_MODIFIER + i, m_modifier.m_amount, apply);
 }
 
 void Aura::HandleNoReagentUseAura(bool /*Apply*/, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
     Unit *target = GetTarget();
-    if(target->GetTypeId() != TYPEID_PLAYER)
+
+    if (target->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ClassFamilyMask mask;
@@ -6541,8 +8013,7 @@ void Aura::HandleShapeshiftBoosts(bool apply)
             MasterShaperSpellId = 48420;
             break;
         case FORM_TREE:
-            spellId1 = 5420;
-            spellId2 = 34123;
+            spellId1 = 34123;
             MasterShaperSpellId = 48422;
             break;
         case FORM_TRAVEL:
@@ -6595,9 +8066,7 @@ void Aura::HandleShapeshiftBoosts(bool apply)
             break;
         case FORM_SHADOW:
             spellId1 = 49868;
-
-            if(target->GetTypeId() == TYPEID_PLAYER)      // Spell 49868 have same category as main form spell and share cooldown
-                ((Player*)target)->RemoveSpellCooldown(49868);
+            spellId2 = 71167;
             break;
         case FORM_GHOSTWOLF:
             spellId1 = 67116;
@@ -6607,15 +8076,24 @@ void Aura::HandleShapeshiftBoosts(bool apply)
         case FORM_STEALTH:
         case FORM_CREATURECAT:
         case FORM_CREATUREBEAR:
+        default:
             break;
     }
 
-    if(apply)
+    if (apply)
     {
         if (spellId1)
+        {
+            if(target->GetTypeId() == TYPEID_PLAYER)
+                ((Player*)target)->RemoveSpellCooldown(spellId1);
             target->CastSpell(target, spellId1, true, NULL, this );
+        }
         if (spellId2)
+        {
+            if(target->GetTypeId() == TYPEID_PLAYER)
+                ((Player*)target)->RemoveSpellCooldown(spellId2);
             target->CastSpell(target, spellId2, true, NULL, this);
+        }
 
         if (target->GetTypeId() == TYPEID_PLAYER)
         {
@@ -6634,8 +8112,8 @@ void Aura::HandleShapeshiftBoosts(bool apply)
             for (Unit::SpellAuraHolderMap::iterator itr = tAuras.begin(); itr != tAuras.end();)
             {
                 SpellEntry const *spellInfo = itr->second->GetSpellProto();
-                if (itr->second->IsPassive() && spellInfo->HasAttribute(SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT)
-                    && (spellInfo->StancesNot & (1<<(form-1))))
+                if ((itr->second->IsPassive() && spellInfo->HasAttribute(SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT)
+                    && (spellInfo->StancesNot & (1<<(form-1)))) || (spellInfo->Id == 66530 && form == FORM_DIREBEAR))  // Improved Barkskin must not affect Dire Bear Form, but does not have correct data in dbc
                 {
                     target->RemoveAurasDueToSpell(itr->second->GetId());
                     itr = tAuras.begin();
@@ -6651,7 +8129,7 @@ void Aura::HandleShapeshiftBoosts(bool apply)
                 Unit::AuraList const& ShapeShifterAuras = target->GetAurasByType(SPELL_AURA_DUMMY);
                 for(Unit::AuraList::const_iterator i = ShapeShifterAuras.begin(); i != ShapeShifterAuras.end(); ++i)
                 {
-                    if ((*i)->GetSpellProto()->SpellIconID == 2851)
+                    if ((*i)->GetSpellProto()->GetSpellIconID() == 2851)
                     {
                         int32 ShiftMod = (*i)->GetModifier()->m_amount;
                         target->CastCustomSpell(target, MasterShaperSpellId, &ShiftMod, NULL, NULL, true);
@@ -6664,7 +8142,7 @@ void Aura::HandleShapeshiftBoosts(bool apply)
             if (((Player*)target)->HasSpell(17007))
             {
                 SpellEntry const *spellInfo = sSpellStore.LookupEntry(24932);
-                if (spellInfo && spellInfo->Stances & (1<<(form-1)))
+                if (spellInfo && (spellInfo->Stances & (1<<(form-1))))
                     target->CastSpell(target, 24932, true, NULL, this);
             }
 
@@ -6679,7 +8157,7 @@ void Aura::HandleShapeshiftBoosts(bool apply)
                 for (Unit::AuraList::const_iterator i = modAuras.begin(); i != modAuras.end(); ++i)
                 {
                     if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DRUID &&
-                        (*i)->GetSpellProto()->SpellIconID == 961)
+                        (*i)->GetSpellProto()->GetSpellIconID() == 961)
                     {
                         int32 bp = (*i)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_2);
                         if (bp)
@@ -6696,7 +8174,7 @@ void Aura::HandleShapeshiftBoosts(bool apply)
                 for(Unit::AuraList::const_iterator i = dummyAuras.begin(); i != dummyAuras.end(); ++i)
                 {
                     if ((*i)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_DRUID &&
-                        (*i)->GetSpellProto()->SpellIconID == 2855)
+                        (*i)->GetSpellProto()->GetSpellIconID() == 2855)
                     {
                         uint32 spell_id = 0;
                         switch((*i)->GetId())
@@ -6709,7 +8187,7 @@ void Aura::HandleShapeshiftBoosts(bool apply)
                                 break;
                         }
 
-                        if(spell_id)
+                        if (spell_id)
                             target->CastSpell(target, spell_id, true, NULL, this);
                         break;
                     }
@@ -6722,10 +8200,10 @@ void Aura::HandleShapeshiftBoosts(bool apply)
                 Unit::AuraList const& mModTotalStatPct = target->GetAurasByType(SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE);
                 for(Unit::AuraList::const_iterator i = mModTotalStatPct.begin(); i != mModTotalStatPct.end(); ++i)
                 {
-                    if ((*i)->GetSpellProto()->SpellIconID == 240 && (*i)->GetModifier()->m_miscvalue == 3)
+                    if ((*i)->GetSpellProto()->GetSpellIconID() == 240 && (*i)->GetModifier()->m_miscvalue == 3)
                     {
                         int32 HotWMod = (*i)->GetModifier()->m_amount;
-                        if(GetModifier()->m_miscvalue == FORM_CAT)
+                        if (GetModifier()->m_miscvalue == FORM_CAT  || GetModifier()->m_miscvalue == FORM_BEAR || GetModifier()->m_miscvalue == FORM_DIREBEAR)
                             HotWMod /= 2;
 
                         target->CastCustomSpell(target, HotWSpellId, &HotWMod, NULL, NULL, true, NULL, this);
@@ -6737,11 +8215,11 @@ void Aura::HandleShapeshiftBoosts(bool apply)
     }
     else
     {
-        if(spellId1)
+        if (spellId1)
             target->RemoveAurasDueToSpell(spellId1);
-        if(spellId2)
+        if (spellId2)
             target->RemoveAurasDueToSpell(spellId2);
-        if(MasterShaperSpellId)
+        if (MasterShaperSpellId)
             target->RemoveAurasDueToSpell(MasterShaperSpellId);
 
         if (target->GetTypeId() == TYPEID_PLAYER)
@@ -6776,42 +8254,64 @@ void Aura::HandleShapeshiftBoosts(bool apply)
 
 void Aura::HandleAuraEmpathy(bool apply, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_UNIT)
+    if (GetTarget()->GetTypeId() != TYPEID_UNIT)
         return;
 
     CreatureInfo const * ci = ObjectMgr::GetCreatureTemplate(GetTarget()->GetEntry());
-    if(ci && ci->type == CREATURE_TYPE_BEAST)
+    if (ci && ci->CreatureType == CREATURE_TYPE_BEAST)
         GetTarget()->ApplyModUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_SPECIALINFO, apply);
 }
 
 void Aura::HandleAuraUntrackable(bool apply, bool /*Real*/)
-{
-    if(apply)
-        GetTarget()->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNTRACKABLE);
-    else
-        GetTarget()->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNTRACKABLE);
-}
-
-void Aura::HandleAuraModPacify(bool apply, bool /*Real*/)
 {
     if (apply)
-        GetTarget()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
+        GetTarget()->SetByteFlag(UNIT_FIELD_BYTES_1, 2, UNIT_STAND_FLAGS_UNTRACKABLE);
     else
-        GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
-}
+    {
+        // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit
+        Unit::AuraList const& auras = GetTarget()->GetAurasByType(SPELL_AURA_UNTRACKABLE);
+        if ( auras.size() > 1)
+            return;
 
-void Aura::HandleAuraModPacifyAndSilence(bool apply, bool Real)
-{
-    HandleAuraModPacify(apply, Real);
-    HandleAuraModSilence(apply, Real);
+        GetTarget()->RemoveByteFlag(UNIT_FIELD_BYTES_1, 2, UNIT_STAND_FLAGS_UNTRACKABLE);
+    }
+}
+
+void Aura::HandleAuraModPacify(bool apply, bool Real)
+{
+    // only at real add/remove aura
+    if (!Real)
+        return;
+
+    Unit* pTarget = GetTarget();
+    if (!pTarget)
+        return;
+
+    if (apply)
+    {
+        pTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
+        pTarget->AttackStop();
+    }
+    else
+    {
+        if (!pTarget->HasAuraType(SPELL_AURA_MOD_PACIFY) &&
+            !pTarget->HasAuraType(SPELL_AURA_MOD_PACIFY_SILENCE))
+            pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
+    }
+}
+
+void Aura::HandleAuraModPacifyAndSilence(bool apply, bool Real)
+{
+    HandleAuraModPacify(apply, Real);
+    HandleAuraModSilence(apply, Real);
 }
 
 void Aura::HandleAuraGhost(bool apply, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    if(apply)
+    if (apply)
     {
         GetTarget()->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST);
     }
@@ -6824,15 +8324,16 @@ void Aura::HandleAuraGhost(bool apply, bool /*Real*/)
 void Aura::HandleAuraAllowFlight(bool apply, bool Real)
 {
     // all applied/removed only at real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     // allow fly
     WorldPacket data;
-    if(apply)
+    if (apply)
         data.Initialize(SMSG_MOVE_SET_CAN_FLY, 12);
     else
         data.Initialize(SMSG_MOVE_UNSET_CAN_FLY, 12);
+
     data << GetTarget()->GetPackGUID();
     data << uint32(0);                                      // unk
     GetTarget()->SendMessageToSet(&data, true);
@@ -6841,10 +8342,10 @@ void Aura::HandleAuraAllowFlight(bool apply, bool Real)
 void Aura::HandleModRating(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     for (uint32 rating = 0; rating < MAX_COMBAT_RATING; ++rating)
@@ -6855,10 +8356,10 @@ void Aura::HandleModRating(bool apply, bool Real)
 void Aura::HandleModRatingFromStat(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
     // Just recalculate ratings
     for (uint32 rating = 0; rating < MAX_COMBAT_RATING; ++rating)
@@ -6868,10 +8369,10 @@ void Aura::HandleModRatingFromStat(bool apply, bool Real)
 
 void Aura::HandleForceMoveForward(bool apply, bool Real)
 {
-    if(!Real)
+    if (!Real)
         return;
 
-    if(apply)
+    if (apply)
         GetTarget()->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FORCE_MOVE);
     else
         GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FORCE_MOVE);
@@ -6879,7 +8380,7 @@ void Aura::HandleForceMoveForward(bool apply, bool Real)
 
 void Aura::HandleAuraModExpertise(bool /*apply*/, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ((Player*)GetTarget())->UpdateExpertise(BASE_ATTACK);
@@ -6889,7 +8390,7 @@ void Aura::HandleAuraModExpertise(bool /*apply*/, bool /*Real*/)
 void Aura::HandleModTargetResistance(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
     Unit *target = GetTarget();
     // applied to damage as HandleNoImmediateEffect in Unit::CalculateAbsorbAndResist and Unit::CalcArmorReducedDamage
@@ -6905,23 +8406,20 @@ void Aura::HandleModTargetResistance(bool apply, bool Real)
 void Aura::HandleShieldBlockValue(bool apply, bool /*Real*/)
 {
     BaseModType modType = FLAT_MOD;
-    if(m_modifier.m_auraname == SPELL_AURA_MOD_SHIELD_BLOCKVALUE_PCT)
+    if (m_modifier.m_auraname == SPELL_AURA_MOD_SHIELD_BLOCKVALUE_PCT)
         modType = PCT_MOD;
 
-    if(GetTarget()->GetTypeId() == TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() == TYPEID_PLAYER)
         ((Player*)GetTarget())->HandleBaseModValue(SHIELD_BLOCK_VALUE, modType, float(m_modifier.m_amount), apply);
 }
 
 void Aura::HandleAuraRetainComboPoints(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
-        return;
-
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (!Real)
         return;
 
-    Player *target = (Player*)GetTarget();
+    Unit* target = GetTarget();
 
     // combo points was added in SPELL_EFFECT_ADD_COMBO_POINTS handler
     // remove only if aura expire by time (in case combo points amount change aura removed without combo points lost)
@@ -6932,7 +8430,7 @@ void Aura::HandleAuraRetainComboPoints(bool apply, bool Real)
 
 void Aura::HandleModUnattackable( bool Apply, bool Real )
 {
-    if(Real && Apply)
+    if (Real && Apply)
      {
         GetTarget()->CombatStop();
         GetTarget()->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
@@ -6943,21 +8441,21 @@ void Aura::HandleModUnattackable( bool Apply, bool Real )
 void Aura::HandleSpiritOfRedemption( bool apply, bool Real )
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     Unit *target = GetTarget();
 
     // prepare spirit state
-    if(apply)
+    if (apply)
     {
-        if(target->GetTypeId()==TYPEID_PLAYER)
+        if (target->GetTypeId()==TYPEID_PLAYER)
         {
             // disable breath/etc timers
             ((Player*)target)->StopMirrorTimers();
 
             // set stand state (expected in this form)
-            if(!target->IsStandState())
+            if (!target->IsStandState())
                 target->SetStandState(UNIT_STAND_STATE_STAND);
         }
 
@@ -6970,11 +8468,11 @@ void Aura::HandleSpiritOfRedemption( bool apply, bool Real )
 
 void Aura::HandleSchoolAbsorb(bool apply, bool Real)
 {
-    if(!Real)
+    if (!Real)
         return;
 
     Unit* caster = GetCaster();
-    if(!caster)
+    if (!caster)
         return;
 
     Unit *target = GetTarget();
@@ -6994,44 +8492,83 @@ void Aura::HandleSchoolAbsorb(bool apply, bool Real)
                     break;
                 case SPELLFAMILY_PRIEST:
                     // Power Word: Shield
-                    if (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000001))
+                    if (spellProto->GetSpellFamilyFlags().test<CF_PRIEST_POWER_WORD_SHIELD>())
                     {
                         //+80.68% from +spell bonus
-                        DoneActualBenefit = caster->SpellBaseHealingBonusDone(GetSpellSchoolMask(spellProto)) * 0.8068f;
+                        int32 spellPower = caster->SpellBaseHealingBonusDone(GetSpellSchoolMask(spellProto));
+                        float SpellBonus = spellPower * 0.8068f;
                         //Borrowed Time
                         Unit::AuraList const& borrowedTime = caster->GetAurasByType(SPELL_AURA_DUMMY);
                         for(Unit::AuraList::const_iterator itr = borrowedTime.begin(); itr != borrowedTime.end(); ++itr)
                         {
                             SpellEntry const* i_spell = (*itr)->GetSpellProto();
-                            if(i_spell->SpellFamilyName==SPELLFAMILY_PRIEST && i_spell->SpellIconID == 2899 && i_spell->EffectMiscValue[(*itr)->GetEffIndex()] == 24)
+                            if (i_spell->SpellFamilyName==SPELLFAMILY_PRIEST && i_spell->GetSpellIconID() == 2899 && i_spell->EffectMiscValue[(*itr)->GetEffIndex()] == 24)
+                            {
+                                SpellBonus += spellPower * (*itr)->GetModifier()->m_amount / 100;
+                                break;
+                            }
+                        }
+                        // extra absorb from talents
+                        int32 BaseBonus = 0, PctAddMod = 0;
+                        Unit::AuraList const& pctModAuras = caster->GetAurasByType(SPELL_AURA_ADD_PCT_MODIFIER);
+                        for (Unit::AuraList::const_iterator itr = pctModAuras.begin(); itr != pctModAuras.end(); ++itr)
+                        {
+                            SpellEntry const* i_spell = (*itr)->GetSpellProto();
+                            if (i_spell->SpellFamilyName != SPELLFAMILY_PRIEST || (*itr)->GetEffIndex() != EFFECT_INDEX_0)
+                                continue;
+                            // Twin Disciplines / Spiritual Healing
+                            if (i_spell->GetSpellIconID() == 2292 || i_spell->GetSpellIconID() == 46)
+                                PctAddMod += (*itr)->GetModifier()->m_amount;
+                            // Improved Power Word: Shield
+                            else if (i_spell->GetSpellIconID() == 566)
+                                SpellBonus *= (100.0f + (*itr)->GetModifier()->m_amount) / 100.0f;
+                            // Item - Priest T10 Healer 4P Bonus
+                            else if (i_spell->Id == 70798)
+                            {
+                                BaseBonus -= m_modifier.m_amount * (*itr)->GetModifier()->m_amount / 100;   // base bonus already added as SPELLMOD_ALL_EFFECTS
+                                PctAddMod += (*itr)->GetModifier()->m_amount;
+                            }
+                        }
+                        Unit::AuraList const& healingPctAuras = caster->GetAurasByType(SPELL_AURA_MOD_HEALING_DONE_PERCENT);
+                        for (Unit::AuraList::const_iterator itr = healingPctAuras.begin(); itr != healingPctAuras.end(); ++itr)
+                        {
+                            SpellEntry const* i_spell = (*itr)->GetSpellProto();
+                            // Focused Power
+                            if (i_spell->SpellFamilyName == SPELLFAMILY_PRIEST && i_spell->GetSpellIconID() == 2210)
                             {
-                                DoneActualBenefit += DoneActualBenefit * (*itr)->GetModifier()->m_amount / 100;
+                                PctAddMod += (*itr)->GetModifier()->m_amount;
                                 break;
                             }
                         }
+                        if (PctAddMod)
+                        {
+                            BaseBonus += m_modifier.m_amount * PctAddMod / 100;
+                            SpellBonus *= (100.0f + PctAddMod) / 100.0f;
+                        }
+                        DoneActualBenefit = BaseBonus + SpellBonus;
                     }
 
                     break;
                 case SPELLFAMILY_MAGE:
                     // Frost Ward, Fire Ward
-                    if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000000108)))
+                    if (spellProto->GetSpellFamilyFlags().test<CF_MAGE_FIRE_WARD, CF_MAGE_FROST_WARD>())
                         //+10% from +spell bonus
                         DoneActualBenefit = caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(spellProto)) * 0.1f;
                     // Ice Barrier
-                    else if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000000100000000)))
+                    else if (spellProto->GetSpellFamilyFlags().test<CF_MAGE_ICE_BARRIER>())
                         //+80.67% from +spell bonus
                         DoneActualBenefit = caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(spellProto)) * 0.8067f;
                     break;
                 case SPELLFAMILY_WARLOCK:
                     // Shadow Ward
-                    if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000000000), 0x00000040))
+                    if (spellProto->GetSpellFamilyFlags().test<CF_WARLOCK_MISC_BUFFS>())
                         //+30% from +spell bonus
                         DoneActualBenefit = caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(spellProto)) * 0.30f;
                     break;
                 case SPELLFAMILY_PALADIN:
                     // Sacred Shield
                     // (check not strictly needed, only Sacred Shield has SPELL_AURA_SCHOOL_ABSORB in SPELLFAMILY_PALADIN at this time)
-                    if (spellProto->IsFitToFamilyMask(UI64LIT(0x0008000000000000)))
+                    if (spellProto->GetSpellFamilyFlags().test<CF_PALADIN_SACRED_SHIELD>())
                     {
                         // +75% from spell power
                         DoneActualBenefit = caster->SpellBaseHealingBonusDone(GetSpellSchoolMask(spellProto)) * 0.75f;
@@ -7044,225 +8581,269 @@ void Aura::HandleSchoolAbsorb(bool apply, bool Real)
             DoneActualBenefit *= caster->CalculateLevelPenalty(GetSpellProto());
 
             m_modifier.m_amount += (int32)DoneActualBenefit;
+            m_modifier.m_baseamount += (int32)DoneActualBenefit;
         }
     }
     else
     {
-        if (caster &&
-            // Power Word: Shield
-            spellProto->SpellFamilyName == SPELLFAMILY_PRIEST && spellProto->Mechanic == MECHANIC_SHIELD &&
-            (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000001)) &&
-            // completely absorbed or dispelled
-            (m_removeMode == AURA_REMOVE_BY_SHIELD_BREAK || m_removeMode == AURA_REMOVE_BY_DISPEL))
+        if (caster && caster->GetTypeId() == TYPEID_PLAYER && spellProto->Id == 47788 &&
+            m_removeMode == AURA_REMOVE_BY_EXPIRE)
         {
-            Unit::AuraList const& vDummyAuras = caster->GetAurasByType(SPELL_AURA_DUMMY);
-            for(Unit::AuraList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr)
+            if (Aura *aur = caster->GetAura(63231, EFFECT_INDEX_0))
             {
-                SpellEntry const* vSpell = (*itr)->GetSpellProto();
-
-                // Rapture (main spell)
-                if(vSpell->SpellFamilyName == SPELLFAMILY_PRIEST && vSpell->SpellIconID == 2894 && vSpell->Effect[EFFECT_INDEX_1])
-                {
-                    switch((*itr)->GetEffIndex())
-                    {
-                        case EFFECT_INDEX_0:
-                        {
-                            // energize caster
-                            int32 manapct1000 = 5 * ((*itr)->GetModifier()->m_amount + sSpellMgr.GetSpellRank(vSpell->Id));
-                            int32 basepoints0 = caster->GetMaxPower(POWER_MANA) * manapct1000 / 1000;
-                            caster->CastCustomSpell(caster, 47755, &basepoints0, NULL, NULL, true);
-                            break;
-                        }
-                        case EFFECT_INDEX_1:
-                        {
-                            // energize target
-                            if (!roll_chance_i((*itr)->GetModifier()->m_amount) || caster->HasAura(63853))
-                                break;
-
-                            switch(target->getPowerType())
-                            {
-                                case POWER_RUNIC_POWER:
-                                    target->CastSpell(target, 63652, true, NULL, NULL, GetCasterGuid());
-                                    break;
-                                case POWER_RAGE:
-                                    target->CastSpell(target, 63653, true, NULL, NULL, GetCasterGuid());
-                                    break;
-                                case POWER_MANA:
-                                    {
-                                        int32 basepoints0 = target->GetMaxPower(POWER_MANA) * 2 / 100;
-                                        target->CastCustomSpell(target, 63654, &basepoints0, NULL, NULL, true);
-                                        break;
-                                    }
-                                case POWER_ENERGY:
-                                    target->CastSpell(target, 63655, true, NULL, NULL, GetCasterGuid());
-                                    break;
-                                default:
-                                    break;
-                            }
-
-                            //cooldown aura
-                            caster->CastSpell(caster, 63853, true);
-                            break;
-                        }
-                        default:
-                            sLog.outError("Changes in R-dummy spell???: effect 3");
-                            break;
-                    }
-                }
+                ((Player*)caster)->SendModifyCooldown(spellProto->Id,-aur->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_0)*IN_MILLISECONDS);
             }
         }
+        // Shield of Runes (Runemaster Molgeim: Ulduar)
+        else if ((GetId() == 62274 || GetId() == 63489) && m_removeMode == AURA_REMOVE_BY_SHIELD_BREAK)
+        {
+            uint32 trigger_spell_Id = GetId() == 62274 ? 62277 : 63967;
+            target->CastSpell(target, trigger_spell_Id, true);
+        }
     }
 }
 
 void Aura::PeriodicTick()
 {
-    Unit *target = GetTarget();
+    Unit* target = GetTarget();
+    SpellAuraHolderPtr holder = GetHolder();
     SpellEntry const* spellProto = GetSpellProto();
 
-    switch(m_modifier.m_auraname)
+    if (!holder || !target || !spellProto)
+        return;
+
+    if (target->IsImmuneToSpell(spellProto, GetAffectiveCaster() ? GetAffectiveCaster()->IsFriendlyTo(target) : true))
+        return;
+
+    switch (m_modifier.m_auraname)
     {
         case SPELL_AURA_PERIODIC_DAMAGE:
         case SPELL_AURA_PERIODIC_DAMAGE_PERCENT:
         {
             // don't damage target if not alive, possible death persistent effects
-            if (!target->isAlive())
+            if (!target->IsInWorld() || !target->isAlive())
+                return;
+
+            Unit* pCaster = GetAffectiveCaster();
+            if (!pCaster)
                 return;
 
-            Unit *pCaster = GetCaster();
-            if(!pCaster)
+            if (!pCaster->IsInWorld())
                 return;
 
-            if( spellProto->Effect[GetEffIndex()] == SPELL_EFFECT_PERSISTENT_AREA_AURA &&
-                pCaster->SpellHitResult(target, spellProto, false) != SPELL_MISS_NONE)
+            if (spellProto->Effect[GetEffIndex()] == SPELL_EFFECT_PERSISTENT_AREA_AURA &&
+                pCaster->SpellHitResult(target, spellProto, true) != SPELL_MISS_NONE)
                 return;
 
             // Check for immune (not use charges)
-            if(target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
+            if (IsSpellCauseDamage(spellProto) && target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
                 return;
 
             // some auras remove at specific health level or more
-            if(m_modifier.m_auraname == SPELL_AURA_PERIODIC_DAMAGE)
+            switch (GetId())
             {
-                switch(GetId())
+                case 31956:
+                case 35321:
+                case 38363:
+                case 38801:
+                case 39215:
+                case 43093:
+                case 48920:
+                case 70292:
+                case 71316:
+                case 71317:
+                {
+                    if (target->GetHealth() == target->GetMaxHealth())
+                    {
+                        target->RemoveAurasDueToSpell(GetId());
+                        return;
+                    }
+                    break;
+                }
+                case 38772:
                 {
-                    case 43093: case 31956: case 38801:
-                    case 35321: case 38363: case 39215:
-                    case 48920:
+                    uint32 percent =
+                        GetEffIndex() < EFFECT_INDEX_2 && spellProto->Effect[GetEffIndex()] == SPELL_EFFECT_DUMMY ?
+                        pCaster->CalculateSpellDamage(target, spellProto, SpellEffectIndex(GetEffIndex() + 1)) :
+                        100;
+                    if (target->GetHealth() * 100 >= target->GetMaxHealth() * percent)
                     {
-                        if(target->GetHealth() == target->GetMaxHealth() )
-                        {
-                            target->RemoveAurasDueToSpell(GetId());
-                            return;
-                        }
-                        break;
+                        target->RemoveAurasDueToSpell(GetId());
+                        return;
                     }
-                    case 38772:
+                    break;
+                }
+                case 70541: // Infest (Lich King)
+                case 73779:
+                case 73780:
+                case 73781:
+                {
+                    if (target->GetHealth() >= target->GetMaxHealth() * 0.9f )
                     {
-                        uint32 percent =
-                            GetEffIndex() < EFFECT_INDEX_2 && spellProto->Effect[GetEffIndex()] == SPELL_EFFECT_DUMMY ?
-                            pCaster->CalculateSpellDamage(target, spellProto, SpellEffectIndex(GetEffIndex() + 1)) :
-                            100;
-                        if(target->GetHealth() * 100 >= target->GetMaxHealth() * percent )
-                        {
-                            target->RemoveAurasDueToSpell(GetId());
-                            return;
-                        }
-                        break;
+                        target->RemoveAurasDueToSpell(GetId());
+                        return;
                     }
-                    default:
-                        break;
+                    else
+                    {
+                        // increasing damage (15% more each tick)
+                        // don't increase first tick damage
+                        if (GetModifier()->m_miscvalue > 0)
+                            GetModifier()->m_amount = GetModifier()->m_amount * 1.15f;
+                        else
+                            GetModifier()->m_miscvalue += 1;
+                    }
+                    break;
+                }
+                case 70672: // Gaseous Bloat (Putricide)
+                case 72455:
+                case 72832:
+                case 72833:
+                {
+                    // drop 1 stack
+                    if (GetHolder()->ModStackAmount(-1))
+                    {
+                        target->RemoveAurasDueToSpell(GetId());
+                        return;
+                    }
+
+                    break;
+                }
+                case 74562: // SPELL_FIERY_COMBUSTION - Ruby sanctum boss Halion, added mark (74567, dummy) every tick
+                {
+                    target->CastSpell(target, 74567, true, NULL, NULL, GetCasterGuid());
+                    break;
+                }
+                case 74792: // SPELL_SOUL_CONSUMPTION - Ruby sanctum boss Halion, added mark (74795, dummy) every tick
+                {
+                    target->CastSpell(target, 74795, true, NULL, NULL, GetCasterGuid());
+                    break;
                 }
+                case 67297:
+                case 65950:
+                    pCaster->CastSpell(target, 65951, true);
+                    break;
+                case 66001:
+                case 67282:
+                    pCaster->CastSpell(target, 66002, true);
+                    break;
+                case 67281:
+                case 67283:
+                    pCaster->CastSpell(target, 66000, true);
+                    break;
+                case 67296:
+                case 67298:
+                    pCaster->CastSpell(target, 65952, true);
+                    break;
+                // Unbound Plague (Putricide)
+                case 70911:
+                case 72854:
+                case 72855:
+                case 72856:
+                    m_modifier.m_miscvalue += 1; // store ticks number in miscvalue
+                    m_modifier.m_amount = m_modifier.m_baseamount * pow(2.7f, m_modifier.m_miscvalue * 0.223f);
+                    break;
+                // Boiling Blood (Saurfang)
+                case 72385:
+                case 72441:
+                case 72442:
+                case 72443:
+                    target->CastSpell(target, 72202, true); // Blood Link
+                    break;
+                default:
+                    break;
             }
 
-            uint32 absorb = 0;
-            uint32 resist = 0;
-            CleanDamage cleanDamage =  CleanDamage(0, BASE_ATTACK, MELEE_HIT_NORMAL );
+            DamageInfo damageInfo = DamageInfo(pCaster, target, spellProto);
+            damageInfo.CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL);
+            damageInfo.damageType = DOT;
 
             // ignore non positive values (can be result apply spellmods to aura damage
             uint32 amount = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
 
-            uint32 pdamage;
-
-            if(m_modifier.m_auraname == SPELL_AURA_PERIODIC_DAMAGE)
-                pdamage = amount;
+            if (m_modifier.m_auraname == SPELL_AURA_PERIODIC_DAMAGE)
+                damageInfo.damage = amount;
             else
-                pdamage = uint32(target->GetMaxHealth()*amount/100);
+                damageInfo.damage = uint32(target->GetMaxHealth()*amount/100);
 
             // SpellDamageBonus for magic spells
-            if(spellProto->DmgClass == SPELL_DAMAGE_CLASS_NONE || spellProto->DmgClass == SPELL_DAMAGE_CLASS_MAGIC)
-                pdamage = target->SpellDamageBonusTaken(pCaster, spellProto, pdamage, DOT, GetStackAmount());
+            if (spellProto->DmgClass == SPELL_DAMAGE_CLASS_NONE || spellProto->DmgClass == SPELL_DAMAGE_CLASS_MAGIC)
+                target->SpellDamageBonusTaken(&damageInfo,GetStackAmount());
             // MeleeDamagebonus for weapon based spells
             else
             {
-                WeaponAttackType attackType = GetWeaponAttackType(spellProto);
-                pdamage = target->MeleeDamageBonusTaken(pCaster, pdamage, attackType, spellProto, DOT, GetStackAmount());
+                damageInfo.attackType = GetWeaponAttackType(spellProto);
+                target->MeleeDamageBonusTaken(&damageInfo, GetStackAmount());
             }
 
             // Calculate armor mitigation if it is a physical spell
-            // But not for bleed mechanic spells
-            if (GetSpellSchoolMask(spellProto) & SPELL_SCHOOL_MASK_NORMAL &&
-                GetEffectMechanic(spellProto, m_effIndex) != MECHANIC_BLEED)
+            if (Unit::IsDamageReducedByArmor(GetSpellSchoolMask(spellProto), spellProto, GetEffIndex()))
             {
-                uint32 pdamageReductedArmor = pCaster->CalcArmorReducedDamage(target, pdamage);
-                cleanDamage.damage += pdamage - pdamageReductedArmor;
-                pdamage = pdamageReductedArmor;
+                uint32 pdamageReductedArmor = pCaster->CalcArmorReducedDamage(target, damageInfo.damage);
+                damageInfo.cleanDamage += damageInfo.damage - pdamageReductedArmor;
+                damageInfo.damage = pdamageReductedArmor;
             }
 
             // Curse of Agony damage-per-tick calculation
-            if (spellProto->SpellFamilyName==SPELLFAMILY_WARLOCK && (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000400)) && spellProto->SpellIconID==544)
+            if (spellProto->SpellFamilyName==SPELLFAMILY_WARLOCK && spellProto->GetSpellFamilyFlags().test<CF_WARLOCK_CURSE_OF_AGONY>() && spellProto->GetSpellIconID()==544)
             {
                 // 1..4 ticks, 1/2 from normal tick damage
                 if (GetAuraTicks() <= 4)
-                    pdamage = pdamage/2;
+                    damageInfo.damage = damageInfo.damage/2;
                 // 9..12 ticks, 3/2 from normal tick damage
-                else if(GetAuraTicks() >= 9)
-                    pdamage += (pdamage + 1) / 2;       // +1 prevent 0.5 damage possible lost at 1..4 ticks
+                else if (GetAuraTicks() >= 9)
+                    damageInfo.damage += (damageInfo.damage + 1) / 2;       // +1 prevent 0.5 damage possible lost at 1..4 ticks
                 // 5..8 ticks have normal tick damage
             }
 
             // This method can modify pdamage
-            bool isCrit = IsCritFromAbilityAura(pCaster, pdamage);
+            bool isCrit = IsCritFromAbilityAura(pCaster, &damageInfo);
 
             // send critical in hit info for threat calculation
             if (isCrit)
             {
-                cleanDamage.hitOutCome = MELEE_HIT_CRIT;
+                damageInfo.hitOutCome = MELEE_HIT_CRIT;
                 // Resilience - reduce crit damage
-                pdamage -= target->GetSpellCritDamageReduction(pdamage);
+                damageInfo.damage -= target->GetSpellCritDamageReduction(damageInfo.damage);
             }
 
             // only from players
             // FIXME: need use SpellDamageBonus instead?
             if (pCaster->GetTypeId() == TYPEID_PLAYER)
-                pdamage -= target->GetSpellDamageReduction(pdamage);
-
-            target->CalculateDamageAbsorbAndResist(pCaster, GetSpellSchoolMask(spellProto), DOT, pdamage, &absorb, &resist, !GetSpellProto()->HasAttribute(SPELL_ATTR_EX2_CANT_REFLECTED));
+                damageInfo.damage -= target->GetSpellDamageReduction(damageInfo.damage);
 
-            DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s attacked %s for %u dmg inflicted by %u abs is %u",
-                GetCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), pdamage, GetId(),absorb);
+            if (GetSpellProto()->Id == 50344) // Dream Funnel Oculus drake spell
+                damageInfo.damage = uint32(pCaster->GetMaxHealth()*0.05f);
 
-            pCaster->DealDamageMods(target, pdamage, &absorb);
+            target->CalculateDamageAbsorbAndResist(pCaster, &damageInfo, !GetSpellProto()->HasAttribute(SPELL_ATTR_EX_CANT_REFLECTED));
 
-            // Set trigger flag
-            uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC; //  | PROC_FLAG_SUCCESSFUL_HARMFUL_SPELL_HIT;
-            uint32 procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;// | PROC_FLAG_TAKEN_HARMFUL_SPELL_HIT;
-            uint32 procEx = isCrit ? PROC_EX_CRITICAL_HIT : PROC_EX_NORMAL_HIT;
+            DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s attacked %s for %u dmg inflicted by %u abs is %u",
+                GetAffectiveCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), damageInfo.damage, GetId(), damageInfo.GetAbsorb());
 
-            pdamage = (pdamage <= absorb + resist) ? 0 : (pdamage - absorb - resist);
+            pCaster->DealDamageMods(&damageInfo);
 
-            uint32 overkill = pdamage > target->GetHealth() ? pdamage - target->GetHealth() : 0;
-            SpellPeriodicAuraLogInfo pInfo(this, pdamage, overkill, absorb, resist, 0.0f, isCrit);
+            uint32 overkill = damageInfo.damage > target->GetHealth() ? damageInfo.damage - target->GetHealth() : 0;
+            SpellPeriodicAuraLogInfo pInfo(this, damageInfo.damage, overkill, damageInfo.GetAbsorb(), damageInfo.resist, 0.0f, isCrit);
             target->SendPeriodicAuraLog(&pInfo);
 
-            if (pdamage)
-                procVictim|=PROC_FLAG_TAKEN_ANY_DAMAGE;
+            // Set trigger flag
+            damageInfo.procAttacker = PROC_FLAG_ON_DO_PERIODIC; //  | PROC_FLAG_SUCCESSFUL_HARMFUL_SPELL_HIT;
+            damageInfo.procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;// | PROC_FLAG_TAKEN_HARMFUL_SPELL_HIT;
+            damageInfo.procEx = isCrit ? PROC_EX_CRITICAL_HIT : PROC_EX_NORMAL_HIT;
 
-            pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, procEx, pdamage, BASE_ATTACK, spellProto);
+            // damage may be changed in DealDamageMods above, so change flags
+            if (!damageInfo.damage)
+                damageInfo.procEx     &= ~PROC_EX_DIRECT_DAMAGE;
+            else
+            {
+                damageInfo.procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
+                damageInfo.procEx     |= PROC_EX_DIRECT_DAMAGE;
+            }
 
-            pCaster->DealDamage(target, pdamage, &cleanDamage, DOT, GetSpellSchoolMask(spellProto), spellProto, true);
+            pCaster->ProcDamageAndSpell(&damageInfo);
+            pCaster->DealDamage(target, &damageInfo, true);
 
             // Drain Soul (chance soul shard)
-            if (pCaster->GetTypeId() == TYPEID_PLAYER && spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && spellProto->SpellFamilyFlags & UI64LIT(0x0000000000004000))
+            if (pCaster->GetTypeId() == TYPEID_PLAYER && spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && spellProto->GetSpellFamilyFlags().test<CF_WARLOCK_DRAIN_SOUL>())
             {
                 // Only from non-grey units
                 if (roll_chance_i(10) &&                    // 1-2 from drain with final and without glyph, 0-1 from damage
@@ -7279,77 +8860,80 @@ void Aura::PeriodicTick()
         case SPELL_AURA_PERIODIC_HEALTH_FUNNEL:
         {
             // don't damage target if not alive, possible death persistent effects
-            if (!target->isAlive())
+            if (!target->IsInWorld() || !target->isAlive())
                 return;
 
-            Unit *pCaster = GetCaster();
-            if(!pCaster)
+            Unit* pCaster = GetAffectiveCaster();
+            if (!pCaster)
                 return;
 
-            if(!pCaster->isAlive())
+            if (!pCaster->IsInWorld() || !pCaster->isAlive())
                 return;
 
-            if( spellProto->Effect[GetEffIndex()] == SPELL_EFFECT_PERSISTENT_AREA_AURA &&
-                pCaster->SpellHitResult(target, spellProto, false) != SPELL_MISS_NONE)
+            if (spellProto->Effect[GetEffIndex()] == SPELL_EFFECT_PERSISTENT_AREA_AURA &&
+                pCaster->SpellHitResult(target, spellProto, true) != SPELL_MISS_NONE)
                 return;
 
             // Check for immune
-            if(target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
+            if (IsSpellCauseDamage(spellProto) && target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
                 return;
 
-            uint32 absorb=0;
-            uint32 resist=0;
-            CleanDamage cleanDamage =  CleanDamage(0, BASE_ATTACK, MELEE_HIT_NORMAL );
+            DamageInfo damageInfo = DamageInfo(pCaster, target, spellProto);
+            damageInfo.CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL );
+            damageInfo.damageType = DOT;
 
-            uint32 pdamage = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
+            damageInfo.damage = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
 
-            //Calculate armor mitigation if it is a physical spell
-            if (GetSpellSchoolMask(spellProto) & SPELL_SCHOOL_MASK_NORMAL)
+            // Calculate armor mitigation if it is a physical spell
+            if (Unit::IsDamageReducedByArmor(GetSpellSchoolMask(spellProto), spellProto, GetEffIndex()))
             {
-                uint32 pdamageReductedArmor = pCaster->CalcArmorReducedDamage(target, pdamage);
-                cleanDamage.damage += pdamage - pdamageReductedArmor;
-                pdamage = pdamageReductedArmor;
+                uint32 pdamageReductedArmor = pCaster->CalcArmorReducedDamage(target, damageInfo.damage);
+                damageInfo.cleanDamage += damageInfo.damage - pdamageReductedArmor;
+                damageInfo.damage = pdamageReductedArmor;
             }
 
-            pdamage = target->SpellDamageBonusTaken(pCaster, spellProto, pdamage, DOT, GetStackAmount());
+            target->SpellDamageBonusTaken(&damageInfo, GetStackAmount());
 
-            bool isCrit = IsCritFromAbilityAura(pCaster, pdamage);
+            bool isCrit = IsCritFromAbilityAura(pCaster, &damageInfo);
 
             // send critical in hit info for threat calculation
             if (isCrit)
             {
-                cleanDamage.hitOutCome = MELEE_HIT_CRIT;
+                damageInfo.hitOutCome = MELEE_HIT_CRIT;
                 // Resilience - reduce crit damage
-                pdamage -= target->GetSpellCritDamageReduction(pdamage);
+                damageInfo.damage -= target->GetSpellCritDamageReduction(damageInfo.damage);
             }
 
             // only from players
             // FIXME: need use SpellDamageBonus instead?
-            if (GetCasterGuid().IsPlayer())
-                pdamage -= target->GetSpellDamageReduction(pdamage);
+            if (GetAffectiveCasterGuid().IsPlayer())
+                damageInfo.damage -= target->GetSpellDamageReduction(damageInfo.damage);
 
-            target->CalculateDamageAbsorbAndResist(pCaster, GetSpellSchoolMask(spellProto), DOT, pdamage, &absorb, &resist, !spellProto->HasAttribute(SPELL_ATTR_EX2_CANT_REFLECTED));
+            target->CalculateDamageAbsorbAndResist(pCaster, &damageInfo, !spellProto->HasAttribute(SPELL_ATTR_EX_CANT_REFLECTED));
 
             DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s health leech of %s for %u dmg inflicted by %u abs is %u",
-                GetCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), pdamage, GetId(),absorb);
+                GetAffectiveCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), damageInfo.damage, GetId(),damageInfo.GetAbsorb());
 
-            pCaster->DealDamageMods(target, pdamage, &absorb);
+            pCaster->DealDamageMods(&damageInfo);
 
-            pCaster->SendSpellNonMeleeDamageLog(target, GetId(), pdamage, GetSpellSchoolMask(spellProto), absorb, resist, false, 0, isCrit);
-
-            float multiplier = spellProto->EffectMultipleValue[GetEffIndex()] > 0 ? spellProto->EffectMultipleValue[GetEffIndex()] : 1;
+            pCaster->SendSpellNonMeleeDamageLog(target, GetId(), damageInfo.damage, damageInfo.GetSchoolMask(), damageInfo.GetAbsorb(), damageInfo.resist, false, 0, isCrit);
 
             // Set trigger flag
-            uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC; //  | PROC_FLAG_SUCCESSFUL_HARMFUL_SPELL_HIT;
-            uint32 procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;// | PROC_FLAG_TAKEN_HARMFUL_SPELL_HIT;
-            uint32 procEx = isCrit ? PROC_EX_CRITICAL_HIT : PROC_EX_NORMAL_HIT;
+            damageInfo.procAttacker = PROC_FLAG_ON_DO_PERIODIC; //  | PROC_FLAG_SUCCESSFUL_HARMFUL_SPELL_HIT;
+            damageInfo.procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;// | PROC_FLAG_TAKEN_HARMFUL_SPELL_HIT;
+            damageInfo.procEx = isCrit ? PROC_EX_CRITICAL_HIT : PROC_EX_NORMAL_HIT;
 
-            pdamage = (pdamage <= absorb + resist) ? 0 : (pdamage-absorb-resist);
-            if (pdamage)
-                procVictim|=PROC_FLAG_TAKEN_ANY_DAMAGE;
+            // damage may be changed in DealDamageMods above, so change flags
+            if (!damageInfo.damage)
+                damageInfo.procEx     &= ~PROC_EX_DIRECT_DAMAGE;
+            else
+            {
+                damageInfo.procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
+                damageInfo.procEx     |= PROC_EX_DIRECT_DAMAGE;
+            }
 
-            pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, procEx, pdamage, BASE_ATTACK, spellProto);
-            int32 new_damage = pCaster->DealDamage(target, pdamage, &cleanDamage, DOT, GetSpellSchoolMask(spellProto), spellProto, false);
+            pCaster->ProcDamageAndSpell(&damageInfo);
+            int32 new_damage = pCaster->DealDamage(target, &damageInfo, false);
 
             if (!target->isAlive() && pCaster->IsNonMeleeSpellCasted(false))
                 for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
@@ -7357,7 +8941,9 @@ void Aura::PeriodicTick()
                         if (spell->m_spellInfo->Id == GetId())
                             spell->cancel();
 
-            if(Player *modOwner = pCaster->GetSpellModOwner())
+            float multiplier = spellProto->EffectMultipleValue[GetEffIndex()] > 0 ? spellProto->EffectMultipleValue[GetEffIndex()] : 1;
+
+            if (Player* modOwner = pCaster->GetSpellModOwner())
                 modOwner->ApplySpellMod(GetId(), SPELLMOD_MULTIPLE_VALUE, multiplier);
 
             int32 heal = pCaster->SpellHealingBonusTaken(pCaster, spellProto, int32(new_damage * multiplier), DOT, GetStackAmount());
@@ -7376,75 +8962,83 @@ void Aura::PeriodicTick()
             if (!target->isAlive())
                 return;
 
-            Unit *pCaster = GetCaster();
-            if(!pCaster)
+            Unit *pCaster = GetAffectiveCaster();
+            if (!pCaster)
+                return;
+
+            // Don't heal target if it is already at max health
+            if (target->GetHealth() == target->GetMaxHealth())
                 return;
 
             // heal for caster damage (must be alive)
-            if(target != pCaster && spellProto->SpellVisual[0] == 163 && !pCaster->isAlive())
+            if (target != pCaster && spellProto->GetSpellVisual() == 163 && !pCaster->isAlive())
                 return;
 
-            // ignore non positive values (can be result apply spellmods to aura damage
-            uint32 amount = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
+            DamageInfo damageInfo = DamageInfo(pCaster, target, spellProto);
+            damageInfo.damageType = NODAMAGE;
 
-            uint32 pdamage;
+            // ignore non positive values (can be result apply spellmods to aura damage
+            uint32 amount  = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
 
-            if(m_modifier.m_auraname==SPELL_AURA_OBS_MOD_HEALTH)
-                pdamage = uint32(target->GetMaxHealth() * amount / 100);
+            if (m_modifier.m_auraname == SPELL_AURA_OBS_MOD_HEALTH)
+                damageInfo.damage = uint32(target->GetMaxHealth() * amount / 100);
             else
             {
-                pdamage = amount;
-
+                damageInfo.damage = amount;
                 // Wild Growth (1/7 - 6 + 2*ramainTicks) %
-                if (spellProto->SpellFamilyName == SPELLFAMILY_DRUID && spellProto->SpellIconID == 2864)
+                if (spellProto->SpellFamilyName == SPELLFAMILY_DRUID && spellProto->GetSpellIconID() == 2864)
                 {
                     int32 ticks = GetAuraMaxTicks();
                     int32 remainingTicks = ticks - GetAuraTicks();
                     int32 addition = int32(amount)*ticks*(-6+2*remainingTicks)/100;
 
-                    if (GetAuraTicks() != 1)
+                    if (GetAuraTicks() > 1 && ticks > 1)
                         // Item - Druid T10 Restoration 2P Bonus
                         if (Aura *aura = pCaster->GetAura(70658, EFFECT_INDEX_0))
-                            addition += abs(int32((addition * aura->GetModifier()->m_amount) / ((ticks-1)* 100)));
+                            addition += int32(aura->GetModifier()->m_amount * amount * ticks * (GetAuraTicks()-1) / 5000);
 
-                    pdamage = int32(pdamage) + addition;
+                    damageInfo.damage = damageInfo.damage + addition;
                 }
             }
+            damageInfo.CleanDamage(-int32(damageInfo.damage), 0, BASE_ATTACK, MELEE_HIT_NORMAL);
 
-            pdamage = target->SpellHealingBonusTaken(pCaster, spellProto, pdamage, DOT, GetStackAmount());
+            damageInfo.damage = target->SpellHealingBonusTaken(pCaster, spellProto, damageInfo.damage, DOT, GetStackAmount());
 
             // This method can modify pdamage
-            bool isCrit = IsCritFromAbilityAura(pCaster, pdamage);
+            bool isCrit = IsCritFromAbilityAura(pCaster, &damageInfo);
 
-            uint32 absorbHeal = 0;
-            pCaster->CalculateHealAbsorb(pdamage, &absorbHeal);
-            pdamage -= absorbHeal;
+            pCaster->CalculateHealAbsorb(damageInfo.damage, &damageInfo.absorb);
+            damageInfo.damage -= damageInfo.GetAbsorb();
 
             DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s heal of %s for %u health  (absorbed %u) inflicted by %u",
-                GetCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), pdamage, absorbHeal, GetId());
+                GetAffectiveCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), damageInfo.damage, damageInfo.GetAbsorb(), GetId());
 
-            int32 gain = target->ModifyHealth(pdamage);
-            SpellPeriodicAuraLogInfo pInfo(this, pdamage, (pdamage - uint32(gain)), absorbHeal, 0, 0.0f, isCrit);
+            int32 gain = target->ModifyHealth(damageInfo.damage);
+            damageInfo.cleanDamage = damageInfo.damage;
+            damageInfo.damage = uint32(gain);
+            uint32 overDamage = damageInfo.cleanDamage - damageInfo.damage;
+            SpellPeriodicAuraLogInfo pInfo(this, damageInfo.cleanDamage, overDamage, damageInfo.GetAbsorb(), 0, 0.0f, isCrit);
             target->SendPeriodicAuraLog(&pInfo);
 
             // Set trigger flag
-            uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC;
-            uint32 procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;
-            uint32 procEx = PROC_EX_PERIODIC_POSITIVE | (isCrit ? PROC_EX_CRITICAL_HIT : PROC_EX_NORMAL_HIT);
-            pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, procEx, gain, BASE_ATTACK, spellProto);
+            damageInfo.procAttacker = PROC_FLAG_ON_DO_PERIODIC;
+            damageInfo.procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;
+            damageInfo.procEx = PROC_EX_PERIODIC_POSITIVE | (isCrit ? PROC_EX_CRITICAL_HIT : PROC_EX_NORMAL_HIT);
+
+            pCaster->ProcDamageAndSpell(&damageInfo);
 
             // add HoTs to amount healed in bgs
-            if( pCaster->GetTypeId() == TYPEID_PLAYER )
-                if( BattleGround *bg = ((Player*)pCaster)->GetBattleGround() )
+            if (pCaster->GetTypeId() == TYPEID_PLAYER )
+                if ( BattleGround *bg = ((Player*)pCaster)->GetBattleGround() )
                     bg->UpdatePlayerScore(((Player*)pCaster), SCORE_HEALING_DONE, gain);
 
             target->getHostileRefManager().threatAssist(pCaster, float(gain) * 0.5f * sSpellMgr.GetSpellThreatMultiplier(spellProto), spellProto);
 
-            // heal for caster damage
-            if(target != pCaster && spellProto->SpellVisual[0] == 163)
+            // heal for caster damage (Health funnel only! spellProto->GetSpellVisual() == 163 wrong - some repair spells here!)
+            if (target != pCaster && spellProto->GetSpellFamilyFlags().test<CF_WARLOCK_HEALTH_FUNNEL>())
             {
                 uint32 dmg = spellProto->manaPerSecond;
-                if(pCaster->GetHealth() <= dmg && pCaster->GetTypeId()==TYPEID_PLAYER)
+                if (pCaster->GetHealth() <= dmg && pCaster->GetTypeId()==TYPEID_PLAYER)
                 {
                     pCaster->RemoveAurasDueToSpell(GetId());
 
@@ -7454,20 +9048,33 @@ void Aura::PeriodicTick()
                 }
                 else
                 {
-                    uint32 damage = gain;
-                    uint32 absorb = 0;
-                    pCaster->DealDamageMods(pCaster, damage, &absorb);
-                    pCaster->SendSpellNonMeleeDamageLog(pCaster, GetId(), damage, GetSpellSchoolMask(spellProto), absorb, 0, false, 0, false);
-
-                    CleanDamage cleanDamage =  CleanDamage(0, BASE_ATTACK, MELEE_HIT_NORMAL );
-                    pCaster->DealDamage(pCaster, damage, &cleanDamage, NODAMAGE, GetSpellSchoolMask(spellProto), spellProto, true);
+                    DamageInfo funneldamageInfo = DamageInfo(pCaster, pCaster, spellProto);
+                    funneldamageInfo.damage = gain;
+                    funneldamageInfo.damageType = DOT;
+                    pCaster->DealDamageMods(&funneldamageInfo);
+                    pCaster->SendSpellNonMeleeDamageLog(pCaster, GetId(), funneldamageInfo.damage, GetSpellSchoolMask(spellProto), funneldamageInfo.GetAbsorb(), 0, false, 0, false);
+                    pCaster->DealDamage(pCaster, &funneldamageInfo, true);
                 }
             }
 
+            // Light's Favor (Lich King)
+            // recalculate bonus damage done after each tick
+            if (GetId() == 69382)
+            {
+                if (Aura *aur = GetHolder()->GetAuraByEffectIndex(EFFECT_INDEX_1))
+                    aur->GetModifier()->m_amount = int32(target->GetHealthPercent());
+            }
+            else if (GetId() == 20578 || GetId() == 52749 || GetId() == 54045)
+            {
+                // cannibalize anim
+                target->HandleEmoteCommand(EMOTE_STATE_CANNIBALIZE);
+            }
+
+
 //            uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC;//   | PROC_FLAG_SUCCESSFUL_HEAL;
 //            uint32 procVictim   = 0;//ROC_FLAG_ON_TAKE_PERIODIC | PROC_FLAG_TAKEN_HEAL;
             // ignore item heals
-//            if(procSpell && !haveCastItem)
+//            if (procSpell && !haveCastItem)
 //                pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, PROC_EX_NORMAL_HIT, pdamage, BASE_ATTACK, spellProto);
             break;
         }
@@ -7477,16 +9084,20 @@ void Aura::PeriodicTick()
             if (!target->isAlive())
                 return;
 
+            // don't energize isolated units (banished)
+            if (target->hasUnitState(UNIT_STAT_ISOLATED))
+                return;
+
             if (m_modifier.m_miscvalue < 0 || m_modifier.m_miscvalue >= MAX_POWERS)
                 return;
 
             Powers power = Powers(m_modifier.m_miscvalue);
 
             // power type might have changed between aura applying and tick (druid's shapeshift)
-            if (target->getPowerType() != power)
+            if (target->GetPowerType() != power)
                 return;
 
-            Unit* pCaster = GetCaster();
+            Unit* pCaster = GetAffectiveCaster();
             if (!pCaster)
                 return;
 
@@ -7494,11 +9105,11 @@ void Aura::PeriodicTick()
                 return;
 
             if (GetSpellProto()->Effect[GetEffIndex()] == SPELL_EFFECT_PERSISTENT_AREA_AURA &&
-                pCaster->SpellHitResult(target, spellProto, false) != SPELL_MISS_NONE)
+                pCaster->SpellHitResult(target, spellProto, true) != SPELL_MISS_NONE)
                 return;
 
             // Check for immune (not use charges)
-            if (target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
+            if (IsSpellCauseDamage(spellProto) && target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
                 return;
 
             // ignore non positive values (can be result apply spellmods to aura damage
@@ -7516,7 +9127,7 @@ void Aura::PeriodicTick()
             }
 
             DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s power leech of %s for %u dmg inflicted by %u",
-                GetCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), pdamage, GetId());
+                GetAffectiveCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), pdamage, GetId());
 
             int32 drain_amount = target->GetPower(power) > pdamage ? pdamage : target->GetPower(power);
 
@@ -7532,7 +9143,7 @@ void Aura::PeriodicTick()
             {
                 gain_multiplier = spellProto->EffectMultipleValue[GetEffIndex()];
 
-                if (Player *modOwner = pCaster->GetSpellModOwner())
+                if (Player* modOwner = pCaster->GetSpellModOwner())
                     modOwner->ApplySpellMod(GetId(), SPELLMOD_MULTIPLE_VALUE, gain_multiplier);
             }
 
@@ -7549,6 +9160,25 @@ void Aura::PeriodicTick()
                             pCaster->CastCustomSpell(pCaster, 32554, &pet_gain, NULL, NULL, true);
 
                 target->AddThreat(pCaster, float(gain) * 0.5f, pInfo.critical, GetSpellSchoolMask(spellProto), spellProto);
+
+                if (pCaster->GetTypeId() == TYPEID_PLAYER && spellProto->Id == 5138 && pCaster->HasSpell(30326))
+                {
+                    if (pCaster->GetPet())
+                    {
+                        GuidSet groupPetsCopy = pCaster->GetPets();
+                        if (!groupPetsCopy.empty())
+                        {
+                            for (GuidSet::const_iterator itr = groupPetsCopy.begin(); itr != groupPetsCopy.end(); ++itr)
+                            {
+                                if (Pet* pPet = pCaster->GetMap()->GetPet(*itr))
+                                {
+                                    if (pPet->isAlive())
+                                        pCaster->CastCustomSpell(pPet, 32554, &gain_amount, NULL, NULL, true, NULL, NULL, pCaster->GetObjectGuid());
+                                }
+                            }
+                        }
+                    }
+                }
             }
 
             // Some special cases
@@ -7556,7 +9186,7 @@ void Aura::PeriodicTick()
             {
                 case 32960:                                 // Mark of Kazzak
                 {
-                    if (target->GetTypeId() == TYPEID_PLAYER && target->getPowerType() == POWER_MANA)
+                    if (target->GetTypeId() == TYPEID_PLAYER && target->GetPowerType() == POWER_MANA)
                     {
                         // Drain 5% of target's mana
                         pdamage = target->GetMaxPower(POWER_MANA) * 5 / 100;
@@ -7594,18 +9224,22 @@ void Aura::PeriodicTick()
             if (!target->isAlive())
                 return;
 
+            // don't energize isolated units (banished)
+            if (target->hasUnitState(UNIT_STAT_ISOLATED))
+                return;
+
             // ignore non positive values (can be result apply spellmods to aura damage
             uint32 pdamage = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
 
             DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s energize %s for %u dmg inflicted by %u",
-                GetCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), pdamage, GetId());
+                GetAffectiveCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), pdamage, GetId());
 
-            if(m_modifier.m_miscvalue < 0 || m_modifier.m_miscvalue >= MAX_POWERS)
+            if (m_modifier.m_miscvalue < 0 || m_modifier.m_miscvalue >= MAX_POWERS)
                 break;
 
             Powers power = Powers(m_modifier.m_miscvalue);
 
-            if(target->GetMaxPower(power) == 0)
+            if (target->GetMaxPower(power) == 0)
                 break;
 
             SpellPeriodicAuraLogInfo pInfo(this, pdamage, 0, 0, 0, 0.0f);
@@ -7613,7 +9247,7 @@ void Aura::PeriodicTick()
 
             int32 gain = target->ModifyPower(power,pdamage);
 
-            if(Unit* pCaster = GetCaster())
+            if (Unit* pCaster = GetCaster())
                 target->getHostileRefManager().threatAssist(pCaster, float(gain) * 0.5f * sSpellMgr.GetSpellThreatMultiplier(spellProto), spellProto);
             break;
         }
@@ -7623,23 +9257,29 @@ void Aura::PeriodicTick()
             if (!target->isAlive())
                 return;
 
+            // don't energize isolated units (banished)
+            if (target->hasUnitState(UNIT_STAT_ISOLATED))
+                return;
+
+            Powers powerType = ( (m_modifier.m_miscvalue > POWER_RUNIC_POWER || m_modifier.m_miscvalue < 0) ? POWER_MANA : Powers(m_modifier.m_miscvalue));
+
             // ignore non positive values (can be result apply spellmods to aura damage
             uint32 amount = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
 
-            uint32 pdamage = uint32(target->GetMaxPower(POWER_MANA) * amount / 100);
+            uint32 pdamage = uint32(target->GetMaxPower(powerType) * amount / 100);
 
-            DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s energize %s for %u mana inflicted by %u",
-                GetCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), pdamage, GetId());
+            DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s energize %s for %u power %u inflicted by %u",
+                GetAffectiveCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), pdamage, powerType, GetId());
 
-            if(target->GetMaxPower(POWER_MANA) == 0)
+            if (target->GetMaxPower(powerType) == 0)
                 break;
 
             SpellPeriodicAuraLogInfo pInfo(this, pdamage, 0, 0, 0, 0.0f);
             target->SendPeriodicAuraLog(&pInfo);
 
-            int32 gain = target->ModifyPower(POWER_MANA, pdamage);
+            int32 gain = target->ModifyPower(powerType, pdamage);
 
-            if(Unit* pCaster = GetCaster())
+            if (Unit* pCaster = GetCaster())
                 target->getHostileRefManager().threatAssist(pCaster, float(gain) * 0.5f * sSpellMgr.GetSpellThreatMultiplier(spellProto), spellProto);
             break;
         }
@@ -7649,49 +9289,54 @@ void Aura::PeriodicTick()
             if (!target->isAlive())
                 return;
 
-            Unit *pCaster = GetCaster();
-            if(!pCaster)
+            Unit *pCaster = GetAffectiveCaster();
+            if (!pCaster)
                 return;
 
             // Check for immune (not use charges)
-            if(target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
+            if (IsSpellCauseDamage(spellProto) && target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
                 return;
 
-            int32 pdamage = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
+            DamageInfo damageInfo(pCaster, target, spellProto);
+
+            damageInfo.damage = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
 
             Powers powerType = Powers(m_modifier.m_miscvalue);
 
-            if(!target->isAlive() || target->getPowerType() != powerType)
+            if (!target->isAlive() || target->GetPowerType() != powerType)
                 return;
 
             // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
             if (powerType == POWER_MANA)
-                pdamage -= target->GetSpellCritDamageReduction(pdamage);
+                damageInfo.damage -= target->GetSpellCritDamageReduction(damageInfo.damage);
 
-            uint32 gain = uint32(-target->ModifyPower(powerType, -pdamage));
+            damageInfo.cleanDamage = abs(target->ModifyPower(powerType, -int32(damageInfo.damage)));
 
-            gain = uint32(gain * spellProto->EffectMultipleValue[GetEffIndex()]);
+            damageInfo.damage = uint32(damageInfo.cleanDamage * spellProto->EffectMultipleValue[GetEffIndex()]);
 
             // maybe has to be sent different to client, but not by SMSG_PERIODICAURALOG
-            SpellNonMeleeDamage damageInfo(pCaster, target, spellProto->Id, SpellSchoolMask(spellProto->SchoolMask));
-            pCaster->CalculateSpellDamage(&damageInfo, gain, spellProto);
+            pCaster->CalculateSpellDamage(&damageInfo);
 
             damageInfo.target->CalculateAbsorbResistBlock(pCaster, &damageInfo, spellProto);
 
-            pCaster->DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb);
+            pCaster->DealDamageMods(&damageInfo);
 
             pCaster->SendSpellNonMeleeDamageLog(&damageInfo);
 
             // Set trigger flag
-            uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC; //  | PROC_FLAG_SUCCESSFUL_HARMFUL_SPELL_HIT;
-            uint32 procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;// | PROC_FLAG_TAKEN_HARMFUL_SPELL_HIT;
-            uint32 procEx       = createProcExtendMask(&damageInfo, SPELL_MISS_NONE);
-            if (damageInfo.damage)
-                procVictim|=PROC_FLAG_TAKEN_ANY_DAMAGE;
+            damageInfo.procAttacker = PROC_FLAG_ON_DO_PERIODIC; //  | PROC_FLAG_SUCCESSFUL_HARMFUL_SPELL_HIT;
+            damageInfo.procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;// | PROC_FLAG_TAKEN_HARMFUL_SPELL_HIT;
+            damageInfo.procEx       = createProcExtendMask(&damageInfo, SPELL_MISS_NONE);
 
-            pCaster->ProcDamageAndSpell(damageInfo.target, procAttacker, procVictim, procEx, damageInfo.damage, BASE_ATTACK, spellProto);
+            if (damageInfo.damage)
+            {
+                damageInfo.procVictim  |= PROC_FLAG_TAKEN_ANY_DAMAGE;
+                damageInfo.procEx      |= PROC_EX_DIRECT_DAMAGE;
+            }
 
+            pCaster->ProcDamageAndSpell(&damageInfo);
             pCaster->DealSpellDamage(&damageInfo, true);
+
             break;
         }
         case SPELL_AURA_MOD_REGEN:
@@ -7701,7 +9346,7 @@ void Aura::PeriodicTick()
                 return;
 
             int32 gain = target->ModifyHealth(m_modifier.m_amount);
-            if (Unit *caster = GetCaster())
+            if (Unit *caster = GetAffectiveCaster())
                 target->getHostileRefManager().threatAssist(caster, float(gain) * 0.5f  * sSpellMgr.GetSpellThreatMultiplier(spellProto), spellProto);
             break;
         }
@@ -7711,8 +9356,12 @@ void Aura::PeriodicTick()
             if (!target->isAlive())
                 return;
 
-            Powers pt = target->getPowerType();
-            if(int32(pt) != m_modifier.m_miscvalue)
+            // don't energize isolated units (banished)
+            if (target->hasUnitState(UNIT_STAT_ISOLATED))
+                return;
+
+            Powers powerType = target->GetPowerType();
+            if (int32(powerType) != m_modifier.m_miscvalue)
                 return;
 
             if ( spellProto->AuraInterruptFlags & AURA_INTERRUPT_FLAG_NOT_SEATED )
@@ -7720,17 +9369,14 @@ void Aura::PeriodicTick()
                 // eating anim
                 target->HandleEmoteCommand(EMOTE_ONESHOT_EAT);
             }
-            else if( GetId() == 20577 )
-            {
-                // cannibalize anim
-                target->HandleEmoteCommand(EMOTE_STATE_CANNIBALIZE);
-            }
-
             // Anger Management
             // amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3
             // so 17 is rounded amount for 5 sec tick grow ~ 1 range grow in 3 sec
-            if(pt == POWER_RAGE)
-                target->ModifyPower(pt, m_modifier.m_amount * 3 / 5);
+            if (powerType == POWER_RAGE)
+                target->ModifyPower(powerType, m_modifier.m_amount * 3 / 5);
+            // Butchery
+            else if (powerType == POWER_RUNIC_POWER && target->isInCombat())
+                target->ModifyPower(powerType, m_modifier.m_amount);
             break;
         }
         // Here tick dummy auras
@@ -7786,12 +9432,34 @@ void Aura::PeriodicDummyTick()
                     // 7053 Forsaken Skill: Shadow
                     return;
                 }
+                // Steal Flesh (The Culling of Stratholme - Salramm the Fleshcrafter)
+                case 52708:
+                {
+                    if (Unit *caster = GetCaster())
+                        caster->CastSpell(caster, 52712, true );
+
+                    target->CastSpell(target, 52711, true);
+                    return;
+                }
                 case 7057:                                  // Haunting Spirits
                     if (roll_chance_i(33))
                         target->CastSpell(target,m_modifier.m_amount,true,NULL,this);
                     return;
 //              // Panda
 //              case 19230: break;
+                case 30019:                                 // Control Piece
+                {
+                    if (target->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    Unit* chessPiece = target->GetCharm();
+                    if (!chessPiece)
+                    {
+                        target->CastSpell(target, 30529, true);
+                        target->RemoveAurasDueToSpell(30019);
+                    }
+                    return;
+                }
 //              // Gossip NPC Periodic - Talk
 //              case 33208: break;
 //              // Gossip NPC Periodic - Despawn
@@ -7840,8 +9508,20 @@ void Aura::PeriodicDummyTick()
 //              case 42596: break;
 //              // Headless Horseman Climax, Head: Periodic
 //              case 42603: break;
-//              // Fire Bomb
-//              case 42621: break;
+                case 42621:                                 // Fire Bomb
+                {
+                    // Cast the summon spells (42622 to 42627) with increasing chance
+                    uint32 rand = urand(0, 99);
+                    for (uint32 i = 1; i <= 6; ++i)
+                    {
+                        if (rand < i * (i+1) /2 * 5)
+                        {
+                            target->CastSpell(target, spell->Id + i, true);
+                            break;
+                        }
+                    }
+                    break;
+                }
 //              // Headless Horseman - Conflagrate, Periodic Aura
 //              case 42637: break;
 //              // Headless Horseman - Create Pumpkin Treats Aura
@@ -7889,7 +9569,15 @@ void Aura::PeriodicDummyTick()
 //              // Holiday - Midsummer, Ribbon Pole Periodic Visual
 //              case 45406: break;
 //              // Parachute
-//              case 45472: break;
+                case 45472:
+                {
+                    if (target->GetTypeId() != TYPEID_PLAYER || !((Player*)target)->IsFalling())
+                        return;
+
+                    target->RemoveAurasDueToSpell(45472);
+                    target->CastSpell(target, 44795, true);
+                    return;
+                }
 //              // Alliance Flag, Extra Damage Debuff
 //              case 45898: break;
 //              // Horde Flag, Extra Damage Debuff
@@ -7913,8 +9601,9 @@ void Aura::PeriodicDummyTick()
 //              case 46205: break;
 //              // Find Opening Beam End
 //              case 46333: break;
-//              // Ice Spear Control Aura
-//              case 46371: break;
+                case 46371:                                 // Ice Spear Control Aura
+                    target->CastSpell(target, 46372, true, NULL, this);
+                    return;
 //              // Hailstone Chill
 //              case 46458: break;
 //              // Hailstone Chill, Internal
@@ -7923,9 +9612,28 @@ void Aura::PeriodicDummyTick()
 //              case 46549: break;
 //              // Summon Ice Spear Knockback Delayer
 //              case 46878: break;
-//              // Burninate Effect
-//              case 47214: break;
-//              // Fizzcrank Practice Parachute
+                case 47214: // Burninate Effect
+                {
+                    Unit * caster = GetCaster();
+                    if (!caster)
+                        return;
+
+                    if (target->GetEntry() == 26570)
+                    {
+                        if (target->HasAura(54683, EFFECT_INDEX_0))
+                            return;
+                        else
+                        {
+                            // Credit Scourge
+                            caster->CastSpell(caster, 47208, true);
+                            // set ablaze
+                            target->CastSpell(target, 54683, true);
+                            ((Creature*)target)->ForcedDespawn(4000);
+                        }
+                    }
+                    break;
+                }
+//              // Fizzcrank Practice Parachute
 //              case 47228: break;
 //              // Send Mug Control Aura
 //              case 47369: break;
@@ -7991,19 +9699,72 @@ void Aura::PeriodicDummyTick()
                     target->CastSpell(target, 52443, true);
                     return;
                 case 53035:                                 // Summon Anub'ar Champion Periodic (Azjol Nerub)
-                    target->CastSpell(target, 53014, true); // Summon Anub'ar Champion
-                    return;
                 case 53036:                                 // Summon Anub'ar Necromancer Periodic (Azjol Nerub)
-                    target->CastSpell(target, 53015, true); // Summon Anub'ar Necromancer
-                    return;
                 case 53037:                                 // Summon Anub'ar Crypt Fiend Periodic (Azjol Nerub)
-                    target->CastSpell(target, 53016, true); // Summon Anub'ar Crypt Fiend
+                {
+                    uint32 summonSpells[3][3] =
+                    {
+                        {53090, 53014, 53064},              // Summon Anub'ar Champion
+                        {53092, 53015, 53066},              // Summon Anub'ar Necromancer
+                        {53091, 53016, 53065}               // Summon Anub'ar Crypt Fiend
+                    };
+
+                    // Cast different spell depending on trigger position
+                    // This will summon a different npc entry on each location - each of those has individual movement patern
+                    if (target->GetPositionZ() < 750.0f)
+                        target->CastSpell(target, summonSpells[spell->Id - 53035][0], true, NULL, this);
+                    else if (target->GetPositionX() > 500.0f)
+                        target->CastSpell(target, summonSpells[spell->Id - 53035][1], true, NULL, this);
+                    else
+                        target->CastSpell(target, summonSpells[spell->Id - 53035][2], true, NULL, this);
+
                     return;
+                }
                 case 53520:                                 // Carrion Beetles
                     target->CastSpell(target, 53521, true, NULL, this);
                     target->CastSpell(target, 53521, true, NULL, this);
                     return;
+                case 54798: // FLAMING Arrow Triggered Effect
+                {
+                    Unit * caster = GetCaster();
+                    if (!caster)
+                        return;
+
+                    Player *rider = caster->GetCharmerOrOwnerPlayerOrPlayerItself();
+                    if (!rider)
+                        return;
+
+                    if (target->GetEntry() == 29358)
+                    {
+                        if (target->HasAura(54683, EFFECT_INDEX_0))
+                            return;
+                        else
+                        {
+                            // Credit Frostworgs
+                            rider->CastSpell(rider, 54896, true);
+                            // set ablaze
+                            target->CastSpell(target, 54683, true);
+                            ((Creature*)target)->ForcedDespawn(6000);
+                        }
+                    }
+                    else if (target->GetEntry() == 29351)
+                    {
+                        if (target->HasAura(54683, EFFECT_INDEX_0))
+                            return;
+                        else
+                        {
+                            // Credit Frost Giants
+                            rider->CastSpell(rider, 54893, true);
+                            // set ablaze
+                            target->CastSpell(target, 54683, true);
+                            ((Creature*)target)->ForcedDespawn(6000);
+                        }
+                    }
+
+                    break;
+                }
                 case 55592:                                 // Clean
+                {
                     switch(urand(0,2))
                     {
                         case 0: target->CastSpell(target, 55731, true); break;
@@ -8011,11 +9772,42 @@ void Aura::PeriodicDummyTick()
                         case 2: target->CastSpell(target, 55739, true); break;
                     }
                     return;
+                }
+                case 61968:                                 // Flash Freeze
+                {
+                    if (GetAuraTicks() == 1 && !target->HasAura(62464))
+                        target->CastSpell(target, 61970, true, NULL, this);
+                    return;
+                }
+                case 62018:                                 // Collapse
+                {
+                    // lose 1% of health every second
+                    target->DealDamage(target, target->GetMaxHealth() * .01, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                    return;
+                }
                 case 62019:                                 // Rune of Summoning
                 {
                     target->CastSpell(target, 62020, true, NULL, this);
                     return;
                 }
+                case 62038:                                 // Biting Cold
+                {
+                    if (target->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // if player is moving remove one aura stack
+                    if (((Player*)target)->isMoving())
+                        target->RemoveAuraHolderFromStack(62039);
+                    // otherwise add one aura stack each 3 seconds
+                    else if (GetAuraTicks() % 3 && !target->HasAura(62821))
+                        target->CastSpell(target, 62039, true, NULL, this);
+                    return;
+                }
+                case 62039:                                 // Biting Cold
+                {
+                    target->CastSpell(target, 62188, true);
+                    return;
+                }
                 case 62566:                                 // Healthy Spore Summon Periodic
                 {
                     target->CastSpell(target, 62582, true);
@@ -8024,13 +9816,132 @@ void Aura::PeriodicDummyTick()
                     target->CastSpell(target, 62593, true);
                     return;
                 }
+                case 62717:                                 // Slag Pot
+                {
+                    target->CastSpell(target, 65722, true, NULL, this);
+
+                    // cast Slag Imbued if the target survives up to the last tick
+                    if (GetAuraTicks() == 10)
+                        target->CastSpell(target, 63536, true, NULL, this);
+                    return;
+                }
+                case 63276:                                   // Mark of the Faceless (General Vezax - Ulduar)
+                {
+
+                    Unit *caster = GetCaster();
+
+                    if (caster && target)
+                        caster->CastCustomSpell(target, 63278, 0, &(spell->EffectBasePoints[0]), 0, false, 0, 0, caster->GetObjectGuid() , spell);
+                    return;
+                }
+                case 63477:                                 // Slag Pot (H)
+                {
+                    target->CastSpell(target, 65723, true, NULL, this);
+
+                    // cast Slag Imbued if the target survives up to the last tick
+                    if (GetAuraTicks() == 10)
+                        target->CastSpell(target, 62836, true, NULL, this);
+                    return;
+                }
+                case 63382:                                 // Rapid Burst
+                {
+                    if (GetAuraTicks() % 2)
+                        target->CastSpell(target, target->GetMap()->IsRegularDifficulty() ? 64019 : 64532, true);
+                    else
+                        target->CastSpell(target, target->GetMap()->IsRegularDifficulty() ? 63387 : 64531, true);
+                    return;
+                }
+                case 64217:                                 // Overcharged
+                {
+                    Unit *caster = GetCaster();
+
+                    if (caster && target)
+                        caster->CastSpell(target, (spell->Id == 62717) ? 65722 : 65723, true, 0, this, this->GetCasterGuid(), this->GetSpellProto());
+                    return;
+                }
+                case 64412:                                 // Phase Punch
+                {
+                    if (SpellAuraHolderPtr phaseAura = target->GetSpellAuraHolder(64412))
+                    {
+                        uint32 uiAuraId = 0;
+                        switch (phaseAura->GetStackAmount())
+                        {
+                            case 1: uiAuraId = 64435; break;
+                            case 2: uiAuraId = 64434; break;
+                            case 3: uiAuraId = 64428; break;
+                            case 4: uiAuraId = 64421; break;
+                            case 5: uiAuraId = 64417; break;
+                        }
+
+                        if (uiAuraId && !target->HasAura(uiAuraId))
+                        {
+                            target->CastSpell(target, uiAuraId, true, NULL, this);
+
+                            // remove original aura if phased
+                            if (uiAuraId == 64417)
+                            {
+                                target->RemoveAurasDueToSpell(64412);
+                                target->CastSpell(target, 62169, true, NULL, this);
+                            }
+                        }
+                    }
+                    return;
+                }
+                case 65272:                                 // Shatter Chest
+                {
+                    target->CastSpell(target, 62501, true, NULL, this);
+                    return;
+                }
+                case 67574:                                // Trial Of Crusader (Spike Aggro Aura - Anub'arak)
+                {
+                    if (!target->GetMap()->Instanceable())
+                        return;
+
+                    if (InstanceData* data = target->GetInstanceData())
+                    {
+                        if (Creature* pSpike = target->GetMap()->GetCreature(data->GetGuid(34660)))
+                            pSpike->AddThreat(target, 1000000.0f);
+                    }
+                    return;
+                }
+                case 66118:                                 // Leeching Swarm 10 man
+                case 68646:
+                {
+                    int32 damage = (m_modifier.m_amount * target->GetHealth()) / 100;
+                    if (damage < 250)
+                        damage = 250;
+                    int32 heal = damage * 68 / 100;
+                    target->CastCustomSpell(target, 66240, &damage, NULL, NULL, true, NULL, this);
+                    if (Unit* caster = GetCaster())
+                        target->CastCustomSpell(caster, 66125, &heal, NULL, NULL, true, NULL, this);
+                    return;
+                }
+                case 67630:                                 // Leeching Swarm 25 man
+                case 68647:
+                {
+                    int32 damage = (m_modifier.m_amount * target->GetHealth()) / 100;
+                    if (damage < 250)
+                        damage = 250;
+                    int32 heal = damage * 155 / 100;
+                    target->CastCustomSpell(target, 66240, &damage, NULL, NULL, true, NULL, this);
+                    if (Unit* caster = GetCaster())
+                        target->CastCustomSpell(caster, 66125, &heal, NULL, NULL, true, NULL, this);
+                    return;
+                }
+                case 68870:                                 // Soulstorm
+                case 69008:                                 // Soulstorm (OOC aura)
+                {
+                    uint32 triggerSpells[8] = {68898, 68904, 68886, 68905, 68896, 68906, 68897, 68907};
+                    target->CastSpell(target, triggerSpells[GetAuraTicks() % 8], true);
+                    return;
+                }
                 case 68875:                                 // Wailing Souls
                 case 68876:                                 // Wailing Souls
                 {
                     // Sweep around
                     float newAngle = target->GetOrientation() + (spell->Id == 68875 ? 0.09f : 2*M_PI_F - 0.09f);
-                    if (newAngle > 2*M_PI_F)
-                        newAngle -= 2*M_PI_F;
+
+                    newAngle = MapManager::NormalizeOrientation(newAngle);
 
                     target->SetFacingTo(newAngle);
 
@@ -8038,6 +9949,51 @@ void Aura::PeriodicDummyTick()
                     target->CastSpell(target, 68873, true);
                     return;
                 }
+                case 69397:                                   // Soul Rip (Lich King)
+                {
+                    Unit *caster = GetCaster();
+                    if (target && caster)
+                    {
+                        int32 bp0;
+                        if (!GetModifier()->m_amount)
+                            GetModifier()->m_amount = 1750;
+                        else
+                            GetModifier()->m_amount *= 2;
+
+                        bp0 = GetModifier()->m_amount;
+                        caster->CastCustomSpell(target, 69398, &bp0, 0, 0, true);
+                    }
+                    return;
+                }
+                case 70069:                                   // Ooze Flood Periodic Trigger (Rotface)
+                {
+                    if (target)
+                        target->CastSpell(target, spell->CalculateSimpleValue(GetEffIndex()), true);
+                    return;
+                }
+                case 70498:                                   // Vile Spirits (Lich King)
+                {
+                    if (target)
+                    {
+                        if (target->GetMap()->GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL)
+                        {
+                            // on 10man normal max 8 spirits
+                            if (GetModifier()->m_miscvalue > 7)
+                                return;
+                        }
+
+                        target->CastSpell(target, 70497, true);
+                    }
+                    return;
+                }
+                case 73001:                                   // Shadow Prison (Blood Council)
+                {
+                    // cast dmg spell when moving
+                    if (target->GetTypeId() == TYPEID_PLAYER && ((Player*)target)->isMoving())
+                        target->CastSpell(target, 72999, true);
+
+                    return;
+                }
 // Exist more after, need add later
                 default:
                     break;
@@ -8061,12 +10017,12 @@ void Aura::PeriodicDummyTick()
             }
 
             // Prey on the Weak
-            if (spell->SpellIconID == 2983)
+            if (spell->GetSpellIconID() == 2983)
             {
-                Unit *victim = target->getVictim();
+                Unit* victim = target->getVictim();
                 if (victim && (target->GetHealth() * 100 / target->GetMaxHealth() > victim->GetHealth() * 100 / victim->GetMaxHealth()))
                 {
-                    if(!target->HasAura(58670))
+                    if (!target->HasAura(58670))
                     {
                         int32 basepoints = GetBasePoints();
                         target->CastCustomSpell(target, 58670, &basepoints, 0, 0, true);
@@ -8079,9 +10035,19 @@ void Aura::PeriodicDummyTick()
         }
         case SPELLFAMILY_MAGE:
         {
-            // Mirror Image
-//            if (spell->Id == 55342)
-//                return;
+            switch (spell->Id)
+            {
+                // Mirror Image
+                case 55342:
+                {
+                    if (GetAuraTicks() != 1)
+                        return;
+                    if (Unit* pCaster = GetCaster())
+                        pCaster->CastSpell(pCaster, spell->EffectTriggerSpell[GetEffIndex()], true, NULL, this);
+                }
+                default:
+                    break;
+            }
             break;
         }
         case SPELLFAMILY_DRUID:
@@ -8093,7 +10059,7 @@ void Aura::PeriodicDummyTick()
                 {
                     // Converts up to 10 rage per second into health for $d.  Each point of rage is converted into ${$m2/10}.1% of max health.
                     // Should be manauser
-                    if (target->getPowerType() != POWER_RAGE)
+                    if (target->GetPowerType() != POWER_RAGE)
                         return;
                     uint32 rage = target->GetPower(POWER_RAGE);
                     // Nothing todo
@@ -8114,6 +10080,30 @@ void Aura::PeriodicDummyTick()
             }
             break;
         }
+        case SPELLFAMILY_WARLOCK:
+            switch (spell->Id)
+            {
+                case 48018:
+                {
+                    GameObject* obj = target->GetGameObject(spell->Id);
+                    if (!obj)
+                    {
+                         target->RemoveAurasDueToSpell(spell->Id);
+                         target->RemoveAurasDueToSpell(62388);
+                         return;
+                    }
+                    // We must take a range of teleport spell, not summon.
+                    const SpellEntry* goToCircleSpell = sSpellStore.LookupEntry(48020);
+                    if (target->IsWithinDist(obj,GetSpellMaxRange(sSpellRangeStore.LookupEntry(goToCircleSpell->GetRangeIndex()))))
+                        target->CastSpell(target, 62388, true);
+                    else
+                        target->RemoveAurasDueToSpell(62388);
+                    break;
+                }
+                default:
+                    break;
+            }
+            break;
         case SPELLFAMILY_ROGUE:
         {
             switch (spell->Id)
@@ -8127,14 +10117,14 @@ void Aura::PeriodicDummyTick()
                     Spell::UnitList targets;
                     {
                         // eff_radius ==0
-                        float radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(spell->rangeIndex));
+                        float radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(spell->GetRangeIndex()));
 
                         MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck u_check(target, target, radius);
                         MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck> checker(targets, u_check);
                         Cell::VisitAllObjects(target, checker, radius);
                     }
 
-                    if(targets.empty())
+                    if (targets.empty())
                         return;
 
                     Spell::UnitList::const_iterator itr = targets.begin();
@@ -8153,7 +10143,7 @@ void Aura::PeriodicDummyTick()
         case SPELLFAMILY_HUNTER:
         {
             // Explosive Shot
-            if (spell->SpellFamilyFlags & UI64LIT(0x8000000000000000))
+            if (spell->GetSpellFamilyFlags().test<CF_HUNTER_EXPLOSIVE_SHOT>())
             {
                 target->CastCustomSpell(target, 53352, &m_modifier.m_amount, 0, 0, true, 0, this, GetCasterGuid());
                 return;
@@ -8168,7 +10158,7 @@ void Aura::PeriodicDummyTick()
                 case 53512:
                 {
                     Unit* victim = target->getVictim();
-                    if( victim && victim->GetHealth() * 100 < victim->GetMaxHealth() * 35 )
+                    if ( victim && victim->GetHealth() * 100 < victim->GetMaxHealth() * 35 )
                         target->CastSpell(target, spell->Id == 53511 ? 60096 : 60097, true, NULL, this);
                     return;
                 }
@@ -8192,17 +10182,17 @@ void Aura::PeriodicDummyTick()
         case SPELLFAMILY_DEATHKNIGHT:
         {
             // Death and Decay
-            if (spell->SpellFamilyFlags & UI64LIT(0x0000000000000020))
+            if (spell->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_DEATH_AND_DECAY>())
             {
                 if (Unit *caster = GetCaster())
                     caster->CastCustomSpell(target, 52212, &m_modifier.m_amount, NULL, NULL, true, NULL, this);
                 return;
             }
             // Raise Dead
-//            if (spell->SpellFamilyFlags & UI64LIT(0x0000000000001000))
+//            if (spell->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_RAISE_DEAD>())
 //                return;
             // Chains of Ice
-            if (spell->SpellFamilyFlags & UI64LIT(0x0000400000000000))
+            if (spell->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_CHAINS_OF_ICE2>())
             {
                 // Get 0 effect aura
                 Aura *slow = target->GetAura(GetId(), EFFECT_INDEX_0);
@@ -8217,13 +10207,10 @@ void Aura::PeriodicDummyTick()
                 return;
             }
             // Summon Gargoyle
-//            if (spell->SpellFamilyFlags & UI64LIT(0x0000008000000000))
-//                return;
-            // Death Rune Mastery
-//            if (spell->SpellFamilyFlags & UI64LIT(0x0000000000004000))
+//            if (spell->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_SUMMON_GARGOYLE>())
 //                return;
             // Bladed Armor
-            if (spell->SpellIconID == 2653)
+            if (spell->GetSpellIconID() == 2653)
             {
                 // Increases your attack power by $s1 for every $s2 armor value you have.
                 // Calculate AP bonus (from 1 efect of this spell)
@@ -8231,14 +10218,30 @@ void Aura::PeriodicDummyTick()
                 target->CastCustomSpell(target, 61217, &apBonus, &apBonus, NULL, true, NULL, this);
                 return;
             }
+            // Death Rune Mastery
             // Reaping
-//            if (spell->SpellIconID == 22)
-//                return;
             // Blood of the North
-//            if (spell->SpellIconID == 30412)
+            if (spell->GetSpellIconID() == 22 || spell->GetSpellIconID() == 3041 || spell->GetSpellIconID() == 30412)
+            {
+                if (target->GetTypeId() != TYPEID_PLAYER)
+                    return;
+                if (target->isInCombat())
+                    return;
+
+                Player *plr = (Player*)GetTarget();
+                for(uint32 i = 0; i < MAX_RUNES; ++i)
+                {
+                    RuneType rune = plr->GetCurrentRune(i);
+                    if (rune == RUNE_DEATH)
+                        plr->ConvertRune(i, plr->GetBaseRune(i));
+                }
+
+                return;
+            }
+//            if (spell->GetSpellIconID() == 30412)
 //                return;
             // Hysteria
-            if (spell->SpellFamilyFlags & UI64LIT(0x0000000020000000))
+            if (spell->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_HYSTERIA>())
             {
                 // damage not expected to be show in logs, not any damage spell related to damage apply
                 uint32 deal = m_modifier.m_amount * target->GetMaxHealth() / 100;
@@ -8250,15 +10253,59 @@ void Aura::PeriodicDummyTick()
         default:
             break;
     }
+
+    if (Unit* caster = GetCaster())
+    {
+        if (target && target->GetTypeId() == TYPEID_UNIT)
+            sScriptMgr.OnEffectDummy(caster, GetId(), GetEffIndex(), (Creature*)target, ObjectGuid());
+    }
+}
+
+void Aura::PeriodicCheck()
+{
+
+    SpellAuraHolderPtr holder = GetHolder();
+    SpellEntry const* spellProto = GetSpellProto();
+
+    if (!holder || !spellProto)
+        return;
+
+    Unit* target = GetTarget();
+    Unit* caster = GetCaster();
+
+    if (!caster || !target)
+        return;
+
+    switch(m_modifier.m_auraname)
+    {
+        case SPELL_AURA_MOD_CONFUSE:
+        case SPELL_AURA_MOD_FEAR:
+        case SPELL_AURA_MOD_STUN:
+        case SPELL_AURA_MOD_ROOT:
+        case SPELL_AURA_TRANSFORM:
+        {
+            if (caster->GetObjectGuid().IsPlayer() && target->GetObjectGuid().IsCreatureOrVehicle())
+            {
+                if (caster->SpellResistResult(target, spellProto) != SPELL_MISS_NONE)
+                {
+                    caster->SendSpellDamageResist(target, spellProto->Id);
+                    target->RemoveAurasDueToSpell(GetId());
+                }
+            }
+            break;
+        }
+        default:
+            break;
+    }
 }
 
 void Aura::HandlePreventFleeing(bool apply, bool Real)
 {
-    if(!Real)
+    if (!Real)
         return;
 
     Unit::AuraList const& fearAuras = GetTarget()->GetAurasByType(SPELL_AURA_MOD_FEAR);
-    if( !fearAuras.empty() )
+    if (!fearAuras.empty())
     {
         if (apply)
             GetTarget()->SetFeared(false, fearAuras.front()->GetCasterGuid());
@@ -8269,19 +10316,19 @@ void Aura::HandlePreventFleeing(bool apply, bool Real)
 
 void Aura::HandleManaShield(bool apply, bool Real)
 {
-    if(!Real)
+    if (!Real)
         return;
 
     // prevent double apply bonuses
-    if(apply && (GetTarget()->GetTypeId()!=TYPEID_PLAYER || !((Player*)GetTarget())->GetSession()->PlayerLoading()))
+    if (apply && (GetTarget()->GetTypeId()!=TYPEID_PLAYER || !((Player*)GetTarget())->GetSession()->PlayerLoading()))
     {
-        if(Unit* caster = GetCaster())
+        if (Unit* caster = GetCaster())
         {
             float DoneActualBenefit = 0.0f;
             switch(GetSpellProto()->SpellFamilyName)
             {
                 case SPELLFAMILY_MAGE:
-                    if(GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000008000))
+                    if (GetSpellProto()->GetSpellFamilyFlags().test<CF_MAGE_MANA_SHIELD>())
                     {
                         // Mana Shield
                         // +50% from +spd bonus
@@ -8306,22 +10353,7 @@ void Aura::HandleArenaPreparation(bool apply, bool Real)
         return;
 
     Unit* target = GetTarget();
-
-    target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PREPARATION, apply);
-
-    if (apply)
-    {
-        // max regen powers at start preparation
-        target->SetHealth(target->GetMaxHealth());
-        target->SetPower(POWER_MANA, target->GetMaxPower(POWER_MANA));
-        target->SetPower(POWER_ENERGY, target->GetMaxPower(POWER_ENERGY));
-    }
-    else
-    {
-        // reset originally 0 powers at start/leave
-        target->SetPower(POWER_RAGE, 0);
-        target->SetPower(POWER_RUNIC_POWER, 0);
-    }
+    target->HandleArenaPreparation(apply);
 }
 
 /**
@@ -8330,7 +10362,7 @@ void Aura::HandleArenaPreparation(bool apply, bool Real)
  */
 void Aura::HandleAuraControlVehicle(bool apply, bool Real)
 {
-    if(!Real)
+    if (!Real)
         return;
 
     Unit* target = GetTarget();
@@ -8345,28 +10377,91 @@ void Aura::HandleAuraControlVehicle(bool apply, bool Real)
 
     if (apply)
     {
-        if (caster->GetTypeId() == TYPEID_PLAYER)
-            ((Player*)caster)->RemovePet(PET_SAVE_AS_CURRENT);
+        // TODO: find a way to make this work properly
+        // some spells seem like store vehicle seat info in basepoints, but not true for all of them, so... ;/
+        int32 seat = GetModifier()->m_amount <= MAX_VEHICLE_SEAT ? GetModifier()->m_amount - 1 : -1;
+
+        if (seat >= 0 && caster->GetTypeId() == TYPEID_PLAYER && !target->GetVehicleKit()->HasEmptySeat(seat))
+            seat = -1;
 
-        //caster->EnterVehicle(target);
+        caster->_EnterVehicle(target->GetVehicleKit(), seat);
     }
     else
     {
-        // some SPELL_AURA_CONTROL_VEHICLE auras have a dummy effect on the player - remove them
-        caster->RemoveAurasDueToSpell(GetId());
 
-        //caster->ExitVehicle();
+        if (caster->GetVehicle() && caster->GetVehicle() == target->GetVehicleKit())
+        {
+            if (m_removeMode == AURA_REMOVE_BY_STACK || m_removeMode == AURA_REMOVE_BY_TRACKING)
+                caster->GetVehicle()->RemovePassenger(caster, false);
+            else
+                caster->_ExitVehicle();
+        }
 
-        if (caster->GetTypeId() == TYPEID_PLAYER)
-            ((Player*)caster)->ResummonPetTemporaryUnSummonedIfAny();
+        // some SPELL_AURA_CONTROL_VEHICLE auras have a dummy effect on the player - remove them
+        caster->RemoveAurasDueToSpell(GetId());
     }
 }
 
-void Aura::HandleAuraAddMechanicAbilities(bool apply, bool Real)
+void Aura::HandleAuraLinked(bool apply, bool Real)
 {
     if (!Real)
         return;
 
+    uint32 linkedSpell = GetSpellProto()->EffectTriggerSpell[m_effIndex];
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(linkedSpell);
+    Unit *pTarget = GetTarget();
+    Unit *pCaster = GetCaster();
+
+    if (!spellInfo)
+    {
+        sLog.outError("HandleAuraLinked for spell %u effect %u: triggering unknown spell %u", GetSpellProto()->Id, m_effIndex, linkedSpell);
+        return;
+    }
+
+    if (apply)
+    {
+        if (pCaster && pCaster->GetTypeId() == TYPEID_PLAYER &&
+            pTarget->IsVehicle() &&
+            spellInfo->HasAttribute(SPELL_ATTR_EX_HIDDEN_AURA) &&
+            spellInfo->HasAttribute(SPELL_ATTR_HIDE_IN_COMBAT_LOG))
+        {
+            float bonus = ((float)((Player*)pCaster)->GetEquipGearScore(false, false) - (float)sWorld.getConfig(CONFIG_UINT32_GEAR_CALC_BASE))
+                                 / (float)sWorld.getConfig(CONFIG_UINT32_GEAR_CALC_BASE);
+
+            float curHealthRatio = pTarget->GetHealthPercent() / 100.0f;
+
+            int32 bp0 = int32(((float)spellInfo->EffectBasePoints[EFFECT_INDEX_0] + bonus) * 100);
+            int32 bp1 = int32(((float)spellInfo->EffectBasePoints[EFFECT_INDEX_1] + bonus) * 100);
+            int32 bp2 = int32(((float)spellInfo->EffectBasePoints[EFFECT_INDEX_2] + bonus) * 100);
+
+            // don't lower stats of vehicle, if GS player below then calculation base
+            if (bp0 < 0)
+                bp0 = 0;
+            if (bp1 < 0)
+                bp1 = 0;
+            if (bp2 < 0)
+                bp2 = 0;
+
+            pTarget->CastCustomSpell(pTarget, spellInfo, &bp0, &bp1, &bp2, true, NULL, this, GetCasterGuid(), GetSpellProto());
+            pTarget->SetHealth(uint32((float)pTarget->GetMaxHealth() * curHealthRatio));
+        }
+        // Ebon Plague and Crypt Fever - set basepoints for linked aura increasing disease damage taken
+        else if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT &&
+            (GetSpellProto()->GetSpellIconID() == 264 || GetSpellProto()->GetSpellIconID() == 1933))
+        {
+            int32 bp0 = GetModifier()->m_amount;
+            if (pCaster)
+                pCaster->CastCustomSpell(pTarget, spellInfo, &bp0, NULL, NULL, true, NULL, this, GetCasterGuid(), GetSpellProto());
+        }
+        else
+            pTarget->CastSpell(pTarget, spellInfo, true, NULL, this);
+    }
+    else
+        pTarget->RemoveAurasByCasterSpell(linkedSpell, GetCasterGuid());
+}
+
+void Aura::HandleAuraAddMechanicAbilities(bool apply, bool Real)
+{
     Unit* target = GetTarget();
 
     if (!target || target->GetTypeId() != TYPEID_PLAYER)    // only players should be affected by this aura
@@ -8400,7 +10495,7 @@ void Aura::HandleAuraAddMechanicAbilities(bool apply, bool Real)
 
 void Aura::HandleAuraOpenStable(bool apply, bool Real)
 {
-    if(!Real || GetTarget()->GetTypeId() != TYPEID_PLAYER || !GetTarget()->IsInWorld())
+    if (!Real || GetTarget()->GetTypeId() != TYPEID_PLAYER || !GetTarget()->IsInWorld())
         return;
 
     Player* player = (Player*)GetTarget();
@@ -8416,52 +10511,58 @@ void Aura::HandleAuraMirrorImage(bool apply, bool Real)
     if (!Real)
         return;
 
-    // Target of aura should always be creature (ref Spell::CheckCast)
-    Creature* pCreature = (Creature*)GetTarget();
+    Unit* target = GetTarget();
+
+    if (!target)
+        return;
 
     if (apply)
     {
-        // Caster can be player or creature, the unit who pCreature will become an clone of.
         Unit* caster = GetCaster();
+        if (target->GetTypeId() == TYPEID_UNIT)
+        {
+            Creature* pCreature = (Creature*)target;
+            pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 0, caster->getRace());
+            pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 1, caster->getClass());
+            pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 2, caster->getGender());
+            pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 3, caster->GetPowerType());
+        }
+        target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_CLONED);
 
-        if (caster->GetTypeId() == TYPEID_PLAYER)           // TODO - Verify! Does it take a 'pseudo-race' (from display-id) for creature-mirroring, and what is sent in SMSG_MIRRORIMAGE_DATA
-            pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 0, caster->getRace());
-
-        pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 1, caster->getClass());
-        pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 2, caster->getGender());
-        pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 3, caster->getPowerType());
-
-        pCreature->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_CLONED);
-
-        pCreature->SetDisplayId(caster->GetNativeDisplayId());
+        target->SetDisplayId(caster->GetDisplayId());
     }
     else
     {
-        const CreatureInfo* cinfo = pCreature->GetCreatureInfo();
-        const CreatureModelInfo* minfo = sObjectMgr.GetCreatureModelInfo(pCreature->GetNativeDisplayId());
+        if (target->GetTypeId() == TYPEID_UNIT)
+        {
+            Creature* pCreature = (Creature*)target;
 
-        pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 0, 0);
-        pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 1, cinfo->unit_class);
-        pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 2, minfo->gender);
-        pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 3, 0);
+            const CreatureInfo* cinfo = pCreature->GetCreatureInfo();
+            const CreatureModelInfo* minfo = sObjectMgr.GetCreatureModelInfo(pCreature->GetNativeDisplayId());
 
-        pCreature->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_CLONED);
+            pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 0, 0);
+            pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 1, cinfo->UnitClass);
+            pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 2, minfo->gender);
+            pCreature->SetByteValue(UNIT_FIELD_BYTES_0, 3, 0);
+        }
+
+        target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_CLONED);
 
-        pCreature->SetDisplayId(pCreature->GetNativeDisplayId());
+        target->SetDisplayId(target->GetNativeDisplayId());
     }
 }
 
 void Aura::HandleAuraConvertRune(bool apply, bool Real)
 {
-    if(!Real)
+    if (!Real)
         return;
 
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     Player *plr = (Player*)GetTarget();
 
-    if(plr->getClass() != CLASS_DEATH_KNIGHT)
+    if (plr->getClass() != CLASS_DEATH_KNIGHT)
         return;
 
     RuneType runeFrom = RuneType(GetSpellProto()->EffectMiscValue[m_effIndex]);
@@ -8473,7 +10574,7 @@ void Aura::HandleAuraConvertRune(bool apply, bool Real)
         {
             if (plr->GetCurrentRune(i) == runeFrom && !plr->GetRuneCooldown(i))
             {
-                plr->ConvertRune(i, runeTo);
+                plr->ConvertRune(i, runeTo, GetId());
                 break;
             }
         }
@@ -8482,9 +10583,10 @@ void Aura::HandleAuraConvertRune(bool apply, bool Real)
     {
         for(uint32 i = 0; i < MAX_RUNES; ++i)
         {
-            if(plr->GetCurrentRune(i) == runeTo && plr->GetBaseRune(i) == runeFrom)
+            if (plr->GetCurrentRune(i) == runeTo && plr->GetBaseRune(i) == runeFrom)
             {
                 plr->ConvertRune(i, runeFrom);
+                plr->ClearConvertedBy(i);
                 break;
             }
         }
@@ -8493,42 +10595,33 @@ void Aura::HandleAuraConvertRune(bool apply, bool Real)
 
 void Aura::HandlePhase(bool apply, bool Real)
 {
-    if(!Real)
+    if (!Real)
         return;
 
     Unit *target = GetTarget();
 
     // always non stackable
-    if(apply)
+    if (apply)
     {
         Unit::AuraList const& phases = target->GetAurasByType(SPELL_AURA_PHASE);
-        if(!phases.empty())
+        if (!phases.empty())
             target->RemoveAurasDueToSpell(phases.front()->GetId(), GetHolder());
     }
 
     target->SetPhaseMask(apply ? GetMiscValue() : PHASEMASK_NORMAL, true);
     // no-phase is also phase state so same code for apply and remove
-    if (GetEffIndex() == EFFECT_INDEX_0 && target->GetTypeId() == TYPEID_PLAYER)
+    if (target->GetTypeId() == TYPEID_PLAYER)
     {
         SpellAreaForAreaMapBounds saBounds = sSpellMgr.GetSpellAreaForAuraMapBounds(GetId());
-        if(saBounds.first != saBounds.second)
+        if (saBounds.first != saBounds.second)
         {
             uint32 zone, area;
             target->GetZoneAndAreaId(zone, area);
 
-            for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
-            {
-                // some auras remove at aura remove
-                if(!itr->second->IsFitToRequirements((Player*)target, zone, area))
-                    target->RemoveAurasDueToSpell(itr->second->spellId);
-                // some auras applied at aura apply
-                else if(itr->second->autocast)
-                {
-                    if (!target->HasAura(itr->second->spellId, EFFECT_INDEX_0))
-                        target->CastSpell(target, itr->second->spellId, true);
-                }
-            }
+            for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
+                itr->second->ApplyOrRemoveSpellIfCan((Player*)target, zone, area, false);
         }
+
     }
 }
 
@@ -8537,19 +10630,20 @@ void Aura::HandleAuraSafeFall( bool Apply, bool Real )
     // implemented in WorldSession::HandleMovementOpcodes
 
     // only special case
-    if(Apply && Real && GetId() == 32474 && GetTarget()->GetTypeId() == TYPEID_PLAYER)
+    if (Apply && Real && GetId() == 32474 && GetTarget()->GetTypeId() == TYPEID_PLAYER)
         ((Player*)GetTarget())->ActivateTaxiPathTo(506, GetId());
 }
 
-bool Aura::IsCritFromAbilityAura(Unit* caster, uint32& damage)
+bool Aura::IsCritFromAbilityAura(Unit* caster, DamageInfo* damageInfo)
 {
-    if (!GetSpellProto()->IsFitToFamily(SPELLFAMILY_ROGUE, UI64LIT(0x100000)) && // Rupture
+    if (!GetSpellProto()->IsFitToFamily<SPELLFAMILY_ROGUE, CF_ROGUE_RUPTURE>() && // Rupture
+        !GetSpellProto()->IsFitToFamily<SPELLFAMILY_ROGUE, CF_ROGUE_DEADLY_POISON>() &&
         !caster->HasAffectedAura(SPELL_AURA_ABILITY_PERIODIC_CRIT, GetSpellProto()))
         return false;
 
     if (caster->IsSpellCrit(GetTarget(), GetSpellProto(), GetSpellSchoolMask(GetSpellProto())))
     {
-        damage = caster->SpellCriticalDamageBonus(GetSpellProto(), damage, GetTarget());
+        damageInfo->damage = caster->SpellCriticalDamageBonus(GetSpellProto(), damageInfo->damage, GetTarget());
         return true;
     }
 
@@ -8558,7 +10652,7 @@ bool Aura::IsCritFromAbilityAura(Unit* caster, uint32& damage)
 
 void Aura::HandleModTargetArmorPct(bool /*apply*/, bool /*Real*/)
 {
-    if(GetTarget()->GetTypeId() != TYPEID_PLAYER)
+    if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ((Player*)GetTarget())->UpdateArmorPenetration();
@@ -8567,12 +10661,12 @@ void Aura::HandleModTargetArmorPct(bool /*apply*/, bool /*Real*/)
 void Aura::HandleAuraModAllCritChance(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
-    if(!Real)
+    if (!Real)
         return;
 
     Unit *target = GetTarget();
 
-    if(target->GetTypeId() != TYPEID_PLAYER)
+    if (target->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ((Player*)target)->HandleBaseModValue(CRIT_PERCENTAGE,         FLAT_MOD, float (m_modifier.m_amount), apply);
@@ -8587,14 +10681,14 @@ void Aura::HandleAuraStopNaturalManaRegen(bool apply, bool Real)
 {
     if (!Real)
         return;
-
-    GetTarget()->ApplyModFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER, !apply && !GetTarget()->IsUnderLastManaUseEffect());
+    if (GetTarget()->getClass() != CLASS_DEATH_KNIGHT)
+        GetTarget()->ApplyModFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER, !apply && !GetTarget()->IsUnderLastManaUseEffect());
 }
 
 bool Aura::IsLastAuraOnHolder()
 {
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if (i != GetEffIndex() && GetHolder()->m_auras[i])
+        if (i != GetEffIndex() && GetHolder()->GetAuraByEffectIndex(SpellEffectIndex(i)))
             return false;
     return true;
 }
@@ -8605,16 +10699,18 @@ bool Aura::HasMechanic(uint32 mechanic) const
         GetSpellProto()->EffectMechanic[m_effIndex] == mechanic;
 }
 
+
 SpellAuraHolder::SpellAuraHolder(SpellEntry const* spellproto, Unit *target, WorldObject *caster, Item *castItem) :
 m_spellProto(spellproto), m_target(target), m_castItemGuid(castItem ? castItem->GetObjectGuid() : ObjectGuid()),
 m_auraSlot(MAX_AURAS), m_auraFlags(AFLAG_NONE), m_auraLevel(1), m_procCharges(0),
-m_stackAmount(1), m_removeMode(AURA_REMOVE_BY_DEFAULT), m_AuraDRGroup(DIMINISHING_NONE), m_timeCla(1000),
-m_permanent(false), m_isRemovedOnShapeLost(true), m_deleted(false), m_in_use(0)
+m_stackAmount(1), m_timeCla(1000), m_removeMode(AURA_REMOVE_BY_DEFAULT), m_AuraDRGroup(DIMINISHING_NONE),
+m_permanent(false), m_isRemovedOnShapeLost(true), m_deleted(false)
 {
     MANGOS_ASSERT(target);
     MANGOS_ASSERT(spellproto && spellproto == sSpellStore.LookupEntry( spellproto->Id ) && "`info` must be pointer to sSpellStore element");
+    m_aurasStorage.clear();
 
-    if(!caster)
+    if (!caster)
         m_casterGuid = target->GetObjectGuid();
     else
     {
@@ -8623,10 +10719,12 @@ m_permanent(false), m_isRemovedOnShapeLost(true), m_deleted(false), m_in_use(0)
         m_casterGuid = caster->GetObjectGuid();
     }
 
+    m_originalCasterGuid = m_casterGuid;  // Must be setted after by special case
+
     m_applyTime      = time(NULL);
     m_isPassive      = IsPassiveSpell(spellproto);
     m_isDeathPersist = IsDeathPersistentSpell(spellproto);
-    m_isSingleTarget = IsSingleTargetSpell(spellproto);
+    m_trackedAuraType= IsSingleTargetSpell(spellproto) ? TRACK_AURA_TYPE_SINGLE_TARGET : IsSpellHaveAura(spellproto, SPELL_AURA_CONTROL_VEHICLE) ? TRACK_AURA_TYPE_CONTROL_VEHICLE : TRACK_AURA_TYPE_NOT_TRACKED;
     m_procCharges    = spellproto->procCharges;
 
     m_isRemovedOnShapeLost = (GetCasterGuid() == m_target->GetObjectGuid() &&
@@ -8638,8 +10736,8 @@ m_permanent(false), m_isRemovedOnShapeLost(true), m_deleted(false), m_in_use(0)
 
     m_duration = m_maxDuration = CalculateSpellDuration(spellproto, unitCaster);
 
-    if (m_maxDuration == -1 || (m_isPassive && spellproto->DurationIndex == 0))
-        m_permanent = true;
+    if (m_maxDuration == -1 || (m_isPassive && spellproto->GetDurationIndex() == 0))
+        SetPermanent(true);
 
     if (unitCaster)
     {
@@ -8656,32 +10754,85 @@ m_permanent(false), m_isRemovedOnShapeLost(true), m_deleted(false), m_in_use(0)
         case 24662:                                         // Restless Strength
         case 26464:                                         // Mercurial Shield
         case 34027:                                         // Kill Command
+        case 53257:                                         // Cobra strike
         case 55166:                                         // Tidal Force
         case 58914:                                         // Kill Command (pet part)
         case 62519:                                         // Attuned to Nature
+        case 63050:                                         // Sanity (Ulduar - Yogg Saron)
         case 64455:                                         // Feral Essence
+        case 66228:                                         // Nether Power (ToC: Lord Jaraxxus)
+        case 67106:                                         // Nether Power (ToC: Lord Jaraxxus)
+        case 67107:                                         // Nether Power (ToC: Lord Jaraxxus)
+        case 67108:                                         // Nether Power (ToC: Lord Jaraxxus)
         case 71564:                                         // Deadly Precision
+        case 71756:                                         // Ball of Flames Proc (Blood Prince Council)
         case 74396:                                         // Fingers of Frost
+        case 70672:                                         // Gaseous Bloat (Putricide)
+        case 72455:
+        case 72832:
+        case 72833:
             m_stackAmount = m_spellProto->StackAmount;
             break;
     }
-
-    for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-        m_auras[i] = NULL;
 }
 
-void SpellAuraHolder::AddAura(Aura *aura, SpellEffectIndex index)
+void SpellAuraHolder::AddAura(Aura const& aura, SpellEffectIndex index)
 {
-    m_auras[index] = aura;
+    if (/*Aura* _aura = */GetAuraByEffectIndex(index))
+    {
+        DEBUG_LOG("SpellAuraHolder::AddAura attempt to add aura (effect %u) to holder of spell %u, but holder already have active aura!", index, GetId());
+        RemoveAura(index);
+    }
+    if (!m_aurasStorage.empty())
+    {
+        AuraStorage::iterator itr = m_aurasStorage.find(index);
+        if (itr != m_aurasStorage.end())
+        {
+            MAPLOCK_WRITE(m_target, MAP_LOCK_TYPE_AURAS);
+            m_aurasStorage.erase(itr);
+        }
+    }
+
+    m_aurasStorage.insert(AuraStorage::value_type(index,aura));
     m_auraFlags |= (1 << index);
 }
 
 void SpellAuraHolder::RemoveAura(SpellEffectIndex index)
 {
-    m_auras[index] = NULL;
     m_auraFlags &= ~(1 << index);
 }
 
+void SpellAuraHolder::CleanupsBeforeDelete()
+{
+    for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+        RemoveAura(SpellEffectIndex(i));
+
+    if (!m_aurasStorage.empty())
+        m_aurasStorage.clear();
+}
+
+Aura* SpellAuraHolder::GetAuraByEffectIndex(SpellEffectIndex index)
+{
+    if ((m_auraFlags & (1 << index)) && !m_aurasStorage.empty())
+    {
+        AuraStorage::iterator itr = m_aurasStorage.find(index);
+        if (itr != m_aurasStorage.end())
+            return &itr->second;
+    }
+    return (Aura*)NULL;
+}
+
+Aura const* SpellAuraHolder::GetAura(SpellEffectIndex index) const
+{
+    if ((m_auraFlags & (1 << index)) && !m_aurasStorage.empty())
+    {
+        AuraStorage::const_iterator itr = m_aurasStorage.find(index);
+        if (itr != m_aurasStorage.end())
+            return &itr->second;
+    }
+    return (Aura*)NULL;
+}
+
 void SpellAuraHolder::ApplyAuraModifiers(bool apply, bool real)
 {
     for (int32 i = 0; i < MAX_EFFECT_INDEX && !IsDeleted(); ++i)
@@ -8693,7 +10844,8 @@ void SpellAuraHolder::_AddSpellAuraHolder()
 {
     if (!GetId())
         return;
-    if(!m_target)
+
+    if (!m_target)
         return;
 
     // Try find slot for aura
@@ -8703,10 +10855,9 @@ void SpellAuraHolder::_AddSpellAuraHolder()
     if (m_target->GetVisibleAurasCount() < MAX_AURAS)
     {
         Unit::VisibleAuraMap const& visibleAuras = m_target->GetVisibleAuras();
-        for(uint8 i = 0; i < MAX_AURAS; ++i)
+        for (size_t i = 0; i < MAX_AURAS ; ++i)
         {
-            Unit::VisibleAuraMap::const_iterator itr = visibleAuras.find(i);
-            if (itr == visibleAuras.end())
+            if (i == visibleAuras.size() || !visibleAuras[i])
             {
                 slot = i;
                 // update for out of range group members (on 1 slot use)
@@ -8719,22 +10870,16 @@ void SpellAuraHolder::_AddSpellAuraHolder()
     Unit* caster = GetCaster();
 
     // set infinity cooldown state for spells
-    if(caster && caster->GetTypeId() == TYPEID_PLAYER)
+    if (caster && caster->GetTypeId() == TYPEID_PLAYER)
     {
         if (m_spellProto->HasAttribute(SPELL_ATTR_DISABLED_WHILE_ACTIVE))
         {
             Item* castItem = m_castItemGuid ? ((Player*)caster)->GetItemByGuid(m_castItemGuid) : NULL;
-            ((Player*)caster)->AddSpellAndCategoryCooldowns(m_spellProto,castItem ? castItem->GetEntry() : 0, NULL,true);
+            caster->AddSpellAndCategoryCooldowns(m_spellProto,castItem ? castItem->GetEntry() : 0,true);
         }
     }
 
-    uint8 flags = 0;
-    for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-    {
-        if (m_auras[i])
-            flags |= (1 << i);
-    }
-    flags |= ((GetCasterGuid() == GetTarget()->GetObjectGuid()) ? AFLAG_NOT_CASTER : AFLAG_NONE) | ((GetSpellMaxDuration(m_spellProto) > 0) ? AFLAG_DURATION : AFLAG_NONE) | (IsPositive() ? AFLAG_POSITIVE : AFLAG_NEGATIVE);
+    uint8 flags = GetAuraFlags() | ((GetCasterGuid() == GetTarget()->GetObjectGuid()) ? AFLAG_NOT_CASTER : AFLAG_NONE) | ((GetSpellMaxDuration(m_spellProto) > 0 && !m_spellProto->HasAttribute(SPELL_ATTR_EX5_NO_DURATION)) ? AFLAG_DURATION : AFLAG_NONE) | (IsPositive() ? AFLAG_POSITIVE : AFLAG_NEGATIVE);
     SetAuraFlags(flags);
 
     SetAuraLevel(caster ? caster->getLevel() : sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL));
@@ -8742,7 +10887,7 @@ void SpellAuraHolder::_AddSpellAuraHolder()
     if (IsNeedVisibleSlot(caster))
     {
         SetAuraSlot( slot );
-        if(slot < MAX_AURAS)                        // slot found send data to client
+        if (slot < MAX_AURAS)                        // slot found send data to client
         {
             SetVisibleAura(false);
             SendAuraUpdate(false);
@@ -8754,7 +10899,7 @@ void SpellAuraHolder::_AddSpellAuraHolder()
         //*****************************************************
 
         // Sitdown on apply aura req seated
-        if (m_spellProto->AuraInterruptFlags & AURA_INTERRUPT_FLAG_NOT_SEATED && !m_target->IsSitState())
+        if ((m_spellProto->AuraInterruptFlags & AURA_INTERRUPT_FLAG_NOT_SEATED) && !m_target->IsSitState())
             m_target->SetStandState(UNIT_STAND_STATE_SIT);
 
         // register aura diminishing on apply
@@ -8766,23 +10911,27 @@ void SpellAuraHolder::_AddSpellAuraHolder()
             m_target->ModifyAuraState(AURA_STATE_JUDGEMENT, true);
 
         // Conflagrate aura state on Immolate and Shadowflame
-        if (m_spellProto->IsFitToFamily(SPELLFAMILY_WARLOCK, UI64LIT(0x0000000000000004), 0x00000002))
+        if (m_spellProto->IsFitToFamily<SPELLFAMILY_WARLOCK, CF_WARLOCK_IMMOLATE, CF_WARLOCK_SHADOWFLAME2>())
             m_target->ModifyAuraState(AURA_STATE_CONFLAGRATE, true);
 
         // Faerie Fire (druid versions)
-        if (m_spellProto->IsFitToFamily(SPELLFAMILY_DRUID, UI64LIT(0x0000000000000400)))
+        if (m_spellProto->IsFitToFamily<SPELLFAMILY_DRUID, CF_DRUID_FAERIE_FIRE>())
+            m_target->ModifyAuraState(AURA_STATE_FAERIE_FIRE, true);
+
+        // Sting (hunter's pet ability)
+        if (m_spellProto->Category == 1133)
             m_target->ModifyAuraState(AURA_STATE_FAERIE_FIRE, true);
 
         // Victorious
-        if (m_spellProto->IsFitToFamily(SPELLFAMILY_WARRIOR, UI64LIT(0x0004000000000000)))
+        if (m_spellProto->IsFitToFamily<SPELLFAMILY_WARRIOR, CF_WARRIOR_VICTORIOUS>())
             m_target->ModifyAuraState(AURA_STATE_WARRIOR_VICTORY_RUSH, true);
 
         // Swiftmend state on Regrowth & Rejuvenation
-        if (m_spellProto->IsFitToFamily(SPELLFAMILY_DRUID, UI64LIT(0x0000000000000050)))
+        if (m_spellProto->IsFitToFamily<SPELLFAMILY_DRUID, CF_DRUID_REJUVENATION, CF_DRUID_REGROWTH>())
             m_target->ModifyAuraState(AURA_STATE_SWIFTMEND, true);
 
         // Deadly poison aura state
-        if (m_spellProto->IsFitToFamily(SPELLFAMILY_ROGUE, UI64LIT(0x0000000000010000)))
+        if (m_spellProto->IsFitToFamily<SPELLFAMILY_ROGUE, CF_ROGUE_DEADLY_POISON>())
             m_target->ModifyAuraState(AURA_STATE_DEADLY_POISON, true);
 
         // Enrage aura state
@@ -8792,6 +10941,24 @@ void SpellAuraHolder::_AddSpellAuraHolder()
         // Bleeding aura state
         if (GetAllSpellMechanicMask(m_spellProto) & (1 << (MECHANIC_BLEED-1)))
             m_target->ModifyAuraState(AURA_STATE_BLEEDING, true);
+
+        switch(m_spellProto->SpellFamilyName)
+        {
+            case SPELLFAMILY_GENERIC:
+                {
+                    if (GetSpellSchoolMask(m_spellProto) == (SPELL_SCHOOL_MASK_ARCANE | SPELL_SCHOOL_MASK_HOLY))
+                        m_target->ModifyAuraState(AURA_STATE_LIGHT_TARGET, true);
+                    else if (GetSpellSchoolMask(m_spellProto) == (SPELL_SCHOOL_MASK_ARCANE | SPELL_SCHOOL_MASK_SHADOW))
+                        m_target->ModifyAuraState(AURA_STATE_DARK_TARGET, true);
+
+                        // need more correct research for this aura state and effect (mostly Ulduar vehicle spells)
+//                    else if (GetSpellSchoolMask(m_spellProto) == (SPELL_SCHOOL_MASK_ARCANE | SPELL_SCHOOL_MASK_FIRE))
+//                        m_target->ModifyAuraState(AURA_STATE_SPELLFIRE, true);
+                    break;
+                }
+            default:
+                break;
+        }
     }
 }
 
@@ -8799,7 +10966,7 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
 {
     // Remove all triggered by aura spells vs unlimited duration
     // except same aura replace case
-    if(m_removeMode!=AURA_REMOVE_BY_STACK)
+    if (m_removeMode!=AURA_REMOVE_BY_STACK)
         CleanupTriggeredSpells();
 
     Unit* caster = GetCaster();
@@ -8814,17 +10981,25 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
             if (Item* castItem = ((Player*)m_target)->GetItemByGuid(castItemGuid))
                 ((Player*)m_target)->DestroyItemWithOnStoreSpell(castItem, GetId());
 
+    // reset cooldown state for spells
+    if (caster && caster->GetTypeId() == TYPEID_PLAYER)
+    {
+        if (GetSpellProto()->GetAttributes() & SPELL_ATTR_DISABLED_WHILE_ACTIVE)
+            // note: item based cooldowns and cooldown spell mods with charges ignored (unknown existing cases)
+            ((Player*)caster)->SendCooldownEvent(GetSpellProto());
+    }
+
     //passive auras do not get put in slots - said who? ;)
     // Note: but totem can be not accessible for aura target in time remove (to far for find in grid)
-    //if(m_isPassive && !(caster && caster->GetTypeId() == TYPEID_UNIT && ((Creature*)caster)->IsTotem()))
+    //if (m_isPassive && !(caster && caster->GetTypeId() == TYPEID_UNIT && ((Creature*)caster)->IsTotem()))
     //    return;
 
     uint8 slot = GetAuraSlot();
 
-    if(slot >= MAX_AURAS)                                   // slot not set
+    if (slot >= MAX_AURAS)                                   // slot not set
         return;
 
-    if(m_target->GetVisibleAura(slot) == 0)
+    if (!m_target->GetVisibleAura(slot))
         return;
 
     // unregister aura diminishing (and store last time)
@@ -8846,7 +11021,7 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
         // Update target aura state flag (at last aura remove)
         //*****************************************************
         // Enrage aura state
-        if(m_spellProto->Dispel == DISPEL_ENRAGE)
+        if (m_spellProto->Dispel == DISPEL_ENRAGE)
             m_target->ModifyAuraState(AURA_STATE_ENRAGE, false);
 
         // Bleeding aura state
@@ -8869,41 +11044,54 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
         }
 
         uint32 removeState = 0;
-        ClassFamilyMask removeFamilyFlag = m_spellProto->SpellFamilyFlags;
+        ClassFamilyMask removeFamilyFlag = m_spellProto->GetSpellFamilyFlags();
         switch(m_spellProto->SpellFamilyName)
         {
+            case SPELLFAMILY_GENERIC:
+                {
+                    if (GetSpellSchoolMask(m_spellProto) == (SPELL_SCHOOL_MASK_ARCANE | SPELL_SCHOOL_MASK_HOLY))
+                        removeState = AURA_STATE_LIGHT_TARGET;
+                    else if (GetSpellSchoolMask(m_spellProto) == (SPELL_SCHOOL_MASK_ARCANE | SPELL_SCHOOL_MASK_SHADOW))
+                        removeState = AURA_STATE_DARK_TARGET;
+                    else if (GetSpellSchoolMask(m_spellProto) == (SPELL_SCHOOL_MASK_ARCANE | SPELL_SCHOOL_MASK_FIRE))
+                        removeState = AURA_STATE_SPELLFIRE;
+                }
+                break;
             case SPELLFAMILY_PALADIN:
                 if (IsSealSpell(m_spellProto))
                     removeState = AURA_STATE_JUDGEMENT;     // Update Seals information
                 break;
             case SPELLFAMILY_WARLOCK:
                 // Conflagrate aura state on Immolate and Shadowflame,
-                if (m_spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000000004), 0x00000002))
+                if (m_spellProto->GetSpellFamilyFlags().test<CF_WARLOCK_IMMOLATE, CF_WARLOCK_SHADOWFLAME2>())
                 {
-                    removeFamilyFlag = ClassFamilyMask(UI64LIT(0x0000000000000004), 0x00000002);
+                    removeFamilyFlag = ClassFamilyMask::create<CF_WARLOCK_IMMOLATE, CF_WARLOCK_SHADOWFLAME2>();
                     removeState = AURA_STATE_CONFLAGRATE;
                 }
                 break;
             case SPELLFAMILY_DRUID:
-                if (m_spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000000400)))
+                if (m_spellProto->GetSpellFamilyFlags().test<CF_DRUID_FAERIE_FIRE>())
                     removeState = AURA_STATE_FAERIE_FIRE;   // Faerie Fire (druid versions)
-                else if (m_spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000000050)))
+                else if (m_spellProto->GetSpellFamilyFlags().test<CF_DRUID_REJUVENATION, CF_DRUID_REGROWTH>())
                 {
-                    removeFamilyFlag = ClassFamilyMask(UI64LIT(0x00000000000050));
+                    removeFamilyFlag = ClassFamilyMask::create<CF_DRUID_REJUVENATION, CF_DRUID_REGROWTH>();
                     removeState = AURA_STATE_SWIFTMEND;     // Swiftmend aura state
                 }
                 break;
             case SPELLFAMILY_WARRIOR:
-                if (m_spellProto->IsFitToFamilyMask(UI64LIT(0x0004000000000000)))
+                if (m_spellProto->GetSpellFamilyFlags().test<CF_WARRIOR_VICTORIOUS>())
                     removeState = AURA_STATE_WARRIOR_VICTORY_RUSH; // Victorious
                 break;
             case SPELLFAMILY_ROGUE:
-                if (m_spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000010000)))
+                if (m_spellProto->GetSpellFamilyFlags().test<CF_ROGUE_DEADLY_POISON>())
                     removeState = AURA_STATE_DEADLY_POISON; // Deadly poison aura state
                 break;
             case SPELLFAMILY_HUNTER:
-                if (m_spellProto->IsFitToFamilyMask(UI64LIT(0x1000000000000000)))
+                if (m_spellProto->GetSpellFamilyFlags().test<CF_HUNTER_PET_SPELLS>())
                     removeState = AURA_STATE_FAERIE_FIRE;   // Sting (hunter versions)
+                break;
+            default:
+                break;
         }
 
         // Remove state (but need check other auras for it)
@@ -8922,36 +11110,32 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
             }
 
             // this has been last aura
-            if(!found)
+            if (!found)
                 m_target->ModifyAuraState(AuraState(removeState), false);
         }
 
-        // reset cooldown state for spells
-        if(caster && caster->GetTypeId() == TYPEID_PLAYER)
-        {
-            if (GetSpellProto()->HasAttribute(SPELL_ATTR_DISABLED_WHILE_ACTIVE))
-                // note: item based cooldowns and cooldown spell mods with charges ignored (unknown existing cases)
-                ((Player*)caster)->SendCooldownEvent(GetSpellProto());
-        }
     }
 }
 
 void SpellAuraHolder::CleanupTriggeredSpells()
 {
+    if (!m_spellProto)
+        return;
+
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
     {
         if (!m_spellProto->EffectApplyAuraName[i])
             continue;
 
         uint32 tSpellId = m_spellProto->EffectTriggerSpell[i];
-        if(!tSpellId)
+        if (!tSpellId)
             continue;
 
         SpellEntry const* tProto = sSpellStore.LookupEntry(tSpellId);
-        if(!tProto)
+        if (!tProto)
             continue;
 
-        if(GetSpellDuration(tProto) != -1)
+        if (GetSpellDuration(tProto) != -1)
             continue;
 
         // needed for spell 43680, maybe others
@@ -8972,6 +11156,9 @@ bool SpellAuraHolder::ModStackAmount(int32 num)
     if (!protoStackAmount)
         return true;
 
+    if (num != 0)
+        HandleSpellSpecificBoostsForward(num > 0);
+
     // Modify stack but limit it
     int32 stackAmount = m_stackAmount + num;
     if (stackAmount > (int32)protoStackAmount)
@@ -9001,7 +11188,7 @@ void SpellAuraHolder::SetStackAmount(uint32 stackAmount)
 
         for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
         {
-            if (Aura *aur = m_auras[i])
+            if (Aura* aur = GetAuraByEffectIndex(SpellEffectIndex(i)))
             {
                 int32 bp = aur->GetBasePoints();
                 int32 amount = m_stackAmount * caster->CalculateSpellDamage(target, m_spellProto, SpellEffectIndex(i), &bp);
@@ -9011,10 +11198,33 @@ void SpellAuraHolder::SetStackAmount(uint32 stackAmount)
                     aur->ApplyModifier(false, true);
                     aur->GetModifier()->m_amount = amount;
                     aur->ApplyModifier(true, true);
+
+                    // change duration if aura refreshes
+                    if (refresh)
+                    {
+                        int32 maxduration = GetSpellMaxDuration(aur->GetSpellProto());
+                        int32 duration = GetSpellDuration(aur->GetSpellProto());
+
+                        // new duration based on combo points
+                        if (duration != maxduration)
+                        {
+                            if (Unit *caster = aur->GetCaster())
+                            {
+                                duration += int32((maxduration - duration) * caster->GetComboPoints() / 5);
+                                SetAuraMaxDuration(duration);
+                                SetAuraDuration(duration);
+                                refresh = false;
+                            }
+                        }
+                    }
                 }
             }
         }
     }
+    // Turkey Marker
+    // Hack for not changing duration of timed achievement
+    if (m_spellProto->Id == 25281)
+        refresh = false;
 
     if (refresh)
         // Stack increased refresh duration
@@ -9026,13 +11236,39 @@ void SpellAuraHolder::SetStackAmount(uint32 stackAmount)
 
 Unit* SpellAuraHolder::GetCaster() const
 {
-    if(GetCasterGuid() == m_target->GetObjectGuid())
-        return m_target;
+    if (!m_target)
+        return NULL;
+
+    if (GetCasterGuid().IsEmpty())
+        return NULL;
+
+    if (m_target->IsInWorld())
+        if (GetCasterGuid() == m_target->GetObjectGuid())
+            return m_target;
 
     return ObjectAccessor::GetUnit(*m_target, m_casterGuid);// player will search at any maps
 }
 
-bool SpellAuraHolder::IsWeaponBuffCoexistableWith(SpellAuraHolder const* ref) const
+Unit* SpellAuraHolder::GetAffectiveCaster() const
+{
+    if (!m_target)
+        return NULL;
+
+    return GetAffectiveCasterGuid() != GetCasterGuid() ?
+        ObjectAccessor::GetUnit(*m_target, GetAffectiveCasterGuid()) :
+        GetCaster();
+}
+
+void SpellAuraHolder::SetAffectiveCasterGuid(ObjectGuid guid)
+{
+    if (!guid || !guid.IsUnit() || !m_target)
+        return;
+
+    m_originalCasterGuid = guid;
+    SetCasterGuid(m_target->GetObjectGuid());
+};
+
+bool SpellAuraHolder::IsWeaponBuffCoexistableWith() const
 {
     // only item casted spells
     if (!GetCastItemGuid())
@@ -9063,8 +11299,7 @@ bool SpellAuraHolder::IsWeaponBuffCoexistableWith(SpellAuraHolder const* ref) co
         (castItem->GetSlot() != EQUIPMENT_SLOT_MAINHAND && castItem->GetSlot() != EQUIPMENT_SLOT_OFFHAND))
         return false;
 
-    // form different weapons
-    return ref->GetCastItemGuid() && ref->GetCastItemGuid() != GetCastItemGuid();
+    return true;
 }
 
 bool SpellAuraHolder::IsNeedVisibleSlot(Unit const* caster) const
@@ -9096,12 +11331,12 @@ void SpellAuraHolder::BuildUpdatePacket(WorldPacket& data) const
     uint32 stackCount = m_procCharges ? m_procCharges*m_stackAmount : m_stackAmount;
     data << uint8(stackCount <= 255 ? stackCount : 255);
 
-    if(!(auraFlags & AFLAG_NOT_CASTER))
+    if (!(auraFlags & AFLAG_NOT_CASTER))
     {
-        data << GetCasterGuid().WriteAsPacked();
+        data << GetAffectiveCasterGuid().WriteAsPacked();
     }
 
-    if(auraFlags & AFLAG_DURATION)
+    if (auraFlags & AFLAG_DURATION)
     {
         data << uint32(GetAuraMaxDuration());
         data << uint32(GetAuraDuration());
@@ -9113,7 +11348,7 @@ void SpellAuraHolder::SendAuraUpdate(bool remove) const
     WorldPacket data(SMSG_AURA_UPDATE);
     data << m_target->GetPackGUID();
 
-    if(remove)
+    if (remove)
     {
         data << uint8(GetAuraSlot());
         data << uint32(0);
@@ -9126,16 +11361,80 @@ void SpellAuraHolder::SendAuraUpdate(bool remove) const
 
 void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
 {
+    // it's impossible in theory, but possible at fact...
+    if (!GetSpellProto())
+        return;
+
+    // if holder applyed in deleted case, need do nothing
+    if (apply && IsDeleted())
+    {
+        sLog.outError("SpellAuraHolder::HandleSpellSpecificBoosts called `apply`  for deleted holder %u !", GetId());
+        return;
+    }
+
     bool cast_at_remove = false;                            // if spell must be casted at last aura from stack remove
     uint32 spellId1 = 0;
     uint32 spellId2 = 0;
     uint32 spellId3 = 0;
     uint32 spellId4 = 0;
 
+    // Linked spells (boost chain)
+    SpellLinkedSet linkedSet = sSpellMgr.GetSpellLinked(GetId(), SPELL_LINKED_TYPE_BOOST);
+    if (linkedSet.size() > 0)
+    {
+        for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+        {
+            apply ?
+                m_target->CastSpell(m_target, *itr, true, NULL, NULL, GetCasterGuid()) :
+                m_target->RemoveAurasByCasterSpell(*itr, GetCasterGuid());
+        }
+    }
+
+    // pet auras add (effects not checked! must be checked at load from DB)
+    for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        if (PetAura const* petSpell = sSpellMgr.GetPetAura(GetId(), SpellEffectIndex(i)))
+        {
+            if (apply)
+                m_target->AddPetAura(petSpell);
+            else
+                m_target->RemovePetAura(petSpell);
+        }
+    }
+
+    linkedSet.clear();
+    if (!apply)
+    {
+        // Linked spells (CastOnRemove chain)
+        linkedSet = sSpellMgr.GetSpellLinked(GetId(), SPELL_LINKED_TYPE_CASTONREMOVE);
+        if (linkedSet.size() > 0)
+        {
+            for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+                m_target->CastSpell(m_target, *itr, true, NULL, NULL, GetCasterGuid());
+        }
+
+        // Linked spells (RemoveOnRemove chain)
+        linkedSet = sSpellMgr.GetSpellLinked(GetId(), SPELL_LINKED_TYPE_REMOVEONREMOVE);
+        if (linkedSet.size() > 0)
+        {
+            for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+                m_target->RemoveAurasByCasterSpell(*itr, GetCasterGuid());
+        }
+    }
+    linkedSet.clear();
+
     switch(GetSpellProto()->SpellFamilyName)
     {
         case SPELLFAMILY_GENERIC:
         {
+            // Bandages
+            if (GetSpellProto()->Mechanic == MECHANIC_BANDAGE && !apply)
+            {
+                cast_at_remove = true;
+                spellId1 = 11196;                     // Recently Bandaged
+                break;
+            }
+
             switch(GetId())
             {
                 case 29865:                                 // Deathbloom (10 man)
@@ -9149,6 +11448,11 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                         return;
                     break;
                 }
+                case 37728:                                 // Arena preparation
+                {
+                    GetTarget()->HandleArenaPreparation(apply);
+                    return;
+                }
                 case 55053:                                 // Deathbloom (25 man)
                 {
                     if (!apply && m_removeMode == AURA_REMOVE_BY_EXPIRE)
@@ -9160,14 +11464,46 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                         return;
                     break;
                 }
+                case 62274:                                 // Shield of Runes (normal) (Runemaster Molgeim, Assembly of Iron encounter in Ulduar)
+                {
+                    if (!apply && m_removeMode == AURA_REMOVE_BY_SHIELD_BREAK)
+                    {
+                        cast_at_remove = true;
+                        spellId1 = 62277;
+                    }
+                    else
+                        return;
+                    break;
+                }
+                case 63489:                                 // Shield of Runes (heroic) (Runemaster Molgeim, Assembly of Iron encounter in Ulduar)
+                {
+                    if (!apply && m_removeMode == AURA_REMOVE_BY_SHIELD_BREAK)
+                    {
+                        cast_at_remove = true;
+                        spellId1 = 63967;
+                    }
+                    else
+                        return;
+                    break;
+                }
                 case 50720:                                 // Vigilance (warrior spell but not have warrior family)
                 {
                     spellId1 = 68066;                       // Damage Reduction
                     break;
                 }
+                case 55001:                                 // Parachute
+                {
+                    if (apply)
+                    {
+                        m_target->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+                        m_target->RemoveSpellsCausingAura(SPELL_AURA_FLY);
+                        m_target->RemoveSpellsCausingAura(SPELL_AURA_MOD_INCREASE_SPEED);
+                    }
+                    break;
+                }
                 case 57350:                                 // Illusionary Barrier
                 {
-                    if (!apply && m_target->getPowerType() == POWER_MANA)
+                    if (!apply && m_target->GetPowerType() == POWER_MANA)
                     {
                         cast_at_remove = true;
                         spellId1 = 60242;                   // Darkmoon Card: Illusion
@@ -9176,19 +11512,71 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                         return;
                     break;
                 }
-                case 58914:                                     // Kill Command, pet aura
+                case 62056:                                 // Stone Grip (Kologarn encounter)
+                case 63985:                                 // Stone Grip (Kologarn encounter) heroic
                 {
-                    // Removal is needed here because the dummy aura handler is applied / removed at stacks change
                     if (!apply)
-                        if(Unit* caster = GetCaster())
-                            caster->RemoveAurasDueToSpell(34027);
+                    {
+                        spellId1 = GetId() == 62056 ? 64290 : 64292;
+                    }
+                }
+                case 62546:                                 // Scorch (Ignis encounter)
+                case 63474:                                 // Scorch (Ignis encounter) heroic
+                {
+                    if (apply)
+                    {
+                        spellId1 = 62551;
+                    }
+                    break;
+                }
+                case 62619:                                 // Potent Pheromones (Freya encounter)
+                case 64321:                                 // Potent Pheromones (Freya encounter) heroic
+                {
+                    if (apply)
+                        if (Unit* target = GetTarget())
+                            target->RemoveAurasDueToSpell(62532);
                     return;
                 }
-                case 62692:                                 // Aura of Despair
+                case 62692:                                 // Aura of Despair (General Vezax - Ulduar)
                 {
                     spellId1 = 64848;
                     break;
                 }
+                case 63277:                                 // Shadow Crash (General Vezax - Ulduar)
+                {
+                    spellId1 = 65269;
+                    break;
+                }
+                case 69409:                                 // Soul Reaper (Lich King)
+                case 73797:
+                case 73798:
+                case 73799:
+                {
+                    Unit *pCaster = GetCaster();
+                    if (!apply && pCaster)
+                        m_target->CastSpell(pCaster, 69410, true);
+
+                    break;
+                }
+                case 70157:                                 // Ice Tomb (Sindragosa)
+                {
+                    spellId1 = 69700;
+                    break;
+                }
+                case 72868:                                 // Slime Puddle (ICC - Professor Putricide) Heroic
+                case 72869:
+                {
+                    m_target->_AddAura(GetId() == 72868 ? 70346 : 72456, 2000);
+                    break;
+                }
+                case 70867:                                 // Soul of Blood Qween
+                case 71473:
+                case 71532:
+                case 71533:
+                {
+                    spellId1 = 70871;
+                    break;
+                }
                 case 71905:                                 // Soul Fragment
                 {
                     if (!apply)
@@ -9200,6 +11588,58 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                         return;
                     break;
                 }
+                case 63120:                                 // Insane
+                {
+                    spellId1 = 64464;
+                    break;
+                }
+                case 63830:                                 // Malady of the Mind
+                case 63881:
+                {
+                    if (!apply)
+                    {
+                        spellId1 = 63881;
+                        cast_at_remove = true;
+                    }
+                    break;
+                }
+                case 69674:                                 // Mutated Infection
+                case 71224:
+                case 73022:
+                case 73023:
+                {
+                    if (!apply)
+                    {
+                        cast_at_remove = true;
+                        spellId1 = (GetSpellProto() ? GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_2) : 0);
+                    }
+                    break;
+                }
+                case 70877:                                 // Frenzied Bloodthirst (Queen Lana'thel)
+                case 71474:
+                {
+                    if (!apply && m_removeMode == AURA_REMOVE_BY_EXPIRE)
+                    {
+                        cast_at_remove = true;
+                        spellId1 = 70923; // Uncontrollable Frenzy
+                    }
+                    break;
+                }
+                case 73034:                                 // Blighted Spores
+                case 73033:
+                case 71222:
+                case 69290:
+                {
+                    if (!apply)
+                    {
+                        if (m_removeMode == AURA_REMOVE_BY_EXPIRE)
+                        {
+                             cast_at_remove = true;
+                             spellId1 = 69291;
+                        }
+                    }
+                    break;
+                }
                 default:
                     return;
             }
@@ -9208,7 +11648,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
         case SPELLFAMILY_MAGE:
         {
             // Ice Barrier (non stacking from one caster)
-            if (m_spellProto->SpellIconID == 32)
+            if (m_spellProto->GetSpellIconID() == 32)
             {
                 if ((!apply && m_removeMode == AURA_REMOVE_BY_DISPEL) || m_removeMode == AURA_REMOVE_BY_SHIELD_BREAK)
                 {
@@ -9216,7 +11656,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                     for(Unit::AuraList::const_iterator itr = dummyAuras.begin(); itr != dummyAuras.end(); ++itr)
                     {
                         // Shattered Barrier
-                        if ((*itr)->GetSpellProto()->SpellIconID == 2945)
+                        if ((*itr)->GetSpellProto()->GetSpellIconID() == 2945)
                         {
                             cast_at_remove = true;
                             // first rank have 50% chance
@@ -9230,12 +11670,40 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                     return;
                 break;
             }
+            else if (m_spellProto->GetSpellFamilyFlags().test<CF_MAGE_FIREBALL>() && GetSpellProto()->GetSpellVisual() == 67)
+            {
+                // Glyph of Fireball
+                if (Unit * caster = GetCaster())
+                    if (caster->HasAura(56368))
+                        m_target->RemoveAurasByCasterSpell(GetId(), caster->GetObjectGuid());
+            }
+            else if (m_spellProto->GetSpellFamilyFlags().test<CF_MAGE_FROSTBOLT>() && GetSpellProto()->GetSpellVisual() == 13)
+            {
+                // Glyph of Frostbolt
+                if (Unit * caster = GetCaster())
+                    if (caster->HasAura(56370))
+                        m_target->RemoveAurasByCasterSpell(GetId(), caster->GetObjectGuid());
+            }
+            else if (!apply && m_spellProto->GetSpellFamilyFlags().test<CF_MAGE_ARCANE_MISSILES_CHANNEL>())
+            {
+                if (Unit * caster = GetCaster())
+                {
+                    // Remove missile barrage
+                    if (SpellAuraHolderPtr holder = caster->GetSpellAuraHolder(44401, caster->GetObjectGuid()))
+                        if (holder->DropAuraCharge())
+                            caster->RemoveSpellAuraHolder(holder);
+
+                    // Remove Arcane Blast
+                    if (caster->HasAura(36032))
+                        caster->RemoveAurasByCasterSpell(36032, caster->GetObjectGuid());
+                }
+            }
 
             switch(GetId())
             {
                 case 11129:                                 // Combustion (remove triggered aura stack)
                 {
-                    if(!apply)
+                    if (!apply)
                         spellId1 = 28682;
                     else
                         return;
@@ -9243,7 +11711,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                 }
                 case 28682:                                 // Combustion (remove main aura)
                 {
-                    if(!apply)
+                    if (!apply)
                         spellId1 = 11129;
                     else
                         return;
@@ -9257,25 +11725,16 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                     if (!apply && m_removeMode == AURA_REMOVE_BY_DEFAULT)
                     {
                         Unit* caster = GetCaster();
-                        // Item - Mage T10 2P Bonus
-                        if (!caster || !caster->HasAura(70752))
-                            return;
-
-                        cast_at_remove = true;
-                        spellId1 = 70753;                   // Pushing the Limit
+                        if (caster && caster->HasAura(70752))   // Item - Mage T10 2P Bonus
+                        {
+                            cast_at_remove = true;
+                            spellId1 = 70753;                   // Pushing the Limit
+                        }
                     }
                     else
                         return;
                     break;
                 }
-                case 74396:                                 // Fingers of Frost (remove main aura)
-                {
-                    if (!apply)
-                        spellId1 = 44544;
-                    else
-                        return;
-                    break;
-                }
                 default:
                     return;
             }
@@ -9283,31 +11742,43 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
         }
         case SPELLFAMILY_WARRIOR:
         {
-            if(!apply)
+            if (!apply)
             {
                 // Remove Blood Frenzy only if target no longer has any Deep Wound or Rend (applying is handled by procs)
-                if (GetSpellProto()->Mechanic != MECHANIC_BLEED)
-                    return;
+                if (GetSpellProto()->Mechanic == MECHANIC_BLEED)
+                {
 
-                // If target still has one of Warrior's bleeds, do nothing
-                Unit::AuraList const& PeriodicDamage = m_target->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE);
-                for(Unit::AuraList::const_iterator i = PeriodicDamage.begin(); i != PeriodicDamage.end(); ++i)
-                    if( (*i)->GetCasterGuid() == GetCasterGuid() &&
-                        (*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARRIOR &&
-                        (*i)->GetSpellProto()->Mechanic == MECHANIC_BLEED)
-                        return;
+                    // If target still has one of Warrior's bleeds, do nothing
+                    Unit::AuraList const& PeriodicDamage = m_target->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE);
+                    for(Unit::AuraList::const_iterator i = PeriodicDamage.begin(); i != PeriodicDamage.end(); ++i)
+                        if ( (*i)->GetCasterGuid() == GetCasterGuid() &&
+                            (*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARRIOR &&
+                            (*i)->GetSpellProto()->Mechanic == MECHANIC_BLEED)
+                            return;
 
-                spellId1 = 30069;                           // Blood Frenzy (Rank 1)
-                spellId2 = 30070;                           // Blood Frenzy (Rank 2)
+                    spellId1 = 30069;                           // Blood Frenzy (Rank 1)
+                    spellId2 = 30070;                           // Blood Frenzy (Rank 2)
+                    break;
+                }
+                else if (GetId() == 44521 && m_target && m_target->GetTypeId() == TYPEID_PLAYER)
+                {
+                    Player* plr = (Player*)m_target;
+                    plr->SetPower(POWER_MANA, plr->GetMaxPower(POWER_MANA));
+                    plr->SetPower(POWER_RAGE, 0);
+                    plr->SetPower(POWER_ENERGY, plr->GetMaxPower(POWER_ENERGY));
+                    plr->SetPower(POWER_RUNIC_POWER, 0);
+                    return;
+                }
+                return;
             }
             break;
         }
         case SPELLFAMILY_WARLOCK:
         {
             // Fear (non stacking)
-            if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000040000000000))
+            if (m_spellProto->GetSpellFamilyFlags().test<CF_WARLOCK_FEAR>())
             {
-                if(!apply)
+                if (!apply)
                 {
                     Unit* caster = GetCaster();
                     if(!caster)
@@ -9318,7 +11789,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                     {
                         SpellEntry const* dummyEntry = (*itr)->GetSpellProto();
                         // Improved Fear
-                        if (dummyEntry->SpellFamilyName == SPELLFAMILY_WARLOCK && dummyEntry->SpellIconID == 98)
+                        if (dummyEntry->SpellFamilyName == SPELLFAMILY_WARLOCK && dummyEntry->GetSpellIconID() == 98)
                         {
                             cast_at_remove = true;
                             switch((*itr)->GetModifier()->m_amount)
@@ -9336,25 +11807,23 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                     return;
             }
             // Shadowflame (DoT)
-            else if (m_spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000000000), 0x00000002))
+            else if (m_spellProto->GetSpellFamilyFlags().test<CF_WARLOCK_SHADOWFLAME2>())
             {
                 // Glyph of Shadowflame
                 Unit* caster;
-                if(!apply)
+                if (!apply)
                     spellId1 = 63311;
                 else if(((caster = GetCaster())) && caster->HasAura(63310))
                     spellId1 = 63311;
                 else
                     return;
             }
-            else
-                return;
             break;
         }
         case SPELLFAMILY_PRIEST:
         {
             // Shadow Word: Pain (need visual check fro skip improvement talent) or Vampiric Touch
-            if ((m_spellProto->SpellIconID == 234 && m_spellProto->SpellVisual[0]) || m_spellProto->SpellIconID == 2213)
+            if ((m_spellProto->GetSpellIconID() == 234 && m_spellProto->GetSpellVisual()) || m_spellProto->GetSpellIconID() == 2213)
             {
                 if (!apply && m_removeMode == AURA_REMOVE_BY_DISPEL)
                 {
@@ -9367,7 +11836,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                     {
                         // Shadow Affinity
                         if ((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_PRIEST
-                            && (*itr)->GetSpellProto()->SpellIconID == 178)
+                            && (*itr)->GetSpellProto()->GetSpellIconID() == 178)
                         {
                             // custom cast code
                             int32 basepoints0 = (*itr)->GetModifier()->m_amount * caster->GetCreateMana() / 100;
@@ -9380,10 +11849,10 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                     return;
             }
             // Power Word: Shield
-            else if (apply && m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000001) && m_spellProto->Mechanic == MECHANIC_SHIELD)
+            else if (apply && m_spellProto->GetSpellFamilyFlags().test<CF_PRIEST_POWER_WORD_SHIELD>() && m_spellProto->Mechanic == MECHANIC_SHIELD)
             {
                 Unit* caster = GetCaster();
-               if(!caster)
+                if (!caster)
                     return;
 
                 // Glyph of Power Word: Shield
@@ -9401,7 +11870,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                 // Abolish Disease (remove 1 more poison effect with Body and Soul)
                 case 552:
                 {
-                    if(apply)
+                    if (apply)
                     {
                         int chance =0;
                         Unit::AuraList const& dummyAuras = m_target->GetAurasByType(SPELL_AURA_DUMMY);
@@ -9409,15 +11878,15 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                         {
                             SpellEntry const* dummyEntry = (*itr)->GetSpellProto();
                             // Body and Soul (talent ranks)
-                            if (dummyEntry->SpellFamilyName == SPELLFAMILY_PRIEST && dummyEntry->SpellIconID == 2218 &&
-                                dummyEntry->SpellVisual[0]==0)
+                            if (dummyEntry->SpellFamilyName == SPELLFAMILY_PRIEST && dummyEntry->GetSpellIconID() == 2218 &&
+                                dummyEntry->GetSpellVisual()==0)
                             {
                                 chance = (*itr)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_1);
                                 break;
                             }
                         }
 
-                        if(roll_chance_i(chance))
+                        if (roll_chance_i(chance))
                             spellId1 = 64134;               // Body and Soul (periodic dispel effect)
                     }
                     else
@@ -9436,20 +11905,72 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
         }
         case SPELLFAMILY_DRUID:
         {
+            // Rip
+            if (GetSpellProto()->GetSpellFamilyFlags().test<CF_DRUID_RIP>())
+            {
+                Unit* caster = GetCaster();
+                if (!caster)
+                    return;
+
+                if (caster->HasAura(63974))                 // Glyph of Shred triggered
+                    caster->RemoveAurasDueToSpell(63974);
+            }
             // Barkskin
-            if (GetId()==22812 && m_target->HasAura(63057)) // Glyph of Barkskin
+            else if (GetId()==22812 && m_target->HasAura(63057)) // Glyph of Barkskin
                 spellId1 = 63058;                           // Glyph - Barkskin 01
-            else if (!apply && GetId() == 5229)             // Enrage (Druid Bear)
-                spellId1 = 51185;                           // King of the Jungle (Enrage damage aura)
+            // Enrage (Druid Bear)
+            else if (GetId() == 5229)
+            {
+                if (apply)
+                {
+                    if (m_target->HasAura(70726))           // Druid T10 Feral 4P Bonus
+                        spellId1 = 70725;                   // Enraged Defense
+                    else
+                        return;
+                }
+                else
+                {
+                    spellId1 = 70725;
+                    spellId2 = 51185;                       // King of the Jungle (Enrage damage aura)
+                }
+            }
             else
                 return;
             break;
         }
         case SPELLFAMILY_ROGUE:
+        {
+            // remove debuf savage combat
+            if (GetSpellProto()->GetSpellFamilyFlags().test<CF_ROGUE_CRIPPLING_POISON, CF_ROGUE_DEADLY_POISON,CF_ROGUE_WOUND_POISON, CF_ROGUE_POISON_UNK>())
+            {
+                // search poison
+                bool found = false;
+                if (m_target->HasAuraState(AURA_STATE_DEADLY_POISON))
+                    found = true;
+                else
+                {
+                    Unit::SpellAuraHolderMap const& auras = m_target->GetSpellAuraHolderMap();
+                    for (Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
+                    {
+                        if (itr->second->GetSpellProto()->SpellFamilyName == SPELLFAMILY_ROGUE &&
+                            itr->second->GetSpellProto()->Dispel == DISPEL_POISON)
+                        {
+                            found = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (!found)
+                {
+                    m_target->RemoveAurasDueToSpell(58684); // Savage Combat rank 1
+                    m_target->RemoveAurasDueToSpell(58683); // Savage Combat rank 2
+                }
+            }
             // Sprint (skip non player casted spells by category)
-            if (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000000040) && GetSpellProto()->Category == 44)
+            else if (GetSpellProto()->GetSpellFamilyFlags().test<CF_ROGUE_SPRINT>() && GetSpellProto()->Category == 44)
             {
-                if(!apply || m_target->HasAura(58039))      // Glyph of Blurred Speed
+                if (!apply || m_target->HasAura(58039))      // Glyph of Blurred Speed
                     spellId1 = 61922;                       // Sprint (waterwalk)
                 else
                    return;
@@ -9457,16 +11978,22 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
             else
                 return;
             break;
+        }
         case SPELLFAMILY_HUNTER:
         {
             switch (GetId())
             {
-                case 34074:                                 // Aspect of the Viper
+                case 13161:                                 // Aspect of the Beast
                 {
-                    if (!apply || m_target->HasAura(60144)) // Viper Attack Speed
-                        spellId1 = 61609;                   // Vicious Viper
-                    else
-                        return;
+                    if (Pet* pet = m_target->GetPet())
+                    {
+                        spellId1 = 61669;                   // Aspect of the Beast - pet part
+                        if (!apply)
+                        {
+                            pet->RemoveAurasDueToSpell(spellId1);
+                            return;
+                        }
+                    }
                     break;
                 }
                 case 19574:                                 // Bestial Wrath - immunity
@@ -9480,46 +12007,36 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                 }
                 case 34027:                                 // Kill Command, owner aura (spellmods)
                 {
-                    if (apply)
-                    {
-                        if (m_target->HasAura(35029))       // Focused Fire, rank 1
-                            spellId1 = 60110;               // Kill Command, Focused Fire rank 1 bonus
-                        else if (m_target->HasAura(35030))  // Focused Fire, rank 2
-                            spellId1 = 60113;               // Kill Command, Focused Fire rank 2 bonus
-                        else
-                            return;
-                    }
+                    if (m_target->HasAura(35029))       // Focused Fire, rank 1
+                        spellId1 = 60110;               // Kill Command, Focused Fire rank 1 bonus
+                    else if (m_target->HasAura(35030))  // Focused Fire, rank 2
+                        spellId1 = 60113;               // Kill Command, Focused Fire rank 2 bonus
                     else
-                    {
-                        spellId1 = 34026;                   // Kill Command, owner casting aura
-                        spellId2 = 60110;                   // Kill Command, Focused Fire rank 1 bonus
-                        spellId3 = 60113;                   // Kill Command, Focused Fire rank 2 bonus
-                        if (Unit* pet = m_target->GetPet())
-                            pet->RemoveAurasDueToSpell(58914); // Kill Command, pet aura
-                    }
-                    break;
-                }
-                case 35029:                                 // Focused Fire, rank 1
-                {
-                    if (apply && !m_target->HasAura(34027)) // Kill Command, owner casting aura
                         return;
-
-                    spellId1 = 60110;                       // Kill Command, Focused Fire rank 1 bonus
                     break;
                 }
-                case 35030:                                 // Focused Fire, rank 2
+                case 34074:                                 // Aspect of the Viper
                 {
-                    if (apply && !m_target->HasAura(34027)) // Kill Command, owner casting aura
+                    if (!apply || m_target->HasAura(60144)) // Viper Attack Speed
+                        spellId1 = 61609;                   // Vicious Viper
+                    else
                         return;
-
-                    spellId1 = 60113;                       // Kill Command, Focused Fire rank 2 bonus
                     break;
                 }
+                case 34455:          // Ferocious inspiration and ranks
+                    spellId1 = 75593;
+                    break;
+                case 34459:
+                    spellId1 = 75446;
+                    break;
+                case 34460:
+                    spellId1 = 75447;
+                    break;
                 default:
                     // Freezing Trap Effect
-                    if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000008))
+                    if (m_spellProto->GetSpellFamilyFlags().test<CF_HUNTER_FREEZING_TRAP_EFFECT>())
                     {
-                        if(!apply)
+                        if (!apply)
                         {
                             Unit *caster = GetCaster();
                             // Glyph of Freezing Trap
@@ -9535,7 +12052,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                             return;
                     }
                     // Aspect of the Dragonhawk dodge
-                    else if (GetSpellProto()->IsFitToFamilyMask(UI64LIT(0x0000000000000000), 0x00001000))
+                    else if (GetSpellProto()->GetSpellFamilyFlags().test<CF_HUNTER_ASPECT_OF_THE_DRAGONHAWK>())
                     {
                         spellId1 = 61848;
 
@@ -9551,9 +12068,31 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
         }
         case SPELLFAMILY_PALADIN:
         {
+            if (m_spellProto->Id == 19746)                  // Aura Mastery (on Concentration Aura remove and apply)
+            {
+                Unit *caster = GetCaster();
+                if (!caster)
+                    return;
+
+                if (apply && caster->HasAura(31821))
+                    caster->CastSpell(caster, 64364, true, NULL);
+                else if (!apply)
+                    caster->RemoveAurasDueToSpell(64364);
+            }
+            if (m_spellProto->Id == 31821)                  // Aura Mastery (on Aura Mastery original buff remove)
+            {
+                Unit *caster = GetCaster();
+                if (!caster)
+                    return;
+
+                if (apply && caster->HasAura(19746))
+                    caster->CastSpell(caster, 64364, true, NULL);
+                else if (!apply)
+                    caster->RemoveAurasDueToSpell(64364);
+            }
             if (m_spellProto->Id == 31884)                  // Avenging Wrath
             {
-                if(!apply)
+                if (!apply)
                     spellId1 = 57318;                       // Sanctified Wrath (triggered)
                 else
                 {
@@ -9561,7 +12100,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                     Unit::AuraList const& dummyAuras = m_target->GetAurasByType(SPELL_AURA_DUMMY);
                     for(Unit::AuraList::const_iterator itr = dummyAuras.begin(); itr != dummyAuras.end(); ++itr)
                     {
-                        if ((*itr)->GetSpellProto()->SpellIconID == 3029)
+                        if ((*itr)->GetSpellProto()->GetSpellIconID() == 3029)
                         {
                             percent = (*itr)->GetModifier()->m_amount;
                             break;
@@ -9569,13 +12108,11 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                     }
 
                     // apply in special way
-                    if(percent)
+                    if (percent)
                     {
                         spellId1 = 57318;                    // Sanctified Wrath (triggered)
                         // prevent aura deletion, specially in multi-boost case
-                        SetInUse(true);
                         m_target->CastCustomSpell(m_target, spellId1, &percent, &percent, NULL, true, NULL);
-                        SetInUse(false);
                     }
                     return;
                 }
@@ -9591,7 +12128,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                 return;
 
             // Sanctified Retribution and Swift Retribution (they share one aura), but not Retribution Aura (already gets modded)
-            if ((GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000000008))==0)
+            if (!GetSpellProto()->GetSpellFamilyFlags().test<CF_PALADIN_RETRIBUTION_AURA>())
                 spellId1 = 63531;                           // placeholder for talent spell mods
             // Improved Concentration Aura (auras bonus)
             spellId2 = 63510;                               // placeholder for talent spell mods
@@ -9605,6 +12142,26 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
             switch (GetId())
             {
                 case 49039: spellId1 = 50397; break;        // Lichborne
+                case 46619:                                 // Raise ally
+                {
+                    if (!m_target || m_target->GetTypeId() != TYPEID_PLAYER)
+                        return;
+                    Player* m_player = (Player*)m_target;
+                    if (apply)
+                    {
+                        // convert player to ghoul
+                        m_player->SetDeathState(GHOULED);
+                        m_player->SetHealth(1);
+                        m_player->SetRoot(true);
+                    }
+                    else
+                    {
+                        m_player->SetRoot(false);
+                        m_player->SetHealth(0);
+                        m_player->SetDeathState(JUST_DIED);
+                    }
+                    break;
+                }
 
                 case 48263:                                 // Frost Presence
                 case 48265:                                 // Unholy Presence
@@ -9622,7 +12179,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                             {
                                 // skip same icon
                                 if ((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT &&
-                                    (*itr)->GetSpellProto()->SpellIconID == 2636)
+                                    (*itr)->GetSpellProto()->GetSpellIconID() == 2636)
                                 {
                                     heal_pct = (*itr)->GetModifier()->m_amount;
                                     break;
@@ -9649,7 +12206,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                             {
                                 // skip same icon
                                 if ((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT &&
-                                    (*itr)->GetSpellProto()->SpellIconID == 2633)
+                                    (*itr)->GetSpellProto()->GetSpellIconID() == 2633)
                                 {
                                     power_pct = (*itr)->GetModifier()->m_amount;
                                     break;
@@ -9673,7 +12230,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                             {
                                 // skip same icon
                                 if ((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT &&
-                                    (*itr)->GetSpellProto()->SpellIconID == 2632)
+                                    (*itr)->GetSpellProto()->GetSpellIconID() == 2632)
                                 {
                                     stamina_pct = (*itr)->GetModifier()->m_amount;
                                     break;
@@ -9700,7 +12257,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                             {
                                 // skip same icon
                                 if ((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT &&
-                                    (*itr)->GetSpellProto()->SpellIconID == 2633)
+                                    (*itr)->GetSpellProto()->GetSpellIconID() == 2633)
                                 {
                                     power_pct = (*itr)->GetModifier()->m_amount;
                                     break;
@@ -9725,7 +12282,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
             }
 
             // Improved Blood Presence
-            if (GetSpellProto()->SpellIconID == 2636 && m_isPassive)
+            if (GetSpellProto()->GetSpellIconID() == 2636 && m_isPassive)
             {
                 // if presence active: Frost Presence or Unholy Presence
                 if (apply && (m_target->HasAura(48263) || m_target->HasAura(48265)))
@@ -9743,7 +12300,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
             }
 
             // Improved Frost Presence
-            if (GetSpellProto()->SpellIconID == 2632 && m_isPassive)
+            if (GetSpellProto()->GetSpellIconID() == 2632 && m_isPassive)
             {
                 // if presence active: Unholy Presence or Blood Presence
                 if (apply && (m_target->HasAura(48265) || m_target->HasAura(48266)))
@@ -9762,7 +12319,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
             }
 
             // Improved Unholy Presence
-            if (GetSpellProto()->SpellIconID == 2633 && m_isPassive)
+            if (GetSpellProto()->GetSpellIconID() == 2633 && m_isPassive)
             {
                 // if presence active: Unholy Presence
                 if (apply && m_target->HasAura(48265))
@@ -9787,48 +12344,214 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
             break;
         }
         default:
-            return;
+            break;
     }
 
-    // prevent aura deletion, specially in multi-boost case
-    SetInUse(true);
+    // Old method override. need rewrite.
+    if (spellId1)
+        linkedSet.insert(spellId1);
+    if (spellId2)
+        linkedSet.insert(spellId2);
+    if (spellId3)
+        linkedSet.insert(spellId3);
+    if (spellId4)
+        linkedSet.insert(spellId4);
 
-    if (apply || cast_at_remove)
+    if (linkedSet.size() > 0)
     {
-        if (spellId1)
-            m_target->CastSpell(m_target, spellId1, true, NULL, NULL, GetCasterGuid());
-        if (spellId2 && !IsDeleted())
-            m_target->CastSpell(m_target, spellId2, true, NULL, NULL, GetCasterGuid());
-        if (spellId3 && !IsDeleted())
-            m_target->CastSpell(m_target, spellId3, true, NULL, NULL, GetCasterGuid());
-        if (spellId4 && !IsDeleted())
-            m_target->CastSpell(m_target, spellId4, true, NULL, NULL, GetCasterGuid());
+        // prevent aura deletion, specially in multi-boost case
+        for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+        {
+            (apply || cast_at_remove) ?
+                m_target->CastSpell(m_target, *itr, true, NULL, NULL, GetCasterGuid()) :
+                m_target->RemoveAurasByCasterSpell(*itr, GetCasterGuid());
+        }
     }
-    else
+}
+
+void SpellAuraHolder::HandleSpellSpecificBoostsForward(bool apply)
+{
+    // in fact, possible call of this method for not fully created holder...
+    if (!GetSpellProto())
+        return;
+
+    // if holder applyed in deleted case, need do nothing
+    if (apply && IsDeleted())
     {
-        if (spellId1)
-            m_target->RemoveAurasByCasterSpell(spellId1, GetCasterGuid());
-        if (spellId2)
-            m_target->RemoveAurasByCasterSpell(spellId2, GetCasterGuid());
-        if (spellId3)
-            m_target->RemoveAurasByCasterSpell(spellId3, GetCasterGuid());
-        if (spellId4)
-            m_target->RemoveAurasByCasterSpell(spellId4, GetCasterGuid());
+        sLog.outError("SpellAuraHolder::HandleSpellSpecificBoostsForward called `apply`  for deleted holder %u !", GetId());
+        return;
     }
 
-    SetInUse(false);
+    // Custom proc system (proc before apply or before fade)
+    Unit* pCaster = GetCaster();
+    if (!pCaster)
+        pCaster = m_target;
+
+    if (!pCaster)
+        return;
+
+    uint32 procFlag = apply ? PROC_FLAG_ON_AURA_APPLY : PROC_FLAG_ON_AURA_FADE;
+    uint32 procEx   = 0;
+    switch (m_removeMode)
+    {
+        case AURA_REMOVE_BY_EXPIRE:
+        case AURA_REMOVE_BY_DEFAULT:
+            procEx   |= PROC_EX_EXPIRE;
+            break;
+        case AURA_REMOVE_BY_SHIELD_BREAK:
+            procEx   |= PROC_EX_SHIELD_BREAK;
+            break;
+        case AURA_REMOVE_BY_DISPEL:
+            procEx   |= PROC_EX_DISPEL;
+            break;
+        default:
+            break;
+    };
+
+    pCaster->ProcDamageAndSpell(m_target, procFlag, PROC_FLAG_NONE, procEx, 0, GetWeaponAttackType(GetSpellProto()), GetSpellProto());
+
+    // Linked spells (boostforward chain)
+    SpellLinkedSet linkedSet = sSpellMgr.GetSpellLinked(GetId(), SPELL_LINKED_TYPE_BOOSTFORWARD);
+
+    // Custom cases
+    switch(GetSpellProto()->SpellFamilyName)
+    {
+        case SPELLFAMILY_GENERIC:
+        {
+            switch(GetId())
+            {
+                case 70337:                                 // Necrotic Plague (Lich King)
+                case 73912:
+                case 73913:
+                case 73914:
+                {
+                    if (!apply)
+                    {
+                        GetTarget()->CastSpell(GetTarget(), 70338, true);
+                        if (m_removeMode != AURA_REMOVE_BY_DISPEL)
+                            GetTarget()->CastSpell(GetTarget(), 70338, true);
+                    }
+                    break;
+                }
+                case 70338:                                 // Necrotic Plague (stacking) (Lich King)
+                case 73785:
+                case 73786:
+                case 73787:
+                {
+                    if (apply)
+                    {
+                        GetTarget()->CastSpell(GetTarget(), 74074, true); // Plague Siphon
+
+                        if (Unit *caster = GetCaster())
+                        {
+                            if (SpellAuraHolderPtr holder = caster->GetSpellAuraHolder(GetId()))
+                                SetStackAmount(holder->GetStackAmount());
+                        }
+                    }
+                    else if (m_removeMode != AURA_REMOVE_BY_DEFAULT)
+                    {
+                        if (m_removeMode == AURA_REMOVE_BY_DISPEL && m_stackAmount > 1)
+                            --m_stackAmount;
+                        else
+                            ++m_stackAmount;
+
+                        GetTarget()->CastSpell(GetTarget(), 70338, true);
+                    }
+                    break;
+                }
+            }
+            break;
+        }
+        case SPELLFAMILY_WARLOCK:
+        {
+            // Shadow embrace (healing reduction part)
+            if (m_spellProto->GetSpellFamilyFlags().test<CF_WARLOCK_MISC_DEBUFFS>() && m_spellProto->GetSpellIconID() == 2209)
+            {
+                switch(GetId())
+                {
+                    case 32386:
+                        linkedSet.insert(60448);
+                        break;
+                    case 32388:
+                        linkedSet.insert(60465);
+                        break;
+                    case 32389:
+                        linkedSet.insert(60466);
+                        break;
+                    case 32390:
+                        linkedSet.insert(60467);
+                        break;
+                    case 32391:
+                        linkedSet.insert(60468);
+                        break;
+                    default:
+                        break;
+                }
+                break;
+            }
+            // Improved Health Funnel (damage reducing part)
+            else if (m_spellProto->GetSpellFamilyFlags().test<CF_WARLOCK_HEALTH_FUNNEL>())
+            {
+                if (pCaster->HasAura(18703))
+                    linkedSet.insert(60955);
+                else if (pCaster->HasAura(18704))
+                    linkedSet.insert(60956);
+            }
+            break;
+        }
+        case SPELLFAMILY_HUNTER:
+        {
+            // Cobra strike
+            if (m_spellProto->Id == 53257)
+            {
+                if (m_target->GetObjectGuid().IsPet())
+                {
+                    if (!apply)
+                        if (Unit* owner = ((Pet*)m_target)->GetOwner())
+                            if (SpellAuraHolderPtr holder = owner->GetSpellAuraHolder(m_spellProto->Id))
+                                if (holder->ModStackAmount(-1))
+                                    owner->RemoveSpellAuraHolder(holder);
+                }
+                else if (apply)
+                {
+                    if (Pet* pet = m_target->GetPet())
+                        if (pet->isAlive())
+                            pet->CastSpell(pet,m_spellProto->Id,true);
+                }
+                return;
+            }
+            else
+                break;
+        }
+        default:
+            break;
+    }
+
+    if (linkedSet.size() > 0)
+    {
+        // prevent aura deletion, specially in multi-boost case
+        for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+        {
+            apply ?
+                m_target->CastSpell(m_target, *itr, true, NULL, NULL, GetCasterGuid()) :
+                m_target->RemoveAurasByCasterSpell(*itr, GetCasterGuid());
+        }
+    }
 }
 
 SpellAuraHolder::~SpellAuraHolder()
 {
-    // note: auras in delete list won't be affected since they clear themselves from holder when adding to deletedAuraslist
-    for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if (Aura *aur = m_auras[i])
-            delete aur;
+//    DEBUG_LOG("SpellAuraHolder:: destructor for SpellAuraHolder of spell %u called.", GetId());
 }
 
 void SpellAuraHolder::Update(uint32 diff)
 {
+    if (!m_spellProto)
+    {
+        DEBUG_LOG("SpellAuraHolder::Update attempt call Update on holder, but holder not have spellproto!");
+        return;
+    }
+
     if (m_duration > 0)
     {
         m_duration -= diff;
@@ -9841,7 +12564,7 @@ void SpellAuraHolder::Update(uint32 diff)
         {
             if (Unit* caster = GetCaster())
             {
-                Powers powertype = Powers(GetSpellProto()->powerType);
+                Powers powertype = Powers(GetSpellProto()->GetPowerType());
                 int32 manaPerSecond = GetSpellProto()->manaPerSecond + GetSpellProto()->manaPerSecondPerLevel * caster->getLevel();
                 m_timeCla = 1*IN_MILLISECONDS;
 
@@ -9857,16 +12580,20 @@ void SpellAuraHolder::Update(uint32 diff)
     }
 
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if (Aura *aura = m_auras[i])
+        if (Aura *aura = GetAuraByEffectIndex(SpellEffectIndex(i)))
             aura->UpdateAura(diff);
 
+    if (!m_target || !m_target->IsInWorld())
+        return;
+
     // Channeled aura required check distance from caster
-    if(IsChanneledSpell(m_spellProto) && GetCasterGuid() != m_target->GetObjectGuid())
+    if (IsChanneledSpell(m_spellProto) && GetCasterGuid() != m_target->GetObjectGuid())
     {
         Unit* caster = GetCaster();
         if(!caster)
         {
-            m_target->RemoveAurasByCasterSpell(GetId(), GetCasterGuid());
+            if (m_target)
+                m_target->RemoveAurasByCasterSpell(GetId(), GetCasterGuid());
             return;
         }
 
@@ -9874,10 +12601,10 @@ void SpellAuraHolder::Update(uint32 diff)
         if (caster->GetChannelObjectGuid() == m_target->GetObjectGuid())
         {
             // Get spell range
-            float max_range = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellProto->rangeIndex));
+            float max_range = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellProto->GetRangeIndex()));
 
             if(Player* modOwner = caster->GetSpellModOwner())
-                modOwner->ApplySpellMod(GetId(), SPELLMOD_RANGE, max_range, NULL);
+                modOwner->ApplySpellMod(GetId(), SPELLMOD_RANGE, max_range);
 
             if(!caster->IsWithinDistInMap(m_target, max_range))
             {
@@ -9901,7 +12628,7 @@ void SpellAuraHolder::SetAuraMaxDuration(int32 duration)
     // possible overwrite persistent state
     if (duration > 0)
     {
-        if (!(IsPassive() && GetSpellProto()->DurationIndex == 0))
+        if (!(IsPassive() && GetSpellProto()->GetDurationIndex() == 0))
             SetPermanent(false);
 
         SetAuraFlags(GetAuraFlags() | AFLAG_DURATION);
@@ -9916,7 +12643,7 @@ bool SpellAuraHolder::HasMechanic(uint32 mechanic) const
         return true;
 
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if (m_auras[i] && m_spellProto->EffectMechanic[i] == mechanic)
+        if (GetAura(SpellEffectIndex(i)) && m_spellProto->EffectMechanic[i] == mechanic)
             return true;
     return false;
 }
@@ -9927,7 +12654,7 @@ bool SpellAuraHolder::HasMechanicMask(uint32 mechanicMask) const
         return true;
 
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if (m_auras[i] && m_spellProto->EffectMechanic[i] && ((1 << (m_spellProto->EffectMechanic[i] -1)) & mechanicMask))
+        if (GetAura(SpellEffectIndex(i)) && m_spellProto->EffectMechanic[i] && ((1 << (m_spellProto->EffectMechanic[i] -1)) & mechanicMask))
             return true;
     return false;
 }
@@ -9935,7 +12662,7 @@ bool SpellAuraHolder::HasMechanicMask(uint32 mechanicMask) const
 bool SpellAuraHolder::IsPersistent() const
 {
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if (Aura *aur = m_auras[i])
+        if (Aura const* aur = GetAura(SpellEffectIndex(i)))
             if (aur->IsPersistent())
                 return true;
     return false;
@@ -9944,7 +12671,7 @@ bool SpellAuraHolder::IsPersistent() const
 bool SpellAuraHolder::IsAreaAura() const
 {
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if (Aura *aur = m_auras[i])
+        if (Aura const* aur = GetAura(SpellEffectIndex(i)))
             if (aur->IsAreaAura())
                 return true;
     return false;
@@ -9952,8 +12679,14 @@ bool SpellAuraHolder::IsAreaAura() const
 
 bool SpellAuraHolder::IsPositive() const
 {
+    if (GetAuraFlags() & AFLAG_POSITIVE)
+        return true;
+    else if (GetAuraFlags() & AFLAG_NEGATIVE)
+        return false;
+
+    // check, if no aura flags defined
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if (Aura *aur = m_auras[i])
+        if (Aura const* aur = GetAura(SpellEffectIndex(i)))
             if (!aur->IsPositive())
                 return false;
     return true;
@@ -9962,18 +12695,258 @@ bool SpellAuraHolder::IsPositive() const
 bool SpellAuraHolder::IsEmptyHolder() const
 {
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if (m_auras[i])
+        if (m_auraFlags & (1 << i))
             return false;
     return true;
 }
 
-void SpellAuraHolder::UnregisterSingleCastHolder()
+void SpellAuraHolder::UnregisterAndCleanupTrackedAuras()
 {
-    if (IsSingleTarget())
+    TrackedAuraType trackedType = GetTrackedAuraType();
+    if (!trackedType)
+        return;
+
+    if (trackedType == TRACK_AURA_TYPE_SINGLE_TARGET)
+    {
+        if (Unit* caster = GetCaster())
+            caster->GetTrackedAuraTargets(trackedType).erase(GetSpellProto());
+    }
+    else if (trackedType == TRACK_AURA_TYPE_CONTROL_VEHICLE)
     {
-        if(Unit* caster = GetCaster())
-            caster->GetSingleCastSpellTargets().erase(GetSpellProto());
+        Unit* caster = GetCaster();
+        if (caster && IsSpellHaveAura(GetSpellProto(), SPELL_AURA_CONTROL_VEHICLE, GetAuraFlags()))
+        {
+            caster->GetTrackedAuraTargets(trackedType).erase(GetSpellProto());
+            caster->RemoveAurasDueToSpell(GetSpellProto()->Id);
+        }
+        else if (caster)
+        {
+            Unit::TrackedAuraTargetMap scTarget = caster->GetTrackedAuraTargets(trackedType);
+            Unit::TrackedAuraTargetMap::iterator find = scTarget.find(GetSpellProto());
+            if (find != scTarget.end())
+            {
+                ObjectGuid vehicleGuid = find->second;
+                scTarget.erase(find);
+                if (Unit* vehicle = caster->GetMap()->GetUnit(vehicleGuid))
+                    vehicle->RemoveAurasDueToSpell(GetSpellProto()->Id, SpellAuraHolderPtr(), AURA_REMOVE_BY_DEFAULT);
+            }
+        }
+    }
 
-        m_isSingleTarget = false;
+    m_trackedAuraType = TRACK_AURA_TYPE_NOT_TRACKED;
+}
+
+void SpellAuraHolder::SetVisibleAura(bool remove)
+{
+    SpellAuraHolderPtr currentHolder = SpellAuraHolderPtr();
+    if (!remove)
+    {
+        for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+        {
+            if (Aura const* aura = GetAura(SpellEffectIndex(i)))
+            {
+                currentHolder = aura->GetHolder();
+                break;
+            }
+        }
+        //MANGOS_ASSERT(currentHolder);
+    }
+    m_target->SetVisibleAura(m_auraSlot, currentHolder);
+}
+
+void Aura::HandleAuraModReflectSpells(bool Apply, bool Real)
+{
+    if (!Real)
+        return;
+
+    //Unit* target = GetTarget();
+    Unit* caster = GetCaster();
+
+    if (Apply)
+    {
+        switch(GetId() )
+        {
+            // Improved Spell Reflection
+            case 23920:
+            {
+                if (!caster)
+                    return;
+
+                Unit::AuraList const& lDummyAuras = caster->GetAurasByType(SPELL_AURA_DUMMY);
+                for(Unit::AuraList::const_iterator i = lDummyAuras.begin(); i != lDummyAuras.end(); ++i)
+                {
+                    if((*i)->GetSpellProto()->GetSpellIconID() == 1935)
+                    {
+                        caster->CastSpell(caster, 59725, true);
+                        break;
+                    }
+                }
+                break;
+            }
+            default:
+                break;
+        }
+    }
+}
+
+void Aura::HandleAuraSetVehicle(bool apply, bool real)
+{
+    if (!real)
+        return;
+
+    Unit* target = GetTarget();
+
+    if (!target || !target->IsInWorld())
+        return;
+
+    uint32 vehicleId = GetMiscValue();
+
+    target->SetVehicleId(apply ? vehicleId : 0);
+
+}
+
+void Aura::HandleAuraFactionChange(bool apply, bool real)
+{
+    if (!real)
+        return;
+
+    Unit* target = GetTarget();
+
+    if (!target || !target->IsInWorld())
+        return;
+
+    uint32 newFaction = apply ? GetMiscValue() : target->GetOriginalFaction();
+
+    if (newFaction && newFaction != target->getFaction())
+        target->setFaction(newFaction);
+
+}
+
+// FIXME: this is only temp. fix for not allowing charmed player to deal damage/heal
+void Aura::HandleAuraAoECharm(bool apply, bool real)
+{
+    if (!real)
+        return;
+
+    Unit *pTarget = GetTarget();
+
+    if (!pTarget || !pTarget->IsInWorld() || pTarget->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    Player *pPlayerTarget = (Player*)pTarget;
+
+    switch(GetId())
+    {
+        case 70923:                                     // Uncontrollable Frenzy (Queen Lana'thel)
+        {
+            if (apply)
+                pPlayerTarget->setFaction(16);
+            else
+                pPlayerTarget->setFactionForRace(pPlayerTarget->getRace());
+
+            break;
+        }
+        default:
+        {
+            if (apply)
+            {
+                Unit *pCaster = GetCaster();
+
+                if (pCaster && pCaster != pTarget)
+                    pPlayerTarget->setFaction(pCaster->getFaction());
+                else
+                    pPlayerTarget->setFaction(16);
+            }
+            else
+                pPlayerTarget->setFactionForRace(pPlayerTarget->getRace());
+
+            break;
+        }
+    }
+}
+
+uint32 Aura::CalculateCrowdControlBreakDamage()
+{
+    if (!GetTarget())
+        return 0;
+
+    if (!IsCrowdControlAura(m_modifier.m_auraname))
+        return 0;
+
+    // auras with this attribute not have damage cap
+    if (GetSpellProto()->HasAttribute(SPELL_ATTR_EX_BREAKABLE_BY_ANY_DAMAGE) &&
+        ((GetSpellProto()->AuraInterruptFlags & AURA_INTERRUPT_FLAG_DIRECT_DAMAGE) ||
+        (GetSpellProto()->HasAttribute(SPELL_ATTR_BREAKABLE_BY_DAMAGE) && !GetSpellProto()->HasAttribute(SPELL_ATTR_STOP_ATTACK_TARGET))))
+        return 0;
+
+    // Damage cap for CC effects
+    uint32 damageCap = (int32)((float)GetTarget()->GetMaxHealth() * sWorld.getConfig(CONFIG_FLOAT_CROWDCONTROL_HP_BASE));
+
+    if (damageCap < 50)
+        damageCap = 50;
+
+    Unit* caster = GetCaster();
+
+    if (!caster)
+        return damageCap;
+
+    MAPLOCK_READ(caster,MAP_LOCK_TYPE_AURAS);
+
+    // Glyphs increasing damage cap
+    Unit::AuraList const& overrideClassScripts = caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
+    for (Unit::AuraList::const_iterator itr = overrideClassScripts.begin(); itr != overrideClassScripts.end(); ++itr)
+    {
+        if((*itr)->isAffectedOnSpell(GetSpellProto()))
+        {
+            // Glyph of Fear, Glyph of Frost nova and similar auras
+            if ((*itr)->GetMiscValue() == 7801)
+            {
+                damageCap += (int32)(damageCap * (*itr)->GetModifier()->m_amount / 100.0f);
+                break;
+            }
+        }
+    }
+    return damageCap;
+}
+
+bool Aura::IsAffectedByCrowdControlEffect(uint32 damage)
+{
+    if (!IsCrowdControlAura(m_modifier.m_auraname))
+        return false;
+
+    if (int32(damage) > abs(m_modifier.m_baseamount))
+    {
+        m_modifier.m_baseamount = 0;
+        return false;
+    }
+
+    m_modifier.m_baseamount -= damage;
+    return true;
+}
+
+void Aura::HandleInitializeImages(bool apply, bool real)
+{
+    if (!real)
+        return;
+
+    Unit* caster = GetCaster();
+    Unit* target = GetTarget();
+
+    if (!caster || !target || !target->IsInWorld() || target->GetTypeId() != TYPEID_UNIT)
+        return;
+
+    if (apply)
+    {
+        target->SetName(caster->GetName());
+    }
+    else
+    {
+        CreatureInfo const* cinfo = ((Creature*)target)->GetCreatureInfo();
+        if (!cinfo)
+        {
+            sLog.outErrorDb("Aura::HandleInitializeImages try set name to unknown creature %s", target->GetObjectGuid().GetString().c_str());
+            return;
+        }
+        target->SetName(cinfo->Name);
     }
 }
diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h
index 1b946006401..fe60259e654 100644
--- a/src/game/SpellAuras.h
+++ b/src/game/SpellAuras.h
@@ -20,23 +20,51 @@
 
 #include "SpellAuraDefines.h"
 #include "DBCEnums.h"
+#include "DBCStores.h"
 #include "ObjectGuid.h"
+#include "ObjectHandler.h"
+
+enum AuraRemoveMode
+{
+    AURA_REMOVE_BY_DEFAULT,
+    AURA_REMOVE_BY_STACK,                                   // at replace by similar aura
+    AURA_REMOVE_BY_CANCEL,
+    AURA_REMOVE_BY_DISPEL,
+    AURA_REMOVE_BY_DEATH,
+    AURA_REMOVE_BY_DELETE,                                  // use for speedup and prevent unexpected effects at player logout/pet unsummon (must be used _only_ after save), delete.
+    AURA_REMOVE_BY_SHIELD_BREAK,                            // when absorb shield is removed by damage, heal absorb debuf
+    AURA_REMOVE_BY_EXPIRE,                                  // at duration end
+    AURA_REMOVE_BY_TRACKING,                                // aura is removed because of a conflicting tracked aura
+
+};
+
+enum AuraClassType
+{
+    AURA_CLASS_AURA,
+    AURA_CLASS_SINGLE_ENEMY_AURA,
+    AURA_CLASS_AREA_AURA,
+    AURA_CLASS_PERSISTENT_AREA_AURA,
+};
 
 struct Modifier
 {
     AuraType m_auraname;
-    int32 m_amount;
-    int32 m_miscvalue;
-    uint32 periodictime;
+    mutable int32    m_amount;
+    int32    m_miscvalue;
+    uint32   periodictime;
+    int32    m_baseamount;
 };
 
 class Unit;
 struct SpellEntry;
 struct ProcTriggerSpell;
+struct DamageInfo;
 
 // forward decl
 class Aura;
 
+typedef std::map<SpellEffectIndex,Aura> AuraStorage;
+
 // internal helper
 struct ReapplyAffectedPassiveAurasHelper;
 
@@ -44,9 +72,10 @@ class MANGOS_DLL_SPEC SpellAuraHolder
 {
     public:
         SpellAuraHolder (SpellEntry const* spellproto, Unit *target, WorldObject *caster, Item *castItem);
-        Aura* m_auras[MAX_EFFECT_INDEX];
 
-        void AddAura(Aura *aura, SpellEffectIndex index);
+        Aura* CreateAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolderPtr holder, Unit *target, Unit *caster = NULL, Item* castItem = NULL);
+        Aura* CreateAura(AuraClassType type, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolderPtr holder, Unit *target, Unit *caster = NULL, Item* castItem = NULL);
+
         void RemoveAura(SpellEffectIndex index);
         void ApplyAuraModifiers(bool apply, bool real = false);
         void _AddSpellAuraHolder();
@@ -54,6 +83,7 @@ class MANGOS_DLL_SPEC SpellAuraHolder
         void BuildUpdatePacket(WorldPacket& data) const;
         void SendAuraUpdate(bool remove) const;
         void HandleSpellSpecificBoosts(bool apply);
+        void HandleSpellSpecificBoostsForward(bool apply);
         void CleanupTriggeredSpells();
 
         void setDiminishGroup(DiminishingGroup group) { m_AuraDRGroup = group; }
@@ -63,7 +93,8 @@ class MANGOS_DLL_SPEC SpellAuraHolder
         void SetStackAmount(uint32 stackAmount);
         bool ModStackAmount(int32 num); // return true if last charge dropped
 
-        Aura* GetAuraByEffectIndex(SpellEffectIndex index) const { return m_auras[index]; }
+        Aura* GetAuraByEffectIndex(SpellEffectIndex index);
+        Aura const* GetAura(SpellEffectIndex index) const;
 
         uint32 GetId() const { return m_spellProto->Id; }
         SpellEntry const* GetSpellProto() const { return m_spellProto; }
@@ -75,6 +106,10 @@ class MANGOS_DLL_SPEC SpellAuraHolder
         Unit* GetTarget() const { return m_target; }
         void SetTarget(Unit* target) { m_target = target; }
 
+        ObjectGuid const& GetAffectiveCasterGuid() const { return m_originalCasterGuid ? m_originalCasterGuid : m_casterGuid; }
+        Unit* GetAffectiveCaster() const;
+        void SetAffectiveCasterGuid(ObjectGuid guid);
+
         bool IsPermanent() const { return m_permanent; }
         void SetPermanent(bool permanent) { m_permanent = permanent; }
         bool IsPassive() const { return m_isPassive; }
@@ -82,33 +117,21 @@ class MANGOS_DLL_SPEC SpellAuraHolder
         bool IsPersistent() const;
         bool IsPositive() const;
         bool IsAreaAura() const;                            // if one from auras of holder applied as area aura
-        bool IsWeaponBuffCoexistableWith(SpellAuraHolder const* ref) const;
+        bool IsWeaponBuffCoexistableWith() const;
         bool IsNeedVisibleSlot(Unit const* caster) const;
         bool IsRemovedOnShapeLost() const { return m_isRemovedOnShapeLost; }
-        bool IsInUse() const { return m_in_use;}
         bool IsDeleted() const { return m_deleted;}
         bool IsEmptyHolder() const;
 
         void SetDeleted() { m_deleted = true; }
 
-        void SetInUse(bool state)
-        {
-            if(state)
-                ++m_in_use;
-            else
-            {
-                if(m_in_use)
-                    --m_in_use;
-            }
-        }
-
-        void UpdateHolder(uint32 diff) { SetInUse(true); Update(diff); SetInUse(false); }
+        void UpdateHolder(uint32 diff) { Update(diff); }
         void Update(uint32 diff);
         void RefreshHolder();
 
-        bool IsSingleTarget() const { return m_isSingleTarget; }
-        void SetIsSingleTarget(bool val) { m_isSingleTarget = val; }
-        void UnregisterSingleCastHolder();
+        TrackedAuraType GetTrackedAuraType() const { return m_trackedAuraType; }
+        void SetTrackedAuraType(TrackedAuraType val) { m_trackedAuraType = val; }
+        void UnregisterAndCleanupTrackedAuras();
 
         int32 GetAuraMaxDuration() const { return m_maxDuration; }
         void SetAuraMaxDuration(int32 duration);
@@ -143,7 +166,7 @@ class MANGOS_DLL_SPEC SpellAuraHolder
 
         time_t GetAuraApplyTime() const { return m_applyTime; }
 
-        void SetVisibleAura(bool remove) { m_target->SetVisibleAura(m_auraSlot, remove ? 0 : GetId()); }
+        void SetVisibleAura(bool remove);
         void SetRemoveMode(AuraRemoveMode mode) { m_removeMode = mode; }
         void SetLoadedState(ObjectGuid const& casterGUID, ObjectGuid const& itemGUID, uint32 stackAmount, uint32 charges, int32 maxduration, int32 duration)
         {
@@ -158,15 +181,20 @@ class MANGOS_DLL_SPEC SpellAuraHolder
         bool HasMechanic(uint32 mechanic) const;
         bool HasMechanicMask(uint32 mechanicMask) const;
 
+        void CleanupsBeforeDelete();
         ~SpellAuraHolder();
+
     private:
+        void AddAura(Aura const& aura, SpellEffectIndex index);
+
+        SpellEntry const* m_spellProto;
+
         Unit* m_target;
         ObjectGuid m_casterGuid;
         ObjectGuid m_castItemGuid;                          // it is NOT safe to keep a pointer to the item because it may get deleted
+        ObjectGuid m_originalCasterGuid;                    // real source of auras cast, used for set cast source in  area auras with "exclusive target"
         time_t m_applyTime;
 
-        SpellEntry const* m_spellProto;
-
         uint8 m_auraSlot;                                   // Aura slot on unit (for show in client)
         uint8 m_auraFlags;                                  // Aura info flag (for send data to client)
         uint8 m_auraLevel;                                  // Aura level (store caster level for correct show level dep amount)
@@ -178,6 +206,9 @@ class MANGOS_DLL_SPEC SpellAuraHolder
 
         AuraRemoveMode m_removeMode:8;                      // Store info for know remove aura reason
         DiminishingGroup m_AuraDRGroup:8;                   // Diminishing
+        TrackedAuraType m_trackedAuraType: 8;               // store if the caster tracks the aura - can change at spell steal for example
+
+        AuraStorage       m_aurasStorage;                   // Auras storage
 
         bool m_permanent:1;
         bool m_isPassive:1;
@@ -186,27 +217,26 @@ class MANGOS_DLL_SPEC SpellAuraHolder
         bool m_isSingleTarget:1;                            // true if it's a single target spell and registered at caster - can change at spell steal for example
         bool m_deleted:1;
 
-        uint32 m_in_use;                                    // > 0 while in SpellAuraHolder::ApplyModifiers call/SpellAuraHolder::Update/etc
 };
 
 typedef void(Aura::*pAuraHandler)(bool Apply, bool Real);
 // Real == true at aura add/remove
 // Real == false at aura mod unapply/reapply; when adding/removing dependent aura/item/stat mods
 //
-// Code in aura handler can be guarded by if(Real) check if it should execution only at real add/remove of aura
+// Code in aura handler can be guarded by if (Real) check if it should execution only at real add/remove of aura
 //
-// MAIN RULE: Code MUST NOT be guarded by if(Real) check if it modifies any stats
+// MAIN RULE: Code MUST NOT be guarded by if (Real) check if it modifies any stats
 //      (percent auras, stats mods, etc)
-// Second rule: Code must be guarded by if(Real) check if it modifies object state (start/stop attack, send packets to client, etc)
+// Second rule: Code must be guarded by if (Real) check if it modifies object state (start/stop attack, send packets to client, etc)
 //
-// Other case choice: each code line moved under if(Real) check is mangos speedup,
-//      each setting object update field code line moved under if(Real) check is significant mangos speedup, and less server->client data sends
-//      each packet sending code moved under if(Real) check is _large_ mangos speedup, and lot less server->client data sends
+// Other case choice: each code line moved under if (Real) check is mangos speedup,
+//      each setting object update field code line moved under if (Real) check is significant mangos speedup, and less server->client data sends
+//      each packet sending code moved under if (Real) check is _large_ mangos speedup, and lot less server->client data sends
 
 class MANGOS_DLL_SPEC Aura
 {
+    friend class SpellAuraHolder;
     friend struct ReapplyAffectedPassiveAurasHelper;
-    friend Aura* CreateAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target, Unit *caster, Item* castItem);
 
     public:
         //aura handlers
@@ -267,6 +297,7 @@ class MANGOS_DLL_SPEC Aura
         void HandleAuraModResistance(bool Apply, bool Real);
         void HandleAuraModRoot(bool Apply, bool Real);
         void HandleAuraModSilence(bool Apply, bool Real);
+        void HandleAuraModReflectSpells(bool Apply, bool Real);
         void HandleAuraModStat(bool Apply, bool Real);
         void HandleDetectAmore(bool Apply, bool Real);
         void HandleAuraFakeInebriation(bool Apply, bool Real);
@@ -343,6 +374,7 @@ class MANGOS_DLL_SPEC Aura
         void HandleAuraModAttackPowerOfStatPercent(bool apply, bool Real);
         void HandleAuraModAttackPowerOfArmor(bool apply, bool Real);
         void HandleSpiritOfRedemption(bool apply, bool Real);
+        void HandleAuraAoECharm(bool apply, bool Real);
         void HandleModManaRegen(bool apply, bool Real);
         void HandleComprehendLanguage(bool apply, bool Real);
         void HandleShieldBlockValue(bool apply, bool Real);
@@ -371,71 +403,83 @@ class MANGOS_DLL_SPEC Aura
         void HandlePhase(bool Apply, bool Real);
         void HandleModTargetArmorPct(bool Apply, bool Real);
         void HandleAuraModAllCritChance(bool Apply, bool Real);
+        void HandleAuraLinked(bool Apply, bool Real);
         void HandleAuraOpenStable(bool apply, bool Real);
         void HandleAuraAddMechanicAbilities(bool apply, bool Real);
+        void HandleAuraSetVehicle(bool apply, bool Real);
+        void HandleAuraFactionChange(bool apply, bool real);
         void HandleAuraStopNaturalManaRegen(bool apply, bool Real);
+        void HandleInitializeImages(bool apply, bool Real);
 
         virtual ~Aura();
 
         void SetModifier(AuraType t, int32 a, uint32 pt, int32 miscValue);
         Modifier*       GetModifier()       { return &m_modifier; }
         Modifier const* GetModifier() const { return &m_modifier; }
-        int32 GetMiscValue() const { return m_spellAuraHolder->GetSpellProto()->EffectMiscValue[m_effIndex]; }
-        int32 GetMiscBValue() const { return m_spellAuraHolder->GetSpellProto()->EffectMiscValueB[m_effIndex]; }
+        int32 GetMiscValue() const { return GetHolder() ? GetHolder()->GetSpellProto()->GetEffectMiscValue(m_effIndex) : 0; }
+        int32 GetMiscValueB() const { return GetHolder() ? GetHolder()->GetSpellProto()->GetEffectMiscValueB(m_effIndex) : 0; }
+
+        SpellEntry const* GetSpellProto() const { return ( GetHolder() ? GetHolder()->GetSpellProto() : NULL); }
+        uint32 GetId() const { if (SpellEntry const* spellProto = GetSpellProto()) return spellProto->Id; else return 0; }
+        ObjectGuid const& GetCastItemGuid() const;
+        ObjectGuid const& GetCasterGuid() const;
+        Unit* GetCaster() const { return ( GetHolder() ? GetHolder()->GetCaster() : NULL); }
+        Unit* GetTarget() const { return ( GetHolder() ? GetHolder()->GetTarget() : NULL); }
 
-        SpellEntry const* GetSpellProto() const { return GetHolder()->GetSpellProto(); }
-        uint32 GetId() const{ return GetHolder()->GetSpellProto()->Id; }
-        ObjectGuid const& GetCastItemGuid() const { return GetHolder()->GetCastItemGuid(); }
-        ObjectGuid const& GetCasterGuid() const { return GetHolder()->GetCasterGuid(); }
-        Unit* GetCaster() const { return GetHolder()->GetCaster(); }
-        Unit* GetTarget() const { return GetHolder()->GetTarget(); }
+        ObjectGuid const& GetAffectiveCasterGuid() const;
+        Unit* GetAffectiveCaster() const { return ( GetHolder() ? GetHolder()->GetAffectiveCaster() : NULL); }
 
-        SpellEffectIndex GetEffIndex() const{ return m_effIndex; }
+        SpellEffectIndex GetEffIndex() const { return m_effIndex; }
         int32 GetBasePoints() const { return m_currentBasePoints; }
 
-        int32 GetAuraMaxDuration() const { return GetHolder()->GetAuraMaxDuration(); }
-        int32 GetAuraDuration() const { return GetHolder()->GetAuraDuration(); }
+        int32 GetAuraMaxDuration() const { return GetHolder() ? GetHolder()->GetAuraMaxDuration() : 0; }
+        int32 GetAuraDuration() const { return GetHolder() ? GetHolder()->GetAuraDuration() : 0; }
         time_t GetAuraApplyTime() const { return m_applyTime; }
         uint32 GetAuraTicks() const { return m_periodicTick; }
         uint32 GetAuraMaxTicks() const
         {
             int32 maxDuration = GetAuraMaxDuration();
-            return maxDuration > 0 && m_modifier.periodictime > 0 ? maxDuration / m_modifier.periodictime : 0;
+            return (maxDuration > 0 && m_modifier.periodictime > 0) ? maxDuration / m_modifier.periodictime : 0;
         }
-        uint32 GetStackAmount() const { return GetHolder()->GetStackAmount(); }
 
+        void SetAuraPeriodicTimer(int32 timer) { m_modifier.periodictime = timer;}
+
+        uint32 GetStackAmount() const { return GetHolder() ? GetHolder()->GetStackAmount() : 0; }
         void SetLoadedState(int32 damage, uint32 periodicTime)
         {
             m_modifier.m_amount = damage;
             m_modifier.periodictime = periodicTime;
 
-            if(uint32 maxticks = GetAuraMaxTicks())
+            if (uint32 maxticks = GetAuraMaxTicks())
                 m_periodicTick = maxticks - GetAuraDuration() / m_modifier.periodictime;
         }
 
-        bool IsPositive() { return m_positive; }
+        bool IsPositive() const { return m_positive; }
         bool IsPersistent() const { return m_isPersistent; }
         bool IsAreaAura() const { return m_isAreaAura; }
         bool IsPeriodic() const { return m_isPeriodic; }
-        bool IsInUse() const { return m_in_use; }
+        bool IsStacking() const { return m_stacking;}
 
-        void SetInUse(bool state)
-        {
-            if(state)
-                ++m_in_use;
-            else
-            {
-                if(m_in_use)
-                    --m_in_use;
-            }
-        }
         void ApplyModifier(bool apply, bool Real = false);
 
-        void UpdateAura(uint32 diff) { SetInUse(true); Update(diff); SetInUse(false); }
+        void UpdateAura(uint32 diff);
+
+        void ChangeAmount(int32 amount, bool update = true)
+        {
+            m_modifier.m_amount = amount;
+            if (update)
+                GetHolder()->SendAuraUpdate(false);
+        }
 
         void SetRemoveMode(AuraRemoveMode mode) { m_removeMode = mode; }
 
-        virtual Unit* GetTriggerTarget() const { return m_spellAuraHolder->GetTarget(); }
+        bool IsDeleted() const { return m_deleted;}
+        void SetDeleted()      { m_deleted = true;}
+
+        Unit* GetTriggerTarget() const;
+
+        uint32 CalculateCrowdControlBreakDamage();
+        bool   IsAffectedByCrowdControlEffect(uint32 damage);
 
         // add/remove SPELL_AURA_MOD_SHAPESHIFT (36) linked auras
         void HandleShapeshiftBoosts(bool apply);
@@ -443,28 +487,37 @@ class MANGOS_DLL_SPEC Aura
         void TriggerSpell();
         void TriggerSpellWithValue();
 
-        ClassFamilyMask const& GetAuraSpellClassMask() const { return  m_spellAuraHolder->GetSpellProto()->GetEffectSpellClassMask(m_effIndex); }
+        ClassFamilyMask const& GetAuraSpellClassMask() const;
         bool isAffectedOnSpell(SpellEntry const *spell) const;
         bool CanProcFrom(SpellEntry const *spell, uint32 procFlag, uint32 EventProcEx, uint32 procEx, bool active, bool useClassMask) const;
 
-        //SpellAuraHolder const* GetHolder() const { return m_spellHolder; }
-        SpellAuraHolder* GetHolder() { return m_spellAuraHolder; }
-        SpellAuraHolder* const GetHolder() const { return m_spellAuraHolder; }
+        SpellAuraHolderPtr GetHolder() { return m_spellAuraHolder; }
+        SpellAuraHolderPtr GetHolder() const { return m_spellAuraHolder; }
+        AuraClassType const GetAuraClassType() const { return m_classType; }
 
         bool IsLastAuraOnHolder();
 
         bool HasMechanic(uint32 mechanic) const;
+
+        bool IsActive() const { return m_isActive; }
+
     protected:
-        Aura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target, Unit *caster = NULL, Item* castItem = NULL);
+        Aura(AuraClassType type,SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolderPtr holder, Unit *target, Unit *caster = NULL, Item* castItem = NULL);
+        void AreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolderPtr holder, Unit *target, Unit *caster = NULL, Item* castItem = NULL);
+        void PersistentAreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolderPtr holder, Unit *target, Unit *caster = NULL, Item* castItem = NULL);
+        void SingleEnemyTargetAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolderPtr holder, Unit *target, Unit *caster = NULL, Item* castItem = NULL);
 
         // must be called only from Aura::UpdateAura
-        virtual void Update(uint32 diff);
+        void Update(uint32 diff);
+        void AreaAuraUpdate(uint32 diff);
+        void PersistentAreaAuraUpdate(uint32 diff);
 
         // must be called only from Aura*::Update
         void PeriodicTick();
         void PeriodicDummyTick();
+        void PeriodicCheck();
 
-        bool IsCritFromAbilityAura(Unit* caster, uint32& damage);
+        bool IsCritFromAbilityAura(Unit* caster, DamageInfo* damage);
         void ReapplyAffectedPassiveAuras();
 
         Modifier m_modifier;
@@ -479,52 +532,76 @@ class MANGOS_DLL_SPEC Aura
 
         SpellEffectIndex m_effIndex :8;                     // Aura effect index in spell
 
+        bool m_deleted:1;
         bool m_positive:1;
         bool m_isPeriodic:1;
         bool m_isAreaAura:1;
         bool m_isPersistent:1;
+        bool m_stacking:1;                                  // Aura is not overwritten, but effects are not cumulative with similar effects
+        bool m_isActive:1;                                  // Aura activated/not activated (temporary disabled)
 
-        uint32 m_in_use;                                    // > 0 while in Aura::ApplyModifier call/Aura::Update/etc
+        bool IsEffectStacking();
 
-        SpellAuraHolder* const m_spellAuraHolder;
-    private:
-        void ReapplyAffectedPassiveAuras(Unit* target, bool owner_mode);
-};
+        SpellAuraHolderPtr const m_spellAuraHolder;
+        AuraClassType const m_classType;
+
+        ObjectGuid m_castersTargetGuid;
 
-class MANGOS_DLL_SPEC AreaAura : public Aura
-{
-    public:
-        AreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target, Unit *caster = NULL, Item* castItem = NULL);
-        ~AreaAura();
-    protected:
-        void Update(uint32 diff);
     private:
+        void ReapplyAffectedPassiveAuras(Unit* target, bool owner_mode);
         float m_radius;
         AreaAuraType m_areaAuraType;
 };
 
-class MANGOS_DLL_SPEC PersistentAreaAura : public Aura
+MANGOS_DLL_SPEC SpellAuraHolderPtr CreateSpellAuraHolder(SpellEntry const* spellproto, Unit *target, WorldObject *caster, Item *castItem = NULL);
+
+class MANGOS_DLL_SPEC AuraPair
 {
     public:
-        PersistentAreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target, Unit *caster = NULL, Item* castItem = NULL);
-        ~PersistentAreaAura();
-    protected:
-        void Update(uint32 diff);
-};
+        AuraPair() : m_holder(SpellAuraHolderPtr()), m_index(MAX_EFFECT_INDEX) {};
+        AuraPair(SpellAuraHolderPtr holder, SpellEffectIndex idx) : m_holder(holder), m_index(idx) {};
+        AuraPair(Aura const* aura) : m_holder(aura->GetHolder()), m_index(aura->GetEffIndex()) {};
 
-class MANGOS_DLL_SPEC SingleEnemyTargetAura : public Aura
-{
-    friend Aura* CreateAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target, Unit *caster, Item* castItem);
+        AuraPair& operator= (AuraPair const& pair)
+        {
+            m_holder = pair.m_holder;
+            m_index  = pair.m_index;
+            return *this;
+        }
 
-    public:
-        ~SingleEnemyTargetAura();
-        Unit* GetTriggerTarget() const;
+        Aura* operator () () { return m_holder->GetAuraByEffectIndex(m_index); };
+        Aura const* operator () () const { return m_holder->GetAura(m_index); };
 
-    protected:
-        SingleEnemyTargetAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target, Unit *caster  = NULL, Item* castItem = NULL);
-        ObjectGuid m_castersTargetGuid;
+        Aura* operator -> () { return m_holder->GetAuraByEffectIndex(m_index); };
+        Aura const* operator -> () const { return m_holder->GetAura(m_index); };
+
+        Aura operator * () { return *m_holder->GetAuraByEffectIndex(m_index); };
+        Aura const operator * () const { return *m_holder->GetAura(m_index); };
+
+        bool operator == (AuraPair const& pair) const { return (m_index == pair.m_index && m_holder == pair.m_holder); };
+        bool operator == (Aura const* aura)     const { return IsEmpty() ? (aura == NULL) : (aura == GetHolder()->GetAura(m_index)); };
+        bool operator !  ()                     const { return IsEmpty(); };
+        bool operator != (Aura const* aura)     const { return IsEmpty() ? (aura != NULL) : (aura != GetHolder()->GetAura(m_index)); };
+
+        SpellAuraHolderPtr GetHolder()         { return m_holder; };
+        SpellAuraHolderPtr GetHolder()   const { return m_holder; };
+        SpellEffectIndex   GetEffIndex() const { return m_index; };
+
+        bool IsEmpty(bool withDeleted = true) const
+        {
+            return
+                !m_holder ||
+                !m_holder->GetAura(m_index) ||
+                (m_index == MAX_EFFECT_INDEX) ||
+                m_holder->IsEmptyHolder() ||
+                (withDeleted && m_holder->IsDeleted())
+                ;
+        }
+
+    private:
+        SpellAuraHolderPtr m_holder;
+        SpellEffectIndex   m_index;
 };
 
-Aura* CreateAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBasePoints, SpellAuraHolder *holder, Unit *target, Unit *caster = NULL, Item* castItem = NULL);
-SpellAuraHolder* CreateSpellAuraHolder(SpellEntry const* spellproto, Unit *target, WorldObject *caster, Item *castItem = NULL);
+
 #endif
diff --git a/src/game/SpellClassMask.h b/src/game/SpellClassMask.h
new file mode 100644
index 00000000000..e21633b893b
--- /dev/null
+++ b/src/game/SpellClassMask.h
@@ -0,0 +1,865 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOS_SPELL_CLASS_MASK_H
+#define MANGOS_SPELL_CLASS_MASK_H
+
+#include "Platform/Define.h"
+
+enum ClassFlag
+{
+    // -- Generic (0)
+    CF_GENERIC_UNK0                         = 0,    // CM0 00000001
+    CF_GENERIC_TOTEM_CALL_EFF               = 1,    // CM0 00000002 + 1 test spell
+    CF_GENERIC_UNK2                         = 2,    // CM0 00000004
+    CF_GENERIC_UNK3                         = 3,    // CM0 00000008
+    CF_GENERIC_HOLY_ENERGY_EFF              = 4,    // CM0 00000010 
+    CF_GENERIC_UNK5                         = 5,    // CM0 00000020
+    CF_GENERIC_PVP_FLAGS                    = 6,    // CM0 00000040
+    CF_GENERIC_UNK7                         = 7,    // CM0 00000080
+    CF_GENERIC_UNK8                         = 8,    // CM0 00000100
+    CF_GENERIC_UNK9                         = 9,    // CM0 00000200
+    CF_GENERIC_UNK10                        = 10,   // CM0 00000400
+    CF_GENERIC_CURSE_IMMUNITY_EFF           = 11,   // CM0 00000800
+    CF_GENERIC_CONSUMPTION_EFF              = 12,   // CM0 00001000 + combustion
+    CF_GENERIC_UNK13                        = 13,   // CM0 00002000
+    CF_GENERIC_UNK14                        = 14,   // CM0 00004000
+    CF_GENERIC_UNK15                        = 15,   // CM0 00008000
+    CF_GENERIC_GLYPH0_EFF                   = 16,   // CM0 00010000 some glyph's
+    CF_GENERIC_UNK17                        = 17,   // CM0 00020000
+    CF_GENERIC_UNK18                        = 18,   // CM0 00040000
+    CF_GENERIC_UNK19                        = 19,   // CM0 00080000
+    CF_GENERIC_UNK20                        = 20,   // CM0 00100000
+    CF_GENERIC_UNK21                        = 21,   // CM0 00200000
+    CF_GENERIC_PREY_OF_THE_WEAK_EFF         = 22,   // CM0 00400000 + cheating death
+    CF_GENERIC_WEAPON_PROC_EFF              = 23,   // CM0 00800000
+    CF_GENERIC_UNK24                        = 24,   // CM0 01000000
+    CF_GENERIC_CORPSE_EXPLOSION_EFF         = 25,   // CM0 02000000
+    CF_GENERIC_DEMONIC_PACT_EFF             = 26,   // CM0 04000000 + metamorphosis 1'st eff
+    CF_GENERIC_CHALLENGE_FLAG_EFF           = 27,   // CM0 08000000
+    CF_GENERIC_UNK28                        = 28,   // CM0 10000000
+    CF_GENERIC_GLYPH1_EFF                   = 29,   // CM0 20000000 all glyph effects (except glyph0)
+    CF_GENERIC_UNK30                        = 30,   // CM0 40000000
+    CF_GENERIC_BLESSED_HEALING_EFF          = 31,   // CM0 80000000
+
+    CF_GENERIC_UNK32                        = 32,   // CM1 00000001
+    CF_GENERIC_UNK33                        = 33,   // CM1 00000002
+    CF_GENERIC_GLACIAL_STRIKE_EFF           = 34,   // CM1 00000004
+    CF_GENERIC_MELEE_STRIKE_EFF             = 35,   // CM1 00000008 sudden death + trauma
+    CF_GENERIC_TURN_THE_TABLES_EFF          = 36,   // CM1 00000010
+    CF_GENERIC_MILITARY_RANK                = 37,   // CM1 00000020
+    CF_GENERIC_UNK38                        = 38,   // CM1 00000040
+    CF_GENERIC_UNK39                        = 39,   // CM1 00000080
+    CF_GENERIC_UNK40                        = 40,   // CM1 00000100
+    CF_GENERIC_UNK41                        = 41,   // CM1 00000200
+    CF_GENERIC_FLAME_BREATH                 = 42,   // CM1 00000400
+    CF_GENERIC_UNK43                        = 43,   // CM1 00000800
+    CF_GENERIC_RUNIC_MASTERY                = 44,   // CM1 00001000
+    CF_GENERIC_UNK45                        = 45,   // CM1 00002000
+    CF_GENERIC_ELEMENTAL_MASTERY            = 46,   // CM1 00004000
+    CF_GENERIC_UNK47                        = 47,   // CM1 00008000
+    CF_GENERIC_UNK48                        = 48,   // CM1 00010000
+    CF_GENERIC_OWLS_FOCUS                   = 49,   // CM1 00020000
+    CF_GENERIC_UNK50                        = 50,   // CM1 00040000
+    CF_GENERIC_UNK51                        = 51,   // CM1 00080000
+    CF_GENERIC_RHYTM_OF_THE_FALLEN          = 52,   // CM1 00100000
+    CF_GENERIC_UNK53                        = 53,   // CM1 00200000
+    CF_GENERIC_UNK54                        = 54,   // CM1 00400000
+    CF_GENERIC_UNK55                        = 55,   // CM1 00800000
+    CF_GENERIC_UNK56                        = 56,   // CM1 01000000
+    CF_GENERIC_UNK57                        = 57,   // CM1 02000000
+    CF_GENERIC_UNK58                        = 58,   // CM1 04000000
+    CF_GENERIC_UNK59                        = 59,   // CM1 08000000
+    CF_GENERIC_KILL_COMMAND_EFF             = 60,   // CM1 10000000
+    CF_GENERIC_UNK61                        = 61,   // CM1 20000000
+    CF_GENERIC_UNK62                        = 62,   // CM1 40000000
+    CF_GENERIC_UNK63                        = 63,   // CM1 80000000
+
+    CF_GENERIC_UNK64                        = 64,   // CM2 00000001
+
+    // -- Mage (3)
+    CF_MAGE_FIREBALL                        = 0,    // CM0 00000001
+    CF_MAGE_FIRE_BLAST                      = 1,    // CM0 00000002
+    CF_MAGE_FLAMESTRIKE                     = 2,    // CM0 00000004
+    CF_MAGE_FIRE_WARD                       = 3,    // CM0 00000008
+    CF_MAGE_SCORCH                          = 4,    // CM0 00000010
+    CF_MAGE_FROSTBOLT                       = 5,    // CM0 00000020
+    CF_MAGE_FROST_NOVA                      = 6,    // CM0 00000040
+    CF_MAGE_BLIZZARD                        = 7,    // CM0 00000080
+    CF_MAGE_FROST_WARD                      = 8,    // CM0 00000100
+    CF_MAGE_CONE_OF_COLD                    = 9,    // CM0 00000200
+    CF_MAGE_ARCANE_INT                      = 10,   // CM0 00000400 Arcane Intellect & Arcane Brilliance
+    CF_MAGE_ARCANE_MISSILES_CHANNEL         = 11,   // CM0 00000800
+    CF_MAGE_ARCANE_EXPLOSION                = 12,   // CM0 00001000
+    CF_MAGE_D_A_MAGIC                       = 13,   // CM0 00002000 Dampen Magic & Amplify Magic
+    CF_MAGE_COUNTERSPELL                    = 14,   // CM0 00004000
+    CF_MAGE_MANA_SHIELD                     = 15,   // CM0 00008000
+    CF_MAGE_BLINK                           = 16,   // CM0 00010000
+    CF_MAGE_BLAST_WAVE1                     = 17,   // CM0 00020000
+    CF_MAGE_MOLTEN_ARMOR1                   = 18,   // CM0 00040000
+    CF_MAGE_MISC_FROST                      = 19,   // CM0 00080000 lots of stuff
+    CF_MAGE_CHILLED                         = 20,   // CM0 00100000
+    CF_MAGE_ARCANE_MISSILES2                = 21,   // CM0 00200000
+    CF_MAGE_PYROBLAST                       = 22,   // CM0 00400000
+    CF_MAGE_DRAGONS_BREATH                  = 23,   // CM0 00800000
+    CF_MAGE_POLYMORPH                       = 24,   // CM0 01000000
+    CF_MAGE_ELEMENTAL_ARMOR                 = 25,   // CM0 02000000 molten armor & frost armor
+    CF_MAGE_EVOCATION                       = 26,   // CM0 04000000
+    CF_MAGE_IGNITE                          = 27,   // CM0 08000000
+    CF_MAGE_MAGE_ARMOR                      = 28,   // CM0 10000000
+    CF_MAGE_ARCANE_BLAST                    = 29,   // CM0 20000000
+    CF_MAGE_CONJURE                         = 30,   // CM0 40000000 conjure food, water, etc
+    CF_MAGE_PORTALS                         = 31,   // CM0 80000000
+
+    CF_MAGE_ICE_BARRIER                     = 32,   // CM1 00000001
+    CF_MAGE_CLEARCASTING                    = 33,   // CM1 00000002
+    CF_MAGE_COLD_SNAP                       = 34,   // CM1 00000004
+    CF_MAGE_MOLTEN_ARMOR2                   = 35,   // CM1 00000008
+    CF_MAGE_SPELLSTEAL                      = 36,   // CM1 00000010
+    CF_MAGE_PRESENCE_OF_MIND                = 37,   // CM1 00000020
+    CF_MAGE_BLAST_WAVE2                     = 38,   // CM1 00000040
+    CF_MAGE_ICE_BLOCK                       = 39,   // CM1 00000080
+    CF_MAGE_REPLENISH_MANA                  = 40,   // CM1 00000100
+    CF_MAGE_FROSTBITE                       = 41,   // CM1 00000200
+    CF_MAGE_PET_PASSIVE                     = 42,   // CM1 00000400 Unkown Spell
+    CF_MAGE_WATER_ELEMENTAL                 = 43,   // CM1 00000800
+    CF_MAGE_FROSTFIRE_BOLT                  = 44,   // CM1 00001000
+    CF_MAGE_IMPROVED_SCORCH                 = 45,   // CM1 00002000
+    CF_MAGE_ICY_VEINS                       = 46,   // CM1 00004000
+    CF_MAGE_ARCANE_BARRAGE                  = 47,   // CM1 00008000
+    CF_MAGE_LIVING_BOMB_AOE                 = 48,   // CM1 00010000
+    CF_MAGE_LIVING_BOMB                     = 49,   // CM1 00020000
+    CF_MAGE_INVISIBILITY                    = 50,   // CM1 00040000 Arcane spec
+    CF_MAGE_ARCANE_POWER                    = 51,   // CM1 00080000
+    CF_MAGE_DEEP_FREEZE                     = 52,   // CM1 00100000
+    CF_MAGE_MIRROR_IMAGE                    = 53,   // CM1 00200000
+    CF_MAGE_INVISIBILITY2                   = 54,   // CM1 00400000
+    CF_MAGE_SLOW_FALL                       = 55,   // CM1 00800000
+    CF_MAGE_REMOVE_CURSE                    = 56,   // CM1 01000000
+    CF_MAGE_BLAZING_SPEED                   = 57,   // CM1 02000000
+    CF_MAGE_COMBUSTION                      = 58,   // CM1 04000000
+    CF_MAGE_IMPROVED_BLINK                  = 59,   // CM1 08000000
+    CF_MAGE_INCANTERS_ABSORPTION            = 60,   // CM1 10000000
+    CF_MAGE_ARCANE_POTENCY                  = 61,   // CM1 20000000
+    CF_MAGE_IMP_COUNTERSPELL_DEBUFF         = 62,   // CM1 40000000
+    CF_MAGE_FROSTBITE2                      = 63,   // CM1 80000000
+
+    CF_MAGE_WINTERS_CHILL                   = 64,   // CM2 00000001
+    CF_MAGE_FINGERS_OF_FROST                = 65,   // CM2 00000002
+    CF_MAGE_ARCANE_POTENCY2                 = 66,   // CM2 00000004
+    CF_MAGE_MISC                            = 67,   // CM2 00000008 random stuff
+
+    // -- Warrior (4)
+    CF_WARRIOR_CHARGE                       = 0,    // CM0 00000001
+    CF_WARRIOR_HAMSTRING                    = 1,    // CM0 00000002
+    CF_WARRIOR_OVERPOWER                    = 2,    // CM0 00000004
+    CF_WARRIOR_PUMMEL                       = 3,    // CM0 00000008
+    CF_WARRIOR_RECKLESSNESS                 = 4,    // CM0 00000010
+    CF_WARRIOR_REND                         = 5,    // CM0 00000020
+    CF_WARRIOR_HEROIC_STRIKE                = 6,    // CM0 00000040
+    CF_WARRIOR_THUNDER_CLAP                 = 7,    // CM0 00000080
+    CF_WARRIOR_BLOODRAGE                    = 8,    // CM0 00000100
+    CF_WARRIOR_DISARM                       = 9,    // CM0 00000200
+    CF_WARRIOR_REVENGE                      = 10,   // CM0 00000400
+    CF_WARRIOR_SHIELD_BASH                  = 11,   // CM0 00000800
+    CF_WARRIOR_SHIELD_BLOCK                 = 12,   // CM0 00001000
+    CF_WARRIOR_SHIELD_WALL                  = 13,   // CM0 00002000
+    CF_WARRIOR_SUNDER_ARMOR                 = 14,   // CM0 00004000
+    CF_WARRIOR_TAUNT                        = 15,   // CM0 00008000
+    CF_WARRIOR_BATTLE_SHOUT                 = 16,   // CM0 00010000
+    CF_WARRIOR_DEMORALIZING_SHOUT           = 17,   // CM0 00020000
+    CF_WARRIOR_FRIGHTENING_SHOUT            = 18,   // CM0 00040000
+    CF_WARRIOR_CHALLENGING_SHOUT            = 19,   // CM0 00080000
+    CF_WARRIOR_DEATH_WISH                   = 20,   // CM0 00100000
+    CF_WARRIOR_SLAM                         = 21,   // CM0 00200000
+    CF_WARRIOR_CLEAVE                       = 22,   // CM0 00400000
+    CF_WARRIOR_STANCES                      = 23,   // CM0 00800000
+    CF_WARRIOR_CHARGE_STUN                  = 24,   // CM0 01000000
+    CF_WARRIOR_MORTAL_STRIKE                = 25,   // CM0 02000000
+    CF_WARRIOR_CONCUSSION_BLOW              = 26,   // CM0 04000000
+    CF_WARRIOR_MOCKING_BLOW                 = 27,   // CM0 08000000
+    CF_WARRIOR_BERSERKER_RAGE               = 28,   // CM0 10000000
+    CF_WARRIOR_EXECUTE                      = 29,   // CM0 20000000
+    CF_WARRIOR_INTERCEPT                    = 30,   // CM0 40000000
+    CF_WARRIOR_RETALIATION1                 = 31,   // CM0 80000000
+
+    CF_WARRIOR_HEROIC_THROW                 = 32,   // CM1 00000001
+    CF_WARRIOR_SPELL_REFLECTION             = 33,   // CM1 00000002
+    CF_WARRIOR_WHIRLWIND                    = 34,   // CM1 00000004
+    CF_WARRIOR_RETALIATION2                 = 35,   // CM1 00000008
+    CF_WARRIOR_DEEP_WOUNDS                  = 36,   // CM1 00000010
+    CF_WARRIOR_PIERCING_HOWL                = 37,   // CM1 00000020
+    CF_WARRIOR_DEVASTATE                    = 38,   // CM1 00000040
+    CF_WARRIOR_COMMANDING_SHOUT             = 39,   // CM1 00000080
+    CF_WARRIOR_VICTORY_RUSH                 = 40,   // CM1 00000100
+    CF_WARRIOR_SHIELD_SLAM                  = 41,   // CM1 00000200
+    CF_WARRIOR_BLOODTHIRST                  = 42,   // CM1 00000400
+    CF_WARRIOR_BERSERKER_STANCE_PASSIVE     = 43,   // CM1 00000800
+    CF_WARRIOR_DEFIANCE_PASSIVE             = 44,   // CM1 00001000
+    CF_WARRIOR_UNK45                        = 45,   // CM1 00002000
+    CF_WARRIOR_BLADESTORM                   = 46,   // CM1 00004000
+    CF_WARRIOR_SHOCKWAVE                    = 47,   // CM1 00008000
+    CF_WARRIOR_INTERVENE                    = 48,   // CM1 00010000
+    CF_WARRIOR_ENRAGED_REGENERATION         = 49,   // CM1 00020000
+    CF_WARRIOR_VICTORIOUS                   = 50,   // CM1 00040000
+    CF_WARRIOR_LAST_STAND                   = 51,   // CM1 00080000
+    CF_WARRIOR_SWEEPING_STRIKES             = 52,   // CM1 00100000
+    CF_WARRIOR_DAZED                        = 53,   // CM1 00200000
+    CF_WARRIOR_SHATTERING_THROW             = 54,   // CM1 00400000
+    CF_WARRIOR_BATTLE_STANCE                = 55,   // CM1 00800000
+    CF_WARRIOR_BLOODSURGE_PROC              = 56,   // CM1 01000000
+    CF_WARRIOR_SUDDEN_DEATH_PROC            = 57,   // CM1 02000000
+
+    // -- Warlock (5)
+    CF_WARLOCK_SHADOW_BOLT                  = 0,    // CM0 00000001
+    CF_WARLOCK_CORRUPTION                   = 1,    // CM0 00000002
+    CF_WARLOCK_IMMOLATE                     = 2,    // CM0 00000004
+    CF_WARLOCK_DRAIN_LIFE                   = 3,    // CM0 00000008
+    CF_WARLOCK_DRAIN_MANA                   = 4,    // CM0 00000010
+    CF_WARLOCK_RAIN_OF_FIRE                 = 5,    // CM0 00000020
+    CF_WARLOCK_HELLFIRE                     = 6,    // CM0 00000040
+    CF_WARLOCK_SHADOWBURN                   = 7,    // CM0 00000080
+    CF_WARLOCK_SEARING_PAIN                 = 8,    // CM0 00000100
+    CF_WARLOCK_SPORE_EXPLOSION              = 9,    // CM0 00000200
+    CF_WARLOCK_CURSE_OF_AGONY               = 10,   // CM0 00000400
+    CF_WARLOCK_ENSLAVE_DEMON                = 11,   // CM0 00000800
+    CF_WARLOCK_IMP_FIREBOLT                 = 12,   // CM0 00001000
+    CF_WARLOCK_SUCCUBUS_LASH_OF_PAIN        = 13,   // CM0 00002000
+    CF_WARLOCK_DRAIN_SOUL                   = 14,   // CM0 00004000
+    CF_WARLOCK_CURSE_OF_WEAKNESS            = 15,   // CM0 00008000
+    CF_WARLOCK_HEALTHSTONE                  = 16,   // CM0 00010000
+    CF_WARLOCK_SPELLSTONE                   = 17,   // CM0 00020000
+    CF_WARLOCK_LIFE_TAP                     = 18,   // CM0 00040000
+    CF_WARLOCK_DEATH_COIL                   = 19,   // CM0 00080000
+    CF_WARLOCK_CREATE_STONES                = 20,   // CM0 00100000 create healthstone, spellstone, soulstone, etc
+    CF_WARLOCK_FIRESTONE_ATTACK             = 21,   // CM0 00200000
+    CF_WARLOCK_SLOWING_CURSES               = 22,   // CM0 00400000 Curse of Exhaustion & Curse of Past Burdens
+    CF_WARLOCK_IMP_BUFFS                    = 23,   // CM0 00800000 Blood Pact & Fire Shield
+    CF_WARLOCK_HEALTH_FUNNEL                = 24,   // CM0 01000000
+    CF_WARLOCK_VOIDWALKER_SPELLS            = 25,   // CM0 02000000
+    CF_WARLOCK_TAMED_PET_PASSIVE1           = 26,   // CM0 04000000 not sure what this is used for
+    CF_WARLOCK_TAMED_PET_PASSIVE2           = 27,   // CM0 08000000 not sure what this is used for
+    CF_WARLOCK_TAMED_PET_PASSIVE3           = 28,   // CM0 10000000 not sure what this is used for
+    CF_WARLOCK_SUMMON_SPELLS                = 29,   // CM0 20000000 Summon Imp, Voidwalker, etc
+    CF_WARLOCK_SUCCUBUS_SPELLS              = 30,   // CM0 40000000
+    CF_WARLOCK_MISC_DEBUFFS                 = 31,   // CM0 80000000 lots of stuff, mostly debuffs
+
+    CF_WARLOCK_SIPHON_LIFE                  = 32,   // CM1 00000001
+    CF_WARLOCK_CURSE_OF_DOOM                = 33,   // CM1 00000002
+    CF_WARLOCK_UNK34                        = 34,   // CM1 00000004
+    CF_WARLOCK_HOWL_OF_TERROR               = 35,   // CM1 00000008
+    CF_WARLOCK_SEED_OF_CORRUPTION1          = 36,   // CM1 00000010
+    CF_WARLOCK_ARMOR                        = 37,   // CM1 00000020
+    CF_WARLOCK_INCINERATE                   = 38,   // CM1 00000040
+    CF_WARLOCK_SOUL_FIRE                    = 39,   // CM1 00000080
+    CF_WARLOCK_UNSTABLE_AFFLICTION          = 40,   // CM1 00000100
+    CF_WARLOCK_CURSE_OF_THE_ELEMENTS        = 41,   // CM1 00000200
+    CF_WARLOCK_FEAR                         = 42,   // CM1 00000400
+    CF_WARLOCK_CHAOS_BOLT_PASSIVE           = 43,   // CM1 00000800
+    CF_WARLOCK_SHADOWFURY                   = 44,   // CM1 00001000
+    CF_WARLOCK_PET_PASSIVE1                 = 45,   // CM1 00002000 no idea
+    CF_WARLOCK_PET_PASSIVE2                 = 46,   // CM1 00004000 no idea
+    CF_WARLOCK_SEED_OF_CORRUPTION2          = 47,   // CM1 00008000
+    CF_WARLOCK_SHADOWFLAME1                 = 48,   // CM1 00010000
+    CF_WARLOCK_CHAOS_BOLT                   = 49,   // CM1 00020000
+    CF_WARLOCK_HAUNT                        = 50,   // CM1 00040000
+    CF_WARLOCK_UNK51                        = 51,   // CM1 00080000
+    CF_WARLOCK_DEMONIC_PACT                 = 52,   // CM1 00100000
+    CF_WARLOCK_CURSE_OF_RECKLESSNESS        = 53,   // CM1 00200000 Used to be Curse of Recklessness
+    CF_WARLOCK_SHADOW_BITE                  = 54,   // CM1 00400000
+    CF_WARLOCK_CONFLAGRATE                  = 55,   // CM1 00800000
+    CF_WARLOCK_EMPOWERED_IMP                = 56,   // CM1 01000000
+    CF_WARLOCK_FEL_INTELLIGENCE             = 57,   // CM1 02000000
+    CF_WARLOCK_USE_SOULSTONE                = 58,   // CM1 04000000
+    CF_WARLOCK_BANISH                       = 59,   // CM1 08000000
+    CF_WARLOCK_SUCCUBUS_SEDUCTION           = 60,   // CM1 10000000
+    CF_WARLOCK_FEL_ARMOR                    = 61,   // CM1 20000000
+    CF_WARLOCK_EYE_OF_KILROGG_PASSIVE       = 62,   // CM1 40000000
+    CF_WARLOCK_RITUAL_OF_SOULS              = 63,   // CM1 80000000
+
+    CF_WARLOCK_INFERNO_EFFECT               = 64,   // CM2 00000001
+    CF_WARLOCK_SHADOWFLAME2                 = 65,   // CM2 00000002
+    CF_WARLOCK_UNENDING_BREATH              = 66,   // CM2 00000004
+    CF_WARLOCK_DEMONIC_FRENZY               = 67,   // CM2 00000008
+    CF_WARLOCK_DEMON_SKIN                   = 68,   // CM2 00000010
+    CF_WARLOCK_DEMONIC_CIRCLE               = 69,   // CM2 00000020 Summon, Teleport
+    CF_WARLOCK_MISC_BUFFS                   = 70,   // CM2 00000040 Ritual of Summoning, Ritual of Doom, etc
+    CF_WARLOCK_FEL_DOMINATION               = 71,   // CM2 00000080
+    CF_WARLOCK_PANDEMIC                     = 72,   // CM2 00000100
+    CF_WARLOCK_UNK73                        = 73,   // CM2 00000200
+    CF_WARLOCK_DEVOUR_MAGIC                 = 74,   // CM2 00000400
+    CF_WARLOCK_CURSE_OF_TONGUES             = 75,   // CM2 00000800
+
+    // -- Priest (6)
+    CF_PRIEST_POWER_WORD_SHIELD             = 0,    // CM0 00000001
+    CF_PRIEST_INNER_FIRE                    = 1,    // CM0 00000002
+    CF_PRIEST_VAMPIRIC_EMBRACE              = 2,    // CM0 00000004
+    CF_PRIEST_POWER_WORD_FORTITUDE          = 3,    // CM0 00000008 includes Prayer of Fortitude
+    CF_PRIEST_MANA_BURN                     = 4,    // CM0 00000010
+    CF_PRIEST_DIVINE_SPIRIT                 = 5,    // CM0 00000020 includes Prayer of Divine Spirit
+    CF_PRIEST_RENEW                         = 6,    // CM0 00000040
+    CF_PRIEST_SMITE                         = 7,    // CM0 00000080
+    CF_PRIEST_SHADOW_PROTECTION             = 8,    // CM0 00000100 includes Prayer of Shadow Protection
+    CF_PRIEST_PRAYER_OF_HEALING             = 9,    // CM0 00000200
+    CF_PRIEST_HEAL                          = 10,   // CM0 00000400 "Heal" only
+    CF_PRIEST_FLASH_HEAL                    = 11,   // CM0 00000800
+    CF_PRIEST_GREATER_HEAL                  = 12,   // CM0 00001000
+    CF_PRIEST_MIND_BLAST                    = 13,   // CM0 00002000
+    CF_PRIEST_FADE                          = 14,   // CM0 00004000
+    CF_PRIEST_SHADOW_WORD_PAIN              = 15,   // CM0 00008000
+    CF_PRIEST_PSYCHIC_SCREAM                = 16,   // CM0 00010000
+    CF_PRIEST_MIND_CONTROL                  = 17,   // CM0 00020000
+    CF_PRIEST_LESSER_HEAL                   = 18,   // CM0 00040000
+    CF_PRIEST_UNK19                         = 19,   // CM0 00080000
+    CF_PRIEST_HOLY_FIRE                     = 20,   // CM0 00100000
+    CF_PRIEST_STARSHARDS                    = 21,   // CM0 00200000
+    CF_PRIEST_HOLY_NOVA1                    = 22,   // CM0 00400000 also includes "Twin Disciplines"
+    CF_PRIEST_MIND_FLAY1                    = 23,   // CM0 00800000 huge collection of unused spells too...
+    CF_PRIEST_DESPERATE_PRAYER              = 24,   // CM0 01000000
+    CF_PRIEST_DEVOURING_PLAGUE              = 25,   // CM0 02000000
+    CF_PRIEST_MIND_VISION1                  = 26,   // CM0 04000000
+    CF_PRIEST_HOLY_NOVA2                    = 27,   // CM0 08000000
+    CF_PRIEST_CIRCLE_OF_HEALING             = 28,   // CM0 10000000
+    CF_PRIEST_WEAKENED_SOUL                 = 29,   // CM0 20000000 PW:Shield debuff
+    CF_PRIEST_MISC30                        = 30,   // CM0 40000000 Ressurection, Shackle Undead, Shadowfiend
+    CF_PRIEST_MISC_BUFFS1                   = 31,   // CM0 80000000
+
+    CF_PRIEST_DISPELS                       = 32,   // CM1 00000001 Dispel Magic, Cure Disease
+    CF_PRIEST_SHADOW_WORD_DEATH_TARGET      = 33,   // CM1 00000002
+    CF_PRIEST_BINDING_HEAL                  = 34,   // CM1 00000004
+    CF_PRIEST_SHADOW_WEAVING                = 35,   // CM1 00000008
+    CF_PRIEST_UNK36                         = 36,   // CM1 00000010
+    CF_PRIEST_PRAYER_OF_MENDING             = 37,   // CM1 00000020
+    CF_PRIEST_MIND_SOOTHE                   = 38,   // CM1 00000040
+    CF_PRIEST_MASS_DISPEL                   = 39,   // CM1 00000080
+    CF_PRIEST_SHADOWFIEND                   = 40,   // CM1 00000100
+    CF_PRIEST_CLEARCASTING                  = 41,   // CM1 00000200
+    CF_PRIEST_VAMPIRIC_TOUCH                = 42,   // CM1 00000400
+    CF_PRIEST_PRIEST_SHADOWFORM             = 43,   // CM1 00000800
+    CF_PRIEST_MISC_TALENTS                  = 44,   // CM1 00001000 lots of random stuff
+    CF_PRIEST_SHADOW_WORD_DEATH_SELF        = 45,   // CM1 00002000
+    CF_PRIEST_REFLECTIVE_SHIELD             = 46,   // CM1 00004000
+    CF_PRIEST_PENANCE_DMG                   = 47,   // CM1 00008000
+    CF_PRIEST_PENANCE_HEAL                  = 48,   // CM1 00010000
+    CF_PRIEST_HOLY_CONCENTRATION            = 49,   // CM1 00020000
+    CF_PRIEST_DISPERSION                    = 50,   // CM1 00040000
+    CF_PRIEST_MIND_SEAR1                    = 51,   // CM1 00080000
+    CF_PRIEST_MIND_SEAR2                    = 52,   // CM1 00100000
+    CF_PRIEST_SILENCE                       = 53,   // CM1 00200000
+    CF_PRIEST_DIVINE_HYMN1                  = 54,   // CM1 00400000
+    CF_PRIEST_PENANCE_BASE                  = 55,   // CM1 00800000
+    CF_PRIEST_DIVINE_AEGIS                  = 56,   // CM1 01000000
+    CF_PRIEST_FEAR_WARD                     = 57,   // CM1 02000000
+    CF_PRIEST_SHACKLE_UNDEAD                = 58,   // CM1 04000000
+    CF_PRIEST_GUARDIAN_SPIRIT               = 59,   // CM1 08000000
+    CF_PRIEST_PAIN_SUPRESSION               = 60,   // CM1 10000000
+    CF_PRIEST_POWER_INFUSION                = 61,   // CM1 20000000
+    CF_PRIEST_INNER_FOCUS                   = 62,   // CM1 40000000
+    CF_PRIEST_MIND_VISION2                  = 63,   // CM1 80000000
+
+    CF_PRIEST_LEVITATE                      = 64,   // CM2 00000001
+    CF_PRIEST_UNK65                         = 65,   // CM2 00000002
+    CF_PRIEST_DIVINE_HYMN2                  = 66,   // CM2 00000004 Uncategorized
+    CF_PRIEST_IMP_DEVOURING_PLAGUE          = 67,   // CM2 00000008
+    CF_PRIEST_HYMN_OF_HOPE                  = 68,   // CM2 00000010
+    CF_PRIEST_BORROWED_TIME                 = 69,   // CM2 00000020
+    CF_PRIEST_MIND_FLAY2                    = 70,   // CM2 00000040
+    CF_PRIEST_PENANCE_CHANNEL               = 71,   // CM2 00000080
+    CF_PRIEST_BLACKOUT                      = 72,   // CM2 00000100
+    CF_PRIEST_SPIRIT_OF_REDEMPTION          = 73,   // CM2 00000200
+    CF_PRIEST_MISC_BUFFS2                   = 74,   // CM2 00000400
+
+    // -- Druid (7)
+    CF_DRUID_WRATH                          = 0,    // CM0 00000001
+    CF_DRUID_MOONFIRE                       = 1,    // CM0 00000002
+    CF_DRUID_STARFIRE                       = 2,    // CM0 00000004
+    CF_DRUID_DEMORALIZING_ROAR              = 3,    // CM0 00000008
+    CF_DRUID_REJUVENATION                   = 4,    // CM0 00000010
+    CF_DRUID_HEALING_TOUCH                  = 5,    // CM0 00000020
+    CF_DRUID_REGROWTH                       = 6,    // CM0 00000040
+    CF_DRUID_TRANQUILITY                    = 7,    // CM0 00000080
+    CF_DRUID_THORNS                         = 8,    // CM0 00000100
+    CF_DRUID_ENTANGLING_ROOTS               = 9,    // CM0 00000200
+    CF_DRUID_FAERIE_FIRE                    = 10,   // CM0 00000400 includes Faerie Fire (Feral)
+    CF_DRUID_MAUL                           = 11,   // CM0 00000800
+    CF_DRUID_RAKE_CLAW                      = 12,   // CM0 00001000 Rake & Claw
+    CF_DRUID_BASH                           = 13,   // CM0 00002000
+    CF_DRUID_PROWL                          = 14,   // CM0 00004000
+    CF_DRUID_SHRED                          = 15,   // CM0 00008000
+    CF_DRUID_RAVAGE                         = 16,   // CM0 00010000
+    CF_DRUID_POUNCE                         = 17,   // CM0 00020000
+    CF_DRUID_MARK_OF_THE_WILD               = 18,   // CM0 00040000 includes Gift of the Wild
+    CF_DRUID_ENRAGE                         = 19,   // CM0 00080000
+    CF_DRUID_NATURES_GRASP1                 = 20,   // CM0 00100000
+    CF_DRUID_INSECT_SWARM                   = 21,   // CM0 00200000
+    CF_DRUID_HURRICANE                      = 22,   // CM0 00400000
+    CF_DRUID_RIP_BITE                       = 23,   // CM0 00800000 Rip & Ferocious Bite
+    CF_DRUID_SOOTHE_HIBERNATE1              = 24,   // CM0 01000000 Soothe Animal & Hibernate
+    CF_DRUID_BEAR_FORM_PASSIVE2             = 25,   // CM0 02000000
+    CF_DRUID_UNK1                           = 26,   // CM0 04000000
+    CF_DRUID_CAT_FORM_PASSIVE               = 27,   // CM0 08000000
+    CF_DRUID_REBIRTH                        = 28,   // CM0 10000000
+    CF_DRUID_FAERIE_DRAGON_FORM             = 29,   // CM0 20000000
+    CF_DRUID_BEAR_FORM                      = 30,   // CM0 40000000 includes Dire Bear Form
+    CF_DRUID_CAT_FORM                       = 31,   // CM0 80000000
+
+    CF_DRUID_FERAL_CHARGE_BEAR1             = 32,   // CM1 00000001
+    CF_DRUID_SWIFTMEND                      = 33,   // CM1 00000002
+    CF_DRUID_CURE_POISON                    = 34,   // CM1 00000004 also Abolish Poison
+    CF_DRUID_GROWL                          = 35,   // CM1 00000008
+    CF_DRUID_LIFEBLOOM                      = 36,   // CM1 00000010
+    CF_DRUID_CYCLONE                        = 37,   // CM1 00000020
+    CF_DRUID_MANGLE_BEAR                    = 38,   // CM1 00000040
+    CF_DRUID_MAIM                           = 39,   // CM1 00000080
+    CF_DRUID_LACERATE                       = 40,   // CM1 00000100
+    CF_DRUID_FORCE_OF_NATURE                = 41,   // CM1 00000200
+    CF_DRUID_MANGLE_CAT                     = 42,   // CM1 00000400
+    CF_DRUID_LEADER_OF_THE_PACK             = 43,   // CM1 00000800
+    CF_DRUID_INNERVATE                      = 44,   // CM1 00001000
+    CF_DRUID_MOONKIN                        = 45,   // CM1 00002000 Moonkin Form & Aura
+    CF_DRUID_TRAVEL_FORM                    = 46,   // CM1 00004000
+    CF_DRUID_FLIGHT_FORMS                   = 47,   // CM1 00008000
+    CF_DRUID_TREE_OF_LIFE                   = 48,   // CM1 00010000
+    CF_DRUID_SOOTHE_HIBERNATE2              = 49,   // CM1 00020000 Soothe Animal & Hibernate
+    CF_DRUID_BARKSKIN                       = 50,   // CM1 00040000
+    CF_DRUID_NATURES_SWIFTNESS              = 51,   // CM1 00080000
+    CF_DRUID_SWIPE                          = 52,   // CM1 00100000
+    CF_DRUID_CLEARCASTING                   = 53,   // CM1 00200000
+    CF_DRUID_REMOVE_CURSE                   = 54,   // CM1 00400000
+    CF_DRUID_STARFALL1                      = 55,   // CM1 00800000
+    CF_DRUID_TYPHOON                        = 56,   // CM1 01000000
+    CF_DRUID_NOURISH                        = 57,   // CM1 02000000
+    CF_DRUID_WILD_GROWTH                    = 58,   // CM1 04000000
+    CF_DRUID_TREE_OF_LIFE_PASSIVE           = 59,   // CM1 08000000
+    CF_DRUID_SAVAGE_ROAR_LOCK_JAW           = 60,   // CM1 10000000 Savage Roar & Lock Jaw
+    CF_DRUID_COWER                          = 61,   // CM1 20000000
+    CF_DRUID_FRENZIED_REGENERATION          = 62,   // CM1 40000000
+    CF_DRUID_AQUATIC_FORM_PASSIVE           = 63,   // CM1 80000000
+
+    CF_DRUID_CHALLENGING_ROAR               = 64,   // CM2 00000001
+    CF_DRUID_BEAR_FORM_PASSIVE              = 65,   // CM2 00000002 also Dire Bear Form (Passive)
+    CF_DRUID_MOONKIN_FORM_PASSIVE           = 66,   // CM2 00000004
+    CF_DRUID_DASH                           = 67,   // CM2 00000008
+    CF_DRUID_FERAL_CHARGE_BEAR2             = 68,   // CM2 00000010
+    CF_DRUID_FERAL_CHARGE_CAT               = 69,   // CM2 00000020
+    CF_DRUID_BERSERK                        = 70,   // CM2 00000040
+    CF_DRUID_SURVIVAL_INSTINCTS             = 71,   // CM2 00000080
+    CF_DRUID_STARFALL2                      = 72,   // CM2 00000100
+    CF_DRUID_REVIVE                         = 73,   // CM2 00000200
+    CF_DRUID_SWIPE_CAT                      = 74,   // CM2 00000400
+    CF_DRUID_TIGERS_FURY                    = 75,   // CM2 00000800
+    CF_DRUID_NATURES_GRASP2                 = 76,   // CM2 00001000
+    CF_DRUID_SOOTHE                         = 77,   // CM2 00002000
+    CF_DRUID_UNK78                          = 78,   // CM2 00004000
+    CF_DRUID_HIBERNATE                      = 79,   // CM2 00008000
+    CF_DRUID_UNK80                          = 80,   // CM2 00010000
+    CF_DRUID_UNK81                          = 81,   // CM2 00020000
+    CF_DRUID_CLAW_CAT                       = 82,   // CM2 00040000
+    CF_DRUID_UNK83                          = 83,   // CM2 00080000
+    CF_DRUID_ECLIPSE                        = 84,   // CM2 00100000
+    CF_DRUID_RIP                            = 85,   // CM2 00200000
+
+    // -- Rogue (8)
+    CF_ROGUE_THROW                          = 0,    // CM0 00000001
+    CF_ROGUE_SINISTER_STRIKE                = 1,    // CM0 00000002
+    CF_ROGUE_BACKSTAB                       = 2,    // CM0 00000004
+    CF_ROGUE_GOUGE                          = 3,    // CM0 00000008
+    CF_ROGUE_KICK                           = 4,    // CM0 00000010
+    CF_ROGUE_EVASION                        = 5,    // CM0 00000020
+    CF_ROGUE_SPRINT                         = 6,    // CM0 00000040
+    CF_ROGUE_SAP                            = 7,    // CM0 00000080
+    CF_ROGUE_GARROTE                        = 8,    // CM0 00000100
+    CF_ROGUE_AMBUSH                         = 9,    // CM0 00000200
+    CF_ROGUE_CHEAP_SHOT                     = 10,   // CM0 00000400
+    CF_ROGUE_VANISH                         = 11,   // CM0 00000800
+    CF_ROGUE_DISTRACT                       = 12,   // CM0 00001000
+    CF_ROGUE_INSTANT_POISON                 = 13,   // CM0 00002000
+    CF_ROGUE_CRIPPLING_POISON               = 14,   // CM0 00004000
+    CF_ROGUE_MIND_NUMBING_POISON            = 15,   // CM0 00008000
+    CF_ROGUE_DEADLY_POISON                  = 16,   // CM0 00010000
+    CF_ROGUE_EVISCERATE                     = 17,   // CM0 00020000
+    CF_ROGUE_SLICE_AND_DICE                 = 18,   // CM0 00040000
+    CF_ROGUE_EXPOSE_ARMOR                   = 19,   // CM0 00080000
+    CF_ROGUE_RUPTURE                        = 20,   // CM0 00100000
+    CF_ROGUE_KIDNEY_SHOT                    = 21,   // CM0 00200000
+    CF_ROGUE_STEALTH                        = 22,   // CM0 00400000
+    CF_ROGUE_MISC_COMBO_MOVES               = 23,   // CM0 00800000 most of these have their own flag also...
+    CF_ROGUE_BLIND                          = 24,   // CM0 01000000
+    CF_ROGUE_HEMORRHAGE                     = 25,   // CM0 02000000
+    CF_ROGUE_CONFUSION                      = 26,   // CM0 04000000 Uncategorized
+    CF_ROGUE_FEINT                          = 27,   // CM0 08000000
+    CF_ROGUE_WOUND_POISON                   = 28,   // CM0 10000000
+    CF_ROGUE_SHIV                           = 29,   // CM0 20000000
+    CF_ROGUE_MISC                           = 30,   // CM0 40000000 lots of stuff
+    CF_ROGUE_RIPOSTE1                       = 31,   // CM0 80000000 Old Riposte, Not used anymore in 3.1.0, Uncategorized
+
+    CF_ROGUE_DEADLY_THROW                   = 32,   // CM1 00000001
+    CF_ROGUE_MUTILATE_MH                    = 33,   // CM1 00000002 Mutilate triggered
+    CF_ROGUE_MUTILATE_OH                    = 34,   // CM1 00000004
+    CF_ROGUE_ENVENOM                        = 35,   // CM1 00000008
+    CF_ROGUE_ANESTHETIC_POISON              = 36,   // CM1 00000010
+    CF_ROGUE_PREMEDITATION                  = 37,   // CM1 00000020
+    CF_ROGUE_COLD_BLOOD                     = 38,   // CM1 00000040
+    CF_ROGUE_ADRENALINE_RUSH                = 39,   // CM1 00000080
+    CF_ROGUE_RIPOSTE2                       = 40,   // CM1 00000100 Added in WoTLK
+    CF_ROGUE_SHADOWSTEP                     = 41,   // CM1 00000200
+    CF_ROGUE_CHEAT_DEATH                    = 42,   // CM1 00000400
+    CF_ROGUE_BLADE_FLURRY                   = 43,   // CM1 00000800
+    CF_ROGUE_PREPARATION                    = 44,   // CM1 00001000
+    CF_ROGUE_DISARM_TRAP                    = 45,   // CM1 00002000
+    CF_ROGUE_PICK_LOCK                      = 46,   // CM1 00004000
+    CF_ROGUE_SAFE_FALL                      = 47,   // CM1 00008000
+    CF_ROGUE_CLOAK_OF_SHADOWS               = 48,   // CM1 00010000
+    CF_ROGUE_TRICKS_OF_THE_TRADE1           = 49,   // CM1 00020000
+    CF_ROGUE_FAN_OF_KNIVES                  = 50,   // CM1 00040000
+    CF_ROGUE_POISON_UNK                     = 51,   // CM1 00080000 something to do with poisons, not sure what
+    CF_ROGUE_DISMANTLE                      = 52,   // CM1 00100000
+    CF_ROGUE_MUTILATE                       = 53,   // CM1 00200000 Mutilate main spell, also Honor Among Thieves, Turn the Tables
+    CF_ROGUE_VIGOR                          = 54,   // CM1 00400000
+    CF_ROGUE_KILLING_SPREE                  = 55,   // CM1 00800000
+    CF_ROGUE_HUNGER_FOR_BLOOD               = 56,   // CM1 01000000
+    CF_ROGUE_SHADOW_DANCE                   = 57,   // CM1 02000000
+    CF_ROGUE_TRICKS_OF_THE_TRADE2           = 58,   // CM1 04000000 Uncategorized
+
+    // -- Hunter (9)
+    CF_HUNTER_SHOOT                         = 0,    // CM0 00000001 shooting technically is a spell XD
+    CF_HUNTER_MONGOOSE_RAPTOR               = 1,    // CM0 00000002 Mongoose Bite and Raptor Strike
+    CF_HUNTER_FIRE_TRAP_EFFECTS             = 2,    // CM0 00000004 Immolation/Explosive Trap effects
+    CF_HUNTER_FREEZING_TRAP_EFFECT          = 3,    // CM0 00000008 Freezing Trap effect, Freezing Arrow Effect
+    CF_HUNTER_FROST_TRAP_EFFECTS            = 4,    // CM0 00000010 frost traps, strikes and other random stuff
+    CF_HUNTER_RAPID_FIRE                    = 5,    // CM0 00000020
+    CF_HUNTER_WING_CLIP                     = 6,    // CM0 00000040
+    CF_HUNTER_TRAPS                         = 7,    // CM0 00000080 the actual traps themselves I think
+    CF_HUNTER_FEIGN_DEATH                   = 8,    // CM0 00000100
+    CF_HUNTER_CONCUSSIVE_SHOT               = 9,    // CM0 00000200
+    CF_HUNTER_HUNTERS_MARK                  = 10,   // CM0 00000400
+    CF_HUNTER_ARCANE_SHOT                   = 11,   // CM0 00000800
+    CF_HUNTER_MULTI_SHOT                    = 12,   // CM0 00001000
+    CF_HUNTER_MISC_TRAPS                    = 13,   // CM0 00002000
+    CF_HUNTER_SERPENT_STING                 = 14,   // CM0 00004000
+    CF_HUNTER_SCORPID_STING                 = 15,   // CM0 00008000
+    CF_HUNTER_MISC                          = 16,   // CM0 00010000 odd combination of stuff
+    CF_HUNTER_AIMED_SHOT                    = 17,   // CM0 00020000
+    CF_HUNTER_SCATTER_SILENCING_SHOT        = 18,   // CM0 00040000 Scatter Shot & Silencing Shot
+    CF_HUNTER_ASPECT_OF_THE_MONKEY          = 19,   // CM0 00080000
+    CF_HUNTER_ASPECT_OF_THE_HAWK            = 20,   // CM0 00100000
+    CF_HUNTER_ASPECT_OF_THE_PACK            = 21,   // CM0 00200000
+    CF_HUNTER_EYES_OF_THE_BEAST             = 22,   // CM0 00400000
+    CF_HUNTER_MEND_PET                      = 23,   // CM0 00800000
+    CF_HUNTER_REVIVE_PET                    = 24,   // CM0 01000000
+    CF_HUNTER_TAMED_PET_PASSIVE_01          = 25,   // CM0 02000000
+    CF_HUNTER_TAMED_PET_PASSIVE_02          = 26,   // CM0 04000000
+    CF_HUNTER_TAMED_PET_PASSIVE_03          = 27,   // CM0 08000000
+    CF_HUNTER_TAMED_PET_PASSIVE_04          = 28,   // CM0 10000000
+    CF_HUNTER_TAMED_PET_PASSIVE_05          = 29,   // CM0 20000000
+    CF_HUNTER_TAMED_PET_PASSIVE_06          = 30,   // CM0 40000000
+    CF_HUNTER_TAMED_PET_PASSIVE_07          = 31,   // CM0 80000000
+
+    CF_HUNTER_STEADY_SHOT                   = 32,   // CM1 00000001
+    CF_HUNTER_DETERRENCE                    = 33,   // CM1 00000002
+    CF_HUNTER_TAMED_PET_PASSIVE_08          = 34,   // CM1 00000004
+    CF_HUNTER_TAMED_PET_PASSIVE_09          = 35,   // CM1 00000008
+    CF_HUNTER_TAMED_PET_PASSIVE_10          = 36,   // CM1 00000010
+    CF_HUNTER_FEROCIOUS_INSPIRATION1        = 37,   // CM1 00000020
+    CF_HUNTER_FEROCIOUS_INSPIRATION2        = 38,   // CM1 00000040
+    CF_HUNTER_VIPER_STING                   = 39,   // CM1 00000080
+    CF_HUNTER_WYVERN_STING1                 = 40,   // CM1 00000100
+    CF_HUNTER_RAPID_RECUPERATION            = 41,   // CM1 00000200
+    CF_HUNTER_PET_FIRE_BREATH               = 42,   // CM1 00000400 misc pet fire breath spells
+    CF_HUNTER_KILL_COMMAND                  = 43,   // CM1 00000800
+    CF_HUNTER_WYVERN_STING2                 = 44,   // CM1 00001000
+    CF_HUNTER_SNAKE_TRAP_EFFECT             = 45,   // CM1 00002000
+    CF_HUNTER_DISENGAGE                     = 46,   // CM1 00004000
+    CF_HUNTER_FLARE                         = 47,   // CM1 00008000
+    CF_HUNTER_SCARE_BEAST                   = 48,   // CM1 00010000
+    CF_HUNTER_UNK49                         = 49,   // CM1 00020000
+    CF_HUNTER_ASPECT_OF_THE_VIPER           = 50,   // CM1 00040000
+    CF_HUNTER_COUNTERATTACK                 = 51,   // CM1 00080000
+    CF_HUNTER_MISDIRECTION                  = 52,   // CM1 00100000
+    CF_HUNTER_TRUESHOT_AURA                 = 53,   // CM1 00200000
+    CF_HUNTER_ASPECT_OF_THE_WILD            = 54,   // CM1 00400000
+    CF_HUNTER_KILL_SHOT                     = 55,   // CM1 00800000
+    CF_HUNTER_RAPID_KILLING                 = 56,   // CM1 01000000
+    CF_HUNTER_BESTIAL_WRATH                 = 57,   // CM1 02000000
+    CF_HUNTER_BEAR_TRAP                     = 58,   // CM1 04000000
+    CF_HUNTER_BLACK_ARROW                   = 59,   // CM1 08000000
+    CF_HUNTER_PET_SPELLS                    = 60,   // CM1 10000000
+    CF_HUNTER_PET_DASH_DIVE                 = 61,   // CM1 20000000 Dash & Dive
+    CF_HUNTER_SAVAGE_REND                   = 62,   // CM1 40000000
+    CF_HUNTER_EXPLOSIVE_SHOT                = 63,   // CM1 80000000
+
+    CF_HUNTER_CHIMERA_SHOT                  = 64,   // CM2 00000001
+    CF_HUNTER_TRACKING                      = 65,   // CM2 00000002
+    CF_HUNTER_MASTERS_CALL                  = 66,   // CM2 00000004
+    CF_HUNTER_INTIMIDATION                  = 67,   // CM2 00000008
+    CF_HUNTER_ASPECT_OF_THE_BEAST           = 68,   // CM2 00000010
+    CF_HUNTER_CAMOUFLAGE                    = 69,   // CM2 00000020
+    CF_HUNTER_EXPLOSIVE_SHOT1               = 70,   // CM2 00000040
+    CF_HUNTER_WILD_QUIVER_AUTO_SHOT         = 71,   // CM2 00000080 Chance to proc from a Quiver, Uncategorized
+    CF_HUNTER_UNK72                         = 72,   // CM2 00000100
+    CF_HUNTER_EXPLOSIVE_SHOT2               = 73,   // CM2 00000200
+    CF_HUNTER_CHIMERA_SHOT__PET             = 74,   // CM2 00000400
+    CF_HUNTER_CHIMERA_SHOT__SERPENT         = 75,   // CM2 00000800 dunno what's so special about this one =P
+    CF_HUNTER_ASPECT_OF_THE_DRAGONHAWK      = 76,   // CM2 00001000
+    CF_HUNTER_ASPECT_OF_THE_DRAGONHAWK2     = 77,   // CM2 00002000 the dodge effect
+    CF_HUNTER_EXPLOSIVE_TRAP_EFFECT         = 78,   // CM2 00004000
+    CF_HUNTER_SCATTER_SHOT                  = 79,   // CM2 00008000
+    CF_HUNTER_RAPTOR_STRIKE                 = 80,   // CM2 00010000
+    CF_HUNTER_IMMOLATION_TRAP               = 81,   // CM2 00020000
+    CF_HUNTER_FROST_TRAP                    = 82,   // CM2 00040000
+    CF_HUNTER_MASTERS_CALL2                 = 83,   // CM2 00080000
+    CF_HUNTER_CALL_STABLED_PET              = 84,   // CM2 00100000
+
+    // -- Paladin (10)
+    CF_PALADIN_RIGHTEOUS_FURY               = 0,    // CM0 00000001
+    CF_PALADIN_BLESSING_OF_MIGHT            = 1,    // CM0 00000002 Also includes Greater Blessing of Might
+    CF_PALADIN_REPENTANCE                   = 2,    // CM0 00000004
+    CF_PALADIN_RETRIBUTION_AURA             = 3,    // CM0 00000008
+    CF_PALADIN_HAND_OF_FREEDOM              = 4,    // CM0 00000010
+    CF_PALADIN_CONSECRATION                 = 5,    // CM0 00000020
+    CF_PALADIN_DEVOTION_AURA                = 6,    // CM0 00000040
+    CF_PALADIN_HAND_OF_PROTECTION           = 7,    // CM0 00000080
+    CF_PALADIN_HAND_OF_SALVATION1           = 8,    // CM0 00000100
+    CF_PALADIN_STUN                         = 9,    // CM0 00000200 Used by Seal of Justice
+    CF_PALADIN_JUDGEMENT_OF_RIGHT           = 10,   // CM0 00000400
+    CF_PALADIN_HAMMER_OF_JUSTICE            = 11,   // CM0 00000800
+    CF_PALADIN_PURIFY_CLEANSE               = 12,   // CM0 00001000 Purify & Cleanse
+    CF_PALADIN_HAND_OF_SACRIFICE            = 13,   // CM0 00002000
+    CF_PALADIN_AVENGERS_SHIELD              = 14,   // CM0 00004000
+    CF_PALADIN_LAY_ON_HANDS                 = 15,   // CM0 00008000
+    CF_PALADIN_BLESSING_OF_WISDOM           = 16,   // CM0 00010000 Also Includes Greater Blessing of Wisdom
+    CF_PALADIN_CONCENTRATION_AURA           = 17,   // CM0 00020000 +Couple talents
+    CF_PALADIN_SEAL_OF_WISDOM_LIGHT         = 18,   // CM0 00040000 Seal of Wisdom & Seal of Light
+    CF_PALADIN_JUDGEMENT_OF_WISDOM_LIGHT    = 19,   // CM0 00080000 Judgement of Wisdom & Judgement of Light<- Not used anymore in WOTLK 3.1.0
+    CF_PALADIN_JUDGEMENT_OF_JUSTICE         = 20,   // CM0 00100000
+    CF_PALADIN_HOLY_SHOCK1                  = 21,   // CM0 00200000
+    CF_PALADIN_DIVINE_SHIELD                = 22,   // CM0 00400000
+    CF_PALADIN_JUDGEMENT_ACTIVATE           = 23,   // CM0 00800000 New Judgements
+    CF_PALADIN_BLESSING_OF_KINGS            = 24,   // CM0 01000000 Also includes Greater Blessing of Kings
+    CF_PALADIN_SEAL_OF_COMMAND              = 25,   // CM0 02000000
+    CF_PALADIN_MISC_AURAS1                  = 26,   // CM0 04000000
+    CF_PALADIN_SEAL_OF_JUST_RIGHT           = 27,   // CM0 08000000 Seal of Justice & Seal of Righteousness
+    CF_PALADIN_MISC_BLESSINGS               = 28,   // CM0 10000000 Most of them aren't used anymore by players
+    CF_PALADIN_HEART_OF_THE_CRUSADER        = 29,   // CM0 20000000
+    CF_PALADIN_FLASH_OF_LIGHT               = 30,   // CM0 40000000
+    CF_PALADIN_HOLY_LIGHT                   = 31,   // CM0 80000000
+
+    CF_PALADIN_JUDGEMENT_OF_LIGHT           = 32,   // CM1 00000001
+    CF_PALADIN_EXORCISM                     = 33,   // CM1 00000002
+    CF_PALADIN_RIGHTEOUS_DEFENSE            = 34,   // CM1 00000004
+    CF_PALADIN_JUDGEMENT_OF_BLOOD_MARTYR    = 35,   // CM1 00000008
+    CF_PALADIN_MISC_AURAS2                  = 36,   // CM1 00000010
+    CF_PALADIN_HAND_OF_SALVATION2           = 37,   // CM1 00000020 Uncategorized
+    CF_PALADIN_HOLY_SHIELD                  = 38,   // CM1 00000040
+    CF_PALADIN_HAMMER_OF_WRATH              = 39,   // CM1 00000080
+    CF_PALADIN_DIVINE_FAVOR                 = 40,   // CM1 00000100
+    CF_PALADIN_JUDGEMENT_OF_COMMAND         = 41,   // CM1 00000200 Uncategorized
+    CF_PALADIN_SEAL_OF_BLOOD_MARTYR         = 42,   // CM1 00000400 Seal of Blood & Seal of the Martyr
+    CF_PALADIN_SEAL_OF_CORRUPT_VENGE        = 43,   // CM1 00000800 Seal of Corruption & Seal of Vengeance
+    CF_PALADIN_SPIRITUAL_ATTUNEMENT         = 44,   // CM1 00001000
+    CF_PALADIN_AVENGING_WRATH               = 45,   // CM1 00002000
+    CF_PALADIN_VINDICATION                  = 46,   // CM1 00004000
+    CF_PALADIN_CRUSADER_STRIKE              = 47,   // CM1 00008000
+    CF_PALADIN_HOLY_SHOCK                   = 48,   // CM1 00010000
+    CF_PALADIN_DIVINE_STORM                 = 49,   // CM1 00020000
+    CF_PALADIN_HAMMER_OF_THE_RIGHTEOUS      = 50,   // CM1 00040000
+    CF_PALADIN_SACRED_SHIELD                = 51,   // CM1 00080000
+    CF_PALADIN_SHIELD_OF_RIGHTEOUSNESS      = 52,   // CM1 00100000
+    CF_PALADIN_HOLY_WRATH                   = 53,   // CM1 00200000
+    CF_PALADIN_JUDGEMENT_OF_CORRUPT_VENG    = 54,   // CM1 00400000
+    CF_PALADIN_TURN_EVIL                    = 55,   // CM1 00800000
+    CF_PALADIN_BEACON_OF_LIGHT              = 56,   // CM1 01000000
+    CF_PALADIN_SEAL_OF_LIGHT                = 57,   // CM1 02000000
+    CF_PALADIN_SEAL_OF_WISDOM               = 58,   // CM1 04000000
+    CF_PALADIN_SENSE_UNDEAD                 = 59,   // CM1 08000000
+    CF_PALADIN_SUMMON_MOUNT                 = 60,   // CM1 10000000
+    CF_PALADIN_SEAL_OF_RIGHTEOUSNESS        = 61,   // CM1 20000000
+    CF_PALADIN_HAND_OF_RECKONING            = 62,   // CM1 40000000
+    CF_PALADIN_UNK63                        = 63,   // CM1 80000000
+
+    CF_PALADIN_UNK64                        = 64,   // CM2 00000001
+    CF_PALADIN_UNK65                        = 65,   // CM2 00000002
+    CF_PALADIN_UNK66                        = 66,   // CM2 00000004
+    CF_PALADIN_UNK67                        = 67,   // CM2 00000008
+    CF_PALADIN_UNK68                        = 68,   // CM2 00000010
+    CF_PALADIN_AURAS                        = 69,   // CM2 00000020 something to do with auras...
+    CF_PALADIN_JUDGEMENT_OF_JUST            = 70,   // CM2 00000040 Judgements of the Just target aura
+
+    // -- Shaman (11)
+    CF_SHAMAN_LIGHTNING_BOLT                = 0,    // CM0 00000001
+    CF_SHAMAN_CHAIN_LIGHTNING               = 1,    // CM0 00000002
+    CF_SHAMAN_MAGMA_TOTEM_ATTACK            = 2,    // CM0 00000004
+    CF_SHAMAN_STONECLAW_TOTEM               = 3,    // CM0 00000008
+    CF_SHAMAN_SEARING_TOTEM                 = 4,    // CM0 00000010
+    CF_SHAMAN_UNUSED5                       = 5,    // CM0 00000020 0 spells have this as of 3.3.0a
+    CF_SHAMAN_HEALING_WAVE                  = 6,    // CM0 00000040
+    CF_SHAMAN_LESSER_HEALING_WAVE           = 7,    // CM0 00000080
+    CF_SHAMAN_CHAIN_HEAL                    = 8,    // CM0 00000100
+    CF_SHAMAN_REINCARNATION                 = 9,    // CM0 00000200
+    CF_SHAMAN_LIGHTNING_SHIELD              = 10,   // CM0 00000400
+    CF_SHAMAN_GHOSTWOLF                     = 11,   // CM0 00000800
+    CF_SHAMAN_MAGMA_TOTEM                   = 12,   // CM0 00001000
+    CF_SHAMAN_HEALING_STREAM                = 13,   // CM0 00002000 used by Healing Stream Totem
+    CF_SHAMAN_MANA_SPRING                   = 14,   // CM0 00004000 used by Mana Spring Totem
+    CF_SHAMAN_STONESKIN                     = 15,   // CM0 00008000 used by Stoneskin Totem
+    CF_SHAMAN_STRENGTH_OF_EARTH             = 16,   // CM0 00010000 used by Strength of Earth Totem
+    CF_SHAMAN_UNK17                         = 17,   // CM0 00020000 doesn't seem to be used by anything
+    CF_SHAMAN_GROUNDING_TOTEM               = 18,   // CM0 00040000
+    CF_SHAMAN_RESTO_TOTEMS                  = 19,   // CM0 00080000 Healing Stream Totem & Mana Spring Totem
+    CF_SHAMAN_EARTH_SHOCK                   = 20,   // CM0 00100000
+    CF_SHAMAN_FLAMETONGUE_WEAPON            = 21,   // CM0 00200000
+    CF_SHAMAN_ROCKBITER_WEAPON              = 22,   // CM0 00400000
+    CF_SHAMAN_WINDFURY_WEAPON_PROC          = 23,   // CM0 00800000
+    CF_SHAMAN_FROSTBRAND_WEAPON_PROC        = 24,   // CM0 01000000
+    CF_SHAMAN_FLAMETONGUE_TOTEM             = 25,   // CM0 02000000
+    CF_SHAMAN_MISC_TOTEM_EFFECTS            = 26,   // CM0 04000000 lots of stuff...
+    CF_SHAMAN_FIRE_NOVA                     = 27,   // CM0 08000000 new Fire Nova spell on 3.3.0a
+    CF_SHAMAN_FLAME_SHOCK                   = 28,   // CM0 10000000
+    CF_SHAMAN_MISC_TOTEMS                   = 29,   // CM0 20000000 non-attacking totems
+    CF_SHAMAN_FIRE_TOTEM_ATTACK             = 30,   // CM0 40000000
+    CF_SHAMAN_FROST_SHOCK                   = 31,   // CM0 80000000
+
+    CF_SHAMAN_EARTHBIND                     = 32,   // CM1 00000001
+    CF_SHAMAN_MAELSTROM_WEAPON              = 33,   // CM1 00000002
+    CF_SHAMAN_UNUSED34                      = 34,   // CM1 00000004
+    CF_SHAMAN_CURES                         = 35,   // CM1 00000008 Cleanse Spirit, Cure Poison/Disease
+    CF_SHAMAN_STORMSTRIKE1                  = 36,   // CM1 00000010
+    CF_SHAMAN_WATER_SHIELD                  = 37,   // CM1 00000020
+    CF_SHAMAN_BLOODLUST_HEROISM             = 38,   // CM1 00000040 Bloodlust & Heroism
+    CF_SHAMAN_NATURES_SWIFTNESS             = 39,   // CM1 00000080
+    CF_SHAMAN_WRATH_OF_AIR_TOTEM            = 40,   // CM1 00000100
+    CF_SHAMAN_FLURRY                        = 41,   // CM1 00000200
+    CF_SHAMAN_EARTH_SHIELD                  = 42,   // CM1 00000400
+    CF_SHAMAN_WEAPON_ENCHANTS               = 43,   // CM1 00000800 Purge is also in here
+    CF_SHAMAN_LAVA_BURST                    = 44,   // CM1 00001000
+    CF_SHAMAN_THUNDERSTORM                  = 45,   // CM1 00002000
+    CF_SHAMAN_CLEARCASTING                  = 46,   // CM1 00004000 Elemental Mastery
+    CF_SHAMAN_HEX                           = 47,   // CM1 00008000
+    CF_SHAMAN_FERAL_SPIRIT                  = 48,   // CM1 00010000
+    CF_SHAMAN_SHAMANISTIC_RAGE              = 49,   // CM1 00020000
+    CF_SHAMAN_FIRE_NOVA_EFFECT              = 50,   // CM1 00040000 damage part casted from totem
+    CF_SHAMAN_EARTHLIVING                   = 51,   // CM1 00080000
+    CF_SHAMAN_EARTHLIVING_WEAPON_PASSIVE    = 52,   // CM1 00100000
+    CF_SHAMAN_WINDFURY_TOTEM                = 53,   // CM1 00200000
+    CF_SHAMAN_EARTH_ELEMENTAL_TOTEM         = 54,   // CM1 00400000
+    CF_SHAMAN_FIRE_ELEMENTAL_TOTEM          = 55,   // CM1 00800000
+    CF_SHAMAN_STORMSTRIKE2                  = 56,   // CM1 01000000
+    CF_SHAMAN_TOTEM_OF_WRATH                = 57,   // CM1 02000000
+    CF_SHAMAN_RESTO_BUFFS                   = 58,   // CM1 04000000 Ancestral Fortitude, Healing Way, etc
+    CF_SHAMAN_WIND_SHOCK                    = 59,   // CM1 08000000
+    CF_SHAMAN_WATER_BREATHING               = 60,   // CM1 10000000
+    CF_SHAMAN_WATER_WALKING                 = 61,   // CM1 20000000
+    CF_SHAMAN_ASTRAL_RECALL                 = 62,   // CM1 40000000
+    CF_SHAMAN_FIRE_NOVA_EFFECT1             = 63,   // CM1 80000000 CF_SHAMAN_FIRE_NOVA_EFFECT duplicate
+
+    CF_SHAMAN_TIDAL_FORCE                   = 64,   // CM2 00000001
+    CF_SHAMAN_SPIRIT_WOLF_SPELLS            = 65,   // CM2 00000002
+    CF_SHAMAN_LAVA_LASH                     = 66,   // CM2 00000004
+    CF_SHAMAN_IMPROVED_GHOSTWOLF            = 67,   // CM2 00000008
+    CF_SHAMAN_RIPTIDE                       = 68,   // CM2 00000010
+    CF_SHAMAN_EARTHBIND_TOTEM               = 69,   // CM2 00000020
+    CF_SHAMAN_TIDAL_MASTERY                 = 70,   // CM2 00000040
+    CF_SHAMAN_UNUSED71                      = 71,   // CM2 00000080
+    CF_SHAMAN_WINDFURY_WEAPON_PASSIVE       = 72,   // CM2 00000100
+    CF_SHAMAN_MAELSTORM_WEAPON              = 73,   // CM2 00000200
+    CF_SHAMAN_STORMSTRIKES                  = 74,   // CM2 00000400
+    CF_SHAMAN_COMMAND                       = 75,   // CM2 00000800
+    CF_SHAMAN_UNK76                         = 76,   // CM2 00001000
+    CF_SHAMAN_STATIC_SHOCK                  = 77,   // CM2 00002000
+    CF_SHAMAN_EARTHGRAB                     = 78,   // CM2 00004000
+
+    // -- Death Kight (15)
+    CF_DEATHKNIGHT_PLAGUE_STRIKE            = 0,    // CM0 00000001
+    CF_DEATHKNIGHT_ICY_TOUCH_TALONS         = 1,    // CM0 00000002 Icy Touch & Icy Talons
+    CF_DEATHKNIGHT_CHAINS_OF_ICE1           = 2,    // CM0 00000004
+    CF_DEATHKNIGHT_DEATH_RUNES              = 3,    // CM0 00000008 Blood Tap & Death Rune Mastery
+    CF_DEATHKNIGHT_DEATH_STRIKE             = 4,    // CM0 00000010
+    CF_DEATHKNIGHT_DEATH_AND_DECAY          = 5,    // CM0 00000020
+    CF_DEATHKNIGHT_UNK6                     = 6,    // CM0 00000040
+    CF_DEATHKNIGHT_DESECRATION1             = 7,    // CM0 00000080
+    CF_DEATHKNIGHT_UNHOLY_PRESENCE          = 8,    // CM0 00000100
+    CF_DEATHKNIGHT_STRANGULATE              = 9,    // CM0 00000200
+    CF_DEATHKNIGHT_MIND_FREEZE              = 10,   // CM0 00000400
+    CF_DEATHKNIGHT_ARMY_OF_THE_DEAD         = 11,   // CM0 00000800
+    CF_DEATHKNIGHT_RAISE_DEAD               = 12,   // CM0 00001000
+    CF_DEATHKNIGHT_DEATH_COIL               = 13,   // CM0 00002000
+    CF_DEATHKNIGHT_RUNE_WEAPONS             = 14,   // CM0 00004000 seems to be something to do with rune weapons
+    CF_DEATHKNIGHT_FROST_PRESENCE           = 15,   // CM0 00008000
+    CF_DEATHKNIGHT_VENDETTA1                = 16,   // CM0 00010000
+    CF_DEATHKNIGHT_TUNDRA_STALKER           = 17,   // CM0 00020000
+    CF_DEATHKNIGHT_BLOOD_BOIL               = 18,   // CM0 00040000
+    CF_DEATHKNIGHT_DEATH_PACT               = 19,   // CM0 00080000
+    CF_DEATHKNIGHT_ICEBOUND_FORTITUDE       = 20,   // CM0 00100000
+    CF_DEATHKNIGHT_UNBREAKABLE_ARMOR        = 21,   // CM0 00200000 Frozen Rune Weapon also? Yes Also includes Frozen Rune Weapon
+    CF_DEATHKNIGHT_BLOOD_STRIKE             = 22,   // CM0 00400000
+    CF_DEATHKNIGHT_BLOOD_PRESENCE           = 23,   // CM0 00800000
+    CF_DEATHKNIGHT_HEART_STRIKE             = 24,   // CM0 01000000
+    CF_DEATHKNIGHT_DEATH_GRIP               = 25,   // CM0 02000000
+    CF_DEATHKNIGHT_MELEE_INTERVENTION       = 26,   // CM0 04000000 Also includes Acherus Deathcharger
+    CF_DEATHKNIGHT_RUNE_TRAP                = 27,   // CM0 08000000
+    CF_DEATHKNIGHT_MARK_OF_BLOOD            = 28,   // CM0 10000000
+    CF_DEATHKNIGHT_HYSTERIA                 = 29,   // CM0 20000000
+    CF_DEATHKNIGHT_DANCING_RUNE_WEAPON      = 30,   // CM0 40000000
+    CF_DEATHKNIGHT_FROZEN_RUNE_WEAPON       = 31,   // CM0 80000000 Uncategorized
+
+    CF_DEATHKNIGHT_DEATHCHILL               = 32,   // CM1 00000001
+    CF_DEATHKNIGHT_HOWLING_BLAST            = 33,   // CM1 00000002
+    CF_DEATHKNIGHT_FROST_STRIKE             = 34,   // CM1 00000004
+    CF_DEATHKNIGHT_VAMPIRIC_BLOOD           = 35,   // CM1 00000008
+    CF_DEATHKNIGHT_LICHBORNE                = 36,   // CM1 00000010
+    CF_DEATHKNIGHT_CORPSE_EXPLOSION         = 37,   // CM1 00000020
+    CF_DEATHKNIGHT_BONE_SHIELD              = 38,   // CM1 00000040
+    CF_DEATHKNIGHT_SUMMON_GARGOYLE          = 39,   // CM1 00000080
+    CF_DEATHKNIGHT_UNHOLY_BLIGHT            = 40,   // CM1 00000100
+    CF_DEATHKNIGHT_UNK41                    = 41,   // CM1 00000200
+    CF_DEATHKNIGHT_UNK42                    = 42,   // CM1 00000400
+    CF_DEATHKNIGHT_UNHOLY_DISEASES          = 43,   // CM1 00000800 the debuff parts I think
+    CF_DEATHKNIGHT_HUNGERING_COLD           = 44,   // CM1 00001000
+    CF_DEATHKNIGHT_DEATH                    = 45,   // CM1 00002000
+    CF_DEATHKNIGHT_CHAINS_OF_ICE2           = 46,   // CM1 00004000
+    CF_DEATHKNIGHT_FROZEN                   = 47,   // CM1 00008000
+    CF_DEATHKNIGHT_PESTILENCE               = 48,   // CM1 00010000
+    CF_DEATHKNIGHT_OBLITERATE               = 49,   // CM1 00020000
+    CF_DEATHKNIGHT_ICY_CLUTCH               = 50,   // CM1 00040000
+    CF_DEATHKNIGHT_DESECRATION2             = 51,   // CM1 00080000
+    CF_DEATHKNIGHT_VENDETTA2                = 52,   // CM1 00100000
+    CF_DEATHKNIGHT_HEALTH_LEECH             = 53,   // CM1 00200000
+    CF_DEATHKNIGHT_SCENT_OF_BLOOD           = 54,   // CM1 00400000
+    CF_DEATHKNIGHT_UNK55                    = 55,   // CM1 00800000
+    CF_DEATHKNIGHT_UNK56                    = 56,   // CM1 01000000
+    CF_DEATHKNIGHT_BLOOD_PLAGUE             = 57,   // CM1 02000000
+    CF_DEATHKNIGHT_FROST_FEVER              = 58,   // CM1 04000000
+    CF_DEATHKNIGHT_SCOURGE_STRIKE           = 59,   // CM1 08000000
+    CF_DEATHKNIGHT_DARK_COMMAND             = 60,   // CM1 10000000
+    CF_DEATHKNIGHT_RUNE_STRIKE              = 61,   // CM1 20000000
+    CF_DEATHKNIGHT_HORN_OF_WINTER           = 62,   // CM1 40000000
+    CF_DEATHKNIGHT_RAISE_ALLY               = 63,   // CM1 80000000
+
+    CF_DEATHKNIGHT_DEATH_COIL1              = 64,   // CM2 00000001
+    CF_DEATHKNIGHT_FF_BP_ACTIVE             = 65,   // CM2 00000002 the non-passive parts of Frost Fever & Blood Plague
+    CF_DEATHKNIGHT_DEATH_STRIKE_HEAL        = 66,   // CM2 00000004
+    CF_DEATHKNIGHT_DEATH_AND_DECAY1         = 67,   // CM2 00000008
+    CF_DEATHKNIGHT_CRYPT_FEVER              = 68,   // CM2 00000010 debuff
+    CF_DEATHKNIGHT_GHOUL_FRENZY             = 69,   // CM2 00000020
+    CF_DEATHKNIGHT_EBON_PLAGUE              = 70,   // CM2 00000040 debuff
+    CF_DEATHKNIGHT_SCOURGE_STRIKE1          = 71,   // CM2 00000080
+
+    CF_ALL_GIFT_OF_THE_NAARU                = 95,   // CM2 80000000 not sure why this spell gets its own XD
+};
+
+#endif // MANGOS_SPELL_CLASS_MASK_H
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index e064358cdb2..5d80a91cf91 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -26,7 +26,6 @@
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
 #include "Player.h"
-#include "SkillExtraItems.h"
 #include "Unit.h"
 #include "Spell.h"
 #include "DynamicObject.h"
@@ -42,17 +41,17 @@
 #include "Creature.h"
 #include "Totem.h"
 #include "CreatureAI.h"
-#include "BattleGroundMgr.h"
-#include "BattleGround.h"
-#include "BattleGroundEY.h"
-#include "BattleGroundWS.h"
+#include "BattleGround/BattleGroundMgr.h"
+#include "BattleGround/BattleGround.h"
+#include "BattleGround/BattleGroundWS.h"
+#include "BattleGround/BattleGroundEY.h"
+#include "OutdoorPvP/OutdoorPvP.h"
 #include "Language.h"
 #include "SocialMgr.h"
 #include "VMapFactory.h"
 #include "Util.h"
 #include "TemporarySummon.h"
 #include "ScriptMgr.h"
-#include "SkillDiscovery.h"
 #include "Formulas.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
@@ -133,7 +132,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectPull,                                     // 70 SPELL_EFFECT_PULL                     one spell: Distract Move
     &Spell::EffectPickPocket,                               // 71 SPELL_EFFECT_PICKPOCKET
     &Spell::EffectAddFarsight,                              // 72 SPELL_EFFECT_ADD_FARSIGHT
-    &Spell::EffectNULL,                                     // 73 SPELL_EFFECT_UNTRAIN_TALENTS          one spell: Trainer: Untrain Talents
+    &Spell::EffectUntrainTalents,                           // 73 SPELL_EFFECT_UNTRAIN_TALENTS          one spell: Trainer: Untrain Talents
     &Spell::EffectApplyGlyph,                               // 74 SPELL_EFFECT_APPLY_GLYPH
     &Spell::EffectHealMechanical,                           // 75 SPELL_EFFECT_HEAL_MECHANICAL          one spell: Mechanical Patch Kit
     &Spell::EffectSummonObjectWild,                         // 76 SPELL_EFFECT_SUMMON_OBJECT_WILD
@@ -147,9 +146,9 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectStuck,                                    // 84 SPELL_EFFECT_STUCK
     &Spell::EffectSummonPlayer,                             // 85 SPELL_EFFECT_SUMMON_PLAYER
     &Spell::EffectActivateObject,                           // 86 SPELL_EFFECT_ACTIVATE_OBJECT
-    &Spell::EffectNULL,                                     // 87 SPELL_EFFECT_WMO_DAMAGE (57 spells in 3.3.2)
-    &Spell::EffectNULL,                                     // 88 SPELL_EFFECT_WMO_REPAIR (2 spells in 3.3.2)
-    &Spell::EffectNULL,                                     // 89 SPELL_EFFECT_WMO_CHANGE (7 spells in 3.3.2)
+    &Spell::EffectWMODamage,                                // 87 SPELL_EFFECT_WMO_DAMAGE (57 spells in 3.3.2)
+    &Spell::EffectWMORepair,                                // 88 SPELL_EFFECT_WMO_REPAIR (2 spells in 3.3.2)
+    &Spell::EffectWMOChange,                                // 89 SPELL_EFFECT_WMO_CHANGE (7 spells in 3.3.2)
     &Spell::EffectKillCreditPersonal,                       // 90 SPELL_EFFECT_KILL_CREDIT_PERSONAL     Kill credit but only for single person
     &Spell::EffectUnused,                                   // 91 SPELL_EFFECT_THREAT_ALL               one spell: zzOLDBrainwash
     &Spell::EffectEnchantHeldItem,                          // 92 SPELL_EFFECT_ENCHANT_HELD_ITEM
@@ -182,7 +181,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectApplyAreaAura,                            //119 SPELL_EFFECT_APPLY_AREA_AURA_PET
     &Spell::EffectUnused,                                   //120 SPELL_EFFECT_TELEPORT_GRAVEYARD       one spell: Graveyard Teleport Test
     &Spell::EffectWeaponDmg,                                //121 SPELL_EFFECT_NORMALIZED_WEAPON_DMG
-    &Spell::EffectUnused,                                   //122 SPELL_EFFECT_122                      unused
+    &Spell::EffectServerSide,                               //122 SPELL_EFFECT_SERVER_SIDE              unused (used in R2 for server-side spells like 18350)
     &Spell::EffectSendTaxi,                                 //123 SPELL_EFFECT_SEND_TAXI                taxi/flight related (misc value is taxi path id)
     &Spell::EffectPlayerPull,                               //124 SPELL_EFFECT_PLAYER_PULL              opposite of knockback effect (pulls player twoard caster)
     &Spell::EffectModifyThreatPercent,                      //125 SPELL_EFFECT_MODIFY_THREAT_PERCENT
@@ -204,15 +203,15 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectNULL,                                     //141 SPELL_EFFECT_141                      damage and reduce speed?
     &Spell::EffectTriggerSpellWithValue,                    //142 SPELL_EFFECT_TRIGGER_SPELL_WITH_VALUE
     &Spell::EffectApplyAreaAura,                            //143 SPELL_EFFECT_APPLY_AREA_AURA_OWNER
-    &Spell::EffectNULL,                                     //144 SPELL_EFFECT_144                      Spectral Blast
-    &Spell::EffectNULL,                                     //145 SPELL_EFFECT_145                      Black Hole Effect
+    &Spell::EffectKnockBackFromPosition,                    //144 SPELL_EFFECT_KNOCKBACK_FROM_POSITION  Spectral Blast
+    &Spell::EffectSuspendGravity,                           //145 SPELL_EFFECT_SUSPEND_GRAVITY          Black Hole Effect
     &Spell::EffectActivateRune,                             //146 SPELL_EFFECT_ACTIVATE_RUNE
     &Spell::EffectQuestFail,                                //147 SPELL_EFFECT_QUEST_FAIL               quest fail
-    &Spell::EffectNULL,                                     //148 SPELL_EFFECT_148                      single spell: Inflicts Fire damage to an enemy.
+    &Spell::EffectTriggerMissileSpell,                      //148 SPELL_EFFECT_TRIGGER_MISSILE_2        single spell: Inflicts Fire damage to an enemy.
     &Spell::EffectCharge2,                                  //149 SPELL_EFFECT_CHARGE2                  swoop
     &Spell::EffectQuestOffer,                               //150 SPELL_EFFECT_QUEST_OFFER
     &Spell::EffectTriggerRitualOfSummoning,                 //151 SPELL_EFFECT_TRIGGER_SPELL_2
-    &Spell::EffectNULL,                                     //152 SPELL_EFFECT_152                      summon Refer-a-Friend
+    &Spell::EffectFriendSummon,                             //152 SPELL_EFFECT_FRIEND_SUMMON    summon Refer-a-Friend
     &Spell::EffectNULL,                                     //153 SPELL_EFFECT_CREATE_PET               misc value is creature entry
     &Spell::EffectTeachTaxiNode,                            //154 SPELL_EFFECT_TEACH_TAXI_NODE          single spell: Teach River's Heart Taxi Path
     &Spell::EffectTitanGrip,                                //155 SPELL_EFFECT_TITAN_GRIP Allows you to equip two-handed axes, maces and swords in one hand, but you attack $49152s1% slower than normal.
@@ -244,24 +243,27 @@ void Spell::EffectUnused(SpellEffectIndex /*eff_idx*/)
 
 void Spell::EffectResurrectNew(SpellEffectIndex eff_idx)
 {
-    if(!unitTarget || unitTarget->isAlive())
+    if (!unitTarget || unitTarget->isAlive())
         return;
 
-    if(unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    if(!unitTarget->IsInWorld())
+    if (!unitTarget->IsInWorld())
         return;
 
     Player* pTarget = ((Player*)unitTarget);
 
-    if(pTarget->isRessurectRequested())       // already have one active request
+    if (pTarget->isRessurectRequested())       // already have one active request
         return;
 
     uint32 health = damage;
+    if ( m_caster->HasAura(54733, EFFECT_INDEX_0) ) // Glyph of Rebirth
+        health = pTarget->GetMaxHealth();
     uint32 mana = m_spellInfo->EffectMiscValue[eff_idx];
     pTarget->setResurrectRequestData(m_caster->GetObjectGuid(), m_caster->GetMapId(), m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), health, mana);
     SendResurrectRequest(pTarget);
+    SendEffectLogExecute(eff_idx, pTarget->GetObjectGuid());
 }
 
 void Spell::EffectInstaKill(SpellEffectIndex /*eff_idx*/)
@@ -269,7 +271,27 @@ void Spell::EffectInstaKill(SpellEffectIndex /*eff_idx*/)
     if (!unitTarget || !unitTarget->isAlive())
         return;
 
-    if (m_caster == unitTarget)                             // prevent interrupt message
+    // Demonic Sacrifice
+    if (m_spellInfo->Id == 18788 && unitTarget->GetTypeId() == TYPEID_UNIT)
+    {
+        uint32 entry = unitTarget->GetEntry();
+        uint32 spellId;
+        switch (entry)
+        {
+            case   416: spellId = 18789; break;               // imp
+            case   417: spellId = 18792; break;               // fellhunter
+            case  1860: spellId = 18790; break;               // void
+            case  1863: spellId = 18791; break;               // succubus
+            case 17252: spellId = 35701; break;               // fellguard
+            default:
+                sLog.outError("EffectInstaKill: Unhandled creature entry (%u) case.", entry);
+                return;
+        }
+
+        m_caster->CastSpell(m_caster, spellId, true);
+    }
+
+    if (m_caster == unitTarget)                              // prevent interrupt message
         finish();
 
     WorldObject* caster = GetCastingObject();               // we need the original casting object
@@ -285,31 +307,51 @@ void Spell::EffectInstaKill(SpellEffectIndex /*eff_idx*/)
 
 void Spell::EffectEnvironmentalDMG(SpellEffectIndex eff_idx)
 {
-    uint32 absorb = 0;
-    uint32 resist = 0;
-
     // Note: this hack with damage replace required until GO casting not implemented
     // environment damage spells already have around enemies targeting but this not help in case nonexistent GO casting support
     // currently each enemy selected explicitly and self cast damage, we prevent apply self casted spell bonuses/etc
+    DamageInfo damageInfo = DamageInfo(m_caster,m_caster,m_spellInfo);
+    damageInfo.damage     = damage;
+    damageInfo.damageType = SELF_DAMAGE;
+
     damage = m_spellInfo->CalculateSimpleValue(eff_idx);
 
-    m_caster->CalculateDamageAbsorbAndResist(m_caster, GetSpellSchoolMask(m_spellInfo), SPELL_DIRECT_DAMAGE, damage, &absorb, &resist);
+    m_caster->CalculateDamageAbsorbAndResist(m_caster, &damageInfo);
+
+    m_caster->SendSpellNonMeleeDamageLog(&damageInfo);
 
-    m_caster->SendSpellNonMeleeDamageLog(m_caster, m_spellInfo->Id, damage, GetSpellSchoolMask(m_spellInfo), absorb, resist, false, 0, false);
-    if(m_caster->GetTypeId() == TYPEID_PLAYER)
+    if (m_caster->GetTypeId() == TYPEID_PLAYER)
         ((Player*)m_caster)->EnvironmentalDamage(DAMAGE_FIRE, damage);
 }
 
 void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
 {
-    if( unitTarget && unitTarget->isAlive())
+    if (unitTarget && unitTarget->isAlive())
     {
-        switch(m_spellInfo->SpellFamilyName)
+        if (unitTarget->GetEntry() == 26125 && m_caster->GetObjectGuid().IsCreature() && IsAreaOfEffectSpell(m_spellInfo)) // Ghoul
+        {
+            if (Player* pOwner = unitTarget->GetCharmerOrOwnerPlayerOrPlayerItself())
+            {
+                // Night of the Dead avoidance
+                Aura* pAura = pOwner->GetAura(55620, EFFECT_INDEX_0); // Rank 1
+                if (!pAura)
+                    pAura = pOwner->GetAura(55623, EFFECT_INDEX_0);   // Rank 2
+                if (pAura)
+                    damage -= damage * pAura->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_2) / 100;
+            }
+        }
+
+        switch (m_spellInfo->SpellFamilyName)
         {
             case SPELLFAMILY_GENERIC:
             {
-                switch(m_spellInfo->Id)                     // better way to check unknown
+                switch (m_spellInfo->Id)                    // better way to check unknown
                 {
+                    case 19698:
+                        damage = unitTarget->GetHealth() / 16;
+                        if (damage < 200)
+                            damage = 200;
+                        break;
                     // Meteor like spells (divided damage to targets)
                     case 24340: case 26558: case 28884:     // Meteor
                     case 36837: case 38903: case 41276:     // Meteor
@@ -327,27 +369,46 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                     {
                         uint32 count = 0;
                         for(TargetList::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
-                            if(ihit->effectMask & (1<<effect_idx))
+                            if (ihit->effectMask & (1<<effect_idx))
                                 ++count;
 
                         damage /= count;                    // divide to all targets
                         break;
                     }
+                    // AoE spells, which damage is reduced with distance from the initial hit point
+                    case 62598: case 62937:                 // Detonate
+                    case 65279:                             // Lightning Nova
+                    case 62311: case 64596:                 // Cosmic Smash
+                    case 52339:                             // Hurl Boulder
+                    case 51673:                             // Rocket Blast
+                    {
+                        float distance = unitTarget->GetDistance(m_targets.getDestination());
+                        damage *= exp(-distance/15.0f);
+                        break;
+                    }
                     // percent from health with min
                     case 25599:                             // Thundercrash
                     {
                         damage = unitTarget->GetHealth() / 2;
-                        if(damage < 200)
+                        if (damage < 200)
                             damage = 200;
                         break;
                     }
-                    // Intercept (warrior spell trigger)
-                    case 20253:
+                    case 20253:                             // Intercept (warrior spell trigger)
                     case 61491:
                     {
                         damage+= uint32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.12f);
                         break;
                     }
+                    // Mana Detonation
+                    case 27820:
+                    {
+                        if (unitTarget == m_caster)
+                            damage = 0;
+                        else
+                            damage = m_caster->GetMaxPower(POWER_MANA);
+                        break;
+                    }
                     // percent max target health
                     case 29142:                             // Eyesore Blaster
                     case 35139:                             // Throw Boom's Doom
@@ -357,12 +418,73 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                         damage = damage * unitTarget->GetMaxHealth() / 100;
                         break;
                     }
+                    // Thaddius' charges, don't deal dmg to units with the same charge but give them the buff:
+                    // Positive Charge
+                    case 28062:
+                    {
+                        // remove pet from damage and buff list
+                        if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        {
+                              damage = 0;
+                              break;
+                        }
+                        // If target is not (+) charged, then just deal dmg
+                        if (!unitTarget->HasAura(28059))
+                            break;
+
+                        if (m_caster != unitTarget)
+                            m_caster->CastSpell(m_caster, 29659, true);
+
+                        damage = 0;
+                        break;
+                    }
+                    // Negative Charge
+                    case 28085:
+                    {
+                        // remove pet from damage and buff list
+                        if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        {
+                              damage = 0;
+                              break;
+                        }
+                        // If target is not (-) charged, then just deal dmg
+                        if (!unitTarget->HasAura(28084))
+                            break;
+
+                        if (m_caster != unitTarget)
+                            m_caster->CastSpell(m_caster, 29660, true);
+
+                        damage = 0;
+                        break;
+                    }
                     // Cataclysmic Bolt
                     case 38441:
                     {
                         damage = unitTarget->GetMaxHealth() / 2;
                         break;
                     }
+                    // Ymiron Dark Slash
+                    case 48292:
+                    {
+                        damage = unitTarget->GetHealth() / 2;
+                        break;
+                    }
+                    case 51132: // Urom Clocking Bomb Damage
+                    {
+                        damage = m_caster->GetMaxHealth() - m_caster->GetHealth();
+                        break;
+                    }
+                    // Explode
+                    case 47496:
+                    {
+                        // Special Effect only for caster (ghoul in this case)
+                        if (unitTarget->GetEntry() == 26125 && (unitTarget->GetObjectGuid() == m_caster->GetObjectGuid()))
+                        {
+                            // After explode the ghoul must be killed
+                            unitTarget->KillSelf();
+                        }
+                        break;
+                    }
                     // Touch the Nightmare
                     case 50341:
                     {
@@ -370,6 +492,40 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                             damage = int32(unitTarget->GetMaxHealth() * 0.3f);
                         break;
                     }
+                    // Shatter (Krystallus)
+                    case 50811:
+                    case 61547:
+                    {
+                        float dist = unitTarget->GetDistance(m_caster);
+                        float radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[effect_idx]));
+
+                        damage = damage / radius * (radius - dist);
+                        break;
+                    }
+                    // Flame Tsunami (Sartharion encounter)
+                    case 57491:
+                    {
+                        // knock back only once
+                        if (unitTarget->HasAura(60241))
+                            return;
+
+                        unitTarget->SetOrientation(m_caster->GetOrientation()+M_PI_F);
+                        unitTarget->CastSpell(unitTarget, 60241, true);
+                        break;
+                    }
+                    // Biting Cold
+                    case 62188:
+                    {
+                        if (!unitTarget)
+                            return;
+
+                        // 200 * 2 ^ stack_amount
+                        if (SpellAuraHolderPtr holder = unitTarget->GetSpellAuraHolder(62039))
+                        {
+                            damage = 200 << holder->GetStackAmount();
+                        }
+                        break;
+                    }
                     // Tympanic Tantrum
                     case 62775:
                     {
@@ -394,36 +550,334 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                         damage = std::min(damage, 15000);
                         break;
                     }
+                    // Pungent Blight (Festergut)
+                    case 69195:
+                    case 71219:
+                    case 73031:
+                    case 73032:
+                    {
+                        // remove Inoculated
+                        SpellAuraHolderPtr holder = unitTarget->GetSpellAuraHolder(69291);
+                        if (!holder)
+                            holder = unitTarget->GetSpellAuraHolder(72101);
+                        if (!holder)
+                            holder = unitTarget->GetSpellAuraHolder(72102);
+                        if (!holder)
+                            holder = unitTarget->GetSpellAuraHolder(72103);
+
+                        if (holder)
+                            holder->SetAuraDuration(500);
+
+                        break;
+                    }
+                    // Empowered Flare (Blood Council encounter)
+                    case 71708:
+                    {
+                        // aura doesn't want to proc, so hacked...
+                        if (SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(71756))
+                        {
+                            if (holder->GetStackAmount() <= 1)
+                                m_caster->RemoveSpellAuraHolder(holder);
+                            else
+                                holder->ModStackAmount(-1);
+                        }
+
+                        break;
+                    }
+                    // Bone Storm
+                    case 69075:
+                    case 70834:
+                    case 70835:
+                    case 70836:
+                    {
+                        float distance = unitTarget->GetDistance2d(m_caster);
+                        damage *= exp(-distance/(27.5f));
+                        break;
+                    }
+                    // Expunged Gas (Putricide)
+                    case 70701:
+                    {
+                        uint32 stack = 1;
+                        int32 extraDamage = 0;
+                        damage = 1;
+
+                        SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(70672);
+                        if (!holder)
+                            holder = m_caster->GetSpellAuraHolder(72455);
+                        if (!holder)
+                            holder = m_caster->GetSpellAuraHolder(72832);
+                        if (!holder)
+                            holder = m_caster->GetSpellAuraHolder(72833);
+
+                        if (holder)
+                        {
+                            stack = holder->GetStackAmount();
+
+                            if (m_caster->GetMap()->GetDifficulty() >= RAID_DIFFICULTY_25MAN_NORMAL)
+                                extraDamage = 1500;
+                            else
+                                extraDamage = 1250;
+                        }
+
+                        for (uint32 i = 1; i <= stack; ++i)
+                            damage += extraDamage * i;
+
+                        break;
+                    }
+                    // Vampiric Bite (Queen Lana'thel)
+                    case 70946:
+                    case 71475:
+                    case 71476:
+                    case 71477:
+                    case 71726:
+                    case 71727:
+                    case 71728:
+                    case 71729:
+                    {
+                        // trigger Presence of the Darkfallen check
+                        unitTarget->CastSpell(unitTarget, 71952, true);
+                        break;
+                    }
+                    // Mark of the Fallen Champion damage (Saurfang)
+                    case 72255:
+                    case 72444:
+                    case 72445:
+                    case 72446:
+                    {
+                        if (!unitTarget->HasAura(72293))
+                            damage = 0;
+                        else
+                            unitTarget->CastSpell(unitTarget, 72202, true); // Blood Link
+                        break;
+                    }
+                    // Mutated Plague (Putricide)
+                    // need to find correct formula
+                    case 72454: // 10normal
+                    {
+                        if (SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(72451))
+                        {
+                            uint32 stack = holder->GetStackAmount();
+                            switch(stack)
+                            {
+                                case 1:
+                                    // deal normal dmg
+                                    break;
+                                case 2:
+                                    damage = urand(200, 500);
+                                    break;
+                                case 3:
+                                    damage = urand(1000, 1200);
+                                    break;
+                                case 4:
+                                    damage = urand(2500, 3000);
+                                    break;
+                                case 5:
+                                    damage = urand(6500, 7500);
+                                    break;
+                                default:
+                                    damage = 3000 * stack;
+                                    break;
+                            }
+                        }
+                        break;
+                    }
+                    case 72464: // 25normal
+                    {
+                        if (SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(72463))
+                        {
+                            uint32 stack = holder->GetStackAmount();
+                            switch(stack)
+                            {
+                                case 1:
+                                    // deal normal dmg
+                                    break;
+                                case 2:
+                                    damage = urand(500, 1000);
+                                    break;
+                                case 3:
+                                    damage = urand(1800, 2300);
+                                    break;
+                                case 4:
+                                    damage = urand(4200, 4700);
+                                    break;
+                                case 5:
+                                    damage = urand(9000, 9500);
+                                    break;
+                                default:
+                                    damage = 3500 * stack;
+                                    break;
+                            }
+                        }
+                        break;
+                    }
+                    case 72506: // 10hero
+                    {
+                        if (SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(72671))
+                        {
+                            uint32 stack = holder->GetStackAmount();
+                            switch(stack)
+                            {
+                                case 1:
+                                    // deal normal dmg
+                                    break;
+                                case 2:
+                                    damage = urand(400, 800);
+                                    break;
+                                case 3:
+                                    damage = urand(1500, 2000);
+                                    break;
+                                case 4:
+                                    damage = urand(3500, 4000);
+                                    break;
+                                case 5:
+                                    damage = urand(7000, 8000);
+                                    break;
+                                default:
+                                    damage = 3500 * stack;
+                                    break;
+                            }
+                        }
+                        break;
+                    }
+                    case 72507: // 25hero
+                    {
+                        if (SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(72672))
+                        {
+                            uint32 stack = holder->GetStackAmount();
+                            switch(stack)
+                            {
+                                case 1:
+                                    // deal normal dmg
+                                    break;
+                                case 2:
+                                    damage = urand(500, 1000);
+                                    break;
+                                case 3:
+                                    damage = urand(2000, 3000);
+                                    break;
+                                case 4:
+                                    damage = urand(4500, 5500);
+                                    break;
+                                case 5:
+                                    damage = urand(10000, 12000);
+                                    break;
+                                default:
+                                    damage = 4000 * stack;
+                                    break;
+                            }
+                        }
+                        break;
+                    }
+                    // Defile (Lich King)
+                    case 72754:
+                    case 73708:
+                    case 73709:
+                    case 73710:
+                    {
+                        damage = damage * m_caster->GetObjectScale();
+
+                        if (!unitTarget->GetDummyAura(m_spellInfo->Id))
+                            m_caster->CastSpell(m_caster, 72756, true);
+
+                        break;
+                    }
+                    // Shadow Prison
+                    case 72999:
+                    {
+                        if (Aura const* aur = unitTarget->GetDummyAura(m_spellInfo->Id))
+                            damage += aur->GetModifier()->m_amount;
+
+                        break;
+                    }
+                    // Life Siphon (Lich King)
+                    case 73488:
+                    case 73782:
+                    case 73783:
+                    case 73784:
+                    {
+                        // heals caster for damage done * 10
+                        int32 bp0 = damage * 10;
+                        m_caster->CastCustomSpell(m_caster, 73489, &bp0, 0, 0, true);
+                        break;
+                    }
+                    case 74607:
+                    // SPELL_FIERY_COMBUSTION_EXPLODE - Ruby sanctum boss Halion,
+                    // damage proportional number of mark (74567, dummy)
+                    {
+                        if (Aura* aura = m_caster->GetAura(74567, EFFECT_INDEX_0))
+                        {
+                            if (aura->GetStackAmount() > 0)
+                                damage = 1000 * aura->GetStackAmount();
+                            m_caster->RemoveAurasDueToSpell(74567);
+                        }
+                        else damage = 0;
+                        break;
+                    }
+                    // Blade of Twilight
+                    case 74769:
+                    case 77844:
+                    case 77845:
+                    case 77846:
+                    {
+                        float distance = unitTarget->GetDistance2d(m_caster);
+                        damage *= exp(-distance/(10.0f));
+                        break;
+                    }
+                    case 74799:
+                    // SPELL_SOUL_CONSUMPTION_EXPLODE - Ruby sanctum boss Halion,
+                    // damage proportional number of mark (74795, dummy)
+                    {
+                        if (Aura* aura = m_caster->GetAura(74795, EFFECT_INDEX_0))
+                        {
+                            if (aura->GetStackAmount() > 0)
+                                damage = 1000 * aura->GetStackAmount();
+                            m_caster->RemoveAurasDueToSpell(74795);
+                        }
+                        else damage = 0;
+                        break;
+                    }
+                    // Pact of the Darkfallen
+                    case 71341:
+                    {
+                        if (m_caster != unitTarget && unitTarget->HasAura(71340))
+                            damage = 0;
+                        break;
+                    }
                 }
                 break;
             }
             case SPELLFAMILY_WARRIOR:
             {
                 // Bloodthirst
-                if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x40000000000))
+                if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_BLOODTHIRST>())
                 {
                     damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100);
                 }
                 // Shield Slam
-                else if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000020000000000)) && m_spellInfo->Category==1209)
-                    damage += int32(m_caster->GetShieldBlockValue());
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_SHIELD_SLAM>() && m_spellInfo->Category==1209)
+                {
+                    // limited max cap of Block Value
+                    int32 iCurrentBlockValue = m_caster->GetShieldBlockValue();
+                    int32 iCurrentBlockValueCap = int32(34.5f * m_caster->getLevel()) * (m_caster->HasAura(2565) ? 2 : 1);
+                    damage += (iCurrentBlockValue > iCurrentBlockValueCap ? iCurrentBlockValueCap : iCurrentBlockValue);
+                }
                 // Victory Rush
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x10000000000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_VICTORY_RUSH>())
                 {
                     damage = uint32(damage * m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100);
                     m_caster->ModifyAuraState(AURA_STATE_WARRIOR_VICTORY_RUSH, false);
                 }
                 // Revenge ${$m1+$AP*0.310} to ${$M1+$AP*0.310}
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000400))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_REVENGE>())
                     damage+= uint32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.310f);
                 // Heroic Throw ${$m1+$AP*.50}
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000100000000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_HEROIC_THROW>())
                     damage+= uint32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.5f);
                 // Shattering Throw ${$m1+$AP*.50}
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0040000000000000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_SHATTERING_THROW>())
                     damage+= uint32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.5f);
                 // Shockwave ${$m3/100*$AP}
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000800000000000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_SHOCKWAVE>())
                 {
                     int32 pct = m_caster->CalculateSpellDamage(unitTarget, m_spellInfo, EFFECT_INDEX_2);
                     if (pct > 0)
@@ -431,7 +885,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                     break;
                 }
                 // Thunder Clap
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000080))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_THUNDER_CLAP>())
                 {
                     damage+=int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 12 / 100);
                 }
@@ -440,18 +894,18 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
             case SPELLFAMILY_WARLOCK:
             {
                 // Incinerate Rank 1 & 2
-                if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x00004000000000)) && m_spellInfo->SpellIconID==2128)
+                if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARLOCK_INCINERATE>() && m_spellInfo->GetSpellIconID()==2128)
                 {
                     // Incinerate does more dmg (dmg*0.25) if the target have Immolate debuff.
                     // Check aura state for speed but aura state set not only for Immolate spell
-                    if(unitTarget->HasAuraState(AURA_STATE_CONFLAGRATE))
+                    if (unitTarget->HasAuraState(AURA_STATE_CONFLAGRATE))
                     {
                         Unit::AuraList const& RejorRegr = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE);
                         for(Unit::AuraList::const_iterator i = RejorRegr.begin(); i != RejorRegr.end(); ++i)
                         {
                             // Immolate
                             if((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARLOCK &&
-                                ((*i)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x00000000000004)))
+                                (*i)->GetSpellProto()->GetSpellFamilyFlags().test<CF_WARLOCK_IMMOLATE>())
                             {
                                 damage += damage/4;
                                 break;
@@ -460,7 +914,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                     }
                 }
                 // Shadowflame
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0001000000000000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARLOCK_SHADOWFLAME1>())
                 {
                     // Apply DOT part
                     switch(m_spellInfo->Id)
@@ -473,7 +927,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                     }
                 }
                 // Shadow Bite
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0040000000000000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARLOCK_SHADOW_BITE>())
                 {
                     Unit *owner = m_caster->GetOwner();
                     if (!owner)
@@ -502,22 +956,29 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                             continue;
 
                         // Immolate
-                        if ((*i)->GetSpellProto()->IsFitToFamilyMask(UI64LIT(0x0000000000000004)))
+                        if ((*i)->GetSpellProto()->GetSpellFamilyFlags().test<CF_WARLOCK_IMMOLATE>())
                         {
-                            aura = *i;                      // it selected always if exist
+                            aura = (*i)();                      // it selected always if exist
                             break;
                         }
 
                         // Shadowflame
-                        if ((*i)->GetSpellProto()->IsFitToFamilyMask(UI64LIT(0x0000000000000000), 0x00000002))
-                            aura = *i;                      // remember but wait possible Immolate as primary priority
+                        if ((*i)->GetSpellProto()->GetSpellFamilyFlags().test<CF_WARLOCK_SHADOWFLAME2>())
+                            aura = (*i)();                      // remember but wait possible Immolate as primary priority
                     }
 
                     // found Immolate or Shadowflame
                     if (aura)
                     {
-                        int32 damagetick = aura->GetModifier()->m_amount;
-                        damage += damagetick * 4;
+                        int32 duration = GetSpellDuration(aura->GetSpellProto());
+                        int32 per_time = aura->GetSpellProto()->EffectAmplitude[aura->GetEffIndex()];
+                        int32 num_ticks = duration > 0 && per_time > 0 ? duration / per_time : 0;
+                        int32 basepoints = num_ticks * aura->GetModifier()->m_amount;
+
+                        // 60% of the dot aura damage is direct damage, value stored in basepoints of effect 1
+                        damage += basepoints * m_currentBasePoints[EFFECT_INDEX_1] / 100;
+                        // 40% of the dot aura damage is dot damage, value stored in basepoints of effect 2
+                        m_currentBasePoints[EFFECT_INDEX_1] = basepoints * m_currentBasePoints[EFFECT_INDEX_2] / (100 * GetSpellAuraMaxTicks(m_spellInfo));
 
                         // Glyph of Conflagrate
                         if (!m_caster->HasAura(56235))
@@ -530,16 +991,22 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
             case SPELLFAMILY_PRIEST:
             {
                 // Shadow Word: Death - deals damage equal to damage done to caster
-                if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000200000000))
+                if (m_spellInfo->GetSpellFamilyFlags().test<CF_PRIEST_SHADOW_WORD_DEATH_TARGET>())
+                {
+                    // Glyph of Shadow Word: Death
+                    if (Aura* pAura = m_caster->GetAura(55682, EFFECT_INDEX_1))
+                        if (unitTarget->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
+                            damage += int32(damage / 100 * pAura->GetModifier()->m_amount);
                     m_caster->CastCustomSpell(m_caster, 32409, &damage, 0, 0, true);
+                }
                 // Improved Mind Blast (Mind Blast in shadow form bonus)
-                else if (m_caster->GetShapeshiftForm() == FORM_SHADOW && (m_spellInfo->SpellFamilyFlags & UI64LIT(0x00002000)))
+                else if (m_caster->GetShapeshiftForm() == FORM_SHADOW && m_spellInfo->GetSpellFamilyFlags().test<CF_PRIEST_MIND_BLAST>())
                 {
                     Unit::AuraList const& ImprMindBlast = m_caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER);
                     for(Unit::AuraList::const_iterator i = ImprMindBlast.begin(); i != ImprMindBlast.end(); ++i)
                     {
                         if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_PRIEST &&
-                            ((*i)->GetSpellProto()->SpellIconID == 95))
+                            ((*i)->GetSpellProto()->GetSpellIconID() == 95))
                         {
                             int chance = (*i)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_1);
                             if (roll_chance_i(chance))
@@ -549,30 +1016,36 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                         }
                     }
                 }
+                // Improved Devouring Plague health leech
+                else if (m_spellInfo->Id == 63675)
+                {
+                    int32 heal = damage * 15 / 100;
+                    m_caster->CastCustomSpell(m_caster, 75999, &heal, NULL, NULL, true);
+                }
                 break;
             }
             case SPELLFAMILY_DRUID:
             {
                 // Ferocious Bite
-                if (m_caster->GetTypeId()==TYPEID_PLAYER && (m_spellInfo->SpellFamilyFlags & UI64LIT(0x000800000)) && m_spellInfo->SpellVisual[0]==6587)
+                if (m_caster->GetTypeId()==TYPEID_PLAYER && m_spellInfo->GetSpellFamilyFlags().test<CF_DRUID_RIP_BITE>() && m_spellInfo->GetSpellVisual()==6587)
                 {
                     // converts up to 30 points of energy into ($f1+$AP/410) additional damage
                     float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK);
                     float multiple = ap / 410 + m_spellInfo->DmgMultiplier[effect_idx];
-                    damage += int32(((Player*)m_caster)->GetComboPoints() * ap * 7 / 100);
+                    damage += int32(m_caster->GetComboPoints() * ap * 7 / 100);
                     uint32 energy = m_caster->GetPower(POWER_ENERGY);
                     uint32 used_energy = energy > 30 ? 30 : energy;
                     damage += int32(used_energy * multiple);
                     m_caster->SetPower(POWER_ENERGY,energy-used_energy);
                 }
                 // Rake
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000001000) && m_spellInfo->Effect[EFFECT_INDEX_2] == SPELL_EFFECT_ADD_COMBO_POINTS)
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_DRUID_RAKE_CLAW>() && m_spellInfo->Effect[EFFECT_INDEX_2] == SPELL_EFFECT_ADD_COMBO_POINTS)
                 {
                     // $AP*0.01 bonus
                     damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100);
                 }
                 // Swipe
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0010000000000000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_DRUID_SWIPE>())
                 {
                     damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.08f);
                 }
@@ -581,21 +1054,21 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
             case SPELLFAMILY_ROGUE:
             {
                 // Envenom
-                if (m_caster->GetTypeId()==TYPEID_PLAYER && (m_spellInfo->SpellFamilyFlags & UI64LIT(0x800000000)))
+                if (m_caster->GetTypeId()==TYPEID_PLAYER && m_spellInfo->GetSpellFamilyFlags().test<CF_ROGUE_ENVENOM>())
                 {
                     // consume from stack dozes not more that have combo-points
-                    if(uint32 combo = ((Player*)m_caster)->GetComboPoints())
+                    if (uint32 combo = m_caster->GetComboPoints())
                     {
-                        Aura *poison = 0;
+                        Aura const* poison = NULL;
                         // Lookup for Deadly poison (only attacker applied)
                         Unit::AuraList const& auras = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE);
                         for(Unit::AuraList::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
                         {
                             if ((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_ROGUE &&
-                                ((*itr)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x10000)) &&
+                                (*itr)->GetSpellProto()->GetSpellFamilyFlags().test<CF_ROGUE_DEADLY_POISON>() &&
                                 (*itr)->GetCasterGuid() == m_caster->GetObjectGuid())
                             {
-                                poison = *itr;
+                                poison = (*itr)();
                                 break;
                             }
                         }
@@ -612,7 +1085,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                             Unit::AuraList const& auraList = ((Player*)m_caster)->GetAurasByType(SPELL_AURA_MOD_DURATION_OF_EFFECTS_BY_DISPEL);
                             for(Unit::AuraList::const_iterator iter = auraList.begin(); iter!=auraList.end(); ++iter)
                             {
-                                if ((*iter)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_ROGUE && (*iter)->GetSpellProto()->SpellIconID == 1960)
+                                if ((*iter)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_ROGUE && (*iter)->GetSpellProto()->GetSpellIconID() == 1960)
                                 {
                                     if (int32 chance = (*iter)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_2))
                                         if (roll_chance_i(chance))
@@ -630,37 +1103,64 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                         }
                         // Eviscerate and Envenom Bonus Damage (item set effect)
                         if (m_caster->GetDummyAura(37169))
-                            damage += ((Player*)m_caster)->GetComboPoints()*40;
+                            damage += m_caster->GetComboPoints()*40;
                     }
                 }
                 // Eviscerate
-                else if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x00020000)) && m_caster->GetTypeId()==TYPEID_PLAYER)
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_ROGUE_EVISCERATE>() && m_caster->GetTypeId()==TYPEID_PLAYER)
                 {
-                    if(uint32 combo = ((Player*)m_caster)->GetComboPoints())
+                    if (uint32 combo = m_caster->GetComboPoints())
                     {
                         float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK);
                         damage += irand(int32(ap * combo * 0.03f), int32(ap * combo * 0.07f));
 
                         // Eviscerate and Envenom Bonus Damage (item set effect)
-                        if(m_caster->GetDummyAura(37169))
+                        if (m_caster->GetDummyAura(37169))
                             damage += combo*40;
+
+                        // Apply spell mods
+                        if (Player* modOwner = m_caster->GetSpellModOwner())
+                            modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DAMAGE, damage);
                     }
                 }
+                // Thrash (Raise ally ghoul spell)
+                else if (m_spellInfo->Id == 47480)
+                {
+                    if (Aura* aura = m_caster->GetAura(62218, EFFECT_INDEX_0))
+                    {
+                        if (aura->GetStackAmount() > 0)
+                            damage += m_caster->GetTotalAttackPowerValue(BASE_ATTACK) *
+                                     m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_0)/100 +
+                                     m_caster->GetTotalAttackPowerValue(BASE_ATTACK) /10 *
+                                     aura->GetStackAmount();
+                        m_caster->RemoveAurasDueToSpell(62218);
+
+                        if (Unit* owner = m_caster->GetCharmerOrOwner())
+                           owner->RemoveAurasDueToSpell(62218);
+                    }
+                    else
+                        damage += m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_0)/100;
+                }
                 break;
             }
             case SPELLFAMILY_HUNTER:
             {
                 //Gore
-                if (m_spellInfo->SpellIconID == 1578)
+                if (m_spellInfo->GetSpellIconID() == 1578)
                 {
                     if (m_caster->HasAura(57627))           // Charge 6 sec post-affect
                         damage *= 2;
                 }
                 // Steady Shot
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x100000000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_HUNTER_STEADY_SHOT>())
                 {
                     int32 base = irand((int32)m_caster->GetWeaponDamageRange(RANGED_ATTACK, MINDAMAGE),(int32)m_caster->GetWeaponDamageRange(RANGED_ATTACK, MAXDAMAGE));
-                    damage += int32(float(base)/m_caster->GetAttackTime(RANGED_ATTACK)*2800 + m_caster->GetTotalAttackPowerValue(RANGED_ATTACK)*0.1f);
+                    float ap = m_caster->GetTotalAttackPowerValue(RANGED_ATTACK);
+                    ap += unitTarget->GetTotalAuraModifier(SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS);
+                    ap += m_caster->GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_RANGED_ATTACK_POWER_VERSUS, unitTarget->GetCreatureTypeMask());
+                    if (m_caster->GetTypeId()==TYPEID_PLAYER)
+                        base += ((Player*)m_caster)->GetAmmoDPS();
+                    damage += int32(float(base)/m_caster->GetAttackTime(RANGED_ATTACK)*2800 + ap*0.1f);
                 }
                 break;
             }
@@ -676,7 +1176,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                     damage += int32(ap * 0.2f) + int32(holy * 32 / 100);
                 }
                 // Judgement of Vengeance/Corruption ${1+0.22*$SPH+0.14*$AP} + 10% for each application of Holy Vengeance/Blood Corruption on the target
-                else if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x800000000)) && m_spellInfo->SpellIconID==2292)
+                else if ((m_spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_JUDGEMENT_OF_CORRUPT_VENG>()) && m_spellInfo->GetSpellIconID()==2292)
                 {
                     uint32 debuf_id;
                     switch(m_spellInfo->Id)
@@ -703,11 +1203,11 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                         }
                     }
                     // + 10% for each application of Holy Vengeance on the target
-                    if(stacks)
+                    if (stacks)
                         damage += damage * stacks * 10 /100;
                 }
                 // Avenger's Shield ($m1+0.07*$SPH+0.07*$AP) - ranged sdb for future
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000004000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_AVENGERS_SHIELD>())
                 {
                     float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK);
                     int32 holy = m_caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(m_spellInfo));
@@ -716,7 +1216,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                     damage += int32(ap * 0.07f) + int32(holy * 7 / 100);
                 }
                 // Hammer of Wrath ($m1+0.15*$SPH+0.15*$AP) - ranged type sdb future fix
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000008000000000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_HAMMER_OF_WRATH>())
                 {
                     float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK);
                     int32 holy = m_caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(m_spellInfo));
@@ -725,7 +1225,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                     damage += int32(ap * 0.15f) + int32(holy * 15 / 100);
                 }
                 // Hammer of the Righteous
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0004000000000000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_HAMMER_OF_THE_RIGHTEOUS>())
                 {
                     // Add main hand dps * effect[2] amount
                     float average = (m_caster->GetFloatValue(UNIT_FIELD_MINDAMAGE) + m_caster->GetFloatValue(UNIT_FIELD_MAXDAMAGE)) / 2;
@@ -733,21 +1233,38 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
                     damage += count * int32(average * IN_MILLISECONDS) / m_caster->GetAttackTime(BASE_ATTACK);
                 }
                 // Shield of Righteousness
-                else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0010000000000000))
+                else if (m_spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_SHIELD_OF_RIGHTEOUSNESS>())
                 {
-                    damage+=int32(m_caster->GetShieldBlockValue());
+                    // limited max cap of Block Value
+                    int32 iCurrentBlockValue = m_caster->GetShieldBlockValue();
+                    int32 iCurrentBlockValueCap = int32(34.5f * m_caster->getLevel());
+                    damage += (iCurrentBlockValue > iCurrentBlockValueCap ? iCurrentBlockValueCap : iCurrentBlockValue);
                 }
                 // Judgement
                 else if (m_spellInfo->Id == 54158)
                 {
-                    // [1 + 0.25 * SPH + 0.16 * AP]
-                    damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.16f);
+                    // [1 + 0.27 * SPH + 0.175 * AP]
+                    float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK);
+                    int32 holy = m_caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(m_spellInfo));
+                    if (holy < 0)
+                        holy = 0;
+                    damage += int32(ap * 0.175f) + int32(holy * 27 / 100);
+                }
+                break;
+            }
+            case SPELLFAMILY_DEATHKNIGHT:
+            {
+                // Blood Boil - bonus for diseased targets
+                if (m_spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_BLOOD_BOIL>() && unitTarget->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DEATHKNIGHT, CF_DEATHKNIGHT_FF_BP_ACTIVE>(m_caster->GetObjectGuid()))
+                {
+                    damage += damage / 2;
+                    damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)* 0.035f);
                 }
                 break;
             }
         }
 
-        if(damage >= 0)
+        if (damage >= 0)
             m_damage += damage;
     }
 }
@@ -766,7 +1283,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
             {
                 case 3360:                                  // Curse of the Eye
                 {
-                    if(!unitTarget)
+                    if (!unitTarget)
                         return;
 
                     uint32 spell_id = (unitTarget->getGender() == GENDER_MALE) ? 10651: 10653;
@@ -783,6 +1300,27 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     unitTarget->CastSpell(unitTarget, 24085, true);
                     return;
                 }
+                case 7769:                                  // Strafe Jotunheim Building
+                {
+                    Unit* pCaster = GetCaster();
+                    if (!pCaster)
+                        return;
+
+                    Creature* pBuilding = pCaster->GetClosestCreatureWithEntry(pCaster, 30599, 50.0f);
+                    if (!pBuilding)
+                        return;
+
+                    if (pBuilding->HasAura(7448))           // Do not give credit for already burning buildings
+                        return;
+
+                    Player* pPlayer = pCaster->GetCharmerOrOwnerPlayerOrPlayerItself();
+                    if (!pPlayer)
+                        return;
+
+                    pPlayer->KilledMonsterCredit(30576);
+                    pBuilding->CastSpell(pBuilding, 7448, true);
+                    return;
+                }
                 case 8063:                                  // Deviate Fish
                 {
                     if (m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -854,7 +1392,19 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     else                                    // normal root
                         spell_id = 13099;
 
-                    m_caster->CastSpell(unitTarget,spell_id,true,NULL);
+                    m_caster->CastSpell(unitTarget, spell_id, true);
+                    return;
+                }
+                case 13280:                                 // Gnomish Death Ray
+                {
+                    if (!unitTarget)
+                        return;
+
+                    if (roll_chance_i(15))
+                        m_caster->CastSpell(m_caster, 13493, true);
+                    else
+                        m_caster->CastSpell(unitTarget, 13279, true);
+
                     return;
                 }
                 case 13567:                                 // Dummy Trigger
@@ -933,6 +1483,26 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->CastSpell(m_caster, spell_id, true, NULL);
                     return;
                 }
+                case 17009:                                 // Voodoo
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    uint32 spell_id = 0;
+                    switch (urand(0, 6))
+                    {
+                        case 0: spell_id = 16707; break;    // Hex
+                        case 1: spell_id = 16708; break;    // Hex
+                        case 2: spell_id = 16709; break;    // Hex
+                        case 3: spell_id = 16711; break;    // Grow
+                        case 4: spell_id = 16712; break;    // Special Brew
+                        case 5: spell_id = 16713; break;    // Ghostly
+                        case 6: spell_id = 16716; break;    // Launch
+                    }
+
+                    m_caster->CastSpell(unitTarget, spell_id, true, NULL, NULL, m_originalCasterGuid, m_spellInfo);
+                    return;
+                }
                 case 17251:                                 // Spirit Healer Res
                 {
                     if (!unitTarget)
@@ -1008,7 +1578,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     DEBUG_LOG("Gameobject, create custom in SpellEffects.cpp EffectDummy");
 
                     // Expect created without owner, but with level from _template
-                    pGameObj->SetRespawnTime(MINUTE/2);
+                    pGameObj->SetRespawnTime(MINUTE / 2);
                     pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, pGameObj->GetGOInfo()->trap.level);
                     pGameObj->SetSpellId(m_spellInfo->Id);
 
@@ -1016,14 +1586,33 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                     return;
                 }
+                case 19869:                                 // Dragon Orb
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || unitTarget->HasAura(23958))
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 19832, true);
+                    return;
+                }
+                case 20037:                                 // Explode Orb Effect
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 20038, true);
+                    return;
+                }
                 case 20577:                                 // Cannibalize
                 {
-                    if (unitTarget)
-                        m_caster->CastSpell(m_caster, 20578, false, NULL);
+                    if (!unitTarget)
+                        return;
 
+                    finish(false);
+                    m_caster->CastSpell(m_caster, 20578, false, NULL);
                     return;
                 }
-                case 21147:                                 // Arcane Vacuum
+                case 21147:                                 // Arcane Vacuum (Azuregos)
+                case 58694:                                 // Arcane Vacuum (Cyanigosa)
                 {
                     if (!unitTarget)
                         return;
@@ -1167,6 +1756,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     float flyspeed = m_caster->GetSpeedRate(MOVE_FLIGHT);
                     float speed = m_caster->GetSpeedRate(MOVE_RUN);
 
+                    m_caster->Unmount(true);
                     m_caster->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
 
                     //5 different spells used depending on mounted speed and if mount can fly or not
@@ -1199,6 +1789,23 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                     return;
                 }
+                case 28089:                                 // Polarity Shift (Thaddius - Naxxramas)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // neutralize the target
+                    if (unitTarget->HasAura(28059)) unitTarget->RemoveAurasDueToSpell(28059);
+                    if (unitTarget->HasAura(29659)) unitTarget->RemoveAurasDueToSpell(29659);
+                    if (unitTarget->HasAura(28084)) unitTarget->RemoveAurasDueToSpell(28084);
+                    if (unitTarget->HasAura(29660)) unitTarget->RemoveAurasDueToSpell(29660);
+
+                    unitTarget->CastSpell(unitTarget, roll_chance_i(50) ? 28059 : 28084, true, 0, 0, m_caster->GetObjectGuid());
+                    break;
+                }
                 case 29126:                                 // Cleansing Flames (Darnassus)
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
@@ -1239,9 +1846,41 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                     return;
                 }
-                case 30458:                                 // Nigh Invulnerability
+                case 29969:                                 // Summon Blizzard
                 {
-                    if (!m_CastItem)
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 29952, true, NULL, NULL, m_caster->GetObjectGuid());
+                    return;
+                }
+                case 29970:                                 // Deactivate Blizzard (Naxxramas: Sapphiron)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->RemoveAurasDueToSpell(29952);
+                    return;
+                }
+                case 29979:                                 // Massive Magnetic Pull
+                {
+                    if (!unitTarget)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, 30010, true);
+                    return;
+                }
+                case 30004:                                 // Flame Wreath
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, 29946, true);
+                    return;
+                }
+                case 30458:                                 // Nigh Invulnerability
+                {
+                    if (!m_CastItem)
                         return;
 
                     if (roll_chance_i(86))                  // Nigh-Invulnerability   - success
@@ -1264,6 +1903,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     return;
                 }
                 case 32146:                                 // Liquid Fire
+                case 45474:                                 // Ragefist's Torch
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
@@ -1280,6 +1920,16 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     unitTarget->CastSpell(unitTarget, unitTarget->GetMap()->IsRegularDifficulty() ? 32302 : 38382, true);
                     return;
                 }
+                case 32312:                                 // Move 1 (Chess event AI short distance move)
+                case 37388:                                 // Move 2 (Chess event AI long distance move)
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    // cast generic move spell
+                    m_caster->CastSpell(unitTarget, 30012, true);
+                    return;
+                }
                 case 33060:                                 // Make a Wish
                 {
                     if (m_caster->GetTypeId()!=TYPEID_PLAYER)
@@ -1299,6 +1949,60 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->CastSpell(m_caster, spell_id, true, NULL);
                     return;
                 }
+                case 34803:                                 // Summon Reinforcements
+                {
+                    m_caster->CastSpell(m_caster, 34810, true); // Summon 20083 behind of the caster
+                    m_caster->CastSpell(m_caster, 34817, true); // Summon 20078 right of the caster
+                    m_caster->CastSpell(m_caster, 34818, true); // Summon 20078 left of the caster
+                    m_caster->CastSpell(m_caster, 34819, true); // Summon 20078 front of the caster
+                    return;
+                }
+                case 36677:                                 // Chaos Breath
+                {
+                    if (!unitTarget)
+                        return;
+
+                    uint32 possibleSpells[] = {36693, 36694, 36695, 36696, 36697, 36698, 36699, 36700} ;
+                    std::vector<uint32> spellPool(possibleSpells, possibleSpells + countof(possibleSpells));
+                    std::random_shuffle(spellPool.begin(), spellPool.end());
+
+                    for (uint8 i = 0; i < (m_caster->GetMap()->IsRegularDifficulty() ? 2 : 4); ++i)
+                        m_caster->CastSpell(m_caster, spellPool[i], true);
+
+                    return;
+                }
+                case 33923:                                 // Sonic Boom
+                case 38796:                                 // Sonic Boom (heroic)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->Id == 33923 ? 33666 : 38795, true);
+                    return;
+                }
+                case 34665:                                 // Administer Antidote
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    uint32 health = unitTarget->GetHealth();
+
+                    float x, y, z, o;
+                    unitTarget->GetPosition(x, y, z);
+                    o = unitTarget->GetOrientation();
+
+                    ((Creature*)unitTarget)->ForcedDespawn();
+
+                    if (Creature* pSummon = m_caster->SummonCreature(16992, x, y, z, o, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000))
+                    {
+                        pSummon->SetHealth(health);
+                        ((Player*)m_caster)->RewardPlayerAndGroupAtEvent(16992, pSummon);
+
+                        if (pSummon->AI())
+                            pSummon->AI()->AttackStart(m_caster);
+                    }
+                    return;
+                }
                 case 35745:                                 // Socrethar's Stone
                 {
                     uint32 spell_id;
@@ -1312,6 +2016,14 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->CastSpell(m_caster, spell_id, true);
                     return;
                 }
+                case 37473:                                 // Detect Whispers (related to quest 10607 - Whispers of the Raven God_Whispers of the Raven God)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, damage, true);
+                    break;
+                }
                 case 37674:                                 // Chaos Blast
                 {
                     if (!unitTarget)
@@ -1335,11 +2047,37 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     ((Creature*)unitTarget)->ForcedDespawn(10000);
                     return;
                 }
+                case 39635:                                 // Throw Glaive (first)
+                case 39849:                                 // Throw Glaive (second)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 41466, true, NULL, NULL, m_caster->GetObjectGuid());
+                    return;
+                }
+                case 39992:                                 // High Warlord Naj'entus: Needle Spine Targeting
+                {
+                    if (!unitTarget)
+                        return;
+
+                    // TODO - Cone Targeting; along wowwiki this spell should target "three random targets in a cone"
+                    m_caster->CastSpell(unitTarget, 39835, true);
+                    return;
+                }
+                case 40109:                                 // Knockdown Fel Cannon: The Bolt
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 40075, true);
+                    return;
+                }
                 case 40802:                                 // Mingo's Fortune Generator (Mingo's Fortune Giblets)
                 {
                     // selecting one from Bloodstained Fortune item
                     uint32 newitemid;
-                    switch(urand(1, 20))
+                    switch (urand(1, 20))
                     {
                         case 1:  newitemid = 32688; break;
                         case 2:  newitemid = 32689; break;
@@ -1368,6 +2106,22 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     DoCreateItem(eff_idx, newitemid);
                     return;
                 }
+                case 40834:                                 // Agonizing Flames
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, 40932, true);
+                    return;
+                }
+                case 40869:                                 // Fatal Attraction
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, 41001, true);
+                    return;
+                }
                 case 40962:                                 // Blade's Edge Terrace Demon Boss Summon Branch
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
@@ -1384,6 +2138,24 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     unitTarget->CastSpell(unitTarget, spell_id, true);
                     return;
                 }
+                case 41283:                                 // Abyssal Toss
+                {
+                    if (!unitTarget)
+                        return;
+
+                    m_caster->SummonCreature(23416, unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
+                    return;
+                }
+                case 41333:                                 // Empyreal Equivalency
+                {
+                    if (!unitTarget)
+                        return;
+
+                    // Equilize the health of all targets based on the corresponding health percent
+                    float health_diff = (float)unitTarget->GetMaxHealth() / (float)m_caster->GetMaxHealth();
+                    unitTarget->SetHealth(m_caster->GetHealth() * health_diff);
+                    return;
+                }
                 case 42287:                                 // Salvage Wreckage
                 {
                     if (m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -1393,7 +2165,43 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                         m_caster->CastSpell(m_caster, 42289, true, m_CastItem);
                     else
                         m_caster->CastSpell(m_caster, 42288, true);
+                    return;
+                }
+                case 42339:                                 // Bucket Lands
+                {
+                     // remove aura Has Bucket from caster
+                   m_caster->RemoveAurasDueToSpell(42336);
+                    if (!unitTarget)
+                        return;
+                    // if target has aura Has Bucket do nothing
+                    if (unitTarget->HasAura(42336))
+                         return;
+
+                    // apply aura Has Bucket
+                    unitTarget->CastSpell(unitTarget, 42336, true);
+                    // create new bucket for target
+                    m_caster->CastSpell(unitTarget, 42349, true);
+                    return;
+
+                }
+                case 42628:                                 // Fire Bomb (throw)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 42629, true);
+                    return;
+                }
+                case 42631:                                 // Fire Bomb (explode)
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    unitTarget->RemoveAurasDueToSpell(42629);
+                    unitTarget->CastSpell(unitTarget, 42630, true);
 
+                    // despawn the bomb after exploding
+                    ((Creature*)unitTarget)->ForcedDespawn(3000);
                     return;
                 }
                 case 42793:                                 // Burn Body
@@ -1417,12 +2225,23 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     ((Player*)m_caster)->KilledMonster(pCreature->GetCreatureInfo(), pCreature->GetObjectGuid());
                     return;
                 }
-                case 43014:                                 // Despawn Self
+                case 43014:                                  // Despawn Self
+                {                                           // used by ACID event to run away and despawn
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    ((Creature*)unitTarget)->ForcedDespawn(2000);
+                    float x, y, z;
+                    unitTarget->GetClosePoint(x, y, z, unitTarget->GetObjectBoundingRadius(), 10.0f, unitTarget->GetOrientation());
+                    unitTarget->MonsterMoveWithSpeed(x, y, z, 28.0f);
+                    return;
+                }
+                case 43106:                                 // Brave's Flare Effect
                 {
-                    if (m_caster->GetTypeId() != TYPEID_UNIT)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    ((Creature*)m_caster)->ForcedDespawn();
+                    ((Player*)m_caster)->KilledMonsterCredit(((Creature*)unitTarget)->GetEntry());
                     return;
                 }
                 case 43036:                                 // Dismembering Corpse
@@ -1443,6 +2262,52 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->CastSpell(m_caster, 43072, true);
                     return;
                 }
+                case 43096:                                 // Summon All Players
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, 43097, true);
+                    return;
+                }
+                case 43144:                                 // Hatch All Eggs
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 42493, true, NULL, NULL, m_caster->GetObjectGuid());
+                    return;
+                }
+                case 43152:                                 // Lynx Rush
+                {
+                    if (!unitTarget || m_caster->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    // Rush 9 targets in a row
+                    for (uint8 i = 0; i < 9; ++i)
+                    {
+                        if (Unit* target = ((Creature*)m_caster)->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                            m_caster->CastSpell(target, 43153, true);
+                    }
+                    return;
+                }
+                case 43178:                                 // Plant Forsaken Banner
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    uint32 entry;
+                    switch (((Creature*)unitTarget)->GetEntry())
+                    {
+                        case 24161: entry = 24166; break; // Oric the Baleful
+                        case 24016: entry = 24165; break; // Ulf the Bloodletter
+                        case 24162: entry = 24167; break; // Gunnar Thorvardsson
+                        default: return;
+                    }
+
+                    ((Player*)m_caster)->KilledMonsterCredit(entry);
+                    return;
+                }
                 case 43209:                                 // Place Ram Meat
                 {
                     if (!unitTarget)
@@ -1493,7 +2358,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     if (m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    ((Player*)m_caster)->CastSpell(unitTarget, 43753, true, m_CastItem, NULL, m_originalCasterGUID, m_spellInfo);
+                    ((Player*)m_caster)->CastSpell(unitTarget, 43753, true, m_CastItem, NULL, m_originalCasterGuid, m_spellInfo);
                     return;
                 }
                 case 43882:                                 // Scourging Crystal Controller Dummy
@@ -1513,21 +2378,6 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->CastSpell(unitTarget, 44455, true, m_CastItem);
                     return;
                 }
-                case 44845:                                 // Spectral Realm
-                {
-                    if (!unitTarget)
-                        return;
-
-                    // teleport all targets which have the spectral realm aura
-                    if (unitTarget->HasAura(46021))
-                    {
-                        unitTarget->RemoveAurasDueToSpell(46021);
-                        unitTarget->CastSpell(unitTarget, 46020, true);
-                        unitTarget->CastSpell(unitTarget, 44867, true);
-                    }
-
-                    return;
-                }
                 case 44869:                                 // Spectral Blast
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
@@ -1558,7 +2408,14 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                 }
                 case 44997:                                 // Converting Sentry
                 {
-                    //Converted Sentry Credit
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    Creature* creatureTarget = (Creature*)unitTarget;
+
+                    creatureTarget->ForcedDespawn(500);
+
+                    // Converted Sentry Credit
                     m_caster->CastSpell(m_caster, 45009, true);
                     return;
                 }
@@ -1578,13 +2435,42 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     }
                     //Spawn
                     m_caster->CastSpell(m_caster, spellId, true);
-                    
+
                     if (!unitTarget) return;
                     //Arcane Prisoner Kill Credit
                     unitTarget->CastSpell(m_caster, 45456, true);
-
                     break;
                 }
+                case 45277:                                 // Throw Torch
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 45276, true, m_CastItem, NULL, m_originalCasterGuid);
+
+                    if (unitTarget->GetTypeId() == TYPEID_PLAYER && unitTarget->GetZoneId() == 4395)
+                        unitTarget->CastSpell(unitTarget, 45280, true);
+
+                    return;
+                }
+                case 45536:                                // Complete Ancestor Ritual, KillCredit for (Q:11610)
+                {
+                    if (!gameObjTarget || m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    uint32 killCredit;
+                    switch (gameObjTarget->GetEntry())
+                    {
+                        case 191088: killCredit = 25397; break;
+                        case 191089: killCredit = 25398; break;
+                        case 191090: killCredit = 25399; break;
+                        default:
+                            return;
+                    }
+
+                    ((Player*)m_caster)->KilledMonsterCredit(killCredit);
+                    return;
+                }
                 case 45583:                                 // Throw Gnomish Grenade
                 {
                     if (!unitTarget || m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -1597,7 +2483,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     // big fire
                     GameObject* pGo = NULL;
 
-                    float fMaxDist = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex));
+                    float fMaxDist = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex()));
 
                     MaNGOS::NearestGameObjectEntryInPosRangeCheck go_check_big(*unitTarget, 187675, unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), fMaxDist);
                     MaNGOS::GameObjectSearcher<MaNGOS::NearestGameObjectEntryInPosRangeCheck> checker1(pGo, go_check_big);
@@ -1638,6 +2524,36 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->RemoveAurasDueToSpell(45683);
                     return;
                 }
+                case 45692:                                 // Use Tuskarr Torch (for Quest: Burn in Effigy)
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    // let them burn! niah! (flame spell could be wrong one, anyway visual effect is correct)
+                    unitTarget->CastSpell(unitTarget, 64561, true);
+                    ((Creature*)unitTarget)->ForcedDespawn(15000);
+                    return;
+                }
+                case 45780:                                 // Use Tuskarr Torch (for Quest: Burn in Effigy)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    if (Unit* pCaster = GetCaster())
+                    {
+                       if (Creature* pCre = pCaster->GetClosestCreatureWithEntry(pCaster, 25584, 50.0f))
+                       {
+                           pCaster->DealDamage(pCre, pCre->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                           pCre->GetMotionMaster()->MoveFall();
+                       }
+                    }
+                    return;
+                }
+                case 45819:                                 // Throw Torch
+                {
+                    m_caster->CastSpell(m_targets.getDestination(), 45277, true, m_CastItem, NULL, m_originalCasterGuid);
+                    return;
+                }
                 case 45958:                                 // Signal Alliance
                 {
                     m_caster->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
@@ -1683,13 +2599,14 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                 }
                 case 45990:                                 // Collect Oil
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    if (const SpellEntry *pSpell = sSpellStore.LookupEntry(45991))
+                    if (SpellEntry const* pSpell = sSpellStore.LookupEntry(45991))
                     {
                         unitTarget->CastSpell(unitTarget, pSpell, true);
                         ((Creature*)unitTarget)->ForcedDespawn(m_duration);
+                        ((Player*)m_caster)->KilledMonsterCredit(unitTarget->GetEntry(), unitTarget->GetObjectGuid());
                     }
 
                     return;
@@ -1702,6 +2619,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                 case 51961:                                 // Captured Chicken Cover
                 case 55364:                                 // Create Ghoul Drool Cover
                 case 61832:                                 // Rifle the Bodies: Create Magehunter Personal Effects Cover
+                case 63125:                                 // Search Maloric
                 case 74904:                                 // Pickup Sen'jin Frog
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -1709,7 +2627,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                     uint32 spellId = 0;
 
-                    switch(m_spellInfo->Id)
+                    switch (m_spellInfo->Id)
                     {
                         case 46167: spellId = 46773; break;
                         case 50918: spellId = 50919; break;
@@ -1719,17 +2637,18 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                         case 51961: spellId = 51037; break;
                         case 55364: spellId = 55363; break;
                         case 61832: spellId = 47096; break;
+                        case 63125: spellId = 63126; break;
                         case 74904: spellId = 74905; break;
                     }
 
-                    if (const SpellEntry *pSpell = sSpellStore.LookupEntry(spellId))
+                    if (SpellEntry const* pSpell = sSpellStore.LookupEntry(spellId))
                     {
                         unitTarget->CastSpell(m_caster, spellId, true);
 
                         Creature* creatureTarget = (Creature*)unitTarget;
 
-                        if (const SpellCastTimesEntry *pCastTime = sSpellCastTimesStore.LookupEntry(pSpell->CastingTimeIndex))
-                            creatureTarget->ForcedDespawn(pCastTime->CastTime + 1);
+                        if (const SpellCastTimesEntry* pCastTime = sSpellCastTimesStore.LookupEntry(pSpell->GetCastingTimeIndex()))
+                            creatureTarget->ForcedDespawn(pCastTime->CastTime < 0 ? 0 : pCastTime->CastTime + 1);
                     }
                     return;
                 }
@@ -1743,7 +2662,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     // look for gameobject within max spell range of unitTarget, and respawn if found
                     GameObject* pGo = NULL;
 
-                    float fMaxDist = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex));
+                    float fMaxDist = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex()));
 
                     MaNGOS::NearestGameObjectEntryInPosRangeCheck go_check(*unitTarget, 187675, unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), fMaxDist);
                     MaNGOS::GameObjectSearcher<MaNGOS::NearestGameObjectEntryInPosRangeCheck> checker(pGo, go_check);
@@ -1755,7 +2674,39 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                         pGo->SetRespawnTime(MINUTE/2);
                         pGo->Refresh();
                     }
+                    return;
+                }
+                case 46292:                                 // Cataclysm Breath
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    uint32 spellId = 0;
+
+                    switch (urand(0, 7))
+                    {
+                        case 0: spellId = 46293; break;     // Corrosive Poison
+                        case 1: spellId = 46294; break;     // Fevered Fatigue
+                        case 2: spellId = 46295; break;     // Hex
+                        case 3: spellId = 46296; break;     // Necrotic Poison
+                        case 4: spellId = 46297; break;     // Piercing Shadow
+                        case 5: spellId = 46298; break;     // Shrink
+                        case 6: spellId = 46299; break;     // Wavering Will
+                        case 7: spellId = 46300; break;     // Withered Touch
+                        default:
+                            return;                         // Crazy :)
+                    }
+
+                    m_caster->CastSpell(m_caster, spellId, true);
+
+                    break;
+                }
+                case 46372:                                 // Ice Spear Target Picker
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
+                    m_caster->CastSpell(unitTarget, 46359, true);
                     return;
                 }
                 case 46485:                                 // Greatmother's Soulcatcher
@@ -1772,7 +2723,6 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                         ((Creature*)unitTarget)->ForcedDespawn();
                     }
-
                     return;
                 }
                 case 46606:                                 // Plague Canister Dummy
@@ -1827,6 +2777,17 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                     return;
                 }
+                case 47129:                                 // Totemic Beacon (Midsummer Fire Festival)
+                {
+                    if (eff_idx != EFFECT_INDEX_0)
+                        return;
+
+                    float fDestX, fDestY, fDestZ;
+                    m_caster->GetNearPoint(m_caster, fDestX, fDestY, fDestZ, m_caster->GetObjectBoundingRadius(), 30.0f, 0.0f);
+
+                    if (Creature* pWolf = m_caster->SummonCreature(25324, fDestX, fDestY, fDestZ, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 60000))
+                        pWolf->GetMotionMaster()->MoveFollow(m_caster, PET_FOLLOW_DIST, pWolf->GetAngle(m_caster));
+                }
                 case 47170:                                 // Impale Leviroth
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
@@ -1901,6 +2862,16 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                     return;
                 }
+                case 47670:                             // Awaken Gortok
+                {
+                    if (unitTarget && unitTarget->GetTypeId() == TYPEID_UNIT)
+                    {
+                        unitTarget->RemoveAurasDueToSpell(16245);
+                        unitTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        ((Creature*)unitTarget)->SetInCombatWithZone();
+                    }
+                    break;
+                }
                 case 48046:                                 // Use Camera
                 {
                     if (!unitTarget)
@@ -1913,9 +2884,22 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->CastSpell(m_caster, 48047, true, m_CastItem, NULL, unitTarget->GetObjectGuid());
                     return;
                 }
-                case 48790:                                 // Neltharion's Flame
+                case 48386:                                 // Ymiron Summon Fountain
                 {
-                    if (!unitTarget)
+                    m_caster->CastSpell(m_caster, 48385, true);
+                    return;
+                }
+                case 48593:                                 // Summon Avenging Spirit
+                {
+                    for (int i = 0; i < 4; ++i)
+                    {
+                        m_caster->CastSpell(m_caster, 48592, true);
+                    }
+                    return;
+                }
+                case 48790:                                 // Neltharion's Flame
+                {
+                    if (!unitTarget)
                         return;
 
                     // Neltharion's Flame Fire Bunny: Periodic Fire Aura
@@ -1953,6 +2937,12 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     }
                     return;
                 }
+                case 49625:                                 // Brave's Flare
+                {
+                    // Trigger Brave's Flare Effect (with EffectTarget)
+                    m_caster->CastSpell(m_caster, 43106, true);
+                    return;
+                }
                 case 49634:                                 // Sergeant's Flare
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
@@ -1975,7 +2965,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     {
                         const SpellEntry *pSpell = sSpellStore.LookupEntry(spellCredit[i]);
 
-                        if (pSpell->EffectMiscValue[EFFECT_INDEX_0] == unitTarget->GetEntry())
+                        if (pSpell->EffectMiscValue[EFFECT_INDEX_0] == (int32)unitTarget->GetEntry())
                         {
                             m_caster->CastSpell(m_caster, spellCredit[i], true);
                             break;
@@ -2096,7 +3086,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                     return;
                 }
-                case 51336:                                 // Magic Pull
+                case 51336:                                 // Drakos Magic Pull
                 {
                     if (!unitTarget)
                         return;
@@ -2104,6 +3094,14 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->CastSpell(unitTarget, 50770, true);
                     return;
                 }
+                case 51369:                                 // Tickbird Signal to Fall
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->KillSelf();
+                    return;
+                }
                 case 51420:                                 // Digging for Treasure Ping
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
@@ -2157,11 +3155,34 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     ((Creature*)unitTarget)->ForcedDespawn(5000);
                     return;
                 }
+                case 51858: // Siphon of Acherus
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                    return;
+
+                    static uint32 const spellCredit[4] =
+                    {
+                        51974,                              // Forge Credit
+                        51980,                              // Scarlet Hold Credit
+                        51977,                              // Town Hall Credit
+                        51982,                              // Chapel Credit
+                    };
+                    for (int i = 0; i < 4; ++i)
+                    {
+                        const SpellEntry *pSpell = sSpellStore.LookupEntry(spellCredit[i]);
+                        if (pSpell->EffectMiscValue[EFFECT_INDEX_0] == (int32)unitTarget->GetEntry())
+                        {
+                            m_caster->RemoveAurasDueToSpell(52006);   // Remove Stealth from Eye of Acherus upon cast
+                            m_caster->CastSpell(unitTarget, spellCredit[i], true);
+                            break;
+                        }
+                    }
+                    return;
+                }
                 case 51866:                                 // Kick Nass
                 {
                     // It is possible that Nass Heartbeat (spell id 61438) is involved in this
                     // If so, unclear how it should work and using the below instead (even though it could be a bit hack-ish)
-
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
                         return;
 
@@ -2169,32 +3190,24 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     if (m_caster != unitTarget->GetOwner())
                         return;
 
-                    // This means we already set state (see below) and need to wait.
-                    if (unitTarget->hasUnitState(UNIT_STAT_ROOT))
-                        return;
+                    m_caster->clearUnitState(UNIT_STAT_ROOT);
 
                     // Expecting pTargetDummy to be summoned by AI at death of target creatures.
+                    float fRange = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex()));
 
-                    Creature* pTargetDummy = NULL;
-                    float fRange = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex));
-
-                    MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*m_caster, 28523, true, false, fRange*2);
-                    MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(pTargetDummy, u_check);
-
-                    Cell::VisitGridObjects(m_caster, searcher, fRange*2);
-
+                    Creature* pTargetDummy = m_caster->GetClosestCreatureWithEntry(m_caster, 28523, fRange * 2.0f);
                     if (pTargetDummy)
                     {
-                        if (unitTarget->hasUnitState(UNIT_STAT_FOLLOW | UNIT_STAT_FOLLOW_MOVE))
-                            unitTarget->GetMotionMaster()->MovementExpired();
+                        // Set player's faction to Nass
+                        unitTarget->setFaction(m_caster->getFaction());
 
-                        unitTarget->MonsterMoveWithSpeed(pTargetDummy->GetPositionX(), pTargetDummy->GetPositionY(), pTargetDummy->GetPositionZ(), 24.f);
+                        unitTarget->MonsterMoveWithSpeed(pTargetDummy->GetPositionX(), pTargetDummy->GetPositionY(), pTargetDummy->GetPositionZ(), 24.0f);
 
                         // Add state to temporarily prevent follow
                         unitTarget->addUnitState(UNIT_STAT_ROOT);
 
                         // Collect Hair Sample
-                        unitTarget->CastSpell(pTargetDummy, 51870, true);
+                        unitTarget->CastSpell(unitTarget, 51870, true);
                     }
 
                     return;
@@ -2226,14 +3239,34 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                     return;
                 }
-                case 51858:                                 // Siphon of Acherus
+                case 52238:                                 // Volkhan Temper, Summon Golems
                 {
-                    if (!m_originalCaster || !unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                    if (!unitTarget)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, 52405, true);   // Summon Golem
+                    m_caster->CastSpell(m_caster, 52661, true);     // Summon Temper
+                    m_caster->CastSpell(unitTarget, 52654, false);  // Temper 2 Vokhan Deal Two Strike
+
+                    return;
+                }
+                case 52654:                                  // Volkhan Temper 2, Summon Golems
+                {
+                    if (!unitTarget)
                         return;
 
-                    if (Player* pPlayer = m_originalCaster->GetCharmerOrOwnerPlayerOrPlayerItself())
-                        pPlayer->KilledMonsterCredit(unitTarget->GetEntry(), unitTarget->GetObjectGuid());
+                    m_caster->CastSpell(unitTarget, 52405, true);   // Summon Golem
+                    m_caster->CastSpell(m_caster, 52661, true);     // Summon Temper
+
+                    return;
+                }
+                case 52429:                                 // Volkhan Golem Shattered
+                case 59527:
+                {
+                    if (m_caster->GetTypeId() != TYPEID_UNIT)
+                        return;
 
+                    ((Creature*)m_caster)->ForcedDespawn(500);
                     return;
                 }
                 case 52308:                                 // Take Sputum Sample
@@ -2249,8 +3282,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                                 m_caster->CastSpell(m_caster, spellID, true, NULL);
                             return;
                         }
-                        case EFFECT_INDEX_1:                // additional data for dummy[0]
-                        case EFFECT_INDEX_2:
+                        default:                            // additional data for dummy[0]
                             return;
                     }
                     return;
@@ -2267,7 +3299,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     // look for gameobjects within max spell range of unitTarget, and respawn if found
                     std::list<GameObject*> lList;
 
-                    float fMaxDist = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex));
+                    float fMaxDist = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex()));
 
                     MaNGOS::GameObjectEntryInPosRangeCheck go_check(*unitTarget, 182071, unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), fMaxDist);
                     MaNGOS::GameObjectListSearcher<MaNGOS::GameObjectEntryInPosRangeCheck> checker(lList, go_check);
@@ -2285,6 +3317,16 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                     return;
                 }
+                case 52748:                                 // Voracious Appetite
+                {
+                    if (!unitTarget)
+                        return;
+
+                    finish(false);
+                    CancelGlobalCooldown();
+                    m_caster->CastSpell(m_caster, 52749, false);
+                    return;
+                }
                 case 52759:                                 // Ancestral Awakening
                 {
                     if (!unitTarget)
@@ -2365,7 +3407,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     const uint32 spellShrink = 53805;
                     const uint32 spellTransf = 53806;
 
-                    if (SpellAuraHolder* holder = m_caster->GetSpellAuraHolder(spellShrink))
+                    if (SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(spellShrink))
                     {
                         // chance to become pygmified (5, 10, 15 etc)
                         if (roll_chance_i(holder->GetStackAmount() * 5))
@@ -2382,6 +3424,85 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->CastSpell(m_caster, spellShrink, true);
                     return;
                 }
+                case 54092:                                 // Monster Slayer's Kit
+                {
+                    if (!unitTarget)
+                        return;
+
+                    uint32 spellIds[] = {51853, 54063, 54071, 54086};
+                    m_caster->CastSpell(unitTarget, spellIds[urand(0, 3)], true);
+                    return;
+                }
+                case 54148:                                 // Svala - Ritual Of Sword
+                {
+                    unitTarget->CastSpell(unitTarget, 48267, true);    // Teleport Player
+                    unitTarget->CastSpell(unitTarget, 48271, true);    // Target Summon Banshee
+                    unitTarget->CastSpell(unitTarget, 48274, true);    // Target Summon Banshee
+                    unitTarget->CastSpell(unitTarget, 48275, true);    // Target Summon Banshee
+                    return;
+                }
+                case 54171:                                 //Divine Storm
+                {
+                    // split between targets
+                    int32 bp = damage / m_UniqueTargetInfo.size();
+                    m_caster->CastCustomSpell(unitTarget, 54172, &bp, NULL, NULL, true);
+                    return;
+                }
+                case 54245:                                 // Enough - Drakuru Overlord, Kill Trolls
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->KillSelf();
+                    return;
+                }
+                case 54250:                                 // Skull Missile - Drakuru Overlord
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 54253, true);    // Summon Skull
+                    return;
+                }
+                case 54209:                                 // Portal Missile - Drakuru Overlord
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 51807, true);    // Cast Portal Visual
+                    return;
+                }
+                case 54517:                                 // Magnetic Pull
+                {
+                    // Feugen casts on Stalagg
+                    if (m_caster->GetTypeId() != TYPEID_UNIT || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    if (m_caster->GetEntry() == 15930 && unitTarget->GetEntry() == 15929)
+                    {
+                        Unit* pFeugenVictim = m_caster->getVictim();
+                        Unit* pStalaggVictim = unitTarget->getVictim();
+
+                        if (pFeugenVictim && pStalaggVictim)
+                        {
+                            pStalaggVictim->CastSpell(m_caster, 54485, true);
+                            pFeugenVictim->CastSpell(unitTarget, 54485, true);
+
+                            // threat swap
+                            m_caster->AddThreat(pStalaggVictim, m_caster->getThreatManager().getThreat(pFeugenVictim));
+                            unitTarget->AddThreat(pFeugenVictim, m_caster->getThreatManager().getThreat(pStalaggVictim));
+                            m_caster->getThreatManager().modifyThreatPercent(pFeugenVictim, -101);
+                            unitTarget->getThreatManager().modifyThreatPercent(pStalaggVictim, -101);
+
+                            // stop moving for a moment
+                            m_caster->GetMotionMaster()->Clear();
+                            m_caster->GetMotionMaster()->MoveIdle();
+                            unitTarget->GetMotionMaster()->Clear();
+                            unitTarget->GetMotionMaster()->MoveIdle();
+                        }
+                    }
+                    return;
+                }
                 case 54577:                                 // Throw U.D.E.D.
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
@@ -2400,19 +3521,19 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     unitTarget->CastSpell(unitTarget, 54581, true, m_CastItem);
                     return;
                 }
-                case 54850:                                 // Emerge
-                {
-                    // Cast Emerge summon
-                    m_caster->CastSpell(m_caster, 54851, true);
-                    return;
-                }
-                case 54092:                                 // Monster Slayer's Kit
+/*                case 54850:                                 // Drakkari Colossus, Summon Elemental
                 {
                     if (!unitTarget)
                         return;
 
-                    uint32 spellIds[] = {51853, 54063, 54071, 54086};
-                    m_caster->CastSpell(unitTarget, spellIds[urand(0, 3)], true);
+                    unitTarget->CastSpell(unitTarget, 54851, true); // Summon Elemental
+                    unitTarget->CastSpell(unitTarget, 54852, true); // Stun
+                    return;
+                }*/
+                case 54850:                                 // Emerge
+                {
+                    // Cast Emerge summon
+                    m_caster->CastSpell(m_caster, 54851, true);
                     return;
                 }
                 case 55004:                                 // Nitro Boosts
@@ -2427,6 +3548,22 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                     return;
                 }
+                case 55804:                                 // Healing Finished (triggered by item spell Telluric Poultice)
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || unitTarget->isInCombat())
+                        return;
+
+                    Unit* pCaster = GetAffectiveCaster();
+                    if (!pCaster || pCaster->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    ((Creature*)unitTarget)->ForcedDespawn(30000);
+                    unitTarget->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_STAND);
+                    unitTarget->GetMotionMaster()->Clear();
+                    unitTarget->GetMotionMaster()->MoveFollow(pCaster, PET_FOLLOW_DIST, unitTarget->GetAngle(pCaster));
+                    ((Player*)pCaster)->KilledMonsterCredit(unitTarget->GetEntry(), unitTarget->GetObjectGuid());
+                    return;
+                }
                 case 55818:                                 // Hurl Boulder
                 {
                     // unclear how many summon min/max random, best guess below
@@ -2437,6 +3574,62 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
 
                     return;
                 }
+                case 55931:                                 // Conjure Flame Sphere
+                {
+                    float x, y, z;
+                    m_caster->GetPosition(x, y, z);
+                    if (m_caster->GetMap()->IsRegularDifficulty())
+                    {
+                        m_caster->CastSpell(x, y, z + 5.0f, 55895, true);
+                    }
+                    else
+                    {
+                        m_caster->CastSpell(x, y, z + 5.0f, 55895, true);
+                        m_caster->CastSpell(x, y, z + 5.0f, 59511, true);
+                        m_caster->CastSpell(x, y, z + 5.0f, 59512, true);
+                    }
+                    return;
+                }
+                case 56430:                                 // Arcane Bomb
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 56431, true, NULL, NULL, m_caster->GetObjectGuid());
+                    unitTarget->CastSpell(unitTarget, 56432, true, NULL, NULL, m_caster->GetObjectGuid());
+                    return;
+                }
+                case 57385:                                 // Argent Cannon
+                case 57412:                                 // Reckoning Bomb
+                {
+                    if (!unitTarget || gameObjTarget)
+                        return;
+
+                    SpellEntry const* spellInfo = sSpellStore.LookupEntry(m_spellInfo->CalculateSimpleValue(eff_idx));
+
+                    // Init dest coordinates
+                    WorldLocation loc = m_targets.getDestination();
+                    MaNGOS::NormalizeMapCoord(loc.x);
+                    MaNGOS::NormalizeMapCoord(loc.y);
+                    m_caster->UpdateGroundPositionZ(loc.x, loc.y, loc.z);
+
+                    m_caster->CastSpell(loc, spellInfo, false, NULL, NULL, m_originalCasterGuid);
+
+                    return;
+                }
+                case 57496:                                 // Volazj - Insanity
+                {
+                    m_caster->CastSpell(m_caster, 57561, true);
+                    return;
+                }
+                case 57578:                                 // Lava Strike
+                {
+                    if (!unitTarget)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
+                }
                 case 57908:                                 // Stain Cloth
                 {
                     // nothing do more
@@ -2448,6 +3641,11 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     ClearCastItem();
                     break;
                 }
+                case 57930:                                 // Arcane Lightning
+                {
+                    m_caster->CastSpell(m_caster, 57912, true);
+                    return;
+                }
                 case 58418:                                 // Portal to Orgrimmar
                 case 58420:                                 // Portal to Stormwind
                     return;                                 // implemented in EffectScript[0]
@@ -2457,6 +3655,16 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->RemoveSpellsCausingAura(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED);
                     return;
                 }
+                case 58689:                                 // Rock Shards (Vault of Archavon, Archavon)
+                {
+                    m_caster->CastSpell(m_targets.getDestination(), m_caster->GetMap()->IsRegularDifficulty() ? 58696 : 60884, true);
+                    return;
+                }
+                case 58692:                                 // Rock Shards (Vault of Archavon, Archavon)
+                {
+                    m_caster->CastSpell(m_targets.getDestination(), m_caster->GetMap()->IsRegularDifficulty() ? 58695 : 60883, true);
+                    return;
+                }
                 case 59640:                                 // Underbelly Elixir
                 {
                     if (m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -2473,6 +3681,11 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     m_caster->CastSpell(m_caster,spell_id,true,NULL);
                     return;
                 }
+                case 60038:                                 // Arcane Lightning
+                {
+                    m_caster->CastSpell(m_caster, 58152, true);
+                    return;
+                }
                 case 60932:                                 // Disengage (one from creature versions)
                 {
                     if (!unitTarget)
@@ -2498,5342 +3711,7775 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                     unitTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
                     return;
                 }
-                case 64385:                                 // Spinning (from Unusual Compass)
+                case 62278:                                 // Lightning Orb Charger
                 {
-                    m_caster->SetFacingTo(frand(0, M_PI_F*2));
+                    if (!unitTarget)
+                        return;
+                    unitTarget->CastSpell(m_caster, 62466, true);
+                    unitTarget->CastSpell(unitTarget, 62279, true);
                     return;
                 }
-                case 64981:                                 // Summon Random Vanquished Tentacle
+                case 62301:                                 // Cosmic Smash (Ulduar - Algalon)
+                case 64598:
                 {
-                    uint32 spell_id = 0;
+                  if (!unitTarget)
+                    return;
 
-                    switch(urand(0, 2))
-                    {
-                        case 0: spell_id = 64982; break;    // Summon Vanquished Crusher Tentacle
-                        case 1: spell_id = 64983; break;    // Summon Vanquished Constrictor Tentacle
-                        case 2: spell_id = 64984; break;    // Summon Vanquished Corruptor Tentacle
-                    }
+                  unitTarget->CastSpell(unitTarget, 62295, true);
+                  return;
+                }
+                case 62652:                                 // Tidal Wave
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-                    m_caster->CastSpell(m_caster, spell_id, true);
+                    m_caster->CastSpell(unitTarget, m_caster->GetMap()->IsRegularDifficulty() ? 62653 : 62935, true);
                     return;
                 }
-                case 66390:                                 // Read Last Rites
+                case 62653:                                 // Tidal Wave
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->GetTypeId() != TYPEID_PLAYER)
+                     if (!unitTarget)
                         return;
 
-                    // Summon Tualiq Proxy
-                    // Not known what purpose this has
-                    unitTarget->CastSpell(unitTarget, 66411, true);
-
-                    // Summon Tualiq Spirit
-                    // Offtopic note: the summoned has aura from spell 37119 and 66419. One of them should
-                    // most likely make summoned "rise", hover up/sideways in the air (MOVEFLAG_LEVITATING + MOVEFLAG_HOVER)
-                    unitTarget->CastSpell(unitTarget, 66412, true);
-
-                    ((Player*)m_caster)->KilledMonsterCredit(unitTarget->GetEntry(), unitTarget->GetObjectGuid());
+                     m_caster->CastSpell(unitTarget, 62654, true);
+                     return;
+                }
+                case 62797:                                 // Storm Cloud
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-                    // Must have a delay for proper spell animation
-                    ((Creature*)unitTarget)->ForcedDespawn(1000);
+                    m_caster->CastSpell(unitTarget, m_caster->GetMap()->IsRegularDifficulty() ? 65123 : 65133, true);
                     return;
                 }
-                case 67019:                                 // Flask of the North
+                case 62907:                                 // Freya's Ward
                 {
-                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget)
                         return;
 
-                    uint32 spell_id = 0;
-                    switch(m_caster->getClass())
-                    {
-                        case CLASS_WARRIOR:
-                        case CLASS_DEATH_KNIGHT:
-                            spell_id = 67018;               // STR for Warriors, Death Knights
-                            break;
-                        case CLASS_ROGUE:
-                        case CLASS_HUNTER:
-                            spell_id = 67017;               // AP for Rogues, Hunters
-                            break;
-                        case CLASS_PRIEST:
-                        case CLASS_MAGE:
-                        case CLASS_WARLOCK:
-                            spell_id = 67016;               // SPD for Priests, Mages, Warlocks
-                            break;
-                        case CLASS_SHAMAN:
-                            // random (SPD, AP)
-                            spell_id = roll_chance_i(50) ? 67016 : 67017;
-                            break;
-                        case CLASS_PALADIN:
-                        case CLASS_DRUID:
-                        default:
-                            // random (SPD, STR)
-                            spell_id = roll_chance_i(50) ? 67016 : 67018;
-                            break;
-                    }
-                    m_caster->CastSpell(m_caster, spell_id, true);
+                    for (uint8 i = 0; i < 5; ++i)
+                        m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
                     return;
                 }
-                case 69922:                                 // Temper Quel'Delar
+                case 62935:                                 // Tidal Wave (H)
+                {
+                   if (!unitTarget)
+                      return;
+
+                   m_caster->CastSpell(unitTarget, 62936, true);
+                   return;
+                }
+                case 63499:                                 // Dispel Magic
                 {
                     if (!unitTarget)
                         return;
 
-                    // Return Tempered Quel'Delar
-                    unitTarget->CastSpell(m_caster, 69956, true);
+                    unitTarget->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(eff_idx));
                     return;
                 }
-            }
-            break;
-        }
-        case SPELLFAMILY_MAGE:
-        {
-            switch(m_spellInfo->Id)
-            {
-                case 11958:                                 // Cold Snap
+                case 63545:                                 // Icicle
                 {
-                    if (m_caster->GetTypeId()!=TYPEID_PLAYER)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    // immediately finishes the cooldown on Frost spells
-                    const SpellCooldowns& cm = ((Player *)m_caster)->GetSpellCooldownMap();
-                    for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end();)
-                    {
-                        SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
+                    m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                }
+                case 63984:                                 // Hate to Zero (Ulduar - Yogg Saron)
+                {
+                    if (!unitTarget)
+                        return;
 
-                        if (spellInfo->SpellFamilyName == SPELLFAMILY_MAGE &&
-                            (GetSpellSchoolMask(spellInfo) & SPELL_SCHOOL_MASK_FROST) &&
-                            spellInfo->Id != 11958 && GetSpellRecoveryTime(spellInfo) > 0)
-                        {
-                            ((Player*)m_caster)->RemoveSpellCooldown((itr++)->first, true);
-                        }
-                        else
-                            ++itr;
-                    }
+                    Unit* caster = GetCaster();
+                    if (!caster)
+                        return;
+
+                    unitTarget->getHostileRefManager().deleteReferences();
                     return;
                 }
-                case 31687:                                 // Summon Water Elemental
+                case 64172:                                 // Titanic Storm (Ulduar - Yogg Saron)
                 {
-                    if (m_caster->HasAura(70937))           // Glyph of Eternal Water (permanent limited by known spells version)
-                        m_caster->CastSpell(m_caster, 70908, true);
-                    else                                    // temporary version
-                        m_caster->CastSpell(m_caster, 70907, true);
+                    if (!unitTarget)
+                        return;
 
+                    if (unitTarget->HasAura(64162))
+                        unitTarget->KillSelf();
                     return;
                 }
-                case 32826:                                 // Polymorph Cast Visual
+                case 64385:                                 // Spinning (from Unusual Compass)
                 {
-                    if (unitTarget && unitTarget->GetTypeId() == TYPEID_UNIT)
-                    {
-                        //Polymorph Cast Visual Rank 1
-                        const uint32 spell_list[6] =
-                        {
-                            32813,                          // Squirrel Form
-                            32816,                          // Giraffe Form
-                            32817,                          // Serpent Form
-                            32818,                          // Dragonhawk Form
-                            32819,                          // Worgen Form
-                            32820                           // Sheep Form
-                        };
-                        unitTarget->CastSpell( unitTarget, spell_list[urand(0, 5)], true);
-                    }
+                    m_caster->SetFacingTo(frand(0, M_PI_F * 2));
                     return;
                 }
-                case 38194:                                 // Blink
+                case 64402:                                 // Rocket Strike
                 {
-                    // Blink
-                    if (unitTarget)
-                        m_caster->CastSpell(unitTarget, 38203, true);
+                    if (!unitTarget)
+                        return;
 
+                    unitTarget->CastSpell(unitTarget, 63681, true);
                     return;
                 }
-            }
+                case 64489:                                 // Feral Rush
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-            // Conjure Mana Gem
-            if (eff_idx == EFFECT_INDEX_1 && m_spellInfo->Effect[EFFECT_INDEX_0] == SPELL_EFFECT_CREATE_ITEM)
-            {
-                if (m_caster->GetTypeId()!=TYPEID_PLAYER)
+                    m_caster->CastSpell(unitTarget, 64496, true);
                     return;
+                }
+                case 64543:                                 // Melt Ice
+                {
+                    if (!unitTarget)
+                        return;
 
-                // checked in create item check, avoid unexpected
-                if (Item* item = ((Player*)m_caster)->GetItemByLimitedCategory(ITEM_LIMIT_CATEGORY_MANA_GEM))
-                    if (item->HasMaxCharges())
+                    m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    m_caster->CastSpell(m_caster, 64540, true);
+                    return;
+                }
+                case 64673:                                 // Feral Rush (h)
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                unitTarget->CastSpell( unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true, m_CastItem);
-                return;
-            }
-            break;
-        }
-        case SPELLFAMILY_WARRIOR:
-        {
-            // Charge
-            if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x1)) && m_spellInfo->SpellVisual[0] == 867)
-            {
-                int32 chargeBasePoints0 = damage;
-                m_caster->CastCustomSpell(m_caster, 34846, &chargeBasePoints0, NULL, NULL, true);
-                return;
-            }
-            // Execute
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x20000000))
-            {
-                if (!unitTarget)
+                    m_caster->CastSpell(unitTarget, 64674, true);
                     return;
+                }
+                case 64981:                                 // Summon Random Vanquished Tentacle
+                {
+                    uint32 spell_id = 0;
 
-                uint32 rage = m_caster->GetPower(POWER_RAGE);
+                    switch(urand(0, 2))
+                    {
+                        case 0: spell_id = 64982; break;    // Summon Vanquished Crusher Tentacle
+                        case 1: spell_id = 64983; break;    // Summon Vanquished Constrictor Tentacle
+                        case 2: spell_id = 64984; break;    // Summon Vanquished Corruptor Tentacle
+                    }
 
-                // up to max 30 rage cost
-                if (rage > 300)
-                    rage = 300;
+                    m_caster->CastSpell(m_caster, spell_id, true);
+                    return;
+                }
+                case 65346:                                 // Proximity Mine
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-                // Glyph of Execution bonus
-                uint32 rage_modified = rage;
+                    m_caster->CastSpell(m_caster, m_caster->GetMap()->IsRegularDifficulty() ? 66351 : 63009, true);
+                    m_caster->RemoveAurasDueToSpell(65345);
+                    m_caster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    return;
+                }
+                case 66181:                                 // Anub'arak Find Never Cold and Cast Ice Spikes
+                {
+                    if (!unitTarget)
+                        return;
 
-                if (Aura *aura = m_caster->GetDummyAura(58367))
-                    rage_modified +=  aura->GetModifier()->m_amount*10;
+                    m_caster->RemoveAurasDueToSpell(65920); // Remove Aura Spike 01
+                    m_caster->RemoveAurasDueToSpell(65922); // Remove Aura Spike 02
+                    m_caster->RemoveAurasDueToSpell(65923); // Remove Aura Spike 03
+                    m_caster->CastSpell(m_caster, 67732, true); // cast Ice Spike
 
-                int32 basePoints0 = damage+int32(rage_modified * m_spellInfo->DmgMultiplier[eff_idx] +
-                                                 m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f);
+                    Unit* pVictim = m_caster->getVictim();
+                    if (pVictim && pVictim->HasAura(67574)) // Remove Target Aura
+                        pVictim->RemoveAurasDueToSpell(67574);
 
-                m_caster->CastCustomSpell(unitTarget, 20647, &basePoints0, NULL, NULL, true, 0);
+                    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        ((Creature*)unitTarget)->ForcedDespawn(700);
 
-                // Sudden Death
-                if (m_caster->HasAura(52437))
+                    float x, y, z;
+                    m_caster->GetClosePoint(x, y, z, m_caster->GetObjectBoundingRadius(), 10.0f, frand(0.0f, M_PI_F * 2));
+                    m_caster->NearTeleportTo(x, y, z, m_caster->GetOrientation());
+                    m_caster->CastSpell(m_caster, 65920, true); // Cast Aura Spike 01
+                    return;
+                }
+                case 66218:                                 // Launch - set position
                 {
-                    Unit::AuraList const& auras = m_caster->GetAurasByType(SPELL_AURA_PROC_TRIGGER_SPELL);
-                    for (Unit::AuraList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    if (VehicleKitPtr vehicleKit = unitTarget->GetVehicleKit())
                     {
-                        // Only Sudden Death have this SpellIconID with SPELL_AURA_PROC_TRIGGER_SPELL
-                        if ((*itr)->GetSpellProto()->SpellIconID == 1989)
-                        {
-                            // saved rage top stored in next affect
-                            uint32 lastrage = (*itr)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_1)*10;
-                            if(lastrage < rage)
-                                rage -= lastrage;
-                            break;
-                        }
+                        vehicleKit->SetDestination(m_targets.getDestination().getX(), m_targets.getDestination().getY(), m_targets.getDestination().getZ(), unitTarget->GetOrientation(),  m_targets.GetSpeed(), m_targets.GetElevation());
                     }
+                    return;
                 }
+                case 66390:                                 // Read Last Rites
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-                m_caster->SetPower(POWER_RAGE,m_caster->GetPower(POWER_RAGE)-rage);
-                return;
-            }
-            // Slam
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000200000))
-            {
-                if(!unitTarget)
-                    return;
+                    // Summon Tualiq Proxy
+                    // Not known what purpose this has
+                    unitTarget->CastSpell(unitTarget, 66411, true);
 
-                // dummy cast itself ignored by client in logs
-                m_caster->CastCustomSpell(unitTarget,50782,&damage,NULL,NULL,true);
-                return;
-            }
-            // Concussion Blow
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000004000000))
-            {
-                m_damage+= uint32(damage * m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100);
-                return;
-            }
+                    // Summon Tualiq Spirit
+                    // Offtopic note: the summoned has aura from spell 37119 and 66419. One of them should
+                    // most likely make summoned "rise", hover up/sideways in the air (MOVEFLAG_LEVITATING + MOVEFLAG_HOVER)
+                    unitTarget->CastSpell(unitTarget, 66412, true);
 
-            switch(m_spellInfo->Id)
-            {
-                // Warrior's Wrath
-                case 21977:
+                    ((Player*)m_caster)->KilledMonsterCredit(unitTarget->GetEntry(), unitTarget->GetObjectGuid());
+
+                    // Must have a delay for proper spell animation
+                    ((Creature*)unitTarget)->ForcedDespawn(1000);
+                    return;
+                }
+                case 67019:                                 // Flask of the North
                 {
-                    if (!unitTarget)
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-                    m_caster->CastSpell(unitTarget, 21887, true); // spell mod
+
+                    uint32 spell_id = 0;
+                    switch(m_caster->getClass())
+                    {
+                        case CLASS_WARRIOR:
+                        case CLASS_DEATH_KNIGHT:
+                            spell_id = 67018;               // STR for Warriors, Death Knights
+                            break;
+                        case CLASS_ROGUE:
+                        case CLASS_HUNTER:
+                            spell_id = 67017;               // AP for Rogues, Hunters
+                            break;
+                        case CLASS_PRIEST:
+                        case CLASS_MAGE:
+                        case CLASS_WARLOCK:
+                            spell_id = 67016;               // SPD for Priests, Mages, Warlocks
+                            break;
+                        case CLASS_SHAMAN:
+                            // random (SPD, AP)
+                            spell_id = roll_chance_i(50) ? 67016 : 67017;
+                            break;
+                        case CLASS_PALADIN:
+                        case CLASS_DRUID:
+                        default:
+                            // random (SPD, STR)
+                            spell_id = roll_chance_i(50) ? 67016 : 67018;
+                            break;
+                    }
+                    m_caster->CastSpell(m_caster, spell_id, true);
                     return;
                 }
-                // Last Stand
-                case 12975:
+                case 67322: // Burrower Cast (Toc10)
                 {
-                    int32 healthModSpellBasePoints0 = int32(m_caster->GetMaxHealth()*0.3);
-                    m_caster->CastCustomSpell(m_caster, 12976, &healthModSpellBasePoints0, NULL, NULL, true, NULL);
+                    if (!m_caster->HasAura(66193) && !m_caster->HasAura(67855) && !m_caster->HasAura(67856) && !m_caster->HasAura(67857))
+                        m_caster->CastSpell(m_caster, 68394, false); // Cast Burrower
                     return;
                 }
-                // Bloodthirst
-                case 23881:
+                case 67366:                                 // C-14 Gauss Rifle
                 {
-                    m_caster->CastCustomSpell(unitTarget, 23885, &damage, NULL, NULL, true, NULL);
+                    if (!unitTarget)
+                        return;
+
+                    Unit* pZerg = unitTarget->GetMiniPet();
+                    if (pZerg && pZerg->isAlive() && pZerg->GetEntry() == 11327)
+                    {
+                        pZerg->GetUnitStateMgr().InitDefaults();
+                        m_caster->DealDamage(pZerg, unitTarget->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                        ((Creature*)pZerg)->ForcedDespawn(5000);
+                    }
                     return;
                 }
-            }
-            break;
-        }
-        case SPELLFAMILY_WARLOCK:
-        {
-            // Life Tap
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000040000))
-            {
-                if (unitTarget && (int32(unitTarget->GetHealth()) > damage))
+                case 67400:                                 // Zergling Attack (on Grunty companion)
                 {
-                    // Shouldn't Appear in Combat Log
-                    unitTarget->ModifyHealth(-damage);
-
-                    int32 spell_power = m_caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(m_spellInfo));
-                    int32 mana = damage + spell_power / 2;
-
-                    // Improved Life Tap mod
-                    Unit::AuraList const& auraDummy = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
-                    for(Unit::AuraList::const_iterator itr = auraDummy.begin(); itr != auraDummy.end(); ++itr)
-                        if((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARLOCK && (*itr)->GetSpellProto()->SpellIconID == 208)
-                            mana = ((*itr)->GetModifier()->m_amount + 100)* mana / 100;
-
-                    m_caster->CastCustomSpell(unitTarget, 31818, &mana, NULL, NULL, true);
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || !((Creature*)unitTarget)->IsPet())
+                        return;
 
-                    // Mana Feed
-                    int32 manaFeedVal = 0;
-                    Unit::AuraList const& mod = m_caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER);
-                    for(Unit::AuraList::const_iterator itr = mod.begin(); itr != mod.end(); ++itr)
+                    m_caster->DealDamage(unitTarget, unitTarget->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    ((Pet*)unitTarget)->Unsummon(PET_SAVE_AS_DELETED);
+                    m_caster->GetUnitStateMgr().InitDefaults();
+                    return;
+                }
+                case 68576:                                 // Eject All Passengers (also used in encounters Lich King, Jaraxxus?)
+                {
+                    m_caster->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+                    return;
+                }
+                case 69110:                                 // Ice Burst Target Search (Lich King)
+                {
+                    if (unitTarget)
                     {
-                        if((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARLOCK && (*itr)->GetSpellProto()->SpellIconID == 1982)
-                            manaFeedVal+= (*itr)->GetModifier()->m_amount;
+                        if (unitTarget->GetTypeId() == TYPEID_PLAYER)
+                        {
+                            m_caster->CastSpell(m_caster, 69108, true);
+
+                            if (m_caster->GetTypeId() == TYPEID_UNIT)
+                                ((Creature*)m_caster)->ForcedDespawn(800);
+                        }
                     }
-                    if (manaFeedVal > 0)
+                    return;
+                }
+                case 69712:                                 // Ice Tomb (Sindragosa)
+                {
+                    // trigger spheres to targets with Frost Beacon mark
+                    if (unitTarget)
                     {
-                        manaFeedVal = manaFeedVal * mana / 100;
-                        m_caster->CastCustomSpell(m_caster, 32553, &manaFeedVal, NULL, NULL, true, NULL);
+                        if (unitTarget->HasAura(70126, EFFECT_INDEX_0))
+                            m_caster->CastSpell(unitTarget, 69675, true, 0, 0, ObjectGuid(), m_spellInfo);
                     }
-                }
-                else
-                    SendCastResult(SPELL_FAILED_FIZZLE);
 
-                return;
-            }
-            break;
-        }
-        case SPELLFAMILY_PRIEST:
-        {
-            // Penance
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0080000000000000))
-            {
-                if (!unitTarget)
                     return;
-
-                int hurt = 0;
-                int heal = 0;
-                switch(m_spellInfo->Id)
+                }
+                case 69922:                                 // Temper Quel'Delar
                 {
-                    case 47540: hurt = 47758; heal = 47757; break;
-                    case 53005: hurt = 53001; heal = 52986; break;
-                    case 53006: hurt = 53002; heal = 52987; break;
-                    case 53007: hurt = 53003; heal = 52988; break;
-                    default:
-                        sLog.outError("Spell::EffectDummy: Spell %u Penance need set correct heal/damage spell", m_spellInfo->Id);
+                    if (!unitTarget)
                         return;
-                }
-
-                // prevent interrupted message for main spell
-                finish(true);
-
-                // replace cast by selected spell, this also make it interruptible including target death case
-                if (m_caster->IsFriendlyTo(unitTarget))
-                    m_caster->CastSpell(unitTarget, heal, false);
-                else
-                    m_caster->CastSpell(unitTarget, hurt, false);
 
-                return;
-            }
-            break;
-        }
-        case SPELLFAMILY_DRUID:
-        {
-            // Starfall
-            if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0000000000000000), 0x00000100))
-            {
-                //Shapeshifting into an animal form or mounting cancels the effect.
-                if(m_caster->GetCreatureType() == CREATURE_TYPE_BEAST || m_caster->IsMounted())
-                {
-                    if(m_triggeredByAuraSpell)
-                        m_caster->RemoveAurasDueToSpell(m_triggeredByAuraSpell->Id);
+                    // Return Tempered Quel'Delar
+                    unitTarget->CastSpell(m_caster, 69956, true);
                     return;
                 }
-
-                //Any effect which causes you to lose control of your character will supress the starfall effect.
-                if (m_caster->hasUnitState(UNIT_STAT_NO_FREE_MOVE))
+                case 70534:                                 // Vile Spirit Damage Target Search (Lich King)
+                {
+                    if (unitTarget)
+                    {
+                        m_caster->CastSpell(m_caster, 70503, true);
+                        m_caster->RemoveAurasDueToSpell(70502);
+                        if (m_caster->GetTypeId() == TYPEID_UNIT)
+                        {
+                            m_caster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                            ((Creature*)m_caster)->ForcedDespawn(1000);
+                        }
+                    }
                     return;
-
-                switch(m_spellInfo->Id)
+                }
+                case 70769:                                 // Divine Storm!
                 {
-                    case 50286: m_caster->CastSpell(unitTarget, 50288, true); return;
-                    case 53196: m_caster->CastSpell(unitTarget, 53191, true); return;
-                    case 53197: m_caster->CastSpell(unitTarget, 53194, true); return;
-                    case 53198: m_caster->CastSpell(unitTarget, 53195, true); return;
-                    default:
-                        sLog.outError("Spell::EffectDummy: Unhandeled Starfall spell rank %u",m_spellInfo->Id);
-                        return;
+                    m_caster->RemoveSpellCooldown(53385, true);
+                    return;
                 }
-            }
-            break;
-        }
-        case SPELLFAMILY_ROGUE:
-        {
-            switch(m_spellInfo->Id)
-            {
-                case 5938:                                  // Shiv
+                case 70895:                                 // Dark Transformation (Icecrown Citadel, Lady Deathwhisper encounter)
                 {
-                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
-                        return;
-
-                    Player *pCaster = ((Player*)m_caster);
-
-                    Item *item = pCaster->GetWeaponForAttack(OFF_ATTACK);
-                    if (!item)
+                    if (!unitTarget)
                         return;
 
-                    // all poison enchantments is temporary
-                    uint32 enchant_id = item->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT);
-                    if (!enchant_id)
+                    unitTarget->CastSpell(unitTarget, 70900, true);
+                    break;
+                }
+                case 70896:                                 // Dark Empowerment (Icecrown Citadel, Lady Deathwhisper encounter)
+                {
+                    if (!unitTarget)
                         return;
 
-                    SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
-                    if (!pEnchant)
+                    unitTarget->CastSpell(unitTarget, 70901, true);
+                    break;
+                }
+                case 70897:                                 // Dark Martyrdom (Icecrown Citadel, Lady Deathwhisper encounter)
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
                         return;
 
-                    for (int s = 0; s < 3; ++s)
+                    switch (unitTarget->GetEntry())
                     {
-                        if (pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL)
-                            continue;
-
-                        SpellEntry const* combatEntry = sSpellStore.LookupEntry(pEnchant->spellid[s]);
-                        if (!combatEntry || combatEntry->Dispel != DISPEL_POISON)
-                            continue;
-
-                        m_caster->CastSpell(unitTarget, combatEntry, true, item);
+                        case 37949:                         // Cult Adherent
+                            unitTarget->CastSpell(unitTarget, 70903, false);
+                            break;
+                        case 37890:                         // Cult Fanatic
+                            unitTarget->CastSpell(unitTarget, 71236, false);
+                            break;
                     }
-
-                    m_caster->CastSpell(unitTarget, 5940, true);
-                    return;
+                    break;
                 }
-                case 14185:                                 // Preparation
+                case 70961:                                 // Shattered Bones (Icecrown Citadel, trash mob The Damned)
                 {
-                    if (m_caster->GetTypeId()!=TYPEID_PLAYER)
+                    if (!unitTarget || unitTarget == m_caster)
                         return;
 
-                    //immediately finishes the cooldown on certain Rogue abilities
-                    const SpellCooldowns& cm = ((Player *)m_caster)->GetSpellCooldownMap();
-                    for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end();)
-                    {
-                        SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
-
-                        if (spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE && (spellInfo->SpellFamilyFlags & UI64LIT(0x0000024000000860)))
-                            ((Player*)m_caster)->RemoveSpellCooldown((itr++)->first,true);
-                        else
-                            ++itr;
-                    }
-                    return;
+                    m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    break;
                 }
-                case 31231:                                 // Cheat Death
+                case 71281:                                 // Slave Trigger Closest (Q:24498)
                 {
-                    // Cheating Death
-                    m_caster->CastSpell(m_caster, 45182, true);
-                    return;
+                    if (!m_caster || m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    Player* pPlayer = (Player*)m_caster;
+                    pPlayer->KilledMonsterCredit(pPlayer->GetTeam() == ALLIANCE ? 36764 : 36770);
+                    break;
                 }
-                case 51662:                                 // Hunger for Blood
+                case 71307:                                 // Vile Gas (Festergut, Rotface)
+                case 71908:
+                case 72270:
+                case 72271:
+                case 72295:                                 // Malleable Goo (ICC -Professor Putricide)
+                case 72615:
+                case 74280:
+                case 74281:
                 {
-                    m_caster->CastSpell(m_caster, 63848, true);
+                    if (unitTarget)
+                        m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
                     return;
                 }
-            }
-            break;
-        }
-        case SPELLFAMILY_HUNTER:
-        {
-            // Steady Shot
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x100000000))
-            {
-                if (!unitTarget || !unitTarget->isAlive())
-                    return;
-
-                bool found = false;
+                case 71336:                                 // Pact of the Darkfallen
+                {
+                    if (!unitTarget)
+                        return;
 
-                // check dazed affect
-                Unit::AuraList const& decSpeedList = unitTarget->GetAurasByType(SPELL_AURA_MOD_DECREASE_SPEED);
-                for(Unit::AuraList::const_iterator iter = decSpeedList.begin(); iter != decSpeedList.end(); ++iter)
+                    unitTarget->CastSpell(unitTarget, 71340, true);
+                    break;
+                }
+                case 71341:                                 // Pact of the Darkfallen
                 {
-                    if ((*iter)->GetSpellProto()->SpellIconID==15 && (*iter)->GetSpellProto()->Dispel==0)
+                    if (!unitTarget)
+                        return;
+
+                    bool needRemove = true;
+                    for(TargetList::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
                     {
-                        found = true;
-                        break;
+                        Unit *unit = ObjectAccessor::GetUnit(*unitTarget, ihit->targetGUID);
+                        if (unit && unitTarget->GetDistance(unit) > 5.0f)
+                        {
+                            needRemove = false;
+                            break;
+                        }
                     }
-                }
 
-                if (found)
-                    m_damage+= damage;
-                return;
-            }
+                    if (needRemove)
+                        unitTarget->RemoveAurasDueToSpell(71340);
 
-            // Disengage
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000400000000000))
-            {
-                Unit* target = unitTarget;
-                uint32 spellid;
-                switch(m_spellInfo->Id)
+                    break;
+                }
+                case 71445:                                 // Twilight Bloodbolt (Lana'thel)
+                case 71471:
                 {
-                    case 57635: spellid = 57636; break;     // one from creature cases
-                    case 61507: spellid = 61508; break;     // one from creature cases
-                    default:
-                        sLog.outError("Spell %u not handled propertly in EffectDummy(Disengage)",m_spellInfo->Id);
-                        return;
+                    if (unitTarget)
+                        m_caster->CastSpell(unitTarget, 71818, true);
+                    break;
                 }
-                if (!target || !target->isAlive())
-                    return;
-                m_caster->CastSpell(target,spellid,true,NULL);
-            }
-
-            switch(m_spellInfo->Id)
-            {
-                case 23989:                                 // Readiness talent
+                case 71718:                                 // Conjure Flame
+                case 72040:                                 // Conjure Empowered Flame
                 {
-                    if (m_caster->GetTypeId()!=TYPEID_PLAYER)
+                    if (unitTarget)
+                        unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    break;
+                }
+                case 71837:                                 // Vampiric Bite
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    //immediately finishes the cooldown for hunter abilities
-                    const SpellCooldowns& cm = ((Player*)m_caster)->GetSpellCooldownMap();
-                    for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end();)
-                    {
-                        SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
-
-                        if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && spellInfo->Id != 23989 && GetSpellRecoveryTime(spellInfo) > 0 )
-                            ((Player*)m_caster)->RemoveSpellCooldown((itr++)->first,true);
-                        else
-                            ++itr;
-                    }
+                    m_caster->CastSpell(unitTarget, 71726, true);
                     return;
                 }
-                case 37506:                                 // Scatter Shot
+                case 71861:                                 // Swarming Shadows
                 {
-                    if (m_caster->GetTypeId()!=TYPEID_PLAYER)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    // break Auto Shot and autohit
-                    m_caster->InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
-                    m_caster->AttackStop();
-                    ((Player*)m_caster)->SendAttackSwingCancelAttack();
+                    m_caster->CastSpell(unitTarget, 71264, true);
                     return;
                 }
-                // Last Stand
-                case 53478:
+                case 72202:                                 // Blood Link
                 {
                     if (!unitTarget)
                         return;
-                    int32 healthModSpellBasePoints0 = int32(unitTarget->GetMaxHealth() * 0.3);
-                    unitTarget->CastCustomSpell(unitTarget, 53479, &healthModSpellBasePoints0, NULL, NULL, true, NULL);
-                    return;
+
+                    unitTarget->CastSpell(unitTarget, 72195, true);
+                    break;
                 }
-                // Master's Call
-                case 53271:
+                case 72254:                                 // Mark of the fallen Champion Search Spell
                 {
-                    Pet* pet = m_caster->GetPet();
-                    if (!pet || !unitTarget)
+                    if (!unitTarget)
                         return;
-
-                    pet->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_0), false);
                     return;
                 }
-            }
-            break;
-        }
-        case SPELLFAMILY_PALADIN:
-        {
-            switch(m_spellInfo->SpellIconID)
-            {
-                case 156:                                   // Holy Shock
+                case 72261:                                 // Delirious Slash
                 {
                     if (!unitTarget)
                         return;
 
-                    int hurt = 0;
-                    int heal = 0;
-
-                    switch(m_spellInfo->Id)
-                    {
-                        case 20473: hurt = 25912; heal = 25914; break;
-                        case 20929: hurt = 25911; heal = 25913; break;
-                        case 20930: hurt = 25902; heal = 25903; break;
-                        case 27174: hurt = 27176; heal = 27175; break;
-                        case 33072: hurt = 33073; heal = 33074; break;
-                        case 48824: hurt = 48822; heal = 48820; break;
-                        case 48825: hurt = 48823; heal = 48821; break;
-                        default:
-                            sLog.outError("Spell::EffectDummy: Spell %u not handled in HS",m_spellInfo->Id);
-                            return;
-                    }
-
-                    if (m_caster->IsFriendlyTo(unitTarget))
-                        m_caster->CastSpell(unitTarget, heal, true);
-                    else
-                        m_caster->CastSpell(unitTarget, hurt, true);
+                    m_caster->CastSpell(unitTarget, m_caster->CanReachWithMeleeAttack(unitTarget) ? 71623 : 72264, true);
+                    return;
+                }
+                case 72379:                                 // Bloodnova
+                {
+                    if (!m_originalCaster || !unitTarget)
+                        return;
 
+                    m_originalCaster->CastSpell(unitTarget, 72380, true);
                     return;
                 }
-                case 561:                                   // Judgement of command
+                case 74452:                                 // Conflagration
                 {
-                    if (!unitTarget)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    uint32 spell_id = m_currentBasePoints[eff_idx];
-                    SpellEntry const* spell_proto = sSpellStore.LookupEntry(spell_id);
-                    if (!spell_proto)
-                        return;
-
-                    m_caster->CastSpell(unitTarget, spell_proto, true, NULL);
+                    m_caster->CastSpell(unitTarget, 74453, true);
+                    m_caster->CastSpell(unitTarget, 74454, true, NULL, NULL, m_caster->GetObjectGuid(), m_spellInfo);
                     return;
                 }
+                default:
+                    break;
             }
-
+            break;
+        }
+        case SPELLFAMILY_MAGE:
+        {
             switch(m_spellInfo->Id)
             {
-                case 31789:                                 // Righteous Defense (step 1)
+                case 11958:                                 // Cold Snap
                 {
-                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
-                    {
-                        SendCastResult(SPELL_FAILED_TARGET_AFFECTING_COMBAT);
-                        return;
-                    }
-
-                    // 31989 -> dummy effect (step 1) + dummy effect (step 2) -> 31709 (taunt like spell for each target)
-                    Unit* friendTarget = !unitTarget || unitTarget->IsFriendlyTo(m_caster) ? unitTarget : unitTarget->getVictim();
-                    if (friendTarget)
-                    {
-                        Player* player = friendTarget->GetCharmerOrOwnerPlayerOrPlayerItself();
-                        if (!player || !player->IsInSameRaidWith((Player*)m_caster))
-                            friendTarget = NULL;
-                    }
-
-                    // non-standard cast requirement check
-                    if (!friendTarget || friendTarget->getAttackers().empty())
+                    // immediately finishes the cooldown on Frost spells
+                    SpellCooldowns const* cm = m_caster->GetSpellCooldownMap();
+                    SpellCooldowns::const_iterator itr, next;
+                    for (SpellCooldowns::const_iterator itr = cm->begin(); itr != cm->end();itr = next)
                     {
-                        ((Player*)m_caster)->RemoveSpellCooldown(m_spellInfo->Id,true);
-                        SendCastResult(SPELL_FAILED_TARGET_AFFECTING_COMBAT);
-                        return;
-                    }
-
-                    // Righteous Defense (step 2) (in old version 31980 dummy effect)
-                    // Clear targets for eff 1
-                    for(TargetList::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
-                        ihit->effectMask &= ~(1<<1);
-
-                    // not empty (checked), copy
-                    Unit::AttackerSet attackers = friendTarget->getAttackers();
+                        next = itr;
+                        ++next;
+                        SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
 
-                    // selected from list 3
-                    for(uint32 i = 0; i < std::min(size_t(3),attackers.size()); ++i)
-                    {
-                        Unit::AttackerSet::iterator aItr = attackers.begin();
-                        std::advance(aItr, rand() % attackers.size());
-                        AddUnitTarget((*aItr), EFFECT_INDEX_1);
-                        attackers.erase(aItr);
+                        if (spellInfo->SpellFamilyName == SPELLFAMILY_MAGE &&
+                            (GetSpellSchoolMask(spellInfo) & SPELL_SCHOOL_MASK_FROST) &&
+                            spellInfo->Id != 11958 && GetSpellRecoveryTime(spellInfo) > 0)
+                        {
+                            m_caster->RemoveSpellCooldown(itr->first, true);
+                        }
                     }
-
-                    // now let next effect cast spell at each target.
                     return;
                 }
-                case 37877:                                 // Blessing of Faith
+                case 31687:                                 // Summon Water Elemental
                 {
-                    if (!unitTarget)
-                        return;
-
-                    uint32 spell_id = 0;
-                    switch(unitTarget->getClass())
-                    {
-                        case CLASS_DRUID:   spell_id = 37878; break;
-                        case CLASS_PALADIN: spell_id = 37879; break;
-                        case CLASS_PRIEST:  spell_id = 37880; break;
-                        case CLASS_SHAMAN:  spell_id = 37881; break;
-                        default: return;                    // ignore for not healing classes
-                    }
+                    if (m_caster->HasAura(70937))           // Glyph of Eternal Water (permanent limited by known spells version)
+                        m_caster->CastSpell(m_caster, 70908, true);
+                    else                                    // temporary version
+                        m_caster->CastSpell(m_caster, 70907, true);
 
-                    m_caster->CastSpell(m_caster, spell_id, true);
                     return;
                 }
-            }
-            break;
-        }
-        case SPELLFAMILY_SHAMAN:
-        {
-            // Cleansing Totem
-            if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000004000000)) && m_spellInfo->SpellIconID==1673)
-            {
-                if (unitTarget)
-                    m_caster->CastSpell(unitTarget, 52025, true);
-                return;
-            }
-            // Healing Stream Totem
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000002000))
-            {
-                if (unitTarget)
+                case 32826:                                 // Polymorph Cast Visual
                 {
-                    if (Unit *owner = m_caster->GetOwner())
+                    if (unitTarget && unitTarget->GetTypeId() == TYPEID_UNIT)
                     {
-                        // spell have SPELL_DAMAGE_CLASS_NONE and not get bonuses from owner, use main spell for bonuses
-                        if (m_triggeredBySpellInfo)
+                        //Polymorph Cast Visual Rank 1
+                        const uint32 spell_list[6] =
                         {
-                            damage = int32(owner->SpellHealingBonusDone(unitTarget, m_triggeredBySpellInfo, damage, HEAL));
-                            damage = int32(unitTarget->SpellHealingBonusTaken(owner, m_triggeredBySpellInfo, damage, HEAL));
-                        }
-
-                        // Restorative Totems
-                        Unit::AuraList const& mDummyAuras = owner->GetAurasByType(SPELL_AURA_DUMMY);
-                        for(Unit::AuraList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)
-                            // only its have dummy with specific icon
-                            if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_SHAMAN && (*i)->GetSpellProto()->SpellIconID == 338)
-                                damage += (*i)->GetModifier()->m_amount * damage / 100;
-
-                        // Glyph of Healing Stream Totem
-                        if (Aura *dummy = owner->GetDummyAura(55456))
-                            damage += dummy->GetModifier()->m_amount * damage / 100;
+                            32813,                          // Squirrel Form
+                            32816,                          // Giraffe Form
+                            32817,                          // Serpent Form
+                            32818,                          // Dragonhawk Form
+                            32819,                          // Worgen Form
+                            32820                           // Sheep Form
+                        };
+                        unitTarget->CastSpell( unitTarget, spell_list[urand(0, 5)], true);
                     }
-                    m_caster->CastCustomSpell(unitTarget, 52042, &damage, NULL, NULL, true, 0, 0, m_originalCasterGUID);
+                    return;
                 }
-                return;
-            }
-            // Mana Spring Totem
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000004000))
-            {
-                if (!unitTarget || unitTarget->getPowerType()!=POWER_MANA)
+                case 38194:                                 // Blink
+                {
+                    // Blink
+                    if (unitTarget)
+                        m_caster->CastSpell(unitTarget, 38203, true);
                     return;
-                m_caster->CastCustomSpell(unitTarget, 52032, &damage, 0, 0, true, 0, 0, m_originalCasterGUID);
-                return;
+                }
             }
-            // Flametongue Weapon Proc, Ranks
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000200000))
+
+            // Conjure Mana Gem
+            if (eff_idx == EFFECT_INDEX_1 && m_spellInfo->Effect[EFFECT_INDEX_0] == SPELL_EFFECT_CREATE_ITEM)
             {
-                if (!m_CastItem)
-                {
-                    sLog.outError("Spell::EffectDummy: spell %i requires cast Item", m_spellInfo->Id);
+                if (m_caster->GetTypeId()!=TYPEID_PLAYER)
                     return;
-                }
-                // found spelldamage coefficients of 0.381% per 0.1 speed and 15.244 per 4.0 speed
-                // but own calculation say 0.385 gives at most one point difference to published values
-                int32 spellDamage = m_caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(m_spellInfo));
-                float weaponSpeed = (1.0f/IN_MILLISECONDS) * m_CastItem->GetProto()->Delay;
-                int32 totalDamage = int32((damage + 3.85f * spellDamage) * 0.01 * weaponSpeed);
 
-                m_caster->CastCustomSpell(unitTarget, 10444, &totalDamage, NULL, NULL, true, m_CastItem);
+                // checked in create item check, avoid unexpected
+                if (Item* item = ((Player*)m_caster)->GetItemByLimitedCategory(ITEM_LIMIT_CATEGORY_MANA_GEM))
+                    if (item->HasMaxCharges())
+                        return;
+
+                unitTarget->CastSpell( unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true, m_CastItem);
                 return;
             }
-            if (m_spellInfo->Id == 39610)                   // Mana Tide Totem effect
+            break;
+        }
+        case SPELLFAMILY_WARRIOR:
+        {
+            // Charge
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_CHARGE>() && m_spellInfo->GetSpellVisual() == 867)
             {
-                if (!unitTarget || unitTarget->getPowerType() != POWER_MANA)
-                    return;
-
-                // Glyph of Mana Tide
-                if (Unit *owner = m_caster->GetOwner())
-                    if (Aura *dummy = owner->GetDummyAura(55441))
-                        damage+=dummy->GetModifier()->m_amount;
-                // Regenerate 6% of Total Mana Every 3 secs
-                int32 EffectBasePoints0 = unitTarget->GetMaxPower(POWER_MANA)  * damage / 100;
-                m_caster->CastCustomSpell(unitTarget, 39609, &EffectBasePoints0, NULL, NULL, true, NULL, NULL, m_originalCasterGUID);
+                int32 chargeBasePoints0 = damage;
+                m_caster->CastCustomSpell(m_caster, 34846, &chargeBasePoints0, NULL, NULL, true);
                 return;
             }
-            // Lava Lash
-            if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0000000000000000), 0x00000004))
+            // Execute
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_EXECUTE>())
             {
-                if (m_caster->GetTypeId()!=TYPEID_PLAYER)
+                if (!unitTarget)
                     return;
-                Item *item = ((Player*)m_caster)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
-                if (item)
+
+                uint32 rage = m_caster->GetPower(POWER_RAGE);
+
+                // up to max 30 rage cost
+                if (rage > 300)
+                    rage = 300;
+
+                // Glyph of Execution bonus
+                uint32 rage_modified = rage;
+
+                if (Aura const* aura = m_caster->GetDummyAura(58367))
+                    rage_modified +=  aura->GetModifier()->m_amount*10;
+
+                int32 basePoints0 = damage+int32(rage_modified * m_spellInfo->DmgMultiplier[eff_idx] +
+                                                 m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f);
+
+                m_caster->CastCustomSpell(unitTarget, 20647, &basePoints0, NULL, NULL, true, 0);
+
+                // Sudden Death
+                if (m_caster->HasAura(52437))
                 {
-                    // Damage is increased if your off-hand weapon is enchanted with Flametongue.
-                    Unit::AuraList const& auraDummy = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
-                    for(Unit::AuraList::const_iterator itr = auraDummy.begin(); itr != auraDummy.end(); ++itr)
+                    Unit::AuraList const& auras = m_caster->GetAurasByType(SPELL_AURA_PROC_TRIGGER_SPELL);
+                    for (Unit::AuraList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
                     {
-                        if ((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_SHAMAN &&
-                            ((*itr)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000200000)) &&
-                            (*itr)->GetCastItemGuid() == item->GetObjectGuid())
+                        // Only Sudden Death have this SpellIconID with SPELL_AURA_PROC_TRIGGER_SPELL
+                        if ((*itr)->GetSpellProto()->GetSpellIconID() == 1989)
                         {
-                            m_damage += m_damage * damage / 100;
-                            return;
+                            // saved rage top stored in next affect
+                            uint32 lastrage = (*itr)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_1)*10;
+                            if (lastrage < rage)
+                                rage -= lastrage;
+                            break;
                         }
                     }
                 }
+
+                m_caster->SetPower(POWER_RAGE,m_caster->GetPower(POWER_RAGE)-rage);
                 return;
             }
-            // Fire Nova
-            if (m_spellInfo->SpellIconID == 33)
+            // Slam
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_SLAM>())
             {
-                // fire totems slot
-                Totem* totem = m_caster->GetTotem(TOTEM_SLOT_FIRE);
-                if (!totem)
+                if (!unitTarget)
                     return;
 
-                uint32 triggered_spell_id;
-                switch(m_spellInfo->Id)
-                {
-                    case 1535:  triggered_spell_id = 8349;  break;
-                    case 8498:  triggered_spell_id = 8502;  break;
-                    case 8499:  triggered_spell_id = 8503;  break;
-                    case 11314: triggered_spell_id = 11306; break;
-                    case 11315: triggered_spell_id = 11307; break;
-                    case 25546: triggered_spell_id = 25535; break;
-                    case 25547: triggered_spell_id = 25537; break;
-                    case 61649: triggered_spell_id = 61650; break;
-                    case 61657: triggered_spell_id = 61654; break;
-                    default: return;
-                }
-
-                totem->CastSpell(totem, triggered_spell_id, true, NULL, NULL, m_caster->GetObjectGuid());
-
-                // Fire Nova Visual
-                totem->CastSpell(totem, 19823, true, NULL, NULL, m_caster->GetObjectGuid());
+                // dummy cast itself ignored by client in logs
+                m_caster->CastCustomSpell(unitTarget,50782,&damage,NULL,NULL,true);
                 return;
             }
-            break;
-        }
-        case SPELLFAMILY_DEATHKNIGHT:
-        {
-            // Death Coil
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x002000))
+            // Concussion Blow
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_CONCUSSION_BLOW>())
             {
-                if (m_caster->IsFriendlyTo(unitTarget))
+                m_damage+= uint32(damage * m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100);
+                return;
+            }
+
+            switch(m_spellInfo->Id)
+            {
+                // Warrior's Wrath
+                case 21977:
                 {
-                    if (!unitTarget || unitTarget->GetCreatureType() != CREATURE_TYPE_UNDEAD)
+                    if (!unitTarget)
                         return;
 
-                    int32 bp = int32(damage * 1.5f);
-                    m_caster->CastCustomSpell(unitTarget, 47633, &bp, NULL, NULL, true);
+                    m_caster->CastSpell(unitTarget, 21887, true); // spell mod
+                    return;
                 }
-                else
+                // Last Stand
+                case 12975:
                 {
-                    int32 bp = damage;
-                    m_caster->CastCustomSpell(unitTarget, 47632, &bp, NULL, NULL, true);
+                    int32 healthModSpellBasePoints0 = int32(m_caster->GetMaxHealth()*0.3);
+                    m_caster->CastCustomSpell(m_caster, 12976, &healthModSpellBasePoints0, NULL, NULL, true, NULL);
+                    return;
                 }
-                return;
-            }
-            // Hungering Cold
-            else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000100000000000))
-            {
-                m_caster->CastSpell(m_caster, 51209, true);
-                return;
-            }
-            // Death Strike
-            else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000010))
-            {
-                uint32 count = 0;
-                Unit::SpellAuraHolderMap const& auras = unitTarget->GetSpellAuraHolderMap();
-                for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
+                // Bloodthirst
+                case 23881:
                 {
-                    if (itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE &&
-                        itr->second->GetCasterGuid() == m_caster->GetObjectGuid())
-                    {
-                        ++count;
-                        // max. 15%
-                        if (count == 3)
-                            break;
-                    }
+                    m_caster->CastCustomSpell(unitTarget, 23885, &damage, NULL, NULL, true, NULL);
+                    return;
                 }
+                case 30012:                                 // Move
+                {
+                    if (!unitTarget || unitTarget->HasAura(39400))
+                        return;
 
-                int32 bp = int32(count * m_caster->GetMaxHealth() * m_spellInfo->DmgMultiplier[EFFECT_INDEX_0] / 100);
-
-                // Improved Death Strike (percent stored in nonexistent EFFECT_INDEX_2 effect base points)
-                Unit::AuraList const& auraMod = m_caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER);
-                for(Unit::AuraList::const_iterator iter = auraMod.begin(); iter != auraMod.end(); ++iter)
+                    unitTarget->CastSpell(m_caster, 30253, true);
+                }
+                case 30284:                                 // Change Facing
                 {
-                    // only required spell have spellicon for SPELL_AURA_ADD_FLAT_MODIFIER
-                    if ((*iter)->GetSpellProto()->SpellIconID == 2751 && (*iter)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT)
-                    {
-                        bp += (*iter)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_2) * bp / 100;
-                        break;
-                    }
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(m_caster, 30270, true);
+                    return;
                 }
+                case 37144:                                 // Move (Chess event player knight move)
+                case 37146:                                 // Move (Chess event player pawn move)
+                case 37148:                                 // Move (Chess event player queen move)
+                case 37151:                                 // Move (Chess event player rook move)
+                case 37152:                                 // Move (Chess event player bishop move)
+                case 37153:                                 // Move (Chess event player king move)
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
 
-                m_caster->CastCustomSpell(m_caster, 45470, &bp, NULL, NULL, true);
-                return;
+                    // cast generic move spell
+                    m_caster->CastSpell(unitTarget, 30012, true);
+                    return;
+                }
             }
-            // Obliterate
-            else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0002000000000000))
+            break;
+        }
+        case SPELLFAMILY_WARLOCK:
+        {
+            // Life Tap
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_WARLOCK_LIFE_TAP>())
             {
-                // search for Annihilation
-                Unit::AuraList const& dummyList = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
-                for (Unit::AuraList::const_iterator itr = dummyList.begin(); itr != dummyList.end(); ++itr)
+                if (unitTarget && (int32(unitTarget->GetHealth()) > damage))
                 {
-                    if ((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && (*itr)->GetSpellProto()->SpellIconID == 2710)
+                    // Shouldn't Appear in Combat Log
+                    unitTarget->ModifyHealth(-damage);
+
+                    int32 spell_power = m_caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(m_spellInfo));
+                    int32 mana = damage + spell_power / 2;
+
+                    // Improved Life Tap mod
+                    Unit::AuraList const& auraDummy = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
+                    for(Unit::AuraList::const_iterator itr = auraDummy.begin(); itr != auraDummy.end(); ++itr)
+                        if((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARLOCK && (*itr)->GetSpellProto()->GetSpellIconID() == 208)
+                            mana = ((*itr)->GetModifier()->m_amount + 100)* mana / 100;
+
+                    m_caster->CastCustomSpell(unitTarget, 31818, &mana, NULL, NULL, true);
+
+                    // Mana Feed
+                    int32 manaFeedVal = 0;
+                    Unit::AuraList const& mod = m_caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER);
+                    for(Unit::AuraList::const_iterator itr = mod.begin(); itr != mod.end(); ++itr)
                     {
-                        if (roll_chance_i((*itr)->GetModifier()->m_amount)) // don't consume if found
-                            return;
-                        else
-                            break;
+                        if((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARLOCK && (*itr)->GetSpellProto()->GetSpellIconID() == 1982)
+                            manaFeedVal+= (*itr)->GetModifier()->m_amount;
+                    }
+                    if (manaFeedVal > 0)
+                    {
+                        manaFeedVal = manaFeedVal * mana / 100;
+                        m_caster->CastCustomSpell(m_caster, 32553, &manaFeedVal, NULL, NULL, true, NULL);
                     }
                 }
+                else
+                    SendCastResult(SPELL_FAILED_FIZZLE);
 
-                // consume diseases
-                unitTarget->RemoveAurasWithDispelType(DISPEL_DISEASE, m_caster->GetObjectGuid());
+                return;
             }
             break;
         }
-    }
+        case SPELLFAMILY_PRIEST:
+        {
+            // Penance
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_PRIEST_PENANCE_BASE>())
+            {
+                if (!unitTarget)
+                    return;
 
-    // pet auras
-    if (PetAura const* petSpell = sSpellMgr.GetPetAura(m_spellInfo->Id, eff_idx))
-    {
-        m_caster->AddPetAura(petSpell);
-        return;
-    }
+                int hurt = 0;
+                int heal = 0;
+                switch(m_spellInfo->Id)
+                {
+                    case 47540: hurt = 47758; heal = 47757; break;
+                    case 53005: hurt = 53001; heal = 52986; break;
+                    case 53006: hurt = 53002; heal = 52987; break;
+                    case 53007: hurt = 53003; heal = 52988; break;
+                    default:
+                        sLog.outError("Spell::EffectDummy: Spell %u Penance need set correct heal/damage spell", m_spellInfo->Id);
+                        return;
+                }
 
-    // Script based implementation. Must be used only for not good for implementation in core spell effects
-    // So called only for not processed cases
-    bool libraryResult = false;
-    if (gameObjTarget)
-        libraryResult = sScriptMgr.OnEffectDummy(m_caster, m_spellInfo->Id, eff_idx, gameObjTarget);
-    else if (unitTarget && unitTarget->GetTypeId() == TYPEID_UNIT)
-        libraryResult = sScriptMgr.OnEffectDummy(m_caster, m_spellInfo->Id, eff_idx, (Creature*)unitTarget);
-    else if (itemTarget)
-        libraryResult = sScriptMgr.OnEffectDummy(m_caster, m_spellInfo->Id, eff_idx, itemTarget);
+                // prevent interrupted message for main spell
+                finish(true);
 
-    if (libraryResult || !unitTarget)
-        return;
+                // replace cast by selected spell, this also make it interruptible including target death case
+                if (m_caster->IsFriendlyTo(unitTarget))
+                    m_caster->CastSpell(unitTarget, heal, false);
+                else
+                    m_caster->CastSpell(unitTarget, hurt, false);
 
-    // Previous effect might have started script
-    if (!ScriptMgr::CanSpellEffectStartDBScript(m_spellInfo, eff_idx))
-        return;
+                return;
+            }
+            break;
+        }
+        case SPELLFAMILY_DRUID:
+        {
+            // Starfall
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_DRUID_STARFALL2>())
+            {
+                //Shapeshifting into an animal form or mounting cancels the effect.
+                if (m_caster->GetCreatureType() == CREATURE_TYPE_BEAST || m_caster->IsMounted())
+                {
+                    if (m_triggeredByAuraSpell)
+                        m_caster->RemoveAurasDueToSpell(m_triggeredByAuraSpell->Id);
+                    return;
+                }
 
-    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell ScriptStart spellid %u in EffectDummy", m_spellInfo->Id);
-    m_caster->GetMap()->ScriptsStart(sSpellScripts, m_spellInfo->Id, m_caster, unitTarget);
-}
+                //Any effect which causes you to lose control of your character will supress the starfall effect.
+                if (m_caster->hasUnitState(UNIT_STAT_CAN_NOT_REACT))
+                    return;
 
-void Spell::EffectTriggerSpellWithValue(SpellEffectIndex eff_idx)
-{
-    uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[eff_idx];
+                switch(m_spellInfo->Id)
+                {
+                    case 50286: m_caster->CastSpell(unitTarget, 50288, true); return;
+                    case 53196: m_caster->CastSpell(unitTarget, 53191, true); return;
+                    case 53197: m_caster->CastSpell(unitTarget, 53194, true); return;
+                    case 53198: m_caster->CastSpell(unitTarget, 53195, true); return;
+                    default:
+                        sLog.outError("Spell::EffectDummy: Unhandeled Starfall spell rank %u",m_spellInfo->Id);
+                        return;
+                }
+            }
+            break;
+        }
+        case SPELLFAMILY_ROGUE:
+        {
+            switch(m_spellInfo->Id)
+            {
+                case 5938:                                  // Shiv
+                {
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-    // normal case
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry( triggered_spell_id );
+                    Player *pCaster = ((Player*)m_caster);
 
-    if(!spellInfo)
-    {
-        sLog.outError("EffectTriggerSpellWithValue of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id);
-        return;
-    }
+                    Item *item = pCaster->GetWeaponForAttack(OFF_ATTACK);
+                    if (!item)
+                        return;
 
-    int32 bp = damage;
-    m_caster->CastCustomSpell(unitTarget,triggered_spell_id,&bp,&bp,&bp,true,NULL,NULL,m_originalCasterGUID);
-}
+                    // all poison enchantments is temporary
+                    uint32 enchant_id = item->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT);
+                    if (!enchant_id)
+                        return;
 
-void Spell::EffectTriggerRitualOfSummoning(SpellEffectIndex eff_idx)
-{
-    uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[eff_idx];
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry( triggered_spell_id );
+                    SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+                    if (!pEnchant)
+                        return;
 
-    if(!spellInfo)
-    {
-        sLog.outError("EffectTriggerRitualOfSummoning of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id);
-        return;
-    }
+                    for (int s = 0; s < 3; ++s)
+                    {
+                        if (pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL)
+                            continue;
 
-    finish();
+                        SpellEntry const* combatEntry = sSpellStore.LookupEntry(pEnchant->spellid[s]);
+                        if (!combatEntry || combatEntry->Dispel != DISPEL_POISON)
+                            continue;
 
-    m_caster->CastSpell(unitTarget,spellInfo,false);
-}
+                        m_caster->CastSpell(unitTarget, combatEntry, true, item);
+                    }
 
-void Spell::EffectClearQuest(SpellEffectIndex eff_idx)
-{
-    if (m_caster->GetTypeId() != TYPEID_PLAYER)
-        return;
+                    m_caster->CastSpell(unitTarget, 5940, true);
+                    return;
+                }
+                case 14185:                                 // Preparation
+                {
+                    bool glyph = m_caster->HasAura(56819);
+                    //immediately finishes the cooldown on certain Rogue abilities
+                    SpellCooldowns const* cm = m_caster->GetSpellCooldownMap();
+                    SpellCooldowns::const_iterator itr, next;
+                    for (SpellCooldowns::const_iterator itr = cm->begin(); itr != cm->end();itr = next)
+                    {
+                        next = itr;
+                        ++next;
+                        SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
 
-    Player *player = (Player*)m_caster;
+                        if (spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE && spellInfo->GetSpellFamilyFlags().test<CF_ROGUE_EVASION, CF_ROGUE_SPRINT, CF_ROGUE_VANISH, CF_ROGUE_COLD_BLOOD, CF_ROGUE_SHADOWSTEP>())
+                            m_caster->RemoveSpellCooldown(itr->first,true);
+                        // Glyph of Preparation
+                        else if (glyph && (spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE && (spellInfo->GetSpellFamilyFlags().test<CF_ROGUE_KICK, CF_ROGUE_MISC>() || spellInfo->Id == 51722)))
+                            m_caster->RemoveSpellCooldown(itr->first,true);
+                    }
+                    return;
+                }
+                case 31231:                                 // Cheat Death
+                {
+                    // Cheating Death
+                    m_caster->CastSpell(m_caster, 45182, true);
+                    return;
+                }
+                case 51662:                                 // Hunger for Blood
+                {
+                    m_caster->CastSpell(m_caster, 63848, true);
+                    return;
+                }
+                case 51690:                                 // Killing Spree
+                {
+                    m_caster->CastSpell(m_caster, 61851, true);
+                    return;
+                }
+            }
+            break;
+        }
+        case SPELLFAMILY_HUNTER:
+        {
+            // Steady Shot
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_HUNTER_STEADY_SHOT>())
+            {
+                if (!unitTarget || !unitTarget->isAlive())
+                    return;
 
-    uint32 quest_id = m_spellInfo->EffectMiscValue[eff_idx];
+                bool found = false;
 
-    if (!sObjectMgr.GetQuestTemplate(quest_id))
-    {
-        sLog.outError("Spell::EffectClearQuest spell entry %u attempt clear quest entry %u but this quest does not exist.", m_spellInfo->Id, quest_id);
-        return;
-    }
-
-    // remove quest possibly in quest log (is that expected?)
-    for(uint16 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot)
-    {
-        uint32 quest = player->GetQuestSlotQuestId(slot);
-
-        if (quest == quest_id)
-        {
-            player->SetQuestSlot(slot, 0);
-            // ignore unequippable quest items in this case, it will still be equipped
-            player->TakeQuestSourceItem(quest_id, false);
-        }
-    }
-
-    player->SetQuestStatus(quest_id, QUEST_STATUS_NONE);
-    player->getQuestStatusMap()[quest_id].m_rewarded = false;
-}
-
-void Spell::EffectForceCast(SpellEffectIndex eff_idx)
-{
-    if (!unitTarget)
-        return;
-
-    uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[eff_idx];
-
-    // normal case
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry(triggered_spell_id);
+                // check dazed affect
+                Unit::AuraList const& decSpeedList = unitTarget->GetAurasByType(SPELL_AURA_MOD_DECREASE_SPEED);
+                for(Unit::AuraList::const_iterator iter = decSpeedList.begin(); iter != decSpeedList.end(); ++iter)
+                {
+                    if ((*iter)->GetSpellProto()->GetSpellIconID()==15 && (*iter)->GetSpellProto()->Dispel==0)
+                    {
+                        found = true;
+                        break;
+                    }
+                }
 
-    if (!spellInfo)
-    {
-        sLog.outError("EffectForceCast of spell %u: triggering unknown spell id %i", m_spellInfo->Id, triggered_spell_id);
-        return;
-    }
+                if (found)
+                    m_damage+= damage;
+                return;
+            }
 
-    unitTarget->CastSpell(unitTarget, spellInfo, true, NULL, NULL, m_originalCasterGUID, m_spellInfo);
-}
+            // Disengage
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_HUNTER_DISENGAGE>())
+            {
+                Unit* target = unitTarget;
+                uint32 spellid;
 
-void Spell::EffectTriggerSpell(SpellEffectIndex effIndex)
-{
-    // only unit case known
-    if (!unitTarget)
-    {
-        if(gameObjTarget || itemTarget)
-            sLog.outError("Spell::EffectTriggerSpell (Spell: %u): Unsupported non-unit case!",m_spellInfo->Id);
-        return;
-    }
+                switch(m_spellInfo->Id)
+                {
+                    case 57635: spellid = 57636; break;     // one from creature cases
+                    case 61507: spellid = 61508; break;     // one from creature cases
+                    default:
+                        sLog.outError("Spell %u not handled propertly in EffectDummy(Disengage)",m_spellInfo->Id);
+                        return;
+                }
+                if (!target || !target->isAlive())
+                    return;
 
-    uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[effIndex];
+                m_caster->CastSpell(target,spellid,true,NULL);
+            }
 
-    // special cases
-    switch(triggered_spell_id)
-    {
-        // Vanish (not exist)
-        case 18461:
-        {
-            unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
-            unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
-            unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STALKED);
+            switch(m_spellInfo->Id)
+            {
+                case 23989:                                 // Readiness talent
+                {
+                    //immediately finishes the cooldown for hunter abilities
+                    SpellCooldowns const* cm = m_caster->GetSpellCooldownMap();
+                    SpellCooldowns::const_iterator itr, next;
+                    for (SpellCooldowns::const_iterator itr = cm->begin(); itr != cm->end();itr = next)
+                    {
+                        next = itr;
+                        ++next;
+                        SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
 
-            // if this spell is given to NPC it must handle rest by it's own AI
-            if (unitTarget->GetTypeId() != TYPEID_PLAYER)
-                return;
+                        if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER &&
+                            spellInfo->Id != 23989 &&
+                            spellInfo->GetSpellIconID() != 1680 &&
+                            GetSpellRecoveryTime(spellInfo) > 0 )
+                            m_caster->RemoveSpellCooldown(itr->first,true);
+                    }
+                    return;
+                }
+                case 37506:                                 // Scatter Shot
+                {
+                    if (m_caster->GetTypeId()!=TYPEID_PLAYER)
+                        return;
 
-            uint32 spellId = 1784;
-            // reset cooldown on it if needed
-            if (((Player*)unitTarget)->HasSpellCooldown(spellId))
-                ((Player*)unitTarget)->RemoveSpellCooldown(spellId);
+                    // break Auto Shot and autohit
+                    m_caster->InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
+                    m_caster->AttackStop();
+                    ((Player*)m_caster)->SendAttackSwingCancelAttack();
+                    return;
+                }
+                // Last Stand
+                case 53478:
+                {
+                    if (!unitTarget)
+                        return;
+                    int32 healthModSpellBasePoints0 = int32(unitTarget->GetMaxHealth() * 0.3);
+                    unitTarget->CastCustomSpell(unitTarget, 53479, &healthModSpellBasePoints0, NULL, NULL, true, NULL);
+                    return;
+                }
+                // Master's Call
+                case 53271:
+                {
+                    Pet* pet = m_caster->GetPet();
+                    if (!pet || !unitTarget)
+                        return;
 
-            m_caster->CastSpell(unitTarget, spellId, true);
-            return;
-        }
-        // just skip
-        case 23770:                                         // Sayge's Dark Fortune of *
-            // not exist, common cooldown can be implemented in scripts if need.
-            return;
-        // Brittle Armor - (need add max stack of 24575 Brittle Armor)
-        case 29284:
-            m_caster->CastSpell(unitTarget, 24575, true, m_CastItem, NULL, m_originalCasterGUID);
-            return;
-        // Mercurial Shield - (need add max stack of 26464 Mercurial Shield)
-        case 29286:
-            m_caster->CastSpell(unitTarget, 26464, true, m_CastItem, NULL, m_originalCasterGUID);
-            return;
-        // Righteous Defense
-        case 31980:
-        {
-            m_caster->CastSpell(unitTarget, 31790, true, m_CastItem, NULL, m_originalCasterGUID);
-            return;
-        }
-        // Cloak of Shadows
-        case 35729:
-        {
-            Unit::SpellAuraHolderMap& Auras = unitTarget->GetSpellAuraHolderMap();
-            for(Unit::SpellAuraHolderMap::iterator iter = Auras.begin(); iter != Auras.end(); ++iter)
-            {
-                // Remove all harmful spells on you except positive/passive/physical auras
-                if (!iter->second->IsPositive() &&
-                    !iter->second->IsPassive() &&
-                    !iter->second->IsDeathPersistent() &&
-                    (GetSpellSchoolMask(iter->second->GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL) == 0)
+                    pet->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
+                }
+                case 54044:                                 // Carrion Feeder
                 {
-                    m_caster->RemoveAurasDueToSpell(iter->second->GetSpellProto()->Id);
-                    iter = Auras.begin();
+                    if (!unitTarget)
+                        return;
+
+                    finish(true);
+                    CancelGlobalCooldown();
+                    if (m_caster->GetObjectGuid().IsPet())
+                        m_caster->DoPetCastSpell(m_caster, 54045);
+                    else
+                        m_caster->CastSpell(m_caster, 54045, false);
+                    return;
                 }
             }
-            return;
-        }
-        // Priest Shadowfiend (34433) need apply mana gain trigger aura on pet
-        case 41967:
-        {
-            if (Unit *pet = unitTarget->GetPet())
-                pet->CastSpell(pet, 28305, true);
-            return;
+            break;
         }
-        // Empower Rune Weapon
-        case 53258:
+        case SPELLFAMILY_PALADIN:
         {
-            // remove cooldown of frost/death, undead/blood activated in main spell
-            if (unitTarget->GetTypeId() == TYPEID_PLAYER)
+            switch(m_spellInfo->GetSpellIconID())
             {
-                bool res1 = ((Player*)unitTarget)->ActivateRunes(RUNE_FROST, 2);
-                bool res2 = ((Player*)unitTarget)->ActivateRunes(RUNE_DEATH, 2);
-                if (res1 || res2)
-                    ((Player*)unitTarget)->ResyncRunes();
-            }
-            return;
-        }
-    }
+                case 156:                                   // Holy Shock
+                {
+                    if (!unitTarget)
+                        return;
 
-    // normal case
-    SpellEntry const* spellInfo = sSpellStore.LookupEntry(triggered_spell_id);
-    if (!spellInfo)
-    {
-        // No previous Effect might have started a script
-        bool startDBScript = unitTarget && ScriptMgr::CanSpellEffectStartDBScript(m_spellInfo, effIndex);
-        if (startDBScript)
-        {
-            DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell ScriptStart spellid %u in EffectTriggerSpell", m_spellInfo->Id);
-            startDBScript = m_caster->GetMap()->ScriptsStart(sSpellScripts, m_spellInfo->Id, m_caster, unitTarget);
-        }
+                    int hurt = 0;
+                    int heal = 0;
 
-        if (!startDBScript)
-            sLog.outError("EffectTriggerSpell of spell %u: triggering unknown spell id %i", m_spellInfo->Id, triggered_spell_id);
-        return;
-    }
+                    switch(m_spellInfo->Id)
+                    {
+                        case 20473: hurt = 25912; heal = 25914; break;
+                        case 20929: hurt = 25911; heal = 25913; break;
+                        case 20930: hurt = 25902; heal = 25903; break;
+                        case 27174: hurt = 27176; heal = 27175; break;
+                        case 33072: hurt = 33073; heal = 33074; break;
+                        case 48824: hurt = 48822; heal = 48820; break;
+                        case 48825: hurt = 48823; heal = 48821; break;
+                        default:
+                            sLog.outError("Spell::EffectDummy: Spell %u not handled in HS",m_spellInfo->Id);
+                            return;
+                    }
 
-    // select formal caster for triggered spell
-    Unit* caster = m_caster;
+                    if (m_caster->IsFriendlyTo(unitTarget))
+                        m_caster->CastSpell(unitTarget, heal, true);
+                    else
+                        m_caster->CastSpell(unitTarget, hurt, true);
 
-    // some triggered spells require specific equipment
-    if (spellInfo->EquippedItemClass >=0 && m_caster->GetTypeId()==TYPEID_PLAYER)
-    {
-        // main hand weapon required
-        if (spellInfo->HasAttribute(SPELL_ATTR_EX3_MAIN_HAND))
-        {
-            Item* item = ((Player*)m_caster)->GetWeaponForAttack(BASE_ATTACK, true, false);
+                    return;
+                }
+                case 561:                                   // Judgement of command
+                {
+                    if (!unitTarget)
+                        return;
 
-            // skip spell if no weapon in slot or broken
-            if (!item)
-                return;
+                    uint32 spell_id = m_currentBasePoints[eff_idx];
+                    SpellEntry const* spell_proto = sSpellStore.LookupEntry(spell_id);
+                    if (!spell_proto)
+                        return;
 
-            // skip spell if weapon not fit to triggered spell
-            if (!item->IsFitToSpellRequirements(spellInfo))
-                return;
-        }
+                    m_caster->CastSpell(unitTarget, spell_proto, true, NULL);
+                    return;
+                }
+            }
 
-        // offhand hand weapon required
-        if (spellInfo->HasAttribute(SPELL_ATTR_EX3_REQ_OFFHAND))
-        {
-            Item* item = ((Player*)m_caster)->GetWeaponForAttack(OFF_ATTACK, true, false);
+            switch(m_spellInfo->Id)
+            {
+                case 31789:                                 // Righteous Defense (step 1)
+                {
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                    {
+                        SendCastResult(SPELL_FAILED_TARGET_AFFECTING_COMBAT);
+                        return;
+                    }
 
-            // skip spell if no weapon in slot or broken
-            if (!item)
-                return;
+                    // 31989 -> dummy effect (step 1) + dummy effect (step 2) -> 31709 (taunt like spell for each target)
+                    Unit* friendTarget = !unitTarget || unitTarget->IsFriendlyTo(m_caster) ? unitTarget : unitTarget->getVictim();
+                    if (friendTarget)
+                    {
+                        Player* player = friendTarget->GetCharmerOrOwnerPlayerOrPlayerItself();
+                        if (!player || !player->IsInSameRaidWith((Player*)m_caster))
+                            friendTarget = NULL;
+                    }
 
-            // skip spell if weapon not fit to triggered spell
-            if (!item->IsFitToSpellRequirements(spellInfo))
-                return;
-        }
-    }
-    else
-    {
-        // Note: not exist spells with weapon req. and IsSpellHaveCasterSourceTargets == true
-        // so this just for speedup places in else
-        caster = IsSpellWithCasterSourceTargetsOnly(spellInfo) ? unitTarget : m_caster;
-    }
-
-    caster->CastSpell(unitTarget,spellInfo,true,NULL,NULL,m_originalCasterGUID);
-}
-
-void Spell::EffectTriggerMissileSpell(SpellEffectIndex effect_idx)
-{
-    uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[effect_idx];
-
-    // normal case
-    SpellEntry const *spellInfo = sSpellStore.LookupEntry( triggered_spell_id );
-
-    if(!spellInfo)
-    {
-        sLog.outError("EffectTriggerMissileSpell of spell %u (eff: %u): triggering unknown spell id %u",
-            m_spellInfo->Id,effect_idx,triggered_spell_id);
-        return;
-    }
-
-    if (m_CastItem)
-        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WORLD: cast Item spellId - %i", spellInfo->Id);
+                    // non-standard cast requirement check
+                    if (!friendTarget || !friendTarget->IsInCombat())
+                    {
+                        m_caster->RemoveSpellCooldown(m_spellInfo->Id,true);
+                        SendCastResult(SPELL_FAILED_TARGET_AFFECTING_COMBAT);
+                        return;
+                    }
 
-    m_caster->CastSpell(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, spellInfo, true, m_CastItem, 0, m_originalCasterGUID);
-}
+                    // Righteous Defense (step 2) (in old version 31980 dummy effect)
+                    // Clear targets for eff 1
+                    for(TargetList::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
+                        ihit->effectMask &= ~(1<<1);
 
-void Spell::EffectJump(SpellEffectIndex eff_idx)
-{
-    if(m_caster->IsTaxiFlying())
-        return;
+                    // not empty (checked), copy
+                    GuidSet& attackers = friendTarget->GetMap()->GetAttackersFor(friendTarget->GetObjectGuid());
+                    if (!attackers.empty())
+                    {
+                        // selected from list 3
+                        for(uint32 i = 0; i < std::min(size_t(3), attackers.size()); ++i)
+                        {
+                            GuidSet::iterator aItr = attackers.begin();
+                            std::advance(aItr, rand() % attackers.size());
+                            if (Unit* nTarget = friendTarget->GetMap()->GetUnit(*aItr))
+                                AddUnitTarget(nTarget, EFFECT_INDEX_1);
+                            attackers.erase(aItr);
+                        }
+                    }
 
-    // Init dest coordinates
-    float x,y,z,o;
-    if(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
-    {
-        x = m_targets.m_destX;
-        y = m_targets.m_destY;
-        z = m_targets.m_destZ;
+                    // now let next effect cast spell at each target.
+                    return;
+                }
+                case 37877:                                 // Blessing of Faith
+                {
+                    if (!unitTarget)
+                        return;
 
-        if(m_spellInfo->EffectImplicitTargetA[eff_idx] == TARGET_BEHIND_VICTIM)
-        {
-            // explicit cast data from client or server-side cast
-            // some spell at client send caster
-            Unit* pTarget = NULL;
-            if(m_targets.getUnitTarget() && m_targets.getUnitTarget()!=m_caster)
-                pTarget = m_targets.getUnitTarget();
-            else if(unitTarget->getVictim())
-                pTarget = m_caster->getVictim();
-            else if(m_caster->GetTypeId() == TYPEID_PLAYER)
-                pTarget = m_caster->GetMap()->GetUnit(((Player*)m_caster)->GetSelectionGuid());
+                    uint32 spell_id = 0;
+                    switch(unitTarget->getClass())
+                    {
+                        case CLASS_DRUID:   spell_id = 37878; break;
+                        case CLASS_PALADIN: spell_id = 37879; break;
+                        case CLASS_PRIEST:  spell_id = 37880; break;
+                        case CLASS_SHAMAN:  spell_id = 37881; break;
+                        default: return;                    // ignore for not healing classes
+                    }
 
-            o = pTarget ? pTarget->GetOrientation() : m_caster->GetOrientation();
+                    m_caster->CastSpell(m_caster, spell_id, true);
+                    return;
+                }
+            }
+            break;
         }
-        else
-            o = m_caster->GetOrientation();
-    }
-    else if(unitTarget)
-    {
-        unitTarget->GetContactPoint(m_caster,x,y,z,CONTACT_DISTANCE);
-        o = m_caster->GetOrientation();
-    }
-    else if(gameObjTarget)
-    {
-        gameObjTarget->GetContactPoint(m_caster,x,y,z,CONTACT_DISTANCE);
-        o = m_caster->GetOrientation();
-    }
-    else
-    {
-        sLog.outError( "Spell::EffectJump - unsupported target mode for spell ID %u", m_spellInfo->Id );
-        return;
-    }
-
-    m_caster->NearTeleportTo(x, y, z, o, true);
-}
-
-void Spell::EffectTeleportUnits(SpellEffectIndex eff_idx)
-{
-    if(!unitTarget || unitTarget->IsTaxiFlying())
-        return;
+        case SPELLFAMILY_SHAMAN:
+        {
+            // Cleansing Totem
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_MISC_TOTEM_EFFECTS>() && m_spellInfo->GetSpellIconID()==1673)
+            {
+                if (unitTarget)
+                    m_caster->CastSpell(unitTarget, 52025, true);
+                return;
+            }
+            // Healing Stream Totem
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_HEALING_STREAM>())
+            {
+                if (unitTarget)
+                {
+                    if (Unit *owner = m_caster->GetOwner())
+                    {
+                        // spell have SPELL_DAMAGE_CLASS_NONE and not get bonuses from owner, use main spell for bonuses
+                        if (m_triggeredBySpellInfo)
+                        {
+                            damage = int32(owner->SpellHealingBonusDone(unitTarget, m_triggeredBySpellInfo, damage, HEAL));
+                            damage = int32(unitTarget->SpellHealingBonusTaken(owner, m_triggeredBySpellInfo, damage, HEAL));
+                        }
 
-    // Target dependend on TargetB, if there is none provided, decide dependend on A
-    uint32 targetType = m_spellInfo->EffectImplicitTargetB[eff_idx];
-    if (!targetType)
-        targetType = m_spellInfo->EffectImplicitTargetA[eff_idx];
+                        // Restorative Totems
+                        Unit::AuraList const& mDummyAuras = owner->GetAurasByType(SPELL_AURA_DUMMY);
+                        for(Unit::AuraList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)
+                            // only its have dummy with specific icon
+                            if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_SHAMAN && (*i)->GetSpellProto()->GetSpellIconID() == 338)
+                                damage += (*i)->GetModifier()->m_amount * damage / 100;
 
-    switch (targetType)
-    {
-        case TARGET_INNKEEPER_COORDINATES:
-        {
-            // Only players can teleport to innkeeper
-            if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        // Glyph of Healing Stream Totem
+                        if (Aura const* dummy = owner->GetDummyAura(55456))
+                            damage += dummy->GetModifier()->m_amount * damage / 100;
+                    }
+                    m_caster->CastCustomSpell(unitTarget, 52042, &damage, NULL, NULL, true, 0, 0, m_originalCasterGuid);
+                }
                 return;
+            }
+            // Mana Spring Totem
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_MANA_SPRING>())
+            {
+                if (!unitTarget || unitTarget->GetPowerType() != POWER_MANA)
+                    return;
 
-            ((Player*)unitTarget)->TeleportToHomebind(unitTarget==m_caster ? TELE_TO_SPELL : 0);
-            return;
-        }
-        case TARGET_AREAEFFECT_INSTANT:                     // in all cases first TARGET_TABLE_X_Y_Z_COORDINATES
-        case TARGET_TABLE_X_Y_Z_COORDINATES:
-        {
-            SpellTargetPosition const* st = sSpellMgr.GetSpellTargetPosition(m_spellInfo->Id);
-            if(!st)
+                m_caster->CastCustomSpell(unitTarget, 52032, &damage, 0, 0, true, 0, 0, m_originalCasterGuid);
+                return;
+            }
+            // Flametongue Weapon Proc, Ranks
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_FLAMETONGUE_WEAPON>())
             {
-                sLog.outError( "Spell::EffectTeleportUnits - unknown Teleport coordinates for spell ID %u", m_spellInfo->Id );
+                if (!m_CastItem)
+                {
+                    sLog.outError("Spell::EffectDummy: spell %i requires cast Item", m_spellInfo->Id);
+                    return;
+                }
+                // found spelldamage coefficients of 0.381% per 0.1 speed and 15.244 per 4.0 speed
+                // but own calculation say 0.385 gives at most one point difference to published values
+                int32 spellDamage = m_caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(m_spellInfo));
+                float weaponSpeed = (1.0f/IN_MILLISECONDS) * m_CastItem->GetProto()->Delay;
+                int32 totalDamage = int32((damage + 3.85f * spellDamage) * 0.01 * weaponSpeed);
+
+                m_caster->CastCustomSpell(unitTarget, 10444, &totalDamage, NULL, NULL, true, m_CastItem);
                 return;
             }
+            if (m_spellInfo->Id == 39610)                   // Mana Tide Totem effect
+            {
+                if (!unitTarget || unitTarget->GetPowerType() != POWER_MANA)
+                    return;
 
-            if(st->target_mapId==unitTarget->GetMapId())
-                unitTarget->NearTeleportTo(st->target_X,st->target_Y,st->target_Z,st->target_Orientation,unitTarget==m_caster);
-            else if(unitTarget->GetTypeId()==TYPEID_PLAYER)
-                ((Player*)unitTarget)->TeleportTo(st->target_mapId,st->target_X,st->target_Y,st->target_Z,st->target_Orientation,unitTarget==m_caster ? TELE_TO_SPELL : 0);
-            break;
-        }
-        case TARGET_EFFECT_SELECT:
-        {
-            // m_destN filled, but sometimes for wrong dest and does not have TARGET_FLAG_DEST_LOCATION
+                // Glyph of Mana Tide
+                if (Unit *owner = m_caster->GetOwner())
+                    if (Aura const* dummy = owner->GetDummyAura(55441))
+                        damage += dummy->GetModifier()->m_amount;
+                // Regenerate 6% of Total Mana Every 3 secs
+                int32 EffectBasePoints0 = unitTarget->GetMaxPower(POWER_MANA)  * damage / 100;
+                m_caster->CastCustomSpell(unitTarget, 39609, &EffectBasePoints0, NULL, NULL, true, NULL, NULL, m_originalCasterGuid);
+                return;
+            }
+            // Lava Lash
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_LAVA_LASH>())
+            {
+                if (m_caster->GetTypeId()!=TYPEID_PLAYER)
+                    return;
 
-            float x = unitTarget->GetPositionX();
-            float y = unitTarget->GetPositionY();
-            float z = unitTarget->GetPositionZ();
-            float orientation = m_caster->GetOrientation();
+                Item *item = ((Player*)m_caster)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
+                if (item)
+                {
+                    // Damage is increased if your off-hand weapon is enchanted with Flametongue.
+                    Unit::AuraList const& auraDummy = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
+                    for(Unit::AuraList::const_iterator itr = auraDummy.begin(); itr != auraDummy.end(); ++itr)
+                    {
+                        if ((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_SHAMAN &&
+                            (*itr)->GetSpellProto()->GetSpellFamilyFlags().test<CF_SHAMAN_FLAMETONGUE_WEAPON>() &&
+                            (*itr)->GetCastItemGuid() == item->GetObjectGuid())
+                        {
+                            m_damage += m_damage * damage / 100;
+                            return;
+                        }
+                    }
+                }
+                return;
+            }
+            // Fire Nova
+            if (m_spellInfo->GetSpellIconID() == 33)
+            {
+                // fire totems slot
+                Totem* totem = m_caster->GetTotem(TOTEM_SLOT_FIRE);
+                if (!totem)
+                    return;
 
-            m_caster->NearTeleportTo(x, y, z, orientation, unitTarget == m_caster);
-            return;
-        }
-        case TARGET_BEHIND_VICTIM:
-        {
-            Unit *pTarget = NULL;
+                uint32 triggered_spell_id;
+                switch(m_spellInfo->Id)
+                {
+                    case 1535:  triggered_spell_id = 8349;  break;
+                    case 8498:  triggered_spell_id = 8502;  break;
+                    case 8499:  triggered_spell_id = 8503;  break;
+                    case 11314: triggered_spell_id = 11306; break;
+                    case 11315: triggered_spell_id = 11307; break;
+                    case 25546: triggered_spell_id = 25535; break;
+                    case 25547: triggered_spell_id = 25537; break;
+                    case 61649: triggered_spell_id = 61650; break;
+                    case 61657: triggered_spell_id = 61654; break;
+                    default: return;
+                }
 
-            // explicit cast data from client or server-side cast
-            // some spell at client send caster
-            if(m_targets.getUnitTarget() && m_targets.getUnitTarget()!=unitTarget)
-                pTarget = m_targets.getUnitTarget();
-            else if(unitTarget->getVictim())
-                pTarget = unitTarget->getVictim();
-            else if(unitTarget->GetTypeId() == TYPEID_PLAYER)
-                pTarget = unitTarget->GetMap()->GetUnit(((Player*)unitTarget)->GetSelectionGuid());
+                totem->CastSpell(totem, triggered_spell_id, true, NULL, NULL, m_caster->GetObjectGuid());
 
-            // Init dest coordinates
-            float x = m_targets.m_destX;
-            float y = m_targets.m_destY;
-            float z = m_targets.m_destZ;
-            float orientation = pTarget ? pTarget->GetOrientation() : unitTarget->GetOrientation();
-            unitTarget->NearTeleportTo(x,y,z,orientation,unitTarget==m_caster);
-            return;
-        }
-        default:
-        {
-            // If not exist data for dest location - return
-            if(!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
-            {
-                sLog.outError( "Spell::EffectTeleportUnits - unknown EffectImplicitTargetB[%u] = %u for spell ID %u", eff_idx, m_spellInfo->EffectImplicitTargetB[eff_idx], m_spellInfo->Id );
+                // Fire Nova Visual
+                totem->CastSpell(totem, 19823, true, NULL, NULL, m_caster->GetObjectGuid());
                 return;
             }
-            // Init dest coordinates
-            float x = m_targets.m_destX;
-            float y = m_targets.m_destY;
-            float z = m_targets.m_destZ;
-            float orientation = unitTarget->GetOrientation();
-            // Teleport
-            unitTarget->NearTeleportTo(x,y,z,orientation,unitTarget==m_caster);
-            return;
+            break;
         }
-    }
-
-    // post effects for TARGET_TABLE_X_Y_Z_COORDINATES
-    switch ( m_spellInfo->Id )
-    {
-        // Dimensional Ripper - Everlook
-        case 23442:
+        case SPELLFAMILY_DEATHKNIGHT:
         {
-            int32 r = irand(0, 119);
-            if ( r >= 70 )                                  // 7/12 success
+            // Corpse Explosion
+            if (m_spellInfo->GetSpellIconID() == 1737)
             {
-                if ( r < 100 )                              // 4/12 evil twin
-                    m_caster->CastSpell(m_caster, 23445, true);
-                else                                        // 1/12 fire
-                    m_caster->CastSpell(m_caster, 23449, true);
+                // Living ghoul as a target
+                if (unitTarget->isAlive() && unitTarget->GetObjectGuid().IsPet() && unitTarget->GetEntry() == 26125)
+                {
+                    int32 bp = int32(unitTarget->GetMaxHealth()/4.0f);
+                    unitTarget->CastCustomSpell(unitTarget,47496,&bp,NULL,NULL,true);
+                    unitTarget->CastSpell(unitTarget, 53730, true, NULL, NULL, m_caster->GetObjectGuid());
+                    unitTarget->CastSpell(unitTarget,43999,true);
+                    ((Pet*)unitTarget)->Unsummon(PET_SAVE_AS_DELETED);
+                }
+                else if (!unitTarget->isAlive())
+                {
+                    m_caster->CastSpell(unitTarget, 50444, true, NULL, NULL, m_caster->GetObjectGuid());
+                    m_caster->CastSpell(unitTarget, 53730, true, NULL, NULL, m_caster->GetObjectGuid());
+                    if (unitTarget->GetTypeId() == TYPEID_UNIT && unitTarget->getDeathState() == CORPSE)
+                        ((Creature*)unitTarget)->RemoveCorpse();
+                }
+                return;
             }
-            return;
-        }
-        // Ultrasafe Transporter: Toshley's Station
-        case 36941:
-        {
-            if ( roll_chance_i(50) )                        // 50% success
+            // Death Coil
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_DEATH_COIL>())
             {
-                int32 rand_eff = urand(1, 7);
-                switch ( rand_eff )
+                if (m_caster->IsFriendlyTo(unitTarget))
                 {
-                    case 1:
-                        // soul split - evil
-                        m_caster->CastSpell(m_caster, 36900, true);
-                        break;
-                    case 2:
-                        // soul split - good
-                        m_caster->CastSpell(m_caster, 36901, true);
-                        break;
-                    case 3:
-                        // Increase the size
-                        m_caster->CastSpell(m_caster, 36895, true);
-                        break;
-                    case 4:
-                        // Decrease the size
-                        m_caster->CastSpell(m_caster, 36893, true);
-                        break;
-                    case 5:
-                    // Transform
+                    if (!unitTarget || unitTarget->GetCreatureType() != CREATURE_TYPE_UNDEAD)
+                        return;
+
+                    int32 bp = int32(damage * 1.5f);
+                    m_caster->CastCustomSpell(unitTarget, 47633, &bp, NULL, NULL, true);
+                }
+                else
+                {
+                    int32 bp = damage;
+                    m_caster->CastCustomSpell(unitTarget, 47632, &bp, NULL, NULL, true);
+                }
+                return;
+            }
+            // Hungering Cold
+            else if (m_spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_HUNGERING_COLD>())
+            {
+                m_caster->CastSpell(m_caster, 51209, true);
+                return;
+            }
+            // Death Strike
+            else if (m_spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_DEATH_STRIKE>())
+            {
+                uint32 count = 0;
+                Unit::SpellAuraHolderMap const& auras = unitTarget->GetSpellAuraHolderMap();
+                for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
+                {
+                    if (itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE &&
+                        itr->second->GetCasterGuid() == m_caster->GetObjectGuid())
                     {
-                        if (((Player*)m_caster)->GetTeam() == ALLIANCE )
-                            m_caster->CastSpell(m_caster, 36897, true);
-                        else
-                            m_caster->CastSpell(m_caster, 36899, true);
-                        break;
+                        ++count;
+                        // max. 15%
+                        if (count == 3)
+                            break;
                     }
-                    case 6:
-                        // chicken
-                        m_caster->CastSpell(m_caster, 36940, true);
-                        break;
-                    case 7:
-                        // evil twin
-                        m_caster->CastSpell(m_caster, 23445, true);
+                }
+
+                int32 bp = int32(count * m_caster->GetMaxHealth() * m_spellInfo->DmgMultiplier[EFFECT_INDEX_0] / 100);
+
+                // Improved Death Strike (percent stored in nonexistent EFFECT_INDEX_2 effect base points)
+                Unit::AuraList const& auraMod = m_caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER);
+                for(Unit::AuraList::const_iterator iter = auraMod.begin(); iter != auraMod.end(); ++iter)
+                {
+                    // only required spell have spellicon for SPELL_AURA_ADD_FLAT_MODIFIER
+                    if ((*iter)->GetSpellProto()->GetSpellIconID() == 2751 && (*iter)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT)
+                    {
+                        bp += (*iter)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_2) * bp / 100;
                         break;
+                    }
                 }
+
+                m_caster->CastCustomSpell(m_caster, 45470, &bp, NULL, NULL, true);
+                return;
             }
-            return;
-        }
-        // Dimensional Ripper - Area 52
-        case 36890:
-        {
-            if ( roll_chance_i(50) )                        // 50% success
+            // Death Grip
+            else if (m_spellInfo->Id == 49576)
             {
-                int32 rand_eff = urand(1, 4);
-                switch ( rand_eff )
+                if (!unitTarget)
+                    return;
+
+                m_caster->CastSpell(unitTarget, 49560, true);
+                return;
+            }
+            else if (m_spellInfo->Id == 49560)
+            {
+                if (!unitTarget || unitTarget == m_caster)
+                    return;
+
+                uint32 spellId = m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_0);
+                float dest_x, dest_y;
+                m_caster->GetNearPoint2D(dest_x, dest_y, m_caster->GetObjectBoundingRadius() + unitTarget->GetObjectBoundingRadius(), m_caster->GetOrientation());
+                unitTarget->CastSpell(dest_x, dest_y, m_caster->GetPositionZ()+0.5f, spellId, true,NULL,NULL,m_caster->GetObjectGuid(),m_spellInfo);
+                return;
+            }
+            // Corpse Explosion. Execute for Effect1 only
+            else if (m_spellInfo->GetSpellIconID() == 1737 && eff_idx == EFFECT_INDEX_1)
+            {
+                if (!unitTarget)
+                    return;
+
+                // casting on a ghoul-pet makes it explode! :D
+                // target validation is done in Spell:SetTargetMap
+                if (unitTarget->GetEntry() == 26125 && unitTarget->isAlive() )
                 {
-                    case 1:
-                        // soul split - evil
-                        m_caster->CastSpell(m_caster, 36900, true);
-                        break;
-                    case 2:
-                        // soul split - good
-                        m_caster->CastSpell(m_caster, 36901, true);
-                        break;
-                    case 3:
-                        // Increase the size
-                        m_caster->CastSpell(m_caster, 36895, true);
-                        break;
-                    case 4:
-                    // Transform
+                    int32 bp0 = int32(unitTarget->GetMaxHealth() * 0.25); // AoE dmg
+                    int32 bp1 = int32(unitTarget->GetHealth() ); // self damage
+                    unitTarget->InterruptNonMeleeSpells(false);
+                    unitTarget->CastCustomSpell(unitTarget, 47496, &bp0, &bp1, 0, false);
+                }
+                else
+                {
+                    int32 damage = m_spellInfo->CalculateSimpleValue(SpellEffectIndex(EFFECT_INDEX_0));
+                    uint32 spell = m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_1);
+
+                    m_caster->CastSpell(unitTarget, 51270, true); // change modelId (is this generic spell for this kind of spells?)
+                    m_caster->CastCustomSpell(unitTarget, spell, &damage, NULL, NULL, true);
+                }
+                return;
+            }
+            // Obliterate
+            else if (m_spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_OBLITERATE>())
+            {
+                // search for Annihilation
+                Unit::AuraList const& dummyList = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
+                for (Unit::AuraList::const_iterator itr = dummyList.begin(); itr != dummyList.end(); ++itr)
+                {
+                    if ((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && (*itr)->GetSpellProto()->GetSpellIconID() == 2710)
                     {
-                        if (((Player*)m_caster)->GetTeam() == ALLIANCE )
-                            m_caster->CastSpell(m_caster, 36897, true);
+                        if (roll_chance_i((*itr)->GetModifier()->m_amount)) // don't consume if found
+                            return;
                         else
-                            m_caster->CastSpell(m_caster, 36899, true);
-                        break;
+                            break;
                     }
                 }
+
+                // consume diseases
+                unitTarget->RemoveAurasWithDispelType(DISPEL_DISEASE, m_caster->GetObjectGuid());
             }
-            return;
+            break;
         }
     }
-}
-
-void Spell::EffectApplyAura(SpellEffectIndex eff_idx)
-{
-    if(!unitTarget)
-        return;
 
-    // ghost spell check, allow apply any auras at player loading in ghost mode (will be cleanup after load)
-    if ( (!unitTarget->isAlive() && !(IsDeathOnlySpell(m_spellInfo) || IsDeathPersistentSpell(m_spellInfo))) &&
-        (unitTarget->GetTypeId() != TYPEID_PLAYER || !((Player*)unitTarget)->GetSession()->PlayerLoading()) )
-        return;
+    // Linked spells (DUMMYEFFECT chain)
+    SpellLinkedSet linkedSet = sSpellMgr.GetSpellLinked(m_spellInfo->Id, SPELL_LINKED_TYPE_DUMMYEFFECT);
+    if (linkedSet.size() > 0)
+    {
+        for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+            m_caster->CastSpell(unitTarget ? unitTarget : m_caster, *itr, true, NULL, NULL, m_caster->GetObjectGuid(), m_spellInfo);
+    }
 
-    Unit* caster = GetAffectiveCaster();
-    if(!caster)
+    // pet auras
+    if (PetAura const* petSpell = sSpellMgr.GetPetAura(m_spellInfo->Id, eff_idx))
     {
-        // FIXME: currently we can't have auras applied explicitly by gameobjects
-        // so for auras from wild gameobjects (no owner) target used
-        if (m_originalCasterGUID.IsGameObject())
-            caster = unitTarget;
-        else
-            return;
+        m_caster->AddPetAura(petSpell);
+        return;
     }
 
-    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell: Aura is: %u", m_spellInfo->EffectApplyAuraName[eff_idx]);
+    // Script based implementation. Must be used only for not good for implementation in core spell effects
+    // So called only for not processed cases
+    bool libraryResult = false;
+    if (gameObjTarget)
+        libraryResult = sScriptMgr.OnEffectDummy(m_caster, m_spellInfo->Id, eff_idx, gameObjTarget, m_originalCasterGuid);
+    else if (unitTarget && unitTarget->GetTypeId() == TYPEID_UNIT)
+        libraryResult = sScriptMgr.OnEffectDummy(m_caster, m_spellInfo->Id, eff_idx, (Creature*)unitTarget, m_originalCasterGuid);
+    else if (itemTarget)
+        libraryResult = sScriptMgr.OnEffectDummy(m_caster, m_spellInfo->Id, eff_idx, itemTarget, m_originalCasterGuid);
+
+    if (libraryResult || !unitTarget)
+        return;
+
+    // Previous effect might have started script
+    if (!ScriptMgr::CanSpellEffectStartDBScript(m_spellInfo, eff_idx))
+        return;
 
-    Aura* aur = CreateAura(m_spellInfo, eff_idx, &m_currentBasePoints[eff_idx], m_spellAuraHolder, unitTarget, caster, m_CastItem);
-    m_spellAuraHolder->AddAura(aur, eff_idx);
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell ScriptStart spellid %u in EffectDummy", m_spellInfo->Id);
+    m_caster->GetMap()->ScriptsStart(sSpellScripts, m_spellInfo->Id, m_caster, unitTarget);
 }
 
-void Spell::EffectUnlearnSpecialization(SpellEffectIndex eff_idx)
+void Spell::EffectTriggerSpellWithValue(SpellEffectIndex eff_idx)
 {
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
-        return;
+    uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[eff_idx];
 
-    Player *_player = (Player*)unitTarget;
-    uint32 spellToUnlearn = m_spellInfo->EffectTriggerSpell[eff_idx];
+    // normal case
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry( triggered_spell_id );
 
-    _player->removeSpell(spellToUnlearn);
+    if (!spellInfo)
+    {
+        sLog.outError("EffectTriggerSpellWithValue of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id);
+        return;
+    }
 
-    DEBUG_LOG( "Spell: Player %u has unlearned spell %u from NpcGUID: %u", _player->GetGUIDLow(), spellToUnlearn, m_caster->GetGUIDLow() );
+    int32 bp = damage;
+    m_caster->CastCustomSpell(unitTarget, triggered_spell_id, &bp, &bp, &bp, true, m_CastItem , NULL, m_originalCasterGuid, m_spellInfo);
 }
 
-void Spell::EffectPowerDrain(SpellEffectIndex eff_idx)
+void Spell::EffectTriggerRitualOfSummoning(SpellEffectIndex eff_idx)
 {
-    if(m_spellInfo->EffectMiscValue[eff_idx] < 0 || m_spellInfo->EffectMiscValue[eff_idx] >= MAX_POWERS)
-        return;
-
-    Powers drain_power = Powers(m_spellInfo->EffectMiscValue[eff_idx]);
+    uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[eff_idx];
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry( triggered_spell_id );
 
-    if(!unitTarget)
-        return;
-    if(!unitTarget->isAlive())
-        return;
-    if(unitTarget->getPowerType() != drain_power)
-        return;
-    if(damage < 0)
+    if (!spellInfo)
+    {
+        sLog.outError("EffectTriggerRitualOfSummoning of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id);
         return;
+    }
 
-    uint32 curPower = unitTarget->GetPower(drain_power);
+    finish();
 
-    //add spell damage bonus
-    damage = m_caster->SpellDamageBonusDone(unitTarget,m_spellInfo,uint32(damage),SPELL_DIRECT_DAMAGE);
-    damage = unitTarget->SpellDamageBonusTaken(m_caster, m_spellInfo, uint32(damage),SPELL_DIRECT_DAMAGE);
+    m_caster->CastSpell(unitTarget,spellInfo,false);
+}
 
-    // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
-    uint32 power = damage;
-    if (drain_power == POWER_MANA)
-        power -= unitTarget->GetSpellCritDamageReduction(power);
+void Spell::EffectClearQuest(SpellEffectIndex eff_idx)
+{
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+        return;
 
-    int32 new_damage;
-    if(curPower < power)
-        new_damage = curPower;
-    else
-        new_damage = power;
+    Player *player = (Player*)m_caster;
 
-    unitTarget->ModifyPower(drain_power,-new_damage);
+    uint32 quest_id = m_spellInfo->EffectMiscValue[eff_idx];
 
-    // Don`t restore from self drain
-    if(drain_power == POWER_MANA && m_caster != unitTarget)
+    if (!sObjectMgr.GetQuestTemplate(quest_id))
     {
-        float manaMultiplier = m_spellInfo->EffectMultipleValue[eff_idx];
-        if(manaMultiplier==0)
-            manaMultiplier = 1;
-
-        if(Player *modOwner = m_caster->GetSpellModOwner())
-            modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, manaMultiplier);
+        sLog.outError("Spell::EffectClearQuest spell entry %u attempt clear quest entry %u but this quest does not exist.", m_spellInfo->Id, quest_id);
+        return;
+    }
 
-        int32 gain = int32(new_damage * manaMultiplier);
+    // remove quest possibly in quest log (is that expected?)
+    for(uint16 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot)
+    {
+        uint32 quest = player->GetQuestSlotQuestId(slot);
 
-        m_caster->EnergizeBySpell(m_caster, m_spellInfo->Id, gain, POWER_MANA);
+        if (quest == quest_id)
+        {
+            player->SetQuestSlot(slot, 0);
+            // ignore unequippable quest items in this case, it will still be equipped
+            player->TakeQuestSourceItem(quest_id, false);
+        }
     }
-}
-
-void Spell::EffectSendEvent(SpellEffectIndex effectIndex)
-{
-    /*
-    we do not handle a flag dropping or clicking on flag in battleground by sendevent system
-    */
-    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell ScriptStart %u for spellid %u in EffectSendEvent ", m_spellInfo->EffectMiscValue[effectIndex], m_spellInfo->Id);
 
-    if (!sScriptMgr.OnProcessEvent(m_spellInfo->EffectMiscValue[effectIndex], m_caster, focusObject, true))
-        m_caster->GetMap()->ScriptsStart(sEventScripts, m_spellInfo->EffectMiscValue[effectIndex], m_caster, focusObject);
+    player->SetQuestStatus(quest_id, QUEST_STATUS_NONE);
+    if (QuestStatusData* data = player->GetQuestStatusData(quest_id))
+        data->m_rewarded = false;
 }
 
-void Spell::EffectPowerBurn(SpellEffectIndex eff_idx)
+void Spell::EffectForceCast(SpellEffectIndex eff_idx)
 {
-    if (m_spellInfo->EffectMiscValue[eff_idx] < 0 || m_spellInfo->EffectMiscValue[eff_idx] >= MAX_POWERS)
-        return;
-
-    Powers powertype = Powers(m_spellInfo->EffectMiscValue[eff_idx]);
-
     if (!unitTarget)
         return;
-    if (!unitTarget->isAlive())
-        return;
-    if (unitTarget->getPowerType()!=powertype)
-        return;
-    if (damage < 0)
+
+    Unit* caster = GetAffectiveUnitCaster();
+    if (!caster)
         return;
 
-    // burn x% of target's mana, up to maximum of 2x% of caster's mana (Mana Burn)
-    if (m_spellInfo->ManaCostPercentage)
+    uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[eff_idx];
+
+    // normal case
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(triggered_spell_id);
+
+    if (!spellInfo)
     {
-        int32 maxdamage = m_caster->GetMaxPower(powertype) * damage * 2 / 100;
-        damage = unitTarget->GetMaxPower(powertype) * damage / 100;
-        if(damage > maxdamage)
-            damage = maxdamage;
+        sLog.outError("Spell::EffectForceCast of spell %u: triggering unknown spell %u (caster %s)", m_spellInfo->Id, triggered_spell_id, caster ? caster->GetObjectGuid().GetString().c_str() : "<none>");
+        return;
     }
 
-    int32 curPower = int32(unitTarget->GetPower(powertype));
-
-    // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
-    int32 power = damage;
-    if (powertype == POWER_MANA)
-        power -= unitTarget->GetSpellCritDamageReduction(power);
+    bool b_castBack = false;
 
-    int32 new_damage = (curPower < power) ? curPower : power;
+    // in some cases requred spell direction target->caster
+    for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        if (spellInfo->Effect[i] == SPELL_EFFECT_NONE)
+            continue;
 
-    unitTarget->ModifyPower(powertype, -new_damage);
-    float multiplier = m_spellInfo->EffectMultipleValue[eff_idx];
+        if (spellInfo->EffectImplicitTargetA[i] == TARGET_DUELVSPLAYER &&
+            spellInfo->EffectImplicitTargetB[i] == TARGET_NONE)
+        {
+            b_castBack = true;
+            break;
+        }
 
-    if (Player *modOwner = m_caster->GetSpellModOwner())
-        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, multiplier);
+        if (spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA &&
+            spellInfo->EffectApplyAuraName[i] == SPELL_AURA_CONTROL_VEHICLE)
+        {
+            b_castBack = true;
+            break;
+        }
+    }
 
-    new_damage = int32(new_damage * multiplier);
-    m_damage += new_damage;
+    unitTarget->CastSpell(b_castBack ? caster : unitTarget, spellInfo, true, m_CastItem, NULL, b_castBack ? unitTarget->GetObjectGuid() : m_originalCasterGuid, m_spellInfo);
 }
 
-void Spell::EffectHeal(SpellEffectIndex /*eff_idx*/)
+void Spell::EffectTriggerSpell(SpellEffectIndex effIndex)
 {
-    if (unitTarget && unitTarget->isAlive() && damage >= 0)
+    // only unit case known
+    if (!unitTarget)
     {
-        // Try to get original caster
-        Unit *caster = GetAffectiveCaster();
-        if (!caster)
-            return;
+        if (gameObjTarget || itemTarget)
+            sLog.outError("Spell::EffectTriggerSpell (Spell: %u): Unsupported non-unit case!",m_spellInfo->Id);
+        return;
+    }
 
-        int32 addhealth = damage;
+    uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[effIndex];
 
-        // Seal of Light proc
-        if (m_spellInfo->Id == 20167)
+    // special cases
+    switch(triggered_spell_id)
+    {
+        case 18461:                                         // Vanish (not exist)
         {
-            float ap = caster->GetTotalAttackPowerValue(BASE_ATTACK);
-            int32 holy = caster->SpellBaseHealingBonusDone(GetSpellSchoolMask(m_spellInfo));
-            if (holy < 0)
-                holy = 0;
-            addhealth += int32(ap * 0.15) + int32(holy * 15 / 100);
+            unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
+            unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
+            unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STALKED);
+
+            uint32 spellId = 1784;
+            // reset cooldown on it if needed
+            if (unitTarget->HasSpellCooldown(spellId))
+                unitTarget->RemoveSpellCooldown(spellId);
+
+            m_caster->CastSpell(unitTarget, spellId, true);
+            return;
         }
-        // Vessel of the Naaru (Vial of the Sunwell trinket)
-        else if (m_spellInfo->Id == 45064)
+        // just skip
+        case 23770:                                         // Sayge's Dark Fortune of *
+            // not exist, common cooldown can be implemented in scripts if need.
+            return;
+        case 29284:                                         // Brittle Armor - (need add max stack of 24575 Brittle Armor)
+            m_caster->CastSpell(unitTarget, 24575, true, m_CastItem, NULL, m_originalCasterGuid);
+            return;
+        case 29286:                                         // Mercurial Shield - (need add max stack of 26464 Mercurial Shield)
+            m_caster->CastSpell(unitTarget, 26464, true, m_CastItem, NULL, m_originalCasterGuid);
+            return;
+        case 31980:                                         // Righteous Defense
         {
-            // Amount of heal - depends from stacked Holy Energy
-            int damageAmount = 0;
-            Unit::AuraList const& mDummyAuras = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
-            for(Unit::AuraList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)
-                if ((*i)->GetId() == 45062)
-                    damageAmount+=(*i)->GetModifier()->m_amount;
-            if (damageAmount)
-                m_caster->RemoveAurasDueToSpell(45062);
-
-            addhealth += damageAmount;
+            m_caster->CastSpell(unitTarget, 31790, true, m_CastItem, NULL, m_originalCasterGuid);
+            return;
         }
-        // Death Pact (percent heal)
-        else if (m_spellInfo->Id==48743)
-            addhealth = addhealth * unitTarget->GetMaxHealth() / 100;
-        // Swiftmend - consumes Regrowth or Rejuvenation
-        else if (m_spellInfo->TargetAuraState == AURA_STATE_SWIFTMEND && unitTarget->HasAuraState(AURA_STATE_SWIFTMEND))
+        case 35729:                                         // Cloak of Shadows
         {
-            Unit::AuraList const& RejorRegr = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_HEAL);
-            // find most short by duration
-            Aura *targetAura = NULL;
-            for(Unit::AuraList::const_iterator i = RejorRegr.begin(); i != RejorRegr.end(); ++i)
+            std::set<uint32> toRemoveSpellList;
+            Unit::SpellAuraHolderMap& Auras = unitTarget->GetSpellAuraHolderMap();
+            for(Unit::SpellAuraHolderMap::iterator iter = Auras.begin(); iter != Auras.end(); ++iter)
             {
-                if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DRUID &&
-                    // Regrowth or Rejuvenation 0x40 | 0x10
-                    ((*i)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000000050)))
+                SpellAuraHolderPtr holder = iter->second;
+                if (!holder || holder->IsDeleted())
+                    continue;
+                // Remove all harmful spells on you except positive/passive/physical auras
+                if (!holder->IsPositive() &&
+                    !holder->IsPassive() &&
+                    !holder->IsDeathPersistent() &&
+                    (GetSpellSchoolMask(holder->GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL) == 0)
                 {
-                    if (!targetAura || (*i)->GetAuraDuration() < targetAura->GetAuraDuration())
-                        targetAura = *i;
+                    toRemoveSpellList.insert(holder->GetId());
                 }
             }
+            for (std::set<uint32>::iterator i = toRemoveSpellList.begin(); i != toRemoveSpellList.end(); ++i)
+                m_caster->RemoveAurasDueToSpell(*i);
+            return;
+        }
+        case 41967:                                         // Priest Shadowfiend (34433) need apply mana gain trigger aura on pet
+        {
+            if (Unit *pet = unitTarget->GetPet())
+                pet->CastSpell(pet, 28305, true);
+            return;
+        }
+        case 58832:                                         // Mirror Image
+        {
+            // Glyph of Mirror Image
+            if (m_caster->HasAura(63093))
+               m_caster->CastSpell(m_caster, 65047, true);  // creates a 4th copy
+            break;
+        }
+        // Coldflame (Lord Marrowgar - Icecrown Citadel) - have casting time 0.2s, must be casted with triggered=false
+        case 69147:
+        {
+            m_caster->CastSpell(m_caster, triggered_spell_id, false);
+            return;
+        }
 
-            if (!targetAura)
-            {
-                sLog.outError("Target (GUID: %u TypeId: %u) has aurastate AURA_STATE_SWIFTMEND but no matching aura.", unitTarget->GetGUIDLow(), unitTarget->GetTypeId());
-                return;
-            }
-            int idx = 0;
-            while(idx < 3)
-            {
-                if(targetAura->GetSpellProto()->EffectApplyAuraName[idx] == SPELL_AURA_PERIODIC_HEAL)
-                    break;
-                idx++;
-            }
+    }
 
-            int32 tickheal = targetAura->GetModifier()->m_amount;
-            int32 tickcount = GetSpellDuration(targetAura->GetSpellProto()) / targetAura->GetSpellProto()->EffectAmplitude[idx] - 1;
+    // normal case
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(triggered_spell_id);
+    if (!spellInfo)
+    {
+        // No previous Effect might have started a script
+        bool startDBScript = unitTarget && ScriptMgr::CanSpellEffectStartDBScript(m_spellInfo, effIndex);
+        if (startDBScript)
+        {
+            DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell ScriptStart spellid %u in EffectTriggerSpell", m_spellInfo->Id);
+            startDBScript = m_caster->GetMap()->ScriptsStart(sSpellScripts, m_spellInfo->Id, m_caster, unitTarget);
+        }
 
-            // Glyph of Swiftmend
-            if (!caster->HasAura(54824))
-                unitTarget->RemoveAurasDueToSpell(targetAura->GetId());
+        if (!startDBScript)
+            sLog.outError("EffectTriggerSpell of spell %u: triggering unknown spell id %i", m_spellInfo->Id, triggered_spell_id);
+        return;
+    }
 
-            addhealth += tickheal * tickcount;
-        }
-        // Runic Healing Injector & Healing Potion Injector effect increase for engineers
-        else if ((m_spellInfo->Id == 67486 || m_spellInfo->Id == 67489) && unitTarget->GetTypeId() == TYPEID_PLAYER)
+    // select formal caster for triggered spell
+    Unit* caster = m_caster;
+
+    // some triggered spells require specific equipment
+    if (spellInfo->EquippedItemClass >=0 && m_caster->GetTypeId()==TYPEID_PLAYER)
+    {
+        // main hand weapon required
+        if (spellInfo->HasAttribute(SPELL_ATTR_EX3_MAIN_HAND))
         {
-            Player* player = (Player*)unitTarget;
-            if (player->HasSkill(SKILL_ENGINEERING))
-                addhealth += int32(addhealth * 0.25);
+            Item* item = ((Player*)m_caster)->GetWeaponForAttack(BASE_ATTACK, true, false);
+
+            // skip spell if no weapon in slot or broken
+            if (!item)
+                return;
+
+            // skip spell if weapon not fit to triggered spell
+            if (!item->IsFitToSpellRequirements(spellInfo))
+                return;
         }
 
-        // Chain Healing
-        if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000100))
+        // offhand hand weapon required
+        if (spellInfo->HasAttribute(SPELL_ATTR_EX3_REQ_OFFHAND))
         {
-            if (unitTarget == m_targets.getUnitTarget())
-            {
-                // check for Riptide
-                Aura* riptide = unitTarget->GetAura(SPELL_AURA_PERIODIC_HEAL, SPELLFAMILY_SHAMAN, UI64LIT(0x0), 0x00000010, caster->GetObjectGuid());
-                if (riptide)
-                {
-                    addhealth += addhealth/4;
-                    unitTarget->RemoveAurasDueToSpell(riptide->GetId());
-                }
-            }
+            Item* item = ((Player*)m_caster)->GetWeaponForAttack(OFF_ATTACK, true, false);
+
+            // skip spell if no weapon in slot or broken
+            if (!item)
+                return;
+
+            // skip spell if weapon not fit to triggered spell
+            if (!item->IsFitToSpellRequirements(spellInfo))
+                return;
         }
+    }
+    else if ((spellInfo->Targets & TARGET_FLAG_DEST_LOCATION) &&
+         (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
+    {
+        // Init dest coordinates
+        WorldLocation loc = m_targets.getDestination();
+        m_caster->RemoveSpellCooldown(triggered_spell_id);
 
-        addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, addhealth, HEAL);
-        addhealth = unitTarget->SpellHealingBonusTaken(caster, m_spellInfo, addhealth, HEAL);
+        MaNGOS::NormalizeMapCoord(loc.x);
+        MaNGOS::NormalizeMapCoord(loc.y);
+        m_caster->UpdateAllowedPositionZ(loc.x,loc.y,loc.z);
 
-        m_healing += addhealth;
+        m_caster->CastSpell(loc, spellInfo, true, NULL, NULL, m_originalCasterGuid);
+        return;
+    }
+    else
+    {
+        // Note: not exist spells with weapon req. and IsSpellHaveCasterSourceTargets == true
+        // so this just for speedup places in else
+        caster = IsSpellWithCasterSourceTargetsOnly(spellInfo) ? unitTarget : m_caster;
     }
+
+    caster->CastSpell(unitTarget, spellInfo, true, m_CastItem, NULL, m_originalCasterGuid, m_spellInfo);
 }
 
-void Spell::EffectHealPct(SpellEffectIndex /*eff_idx*/)
+void Spell::EffectTriggerMissileSpell(SpellEffectIndex effect_idx)
 {
-    if (unitTarget && unitTarget->isAlive() && damage >= 0)
+    uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[effect_idx];
+
+    // normal case
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(triggered_spell_id);
+
+    if (!spellInfo)
     {
-        // Try to get original caster
-        Unit *caster = GetAffectiveCaster();
-        if (!caster)
-            return;
+        sLog.outError("Spell::EffectTriggerMissileSpell spell %u (eff: %u): triggering unknown spell id %u",
+            m_spellInfo->Id,effect_idx,triggered_spell_id);
+        return;
+    }
 
-        uint32 addhealth = unitTarget->GetMaxHealth() * damage / 100;
+    m_caster->RemoveSpellCooldown(triggered_spell_id);
 
-        addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, addhealth, HEAL);
-        addhealth = unitTarget->SpellHealingBonusTaken(caster, m_spellInfo, addhealth, HEAL);
+    if ((m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) || m_caster == unitTarget )
+    {
+        // Init dest coordinates
+        WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                            m_targets.getDestination() :
+                            m_caster->GetPosition();
 
-        uint32 absorb = 0;
-        unitTarget->CalculateHealAbsorb(addhealth, &absorb);
+        Unit* target = unitTarget ? unitTarget : m_caster;
 
-        int32 gain = caster->DealHeal(unitTarget, addhealth - absorb, m_spellInfo, false, absorb);
-        unitTarget->getHostileRefManager().threatAssist(caster, float(gain) * 0.5f * sSpellMgr.GetSpellThreatMultiplier(m_spellInfo), m_spellInfo);
-    }
-}
+        MaNGOS::NormalizeMapCoord(loc.x);
+        MaNGOS::NormalizeMapCoord(loc.y);
 
-void Spell::EffectHealMechanical(SpellEffectIndex /*eff_idx*/)
-{
-    // Mechanic creature type should be correctly checked by targetCreatureType field
-    if (unitTarget && unitTarget->isAlive() && damage >= 0)
-    {
-        // Try to get original caster
-        Unit *caster = GetAffectiveCaster();
-        if (!caster)
-            return;
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::EffectTriggerMissileSpell %s spell %u (eff %u): triggering spell %u with coords %f %f %f",
+            m_CastItem ?  "Item" : "",
+            m_spellInfo->Id,
+            effect_idx,
+            triggered_spell_id,
+            loc.x, loc.y, loc.z);
 
-        uint32 addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, damage, HEAL);
-        addhealth = unitTarget->SpellHealingBonusTaken(caster, m_spellInfo, addhealth, HEAL);
+        target->CastSpell(loc, spellInfo, true, m_CastItem, NULL, m_originalCasterGuid, m_spellInfo);
+    }
+    else
+    {
+        Unit* caster = IsSpellWithCasterSourceTargetsOnly(spellInfo) ? unitTarget : m_caster;
 
-        uint32 absorb = 0;
-        unitTarget->CalculateHealAbsorb(addhealth, &absorb);
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::EffectTriggerMissileSpell %s spell %u (eff %u): triggering spell %u to %s without coords",
+            m_CastItem ?  "Item" : "",
+            m_spellInfo->Id,
+            effect_idx,
+            triggered_spell_id,
+            unitTarget->GetObjectGuid().GetString().c_str());
 
-        caster->DealHeal(unitTarget, addhealth - absorb, m_spellInfo, false, absorb);
+        caster->CastSpell(unitTarget, spellInfo, true, m_CastItem, NULL, m_originalCasterGuid, m_spellInfo);
     }
 }
 
-void Spell::EffectHealthLeech(SpellEffectIndex eff_idx)
+void Spell::EffectJump(SpellEffectIndex eff_idx)
 {
-    if (!unitTarget)
-        return;
-    if (!unitTarget->isAlive())
-        return;
-
-    if (damage < 0)
+    if (m_caster->IsTaxiFlying())
         return;
 
-    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "HealthLeech :%i", damage);
+    // Init dest coordinates
+    Unit* pTarget = NULL;
+    WorldLocation loc = m_caster->GetPosition();
+    if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
+    {
+        loc = m_targets.getDestination();
 
-    uint32 curHealth = unitTarget->GetHealth();
-    damage = m_caster->SpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, damage );
-    if ((int32)curHealth < damage)
-        damage = curHealth;
-
-    float multiplier = m_spellInfo->EffectMultipleValue[eff_idx];
-
-    if (Player *modOwner = m_caster->GetSpellModOwner())
-        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, multiplier);
-
-    int32 heal = int32(damage*multiplier);
-    if (m_caster->isAlive())
-    {
-        heal = m_caster->SpellHealingBonusTaken(m_caster, m_spellInfo, heal, HEAL);
-
-        uint32 absorb = 0;
-        m_caster->CalculateHealAbsorb(heal, &absorb);
-
-        m_caster->DealHeal(m_caster, heal - absorb, m_spellInfo, false, absorb);
-    }
-}
-
-void Spell::DoCreateItem(SpellEffectIndex eff_idx, uint32 itemtype)
-{
-    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
-        return;
-
-    Player* player = (Player*)unitTarget;
+        if (m_spellInfo->EffectImplicitTargetA[eff_idx] == TARGET_BEHIND_VICTIM)
+        {
+            // explicit cast data from client or server-side cast
+            // some spell at client send caster
+            if (m_targets.getUnitTarget() && m_targets.getUnitTarget() != m_caster)
+                pTarget = m_targets.getUnitTarget();
+            else if (Unit* pVictim = m_caster->getVictim())
+                pTarget = pVictim;
+            else if (m_caster->GetTypeId() == TYPEID_PLAYER)
+                pTarget = m_caster->GetMap()->GetUnit(((Player*)m_caster)->GetSelectionGuid());
 
-    uint32 newitemid = itemtype;
-    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype( newitemid );
-    if(!pProto)
-    {
-        player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
-        return;
+            loc.SetOrientation(pTarget ? pTarget->GetOrientation() : m_caster->GetOrientation());
+        }
+        else
+            loc.SetOrientation(m_caster->GetOrientation());
     }
-
-    // bg reward have some special in code work
-    bool bg_mark = false;
-    switch(m_spellInfo->Id)
+    else if (unitTarget)
     {
-        case SPELL_WG_MARK_VICTORY:
-        case SPELL_WG_MARK_DEFEAT:
-            bg_mark = true;
-            break;
-        default:
-            break;
+        unitTarget->GetContactPoint(m_caster, loc.x, loc.y, loc.z, CONTACT_DISTANCE);
+        pTarget = unitTarget;
     }
-
-    uint32 num_to_add = damage;
-
-    if (num_to_add < 1)
-        num_to_add = 1;
-    if (num_to_add > pProto->GetMaxStackSize())
-        num_to_add = pProto->GetMaxStackSize();
-
-    // init items_count to 1, since 1 item will be created regardless of specialization
-    int items_count=1;
-    // the chance to create additional items
-    float additionalCreateChance=0.0f;
-    // the maximum number of created additional items
-    uint8 additionalMaxNum=0;
-    // get the chance and maximum number for creating extra items
-    if ( canCreateExtraItems(player, m_spellInfo->Id, additionalCreateChance, additionalMaxNum) )
+    else if (gameObjTarget)
     {
-        // roll with this chance till we roll not to create or we create the max num
-        while ( roll_chance_f(additionalCreateChance) && items_count<=additionalMaxNum )
-            ++items_count;
+        gameObjTarget->GetContactPoint(m_caster, loc.x, loc.y, loc.z, CONTACT_DISTANCE);
     }
-
-    // really will be created more items
-    num_to_add *= items_count;
-
-    // can the player store the new item?
-    ItemPosCountVec dest;
-    uint32 no_space = 0;
-    InventoryResult msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, newitemid, num_to_add, &no_space );
-    if (msg != EQUIP_ERR_OK)
+    else
     {
-        // convert to possible store amount
-        if (msg == EQUIP_ERR_INVENTORY_FULL || msg == EQUIP_ERR_CANT_CARRY_MORE_OF_THIS)
-            num_to_add -= no_space;
-        else
-        {
-            // ignore mana gem case (next effect will recharge existing example)
-            if (eff_idx == EFFECT_INDEX_0 && m_spellInfo->Effect[EFFECT_INDEX_1] == SPELL_EFFECT_DUMMY )
-                return;
-
-            // if not created by another reason from full inventory or unique items amount limitation
-            player->SendEquipError( msg, NULL, NULL, newitemid );
-            return;
-        }
+        sLog.outError( "Spell::EffectJump - unsupported target mode for spell ID %u", m_spellInfo->Id );
+        return;
     }
 
-    if(num_to_add)
-    {
-        // create the new item and store it
-        Item* pItem = player->StoreNewItem( dest, newitemid, true, Item::GenerateItemRandomPropertyId(newitemid));
-
-        // was it successful? return error if not
-        if(!pItem)
-        {
-            player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
-            return;
-        }
-
-        // set the "Crafted by ..." property of the item
-        if (pItem->GetProto()->Class != ITEM_CLASS_CONSUMABLE && pItem->GetProto()->Class != ITEM_CLASS_QUEST)
-            pItem->SetGuidValue(ITEM_FIELD_CREATOR, player->GetObjectGuid());
-
-        // send info to the client
-        player->SendNewItem(pItem, num_to_add, true, !bg_mark);
+    int32 speed_z = m_spellInfo->EffectMiscValue[eff_idx];
+    if (!speed_z)
+        speed_z = 5;
+    int32 speed_xy = m_spellInfo->EffectMiscValueB[eff_idx];
+    if (!speed_xy)
+        speed_xy = 150;
 
-        // we succeeded in creating at least one item, so a levelup is possible
-        if(!bg_mark)
-            player->UpdateCraftSkill(m_spellInfo->Id);
-    }
-}
+    if (pTarget == m_caster)
+        pTarget = NULL;
 
-void Spell::EffectCreateItem(SpellEffectIndex eff_idx)
-{
-    DoCreateItem(eff_idx,m_spellInfo->EffectItemType[eff_idx]);
+    m_caster->MonsterMoveToDestination(loc.x, loc.y, loc.z, loc.o, float(speed_xy) / 2, float(speed_z) / 10, false, pTarget);
 }
 
-void Spell::EffectCreateItem2(SpellEffectIndex eff_idx)
+void Spell::EffectTeleportUnits(SpellEffectIndex eff_idx)   // TODO - Use target settings for this effect!
 {
-    if (m_caster->GetTypeId()!=TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->IsTaxiFlying())
         return;
-    Player* player = (Player*)m_caster;
 
-    // explicit item (possible fake)
-    uint32 item_id = m_spellInfo->EffectItemType[eff_idx];
-
-    if (item_id)
-        DoCreateItem(eff_idx, item_id);
+    // Target dependend on TargetB, if there is none provided, decide dependend on A
+    uint32 targetType = m_spellInfo->EffectImplicitTargetB[eff_idx];
+    if (!targetType)
+        targetType = m_spellInfo->EffectImplicitTargetA[eff_idx];
 
-    // not explicit loot (with fake item drop if need)
-    if (IsLootCraftingSpell(m_spellInfo))
+    switch (targetType)
     {
-        if(item_id)
+        case TARGET_INNKEEPER_COORDINATES:
         {
-            if (!player->HasItemCount(item_id, 1))
+            // Only players can teleport to innkeeper
+            if (unitTarget->GetTypeId() != TYPEID_PLAYER)
                 return;
 
-            // remove reagent
-            uint32 count = 1;
-            player->DestroyItemCount(item_id, count, true);
-        }
-
-        // create some random items
-        player->AutoStoreLoot(m_spellInfo->Id, LootTemplates_Spell);
-    }
-}
-
-void Spell::EffectCreateRandomItem(SpellEffectIndex /*eff_idx*/)
-{
-    if (m_caster->GetTypeId()!=TYPEID_PLAYER)
-        return;
-    Player* player = (Player*)m_caster;
-
-    // create some random items
-    player->AutoStoreLoot(m_spellInfo->Id, LootTemplates_Spell);
-}
-
-void Spell::EffectPersistentAA(SpellEffectIndex eff_idx)
-{
-    Unit* pCaster = GetAffectiveCaster();
-    // FIXME: in case wild GO will used wrong affective caster (target in fact) as dynobject owner
-    if (!pCaster)
-        pCaster = m_caster;
-
-    float radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[eff_idx]));
-
-    if (Player* modOwner = pCaster->GetSpellModOwner())
-        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius);
-
-    DynamicObject* dynObj = new DynamicObject;
-    if (!dynObj->Create(pCaster->GetMap()->GenerateLocalLowGuid(HIGHGUID_DYNAMICOBJECT), pCaster, m_spellInfo->Id,
-        eff_idx, m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, m_duration, radius, DYNAMIC_OBJECT_AREA_SPELL))
-    {
-        delete dynObj;
-        return;
-    }
-
-    pCaster->AddDynObject(dynObj);
-    pCaster->GetMap()->Add(dynObj);
-}
-
-void Spell::EffectEnergize(SpellEffectIndex eff_idx)
-{
-    if(!unitTarget)
-        return;
-    if(!unitTarget->isAlive())
-        return;
+            switch (m_spellInfo->Id)
+            {
+                case 48129:                                 // Scroll of Recall
+                case 60320:                                 // Scroll of Recall II
+                case 60321:                                 // Scroll of Recall III
+                {
+                    uint32 charLevel = 0;
+                    switch (m_spellInfo->Id)
+                    {
+                        case 48129: charLevel = 40; break;
+                        case 60320: charLevel = 70; break;
+                        case 60321: charLevel = 80; break;
+                        default: break;
+                    }
 
-    if(m_spellInfo->EffectMiscValue[eff_idx] < 0 || m_spellInfo->EffectMiscValue[eff_idx] >= MAX_POWERS)
-        return;
+                    if (((Player*)unitTarget)->getLevel() > charLevel)
+                    {
+                        unitTarget->CastSpell(unitTarget, 60444, true);
+                        return;
+                    }
+                }
+                default:
+                    break;
+            }
 
-    Powers power = Powers(m_spellInfo->EffectMiscValue[eff_idx]);
 
-    // Some level depends spells
-    int level_multiplier = 0;
-    int level_diff = 0;
-    switch (m_spellInfo->Id)
-    {
-        case 9512:                                          // Restore Energy
-            level_diff = m_caster->getLevel() - 40;
-            level_multiplier = 2;
-            break;
-        case 24571:                                         // Blood Fury
-            level_diff = m_caster->getLevel() - 60;
-            level_multiplier = 10;
-            break;
-        case 24532:                                         // Burst of Energy
-            level_diff = m_caster->getLevel() - 60;
-            level_multiplier = 4;
-            break;
-        case 31930:                                         // Judgements of the Wise
-        case 48542:                                         // Revitalize (mana restore case)
-        case 63375:                                         // Improved Stormstrike
-        case 68082:                                         // Glyph of Seal of Command
-            damage = damage * unitTarget->GetCreateMana() / 100;
-            break;
-        case 67487:                                         // Mana Potion Injector
-        case 67490:                                         // Runic Mana Injector
+            ((Player*)unitTarget)->TeleportToHomebind(unitTarget == m_caster ? TELE_TO_SPELL|TELE_TO_CHECKED : TELE_TO_CHECKED);
+            return;
+        }
+        case TARGET_AREAEFFECT_INSTANT:                     // in all cases first TARGET_TABLE_X_Y_Z_COORDINATES
+        case TARGET_TABLE_X_Y_Z_COORDINATES:
+        case TARGET_SELF2:
         {
-            if (unitTarget->GetTypeId() == TYPEID_PLAYER)
+            WorldLocation const* st = sSpellMgr.GetSpellTargetPosition(m_spellInfo->Id);
+            if (!st)
             {
-                Player* player = (Player*)unitTarget;
-                if (player->HasSkill(SKILL_ENGINEERING))
-                    damage += int32(damage * 0.25);
+                sLog.outError( "Spell::EffectTeleportUnits - unknown Teleport coordinates for spell ID %u", m_spellInfo->Id );
+                return;
             }
+
+            if (st->GetMapId() == unitTarget->GetMapId())
+                unitTarget->NearTeleportTo(st->x, st->y, st->z, st->orientation,unitTarget == m_caster);
+            else if (unitTarget->GetTypeId()==TYPEID_PLAYER)
+                ((Player*)unitTarget)->TeleportTo(*st, unitTarget == m_caster ? TELE_TO_SPELL : 0);
             break;
         }
-        default:
-            break;
-    }
-
-    if (level_diff > 0)
-        damage -= level_multiplier * level_diff;
+        case TARGET_EFFECT_SELECT:
+        {
+            // m_destN filled, but sometimes for wrong dest and does not have TARGET_FLAG_DEST_LOCATION
 
-    if(damage < 0)
-        return;
+            float x = unitTarget->GetPositionX();
+            float y = unitTarget->GetPositionY();
+            float z = unitTarget->GetPositionZ();
+            float orientation = m_caster->GetOrientation();
 
-    if(unitTarget->GetMaxPower(power) == 0)
-        return;
+            m_caster->NearTeleportTo(x, y, z, orientation, unitTarget == m_caster);
+            return;
+        }
+        case TARGET_BEHIND_VICTIM:
+        {
+            Unit *pTarget = NULL;
 
-    m_caster->EnergizeBySpell(unitTarget, m_spellInfo->Id, damage, power);
+            // explicit cast data from client or server-side cast
+            // some spell at client send caster
+            if (m_targets.getUnitTarget() && m_targets.getUnitTarget()!=unitTarget)
+                pTarget = m_targets.getUnitTarget();
+            else if (Unit* pVictim = unitTarget->getVictim())
+                pTarget = pVictim;
+            else if (unitTarget->GetTypeId() == TYPEID_PLAYER)
+                pTarget = unitTarget->GetMap()->GetUnit(((Player*)unitTarget)->GetSelectionGuid());
 
-    // Mad Alchemist's Potion
-    if (m_spellInfo->Id == 45051)
-    {
-        // find elixirs on target
-        uint32 elixir_mask = 0;
-        Unit::SpellAuraHolderMap& Auras = unitTarget->GetSpellAuraHolderMap();
-        for(Unit::SpellAuraHolderMap::iterator itr = Auras.begin(); itr != Auras.end(); ++itr)
+            // Init dest coordinates
+            WorldLocation loc = m_targets.getDestination();
+            loc.SetOrientation(pTarget ? pTarget->GetOrientation() : unitTarget->GetOrientation());
+            unitTarget->NearTeleportTo(loc, unitTarget == m_caster);
+            return;
+        }
+        default:
         {
-            uint32 spell_id = itr->second->GetId();
-            if(uint32 mask = sSpellMgr.GetSpellElixirMask(spell_id))
-                elixir_mask |= mask;
+            // If not exist data for dest location - return
+            if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
+            {
+                sLog.outError( "Spell::EffectTeleportUnits - unknown EffectImplicitTargetB[%u] = %u for spell ID %u", eff_idx, m_spellInfo->EffectImplicitTargetB[eff_idx], m_spellInfo->Id );
+                return;
+            }
+            // Init dest coordinates
+            WorldLocation loc = m_targets.getDestination();
+            loc.SetOrientation(unitTarget->GetOrientation());
+            // Teleport
+            unitTarget->NearTeleportTo(loc, unitTarget == m_caster);
+            return;
         }
+    }
 
-        // get available elixir mask any not active type from battle/guardian (and flask if no any)
-        elixir_mask = (elixir_mask & ELIXIR_FLASK_MASK) ^ ELIXIR_FLASK_MASK;
-
-        // get all available elixirs by mask and spell level
-        std::vector<uint32> elixirs;
-        SpellElixirMap const& m_spellElixirs = sSpellMgr.GetSpellElixirMap();
-        for(SpellElixirMap::const_iterator itr = m_spellElixirs.begin(); itr != m_spellElixirs.end(); ++itr)
+    // post effects for TARGET_TABLE_X_Y_Z_COORDINATES
+    switch ( m_spellInfo->Id )
+    {
+        // Dimensional Ripper - Everlook
+        case 23442:
         {
-            if (itr->second & elixir_mask)
+            int32 r = irand(0, 119);
+            if ( r >= 70 )                                  // 7/12 success
             {
-                if (itr->second & (ELIXIR_UNSTABLE_MASK | ELIXIR_SHATTRATH_MASK))
-                    continue;
-
-                SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
-                if (spellInfo && (spellInfo->spellLevel < m_spellInfo->spellLevel || spellInfo->spellLevel > unitTarget->getLevel()))
-                    continue;
-
-                elixirs.push_back(itr->first);
+                if ( r < 100 )                              // 4/12 evil twin
+                    m_caster->CastSpell(m_caster, 23445, true);
+                else                                        // 1/12 fire
+                    m_caster->CastSpell(m_caster, 23449, true);
             }
+            return;
         }
-
-        if (!elixirs.empty())
+        // Ultrasafe Transporter: Toshley's Station
+        case 36941:
         {
-            // cast random elixir on target
-            uint32 rand_spell = urand(0,elixirs.size()-1);
-            m_caster->CastSpell(unitTarget,elixirs[rand_spell],true,m_CastItem);
+            if ( roll_chance_i(50) )                        // 50% success
+            {
+                int32 rand_eff = urand(1, 7);
+                switch ( rand_eff )
+                {
+                    case 1:
+                        // soul split - evil
+                        m_caster->CastSpell(m_caster, 36900, true);
+                        break;
+                    case 2:
+                        // soul split - good
+                        m_caster->CastSpell(m_caster, 36901, true);
+                        break;
+                    case 3:
+                        // Increase the size
+                        m_caster->CastSpell(m_caster, 36895, true);
+                        break;
+                    case 4:
+                        // Decrease the size
+                        m_caster->CastSpell(m_caster, 36893, true);
+                        break;
+                    case 5:
+                    // Transform
+                    {
+                        if (((Player*)m_caster)->GetTeam() == ALLIANCE )
+                            m_caster->CastSpell(m_caster, 36897, true);
+                        else
+                            m_caster->CastSpell(m_caster, 36899, true);
+                        break;
+                    }
+                    case 6:
+                        // chicken
+                        m_caster->CastSpell(m_caster, 36940, true);
+                        break;
+                    case 7:
+                        // evil twin
+                        m_caster->CastSpell(m_caster, 23445, true);
+                        break;
+                }
+            }
+            return;
+        }
+        // Dimensional Ripper - Area 52
+        case 36890:
+        {
+            if ( roll_chance_i(50) )                        // 50% success
+            {
+                int32 rand_eff = urand(1, 4);
+                switch ( rand_eff )
+                {
+                    case 1:
+                        // soul split - evil
+                        m_caster->CastSpell(m_caster, 36900, true);
+                        break;
+                    case 2:
+                        // soul split - good
+                        m_caster->CastSpell(m_caster, 36901, true);
+                        break;
+                    case 3:
+                        // Increase the size
+                        m_caster->CastSpell(m_caster, 36895, true);
+                        break;
+                    case 4:
+                    // Transform
+                    {
+                        if (((Player*)m_caster)->GetTeam() == ALLIANCE )
+                            m_caster->CastSpell(m_caster, 36897, true);
+                        else
+                            m_caster->CastSpell(m_caster, 36899, true);
+                        break;
+                    }
+                }
+            }
+            return;
         }
     }
 }
 
-void Spell::EffectEnergisePct(SpellEffectIndex eff_idx)
+void Spell::EffectApplyAura(SpellEffectIndex eff_idx)
 {
     if (!unitTarget)
         return;
-    if (!unitTarget->isAlive())
-        return;
-
-    if (m_spellInfo->EffectMiscValue[eff_idx] < 0 || m_spellInfo->EffectMiscValue[eff_idx] >= MAX_POWERS)
-        return;
 
-    Powers power = Powers(m_spellInfo->EffectMiscValue[eff_idx]);
-
-    uint32 maxPower = unitTarget->GetMaxPower(power);
-    if (maxPower == 0)
+    // ghost spell check, allow apply any auras at player loading in ghost mode (will be cleanup after load)
+    if ((!unitTarget->isAlive() && !(IsDeathOnlySpell(m_spellInfo) || IsDeathPersistentSpell(m_spellInfo))) &&
+        (unitTarget->GetTypeId() != TYPEID_PLAYER || !((Player*)unitTarget)->GetSession()->PlayerLoading()))
         return;
 
-    uint32 gain = damage * maxPower / 100;
-    m_caster->EnergizeBySpell(unitTarget, m_spellInfo->Id, gain, power);
-}
-
-void Spell::SendLoot(ObjectGuid guid, LootType loottype, LockType lockType)
-{
-    if (gameObjTarget)
+    Unit* caster = GetAffectiveCaster();
+    if (!caster)
     {
-        switch (gameObjTarget->GetGoType())
-        {
-            case GAMEOBJECT_TYPE_DOOR:
-            case GAMEOBJECT_TYPE_BUTTON:
-            case GAMEOBJECT_TYPE_QUESTGIVER:
-            case GAMEOBJECT_TYPE_SPELL_FOCUS:
-            case GAMEOBJECT_TYPE_GOOBER:
-                gameObjTarget->Use(m_caster);
-                return;
-
-            case GAMEOBJECT_TYPE_CHEST:
-                gameObjTarget->Use(m_caster);
-                // Don't return, let loots been taken
-                break;
-
-            case GAMEOBJECT_TYPE_TRAP:
-                if (lockType == LOCKTYPE_DISARM_TRAP)
-                {
-                    gameObjTarget->SetLootState(GO_JUST_DEACTIVATED);
-                    return;
-                }
-                sLog.outError("Spell::SendLoot unhandled locktype %u for GameObject trap (entry %u) for spell %u.", lockType, gameObjTarget->GetEntry(), m_spellInfo->Id);
-                return;
-            default:
-                sLog.outError("Spell::SendLoot unhandled GameObject type %u (entry %u) for spell %u.", gameObjTarget->GetGoType(), gameObjTarget->GetEntry(), m_spellInfo->Id);
-                return;
-        }
+        // FIXME: currently we can't have auras applied explicitly by gameobjects
+        // so for auras from wild gameobjects (no owner) target used
+        if (m_originalCasterGuid.IsGameObject())
+            caster = unitTarget;
+        else
+            return;
     }
 
-    if (m_caster->GetTypeId() != TYPEID_PLAYER)
-        return;
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell: Aura is: %u", m_spellInfo->EffectApplyAuraName[eff_idx]);
 
-    // Send loot
-    ((Player*)m_caster)->SendLoot(guid, loottype);
-}
+    Aura* aura = m_spellAuraHolder->CreateAura(m_spellInfo, eff_idx, &m_currentBasePoints[eff_idx], m_spellAuraHolder, unitTarget, caster, m_CastItem);
 
-void Spell::EffectOpenLock(SpellEffectIndex eff_idx)
-{
-    if (!m_caster || m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (!aura)
     {
-        DEBUG_LOG( "WORLD: Open Lock - No Player Caster!");
+        sLog.outError("Spell::EffectApplyAura cannot create aura, caster %s, spell %u effect %u",
+            caster ?  caster->GetObjectGuid().GetString().c_str() : "<none>", m_spellInfo->Id, eff_idx);
         return;
     }
 
-    Player* player = (Player*)m_caster;
-
-    uint32 lockId = 0;
-    ObjectGuid guid;
+    // Now Reduce spell duration using data received at spell hit
+    int32 duration = aura->GetAuraMaxDuration();
 
-    // Get lockId
-    if (gameObjTarget)
+    // Mixology - increase effect and duration of alchemy spells which the caster has
+    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_POTION &&
+        !m_spellInfo->HasAttribute(SPELL_ATTR_EX4_UNK21) &&             // unaffected by Mixology
+        caster->GetTypeId() == TYPEID_PLAYER && caster->HasAura(53042)) // has Mixology passive
     {
-        GameObjectInfo const* goInfo = gameObjTarget->GetGOInfo();
-        // Arathi Basin banner opening !
-        if ((goInfo->type == GAMEOBJECT_TYPE_BUTTON && goInfo->button.noDamageImmune) ||
-            (goInfo->type == GAMEOBJECT_TYPE_GOOBER && goInfo->goober.losOK))
-        {
-            //CanUseBattleGroundObject() already called in CheckCast()
-            // in battleground check
-            if (BattleGround *bg = player->GetBattleGround())
-            {
-                // check if it's correct bg
-                if (bg->GetTypeID() == BATTLEGROUND_AB || bg->GetTypeID() == BATTLEGROUND_AV)
-                    bg->EventPlayerClickedOnFlag(player, gameObjTarget);
-                return;
-            }
-        }
-        else if (goInfo->type == GAMEOBJECT_TYPE_FLAGSTAND)
+        SpellSpecific spellSpec = GetSpellSpecific(aura->GetId());
+        if ((spellSpec == SPELL_BATTLE_ELIXIR || spellSpec == SPELL_GUARDIAN_ELIXIR || spellSpec == SPELL_FLASK_ELIXIR) &&
+            caster->HasSpell(m_spellInfo->EffectTriggerSpell[EFFECT_INDEX_0]))  // caster knows the spell
         {
-            //CanUseBattleGroundObject() already called in CheckCast()
-            // in battleground check
-            if (BattleGround *bg = player->GetBattleGround())
+            // do not exceed 2 hours duration (cause of ApplyAura effect triggered twice applied twice)
+            if (duration < 2 * HOUR * IN_MILLISECONDS)
+                duration *= 2;  // Increase duration by 2x
+
+            // known effect increases
+            int32 amount = 0;
+            switch (m_spellInfo->Id)
             {
-                if (bg->GetTypeID() == BATTLEGROUND_EY)
-                    bg->EventPlayerClickedOnFlag(player, gameObjTarget);
-                return;
+                case 53749:         // Guru's Elixir
+                    amount = 8;
+                    break;
+                case 28497:         // Elixir of Mighty Agility
+                case 53747:         // Elixir of Spirit
+                case 54212:         // Flask of Pure Mojo
+                case 60340:         // Elixir of Accuracy
+                case 60341:         // Elixir of Deadly Strikes
+                case 60343:         // Elixir of Mighty Defense
+                case 60344:         // Elixir of Expertise
+                case 60345:         // Elixir of Armor Piercing
+                case 60346:         // Elixir of Lightning Speed
+                case 60347:         // Elixir of Mighty Thoughts
+                    amount = 20;
+                    break;
+                case 53752:         // Lesser Flask of Toughness
+                case 62380:         // Lesser Flask of Resistance
+                    amount = 40;
+                    break;
+                case 53755:         // Flask of the Frost Wyrm
+                    amount = 47;
+                    break;
+                case 53760:         // Flask of Endless Rage
+                    amount = 82;
+                    break;
+                case 53751:         // Elixir of Mighty Fortitude
+                    amount = 200;
+                    break;
+                case 53763:         // Elixir of Protection
+                    amount = 280;
+                    break;
+                case 53758:         // Flask of Stoneblood
+                    amount = 650;
+                    break;
+                default:
+                    // default value for all other flasks/elixirs
+                    //TODO: add data to db table or find way of getting it from dbc
+                    amount = aura->GetModifier()->m_amount * 30 / 100;
+                    break;
             }
+            aura->GetModifier()->m_amount += amount;
         }
-        lockId = goInfo->GetLockId();
-        guid = gameObjTarget->GetObjectGuid();
     }
-    else if (itemTarget)
+
+    if (duration != aura->GetAuraMaxDuration())
     {
-        lockId = itemTarget->GetProto()->LockID;
-        guid = itemTarget->GetObjectGuid();
+        m_spellAuraHolder->SetAuraMaxDuration(duration);
+        m_spellAuraHolder->SetAuraDuration(duration);
     }
-    else
-    {
-        DEBUG_LOG( "WORLD: Open Lock - No GameObject/Item Target!");
+}
+
+void Spell::EffectUnlearnSpecialization(SpellEffectIndex eff_idx)
+{
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-    }
 
-    SkillType skillId = SKILL_NONE;
-    int32 reqSkillValue = 0;
-    int32 skillValue;
+    Player *_player = (Player*)unitTarget;
+    uint32 spellToUnlearn = m_spellInfo->EffectTriggerSpell[eff_idx];
 
-    SpellCastResult res = CanOpenLock(eff_idx, lockId, skillId, reqSkillValue, skillValue);
-    if (res != SPELL_CAST_OK)
-    {
-        SendCastResult(res);
-        return;
-    }
+    _player->removeSpell(spellToUnlearn);
 
-    // mark item as unlocked
-    if (itemTarget)
-        itemTarget->SetFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_UNLOCKED);
-
-    SendLoot(guid, LOOT_SKINNING, LockType(m_spellInfo->EffectMiscValue[eff_idx]));
-
-    // not allow use skill grow at item base open
-    if (!m_CastItem && skillId != SKILL_NONE)
-    {
-        // update skill if really known
-        if (uint32 pureSkillValue = player->GetPureSkillValue(skillId))
-        {
-            if (gameObjTarget)
-            {
-                // Allow one skill-up until respawned
-                if (!gameObjTarget->IsInSkillupList(player) &&
-                    player->UpdateGatherSkill(skillId, pureSkillValue, reqSkillValue))
-                    gameObjTarget->AddToSkillupList(player);
-            }
-            else if (itemTarget)
-            {
-                // Do one skill-up
-                player->UpdateGatherSkill(skillId, pureSkillValue, reqSkillValue);
-            }
-        }
-    }
+    if (WorldObject const* caster = GetCastingObject())
+        DEBUG_LOG("Spell: %s has UnLearned spell %u from %s", _player->GetGuidStr().c_str(), spellToUnlearn, caster->GetGuidStr().c_str());
 }
 
-void Spell::EffectSummonChangeItem(SpellEffectIndex eff_idx)
+void Spell::EffectPowerDrain(SpellEffectIndex eff_idx)
 {
-    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (m_spellInfo->EffectMiscValue[eff_idx] < 0 || m_spellInfo->EffectMiscValue[eff_idx] >= MAX_POWERS)
         return;
 
-    Player *player = (Player*)m_caster;
+    Powers drain_power = Powers(m_spellInfo->EffectMiscValue[eff_idx]);
 
-    // applied only to using item
-    if (!m_CastItem)
+    if (!unitTarget)
         return;
 
-    // ... only to item in own inventory/bank/equip_slot
-    if (m_CastItem->GetOwnerGuid() != player->GetObjectGuid())
+    if (!unitTarget->isAlive())
         return;
 
-    uint32 newitemid = m_spellInfo->EffectItemType[eff_idx];
-    if (!newitemid)
+    if (unitTarget->GetPowerType() != drain_power)
         return;
 
-    Item* oldItem = m_CastItem;
-
-    // prevent crash at access and unexpected charges counting with item update queue corrupt
-    ClearCastItem();
+    if (damage < 0)
+        return;
 
-    player->ConvertItem(oldItem, newitemid);
-}
+    uint32 curPower = unitTarget->GetPower(drain_power);
 
-void Spell::EffectProficiency(SpellEffectIndex /*eff_idx*/)
-{
-    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
-        return;
-    Player *p_target = (Player*)unitTarget;
+    DamageInfo drainDamageInfo =  DamageInfo(m_caster, unitTarget, m_spellInfo, damage);
+    drainDamageInfo.damageType = SPELL_DIRECT_DAMAGE;
 
-    uint32 subClassMask = m_spellInfo->EquippedItemSubClassMask;
-    if (m_spellInfo->EquippedItemClass == ITEM_CLASS_WEAPON && !(p_target->GetWeaponProficiency() & subClassMask))
-    {
-        p_target->AddWeaponProficiency(subClassMask);
-        p_target->SendProficiency(ITEM_CLASS_WEAPON, p_target->GetWeaponProficiency());
-    }
-    if (m_spellInfo->EquippedItemClass == ITEM_CLASS_ARMOR && !(p_target->GetArmorProficiency() & subClassMask))
-    {
-        p_target->AddArmorProficiency(subClassMask);
-        p_target->SendProficiency(ITEM_CLASS_ARMOR, p_target->GetArmorProficiency());
-    }
-}
+    //add spell damage bonus
+    m_caster->SpellDamageBonusDone(&drainDamageInfo);
+    unitTarget->SpellDamageBonusTaken(&drainDamageInfo);
 
-void Spell::EffectApplyAreaAura(SpellEffectIndex eff_idx)
-{
-    if (!unitTarget)
-        return;
-    if (!unitTarget->isAlive())
-        return;
+    // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
+    if (drain_power == POWER_MANA)
+        drainDamageInfo.damage -= unitTarget->GetSpellCritDamageReduction(drainDamageInfo.damage);
 
-    AreaAura* Aur = new AreaAura(m_spellInfo, eff_idx, &m_currentBasePoints[eff_idx], m_spellAuraHolder, unitTarget, m_caster, m_CastItem);
-    m_spellAuraHolder->AddAura(Aur, eff_idx);
-}
+    uint32 new_damage = std::min(curPower, drainDamageInfo.damage);
+    unitTarget->ModifyPower(drain_power,-int32(new_damage));
 
-void Spell::EffectSummonType(SpellEffectIndex eff_idx)
-{
-    uint32 prop_id = m_spellInfo->EffectMiscValueB[eff_idx];
-    SummonPropertiesEntry const *summon_prop = sSummonPropertiesStore.LookupEntry(prop_id);
-    if(!summon_prop)
+    // Don`t restore from self drain
+    if (drain_power == POWER_MANA && m_caster != unitTarget)
     {
-        sLog.outError("EffectSummonType: Unhandled summon type %u", prop_id);
-        return;
-    }
+        float manaMultiplier = m_spellInfo->EffectMultipleValue[eff_idx];
+        if (fabs(manaMultiplier) < M_NULL_F)
+            manaMultiplier = 1.0f;
 
-    switch(summon_prop->Group)
-    {
-        // faction handled later on, or loaded from template
-        case SUMMON_PROP_GROUP_WILD:
-        case SUMMON_PROP_GROUP_FRIENDLY:
-        {
-            switch(summon_prop->Title)                      // better from known way sorting summons by AI types
-            {
-                case UNITNAME_SUMMON_TITLE_NONE:
-                {
-                    // those are classical totems - effectbasepoints is their hp and not summon ammount!
-                    //121: 23035, battlestands
-                    //647: 52893, Anti-Magic Zone (npc used)
-                    if (prop_id == 121 || prop_id == 647)
-                        DoSummonTotem(eff_idx);
-                    else
-                        DoSummonWild(eff_idx, summon_prop->FactionId);
-                    break;
-                }
-                case UNITNAME_SUMMON_TITLE_PET:
-                case UNITNAME_SUMMON_TITLE_MINION:
-                case UNITNAME_SUMMON_TITLE_RUNEBLADE:
-                    DoSummonGuardian(eff_idx, summon_prop->FactionId);
-                    break;
-                case UNITNAME_SUMMON_TITLE_GUARDIAN:
-                {
-                    if (prop_id == 61)                      // mixed guardians, totems, statues
-                    {
-                        // * Stone Statue, etc  -- fits much better totem AI
-                        if (m_spellInfo->SpellIconID == 2056)
-                            DoSummonTotem(eff_idx);
-                        else
-                        {
-                            // possible sort totems/guardians only by summon creature type
-                            CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(m_spellInfo->EffectMiscValue[eff_idx]);
+        if (Player* modOwner = m_caster->GetSpellModOwner())
+            modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, manaMultiplier);
 
-                            if (!cInfo)
-                                return;
+        int32 gain = int32(new_damage * manaMultiplier);
 
-                            // FIXME: not all totems and similar cases seelcted by this check...
-                            if (cInfo->type == CREATURE_TYPE_TOTEM)
-                                DoSummonTotem(eff_idx);
-                            else
-                                DoSummonGuardian(eff_idx, summon_prop->FactionId);
-                        }
-                    }
-                    else
-                        DoSummonGuardian(eff_idx, summon_prop->FactionId);
-                    break;
-                }
-                case UNITNAME_SUMMON_TITLE_CONSTRUCT:
-                {
-                    if (prop_id == 2913)                    // Scrapbot
-                        DoSummonWild(eff_idx, summon_prop->FactionId);
-                    else
-                        DoSummonGuardian(eff_idx, summon_prop->FactionId);
-                    break;
-                }
-                case UNITNAME_SUMMON_TITLE_TOTEM:
-                    DoSummonTotem(eff_idx, summon_prop->Slot);
-                    break;
-                case UNITNAME_SUMMON_TITLE_COMPANION:
-                    // slot 6 set for critters that can help to player in fighting
-                    if (summon_prop->Slot == 6)
-                        DoSummonGuardian(eff_idx, summon_prop->FactionId);
-                    else
-                        DoSummonCritter(eff_idx, summon_prop->FactionId);
-                    break;
-                case UNITNAME_SUMMON_TITLE_OPPONENT:
-                case UNITNAME_SUMMON_TITLE_LIGHTWELL:
-                case UNITNAME_SUMMON_TITLE_BUTLER:
-                    DoSummonWild(eff_idx, summon_prop->FactionId);
-                    break;
-                case UNITNAME_SUMMON_TITLE_VEHICLE:
-                case UNITNAME_SUMMON_TITLE_MOUNT:
-                    // TODO
-                    // EffectSummonVehicle(i);
-                    break;
-                default:
-                    sLog.outError("EffectSummonType: Unhandled summon title %u", summon_prop->Title);
-                break;
-            }
-            break;
-        }
-        case SUMMON_PROP_GROUP_PETS:
-        {
-            // FIXME : multiple summons -  not yet supported as pet
-            //1562 - force of nature  - sid 33831
-            //1161 - feral spirit - sid 51533
-            if(prop_id == 1562) // 3 uncontrolable instead of one controllable :/
-                DoSummonGuardian(eff_idx, summon_prop->FactionId);
-            else
-                DoSummon(eff_idx);
-            break;
-        }
-        case SUMMON_PROP_GROUP_CONTROLLABLE:
-        {
-            // no type here
-            // maybe wrong - but thats the handler currently used for those
-            DoSummonGuardian(eff_idx, summon_prop->FactionId);
-            break;
-        }
-        case SUMMON_PROP_GROUP_VEHICLE:
-        {
-            // TODO
-            // EffectSummonVehicle(i);
-            sLog.outDebug("EffectSummonType: Unhandled summon group type SUMMON_PROP_GROUP_VEHICLE(%u)", summon_prop->Group);
-            break;
-        }
-        default:
-            sLog.outError("EffectSummonType: Unhandled summon group type %u", summon_prop->Group);
-            break;
+        m_caster->EnergizeBySpell(m_caster, m_spellInfo->Id, gain, POWER_MANA);
+
+        SendEffectLogExecute(eff_idx, unitTarget->GetObjectGuid(), drain_power, new_damage, manaMultiplier);
     }
 }
 
-void Spell::DoSummon(SpellEffectIndex eff_idx)
+void Spell::EffectSendEvent(SpellEffectIndex effectIndex)
 {
-    if (m_caster->GetPetGuid())
+    /*
+    we do not handle a flag dropping or clicking on flag in battleground by sendevent system
+    TODO: Actually, why not...
+    */
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell ScriptStart %u for spellid %u in EffectSendEvent ", m_spellInfo->EffectMiscValue[effectIndex], m_spellInfo->Id);
+    StartEvents_Event(m_caster->GetMap(), m_spellInfo->EffectMiscValue[effectIndex], m_caster, focusObject, true, m_caster);
+}
+
+void Spell::EffectPowerBurn(SpellEffectIndex eff_idx)
+{
+    if (m_spellInfo->EffectMiscValue[eff_idx] < 0 || m_spellInfo->EffectMiscValue[eff_idx] >= MAX_POWERS)
         return;
 
+    Powers powertype = Powers(m_spellInfo->EffectMiscValue[eff_idx]);
+
     if (!unitTarget)
         return;
-
-    uint32 pet_entry = m_spellInfo->EffectMiscValue[eff_idx];
-    if (!pet_entry)
+    if (!unitTarget->isAlive())
         return;
-
-    CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(pet_entry);
-    if (!cInfo)
-    {
-        sLog.outErrorDb("Spell::DoSummon: creature entry %u not found for spell %u.", pet_entry, m_spellInfo->Id);
+    if (unitTarget->GetPowerType() != powertype)
         return;
-    }
-
-    uint32 level = m_caster->getLevel();
-    Pet* spawnCreature = new Pet(SUMMON_PET);
-
-    if (m_caster->GetTypeId()==TYPEID_PLAYER && spawnCreature->LoadPetFromDB((Player*)m_caster,pet_entry))
-    {
-        // Summon in dest location
-        if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
-            spawnCreature->Relocate(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, -m_caster->GetOrientation());
-
-        // set timer for unsummon
-        if (m_duration > 0)
-            spawnCreature->SetDuration(m_duration);
-
+    if (damage < 0)
         return;
-    }
-
-    // Summon in dest location
-    CreatureCreatePos pos (m_caster->GetMap(), m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, -m_caster->GetOrientation(), m_caster->GetPhaseMask());
 
-    if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
-        pos = CreatureCreatePos(m_caster, -m_caster->GetOrientation());
-
-    Map *map = m_caster->GetMap();
-    uint32 pet_number = sObjectMgr.GeneratePetNumber();
-    if (!spawnCreature->Create(map->GenerateLocalLowGuid(HIGHGUID_PET), pos, cInfo, pet_number))
+    // burn x% of target's mana, up to maximum of 2x% of caster's mana (Priest's Mana Burn)
+    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PRIEST)
     {
-        sLog.outErrorDb("Spell::EffectSummon: can't create creature with entry %u for spell %u", cInfo->Entry, m_spellInfo->Id);
-        delete spawnCreature;
-        return;
+        int32 maxdamage = m_caster->GetMaxPower(powertype) * damage * 2 / 100;
+        damage = unitTarget->GetMaxPower(powertype) * damage / 100;
+        if (damage > maxdamage)
+            damage = maxdamage;
     }
 
-    spawnCreature->SetSummonPoint(pos);
-
-    // set timer for unsummon
-    if (m_duration > 0)
-        spawnCreature->SetDuration(m_duration);
-
-    spawnCreature->SetOwnerGuid(m_caster->GetObjectGuid());
-    spawnCreature->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
-    spawnCreature->setPowerType(POWER_MANA);
-    spawnCreature->setFaction(m_caster->getFaction());
-    spawnCreature->SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, 0);
-    spawnCreature->SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0);
-    spawnCreature->SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, 1000);
-    spawnCreature->SetCreatorGuid(m_caster->GetObjectGuid());
-    spawnCreature->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
-
-    spawnCreature->InitStatsForLevel(level, m_caster);
-
-    spawnCreature->GetCharmInfo()->SetPetNumber(pet_number, false);
+    int32 curPower = int32(unitTarget->GetPower(powertype));
 
-    spawnCreature->AIM_Initialize();
-    spawnCreature->InitPetCreateSpells();
-    spawnCreature->InitLevelupSpellsForLevel();
-    spawnCreature->SetHealth(spawnCreature->GetMaxHealth());
-    spawnCreature->SetPower(POWER_MANA, spawnCreature->GetMaxPower(POWER_MANA));
+    // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
+    int32 power = damage;
+    if (powertype == POWER_MANA)
+        power -= unitTarget->GetSpellCritDamageReduction(power);
 
-    //spawnCreature->SetName("");                           // generated by client
+    int32 new_damage = (curPower < power) ? curPower : power;
 
-    map->Add((Creature*)spawnCreature);
+    unitTarget->ModifyPower(powertype, -new_damage);
+    float multiplier = m_spellInfo->EffectMultipleValue[eff_idx];
 
-    m_caster->SetPet(spawnCreature);
+    if (Player *modOwner = m_caster->GetSpellModOwner())
+        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, multiplier);
 
-    if (m_caster->GetTypeId() == TYPEID_PLAYER)
-    {
-        spawnCreature->GetCharmInfo()->SetReactState( REACT_DEFENSIVE );
-        spawnCreature->SavePetToDB(PET_SAVE_AS_CURRENT);
-        ((Player*)m_caster)->PetSpellInitialize();
-    }
+    new_damage = int32(new_damage * multiplier);
+    m_damage += new_damage;
 
-    if (m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->AI())
-        ((Creature*)m_caster)->AI()->JustSummoned((Creature*)spawnCreature);
-    if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
-        ((Creature*)m_originalCaster)->AI()->JustSummoned((Creature*)spawnCreature);
+    DamageInfo damageInfo(m_caster, unitTarget, m_spellInfo);
+    damageInfo.damage = new_damage;
+    // Set trigger flag
+    damageInfo.procAttacker = PROC_FLAG_NONE;
+    damageInfo.procVictim   = PROC_FLAG_TAKEN_ANY_DAMAGE;
+    damageInfo.procEx       = PROC_EX_DIRECT_DAMAGE | PROC_EX_IGNORE_CC;
+    unitTarget->ProcDamageAndSpellFor(true,&damageInfo);
 }
 
-void Spell::EffectLearnSpell(SpellEffectIndex eff_idx)
+void Spell::EffectHeal(SpellEffectIndex eff_idx)
 {
-    if (!unitTarget)
-        return;
-
-    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (unitTarget && unitTarget->isAlive() && damage >= 0)
     {
-        if (m_caster->GetTypeId() == TYPEID_PLAYER)
-            EffectLearnPetSpell(eff_idx);
-
-        return;
-    }
-
-    Player *player = (Player*)unitTarget;
+        // Try to get original caster
+        Unit *caster = GetAffectiveCaster();
+        if (!caster)
+            return;
 
-    uint32 spellToLearn = ((m_spellInfo->Id==SPELL_ID_GENERIC_LEARN) || (m_spellInfo->Id==SPELL_ID_GENERIC_LEARN_PET)) ? damage : m_spellInfo->EffectTriggerSpell[eff_idx];
-    player->learnSpell(spellToLearn, false);
+        int32 addhealth = damage;
 
-    DEBUG_LOG( "Spell: Player %u has learned spell %u from NpcGUID=%u", player->GetGUIDLow(), spellToLearn, m_caster->GetGUIDLow() );
-}
-
-void Spell::EffectDispel(SpellEffectIndex eff_idx)
-{
-    if (!unitTarget)
-        return;
-
-    // Fill possible dispel list
-    std::list <std::pair<SpellAuraHolder* ,uint32> > dispel_list;
+        // Seal of Light proc
+        if (m_spellInfo->Id == 20167)
+        {
+            float ap = caster->GetTotalAttackPowerValue(BASE_ATTACK);
+            int32 holy = caster->SpellBaseHealingBonusDone(GetSpellSchoolMask(m_spellInfo));
+            if (holy < 0)
+                holy = 0;
+            addhealth += int32(ap * 0.15) + int32(holy * 15 / 100);
+        }
+        // Vessel of the Naaru (Vial of the Sunwell trinket)
+        else if (m_spellInfo->Id == 45064)
+        {
+            // Amount of heal - depends from stacked Holy Energy
+            int damageAmount = 0;
+            Unit::AuraList const& mDummyAuras = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
+            for(Unit::AuraList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)
+                if ((*i)->GetId() == 45062)
+                    damageAmount+=(*i)->GetModifier()->m_amount;
+            if (damageAmount)
+                m_caster->RemoveAurasDueToSpell(45062);
 
-    // Create dispel mask by dispel type
-    uint32 dispel_type = m_spellInfo->EffectMiscValue[eff_idx];
-    uint32 dispelMask  = GetDispellMask( DispelType(dispel_type) );
-    Unit::SpellAuraHolderMap const& auras = unitTarget->GetSpellAuraHolderMap();
-    for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
-    {
-        SpellAuraHolder *holder = itr->second;
-        if ((1<<holder->GetSpellProto()->Dispel) & dispelMask)
+            addhealth += damageAmount;
+        }
+        // Death Pact (percent heal)
+        else if (m_spellInfo->Id==48743)
+            addhealth = addhealth * unitTarget->GetMaxHealth() / 100;
+        // Swiftmend - consumes Regrowth or Rejuvenation
+        else if (m_spellInfo->TargetAuraState == AURA_STATE_SWIFTMEND && unitTarget->HasAuraState(AURA_STATE_SWIFTMEND))
         {
-            if(holder->GetSpellProto()->Dispel == DISPEL_MAGIC)
+            Unit::AuraList const& RejorRegr = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_HEAL);
+            // find most short by duration
+            Aura const* targetAura = NULL;
+            for(Unit::AuraList::const_iterator i = RejorRegr.begin(); i != RejorRegr.end(); ++i)
             {
-                bool positive = true;
-                if (!holder->IsPositive())
-                    positive = false;
-                else
-                    positive = !holder->GetSpellProto()->HasAttribute(SPELL_ATTR_EX_NEGATIVE);
+                if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DRUID &&
+                    // Regrowth or Rejuvenation 0x40 | 0x10
+                    (*i)->GetSpellProto()->GetSpellFamilyFlags().test<CF_DRUID_REGROWTH, CF_DRUID_REJUVENATION>())
+                {
+                    if (!targetAura || (*i)->GetAuraDuration() < targetAura->GetAuraDuration())
+                        targetAura = (*i)();
+                }
+            }
 
-                // do not remove positive auras if friendly target
-                //               negative auras if non-friendly target
-                if (positive == unitTarget->IsFriendlyTo(m_caster))
-                    continue;
+            if (!targetAura)
+            {
+                sLog.outError("Target (GUID: %u TypeId: %u) has aurastate AURA_STATE_SWIFTMEND but no matching aura.", unitTarget->GetGUIDLow(), unitTarget->GetTypeId());
+                return;
+            }
+            int idx = 0;
+            while(idx < 3)
+            {
+                if (targetAura->GetSpellProto()->EffectApplyAuraName[idx] == SPELL_AURA_PERIODIC_HEAL)
+                    break;
+                idx++;
             }
-            // Unholy Blight prevents dispel of diseases from target
-            else if (holder->GetSpellProto()->Dispel == DISPEL_DISEASE)
-                if (unitTarget->HasAura(50536))
-                    continue;
 
-            dispel_list.push_back(std::pair<SpellAuraHolder* ,uint32>(holder, holder->GetStackAmount()));
-        }
-    }
-    // Ok if exist some buffs for dispel try dispel it
-    if (!dispel_list.empty())
-    {
-        std::list<std::pair<SpellAuraHolder* ,uint32> > success_list;// (spell_id,casterGuid)
-        std::list < uint32 > fail_list;                     // spell_id
+            int32 tickheal = targetAura->GetModifier()->m_amount;
+            int32 tickcount = GetSpellDuration(targetAura->GetSpellProto()) / targetAura->GetSpellProto()->EffectAmplitude[idx] - 1;
 
-        // some spells have effect value = 0 and all from its by meaning expect 1
-        if(!damage)
-            damage = 1;
+            // Glyph of Swiftmend
+            if (!caster->HasAura(54824))
+                unitTarget->RemoveAurasDueToSpell(targetAura->GetId());
 
-        // Dispel N = damage buffs (or while exist buffs for dispel)
-        for (int32 count=0; count < damage && !dispel_list.empty(); ++count)
+            addhealth += tickheal * tickcount;
+        }
+        // Runic Healing Injector & Healing Potion Injector effect increase for engineers
+        else if ((m_spellInfo->Id == 67486 || m_spellInfo->Id == 67489) && unitTarget->GetTypeId() == TYPEID_PLAYER)
         {
-            // Random select buff for dispel
-            std::list<std::pair<SpellAuraHolder* ,uint32> >::iterator dispel_itr = dispel_list.begin();
-            std::advance(dispel_itr,urand(0, dispel_list.size()-1));
-
-            SpellAuraHolder *holder = dispel_itr->first;
-
-            dispel_itr->second -= 1;
-
-            // remove entry from dispel_list if nothing left in stack
-            if (dispel_itr->second == 0)
-                dispel_list.erase(dispel_itr);
+            Player* player = (Player*)unitTarget;
+            if (player->HasSkill(SKILL_ENGINEERING))
+                addhealth += int32(addhealth * 0.25);
+        }
 
-            SpellEntry const* spellInfo = holder->GetSpellProto();
-            // Base dispel chance
-            // TODO: possible chance depend from spell level??
-            int32 miss_chance = 0;
-            // Apply dispel mod from aura caster
-            if (Unit *caster = holder->GetCaster())
-            {
-                if ( Player* modOwner = caster->GetSpellModOwner() )
-                    modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_RESIST_DISPEL_CHANCE, miss_chance, this);
-            }
-            // Try dispel
-            if (roll_chance_i(miss_chance))
-                fail_list.push_back(spellInfo->Id);
-            else
+        // Chain Healing
+        if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_CHAIN_HEAL>())
+        {
+            if (unitTarget == m_targets.getUnitTarget())
             {
-                bool foundDispelled = false;
-                for (std::list<std::pair<SpellAuraHolder* ,uint32> >::iterator success_iter = success_list.begin(); success_iter != success_list.end(); ++success_iter)
+                // check for Riptide
+                Aura* riptide = unitTarget->GetAura<SPELL_AURA_PERIODIC_HEAL, SPELLFAMILY_SHAMAN, CF_SHAMAN_RIPTIDE>(caster->GetObjectGuid());
+                if (riptide)
                 {
-                    if (success_iter->first->GetId() == holder->GetId() && success_iter->first->GetCasterGuid() == holder->GetCasterGuid())
-                    {
-                        success_iter->second += 1;
-                        foundDispelled = true;
-                        break;
-                    }
+                    addhealth += addhealth/4;
+                    unitTarget->RemoveAurasDueToSpell(riptide->GetId());
                 }
-                if (!foundDispelled)
-                    success_list.push_back(std::pair<SpellAuraHolder* ,uint32>(holder, 1));
             }
         }
-        // Send success log and really remove auras
-        if (!success_list.empty())
-        {
-            int32 count = success_list.size();
-            WorldPacket data(SMSG_SPELLDISPELLOG, 8+8+4+1+4+count*5);
-            data << unitTarget->GetPackGUID();              // Victim GUID
-            data << m_caster->GetPackGUID();                // Caster GUID
-            data << uint32(m_spellInfo->Id);                // Dispel spell id
-            data << uint8(0);                               // not used
-            data << uint32(count);                          // count
-            for (std::list<std::pair<SpellAuraHolder* ,uint32> >::iterator j = success_list.begin(); j != success_list.end(); ++j)
-            {
-                SpellAuraHolder* dispelledHolder = j->first;
-                data << uint32(dispelledHolder->GetId());   // Spell Id
-                data << uint8(0);                           // 0 - dispelled !=0 cleansed
-                unitTarget->RemoveAuraHolderDueToSpellByDispel(dispelledHolder->GetId(), j->second, dispelledHolder->GetCasterGuid(), m_caster);
-            }
-            m_caster->SendMessageToSet(&data, true);
 
-            // On success dispel
-            // Devour Magic
-            if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->Category == SPELLCATEGORY_DEVOUR_MAGIC)
-            {
-                int32 heal_amount = m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_1);
-                m_caster->CastCustomSpell(m_caster, 19658, &heal_amount, NULL, NULL, true);
-            }
-        }
-        // Send fail log to client
-        if (!fail_list.empty())
-        {
-            // Failed to dispel
-            WorldPacket data(SMSG_DISPEL_FAILED, 8+8+4+4*fail_list.size());
-            data << m_caster->GetObjectGuid();              // Caster GUID
-            data << unitTarget->GetObjectGuid();            // Victim GUID
-            data << uint32(m_spellInfo->Id);                // Dispel spell id
-            for (std::list< uint32 >::iterator j = fail_list.begin(); j != fail_list.end(); ++j)
-                data << uint32(*j);                         // Spell Id
-            m_caster->SendMessageToSet(&data, true);
-        }
-    }
-}
+        addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, addhealth, HEAL);
+        if (m_applyMultiplierMask & (1 << eff_idx))
+            addhealth = int32(addhealth * m_damageMultipliers[eff_idx]);
+        addhealth = unitTarget->SpellHealingBonusTaken(caster, m_spellInfo, addhealth, HEAL);
 
-void Spell::EffectDualWield(SpellEffectIndex /*eff_idx*/)
-{
-    if (unitTarget && unitTarget->GetTypeId() == TYPEID_PLAYER)
-        ((Player*)unitTarget)->SetCanDualWield(true);
+        m_healing += addhealth;
+    }
 }
 
-void Spell::EffectPull(SpellEffectIndex /*eff_idx*/)
+void Spell::EffectHealPct(SpellEffectIndex eff_idx)
 {
-    // TODO: create a proper pull towards distract spell center for distract
-    DEBUG_LOG("WORLD: Spell Effect DUMMY");
-}
+    if (unitTarget && unitTarget->isAlive() && damage >= 0)
+    {
+        // Try to get original caster
+        Unit *caster = GetAffectiveCaster();
+        if (!caster)
+            return;
 
-void Spell::EffectDistract(SpellEffectIndex /*eff_idx*/)
-{
-    // Check for possible target
-    if (!unitTarget || unitTarget->isInCombat())
-        return;
+        uint32 addhealth = unitTarget->GetMaxHealth() * damage / 100;
 
-    // target must be OK to do this
-    if (unitTarget->hasUnitState(UNIT_STAT_CAN_NOT_REACT))
-        return;
+        addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, addhealth, HEAL);
+        if (m_applyMultiplierMask & (1 << eff_idx))
+            addhealth = int32(addhealth * m_damageMultipliers[eff_idx]);
+        addhealth = unitTarget->SpellHealingBonusTaken(caster, m_spellInfo, addhealth, HEAL);
 
-    unitTarget->SetFacingTo(unitTarget->GetAngle(m_targets.m_destX, m_targets.m_destY));
-    unitTarget->clearUnitState(UNIT_STAT_MOVING);
+        uint32 absorb = 0;
+        unitTarget->CalculateHealAbsorb(addhealth, &absorb);
 
-    if (unitTarget->GetTypeId() == TYPEID_UNIT)
-        unitTarget->GetMotionMaster()->MoveDistract(damage * IN_MILLISECONDS);
+        int32 gain = caster->DealHeal(unitTarget, addhealth - absorb, m_spellInfo, false, absorb);
+        unitTarget->getHostileRefManager().threatAssist(caster, float(gain) * 0.5f * sSpellMgr.GetSpellThreatMultiplier(m_spellInfo), m_spellInfo);
+    }
 }
 
-void Spell::EffectPickPocket(SpellEffectIndex /*eff_idx*/)
+void Spell::EffectHealMechanical(SpellEffectIndex eff_idx)
 {
-    if (m_caster->GetTypeId() != TYPEID_PLAYER)
-        return;
+    // Mechanic creature type should be correctly checked by targetCreatureType field
+    if (unitTarget && unitTarget->isAlive() && damage >= 0)
+    {
+        // Try to get original caster
+        Unit *caster = GetAffectiveCaster();
+        if (!caster)
+            return;
 
-    // victim must be creature and attackable
-    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->IsFriendlyTo(unitTarget))
-        return;
+        uint32 addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, damage, HEAL);
+        if (m_applyMultiplierMask & (1 << eff_idx))
+            addhealth = int32(addhealth * m_damageMultipliers[eff_idx]);
+        addhealth = unitTarget->SpellHealingBonusTaken(caster, m_spellInfo, addhealth, HEAL);
 
-    // victim have to be alive and humanoid or undead
-    if (unitTarget->isAlive() && (unitTarget->GetCreatureTypeMask() & CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD) != 0)
-    {
-        int32 chance = 10 + int32(m_caster->getLevel()) - int32(unitTarget->getLevel());
+        uint32 absorb = 0;
+        unitTarget->CalculateHealAbsorb(addhealth, &absorb);
 
-        if (chance > irand(0, 19))
-        {
-            // Stealing successful
-            //DEBUG_LOG("Sending loot from pickpocket");
-            ((Player*)m_caster)->SendLoot(unitTarget->GetObjectGuid(),LOOT_PICKPOCKETING);
-        }
-        else
-        {
-            // Reveal action + get attack
-            m_caster->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
-            unitTarget->AttackedBy(m_caster);
-        }
+        caster->DealHeal(unitTarget, addhealth - absorb, m_spellInfo, false, absorb);
     }
 }
 
-void Spell::EffectAddFarsight(SpellEffectIndex eff_idx)
+void Spell::EffectHealthLeech(SpellEffectIndex eff_idx)
 {
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget)
         return;
-
-    DynamicObject* dynObj = new DynamicObject;
-
-    // set radius to 0: spell not expected to work as persistent aura
-    if(!dynObj->Create(m_caster->GetMap()->GenerateLocalLowGuid(HIGHGUID_DYNAMICOBJECT), m_caster,
-        m_spellInfo->Id, eff_idx, m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, m_duration, 0, DYNAMIC_OBJECT_FARSIGHT_FOCUS))
-    {
-        delete dynObj;
+    if (!unitTarget->isAlive())
         return;
-    }
 
-    m_caster->AddDynObject(dynObj);
-    m_caster->GetMap()->Add(dynObj);
+    if (damage < 0)
+        return;
 
-    ((Player*)m_caster)->GetCamera().SetView(dynObj);
-}
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "HealthLeech :%i", damage);
 
-void Spell::DoSummonWild(SpellEffectIndex eff_idx, uint32 forceFaction)
-{
-    uint32 creature_entry = m_spellInfo->EffectMiscValue[eff_idx];
-    if (!creature_entry)
-        return;
-
-    uint32 level = m_caster->getLevel();
-
-    // level of creature summoned using engineering item based at engineering skill level
-    if (m_caster->GetTypeId()==TYPEID_PLAYER && m_CastItem)
-    {
-        ItemPrototype const *proto = m_CastItem->GetProto();
-        if (proto && proto->RequiredSkill == SKILL_ENGINEERING)
-        {
-            uint16 skill202 = ((Player*)m_caster)->GetSkillValue(SKILL_ENGINEERING);
-            if (skill202)
-                level = skill202/5;
-        }
-    }
-
-    // select center of summon position
-    float center_x = m_targets.m_destX;
-    float center_y = m_targets.m_destY;
-    float center_z = m_targets.m_destZ;
+    uint32 curHealth = unitTarget->GetHealth();
+    damage = m_caster->SpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, damage );
+    if ((int32)curHealth < damage)
+        damage = curHealth;
 
-    float radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[eff_idx]));
-    TempSummonType summonType = (m_duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_OR_DEAD_DESPAWN;
+    float multiplier = m_spellInfo->EffectMultipleValue[eff_idx];
 
-    int32 amount = damage > 0 ? damage : 1;
+    if (Player *modOwner = m_caster->GetSpellModOwner())
+        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, multiplier);
 
-    for(int32 count = 0; count < amount; ++count)
+    int32 heal = int32(damage*multiplier);
+    if (m_caster->isAlive())
     {
-        float px, py, pz;
-        // If dest location if present
-        if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
-        {
-            // Summon 1 unit in dest location
-            if (count == 0)
-            {
-                px = m_targets.m_destX;
-                py = m_targets.m_destY;
-                pz = m_targets.m_destZ;
-            }
-            // Summon in random point all other units if location present
-            else
-                m_caster->GetRandomPoint(center_x, center_y, center_z, radius, px, py, pz);
-        }
-        // Summon if dest location not present near caster
-        else
-        {
-            if (radius > 0.0f)
-            {
-                // not using bounding radius of caster here
-                m_caster->GetClosePoint(px, py, pz, 0.0f, radius);
-            }
-            else
-            {
-                // EffectRadiusIndex 0 or 36
-                px = m_caster->GetPositionX();
-                py = m_caster->GetPositionY();
-                pz = m_caster->GetPositionZ();
-            }
-        }
-
-        if (Creature* summon = m_caster->SummonCreature(creature_entry, px, py, pz, m_caster->GetOrientation(), summonType, m_duration))
-        {
-            summon->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
-
-            // UNIT_FIELD_CREATEDBY are not set for these kind of spells.
-            // Does exceptions exist? If so, what are they?
-            // summon->SetCreatorGuid(m_caster->GetObjectGuid());
+        heal = m_caster->SpellHealingBonusTaken(m_caster, m_spellInfo, heal, HEAL);
 
-            if(forceFaction)
-                summon->setFaction(forceFaction);
+        uint32 absorb = 0;
+        m_caster->CalculateHealAbsorb(heal, &absorb);
 
-            // Notify original caster if not done already
-            if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
-                ((Creature*)m_originalCaster)->AI()->JustSummoned(summon);
-        }
+        m_caster->DealHeal(m_caster, heal - absorb, m_spellInfo, false, absorb);
     }
 }
 
-void Spell::DoSummonGuardian(SpellEffectIndex eff_idx, uint32 forceFaction)
+void Spell::DoCreateItem(SpellEffectIndex eff_idx, uint32 itemtype)
 {
-    uint32 pet_entry = m_spellInfo->EffectMiscValue[eff_idx];
-    if (!pet_entry)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    SummonPropertiesEntry const* propEntry = sSummonPropertiesStore.LookupEntry(m_spellInfo->EffectMiscValueB[eff_idx]);
-    if (!propEntry)
-        return;
+    Player* player = (Player*)unitTarget;
 
-    CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(pet_entry);
-    if (!cInfo)
+    uint32 newitemid = itemtype;
+    ItemPrototype const *pProto = ObjectMgr::GetItemPrototype( newitemid );
+    if (!pProto)
     {
-        sLog.outErrorDb("Spell::DoSummonGuardian: creature entry %u not found for spell %u.", pet_entry, m_spellInfo->Id);
+        player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
         return;
     }
 
-    PetType petType = propEntry->Title == UNITNAME_SUMMON_TITLE_COMPANION ? PROTECTOR_PET : GUARDIAN_PET;
-
-    // second direct cast unsummon guardian(s) (guardians without like functionality have cooldown > spawn time)
-    if (!m_IsTriggeredSpell && m_caster->GetTypeId() == TYPEID_PLAYER)
+    // bg reward have some special in code work
+    bool bg_mark = false;
+    switch(m_spellInfo->Id)
     {
-        bool found = false;
-        // including protector
-        while (Pet* old_summon = m_caster->FindGuardianWithEntry(pet_entry))
-        {
-            old_summon->Unsummon(PET_SAVE_AS_DELETED, m_caster);
-            found = true;
-        }
-
-        if (found)
-            return;
+        case SPELL_WG_MARK_VICTORY:
+        case SPELL_WG_MARK_DEFEAT:
+            bg_mark = true;
+            break;
+        default:
+            break;
     }
 
-    // protectors allowed only in single amount
-    if (petType == PROTECTOR_PET)
-        if (Pet* old_protector = m_caster->GetProtectorPet())
-            old_protector->Unsummon(PET_SAVE_AS_DELETED, m_caster);
+    uint32 num_to_add = damage;
 
-    // in another case summon new
-    uint32 level = m_caster->getLevel();
+    if (num_to_add < 1)
+        num_to_add = 1;
+    if (num_to_add > pProto->GetMaxStackSize())
+        num_to_add = pProto->GetMaxStackSize();
 
-    // level of pet summoned using engineering item based at engineering skill level
-    if (m_caster->GetTypeId() == TYPEID_PLAYER && m_CastItem)
+    // init items_count to 1, since 1 item will be created regardless of specialization
+    int items_count=1;
+    // the chance to create additional items
+    float additionalCreateChance=0.0f;
+    // the maximum number of created additional items
+    uint8 additionalMaxNum=0;
+    // get the chance and maximum number for creating extra items
+    if (sSpellMgr.CanCreateExtraItems(player, m_spellInfo->Id, additionalCreateChance, additionalMaxNum) )
     {
-        ItemPrototype const *proto = m_CastItem->GetProto();
-        if (proto && proto->RequiredSkill == SKILL_ENGINEERING)
-        {
-            uint16 skill202 = ((Player*)m_caster)->GetSkillValue(SKILL_ENGINEERING);
-            if (skill202)
-            {
-                level = skill202 / 5;
-            }
-        }
+        // roll with this chance till we roll not to create or we create the max num
+        while ( roll_chance_f(additionalCreateChance) && items_count<=additionalMaxNum )
+            ++items_count;
     }
 
-    // select center of summon position
-    float center_x = m_targets.m_destX;
-    float center_y = m_targets.m_destY;
-    float center_z = m_targets.m_destZ;
-
-    float radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[eff_idx]));
-
-    int32 amount = damage > 0 ? damage : 1;
+    // really will be created more items
+    num_to_add *= items_count;
 
-    for (int32 count = 0; count < amount; ++count)
+    // can the player store the new item?
+    ItemPosCountVec dest;
+    uint32 no_space = 0;
+    InventoryResult msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, newitemid, num_to_add, &no_space );
+    if (msg != EQUIP_ERR_OK)
     {
-        Pet* spawnCreature = new Pet(petType);
-
-        // If dest location if present
-        // Summon 1 unit in dest location
-        CreatureCreatePos pos(m_caster->GetMap(), m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, -m_caster->GetOrientation(), m_caster->GetPhaseMask());
-
-        if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
+        // convert to possible store amount
+        if (msg == EQUIP_ERR_INVENTORY_FULL || msg == EQUIP_ERR_CANT_CARRY_MORE_OF_THIS)
+            num_to_add -= no_space;
+        else
         {
-            // Summon in random point all other units if location present
-            if (count > 0)
-            {
-                float x, y, z;
-                m_caster->GetRandomPoint(center_x, center_y, center_z, radius, x, y, z);
-                pos = CreatureCreatePos(m_caster->GetMap(), x, y, z, m_caster->GetOrientation(), m_caster->GetPhaseMask());
-            }
+            // ignore mana gem case (next effect will recharge existing example)
+            if (eff_idx == EFFECT_INDEX_0 && m_spellInfo->Effect[EFFECT_INDEX_1] == SPELL_EFFECT_DUMMY )
+                return;
+
+            // if not created by another reason from full inventory or unique items amount limitation
+            player->SendEquipError( msg, NULL, NULL, newitemid );
+            return;
         }
-        // Summon if dest location not present near caster
-        else
-            pos = CreatureCreatePos(m_caster, m_caster->GetOrientation());
+    }
+
+    if (num_to_add)
+    {
+        // create the new item and store it
+        Item* pItem = player->StoreNewItem( dest, newitemid, true, Item::GenerateItemRandomPropertyId(newitemid));
 
-        Map *map = m_caster->GetMap();
-        uint32 pet_number = sObjectMgr.GeneratePetNumber();
-        if (!spawnCreature->Create(map->GenerateLocalLowGuid(HIGHGUID_PET), pos, cInfo, pet_number))
+        // was it successful? return error if not
+        if (!pItem)
         {
-            sLog.outError("Spell::DoSummonGuardian: can't create creature entry %u for spell %u.", pet_entry, m_spellInfo->Id);
-            delete spawnCreature;
+            player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
             return;
         }
 
-        spawnCreature->SetSummonPoint(pos);
+        // set the "Crafted by ..." property of the item
+        if (pItem->GetProto()->Class != ITEM_CLASS_CONSUMABLE && pItem->GetProto()->Class != ITEM_CLASS_QUEST)
+            pItem->SetGuidValue(ITEM_FIELD_CREATOR, player->GetObjectGuid());
 
-        if (m_duration > 0)
-            spawnCreature->SetDuration(m_duration);
+        // send info to the client
+        if (pItem)
+            player->SendNewItem(pItem, num_to_add, true, !bg_mark);
 
-        //spawnCreature->SetName("");                       // generated by client
-        spawnCreature->SetOwnerGuid(m_caster->GetObjectGuid());
-        spawnCreature->setPowerType(POWER_MANA);
-        spawnCreature->SetUInt32Value(UNIT_NPC_FLAGS, spawnCreature->GetCreatureInfo()->npcflag);
-        spawnCreature->setFaction(forceFaction ? forceFaction : m_caster->getFaction());
-        spawnCreature->SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, 0);
-        spawnCreature->SetCreatorGuid(m_caster->GetObjectGuid());
-        spawnCreature->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
+        // we succeeded in creating at least one item, so a levelup is possible
+        if (!bg_mark)
+            player->UpdateCraftSkill(m_spellInfo->Id);
+    }
+}
 
-        spawnCreature->InitStatsForLevel(level, m_caster);
-        spawnCreature->GetCharmInfo()->SetPetNumber(pet_number, false);
+void Spell::EffectCreateItem(SpellEffectIndex eff_idx)
+{
+    DoCreateItem(eff_idx,m_spellInfo->EffectItemType[eff_idx]);
+    SendEffectLogExecute(eff_idx, ObjectGuid(), m_spellInfo->EffectItemType[eff_idx]);
+}
 
-        spawnCreature->AIM_Initialize();
+void Spell::EffectCreateItem2(SpellEffectIndex eff_idx)
+{
+    if (m_caster->GetTypeId()!=TYPEID_PLAYER)
+        return;
+    Player* player = (Player*)m_caster;
 
-        m_caster->AddGuardian(spawnCreature);
+    // explicit item (possible fake)
+    uint32 item_id = m_spellInfo->EffectItemType[eff_idx];
 
-        map->Add((Creature*)spawnCreature);
+    if (item_id)
+    {
+        DoCreateItem(eff_idx, item_id);
+        SendEffectLogExecute(eff_idx,ObjectGuid(), item_id);
+    }
 
-        // Notify Summoner
-        if (m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->AI())
-            ((Creature*)m_caster)->AI()->JustSummoned(spawnCreature);
-        if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
-            ((Creature*)m_originalCaster)->AI()->JustSummoned(spawnCreature);
+    // not explicit loot (with fake item drop if need)
+    if (IsLootCraftingSpell(m_spellInfo))
+    {
+        if (item_id)
+        {
+            if (!player->HasItemCount(item_id, 1))
+                return;
+
+            // remove reagent
+            uint32 count = 1;
+            player->DestroyItemCount(item_id, count, true);
+        }
+
+        // create some random items
+        player->AutoStoreLoot(NULL, m_spellInfo->Id, LootTemplates_Spell);
     }
 }
 
-void Spell::EffectTeleUnitsFaceCaster(SpellEffectIndex eff_idx)
+void Spell::EffectCreateRandomItem(SpellEffectIndex /*eff_idx*/)
 {
-    if (!unitTarget)
+    if (m_caster->GetTypeId()!=TYPEID_PLAYER)
         return;
+    Player* player = (Player*)m_caster;
 
-    if (unitTarget->IsTaxiFlying())
-        return;
+    // create some random items
+    player->AutoStoreLoot(NULL, m_spellInfo->Id, LootTemplates_Spell);
+}
+
+void Spell::EffectPersistentAA(SpellEffectIndex eff_idx)
+{
+    Unit* pCaster = GetAffectiveCaster();
+    // FIXME: in case wild GO will used wrong affective caster (target in fact) as dynobject owner
+    if (!pCaster)
+        pCaster = m_caster;
 
-    float dis = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[eff_idx]));
+    float radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[eff_idx]));
 
-    float fx, fy, fz;
-    m_caster->GetClosePoint(fx, fy, fz, unitTarget->GetObjectBoundingRadius(), dis);
+    if (Player* modOwner = pCaster->GetSpellModOwner())
+        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius);
 
-    unitTarget->NearTeleportTo(fx, fy, fz, -m_caster->GetOrientation(), unitTarget==m_caster);
-}
+    DynamicObject* dynObj = new DynamicObject;
 
-void Spell::EffectLearnSkill(SpellEffectIndex eff_idx)
-{
-    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
-        return;
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetPosition();
 
-    if (damage < 0)
+    if (!dynObj->Create(pCaster->GetMap()->GenerateLocalLowGuid(HIGHGUID_DYNAMICOBJECT), pCaster, m_spellInfo->Id,
+        eff_idx, loc.x, loc.y, loc.z, m_duration, radius, DYNAMIC_OBJECT_AREA_SPELL))
+    {
+        delete dynObj;
         return;
+    }
 
-    uint32 skillid =  m_spellInfo->EffectMiscValue[eff_idx];
-    uint16 skillval = ((Player*)unitTarget)->GetPureSkillValue(skillid);
-    ((Player*)unitTarget)->SetSkill(skillid, skillval ? skillval : 1, damage * 75, damage);
+    pCaster->AddDynObject(dynObj);
+    pCaster->GetMap()->Add(dynObj);
 }
 
-void Spell::EffectAddHonor(SpellEffectIndex /*eff_idx*/)
+void Spell::EffectEnergize(SpellEffectIndex eff_idx)
 {
-    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget)
+        return;
+    if (!unitTarget->isAlive())
         return;
 
-    // not scale value for item based reward (/10 value expected)
-    if (m_CastItem)
-    {
-        ((Player*)unitTarget)->RewardHonor(NULL, 1, float(damage / 10));
-        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "SpellEffect::AddHonor (spell_id %u) rewards %d honor points (item %u) for player: %u", m_spellInfo->Id, damage/10, m_CastItem->GetEntry(),((Player*)unitTarget)->GetGUIDLow());
+    // don't energize isolated units (banished)
+    if (unitTarget->hasUnitState(UNIT_STAT_ISOLATED))
         return;
-    }
 
-    // do not allow to add too many honor for player (50 * 21) = 1040 at level 70, or (50 * 31) = 1550 at level 80
-    if (damage <= 50)
-    {
-        float honor_reward = MaNGOS::Honor::hk_honor_at_level(unitTarget->getLevel(), damage);
-        ((Player*)unitTarget)->RewardHonor(NULL, 1, honor_reward);
-        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "SpellEffect::AddHonor (spell_id %u) rewards %f honor points (scale) to player: %u", m_spellInfo->Id, honor_reward, ((Player*)unitTarget)->GetGUIDLow());
-    }
-    else
-    {
-        //maybe we have correct honor_gain in damage already
-        ((Player*)unitTarget)->RewardHonor(NULL, 1, (float)damage);
-        sLog.outError("SpellEffect::AddHonor (spell_id %u) rewards %u honor points (non scale) for player: %u", m_spellInfo->Id, damage, ((Player*)unitTarget)->GetGUIDLow());
-    }
-}
-
-void Spell::EffectTradeSkill(SpellEffectIndex /*eff_idx*/)
-{
-    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (m_spellInfo->EffectMiscValue[eff_idx] < 0 || m_spellInfo->EffectMiscValue[eff_idx] >= MAX_POWERS)
         return;
-    // uint32 skillid =  m_spellInfo->EffectMiscValue[i];
-    // uint16 skillmax = ((Player*)unitTarget)->(skillid);
-    // ((Player*)unitTarget)->SetSkill(skillid,skillval?skillval:1,skillmax+75);
-}
 
-void Spell::EffectEnchantItemPerm(SpellEffectIndex eff_idx)
-{
-    if (m_caster->GetTypeId() != TYPEID_PLAYER)
-        return;
-    if (!itemTarget)
-        return;
+    Powers power = Powers(m_spellInfo->EffectMiscValue[eff_idx]);
 
-    uint32 enchant_id = m_spellInfo->EffectMiscValue[eff_idx];
-    if (!enchant_id)
-        return;
+    // Some level depends spells
+    int level_multiplier = 0;
+    int level_diff = 0;
+    switch (m_spellInfo->Id)
+    {
+        case 2687:                                          // Bloodrage
+            if (m_caster->HasAura(70844))
+                m_caster->CastSpell(m_caster,70845,true);
+            break;
+        case 9512:                                          // Restore Energy
+            level_diff = m_caster->getLevel() - 40;
+            level_multiplier = 2;
+            break;
+        case 24571:                                         // Blood Fury
+            level_diff = m_caster->getLevel() - 60;
+            level_multiplier = 10;
+            break;
+        case 24532:                                         // Burst of Energy
+            level_diff = m_caster->getLevel() - 60;
+            level_multiplier = 4;
+            break;
+        case 48542:                                         // Revitalize (mana restore case)
+            damage = damage * unitTarget->GetMaxPower(POWER_MANA) / 100;
+            break;
+        case 31930:                                         // Judgements of the Wise
+        case 63375:                                         // Improved Stormstrike
+        case 67545:                                         // Empowered Fire
+        case 68082:                                         // Glyph of Seal of Command
+            damage = damage * unitTarget->GetCreateMana() / 100;
+            break;
+        case 67487:                                         // Mana Potion Injector
+        case 67490:                                         // Runic Mana Injector
+        {
+            if (unitTarget->GetTypeId() == TYPEID_PLAYER)
+            {
+                Player* player = (Player*)unitTarget;
+                if (player->HasSkill(SKILL_ENGINEERING))
+                    damage += int32(damage * 0.25);
+            }
+            break;
+        }
+        default:
+            break;
+    }
 
-    SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
-    if (!pEnchant)
+    if (level_diff > 0)
+        damage -= level_multiplier * level_diff;
+
+    if (damage < 0)
         return;
 
-    // item can be in trade slot and have owner diff. from caster
-    Player* item_owner = itemTarget->GetOwner();
-    if (!item_owner)
+    if (unitTarget->GetMaxPower(power) == 0)
         return;
 
-    Player* p_caster = (Player*)m_caster;
+    m_caster->EnergizeBySpell(unitTarget, m_spellInfo->Id, damage, power);
 
-    // Enchanting a vellum requires special handling, as it creates a new item
-    // instead of modifying an existing one.
-    ItemPrototype const* targetProto = itemTarget->GetProto();
-    if (targetProto->IsVellum() && m_spellInfo->EffectItemType[eff_idx])
+    // Mad Alchemist's Potion
+    if (m_spellInfo->Id == 45051)
     {
-        unitTarget = m_caster;
-        DoCreateItem(eff_idx,m_spellInfo->EffectItemType[eff_idx]);
-        // Vellum target case: Target becomes additional reagent, new scroll item created instead in Spell::EffectEnchantItemPerm()
-        // cannot already delete in TakeReagents() unfortunately
-        p_caster->DestroyItemCount(targetProto->ItemId, 1, true);
-        return;
-    }
+        // find elixirs on target
+        uint32 elixir_mask = 0;
+        Unit::SpellAuraHolderMap& Auras = unitTarget->GetSpellAuraHolderMap();
+        for(Unit::SpellAuraHolderMap::iterator itr = Auras.begin(); itr != Auras.end(); ++itr)
+        {
+            uint32 spell_id = itr->second->GetId();
+            if (uint32 mask = sSpellMgr.GetSpellElixirMask(spell_id))
+                elixir_mask |= mask;
+        }
 
-    // Using enchant stored on scroll does not increase enchanting skill! (Already granted on scroll creation)
-    if (!(m_CastItem && m_CastItem->GetProto()->Flags & ITEM_FLAG_ENCHANT_SCROLL))
-        p_caster->UpdateCraftSkill(m_spellInfo->Id);
+        // get available elixir mask any not active type from battle/guardian (and flask if no any)
+        elixir_mask = (elixir_mask & ELIXIR_FLASK_MASK) ^ ELIXIR_FLASK_MASK;
 
-    if (item_owner!=p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE) )
-    {
-        sLog.outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)",
-            p_caster->GetName(),p_caster->GetSession()->GetAccountId(),
-            itemTarget->GetProto()->Name1,itemTarget->GetEntry(),
-            item_owner->GetName(),item_owner->GetSession()->GetAccountId());
-    }
+        // get all available elixirs by mask and spell level
+        std::vector<uint32> elixirs;
+        SpellElixirMap const& m_spellElixirs = sSpellMgr.GetSpellElixirMap();
+        for(SpellElixirMap::const_iterator itr = m_spellElixirs.begin(); itr != m_spellElixirs.end(); ++itr)
+        {
+            if (itr->second & elixir_mask)
+            {
+                if (itr->second & (ELIXIR_UNSTABLE_MASK | ELIXIR_SHATTRATH_MASK))
+                    continue;
 
-    // remove old enchanting before applying new if equipped
-    item_owner->ApplyEnchantment(itemTarget,PERM_ENCHANTMENT_SLOT,false);
+                SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
+                if (spellInfo && (spellInfo->spellLevel < m_spellInfo->spellLevel || spellInfo->spellLevel > unitTarget->getLevel()))
+                    continue;
 
-    itemTarget->SetEnchantment(PERM_ENCHANTMENT_SLOT, enchant_id, 0, 0);
+                elixirs.push_back(itr->first);
+            }
+        }
 
-    // add new enchanting if equipped
-    item_owner->ApplyEnchantment(itemTarget,PERM_ENCHANTMENT_SLOT,true);
+        if (!elixirs.empty())
+        {
+            // cast random elixir on target
+            uint32 rand_spell = urand(0,elixirs.size()-1);
+            m_caster->CastSpell(unitTarget,elixirs[rand_spell],true,m_CastItem);
+        }
+    }
 }
 
-void Spell::EffectEnchantItemPrismatic(SpellEffectIndex eff_idx)
+void Spell::EffectEnergisePct(SpellEffectIndex eff_idx)
 {
-    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget)
         return;
-    if (!itemTarget)
+    if (!unitTarget->isAlive())
         return;
 
-    Player* p_caster = (Player*)m_caster;
+    if (m_spellInfo->EffectMiscValue[eff_idx] < 0 || m_spellInfo->EffectMiscValue[eff_idx] >= MAX_POWERS)
+        return;
 
-    uint32 enchant_id = m_spellInfo->EffectMiscValue[eff_idx];
-    if (!enchant_id)
+    Powers power = Powers(m_spellInfo->EffectMiscValue[eff_idx]);
+
+    uint32 maxPower = unitTarget->GetMaxPower(power);
+    if (maxPower == 0)
         return;
 
-    SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
-    if (!pEnchant)
+    uint32 gain = damage * maxPower / 100;
+    m_caster->EnergizeBySpell(unitTarget, m_spellInfo->Id, gain, power);
+}
+
+void Spell::SendLoot(ObjectGuid guid, LootType loottype, LockType lockType)
+{
+    if (!m_caster)
         return;
 
-    // support only enchantings with add socket in this slot
+    if (!m_IsTriggeredSpell && isSpellBreakStealth(m_spellInfo))
+        m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_USE);
+
+    if (gameObjTarget)
     {
-        bool add_socket = false;
-        for(int i = 0; i < 3; ++i)
+        switch (gameObjTarget->GetGoType())
         {
-            if (pEnchant->type[i]==ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET)
-            {
-                add_socket = true;
+            case GAMEOBJECT_TYPE_DOOR:
+            case GAMEOBJECT_TYPE_BUTTON:
+            case GAMEOBJECT_TYPE_QUESTGIVER:
+            case GAMEOBJECT_TYPE_SPELL_FOCUS:
+            case GAMEOBJECT_TYPE_GOOBER:
+                gameObjTarget->Use(m_caster);
+                return;
+
+            case GAMEOBJECT_TYPE_CHEST:
+                gameObjTarget->Use(m_caster);
+                // Don't return, let loots been taken
                 break;
-            }
-        }
-        if (!add_socket)
-        {
-            sLog.outError("Spell::EffectEnchantItemPrismatic: attempt apply enchant spell %u with SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC (%u) but without ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET (%u), not suppoted yet.",
-                m_spellInfo->Id,SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC,ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET);
-            return;
+
+            case GAMEOBJECT_TYPE_TRAP:
+                if (lockType == LOCKTYPE_DISARM_TRAP || gameObjTarget->GetEntry() == 190752 || gameObjTarget->GetEntry() == 195235 || gameObjTarget->GetEntry() == 195331)
+                {
+                    gameObjTarget->SetLootState(GO_JUST_DEACTIVATED);
+                    return;
+                }
+                sLog.outError("Spell::SendLoot unhandled locktype %u for GameObject trap (entry %u) for spell %u.", lockType, gameObjTarget->GetEntry(), m_spellInfo->Id);
+                return;
+            default:
+                sLog.outError("Spell::SendLoot unhandled GameObject type %u (entry %u) for spell %u.", gameObjTarget->GetGoType(), gameObjTarget->GetEntry(), m_spellInfo->Id);
+                return;
         }
     }
 
-    // item can be in trade slot and have owner diff. from caster
-    Player* item_owner = itemTarget->GetOwner();
-    if (!item_owner)
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    if (item_owner!=p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE) )
-    {
-        sLog.outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)",
-            p_caster->GetName(),p_caster->GetSession()->GetAccountId(),
-            itemTarget->GetProto()->Name1,itemTarget->GetEntry(),
-            item_owner->GetName(),item_owner->GetSession()->GetAccountId());
-    }
-
-    // remove old enchanting before applying new if equipped
-    item_owner->ApplyEnchantment(itemTarget,PRISMATIC_ENCHANTMENT_SLOT,false);
-
-    itemTarget->SetEnchantment(PRISMATIC_ENCHANTMENT_SLOT, enchant_id, 0, 0);
-
-    // add new enchanting if equipped
-    item_owner->ApplyEnchantment(itemTarget,PRISMATIC_ENCHANTMENT_SLOT,true);
+    // Send loot
+    ((Player*)m_caster)->SendLoot(guid, loottype);
 }
 
-void Spell::EffectEnchantItemTmp(SpellEffectIndex eff_idx)
+void Spell::EffectOpenLock(SpellEffectIndex eff_idx)
 {
-    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (!m_caster || m_caster->GetTypeId() != TYPEID_PLAYER)
+    {
+        DEBUG_LOG( "WORLD: Open Lock - No Player Caster!");
         return;
+    }
 
-    Player* p_caster = (Player*)m_caster;
+    Player* player = m_caster->GetCharmerOrOwnerPlayerOrPlayerItself();
 
-    // Rockbiter Weapon
-    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000400000))
-    {
-        uint32 spell_id = 0;
+    uint32 lockId = 0;
+    ObjectGuid guid;
 
-        // enchanting spell selected by calculated damage-per-sec stored in Effect[1] base value
-        // Note: damage calculated (correctly) with rounding int32(float(v)) but
-        // RW enchantments applied damage int32(float(v)+0.5), this create  0..1 difference sometime
-        switch(damage)
+    // Get lockId
+    if (player && gameObjTarget)
+    {
+        GameObjectInfo const* goInfo = gameObjTarget->GetGOInfo();
+        // Arathi Basin banner opening !
+        if ((goInfo->type == GAMEOBJECT_TYPE_BUTTON && goInfo->button.noDamageImmune) ||
+            (goInfo->type == GAMEOBJECT_TYPE_GOOBER && goInfo->goober.losOK))
         {
-            // Rank 1
-            case  2: spell_id = 36744; break;               //  0% [ 7% ==  2, 14% == 2, 20% == 2]
-            // Rank 2
-            case  4: spell_id = 36753; break;               //  0% [ 7% ==  4, 14% == 4]
-            case  5: spell_id = 36751; break;               // 20%
-            // Rank 3
-            case  6: spell_id = 36754; break;               //  0% [ 7% ==  6, 14% == 6]
-            case  7: spell_id = 36755; break;               // 20%
-            // Rank 4
-            case  9: spell_id = 36761; break;               //  0% [ 7% ==  6]
-            case 10: spell_id = 36758; break;               // 14%
-            case 11: spell_id = 36760; break;               // 20%
-            default:
-                sLog.outError("Spell::EffectEnchantItemTmp: Damage %u not handled in S'RW",damage);
+            //CanUseBattleGroundObject() already called in CheckCast()
+            // in battleground check
+            if (BattleGround *bg = player->GetBattleGround())
+            {
+                // check if it's correct bg
+                if (bg->GetTypeID(true) == BATTLEGROUND_AB || bg->GetTypeID(true) == BATTLEGROUND_AV || bg->GetTypeID(true) == BATTLEGROUND_SA || bg->GetTypeID(true) == BATTLEGROUND_IC)
+                    bg->EventPlayerClickedOnFlag(player, gameObjTarget);
                 return;
+            }
         }
-
-        SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
-        if (!spellInfo)
+        else if (goInfo->type == GAMEOBJECT_TYPE_FLAGSTAND)
         {
-            sLog.outError("Spell::EffectEnchantItemTmp: unknown spell id %i", spell_id);
-            return;
+            //CanUseBattleGroundObject() already called in CheckCast()
+            // in battleground check
+            if (BattleGround *bg = player->GetBattleGround())
+            {
+                if (bg->GetTypeID(true) == BATTLEGROUND_EY)
+                    bg->EventPlayerClickedOnFlag(player, gameObjTarget);
+                return;
+            }
+        }
+        else if(goInfo->type == GAMEOBJECT_TYPE_GOOBER)
+        {
+            // Check if object is handled by outdoor pvp
+            // GameObject is handling some events related to world battleground events
+            if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(player->GetZoneId()))
+                if(outdoorPvP->HandleGameObjectUse(player, gameObjTarget))
+                    return;
         }
 
-        Spell *spell = new Spell(m_caster, spellInfo, true);
-        SpellCastTargets targets;
-        targets.setItemTarget( itemTarget );
-        spell->prepare(&targets);
-        return;
-    }
-
-    if (!itemTarget)
-        return;
-
-    uint32 enchant_id = m_spellInfo->EffectMiscValue[eff_idx];
-
-    if (!enchant_id)
-    {
-        sLog.outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have 0 as enchanting id",m_spellInfo->Id,eff_idx);
-        return;
+        lockId = goInfo->GetLockId();
+        guid = gameObjTarget->GetObjectGuid();
     }
-
-    SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
-    if(!pEnchant)
+    else if (itemTarget)
     {
-        sLog.outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have nonexistent enchanting id %u ",m_spellInfo->Id,eff_idx,enchant_id);
-        return;
+        lockId = itemTarget->GetProto()->LockID;
+        guid = itemTarget->GetObjectGuid();
     }
-
-    // select enchantment duration
-    uint32 duration;
-
-    // rogue family enchantments exception by duration
-    if(m_spellInfo->Id == 38615)
-        duration = 1800;                                    // 30 mins
-    // other rogue family enchantments always 1 hour (some have spell damage=0, but some have wrong data in EffBasePoints)
-    else if(m_spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE)
-        duration = 3600;                                    // 1 hour
-    // shaman family enchantments
-    else if(m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN)
-        duration = 1800;                                    // 30 mins
-    // other cases with this SpellVisual already selected
-    else if(m_spellInfo->SpellVisual[0] == 215)
-        duration = 1800;                                    // 30 mins
-    // some fishing pole bonuses
-    else if(m_spellInfo->SpellVisual[0] == 563)
-        duration = 600;                                     // 10 mins
-    // shaman rockbiter enchantments
-    else if(m_spellInfo->SpellVisual[0] == 0)
-        duration = 1800;                                    // 30 mins
-    else if(m_spellInfo->Id == 29702)
-        duration = 300;                                     // 5 mins
-    else if(m_spellInfo->Id == 37360)
-        duration = 300;                                     // 5 mins
-    // default case
     else
-        duration = 3600;                                    // 1 hour
-
-    // item can be in trade slot and have owner diff. from caster
-    Player* item_owner = itemTarget->GetOwner();
-    if(!item_owner)
-        return;
-
-    if(item_owner!=p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE) )
-    {
-        sLog.outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(temp): %s (Entry: %d) for player: %s (Account: %u)",
-            p_caster->GetName(), p_caster->GetSession()->GetAccountId(),
-            itemTarget->GetProto()->Name1, itemTarget->GetEntry(),
-            item_owner->GetName(), item_owner->GetSession()->GetAccountId());
-    }
-
-    // remove old enchanting before applying new if equipped
-    item_owner->ApplyEnchantment(itemTarget,TEMP_ENCHANTMENT_SLOT, false);
-
-    itemTarget->SetEnchantment(TEMP_ENCHANTMENT_SLOT, enchant_id, duration * 1000, 0);
-
-    // add new enchanting if equipped
-    item_owner->ApplyEnchantment(itemTarget, TEMP_ENCHANTMENT_SLOT, true);
-}
-
-void Spell::EffectTameCreature(SpellEffectIndex /*eff_idx*/)
-{
-    // Caster must be player, checked in Spell::CheckCast
-    // Spell can be triggered, we need to check original caster prior to caster
-    Player* plr = (Player*)GetAffectiveCaster();
-
-    Creature* creatureTarget = (Creature*)unitTarget;
-
-    // cast finish successfully
-    //SendChannelUpdate(0);
-    finish();
-
-    Pet* pet = new Pet(HUNTER_PET);
-
-    if(!pet->CreateBaseAtCreature(creatureTarget))
     {
-        delete pet;
+        DEBUG_LOG( "WORLD: Open Lock - No GameObject/Item Target!");
         return;
     }
 
-    pet->SetOwnerGuid(plr->GetObjectGuid());
-    pet->SetCreatorGuid(plr->GetObjectGuid());
-    pet->setFaction(plr->getFaction());
-    pet->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
-
-    if (plr->IsPvP())
-        pet->SetPvP(true);
-
-    if (plr->IsFFAPvP())
-        pet->SetFFAPvP(true);
-
-    // level of hunter pet can't be less owner level at 5 levels
-    uint32 level = creatureTarget->getLevel() + 5 < plr->getLevel() ? (plr->getLevel() - 5) : creatureTarget->getLevel();
+    SkillType skillId = SKILL_NONE;
+    int32 reqSkillValue = 0;
+    int32 skillValue;
 
-    if (!pet->InitStatsForLevel(level))
+    SpellCastResult res = CanOpenLock(eff_idx, lockId, skillId, reqSkillValue, skillValue);
+    if (res != SPELL_CAST_OK)
     {
-        sLog.outError("Pet::InitStatsForLevel() failed for creature (Entry: %u)!", creatureTarget->GetEntry());
-        delete pet;
+        SendCastResult(res);
         return;
     }
 
-    pet->GetCharmInfo()->SetPetNumber(sObjectMgr.GeneratePetNumber(), true);
-    // this enables pet details window (Shift+P)
-    pet->AIM_Initialize();
-    pet->InitPetCreateSpells();
-    pet->InitLevelupSpellsForLevel();
-    pet->InitTalentForLevel();
-    pet->SetHealth(pet->GetMaxHealth());
-
-    // "kill" original creature
-    creatureTarget->ForcedDespawn();
-
-    // prepare visual effect for levelup
-    pet->SetUInt32Value(UNIT_FIELD_LEVEL, level - 1);
-
-    // add to world
-    pet->GetMap()->Add((Creature*)pet);
-
-    // visual effect for levelup
-    pet->SetUInt32Value(UNIT_FIELD_LEVEL, level);
-
-    // caster have pet now
-    plr->SetPet(pet);
-
-    pet->SavePetToDB(PET_SAVE_AS_CURRENT);
-    plr->PetSpellInitialize();
-}
+    // mark item as unlocked
+    if (itemTarget)
+        itemTarget->SetFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_UNLOCKED);
 
-void Spell::EffectSummonPet(SpellEffectIndex eff_idx)
-{
-    uint32 petentry = m_spellInfo->EffectMiscValue[eff_idx];
+    SendLoot(guid, LOOT_SKINNING, LockType(m_spellInfo->EffectMiscValue[eff_idx]));
 
-    Pet *OldSummon = m_caster->GetPet();
+    SendEffectLogExecute(eff_idx, guid);
 
-    // if pet requested type already exist
-    if( OldSummon )
+    // not allow use skill grow at item base open
+    if (!m_CastItem && skillId != SKILL_NONE)
     {
-        if(petentry == 0 || OldSummon->GetEntry() == petentry)
+        // update skill if really known
+        if (uint32 pureSkillValue = player->GetPureSkillValue(skillId))
         {
-            // pet in corpse state can't be summoned
-            if( OldSummon->isDead() )
-                return;
-
-            OldSummon->GetMap()->Remove((Creature*)OldSummon,false);
-
-            float px, py, pz;
-            m_caster->GetClosePoint(px, py, pz, OldSummon->GetObjectBoundingRadius());
-
-            OldSummon->Relocate(px, py, pz, OldSummon->GetOrientation());
-            m_caster->GetMap()->Add((Creature*)OldSummon);
-
-            if(m_caster->GetTypeId() == TYPEID_PLAYER && OldSummon->isControlled() )
+            if (gameObjTarget)
             {
-                ((Player*)m_caster)->PetSpellInitialize();
+                // Allow one skill-up until respawned
+                if (!gameObjTarget->IsInSkillupList(player) &&
+                    player->UpdateGatherSkill(skillId, pureSkillValue, reqSkillValue))
+                    gameObjTarget->AddToSkillupList(player);
+            }
+            else if (itemTarget)
+            {
+                // Do one skill-up
+                player->UpdateGatherSkill(skillId, pureSkillValue, reqSkillValue);
             }
-            return;
         }
-
-        if(m_caster->GetTypeId() == TYPEID_PLAYER)
-            OldSummon->Unsummon(OldSummon->getPetType() == HUNTER_PET ? PET_SAVE_AS_DELETED : PET_SAVE_NOT_IN_SLOT, m_caster);
-        else
-            return;
     }
+}
 
-    CreatureInfo const* cInfo = petentry ? sCreatureStorage.LookupEntry<CreatureInfo>(petentry) : NULL;
-
-    // == 0 in case call current pet, check only real summon case
-    if (petentry && !cInfo)
-    {
-        sLog.outErrorDb("EffectSummonPet: creature entry %u not found for spell %u.", petentry, m_spellInfo->Id);
+void Spell::EffectSummonChangeItem(SpellEffectIndex eff_idx)
+{
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-    }
 
-    Pet* NewSummon = new Pet;
+    Player *player = (Player*)m_caster;
 
-    // petentry==0 for hunter "call pet" (current pet summoned if any)
-    if (m_caster->GetTypeId() == TYPEID_PLAYER && NewSummon->LoadPetFromDB((Player*)m_caster, petentry))
+    // applied only to using item
+    if (!m_CastItem)
         return;
 
-    // not error in case fail hunter call pet
-    if (!petentry)
-    {
-        delete NewSummon;
+    // ... only to item in own inventory/bank/equip_slot
+    if (m_CastItem->GetOwnerGuid() != player->GetObjectGuid())
         return;
-    }
 
-    CreatureCreatePos pos(m_caster, m_caster->GetOrientation());
-
-    Map *map = m_caster->GetMap();
-    uint32 pet_number = sObjectMgr.GeneratePetNumber();
-    if (!NewSummon->Create(map->GenerateLocalLowGuid(HIGHGUID_PET), pos, cInfo, pet_number))
-    {
-        delete NewSummon;
+    uint32 newitemid = m_spellInfo->EffectItemType[eff_idx];
+    if (!newitemid)
         return;
-    }
-
-    NewSummon->SetSummonPoint(pos);
-
-    uint32 petlevel = m_caster->getLevel();
-    NewSummon->setPetType(SUMMON_PET);
 
-    uint32 faction = m_caster->getFaction();
-    if(m_caster->GetTypeId() == TYPEID_UNIT)
-    {
-        if ( ((Creature*)m_caster)->IsTotem() )
-            NewSummon->GetCharmInfo()->SetReactState(REACT_AGGRESSIVE);
-        else
-            NewSummon->GetCharmInfo()->SetReactState(REACT_DEFENSIVE);
-    }
-
-    NewSummon->SetOwnerGuid(m_caster->GetObjectGuid());
-    NewSummon->SetCreatorGuid(m_caster->GetObjectGuid());
-    NewSummon->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
-    NewSummon->setFaction(faction);
-    NewSummon->SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, uint32(time(NULL)));
-    NewSummon->SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0);
-    NewSummon->SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, 1000);
-    NewSummon->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
-
-    NewSummon->GetCharmInfo()->SetPetNumber(pet_number, true);
-    // this enables pet details window (Shift+P)
-
-    if(m_caster->IsPvP())
-        NewSummon->SetPvP(true);
+    Item* oldItem = m_CastItem;
 
-    if(m_caster->IsFFAPvP())
-        NewSummon->SetFFAPvP(true);
+    // prevent crash at access and unexpected charges counting with item update queue corrupt
+    ClearCastItem();
 
-    NewSummon->InitStatsForLevel(petlevel, m_caster);
-    NewSummon->InitPetCreateSpells();
-    NewSummon->InitLevelupSpellsForLevel();
-    NewSummon->InitTalentForLevel();
+    player->ConvertItem(oldItem, newitemid);
+}
 
-    if (m_caster->GetTypeId() == TYPEID_PLAYER && NewSummon->getPetType() == SUMMON_PET)
-    {
-        // generate new name for summon pet
-        std::string new_name = sObjectMgr.GeneratePetName(petentry);
-        if (!new_name.empty())
-            NewSummon->SetName(new_name);
-    }
+void Spell::EffectProficiency(SpellEffectIndex /*eff_idx*/)
+{
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+        return;
+    Player *p_target = (Player*)unitTarget;
 
-    if (NewSummon->getPetType() == HUNTER_PET)
+    uint32 subClassMask = m_spellInfo->EquippedItemSubClassMask;
+    if (m_spellInfo->EquippedItemClass == ITEM_CLASS_WEAPON && !(p_target->GetWeaponProficiency() & subClassMask))
     {
-        NewSummon->RemoveByteFlag(UNIT_FIELD_BYTES_2, 2, UNIT_CAN_BE_RENAMED);
-        NewSummon->SetByteFlag(UNIT_FIELD_BYTES_2, 2, UNIT_CAN_BE_ABANDONED);
+        p_target->AddWeaponProficiency(subClassMask);
+        p_target->SendProficiency(ITEM_CLASS_WEAPON, p_target->GetWeaponProficiency());
     }
-
-    NewSummon->AIM_Initialize();
-    NewSummon->SetHealth(NewSummon->GetMaxHealth());
-    NewSummon->SetPower(POWER_MANA, NewSummon->GetMaxPower(POWER_MANA));
-
-    map->Add((Creature*)NewSummon);
-
-    m_caster->SetPet(NewSummon);
-    DEBUG_LOG("New Pet has guid %u", NewSummon->GetGUIDLow());
-
-    if(m_caster->GetTypeId() == TYPEID_PLAYER)
+    if (m_spellInfo->EquippedItemClass == ITEM_CLASS_ARMOR && !(p_target->GetArmorProficiency() & subClassMask))
     {
-        NewSummon->SavePetToDB(PET_SAVE_AS_CURRENT);
-        ((Player*)m_caster)->PetSpellInitialize();
+        p_target->AddArmorProficiency(subClassMask);
+        p_target->SendProficiency(ITEM_CLASS_ARMOR, p_target->GetArmorProficiency());
     }
 }
 
-void Spell::EffectLearnPetSpell(SpellEffectIndex eff_idx)
+void Spell::EffectApplyAreaAura(SpellEffectIndex eff_idx)
 {
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
-        return;
-
-    Player *_player = (Player*)m_caster;
-
-    Pet *pet = _player->GetPet();
-    if(!pet)
-        return;
-    if(!pet->isAlive())
+    if (!unitTarget)
         return;
 
-    SpellEntry const *learn_spellproto = sSpellStore.LookupEntry(m_spellInfo->EffectTriggerSpell[eff_idx]);
-    if(!learn_spellproto)
+    if (!unitTarget->isAlive())
         return;
 
-    pet->learnSpell(learn_spellproto->Id);
+    m_spellAuraHolder->CreateAura(AURA_CLASS_AREA_AURA, eff_idx, &m_currentBasePoints[eff_idx], m_spellAuraHolder, unitTarget, m_caster, m_CastItem);
 
-    pet->SavePetToDB(PET_SAVE_AS_CURRENT);
-    _player->PetSpellInitialize();
+    if (IsCasterSourceAuraTarget(m_spellInfo->GetEffectImplicitTargetAByIndex(eff_idx)))
+        m_spellAuraHolder->SetAffectiveCasterGuid(m_originalCasterGuid);
 }
 
-void Spell::EffectTaunt(SpellEffectIndex /*eff_idx*/)
+void Spell::EffectSummonType(SpellEffectIndex eff_idx)
 {
-    if (!unitTarget)
+    uint32 prop_id = m_spellInfo->EffectMiscValueB[eff_idx];
+    SummonPropertiesEntry const *summon_prop = sSummonPropertiesStore.LookupEntry(prop_id);
+    if (!summon_prop)
+    {
+        sLog.outError("EffectSummonType: Unhandled summon type %u", prop_id);
         return;
+    }
 
-    // this effect use before aura Taunt apply for prevent taunt already attacking target
-    // for spell as marked "non effective at already attacking target"
-    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+    // Get casting object
+    WorldObject* realCaster = GetCastingObject();
+    if (!realCaster)
     {
-        if (unitTarget->getVictim()==m_caster)
-        {
-            SendCastResult(SPELL_FAILED_DONT_REPORT);
-            return;
-        }
+        sLog.outError("EffectSummonType: No Casting Object found for spell %u, (caster = %s)", m_spellInfo->Id, m_caster->GetGuidStr().c_str());
+        return;
     }
 
-    // Also use this effect to set the taunter's threat to the taunted creature's highest value
-    if (unitTarget->CanHaveThreatList() && unitTarget->getThreatManager().getCurrentVictim())
-        unitTarget->getThreatManager().addThreat(m_caster,unitTarget->getThreatManager().getCurrentVictim()->getThreat());
-}
-
-void Spell::EffectWeaponDmg(SpellEffectIndex eff_idx)
-{
-    if(!unitTarget)
-        return;
-    if(!unitTarget->isAlive())
-        return;
-
-    // multiple weapon dmg effect workaround
-    // execute only the last weapon damage
-    // and handle all effects at once
-    for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
-    {
-        switch(m_spellInfo->Effect[j])
-        {
-            case SPELL_EFFECT_WEAPON_DAMAGE:
-            case SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL:
-            case SPELL_EFFECT_NORMALIZED_WEAPON_DMG:
-            case SPELL_EFFECT_WEAPON_PERCENT_DAMAGE:
-                if (j < int(eff_idx))                             // we must calculate only at last weapon effect
-                    return;
-            break;
-        }
-    }
-
-    // some spell specific modifiers
-    bool spellBonusNeedWeaponDamagePercentMod = false;      // if set applied weapon damage percent mode to spell bonus
-
-    float weaponDamagePercentMod = 1.0f;                    // applied to weapon damage and to fixed effect damage bonus
-    float totalDamagePercentMod  = 1.0f;                    // applied to final bonus+weapon damage
-    bool normalized = false;
+    Unit* responsibleCaster = m_originalCaster;
+    if (realCaster->GetTypeId() == TYPEID_GAMEOBJECT)
+        responsibleCaster = ((GameObject*)realCaster)->GetOwner();
 
-    int32 spell_bonus = 0;                                  // bonus specific for spell
+    uint32 factionId = summon_prop->FactionId ? summon_prop->FactionId :
+                        // Else set faction to summoner's faction for pet-like summoned
+                        ((summon_prop->Flags & SUMMON_PROP_FLAG_INHERIT_FACTION) ?
+                        (responsibleCaster ? responsibleCaster->getFaction() : m_caster->getFaction()) :
+                        // else auto faction detect
+                        0);
 
-    switch(m_spellInfo->SpellFamilyName)
+    switch(summon_prop->Group)
     {
-        case SPELLFAMILY_GENERIC:
+        // faction handled later on, or loaded from template
+        case SUMMON_PROP_GROUP_WILD:
+        case SUMMON_PROP_GROUP_FRIENDLY:
         {
-            switch(m_spellInfo->Id)
+            switch(summon_prop->Title)                      // better from known way sorting summons by AI types
             {
-                // for spells with divided damage to targets
-                case 66765: case 66809: case 67331:         // Meteor Fists
-                case 67333:                                 // Meteor Fists
-                case 69055:                                 // Bone Slice
-                case 71021:                                 // Saber Lash
+                case UNITNAME_SUMMON_TITLE_NONE:
                 {
-                    uint32 count = 0;
-                    for(TargetList::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
-                        if(ihit->effectMask & (1<<eff_idx))
-                            ++count;
+                    // those are classical totems - effectbasepoints is their hp and not summon ammount!
+                    //121: 23035, battlestands
+                    //647: 52893, Anti-Magic Zone (npc used)
+                    if (prop_id == 121 || prop_id == 647)
+                        DoSummonTotem(eff_idx);
+                   // Snake trap exception
+                    else if (m_spellInfo->EffectMiscValueB[eff_idx] == 2301)
+                        DoSummonSnakes(eff_idx);
+                    else if (prop_id == 1021)
+                        DoSummonGuardian(eff_idx, factionId);
+                    else
+                        DoSummonWild(eff_idx, factionId);
+                    break;
+                }
+                case UNITNAME_SUMMON_TITLE_PET:
+                case UNITNAME_SUMMON_TITLE_MINION:
+                case UNITNAME_SUMMON_TITLE_RUNEBLADE:
+                    DoSummonGuardian(eff_idx, factionId);
+                    break;
+                case UNITNAME_SUMMON_TITLE_GUARDIAN:
+                {
+                    if (prop_id == 61)                      // mixed guardians, totems, statues
+                    {
+                        // * Stone Statue, etc  -- fits much better totem AI
+                        if (m_spellInfo->GetSpellIconID() == 2056)
+                            DoSummonTotem(eff_idx);
+                        else
+                        {
+                            // possible sort totems/guardians only by summon creature type
+                            CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(m_spellInfo->EffectMiscValue[eff_idx]);
 
-                    totalDamagePercentMod /= float(count);  // divide to all targets
+                            if (!cInfo)
+                                return;
+
+                            // FIXME: not all totems and similar cases selected by this check...
+                            if (cInfo->CreatureType == CREATURE_TYPE_TOTEM)
+                                DoSummonTotem(eff_idx);
+                            else
+                                DoSummonGuardian(eff_idx, factionId);
+                        }
+                    }
+                    else
+                        DoSummonGuardian(eff_idx, summon_prop->FactionId);
+                    break;
+                }
+                case UNITNAME_SUMMON_TITLE_CONSTRUCT:
+                {
+                    if (prop_id == 2913)                    // Scrapbot
+                        DoSummonWild(eff_idx, factionId);
+                    else
+                        DoSummonGuardian(eff_idx, factionId);
                     break;
                 }
+                case UNITNAME_SUMMON_TITLE_TOTEM:
+                    DoSummonTotem(eff_idx, summon_prop->Slot);
+                    break;
+                case UNITNAME_SUMMON_TITLE_COMPANION:
+                    // slot 6 set for critters that can help to player in fighting
+                    if (summon_prop->Slot == 6)
+                        DoSummonGuardian(eff_idx, factionId);
+                    else
+                        DoSummonCritter(eff_idx, factionId);
+                    break;
+                case UNITNAME_SUMMON_TITLE_OPPONENT:
+                case UNITNAME_SUMMON_TITLE_LIGHTWELL:
+                case UNITNAME_SUMMON_TITLE_BUTLER:
+                case UNITNAME_SUMMON_TITLE_MOUNT:
+                    DoSummonWild(eff_idx, factionId);
+                    break;
+                case UNITNAME_SUMMON_TITLE_VEHICLE:
+                    DoSummonWild(eff_idx, factionId);
+                    break;
+                default:
+                    sLog.outError("EffectSummonType: Unhandled summon title %u", summon_prop->Title);
+                break;
             }
             break;
         }
-        case SPELLFAMILY_WARRIOR:
+        case SUMMON_PROP_GROUP_PETS:
         {
-            // Devastate
-            if(m_spellInfo->SpellVisual[0] == 12295 && m_spellInfo->SpellIconID == 1508)
-            {
-                // Sunder Armor
-                Aura* sunder = unitTarget->GetAura(SPELL_AURA_MOD_RESISTANCE_PCT, SPELLFAMILY_WARRIOR, UI64LIT(0x0000000000004000), 0x00000000, m_caster->GetObjectGuid());
-
-                // Devastate bonus and sunder armor refresh
-                if (sunder)
-                {
-                    sunder->GetHolder()->RefreshHolder();
-                    spell_bonus += sunder->GetStackAmount() * CalculateDamage(EFFECT_INDEX_2, unitTarget);
-                }
-
-                // Devastate causing Sunder Armor Effect
-                // and no need to cast over max stack amount
-                if (!sunder || sunder->GetStackAmount() < sunder->GetSpellProto()->StackAmount)
-                    m_caster->CastSpell(unitTarget, 58567, true);
-            }
+            //1562 - force of nature  - sid 33831
+            //1161 - feral spirit - sid 51533
+            //89 - Infernal - sid 1122
+            DoSummonGroupPets(eff_idx);
             break;
         }
-        case SPELLFAMILY_ROGUE:
+        case SUMMON_PROP_GROUP_CONTROLLABLE:
         {
-            // Mutilate (for each hand)
-            if(m_spellInfo->SpellFamilyFlags & UI64LIT(0x600000000))
-            {
-                bool found = false;
-                // fast check
-                if(unitTarget->HasAuraState(AURA_STATE_DEADLY_POISON))
-                    found = true;
-                // full aura scan
-                else
-                {
-                    Unit::SpellAuraHolderMap const& auras = unitTarget->GetSpellAuraHolderMap();
-                    for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
-                    {
-                        if(itr->second->GetSpellProto()->Dispel == DISPEL_POISON)
-                        {
-                            found = true;
-                            break;
-                        }
-                    }
-                }
-
-                if(found)
-                    totalDamagePercentMod *= 1.2f;          // 120% if poisoned
-            }
-            // Fan of Knives
-            else if (m_caster->GetTypeId()==TYPEID_PLAYER && (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0004000000000000)))
+            switch(prop_id)
             {
-                Item* weapon = ((Player*)m_caster)->GetWeaponForAttack(m_attackType,true,true);
-                if (weapon && weapon->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER)
-                    totalDamagePercentMod *= 1.5f;          // 150% to daggers
-            }
-            // Ghostly Strike
-            else if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->Id == 14278)
-            {
-                Item* weapon = ((Player*)m_caster)->GetWeaponForAttack(m_attackType,true,true);
-                if (weapon && weapon->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER)
-                    totalDamagePercentMod *= 1.44f;         // 144% to daggers
-            }
-            // Hemorrhage
-            else if (m_caster->GetTypeId() == TYPEID_PLAYER && (m_spellInfo->SpellFamilyFlags & UI64LIT(0x2000000)))
-            {
-                Item* weapon = ((Player*)m_caster)->GetWeaponForAttack(m_attackType,true,true);
-                if (weapon && weapon->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER)
-                    totalDamagePercentMod *= 1.45f;         // 145% to daggers
+                case 65:
+                case 428:
+                    EffectSummonPossessed(eff_idx);
+                    break;
+                default:
+                    DoSummonGuardian(eff_idx, factionId);
+                break;
             }
             break;
         }
-        case SPELLFAMILY_PALADIN:
+        case SUMMON_PROP_GROUP_VEHICLE:
+        case SUMMON_PROP_GROUP_UNCONTROLLABLE_VEHICLE:
         {
-            // Judgement of Command - receive benefit from Spell Damage and Attack Power
-            if(m_spellInfo->SpellFamilyFlags & UI64LIT(0x00020000000000))
-            {
-                float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK);
-                int32 holy = m_caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(m_spellInfo));
-                if (holy < 0)
-                    holy = 0;
-                spell_bonus += int32(ap * 0.08f) + int32(holy * 13 / 100);
-            }
+            DoSummonVehicle(eff_idx, factionId);
             break;
         }
-        case SPELLFAMILY_HUNTER:
+        default:
+            sLog.outError("EffectSummonType: Unhandled summon group type %u", summon_prop->Group);
+            break;
+    }
+}
+
+void Spell::DoSummonGroupPets(SpellEffectIndex eff_idx)
+{
+    if (m_caster->GetPetGuid())
+        return;
+
+    if (!unitTarget)
+        return;
+
+    uint32 pet_entry = m_spellInfo->EffectMiscValue[eff_idx];
+    if (!pet_entry)
+        return;
+
+    CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(pet_entry);
+    if (!cInfo)
+    {
+        sLog.outErrorDb("Spell::DoSummon: creature entry %u not found for spell %u.", pet_entry, m_spellInfo->Id);
+        return;
+    }
+
+    if (m_duration > 0)
+    {
+        if (Player* modOwner = m_caster->GetSpellModOwner())
+            modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, m_duration);
+    }
+    else if (m_duration < 0)
+    {
+        DEBUG_LOG("Spell::DoSummonGroupPets: attempt to summon pet with negative duration (%i)",m_duration);
+        m_duration = 0;
+    }
+
+    int32 amount = m_spellInfo->EffectRealPointsPerLevel[eff_idx] ? m_spellInfo->EffectRealPointsPerLevel[eff_idx] : m_currentBasePoints[eff_idx];
+
+    if (amount < 0)
+        amount = 1;
+
+    uint32 originalSpellID = (m_IsTriggeredSpell && m_triggeredBySpellInfo) ? m_triggeredBySpellInfo->Id : m_spellInfo->Id;
+
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetPosition();
+
+    loc. SetOrientation(-m_caster->GetOrientation());
+
+    CreatureCreatePos pos(m_caster->GetMap(), loc);
+
+    if (m_caster->GetTypeId() == TYPEID_PLAYER)
+    {
+        QueryResult* result = CharacterDatabase.PQuery("SELECT id FROM character_pet WHERE owner = '%u' AND entry = '%u'",
+            m_caster->GetGUIDLow(), pet_entry);
+
+        std::vector<uint32> petnumber;
+
+        if (result)
         {
-            // Kill Shot
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x80000000000000))
+            do
             {
-                // 0.4*RAP added to damage (that is 0.2 if we apply PercentMod (200%) to spell_bonus, too)
-                spellBonusNeedWeaponDamagePercentMod = true;
-                spell_bonus += int32( 0.2f * m_caster->GetTotalAttackPowerValue(RANGED_ATTACK) );
+               Field* fields = result->Fetch();
+               uint32 petnum = fields[0].GetUInt32();
+               if (petnum)
+                   petnumber.push_back(petnum);
             }
-            break;
+            while (result->NextRow());
+            delete result;
         }
-        case SPELLFAMILY_SHAMAN:
+
+        if (!petnumber.empty())
         {
-            // Skyshatter Harness item set bonus
-            // Stormstrike
-            if(m_spellInfo->SpellFamilyFlags & UI64LIT(0x001000000000))
+            for (uint8 i = 0; i < petnumber.size() && amount > 0; ++i)
             {
-                Unit::AuraList const& m_OverrideClassScript = m_caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
-                for(Unit::AuraList::const_iterator citr = m_OverrideClassScript.begin(); citr != m_OverrideClassScript.end(); ++citr)
+                if (petnumber[i])
                 {
-                    // Stormstrike AP Buff
-                    if ( (*citr)->GetModifier()->m_miscvalue == 5634 )
+                    Pet* pet = new Pet(SUMMON_PET);
+                    // set timer for unsummon
+                    pet->SetDuration(m_duration);
+                    pet->SetCreateSpellID(originalSpellID);
+                    pet->SetPetCounter(amount-1);
+                    //bool _summoned = false;
+
+                    if (pet->LoadPetFromDB((Player*)m_caster, pet_entry, petnumber[i], false, &pos))
                     {
-                        m_caster->CastSpell(m_caster, 38430, true, NULL, *citr);
-                        break;
+                         --amount;
+                        DEBUG_LOG("%s summoned (from database). Counter is %d ",
+                            pet->GetGuidStr().c_str(), pet->GetPetCounter());
+                        SendEffectLogExecute(eff_idx, pet->GetObjectGuid());
                     }
+                    else
+                    {
+                        DEBUG_LOG("%s found in database, but not loaded. Counter is %d ",
+                             pet->GetGuidStr().c_str(), pet->GetPetCounter());
+                        delete pet;
+                    }
+
+                    if (m_duration)
+                        pet->SetDuration(m_duration);
+
                 }
             }
-            break;
         }
-        case SPELLFAMILY_DEATHKNIGHT:
+    }
+
+    // Pet not found in database
+    for (uint32 count = 0; count < uint32(amount); ++count)
+    {
+        Pet* pet = new Pet(SUMMON_PET);
+        pet->SetPetCounter(amount - count - 1);
+        pet->SetCreateSpellID(originalSpellID);
+        pet->SetDuration(m_duration);
+
+        if (!pet->Create(0, pos, cInfo, 0, m_caster))
         {
-            // Blood Strike, Heart Strike, Obliterate
-            // Blood-Caked Strike
-            if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0002000001400000) ||
-                m_spellInfo->SpellIconID == 1736)
-            {
-                uint32 count = 0;
-                Unit::SpellAuraHolderMap const& auras = unitTarget->GetSpellAuraHolderMap();
-                for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
-                {
-                    if(itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE &&
-                        itr->second->GetCasterGuid() == m_caster->GetObjectGuid())
-                        ++count;
-                }
+            sLog.outErrorDb("Spell::EffectSummonGroupPets: not possible create creature entry %u", pet_entry);
+            delete pet;
+            return;
+        }
+
+        pet->SetSummonPoint(pos);
+
+        if (!pet->Summon())
+        {
+            sLog.outError("Spell::EffectSummonGroupPets: %s not summoned by undefined reason.", pet->GetGuidStr().c_str());
+
+            delete pet;
+            return;
+        }
+        DEBUG_LOG("New %s summoned (default). Counter is %d ", pet->GetGuidStr().c_str(), pet->GetPetCounter());
+
+        if (m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->AI())
+            ((Creature*)m_caster)->AI()->JustSummoned((Creature*)pet);
+        if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
+            ((Creature*)m_originalCaster)->AI()->JustSummoned((Creature*)pet);
+        SendEffectLogExecute(eff_idx, pet->GetObjectGuid());
+    }
+
+}
+
+void Spell::EffectSummonPossessed(SpellEffectIndex eff_idx)
+{
+    if (!m_caster || m_caster->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    uint32 creature_entry = m_spellInfo->EffectMiscValue[eff_idx];
+    if (!creature_entry)
+        return;
+
+    int32 duration = GetSpellDuration(m_spellInfo);
+
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetClosePoint(1.0f);
+
+    TempSummonType summonType = (duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_OR_DEAD_DESPAWN;
+    Creature* spawnCreature = m_caster->SummonCreature(creature_entry, loc.x, loc.y, loc.z, loc.o, summonType, duration, true);
+
+    if (spawnCreature)
+    {
+        spawnCreature->SetLevel(m_caster->getLevel());
+
+        if (sScriptMgr.GetCreatureAI(spawnCreature))
+        {
+            // Prevent from ScriptedAI reinitialized
+            spawnCreature->LockAI(true);
+            m_caster->CastSpell(spawnCreature, 530, true);
+            spawnCreature->LockAI(false);
+        }
+        else
+            m_caster->CastSpell(spawnCreature, 530, true);
+
+        DEBUG_LOG("New possessed creature (%s) summoned. Owner is %s ", spawnCreature->GetObjectGuid().GetString().c_str(), m_caster->GetObjectGuid().GetString().c_str());
+
+        // Notify original caster if not done already
+        if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
+            ((Creature*)m_originalCaster)->AI()->JustSummoned((Creature*)spawnCreature);
+
+        SendEffectLogExecute(eff_idx, spawnCreature->GetObjectGuid());
+    }
+    else
+        sLog.outError("New possessed creature (entry %d) NOT summoned. Owner is %s ", creature_entry, m_caster->GetObjectGuid().GetString().c_str());
+}
+
+void Spell::EffectLearnSpell(SpellEffectIndex eff_idx)
+{
+    if (!unitTarget)
+        return;
+
+    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+    {
+        if (m_caster->GetTypeId() == TYPEID_PLAYER)
+            EffectLearnPetSpell(eff_idx);
+
+        return;
+    }
+
+    Player* player = (Player*)unitTarget;
+
+    uint32 spellToLearn = ((m_spellInfo->Id == SPELL_ID_GENERIC_LEARN) || (m_spellInfo->Id == SPELL_ID_GENERIC_LEARN_PET)) ? damage : m_spellInfo->EffectTriggerSpell[eff_idx];
+    player->learnSpell(spellToLearn, false);
+
+    if (WorldObject const* caster = GetCastingObject())
+        DEBUG_LOG("Spell: %s has learned spell %u from %s", player->GetGuidStr().c_str(), spellToLearn, caster->GetGuidStr().c_str());
+}
+
+void Spell::EffectDispel(SpellEffectIndex eff_idx)
+{
+    if (!unitTarget)
+        return;
+
+    // Fill possible dispel list
+    std::list <std::pair<SpellAuraHolderPtr ,uint32> > dispel_list;
+
+    // Create dispel mask by dispel type
+    uint32 dispel_type = m_spellInfo->EffectMiscValue[eff_idx];
+    uint32 dispelMask  = GetDispellMask( DispelType(dispel_type) );
+    Unit::SpellAuraHolderMap const& auras = unitTarget->GetSpellAuraHolderMap();
+    for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
+    {
+        if (!itr->second || itr->second->IsDeleted())
+            continue;
+
+        if ((1 << itr->second->GetSpellProto()->Dispel) & dispelMask)
+        {
+            if (itr->second->GetSpellProto()->Dispel == DISPEL_MAGIC)
+            {
+                bool positive = true;
+                if (!itr->second->IsPositive())
+                    positive = false;
+                else
+                    positive = !itr->second->GetSpellProto()->HasAttribute(SPELL_ATTR_EX_NEGATIVE);
+
+                // do not remove positive auras if friendly target
+                //               negative auras if non-friendly target
+                if (positive == unitTarget->IsFriendlyTo(m_caster))
+                    continue;
+            }
+            // Unholy Blight prevents dispel of diseases from target
+            else if (itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE)
+                if (unitTarget->HasAura(50536))
+                    continue;
+
+            if (itr->second->GetAuraCharges() > 1)
+                dispel_list.push_back(std::pair<SpellAuraHolderPtr ,uint32>(itr->second, itr->second->GetAuraCharges()));
+            else
+                dispel_list.push_back(std::pair<SpellAuraHolderPtr ,uint32>(itr->second, itr->second->GetStackAmount()));
+        }
+    }
+    // Ok if exist some buffs for dispel try dispel it
+    if (!dispel_list.empty())
+    {
+        std::list<std::pair<SpellAuraHolderPtr ,uint32> > success_list;// (spell_id,casterGuid)
+        std::list < uint32 > fail_list;                     // spell_id
+
+        // some spells have effect value = 0 and all from its by meaning expect 1
+        if (!damage)
+            damage = 1;
+
+        // Dispel N = damage buffs (or while exist buffs for dispel)
+        for (int32 count=0; count < damage && !dispel_list.empty(); ++count)
+        {
+            // Random select buff for dispel
+            std::list<std::pair<SpellAuraHolderPtr ,uint32> >::iterator dispel_itr = dispel_list.begin();
+            std::advance(dispel_itr,urand(0, dispel_list.size()-1));
+
+            SpellAuraHolderPtr holder = dispel_itr->first;
+
+            dispel_itr->second -= 1;
+
+            // remove entry from dispel_list if nothing left in stack
+            if (dispel_itr->second == 0)
+                dispel_list.erase(dispel_itr);
+
+            SpellEntry const* spellInfo = holder->GetSpellProto();
+            // Base dispel chance
+            // TODO: possible chance depend from spell level??
+            int32 miss_chance = 0;
+            // Apply dispel mod from aura caster
+            if (Unit *caster = holder->GetCaster())
+            {
+                if (Player* modOwner = caster->GetSpellModOwner() )
+                    modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_RESIST_DISPEL_CHANCE, miss_chance);
+            }
+            // Try dispel
+            if (roll_chance_i(miss_chance))
+                fail_list.push_back(spellInfo->Id);
+            else
+            {
+                bool foundDispelled = false;
+                for (std::list<std::pair<SpellAuraHolderPtr ,uint32> >::iterator success_iter = success_list.begin(); success_iter != success_list.end(); ++success_iter)
+                {
+                    if (success_iter->first->GetId() == holder->GetId() && success_iter->first->GetCasterGuid() == holder->GetCasterGuid())
+                    {
+                        success_iter->second += 1;
+                        foundDispelled = true;
+                        break;
+                    }
+                }
+                if (!foundDispelled)
+                    success_list.push_back(std::pair<SpellAuraHolderPtr ,uint32>(holder, 1));
+            }
+        }
+        // Send success log and really remove auras
+        if (!success_list.empty())
+        {
+            int32 count = success_list.size();
+            WorldPacket data(SMSG_SPELLDISPELLOG, unitTarget->GetPackGUID().size() + m_caster->GetPackGUID().size() + 4 + 1 + 4 + count * 5);
+            data << unitTarget->GetPackGUID();              // Victim GUID
+            data << m_caster->GetPackGUID();                // Caster GUID
+            data << uint32(m_spellInfo->Id);                // Dispel spell id
+            data << uint8(0);                               // not used
+            data << uint32(count);                          // count
+            for (std::list<std::pair<SpellAuraHolderPtr ,uint32> >::iterator j = success_list.begin(); j != success_list.end(); ++j)
+            {
+                SpellAuraHolderPtr dispelledHolder = j->first;
+                data << uint32(dispelledHolder->GetId());   // Spell Id
+                data << uint8(0);                           // 0 - dispelled !=0 cleansed
+
+                if (dispelledHolder->GetSpellProto()->HasAttribute(SPELL_ATTR_EX7_DISPEL_CHARGES) && dispelledHolder->GetAuraCharges() > 1)
+                {
+                    if (dispelledHolder->DropAuraCharge())
+                        unitTarget->RemoveSpellAuraHolder(dispelledHolder, AURA_REMOVE_BY_DISPEL);
+                }
+                else
+                    unitTarget->RemoveAuraHolderDueToSpellByDispel(dispelledHolder->GetId(), j->second, dispelledHolder->GetCasterGuid(), m_caster);
+            }
+            m_caster->SendMessageToSet(&data, true);
+
+            // On success dispel
+            // Devour Magic
+            if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->Category == SPELLCATEGORY_DEVOUR_MAGIC)
+            {
+                int32 heal_amount = m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_1);
+                m_caster->CastCustomSpell(m_caster, 19658, &heal_amount, NULL, NULL, true);
+
+                // Glyph of Felhunter
+                if (Unit *owner = m_caster->GetOwner())
+                    if (owner->HasAura(56249))
+                        m_caster->CastCustomSpell(owner, 19658, &heal_amount, NULL, NULL, true);
+            }
+        }
+        // Send fail log to client
+        if (!fail_list.empty())
+        {
+            // Failed to dispel
+            WorldPacket data(SMSG_DISPEL_FAILED, 8+8+4+4*fail_list.size());
+            data << m_caster->GetObjectGuid();              // Caster GUID
+            data << unitTarget->GetObjectGuid();            // Victim GUID
+            data << uint32(m_spellInfo->Id);                // Dispel spell id
+            for (std::list< uint32 >::iterator j = fail_list.begin(); j != fail_list.end(); ++j)
+                data << uint32(*j);                         // Spell Id
+            m_caster->SendMessageToSet(&data, true);
+        }
+    }
+}
+
+void Spell::EffectDualWield(SpellEffectIndex /*eff_idx*/)
+{
+    if (unitTarget && unitTarget->GetTypeId() == TYPEID_PLAYER)
+        ((Player*)unitTarget)->SetCanDualWield(true);
+}
+
+void Spell::EffectPull(SpellEffectIndex /*eff_idx*/)
+{
+    // TODO: create a proper pull towards distract spell center for distract
+    DEBUG_LOG("WORLD: Spell Effect DUMMY");
+}
+
+void Spell::EffectDistract(SpellEffectIndex /*eff_idx*/)
+{
+    // Check for possible target
+    if (!unitTarget || unitTarget->isInCombat())
+        return;
+
+    // target must be OK to do this
+    if (unitTarget->hasUnitState(UNIT_STAT_CAN_NOT_REACT))
+        return;
+
+    unitTarget->SetFacingTo(unitTarget->GetAngle(m_targets.getDestination().getX(), m_targets.getDestination().getY()));
+    unitTarget->clearUnitState(UNIT_STAT_MOVING);
+
+    if (unitTarget->GetTypeId() == TYPEID_UNIT)
+        unitTarget->GetMotionMaster()->MoveDistract(damage * IN_MILLISECONDS);
+}
+
+void Spell::EffectPickPocket(SpellEffectIndex /*eff_idx*/)
+{
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    // victim must be creature and attackable
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->IsFriendlyTo(unitTarget))
+        return;
+
+    // victim have to be alive and humanoid or undead
+    if (unitTarget->isAlive() && (unitTarget->GetCreatureTypeMask() & CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD) != 0)
+    {
+        int32 chance = 10 + int32(m_caster->getLevel()) - int32(unitTarget->getLevel());
+
+        if (chance > irand(0, 19))
+        {
+            // Stealing successful
+            //DEBUG_LOG("Sending loot from pickpocket");
+            ((Player*)m_caster)->SendLoot(unitTarget->GetObjectGuid(),LOOT_PICKPOCKETING);
+        }
+        else
+        {
+            // Reveal action + get attack
+            m_caster->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
+            unitTarget->AttackedBy(m_caster);
+        }
+    }
+}
+
+void Spell::EffectAddFarsight(SpellEffectIndex eff_idx)
+{
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    DynamicObject* dynObj = new DynamicObject;
+
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetPosition();
+
+    // set radius to 0: spell not expected to work as persistent aura
+    if(!dynObj->Create(m_caster->GetMap()->GenerateLocalLowGuid(HIGHGUID_DYNAMICOBJECT), m_caster,
+        m_spellInfo->Id, eff_idx, loc.x, loc.y, loc.z, m_duration, 0, DYNAMIC_OBJECT_FARSIGHT_FOCUS))
+    {
+        delete dynObj;
+        return;
+    }
+
+    m_caster->AddDynObject(dynObj);
+    m_caster->GetMap()->Add(dynObj);
+
+    ((Player*)m_caster)->SetViewPoint(dynObj);
+}
+
+void Spell::DoSummonWild(SpellEffectIndex eff_idx, uint32 forceFaction)
+{
+    uint32 creature_entry = m_spellInfo->EffectMiscValue[eff_idx];
+    if (!creature_entry)
+        return;
+
+    SummonPropertiesEntry const* propEntry = sSummonPropertiesStore.LookupEntry(m_spellInfo->EffectMiscValueB[eff_idx]);
+    if (!propEntry)
+        return;
+
+    TempSummonType summonType = TEMPSUMMON_DEAD_DESPAWN;
+    if (m_duration > 0)
+    {
+        if (propEntry->HasFlag(SUMMON_PROP_FLAG_NOT_DESPAWN_IN_COMBAT))
+            summonType = TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN;
+        else
+            summonType = TEMPSUMMON_TIMED_OR_DEAD_DESPAWN;
+    }
+
+    // select center of summon position
+    WorldLocation center = m_targets.getDestination();
+    center.SetOrientation(-m_caster->GetOrientation());
+
+    float radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[eff_idx]));
+
+    uint32 uDuration = m_duration > 0 ? uint32(m_duration) : 0;
+
+    int32 amount = m_spellInfo->EffectRealPointsPerLevel[eff_idx] ? m_spellInfo->EffectRealPointsPerLevel[eff_idx] : m_currentBasePoints[eff_idx];
+    if (amount <= 0)
+        amount = 1;
+
+    for(int32 count = 0; count < amount; ++count)
+    {
+        WorldLocation p = center;
+        // If dest location if present
+        if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION && !p.IsEmpty())
+        {
+            m_caster->GetRandomPoint(center.x, center.y, center.z, radius, p.x, p.y, p.z);
+            m_caster->GetMap()->GetHitPosition(center.x,center.y,center.z, p.x, p.y, p.z, m_caster->GetPhaseMask(),-0.1f);
+            m_caster->UpdateAllowedPositionZ(p.x,p.y,p.z);
+        }
+        // Summon if dest location not present near caster
+        else
+        {
+            if (radius > M_NULL_F && radius < m_caster->GetMap()->GetVisibilityDistance())
+            {
+                // not using bounding radius of caster here
+                p = m_caster->GetClosePoint(M_NULL_F, radius);
+                WorldLocation const& loc = m_caster->GetPosition();
+                m_caster->GetMap()->GetHitPosition(loc.x, loc.y, loc.z, p.x, p.y, p.z, m_caster->GetPhaseMask(),-0.1f);
+                m_caster->UpdateAllowedPositionZ(p.x, p.y, p.z);
+            }
+            else
+            {
+                // EffectRadiusIndex 0 or 36
+                p = m_caster->GetPosition();
+            }
+        }
+
+        if (Creature* summon = m_caster->SummonCreature(creature_entry, p.x, p.y, p.z, p.o, summonType, m_duration))
+        {
+            summon->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
+
+            // UNIT_FIELD_CREATEDBY are not set for these kind of spells.
+            // Does exceptions exist? If so, what are they?
+            summon->SetCreatorGuid(m_caster->GetObjectGuid());
+
+            if (forceFaction)
+                summon->setFaction(forceFaction);
+
+            // Notify original caster if not done already
+            if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
+                ((Creature*)m_originalCaster)->AI()->JustSummoned(summon);
+
+            SendEffectLogExecute(eff_idx, summon->GetObjectGuid());
+        }
+    }
+}
+
+void Spell::DoSummonGuardian(SpellEffectIndex eff_idx, uint32 forceFaction)
+{
+    uint32 pet_entry = m_spellInfo->EffectMiscValue[eff_idx];
+    if (!pet_entry)
+        return;
+
+    SummonPropertiesEntry const* propEntry = sSummonPropertiesStore.LookupEntry(m_spellInfo->EffectMiscValueB[eff_idx]);
+    if (!propEntry)
+        return;
+
+    CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(pet_entry);
+    if (!cInfo)
+    {
+        sLog.outErrorDb("Spell::DoSummonGuardian: creature entry %u not found for spell %u.", pet_entry, m_spellInfo->Id);
+        return;
+    }
+
+    PetType petType = propEntry->Title == UNITNAME_SUMMON_TITLE_COMPANION ? PROTECTOR_PET : GUARDIAN_PET;
+
+    // second cast unsummon guardian(s) (guardians without like functionality have cooldown > spawn time)
+    if (!m_IsTriggeredSpell && m_caster->GetTypeId() == TYPEID_PLAYER && m_CastItem)
+    {
+        bool found = false;
+        // including protector
+        while (Pet* old_summon = m_caster->FindGuardianWithEntry(pet_entry))
+        {
+            old_summon->Unsummon(PET_SAVE_AS_DELETED, m_caster);
+            found = true;
+        }
+
+        if (found)
+            return;
+    }
+
+    // protectors allowed only in single amount
+    if (petType == PROTECTOR_PET && m_CastItem)
+        if (Pet* old_protector = m_caster->GetProtectorPet())
+            old_protector->Unsummon(PET_SAVE_AS_DELETED, m_caster);
+
+    int32 amount = m_spellInfo->EffectRealPointsPerLevel[eff_idx] ? m_spellInfo->EffectRealPointsPerLevel[eff_idx] : m_currentBasePoints[eff_idx];
+    if (amount < 0)
+        amount = 1;
+
+    //uint32 level  = m_caster->getLevel();
+    uint32 level  = m_spellInfo->EffectRealPointsPerLevel[eff_idx] ? (damage < int32(m_caster->getLevel()) ? damage : m_caster->getLevel()) : m_caster->getLevel();
+
+    // level of pet summoned using engineering item based at engineering skill level
+    if (m_caster->GetTypeId() == TYPEID_PLAYER && m_CastItem)
+    {
+        ItemPrototype const *proto = m_CastItem->GetProto();
+        if (proto && proto->RequiredSkill == SKILL_ENGINEERING)
+        {
+            uint16 skill202 = ((Player*)m_caster)->GetSkillValue(SKILL_ENGINEERING);
+            if (skill202)
+            {
+                level = skill202 / 5;
+            }
+        }
+    }
+
+    // select center of summon position
+    WorldLocation center = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                            m_targets.getDestination() :
+                            m_caster->GetPosition();
+
+    if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
+        center.SetOrientation(-m_caster->GetOrientation());
+
+    if (!MapManager::ExistMapAndVMap(m_caster->GetMapId(),center.x,center.y))
+    {
+        sLog.outError("Spell::DoSummonGuardian: impossible place for create creature entry %u, spell %u.", pet_entry, m_spellInfo->Id);
+        return;
+    }
+
+    float radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[eff_idx]));
+
+    uint32 originalSpellID = (m_IsTriggeredSpell && m_triggeredBySpellInfo) ? m_triggeredBySpellInfo->Id : m_spellInfo->Id;
+
+    for (int32 count = 0; count < amount; ++count)
+    {
+        Pet* spawnCreature = new Pet(petType);
+
+        spawnCreature->SetCreateSpellID(originalSpellID);
+        spawnCreature->SetDuration(m_duration);
+        spawnCreature->SetPetCounter(m_caster->GetGuardians().size());
+
+        // If dest location present. FIXME - need correct summon pos from pet number
+        CreatureCreatePos pos = CreatureCreatePos(m_caster->GetMap(), center);
+
+        if (!spawnCreature->Create(0, pos, cInfo, 0, m_caster))
+        {
+            sLog.outError("Spell::DoSummonGuardian: can't create creature entry %u for spell %u.", pet_entry, m_spellInfo->Id);
+            delete spawnCreature;
+            return;
+        }
+        spawnCreature->setFaction(forceFaction ? forceFaction : m_caster->getFaction());
+        spawnCreature->SetLevel(level);
+
+        if (!spawnCreature->Summon())
+        {
+            sLog.outError("Guardian pet (guidlow %d, entry %d) not summoned by undefined reason. ",
+                spawnCreature->GetGUIDLow(), spawnCreature->GetEntry());
+            delete spawnCreature;
+            return;
+        }
+
+        spawnCreature->SetSummonPoint(pos);
+
+        // Notify Summoner
+        if (m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->AI())
+            ((Creature*)m_caster)->AI()->JustSummoned(spawnCreature);
+        if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
+            ((Creature*)m_originalCaster)->AI()->JustSummoned(spawnCreature);
+
+        DEBUG_LOG("Guardian pet %s summoned (default). Counter is %d ", spawnCreature->GetObjectGuid().GetString().c_str(), spawnCreature->GetPetCounter());
+
+        SendEffectLogExecute(eff_idx, spawnCreature->GetObjectGuid());
+    }
+}
+
+void Spell::DoSummonVehicle(SpellEffectIndex eff_idx, uint32 forceFaction)
+{
+    if (!m_caster)
+        return;
+
+    if (m_caster->hasUnitState(UNIT_STAT_ON_VEHICLE))
+    {
+        if (m_spellInfo->HasAttribute(SPELL_ATTR_HIDDEN_CLIENTSIDE))
+            m_caster->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+        else
+            return;
+    }
+    uint32 vehicle_entry = m_spellInfo->EffectMiscValue[eff_idx];
+
+    if (!vehicle_entry)
+        return;
+
+    SpellEntry const* m_mountspell = sSpellStore.LookupEntry(
+        m_spellInfo->EffectBasePoints[eff_idx] != 0 ?
+        m_spellInfo->CalculateSimpleValue(eff_idx) :
+        SPELL_RIDE_VEHICLE_HARDCODED);
+
+    if (!m_mountspell)
+        m_mountspell = sSpellStore.LookupEntry(46598);
+    // Used BasePoint mount spell, if not present - hardcoded (by Blzz).
+
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetClosePoint(m_caster->GetObjectBoundingRadius());
+
+    m_caster->UpdateAllowedPositionZ(loc.x,loc.y,loc.z);
+
+    TempSummonType summonType = (GetSpellDuration(m_spellInfo) == 0) ? TEMPSUMMON_DEAD_OR_LOST_OWNER_DESPAWN : TEMPSUMMON_TIMED_OR_DEAD_OR_LOST_OWNER_DESPAWN;
+
+    Creature* vehicle = m_caster->SummonCreature(vehicle_entry, loc.x, loc.y, loc.z, loc.o, summonType, GetSpellDuration(m_spellInfo), true);
+
+    if (vehicle && !vehicle->IsVehicle())
+    {
+        sLog.outError("DoSommonVehicle: Creature (guidlow %d, entry %d) summoned, but this is not vehicle. Correct VehicleId in creature_template.", vehicle->GetGUIDLow(), vehicle->GetEntry());
+        vehicle->ForcedDespawn();
+        return;
+    }
+
+    if (vehicle)
+    {
+        vehicle->setFaction(forceFaction ? forceFaction : m_caster->getFaction());
+        vehicle->SetUInt32Value(UNIT_CREATED_BY_SPELL,m_spellInfo->Id);
+        m_caster->CastSpell(vehicle, m_mountspell, true);
+        DEBUG_LOG("Caster (guidlow %d) summon vehicle (guidlow %d, entry %d) and mounted with spell %d ", m_caster->GetGUIDLow(), vehicle->GetGUIDLow(), vehicle->GetEntry(), m_mountspell->Id);
+
+        // Notify original caster if not done already
+        if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
+            ((Creature*)m_originalCaster)->AI()->JustSummoned(vehicle);
+
+        SendEffectLogExecute(eff_idx, vehicle->GetObjectGuid());
+    }
+    else
+        sLog.outError("Vehicle (entry %d) NOT summoned by undefined reason. ", vehicle_entry);
+}
+
+void Spell::EffectTeleUnitsFaceCaster(SpellEffectIndex eff_idx)
+{
+    if (!unitTarget || unitTarget->IsTaxiFlying())
+        return;
+
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetClosePoint(unitTarget->GetObjectBoundingRadius(), GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[eff_idx])));
+
+    loc.SetOrientation(-m_caster->GetOrientation());
+
+    unitTarget->NearTeleportTo(loc, unitTarget == m_caster);
+}
+
+void Spell::EffectLearnSkill(SpellEffectIndex eff_idx)
+{
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    if (damage < 0)
+        return;
+
+    uint32 skillid =  m_spellInfo->EffectMiscValue[eff_idx];
+    uint16 skillval = ((Player*)unitTarget)->GetPureSkillValue(skillid);
+    ((Player*)unitTarget)->SetSkill(skillid, skillval ? skillval : 1, damage * 75, damage);
+
+    if (WorldObject const* caster = GetCastingObject())
+        DEBUG_LOG("Spell: %s has learned skill %u value %u from %s", unitTarget->GetGuidStr().c_str(), skillid, skillval, caster->GetGuidStr().c_str());
+}
+
+void Spell::EffectAddHonor(SpellEffectIndex /*eff_idx*/)
+{
+    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    // not scale value for item based reward (/10 value expected)
+    if (m_CastItem)
+    {
+        ((Player*)unitTarget)->RewardHonor(NULL, 1, float(damage / 10));
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "SpellEffect::AddHonor (spell_id %u) rewards %d honor points (item %u) for player: %u", m_spellInfo->Id, damage/10, m_CastItem->GetEntry(),((Player*)unitTarget)->GetGUIDLow());
+        return;
+    }
+
+    // do not allow to add too many honor for player (50 * 21) = 1040 at level 70, or (50 * 31) = 1550 at level 80
+    if (damage <= 50)
+    {
+        float honor_reward = MaNGOS::Honor::hk_honor_at_level(unitTarget->getLevel(), damage);
+        ((Player*)unitTarget)->RewardHonor(NULL, 1, honor_reward);
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "SpellEffect::AddHonor (spell_id %u) rewards %f honor points (scale) to player: %u", m_spellInfo->Id, honor_reward, ((Player*)unitTarget)->GetGUIDLow());
+    }
+    else
+    {
+        //maybe we have correct honor_gain in damage already
+        ((Player*)unitTarget)->RewardHonor(NULL, 1, (float)damage);
+        sLog.outError("SpellEffect::AddHonor (spell_id %u) rewards %u honor points (non scale) for player: %u", m_spellInfo->Id, damage, ((Player*)unitTarget)->GetGUIDLow());
+    }
+}
+
+void Spell::EffectTradeSkill(SpellEffectIndex /*eff_idx*/)
+{
+    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+        return;
+    // uint32 skillid =  m_spellInfo->EffectMiscValue[i];
+    // uint16 skillmax = ((Player*)unitTarget)->(skillid);
+    // ((Player*)unitTarget)->SetSkill(skillid,skillval?skillval:1,skillmax+75);
+}
+
+void Spell::EffectEnchantItemPerm(SpellEffectIndex eff_idx)
+{
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+        return;
+    if (!itemTarget)
+        return;
+
+    uint32 enchant_id = m_spellInfo->EffectMiscValue[eff_idx];
+    if (!enchant_id)
+        return;
+
+    SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+    if (!pEnchant)
+        return;
+
+    // item can be in trade slot and have owner diff. from caster
+    Player* item_owner = itemTarget->GetOwner();
+    if (!item_owner)
+        return;
+
+    Player* p_caster = (Player*)m_caster;
+
+    // Enchanting a vellum requires special handling, as it creates a new item
+    // instead of modifying an existing one.
+    ItemPrototype const* targetProto = itemTarget->GetProto();
+    if (targetProto->IsVellum() && m_spellInfo->EffectItemType[eff_idx])
+    {
+        unitTarget = m_caster;
+        DoCreateItem(eff_idx,m_spellInfo->EffectItemType[eff_idx]);
+        // Vellum target case: Target becomes additional reagent, new scroll item created instead in Spell::EffectEnchantItemPerm()
+        // cannot already delete in TakeReagents() unfortunately
+        p_caster->DestroyItemCount(targetProto->ItemId, 1, true);
+        return;
+    }
+
+    // Using enchant stored on scroll does not increase enchanting skill! (Already granted on scroll creation)
+    if (!(m_CastItem && (m_CastItem->GetProto()->Flags & ITEM_FLAG_ENCHANT_SCROLL)))
+        p_caster->UpdateCraftSkill(m_spellInfo->Id);
+
+    if (item_owner!=p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE) )
+    {
+        sLog.outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)",
+            p_caster->GetName(),p_caster->GetSession()->GetAccountId(),
+            itemTarget->GetProto()->Name1,itemTarget->GetEntry(),
+            item_owner->GetName(),item_owner->GetSession()->GetAccountId());
+    }
+
+    // remove old enchanting before applying new if equipped
+    item_owner->ApplyEnchantment(itemTarget,PERM_ENCHANTMENT_SLOT,false);
+
+    itemTarget->SetEnchantment(PERM_ENCHANTMENT_SLOT, enchant_id, 0, 0);
+
+    // add new enchanting if equipped
+    item_owner->ApplyEnchantment(itemTarget,PERM_ENCHANTMENT_SLOT,true);
+
+    itemTarget->SetNotSoulboundTradeable(item_owner);
+}
+
+void Spell::EffectEnchantItemPrismatic(SpellEffectIndex eff_idx)
+{
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+        return;
+    if (!itemTarget)
+        return;
+
+    Player* p_caster = (Player*)m_caster;
+
+    uint32 enchant_id = m_spellInfo->EffectMiscValue[eff_idx];
+    if (!enchant_id)
+        return;
+
+    SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+    if (!pEnchant)
+        return;
+
+    // support only enchantings with add socket in this slot
+    {
+        bool add_socket = false;
+        for(int i = 0; i < 3; ++i)
+        {
+            if (pEnchant->type[i]==ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET)
+            {
+                add_socket = true;
+                break;
+            }
+        }
+        if (!add_socket)
+        {
+            sLog.outError("Spell::EffectEnchantItemPrismatic: attempt apply enchant spell %u with SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC (%u) but without ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET (%u), not suppoted yet.",
+                m_spellInfo->Id,SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC,ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET);
+            return;
+        }
+    }
+
+    // item can be in trade slot and have owner diff. from caster
+    Player* item_owner = itemTarget->GetOwner();
+    if (!item_owner)
+        return;
+
+    if (item_owner!=p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE) )
+    {
+        sLog.outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)",
+            p_caster->GetName(),p_caster->GetSession()->GetAccountId(),
+            itemTarget->GetProto()->Name1,itemTarget->GetEntry(),
+            item_owner->GetName(),item_owner->GetSession()->GetAccountId());
+    }
+
+    // remove old enchanting before applying new if equipped
+    item_owner->ApplyEnchantment(itemTarget,PRISMATIC_ENCHANTMENT_SLOT,false);
+
+    itemTarget->SetEnchantment(PRISMATIC_ENCHANTMENT_SLOT, enchant_id, 0, 0);
+
+    // add new enchanting if equipped
+    item_owner->ApplyEnchantment(itemTarget,PRISMATIC_ENCHANTMENT_SLOT,true);
+
+    itemTarget->SetNotSoulboundTradeable(item_owner);
+}
+
+void Spell::EffectEnchantItemTmp(SpellEffectIndex eff_idx)
+{
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    Player* p_caster = (Player*)m_caster;
+
+    // Rockbiter Weapon
+    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_ROCKBITER_WEAPON>())
+    {
+        uint32 spell_id = 0;
+
+        // enchanting spell selected by calculated damage-per-sec stored in Effect[1] base value
+        // Note: damage calculated (correctly) with rounding int32(float(v)) but
+        // RW enchantments applied damage int32(float(v)+0.5), this create  0..1 difference sometime
+        switch(damage)
+        {
+            // Rank 1
+            case  2: spell_id = 36744; break;               //  0% [ 7% ==  2, 14% == 2, 20% == 2]
+            // Rank 2
+            case  4: spell_id = 36753; break;               //  0% [ 7% ==  4, 14% == 4]
+            case  5: spell_id = 36751; break;               // 20%
+            // Rank 3
+            case  6: spell_id = 36754; break;               //  0% [ 7% ==  6, 14% == 6]
+            case  7: spell_id = 36755; break;               // 20%
+            // Rank 4
+            case  9: spell_id = 36761; break;               //  0% [ 7% ==  6]
+            case 10: spell_id = 36758; break;               // 14%
+            case 11: spell_id = 36760; break;               // 20%
+            default:
+                sLog.outError("Spell::EffectEnchantItemTmp: Damage %u not handled in S'RW",damage);
+                return;
+        }
+
+        SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
+        if (!spellInfo)
+        {
+            sLog.outError("Spell::EffectEnchantItemTmp: unknown spell id %i", spell_id);
+            return;
+        }
+
+        Spell *spell = new Spell(m_caster, spellInfo, true);
+        SpellCastTargets targets;
+        targets.setItemTarget( itemTarget );
+        spell->prepare(&targets);
+        return;
+    }
+
+    if (!itemTarget)
+        return;
+
+    uint32 enchant_id = m_spellInfo->EffectMiscValue[eff_idx];
+
+    if (!enchant_id)
+    {
+        sLog.outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have 0 as enchanting id",m_spellInfo->Id,eff_idx);
+        return;
+    }
+
+    SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+    if (!pEnchant)
+    {
+        sLog.outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have nonexistent enchanting id %u ",m_spellInfo->Id,eff_idx,enchant_id);
+        return;
+    }
+
+    // select enchantment duration
+    uint32 duration;
+
+    // rogue family enchantments exception by duration
+    if (m_spellInfo->Id == 38615)
+        duration = 1800;                                    // 30 mins
+    // other rogue family enchantments always 1 hour (some have spell damage=0, but some have wrong data in EffBasePoints)
+    else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE)
+        duration = 3600;                                    // 1 hour
+    // shaman family enchantments
+    else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN)
+        duration = 1800;                                    // 30 mins
+    // other cases with this SpellVisual already selected
+    else if (m_spellInfo->GetSpellVisual() == 215)
+        duration = 1800;                                    // 30 mins
+    // some fishing pole bonuses
+    else if (m_spellInfo->GetSpellVisual() == 563 && m_spellInfo->Id != 64401)
+        duration = 600;                                     // 10 mins
+    // shaman rockbiter enchantments
+    else if (m_spellInfo->GetSpellVisual() == 0)
+        duration = 1800;                                    // 30 mins
+    else if (m_spellInfo->Id == 29702)
+        duration = 300;                                     // 5 mins
+    else if (m_spellInfo->Id == 37360)
+        duration = 300;                                     // 5 mins
+    // default case
+    else
+        duration = 3600;                                    // 1 hour
+
+    // item can be in trade slot and have owner diff. from caster
+    Player* item_owner = itemTarget->GetOwner();
+    if (!item_owner)
+        return;
+
+    if (item_owner!=p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_BOOL_GM_LOG_TRADE) )
+    {
+        sLog.outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(temp): %s (Entry: %d) for player: %s (Account: %u)",
+            p_caster->GetName(), p_caster->GetSession()->GetAccountId(),
+            itemTarget->GetProto()->Name1, itemTarget->GetEntry(),
+            item_owner->GetName(), item_owner->GetSession()->GetAccountId());
+    }
+
+    // remove old enchanting before applying new if equipped
+    item_owner->ApplyEnchantment(itemTarget,TEMP_ENCHANTMENT_SLOT, false);
+
+    itemTarget->SetEnchantment(TEMP_ENCHANTMENT_SLOT, enchant_id, duration * 1000, 0);
+
+    // add new enchanting if equipped
+    item_owner->ApplyEnchantment(itemTarget, TEMP_ENCHANTMENT_SLOT, true);
+}
+
+void Spell::EffectTameCreature(SpellEffectIndex /*eff_idx*/)
+{
+    // Caster must be player, checked in Spell::CheckCast
+    // Spell can be triggered, we need to check original caster prior to caster
+    Player* plr = (Player*)GetAffectiveCaster();
+
+    Creature* creatureTarget = (Creature*)unitTarget;
+
+    // cast finish successfully
+    //SendChannelUpdate(0);
+    finish();
+
+    Pet* pet = new Pet(HUNTER_PET);
+
+    pet->SetCreateSpellID(m_spellInfo->Id);
+
+    if (!pet->CreateBaseAtCreature(creatureTarget, (Unit*)plr))
+    {
+        delete pet;
+        return;
+    }
+
+    // level of hunter pet can't be less owner level at 5 levels
+    uint32 level = creatureTarget->getLevel() + 5 < plr->getLevel() ? (plr->getLevel() - 5) : creatureTarget->getLevel();
+
+    // prepare visual effect for levelup
+    pet->SetLevel(level - 1);
+
+    // add to world
+    if (!pet->Summon())
+    {
+        sLog.outError("Pet (guidlow %d, entry %d) not summoned from tame effect by undefined reason. ",
+            pet->GetGUIDLow(), pet->GetEntry());
+        delete pet;
+        return;
+    }
+
+    // "kill" original creature
+    creatureTarget->ForcedDespawn();
+
+    // visual effect for levelup
+    pet->SetLevel(level);
+}
+
+void Spell::EffectSummonPet(SpellEffectIndex eff_idx)
+{
+    uint32 petentry = m_spellInfo->EffectMiscValue[eff_idx];
+
+    Pet* OldSummon = m_caster->GetPet();
+
+    // if pet requested type already exist
+    if (OldSummon)
+    {
+        // Preview summon is loading or deleting
+        if (!OldSummon->IsInWorld())
+            return;
+
+        if ((m_caster->GetTypeId() == TYPEID_PLAYER && petentry == 0) || OldSummon->GetEntry() == petentry)
+        {
+            // pet in corpse state can't be summoned
+            if (OldSummon->isDead())
+                return;
+
+            ((Player*)m_caster)->UnsummonPetTemporaryIfAny(false);
+
+            ((Player*)m_caster)->ResummonPetTemporaryUnSummonedIfAny();
+
+            return;
+        }
+
+        if (m_caster->GetTypeId() == TYPEID_PLAYER)
+            OldSummon->Unsummon(OldSummon->getPetType() == HUNTER_PET ? PET_SAVE_AS_DELETED : PET_SAVE_NOT_IN_SLOT, m_caster);
+        else
+            return;
+    }
+
+    CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(petentry);
+
+    // == 0 in case call current pet, check only real summon case
+    if (petentry && !cInfo)
+    {
+        sLog.outErrorDb("EffectSummonPet: creature entry %u not found for spell %u.", petentry, m_spellInfo->Id);
+        return;
+    }
+
+    Pet* NewSummon = new Pet;
+
+    uint32 originalSpellID = (m_IsTriggeredSpell && m_triggeredBySpellInfo) ? m_triggeredBySpellInfo->Id : m_spellInfo->Id;
+    NewSummon->SetCreateSpellID(originalSpellID);
+    NewSummon->SetPetCounter(0);
+
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetPosition();
+
+    if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
+        loc.SetOrientation(-m_caster->GetOrientation());
+
+    CreatureCreatePos pos = CreatureCreatePos(m_caster->GetMap(), loc);
+
+    // petentry==0 for hunter "call pet" (current pet summoned if any)
+    if (m_caster->GetTypeId() == TYPEID_PLAYER && NewSummon->LoadPetFromDB((Player*)m_caster, petentry, 0, false, &pos))
+        return;
+
+    // not error in case fail hunter call pet
+    if (!petentry)
+    {
+        delete NewSummon;
+        return;
+    }
+
+    NewSummon->setPetType(SUMMON_PET);
+
+    if (!NewSummon->Create(0, pos, cInfo, 0, m_caster))
+    {
+        delete NewSummon;
+        return;
+    }
+
+    if (!NewSummon->Summon())
+    {
+        sLog.outError("Pet (guidlow %d, entry %d) not summoned by undefined reason. ",
+            NewSummon->GetGUIDLow(), NewSummon->GetEntry());
+        delete NewSummon;
+        return;
+    }
+
+    if (NewSummon->getPetType() == SUMMON_PET)
+    {
+        // Remove Demonic Sacrifice auras (new pet)
+        Unit::AuraList const& auraClassScripts = m_caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
+        for(Unit::AuraList::const_iterator itr = auraClassScripts.begin(); itr != auraClassScripts.end();)
+        {
+            if((*itr)->GetModifier()->m_miscvalue == 2228)
+            {
+                m_caster->RemoveAurasDueToSpell((*itr)->GetId());
+                itr = auraClassScripts.begin();
+            }
+            else
+                ++itr;
+        }
+    }
+
+    DEBUG_LOG("New pet %s summoned", NewSummon->GetObjectGuid().GetString().c_str());
+    SendEffectLogExecute(eff_idx, NewSummon->GetObjectGuid());
+}
+
+void Spell::EffectLearnPetSpell(SpellEffectIndex eff_idx)
+{
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    Player *_player = (Player*)m_caster;
+
+    Pet *pet = _player->GetPet();
+    if (!pet)
+        return;
+
+    if (!pet->isAlive())
+        return;
+
+    SpellEntry const *learn_spellproto = sSpellStore.LookupEntry(m_spellInfo->EffectTriggerSpell[eff_idx]);
+    if (!learn_spellproto)
+        return;
+
+    pet->learnSpell(learn_spellproto->Id);
+
+    pet->SavePetToDB(PET_SAVE_AS_CURRENT);
+    _player->PetSpellInitialize();
+
+    if (WorldObject const* caster = GetCastingObject())
+        DEBUG_LOG("Spell: %s has learned spell %u from %s", pet->GetGuidStr().c_str(), learn_spellproto->Id, caster->GetGuidStr().c_str());
+}
+
+void Spell::EffectTaunt(SpellEffectIndex /*eff_idx*/)
+{
+    if (!unitTarget || unitTarget->GetTypeId() == TYPEID_PLAYER)
+        return;
+
+    if (!unitTarget->TauntApply(m_caster, true))
+        SendCastResult(SPELL_FAILED_DONT_REPORT);
+}
+
+void Spell::EffectWeaponDmg(SpellEffectIndex eff_idx)
+{
+    if (!unitTarget)
+        return;
+
+    if (!unitTarget->isAlive())
+        return;
+
+    // multiple weapon dmg effect workaround
+    // execute only the last weapon damage
+    // and handle all effects at once
+    for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
+    {
+        switch(m_spellInfo->Effect[j])
+        {
+            case SPELL_EFFECT_WEAPON_DAMAGE:
+            case SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL:
+            case SPELL_EFFECT_NORMALIZED_WEAPON_DMG:
+            case SPELL_EFFECT_WEAPON_PERCENT_DAMAGE:
+                if (j < int(eff_idx))                             // we must calculate only at last weapon effect
+                    return;
+            break;
+        }
+    }
+
+    // some spell specific modifiers
+    bool spellBonusNeedWeaponDamagePercentMod = false;      // if set applied weapon damage percent mode to spell bonus
+
+    float weaponDamagePercentMod = 1.0f;                    // applied to weapon damage and to fixed effect damage bonus
+    float totalDamagePercentMod  = 1.0f;                    // applied to final bonus+weapon damage
+    bool normalized = false;
+
+    int32 spell_bonus = 0;                                  // bonus specific for spell
+
+    switch(m_spellInfo->SpellFamilyName)
+    {
+        case SPELLFAMILY_GENERIC:
+        {
+            switch(m_spellInfo->Id)
+            {
+                // for spells with divided damage to targets
+                case 66765: case 66809: case 67331:         // Meteor Fists
+                case 67333:                                 // Meteor Fists
+                case 69055:                                 // Bone Slice (Icecrown Citadel, Lord Marrowgar, normal)
+                case 70814:                                 // Bone Slice (Icecrown Citadel, Lord Marrowgar, heroic)
+                case 71021:                                 // Saber Lash
+                {
+                    uint32 count = 0;
+                    for(TargetList::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
+                        if (ihit->effectMask & (1<<eff_idx))
+                            ++count;
+
+                    totalDamagePercentMod /= float(count);  // divide to all targets
+                    break;
+                }
+            }
+            break;
+        }
+        case SPELLFAMILY_DRUID:
+        {
+            // Rend and Tear ( on Maul / Shred )
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_DRUID_MAUL, CF_DRUID_SHRED>())
+            {
+                if (unitTarget && unitTarget->HasAuraState(AURA_STATE_BLEEDING))
+                {
+                    Unit::AuraList const& aura = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
+                    for(Unit::AuraList::const_iterator itr = aura.begin(); itr != aura.end(); ++itr)
+                    {
+                        if ((*itr)->GetSpellProto()->GetSpellIconID() == 2859 && (*itr)->GetEffIndex() == 0)
+                        {
+                            totalDamagePercentMod += (totalDamagePercentMod * (*itr)->GetModifier()->m_amount) / 100;
+                            break;
+                        }
+                    }
+                }
+            }
+            break;
+        }
+        case SPELLFAMILY_WARRIOR:
+        {
+            // Devastate
+            if (m_spellInfo->GetSpellVisual() == 12295 && m_spellInfo->GetSpellIconID() == 1508)
+            {
+                // Sunder Armor
+                Aura* sunder = unitTarget->GetAura<SPELL_AURA_MOD_RESISTANCE_PCT, SPELLFAMILY_WARRIOR, CF_WARRIOR_SUNDER_ARMOR>(m_caster->GetObjectGuid());
+
+                uint32 stack = 0;
+                uint32 stackMax = 0;
+
+                // Devastate bonus and sunder armor refresh
+                if (sunder)
+                {
+                    sunder->GetHolder()->RefreshHolder();
+                    stack = sunder->GetStackAmount();
+                    stackMax = sunder->GetSpellProto()->StackAmount;
+                    spell_bonus += stack * CalculateDamage(EFFECT_INDEX_2, unitTarget);
+                }
+                else
+                {
+                    SpellEntry const* spellInfo = sSpellStore.LookupEntry(58567);
+                    if (spellInfo)
+                       stackMax = spellInfo->StackAmount;
+                }
+
+                // Devastate causing Sunder Armor Effect
+                // and no need to cast over max stack amount
+                if (!stack || stack < stackMax)
+                {
+                    m_caster->CastSpell(unitTarget, 58567, true);
+
+                    // Glyph of Devastate
+                    if (++stack < stackMax && m_caster->GetDummyAura(58388))
+                        m_caster->CastSpell(unitTarget, 58567, true);
+                }
+            }
+            break;
+        }
+        case SPELLFAMILY_ROGUE:
+        {
+            // Mutilate (for each hand)
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_ROGUE_MUTILATE_MH, CF_ROGUE_MUTILATE_OH>())
+            {
+                bool found = false;
+                // fast check
+                if (unitTarget->HasAuraState(AURA_STATE_DEADLY_POISON))
+                    found = true;
+                // full aura scan
+                else
+                {
+                    Unit::SpellAuraHolderMap const& auras = unitTarget->GetSpellAuraHolderMap();
+                    for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
+                    {
+                        if (itr->second->GetSpellProto()->Dispel == DISPEL_POISON)
+                        {
+                            found = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (found)
+                    totalDamagePercentMod *= 1.2f;          // 120% if poisoned
+            }
+            // Fan of Knives
+            else if (m_caster->GetTypeId()==TYPEID_PLAYER && m_spellInfo->GetSpellFamilyFlags().test<CF_ROGUE_FAN_OF_KNIVES>())
+            {
+                Item* weapon = ((Player*)m_caster)->GetWeaponForAttack(m_attackType,true,true);
+                if (weapon && weapon->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER)
+                    totalDamagePercentMod *= 1.5f;          // 150% to daggers
+            }
+            // Ghostly Strike
+            else if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->Id == 14278)
+            {
+                Item* weapon = ((Player*)m_caster)->GetWeaponForAttack(m_attackType,true,true);
+                if (weapon && weapon->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER)
+                    totalDamagePercentMod *= 1.44f;         // 144% to daggers
+            }
+            // Hemorrhage
+            else if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->GetSpellFamilyFlags().test<CF_ROGUE_HEMORRHAGE>())
+            {
+                Item* weapon = ((Player*)m_caster)->GetWeaponForAttack(m_attackType,true,true);
+                if (weapon && weapon->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER)
+                    totalDamagePercentMod *= 1.45f;         // 145% to daggers
+            }
+            break;
+        }
+        case SPELLFAMILY_PALADIN:
+        {
+            // Judgement of Command - receive benefit from Spell Damage and Attack Power
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_JUDGEMENT_OF_COMMAND>())
+            {
+                float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK);
+                int32 holy = m_caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(m_spellInfo));
+                if (holy < 0)
+                    holy = 0;
+                spell_bonus += int32(ap * 0.08f) + int32(holy * 13 / 100);
+            }
+            break;
+        }
+        case SPELLFAMILY_HUNTER:
+        {
+            // Kill Shot
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_HUNTER_KILL_SHOT>())
+            {
+                // 0.4*RAP added to damage (that is 0.2 if we apply PercentMod (200%) to spell_bonus, too)
+                spellBonusNeedWeaponDamagePercentMod = true;
+                spell_bonus += int32( 0.2f * m_caster->GetTotalAttackPowerValue(RANGED_ATTACK) );
+            }
+            break;
+        }
+        case SPELLFAMILY_SHAMAN:
+        {
+            // Skyshatter Harness item set bonus
+            // Stormstrike
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_STORMSTRIKE1>())
+            {
+                Unit::AuraList const& m_OverrideClassScript = m_caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
+                for(Unit::AuraList::const_iterator citr = m_OverrideClassScript.begin(); citr != m_OverrideClassScript.end(); ++citr)
+                {
+                    // Stormstrike AP Buff
+                    if ( (*citr)->GetModifier()->m_miscvalue == 5634 )
+                    {
+                        m_caster->CastSpell(m_caster, 38430, true, NULL, (*citr)());
+                        break;
+                    }
+                }
+            }
+            break;
+        }
+        case SPELLFAMILY_DEATHKNIGHT:
+        {
+            // Blood Strike, Heart Strike, Obliterate
+            // Blood-Caked Strike
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_BLOOD_STRIKE, CF_DEATHKNIGHT_HEART_STRIKE, CF_DEATHKNIGHT_OBLITERATE>() ||
+                m_spellInfo->GetSpellIconID() == 1736)
+            {
+                uint32 count = 0;
+                Unit::SpellAuraHolderMap const& auras = unitTarget->GetSpellAuraHolderMap();
+                for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
+                {
+                    if (itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE &&
+                        itr->second->GetCasterGuid() == m_caster->GetObjectGuid())
+                        ++count;
+                }
+
+                if (count)
+                {
+                    float bonus;
+                    if (m_spellInfo->GetSpellIconID() != 1736) // Blood Strike, Heart Strike, Obliterate
+                    {
+                        // Effect 3 damage is bonus
+                        bonus = count * CalculateDamage(EFFECT_INDEX_2, unitTarget) / 100.0f;
+                        // Blood Strike and Obliterate store bonus*2
+                        if (m_spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_BLOOD_STRIKE, CF_DEATHKNIGHT_OBLITERATE>())
+                            bonus /= 2.0f;
+                        if (Aura const* dummy = m_caster->GetDummyAura(64736)) // Item - Death Knight T8 Melee 4P Bonus
+                            bonus += (dummy->GetModifier()->m_amount * count) / 100.0f;
+                    }
+                    else // Blood-Caked Blade damage info taken from http://www.wowhead.com/forums&topic=54152.2 and Dr.Damage addon.
+                       bonus= count * 0.5f;//Blood-Caked Blade damage = (0.25(base) + diseaseCount * 0.125)= 0.25*(1+diseaseCount * 0.5)
+
+                    totalDamagePercentMod *= 1.0f + bonus;
+                }
+
+                // Heart Strike secondary target
+                if (m_spellInfo->GetSpellIconID() == 3145)
+                    if (m_targets.getUnitTarget() != unitTarget)
+                        weaponDamagePercentMod /= 2.0f;
+            }
+            // Glyph of Blood Strike
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_BLOOD_STRIKE>() &&
+                m_caster->HasAura(59332) &&
+                unitTarget->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED))
+            {
+                totalDamagePercentMod *= 1.2f;              // 120% if snared
+            }
+            // Glyph of Death Strike
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_DEATH_STRIKE>() &&
+                m_caster->HasAura(59336))
+            {
+                int32 rp = m_caster->GetPower(POWER_RUNIC_POWER) / 10;
+                if (rp > 25)
+                    rp = 25;
+                totalDamagePercentMod *= 1.0f + rp / 100.0f;
+            }
+            // Glyph of Plague Strike
+            if (m_spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_PLAGUE_STRIKE>() &&
+                m_caster->HasAura(58657) )
+            {
+                totalDamagePercentMod *= 1.2f;
+            }
+            // Rune strike
+            if ( m_spellInfo->GetSpellIconID() == 3007)
+            {
+                int32 count = CalculateDamage(EFFECT_INDEX_2, unitTarget);
+                spell_bonus += int32(count * m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100.0f);
+            }
+            break;
+        }
+    }
+
+    int32 fixed_bonus = 0;
+    for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
+    {
+        switch(m_spellInfo->Effect[j])
+        {
+            case SPELL_EFFECT_WEAPON_DAMAGE:
+            case SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL:
+                fixed_bonus += CalculateDamage(SpellEffectIndex(j), unitTarget);
+                break;
+            case SPELL_EFFECT_NORMALIZED_WEAPON_DMG:
+                fixed_bonus += CalculateDamage(SpellEffectIndex(j), unitTarget);
+                normalized = true;
+                break;
+            case SPELL_EFFECT_WEAPON_PERCENT_DAMAGE:
+                weaponDamagePercentMod *= float(CalculateDamage(SpellEffectIndex(j), unitTarget)) / 100.0f;
+
+                // applied only to prev.effects fixed damage
+                fixed_bonus = int32(fixed_bonus*weaponDamagePercentMod);
+                break;
+            default:
+                break;                                      // not weapon damage effect, just skip
+        }
+    }
+
+    // apply weaponDamagePercentMod to spell bonus also
+    if (spellBonusNeedWeaponDamagePercentMod)
+        spell_bonus = int32(spell_bonus*weaponDamagePercentMod);
+
+    // non-weapon damage
+    int32 bonus = spell_bonus + fixed_bonus;
+
+    // apply to non-weapon bonus weapon total pct effect, weapon total flat effect included in weapon damage
+    if (bonus)
+    {
+        UnitMods unitMod;
+        switch(m_attackType)
+        {
+            default:
+            case BASE_ATTACK:   unitMod = UNIT_MOD_DAMAGE_MAINHAND; break;
+            case OFF_ATTACK:    unitMod = UNIT_MOD_DAMAGE_OFFHAND;  break;
+            case RANGED_ATTACK: unitMod = UNIT_MOD_DAMAGE_RANGED;   break;
+        }
+
+        float weapon_total_pct  = m_caster->GetModifierValue(unitMod, TOTAL_PCT);
+        bonus = int32(bonus*weapon_total_pct);
+    }
+
+    // + weapon damage with applied weapon% dmg to base weapon damage in call
+    bonus += int32(m_caster->CalculateDamage(m_attackType, normalized)*weaponDamagePercentMod);
+
+    // total damage
+    bonus = int32(bonus*totalDamagePercentMod);
+
+    // prevent negative damage
+    m_damage+= uint32(bonus > 0 ? bonus : 0);
+
+    // Hemorrhage
+    if (m_spellInfo->IsFitToFamily<SPELLFAMILY_ROGUE, CF_ROGUE_HEMORRHAGE>())
+    {
+        if (m_caster->GetTypeId()==TYPEID_PLAYER)
+            m_caster->AddComboPoints(unitTarget, 1);
+    }
+    // Mangle (Cat): CP
+    else if (m_spellInfo->IsFitToFamily<SPELLFAMILY_DRUID, CF_DRUID_MANGLE_CAT>())
+    {
+        if (m_caster->GetTypeId()==TYPEID_PLAYER)
+            m_caster->AddComboPoints(unitTarget, 1);
+    }
+
+}
+
+void Spell::EffectThreat(SpellEffectIndex /*eff_idx*/)
+{
+    if (!unitTarget || !unitTarget->isAlive() || !m_caster->isAlive())
+        return;
+
+    if (!unitTarget->CanHaveThreatList())
+        return;
+
+    int32 bonus=0;
+    if (m_caster->GetTypeId()==TYPEID_PLAYER)
+        if (m_spellInfo->SpellFamilyName==SPELLFAMILY_WARRIOR && m_spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_SUNDER_ARMOR>())
+            bonus+=m_caster->GetTotalAttackPowerValue(BASE_ATTACK)/20; //Sunder Armor bonus threat
+
+   unitTarget->AddThreat(m_caster, float(damage+bonus), false, GetSpellSchoolMask(m_spellInfo), m_spellInfo);
+}
+
+void Spell::EffectHealMaxHealth(SpellEffectIndex /*eff_idx*/)
+{
+    if (!unitTarget)
+        return;
+
+    if (!unitTarget->isAlive())
+        return;
+
+    uint32 heal = m_caster->GetMaxHealth();
+
+    m_healing += heal;
+}
+
+void Spell::EffectInterruptCast(SpellEffectIndex eff_idx)
+{
+    if (!unitTarget)
+        return;
+
+    if (!unitTarget->isAlive())
+        return;
+
+    // TODO: not all spells that used this effect apply cooldown at school spells
+    // also exist case: apply cooldown to interrupted cast only and to all spells
+    for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
+    {
+        if (Spell* spell = unitTarget->GetCurrentSpell(CurrentSpellTypes(i)))
+        {
+            SpellEntry const* curSpellInfo = spell->m_spellInfo;
+            // check if we can interrupt spell
+            if ((curSpellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_INTERRUPT) && curSpellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE )
+            {
+                unitTarget->ProhibitSpellSchool(GetSpellSchoolMask(curSpellInfo), unitTarget->CalculateAuraDuration(m_spellInfo, (1 << eff_idx), GetSpellDuration(m_spellInfo), m_caster));
+                unitTarget->InterruptSpell(CurrentSpellTypes(i),false);
+                SendEffectLogExecute(eff_idx, unitTarget->GetObjectGuid(), curSpellInfo->Id);
+            }
+        }
+    }
+}
+
+void Spell::EffectSummonObjectWild(SpellEffectIndex eff_idx)
+{
+    uint32 gameobject_id = m_spellInfo->EffectMiscValue[eff_idx];
+
+    GameObject* pGameObj = new GameObject;
+
+    WorldObject* target = focusObject;
+    if (!target)
+        target = m_caster;
+
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                            m_targets.getDestination() :
+                            m_caster->GetClosePoint(DEFAULT_WORLD_OBJECT_SIZE);
+
+    Map* map = target->GetMap();
+
+    if(!pGameObj->Create(map->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), gameobject_id, map,
+        m_caster->GetPhaseMask(), loc.x, loc.y, loc.z, target->GetOrientation()))
+    {
+        delete pGameObj;
+        return;
+    }
+
+    pGameObj->SetRespawnTime(m_duration > 0 ? m_duration/IN_MILLISECONDS : 0);
+    pGameObj->SetSpellId(m_spellInfo->Id);
+
+    // Wild object not have owner and check clickable by players
+    map->Add(pGameObj);
+
+    // Store the GO to the caster
+    m_caster->AddWildGameObject(pGameObj);
+
+    if (pGameObj->GetGoType() == GAMEOBJECT_TYPE_FLAGDROP && m_caster->GetTypeId() == TYPEID_PLAYER)
+    {
+        Player *pl = (Player*)m_caster;
+        BattleGround* bg = ((Player *)m_caster)->GetBattleGround();
+
+        switch(pGameObj->GetMapId())
+        {
+            case 489:                                       //WS
+            {
+                if (bg && bg->GetTypeID(true)==BATTLEGROUND_WS && bg->GetStatus() == STATUS_IN_PROGRESS)
+                {
+                    Team team = pl->GetTeam() == ALLIANCE ? HORDE : ALLIANCE;
+
+                    ((BattleGroundWS*)bg)->SetDroppedFlagGuid(pGameObj->GetObjectGuid(), team);
+                }
+                break;
+            }
+            case 566:                                       //EY
+            {
+                if (bg && bg->GetTypeID(true)==BATTLEGROUND_EY && bg->GetStatus() == STATUS_IN_PROGRESS)
+                {
+                    ((BattleGroundEY*)bg)->SetDroppedFlagGuid(pGameObj->GetObjectGuid());
+                }
+                break;
+            }
+        }
+    }
+
+    pGameObj->SummonLinkedTrapIfAny();
+
+    if (m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->AI())
+        ((Creature*)m_caster)->AI()->JustSummoned(pGameObj);
+    if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
+        ((Creature*)m_originalCaster)->AI()->JustSummoned(pGameObj);
+    SendEffectLogExecute(eff_idx, pGameObj->GetObjectGuid());
+}
+
+void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
+{
+    // TODO: we must implement hunter pet summon at login there (spell 6962)
+
+    switch(m_spellInfo->SpellFamilyName)
+    {
+        case SPELLFAMILY_GENERIC:
+        {
+            switch (m_spellInfo->SpellDifficultyId)
+            {
+                case 344:                                           // Mistress' Kiss (Lord Jaraxxus) - Spells 66336 , 67076 , 67077 , 67078
+                {
+                    if (unitTarget)
+                        unitTarget->CastSpell(unitTarget, 66334, true);
+                    return;
+                }
+                case 581:                                           // Powering Up (Twin Val'kyrs) - Spells 67590 , 67602 , 67603 , 67604
+                {
+                    if (!unitTarget)
+                        return;
+
+                    if (SpellAuraHolderPtr pHolder = unitTarget->GetSpellAuraHolder(m_spellInfo->Id))
+                    {
+                        if (pHolder->GetStackAmount() + 1 == m_spellInfo->StackAmount)
+                        {
+                            if (unitTarget->HasAuraOfDifficulty(65686)) // Light Essence
+                            {
+                                unitTarget->CastSpell(unitTarget, 65748, true); // Empowered Light
+                            }
+                            if (unitTarget->HasAuraOfDifficulty(65684)) // Dark Essence
+                            {
+                                unitTarget->CastSpell(unitTarget, 67215, true); // Empowered Darkness
+                            }
+                            pHolder->SetStackAmount(0);
+                        }
+                    }
+                    return;
+                }
+                case 606:                                           // Burning Bile - Spells 66870 , 67621 , 67622 , 67623
+                {
+                    if (!unitTarget)
+                        return;
+
+                    if (unitTarget->HasAuraOfDifficulty(66823))
+                        unitTarget->RemoveAurasDueToSpell(66823);
+                    return;
+                }
+                case 1822:                                          // Bone Spike Graveyard (Lord Marrowgar) - Spells 69057 , 70826 , 72088 , 72089
+                case 2270:                                          // Spells 73142 , 73143 , 73144 , 73145
+                {
+                    if (unitTarget)
+                    {
+                        unitTarget->CastSpell(unitTarget, 72670, true); // enter vehicle - Possible 69062, 72669 !
+                        unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_1), true, 0, 0, m_caster->GetObjectGuid(), m_spellInfo);
+                    }
+                    return;
+                }
+                case 1988:                                          // Pungent Blight (Festergut) - Spells 69195 , 71219 , 73031 , 73032
+                {
+                    m_caster->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(eff_idx));
+                    return;
+                }
+                case 2085:                                          // Twilight Bloodbolt (Blood-Queen) - Spells 71446 , 71478 , 71479 , 71480
+                case 2109:                                          // Spells 71818 , 71819 , 71820 , 71821
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 71447, true);
+                    return;
+                }
+                case 2113:                                          // Bloodbolt Whirl (Blood-Queen) - Spells 71899 , 71900 , 71901 , 71902
+                {
+                    if (!unitTarget)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, 71446, true);
+                    return;
+                }
+                case 2169:                                          // Blood Nova (Saurfang) - Spells 72380 , 72438 , 72439 , 72440
+                case 2172:                                          // Rune of Blood (Saurfang) - Spells 72409 , 72447 , 72448 , 72449
+                {
+                    // cast Blood Link on Saurfang (script target)
+                    if (unitTarget)
+                        unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true, 0, 0, m_caster->GetObjectGuid(), m_spellInfo);
+                    return;
+                }
+                case 2198:                                          // Gastric Bloat (Festergut) - 72219 , 72551 , 72552 , 72553
+                {
+                    if (!unitTarget)
+                        return;
+
+                    if (SpellAuraHolderPtr pHolder = unitTarget->GetSpellAuraHolder(m_spellInfo->Id))
+                    {
+                        if (pHolder->GetStackAmount() + 1 >= m_spellInfo->StackAmount)
+                            unitTarget->CastSpell(unitTarget, 72227, true);
+                    }
+
+                    return;
+                }
+                default:
+                    break;
+            }
+            switch(m_spellInfo->Id)
+            {
+                case 6962:                                  // Called pet
+                {
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    if (((Player*)m_caster)->GetTemporaryUnsummonedPetCount())
+                        ((Player*)m_caster)->ResummonPetTemporaryUnSummonedIfAny();
+                    else
+                        ((Player*)m_caster)->LoadPet();
+                    return;
+                }
+                case 8856:                                  // Bending Shinbone
+                {
+                    if (!itemTarget && m_caster->GetTypeId()!=TYPEID_PLAYER)
+                        return;
+
+                    uint32 spell_id = 0;
+                    switch(urand(1, 5))
+                    {
+                        case 1:  spell_id = 8854; break;
+                        default: spell_id = 8855; break;
+                    }
+
+                    m_caster->CastSpell(m_caster,spell_id,true,NULL);
+                    return;
+                }
+                case 17512:                                 // Piccolo of the Flaming Fire
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    unitTarget->HandleEmoteCommand(EMOTE_STATE_DANCE);
+                    return;
+                }
+                case 20589:                                 // Escape artist
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
+                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
+                    return;
+                }
+                case 22539:                                 // Shadow Flame (All script effects, not just end ones to
+                case 22972:                                 // prevent player from dodging the last triggered spell)
+                case 22975:
+                case 22976:
+                case 22977:
+                case 22978:
+                case 22979:
+                case 22980:
+                case 22981:
+                case 22982:
+                case 22983:
+                case 22984:
+                case 22985:
+                {
+                    if (!unitTarget || !unitTarget->isAlive())
+                        return;
+
+                    // Onyxia Scale Cloak
+                    if (unitTarget->GetDummyAura(22683))
+                        return;
+
+                    // Shadow Flame
+                    m_caster->CastSpell(unitTarget, 22682, true);
+                    return;
+                }
+                case 24194:                                 // Uther's Tribute
+                case 24195:                                 // Grom's Tribute
+                {
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    uint8 race = m_caster->getRace();
+                    uint32 spellId = 0;
+
+                    switch(m_spellInfo->Id)
+                    {
+                        case 24194:
+                            switch(race)
+                            {
+                                case RACE_HUMAN:            spellId = 24105; break;
+                                case RACE_DWARF:            spellId = 24107; break;
+                                case RACE_NIGHTELF:         spellId = 24108; break;
+                                case RACE_GNOME:            spellId = 24106; break;
+                                case RACE_DRAENEI:          spellId = 69533; break;
+                            }
+                            break;
+                        case 24195:
+                            switch(race)
+                            {
+                                case RACE_ORC:              spellId = 24104; break;
+                                case RACE_UNDEAD:           spellId = 24103; break;
+                                case RACE_TAUREN:           spellId = 24102; break;
+                                case RACE_TROLL:            spellId = 24101; break;
+                                case RACE_BLOODELF:         spellId = 69530; break;
+                            }
+                            break;
+                    }
+
+                    if (spellId)
+                        m_caster->CastSpell(m_caster, spellId, true);
+
+                    return;
+                }
+                case 24320:                                 // Poisonous Blood
+                {
+                    unitTarget->CastSpell(unitTarget, 24321, true, NULL, NULL, m_caster->GetObjectGuid());
+                    return;
+                }
+                case 24324:                                 // Blood Siphon
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    unitTarget->CastSpell(m_caster, unitTarget->HasAura(24321) ? 24323 : 24322, true);
+                    return;
+                }
+                case 24590:                                 // Brittle Armor - need remove one 24575 Brittle Armor aura
+                    unitTarget->RemoveAuraHolderFromStack(24575);
+                    return;
+                case 24714:                                 // Trick
+                {
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    if (roll_chance_i(14))                  // Trick (can be different critter models). 14% since below can have 1 of 6
+                        m_caster->CastSpell(m_caster, 24753, true);
+                    else                                    // Random Costume, 6 different (plus add. for gender)
+                        m_caster->CastSpell(m_caster, 24720, true);
+
+                    return;
+                }
+                case 24717:                                 // Pirate Costume
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // Pirate Costume (male or female)
+                    m_caster->CastSpell(unitTarget, unitTarget->getGender() == GENDER_MALE ? 24708 : 24709, true);
+                    return;
+                }
+                case 24718:                                 // Ninja Costume
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // Ninja Costume (male or female)
+                    m_caster->CastSpell(unitTarget, unitTarget->getGender() == GENDER_MALE ? 24711 : 24710, true);
+                    return;
+                }
+                case 24719:                                 // Leper Gnome Costume
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // Leper Gnome Costume (male or female)
+                    m_caster->CastSpell(unitTarget, unitTarget->getGender() == GENDER_MALE ? 24712 : 24713, true);
+                    return;
+                }
+                case 24720:                                 // Random Costume
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    uint32 spellId = 0;
+
+                    switch(urand(0, 6))
+                    {
+                        case 0:
+                            spellId = unitTarget->getGender() == GENDER_MALE ? 24708 : 24709;
+                            break;
+                        case 1:
+                            spellId = unitTarget->getGender() == GENDER_MALE ? 24711 : 24710;
+                            break;
+                        case 2:
+                            spellId = unitTarget->getGender() == GENDER_MALE ? 24712 : 24713;
+                            break;
+                        case 3:
+                            spellId = 24723;
+                            break;
+                        case 4:
+                            spellId = 24732;
+                            break;
+                        case 5:
+                            spellId = unitTarget->getGender() == GENDER_MALE ? 24735 : 24736;
+                            break;
+                        case 6:
+                            spellId = 24740;
+                            break;
+                    }
+
+                    m_caster->CastSpell(unitTarget, spellId, true);
+                    return;
+                }
+                case 24737:                                 // Ghost Costume
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // Ghost Costume (male or female)
+                    m_caster->CastSpell(unitTarget, unitTarget->getGender() == GENDER_MALE ? 24735 : 24736, true);
+                    return;
+                }
+                case 24751:                                 // Trick or Treat
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // Tricked or Treated
+                    unitTarget->CastSpell(unitTarget, 24755, true);
+
+                    // Treat / Trick
+                    unitTarget->CastSpell(unitTarget, roll_chance_i(50) ? 24714 : 24715, true);
+                    return;
+                }
+                case 25140:                                 // Orb teleport spells
+                case 25143:
+                case 25650:
+                case 25652:
+                case 29128:
+                case 29129:
+                case 35376:
+                case 35727:
+                {
+                    if (!unitTarget)
+                        return;
+
+                    uint32 spellid;
+                    switch(m_spellInfo->Id)
+                    {
+                        case 25140: spellid =  32568; break;
+                        case 25143: spellid =  32572; break;
+                        case 25650: spellid =  30140; break;
+                        case 25652: spellid =  30141; break;
+                        case 29128: spellid =  32571; break;
+                        case 29129: spellid =  32569; break;
+                        case 35376: spellid =  25649; break;
+                        case 35727: spellid =  35730; break;
+                        default:
+                            return;
+                    }
+
+                    unitTarget->CastSpell(unitTarget,spellid,false);
+                    return;
+                }
+                case 26004:                                 // Mistletoe
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->HandleEmote(EMOTE_ONESHOT_CHEER);
+                    return;
+                }
+                case 26137:                                 // Rotate Trigger
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, urand(0, 1) ? 26009 : 26136, true);
+                    return;
+                }
+                case 26218:                                 // Mistletoe
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    uint32 spells[3] = {26206, 26207, 45036};
+
+                    m_caster->CastSpell(unitTarget, spells[urand(0, 2)], true);
+                    return;
+                }
+                case 26275:                                 // PX-238 Winter Wondervolt TRAP
+                {
+                    uint32 spells[4] = {26272, 26157, 26273, 26274};
+
+                    // check presence
+                    for(int j = 0; j < 4; ++j)
+                        if (unitTarget->HasAura(spells[j], EFFECT_INDEX_0))
+                            return;
+
+                    // cast
+                    unitTarget->CastSpell(unitTarget, spells[urand(0,3)], true);
+                    return;
+                }
+                case 26465:                                 // Mercurial Shield - need remove one 26464 Mercurial Shield aura
+                    unitTarget->RemoveAuraHolderFromStack(26464);
+                    return;
+                case 26656:                                 // Summon Black Qiraji Battle Tank
+                {
+                    if (!unitTarget)
+                        return;
+
+                    // Prevent stacking of mounts
+                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+
+                    // Two separate mounts depending on area id (allows use both in and out of specific instance)
+                    if (unitTarget->GetAreaId() == 3428)
+                        unitTarget->CastSpell(unitTarget, 25863, false);
+                    else
+                        unitTarget->CastSpell(unitTarget, 26655, false);
+
+                    return;
+                }
+                case 26678:                                 //Heart Candy
+                {
+                    uint32 item=0;
+                    switch ( urand(0, 7) )
+                    {
+                        case 0:
+                            item = 21816; break;
+                        case 1:
+                            item = 21817; break;
+                        case 2:
+                            item = 21818; break;
+                        case 3:
+                            item = 21819; break;
+                        case 4:
+                            item = 21820; break;
+                        case 5:
+                            item = 21821; break;
+                        case 6:
+                            item = 21822; break;
+                        case 7:
+                            item = 21823; break;
+                    }
+                    if (item)
+                        DoCreateItem(eff_idx,item);
+                    return;
+                }
+                case 27687:                                 // Summon Bone Minions
+                {
+                    if (!unitTarget)
+                        return;
+
+                    // Spells 27690, 27691, 27692, 27693 are missing from DBC
+                    // So we need to summon creature 16119 manually
+                    float x, y, z;
+                    float angle = unitTarget->GetOrientation();
+                    for (uint8 i = 0; i < 4; ++i)
+                    {
+                        unitTarget->GetNearPoint(unitTarget, x, y, z, unitTarget->GetObjectBoundingRadius(), INTERACTION_DISTANCE, angle + i * M_PI_F / 2);
+                        unitTarget->SummonCreature(16119, x, y, z, angle, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 10 * MINUTE * IN_MILLISECONDS);
+                    }
+                    return;
+                }
+                case 27695:                                 // Summon Bone Mages
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 27696, true);
+                    unitTarget->CastSpell(unitTarget, 27697, true);
+                    unitTarget->CastSpell(unitTarget, 27698, true);
+                    unitTarget->CastSpell(unitTarget, 27699, true);
+                    return;
+                }
+                case 28374:                                 // Decimate (Naxxramas: Gluth)
+                case 54426:                                 // Decimate (Naxxramas: Gluth (spells are identical))
+                case 71123:                                 // Decimate (ICC: Precious / Stinky)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    float downToHealthPercent = (m_spellInfo->Id != 71123 ? 5 : m_spellInfo->CalculateSimpleValue(eff_idx)) * 0.01f;
+
+                    int32 damage = unitTarget->GetHealth() - unitTarget->GetMaxHealth() * downToHealthPercent;
+                    if (damage > 0)
+                        m_caster->CastCustomSpell(unitTarget, 28375, &damage, NULL, NULL, true);
+                    return;
+                }
+                case 28526:                                 // Icebolt (Naxxramas: Sapphiron)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    if (unitTarget->GetTypeId() == TYPEID_UNIT)
+                    {
+                        Creature* pCreature = (Creature*)unitTarget;
+                        if (pCreature && pCreature->AI())
+                        {
+                            if (Unit* pTarget = pCreature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_PLAYER))
+                                pCreature->CastSpell(pTarget, 28522, true);
+                        }
+                    }
+                    return;
+                }
+                case 28560:                                 // Summon Blizzard
+                {
+                    if (!unitTarget)
+                        return;
+
+                    m_caster->SummonCreature(16474, unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 30000);
+                    return;
+                }
+                case 28859:                                 // Cleansing Flames
+                case 29126:                                 // Cleansing Flames (Darnassus)
+                case 29135:                                 // Cleansing Flames (Ironforge)
+                case 29136:                                 // Cleansing Flames (Orgrimmar)
+                case 29137:                                 // Cleansing Flames (Stormwind)
+                case 29138:                                 // Cleansing Flames (Thunder Bluff)
+                case 29139:                                 // Cleansing Flames (Undercity)
+                case 46671:                                 // Cleansing Flames (Exodar)
+                case 46672:                                 // Cleansing Flames (Silvermoon)
+                {
+                    // Cleanse all magic, curse, disease and poison
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->RemoveAurasWithDispelType(DISPEL_MAGIC);
+                    unitTarget->RemoveAurasWithDispelType(DISPEL_CURSE);
+                    unitTarget->RemoveAurasWithDispelType(DISPEL_DISEASE);
+                    unitTarget->RemoveAurasWithDispelType(DISPEL_POISON);
+
+                    return;
+                }
+                case 29395:                                 // Break Kaliri Egg
+                {
+                    uint32 creature_id = 0;
+                    uint32 rand = urand(0, 99);
+
+                    if (rand < 10)
+                        creature_id = 17034;
+                    else if (rand < 60)
+                        creature_id = 17035;
+                    else
+                        creature_id = 17039;
+
+                    if (WorldObject* pSource = GetAffectiveCasterObject())
+                        pSource->SummonCreature(creature_id, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120*IN_MILLISECONDS);
+                    return;
+                }
+                case 29830:                                 // Mirren's Drinking Hat
+                {
+                    uint32 item = 0;
+                    switch ( urand(1, 6) )
+                    {
+                        case 1:
+                        case 2:
+                        case 3:
+                            item = 23584; break;            // Loch Modan Lager
+                        case 4:
+                        case 5:
+                            item = 23585; break;            // Stouthammer Lite
+                        case 6:
+                            item = 23586; break;            // Aerie Peak Pale Ale
+                    }
+
+                    if (item)
+                        DoCreateItem(eff_idx,item);
+
+                    break;
+                }
+                case 30541:                                 // Blaze
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 30542, true);
+                    break;
+                }
+                case 30769:                                 // Pick Red Riding Hood
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // cast Little Red Riding Hood
+                    m_caster->CastSpell(unitTarget, 30768, true);
+                    break;
+                }
+                case 30835:                                 // Infernal Relay
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 30836, true, NULL, NULL, m_caster->GetObjectGuid());
+                    break;
+                }
+                case 30918:                                 // Improved Sprint
+                {
+                    if (!unitTarget)
+                        return;
+
+                    // Removes snares and roots.
+                    unitTarget->RemoveAurasAtMechanicImmunity(IMMUNE_TO_ROOT_AND_SNARE_MASK,30918,true);
+                    break;
+                }
+                case 37473:                                 // Detect Whispers (related to quest 10607 - Whispers of the Raven God_Whispers of the Raven God)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, damage, true);
+                    break;
+                }
+                case 37142:                                 // Karazhan - Chess NPC Action: Melee Attack: Conjured Water Elemental
+                case 37143:                                 // Karazhan - Chess NPC Action: Melee Attack: Charger
+                case 37147:                                 // Karazhan - Chess NPC Action: Melee Attack: Human Cleric
+                case 37149:                                 // Karazhan - Chess NPC Action: Melee Attack: Human Conjurer
+                case 37150:                                 // Karazhan - Chess NPC Action: Melee Attack: King Llane
+                case 37220:                                 // Karazhan - Chess NPC Action: Melee Attack: Summoned Daemon
+                case 32227:                                 // Karazhan - Chess NPC Action: Melee Attack: Footman
+                case 32228:                                 // Karazhan - Chess NPC Action: Melee Attack: Grunt
+                case 37337:                                 // Karazhan - Chess NPC Action: Melee Attack: Orc Necrolyte
+                case 37339:                                 // Karazhan - Chess NPC Action: Melee Attack: Orc Wolf
+                case 37345:                                 // Karazhan - Chess NPC Action: Melee Attack: Orc Warlock
+                case 37348:                                 // Karazhan - Chess NPC Action: Melee Attack: Warchief Blackhand
+                {
+                        if (!unitTarget)
+                            return;
+
+                        m_caster->CastSpell(unitTarget, 32247, true);
+                        return;
+                }
+                case 32301:                                 // Ping Shirrak
+                {
+                    if (!unitTarget)
+                        return;
+
+                    // Cast Focus fire on caster
+                    unitTarget->CastSpell(m_caster, 32300, true);
+                    return;
+                }
+                case 33676:                                 // Incite Chaos
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, 33684, true);
+                    return;
+                }
+                case 35865:                                 // Summon Nether Vapor
+                {
+                    if (!unitTarget)
+                        return;
+
+                    float x, y, z;
+                    for (uint8 i = 0; i < 4; ++i)
+                    {
+                        m_caster->GetNearPoint(m_caster, x, y, z, 0.0f, INTERACTION_DISTANCE, M_PI_F * .5f * i + M_PI_F * .25f);
+                        m_caster->SummonCreature(21002, x, y, z, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    }
+                    return;
+                }
+                case 37431:                                 // Spout
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, urand(0, 1) ? 37429 : 37430, true);
+                    return;
+                }
+                case 37775:                                 // Karazhan - Chess NPC Action - Poison Cloud
+                {
+                    if (!unitTarget)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, 37469, true);
+                    return;
+                }
+                case 37824:                                 // Karazhan - Chess NPC Action - Shadow Mend
+                {
+                    if (!unitTarget)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, 37456, true);
+                    return;
+                }
+                case 38358:                                 // Tidal Surge
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 38353, true, NULL, NULL, m_caster->GetObjectGuid());
+                    return;
+                }
+                case 39338:                                 // Karazhan - Chess, Medivh CHEAT: Hand of Medivh, Target Horde
+                case 39342:                                 // Karazhan - Chess, Medivh CHEAT: Hand of Medivh, Target Alliance
+                {
+                    if (!unitTarget)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, 39339, true);
+                    return;
+                }
+                case 39341:                                 // Karazhan - Chess, Medivh CHEAT: Fury of Medivh, Target Horde
+                case 39344:                                 // Karazhan - Chess, Medivh CHEAT: Fury of Medivh, Target Alliance
+                {
+                    if (!unitTarget)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
+                }
+                case 39681:                                 // Summon Goblin Tonk
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 39682, true);
+                    break;
+                }
+                case 39684:                                 // Summon Gnomish Tonk
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 39683, true);
+                    break;
+                }
+                case 39835:                                 // Needle Spine (Warlord Najentus)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    // TODO likely that this spell should have m_caster as Original caster, but conflicts atm with TARGET_ALL_FRIENDLY_UNITS_AROUND_CASTER
+                    unitTarget->CastSpell(unitTarget, 39968, true);
+                    return;
+                }
+                case 41055:                                 // Copy Weapon
+                {
+                    if (m_caster->GetTypeId() != TYPEID_UNIT || !unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    if (Item* pItem = ((Player*)unitTarget)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND))
+                    {
+                        ((Creature*)m_caster)->SetVirtualItem(VIRTUAL_ITEM_SLOT_0, pItem->GetEntry());
+
+                        // Unclear what this spell should do
+                        unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    }
+
+                    return;
+                }
+                case 41126:                                 // Flame Crash
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 41131, true);
+                    break;
+                }
+                case 42281:                                 // Sprout (Headless Horsemann spell)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 42285, true);
+                    return;
+                }
+                case 42577:                                 // Zap
+                {
+                    if (!unitTarget)
+                        return;
+
+                    if (Unit* pVictim = unitTarget->getVictim())
+                    {
+                        // Cast Zap damage spell
+                        unitTarget->CastSpell(pVictim, 43137, true);
+
+                        // Attack a new target
+                        if (unitTarget->GetTypeId() == TYPEID_UNIT)
+                        {
+                            Creature* cre = (Creature*)unitTarget;
+                            if (cre && cre->AI())
+                            {
+                                if (Unit* target = cre->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                                    cre->AI()->AttackStart(target);
+                            }
+                        }
+                    }
+                    return;
+                }
+                case 43365:                                 // The Cleansing: Shrine Cast
+                {
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // Script Effect Player Cast Mirror Image
+                    m_caster->CastSpell(m_caster, 50217, true);
+                    return;
+                }
+                case 43375:                                 // Mixing Vrykul Blood
+                case 43972:                                 // Mixing Blood for Quest 11306
+                {
+                    if (!unitTarget)
+                        return;
+
+                    uint32 triggeredSpell[] = {43376, 43378, 43970, 43377};
+
+                    unitTarget->CastSpell(unitTarget, triggeredSpell[urand(0, 3)], true);
+                    return;
+                }
+                case 44323:                                 // Hawk Hunting
+                case 44407:                                 // Hawk Hunting
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    // check target entry specific to each spell
+                    if (m_spellInfo->Id == 44323 && unitTarget->GetEntry() != 24746)
+                        return;
+                    if (m_spellInfo->Id == 44407 && unitTarget->GetEntry() != 24747)
+                        return;
+
+                    unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    // despawn delay depends on the distance between caster and target
+                    ((Creature*)unitTarget)->ForcedDespawn(100 * unitTarget->GetDistance2d(m_caster));
+                    return;
+                }
+                case 44364:                                 // Rock Falcon Primer
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // Are there anything special with this, a random chance or condition?
+                    // Feeding Rock Falcon
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true, NULL, NULL, unitTarget->GetObjectGuid(), m_spellInfo);
+                    return;
+                }
+                case 44436:                                 // Tricky Treat
+                {
+                    if (!unitTarget)
+                        return;
+
+                    if (roll_chance_i(25))                  // chance unknown, using 25, Script Effect Cast Upset Tummy
+                        unitTarget->CastSpell(unitTarget, 42966, true);
+
+                    return;
+                }
+                case 44455:                                 // Character Script Effect Reverse Cast
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    Creature* pTarget = (Creature*)unitTarget;
+
+                    if (const SpellEntry *pSpell = sSpellStore.LookupEntry(m_spellInfo->CalculateSimpleValue(eff_idx)))
+                    {
+                        // if we used item at least once...
+                        if (pTarget->IsTemporarySummon() && int32(pTarget->GetEntry()) == pSpell->EffectMiscValue[eff_idx])
+                        {
+                            TemporarySummon* pSummon = (TemporarySummon*)pTarget;
+
+                            // can only affect "own" summoned
+                            if (pSummon->GetSummonerGuid() == m_caster->GetObjectGuid())
+                            {
+                                // trigger cast of quest complete script (see code for this spell below)
+                                pTarget->CastSpell(pTarget, 44462, true);
+
+                                pTarget->GetMotionMaster()->MovePoint(0, m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ());
+                            }
+
+                            return;
+                        }
+
+                        // or if it is first time used item, cast summon and despawn the target
+                        m_caster->CastSpell(pTarget, pSpell, true);
+                        pTarget->ForcedDespawn();
+
+                        // TODO: here we should get pointer to the just summoned and make it move.
+                        // without, it will be one extra use of quest item
+                    }
+
+                    return;
+                }
+                case 44462:                                 // Cast Quest Complete on Master
+                {
+                    if (m_caster->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    Creature* pQuestCow = NULL;
+
+                    float range = 20.0f;
+
+                    // search for a reef cow nearby
+                    MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*m_caster, 24797, true, false, range);
+                    MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(pQuestCow, u_check);
+
+                    Cell::VisitGridObjects(m_caster, searcher, range);
+
+                    // no cows found, so return
+                    if (!pQuestCow)
+                        return;
+
+                    if (!((Creature*)m_caster)->IsTemporarySummon())
+                        return;
+
+                    if (const SpellEntry *pSpell = sSpellStore.LookupEntry(m_spellInfo->CalculateSimpleValue(eff_idx)))
+                    {
+                        TemporarySummon* pSummon = (TemporarySummon*)m_caster;
+
+                        // all ok, so make summoner cast the quest complete
+                        if (Unit* pSummoner = pSummon->GetSummoner())
+                            pSummoner->CastSpell(pSummoner, pSpell, true);
+                    }
+
+                    return;
+                }
+                case 44876:                                 // Force Cast - Portal Effect: Sunwell Isle
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 44870, true);
+                    break;
+                }
+                case 44811:                                 // Spectral Realm
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // If the player can't be teleported, send him a notification
+                    if (unitTarget->HasAura(44867))
+                    {
+                        ((Player*)unitTarget)->GetSession()->SendNotification(LANG_FAIL_ENTER_SPECTRAL_REALM);
+                        return;
+                    }
+
+                    // Teleport target to the spectral realm, add debuff and force faction
+                    unitTarget->CastSpell(unitTarget, 46019, true);
+                    unitTarget->CastSpell(unitTarget, 46021, true);
+                    unitTarget->CastSpell(unitTarget, 44845, true);
+                    unitTarget->CastSpell(unitTarget, 44852, true);
+                    return;
+                }
+                case 45141:                                 // Burn
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 46394, true, NULL, NULL, m_caster->GetObjectGuid());
+                    return;
+                }
+                case 45151:                                 // Burn
+                {
+                    if (!unitTarget || unitTarget->HasAura(46394))
+                        return;
+
+                    // Make the burn effect jump to another friendly target
+                    unitTarget->CastSpell(unitTarget, 46394, true);
+                    return;
+                }
+                case 45185:                                 // Stomp
+                {
+                    if (!unitTarget)
+                        return;
+
+                    // Remove the burn effect
+                    unitTarget->RemoveAurasDueToSpell(46394);
+                    return;
+                }
+                case 45204:                                 // Clone Me!
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
+                }
+                case 45206:                                 // Copy Off-hand Weapon
+                {
+                    if (m_caster->GetTypeId() != TYPEID_UNIT || !unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    if (Item* pItem = ((Player*)unitTarget)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
+                    {
+                        ((Creature*)m_caster)->SetVirtualItem(VIRTUAL_ITEM_SLOT_1, pItem->GetEntry());
+
+                        // Unclear what this spell should do
+                        unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    }
+
+                    return;
+                }
+                case 45235:                                 // Blaze
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 45236, true, NULL, NULL, m_caster->GetObjectGuid());
+                    return;
+                }
+                case 45260:                                 // Karazhan - Chess - Force Player to Kill Bunny
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    unitTarget->CastSpell(unitTarget, 45259, true);
+                    return;
+                }
+                case 45668:                                 // Ultra-Advanced Proto-Typical Shortening Blaster
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    if (roll_chance_i(25))                  // chance unknown, using 25
+                        return;
+
+                    static uint32 const spellPlayer[5] =
+                    {
+                        45674,                              // Bigger!
+                        45675,                              // Shrunk
+                        45678,                              // Yellow
+                        45682,                              // Ghost
+                        45684                               // Polymorph
+                    };
+
+                    static uint32 const spellTarget[5] =
+                    {
+                        45673,                              // Bigger!
+                        45672,                              // Shrunk
+                        45677,                              // Yellow
+                        45681,                              // Ghost
+                        45683                               // Polymorph
+                    };
+
+                    m_caster->CastSpell(m_caster, spellPlayer[urand(0,4)], true);
+                    unitTarget->CastSpell(unitTarget, spellTarget[urand(0,4)], true);
+
+                    return;
+                }
+                case 45691:                                 // Magnataur On Death 1
+                {
+                    // assuming caster is creature, if not, then return
+                    if (m_caster->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    Player* pPlayer = ((Creature*)m_caster)->GetOriginalLootRecipient();
+
+                    if (!pPlayer)
+                        return;
+
+                    if (pPlayer->HasAura(45674) || pPlayer->HasAura(45675) || pPlayer->HasAura(45678) || pPlayer->HasAura(45682) || pPlayer->HasAura(45684))
+                        pPlayer->CastSpell(pPlayer, 45686, true);
+
+                    m_caster->CastSpell(m_caster, 45685, true);
+
+                    return;
+                }
+                case 45713:                                 // Naked Caravan Guard - Master Transform
+                {
+                    if (m_caster->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    const CreatureInfo* cTemplate = NULL;
+
+                    switch(m_caster->GetEntry())
+                    {
+                        case 25342: cTemplate = ObjectMgr::GetCreatureTemplate(25340); break;
+                        case 25343: cTemplate = ObjectMgr::GetCreatureTemplate(25341); break;
+                    }
+
+                    if (!cTemplate)
+                        return;
+
+                    uint32 display_id = 0;
+
+                    // Spell is designed to be used in creature addon.
+                    // This makes it possible to set proper model before adding to map.
+                    // For later, spell is used in gossip (with following despawn,
+                    // so addon can reload the default model and data again).
+
+                    // It should be noted that additional spell id's have been seen in relation to this spell, but
+                    // those does not exist in client (45701 (regular spell), 45705-45712 (auras), 45459-45460 (auras)).
+                    // We can assume 45705-45712 are transform auras, used instead of hard coded models in the below code.
+
+                    // not in map yet OR no npc flags yet (restored after LoadCreatureAddon for respawn cases)
+                    if (!m_caster->IsInMap(m_caster) || m_caster->GetUInt32Value(UNIT_NPC_FLAGS) == UNIT_NPC_FLAG_NONE)
+                    {
+                        display_id = Creature::ChooseDisplayId(cTemplate);
+                        ((Creature*)m_caster)->LoadEquipment(((Creature*)m_caster)->GetEquipmentId());
+                    }
+                    else
+                    {
+                        m_caster->SetUInt32Value(UNIT_NPC_FLAGS, cTemplate->NpcFlags);
+                        ((Creature*)m_caster)->SetVirtualItem(VIRTUAL_ITEM_SLOT_0, 0);
+                        ((Creature*)m_caster)->SetVirtualItem(VIRTUAL_ITEM_SLOT_1, 0);
+
+                        switch(m_caster->GetDisplayId())
+                        {
+                            case 23246: display_id = 23245; break;
+                            case 23247: display_id = 23250; break;
+                            case 23248: display_id = 23251; break;
+                            case 23249: display_id = 23252; break;
+                            case 23124: display_id = 23253; break;
+                            case 23125: display_id = 23254; break;
+                            case 23126: display_id = 23255; break;
+                            case 23127: display_id = 23256; break;
+                        }
+                    }
 
-                if (count)
+                    m_caster->SetDisplayId(display_id);
+                    return;
+                }
+                case 45714:                                 // Fog of Corruption (caster inform)
                 {
-                    // Effect 1(for Blood-Caked Strike)/3(other) damage is bonus
-                    float bonus = count * CalculateDamage(m_spellInfo->SpellIconID == 1736 ? EFFECT_INDEX_0 : EFFECT_INDEX_2, unitTarget) / 100.0f;
-                    // Blood Strike, Blood-Caked Strike and Obliterate store bonus*2
-                    if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0002000000400000) ||
-                        m_spellInfo->SpellIconID == 1736)
-                        bonus /= 2.0f;
+                    if (!unitTarget || m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-                    totalDamagePercentMod *= 1.0f + bonus;
+                    unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
                 }
+                case 45717:                                 // Fog of Corruption (player buff)
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-                // Heart Strike secondary target
-                if (m_spellInfo->SpellIconID == 3145)
-                    if (m_targets.getUnitTarget() != unitTarget)
-                        weaponDamagePercentMod /= 2.0f;
-            }
-            // Glyph of Blood Strike
-            if( m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000400000) &&
-                m_caster->HasAura(59332) &&
-                unitTarget->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED))
-            {
-                totalDamagePercentMod *= 1.2f;              // 120% if snared
-            }
-            // Glyph of Death Strike
-            if( m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000010) &&
-                m_caster->HasAura(59336))
-            {
-                int32 rp = m_caster->GetPower(POWER_RUNIC_POWER) / 10;
-                if(rp > 25)
-                    rp = 25;
-                totalDamagePercentMod *= 1.0f + rp / 100.0f;
-            }
-            // Glyph of Plague Strike
-            if( m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000001) &&
-                m_caster->HasAura(58657) )
-            {
-                totalDamagePercentMod *= 1.2f;
-            }
-            break;
-        }
-    }
-
-    int32 fixed_bonus = 0;
-    for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
-    {
-        switch(m_spellInfo->Effect[j])
-        {
-            case SPELL_EFFECT_WEAPON_DAMAGE:
-            case SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL:
-                fixed_bonus += CalculateDamage(SpellEffectIndex(j), unitTarget);
-                break;
-            case SPELL_EFFECT_NORMALIZED_WEAPON_DMG:
-                fixed_bonus += CalculateDamage(SpellEffectIndex(j), unitTarget);
-                normalized = true;
-                break;
-            case SPELL_EFFECT_WEAPON_PERCENT_DAMAGE:
-                weaponDamagePercentMod *= float(CalculateDamage(SpellEffectIndex(j), unitTarget)) / 100.0f;
-
-                // applied only to prev.effects fixed damage
-                fixed_bonus = int32(fixed_bonus*weaponDamagePercentMod);
-                break;
-            default:
-                break;                                      // not weapon damage effect, just skip
-        }
-    }
-
-    // apply weaponDamagePercentMod to spell bonus also
-    if(spellBonusNeedWeaponDamagePercentMod)
-        spell_bonus = int32(spell_bonus*weaponDamagePercentMod);
+                    unitTarget->CastSpell(unitTarget, 45726, true);
+                    return;
+                }
+                case 45785:                                 // Sinister Reflection Clone
+                {
+                    if (!unitTarget)
+                        return;
 
-    // non-weapon damage
-    int32 bonus = spell_bonus + fixed_bonus;
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
+                }
+                case 45833:                                 // Power of the Blue Flight
+                {
+                    if (!unitTarget)
+                        return;
 
-    // apply to non-weapon bonus weapon total pct effect, weapon total flat effect included in weapon damage
-    if(bonus)
-    {
-        UnitMods unitMod;
-        switch(m_attackType)
-        {
-            default:
-            case BASE_ATTACK:   unitMod = UNIT_MOD_DAMAGE_MAINHAND; break;
-            case OFF_ATTACK:    unitMod = UNIT_MOD_DAMAGE_OFFHAND;  break;
-            case RANGED_ATTACK: unitMod = UNIT_MOD_DAMAGE_RANGED;   break;
-        }
+                    unitTarget->CastSpell(unitTarget, 45836, true);
+                    return;
+                }
+                case 45892:                                 // Sinister Reflection
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-        float weapon_total_pct  = m_caster->GetModifierValue(unitMod, TOTAL_PCT);
-        bonus = int32(bonus*weapon_total_pct);
-    }
+                    // Summon 4 clones of the same player
+                    for (uint8 i = 0; i < 4; ++i)
+                        unitTarget->CastSpell(unitTarget, 45891, true, NULL, NULL, m_caster->GetObjectGuid());
+                    return;
+                }
+                case 45918:                                 // Soul Sever
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || !unitTarget->HasAura(45717))
+                        return;
 
-    // + weapon damage with applied weapon% dmg to base weapon damage in call
-    bonus += int32(m_caster->CalculateDamage(m_attackType, normalized)*weaponDamagePercentMod);
+                    // kill all charmed targets
+                    unitTarget->CastSpell(unitTarget, 45917, true);
+                    return;
+                }
+                case 45958:                                 // Signal Alliance
+                {
+                    // "escort" aura not present, so let nothing happen
+                    if (!m_caster->HasAura(m_spellInfo->CalculateSimpleValue(eff_idx)))
+                        return;
+                    // "escort" aura is present so break; and let DB table dbscripts_on_spell be used and process further.
+                    else
+                        break;
+                }
 
-    // total damage
-    bonus = int32(bonus*totalDamagePercentMod);
+                case 46203:                                 // Goblin Weather Machine
+                {
+                    if (!unitTarget)
+                        return;
 
-    // prevent negative damage
-    m_damage+= uint32(bonus > 0 ? bonus : 0);
+                    uint32 spellId = 0;
+                    switch(rand() % 4)
+                    {
+                        case 0: spellId = 46740; break;
+                        case 1: spellId = 46739; break;
+                        case 2: spellId = 46738; break;
+                        case 3: spellId = 46736; break;
+                    }
+                    unitTarget->CastSpell(unitTarget, spellId, true);
+                    break;
+                }
+                case 46289:                                 // Negative Energy
+                {
+                    if (!unitTarget)
+                        return;
 
-    // Hemorrhage
-    if (m_spellInfo->SpellFamilyName==SPELLFAMILY_ROGUE && (m_spellInfo->SpellFamilyFlags & UI64LIT(0x2000000)))
-    {
-        if(m_caster->GetTypeId()==TYPEID_PLAYER)
-            ((Player*)m_caster)->AddComboPoints(unitTarget, 1);
-    }
-    // Mangle (Cat): CP
-    else if (m_spellInfo->IsFitToFamily(SPELLFAMILY_DRUID, UI64LIT(0x0000040000000000)))
-    {
-        if(m_caster->GetTypeId()==TYPEID_PLAYER)
-            ((Player*)m_caster)->AddComboPoints(unitTarget, 1);
-    }
+                    m_caster->CastSpell(unitTarget, 46285, true);
+                    return;
+                }
+                case 46430:                                 // Synch Health
+                {
+                    if (!unitTarget)
+                        return;
 
-    // take ammo
-    if(m_attackType == RANGED_ATTACK && m_caster->GetTypeId() == TYPEID_PLAYER)
-    {
-        Item *pItem = ((Player*)m_caster)->GetWeaponForAttack(RANGED_ATTACK, true, false);
+                    unitTarget->SetHealth(m_caster->GetHealth());
+                    return;
+                }
+                case 46642:                                 // 5,000 Gold
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-        // wands don't have ammo
-        if (!pItem || pItem->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_WAND)
-            return;
+                    ((Player*)unitTarget)->ModifyMoney(50000000);
+                    break;
+                }
+                case 45625:                                 // Arcane Chains: Character Force Cast
+                {
+                    if (!unitTarget)
+                        return;
 
-        if (pItem->GetProto()->InventoryType == INVTYPE_THROWN)
-        {
-            if(pItem->GetMaxStackCount()==1)
-            {
-                // decrease durability for non-stackable throw weapon
-                ((Player*)m_caster)->DurabilityPointLossForEquipSlot(EQUIPMENT_SLOT_RANGED);
-            }
-            else
-            {
-                // decrease items amount for stackable throw weapon
-                uint32 count = 1;
-                ((Player*)m_caster)->DestroyItemCount( pItem, count, true);
-            }
-        }
-        else if(uint32 ammo = ((Player*)m_caster)->GetUInt32Value(PLAYER_AMMO_ID))
-            ((Player*)m_caster)->DestroyItemCount(ammo, 1, true);
-    }
-}
+                    unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    break;
+                }
+/*                case 46671:                                 // Cleansing Flames Exodar
+                {
+                    if (!unitTarget)
+                        return;
 
-void Spell::EffectThreat(SpellEffectIndex /*eff_idx*/)
-{
-    if(!unitTarget || !unitTarget->isAlive() || !m_caster->isAlive())
-        return;
+                    unitTarget->CastSpell(unitTarget, 46690, true); // Create Flame of the Exodar
+                    break;
+                }
+                case 46672:                                 // Cleansing Flames Silvermoon
+                {
+                    if (!unitTarget)
+                        return;
 
-    if(!unitTarget->CanHaveThreatList())
-        return;
+                    unitTarget->CastSpell(unitTarget, 46689, true); // Create Flame of The Silvermoon
+                    break;
+                }*/
+                case 47097:                                 // Surge Needle Teleporter
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-    unitTarget->AddThreat(m_caster, float(damage), false, GetSpellSchoolMask(m_spellInfo), m_spellInfo);
-}
+                    if (unitTarget->GetAreaId() == 4157)
+                        unitTarget->CastSpell(unitTarget, 47324, true);
+                    else if (unitTarget->GetAreaId() == 4156)
+                        unitTarget->CastSpell(unitTarget, 47325, true);
 
-void Spell::EffectHealMaxHealth(SpellEffectIndex /*eff_idx*/)
-{
-    if(!unitTarget)
-        return;
-    if(!unitTarget->isAlive())
-        return;
+                    break;
+                }
+                case 47311:                                 // Quest - Jormungar Explosion Spell Spawner
+                {
+                    // Summons npc's. They are expected to summon GO from 47315
+                    // but there is no way to get the summoned, to trigger a spell
+                    // cast (workaround can be done with ai script).
 
-    uint32 heal = m_caster->GetMaxHealth();
+                    // Quest - Jormungar Explosion Summon Object
+                    for(int i = 0; i < 2; ++i)
+                        m_caster->CastSpell(m_caster, 47309, true);
 
-    m_healing += heal;
-}
+                    for(int i = 0; i < 2; ++i)
+                        m_caster->CastSpell(m_caster, 47924, true);
 
-void Spell::EffectInterruptCast(SpellEffectIndex /*eff_idx*/)
-{
-    if(!unitTarget)
-        return;
-    if(!unitTarget->isAlive())
-        return;
+                    for(int i = 0; i < 2; ++i)
+                        m_caster->CastSpell(m_caster, 47925, true);
 
-    // TODO: not all spells that used this effect apply cooldown at school spells
-    // also exist case: apply cooldown to interrupted cast only and to all spells
-    for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
-    {
-        if (Spell* spell = unitTarget->GetCurrentSpell(CurrentSpellTypes(i)))
-        {
-            SpellEntry const* curSpellInfo = spell->m_spellInfo;
-            // check if we can interrupt spell
-            if ((curSpellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_INTERRUPT) && curSpellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE )
-            {
-                unitTarget->ProhibitSpellSchool(GetSpellSchoolMask(curSpellInfo), GetSpellDuration(m_spellInfo));
-                unitTarget->InterruptSpell(CurrentSpellTypes(i),false);
-            }
-        }
-    }
-}
+                    return;
+                }
+                case 47393:                                 // The Focus on the Beach: Quest Completion Script
+                {
+                    if (!unitTarget)
+                        return;
 
-void Spell::EffectSummonObjectWild(SpellEffectIndex eff_idx)
-{
-    uint32 gameobject_id = m_spellInfo->EffectMiscValue[eff_idx];
+                    // Ley Line Information
+                    unitTarget->RemoveAurasDueToSpell(47391);
+                    return;
+                }
+                case 47615:                                 // Atop the Woodlands: Quest Completion Script
+                {
+                    if (!unitTarget)
+                        return;
 
-    GameObject* pGameObj = new GameObject;
+                    // Ley Line Information
+                    unitTarget->RemoveAurasDueToSpell(47473);
+                    return;
+                }
+                case 47638:                                 // The End of the Line: Quest Completion Script
+                {
+                    if (!unitTarget)
+                        return;
 
-    WorldObject* target = focusObject;
-    if( !target )
-        target = m_caster;
+                    // Ley Line Information
+                    unitTarget->RemoveAurasDueToSpell(47636);
+                    return;
+                }
+                case 47703:                                 // Unholy Union
+                {
+                    m_caster->CastSpell(m_caster, 50254, true);
+                    return;
+                }
+                case 47724:                                 // Frost Draw
+                {
+                    m_caster->CastSpell(m_caster, 50239, true);
+                    return;
+                }
+                case 48679:                                 // Banshee's Magic Mirror
+                {
+                    if (!unitTarget || m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-    float x, y, z;
-    if(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
-    {
-        x = m_targets.m_destX;
-        y = m_targets.m_destY;
-        z = m_targets.m_destZ;
-    }
-    else
-        m_caster->GetClosePoint(x, y, z, DEFAULT_WORLD_OBJECT_SIZE);
+                    unitTarget->CastSpell(m_caster, 48648, true);
+                    return;
+                }
+                case 47958:                                 // Crystal Spikes
+                case 57083:                                 // Crystal Spikes (h2)
+                {
+                    if (!unitTarget)
+                        return;
+                    // Summon Crystal Spike
 
-    Map *map = target->GetMap();
+                    m_caster->CastSpell(m_caster, 47954, true);
+                    m_caster->CastSpell(m_caster, 47955, true);
+                    m_caster->CastSpell(m_caster, 47956, true);
+                    m_caster->CastSpell(m_caster, 47957, true);
+                    return;
+                }
+                case 48590:                                 // Avenging Spirits (summon Avenging Spirit Summoners)
+                {
+                    if (!unitTarget)
+                        return;
 
-    if(!pGameObj->Create(map->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), gameobject_id, map,
-        m_caster->GetPhaseMask(), x, y, z, target->GetOrientation()))
-    {
-        delete pGameObj;
-        return;
-    }
+                    unitTarget->CastSpell(unitTarget, 48586, true);
+                    unitTarget->CastSpell(unitTarget, 48587, true);
+                    unitTarget->CastSpell(unitTarget, 48588, true);
+                    unitTarget->CastSpell(unitTarget, 48589, true);
+                    return;
+                }
+                case 48603:                                 // High Executor's Branding Iron
+                    // Torture the Torturer: High Executor's Branding Iron Impact
+                    unitTarget->CastSpell(unitTarget, 48614, true);
+                    return;
+                case 48724:                                 // The Denouncement: Commander Jordan On Death
+                case 48726:                                 // The Denouncement: Lead Cannoneer Zierhut On Death
+                case 48728:                                 // The Denouncement: Blacksmith Goodman On Death
+                case 48730:                                 // The Denouncement: Stable Master Mercer On Death
+                {
+                    // Compelled
+                    if (!unitTarget || !m_caster->HasAura(48714))
+                        return;
 
-    pGameObj->SetRespawnTime(m_duration > 0 ? m_duration/IN_MILLISECONDS : 0);
-    pGameObj->SetSpellId(m_spellInfo->Id);
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
+                }
+                // Gender spells
+                case 48762:                                 // A Fall from Grace: Scarlet Raven Priest Image - Master
+                case 45759:                                 // Warsong Orc Disguise
+                case 69672:                                 // Sunreaver Disguise
+                case 69673:                                 // Silver Covenant Disguise
+                {
+                    if (!unitTarget)
+                        return;
 
-    // Wild object not have owner and check clickable by players
-    map->Add(pGameObj);
+                    uint8 gender = unitTarget->getGender();
+                    uint32 spellId;
+                    switch (m_spellInfo->Id)
+                    {
+                        case 48762: spellId = (gender == GENDER_MALE ? 48763 : 48761); break;
+                        case 45759: spellId = (gender == GENDER_MALE ? 45760 : 45762); break;
+                        case 69672: spellId = (gender == GENDER_MALE ? 70974 : 70973); break;
+                        case 69673: spellId = (gender == GENDER_MALE ? 70972 : 70971); break;
+                        default: return;
+                    }
+                    unitTarget->CastSpell(unitTarget, spellId, true);
+                    return;
+                }
+                case 48810:                                 // Death's Door
+                {
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
 
-    // Store the GO to the caster
-    m_caster->AddWildGameObject(pGameObj);
+                    // Spell effect order will summon creature first and then apply invisibility to caster.
+                    // This result in that summoner/summoned can not see each other and that is not expected.
+                    // Aura from 48814 can be used as a hack from creature_addon, but we can not get the
+                    // summoned to cast this from this spell effect since we have no way to get pointer to creature.
+                    // Most proper would be to summon to same visibility mask as summoner, and not use spell at all.
 
-    if(pGameObj->GetGoType() == GAMEOBJECT_TYPE_FLAGDROP && m_caster->GetTypeId() == TYPEID_PLAYER)
-    {
-        Player *pl = (Player*)m_caster;
-        BattleGround* bg = ((Player *)m_caster)->GetBattleGround();
+                    // Binding Life
+                    m_caster->CastSpell(m_caster, 48809, true);
 
-        switch(pGameObj->GetMapId())
-        {
-            case 489:                                       //WS
-            {
-                if(bg && bg->GetTypeID()==BATTLEGROUND_WS && bg->GetStatus() == STATUS_IN_PROGRESS)
-                {
-                    Team team = pl->GetTeam() == ALLIANCE ? HORDE : ALLIANCE;
+                    // After (after: meaning creature does not have auras at creation)
+                    // creature is summoned and visible for player in map, it is expected to
+                    // gain two auras. First from 29266(aura slot0) and then from 48808(aura slot1).
+                    // We have no pointer to summoned, so only 48808 is possible from this spell effect.
 
-                    ((BattleGroundWS*)bg)->SetDroppedFlagGuid(pGameObj->GetObjectGuid(), team);
+                    // Binding Death
+                    m_caster->CastSpell(m_caster, 48808, true);
+                    return;
                 }
-                break;
-            }
-            case 566:                                       //EY
-            {
-                if(bg && bg->GetTypeID()==BATTLEGROUND_EY && bg->GetStatus() == STATUS_IN_PROGRESS)
+                case 48811:                                 // Despawn Forgotten Soul
                 {
-                    ((BattleGroundEY*)bg)->SetDroppedFlagGuid(pGameObj->GetObjectGuid());
-                }
-                break;
-            }
-        }
-    }
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                        return;
 
-    pGameObj->SummonLinkedTrapIfAny();
+                    if (!((Creature*)unitTarget)->IsTemporarySummon())
+                        return;
 
-    if (m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->AI())
-        ((Creature*)m_caster)->AI()->JustSummoned(pGameObj);
-    if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
-        ((Creature*)m_originalCaster)->AI()->JustSummoned(pGameObj);
-}
+                    TemporarySummon* pSummon = (TemporarySummon*)unitTarget;
 
-void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
-{
-    // TODO: we must implement hunter pet summon at login there (spell 6962)
+                    Unit::AuraList const& images = unitTarget->GetAurasByType(SPELL_AURA_MIRROR_IMAGE);
 
-    switch(m_spellInfo->SpellFamilyName)
-    {
-        case SPELLFAMILY_GENERIC:
-        {
-            switch(m_spellInfo->Id)
-            {
-                case 8856:                                  // Bending Shinbone
-                {
-                    if (!itemTarget && m_caster->GetTypeId()!=TYPEID_PLAYER)
+                    if (images.empty())
                         return;
 
-                    uint32 spell_id = 0;
-                    switch(urand(1, 5))
-                    {
-                        case 1:  spell_id = 8854; break;
-                        default: spell_id = 8855; break;
-                    }
+                    Unit* pCaster = images.front()->GetCaster();
+                    Unit* pSummoner = unitTarget->GetMap()->GetUnit(pSummon->GetSummonerGuid());
+
+                    if (pSummoner && pSummoner == pCaster)
+                        pSummon->UnSummon();
 
-                    m_caster->CastSpell(m_caster,spell_id,true,NULL);
                     return;
                 }
-                case 17512:                                 // Piccolo of the Flaming Fire
+                case 48917:                                 // Who Are They: Cast from Questgiver
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    unitTarget->HandleEmoteCommand(EMOTE_STATE_DANCE);
+                    // Male Shadowy Disguise / Female Shadowy Disguise
+                    unitTarget->CastSpell(unitTarget, unitTarget->getGender() == GENDER_MALE ? 38080 : 38081, true);
+                    // Shadowy Disguise
+                    unitTarget->CastSpell(unitTarget, 32756, true);
                     return;
                 }
-                case 20589:                                 // Escape artist
+                case 49380:                                 // Consume
+                case 59803:                                 // Consume (heroic)
                 {
                     if (!unitTarget)
                         return;
 
-                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
-                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
+                    // Each target hit buffs the caster
+                    unitTarget->CastSpell(m_caster, m_spellInfo->Id == 49380 ? 49381 : 59805, true, NULL, NULL, m_caster->GetObjectGuid());
                     return;
                 }
-                case 22539:                                 // Shadow Flame (All script effects, not just end ones to
-                case 22972:                                 // prevent player from dodging the last triggered spell)
-                case 22975:
-                case 22976:
-                case 22977:
-                case 22978:
-                case 22979:
-                case 22980:
-                case 22981:
-                case 22982:
-                case 22983:
-                case 22984:
-                case 22985:
+                case 49405:                                 //Invader Taunt Trigger
                 {
-                    if (!unitTarget || !unitTarget->isAlive())
+                    if (!unitTarget)
                         return;
 
-                    // Onyxia Scale Cloak
-                    if (unitTarget->GetDummyAura(22683))
+                    unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
+                }
+                case 50217:                                 // The Cleansing: Script Effect Player Cast Mirror Image
+                {
+                    // Summon Your Inner Turmoil
+                    m_caster->CastSpell(m_caster, 50167, true);
+
+                    // Spell 50218 has TARGET_SCRIPT, but other wild summons near may exist, and then target can become wrong
+                    // Only way to make this safe is to get the actual summoned by m_caster
+
+                    // Your Inner Turmoil's Mirror Image Aura
+                    m_caster->CastSpell(m_caster, 50218, true);
+
+                    return;
+                }
+                case 50218:                                 // The Cleansing: Your Inner Turmoil's Mirror Image Aura
+                {
+                    if (!m_originalCaster || m_originalCaster->GetTypeId() != TYPEID_PLAYER || !unitTarget)
                         return;
 
-                    // Shadow Flame
-                    m_caster->CastSpell(unitTarget, 22682, true);
+                    // determine if and what weapons can be copied
+                    switch(eff_idx)
+                    {
+                        case EFFECT_INDEX_1:
+                            if (((Player*)m_originalCaster)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND))
+                                unitTarget->CastSpell(m_originalCaster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+
+                            return;
+                        case EFFECT_INDEX_2:
+                            if (((Player*)m_originalCaster)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
+                                unitTarget->CastSpell(m_originalCaster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+
+                            return;
+                        default:
+                            return;
+                    }
+                    return;
+                }
+                case 50238:                                 // The Cleansing: Your Inner Turmoil's On Death Cast on Master
+                {
+                    if (m_caster->GetTypeId() != TYPEID_UNIT)
+                        return;
+
+                    if (((Creature*)m_caster)->IsTemporarySummon())
+                    {
+                        TemporarySummon* pSummon = (TemporarySummon*)m_caster;
+
+                        if (pSummon->GetSummonerGuid().IsPlayer())
+                        {
+                            Player* pSummoner = sObjectMgr.GetPlayer(pSummon->GetSummonerGuid());
+                            if (pSummoner)
+                                pSummoner->CastSpell(pSummoner, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                        }
+                    }
+
+                    return;
+                }
+                case 50252:                                 // Blood Draw
+                {
+                    m_caster->CastSpell(m_caster, 50250, true);
                     return;
                 }
-                case 24194:                                 // Uther's Tribute
-                case 24195:                                 // Grom's Tribute
+                case 50255:                                 // Poisoned Spear
+                case 59331:                                 // Poisoned Spear (heroic)
                 {
-                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget)
                         return;
 
-                    uint8 race = m_caster->getRace();
-                    uint32 spellId = 0;
-
-                    switch(m_spellInfo->Id)
-                    {
-                        case 24194:
-                            switch(race)
-                            {
-                                case RACE_HUMAN:            spellId = 24105; break;
-                                case RACE_DWARF:            spellId = 24107; break;
-                                case RACE_NIGHTELF:         spellId = 24108; break;
-                                case RACE_GNOME:            spellId = 24106; break;
-                                case RACE_DRAENEI:          spellId = 69533; break;
-                            }
-                            break;
-                        case 24195:
-                            switch(race)
-                            {
-                                case RACE_ORC:              spellId = 24104; break;
-                                case RACE_UNDEAD:           spellId = 24103; break;
-                                case RACE_TAUREN:           spellId = 24102; break;
-                                case RACE_TROLL:            spellId = 24101; break;
-                                case RACE_BLOODELF:         spellId = 69530; break;
-                            }
-                            break;
-                    }
-
-                    if (spellId)
-                        m_caster->CastSpell(m_caster, spellId, true);
-
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true, NULL, NULL, m_originalCasterGuid);
                     return;
                 }
-                case 24320:                                 // Poisonous Blood
+                case 50439:                                 // Script Cast Summon Image of Drakuru 05
                 {
-                    unitTarget->CastSpell(unitTarget, 24321, true, NULL, NULL, m_caster->GetObjectGuid());
+                    // TODO: check if summon already exist, if it does in this instance, return.
+
+                    // Summon Drakuru
+                    m_caster->CastSpell(m_caster, 50446, true);
                     return;
                 }
-                case 24590:                                 // Brittle Armor - need remove one 24575 Brittle Armor aura
-                    unitTarget->RemoveAuraHolderFromStack(24575);
+                case 50630:                                 // Eject All Passengers
+                {
+                    m_caster->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
                     return;
-                case 24714:                                 // Trick
+                }
+                case 50725:                                 // Vigilance - remove cooldown on Taunt
                 {
-                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                    Unit* caster = GetAffectiveCaster();
+                    if (!caster)
                         return;
 
-                    if (roll_chance_i(14))                  // Trick (can be different critter models). 14% since below can have 1 of 6
-                        m_caster->CastSpell(m_caster, 24753, true);
-                    else                                    // Random Costume, 6 different (plus add. for gender)
-                        m_caster->CastSpell(m_caster, 24720, true);
-
+                    caster->RemoveSpellCategoryCooldown(82, true);
                     return;
                 }
-                case 24717:                                 // Pirate Costume
+                case 50742:                                 // Ooze Combine
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
                         return;
 
-                    // Pirate Costume (male or female)
-                    m_caster->CastSpell(unitTarget, unitTarget->getGender() == GENDER_MALE ? 24708 : 24709, true);
+                    m_caster->CastSpell(unitTarget, 50747, true);
+                    ((Creature*)m_caster)->ForcedDespawn();
                     return;
                 }
-                case 24718:                                 // Ninja Costume
+                case 50810:                                 // Shatter
+                case 61546:                                 // Shatter (h)
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    // Ninja Costume (male or female)
-                    m_caster->CastSpell(unitTarget, unitTarget->getGender() == GENDER_MALE ? 24711 : 24710, true);
+                    if (!unitTarget->HasAura(50812))
+                        return;
+
+                    unitTarget->RemoveAurasDueToSpell(50812);
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->Id == 50810 ? 50811 : 61547 , true, NULL, NULL, m_caster->GetObjectGuid());
                     return;
                 }
-                case 24719:                                 // Leper Gnome Costume
+                case 50894:                                 // Zul'Drak Rat
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
                         return;
 
-                    // Leper Gnome Costume (male or female)
-                    m_caster->CastSpell(unitTarget, unitTarget->getGender() == GENDER_MALE ? 24712 : 24713, true);
+                    if (SpellAuraHolderPtr pHolder = unitTarget->GetSpellAuraHolder(m_spellInfo->Id))
+                    {
+                        if (pHolder->GetStackAmount() + 1 >= m_spellInfo->StackAmount)
+                        {
+                            // Gluttonous Lurkers: Summon Gorged Lurking Basilisk
+                            unitTarget->CastSpell(m_caster, 50928, true);
+                            ((Creature*)unitTarget)->ForcedDespawn(1);
+                        }
+                    }
+
                     return;
                 }
-                case 24720:                                 // Random Costume
+                case 51519:                                 // Death Knight Initiate Visual
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget)
                         return;
-
                     uint32 spellId = 0;
 
-                    switch(urand(0, 6))
+                    bool isMale = unitTarget->getGender() == GENDER_MALE;
+                    switch (unitTarget->getRace())
                     {
-                        case 0:
-                            spellId = unitTarget->getGender() == GENDER_MALE ? 24708 : 24709;
-                            break;
-                        case 1:
-                            spellId = unitTarget->getGender() == GENDER_MALE ? 24711 : 24710;
-                            break;
-                        case 2:
-                            spellId = unitTarget->getGender() == GENDER_MALE ? 24712 : 24713;
-                            break;
-                        case 3:
-                            spellId = 24723;
-                            break;
-                        case 4:
-                            spellId = 24732;
-                            break;
-                        case 5:
-                            spellId = unitTarget->getGender() == GENDER_MALE ? 24735 : 24736;
-                            break;
-                        case 6:
-                            spellId = 24740;
-                            break;
+                        case RACE_HUMAN:    spellId = isMale ? 51520 : 51534; break;
+                        case RACE_DWARF:    spellId = isMale ? 51538 : 51537; break;
+                        case RACE_NIGHTELF: spellId = isMale ? 51535 : 51536; break;
+                        case RACE_GNOME:    spellId = isMale ? 51539 : 51540; break;
+                        case RACE_DRAENEI:  spellId = isMale ? 51541 : 51542; break;
+                        case RACE_ORC:      spellId = isMale ? 51543 : 51544; break;
+                        case RACE_UNDEAD:   spellId = isMale ? 51549 : 51550; break;
+                        case RACE_TAUREN:   spellId = isMale ? 51547 : 51548; break;
+                        case RACE_TROLL:    spellId = isMale ? 51546 : 51545; break;
+                        case RACE_BLOODELF: spellId = isMale ? 51551 : 51552; break;
+                        default:
+                            return;
                     }
 
-                    m_caster->CastSpell(unitTarget, spellId, true);
+                    unitTarget->CastSpell(unitTarget, spellId, true);
                     return;
                 }
-                case 24737:                                 // Ghost Costume
+                case 51770:                                 // Emblazon Runeblade
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    Unit* caster = GetAffectiveCaster();
+                    if (!caster)
                         return;
 
-                    // Ghost Costume (male or female)
-                    m_caster->CastSpell(unitTarget, unitTarget->getGender() == GENDER_MALE ? 24735 : 24736, true);
-                    return;
+                    caster->CastSpell(caster, damage, false);
+                    break;
                 }
-                case 24751:                                 // Trick or Treat
+                case 51864:                                 // Player Summon Nass
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    // Tricked or Treated
-                    unitTarget->CastSpell(unitTarget, 24755, true);
+                    // Summon Nass
+                    if (const SpellEntry* pSpell = sSpellStore.LookupEntry(51865))
+                    {
+                        // Only if he is not already there
+                        if (!m_caster->FindGuardianWithEntry(pSpell->EffectMiscValue[EFFECT_INDEX_0]))
+                        {
+                            m_caster->CastSpell(m_caster, pSpell, true);
 
-                    // Treat / Trick
-                    unitTarget->CastSpell(unitTarget, roll_chance_i(50) ? 24714 : 24715, true);
+                            if (Pet* pPet = m_caster->FindGuardianWithEntry(pSpell->EffectMiscValue[EFFECT_INDEX_0]))
+                            {
+                                // Nass Periodic Say aura
+                                pPet->CastSpell(pPet, 51868, true);
+                            }
+                        }
+                    }
                     return;
                 }
-                case 25140:                                 // Orb teleport spells
-                case 25143:
-                case 25650:
-                case 25652:
-                case 29128:
-                case 29129:
-                case 35376:
-                case 35727:
+                case 51889:                                 // Quest Accept Summon Nass
                 {
-                    if (!unitTarget)
+                    // This is clearly for quest accept, is spell 51864 then for gossip and does pretty much the same thing?
+                    // Just "jumping" to what may be the "gossip-spell" for now, doing the same thing
+                    m_caster->CastSpell(m_caster, 51864, true);
+                    return;
+                }
+                case 51910:                                 // Kickin' Nass: Quest Completion
+                {
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    uint32 spellid;
-                    switch(m_spellInfo->Id)
+                    if (const SpellEntry* pSpell = sSpellStore.LookupEntry(51865))
                     {
-                        case 25140: spellid =  32568; break;
-                        case 25143: spellid =  32572; break;
-                        case 25650: spellid =  30140; break;
-                        case 25652: spellid =  30141; break;
-                        case 29128: spellid =  32571; break;
-                        case 29129: spellid =  32569; break;
-                        case 35376: spellid =  25649; break;
-                        case 35727: spellid =  35730; break;
-                        default:
-                            return;
+                        // Is this all to be done at completion?
+                        if (Pet* pPet = m_caster->FindGuardianWithEntry(pSpell->EffectMiscValue[EFFECT_INDEX_0]))
+                            pPet->Unsummon(PET_SAVE_AS_DELETED, m_caster);
                     }
-
-                    unitTarget->CastSpell(unitTarget,spellid,false);
                     return;
                 }
-                case 26004:                                 // Mistletoe
+                case 51904:                                 // Summon Ghouls Of Scarlet Crusade
                 {
                     if (!unitTarget)
                         return;
 
-                    unitTarget->HandleEmote(EMOTE_ONESHOT_CHEER);
-                    return;
+                    unitTarget->CastSpell(unitTarget, 54522, true);
+                    break;
                 }
-                case 26218:                                 // Mistletoe
+                case 52124:                                 // Sky Darkener Assault
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    if (unitTarget && unitTarget != m_caster)
+                        m_caster->CastSpell(unitTarget, 52125, false);
+                    break;
+                }
+                case 52357:                                 // Into the realm of shadows
+                {
+                    if (!unitTarget)
                         return;
 
-                    uint32 spells[3] = {26206, 26207, 45036};
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    break;
+                }
+                case 52479:                                 // The Gift That Keeps On Giving
+                {
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER || !unitTarget)
+                        return;
 
-                    m_caster->CastSpell(unitTarget, spells[urand(0, 2)], true);
+                    // Each ghoul casts 52500 onto player, so use number of auras as check
+                    Unit::SpellAuraHolderConstBounds bounds = m_caster->GetSpellAuraHolderBounds(52500);
+                    uint32 summonedGhouls = std::distance(bounds.first, bounds.second);
+
+                    m_caster->CastSpell(unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), urand(0, 2) || summonedGhouls >= 5 ? 52505 : m_spellInfo->CalculateSimpleValue(eff_idx), true);
                     return;
                 }
-                case 26275:                                 // PX-238 Winter Wondervolt TRAP
+                case 52555:                                 // Dispel Scarlet Ghoul Credit Counter
                 {
-                    uint32 spells[4] = {26272, 26157, 26273, 26274};
-
-                    // check presence
-                    for(int j = 0; j < 4; ++j)
-                        if (unitTarget->HasAura(spells[j], EFFECT_INDEX_0))
-                            return;
+                    if (!unitTarget)
+                        return;
 
-                    // cast
-                    unitTarget->CastSpell(unitTarget, spells[urand(0,3)], true);
+                    unitTarget->RemoveAurasByCasterSpell(m_spellInfo->CalculateSimpleValue(eff_idx), m_caster->GetObjectGuid());
                     return;
                 }
-                case 26465:                                 // Mercurial Shield - need remove one 26464 Mercurial Shield aura
-                    unitTarget->RemoveAuraHolderFromStack(26464);
+                case 52694:                                 // Recall Eye of Acherus
+                {
+                    if (!m_caster || m_caster->GetTypeId() != TYPEID_UNIT)
+                        return;
+                    m_caster->RemoveAurasDueToSpell(530);
                     return;
-                case 26656:                                 // Summon Black Qiraji Battle Tank
+                }
+                case 52751:                                 // Death Gate
                 {
-                    if (!unitTarget)
+                    if (!unitTarget || unitTarget->getClass() != CLASS_DEATH_KNIGHT)
                         return;
 
-                    // Prevent stacking of mounts
-                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+                    // triggered spell is stored in m_spellInfo->EffectBasePoints[0]
+                    unitTarget->CastSpell(unitTarget, damage, false);
+                    break;
+                }
+                case 52941:                                 // Song of Cleansing
+                {
+                    uint32 spellId = 0;
 
-                    // Two separate mounts depending on area id (allows use both in and out of specific instance)
-                    if (unitTarget->GetAreaId() == 3428)
-                        unitTarget->CastSpell(unitTarget, 25863, false);
-                    else
-                        unitTarget->CastSpell(unitTarget, 26655, false);
+                    switch(m_caster->GetAreaId())
+                    {
+                        case 4385: spellId = 52954; break;  // Bittertide Lake
+                        case 4290: spellId = 52958; break;  // River's Heart
+                        case 4388: spellId = 52959; break;  // Wintergrasp River
+                    }
+
+                    if (spellId)
+                        m_caster->CastSpell(m_caster, spellId, true);
+                    break;
+                }
+                case 53110:                                 // Devour Humanoid
+                {
+                    unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx),true, NULL, NULL, m_caster->GetObjectGuid());
+                    return;
+                }
+                case 53242:                                 // Clear Gift of Tharonja
+                {
+                    if (!unitTarget || !unitTarget->HasAura(52509))
+                        return;
 
+                    unitTarget->RemoveAurasDueToSpell(52509);
                     return;
                 }
-                case 27687:                                 // Summon Bone Minions
+                case 54182:                                 // An End to the Suffering: Quest Completion Script
                 {
                     if (!unitTarget)
                         return;
 
-                    // Spells 27690, 27691, 27692, 27693 are missing from DBC
-                    // So we need to summon creature 16119 manually
-                    float x, y, z;
-                    float angle = unitTarget->GetOrientation();
-                    for (uint8 i = 0; i < 4; ++i)
-                    {
-                        unitTarget->GetNearPoint(unitTarget, x, y, z, unitTarget->GetObjectBoundingRadius(), 5.0f, angle + i*M_PI_F/2);
-                        unitTarget->SummonCreature(16119, x, y, z, angle, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10*MINUTE*IN_MILLISECONDS);
-                    }
+                    // Remove aura (Mojo of Rhunok) given at quest accept / gossip
+                    unitTarget->RemoveAurasDueToSpell(51967);
                     return;
                 }
-                case 27695:                                 // Summon Bone Mages
+                case 54248:                                 // Drakuru Overlord Death
                 {
                     if (!unitTarget)
                         return;
 
-                    unitTarget->CastSpell(unitTarget, 27696, true);
-                    unitTarget->CastSpell(unitTarget, 27697, true);
-                    unitTarget->CastSpell(unitTarget, 27698, true);
-                    unitTarget->CastSpell(unitTarget, 27699, true);
+                    unitTarget->CastSpell(unitTarget, 52578, true); // Meat
+                    unitTarget->CastSpell(unitTarget, 52580, true); // Bones
+                    unitTarget->CastSpell(unitTarget, 52575, true); // Bones II
+                    unitTarget->CastSpell(unitTarget, 52578, true); // Meat
+                    unitTarget->CastSpell(unitTarget, 52580, true); // Bones
+                    unitTarget->CastSpell(unitTarget, 52575, true); // Bones II
+                    unitTarget->CastSpell(unitTarget, 54250, true); // Skull Missile
                     return;
                 }
-                case 28374:                                 // Decimate (Naxxramas: Gluth)
-                case 54426:                                 // Decimate (Naxxramas: Gluth (spells are identical))
-                case 71123:                                 // Decimate (ICC: Precious / Stinky)
+                case 54581:                                 // Mammoth Explosion Spell Spawner
                 {
-                    if (!unitTarget)
+                    if (m_caster->GetTypeId() != TYPEID_UNIT)
                         return;
 
-                    float downToHealthPercent = (m_spellInfo->Id != 71123 ? 5 : m_spellInfo->CalculateSimpleValue(eff_idx)) * 0.01f;
+                    // Summons misc npc's. They are expected to summon GO from 54625
+                    // but there is no way to get the summoned, to trigger a spell
+                    // cast (workaround can be done with ai script).
 
-                    int32 damage = unitTarget->GetHealth() - unitTarget->GetMaxHealth() * downToHealthPercent;
-                    if (damage > 0)
-                        m_caster->CastCustomSpell(unitTarget, 28375, &damage, NULL, NULL, true);
+                    // Quest - Mammoth Explosion Summon Object
+                    for(int i = 0; i < 2; ++i)
+                        m_caster->CastSpell(m_caster, 54623, true);
+
+                    for(int i = 0; i < 2; ++i)
+                        m_caster->CastSpell(m_caster, 54627, true);
+
+                    for(int i = 0; i < 2; ++i)
+                        m_caster->CastSpell(m_caster, 54628, true);
+
+                    // Summon Main Mammoth Meat
+                    m_caster->CastSpell(m_caster, 57444, true);
                     return;
                 }
-                case 28560:                                 // Summon Blizzard
+                case 54269:                                 // Drakkari Colossus, Elemental Despawn
                 {
-                    if (!unitTarget)
+                    if (!unitTarget || m_caster->GetTypeId() != TYPEID_UNIT)
                         return;
 
-                    m_caster->SummonCreature(16474, unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 30000);
+                    ((Creature*)m_caster)->ForcedDespawn(3000);
+                    m_caster->CastSpell(unitTarget, 54878, true); // Set Scale 0.1 And Stun
                     return;
                 }
-                case 28859:                                 // Cleansing Flames
-                case 29126:                                 // Cleansing Flames (Darnassus)
-                case 29135:                                 // Cleansing Flames (Ironforge)
-                case 29136:                                 // Cleansing Flames (Orgrimmar)
-                case 29137:                                 // Cleansing Flames (Stormwind)
-                case 29138:                                 // Cleansing Flames (Thunder Bluff)
-                case 29139:                                 // Cleansing Flames (Undercity)
-                case 46671:                                 // Cleansing Flames (Exodar)
-                case 46672:                                 // Cleansing Flames (Silvermoon)
+                case 54436:                                 // Demonic Empowerment (succubus Vanish effect)
                 {
-                    // Cleanse all magic, curse, disease and poison
                     if (!unitTarget)
                         return;
 
-                    unitTarget->RemoveAurasWithDispelType(DISPEL_MAGIC);
-                    unitTarget->RemoveAurasWithDispelType(DISPEL_CURSE);
-                    unitTarget->RemoveAurasWithDispelType(DISPEL_DISEASE);
-                    unitTarget->RemoveAurasWithDispelType(DISPEL_POISON);
-
+                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
+                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
+                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STALKED);
+                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STUN);
                     return;
                 }
-                case 29395:                                 // Break Kaliri Egg
+                // Glyph of Starfire
+                case 54846:
                 {
-                    uint32 creature_id = 0;
-                    uint32 rand = urand(0, 99);
-
-                    if (rand < 10)
-                        creature_id = 17034;
-                    else if (rand < 60)
-                        creature_id = 17035;
-                    else
-                        creature_id = 17039;
+                    Aura* aura = unitTarget->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, CF_DRUID_MOONFIRE>(m_caster->GetObjectGuid());
+                    if (aura)
+                    {
+                        uint32 countMin = aura->GetAuraMaxDuration();
+                        uint32 countMax = GetSpellMaxDuration(aura->GetSpellProto());
+                        countMax += 9000;
+                        countMax += m_caster->HasAura(38414) ? 3000 : 0;
+                        countMax += m_caster->HasAura(57865) ? 3000 : 0;
 
-                    if (WorldObject* pSource = GetAffectiveCasterObject())
-                        pSource->SummonCreature(creature_id, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120*IN_MILLISECONDS);
+                        if (countMin < countMax)
+                        {
+                            aura->GetHolder()->SetAuraDuration(aura->GetAuraDuration() + 3000);
+                            aura->GetHolder()->SetAuraMaxDuration(countMin + 3000);
+                            aura->GetHolder()->SendAuraUpdate(false);
+                        }
+                    }
                     return;
                 }
-                case 29830:                                 // Mirren's Drinking Hat
+                case 55328:                                    // Stoneclaw Totem I
+                case 55329:                                    // Stoneclaw Totem II
+                case 55330:                                    // Stoneclaw Totem III
+                case 55332:                                    // Stoneclaw Totem IV
+                case 55333:                                    // Stoneclaw Totem V
+                case 55335:                                    // Stoneclaw Totem VI
+                case 55278:                                    // Stoneclaw Totem VII
+                case 58589:                                    // Stoneclaw Totem VIII
+                case 58590:                                    // Stoneclaw Totem IX
+                case 58591:                                    // Stoneclaw Totem X
                 {
-                    uint32 item = 0;
-                    switch ( urand(1, 6) )
+                    if (!unitTarget)    // Stoneclaw Totem owner
+                        return;
+
+                    // Absorb shield for totems
+                    for(int itr = 0; itr < MAX_TOTEM_SLOT; ++itr)
+                        if (Totem* totem = unitTarget->GetTotem(TotemSlot(itr)))
+                            m_caster->CastCustomSpell(totem, 55277, &damage, NULL, NULL, true);
+                    // Glyph of Stoneclaw Totem
+                    if (Aura* auraGlyph = unitTarget->GetAura(63298, EFFECT_INDEX_0))
                     {
-                        case 1:
-                        case 2:
-                        case 3:
-                            item = 23584; break;            // Loch Modan Lager
-                        case 4:
-                        case 5:
-                            item = 23585; break;            // Stouthammer Lite
-                        case 6:
-                            item = 23586; break;            // Aerie Peak Pale Ale
+                        int32 playerAbsorb = damage * auraGlyph->GetModifier()->m_amount;
+                        m_caster->CastCustomSpell(unitTarget, 55277, &playerAbsorb, NULL, NULL, true);
                     }
-
-                    if (item)
-                        DoCreateItem(eff_idx,item);
-
-                    break;
+                    return;
                 }
-                case 30918:                                 // Improved Sprint
+                case 55299:                                 // Galdarah Transform to Troll!
+                {
+                    m_caster->RemoveAurasDueToSpell(55297);
+                    return;
+                }
+                case 55693:                                 // Remove Collapsing Cave Aura
                 {
                     if (!unitTarget)
                         return;
 
-                    // Removes snares and roots.
-                    unitTarget->RemoveAurasAtMechanicImmunity(IMMUNE_TO_ROOT_AND_SNARE_MASK,30918,true);
+                    unitTarget->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(eff_idx));
                     break;
                 }
-                case 32301:                                 // Ping Shirrak
+                case 56072:                                 // Ride Red Dragon Buddy
                 {
                     if (!unitTarget)
                         return;
 
-                    // Cast Focus fire on caster
-                    unitTarget->CastSpell(m_caster, 32300, true);
-                    return;
+                    m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    break;
                 }
-                case 38358:                                 // Tidal Surge
+                case 56659:                                 //  Build Demolisher (Force)
+                case 56662:                                 //  Build Siege Vehicle (Force) - alliance
+                case 56664:                                 //  Build Catapult (Force)
+                case 61409:                                 //  Build Siege Vehicle (Force) - horde
                 {
-                    if (!unitTarget)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    unitTarget->CastSpell(unitTarget, 38353, true, NULL, NULL, m_caster->GetObjectGuid());
-                    return;
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    break;
                 }
-                case 41055:                                 // Copy Weapon
+                case 57082:                                 // Crystal Spikes (h1)
                 {
-                    if (m_caster->GetTypeId() != TYPEID_UNIT || !unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget)
                         return;
 
-                    if (Item* pItem = ((Player*)unitTarget)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND))
-                    {
-                        ((Creature*)m_caster)->SetVirtualItem(VIRTUAL_ITEM_SLOT_0, pItem->GetEntry());
-
-                        // Unclear what this spell should do
-                        unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
-                    }
-
+                    unitTarget->CastSpell(unitTarget, 57077, true);
+                    unitTarget->CastSpell(unitTarget, 57078, true);
+                    unitTarget->CastSpell(unitTarget, 57080, true);
+                    unitTarget->CastSpell(unitTarget, 57081, true);
                     return;
                 }
-                case 41126:                                 // Flame Crash
+                case 57337:                                 // Great Feast
                 {
                     if (!unitTarget)
                         return;
 
-                    unitTarget->CastSpell(unitTarget, 41131, true);
+                    unitTarget->CastSpell(unitTarget, 58067, true);
                     break;
                 }
-                case 43365:                                 // The Cleansing: Shrine Cast
+                case 57397:                                 // Fish Feast
                 {
-                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget)
                         return;
 
-                    // Script Effect Player Cast Mirror Image
-                    m_caster->CastSpell(m_caster, 50217, true);
-                    return;
+                    unitTarget->CastSpell(unitTarget, 58648, true);
+                    unitTarget->CastSpell(unitTarget, 57398, true);
+                    break;
                 }
-                case 43375:                                 // Mixing Vrykul Blood
+                case 58466:                                 // Gigantic Feast
+                case 58475:                                 // Small Feast
                 {
                     if (!unitTarget)
                         return;
 
-                    uint32 triggeredSpell[] = {43376, 43378, 43970, 43377};
-
-                    unitTarget->CastSpell(unitTarget, triggeredSpell[urand(0, 3)], true);
-                    return;
+                    unitTarget->CastSpell(unitTarget, 57085, true);
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->Id == 58475 ? 58477 : 58467, true);
+                    break;
                 }
-                case 44364:                                 // Rock Falcon Primer
+                case 58418:                                 // Portal to Orgrimmar
+                case 58420:                                 // Portal to Stormwind
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || eff_idx != EFFECT_INDEX_0)
                         return;
 
-                    // Are there anything special with this, a random chance or condition?
-                    // Feeding Rock Falcon
-                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true, NULL, NULL, unitTarget->GetObjectGuid(), m_spellInfo);
+                    uint32 spellID = m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_0);
+                    uint32 questID = m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_1);
+
+                    if (((Player*)unitTarget)->GetQuestStatus(questID) == QUEST_STATUS_COMPLETE && !((Player*)unitTarget)->GetQuestRewardStatus (questID))
+                        unitTarget->CastSpell(unitTarget, spellID, true);
                     return;
                 }
-                case 44455:                                 // Character Script Effect Reverse Cast
+                case 58941:                                 // Rock Shards (Vault of Archavon, Archavon)
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
-                        return;
-
-                    Creature* pTarget = (Creature*)unitTarget;
-
-                    if (const SpellEntry *pSpell = sSpellStore.LookupEntry(m_spellInfo->CalculateSimpleValue(eff_idx)))
+                    if (Unit* pTarget = m_caster->GetMap()->GetUnit(m_caster->GetChannelObjectGuid()))
                     {
-                        // if we used item at least once...
-                        if (pTarget->IsTemporarySummon() && int32(pTarget->GetEntry()) == pSpell->EffectMiscValue[eff_idx])
+                        for (uint8 i = 0; i < 3; ++i)   // Trigger three spikes from each hand
                         {
-                            TemporarySummon* pSummon = (TemporarySummon*)pTarget;
-
-                            // can only affect "own" summoned
-                            if (pSummon->GetSummonerGuid() == m_caster->GetObjectGuid())
-                            {
-                                if (pTarget->hasUnitState(UNIT_STAT_ROAMING | UNIT_STAT_ROAMING_MOVE))
-                                    pTarget->GetMotionMaster()->MovementExpired();
-
-                                // trigger cast of quest complete script (see code for this spell below)
-                                pTarget->CastSpell(pTarget, 44462, true);
-
-                                pTarget->GetMotionMaster()->MovePoint(0, m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ());
-                            }
-
-                            return;
+                            m_caster->CastSpell(pTarget, 58689, true);
+                            m_caster->CastSpell(pTarget, 58692, true);
                         }
-
-                        // or if it is first time used item, cast summon and despawn the target
-                        m_caster->CastSpell(pTarget, pSpell, true);
-                        pTarget->ForcedDespawn();
-
-                        // TODO: here we should get pointer to the just summoned and make it move.
-                        // without, it will be one extra use of quest item
                     }
-
                     return;
                 }
-                case 44462:                                 // Cast Quest Complete on Master
+                case 59317:                                 // Teleporting
                 {
-                    if (m_caster->GetTypeId() != TYPEID_UNIT)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    Creature* pQuestCow = NULL;
-
-                    float range = 20.0f;
-
-                    // search for a reef cow nearby
-                    MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*m_caster, 24797, true, false, range);
-                    MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(pQuestCow, u_check);
+                    // return from top
+                    if (((Player*)unitTarget)->GetAreaId() == 4637)
+                        unitTarget->CastSpell(unitTarget, 59316, true);
+                    // teleport atop
+                    else
+                        unitTarget->CastSpell(unitTarget, 59314, true);
+                    return;
+                }
+                case 58916:                                 // Gift of the Lich King
+                {
+                    if (!unitTarget || unitTarget->isAlive())
+                        return;
 
-                    Cell::VisitGridObjects(m_caster, searcher, range);
+                    m_caster->CastSpell(unitTarget, 58915, true);
+                    if (unitTarget->GetTypeId() == TYPEID_UNIT)
+                        ((Creature*)unitTarget)->RemoveCorpse();
 
-                    // no cows found, so return
-                    if (!pQuestCow)
+                    if (Unit* master = m_caster->GetCharmerOrOwner())
+                        master->CastSpell(master, 58987, true);
+                    return;
+                }
+                case 58917:                                 // Consume minions
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
                         return;
 
-                    if (!((Creature*)m_caster)->IsTemporarySummon())
+                    m_caster->CastSpell(unitTarget, 58919, true);
+                    return;
+                }                                           // random spell learn instead placeholder
+                case 59789:                                 // Oracle Ablutions
+                {
+                    if (!unitTarget)
                         return;
 
-                    if (const SpellEntry *pSpell = sSpellStore.LookupEntry(m_spellInfo->CalculateSimpleValue(eff_idx)))
+                    switch (unitTarget->GetPowerType())
                     {
-                        TemporarySummon* pSummon = (TemporarySummon*)m_caster;
-
-                        // all ok, so make summoner cast the quest complete
-                        if (Unit* pSummoner = pSummon->GetSummoner())
-                            pSummoner->CastSpell(pSummoner, pSpell, true);
+                        case POWER_RUNIC_POWER:
+                        {
+                            unitTarget->CastSpell(unitTarget, 59812, true);
+                            break;
+                        }
+                        case POWER_MANA:
+                        {
+                            int32 manapool = unitTarget->GetMaxPower(POWER_MANA) * 0.05;
+                            unitTarget->CastCustomSpell(unitTarget, 59813, &manapool, NULL, NULL, true);
+                            break;
+                        }
+                        case POWER_RAGE:
+                        {
+                            unitTarget->CastSpell(unitTarget, 59814, true);
+                            break;
+                        }
+                        case POWER_ENERGY:
+                        {
+                            unitTarget->CastSpell(unitTarget, 59815, true);
+                            break;
+                        }
+                        default:
+                            break;
                     }
-
                     return;
                 }
-                case 44876:                                 // Force Cast - Portal Effect: Sunwell Isle
+                case 62042:                                 // Stormhammer
                 {
-                    if (!unitTarget)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    unitTarget->CastSpell(unitTarget, 44870, true);
-                    break;
+                    unitTarget->CastSpell(unitTarget, 62470, true);
+                    unitTarget->CastSpell(m_caster, 64909, true);
+                    return;
                 }
-                case 44811:                                 // Spectral Realm
+                case 62217:                                 // Unstable Energy
+                case 62922:                                 // Unstable Energy (h)
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
-                        return;
-
-                    // If the player can't be teleported, send him a notification
-                    if (unitTarget->HasAura(44867))
-                    {
-                        ((Player*)unitTarget)->GetSession()->SendNotification(LANG_FAIL_ENTER_SPECTRAL_REALM);
+                    if (!unitTarget)
                         return;
-                    }
 
-                    // Teleport target to the spectral realm, add debuff and force faction
-                    unitTarget->CastSpell(unitTarget, 44852, true);
-                    unitTarget->CastSpell(unitTarget, 46019, true);
-                    unitTarget->CastSpell(unitTarget, 46021, true);
+                    unitTarget->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(eff_idx));
                     return;
                 }
-                case 45141:                                 // Burn
+                case 62262:                                 // Brightleaf Flux
                 {
                     if (!unitTarget)
                         return;
 
-                    unitTarget->CastSpell(unitTarget, 46394, true, NULL, NULL, m_caster->GetObjectGuid());
+                    if (unitTarget->HasAura(62239))
+                        unitTarget->RemoveAurasDueToSpell(62239);
+                    else
+                    {
+                        uint32 stackAmount = urand(1, GetSpellStore()->LookupEntry(62239)->StackAmount);
+
+                        for (uint8 i = 0; i < stackAmount; ++i)
+                            unitTarget->CastSpell(unitTarget, 62239, true);
+                    }
                     return;
                 }
-                case 45151:                                 // Burn
+                case 62282:                                 // Iron Roots
+                case 62440:                                 // Strengthened Iron Roots
+                case 63598:                                 // Iron Roots (h)
+                case 63601:                                 // Strengthened Iron Roots (h)
                 {
-                    if (!unitTarget || unitTarget->HasAura(46394))
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || !((Creature*)unitTarget)->IsTemporarySummon())
                         return;
 
-                    // Make the burn effect jump to another friendly target
-                    unitTarget->CastSpell(unitTarget, 46394, true);
+                    uint32 ownerAura = 0;
+
+                    switch (m_spellInfo->Id)
+                    {
+                        case 62282: ownerAura = 62283; break;
+                        case 62440: ownerAura = 62438; break;
+                        case 63598: ownerAura = 62930; break;
+                        case 63601: ownerAura = 62861; break;
+                    };
+
+                    if (Unit* summoner = unitTarget->GetMap()->GetUnit(((TemporarySummon*)unitTarget)->GetSummonerGuid()))
+                        summoner->RemoveAurasDueToSpell(ownerAura);
                     return;
                 }
-                case 45185:                                 // Stomp
+                case 62381:                                 // Chill
                 {
                     if (!unitTarget)
                         return;
 
-                    // Remove the burn effect
-                    unitTarget->RemoveAurasDueToSpell(46394);
+                    unitTarget->RemoveAurasDueToSpell(62373);
+                    unitTarget->CastSpell(unitTarget, 62382, true);
                     return;
                 }
-                case 45204:                                 // Clone Me!
+                case 62428:                                 // Load into Catapult
                 {
                     if (!unitTarget)
                         return;
 
-                    unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    m_caster->CastSpell(m_caster, 62340, true);
                     return;
                 }
-                case 45206:                                 // Copy Off-hand Weapon
+                case 62488:                                 // Activate Construct
                 {
-                    if (m_caster->GetTypeId() != TYPEID_UNIT || !unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget || !unitTarget->HasAura(62468))
                         return;
 
-                    if (Item* pItem = ((Player*)unitTarget)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
-                    {
-                        ((Creature*)m_caster)->SetVirtualItem(VIRTUAL_ITEM_SLOT_1, pItem->GetEntry());
-
-                        // Unclear what this spell should do
-                        unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
-                    }
+                    unitTarget->RemoveAurasDueToSpell(62468);
+                    unitTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    unitTarget->CastSpell(unitTarget, 64474, true);
 
+                    if (Unit* pVictim = m_caster->getVictim())
+                        ((Creature*)unitTarget)->AI()->AttackStart(pVictim);
                     return;
                 }
-                case 45668:                                 // Ultra-Advanced Proto-Typical Shortening Blaster
+                case 62524:                                 // Attuned to Nature 2 Dose Reduction
+                case 62525:                                 // Attuned to Nature 10 Dose Reduction
+                case 62521:                                 // Attuned to Nature 25 Dose Reduction
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
-                        return;
-
-                    if (roll_chance_i(25))                  // chance unknown, using 25
+                    if (!unitTarget)
                         return;
 
-                    static uint32 const spellPlayer[5] =
-                    {
-                        45674,                              // Bigger!
-                        45675,                              // Shrunk
-                        45678,                              // Yellow
-                        45682,                              // Ghost
-                        45684                               // Polymorph
-                    };
+                    uint32 numStacks = 0;
 
-                    static uint32 const spellTarget[5] =
+                    switch(m_spellInfo->Id)
                     {
-                        45673,                              // Bigger!
-                        45672,                              // Shrunk
-                        45677,                              // Yellow
-                        45681,                              // Ghost
-                        45683                               // Polymorph
+                        case 62524: numStacks = 2;  break;
+                        case 62525: numStacks = 10; break;
+                        case 62521: numStacks = 25; break;
                     };
 
-                    m_caster->CastSpell(m_caster, spellPlayer[urand(0,4)], true);
-                    unitTarget->CastSpell(unitTarget, spellTarget[urand(0,4)], true);
-
+                    uint32 spellId = m_spellInfo->CalculateSimpleValue(eff_idx);
+                    unitTarget->RemoveAuraHolderFromStack(spellId, numStacks);
                     return;
                 }
-                case 45691:                                 // Magnataur On Death 1
+                case 62688:                                 // Summon Wave - 10 Mob
                 {
-                    // assuming caster is creature, if not, then return
-                    if (m_caster->GetTypeId() != TYPEID_UNIT)
-                        return;
-
-                    Player* pPlayer = ((Creature*)m_caster)->GetOriginalLootRecipient();
+                    uint32 spellId = m_spellInfo->CalculateSimpleValue(eff_idx);
 
-                    if (!pPlayer)
+                    for (uint32 i = 0; i < 10; ++i)
+                        m_caster->CastSpell(m_caster, spellId, true);
+                    return;
+                }
+                case 63845:                                 // Create lance
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    if (pPlayer->HasAura(45674) || pPlayer->HasAura(45675) || pPlayer->HasAura(45678) || pPlayer->HasAura(45682) || pPlayer->HasAura(45684))
-                        pPlayer->CastSpell(pPlayer, 45686, true);
+                    uint32 spellid;
 
-                    m_caster->CastSpell(m_caster, 45685, true);
+                    if (((Player*)unitTarget)->GetTeam() == HORDE)
+                       spellid = 63919;
+                    else
+                       spellid = 63914;
 
+                    unitTarget->CastSpell(unitTarget, spellid, true);
                     return;
                 }
-                case 45713:                                 // Naked Caravan Guard - Master Transform
+                                                            // random spell learn instead placeholder
+                case 60893:                                 // Northrend Alchemy Research
+                case 61177:                                 // Northrend Inscription Research
+                case 61288:                                 // Minor Inscription Research
+                case 61756:                                 // Northrend Inscription Research (FAST QA VERSION)
+                case 64323:                                 // Book of Glyph Mastery
                 {
-                    if (m_caster->GetTypeId() != TYPEID_UNIT)
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    const CreatureInfo* cTemplate = NULL;
-
-                    switch(m_caster->GetEntry())
+                    // learn random explicit discovery recipe (if any)
+                    if (uint32 discoveredSpell = sSpellMgr.GetExplicitDiscoverySpell(m_spellInfo->Id, (Player*)m_caster))
                     {
-                        case 25342: cTemplate = ObjectMgr::GetCreatureTemplate(25340); break;
-                        case 25343: cTemplate = ObjectMgr::GetCreatureTemplate(25341); break;
+                        ((Player*)m_caster)->learnSpell(discoveredSpell, false);
+                        ((Player*)m_caster)->UpdateCraftSkill(m_spellInfo->Id);
                     }
 
-                    if (!cTemplate)
-                        return;
-
-                    uint32 display_id = 0;
-
-                    // Spell is designed to be used in creature addon.
-                    // This makes it possible to set proper model before adding to map.
-                    // For later, spell is used in gossip (with following despawn,
-                    // so addon can reload the default model and data again).
+                    return;
+                }
+                case 60123: // Lightwell
+                {
+                   if (m_caster->GetTypeId() != TYPEID_UNIT)
+                       return;
 
-                    // It should be noted that additional spell id's have been seen in relation to this spell, but
-                    // those does not exist in client (45701 (regular spell), 45705-45712 (auras), 45459-45460 (auras)).
-                    // We can assume 45705-45712 are transform auras, used instead of hard coded models in the below code.
+                    uint32 spellID;
+                    uint32 entry  = m_caster->GetEntry();
 
-                    // not in map yet OR no npc flags yet (restored after LoadCreatureAddon for respawn cases)
-                    if (!m_caster->IsInMap(m_caster) || m_caster->GetUInt32Value(UNIT_NPC_FLAGS) == UNIT_NPC_FLAG_NONE)
+                    switch(entry)
                     {
-                        display_id = Creature::ChooseDisplayId(cTemplate);
-                        ((Creature*)m_caster)->LoadEquipment(((Creature*)m_caster)->GetEquipmentId());
+                        case 31897: spellID = 7001; break;   // Lightwell Renew Rank 1
+                        case 31896: spellID = 27873; break;  // Lightwell Renew Rank 2
+                        case 31895: spellID = 27874; break;  // Lightwell Renew Rank 3
+                        case 31894: spellID = 28276; break;  // Lightwell Renew Rank 4
+                        case 31893: spellID = 48084; break;  // Lightwell Renew Rank 5
+                        case 31883: spellID = 48085; break;  // Lightwell Renew Rank 6
+                        default:
+                            sLog.outError("Unknown Lightwell spell caster %u", m_caster->GetEntry());
+                            return;
                     }
-                    else
+                    Aura* chargesaura = m_caster->GetAura(59907, EFFECT_INDEX_0);
+                    if (chargesaura && chargesaura->GetHolder() && chargesaura->GetHolder()->GetAuraCharges() >= 1)
                     {
-                        m_caster->SetUInt32Value(UNIT_NPC_FLAGS, cTemplate->npcflag);
-                        ((Creature*)m_caster)->SetVirtualItem(VIRTUAL_ITEM_SLOT_0, 0);
-                        ((Creature*)m_caster)->SetVirtualItem(VIRTUAL_ITEM_SLOT_1, 0);
-
-                        switch(m_caster->GetDisplayId())
-                        {
-                            case 23246: display_id = 23245; break;
-                            case 23247: display_id = 23250; break;
-                            case 23248: display_id = 23251; break;
-                            case 23249: display_id = 23252; break;
-                            case 23124: display_id = 23253; break;
-                            case 23125: display_id = 23254; break;
-                            case 23126: display_id = 23255; break;
-                            case 23127: display_id = 23256; break;
-                        }
+                        chargesaura->GetHolder()->SetAuraCharges(chargesaura->GetHolder()->GetAuraCharges() - 1);
+                        m_caster->CastSpell(unitTarget, spellID, false, NULL, NULL);
                     }
+                    else
+                        ((TemporarySummon*)m_caster)->UnSummon();
 
-                    m_caster->SetDisplayId(display_id);
                     return;
                 }
-                case 45958:                                 // Signal Alliance
+                case 60603:                                 // Eject Passenger 1
+                case 64629:                                 // Eject Passenger 1 (with visual eff)
+                case 68183:                                 // Eject Passenger 1
+                case 62539:                                 // Eject Passenger 2
+                case 64630:                                 // Eject Passenger 2 (with visual eff)
+                case 64631:                                 // Eject Passenger 3 (with visual eff)
+                case 52205:                                 // Eject Passenger 3
+                case 64614:                                 // Eject Passenger 4
+                case 64632:                                 // Eject Passenger 4 (with visual eff)
+                case 64633:                                 // Eject Passenger 5 (with visual eff)
+                case 64634:                                 // Eject Passenger 6 (with visual eff)
+                case 64635:                                 // Eject Passenger 7 (with visual eff)
+                case 64636:                                 // Eject Passenger 8 (with visual eff)
                 {
-                    // "escort" aura not present, so let nothing happen
-                    if (!m_caster->HasAura(m_spellInfo->CalculateSimpleValue(eff_idx)))
+                    if (!unitTarget)
                         return;
-                    // "escort" aura is present so break; and let DB table spell_scripts be used and process further.
-                    else
-                        break;
+
+                    int8 seatId;
+                    switch (m_spellInfo->Id)
+                    {
+                        case 60603:
+                        case 68183:
+                            seatId = 0;
+                            break;
+                        case 52205:
+                            seatId = 2;
+                            break;
+                        default:
+                            seatId = m_spellInfo->EffectBasePoints[EFFECT_INDEX_0];
+                            break;
+                    }
+
+                    unitTarget->EjectVehiclePassenger(seatId);
+                    return;
                 }
-                case 46203:                                 // Goblin Weather Machine
+                case 61263:                                 //Intravenous Healing Potion
+                {
+                    m_caster->CastSpell(unitTarget, 61828, true);
+                    break;
+                }
+                case 62536:                                 // Frog Kiss (quest Blade fit for a champion)
                 {
                     if (!unitTarget)
                         return;
+                                                            // remove Warts!
+                    unitTarget->RemoveAurasDueToSpell(62581);
+                    if (!unitTarget->HasAura(62574))        // if not protected by potion cast Warts!
+                        m_caster->CastSpell(unitTarget, 62581, true);
+                                                            // remove protective aura
+                    unitTarget->RemoveAurasDueToSpell(62574);
 
-                    uint32 spellId = 0;
-                    switch(rand() % 4)
-                    {
-                        case 0: spellId = 46740; break;
-                        case 1: spellId = 46739; break;
-                        case 2: spellId = 46738; break;
-                        case 3: spellId = 46736; break;
-                    }
-                    unitTarget->CastSpell(unitTarget, spellId, true);
+                    m_caster->GetMotionMaster()->MoveFollow(unitTarget, PET_FOLLOW_DIST, unitTarget->GetAngle(m_caster));
                     break;
                 }
-                case 46642:                                 //5,000 Gold
+                case 62705:                                 // Auto-repair (Ulduar: RX-214)
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget || !unitTarget->IsVehicle())
                         return;
 
-                    ((Player*)unitTarget)->ModifyMoney(50000000);
+                    unitTarget->SetHealthPercent(m_spellInfo->CalculateSimpleValue(eff_idx));
                     break;
                 }
-                case 47097:                                 // Surge Needle Teleporter
+                case 62707:                                 // Grab (Ulduar: Ignis)
+                case 63535:                                 // Grab heroic
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget || !m_caster)
                         return;
 
-                    if (unitTarget->GetAreaId() == 4157)
-                        unitTarget->CastSpell(unitTarget, 47324, true);
-                    else if (unitTarget->GetAreaId() == 4156)
-                        unitTarget->CastSpell(unitTarget, 47325, true);
+                    unitTarget->CastSpell(m_caster, 62708, true); // Control Vehicle aura
+                    m_caster->CastSpell(unitTarget, (m_spellInfo->Id == 62707) ? 62717 : 63477, true); // DoT/Immunity
+                    break;
+                }
+                case 63027:                                 // Proximity Mines for Mimiron Encounter
+                {
+                    if (!unitTarget)
+                        return;
 
+                    for(uint8 i = 0; i < urand(8, 10); ++i)
+                    {
+                        unitTarget->CastSpell(unitTarget, 65347, true);
+                    }
                     break;
                 }
-                case 47311:                                 // Quest - Jormungar Explosion Spell Spawner
+                case 63633:                                 // Summon Rubble (Kologarn)
                 {
-                    // Summons npc's. They are expected to summon GO from 47315
-                    // but there is no way to get the summoned, to trigger a spell
-                    // cast (workaround can be done with ai script).
+                    if (!unitTarget)
+                        return;
 
-                    // Quest - Jormungar Explosion Summon Object
-                    for(int i = 0; i < 2; ++i)
-                        m_caster->CastSpell(m_caster, 47309, true);
+                    for (uint8 i = 0; i < 5; ++i)
+                    {
+                        unitTarget->CastSpell(unitTarget, 63634, true);
+                    }
+                    break;
+                }
+                case 63795:                                 // Psychosis normal (Ulduar - Yogg Saron)
+                case 65301:                                 // Psychosis heroic (Ulduar - Yogg Saron)
+                case 64164:                                 // Lunatic Gaze spell from Yogg Saron
+                case 64168:                                 // Lunatic Gaze spell from Laughing Skull
+                case 64059:                                 // Induce Madness
+                case 63830:                                 // Malady of the Mind
+                case 63881:
+                case 63803:                                 // Brain Link
+                {
+                    if (!unitTarget)
+                        return;
 
-                    for(int i = 0; i < 2; ++i)
-                        m_caster->CastSpell(m_caster, 47924, true);
+                    if (SpellAuraHolderPtr holder = unitTarget->GetSpellAuraHolder(63050))
+                    {
+                        int32 stacks = 0;
+                        switch (m_spellInfo->Id)
+                        {
+                            case 63795: stacks = -9;
+                                break;                      // Psychosis; remove!?, more script Effect basepoints 63988
+                            case 65301: stacks = -12;
+                                break;                      // Psychosis; remove!?, more script Effect basepoints 63988
+                            case 64164: stacks = -4;
+                                break;                      // Lunatic Gaze
+                            case 64168:
+                            case 63803: stacks = -2;
+                                break;                      // Brain Link
+                            case 63830:                     // Induce Madness; 65201 (Crush) as basepoints !?
+                            case 63881: stacks = -3;
+                                break;
+                            case 64059:                     // remove!?, more script Effect basepoints 63988
+                            {
+                                if (unitTarget->GetPositionZ() > 245.0f)
+                                    return;
+                                stacks = -100; break;
+                            }
+                        }
+                        int32 stackAmount = holder->GetStackAmount() + stacks;
 
-                    for(int i = 0; i < 2; ++i)
-                        m_caster->CastSpell(m_caster, 47925, true);
+                        if (stackAmount > 100)
+                            stackAmount = 100;
+
+                        else if (stackAmount <=0)           // Last aura from stack removed
+                        {
+                            stackAmount = 0;
+                        }
+                        holder->SetStackAmount(stackAmount);
+                    }
+                    return;
+                }
+                case 63122:                                 // Clear Insane (Ulduar - Yogg Saron)
+                {
+                    if (!unitTarget)
+                        return;
 
+                    unitTarget->RemoveAurasDueToSpell(63050);
+                    unitTarget->RemoveAurasDueToSpell(63120);
                     return;
                 }
-                case 47393:                                 // The Focus on the Beach: Quest Completion Script
+                case 64123:                                 // Lunge (Ulduar - Yogg Saron)
+                {
+                    if (!unitTarget)
+                        return;
+
+                    uint32 spellid = 0;
+                    unitTarget->GetMap()->IsRegularDifficulty() ? spellid = 64125 : spellid = 64126;
+                    unitTarget->CastSpell(unitTarget, spellid, true);
+                    break;
+                }
+                case 64466:                                 // Empowering Shadows (Ulduar - Yogg Saron)
                 {
                     if (!unitTarget)
                         return;
 
-                    // Ley Line Information
-                    unitTarget->RemoveAurasDueToSpell(47391);
-                    return;
+                    // effect back to caster (Immortal Guardian)
+                    unitTarget->CastSpell(m_caster, 64467, true);
+                    break;
                 }
-                case 47615:                                 // Atop the Woodlands: Quest Completion Script
+                case 64467:                                 // Empowering Shadows (Ulduar - Yogg Saron)
                 {
                     if (!unitTarget)
                         return;
 
-                    // Ley Line Information
-                    unitTarget->RemoveAurasDueToSpell(47473);
-                    return;
+                    uint32 spellid = 0;
+                    unitTarget->GetMap()->IsRegularDifficulty() ? spellid = 64468 : spellid = 64469;
+                    unitTarget->CastSpell(unitTarget, spellid, true);
+                    break;
                 }
-                case 47638:                                 // The End of the Line: Quest Completion Script
+                case 65238:                                 // Shattered Illusion (Ulduar - Yogg Saron)
                 {
                     if (!unitTarget)
                         return;
 
-                    // Ley Line Information
-                    unitTarget->RemoveAurasDueToSpell(47636);
+                    unitTarget->RemoveAurasDueToSpell(m_spellInfo->EffectBasePoints[eff_idx]);
                     return;
                 }
-                case 47703:                                 // Unholy Union
+                case 62003:                                 // Algalon - Black Hole Spawn
                 {
-                    m_caster->CastSpell(m_caster, 50254, true);
-                    return;
+                    if (!unitTarget)
+                        return;
+
+                    // Apply aura which causes black hole phase/1 sec to hostile targets
+                    unitTarget->CastSpell(m_caster, 62185, true);
                 }
-                case 47724:                                 // Frost Draw
+                case 62168:                                 // Algalon - Black Hole Damage
                 {
-                    m_caster->CastSpell(m_caster, 50239, true);
+                    if (!unitTarget)
+                        return;
+                    unitTarget->CastSpell(unitTarget, 62169, true);
                     return;
                 }
-                case 48590:                                 // Avenging Spirits
+                case 64122:
+                case 65108:                                 // Algalon - Collapsing start explosion to summon black hole
                 {
                     if (!unitTarget)
                         return;
 
-                    // Summon 4 spirits summoners
-                    unitTarget->CastSpell(unitTarget, 48586, true);
-                    unitTarget->CastSpell(unitTarget, 48587, true);
-                    unitTarget->CastSpell(unitTarget, 48588, true);
-                    unitTarget->CastSpell(unitTarget, 48589, true);
+                    // Cast Black hole spawn
+                    m_caster->CastSpell(m_caster, 62189, true);
                     return;
                 }
-                case 48603:                                 // High Executor's Branding Iron
-                    // Torture the Torturer: High Executor's Branding Iron Impact
-                    unitTarget->CastSpell(unitTarget, 48614, true);
-                    return;
-                case 48724:                                 // The Denouncement: Commander Jordan On Death
-                case 48726:                                 // The Denouncement: Lead Cannoneer Zierhut On Death
-                case 48728:                                 // The Denouncement: Blacksmith Goodman On Death
-                case 48730:                                 // The Denouncement: Stable Master Mercer On Death
+                case 65044:                                 // Flames Ulduar
                 {
-                    // Compelled
-                    if (!unitTarget || !m_caster->HasAura(48714))
+                    if (!unitTarget)
                         return;
 
-                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
-                    return;
+                    if (unitTarget->HasAura(62297))
+                        unitTarget->RemoveAurasDueToSpell(62297);   // Remove Hodir's Fury
+                    break;
                 }
-                // Gender spells
-                case 48762:                                 // A Fall from Grace: Scarlet Raven Priest Image - Master
-                case 45759:                                 // Warsong Orc Disguise
-                case 69672:                                 // Sunreaver Disguise
-                case 69673:                                 // Silver Covenant Disguise
+                case 65917:                                 // Magic Rooster
                 {
-                    if (!unitTarget)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    uint8 gender = unitTarget->getGender();
-                    uint32 spellId;
-                    switch (m_spellInfo->Id)
+                    // Prevent stacking of mounts
+                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+
+                    uint32 spellId = 66122; // common case
+
+                    if (((Player*)unitTarget)->getGender() == GENDER_MALE)
                     {
-                        case 48762: spellId = (gender == GENDER_MALE ? 48763 : 48761); break;
-                        case 45759: spellId = (gender == GENDER_MALE ? 45760 : 45762); break;
-                        case 69672: spellId = (gender == GENDER_MALE ? 70974 : 70973); break;
-                        case 69673: spellId = (gender == GENDER_MALE ? 70972 : 70971); break;
-                        default: return;
+                        switch (((Player*)unitTarget)->getRace())
+                        {
+                            case RACE_TAUREN: spellId = 66124; break;
+                            case RACE_DRAENEI: spellId = 66123; break;
+                        }
                     }
+
                     unitTarget->CastSpell(unitTarget, spellId, true);
                     return;
                 }
-                case 48810:                                 // Death's Door
+                case 64104:                                 // Quest Credit - Trigger - Dummy - 01
+                case 64107:                                 // Quest Credit - Trigger - Dummy - 02
                 {
-                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget)
                         return;
 
-                    // Spell effect order will summon creature first and then apply invisibility to caster.
-                    // This result in that summoner/summoned can not see each other and that is not expected.
-                    // Aura from 48814 can be used as a hack from creature_addon, but we can not get the
-                    // summoned to cast this from this spell effect since we have no way to get pointer to creature.
-                    // Most proper would be to summon to same visibility mask as summoner, and not use spell at all.
-
-                    // Binding Life
-                    m_caster->CastSpell(m_caster, 48809, true);
-
-                    // After (after: meaning creature does not have auras at creation)
-                    // creature is summoned and visible for player in map, it is expected to
-                    // gain two auras. First from 29266(aura slot0) and then from 48808(aura slot1).
-                    // We have no pointer to summoned, so only 48808 is possible from this spell effect.
-
-                    // Binding Death
-                    m_caster->CastSpell(m_caster, 48808, true);
+                    if (Unit* charmer = unitTarget->GetCharmer())
+                        charmer->CastSpell(charmer, damage, true);
                     return;
                 }
-                case 48811:                                 // Despawn Forgotten Soul
+                case 63667:                                 // Napalm Shell
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
-                        return;
-
-                    if (!((Creature*)unitTarget)->IsTemporarySummon())
-                        return;
-
-                    TemporarySummon* pSummon = (TemporarySummon*)unitTarget;
-
-                    Unit::AuraList const& images = unitTarget->GetAurasByType(SPELL_AURA_MIRROR_IMAGE);
-
-                    if (images.empty())
+                    if (!unitTarget)
                         return;
 
-                    Unit* pCaster = images.front()->GetCaster();
-                    Unit* pSummoner = unitTarget->GetMap()->GetUnit(pSummon->GetSummonerGuid());
-
-                    if (pSummoner && pSummoner == pCaster)
-                        pSummon->UnSummon();
-
+                    m_caster->CastSpell(unitTarget, m_caster->GetMap()->IsRegularDifficulty() ? 63666 : 65026, true);
                     return;
                 }
-                case 48917:                                 // Who Are They: Cast from Questgiver
+                case 63681:                                 // Rocket Strike
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    // Male Shadowy Disguise / Female Shadowy Disguise
-                    unitTarget->CastSpell(unitTarget, unitTarget->getGender() == GENDER_MALE ? 38080 : 38081, true);
-                    // Shadowy Disguise
-                    unitTarget->CastSpell(unitTarget, 32756, true);
+                    m_caster->CastSpell(unitTarget, 63036, true);
                     return;
                 }
-                case 49380:                                 // Consume
-                case 59803:                                 // Consume (heroic)
+                case 64456:                                 // Feral Essence Application Removal
                 {
                     if (!unitTarget)
                         return;
 
-                    // Each target hit buffs the caster
-                    unitTarget->CastSpell(m_caster, m_spellInfo->Id == 49380 ? 49381 : 59805, true, NULL, NULL, m_caster->GetObjectGuid());
+                    uint32 spellId = m_spellInfo->CalculateSimpleValue(eff_idx);
+                    unitTarget->RemoveAuraHolderFromStack(spellId);
                     return;
                 }
-                case 49405:                                 //Invader Taunt Trigger
+                case 64475:                                 // Strength of the Creator
                 {
                     if (!unitTarget)
                         return;
 
-                    unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    unitTarget->RemoveAuraHolderFromStack(64473);
                     return;
                 }
-                case 50217:                                 // The Cleansing: Script Effect Player Cast Mirror Image
+                case 64503:                                 // Water
                 {
-                    // Summon Your Inner Turmoil
-                    m_caster->CastSpell(m_caster, 50167, true);
-
-                    // Spell 50218 has TARGET_SCRIPT, but other wild summons near may exist, and then target can become wrong
-                    // Only way to make this safe is to get the actual summoned by m_caster
-
-                    // Your Inner Turmoil's Mirror Image Aura
-                    m_caster->CastSpell(m_caster, 50218, true);
+                    if (!unitTarget || unitTarget->GetTypeId() == TYPEID_PLAYER || !unitTarget->HasAura(62373))
+                        return;
 
+                    unitTarget->CastSpell(unitTarget, 62381, true);
                     return;
                 }
-                case 50218:                                 // The Cleansing: Your Inner Turmoil's Mirror Image Aura
+                case 64623:                                 // Frost Bomb
                 {
-                    if (!m_originalCaster || m_originalCaster->GetTypeId() != TYPEID_PLAYER || !unitTarget)
+                    if (!unitTarget)
                         return;
 
-                    // determine if and what weapons can be copied
-                    switch(eff_idx)
-                    {
-                        case EFFECT_INDEX_1:
-                            if (((Player*)m_originalCaster)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND))
-                                unitTarget->CastSpell(m_originalCaster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
-
-                            return;
-                        case EFFECT_INDEX_2:
-                            if (((Player*)m_originalCaster)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
-                                unitTarget->CastSpell(m_originalCaster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
-
-                            return;
-                        default:
-                            return;
-                    }
+                    m_caster->CastSpell(unitTarget, 64627, true);
                     return;
                 }
-                case 50238:                                 // The Cleansing: Your Inner Turmoil's On Death Cast on Master
+                case 64767:                                 // Stormhammer
                 {
-                    if (m_caster->GetTypeId() != TYPEID_UNIT)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
                         return;
 
-                    if (((Creature*)m_caster)->IsTemporarySummon())
+                    if (Creature* target = (Creature*)unitTarget)
                     {
-                        TemporarySummon* pSummon = (TemporarySummon*)m_caster;
-
-                        if (pSummon->GetSummonerGuid().IsPlayer())
-                        {
-                            if (Player* pSummoner = sObjectMgr.GetPlayer(pSummon->GetSummonerGuid()))
-                                pSummoner->CastSpell(pSummoner, m_spellInfo->CalculateSimpleValue(eff_idx), true);
-                        }
+                        target->AI()->EnterEvadeMode();
+                        target->CastSpell(target, 62470, true);
+                        target->CastSpell(m_caster, 64909, true);
+                        target->CastSpell(target, 64778, true);
+                        target->ForcedDespawn(10000);
                     }
-
-                    return;
-                }
-                case 50252:                                 // Blood Draw
-                {
-                    m_caster->CastSpell(m_caster, 50250, true);
                     return;
                 }
-                case 50439:                                 // Script Cast Summon Image of Drakuru 05
+                case 64841:                                 // Rapid Burst
                 {
-                    // TODO: check if summon already exist, if it does in this instance, return.
+                    if (!unitTarget)
+                        return;
 
-                    // Summon Drakuru
-                    m_caster->CastSpell(m_caster, 50446, true);
+                    unitTarget->CastSpell(m_caster, 63382, false);
                     return;
                 }
-                case 50725:                                 // Vigilance - remove cooldown on Taunt
+                case 66477:                                 // Bountiful Feast
                 {
-                    Unit* caster = GetAffectiveCaster();
-                    if (!caster || caster->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget)
                         return;
 
-                    ((Player*)caster)->RemoveSpellCategoryCooldown(82, true);
-                    return;
+                    unitTarget->CastSpell(unitTarget, 65422, true);
+                    unitTarget->CastSpell(unitTarget, 66622, true);
+                    break;
                 }
-                case 50894:                                 // Zul'Drak Rat
+                case 66741:                                 // Chum the Water
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
+                    // maybe this check should be done sooner?
+                    if (!m_caster->IsInWater())
                         return;
 
-                    if (SpellAuraHolder* pHolder = unitTarget->GetSpellAuraHolder(m_spellInfo->Id))
+                    uint32 spellId = 0;
+
+                    // too low/high?
+                    if (roll_chance_i(33))
+                        spellId = 66737;                    // angry
+                    else
                     {
-                        if (pHolder->GetStackAmount() + 1 >= m_spellInfo->StackAmount)
+                        switch(rand() % 3)
                         {
-                            // Gluttonous Lurkers: Summon Gorged Lurking Basilisk
-                            unitTarget->CastSpell(m_caster, 50928, true);
-                            ((Creature*)unitTarget)->ForcedDespawn(1);
+                            case 0: spellId = 66740; break; // blue
+                            case 1: spellId = 66739; break; // tresher
+                            case 2: spellId = 66738; break; // mako
                         }
                     }
 
+                    if (spellId)
+                        m_caster->CastSpell(m_caster, spellId, true);
+
                     return;
                 }
-                case 51519:                                 // Death Knight Initiate Visual
+                case 66744:                                 // Make Player Destroy Totems
                 {
-                    if (!unitTarget)
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    uint32 spellId = 0;
-
-                    bool isMale = unitTarget->getGender() == GENDER_MALE;
-                    switch (unitTarget->getRace())
-                    {
-                        case RACE_HUMAN:    spellId = isMale ? 51520 : 51534; break;
-                        case RACE_DWARF:    spellId = isMale ? 51538 : 51537; break;
-                        case RACE_NIGHTELF: spellId = isMale ? 51535 : 51536; break;
-                        case RACE_GNOME:    spellId = isMale ? 51539 : 51540; break;
-                        case RACE_DRAENEI:  spellId = isMale ? 51541 : 51542; break;
-                        case RACE_ORC:      spellId = isMale ? 51543 : 51544; break;
-                        case RACE_UNDEAD:   spellId = isMale ? 51549 : 51550; break;
-                        case RACE_TAUREN:   spellId = isMale ? 51547 : 51548; break;
-                        case RACE_TROLL:    spellId = isMale ? 51546 : 51545; break;
-                        case RACE_BLOODELF: spellId = isMale ? 51551 : 51552; break;
-                        default:
-                            return;
-                    }
-
-                    unitTarget->CastSpell(unitTarget, spellId, true);
+                    // Totem of the Earthen Ring does not really require or take reagents.
+                    // Expecting RewardQuest() to already destroy them or we need additional code here to destroy.
+                    unitTarget->CastSpell(unitTarget, 66747, true);
                     return;
                 }
-                case 51770:                                 // Emblazon Runeblade
+                case 67009:                                 // Nether Power (ToC25: Lord Jaraxxus)
                 {
-                    Unit* caster = GetAffectiveCaster();
-                    if (!caster)
+                    if (!unitTarget)
                         return;
 
-                    caster->CastSpell(caster, damage, false);
-                    break;
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
                 }
-                case 51864:                                 // Player Summon Nass
+                case 67398:                                 // Zergling Periodic Effect (Called by Zergling Passive)
                 {
-                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget || !unitTarget->isAlive())
                         return;
-
-                    // Summon Nass
-                    if (const SpellEntry* pSpell = sSpellStore.LookupEntry(51865))
+                                                            // Only usable on Grunty companion
+                    Unit* pGrunty = unitTarget->GetMiniPet();
+                    if (pGrunty && pGrunty->GetEntry() == 34694)
                     {
-                        // Only if he is not already there
-                        if (!m_caster->FindGuardianWithEntry(pSpell->EffectMiscValue[EFFECT_INDEX_0]))
+                        if (m_caster->IsWithinDist(pGrunty, 2.0f))
+                            m_caster->CastSpell(pGrunty, 67400, true); //zerg attack
+                        else
                         {
-                            m_caster->CastSpell(m_caster, pSpell, true);
-
-                            if (Pet* pPet = m_caster->FindGuardianWithEntry(pSpell->EffectMiscValue[EFFECT_INDEX_0]))
-                            {
-                                // Nass Periodic Say aura
-                                pPet->CastSpell(pPet, 51868, true);
-                            }
+                            m_caster->CastSpell(pGrunty, 67397, true); // zerg rush dummy aura
+                            m_caster->GetMotionMaster()->MoveFollow(pGrunty,0,0);
                         }
                     }
                     return;
                 }
-                case 51889:                                 // Quest Accept Summon Nass
-                {
-                    // This is clearly for quest accept, is spell 51864 then for gossip and does pretty much the same thing?
-                    // Just "jumping" to what may be the "gossip-spell" for now, doing the same thing
-                    m_caster->CastSpell(m_caster, 51864, true);
-                    return;
-                }
-                case 51910:                                 // Kickin' Nass: Quest Completion
+                case 67369:                                 // Grunty Periodic usable only on Zergling companion
                 {
-                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget)
                         return;
 
-                    if (const SpellEntry* pSpell = sSpellStore.LookupEntry(51865))
+                    Unit* pZerg = unitTarget->GetMiniPet(); // Only usable on Grunty companion
+                    if (pZerg && pZerg->isAlive() && pZerg->GetEntry() == 11327)
                     {
-                        // Is this all to be done at completion?
-                        if (Pet* pPet = m_caster->FindGuardianWithEntry(pSpell->EffectMiscValue[EFFECT_INDEX_0]))
-                            pPet->Unsummon(PET_SAVE_AS_DELETED, m_caster);
+                        m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                        m_caster->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED);
+                        return;
                     }
                     return;
                 }
-                case 52751:                                 // Death Gate
+                case 67533:                                 // Shoot Air Rifle
                 {
-                    if (!unitTarget || unitTarget->getClass() != CLASS_DEATH_KNIGHT)
+                    if (!unitTarget)
                         return;
 
-                    // triggered spell is stored in m_spellInfo->EffectBasePoints[0]
-                    unitTarget->CastSpell(unitTarget, damage, false);
-                    break;
+                    m_caster->CastSpell(unitTarget, 67532, true);
+                    return;
                 }
-                case 52941:                                 // Song of Cleansing
+                case 68861:                                 // Consume Soul (ICC FoS: Bronjahm)
                 {
-                    uint32 spellId = 0;
-
-                    switch(m_caster->GetAreaId())
-                    {
-                        case 4385: spellId = 52954; break;  // Bittertide Lake
-                        case 4290: spellId = 52958; break;  // River's Heart
-                        case 4388: spellId = 52959; break;  // Wintergrasp River
-                    }
-
-                    if (spellId)
-                        m_caster->CastSpell(m_caster, spellId, true);
-
-                    break;
+                    if (unitTarget)
+                        unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
                 }
-                case 54182:                                 // An End to the Suffering: Quest Completion Script
+                case 68871:                                 // Wailing Souls
+                    // Left or Right direction?
+                    m_caster->CastSpell(m_caster, urand(0, 1) ? 68875 : 68876, false);
+                    // Clear TargetGuid for sweeping
+                    m_caster->SetTargetGuid(ObjectGuid());
+                    return;
+                case 69048:                                 // Mirrored Soul
                 {
                     if (!unitTarget)
                         return;
 
-                    // Remove aura (Mojo of Rhunok) given at quest accept / gossip
-                    unitTarget->RemoveAurasDueToSpell(51967);
+                    // This is extremely strange!
+                    // The spell should send MSG_CHANNEL_START, SMSG_SPELL_START
+                    // However it has cast time 2s, but should send SMSG_SPELL_GO instantly.
+                    m_caster->CastSpell(unitTarget, 69051, true);
                     return;
                 }
-                case 54581:                                 // Mammoth Explosion Spell Spawner
+                case 69051:                                 // Mirrored Soul
                 {
-                    if (m_caster->GetTypeId() != TYPEID_UNIT)
+                    if (!unitTarget)
                         return;
 
-                    // Summons misc npc's. They are expected to summon GO from 54625
-                    // but there is no way to get the summoned, to trigger a spell
-                    // cast (workaround can be done with ai script).
-
-                    // Quest - Mammoth Explosion Summon Object
-                    for(int i = 0; i < 2; ++i)
-                        m_caster->CastSpell(m_caster, 54623, true);
+                    // Actually this spell should be sent with SMSG_SPELL_START
+                    unitTarget->CastSpell(m_caster, 69023, true);
+                    return;
+                }
+                case 69165:                                 // Inhale Blight (Festergut)
+                {
+                    SpellAuraHolderPtr holder = m_caster->GetSpellAuraHolder(69166);
 
-                    for(int i = 0; i < 2; ++i)
-                        m_caster->CastSpell(m_caster, 54627, true);
+                    if (!holder)
+                        holder = m_caster->GetSpellAuraHolder(71912);
 
-                    for(int i = 0; i < 2; ++i)
-                        m_caster->CastSpell(m_caster, 54628, true);
+                    if (!holder)
+                    {
+                        // first Inhale
+                        m_caster->RemoveAurasDueToSpell(69157);
+                        m_caster->CastSpell(m_caster, 69162, true);
+                    }
+                    else if (holder)
+                    {
+                        if (holder->GetStackAmount() == 1)
+                        {
+                            // second Inhale
+                            m_caster->RemoveAurasDueToSpell(69162);
+                            m_caster->CastSpell(m_caster, 69164, true);
+                        }
+                        else if (holder->GetStackAmount() == 2)
+                        {
+                            // third Inhale
+                            m_caster->RemoveAurasDueToSpell(69164);
+                            m_caster->CastSpell(m_caster, 69171, true);
+                        }
+                    }
 
-                    // Summon Main Mammoth Meat
-                    m_caster->CastSpell(m_caster, 57444, true);
                     return;
                 }
-                case 54436:                                 // Demonic Empowerment (succubus Vanish effect)
+                case 69200:                                 // Raging Spirit
                 {
                     if (!unitTarget)
                         return;
 
-                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
-                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
-                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STALKED);
-                    unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STUN);
+                    unitTarget->CastSpell(unitTarget, 69201, true);
                     return;
                 }
-                case 55693:                                 // Remove Collapsing Cave Aura
+                case 69171:                                 // Low Plague Blight Visual Cancel (Festergut)
                 {
-                    if (!unitTarget)
-                        return;
-
-                    unitTarget->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(eff_idx));
-                    break;
+                    if (unitTarget)
+                    {
+                        // remove Visual Auras
+                        unitTarget->RemoveAurasDueToSpell(69126);
+                        unitTarget->RemoveAurasDueToSpell(69152);
+                        unitTarget->RemoveAurasDueToSpell(69154);
+                    }
+                    return;
                 }
-                case 57337:                                 // Great Feast
+                case 69298:                                 // Cancel Resistant to Blight (Festergut)
+                {
+                    if (unitTarget)
+                        unitTarget->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(eff_idx));
+                    return;
+                }
+                case 69377:                                 // Fortitude
                 {
                     if (!unitTarget)
                         return;
 
-                    unitTarget->CastSpell(unitTarget, 58067, true);
-                    break;
+                    m_caster->CastSpell(unitTarget, 72590, true);
+                    return;
                 }
-                case 57397:                                 // Fish Feast
+                case 69378:                                 // Blessing of Forgotten Kings
                 {
                     if (!unitTarget)
                         return;
 
-                    unitTarget->CastSpell(unitTarget, 57292, true);
-                    break;
+                    m_caster->CastSpell(unitTarget, 72586, true);
+                    return;
                 }
-                case 58466:                                 // Gigantic Feast
-                case 58475:                                 // Small Feast
+                case 69381:                                 // Gift of the Wild
                 {
                     if (!unitTarget)
                         return;
 
-                    unitTarget->CastSpell(unitTarget, 57085, true);
-                    break;
+                    m_caster->CastSpell(unitTarget, 72588, true);
+                    return;
                 }
-                case 58418:                                 // Portal to Orgrimmar
-                case 58420:                                 // Portal to Stormwind
+                //Glyph of Scourge Strike
+                case 69961:
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || eff_idx != EFFECT_INDEX_0)
-                        return;
-
-                    uint32 spellID = m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_0);
-                    uint32 questID = m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_1);
-
-                    if (((Player*)unitTarget)->GetQuestStatus(questID) == QUEST_STATUS_COMPLETE && !((Player*)unitTarget)->GetQuestRewardStatus (questID))
-                        unitTarget->CastSpell(unitTarget, spellID, true);
+                    Unit::SpellAuraHolderMap const& auras = unitTarget->GetSpellAuraHolderMap();
+                    for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
+                    {
+                        if (itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE &&
+                            itr->second->GetCasterGuid() == m_caster->GetObjectGuid())
+                        if (Aura* aura =itr->second->GetAuraByEffectIndex(EFFECT_INDEX_0))
+                        {
+                            uint32 countMin = aura->GetAuraMaxDuration();
+                            uint32 countMax = GetSpellMaxDuration(aura->GetSpellProto());
+                            countMax += 9000;
+                            countMax += m_caster->HasAura(49036) ? 3000 : 0; //Epidemic (Rank 1)
+                            countMax += m_caster->HasAura(49562) ? 6000 : 0; //Epidemic (Rank 2)
 
-                    return;
+                            if (countMin < countMax)
+                            {
+                                aura->GetHolder()->SetAuraDuration(aura->GetAuraDuration() + 3000);
+                                aura->GetHolder()->SetAuraMaxDuration(countMin + 3000);
+                                aura->GetHolder()->SendAuraUpdate(false);
+                            }
+                        }
+                    }
+                return;
                 }
-                case 59317:                                 // Teleporting
+                case 69140:                                 // Coldflame (random target selection)
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                    if (!unitTarget)
                         return;
 
-                    // return from top
-                    if (((Player*)unitTarget)->GetAreaId() == 4637)
-                        unitTarget->CastSpell(unitTarget, 59316, true);
-                    // teleport atop
-                    else
-                        unitTarget->CastSpell(unitTarget, 59314, true);
-
+                    m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
                     return;
-                }                                           // random spell learn instead placeholder
-                case 59789:                                 // Oracle Ablutions
+                }
+                case 69147:                                 // Coldflame
                 {
                     if (!unitTarget)
                         return;
 
-                    switch (unitTarget->getPowerType())
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    return;
+                }
+                case 69538:                                 // Small Ooze Combine (Rotface)
+                {
+                    if (unitTarget)
                     {
-                        case POWER_RUNIC_POWER:
-                        {
-                            unitTarget->CastSpell(unitTarget, 59812, true);
-                            break;
-                        }
-                        case POWER_MANA:
-                        {
-                            int32 manapool = unitTarget->GetMaxPower(POWER_MANA) * 0.05;
-                            unitTarget->CastCustomSpell(unitTarget, 59813, &manapool, NULL, NULL, true);
-                            break;
-                        }
-                        case POWER_RAGE:
-                        {
-                            unitTarget->CastSpell(unitTarget, 59814, true);
-                            break;
-                        }
-                        case POWER_ENERGY:
-                        {
-                            unitTarget->CastSpell(unitTarget, 59815, true);
-                            break;
-                        }
+                        m_caster->CastSpell(unitTarget, 69889, true); // merge
+                        if (m_caster->GetTypeId() == TYPEID_UNIT)
+                            ((Creature*)m_caster)->ForcedDespawn(200);
                     }
                     return;
                 }
-                case 60893:                                 // Northrend Alchemy Research
-                case 61177:                                 // Northrend Inscription Research
-                case 61288:                                 // Minor Inscription Research
-                case 61756:                                 // Northrend Inscription Research (FAST QA VERSION)
-                case 64323:                                 // Book of Glyph Mastery
+                case 69553:                                 // Large Ooze Combine (Rotface)
                 {
-                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
-                        return;
+                    // 2 large Oozes, smaller lives and gets 1 more stack, bigger dies
+                    if (unitTarget)
+                    {
+                        SpellAuraHolderPtr casterHolder = m_caster->GetSpellAuraHolder(69558);
+                        SpellAuraHolderPtr targetHolder = unitTarget->GetSpellAuraHolder(69558);
+                        uint32 casterStack = 0;
+                        uint32 targetStack = 0;
+                        Unit *pBigger, *pSmaller;
 
-                    // learn random explicit discovery recipe (if any)
-                    if (uint32 discoveredSpell = GetExplicitDiscoverySpell(m_spellInfo->Id, (Player*)m_caster))
-                        ((Player*)m_caster)->learnSpell(discoveredSpell, false);
+                        if (casterHolder)
+                            casterStack = casterHolder->GetStackAmount();
+                        if (targetHolder)
+                            targetStack = targetHolder->GetStackAmount();
+
+                        // mark which will live and which will die
+                        pBigger = casterStack <= targetStack ? unitTarget : m_caster;
+                        pSmaller = casterStack <= targetStack ? m_caster : unitTarget;
 
+                        pSmaller->CastSpell(pSmaller, 69558, true); // smaller one grows
+                        if (pBigger->GetTypeId() == TYPEID_UNIT)
+                            ((Creature*)pBigger)->ForcedDespawn(0); // bigger one dies
+                        return;
+                    }
                     return;
                 }
-                case 62524:                                 // Attuned to Nature 2 Dose Reduction
-                case 62525:                                 // Attuned to Nature 10 Dose Reduction
-                case 62521:                                 // Attuned to Nature 25 Dose Reduction
+                case 69558:                                 // Unstable Ooze (Rotface)
                 {
-                    if (!unitTarget)
-                        return;
-
-                    uint32 numStacks = 0;
-
-                    switch(m_spellInfo->Id)
+                    if (unitTarget)
                     {
-                        case 62524: numStacks = 2;  break;
-                        case 62525: numStacks = 10; break;
-                        case 62521: numStacks = 25; break;
-                    };
-
-                    uint32 spellId = m_spellInfo->CalculateSimpleValue(eff_idx);
-                    unitTarget->RemoveAuraHolderFromStack(spellId, numStacks);
+                        if (SpellAuraHolderPtr holder = unitTarget->GetSpellAuraHolder(m_spellInfo->Id))
+                        {
+                            if (holder->GetStackAmount() >= 4)
+                                unitTarget->CastSpell(unitTarget, 69839, false); // Unstable Ooze Explosion
+                        }
+                    }
                     return;
                 }
-                case 62678:                                 // Summon Allies of Nature
+                case 69610:                                 // Large Ooze Buff Combine (Rotface)
                 {
-                    const uint32 randSpells[] =
+                    // Large Ooze (m_caster) and Little Ooze (unitTarget)
+                    if (unitTarget)
                     {
-                        62685,  // Summon Wave - 1 Mob
-                        62686,  // Summon Wave - 3 Mob
-                        62688,  // Summon Wave - 10 Mob
-                    };
+                        m_caster->CastSpell(m_caster, 69558, true);
+                        if (unitTarget->GetTypeId() == TYPEID_UNIT)
+                            ((Creature*)unitTarget)->ForcedDespawn();
+                    }
+                }
+                case 69782:                                 // Ooze Flood (Rotface)
+                case 69796:
+                case 69798:
+                case 69801:
+                {
+                    // targets Puddle Stalker which casts slime AoE
+                    if (unitTarget)
+                        unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), false);
 
-                    m_caster->CastSpell(m_caster, randSpells[urand(0, countof(randSpells)-1)], true);
                     return;
                 }
-                case 62688:                                 // Summon Wave - 10 Mob
+                case 69795:                                 // Ooze Flood Trigger (Rotface)
                 {
-                    uint32 spellId = m_spellInfo->CalculateSimpleValue(eff_idx);
-
-                    for (uint32 i = 0; i < 10; ++i)
-                        m_caster->CastSpell(m_caster, spellId, true);
-
+                    // unclear: different versions of spell in the rest of effects basepoints
+                    m_caster->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
                     return;
                 }
-                case 64456:                                 // Feral Essence Application Removal
+                case 70079:                                 // Ooze Flood Periodic Trigger Cancel (Rotface)
                 {
-                    if (!unitTarget)
-                        return;
-
-                    uint32 spellId = m_spellInfo->CalculateSimpleValue(eff_idx);
-                    unitTarget->RemoveAuraHolderFromStack(spellId);
+                    if (unitTarget)
+                        unitTarget->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(eff_idx));
                     return;
                 }
-                case 66477:                                 // Bountiful Feast
+                case 70117:                                 // Icy grip (Sindragosa pull effect)
                 {
-                    if (!unitTarget)
-                        return;
+                    if (unitTarget)
+                        unitTarget->CastSpell(m_caster, 70122, true);
 
-                    unitTarget->CastSpell(unitTarget, 65422, true);
-                    unitTarget->CastSpell(unitTarget, 66622, true);
-                    break;
+                    m_caster->CastSpell(m_caster, 70123, false); // trigger Blistering Cold
+                    return;
                 }
-                case 66741:                                 // Chum the Water
+                case 70360:                                 // Eat Ooze (Putricide)
+                case 72527:
                 {
-                    // maybe this check should be done sooner?
-                    if (!m_caster->IsInWater())
+                    if (!unitTarget)
                         return;
 
-                    uint32 spellId = 0;
-
-                    // too low/high?
-                    if (roll_chance_i(33))
-                        spellId = 66737;                    // angry
-                    else
+                    if (SpellAuraHolderPtr holder = unitTarget->GetSpellAuraHolder(70347))
                     {
-                        switch(rand() % 3)
+                        if (holder->GetStackAmount() <= 3)
                         {
-                            case 0: spellId = 66740; break; // blue
-                            case 1: spellId = 66739; break; // tresher
-                            case 2: spellId = 66738; break; // mako
+                            if (unitTarget->GetTypeId() == TYPEID_UNIT)
+                                ((Creature*)unitTarget)->ForcedDespawn();
+                            else
+                                unitTarget->RemoveAurasDueToSpell(70347);
                         }
+                        else
+                            holder->ModStackAmount(-3);
                     }
-
-                    if (spellId)
-                        m_caster->CastSpell(m_caster, spellId, true);
-
                     return;
                 }
-                case 66744:                                 // Make Player Destroy Totems
+                case 70920:                                 // Unbound Plague Search Effect
                 {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
-                        return;
+                    if (unitTarget)
+                    {
+                        m_caster->CastSpell(unitTarget, 70911, true);   // apply Plague to new target
+                        m_caster->RemoveAurasDueToSpell(70911);
+                    }
 
-                    // Totem of the Earthen Ring does not really require or take reagents.
-                    // Expecting RewardQuest() to already destroy them or we need additional code here to destroy.
-                    unitTarget->CastSpell(unitTarget, 66747, true);
                     return;
                 }
-                case 67009:                                 // Nether Power (ToC25: Lord Jaraxxus)
+                case 71255:                                 // Choking Gas Bomb (Putricide)
                 {
-                    if (!unitTarget)
-                        return;
-
-                    for (uint8 i = 0; i < 11; ++i)
-                        unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
-
+                    m_caster->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_0), true);
+                    // second is on random side
+                    m_caster->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(SpellEffectIndex(urand(1, 2))), true);
                     return;
                 }
-                case 68861:                                 // Consume Soul (ICC FoS: Bronjahm)
+                case 71620:                                 // Tear Gas Cancel (Putricide)
+                case 72618:                                 // Mutated Plague Clear (Putricide)
+                {
                     if (unitTarget)
-                        unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
-                    return;
-                case 68871:                                 // Wailing Souls
-                    // Left or Right direction?
-                    m_caster->CastSpell(m_caster, urand(0, 1) ? 68875 : 68876, false);
-                    // Clear TargetGuid for sweeping
-                    m_caster->SetTargetGuid(ObjectGuid());
+                    {
+                        unitTarget->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_0));
+                        unitTarget->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_1));
+                    }
                     return;
-                case 69048:                                 // Mirrored Soul
+                }
+                case 71806:                                 // Glittering Sparks
                 {
                     if (!unitTarget)
                         return;
 
-                    // This is extremely strange!
-                    // The spell should send MSG_CHANNEL_START, SMSG_SPELL_START
-                    // However it has cast time 2s, but should send SMSG_SPELL_GO instantly.
-                    m_caster->CastSpell(unitTarget, 69051, true);
+                    m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
                     return;
                 }
-                case 69051:                                 // Mirrored Soul
+                case 71952:                                 // Presence of the Darkfallen (Queen Lana'thel ICC)
                 {
                     if (!unitTarget)
                         return;
 
-                    // Actually this spell should be sent with SMSG_SPELL_START
-                    unitTarget->CastSpell(m_caster, 69023, true);
+                    if (unitTarget->GetMap()->GetDifficulty() == RAID_DIFFICULTY_10MAN_HEROIC ||
+                        unitTarget->GetMap()->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC)
+                    {
+                        unitTarget->CastSpell(unitTarget, 70995, true);
+                    }
                     return;
                 }
-                case 69140:                                 // Coldflame (random target selection)
+                case 72034:                                 // Whiteout
+                case 72096:                                 // Whiteout (heroic)
                 {
-                    if (!unitTarget)
-                        return;
-
-                    m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    // cast Whiteout visual
+                    m_caster->CastSpell(unitTarget, 72036, true);
                     return;
                 }
-                case 69147:                                 // Coldflame
+                case 72195:                                 // Blood link
                 {
                     if (!unitTarget)
                         return;
-
-                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    if (unitTarget->HasAura(72371))
+                    {
+                        unitTarget->RemoveAurasDueToSpell(72371);
+                        int32 power = unitTarget->GetPower(unitTarget->GetPowerType());
+                        unitTarget->CastCustomSpell(unitTarget, 72371, &power, &power, NULL, true);
+                    }
                     return;
                 }
-                case 69377:                                 // Fortitude
+                case 72257:                                 // Remove Marks of the Fallen Champion
                 {
-                    if (!unitTarget)
-                        return;
-
-                    m_caster->CastSpell(unitTarget, 72590, true);
+                    if (unitTarget)
+                        unitTarget->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(eff_idx));
                     return;
                 }
-                case 69378:                                 // Blessing of Forgotten Kings
+                case 72429:                                 // Mass Resurrection (Lich King encounter)
+                {
+                    if (unitTarget)
+                        m_caster->CastSpell(unitTarget, 72423, true);
+                    return;
+                }
+                case 72705:                                 // Coldflame (summon around the caster)
                 {
                     if (!unitTarget)
                         return;
 
-                    m_caster->CastSpell(unitTarget, 72586, true);
+                    // Cast summon spells 72701, 72702, 72703, 72704
+                    for (uint32 triggeredSpell = m_spellInfo->CalculateSimpleValue(eff_idx); triggeredSpell < m_spellInfo->Id; ++triggeredSpell)
+                        unitTarget->CastSpell(unitTarget, triggeredSpell, true);
+
                     return;
                 }
-                case 69381:                                 // Gift of the Wild
+                case 72864:                                 // Death plague
                 {
                     if (!unitTarget)
                         return;
 
-                    m_caster->CastSpell(unitTarget, 72588, true);
+                    if (unitTarget->GetObjectGuid() == m_caster->GetObjectGuid())
+                    {
+                        if ((int)m_UniqueTargetInfo.size() < 2)
+                            m_caster->CastSpell(m_caster, 72867, true, NULL, NULL, m_originalCasterGuid);
+                        else
+                            m_caster->CastSpell(m_caster, 72884, true);
+                    }
+                    else
+                        unitTarget->CastSpell(unitTarget, 72865, true, NULL, NULL, m_originalCasterGuid);
                     return;
                 }
-                case 72034:                                 // Whiteout
-                case 72096:                                 // Whiteout (heroic)
+                case 74282:                                 // Shadow Trap (Lich King)
                 {
-                    // cast Whiteout visual
-                    m_caster->CastSpell(unitTarget, 72036, true);
+                    if (unitTarget)
+                    {
+                        m_caster->CastSpell(m_caster, 73529, true);
+                        m_caster->RemoveAurasDueToSpell(73525);
+
+                        if (m_caster->GetTypeId() == TYPEID_UNIT)
+                            ((Creature*)m_caster)->ForcedDespawn(800);
+                    }
                     return;
                 }
-                case 72705:                                 // Coldflame (summon around the caster)
+                case 74455:                                 // Conflagration
                 {
                     if (!unitTarget)
                         return;
 
-                    // Cast summon spells 72701, 72702, 72703, 72704
-                    for (uint32 triggeredSpell = m_spellInfo->CalculateSimpleValue(eff_idx); triggeredSpell < m_spellInfo->Id; ++triggeredSpell)
-                        unitTarget->CastSpell(unitTarget, triggeredSpell, true);
-
-                    return;
+                    unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
                 }
             }
             break;
@@ -7934,8 +11580,8 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
                     for(Unit::SpellAuraHolderMap::iterator itr = suAuras.begin(); itr != suAuras.end(); ++itr)
                     {
                         SpellEntry const *spellInfo = (*itr).second->GetSpellProto();
-                        if(spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK &&
-                           (spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000002)) &&
+                        if (spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK &&
+                           spellInfo->GetSpellFamilyFlags().test<CF_WARLOCK_CORRUPTION>() &&
                            (*itr).second->GetCasterGuid() == m_caster->GetObjectGuid())
                            (*itr).second->RefreshHolder();
                     }
@@ -7944,7 +11590,7 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
                 case 63521:                                 // Guarded by The Light (Paladin spell with SPELLFAMILY_WARLOCK)
                 {
                     // Divine Plea, refresh on target (3 aura slots)
-                    if (SpellAuraHolder* holder = unitTarget->GetSpellAuraHolder(54428))
+                    if (SpellAuraHolderPtr holder = unitTarget->GetSpellAuraHolder(54428))
                         holder->RefreshHolder();
 
                     return;
@@ -7967,7 +11613,7 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
                     {
                         SpellEntry const *spellInfo = (*itr).second->GetSpellProto();
                         if (spellInfo->SpellFamilyName == SPELLFAMILY_PRIEST &&
-                            (spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000008000)) &&
+                            spellInfo->GetSpellFamilyFlags().test<CF_PRIEST_SHADOW_WORD_PAIN>() &&
                             (*itr).second->GetCasterGuid() == m_caster->GetObjectGuid())
                         {
                             (*itr).second->RefreshHolder();
@@ -7996,13 +11642,13 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
                     Unit::SpellAuraHolderMap& Auras = unitTarget->GetSpellAuraHolderMap();
                     for(Unit::SpellAuraHolderMap::iterator i = Auras.begin(); i != Auras.end(); ++i)
                     {
-                        SpellAuraHolder *holder = i->second;
+                        SpellAuraHolderPtr holder = i->second;
                         if (holder->GetCasterGuid() != m_caster->GetObjectGuid())
                             continue;
 
                         // Search only Serpent Sting, Viper Sting, Scorpid Sting auras
-                        ClassFamilyMask const& familyFlag = holder->GetSpellProto()->SpellFamilyFlags;
-                        if (!familyFlag.IsFitToFamilyMask(UI64LIT(0x000000800000C000)))
+                        ClassFamilyMask const& familyFlag = holder->GetSpellProto()->GetSpellFamilyFlags();
+                        if (!familyFlag.test<CF_HUNTER_SERPENT_STING, CF_HUNTER_SCORPID_STING, CF_HUNTER_VIPER_STING>())
                             continue;
 
                         // Refresh aura duration
@@ -8014,7 +11660,7 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
                             continue;
 
                         // Serpent Sting - Instantly deals 40% of the damage done by your Serpent Sting.
-                        if (familyFlag.IsFitToFamilyMask(UI64LIT(0x0000000000004000)))
+                        if (familyFlag.test<CF_HUNTER_SERPENT_STING>())
                         {
                             // m_amount already include RAP bonus
                             basePoint = aura->GetModifier()->m_amount * aura->GetAuraMaxTicks() * 40 / 100;
@@ -8022,7 +11668,7 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
                         }
 
                         // Viper Sting - Instantly restores mana to you equal to 60% of the total amount drained by your Viper Sting.
-                        if (familyFlag.IsFitToFamilyMask(UI64LIT(0x0000008000000000)))
+                        else if (familyFlag.test<CF_HUNTER_VIPER_STING>())
                         {
                             uint32 target_max_mana = unitTarget->GetMaxPower(POWER_MANA);
                             if (!target_max_mana)
@@ -8045,18 +11691,23 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
                         }
 
                         // Scorpid Sting - Attempts to Disarm the target for 10 sec. This effect cannot occur more than once per 1 minute.
-                        if (familyFlag.IsFitToFamilyMask(UI64LIT(0x0000000000008000)))
+                        else if (familyFlag.test<CF_HUNTER_SCORPID_STING>())
                             spellId = 53359;                // Chimera Shot - Scorpid
                         // ?? nothing say in spell desc (possibly need addition check)
-                        //if ((familyFlag & UI64LIT(0x0000010000000000)) || // dot
-                        //    (familyFlag & UI64LIT(0x0000100000000000)))   // stun
+                        //if (familyFlag.test<CF_HUNTER_WYVERN_STING1>() || // dot
+                        //    familyFlag.test<CF_HUNTER_WYVERN_STING2>()   // stun
                         //{
                         //    spellId = 53366; // 53366 Chimera Shot - Wyvern
                         //}
                     }
 
-                    if (spellId)
-                        m_caster->CastCustomSpell(target, spellId, &basePoint, 0, 0, false);
+                    if (spellId && !m_caster->HasSpellCooldown(spellId))
+                    {
+                        m_caster->CastCustomSpell(target, spellId, &basePoint, 0, 0, true);
+
+                        if (spellId == 53359) // Disarm from Chimera Shot should have 1 min cooldown
+                            m_caster->AddSpellCooldown(spellId, 0, uint32(time(NULL) + MINUTE));
+                    }
 
                     return;
                 }
@@ -8069,11 +11720,11 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
                     for(Unit::AuraList::const_iterator i = auras.begin();i != auras.end(); ++i)
                     {
                         // Invigoration (master talent)
-                        if ((*i)->GetModifier()->m_miscvalue == 8 && (*i)->GetSpellProto()->SpellIconID == 3487)
+                        if ((*i)->GetModifier()->m_miscvalue == 8 && (*i)->GetSpellProto()->GetSpellIconID() == 3487)
                         {
                             if (roll_chance_i((*i)->GetModifier()->m_amount))
                             {
-                                unitTarget->CastSpell(unitTarget, 53398, true, NULL, (*i), m_caster->GetObjectGuid());
+                                unitTarget->CastSpell(unitTarget, 53398, true, NULL, (*i)(), m_caster->GetObjectGuid());
                                 break;
                             }
                         }
@@ -8089,6 +11740,20 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
                     unitTarget->CastSpell(unitTarget, 62305, true);
                     return;
                 }
+                case 55709:                                 // Heart of the phoenix
+                {
+                    if (!unitTarget || !unitTarget->GetObjectGuid().IsPet())
+                        return;
+
+                    if (!unitTarget->HasAura(55711))
+                    {
+                        ((Pet*)unitTarget)->GetOwner()->CastSpell(unitTarget, 54114, true);
+                        unitTarget->CastSpell(unitTarget, 55711, true);
+                    }
+                    else
+                        SendCastResult(SPELL_FAILED_CASTER_AURASTATE);
+                    return;
+                }
                 default:
                     break;
             }
@@ -8230,15 +11895,121 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
 
                     break;
                 }
+                // Raise dead script effect
+                case 46584:
+                {
+                    if (!unitTarget || m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    // If have 52143 spell - summoned pet from dummy effect
+                    // Another case summoned guardian from script effect
+                    uint32 triggered_spell_id = m_spellInfo->CalculateSimpleValue(SpellEffectIndex(m_caster->HasSpell(52143) ? EFFECT_INDEX_2 : EFFECT_INDEX_1));
+
+                    float x,y,z;
+
+                    m_caster->GetClosePoint(x, y, z, m_caster->GetObjectBoundingRadius(), PET_FOLLOW_DIST);
+
+                    if (unitTarget != (Unit*)m_caster)
+                    {
+                        m_caster->CastSpell(unitTarget->GetPositionX(),unitTarget->GetPositionY(),unitTarget->GetPositionZ(),triggered_spell_id, true, NULL, NULL, m_caster->GetObjectGuid(), m_spellInfo);
+                        //if (unitTarget->GetTypeId() == TYPEID_UNIT) // By user information, corpse not removed after ghoul summon.
+                        //    ((Creature*)unitTarget)->RemoveCorpse();
+                    }
+                    else if (m_caster->HasAura(60200))
+                    {
+                        m_caster->CastSpell(x,y,z,triggered_spell_id, true, NULL, NULL, m_caster->GetObjectGuid(), m_spellInfo);
+                    }
+                    else  if (((Player*)m_caster)->HasItemCount(37201,1))
+                    {
+                        m_caster->CastSpell(m_caster,48289,true);
+                        m_caster->CastSpell(x,y,z,triggered_spell_id, true, NULL, NULL, m_caster->GetObjectGuid(), m_spellInfo);
+                    }
+                    else
+                    {
+                        SendCastResult(SPELL_FAILED_REAGENTS);
+                        finish(true);
+                        CancelGlobalCooldown();
+                        return;
+                    }
+                    finish(true);
+                    m_caster->RemoveSpellCooldown(m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_2),true);
+                    m_caster->RemoveSpellCooldown(m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_1),true);
+                    CancelGlobalCooldown();
+                    return;
+                }
+
+                // Raise ally
+                case 61999:
+                {
+                    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || unitTarget->isAlive())
+                    {
+                        SendCastResult(SPELL_FAILED_TARGET_NOT_DEAD);
+                        finish(true);
+                        CancelGlobalCooldown();
+                        return;
+                    }
+
+                    // hack remove death
+                    unitTarget->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_0), true);
+                    CancelGlobalCooldown();
+                    return;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        case SPELLFAMILY_WARRIOR:
+        {
+            switch(m_spellInfo->Id)
+            {
+                case 47962:                                 // Resque  inquired soldier
+                {
+                    if (!unitTarget)
+                        return;
+
+                    unitTarget->CastSpell(m_caster, m_spellInfo->CalculateSimpleValue(eff_idx), true);
+                    m_caster->CastSpell(m_caster, 47967, true);
+                    return;
+                }
+                case 64380:                                 // Shattering Throw
+                {
+                    if (!unitTarget || !unitTarget->isAlive() || unitTarget->HasAura(64382))
+                        return;
+
+                    // remove unvulnerability effects
+                    unitTarget->RemoveAurasAtMechanicImmunity(IMMUNE_BY_UNVULNERABILITY_MASK,0);
+                    break;
+                }
             }
             break;
         }
     }
 
+
     // normal DB scripted effect
     if (!unitTarget)
         return;
 
+    // Linked spells (SCRIPTEFFECT chain)
+    SpellLinkedSet linkedSet = sSpellMgr.GetSpellLinked(m_spellInfo->Id, SPELL_LINKED_TYPE_SCRIPTEFFECT);
+    if (linkedSet.size() > 0)
+    {
+        for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+            m_caster->CastSpell(unitTarget, *itr, true, NULL, NULL, m_caster->GetObjectGuid(), m_spellInfo);
+    }
+
+    // Script based implementation. Must be used only for not good for implementation in core spell effects
+    // So called only for not processed cases
+    if (unitTarget->GetTypeId() == TYPEID_UNIT)
+    {
+        if (sScriptMgr.OnEffectScriptEffect(m_caster, m_spellInfo->Id, eff_idx, (Creature*)unitTarget, m_originalCasterGuid))
+            return;
+    }
+
     // Previous effect might have started script
     if (!ScriptMgr::CanSpellEffectStartDBScript(m_spellInfo, eff_idx))
         return;
@@ -8249,7 +12020,7 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
 
 void Spell::EffectSanctuary(SpellEffectIndex /*eff_idx*/)
 {
-    if(!unitTarget)
+    if (!unitTarget)
         return;
     //unitTarget->CombatStop();
 
@@ -8257,27 +12028,24 @@ void Spell::EffectSanctuary(SpellEffectIndex /*eff_idx*/)
     unitTarget->getHostileRefManager().deleteReferences();  // stop all fighting
 
     // Vanish allows to remove all threat and cast regular stealth so other spells can be used
-    if (m_spellInfo->IsFitToFamily(SPELLFAMILY_ROGUE, UI64LIT(0x0000000000000800)))
+    if (m_spellInfo->IsFitToFamily<SPELLFAMILY_ROGUE, CF_ROGUE_VANISH>())
         ((Player *)m_caster)->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
 }
 
 void Spell::EffectAddComboPoints(SpellEffectIndex /*eff_idx*/)
 {
-    if(!unitTarget)
-        return;
-
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget)
         return;
 
-    if(damage <= 0)
+    if (damage <= 0)
         return;
 
-    ((Player*)m_caster)->AddComboPoints(unitTarget, damage);
+    m_caster->AddComboPoints(unitTarget, damage);
 }
 
 void Spell::EffectDuel(SpellEffectIndex eff_idx)
 {
-    if(!m_caster || !unitTarget || m_caster->GetTypeId() != TYPEID_PLAYER || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!m_caster || !unitTarget || m_caster->GetTypeId() != TYPEID_PLAYER || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
     Player *caster = (Player*)m_caster;
@@ -8308,7 +12076,7 @@ void Spell::EffectDuel(SpellEffectIndex eff_idx)
     uint32 gameobject_id = m_spellInfo->EffectMiscValue[eff_idx];
 
     Map *map = m_caster->GetMap();
-    if(!pGameObj->Create(map->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), gameobject_id,
+    if (!pGameObj->Create(map->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), gameobject_id,
         map, m_caster->GetPhaseMask(),
         m_caster->GetPositionX()+(unitTarget->GetPositionX()-m_caster->GetPositionX())/2 ,
         m_caster->GetPositionY()+(unitTarget->GetPositionY()-m_caster->GetPositionY())/2 ,
@@ -8353,14 +12121,16 @@ void Spell::EffectDuel(SpellEffectIndex eff_idx)
 
     caster->SetGuidValue(PLAYER_DUEL_ARBITER, pGameObj->GetObjectGuid());
     target->SetGuidValue(PLAYER_DUEL_ARBITER, pGameObj->GetObjectGuid());
+
+    SendEffectLogExecute(eff_idx, pGameObj->GetObjectGuid());
 }
 
 void Spell::EffectStuck(SpellEffectIndex /*eff_idx*/)
 {
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    if(!sWorld.getConfig(CONFIG_BOOL_CAST_UNSTUCK))
+    if (!sWorld.getConfig(CONFIG_BOOL_CAST_UNSTUCK))
         return;
 
     Player* pTarget = (Player*)unitTarget;
@@ -8368,33 +12138,34 @@ void Spell::EffectStuck(SpellEffectIndex /*eff_idx*/)
     DEBUG_LOG("Spell Effect: Stuck");
     DETAIL_LOG("Player %s (guid %u) used auto-unstuck future at map %u (%f, %f, %f)", pTarget->GetName(), pTarget->GetGUIDLow(), m_caster->GetMapId(), m_caster->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ());
 
-    if(pTarget->IsTaxiFlying())
+    if (pTarget->IsTaxiFlying() || pTarget->InBattleGround())
         return;
 
-    // homebind location is loaded always
-    pTarget->TeleportToHomebind(unitTarget==m_caster ? TELE_TO_SPELL : 0);
+    pTarget->RepopAtGraveyard();
 
     // Stuck spell trigger Hearthstone cooldown
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(8690);
-    if(!spellInfo)
+    if (!spellInfo)
         return;
+
     Spell spell(pTarget, spellInfo, true);
     spell.SendSpellCooldown();
 }
 
 void Spell::EffectSummonPlayer(SpellEffectIndex /*eff_idx*/)
 {
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
     // Evil Twin (ignore player summon, but hide this for summoner)
-    if(unitTarget->GetDummyAura(23445))
+    if (unitTarget->GetDummyAura(23445))
         return;
 
-    float x, y, z;
-    m_caster->GetClosePoint(x, y, z, unitTarget->GetObjectBoundingRadius());
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetClosePoint(unitTarget->GetObjectBoundingRadius());
 
-    ((Player*)unitTarget)->SetSummonPoint(m_caster->GetMapId(),x,y,z);
+    ((Player*)unitTarget)->SetSummonPoint(loc);
 
     WorldPacket data(SMSG_SUMMON_REQUEST, 8+4+4);
     data << m_caster->GetObjectGuid();                      // summoner guid
@@ -8409,38 +12180,173 @@ static ScriptInfo generateActivateCommand()
     si.command = SCRIPT_COMMAND_ACTIVATE_OBJECT;
     si.id = 0;
     si.buddyEntry = 0;
-    si.searchRadius = 0;
+    si.searchRadiusOrGuid = 0;
     si.data_flags = 0x00;
     return si;
 }
 
 void Spell::EffectActivateObject(SpellEffectIndex eff_idx)
 {
-    if(!gameObjTarget)
+    if (!gameObjTarget)
         return;
 
-    static ScriptInfo activateCommand = generateActivateCommand();
+    uint32 misc_value = m_spellInfo->EffectMiscValue[eff_idx];
+
+    switch (misc_value)
+    {
+        case 1:                     // GO simple use
+        case 2:                     // unk - 2 spells
+        case 4:                     // unk - 1 spell
+        case 5:                     // GO trap usage
+        case 7:                     // unk - 2 spells
+        case 8:                     // GO usage with TargetB = none or random
+        case 10:                    // GO explosions
+        case 11:                    // unk - 1 spell
+        case 19:                    // unk - 1 spell
+        case 20:                    // unk - 2 spells
+        {
+            static ScriptInfo activateCommand = generateActivateCommand();
+
+            int32 delay_secs = m_spellInfo->CalculateSimpleValue(eff_idx);
+
+            gameObjTarget->GetMap()->ScriptCommandStart(activateCommand, delay_secs, m_caster, gameObjTarget);
+            break;
+        }
+        case 3:                     // GO custom anim - found mostly in Lunar Fireworks spells
+            gameObjTarget->SendGameObjectCustomAnim(gameObjTarget->GetObjectGuid());
+            break;
+        case 12:                    // GO state active alternative - found mostly in Simon Game spells
+            gameObjTarget->UseDoorOrButton(0, true);
+            break;
+        case 13:                    // GO state ready - found only in Simon Game spells
+            gameObjTarget->ResetDoorOrButton();
+            break;
+        case 15:                    // GO destroy
+            gameObjTarget->SetLootState(GO_JUST_DEACTIVATED);
+            break;
+        case 16:                    // GO custom use - found mostly in Wind Stones spells, Simon Game spells and other GO target summoning spells
+        {
+            switch (m_spellInfo->Id)
+            {
+                case 24734:         // Summon Templar Random
+                case 24744:         // Summon Templar (fire)
+                case 24756:         // Summon Templar (air)
+                case 24758:         // Summon Templar (earth)
+                case 24760:         // Summon Templar (water)
+                case 24763:         // Summon Duke Random
+                case 24765:         // Summon Duke (fire)
+                case 24768:         // Summon Duke (air)
+                case 24770:         // Summon Duke (earth)
+                case 24772:         // Summon Duke (water)
+                case 24784:         // Summon Royal Random
+                case 24786:         // Summon Royal (fire)
+                case 24788:         // Summon Royal (air)
+                case 24789:         // Summon Royal (earth)
+                case 24790:         // Summon Royal (water)
+                {
+                    uint32 npcEntry = 0;
+                    uint32 templars[] = {15209, 15211, 15212, 15307};
+                    uint32 dukes[] = {15206, 15207, 15208, 15220};
+                    uint32 royals[] = {15203, 15204, 15205, 15305};
+
+                    switch (m_spellInfo->Id)
+                    {
+                        case 24734: npcEntry = templars[urand(0, 3)]; break;
+                        case 24763: npcEntry = dukes[urand(0, 3)];    break;
+                        case 24784: npcEntry = royals[urand(0, 3)];   break;
+                        case 24744: npcEntry = 15209;                 break;
+                        case 24756: npcEntry = 15212;                 break;
+                        case 24758: npcEntry = 15307;                 break;
+                        case 24760: npcEntry = 15211;                 break;
+                        case 24765: npcEntry = 15206;                 break;
+                        case 24768: npcEntry = 15220;                 break;
+                        case 24770: npcEntry = 15208;                 break;
+                        case 24772: npcEntry = 15207;                 break;
+                        case 24786: npcEntry = 15203;                 break;
+                        case 24788: npcEntry = 15204;                 break;
+                        case 24789: npcEntry = 15205;                 break;
+                        case 24790: npcEntry = 15305;                 break;
+                    }
+
+                    gameObjTarget->SummonCreature(npcEntry, gameObjTarget->GetPositionX(), gameObjTarget->GetPositionY(), gameObjTarget->GetPositionZ(), gameObjTarget->GetAngle(m_caster), TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, MINUTE * IN_MILLISECONDS);
+                    gameObjTarget->SetLootState(GO_JUST_DEACTIVATED);
+                    break;
+                }
+                case 40176:         // Simon Game pre-game Begin, blue
+                case 40177:         // Simon Game pre-game Begin, green
+                case 40178:         // Simon Game pre-game Begin, red
+                case 40179:         // Simon Game pre-game Begin, yellow
+                case 40283:         // Simon Game END, blue
+                case 40284:         // Simon Game END, green
+                case 40285:         // Simon Game END, red
+                case 40286:         // Simon Game END, yellow
+                case 40494:         // Simon Game, switched ON
+                case 40495:         // Simon Game, switched OFF
+                case 40512:         // Simon Game, switch...disable Off switch
+                    gameObjTarget->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                    break;
+                case 40632:         // Summon Gezzarak the Huntress
+                case 40640:         // Summon Karrog
+                case 40642:         // Summon Darkscreecher Akkarai
+                case 40644:         // Summon Vakkiz the Windrager
+                case 41004:         // Summon Terokk
+                    gameObjTarget->SetLootState(GO_JUST_DEACTIVATED);
+                    break;
+                case 46085:         // Place Fake Fur
+                {
+                    float x, y, z;
+                    gameObjTarget->GetClosePoint(x, y, z, gameObjTarget->GetObjectBoundingRadius(), 2 * INTERACTION_DISTANCE, frand(0, M_PI_F * 2));
+
+                    // Note: event script is implemented in script library
+                    gameObjTarget->SummonCreature(25835, x, y, z, gameObjTarget->GetOrientation(), TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 15000);
+                    gameObjTarget->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
+                    break;
+                }
+                case 46592:         // Summon Ahune Lieutenant
+                {
+                    uint32 npcEntry = 0;
 
-    int32 delay_secs = m_spellInfo->CalculateSimpleValue(eff_idx);
+                    switch (gameObjTarget->GetEntry())
+                    {
+                        case 188049: npcEntry = 26116; break;       // Frostwave Lieutenant (Ashenvale)
+                        case 188137: npcEntry = 26178; break;       // Hailstone Lieutenant (Desolace)
+                        case 188138: npcEntry = 26204; break;       // Chillwind Lieutenant (Stranglethorn)
+                        case 188148: npcEntry = 26214; break;       // Frigid Lieutenant (Searing Gorge)
+                        case 188149: npcEntry = 26215; break;       // Glacial Lieutenant (Silithus)
+                        case 188150: npcEntry = 26216; break;       // Glacial Templar (Hellfire Peninsula)
+                    }
 
-    gameObjTarget->GetMap()->ScriptCommandStart(activateCommand, delay_secs, m_caster, gameObjTarget);
+                    gameObjTarget->SummonCreature(npcEntry, gameObjTarget->GetPositionX(), gameObjTarget->GetPositionY(), gameObjTarget->GetPositionZ(), gameObjTarget->GetAngle(m_caster), TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, MINUTE * IN_MILLISECONDS);
+                    gameObjTarget->SetLootState(GO_JUST_DEACTIVATED);
+                    break;
+                }
+            }
+            break;
+        }
+        case 17:                    // GO unlock - found mostly in Simon Game spells
+            gameObjTarget->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+            break;
+        default:
+            sLog.outError("Spell::EffectActivateObject called with unknown misc value. Spell Id %u", m_spellInfo->Id);
+            break;
+    }
 }
 
 void Spell::EffectApplyGlyph(SpellEffectIndex eff_idx)
 {
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
 
     Player *player = (Player*)m_caster;
 
     // apply new one
-    if(uint32 glyph = m_spellInfo->EffectMiscValue[eff_idx])
+    if (uint32 glyph = m_spellInfo->EffectMiscValue[eff_idx])
     {
-        if(GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph))
+        if (GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph))
         {
-            if(GlyphSlotEntry const *gs = sGlyphSlotStore.LookupEntry(player->GetGlyphSlot(m_glyphIndex)))
+            if (GlyphSlotEntry const *gs = sGlyphSlotStore.LookupEntry(player->GetGlyphSlot(m_glyphIndex)))
             {
-                if(gp->TypeFlags != gs->TypeFlags)
+                if (gp->TypeFlags != gs->TypeFlags)
                 {
                     SendCastResult(SPELL_FAILED_INVALID_GLYPH);
                     return;                                 // glyph slot mismatch
@@ -8498,6 +12404,12 @@ void Spell::DoSummonTotem(SpellEffectIndex eff_idx, uint8 slot_dbc)
 
     pTotem->SetDuration(m_duration);
 
+    if (m_spellInfo->Id == 16190)
+        damage = m_caster->GetMaxHealth() * m_spellInfo->CalculateSimpleValue(EFFECT_INDEX_1) / 100;
+
+    if (m_spellInfo->Id == 51052) // Anti-Magic Zone
+        damage += m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 2; //AP bonus;
+
     if (damage)                                             // if not spell info, DB values used
     {
         pTotem->SetMaxHealth(damage);
@@ -8527,57 +12439,58 @@ void Spell::DoSummonTotem(SpellEffectIndex eff_idx, uint8 slot_dbc)
     }
 
     pTotem->Summon(m_caster);
+
+    SendEffectLogExecute(eff_idx, pTotem->GetObjectGuid());
 }
 
 void Spell::EffectEnchantHeldItem(SpellEffectIndex eff_idx)
 {
     // this is only item spell effect applied to main-hand weapon of target player (players in area)
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
     Player* item_owner = (Player*)unitTarget;
     Item* item = item_owner->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
 
-    if(!item )
+    if (!item )
         return;
 
     // must be equipped
-    if(!item ->IsEquipped())
+    if (!item ->IsEquipped())
         return;
 
     if (m_spellInfo->EffectMiscValue[eff_idx])
     {
         uint32 enchant_id = m_spellInfo->EffectMiscValue[eff_idx];
         int32 duration = m_duration;                        // Try duration index first...
-        if(!duration)
-            duration = m_currentBasePoints[eff_idx];        // Base points after...
-        if(!duration)
-            duration = 10;                                  // 10 seconds for enchants which don't have listed duration
+        if (!duration)
+            duration = 10 * IN_MILLISECONDS;                // 10 seconds for enchants which don't have listed duration
+
+        SpellItemEnchantmentEntry const* pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
 
-        SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
-        if(!pEnchant)
+        if (!pEnchant)
             return;
 
         // Always go to temp enchantment slot
         EnchantmentSlot slot = TEMP_ENCHANTMENT_SLOT;
 
         // Enchantment will not be applied if a different one already exists
-        if(item->GetEnchantmentId(slot) && item->GetEnchantmentId(slot) != enchant_id)
+        if (item->GetEnchantmentId(slot) && item->GetEnchantmentId(slot) != enchant_id)
             return;
 
         // Apply the temporary enchantment
-        item->SetEnchantment(slot, enchant_id, duration*IN_MILLISECONDS, 0);
+        item->SetEnchantment(slot, enchant_id, duration, 0);
         item_owner->ApplyEnchantment(item, slot, true);
     }
 }
 
 void Spell::EffectDisEnchant(SpellEffectIndex /*eff_idx*/)
 {
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
 
     Player* p_caster = (Player*)m_caster;
-    if(!itemTarget || !itemTarget->GetProto()->DisenchantID)
+    if (!itemTarget || !itemTarget->GetProto()->DisenchantID)
         return;
 
     p_caster->UpdateCraftSkill(m_spellInfo->Id);
@@ -8589,59 +12502,67 @@ void Spell::EffectDisEnchant(SpellEffectIndex /*eff_idx*/)
 
 void Spell::EffectInebriate(SpellEffectIndex /*eff_idx*/)
 {
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    Player *player = (Player*)unitTarget;
-    uint16 currentDrunk = player->GetDrunkValue();
-    uint16 drunkMod = damage * 256;
-    if (currentDrunk + drunkMod > 0xFFFF)
-        currentDrunk = 0xFFFF;
-    else
-        currentDrunk += drunkMod;
-    player->SetDrunkValue(currentDrunk, m_CastItem ? m_CastItem->GetEntry() : 0);
+    Player* player = (Player*)unitTarget;
+
+    uint8 drunkValue = player->GetDrunkValue() + (uint8)damage;
+    if (drunkValue > 100)
+    {
+        drunkValue = 100;
+
+        if (roll_chance_i(25))
+            player->CastSpell(player, 67468, false);    // Drunken Vomit
+    }
+
+    player->SetDrunkValue(drunkValue, m_CastItem ? m_CastItem->GetEntry() : 0);
 }
 
 void Spell::EffectFeedPet(SpellEffectIndex eff_idx)
 {
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
 
     Player *_player = (Player*)m_caster;
 
     Item* foodItem = m_targets.getItemTarget();
-    if(!foodItem)
+    if (!foodItem)
         return;
 
     Pet *pet = _player->GetPet();
-    if(!pet)
+    if (!pet)
         return;
 
-    if(!pet->isAlive())
+    if (!pet->isAlive())
         return;
 
     int32 benefit = pet->GetCurrentFoodBenefitLevel(foodItem->GetProto()->ItemLevel);
-    if(benefit <= 0)
+    if (benefit <= 0)
         return;
 
     uint32 count = 1;
+    uint32 entry = foodItem ? foodItem->GetObjectGuid().GetEntry() : 0;
     _player->DestroyItemCount(foodItem,count,true);
     // TODO: fix crash when a spell has two effects, both pointed at the same item target
 
     m_caster->CastCustomSpell(pet, m_spellInfo->EffectTriggerSpell[eff_idx], &benefit, NULL, NULL, true);
+
+    SendEffectLogExecute(eff_idx, ObjectGuid(), entry);
 }
 
-void Spell::EffectDismissPet(SpellEffectIndex /*eff_idx*/)
+void Spell::EffectDismissPet(SpellEffectIndex eff_idx)
 {
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
 
     Pet* pet = m_caster->GetPet();
 
     // not let dismiss dead pet
-    if(!pet||!pet->isAlive())
+    if (!pet || !pet->isAlive())
         return;
 
+    SendEffectLogExecute(eff_idx, pet->GetObjectGuid());
     pet->Unsummon(PET_SAVE_NOT_IN_SLOT, m_caster);
 }
 
@@ -8668,21 +12589,16 @@ void Spell::EffectSummonObject(SpellEffectIndex eff_idx)
 
     GameObject* pGameObj = new GameObject;
 
-    float x, y, z;
-    // If dest location if present
-    if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
-    {
-        x = m_targets.m_destX;
-        y = m_targets.m_destY;
-        z = m_targets.m_destZ;
-    }
-    // Summon in random point all other units if location present
-    else
-        m_caster->GetClosePoint(x, y, z, DEFAULT_WORLD_OBJECT_SIZE);
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetPosition();
 
-    Map *map = m_caster->GetMap();
+    if (m_spellInfo->Id != 48018)
+        m_caster->GetClosePoint(loc.x, loc.y, loc.z, DEFAULT_WORLD_OBJECT_SIZE);
+
+    Map* map = m_caster->GetMap();
     if(!pGameObj->Create(map->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), go_id, map,
-        m_caster->GetPhaseMask(), x, y, z, m_caster->GetOrientation()))
+        m_caster->GetPhaseMask(), loc.x, loc.y, loc.z, m_caster->GetOrientation()))
     {
         delete pGameObj;
         return;
@@ -8703,9 +12619,11 @@ void Spell::EffectSummonObject(SpellEffectIndex eff_idx)
         ((Creature*)m_caster)->AI()->JustSummoned(pGameObj);
     if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
         ((Creature*)m_originalCaster)->AI()->JustSummoned(pGameObj);
+
+    SendEffectLogExecute(eff_idx, pGameObj->GetObjectGuid());
 }
 
-void Spell::EffectResurrect(SpellEffectIndex /*eff_idx*/)
+void Spell::EffectResurrect(SpellEffectIndex eff_idx)
 {
     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
@@ -8742,7 +12660,7 @@ void Spell::EffectResurrect(SpellEffectIndex /*eff_idx*/)
 
     Player* pTarget = ((Player*)unitTarget);
 
-    if(pTarget->isRessurectRequested())       // already have one active request
+    if (pTarget->isRessurectRequested())       // already have one active request
         return;
 
     uint32 health = pTarget->GetMaxHealth() * damage / 100;
@@ -8750,17 +12668,21 @@ void Spell::EffectResurrect(SpellEffectIndex /*eff_idx*/)
 
     pTarget->setResurrectRequestData(m_caster->GetObjectGuid(), m_caster->GetMapId(), m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), health, mana);
     SendResurrectRequest(pTarget);
+
+    SendEffectLogExecute(eff_idx, pTarget->GetObjectGuid());
 }
 
-void Spell::EffectAddExtraAttacks(SpellEffectIndex /*eff_idx*/)
+void Spell::EffectAddExtraAttacks(SpellEffectIndex eff_idx)
 {
-    if(!unitTarget || !unitTarget->isAlive())
+    if (!unitTarget || !unitTarget->isAlive())
         return;
 
-    if( unitTarget->m_extraAttacks )
+    if (unitTarget->m_extraAttacks)
         return;
 
     unitTarget->m_extraAttacks = damage;
+
+    SendEffectLogExecute(eff_idx, unitTarget->GetObjectGuid(), damage);
 }
 
 void Spell::EffectParry(SpellEffectIndex /*eff_idx*/)
@@ -8777,30 +12699,30 @@ void Spell::EffectBlock(SpellEffectIndex /*eff_idx*/)
 
 void Spell::EffectLeapForward(SpellEffectIndex eff_idx)
 {
-    if(unitTarget->IsTaxiFlying())
+    if (!unitTarget || unitTarget->IsTaxiFlying())
         return;
 
-    if( m_spellInfo->rangeIndex == 1)                       //self range
+    if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
     {
-        float dis = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[eff_idx]));
+        WorldLocation loc =  m_targets.getDestination();
 
-        // before caster
-        float fx, fy, fz;
-        unitTarget->GetClosePoint(fx, fy, fz, unitTarget->GetObjectBoundingRadius(), dis);
-        float ox, oy, oz;
-        unitTarget->GetPosition(ox, oy, oz);
+        // Try to normalize Z coord
+        m_caster->UpdateGroundPositionZ(loc.x, loc.y, loc.z);
+        loc.z += 0.2f;
 
-        float fx2, fy2, fz2;                                // getObjectHitPos overwrite last args in any result case
-        if(VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(unitTarget->GetMapId(), ox,oy,oz+0.5f, fx,fy,oz+0.5f,fx2,fy2,fz2, -0.5f))
+        if (sWorld.getConfig(CONFIG_BOOL_BLINK_ANIMATION_TYPE))
         {
-            fx = fx2;
-            fy = fy2;
-            fz = fz2;
-            unitTarget->UpdateAllowedPositionZ(fx, fy, fz);
+            float speed = BASE_CHARGE_SPEED * 10.0f;
+            m_caster->MonsterMoveWithSpeed(loc.x, loc.y, loc.z, speed, !m_caster->IsFalling(), true);
+        }
+        else
+        {
+            unitTarget->SetFallInformation(0, unitTarget->GetPositionZ());
+            unitTarget->NearTeleportTo(loc.x, loc.y, loc.z, m_caster->GetOrientation(), unitTarget == m_caster);
         }
-
-        unitTarget->NearTeleportTo(fx, fy, fz, unitTarget->GetOrientation(), unitTarget == m_caster);
     }
+    else
+        sLog.outError("Spell::EffectLeapForward teleport %s failed - desination point not setted.", unitTarget->GetObjectGuid().GetString().c_str());
 }
 
 void Spell::EffectLeapBack(SpellEffectIndex eff_idx)
@@ -8813,7 +12735,7 @@ void Spell::EffectLeapBack(SpellEffectIndex eff_idx)
 
 void Spell::EffectReputation(SpellEffectIndex eff_idx)
 {
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
     Player *_player = (Player*)unitTarget;
@@ -8823,7 +12745,7 @@ void Spell::EffectReputation(SpellEffectIndex eff_idx)
 
     FactionEntry const* factionEntry = sFactionStore.LookupEntry(faction_id);
 
-    if(!factionEntry)
+    if (!factionEntry)
         return;
 
     rep_change = _player->CalculateReputationGain(REPUTATION_SOURCE_SPELL, rep_change, faction_id);
@@ -8861,18 +12783,20 @@ void Spell::EffectQuestComplete(SpellEffectIndex eff_idx)
 
 void Spell::EffectSelfResurrect(SpellEffectIndex eff_idx)
 {
-    if(!unitTarget || unitTarget->isAlive())
+    if (!unitTarget || unitTarget->isAlive())
         return;
-    if(unitTarget->GetTypeId() != TYPEID_PLAYER)
+
+    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-    if(!unitTarget->IsInWorld())
+
+    if (!unitTarget->IsInWorld())
         return;
 
     uint32 health = 0;
     uint32 mana = 0;
 
     // flat case
-    if(damage < 0)
+    if (damage < 0)
     {
         health = uint32(-damage);
         mana = m_spellInfo->EffectMiscValue[eff_idx];
@@ -8881,12 +12805,12 @@ void Spell::EffectSelfResurrect(SpellEffectIndex eff_idx)
     else
     {
         health = uint32(damage/100.0f*unitTarget->GetMaxHealth());
-        if(unitTarget->GetMaxPower(POWER_MANA) > 0)
+        if (unitTarget->GetMaxPower(POWER_MANA) > 0)
             mana = uint32(damage/100.0f*unitTarget->GetMaxPower(POWER_MANA));
     }
 
     Player *plr = ((Player*)unitTarget);
-    plr->ResurrectPlayer(0.0f);
+    plr->ResurrectPlayer(0);
 
     plr->SetHealth( health );
     plr->SetPower(POWER_MANA, mana );
@@ -8898,9 +12822,10 @@ void Spell::EffectSelfResurrect(SpellEffectIndex eff_idx)
 
 void Spell::EffectSkinning(SpellEffectIndex /*eff_idx*/)
 {
-    if(unitTarget->GetTypeId() != TYPEID_UNIT )
+    if (unitTarget->GetTypeId() != TYPEID_UNIT )
         return;
-    if(!m_caster || m_caster->GetTypeId() != TYPEID_PLAYER)
+
+    if (!m_caster || m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
 
     Creature* creature = (Creature*) unitTarget;
@@ -8921,44 +12846,65 @@ void Spell::EffectSkinning(SpellEffectIndex /*eff_idx*/)
 
 void Spell::EffectCharge(SpellEffectIndex /*eff_idx*/)
 {
-    if (!unitTarget)
+    if (!unitTarget || !m_caster)
         return;
 
-    //TODO: research more ContactPoint/attack distance.
-    //3.666666 instead of ATTACK_DISTANCE(5.0f) in below seem to give more accurate result.
-    float x, y, z;
-    unitTarget->GetContactPoint(m_caster, x, y, z, 3.666666f);
+    WorldLocation loc = m_caster->GetPosition();
+    unitTarget->GetContactPoint(m_caster, loc.x, loc.y, loc.z);
+
+    // Try to normalize Z coord cuz GetContactPoint do nothing with Z axis
+    m_caster->UpdateAllowedPositionZ(loc.x, loc.y, loc.z);
 
     if (unitTarget->GetTypeId() != TYPEID_PLAYER)
-        ((Creature *)unitTarget)->StopMoving();
+        ((Creature*)unitTarget)->StopMoving();
+
+    float speed = m_spellInfo->GetSpeed() ? m_spellInfo->GetSpeed() : BASE_CHARGE_SPEED;
+
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::EffectCharge spell %u caster %s target %s speed %f dest. point %f %f %f",
+             m_spellInfo->Id,
+             m_caster ? m_caster->GetObjectGuid().GetString().c_str() : "<none>",
+             unitTarget ? unitTarget->GetObjectGuid().GetString().c_str() : "<none>",
+             speed, loc.x, loc.y, loc.z);
 
-    // Only send MOVEMENTFLAG_WALK_MODE, client has strange issues with other move flags
-    m_caster->MonsterMoveWithSpeed(x, y, z, 24.f, true, true);
+    if (m_caster->IsFalling())
+        m_caster->MonsterMoveWithSpeed(loc.x, loc.y, loc.z, speed, false, false);
+    else
+        m_caster->MonsterMoveToDestination(loc.x, loc.y, loc.z, loc.o, speed, 0, false, unitTarget);
 
     // not all charge effects used in negative spells
     if (unitTarget != m_caster && !IsPositiveSpell(m_spellInfo->Id))
         m_caster->Attack(unitTarget, true);
+
+   //Warbringer - remove movement imparing effects for Intervene
+    if (m_spellInfo->Id == 3411 && m_caster->HasAura(57499) )
+        m_caster->RemoveAurasAtMechanicImmunity(IMMUNE_TO_ROOT_AND_SNARE_MASK,57499,true);
 }
 
 void Spell::EffectCharge2(SpellEffectIndex /*eff_idx*/)
 {
-    float x, y, z;
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetPosition();
+
     if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
     {
-        x = m_targets.m_destX;
-        y = m_targets.m_destY;
-        z = m_targets.m_destZ;
-
         if (unitTarget->GetTypeId() != TYPEID_PLAYER)
             ((Creature *)unitTarget)->StopMoving();
     }
     else if (unitTarget && unitTarget != m_caster)
-        unitTarget->GetContactPoint(m_caster, x, y, z, 3.666666f);
+        unitTarget->GetContactPoint(m_caster, loc.x, loc.y, loc.z);
     else
         return;
 
-    // Only send MOVEMENTFLAG_WALK_MODE, client has strange issues with other move flags
-    m_caster->MonsterMoveWithSpeed(x, y, z, 24.f, true, true);
+    // Try to normalize Z coord cuz GetContactPoint do nothing with Z axis
+    m_caster->UpdateAllowedPositionZ(loc.x, loc.y, loc.z);
+
+    float speed = m_spellInfo->GetSpeed() ? m_spellInfo->GetSpeed() : BASE_CHARGE_SPEED;
+
+    if (m_caster->IsFalling())
+        m_caster->MonsterMoveWithSpeed(loc.x, loc.y, loc.z, speed, false, false);
+    else
+        m_caster->MonsterMoveToDestination(loc.x, loc.y, loc.z, loc.o, speed, 0, false, unitTarget);
 
     // not all charge effects used in negative spells
     if (unitTarget && unitTarget != m_caster && !IsPositiveSpell(m_spellInfo->Id))
@@ -8968,7 +12914,7 @@ void Spell::EffectCharge2(SpellEffectIndex /*eff_idx*/)
 void Spell::DoSummonCritter(SpellEffectIndex eff_idx, uint32 forceFaction)
 {
     uint32 pet_entry = m_spellInfo->EffectMiscValue[eff_idx];
-    if(!pet_entry)
+    if (!pet_entry)
         return;
 
     CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(pet_entry);
@@ -8991,50 +12937,47 @@ void Spell::DoSummonCritter(SpellEffectIndex eff_idx, uint32 forceFaction)
     if (old_critter)
         m_caster->RemoveMiniPet();
 
-    CreatureCreatePos pos(m_caster->GetMap(), m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, m_caster->GetOrientation(), m_caster->GetPhaseMask());
-    if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
-        pos = CreatureCreatePos(m_caster, m_caster->GetOrientation());
-
     // summon new pet
     Pet* critter = new Pet(MINI_PET);
 
-    Map *map = m_caster->GetMap();
-    uint32 pet_number = sObjectMgr.GeneratePetNumber();
-    if (!critter->Create(map->GenerateLocalLowGuid(HIGHGUID_PET), pos, cInfo, pet_number))
+    CreatureCreatePos pos = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                                CreatureCreatePos(m_caster->GetMap(), m_targets.getDestination()) :
+                                CreatureCreatePos(m_caster, m_caster->GetOrientation());
+
+    uint32 originalSpellID = (m_IsTriggeredSpell && m_triggeredBySpellInfo) ? m_triggeredBySpellInfo->Id : m_spellInfo->Id;
+
+    critter->SetCreateSpellID(originalSpellID);
+    critter->SetDuration(m_duration);
+
+    if (!critter->Create(0, pos, cInfo, 0, m_caster))
     {
-        sLog.outError("Spell::EffectSummonCritter, spellid %u: no such creature entry %u", m_spellInfo->Id, pet_entry);
+        sLog.outError("Mini pet (guidlow %d, entry %d) not summoned",
+            critter->GetGUIDLow(), critter->GetEntry());
         delete critter;
         return;
     }
 
-    critter->SetSummonPoint(pos);
-
-    //critter->SetName("");                                 // generated by client
-    critter->SetOwnerGuid(m_caster->GetObjectGuid());
-    critter->SetCreatorGuid(m_caster->GetObjectGuid());
-
-    critter->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
     critter->setFaction(forceFaction ? forceFaction : m_caster->getFaction());
-    critter->AIM_Initialize();
-    critter->InitPetCreateSpells();                         // e.g. disgusting oozeling has a create spell as critter...
-    //critter->InitLevelupSpellsForLevel();                 // none?
-    critter->SelectLevel(critter->GetCreatureInfo());       // some summoned creaters have different from 1 DB data for level/hp
-    critter->SetUInt32Value(UNIT_NPC_FLAGS, critter->GetCreatureInfo()->npcflag);
-                                                            // some mini-pets have quests
-
-    // set timer for unsummon
-    if(m_duration > 0)
-        critter->SetDuration(m_duration);
 
-    m_caster->SetMiniPet(critter);
+    if (!critter->Summon())
+    {
+        sLog.outError("Mini pet (guidlow %d, entry %d) not summoned by undefined reason. ",
+            critter->GetGUIDLow(), critter->GetEntry());
+        delete critter;
+        return;
+    }
 
-    map->Add((Creature*)critter);
+    critter->SetSummonPoint(pos);
 
     // Notify Summoner
     if (m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->AI())
         ((Creature*)m_caster)->AI()->JustSummoned(critter);
     if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
         ((Creature*)m_originalCaster)->AI()->JustSummoned(critter);
+
+    DEBUG_LOG("New mini pet %s summoned", critter->GetObjectGuid().GetString().c_str());
+    SendEffectLogExecute(eff_idx, critter->GetObjectGuid());
+
 }
 
 void Spell::EffectKnockBack(SpellEffectIndex eff_idx)
@@ -9042,12 +12985,40 @@ void Spell::EffectKnockBack(SpellEffectIndex eff_idx)
     if (!unitTarget)
         return;
 
+    // Can't knockback unit underwater
+    if (unitTarget->IsInWater())
+        return;
+
+    // Can't knockback rooted target
+    if (unitTarget->hasUnitState(UNIT_STAT_ROOT))
+        return;
+
+    // Can't knockback BG vehicles
+    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+        if (((Creature*)unitTarget)->IsVehicle() && ((Creature*)unitTarget)->GetMap()->IsBattleGround())
+            return;
+
+    // Typhoon
+    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->GetSpellFamilyFlags().test<CF_DRUID_TYPHOON>())
+        if (m_caster->HasAura(62135)) // Glyph of Typhoon
+            return;
+
+    // Thunderstorm
+    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_THUNDERSTORM>())
+        if (m_caster->HasAura(62132)) // Glyph of Thunderstorm
+            return;
+
+    // Blast Wave
+    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_MAGE && m_spellInfo->GetSpellFamilyFlags().test<CF_MAGE_BLAST_WAVE2, CF_MAGE_BLAST_WAVE1>())
+        if (m_caster->HasAura(62126)) // Glyph of Blast Wave
+            return;
+
     unitTarget->KnockBackFrom(m_caster, float(m_spellInfo->EffectMiscValue[eff_idx])/10, float(damage)/10);
 }
 
 void Spell::EffectSendTaxi(SpellEffectIndex eff_idx)
 {
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ((Player*)unitTarget)->ActivateTaxiPathTo(m_spellInfo->EffectMiscValue[eff_idx],m_spellInfo->Id);
@@ -9058,11 +13029,14 @@ void Spell::EffectPlayerPull(SpellEffectIndex eff_idx)
     if (!unitTarget)
         return;
 
+    if (unitTarget->hasUnitState(UNIT_STAT_ROOT))
+        return;
+
     float dist = unitTarget->GetDistance2d(m_caster);
     if (damage && dist > damage)
         dist = float(damage);
 
-    unitTarget->KnockBackFrom(m_caster, -dist, float(m_spellInfo->EffectMiscValue[eff_idx])/10);
+    unitTarget->KnockBackFrom(m_caster, -dist, float(m_spellInfo->EffectMiscValue[eff_idx])/30);
 }
 
 void Spell::EffectDispelMechanic(SpellEffectIndex eff_idx)
@@ -9091,15 +13065,19 @@ void Spell::EffectDispelMechanic(SpellEffectIndex eff_idx)
 
 void Spell::EffectSummonDeadPet(SpellEffectIndex /*eff_idx*/)
 {
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
+
     Player *_player = (Player*)m_caster;
     Pet *pet = _player->GetPet();
-    if(!pet)
+
+    if (!pet)
         return;
-    if(pet->isAlive())
+
+    if (pet->isAlive())
         return;
-    if(damage < 0)
+
+    if (damage < 0)
         return;
 
     pet->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE);
@@ -9116,7 +13094,7 @@ void Spell::EffectSummonDeadPet(SpellEffectIndex /*eff_idx*/)
 
 void Spell::EffectSummonAllTotems(SpellEffectIndex eff_idx)
 {
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
 
     int32 start_button = ACTION_BUTTON_SHAMAN_TOTEMS_BAR + m_spellInfo->EffectMiscValue[eff_idx];
@@ -9125,8 +13103,27 @@ void Spell::EffectSummonAllTotems(SpellEffectIndex eff_idx)
     for(int32 slot = 0; slot < amount_buttons; ++slot)
         if (ActionButton const* actionButton = ((Player*)m_caster)->GetActionButton(start_button+slot))
             if (actionButton->GetType()==ACTION_BUTTON_SPELL)
-                if (uint32 spell_id = actionButton->GetAction())
-                    m_caster->CastSpell(unitTarget,spell_id,true);
+                if (uint32 spell_Id = actionButton->GetAction())
+                {
+                    /* process anticheat check */
+                    if (!((Player*)m_caster)->GetAntiCheat()->DoAntiCheatCheck(CHECK_SPELL, spell_Id, CMSG_CAST_SPELL))
+                        return;
+
+                    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_Id);
+
+                    // not have spell in spellbook or spell passive and not casted by client
+                    if (!spellInfo ||
+                       (((Player*)m_caster)->GetUInt16Value(PLAYER_FIELD_BYTES2, 0) == 0 &&
+                        (!((Player*)m_caster)->HasActiveSpell(spell_Id))) ||
+                        IsPassiveSpell(spellInfo))
+                    {
+                        sLog.outError("Spell::EffectSummonAllTotems: unknown spell id %u in player %s totem slot! WPE cheat detected!", spell_Id,m_caster->GetObjectGuid().GetString().c_str());
+                        return;
+                    }
+
+                    if (!m_caster->HasSpellCooldown(spell_Id))
+                        m_caster->CastSpell(unitTarget,spellInfo,true);
+                }
 }
 
 void Spell::EffectDestroyAllTotems(SpellEffectIndex /*eff_idx*/)
@@ -9165,56 +13162,62 @@ void Spell::EffectBreakPlayerTargeting (SpellEffectIndex /* eff_idx */)
 
 void Spell::EffectDurabilityDamage(SpellEffectIndex eff_idx)
 {
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
     int32 slot = m_spellInfo->EffectMiscValue[eff_idx];
 
     // FIXME: some spells effects have value -1/-2
     // Possibly its mean -1 all player equipped items and -2 all items
-    if(slot < 0)
+    if (slot < 0)
     {
         ((Player*)unitTarget)->DurabilityPointsLossAll(damage, (slot < -1));
         return;
     }
 
     // invalid slot value
-    if(slot >= INVENTORY_SLOT_BAG_END)
+    if (slot >= INVENTORY_SLOT_BAG_END)
         return;
 
-    if(Item* item = ((Player*)unitTarget)->GetItemByPos(INVENTORY_SLOT_BAG_0, slot))
+    if (Item* item = ((Player*)unitTarget)->GetItemByPos(INVENTORY_SLOT_BAG_0, slot))
+    {
         ((Player*)unitTarget)->DurabilityPointsLoss(item, damage);
+        SendEffectLogExecute(eff_idx, unitTarget->GetObjectGuid(), m_spellInfo->Id, damage);
+    }
 }
 
 void Spell::EffectDurabilityDamagePCT(SpellEffectIndex eff_idx)
 {
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
     int32 slot = m_spellInfo->EffectMiscValue[eff_idx];
 
     // FIXME: some spells effects have value -1/-2
     // Possibly its mean -1 all player equipped items and -2 all items
-    if(slot < 0)
+    if (slot < 0)
     {
         ((Player*)unitTarget)->DurabilityLossAll(double(damage)/100.0f, (slot < -1));
         return;
     }
 
     // invalid slot value
-    if(slot >= INVENTORY_SLOT_BAG_END)
+    if (slot >= INVENTORY_SLOT_BAG_END)
         return;
 
-    if(damage <= 0)
+    if (damage <= 0)
         return;
 
-    if(Item* item = ((Player*)unitTarget)->GetItemByPos(INVENTORY_SLOT_BAG_0, slot))
+    if (Item* item = ((Player*)unitTarget)->GetItemByPos(INVENTORY_SLOT_BAG_0, slot))
+    {
         ((Player*)unitTarget)->DurabilityLoss(item, double(damage)/100.0f);
+        SendEffectLogExecute(eff_idx, unitTarget->GetObjectGuid(), m_spellInfo->Id, damage);
+    }
 }
 
 void Spell::EffectModifyThreatPercent(SpellEffectIndex /*eff_idx*/)
 {
-    if(!unitTarget)
+    if (!unitTarget)
         return;
 
     unitTarget->getThreatManager().modifyThreatPercent(m_caster, damage);
@@ -9232,24 +13235,20 @@ void Spell::EffectTransmitted(SpellEffectIndex eff_idx)
         return;
     }
 
-    float fx, fy, fz;
+    WorldLocation loc = m_caster->GetPosition();
 
-    if(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
-    {
-        fx = m_targets.m_destX;
-        fy = m_targets.m_destY;
-        fz = m_targets.m_destZ;
-    }
-    //FIXME: this can be better check for most objects but still hack
-    else if(m_spellInfo->EffectRadiusIndex[eff_idx] && m_spellInfo->speed==0)
+    if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
+        loc = m_targets.getDestination();
+    // FIXME: this can be better check for most objects but still hack
+    else if (m_spellInfo->EffectRadiusIndex[eff_idx] && m_spellInfo->GetSpeed() == 0)
     {
         float dis = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[eff_idx]));
-        m_caster->GetClosePoint(fx, fy, fz, DEFAULT_WORLD_OBJECT_SIZE, dis);
+        m_caster->GetClosePoint(loc.x, loc.y, loc.z, DEFAULT_WORLD_OBJECT_SIZE, dis);
     }
     else
     {
-        float min_dis = GetSpellMinRange(sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex));
-        float max_dis = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex));
+        float min_dis = GetSpellMinRange(sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex()));
+        float max_dis = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->GetRangeIndex()));
         float dis = rand_norm_f() * (max_dis - min_dis) + min_dis;
 
         // special code for fishing bobber (TARGET_SELF_FISHING), should not try to avoid objects
@@ -9259,19 +13258,24 @@ void Spell::EffectTransmitted(SpellEffectIndex eff_idx)
             // calculate angle variation for roughly equal dimensions of target area
             float max_angle = (max_dis - min_dis)/(max_dis + m_caster->GetObjectBoundingRadius());
             float angle_offset = max_angle * (rand_norm_f() - 0.5f);
-            m_caster->GetNearPoint2D(fx, fy, dis, m_caster->GetOrientation() + angle_offset);
+            m_caster->GetNearPoint2D(loc.x, loc.y, dis + m_caster->GetObjectBoundingRadius(), m_caster->GetOrientation() + angle_offset);
 
-            GridMapLiquidData liqData;
-            if (!m_caster->GetTerrain()->IsInWater(fx, fy, m_caster->GetPositionZ() + 1.f, &liqData))
+            if (!m_caster->GetTerrain()->IsAboveWater(loc.x, loc.y, m_caster->GetPositionZ() + 1.5f, &loc.z))
             {
                 SendCastResult(SPELL_FAILED_NOT_FISHABLE);
                 SendChannelUpdate(0);
                 return;
             }
 
-            fz = liqData.level;
+            if (m_caster->GetPositionZ() < (loc.z - 1.0f))
+            {
+                SendCastResult(SPELL_FAILED_ONLY_ABOVEWATER);
+                SendChannelUpdate(0);
+                return;
+            }
+
             // finally, check LoS
-            if (!m_caster->IsWithinLOS(fx, fy, fz))
+            if (!m_caster->IsWithinLOS(loc.x, loc.y, loc.z))
             {
                 SendCastResult(SPELL_FAILED_LINE_OF_SIGHT);
                 SendChannelUpdate(0);
@@ -9279,22 +13283,18 @@ void Spell::EffectTransmitted(SpellEffectIndex eff_idx)
             }
         }
         else
-            m_caster->GetClosePoint(fx, fy, fz, DEFAULT_WORLD_OBJECT_SIZE, dis);
+            m_caster->GetClosePoint(loc.x, loc.y, loc.z, DEFAULT_WORLD_OBJECT_SIZE, dis);
     }
 
     Map *cMap = m_caster->GetMap();
 
-
-    // if gameobject is summoning object, it should be spawned right on caster's position
     if (goinfo->type == GAMEOBJECT_TYPE_SUMMONING_RITUAL)
-    {
-        m_caster->GetPosition(fx, fy, fz);
-    }
+        loc = m_caster->GetPosition();
 
     GameObject* pGameObj = new GameObject;
 
     if(!pGameObj->Create(cMap->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), name_id, cMap,
-        m_caster->GetPhaseMask(), fx, fy, fz, m_caster->GetOrientation()))
+        m_caster->GetPhaseMask(), loc.x, loc.y, loc.z, loc.o))
     {
         delete pGameObj;
         return;
@@ -9325,7 +13325,7 @@ void Spell::EffectTransmitted(SpellEffectIndex eff_idx)
         }
         case GAMEOBJECT_TYPE_SUMMONING_RITUAL:
         {
-            if(m_caster->GetTypeId() == TYPEID_PLAYER)
+            if (m_caster->GetTypeId() == TYPEID_PLAYER)
             {
                 pGameObj->AddUniqueUse((Player*)m_caster);
                 m_caster->AddGameObject(pGameObj);          // will removed at spell cancel
@@ -9357,6 +13357,7 @@ void Spell::EffectTransmitted(SpellEffectIndex eff_idx)
         ((Creature*)m_caster)->AI()->JustSummoned(pGameObj);
     if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
         ((Creature*)m_originalCaster)->AI()->JustSummoned(pGameObj);
+    SendEffectLogExecute(eff_idx, pGameObj->GetObjectGuid());
 }
 
 void Spell::EffectProspecting(SpellEffectIndex /*eff_idx*/)
@@ -9383,7 +13384,7 @@ void Spell::EffectMilling(SpellEffectIndex /*eff_idx*/)
 
     Player* p_caster = (Player*)m_caster;
 
-    if( sWorld.getConfig(CONFIG_BOOL_SKILL_MILLING))
+    if ( sWorld.getConfig(CONFIG_BOOL_SKILL_MILLING))
     {
         uint32 SkillValue = p_caster->GetPureSkillValue(SKILL_INSCRIPTION);
         uint32 reqSkillValue = itemTarget->GetProto()->RequiredSkillRank;
@@ -9403,22 +13404,27 @@ void Spell::EffectSpiritHeal(SpellEffectIndex /*eff_idx*/)
     // TODO player can't see the heal-animation - he should respawn some ticks later
     if (!unitTarget || unitTarget->isAlive())
         return;
+
     if (unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
+
     if (!unitTarget->IsInWorld())
         return;
+
     if (m_spellInfo->Id == 22012 && !unitTarget->HasAura(2584))
         return;
 
-    ((Player*)unitTarget)->ResurrectPlayer(1.0f);
+    ((Player*)unitTarget)->ResurrectPlayer(100);
     ((Player*)unitTarget)->SpawnCorpseBones();
+
+    ((Player*)unitTarget)->CastSpell(unitTarget, 6962, true);
 }
 
 // remove insignia spell effect
 void Spell::EffectSkinPlayerCorpse(SpellEffectIndex /*eff_idx*/)
 {
     DEBUG_LOG("Effect: SkinPlayerCorpse");
-    if ( (m_caster->GetTypeId() != TYPEID_PLAYER) || (unitTarget->GetTypeId() != TYPEID_PLAYER) || (unitTarget->isAlive()) )
+    if ((m_caster->GetTypeId() != TYPEID_PLAYER) || (unitTarget->GetTypeId() != TYPEID_PLAYER) || (unitTarget->isAlive()))
         return;
 
     ((Player*)unitTarget)->RemovedInsignia( (Player*)m_caster );
@@ -9428,18 +13434,18 @@ void Spell::EffectStealBeneficialBuff(SpellEffectIndex eff_idx)
 {
     DEBUG_LOG("Effect: StealBeneficialBuff");
 
-    if(!unitTarget || unitTarget==m_caster)                 // can't steal from self
+    if (!unitTarget || unitTarget==m_caster)                 // can't steal from self
         return;
 
-    typedef std::vector<SpellAuraHolder*> StealList;
+    typedef std::vector<SpellAuraHolderPtr> StealList;
     StealList steal_list;
     // Create dispel mask by dispel type
     uint32 dispelMask  = GetDispellMask( DispelType(m_spellInfo->EffectMiscValue[eff_idx]) );
     Unit::SpellAuraHolderMap const& auras = unitTarget->GetSpellAuraHolderMap();
     for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
     {
-        SpellAuraHolder *holder = itr->second;
-        if (holder && (1<<holder->GetSpellProto()->Dispel) & dispelMask)
+        SpellAuraHolderPtr holder = itr->second;
+        if (holder && ((1<<holder->GetSpellProto()->Dispel) & dispelMask))
         {
             // Need check for passive? this
             if (holder->IsPositive() && !holder->IsPassive() && !holder->GetSpellProto()->HasAttribute(SPELL_ATTR_EX4_NOT_STEALABLE))
@@ -9456,15 +13462,40 @@ void Spell::EffectStealBeneficialBuff(SpellEffectIndex eff_idx)
         for (int32 count=0; count < damage && list_size > 0; ++count)
         {
             // Random select buff for dispel
-            SpellAuraHolder *holder = steal_list[urand(0, list_size-1)];
-            // Not use chance for steal
-            // TODO possible need do it
-            success_list.push_back(SuccessList::value_type(holder->GetId(),holder->GetCasterGuid()));
+            SpellAuraHolderPtr holder = steal_list[urand(0, list_size-1)];
+
+            int32 miss_chance = 0;
+            // Apply dispel mod from aura caster
+            Unit* caster = holder->GetCaster();
+            Unit* target = holder->GetTarget();
+
+            if(!caster || !target)
+                continue;
+
+            if (Player* modOwner = caster->GetSpellModOwner())
+            {
+                modOwner->ApplySpellMod(holder->GetSpellProto()->Id, SPELLMOD_RESIST_DISPEL_CHANCE, miss_chance);
+                miss_chance += modOwner->GetTotalAuraModifier(SPELL_AURA_MOD_DISPEL_RESIST);
+            }
+
+            if (caster != target)
+            {
+                if (Player* modOwner = target->GetSpellModOwner())
+                {
+                    modOwner->ApplySpellMod(holder->GetSpellProto()->Id, SPELLMOD_RESIST_DISPEL_CHANCE, miss_chance);
+                    miss_chance += modOwner->GetTotalAuraModifier(SPELL_AURA_MOD_DISPEL_RESIST);
+                }
+            }
+
+            // Try dispel
+            if (!roll_chance_i(miss_chance))
+                success_list.push_back(SuccessList::value_type(holder->GetId(),holder->GetCasterGuid()));
+            else m_caster->SendSpellMiss(unitTarget, holder->GetSpellProto()->Id, SPELL_MISS_RESIST);
 
             // Remove buff from list for prevent doubles
             for (StealList::iterator j = steal_list.begin(); j != steal_list.end(); )
             {
-                SpellAuraHolder *stealed = *j;
+                SpellAuraHolderPtr stealed = *j;
                 if (stealed->GetId() == holder->GetId() && stealed->GetCasterGuid() == holder->GetCasterGuid())
                 {
                     j = steal_list.erase(j);
@@ -9478,7 +13509,7 @@ void Spell::EffectStealBeneficialBuff(SpellEffectIndex eff_idx)
         if (!success_list.empty())
         {
             int32 count = success_list.size();
-            WorldPacket data(SMSG_SPELLSTEALLOG, 8+8+4+1+4+count*5);
+            WorldPacket data(SMSG_SPELLSTEALLOG, unitTarget->GetPackGUID().size() + m_caster->GetPackGUID().size() + 4 + 1 + 4 + count * 5);
             data << unitTarget->GetPackGUID();       // Victim GUID
             data << m_caster->GetPackGUID();         // Caster GUID
             data << uint32(m_spellInfo->Id);         // Dispell spell id
@@ -9498,7 +13529,7 @@ void Spell::EffectStealBeneficialBuff(SpellEffectIndex eff_idx)
 
 void Spell::EffectKillCreditPersonal(SpellEffectIndex eff_idx)
 {
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ((Player*)unitTarget)->KilledMonsterCredit(m_spellInfo->EffectMiscValue[eff_idx]);
@@ -9506,7 +13537,7 @@ void Spell::EffectKillCreditPersonal(SpellEffectIndex eff_idx)
 
 void Spell::EffectKillCreditGroup(SpellEffectIndex eff_idx)
 {
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ((Player*)unitTarget)->RewardPlayerAndGroupAtEvent(m_spellInfo->EffectMiscValue[eff_idx], unitTarget);
@@ -9514,7 +13545,7 @@ void Spell::EffectKillCreditGroup(SpellEffectIndex eff_idx)
 
 void Spell::EffectQuestFail(SpellEffectIndex eff_idx)
 {
-    if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
 
     ((Player*)unitTarget)->FailQuest(m_spellInfo->EffectMiscValue[eff_idx]);
@@ -9522,12 +13553,12 @@ void Spell::EffectQuestFail(SpellEffectIndex eff_idx)
 
 void Spell::EffectActivateRune(SpellEffectIndex eff_idx)
 {
-    if(m_caster->GetTypeId() != TYPEID_PLAYER)
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
 
     Player *plr = (Player*)m_caster;
 
-    if(plr->getClass() != CLASS_DEATH_KNIGHT)
+    if (plr->getClass() != CLASS_DEATH_KNIGHT)
         return;
 
     int32 count = damage;                                   // max amount of reset runes
@@ -9555,7 +13586,7 @@ void Spell::EffectRenamePet(SpellEffectIndex /*eff_idx*/)
         !((Creature*)unitTarget)->IsPet() || ((Pet*)unitTarget)->getPetType() != HUNTER_PET)
         return;
 
-    unitTarget->RemoveByteFlag(UNIT_FIELD_BYTES_2, 2, UNIT_CAN_BE_RENAMED);
+    unitTarget->SetByteFlag(UNIT_FIELD_BYTES_2, 2, UNIT_CAN_BE_RENAMED | UNIT_CAN_BE_ABANDONED);
 }
 
 void Spell::EffectPlaySound(SpellEffectIndex eff_idx)
@@ -9615,53 +13646,44 @@ void Spell::EffectBind(SpellEffectIndex eff_idx)
 
     Player* player = (Player*)unitTarget;
 
-    uint32 area_id;
     WorldLocation loc;
     if (m_spellInfo->EffectImplicitTargetA[eff_idx] == TARGET_TABLE_X_Y_Z_COORDINATES ||
         m_spellInfo->EffectImplicitTargetB[eff_idx] == TARGET_TABLE_X_Y_Z_COORDINATES)
     {
-        SpellTargetPosition const* st = sSpellMgr.GetSpellTargetPosition(m_spellInfo->Id);
+        WorldLocation const* st = sSpellMgr.GetSpellTargetPosition(m_spellInfo->Id);
         if (!st)
         {
             sLog.outError( "Spell::EffectBind - unknown Teleport coordinates for spell ID %u", m_spellInfo->Id );
             return;
         }
 
-        loc.mapid       = st->target_mapId;
-        loc.coord_x     = st->target_X;
-        loc.coord_y     = st->target_Y;
-        loc.coord_z     = st->target_Z;
-        loc.orientation = st->target_Orientation;
-        area_id = sTerrainMgr.GetAreaId(loc.mapid, loc.coord_x, loc.coord_y, loc.coord_z);
+        loc = *st;
     }
     else
-    {
-        player->GetPosition(loc);
-        area_id = player->GetAreaId();
-    }
-
-    player->SetHomebindToLocation(loc,area_id);
+        loc = player->GetPosition();
 
+    player->SetHomebindToLocation(loc);
+    uint32 area_id = loc.GetAreaId();
     // binding
     WorldPacket data( SMSG_BINDPOINTUPDATE, (4+4+4+4+4) );
-    data << float(loc.coord_x);
-    data << float(loc.coord_y);
-    data << float(loc.coord_z);
-    data << uint32(loc.mapid);
+    data << float(loc.x);
+    data << float(loc.y);
+    data << float(loc.z);
+    data << uint32(loc.GetMapId());
     data << uint32(area_id);
     player->SendDirectMessage( &data );
 
-    DEBUG_LOG("New Home Position X is %f", loc.coord_x);
-    DEBUG_LOG("New Home Position Y is %f", loc.coord_y);
-    DEBUG_LOG("New Home Position Z is %f", loc.coord_z);
-    DEBUG_LOG("New Home MapId is %u", loc.mapid);
+    DEBUG_LOG("New Home Position X is %f", loc.x);
+    DEBUG_LOG("New Home Position Y is %f", loc.y);
+    DEBUG_LOG("New Home Position Z is %f", loc.z);
+    DEBUG_LOG("New Home MapId is %u", loc.GetMapId());
     DEBUG_LOG("New Home AreaId is %u", area_id);
 
     // zone update
-    data.Initialize(SMSG_PLAYERBOUND, 8+4);
-    data << player->GetObjectGuid();
+    data.Initialize(SMSG_PLAYERBOUND, 8 + 4);
+    data << m_caster->GetObjectGuid();
     data << uint32(area_id);
-    player->SendDirectMessage( &data );
+    player->SendDirectMessage(&data);
 }
 
 void Spell::EffectRestoreItemCharges( SpellEffectIndex eff_idx )
@@ -9692,7 +13714,7 @@ void Spell::EffectRedirectThreat(SpellEffectIndex eff_idx)
         return;
 
     if (m_spellInfo->Id == 59665)                           // Vigilance
-        if (Aura *glyph = unitTarget->GetDummyAura(63326))  // Glyph of Vigilance
+        if (Aura const* glyph = unitTarget->GetDummyAura(63326))  // Glyph of Vigilance
             damage += glyph->GetModifier()->m_amount;
 
     m_caster->getHostileRefManager().SetThreatRedirection(unitTarget->GetObjectGuid(), uint32(damage));
@@ -9735,6 +13757,88 @@ void Spell::EffectQuestOffer(SpellEffectIndex eff_idx)
     }
 }
 
+void Spell::EffectWMODamage(SpellEffectIndex eff_idx)
+{
+    Unit* caster = m_originalCaster;
+    if (!caster)
+        return;
+
+    if (!gameObjTarget || gameObjTarget->GetGoType() != GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING)
+    {
+        sLog.outError("Spell::EffectWMODamage called, but no valid targets. Spell ID %u, caster %s", m_spellInfo->Id, caster->GetObjectGuid().GetString().c_str());
+        return;
+    }
+
+    if (!gameObjTarget->GetHealth())  // attempt damage already destroyed object.
+        return;
+
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::EffectWMODamage, spell ID %u, object %s, damage %u", m_spellInfo->Id,gameObjTarget->GetObjectGuid().GetString().c_str(),uint32(damage));
+
+    gameObjTarget->DamageTaken(caster, uint32(damage), m_spellInfo->Id);
+}
+
+void Spell::EffectWMORepair(SpellEffectIndex eff_idx)
+{
+    if (gameObjTarget && gameObjTarget->GetGoType() == GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING)
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::EffectWMORepair, spell ID %u, object %s, caster %s", m_spellInfo->Id,gameObjTarget->GetObjectGuid().GetString().c_str(), m_originalCaster ? m_originalCaster->GetObjectGuid().GetString().c_str() : "<none>");
+        gameObjTarget->Rebuild(m_caster, m_spellInfo->Id);
+    }
+    else
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell::EffectWMORepair called, but no valid targets. Spell ID %u, caster %s", m_spellInfo->Id, m_originalCaster ? m_originalCaster->GetObjectGuid().GetString().c_str() : "<none>");
+}
+
+void Spell::EffectWMOChange(SpellEffectIndex eff_idx)
+{
+    Unit* caster = GetAffectiveCaster();
+
+    if (!caster)
+        return;
+
+    if (!gameObjTarget || gameObjTarget->GetGoType() != GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING)
+    {
+        sLog.outError("Spell::EffectWMOChange called, but no valid targets. Caster %s, spell %u (current target %s)", caster->GetObjectGuid().GetString().c_str(), m_spellInfo->Id, gameObjTarget ? gameObjTarget->GetObjectGuid().GetString().c_str() : "<none>");
+        return;
+    }
+
+    DEBUG_LOG( "Spell::EffectWMOChange,  spell ID %u, object %s, command %u", m_spellInfo->Id, gameObjTarget->GetObjectGuid().GetString().c_str(), m_spellInfo->EffectMiscValue[eff_idx]);
+
+    switch (m_spellInfo->EffectMiscValue[eff_idx] + 1)
+    {
+        case OBJECT_STATE_INTACT:                                               // still intact
+            gameObjTarget->DamageTaken(caster, gameObjTarget->GetHealth() - gameObjTarget->GetMaxHealth(), m_spellInfo->Id);
+            break;
+        case OBJECT_STATE_DAMAGE:                                               // damaged
+            gameObjTarget->DamageTaken(caster, gameObjTarget->GetHealth() - gameObjTarget->GetGOInfo()->destructibleBuilding.damagedNumHits,  m_spellInfo->Id);
+            break;
+        case OBJECT_STATE_DESTROY:                                              // destroyed
+            gameObjTarget->DamageTaken(caster, gameObjTarget->GetHealth(),  m_spellInfo->Id);
+            break;
+        case OBJECT_STATE_REBUILD:                                              // rebuild
+            gameObjTarget->Rebuild(caster,  m_spellInfo->Id);
+            break;
+        default:
+            sLog.outError("Spell::EffectWMOChange, spell Id %u with undefined command %u from caster %s!", m_spellInfo->Id,m_spellInfo->EffectMiscValue[eff_idx], caster->GetObjectGuid().GetString().c_str());
+            break;
+    }
+}
+
+void Spell::EffectFriendSummon( SpellEffectIndex eff_idx )
+{
+    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    if (((Player*)m_caster)->GetSelectionGuid().IsEmpty() || !((Player*)m_caster)->GetSelectionGuid().IsPlayer())
+    {
+        DEBUG_LOG( "Spell::EffectFriendSummon is called, but no selection or selection is not player");
+        return;
+    }
+
+    DEBUG_LOG( "Spell::EffectFriendSummon called for player %u", ((Player*)m_caster)->GetSelectionGuid().GetCounter());
+
+    m_caster->CastSpell(m_caster, m_spellInfo->EffectTriggerSpell[eff_idx], true);
+}
+
 void Spell::EffectCancelAura(SpellEffectIndex eff_idx)
 {
     if (!unitTarget)
@@ -9750,3 +13854,205 @@ void Spell::EffectCancelAura(SpellEffectIndex eff_idx)
 
     unitTarget->RemoveAurasDueToSpell(spellId);
 }
+
+void Spell::EffectServerSide(SpellEffectIndex eff_idx)
+{
+
+    if (!unitTarget)
+        return;
+
+    if (!m_triggeredBySpellInfo && !m_triggeredByAuraSpell)
+    {
+        sLog.outError("Spell::EffectServerSide: spell %u must be triggered, but not have trigger info!", m_spellInfo->Id);
+        return;
+    }
+
+    uint32 triggerID = (m_triggeredBySpellInfo ? m_triggeredBySpellInfo->Id : m_triggeredByAuraSpell->Id);
+
+    DEBUG_LOG("Spell::EffectServerSide: spell %u if triggered by %u", m_spellInfo->Id, triggerID);
+
+    SpellEntry const* triggerSpell = sSpellStore.LookupEntry(triggerID);
+
+    switch(m_spellInfo->Id)
+    {
+        case 18350:
+        {
+
+            switch (triggerID)
+            {
+                case 67712:
+                case 67758:
+                {
+                    if (SpellAuraHolderPtr holder = unitTarget->GetSpellAuraHolder((triggerID == 67712 ? 67713 : 67759)))
+                    {
+                        if ( holder->GetStackAmount() + 1 > uint32(triggerSpell->EffectBasePoints[EFFECT_INDEX_0] ))
+                        {
+                            unitTarget->RemoveAurasDueToSpell(triggerID == 67712 ? 67713 : 67759);
+                            if (Unit* pVictim = unitTarget->getVictim())
+                                unitTarget->CastSpell(pVictim, (triggerID == 67712 ? 67714 : 67760), true);
+                            return;
+                        }
+                    }
+                    unitTarget->CastSpell(unitTarget,triggerID == 67712 ? 67713 : 67759, true);
+                    return;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        case 63974: // Synthetic spell for Glyph of shred
+        {
+            if (SpellAuraHolderPtr holder = GetCaster()->GetSpellAuraHolder(m_spellInfo->Id))
+                if (holder->GetStackAmount() > 3)
+                    return;
+
+            if (Aura* aura = unitTarget->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, ClassFamilyMask::create<CF_DRUID_RIP>(), GetCaster()->GetObjectGuid()))
+            {
+                uint32 maxDuration = aura->GetAuraMaxDuration() + (GetCaster()->HasAura(54818) ? 4 * IN_MILLISECONDS : 0) + (GetCaster()->HasAura(60141) ? 4 * IN_MILLISECONDS : 0);
+                uint32 duration    = aura->GetAuraDuration() + damage * IN_MILLISECONDS;
+                aura->GetHolder()->SetAuraDuration(duration < maxDuration ? duration : maxDuration);
+                aura->GetHolder()->SendAuraUpdate(false);
+            }
+            break;
+        }
+        case 8320:
+        case 16630:
+        case 19229:
+        case 22904:
+        case 23209:
+        case 24606:
+        case 31770:
+        case 32184:
+        case 32186:
+        case 33801:
+        case 33897:
+        case 35256:
+        case 37492:
+        case 37503:
+        case 40200:
+        case 40426:
+        case 41910:
+        case 42686:
+        case 42778:
+        case 43537:
+        case 47067:
+        case 47531:
+        case 47805:
+        case 54437:
+        case 62431:
+        case 62474:
+        case 64884:
+        case 65095:
+        case 65142:
+        case 66319:
+        case 69357:
+        case 71382:
+            break;
+        default:
+            break;
+    }
+}
+
+void Spell::EffectSuspendGravity(SpellEffectIndex eff_idx)
+{
+    if (!unitTarget)
+        return;
+
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetPosition();
+
+    if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
+        m_caster->GetClosePoint(loc.x, loc.y, loc.z, m_caster->GetObjectBoundingRadius(), 0.0f, m_caster->GetAngle(unitTarget));
+
+    unitTarget->UpdateAllowedPositionZ(loc.x, loc.y, loc.z);
+
+    float speed  = float(m_spellInfo->EffectMiscValue[eff_idx]/2.0f);
+    float height = float(unitTarget->GetDistance(loc) / 10.0f);
+
+    unitTarget->MonsterMoveToDestination(loc.x, loc.y, loc.z + 0.1f, unitTarget->GetOrientation(), speed, height, true, m_caster == unitTarget ? NULL : m_caster);
+}
+
+void Spell::EffectUntrainTalents(SpellEffectIndex eff_idx)
+{
+    if (!unitTarget)
+        return;
+
+    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    Player* pTarget = (Player*)unitTarget;
+
+    pTarget->resetTalents(true);
+    pTarget->SendTalentsInfoData(false);
+}
+
+void Spell::EffectKnockBackFromPosition(SpellEffectIndex eff_idx)
+{
+    if (!unitTarget)
+        return;
+
+    WorldLocation loc = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) ?
+                        m_targets.getDestination() :
+                        m_caster->GetPosition();
+
+    float angle = unitTarget->GetAngle(loc.x,loc.y) + M_PI_F;
+    float horizontalSpeed = float(m_spellInfo->EffectMiscValue[eff_idx])/10;
+    float verticalSpeed = float(damage)/10;
+    unitTarget->KnockBackWithAngle(angle, horizontalSpeed, verticalSpeed);
+}
+
+// Used only for snake trap
+void Spell::DoSummonSnakes(SpellEffectIndex eff_idx)
+{
+    uint32 creature_entry = m_spellInfo->EffectMiscValue[eff_idx];
+    if (!creature_entry || !m_caster)
+        return;
+
+    // Find trap GO and get it coordinates to spawn snakes
+    GameObject* pTrap = m_caster->GetMap()->GetGameObject(m_originalCasterGuid);
+    if (!pTrap)
+    {
+        sLog.outError("Spell::EffectSummonSnakes failed to find trap for caster %s ", m_caster->GetObjectGuid().GetString().c_str());
+        return;
+    }
+
+    float position_x, position_y, position_z;
+    pTrap->GetPosition(position_x, position_y, position_z);
+
+    // Find summon duration based on DBC
+    int32 duration = GetSpellDuration(m_spellInfo);
+    if (Player* modOwner = m_caster->GetSpellModOwner())
+        modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration);
+
+    int32 amount = damage > 0 ? damage : 1;
+
+    for (int32 count = 0; count < amount; ++count)
+    {
+        // Summon snakes
+        Creature *pSummon = m_caster->SummonCreature(creature_entry, position_x, position_y, position_z, m_caster->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, duration);
+
+        if (!pSummon)
+            continue;
+
+        // Valid position
+        if (!pSummon->IsPositionValid())
+        {
+            sLog.outError("Spell::EffectSummonSnakes failed to summon snakes for %s  bacause of invalid position (x = %f, y = %f, z = %f map = %u)"
+                ,m_caster->GetObjectGuid().GetString().c_str(), position_x, position_y, position_z, m_caster->GetMapId());
+            delete pSummon;
+            continue;
+        }
+
+        // Apply stats
+        pSummon->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
+        pSummon->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE | UNIT_FLAG_PET_IN_COMBAT | UNIT_FLAG_PVP);
+        pSummon->SetCreatorGuid(m_caster->GetObjectGuid());
+        pSummon->SetOwnerGuid(m_caster->GetObjectGuid());
+        pSummon->setFaction(m_caster->getFaction());
+        pSummon->SetLevel(m_caster->getLevel());
+        pSummon->SetMaxHealth(m_caster->getLevel()+ urand(20,30));
+        SendEffectLogExecute(eff_idx, pSummon->GetObjectGuid());
+    }
+}
diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp
index 86355ee21c4..4257d4c8d1f 100644
--- a/src/game/SpellHandler.cpp
+++ b/src/game/SpellHandler.cpp
@@ -29,6 +29,10 @@
 #include "Totem.h"
 #include "SpellAuras.h"
 
+#include <G3D/Vector3.h>
+
+using G3D::Vector3;
+
 void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
 {
     uint8 bagIndex, slot;
@@ -117,6 +121,14 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
         return;
     }
 
+    if ((proto->Area && proto->Area != pUser->GetAreaId()) ||
+        (proto->Map && proto->Map != pUser->GetMapId()))
+    {
+        if (SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid))
+            Spell::SendCastResult(pUser, spellInfo, cast_count, SPELL_FAILED_INCORRECT_AREA);
+        return;
+    }
+
     if (pUser->isInCombat())
     {
         for(int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
@@ -155,9 +167,15 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
 
     recvPacket >> targets.ReadForCaster(pUser);
 
+    // some spell cast packet including more data (for projectiles?)
+    if (unk_flags & 0x02)
+        targets.ReadAdditionalData(recvPacket);
+
     targets.Update(pUser);
 
-    if (!pItem->IsTargetValidForItemUse(targets.getUnitTarget()))
+    Unit* pTarget = pUser->GetMap()->GetUnit(pUser->GetTargetGuid());
+
+    if (!pItem->IsTargetValidForItemUse(pTarget))
     {
         // free gray item after use fail
         pUser->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
@@ -309,6 +327,7 @@ void WorldSession::HandleGameObjectUseOpcode( WorldPacket & recv_data )
         return;
     }
 
+    GetPlayer()->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_USE);
     obj->Use(_player);
 }
 
@@ -342,8 +361,8 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
     recvPacket >> unk_flags;                                // flags (if 0x02 - some additional data are received)
 
     // ignore for remote control state (for player case)
-    Unit* mover = _player->GetMover();
-    if (mover != _player && mover->GetTypeId()==TYPEID_PLAYER)
+    Unit* _mover = GetPlayer()->GetMover();
+    if (_mover != GetPlayer() && _mover->GetTypeId()==TYPEID_PLAYER)
     {
         recvPacket.rpos(recvPacket.wpos());                 // prevent spam at ignore packet
         return;
@@ -352,6 +371,10 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
     DEBUG_LOG("WORLD: got cast spell packet, spellId - %u, cast_count: %u, unk_flags %u, data length = %i",
         spellId, cast_count, unk_flags, (uint32)recvPacket.size());
 
+    /* process anticheat check */
+    if (!GetPlayer()->GetAntiCheat()->DoAntiCheatCheck(CHECK_SPELL, spellId, CMSG_CAST_SPELL))
+        return;
+
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
 
     if(!spellInfo)
@@ -361,12 +384,47 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
         return;
     }
 
+    //  Players on vehicles may cast many simple spells (like knock) from self
+
+    Unit* mover = NULL;
+
+    if (spellInfo->HasAttribute(SPELL_ATTR_EX6_CASTABLE_ON_VEHICLE) && _mover->IsCharmerOrOwnerPlayerOrPlayerItself())
+        mover = _mover->GetCharmerOrOwnerPlayerOrPlayerItself();
+    else
+        mover = _mover;
+
+    // casting own spells on some vehicles
+    if (Player* plr = mover->GetCharmerOrOwnerPlayerOrPlayerItself())
+    {
+        if (mover->IsVehicle() && (mover != plr))
+        {
+            if (VehicleKitPtr vehicle = mover->GetVehicleKit())
+            {
+                if (VehicleSeatEntry const* seatInfo = vehicle->GetSeatInfo(plr))
+                    if (seatInfo->m_flags & (SEAT_FLAG_CAN_ATTACK | SEAT_FLAG_CAN_CAST))
+                        mover = plr;
+            }
+        }
+    }
+
+    bool triggered = false;
+    SpellEntry const* triggeredBy = NULL;
+    Aura const* triggeredByAura = mover->GetTriggeredByClientAura(spellId);
+    if (triggeredByAura)
+    {
+        triggered = true;
+        triggeredBy = triggeredByAura->GetSpellProto();
+        cast_count = 0;
+    }
+
     if (mover->GetTypeId()==TYPEID_PLAYER)
     {
         // not have spell in spellbook or spell passive and not casted by client
-        if (!((Player*)mover)->HasActiveSpell (spellId) || IsPassiveSpell(spellInfo))
+        if (((((Player*)mover)->GetUInt16Value(PLAYER_FIELD_BYTES2, 0) == 0 &&
+            (!((Player*)mover)->HasActiveSpell(spellId) && !triggered))
+            || IsPassiveSpell(spellInfo)) && spellId != 1843)
         {
-            sLog.outError("World: Player %u casts spell %u which he shouldn't have", mover->GetGUIDLow(), spellId);
+            sLog.outError("WorldSession::HandleCastSpellOpcode: %s casts spell %u which he shouldn't have", mover->GetObjectGuid().GetString().c_str(), spellId);
             //cheater? kick? ban?
             recvPacket.rpos(recvPacket.wpos());                 // prevent spam at ignore packet
             return;
@@ -375,8 +433,10 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
     else
     {
         // not have spell in spellbook or spell passive and not casted by client
-        if (!((Creature*)mover)->HasSpell(spellId) || IsPassiveSpell(spellInfo))
+        if ((!((Creature*)mover)->HasSpell(spellId) && !triggered)
+        || IsPassiveSpell(spellInfo))
         {
+            sLog.outError("WorldSession::HandleCastSpellOpcode: %s try casts spell %u which he shouldn't have", mover->GetObjectGuid().GetString().c_str(), spellId);
             //cheater? kick? ban?
             recvPacket.rpos(recvPacket.wpos());                 // prevent spam at ignore packet
             return;
@@ -390,22 +450,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
 
     // some spell cast packet including more data (for projectiles?)
     if (unk_flags & 0x02)
-    {
-        uint8 unk1;
-
-        recvPacket >> Unused<float>();                      // unk1, coords?
-        recvPacket >> Unused<float>();                      // unk1, coords?
-        recvPacket >> unk1;                                 // >> 1 or 0
-        if(unk1)
-        {
-            ObjectGuid guid;                                // guid - unused
-            MovementInfo movementInfo;
-
-            recvPacket >> Unused<uint32>();                 // >> MSG_MOVE_STOP
-            recvPacket >> guid.ReadAsPacked();
-            recvPacket >> movementInfo;
-        }
-    }
+        targets.ReadAdditionalData(recvPacket);
 
     // auto-selection buff level base at target level (in spellInfo)
     if (Unit* target = targets.getUnitTarget())
@@ -415,9 +460,9 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
             spellInfo = actualSpellInfo;
     }
 
-    Spell *spell = new Spell(mover, spellInfo, false);
+    Spell *spell = new Spell(mover, spellInfo, triggered, mover->GetObjectGuid(), triggeredBy);
     spell->m_cast_count = cast_count;                       // set count of casts
-    spell->prepare(&targets);
+    spell->prepare(&targets, triggeredByAura);
 }
 
 void WorldSession::HandleCancelCastOpcode(WorldPacket& recvPacket)
@@ -489,7 +534,7 @@ void WorldSession::HandleCancelAuraOpcode( WorldPacket& recvPacket)
         return;
     }
 
-    SpellAuraHolder *holder = _player->GetSpellAuraHolder(spellId);
+    SpellAuraHolderPtr holder = _player->GetSpellAuraHolder(spellId);
 
     // not own area auras can't be cancelled (note: maybe need to check for aura on holder and not general on spell)
     if (holder && holder->GetCasterGuid() != _player->GetObjectGuid() && HasAreaAuraEffect(holder->GetSpellProto()))
@@ -540,7 +585,7 @@ void WorldSession::HandlePetCancelAuraOpcode( WorldPacket& recvPacket)
 
     pet->RemoveAurasDueToSpell(spellId);
 
-    pet->AddCreatureSpellCooldown(spellId);
+    pet->AddSpellAndCategoryCooldowns(spellInfo);
 }
 
 void WorldSession::HandleCancelGrowthAuraOpcode( WorldPacket& /*recvPacket*/)
@@ -581,7 +626,12 @@ void WorldSession::HandleTotemDestroyed( WorldPacket& recvPacket)
         return;
 
     if (Totem* totem = GetPlayer()->GetTotem(TotemSlot(slotId)))
+    {
+        if(totem->GetEntry() == SENTRY_TOTEM_ENTRY)
+            return;
+
         totem->UnSummon();
+    }
 }
 
 void WorldSession::HandleSelfResOpcode( WorldPacket & /*recv_data*/ )
@@ -603,29 +653,72 @@ void WorldSession::HandleSpellClick( WorldPacket & recv_data )
     ObjectGuid guid;
     recv_data >> guid;
 
-    if (_player->isInCombat())                              // client prevent click and set different icon at combat state
+    Creature* unit = _player->GetMap()->GetAnyTypeCreature(guid);
+    if (!unit)
         return;
 
-    Creature *unit = _player->GetMap()->GetAnyTypeCreature(guid);
-    if (!unit || unit->isInCombat())                        // client prevent click and set different icon at combat state
+    if (_player->isInCombat() && !unit->IsVehicle())                              // client prevent click and set different icon at combat state
         return;
 
     SpellClickInfoMapBounds clickPair = sObjectMgr.GetSpellClickInfoMapBounds(unit->GetEntry());
     for(SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr)
     {
-        if (itr->second.IsFitToRequirements(_player))
+        if (itr->second.IsFitToRequirements(_player, unit))
         {
             Unit *caster = (itr->second.castFlags & 0x1) ? (Unit*)_player : (Unit*)unit;
             Unit *target = (itr->second.castFlags & 0x2) ? (Unit*)_player : (Unit*)unit;
 
-            caster->CastSpell(target, itr->second.spellId, true);
+            caster->CastSpell(target, itr->second.spellId, true, NULL, NULL,caster->GetObjectGuid());
         }
     }
 }
 
+
+void WorldSession::HandleUpdateProjectilePosition(WorldPacket& recvPacket)
+{
+    ObjectGuid casterGuid;  // actually target ?
+    uint32 spellId;         // Spell Id
+    uint8  castCount;       //
+    float m_targetX, m_targetY, m_targetZ; // Position of missile hit
+
+    recvPacket >> casterGuid;
+    recvPacket >> spellId;
+    recvPacket >> castCount;
+
+    recvPacket >> m_targetX >> m_targetY >> m_targetZ;
+
+    // Do we need unit as we use 3d position anyway ?
+    Unit* pCaster = GetPlayer()->GetMap()->GetUnit(casterGuid);
+    if (!pCaster)
+        return;
+
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
+
+    if(!spellInfo)
+    {
+        sLog.outError("CMSG_UPDATE_PROJECTILE_POSITION: unknown spell id %u", spellId);
+        recvPacket.rpos(recvPacket.wpos());                 // prevent spam at ignore packet
+        return;
+    }
+
+    WorldPacket data(SMSG_NOTIFY_MISSILE_TRAJECTORY_COLLISION, 8+1+4+4+4);
+    data << casterGuid;
+    data << castCount;
+    data << m_targetX;
+    data << m_targetY;
+    data << m_targetZ;
+    SendPacket(&data);
+
+    for(int i = 0; i < 3; ++i)
+    {
+        if(spellInfo->EffectTriggerSpell[i])
+            if (SpellEntry const* spellInfoT = sSpellStore.LookupEntry(spellInfo->EffectTriggerSpell[i]))
+                pCaster->CastSpell(m_targetX, m_targetY, m_targetZ, spellInfoT, true);
+    }
+}
+
 void WorldSession::HandleGetMirrorimageData(WorldPacket& recv_data)
 {
-    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WORLD: CMSG_GET_MIRRORIMAGE_DATA");
 
     ObjectGuid guid;
     recv_data >> guid;
@@ -642,11 +735,16 @@ void WorldSession::HandleGetMirrorimageData(WorldPacket& recv_data)
 
     Unit* pCaster = images.front()->GetCaster();
 
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WorldSession::HandleGetMirrorimageData CMSG_GET_MIRRORIMAGE_DATA creature %s aura %u caster %s",
+        guid.GetString().c_str(),
+        images.front()->GetId(),
+        pCaster ? pCaster->GetObjectGuid().GetString().c_str() : "<none>");
+
     WorldPacket data(SMSG_MIRRORIMAGE_DATA, 68);
 
     data << guid;
-    data << (uint32)pCreature->GetDisplayId();
 
+    data << (uint32)pCreature->GetDisplayId();
     data << (uint8)pCreature->getRace();
     data << (uint8)pCreature->getGender();
     data << (uint8)pCreature->getClass();
@@ -708,3 +806,57 @@ void WorldSession::HandleGetMirrorimageData(WorldPacket& recv_data)
 
     SendPacket(&data);
 }
+
+void WorldSession::HandleUpdateMissileTrajectory(WorldPacket& recv_data)
+{
+    DEBUG_LOG("WORLD: CMSG_UPDATE_MISSILE_TRAJECTORY");
+
+    ObjectGuid guid;
+    uint32 spellId;
+    float elevation, speed;
+    WorldLocation src = GetPlayer()->GetPosition();
+    WorldLocation dst = GetPlayer()->GetPosition();
+    uint8 moveFlag;
+
+    recv_data >> guid;
+
+//    if (!guid.IsPlayer())
+//        return;
+
+    recv_data >> spellId;
+    recv_data >> elevation;
+    recv_data >> speed;
+    recv_data >> src.x >> src.y >> src.z;
+    recv_data >> dst.x >> dst.y >> dst.z;
+    recv_data >> moveFlag;
+
+    Unit* unit = ObjectAccessor::GetUnit(*GetPlayer(), guid);
+    if (!unit)
+        return;
+
+    Spell* spell = unit ? unit->GetCurrentSpell(CURRENT_GENERIC_SPELL) : NULL;
+    if (!spell || spell->m_spellInfo->Id != spellId || !(spell->m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
+    {
+        return;
+    }
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WorldSession::HandleUpdateMissileTrajectory spell %u ajusted coords: src %f/%f %f/%f %f/%f dst %f/%f %f/%f %f/%f speed %f/%f elevation %f/%f",
+        spellId,
+        spell->m_targets.getSource().getX(), src.getX(), spell->m_targets.getSource().getY(), src.getY(), spell->m_targets.getSource().getZ(), src.getZ(),
+        spell->m_targets.getDestination().getX(), dst.getX(), spell->m_targets.getDestination().getY(), dst.getY(), spell->m_targets.getDestination().getZ(), dst.getZ(),
+        spell->m_targets.GetSpeed(), speed, spell->m_targets.GetElevation(), elevation);
+
+    spell->m_targets.setSource(src);
+    spell->m_targets.setDestination(dst);
+    spell->m_targets.SetElevation(elevation);
+    spell->m_targets.SetSpeed(speed);
+
+    if (moveFlag)
+    {
+        ObjectGuid guid2;                               // unk guid (possible - active mover) - unused
+        MovementInfo movementInfo;                      // MovementInfo
+
+        recv_data >> Unused<uint32>();                  // >> MSG_MOVE_STOP
+        recv_data >> guid.ReadAsPacked();
+        recv_data >> movementInfo;
+    }
+}
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index b7cacee6a57..79a276f71bb 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -21,13 +21,26 @@
 #include "SpellAuraDefines.h"
 #include "ProgressBar.h"
 #include "DBCStores.h"
+#include "SQLStorages.h"
 #include "World.h"
 #include "Chat.h"
 #include "Spell.h"
-#include "BattleGroundMgr.h"
+#include "BattleGround/BattleGroundMgr.h"
 #include "MapManager.h"
 #include "Unit.h"
 
+bool IsPrimaryProfessionSkill(uint32 skill)
+{
+    SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(skill);
+    if(!pSkill)
+        return false;
+
+    if(pSkill->categoryId != SKILL_CATEGORY_PROFESSION)
+        return false;
+
+    return true;
+}
+
 SpellMgr::SpellMgr()
 {
 }
@@ -46,7 +59,7 @@ int32 GetSpellDuration(SpellEntry const *spellInfo)
 {
     if(!spellInfo)
         return 0;
-    SpellDurationEntry const *du = sSpellDurationStore.LookupEntry(spellInfo->DurationIndex);
+    SpellDurationEntry const *du = sSpellDurationStore.LookupEntry(spellInfo->GetDurationIndex());
     if(!du)
         return 0;
     return (du->Duration[0] == -1) ? -1 : abs(du->Duration[0]);
@@ -56,7 +69,7 @@ int32 GetSpellMaxDuration(SpellEntry const *spellInfo)
 {
     if(!spellInfo)
         return 0;
-    SpellDurationEntry const *du = sSpellDurationStore.LookupEntry(spellInfo->DurationIndex);
+    SpellDurationEntry const *du = sSpellDurationStore.LookupEntry(spellInfo->GetDurationIndex());
     if(!du)
         return 0;
     return (du->Duration[2] == -1) ? -1 : abs(du->Duration[2]);
@@ -70,15 +83,18 @@ int32 CalculateSpellDuration(SpellEntry const *spellInfo, Unit const* caster)
     {
         int32 maxduration = GetSpellMaxDuration(spellInfo);
 
-        if (duration != maxduration && caster->GetTypeId() == TYPEID_PLAYER)
-            duration += int32((maxduration - duration) * ((Player*)caster)->GetComboPoints() / 5);
+        if (duration != maxduration)
+            duration += int32((maxduration - duration) * caster->GetComboPoints() / 5);
 
         if (Player* modOwner = caster->GetSpellModOwner())
         {
             modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_DURATION, duration);
 
+            duration = modOwner->CalculateSpellDurationWithHaste(spellInfo, duration);
+
             if (duration < 0)
                 duration = 0;
+
         }
     }
 
@@ -90,7 +106,7 @@ uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell const* spell)
     if (spell)
     {
         // some triggered spells have data only usable for client
-        if (spell->IsTriggeredSpellWithRedundentData())
+        if (spell->IsTriggeredSpellWithRedundentCastTime())
             return 0;
 
         // spell targeted to non-trading trade slot item instant at trade success apply
@@ -101,7 +117,7 @@ uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell const* spell)
                         return 0;
     }
 
-    SpellCastTimesEntry const *spellCastTimeEntry = sSpellCastTimesStore.LookupEntry(spellInfo->CastingTimeIndex);
+    SpellCastTimesEntry const *spellCastTimeEntry = sSpellCastTimesStore.LookupEntry(spellInfo->GetCastingTimeIndex());
 
     // not all spells have cast time index and this is all is pasiive abilities
     if (!spellCastTimeEntry)
@@ -111,10 +127,13 @@ uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell const* spell)
 
     if (spell)
     {
+        if (spellInfo->RequiresSpellFocus == 4 && spell->GetCaster()->HasAura(67556))
+            castTime /= 2;
+
         if (Player* modOwner = spell->GetCaster()->GetSpellModOwner())
-            modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_CASTING_TIME, castTime, spell);
+            modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_CASTING_TIME, castTime);
 
-        if (!spellInfo->HasAttribute(SPELL_ATTR_UNK4) && !spellInfo->HasAttribute(SPELL_ATTR_TRADESPELL))
+        if (!(spellInfo->GetAttributes() & (SPELL_ATTR_ABILITY|SPELL_ATTR_TRADESPELL)))
             castTime = int32(castTime * spell->GetCaster()->GetFloatValue(UNIT_MOD_CAST_SPEED));
         else
         {
@@ -136,7 +155,7 @@ uint32 GetSpellCastTimeForBonus( SpellEntry const *spellProto, DamageEffectType
     if (CastingTime > 7000) CastingTime = 7000;
     if (CastingTime < 1500) CastingTime = 1500;
 
-    if(damagetype == DOT && !IsChanneledSpell(spellProto))
+    if (damagetype == DOT && !IsChanneledSpell(spellProto))
         CastingTime = 3500;
 
     int32 overTime    = 0;
@@ -234,11 +253,11 @@ uint32 GetSpellCastTimeForBonus( SpellEntry const *spellProto, DamageEffectType
 uint16 GetSpellAuraMaxTicks(SpellEntry const* spellInfo)
 {
     int32 DotDuration = GetSpellDuration(spellInfo);
-    if(DotDuration == 0)
+    if (DotDuration == 0)
         return 1;
 
     // 200% limit
-    if(DotDuration > 30000)
+    if (DotDuration > 30000)
         DotDuration = 30000;
 
     for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
@@ -317,14 +336,12 @@ WeaponAttackType GetWeaponAttackType(SpellEntry const *spellInfo)
 bool IsPassiveSpell(uint32 spellId)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
-    if (!spellInfo)
-        return false;
     return IsPassiveSpell(spellInfo);
 }
 
-bool IsPassiveSpell(SpellEntry const *spellInfo)
+bool IsPassiveSpell(SpellEntry const* spellInfo)
 {
-    return spellInfo->HasAttribute(SPELL_ATTR_PASSIVE);
+    return spellInfo ? spellInfo->HasAttribute(SPELL_ATTR_PASSIVE) : false;
 }
 
 bool IsNoStackAuraDueToAura(uint32 spellId_1, uint32 spellId_2)
@@ -332,7 +349,7 @@ bool IsNoStackAuraDueToAura(uint32 spellId_1, uint32 spellId_2)
     SpellEntry const *spellInfo_1 = sSpellStore.LookupEntry(spellId_1);
     SpellEntry const *spellInfo_2 = sSpellStore.LookupEntry(spellId_2);
     if(!spellInfo_1 || !spellInfo_2) return false;
-    if(spellInfo_1->Id == spellId_2) return false;
+    if (spellInfo_1->Id == spellId_2) return false;
 
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
     {
@@ -351,6 +368,14 @@ bool IsNoStackAuraDueToAura(uint32 spellId_1, uint32 spellId_2)
     return false;
 }
 
+bool IsSpellAffectedBySpellMods(SpellEntry const* spellInfo)
+{
+    return !(IsPassiveSpell(spellInfo) &&
+        !spellInfo->HasAttribute(SPELL_ATTR_ABILITY) &&
+        spellInfo->HasAttribute(SPELL_ATTR_EX3_CAN_PROC_WITH_TRIGGERED));
+}
+
+
 int32 CompareAuraRanks(uint32 spellId_1, uint32 spellId_2)
 {
     SpellEntry const*spellInfo_1 = sSpellStore.LookupEntry(spellId_1);
@@ -416,25 +441,31 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
             {
                 // Well Fed buffs (must be exclusive with Food / Drink replenishment effects, or else Well Fed will cause them to be removed)
                 // SpellIcon 2560 is Spell 46687, does not have this flag
-                if (spellInfo->HasAttribute(SPELL_ATTR_EX2_FOOD_BUFF) || spellInfo->SpellIconID == 2560)
+                if (spellInfo->HasAttribute(SPELL_ATTR_EX2_FOOD_BUFF) || spellInfo->GetSpellIconID() == 2560)
                     return SPELL_WELL_FED;
+                else if (spellInfo->EffectApplyAuraName[EFFECT_INDEX_0] == SPELL_AURA_MOD_STAT && spellInfo->SpellFamilyName == SPELLFAMILY_GENERIC &&
+                     (spellInfo->GetSchoolMask() & SPELL_SCHOOL_MASK_NATURE) && spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE)
+                     return SPELL_SCROLL;
             }
             break;
         }
         case SPELLFAMILY_MAGE:
         {
             // family flags 18(Molten), 25(Frost/Ice), 28(Mage)
-            if (spellInfo->SpellFamilyFlags & UI64LIT(0x12040000))
+            if (spellInfo->GetSpellFamilyFlags().test<CF_MAGE_MOLTEN_ARMOR1, CF_MAGE_ELEMENTAL_ARMOR, CF_MAGE_MAGE_ARMOR>())
                 return SPELL_MAGE_ARMOR;
 
-            if ((spellInfo->SpellFamilyFlags & UI64LIT(0x1000000)) && spellInfo->EffectApplyAuraName[EFFECT_INDEX_0] == SPELL_AURA_MOD_CONFUSE)
+            if (spellInfo->GetSpellFamilyFlags().test<CF_MAGE_POLYMORPH>() && spellInfo->EffectApplyAuraName[EFFECT_INDEX_0] == SPELL_AURA_MOD_CONFUSE)
                 return SPELL_MAGE_POLYMORPH;
 
+            if (spellInfo->GetSpellFamilyFlags().test<CF_MAGE_ARCANE_INT>())
+                return SPELL_MAGE_INTELLECT;
+
             break;
         }
         case SPELLFAMILY_WARRIOR:
         {
-            if (spellInfo->SpellFamilyFlags & UI64LIT(0x00008000010000))
+            if (spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_BATTLE_SHOUT, CF_WARRIOR_COMMANDING_SHOUT>())
                 return SPELL_POSITIVE_SHOUT;
 
             break;
@@ -446,11 +477,11 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
                 return SPELL_CURSE;
 
             // Warlock (Demon Armor | Demon Skin | Fel Armor)
-            if (spellInfo->IsFitToFamilyMask(UI64LIT(0x2000002000000000), 0x00000010))
+            if (spellInfo->GetSpellFamilyFlags().test<CF_WARLOCK_ARMOR, CF_WARLOCK_FEL_ARMOR, CF_WARLOCK_DEMON_SKIN>())
                 return SPELL_WARLOCK_ARMOR;
 
             // Unstable Affliction | Immolate
-            if (spellInfo->IsFitToFamilyMask(UI64LIT(0x0000010000000004)))
+            if (spellInfo->GetSpellFamilyFlags().test<CF_WARLOCK_IMMOLATE, CF_WARLOCK_UNSTABLE_AFFLICTION>())
                 return SPELL_UA_IMMOLATE;
             break;
         }
@@ -459,7 +490,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
             // "Well Fed" buff from Blessed Sunfruit, Blessed Sunfruit Juice, Alterac Spring Water
             if (spellInfo->HasAttribute(SPELL_ATTR_CASTABLE_WHILE_SITTING) &&
                 (spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_AUTOATTACK) &&
-                (spellInfo->SpellIconID == 52 || spellInfo->SpellIconID == 79))
+                (spellInfo->GetSpellIconID() == 52 || spellInfo->GetSpellIconID() == 79))
                 return SPELL_WELL_FED;
             break;
         }
@@ -470,7 +501,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
                 return SPELL_STING;
 
             // only hunter aspects have this
-            if (spellInfo->IsFitToFamilyMask(UI64LIT(0x0044000000380000), 0x00001010))
+            if (spellInfo->GetSpellFamilyFlags().test<CF_HUNTER_ASPECT_OF_THE_MONKEY, CF_HUNTER_ASPECT_OF_THE_HAWK, CF_HUNTER_ASPECT_OF_THE_PACK, CF_HUNTER_ASPECT_OF_THE_VIPER, CF_HUNTER_ASPECT_OF_THE_WILD, CF_HUNTER_ASPECT_OF_THE_BEAST, CF_HUNTER_ASPECT_OF_THE_DRAGONHAWK>())
                 return SPELL_ASPECT;
 
             break;
@@ -480,18 +511,19 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
             if (IsSealSpell(spellInfo))
                 return SPELL_SEAL;
 
-            if (spellInfo->IsFitToFamilyMask(UI64LIT(0x0000000011010002)))
+            if (spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_BLESSING_OF_MIGHT, CF_PALADIN_BLESSING_OF_WISDOM, CF_PALADIN_BLESSING_OF_KINGS, CF_PALADIN_MISC_BLESSINGS>())
                 return SPELL_BLESSING;
 
-            if (spellInfo->IsFitToFamilyMask(UI64LIT(0x0000000000002190)))
+            if (spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_HAND_OF_FREEDOM, CF_PALADIN_HAND_OF_PROTECTION, CF_PALADIN_HAND_OF_SALVATION1, CF_PALADIN_HAND_OF_SACRIFICE>())
                 return SPELL_HAND;
 
-            // skip Heart of the Crusader that have also same spell family mask
-            if (spellInfo->IsFitToFamilyMask(UI64LIT(0x00000820180400)) && spellInfo->HasAttribute(SPELL_ATTR_EX3_UNK9) && (spellInfo->SpellIconID != 237))
+            // skip Heart of the Crusader and Judgements of the Just that have also same spell family mask
+            if (spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_JUDGEMENT_OF_RIGHT, CF_PALADIN_JUDGEMENT_OF_WISDOM_LIGHT, CF_PALADIN_JUDGEMENT_OF_JUSTICE, CF_PALADIN_HEART_OF_THE_CRUSADER, CF_PALADIN_JUDGEMENT_OF_BLOOD_MARTYR>() &&
+                (spellInfo->HasAttribute(SPELL_ATTR_EX3_UNK9) && !spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_HEART_OF_THE_CRUSADER,CF_PALADIN_JUDGEMENT_OF_JUST>()))
                 return SPELL_JUDGEMENT;
 
             // only paladin auras have this (for palaldin class family)
-            if (spellInfo->IsFitToFamilyMask(UI64LIT(0x0000000000000000), 0x00000020))
+            if (spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_AURAS>())
                 return SPELL_AURA;
 
             break;
@@ -517,7 +549,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
     if ((IsSpellHaveAura(spellInfo, SPELL_AURA_TRACK_CREATURES) ||
         IsSpellHaveAura(spellInfo, SPELL_AURA_TRACK_RESOURCES)  ||
         IsSpellHaveAura(spellInfo, SPELL_AURA_TRACK_STEALTHED)) &&
-        (spellInfo->HasAttribute(SPELL_ATTR_EX_UNK17) || spellInfo->HasAttribute(SPELL_ATTR_EX6_UNK12)))
+        (spellInfo->HasAttribute(SPELL_ATTR_EX_UNK17) || spellInfo->HasAttribute(SPELL_ATTR_EX6_CASTABLE_ON_VEHICLE)))
         return SPELL_TRACKER;
 
     // elixirs can have different families, but potion most ofc.
@@ -576,6 +608,8 @@ bool IsSingleFromSpellSpecificPerTarget(SpellSpecific spellSpec1,SpellSpecific s
         case SPELL_MAGE_POLYMORPH:
         case SPELL_PRESENCE:
         case SPELL_WELL_FED:
+        case SPELL_BLEED_DEBUFF:
+        case SPELL_MAGE_INTELLECT:
             return spellSpec1==spellSpec2;
         case SPELL_BATTLE_ELIXIR:
             return spellSpec2==SPELL_BATTLE_ELIXIR
@@ -651,7 +685,7 @@ bool IsExplicitNegativeTarget(uint32 targetA)
     {
         case TARGET_CHAIN_DAMAGE:
         case TARGET_CURRENT_ENEMY_COORDINATES:
-        case TARGET_SINGLE_ENEMY:
+//        case TARGET_SINGLE_ENEMY: <- Penace is positive!
             return true;
         default:
             break;
@@ -661,6 +695,67 @@ bool IsExplicitNegativeTarget(uint32 targetA)
 
 bool IsPositiveEffect(SpellEntry const *spellproto, SpellEffectIndex effIndex)
 {
+    if (!spellproto)
+        return false;
+
+    switch(spellproto->Id)
+    {
+        case 37675:                                         // Chaos Blast
+        case 42786:                                         // Echo Of Ymiron
+        case 56266:                                         // Vortex
+        case 62470:                                         // Deafening Thunder
+        case 63138:                                         // Sara's Fervor (Ulduar - Yogg Saron encounter)
+        case 63134:                                         // Sara's Blessing (Ulduar - Yogg Saron encounter)
+        case 63355:                                         // Crunch Armor
+        case 66271:                                         // Carrying Seaforium (IoC)
+        case 66406:                                         // Snobolled! (Trial of the Crusader, Gormok the Impaler encounter)
+        case 68377:                                         // Carrying Huge Seaforium (IoC)
+        case 71010:                                         // Web Wrap (Icecrown Citadel, trash mob Nerub'ar Broodkeeper)
+        case 71265:                                         // Swarming Shadows (Lanathel)
+        case 72219:                                         // Gastric Bloat 10 N
+        case 72551:                                         // Gastric Bloat 10 H
+        case 72552:                                         // Gastric Bloat 25 N
+        case 72553:                                         // Gastric Bloat 25 H
+        case 72546:                                         // Harvest Soul (Lich King)
+        case 57508:                                         // Volazj Insanity Phase 1
+        case 57509:                                         // Volazj Insanity Phase 2
+        case 57510:                                         // Volazj Insanity Phase 3
+        case 57511:                                         // Volazj Insanity Phase 4
+        case 57512:                                         // Volazj Insanity Phase 5
+        case 55126:                                         // Sladran Snake Trap
+        case 39288:                                         // Kargath's Executioner
+        case 39289:                                         // Kargath's Executioner
+        case 39290:                                         // Kargath's Executioner
+        case 66550:                                         // Teleport(BattlegroundIC)
+        case 66551:                                         // Teleport(BattlegroundIC)
+        case 62910:                                         // Mimiron's Inferno (Ulduar - Flame Leviathan)
+            return false;
+        case 552:                                           // Abolish Disease
+        case 12042:                                         // Arcane Power
+        case 24732:                                         // Bat Costume
+        case 59286:                                         // Opening
+        case 43730:                                         // Electrified
+        case 47540:                                         // Penance start dummy aura - Rank 1
+        case 53005:                                         // Penance start dummy aura - Rank 2
+        case 53006:                                         // Penance start dummy aura - Rank 3
+        case 53007:                                         // Penance start dummy aura - Rank 4
+        case 47747:                                         // Charge Rift (Nexus: Anomalus)
+        case 47757:                                         // Penance heal effect trigger - Rank 1
+        case 52986:                                         // Penance heal effect trigger - Rank 2
+        case 52987:                                         // Penance heal effect trigger - Rank 3
+        case 52988:                                         // Penance heal effect trigger - Rank 4
+        case 61716:                                         // Rabbit Costume
+        case 64343:                                         // Impact
+        case 64844:                                         // Divine Hymn
+        case 64904:                                         // Hymn of Hope
+        case 67369:                                         // Grunty Focus
+        case 67398:                                         // Zergling Periodic Effect
+        case 72771:                                         // Scent of Blood (Saurfang)
+            return true;
+        default:
+            break;
+    }
+
     switch(spellproto->Effect[effIndex])
     {
         case SPELL_EFFECT_DUMMY:
@@ -668,30 +763,85 @@ bool IsPositiveEffect(SpellEntry const *spellproto, SpellEffectIndex effIndex)
             switch(spellproto->Id)
             {
                 case 28441:                                 // AB Effect 000
+                case 52748:                                 // Voracious Appetite
+                case 54044:                                 // Carrion Feeder
                     return false;
+                case 18153:                                 // Kodo Kombobulator
+                case 32312:                                 // Move 1
+                case 37388:                                 // Move 2
+                case 45863:                                 // Cosmetic - Incinerate to Random Target
+                case 48021:                                 // support for quest 12173
                 case 49634:                                 // Sergeant's Flare
                 case 54530:                                 // Opening
+                case 56099:                                 // Throw Ice
                 case 62105:                                 // To'kini's Blowgun
+                case 64402:                                 // Rocket Strike
+                    return true;
+                default:
+                    break;
+            }
+            break;
+        case SPELL_EFFECT_SCRIPT_EFFECT:
+            // some explicitly required script effect sets
+            switch (spellproto->Id)
+            {
+                case 46650:                                 // Open Brutallus Back Door
+                case 62488:                                 // Activate Construct
+                case 64503:                                 // Water
                     return true;
                 default:
                     break;
             }
             break;
-        // always positive effects (check before target checks that provided non-positive result in some case for positive effects)
+            // always positive effects (check before target checks that provided non-positive result in some case for positive effects)
         case SPELL_EFFECT_HEAL:
         case SPELL_EFFECT_LEARN_SPELL:
         case SPELL_EFFECT_SKILL_STEP:
         case SPELL_EFFECT_HEAL_PCT:
         case SPELL_EFFECT_ENERGIZE_PCT:
         case SPELL_EFFECT_QUEST_COMPLETE:
+        case SPELL_EFFECT_KILL_CREDIT_PERSONAL:
+        case SPELL_EFFECT_KILL_CREDIT_GROUP:
             return true;
 
-            // non-positive aura use
+        case SPELL_EFFECT_SCHOOL_DAMAGE:
+        case SPELL_EFFECT_THREAT:
+            return false;
+
+        case SPELL_EFFECT_PERSISTENT_AREA_AURA:
+            switch(spellproto->Id)
+            {
+                case 62821:                                 // Toasty Fire (Ulduar Hodir); unclear why this spell has SPELL_ATTR_EX_NEGATIVE
+                    return true;
+                case 63540:                                 // Paralytic Field (Ulduar Thorim)
+                case 62241:
+                    return false;
+                default:
+                    break;
+            }
+            break;
+
+        // non-positive aura use
         case SPELL_EFFECT_APPLY_AURA:
         case SPELL_EFFECT_APPLY_AREA_AURA_FRIEND:
         {
             switch(spellproto->EffectApplyAuraName[effIndex])
             {
+                case SPELL_AURA_PHASE:
+                {
+                    switch(spellproto->Id)
+                    {
+                        case 57508:                         // Insanity (Volazj ecounter)
+                        case 57509:
+                        case 57510:
+                        case 57511:
+                        case 57512:
+                            return false;
+                        default:
+                            break;
+                    }
+                    break;
+                }
                 case SPELL_AURA_DUMMY:
                 {
                     // dummy aura can be positive or negative dependent from casted spell
@@ -715,6 +865,7 @@ bool IsPositiveEffect(SpellEntry const *spellproto, SpellEffectIndex effIndex)
                         case 27202:
                         case 27203:
                         case 47669:
+                        case 64996:                         // Reorigination
                             return true;
                         default:
                             break;
@@ -727,7 +878,7 @@ bool IsPositiveEffect(SpellEntry const *spellproto, SpellEffectIndex effIndex)
                 case SPELL_AURA_MOD_DODGE_PERCENT:
                 case SPELL_AURA_MOD_HEALING_PCT:
                 case SPELL_AURA_MOD_HEALING_DONE:
-                    if(spellproto->CalculateSimpleValue(effIndex) < 0)
+                    if (spellproto->CalculateSimpleValue(effIndex) < 0)
                         return false;
                     break;
                 case SPELL_AURA_MOD_DAMAGE_TAKEN:           // dependent from bas point sign (positive -> negative)
@@ -738,7 +889,7 @@ bool IsPositiveEffect(SpellEntry const *spellproto, SpellEffectIndex effIndex)
                 case SPELL_AURA_MOD_SPELL_CRIT_CHANCE:
                 case SPELL_AURA_MOD_INCREASE_HEALTH_PERCENT:
                 case SPELL_AURA_MOD_DAMAGE_PERCENT_DONE:
-                    if(spellproto->CalculateSimpleValue(effIndex) > 0)
+                    if (spellproto->CalculateSimpleValue(effIndex) > 0)
                         return true;                        // some expected positive spells have SPELL_ATTR_EX_NEGATIVE or unclear target modes
                     break;
                 case SPELL_AURA_ADD_TARGET_TRIGGER:
@@ -765,14 +916,26 @@ bool IsPositiveEffect(SpellEntry const *spellproto, SpellEffectIndex effIndex)
                     }
                     break;
                 case SPELL_AURA_PROC_TRIGGER_SPELL:
+                {
+                    switch(spellproto->Id) // Impact should be poisitive aura
+                    {
+                        case 11103:
+                        case 12357:
+                        case 12358:
+                        case 64343:
+                            return true;
+                        default:
+                            break;
+                    }
                     // many positive auras have negative triggered spells at damage for example and this not make it negative (it can be canceled for example)
                     break;
+                }
                 case SPELL_AURA_MOD_STUN:                   //have positive and negative spells, we can't sort its correctly at this moment.
                     if (effIndex == EFFECT_INDEX_0 && spellproto->Effect[EFFECT_INDEX_1] == 0 && spellproto->Effect[EFFECT_INDEX_2] == 0)
                         return false;                       // but all single stun aura spells is negative
 
                     // Petrification
-                    if(spellproto->Id == 17624)
+                    if (spellproto->Id == 17624)
                         return false;
                     break;
                 case SPELL_AURA_MOD_PACIFY_SILENCE:
@@ -821,6 +984,7 @@ bool IsPositiveEffect(SpellEntry const *spellproto, SpellEffectIndex effIndex)
                     switch(spellproto->Id)
                     {
                         case 802:                           // Mutate Bug, wrongly negative by target modes
+                        case 38449:                         // Blessing of the Tides
                             return true;
                         case 36900:                         // Soul Split: Evil!
                         case 36901:                         // Soul Split: Good
@@ -850,13 +1014,26 @@ bool IsPositiveEffect(SpellEntry const *spellproto, SpellEffectIndex effIndex)
                     switch(spellproto->EffectMiscValue[effIndex])
                     {
                         case SPELLMOD_COST:                 // dependent from bas point sign (negative -> positive)
-                            if(spellproto->CalculateSimpleValue(effIndex) > 0)
+                            if (spellproto->Id == 12042)     // Arcane Power workaround
+                                break;
+                            if (spellproto->CalculateSimpleValue(effIndex) > 0)
                                 return false;
                             break;
                         default:
                             break;
                     }
                 }   break;
+                case SPELL_AURA_MOD_MELEE_HASTE:
+                {
+                    switch (spellproto->Id)
+                    {
+                        case 38449:                         // Blessing of the Tides
+                            return true;
+                        default:
+                            break;
+                    }
+                    break;
+                }
                 case SPELL_AURA_FORCE_REACTION:
                 {
                     switch (spellproto->Id)
@@ -869,6 +1046,13 @@ bool IsPositiveEffect(SpellEntry const *spellproto, SpellEffectIndex effIndex)
                     }
                     break;
                 }
+                case SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT:
+                {
+                    if (spellproto->CalculateSimpleValue(effIndex) < 0)
+                        return true;
+                    else
+                        return false;
+                }
                 default:
                     break;
             }
@@ -909,6 +1093,30 @@ bool IsPositiveSpell(SpellEntry const *spellproto)
     return true;
 }
 
+bool IsNonPositiveSpell(uint32 spellId)
+{
+    SpellEntry const* spellProto = sSpellStore.LookupEntry(spellId);
+
+    if (!spellProto)
+        return false;
+
+    return IsNonPositiveSpell(spellProto);
+}
+
+bool IsNonPositiveSpell(SpellEntry const* spellProto)
+{
+    if (!spellProto)
+        return false;
+
+    if (spellProto->HasAttribute(SPELL_ATTR_EX6_NO_STACK_DEBUFF_MAJOR))
+        return true;
+
+    if (IsPositiveSpell(spellProto))
+        return false;
+
+    return true;
+}
+
 bool IsSingleTargetSpell(SpellEntry const *spellInfo)
 {
     // all other single target spells have if it has AttributesEx5
@@ -927,7 +1135,7 @@ bool IsSingleTargetSpell(SpellEntry const *spellInfo)
     // single target triggered spell.
     // Not real client side single target spell, but it' not triggered until prev. aura expired.
     // This is allow store it in single target spells list for caster for spell proc checking
-    if(spellInfo->Id==38324)                                // Regeneration (triggered by 38299 (HoTs on Heals))
+    if (spellInfo->Id==38324)                                // Regeneration (triggered by 38299 (HoTs on Heals))
         return true;
 
     return false;
@@ -937,8 +1145,8 @@ bool IsSingleTargetSpells(SpellEntry const *spellInfo1, SpellEntry const *spellI
 {
     // TODO - need better check
     // Equal icon and spellfamily
-    if( spellInfo1->SpellFamilyName == spellInfo2->SpellFamilyName &&
-        spellInfo1->SpellIconID == spellInfo2->SpellIconID )
+    if ( spellInfo1->SpellFamilyName == spellInfo2->SpellFamilyName &&
+        spellInfo1->GetSpellIconID() == spellInfo2->GetSpellIconID() )
         return true;
 
     // TODO - need found Judgements rule
@@ -948,7 +1156,7 @@ bool IsSingleTargetSpells(SpellEntry const *spellInfo1, SpellEntry const *spellI
     {
         case SPELL_JUDGEMENT:
         case SPELL_MAGE_POLYMORPH:
-            if(GetSpellSpecific(spellInfo2->Id) == spec1)
+            if (GetSpellSpecific(spellInfo2->Id) == spec1)
                 return true;
             break;
         default:
@@ -962,7 +1170,7 @@ SpellCastResult GetErrorAtShapeshiftedCast (SpellEntry const *spellInfo, uint32
 {
     // talents that learn spells can have stance requirements that need ignore
     // (this requirement only for client-side stance show in talent description)
-    if( GetTalentSpellCost(spellInfo->Id) > 0 &&
+    if ( GetTalentSpellCost(spellInfo->Id) > 0 &&
         (spellInfo->Effect[EFFECT_INDEX_0] == SPELL_EFFECT_LEARN_SPELL || spellInfo->Effect[EFFECT_INDEX_1] == SPELL_EFFECT_LEARN_SPELL || spellInfo->Effect[EFFECT_INDEX_2] == SPELL_EFFECT_LEARN_SPELL) )
         return SPELL_CAST_OK;
 
@@ -986,10 +1194,14 @@ SpellCastResult GetErrorAtShapeshiftedCast (SpellEntry const *spellInfo, uint32
         actAsShifted = !(shapeInfo->flags1 & 1);            // shapeshift acts as normal form for spells
     }
 
-    if(actAsShifted)
+    if (actAsShifted)
     {
         if (spellInfo->HasAttribute(SPELL_ATTR_NOT_SHAPESHIFT)) // not while shapeshifted
-            return SPELL_FAILED_NOT_SHAPESHIFT;
+        {
+            //but we must allow cast of Berserk+modifier from any form... where for the hell should we do it?
+            if (!(spellInfo->GetSpellIconID() == 1680 && (spellInfo->GetAttributesEx() & 0x8000)))
+                return SPELL_FAILED_NOT_SHAPESHIFT;
+        }
         else if (spellInfo->Stances != 0)                   // needs other shapeshift
             return SPELL_FAILED_ONLY_SHAPESHIFT;
     }
@@ -1032,22 +1244,20 @@ void SpellMgr::LoadSpellTargetPositions()
 
         uint32 Spell_ID = fields[0].GetUInt32();
 
-        SpellTargetPosition st;
-
-        st.target_mapId       = fields[1].GetUInt32();
-        st.target_X           = fields[2].GetFloat();
-        st.target_Y           = fields[3].GetFloat();
-        st.target_Z           = fields[4].GetFloat();
-        st.target_Orientation = fields[5].GetFloat();
+        WorldLocation st = WorldLocation(fields[1].GetUInt32(),
+                                         fields[2].GetFloat(),
+                                         fields[3].GetFloat(),
+                                         fields[4].GetFloat(),
+                                         fields[5].GetFloat());
 
-        MapEntry const* mapEntry = sMapStore.LookupEntry(st.target_mapId);
+        MapEntry const* mapEntry = sMapStore.LookupEntry(st.GetMapId());
         if (!mapEntry)
         {
-            sLog.outErrorDb("Spell (ID:%u) target map (ID: %u) does not exist in `Map.dbc`.",Spell_ID,st.target_mapId);
+            sLog.outErrorDb("Spell (ID:%u) target map (ID: %u) does not exist in `Map.dbc`.",Spell_ID,st.GetMapId());
             continue;
         }
 
-        if (st.target_X==0 && st.target_Y==0 && st.target_Z==0)
+        if (st.IsEmpty())
         {
             sLog.outErrorDb("Spell (ID:%u) target coordinates not provided.",Spell_ID);
             continue;
@@ -1063,19 +1273,12 @@ void SpellMgr::LoadSpellTargetPositions()
         bool found = false;
         for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
         {
-            if (spellInfo->EffectImplicitTargetA[i]==TARGET_TABLE_X_Y_Z_COORDINATES || spellInfo->EffectImplicitTargetB[i]==TARGET_TABLE_X_Y_Z_COORDINATES)
+            if (spellInfo->EffectImplicitTargetA[i] == TARGET_TABLE_X_Y_Z_COORDINATES ||
+                spellInfo->EffectImplicitTargetB[i] == TARGET_TABLE_X_Y_Z_COORDINATES ||
+                spellInfo->EffectImplicitTargetA[i] == TARGET_SCRIPT_COORDINATES ||
+                spellInfo->EffectImplicitTargetB[i] == TARGET_SCRIPT_COORDINATES ||
+                spellInfo->EffectImplicitTargetB[i] == TARGET_SELF2)
             {
-                // additional requirements
-                if (spellInfo->Effect[i]==SPELL_EFFECT_BIND && spellInfo->EffectMiscValue[i])
-                {
-                    uint32 zone_id = sTerrainMgr.GetAreaId(st.target_mapId, st.target_X, st.target_Y, st.target_Z);
-                    if (int32(zone_id) != spellInfo->EffectMiscValue[i])
-                    {
-                        sLog.outErrorDb("Spell (Id: %u) listed in `spell_target_position` expected point to zone %u bit point to zone %u.",Spell_ID, spellInfo->EffectMiscValue[i], zone_id);
-                        break;
-                    }
-                }
-
                 found = true;
                 break;
             }
@@ -1113,7 +1316,7 @@ struct SpellRankHelper
         uint32 first_id = mgr.GetFirstSpellInChain(spell_id);
 
         // most spell ranks expected same data
-        if(first_id)
+        if (first_id)
         {
             firstRankSpells.insert(first_id);
 
@@ -1219,8 +1422,9 @@ struct DoSpellProcEvent
 
         if (spe.procFlags == 0)
         {
-            if (spell->procFlags==0)
-                sLog.outErrorDb("Spell %u listed in `spell_proc_event` probally not triggered spell (no proc flags)", spell->Id);
+            if (spell->procFlags == 0)
+                DEBUG_LOG("Spell %u listed in `spell_proc_event` probally not triggered spell (no proc flags)", spell->Id);
+            isCustom = true;
         }
         else
         {
@@ -1313,7 +1517,8 @@ void SpellMgr::LoadSpellProcEvents()
         for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
         {
             spe.spellFamilyMask[i] = ClassFamilyMask(
-                (uint64)fields[i+3].GetUInt32() | ((uint64)fields[i+6].GetUInt32()<<32),
+                fields[i+3].GetUInt32(),
+                fields[i+6].GetUInt32(),
                 fields[i+9].GetUInt32());
         }
         spe.procFlags       = fields[12].GetUInt32();
@@ -1395,7 +1600,7 @@ void SpellMgr::LoadSpellProcItemEnchant()
 
         // also add to high ranks
         DoSpellProcItemEnchant worker(mSpellProcItemEnchantMap, ppmRate);
-        doForHighRanks(entry,worker);
+        doForHighRanks(entry, worker);
 
         ++count;
     } while( result->NextRow() );
@@ -1427,6 +1632,7 @@ bool IsCastEndProcModifierAura(SpellEntry const *spellInfo, SpellEffectIndex eff
                 default:
                     break;
             }
+            break;
         }
         case SPELL_AURA_MOD_DAMAGE_PERCENT_DONE:
         {
@@ -1434,11 +1640,12 @@ bool IsCastEndProcModifierAura(SpellEntry const *spellInfo, SpellEffectIndex eff
                 if (IsEffectHandledOnDelayedSpellLaunch(procSpell, SpellEffectIndex(i)))
                     return true;
 
-            return false;
+            break;
         }
         default:
-            return false;
+            break;
     }
+    return false;
 }
 
 struct DoSpellBonuses
@@ -1453,6 +1660,87 @@ struct DoSpellBonuses
 void SpellMgr::LoadSpellBonuses()
 {
     mSpellBonusMap.clear();                             // need for reload case
+
+    // load DBC data EffectCoeffs[] fields
+    // NOTE : only direct_damage/dot_damage data, there's no ap_bonus
+    for(uint32 entry = 1; entry < sSpellStore.GetNumRows(); ++entry)
+    {
+        SpellEntry const* spell = sSpellStore.LookupEntry(entry);
+        if (spell)
+        {
+            // skip NPC spells?
+            if(spell->SpellFamilyName == SPELLFAMILY_GENERIC)
+                continue;
+
+            SpellBonusEntry sbe;
+            bool dataAdded = false;
+
+            for(uint8 i = 0; i < MAX_EFFECT_INDEX; ++i)
+            {
+                if(spell->Effect[i] && spell->EffectCoeffs[i])
+                {
+                    bool isDotEffect = false;
+                    switch(spell->EffectApplyAuraName[i])
+                    {
+                        case SPELL_AURA_PERIODIC_DAMAGE:
+                        case SPELL_AURA_PERIODIC_DAMAGE_PERCENT:
+                        case SPELL_AURA_PERIODIC_LEECH:
+                        case SPELL_AURA_PERIODIC_HEAL:
+                        case SPELL_AURA_OBS_MOD_HEALTH:
+                        case SPELL_AURA_PERIODIC_MANA_LEECH:
+                        case SPELL_AURA_OBS_MOD_MANA:
+                        case SPELL_AURA_POWER_BURN_MANA:
+                            isDotEffect = true;
+                            break;
+                        default:
+                            break;
+                    }
+
+                    // both spells that should take 100% bonus and melee spells have EffectCoeffs set to 100%
+                    // we don't want to load the later
+                    // sometimes indexes with no effect set to 100% too
+                    if(spell->EffectCoeffs[i] == 1.0f)
+                    {
+                        // is it the proper check?
+                        if((spell->GetSchoolMask() & SPELL_SCHOOL_MASK_MAGIC) == 0)
+                            continue;
+
+                        if(spell->Effect[i] != SPELL_EFFECT_SCHOOL_DAMAGE &&
+                            spell->Effect[i] != SPELL_EFFECT_HEALTH_LEECH &&
+                            (spell->Effect[i] != SPELL_EFFECT_APPLY_AURA || !isDotEffect) &&
+                            spell->Effect[i] != SPELL_EFFECT_PERSISTENT_AREA_AURA &&
+                            spell->Effect[i] != SPELL_EFFECT_HEAL)
+                            continue;
+                    }
+
+                    if(!isDotEffect)
+                    {
+                        sbe.direct_damage = spell->EffectCoeffs[i];
+                        sbe.dot_damage = 0.0f;
+                    }
+                    else
+                    {
+                        sbe.dot_damage = spell->EffectCoeffs[i];
+                        sbe.direct_damage = 0.0f;
+                    }
+
+                    // Disable ap_bonus/ap_dot_bonus by default
+                    sbe.ap_bonus = 0.0f;
+                    sbe.ap_dot_bonus = 0.0f;
+
+                    dataAdded = true;
+                }
+            }
+
+            if(dataAdded)
+                mSpellBonusMap[entry] = sbe;
+
+            // DO not add to other ranks! data vary per rank on some spells
+        }
+    }
+
+    // Load data from database
+
     uint32 count = 0;
     //                                                0      1             2          3
     QueryResult *result = WorldDatabase.Query("SELECT entry, direct_bonus, dot_bonus, ap_bonus, ap_dot_bonus FROM spell_bonus_data");
@@ -1493,7 +1781,7 @@ void SpellMgr::LoadSpellBonuses()
         sbe.direct_damage = fields[1].GetFloat();
         sbe.dot_damage    = fields[2].GetFloat();
         sbe.ap_bonus      = fields[3].GetFloat();
-        sbe.ap_dot_bonus   = fields[4].GetFloat();
+        sbe.ap_dot_bonus  = fields[4].GetFloat();
 
         bool need_dot = false;
         bool need_direct = false;
@@ -1595,7 +1883,7 @@ void SpellMgr::LoadSpellBonuses()
 
         // also add to high ranks
         DoSpellBonuses worker(mSpellBonusMap, sbe);
-        doForHighRanks(entry, worker);
+        doForHighRanks(entry,worker);
 
         ++count;
 
@@ -1607,6 +1895,98 @@ void SpellMgr::LoadSpellBonuses()
     sLog.outString( ">> Loaded %u extra spell bonus data",  count);
 }
 
+void SpellMgr::LoadSpellLinked()
+{
+    mSpellLinkedMap.clear();                          // need for reload case
+    uint32 count = 0;
+    //                                                0      1             2     3
+    QueryResult* result = WorldDatabase.Query("SELECT entry, linked_entry, type, effect_mask FROM spell_linked");
+    if (!result)
+    {
+        BarGoLink bar(1);
+        bar.step();
+        sLog.outString();
+        sLog.outString(">> Spell linked definition not loaded - table empty");
+        return;
+    }
+
+    BarGoLink bar(result->GetRowCount());
+    do
+    {
+        Field *fields = result->Fetch();
+        bar.step();
+        uint32 entry       = fields[0].GetUInt32();
+        uint32 linkedEntry = fields[1].GetUInt32();
+        uint32 uitype      = fields[2].GetUInt32();
+
+        SpellEntry const* spell = sSpellStore.LookupEntry(entry);
+        SpellEntry const* spell1 = sSpellStore.LookupEntry(linkedEntry);
+        if (!spell || !spell1)
+        {
+            sLog.outErrorDb("Spells %u or %u listed in `spell_linked` does not exist", entry, linkedEntry);
+            continue;
+        }
+
+        if (entry == linkedEntry)
+        {
+            sLog.outErrorDb("Spell %u linked with self!", entry);
+            continue;
+        }
+
+        if (uitype >= SPELL_LINKED_TYPE_MAX)
+        {
+            sLog.outErrorDb("Spell %u has no valid type %u", entry, uitype);
+            continue;
+        }
+
+        SpellLinkedType type = SpellLinkedType(uitype);
+
+        uint32 first_id = GetFirstSpellInChain(entry);
+
+        if ( first_id != entry )
+        {
+            sLog.outErrorDb("Spell %u listed in `spell_linked` is not first rank (%u) in chain", entry, first_id);
+        }
+
+        SpellLinkedEntry data;
+
+        data.spellId      = entry;
+        data.linkedId     = linkedEntry;
+        data.type         = type;
+        data.effectMask   = fields[3].GetUInt32();
+
+        mSpellLinkedMap.insert(SpellLinkedMap::value_type(entry,data));
+
+        ++count;
+
+    }
+    while (result->NextRow());
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString( ">> Loaded %u spell linked definitions",  count);
+}
+
+SpellLinkedSet SpellMgr::GetSpellLinked(uint32 spell_id, SpellLinkedType type) const
+{
+    SpellLinkedSet result;
+
+    result.clear();
+
+    SpellLinkedMapBounds const& bounds = GetSpellLinkedMapBounds(spell_id);
+
+    if (type < SPELL_LINKED_TYPE_MAX && bounds.first != bounds.second)
+    {
+        for (SpellLinkedMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+        {
+            if (itr->second.type == type)
+                result.insert(itr->second.linkedId);
+        }
+    }
+    return result;
+}
+
 bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const * spellProcEvent, uint32 EventProcFlag, SpellEntry const * procSpell, uint32 procFlags, uint32 procExtra)
 {
     // No extra req need
@@ -1617,7 +1997,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const * spellP
         return false;
 
     // Always trigger for this
-    if (EventProcFlag & (PROC_FLAG_KILLED | PROC_FLAG_KILL | PROC_FLAG_ON_TRAP_ACTIVATION))
+    if (EventProcFlag & (PROC_FLAG_KILLED | PROC_FLAG_KILL | PROC_FLAG_ON_TRAP_ACTIVATION | PROC_FLAG_ON_DEATH))
         return true;
 
     if (spellProcEvent)     // Exist event data
@@ -1629,17 +2009,17 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const * spellP
         if (procSpell == NULL)
         {
             // Check (if set) for school (melee attack have Normal school)
-            if(spellProcEvent->schoolMask && (spellProcEvent->schoolMask & SPELL_SCHOOL_MASK_NORMAL) == 0)
+            if (spellProcEvent->schoolMask && (spellProcEvent->schoolMask & SPELL_SCHOOL_MASK_NORMAL) == 0)
                 return false;
         }
         else // For spells need check school/spell family/family mask
         {
             // Check (if set) for school
-            if(spellProcEvent->schoolMask && (spellProcEvent->schoolMask & procSpell->SchoolMask) == 0)
+            if (spellProcEvent->schoolMask && (spellProcEvent->schoolMask & procSpell->GetSchoolMask()) == 0)
                 return false;
 
             // Check (if set) for spellFamilyName
-            if(spellProcEvent->spellFamilyName && (spellProcEvent->spellFamilyName != procSpell->SpellFamilyName))
+            if (spellProcEvent->spellFamilyName && (spellProcEvent->spellFamilyName != procSpell->SpellFamilyName))
                 return false;
         }
     }
@@ -1648,7 +2028,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const * spellP
     if (procEvent_procEx == PROC_EX_NONE)
     {
         // Don't allow proc from periodic heal if no extra requirement is defined
-        if (EventProcFlag & (PROC_FLAG_ON_DO_PERIODIC | PROC_FLAG_ON_TAKE_PERIODIC) && (procExtra & PROC_EX_PERIODIC_POSITIVE))
+        if ((EventProcFlag & (PROC_FLAG_ON_DO_PERIODIC | PROC_FLAG_ON_TAKE_PERIODIC)) && (procExtra & PROC_EX_PERIODIC_POSITIVE))
             return false;
 
         // No extra req, so can trigger for (damage/healing present) and cast end/hit/crit
@@ -1753,9 +2133,10 @@ struct DoSpellThreat
 
         // flat threat bonus and attack power bonus currently only work properly when all
         // effects have same targets, otherwise, we'd need to seperate it by effect index
-        if (ste.threat || ste.ap_bonus != 0.f)
+        if (ste.threat || fabs(ste.ap_bonus) > M_NULL_F)
         {
             const uint32 *targetA = spell->EffectImplicitTargetA;
+            //const uint32 *targetB = spell->EffectImplicitTargetB;
             if ((targetA[EFFECT_INDEX_1] && targetA[EFFECT_INDEX_1] != targetA[EFFECT_INDEX_0]) ||
                 (targetA[EFFECT_INDEX_2] && targetA[EFFECT_INDEX_2] != targetA[EFFECT_INDEX_0]))
                 sLog.outErrorDb("Spell %u listed in `spell_threat` has effects with different targets, threat may be assigned incorrectly", spell->Id);
@@ -1818,7 +2199,7 @@ bool SpellMgr::IsRankSpellDueToSpell(SpellEntry const *spellInfo_1,uint32 spellI
 {
     SpellEntry const *spellInfo_2 = sSpellStore.LookupEntry(spellId_2);
     if(!spellInfo_1 || !spellInfo_2) return false;
-    if(spellInfo_1->Id == spellId_2) return false;
+    if (spellInfo_1->Id == spellId_2) return false;
 
     return GetFirstSpellInChain(spellInfo_1->Id)==GetFirstSpellInChain(spellId_2);
 }
@@ -1827,7 +2208,7 @@ bool SpellMgr::canStackSpellRanksInSpellBook(SpellEntry const *spellInfo) const
 {
     if (IsPassiveSpell(spellInfo))                          // ranked passive spell
         return false;
-    if (spellInfo->powerType != POWER_MANA && spellInfo->powerType != POWER_HEALTH)
+    if (spellInfo->GetPowerType() != POWER_MANA && spellInfo->GetPowerType() != POWER_HEALTH)
         return false;
     if (IsProfessionOrRidingSpell(spellInfo->Id))
         return false;
@@ -1845,7 +2226,7 @@ bool SpellMgr::canStackSpellRanksInSpellBook(SpellEntry const *spellInfo) const
                 if (spellInfo->Effect[i]==SPELL_EFFECT_APPLY_AREA_AURA_RAID)
                     return false;
                 // Seal of Righteousness, 2 version of same rank
-                if ((spellInfo->SpellFamilyFlags & UI64LIT(0x0000000008000000)) && spellInfo->SpellIconID == 25)
+                if (spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_SEAL_OF_JUST_RIGHT>() && spellInfo->GetSpellIconID() == 25)
                     return false;
                 break;
             case SPELLFAMILY_DRUID:
@@ -1867,576 +2248,151 @@ bool SpellMgr::canStackSpellRanksInSpellBook(SpellEntry const *spellInfo) const
 
 bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) const
 {
-    SpellEntry const *spellInfo_1 = sSpellStore.LookupEntry(spellId_1);
-    SpellEntry const *spellInfo_2 = sSpellStore.LookupEntry(spellId_2);
-
-    if (!spellInfo_1 || !spellInfo_2)
-        return false;
-
     if (spellId_1 == spellId_2)
         return false;
 
-    // Resurrection sickness
-    if ((spellInfo_1->Id == SPELL_ID_PASSIVE_RESURRECTION_SICKNESS) != (spellInfo_2->Id==SPELL_ID_PASSIVE_RESURRECTION_SICKNESS))
-        return false;
+    SpellEntry const* spellInfo_1 = sSpellStore.LookupEntry(spellId_1);
+    SpellEntry const* spellInfo_2 = sSpellStore.LookupEntry(spellId_2);
 
-    // Allow stack passive and not passive spells
-    if (spellInfo_1->HasAttribute(SPELL_ATTR_PASSIVE) != spellInfo_2->HasAttribute(SPELL_ATTR_PASSIVE))
+    if (!spellInfo_1 || !spellInfo_2)
         return false;
 
+    #define MatchedSpellIdPair(Id_1, Id_2) ((spellInfo_1->Id == Id_1 && spellInfo_2->Id == Id_2) || (spellInfo_1->Id == Id_2 && spellInfo_2->Id == Id_1))
+    #define MatchedIconIdPair(Id_1, Id_2) ((spellInfo_1->GetSpellIconID() == Id_1 && spellInfo_2->GetSpellIconID() == Id_2) || (spellInfo_1->GetSpellIconID() == Id_2 && spellInfo_2->GetSpellIconID() == Id_1))
+
     // Specific spell family spells
-    switch(spellInfo_1->SpellFamilyName)
+    // also some SpellIconID exceptions related to late checks (isModifier)
+    switch (spellInfo_1->SpellFamilyName)
     {
         case SPELLFAMILY_GENERIC:
-            switch(spellInfo_2->SpellFamilyName)
-            {
-                case SPELLFAMILY_GENERIC:                   // same family case
-                {
-                    // Thunderfury
-                    if ((spellInfo_1->Id == 21992 && spellInfo_2->Id == 27648) ||
-                        (spellInfo_2->Id == 21992 && spellInfo_1->Id == 27648))
-                        return false;
-
-                    // Lightning Speed (Mongoose) and Fury of the Crashing Waves (Tsunami Talisman)
-                    if ((spellInfo_1->Id == 28093 && spellInfo_2->Id == 42084) ||
-                        (spellInfo_2->Id == 28093 && spellInfo_1->Id == 42084))
-                        return false;
-
-                    // Soulstone Resurrection and Twisting Nether (resurrector)
-                    if (spellInfo_1->SpellIconID == 92 && spellInfo_2->SpellIconID == 92 && (
-                        (spellInfo_1->SpellVisual[0] == 99 && spellInfo_2->SpellVisual[0] == 0) ||
-                        (spellInfo_2->SpellVisual[0] == 99 && spellInfo_1->SpellVisual[0] == 0)))
-                        return false;
-
-                    // Heart of the Wild, Agility and various Idol Triggers
-                    if (spellInfo_1->SpellIconID == 240 && spellInfo_2->SpellIconID == 240)
-                        return false;
-
-                    // Personalized Weather (thunder effect should overwrite rainy aura)
-                    if (spellInfo_1->SpellIconID == 2606 && spellInfo_2->SpellIconID == 2606)
-                        return false;
-
-                    // Mirrored Soul (FoS - Devourer) - and other Boss spells
-                    if (spellInfo_1->SpellIconID == 3176 && spellInfo_2->SpellIconID == 3176)
-                        return false;
-
-                    // Brood Affliction: Bronze
-                    if ((spellInfo_1->Id == 23170 && spellInfo_2->Id == 23171) ||
-                        (spellInfo_2->Id == 23170 && spellInfo_1->Id == 23171))
-                        return false;
-
-                    // Male Shadowy Disguise
-                    if ((spellInfo_1->Id == 32756 && spellInfo_2->Id == 38080) ||
-                        (spellInfo_2->Id == 32756 && spellInfo_1->Id == 38080))
-                         return false;
-
-                    // Female Shadowy Disguise
-                    if ((spellInfo_1->Id == 32756 && spellInfo_2->Id == 38081) ||
-                        (spellInfo_2->Id == 32756 && spellInfo_1->Id == 38081))
-                         return false;
-
-                    // Cool Down (See PeriodicAuraTick())
-                    if ((spellInfo_1->Id == 52441 && spellInfo_2->Id == 52443) ||
-                        (spellInfo_2->Id == 52441 && spellInfo_1->Id == 52443))
-                        return false;
+        {
+            // BG_WS_SPELL_FOCUSED_ASSAULT & BG_WS_SPELL_BRUTAL_ASSAULT
+            if (MatchedSpellIdPair(46392, 46393))
+                return true;
 
-                    // See Chapel Invisibility and See Noth Invisibility
-                    if ((spellInfo_1->Id == 52950 && spellInfo_2->Id == 52707) ||
-                        (spellInfo_2->Id == 52950 && spellInfo_1->Id == 52707))
-                        return false;
+            // Dark Essence & Light Essence
+            if (MatchedSpellIdPair(65684, 65686))
+                return true;
 
-                    // Regular and Night Elf Ghost
-                    if ((spellInfo_1->Id == 8326 && spellInfo_2->Id == 20584) ||
-                        (spellInfo_2->Id == 8326 && spellInfo_1->Id == 20584))
-                         return false;
+            // Potent Fungus and Mini must remove each other (Amanitar encounter, Ahn'kahet)
+            if (MatchedSpellIdPair(57055, 56648))
+                return true;
 
-                    // Aura of Despair auras
-                    if ((spellInfo_1->Id == 64848 && spellInfo_2->Id == 62692) ||
-                        (spellInfo_2->Id == 64848 && spellInfo_1->Id == 62692))
-                        return false;
+            // Mirrored Soul (FoS - Devourer) - and other Boss spells
+            if (spellInfo_1->GetSpellIconID() == 3176 && spellInfo_2->GetSpellIconID() == 3176)
+                return false;
 
-                    // Blood Fury and Rage of the Unraveller
-                    if (spellInfo_1->SpellIconID == 1662 && spellInfo_2->SpellIconID == 1662)
-                        return false;
+            // Blessing of Forgotten Kings and (Greater) Blessing of Kings
+            if (spellInfo_1->Id == 72586)
+            {
+                if (spellInfo_2->GetSpellFamilyFlags().test<CF_PALADIN_BLESSING_OF_KINGS>())
+                    return true;
+            }
+            // Black Hole (damage) and Black Hole (phase)
+            if (MatchedSpellIdPair(62169, 62168))
+                return false;
 
-                    // Kindred Spirits
-                    if (spellInfo_1->SpellIconID == 3559 && spellInfo_2->SpellIconID == 3559)
-                        return false;
+            // Black Hole (damage) and Worm Hole (phase)
+            if (MatchedSpellIdPair(62169, 65250))
+                return false;
 
-                    // Vigilance and Damage Reduction (Vigilance triggered spell)
-                    if (spellInfo_1->SpellIconID == 2834 && spellInfo_2->SpellIconID == 2834)
-                        return false;
+            // Black Hole (damage) and Phase Punch (phase)
+            if (MatchedSpellIdPair(62169, 64417))
+                return false;
 
-                    // Unstable Sphere Timer and Unstable Sphere Passive
-                    if ((spellInfo_1->Id == 50758 && spellInfo_2->Id == 50756) ||
-                        (spellInfo_2->Id == 50758 && spellInfo_1->Id == 50756))
-                        return false;
-
-                    break;
-                }
-                case SPELLFAMILY_MAGE:
-                    // Arcane Intellect and Insight
-                    if (spellInfo_2->SpellIconID == 125 && spellInfo_1->Id == 18820)
-                        return false;
-                    break;
-                case SPELLFAMILY_WARRIOR:
-                {
-                    // Scroll of Protection and Defensive Stance (multi-family check)
-                    if (spellInfo_1->SpellIconID == 276 && spellInfo_1->SpellVisual[0] == 196 && spellInfo_2->Id == 71)
-                        return false;
-
-                    // Improved Hamstring -> Hamstring (multi-family check)
-                    if ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x2)) && spellInfo_1->Id == 23694)
-                        return false;
-
-                    break;
-                }
-                case SPELLFAMILY_DRUID:
-                {
-                    // Scroll of Stamina and Leader of the Pack (multi-family check)
-                    if (spellInfo_1->SpellIconID == 312 && spellInfo_1->SpellVisual[0] == 216 && spellInfo_2->Id == 24932)
-                        return false;
-
-                    // Dragonmaw Illusion (multi-family check)
-                    if (spellId_1 == 40216 && spellId_2 == 42016)
-                        return false;
-
-                    break;
-                }
-                case SPELLFAMILY_ROGUE:
-                {
-                    // Garrote-Silence -> Garrote (multi-family check)
-                    if (spellInfo_1->SpellIconID == 498 && spellInfo_1->SpellVisual[0] == 0 && spellInfo_2->SpellIconID == 498)
-                        return false;
-
-                    break;
-                }
-                case SPELLFAMILY_HUNTER:
-                {
-                    // Concussive Shot and Imp. Concussive Shot (multi-family check)
-                    if (spellInfo_1->Id == 19410 && spellInfo_2->Id == 5116)
-                        return false;
-
-                    // Improved Wing Clip -> Wing Clip (multi-family check)
-                    if ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x40)) && spellInfo_1->Id == 19229)
-                        return false;
-                    break;
-                }
-                case SPELLFAMILY_PALADIN:
-                {
-                    // Unstable Currents and other -> *Sanctity Aura (multi-family check)
-                    if (spellInfo_2->SpellIconID==502 && spellInfo_1->SpellIconID==502 && spellInfo_1->SpellVisual[0]==969)
-                        return false;
-
-                    // *Band of Eternal Champion and Seal of Command(multi-family check)
-                    if (spellId_1 == 35081 && spellInfo_2->SpellIconID==561 && spellInfo_2->SpellVisual[0]==7992)
-                        return false;
-
-                    // Blessing of Sanctuary (multi-family check, some from 16 spell icon spells)
-                    if (spellInfo_1->Id == 67480 && spellInfo_2->Id == 20911)
-                        return false;
-
-                    break;
-                }
-            }
-            // Dragonmaw Illusion, Blood Elf Illusion, Human Illusion, Illidari Agent Illusion, Scarlet Crusade Disguise
-            if(spellInfo_1->SpellIconID == 1691 && spellInfo_2->SpellIconID == 1691)
-                return false;
-            break;
-        case SPELLFAMILY_MAGE:
-            if( spellInfo_2->SpellFamilyName == SPELLFAMILY_MAGE )
-            {
-                // Blizzard & Chilled (and some other stacked with blizzard spells
-                if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x80)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x100000))) ||
-                    ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x80)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x100000))))
-                    return false;
-
-                // Blink & Improved Blink
-                if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x0000000000010000)) && (spellInfo_2->SpellVisual[0] == 72 && spellInfo_2->SpellIconID == 1499)) ||
-                    ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x0000000000010000)) && (spellInfo_1->SpellVisual[0] == 72 && spellInfo_1->SpellIconID == 1499)))
-                    return false;
-
-                // Fingers of Frost effects
-                if (spellInfo_1->SpellIconID == 2947 && spellInfo_2->SpellIconID == 2947)
-                    return false;
-
-                // Living Bomb & Ignite (Dots)
-                if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x2000000000000)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x8000000))) ||
-                    ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x2000000000000)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x8000000))))
-                    return false;
-
-                // Fireball & Pyroblast (Dots)
-                if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x1)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x400000))) ||
-                    ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x1)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x400000))))
-                    return false;
-            }
-            // Detect Invisibility and Mana Shield (multi-family check)
-            if (spellInfo_2->Id == 132 && spellInfo_1->SpellIconID == 209 && spellInfo_1->SpellVisual[0] == 968)
-                return false;
-
-            // Combustion and Fire Protection Aura (multi-family check)
-            if (spellInfo_1->Id == 11129 && spellInfo_2->SpellIconID == 33 && spellInfo_2->SpellVisual[0] == 321)
-                return false;
-
-            // Arcane Intellect and Insight
-            if (spellInfo_1->SpellIconID == 125 && spellInfo_2->Id == 18820)
-                return false;
+            // Auto Grow and Healthy Spore Visual
+            if (MatchedSpellIdPair(62559, 62538))
+                return false;
 
             break;
+        }
         case SPELLFAMILY_WARLOCK:
             if (spellInfo_2->SpellFamilyName == SPELLFAMILY_WARLOCK)
             {
-                // Siphon Life and Drain Life
-                if ((spellInfo_1->SpellIconID == 152 && spellInfo_2->SpellIconID == 546) ||
-                    (spellInfo_2->SpellIconID == 152 && spellInfo_1->SpellIconID == 546))
-                    return false;
-
-                //Corruption & Seed of corruption
-                if ((spellInfo_1->SpellIconID == 313 && spellInfo_2->SpellIconID == 1932) ||
-                    (spellInfo_2->SpellIconID == 313 && spellInfo_1->SpellIconID == 1932))
-                    if(spellInfo_1->SpellVisual[0] != 0 && spellInfo_2->SpellVisual[0] != 0)
+                // Corruption & Seed of corruption
+                if (MatchedIconIdPair(313, 1932))
+                {
+                    if (spellInfo_1->GetSpellVisual() != 0 && spellInfo_2->GetSpellVisual() != 0)
                         return true;                        // can't be stacked
-
-                // Corruption and Unstable Affliction
-                if ((spellInfo_1->SpellIconID == 313 && spellInfo_2->SpellIconID == 2039) ||
-                    (spellInfo_2->SpellIconID == 313 && spellInfo_1->SpellIconID == 2039))
-                    return false;
-
-                // (Corruption or Unstable Affliction) and (Curse of Agony or Curse of Doom)
-                if (((spellInfo_1->SpellIconID == 313 || spellInfo_1->SpellIconID == 2039) && (spellInfo_2->SpellIconID == 544  || spellInfo_2->SpellIconID == 91)) ||
-                    ((spellInfo_2->SpellIconID == 313 || spellInfo_2->SpellIconID == 2039) && (spellInfo_1->SpellIconID == 544  || spellInfo_1->SpellIconID == 91)))
-                    return false;
-
-                // Shadowflame and Curse of Agony
-                if( spellInfo_1->SpellIconID == 544 && spellInfo_2->SpellIconID == 3317 ||
-                    spellInfo_2->SpellIconID == 544 && spellInfo_1->SpellIconID == 3317 )
-                    return false;
-
-                // Shadowflame and Curse of Doom
-                if( spellInfo_1->SpellIconID == 91 && spellInfo_2->SpellIconID == 3317 ||
-                    spellInfo_2->SpellIconID == 91 && spellInfo_1->SpellIconID == 3317 )
-                    return false;
-
-                // Metamorphosis, diff effects
-                if (spellInfo_1->SpellIconID == 3314 && spellInfo_2->SpellIconID == 3314)
-                    return false;
+                }
             }
-            // Detect Invisibility and Mana Shield (multi-family check)
-            if (spellInfo_1->Id == 132 && spellInfo_2->SpellIconID == 209 && spellInfo_2->SpellVisual[0] == 968)
-                return false;
             break;
         case SPELLFAMILY_WARRIOR:
             if (spellInfo_2->SpellFamilyName == SPELLFAMILY_WARRIOR)
             {
-                // Rend and Deep Wound
-                if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x20)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x1000000000))) ||
-                    ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x20)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x1000000000))))
-                    return false;
-
-                // Battle Shout and Rampage
-                if ((spellInfo_1->SpellIconID == 456 && spellInfo_2->SpellIconID == 2006) ||
-                    (spellInfo_2->SpellIconID == 456 && spellInfo_1->SpellIconID == 2006))
-                    return false;
-
-                // Glyph of Revenge (triggered), and Sword and Board (triggered)
-                if ((spellInfo_1->SpellIconID == 856 && spellInfo_2->SpellIconID == 2780) ||
-                    (spellInfo_2->SpellIconID == 856 && spellInfo_1->SpellIconID == 2780))
-                    return false;
-
                 // Defensive/Berserker/Battle stance aura can not stack (needed for dummy auras)
-                if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x800000)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x800000))) ||
-                    ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x800000)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x800000))))
+                if (spellInfo_1->GetSpellFamilyFlags().test<CF_WARRIOR_STANCES>() && spellInfo_2->GetSpellFamilyFlags().test<CF_WARRIOR_STANCES>())
                     return true;
             }
-
-            // Hamstring -> Improved Hamstring (multi-family check)
-            if ((spellInfo_1->SpellFamilyFlags & UI64LIT(0x2)) && spellInfo_2->Id == 23694)
-                return false;
-
-            // Defensive Stance and Scroll of Protection (multi-family check)
-            if (spellInfo_1->Id == 71 && spellInfo_2->SpellIconID == 276 && spellInfo_2->SpellVisual[0] == 196)
-                return false;
-
-            // Bloodlust and Bloodthirst (multi-family check)
-            if (spellInfo_2->Id == 2825 && spellInfo_1->SpellIconID == 38 && spellInfo_1->SpellVisual[0] == 0)
-                return false;
-
-            break;
-        case SPELLFAMILY_PRIEST:
-            if (spellInfo_2->SpellFamilyName == SPELLFAMILY_PRIEST)
-            {
-                //Devouring Plague and Shadow Vulnerability
-                if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x2000000)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x800000000))) ||
-                    ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x2000000)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x800000000))))
-                    return false;
-
-                //StarShards and Shadow Word: Pain
-                if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x200000)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x8000))) ||
-                    ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x200000)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x8000))))
-                    return false;
-
-                // Dispersion
-                if ((spellInfo_1->Id == 47585 && spellInfo_2->Id == 60069) ||
-                    (spellInfo_2->Id == 47585 && spellInfo_1->Id == 60069))
-                    return false;
-            }
             break;
         case SPELLFAMILY_DRUID:
             if (spellInfo_2->SpellFamilyName == SPELLFAMILY_DRUID)
             {
-                //Omen of Clarity and Blood Frenzy
-                if (((spellInfo_1->SpellFamilyFlags == UI64LIT(0x0) && spellInfo_1->SpellIconID == 108) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x20000000000000))) ||
-                    ((spellInfo_2->SpellFamilyFlags == UI64LIT(0x0) && spellInfo_2->SpellIconID == 108) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x20000000000000))))
-                    return false;
-
-                //  Tree of Life (Shapeshift) and 34123 Tree of Life (Passive)
-                if ((spellId_1 == 33891 && spellId_2 == 34123) ||
-                    (spellId_2 == 33891 && spellId_1 == 34123))
-                    return false;
-
-                // Lifebloom and Wild Growth
-                if ((spellInfo_1->SpellIconID == 2101 && spellInfo_2->SpellIconID == 2864) ||
-                    (spellInfo_2->SpellIconID == 2101 && spellInfo_1->SpellIconID == 2864))
-                    return false;
-
-                //  Innervate and Glyph of Innervate and some other spells
-                if (spellInfo_1->SpellIconID == 62 && spellInfo_2->SpellIconID == 62)
-                    return false;
-
-                // Wrath of Elune and Nature's Grace
-                if ((spellInfo_1->Id == 16886 && spellInfo_2->Id == 46833) ||
-                    (spellInfo_2->Id == 16886 && spellInfo_1->Id == 46833))
-                    return false;
-
-                // Bear Rage (Feral T4 (2)) and Omen of Clarity
-                if ((spellInfo_1->Id == 16864 && spellInfo_2->Id == 37306) ||
-                    (spellInfo_2->Id == 16864 && spellInfo_1->Id == 37306))
-                    return false;
-
-                // Cat Energy (Feral T4 (2)) and Omen of Clarity
-                if ((spellInfo_1->Id == 16864 && spellInfo_2->Id == 37311) ||
-                    (spellInfo_2->Id == 16864 && spellInfo_1->Id == 37311))
-                    return false;
-
-                // Survival Instincts and Survival Instincts
-                if ((spellInfo_1->Id == 61336 && spellInfo_2->Id == 50322) ||
-                    (spellInfo_2->Id == 61336 && spellInfo_1->Id == 50322))
-                    return false;
-
-                // Savage Roar and Savage Roar (triggered)
-                if (spellInfo_1->SpellIconID == 2865 && spellInfo_2->SpellIconID == 2865)
-                    return false;
-
-                // Frenzied Regeneration and Savage Defense
-                if ((spellInfo_1->Id == 22842 && spellInfo_2->Id == 62606) ||
-                    (spellInfo_2->Id == 22842 && spellInfo_1->Id == 62606))
-                    return false;
+                // Mark/Gift of the Wild
+                if (spellInfo_1->IsFitToFamily<SPELLFAMILY_DRUID, CF_DRUID_MARK_OF_THE_WILD>() &&
+                    spellInfo_2->IsFitToFamily<SPELLFAMILY_DRUID, CF_DRUID_MARK_OF_THE_WILD>())
+                    return true;
             }
-
-            // Leader of the Pack and Scroll of Stamina (multi-family check)
-            if (spellInfo_1->Id == 24932 && spellInfo_2->SpellIconID == 312 && spellInfo_2->SpellVisual[0] == 216)
-                return false;
-
-            // Dragonmaw Illusion (multi-family check)
-            if (spellId_1 == 42016 && spellId_2 == 40216 )
-                return false;
-
             break;
-        case SPELLFAMILY_ROGUE:
-            if (spellInfo_2->SpellFamilyName == SPELLFAMILY_ROGUE)
+        case SPELLFAMILY_PALADIN:
+            if (spellInfo_2->SpellFamilyName == SPELLFAMILY_PALADIN)
             {
-                // Master of Subtlety
-                if ((spellId_1 == 31665 && spellId_2 == 31666) ||
-                    (spellId_1 == 31666 && spellId_2 == 31665))
-                    return false;
+                // Paladin Seals
+                if (IsSealSpell(spellInfo_1) && IsSealSpell(spellInfo_2))
+                    return true;
 
-                // Sprint & Sprint (waterwalk)
-                if (spellInfo_1->SpellIconID == 516 && spellInfo_2->SpellIconID == 516 &&
-                    ((spellInfo_1->Category == 44 && spellInfo_2->Category == 0) ||
-                    (spellInfo_2->Category == 44 && spellInfo_1->Category == 0)))
-                    return false;
+                // Repentance removes Righteous Vengeance
+                if (spellInfo_1->Id == 20066 && spellInfo_2->Id == 61840)
+                    return true;
             }
 
-            //Overkill
-            if (spellInfo_1->SpellIconID == 2285 && spellInfo_2->SpellIconID == 2285)
-                return false;
-
-            // Garrote -> Garrote-Silence (multi-family check)
-            if (spellInfo_1->SpellIconID == 498 && spellInfo_2->SpellIconID == 498 && spellInfo_2->SpellVisual[0] == 0)
-                return false;
-            break;
-        case SPELLFAMILY_HUNTER:
-            if (spellInfo_2->SpellFamilyName == SPELLFAMILY_HUNTER)
+            // Blessing of Forgotten Kings and (Greater) Blessing of Kings
+            if (spellInfo_1->GetSpellFamilyFlags().test<CF_PALADIN_BLESSING_OF_KINGS>())
             {
-                // Rapid Fire & Quick Shots
-                if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x20)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x20000000000))) ||
-                    ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x20)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x20000000000))) )
-                    return false;
-
-                // Serpent Sting & (Immolation/Explosive Trap Effect)
-                if (((spellInfo_1->SpellFamilyFlags & UI64LIT(0x4)) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x00000004000))) ||
-                    ((spellInfo_2->SpellFamilyFlags & UI64LIT(0x4)) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x00000004000))))
-                    return false;
-
-                // Deterrence
-                if (spellInfo_1->SpellIconID == 83 && spellInfo_2->SpellIconID == 83)
-                    return false;
-
-                // Bestial Wrath
-                if (spellInfo_1->SpellIconID == 1680 && spellInfo_2->SpellIconID == 1680)
-                    return false;
-
-                // Aspect of the Viper & Vicious Viper
-                if (spellInfo_1->SpellIconID == 2227 && spellInfo_2->SpellIconID == 2227)
-                    return false;
+                if (spellInfo_2->Id == 72586)
+                    return true;
             }
 
-            // Wing Clip -> Improved Wing Clip (multi-family check)
-            if ((spellInfo_1->SpellFamilyFlags & UI64LIT(0x40)) && spellInfo_2->Id == 19229)
-                return false;
-
-            // Concussive Shot and Imp. Concussive Shot (multi-family check)
-            if (spellInfo_2->Id == 19410 && spellInfo_1->Id == 5116)
-                return false;
             break;
-        case SPELLFAMILY_PALADIN:
-            if (spellInfo_2->SpellFamilyName == SPELLFAMILY_PALADIN)
+        case SPELLFAMILY_DEATHKNIGHT:
+            if (spellInfo_2->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT)
             {
-                // Paladin Seals
-                if (IsSealSpell(spellInfo_1) && IsSealSpell(spellInfo_2))
+                // Crypt Fever and Ebon Plague
+                if (MatchedIconIdPair(264, 1933))
                     return true;
-
-                // Swift Retribution / Improved Devotion Aura (talents) and Paladin Auras
-                if ((spellInfo_1->IsFitToFamilyMask(UI64LIT(0x0), 0x00000020) && (spellInfo_2->SpellIconID == 291 || spellInfo_2->SpellIconID == 3028)) ||
-                    (spellInfo_2->IsFitToFamilyMask(UI64LIT(0x0), 0x00000020) && (spellInfo_1->SpellIconID == 291 || spellInfo_1->SpellIconID == 3028)))
-                    return false;
-
-                // Beacon of Light and Light's Beacon
-                if ((spellInfo_1->SpellIconID == 3032) && (spellInfo_2->SpellIconID == 3032))
-                    return false;
-
-                // Concentration Aura and Improved Concentration Aura and Aura Mastery
-                if ((spellInfo_1->SpellIconID == 1487) && (spellInfo_2->SpellIconID == 1487))
-                    return false;
-
-                // Seal of Corruption (caster/target parts stacking allow, other stacking checked by spell specs)
-                if (spellInfo_1->SpellIconID == 2292 && spellInfo_2->SpellIconID == 2292)
-                    return false;
-
-                // Divine Sacrifice and Divine Guardian
-                if (spellInfo_1->SpellIconID == 3837 && spellInfo_2->SpellIconID == 3837)
-                    return false;
-
-                // Blood Corruption, Holy Vengeance, Righteous Vengeance
-                if ((spellInfo_1->SpellIconID == 2292 && spellInfo_2->SpellIconID == 3025) ||
-                    (spellInfo_2->SpellIconID == 2292 && spellInfo_1->SpellIconID == 3025))
-                    return false;
             }
-
-            // Blessing of Sanctuary (multi-family check, some from 16 spell icon spells)
-            if (spellInfo_2->Id == 67480 && spellInfo_1->Id == 20911)
-                return false;
-
-            // Combustion and Fire Protection Aura (multi-family check)
-            if (spellInfo_2->Id == 11129 && spellInfo_1->SpellIconID == 33 && spellInfo_1->SpellVisual[0] == 321)
-                return false;
-
-            // *Sanctity Aura -> Unstable Currents and other (multi-family check)
-            if (spellInfo_1->SpellIconID==502 && spellInfo_2->SpellFamilyName == SPELLFAMILY_GENERIC && spellInfo_2->SpellIconID==502 && spellInfo_2->SpellVisual[0]==969)
-                return false;
-
-            // *Seal of Command and Band of Eternal Champion (multi-family check)
-            if (spellInfo_1->SpellIconID==561 && spellInfo_1->SpellVisual[0]==7992 && spellId_2 == 35081)
-                return false;
             break;
-        case SPELLFAMILY_SHAMAN:
-            if (spellInfo_2->SpellFamilyName == SPELLFAMILY_SHAMAN)
+        case SPELLFAMILY_MAGE:
+            if (spellInfo_2->SpellFamilyName == SPELLFAMILY_MAGE)
             {
-                // Windfury weapon
-                if (spellInfo_1->SpellIconID==220 && spellInfo_2->SpellIconID==220 &&
-                    !spellInfo_1->IsFitToFamilyMask(spellInfo_2->SpellFamilyFlags))
-                    return false;
-
-                // Ghost Wolf
-                if (spellInfo_1->SpellIconID == 67 && spellInfo_2->SpellIconID == 67)
-                    return false;
-
-                // Totem of Wrath (positive/negative), ranks checked early
-                if (spellInfo_1->SpellIconID == 2019 && spellInfo_2->SpellIconID == 2019)
-                    return false;
+                // Dampen / Amplify Magic
+                if (spellInfo_1->IsFitToFamily<SPELLFAMILY_MAGE, CF_MAGE_D_A_MAGIC>() &&
+                    spellInfo_2->IsFitToFamily<SPELLFAMILY_MAGE, CF_MAGE_D_A_MAGIC>())
+                    return true;
             }
-            // Bloodlust and Bloodthirst (multi-family check)
-            if (spellInfo_1->Id == 2825 && spellInfo_2->SpellIconID == 38 && spellInfo_2->SpellVisual[0] == 0)
-                return false;
             break;
-        case SPELLFAMILY_DEATHKNIGHT:
-            if (spellInfo_2->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT)
+        case SPELLFAMILY_PRIEST:
+            if (spellInfo_2->SpellFamilyName == SPELLFAMILY_PRIEST)
             {
-                // Lichborne  and Lichborne (triggered)
-                if (spellInfo_1->SpellIconID == 61 && spellInfo_2->SpellIconID == 61)
-                    return false;
-
-                // Frost Presence and Frost Presence (triggered)
-                if (spellInfo_1->SpellIconID == 2632 && spellInfo_2->SpellIconID == 2632)
-                    return false;
-
-                // Unholy Presence and Unholy Presence (triggered)
-                if (spellInfo_1->SpellIconID == 2633 && spellInfo_2->SpellIconID == 2633)
-                    return false;
+                // Power Word / Prayer of Fortitude
+                if (spellInfo_1->IsFitToFamily<SPELLFAMILY_PRIEST, CF_PRIEST_POWER_WORD_FORTITUDE>() &&
+                    spellInfo_2->IsFitToFamily<SPELLFAMILY_PRIEST, CF_PRIEST_POWER_WORD_FORTITUDE>())
+                    return true;
 
-                // Blood Presence and Blood Presence (triggered)
-                if (spellInfo_1->SpellIconID == 2636 && spellInfo_2->SpellIconID == 2636)
-                    return false;
+                // Shadow Protection / Prayer of Shadow Protection
+                if (spellInfo_1->IsFitToFamily<SPELLFAMILY_PRIEST, CF_PRIEST_SHADOW_PROTECTION>() &&
+                    spellInfo_2->IsFitToFamily<SPELLFAMILY_PRIEST, CF_PRIEST_SHADOW_PROTECTION>())
+                    return true;
             }
             break;
         default:
             break;
     }
 
-    // more generic checks
-    if (spellInfo_1->SpellIconID == spellInfo_2->SpellIconID &&
-        spellInfo_1->SpellIconID != 0 && spellInfo_2->SpellIconID != 0)
-    {
-        bool isModifier = false;
-        for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
-        {
-            if (spellInfo_1->EffectApplyAuraName[i] == SPELL_AURA_ADD_FLAT_MODIFIER ||
-                spellInfo_1->EffectApplyAuraName[i] == SPELL_AURA_ADD_PCT_MODIFIER  ||
-                spellInfo_2->EffectApplyAuraName[i] == SPELL_AURA_ADD_FLAT_MODIFIER ||
-                spellInfo_2->EffectApplyAuraName[i] == SPELL_AURA_ADD_PCT_MODIFIER )
-                isModifier = true;
-        }
-
-        if (!isModifier)
-            return true;
-    }
-
     if (IsRankSpellDueToSpell(spellInfo_1, spellId_2))
         return true;
 
-    if (spellInfo_1->SpellFamilyName == 0 || spellInfo_2->SpellFamilyName == 0)
-        return false;
-
-    if (spellInfo_1->SpellFamilyName != spellInfo_2->SpellFamilyName)
-        return false;
-
-    bool dummy_only = true;
-    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
-    {
-        if (spellInfo_1->Effect[i] != spellInfo_2->Effect[i] ||
-            spellInfo_1->EffectItemType[i] != spellInfo_2->EffectItemType[i] ||
-            spellInfo_1->EffectMiscValue[i] != spellInfo_2->EffectMiscValue[i] ||
-            spellInfo_1->EffectApplyAuraName[i] != spellInfo_2->EffectApplyAuraName[i])
-            return false;
-
-        // ignore dummy only spells
-        if (spellInfo_1->Effect[i] && spellInfo_1->Effect[i] != SPELL_EFFECT_DUMMY && spellInfo_1->EffectApplyAuraName[i] != SPELL_AURA_DUMMY)
-            dummy_only = false;
-    }
-    if (dummy_only)
-        return false;
-
-    return true;
+    return false;
 }
 
 bool SpellMgr::IsProfessionOrRidingSpell(uint32 spellId)
@@ -2495,44 +2451,633 @@ uint32 SpellMgr::GetProfessionSpellMinLevel(uint32 spellId)
         /*7*/ { 75, 75, 10 },
     };
 
-    uint32 rank = GetSpellRank(spellId);
-    if (rank >= 8)
-        return 0;
+    uint32 rank = GetSpellRank(spellId);
+    if (rank >= 8)
+        return 0;
+
+    SkillLineAbilityMapBounds bounds = GetSkillLineAbilityMapBounds(spellId);
+    if (bounds.first == bounds.second)
+        return 0;
+
+    switch (bounds.first->second->skillId)
+    {
+        case SKILL_FISHING:
+            return s2l[rank][2];
+        case SKILL_HERBALISM:
+        case SKILL_MINING:
+        case SKILL_SKINNING:
+            return s2l[rank][0];
+        default:
+            return s2l[rank][1];
+    }
+}
+
+
+bool SpellMgr::IsPrimaryProfessionFirstRankSpell(uint32 spellId) const
+{
+    return IsPrimaryProfessionSpell(spellId) && GetSpellRank(spellId)==1;
+}
+
+bool SpellMgr::IsSkillBonusSpell(uint32 spellId) const
+{
+    SkillLineAbilityMapBounds bounds = GetSkillLineAbilityMapBounds(spellId);
+
+    for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
+    {
+        SkillLineAbilityEntry const *pAbility = _spell_idx->second;
+        if (!pAbility || pAbility->learnOnGetSkill != ABILITY_LEARNED_ON_GET_PROFESSION_SKILL)
+            continue;
+
+        if (pAbility->req_skill_value > 0)
+            return true;
+    }
+
+    return false;
+}
+
+bool SpellMgr::IsGroupBuff(SpellEntry const *spellInfo)
+{
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        switch(spellInfo->EffectImplicitTargetA[i])
+        {
+            case TARGET_SINGLE_PARTY:
+            case TARGET_ALL_PARTY_AROUND_CASTER:
+            case TARGET_ALL_PARTY:
+            case TARGET_ALL_PARTY_AROUND_CASTER_2:
+            case TARGET_AREAEFFECT_PARTY:
+            case TARGET_ALL_RAID_AROUND_CASTER:
+            case TARGET_AREAEFFECT_PARTY_AND_CLASS:
+                if (IsPositiveEffect(spellInfo, SpellEffectIndex(i)) &&
+                    (spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA ||
+                     spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AREA_AURA_PARTY ||
+                     spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AREA_AURA_RAID)
+                    )
+                {
+                    return true;
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    // some custom cases
+    switch (spellInfo->Id)
+    {
+        case 72590:                             // Fortitude (triggered by AoE spell with ScriptEffect)
+            return true;
+        default:
+            break;
+    }
+
+    return false;
+}
+
+bool SpellMgr::IsTargetMatchedWithCreatureType(SpellEntry const* pSpellInfo, Unit* pTarget)
+{
+    if (!pSpellInfo || !pTarget || !pTarget->IsInitialized())
+        return false;
+
+
+    if (IsSpellWithCasterSourceTargetsOnly(pSpellInfo))
+        return true;
+
+    uint32 spellCreatureTargetMask = 0;
+
+    switch (pSpellInfo->Id)
+    {
+        // Curse of Doom: not find another way to fix spell target check :/
+        case 603:
+        case 30910:
+        case 47867:
+        {
+            // not allow cast at player
+            if (pTarget->GetTypeId() == TYPEID_PLAYER)
+                return false;
+
+            spellCreatureTargetMask = 0x7FF;
+            break;
+        }
+        // Dismiss Pet and Taming Lesson skipped
+        case 2641:
+        case 23356:
+            /*spellCreatureTargetMask =  0;*/
+            break;
+        default:
+            spellCreatureTargetMask = pSpellInfo->TargetCreatureType;
+            break;
+    }
+
+    if (spellCreatureTargetMask)
+    {
+        uint32 TargetCreatureType = pTarget->GetCreatureTypeMask();
+
+        return !TargetCreatureType || (spellCreatureTargetMask & TargetCreatureType);
+    }
+    return true;
+}
+
+bool SpellMgr::IsReflectableSpell(SpellEntry const* spellInfo)
+{
+    // AoE spells, spells with non-magic DmgClass or SchoolMask or with SPELL_ATTR_EX2_CANT_REFLECTED cannot be reflected
+    if (spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MAGIC &&
+        spellInfo->GetSchoolMask() != SPELL_SCHOOL_MASK_NORMAL &&
+        !spellInfo->HasAttribute(SPELL_ATTR_EX2_IGNORE_LOS) &&
+        !spellInfo->HasAttribute(SPELL_ATTR_EX_CANT_REFLECTED) &&
+        !IsAreaOfEffectSpell(spellInfo))
+    {
+        for(int j = 0; j < MAX_EFFECT_INDEX; ++j)
+        {
+            if (spellInfo->Effect[j] == SPELL_EFFECT_NONE)
+                continue;
+
+            if (IsPositiveTarget(spellInfo->EffectImplicitTargetA[j], spellInfo->EffectImplicitTargetB[j]) && !spellInfo->HasAttribute(SPELL_ATTR_EX_NEGATIVE))
+                continue;
+            else
+                return true;
+        }
+    }
+    return false;
+}
+
+uint32 SpellMgr::GetSpellMaxTargetsWithCustom(SpellEntry const* spellInfo, Unit const* caster)
+{
+    // Get spell max affected targets
+    uint32 unMaxTargets = spellInfo->MaxAffectedTargets;
+    // custom target amount cases
+    switch(spellInfo->SpellFamilyName)
+    {
+        case SPELLFAMILY_GENERIC:
+        {
+            switch(spellInfo->Id)
+            {
+                case 802:                                   // Mutate Bug
+                case 804:                                   // Explode Bug
+                case 23138:                                 // Gate of Shazzrah
+                case 28560:                                 // Summon Blizzard
+                case 30541:                                 // Blaze (Magtheridon)
+                case 30572:                                 // Quake (Magtheridon)
+                case 30769:                                 // Pick Red Riding Hood
+                case 30835:                                 // Infernal Relay
+                case 31347:                                 // Doom TODO: exclude top threat target from target selection
+                case 32312:                                 // Move 1 (Karazhan, Chess Event)
+                case 33711:                                 // Murmur's Touch
+                case 37388:                                 // Move 2 (Karazhan, Chess Event)
+                case 38794:                                 // Murmur's Touch (h)
+                case 39338:                                 // Karazhan - Chess, Medivh CHEAT: Hand of Medivh, Target Horde
+                case 39342:                                 // Karazhan - Chess, Medivh CHEAT: Hand of Medivh, Target Alliance
+                case 44869:                                 // Spectral Blast
+                case 45391:                                 // Summon Demonic Vapor (SWP, Felmyst)
+                case 45785:                                 // Sinister Reflection Clone (SWP, Kil'jaeden)
+                case 45863:                                 // Cosmetic - Incinerate to Random Target (Borean Tundra)
+                case 45892:                                 // Sinister Reflection (SWP, Kil'jaeden)
+                case 45976:                                 // Open Portal
+                case 46293:                                 // Corrosive Poison
+                case 46294:                                 // Fevered Fatigue
+                case 46295:                                 // Hex
+                case 46296:                                 // Necrotic Poison
+                case 46297:                                 // Piercing Shadow
+                case 46298:                                 // Shrink
+                case 46299:                                 // Wavering Will
+                case 46300:                                 // Withered Touch
+                case 46372:                                 // Ice Spear Target Picker (Slave Pens, Ahune)
+                case 47669:                                 // Wakeup Subboss (Utgarde Pinnacle)
+                case 48278:                                 // Paralyze (Utgarde Pinnacle)
+                case 50988:                                 // Glare of the Tribunal (Halls of Stone)
+                case 50742:                                 // Ooze Combine (Halls of Stone)
+                case 51003:                                 // Summon Dark Matter Target (Halls of Stone)
+                case 51146:                                 // Summon Searching Gaze (Halls Of Stone)
+                case 52438:                                 // Summon Skittering Swarmer (Azjol Nerub,  Krik'thir the Gatewatcher)
+                case 52449:                                 // Summon Skittering Infector (Azjol Nerub,  Krik'thir the Gatewatcher)
+                case 53457:                                 // Impale (Azjol Nerub,  Anub'arak)
+                case 54148:                                 // Ritual of the Sword (Utgarde Pinnacle, Svala)
+                case 55479:                                 // Forced Obedience (Naxxramas, Razovius)
+                case 56140:                                 // Summon Power Spark (Eye of Eternity, Malygos)
+                case 57578:                                 // Lava Strike (Obsidian Sanctum, Sartharion)
+                case 59870:                                 // Glare of the Tribunal (h) (Halls of Stone)
+                case 62978:                                 // Summon Guardian (Ulduar - Yogg Saron)
+                case 63713:                                 // Dominate Mind (Ulduar - Yogg Saron)
+                case 63830:                                 // Malady of the Mind (Ulduar - Yogg Saron)
+                case 64465:                                 // Shadow Beacon (Ulduar - Yogg Saron)
+                case 62016:                                 // Charge Orb (Ulduar, Thorim)
+                case 62042:                                 // Stormhammer (Ulduar, Thorim)
+                case 62166:                                 // StoneGrip nh
+                case 62301:                                 // Cosmic Smash (Ulduar, Algalon)
+                case 62374:                                 // Pursued (Ulduar, Flame Leviathan)
+                case 62400:                                 // Missile Barrage (Ulduar, Flame Leviathan)
+                case 62488:                                 // Activate Construct (Ulduar, Ignis)
+                case 62577:                                 // Blizzard (Ulduar, Thorim)
+                case 62603:                                 // Blizzard (h) (Ulduar, Thorim)
+                case 62797:                                 // Storm Cloud (Ulduar, Hodir)
+                case 63018:                                 // Searing Light
+                case 63024:                                 // Gravity Bomb (Ulduar, XT-002)
+                case 63342:                                 // Focused Eyebeam Summon Trigger (Ulduar, Kologarn)
+                case 63545:                                 // Icicle Hodir(trigger spell from 62227)
+                case 63795:                                 // Psychosis (Ulduar, Yogg-Saron)
+                case 63820:                                 // Summon Scrap Bot Trigger (Ulduar, Mimiron) use for Scrap Bots, hits npc 33856
+                case 64218:                                 // Overcharge
+                case 64234:                                 // Gravity Bomb (h) (Ulduar, XT-002)
+                case 64402:                                 // Rocket Strike (Ulduar, Mimiron)
+                case 64425:                                 // Summon Scrap Bot Trigger (Ulduar, Mimiron) use for Assault Bots, hits npc 33856
+                case 64543:                                 // Melt Ice (Ulduar, Hodir)
+                case 64562:                                 // Summon Flames Spread Trigger (Ulduar, Mimiron)
+                case 64623:                                 // Frost Bomb (Ulduar, Mimiron)
+                case 65121:                                 // Searing Light (h)
+                case 65301:                                 // Psychosis (Ulduar, Yogg-Saron)
+                case 65872:                                 // Pursuing Spikes
+                case 65950:                                 // Touch of Light (ToCrusader, Val'kyr Twins)
+                case 66001:                                 // Touch of Darkness (ToCrusader, Val'kyr Twins)
+                case 66152:                                 // Bullet Controller Summon Periodic Trigger Light (ToCrusader)
+                case 66153:                                 // Bullet Controller Summon Periodic Trigger Dark (ToCrusader)
+                case 66332:                                 // Nerubian Burrower (Mode 0) (ToCrusader, Anub'arak)
+                case 66336:                                 // Mistress' Kiss (ToCrusader, Jaraxxus)
+                case 66339:                                 // Summon Scarab (ToCrusader, Anub'arak)
+                case 67077:                                 // Mistress' Kiss (Mode 2) (ToCrusader, Jaraxxus)
+                case 67281:                                 // Touch of Darkness (Mode 1)
+                case 67282:                                 // Touch of Darkness (Mode 2)
+                case 67283:                                 // Touch of Darkness (Mode 3)
+                case 67296:                                 // Touch of Light (Mode 1)
+                case 67297:                                 // Touch of Light (Mode 2)
+                case 67298:                                 // Touch of Light (Mode 3)
+                case 67470:                                 // Pursuing Spikes
+                case 68950:                                 // Fear (FoS)
+                case 68912:                                 // Wailing Souls (FoS)
+                case 68987:                                 // Pursuit (Pit of Saron, Ick)
+                case 69048:                                 // Mirrored Soul (FoS)
+                case 69057:                                 // Bone Spike Graveyard (Icecrown Citadel, Lord Marrowgar) 10 mann
+                case 72088:
+                case 73142:
+                case 73144:
+                case 69140:                                 // Coldflame (ICC, Marrowgar)
+                case 69674:                                 // Mutated Infection (ICC, Rotface)
+                case 71224:                                 // Mutated Infection
+                case 73022:                                 // Mutated Infection
+                case 73023:                                 // Mutated Infection
+                case 70447:                                 // Volatile Ooze Adhesive (ICC -Putricide)
+                case 72836:
+                case 72837:
+                case 72838:
+                case 70450:                                 // Blood Mirror
+                case 70837:                                 // Blood Mirror
+                case 70672:                                 // Gaseous Bloat (ICC, Professor Putricide)
+                case 72455:
+                case 72832:
+                case 72833:
+                case 70882:                                 // Slime Spray Summon Trigger (ICC, Rotface)
+                case 70911:                                 // Unbound Plague (ICC, Putricide)
+                case 72854:
+                case 72855:
+                case 72856:
+                case 70920:                                 // Unbound Plague Search Effect (ICC, Putricide)
+                case 71445:                                 // Twilight Bloodbolt
+                case 71471:                                 // Twilight Bloodbolt
+                case 71837:                                 // Vampiric Bite
+                case 71861:                                 // Swarming Shadows
+                case 72091:                                 // Frozen Orb (Vault of Archavon, Toravon)
+                case 72254:                                 // Mark of the fallen Champion Search Spell
+                case 72295:                                 // Malleable Goo (ICC -Professor Putricide)
+                case 74280:
+                case 72378:                                 // Blood Nova (Saurfang)
+                case 73058:
+                case 72385:                                 // Boiling Blood
+                case 72441:
+                case 72442:
+                case 72443:
+                    unMaxTargets = 1;
+                    break;
+                case 28542:                                 // Life Drain
+                case 62476:                                 // Icicle (Hodir 10man)
+                case 63476:                                 // Icicle (Hodir - 10)
+                case 66013:                                 // Penetrating Cold (10 man)
+                case 67755:                                 // Nerubian Burrower (Mode 1) (ToCrusader, Anub'arak)
+                case 67756:                                 // Nerubian Burrower (Mode 2) (ToCrusader, Anub'arak)
+                case 68509:                                 // Penetrating Cold (10 man heroic)
+                case 69055:                                 // Bone Slice (ICC, Lord Marrowgar)
+                case 69278:                                 // Gas spore (ICC, Festergut)
+                case 70341:                                 // Slime Puddle (ICC, Putricide)
+                case 71424:                                 // Slime Puddle (ICC, Putricide) Search Spell
+                case 72615:                                 // Malleable Goo (ICC -Professor Putricide)
+                case 74281:
+                    unMaxTargets = 2;
+                    break;
+                case 28796:                                 // Poison Bolt Volley
+                case 29213:                                 // Curse of the Plaguebringer
+                case 30004:                                 // Flame Wreath
+                case 31298:                                 // Sleep
+                case 39341:                                 // Karazhan - Chess, Medivh CHEAT: Fury of Medivh, Target Horde
+                case 39344:                                 // Karazhan - Chess, Medivh CHEAT: Fury of Medivh, Target Alliance
+                case 39992:                                 // Needle Spine Targeting (BT, Warlord Najentus)
+                case 40869:                                 // Fatal Attraction (BT, Mother Shattraz)
+                case 41303:                                 // Soul Drain (BT, Reliquary of Souls)
+                case 41376:                                 // Spite (BT, Reliquary of Souls)
+                case 51904:                                 // Limiting the count of Summoned Ghouls
+                case 54522:                                 // Summon Ghouls On Scarlet Crusade
+                case 60936:                                 // Surge of Power (h) (Malygos)
+                case 61693:                                 // Arcane Storm (Malygos)
+                case 62477:                                 // Icicle (Hodir 25man)
+                case 63981:                                 // StoneGrip H
+                case 64598:                                 // Cosmic Smash (h) (Ulduar, Algalon)
+                case 64620:                                 // Summon Fire Bot Trigger (Ulduar, Mimiron) hits npc 33856
+                case 70814:                                 // Bone Slice (ICC, Lord Marrowgar, heroic)
+                case 71221:                                 // Gas spore (Mode 1) (ICC, Festergut)
+                case 72095:                                 // Frozen Orb (h) (Vault of Archavon, Toravon)
+                case 72089:                                 // Bone Spike Graveyard (Icecrown Citadel, Lord Marrowgar) 25 mann
+                case 70826:
+                case 73143:
+                case 73145:
+                    unMaxTargets = 3;
+                    break;
+                case 37676:                                 // Insidious Whisper
+                case 46650:                                 // Open Brutallus Back Door (SWP, Felmyst)
+                case 38028:                                 // Watery Grave
+                case 67757:                                 // Nerubian Burrower (Mode 3) (ToCrusader, Anub'arak)
+                    unMaxTargets = 4;
+                    break;
+                case 30843:                                 // Enfeeble
+                case 40243:                                 // Crushing Shadows (BT, Teron Gorefiend)
+                case 42005:                                 // Bloodboil
+                case 45641:                                 // Fire Bloom (SWP, Kil'jaeden)
+                case 55665:                                 // Life Drain (h)
+                case 58917:                                 // Consume Minions
+                case 64604:                                 // Nature Bomb (Ulduar, Freya)
+                case 67076:                                 // Mistress' Kiss (Mode 1) (ToCrusader, Jaraxxus)
+                case 67078:                                 // Mistress' Kiss (Mode 3) (ToCrusader, Jaraxxus)
+                case 67700:                                 // Penetrating Cold (25 man)
+                case 68510:                                 // Penetrating Cold (25 man, heroic)
+                    unMaxTargets = 5;
+                    break;
+                case 61694:                                 // Arcane Storm (h) (Malygos)
+                    unMaxTargets = 7;
+                    break;
+                case 54098:                                 // Poison Bolt Volley (h)
+                case 54835:                                 // Curse of the Plaguebringer (h)
+                case 66140:                                 // Light Bullet Summon Trigger 10 nonhero (correct from sniff)
+                case 67159:                                 // Light Bullet Summon Trigger 10 hero (maybe wrong amount)
+                    unMaxTargets = 10;
+                    break;
+                case 25991:                                 // Poison Bolt Volley (Pincess Huhuran)
+                case 67158:                                 // Light Bullet Summon Trigger 25 nonhero (maybe wrong amount)
+                case 67160:                                 // Light Bullet Summon Trigger 25 hero (maybe wrong amount)
+                    unMaxTargets = 15;
+                    break;
+                // random count
+                case 61916:                                 // Lightning Whirl (Ulduar, Stormcaller Brundir)
+                    unMaxTargets = urand(2, 3);
+                    break;
+                case 46771:                                 // Flame Sear (SWP, Grand Warlock Alythess)
+                    unMaxTargets = urand(3, 5);
+                    break;
+                case 63482:                                 // Lightning Whirl (h) (Ulduar, Stormcaller Brundir)
+                    unMaxTargets = urand(3, 6);
+                    break;
+                case 74452:                                 // Conflagration (Saviana, Ruby Sanctum) (hack, in 25 mode spell simple casted double time)
+                {
+                    if (caster)
+                    {
+                        switch (caster->GetMap()->GetDifficulty())
+                        {
+                            case RAID_DIFFICULTY_10MAN_NORMAL:
+                            case RAID_DIFFICULTY_10MAN_HEROIC:
+                                unMaxTargets = 2;
+                                break;
+                            case RAID_DIFFICULTY_25MAN_NORMAL:
+                            case RAID_DIFFICULTY_25MAN_HEROIC:
+                                unMaxTargets = 5;
+                                break;
+                        }
+                    }
+                    break;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        case SPELLFAMILY_MAGE:
+        {
+            if (spellInfo->Id == 38194)                   // Blink
+                unMaxTargets = 1;
+            break;
+        }
+        case SPELLFAMILY_DRUID:
+        {
+            // Starfall
+            if (spellInfo->GetSpellFamilyFlags().test<CF_DRUID_STARFALL2>())
+                unMaxTargets = 2;
+            break;
+        }
+        case SPELLFAMILY_DEATHKNIGHT:
+        {
+            if (spellInfo->GetSpellIconID() == 1737)           // Corpse Explosion // TODO - spell 50445?
+                unMaxTargets = 1;
+            break;
+        }
+        default:
+            break;
+    }
+
+    Unit::AuraList const& mod = caster->GetAurasByType(SPELL_AURA_MOD_MAX_AFFECTED_TARGETS);
+    for(Unit::AuraList::const_iterator m = mod.begin(); m != mod.end(); ++m)
+    {
+        if (!(*m)->isAffectedOnSpell(spellInfo))
+            continue;
+        unMaxTargets += (*m)->GetModifier()->m_amount;
+    }
+
+    return unMaxTargets;
+}
+
+float SpellMgr::GetSpellRadiusWithCustom(SpellEntry const* spellInfo, Unit const* caster, SpellEffectIndex effIndex)
+{
+    float radius;
+    if (spellInfo->EffectRadiusIndex[effIndex])
+        radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(spellInfo->EffectRadiusIndex[effIndex]));
+    else
+        radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(spellInfo->GetRangeIndex()));
+
+    switch(spellInfo->SpellFamilyName)
+    {
+        case SPELLFAMILY_GENERIC:
+        {
+            switch(spellInfo->Id)
+            {
+                case 71160:                                 // Plague Stench
+                case 71161:
+                    radius = 30;
+                    break;
+                case 67732:                                 // Destroy all Frost Patches (Trial of the Crusader, Anub'arak)
+                    radius = 9.0f;
+                    break;
+                case 74086:                                 // Destroy Soul (Lich King)
+                    radius = 100.0f;
+                    break;
+                case 69075:                                 // Bone Storm
+                case 69832:                                 // Unstable Ooze Explosion (Rotface)
+                case 70341:                                 // Slime Puddle (Putricide)
+                case 70541:                                 // Infest (Lich King)
+                case 73779:
+                case 73780:
+                case 73781:
+                case 70834:                                 // Bone Storm
+                case 70835:                                 // Bone Storm
+                case 70836:                                 // Bone Storm
+                case 71518:                                 // Unholy infusion credit
+                case 72289:                                 // Frost infusion credit
+                case 72706:                                 // Valithria event credit
+                case 72254:                                 // Mark of the fallen Champion Search Spell
+                case 72769:                                 // Scent of Blood (Saurfang)
+                case 72771:
+                case 72934:                                 // Blood infusion credit
+                case 69057:                                 // Bone Spike Graveyard (Icecrown Citadel, Lord Marrowgar encounter, 10N)
+                case 70826:                                 // Bone Spike Graveyard (Icecrown Citadel, Lord Marrowgar encounter, 25N)
+                case 72088:                                 // Bone Spike Graveyard (Icecrown Citadel, Lord Marrowgar encounter, 10H)
+                case 72089:                                 // Bone Spike Graveyard (Icecrown Citadel, Lord Marrowgar encounter, 25H)
+                case 73142:                                 // Bone Spike Graveyard (during Bone Storm) (Icecrown Citadel, Lord Marrowgar encounter, 10N)
+                case 73143:                                 // Bone Spike Graveyard (during Bone Storm) (Icecrown Citadel, Lord Marrowgar encounter, 25N)
+                case 73144:                                 // Bone Spike Graveyard (during Bone Storm) (Icecrown Citadel, Lord Marrowgar encounter, 10H)
+                case 73145:                                 // Bone Spike Graveyard (during Bone Storm) (Icecrown Citadel, Lord Marrowgar encounter, 25H)
+                    radius = DEFAULT_VISIBILITY_INSTANCE;
+                    break;
+                case 72350:                                 // Fury of Frostmourne
+                case 72351:                                 // Fury of Frostmourne
+                    radius = 300.0f;
+                    break;
+                // Custom (calculated) radiuses here
+                case 24811:                                 // Draw Spirit (Lethon)
+                {
+                    if (effIndex == EFFECT_INDEX_0)         // Copy range from EFF_1 to 0
+                        radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(spellInfo->EffectRadiusIndex[EFFECT_INDEX_1]));
+                    break;
+                }
+                case 28241:                                 // Poison (Naxxramas, Grobbulus Cloud)
+                case 54363:                                 // Poison (Naxxramas, Grobbulus Cloud) (H)
+                {
+                    uint32 auraId = (spellInfo->Id == 28241 ? 28158 : 54362);
+                    if (SpellAuraHolderPtr auraHolder = caster->GetSpellAuraHolder(auraId))
+                        radius = 0.5f * (60000 - auraHolder->GetAuraDuration()) * 0.001f;
+                    break;
+                }
+                case 66881:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale)
+                case 67638:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale) (Mode 1)
+                case 67639:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale) (Mode 2)
+                case 67640:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale) (Mode 3)
+                    if (SpellAuraHolderPtr auraHolder = caster->GetSpellAuraHolder(66882))
+                        radius = 0.5f * (60000 - auraHolder->GetAuraDuration()) * 0.001f;
+                    break;
+                case 56438:                                 // Arcane Overload
+                    radius = radius * caster->GetObjectScale();
+                    break;
+                case 70346:                                 // Slime Puddle (ICC - Professor Putricide)
+                case 72456:
+                case 72868:
+                case 72869:
+                    radius = 5.0f;
+                    if (SpellAuraHolderPtr holder = caster->GetSpellAuraHolder(70347))
+                        radius += holder->GetStackAmount() * 0.2f;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        }
+        case SPELLFAMILY_DRUID:
+        {
+            switch (spellInfo->Id)
+            {
+                case 49376:                                 // Feral Charge - Cat
+                    // No default radius for this spell, so we need to use the contact distance
+                    radius = CONTACT_DISTANCE;
+                    break;
+                default:
+                    break;
+            }
+        }
+        default:
+            break;
+    }
+    if (Player* modOwner = caster->GetSpellModOwner())
+        modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_RADIUS, radius);
+
+    return radius;
+}
 
-    SkillLineAbilityMapBounds bounds = GetSkillLineAbilityMapBounds(spellId);
-    if (bounds.first == bounds.second)
-        return 0;
+uint32 SpellMgr::GetSpellTargetsForChainWithCustom(SpellEntry const* spellInfo, Unit const* caster, SpellEffectIndex effIndex)
+{
+    uint32 effectChainTarget = spellInfo->EffectChainTarget[effIndex];
 
-    switch (bounds.first->second->skillId)
+    switch (spellInfo->SpellFamilyName)
     {
-        case SKILL_FISHING:
-            return s2l[rank][2];
-        case SKILL_HERBALISM:
-        case SKILL_MINING:
-        case SKILL_SKINNING:
-            return s2l[rank][0];
+        case SPELLFAMILY_WARRIOR:
+        {
+            // Sunder Armor (triggered spell)
+            if (spellInfo->GetSpellFamilyFlags().test<CF_WARRIOR_SUNDER_ARMOR>() && spellInfo->GetSpellVisual() == 0)
+                if (caster->HasAura(58387))               // Glyph of Sunder Armor
+                    effectChainTarget = 2;
+            break;
+        }
+        case SPELLFAMILY_PALADIN:
+        {
+            if (spellInfo->Id == 20424)                   // Seal of Command (2 more target for single targeted spell)
+            {
+                // overwrite EffectChainTarget for non single target spell
+                if (Spell* currSpell = caster->GetCurrentSpell(CURRENT_GENERIC_SPELL))
+                    if (currSpell->m_spellInfo->MaxAffectedTargets > 0 ||
+                        currSpell->m_spellInfo->EffectChainTarget[EFFECT_INDEX_0] > 0 ||
+                        currSpell->m_spellInfo->EffectChainTarget[EFFECT_INDEX_1] > 0 ||
+                        currSpell->m_spellInfo->EffectChainTarget[EFFECT_INDEX_2] > 0)
+                        effectChainTarget = 0;              // no chain targets
+            }
+            break;
+        }
         default:
-            return s2l[rank][1];
+            break;
     }
-}
-
+    if (Player* modOwner = caster->GetSpellModOwner())
+        modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_JUMP_TARGETS, effectChainTarget);
 
-bool SpellMgr::IsPrimaryProfessionFirstRankSpell(uint32 spellId) const
-{
-    return IsPrimaryProfessionSpell(spellId) && GetSpellRank(spellId)==1;
+    return effectChainTarget;
 }
 
-bool SpellMgr::IsSkillBonusSpell(uint32 spellId) const
+// is holder stackable from different casters
+bool SpellMgr::IsStackableSpellAuraHolder(SpellEntry const* spellInfo)
 {
-    SkillLineAbilityMapBounds bounds = GetSkillLineAbilityMapBounds(spellId);
+    if (spellInfo->HasAttribute(SPELL_ATTR_EX3_STACK_FOR_DIFF_CASTERS))
+        return true;
 
-    for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
+    if (GetSpellSpecific(spellInfo->Id) == SPELL_JUDGEMENT)
+        return false;
+
+    // some more (custom) checks. e.g. Insect Swarm doesn't have the attribute, we depend on aura types in holder
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
     {
-        SkillLineAbilityEntry const *pAbility = _spell_idx->second;
-        if (!pAbility || pAbility->learnOnGetSkill != ABILITY_LEARNED_ON_GET_PROFESSION_SKILL)
-            continue;
+        switch(spellInfo->EffectApplyAuraName[i])
+        {
+            // DoT/HoT and some more
+            case SPELL_AURA_PERIODIC_DAMAGE:
+            case SPELL_AURA_DUMMY:
+            case SPELL_AURA_PERIODIC_HEAL:
+            case SPELL_AURA_OBS_MOD_HEALTH:
+            case SPELL_AURA_OBS_MOD_MANA:
+            case SPELL_AURA_PERIODIC_TRIGGER_SPELL:
+            case SPELL_AURA_PERIODIC_LEECH:
+            case SPELL_AURA_PERIODIC_MANA_LEECH:
+            case SPELL_AURA_PERIODIC_DAMAGE_PERCENT:
+            case SPELL_AURA_POWER_BURN_MANA:
+            case SPELL_AURA_CONTROL_VEHICLE:
+            case SPELL_AURA_MOD_STUN:
+            case SPELL_AURA_PERIODIC_DUMMY:
+                return true;
+            default:
+                continue;
+        }
+    }
 
-        if (pAbility->req_skill_value > 0)
+    // some direct ID checks (hacks!)
+    switch(spellInfo->Id)
+    {
+        case 70602: // Corruption (Valithria Dreamwalker)
+        case 70588: // Suppression (Valithria Dreamwalker)
             return true;
     }
 
@@ -2576,7 +3121,7 @@ SpellEntry const* SpellMgr::SelectAuraRankForLevel(SpellEntry const* spellInfo,
             break;
 
         // if found appropriate level
-        if (level + 10 >= spellInfo->spellLevel)
+        if (level + 10 >= nextSpellInfo->spellLevel)
             return nextSpellInfo;
 
         // one rank less then
@@ -2857,7 +3402,7 @@ void SpellMgr::LoadSpellChains()
         }
 
         // check basic spell chain data integrity (note: rank can be equal 0 or 1 for first/single spell)
-        if( (spell_id == node.first) != (node.rank <= 1) ||
+        if ( (spell_id == node.first) != (node.rank <= 1) ||
             (spell_id == node.first) != (node.prev == 0) ||
             (node.rank <= 1) != (node.prev == 0) )
         {
@@ -2866,7 +3411,7 @@ void SpellMgr::LoadSpellChains()
             continue;
         }
 
-        if(node.req!=0 && !sSpellStore.LookupEntry(node.req))
+        if (node.req!=0 && !sSpellStore.LookupEntry(node.req))
         {
             sLog.outErrorDb("Spell %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has not existing required spell.",
                 spell_id,node.prev,node.first,node.rank,node.req);
@@ -2874,32 +3419,32 @@ void SpellMgr::LoadSpellChains()
         }
 
         // talents not required data in spell chain for work, but must be checked if present for integrity
-        if(TalentSpellPos const* pos = GetTalentSpellPos(spell_id))
+        if (TalentSpellPos const* pos = GetTalentSpellPos(spell_id))
         {
-            if(node.rank!=pos->rank+1)
+            if (node.rank!=pos->rank+1)
             {
                 sLog.outErrorDb("Talent %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has wrong rank.",
                     spell_id,node.prev,node.first,node.rank,node.req);
                 continue;
             }
 
-            if(TalentEntry const* talentEntry = sTalentStore.LookupEntry(pos->talent_id))
+            if (TalentEntry const* talentEntry = sTalentStore.LookupEntry(pos->talent_id))
             {
-                if(node.first!=talentEntry->RankID[0])
+                if (node.first!=talentEntry->RankID[0])
                 {
                     sLog.outErrorDb("Talent %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has wrong first rank spell.",
                         spell_id,node.prev,node.first,node.rank,node.req);
                     continue;
                 }
 
-                if(node.rank > 1 && node.prev != talentEntry->RankID[node.rank-1-1])
+                if (node.rank > 1 && node.prev != talentEntry->RankID[node.rank-1-1])
                 {
                     sLog.outErrorDb("Talent %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has wrong prev rank spell.",
                         spell_id,node.prev,node.first,node.rank,node.req);
                     continue;
                 }
 
-                /*if(node.req!=talentEntry->DependsOnSpell)
+                /*if (node.req!=talentEntry->DependsOnSpell)
                 {
                     sLog.outErrorDb("Talent %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has wrong required spell.",
                         spell_id,node.prev,node.first,node.rank,node.req);
@@ -2946,21 +3491,21 @@ void SpellMgr::LoadSpellChains()
     // additional integrity checks
     for(SpellChainMap::const_iterator i = mSpellChains.begin(); i != mSpellChains.end(); ++i)
     {
-        if(i->second.prev)
+        if (i->second.prev)
         {
             SpellChainMap::const_iterator i_prev = mSpellChains.find(i->second.prev);
-            if(i_prev == mSpellChains.end())
+            if (i_prev == mSpellChains.end())
             {
                 sLog.outErrorDb("Spell %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has not found previous rank spell in table.",
                     i->first,i->second.prev,i->second.first,i->second.rank,i->second.req);
             }
-            else if( i_prev->second.first != i->second.first )
+            else if ( i_prev->second.first != i->second.first )
             {
                 sLog.outErrorDb("Spell %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has different first spell in chain compared to previous rank spell (prev: %u, first: %u, rank: %d, req: %u).",
                     i->first,i->second.prev,i->second.first,i->second.rank,i->second.req,
                     i_prev->second.prev,i_prev->second.first,i_prev->second.rank,i_prev->second.req);
             }
-            else if( i_prev->second.rank+1 != i->second.rank )
+            else if ( i_prev->second.rank+1 != i->second.rank )
             {
                 sLog.outErrorDb("Spell %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has different rank compared to previous rank spell (prev: %u, first: %u, rank: %d, req: %u).",
                     i->first,i->second.prev,i->second.first,i->second.rank,i->second.req,
@@ -2968,21 +3513,21 @@ void SpellMgr::LoadSpellChains()
             }
         }
 
-        if(i->second.req)
+        if (i->second.req)
         {
             SpellChainMap::const_iterator i_req = mSpellChains.find(i->second.req);
-            if(i_req == mSpellChains.end())
+            if (i_req == mSpellChains.end())
             {
                 sLog.outErrorDb("Spell %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has not found required rank spell in table.",
                     i->first,i->second.prev,i->second.first,i->second.rank,i->second.req);
             }
-            else if( i_req->second.first == i->second.first )
+            else if ( i_req->second.first == i->second.first )
             {
                 sLog.outErrorDb("Spell %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has required rank spell from same spell chain (prev: %u, first: %u, rank: %d, req: %u).",
                     i->first,i->second.prev,i->second.first,i->second.rank,i->second.req,
                     i_req->second.prev,i_req->second.first,i_req->second.rank,i_req->second.req);
             }
-            else if( i_req->second.req )
+            else if ( i_req->second.req )
             {
                 sLog.outErrorDb("Spell %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has required rank spell with required spell (prev: %u, first: %u, rank: %d, req: %u).",
                     i->first,i->second.prev,i->second.first,i->second.rank,i->second.req,
@@ -2997,10 +3542,10 @@ void SpellMgr::LoadSpellChains()
         uint32 spell_id = i->first;
         SpellChainNode const& node = i->second;
 
-        if(node.prev)
+        if (node.prev)
             mSpellChainsNext.insert(SpellChainMapNext::value_type(node.prev,spell_id));
 
-        if(node.req)
+        if (node.req)
             mSpellChainsNext.insert(SpellChainMapNext::value_type(node.req,spell_id));
     }
 
@@ -3129,7 +3674,7 @@ void SpellMgr::LoadSpellLearnSpells()
 
         for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
         {
-            if(entry->Effect[i]==SPELL_EFFECT_LEARN_SPELL)
+            if (entry->Effect[i]==SPELL_EFFECT_LEARN_SPELL)
             {
                 SpellLearnSpellNode dbc_node;
                 dbc_node.spell       = entry->EffectTriggerSpell[i];
@@ -3173,46 +3718,23 @@ void SpellMgr::LoadSpellLearnSpells()
 
 void SpellMgr::LoadSpellScriptTarget()
 {
-    mSpellScriptTarget.clear();                             // need for reload case
-
-    uint32 count = 0;
-
-    QueryResult *result = WorldDatabase.Query("SELECT entry,type,targetEntry FROM spell_script_target");
-
-    if (!result)
-    {
-        BarGoLink bar(1);
-
-        bar.step();
+    sSpellScriptTargetStorage.Load();
 
-        sLog.outString();
-        sLog.outErrorDb(">> Loaded 0 SpellScriptTarget. DB table `spell_script_target` is empty.");
-        return;
-    }
-
-    BarGoLink bar(result->GetRowCount());
-
-    do
+    // Check content
+    for (SQLMultiStorage::SQLSIterator<SpellTargetEntry> itr = sSpellScriptTargetStorage.getDataBegin<SpellTargetEntry>(); itr < sSpellScriptTargetStorage.getDataEnd<SpellTargetEntry>(); ++itr)
     {
-        Field *fields = result->Fetch();
-        bar.step();
-
-        uint32 spellId     = fields[0].GetUInt32();
-        uint32 type        = fields[1].GetUInt32();
-        uint32 targetEntry = fields[2].GetUInt32();
-
-        SpellEntry const* spellProto = sSpellStore.LookupEntry(spellId);
-
+        SpellEntry const* spellProto = sSpellStore.LookupEntry(itr->spellId);
         if (!spellProto)
         {
-            sLog.outErrorDb("Table `spell_script_target`: spellId %u listed for TargetEntry %u does not exist.",spellId,targetEntry);
+            sLog.outErrorDb("Table `spell_script_target`: spellId %u listed for TargetEntry %u does not exist.", itr->spellId, itr->targetEntry);
+            sSpellScriptTargetStorage.EraseEntry(itr->spellId);
             continue;
         }
 
         bool targetfound = false;
         for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
         {
-            if( spellProto->EffectImplicitTargetA[i] == TARGET_SCRIPT ||
+            if ( spellProto->EffectImplicitTargetA[i] == TARGET_SCRIPT ||
                 spellProto->EffectImplicitTargetB[i] == TARGET_SCRIPT ||
                 spellProto->EffectImplicitTargetA[i] == TARGET_SCRIPT_COORDINATES ||
                 spellProto->EffectImplicitTargetB[i] == TARGET_SCRIPT_COORDINATES ||
@@ -3222,6 +3744,8 @@ void SpellMgr::LoadSpellScriptTarget()
                 spellProto->EffectImplicitTargetB[i] == TARGET_AREAEFFECT_INSTANT ||
                 spellProto->EffectImplicitTargetA[i] == TARGET_AREAEFFECT_CUSTOM ||
                 spellProto->EffectImplicitTargetB[i] == TARGET_AREAEFFECT_CUSTOM ||
+                spellProto->EffectImplicitTargetA[i] == TARGET_AREAEFFECT_GO_AROUND_SOURCE ||
+                spellProto->EffectImplicitTargetB[i] == TARGET_AREAEFFECT_GO_AROUND_SOURCE ||
                 spellProto->EffectImplicitTargetA[i] == TARGET_AREAEFFECT_GO_AROUND_DEST ||
                 spellProto->EffectImplicitTargetB[i] == TARGET_AREAEFFECT_GO_AROUND_DEST)
             {
@@ -3231,87 +3755,84 @@ void SpellMgr::LoadSpellScriptTarget()
         }
         if (!targetfound)
         {
-            sLog.outErrorDb("Table `spell_script_target`: spellId %u listed for TargetEntry %u does not have any implicit target TARGET_SCRIPT(38) or TARGET_SCRIPT_COORDINATES (46) or TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT (40).", spellId, targetEntry);
+            sLog.outErrorDb("Table `spell_script_target`: spellId %u listed for TargetEntry %u does not have any implicit target TARGET_SCRIPT(38) or TARGET_SCRIPT_COORDINATES (46) or TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT (40).", itr->spellId, itr->targetEntry);
+            sSpellScriptTargetStorage.EraseEntry(itr->spellId);
             continue;
         }
 
-        if (type >= MAX_SPELL_TARGET_TYPE)
+        if (itr->type >= MAX_SPELL_TARGET_TYPE)
         {
-            sLog.outErrorDb("Table `spell_script_target`: target type %u for TargetEntry %u is incorrect.",type,targetEntry);
+            sLog.outErrorDb("Table `spell_script_target`: target type %u for TargetEntry %u is incorrect.", itr->type, itr->targetEntry);
+            sSpellScriptTargetStorage.EraseEntry(itr->spellId);
             continue;
         }
 
         // Checks by target type
-        switch (type)
+        switch (itr->type)
         {
             case SPELL_TARGET_TYPE_GAMEOBJECT:
             {
-                if (!targetEntry)
+                if (!itr->targetEntry)
                     break;
 
-                if (!sGOStorage.LookupEntry<GameObjectInfo>(targetEntry))
+                if (!sGOStorage.LookupEntry<GameObjectInfo>(itr->targetEntry))
                 {
-                    sLog.outErrorDb("Table `spell_script_target`: gameobject template entry %u does not exist.",targetEntry);
+                    sLog.outErrorDb("Table `spell_script_target`: gameobject template entry %u does not exist.", itr->targetEntry);
+                    sSpellScriptTargetStorage.EraseEntry(itr->spellId);
                     continue;
                 }
                 break;
             }
             default:
-                if (!targetEntry)
+                if (!itr->targetEntry)
                 {
-                    sLog.outErrorDb("Table `spell_script_target`: target entry == 0 for not GO target type (%u).",type);
+                    sLog.outErrorDb("Table `spell_script_target`: target entry == 0 for not GO target type (%u).", itr->type);
+                    sSpellScriptTargetStorage.EraseEntry(itr->spellId);
                     continue;
                 }
-                if (const CreatureInfo* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(targetEntry))
+                if (const CreatureInfo* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(itr->targetEntry))
                 {
-                    if (spellId == 30427 && !cInfo->SkinLootId)
+                    if (itr->spellId == 30427 && !cInfo->SkinningLootId)
                     {
                         sLog.outErrorDb("Table `spell_script_target` has creature %u as a target of spellid 30427, but this creature has no skinlootid. Gas extraction will not work!", cInfo->Entry);
+                        sSpellScriptTargetStorage.EraseEntry(itr->spellId);
                         continue;
                     }
                 }
                 else
                 {
-                    sLog.outErrorDb("Table `spell_script_target`: creature template entry %u does not exist.",targetEntry);
+                    sLog.outErrorDb("Table `spell_script_target`: creature template entry %u does not exist.", itr->targetEntry);
+                    sSpellScriptTargetStorage.EraseEntry(itr->spellId);
                     continue;
                 }
                 break;
         }
-
-        mSpellScriptTarget.insert(SpellScriptTarget::value_type(spellId,SpellTargetEntry(SpellTargetType(type),targetEntry)));
-
-        ++count;
-    } while (result->NextRow());
-
-    delete result;
+    }
 
     // Check all spells
-    /* Disabled (lot errors at this moment)
-    for(uint32 i = 1; i < sSpellStore.nCount; ++i)
+    if (!sLog.HasLogFilter(LOG_FILTER_DB_STRICTED_CHECK))
     {
-        SpellEntry const * spellInfo = sSpellStore.LookupEntry(i);
-        if(!spellInfo)
-            continue;
-
-        bool found = false;
-        for(int j = 0; j < MAX_EFFECT_INDEX; ++j)
+        for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
         {
-            if( spellInfo->EffectImplicitTargetA[j] == TARGET_SCRIPT || spellInfo->EffectImplicitTargetA[j] != TARGET_SELF && spellInfo->EffectImplicitTargetB[j] == TARGET_SCRIPT )
+            SpellEntry const* spellInfo = sSpellStore.LookupEntry(i);
+            if (!spellInfo)
+                continue;
+
+            for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
             {
-                SpellScriptTarget::const_iterator lower = GetBeginSpellScriptTarget(spellInfo->Id);
-                SpellScriptTarget::const_iterator upper = GetEndSpellScriptTarget(spellInfo->Id);
-                if(lower==upper)
+                if (spellInfo->Effect[j] && (spellInfo->EffectImplicitTargetA[j] == TARGET_SCRIPT ||
+                                             (spellInfo->EffectImplicitTargetA[j] != TARGET_SELF && spellInfo->EffectImplicitTargetB[j] == TARGET_SCRIPT)))
                 {
-                    sLog.outErrorDb("Spell (ID: %u) has effect EffectImplicitTargetA/EffectImplicitTargetB = %u (TARGET_SCRIPT), but does not have record in `spell_script_target`",spellInfo->Id,TARGET_SCRIPT);
-                    break;                                  // effects of spell
+                    SQLMultiStorage::SQLMSIteratorBounds<SpellTargetEntry> bounds = sSpellScriptTargetStorage.getBounds<SpellTargetEntry>(i);
+                    if (bounds.first == bounds.second)
+                    {
+                        sLog.outErrorDb("Spell (ID: %u) has effect EffectImplicitTargetA/EffectImplicitTargetB = %u (TARGET_SCRIPT), but does not have record in `spell_script_target`", spellInfo->Id, TARGET_SCRIPT);
+                        break;                                  // effects of spell
+                    }
                 }
             }
         }
     }
-    */
-
-    sLog.outString();
-    sLog.outString(">> Loaded %u Spell Script Targets", count);
 }
 
 void SpellMgr::LoadSpellPetAuras()
@@ -3347,6 +3868,14 @@ void SpellMgr::LoadSpellPetAuras()
         uint32 pet = fields[2].GetUInt32();
         uint32 aura = fields[3].GetUInt32();
 
+        if (!spell)
+        {
+            // Creating lists of pet passive auras (spell == 0)
+            PetAura pa(pet, aura, eff, 0);
+            mSpellPetPassiveAuraMap[pet].push_back(pa);
+            continue;
+        }
+
         if (eff >= MAX_EFFECT_INDEX)
         {
             sLog.outErrorDb("Spell %u listed in `spell_pet_auras` with wrong spell effect index (%u)", spell, eff);
@@ -3354,7 +3883,7 @@ void SpellMgr::LoadSpellPetAuras()
         }
 
         SpellPetAuraMap::iterator itr = mSpellPetAuraMap.find((spell<<8) + eff);
-        if(itr != mSpellPetAuraMap.end())
+        if (itr != mSpellPetAuraMap.end())
         {
             itr->second.AddAura(pet, aura);
         }
@@ -3367,14 +3896,6 @@ void SpellMgr::LoadSpellPetAuras()
                 continue;
             }
 
-            if (spellInfo->Effect[eff] != SPELL_EFFECT_DUMMY &&
-               (spellInfo->Effect[eff] != SPELL_EFFECT_APPLY_AURA ||
-                spellInfo->EffectApplyAuraName[eff] != SPELL_AURA_DUMMY))
-            {
-                sLog.outError("Spell %u listed in `spell_pet_auras` does not have dummy aura or dummy effect", spell);
-                continue;
-            }
-
             SpellEntry const* spellInfo2 = sSpellStore.LookupEntry(aura);
             if (!spellInfo2)
             {
@@ -3409,14 +3930,14 @@ void SpellMgr::LoadPetLevelupSpellMap()
         for (uint32 j = 0; j < sSkillLineAbilityStore.GetNumRows(); ++j)
         {
             SkillLineAbilityEntry const *skillLine = sSkillLineAbilityStore.LookupEntry(j);
-            if( !skillLine )
+            if ( !skillLine )
                 continue;
 
             if (skillLine->skillId!=creatureFamily->skillLine[0] &&
                 (!creatureFamily->skillLine[1] || skillLine->skillId!=creatureFamily->skillLine[1]))
                 continue;
 
-            if(skillLine->learnOnGetSkill != ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL)
+            if (skillLine->learnOnGetSkill != ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL)
                 continue;
 
             SpellEntry const *spell = sSpellStore.LookupEntry(skillLine->spellId);
@@ -3424,7 +3945,7 @@ void SpellMgr::LoadPetLevelupSpellMap()
                 continue;
 
             PetLevelupSpellSet& spellSet = mPetLevelupSpellMap[creatureFamily->ID];
-            if(spellSet.empty())
+            if (spellSet.empty())
                 ++family_count;
 
             spellSet.insert(PetLevelupSpellSet::value_type(spell->spellLevel,spell->Id));
@@ -3442,7 +3963,7 @@ bool SpellMgr::LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefault
     bool have_spell = false;
     for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j)
     {
-        if(petDefSpells.spellid[j])
+        if (petDefSpells.spellid[j])
         {
             have_spell = true;
             break;
@@ -3452,7 +3973,7 @@ bool SpellMgr::LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefault
         return false;
 
     // remove duplicates with levelupSpells if any
-    if(PetLevelupSpellSet const *levelupSpells = cInfo->family ? GetPetLevelupSpellList(cInfo->family) : NULL)
+    if (PetLevelupSpellSet const* levelupSpells = cInfo->Family ? GetPetLevelupSpellList(cInfo->Family) : NULL)
     {
         for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j)
         {
@@ -3474,7 +3995,7 @@ bool SpellMgr::LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefault
     have_spell = false;
     for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j)
     {
-        if(petDefSpells.spellid[j])
+        if (petDefSpells.spellid[j])
         {
             have_spell = true;
             break;
@@ -3486,14 +4007,14 @@ bool SpellMgr::LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefault
 
 void SpellMgr::LoadPetDefaultSpells()
 {
-    MANGOS_ASSERT(MAX_CREATURE_SPELL_DATA_SLOT==CREATURE_MAX_SPELLS);
+    MANGOS_ASSERT(MAX_CREATURE_SPELL_DATA_SLOT <= CREATURE_MAX_SPELLS);
 
     mPetDefaultSpellsMap.clear();
 
     uint32 countCreature = 0;
     uint32 countData = 0;
 
-    for(uint32 i = 0; i < sCreatureStorage.MaxEntry; ++i )
+    for (uint32 i = 0; i < sCreatureStorage.GetMaxEntry(); ++i)
     {
         CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i);
         if(!cInfo)
@@ -3512,7 +4033,7 @@ void SpellMgr::LoadPetDefaultSpells()
         for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j)
             petDefSpells.spellid[j] = spellDataEntry->spellId[j];
 
-        if(LoadPetDefaultSpells_helper(cInfo, petDefSpells))
+        if (LoadPetDefaultSpells_helper(cInfo, petDefSpells))
         {
             mPetDefaultSpellsMap[petSpellsId] = petDefSpells;
             ++countData;
@@ -3528,7 +4049,7 @@ void SpellMgr::LoadPetDefaultSpells()
 
         for(int k = 0; k < MAX_EFFECT_INDEX; ++k)
         {
-            if(spellEntry->Effect[k]==SPELL_EFFECT_SUMMON || spellEntry->Effect[k]==SPELL_EFFECT_SUMMON_PET)
+            if (spellEntry->Effect[k]==SPELL_EFFECT_SUMMON || spellEntry->Effect[k]==SPELL_EFFECT_SUMMON_PET)
             {
                 uint32 creature_id = spellEntry->EffectMiscValue[k];
                 CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(creature_id);
@@ -3536,19 +4057,28 @@ void SpellMgr::LoadPetDefaultSpells()
                     continue;
 
                 // already loaded
-                if(cInfo->PetSpellDataId)
+                if (cInfo->PetSpellDataId)
                     continue;
 
                 // for creature without PetSpellDataId get default pet spells from creature_template
                 int32 petSpellsId = cInfo->Entry;
-                if(mPetDefaultSpellsMap.find(cInfo->Entry) != mPetDefaultSpellsMap.end())
+                if (mPetDefaultSpellsMap.find(cInfo->Entry) != mPetDefaultSpellsMap.end())
                     continue;
-
                 PetDefaultSpellsEntry petDefSpells;
-                for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j)
-                    petDefSpells.spellid[j] = cInfo->spells[j];
 
-                if(LoadPetDefaultSpells_helper(cInfo, petDefSpells))
+                CreatureSpellsList const* spellList = sObjectMgr.GetCreatureSpells(cInfo->Entry);
+                if (spellList && !spellList->empty())
+                {
+                    for (CreatureSpellsList::const_iterator itr = spellList->begin(); (itr != spellList->end() && itr->first < MAX_CREATURE_SPELL_DATA_SLOT); ++itr)
+                    {
+                        if (itr->second.disabled || !itr->second.spell)
+                            petDefSpells.spellid[itr->first] = 0;
+                        else
+                            petDefSpells.spellid[itr->first] = itr->second.spell;
+                    }
+                }
+
+                if (LoadPetDefaultSpells_helper(cInfo, petDefSpells))
                 {
                     mPetDefaultSpellsMap[petSpellsId] = petDefSpells;
                     ++countCreature;
@@ -3587,9 +4117,9 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg)
                     // skip auto-loot crafting spells, its not need explicit item info (but have special fake items sometime)
                     if (!IsLootCraftingSpell(spellInfo))
                     {
-                        if(msg)
+                        if (msg)
                         {
-                            if(pl)
+                            if (pl)
                                 ChatHandler(pl).PSendSysMessage("Craft spell %u not have create item entry.",spellInfo->Id);
                             else
                                 sLog.outErrorDb("Craft spell %u not have create item entry.",spellInfo->Id);
@@ -3601,9 +4131,9 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg)
                 // also possible IsLootCraftingSpell case but fake item must exist anyway
                 else if (!ObjectMgr::GetItemPrototype( spellInfo->EffectItemType[i] ))
                 {
-                    if(msg)
+                    if (msg)
                     {
-                        if(pl)
+                        if (pl)
                             ChatHandler(pl).PSendSysMessage("Craft spell %u create item (Entry: %u) but item does not exist in item_template.",spellInfo->Id,spellInfo->EffectItemType[i]);
                         else
                             sLog.outErrorDb("Craft spell %u create item (Entry: %u) but item does not exist in item_template.",spellInfo->Id,spellInfo->EffectItemType[i]);
@@ -3617,11 +4147,11 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg)
             case SPELL_EFFECT_LEARN_SPELL:
             {
                 SpellEntry const* spellInfo2 = sSpellStore.LookupEntry(spellInfo->EffectTriggerSpell[i]);
-                if( !IsSpellValid(spellInfo2,pl,msg) )
+                if ( !IsSpellValid(spellInfo2,pl,msg) )
                 {
-                    if(msg)
+                    if (msg)
                     {
-                        if(pl)
+                        if (pl)
                             ChatHandler(pl).PSendSysMessage("Spell %u learn to broken spell %u, and then...",spellInfo->Id,spellInfo->EffectTriggerSpell[i]);
                         else
                             sLog.outErrorDb("Spell %u learn to invalid spell %u, and then...",spellInfo->Id,spellInfo->EffectTriggerSpell[i]);
@@ -3633,15 +4163,15 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg)
         }
     }
 
-    if(need_check_reagents)
+    if (need_check_reagents)
     {
         for(int j = 0; j < MAX_SPELL_REAGENTS; ++j)
         {
-            if(spellInfo->Reagent[j] > 0 && !ObjectMgr::GetItemPrototype( spellInfo->Reagent[j] ))
+            if (spellInfo->Reagent[j] > 0 && !ObjectMgr::GetItemPrototype( spellInfo->Reagent[j] ))
             {
-                if(msg)
+                if (msg)
                 {
-                    if(pl)
+                    if (pl)
                         ChatHandler(pl).PSendSysMessage("Craft spell %u requires reagent item (Entry: %u) but item does not exist in item_template.",spellInfo->Id,spellInfo->Reagent[j]);
                     else
                         sLog.outErrorDb("Craft spell %u requires reagent item (Entry: %u) but item does not exist in item_template.",spellInfo->Id,spellInfo->Reagent[j]);
@@ -3657,15 +4187,12 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg)
 void SpellMgr::LoadSpellAreas()
 {
     mSpellAreaMap.clear();                                  // need for reload case
-    mSpellAreaForQuestMap.clear();
-    mSpellAreaForActiveQuestMap.clear();
-    mSpellAreaForQuestEndMap.clear();
     mSpellAreaForAuraMap.clear();
 
     uint32 count = 0;
 
-    //                                                0      1     2            3                   4          5           6         7       8
-    QueryResult *result = WorldDatabase.Query("SELECT spell, area, quest_start, quest_start_active, quest_end, aura_spell, racemask, gender, autocast FROM spell_area");
+    //                                                0      1     2            3                   4          5             6           7         8       9
+    QueryResult* result = WorldDatabase.Query("SELECT spell, area, quest_start, quest_start_active, quest_end, condition_id, aura_spell, racemask, gender, autocast FROM spell_area");
 
     if (!result)
     {
@@ -3693,10 +4220,11 @@ void SpellMgr::LoadSpellAreas()
         spellArea.questStart          = fields[2].GetUInt32();
         spellArea.questStartCanActive = fields[3].GetBool();
         spellArea.questEnd            = fields[4].GetUInt32();
-        spellArea.auraSpell           = fields[5].GetInt32();
-        spellArea.raceMask            = fields[6].GetUInt32();
-        spellArea.gender              = Gender(fields[7].GetUInt8());
-        spellArea.autocast            = fields[8].GetBool();
+        spellArea.conditionId         = fields[5].GetUInt16();
+        spellArea.auraSpell           = fields[6].GetInt32();
+        spellArea.raceMask            = fields[7].GetUInt32();
+        spellArea.gender              = Gender(fields[8].GetUInt8());
+        spellArea.autocast            = fields[9].GetBool();
 
         if (!sSpellStore.LookupEntry(spell))
         {
@@ -3741,6 +4269,13 @@ void SpellMgr::LoadSpellAreas()
             continue;
         }
 
+        if (spellArea.conditionId && !sConditionStorage.LookupEntry<PlayerCondition>(spellArea.conditionId))
+        {
+            sLog.outErrorDb("Spell %u listed in `spell_area` have wrong conditionId (%u) requirement", spell, spellArea.conditionId);
+            continue;
+        }
+        else if (!spellArea.conditionId)
+    {
         if (spellArea.questStart && !sObjectMgr.GetQuestTemplate(spellArea.questStart))
         {
             sLog.outErrorDb("Spell %u listed in `spell_area` have wrong start quest (%u) requirement", spell,spellArea.questStart);
@@ -3762,6 +4297,19 @@ void SpellMgr::LoadSpellAreas()
             }
         }
 
+        if (spellArea.raceMask && (spellArea.raceMask & RACEMASK_ALL_PLAYABLE) == 0)
+        {
+            sLog.outErrorDb("Spell %u listed in `spell_area` have wrong race mask (%u) requirement", spell, spellArea.raceMask);
+            continue;
+        }
+
+        if (spellArea.gender != GENDER_NONE && spellArea.gender != GENDER_FEMALE && spellArea.gender != GENDER_MALE)
+        {
+            sLog.outErrorDb("Spell %u listed in `spell_area` have wrong gender (%u) requirement", spell, spellArea.gender);
+            continue;
+        }
+   }
+
         if (spellArea.auraSpell)
         {
             SpellEntry const* spellInfo = sSpellStore.LookupEntry(abs(spellArea.auraSpell));
@@ -3826,37 +4374,12 @@ void SpellMgr::LoadSpellAreas()
             }
         }
 
-        if (spellArea.raceMask && (spellArea.raceMask & RACEMASK_ALL_PLAYABLE)==0)
-        {
-            sLog.outErrorDb("Spell %u listed in `spell_area` have wrong race mask (%u) requirement", spell,spellArea.raceMask);
-            continue;
-        }
-
-        if (spellArea.gender!=GENDER_NONE && spellArea.gender!=GENDER_FEMALE && spellArea.gender!=GENDER_MALE)
-        {
-            sLog.outErrorDb("Spell %u listed in `spell_area` have wrong gender (%u) requirement", spell,spellArea.gender);
-            continue;
-        }
-
-        SpellArea const* sa = &mSpellAreaMap.insert(SpellAreaMap::value_type(spell,spellArea))->second;
+        SpellArea const* sa = &mSpellAreaMap.insert(SpellAreaMap::value_type(spell, spellArea))->second;
 
         // for search by current zone/subzone at zone/subzone change
         if (spellArea.areaId)
             mSpellAreaForAreaMap.insert(SpellAreaForAreaMap::value_type(spellArea.areaId,sa));
 
-        // for search at quest start/reward
-        if (spellArea.questStart)
-        {
-            if (spellArea.questStartCanActive)
-                mSpellAreaForActiveQuestMap.insert(SpellAreaForQuestMap::value_type(spellArea.questStart,sa));
-            else
-                mSpellAreaForQuestMap.insert(SpellAreaForQuestMap::value_type(spellArea.questStart,sa));
-        }
-
-        // for search at quest start/reward
-        if (spellArea.questEnd)
-            mSpellAreaForQuestEndMap.insert(SpellAreaForQuestMap::value_type(spellArea.questEnd,sa));
-
         // for search at aura apply
         if (spellArea.auraSpell)
             mSpellAreaForAuraMap.insert(SpellAreaForAuraMap::value_type(abs(spellArea.auraSpell),sa));
@@ -3898,7 +4421,7 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
     {
         uint32 v_map = GetVirtualMapForMapAndZone(map_id, zone_id);
         MapEntry const* mapEntry = sMapStore.LookupEntry(v_map);
-        if (!mapEntry || mapEntry->addon < 1 || !mapEntry->IsContinent())
+        if (!mapEntry || (mapEntry->addon < 1 && !sWorld.getConfig(CONFIG_BOOL_ALLOW_FLIGHT_ON_OLD_MAPS)) || !mapEntry->IsContinent())
             return SPELL_FAILED_INCORRECT_AREA;
     }
 
@@ -3916,7 +4439,7 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
     {
         for(SpellAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
         {
-            if(itr->second.IsFitToRequirements(player,zone_id,area_id))
+            if (itr->second.IsFitToRequirements(player,zone_id,area_id))
                 return SPELL_CAST_OK;
         }
         return SPELL_FAILED_INCORRECT_AREA;
@@ -3985,78 +4508,369 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
         {
             return player && player->InArena() ? SPELL_CAST_OK : SPELL_FAILED_ONLY_IN_ARENA;
         }
-        case 32727:                                         // Arena Preparation
+        case 32727:                                         // Arena Preparation
+        {
+            if (!player)
+                return SPELL_FAILED_REQUIRES_AREA;
+            if (!player->InArena())
+                return SPELL_FAILED_REQUIRES_AREA;
+
+            BattleGround* bg = player->GetBattleGround();
+            return bg && bg->GetStatus()==STATUS_WAIT_JOIN ? SPELL_CAST_OK : SPELL_FAILED_ONLY_IN_ARENA;
+        }
+        case 69065:                                         // Impaled
+        case 69126:                                         // Pungent blight - first aura
+        case 69152:                                         // Gazeous blight - first aura
+        case 72293:                                         // Mark of the Fallen Champion
+            return map_id == 631 ? SPELL_CAST_OK : SPELL_FAILED_INCORRECT_AREA;
+        case 74410:                                         // Arena - Dampening
+            return player && player->InArena() ? SPELL_CAST_OK : SPELL_FAILED_ONLY_IN_ARENA;
+        case 74411:                                         // Battleground - Dampening
+        {
+            if (!player)
+                return SPELL_FAILED_ONLY_BATTLEGROUNDS;
+
+            BattleGround* bg = player->GetBattleGround();
+            return bg && !bg->isArena() ? SPELL_CAST_OK : SPELL_FAILED_ONLY_BATTLEGROUNDS;
+        }
+    }
+
+    return SPELL_CAST_OK;
+}
+
+void SpellMgr::LoadSkillLineAbilityMap()
+{
+    mSkillLineAbilityMap.clear();
+
+    BarGoLink bar(sSkillLineAbilityStore.GetNumRows());
+    uint32 count = 0;
+
+    for (uint32 i = 0; i < sSkillLineAbilityStore.GetNumRows(); ++i)
+    {
+        bar.step();
+        SkillLineAbilityEntry const *SkillInfo = sSkillLineAbilityStore.LookupEntry(i);
+        if(!SkillInfo)
+            continue;
+
+        mSkillLineAbilityMap.insert(SkillLineAbilityMap::value_type(SkillInfo->spellId,SkillInfo));
+        ++count;
+    }
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u SkillLineAbility MultiMap Data", count);
+}
+
+void SpellMgr::LoadSkillRaceClassInfoMap()
+{
+    mSkillRaceClassInfoMap.clear();
+
+    BarGoLink bar(sSkillRaceClassInfoStore.GetNumRows());
+    uint32 count = 0;
+
+    for (uint32 i = 0; i < sSkillRaceClassInfoStore.GetNumRows(); ++i)
+    {
+        bar.step();
+        SkillRaceClassInfoEntry const *skillRCInfo = sSkillRaceClassInfoStore.LookupEntry(i);
+        if (!skillRCInfo)
+            continue;
+
+        // not all skills really listed in ability skills list
+        if (!sSkillLineStore.LookupEntry(skillRCInfo->skillId))
+            continue;
+
+        mSkillRaceClassInfoMap.insert(SkillRaceClassInfoMap::value_type(skillRCInfo->skillId,skillRCInfo));
+
+        ++count;
+    }
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u SkillRaceClassInfo MultiMap Data", count);
+}
+
+void SpellMgr::LoadSkillDiscoveryTable()
+{
+
+    mSkillDiscoveryStore.clear();                            // need for reload
+
+    uint32 count = 0;
+
+    //                                                0        1         2              3
+    QueryResult *result = WorldDatabase.Query("SELECT spellId, reqSpell, reqSkillValue, chance FROM skill_discovery_template");
+
+    if (!result)
+    {
+        sLog.outString();
+        sLog.outString( ">> Loaded 0 skill discovery definitions. DB table `skill_discovery_template` is empty." );
+        return;
+    }
+
+    BarGoLink bar(result->GetRowCount());
+
+    std::ostringstream ssNonDiscoverableEntries;
+    std::set<uint32> reportedReqSpells;
+
+    do
+    {
+        Field *fields = result->Fetch();
+        bar.step();
+
+        uint32 spellId         = fields[0].GetUInt32();
+        int32  reqSkillOrSpell = fields[1].GetInt32();
+        uint32 reqSkillValue   = fields[2].GetInt32();
+        float  chance          = fields[3].GetFloat();
+
+        if (chance <= 0)                                    // chance
+        {
+            ssNonDiscoverableEntries << "spellId = " << spellId << " reqSkillOrSpell = " << reqSkillOrSpell
+                << " reqSkillValue = " << reqSkillValue << " chance = " << chance << "(chance problem)\n";
+            continue;
+        }
+
+        if (reqSkillOrSpell > 0)                            // spell case
+        {
+            SpellEntry const* reqSpellEntry = sSpellStore.LookupEntry(reqSkillOrSpell);
+            if (!reqSpellEntry)
+            {
+                if (reportedReqSpells.find(reqSkillOrSpell) == reportedReqSpells.end())
+                {
+                    sLog.outErrorDb("Spell (ID: %u) have nonexistent spell (ID: %i) in `reqSpell` field in `skill_discovery_template` table",spellId,reqSkillOrSpell);
+                    reportedReqSpells.insert(reqSkillOrSpell);
+                }
+                continue;
+            }
+
+            // mechanic discovery
+            if (reqSpellEntry->Mechanic != MECHANIC_DISCOVERY &&
+                // explicit discovery ability
+                !IsExplicitDiscoverySpell(reqSpellEntry))
+            {
+                if (reportedReqSpells.find(reqSkillOrSpell) == reportedReqSpells.end())
+                {
+                    sLog.outErrorDb("Spell (ID: %u) not have MECHANIC_DISCOVERY (28) value in Mechanic field in spell.dbc"
+                        " and not 100%% chance random discovery ability but listed for spellId %u (and maybe more) in `skill_discovery_template` table",
+                        reqSkillOrSpell,spellId);
+                    reportedReqSpells.insert(reqSkillOrSpell);
+                }
+                continue;
+            }
+
+            mSkillDiscoveryStore[reqSkillOrSpell].push_back( SkillDiscoveryEntry(spellId, reqSkillValue, chance) );
+        }
+        else if (reqSkillOrSpell == 0)                      // skill case
         {
-            if (!player)
-                return SPELL_FAILED_REQUIRES_AREA;
-            if (!player->InArena())
-                return SPELL_FAILED_REQUIRES_AREA;
+            SkillLineAbilityMapBounds bounds = sSpellMgr.GetSkillLineAbilityMapBounds(spellId);
 
-            BattleGround* bg = player->GetBattleGround();
-            return bg && bg->GetStatus()==STATUS_WAIT_JOIN ? SPELL_CAST_OK : SPELL_FAILED_ONLY_IN_ARENA;
+            if (bounds.first==bounds.second)
+            {
+                sLog.outErrorDb("Spell (ID: %u) not listed in `SkillLineAbility.dbc` but listed with `reqSpell`=0 in `skill_discovery_template` table",spellId);
+                continue;
+            }
+
+            for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
+                mSkillDiscoveryStore[-int32(_spell_idx->second->skillId)].push_back( SkillDiscoveryEntry(spellId, reqSkillValue, chance) );
         }
-        case 74410:                                         // Arena - Dampening
-            return player && player->InArena() ? SPELL_CAST_OK : SPELL_FAILED_ONLY_IN_ARENA;
-        case 74411:                                         // Battleground - Dampening
+        else
         {
-            if (!player)
-                return SPELL_FAILED_ONLY_BATTLEGROUNDS;
-
-            BattleGround* bg = player->GetBattleGround();
-            return bg && !bg->isArena() ? SPELL_CAST_OK : SPELL_FAILED_ONLY_BATTLEGROUNDS;
+            sLog.outErrorDb("Spell (ID: %u) have negative value in `reqSpell` field in `skill_discovery_template` table",spellId);
+            continue;
         }
-    }
 
-    return SPELL_CAST_OK;
+        ++count;
+    } while (result->NextRow());
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString( ">> Loaded %u skill discovery definitions", count );
+    if (!ssNonDiscoverableEntries.str().empty())
+        sLog.outErrorDb("Some items can't be successfully discovered: have in chance field value < 0.000001 in `skill_discovery_template` DB table . List:\n%s",ssNonDiscoverableEntries.str().c_str());
+
+    // report about empty data for explicit discovery spells
+    for(uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id)
+    {
+        SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell_id);
+        if (!spellEntry)
+            continue;
+
+        // skip not explicit discovery spells
+        if (!IsExplicitDiscoverySpell(spellEntry))
+            continue;
+
+        if (mSkillDiscoveryStore.find(spell_id) == mSkillDiscoveryStore.end())
+            sLog.outErrorDb("Spell (ID: %u) is 100%% chance random discovery ability but not have data in `skill_discovery_template` table",spell_id);
+    }
 }
 
-void SpellMgr::LoadSkillLineAbilityMap()
+uint32 SpellMgr::GetExplicitDiscoverySpell(uint32 spellId, Player* player)
 {
-    mSkillLineAbilityMap.clear();
+    // explicit discovery spell chances (always success if case exist)
+    // in this case we have both skill and spell
+    SkillDiscoveryMap::const_iterator tab = mSkillDiscoveryStore.find(spellId);
+    if (tab == mSkillDiscoveryStore.end())
+        return 0;
 
-    BarGoLink bar(sSkillLineAbilityStore.GetNumRows());
-    uint32 count = 0;
+    SkillLineAbilityMapBounds bounds = GetSkillLineAbilityMapBounds(spellId);
+    uint32 skillvalue = bounds.first != bounds.second ? player->GetSkillValue(bounds.first->second->skillId) : 0;
 
-    for (uint32 i = 0; i < sSkillLineAbilityStore.GetNumRows(); ++i)
+    float full_chance = 0;
+    for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
+        if (item_iter->reqSkillValue <= skillvalue)
+            if (!player->HasSpell(item_iter->spellId))
+                full_chance += item_iter->chance;
+
+    float rate = full_chance / 100.0f;
+    float roll = rand_chance_f() * rate;                    // roll now in range 0..full_chance
+
+    for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
     {
-        bar.step();
-        SkillLineAbilityEntry const *SkillInfo = sSkillLineAbilityStore.LookupEntry(i);
-        if(!SkillInfo)
+        if (item_iter->reqSkillValue > skillvalue)
             continue;
 
-        mSkillLineAbilityMap.insert(SkillLineAbilityMap::value_type(SkillInfo->spellId,SkillInfo));
-        ++count;
+        if (player->HasSpell(item_iter->spellId))
+            continue;
+
+        if (item_iter->chance > roll)
+            return item_iter->spellId;
+
+        roll -= item_iter->chance;
     }
 
-    sLog.outString();
-    sLog.outString(">> Loaded %u SkillLineAbility MultiMap Data", count);
+    return 0;
 }
 
-void SpellMgr::LoadSkillRaceClassInfoMap()
+uint32 SpellMgr::GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player)
 {
-    mSkillRaceClassInfoMap.clear();
+    uint32 skillvalue = skillId ? player->GetSkillValue(skillId) : 0;
 
-    BarGoLink bar(sSkillRaceClassInfoStore.GetNumRows());
+    // check spell case
+    SkillDiscoveryMap::const_iterator tab = mSkillDiscoveryStore.find(spellId);
+
+    if (tab != mSkillDiscoveryStore.end())
+    {
+        for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
+        {
+            if (roll_chance_f(item_iter->chance * sWorld.getConfig(CONFIG_FLOAT_RATE_SKILL_DISCOVERY)) &&
+                item_iter->reqSkillValue <= skillvalue &&
+                !player->HasSpell(item_iter->spellId))
+                return item_iter->spellId;
+        }
+
+        return 0;
+    }
+
+    if (!skillId)
+        return 0;
+
+    // check skill line case
+    tab = mSkillDiscoveryStore.find(-(int32)skillId);
+    if (tab != mSkillDiscoveryStore.end())
+    {
+        for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
+        {
+            if (roll_chance_f(item_iter->chance * sWorld.getConfig(CONFIG_FLOAT_RATE_SKILL_DISCOVERY)) &&
+                item_iter->reqSkillValue <= skillvalue &&
+                !player->HasSpell(item_iter->spellId))
+                return item_iter->spellId;
+        }
+
+        return 0;
+    }
+
+    return 0;
+}
+
+// loads the extra item creation info from DB
+void SpellMgr::LoadSkillExtraItemTable()
+{
     uint32 count = 0;
 
-    for (uint32 i = 0; i < sSkillRaceClassInfoStore.GetNumRows(); ++i)
+    mSkillExtraItemStore.clear();                            // need for reload
+
+    //                                                 0        1                       2                       3
+    QueryResult *result = WorldDatabase.Query("SELECT spellId, requiredSpecialization, additionalCreateChance, additionalMaxNum FROM skill_extra_item_template");
+
+    if (result)
     {
-        bar.step();
-        SkillRaceClassInfoEntry const *skillRCInfo = sSkillRaceClassInfoStore.LookupEntry(i);
-        if (!skillRCInfo)
-            continue;
+        BarGoLink bar(result->GetRowCount());
 
-        // not all skills really listed in ability skills list
-        if (!sSkillLineStore.LookupEntry(skillRCInfo->skillId))
-            continue;
+        do
+        {
+            Field *fields = result->Fetch();
+            bar.step();
 
-        mSkillRaceClassInfoMap.insert(SkillRaceClassInfoMap::value_type(skillRCInfo->skillId,skillRCInfo));
+            uint32 spellId = fields[0].GetUInt32();
 
-        ++count;
+            if (!sSpellStore.LookupEntry(spellId))
+            {
+                sLog.outError("Skill specialization %u has nonexistent spell id in `skill_extra_item_template`!", spellId);
+                continue;
+            }
+
+            uint32 requiredSpecialization = fields[1].GetUInt32();
+            if (!sSpellStore.LookupEntry(requiredSpecialization))
+            {
+                sLog.outError("Skill specialization %u have nonexistent required specialization spell id %u in `skill_extra_item_template`!", spellId,requiredSpecialization);
+                continue;
+            }
+
+            float additionalCreateChance = fields[2].GetFloat();
+            if (additionalCreateChance <= 0.0f)
+            {
+                sLog.outError("Skill specialization %u has too low additional create chance in `skill_extra_item_template`!", spellId);
+                continue;
+            }
+
+            uint8 additionalMaxNum = fields[3].GetUInt8();
+            if (!additionalMaxNum)
+            {
+                sLog.outError("Skill specialization %u has 0 max number of extra items in `skill_extra_item_template`!", spellId);
+                continue;
+            }
+
+            SkillExtraItemEntry& skillExtraItemEntry = mSkillExtraItemStore[spellId];
+
+            skillExtraItemEntry.requiredSpecialization = requiredSpecialization;
+            skillExtraItemEntry.additionalCreateChance = additionalCreateChance;
+            skillExtraItemEntry.additionalMaxNum       = additionalMaxNum;
+
+            ++count;
+        } while (result->NextRow());
+
+        delete result;
+
+        sLog.outString();
+        sLog.outString(">> Loaded %u spell specialization definitions", count);
+    }
+    else
+    {
+        sLog.outString();
+        sLog.outString( ">> Loaded 0 spell specialization definitions. DB table `skill_extra_item_template` is empty." );
     }
+}
 
-    sLog.outString();
-    sLog.outString(">> Loaded %u SkillRaceClassInfo MultiMap Data", count);
+bool SpellMgr::CanCreateExtraItems(Player * player, uint32 spellId, float &additionalChance, uint8 &additionalMax)
+{
+    // get the info for the specified spell
+    SkillExtraItemMap::const_iterator ret = mSkillExtraItemStore.find(spellId);
+    if (ret == mSkillExtraItemStore.end())
+        return false;
+
+    SkillExtraItemEntry const* specEntry = &ret->second;
+
+    // if no entry, then no extra items can be created
+    if(!specEntry)
+        return false;
+
+    // the player doesn't have the required specialization, return false
+    if(!player->HasSpell(specEntry->requiredSpecialization))
+        return false;
+
+    // set the arguments to the appropriate values
+    additionalChance = specEntry->additionalCreateChance;
+    additionalMax = specEntry->additionalMaxNum;
+
+    // enable extra item creation
+    return true;
 }
 
 void SpellMgr::CheckUsedSpells(char const* table)
@@ -4088,8 +4902,7 @@ void SpellMgr::CheckUsedSpells(char const* table)
 
         uint32 spell       = fields[0].GetUInt32();
         int32  family      = fields[1].GetInt32();
-        uint64 familyMaskA = fields[2].GetUInt64();
-        uint32 familyMaskB = fields[3].GetUInt32();
+        ClassFamilyMask familyMask = ClassFamilyMask(fields[2].GetUInt64(), fields[3].GetUInt32());
         int32  spellIcon   = fields[4].GetInt32();
         int32  spellVisual = fields[5].GetInt32();
         int32  category    = fields[6].GetInt32();
@@ -4148,7 +4961,7 @@ void SpellMgr::CheckUsedSpells(char const* table)
 
         // now checks of requirements
 
-        if(spell)
+        if (spell)
         {
             ++countSpells;
 
@@ -4165,38 +4978,39 @@ void SpellMgr::CheckUsedSpells(char const* table)
                 continue;
             }
 
-            if(familyMaskA != UI64LIT(0xFFFFFFFFFFFFFFFF) || familyMaskB != 0xFFFFFFFF)
+            if (familyMask != ~ClassFamilyMask())
             {
-                if(familyMaskA == UI64LIT(0x0000000000000000) && familyMaskB == 0x00000000)
+                if (familyMask == ClassFamilyMask())
                 {
-                    if (spellEntry->SpellFamilyFlags)
+                    if (spellEntry->GetSpellFamilyFlags())
                     {
                         sLog.outError("Spell %u '%s' not fit to (" I64FMT "," I32FMT ") but used in %s.",
-                            spell, name.c_str(), familyMaskA, familyMaskB, code.c_str());
+                            spell, name.c_str(), familyMask.Flags, familyMask.Flags2, code.c_str());
                         continue;
                     }
 
                 }
                 else
                 {
-                    if (!spellEntry->IsFitToFamilyMask(familyMaskA, familyMaskB))
+                    if (!spellEntry->IsFitToFamilyMask(familyMask))
                     {
-                        sLog.outError("Spell %u '%s' not fit to (" I64FMT "," I32FMT ") but used in %s.",spell,name.c_str(),familyMaskA,familyMaskB,code.c_str());
+                        sLog.outError("Spell %u '%s' not fit to (" I64FMT "," I32FMT ") but used in %s.",
+                            spell, name.c_str(), familyMask.Flags, familyMask.Flags2, code.c_str());
                         continue;
                     }
 
                 }
             }
 
-            if (spellIcon >= 0 && spellEntry->SpellIconID != uint32(spellIcon))
+            if (spellIcon >= 0 && spellEntry->GetSpellIconID() != uint32(spellIcon))
             {
-                sLog.outError("Spell %u '%s' icon(%u) <> %u but used in %s.",spell,name.c_str(),spellEntry->SpellIconID,spellIcon,code.c_str());
+                sLog.outError("Spell %u '%s' icon(%u) <> %u but used in %s.",spell,name.c_str(),spellEntry->GetSpellIconID(),spellIcon,code.c_str());
                 continue;
             }
 
-            if (spellVisual >= 0 && spellEntry->SpellVisual[0] != uint32(spellVisual))
+            if (spellVisual >= 0 && spellEntry->GetSpellVisual() != uint32(spellVisual))
             {
-                sLog.outError("Spell %u '%s' visual(%u) <> %u but used in %s.",spell,name.c_str(),spellEntry->SpellVisual[0],spellVisual,code.c_str());
+                sLog.outError("Spell %u '%s' visual(%u) <> %u but used in %s.",spell,name.c_str(),spellEntry->GetSpellVisual(),spellVisual,code.c_str());
                 continue;
             }
 
@@ -4250,24 +5064,24 @@ void SpellMgr::CheckUsedSpells(char const* table)
                 if (family >=0 && spellEntry->SpellFamilyName != uint32(family))
                     continue;
 
-                if (familyMaskA != UI64LIT(0xFFFFFFFFFFFFFFFF) || familyMaskB != 0xFFFFFFFF)
+                if (familyMask != ~ClassFamilyMask())
                 {
-                    if(familyMaskA == UI64LIT(0x0000000000000000) && familyMaskB == 0x00000000)
+                    if (familyMask == ClassFamilyMask())
                     {
-                        if (spellEntry->SpellFamilyFlags)
+                        if (spellEntry->GetSpellFamilyFlags())
                             continue;
                     }
                     else
                     {
-                        if (!spellEntry->IsFitToFamilyMask(familyMaskA, familyMaskB))
+                        if (!spellEntry->IsFitToFamilyMask(familyMask))
                             continue;
                     }
                 }
 
-                if (spellIcon >= 0 && spellEntry->SpellIconID != uint32(spellIcon))
+                if (spellIcon >= 0 && spellEntry->GetSpellIconID() != uint32(spellIcon))
                     continue;
 
-                if (spellVisual >= 0 && spellEntry->SpellVisual[0] != uint32(spellVisual))
+                if (spellVisual >= 0 && spellEntry->GetSpellVisual() != uint32(spellVisual))
                     continue;
 
                 if (category >= 0 && spellEntry->Category != uint32(category))
@@ -4298,10 +5112,10 @@ void SpellMgr::CheckUsedSpells(char const* table)
             {
                 if (effectIdx >= 0)
                     sLog.outError("Spells '%s' not found for family %i (" I64FMT "," I32FMT ") icon(%i) visual(%i) category(%i) effect%d(%i) aura%d(%i) but used in %s",
-                        name.c_str(),family,familyMaskA,familyMaskB,spellIcon,spellVisual,category,effectIdx+1,effectType,effectIdx+1,auraType,code.c_str());
+                        name.c_str(),family,familyMask.Flags,familyMask.Flags2,spellIcon,spellVisual,category,effectIdx+1,effectType,effectIdx+1,auraType,code.c_str());
                 else
                     sLog.outError("Spells '%s' not found for family %i (" I64FMT "," I32FMT ") icon(%i) visual(%i) category(%i) effect(%i) aura(%i) but used in %s",
-                        name.c_str(),family,familyMaskA,familyMaskB,spellIcon,spellVisual,category,effectType,auraType,code.c_str());
+                        name.c_str(),family,familyMask.Flags,familyMask.Flags2,spellIcon,spellVisual,category,effectType,auraType,code.c_str());
                 continue;
             }
         }
@@ -4326,74 +5140,99 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto
             break;
         case SPELLFAMILY_MAGE:
             // Dragon's Breath
-            if  (spellproto->SpellIconID == 1548)
+            if  (spellproto->GetSpellIconID() == 1548)
                 return DIMINISHING_DISORIENT;
+            // Slow
+            else if (spellproto->Id == 31589)
+                return DIMINISHING_LIMITONLY;
+            // Charge
+            else if (spellproto->Id == 7922)
+                return DIMINISHING_CHARGE;
             break;
         case SPELLFAMILY_ROGUE:
         {
             // Blind
-            if (spellproto->IsFitToFamilyMask(UI64LIT(0x00001000000)))
+            if (spellproto->GetSpellFamilyFlags().test<CF_ROGUE_BLIND>())
                 return DIMINISHING_FEAR_CHARM_BLIND;
             // Cheap Shot
-            else if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000000400)))
+            else if (spellproto->GetSpellFamilyFlags().test<CF_ROGUE_CHEAP_SHOT>())
                 return DIMINISHING_CHEAPSHOT_POUNCE;
             // Crippling poison - Limit to 10 seconds in PvP (No SpellFamilyFlags)
-            else if (spellproto->SpellIconID == 163)
+            else if (spellproto->GetSpellIconID() == 163)
+                return DIMINISHING_LIMITONLY;
+            // Wound poison - Limit to 10 seconds in PvP (No SpellFamilyFlags)
+            else if (spellproto->GetSpellIconID() == 1496)
                 return DIMINISHING_LIMITONLY;
             break;
         }
         case SPELLFAMILY_HUNTER:
         {
             // Freezing Trap & Freezing Arrow & Wyvern Sting
-            if  (spellproto->SpellIconID == 180 || spellproto->SpellIconID == 1721)
+            if  (spellproto->GetSpellIconID() == 180 || spellproto->GetSpellIconID() == 1721)
                 return DIMINISHING_DISORIENT;
+            // Hunters Mark - limit to 2 minutes in PvP
+            else if (spellproto->GetSpellFamilyFlags().test<CF_HUNTER_HUNTERS_MARK>())
+                return DIMINISHING_LIMITONLY;
             break;
         }
-        case SPELLFAMILY_WARLOCK:
+        case SPELLFAMILY_PALADIN:
         {
-            // Curses/etc
-            if (spellproto->IsFitToFamilyMask(UI64LIT(0x00080000000)))
+            // Judgement of Justice - limit to 10 seconds in PvP
+            if (spellproto->GetSpellFamilyFlags().test<CF_PALADIN_JUDGEMENT_OF_JUSTICE>())
                 return DIMINISHING_LIMITONLY;
+            // Turn Evil
+            else if (spellproto->GetSpellFamilyFlags().test<CF_PALADIN_TURN_EVIL>())
+                return DIMINISHING_FEAR_CHARM_BLIND;
             break;
         }
-        case SPELLFAMILY_PALADIN:
+        case SPELLFAMILY_SHAMAN:
+        {
+            // Earthgrab
+            if (spellproto->GetSpellFamilyFlags().test<CF_SHAMAN_EARTHGRAB>())
+                return DIMINISHING_LIMITONLY;
+            break;
+        }
+        case SPELLFAMILY_WARLOCK:
         {
-            // Judgement of Justice - Limit to 10 seconds in PvP
-            if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000100000)))
+            // Curses/etc
+            if (spellproto->GetSpellFamilyFlags().test<CF_WARLOCK_MISC_DEBUFFS, CF_WARLOCK_CURSE_OF_THE_ELEMENTS>())
                 return DIMINISHING_LIMITONLY;
             break;
         }
         case SPELLFAMILY_DRUID:
         {
             // Cyclone
-            if (spellproto->IsFitToFamilyMask(UI64LIT(0x02000000000)))
+            if (spellproto->GetSpellFamilyFlags().test<CF_DRUID_CYCLONE>())
                 return DIMINISHING_CYCLONE;
             // Pounce
-            else if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000020000)))
+            else if (spellproto->GetSpellFamilyFlags().test<CF_DRUID_POUNCE>())
                 return DIMINISHING_CHEAPSHOT_POUNCE;
             // Faerie Fire
-            else if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000000400)))
+            else if (spellproto->GetSpellFamilyFlags().test<CF_DRUID_FAERIE_FIRE>())
                 return DIMINISHING_LIMITONLY;
             break;
         }
         case SPELLFAMILY_WARRIOR:
         {
             // Hamstring - limit duration to 10s in PvP
-            if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000000002)))
+            if (spellproto->GetSpellFamilyFlags().test<CF_WARRIOR_HAMSTRING>())
                 return DIMINISHING_LIMITONLY;
+            // Charge - since 3.1.0
+            if (spellproto->Id == 7922)
+                return DIMINISHING_CHARGE;
             break;
         }
         case SPELLFAMILY_PRIEST:
         {
             // Shackle Undead
-            if (spellproto->SpellIconID == 27)
+            if (spellproto->GetSpellIconID() == 27)
                 return DIMINISHING_DISORIENT;
             break;
         }
         case SPELLFAMILY_DEATHKNIGHT:
         {
             // Hungering Cold (no flags)
-            if (spellproto->SpellIconID == 2797)
+            if (spellproto->GetSpellIconID() == 2797)
                 return DIMINISHING_DISORIENT;
             break;
         }
@@ -4401,6 +5240,10 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto
             break;
     }
 
+    // Taunt dimishing returns
+    if (IsSpellHaveAura(spellproto, SPELL_AURA_MOD_TAUNT))
+        return DIMINISHING_TAUNT;
+
     // Get by mechanic
     uint32 mechanic = GetAllSpellMechanicMask(spellproto);
     if (!mechanic)
@@ -4436,24 +5279,43 @@ int32 GetDiminishingReturnsLimitDuration(DiminishingGroup group, SpellEntry cons
     // Explicit diminishing duration
     switch(spellproto->SpellFamilyName)
     {
+        case SPELLFAMILY_WARLOCK:
+        {
+            // Curse of the Elements - limit to 2 minutes in PvP
+            if (spellproto->GetSpellFamilyFlags().test<CF_WARLOCK_CURSE_OF_THE_ELEMENTS>())
+                return 120000;
+            // Banish - limit to 6 seconds in PvP (3.1)
+            else if (spellproto->GetSpellFamilyFlags().test<CF_WARLOCK_BANISH>())
+                return 6000;
+            // Curse of agony - limit to 24 seconds in PvP (?)
+            else if (spellproto->GetSpellFamilyFlags().test<CF_WARLOCK_CURSE_OF_AGONY>())
+                return 24000;
+            // Shadow embrace - limit to 12 seconds in PvP (?)
+            else if (spellproto->GetSpellFamilyFlags().test<CF_WARLOCK_MISC_DEBUFFS>() && spellproto->GetSpellIconID() == 2209)
+                return 12000;
+            break;
+        }
         case SPELLFAMILY_HUNTER:
         {
             // Wyvern Sting
-            if (spellproto->SpellFamilyFlags & UI64LIT(0x0000100000000000))
+            if (spellproto->GetSpellFamilyFlags().test<CF_HUNTER_WYVERN_STING2>())
                 return 6000;
+            // Hunters Mark - limit to 2 minutes in PvP
+            else if (spellproto->GetSpellFamilyFlags().test<CF_HUNTER_HUNTERS_MARK>())
+                return 120000;
             break;
         }
         case SPELLFAMILY_PALADIN:
         {
             // Repentance - limit to 6 seconds in PvP
-            if (spellproto->SpellFamilyFlags & UI64LIT(0x00000000004))
+            if (spellproto->GetSpellFamilyFlags().test<CF_PALADIN_REPENTANCE>())
                 return 6000;
             break;
         }
         case SPELLFAMILY_DRUID:
         {
             // Faerie Fire - limit to 40 seconds in PvP (3.1)
-            if (spellproto->SpellFamilyFlags & UI64LIT(0x00000000400))
+            if (spellproto->GetSpellFamilyFlags().test<CF_DRUID_FAERIE_FIRE>())
                 return 40000;
             break;
         }
@@ -4479,6 +5341,7 @@ bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group)
         case DIMINISHING_CYCLONE:
         case DIMINISHING_BANISH:
         case DIMINISHING_LIMITONLY:
+        case DIMINISHING_CHARGE:
             return true;
         default:
             return false;
@@ -4493,6 +5356,7 @@ DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group)
         case DIMINISHING_CYCLONE:
         case DIMINISHING_TRIGGER_STUN:
         case DIMINISHING_CONTROL_STUN:
+        case DIMINISHING_CHARGE:
             return DRTYPE_ALL;
         case DIMINISHING_CONTROL_ROOT:
         case DIMINISHING_TRIGGER_ROOT:
@@ -4505,6 +5369,8 @@ DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group)
         case DIMINISHING_BANISH:
         case DIMINISHING_CHEAPSHOT_POUNCE:
             return DRTYPE_PLAYER;
+        case DIMINISHING_TAUNT:
+            return DRTYPE_TAUNT;
         default:
             break;
     }
@@ -4514,57 +5380,78 @@ DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group)
 
 bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 newArea) const
 {
-    if(gender!=GENDER_NONE)
+    if (conditionId)
+    {
+        if (!player || !sObjectMgr.IsPlayerMeetToCondition(conditionId, player, player->GetMap(), NULL, CONDITION_FROM_SPELL_AREA))
+            return false;
+    }
+    else                                                    // This block will be removed
+ {
+    if (gender != GENDER_NONE)
     {
         // not in expected gender
         if(!player || gender != player->getGender())
             return false;
     }
 
-    if (raceMask)
+    if (player && raceMask)
     {
         // not in expected race
         if (!(raceMask & player->getRaceMask()))
             return false;
     }
 
-    if(areaId)
+    if (questStart)
     {
-        // not in expected zone
-        if(newZone!=areaId && newArea!=areaId)
+        // not in expected required quest state
+        if(!player || ((!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart)))
             return false;
     }
 
-    if(questStart)
+    if (questEnd)
     {
-        // not in expected required quest state
-        if(!player || (!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart))
+        // not in expected forbidden quest state
+        if(!player || player->GetQuestRewardStatus(questEnd))
             return false;
     }
+ }
 
-    if(questEnd)
+    if (areaId)
     {
-        // not in expected forbidden quest state
-        if(!player || player->GetQuestRewardStatus(questEnd))
+        // not in expected zone
+        if (newZone != areaId && newArea != areaId)
             return false;
     }
 
-    if(auraSpell)
+    if (auraSpell)
     {
         // not have expected aura
         if(!player)
             return false;
-        if(auraSpell > 0)
+        if (auraSpell > 0)
             // have expected aura
-            return player->HasAura(auraSpell, EFFECT_INDEX_0);
+            return player->HasAura(auraSpell);
         else
             // not have expected aura
-            return !player->HasAura(-auraSpell, EFFECT_INDEX_0);
+            return !player->HasAura(-auraSpell);
     }
 
     return true;
 }
 
+void SpellArea::ApplyOrRemoveSpellIfCan(Player* player, uint32 newZone, uint32 newArea, bool onlyApply) const
+{
+    MANGOS_ASSERT(player);
+
+    if (IsFitToRequirements(player, newZone, newArea))
+    {
+        if (autocast && !player->HasAura(spellId))
+            player->CastSpell(player, spellId, true);
+    }
+    else if (!onlyApply && player->HasAura(spellId))
+        player->RemoveAurasDueToSpell(spellId);
+}
+
 SpellEntry const* GetSpellEntryByDifficulty(uint32 id, Difficulty difficulty, bool isRaid)
 {
     SpellDifficultyEntry const* spellDiff = sSpellDifficultyStore.LookupEntry(id);
@@ -4572,7 +5459,17 @@ SpellEntry const* GetSpellEntryByDifficulty(uint32 id, Difficulty difficulty, bo
     if (!spellDiff)
         return NULL;
 
-    for (Difficulty diff = difficulty; diff >= REGULAR_DIFFICULTY; diff = GetPrevDifficulty(diff, isRaid))
+    DEBUG_LOG("Searching spell %u in SpellDifficulty.dbc: Result is: %u/%u/%u/%u ",id,
+    spellDiff->spellId[RAID_DIFFICULTY_10MAN_NORMAL],
+    spellDiff->spellId[RAID_DIFFICULTY_25MAN_NORMAL],
+    spellDiff->spellId[RAID_DIFFICULTY_10MAN_HEROIC],
+    spellDiff->spellId[RAID_DIFFICULTY_25MAN_HEROIC]);
+
+
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellDiff->spellId[RAID_DIFFICULTY_10MAN_NORMAL]);
+    bool _isRaid = spellInfo ? (spellInfo->HasAttribute(SPELL_ATTR_EX6_NORMAL_DIFFICULTY) ? false : isRaid) : isRaid;
+
+    for (Difficulty diff = difficulty; diff >= REGULAR_DIFFICULTY; diff = GetPrevDifficulty(diff, _isRaid))
     {
         if (spellDiff->spellId[diff])
             return sSpellStore.LookupEntry(spellDiff->spellId[diff]);
@@ -4580,3 +5477,165 @@ SpellEntry const* GetSpellEntryByDifficulty(uint32 id, Difficulty difficulty, bo
 
     return NULL;
 }
+
+uint32 GetProcFlag(SpellEntry const* spellInfo)
+{
+    if (!spellInfo)
+        return 0;
+
+    SpellProcEventEntry const* spellProcEvent = sSpellMgr.GetSpellProcEvent(spellInfo->Id);
+
+    // Get EventProcFlag
+    uint32 EventProcFlag = 0;
+    if (spellProcEvent && spellProcEvent->procFlags) // if exist get custom spellProcEvent->procFlags
+        EventProcFlag = spellProcEvent->procFlags;
+    else
+        EventProcFlag = spellInfo->procFlags;       // else get from spell proto
+
+    return EventProcFlag;
+}
+
+ClassFamilyMask const ClassFamilyMask::Null = ClassFamilyMask();
+
+bool IsEffectCauseDamage(SpellEntry const* spellInfo, SpellEffectIndex effecIdx)
+{
+    if (!spellInfo)
+        return false;
+
+    switch (spellInfo->Effect[effecIdx])
+    {
+        // need much more correct effect definition in this check
+        case SPELL_EFFECT_NONE:
+        case SPELL_EFFECT_DISPEL:
+        case SPELL_EFFECT_TRIGGER_SPELL:
+        case SPELL_EFFECT_DISPEL_MECHANIC:
+        case SPELL_EFFECT_QUEST_COMPLETE:
+        case SPELL_EFFECT_KILL_CREDIT_PERSONAL:
+        case SPELL_EFFECT_KILL_CREDIT_GROUP:
+            return false;
+
+        case SPELL_EFFECT_SCHOOL_DAMAGE:
+        case SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL:
+        case SPELL_EFFECT_WEAPON_PERCENT_DAMAGE:
+        case SPELL_EFFECT_WEAPON_DAMAGE:
+        case SPELL_EFFECT_NORMALIZED_WEAPON_DMG:
+
+        // also all undefined (default mangos way)
+        default:
+            return true;
+    }
+}
+
+SpellPreferredTargetType GetPreferredTargetForSpell(SpellEntry const* spellInfo)
+{
+    if (!spellInfo)
+        return SPELL_PREFERRED_TARGET_SELF;
+
+    if (IsSpellWithCasterSourceTargetsOnly(spellInfo))
+        return SPELL_PREFERRED_TARGET_SELF;
+
+    bool positive = IsExplicitPositiveTarget(spellInfo->Id) || IsPositiveSpell(spellInfo);
+
+    if (IsAreaOfEffectSpell(spellInfo))
+        return positive ? SPELL_PREFERRED_TARGET_SELF : SPELL_PREFERRED_TARGET_VICTIM;
+
+    uint32 firstTarget = spellInfo->EffectImplicitTargetA[EFFECT_INDEX_0];
+    uint32 firstTargetB = spellInfo->EffectImplicitTargetB[EFFECT_INDEX_0];
+
+    if (firstTarget == TARGET_NONE && firstTargetB == TARGET_NONE)
+        return SPELL_PREFERRED_TARGET_SELF;
+
+    if (!IsSpellCauseDamage(spellInfo) && firstTarget == TARGET_DUELVSPLAYER)
+        return SPELL_PREFERRED_TARGET_RANDOM;
+    if (positive)
+    {
+        switch (firstTarget)
+        {
+            case TARGET_MASTER:
+                return SPELL_PREFERRED_TARGET_OWNER;
+            case TARGET_SINGLE_FRIEND_2:
+                return SPELL_PREFERRED_TARGET_FRIEND;
+            default:
+                break;
+        }
+
+        if (IsCasterSourceTarget(firstTarget))
+            return SPELL_PREFERRED_TARGET_SELF;
+
+        if (IsSpellAppliesAura(spellInfo))
+            return HasAreaAuraEffect(spellInfo) ? SPELL_PREFERRED_TARGET_SELF : SPELL_PREFERRED_TARGET_FRIEND;
+
+        return SPELL_PREFERRED_TARGET_SELF;
+    }
+    else
+    {
+        if (IsCasterSourceTarget(firstTarget))
+            return SPELL_PREFERRED_TARGET_SELF;
+
+        if (IsSpellCauseDamage(spellInfo))
+            return SPELL_PREFERRED_TARGET_VICTIM;
+
+        return SPELL_PREFERRED_TARGET_ENEMY;
+    }
+
+    return SPELL_PREFERRED_TARGET_SELF;
+}
+
+static char* SPELL_DBC_SPELL      = "reconstructed by spell_dbc spell";
+
+struct SpellDbcLoader : public SQLStorageLoaderBase<SpellDbcLoader, SQLHashStorage>
+{
+    template<class S, class D>
+    void default_fill(uint32 field_pos, S src, D &dst)
+    {
+        dst = D(src);
+    }
+
+    void default_fill_to_str(uint32 field_pos, char const* /*src*/, char * & dst)
+    {
+        if (field_pos == LOADED_SPELLDBC_FIELD_POS_SPELLNAME_0)
+        {
+            dst = SPELL_DBC_SPELL;
+        }
+        else
+        {
+            dst = new char[1];
+            *dst = 0;
+        }
+    }
+};
+
+void SpellMgr::LoadSpellDbc()
+{
+    SpellDbcLoader loader;
+    loader.Load(sSpellDbcTemplate);
+
+    sLog.outString(">> Loaded %u spell definitions", sSpellDbcTemplate.GetRecordCount());
+    sLog.outString();
+
+    for (uint32 i = 1; i < sSpellDbcTemplate.GetMaxEntry(); ++i)
+    {
+        // check data correctness
+        SpellEntry const* spellEntry = sSpellDbcTemplate.LookupEntry<SpellEntry>(i);
+        if (!spellEntry)
+            continue;
+
+        // insert serverside spell data
+        if (sSpellStore.GetNumRows() <= i)
+        {
+            sLog.outErrorDb("SpellMgr::LoadSpellDbc Loading Spell Template for spell %u, index out of bounds (max = %u)", i, sSpellStore.GetNumRows());
+            continue;
+        }
+        else if (/*SpellEntry const* originalSpellEntry = */sSpellStore.LookupEntry(i))
+        {
+            sLog.outDetail("SpellMgr::LoadSpellDbc Index %u already exists in SpellStorage! replacing on spell_dbc data fields!", i);
+            sSpellStore.EraseEntry(i);
+            sSpellStore.InsertEntry(const_cast<SpellEntry*>(spellEntry), i);
+        }
+        else
+        {
+            sLog.outDetail("SpellMgr::LoadSpellDbc reconstructed spell %u inserted in SpellStorage", spellEntry->Id);
+            sSpellStore.InsertEntry(const_cast<SpellEntry*>(spellEntry), i);
+        }
+    }
+}
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h
index 0a2630511aa..2eaa626ae5e 100644
--- a/src/game/SpellMgr.h
+++ b/src/game/SpellMgr.h
@@ -28,6 +28,7 @@
 #include "DBCStructure.h"
 #include "DBCStores.h"
 #include "SQLStorages.h"
+#include "WorldLocation.h"
 
 #include "Utilities/UnorderedMapSet.h"
 
@@ -73,6 +74,9 @@ enum SpellSpecific
     SPELL_DRINK             = 21,
     SPELL_FOOD_AND_DRINK    = 22,
     SPELL_UA_IMMOLATE       = 23,                           // Unstable Affliction and Immolate
+    SPELL_BLEED_DEBUFF      = 24,                           // Mangle and Trauma
+    SPELL_MAGE_INTELLECT    = 25,
+    SPELL_SCROLL            = 30
 };
 
 SpellSpecific GetSpellSpecific(uint32 spellId);
@@ -105,7 +109,7 @@ WeaponAttackType GetWeaponAttackType(SpellEntry const *spellInfo);
 inline bool IsSpellHaveEffect(SpellEntry const *spellInfo, SpellEffects effect)
 {
     for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if(SpellEffects(spellInfo->Effect[i])==effect)
+        if (SpellEffects(spellInfo->Effect[i])==effect)
             return true;
     return false;
 }
@@ -145,6 +149,7 @@ inline bool IsEffectHandledOnDelayedSpellLaunch(SpellEntry const *spellInfo, Spe
         case SPELL_EFFECT_WEAPON_PERCENT_DAMAGE:
         case SPELL_EFFECT_WEAPON_DAMAGE:
         case SPELL_EFFECT_NORMALIZED_WEAPON_DMG:
+        case SPELL_EFFECT_CHARGE:
             return true;
         default:
             return false;
@@ -166,18 +171,19 @@ inline bool IsPeriodicRegenerateEffect(SpellEntry const *spellInfo, SpellEffectI
 
 bool IsCastEndProcModifierAura(SpellEntry const *spellInfo, SpellEffectIndex effecIdx, SpellEntry const *procSpell);
 
-inline bool IsSpellHaveAura(SpellEntry const *spellInfo, AuraType aura)
+inline bool IsSpellHaveAura(SpellEntry const* spellInfo, AuraType aura, uint32 effectMask = (1 << EFFECT_INDEX_0) | (1 << EFFECT_INDEX_1) | (1 << EFFECT_INDEX_2))
 {
-    for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
-        if(AuraType(spellInfo->EffectApplyAuraName[i])==aura)
-            return true;
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+        if (effectMask & (1 << i))
+            if (AuraType(spellInfo->EffectApplyAuraName[i]) == aura)
+                return true;
     return false;
 }
 
 inline bool IsSpellLastAuraEffect(SpellEntry const *spellInfo, SpellEffectIndex effecIdx)
 {
     for(int i = effecIdx+1; i < MAX_EFFECT_INDEX; ++i)
-        if(spellInfo->EffectApplyAuraName[i])
+        if (spellInfo->EffectApplyAuraName[i])
             return false;
     return true;
 }
@@ -187,7 +193,9 @@ bool IsNoStackAuraDueToAura(uint32 spellId_1, uint32 spellId_2);
 inline bool IsSealSpell(SpellEntry const *spellInfo)
 {
     //Collection of all the seal family flags. No other paladin spell has any of those.
-    return spellInfo->IsFitToFamily(SPELLFAMILY_PALADIN, UI64LIT(0x26000C000A000000)) &&
+    return spellInfo->SpellFamilyName == SPELLFAMILY_PALADIN &&
+        spellInfo->GetSpellFamilyFlags().test<CF_PALADIN_SEAL_OF_COMMAND, CF_PALADIN_SEAL_OF_JUST_RIGHT, CF_PALADIN_SEAL_OF_BLOOD_MARTYR,
+            CF_PALADIN_SEAL_OF_CORRUPT_VENGE, CF_PALADIN_SEAL_OF_LIGHT, CF_PALADIN_SEAL_OF_WISDOM, CF_PALADIN_SEAL_OF_RIGHTEOUSNESS>() &&
         // avoid counting target triggered effect as seal for avoid remove it or seal by it.
         spellInfo->EffectImplicitTargetA[EFFECT_INDEX_0] == TARGET_SELF;
 }
@@ -195,7 +203,8 @@ inline bool IsSealSpell(SpellEntry const *spellInfo)
 inline bool IsElementalShield(SpellEntry const *spellInfo)
 {
     // family flags 10 (Lightning), 42 (Earth), 37 (Water), proc shield from T2 8 pieces bonus
-    return (spellInfo->SpellFamilyFlags & UI64LIT(0x42000000400)) || spellInfo->Id == 23552;
+    return spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN &&
+        (spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_LIGHTNING_SHIELD, CF_SHAMAN_WATER_SHIELD, CF_SHAMAN_EARTH_SHIELD>() || spellInfo->Id == 23552);
 }
 
 inline bool IsExplicitDiscoverySpell(SpellEntry const *spellInfo)
@@ -209,9 +218,9 @@ inline bool IsExplicitDiscoverySpell(SpellEntry const *spellInfo)
 inline bool IsLootCraftingSpell(SpellEntry const *spellInfo)
 {
     return (spellInfo->Effect[EFFECT_INDEX_0] == SPELL_EFFECT_CREATE_RANDOM_ITEM ||
-        // different random cards from Inscription (121==Virtuoso Inking Set category) r without explicit item
-        (spellInfo->Effect[EFFECT_INDEX_0] == SPELL_EFFECT_CREATE_ITEM_2 &&
-        (spellInfo->TotemCategory[0] != 0 || spellInfo->EffectItemType[0]==0)));
+            // different random cards from Inscription (121==Virtuoso Inking Set category) or without explicit item or explicit spells
+            (spellInfo->Effect[EFFECT_INDEX_0] == SPELL_EFFECT_CREATE_ITEM_2 &&
+             (spellInfo->TotemCategory[0] != 0 || spellInfo->EffectItemType[0] == 0 || spellInfo->Id == 62941)));
 }
 
 int32 CompareAuraRanks(uint32 spellId_1, uint32 spellId_2);
@@ -239,7 +248,7 @@ inline bool IsSpellRemoveAllMovementAndControlLossEffects(SpellEntry const* spel
         spellProto->EffectApplyAuraName[EFFECT_INDEX_1] == 0 &&
         spellProto->EffectApplyAuraName[EFFECT_INDEX_2] == 0 &&
         spellProto->HasAttribute(SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY)/* && -- all above selected spells have SPELL_ATTR_EX5_* mask
-        ((spellProto->AttributesEx5 &
+        ((spellProto->GetAttributesEx5() &
             (SPELL_ATTR_EX5_USABLE_WHILE_CONFUSED|SPELL_ATTR_EX5_USABLE_WHILE_FEARED|SPELL_ATTR_EX5_USABLE_WHILE_STUNNED)) ==
             (SPELL_ATTR_EX5_USABLE_WHILE_CONFUSED|SPELL_ATTR_EX5_USABLE_WHILE_FEARED|SPELL_ATTR_EX5_USABLE_WHILE_STUNNED))*/;
 }
@@ -249,11 +258,31 @@ inline bool IsDeathOnlySpell(SpellEntry const *spellInfo)
     return spellInfo->HasAttribute(SPELL_ATTR_EX3_CAST_ON_DEAD) || spellInfo->Id == 2584;
 }
 
+bool IsEffectCauseDamage(SpellEntry const* spellInfo, SpellEffectIndex effecIdx);
+
+inline bool IsSpellCauseDamage(SpellEntry const* spellInfo)
+{
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+        if (IsEffectCauseDamage(spellInfo, SpellEffectIndex(i)))
+            return true;
+    return false;
+}
+
+inline bool IsCrowdControlAura(AuraType aura)
+{
+    return (aura == SPELL_AURA_MOD_CONFUSE ||
+            aura == SPELL_AURA_MOD_FEAR    ||
+            aura == SPELL_AURA_MOD_STUN    ||
+            aura == SPELL_AURA_MOD_ROOT    ||
+            aura == SPELL_AURA_TRANSFORM   );
+}
+
+uint32 GetProcFlag(SpellEntry const* spellInfo);
+
 inline bool IsDeathPersistentSpell(SpellEntry const *spellInfo)
 {
     return spellInfo->HasAttribute(SPELL_ATTR_EX3_DEATH_PERSISTENT);
 }
-
 inline bool IsNonCombatSpell(SpellEntry const *spellInfo)
 {
     return spellInfo->HasAttribute(SPELL_ATTR_CANT_USED_IN_COMBAT);
@@ -264,6 +293,9 @@ bool IsPositiveSpell(SpellEntry const *spellproto);
 bool IsPositiveEffect(SpellEntry const *spellInfo, SpellEffectIndex effIndex);
 bool IsPositiveTarget(uint32 targetA, uint32 targetB);
 
+bool IsNonPositiveSpell(uint32 spellId);
+bool IsNonPositiveSpell(SpellEntry const* spellproto);
+
 bool IsExplicitPositiveTarget(uint32 targetA);
 bool IsExplicitNegativeTarget(uint32 targetA);
 
@@ -272,7 +304,7 @@ bool IsSingleTargetSpells(SpellEntry const *spellInfo1, SpellEntry const *spellI
 
 inline bool IsCasterSourceTarget(uint32 target)
 {
-    switch (target )
+    switch (target)
     {
         case TARGET_SELF:
         case TARGET_PET:
@@ -293,6 +325,25 @@ inline bool IsCasterSourceTarget(uint32 target)
         case TARGET_DIRECTLY_FORWARD:
         case TARGET_NONCOMBAT_PET:
         case TARGET_IN_FRONT_OF_CASTER_30:
+        case TARGET_RANDOM_NEARBY_LOC:
+        case TARGET_RANDOM_CIRCUMFERENCE_POINT:
+        case TARGET_DEST_RADIUS:
+        case TARGET_RANDOM_NEARBY_DEST:
+            return true;
+        default:
+            break;
+    }
+    return false;
+}
+
+inline bool IsCasterSourceAuraTarget(uint32 target)
+{
+    switch (target)
+    {
+        // Minimal set. Possible additional targets here.
+        case TARGET_SELF:
+        case TARGET_SINGLE_FRIEND:
+        case TARGET_SINGLE_FRIEND_2:
             return true;
         default:
             break;
@@ -302,22 +353,84 @@ inline bool IsCasterSourceTarget(uint32 target)
 
 inline bool IsSpellWithCasterSourceTargetsOnly(SpellEntry const* spellInfo)
 {
-    for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
+
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
     {
-        uint32 targetA = spellInfo->EffectImplicitTargetA[i];
-        if(targetA && !IsCasterSourceTarget(targetA))
+        if (spellInfo->Effect[i] == SPELL_EFFECT_NONE)
+            continue;
+
+        // All those spells - selfcasted in 3.3.5a (but not all has  standart targets set)
+        if (spellInfo->HasAttribute(SPELL_ATTR_PASSIVE) && 
+            spellInfo->HasAttribute(SPELL_ATTR_HIDDEN_CLIENTSIDE) &&
+            IsAuraApplyEffect(spellInfo, SpellEffectIndex(i)) &&
+            IsCasterSourceAuraTarget(spellInfo->GetEffectImplicitTargetAByIndex(SpellEffectIndex(i))))
+            continue;
+
+        if (((spellInfo->GetEffectImplicitTargetAByIndex(SpellEffectIndex(i)) != TARGET_NONE) && 
+                !IsCasterSourceTarget(spellInfo->GetEffectImplicitTargetAByIndex(SpellEffectIndex(i)))) ||
+            ((spellInfo->GetEffectImplicitTargetBByIndex(SpellEffectIndex(i)) != TARGET_NONE) && 
+                !IsCasterSourceTarget(spellInfo->GetEffectImplicitTargetBByIndex(SpellEffectIndex(i)))))
             return false;
 
-        uint32 targetB = spellInfo->EffectImplicitTargetB[i];
-        if(targetB && !IsCasterSourceTarget(targetB))
+        if (spellInfo->GetEffectImplicitTargetAByIndex(SpellEffectIndex(i)) == TARGET_NONE && 
+            spellInfo->GetEffectImplicitTargetBByIndex(SpellEffectIndex(i)) == TARGET_NONE)
+            return false;
+    }
+    return true;
+}
+
+inline bool IsTargetExplicitRequired(uint32 target)
+{
+    switch (target)
+    {
+        case TARGET_NONE:
+        case TARGET_IN_FRONT_OF_CASTER:
+        case TARGET_IN_FRONT_OF_CASTER_30:
+        case TARGET_GO_IN_FRONT_OF_CASTER_90:
+        //case TARGET_AREAEFFECT_INSTANT:
+        //case TARGET_AREAEFFECT_CUSTOM:
+        //case TARGET_INNKEEPER_COORDINATES:
+        //case TARGET_LARGE_FRONTAL_CONE:
+        //case TARGET_LEAP_FORWARD:
+        //case TARGET_NARROW_FRONTAL_CONE:
+        //case TARGET_AREAEFFECT_PARTY_AND_CLASS:
+        //case TARGET_DIRECTLY_FORWARD:
+        //case TARGET_RANDOM_NEARBY_LOC:
+        //case TARGET_RANDOM_CIRCUMFERENCE_POINT:
+        //case TARGET_DEST_RADIUS:
             return false;
+        default:
+            break;
+    }
+    return true;
+}
 
-        if(!targetA && !targetB)
+inline bool IsEffectRequiresTarget(SpellEntry const* spellInfo, SpellEffectIndex i)
+{
+    switch(spellInfo->Effect[i])
+    {
+        case SPELL_EFFECT_NONE:
             return false;
+
+        // this - hack for current mangos operate state with spells
+        case SPELL_EFFECT_DUMMY:
+            break;
+
+        case SPELL_EFFECT_SEND_EVENT:
+        default:
+            return IsTargetExplicitRequired(spellInfo->EffectImplicitTargetA[i]) || IsTargetExplicitRequired(spellInfo->EffectImplicitTargetB[i]);
     }
     return true;
 }
 
+inline bool IsSpellRequiresTarget(SpellEntry const* spellInfo)
+{
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+        if (IsEffectRequiresTarget(spellInfo, SpellEffectIndex(i)))
+            return true;
+    return false;
+}
+
 inline bool IsPointEffectTarget( Targets target )
 {
     switch (target )
@@ -392,18 +505,18 @@ inline bool IsAreaEffectTarget( Targets target )
 
 inline bool IsAreaOfEffectSpell(SpellEntry const *spellInfo)
 {
-    if(IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetA[EFFECT_INDEX_0])) || IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetB[EFFECT_INDEX_0])))
+    if (IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetA[EFFECT_INDEX_0])) || IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetB[EFFECT_INDEX_0])))
         return true;
-    if(IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetA[EFFECT_INDEX_1])) || IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetB[EFFECT_INDEX_1])))
+    if (IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetA[EFFECT_INDEX_1])) || IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetB[EFFECT_INDEX_1])))
         return true;
-    if(IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetA[EFFECT_INDEX_2])) || IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetB[EFFECT_INDEX_2])))
+    if (IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetA[EFFECT_INDEX_2])) || IsAreaEffectTarget(Targets(spellInfo->EffectImplicitTargetB[EFFECT_INDEX_2])))
         return true;
     return false;
 }
 
 inline bool IsAreaAuraEffect(uint32 effect)
 {
-    if( effect == SPELL_EFFECT_APPLY_AREA_AURA_PARTY    ||
+    if ( effect == SPELL_EFFECT_APPLY_AREA_AURA_PARTY    ||
         effect == SPELL_EFFECT_APPLY_AREA_AURA_RAID     ||
         effect == SPELL_EFFECT_APPLY_AREA_AURA_FRIEND   ||
         effect == SPELL_EFFECT_APPLY_AREA_AURA_ENEMY    ||
@@ -437,7 +550,50 @@ inline bool HasAuraWithTriggerEffect(SpellEntry const *spellInfo)
     return false;
 }
 
-inline bool IsDispelSpell(SpellEntry const *spellInfo)
+inline bool HasInterruptSpellEffect(SpellEntry const *spellInfo)
+{
+    for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        switch(spellInfo->Effect[i])
+        {
+            case SPELL_EFFECT_INTERRUPT_CAST:
+                return true;
+            default:
+                break;
+        }
+    }
+    return false;
+}
+
+inline bool IsOnlySelfTargeting(SpellEntry const* spellInfo)
+{
+    for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        if (!spellInfo->Effect[i])
+            return true;
+
+        switch (spellInfo->EffectImplicitTargetA[i])
+        {
+            case TARGET_SELF:
+            case TARGET_SELF2:
+                break;
+            default:
+                return false;
+        }
+        switch (spellInfo->EffectImplicitTargetB[i])
+        {
+            case TARGET_SELF:
+            case TARGET_SELF2:
+            case TARGET_NONE:
+                break;
+            default:
+                return false;
+        }
+    }
+    return true;
+}
+
+inline bool IsDispelSpell(SpellEntry const* spellInfo)
 {
     return IsSpellHaveEffect(spellInfo, SPELL_EFFECT_DISPEL);
 }
@@ -466,11 +622,11 @@ inline bool IsChanneledSpell(SpellEntry const* spellInfo)
 
 inline bool IsNeedCastSpellAtFormApply(SpellEntry const* spellInfo, ShapeshiftForm form)
 {
-    if ((!spellInfo->HasAttribute(SPELL_ATTR_PASSIVE) && !spellInfo->HasAttribute(SPELL_ATTR_UNK7)) || !form)
+    if ((!spellInfo->HasAttribute(SPELL_ATTR_PASSIVE) && !spellInfo->HasAttribute(SPELL_ATTR_HIDDEN_CLIENTSIDE)) || !form)
         return false;
 
     // passive spells with SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT are already active without shapeshift, do no recast!
-    return (spellInfo->Stances & (1<<(form-1)) && !spellInfo->HasAttribute(SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT));
+    return ((spellInfo->Stances & (1<<(form-1))) && !spellInfo->HasAttribute(SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT));
 }
 
 
@@ -481,7 +637,7 @@ inline bool NeedsComboPoints(SpellEntry const* spellInfo)
 
 inline SpellSchoolMask GetSpellSchoolMask(SpellEntry const* spellInfo)
 {
-    return SpellSchoolMask(spellInfo->SchoolMask);
+    return spellInfo ? SpellSchoolMask(spellInfo->GetSchoolMask()) : SPELL_SCHOOL_MASK_NORMAL;
 }
 
 inline uint32 GetSpellMechanicMask(SpellEntry const* spellInfo, uint32 effectMask)
@@ -522,6 +678,27 @@ inline Mechanics GetEffectMechanic(SpellEntry const* spellInfo, SpellEffectIndex
     return MECHANIC_NONE;
 }
 
+inline bool IsBinaryResistedSpell(SpellEntry const* spellInfo)
+{
+    if (!spellInfo)
+        return false;
+
+    if (IsAreaOfEffectSpell(spellInfo) ||
+            spellInfo->HasAttribute(SPELL_ATTR_EX6_EXPLICIT_NO_BINARY_RESIST) ||
+            spellInfo->HasAttribute(SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY) || //???
+            spellInfo->HasAttribute(SPELL_ATTR_EX4_IGNORE_RESISTANCES) ||
+           (spellInfo->GetSchoolMask() & SPELL_SCHOOL_MASK_NORMAL) ||
+            spellInfo->HasAttribute(SPELL_ATTR_EX3_CANT_MISS))
+        return false;
+
+    if (GetAllSpellMechanicMask(spellInfo) != 0
+            || IsDispelSpell(spellInfo)
+            || spellInfo->HasAttribute(SPELL_ATTR_EX_BREAKABLE_BY_ANY_DAMAGE))
+        return true;
+
+    return false;
+}
+
 inline uint32 GetDispellMask(DispelType dispel)
 {
     // If dispell all
@@ -531,13 +708,97 @@ inline uint32 GetDispellMask(DispelType dispel)
         return (1 << dispel);
 }
 
+inline bool IsSpellReduceThreat(SpellEntry const* spellInfo)
+{
+    for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        if (spellInfo->Effect[i] == SPELL_EFFECT_THREAT)
+        {
+            if (spellInfo->CalculateSimpleValue(SpellEffectIndex(i)) < 0)
+                return true;
+            else if (spellInfo->EffectRealPointsPerLevel[i] < 0.0f)
+                return true;
+            else
+                return false;
+        }
+
+        if (spellInfo->Effect[i] != SPELL_EFFECT_APPLY_AURA)
+            continue;
+
+        switch(spellInfo->EffectApplyAuraName[i])
+        {
+            case SPELL_AURA_MOD_TOTAL_THREAT:
+            case SPELL_AURA_MOD_THREAT:
+            case SPELL_AURA_MOD_CRITICAL_THREAT:
+                if (spellInfo->CalculateSimpleValue(SpellEffectIndex(i)) < 0)
+                    return true;
+                break;
+            default:
+                break;
+        }
+    }
+    return false;
+}
+
+inline bool IsSpellIncreaseThreat(SpellEntry const* spellInfo)
+{
+    for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        switch(spellInfo->Effect[i])
+        {
+            case SPELL_EFFECT_THREAT:
+            case SPELL_EFFECT_THREAT_ALL:
+                return true;
+            default:
+                break;
+        }
+
+        if (spellInfo->Effect[i] != SPELL_EFFECT_APPLY_AURA)
+            continue;
+
+        switch(spellInfo->EffectApplyAuraName[i])
+        {
+            case SPELL_AURA_MOD_TOTAL_THREAT:
+            case SPELL_AURA_MOD_THREAT:
+            case SPELL_AURA_MOD_CRITICAL_THREAT:
+                if (spellInfo->CalculateSimpleValue(SpellEffectIndex(i)) > 0)
+                    return true;
+                break;
+            default:
+                break;
+        }
+    }
+    return false;
+}
+
+inline bool IsSpellAllowDeadTarget(SpellEntry const* spellInfo)
+{
+    return spellInfo ? spellInfo->HasAttribute(SPELL_ATTR_EX2_ALLOW_DEAD_TARGET) : false;
+}
+
+bool IsSpellAffectedBySpellMods(SpellEntry const* spellInfo);
+
+enum SpellPreferredTargetType
+{
+    SPELL_PREFERRED_TARGET_VICTIM,
+    SPELL_PREFERRED_TARGET_SELF,
+    SPELL_PREFERRED_TARGET_ENEMY,
+    SPELL_PREFERRED_TARGET_FRIEND,
+    SPELL_PREFERRED_TARGET_AREA,
+    SPELL_PREFERRED_TARGET_OWNER,
+    SPELL_PREFERRED_TARGET_RANDOM,
+    SPELL_PREFERRED_TARGET_MAX,
+};
+
+SpellPreferredTargetType GetPreferredTargetForSpell(SpellEntry const* spellInfo);
+
 // Diminishing Returns interaction with spells
 DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto, bool triggered);
 bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group);
 DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group);
 int32 GetDiminishingReturnsLimitDuration(DiminishingGroup group, SpellEntry const* spellproto);
 
-SpellEntry const* GetSpellEntryByDifficulty(uint32 id, Difficulty difficulty, bool isRaid);
+MANGOS_DLL_SPEC SpellEntry const* GetSpellEntryByDifficulty(uint32 id, Difficulty difficulty, bool isRaid);
 
 // Spell proc event related declarations (accessed using SpellMgr functions)
 enum ProcFlags
@@ -578,7 +839,13 @@ enum ProcFlags
     PROC_FLAG_ON_TRAP_ACTIVATION            = 0x00200000,   // 21 On trap activation
 
     PROC_FLAG_TAKEN_OFFHAND_HIT             = 0x00400000,   // 22 Taken off-hand melee attacks(not used)
-    PROC_FLAG_SUCCESSFUL_OFFHAND_HIT        = 0x00800000    // 23 Successful off-hand melee attacks
+    PROC_FLAG_SUCCESSFUL_OFFHAND_HIT        = 0x00800000,   // 23 Successful off-hand melee attacks
+
+    PROC_FLAG_ON_DEATH                      = 0x01000000,   // 24 On caster's death
+
+    // Custom proc flag system (must be used for write proc-like effects over procsystem)
+    PROC_FLAG_ON_AURA_APPLY                 = 0x04000000,   // 26 On apply aura (require SpellClassMask and custom proc ex flags)
+    PROC_FLAG_ON_AURA_FADE                  = 0x08000000,   // 27 On fade aura  (require SpellClassMask and custom proc ex flags)
 };
 
 #define MELEE_BASED_TRIGGER_MASK (PROC_FLAG_SUCCESSFUL_MELEE_HIT        | \
@@ -603,6 +870,15 @@ enum ProcFlags
                                  PROC_FLAG_SUCCESSFUL_AOE_SPELL_HIT      | \
                                  PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL     | \
                                  PROC_FLAG_SUCCESSFUL_NEGATIVE_SPELL_HIT)
+
+#define DAMAGE_OR_HIT_TRIGGER_MASK (PROC_FLAG_TAKEN_MELEE_HIT | \
+                                    PROC_FLAG_TAKEN_MELEE_SPELL_HIT | \
+                                    PROC_FLAG_TAKEN_RANGED_HIT | \
+                                    PROC_FLAG_TAKEN_AOE_SPELL_HIT | \
+                                    PROC_FLAG_TAKEN_NEGATIVE_SPELL_HIT | \
+                                    PROC_FLAG_TAKEN_ANY_DAMAGE | \
+                                    PROC_FLAG_ON_TRAP_ACTIVATION)
+
 enum ProcFlagsEx
 {
     PROC_EX_NONE                = 0x0000000,                // If none can tigger on Hit/Crit only (passive spells MUST defined by SpellFamily flag)
@@ -625,7 +901,14 @@ enum ProcFlagsEx
     PROC_EX_EX_TRIGGER_ALWAYS   = 0x0010000,                // If set trigger always ( no matter another flags) used for drop charges
     PROC_EX_EX_ONE_TIME_TRIGGER = 0x0020000,                // If set trigger always but only one time (not used)
     PROC_EX_PERIODIC_POSITIVE   = 0x0040000,                // For periodic heal
-    PROC_EX_CAST_END            = 0x0080000                 // procs on end of cast
+    PROC_EX_CAST_END            = 0x0080000,                // procs on end of cast
+
+    // Custom proc ex flag system
+    PROC_EX_DIRECT_DAMAGE       = 0x0100000,                // do not proc from absorbed damage
+    PROC_EX_SHIELD_BREAK        = 0x0200000,                // proc at remove aura by shield break
+    PROC_EX_DISPEL              = 0x0400000,                // proc at remove aura by dispel
+    PROC_EX_EXPIRE              = 0x0800000,                // proc at remove aura by expire
+    PROC_EX_IGNORE_CC           = 0x1000000,                // proc result ignore possible CC limitations
 };
 
 struct SpellProcEventEntry
@@ -679,35 +962,57 @@ enum SpellTargetType
 
 #define MAX_SPELL_TARGET_TYPE 3
 
+// pre-defined targeting for spells
 struct SpellTargetEntry
 {
-    SpellTargetEntry(SpellTargetType type_,uint32 targetEntry_) : type(type_), targetEntry(targetEntry_) {}
-    SpellTargetType type;
+    uint32 spellId;
+    uint32 type;
     uint32 targetEntry;
+    uint32 inverseEffectMask;
+
+    bool CanNotHitWithSpellEffect(SpellEffectIndex effect) const { return inverseEffectMask & (1 << effect); }
 };
 
-typedef std::multimap<uint32,SpellTargetEntry> SpellScriptTarget;
-typedef std::pair<SpellScriptTarget::const_iterator,SpellScriptTarget::const_iterator> SpellScriptTargetBounds;
+typedef UNORDERED_MAP<uint32, WorldLocation> SpellTargetPositionMap;
 
-// coordinates for spells (accessed using SpellMgr functions)
-struct SpellTargetPosition
+// Spell linked types
+enum SpellLinkedType
 {
-    uint32 target_mapId;
-    float  target_X;
-    float  target_Y;
-    float  target_Z;
-    float  target_Orientation;
+    SPELL_LINKED_TYPE_NONE              = 0,
+    SPELL_LINKED_TYPE_BOOST             = 1,
+    SPELL_LINKED_TYPE_BOOSTFORWARD      = 2,
+    SPELL_LINKED_TYPE_PRECAST           = 3,
+    SPELL_LINKED_TYPE_TRIGGERED         = 4,
+    SPELL_LINKED_TYPE_PROC              = 5,
+    SPELL_LINKED_TYPE_REMOVEONCAST      = 6,
+    SPELL_LINKED_TYPE_REMOVEONREMOVE    = 7,
+    SPELL_LINKED_TYPE_CASTONREMOVE      = 8,
+    SPELL_LINKED_TYPE_SCRIPTEFFECT      = 9,
+    SPELL_LINKED_TYPE_DUMMYEFFECT       = 10,
+    SPELL_LINKED_TYPE_NOT_TRIGGERED     = 11,
+    SPELL_LINKED_TYPE_MAX,
 };
 
-typedef UNORDERED_MAP<uint32, SpellTargetPosition> SpellTargetPositionMap;
+struct SpellLinkedEntry
+{
+    uint32 spellId;
+    uint32 linkedId;
+    SpellLinkedType type;
+    uint32 effectMask;
+};
+
+typedef UNORDERED_MULTIMAP<uint32, SpellLinkedEntry>  SpellLinkedMap;
+typedef std::pair<SpellLinkedMap::const_iterator,SpellLinkedMap::const_iterator> SpellLinkedMapBounds;
+typedef UNORDERED_SET<uint32>  SpellLinkedSet;
 
 // Spell pet auras
 class PetAura
 {
     public:
-        PetAura()
+        PetAura() :
+            removeOnChangePet(false),
+            damage(0)
         {
-            auras.clear();
         }
 
         PetAura(uint32 petEntry, uint32 aura, bool _removeOnChangePet, int _damage) :
@@ -719,12 +1024,12 @@ class PetAura
         uint32 GetAura(uint32 petEntry) const
         {
             std::map<uint32, uint32>::const_iterator itr = auras.find(petEntry);
-            if(itr != auras.end())
+            if (itr != auras.end())
                 return itr->second;
             else
             {
                 std::map<uint32, uint32>::const_iterator itr2 = auras.find(0);
-                if(itr2 != auras.end())
+                if (itr2 != auras.end())
                     return itr2->second;
                 else
                     return 0;
@@ -752,6 +1057,8 @@ class PetAura
         int32 damage;
 };
 typedef std::map<uint32, PetAura> SpellPetAuraMap;
+typedef std::vector<PetAura> PetPassiveAuraList;
+typedef std::map<uint32, PetPassiveAuraList> SpellPetPassiveAuraMap;
 
 struct SpellArea
 {
@@ -759,6 +1066,7 @@ struct SpellArea
     uint32 areaId;                                          // zone/subzone/or 0 is not limited to zone
     uint32 questStart;                                      // quest start (quest must be active or rewarded for spell apply)
     uint32 questEnd;                                        // quest end (quest don't must be rewarded for spell apply)
+    uint16 conditionId;                                     // conditionId - will replace questStart, questEnd, raceMask, gender and questStartCanActive
     int32  auraSpell;                                       // spell aura must be applied for spell apply )if possitive) and it don't must be applied in other case
     uint32 raceMask;                                        // can be applied only to races
     Gender gender;                                          // can be applied only to gender
@@ -767,14 +1075,13 @@ struct SpellArea
 
     // helpers
     bool IsFitToRequirements(Player const* player, uint32 newZone, uint32 newArea) const;
+    void ApplyOrRemoveSpellIfCan(Player* player, uint32 newZone, uint32 newArea, bool onlyApply) const;
 };
 
-typedef std::multimap<uint32,SpellArea> SpellAreaMap;
-typedef std::multimap<uint32,SpellArea const*> SpellAreaForQuestMap;
-typedef std::multimap<uint32,SpellArea const*> SpellAreaForAuraMap;
-typedef std::multimap<uint32,SpellArea const*> SpellAreaForAreaMap;
-typedef std::pair<SpellAreaMap::const_iterator,SpellAreaMap::const_iterator> SpellAreaMapBounds;
-typedef std::pair<SpellAreaForQuestMap::const_iterator,SpellAreaForQuestMap::const_iterator> SpellAreaForQuestMapBounds;
+typedef UNORDERED_MULTIMAP<uint32 /*applySpellId*/, SpellArea> SpellAreaMap;
+typedef UNORDERED_MULTIMAP<uint32 /*auraSpellId*/, SpellArea const*> SpellAreaForAuraMap;
+typedef UNORDERED_MULTIMAP<uint32 /*areaOrZoneId*/, SpellArea const*> SpellAreaForAreaMap;
+typedef std::pair<SpellAreaMap::const_iterator, SpellAreaMap::const_iterator> SpellAreaMapBounds;
 typedef std::pair<SpellAreaForAuraMap::const_iterator, SpellAreaForAuraMap::const_iterator>  SpellAreaForAuraMapBounds;
 typedef std::pair<SpellAreaForAreaMap::const_iterator, SpellAreaForAreaMap::const_iterator>  SpellAreaForAreaMapBounds;
 
@@ -800,7 +1107,7 @@ struct SpellLearnSkillNode
     uint16 maxvalue;                                        // 0  - max skill value for player level
 };
 
-typedef std::map<uint32, SpellLearnSkillNode> SpellLearnSkillMap;
+typedef UNORDERED_MAP<uint32, SpellLearnSkillNode> SpellLearnSkillMap;
 
 struct SpellLearnSpellNode
 {
@@ -809,38 +1116,68 @@ struct SpellLearnSpellNode
     bool autoLearned;
 };
 
-typedef std::multimap<uint32, SpellLearnSpellNode> SpellLearnSpellMap;
+typedef UNORDERED_MULTIMAP<uint32, SpellLearnSpellNode> SpellLearnSpellMap;
 typedef std::pair<SpellLearnSpellMap::const_iterator,SpellLearnSpellMap::const_iterator> SpellLearnSpellMapBounds;
 
-typedef std::multimap<uint32, SkillLineAbilityEntry const*> SkillLineAbilityMap;
+typedef UNORDERED_MULTIMAP<uint32, SkillLineAbilityEntry const*> SkillLineAbilityMap;
 typedef std::pair<SkillLineAbilityMap::const_iterator,SkillLineAbilityMap::const_iterator> SkillLineAbilityMapBounds;
 
-typedef std::multimap<uint32, SkillRaceClassInfoEntry const*> SkillRaceClassInfoMap;
+typedef UNORDERED_MULTIMAP<uint32, SkillRaceClassInfoEntry const*> SkillRaceClassInfoMap;
 typedef std::pair<SkillRaceClassInfoMap::const_iterator,SkillRaceClassInfoMap::const_iterator> SkillRaceClassInfoMapBounds;
 
+struct SkillDiscoveryEntry
+{
+    uint32  spellId;                                        // discavered spell
+    uint32  reqSkillValue;                                  // skill level limitation
+    float   chance;                                         // chance
+
+    SkillDiscoveryEntry()
+        : spellId(0), reqSkillValue(0), chance(0) {}
+
+    SkillDiscoveryEntry(uint32 _spellId, uint32 req_skill_val, float _chance)
+        : spellId(_spellId), reqSkillValue(req_skill_val), chance(_chance) {}
+};
+
+typedef std::list<SkillDiscoveryEntry> SkillDiscoveryList;
+typedef UNORDERED_MAP<int32, SkillDiscoveryList> SkillDiscoveryMap;
+
+// struct to store information about extra item creation
+// one entry for every spell that is able to create an extra item
+struct SkillExtraItemEntry
+{
+    // the spell id of the specialization required to create extra items
+    uint32 requiredSpecialization;
+    // the chance to create one additional item
+    float additionalCreateChance;
+    // maximum number of extra items created per crafting
+    uint8 additionalMaxNum;
+
+    SkillExtraItemEntry()
+        : requiredSpecialization(0), additionalCreateChance(0.0f), additionalMaxNum(0) {}
+
+    SkillExtraItemEntry(uint32 rS, float aCC, uint8 aMN)
+        : requiredSpecialization(rS), additionalCreateChance(aCC), additionalMaxNum(aMN) {}
+};
+
+// map to store the extra item creation info, the key is the spellId of the creation spell, the mapped value is the assigned SkillExtraItemEntry
+typedef std::map<uint32,SkillExtraItemEntry> SkillExtraItemMap;
+
 typedef std::multimap<uint32, uint32> PetLevelupSpellSet;
-typedef std::map<uint32, PetLevelupSpellSet> PetLevelupSpellMap;
+typedef UNORDERED_MAP<uint32, PetLevelupSpellSet> PetLevelupSpellMap;
 
 struct PetDefaultSpellsEntry
 {
+    explicit PetDefaultSpellsEntry()
+    {
+        memset(spellid, 0, MAX_CREATURE_SPELL_DATA_SLOT * sizeof(uint32));
+    }
     uint32 spellid[MAX_CREATURE_SPELL_DATA_SLOT];
 };
 
 // < 0 for petspelldata id, > 0 for creature_id
 typedef std::map<int32, PetDefaultSpellsEntry> PetDefaultSpellsMap;
 
-
-inline bool IsPrimaryProfessionSkill(uint32 skill)
-{
-    SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(skill);
-    if(!pSkill)
-        return false;
-
-    if(pSkill->categoryId != SKILL_CATEGORY_PROFESSION)
-        return false;
-
-    return true;
-}
+bool IsPrimaryProfessionSkill(uint32 skill);
 
 inline bool IsProfessionSkill(uint32 skill)
 {
@@ -871,7 +1208,7 @@ class SpellMgr
         uint32 GetSpellElixirMask(uint32 spellid) const
         {
             SpellElixirMap::const_iterator itr = mSpellElixirs.find(spellid);
-            if(itr==mSpellElixirs.end())
+            if (itr==mSpellElixirs.end())
                 return 0x0;
 
             return itr->second;
@@ -882,11 +1219,11 @@ class SpellMgr
             uint32 mask = GetSpellElixirMask(spellid);
             if((mask & ELIXIR_FLASK_MASK)==ELIXIR_FLASK_MASK)
                 return SPELL_FLASK_ELIXIR;
-            else if(mask & ELIXIR_BATTLE_MASK)
+            else if (mask & ELIXIR_BATTLE_MASK)
                 return SPELL_BATTLE_ELIXIR;
-            else if(mask & ELIXIR_GUARDIAN_MASK)
+            else if (mask & ELIXIR_GUARDIAN_MASK)
                 return SPELL_GUARDIAN_ELIXIR;
-            else if(mask & ELIXIR_WELL_FED)
+            else if (mask & ELIXIR_WELL_FED)
                 return SPELL_WELL_FED;
             else
                 return SPELL_NORMAL;
@@ -916,7 +1253,7 @@ class SpellMgr
         SpellProcEventEntry const* GetSpellProcEvent(uint32 spellId) const
         {
             SpellProcEventMap::const_iterator itr = mSpellProcEventMap.find(spellId);
-            if( itr != mSpellProcEventMap.end( ) )
+            if ( itr != mSpellProcEventMap.end( ) )
                 return &itr->second;
             return NULL;
         }
@@ -925,7 +1262,7 @@ class SpellMgr
         float GetItemEnchantProcChance(uint32 spellid) const
         {
             SpellProcItemEnchantMap::const_iterator itr = mSpellProcItemEnchantMap.find(spellid);
-            if(itr==mSpellProcItemEnchantMap.end())
+            if (itr==mSpellProcItemEnchantMap.end())
                 return 0.0f;
 
             return itr->second;
@@ -938,17 +1275,17 @@ class SpellMgr
         {
             // Lookup data
             SpellBonusMap::const_iterator itr = mSpellBonusMap.find(spellId);
-            if( itr != mSpellBonusMap.end( ) )
+            if ( itr != mSpellBonusMap.end( ) )
                 return &itr->second;
 
             return NULL;
         }
 
         // Spell target coordinates
-        SpellTargetPosition const* GetSpellTargetPosition(uint32 spell_id) const
+        WorldLocation const* GetSpellTargetPosition(uint32 spell_id) const
         {
             SpellTargetPositionMap::const_iterator itr = mSpellTargetPositions.find( spell_id );
-            if( itr != mSpellTargetPositions.end( ) )
+            if ( itr != mSpellTargetPositions.end( ) )
                 return &itr->second;
             return NULL;
         }
@@ -957,7 +1294,7 @@ class SpellMgr
         SpellChainNode const* GetSpellChainNode(uint32 spell_id) const
         {
             SpellChainMap::const_iterator itr = mSpellChains.find(spell_id);
-            if(itr == mSpellChains.end())
+            if (itr == mSpellChains.end())
                 return NULL;
 
             return &itr->second;
@@ -965,7 +1302,7 @@ class SpellMgr
 
         uint32 GetFirstSpellInChain(uint32 spell_id) const
         {
-            if(SpellChainNode const* node = GetSpellChainNode(spell_id))
+            if (SpellChainNode const* node = GetSpellChainNode(spell_id))
                 return node->first;
 
             return spell_id;
@@ -973,7 +1310,7 @@ class SpellMgr
 
         uint32 GetPrevSpellInChain(uint32 spell_id) const
         {
-            if(SpellChainNode const* node = GetSpellChainNode(spell_id))
+            if (SpellChainNode const* node = GetSpellChainNode(spell_id))
                 return node->prev;
 
             return 0;
@@ -996,7 +1333,7 @@ class SpellMgr
         // Use IsHighRankOfSpell instead
         uint8 GetSpellRank(uint32 spell_id) const
         {
-            if(SpellChainNode const* node = GetSpellChainNode(spell_id))
+            if (SpellChainNode const* node = GetSpellChainNode(spell_id))
                 return node->rank;
 
             return 0;
@@ -1009,12 +1346,12 @@ class SpellMgr
             uint32 rank2 = GetSpellRank(spell2);
 
             // not ordered correctly by rank value
-            if(itr == mSpellChains.end() || !rank2 || itr->second.rank <= rank2)
+            if (itr == mSpellChains.end() || !rank2 || itr->second.rank <= rank2)
                 return false;
 
             // check present in same rank chain
             for(; itr != mSpellChains.end(); itr = mSpellChains.find(itr->second.prev))
-                if(itr->second.prev==spell2)
+                if (itr->second.prev==spell2)
                     return true;
 
             return false;
@@ -1028,13 +1365,21 @@ class SpellMgr
             return !canStackSpellRanksInSpellBook(spellInfo) && GetSpellRank(spellInfo->Id) != 0;
         }
 
+        static bool IsGroupBuff(SpellEntry const *spellInfo);
+        static bool IsStackableSpellAuraHolder(SpellEntry const *spellInfo);
+        static bool IsTargetMatchedWithCreatureType(SpellEntry const* spellInfo, Unit* pTarget);
+        static bool IsReflectableSpell(SpellEntry const* spellInfo);
+        static uint32 GetSpellMaxTargetsWithCustom(SpellEntry const* spellInfo, Unit const* caster);
+        static float GetSpellRadiusWithCustom(SpellEntry const* spellInfo, Unit const* caster, SpellEffectIndex effIndex);
+        static uint32 GetSpellTargetsForChainWithCustom(SpellEntry const* spellInfo, Unit const* caster, SpellEffectIndex effIndex);
+
         SpellEntry const* SelectAuraRankForLevel(SpellEntry const* spellInfo, uint32 Level) const;
 
         // Spell learning
         SpellLearnSkillNode const* GetSpellLearnSkill(uint32 spell_id) const
         {
             SpellLearnSkillMap::const_iterator itr = mSpellLearnSkills.find(spell_id);
-            if(itr != mSpellLearnSkills.end())
+            if (itr != mSpellLearnSkills.end())
                 return &itr->second;
             else
                 return NULL;
@@ -1067,13 +1412,6 @@ class SpellMgr
 
         bool IsSkillBonusSpell(uint32 spellId) const;
 
-
-        // Spell script targets
-        SpellScriptTargetBounds GetSpellScriptTargetBounds(uint32 spell_id) const
-        {
-            return mSpellScriptTarget.equal_range(spell_id);
-        }
-
         // Spell correctness for client using
         static bool IsSpellValid(SpellEntry const * spellInfo, Player* pl = NULL, bool msg = true);
 
@@ -1090,7 +1428,16 @@ class SpellMgr
         PetAura const* GetPetAura(uint32 spell_id, SpellEffectIndex eff)
         {
             SpellPetAuraMap::const_iterator itr = mSpellPetAuraMap.find((spell_id<<8) + eff);
-            if(itr != mSpellPetAuraMap.end())
+            if (itr != mSpellPetAuraMap.end())
+                return &itr->second;
+            else
+                return NULL;
+        }
+
+        PetPassiveAuraList const* GetPetPassiveAuraList(uint32 creature_id)
+        {
+            SpellPetPassiveAuraMap::const_iterator itr = mSpellPetPassiveAuraMap.find(creature_id);
+            if (itr != mSpellPetPassiveAuraMap.end())
                 return &itr->second;
             else
                 return NULL;
@@ -1099,7 +1446,7 @@ class SpellMgr
         PetLevelupSpellSet const* GetPetLevelupSpellList(uint32 petFamily) const
         {
             PetLevelupSpellMap::const_iterator itr = mPetLevelupSpellMap.find(petFamily);
-            if(itr != mPetLevelupSpellMap.end())
+            if (itr != mPetLevelupSpellMap.end())
                 return &itr->second;
             else
                 return NULL;
@@ -1109,7 +1456,7 @@ class SpellMgr
         PetDefaultSpellsEntry const* GetPetDefaultSpellsEntry(int32 id) const
         {
             PetDefaultSpellsMap::const_iterator itr = mPetDefaultSpellsMap.find(id);
-            if(itr != mPetDefaultSpellsMap.end())
+            if (itr != mPetDefaultSpellsMap.end())
                 return &itr->second;
             return NULL;
         }
@@ -1121,19 +1468,6 @@ class SpellMgr
             return mSpellAreaMap.equal_range(spell_id);
         }
 
-        SpellAreaForQuestMapBounds GetSpellAreaForQuestMapBounds(uint32 quest_id, bool active) const
-        {
-            if (active)
-                return mSpellAreaForActiveQuestMap.equal_range(quest_id);
-            else
-                return mSpellAreaForQuestMap.equal_range(quest_id);
-        }
-
-        SpellAreaForQuestMapBounds GetSpellAreaForQuestEndMapBounds(uint32 quest_id) const
-        {
-            return mSpellAreaForQuestEndMap.equal_range(quest_id);
-        }
-
         SpellAreaForAuraMapBounds GetSpellAreaForAuraMapBounds(uint32 spell_id) const
         {
             return mSpellAreaForAuraMap.equal_range(spell_id);
@@ -1144,6 +1478,20 @@ class SpellMgr
             return mSpellAreaForAreaMap.equal_range(area_id);
         }
 
+        SpellLinkedMapBounds GetSpellLinkedMapBounds(uint32 spell_id) const
+        {
+            return mSpellLinkedMap.equal_range(spell_id);
+        }
+
+        SpellLinkedSet GetSpellLinked(uint32 spell_id, SpellLinkedType type) const;
+
+        uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player);
+        uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player);
+
+        void LoadSkillExtraItemTable();
+        // returns true and sets the appropriate info if the player can create extra items with the given spellId
+        bool CanCreateExtraItems(Player* player, uint32 spellId, float &additionalChance, uint8 &additionalMax);
+
     // Modifiers
     public:
         static SpellMgr& Instance();
@@ -1159,6 +1507,7 @@ class SpellMgr
         void LoadSpellProcEvents();
         void LoadSpellProcItemEnchant();
         void LoadSpellBonuses();
+        void LoadSpellLinked();
         void LoadSpellTargetPositions();
         void LoadSpellThreats();
         void LoadSkillLineAbilityMap();
@@ -1167,11 +1516,12 @@ class SpellMgr
         void LoadPetLevelupSpellMap();
         void LoadPetDefaultSpells();
         void LoadSpellAreas();
+        void LoadSkillDiscoveryTable();
+        void LoadSpellDbc();
 
     private:
         bool LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefaultSpellsEntry& petDefSpells);
 
-        SpellScriptTarget  mSpellScriptTarget;
         SpellChainMap      mSpellChains;
         SpellChainMapNext  mSpellChainsNext;
         SpellLearnSkillMap mSpellLearnSkills;
@@ -1182,17 +1532,18 @@ class SpellMgr
         SpellProcEventMap  mSpellProcEventMap;
         SpellProcItemEnchantMap mSpellProcItemEnchantMap;
         SpellBonusMap      mSpellBonusMap;
+        SpellLinkedMap     mSpellLinkedMap;
         SkillLineAbilityMap mSkillLineAbilityMap;
         SkillRaceClassInfoMap mSkillRaceClassInfoMap;
         SpellPetAuraMap     mSpellPetAuraMap;
+        SpellPetPassiveAuraMap     mSpellPetPassiveAuraMap;
         PetLevelupSpellMap  mPetLevelupSpellMap;
         PetDefaultSpellsMap mPetDefaultSpellsMap;           // only spells not listed in related mPetLevelupSpellMap entry
         SpellAreaMap         mSpellAreaMap;
-        SpellAreaForQuestMap mSpellAreaForQuestMap;
-        SpellAreaForQuestMap mSpellAreaForActiveQuestMap;
-        SpellAreaForQuestMap mSpellAreaForQuestEndMap;
         SpellAreaForAuraMap  mSpellAreaForAuraMap;
         SpellAreaForAreaMap  mSpellAreaForAreaMap;
+        SkillDiscoveryMap    mSkillDiscoveryStore;
+        SkillExtraItemMap    mSkillExtraItemStore;
 };
 
 #define sSpellMgr SpellMgr::Instance()
diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp
index 2aacac482a2..7020e54a709 100644
--- a/src/game/StatSystem.cpp
+++ b/src/game/StatSystem.cpp
@@ -18,11 +18,30 @@
 
 #include "Unit.h"
 #include "Player.h"
+#include "ObjectMgr.h"
 #include "Pet.h"
 #include "Creature.h"
 #include "SharedDefines.h"
 #include "SpellAuras.h"
 
+/*#######################################
+########                         ########
+########     UNIT STAT SYSTEM    ########
+########                         ########
+#######################################*/
+
+void Unit::UpdateAllResistances()
+{
+    for (uint32 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
+        UpdateResistances(i);
+}
+
+void Unit::UpdateAllMaxPower()
+{
+    for (uint32 i = POWER_MANA; i < MAX_POWERS; ++i)
+        UpdateMaxPower(Powers(i));
+}
+
 /*#######################################
 ########                         ########
 ########   PLAYERS STAT SYSTEM   ########
@@ -39,14 +58,10 @@ bool Player::UpdateStats(Stats stat)
 
     SetStat(stat, int32(value));
 
-    if(stat == STAT_STAMINA || stat == STAT_INTELLECT)
-    {
-        Pet *pet = GetPet();
-        if(pet)
-            pet->UpdateStats(stat);
-    }
+    if (IsInWorld())
+        CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_STAT, stat, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
 
-    switch(stat)
+    switch (stat)
     {
         case STAT_STRENGTH:
             UpdateShieldBlockValue();
@@ -56,19 +71,20 @@ bool Player::UpdateStats(Stats stat)
             UpdateAllCritPercentages();
             UpdateDodgePercentage();
             break;
-        case STAT_STAMINA:   UpdateMaxHealth(); break;
+        case STAT_STAMINA:
+            UpdateMaxHealth();
+            break;
         case STAT_INTELLECT:
             UpdateMaxPower(POWER_MANA);
             UpdateAllSpellCritChances();
             UpdateArmor();                                  //SPELL_AURA_MOD_RESISTANCE_OF_INTELLECT_PERCENT, only armor currently
             break;
-
         case STAT_SPIRIT:
             break;
-
         default:
             break;
     }
+
     // Need update (exist AP from stat auras)
     UpdateAttackPowerAndDamage();
     UpdateAttackPowerAndDamage(true);
@@ -79,26 +95,38 @@ bool Player::UpdateStats(Stats stat)
     // Update ratings in exist SPELL_AURA_MOD_RATING_FROM_STAT and only depends from stat
     uint32 mask = 0;
     AuraList const& modRatingFromStat = GetAurasByType(SPELL_AURA_MOD_RATING_FROM_STAT);
-    for(AuraList::const_iterator i = modRatingFromStat.begin();i != modRatingFromStat.end(); ++i)
-        if (Stats((*i)->GetMiscBValue()) == stat)
+    for (AuraList::const_iterator i = modRatingFromStat.begin(); i != modRatingFromStat.end(); ++i)
+    {
+        if (Stats((*i)->GetMiscValueB()) == stat)
             mask |= (*i)->GetMiscValue();
+    }
+
     if (mask)
     {
         for (uint32 rating = 0; rating < MAX_COMBAT_RATING; ++rating)
+        {
             if (mask & (1 << rating))
                 ApplyRatingMod(CombatRating(rating), 0, true);
+        }
     }
+
     return true;
 }
 
 void Player::ApplySpellPowerBonus(int32 amount, bool apply)
 {
-    m_baseSpellPower+=apply?amount:-amount;
+    m_baseSpellPower += apply ? amount : -amount;
 
     // For speed just update for client
     ApplyModUInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS, amount, apply);
-    for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
-        ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+i, amount, apply);;
+    for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
+        ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + i, amount, apply);
+
+    if (IsInWorld())
+    {
+        CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_ATTACKPOWER, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
+        CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_SPELLDAMAGE, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
+    }
 }
 
 void Player::UpdateSpellDamageAndHealingBonus()
@@ -108,8 +136,12 @@ void Player::UpdateSpellDamageAndHealingBonus()
     // Get healing bonus for all schools
     SetStatInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS, SpellBaseHealingBonusDone(SPELL_SCHOOL_MASK_ALL));
     // Get damage bonus for all schools
-    for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
-        SetStatInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+i, SpellBaseDamageBonusDone(SpellSchoolMask(1 << i)));
+    // PLAYER_FIELD_MOD_DAMAGE_DONE_NEG field handled in Aura::HandleModDamageDone
+    for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
+        SetStatInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + i, SpellBaseDamageBonusDone(SpellSchoolMask(1 << i)) - GetInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + i));
+
+    CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_ATTACKPOWER, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
+    CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_SPELLDAMAGE, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
 }
 
 bool Player::UpdateAllStats()
@@ -117,7 +149,7 @@ bool Player::UpdateAllStats()
     for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
     {
         float value = GetTotalStatValue(Stats(i));
-        SetStat(Stats(i), (int32)value);
+        SetStat(Stats(i), int32(value));
     }
 
     UpdateArmor();
@@ -125,9 +157,7 @@ bool Player::UpdateAllStats()
     UpdateAttackPowerAndDamage(true);
     UpdateMaxHealth();
 
-    for(int i = POWER_MANA; i < MAX_POWERS; ++i)
-        UpdateMaxPower(Powers(i));
-
+    UpdateAllMaxPower();
     UpdateAllRatings();
     UpdateAllCritPercentages();
     UpdateAllSpellCritChances();
@@ -138,25 +168,22 @@ bool Player::UpdateAllStats()
     UpdateManaRegen();
     UpdateExpertise(BASE_ATTACK);
     UpdateExpertise(OFF_ATTACK);
-    for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
-        UpdateResistances(i);
+    UpdateAllResistances();
 
     return true;
 }
 
 void Player::UpdateResistances(uint32 school)
 {
-    if(school > SPELL_SCHOOL_NORMAL)
+    if (school > SPELL_SCHOOL_NORMAL)
     {
-        float value  = GetTotalAuraModValue(UnitMods(UNIT_MOD_RESISTANCE_START + school));
+        float value = GetTotalAuraModValue(UnitMods(UNIT_MOD_RESISTANCE_START + school));
         SetResistance(SpellSchools(school), int32(value));
-
-        Pet *pet = GetPet();
-        if(pet)
-            pet->UpdateResistances(school);
     }
     else
         UpdateArmor();
+
+    CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_RESISTANCE, school, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
 }
 
 void Player::UpdateArmor()
@@ -169,23 +196,19 @@ void Player::UpdateArmor()
     value += GetStat(STAT_AGILITY) * 2.0f;                  // armor bonus from stats
     value += GetModifierValue(unitMod, TOTAL_VALUE);
 
-    //add dynamic flat mods
+    // add dynamic flat mods
     AuraList const& mResbyIntellect = GetAurasByType(SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT);
-    for(AuraList::const_iterator i = mResbyIntellect.begin();i != mResbyIntellect.end(); ++i)
+    for (AuraList::const_iterator i = mResbyIntellect.begin();i != mResbyIntellect.end(); ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
+        Modifier const* mod = (*i)->GetModifier();
         if(mod->m_miscvalue & SPELL_SCHOOL_MASK_NORMAL)
-            value += int32(GetStat(Stats((*i)->GetMiscBValue())) * mod->m_amount / 100.0f);
+            value += int32(GetStat(Stats((*i)->GetMiscValueB())) * mod->m_amount / 100.0f);
     }
 
     value *= GetModifierValue(unitMod, TOTAL_PCT);
 
     SetArmor(int32(value));
 
-    Pet *pet = GetPet();
-    if(pet)
-        pet->UpdateArmor();
-
     UpdateAttackPowerAndDamage();                           // armor dependent auras update for SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR
 }
 
@@ -193,20 +216,20 @@ float Player::GetHealthBonusFromStamina()
 {
     float stamina = GetStat(STAT_STAMINA);
 
-    float baseStam = stamina < 20 ? stamina : 20;
+    float baseStam = stamina < 20.0f ? stamina : 20.0f;
     float moreStam = stamina - baseStam;
 
-    return baseStam + (moreStam*10.0f);
+    return baseStam + (moreStam * 10.0f);
 }
 
 float Player::GetManaBonusFromIntellect()
 {
     float intellect = GetStat(STAT_INTELLECT);
 
-    float baseInt = intellect < 20 ? intellect : 20;
+    float baseInt = intellect < 20.0f ? intellect : 20.0f;
     float moreInt = intellect - baseInt;
 
-    return baseInt + (moreInt*15.0f);
+    return baseInt + (moreInt * 15.0f);
 }
 
 void Player::UpdateMaxHealth()
@@ -240,11 +263,11 @@ void Player::UpdateMaxPower(Powers power)
 
 void Player::ApplyFeralAPBonus(int32 amount, bool apply)
 {
-    m_baseFeralAP+= apply ? amount:-amount;
+    m_baseFeralAP += apply ? amount : -amount;
     UpdateAttackPowerAndDamage();
 }
 
-void Player::UpdateAttackPowerAndDamage(bool ranged )
+void Player::UpdateAttackPowerAndDamage(bool ranged)
 {
     float val2 = 0.0f;
     float level = float(getLevel());
@@ -255,48 +278,60 @@ void Player::UpdateAttackPowerAndDamage(bool ranged )
     uint16 index_mod = UNIT_FIELD_ATTACK_POWER_MODS;
     uint16 index_mult = UNIT_FIELD_ATTACK_POWER_MULTIPLIER;
 
-    if(ranged)
+    if (ranged)
     {
         index = UNIT_FIELD_RANGED_ATTACK_POWER;
         index_mod = UNIT_FIELD_RANGED_ATTACK_POWER_MODS;
         index_mult = UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER;
 
-        switch(getClass())
+        switch (getClass())
         {
-            case CLASS_HUNTER: val2 = level * 2.0f + GetStat(STAT_AGILITY) - 10.0f;    break;
-            case CLASS_ROGUE:  val2 = level        + GetStat(STAT_AGILITY) - 10.0f;    break;
-            case CLASS_WARRIOR:val2 = level        + GetStat(STAT_AGILITY) - 10.0f;    break;
+            case CLASS_HUNTER:
+                val2 = level * 2.0f + GetStat(STAT_AGILITY) - 10.0f;
+                break;
+            case CLASS_ROGUE:
+            case CLASS_WARRIOR:
+                val2 = level + GetStat(STAT_AGILITY) - 10.0f;
+                break;
             case CLASS_DRUID:
-                switch(GetShapeshiftForm())
+                switch (GetShapeshiftForm())
                 {
                     case FORM_CAT:
                     case FORM_BEAR:
                     case FORM_DIREBEAR:
-                        val2 = 0.0f; break;
+                        val2 = 0.0f;
+                        break;
                     default:
-                        val2 = GetStat(STAT_AGILITY) - 10.0f; break;
+                        val2 = GetStat(STAT_AGILITY) - 10.0f;
+                        break;
                 }
                 break;
-            default: val2 = GetStat(STAT_AGILITY) - 10.0f; break;
+            default:
+                val2 = GetStat(STAT_AGILITY) - 10.0f;
+                break;
         }
     }
     else
     {
-        switch(getClass())
+        switch (getClass())
         {
-            case CLASS_WARRIOR:      val2 = level*3.0f + GetStat(STAT_STRENGTH)*2.0f                    - 20.0f; break;
-            case CLASS_PALADIN:      val2 = level*3.0f + GetStat(STAT_STRENGTH)*2.0f                    - 20.0f; break;
-            case CLASS_DEATH_KNIGHT: val2 = level*3.0f + GetStat(STAT_STRENGTH)*2.0f                    - 20.0f; break;
-            case CLASS_ROGUE:        val2 = level*2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f; break;
-            case CLASS_HUNTER:       val2 = level*2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f; break;
-            case CLASS_SHAMAN:       val2 = level*2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f; break;
+            case CLASS_WARRIOR:
+            case CLASS_PALADIN:
+            case CLASS_DEATH_KNIGHT:
+                val2 = level * 3.0f + GetStat(STAT_STRENGTH) * 2.0f - 20.0f;
+                break;
+            case CLASS_ROGUE:
+            case CLASS_HUNTER:
+            case CLASS_SHAMAN:
+                val2 = level * 2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f;
+                break;
             case CLASS_DRUID:
             {
                 ShapeshiftForm form = GetShapeshiftForm();
-                //Check if Predatory Strikes is skilled
+                // Check if Predatory Strikes is skilled
                 float mLevelBonus = 0.0f;
                 float mBonusWeaponAtt = 0.0f;
-                switch(form)
+                switch (form)
                 {
                     case FORM_CAT:
                     case FORM_BEAR:
@@ -304,9 +339,9 @@ void Player::UpdateAttackPowerAndDamage(bool ranged )
                     case FORM_MOONKIN:
                     {
                         Unit::AuraList const& mDummy = GetAurasByType(SPELL_AURA_DUMMY);
-                        for(Unit::AuraList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr)
+                        for (Unit::AuraList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr)
                         {
-                            if((*itr)->GetSpellProto()->SpellIconID != 1563)
+                            if((*itr)->GetSpellProto()->GetSpellIconID() != 1563)
                                 continue;
 
                             // Predatory Strikes (effect 0)
@@ -314,84 +349,92 @@ void Player::UpdateAttackPowerAndDamage(bool ranged )
                                 mLevelBonus = getLevel() * (*itr)->GetModifier()->m_amount / 100.0f;
                             // Predatory Strikes (effect 1)
                             else if ((*itr)->GetEffIndex() == EFFECT_INDEX_1)
-                                mBonusWeaponAtt = (*itr)->GetModifier()->m_amount * m_baseFeralAP / 100.0f;
+                                mBonusWeaponAtt = (*itr)->GetModifier()->m_amount * m_baseFeralAP * 0.01f;
 
-                            if (mLevelBonus != 0.0f && mBonusWeaponAtt != 0.0f)
+                            if (fabs(mLevelBonus) > M_NULL_F && fabs(mBonusWeaponAtt) > M_NULL_F)
                                 break;
                         }
                         break;
                     }
-                    default: break;
+                    default:
+                        break;
                 }
 
-                switch(form)
+                switch (form)
                 {
                     case FORM_CAT:
-                        val2 = GetStat(STAT_STRENGTH)*2.0f + GetStat(STAT_AGILITY) - 20.0f + mLevelBonus + m_baseFeralAP + mBonusWeaponAtt; break;
+                        val2 = GetStat(STAT_STRENGTH) * 2.0f + GetStat(STAT_AGILITY) - 20.0f + mLevelBonus + m_baseFeralAP + mBonusWeaponAtt; break;
                     case FORM_BEAR:
                     case FORM_DIREBEAR:
-                        val2 = GetStat(STAT_STRENGTH)*2.0f - 20.0f + mLevelBonus + m_baseFeralAP + mBonusWeaponAtt; break;
+                        val2 = GetStat(STAT_STRENGTH) * 2.0f - 20.0f + mLevelBonus + m_baseFeralAP + mBonusWeaponAtt; break;
                     case FORM_MOONKIN:
-                        val2 = GetStat(STAT_STRENGTH)*2.0f - 20.0f + m_baseFeralAP + mBonusWeaponAtt; break;
+                        val2 = GetStat(STAT_STRENGTH) * 2.0f - 20.0f + m_baseFeralAP + mBonusWeaponAtt; break;
                     default:
-                        val2 = GetStat(STAT_STRENGTH)*2.0f - 20.0f; break;
+                        val2 = GetStat(STAT_STRENGTH) * 2.0f - 20.0f; break;
                 }
                 break;
             }
-            case CLASS_MAGE:    val2 =              GetStat(STAT_STRENGTH)                         - 10.0f; break;
-            case CLASS_PRIEST:  val2 =              GetStat(STAT_STRENGTH)                         - 10.0f; break;
-            case CLASS_WARLOCK: val2 =              GetStat(STAT_STRENGTH)                         - 10.0f; break;
+            case CLASS_MAGE:
+            case CLASS_PRIEST:
+            case CLASS_WARLOCK:
+                val2 = GetStat(STAT_STRENGTH) - 10.0f;
+                break;
         }
     }
 
     SetModifierValue(unitMod, BASE_VALUE, val2);
 
-    float base_attPower  = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
+    float base_attPower = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
     float attPowerMod = GetModifierValue(unitMod, TOTAL_VALUE);
 
-    //add dynamic flat mods
-    if( ranged )
+    // add dynamic flat mods
+    if (ranged)
     {
-        if ((getClassMask() & CLASSMASK_WAND_USERS)==0)
+        if ((getClassMask() & CLASSMASK_WAND_USERS) == 0)
         {
             AuraList const& mRAPbyStat = GetAurasByType(SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT);
-            for(AuraList::const_iterator i = mRAPbyStat.begin();i != mRAPbyStat.end(); ++i)
+            for (AuraList::const_iterator i = mRAPbyStat.begin(); i != mRAPbyStat.end(); ++i)
                 attPowerMod += int32(GetStat(Stats((*i)->GetModifier()->m_miscvalue)) * (*i)->GetModifier()->m_amount / 100.0f);
         }
     }
     else
     {
         AuraList const& mAPbyStat = GetAurasByType(SPELL_AURA_MOD_ATTACK_POWER_OF_STAT_PERCENT);
-        for(AuraList::const_iterator i = mAPbyStat.begin();i != mAPbyStat.end(); ++i)
+        for (AuraList::const_iterator i = mAPbyStat.begin(); i != mAPbyStat.end(); ++i)
             attPowerMod += int32(GetStat(Stats((*i)->GetModifier()->m_miscvalue)) * (*i)->GetModifier()->m_amount / 100.0f);
 
         AuraList const& mAPbyArmor = GetAurasByType(SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR);
-        for(AuraList::const_iterator iter = mAPbyArmor.begin(); iter != mAPbyArmor.end(); ++iter)
+        for (AuraList::const_iterator iter = mAPbyArmor.begin(); iter != mAPbyArmor.end(); ++iter)
             // always: ((*i)->GetModifier()->m_miscvalue == 1 == SPELL_SCHOOL_MASK_NORMAL)
             attPowerMod += int32(GetArmor() / (*iter)->GetModifier()->m_amount);
     }
 
     float attPowerMultiplier = GetModifierValue(unitMod, TOTAL_PCT) - 1.0f;
 
-    SetInt32Value(index, (uint32)base_attPower);            //UNIT_FIELD_(RANGED)_ATTACK_POWER field
-    SetInt32Value(index_mod, (uint32)attPowerMod);          //UNIT_FIELD_(RANGED)_ATTACK_POWER_MODS field
-    SetFloatValue(index_mult, attPowerMultiplier);          //UNIT_FIELD_(RANGED)_ATTACK_POWER_MULTIPLIER field
+    SetInt32Value(index, (uint32)base_attPower);            // UNIT_FIELD_(RANGED)_ATTACK_POWER field
+    SetInt32Value(index_mod, (uint32)attPowerMod);          // UNIT_FIELD_(RANGED)_ATTACK_POWER_MODS field
+    SetFloatValue(index_mult, attPowerMultiplier);          // UNIT_FIELD_(RANGED)_ATTACK_POWER_MULTIPLIER field
 
-    //automatically update weapon damage after attack power modification
-    if(ranged)
+    // automatically update weapon damage after attack power modification
+    if (ranged)
     {
         UpdateDamagePhysical(RANGED_ATTACK);
-
-        Pet *pet = GetPet();                                //update pet's AP
-        if(pet)
-            pet->UpdateAttackPowerAndDamage();
     }
     else
     {
         UpdateDamagePhysical(BASE_ATTACK);
-        if(CanDualWield() && haveOffhandWeapon())           //allow update offhand damage only if player knows DualWield Spec and has equipped offhand weapon
+        if (CanDualWield() && haveOffhandWeapon())          // allow update offhand damage only if player knows DualWield Spec and has equipped offhand weapon
             UpdateDamagePhysical(OFF_ATTACK);
     }
+
+    UpdateSpellDamageAndHealingBonus();
+
+    if (IsInWorld())
+    {
+        CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_ATTACKPOWER, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
+        CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_SPELLDAMAGE, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
+        CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_DAMAGE, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
+    }
 }
 
 void Player::UpdateShieldBlockValue()
@@ -402,28 +445,28 @@ void Player::UpdateShieldBlockValue()
 void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, float& min_damage, float& max_damage)
 {
     UnitMods unitMod;
-    UnitMods attPower;
+    // UnitMods attPower;
 
-    switch(attType)
+    switch (attType)
     {
         case BASE_ATTACK:
         default:
             unitMod = UNIT_MOD_DAMAGE_MAINHAND;
-            attPower = UNIT_MOD_ATTACK_POWER;
+            //attPower = UNIT_MOD_ATTACK_POWER;
             break;
         case OFF_ATTACK:
             unitMod = UNIT_MOD_DAMAGE_OFFHAND;
-            attPower = UNIT_MOD_ATTACK_POWER;
+            //attPower = UNIT_MOD_ATTACK_POWER;
             break;
         case RANGED_ATTACK:
             unitMod = UNIT_MOD_DAMAGE_RANGED;
-            attPower = UNIT_MOD_ATTACK_POWER_RANGED;
+            //attPower = UNIT_MOD_ATTACK_POWER_RANGED;
             break;
     }
 
-    float att_speed = GetAPMultiplier(attType,normalized);
+    float att_speed = GetAPMultiplier(attType, normalized);
 
-    float base_value  = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType)/ 14.0f * att_speed;
+    float base_value  = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType) / 14.0f * att_speed;
     float base_pct    = GetModifierValue(unitMod, BASE_PCT);
     float total_value = GetModifierValue(unitMod, TOTAL_VALUE);
     float total_pct   = GetModifierValue(unitMod, TOTAL_PCT);
@@ -437,15 +480,22 @@ void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, fl
         if (lvl > 60)
             lvl = 60;
 
-        weapon_mindamage = lvl*0.85f*att_speed;
-        weapon_maxdamage = lvl*1.25f*att_speed;
+        weapon_mindamage = lvl * 0.85f * att_speed;
+        weapon_maxdamage = lvl * 1.25f * att_speed;
     }
-    else if (!CanUseEquippedWeapon(attType))                // check if player not in form but still can't use weapon (broken/etc)
+    else if (!CanUseEquippedWeapon(attType))                // check if player not in form but still can't use weapon (disarm case)
     {
+        // cannot use ranged/off attack, set values to 0
+        if (attType != BASE_ATTACK)
+        {
+            min_damage = 0;
+            max_damage = 0;
+            return;
+        }
         weapon_mindamage = BASE_MINDAMAGE;
         weapon_maxdamage = BASE_MAXDAMAGE;
     }
-    else if (attType == RANGED_ATTACK)                      // add ammo DPS to ranged damage
+    else if (attType == RANGED_ATTACK)                       //add ammo DPS to ranged damage
     {
         weapon_mindamage += GetAmmoDPS() * att_speed;
         weapon_maxdamage += GetAmmoDPS() * att_speed;
@@ -460,22 +510,22 @@ void Player::UpdateDamagePhysical(WeaponAttackType attType)
     float mindamage;
     float maxdamage;
 
-    CalculateMinMaxDamage(attType,false,mindamage,maxdamage);
+    CalculateMinMaxDamage(attType, false, mindamage, maxdamage);
 
-    switch(attType)
+    switch (attType)
     {
         case BASE_ATTACK:
         default:
-            SetStatFloatValue(UNIT_FIELD_MINDAMAGE,mindamage);
-            SetStatFloatValue(UNIT_FIELD_MAXDAMAGE,maxdamage);
+            SetStatFloatValue(UNIT_FIELD_MINDAMAGE, mindamage);
+            SetStatFloatValue(UNIT_FIELD_MAXDAMAGE, maxdamage);
             break;
         case OFF_ATTACK:
-            SetStatFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE,mindamage);
-            SetStatFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE,maxdamage);
+            SetStatFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE, mindamage);
+            SetStatFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE, maxdamage);
             break;
         case RANGED_ATTACK:
-            SetStatFloatValue(UNIT_FIELD_MINRANGEDDAMAGE,mindamage);
-            SetStatFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE,maxdamage);
+            SetStatFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, mindamage);
+            SetStatFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, maxdamage);
             break;
     }
 }
@@ -491,7 +541,7 @@ void Player::UpdateBlockPercentage()
 {
     // No block
     float value = 0.0f;
-    if(CanBlock())
+    if (CanBlock())
     {
         // Base value
         value = 5.0f;
@@ -512,7 +562,7 @@ void Player::UpdateCritPercentage(WeaponAttackType attType)
     uint16 index;
     CombatRating cr;
 
-    switch(attType)
+    switch (attType)
     {
         case OFF_ATTACK:
             modGroup = OFFHAND_CRIT_PERCENTAGE;
@@ -586,11 +636,11 @@ void Player::UpdateParryPercentage()
 
     // No parry
     float value = 0.0f;
-    uint32 pclass = getClass()-1;
+    uint32 pclass = getClass() - 1;
     if (CanParry() && parry_cap[pclass] > 0.0f)
     {
         // Base parry
-        float nondiminishing  = 5.0f;
+        float nondiminishing = 5.0f;
         // Parry from rating
         float diminishing = GetRatingBonusValue(CR_PARRY);
         // Modify value from defense skill (only bonus from defense rating diminishes)
@@ -644,7 +694,7 @@ void Player::UpdateDodgePercentage()
 void Player::UpdateSpellCritChance(uint32 school)
 {
     // For normal school set zero crit chance
-    if(school == SPELL_SCHOOL_NORMAL)
+    if (school == SPELL_SCHOOL_NORMAL)
     {
         SetFloatValue(PLAYER_SPELL_CRIT_PERCENTAGE1, 0.0f);
         return;
@@ -668,20 +718,25 @@ void Player::UpdateSpellCritChance(uint32 school)
 
 void Player::UpdateMeleeHitChances()
 {
-    m_modMeleeHitChance = GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE);
-    m_modMeleeHitChance+=  GetRatingBonusValue(CR_HIT_MELEE);
+    m_modMeleeHitChance  = GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE);
+    m_modMeleeHitChance += GetRatingBonusValue(CR_HIT_MELEE);
+
+    CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_HIT, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
 }
 
 void Player::UpdateRangedHitChances()
 {
-    m_modRangedHitChance = GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE);
-    m_modRangedHitChance+= GetRatingBonusValue(CR_HIT_RANGED);
+    m_modRangedHitChance  = GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE);
+    m_modRangedHitChance += GetRatingBonusValue(CR_HIT_RANGED);
 }
 
 void Player::UpdateSpellHitChances()
 {
-    m_modSpellHitChance = GetTotalAuraModifier(SPELL_AURA_MOD_SPELL_HIT_CHANCE);
-    m_modSpellHitChance+= GetRatingBonusValue(CR_HIT_SPELL);
+    m_modSpellHitChance  = GetTotalAuraModifier(SPELL_AURA_MOD_SPELL_HIT_CHANCE);
+    m_modSpellHitChance += GetRatingBonusValue(CR_HIT_SPELL);
+
+    if (IsInWorld())
+        CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_SPELLHIT, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
 }
 
 void Player::UpdateAllSpellCritChances()
@@ -692,33 +747,36 @@ void Player::UpdateAllSpellCritChances()
 
 void Player::UpdateExpertise(WeaponAttackType attack)
 {
-    if(attack==RANGED_ATTACK)
+    if (attack == RANGED_ATTACK)
         return;
 
     int32 expertise = int32(GetRatingBonusValue(CR_EXPERTISE));
 
-    Item *weapon = GetWeaponForAttack(attack);
+    Item* weapon = GetWeaponForAttack(attack);
 
     AuraList const& expAuras = GetAurasByType(SPELL_AURA_MOD_EXPERTISE);
-    for(AuraList::const_iterator itr = expAuras.begin(); itr != expAuras.end(); ++itr)
+    for (AuraList::const_iterator itr = expAuras.begin(); itr != expAuras.end(); ++itr)
     {
         // item neutral spell
-        if((*itr)->GetSpellProto()->EquippedItemClass == -1)
+        if ((*itr)->GetSpellProto()->EquippedItemClass == -1)
             expertise += (*itr)->GetModifier()->m_amount;
         // item dependent spell
-        else if(weapon && weapon->IsFitToSpellRequirements((*itr)->GetSpellProto()))
+        else if (weapon && weapon->IsFitToSpellRequirements((*itr)->GetSpellProto()))
             expertise += (*itr)->GetModifier()->m_amount;
     }
 
-    if(expertise < 0)
+    if (expertise < 0)
         expertise = 0;
 
-    switch(attack)
+    switch (attack)
     {
         case BASE_ATTACK: SetUInt32Value(PLAYER_EXPERTISE, expertise);         break;
         case OFF_ATTACK:  SetUInt32Value(PLAYER_OFFHAND_EXPERTISE, expertise); break;
         default: break;
     }
+
+    if (IsInWorld())
+        CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_EXPERTIZE, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
 }
 
 void Player::UpdateArmorPenetration()
@@ -726,20 +784,20 @@ void Player::UpdateArmorPenetration()
     m_armorPenetrationPct = GetRatingBonusValue(CR_ARMOR_PENETRATION);
 
     AuraList const& armorAuras = GetAurasByType(SPELL_AURA_MOD_TARGET_ARMOR_PCT);
-    for(AuraList::const_iterator itr = armorAuras.begin(); itr != armorAuras.end(); ++itr)
+    for (AuraList::const_iterator itr = armorAuras.begin(); itr != armorAuras.end(); ++itr)
     {
         // affects all weapons
-        if((*itr)->GetSpellProto()->EquippedItemClass == -1)
+        if ((*itr)->GetSpellProto()->EquippedItemClass == -1)
         {
             m_armorPenetrationPct += (*itr)->GetModifier()->m_amount;
             continue;
         }
 
         // dependent on weapon class
-        for(uint8 i = 0; i < MAX_ATTACK; ++i)
+        for (uint8 i = 0; i < MAX_ATTACK; ++i)
         {
-            Item *weapon = GetWeaponForAttack(WeaponAttackType(i));
-            if(weapon && weapon->IsFitToSpellRequirements((*itr)->GetSpellProto()))
+            Item* weapon = GetWeaponForAttack(WeaponAttackType(i));
+            if (weapon && weapon->IsFitToSpellRequirements((*itr)->GetSpellProto()))
             {
                 m_armorPenetrationPct += (*itr)->GetModifier()->m_amount;
                 break;
@@ -748,6 +806,11 @@ void Player::UpdateArmorPenetration()
     }
 }
 
+void Player::ApplyHealthRegenBonus(int32 amount, bool apply)
+{
+    m_baseHealthRegen += apply ? amount : -amount;
+}
+
 void Player::ApplyManaRegenBonus(int32 amount, bool apply)
 {
     m_baseManaRegen+= apply ? amount : -amount;
@@ -767,9 +830,9 @@ void Player::UpdateManaRegen()
 
     // Get bonus from SPELL_AURA_MOD_MANA_REGEN_FROM_STAT aura
     AuraList const& regenAura = GetAurasByType(SPELL_AURA_MOD_MANA_REGEN_FROM_STAT);
-    for(AuraList::const_iterator i = regenAura.begin();i != regenAura.end(); ++i)
+    for (AuraList::const_iterator i = regenAura.begin();i != regenAura.end(); ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
+        Modifier const* mod = (*i)->GetModifier();
         power_regen_mp5 += GetStat(Stats(mod->m_miscvalue)) * mod->m_amount / 500.0f;
     }
 
@@ -777,9 +840,12 @@ void Player::UpdateManaRegen()
     int32 modManaRegenInterrupt = GetTotalAuraModifier(SPELL_AURA_MOD_MANA_REGEN_INTERRUPT);
     if (modManaRegenInterrupt > 100)
         modManaRegenInterrupt = 100;
-    SetStatFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER, power_regen_mp5 + power_regen * modManaRegenInterrupt / 100.0f);
+    SetStatFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER, power_regen_mp5 + power_regen * modManaRegenInterrupt * 0.01f);
 
     SetStatFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER, power_regen_mp5 + power_regen);
+
+    if (IsInWorld())
+        CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_POWERREGEN, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
 }
 
 void Player::_ApplyAllStatBonuses()
@@ -821,19 +887,17 @@ bool Creature::UpdateAllStats()
 {
     UpdateMaxHealth();
     UpdateAttackPowerAndDamage();
+    UpdateAttackPowerAndDamage(true);
 
-    for(int i = POWER_MANA; i < MAX_POWERS; ++i)
-        UpdateMaxPower(Powers(i));
-
-    for(int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
-        UpdateResistances(i);
+    UpdateAllMaxPower();
+    UpdateAllResistances();
 
     return true;
 }
 
 void Creature::UpdateResistances(uint32 school)
 {
-    if(school > SPELL_SCHOOL_NORMAL)
+    if (school > SPELL_SCHOOL_NORMAL)
     {
         float value  = GetTotalAuraModValue(UnitMods(UNIT_MOD_RESISTANCE_START + school));
         SetResistance(SpellSchools(school), int32(value));
@@ -877,7 +941,7 @@ void Creature::UpdateAttackPowerAndDamage(bool ranged)
         index_mult = UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER;
     }
 
-    float base_attPower  = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
+    float base_attPower = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
     float attPowerMod = GetModifierValue(unitMod, TOTAL_VALUE);
     float attPowerMultiplier = GetModifierValue(unitMod, TOTAL_PCT) - 1.0f;
 
@@ -885,37 +949,74 @@ void Creature::UpdateAttackPowerAndDamage(bool ranged)
     SetInt32Value(index_mod, (uint32)attPowerMod);          //UNIT_FIELD_(RANGED)_ATTACK_POWER_MODS field
     SetFloatValue(index_mult, attPowerMultiplier);          //UNIT_FIELD_(RANGED)_ATTACK_POWER_MULTIPLIER field
 
+    // automatically update weapon damage after attack power modification
     if (ranged)
-        return;
-
-    //automatically update weapon damage after attack power modification
-    UpdateDamagePhysical(BASE_ATTACK);
-    UpdateDamagePhysical(OFF_ATTACK);
+        UpdateDamagePhysical(RANGED_ATTACK);
+    else
+    {
+        UpdateDamagePhysical(BASE_ATTACK);
+        UpdateDamagePhysical(OFF_ATTACK);
+    }
 }
 
 void Creature::UpdateDamagePhysical(WeaponAttackType attType)
 {
-    if (attType > OFF_ATTACK)
-        return;
-
-    UnitMods unitMod = (attType == BASE_ATTACK ? UNIT_MOD_DAMAGE_MAINHAND : UNIT_MOD_DAMAGE_OFFHAND);
+    UnitMods unitMod;
+    switch (attType)
+    {
+        case BASE_ATTACK:
+            unitMod = UNIT_MOD_DAMAGE_MAINHAND;
+            break;
+        case OFF_ATTACK:
+            unitMod = UNIT_MOD_DAMAGE_OFFHAND;
+            break;
+        case RANGED_ATTACK:
+            unitMod = UNIT_MOD_DAMAGE_RANGED;
+            break;
+        default:
+            return;
+    }
 
     /* difference in AP between current attack power and base value from DB */
-    float att_pwr_change = GetTotalAttackPowerValue(attType) - GetCreatureInfo()->attackpower;
+    float att_pwr_change = GetTotalAttackPowerValue(attType) - GetCreatureInfo()->MeleeAttackPower;
     float base_value  = GetModifierValue(unitMod, BASE_VALUE) + (att_pwr_change * GetAPMultiplier(attType, false) / 14.0f);
     float base_pct    = GetModifierValue(unitMod, BASE_PCT);
     float total_value = GetModifierValue(unitMod, TOTAL_VALUE);
     float total_pct   = GetModifierValue(unitMod, TOTAL_PCT);
-    float dmg_multiplier = GetCreatureInfo()->dmg_multiplier;
+    float dmg_multiplier = GetCreatureInfo()->DamageMultiplier;
 
-    float weapon_mindamage = GetWeaponDamageRange(attType, MINDAMAGE);
-    float weapon_maxdamage = GetWeaponDamageRange(attType, MAXDAMAGE);
+    float weapon_mindamage;
+    float weapon_maxdamage;
+
+    if (CanUseEquippedWeapon(attType))                // check disarm case
+    {
+        weapon_mindamage = GetWeaponDamageRange(attType, MINDAMAGE);
+        weapon_maxdamage = GetWeaponDamageRange(attType, MAXDAMAGE);
+    }
+    else
+    {
+        weapon_mindamage = 0;
+        weapon_maxdamage = 0;
+    }
 
     float mindamage = ((base_value + weapon_mindamage) * dmg_multiplier * base_pct + total_value) * total_pct;
     float maxdamage = ((base_value + weapon_maxdamage) * dmg_multiplier * base_pct + total_value) * total_pct;
 
-    SetStatFloatValue(attType == BASE_ATTACK ? UNIT_FIELD_MINDAMAGE : UNIT_FIELD_MINOFFHANDDAMAGE, mindamage);
-    SetStatFloatValue(attType == BASE_ATTACK ? UNIT_FIELD_MAXDAMAGE : UNIT_FIELD_MAXOFFHANDDAMAGE, maxdamage);
+    switch (attType)
+    {
+        case BASE_ATTACK:
+            SetStatFloatValue(UNIT_FIELD_MINDAMAGE, mindamage);
+            SetStatFloatValue(UNIT_FIELD_MAXDAMAGE, maxdamage);
+            break;
+        case OFF_ATTACK:
+            SetStatFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE, mindamage);
+            SetStatFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE, maxdamage);
+            break;
+        case RANGED_ATTACK:
+            SetStatFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, mindamage);
+            SetStatFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, maxdamage);
+            break;
+    }
 }
 
 /*#######################################
@@ -926,38 +1027,32 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType)
 
 bool Pet::UpdateStats(Stats stat)
 {
-    if(stat > STAT_SPIRIT)
+    if (stat > STAT_SPIRIT || stat < STAT_STRENGTH)
         return false;
 
-    // value = ((base_value * base_pct) + total_value) * total_pct
+    // value = ((create_value + base_value * base_pct) + total_value) * total_pct
     float value  = GetTotalStatValue(stat);
-
-    Unit *owner = GetOwner();
-    if ( stat == STAT_STAMINA )
-    {
-        if(owner)
-            value += float(owner->GetStat(stat)) * 0.3f;
-    }
-                                                            //warlock's and mage's pets gain 30% of owner's intellect
-    else if ( stat == STAT_INTELLECT && getPetType() == SUMMON_PET )
-    {
-        if(owner && (owner->getClass() == CLASS_WARLOCK || owner->getClass() == CLASS_MAGE) )
-            value += float(owner->GetStat(stat)) * 0.3f;
-    }
-
     SetStat(stat, int32(value));
 
-    switch(stat)
+    switch (stat)
     {
-        case STAT_STRENGTH:         UpdateAttackPowerAndDamage();        break;
-        case STAT_AGILITY:          UpdateArmor();                       break;
-        case STAT_STAMINA:          UpdateMaxHealth();                   break;
-        case STAT_INTELLECT:        UpdateMaxPower(POWER_MANA);          break;
+        case STAT_STRENGTH:
+            UpdateAttackPowerAndDamage();
+            break;
+        case STAT_AGILITY:
+            UpdateAttackPowerAndDamage(true);
+            UpdateArmor();
+            break;
+        case STAT_STAMINA:
+            UpdateMaxHealth();
+            break;
+        case STAT_INTELLECT:
+            UpdateMaxPower(POWER_MANA);
+            break;
         case STAT_SPIRIT:
         default:
             break;
     }
-
     return true;
 }
 
@@ -966,27 +1061,22 @@ bool Pet::UpdateAllStats()
     for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
         UpdateStats(Stats(i));
 
-    for(int i = POWER_MANA; i < MAX_POWERS; ++i)
-        UpdateMaxPower(Powers(i));
+    UpdateAllMaxPower();
+    UpdateAllResistances();
 
-    for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
-        UpdateResistances(i);
+    UpdateAttackPowerAndDamage();
+    UpdateAttackPowerAndDamage(true);
+    UpdateManaRegen();
+    UpdateSpellPower();
 
     return true;
 }
 
 void Pet::UpdateResistances(uint32 school)
 {
-    if(school > SPELL_SCHOOL_NORMAL)
+    if (school > SPELL_SCHOOL_NORMAL)
     {
-        float value  = GetTotalAuraModValue(UnitMods(UNIT_MOD_RESISTANCE_START + school));
-
-        Unit *owner = GetOwner();
-        // hunter and warlock pets gain 40% of owner's resistance
-        if(owner && (getPetType() == HUNTER_PET || (getPetType() == SUMMON_PET && owner->getClass() == CLASS_WARLOCK)))
-            value += float(owner->GetResistance(SpellSchools(school))) * 0.4f;
-
-        SetResistance(SpellSchools(school), int32(value));
+        SetResistance(SpellSchools(school), int32(GetTotalAuraModValue(UnitMods(UNIT_MOD_RESISTANCE_START + school))));
     }
     else
         UpdateArmor();
@@ -995,18 +1085,11 @@ void Pet::UpdateResistances(uint32 school)
 void Pet::UpdateArmor()
 {
     float value = 0.0f;
-    float bonus_armor = 0.0f;
     UnitMods unitMod = UNIT_MOD_ARMOR;
 
-    Unit *owner = GetOwner();
-    // hunter and warlock pets gain 35% of owner's armor value
-    if(owner && (getPetType() == HUNTER_PET || (getPetType() == SUMMON_PET && owner->getClass() == CLASS_WARLOCK)))
-        bonus_armor = 0.35f * float(owner->GetArmor());
-
-    value  = GetModifierValue(unitMod, BASE_VALUE);
+    value  = GetModifierValue(unitMod, BASE_VALUE) + GetStat(STAT_AGILITY) * 2.0f;
     value *= GetModifierValue(unitMod, BASE_PCT);
-    value += GetStat(STAT_AGILITY) * 2.0f;
-    value += GetModifierValue(unitMod, TOTAL_VALUE) + bonus_armor;
+    value += GetModifierValue(unitMod, TOTAL_VALUE);
     value *= GetModifierValue(unitMod, TOTAL_PCT);
 
     SetArmor(int32(value));
@@ -1014,12 +1097,15 @@ void Pet::UpdateArmor()
 
 void Pet::UpdateMaxHealth()
 {
+    if (!CanModifyStats())
+        return;
+
     UnitMods unitMod = UNIT_MOD_HEALTH;
-    float stamina = GetStat(STAT_STAMINA) - GetCreateStat(STAT_STAMINA);
+    float staminaBonus = (GetStat(STAT_STAMINA) - GetCreateStat(STAT_STAMINA)) * (CalculateScalingData()->healthScale / 100.0f);
 
-    float value   = GetModifierValue(unitMod, BASE_VALUE) + GetCreateHealth();
+    float value   = GetModifierValue(unitMod, BASE_VALUE) + GetCreateHealth() + staminaBonus;
     value  *= GetModifierValue(unitMod, BASE_PCT);
-    value  += GetModifierValue(unitMod, TOTAL_VALUE) + stamina * 10.0f;
+    value  += GetModifierValue(unitMod, TOTAL_VALUE);
     value  *= GetModifierValue(unitMod, TOTAL_PCT);
 
     SetMaxHealth((uint32)value);
@@ -1027,13 +1113,16 @@ void Pet::UpdateMaxHealth()
 
 void Pet::UpdateMaxPower(Powers power)
 {
+    if (!CanModifyStats())
+        return;
+
     UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + power);
 
-    float addValue = (power == POWER_MANA) ? GetStat(STAT_INTELLECT) - GetCreateStat(STAT_INTELLECT) : 0.0f;
+    float intellectBonus = (power == POWER_MANA) ? (GetStat(STAT_INTELLECT) - GetCreateStat(STAT_INTELLECT))*(CalculateScalingData()->powerScale / 100.0f) : 0.0f;
 
-    float value  = GetModifierValue(unitMod, BASE_VALUE) + GetCreatePowers(power);
+    float value  = GetModifierValue(unitMod, BASE_VALUE) + GetCreatePowers(power) + intellectBonus;
     value *= GetModifierValue(unitMod, BASE_PCT);
-    value += GetModifierValue(unitMod, TOTAL_VALUE) +  addValue * 15.0f;
+    value += GetModifierValue(unitMod, TOTAL_VALUE);
     value *= GetModifierValue(unitMod, TOTAL_PCT);
 
     SetMaxPower(power, uint32(value));
@@ -1041,106 +1130,106 @@ void Pet::UpdateMaxPower(Powers power)
 
 void Pet::UpdateAttackPowerAndDamage(bool ranged)
 {
-    if(ranged)
-        return;
-
-    float val = 0.0f;
-    float bonusAP = 0.0f;
-    UnitMods unitMod = UNIT_MOD_ATTACK_POWER;
+    UnitMods unitMod;
+    float baseAP = 0.0f;
 
-    if(GetEntry() == 416)                                   // imp's attack power
-        val = GetStat(STAT_STRENGTH) - 10.0f;
+    if (!ranged)
+    {
+        unitMod  = UNIT_MOD_ATTACK_POWER;
+        baseAP = (CalculateScalingData()->APBaseScale / 100.0f) * (GetStat(STAT_STRENGTH) - CalculateScalingData()->APBasepoint);
+    }
     else
-        val = 2 * GetStat(STAT_STRENGTH) - 20.0f;
-
-    Unit* owner = GetOwner();
-    if( owner && owner->GetTypeId()==TYPEID_PLAYER)
     {
-        if(getPetType() == HUNTER_PET)                      //hunter pets benefit from owner's attack power
-        {
-            bonusAP = owner->GetTotalAttackPowerValue(RANGED_ATTACK) * 0.22f;
-            SetBonusDamage( int32(owner->GetTotalAttackPowerValue(RANGED_ATTACK) * 0.1287f));
-        }
-        //demons benefit from warlocks shadow or fire damage
-        else if(getPetType() == SUMMON_PET && owner->getClass() == CLASS_WARLOCK)
-        {
-            int32 fire  = int32(owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + SPELL_SCHOOL_FIRE)) - owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + SPELL_SCHOOL_FIRE);
-            int32 shadow = int32(owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + SPELL_SCHOOL_SHADOW)) - owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + SPELL_SCHOOL_SHADOW);
-            int32 maximum  = (fire > shadow) ? fire : shadow;
-            if(maximum < 0)
-                maximum = 0;
-            SetBonusDamage( int32(maximum * 0.15f));
-            bonusAP = maximum * 0.57f;
-        }
-        //water elementals benefit from mage's frost damage
-        else if(getPetType() == SUMMON_PET && owner->getClass() == CLASS_MAGE)
-        {
-            int32 frost = int32(owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + SPELL_SCHOOL_FROST)) - owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + SPELL_SCHOOL_FROST);
-            if(frost < 0)
-                frost = 0;
-            SetBonusDamage( int32(frost * 0.4f));
-        }
+        unitMod  = UNIT_MOD_ATTACK_POWER_RANGED;
+        baseAP = (CalculateScalingData()->APBaseScale / 100.0f) * (GetStat(STAT_AGILITY) - CalculateScalingData()->APBasepoint);
     }
 
-    SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, val + bonusAP);
+    if ((baseAP) < 0.0f)
+        baseAP = 0.0f;
+
+    SetModifierValue(unitMod, BASE_VALUE, baseAP);
 
     //in BASE_VALUE of UNIT_MOD_ATTACK_POWER for creatures we store data of meleeattackpower field in DB
-    float base_attPower  = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
-    float attPowerMod = GetModifierValue(unitMod, TOTAL_VALUE);
+    float base_attPower      = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
+    float attPowerMod        = GetModifierValue(unitMod, TOTAL_VALUE);
     float attPowerMultiplier = GetModifierValue(unitMod, TOTAL_PCT) - 1.0f;
 
-    //UNIT_FIELD_(RANGED)_ATTACK_POWER field
-    SetInt32Value(UNIT_FIELD_ATTACK_POWER, (int32)base_attPower);
-    //UNIT_FIELD_(RANGED)_ATTACK_POWER_MODS field
-    SetInt32Value(UNIT_FIELD_ATTACK_POWER_MODS, (int32)attPowerMod);
-    //UNIT_FIELD_(RANGED)_ATTACK_POWER_MULTIPLIER field
-    SetFloatValue(UNIT_FIELD_ATTACK_POWER_MULTIPLIER, attPowerMultiplier);
-
-    //automatically update weapon damage after attack power modification
-    UpdateDamagePhysical(BASE_ATTACK);
+    if (!ranged)
+    {
+        SetInt32Value(UNIT_FIELD_ATTACK_POWER, (int32)base_attPower);
+        SetInt32Value(UNIT_FIELD_ATTACK_POWER_MODS, (int32)attPowerMod);
+        SetFloatValue(UNIT_FIELD_ATTACK_POWER_MULTIPLIER, attPowerMultiplier);
+        UpdateDamagePhysical(BASE_ATTACK);
+    }
+    else
+    {
+        SetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER, (int32)base_attPower);
+        SetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER_MODS, (int32)attPowerMod);
+        SetFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER, attPowerMultiplier);
+        UpdateDamagePhysical(RANGED_ATTACK);
+    }
 }
 
 void Pet::UpdateDamagePhysical(WeaponAttackType attType)
 {
-    if(attType > BASE_ATTACK)
-        return;
+    UnitMods unitMod;
 
-    UnitMods unitMod = UNIT_MOD_DAMAGE_MAINHAND;
+    if (attType == BASE_ATTACK)
+        unitMod  = UNIT_MOD_DAMAGE_MAINHAND;
+    else if (attType == RANGED_ATTACK)
+       unitMod  = UNIT_MOD_DAMAGE_RANGED;
+    else
+        return;
 
-    float att_speed = float(GetAttackTime(BASE_ATTACK))/1000.0f;
+    float att_speed = float(GetAttackTime(attType)) / 1000.0f;
 
     float base_value  = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType)/ 14.0f * att_speed;
     float base_pct    = GetModifierValue(unitMod, BASE_PCT);
     float total_value = GetModifierValue(unitMod, TOTAL_VALUE);
     float total_pct   = GetModifierValue(unitMod, TOTAL_PCT);
 
-    float weapon_mindamage = GetWeaponDamageRange(BASE_ATTACK, MINDAMAGE);
-    float weapon_maxdamage = GetWeaponDamageRange(BASE_ATTACK, MAXDAMAGE);
+    float weapon_mindamage = GetWeaponDamageRange(attType, MINDAMAGE);
+    float weapon_maxdamage = GetWeaponDamageRange(attType, MAXDAMAGE);
 
     float mindamage = ((base_value + weapon_mindamage) * base_pct + total_value) * total_pct;
     float maxdamage = ((base_value + weapon_maxdamage) * base_pct + total_value) * total_pct;
 
-    //  Pet's base damage changes depending on happiness
-    if (getPetType() == HUNTER_PET && attType == BASE_ATTACK)
+    if (attType == BASE_ATTACK)
     {
-        switch(GetHappinessState())
-        {
-            case HAPPY:
-                // 125% of normal damage
-                mindamage = mindamage * 1.25f;
-                maxdamage = maxdamage * 1.25f;
-                break;
-            case CONTENT:
-                // 100% of normal damage, nothing to modify
-                break;
-            case UNHAPPY:
-                // 75% of normal damage
-                mindamage = mindamage * 0.75f;
-                maxdamage = maxdamage * 0.75f;
-                break;
-        }
+        SetStatFloatValue(UNIT_FIELD_MINDAMAGE, mindamage);
+        SetStatFloatValue(UNIT_FIELD_MAXDAMAGE, maxdamage);
+    }
+    else if (attType == RANGED_ATTACK)
+    {
+        SetStatFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, mindamage);
+        SetStatFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, maxdamage);
     }
+}
+
+void Pet::UpdateSpellPower()
+{
+    Unit* owner = GetOwner();
+
+    if (!owner ||owner->GetTypeId() != TYPEID_PLAYER || !owner->IsInWorld())
+        return;
 
-    SetStatFloatValue(UNIT_FIELD_MINDAMAGE, mindamage);
-    SetStatFloatValue(UNIT_FIELD_MAXDAMAGE, maxdamage);
+    MAPLOCK_READ(owner,MAP_LOCK_TYPE_AURAS);
+                                                  // Only for displaying in client!
+    owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_SPELL));
+}
+
+void Pet::UpdateManaRegen()
+{
+    float power_regen = sqrt(GetStat(STAT_INTELLECT)) * OCTRegenMPPerSpirit();
+
+    power_regen *= GetTotalAuraMultiplierByMiscValue(SPELL_AURA_MOD_POWER_REGEN_PERCENT, POWER_MANA);
+
+    // Mana regen from SPELL_AURA_MOD_POWER_REGEN aura
+    float power_regen_mp5 = GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, POWER_MANA) / 5.0f;
+
+    // Set regen rate in cast state apply only on spirit based regen
+    int32 modManaRegenInterrupt = GetTotalAuraModifier(SPELL_AURA_MOD_MANA_REGEN_INTERRUPT);
+
+    SetStatFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER, power_regen_mp5 + power_regen * modManaRegenInterrupt * 0.01f);
+    SetStatFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER, power_regen_mp5 + power_regen);
 }
diff --git a/src/game/StateMgr.cpp b/src/game/StateMgr.cpp
new file mode 100644
index 00000000000..c744dacdd8c
--- /dev/null
+++ b/src/game/StateMgr.cpp
@@ -0,0 +1,720 @@
+/*
+ * Copyright (C) 2012-2013 /dev/rsa for MangosR2 <http://github.com/mangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/* StateMgr based on idea and part of code from SilverIce (http:://github.com/SilverIce
+*/
+#include "movementGenerators/ConfusedMovementGenerator.h"
+#include "movementGenerators/TargetedMovementGenerator.h"
+#include "movementGenerators/IdleMovementGenerator.h"
+#include "movementGenerators/WaypointMovementGenerator.h"
+#include "Timer.h"
+#include "StateMgr.h"
+#include "Player.h"
+#include "Creature.h"
+#include "DBCStores.h"
+
+static const class staticActionInfo
+{
+    public:
+    staticActionInfo()
+    {
+        actionInfo[UNIT_ACTION_IDLE](UNIT_ACTION_PRIORITY_IDLE,ACTION_TYPE_RESTOREABLE);
+        actionInfo[UNIT_ACTION_DOWAYPOINTS](UNIT_ACTION_PRIORITY_DOWAYPOINTS,ACTION_TYPE_NONRESTOREABLE);
+        actionInfo[UNIT_ACTION_HOME](UNIT_ACTION_PRIORITY_HOME,ACTION_TYPE_NONRESTOREABLE);
+        actionInfo[UNIT_ACTION_CHASE](UNIT_ACTION_PRIORITY_CHASE,ACTION_TYPE_NONRESTOREABLE);
+        actionInfo[UNIT_ACTION_ASSISTANCE](UNIT_ACTION_PRIORITY_ASSISTANCE,ACTION_TYPE_NONRESTOREABLE);
+        actionInfo[UNIT_ACTION_CONTROLLED](UNIT_ACTION_PRIORITY_CONTROLLED,ACTION_TYPE_NONRESTOREABLE);
+        actionInfo[UNIT_ACTION_CONFUSED](UNIT_ACTION_PRIORITY_CONFUSED,ACTION_TYPE_NONRESTOREABLE);
+        actionInfo[UNIT_ACTION_FEARED]( UNIT_ACTION_PRIORITY_FEARED,ACTION_TYPE_NONRESTOREABLE);
+        actionInfo[UNIT_ACTION_ROOT](UNIT_ACTION_PRIORITY_ROOT,ACTION_TYPE_RESTOREABLE);
+        actionInfo[UNIT_ACTION_STUN](UNIT_ACTION_PRIORITY_STUN,ACTION_TYPE_RESTOREABLE);
+        actionInfo[UNIT_ACTION_FEIGNDEATH](UNIT_ACTION_PRIORITY_FEIGNDEATH,ACTION_TYPE_NONRESTOREABLE);
+        actionInfo[UNIT_ACTION_ONVEHICLE](UNIT_ACTION_PRIORITY_ONVEHICLE,ACTION_TYPE_NONRESTOREABLE);
+        actionInfo[UNIT_ACTION_TAXI](UNIT_ACTION_PRIORITY_TAXI,ACTION_TYPE_NONRESTOREABLE);
+        actionInfo[UNIT_ACTION_EFFECT](UNIT_ACTION_PRIORITY_EFFECT,ACTION_TYPE_NONRESTOREABLE);
+    }
+
+    const StaticActionInfo& operator[](UnitActionId i) const { return actionInfo[i];}
+
+    private:
+    StaticActionInfo actionInfo[UNIT_ACTION_END];
+} staticActionInfo;
+
+// derived from IdleState_ to not write new GetMovementGeneratorType, Update
+class StunnedState : public IdleMovementGenerator
+{
+public:
+
+    const char* Name() const { return "<Stunned>"; }
+    void Interrupt(Unit &u) {Finalize(u);}
+    void Reset(Unit &u) {Initialize(u);}
+    void Initialize(Unit &u)
+    {
+        Unit* const target = &u;
+        if (!target)
+            return;
+
+        target->addUnitState(UNIT_STAT_STUNNED);
+        target->SetTargetGuid(ObjectGuid());
+
+        target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
+        //Clear unit movement flags
+        target->m_movementInfo.RemoveMovementFlag(movementFlagsMask);
+        target->m_movementInfo.AddMovementFlag(MOVEFLAG_ROOT);
+
+        // Creature specific
+        if (target->GetTypeId() != TYPEID_PLAYER)
+            target->StopMoving();
+        else
+        {
+            target->SetStandState(UNIT_STAND_STATE_STAND);// in 1.5 client
+        }
+
+        target->SendMeleeAttackStop(NULL);
+        target->SetRoot(true);
+    }
+
+    void Finalize(Unit &u)
+    {
+        Unit* const target = &u;
+        if (!target)
+            return;
+        target->clearUnitState(UNIT_STAT_STUNNED);
+        target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
+
+        if (Unit* pVictim = target->getVictim())
+            target->SetTargetGuid(pVictim->GetObjectGuid());
+
+        target->SetRoot(false);
+        target->m_movementInfo.RemoveMovementFlag(MOVEFLAG_ROOT);
+        target->AddEvent(new AttackResumeEvent(*target), ATTACK_DISPLAY_DELAY);
+    }
+
+};
+
+class RootState : public IdleMovementGenerator
+{
+public:
+
+    const char* Name() const { return "<Rooted>"; }
+    void Interrupt(Unit &u) {Finalize(u);}
+    void Reset(Unit &u) {Initialize(u);}
+    void Initialize(Unit &u)
+    {
+        Unit* const target = &u;
+        if (!target)
+            return;
+        target->StopMoving();
+        target->addUnitState(UNIT_STAT_ROOT);
+        target->SetTargetGuid(ObjectGuid());
+        //Save last orientation
+        if (Unit* pVictim = target->getVictim())
+            target->SetOrientation(target->GetAngle(pVictim));
+
+        //Clear unit movement flags
+        target->m_movementInfo.RemoveMovementFlag(movementFlagsMask);
+        target->m_movementInfo.AddMovementFlag(MOVEFLAG_ROOT);
+        target->SendMeleeAttackStop(NULL);
+        target->SetRoot(true);
+
+    }
+
+    void Finalize(Unit &u)
+    {
+        Unit* const target = &u;
+        if (!target)
+            return;
+        target->clearUnitState(UNIT_STAT_ROOT);
+        target->SetRoot(false);
+        target->m_movementInfo.RemoveMovementFlag(MOVEFLAG_ROOT);
+
+        if (Unit* pVictim = target->getVictim())
+            target->SetTargetGuid(pVictim->GetObjectGuid());
+        target->AddEvent(new AttackResumeEvent(*target), ATTACK_DISPLAY_DELAY);
+    }
+};
+
+class FeignDeathState : public IdleMovementGenerator
+{
+public:
+
+    const char* Name() const { return "<FeignDeath>"; }
+    void Interrupt(Unit &u) {Finalize(u);}
+    void Reset(Unit &u) {Initialize(u);}
+    void Initialize(Unit &u)
+    {
+        Unit* const target = &u;
+        if (!target)
+            return;
+
+        target->StopMoving();
+
+        target->m_movementInfo.RemoveMovementFlag(movementFlagsMask);
+        target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29);
+        target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
+        target->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
+
+        target->InterruptNonMeleeSpells(true);
+        target->CombatStop();
+        target->getHostileRefManager().deleteReferences();
+        target->addUnitState(UNIT_STAT_DIED);
+        target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
+
+    }
+
+    void Finalize(Unit &u)
+    {
+        Unit* const target = &u;
+        if (!target)
+            return;
+
+        target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29);
+        target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
+        target->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
+        target->clearUnitState(UNIT_STAT_DIED);
+    }
+};
+
+class TaxiState : public FlightPathMovementGenerator
+{
+public:
+    TaxiState(uint32 mountDisplayId, uint32 path, uint32 startNode = 0) :
+        FlightPathMovementGenerator(sTaxiPathNodesByPath[path], startNode), m_displayId(mountDisplayId), m_previewDisplayId(0)
+    {
+    };
+
+public:
+    const char* Name() const { return "<FlightPath>"; }
+    void Interrupt(Player &u) 
+    {
+        _Interrupt(u);
+        u.clearUnitState(UNIT_STAT_TAXI_FLIGHT);
+        if (m_displayId)
+            u.Unmount();
+        u.RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT);
+        if (m_previewDisplayId)
+        {
+            u.Mount(m_previewDisplayId);
+        }
+    };
+
+    void Reset(Player &u) 
+    {
+        Initialize(u);
+    };
+
+    void Initialize(Player &u)
+    {
+        if (m_displayId)
+        {
+            if (!m_previewDisplayId)
+                m_previewDisplayId = u.GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID);
+            u.Mount(m_displayId);
+        }
+        u.getHostileRefManager().setOnlineOfflineState(false);
+        u.addUnitState(UNIT_STAT_TAXI_FLIGHT);
+        u.SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT);
+        _Initialize(u);
+    };
+
+    void Finalize(Player &u)
+    {
+        // remove flag to prevent send object build movement packets for flight state and crash (movement generator already not at top of stack)
+        if (m_displayId)
+            u.Unmount();
+        u.clearUnitState(UNIT_STAT_TAXI_FLIGHT);
+        u.RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT);
+        u.getHostileRefManager().setOnlineOfflineState(true);
+        if(u.pvpInfo.inHostileArea)
+            u.CastSpell(&u, SPELL_ID_HONORLESS_TARGET, true);
+
+        _Finalize(u);
+
+        if (m_previewDisplayId)
+        {
+            u.Mount(m_previewDisplayId);
+        }
+    };
+
+private:
+    uint32 m_displayId;
+    uint32 m_previewDisplayId;
+};
+
+class OnVehicleState : public IdleMovementGenerator
+{
+public:
+    OnVehicleState(int32 _type) : m_seatId(int8(_type))
+    {};
+
+    const char* Name() const { return "<OnVehicle>"; }
+    void Interrupt(Unit &u) {Finalize(u);}
+    void Reset(Unit &u) {Initialize(u);}
+    void Initialize(Unit &u)
+    {
+        Unit* const target = &u;
+        if (!target)
+            return;
+    }
+
+    void Finalize(Unit &u)
+    {
+        Unit* const target = &u;
+        if (!target)
+            return;
+    }
+
+private:
+    int8 m_seatId;
+};
+
+class ControlledState : public IdleMovementGenerator
+{
+public:
+    ControlledState(int32 _type) : m_state(uint8(_type))
+    {};
+
+    const char* Name() const { return "<Controlled>"; }
+    void Interrupt(Unit &u) {Finalize(u);}
+    void Reset(Unit &u) {Initialize(u);}
+    void Initialize(Unit &u)
+    {
+        Unit* const target = &u;
+        if (!target)
+            return;
+    }
+
+    void Finalize(Unit &u)
+    {
+        Unit* const target = &u;
+        if (!target)
+            return;
+    }
+
+private:
+    uint8 m_state;
+};
+
+UnitActionPtr UnitStateMgr::CreateStandartState(UnitActionId stateId, ...)
+{
+    va_list vargs;
+    va_start(vargs, stateId);
+
+    UnitActionPtr state = UnitActionPtr(NULL);
+    switch (stateId)
+    {
+        case UNIT_ACTION_IDLE:
+            state = UnitActionPtr(new IdleMovementGenerator());
+            break;
+        case UNIT_ACTION_CONFUSED:
+        case UNIT_ACTION_FEARED:
+        case UNIT_ACTION_CHASE:
+            break;
+        case UNIT_ACTION_STUN:
+            state = UnitActionPtr(new StunnedState());
+            break;
+        case UNIT_ACTION_FEIGNDEATH:
+            state = UnitActionPtr(new FeignDeathState());
+            break;
+        case UNIT_ACTION_ROOT:
+            state = UnitActionPtr(new RootState());
+            break;
+        case UNIT_ACTION_ONVEHICLE:
+        {
+            uint32 param = va_arg(vargs,int32);
+            state = UnitActionPtr(new OnVehicleState(param));
+            break;
+        }
+        case UNIT_ACTION_CONTROLLED:
+        {
+            uint32 param = va_arg(vargs,int32);
+            state = UnitActionPtr(new ControlledState(param));
+            break;
+        }
+        case UNIT_ACTION_TAXI:
+        {
+            uint32 mountDisplayId = va_arg(vargs,uint32);
+            uint32 path           = va_arg(vargs,uint32);
+            uint32 startNode      = va_arg(vargs,uint32);
+            state = UnitActionPtr(new TaxiState(mountDisplayId, path, startNode));
+            break;
+        }
+        default:
+            sLog.outError("UnitStateMgr: attempt to create unknown standart state %u, creating IDLE state instead", stateId);
+            state = UnitActionPtr(new IdleMovementGenerator());
+            break;
+    }
+
+    va_end(vargs);
+
+    MANGOS_ASSERT(state);
+
+    return state;
+}
+
+UnitStateMgr::UnitStateMgr(Unit* owner) : m_owner(owner), m_needReinit(false)
+{
+    m_actions.clear();
+
+    for (int32 i = UNIT_ACTION_IDLE; i != UNIT_ACTION_END; ++i)
+        m_stateCounter[i] = 0;
+
+    InitDefaults(true);
+}
+
+UnitStateMgr::~UnitStateMgr()
+{
+}
+
+void UnitStateMgr::InitDefaults(bool immediate)
+{
+    if (immediate)
+    {
+        m_oldAction = UnitActionPtr(NULL);
+        DropAllStates();
+    }
+    else
+        m_needReinit = true;
+}
+
+void UnitStateMgr::Update(uint32 diff)
+{
+    if (m_needReinit)
+    {
+        m_needReinit = false;
+        InitDefaults(true);
+    }
+
+    ActionInfo* state = CurrentState();
+
+    if (!m_oldAction)
+        m_oldAction = state->Action();
+    else if (m_oldAction && m_oldAction != state->Action())
+    {
+        if (ActionInfo* oldAction = GetAction(m_oldAction))
+        {
+            if (oldAction->HasFlag(ACTION_STATE_ACTIVE) &&
+                !oldAction->HasFlag(ACTION_STATE_FINALIZED) &&
+                !oldAction->HasFlag(ACTION_STATE_INTERRUPTED))
+                oldAction->Interrupt(this);
+        }
+        // else do nothing - action be deleted without interrupt/finalize (may be need correct?)
+        m_oldAction = state->Action();
+    }
+
+    if (!state->Update(this, diff))
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "UnitStateMgr: %s finished action %s", GetOwnerStr().c_str(), state->TypeName());
+        DropAction(state->priority);
+    }
+}
+
+void UnitStateMgr::DropAction(UnitActionId actionId)
+{
+    DropAction(actionId, staticActionInfo[actionId].priority);
+}
+
+void UnitStateMgr::DropAction(UnitActionId actionId, UnitActionPriority priority)
+{
+    if (!m_actions.empty())
+    {
+        std::vector<UnitActionPriority> priorityToDrop;
+        for (UnitActionStorage::const_iterator itr = m_actions.begin(); itr != m_actions.end(); ++itr)
+            if (itr->first <= priority && itr->second.Id == actionId)
+                priorityToDrop.push_back(itr->first);
+
+        while (!priorityToDrop.empty())
+        {
+            DropAction(priorityToDrop.back());
+            priorityToDrop.pop_back();
+        }
+    }
+}
+
+void UnitStateMgr::DropAction(UnitActionPriority priority)
+{
+    // Don't remove action with NONE priority - static
+    if (priority < UNIT_ACTION_PRIORITY_IDLE)
+        return;
+
+    UnitActionStorage::iterator itr = m_actions.find(priority);
+
+    if (itr != m_actions.end())
+    {
+        bool bActiveActionChanged = false;
+        ActionInfo* oldInfo = CurrentState();
+        UnitActionPtr oldAction = oldInfo ? oldInfo->Action() : UnitActionPtr();
+
+        // if dropped current active state...
+        if (oldInfo && itr->second.Action() == oldInfo->Action() && !oldInfo->HasFlag(ACTION_STATE_FINALIZED))
+            bActiveActionChanged = true;
+
+        // in first - erasing current action, if his active
+        if (itr->second.Action() == m_oldAction)
+            m_oldAction = UnitActionPtr(NULL);
+
+        // Possible erasing by iterator more fast and logic, but by Key much more safe
+        m_actions.erase(priority);
+
+        // Finalized not ActionInfo, but real action (saved before), due to ActionInfo wrapper already deleted.
+        if (bActiveActionChanged && oldAction)
+        {
+            DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "DropAction: %s finalize (direct) action %s", GetOwnerStr().c_str(), oldAction->Name());
+            oldAction->Finalize(*GetOwner());
+        }
+        // in this point we delete last link to UnitActionPtr, after this UnitAction be auto-deleted...
+    }
+}
+
+void UnitStateMgr::DropActionHigherThen(UnitActionPriority priority)
+{
+    for (int32 i = priority + 1; i != UNIT_ACTION_PRIORITY_END; ++i)
+        DropAction(UnitActionPriority(i));
+}
+
+void UnitStateMgr::PushAction(UnitActionId actionId)
+{
+    UnitActionPtr state = CreateStandartState(actionId);
+    PushAction(actionId, state, staticActionInfo[actionId].priority, staticActionInfo[actionId].restoreable); 
+}
+
+void UnitStateMgr::PushAction(UnitActionId actionId, UnitActionPriority priority)
+{
+    UnitActionPtr state = CreateStandartState(actionId);
+    PushAction(actionId, state, priority, ACTION_TYPE_NONRESTOREABLE);
+}
+
+void UnitStateMgr::PushAction(UnitActionId actionId, UnitActionPtr state)
+{
+    PushAction(actionId, state, staticActionInfo[actionId].priority, staticActionInfo[actionId].restoreable); 
+}
+
+void UnitStateMgr::PushAction(UnitActionId actionId, UnitActionPtr state, UnitActionPriority priority, eActionType restoreable)
+{
+    ActionInfo* oldInfo = CurrentState();
+    UnitActionPriority _priority = oldInfo ? oldInfo->priority : UNIT_ACTION_PRIORITY_IDLE;
+
+    // Only interrupt action, if not drop his below and action lower by priority
+    if (oldInfo &&
+        oldInfo->HasFlag(ACTION_STATE_ACTIVE) && 
+        oldInfo->Id != actionId &&
+        _priority < priority)
+        oldInfo->Interrupt(this);
+
+    if (_priority > UNIT_ACTION_PRIORITY_IDLE)
+    {
+        // Some speedup - testing - not need drop Idle/None actions
+        DropAction(actionId, priority);
+        DropAction(priority);
+    }
+
+    bool needInsert = true;
+
+    if (restoreable != ACTION_TYPE_NONRESTOREABLE)
+    {
+        // Don't replace (only interrupt and reset!) restoreable actions
+        UnitActionStorage::iterator itr = m_actions.find(priority);
+        if (itr != m_actions.end())
+        {
+            if (itr->second.Id == actionId)
+            {
+                itr->second.Reset(this);
+                needInsert = false;
+            }
+        }
+    }
+
+    if (needInsert)
+        m_actions.insert(UnitActionStorage::value_type(priority,ActionInfo(actionId, state, priority, restoreable)));
+
+    IncreaseCounter(actionId);
+/*
+    ActionInfo* newInfo = CurrentState();
+    if (newInfo && newInfo != oldInfo)
+    {
+        if (!newInfo->HasFlag(ACTION_STATE_INITIALIZED))
+            newInfo->Initialize(this);
+    }
+*/
+}
+
+ActionInfo* UnitStateMgr::GetAction(UnitActionPriority priority)
+{
+    for (UnitActionStorage::reverse_iterator itr = m_actions.rbegin(); itr != m_actions.rend(); ++itr)
+        if (itr->first == priority)
+            return &itr->second;
+    return NULL;
+}
+
+ActionInfo* UnitStateMgr::GetAction(UnitActionPtr _action)
+{
+    for (UnitActionStorage::iterator itr = m_actions.begin(); itr != m_actions.end(); ++itr)
+        if (itr->second.Action() == _action)
+            return &itr->second;
+    return NULL;
+}
+
+ActionInfo* UnitStateMgr::GetAction(UnitActionId actionId)
+{
+    for (UnitActionStorage::reverse_iterator itr = m_actions.rbegin(); itr != m_actions.rend(); ++itr)
+        if (itr->second.Id == actionId)
+            return &itr->second;
+    return NULL;
+}
+
+UnitActionPtr UnitStateMgr::CurrentAction()
+{
+    ActionInfo* action = CurrentState();
+    return action ? action->Action() : UnitActionPtr(NULL);
+}
+
+ActionInfo* UnitStateMgr::CurrentState()
+{
+    return m_actions.empty() ? NULL : &m_actions.rbegin()->second;
+}
+
+void UnitStateMgr::DropAllStates()
+{
+    // Assume, that if only one action - that IDLE appears (rechecked later).
+    if (m_actions.size() > 1 )
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "UnitStateMgr:DropAllStates %s drop all active states (count = %u)", GetOwnerStr().c_str(), m_actions.size());
+        DropActionHigherThen(UNIT_ACTION_PRIORITY_IDLE);
+    }
+    // Unique action after dropping may be not UNIT_ACTION_IDLE
+    if (m_actions.empty() || GetCurrentState() != UNIT_ACTION_IDLE)
+        PushAction(UNIT_ACTION_IDLE);
+}
+
+std::string const UnitStateMgr::GetOwnerStr() 
+{
+    return GetOwner()->IsInWorld() ? GetOwner()->GetGuidStr() : "<Uninitialized>"; 
+};
+
+bool ActionInfo::operator == (ActionInfo& val)
+{
+    return (Action() == val.Action());
+};
+
+bool ActionInfo::operator == (UnitActionPtr _action)
+{
+    return (Action() == _action);
+};
+
+bool ActionInfo::operator != (ActionInfo& val)
+{
+    return (Action() != val.Action());
+};
+
+bool ActionInfo::operator != (UnitActionPtr _action)
+{
+    return (Action() != _action);
+};
+
+void ActionInfo::Delete()
+{
+    delete this;
+}
+
+void ActionInfo::Initialize(UnitStateMgr* mgr)
+{
+    if (HasFlag(ACTION_STATE_FINALIZED))
+        return;
+
+    MAPLOCK_READ(mgr->GetOwner(), MAP_LOCK_TYPE_MOVEMENT);
+    if (!HasFlag(ACTION_STATE_INITIALIZED) && Action())
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "ActionInfo: %s initialize action %s", mgr->GetOwnerStr().c_str(), TypeName());
+        Action()->Initialize(*mgr->GetOwner());
+        AddFlag(ACTION_STATE_INITIALIZED);
+    }
+    else if (Action())
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "ActionInfo: %s reset action %s", mgr->GetOwnerStr().c_str(), TypeName());
+        Action()->Reset(*mgr->GetOwner());
+        RemoveFlag(ACTION_STATE_INTERRUPTED);
+    }
+    RemoveFlag(ACTION_STATE_INTERRUPTED);
+}
+
+void ActionInfo::Finalize(UnitStateMgr* mgr)
+{
+    if (!HasFlag(ACTION_STATE_INITIALIZED) || 
+        HasFlag(ACTION_STATE_FINALIZED))
+        return;
+
+    MAPLOCK_READ(mgr->GetOwner(), MAP_LOCK_TYPE_MOVEMENT);
+    AddFlag(ACTION_STATE_FINALIZED);
+    RemoveFlag(ACTION_STATE_ACTIVE);
+
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "ActionInfo: %s finalize action %s", mgr->GetOwnerStr().c_str(), TypeName());
+
+    if (Action())
+        Action()->Finalize(*mgr->GetOwner());
+}
+
+void ActionInfo::Interrupt(UnitStateMgr* mgr)
+{
+    if (!HasFlag(ACTION_STATE_INITIALIZED) || 
+        HasFlag(ACTION_STATE_FINALIZED) ||
+        HasFlag(ACTION_STATE_INTERRUPTED))
+        return;
+
+    MAPLOCK_READ(mgr->GetOwner(), MAP_LOCK_TYPE_MOVEMENT);
+    AddFlag(ACTION_STATE_INTERRUPTED);
+    RemoveFlag(ACTION_STATE_ACTIVE);
+
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "ActionInfo: %s interrupt action %s", mgr->GetOwnerStr().c_str(), TypeName());
+
+    if (Action())
+        Action()->Interrupt(*mgr->GetOwner());
+}
+
+void ActionInfo::Reset(UnitStateMgr* mgr)
+{
+    if (!HasFlag(ACTION_STATE_INITIALIZED))
+        return;
+
+    if (!HasFlag(ACTION_STATE_INTERRUPTED) && 
+        HasFlag(ACTION_STATE_ACTIVE))
+        Interrupt(mgr);
+
+    RemoveFlag(ACTION_STATE_INITIALIZED);
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "ActionInfo: %s reset action %s", mgr->GetOwnerStr().c_str(), TypeName());
+}
+
+bool ActionInfo::Update(UnitStateMgr* mgr, uint32 diff)
+{
+    if (Action() && 
+        (!HasFlag(ACTION_STATE_INITIALIZED) ||
+        HasFlag(ACTION_STATE_INTERRUPTED)))
+        Initialize(mgr);
+
+    AddFlag(ACTION_STATE_ACTIVE);
+
+    // DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "ActionInfo: %s update action %s", mgr->GetOwnerStr().c_str(), TypeName());
+
+    if (Action())
+        return Action()->Update(*mgr->GetOwner(), diff);
+    else
+        return false;
+}
+
+const char* ActionInfo::TypeName() const 
+{
+    return (action ? action->Name() : "<empty>");
+}
diff --git a/src/game/StateMgr.h b/src/game/StateMgr.h
new file mode 100644
index 00000000000..7b604480d4c
--- /dev/null
+++ b/src/game/StateMgr.h
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2011-2013 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/* StateMgr based on idea and part of code from SilverIce (http:://github.com/SilverIce
+*/
+#ifndef _STATEMGR_H
+#define _STATEMGR_H
+
+#include "ObjectHandler.h"
+#include "Common.h"
+#include "MotionMaster.h"
+#include "StateMgrImpl.h"
+#include "movementGenerators/MovementGenerator.h"
+#include "Log.h"
+#include <sstream>
+#include <algorithm>
+#pragma once
+
+class Unit;
+class UnitStateMgr;
+
+class ActionInfo
+{
+public:
+    ActionInfo(UnitActionId _Id, UnitActionPtr _action, UnitActionPriority _priority, bool _restoreable)
+        : Id(_Id), action(_action), priority(_priority), m_flags(0), restoreable(_restoreable)
+    {}
+
+    ~ActionInfo() {};
+
+    bool operator == (ActionInfo& val);
+    bool operator == (UnitActionPtr _action);
+    bool operator != (ActionInfo& val);
+    bool operator != (UnitActionPtr _action);
+
+    void Delete();
+    void Reset(UnitStateMgr* mgr);
+    void Initialize(UnitStateMgr* mgr);
+    void Finalize(UnitStateMgr* mgr);
+    void Interrupt(UnitStateMgr* mgr);
+    bool Update(UnitStateMgr* mgr, uint32 diff);
+    UnitActionPtr Action() { return action; };
+
+    const char* TypeName() const;
+
+    UnitActionId GetId() const             { return Id; };
+    UnitActionPriority GetPriority() const { return priority; };
+
+    uint32 const&  GetFlags();
+    void           SetFlags(uint32 flags);
+    void           AddFlag(ActionUpdateState state) { m_flags |= (1 << state); };
+    void           RemoveFlag(ActionUpdateState state) { m_flags &= ~(1 << state); };
+    bool           HasFlag(ActionUpdateState state) const { return (m_flags & (1 << state)); };
+
+    UnitActionId       Id;
+    UnitActionPtr      action;
+    UnitActionPriority priority;
+    uint32             m_flags;
+    bool               restoreable;
+
+    private:
+    // Don't must be created uninitialized
+    ActionInfo() {};
+//    ActionInfo(ActionInfo const& _action) {};
+};
+
+typedef std::map<UnitActionPriority, ActionInfo> UnitActionStorage;
+
+class UnitStateMgr
+{
+
+protected:
+    UnitStateMgr(const UnitStateMgr&);
+    UnitStateMgr& operator = (const UnitStateMgr&);
+
+public:
+    explicit UnitStateMgr(Unit* owner);
+    ~UnitStateMgr();
+
+    void InitDefaults(bool immediate = true);
+
+    void Update(uint32 diff);
+
+    static UnitActionPtr CreateStandartState(UnitActionId stateId, ...);
+
+    void DropAction(UnitActionId actionId);
+    void DropAction(UnitActionId actionId, UnitActionPriority priority);
+    void DropAction(UnitActionPriority priority);
+    void DropActionHigherThen(UnitActionPriority priority);
+
+    void DropAllStates();
+
+    void PushAction(UnitActionId actionId);
+    void PushAction(UnitActionId actionId, UnitActionPriority priority);
+    void PushAction(UnitActionId actionId, UnitActionPtr state);
+    void PushAction(UnitActionId actionId, UnitActionPtr state, UnitActionPriority priority, eActionType restoreable);
+
+    ActionInfo* GetAction(UnitActionPriority priority);
+    ActionInfo* GetAction(UnitActionPtr _action);
+    ActionInfo* GetAction(UnitActionId actionId);
+
+    UnitActionStorage const& GetActions() { return m_actions; };
+
+    UnitActionPtr CurrentAction();
+    ActionInfo*   CurrentState();
+
+    UnitActionId  GetCurrentState()  const { return m_actions.empty() ? UNIT_ACTION_IDLE : m_actions.rbegin()->second.GetId(); };
+    Unit*         GetOwner()         const { return m_owner; };
+
+    std::string const GetOwnerStr();
+
+    // State counters
+    uint32 const&     GetCounter(UnitActionId id) { return m_stateCounter[id]; };
+    void              IncreaseCounter(UnitActionId id) { ++m_stateCounter[id]; };
+
+private:
+    UnitActionStorage m_actions;
+    Unit*             m_owner;
+    UnitActionPtr     m_oldAction;
+    uint32            m_stateCounter[UNIT_ACTION_END];
+    bool              m_needReinit;
+
+};
+
+#endif
diff --git a/src/game/StateMgrImpl.h b/src/game/StateMgrImpl.h
new file mode 100644
index 00000000000..24f300a7aed
--- /dev/null
+++ b/src/game/StateMgrImpl.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _STATEMGRIMPL_H
+#define _STATEMGRIMPL_H
+
+#include "Common.h"
+#pragma once
+
+// values 0 ... MAX_DB_MOTION_TYPE-1 used in DB
+enum MovementGeneratorType
+{
+    IDLE_MOTION_TYPE                = 0,                    // IdleMovementGenerator.h
+    RANDOM_MOTION_TYPE              = 1,                    // RandomMovementGenerator.h
+    WAYPOINT_MOTION_TYPE            = 2,                    // WaypointMovementGenerator.h
+    MAX_DB_MOTION_TYPE              = 3,                    // *** this and below motion types can't be set in DB.
+
+    CONFUSED_MOTION_TYPE            = 4,                    // ConfusedMovementGenerator.h
+    CHASE_MOTION_TYPE               = 5,                    // TargetedMovementGenerator.h
+    HOME_MOTION_TYPE                = 6,                    // HomeMovementGenerator.h
+    FLIGHT_MOTION_TYPE              = 7,                    // WaypointMovementGenerator.h
+    POINT_MOTION_TYPE               = 8,                    // PointMovementGenerator.h
+    FLEEING_MOTION_TYPE             = 9,                    // FleeingMovementGenerator.h
+    DISTRACT_MOTION_TYPE            = 10,                   // IdleMovementGenerator.h
+    ASSISTANCE_MOTION_TYPE          = 11,                   // PointMovementGenerator.h (first part of flee for assistance)
+    ASSISTANCE_DISTRACT_MOTION_TYPE = 12,                   // IdleMovementGenerator.h (second part of flee for assistance)
+    TIMED_FLEEING_MOTION_TYPE       = 13,                   // FleeingMovementGenerator.h (alt.second part of flee for assistance)
+    FOLLOW_MOTION_TYPE              = 14,                   // TargetedMovementGenerator.h
+    EFFECT_MOTION_TYPE              = 15,
+};
+
+/** List of default unit's state providen by MaNGOS */
+enum UnitActionId
+{
+    UNIT_ACTION_IDLE,
+    UNIT_ACTION_DOWAYPOINTS,
+    UNIT_ACTION_HOME,
+    UNIT_ACTION_CHASE,
+    UNIT_ACTION_ASSISTANCE,
+    UNIT_ACTION_CONTROLLED,
+    UNIT_ACTION_CONFUSED,
+    UNIT_ACTION_FEARED,
+    UNIT_ACTION_ROOT,
+    UNIT_ACTION_STUN,
+    UNIT_ACTION_FEIGNDEATH,
+    UNIT_ACTION_ONVEHICLE,
+    UNIT_ACTION_TAXI,
+    UNIT_ACTION_EFFECT,
+    UNIT_ACTION_END,
+};
+
+/** List of default unit's state priorityes */
+enum UnitActionPriority
+{
+    UNIT_ACTION_PRIORITY_NONE        = -1,
+    UNIT_ACTION_PRIORITY_IDLE        =  0,
+    UNIT_ACTION_PRIORITY_DOWAYPOINTS =  1,
+    UNIT_ACTION_PRIORITY_HOME        =  2,
+    UNIT_ACTION_PRIORITY_CHASE       =  3,
+    UNIT_ACTION_PRIORITY_ASSISTANCE  =  4,
+    UNIT_ACTION_PRIORITY_CONTROLLED  =  5,
+    UNIT_ACTION_PRIORITY_CONFUSED    =  6,
+    UNIT_ACTION_PRIORITY_FEARED      =  7,
+    UNIT_ACTION_PRIORITY_ROOT        =  8,
+    UNIT_ACTION_PRIORITY_STUN        =  9,
+    UNIT_ACTION_PRIORITY_FEIGNDEATH  = 10,
+    UNIT_ACTION_PRIORITY_ONVEHICLE   = 11,
+    UNIT_ACTION_PRIORITY_TAXI        = 12,
+    UNIT_ACTION_PRIORITY_EFFECT      = 13,
+    UNIT_ACTION_PRIORITY_IMMEDIATE   = 14,
+    UNIT_ACTION_PRIORITY_END,
+};
+
+enum eActionType
+{
+    ACTION_TYPE_NONRESTOREABLE = 0,                   // Action NOT be restored after interrupt (effect type)
+    ACTION_TYPE_RESTOREABLE    = 1,                   // Action be restored after interrupt (normal type)
+    ACTION_TYPE_REPLACEABLE    = 2,                   // Action be restored after interrupt, some attributes 
+                                                      // removed only on finalize, not in interrupted state
+    ACTION_TYPE_END,
+};
+
+enum ActionUpdateState
+{
+    ACTION_STATE_ACTIVE      = 0,                     // updated at least one time and not interrupted
+    ACTION_STATE_INITIALIZED = 1,                     // Already initialized one time
+    ACTION_STATE_EXECUTED    = 2,                     // Executed in current time (NUN)
+    ACTION_STATE_INTERRUPTED = 3,                     // In stack, but interrupted
+    ACTION_STATE_FINALIZED   = 4,                     // Finalized, awaiting delete
+    ACTION_STATE_END
+};
+
+struct StaticActionInfo
+{
+    explicit StaticActionInfo() : priority(UNIT_ACTION_PRIORITY_IDLE), restoreable(ACTION_TYPE_RESTOREABLE) {}
+
+    explicit StaticActionInfo(UnitActionPriority _priority, eActionType _restoreable = ACTION_TYPE_RESTOREABLE) : priority(_priority), restoreable(_restoreable) {}
+
+    void operator()(UnitActionPriority _priority, eActionType _restoreable = ACTION_TYPE_RESTOREABLE) 
+    {
+        priority = _priority;
+        restoreable = _restoreable;
+    }
+
+    UnitActionPriority priority;
+    eActionType        restoreable;
+};
+
+class Unit;
+class UnitAction
+{
+    public:
+    virtual ~UnitAction() {}
+
+    virtual void Interrupt(Unit &) = 0;
+    virtual void Reset(Unit &) = 0;
+    virtual void Initialize(Unit &) = 0;
+    virtual void Finalize(Unit &) = 0;
+
+    virtual bool IsReachable() const { return true; };
+    virtual const char* Name() const { return "<Uninitialized>"; };
+    virtual MovementGeneratorType GetMovementGeneratorType() const = 0;
+    virtual void UnitSpeedChanged() {};
+
+    /* Returns true to show that state expired and can be finalized. */
+    virtual bool Update(Unit &, const uint32& diff) = 0;
+};
+
+#endif
\ No newline at end of file
diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp
deleted file mode 100644
index 0f8271acfd5..00000000000
--- a/src/game/TargetedMovementGenerator.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "ByteBuffer.h"
-#include "TargetedMovementGenerator.h"
-#include "Errors.h"
-#include "Creature.h"
-#include "Player.h"
-#include "World.h"
-#include "movement/MoveSplineInit.h"
-#include "movement/MoveSpline.h"
-
-//-----------------------------------------------//
-template<class T, typename D>
-void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T &owner)
-{
-    if (!i_target.isValid() || !i_target->IsInWorld())
-        return;
-
-    if (owner.hasUnitState(UNIT_STAT_NOT_MOVE))
-        return;
-
-    float x, y, z;
-
-    // prevent redundant micro-movement for pets, other followers.
-    if (i_offset && i_target->IsWithinDistInMap(&owner,2*i_offset))
-    {
-        if (!owner.movespline->Finalized())
-            return;
-
-        owner.GetPosition(x, y, z);
-    }
-    else if (!i_offset)
-    {
-        // to nearest contact position
-        i_target->GetContactPoint( &owner, x, y, z );
-    }
-    else
-    {
-        // to at i_offset distance from target and i_angle from target facing
-        i_target->GetClosePoint(x, y, z, owner.GetObjectBoundingRadius(), i_offset, i_angle, &owner);
-    }
-
-    /*
-        We MUST not check the distance difference and avoid setting the new location for smaller distances.
-        By that we risk having far too many GetContactPoint() calls freezing the whole system.
-        In TargetedMovementGenerator<T>::Update() we check the distance to the target and at
-        some range we calculate a new position. The calculation takes some processor cycles due to vmaps.
-        If the distance to the target it too large to ignore,
-        but the distance to the new contact point is short enough to be ignored,
-        we will calculate a new contact point each update loop, but will never move to it.
-        The system will freeze.
-        ralf
-
-        //We don't update Mob Movement, if the difference between New destination and last destination is < BothObjectSize
-        float  bothObjectSize = i_target->GetObjectBoundingRadius() + owner.GetObjectBoundingRadius() + CONTACT_DISTANCE;
-        if( i_destinationHolder.HasDestination() && i_destinationHolder.GetDestinationDiff(x,y,z) < bothObjectSize )
-            return;
-    */
-
-    if(!i_path)
-        i_path = new PathFinder(&owner);
-
-    // allow pets following their master to cheat while generating paths
-    bool forceDest = (owner.GetTypeId() == TYPEID_UNIT && ((Creature*)&owner)->IsPet()
-                        && owner.hasUnitState(UNIT_STAT_FOLLOW));
-    i_path->calculate(x, y, z, forceDest);
-    if(i_path->getPathType() & PATHFIND_NOPATH)
-        return;
-
-    D::_addUnitStateMove(owner);
-    i_targetReached = false;
-    i_recalculateTravel = false;
-
-    Movement::MoveSplineInit init(owner);
-    init.MovebyPath(i_path->getPath());
-    init.SetWalk(((D*)this)->EnableWalking());
-    init.Launch();
-}
-
-template<>
-void TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::UpdateFinalDistance(float /*fDistance*/)
-{
-    // nothing to do for Player
-}
-
-template<>
-void TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::UpdateFinalDistance(float /*fDistance*/)
-{
-    // nothing to do for Player
-}
-
-template<>
-void TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::UpdateFinalDistance(float fDistance)
-{
-    i_offset = fDistance;
-    i_recalculateTravel = true;
-}
-
-template<>
-void TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::UpdateFinalDistance(float fDistance)
-{
-    i_offset = fDistance;
-    i_recalculateTravel = true;
-}
-
-template<class T, typename D>
-bool TargetedMovementGeneratorMedium<T,D>::Update(T &owner, const uint32 & time_diff)
-{
-    if (!i_target.isValid() || !i_target->IsInWorld())
-        return false;
-
-    if (!owner.isAlive())
-        return true;
-
-    if (owner.hasUnitState(UNIT_STAT_NOT_MOVE))
-    {
-        D::_clearUnitStateMove(owner);
-        return true;
-    }
-
-    // prevent movement while casting spells with cast time or channel time
-    if (owner.IsNonMeleeSpellCasted(false, false,  true))
-    {
-        if (!owner.IsStopped())
-            owner.StopMoving();
-        return true;
-    }
-
-    // prevent crash after creature killed pet
-    if (static_cast<D*>(this)->_lostTarget(owner))
-    {
-        D::_clearUnitStateMove(owner);
-        return true;
-    }
-
-    i_recheckDistance.Update(time_diff);
-    if (i_recheckDistance.Passed())
-    {
-        i_recheckDistance.Reset(100);
-
-        //More distance let have better performance, less distance let have more sensitive reaction at target move.
-        float allowed_dist = owner.GetObjectBoundingRadius() + sWorld.getConfig(CONFIG_FLOAT_RATE_TARGET_POS_RECALCULATION_RANGE);
-        G3D::Vector3 dest = owner.movespline->FinalDestination();
-
-        bool targetMoved = false;
-        if (owner.GetTypeId() == TYPEID_UNIT && ((Creature*)&owner)->CanFly())
-            targetMoved = !i_target->IsWithinDist3d(dest.x, dest.y, dest.z, allowed_dist);
-        else
-            targetMoved = !i_target->IsWithinDist2d(dest.x, dest.y, allowed_dist);
-
-        if (targetMoved)
-            _setTargetLocation(owner);
-    }
-
-    if (owner.movespline->Finalized())
-    {
-        if (i_angle == 0.f && !owner.HasInArc(0.01f, i_target.getTarget()))
-            owner.SetInFront(i_target.getTarget());
-
-        if (!i_targetReached)
-        {
-            i_targetReached = true;
-            static_cast<D*>(this)->_reachTarget(owner);
-        }
-    }
-    else
-    {
-        if (i_recalculateTravel)
-            _setTargetLocation(owner);
-    }
-    return true;
-}
-
-//-----------------------------------------------//
-template<class T>
-void ChaseMovementGenerator<T>::_reachTarget(T &owner)
-{
-    if (owner.CanReachWithMeleeAttack(this->i_target.getTarget()))
-        owner.Attack(this->i_target.getTarget(),true);
-}
-
-template<>
-void ChaseMovementGenerator<Player>::Initialize(Player &owner)
-{
-    owner.addUnitState(UNIT_STAT_CHASE|UNIT_STAT_CHASE_MOVE);
-    _setTargetLocation(owner);
-}
-
-template<>
-void ChaseMovementGenerator<Creature>::Initialize(Creature &owner)
-{
-    owner.SetWalk(false);
-    owner.addUnitState(UNIT_STAT_CHASE|UNIT_STAT_CHASE_MOVE);
-    _setTargetLocation(owner);
-}
-
-template<class T>
-void ChaseMovementGenerator<T>::Finalize(T &owner)
-{
-    owner.clearUnitState(UNIT_STAT_CHASE|UNIT_STAT_CHASE_MOVE);
-}
-
-template<class T>
-void ChaseMovementGenerator<T>::Interrupt(T &owner)
-{
-    owner.clearUnitState(UNIT_STAT_CHASE|UNIT_STAT_CHASE_MOVE);
-}
-
-template<class T>
-void ChaseMovementGenerator<T>::Reset(T &owner)
-{
-    Initialize(owner);
-}
-
-//-----------------------------------------------//
-template<>
-bool FollowMovementGenerator<Creature>::EnableWalking() const
-{
-    return i_target.isValid() && i_target->IsWalking();
-}
-
-template<>
-bool FollowMovementGenerator<Player>::EnableWalking() const
-{
-    return false;
-}
-
-template<>
-void FollowMovementGenerator<Player>::_updateSpeed(Player &/*u*/)
-{
-    // nothing to do for Player
-}
-
-template<>
-void FollowMovementGenerator<Creature>::_updateSpeed(Creature &u)
-{
-    // pet only sync speed with owner
-    if (!((Creature&)u).IsPet() || !i_target.isValid() || i_target->GetObjectGuid() != u.GetOwnerGuid())
-        return;
-
-    u.UpdateSpeed(MOVE_RUN,true);
-    u.UpdateSpeed(MOVE_WALK,true);
-    u.UpdateSpeed(MOVE_SWIM,true);
-}
-
-template<>
-void FollowMovementGenerator<Player>::Initialize(Player &owner)
-{
-    owner.addUnitState(UNIT_STAT_FOLLOW|UNIT_STAT_FOLLOW_MOVE);
-    _updateSpeed(owner);
-    _setTargetLocation(owner);
-}
-
-template<>
-void FollowMovementGenerator<Creature>::Initialize(Creature &owner)
-{
-    owner.addUnitState(UNIT_STAT_FOLLOW|UNIT_STAT_FOLLOW_MOVE);
-    _updateSpeed(owner);
-    _setTargetLocation(owner);
-}
-
-template<class T>
-void FollowMovementGenerator<T>::Finalize(T &owner)
-{
-    owner.clearUnitState(UNIT_STAT_FOLLOW|UNIT_STAT_FOLLOW_MOVE);
-    _updateSpeed(owner);
-}
-
-template<class T>
-void FollowMovementGenerator<T>::Interrupt(T &owner)
-{
-    owner.clearUnitState(UNIT_STAT_FOLLOW|UNIT_STAT_FOLLOW_MOVE);
-    _updateSpeed(owner);
-}
-
-template<class T>
-void FollowMovementGenerator<T>::Reset(T &owner)
-{
-    Initialize(owner);
-}
-
-//-----------------------------------------------//
-template void TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::_setTargetLocation(Player &);
-template void TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::_setTargetLocation(Player &);
-template void TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::_setTargetLocation(Creature &);
-template void TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::_setTargetLocation(Creature &);
-template bool TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::Update(Player &, const uint32 &);
-template bool TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::Update(Player &, const uint32 &);
-template bool TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::Update(Creature &, const uint32 &);
-template bool TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::Update(Creature &, const uint32 &);
-
-template void ChaseMovementGenerator<Player>::_reachTarget(Player &);
-template void ChaseMovementGenerator<Creature>::_reachTarget(Creature &);
-template void ChaseMovementGenerator<Player>::Finalize(Player &);
-template void ChaseMovementGenerator<Creature>::Finalize(Creature &);
-template void ChaseMovementGenerator<Player>::Interrupt(Player &);
-template void ChaseMovementGenerator<Creature>::Interrupt(Creature &);
-template void ChaseMovementGenerator<Player>::Reset(Player &);
-template void ChaseMovementGenerator<Creature>::Reset(Creature &);
-
-template void FollowMovementGenerator<Player>::Finalize(Player &);
-template void FollowMovementGenerator<Creature>::Finalize(Creature &);
-template void FollowMovementGenerator<Player>::Interrupt(Player &);
-template void FollowMovementGenerator<Creature>::Interrupt(Creature &);
-template void FollowMovementGenerator<Player>::Reset(Player &);
-template void FollowMovementGenerator<Creature>::Reset(Creature &);
diff --git a/src/game/TargetedMovementGenerator.h b/src/game/TargetedMovementGenerator.h
deleted file mode 100644
index d05e0d47148..00000000000
--- a/src/game/TargetedMovementGenerator.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef MANGOS_TARGETEDMOVEMENTGENERATOR_H
-#define MANGOS_TARGETEDMOVEMENTGENERATOR_H
-
-#include "MovementGenerator.h"
-#include "FollowerReference.h"
-#include "PathFinder.h"
-#include "Unit.h"
-
-class MANGOS_DLL_SPEC TargetedMovementGeneratorBase
-{
-    public:
-        TargetedMovementGeneratorBase(Unit &target) { i_target.link(&target, this); }
-        void stopFollowing() { }
-    protected:
-        FollowerReference i_target;
-};
-
-template<class T, typename D>
-class MANGOS_DLL_SPEC TargetedMovementGeneratorMedium
-: public MovementGeneratorMedium< T, D >, public TargetedMovementGeneratorBase
-{
-    protected:
-        TargetedMovementGeneratorMedium(Unit &target, float offset, float angle) :
-            TargetedMovementGeneratorBase(target), i_offset(offset), i_angle(angle),
-            i_recalculateTravel(false), i_targetReached(false), i_recheckDistance(0),
-            i_path(NULL)
-        {
-        }
-        ~TargetedMovementGeneratorMedium() { delete i_path; }
-
-    public:
-        bool Update(T &, const uint32 &);
-
-        bool IsReachable() const
-        {
-            return (i_path) ? (i_path->getPathType() & PATHFIND_NORMAL) : true;
-        }
-
-        Unit* GetTarget() const { return i_target.getTarget(); }
-
-        void unitSpeedChanged() { i_recalculateTravel=true; }
-        void UpdateFinalDistance(float fDistance);
-
-    protected:
-        void _setTargetLocation(T &);
-
-        ShortTimeTracker i_recheckDistance;
-        float i_offset;
-        float i_angle;
-        bool i_recalculateTravel : 1;
-        bool i_targetReached : 1;
-
-        PathFinder* i_path;
-};
-
-template<class T>
-class MANGOS_DLL_SPEC ChaseMovementGenerator : public TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >
-{
-    public:
-        ChaseMovementGenerator(Unit &target)
-            : TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >(target) {}
-        ChaseMovementGenerator(Unit &target, float offset, float angle)
-            : TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >(target, offset, angle) {}
-        ~ChaseMovementGenerator() {}
-
-        MovementGeneratorType GetMovementGeneratorType() const { return CHASE_MOTION_TYPE; }
-
-        void Initialize(T &);
-        void Finalize(T &);
-        void Interrupt(T &);
-        void Reset(T &);
-
-        static void _clearUnitStateMove(T &u) { u.clearUnitState(UNIT_STAT_CHASE_MOVE); }
-        static void _addUnitStateMove(T &u)  { u.addUnitState(UNIT_STAT_CHASE_MOVE); }
-        bool EnableWalking() const { return false;}
-        bool _lostTarget(T &u) const { return u.getVictim() != this->GetTarget(); }
-        void _reachTarget(T &);
-};
-
-template<class T>
-class MANGOS_DLL_SPEC FollowMovementGenerator : public TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >
-{
-    public:
-        FollowMovementGenerator(Unit &target)
-            : TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >(target){}
-        FollowMovementGenerator(Unit &target, float offset, float angle)
-            : TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >(target, offset, angle) {}
-        ~FollowMovementGenerator() {}
-
-        MovementGeneratorType GetMovementGeneratorType() const { return FOLLOW_MOTION_TYPE; }
-
-        void Initialize(T &);
-        void Finalize(T &);
-        void Interrupt(T &);
-        void Reset(T &);
-
-        static void _clearUnitStateMove(T &u) { u.clearUnitState(UNIT_STAT_FOLLOW_MOVE); }
-        static void _addUnitStateMove(T &u)  { u.addUnitState(UNIT_STAT_FOLLOW_MOVE); }
-        bool EnableWalking() const;
-        bool _lostTarget(T &) const { return false; }
-        void _reachTarget(T &) {}
-    private:
-        void _updateSpeed(T &u);
-};
-
-#endif
diff --git a/src/game/TaxiHandler.cpp b/src/game/TaxiHandler.cpp
index 40deee1377e..20edec47f39 100644
--- a/src/game/TaxiHandler.cpp
+++ b/src/game/TaxiHandler.cpp
@@ -26,7 +26,7 @@
 #include "Player.h"
 #include "UpdateMask.h"
 #include "Path.h"
-#include "WaypointMovementGenerator.h"
+#include "movementGenerators/WaypointMovementGenerator.h"
 
 void WorldSession::HandleTaxiNodeStatusQueryOpcode( WorldPacket & recv_data )
 {
@@ -111,19 +111,18 @@ void WorldSession::SendTaxiMenu( Creature* unit )
     DEBUG_LOG( "WORLD: Sent SMSG_SHOWTAXINODES" );
 }
 
-void WorldSession::SendDoFlight( uint32 mountDisplayId, uint32 path, uint32 pathNode )
+void WorldSession::SendDoFlight(uint32 mountDisplayId, uint32 path, uint32 pathNode)
 {
-    // remove fake death
-    if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
-        GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
-
-    while(GetPlayer()->GetMotionMaster()->GetCurrentMovementGeneratorType()==FLIGHT_MOTION_TYPE)
-        GetPlayer()->GetMotionMaster()->MovementExpired(false);
-
-    if (mountDisplayId)
-        GetPlayer()->Mount( mountDisplayId );
-
-    GetPlayer()->GetMotionMaster()->MoveTaxiFlight(path,pathNode);
+    if (path < sTaxiPathNodesByPath.size())
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "WorldSession::SendDoFlight %s taxi to (Path %u node %u, mount %u)", GetPlayer()->GetGuidStr().c_str(), path, pathNode, mountDisplayId);
+        GetPlayer()->GetUnitStateMgr().PushAction(UNIT_ACTION_TAXI,GetPlayer()->GetUnitStateMgr().CreateStandartState(UNIT_ACTION_TAXI,mountDisplayId,path,pathNode));
+    }
+    else
+    {
+        sLog.outError("WorldSession::SendDoFlight %s attempt taxi to (nonexistent Path %u node %u)",
+            GetPlayer()->GetGuidStr().c_str(), path, pathNode);
+    }
 }
 
 bool WorldSession::SendLearnNewTaxiNode( Creature* unit )
@@ -150,7 +149,16 @@ bool WorldSession::SendLearnNewTaxiNode( Creature* unit )
         return false;
 }
 
-void WorldSession::HandleActivateTaxiExpressOpcode ( WorldPacket & recv_data )
+void WorldSession::SendActivateTaxiReply(ActivateTaxiReply reply)
+{
+    WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
+    data << uint32(reply);
+    SendPacket(&data);
+
+    DEBUG_LOG("WORLD: Sent SMSG_ACTIVATETAXIREPLY");
+}
+
+void WorldSession::HandleActivateTaxiExpressOpcode(WorldPacket& recv_data)
 {
     DEBUG_LOG( "WORLD: Received CMSG_ACTIVATETAXIEXPRESS" );
 
@@ -171,6 +179,14 @@ void WorldSession::HandleActivateTaxiExpressOpcode ( WorldPacket & recv_data )
     {
         uint32 node;
         recv_data >> node;
+
+        if (!GetPlayer()->m_taxi.IsTaximaskNodeKnown(node) && !GetPlayer()->isTaxiCheater())
+        {
+            SendActivateTaxiReply(ERR_TAXINOTVISITED);
+            recv_data.rfinish();
+            return;
+        }
+
         nodes.push_back(node);
     }
 
@@ -205,12 +221,12 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recv_data)
     TaxiNodesEntry const* curDestNode = sTaxiNodesStore.LookupEntry(curDest);
 
     // far teleport case
-    if(curDestNode && curDestNode->map_id != GetPlayer()->GetMapId())
+    if (curDestNode && curDestNode->map_id != GetPlayer()->GetMapId())
     {
-        if(GetPlayer()->GetMotionMaster()->GetCurrentMovementGeneratorType()==FLIGHT_MOTION_TYPE)
+        if (GetPlayer()->IsInUnitState(UNIT_ACTION_TAXI))
         {
             // short preparations to continue flight
-            FlightPathMovementGenerator* flight = (FlightPathMovementGenerator*)(GetPlayer()->GetMotionMaster()->top());
+            FlightPathMovementGenerator* flight = (FlightPathMovementGenerator*)(GetPlayer()->GetMotionMaster()->CurrentMovementGenerator());
 
             flight->Interrupt(*GetPlayer());                // will reset at map landing
 
@@ -218,7 +234,7 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recv_data)
             TaxiPathNodeEntry const& node = flight->GetPath()[flight->GetCurrentNode()];
             flight->SkipCurrentNode();
 
-            GetPlayer()->TeleportTo(curDestNode->map_id,node.x,node.y,node.z,GetPlayer()->GetOrientation());
+            GetPlayer()->TeleportTo(curDestNode->map_id,node.x,node.y,node.z,GetPlayer()->GetOrientation(), TELE_TO_NODELAY);
         }
         return;
     }
@@ -272,5 +288,14 @@ void WorldSession::HandleActivateTaxiOpcode( WorldPacket & recv_data )
         return;
     }
 
+    if (!GetPlayer()->isTaxiCheater())
+    {
+        if (!GetPlayer()->m_taxi.IsTaximaskNodeKnown(nodes[0]) || !GetPlayer()->m_taxi.IsTaximaskNodeKnown(nodes[1]))
+        {
+            SendActivateTaxiReply(ERR_TAXINOTVISITED);
+            return;
+        }
+    }
+
     GetPlayer()->ActivateTaxiPathTo(nodes, npc);
 }
diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp
index 80aeaa92d55..7ad8d7cc640 100644
--- a/src/game/TemporarySummon.cpp
+++ b/src/game/TemporarySummon.cpp
@@ -19,134 +19,161 @@
 #include "TemporarySummon.h"
 #include "Log.h"
 #include "CreatureAI.h"
+#include "CellImpl.h"
+#include "GridNotifiersImpl.h"
+#include "GridNotifiers.h"
 
-TemporarySummon::TemporarySummon( ObjectGuid summoner ) :
-Creature(CREATURE_SUBTYPE_TEMPORARY_SUMMON), m_type(TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN), m_timer(0), m_lifetime(0), m_summoner(summoner)
+TemporarySummon::TemporarySummon(ObjectGuid summoner) :
+    Creature(CREATURE_SUBTYPE_TEMPORARY_SUMMON), m_type(TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN),
+    m_timer(0), m_lifetime(0), m_summoner(summoner), m_isActive(true)
 {
 }
 
-void TemporarySummon::Update( uint32 update_diff,  uint32 diff )
+void TemporarySummon::Update(uint32 update_diff, uint32 diff)
 {
-    switch(m_type)
+    TSUpdateActions ua = TSUA_NONE;
+
+    switch (m_type)
     {
         case TEMPSUMMON_MANUAL_DESPAWN:
             break;
-        case TEMPSUMMON_TIMED_DESPAWN:
+        case TEMPSUMMON_DEAD_DESPAWN:
         {
-            if (m_timer <= update_diff)
-            {
-                UnSummon();
-                return;
-            }
-
-            m_timer -= update_diff;
+            if (IsDespawned())
+                ua = TSUA_UNSUMMON;
             break;
         }
-        case TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT:
+        case TEMPSUMMON_CORPSE_DESPAWN:
         {
-            if (!isInCombat())
-            {
-                if (m_timer <= update_diff)
-                {
-                    UnSummon();
-                    return;
-                }
-
-                m_timer -= update_diff;
-            }
-            else if (m_timer != m_lifetime)
-                m_timer = m_lifetime;
-
+            // if m_deathState is DEAD, CORPSE was skipped
+            if (isDead())
+                ua = TSUA_UNSUMMON;
             break;
         }
-
         case TEMPSUMMON_CORPSE_TIMED_DESPAWN:
         {
-            if (IsCorpse())
-            {
-                if (m_timer <= update_diff)
-                {
-                    UnSummon();
-                    return;
-                }
-
-                m_timer -= update_diff;
-            }
+            if (IsDespawned())
+                ua = TSUA_UNSUMMON;
+            else if (IsCorpse())
+                ua = TSUA_CHECK_TIMER;
             break;
         }
-        case TEMPSUMMON_CORPSE_DESPAWN:
+        case TEMPSUMMON_TIMED_DESPAWN:
         {
-            // if m_deathState is DEAD, CORPSE was skipped
-            if (isDead())
-            {
-                UnSummon();
-                return;
-            }
-
+            ua = TSUA_CHECK_TIMER;
             break;
         }
-        case TEMPSUMMON_DEAD_DESPAWN:
+        case TEMPSUMMON_TIMED_OOC_DESPAWN:
         {
-            if (IsDespawned())
-            {
-                UnSummon();
-                return;
-            }
+            ua = isInCombat() ? TSUA_RESET_TIMER : TSUA_CHECK_TIMER;
+            break;
+        }
+        case TEMPSUMMON_TIMED_OR_DEAD_DESPAWN:
+        {
+            ua = IsDespawned() ? TSUA_UNSUMMON : TSUA_CHECK_TIMER;
             break;
         }
         case TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN:
         {
             // if m_deathState is DEAD, CORPSE was skipped
-            if (isDead())
-            {
-                UnSummon();
-                return;
-            }
-
-            if (!isInCombat())
-            {
-                if (m_timer <= update_diff)
-                {
-                    UnSummon();
-                    return;
-                }
-                else
-                    m_timer -= update_diff;
-            }
-            else if (m_timer != m_lifetime)
-                m_timer = m_lifetime;
+            ua = isDead() ? TSUA_UNSUMMON : TSUA_CHECK_TIMER;
             break;
         }
-        case TEMPSUMMON_TIMED_OR_DEAD_DESPAWN:
+        case TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN:
         {
-            // if m_deathState is DEAD, CORPSE was skipped
             if (IsDespawned())
+                ua = TSUA_UNSUMMON;
+            else
+                ua = (!isInCombat() && isAlive()) ? TSUA_CHECK_TIMER : TSUA_RESET_TIMER;
+            break;
+        }
+        case TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN:
+        {
+            if (isDead())
+                ua = TSUA_UNSUMMON;
+            else
+                ua = isInCombat() ? TSUA_RESET_TIMER : TSUA_CHECK_TIMER;
+            break;
+        }
+        case TEMPSUMMON_LOST_OWNER_DESPAWN:
+        case TEMPSUMMON_DEAD_OR_LOST_OWNER_DESPAWN:
+        {
+            if (m_type == TEMPSUMMON_DEAD_OR_LOST_OWNER_DESPAWN && IsDespawned())
+                ua = TSUA_UNSUMMON;
+            else if (!GetSummoner())
             {
-                UnSummon();
-                return;
-            }
-
-            if (!isInCombat() && isAlive() )
-            {
-                if (m_timer <= update_diff)
-                {
-                    UnSummon();
-                    return;
-                }
-                else
-                    m_timer -= update_diff;
+                m_type = TEMPSUMMON_TIMED_DESPAWN;
+                m_lifetime = DEFAULT_DESPAWN_DELAY;
+                ua = TSUA_RESET_TIMER;
             }
-            else if (m_timer != m_lifetime)
-                m_timer = m_lifetime;
+            break;
+        }
+        case TEMPSUMMON_TIMED_OR_DEAD_OR_LOST_OWNER_DESPAWN:
+        {
+            ua = (IsDespawned() || !GetSummoner()) ? TSUA_UNSUMMON : TSUA_CHECK_TIMER;
+            break;
+        }
+        case TEMPSUMMON_TIMED_OR_DEAD_OR_LOST_UNIQUENESS_DESPAWN:
+        {
+            ua = IsDespawned() ? TSUA_UNSUMMON : TSUpdateActions(TSUA_CHECK_UNIQUENESS | TSUA_CHECK_TIMER);
+            break;
+        }
+        case TEMPSUMMON_DEAD_OR_LOST_UNIQUENESS_DESPAWN:
+        {
+            ua = IsDespawned() ? TSUA_UNSUMMON : TSUA_CHECK_UNIQUENESS;
             break;
         }
         default:
-            UnSummon();
-            sLog.outError("Temporary summoned creature (entry: %u) have unknown type %u of ",GetEntry(),m_type);
+            ua = TSUA_UNSUMMON;
+            sLog.outError("Temporary summoned %s have unknown type %u of", GetGuidStr().c_str(), m_type);
             break;
     }
 
-    Creature::Update( update_diff, diff );
+    if (ua & TSUA_RESET_TIMER)
+    {
+        if (m_timer != m_lifetime)
+            m_timer = m_lifetime;
+    }
+    else if (ua & TSUA_CHECK_TIMER)
+    {
+        if (m_timer <= update_diff)
+            ua = TSUA_UNSUMMON;
+        else
+            m_timer -= update_diff;
+    }
+
+    if (ua & TSUA_CHECK_UNIQUENESS)
+    {
+        std::list<Creature*> tlist;
+        MaNGOS::AllIdenticalObjectsInRangeCheck check(this, GetMap()->GetVisibilityDistance());
+        MaNGOS::CreatureListSearcher<MaNGOS::AllIdenticalObjectsInRangeCheck> searcher(tlist, check);
+        Cell::VisitGridObjects(this, searcher, GetMap()->GetVisibilityDistance(), true);
+
+        for (std::list<Creature*>::const_iterator itr = tlist.begin(); itr != tlist.end(); ++itr)
+        {
+            Creature* pCre = *itr;
+            if (!pCre || !pCre->isAlive() || !pCre->IsTemporarySummon())
+                continue;
+
+            if (((TemporarySummon*)pCre)->GetTempSummonType() == GetTempSummonType() &&
+                ((TemporarySummon*)pCre)->GetSummonerGuid() == GetSummonerGuid())
+            {
+                ua = TSUA_UNSUMMON;
+                break;
+            }
+        }
+    }
+
+    if (ua & TSUA_UNSUMMON)
+    {
+        UnSummon();
+        return;
+    }
+
+    if (!m_isActive)
+        return;
+
+    Creature::Update(update_diff, diff);
 }
 
 void TemporarySummon::Summon(TempSummonType type, uint32 lifetime)
@@ -159,18 +186,41 @@ void TemporarySummon::Summon(TempSummonType type, uint32 lifetime)
     GetMap()->Add((Creature*)this);
 }
 
-void TemporarySummon::UnSummon()
+void TemporarySummon::UnSummon(uint32 delay)
 {
+    if (delay > 0)
+    {
+        m_type = TEMPSUMMON_TIMED_OR_DEAD_DESPAWN;
+        m_timer = delay;
+        return;
+    }
+
+    m_isActive = false;
+
     CombatStop();
 
     if (GetSummonerGuid().IsCreatureOrVehicle())
-        if(Creature* sum = GetMap()->GetCreature(GetSummonerGuid()))
+    {
+        if (Creature* sum = GetMap()->GetCreature(GetSummonerGuid()))
+        {
             if (sum->AI())
                 sum->AI()->SummonedCreatureDespawn(this);
+        }
+    }
+
+    KillAllEvents(false);
 
     AddObjectToRemoveList();
+
+    // Prevent double unsummonig before remove from world
+    m_type = TEMPSUMMON_MANUAL_DESPAWN;
 }
 
 void TemporarySummon::SaveToDB()
 {
 }
+
+bool TemporarySummon::IsDespawned() const
+{
+    return !m_isActive || getDeathState() == DEAD;
+}
diff --git a/src/game/TemporarySummon.h b/src/game/TemporarySummon.h
index 78488b08a9e..4d7f3a2124c 100644
--- a/src/game/TemporarySummon.h
+++ b/src/game/TemporarySummon.h
@@ -22,18 +22,32 @@
 #include "Creature.h"
 #include "ObjectAccessor.h"
 
+#define DEFAULT_DESPAWN_DELAY 5000
+
+enum TSUpdateActions
+{
+    TSUA_NONE                 = 0,
+    TSUA_UNSUMMON             = 1,
+    TSUA_RESET_TIMER          = 2,
+    TSUA_CHECK_TIMER          = 4,
+    TSUA_CHECK_UNIQUENESS     = 8
+};
+
 class TemporarySummon : public Creature
 {
     public:
         explicit TemporarySummon(ObjectGuid summoner = ObjectGuid());
         virtual ~TemporarySummon(){};
 
-        void Update(uint32 update_diff, uint32 time) override;
+        virtual void Update(uint32 update_diff, uint32 time) override;
         void Summon(TempSummonType type, uint32 lifetime);
-        void MANGOS_DLL_SPEC UnSummon();
+        void MANGOS_DLL_SPEC UnSummon(uint32 delay = 0);
         void SaveToDB();
         ObjectGuid const& GetSummonerGuid() const { return m_summoner ; }
         Unit* GetSummoner() const { return ObjectAccessor::GetUnit(*this, m_summoner); }
+        TempSummonType GetTempSummonType() const { return m_type; };
+        bool IsDespawned() const override;
+
     private:
         void SaveToDB(uint32, uint8, uint32)                // overwrited of Creature::SaveToDB     - don't must be called
         {
@@ -48,5 +62,6 @@ class TemporarySummon : public Creature
         uint32 m_timer;
         uint32 m_lifetime;
         ObjectGuid m_summoner;
+        bool       m_isActive;
 };
 #endif
diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp
index b2516913f6c..b4754f249d1 100644
--- a/src/game/ThreatManager.cpp
+++ b/src/game/ThreatManager.cpp
@@ -24,6 +24,8 @@
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "UnitEvents.h"
+#include "SpellMgr.h"
+#include "Vehicle.h"
 
 //==============================================================
 //================= ThreatCalcHelper ===========================
@@ -33,12 +35,12 @@
 float ThreatCalcHelper::CalcThreat(Unit* pHatedUnit, Unit* /*pHatingUnit*/, float threat, bool crit, SpellSchoolMask schoolMask, SpellEntry const *pThreatSpell)
 {
     // all flat mods applied early
-    if (!threat)
+    if (fabs(threat) < M_NULL_F)
         return 0.0f;
 
     if (pThreatSpell)
     {
-        if (pThreatSpell->HasAttribute(SPELL_ATTR_EX_NO_THREAT))
+        if (pThreatSpell->HasAttribute(SPELL_ATTR_EX_NO_THREAT)&& !IsSpellReduceThreat(pThreatSpell))
             return 0.0f;
 
         if (Player* modOwner = pHatedUnit->GetSpellModOwner())
@@ -93,7 +95,7 @@ void HostileReference::sourceObjectDestroyLink()
 
 void HostileReference::fireStatusChanged(ThreatRefStatusChangeEvent& pThreatRefStatusChangeEvent)
 {
-    if(getSource())
+    if (getSource())
         getSource()->processThreatEvent(&pThreatRefStatusChangeEvent);
 }
 
@@ -104,18 +106,19 @@ void HostileReference::addThreat(float pMod)
     iThreat += pMod;
     // the threat is changed. Source and target unit have to be availabe
     // if the link was cut before relink it again
-    if(!isOnline())
+    if (!isOnline())
         updateOnlineStatus();
-    if(pMod != 0.0f)
+
+    if (fabs(pMod) > M_NULL_F)
     {
         ThreatRefStatusChangeEvent event(UEV_THREAT_REF_THREAT_CHANGE, this, pMod);
         fireStatusChanged(event);
     }
 
-    if(isValid() && pMod >= 0)
+    if (isValid() && pMod >= 0.0f)
     {
         Unit* victim_owner = getTarget()->GetOwner();
-        if(victim_owner && victim_owner->isAlive())
+        if (victim_owner && victim_owner->isAlive())
             getSource()->addThreat(victim_owner, 0.0f);     // create a threat to the owner of a pet, if the pet attacks
     }
 }
@@ -137,15 +140,15 @@ void HostileReference::updateOnlineStatus()
     // ref is valid
     // target is no player or not gamemaster
     // target is not in flight
-    if(isValid() &&
+    if (isValid() &&
         ((getTarget()->GetTypeId() != TYPEID_PLAYER || !((Player*)getTarget())->isGameMaster()) ||
         !getTarget()->IsTaxiFlying()))
     {
-        Creature* creature = (Creature* ) getSourceUnit();
+        Creature* creature = (Creature*) getSourceUnit();
         online = getTarget()->isInAccessablePlaceFor(creature);
-        if(!online)
+        if (!online)
         {
-            if(creature->AI()->canReachByRangeAttack(getTarget()))
+            if (creature->AI()->canReachByRangeAttack(getTarget()))
                 online = true;                              // not accessable but stays online
         }
         else
@@ -161,10 +164,10 @@ void HostileReference::updateOnlineStatus()
 
 void HostileReference::setOnlineOfflineState(bool pIsOnline)
 {
-    if(iOnline != pIsOnline)
+    if (iOnline != pIsOnline)
     {
         iOnline = pIsOnline;
-        if(!iOnline)
+        if (!iOnline)
             setAccessibleState(false);                      // if not online that not accessable as well
 
         ThreatRefStatusChangeEvent event(UEV_THREAT_REF_ONLINE_STATUS, this);
@@ -176,7 +179,7 @@ void HostileReference::setOnlineOfflineState(bool pIsOnline)
 
 void HostileReference::setAccessibleState(bool pIsAccessible)
 {
-    if(iAccessible != pIsAccessible)
+    if (iAccessible != pIsAccessible)
     {
         iAccessible = pIsAccessible;
 
@@ -210,7 +213,7 @@ Unit* HostileReference::getSourceUnit()
 
 void ThreatContainer::clearReferences()
 {
-    for(ThreatList::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i)
+    for (ThreatList::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i)
     {
         (*i)->unlink();
         delete (*i);
@@ -222,18 +225,20 @@ void ThreatContainer::clearReferences()
 // Return the HostileReference of NULL, if not found
 HostileReference* ThreatContainer::getReferenceByTarget(Unit* pVictim)
 {
-    HostileReference* result = NULL;
+   if (!pVictim)
+        return NULL;
+
     ObjectGuid guid = pVictim->GetObjectGuid();
-    for(ThreatList::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i)
+    if (!guid)
+        return NULL;
+
+    for (ThreatList::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i)
     {
         if ((*i)->getUnitGuid() == guid)
-        {
-            result = (*i);
-            break;
-        }
+            return *i;
     }
 
-    return result;
+    return NULL;
 }
 
 //============================================================
@@ -242,18 +247,18 @@ HostileReference* ThreatContainer::getReferenceByTarget(Unit* pVictim)
 HostileReference* ThreatContainer::addThreat(Unit* pVictim, float pThreat)
 {
     HostileReference* ref = getReferenceByTarget(pVictim);
-    if(ref)
+    if (ref)
         ref->addThreat(pThreat);
     return ref;
 }
 
 //============================================================
 
-void ThreatContainer::modifyThreatPercent(Unit *pVictim, int32 pPercent)
+void ThreatContainer::modifyThreatPercent(Unit* pVictim, int32 pPercent)
 {
-    if(HostileReference* ref = getReferenceByTarget(pVictim))
+    if (HostileReference* ref = getReferenceByTarget(pVictim))
     {
-        if(pPercent < -100)
+        if (pPercent < -100)
         {
             ref->removeReference();
             delete ref;
@@ -276,19 +281,38 @@ bool HostileReferenceSortPredicate(const HostileReference* lhs, const HostileRef
 
 void ThreatContainer::update()
 {
-    if(iDirty && iThreatList.size() >1)
+    if (iDirty && iThreatList.size() > 1)
     {
         iThreatList.sort(HostileReferenceSortPredicate);
     }
     iDirty = false;
 }
 
+//============================================================
+// Check if a target is a second choice target for the attacker
+// if (bCheckThreatArea) consider IsOutOfThreatArea - expected to be only set for pCurrentVictim
+//     This prevents dropping valid targets due to 1.1 or 1.3 threat rule vs invalid current target
+// if (bCheckMeleeRange) consider CanReachWithMeleeAttack
+//     This is important for mobs that are stationary in combat
+
+// TODO - should such a independend function be made static?
+//bool ThreatContainer::IsSecondChoiceTarget(Creature* pAttacker, Unit* pTarget, bool bCheckThreatArea, bool bCheckMeleeRange)
+//{
+//    // This function must only be called for valid pAttacker and valid pTarget
+//    return
+//        pTarget->IsImmunedToDamage(pAttacker->GetMeleeDamageSchoolMask()) ||
+//        pTarget->hasNegativeAuraWithInterruptFlag(AURA_INTERRUPT_FLAG_DAMAGE) ||
+//        (bCheckThreatArea && pAttacker->IsOutOfThreatArea(pTarget)) ||
+//        (bCheckMeleeRange && !pAttacker->CanReachWithMeleeAttack(pTarget));
+//}
+
 //============================================================
 // return the next best victim
 // could be the current victim
 
-HostileReference* ThreatContainer::selectNextVictim(Creature* pAttacker, HostileReference* pCurrentVictim)
+HostileReference* ThreatContainer::selectNextVictim(Unit* pUnitAttacker, HostileReference* pCurrentVictim)
 {
+    Creature* pAttacker = (Creature*)pUnitAttacker;
     HostileReference* pCurrentRef = NULL;
     bool found = false;
     bool onlySecondChoiceTargetsFound = false;
@@ -302,7 +326,18 @@ HostileReference* ThreatContainer::selectNextVictim(Creature* pAttacker, Hostile
         pCurrentRef = (*iter);
 
         Unit* pTarget = pCurrentRef->getTarget();
-        MANGOS_ASSERT(pTarget);                             // if the ref has status online the target must be there!
+
+//        MANGOS_ASSERT(pTarget);                             // if the ref has status online the target must be there!
+
+        if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && !((Player*)pTarget)->isGameMaster() && pTarget->GetVehicle())
+        {
+            Unit* vehicleBase = pTarget->GetVehicle()->GetBase();
+            if (pUnitAttacker->IsHostileTo(vehicleBase))
+                pTarget = vehicleBase;
+        }
+
+        if (!pTarget)
+            continue;
 
         // some units are prefered in comparison to others
         // if (checkThreatArea) consider IsOutOfThreatArea - expected to be only set for pCurrentVictim
@@ -385,8 +420,8 @@ HostileReference* ThreatContainer::selectNextVictim(Creature* pAttacker, Hostile
 //=================== ThreatManager ==========================
 //============================================================
 
-ThreatManager::ThreatManager(Unit* owner)
-: iCurrentVictim(NULL), iOwner(owner), iUpdateTimer(THREAT_UPDATE_INTERVAL), iUpdateNeed(false)
+ThreatManager::ThreatManager(Unit& aOwner)
+: iCurrentVictim(NULL), owner(aOwner), iUpdateTimer(THREAT_UPDATE_INTERVAL), iUpdateNeed(false)
 {
 }
 
@@ -415,18 +450,22 @@ void ThreatManager::addThreat(Unit* pVictim, float pThreat, bool crit, SpellScho
         return;
 
     // not to GM
-    if (!pVictim || (pVictim->GetTypeId() == TYPEID_PLAYER && ((Player*)pVictim)->isGameMaster()) )
+    if (!pVictim || (pVictim->GetTypeId() == TYPEID_PLAYER && ((Player*)pVictim)->isGameMaster()))
         return;
 
     // not to dead and not for dead
-    if(!pVictim->isAlive() || !getOwner()->isAlive() )
+    if (!pVictim->isAlive() || !getOwner()->isAlive())
         return;
 
-    MANGOS_ASSERT(getOwner()->GetTypeId()== TYPEID_UNIT);
+    // not to friendly
+    if (!getOwner()->IsHostileTo(pVictim) || !pVictim->IsHostileTo(getOwner()))
+        return;
 
-    float threat = ThreatCalcHelper::CalcThreat(pVictim, iOwner, pThreat, crit, schoolMask, pThreatSpell);
+    MANGOS_ASSERT(getOwner()->GetTypeId() == TYPEID_UNIT);
 
-    if (threat > 0.0f)
+    float threat = ThreatCalcHelper::CalcThreat(pVictim, getOwner(), pThreat, crit, schoolMask, pThreatSpell);
+
+    if (threat > M_NULL_F)
     {
         if (float redirectedMod = pVictim->getHostileRefManager().GetThreatRedirectionMod())
         {
@@ -447,6 +486,10 @@ void ThreatManager::addThreat(Unit* pVictim, float pThreat, bool crit, SpellScho
 
 void ThreatManager::addThreatDirectly(Unit* pVictim, float threat)
 {
+    // not to self
+    if (pVictim == getOwner())
+        return;
+
     HostileReference* ref = iThreatContainer.addThreat(pVictim, threat);
     // Ref is online
     if (ref)
@@ -455,14 +498,14 @@ void ThreatManager::addThreatDirectly(Unit* pVictim, float threat)
     else
         ref = iThreatOfflineContainer.addThreat(pVictim, threat);
 
-    if(!ref)                                                // there was no ref => create a new one
+    if (!ref)                                                // there was no ref => create a new one
     {
         // threat has to be 0 here
         HostileReference* hostileReference = new HostileReference(pVictim, this, 0);
         iThreatContainer.addReference(hostileReference);
         hostileReference->addThreat(threat);                // now we add the real threat
         iUpdateNeed = true;
-        if(pVictim->GetTypeId() == TYPEID_PLAYER && ((Player*)pVictim)->isGameMaster())
+        if (pVictim->GetTypeId() == TYPEID_PLAYER && ((Player*)pVictim)->isGameMaster())
             hostileReference->setOnlineOfflineState(false); // GM is always offline
     }
 }
@@ -480,9 +523,19 @@ void ThreatManager::modifyThreatPercent(Unit *pVictim, int32 pPercent)
 Unit* ThreatManager::getHostileTarget()
 {
     iThreatContainer.update();
-    HostileReference* nextVictim = iThreatContainer.selectNextVictim((Creature*) getOwner(), getCurrentVictim());
+    HostileReference* nextVictim = iThreatContainer.selectNextVictim(getOwner(), getCurrentVictim());
     setCurrentVictim(nextVictim);
-    return getCurrentVictim() != NULL ? getCurrentVictim()->getTarget() : NULL;
+    if (!getCurrentVictim())
+        return NULL;
+
+    Unit* pTarget = getCurrentVictim()->getTarget();
+    if (!pTarget)
+        return NULL;
+
+    if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->GetVehicle())
+        pTarget = pTarget->GetVehicle()->GetBase();
+
+    return pTarget;
 }
 
 //============================================================
@@ -491,9 +544,9 @@ float ThreatManager::getThreat(Unit *pVictim, bool pAlsoSearchOfflineList)
 {
     float threat = 0.0f;
     HostileReference* ref = iThreatContainer.getReferenceByTarget(pVictim);
-    if(!ref && pAlsoSearchOfflineList)
+    if (!ref && pAlsoSearchOfflineList)
         ref = iThreatOfflineContainer.getReferenceByTarget(pVictim);
-    if(ref)
+    if (ref)
         threat = ref->getThreat();
     return threat;
 }
@@ -502,14 +555,14 @@ float ThreatManager::getThreat(Unit *pVictim, bool pAlsoSearchOfflineList)
 
 void ThreatManager::tauntApply(Unit* pTaunter)
 {
-    if(HostileReference* ref = iThreatContainer.getReferenceByTarget(pTaunter))
+    if (HostileReference* ref = iThreatContainer.getReferenceByTarget(pTaunter))
     {
-        if(getCurrentVictim() && (ref->getThreat() < getCurrentVictim()->getThreat()))
+        if (getCurrentVictim() && (ref->getThreat() < getCurrentVictim()->getThreat()))
         {
             // Ok, temp threat is unused
-            if(ref->getTempThreatModifyer() == 0.0f)
+            if (fabs(ref->getTempThreatModifyer()) < M_NULL_F)
             {
-                ref->setTempThreat(getCurrentVictim()->getThreat());
+                ref->setTempThreat(getCurrentVictim()->getThreat()*1.4f);
                 iUpdateNeed = true;
             }
         }
@@ -520,7 +573,7 @@ void ThreatManager::tauntApply(Unit* pTaunter)
 
 void ThreatManager::tauntFadeOut(Unit *pTaunter)
 {
-    if(HostileReference* ref = iThreatContainer.getReferenceByTarget(pTaunter))
+    if (HostileReference* ref = iThreatContainer.getReferenceByTarget(pTaunter))
     {
         ref->resetTempThreat();
         iUpdateNeed = true;
@@ -536,7 +589,7 @@ void ThreatManager::setCurrentVictim(HostileReference* pHostileReference)
         return;
 
     if (pHostileReference)
-        iOwner->SendHighestThreatUpdate(pHostileReference);
+        getOwner()->SendHighestThreatUpdate(pHostileReference);
 
     iCurrentVictim = pHostileReference;
     iUpdateNeed = true;
@@ -552,29 +605,30 @@ void ThreatManager::processThreatEvent(ThreatRefStatusChangeEvent* threatRefStat
 
     HostileReference* hostileReference = threatRefStatusChangeEvent->getReference();
 
-    switch(threatRefStatusChangeEvent->getType())
+    switch (threatRefStatusChangeEvent->getType())
     {
         case UEV_THREAT_REF_THREAT_CHANGE:
-            if((getCurrentVictim() == hostileReference && threatRefStatusChangeEvent->getFValue()<0.0f) ||
+            if ((getCurrentVictim() == hostileReference && threatRefStatusChangeEvent->getFValue()<0.0f) ||
                 (getCurrentVictim() != hostileReference && threatRefStatusChangeEvent->getFValue()>0.0f))
                 setDirty(true);                             // the order in the threat list might have changed
             break;
         case UEV_THREAT_REF_ONLINE_STATUS:
-            if(!hostileReference->isOnline())
+            if (!hostileReference->isOnline())
             {
                 if (hostileReference == getCurrentVictim())
                 {
                     setCurrentVictim(NULL);
                     setDirty(true);
                 }
-                iOwner->SendThreatRemove(hostileReference);
+                if (isOwnerOnline())
+                    getOwner()->SendThreatRemove(hostileReference);
                 iThreatContainer.remove(hostileReference);
                 iUpdateNeed = true;
                 iThreatOfflineContainer.addReference(hostileReference);
             }
             else
             {
-                if(getCurrentVictim() && hostileReference->getThreat() > (1.1f * getCurrentVictim()->getThreat()))
+                if (getCurrentVictim() && hostileReference->getThreat() > (1.1f * getCurrentVictim()->getThreat()))
                     setDirty(true);
                 iThreatContainer.addReference(hostileReference);
                 iUpdateNeed = true;
@@ -587,9 +641,11 @@ void ThreatManager::processThreatEvent(ThreatRefStatusChangeEvent* threatRefStat
                 setCurrentVictim(NULL);
                 setDirty(true);
             }
-            if(hostileReference->isOnline())
+
+            if (hostileReference->isOnline())
             {
-                iOwner->SendThreatRemove(hostileReference);
+                if (isOwnerOnline())
+                    getOwner()->SendThreatRemove(hostileReference);
                 iThreatContainer.remove(hostileReference);
                 iUpdateNeed = true;
             }
@@ -607,8 +663,24 @@ void ThreatManager::UpdateForClient(uint32 diff)
     iUpdateTimer.Update(diff);
     if (iUpdateTimer.Passed())
     {
-        iOwner->SendThreatUpdate();
+        getOwner()->SendThreatUpdate();
         iUpdateTimer.Reset(THREAT_UPDATE_INTERVAL);
         iUpdateNeed = false;
     }
 }
+
+bool ThreatManager::isOwnerOnline() const
+{
+    if (!owner.IsInWorld() || !owner.GetMap())
+        return false;
+
+    // Check for map valid - some object pointers removed after removing map :)
+    Map* map = sMapMgr.FindMap(owner.GetMapId(), owner.GetInstanceId());
+    if (map != owner.GetMap())
+        return false;
+
+    if (owner.GetTypeId() == TYPEID_PLAYER)
+        return ((Player const*)&owner)->GetSession() && !((Player const*)&owner)->GetSession()->PlayerLogout();
+
+    return true;
+}
\ No newline at end of file
diff --git a/src/game/ThreatManager.h b/src/game/ThreatManager.h
index cdf7e25a437..d9aba48ddc4 100644
--- a/src/game/ThreatManager.h
+++ b/src/game/ThreatManager.h
@@ -25,7 +25,6 @@
 #include "UnitEvents.h"
 #include "Timer.h"
 #include "ObjectGuid.h"
-#include <list>
 
 //==============================================================
 
@@ -34,7 +33,7 @@ class Creature;
 class ThreatManager;
 struct SpellEntry;
 
-#define THREAT_UPDATE_INTERVAL 1 * IN_MILLISECONDS    // Server should send threat update to client periodically each second
+#define THREAT_UPDATE_INTERVAL (1 * IN_MILLISECONDS)        // Server should send threat update to client periodically each second
 
 //==============================================================
 // Class to calculate the real threat based
@@ -42,14 +41,14 @@ struct SpellEntry;
 class ThreatCalcHelper
 {
     public:
-        static float CalcThreat(Unit* pHatedUnit, Unit* pHatingUnit, float threat, bool crit, SpellSchoolMask schoolMask, SpellEntry const *threatSpell);
+        static float CalcThreat(Unit* pHatedUnit, Unit* pHatingUnit, float threat, bool crit, SpellSchoolMask schoolMask, SpellEntry const* threatSpell);
 };
 
 //==============================================================
 class MANGOS_DLL_SPEC HostileReference : public Reference<Unit, ThreatManager>
 {
     public:
-        HostileReference(Unit* pUnit, ThreatManager *pThreatManager, float pThreat);
+        HostileReference(Unit* pUnit, ThreatManager* pThreatManager, float pThreat);
 
         //=================================================
         void addThreat(float pMod);
@@ -72,11 +71,11 @@ class MANGOS_DLL_SPEC HostileReference : public Reference<Unit, ThreatManager>
 
         // used for temporary setting a threat and reducting it later again.
         // the threat modification is stored
-        void setTempThreat(float pThreat) { iTempThreatModifyer = pThreat - getThreat(); if(iTempThreatModifyer != 0.0f) addThreat(iTempThreatModifyer);  }
+        void setTempThreat(float pThreat) { iTempThreatModifyer = pThreat - getThreat(); if (fabs(iTempThreatModifyer) > M_NULL_F) addThreat(iTempThreatModifyer);  }
 
         void resetTempThreat()
         {
-            if(iTempThreatModifyer != 0.0f)
+            if (fabs(iTempThreatModifyer) > M_NULL_F)
             {
                 addThreat(-iTempThreatModifyer);  iTempThreatModifyer = 0.0f;
             }
@@ -106,7 +105,7 @@ class MANGOS_DLL_SPEC HostileReference : public Reference<Unit, ThreatManager>
 
         //=================================================
 
-        HostileReference* next() { return ((HostileReference* ) Reference<Unit, ThreatManager>::next()); }
+        HostileReference* next() { return ((HostileReference*) Reference<Unit, ThreatManager>::next()); }
 
         //=================================================
 
@@ -136,7 +135,6 @@ class ThreatManager;
 
 typedef std::list<HostileReference*> ThreatList;
 
-
 class MANGOS_DLL_SPEC ThreatContainer
 {
     private:
@@ -158,13 +156,15 @@ class MANGOS_DLL_SPEC ThreatContainer
 
         void modifyThreatPercent(Unit *pVictim, int32 percent);
 
-        HostileReference* selectNextVictim(Creature* pAttacker, HostileReference* pCurrentVictim);
+//        bool IsSecondChoiceTarget(Creature* pAttacker, Unit* pTarget, bool bCheckThreatArea, bool bCheckMeleeRange);
+
+        HostileReference* selectNextVictim(Unit* pUnitAttacker, HostileReference* pCurrentVictim);
 
         void setDirty(bool pDirty) { iDirty = pDirty; }
 
         bool isDirty() const { return iDirty; }
 
-        bool empty() const { return(iThreatList.empty()); }
+        bool empty() const { return iThreatList.empty(); }
 
         HostileReference* getMostHated() { return iThreatList.empty() ? NULL : iThreatList.front(); }
 
@@ -180,7 +180,7 @@ class MANGOS_DLL_SPEC ThreatManager
     public:
         friend class HostileReference;
 
-        explicit ThreatManager(Unit *pOwner);
+        explicit ThreatManager(Unit& aOwner);
 
         ~ThreatManager() { clearReferences(); }
 
@@ -192,7 +192,7 @@ class MANGOS_DLL_SPEC ThreatManager
         // add threat as raw value (ignore redirections and expection all mods applied already to it
         void addThreatDirectly(Unit* pVictim, float threat);
 
-        void modifyThreatPercent(Unit *pVictim, int32 pPercent);
+        void modifyThreatPercent(Unit* pVictim, int32 pPercent);
 
         float getThreat(Unit *pVictim, bool pAlsoSearchOfflineList = false);
 
@@ -204,12 +204,14 @@ class MANGOS_DLL_SPEC ThreatManager
 
         HostileReference* getCurrentVictim() { return iCurrentVictim; }
 
-        Unit*  getOwner() const { return iOwner; }
+        Unit* getOwner() { return &owner; }
+
+        bool isOwnerOnline() const;
 
         Unit* getHostileTarget();
 
         void tauntApply(Unit* pTaunter);
-        void tauntFadeOut(Unit *pTaunter);
+        void tauntFadeOut(Unit* pTaunter);
 
         void setCurrentVictim(HostileReference* pHostileReference);
 
@@ -219,7 +221,7 @@ class MANGOS_DLL_SPEC ThreatManager
         ThreatList const& getThreatList() const { return iThreatContainer.getThreatList(); }
     private:
         HostileReference* iCurrentVictim;
-        Unit* iOwner;
+        Unit& owner;
         ShortTimeTracker iUpdateTimer;
         bool iUpdateNeed;
         ThreatContainer iThreatContainer;
diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp
index f68266eb981..87ce601d8b3 100644
--- a/src/game/Totem.cpp
+++ b/src/game/Totem.cpp
@@ -49,7 +49,7 @@ bool Totem::Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo const*
             SetDisplayId(modelid_race);
     }
 
-    cPos.SelectFinalPoint(this);
+    cPos.SelectFinalPoint(this, true);
 
     // totem must be at same Z in case swimming caster and etc.
     if (fabs(cPos.m_pos.z - owner->GetPositionZ() ) > 5.0f)
@@ -97,31 +97,53 @@ void Totem::Summon(Unit* owner)
     if (owner->GetTypeId() == TYPEID_UNIT && ((Creature*)owner)->AI())
         ((Creature*)owner)->AI()->JustSummoned((Creature*)this);
 
-    // there are some totems, which exist just for their visual appeareance
-    if (!GetSpell())
-        return;
-
     switch(m_type)
     {
         case TOTEM_PASSIVE:
-            CastSpell(this, GetSpell(), true);
+        {
+            for (uint32 i = 0; i <= GetSpellMaxIndex(); ++i)
+            {
+                if (uint32 spellId = GetSpell(i))
+                    CastSpell(this, spellId, true);
+            }
             break;
+        }
         case TOTEM_STATUE:
-            CastSpell(GetOwner(), GetSpell(), true);
+        {
+            if (GetSpell(0))
+                CastSpell(GetOwner(), GetSpell(0), true);
+            break;
+        }
+        default:
             break;
-        default: break;
     }
 }
 
 void Totem::UnSummon()
 {
     CombatStop();
-    RemoveAurasDueToSpell(GetSpell());
 
-    if (Unit *owner = GetOwner())
+    uint32 maxIdx = GetSpellMaxIndex();
+
+    for (int32 i = maxIdx; i >= 0; --i)
+    {
+        if (uint32 spellId = GetSpell(i))
+            RemoveAurasDueToSpell(spellId);
+    }
+
+    if (Unit* owner = GetOwner())
     {
         owner->_RemoveTotem(this);
-        owner->RemoveAurasDueToSpell(GetSpell());
+
+        for (int32 i = maxIdx; i >= 0; --i)
+        {
+            if (uint32 spellId = GetSpell(i))
+                owner->RemoveAurasDueToSpell(spellId);
+        }
+
+        // Sentry totem has dummy aura on owner at least
+        if (GetUInt32Value(UNIT_CREATED_BY_SPELL) != 0)
+            owner->RemoveAurasDueToSpell(GetUInt32Value(UNIT_CREATED_BY_SPELL));
 
         //remove aura all party members too
         if (owner->GetTypeId() == TYPEID_PLAYER)
@@ -129,13 +151,19 @@ void Totem::UnSummon()
             ((Player*)owner)->SendAutoRepeatCancel(this);
 
             // Not only the player can summon the totem (scripted AI)
-            if (Group *pGroup = ((Player*)owner)->GetGroup())
+            if (Group* pGroup = ((Player*)owner)->GetGroup())
             {
-                for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+                for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
                 {
                     Player* Target = itr->getSource();
-                    if(Target && pGroup->SameSubGroup((Player*)owner, Target))
-                        Target->RemoveAurasDueToSpell(GetSpell());
+                    if (Target && pGroup->SameSubGroup((Player*)owner, Target))
+                    {
+                        for (int32 i = maxIdx; i >= 0; --i)
+                        {
+                            if (uint32 spellId = GetSpell(i))
+                                Target->RemoveAurasDueToSpell(spellId);
+                        }
+                    }
                 }
             }
         }
@@ -176,13 +204,24 @@ void Totem::SetTypeBySummonSpell(SpellEntry const * spellProto)
         // If spell have cast time -> so its active totem
         if (GetSpellCastTime(totemSpell))
             m_type = TOTEM_ACTIVE;
+
+        if(totemSpell->Id == 40132 || totemSpell->Id == 40133)
+            m_type = TOTEM_PASSIVE;                             // Shaman summoning totems
     }
-    if(spellProto->SpellIconID == 2056)
+    if(spellProto->GetSpellIconID() == 2056)
         m_type = TOTEM_STATUE;                              //Jewelery statue
+
 }
 
 bool Totem::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex index) const
 {
+    if (!spellInfo)
+        return true;
+
+    // Author - Velvet. seems not fully correct, but usable.
+    if (spellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_MANA_SPRING, CF_SHAMAN_HEALING_STREAM, CF_SHAMAN_MISC_TOTEM_EFFECTS>())
+        return false;
+
     switch(spellInfo->Effect[index])
     {
         case SPELL_EFFECT_ATTACK_ME:
@@ -213,3 +252,13 @@ bool Totem::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex
 
     return Creature::IsImmuneToSpellEffect(spellInfo, index);
 }
+
+uint32 Totem::GetCreatureTypeMask() const
+{
+
+    // skip creature type check for Grounding Totem
+    if (GetUInt32Value(UNIT_CREATED_BY_SPELL) == 8177)
+        return 0x7FF;
+
+    return Unit::GetCreatureTypeMask();
+}
diff --git a/src/game/Totem.h b/src/game/Totem.h
index 6ef03139353..7bd35b31a15 100644
--- a/src/game/Totem.h
+++ b/src/game/Totem.h
@@ -28,16 +28,18 @@ enum TotemType
     TOTEM_STATUE     = 2
 };
 
+#define SENTRY_TOTEM_ENTRY  3968
+
 class Totem : public Creature
 {
     public:
         explicit Totem();
         virtual ~Totem(){};
         bool Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo const* cinfo, Unit* owner);
-        void Update(uint32 update_diff, uint32 time) override;
+        virtual void Update(uint32 update_diff, uint32 time) override;
         void Summon(Unit* owner);
         void UnSummon();
-        uint32 GetSpell() const { return m_spells[0]; }
+        uint32 GetSpell(uint32 idx = 0) const { return ((Creature*)this)->GetSpell(idx); }
         uint32 GetTotemDuration() const { return m_duration; }
         Unit *GetOwner();
         TotemType GetTotemType() const { return m_type; }
@@ -56,6 +58,8 @@ class Totem : public Creature
 
         bool IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex index) const;
 
+        virtual uint32 GetCreatureTypeMask() const override;
+
     protected:
         TotemType m_type;
         uint32 m_duration;
diff --git a/src/game/TotemAI.cpp b/src/game/TotemAI.cpp
index 951f87d5655..0f33f6f90d7 100644
--- a/src/game/TotemAI.cpp
+++ b/src/game/TotemAI.cpp
@@ -26,31 +26,28 @@
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 
-int
-TotemAI::Permissible(const Creature *creature)
+int TotemAI::Permissible(Creature const* creature)
 {
     if( creature->IsTotem() )
         return PERMIT_BASE_PROACTIVE;
 
     return PERMIT_BASE_NO;
-}
+};
 
-TotemAI::TotemAI(Creature *c) : CreatureAI(c)
+TotemAI::TotemAI(Creature* c) : CreatureAI(c)
 {
-}
+};
 
-void
-TotemAI::MoveInLineOfSight(Unit *)
+void TotemAI::MoveInLineOfSight(Unit*)
 {
-}
+};
 
 void TotemAI::EnterEvadeMode()
 {
     m_creature->CombatStop(true);
-}
+};
 
-void
-TotemAI::UpdateAI(const uint32 /*diff*/)
+void TotemAI::UpdateAI(uint32 const /*diff*/)
 {
     if (getTotem().GetTotemType() != TOTEM_ACTIVE)
         return;
@@ -64,7 +61,7 @@ TotemAI::UpdateAI(const uint32 /*diff*/)
         return;
 
     // Get spell rangy
-    SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->rangeIndex);
+    SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->GetRangeIndex());
     float max_range = GetSpellMaxRange(srange);
 
     // SPELLMOD_RANGE not applied in this place just because nonexistent range mods for attacking totems
@@ -79,7 +76,7 @@ TotemAI::UpdateAI(const uint32 /*diff*/)
     {
         victim = NULL;
 
-        MaNGOS::NearestAttackableUnitInObjectRangeCheck u_check(m_creature, m_creature, max_range);
+        MaNGOS::NearestAttackableUnitInObjectRangeCheck u_check(m_creature, max_range);
         MaNGOS::UnitLastSearcher<MaNGOS::NearestAttackableUnitInObjectRangeCheck> checker(victim, u_check);
         Cell::VisitAllObjects(m_creature, checker, max_range);
     }
@@ -96,20 +93,27 @@ TotemAI::UpdateAI(const uint32 /*diff*/)
     }
     else
         i_victimGuid.Clear();
-}
+};
 
-bool
-TotemAI::IsVisible(Unit *) const
+bool TotemAI::IsVisible(Unit*) const
 {
     return false;
-}
+};
 
-void
-TotemAI::AttackStart(Unit *)
+void TotemAI::AttackStart(Unit*)
 {
-}
+    // Sentry totem sends ping on attack
+    if (m_creature->GetEntry() == SENTRY_TOTEM_ENTRY && m_creature->GetOwner() && m_creature->GetOwner()->GetTypeId() == TYPEID_PLAYER)
+    {
+        WorldPacket data(MSG_MINIMAP_PING, (8+4+4));
+        data << m_creature->GetObjectGuid();
+        data << m_creature->GetPositionX();
+        data << m_creature->GetPositionY();
+        ((Player*)m_creature->GetOwner())->GetSession()->SendPacket(&data);
+    }
+};
 
 Totem& TotemAI::getTotem()
 {
     return static_cast<Totem&>(*m_creature);
-}
+};
diff --git a/src/game/TradeHandler.cpp b/src/game/TradeHandler.cpp
index e6823dae15d..0c699980c99 100644
--- a/src/game/TradeHandler.cpp
+++ b/src/game/TradeHandler.cpp
@@ -28,6 +28,7 @@
 #include "Spell.h"
 #include "SocialMgr.h"
 #include "Language.h"
+#include "DBCStores.h"
 
 void WorldSession::SendTradeStatus(TradeStatus status)
 {
@@ -53,6 +54,7 @@ void WorldSession::SendTradeStatus(TradeStatus status)
             data << uint32(0);
             break;
         case TRADE_STATUS_ONLY_CONJURED:
+        case TRADE_STATUS_NOT_ELIGIBLE:
             data.Initialize(SMSG_TRADE_STATUS, 4+1);
             data << uint32(status);
             data << uint8(0);
@@ -159,6 +161,8 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
                 }
 
                 // store
+                if (myItems[i]->HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE))
+                    myItems[i]->SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, trader->GetTotalPlayedTime() - (_player->GetTotalPlayedTime() - myItems[i]->GetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME)));
                 trader->MoveItemToInventory( traderDst, myItems[i], true, true);
             }
 
@@ -175,6 +179,8 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
                 }
 
                 // store
+                if (hisItems[i]->HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_BOP_TRADEABLE))
+                    hisItems[i]->SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, _player->GetTotalPlayedTime() - (trader->GetTotalPlayedTime() - hisItems[i]->GetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME)));
                 _player->MoveItemToInventory( playerDst, hisItems[i], true, true);
             }
         }
@@ -291,16 +297,22 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& recvPacket)
     {
         if (Item* item = my_trade->GetItem(TradeSlots(i)))
         {
-            if (!item->CanBeTraded())
+            if (!item->CanBeTraded(false, true))
             {
                 SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
                 return;
             }
+            if (item->IsBindedNotWith(trader))
+            {
+                SendTradeStatus(TRADE_STATUS_NOT_ELIGIBLE);
+                SendTradeStatus(TRADE_STATUS_CLOSE_WINDOW/*TRADE_STATUS_TRADE_CANCELED*/);
+                return;
+            }
         }
 
         if (Item* item  = his_trade->GetItem(TradeSlots(i)))
         {
-            if (!item->CanBeTraded())
+            if (!item->CanBeTraded(false, true))
             {
                 SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
                 return;
@@ -603,11 +615,13 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket)
         return;
     }
 
-    if (pOther->GetTeam() !=_player->GetTeam() )
+    // Frozen Mod
+    /* if (pOther->GetTeam() !=_player->GetTeam() )
     {
         SendTradeStatus(TRADE_STATUS_WRONG_FACTION);
         return;
-    }
+    } */
+    // Frozen Mod
 
     if (!pOther->IsWithinDistInMap(_player,10.0f,false))
     {
@@ -635,7 +649,6 @@ void WorldSession::HandleSetTradeGoldOpcode(WorldPacket& recvPacket)
     if (!my_trade)
         return;
 
-    // gold can be incorrect, but this is checked at trade finished.
     my_trade->SetMoney(gold);
 }
 
@@ -663,7 +676,7 @@ void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket)
 
     // check cheating, can't fail with correct client operations
     Item* item = _player->GetItemByPos(bag, slot);
-    if (!item || (tradeSlot != TRADE_SLOT_NONTRADED && !item->CanBeTraded()))
+    if (!item || (tradeSlot != TRADE_SLOT_NONTRADED && !item->CanBeTraded(false, true)))
     {
         SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
         return;
diff --git a/src/game/TransportSystem.cpp b/src/game/TransportSystem.cpp
new file mode 100644
index 00000000000..aadeb02cb3a
--- /dev/null
+++ b/src/game/TransportSystem.cpp
@@ -0,0 +1,319 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/**
+ * @addtogroup TransportSystem
+ * @{
+ *
+ * @file TransportSystem.cpp
+ * This file contains the code needed for MaNGOS to provide abstract support for transported entities
+ * Currently implemented
+ * - Calculating between local and global coords
+ * - Abstract storage of passengers (added by BoardPassenger, UnboardPassenger)
+ */
+
+#include "Player.h"
+#include "Transports.h"
+#include "TransportSystem.h"
+#include "Unit.h"
+#include "Vehicle.h"
+#include "MapManager.h"
+
+/* **************************************** TransportBase ****************************************/
+
+TransportBase::TransportBase(WorldObject* owner) :
+    m_owner(owner),
+    m_lastPosition(owner->GetPositionX(), owner->GetPositionY(), owner->GetPositionZ(), owner->GetOrientation()),
+    m_sinO(sin(m_lastPosition.o)),
+    m_cosO(cos(m_lastPosition.o)),
+    m_updatePositionsTimer(500)
+{
+    MANGOS_ASSERT(m_owner);
+}
+
+// Update every now and then (after some change of transporter's position)
+// This is used to calculate global positions (which don't have to be exact, they are only required for some server-side calculations
+void TransportBase::Update(uint32 diff)
+{
+    if (m_updatePositionsTimer < diff)
+    {
+        if (fabs(m_owner->GetPositionX() - m_lastPosition.x) +
+                fabs(m_owner->GetPositionY() - m_lastPosition.y) +
+                fabs(m_owner->GetPositionZ() - m_lastPosition.z) > 1.0f ||
+                MapManager::NormalizeOrientation(m_owner->GetOrientation() - m_lastPosition.o) > 0.01f)
+            UpdateGlobalPositions();
+
+        m_updatePositionsTimer = 500;
+    }
+    else
+        m_updatePositionsTimer -= diff;
+}
+
+// Update the global positions of all passengers
+void TransportBase::UpdateGlobalPositions(bool isParent)
+{
+    WorldLocation pos = m_owner->GetPosition();
+
+    // Calculate new direction multipliers
+    if (MapManager::NormalizeOrientation(pos.o - m_lastPosition.o) > 0.01f)
+    {
+        m_sinO = sin(pos.o);
+        m_cosO = cos(pos.o);
+    }
+
+    if (!m_passengers.empty())
+    {
+        if (!isParent)
+            MAPLOCK_READ(GetOwner(), MAP_LOCK_TYPE_MOVEMENT);
+        // Update global positions
+        for (PassengerMap::const_iterator itr = m_passengers.begin(); itr != m_passengers.end(); ++itr)
+            UpdateGlobalPositionOf(itr->first, itr->second.GetLocalPosition());
+    }
+
+    m_lastPosition = pos;
+}
+
+// Update the global position of a passenger
+void TransportBase::UpdateGlobalPositionOf(ObjectGuid const& passengerGuid, Position const& pos) const
+{
+    WorldObject* passenger = GetOwner()->GetMap()->GetWorldObject(passengerGuid);
+
+    if (!passenger)
+        return;
+
+    //Position g = CalculateGlobalPositionOf(pos);
+    WorldLocation globalPos = GetOwner()->GetPosition();
+    globalPos.SetTransportPosition(pos);
+
+    if (globalPos == passenger->GetPosition())
+        return;
+
+    switch(passenger->GetTypeId())
+    {
+        case TYPEID_GAMEOBJECT:
+        case TYPEID_DYNAMICOBJECT:
+            m_owner->GetMap()->Relocation((GameObject*)passenger, globalPos);
+            break;
+        case TYPEID_UNIT:
+            m_owner->GetMap()->Relocation((Creature*)passenger, globalPos);
+            // If passenger is vehicle
+            if (((Unit*)passenger)->IsVehicle())
+                ((Unit*)passenger)->GetVehicleKit()->UpdateGlobalPositions(true);
+            break;
+        case TYPEID_PLAYER:
+            m_owner->GetMap()->Relocation((Player*)passenger, globalPos);
+            // If passenger is vehicle
+            if (((Unit*)passenger)->IsVehicle())
+                ((Unit*)passenger)->GetVehicleKit()->UpdateGlobalPositions(true);
+            break;
+        case TYPEID_CORPSE:
+        // TODO - add corpse relocation
+        default:
+            break;
+    }
+}
+
+// This rotates the vector (lx, ly) by transporter->orientation
+void TransportBase::RotateLocalPosition(float lx, float ly, float& rx, float& ry) const
+{
+    rx = lx * m_cosO - ly * m_sinO;
+    ry = lx * m_sinO + ly * m_cosO;
+}
+
+// This rotates the vector (rx, ry) by -transporter->orientation
+void TransportBase::NormalizeRotatedPosition(float rx, float ry, float& lx, float& ly) const
+{
+    lx = rx * -m_cosO - ry * -m_sinO;
+    ly = rx * -m_sinO + ry * -m_cosO;
+}
+
+// Calculate a global position of local positions based on this transporter
+Position TransportBase::CalculateGlobalPositionOf(Position const& pos) const
+{
+    Position g(pos);
+    RotateLocalPosition(pos.x, pos.y, g.x, g.y);
+    g.x += m_owner->GetPositionX();
+    g.y += m_owner->GetPositionY();
+
+    g.z = pos.z + m_owner->GetPositionZ();
+    g.o = MapManager::NormalizeOrientation(pos.o + m_owner->GetOrientation());
+    return g;
+}
+
+void TransportBase::BoardPassenger(WorldObject* passenger, Position const& pos, int8 seat)
+{
+    if (!passenger)
+        return;
+
+    MAPLOCK_WRITE(GetOwner(), MAP_LOCK_TYPE_MOVEMENT);
+
+    // Insert our new passenger
+    m_passengers.insert(PassengerMap::value_type(passenger->GetObjectGuid(),TransportInfo(*passenger, *this, pos, seat)));
+
+    PassengerMap::iterator itr = m_passengers.find(passenger->GetObjectGuid());
+    MANGOS_ASSERT(itr != m_passengers.end());
+
+    // The passenger needs fast access to transportInfo
+    passenger->SetTransportInfo(&itr->second);
+
+    // Add MI and other data only if successful boarded!
+    if (passenger->isType(TYPEMASK_UNIT))
+    {
+        ((Unit*)passenger)->m_movementInfo.ClearTransportData();
+        ((Unit*)passenger)->m_movementInfo.AddMovementFlag(MOVEFLAG_ONTRANSPORT);
+        ((Unit*)passenger)->m_movementInfo.SetTransportData(GetOwner()->GetObjectGuid(), pos, WorldTimer::getMSTime(), -1);
+    }
+    passenger->SetTransportPosition(pos);
+}
+
+void TransportBase::UnBoardPassenger(WorldObject* passenger)
+{
+    if (!passenger)
+        return;
+
+    // Cleanup movementinfo/data even his not boarded!
+    if (passenger->isType(TYPEMASK_UNIT))
+    {
+        ((Unit*)passenger)->m_movementInfo.ClearTransportData();
+        ((Unit*)passenger)->m_movementInfo.RemoveMovementFlag(MOVEFLAG_ONTRANSPORT);
+    }
+    passenger->ClearTransportData();
+
+    // Set passengers transportInfo to NULL
+    passenger->SetTransportInfo(NULL);
+
+    MAPLOCK_WRITE(GetOwner(), MAP_LOCK_TYPE_MOVEMENT);
+    PassengerMap::iterator itr = m_passengers.find(passenger->GetObjectGuid());
+
+    if (itr == m_passengers.end())
+        return;
+
+    // Delete transportInfo
+    // Unboard finally
+    m_passengers.erase(itr);
+}
+
+/* **************************************** TransportInfo ****************************************/
+
+void TransportInfo::SetLocalPosition(Position const& pos)
+{
+    // m_owner.SetTransportPosition(pos);
+    // Update global position
+    m_transport.UpdateGlobalPositionOf(m_owner.GetObjectGuid(), pos);
+}
+
+WorldObject* TransportInfo::GetTransport() const
+{
+    return m_transport.GetOwner();
+}
+
+ObjectGuid TransportInfo::GetTransportGuid() const
+{
+    return m_transport.GetOwner()->GetObjectGuid();
+}
+
+bool TransportInfo::IsOnVehicle() const
+{
+    return m_transport.GetOwner()->GetTypeId() == TYPEID_PLAYER || m_transport.GetOwner()->GetTypeId() == TYPEID_UNIT;
+}
+
+void NotifyMapChangeBegin::operator() (WorldObject* obj) const
+{
+    if (!obj)
+        return;
+
+    switch(obj->GetTypeId())
+    {
+        case TYPEID_GAMEOBJECT:
+        case TYPEID_DYNAMICOBJECT:
+            break;
+        case TYPEID_UNIT:
+            if (obj->GetObjectGuid().IsPet())
+                break;
+            // TODO Despawn creatures in old map
+            break;
+        case TYPEID_PLAYER:
+        {
+            Player* plr = (Player*)obj;
+            if (!plr)
+                return;
+            if (plr->isDead() && !plr->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
+                plr->ResurrectPlayer(100);
+            if (plr->GetSession() && m_oldloc.GetMapId() != m_loc.GetMapId())
+            {
+                WorldPacket data(SMSG_NEW_WORLD, 4);
+                data << uint32(m_loc.GetMapId());
+                plr->GetSession()->SendPacket(&data);
+            }
+            plr->TeleportTo(m_loc, TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NODELAY);
+            break;
+        }
+        // TODO - make corpse moving.
+        case TYPEID_CORPSE:
+        default:
+            break;
+    }
+}
+
+void NotifyMapChangeEnd::operator() (WorldObject* obj) const
+{
+    if (!obj)
+        return;
+
+    switch(obj->GetTypeId())
+    {
+        case TYPEID_GAMEOBJECT:
+        case TYPEID_DYNAMICOBJECT:
+            break;
+        case TYPEID_UNIT:
+            // TODO Spawn creatures in new map
+            break;
+        case TYPEID_PLAYER:
+            break;
+        // TODO - make corpse moving.
+        case TYPEID_CORPSE:
+        default:
+            break;
+    }
+}
+
+void SendCurrentTransportDataWithHelper::operator() (WorldObject* object) const
+{
+    if (!object ||
+        object->GetObjectGuid() == m_player->GetObjectGuid() ||
+        !m_player->HaveAtClient(object->GetObjectGuid()))
+        return;
+
+    object->BuildCreateUpdateBlockForPlayer(m_data, m_player);
+}
+
+void UpdateVisibilityOfWithHelper::operator() (WorldObject* object) const
+{
+    if (!object)
+        return;
+
+    if (m_guidSet.find(object->GetObjectGuid()) != m_guidSet.end())
+    {
+        if (object->GetTypeId() == TYPEID_PLAYER)
+            ((Player*)object)->UpdateVisibilityOf(object, &m_player);
+        m_player.UpdateVisibilityOf(&m_player, object, i_data, i_visibleNow);
+        m_guidSet.erase(object->GetObjectGuid());
+    }
+}
+
+/*! @} */
diff --git a/src/game/TransportSystem.h b/src/game/TransportSystem.h
new file mode 100644
index 00000000000..73413ad9052
--- /dev/null
+++ b/src/game/TransportSystem.h
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/**
+ * @addtogroup TransportSystem to provide abstract support for transported entities
+ * The Transport System in MaNGOS consists of these files:
+ * - TransportSystem.h to provide the basic classes TransportBase and TransportInfo
+ * - TransportSystem.cpp which implements these classes
+ * - Vehicle.h as a vehicle is a transporter it will inherit itr transporter-information from TransportBase
+ * - Transports.h to implement the MOTransporter (subclas of gameobject) - Remains TODO
+ * as well of
+ * - impacts to various files
+ *
+ * @{
+ *
+ * @file TransportSystem.h
+ * This file contains the headers for base clases needed for MaNGOS to handle passengers on transports
+ *
+ */
+
+#ifndef _TRANSPORT_SYSTEM_H
+#define _TRANSPORT_SYSTEM_H
+
+#include "Common.h"
+#include "Map.h"
+#include "Object.h"
+#include "ObjectGuid.h"
+
+class TransportBase;
+
+/**
+ * A class to provide basic information for each transported passenger. This includes
+ * - local positions
+ * - Accessors to get the transporter
+ */
+
+class MANGOS_DLL_DECL TransportInfo
+{
+    public:
+        TransportInfo(WorldObject& owner, TransportBase& transport, Position const& pos, int8 seat) :
+            m_owner(owner), m_transport(transport), m_seat(seat)
+        {/*SetTransportPosition(pos)*/};
+
+        TransportInfo(TransportInfo const& info) :
+            m_owner(info.m_owner), m_transport(info.m_transport), m_seat(info.m_seat)
+        {};
+
+        ~TransportInfo() { m_owner.SetTransportInfo(NULL); };
+
+        // Set local positions
+        void SetLocalPosition(Position const& pos);
+        void SetTransportSeat(int8 seat) { m_seat = seat; }
+
+        // Accessors
+        WorldObject* GetTransport() const;
+        ObjectGuid GetTransportGuid() const;
+
+        // Required for chain-updating (passenger on transporter on transporter)
+        bool IsOnVehicle() const;
+
+        // Get local position and seat
+        uint8 GetTransportSeat() const { return m_seat; }
+        Position const& GetLocalPosition() const { return m_owner.GetPosition().GetTransportPos(); }
+
+    private:
+        WorldObject&   m_owner;                             ///< Passenger
+        TransportBase& m_transport;                         ///< Transporter
+        int8 m_seat;
+};
+
+typedef UNORDERED_MAP < ObjectGuid /*passenger*/, TransportInfo /*passengerInfo*/ > PassengerMap;
+
+/**
+ * A class to provide basic support for each transporter. This includes
+ * - Storing a list of passengers
+ * - Providing helper for calculating between local and global coordinates
+ */
+
+class MANGOS_DLL_DECL TransportBase
+{
+    public:
+        explicit TransportBase(WorldObject* owner);
+        virtual ~TransportBase() { MANGOS_ASSERT(m_passengers.size() == 0); };
+
+        void Update(uint32 diff);
+        void UpdateGlobalPositions(bool isParent = false);
+        void UpdateGlobalPositionOf(ObjectGuid const& passengerGuid, Position const& pos) const;
+
+        WorldObject* GetOwner() const { return m_owner; }
+
+        // Helper functions to calculate positions
+        void RotateLocalPosition(float lx, float ly, float& rx, float& ry) const;
+        void NormalizeRotatedPosition(float rx, float ry, float& lx, float& ly) const;
+
+        Position CalculateGlobalPositionOf(Position const& pos) const;
+
+        bool const HasPassengers() const { return (m_passengers.size() > 0); }
+
+        // Helper functions to add/ remove a passenger from the list
+        void BoardPassenger(WorldObject* passenger, Position const& pos, int8 seat);
+        void UnBoardPassenger(WorldObject* passenger);
+
+    private:
+        virtual Position CalculateBoardingPositionOf(Position const& pos) const { return Position(); };
+
+    protected:
+        WorldObject* m_owner;                               ///< The transporting unit
+        PassengerMap m_passengers;                          ///< List of passengers and their transport-information
+
+        // Helpers to speedup position calculations
+        Position m_lastPosition;
+        float m_sinO, m_cosO;
+        uint32 m_updatePositionsTimer;                      ///< Timer that is used to trigger updates for global coordinate calculations
+
+    public:
+        template<typename Func> void CallForAllPassengers(Func const& func)
+        {
+            if (HasPassengers())
+            {
+                // Make cache for passengers list
+                GuidSet passengerGuids;
+                {
+                    MAPLOCK_READ(GetOwner(), MAP_LOCK_TYPE_MOVEMENT);
+                    for (PassengerMap::const_iterator itr = m_passengers.begin(); itr != m_passengers.end(); ++itr)
+                        if (itr->first)
+                            passengerGuids.insert(itr->first);
+                }
+
+                // Current passenger list (m_passengers) may be changed while "func". use cached value for iterate
+                for (GuidSet::const_iterator itr = passengerGuids.begin(); itr != passengerGuids.end(); ++itr)
+                {
+                    WorldObject* passenger = GetOwner()->GetMap()->GetWorldObject(*itr);
+
+                    if (!passenger)
+                        continue;
+
+                    func(passenger);
+                }
+            }
+        }
+};
+
+struct NotifyMapChangeBegin
+{
+    explicit NotifyMapChangeBegin(Map const* map, WorldLocation const& oldloc, WorldLocation const& loc) :
+        m_map(map), m_oldloc(oldloc), m_loc(loc)
+    {}
+    void operator()(WorldObject* object) const;
+    Map const* m_map;
+    WorldLocation const& m_oldloc;
+    WorldLocation const& m_loc;
+};
+
+struct NotifyMapChangeEnd
+{
+    explicit NotifyMapChangeEnd(Map const* map, WorldLocation const& loc) :
+        m_map(map), m_loc(loc)
+    {}
+    void operator()(WorldObject* object) const;
+    Map const* m_map;
+    WorldLocation const& m_loc;
+};
+
+struct SendCurrentTransportDataWithHelper
+{
+    explicit SendCurrentTransportDataWithHelper(UpdateData* data, Player* player) : m_data(data), m_player(player)
+    {}
+    void operator()(WorldObject* object) const;
+    UpdateData* m_data;
+    Player* m_player;
+};
+
+struct UpdateObjectVisibilityWithHelper
+{
+    explicit UpdateObjectVisibilityWithHelper(WorldObject* obj, Cell cell, CellPair cellpair) : m_obj(obj), m_cell(cell), m_cellpair(cellpair)
+    {}
+    void operator()(WorldObject* object) const;
+    WorldObject* m_obj;
+    Cell m_cell;
+    CellPair m_cellpair;
+};
+
+struct UpdateVisibilityOfWithHelper
+{
+    explicit UpdateVisibilityOfWithHelper(Player& player, GuidSet& guidSet, UpdateData& data, WorldObjectSet& visibleNow) 
+        : m_player(player), m_guidSet(guidSet), i_data(data), i_visibleNow(visibleNow)
+    {}
+    void operator()(WorldObject* object) const;
+    Player&  m_player;
+    GuidSet& m_guidSet;
+    UpdateData& i_data;
+    WorldObjectSet& i_visibleNow;
+};
+
+#endif
+/*! @} */
diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp
index 2b517428e91..93f88aa3710 100644
--- a/src/game/Transports.cpp
+++ b/src/game/Transports.cpp
@@ -19,137 +19,83 @@
 #include "Common.h"
 
 #include "Transports.h"
-#include "MapManager.h"
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "Path.h"
 
 #include "WorldPacket.h"
 #include "DBCStores.h"
-#include "ProgressBar.h"
 #include "ScriptMgr.h"
+#include "TransportSystem.h"
+#include "movement/MoveSplineInit.h"
+#include "movement/MoveSpline.h"
 
-void MapManager::LoadTransports()
+// Transport - base class for regular Transport && MOTransport class
+Transport::Transport() : GameObject(), m_transportKit(NULL)
 {
-    QueryResult *result = WorldDatabase.Query("SELECT entry, name, period FROM transports");
-
-    uint32 count = 0;
-
-    if( !result )
-    {
-        BarGoLink bar(1);
-        bar.step();
-
-        sLog.outString();
-        sLog.outString( ">> Loaded %u transports", count );
-        return;
-    }
+    m_updateFlag = (UPDATEFLAG_TRANSPORT | UPDATEFLAG_HIGHGUID | UPDATEFLAG_HAS_POSITION | UPDATEFLAG_ROTATION);
+}
 
-    BarGoLink bar(result->GetRowCount());
+Transport::~Transport()
+{
+    if (m_transportKit)
+        delete m_transportKit;
+}
 
-    do
+bool Transport::AddPassenger(WorldObject* passenger, Position const& transportPos)
+{
+    GetTransportKit()->AddPassenger(passenger, transportPos);
+    if (passenger->isType(TYPEMASK_UNIT))
     {
-        bar.step();
-
-        Transport *t = new Transport;
-
-        Field *fields = result->Fetch();
-
-        uint32 entry = fields[0].GetUInt32();
-        std::string name = fields[1].GetCppString();
-        t->m_period = fields[2].GetUInt32();
-
-        const GameObjectInfo *goinfo = ObjectMgr::GetGameObjectInfo(entry);
-
-        if(!goinfo)
+        GuidSet const& groupPets = ((Unit*)passenger)->GetPets();
+        if (!groupPets.empty())
         {
-            sLog.outErrorDb("Transport ID:%u, Name: %s, will not be loaded, gameobject_template missing", entry, name.c_str());
-            delete t;
-            continue;
+            for (GuidSet::const_iterator itr = groupPets.begin(); itr != groupPets.end(); ++itr)
+                if (Pet* pPet = GetMap()->GetPet(*itr))
+                    if (pPet && pPet->IsInWorld())
+                        GetTransportKit()->AddPassenger(pPet, transportPos);
         }
+    }
+    return true;
+}
 
-        if(goinfo->type != GAMEOBJECT_TYPE_MO_TRANSPORT)
-        {
-            sLog.outErrorDb("Transport ID:%u, Name: %s, will not be loaded, gameobject_template type wrong", entry, name.c_str());
-            delete t;
-            continue;
-        }
-
-        // sLog.outString("Loading transport %d between %s, %s", entry, name.c_str(), goinfo->name);
-
-        std::set<uint32> mapsUsed;
-
-        if(!t->GenerateWaypoints(goinfo->moTransport.taxiPathId, mapsUsed))
-            // skip transports with empty waypoints list
-        {
-            sLog.outErrorDb("Transport (path id %u) path size = 0. Transport ignored, check DBC files or transport GO data0 field.",goinfo->moTransport.taxiPathId);
-            delete t;
-            continue;
-        }
-
-        float x, y, z, o;
-        uint32 mapid;
-        x = t->m_WayPoints[0].x; y = t->m_WayPoints[0].y; z = t->m_WayPoints[0].z; mapid = t->m_WayPoints[0].mapid; o = 1;
-
-        //current code does not support transports in dungeon!
-        const MapEntry* pMapInfo = sMapStore.LookupEntry(mapid);
-        if(!pMapInfo || pMapInfo->Instanceable())
-        {
-            delete t;
-            continue;
-        }
-
-        // creates the Gameobject
-        if (!t->Create(entry, mapid, x, y, z, o, GO_ANIMPROGRESS_DEFAULT, 0))
-        {
-            delete t;
-            continue;
-        }
-
-        m_Transports.insert(t);
-
-        for (std::set<uint32>::const_iterator i = mapsUsed.begin(); i != mapsUsed.end(); ++i)
-            m_TransportsByMap[*i].insert(t);
-
-        //If we someday decide to use the grid to track transports, here:
-        t->SetMap(sMapMgr.CreateMap(mapid, t));
-
-        //t->GetMap()->Add<GameObject>((GameObject *)t);
-        ++count;
-    } while(result->NextRow());
-    delete result;
-
-    sLog.outString();
-    sLog.outString( ">> Loaded %u transports", count );
-
-    // check transport data DB integrity
-    result = WorldDatabase.Query("SELECT gameobject.guid,gameobject.id,transports.name FROM gameobject,transports WHERE gameobject.id = transports.entry");
-    if(result)                                              // wrong data found
+bool Transport::RemovePassenger(WorldObject* passenger)
+{
+    GetTransportKit()->RemovePassenger(passenger);
+    if (passenger->isType(TYPEMASK_UNIT))
     {
-        do
+        GuidSet groupPetsCopy = ((Unit*)passenger)->GetPets();
+        if (!groupPetsCopy.empty())
         {
-            Field *fields = result->Fetch();
-
-            uint32 guid  = fields[0].GetUInt32();
-            uint32 entry = fields[1].GetUInt32();
-            std::string name = fields[2].GetCppString();
-            sLog.outErrorDb("Transport %u '%s' have record (GUID: %u) in `gameobject`. Transports DON'T must have any records in `gameobject` or its behavior will be unpredictable/bugged.",entry,name.c_str(),guid);
+            for (GuidSet::const_iterator itr = groupPetsCopy.begin(); itr != groupPetsCopy.end(); ++itr)
+                if (Pet* pPet = GetMap()->GetPet(*itr))
+                    if (pPet && pPet->IsInWorld())
+                        GetTransportKit()->RemovePassenger(pPet);
         }
-        while(result->NextRow());
-
-        delete result;
     }
+    return true;
 }
 
-Transport::Transport() : GameObject()
+void Transport::Update(uint32 update_diff, uint32 p_time)
+{
+    GameObject::Update(update_diff, p_time);
+}
+
+// MOTransport - work class for MO_TRANSPORT GO type
+MOTransport::MOTransport() : Transport()
 {
-    m_updateFlag = (UPDATEFLAG_TRANSPORT | UPDATEFLAG_HIGHGUID | UPDATEFLAG_HAS_POSITION | UPDATEFLAG_ROTATION);
 }
 
-bool Transport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint8 animprogress, uint16 dynamicHighValue)
+MOTransport::~MOTransport()
 {
-    Relocate(x,y,z,ang);
-    // instance id and phaseMask isn't set to values different from std.
+    if (GetMap())
+        GetMap()->Remove((GameObject*)this, true);
+}
+
+bool MOTransport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint8 animprogress, uint16 dynamicLowValue)
+{
+    Relocate(WorldLocation(mapid, x, y, z, ang));
+    // FIXME - instance id and phaseMask isn't set to values different from std.
 
     if(!IsPositionValid())
     {
@@ -158,7 +104,7 @@ bool Transport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z,
         return false;
     }
 
-    Object::_Create(guidlow, 0, HIGHGUID_MO_TRANSPORT);
+    Object::_Create(ObjectGuid(HIGHGUID_MO_TRANSPORT, guidlow));
 
     GameObjectInfo const* goinfo = ObjectMgr::GetGameObjectInfo(guidlow);
 
@@ -175,7 +121,7 @@ bool Transport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z,
     SetUInt32Value(GAMEOBJECT_FACTION, goinfo->faction);
     //SetUInt32Value(GAMEOBJECT_FLAGS, goinfo->flags);
     SetUInt32Value(GAMEOBJECT_FLAGS, (GO_FLAG_TRANSPORT | GO_FLAG_NODESPAWN));
-    SetUInt32Value(GAMEOBJECT_LEVEL, m_period);
+    SetUInt32Value(GAMEOBJECT_LEVEL, GetPeriod(true));
     SetEntry(goinfo->id);
 
     SetDisplayId(goinfo->displayId);
@@ -185,12 +131,16 @@ bool Transport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z,
     SetGoArtKit(0);
     SetGoAnimProgress(animprogress);
 
-    // low part always 0, dynamicHighValue is some kind of progression (not implemented)
-    SetUInt16Value(GAMEOBJECT_DYNAMIC, 0, 0);
-    SetUInt16Value(GAMEOBJECT_DYNAMIC, 1, dynamicHighValue);
+    SetUInt16Value(GAMEOBJECT_DYNAMIC, 0, dynamicLowValue);
+    SetUInt16Value(GAMEOBJECT_DYNAMIC, 1, 0);
 
     SetName(goinfo->name);
 
+    m_transportKit = new TransportKit(*this);
+
+    m_anchorageTimer.SetInterval(0);
+    m_anchorageTimer.Reset();
+
     return true;
 }
 
@@ -209,7 +159,7 @@ struct keyFrame
     float tFrom, tTo;
 };
 
-bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
+bool MOTransport::GenerateWaypoints(uint32 pathid, std::set<uint32>& mapids)
 {
     if (pathid >= sTaxiPathNodesByPath.size())
         return false;
@@ -324,7 +274,11 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
     WayPoint pos(keyFrames[0].node->mapid, keyFrames[0].node->x, keyFrames[0].node->y, keyFrames[0].node->z, teleport,
         keyFrames[0].node->arrivalEventID, keyFrames[0].node->departureEventID);
     m_WayPoints[0] = pos;
-    t += keyFrames[0].node->delay * 1000;
+    if (keyFrames[0].node->delay >0)
+    {
+        m_WayPoints[0].delay = keyFrames[0].node->delay * 1000;
+        t += keyFrames[0].node->delay * 1000;
+    }
 
     uint32 cM = keyFrames[0].node->mapid;
     for (size_t i = 0; i < keyFrames.size() - 1; ++i)
@@ -358,7 +312,11 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
                     //                    sLog.outString("T: %d, D: %f, x: %f, y: %f, z: %f", t, d, newX, newY, newZ);
                     WayPoint pos(keyFrames[i].node->mapid, newX, newY, newZ, teleport);
                     if (teleport)
+                    {
                         m_WayPoints[t] = pos;
+                        if (keyFrames[i].node->delay > 0)
+                            m_WayPoints[t].delay = keyFrames[i].node->delay * 1000;
+                    }
                 }
 
                 if (tFrom < tTo)                            // caught in tFrom dock's "gravitational pull"
@@ -405,12 +363,17 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
         WayPoint pos(keyFrames[i + 1].node->mapid, keyFrames[i + 1].node->x, keyFrames[i + 1].node->y, keyFrames[i + 1].node->z, teleport,
             keyFrames[i + 1].node->arrivalEventID, keyFrames[i + 1].node->departureEventID);
 
-        //        sLog.outString("T: %d, x: %f, y: %f, z: %f, t:%d", t, pos.x, pos.y, pos.z, teleport);
+        //DEBUG_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES,"Transport::Waypoint: %d, map: %u,  x: %f, y: %f, z: %f, t:%d", t, pos.loc.GetMapId(), pos.loc.getX(), pos.loc.getY(), pos.loc.getZ(), pos.teleport);
 
         //if (teleport)
         m_WayPoints[t] = pos;
 
-        t += keyFrames[i + 1].node->delay * 1000;
+        if (keyFrames[i + 1].node->delay > 0)
+        {
+             t += keyFrames[i + 1].node->delay * 1000;
+             m_WayPoints[t] = pos;
+             m_WayPoints[t].delay = keyFrames[i + 1].node->delay * 1000;
+        }
         //        sLog.outString("------");
     }
 
@@ -423,13 +386,12 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
     MoveToNextWayPoint();                                   // skip first point
 
     m_pathTime = timer;
-
     m_nextNodeTime = m_curr->first;
 
     return true;
 }
 
-void Transport::MoveToNextWayPoint()
+void MOTransport::MoveToNextWayPoint()
 {
     m_curr = m_next;
 
@@ -438,147 +400,254 @@ void Transport::MoveToNextWayPoint()
         m_next = m_WayPoints.begin();
 }
 
-void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z)
+
+void MOTransport::Update(uint32 update_diff, uint32 p_time)
 {
-    Map const* oldMap = GetMap();
-    Relocate(x, y, z);
+    UpdateSplineMovement(p_time);
+
+    if (!movespline->Finalized())
+        return;
+
+    if (m_WayPoints.size() <= 1)
+        return;
+
+    bool anchorage = !m_anchorageTimer.Passed();
+    if (anchorage)
+        m_anchorageTimer.Update(update_diff);
 
-    for(PlayerSet::iterator itr = m_passengers.begin(); itr != m_passengers.end();)
+    m_timer = WorldTimer::getMSTime() % GetPeriod(true);
+    while (((m_timer - m_curr->first) % m_pathTime) > ((m_next->first - m_curr->first) % m_pathTime))
     {
-        PlayerSet::iterator it2 = itr;
-        ++itr;
 
-        Player *plr = *it2;
-        if(!plr)
+        DoEventIfAny(*m_curr,true);
+        MoveToNextWayPoint();
+
+        // delay detect
+        if (m_next->second.delay > 0)
         {
-            m_passengers.erase(it2);
-            continue;
+            m_anchorageTimer.SetInterval(m_next->first - m_next->second.delay);
+            m_anchorageTimer.Reset();
         }
+        DoEventIfAny(*m_curr,false);
 
-        if (plr->isDead() && !plr->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
+        if (!SetPosition(m_curr->second.loc, m_curr->second.teleport))
         {
-            plr->ResurrectPlayer(1.0);
+            if (m_curr->second.loc.GetMapId() == m_next->second.loc.GetMapId() &&
+                !m_curr->second.teleport &&
+                m_anchorageTimer.Passed() &&
+                !(m_curr->second.loc == m_next->second.loc))
+            {
+                // FIXME - use MovementGenerator instead this
+                DEBUG_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES,"Transport::Update %s start spline movement to %f %f %f",GetObjectGuid().GetString().c_str(), m_next->second.loc.x, m_next->second.loc.y, m_next->second.loc.z);
+                Movement::MoveSplineInit<GameObject*> init(*this);
+                init.MoveTo((Vector3)m_next->second.loc);
+                init.SetVelocity(GetGOInfo()->moTransport.moveSpeed);
+                init.Launch();
+            }
         }
-        plr->TeleportTo(newMapid, x, y, z, GetOrientation(), TELE_TO_NOT_LEAVE_TRANSPORT);
+        m_nextNodeTime = m_curr->first;
 
-        //WorldPacket data(SMSG_811, 4);
-        //data << uint32(0);
-        //plr->GetSession()->SendPacket(&data);
+        DEBUG_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES, "Transport::Update %s moved to %f %f %f %d %s, next keyframe %u", GetObjectGuid().GetString().c_str(), m_curr->second.loc.x, m_curr->second.loc.y, m_curr->second.loc.z, m_curr->second.loc.GetMapId(), m_curr == m_WayPoints.begin() ? "begin move" : "", m_nextNodeTime);
     }
+}
 
-    //we need to create and save new Map object with 'newMapid' because if not done -> lead to invalid Map object reference...
-    //player far teleport would try to create same instance, but we need it NOW for transport...
-    //correct me if I'm wrong O.o
-    Map * newMap = sMapMgr.CreateMap(newMapid, this);
-    SetMap(newMap);
-
-    if(oldMap != newMap)
+void MOTransport::DoEventIfAny(WayPointMap::value_type const& node, bool departure)
+{
+    if (uint32 eventid = departure ? node.second.departureEventID : node.second.arrivalEventID)
     {
-        UpdateForMap(oldMap);
-        UpdateForMap(newMap);
+        DEBUG_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES, "Transport::DoEventIfAny %s activate taxi %s event %u (node %u)", GetGuidStr().c_str(), departure ? "departure" : "arrival", eventid, node.first);
+
+        if (!sScriptMgr.OnProcessEvent(eventid, this, this, departure))
+            GetMap()->ScriptsStart(sEventScripts, eventid, this, this);
     }
 }
 
-bool Transport::AddPassenger(Player* passenger)
+uint32 MOTransport::GetPossibleMapByEntry(uint32 entry, bool start)
 {
-    if (m_passengers.find(passenger) == m_passengers.end())
+    GameObjectInfo const* goinfo = ObjectMgr::GetGameObjectInfo(entry);
+    if (!goinfo || goinfo->type != GAMEOBJECT_TYPE_MO_TRANSPORT)
+        return UINT32_MAX;
+
+    if (goinfo->moTransport.taxiPathId >= sTaxiPathNodesByPath.size())
+        return UINT32_MAX;
+
+    TaxiPathNodeList const& path = sTaxiPathNodesByPath[goinfo->moTransport.taxiPathId];
+
+    if (path.empty())
+        return UINT32_MAX;
+
+    if (!start)
     {
-        DETAIL_LOG("Player %s boarded transport %s.", passenger->GetName(), GetName());
-        m_passengers.insert(passenger);
+        for (size_t i = 0; i < path.size(); ++i)
+            if (path[i].mapid != path[0].mapid)
+                return path[i].mapid;
     }
-    return true;
+
+    return path[0].mapid;
 }
 
-bool Transport::RemovePassenger(Player* passenger)
+bool MOTransport::IsSpawnedAtDifficulty(uint32 entry, Difficulty difficulty)
 {
-    if (m_passengers.erase(passenger))
-        DETAIL_LOG("Player %s removed from transport %s.", passenger->GetName(), GetName());
-    return true;
+    GameObjectInfo const* goinfo = ObjectMgr::GetGameObjectInfo(entry);
+    if (!goinfo || goinfo->type != GAMEOBJECT_TYPE_MO_TRANSPORT)
+        return false;
+    if (!goinfo->moTransport.difficultyMask)
+        return true;
+    return goinfo->moTransport.difficultyMask & uint32( 1 << difficulty);
 }
 
-void Transport::Update( uint32 update_diff, uint32 /*p_time*/)
+void MOTransport::Start()
 {
-    if (m_WayPoints.size() <= 1)
-        return;
-
-    m_timer = WorldTimer::getMSTime() % m_period;
-    while (((m_timer - m_curr->first) % m_pathTime) > ((m_next->first - m_curr->first) % m_pathTime))
-    {
+    DETAIL_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES, "Transport::StartMovement %s (%s) start moves, period %u/%u",
+        GetObjectGuid().GetString().c_str(),
+        GetName(),
+        m_pathTime,
+        GetPeriod()
+        );
+    SetActiveObjectState(true);
+    SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
+    SetGoState(GO_STATE_ACTIVE);
+    SetLootState(GO_ACTIVATED);
+}
 
-        DoEventIfAny(*m_curr,true);
+void MOTransport::Stop()
+{
+    DETAIL_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES, "Transport::StartMovement %s (%s) stop moves, period %u/%u",
+        GetObjectGuid().GetString().c_str(),
+        GetName(),
+        m_pathTime,
+        GetPeriod()
+        );
+    SetActiveObjectState(false);
+    RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
+    SetGoState(GO_STATE_READY);
+    SetLootState(GO_JUST_DEACTIVATED);
+}
 
-        MoveToNextWayPoint();
+// Return true, only if transport has correct position!
+bool MOTransport::SetPosition(WorldLocation const& loc, bool teleport)
+{
+    // prevent crash when a bad coord is sent by the client
+    if (!MaNGOS::IsValidMapCoord(loc.getX(), loc.getY(), loc.getZ(), loc.getO()))
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES, "Transport::SetPosition(%f, %f, %f, %f, %d) bad coordinates for transport %s!", loc.getX(), loc.getY(), loc.getZ(), loc.getO(), teleport, GetName());
+        return false;
+    }
 
-        DoEventIfAny(*m_curr,false);
+    if (teleport || GetMapId() != loc.GetMapId())
+    {
+        Map* oldMap = GetMap();
+        Map* newMap = sMapMgr.CreateMap(loc.GetMapId(), this);
 
-        // first check help in case client-server transport coordinates de-synchronization
-        if (m_curr->second.mapid != GetMapId() || m_curr->second.teleport)
+        if (!newMap)
         {
-            TeleportTransport(m_curr->second.mapid, m_curr->second.x, m_curr->second.y, m_curr->second.z);
-        }
-        else
-        {
-            Relocate(m_curr->second.x, m_curr->second.y, m_curr->second.z);
+            sLog.outError("Transport::SetPosition cannot create map %u for transport %s!", loc.GetMapId(), GetName());
+            return false;
         }
 
-        /*
-        for(PlayerSet::const_iterator itr = m_passengers.begin(); itr != m_passengers.end();)
+        if (oldMap != newMap)
         {
-            PlayerSet::const_iterator it2 = itr;
-            ++itr;
-            //(*it2)->SetPosition( m_curr->second.x + (*it2)->GetTransOffsetX(), m_curr->second.y + (*it2)->GetTransOffsetY(), m_curr->second.z + (*it2)->GetTransOffsetZ(), (*it2)->GetTransOffsetO() );
-        }
-        */
+            // Transport inserted in current map ActiveObjects list
+            if (!GetTransportKit()->GetPassengers().empty())
+            {
+                DEBUG_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES,"Transport::SetPosition %s notify passengers (count %u) for change map from %u to %u",GetObjectGuid().GetString().c_str(), GetTransportKit()->GetPassengers().size(), GetPosition().GetMapId(), loc.GetMapId());
+                GetTransportKit()->CallForAllPassengers(NotifyMapChangeBegin(oldMap, GetPosition(), loc));
+            }
 
-        m_nextNodeTime = m_curr->first;
+            oldMap->Remove((GameObject*)this, false);
 
-        if (m_curr == m_WayPoints.begin())
-            DETAIL_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES, " ************ BEGIN ************** %s", GetName());
+            SkipUpdate(true);
 
-        DETAIL_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES, "%s moved to %f %f %f %d", GetName(), m_curr->second.x, m_curr->second.y, m_curr->second.z, m_curr->second.mapid);
-    }
-}
+            SetMap(newMap);
 
-void Transport::UpdateForMap(Map const* targetMap)
-{
-    Map::PlayerList const& pl = targetMap->GetPlayers();
-    if(pl.isEmpty())
-        return;
+            Relocate(loc);
+            SetLocationMapId(loc.GetMapId());
+            SetLocationInstanceId(loc.GetInstanceId());
 
-    if(GetMapId()==targetMap->GetId())
-    {
-        for(Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr)
-        {
-            if(this != itr->getSource()->GetTransport())
+            newMap->Add((GameObject*)this);
+
+            // Transport inserted in current map ActiveObjects list
+            if (!GetTransportKit()->GetPassengers().empty())
             {
-                UpdateData transData;
-                BuildCreateUpdateBlockForPlayer(&transData, itr->getSource());
-                WorldPacket packet;
-                transData.BuildPacket(&packet);
-                itr->getSource()->SendDirectMessage(&packet);
+                DEBUG_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES,"Transport::SetPosition %s notify passengers (count %u) for finished change map to %u",GetObjectGuid().GetString().c_str(), GetTransportKit()->GetPassengers().size(), loc.GetMapId());
+                GetTransportKit()->CallForAllPassengers(NotifyMapChangeEnd(newMap,loc));
             }
+
+            DEBUG_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES, "Transport::SetPosition %s teleported to (%f, %f, %f, %f)", GetObjectGuid().GetString().c_str(), loc.x, loc.y, loc.z, loc.orientation);
+            return true;
         }
+        else if (!(GetPosition() == loc))
+            GetMap()->Relocation((GameObject*)this, loc);
     }
-    else
-    {
-        UpdateData transData;
-        BuildOutOfRangeUpdateBlock(&transData);
-        WorldPacket out_packet;
-        transData.BuildPacket(&out_packet);
-
-        for(Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr)
-            if(this != itr->getSource()->GetTransport())
-                itr->getSource()->SendDirectMessage(&out_packet);
-    }
+    else if (!(GetPosition() == loc))
+        GetMap()->Relocation((GameObject*)this, loc);
+
+
+    return false;
 }
 
-void Transport::DoEventIfAny(WayPointMap::value_type const& node, bool departure)
+
+/**
+ * @addtogroup TransportSystem
+ * @{
+ *
+ * @class TransportKit
+ * This classe contains the code needed for MaNGOS to provide abstract support for GO transporter
+ */
+
+
+TransportKit::TransportKit(Transport& base)
+    : TransportBase(&base), m_isInitialized(false)
 {
-    if (uint32 eventid = departure ? node.second.departureEventID : node.second.arrivalEventID)
-    {
-        DEBUG_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES, "Taxi %s event %u of node %u of %s \"%s\") path", departure ? "departure" : "arrival", eventid, node.first, GetGuidStr().c_str(), GetName());
+}
 
-        if (!sScriptMgr.OnProcessEvent(eventid, this, this, departure))
-            GetMap()->ScriptsStart(sEventScripts, eventid, this, this);
-    }
+TransportKit::~TransportKit()
+{
+    RemoveAllPassengers();
+}
+
+void TransportKit::Initialize()
+{
+    m_isInitialized = true;
+}
+
+void TransportKit::RemoveAllPassengers()
+{
+}
+
+void TransportKit::Reset()
+{
+    m_isInitialized = true;
+}
+
+bool TransportKit::AddPassenger(WorldObject* passenger, Position const& transportPos)
+{
+    // possible requires check for board possibility here and return false
+
+    // Calculate passengers local position, if not provided
+    BoardPassenger(passenger, transportPos.IsEmpty() ? CalculateBoardingPositionOf(passenger->GetPosition()) : transportPos, -1);
+
+    DETAIL_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES,"TransportKit::AddPassenger %s boarded on %s offset %f %f %f",
+        passenger->GetObjectGuid().GetString().c_str(), GetBase()->GetObjectGuid().GetString().c_str(), transportPos.getX(), transportPos.getY(), transportPos.getZ());
+
+    return true;
+}
+
+void TransportKit::RemovePassenger(WorldObject* passenger)
+{
+    UnBoardPassenger(passenger);
+
+    DETAIL_FILTER_LOG(LOG_FILTER_TRANSPORT_MOVES,"Transport::RemovePassenger %s unboarded from  %s.",
+        passenger->GetObjectGuid().GetString().c_str(), GetBase()->GetObjectGuid().GetString().c_str());
+}
+
+// Helper function to undo the turning of the vehicle to calculate a relative position of the passenger when boarding
+Position TransportKit::CalculateBoardingPositionOf(Position const& pos) const
+{
+    Position l(pos);
+    NormalizeRotatedPosition(pos.x - GetBase()->GetPositionX(), pos.y - GetBase()->GetPositionY(), l.x, l.y);
+
+    l.z = pos.z - GetBase()->GetPositionZ();
+    l.o = MapManager::NormalizeOrientation(pos.o - GetBase()->GetOrientation());
+    return l;
 }
diff --git a/src/game/Transports.h b/src/game/Transports.h
index a3b74812a32..cf3c7258f02 100644
--- a/src/game/Transports.h
+++ b/src/game/Transports.h
@@ -20,62 +20,129 @@
 #define TRANSPORTS_H
 
 #include "GameObject.h"
+#include "DBCEnums.h"
+#include "TransportSystem.h"
 
 #include <map>
 #include <set>
 #include <string>
 
-class Transport : public GameObject
+class TransportKit;
+
+class MANGOS_DLL_SPEC Transport : public GameObject
 {
     public:
         explicit Transport();
+        virtual ~Transport();
+
+        virtual void Update(uint32 update_diff, uint32 p_time) override;
+
+        bool AddPassenger(WorldObject* passenger, Position const& transportPos);
+        bool RemovePassenger(WorldObject* passenger);
+
+        virtual void Start() {};
+        virtual void Stop() {};
+
+        virtual TransportKit* GetTransportKit() override { return m_transportKit; };
+
+        virtual bool IsTransport() const override { return bool(m_transportKit); };
+        TransportBase* GetTransportBase() { return (TransportBase*)m_transportKit; };
+
+        uint32 GetPeriod(bool isDB = false) const { return isDB ? m_period : GetUInt32Value(GAMEOBJECT_LEVEL);}
+
+        void SetDBPeriod(uint32 _period) { m_period = _period; };
+        void SetPeriod(uint32 time) { SetUInt32Value(GAMEOBJECT_LEVEL, time);}
+
+    private:
+        uint32 m_period;
+
+    protected:
+        bool m_isInitialized;
+        TransportKit* m_transportKit;
+};
+
+class MANGOS_DLL_SPEC MOTransport : public Transport
+{
+    public:
+        explicit MOTransport();
+        virtual ~MOTransport();
+
+        static uint32 GetPossibleMapByEntry(uint32 entry, bool start = true);
+        static bool   IsSpawnedAtDifficulty(uint32 entry, Difficulty difficulty);
 
         bool Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint8 animprogress, uint16 dynamicHighValue);
-        bool GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids);
-        void Update(uint32 update_diff, uint32 p_time) override;
-        bool AddPassenger(Player* passenger);
-        bool RemovePassenger(Player* passenger);
+        bool GenerateWaypoints(uint32 pathid, std::set<uint32>& mapids);
+
+        virtual void Update(uint32 update_diff, uint32 p_time) override;
+        bool SetPosition(WorldLocation const& loc, bool teleport);
 
-        typedef std::set<Player*> PlayerSet;
-        PlayerSet const& GetPassengers() const { return m_passengers; }
+        uint32 GetTransportMapId() const { return GetGOInfo() ? GetGOInfo()->moTransport.mapID : 0; };
+
+        virtual void Start() override;
+        virtual void Stop() override;
+
+        virtual bool IsMOTransport() const override { return bool(m_transportKit); };
 
     private:
         struct WayPoint
         {
-            WayPoint() : mapid(0), x(0), y(0), z(0), teleport(false) {}
+            WayPoint() : loc(WorldLocation()), teleport(false) {}
             WayPoint(uint32 _mapid, float _x, float _y, float _z, bool _teleport, uint32 _arrivalEventID = 0, uint32 _departureEventID = 0)
-                : mapid(_mapid), x(_x), y(_y), z(_z), teleport(_teleport),
-                arrivalEventID(_arrivalEventID), departureEventID(_departureEventID)
+                : loc(_mapid, _x, _y, _z, 0.0f), teleport(_teleport),
+                arrivalEventID(_arrivalEventID), departureEventID(_departureEventID), delay(0)
             {
             }
-
-            uint32 mapid;
-            float x;
-            float y;
-            float z;
+            WorldLocation loc;
             bool teleport;
             uint32 arrivalEventID;
             uint32 departureEventID;
+            uint32 delay;
         };
 
+    public:
         typedef std::map<uint32, WayPoint> WayPointMap;
 
+    private:
+        void DoEventIfAny(WayPointMap::value_type const& node, bool departure);
+        void MoveToNextWayPoint();                          // move m_next/m_cur to next points
+
+        WayPointMap m_WayPoints;
+        uint32 m_timer;
+        uint32 m_pathTime;
+        uint32 m_nextNodeTime;
+        IntervalTimer  m_anchorageTimer;
+
         WayPointMap::const_iterator m_curr;
         WayPointMap::const_iterator m_next;
-        uint32 m_pathTime;
-        uint32 m_timer;
 
-        PlayerSet m_passengers;
+    public:
+        WayPointMap::const_iterator GetCurrent() { return m_curr; }
+        WayPointMap::const_iterator GetNext()    { return m_next; }
+        WayPoint const& GetWayPoint(uint32 index) { return index < m_WayPoints.size() ? m_WayPoints[index] : m_WayPoints[0]; }
+};
 
+class  MANGOS_DLL_SPEC TransportKit : public TransportBase
+{
     public:
-        WayPointMap m_WayPoints;
-        uint32 m_nextNodeTime;
-        uint32 m_period;
+        explicit TransportKit(Transport& base);
+        virtual ~TransportKit();
+
+        void Initialize();
+        bool IsInitialized() const { return m_isInitialized; }
+
+        void Reset();
+
+        bool AddPassenger(WorldObject* passenger, Position const& transportPos);
+        void RemovePassenger(WorldObject* passenger);
+        void RemoveAllPassengers();
+
+        Transport* GetBase() const { return (Transport*)GetOwner(); }
+        PassengerMap const& GetPassengers() const { return m_passengers; };
 
     private:
-        void TeleportTransport(uint32 newMapid, float x, float y, float z);
-        void UpdateForMap(Map const* map);
-        void DoEventIfAny(WayPointMap::value_type const& node, bool departure);
-        void MoveToNextWayPoint();                          // move m_next/m_cur to next points
+        // Internal use to calculate the boarding position
+        virtual Position CalculateBoardingPositionOf(Position const& pos) const override;
+        bool m_isInitialized;
 };
+
 #endif
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index abcc9cce411..83e15fd23a2 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -40,16 +40,19 @@
 #include "Util.h"
 #include "Totem.h"
 #include "Vehicle.h"
-#include "BattleGround.h"
+#include "BattleGround/BattleGround.h"
 #include "InstanceData.h"
+#include "OutdoorPvP/OutdoorPvP.h"
 #include "MapPersistentStateMgr.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
+#include "Transports.h"
 #include "VMapFactory.h"
-#include "MovementGenerator.h"
+#include "movementGenerators/MovementGenerator.h"
 #include "movement/MoveSplineInit.h"
 #include "movement/MoveSpline.h"
 #include "CreatureLinkingMgr.h"
+#include "UpdateFieldFlags.h"
 
 #include <math.h>
 #include <stdarg.h>
@@ -80,7 +83,7 @@ void MovementInfo::Read(ByteBuffer &data)
     data >> pos.z;
     data >> pos.o;
 
-    if(HasMovementFlag(MOVEFLAG_ONTRANSPORT))
+    if (HasMovementFlag(MOVEFLAG_ONTRANSPORT))
     {
         data >> t_guid.ReadAsPacked();
         data >> t_pos.x;
@@ -90,7 +93,7 @@ void MovementInfo::Read(ByteBuffer &data)
         data >> t_time;
         data >> t_seat;
 
-        if(moveFlags2 & MOVEFLAG2_INTERP_MOVEMENT)
+        if (moveFlags2 & MOVEFLAG2_INTERP_MOVEMENT)
             data >> t_time2;
     }
 
@@ -101,7 +104,7 @@ void MovementInfo::Read(ByteBuffer &data)
 
     data >> fallTime;
 
-    if(HasMovementFlag(MOVEFLAG_FALLING))
+    if (HasMovementFlag(MOVEFLAG_FALLING))
     {
         data >> jump.velocity;
         data >> jump.sinAngle;
@@ -109,9 +112,9 @@ void MovementInfo::Read(ByteBuffer &data)
         data >> jump.xyspeed;
     }
 
-    if(HasMovementFlag(MOVEFLAG_SPLINE_ELEVATION))
+    if (HasMovementFlag(MOVEFLAG_SPLINE_ELEVATION))
     {
-        data >> u_unk1;
+        data >> splineElevation;
     }
 }
 
@@ -125,7 +128,7 @@ void MovementInfo::Write(ByteBuffer &data) const
     data << pos.z;
     data << pos.o;
 
-    if(HasMovementFlag(MOVEFLAG_ONTRANSPORT))
+    if (HasMovementFlag(MOVEFLAG_ONTRANSPORT))
     {
         data << t_guid.WriteAsPacked();
         data << t_pos.x;
@@ -135,7 +138,7 @@ void MovementInfo::Write(ByteBuffer &data) const
         data << t_time;
         data << t_seat;
 
-        if(moveFlags2 & MOVEFLAG2_INTERP_MOVEMENT)
+        if (moveFlags2 & MOVEFLAG2_INTERP_MOVEMENT)
             data << t_time2;
     }
 
@@ -146,7 +149,7 @@ void MovementInfo::Write(ByteBuffer &data) const
 
     data << fallTime;
 
-    if(HasMovementFlag(MOVEFLAG_FALLING))
+    if (HasMovementFlag(MOVEFLAG_FALLING))
     {
         data << jump.velocity;
         data << jump.sinAngle;
@@ -154,9 +157,9 @@ void MovementInfo::Write(ByteBuffer &data) const
         data << jump.xyspeed;
     }
 
-    if(HasMovementFlag(MOVEFLAG_SPLINE_ELEVATION))
+    if (HasMovementFlag(MOVEFLAG_SPLINE_ELEVATION))
     {
-        data << u_unk1;
+        data << splineElevation;
     }
 }
 
@@ -169,6 +172,12 @@ bool GlobalCooldownMgr::HasGlobalCooldown(SpellEntry const* spellInfo) const
     return itr != m_GlobalCooldowns.end() && itr->second.duration && WorldTimer::getMSTimeDiff(itr->second.cast_time, WorldTimer::getMSTime()) < itr->second.duration;
 }
 
+uint32 GlobalCooldownMgr::GetGlobalCooldown(SpellEntry const* spellInfo) const
+{
+    GlobalCooldownList::const_iterator itr = m_GlobalCooldowns.find(spellInfo->StartRecoveryCategory);
+    return itr != m_GlobalCooldowns.end() ? itr->second.duration - WorldTimer::getMSTimeDiff(itr->second.cast_time, WorldTimer::getMSTime()) : 0;
+}
+
 void GlobalCooldownMgr::AddGlobalCooldown(SpellEntry const* spellInfo, uint32 gcd)
 {
     m_GlobalCooldowns[spellInfo->StartRecoveryCategory] = GlobalCooldown(gcd, WorldTimer::getMSTime());
@@ -183,10 +192,11 @@ void GlobalCooldownMgr::CancelGlobalCooldown(SpellEntry const* spellInfo)
 // Methods of class Unit
 
 Unit::Unit() :
-    i_motionMaster(this), m_ThreatManager(this), m_HostileRefManager(this),
     m_charmInfo(NULL),
-    m_vehicleInfo(NULL),
-    movespline(new Movement::MoveSpline())
+    i_motionMaster(this),
+    m_ThreatManager(*this),
+    m_HostileRefManager(new HostileRefManager(this)),
+    m_stateMgr(this)
 {
     m_objectType |= TYPEMASK_UNIT;
     m_objectTypeId = TYPEID_UNIT;
@@ -199,6 +209,11 @@ Unit::Unit() :
     m_modAttackSpeedPct[BASE_ATTACK] = 1.0f;
     m_modAttackSpeedPct[OFF_ATTACK] = 1.0f;
     m_modAttackSpeedPct[RANGED_ATTACK] = 1.0f;
+    m_modAttackSpeedPct[NONSTACKING_POS_MOD_MELEE] = 0.0f;
+    m_modAttackSpeedPct[NONSTACKING_NEG_MOD_MELEE] = 0.0f;
+    m_modAttackSpeedPct[NONSTACKING_MOD_ALL] = 0.0f;
+    m_modSpellSpeedPctNeg = 0.0f;
+    m_modSpellSpeedPctPos = 0.0f;
 
     m_extraAttacks = 0;
 
@@ -213,7 +228,6 @@ Unit::Unit() :
     //m_Aura = NULL;
     //m_AurasCheck = 2000;
     //m_removeAuraTimer = 4;
-    m_spellAuraHoldersUpdateIterator = m_spellAuraHolders.end();
     m_AuraFlags = 0;
 
     m_Visibility = VISIBILITY_ON;
@@ -232,6 +246,10 @@ Unit::Unit() :
         m_auraModifiersGroup[i][BASE_PCT] = 1.0f;
         m_auraModifiersGroup[i][TOTAL_VALUE] = 0.0f;
         m_auraModifiersGroup[i][TOTAL_PCT] = 1.0f;
+        m_auraModifiersGroup[i][NONSTACKING_VALUE_POS] = 0.0f;
+        m_auraModifiersGroup[i][NONSTACKING_VALUE_NEG] = 0.0f;
+        m_auraModifiersGroup[i][NONSTACKING_PCT] = 0.0f;
+        m_auraModifiersGroup[i][NONSTACKING_PCT_MINOR] = 0.0f;
     }
 
     // implement 50% base damage from offhand
@@ -245,7 +263,7 @@ Unit::Unit() :
     for (int i = 0; i < MAX_STATS; ++i)
         m_createStats[i] = 0.0f;
 
-    m_attacking = NULL;
+    m_attackingGuid.Clear();
     m_modMeleeHitChance = 0.0f;
     m_modRangedHitChance = 0.0f;
     m_modSpellHitChance = 0.0f;
@@ -261,16 +279,35 @@ Unit::Unit() :
     for (int i = 0; i < MAX_MOVE_TYPE; ++i)
         m_speed_rate[i] = 1.0f;
 
+    m_charmInfo = NULL;
+
     // remove aurastates allowing special moves
     for(int i=0; i < MAX_REACTIVE; ++i)
         m_reactiveTimer[i] = 0;
 
     m_isCreatureLinkingTrigger = false;
     m_isSpawningLinked = false;
+
+    m_pVehicleKit = VehicleKitPtr(NULL);
+    m_pVehicle    = VehicleKitPtr(NULL);
+
+    m_comboPoints = 0;
+
+    m_originalFaction = 0;
+
+    // Frozen Mod
+    m_spoofSamePlayerFaction = false;
+    // Frozen Mod
+
 }
 
 Unit::~Unit()
 {
+    if (IsInWorld())
+        WorldObject::RemoveFromWorld(true);
+
+    ResetMap();
+
     // set current spells as deletable
     for (uint32 i = 0; i < CURRENT_MAX_SPELL; ++i)
     {
@@ -281,23 +318,29 @@ Unit::~Unit()
         }
     }
 
-    delete m_charmInfo;
-    delete m_vehicleInfo;
-    delete movespline;
+    {
+#ifndef NOTSAFE_SEMAPHORE_OVERHANDLING
+        MAPLOCK_WRITE(this, MAP_LOCK_TYPE_DEFAULT);
+        MAPLOCK_WRITE1(this, MAP_LOCK_TYPE_AURAS);
+#endif
+        CleanupDeletedHolders(true);
+
+        delete m_charmInfo;
+    }
+    delete m_HostileRefManager;
 
     // those should be already removed at "RemoveFromWorld()" call
     MANGOS_ASSERT(m_gameObj.size() == 0);
-    MANGOS_ASSERT(m_dynObjGUIDs.size() == 0);
-    MANGOS_ASSERT(m_deletedAuras.size() == 0);
+    MANGOS_ASSERT(m_dynObjGuids.size() == 0);
     MANGOS_ASSERT(m_deletedHolders.size() == 0);
 }
 
-void Unit::Update( uint32 update_diff, uint32 p_time )
+void Unit::Update(uint32 update_diff, uint32 p_time)
 {
-    if(!IsInWorld())
+    if (!IsInWorld())
         return;
 
-    /*if(p_time > m_AurasCheck)
+    /*if (p_time > m_AurasCheck)
     {
     m_AurasCheck = 2000;
     _UpdateAura();
@@ -307,10 +350,13 @@ void Unit::Update( uint32 update_diff, uint32 p_time )
     // WARNING! Order of execution here is important, do not change.
     // Spells must be processed with event system BEFORE they go to _UpdateSpells.
     // Or else we may have some SPELL_STATE_FINISHED spells stalled in pointers, that is bad.
-    m_Events.Update( update_diff );
+    UpdateEvents(update_diff, p_time);
     _UpdateSpells( update_diff );
 
-    CleanupDeletedAuras();
+    {
+        MAPLOCK_WRITE(this,MAP_LOCK_TYPE_AURAS);
+        CleanupDeletedHolders(false);
+    }
 
     if (m_lastManaUseTimer)
     {
@@ -329,7 +375,7 @@ void Unit::Update( uint32 update_diff, uint32 p_time )
         // Check UNIT_STAT_MELEE_ATTACKING or UNIT_STAT_CHASE (without UNIT_STAT_FOLLOW in this case) so pets can reach far away
         // targets without stopping half way there and running off.
         // These flags are reset after target dies or another command is given.
-        if (m_HostileRefManager.isEmpty())
+        if (m_HostileRefManager->isEmpty())
         {
             // m_CombatTimer set at aura start and it will be freeze until aura removing
             if (m_CombatTimer <= update_diff)
@@ -341,27 +387,40 @@ void Unit::Update( uint32 update_diff, uint32 p_time )
 
     if (uint32 base_att = getAttackTimer(BASE_ATTACK))
     {
-        setAttackTimer(BASE_ATTACK, (update_diff >= base_att ? 0 : base_att - update_diff) );
+        setAttackTimer(BASE_ATTACK, (update_diff >= base_att ? 0 : base_att - update_diff));
     }
 
     if (uint32 base_att = getAttackTimer(OFF_ATTACK))
     {
-        setAttackTimer(OFF_ATTACK, (update_diff >= base_att ? 0 : base_att - update_diff) );
+        setAttackTimer(OFF_ATTACK, (update_diff >= base_att ? 0 : base_att - update_diff));
     }
 
-    // update abilities available only for fraction of time
-    UpdateReactives( update_diff );
+    if (IsVehicle() && !IsInEvadeMode())
+    {
+        // Initialize vehicle if not done
+        if (isAlive() && !GetVehicleKit()->IsInitialized())
+            GetVehicleKit()->Initialize();
+
+        // Update passenger positions if we are the first vehicle
+        if (!IsBoarded())
+            GetVehicleKit()->Update(update_diff);
+    }
 
-    ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, GetHealth() < GetMaxHealth()*0.20f);
-    ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, GetHealth() < GetMaxHealth()*0.35f);
-    ModifyAuraState(AURA_STATE_HEALTH_ABOVE_75_PERCENT, GetHealth() > GetMaxHealth()*0.75f);
+    // update abilities available only for fraction of time
+    UpdateReactives(update_diff);
+    if (isAlive())
+    {
+        ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, GetHealth() < GetMaxHealth() * 0.20f);
+        ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, GetHealth() < GetMaxHealth() * 0.35f);
+        ModifyAuraState(AURA_STATE_HEALTH_ABOVE_75_PERCENT, GetHealth() > GetMaxHealth() * 0.75f);
+    }
     UpdateSplineMovement(p_time);
-    i_motionMaster.UpdateMotion(p_time);
+    GetUnitStateMgr().Update(p_time);
 }
 
 bool Unit::UpdateMeleeAttackingState()
 {
-    Unit *victim = getVictim();
+    Unit* victim = getVictim();
     if (!victim || IsNonMeleeSpellCasted(false))
         return false;
 
@@ -425,7 +484,7 @@ bool Unit::haveOffhandWeapon() const
     if (!CanUseEquippedWeapon(OFF_ATTACK))
         return false;
 
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
         return ((Player*)this)->GetWeaponForAttack(OFF_ATTACK,true,true);
     else
     {
@@ -439,6 +498,36 @@ bool Unit::haveOffhandWeapon() const
     }
 }
 
+bool Unit::SetPosition(Position const& pos, bool teleport)
+{
+    // prevent crash when a bad coord is sent by the client
+    if (!MaNGOS::IsValidMapCoord(pos.x, pos.y, pos.z, pos.orientation))
+    {
+        DEBUG_LOG("Unit::SetPosition(%f, %f, %f, %f, %d) .. bad coordinates for unit %s!", pos.x, pos.y, pos.z, pos.orientation, teleport, GetObjectGuid().GetString().c_str());
+        return false;
+    }
+
+    bool turn = fabs(GetOrientation() - pos.orientation) > M_NULL_F;
+    bool relocate = !((Position)GetPosition() == pos);
+
+    if (turn)
+        RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING);
+
+    if (relocate)
+    {
+        RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOVE);
+
+        if (GetTypeId() == TYPEID_PLAYER)
+            GetMap()->Relocation((Player*)this, pos);
+        else
+            GetMap()->Relocation((Creature*)this, pos);
+    }
+    else if (turn)
+        SetOrientation(pos.orientation);
+
+    return relocate || turn;
+}
+
 void Unit::SendHeartBeat()
 {
     m_movementInfo.UpdateTime(WorldTimer::getMSTime());
@@ -453,57 +542,110 @@ void Unit::resetAttackTimer(WeaponAttackType type)
     m_attackTimer[type] = uint32(GetAttackTime(type) * m_modAttackSpeedPct[type]);
 }
 
-bool Unit::CanReachWithMeleeAttack(Unit* pVictim, float flat_mod /*= 0.0f*/) const
+float Unit::GetCombatReach(bool forMeleeRange /*=true*/) const
+{
+    float reach = GetFloatValue(UNIT_FIELD_COMBATREACH);
+    return (forMeleeRange && reach < DEFAULT_COMBAT_REACH) ? DEFAULT_COMBAT_REACH : reach;
+}
+
+float Unit::GetCombatReach(Unit const* pVictim, bool forMeleeRange /*=true*/, float flatMod /*=0.0f*/) const
+{
+    float victimReach = (pVictim && pVictim->IsInWorld())
+        ? pVictim->GetCombatReach(forMeleeRange)
+        : 0.0f;
+
+    float reach = GetCombatReach(forMeleeRange) + victimReach + flatMod;
+
+    if (forMeleeRange)
+    {
+        reach += BASE_MELEERANGE_OFFSET;
+        if (reach < ATTACK_DISTANCE)
+            reach = ATTACK_DISTANCE;
+    }
+
+    return reach;
+}
+
+float Unit::GetCombatDistance(Unit const* pVictim, bool forMeleeRange /*=true*/) const
 {
-    MANGOS_ASSERT(pVictim);
+    if (!pVictim)
+        return 0.0f;
 
-    // The measured values show BASE_MELEE_OFFSET in (1.3224, 1.342)
-    float reach = GetFloatValue(UNIT_FIELD_COMBATREACH) + pVictim->GetFloatValue(UNIT_FIELD_COMBATREACH) +
-        BASE_MELEERANGE_OFFSET + flat_mod;
+    float radius = GetCombatReach(pVictim, forMeleeRange);
+    float dist = GetPosition().GetDistance(pVictim->GetPosition()) - radius;
+    return dist > M_NULL_F ? dist : 0.0f;
+}
 
-    if (reach < ATTACK_DISTANCE)
-        reach = ATTACK_DISTANCE;
+bool Unit::CanReachWithMeleeAttack(Unit const* pVictim, float flatMod /*=0.0f*/) const
+{
+    if (!pVictim || !pVictim->IsInWorld() || !InSamePhase(pVictim))
+        return false;
 
-    // This check is not related to bounding radius
-    float dx = GetPositionX() - pVictim->GetPositionX();
-    float dy = GetPositionY() - pVictim->GetPositionY();
-    float dz = GetPositionZ() - pVictim->GetPositionZ();
+    float reach = GetCombatReach(pVictim, true, flatMod);
 
-    return dx*dx + dy*dy + dz*dz < reach*reach;
+    // This check is not related to bounding radius of both units!
+    return GetPosition().GetDistance(pVictim->GetPosition()) < reach;
 }
 
 void Unit::RemoveSpellsCausingAura(AuraType auraType)
 {
-    for (AuraList::const_iterator iter = m_modAuras[auraType].begin(); iter != m_modAuras[auraType].end();)
+    SpellIdSet toRemoveSpellList;
+    for (AuraList::const_iterator iter = m_modAuras[auraType].begin(); iter != m_modAuras[auraType].end(); ++iter)
+    {
+        if (!iter->GetHolder() || iter->GetHolder()->IsDeleted())
+            continue;
+
+        toRemoveSpellList.insert(iter->GetHolder()->GetId());
+    }
+
+    for (SpellIdSet::iterator i = toRemoveSpellList.begin(); i != toRemoveSpellList.end(); ++i)
+        RemoveAurasDueToSpell(*i);
+}
+
+void Unit::RemoveSpellsCausingAura(AuraType auraType, SpellAuraHolderPtr except)
+{
+    SpellIdSet toRemoveSpellList;
+    AuraList const& auras = GetAurasByType(auraType);
+
+    for (AuraList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter)
     {
-        RemoveAurasDueToSpell((*iter)->GetId());
-        iter = m_modAuras[auraType].begin();
+        if (!iter->GetHolder() || iter->GetHolder()->IsDeleted())
+            continue;
+
+        // skip `except` holder
+        if (iter->GetHolder() == except)
+            continue;
+
+        toRemoveSpellList.insert(iter->GetHolder()->GetId());
     }
+
+    for (SpellIdSet::iterator i = toRemoveSpellList.begin(); i != toRemoveSpellList.end(); ++i)
+        RemoveAurasDueToSpell(*i, except);
 }
 
-void Unit::RemoveSpellsCausingAura(AuraType auraType, SpellAuraHolder* except)
+void Unit::RemoveSpellsCausingAura(AuraType auraType, ObjectGuid casterGuid)
 {
     for (AuraList::const_iterator iter = m_modAuras[auraType].begin(); iter != m_modAuras[auraType].end();)
     {
-        // skip `except` aura
-        if ((*iter)->GetHolder() == except)
+        if ((*iter)->GetCasterGuid() == casterGuid)
         {
-            ++iter;
-            continue;
+            RemoveAuraHolderFromStack((*iter)->GetId(), 1, casterGuid);
+            iter = m_modAuras[auraType].begin();
         }
-
-        RemoveAurasDueToSpell((*iter)->GetId(), except);
-        iter = m_modAuras[auraType].begin();
+        else
+            ++iter;
     }
 }
 
-void Unit::DealDamageMods(Unit *pVictim, uint32 &damage, uint32* absorb)
+void Unit::DealDamageMods(DamageInfo* damageInfo)
 {
+    Unit* pVictim = damageInfo->target;
+    if (!pVictim)
+        return;
+
     if (!pVictim->isAlive() || pVictim->IsTaxiFlying() || (pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode()))
     {
-        if (absorb)
-            *absorb += damage;
-        damage = 0;
+        damageInfo->AddAbsorb(damageInfo->damage);
         return;
     }
 
@@ -511,174 +653,278 @@ void Unit::DealDamageMods(Unit *pVictim, uint32 &damage, uint32* absorb)
     //You still see it in the combat log though
     if (!IsAllowedDamageInArea(pVictim))
     {
-        if(absorb)
-            *absorb += damage;
-        damage = 0;
+        damageInfo->AddAbsorb(damageInfo->damage);
     }
 
-    uint32 originalDamage = damage;
+    uint32 originalDamage = damageInfo->damage;
 
     //Script Event damage Deal
-    if( GetTypeId()== TYPEID_UNIT && ((Creature *)this)->AI())
-        ((Creature *)this)->AI()->DamageDeal(pVictim, damage);
+    if ( GetTypeId()== TYPEID_UNIT && ((Creature *)this)->AI())
+        ((Creature *)this)->AI()->DamageDeal(pVictim, damageInfo->damage);
     //Script Event damage taken
-    if( pVictim->GetTypeId()== TYPEID_UNIT && ((Creature *)pVictim)->AI() )
-        ((Creature *)pVictim)->AI()->DamageTaken(this, damage);
+    if ( pVictim->GetTypeId()== TYPEID_UNIT && ((Creature *)pVictim)->AI() )
+        ((Creature *)pVictim)->AI()->DamageTaken(this, damageInfo->damage);
 
-    if(absorb && originalDamage > damage)
-        *absorb += (originalDamage - damage);
+    if (originalDamage > damageInfo->damage)
+        damageInfo->AddAbsorb(originalDamage - damageInfo->damage);
 }
 
-uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellEntry const *spellProto, bool durabilityLoss)
+uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, DamageInfo* damageInfo, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellEntry const *spellProto, bool durabilityLoss)
 {
-    // remove affects from attacker at any non-DoT damage (including 0 damage)
-    if( damagetype != DOT)
+    // wrapper for old method of damage calculation (mostly for scripts)
+    if (!damageInfo)
+    {
+        DamageInfo tmpdamageInfo   = DamageInfo(this, pVictim, spellProto, damage);
+        tmpdamageInfo.cleanDamage  = damage;
+        tmpdamageInfo.damageType   = damagetype;
+        return DealDamage(pVictim, &tmpdamageInfo, durabilityLoss);
+    }
+    else
     {
-        RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
-        RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+        if (damageInfo->GetSpellProto() != spellProto)
+            sLog.outError("Unit::DealDamage wrong usage of wrapper for damage dealing, damageInfo has spell id %u, but provided %u!",
+            damageInfo->GetSpellProto() ? damageInfo->GetSpellProto()->Id : 0,
+            spellProto ? spellProto->Id : 0);
+        damageInfo->cleanDamage  = damageInfo->damage;
+        damageInfo->damage       = damage;
+        damageInfo->damageType   = damagetype;
+        return DealDamage(pVictim, damageInfo, durabilityLoss);
+    }
+}
 
-        if(pVictim != this)
-            RemoveSpellsCausingAura(SPELL_AURA_MOD_INVISIBILITY);
+uint32 Unit::DealDamage(Unit* pVictim, DamageInfo* damageInfo, bool durabilityLoss)
+{
+    if (!damageInfo)
+        return 0;
 
-        if(pVictim->GetTypeId() == TYPEID_PLAYER && !pVictim->IsStandState() && !pVictim->hasUnitState(UNIT_STAT_STUNNED))
-            pVictim->SetStandState(UNIT_STAND_STATE_STAND);
+    if (!damageInfo->target || damageInfo->target != pVictim)
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"Unit::DealDamage wrong target definition in DealDamage of %s, try override!",
+            GetObjectGuid().GetString().c_str());
+        damageInfo->target = pVictim;
     }
+    damageInfo->durabilityLoss = durabilityLoss;
 
-    if(!damage)
-    {
-        // Rage from physical damage received .
-        if(cleanDamage && cleanDamage->damage && (damageSchoolMask & SPELL_SCHOOL_MASK_NORMAL) && pVictim->GetTypeId() == TYPEID_PLAYER && (pVictim->getPowerType() == POWER_RAGE))
-            ((Player*)pVictim)->RewardRage(cleanDamage->damage, 0, false);
+    return DealDamage(damageInfo);
+}
 
+uint32 Unit::DealDamage(DamageInfo* damageInfo)
+{
+    if (!damageInfo || !damageInfo->target)
         return 0;
-    }
 
-    // no xp,health if type 8 /critters/
-    if (pVictim->GetTypeId() == TYPEID_UNIT && pVictim->GetCreatureType() == CREATURE_TYPE_CRITTER)
+    Unit* pVictim = damageInfo->target;
+    SpellEntry const* spellProto = damageInfo->GetSpellProto();
+
+    // Divine Storm heal hack
+    if ( spellProto && spellProto->Id == 53385 )
     {
-        // TODO: fix this part
-        // Critter may not die of damage taken, instead expect it to run away (no fighting back)
-        // If (this) is TYPEID_PLAYER, (this) will enter combat w/victim, but after some time, automatically leave combat.
-        // It is unclear how it should work for other cases.
+        int32 divineDmg = damageInfo->damage * (25 + (HasAura(63220) ? 15 : 0)) / 100; //25%, if has Glyph of Divine Storm -> 40%
+        CastCustomSpell(this, 54171, &divineDmg, NULL, NULL, true);
+    }
 
-        ((Creature*)pVictim)->SetLootRecipient(this);
+    // remove affects from attacker at any non-DoT damage (including 0 damage)
+    if ( damageInfo->damageType != DOT)
+    {
+        if (pVictim->GetTypeId() == TYPEID_PLAYER && !pVictim->IsStandState() && !pVictim->hasUnitState(UNIT_STAT_STUNNED))
+            pVictim->SetStandState(UNIT_STAND_STATE_STAND);
 
-        pVictim->SetDeathState(JUST_DIED);
-        pVictim->SetHealth(0);
+        if (pVictim != this)
+            pVictim->AttackedBy(this);
 
-        // allow loot only if has loot_id in creature_template
-        ((Creature*)pVictim)->PrepareBodyLootState();
-        ((Creature*)pVictim)->AllLootRemovedFromCorpse();
+        if (damageInfo->GetSchoolMask() == SPELL_SCHOOL_MASK_NORMAL)
+            RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MELEE_ATTACK);
+        else
+            RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_SPELL_ATTACK);
+    }
 
-        // some critters required for quests (need normal entry instead possible heroic in any cases)
-        if (GetTypeId() == TYPEID_PLAYER)
+    // Blessed Life talent of Paladin
+    if ( pVictim->GetTypeId() == TYPEID_PLAYER )
+    {
+        AuraList const& BlessedLife = pVictim->GetAurasByType(SPELL_AURA_PROC_TRIGGER_SPELL);
+        for (AuraList::const_iterator i = BlessedLife.begin(); i != BlessedLife.end(); ++i)
         {
-            if (CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(pVictim->GetEntry()))
-                ((Player*)this)->KilledMonster(normalInfo, pVictim->GetObjectGuid());
+            if (!i->GetHolder() || i->GetHolder()->IsDeleted())
+                continue;
+
+            if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_PALADIN && (*i)->GetSpellProto()->GetSpellIconID() == 2137)
+                if ( urand(0,100) < (*i)->GetSpellProto()->procChance )
+                    damageInfo->damage *= 0.5f;
         }
+    }
 
-        if (InstanceData* mapInstance = pVictim->GetInstanceData())
-            mapInstance->OnCreatureDeath(((Creature*)pVictim));
+    if (!damageInfo->damage)
+    {
+        if (!damageInfo->cleanDamage)
+            return 0;
 
-        DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "DealDamage critter, critter dies");
+        if (!damageInfo->GetAbsorb())
+        {
+            // Rage from physical damage received .
+            if (damageInfo->cleanDamage && (damageInfo->GetSchoolMask() & SPELL_SCHOOL_MASK_NORMAL) && pVictim->GetTypeId() == TYPEID_PLAYER && (pVictim->GetPowerType() == POWER_RAGE))
+                ((Player*)pVictim)->RewardRage(damageInfo->cleanDamage, 0, false);
 
-        return damage;
+            return 0;
+        }
     }
 
-    DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"DealDamageStart");
 
     uint32 health = pVictim->GetHealth();
-    DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"deal dmg:%d to health:%d ",damage,health);
+    DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"Unit::DealDamage DealDamageStart, %s strike %s,  value %u, health %u",GetObjectGuid().GetString().c_str(), pVictim->GetObjectGuid().GetString().c_str(), damageInfo->damage, health);
 
-    // duel ends when player has 1 or less hp
-    bool duel_hasEnded = false;
-    if (pVictim->GetTypeId() == TYPEID_PLAYER && ((Player*)pVictim)->duel && damage >= (health-1))
+    if (!damageInfo->HasFlag(DAMAGE_SHARED))
     {
-        // prevent kill only if killed in duel and killed by opponent or opponent controlled creature
-        if(((Player*)pVictim)->duel->opponent==this || ((Player*)pVictim)->duel->opponent->GetObjectGuid() == GetOwnerGuid())
-            damage = health-1;
+        std::vector<DamageInfo> linkedDamageList;
+        {
+            MAPLOCK_READ(pVictim,MAP_LOCK_TYPE_AURAS);
+            // share damage by auras
+            AuraList const& vShareDamageAuras = pVictim->GetAurasByType(SPELL_AURA_SHARE_DAMAGE_PCT);
+            for (AuraList::const_iterator itr = vShareDamageAuras.begin(); itr != vShareDamageAuras.end(); ++itr)
+            {
+                if (!(*itr) || !(*itr)->GetHolder() || (*itr)->GetHolder()->IsDeleted())
+                    continue;
 
-        duel_hasEnded = true;
-    }
-    //Get in CombatState
-    if(pVictim != this && damagetype != DOT)
-    {
-        SetInCombatWith(pVictim);
-        pVictim->SetInCombatWith(this);
+                if (Unit* shareTarget = (*itr)->GetCaster())
+                {
+                    if (shareTarget != pVictim && ((*itr)->GetMiscValue() & damageInfo->GetSchoolMask()))
+                    {
+                        SpellEntry const* shareSpell = (*itr)->GetSpellProto();
+                        int32 shareDamage = int32(damageInfo->damage * (*itr)->GetModifier()->m_amount / 100.0f);
+                        //linkedDamageList.push_back(DamageInfo(this, shareTarget, spellProto, shareDamage));
+                        linkedDamageList.push_back(DamageInfo(this, shareTarget, shareSpell, shareDamage));
+                        DamageInfo* sharedDamageInfo   = &linkedDamageList.back();
+                        DealDamageMods(sharedDamageInfo);
+                        sharedDamageInfo->cleanDamage  = shareDamage;
+                        sharedDamageInfo->AddFlag(DAMAGE_SHARED);
+                    }
+                }
+            }
+        }
 
-        if(Player* attackedPlayer = pVictim->GetCharmerOrOwnerPlayerOrPlayerItself())
-            SetContestedPvP(attackedPlayer);
+        while (!linkedDamageList.empty())
+        {
+            DealDamage(&linkedDamageList.back());
+            linkedDamageList.pop_back();
+        }
     }
 
+
     // Rage from Damage made (only from direct weapon damage)
-    if( cleanDamage && damagetype==DIRECT_DAMAGE && this != pVictim && GetTypeId() == TYPEID_PLAYER && (getPowerType() == POWER_RAGE))
+    if (damageInfo->cleanDamage && damageInfo->damageType == DIRECT_DAMAGE && this != pVictim && GetTypeId() == TYPEID_PLAYER && (GetPowerType() == POWER_RAGE))
     {
         uint32 weaponSpeedHitFactor;
 
-        switch(cleanDamage->attackType)
+        switch (damageInfo->attackType)
         {
             case BASE_ATTACK:
             {
-                if(cleanDamage->hitOutCome == MELEE_HIT_CRIT)
-                    weaponSpeedHitFactor = uint32(GetAttackTime(cleanDamage->attackType)/1000.0f * 7);
+                if (damageInfo->hitOutCome == MELEE_HIT_CRIT)
+                    weaponSpeedHitFactor = uint32(GetAttackTime(damageInfo->attackType)/1000.0f * 7);
                 else
-                    weaponSpeedHitFactor = uint32(GetAttackTime(cleanDamage->attackType)/1000.0f * 3.5f);
+                    weaponSpeedHitFactor = uint32(GetAttackTime(damageInfo->attackType)/1000.0f * 3.5f);
 
-                ((Player*)this)->RewardRage(damage, weaponSpeedHitFactor, true);
+                ((Player*)this)->RewardRage(damageInfo->damage + damageInfo->GetAbsorb(), weaponSpeedHitFactor, true);
 
                 break;
             }
             case OFF_ATTACK:
             {
-                if(cleanDamage->hitOutCome == MELEE_HIT_CRIT)
-                    weaponSpeedHitFactor = uint32(GetAttackTime(cleanDamage->attackType)/1000.0f * 3.5f);
+                if (damageInfo->hitOutCome == MELEE_HIT_CRIT)
+                    weaponSpeedHitFactor = uint32(GetAttackTime(damageInfo->attackType)/1000.0f * 3.5f);
                 else
-                    weaponSpeedHitFactor = uint32(GetAttackTime(cleanDamage->attackType)/1000.0f * 1.75f);
+                    weaponSpeedHitFactor = uint32(GetAttackTime(damageInfo->attackType)/1000.0f * 1.75f);
 
-                ((Player*)this)->RewardRage(damage, weaponSpeedHitFactor, true);
+                ((Player*)this)->RewardRage(damageInfo->damage + damageInfo->GetAbsorb(), weaponSpeedHitFactor, true);
 
                 break;
             }
             case RANGED_ATTACK:
+            default:
                 break;
         }
     }
 
+    // no xp,health if type 8 /critters/
+    if (pVictim->GetTypeId() == TYPEID_UNIT && pVictim->GetCreatureType() == CREATURE_TYPE_CRITTER)
+    {
+        // TODO: fix this part
+        // Critter may not die of damage taken, instead expect it to run away (no fighting back)
+        // If (this) is TYPEID_PLAYER, (this) will enter combat w/victim, but after some time, automatically leave combat.
+        // It is unclear how it should work for other cases.
+
+        DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "Unit::DealDamage %s strike critter, critter %s dies", GetObjectGuid().GetString().c_str(), pVictim->GetObjectGuid().GetString().c_str());
+
+        ((Creature*)pVictim)->SetLootRecipient(this);
+
+        JustKilledCreature((Creature*)pVictim, NULL);
+
+        pVictim->SetDeathState(JUST_DIED);
+        pVictim->SetHealth(0);
+
+        return damageInfo->damage;
+    }
+
+    // duel ends when player has 1 or less hp
+    bool duel_hasEnded = false;
+    if (pVictim->GetTypeId() == TYPEID_PLAYER && ((Player*)pVictim)->duel && damageInfo->damage >= (health-1))
+    {
+        // prevent kill only if killed in duel and killed by opponent or opponent controlled creature
+        if(((Player*)pVictim)->duel->opponent==this || ((Player*)pVictim)->duel->opponent->GetObjectGuid() == GetOwnerGuid())
+            damageInfo->damage = health-1;
+
+        duel_hasEnded = true;
+    }
+    //Get in CombatState
+    if (pVictim != this && damageInfo->damageType != DOT)
+    {
+        if (!spellProto || !spellProto->HasAttribute(SPELL_ATTR_EX_NO_THREAT))
+        {
+            SetInCombatWith(pVictim);
+            pVictim->SetInCombatWith(this);
+
+            if (Player* attackedPlayer = pVictim->GetCharmerOrOwnerPlayerOrPlayerItself())
+                SetContestedPvP(attackedPlayer);
+        }
+    }
+
     if (GetTypeId() == TYPEID_PLAYER && this != pVictim)
     {
         Player *killer = ((Player*)this);
 
+        /* process anticheat check */
+        killer->GetAntiCheat()->DoAntiCheatCheck(CHECK_DAMAGE, 0, 0, damageInfo->damage);
+
+
         // in bg, count dmg if victim is also a player
         if (pVictim->GetTypeId()==TYPEID_PLAYER)
         {
             if (BattleGround *bg = killer->GetBattleGround())
             {
                 // FIXME: kept by compatibility. don't know in BG if the restriction apply.
-                bg->UpdatePlayerScore(killer, SCORE_DAMAGE_DONE, damage);
+                bg->UpdatePlayerScore(killer, SCORE_DAMAGE_DONE, damageInfo->damage);
             }
         }
 
-        killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE, damage, 0, pVictim);
-        killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_DEALT, damage);
+        killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE, damageInfo->damage, 0, pVictim);
+        killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_DEALT, damageInfo->damage);
     }
 
     if (pVictim->GetTypeId() == TYPEID_PLAYER)
-        ((Player*)pVictim)->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_RECEIVED, damage);
+        ((Player*)pVictim)->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_RECEIVED, damageInfo->damage);
 
     if (pVictim->GetTypeId() == TYPEID_UNIT && !((Creature*)pVictim)->IsPet() && !((Creature*)pVictim)->HasLootRecipient())
         ((Creature*)pVictim)->SetLootRecipient(this);
 
-    if (health <= damage)
+    if (health <= damageInfo->damage)
     {
-        DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"DealDamage: victim just died");
+        DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "Unit::DealDamage %s Killed %s", GetGuidStr().c_str(), pVictim->GetGuidStr().c_str());
 
-        // find player: owner of controlled `this` or `this` itself maybe
-        // for loot will be sued only if group_tap==NULL
-        Player *player_tap = GetCharmerOrOwnerPlayerOrPlayerItself();
-        Group *group_tap = NULL;
-
-        // find owner of pVictim, used for creature cases, AI calls
-        Unit* pOwner = pVictim->GetCharmerOrOwner();
+        /*
+         *                      Preparation: Who gets credit for killing whom, invoke SpiritOfRedemtion?
+         */
+        // for loot will be used only if group_tap == NULL
+        Player* player_tap = GetCharmerOrOwnerPlayerOrPlayerItself();
+        Group* group_tap = NULL;
 
         // in creature kill case group/player tap stored for creature
         if (pVictim->GetTypeId() == TYPEID_UNIT)
@@ -695,21 +941,35 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
                 group_tap = player_tap->GetGroup();
         }
 
-        if (pVictim->GetTypeId() == TYPEID_PLAYER)
+        // Spirit of Redemtion Talent
+        bool damageFromSpiritOfRedemtionTalent = spellProto && spellProto->Id == 27795;
+        // if talent known but not triggered (check priest class for speedup check)
+        AuraPair spiritOfRedemtionTalentReady;
+        if (!damageFromSpiritOfRedemtionTalent &&           // not called from SPELL_AURA_SPIRIT_OF_REDEMPTION
+                pVictim->GetTypeId() == TYPEID_PLAYER && pVictim->getClass() == CLASS_PRIEST)
         {
-            ((Player*)pVictim)->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, health);
-            if (player_tap)
-                player_tap->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL,1,0,pVictim);
+            AuraList const& vDummyAuras = pVictim->GetAurasByType(SPELL_AURA_DUMMY);
+            for (AuraList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr)
+            {
+                if ((*itr)->GetSpellProto()->GetSpellIconID() == 1654)
+                {
+                    spiritOfRedemtionTalentReady = (*itr);
+                    break;
+                }
+            }
         }
 
+        /*
+         *                      Generic Actions (ProcEvents, Combat-Log, Kill Rewards, Stop Combat)
+         */
         // call kill spell proc event (before real die and combat stop to triggering auras removed at death/combat stop)
-        if(player_tap && player_tap != pVictim)
+        if (player_tap && player_tap != pVictim)
         {
             player_tap->ProcDamageAndSpell(pVictim, PROC_FLAG_KILL, PROC_FLAG_KILLED, PROC_EX_NONE, 0);
 
-            WorldPacket data(SMSG_PARTYKILLLOG, (8+8));     //send event PARTY_KILL
-            data << player_tap->GetObjectGuid();            //player with killing blow
-            data << pVictim->GetObjectGuid();              //victim
+            WorldPacket data(SMSG_PARTYKILLLOG, (8 + 8));   // send event PARTY_KILL
+            data << player_tap->GetObjectGuid();            // player with killing blow
+            data << pVictim->GetObjectGuid();               // victim
 
             if (group_tap)
                 group_tap->BroadcastPacket(&data, false, group_tap->GetMemberGroup(player_tap->GetObjectGuid()),player_tap->GetObjectGuid());
@@ -717,49 +977,18 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
             player_tap->SendDirectMessage(&data);
         }
 
-        // Reward player, his pets, and group/raid members
-        if (player_tap != pVictim)
-        {
-            if (group_tap)
-                group_tap->RewardGroupAtKill(pVictim, player_tap);
-            else if (player_tap)
-                player_tap->RewardSinglePlayerAtKill(pVictim);
-        }
-
-        DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"DealDamageAttackStop");
-
         // stop combat
+        DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "Unit::DealDamage DealDamageAttackStop, %s stopped attack",GetGuidStr().c_str());
         pVictim->CombatStop();
         pVictim->getHostileRefManager().deleteReferences();
 
-        bool damageFromSpiritOfRedemtionTalent = spellProto && spellProto->Id == 27795;
-
-        // if talent known but not triggered (check priest class for speedup check)
-        Aura* spiritOfRedemtionTalentReady = NULL;
-        if( !damageFromSpiritOfRedemtionTalent &&           // not called from SPELL_AURA_SPIRIT_OF_REDEMPTION
-            pVictim->GetTypeId()==TYPEID_PLAYER && pVictim->getClass()==CLASS_PRIEST )
-        {
-            AuraList const& vDummyAuras = pVictim->GetAurasByType(SPELL_AURA_DUMMY);
-            for(AuraList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr)
-            {
-                if((*itr)->GetSpellProto()->SpellIconID==1654)
-                {
-                    spiritOfRedemtionTalentReady = *itr;
-                    break;
-                }
-            }
-        }
-
-        if (!spiritOfRedemtionTalentReady)
+        /*
+         *                      Actions for the killer
+         */
+        if (!spiritOfRedemtionTalentReady.IsEmpty())
         {
-            DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"SET JUST_DIED");
-            pVictim->SetDeathState(JUST_DIED);
-        }
-
-        DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"DealDamageHealth1");
+            DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "Unit::DealDamage: Spirit of Redemtion (unit %s) sready", pVictim->GetGuidStr().c_str());
 
-        if(spiritOfRedemtionTalentReady)
-        {
             // save value before aura remove
             uint32 ressSpellId = pVictim->GetUInt32Value(PLAYER_SELF_RES_SPELL);
             if(!ressSpellId)
@@ -772,16 +1001,11 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
             pVictim->SetUInt32Value(PLAYER_SELF_RES_SPELL,ressSpellId);
 
             // FORM_SPIRITOFREDEMPTION and related auras
-            pVictim->CastSpell(pVictim,27827,true,NULL,spiritOfRedemtionTalentReady);
+            pVictim->CastSpell(pVictim,27827,true,NULL,spiritOfRedemtionTalentReady());
         }
-        else
+        else if (pVictim->IsInWorld())
             pVictim->SetHealth(0);
 
-        // remember victim PvP death for corpse type and corpse reclaim delay
-        // at original death (not at SpiritOfRedemtionTalent timeout)
-        if( pVictim->GetTypeId()==TYPEID_PLAYER && !damageFromSpiritOfRedemtionTalent )
-            ((Player*)pVictim)->SetPvPDeath(player_tap != NULL);
-
         // Call KilledUnit for creatures
         if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->AI())
             ((Creature*)this)->AI()->KilledUnit(pVictim);
@@ -789,164 +1013,123 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
         // Call AI OwnerKilledUnit (for any current summoned minipet/guardian/protector)
         PetOwnerKilledUnit(pVictim);
 
-        // achievement stuff
-        if (pVictim->GetTypeId() == TYPEID_PLAYER)
+        /*
+         *                      Actions for the victim
+         */
+        if (pVictim->GetTypeId() == TYPEID_PLAYER)          // Killed player
         {
+            Player* playerVictim = (Player*)pVictim;
+
+            // remember victim PvP death for corpse type and corpse reclaim delay
+            // at original death (not at SpiritOfRedemtionTalent timeout)
+            if (!damageFromSpiritOfRedemtionTalent)
+                playerVictim->SetPvPDeath(player_tap != NULL);
+
+            // achievement stuff
+            playerVictim->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, health);
+            if (player_tap)
+                player_tap->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL, 1, 0, pVictim);
             if (GetTypeId() == TYPEID_UNIT)
-                ((Player*)pVictim)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_CREATURE, GetEntry());
-            else if(GetTypeId() == TYPEID_PLAYER && pVictim != this)
-                ((Player*)pVictim)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_PLAYER, 1, ((Player*)this)->GetTeam());
-        }
+                playerVictim->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_CREATURE, GetEntry());
+            else if (GetTypeId() == TYPEID_PLAYER && pVictim != this)
+                playerVictim->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_PLAYER, 1, playerVictim->GetTeam());
 
-        // 10% durability loss on death
-        // clean InHateListOf
-        if (pVictim->GetTypeId() == TYPEID_PLAYER)
-        {
+            // 10% durability loss on death
             // only if not player and not controlled by player pet. And not at BG
-            if (durabilityLoss && !player_tap && !((Player*)pVictim)->InBattleGround())
+            if (damageInfo->durabilityLoss && !player_tap && !playerVictim->InBattleGround())
             {
-                DEBUG_LOG("We are dead, loosing 10 percents durability");
-                ((Player*)pVictim)->DurabilityLossAll(0.10f,false);
+                DEBUG_LOG("Unit::DealDamage: Killed %s, looing 10 percents durability", pVictim->GetGuidStr().c_str());
+                playerVictim->DurabilityLossAll(0.10f, false);
                 // durability lost message
                 WorldPacket data(SMSG_DURABILITY_DAMAGE_DEATH, 0);
-                ((Player*)pVictim)->GetSession()->SendPacket(&data);
+                playerVictim->GetSession()->SendPacket(&data);
             }
-        }
-        else                                                // creature died
-        {
-            DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"DealDamageNotPlayer");
-            Creature *cVictim = (Creature*)pVictim;
 
-            if(!cVictim->IsPet())
+            if (!spiritOfRedemtionTalentReady)              // Before informing Battleground
             {
-                cVictim->DeleteThreatList();
-                // only lootable if it has loot or can drop gold
-                cVictim->PrepareBodyLootState();
-                // may have no loot, so update death timer if allowed
-                cVictim->AllLootRemovedFromCorpse();
+                DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "Unit::DealDamage %s SET JUST_DIED", pVictim->GetGuidStr().c_str());
+                pVictim->SetDeathState(JUST_DIED);
             }
 
-            // Call creature just died function
-            if (cVictim->AI())
-                cVictim->AI()->JustDied(this);
-
-            if (cVictim->IsTemporarySummon())
-            {
-                TemporarySummon* pSummon = (TemporarySummon*)cVictim;
-                if (pSummon->GetSummonerGuid().IsCreatureOrVehicle())
-                    if(Creature* pSummoner = cVictim->GetMap()->GetCreature(pSummon->GetSummonerGuid()))
-                        if (pSummoner->AI())
-                            pSummoner->AI()->SummonedCreatureJustDied(cVictim);
-            }
-            else if (pOwner && pOwner->GetTypeId() == TYPEID_UNIT)
+            // playerVictim was in duel, duel must be interrupted
+            // last damage from non duel opponent or non opponent controlled creature
+            if (duel_hasEnded)
             {
-                if (((Creature*)pOwner)->AI())
-                    ((Creature*)pOwner)->AI()->SummonedCreatureJustDied(cVictim);
-            }
-
-            if (InstanceData* mapInstance = cVictim->GetInstanceData())
-                mapInstance->OnCreatureDeath(cVictim);
+                playerVictim->duel->opponent->CombatStopWithPets(true);
+                playerVictim->CombatStopWithPets(true);
 
-            if (cVictim->IsLinkingEventTrigger())
-                cVictim->GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_DIE, cVictim);
+                playerVictim->DuelComplete(DUEL_INTERRUPTED);
+            }
 
-            // Dungeon specific stuff, only applies to players killing creatures
-            if(cVictim->GetInstanceId())
+            if (player_tap)                                 // PvP kill
             {
-                Map *m = cVictim->GetMap();
-                Player *creditedPlayer = GetCharmerOrOwnerPlayerOrPlayerItself();
-                // TODO: do instance binding anyway if the charmer/owner is offline
-
-                if(m->IsDungeon() && creditedPlayer)
+                if (playerVictim->InBattleGround())
                 {
-                    if (m->IsRaidOrHeroicDungeon())
-                    {
-                        if(cVictim->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND)
-                            ((DungeonMap *)m)->PermBindAllPlayers(creditedPlayer);
-                    }
-                    else
-                    {
-                        DungeonPersistentState* save = ((DungeonMap*)m)->GetPersistanceState();
-                        // the reset time is set but not added to the scheduler
-                        // until the players leave the instance
-                        time_t resettime = cVictim->GetRespawnTimeEx() + 2 * HOUR;
-                        if (save->GetResetTime() < resettime)
-                            save->SetResetTime(resettime);
-                    }
-
-                    // update encounter state if needed
-                    ((DungeonMap*)m)->GetPersistanceState()->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, ((Creature*)cVictim)->GetEntry());
+                    if (BattleGround* bg = playerVictim->GetBattleGround())
+                        bg->HandleKillPlayer(playerVictim, player_tap);
+                }
+                else if (pVictim != this)
+                {
+                    // selfkills are not handled in outdoor pvp scripts
+                    if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(player_tap->GetCachedZoneId()))
+                        outdoorPvP->HandlePlayerKill(player_tap, playerVictim);
                 }
             }
         }
-
-        // last damage from non duel opponent or opponent controlled creature
-        if(duel_hasEnded)
+        else                                                // Killed creature
         {
-            MANGOS_ASSERT(pVictim->GetTypeId()==TYPEID_PLAYER);
-            Player *he = (Player*)pVictim;
-
-            MANGOS_ASSERT(he->duel);
+            JustKilledCreature((Creature*)pVictim, player_tap);
 
-            he->duel->opponent->CombatStopWithPets(true);
-            he->CombatStopWithPets(true);
+            DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"Unit::DealDamage %s JUST_DIED", pVictim->GetGuidStr().c_str());
+            pVictim->SetDeathState(JUST_DIED);              // if !spiritOfRedemtionTalentReady always true for unit
 
-            he->DuelComplete(DUEL_INTERUPTED);
+            if (player_tap)                                 // killedby Player
+                if (BattleGround* bg = player_tap->GetBattleGround())
+                    bg->HandleKillUnit((Creature*)pVictim, player_tap);
         }
 
-        // battleground things (do this at the end, so the death state flag will be properly set to handle in the bg->handlekill)
-        if(pVictim->GetTypeId() == TYPEID_PLAYER && ((Player*)pVictim)->InBattleGround())
-        {
-            Player *killed = ((Player*)pVictim);
-            if(BattleGround *bg = killed->GetBattleGround())
-                if(player_tap)
-                    bg->HandleKillPlayer(killed, player_tap);
-        }
-        else if(pVictim->GetTypeId() == TYPEID_UNIT)
+        // Reward player, his pets, and group/raid members
+        if (player_tap != pVictim)
         {
-            if (player_tap)
-                if (BattleGround *bg = player_tap->GetBattleGround())
-                    bg->HandleKillUnit((Creature*)pVictim, player_tap);
+            if (group_tap)
+                group_tap->RewardGroupAtKill(pVictim, player_tap);
+            else if (player_tap)
+                player_tap->RewardSinglePlayerAtKill(pVictim);
         }
     }
     else                                                    // if (health <= damage)
     {
-        DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"DealDamageAlive");
+        DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"Unit::DealDamage %s still alive", pVictim->GetGuidStr().c_str());
 
         if (pVictim->GetTypeId() == TYPEID_PLAYER)
-            ((Player*)pVictim)->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, damage);
+            ((Player*)pVictim)->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, damageInfo->damage);
 
-        pVictim->ModifyHealth(- (int32)damage);
+        pVictim->ModifyHealth(- int32(damageInfo->damage));
 
-        if(damagetype != DOT)
+        if (damageInfo->damageType != DOT)
         {
-            if(!getVictim())
+            if (!getVictim())
             {
                 // if not have main target then attack state with target (including AI call)
                 //start melee attacks only after melee hit
-                Attack(pVictim,(damagetype == DIRECT_DAMAGE));
+                Attack(pVictim, damageInfo->damageType == DIRECT_DAMAGE);
             }
 
             // if damage pVictim call AI reaction
             pVictim->AttackedBy(this);
         }
 
-        if(damagetype == DIRECT_DAMAGE || damagetype == SPELL_DIRECT_DAMAGE)
-        {
-            if (!spellProto || !(spellProto->AuraInterruptFlags&AURA_INTERRUPT_FLAG_DIRECT_DAMAGE))
-                pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_DIRECT_DAMAGE);
-        }
         if (pVictim->GetTypeId() != TYPEID_PLAYER)
         {
-            float threat = damage * sSpellMgr.GetSpellThreatMultiplier(spellProto);
-            pVictim->AddThreat(this, threat, (cleanDamage && cleanDamage->hitOutCome == MELEE_HIT_CRIT), damageSchoolMask, spellProto);
+            float threat = (damageInfo->damage + (damageInfo->cleanDamage ? (damageInfo->cleanDamage + damageInfo->GetAbsorb()) : 0)) * sSpellMgr.GetSpellThreatMultiplier(spellProto);
+            pVictim->AddThreat(this, threat, (damageInfo->cleanDamage && damageInfo->hitOutCome == MELEE_HIT_CRIT), damageInfo->GetSchoolMask(), spellProto);
         }
         else                                                // victim is a player
         {
             // Rage from damage received
-            if(this != pVictim && pVictim->getPowerType() == POWER_RAGE)
+            if (this != pVictim && pVictim->GetPowerType() == POWER_RAGE)
             {
-                uint32 rage_damage = damage + (cleanDamage ? cleanDamage->damage : 0);
+                uint32 rage_damage = damageInfo->damage + (damageInfo->cleanDamage ? (damageInfo->cleanDamage + damageInfo->GetAbsorb()) : 0);
                 ((Player*)pVictim)->RewardRage(rage_damage, 0, false);
             }
 
@@ -958,7 +1141,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
             }
         }
 
-        if(GetTypeId()==TYPEID_PLAYER)
+        if (GetTypeId()==TYPEID_PLAYER)
         {
             // random durability for items (HIT DONE)
             if (roll_chance_f(sWorld.getConfig(CONFIG_FLOAT_RATE_DURABILITY_LOSS_DAMAGE)))
@@ -968,24 +1151,9 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
             }
         }
 
-        // TODO: Store auras by interrupt flag to speed this up.
-        SpellAuraHolderMap& vAuras = pVictim->GetSpellAuraHolderMap();
-        for (SpellAuraHolderMap::const_iterator i = vAuras.begin(), next; i != vAuras.end(); i = next)
-        {
-            const SpellEntry *se = i->second->GetSpellProto();
-            next = i; ++next;
-            if (spellProto && spellProto->Id == se->Id) // Not drop auras added by self
-                continue;
-            if (!se->procFlags && (se->AuraInterruptFlags & AURA_INTERRUPT_FLAG_DAMAGE))
-            {
-                pVictim->RemoveAurasDueToSpell(i->second->GetId());
-                next = vAuras.begin();
-            }
-        }
-
-        if (damagetype != NODAMAGE && damage && pVictim->GetTypeId() == TYPEID_PLAYER)
+        if (damageInfo->damageType != NODAMAGE && pVictim->GetTypeId() == TYPEID_PLAYER)
         {
-            if( damagetype != DOT )
+            if (damageInfo->damageType != DOT)
             {
                 for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
                 {
@@ -993,46 +1161,51 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
                     if (i == CURRENT_CHANNELED_SPELL)
                         continue;
 
-                    if(Spell* spell = pVictim->GetCurrentSpell(CurrentSpellTypes(i)))
+                    if (Spell* spell = pVictim->GetCurrentSpell(CurrentSpellTypes(i)))
                     {
-                        if(spell->getState() == SPELL_STATE_PREPARING)
+                        if (spell->getState() == SPELL_STATE_PREPARING)
                         {
-                            if(spell->m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_ABORT_ON_DMG)
+                            if (spell->m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_ABORT_ON_DMG) // Always interrupt, even on absorbed.
                                 pVictim->InterruptSpell(CurrentSpellTypes(i));
-                            else
+                            else if (damageInfo->damage)
                                 spell->Delayed();
                         }
                     }
+
                 }
             }
 
-            if(Spell* spell = pVictim->m_currentSpells[CURRENT_CHANNELED_SPELL])
+            if (damageInfo->damage)
             {
-                if (spell->getState() == SPELL_STATE_CASTING)
+                if (Spell* spell = pVictim->m_currentSpells[CURRENT_CHANNELED_SPELL])
                 {
-                    uint32 channelInterruptFlags = spell->m_spellInfo->ChannelInterruptFlags;
-                    if( channelInterruptFlags & CHANNEL_FLAG_DELAY )
+                    if (spell->getState() == SPELL_STATE_CASTING)
                     {
-                        if(pVictim!=this)                   //don't shorten the duration of channeling if you damage yourself
-                            spell->DelayedChannel();
+                        uint32 channelInterruptFlags = spell->m_spellInfo->ChannelInterruptFlags;
+                        if ( channelInterruptFlags & CHANNEL_FLAG_DELAY )
+                        {
+                            if (damageInfo->damageType != DOT)
+                                if (pVictim != this)                   //don't shorten the duration of channeling if you damage yourself
+                                    spell->DelayedChannel();
+                        }
+                        else if ( (channelInterruptFlags & (CHANNEL_FLAG_DAMAGE | CHANNEL_FLAG_DAMAGE2)) )
+                        {
+                            DETAIL_LOG("Unit::DealDamage channeled spell %u caster %s canceled at damage!",spell->m_spellInfo->Id, spell->GetAffectiveCasterObject()->GetObjectGuid().GetString().c_str());
+                            pVictim->InterruptSpell(CURRENT_CHANNELED_SPELL);
+                        }
                     }
-                    else if( (channelInterruptFlags & (CHANNEL_FLAG_DAMAGE | CHANNEL_FLAG_DAMAGE2)) )
+                    else if (spell->getState() == SPELL_STATE_DELAYED)
+                        // break channeled spell in delayed state on damage
                     {
-                        DETAIL_LOG("Spell %u canceled at damage!",spell->m_spellInfo->Id);
+                        DETAIL_LOG("Unit::DealDamage Delayed spell %u caster %s canceled at damage!",spell->m_spellInfo->Id, spell->GetAffectiveCasterObject()->GetObjectGuid().GetString().c_str());
                         pVictim->InterruptSpell(CURRENT_CHANNELED_SPELL);
                     }
                 }
-                else if (spell->getState() == SPELL_STATE_DELAYED)
-                    // break channeled spell in delayed state on damage
-                {
-                    DETAIL_LOG("Spell %u canceled at damage!",spell->m_spellInfo->Id);
-                    pVictim->InterruptSpell(CURRENT_CHANNELED_SPELL);
-                }
             }
         }
 
         // last damage from duel opponent
-        if(duel_hasEnded)
+        if (duel_hasEnded)
         {
             MANGOS_ASSERT(pVictim->GetTypeId()==TYPEID_PLAYER);
             Player *he = (Player*)pVictim;
@@ -1049,9 +1222,9 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
         }
     }
 
-    DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"DealDamageEnd returned %d damage", damage);
+    DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE,"Unit::DealDamageEnd attacker %s target %s returned %u damage", GetGuidStr().c_str(), pVictim->GetGuidStr().c_str(), damageInfo->damage);
 
-    return damage;
+    return damageInfo->damage;
 }
 
 struct PetOwnerKilledUnitHelper
@@ -1069,6 +1242,115 @@ struct PetOwnerKilledUnitHelper
     Unit* m_victim;
 };
 
+void Unit::JustKilledCreature(Creature* victim, Player* responsiblePlayer)
+{
+    if (!victim)
+        return;
+
+    if (victim->CanHaveThreatList())
+        victim->DeleteThreatList();
+
+    if (!victim->IsPet())                                   // Prepare loot if can
+    {
+        // only lootable if it has loot or can drop gold
+        victim->PrepareBodyLootState();
+        // may have no loot, so update death timer if allowed
+        victim->AllLootRemovedFromCorpse();
+    }
+
+    // some critters required for quests (need normal entry instead possible heroic in any cases)
+    if (victim->GetCreatureType() == CREATURE_TYPE_CRITTER && GetTypeId() == TYPEID_PLAYER)
+    {
+        if (CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(victim->GetEntry()))
+            ((Player*)this)->KilledMonster(normalInfo, victim->GetObjectGuid());
+    }
+
+    // if victim is vehicle and has passengers - remove his
+    if (victim->IsVehicle())
+    {
+        if (victim->GetVehicleKit())
+            victim->GetVehicleKit()->RemoveAllPassengers();
+    }
+
+    // Interrupt channeling spell when a Possessed Summoned is killed
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(victim->GetUInt32Value(UNIT_CREATED_BY_SPELL));
+    if (spellInfo && spellInfo->HasAttribute(SPELL_ATTR_EX_FARSIGHT) && spellInfo->HasAttribute(SPELL_ATTR_EX_CHANNELED_1))
+    {
+        Unit* creator = GetMap()->GetUnit(victim->GetCreatorGuid());
+        if (creator && creator->GetCharmGuid() == victim->GetObjectGuid())
+        {
+            Spell* channeledSpell = creator->GetCurrentSpell(CURRENT_CHANNELED_SPELL);
+            if (channeledSpell && channeledSpell->m_spellInfo->Id == spellInfo->Id)
+                creator->InterruptNonMeleeSpells(false);
+        }
+    }
+
+    /* ******************************* Inform various hooks ************************************ */
+    // Inform victim's AI
+    if (victim->AI())
+        victim->AI()->JustDied(this);
+
+    // Inform Owner
+    Unit* pOwner = victim->GetCharmerOrOwner();
+    if (victim->IsTemporarySummon())
+    {
+        TemporarySummon* pSummon = (TemporarySummon*)victim;
+        if (pSummon->GetSummonerGuid().IsCreatureOrVehicle())
+            if(Creature* pSummoner = victim->GetMap()->GetCreature(pSummon->GetSummonerGuid()))
+                if (pSummoner->AI())
+                    pSummoner->AI()->SummonedCreatureJustDied(victim);
+    }
+    else if (pOwner && pOwner->GetTypeId() == TYPEID_UNIT)
+    {
+        if (((Creature*)pOwner)->AI())
+            ((Creature*)pOwner)->AI()->SummonedCreatureJustDied(victim);
+    }
+
+    // Inform Instance Data and Linking
+    if (InstanceData* mapInstance = victim->GetInstanceData())
+        mapInstance->OnCreatureDeath(victim);
+
+    // Notify the outdoor pvp script
+    if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetZoneId()))
+        outdoorPvP->HandleCreatureDeath(victim);
+
+    // Start creature death script
+    GetMap()->ScriptsStart(sCreatureDeathScripts, victim->GetEntry(), victim, responsiblePlayer ? responsiblePlayer : this);
+
+    if (victim->IsLinkingEventTrigger())
+        victim->GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_DIE, victim);
+
+    // Dungeon specific stuff
+    if (victim->GetInstanceId())
+    {
+        Map* m = victim->GetMap();
+        Player* creditedPlayer = GetCharmerOrOwnerPlayerOrPlayerItself();
+        // TODO: do instance binding anyway if the charmer/owner is offline
+
+        if (m->IsDungeon() && creditedPlayer)
+        {
+            if (m->IsRaidOrHeroicDungeon())
+            {
+                if (victim->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_INSTANCE_BIND)
+                    ((DungeonMap*)m)->PermBindAllPlayers(creditedPlayer);
+            }
+            else
+            {
+                DungeonPersistentState* save = ((DungeonMap*)m)->GetPersistanceState();
+                // the reset time is set but not added to the scheduler
+                // until the players leave the instance
+                time_t resettime = victim->GetRespawnTimeEx() + 2 * HOUR;
+                if (save->GetResetTime() < resettime)
+                    save->SetResetTime(resettime);
+            }
+
+            // update encounter state if needed
+            if (DungeonPersistentState* state = ((DungeonMap*)m)->GetPersistanceState())
+                state->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, victim->GetEntry());
+        }
+    }
+}
+
 void Unit::PetOwnerKilledUnit(Unit* pVictim)
 {
     // for minipet and guardians (including protector)
@@ -1082,7 +1364,7 @@ void Unit::CastStop(uint32 except_spellid)
             InterruptSpell(CurrentSpellTypes(i),false);
 }
 
-void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem, Aura* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
+void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem, Aura const* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
 
@@ -1098,7 +1380,7 @@ void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castIte
     CastSpell(Victim, spellInfo, triggered, castItem, triggeredByAura, originalCaster, triggeredBy);
 }
 
-void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, Item *castItem, Aura* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
+void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, Item *castItem, Aura const* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
 {
     if(!spellInfo)
     {
@@ -1109,6 +1391,12 @@ void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered,
         return;
     }
 
+    if(!Victim)
+    {
+        sLog.outError("CastSpell: cast spell %u by caster %s failed - victim is NULL", spellInfo->Id, GetGuidStr().c_str());
+        return;
+    }
+
     if (castItem)
         DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WORLD: cast Item spellId - %i", spellInfo->Id);
 
@@ -1119,16 +1407,41 @@ void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered,
 
         triggeredBy = triggeredByAura->GetSpellProto();
     }
+    else
+    {
+        triggeredByAura = GetTriggeredByClientAura(spellInfo->Id);
+        if (triggeredByAura)
+        {
+            triggered = true;
+            triggeredBy = triggeredByAura->GetSpellProto();
+        }
+    }
 
-    Spell *spell = new Spell(this, spellInfo, triggered, originalCaster, triggeredBy);
+    Spell* spell = new Spell(this, spellInfo, triggered, originalCaster, triggeredBy);
 
     SpellCastTargets targets;
     targets.setUnitTarget( Victim );
+
+    if (spellInfo->Targets & TARGET_FLAG_DEST_LOCATION)
+        targets.setDestination(Victim->GetPosition());
+    if (spellInfo->Targets & TARGET_FLAG_SOURCE_LOCATION)
+        if (WorldObject* caster = spell->GetCastingObject())
+            targets.setSource(caster->GetPosition());
+
     spell->m_CastItem = castItem;
     spell->prepare(&targets, triggeredByAura);
+
+    // Linked spells (RemoveOnCast chain)
+    SpellLinkedSet linkedSet = sSpellMgr.GetSpellLinked(spellInfo->Id, SPELL_LINKED_TYPE_REMOVEONCAST);
+    if (linkedSet.size() > 0)
+    {
+        for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+            Victim->RemoveAurasDueToSpell(*itr);
+    }
+
 }
 
-void Unit::CastCustomSpell(Unit* Victim,uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
+void Unit::CastCustomSpell(Unit* Victim,uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura const* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
 
@@ -1144,7 +1457,7 @@ void Unit::CastCustomSpell(Unit* Victim,uint32 spellId, int32 const* bp0, int32
     CastCustomSpell(Victim, spellInfo, bp0, bp1, bp2, triggered, castItem, triggeredByAura, originalCaster, triggeredBy);
 }
 
-void Unit::CastCustomSpell(Unit* Victim, SpellEntry const *spellInfo, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
+void Unit::CastCustomSpell(Unit* Victim, SpellEntry const *spellInfo, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura const* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
 {
     if(!spellInfo)
     {
@@ -1155,36 +1468,77 @@ void Unit::CastCustomSpell(Unit* Victim, SpellEntry const *spellInfo, int32 cons
         return;
     }
 
+    if (sObjectMgr.IsSpellDisabled(spellInfo->Id))
+        return;
+
     if (castItem)
         DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WORLD: cast Item spellId - %i", spellInfo->Id);
 
     if (triggeredByAura)
     {
-        if (!originalCaster)
-            originalCaster = triggeredByAura->GetCasterGuid();
-
-        triggeredBy = triggeredByAura->GetSpellProto();
+        if (originalCaster.IsEmpty())
+        {
+            if (triggeredByAura->GetHolder())
+            {
+                originalCaster = triggeredByAura->GetCasterGuid();
+                triggeredBy    = triggeredByAura->GetSpellProto();
+            }
+            else
+            {
+                sLog.outError("CastCustomSpell: spell %d by caster: %s triggered by aura without original caster and spellholder (CRUSH THERE!)", spellInfo->Id, GetObjectGuid().GetString().c_str());
+                return;
+            }
+        }
     }
 
     Spell *spell = new Spell(this, spellInfo, triggered, originalCaster, triggeredBy);
 
-    if(bp0)
+    if (bp0)
         spell->m_currentBasePoints[EFFECT_INDEX_0] = *bp0;
 
-    if(bp1)
+    if (bp1)
         spell->m_currentBasePoints[EFFECT_INDEX_1] = *bp1;
 
-    if(bp2)
+    if (bp2)
         spell->m_currentBasePoints[EFFECT_INDEX_2] = *bp2;
 
     SpellCastTargets targets;
     targets.setUnitTarget( Victim );
     spell->m_CastItem = castItem;
+
+    if (spellInfo->Targets & TARGET_FLAG_DEST_LOCATION)
+        targets.setDestination(Victim->GetPosition());
+    if (spellInfo->Targets & TARGET_FLAG_SOURCE_LOCATION)
+        if (WorldObject* caster = spell->GetCastingObject())
+            targets.setSource(caster->GetPosition());
+
     spell->prepare(&targets, triggeredByAura);
 }
 
 // used for scripting
-void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem, Aura* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
+void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item* castItem, Aura const* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
+{
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
+
+    if(!spellInfo)
+    {
+        if (triggeredByAura)
+            sLog.outError("CastSpell(x,y,z): unknown spell id %i by caster: %s triggered by aura %u (eff %u)", spellId, GetGuidStr().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex());
+        else
+            sLog.outError("CastSpell(x,y,z): unknown spell id %i by caster: %s", spellId, GetGuidStr().c_str());
+        return;
+    }
+
+    WorldLocation loc = GetPosition();
+    loc.x = x;
+    loc.y = y;
+    loc.z = z;
+
+    CastSpell(loc, spellInfo, triggered, castItem, triggeredByAura, originalCaster, triggeredBy);
+}
+
+// used for scripting
+void Unit::CastSpell(WorldLocation const& loc, uint32 spellId, bool triggered, Item* castItem, Aura const* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
 
@@ -1197,11 +1551,11 @@ void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered,
         return;
     }
 
-    CastSpell(x, y, z, spellInfo, triggered, castItem, triggeredByAura, originalCaster, triggeredBy);
+    CastSpell(loc, spellInfo, triggered, castItem, triggeredByAura, originalCaster, triggeredBy);
 }
 
 // used for scripting
-void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, bool triggered, Item *castItem, Aura* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
+void Unit::CastSpell(float x, float y, float z, SpellEntry const* spellInfo, bool triggered, Item* castItem, Aura const* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
 {
     if(!spellInfo)
     {
@@ -1212,6 +1566,37 @@ void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, boo
         return;
     }
 
+    if (triggeredByAura)
+    {
+        if (!originalCaster)
+            originalCaster = triggeredByAura->GetCasterGuid();
+
+        triggeredBy = triggeredByAura->GetSpellProto();
+    }
+
+    WorldLocation loc = GetPosition();
+    loc.x = x;
+    loc.y = y;
+    loc.z = z;
+
+    CastSpell(loc, spellInfo, triggered, castItem, triggeredByAura, originalCaster, triggeredBy);
+}
+
+// used for scripting
+void Unit::CastSpell(WorldLocation const& loc, SpellEntry const* spellInfo, bool triggered, Item* castItem, Aura const* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
+{
+    if (!spellInfo)
+    {
+        if (triggeredByAura)
+            sLog.outError("CastSpell(x,y,z): unknown spell by caster: %s triggered by aura %u (eff %u)", GetGuidStr().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex());
+        else
+            sLog.outError("CastSpell(x,y,z): unknown spell by caster: %s", GetGuidStr().c_str());
+        return;
+    }
+
+    if (sObjectMgr.IsSpellDisabled(spellInfo->Id))
+        return;
+
     if (castItem)
         DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WORLD: cast Item spellId - %i", spellInfo->Id);
 
@@ -1223,112 +1608,139 @@ void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, boo
         triggeredBy = triggeredByAura->GetSpellProto();
     }
 
-    Spell *spell = new Spell(this, spellInfo, triggered, originalCaster, triggeredBy);
+    Spell* spell = new Spell(this, spellInfo, triggered, originalCaster, triggeredBy);
 
     SpellCastTargets targets;
-    targets.setDestination(x, y, z);
+
+    if (spellInfo->Targets & TARGET_FLAG_DEST_LOCATION)
+        targets.setDestination(loc);
+    if (spellInfo->Targets & TARGET_FLAG_SOURCE_LOCATION)
+        targets.setSource(loc);
+
+    // Spell cast with x,y,z but without dbc target-mask, set only destination!
+    if (!(targets.m_targetMask & (TARGET_FLAG_DEST_LOCATION | TARGET_FLAG_SOURCE_LOCATION)))
+        targets.setDestination(loc);
+
     spell->m_CastItem = castItem;
     spell->prepare(&targets, triggeredByAura);
 }
 
 // Obsolete func need remove, here only for comotability vs another patches
-uint32 Unit::SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage)
+uint32 Unit::SpellNonMeleeDamageLog(Unit* pVictim, uint32 spellID, uint32 damage)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID);
-    SpellNonMeleeDamage damageInfo(this, pVictim, spellInfo->Id, SpellSchoolMask(spellInfo->SchoolMask));
-    CalculateSpellDamage(&damageInfo, damage, spellInfo);
+    DamageInfo damageInfo(this, pVictim, spellInfo);
+    damageInfo.damage = damage;
+    CalculateSpellDamage(&damageInfo);
     damageInfo.target->CalculateAbsorbResistBlock(this, &damageInfo, spellInfo);
-    DealDamageMods(damageInfo.target,damageInfo.damage,&damageInfo.absorb);
+    DealDamageMods(&damageInfo);
     SendSpellNonMeleeDamageLog(&damageInfo);
     DealSpellDamage(&damageInfo, true);
     return damageInfo.damage;
 }
 
-void Unit::CalculateSpellDamage(SpellNonMeleeDamage *damageInfo, int32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType)
+void Unit::CalculateSpellDamage(DamageInfo* damageInfo, float DamageMultiplier)
 {
-    SpellSchoolMask damageSchoolMask = damageInfo->schoolMask;
-    Unit *pVictim = damageInfo->target;
-
-    if (damage < 0)
+    if (!damageInfo || int32(damageInfo->damage) < 0)
         return;
 
-    if(!this || !pVictim)
-        return;
-    if(!this->isAlive() || !pVictim->isAlive())
+    if (!damageInfo->target || !isAlive() || !damageInfo->target->isAlive())
         return;
 
     // Check spell crit chance
-    bool crit = IsSpellCrit(pVictim, spellInfo, damageSchoolMask, attackType);
+    bool isCrit = IsSpellCrit(damageInfo->target, damageInfo->GetSpellProto(), damageInfo->GetSchoolMask(), damageInfo->attackType);
+    isCrit ? damageInfo->HitInfo |= SPELL_HIT_TYPE_CRIT : damageInfo->HitInfo &= ~SPELL_HIT_TYPE_CRIT;
 
-    // damage bonus (per damage class)
-    switch (spellInfo->DmgClass)
+    // Damage bonus (per damage class)
+    switch (damageInfo->GetSpellProto()->DmgClass)
     {
         // Melee and Ranged Spells
         case SPELL_DAMAGE_CLASS_RANGED:
         case SPELL_DAMAGE_CLASS_MELEE:
         {
-            //Calculate damage bonus
-            damage = MeleeDamageBonusDone(pVictim, damage, attackType, spellInfo, SPELL_DIRECT_DAMAGE);
-            damage = pVictim->MeleeDamageBonusTaken(this, damage, attackType, spellInfo, SPELL_DIRECT_DAMAGE);
+            // Calculate damage bonus
+            MeleeDamageBonusDone(damageInfo);
+            if (fabs(DamageMultiplier - 1.0f) > M_NULL_F)
+                damageInfo->damage = floor(float(damageInfo->damage) * DamageMultiplier);
+
+            damageInfo->target->MeleeDamageBonusTaken(damageInfo);
 
-            // if crit add critical bonus
-            if (crit)
+            // If crit add critical bonus
+            if (isCrit)
             {
-                damageInfo->HitInfo|= SPELL_HIT_TYPE_CRIT;
-                damage = SpellCriticalDamageBonus(spellInfo, damage, pVictim);
-                // Resilience - reduce crit damage
-                uint32 reduction_affected_damage = CalcNotIgnoreDamageReduction(damage, damageSchoolMask);
-                if (attackType != RANGED_ATTACK)
-                    damage -= pVictim->GetMeleeCritDamageReduction(reduction_affected_damage);
-                else
-                    damage -= pVictim->GetRangedCritDamageReduction(reduction_affected_damage);
+                damageInfo->damage = SpellCriticalDamageBonus(damageInfo->GetSpellProto(), damageInfo->damage, damageInfo->target);
+
+                // Resilience - reduce crit damage (full or reduced)
+                uint32 reduction_affected_damage = sWorld.getConfig(CONFIG_BOOL_RESILIENCE_ALTERNATIVE_CALCULATION)
+                    ? damageInfo->damage
+                    : CalcNotIgnoreDamageReduction(damageInfo);
+
+                uint32 damageCritReduction = (damageInfo->attackType != RANGED_ATTACK)
+                    ? damageInfo->target->GetMeleeCritDamageReduction(reduction_affected_damage)
+                    : damageInfo->target->GetRangedCritDamageReduction(reduction_affected_damage);
+
+                damageInfo->damage -= damageCritReduction;
             }
+            break;
         }
-        break;
         // Magical Attacks
         case SPELL_DAMAGE_CLASS_NONE:
         case SPELL_DAMAGE_CLASS_MAGIC:
         {
             // Calculate damage bonus
-            damage = SpellDamageBonusDone(pVictim, spellInfo, damage, SPELL_DIRECT_DAMAGE);
-            damage = pVictim->SpellDamageBonusTaken(this, spellInfo, damage, SPELL_DIRECT_DAMAGE);
+            SpellDamageBonusDone(damageInfo);
+            if (fabs(DamageMultiplier - 1.0f) > M_NULL_F)
+                damageInfo->damage = floor(float(damageInfo->damage) * DamageMultiplier);
+
+            damageInfo->target->SpellDamageBonusTaken(damageInfo);
 
             // If crit add critical bonus
-            if (crit)
+            if (isCrit)
             {
-                damageInfo->HitInfo|= SPELL_HIT_TYPE_CRIT;
-                damage = SpellCriticalDamageBonus(spellInfo, damage, pVictim);
-                // Resilience - reduce crit damage
-                uint32 reduction_affected_damage = CalcNotIgnoreDamageReduction(damage, damageSchoolMask);
-                damage -= pVictim->GetSpellCritDamageReduction(reduction_affected_damage);
+                damageInfo->damage = SpellCriticalDamageBonus(damageInfo->GetSpellProto(), damageInfo->damage, damageInfo->target);
+
+                // Resilience - reduce crit damage (full or reduced)
+                uint32 reduction_affected_damage = sWorld.getConfig(CONFIG_BOOL_RESILIENCE_ALTERNATIVE_CALCULATION)
+                    ? damageInfo->damage
+                    : CalcNotIgnoreDamageReduction(damageInfo);
+
+                damageInfo->damage -= damageInfo->target->GetSpellCritDamageReduction(reduction_affected_damage);
             }
+            break;
         }
-        break;
-    }
-
-    // only from players
-    if (GetTypeId() == TYPEID_PLAYER)
-    {
-        uint32 reduction_affected_damage = CalcNotIgnoreDamageReduction(damage, damageSchoolMask);
-        damage -= pVictim->GetSpellDamageReduction(reduction_affected_damage);
+        default:
+            sLog.outError("Unit::CalculateSpellDamage: Unknown damage class by caster: %s, spell %u", GetGuidStr().c_str(), damageInfo->GetSpellProto()->Id);
+            return;
     }
 
     // damage mitigation
-    if (damage > 0)
+    if (int32(damageInfo->damage) > 0)
     {
         // physical damage => armor
-        if (damageSchoolMask & SPELL_SCHOOL_MASK_NORMAL)
+        if (!damageInfo->GetSpellProto()->HasAttribute(SPELL_ATTR_EX3_CANT_MISS) && IsDamageReducedByArmor(damageInfo->GetSchoolMask(), damageInfo->GetSpellProto()))
         {
-            uint32 armor_affected_damage = CalcNotIgnoreDamageReduction(damage, damageSchoolMask);
-            damage = damage - armor_affected_damage + CalcArmorReducedDamage(pVictim, armor_affected_damage);
+            uint32 armor_affected_damage = CalcNotIgnoreDamageReduction(damageInfo);
+            damageInfo->damage = damageInfo->damage - armor_affected_damage + CalcArmorReducedDamage(damageInfo->target, armor_affected_damage);
+        }
+
+        // Only from players and their pets
+        if (int32(damageInfo->damage) > 0 && IsCharmerOrOwnerPlayerOrPlayerItself())
+        {
+            // Resilience - reduce regular damage (full or reduced)
+            uint32 reduction_affected_damage = sWorld.getConfig(CONFIG_BOOL_RESILIENCE_ALTERNATIVE_CALCULATION)
+                ? damageInfo->damage
+                : CalcNotIgnoreDamageReduction(damageInfo);
+
+            damageInfo->damage -= damageInfo->target->GetSpellDamageReduction(reduction_affected_damage);
         }
     }
-    else
-        damage = 0;
-    damageInfo->damage = damage;
+
+    // Impossible get negative result but....
+    if (int32(damageInfo->damage) < 0)
+        damageInfo->damage = 0;
 }
 
-void Unit::DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss)
+void Unit::DealSpellDamage(DamageInfo* damageInfo, bool durabilityLoss)
 {
     if (!damageInfo)
         return;
@@ -1341,10 +1753,10 @@ void Unit::DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss)
     if (!pVictim->isAlive() || pVictim->IsTaxiFlying() || (pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode()))
         return;
 
-    SpellEntry const *spellProto = sSpellStore.LookupEntry(damageInfo->SpellID);
+    SpellEntry const *spellProto = sSpellStore.LookupEntry(damageInfo->GetSpellId());
     if (spellProto == NULL)
     {
-        sLog.outError("Unit::DealSpellDamage have wrong damageInfo->SpellID: %u", damageInfo->SpellID);
+        sLog.outError("Unit::DealSpellDamage have wrong damageInfo->SpellID: %u", damageInfo->GetSpellId());
         return;
     }
 
@@ -1354,85 +1766,81 @@ void Unit::DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss)
         return;
 
     // Call default DealDamage (send critical in hit info for threat calculation)
-    CleanDamage cleanDamage(0, BASE_ATTACK, damageInfo->HitInfo & SPELL_HIT_TYPE_CRIT ? MELEE_HIT_CRIT : MELEE_HIT_NORMAL);
-    DealDamage(pVictim, damageInfo->damage, &cleanDamage, SPELL_DIRECT_DAMAGE, damageInfo->schoolMask, spellProto, durabilityLoss);
-}
-
-//TODO for melee need create structure as in
-void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *damageInfo, WeaponAttackType attackType)
-{
-    damageInfo->attacker         = this;
-    damageInfo->target           = pVictim;
-    damageInfo->damageSchoolMask = GetMeleeDamageSchoolMask();
-    damageInfo->attackType       = attackType;
-    damageInfo->damage           = 0;
-    damageInfo->cleanDamage      = 0;
-    damageInfo->absorb           = 0;
-    damageInfo->resist           = 0;
-    damageInfo->blocked_amount   = 0;
-
-    damageInfo->TargetState      = VICTIMSTATE_UNAFFECTED;
-    damageInfo->HitInfo          = HITINFO_NORMALSWING;
-    damageInfo->procAttacker     = PROC_FLAG_NONE;
-    damageInfo->procVictim       = PROC_FLAG_NONE;
-    damageInfo->procEx           = PROC_EX_NONE;
-    damageInfo->hitOutCome       = MELEE_HIT_EVADE;
+    damageInfo->CleanDamage(0, damageInfo->GetAbsorb(), BASE_ATTACK, damageInfo->HitInfo & SPELL_HIT_TYPE_CRIT ? MELEE_HIT_CRIT : MELEE_HIT_NORMAL);
+    damageInfo->damageType = SPELL_DIRECT_DAMAGE;
 
-    if(!this || !pVictim)
+    DealDamage(pVictim, damageInfo, durabilityLoss);
+}
+
+void Unit::CalculateMeleeDamage(DamageInfo* damageInfo)
+{
+    if (!damageInfo)
+        return;
+
+    Unit* pVictim = damageInfo->target;
+
+    if(!pVictim)
         return;
+
     if(!this->isAlive() || !pVictim->isAlive())
         return;
 
     // Select HitInfo/procAttacker/procVictim flag based on attack type
-    switch (attackType)
+    switch (damageInfo->attackType)
     {
         case BASE_ATTACK:
             damageInfo->procAttacker = PROC_FLAG_SUCCESSFUL_MELEE_HIT;
             damageInfo->procVictim   = PROC_FLAG_TAKEN_MELEE_HIT;
-            damageInfo->HitInfo      = HITINFO_NORMALSWING2;
+            damageInfo->HitInfo      = HITINFO_AFFECTS_VICTIM;
             break;
         case OFF_ATTACK:
             damageInfo->procAttacker = PROC_FLAG_SUCCESSFUL_MELEE_HIT | PROC_FLAG_SUCCESSFUL_OFFHAND_HIT;
-            damageInfo->procVictim   = PROC_FLAG_TAKEN_MELEE_HIT;//|PROC_FLAG_TAKEN_OFFHAND_HIT // not used
-            damageInfo->HitInfo = HITINFO_LEFTSWING;
+            damageInfo->procVictim   = PROC_FLAG_TAKEN_MELEE_HIT;     //|PROC_FLAG_TAKEN_OFFHAND_HIT // not used
+            damageInfo->HitInfo      = HITINFO_OFFHAND;
             break;
         case RANGED_ATTACK:
             damageInfo->procAttacker = PROC_FLAG_SUCCESSFUL_RANGED_HIT;
             damageInfo->procVictim   = PROC_FLAG_TAKEN_RANGED_HIT;
-            damageInfo->HitInfo = HITINFO_UNK3;             // test (dev note: test what? HitInfo flag possibly not confirmed.)
+            damageInfo->HitInfo      = HITINFO_UNK3;                  // test (dev note: test what? HitInfo flag possibly not confirmed.)
             break;
         default:
             break;
     }
 
     // Physical Immune check
-    if (damageInfo->target->IsImmunedToDamage(damageInfo->damageSchoolMask))
+    if (damageInfo->target->IsImmunedToDamage(damageInfo->GetSchoolMask()))
     {
         damageInfo->HitInfo       |= HITINFO_NORMALSWING;
         damageInfo->TargetState    = VICTIMSTATE_IS_IMMUNE;
 
-        damageInfo->procEx |=PROC_EX_IMMUNE;
+        damageInfo->procEx        |= PROC_EX_IMMUNE;
         damageInfo->damage         = 0;
         damageInfo->cleanDamage    = 0;
         return;
     }
-    damage += CalculateDamage (damageInfo->attackType, false);
+    damageInfo->damage += CalculateDamage(damageInfo->attackType, false);
     // Add melee damage bonus
-    damage = MeleeDamageBonusDone(damageInfo->target, damage, damageInfo->attackType);
-    damage = damageInfo->target->MeleeDamageBonusTaken(this, damage, damageInfo->attackType);
+    MeleeDamageBonusDone(damageInfo);
+    pVictim->MeleeDamageBonusTaken(damageInfo);
 
     // Calculate armor reduction
-    uint32 armor_affected_damage = CalcNotIgnoreDamageReduction(damage, damageInfo->damageSchoolMask);
-    damageInfo->damage = damage - armor_affected_damage + CalcArmorReducedDamage(damageInfo->target, armor_affected_damage);
-    damageInfo->cleanDamage += damage - damageInfo->damage;
+    if (IsDamageReducedByArmor(damageInfo->GetSchoolMask()))
+    {
+        uint32 armor_affected_damage = CalcNotIgnoreDamageReduction(damageInfo);
+        uint32 armor_reduced_damage  = damageInfo->damage - armor_affected_damage + CalcArmorReducedDamage(damageInfo->target, armor_affected_damage);
+        damageInfo->cleanDamage     += damageInfo->damage - armor_reduced_damage;
+        damageInfo->damage           = armor_reduced_damage;
+    }
 
     damageInfo->hitOutCome = RollMeleeOutcomeAgainst(damageInfo->target, damageInfo->attackType);
 
     // Disable parry or dodge for ranged attack
     if (damageInfo->attackType == RANGED_ATTACK)
     {
-        if (damageInfo->hitOutCome == MELEE_HIT_PARRY) damageInfo->hitOutCome = MELEE_HIT_NORMAL;
-        if (damageInfo->hitOutCome == MELEE_HIT_DODGE) damageInfo->hitOutCome = MELEE_HIT_MISS;
+        if (damageInfo->hitOutCome == MELEE_HIT_PARRY)
+            damageInfo->hitOutCome = MELEE_HIT_NORMAL;
+        if (damageInfo->hitOutCome == MELEE_HIT_DODGE)
+            damageInfo->hitOutCome = MELEE_HIT_MISS;
     }
 
     switch(damageInfo->hitOutCome)
@@ -1442,36 +1850,36 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
             damageInfo->HitInfo    |= HITINFO_MISS|HITINFO_SWINGNOHITSOUND;
             damageInfo->TargetState = VICTIMSTATE_EVADES;
 
-            damageInfo->procEx|=PROC_EX_EVADE;
-            damageInfo->damage = 0;
+            damageInfo->procEx     |= PROC_EX_EVADE;
+            damageInfo->damage      = 0;
             damageInfo->cleanDamage = 0;
-            return;
+            break;
         }
         case MELEE_HIT_MISS:
         {
             damageInfo->HitInfo    |= HITINFO_MISS;
             damageInfo->TargetState = VICTIMSTATE_UNAFFECTED;
 
-            damageInfo->procEx|=PROC_EX_MISS;
-            damageInfo->damage = 0;
+            damageInfo->procEx     |= PROC_EX_MISS;
+            damageInfo->damage      = 0;
             damageInfo->cleanDamage = 0;
             break;
         }
         case MELEE_HIT_NORMAL:
             damageInfo->TargetState = VICTIMSTATE_NORMAL;
-            damageInfo->procEx|=PROC_EX_NORMAL_HIT;
+            damageInfo->procEx     |= PROC_EX_NORMAL_HIT;
             break;
         case MELEE_HIT_CRIT:
         {
-            damageInfo->HitInfo     |= HITINFO_CRITICALHIT;
-            damageInfo->TargetState  = VICTIMSTATE_NORMAL;
+            damageInfo->HitInfo    |= HITINFO_CRITICALHIT;
+            damageInfo->TargetState = VICTIMSTATE_NORMAL;
 
-            damageInfo->procEx|=PROC_EX_CRITICAL_HIT;
+            damageInfo->procEx     |= PROC_EX_CRITICAL_HIT;
             // Crit bonus calc
-            damageInfo->damage += damageInfo->damage;
+            damageInfo->damage     += damageInfo->damage;
             int32 mod=0;
             // Apply SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_DAMAGE or SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE
-            if(damageInfo->attackType == RANGED_ATTACK)
+            if (damageInfo->attackType == RANGED_ATTACK)
                 mod += damageInfo->target->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_DAMAGE);
             else
                 mod += damageInfo->target->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE);
@@ -1486,9 +1894,9 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
                 damageInfo->damage = int32((damageInfo->damage) * float((100.0f + mod)/100.0f));
 
             // Resilience - reduce crit damage
-            uint32 reduction_affected_damage = CalcNotIgnoreDamageReduction(damageInfo->damage, damageInfo->damageSchoolMask);
+            uint32 reduction_affected_damage = CalcNotIgnoreDamageReduction(damageInfo);
             uint32 resilienceReduction;
-            if (attackType != RANGED_ATTACK)
+            if (damageInfo->attackType != RANGED_ATTACK)
                 resilienceReduction = pVictim->GetMeleeCritDamageReduction(reduction_affected_damage);
             else
                 resilienceReduction = pVictim->GetRangedCritDamageReduction(reduction_affected_damage);
@@ -1515,34 +1923,34 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
             damageInfo->TargetState = VICTIMSTATE_NORMAL;
             damageInfo->HitInfo    |= HITINFO_BLOCK;
             damageInfo->procEx     |= PROC_EX_BLOCK;
-            damageInfo->blocked_amount = damageInfo->target->GetShieldBlockValue();
+            damageInfo->blocked     = damageInfo->target->GetShieldBlockValue();
 
             // Target has a chance to double the blocked amount if it has SPELL_AURA_MOD_BLOCK_CRIT_CHANCE
             if (roll_chance_i(pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_BLOCK_CRIT_CHANCE)))
-                damageInfo->blocked_amount *= 2;
+                damageInfo->blocked *= 2;
 
-            if (damageInfo->blocked_amount >= damageInfo->damage)
+            if (damageInfo->blocked >= damageInfo->damage)
             {
                 damageInfo->TargetState = VICTIMSTATE_BLOCKS;
-                damageInfo->blocked_amount = damageInfo->damage;
+                damageInfo->blocked = damageInfo->damage;
                 damageInfo->procEx |= PROC_EX_FULL_BLOCK;
             }
             else
                 damageInfo->procEx |= PROC_EX_NORMAL_HIT;   // Partial blocks can still cause attacker procs
 
-            damageInfo->damage      -= damageInfo->blocked_amount;
-            damageInfo->cleanDamage += damageInfo->blocked_amount;
+            damageInfo->damage      -= damageInfo->blocked;
+            damageInfo->cleanDamage += damageInfo->blocked;
             break;
         }
         case MELEE_HIT_GLANCING:
         {
-            damageInfo->HitInfo |= HITINFO_GLANCING;
-            damageInfo->TargetState = VICTIMSTATE_NORMAL;
-            damageInfo->procEx |= PROC_EX_NORMAL_HIT;
-            float reducePercent = 1.0f;                     //damage factor
+            damageInfo->HitInfo     |= HITINFO_GLANCING;
+            damageInfo->TargetState  = VICTIMSTATE_NORMAL;
+            damageInfo->procEx      |= PROC_EX_NORMAL_HIT;
+            float reducePercent      = 1.0f;                     //damage factor
             // calculate base values and mods
-            float baseLowEnd = 1.3f;
-            float baseHighEnd = 1.2f;
+            float baseLowEnd         = 1.3f;
+            float baseHighEnd        = 1.2f;
             switch(getClass())                              // lowering base values for casters
             {
                 case CLASS_SHAMAN:
@@ -1550,8 +1958,10 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
                 case CLASS_MAGE:
                 case CLASS_WARLOCK:
                 case CLASS_DRUID:
-                    baseLowEnd  -= 0.7f;
-                    baseHighEnd -= 0.3f;
+                    baseLowEnd      -= 0.7f;
+                    baseHighEnd     -= 0.3f;
+                    break;
+                default:
                     break;
             }
 
@@ -1561,6 +1971,9 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
                 case CLASS_WARRIOR:
                 case CLASS_ROGUE:
                     maxLowEnd = 0.91f;                      //If the attacker is a melee class then instead the lower value of 0.91
+                    break;
+                default:
+                    break;
             }
 
             // calculate values
@@ -1579,67 +1992,64 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
             if ( highEnd > 0.99f )
                 highEnd = 0.99f;
 
-            if(lowEnd > highEnd)                            // prevent negative range size
+            if (lowEnd > highEnd)                            // prevent negative range size
                 lowEnd = highEnd;
 
             reducePercent = lowEnd + rand_norm_f() * ( highEnd - lowEnd );
 
             damageInfo->cleanDamage += damageInfo->damage-uint32(reducePercent *  damageInfo->damage);
-            damageInfo->damage   = uint32(reducePercent *  damageInfo->damage);
+            damageInfo->damage       = uint32(reducePercent *  damageInfo->damage);
             break;
         }
         case MELEE_HIT_CRUSHING:
         {
             damageInfo->HitInfo     |= HITINFO_CRUSHING;
             damageInfo->TargetState  = VICTIMSTATE_NORMAL;
-            damageInfo->procEx|=PROC_EX_NORMAL_HIT;
+            damageInfo->procEx      |= PROC_EX_NORMAL_HIT;
             // 150% normal damage
-            damageInfo->damage += (damageInfo->damage / 2);
+            damageInfo->damage      += (damageInfo->damage / 2);
             break;
         }
         default:
-
             break;
     }
 
-    // only from players
-    if (GetTypeId() == TYPEID_PLAYER)
+    // Only from players and their pets
+    if (int32(damageInfo->damage) > 0 && IsCharmerOrOwnerPlayerOrPlayerItself())
     {
-        uint32 reduction_affected_damage = CalcNotIgnoreDamageReduction(damageInfo->damage, damageInfo->damageSchoolMask);
-        uint32 resilienceReduction;
-        if (attackType != RANGED_ATTACK)
-            resilienceReduction = pVictim->GetMeleeDamageReduction(reduction_affected_damage);
-        else
-            resilienceReduction = pVictim->GetRangedDamageReduction(reduction_affected_damage);
+        // Resilience - reduce regular damage (full or reduced)
+        uint32 reduction_affected_damage = sWorld.getConfig(CONFIG_BOOL_RESILIENCE_ALTERNATIVE_CALCULATION)
+            ? damageInfo->damage
+            : CalcNotIgnoreDamageReduction(damageInfo);
+
+        uint32 resilienceReduction = (damageInfo->attackType != RANGED_ATTACK)
+            ? pVictim->GetMeleeDamageReduction(reduction_affected_damage)
+            : pVictim->GetRangedDamageReduction(reduction_affected_damage);
+
         damageInfo->damage      -= resilienceReduction;
         damageInfo->cleanDamage += resilienceReduction;
     }
 
     // Calculate absorb resist
-    if(int32(damageInfo->damage) > 0)
+    if (int32(damageInfo->damage) > 0)
     {
         damageInfo->procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
+        damageInfo->procEx     |= PROC_EX_DIRECT_DAMAGE;
 
         // Calculate absorb & resists
-        uint32 absorb_affected_damage = CalcNotIgnoreAbsorbDamage(damageInfo->damage,damageInfo->damageSchoolMask);
-        damageInfo->target->CalculateDamageAbsorbAndResist(this, damageInfo->damageSchoolMask, DIRECT_DAMAGE, absorb_affected_damage, &damageInfo->absorb, &damageInfo->resist, true);
-        damageInfo->damage-=damageInfo->absorb + damageInfo->resist;
-        if (damageInfo->absorb)
-        {
-            damageInfo->HitInfo|=HITINFO_ABSORB;
-            damageInfo->procEx|=PROC_EX_ABSORB;
-        }
-        if (damageInfo->resist)
-            damageInfo->HitInfo|=HITINFO_RESIST;
-
+        damageInfo->target->CalculateDamageAbsorbAndResist(this, damageInfo, true);
     }
-    else // Umpossible get negative result but....
+
+    // Impossible get negative result but....
+    if (int32(damageInfo->damage) < 0)
         damageInfo->damage = 0;
 }
 
-void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
+void Unit::DealMeleeDamage(DamageInfo* damageInfo, bool durabilityLoss)
 {
-    if (damageInfo==0) return;
+    if (!damageInfo)
+        return;
+
     Unit *pVictim = damageInfo->target;
 
     if(!this || !pVictim)
@@ -1656,10 +2066,10 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
     // Hmmmm dont like this emotes client must by self do all animations
     if (damageInfo->HitInfo&HITINFO_CRITICALHIT)
         pVictim->HandleEmoteCommand(EMOTE_ONESHOT_WOUNDCRITICAL);
-    if (damageInfo->blocked_amount && damageInfo->TargetState!=VICTIMSTATE_BLOCKS)
+    if (damageInfo->blocked && damageInfo->TargetState != VICTIMSTATE_BLOCKS)
         pVictim->HandleEmoteCommand(EMOTE_ONESHOT_PARRYSHIELD);
 
-    if(damageInfo->TargetState == VICTIMSTATE_PARRY)
+    if (damageInfo->TargetState == VICTIMSTATE_PARRY)
     {
         // Get attack timers
         float offtime  = float(pVictim->getAttackTimer(OFF_ATTACK));
@@ -1669,11 +2079,11 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
         {
             float percent20 = pVictim->GetAttackTime(OFF_ATTACK) * 0.20f;
             float percent60 = 3.0f * percent20;
-            if(offtime > percent20 && offtime <= percent60)
+            if (offtime > percent20 && offtime <= percent60)
             {
                 pVictim->setAttackTimer(OFF_ATTACK, uint32(percent20));
             }
-            else if(offtime > percent60)
+            else if (offtime > percent60)
             {
                 offtime -= 2.0f * percent20;
                 pVictim->setAttackTimer(OFF_ATTACK, uint32(offtime));
@@ -1683,11 +2093,11 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
         {
             float percent20 = pVictim->GetAttackTime(BASE_ATTACK) * 0.20f;
             float percent60 = 3.0f * percent20;
-            if(basetime > percent20 && basetime <= percent60)
+            if (basetime > percent20 && basetime <= percent60)
             {
                 pVictim->setAttackTimer(BASE_ATTACK, uint32(percent20));
             }
-            else if(basetime > percent60)
+            else if (basetime > percent60)
             {
                 basetime -= 2.0f * percent20;
                 pVictim->setAttackTimer(BASE_ATTACK, uint32(basetime));
@@ -1696,11 +2106,11 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
     }
 
     // Call default DealDamage
-    CleanDamage cleanDamage(damageInfo->cleanDamage,damageInfo->attackType,damageInfo->hitOutCome);
-    DealDamage(pVictim, damageInfo->damage, &cleanDamage, DIRECT_DAMAGE, damageInfo->damageSchoolMask, NULL, durabilityLoss);
+    damageInfo->damageType = DIRECT_DAMAGE;
+    DealDamage(pVictim, damageInfo, durabilityLoss);
 
     // If this is a creature and it attacks from behind it has a probability to daze it's victim
-    if( (damageInfo->hitOutCome==MELEE_HIT_CRIT || damageInfo->hitOutCome==MELEE_HIT_CRUSHING || damageInfo->hitOutCome==MELEE_HIT_NORMAL || damageInfo->hitOutCome==MELEE_HIT_GLANCING) &&
+    if ( (damageInfo->hitOutCome==MELEE_HIT_CRIT || damageInfo->hitOutCome==MELEE_HIT_CRUSHING || damageInfo->hitOutCome==MELEE_HIT_NORMAL || damageInfo->hitOutCome==MELEE_HIT_GLANCING) &&
         GetTypeId() != TYPEID_PLAYER && !((Creature*)this)->GetCharmerOrOwnerGuid() && !pVictim->HasInArc(M_PI_F, this) )
     {
         // -probability is between 0% and 40%
@@ -1708,7 +2118,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
         float Probability = 20.0f;
 
         //there is a newbie protection, at level 10 just 7% base chance; assuming linear function
-        if( pVictim->getLevel() < 30 )
+        if ( pVictim->getLevel() < 30 )
             Probability = 0.65f*pVictim->getLevel()+0.5f;
 
         uint32 VictimDefense=pVictim->GetDefenseSkillValue();
@@ -1716,10 +2126,10 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
 
         Probability *= AttackerMeleeSkill/(float)VictimDefense;
 
-        if(Probability > 40.0f)
+        if (Probability > 40.0f)
             Probability = 40.0f;
 
-        if(roll_chance_f(Probability))
+        if (roll_chance_f(Probability))
             CastSpell(pVictim, 1604, true);
     }
 
@@ -1727,46 +2137,8 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
     if (!(damageInfo->HitInfo & HITINFO_MISS))
     {
         // on weapon hit casts
-        if(GetTypeId() == TYPEID_PLAYER && pVictim->isAlive())
+        if (GetTypeId() == TYPEID_PLAYER && pVictim->isAlive())
             ((Player*)this)->CastItemCombatSpell(pVictim, damageInfo->attackType);
-
-        // victim's damage shield
-        std::set<Aura*> alreadyDone;
-        AuraList const& vDamageShields = pVictim->GetAurasByType(SPELL_AURA_DAMAGE_SHIELD);
-        for(AuraList::const_iterator i = vDamageShields.begin(); i != vDamageShields.end();)
-        {
-            if (alreadyDone.find(*i) == alreadyDone.end())
-            {
-                alreadyDone.insert(*i);
-                uint32 damage=(*i)->GetModifier()->m_amount;
-                SpellEntry const *i_spellProto = (*i)->GetSpellProto();
-                //Calculate absorb resist ??? no data in opcode for this possibly unable to absorb or resist?
-                //uint32 absorb;
-                //uint32 resist;
-                //CalcAbsorbResist(pVictim, SpellSchools(spellProto->School), SPELL_DIRECT_DAMAGE, damage, &absorb, &resist);
-                //damage-=absorb + resist;
-
-                pVictim->DealDamageMods(this,damage,NULL);
-
-                uint32 targetHealth = GetHealth();
-                uint32 overkill = damage > targetHealth ? damage - targetHealth : 0;
-
-                WorldPacket data(SMSG_SPELLDAMAGESHIELD,(8+8+4+4+4+4));
-                data << pVictim->GetObjectGuid();
-                data << GetObjectGuid();
-                data << uint32(i_spellProto->Id);
-                data << uint32(damage);                  // Damage
-                data << uint32(overkill);                // Overkill
-                data << uint32(i_spellProto->SchoolMask);
-                pVictim->SendMessageToSet(&data, true );
-
-                pVictim->DealDamage(this, damage, 0, SPELL_DIRECT_DAMAGE, GetSpellSchoolMask(i_spellProto), i_spellProto, true);
-
-                i = vDamageShields.begin();
-            }
-            else
-                ++i;
-        }
     }
 }
 
@@ -1797,34 +2169,103 @@ void Unit::HandleEmote(uint32 emote_id)
     }
 }
 
-uint32 Unit::CalcNotIgnoreAbsorbDamage( uint32 damage, SpellSchoolMask damageSchoolMask, SpellEntry const* spellInfo /*= NULL*/)
+uint32 Unit::CalcNotIgnoreAbsorbDamage(DamageInfo* damageInfo)
 {
     float absorb_affected_rate = 1.0f;
     Unit::AuraList const& ignoreAbsorbSchool = GetAurasByType(SPELL_AURA_MOD_IGNORE_ABSORB_SCHOOL);
     for(Unit::AuraList::const_iterator i = ignoreAbsorbSchool.begin(); i != ignoreAbsorbSchool.end(); ++i)
-        if ((*i)->GetMiscValue() & damageSchoolMask)
+        if ((*i)->GetMiscValue() & damageInfo->GetSchoolMask())
             absorb_affected_rate *= (100.0f - (*i)->GetModifier()->m_amount)/100.0f;
 
-    if(spellInfo)
+    if (!damageInfo->IsMeleeDamage())
     {
         Unit::AuraList const& ignoreAbsorbForSpell = GetAurasByType(SPELL_AURA_MOD_IGNORE_ABSORB_FOR_SPELL);
         for(Unit::AuraList::const_iterator citr = ignoreAbsorbForSpell.begin(); citr != ignoreAbsorbForSpell.end(); ++citr)
-            if ((*citr)->isAffectedOnSpell(spellInfo))
+            if ((*citr)->isAffectedOnSpell(damageInfo->GetSpellProto()))
                 absorb_affected_rate *= (100.0f - (*citr)->GetModifier()->m_amount)/100.0f;
     }
 
-    return absorb_affected_rate <= 0.0f ? 0 : (absorb_affected_rate < 1.0f  ? uint32(damage * absorb_affected_rate) : damage);
+    return absorb_affected_rate <= 0.0f ? 0 : (absorb_affected_rate < 1.0f  ? uint32(damageInfo->damage * absorb_affected_rate) : damageInfo->damage);
 }
 
-uint32 Unit::CalcNotIgnoreDamageReduction(uint32 damage, SpellSchoolMask damageSchoolMask)
+uint32 Unit::CalcNotIgnoreDamageReduction(DamageInfo* damageInfo)
 {
     float absorb_affected_rate = 1.0f;
     Unit::AuraList const& ignoreAbsorb = GetAurasByType(SPELL_AURA_MOD_IGNORE_DAMAGE_REDUCTION_SCHOOL);
     for(Unit::AuraList::const_iterator i = ignoreAbsorb.begin(); i != ignoreAbsorb.end(); ++i)
-        if ((*i)->GetMiscValue() & damageSchoolMask)
+        if ((*i)->GetMiscValue() & damageInfo->GetSchoolMask())
             absorb_affected_rate *= (100.0f - (*i)->GetModifier()->m_amount)/100.0f;
 
-    return absorb_affected_rate <= 0.0f ? 0 : (absorb_affected_rate < 1.0f  ? uint32(damage * absorb_affected_rate) : damage);
+    return absorb_affected_rate <= M_NULL_F ? 0 : (absorb_affected_rate < 1.0f  ? floor((float)damageInfo->damage * absorb_affected_rate) : damageInfo->damage);
+}
+
+bool Unit::IsDamageReducedByArmor(SpellSchoolMask schoolMask, SpellEntry const* spellProto /*=NULL*/, SpellEffectIndex effIndex /*=MAX_EFFECT_INDEX*/)
+{
+    // only physical spells damage gets reduced by armor
+    if (!(schoolMask & SPELL_SCHOOL_MASK_NORMAL))
+        return false;
+
+    if (!spellProto)
+        return true;
+
+    // there are spells with no specific attribute but they have "ignores armor" in tooltip
+    switch (spellProto->Id)
+    {
+        case 18500: // Wing Buffet
+        case 33086: // Wild Bite
+        case 49749: // Piercing Blow
+        case 52890: // Penetrating Strike
+        case 53454: // Impale
+        case 59446: // Impale
+        case 62383: // Shatter
+        case 64777: // Machine Gun
+        case 65239: // Machine Gun
+        case 65919: // Impale
+        case 67858: // Impale
+        case 67859: // Impale
+        case 67860: // Impale
+        case 69293: // Wing Buffet
+        case 74439: // Machine Gun
+        case 63278: // Mark of the Faceless (General Vezax)
+        case 62544: // Thrust (Argent Tournament)
+        case 64588: // Thrust (Argent Tournament)
+        case 66479: // Thrust (Argent Tournament)
+        case 68505: // Thrust (Argent Tournament)
+        case 62709: // Counterattack! (Argent Tournament)
+        case 62626: // Break-Shield (Argent Tournament, Player)
+        case 64590: // Break-Shield (Argent Tournament, Player)
+        case 64342: // Break-Shield (Argent Tournament, NPC)
+        case 64686: // Break-Shield (Argent Tournament, NPC)
+        case 65147: // Break-Shield (Argent Tournament, NPC)
+        case 68504: // Break-Shield (Argent Tournament, NPC)
+        case 62874: // Charge (Argent Tournament, Player)
+        case 68498: // Charge (Argent Tournament, Player)
+        case 64591: // Charge (Argent Tournament, Player)
+        case 63003: // Charge (Argent Tournament, NPC)
+        case 63010: // Charge (Argent Tournament, NPC)
+        case 68321: // Charge (Argent Tournament, NPC)
+        case 72255: // Mark of the Fallen Champion (Deathbringer Saurfang)
+        case 72444: // Mark of the Fallen Champion (Deathbringer Saurfang)
+        case 72445: // Mark of the Fallen Champion (Deathbringer Saurfang)
+        case 72446: // Mark of the Fallen Champion (Deathbringer Saurfang)
+        case 64422: // Sonic Screech (Auriaya)
+            return false;
+        default:
+            break;
+    }
+
+    // bleeding effects are not reduced by armor
+    if (effIndex < MAX_EFFECT_INDEX)
+    {
+        if (spellProto->EffectApplyAuraName[effIndex] == SPELL_AURA_PERIODIC_DAMAGE ||
+            spellProto->Effect[effIndex] == SPELL_EFFECT_SCHOOL_DAMAGE)
+        {
+            if (GetEffectMechanic(spellProto, effIndex) == MECHANIC_BLEED)
+                return false;
+        }
+    }
+
+    return true;
 }
 
 uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage)
@@ -1869,18 +2310,27 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage)
     return (newdamage > 1) ? newdamage : 1;
 }
 
-void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolMask, DamageEffectType damagetype, const uint32 damage, uint32 *absorb, uint32 *resist, bool canReflect)
+void Unit::CalculateResistance(Unit* pCaster, DamageInfo* damageInfo)
 {
-    if(!pCaster || !isAlive() || !damage)
+    // Only for magic damage
+    if ((damageInfo->GetSchoolMask() & SPELL_SCHOOL_MASK_NORMAL) ||
+        damageInfo->IsMeleeDamage() ||
+        damageInfo->GetSpellProto()->HasAttribute(SPELL_ATTR_EX4_IGNORE_RESISTANCES) ||
+        IsBinaryResistedSpell(damageInfo->GetSpellProto()))
+    {
+        damageInfo->resist = 0;
         return;
+    }
 
-    // Magic damage, check for resists
-    if ((schoolMask & SPELL_SCHOOL_MASK_NORMAL)==0)
+    uint32 calcMethod = sWorld.getConfig(CONFIG_UINT32_RESIST_CALC_METHOD);
+
+    // TBC (0%, 25%, 50%, 75% or 100%)
+    if (calcMethod == 0)
     {
-        // Get base victim resistance for school
-        float tmpvalue2 = (float)GetResistance(GetFirstSchoolInMask(schoolMask));
+        // Get base resistance for schoolmask
+        float tmpvalue2 = (float)GetResistance(damageInfo->GetSchoolMask());
         // Ignore resistance by self SPELL_AURA_MOD_TARGET_RESISTANCE aura
-        tmpvalue2 += (float)pCaster->GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_TARGET_RESISTANCE, schoolMask);
+        tmpvalue2 += (float)pCaster->GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_TARGET_RESISTANCE, damageInfo->GetSchoolMask());
 
         if (pCaster->GetTypeId() == TYPEID_PLAYER)
             tmpvalue2 -= (float)((Player*)pCaster)->GetSpellPenetrationItemMod();
@@ -1896,46 +2346,117 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
         float Binom = 0.0f;
         for (uint8 i = 0; i < 4; ++i)
         {
-            Binom += 2400 *( powf(tmpvalue2, float(i)) * powf( (1-tmpvalue2), float(4-i)))/faq[i];
-            if (ran > Binom )
+            Binom += 2400 * (pow(tmpvalue2, float(i)) * pow((1 - tmpvalue2), float(4-i))) / faq[i];
+            if (ran > Binom)
                 ++m;
             else
                 break;
         }
-        if (damagetype == DOT && m == 4)
-            *resist += uint32(damage - 1);
+
+        if (damageInfo->damageType == DOT && m == 4)
+            damageInfo->resist = damageInfo->damage;
+            // need make more correct this hack.
         else
-            *resist += uint32(damage * m / 4);
-        if(*resist > damage)
-            *resist = damage;
+            damageInfo->resist = uint32(damageInfo->damage * m / 4);
     }
-    else
-        *resist = 0;
+    // WOTLK (0%, 10%, 20%, 30% ... 100%)
+    else if (calcMethod == 1)
+    {
+        // Get levels with use boss dynamic level
+        int32 casterLevel = int32(pCaster->GetLevelForTarget(this));
+        int32 extraResist = sWorld.getConfig(CONFIG_BOOL_RESIST_ADD_BY_OVER_LEVEL) ?
+            std::max(int32(GetLevelForTarget(pCaster) - casterLevel) * 5, 0) : 0;
 
-    int32 RemainingDamage = damage - *resist;
+        // Get base resistance for schoolmask
+        int32 resistance = int32(GetResistance(damageInfo->GetSchoolMask()));
+        // Ignore resistance by self SPELL_AURA_MOD_TARGET_RESISTANCE aura
+        resistance += pCaster->GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_TARGET_RESISTANCE, damageInfo->GetSchoolMask());
 
-    // Get unit state (need for some absorb check)
-    uint32 unitflag = GetUInt32Value(UNIT_FIELD_FLAGS);
-    // Reflect damage spells (not cast any damage spell in aura lookup)
-    uint32 reflectSpell = 0;
-    int32  reflectDamage = 0;
-    Aura*  reflectTriggeredBy = NULL;                       // expected as not expired at reflect as in current cases
+        // Calculate effective resistance
+        int32 casterPen = pCaster->GetTypeId() == TYPEID_PLAYER ? ((Player*)pCaster)->GetSpellPenetrationItemMod() : 0;
+        int32 effResist = resistance + extraResist - std::min(casterPen, resistance);
+
+        if (effResist > 0)
+        {
+            // Calculate average mitigation
+            uint32 magicK = casterLevel > 80 ? 400 + ceil(36.6f * float(casterLevel - 80)) : 400;
+            float avrgMitigation = float(effResist) / (magicK + effResist);
+
+            // Search applicable section 100%, 90%, 80% ... 10%
+            float chance = rand_norm_f();
+            float resPct = std::min(1.0f, float(floor(10.0f * avrgMitigation + 2.0f) / 10.0f));
+            for (; resPct > 0.0f; resPct -= 0.1f)
+            {
+                float probability = 0.5f - 2.5f * abs(resPct - avrgMitigation);
+                if (probability > chance)
+                {
+                    damageInfo->resist = uint32(float(damageInfo->damage) * resPct);
+                    break;
+                }
+                chance -= probability;
+            }
+        }
+    }
+}
+
+void Unit::CalculateDamageAbsorbAndResist(Unit* pCaster, DamageInfo* damageInfo, bool canReflect)
+{
+    if (!pCaster || !isAlive() || !damageInfo || !damageInfo->damage)
+        return;
+
+    // Calculate resistance if needed
+    CalculateResistance(pCaster, damageInfo);
+
+    int32 RemainingDamage = damageInfo->damage - damageInfo->resist;
+
+    // Get unit state (need for some absorb check)
+    uint32 unitflag = GetUInt32Value(UNIT_FIELD_FLAGS);
+    // Reflect damage spells (not cast any damage spell in aura lookup)
+    uint32 reflectSpell = 0;
+    int32  reflectDamage = 0;
+    AuraPair reflectTriggeredBy;                                      // expected as not expired at reflect as in current cases
     // Death Prevention Aura
     SpellEntry const*  preventDeathSpell = NULL;
     int32  preventDeathAmount = 0;
 
-    // full absorb cases (by chance)
+    // for absorb use only absorb_affected_damage
+    uint32 absorb_affected_damage = pCaster->CalcNotIgnoreAbsorbDamage(damageInfo);
+    uint32 absorb_unaffected_damage = RemainingDamage > int32(absorb_affected_damage) ?
+                                      RemainingDamage - absorb_affected_damage : 0;
+
+    RemainingDamage -= absorb_unaffected_damage;
+
+    if (RemainingDamage == 0)
+    {
+        // nont need remaining calculation, if none absorbed...
+        damageInfo->absorb = 0;
+        if (damageInfo->damage <  damageInfo->resist)
+            damageInfo->damage = 0;
+        else
+            damageInfo->damage -= damageInfo->resist;
+        return;
+    }
+
+    // full and PcT absorb cases (by chance)
     AuraList const& vAbsorb = GetAurasByType(SPELL_AURA_SCHOOL_ABSORB);
     for(AuraList::const_iterator i = vAbsorb.begin(); i != vAbsorb.end() && RemainingDamage > 0; ++i)
     {
         // only work with proper school mask damage
-        Modifier* i_mod = (*i)->GetModifier();
-        if (!(i_mod->m_miscvalue & schoolMask))
+        Modifier const* i_mod = (*i)->GetModifier();
+        if (!(i_mod->m_miscvalue & damageInfo->GetSchoolMask()))
             continue;
 
         SpellEntry const* i_spellProto = (*i)->GetSpellProto();
+
+        // PCT Absorb
+        if (i_spellProto->HasAttribute(SPELL_ATTR_EX6_PCT_ABSORB))
+        {
+            RemainingDamage -= RemainingDamage * ((float)i_mod->m_amount/100.0f);
+        }
+
+        // Full Absorb
         // Fire Ward or Frost Ward
-        if(i_spellProto->SpellFamilyName == SPELLFAMILY_MAGE && i_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000108))
+        if (i_spellProto->SpellFamilyName == SPELLFAMILY_MAGE && i_spellProto->GetSpellFamilyFlags().test<CF_MAGE_FIRE_WARD, CF_MAGE_FROST_WARD>())
         {
             int chance = 0;
             Unit::AuraList const& auras = GetAurasByType(SPELL_AURA_ADD_PCT_MODIFIER);
@@ -1943,345 +2464,390 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
             {
                 SpellEntry const* itr_spellProto = (*itr)->GetSpellProto();
                 // Frost Warding (chance full absorb)
-                if (itr_spellProto->SpellFamilyName == SPELLFAMILY_MAGE && itr_spellProto->SpellIconID == 501)
+                if (itr_spellProto->SpellFamilyName == SPELLFAMILY_MAGE && itr_spellProto->GetSpellIconID() == 501)
                 {
                     // chance stored in next dummy effect
                     chance = itr_spellProto->CalculateSimpleValue(EFFECT_INDEX_1);
                     break;
                 }
             }
-            if(roll_chance_i(chance))
+            if (roll_chance_i(chance))
             {
                 int32 amount = RemainingDamage;
                 RemainingDamage = 0;
 
                 // Frost Warding (mana regen)
-                CastCustomSpell(this, 57776, &amount, NULL, NULL, true, NULL, *i);
+                CastCustomSpell(this, 57776, &amount, NULL, NULL, true, NULL, (*i)());
                 break;
             }
         }
     }
 
-    // Need remove expired auras after
-    bool existExpired = false;
-
     // Incanter's Absorption, for converting to spell power
     int32 incanterAbsorption = 0;
 
+    SpellIdSet toRemoveSpellList;
     // absorb without mana cost
     AuraList const& vSchoolAbsorb = GetAurasByType(SPELL_AURA_SCHOOL_ABSORB);
-    for(AuraList::const_iterator i = vSchoolAbsorb.begin(); i != vSchoolAbsorb.end() && RemainingDamage > 0; ++i)
+    if (!vSchoolAbsorb.empty())
     {
-        Modifier* mod = (*i)->GetModifier();
-        if (!(mod->m_miscvalue & schoolMask))
-            continue;
+        for(AuraList::const_iterator i = vSchoolAbsorb.begin(); i != vSchoolAbsorb.end() && RemainingDamage > 0; ++i)
+        {
+            Modifier const* mod = (*i)->GetModifier();
+            if (!(mod->m_miscvalue & damageInfo->GetSchoolMask()))
+                continue;
 
-        SpellEntry const* spellProto = (*i)->GetSpellProto();
+            SpellEntry const* spellProto = (*i)->GetSpellProto();
 
-        // Max Amount can be absorbed by this aura
-        int32  currentAbsorb = mod->m_amount;
+            // Max Amount can be absorbed by this aura
+            int32  currentAbsorb = mod->m_amount;
 
-        // Found empty aura (impossible but..)
-        if (currentAbsorb <=0)
-        {
-            existExpired = true;
-            continue;
-        }
+            // Found empty aura (impossible but..)
+            if (currentAbsorb <=0 )
+            {
+                toRemoveSpellList.insert((*i)->GetId());
+                continue;
+            }
 
-        // Handle custom absorb auras
-        // TODO: try find better way
+            // Handle custom absorb auras
+            // TODO: try find better way
 
-        switch(spellProto->SpellFamilyName)
-        {
-            case SPELLFAMILY_GENERIC:
+            switch(spellProto->SpellFamilyName)
             {
-                // Astral Shift
-                if (spellProto->SpellIconID == 3066)
-                {
-                    //reduces all damage taken while stun, fear or silence
-                    if (unitflag & (UNIT_FLAG_STUNNED|UNIT_FLAG_FLEEING|UNIT_FLAG_SILENCED))
-                        RemainingDamage -= RemainingDamage * currentAbsorb / 100;
-                    continue;
-                }
-                // Nerves of Steel
-                if (spellProto->SpellIconID == 2115)
-                {
-                    // while affected by Stun and Fear
-                    if (unitflag&(UNIT_FLAG_STUNNED|UNIT_FLAG_FLEEING))
-                        RemainingDamage -= RemainingDamage * currentAbsorb / 100;
-                    continue;
-                }
-                // Spell Deflection
-                if (spellProto->SpellIconID == 3006)
-                {
-                    // You have a chance equal to your Parry chance
-                    if (damagetype == SPELL_DIRECT_DAMAGE &&             // Only for direct spell damage
-                        roll_chance_f(GetUnitParryChance()))             // Roll chance
-                        RemainingDamage -= RemainingDamage * currentAbsorb / 100;
-                    continue;
-                }
-                // Reflective Shield (Lady Malande boss)
-                if (spellProto->Id == 41475 && canReflect)
+                case SPELLFAMILY_GENERIC:
                 {
-                    if(RemainingDamage < currentAbsorb)
-                        reflectDamage = RemainingDamage / 2;
-                    else
-                        reflectDamage = currentAbsorb / 2;
-                    reflectSpell = 33619;
-                    reflectTriggeredBy = *i;
-                    reflectTriggeredBy->SetInUse(true);     // lock aura from final deletion until processing
+                    // Astral Shift
+                    if (spellProto->GetSpellIconID() == 3066)
+                    {
+                        //reduces all damage taken while stun, fear or silence
+                        if (unitflag & (UNIT_FLAG_STUNNED|UNIT_FLAG_FLEEING|UNIT_FLAG_SILENCED))
+                            RemainingDamage -= RemainingDamage * currentAbsorb / 100;
+                        continue;
+                    }
+                    // Nerves of Steel
+                    if (spellProto->GetSpellIconID() == 2115)
+                    {
+                        // while affected by Stun and Fear
+                        if (unitflag&(UNIT_FLAG_STUNNED|UNIT_FLAG_FLEEING))
+                            RemainingDamage -= RemainingDamage * currentAbsorb / 100;
+                        continue;
+                    }
+                    // Spell Deflection
+                    if (spellProto->GetSpellIconID() == 3006)
+                    {
+                        // You have a chance equal to your Parry chance
+                        if (damageInfo->damageType == SPELL_DIRECT_DAMAGE &&             // Only for direct spell damage
+                            roll_chance_f(GetUnitParryChance()))             // Roll chance
+                            RemainingDamage -= RemainingDamage * currentAbsorb / 100;
+                        continue;
+                    }
+                    // Reflective Shield (Lady Malande boss)
+                    if (spellProto->Id == 41475 && canReflect)
+                    {
+                        if (RemainingDamage < currentAbsorb)
+                            reflectDamage = RemainingDamage / 2;
+                        else
+                            reflectDamage = currentAbsorb / 2;
+                        reflectSpell = 33619;
+                        reflectTriggeredBy = *i;
+                        break;
+                    }
+                    if (spellProto->Id == 39228 ||              // Argussian Compass
+                        spellProto->Id == 60218)                // Essence of Gossamer
+                    {
+                        // Max absorb stored in 1 dummy effect
+                        int32 max_absorb = spellProto->CalculateSimpleValue(EFFECT_INDEX_1);
+                        if (max_absorb < currentAbsorb)
+                            currentAbsorb = max_absorb;
+                        break;
+                    }
                     break;
                 }
-                if (spellProto->Id == 39228 ||              // Argussian Compass
-                    spellProto->Id == 60218)                // Essence of Gossamer
+                case SPELLFAMILY_DRUID:
                 {
-                    // Max absorb stored in 1 dummy effect
-                    int32 max_absorb = spellProto->CalculateSimpleValue(EFFECT_INDEX_1);
-                    if (max_absorb < currentAbsorb)
-                        currentAbsorb = max_absorb;
+                    // Primal Tenacity
+                    if (spellProto->GetSpellIconID() == 2253)
+                    {
+                        //reduces all damage taken while Stunned and in Cat Form
+                        if (GetShapeshiftForm() == FORM_CAT && (unitflag & UNIT_FLAG_STUNNED))
+                            RemainingDamage -= RemainingDamage * currentAbsorb / 100;
+                        continue;
+                    }
+                    // Moonkin Form passive
+                    if (spellProto->Id == 69366)
+                    {
+                        //reduces all damage taken while Stunned
+                        if (unitflag & UNIT_FLAG_STUNNED)
+                            RemainingDamage -= RemainingDamage * currentAbsorb / 100;
+                        continue;
+                    }
                     break;
                 }
-                break;
-            }
-            case SPELLFAMILY_DRUID:
-            {
-                // Primal Tenacity
-                if (spellProto->SpellIconID == 2253)
+                case SPELLFAMILY_ROGUE:
                 {
-                    //reduces all damage taken while Stunned and in Cat Form
-                    if (GetShapeshiftForm() == FORM_CAT && (unitflag & UNIT_FLAG_STUNNED))
-                        RemainingDamage -= RemainingDamage * currentAbsorb / 100;
-                    continue;
+                    // Cheat Death (make less prio with Guardian Spirit case)
+                    if (spellProto->GetSpellIconID() == 2109)
+                    {
+                        if (!preventDeathSpell &&
+                            !HasSpellCooldown(31231) &&
+                                                                // Only if no cooldown
+                            roll_chance_i((*i)->GetModifier()->m_amount))
+                                                                    // Only if roll
+                        {
+                            preventDeathSpell = (*i)->GetSpellProto();
+                        }
+                        // always skip this spell in charge dropping, absorb amount calculation since it has chance as m_amount and doesn't need to absorb any damage
+                        continue;
+                    }
+                    break;
                 }
-                // Moonkin Form passive
-                if (spellProto->Id == 69366)
+                case SPELLFAMILY_PALADIN:
                 {
-                    //reduces all damage taken while Stunned
-                    if (unitflag & UNIT_FLAG_STUNNED)
-                        RemainingDamage -= RemainingDamage * currentAbsorb / 100;
-                    continue;
+                    // Ardent Defender
+                    if (spellProto->GetSpellIconID() == 2135 && GetTypeId() == TYPEID_PLAYER)
+                    {
+                        int32 remainingHealth = GetHealth() - RemainingDamage;
+                        uint32 allowedHealth = GetMaxHealth() * 0.35f;
+                        // If damage kills us
+                        if (remainingHealth <= 0 && !HasAura(66233))
+                        {
+                            // Cast healing spell, completely avoid damage
+                            RemainingDamage = 0;
+
+                            uint32 defenseSkillValue = GetDefenseSkillValue();
+                            // Max heal when defense skill denies critical hits from raid bosses
+                            // Formula: max defense at level + 140 (raiting from gear)
+                            uint32 reqDefForMaxHeal  = getLevel() * 5 + 140;
+                            float pctFromDefense = (defenseSkillValue >= reqDefForMaxHeal)
+                                ? 1.0f
+                                : float(defenseSkillValue) / float(reqDefForMaxHeal);
+
+                            int32 healAmount = GetMaxHealth() * ((*i)->GetSpellProto()->EffectBasePoints[1] + 1) / 100.0f * pctFromDefense;
+                            CastSpell(this, 66233, true);
+                            CastCustomSpell(this, 66235, &healAmount, NULL, NULL, true);
+                        }
+                        else if (remainingHealth < int32(allowedHealth))
+                        {
+                            // Reduce damage that brings us under 35% (or full damage if we are already under 35%) by x%
+                            uint32 damageToReduce = (GetHealth() < allowedHealth)
+                                ? RemainingDamage
+                                : allowedHealth - remainingHealth;
+                            RemainingDamage -= damageToReduce * currentAbsorb / 100;
+                        }
+                        continue;
+                    }
+                    break;
                 }
-                break;
-            }
-            case SPELLFAMILY_ROGUE:
-            {
-                // Cheat Death (make less prio with Guardian Spirit case)
-                if (spellProto->SpellIconID == 2109)
+                case SPELLFAMILY_PRIEST:
                 {
-                    if (!preventDeathSpell &&
-                        GetTypeId()==TYPEID_PLAYER &&       // Only players
-                        !((Player*)this)->HasSpellCooldown(31231) &&
-                                                            // Only if no cooldown
-                        roll_chance_i((*i)->GetModifier()->m_amount))
-                                                                // Only if roll
+                    // Guardian Spirit
+                    if (spellProto->GetSpellIconID() == 2873)
                     {
                         preventDeathSpell = (*i)->GetSpellProto();
+                        preventDeathAmount = (*i)->GetModifier()->m_amount;
+                        continue;
                     }
-                    // always skip this spell in charge dropping, absorb amount calculation since it has chance as m_amount and doesn't need to absorb any damage
-                    continue;
-                }
-                break;
-            }
-            case SPELLFAMILY_PRIEST:
-            {
-                // Guardian Spirit
-                if (spellProto->SpellIconID == 2873)
-                {
-                    preventDeathSpell = (*i)->GetSpellProto();
-                    preventDeathAmount = (*i)->GetModifier()->m_amount;
-                    continue;
-                }
-                // Reflective Shield
-                if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000000001)) && canReflect)
-                {
-                    if (pCaster == this)
-                        break;
-                    Unit* caster = (*i)->GetCaster();
-                    if (!caster)
-                        break;
-                    AuraList const& vOverRideCS = caster->GetAurasByType(SPELL_AURA_DUMMY);
-                    for(AuraList::const_iterator k = vOverRideCS.begin(); k != vOverRideCS.end(); ++k)
+                    // Reflective Shield
+                    if (spellProto->GetSpellFamilyFlags().test<CF_PRIEST_POWER_WORD_SHIELD>() && canReflect)
                     {
-                        switch((*k)->GetModifier()->m_miscvalue)
+                        if (pCaster == this)
+                            break;
+                        Unit* caster = (*i)->GetCaster();
+                        if (!caster)
+                            break;
+                        AuraList const& vOverRideCS = caster->GetAurasByType(SPELL_AURA_DUMMY);
+                        for(AuraList::const_iterator k = vOverRideCS.begin(); k != vOverRideCS.end(); ++k)
                         {
-                            case 5065:                      // Rank 1
-                            case 5064:                      // Rank 2
+                            switch((*k)->GetModifier()->m_miscvalue)
                             {
-                                if(RemainingDamage >= currentAbsorb)
-                                    reflectDamage = (*k)->GetModifier()->m_amount * currentAbsorb/100;
-                                else
-                                    reflectDamage = (*k)->GetModifier()->m_amount * RemainingDamage/100;
-                                reflectSpell = 33619;
-                                reflectTriggeredBy = *i;
-                                reflectTriggeredBy->SetInUse(true);// lock aura from final deletion until processing
-                            } break;
-                            default: break;
+                                case 5065:                      // Rank 1
+                                case 5064:                      // Rank 2
+                                {
+                                    if (RemainingDamage >= currentAbsorb)
+                                        reflectDamage = (*k)->GetModifier()->m_amount * currentAbsorb/100;
+                                    else
+                                        reflectDamage = (*k)->GetModifier()->m_amount * RemainingDamage/100;
+                                    reflectSpell = 33619;
+                                    reflectTriggeredBy = *i;
+                                    break;
+                                }
+                                default:
+                                    break;
+                            }
                         }
+                        break;
                     }
                     break;
                 }
-                break;
-            }
-            case SPELLFAMILY_SHAMAN:
-            {
-                // Astral Shift
-                if (spellProto->SpellIconID == 3066)
-                {
-                    //reduces all damage taken while stun, fear or silence
-                    if (unitflag & (UNIT_FLAG_STUNNED|UNIT_FLAG_FLEEING|UNIT_FLAG_SILENCED))
-                        RemainingDamage -= RemainingDamage * currentAbsorb / 100;
-                    continue;
-                }
-                break;
-            }
-            case SPELLFAMILY_DEATHKNIGHT:
-            {
-                // Shadow of Death
-                if (spellProto->SpellIconID == 1958)
-                {
-                    // TODO: absorb only while transform
-                    continue;
-                }
-                // Anti-Magic Shell (on self)
-                if (spellProto->Id == 48707)
-                {
-                    // damage absorbed by Anti-Magic Shell energizes the DK with additional runic power.
-                    // This, if I'm not mistaken, shows that we get back ~2% of the absorbed damage as runic power.
-                    int32 absorbed = RemainingDamage * currentAbsorb / 100;
-                    int32 regen = absorbed * 2 / 10;
-                    CastCustomSpell(this, 49088, &regen, NULL, NULL, true, NULL, *i);
-                    RemainingDamage -= absorbed;
-                    continue;
-                }
-                // Anti-Magic Shell (on single party/raid member)
-                if (spellProto->Id == 50462)
+                case SPELLFAMILY_SHAMAN:
                 {
-                    RemainingDamage -= RemainingDamage * currentAbsorb / 100;
-                    continue;
+                    // Astral Shift
+                    if (spellProto->GetSpellIconID() == 3066)
+                    {
+                        //reduces all damage taken while stun, fear or silence
+                        if (unitflag & (UNIT_FLAG_STUNNED|UNIT_FLAG_FLEEING|UNIT_FLAG_SILENCED))
+                            RemainingDamage -= RemainingDamage * currentAbsorb / 100;
+                        continue;
+                    }
+                    break;
                 }
-                // Anti-Magic Zone
-                if (spellProto->Id == 50461)
+                case SPELLFAMILY_DEATHKNIGHT:
                 {
-                    Unit* caster = (*i)->GetCaster();
-                    if (!caster)
+                    // Shadow of Death
+                    if (spellProto->GetSpellIconID() == 1958)
+                    {
+                        // TODO: absorb only while transform
+                        continue;
+                    }
+                    // Anti-Magic Shell (on self)
+                    if (spellProto->Id == 48707)
+                    {
+                        // damage absorbed by Anti-Magic Shell energizes the DK with additional runic power.
+                        // This, if I'm not mistaken, shows that we get back ~2% of the absorbed damage as runic power.
+                        int32 absorbed = RemainingDamage * currentAbsorb / 100;
+                        int32 regen = absorbed * 2 / 10;
+                        CastCustomSpell(this, 49088, &regen, NULL, NULL, true, NULL, (*i)());
+                        RemainingDamage -= absorbed;
+                        continue;
+                    }
+                    // Anti-Magic Shell (on single party/raid member)
+                    if (spellProto->Id == 50462)
+                    {
+                        RemainingDamage -= RemainingDamage * currentAbsorb / 100;
+                        continue;
+                    }
+                    // Unbreakable armor
+                    if (spellProto->Id == 51271)
+                    {
+                        int32 absorbed = GetArmor() * currentAbsorb / 100;
+                        // If we have a glyph
+                        if (Aura const* aur = GetDummyAura(58635))
+                            absorbed += absorbed * aur->GetModifier()->m_amount / 100;
+                        RemainingDamage = (RemainingDamage < absorbed) ? 0 : RemainingDamage - absorbed;
                         continue;
-                    int32 absorbed = RemainingDamage * currentAbsorb / 100;
-                    int32 canabsorb = caster->GetHealth();
-                    if (canabsorb < absorbed)
-                        absorbed = canabsorb;
+                    }
+                    // Anti-Magic Zone
+                    if (spellProto->Id == 50461)
+                    {
+                        Unit* caster = (*i)->GetCaster();
+                        if (!caster)
+                            continue;
 
-                    RemainingDamage -= absorbed;
+                        uint32 absorbed = std::min(uint32(RemainingDamage * currentAbsorb / 100), caster->GetHealth());
 
-                    uint32 ab_damage = absorbed;
-                    pCaster->DealDamageMods(caster,ab_damage,NULL);
-                    pCaster->DealDamage(caster, ab_damage, NULL, damagetype, schoolMask, 0, false);
-                    continue;
+                        RemainingDamage -= absorbed;
+
+                        DamageInfo amDamageInfo(pCaster, caster, damageInfo->GetSpellProto(), absorbed);
+                        amDamageInfo.damageType = damageInfo->damageType;
+                        amDamageInfo.durabilityLoss = false;
+                        pCaster->DealDamageMods(&amDamageInfo);
+                        pCaster->DealDamage(&amDamageInfo);
+                        continue;
+                    }
+                    // Will of Necropolis
+                    if (spellProto->GetSpellIconID() == 857)
+                    {
+                        // Apply absorb only on damage below 35% hp
+                        int32 absorbableDamage = RemainingDamage + 0.35f * GetMaxHealth() - GetHealth();
+                        if (absorbableDamage > RemainingDamage)
+                            absorbableDamage = RemainingDamage;
+                        if (absorbableDamage > 0)
+                            RemainingDamage -= absorbableDamage * currentAbsorb / 100;
+                        continue;
+                    }
+                    break;
                 }
-                break;
+                default:
+                    break;
             }
-            default:
-                break;
-        }
-
-        // currentAbsorb - damage can be absorbed by shield
-        // If need absorb less damage
-        if (RemainingDamage < currentAbsorb)
-            currentAbsorb = RemainingDamage;
 
-        RemainingDamage -= currentAbsorb;
+            // currentAbsorb - damage can be absorbed by shield
+            // If need absorb less damage
+            if (RemainingDamage < currentAbsorb)
+                currentAbsorb = RemainingDamage;
 
-        // Fire Ward or Frost Ward or Ice Barrier (or Mana Shield)
-        // for Incanter's Absorption converting to spell power
-        if (spellProto->IsFitToFamily(SPELLFAMILY_MAGE, UI64LIT(0x0000000000000000), 0x00000008))
-            incanterAbsorption += currentAbsorb;
+            RemainingDamage -= currentAbsorb;
 
-        // Reduce shield amount
-        mod->m_amount-=currentAbsorb;
-        if((*i)->GetHolder()->DropAuraCharge())
-            mod->m_amount = 0;
-        // Need remove it later
-        if (mod->m_amount<=0)
-            existExpired = true;
-    }
+            // Fire Ward or Frost Ward or Ice Barrier (or Mana Shield)
+            // for Incanter's Absorption converting to spell power
+            if (spellProto->IsFitToFamily<SPELLFAMILY_MAGE, CF_MAGE_MISC>())
+                incanterAbsorption += currentAbsorb;
 
-    // Remove all expired absorb auras
-    if (existExpired)
-    {
-        for(AuraList::const_iterator i = vSchoolAbsorb.begin(); i != vSchoolAbsorb.end();)
-        {
-            if ((*i)->GetModifier()->m_amount<=0)
-            {
-                RemoveAurasDueToSpell((*i)->GetId(), NULL, AURA_REMOVE_BY_SHIELD_BREAK);
-                i = vSchoolAbsorb.begin();
-            }
-            else
-                ++i;
+            // Reduce shield amount
+            mod->m_amount -= currentAbsorb;
+            if((*i)->GetHolder()->DropAuraCharge())
+                mod->m_amount = 0;
+            // Need remove it later
+            if (mod->m_amount <=0 )
+                toRemoveSpellList.insert((*i)->GetId());
         }
     }
 
     // Cast back reflect damage spell
-    if (canReflect && reflectSpell)
-    {
-        CastCustomSpell(pCaster, reflectSpell, &reflectDamage, NULL, NULL, true, NULL, reflectTriggeredBy);
-        reflectTriggeredBy->SetInUse(false);                // free lock from deletion
-    }
+    if (canReflect && reflectSpell && !reflectTriggeredBy.IsEmpty(false))
+        CastCustomSpell(pCaster, reflectSpell, &reflectDamage, NULL, NULL, true, NULL, reflectTriggeredBy());
 
     // absorb by mana cost
     AuraList const& vManaShield = GetAurasByType(SPELL_AURA_MANA_SHIELD);
-    for(AuraList::const_iterator i = vManaShield.begin(), next; i != vManaShield.end() && RemainingDamage > 0; i = next)
+    if (!vManaShield.empty())
     {
-        next = i; ++next;
-
-        // check damage school mask
-        if(((*i)->GetModifier()->m_miscvalue & schoolMask)==0)
-            continue;
+        for(AuraList::const_iterator i = vManaShield.begin(), next; i != vManaShield.end() && RemainingDamage > 0; ++i)
+        {
+            // check damage school mask
+            if(((*i)->GetModifier()->m_miscvalue & damageInfo->GetSchoolMask()) == 0)
+                continue;
 
-        int32 currentAbsorb;
-        if (RemainingDamage >= (*i)->GetModifier()->m_amount)
-            currentAbsorb = (*i)->GetModifier()->m_amount;
-        else
-            currentAbsorb = RemainingDamage;
+            int32 currentAbsorb;
+            if (RemainingDamage >= (*i)->GetModifier()->m_amount)
+                currentAbsorb = (*i)->GetModifier()->m_amount;
+            else
+                currentAbsorb = RemainingDamage;
 
-        if (float manaMultiplier = (*i)->GetSpellProto()->EffectMultipleValue[(*i)->GetEffIndex()])
-        {
-            if(Player *modOwner = GetSpellModOwner())
-                modOwner->ApplySpellMod((*i)->GetId(), SPELLMOD_MULTIPLE_VALUE, manaMultiplier);
+            if (float manaMultiplier = (*i)->GetSpellProto()->EffectMultipleValue[(*i)->GetEffIndex()])
+            {
+                if (Player *modOwner = GetSpellModOwner())
+                    modOwner->ApplySpellMod((*i)->GetId(), SPELLMOD_MULTIPLE_VALUE, manaMultiplier);
 
-            int32 maxAbsorb = int32(GetPower(POWER_MANA) / manaMultiplier);
-            if (currentAbsorb > maxAbsorb)
-                currentAbsorb = maxAbsorb;
+                int32 maxAbsorb = int32(GetPower(POWER_MANA) / manaMultiplier);
+                if (currentAbsorb > maxAbsorb)
+                    currentAbsorb = maxAbsorb;
 
-            int32 manaReduction = int32(currentAbsorb * manaMultiplier);
-            ApplyPowerMod(POWER_MANA, manaReduction, false);
-        }
+                int32 manaReduction = int32(currentAbsorb * manaMultiplier);
+                ApplyPowerMod(POWER_MANA, manaReduction, false);
+            }
 
-        // Mana Shield (or Fire Ward or Frost Ward or Ice Barrier)
-        // for Incanter's Absorption converting to spell power
-        if ((*i)->GetSpellProto()->IsFitToFamily(SPELLFAMILY_MAGE, UI64LIT(0x0000000000000000), 0x000008))
-            incanterAbsorption += currentAbsorb;
+            // Mana Shield (or Fire Ward or Frost Ward or Ice Barrier)
+            // for Incanter's Absorption converting to spell power
+            if ((*i)->GetSpellProto()->IsFitToFamily<SPELLFAMILY_MAGE, CF_MAGE_MISC>())
+                incanterAbsorption += currentAbsorb;
 
-        (*i)->GetModifier()->m_amount -= currentAbsorb;
-        if((*i)->GetModifier()->m_amount <= 0)
-        {
-            RemoveAurasDueToSpell((*i)->GetId());
-            next = vManaShield.begin();
+            (*i)->GetModifier()->m_amount -= currentAbsorb;
+            if((*i)->GetModifier()->m_amount <= 0)
+                toRemoveSpellList.insert((*i)->GetId());
+            RemainingDamage -= currentAbsorb;
         }
+    }
 
-        RemainingDamage -= currentAbsorb;
+    // Remove absorb && manashield auras if need
+    if (!toRemoveSpellList.empty())
+    {
+        for (SpellIdSet::const_iterator _i = toRemoveSpellList.begin(); _i != toRemoveSpellList.end(); ++_i)
+            RemoveAurasDueToSpell(*_i, SpellAuraHolderPtr(NULL), AURA_REMOVE_BY_SHIELD_BREAK);
+        toRemoveSpellList.clear();
     }
 
     // effects dependent from full absorb amount
     // Incanter's Absorption, if have affective absorbing
     if (incanterAbsorption)
     {
-        Unit::AuraList const& auras = GetAurasByType(SPELL_AURA_DUMMY);
+        AuraList const& auras = GetAurasByType(SPELL_AURA_DUMMY);
         for (Unit::AuraList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
         {
             SpellEntry const* itr_spellProto = (*itr)->GetSpellProto();
 
             // Incanter's Absorption
             if (itr_spellProto->SpellFamilyName == SPELLFAMILY_GENERIC &&
-                itr_spellProto->SpellIconID == 2941)
+                itr_spellProto->GetSpellIconID() == 2941)
             {
                 int32 amount = int32(incanterAbsorption * (*itr)->GetModifier()->m_amount / 100);
 
@@ -2297,7 +2863,7 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
     }
 
     // only split damage if not damaging yourself
-    if(pCaster != this)
+    if (pCaster != this)
     {
         AuraList const& vSplitDamageFlat = GetAurasByType(SPELL_AURA_SPLIT_DAMAGE_FLAT);
         for(AuraList::const_iterator i = vSplitDamageFlat.begin(), next; i != vSplitDamageFlat.end() && RemainingDamage >= 0; i = next)
@@ -2305,7 +2871,7 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
             next = i; ++next;
 
             // check damage school mask
-            if(((*i)->GetModifier()->m_miscvalue & schoolMask)==0)
+            if(((*i)->GetModifier()->m_miscvalue & damageInfo->GetSchoolMask()) == 0)
                 continue;
 
             // Damage can be splitted only if aura has an alive caster
@@ -2313,23 +2879,34 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
             if(!caster || caster == this || !caster->IsInWorld() || !caster->isAlive())
                 continue;
 
-            int32 currentAbsorb;
+            DamageInfo splitdamageInfo = DamageInfo(pCaster, caster, (*i)->GetSpellProto());
+            splitdamageInfo.CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL);
+            splitdamageInfo.damageType = damageInfo->damageType;
+
             if (RemainingDamage >= (*i)->GetModifier()->m_amount)
-                currentAbsorb = (*i)->GetModifier()->m_amount;
+                splitdamageInfo.damage = (*i)->GetModifier()->m_amount;
             else
-                currentAbsorb = RemainingDamage;
+                splitdamageInfo.damage = RemainingDamage;
 
-            RemainingDamage -= currentAbsorb;
+            RemainingDamage -= splitdamageInfo.damage;
 
+            pCaster->DealDamageMods(&splitdamageInfo);
 
-            uint32 splitted = currentAbsorb;
-            uint32 splitted_absorb = 0;
-            pCaster->DealDamageMods(caster,splitted,&splitted_absorb);
+            splitdamageInfo.procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
 
-            pCaster->SendSpellNonMeleeDamageLog(caster, (*i)->GetSpellProto()->Id, splitted, schoolMask, splitted_absorb, 0, false, 0, false);
+            if (splitdamageInfo.GetAbsorb())
+                splitdamageInfo.procEx |= PROC_EX_ABSORB;
 
-            CleanDamage cleanDamage = CleanDamage(splitted, BASE_ATTACK, MELEE_HIT_NORMAL);
-            pCaster->DealDamage(caster, splitted, &cleanDamage, DIRECT_DAMAGE, schoolMask, (*i)->GetSpellProto(), false);
+            if (splitdamageInfo.damage == 0)
+                splitdamageInfo.procEx &= ~PROC_EX_DIRECT_DAMAGE;
+            else
+                splitdamageInfo.procEx |= PROC_EX_DIRECT_DAMAGE;
+
+            caster->ProcDamageAndSpellFor(true,&splitdamageInfo);
+
+            pCaster->SendSpellNonMeleeDamageLog(caster, (*i)->GetSpellProto()->Id, splitdamageInfo.damage, damageInfo->GetSchoolMask(), splitdamageInfo.GetAbsorb(), 0, false, 0, false);
+            splitdamageInfo.cleanDamage = splitdamageInfo.damage - splitdamageInfo.GetAbsorb();
+            pCaster->DealDamage(caster, &splitdamageInfo, false);
         }
 
         AuraList const& vSplitDamagePct = GetAurasByType(SPELL_AURA_SPLIT_DAMAGE_PCT);
@@ -2338,7 +2915,7 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
             next = i; ++next;
 
             // check damage school mask
-            if(((*i)->GetModifier()->m_miscvalue & schoolMask)==0)
+            if(((*i)->GetModifier()->m_miscvalue & damageInfo->GetSchoolMask()) == 0)
                 continue;
 
             // Damage can be splitted only if aura has an alive caster
@@ -2346,17 +2923,31 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
             if(!caster || caster == this || !caster->IsInWorld() || !caster->isAlive())
                 continue;
 
-            uint32 splitted = uint32(RemainingDamage * (*i)->GetModifier()->m_amount / 100.0f);
+            DamageInfo splitdamageInfo = DamageInfo(pCaster, caster, (*i)->GetSpellProto());
+            splitdamageInfo.CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL);
+            splitdamageInfo.damageType = damageInfo->damageType;
+
+            splitdamageInfo.damage = uint32(RemainingDamage * (*i)->GetModifier()->m_amount / 100.0f);
 
-            RemainingDamage -=  int32(splitted);
+            RemainingDamage -=  int32(splitdamageInfo.damage);
 
-            uint32 split_absorb = 0;
-            pCaster->DealDamageMods(caster,splitted,&split_absorb);
+            pCaster->DealDamageMods(&splitdamageInfo);
 
-            pCaster->SendSpellNonMeleeDamageLog(caster, (*i)->GetSpellProto()->Id, splitted, schoolMask, split_absorb, 0, false, 0, false);
+            splitdamageInfo.procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
 
-            CleanDamage cleanDamage = CleanDamage(splitted, BASE_ATTACK, MELEE_HIT_NORMAL);
-            pCaster->DealDamage(caster, splitted, &cleanDamage, DIRECT_DAMAGE, schoolMask, (*i)->GetSpellProto(), false);
+            if (splitdamageInfo.GetAbsorb())
+                splitdamageInfo.procEx |= PROC_EX_ABSORB;
+
+            if (splitdamageInfo.damage == 0)
+                splitdamageInfo.procEx &= ~PROC_EX_DIRECT_DAMAGE;
+            else
+                splitdamageInfo.procEx |= PROC_EX_DIRECT_DAMAGE;
+
+            caster->ProcDamageAndSpellFor(true,&splitdamageInfo);
+
+            pCaster->SendSpellNonMeleeDamageLog(caster, (*i)->GetSpellProto()->Id, splitdamageInfo.damage, damageInfo->GetSchoolMask(), splitdamageInfo.GetAbsorb(), 0, false, 0, false);
+            splitdamageInfo.cleanDamage = splitdamageInfo.damage - splitdamageInfo.GetAbsorb();
+            pCaster->DealDamage(caster, &splitdamageInfo, false);
         }
     }
 
@@ -2369,10 +2960,10 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
             case SPELLFAMILY_ROGUE:
             {
                 // Cheat Death
-                if (preventDeathSpell->SpellIconID == 2109)
+                if (preventDeathSpell->GetSpellIconID() == 2109)
                 {
                     CastSpell(this,31231,true);
-                    ((Player*)this)->AddSpellCooldown(31231,0,time(NULL)+60);
+                    AddSpellCooldown(31231,0,time(NULL)+60);
                     // with health > 10% lost health until health==10%, in other case no losses
                     uint32 health10 = GetMaxHealth()/10;
                     RemainingDamage = GetHealth() > health10 ? GetHealth() - health10 : 0;
@@ -2383,7 +2974,7 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
             case SPELLFAMILY_PRIEST:
             {
                 // Guardian Spirit
-                if (preventDeathSpell->SpellIconID == 2873)
+                if (preventDeathSpell->GetSpellIconID() == 2873)
                 {
                     int32 healAmount = GetMaxHealth() * preventDeathAmount / 100;
                     CastCustomSpell(this, 48153, &healAmount, NULL, NULL, true);
@@ -2395,10 +2986,36 @@ void Unit::CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolM
         }
     }
 
-    *absorb = damage - RemainingDamage - *resist;
+    if (damageInfo->damage > 0 )
+        damageInfo->procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
+
+    damageInfo->absorb = damageInfo->damage - damageInfo->resist - RemainingDamage - absorb_unaffected_damage;
+
+    if (damageInfo->GetAbsorb())
+    {
+        damageInfo->procEx  |= PROC_EX_ABSORB;
+        damageInfo->HitInfo |= (damageInfo->damage <= damageInfo->GetAbsorb()) ? HITINFO_ABSORB : HITINFO_PARTIAL_ABSORB;
+    }
+
+    if (damageInfo->resist)
+    {
+        damageInfo->procEx  |= PROC_EX_RESIST;
+        damageInfo->HitInfo |= (damageInfo->damage <= damageInfo->resist) ? HITINFO_RESIST : HITINFO_PARTIAL_RESIST;
+    }
+
+    if (damageInfo->damage <= (damageInfo->GetAbsorb() + damageInfo->resist))
+    {
+        damageInfo->damage = 0;
+        damageInfo->procEx &= ~PROC_EX_DIRECT_DAMAGE;
+    }
+    else
+    {
+        damageInfo->damage -= damageInfo->GetAbsorb() + damageInfo->resist;
+        damageInfo->procEx |= PROC_EX_DIRECT_DAMAGE;
+    }
 }
 
-void Unit::CalculateAbsorbResistBlock(Unit *pCaster, SpellNonMeleeDamage *damageInfo, SpellEntry const* spellProto, WeaponAttackType attType)
+void Unit::CalculateAbsorbResistBlock(Unit *pCaster, DamageInfo *damageInfo, SpellEntry const* spellProto, WeaponAttackType attType)
 {
     bool blocked = false;
     // Get blocked status
@@ -2421,9 +3038,7 @@ void Unit::CalculateAbsorbResistBlock(Unit *pCaster, SpellNonMeleeDamage *damage
         damageInfo->damage-=damageInfo->blocked;
     }
 
-    uint32 absorb_affected_damage = pCaster->CalcNotIgnoreAbsorbDamage(damageInfo->damage,GetSpellSchoolMask(spellProto),spellProto);
-    CalculateDamageAbsorbAndResist(pCaster, GetSpellSchoolMask(spellProto), SPELL_DIRECT_DAMAGE, absorb_affected_damage, &damageInfo->absorb, &damageInfo->resist, !spellProto->HasAttribute(SPELL_ATTR_EX2_CANT_REFLECTED));
-    damageInfo->damage-= damageInfo->absorb + damageInfo->resist;
+    CalculateDamageAbsorbAndResist(pCaster, damageInfo, !spellProto->HasAttribute(SPELL_ATTR_EX_CANT_REFLECTED));
 }
 
 void Unit::CalculateHealAbsorb(const uint32 heal, uint32 *absorb)
@@ -2440,7 +3055,7 @@ void Unit::CalculateHealAbsorb(const uint32 heal, uint32 *absorb)
     AuraList const& vHealAbsorb = GetAurasByType(SPELL_AURA_HEAL_ABSORB);
     for(AuraList::const_iterator i = vHealAbsorb.begin(); i != vHealAbsorb.end() && RemainingHeal > 0; ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
+        Modifier const* mod = (*i)->GetModifier();
 
         // Max Amount can be absorbed by this aura
         int32  currentAbsorb = mod->m_amount;
@@ -2475,7 +3090,7 @@ void Unit::CalculateHealAbsorb(const uint32 heal, uint32 *absorb)
         {
             if ((*i)->GetModifier()->m_amount<=0)
             {
-                RemoveAurasDueToSpell((*i)->GetId(), NULL, AURA_REMOVE_BY_SHIELD_BREAK);
+                RemoveAurasDueToSpell((*i)->GetId(), SpellAuraHolderPtr(NULL), AURA_REMOVE_BY_SHIELD_BREAK);
                 i = vHealAbsorb.begin();
             }
             else
@@ -2486,22 +3101,22 @@ void Unit::CalculateHealAbsorb(const uint32 heal, uint32 *absorb)
     *absorb = heal - RemainingHeal;
 }
 
-void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool extra )
+void Unit::AttackerStateUpdate(Unit* pVictim, WeaponAttackType attType, bool extra)
 {
-    if(hasUnitState(UNIT_STAT_CAN_NOT_REACT) || HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED) )
+    if (hasUnitState(UNIT_STAT_CAN_NOT_REACT) || HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED) )
         return;
 
-    if (!pVictim->isAlive())
+    if (!pVictim || !pVictim->isAlive())
         return;
 
-    if(IsNonMeleeSpellCasted(false))
+    if (IsNonMeleeSpellCasted(false))
         return;
 
     uint32 hitInfo;
     if (attType == BASE_ATTACK)
-        hitInfo = HITINFO_NORMALSWING2;
+        hitInfo = HITINFO_AFFECTS_VICTIM;
     else if (attType == OFF_ATTACK)
-        hitInfo = HITINFO_LEFTSWING;
+        hitInfo = HITINFO_OFFHAND;
     else
         return;                                             // ignore ranged case
 
@@ -2518,7 +3133,7 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex
             while(m_extraAttacks)
             {
                 AttackerStateUpdate(pVictim, BASE_ATTACK, true);
-                if(m_extraAttacks > 0)
+                if (m_extraAttacks > 0)
                     --m_extraAttacks;
             }
         }
@@ -2528,20 +3143,21 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex
     // attack can be redirected to another target
     pVictim = SelectMagnetTarget(pVictim);
 
-    CalcDamageInfo damageInfo;
-    CalculateMeleeDamage(pVictim, 0, &damageInfo, attType);
+    DamageInfo damageInfo = DamageInfo(this, pVictim, NULL);
+    damageInfo.CleanDamage(0, 0, attType, MELEE_HIT_NORMAL);
+    damageInfo.damageType = DIRECT_DAMAGE;
+    damageInfo.HitInfo    = hitInfo;
+
+    CalculateMeleeDamage(&damageInfo);
+
     // Send log damage message to client
-    DealDamageMods(pVictim,damageInfo.damage,&damageInfo.absorb);
+    DealDamageMods(&damageInfo);
     SendAttackStateUpdate(&damageInfo);
-    ProcDamageAndSpell(damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, damageInfo.procEx, damageInfo.damage, damageInfo.attackType);
+    ProcDamageAndSpell(&damageInfo);
     DealMeleeDamage(&damageInfo,true);
 
-    if (GetTypeId() == TYPEID_PLAYER)
-        DEBUG_FILTER_LOG(LOG_FILTER_COMBAT,"AttackerStateUpdate: (Player) %u attacked %u (TypeId: %u) for %u dmg, absorbed %u, blocked %u, resisted %u.",
-            GetGUIDLow(), pVictim->GetGUIDLow(), pVictim->GetTypeId(), damageInfo.damage, damageInfo.absorb, damageInfo.blocked_amount, damageInfo.resist);
-    else
-        DEBUG_FILTER_LOG(LOG_FILTER_COMBAT,"AttackerStateUpdate: (NPC)    %u attacked %u (TypeId: %u) for %u dmg, absorbed %u, blocked %u, resisted %u.",
-            GetGUIDLow(), pVictim->GetGUIDLow(), pVictim->GetTypeId(), damageInfo.damage, damageInfo.absorb, damageInfo.blocked_amount, damageInfo.resist);
+    DEBUG_FILTER_LOG(LOG_FILTER_COMBAT,"Unit::AttackerStateUpdate:  %s attacked %s  hit %u att %u for %u dmg, absorbed %u, blocked %u, resisted %u",
+        GetObjectGuid().GetString().c_str(), pVictim->GetObjectGuid().GetString().c_str(), hitInfo, attType, damageInfo.damage, damageInfo.GetAbsorb(), damageInfo.blocked, damageInfo.resist);
 
     // if damage pVictim call AI reaction
     pVictim->AttackedBy(this);
@@ -2552,7 +3168,7 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex
         while(m_extraAttacks)
         {
             AttackerStateUpdate(pVictim, BASE_ATTACK, true);
-            if(m_extraAttacks > 0)
+            if (m_extraAttacks > 0)
                 --m_extraAttacks;
         }
     }
@@ -2581,7 +3197,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit *pVictim, WeaponAttackT
 
 MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const
 {
-    if(pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode())
+    if (pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode())
         return MELEE_HIT_EVADE;
 
     int32 attackerMaxSkillValueForLevel = GetMaxSkillValueForLevel(pVictim);
@@ -2591,24 +3207,23 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
     int32 victimDefenseSkill = pVictim->GetDefenseSkillValue(this);
 
     // bonus from skills is 0.04%
-    int32    skillBonus  = 4 * ( attackerWeaponSkill - victimMaxSkillValueForLevel );
-    int32    sum = 0, tmp = 0;
-    int32    roll = urand (0, 10000);
+    int32 skillBonus  = 4 * (attackerWeaponSkill - victimMaxSkillValueForLevel);
+    int32 sum = 0;
+    int32 roll = urand(0, 10000);
+    int32 tmp = miss_chance;
 
     DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "RollMeleeOutcomeAgainst: skill bonus of %d for attacker", skillBonus);
     DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "RollMeleeOutcomeAgainst: rolled %d, miss %d, dodge %d, parry %d, block %d, crit %d",
         roll, miss_chance, dodge_chance, parry_chance, block_chance, crit_chance);
 
-    tmp = miss_chance;
-
-    if (tmp > 0 && roll < (sum += tmp ))
+    if (tmp > 0 && roll < (sum += tmp))
     {
         DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "RollMeleeOutcomeAgainst: MISS");
         return MELEE_HIT_MISS;
     }
 
     // always crit against a sitting target (except 0 crit chance)
-    if( pVictim->GetTypeId() == TYPEID_PLAYER && crit_chance > 0 && !pVictim->IsStandState() )
+    if ( pVictim->GetTypeId() == TYPEID_PLAYER && crit_chance > 0 && !pVictim->IsStandState() )
     {
         DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "RollMeleeOutcomeAgainst: CRIT (sitting victim)");
         return MELEE_HIT_CRIT;
@@ -2653,7 +3268,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
         else
             parry_chance -= GetTotalAuraModifier(SPELL_AURA_MOD_EXPERTISE)*25;
 
-        if (parry_chance > 0 && (pVictim->GetTypeId()==TYPEID_PLAYER || !(((Creature*)pVictim)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_PARRY)))
+        if (parry_chance > 0 && (pVictim->GetTypeId() == TYPEID_PLAYER || !(((Creature*)pVictim)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_PARRY)))
         {
             parry_chance -= skillBonus;
 
@@ -2670,7 +3285,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
     }
 
     // Max 40% chance to score a glancing blow against mobs that are higher level (can do only players and pets and not with ranged weapon)
-    if( attType != RANGED_ATTACK &&
+    if ( attType != RANGED_ATTACK &&
         (GetTypeId() == TYPEID_PLAYER || ((Creature*)this)->IsPet()) &&
         pVictim->GetTypeId() != TYPEID_PLAYER && !((Creature*)pVictim)->IsPet() &&
         getLevel() < pVictim->GetLevelForTarget(this) )
@@ -2680,7 +3295,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
         int32 maxskill = attackerMaxSkillValueForLevel;
         skill = (skill > maxskill) ? maxskill : skill;
 
-        tmp = (10 + (victimDefenseSkill - skill)) * 100;
+        tmp = (10 + victimDefenseSkill - skill) * 100;
         tmp = tmp > 4000 ? 4000 : tmp;
         if (roll < (sum += tmp))
         {
@@ -2693,7 +3308,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
     // check if attack comes from behind, nobody can parry or block if attacker is behind
     if (!from_behind)
     {
-        if(pVictim->GetTypeId()==TYPEID_PLAYER || !(((Creature*)pVictim)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_BLOCK) )
+        if (pVictim->GetTypeId() == TYPEID_PLAYER || !(((Creature*)pVictim)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_BLOCK))
         {
             tmp = block_chance;
             if (   (tmp > 0)                                    // check if unit _can_ block
@@ -2717,10 +3332,10 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
 
     // mobs can score crushing blows if they're 4 or more levels above victim
     if (GetLevelForTarget(pVictim) >= pVictim->GetLevelForTarget(this) + 4 &&
-        // can be from by creature (if can) or from controlled player that considered as creature
-        ((GetTypeId()!=TYPEID_PLAYER && !((Creature*)this)->IsPet() &&
-        !(((Creature*)this)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_CRUSH)) ||
-        GetTypeId()==TYPEID_PLAYER && GetCharmerOrOwnerGuid()))
+            // can be from by creature (if can) or from controlled player that considered as creature
+            ((GetTypeId() != TYPEID_PLAYER && !((Creature*)this)->IsPet() &&
+              !(((Creature*)this)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_CRUSH)) ||
+             (GetTypeId() == TYPEID_PLAYER && GetCharmerOrOwnerGuid())))
     {
         // when their weapon skill is 15 or more above victim's defense skill
         tmp = victimDefenseSkill;
@@ -2729,7 +3344,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
         tmp = tmp > tmpmax ? tmpmax : tmp;
         // tmp = mob's level * 5 - player's current defense skill
         tmp = attackerMaxSkillValueForLevel - tmp;
-        if(tmp >= 15)
+        if (tmp >= 15)
         {
             // add 2% chance per lacking skill point, min. is 15%
             tmp = tmp * 200 - 1500;
@@ -2745,7 +3360,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
     return MELEE_HIT_NORMAL;
 }
 
-uint32 Unit::CalculateDamage (WeaponAttackType attType, bool normalized)
+uint32 Unit::CalculateDamage(WeaponAttackType attType, bool normalized)
 {
     float min_damage, max_damage;
 
@@ -2767,7 +3382,6 @@ uint32 Unit::CalculateDamage (WeaponAttackType attType, bool normalized)
                 min_damage = GetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE);
                 max_damage = GetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE);
                 break;
-                // Just for good manner
             default:
                 min_damage = 0.0f;
                 max_damage = 0.0f;
@@ -2780,7 +3394,7 @@ uint32 Unit::CalculateDamage (WeaponAttackType attType, bool normalized)
         std::swap(min_damage,max_damage);
     }
 
-    if(max_damage == 0.0f)
+    if (fabs(max_damage) < M_NULL_F)
         max_damage = 5.0f;
 
     return urand((uint32)min_damage, (uint32)max_damage);
@@ -2788,19 +3402,26 @@ uint32 Unit::CalculateDamage (WeaponAttackType attType, bool normalized)
 
 float Unit::CalculateLevelPenalty(SpellEntry const* spellProto) const
 {
-    uint32 spellLevel = spellProto->spellLevel;
-    if(spellLevel <= 0)
+    if(!spellProto->spellLevel || !spellProto->maxLevel)
+        return 1.0f;
+
+    if (spellProto->maxLevel <= 0)
+        return 1.0f;
+    //if caster level is lower that max caster level
+    if (getLevel() < spellProto->maxLevel)
         return 1.0f;
 
     float LvlPenalty = 0.0f;
 
-    if(spellLevel < 20)
-        LvlPenalty = 20.0f - spellLevel * 3.75f;
-    float LvlFactor = (float(spellLevel) + 6.0f) / float(getLevel());
-    if(LvlFactor > 1.0f)
-        LvlFactor = 1.0f;
+    LvlPenalty = (22.0f + float (spellProto->maxLevel) - float (getLevel())) / 20.0f;
+    //to prevent positive effect
+    if (LvlPenalty > 1.0f)
+        return 1.0f;
+    //level penalty is capped at 0
+    if (LvlPenalty < 0.0f)
+        return 0.0f;
 
-    return (100.0f - LvlPenalty) * LvlFactor / 100.0f;
+    return LvlPenalty;
 }
 
 void Unit::SendMeleeAttackStart(Unit* pVictim)
@@ -2810,23 +3431,22 @@ void Unit::SendMeleeAttackStart(Unit* pVictim)
     data << pVictim->GetObjectGuid();
 
     SendMessageToSet(&data, true);
-    DEBUG_LOG( "WORLD: Sent SMSG_ATTACKSTART" );
+    DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "Unit::SendMeleeAttackStart %s start attacking %s", GetObjectGuid().GetString().c_str(), pVictim ? pVictim->GetObjectGuid().GetString().c_str() : "<none>");
 }
 
 void Unit::SendMeleeAttackStop(Unit* victim)
 {
-    if(!victim)
-        return;
-
-    WorldPacket data( SMSG_ATTACKSTOP, (4+16) );            // we guess size
+    WorldPacket data(SMSG_ATTACKSTOP, GetPackGUID().size() + 9 + 4);                                        // we guess size
     data << GetPackGUID();
-    data << victim->GetPackGUID();                          // can be 0x00...
-    data << uint32(0);                                      // can be 0x1
+    data << (victim ? victim->GetPackGUID() : PackedGuid());                           // can be 0x00...
+    data << uint32(0);                                                                 // can be 0x1
     SendMessageToSet(&data, true);
-    DETAIL_FILTER_LOG(LOG_FILTER_COMBAT, "%s %u stopped attacking %s %u", (GetTypeId()==TYPEID_PLAYER ? "player" : "creature"), GetGUIDLow(), (victim->GetTypeId()==TYPEID_PLAYER ? "player" : "creature"),victim->GetGUIDLow());
 
-    /*if(victim->GetTypeId() == TYPEID_UNIT)
-    ((Creature*)victim)->AI().EnterEvadeMode(this);*/
+    if (victim)
+        DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "Unit::SendMeleeAttackStop %s stopped attacking %s", GetObjectGuid().GetString().c_str(), victim ? victim->GetObjectGuid().GetString().c_str() : "<none>");
+
+    /*if (victim->GetTypeId() == TYPEID_UNIT)
+        ((Creature*)victim)->AI().EnterEvadeMode(this);*/
 }
 
 bool Unit::IsSpellBlocked(Unit *pCaster, SpellEntry const *spellEntry, WeaponAttackType attackType)
@@ -2856,7 +3476,7 @@ bool Unit::IsSpellBlocked(Unit *pCaster, SpellEntry const *spellEntry, WeaponAtt
     // Check creatures flags_extra for disable block
     if (GetTypeId() == TYPEID_UNIT)
     {
-        if (((Creature*)this)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_BLOCK)
+        if (((Creature*)this)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_BLOCK)
             return false;
     }
 
@@ -2911,13 +3531,17 @@ float Unit::MeleeSpellMissChance(Unit *pVictim, WeaponAttackType attType, int32
 }
 
 // Melee based spells hit result calculations
-SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
+SpellMissInfo Unit::MeleeSpellHitResult(Unit* pVictim, SpellEntry const* spell)
 {
     WeaponAttackType attType = BASE_ATTACK;
 
     if (spell->DmgClass == SPELL_DAMAGE_CLASS_RANGED)
         attType = RANGED_ATTACK;
 
+    // cannot parry/dodge/miss if melee spell selfcasted
+    if (pVictim && pVictim->GetObjectGuid() == GetObjectGuid())
+        return SPELL_MISS_NONE;
+
     // bonus from skills is 0.04% per skill Diff
     int32 attackerWeaponSkill = (spell->EquippedItemClass == ITEM_CLASS_WEAPON) ? int32(GetWeaponSkillValue(attType,pVictim)) : GetMaxSkillValueForLevel();
     int32 skillDiff = attackerWeaponSkill - int32(pVictim->GetMaxSkillValueForLevel(this));
@@ -2948,21 +3572,23 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
     tmp += resist_mech;
     if (roll < tmp)
         return SPELL_MISS_RESIST;
-
     bool canDodge = true;
     bool canParry = true;
 
     // Same spells cannot be parry/dodge
+    // this - tempfix (need more research and remove)
     if (spell->HasAttribute(SPELL_ATTR_IMPOSSIBLE_DODGE_PARRY_BLOCK))
         return SPELL_MISS_NONE;
 
     bool from_behind = !pVictim->HasInArc(M_PI_F,this);
 
-    // Ranged attack cannot be parry/dodge only deflect
-    if (attType == RANGED_ATTACK)
+    // Ranged attack cannot be parry/dodge, only deflect
+    // Some spells cannot be parry/dodge/blocked, but may be deflected
+    if (spell->HasAttribute(SPELL_ATTR_IMPOSSIBLE_DODGE_PARRY_BLOCK)
+        || attType == RANGED_ATTACK)
     {
         // only if in front or special ability
-        if (!from_behind || pVictim->HasAuraType(SPELL_AURA_MOD_PARRY_FROM_BEHIND_PERCENT))
+        if (!spell->HasAttribute(SPELL_ATTR_EX3_CANT_MISS) && (!from_behind || pVictim->HasAuraType(SPELL_AURA_MOD_PARRY_FROM_BEHIND_PERCENT)))
         {
             int32 deflect_chance = pVictim->GetTotalAuraModifier(SPELL_AURA_DEFLECT_SPELLS)*100;
 
@@ -2987,10 +3613,10 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
             canParry = false;
     }
     // Check creatures flags_extra for disable parry
-    if(pVictim->GetTypeId()==TYPEID_UNIT)
+    if (pVictim->GetTypeId()==TYPEID_UNIT)
     {
-        uint32 flagEx = ((Creature*)pVictim)->GetCreatureInfo()->flags_extra;
-        if( flagEx & CREATURE_FLAG_EXTRA_NO_PARRY )
+        uint32 flagEx = ((Creature*)pVictim)->GetCreatureInfo()->ExtraFlags;
+        if ( flagEx & CREATURE_FLAG_EXTRA_NO_PARRY )
             canParry = false;
     }
     // Ignore combat result aura
@@ -3052,93 +3678,265 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
     return SPELL_MISS_NONE;
 }
 
-// TODO need use unit spell resistances in calculations
-SpellMissInfo Unit::MagicSpellHitResult(Unit *pVictim, SpellEntry const *spell)
+SpellMissInfo Unit::MagicSpellHitResult(Unit* pVictim, SpellEntry const* spell, bool dotDamage/*=false*/)
 {
     // Can`t miss on dead target (on skinning for example)
     if (!pVictim->isAlive())
         return SPELL_MISS_NONE;
 
+    // Impossible miss friendly spells
+    if (!IsNonPositiveSpell(spell) && IsFriendlyTo(pVictim))
+        return SPELL_MISS_NONE;
+
     SpellSchoolMask schoolMask = GetSpellSchoolMask(spell);
     // PvP - PvE spell misschances per leveldif > 2
-    int32 lchance = pVictim->GetTypeId() == TYPEID_PLAYER ? 7 : 11;
-    int32 leveldif = int32(pVictim->GetLevelForTarget(this)) - int32(GetLevelForTarget(pVictim));
+    // int32 lchance = pVictim->GetTypeId() == TYPEID_PLAYER ? 7 : 11;
+    // int32 leveldif = int32(pVictim->GetLevelForTarget(this)) - int32(GetLevelForTarget(pVictim));
 
     // Base hit chance from attacker and victim levels
-    int32 modHitChance;
-    if(leveldif < 3)
-        modHitChance = 96 - leveldif;
-    else
-        modHitChance = 94 - (leveldif - 2) * lchance;
+    int32 modHitChance = CalculateBaseSpellHitChance(pVictim);
 
     // Spellmod from SPELLMOD_RESIST_MISS_CHANCE
-    if(Player *modOwner = GetSpellModOwner())
-        modOwner->ApplySpellMod(spell->Id, SPELLMOD_RESIST_MISS_CHANCE, modHitChance);
+    if (dotDamage || !IsBinaryResistedSpell(spell))
+    {
+        if (Player* modOwner = GetSpellModOwner())
+            modOwner->ApplySpellMod(spell->Id, SPELLMOD_RESIST_MISS_CHANCE, modHitChance);
+    }
+
     // Increase from attacker SPELL_AURA_MOD_INCREASES_SPELL_PCT_TO_HIT auras
-    modHitChance+=GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_INCREASES_SPELL_PCT_TO_HIT, schoolMask);
+    modHitChance += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_INCREASES_SPELL_PCT_TO_HIT, schoolMask);
     // Chance hit from victim SPELL_AURA_MOD_ATTACKER_SPELL_HIT_CHANCE auras
-    modHitChance+= pVictim->GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_ATTACKER_SPELL_HIT_CHANCE, schoolMask);
+    modHitChance += pVictim->GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_ATTACKER_SPELL_HIT_CHANCE, schoolMask);
+
     // Reduce spell hit chance for Area of effect spells from victim SPELL_AURA_MOD_AOE_AVOIDANCE aura
     if (IsAreaOfEffectSpell(spell))
-        modHitChance-=pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_AOE_AVOIDANCE);
+        modHitChance -= pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_AOE_AVOIDANCE);
+
+    int32 HitChance = modHitChance * 100;
+    // Increase hit chance from attacker SPELL_AURA_MOD_SPELL_HIT_CHANCE and attacker ratings
+    HitChance += int32(m_modSpellHitChance * 100.0f);
+
+    // Decrease hit chance from victim rating bonus
+    if (pVictim->GetTypeId() == TYPEID_PLAYER)
+        HitChance -= int32(((Player*)pVictim)->GetRatingBonusValue(CR_HIT_TAKEN_SPELL) * 100.0f);
+
+    if (HitChance < 100)
+        HitChance = 100;
+    else if (HitChance > 10000)
+        HitChance = 10000;
+
+    int32 tmp = spell->HasAttribute(SPELL_ATTR_EX3_CANT_MISS) ? 0 : (10000 - HitChance);
+
+    int32 rand = irand(0, 10000);
+
+    if (rand < tmp)
+        return SPELL_MISS_MISS;
+
+    bool from_behind = !pVictim->HasInArc(M_PI_F, this);
+
+    // cast by caster in front of victim or behind with special ability
+    if (!spell->HasAttribute(SPELL_ATTR_EX3_CANT_MISS) && (!from_behind || pVictim->HasAuraType(SPELL_AURA_MOD_PARRY_FROM_BEHIND_PERCENT)))
+    {
+        int32 deflect_chance = pVictim->GetTotalAuraModifier(SPELL_AURA_DEFLECT_SPELLS) * 100;
+
+        //if (from_behind) -- only 100% currently and not 100% sure way value apply
+        //    deflect_chance = int32(deflect_chance * (pVictim->GetTotalAuraMultiplier(SPELL_AURA_MOD_PARRY_FROM_BEHIND_PERCENT)) - 1);
+
+        tmp += deflect_chance;
+        if (rand < tmp)
+            return SPELL_MISS_DEFLECT;
+    }
+
+    return SPELL_MISS_NONE;
+}
+
+SpellMissInfo Unit::SpellResistResult(Unit* pVictim, SpellEntry const* spellInfo)
+{
+    // Only binary resisted spells calculated here
+    if (!spellInfo || !IsBinaryResistedSpell(spellInfo))
+        return SPELL_MISS_NONE;
+
+    // Can`t resist on dead target
+    if (!pVictim->isAlive())
+        return SPELL_MISS_NONE;
+
+    // Seems as spell this type cannot be resisted. but this may be not true.
+    if (spellInfo->HasAttribute(SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY) || spellInfo->HasAttribute(SPELL_ATTR_EX4_IGNORE_RESISTANCES))
+        return SPELL_MISS_NONE;
+
+    // Spell this type can't be resisted
+    if ((spellInfo->GetSchoolMask() & SPELL_SCHOOL_MASK_NORMAL) || spellInfo->HasAttribute(SPELL_ATTR_EX3_CANT_MISS))
+        return SPELL_MISS_NONE;
+
+    // Impossible resist friendly spells
+    if (!IsNonPositiveSpell(spellInfo) && IsFriendlyTo(pVictim))
+        return SPELL_MISS_NONE;
+
+    // Calculate binary resist chance part 1 - base (by level) resistance + chance modifications.
+    // Source of formulas - http://www.wowwiki.com/Formulas:Magical_resistance
+    int32 modBaseResistChance = CalculateBaseSpellHitChance(pVictim); // "negative" chance == "Not resist chance"
+
+    // Spellmod from SPELLMOD_RESIST_MISS_CHANCE
+    if (Player* modOwner = GetSpellModOwner())
+        modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_RESIST_MISS_CHANCE, modBaseResistChance);
+
+    int32 modResistChance = modBaseResistChance;
+
     // Reduce spell hit chance for dispel mechanic spells from victim SPELL_AURA_MOD_DISPEL_RESIST
-    if (IsDispelSpell(spell))
-        modHitChance-=pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_DISPEL_RESIST);
+    if (IsDispelSpell(spellInfo))
+        modResistChance -= pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_DISPEL_RESIST);
+
     // Chance resist mechanic (select max value from every mechanic spell effect)
     int32 resist_mech = 0;
+
     // Get effects mechanic and chance
-    for(int eff = 0; eff < MAX_EFFECT_INDEX; ++eff)
+    for (uint8 eff = 0; eff < MAX_EFFECT_INDEX; ++eff)
     {
-        int32 effect_mech = GetEffectMechanic(spell, SpellEffectIndex(eff));
+        int32 effect_mech = GetEffectMechanic(spellInfo, SpellEffectIndex(eff));
         if (effect_mech)
         {
             int32 temp = pVictim->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_MECHANIC_RESISTANCE, effect_mech);
             if (resist_mech < temp)
                 resist_mech = temp;
+
+            // crowd control effect, base resistance chance 5%
+            // to be confirmed: is there really base resistance to CC mechanics ?
+            // if ((1 << effect_mech) & IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK && resist_mech < 5)
+            //    resist_mech = 5;
         }
+
+        // Need additional confirmation for next:
+        // if (spell->Effect[eff] == SPELL_EFFECT_APPLY_AURA && IsCrowdControlAura(AuraType(spell->EffectApplyAuraName[eff])))
+        //     resist_mech = 5;
     }
+
     // Apply mod
-    modHitChance-=resist_mech;
+    modResistChance -= resist_mech;
 
     // Chance resist debuff
-    modHitChance-=pVictim->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DEBUFF_RESISTANCE, int32(spell->Dispel));
+    if (spellInfo->HasAttribute(SPELL_ATTR_EX6_NO_STACK_DEBUFF_MAJOR))
+        modResistChance -= pVictim->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DEBUFF_RESISTANCE, int32(spellInfo->Dispel));
+
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Unit::SpellResistResult  calculation part 1 (base - binary/hit resist chance): caster %s, target %s, spell %u, base:%i, mechanic:%i mod:%i",
+        GetObjectGuid().GetString().c_str(),
+        pVictim->GetObjectGuid().GetString().c_str(),
+        spellInfo->Id,
+        modBaseResistChance,
+        resist_mech,
+        modResistChance
+        );
+
+    if (modResistChance <  0)
+        modResistChance =  0;
+    else if (modResistChance > 100)
+        modResistChance = 100;
+
+    int32 rand = irand(0,100);
+
+    if (rand > modResistChance)
+        return SPELL_MISS_RESIST;
 
-    int32 HitChance = modHitChance * 100;
-    // Increase hit chance from attacker SPELL_AURA_MOD_SPELL_HIT_CHANCE and attacker ratings
-    HitChance += int32(m_modSpellHitChance*100.0f);
+    // Part 2 not applyed to holy and melee spells.
+    if (spellInfo->GetSchoolMask() & (SPELL_SCHOOL_MASK_NORMAL | SPELL_SCHOOL_MASK_HOLY))
+        return SPELL_MISS_NONE;
 
-    // Decrease hit chance from victim rating bonus
-    if (pVictim->GetTypeId()==TYPEID_PLAYER)
-        HitChance -= int32(((Player*)pVictim)->GetRatingBonusValue(CR_HIT_TAKEN_SPELL)*100.0f);
+    // Calculate plain resistance chances (binary resistances part 2, formula from http://www.wowwiki.com/Resistance)
+    // http://www.wowwiki.com/Resistance - "Resistance reduces the chance for the binary spell to land by a certain percentage.
+    // Spell hit will not reduce this chance. It is assumed that this percentage is exactly the damage reduction percentage given above."
 
-    if (HitChance <  100) HitChance =  100;
-    if (HitChance > 10000) HitChance = 10000;
+    // Get base resistance values
+    uint32 targetResistance = pVictim->GetResistance(SpellSchoolMask(spellInfo->GetSchoolMask()));
 
-    int32 tmp = spell->HasAttribute(SPELL_ATTR_EX3_CANT_MISS) ? 0 : (10000 - HitChance);
+    uint32 ignoreTargetResistance = GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_TARGET_RESISTANCE, spellInfo->GetSchoolMask());
+    if (targetResistance < ignoreTargetResistance)
+        targetResistance = 0;
+    else
+        targetResistance -= ignoreTargetResistance;
 
-    int32 rand = irand(0,10000);
+    uint32 spellPenetration = (GetTypeId() == TYPEID_PLAYER) ? ((Player*)this)->GetSpellPenetrationItemMod() : 0;
 
-    if (rand < tmp)
-        return SPELL_MISS_MISS;
+    uint32 effectiveRR = targetResistance + std::max(((int)pVictim->GetLevelForTarget(this) - (int)GetLevelForTarget(pVictim)) * 5, 0) - std::min(targetResistance, spellPenetration);
+    uint32 drp = uint32(100.0f * ((float)effectiveRR / (((pVictim->GetLevelForTarget(this) > 80) ? 510.0f : 400.0f) + (float)effectiveRR)));
 
-    bool from_behind = !pVictim->HasInArc(M_PI_F,this);
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Unit::SpellResistResult  calculation part 2 (damage reduction percentage): caster %s, target %s, spell %u, targetResistance:%i, penetration:%u, effectiveRR:%u, DRP:%u",
+        GetObjectGuid().GetString().c_str(),
+        pVictim->GetObjectGuid().GetString().c_str(),
+        spellInfo->Id,
+        targetResistance,
+        spellPenetration,
+        effectiveRR,
+        drp);
 
-    // cast by caster in front of victim or behind with special ability
-    if (!from_behind || pVictim->HasAuraType(SPELL_AURA_MOD_PARRY_FROM_BEHIND_PERCENT))
-    {
-        int32 deflect_chance = pVictim->GetTotalAuraModifier(SPELL_AURA_DEFLECT_SPELLS)*100;
+    // http://www.wowwiki.com/Formulas:Magical_resistance - "Average resistance may be no higher than 75%."
+    if (drp >  75)
+        drp =  75;
 
-        //if (from_behind) -- only 100% currently and not 100% sure way value apply
-        //    deflect_chance = int32(deflect_chance * (pVictim->GetTotalAuraMultiplier(SPELL_AURA_MOD_PARRY_FROM_BEHIND_PERCENT)) - 1);
+    modResistChance = 100 - drp;
 
-        tmp += deflect_chance;
-        if (rand < tmp)
-            return SPELL_MISS_DEFLECT;
-    }
+    rand = irand(0,100);
+
+    if (rand > modResistChance)
+        return SPELL_MISS_RESIST;
 
     return SPELL_MISS_NONE;
 }
 
+uint32 Unit::CalculateBaseSpellHitChance(Unit* pVictim)
+{
+    uint32 result = 0;
+
+    if (!pVictim)
+        return result;
+
+    // Source of formula: http://www.wowwiki.com/Formulas:Magical_resistance (for binary resisted spells only)
+    //                    http://www.wowwiki.com/Spell_hit (for all spells)
+
+    bool isPvP = IsCharmerOrOwnerPlayerOrPlayerItself() && pVictim->IsCharmerOrOwnerPlayerOrPlayerItself();
+
+    int32 levelDiff = int32(pVictim->GetLevelForTarget(this)) - int32(GetLevelForTarget(pVictim));
+    uint32 levelDiffChance = 0;
+
+    switch (levelDiff)
+    {
+        case -4:
+            levelDiffChance = isPvP ? 0 : 0;
+            break;
+        case -3:
+            levelDiffChance = isPvP ? 1 : 1;
+            break;
+        case -2:
+            levelDiffChance = isPvP ? 2 : 2;
+            break;
+        case -1:
+            levelDiffChance = isPvP ? 3 : 3;
+            break;
+        case 0:
+            levelDiffChance = isPvP ? 4 : 4;
+            break;
+        case 1:
+            levelDiffChance = isPvP ? 5 : 5;
+            break;
+        case 2:
+            levelDiffChance = isPvP ? 6 : 6;
+            break;
+        case 3:
+            levelDiffChance = isPvP ? 13 : 17;
+            break;
+        case 4:
+            levelDiffChance = isPvP ? 20 : 28;
+            break;
+        default:
+            levelDiffChance = levelDiff < 0 ? 0 :
+                    (isPvP ? 20 + (levelDiff - 4) * 7 : 28 + (levelDiff - 4) * 11);
+            break;
+    }
+
+    // Base hit chance from attacker and victim levels
+    result = (levelDiffChance > 100) ? 0 : 100 - levelDiffChance;
+
+    return result;
+}
+
 // Calculate spell hit result can be:
 // Every spell can: Evade/Immune/Reflect/Sucesful hit
 // For melee based spells:
@@ -3147,33 +3945,33 @@ SpellMissInfo Unit::MagicSpellHitResult(Unit *pVictim, SpellEntry const *spell)
 //   Parry
 // For spells
 //   Resist
-SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool CanReflect)
+SpellMissInfo Unit::SpellHitResult(Unit* pVictim, SpellEntry const* spell, bool dotDamage/*=false*/)
 {
     // Return evade for units in evade mode
-    if (pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode())
+    if (pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode())
         return SPELL_MISS_EVADE;
 
-    // Check for immune
-    if (pVictim->IsImmuneToSpell(spell))
-        return SPELL_MISS_IMMUNE;
-
-    // All positive spells can`t miss
-    // TODO: client not show miss log for this spells - so need find info for this in dbc and use it!
-    if (IsPositiveSpell(spell->Id))
+    if (IsPositiveSpell(spell) && IsFriendlyTo(pVictim))
         return SPELL_MISS_NONE;
+    else if (!spell->HasAttribute(SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY))
+    {
+        // Check for immune
+        if (IsSpellCauseDamage(spell) && pVictim->IsImmunedToDamage(GetSpellSchoolMask(spell)))
+            return SPELL_MISS_IMMUNE;
 
-    // Check for immune
-    if (pVictim->IsImmunedToDamage(GetSpellSchoolMask(spell)))
-        return SPELL_MISS_IMMUNE;
+        if (pVictim->IsImmuneToSpell(spell, IsFriendlyTo(pVictim)))
+            return SPELL_MISS_IMMUNE;
+    }
 
     // Try victim reflect spell
-    if (CanReflect)
+    if (SpellMgr::IsReflectableSpell(spell))
     {
         int32 reflectchance = pVictim->GetTotalAuraModifier(SPELL_AURA_REFLECT_SPELLS);
         Unit::AuraList const& mReflectSpellsSchool = pVictim->GetAurasByType(SPELL_AURA_REFLECT_SPELLS_SCHOOL);
-        for(Unit::AuraList::const_iterator i = mReflectSpellsSchool.begin(); i != mReflectSpellsSchool.end(); ++i)
-            if((*i)->GetModifier()->m_miscvalue & GetSpellSchoolMask(spell))
+        for (Unit::AuraList::const_iterator i = mReflectSpellsSchool.begin(); i != mReflectSpellsSchool.end(); ++i)
+            if ((*i)->GetModifier()->m_miscvalue & GetSpellSchoolMask(spell))
                 reflectchance += (*i)->GetModifier()->m_amount;
+
         if (reflectchance > 0 && roll_chance_i(reflectchance))
         {
             // Start triggers for remove charges if need (trigger only for victim, and mark as active spell)
@@ -3182,17 +3980,27 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool
         }
     }
 
+    SpellMissInfo hitResult = SPELL_MISS_NONE;
+
     switch (spell->DmgClass)
     {
-        case SPELL_DAMAGE_CLASS_NONE:
-            return SPELL_MISS_NONE;
         case SPELL_DAMAGE_CLASS_MAGIC:
-            return MagicSpellHitResult(pVictim, spell);
+            hitResult = MagicSpellHitResult(pVictim, spell, dotDamage);
+            break;
         case SPELL_DAMAGE_CLASS_MELEE:
         case SPELL_DAMAGE_CLASS_RANGED:
-            return MeleeSpellHitResult(pVictim, spell);
+            hitResult = MeleeSpellHitResult(pVictim, spell);
+            break;
+        case SPELL_DAMAGE_CLASS_NONE:
+        default:
+            hitResult = SPELL_MISS_NONE;
+            break;
     }
-    return SPELL_MISS_NONE;
+
+    if (dotDamage)
+        return hitResult;
+
+    return (hitResult != SPELL_MISS_NONE) ? hitResult : SpellResistResult(pVictim, spell);
 }
 
 float Unit::MeleeMissChanceCalc(const Unit *pVictim, WeaponAttackType attType) const
@@ -3247,7 +4055,7 @@ float Unit::MeleeMissChanceCalc(const Unit *pVictim, WeaponAttackType attType) c
     }
 
     // Modify miss chance by victim auras
-    if(attType == RANGED_ATTACK)
+    if (attType == RANGED_ATTACK)
         missChance -= pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_RANGED_HIT_CHANCE);
     else
         missChance -= pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_MELEE_HIT_CHANCE);
@@ -3263,7 +4071,7 @@ float Unit::MeleeMissChanceCalc(const Unit *pVictim, WeaponAttackType attType) c
 
 uint32 Unit::GetDefenseSkillValue(Unit const* target) const
 {
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         // in PvP use full skill instead current skill value
         uint32 value = (target && target->GetTypeId() == TYPEID_PLAYER)
@@ -3278,9 +4086,9 @@ uint32 Unit::GetDefenseSkillValue(Unit const* target) const
 
 float Unit::GetUnitDodgeChance() const
 {
-    if(hasUnitState(UNIT_STAT_STUNNED))
+    if (hasUnitState(UNIT_STAT_STUNNED))
         return 0.0f;
-    if( GetTypeId() == TYPEID_PLAYER )
+    if ( GetTypeId() == TYPEID_PLAYER )
         return GetFloatValue(PLAYER_DODGE_PERCENTAGE);
     else
     {
@@ -3302,22 +4110,22 @@ float Unit::GetUnitParryChance() const
 
     float chance = 0.0f;
 
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         Player const* player = (Player const*)this;
-        if(player->CanParry() )
+        if (player->CanParry() )
         {
             Item *tmpitem = player->GetWeaponForAttack(BASE_ATTACK,true,true);
             if(!tmpitem)
                 tmpitem = player->GetWeaponForAttack(OFF_ATTACK,true,true);
 
-            if(tmpitem)
+            if (tmpitem)
                 chance = GetFloatValue(PLAYER_PARRY_PERCENTAGE);
         }
     }
-    else if(GetTypeId() == TYPEID_UNIT)
+    else if (GetTypeId() == TYPEID_UNIT)
     {
-        if(GetCreatureType() == CREATURE_TYPE_HUMANOID)
+        if (GetCreatureType() == CREATURE_TYPE_HUMANOID)
         {
             chance = 5.0f;
             chance += GetTotalAuraModifier(SPELL_AURA_MOD_PARRY_PERCENT);
@@ -3332,13 +4140,13 @@ float Unit::GetUnitBlockChance() const
     if ( IsNonMeleeSpellCasted(false) || hasUnitState(UNIT_STAT_STUNNED))
         return 0.0f;
 
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         Player const* player = (Player const*)this;
-        if(player->CanBlock() && player->CanUseEquippedWeapon(OFF_ATTACK))
+        if (player->CanBlock() && player->CanUseEquippedWeapon(OFF_ATTACK))
         {
             Item *tmpitem = player->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
-            if(tmpitem && !tmpitem->IsBroken() && tmpitem->GetProto()->Block)
+            if (tmpitem && !tmpitem->IsBroken() && tmpitem->GetProto()->Block)
                 return GetFloatValue(PLAYER_BLOCK_PERCENTAGE);
         }
         // is player but has no block ability or no not broken shield equipped
@@ -3361,7 +4169,7 @@ float Unit::GetUnitCriticalChance(WeaponAttackType attackType, const Unit *pVict
 {
     float crit;
 
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         switch(attackType)
         {
@@ -3387,7 +4195,7 @@ float Unit::GetUnitCriticalChance(WeaponAttackType attackType, const Unit *pVict
     }
 
     // flat aura mods
-    if(attackType == RANGED_ATTACK)
+    if (attackType == RANGED_ATTACK)
         crit += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_CHANCE);
     else
         crit += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_CHANCE);
@@ -3411,15 +4219,15 @@ float Unit::GetUnitCriticalChance(WeaponAttackType attackType, const Unit *pVict
 uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target) const
 {
     uint32 value = 0;
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         Item* item = ((Player*)this)->GetWeaponForAttack(attType,true,true);
 
         // feral or unarmed skill only for base attack
-        if(attType != BASE_ATTACK && !item )
+        if (attType != BASE_ATTACK && !item )
             return 0;
 
-        if(IsInFeralForm())
+        if (IsInFeralForm())
             return GetMaxSkillValueForLevel();              // always maximized SKILL_FERAL_COMBAT in fact
 
         // weapon skill or (unarmed for base attack)
@@ -3436,6 +4244,7 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target)
             case BASE_ATTACK:   value+=uint32(((Player*)this)->GetRatingBonusValue(CR_WEAPON_SKILL_MAINHAND));break;
             case OFF_ATTACK:    value+=uint32(((Player*)this)->GetRatingBonusValue(CR_WEAPON_SKILL_OFFHAND));break;
             case RANGED_ATTACK: value+=uint32(((Player*)this)->GetRatingBonusValue(CR_WEAPON_SKILL_RANGED));break;
+            default: break;
         }
     }
     else
@@ -3445,7 +4254,8 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target)
 
 void Unit::_UpdateSpells( uint32 time )
 {
-    if(m_currentSpells[CURRENT_AUTOREPEAT_SPELL])
+
+    if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL])
         _UpdateAutoRepeatSpell();
 
     // remove finished spells from current pointers
@@ -3457,28 +4267,38 @@ void Unit::_UpdateSpells( uint32 time )
             m_currentSpells[i] = NULL;                      // remove pointer
         }
     }
-
+    std::queue<SpellAuraHolderPtr> updateQueue;
     // update auras
-    // m_AurasUpdateIterator can be updated in inderect called code at aura remove to skip next planned to update but removed auras
-    for (m_spellAuraHoldersUpdateIterator = m_spellAuraHolders.begin(); m_spellAuraHoldersUpdateIterator != m_spellAuraHolders.end();)
     {
-        SpellAuraHolder* i_holder = m_spellAuraHoldersUpdateIterator->second;
-        ++m_spellAuraHoldersUpdateIterator;                            // need shift to next for allow update if need into aura update
-        i_holder->UpdateHolder(time);
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        for (SpellAuraHolderMap::const_iterator itr = m_spellAuraHolders.begin(); itr != m_spellAuraHolders.end(); ++itr)
+            if (itr->second && !itr->second->IsDeleted())
+                updateQueue.push(itr->second);
+
     }
 
-    // remove expired auras
-    for (SpellAuraHolderMap::iterator iter = m_spellAuraHolders.begin(); iter != m_spellAuraHolders.end();)
+    while(!updateQueue.empty())
     {
-        SpellAuraHolder *holder = iter->second;
+        if (updateQueue.front() && !updateQueue.front()->IsDeleted())
+            updateQueue.front()->UpdateHolder(time);
+        updateQueue.pop();
+    }
 
-        if (!(holder->IsPermanent() || holder->IsPassive()) && holder->GetAuraDuration() == 0)
-        {
-            RemoveSpellAuraHolder(holder, AURA_REMOVE_BY_EXPIRE);
-            iter = m_spellAuraHolders.begin();
-        }
-        else
-            ++iter;
+    // remove expired auras, cleanup empty holders
+    {
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        for (SpellAuraHolderMap::const_iterator itr = m_spellAuraHolders.begin(); itr != m_spellAuraHolders.end(); ++itr)
+            if (itr->second && !itr->second->IsDeleted()
+                && !(itr->second->IsPermanent() || itr->second->IsPassive())
+                && ((itr->second->GetAuraDuration() == 0) || itr->second->IsEmptyHolder()))
+                updateQueue.push(itr->second);
+    }
+
+    while(!updateQueue.empty())
+    {
+        if (updateQueue.front() && !updateQueue.front()->IsDeleted())
+            RemoveSpellAuraHolder(updateQueue.front(), AURA_REMOVE_BY_EXPIRE);
+        updateQueue.pop();
     }
 
     if(!m_gameObj.empty())
@@ -3488,7 +4308,7 @@ void Unit::_UpdateSpells( uint32 time )
         {
             dnext1 = ite1;
             //(*i)->Update( difftime );
-            if( !(*ite1)->isSpawned() )
+            if ( !(*ite1)->isSpawned() )
             {
                 (*ite1)->SetOwnerGuid(ObjectGuid());
                 (*ite1)->SetRespawnTime(0);
@@ -3533,7 +4353,7 @@ void Unit::_UpdateAutoRepeatSpell()
     if (isAttackReady(RANGED_ATTACK))
     {
         // Check if able to cast
-        if(m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->CheckCast(true) != SPELL_CAST_OK)
+        if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->CheckCast(true) != SPELL_CAST_OK)
         {
             InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
             return;
@@ -3625,10 +4445,16 @@ void Unit::InterruptSpell(CurrentSpellTypes spellType, bool withDelayed, bool se
 
     if (m_currentSpells[spellType] && (withDelayed || m_currentSpells[spellType]->getState() != SPELL_STATE_DELAYED) )
     {
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST,"Unit::InterruptSpell %s try interrupt spell %u, type %u, state %u",
+                GetObjectGuid().GetString().c_str(),
+                m_currentSpells[spellType]->m_spellInfo->Id,
+                spellType,
+                m_currentSpells[spellType]->getState());
+
         // send autorepeat cancel message for autorepeat spells
         if (spellType == CURRENT_AUTOREPEAT_SPELL && sendAutoRepeatCancelToClient)
         {
-            if(GetTypeId() == TYPEID_PLAYER)
+            if (GetTypeId() == TYPEID_PLAYER)
                 ((Player*)this)->SendAutoRepeatCancel(this);
         }
 
@@ -3656,9 +4482,11 @@ void Unit::FinishSpell(CurrentSpellTypes spellType, bool ok /*= true*/)
     spell->finish(ok);
 }
 
-
 bool Unit::IsNonMeleeSpellCasted(bool withDelayed, bool skipChanneled, bool skipAutorepeat) const
 {
+    if (!IsInWorld())
+        return false;
+
     // We don't do loop here to explicitly show that melee spell is excluded.
     // Maybe later some special spells will be excluded too.
 
@@ -3666,7 +4494,10 @@ bool Unit::IsNonMeleeSpellCasted(bool withDelayed, bool skipChanneled, bool skip
     if (m_currentSpells[CURRENT_GENERIC_SPELL] &&
         (m_currentSpells[CURRENT_GENERIC_SPELL]->getState() != SPELL_STATE_FINISHED) &&
         (withDelayed || m_currentSpells[CURRENT_GENERIC_SPELL]->getState() != SPELL_STATE_DELAYED))
-        return true;
+    {
+        if (!m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->HasAttribute(SPELL_ATTR_EX2_NOT_RESET_AUTOSHOT))
+            return true;
+    }
 
     // channeled spells may be delayed, but they are still considered casted
     else if (!skipChanneled && m_currentSpells[CURRENT_CHANNELED_SPELL] &&
@@ -3710,7 +4541,7 @@ void Unit::SetInFront(Unit const* target)
 
 void Unit::SetFacingTo(float ori)
 {
-    Movement::MoveSplineInit init(*this);
+    Movement::MoveSplineInit<Unit*> init(*this);
     init.SetFacing(ori);
     init.Launch();
 }
@@ -3725,12 +4556,34 @@ void Unit::SetFacingToObject(WorldObject* pObject)
     SetFacingTo(GetAngle(pObject));
 }
 
-bool Unit::isInAccessablePlaceFor(Creature const* c) const
+bool Unit::isInAccessablePlaceFor(Unit const* unit) const
 {
-    if(IsInWater())
-        return c->CanSwim();
-    else
-        return c->CanWalk() || c->CanFly();
+    if (!unit)
+        return false;
+
+    if (!IsInMap(unit))
+        return false;
+
+    if (!IsWithinDistInMap(unit, GetMap()->GetVisibilityDistance()))
+        return false;
+
+    if (unit->GetObjectGuid().IsAnyTypeCreature())
+    {
+        float targetReach = ((Creature*)unit)->GetReachDistance(this);
+        if (IsWithinDistInMap(unit, targetReach, true))
+            return true;
+
+        if (IsInWater() || IsUnderWater())
+            return ((Creature*)unit)->CanSwim();
+        else if (IsLevitating())
+            return (unit->IsLevitating() || ((Creature*)unit)->CanFly());
+        else if (GetTypeId() == TYPEID_PLAYER && ((Player*)this)->IsFlying())
+            return (unit->IsLevitating() || ((Creature*)unit)->CanFly());
+        else
+            return ((Creature*)unit)->CanWalk() || ((Creature*)unit)->CanFly();
+    }
+
+    return true;
 }
 
 bool Unit::IsInWater() const
@@ -3751,44 +4604,68 @@ void Unit::DeMorph()
 int32 Unit::GetTotalAuraModifier(AuraType auratype) const
 {
     int32 modifier = 0;
+    int32 nonStackingPos = 0;
+    int32 nonStackingNeg = 0;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
-        modifier += (*i)->GetModifier()->m_amount;
+    {
+        if((*i)->IsStacking())
+            modifier += (*i)->GetModifier()->m_amount;
+        else
+        {
+            if((*i)->GetModifier()->m_amount > nonStackingPos)
+                nonStackingPos = (*i)->GetModifier()->m_amount;
+            else if((*i)->GetModifier()->m_amount < nonStackingNeg)
+                nonStackingNeg = (*i)->GetModifier()->m_amount;
+        }
+    }
 
-    return modifier;
+    return modifier + nonStackingPos + nonStackingNeg;
 }
 
 float Unit::GetTotalAuraMultiplier(AuraType auratype) const
 {
     float multiplier = 1.0f;
+    float nonStackingPos = 0.0f;
+    float nonStackingNeg = 0.0f;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
-        multiplier *= (100.0f + (*i)->GetModifier()->m_amount)/100.0f;
+    {
+        if((*i)->IsStacking())
+            multiplier *= (100.0f + (*i)->GetModifier()->m_amount)/100.0f;
+        else
+        {
+            if((*i)->GetModifier()->m_amount > nonStackingPos)
+                nonStackingPos = (*i)->GetModifier()->m_amount;
+            else if((*i)->GetModifier()->m_amount < nonStackingNeg)
+                nonStackingNeg = (*i)->GetModifier()->m_amount;
+        }
+    }
 
-    return multiplier;
+    return multiplier * (100.0f + nonStackingPos)/100.0f * (100.0f + nonStackingNeg)/100.0f;
 }
 
-int32 Unit::GetMaxPositiveAuraModifier(AuraType auratype) const
+int32 Unit::GetMaxPositiveAuraModifier(AuraType auratype, bool nonStackingOnly) const
 {
     int32 modifier = 0;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
-        if ((*i)->GetModifier()->m_amount > modifier)
+        if (!(nonStackingOnly && (*i)->IsStacking()) && (*i)->GetModifier()->m_amount > modifier)
             modifier = (*i)->GetModifier()->m_amount;
 
     return modifier;
 }
 
-int32 Unit::GetMaxNegativeAuraModifier(AuraType auratype) const
+int32 Unit::GetMaxNegativeAuraModifier(AuraType auratype, bool nonStackingOnly) const
 {
     int32 modifier = 0;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
-        if ((*i)->GetModifier()->m_amount < modifier)
+        if (!(nonStackingOnly && (*i)->IsStacking()) && (*i)->GetModifier()->m_amount < modifier)
             modifier = (*i)->GetModifier()->m_amount;
 
     return modifier;
@@ -3800,15 +4677,37 @@ int32 Unit::GetTotalAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask)
         return 0;
 
     int32 modifier = 0;
+    int32 nonStackingPos = 0;
+    int32 nonStackingNeg = 0;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
+        Modifier const* mod = (*i)->GetModifier();
+
+        if (auratype == SPELL_AURA_MOD_DAMAGE_DONE)
+        {
+            if ((*i)->GetSpellProto()->EquippedItemClass != -1 ||               // -1 == any item class (not wand then)
+                (*i)->GetSpellProto()->EquippedItemInventoryTypeMask != 0)      //  0 == any inventory type (not wand then)
+            {
+                continue;
+            }
+        }
+
         if (mod->m_miscvalue & misc_mask)
-            modifier += mod->m_amount;
-    }
-    return modifier;
+        {
+            if((*i)->IsStacking())
+                modifier += mod->m_amount;
+            else
+            {
+                if(mod->m_amount > nonStackingPos)
+                    nonStackingPos = mod->m_amount;
+                else if(mod->m_amount < nonStackingNeg)
+                    nonStackingNeg = mod->m_amount;
+            }
+        }
+     }
+    return modifier + nonStackingPos + nonStackingNeg;
 }
 
 float Unit::GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask) const
@@ -3817,18 +4716,30 @@ float Unit::GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask
         return 1.0f;
 
     float multiplier = 1.0f;
+    float nonStackingPos = 0.0f;
+    float nonStackingNeg = 0.0f;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
+        Modifier const* mod = (*i)->GetModifier();
         if (mod->m_miscvalue & misc_mask)
-            multiplier *= (100.0f + mod->m_amount)/100.0f;
+        {
+            if((*i)->IsStacking())
+                multiplier *= (100.0f + mod->m_amount)/100.0f;
+            else
+            {
+                if(mod->m_amount > nonStackingPos)
+                    nonStackingPos = mod->m_amount;
+                else if(mod->m_amount < nonStackingNeg)
+                    nonStackingNeg = mod->m_amount;
+            }
+        }
     }
-    return multiplier;
+    return multiplier * (100.0f + nonStackingPos)/100.0f * (100.0f + nonStackingNeg)/100.0f;
 }
 
-int32 Unit::GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const
+int32 Unit::GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask, bool nonStackingOnly) const
 {
     if(!misc_mask)
         return 0;
@@ -3838,15 +4749,15 @@ int32 Unit::GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
-        if (mod->m_miscvalue & misc_mask && mod->m_amount > modifier)
+        Modifier const* mod = (*i)->GetModifier();
+        if (!(nonStackingOnly && (*i)->IsStacking()) && (mod->m_miscvalue & misc_mask) && mod->m_amount > modifier)
             modifier = mod->m_amount;
     }
 
     return modifier;
 }
 
-int32 Unit::GetMaxNegativeAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const
+int32 Unit::GetMaxNegativeAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask, bool nonStackingOnly) const
 {
     if(!misc_mask)
         return 0;
@@ -3856,8 +4767,8 @@ int32 Unit::GetMaxNegativeAuraModifierByMiscMask(AuraType auratype, uint32 misc_
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
-        if (mod->m_miscvalue & misc_mask && mod->m_amount < modifier)
+        Modifier const* mod = (*i)->GetModifier();
+        if (!(nonStackingOnly && (*i)->IsStacking()) && (mod->m_miscvalue & misc_mask) && mod->m_amount < modifier)
             modifier = mod->m_amount;
     }
 
@@ -3867,55 +4778,73 @@ int32 Unit::GetMaxNegativeAuraModifierByMiscMask(AuraType auratype, uint32 misc_
 int32 Unit::GetTotalAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const
 {
     int32 modifier = 0;
+    int32 nonStackingPos = 0;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
+        Modifier const* mod = (*i)->GetModifier();
         if (mod->m_miscvalue == misc_value)
-            modifier += mod->m_amount;
+        {
+            if((*i)->IsStacking())
+                modifier += mod->m_amount;
+            else
+            {
+                if(mod->m_amount > nonStackingPos)
+                    nonStackingPos = mod->m_amount;
+            }
+        }
     }
-    return modifier;
+    return modifier + nonStackingPos;
 }
 
 float Unit::GetTotalAuraMultiplierByMiscValue(AuraType auratype, int32 misc_value) const
 {
     float multiplier = 1.0f;
+    float nonStackingPos = 0.0f;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
+        Modifier const* mod = (*i)->GetModifier();
         if (mod->m_miscvalue == misc_value)
-            multiplier *= (100.0f + mod->m_amount)/100.0f;
+        {
+            if((*i)->IsStacking())
+                multiplier *= (100.0f + mod->m_amount)/100.0f;
+            else
+            {
+                if(mod->m_amount > nonStackingPos)
+                    nonStackingPos = mod->m_amount;
+            }
+        }
     }
-    return multiplier;
+    return multiplier * (100.0f + nonStackingPos)/100.0f;
 }
 
-int32 Unit::GetMaxPositiveAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const
+int32 Unit::GetMaxPositiveAuraModifierByMiscValue(AuraType auratype, int32 misc_value, bool nonStackingOnly) const
 {
     int32 modifier = 0;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
-        if (mod->m_miscvalue == misc_value && mod->m_amount > modifier)
+        Modifier const* mod = (*i)->GetModifier();
+        if (!(nonStackingOnly && (*i)->IsStacking()) && mod->m_amount > modifier && mod->m_miscvalue == misc_value)
             modifier = mod->m_amount;
     }
 
     return modifier;
 }
 
-int32 Unit::GetMaxNegativeAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const
+int32 Unit::GetMaxNegativeAuraModifierByMiscValue(AuraType auratype, int32 misc_value, bool nonStackingOnly) const
 {
     int32 modifier = 0;
 
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
-        if (mod->m_miscvalue == misc_value && mod->m_amount < modifier)
+        Modifier const* mod = (*i)->GetModifier();
+        if (!(nonStackingOnly && (*i)->IsStacking()) && mod->m_miscvalue == misc_value && mod->m_amount < modifier)
             modifier = mod->m_amount;
     }
 
@@ -3929,75 +4858,280 @@ float Unit::GetTotalAuraMultiplierByMiscValueForMask(AuraType auratype, uint32 m
 
     float multiplier = 1.0f;
 
+    int32 nonStackingPos = 0;
+    int32 nonStackingNeg = 0;
+
     AuraList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
-        Modifier* mod = (*i)->GetModifier();
+        Modifier const* mod = (*i)->GetModifier();
+
         if (mask & (1 << (mod->m_miscvalue -1)))
-            multiplier *= (100.0f + mod->m_amount)/100.0f;
+        {
+            if((*i)->IsStacking())
+            {
+                multiplier *= (100.0f + mod->m_amount)/100.0f;
+            }
+            else
+            {
+                if(mod->m_amount > nonStackingPos)
+                    nonStackingPos = mod->m_amount;
+                else if(mod->m_amount < nonStackingNeg)
+                    nonStackingNeg = mod->m_amount;
+            }
+        }
     }
-    return multiplier;
+
+    return multiplier * ((nonStackingPos + 100.0f) / 100.0f) * ((nonStackingNeg + 100.0f) / 100.0f);
 }
 
-bool Unit::AddSpellAuraHolder(SpellAuraHolder *holder)
+float Unit::CheckAuraStackingAndApply(Aura* aura, UnitMods unitMod, UnitModifierType modifierType, float amount, bool apply, int32 miscMask, int32 miscValue)
 {
-    SpellEntry const* aurSpellInfo = holder->GetSpellProto();
+    // not apply values below 1% (rounding errors?)
+    if (!aura || fabs(amount) < M_NULL_F)
+        return 0.0f;
 
-    // ghost spell check, allow apply any auras at player loading in ghost mode (will be cleanup after load)
-    if( !isAlive() && !IsDeathPersistentSpell(aurSpellInfo) &&
-        !IsDeathOnlySpell(aurSpellInfo) &&
-        (GetTypeId()!=TYPEID_PLAYER || !((Player*)this)->GetSession()->PlayerLoading()) )
-    {
-        delete holder;
-        return false;
-    }
+    SpellEntry const *spellProto = aura->GetSpellProto();
 
-    if(holder->GetTarget() != this)
+    if (!aura->IsStacking())
     {
-        sLog.outError("Holder (spell %u) add to spell aura holder list of %s (lowguid: %u) but spell aura holder target is %s (lowguid: %u)",
-            holder->GetId(),(GetTypeId()==TYPEID_PLAYER?"player":"creature"),GetGUIDLow(),
-            (holder->GetTarget()->GetTypeId()==TYPEID_PLAYER?"player":"creature"),holder->GetTarget()->GetGUIDLow());
-        delete holder;
-        return false;
-    }
+        bool bIsPositive = amount >= M_NULL_F;
 
-    // passive and persistent auras can stack with themselves any number of times
-    if ((!holder->IsPassive() && !holder->IsPersistent()) || holder->IsAreaAura())
-    {
-        SpellAuraHolderBounds spair = GetSpellAuraHolderBounds(aurSpellInfo->Id);
+        if (modifierType == TOTAL_VALUE)
+            modifierType = bIsPositive ? NONSTACKING_VALUE_POS : NONSTACKING_VALUE_NEG;
+        else if(modifierType == TOTAL_PCT)
+            modifierType = NONSTACKING_PCT;
 
-        // take out same spell
-        for (SpellAuraHolderMap::iterator iter = spair.first; iter != spair.second; ++iter)
+        float current = GetModifierValue(unitMod, modifierType);
+
+        // need a sanity check here?
+
+        // special case: minor and major categories for armor reduction debuffs
+        // TODO: find some better way of dividing to categories
+        if (aura->GetModifier()->m_auraname == SPELL_AURA_MOD_RESISTANCE_PCT &&
+            (aura->GetId() == 770 ||                                              // Faerie Fire
+            spellProto->IsFitToFamily<SPELLFAMILY_HUNTER, CF_HUNTER_PET_SPELLS>() ||            // Sting (Hunter Pet)
+            spellProto->IsFitToFamily<SPELLFAMILY_WARLOCK, CF_WARLOCK_CURSE_OF_WEAKNESS>()))    // Curse of Weakness
+        {
+            modifierType = NONSTACKING_PCT_MINOR;
+        }
+
+        if ((bIsPositive && amount < (current - M_NULL_F)) ||               // value does not change as a result of applying/removing this aura
+            (!bIsPositive && amount > (current + M_NULL_F)))
+        {
+            return 0.0f;
+        }
+
+        if (!apply)                                          // aura removed is the aura that is currently in effect, must find second highest nonstacking aura's m_amount
+        {
+            if (miscMask)
+            {
+                if (bIsPositive)
+                    amount = (float)GetMaxPositiveAuraModifierByMiscMask(aura->GetModifier()->m_auraname, miscMask, true);
+                else
+                    amount = (float)GetMaxNegativeAuraModifierByMiscMask(aura->GetModifier()->m_auraname, miscMask, true);
+            }
+            else if(miscValue)
+            {
+                if (bIsPositive)
+                    amount = (float)GetMaxPositiveAuraModifierByMiscValue(aura->GetModifier()->m_auraname, miscValue-1, true);
+                else
+                    amount = (float)GetMaxNegativeAuraModifierByMiscValue(aura->GetModifier()->m_auraname, miscValue-1, true);
+            }
+            else
+            {
+                if (bIsPositive)
+                    amount = (float)GetMaxPositiveAuraModifier(aura->GetModifier()->m_auraname, true);
+                else
+                    amount = (float)GetMaxNegativeAuraModifier(aura->GetModifier()->m_auraname, true);
+            }
+        }
+        // not apply values below 1% (rounding errors?)
+        if (fabs(amount) < M_NULL_F)
+            amount = 0.0f;
+
+        HandleStatModifier(unitMod, modifierType, amount, apply);
+
+        if (modifierType == NONSTACKING_VALUE_POS || modifierType == NONSTACKING_VALUE_NEG)
+            amount -= current;
+        else
+        {
+            if (apply)
+                amount = ((100.0f + amount) / (100.0f + current) - 1.0f) * 100.0f;
+            else
+                amount = ((100.0f + current) / (100.0f + amount) - 1.0f) * 100.0f;
+        }
+    }
+    else
+        HandleStatModifier(unitMod, modifierType, amount, apply);
+
+    return amount;
+}
+
+float Unit::GetTotalAuraScriptedMultiplierForDamageTaken(SpellEntry const* spellProto) const
+{
+    // spellProto may be NULL for melee damage
+    float multiplier = 1.0f;
+
+    AuraList const& dummyAuras = GetAurasByType(SPELL_AURA_DUMMY);
+    if (!dummyAuras.empty())
+    {
+        for(AuraList::const_iterator itr = dummyAuras.begin(); itr != dummyAuras.end(); ++itr)
+        {
+            switch ((*itr)->GetId())
+            {
+                case 20911:                                     // Blessing of Sanctuary
+                case 25899:                                     // Greater Blessing of Sanctuary
+                {
+                                                                // don't stack with Vigilance dmg reduction effect
+                    if (!HasAura(68066))
+                        multiplier *= ((float)(*itr)->GetModifier()->m_amount + 100.0f) / 100.0f;
+                    break;
+                }
+                case 45182:                                     // Cheating Death
+                {
+                    if ((*itr)->GetModifier()->m_miscvalue & GetSpellSchoolMask(spellProto))
+                    {
+                        if (GetTypeId() != TYPEID_PLAYER)
+                            continue;
+
+                        float mod = std::min((((Player const*)this)->GetRatingBonusValue(CR_CRIT_TAKEN_MELEE)*(-8.0f)), (float)(*itr)->GetModifier()->m_amount);
+                        multiplier *= (mod + 100.0f) / 100.0f;
+                    }
+                    break;
+                }
+                case 47580:                                     // Pain and Suffering (Rank 1)      TODO: can be pct modifier aura
+                case 47581:                                     // Pain and Suffering (Rank 2)
+                case 47582:                                     // Pain and Suffering (Rank 3)
+                {
+                    // Shadow Word: Death
+                    if (spellProto && spellProto->IsFitToFamily<SPELLFAMILY_PRIEST, CF_PRIEST_SHADOW_WORD_DEATH_TARGET>())
+                        multiplier *= ((float)(*itr)->GetModifier()->m_amount + 100.0f) / 100.0f;
+                    break;
+                }
+                case 63944:                                     // Renewed Hope
+                {
+                    multiplier *= ((float)(*itr)->GetModifier()->m_amount + 100.0f) / 100.0f;
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+    }
+
+    // possible need implement stacking rule in this case.
+    return multiplier;
+}
+
+float Unit::GetTotalAuraScriptedMultiplierForDamageDone(SpellEntry const* spellProto) const
+{
+    // spellProto may be NULL for melee damage
+    float multiplier = 1.0f;
+    return multiplier;
+}
+
+bool Unit::AddSpellAuraHolder(SpellAuraHolderPtr holder)
+{
+    if (!holder || holder->IsDeleted())
+        return false;
+
+    // Check for already existing
+    {
+        SpellAuraHolderBounds spair = GetSpellAuraHolderBounds(holder->GetId());
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        for (SpellAuraHolderMap::const_iterator iter = spair.first; iter != spair.second; ++iter)
+        {
+            if (iter->second == holder)
+            {
+                sLog.outError("Unit::AddSpellAuraHolder cannot add SpellAuraHolder %u, to %s due to holder already added!",
+                    holder->GetId(),GetObjectGuid().GetString().c_str());
+                return false;
+            }
+        }
+    }
+
+    SpellEntry const* aurSpellInfo = holder->GetSpellProto();
+
+    // ghost spell check, allow apply any auras at player loading in ghost mode (will be cleanup after load)
+    if ( !isAlive() && !IsDeathPersistentSpell(aurSpellInfo) &&
+        !IsDeathOnlySpell(aurSpellInfo) &&
+        !IsSpellAllowDeadTarget(aurSpellInfo) &&
+        (GetTypeId()!=TYPEID_PLAYER || !((Player*)this)->GetSession()->PlayerLoading()) )
+    {
+        return false;
+    }
+
+    if (holder->GetTarget() != this)
+    {
+        sLog.outError("Unit::AddSpellAuraHolder cannot add SpellAuraHolder %u, caster %s, to %s, due to different target (%s)!",
+            holder->GetId(),
+            holder->GetCaster() ? holder->GetCaster()->GetObjectGuid().GetString().c_str() : "<none>",
+            GetObjectGuid().GetString().c_str(),
+            holder->GetTarget() ? holder->GetTarget()->GetObjectGuid().GetString().c_str() : "<none>");
+        return false;
+    }
+
+    SpellAuraHolderQueue holdersToRemove;
+    SpellAuraHolderPtr holderToStackAdd;
+    // passive and persistent auras can stack with themselves any number of times
+    if ((!holder->IsPassive() && !holder->IsPersistent()) || holder->IsAreaAura())
+    {
+        SpellAuraHolderBounds spair = GetSpellAuraHolderBounds(aurSpellInfo->Id);
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        // take out same spell
+        for (SpellAuraHolderMap::iterator iter = spair.first; iter != spair.second; ++iter)
         {
-            SpellAuraHolder *foundHolder = iter->second;
-            if (foundHolder->GetCasterGuid() == holder->GetCasterGuid())
+            // stack some specific spells
+            bool bIsSpellStackingCustom = false;
+            switch(holder->GetId())
+            {
+                case 70338: // Necrotic Plague (Lich King)
+                case 73785:
+                case 73786:
+                case 73787:
+                case 74074: // Plague Siphon (Lich King)
+                case 72679: // Harvested Soul (Lich King)
+                case 73028:
+                case 74318:
+                case 74319:
+                case 74320:
+                case 74321:
+                case 74322:
+                case 74323:
+                    bIsSpellStackingCustom = true;
+                    break;
+            }
+
+            if (iter->second && !iter->second->IsDeleted() &&
+                ((iter->second->GetCasterGuid() == holder->GetCasterGuid() || bIsSpellStackingCustom ||
+                (iter->second->GetCasterGuid().IsCreatureOrPet() && holder->GetCasterGuid().IsCreatureOrPet()))))
             {
                 // Aura can stack on self -> Stack it;
                 if (aurSpellInfo->StackAmount)
                 {
-                    // can be created with >1 stack by some spell mods
-                    foundHolder->ModStackAmount(holder->GetStackAmount());
-                    delete holder;
-                    return false;
+                    holderToStackAdd = iter->second;
+                    break;
                 }
 
                 // Check for coexisting Weapon-proced Auras
-                if (holder->IsWeaponBuffCoexistableWith(foundHolder))
+                if  (holder->IsWeaponBuffCoexistableWith() &&
+                    iter->second->GetCastItemGuid() && iter->second->GetCastItemGuid() != holder->GetCastItemGuid())
                     continue;
 
                 // Carry over removed Aura's remaining damage if Aura still has ticks remaining
-                if (foundHolder->GetSpellProto()->HasAttribute(SPELL_ATTR_EX4_STACK_DOT_MODIFIER))
+                if (iter->second->GetSpellProto()->HasAttribute(SPELL_ATTR_EX4_STACK_DOT_MODIFIER))
                 {
                     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
                     {
-                        if (Aura *aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i)))
+                        if (Aura* aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i)))
                         {
                             // m_auraname can be modified to SPELL_AURA_NONE for area auras, use original
                             AuraType aurNameReal = AuraType(aurSpellInfo->EffectApplyAuraName[i]);
 
                             if (aurNameReal == SPELL_AURA_PERIODIC_DAMAGE && aur->GetAuraDuration() > 0)
                             {
-                                if (Aura *existing = foundHolder->GetAuraByEffectIndex(SpellEffectIndex(i)))
+                                if (Aura* existing = iter->second->GetAuraByEffectIndex(SpellEffectIndex(i)))
                                 {
                                     int32 remainingTicks = existing->GetAuraMaxTicks() - existing->GetAuraTicks();
                                     int32 remainingDamage = existing->GetModifier()->m_amount * remainingTicks;
@@ -4011,79 +5145,108 @@ bool Unit::AddSpellAuraHolder(SpellAuraHolder *holder)
                     }
                 }
 
-                // can be only single
-                RemoveSpellAuraHolder(foundHolder, AURA_REMOVE_BY_STACK);
-                break;
-            }
-
-            bool stop = false;
-
-            for (int32 i = 0; i < MAX_EFFECT_INDEX && !stop; ++i)
-            {
-                // no need to check non stacking auras that weren't/won't be applied on this target
-                if (!foundHolder->m_auras[i] || !holder->m_auras[i])
-                    continue;
-
-                // m_auraname can be modified to SPELL_AURA_NONE for area auras, use original
-                AuraType aurNameReal = AuraType(aurSpellInfo->EffectApplyAuraName[i]);
-
-                switch(aurNameReal)
+                // only one holder per caster on same target
+                if (iter->second->GetCasterGuid() == holder->GetCasterGuid())
                 {
-                    // DoT/HoT/etc
-                    case SPELL_AURA_DUMMY:                  // allow stack
-                    case SPELL_AURA_PERIODIC_DAMAGE:
-                    case SPELL_AURA_PERIODIC_DAMAGE_PERCENT:
-                    case SPELL_AURA_PERIODIC_LEECH:
-                    case SPELL_AURA_PERIODIC_HEAL:
-                    case SPELL_AURA_OBS_MOD_HEALTH:
-                    case SPELL_AURA_PERIODIC_MANA_LEECH:
-                    case SPELL_AURA_OBS_MOD_MANA:
-                    case SPELL_AURA_POWER_BURN_MANA:
-                        break;
-                    case SPELL_AURA_PERIODIC_ENERGIZE:      // all or self or clear non-stackable
-                    default:                                // not allow
-                        // can be only single (this check done at _each_ aura add
-                        RemoveSpellAuraHolder(foundHolder,AURA_REMOVE_BY_STACK);
-                        stop = true;
-                        break;
+                    holdersToRemove.push(iter->second);
+                    break;
                 }
             }
 
-            if(stop)
-                break;
+            // stacking of holders from different casters
+            // some holders stack, but their auras dont (i.e. only strongest aura effect works)
+            if (!SpellMgr::IsStackableSpellAuraHolder(aurSpellInfo))
+                holdersToRemove.push(iter->second);
+        }
+    }
+
+    if (!holdersToRemove.empty())
+    {
+        while (!holdersToRemove.empty())
+        {
+            if (holdersToRemove.front() && !holdersToRemove.front()->IsDeleted())
+                RemoveSpellAuraHolder(holdersToRemove.front(),AURA_REMOVE_BY_STACK);
+            holdersToRemove.pop();
         }
     }
+    else if (holderToStackAdd)
+    {
+        // can be created with >1 stack by some spell mods
+        holderToStackAdd->ModStackAmount(holder->GetStackAmount());
+        holderToStackAdd->HandleSpellSpecificBoostsForward(true);
+        return false;
+    }
 
     // passive auras not stackable with other ranks
     if (!IsPassiveSpellStackableWithRanks(aurSpellInfo))
     {
         if (!RemoveNoStackAurasDueToAuraHolder(holder))
         {
-            delete holder;
             return false;                                   // couldn't remove conflicting aura with higher rank
         }
     }
 
-    // update single target auras list (before aura add to aura list, to prevent unexpected remove recently added aura)
-    if (holder->IsSingleTarget())
+    // update tracked aura targets list (before aura add to aura list, to prevent unexpected remove recently added aura)
+    if (TrackedAuraType trackedType = holder->GetTrackedAuraType())
     {
         if (Unit* caster = holder->GetCaster())             // caster not in world
         {
-            SingleCastSpellTargetMap& scTargets = caster->GetSingleCastSpellTargets();
-            for(SingleCastSpellTargetMap::iterator itr = scTargets.begin(); itr != scTargets.end();)
+            // Only compare TrackedAuras of same tracking type
+            TrackedAuraTargetMap& scTargets = caster->GetTrackedAuraTargets(trackedType);
+            for (TrackedAuraTargetMap::iterator itr = scTargets.begin(); itr != scTargets.end();)
             {
                 SpellEntry const* itr_spellEntry = itr->first;
-                ObjectGuid itr_targetGuid = itr->second;
+                ObjectGuid itr_targetGuid = itr->second;    // Target on whom the tracked aura is
 
-                if (itr_targetGuid != GetObjectGuid() &&
-                    IsSingleTargetSpells(itr_spellEntry, aurSpellInfo))
+                if (itr_targetGuid == GetObjectGuid())      // Note: I don't understand this check (based on old aura concepts, kept when adding holders)
                 {
-                    scTargets.erase(itr);                   // remove for caster in any case
+                    ++itr;
+                    continue;
+                }
 
-                    // remove from target if target found
-                    if (Unit* itr_target = GetMap()->GetUnit(itr_targetGuid))
-                        itr_target->RemoveAurasDueToSpell(itr_spellEntry->Id);
+                bool removed = false;
+                switch (trackedType)
+                {
+                    case TRACK_AURA_TYPE_SINGLE_TARGET:
+                        if (IsSingleTargetSpells(itr_spellEntry, aurSpellInfo))
+                        {
+                            removed = true;
+                            // remove from target if target found
+                            if (Unit* itr_target = GetMap()->GetUnit(itr_targetGuid))
+                                itr_target->RemoveAurasDueToSpell(itr_spellEntry->Id); // TODO AURA_REMOVE_BY_TRACKING (might require additional work elsewhere)
+                            else                            // Normally the tracking will be removed by the AuraRemoval
+                                scTargets.erase(itr);
+                        }
+                        break;
+                    case TRACK_AURA_TYPE_CONTROL_VEHICLE:
+                    {
+                        // find minimal effect-index that applies an aura
+                        uint8 i = EFFECT_INDEX_0;
+                        for (; i < MAX_EFFECT_INDEX; ++i)
+                            if (IsAuraApplyEffect(aurSpellInfo, SpellEffectIndex(i)))
+                                break;
+
+                        // Remove auras when first holder is applied
+                        if ((1 << i) & holder->GetAuraFlags())
+                        {
+                            removed = true;                 // each caster can only control one vehicle
 
+                            // remove from target if target found
+                            if (Unit* itr_target = GetMap()->GetUnit(itr_targetGuid))
+                                itr_target->RemoveAurasByCasterSpell(itr_spellEntry->Id, caster->GetObjectGuid(), AURA_REMOVE_BY_TRACKING);
+                            else                            // Normally the tracking will be removed by the AuraRemoval
+                                scTargets.erase(itr);
+                        }
+                        break;
+                    }
+                    case TRACK_AURA_TYPE_NOT_TRACKED:       // These two can never happen
+                    case MAX_TRACKED_AURA_TYPES:
+                        MANGOS_ASSERT(false);
+                        break;
+                }
+
+                if (removed)
+                {
                     itr = scTargets.begin();                // list can be chnaged at remove aura
                     continue;
                 }
@@ -4091,21 +5254,36 @@ bool Unit::AddSpellAuraHolder(SpellAuraHolder *holder)
                 ++itr;
             }
 
-            // register spell holder single target
-            scTargets[aurSpellInfo] = GetObjectGuid();
+            switch (trackedType)
+            {
+                case TRACK_AURA_TYPE_CONTROL_VEHICLE:       // Only track the controlled vehicle, no secondary effects
+                    if (!IsSpellHaveAura(aurSpellInfo, SPELL_AURA_CONTROL_VEHICLE, holder->GetAuraFlags()))
+                        break;
+                    // no break here, track other controlled
+                case TRACK_AURA_TYPE_SINGLE_TARGET:         // Register spell holder single target
+                    scTargets[aurSpellInfo] = GetObjectGuid();
+                    break;
+                default:
+                    break;
+            }
         }
     }
 
+    holder->HandleSpellSpecificBoostsForward(true);
+
     // add aura, register in lists and arrays
-    holder->_AddSpellAuraHolder();
-    m_spellAuraHolders.insert(SpellAuraHolderMap::value_type(holder->GetId(), holder));
+    {
+        holder->_AddSpellAuraHolder();
+        MAPLOCK_WRITE(this,MAP_LOCK_TYPE_AURAS);
+        m_spellAuraHolders.insert(SpellAuraHolderMap::value_type(holder->GetId(), holder));
+    }
 
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
         if (Aura *aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i)))
             AddAuraToModList(aur);
 
-    holder->ApplyAuraModifiers(true, true);
-    DEBUG_LOG("Holder of spell %u now is in use", holder->GetId());
+    holder->ApplyAuraModifiers(true, true);                 // This is the place where auras are actually applied onto the target
+    DETAIL_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Unit::AddSpellAuraHolder holder of spell %u on unit %s now is in use", holder->GetId(), GetObjectGuid().GetString().c_str());
 
     // if aura deleted before boosts apply ignore
     // this can be possible it it removed indirectly by triggered spell effect at ApplyModifier
@@ -4117,10 +5295,11 @@ bool Unit::AddSpellAuraHolder(SpellAuraHolder *holder)
     return true;
 }
 
-void Unit::AddAuraToModList(Aura *aura)
+void Unit::AddAuraToModList(Aura* aura)
 {
-    if (aura->GetModifier()->m_auraname < TOTAL_AURAS)
-        m_modAuras[aura->GetModifier()->m_auraname].push_back(aura);
+    MAPLOCK_WRITE(this,MAP_LOCK_TYPE_AURAS);
+    if (aura && aura->GetModifier()->m_auraname < TOTAL_AURAS)
+        m_modAuras[aura->GetModifier()->m_auraname].push_back(AuraPair(aura));
 }
 
 void Unit::RemoveRankAurasDueToSpell(uint32 spellId)
@@ -4136,11 +5315,11 @@ void Unit::RemoveRankAurasDueToSpell(uint32 spellId)
         uint32 i_spellId = (*i).second->GetId();
         if((*i).second && i_spellId && i_spellId != spellId)
         {
-            if(sSpellMgr.IsRankSpellDueToSpell(spellInfo,i_spellId))
+            if (sSpellMgr.IsRankSpellDueToSpell(spellInfo,i_spellId))
             {
                 RemoveAurasDueToSpell(i_spellId);
 
-                if( m_spellAuraHolders.empty() )
+                if ( m_spellAuraHolders.empty() )
                     break;
                 else
                     next =  m_spellAuraHolders.begin();
@@ -4149,9 +5328,9 @@ void Unit::RemoveRankAurasDueToSpell(uint32 spellId)
     }
 }
 
-bool Unit::RemoveNoStackAurasDueToAuraHolder(SpellAuraHolder *holder)
+bool Unit::RemoveNoStackAurasDueToAuraHolder(SpellAuraHolderPtr holder)
 {
-    if (!holder)
+    if (!holder || holder->IsDeleted())
         return false;
 
     SpellEntry const* spellProto = holder->GetSpellProto();
@@ -4161,22 +5340,24 @@ bool Unit::RemoveNoStackAurasDueToAuraHolder(SpellAuraHolder *holder)
     uint32 spellId = holder->GetId();
 
     // passive spell special case (only non stackable with ranks)
-    if(IsPassiveSpell(spellProto))
+    if (IsPassiveSpell(spellProto))
     {
-        if(IsPassiveSpellStackableWithRanks(spellProto))
+        if (IsPassiveSpellStackableWithRanks(spellProto))
             return true;
     }
 
     SpellSpecific spellId_spec = GetSpellSpecific(spellId);
 
-    SpellAuraHolderMap::iterator i,next;
-    for (i = m_spellAuraHolders.begin(); i != m_spellAuraHolders.end(); i = next)
+    SpellAuraHolderMap& holderMap = GetSpellAuraHolderMap();
+    for (SpellAuraHolderMap::iterator itr = holderMap.begin(), next; itr != holderMap.end(); itr = next)
     {
-        next = i;
+        next = itr;
         ++next;
-        if (!(*i).second) continue;
 
-        SpellEntry const* i_spellProto = (*i).second->GetSpellProto();
+        if (!itr->second || itr->second->IsDeleted())
+            continue;
+
+        SpellEntry const* i_spellProto = itr->second->GetSpellProto();
 
         if (!i_spellProto)
             continue;
@@ -4187,7 +5368,7 @@ bool Unit::RemoveNoStackAurasDueToAuraHolder(SpellAuraHolder *holder)
         if (IsPassiveSpell(i_spellProto))
         {
             // passive non-stackable spells not stackable only for same caster
-            if (holder->GetCasterGuid() != i->second->GetCasterGuid())
+            if (holder->GetCasterGuid() != itr->second->GetCasterGuid())
                 continue;
 
             // passive non-stackable spells not stackable only with another rank of same spell
@@ -4195,7 +5376,8 @@ bool Unit::RemoveNoStackAurasDueToAuraHolder(SpellAuraHolder *holder)
                 continue;
         }
 
-        if(i_spellId == spellId) continue;
+        if (i_spellId == spellId)
+            continue;
 
         bool is_triggered_by_spell = false;
         // prevent triggering aura of removing aura that triggered it
@@ -4216,25 +5398,23 @@ bool Unit::RemoveNoStackAurasDueToAuraHolder(SpellAuraHolder *holder)
         // single allowed spell specific from same caster or from any caster at target
         bool is_spellSpecPerTargetPerCaster = IsSingleFromSpellSpecificPerTargetPerCaster(spellId_spec,i_spellId_spec);
         bool is_spellSpecPerTarget = IsSingleFromSpellSpecificPerTarget(spellId_spec,i_spellId_spec);
-        if (is_spellSpecPerTarget || (is_spellSpecPerTargetPerCaster && holder->GetCasterGuid() == (*i).second->GetCasterGuid()))
+        if (is_spellSpecPerTarget || (is_spellSpecPerTargetPerCaster && holder->GetCasterGuid() == itr->second->GetCasterGuid()))
         {
             // cannot remove higher rank
             if (sSpellMgr.IsRankSpellDueToSpell(spellProto, i_spellId))
-                if(CompareAuraRanks(spellId, i_spellId) < 0)
+                if (CompareAuraRanks(spellId, i_spellId) < 0)
                     return false;
 
             // Its a parent aura (create this aura in ApplyModifier)
-            if ((*i).second->IsInUse())
-            {
-                sLog.outError("SpellAuraHolder (Spell %u) is in process but attempt removed at SpellAuraHolder (Spell %u) adding, need add stack rule for Unit::RemoveNoStackAurasDueToAuraHolder", i->second->GetId(), holder->GetId());
-                continue;
-            }
-            RemoveAurasDueToSpell(i_spellId);
+            if (is_spellSpecPerTargetPerCaster)
+                RemoveSpellAuraHolder(itr->second);
+            else
+                RemoveAurasDueToSpell(i_spellId);
 
-            if( m_spellAuraHolders.empty() )
+            if (holderMap.empty() )
                 break;
             else
-                next =  m_spellAuraHolders.begin();
+                next =  holderMap.begin();
 
             continue;
         }
@@ -4242,67 +5422,57 @@ bool Unit::RemoveNoStackAurasDueToAuraHolder(SpellAuraHolder *holder)
         // spell with spell specific that allow single ranks for spell from diff caster
         // same caster case processed or early or later
         bool is_spellPerTarget = IsSingleFromSpellSpecificSpellRanksPerTarget(spellId_spec,i_spellId_spec);
-        if ( is_spellPerTarget && holder->GetCasterGuid() != (*i).second->GetCasterGuid() && sSpellMgr.IsRankSpellDueToSpell(spellProto, i_spellId))
+        if ( is_spellPerTarget && holder->GetCasterGuid() != itr->second->GetCasterGuid() && sSpellMgr.IsRankSpellDueToSpell(spellProto, i_spellId))
         {
             // cannot remove higher rank
-            if(CompareAuraRanks(spellId, i_spellId) < 0)
+            if (CompareAuraRanks(spellId, i_spellId) < 0)
                 return false;
 
             // Its a parent aura (create this aura in ApplyModifier)
-            if ((*i).second->IsInUse())
-            {
-                sLog.outError("SpellAuraHolder (Spell %u) is in process but attempt removed at SpellAuraHolder (Spell %u) adding, need add stack rule for Unit::RemoveNoStackAurasDueToAuraHolder", i->second->GetId(), holder->GetId());
-                continue;
-            }
             RemoveAurasDueToSpell(i_spellId);
 
-            if( m_spellAuraHolders.empty() )
+            if (holderMap.empty() )
                 break;
             else
-                next =  m_spellAuraHolders.begin();
+                next =  holderMap.begin();
 
             continue;
         }
 
         // non single (per caster) per target spell specific (possible single spell per target at caster)
-        if( !is_spellSpecPerTargetPerCaster && !is_spellSpecPerTarget && sSpellMgr.IsNoStackSpellDueToSpell(spellId, i_spellId) )
+        if ( !is_spellSpecPerTargetPerCaster && !is_spellSpecPerTarget && sSpellMgr.IsNoStackSpellDueToSpell(spellId, i_spellId) )
         {
             // Its a parent aura (create this aura in ApplyModifier)
-            if ((*i).second->IsInUse())
-            {
-                sLog.outError("SpellAuraHolder (Spell %u) is in process but attempt removed at SpellAuraHolder (Spell %u) adding, need add stack rule for Unit::RemoveNoStackAurasDueToAuraHolder", i->second->GetId(), holder->GetId());
+            // different ranks spells with different casters should also stack
+            if (holder->GetCasterGuid() != itr->second->GetCasterGuid() && SpellMgr::IsStackableSpellAuraHolder(spellProto))
                 continue;
-            }
-            RemoveAurasDueToSpell(i_spellId);
 
-            if( m_spellAuraHolders.empty() )
+            if (!itr->second->IsDeleted())
+                RemoveSpellAuraHolder(itr->second, AURA_REMOVE_BY_STACK);
+
+            if (holderMap.empty() )
                 break;
             else
-                next =  m_spellAuraHolders.begin();
+                next = holderMap.begin();
 
             continue;
         }
 
         // Potions stack aura by aura (elixirs/flask already checked)
-        if( spellProto->SpellFamilyName == SPELLFAMILY_POTION && i_spellProto->SpellFamilyName == SPELLFAMILY_POTION )
+        if ( spellProto->SpellFamilyName == SPELLFAMILY_POTION && i_spellProto->SpellFamilyName == SPELLFAMILY_POTION )
         {
             if (IsNoStackAuraDueToAura(spellId, i_spellId))
             {
-                if(CompareAuraRanks(spellId, i_spellId) < 0)
+                if (CompareAuraRanks(spellId, i_spellId) < 0)
                     return false;                       // cannot remove higher rank
 
                 // Its a parent aura (create this aura in ApplyModifier)
-                if ((*i).second->IsInUse())
-                {
-                    sLog.outError("SpellAuraHolder (Spell %u) is in process but attempt removed at SpellAuraHolder (Spell %u) adding, need add stack rule for Unit::RemoveNoStackAurasDueToAuraHolder", i->second->GetId(), holder->GetId());
-                    continue;
-                }
                 RemoveAurasDueToSpell(i_spellId);
 
-                if( m_spellAuraHolders.empty() )
+                if (holderMap.empty())
                     break;
                 else
-                    next =  m_spellAuraHolders.begin();
+                    next = holderMap.begin();
             }
         }
     }
@@ -4314,26 +5484,32 @@ void Unit::RemoveAura(uint32 spellId, SpellEffectIndex effindex, Aura* except)
     SpellAuraHolderBounds spair = GetSpellAuraHolderBounds(spellId);
     for(SpellAuraHolderMap::iterator iter = spair.first; iter != spair.second; )
     {
-        Aura *aur = iter->second->m_auras[effindex];
-        if (aur && aur != except)
+        if (iter->second && !iter->second->IsDeleted())
         {
-            RemoveSingleAuraFromSpellAuraHolder(iter->second, effindex);
-            // may remove holder
-            spair = GetSpellAuraHolderBounds(spellId);
-            iter = spair.first;
+            Aura* aur = iter->second->GetAuraByEffectIndex(effindex);
+            if (aur && aur != except)
+            {
+                RemoveSingleAuraFromSpellAuraHolder(iter->second, effindex);
+                // may remove holder
+                spair = GetSpellAuraHolderBounds(spellId);
+                iter = spair.first;
+            }
+            else
+                ++iter;
         }
         else
             ++iter;
     }
 }
-void Unit::RemoveAurasByCasterSpell(uint32 spellId, ObjectGuid casterGuid)
+
+void Unit::RemoveAurasByCasterSpell(uint32 spellId, ObjectGuid casterGuid, AuraRemoveMode mode /*=AURA_REMOVE_BY_DEFAULT*/)
 {
     SpellAuraHolderBounds spair = GetSpellAuraHolderBounds(spellId);
     for(SpellAuraHolderMap::iterator iter = spair.first; iter != spair.second; )
     {
-        if (iter->second->GetCasterGuid() == casterGuid)
+        if (iter->second && !iter->second->IsDeleted() && iter->second->GetCasterGuid() == casterGuid)
         {
-            RemoveSpellAuraHolder(iter->second);
+            RemoveSpellAuraHolder(iter->second, mode);
             spair = GetSpellAuraHolderBounds(spellId);
             iter = spair.first;
         }
@@ -4342,17 +5518,37 @@ void Unit::RemoveAurasByCasterSpell(uint32 spellId, ObjectGuid casterGuid)
     }
 }
 
+void Unit::RemoveAllGroupBuffsFromCaster(ObjectGuid guidCaster)
+{
+    SpellAuraHolderMap &holdersMap = GetSpellAuraHolderMap();
+    for (SpellAuraHolderMap::iterator itr = holdersMap.begin(); itr != holdersMap.end();)
+    {
+        if (itr->second && !itr->second->IsDeleted() && itr->second->GetCasterGuid() == guidCaster && SpellMgr::IsGroupBuff(itr->second->GetSpellProto()))
+        {
+            RemoveSpellAuraHolder(itr->second);
+            itr = holdersMap.begin();
+        }
+        else
+            ++itr;
+    }
+}
+
 void Unit::RemoveSingleAuraFromSpellAuraHolder(uint32 spellId, SpellEffectIndex effindex, ObjectGuid casterGuid, AuraRemoveMode mode)
 {
     SpellAuraHolderBounds spair = GetSpellAuraHolderBounds(spellId);
     for(SpellAuraHolderMap::iterator iter = spair.first; iter != spair.second; )
     {
-        Aura *aur = iter->second->m_auras[effindex];
-        if (aur && aur->GetCasterGuid() == casterGuid)
+        if (iter->second && !iter->second->IsDeleted())
         {
-            RemoveSingleAuraFromSpellAuraHolder(iter->second, effindex, mode);
-            spair = GetSpellAuraHolderBounds(spellId);
-            iter = spair.first;
+            Aura* aur = iter->second->GetAuraByEffectIndex(effindex);
+            if (aur && aur->GetCasterGuid() == casterGuid)
+            {
+                RemoveSingleAuraFromSpellAuraHolder(iter->second, effindex, mode);
+                spair = GetSpellAuraHolderBounds(spellId);
+                iter = spair.first;
+            }
+            else
+                ++iter;
         }
         else
             ++iter;
@@ -4365,12 +5561,13 @@ void Unit::RemoveAuraHolderDueToSpellByDispel(uint32 spellId, uint32 stackAmount
 
     // Custom dispel case
     // Unstable Affliction
-    if(spellEntry->SpellFamilyName == SPELLFAMILY_WARLOCK && (spellEntry->SpellFamilyFlags & UI64LIT(0x010000000000)))
+    if (spellEntry->SpellFamilyName == SPELLFAMILY_WARLOCK && spellEntry->GetSpellFamilyFlags().test<CF_WARLOCK_UNSTABLE_AFFLICTION>())
     {
-        if (Aura* dotAura = GetAura(SPELL_AURA_PERIODIC_DAMAGE,SPELLFAMILY_WARLOCK,UI64LIT(0x010000000000), 0x00000000, casterGuid))
+        Aura* dotAura = GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_WARLOCK, CF_WARLOCK_UNSTABLE_AFFLICTION>(casterGuid);
+        if (dotAura)
         {
-            // use clean value for initial damage
-            int32 damage = dotAura->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_0);
+            // use spellpower-modified value for initial damage
+            int damage = dotAura->GetModifier()->m_amount;
             damage *= 9;
 
             // Remove spell auras from stack
@@ -4382,9 +5579,10 @@ void Unit::RemoveAuraHolderDueToSpellByDispel(uint32 spellId, uint32 stackAmount
         }
     }
     // Lifebloom
-    else if (spellEntry->SpellFamilyName == SPELLFAMILY_DRUID && (spellEntry->SpellFamilyFlags & UI64LIT(0x0000001000000000)))
+    else if (spellEntry->SpellFamilyName == SPELLFAMILY_DRUID && spellEntry->GetSpellFamilyFlags().test<CF_DRUID_LIFEBLOOM>())
     {
-        if (Aura* dotAura = GetAura(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, UI64LIT(0x0000001000000000), 0x00000000, casterGuid))
+        Aura* dotAura = GetAura<SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, CF_DRUID_LIFEBLOOM>(casterGuid);
+        if (dotAura)
         {
             int32 amount = ( dotAura->GetModifier()->m_amount / dotAura->GetStackAmount() ) * stackAmount;
             CastCustomSpell(this, 33778, &amount, NULL, NULL, true, NULL, dotAura, casterGuid);
@@ -4397,12 +5595,13 @@ void Unit::RemoveAuraHolderDueToSpellByDispel(uint32 spellId, uint32 stackAmount
         }
     }
     // Flame Shock
-    else if (spellEntry->SpellFamilyName == SPELLFAMILY_SHAMAN && (spellEntry->SpellFamilyFlags & UI64LIT(0x10000000)))
+    else if (spellEntry->SpellFamilyName == SPELLFAMILY_SHAMAN && spellEntry->GetSpellFamilyFlags().test<CF_SHAMAN_FLAME_SHOCK>())
     {
         Unit* caster = NULL;
         uint32 triggeredSpell = 0;
 
-        if (Aura* dotAura = GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, UI64LIT(0x10000000), 0x00000000, casterGuid))
+        Aura* dotAura = GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, CF_SHAMAN_FLAME_SHOCK>(casterGuid);
+        if (dotAura)
             caster = dotAura->GetCaster();
 
         if (caster && !caster->isDead())
@@ -4430,9 +5629,10 @@ void Unit::RemoveAuraHolderDueToSpellByDispel(uint32 spellId, uint32 stackAmount
         return;
     }
     // Vampiric touch (first dummy aura)
-    else if (spellEntry->SpellFamilyName == SPELLFAMILY_PRIEST && spellEntry->SpellFamilyFlags & UI64LIT(0x0000040000000000))
+    else if (spellEntry->SpellFamilyName == SPELLFAMILY_PRIEST && spellEntry->GetSpellFamilyFlags().test<CF_PRIEST_VAMPIRIC_TOUCH>())
     {
-        if (Aura *dot = GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, UI64LIT(0x0000040000000000), 0x00000000, casterGuid))
+        Aura *dot = GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, CF_PRIEST_VAMPIRIC_TOUCH>(casterGuid);
+        if (dot)
         {
             if (dot->GetCaster())
             {
@@ -4448,24 +5648,48 @@ void Unit::RemoveAuraHolderDueToSpellByDispel(uint32 spellId, uint32 stackAmount
             }
         }
     }
+    // Necrotic Plague (Lich King)
+    // this hack needs correct implementation
+    else if (spellId == 70338 || spellId == 73785 || spellId == 73786 || spellId == 73787)
+    {
+        RemoveSpellAuraHolder(GetSpellAuraHolder(spellId), AURA_REMOVE_BY_DISPEL);
+    }
 
     RemoveAuraHolderFromStack(spellId, stackAmount, casterGuid, AURA_REMOVE_BY_DISPEL);
 }
 
 void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, ObjectGuid casterGuid, Unit *stealer)
 {
-    SpellAuraHolder *holder = GetSpellAuraHolder(spellId, casterGuid);
+    SpellAuraHolderPtr holder = GetSpellAuraHolder(spellId, casterGuid);
     SpellEntry const* spellProto = sSpellStore.LookupEntry(spellId);
-    SpellAuraHolder *new_holder = CreateSpellAuraHolder(spellProto, stealer, this);
+    SpellAuraHolderPtr new_holder = CreateSpellAuraHolder(spellProto, stealer, this);
 
     // set its duration and maximum duration
     // max duration 2 minutes (in msecs)
-    int32 dur = holder->GetAuraDuration();
+    int32 dur = holder->GetAuraDuration() > 0 ? holder->GetAuraDuration() : holder->GetAuraMaxDuration();
     int32 max_dur = 2*MINUTE*IN_MILLISECONDS;
     int32 new_max_dur = max_dur > dur ? dur : max_dur;
     new_holder->SetAuraMaxDuration(new_max_dur);
     new_holder->SetAuraDuration(new_max_dur);
 
+    // some specific events after stealing aura
+    // Lifebloom
+    if (spellProto->SpellFamilyName == SPELLFAMILY_DRUID && spellProto->GetSpellFamilyFlags().test<CF_DRUID_LIFEBLOOM>())
+    {
+        Aura* dotAura = GetAura<SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, CF_DRUID_LIFEBLOOM>(casterGuid);
+        if (dotAura)
+        {
+            int32 amount = dotAura->GetModifier()->m_amount;
+            CastCustomSpell(this, 33778, &amount, NULL, NULL, true, NULL, dotAura, casterGuid);
+
+            if (Unit* caster = dotAura->GetCaster())
+            {
+                int32 returnmana = (spellProto->ManaCostPercentage * caster->GetCreateMana() / 100) * dotAura->GetStackAmount() / 2;
+                caster->CastCustomSpell(caster, 64372, &returnmana, NULL, NULL, true, NULL, dotAura, casterGuid);
+            }
+        }
+    }
+
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
     {
         Aura *aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i));
@@ -4476,24 +5700,38 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, ObjectGuid casterGuid, U
         int32 basePoints = aur->GetBasePoints();
         // construct the new aura for the attacker - will never return NULL, it's just a wrapper for
         // some different constructors
-        Aura * new_aur = CreateAura(spellProto, aur->GetEffIndex(), &basePoints, new_holder, stealer, this);
+        Aura* new_aur = new_holder->CreateAura(spellProto, aur->GetEffIndex(), &basePoints, new_holder, stealer, this, NULL);
 
         // set periodic to do at least one tick (for case when original aura has been at last tick preparing)
         int32 periodic = aur->GetModifier()->periodictime;
         new_aur->GetModifier()->periodictime = periodic < new_max_dur ? periodic : new_max_dur;
-
-        // add the new aura to stealer
-        new_holder->AddAura(new_aur, new_aur->GetEffIndex());
     }
 
-    if (holder->ModStackAmount(-1))
+    if (holder->GetSpellProto()->HasAttribute(SPELL_ATTR_EX7_DISPEL_CHARGES))
+    {
+        if (holder->DropAuraCharge())
+            RemoveSpellAuraHolder(holder, AURA_REMOVE_BY_DISPEL);
+
+        if (SpellAuraHolderPtr foundHolder = stealer->GetSpellAuraHolder(holder->GetSpellProto()->Id, GetObjectGuid()))
+        {
+            foundHolder->SetAuraDuration(new_max_dur);
+            foundHolder->SetAuraCharges(foundHolder->GetAuraCharges()+1, true);
+            if (!AddSpellAuraHolderToRemoveList(new_holder))
+                DEBUG_LOG("Unit::RemoveAurasDueToSpellBySteal cannot insert SpellAuraHolder (spell %u) to remove list!", new_holder ? new_holder->GetId() : 0);
+            return;
+        }
+        else
+            new_holder->SetAuraCharges(1,false);
+    }
+    else if (holder->ModStackAmount(-1))
         // Remove aura as dispel
         RemoveSpellAuraHolder(holder, AURA_REMOVE_BY_DISPEL);
 
     // strange but intended behaviour: Stolen single target auras won't be treated as single targeted
-    new_holder->SetIsSingleTarget(false);
+    new_holder->SetTrackedAuraType(TRACK_AURA_TYPE_NOT_TRACKED);
 
     stealer->AddSpellAuraHolder(new_holder);
+
 }
 
 void Unit::RemoveAurasDueToSpellByCancel(uint32 spellId)
@@ -4512,18 +5750,24 @@ void Unit::RemoveAurasWithDispelType(DispelType type, ObjectGuid casterGuid)
     // Create dispel mask by dispel type
     uint32 dispelMask = GetDispellMask(type);
     // Dispel all existing auras vs current dispel type
-    SpellAuraHolderMap& auras = GetSpellAuraHolderMap();
-    for (SpellAuraHolderMap::iterator itr = auras.begin(); itr != auras.end(); )
+    SpellIdSet spellsToRemove;
     {
-        SpellEntry const* spell = itr->second->GetSpellProto();
-        if (((1<<spell->Dispel) & dispelMask) && (!casterGuid || casterGuid == itr->second->GetCasterGuid()))
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        SpellAuraHolderMap const& holdersMap = GetSpellAuraHolderMap();
+        for (SpellAuraHolderMap::const_iterator iter = holdersMap.begin(); iter != holdersMap.end(); ++iter)
         {
-            // Dispel aura
-            RemoveAurasDueToSpell(spell->Id);
-            itr = auras.begin();
+            if (!iter->second || iter->second->IsDeleted())
+                continue;
+
+            if (((1 << iter->second->GetSpellProto()->Dispel) & dispelMask) && (!casterGuid || casterGuid == iter->second->GetCasterGuid()))
+                spellsToRemove.insert(iter->first);
         }
-        else
-            ++itr;
+    }
+
+    if (!spellsToRemove.empty())
+    {
+        for(SpellIdSet::const_iterator i = spellsToRemove.begin(); i != spellsToRemove.end(); ++i)
+            RemoveAurasDueToSpell(*i);
     }
 }
 
@@ -4532,6 +5776,9 @@ void Unit::RemoveAuraHolderFromStack(uint32 spellId, uint32 stackAmount, ObjectG
     SpellAuraHolderBounds spair = GetSpellAuraHolderBounds(spellId);
     for (SpellAuraHolderMap::iterator iter = spair.first; iter != spair.second; ++iter)
     {
+        if (!iter->second || iter->second->IsDeleted())
+            continue;
+
         if (!casterGuid || iter->second->GetCasterGuid() == casterGuid)
         {
             if (iter->second->ModStackAmount(-int32(stackAmount)))
@@ -4543,7 +5790,7 @@ void Unit::RemoveAuraHolderFromStack(uint32 spellId, uint32 stackAmount, ObjectG
     }
 }
 
-void Unit::RemoveAurasDueToSpell(uint32 spellId, SpellAuraHolder* except, AuraRemoveMode mode)
+void Unit::RemoveAurasDueToSpell(uint32 spellId, SpellAuraHolderPtr except, AuraRemoveMode mode)
 {
     SpellEntry const* spellEntry = sSpellStore.LookupEntry(spellId);
     if (spellEntry && spellEntry->SpellDifficultyId && IsInWorld() && GetMap()->IsDungeon())
@@ -4553,7 +5800,7 @@ void Unit::RemoveAurasDueToSpell(uint32 spellId, SpellAuraHolder* except, AuraRe
     SpellAuraHolderBounds bounds = GetSpellAuraHolderBounds(spellId);
     for (SpellAuraHolderMap::iterator iter = bounds.first; iter != bounds.second; )
     {
-        if (iter->second != except)
+        if (iter->second && !iter->second->IsDeleted() && iter->second != except)
         {
             RemoveSpellAuraHolder(iter->second, mode);
             bounds = GetSpellAuraHolderBounds(spellId);
@@ -4569,7 +5816,7 @@ void Unit::RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId)
     SpellAuraHolderBounds bounds = GetSpellAuraHolderBounds(spellId);
     for (SpellAuraHolderMap::iterator iter = bounds.first; iter != bounds.second; )
     {
-        if (iter->second->GetCastItemGuid() == castItem->GetObjectGuid())
+        if (iter->second && !iter->second->IsDeleted() && iter->second->GetCastItemGuid() == castItem->GetObjectGuid())
         {
             RemoveSpellAuraHolder(iter->second);
             bounds = GetSpellAuraHolderBounds(spellId);
@@ -4582,41 +5829,69 @@ void Unit::RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId)
 
 void Unit::RemoveAurasWithInterruptFlags(uint32 flags)
 {
-    for (SpellAuraHolderMap::iterator iter = m_spellAuraHolders.begin(); iter != m_spellAuraHolders.end(); )
+    SpellIdSet spellsToRemove;
     {
-        if (iter->second->GetSpellProto()->AuraInterruptFlags & flags)
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        SpellAuraHolderMap const& holdersMap = GetSpellAuraHolderMap();
+        for (SpellAuraHolderMap::const_iterator iter = holdersMap.begin(); iter != holdersMap.end(); ++iter)
         {
-            RemoveSpellAuraHolder(iter->second);
-            iter = m_spellAuraHolders.begin();
+            if (!iter->second || iter->second->IsDeleted() || !iter->second->GetSpellProto())
+                continue;
+
+            if (iter->second->GetSpellProto()->AuraInterruptFlags & flags)
+                spellsToRemove.insert(iter->first);
         }
-        else
-            ++iter;
+    }
+
+    if (!spellsToRemove.empty())
+    {
+        for(SpellIdSet::const_iterator i = spellsToRemove.begin(); i != spellsToRemove.end(); ++i)
+            RemoveAurasDueToSpell(*i);
     }
 }
 
-void Unit::RemoveAurasWithAttribute(uint32 flags)
+void Unit::RemoveAurasWithAttribute(uint32 flags, uint32 exclude /* = 0*/)
 {
-    for (SpellAuraHolderMap::iterator iter = m_spellAuraHolders.begin(); iter != m_spellAuraHolders.end(); )
+    SpellIdSet spellsToRemove;
     {
-        if (iter->second->GetSpellProto()->HasAttribute((SpellAttributes)flags))
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        SpellAuraHolderMap const& holdersMap = GetSpellAuraHolderMap();
+        for (SpellAuraHolderMap::const_iterator iter = holdersMap.begin(); iter != holdersMap.end(); ++iter)
         {
-            RemoveSpellAuraHolder(iter->second);
-            iter = m_spellAuraHolders.begin();
+            if (!iter->second || iter->second->IsDeleted() || !iter->second->GetSpellProto())
+                continue;
+
+            if (iter->second->GetSpellProto()->HasAttribute((SpellAttributes)flags) &&
+                (exclude == 0 || !iter->second->GetSpellProto()->HasAttribute((SpellAttributes)exclude)))
+                spellsToRemove.insert(iter->first);
         }
-        else
-            ++iter;
+    }
+
+    if (!spellsToRemove.empty())
+    {
+        for(SpellIdSet::const_iterator i = spellsToRemove.begin(); i != spellsToRemove.end(); ++i)
+            RemoveAurasDueToSpell(*i);
     }
 }
 
-void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase)
+void Unit::RemoveNotOwnTrackedTargetAuras(uint32 newPhase)
 {
     // single target auras from other casters
     for (SpellAuraHolderMap::iterator iter = m_spellAuraHolders.begin(); iter != m_spellAuraHolders.end(); )
     {
-        if (iter->second->GetCasterGuid() != GetObjectGuid() && iter->second->IsSingleTarget())
+
+        TrackedAuraType trackedType = iter->second->GetTrackedAuraType();
+        if (!trackedType)
         {
-            if (!newPhase)
-            {
+            ++iter;
+            continue;
+        }
+
+
+        if (trackedType == TRACK_AURA_TYPE_CONTROL_VEHICLE || iter->second->GetCasterGuid() != GetObjectGuid())
+        {
+            if (!newPhase)
+            {
                 RemoveSpellAuraHolder(iter->second);
                 iter = m_spellAuraHolders.begin();
                 continue;
@@ -4636,77 +5911,123 @@ void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase)
         ++iter;
     }
 
-    // single target auras at other targets
-    SingleCastSpellTargetMap& scTargets = GetSingleCastSpellTargets();
-    for (SingleCastSpellTargetMap::iterator itr = scTargets.begin(); itr != scTargets.end(); )
+    // tracked aura targets at other targets
+    for (uint8 type = TRACK_AURA_TYPE_SINGLE_TARGET; type < MAX_TRACKED_AURA_TYPES; ++type)
     {
-        SpellEntry const* itr_spellEntry = itr->first;
-        ObjectGuid itr_targetGuid = itr->second;
-
-        if (itr_targetGuid != GetObjectGuid())
+        TrackedAuraTargetMap& scTargets = GetTrackedAuraTargets(TrackedAuraType(type));
+        for (TrackedAuraTargetMap::iterator itr = scTargets.begin(); itr != scTargets.end();)
         {
-            if(!newPhase)
-            {
-                scTargets.erase(itr);                       // remove for caster in any case
+            SpellEntry const* itr_spellEntry = itr->first;
+            ObjectGuid itr_targetGuid = itr->second;
 
-                // remove from target if target found
-                if (Unit* itr_target = GetMap()->GetUnit(itr_targetGuid))
-                    itr_target->RemoveAurasByCasterSpell(itr_spellEntry->Id, GetObjectGuid());
-
-                itr = scTargets.begin();                    // list can be changed at remove aura
-                continue;
-            }
-            else
+            if (itr_targetGuid != GetObjectGuid())
             {
-                Unit* itr_target = GetMap()->GetUnit(itr_targetGuid);
-                if(!itr_target || !itr_target->InSamePhase(newPhase))
+                if (!newPhase)
                 {
-                    scTargets.erase(itr);                   // remove for caster in any case
+                    scTargets.erase(itr);                       // remove for caster in any case
 
                     // remove from target if target found
-                    if (itr_target)
+                    if (Unit* itr_target = GetMap()->GetUnit(itr_targetGuid))
                         itr_target->RemoveAurasByCasterSpell(itr_spellEntry->Id, GetObjectGuid());
 
-                    itr = scTargets.begin();                // list can be changed at remove aura
+                    itr = scTargets.begin();                    // list can be changed at remove aura
                     continue;
                 }
+                else
+                {
+                    Unit* itr_target = GetMap()->GetUnit(itr_targetGuid);
+                    if (!itr_target || !itr_target->InSamePhase(newPhase))
+                    {
+                        scTargets.erase(itr);                   // remove for caster in any case
+
+                        // remove from target if target found
+                        if (itr_target)
+                            itr_target->RemoveAurasByCasterSpell(itr_spellEntry->Id, GetObjectGuid());
+
+                        itr = scTargets.begin();                // list can be changed at remove aura
+                        continue;
+                    }
+                }
             }
+
+            ++itr;
         }
+    }
+}
 
-        ++itr;
+void Unit::TriggerPassiveAurasWithAttribute(bool active, uint32 flags)
+{
+    AuraList triggerAuraList;
+    {
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        SpellAuraHolderMap const& holdersMap = GetSpellAuraHolderMap();
+        for (SpellAuraHolderMap::const_iterator iter = holdersMap.begin(); iter != holdersMap.end(); ++iter)
+        {
+            if (!iter->second ||
+                iter->second->IsDeleted() ||
+                !IsPassiveSpell(iter->second->GetSpellProto()) ||
+                !iter->second->GetSpellProto()->HasAttribute((SpellAttributes)flags)
+                )
+                continue;
+
+            for (uint8 i = EFFECT_INDEX_0; i < MAX_EFFECT_INDEX; ++i)
+                if (Aura* aura = iter->second->GetAuraByEffectIndex(SpellEffectIndex(i)))
+                    if (aura->IsActive() != active)
+                        triggerAuraList.push_back(AuraPair(aura));
+
+        }
     }
 
+    if (!triggerAuraList.empty())
+    {
+        for(AuraList::iterator i = triggerAuraList.begin(); i != triggerAuraList.end(); ++i)
+        {
+            DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST,"Unit::TriggerPassiveAurasWithAttribute %s try make %s aura %u index %u",
+                GetObjectGuid().GetString().c_str(), active ? "active" : "passive", (*i)->GetId(), (*i)->GetEffIndex());
+            (*i)()->ApplyModifier(active, true);
+        }
+    }
 }
 
-void Unit::RemoveSpellAuraHolder(SpellAuraHolder *holder, AuraRemoveMode mode)
+void Unit::RemoveSpellAuraHolder(SpellAuraHolderPtr holder, AuraRemoveMode mode)
 {
+    if (!AddSpellAuraHolderToRemoveList(holder))
+    {
+        sLog.outError("Unit::RemoveSpellAuraHolder cannot insert SpellAuraHolder (spell %u) to remove list!", holder ? holder->GetId() : 0);
+        return;
+    }
+
+    holder->SetRemoveMode(mode);
+
+    if (mode != AURA_REMOVE_BY_DELETE)
+        holder->HandleSpellSpecificBoostsForward(false);
+
     // Statue unsummoned at holder remove
     SpellEntry const* AurSpellInfo = holder->GetSpellProto();
     Totem* statue = NULL;
     Unit* caster = holder->GetCaster();
-    if(IsChanneledSpell(AurSpellInfo) && caster)
-        if(caster->GetTypeId()==TYPEID_UNIT && ((Creature*)caster)->IsTotem() && ((Totem*)caster)->GetTotemType()==TOTEM_STATUE)
+    if (IsChanneledSpell(AurSpellInfo) && caster)
+        if (caster->GetTypeId()==TYPEID_UNIT && ((Creature*)caster)->IsTotem() && ((Totem*)caster)->GetTotemType()==TOTEM_STATUE)
             statue = ((Totem*)caster);
 
-    if (m_spellAuraHoldersUpdateIterator != m_spellAuraHolders.end() && m_spellAuraHoldersUpdateIterator->second == holder)
-        ++m_spellAuraHoldersUpdateIterator;
-
-    SpellAuraHolderBounds bounds = GetSpellAuraHolderBounds(holder->GetId());
-    for (SpellAuraHolderMap::iterator itr = bounds.first; itr != bounds.second; ++itr)
     {
-        if (itr->second == holder)
+        SpellAuraHolderBounds bounds = GetSpellAuraHolderBounds(holder->GetId());
+        MAPLOCK_WRITE(this,MAP_LOCK_TYPE_AURAS);
+        for (SpellAuraHolderMap::iterator itr = bounds.first; itr != bounds.second; ++itr)
         {
-            m_spellAuraHolders.erase(itr);
-            break;
+            if (itr->second == holder)
+            {
+                m_spellAuraHolders.erase(itr);
+                break;
+            }
         }
     }
 
-    holder->SetRemoveMode(mode);
-    holder->UnregisterSingleCastHolder();
+    holder->UnregisterAndCleanupTrackedAuras();
 
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
     {
-        if (Aura *aura = holder->m_auras[i])
+        if (Aura* aura = holder->GetAuraByEffectIndex(SpellEffectIndex(i)))
             RemoveAura(aura, mode);
     }
 
@@ -4715,18 +6036,9 @@ void Unit::RemoveSpellAuraHolder(SpellAuraHolder *holder, AuraRemoveMode mode)
     if (mode != AURA_REMOVE_BY_DELETE)
         holder->HandleSpellSpecificBoosts(false);
 
-    if(statue)
+    if (statue)
         statue->UnSummon();
 
-    // If holder in use (removed from code that plan access to it data after return)
-    // store it in holder list with delayed deletion
-    if (holder->IsInUse())
-    {
-        holder->SetDeleted();
-        m_deletedHolders.push_back(holder);
-    }
-    else
-        delete holder;
 
     if (mode != AURA_REMOVE_BY_EXPIRE && IsChanneledSpell(AurSpellInfo) && !IsAreaOfEffectSpell(AurSpellInfo) &&
         caster && caster->GetObjectGuid() != GetObjectGuid())
@@ -4735,71 +6047,84 @@ void Unit::RemoveSpellAuraHolder(SpellAuraHolder *holder, AuraRemoveMode mode)
     }
 }
 
-void Unit::RemoveSingleAuraFromSpellAuraHolder(SpellAuraHolder *holder, SpellEffectIndex index, AuraRemoveMode mode)
+void Unit::RemoveSingleAuraFromSpellAuraHolder(SpellAuraHolderPtr holder, SpellEffectIndex index, AuraRemoveMode mode)
 {
+    if (!holder || holder->IsDeleted())
+        return;
+
     Aura *aura = holder->GetAuraByEffectIndex(index);
     if (!aura)
         return;
 
-    if (aura->IsLastAuraOnHolder())
+    RemoveAura(aura, mode);
+
+    if (!holder->IsDeleted() && holder->IsEmptyHolder())
         RemoveSpellAuraHolder(holder, mode);
-    else
-        RemoveAura(aura, mode);
 }
 
-void Unit::RemoveAura(Aura *Aur, AuraRemoveMode mode)
+void Unit::RemoveAura(Aura* aura, AuraRemoveMode mode)
 {
-    // remove from list before mods removing (prevent cyclic calls, mods added before including to aura list - use reverse order)
-    if (Aur->GetModifier()->m_auraname < TOTAL_AURAS)
-    {
-        m_modAuras[Aur->GetModifier()->m_auraname].remove(Aur);
-    }
+    // Lock holder for prevent deletion while aura deleting process
+    SpellAuraHolderPtr holder = aura->GetHolder();
+
+    // prevent double removing
+    if (!holder || aura->IsDeleted())
+        return;
 
     // Set remove mode
-    Aur->SetRemoveMode(mode);
+    aura->SetDeleted();
+    aura->SetRemoveMode(mode);
 
-    // some ShapeshiftBoosts at remove trigger removing other auras including parent Shapeshift aura
-    // remove aura from list before to prevent deleting it before
-    ///m_Auras.erase(i);
+    // remove from list before mods removing (prevent cyclic calls, mods added before including to aura list - use reverse order)
+    if (aura->GetModifier()->m_auraname < TOTAL_AURAS)
+    {
+        MAPLOCK_WRITE(this,MAP_LOCK_TYPE_AURAS);
+        m_modAuras[aura->GetModifier()->m_auraname].remove(AuraPair(aura));
 
-    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Aura %u now is remove mode %d",Aur->GetModifier()->m_auraname, mode);
+        // aura _MUST_ be remove from holder before unapply.
+        // un-apply code expected that aura not find by diff searches
+        // in another case it can be double removed for example, if target die/etc in un-apply process.
+        holder->RemoveAura(aura->GetEffIndex());
 
-    // aura _MUST_ be remove from holder before unapply.
-    // un-apply code expected that aura not find by diff searches
-    // in another case it can be double removed for example, if target die/etc in un-apply process.
-    Aur->GetHolder()->RemoveAura(Aur->GetEffIndex());
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Aura %u (spell %u) now is remove mode %d",aura->GetModifier()->m_auraname, aura->GetId(), mode);
+    }
+    else
+    {
+        holder->RemoveAura(aura->GetEffIndex());
+        sLog.outError("Unit::RemoveAura remove aura %u (spell %u) with unknown modifier type!", aura->GetModifier()->m_auraname, aura->GetId());
+    }
 
     // some auras also need to apply modifier (on caster) on remove
     if (mode == AURA_REMOVE_BY_DELETE)
     {
-        switch (Aur->GetModifier()->m_auraname)
+        switch (aura->GetModifier()->m_auraname)
         {
             // need properly undo any auras with player-caster mover set (or will crash at next caster move packet)
             case SPELL_AURA_MOD_POSSESS:
             case SPELL_AURA_MOD_POSSESS_PET:
             case SPELL_AURA_CONTROL_VEHICLE:
-                Aur->ApplyModifier(false,true);
+                aura->ApplyModifier(false,true);
+                break;
+            default:
                 break;
-            default: break;
         }
     }
     else
-        Aur->ApplyModifier(false,true);
+        aura->ApplyModifier(false,true);
 
-    // If aura in use (removed from code that plan access to it data after return)
-    // store it in aura list with delayed deletion
-    if (Aur->IsInUse())
-        m_deletedAuras.push_back(Aur);
-    else
-        delete Aur;
 }
 
 void Unit::RemoveAllAuras(AuraRemoveMode mode /*= AURA_REMOVE_BY_DEFAULT*/)
 {
-    while (!m_spellAuraHolders.empty())
+    for(SpellAuraHolderMap::iterator iter = m_spellAuraHolders.begin(); iter != m_spellAuraHolders.end();)
     {
-        SpellAuraHolderMap::iterator iter = m_spellAuraHolders.begin();
-        RemoveSpellAuraHolder(iter->second,mode);
+        if (!iter->second->IsDeleted())
+        {
+            RemoveSpellAuraHolder(iter->second,mode);
+            iter = m_spellAuraHolders.begin();
+        }
+        else
+            ++iter;
     }
 }
 
@@ -4813,7 +6138,7 @@ void Unit::RemoveArenaAuras(bool onleave)
                                                             // don't remove stances, shadowform, pally/hunter auras
             !iter->second->IsPassive() &&                   // don't remove passive auras
             (!iter->second->GetSpellProto()->HasAttribute(SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY) ||
-            !iter->second->GetSpellProto()->HasAttribute(SPELL_ATTR_UNK8)) &&
+            !iter->second->GetSpellProto()->HasAttribute(SPELL_ATTR_HIDE_IN_COMBAT_LOG)) &&
                                                             // not unaffected by invulnerability auras or not having that unknown flag (that seemed the most probable)
             (iter->second->IsPositive() != onleave))        // remove positive buffs on enter, negative buffs on leave
         {
@@ -4825,13 +6150,88 @@ void Unit::RemoveArenaAuras(bool onleave)
     }
 }
 
+void Unit::HandleArenaPreparation(bool apply)
+{
+    ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PREPARATION, apply);
+
+    if (apply)
+    {
+        // max regen powers at start preparation
+        SetHealth(GetMaxHealth());
+        SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
+        SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY));
+    }
+    else
+    {
+        // reset originally 0 powers at start/leave
+        SetPower(POWER_RAGE, 0);
+        SetPower(POWER_RUNIC_POWER, 0);
+        SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
+        SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY));
+
+        // Remove all buffs with duration < 25 sec (actually depends on config value)
+        // and auras, which have SPELL_ATTR_EX5_REMOVE_AT_ENTER_ARENA (former SPELL_ATTR_EX5_UNK2 = 0x00000004).
+        for (SpellAuraHolderMap::iterator iter = m_spellAuraHolders.begin(); iter != m_spellAuraHolders.end();)
+        {
+            if ((!iter->second->GetSpellProto()->HasAttribute(SPELL_ATTR_EX4_UNK21) &&
+                                                                // don't remove stances, shadowform, pally/hunter auras
+                !iter->second->IsPassive() &&                   // don't remove passive auras
+                (iter->second->GetAuraMaxDuration() > 0 &&
+                iter->second->GetAuraDuration() <= int32(sWorld.getConfig(CONFIG_UINT32_ARENA_AURAS_DURATION) * IN_MILLISECONDS))) ||
+                iter->second->GetSpellProto()->HasAttribute(SPELL_ATTR_EX5_REMOVE_AT_ENTER_ARENA))
+            {
+                RemoveSpellAuraHolder(iter->second, AURA_REMOVE_BY_CANCEL);
+                iter = m_spellAuraHolders.begin();
+            }
+            else
+                ++iter;
+        }
+    }
+
+    if (GetObjectGuid().IsPet())
+    {
+        Pet* pet = ((Pet*)this);
+        if (pet)
+        {
+            Unit* owner = pet->GetOwner();
+            if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
+                ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_AURAS);
+        }
+    }
+    else
+        CallForAllControlledUnits(ApplyArenaPreparationWithHelper(apply),CONTROLLED_PET|CONTROLLED_GUARDIANS);
+}
+
+bool Unit::RemoveSpellsCausingAuraByCaster(AuraType auraType, ObjectGuid casterGuid, AuraRemoveMode mode)
+{
+    SpellAuraHolderQueue holdersToRemove;
+    AuraList const& auras = GetAurasByType(auraType);
+    for (AuraList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter)
+    {
+        if (iter->IsEmpty() || (*iter)->GetHolder()->GetCasterGuid() != casterGuid)
+            continue;
+        holdersToRemove.push(iter->GetHolder());
+    }
+
+    if (holdersToRemove.empty())
+        return false;
+
+    while (!holdersToRemove.empty())
+    {
+        if (holdersToRemove.front() && !holdersToRemove.front()->IsDeleted())
+            RemoveSpellAuraHolder(holdersToRemove.front(), mode);
+        holdersToRemove.pop();
+    }
+    return true;
+}
+
 void Unit::RemoveAllAurasOnDeath()
 {
     // used just after dieing to remove all visible auras
     // and disable the mods for the passive ones
     for(SpellAuraHolderMap::iterator iter = m_spellAuraHolders.begin(); iter != m_spellAuraHolders.end();)
     {
-        if (!iter->second->IsPassive() && !iter->second->IsDeathPersistent())
+        if (iter->second && !iter->second->IsDeleted() && !iter->second->IsPassive() && !iter->second->IsDeathPersistent())
         {
             RemoveSpellAuraHolder(iter->second, AURA_REMOVE_BY_DEATH);
             iter = m_spellAuraHolders.begin();
@@ -4841,24 +6241,43 @@ void Unit::RemoveAllAurasOnDeath()
     }
 }
 
+void Unit::RemoveAllAurasOnEvade()
+{
+    // used when evading to remove all auras except some special auras
+    // Vehicle control auras should not be removed on evade - neither should linked auras
+    for (SpellAuraHolderMap::iterator iter = m_spellAuraHolders.begin(); iter != m_spellAuraHolders.end();)
+    {
+        SpellEntry const* proto = iter->second->GetSpellProto();
+        if (!IsSpellHaveAura(proto, SPELL_AURA_CONTROL_VEHICLE))
+        {
+            RemoveSpellAuraHolder(iter->second, AURA_REMOVE_BY_DEFAULT);
+            iter = m_spellAuraHolders.begin();
+        }
+        else
+            ++iter;
+    }
+}
+
 void Unit::DelaySpellAuraHolder(uint32 spellId, int32 delaytime, ObjectGuid casterGuid)
 {
     SpellAuraHolderBounds bounds = GetSpellAuraHolderBounds(spellId);
+    MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
     for (SpellAuraHolderMap::iterator iter = bounds.first; iter != bounds.second; ++iter)
     {
-        SpellAuraHolder* holder = iter->second;
+        if (!iter->second || !iter->second->IsDeleted())
+            continue;
 
-        if (casterGuid != holder->GetCasterGuid())
+        if (casterGuid != iter->second->GetCasterGuid())
             continue;
 
-        if (holder->GetAuraDuration() < delaytime)
-            holder->SetAuraDuration(0);
+        if (iter->second->GetAuraDuration() < delaytime)
+            iter->second->SetAuraDuration(0);
         else
-            holder->SetAuraDuration(holder->GetAuraDuration() - delaytime);
+            iter->second->SetAuraDuration(iter->second->GetAuraDuration() - delaytime);
 
-        holder->SendAuraUpdate(false);
+        iter->second->SendAuraUpdate(false);
 
-        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell %u partially interrupted on %s, new duration: %u ms", spellId, GetGuidStr().c_str(), holder->GetAuraDuration());
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell %u partially interrupted on %s, new duration: %u ms", spellId, GetObjectGuid().GetString().c_str(), iter->second->GetAuraDuration());
     }
 }
 
@@ -4883,6 +6302,32 @@ bool Unit::HasAuraType(AuraType auraType) const
     return !GetAurasByType(auraType).empty();
 }
 
+bool Unit::HasAuraTypeWithCaster(AuraType auraType, ObjectGuid casterGuid) const
+{
+    AuraList const& mTotalAuraList = GetAurasByType(auraType);
+    for (AuraList::const_iterator itr = mTotalAuraList.begin(); itr != mTotalAuraList.end(); ++itr)
+    {
+        if ((*itr)->GetCasterGuid() == casterGuid)
+            return true;
+    }
+    return false;
+}
+
+bool Unit::HasNegativeAuraType(AuraType auraType) const
+{
+    Unit::AuraList const& auras = GetAurasByType(auraType);
+
+    if (auras.empty())
+        return false;
+
+    for (Unit::AuraList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
+    {
+        if (!(*itr)->GetHolder()->IsPositive())
+            return true;
+    }
+    return false;
+}
+
 bool Unit::HasAffectedAura(AuraType auraType, SpellEntry const* spellProto) const
 {
     Unit::AuraList const& auras = GetAurasByType(auraType);
@@ -4900,28 +6345,128 @@ Aura* Unit::GetAura(uint32 spellId, SpellEffectIndex effindex)
 {
     SpellAuraHolderBounds bounds = GetSpellAuraHolderBounds(spellId);
     if (bounds.first != bounds.second)
-        return bounds.first->second->GetAuraByEffectIndex(effindex);
+    {
+        MAPLOCK_READ(this, MAP_LOCK_TYPE_AURAS);
+        if (bounds.first->second && !bounds.first->second->IsDeleted())
+            return bounds.first->second->GetAuraByEffectIndex(effindex);
+    }
     return NULL;
 }
 
-Aura* Unit::GetAura(AuraType type, SpellFamily family, uint64 familyFlag, uint32 familyFlag2, ObjectGuid casterGuid)
+Aura* Unit::GetAura(AuraType type, SpellFamily family, ClassFamilyMask const& classMask, ObjectGuid casterGuid)
 {
-    AuraList const& auras = GetAurasByType(type);
-    for(AuraList::const_iterator i = auras.begin();i != auras.end(); ++i)
-        if ((*i)->GetSpellProto()->IsFitToFamily(family, familyFlag, familyFlag2) &&
+    MAPLOCK_TRYREAD(this,MAP_LOCK_TYPE_AURAS);
+    AuraList& auras = GetAurasByType(type);
+    for(AuraList::iterator i = auras.begin(); i != auras.end(); ++i)
+    {
+        if (i->IsEmpty())
+            continue;
+
+        if ((*i)->GetSpellProto()->IsFitToFamily(family, classMask) &&
             (!casterGuid || (*i)->GetCasterGuid() == casterGuid))
-            return *i;
+            return (*i)();
+    }
+
+    return NULL;
+}
+
+Aura* Unit::GetAuraByEffectMask(AuraType type, SpellFamily family, ClassFamilyMask const& classMask, ObjectGuid casterGuid)
+{
+    MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+    AuraList& auras = GetAurasByType(type);
+    for (AuraList::iterator i = auras.begin(); i != auras.end(); ++i)
+    {
+        if (i->IsEmpty())
+            continue;
+
+        if ((*i)->GetAuraSpellClassMask() == classMask &&
+            (family <= SPELLFAMILY_PET && SpellFamily((*i)->GetSpellProto()->SpellFamilyName) == family) &&
+            (!casterGuid || (*i)->GetCasterGuid() == casterGuid))
+            return (*i)();
+    }
+
+    return NULL;
+}
+
+Aura const* Unit::GetTriggeredByClientAura(uint32 spellId)
+{
+    if (spellId)
+    {
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        AuraList const& auras = GetAurasByType(SPELL_AURA_PERIODIC_TRIGGER_BY_CLIENT);
+        if (!auras.empty())
+        {
+            for (AuraList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
+            {
+                if (itr->IsEmpty())
+                    continue;
+
+                if ((*itr)->GetHolder()->GetCasterGuid() == GetObjectGuid() &&
+                    (*itr)->GetHolder()->GetSpellProto()->EffectTriggerSpell[(*itr)->GetEffIndex()] == spellId)
+                    return (*itr)();
+            }
+        }
+    }
+    return NULL;
+}
+
+Aura* Unit::GetScalingAura(AuraType type, uint32 stat)
+{
+    AuraList& auras = GetAurasByType(type);
+    if (!auras.empty())
+    {
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        for (AuraList::iterator i = auras.begin(); i != auras.end(); ++i)
+        {
+            if (i->IsEmpty())
+                continue;
 
+            if (i->GetHolder()->GetCasterGuid() != GetObjectGuid())
+                continue;
+
+            if (i->GetHolder()->GetSpellProto()->HasAttribute(SPELL_ATTR_EX4_PET_SCALING_AURA))
+            {
+                switch(type)
+                {
+                    case SPELL_AURA_MOD_ATTACK_POWER:
+                    case SPELL_AURA_MOD_POWER_REGEN:
+                    case SPELL_AURA_MOD_HIT_CHANCE:
+                    case SPELL_AURA_MOD_SPELL_HIT_CHANCE:
+                    case SPELL_AURA_MOD_EXPERTISE:
+                        return (*i)();
+                    case SPELL_AURA_MOD_DAMAGE_DONE:
+                        if ((*i)->GetModifier()->m_miscvalue == SpellSchoolMask(stat))
+                            return (*i)();
+                        break;
+                    case SPELL_AURA_MOD_RESISTANCE:
+                        if ((*i)->GetModifier()->m_miscvalue & (1 << SpellSchools(stat)))
+                            return (*i)();
+                        break;
+                    case SPELL_AURA_MOD_STAT:
+                        if ((*i)->GetModifier()->m_miscvalue == Stats(stat))
+                            return (*i)();
+                        break;
+                    case SPELL_AURA_HASTE_ALL:
+                        return (*i)();
+                    default:
+                        break;
+                }
+            }
+        }
+    }
     return NULL;
 }
 
 bool Unit::HasAura(uint32 spellId, SpellEffectIndex effIndex) const
 {
     SpellAuraHolderConstBounds spair = GetSpellAuraHolderBounds(spellId);
-    for(SpellAuraHolderMap::const_iterator i_holder = spair.first; i_holder != spair.second; ++i_holder)
-        if (i_holder->second->GetAuraByEffectIndex(effIndex))
-            return true;
-
+    if (spair.first != spair.second)
+    {
+        MAPLOCK_READ(const_cast<Unit*>(this), MAP_LOCK_TYPE_AURAS);
+        for (SpellAuraHolderMap::const_iterator i_holder = spair.first; i_holder != spair.second; ++i_holder)
+            if (i_holder->second && !i_holder->second->IsDeleted() && i_holder->second->GetAuraByEffectIndex(effIndex))
+                return true;
+    }
     return false;
 }
 
@@ -4932,29 +6477,61 @@ bool Unit::HasAuraOfDifficulty(uint32 spellId) const
         if (SpellEntry const* spellDiffEntry = GetSpellEntryByDifficulty(spellEntry->SpellDifficultyId, GetMap()->GetDifficulty(), GetMap()->IsRaid()))
             spellId = spellDiffEntry->Id;
 
+    MAPLOCK_READ(const_cast<Unit*>(this), MAP_LOCK_TYPE_AURAS);
     return m_spellAuraHolders.find(spellId) != m_spellAuraHolders.end();
 }
 
+SpellAuraHolderPtr Unit::GetVisibleAura(uint8 slot) const
+{
+    if (slot >= m_visibleAuras.size() || slot >= MAX_AURAS)
+        return SpellAuraHolderPtr();
+
+    return m_visibleAuras[(size_t)slot];
+}
+
+void Unit::SetVisibleAura(uint8 slot, SpellAuraHolderPtr holder)
+{
+    if (slot >= MAX_AURAS || slot > m_visibleAuras.size())
+        return;
+    else if (slot == m_visibleAuras.size())
+        m_visibleAuras.push_back(holder);
+    else
+        m_visibleAuras[slot] = holder;
+}
+
+uint8 Unit::GetVisibleAurasCount() const
+{
+    uint8 result = 0;
+    VisibleAuraMap const& visibleAuras = GetVisibleAuras();
+    for (size_t i = 0; i < MAX_AURAS && i < visibleAuras.size() ; ++i)
+    {
+        if (visibleAuras[i])
+            ++result;
+    }
+    return result;
+}
+
 void Unit::AddDynObject(DynamicObject* dynObj)
 {
-    m_dynObjGUIDs.push_back(dynObj->GetObjectGuid());
+    m_dynObjGuids.push_back(dynObj->GetObjectGuid());
 }
 
 void Unit::RemoveDynObject(uint32 spellid)
 {
-    if(m_dynObjGUIDs.empty())
+    if (m_dynObjGuids.empty())
         return;
-    for (DynObjectGUIDs::iterator i = m_dynObjGUIDs.begin(); i != m_dynObjGUIDs.end();)
+
+    for (GuidList::iterator i = m_dynObjGuids.begin(); i != m_dynObjGuids.end();)
     {
         DynamicObject* dynObj = GetMap()->GetDynamicObject(*i);
         if(!dynObj)
         {
-            i = m_dynObjGUIDs.erase(i);
+            i = m_dynObjGuids.erase(i);
         }
-        else if(spellid == 0 || dynObj->GetSpellId() == spellid)
+        else if (spellid == 0 || dynObj->GetSpellId() == spellid)
         {
             dynObj->Delete();
-            i = m_dynObjGUIDs.erase(i);
+            i = m_dynObjGuids.erase(i);
         }
         else
             ++i;
@@ -4963,22 +6540,41 @@ void Unit::RemoveDynObject(uint32 spellid)
 
 void Unit::RemoveAllDynObjects()
 {
-    while(!m_dynObjGUIDs.empty())
+    while(!m_dynObjGuids.empty())
     {
-        if (DynamicObject* dynObj = GetMap()->GetDynamicObject(*m_dynObjGUIDs.begin()))
+        if (DynamicObject* dynObj = GetMap()->GetDynamicObject(*m_dynObjGuids.begin()))
             dynObj->Delete();
-        m_dynObjGUIDs.erase(m_dynObjGUIDs.begin());
+
+        m_dynObjGuids.erase(m_dynObjGuids.begin());
+    }
+}
+
+DynamicObject* Unit::GetEffectiveDynObject(uint32 spellId, SpellEffectIndex effIndex, Unit* pTarget)
+{
+    for (GuidList::iterator itr = m_dynObjGuids.begin(); itr != m_dynObjGuids.end();)
+    {
+        DynamicObject* dynObj = GetMap()->GetDynamicObject(*itr);
+        if(!dynObj)
+        {
+            itr = m_dynObjGuids.erase(itr);
+            continue;
+        }
+
+        if (dynObj->GetSpellId() == spellId && dynObj->GetEffIndex() == effIndex && dynObj->IsWithinDistInMap(pTarget, dynObj->GetRadius()))
+            return dynObj;
+        ++itr;
     }
+    return NULL;
 }
 
 DynamicObject * Unit::GetDynObject(uint32 spellId, SpellEffectIndex effIndex)
 {
-    for (DynObjectGUIDs::iterator i = m_dynObjGUIDs.begin(); i != m_dynObjGUIDs.end();)
+    for (GuidList::iterator i = m_dynObjGuids.begin(); i != m_dynObjGuids.end();)
     {
         DynamicObject* dynObj = GetMap()->GetDynamicObject(*i);
         if(!dynObj)
         {
-            i = m_dynObjGUIDs.erase(i);
+            i = m_dynObjGuids.erase(i);
             continue;
         }
 
@@ -4991,12 +6587,12 @@ DynamicObject * Unit::GetDynObject(uint32 spellId, SpellEffectIndex effIndex)
 
 DynamicObject * Unit::GetDynObject(uint32 spellId)
 {
-    for (DynObjectGUIDs::iterator i = m_dynObjGUIDs.begin(); i != m_dynObjGUIDs.end();)
+    for (GuidList::iterator i = m_dynObjGuids.begin(); i != m_dynObjGuids.end();)
     {
         DynamicObject* dynObj = GetMap()->GetDynamicObject(*i);
         if(!dynObj)
         {
-            i = m_dynObjGUIDs.erase(i);
+            i = m_dynObjGuids.erase(i);
             continue;
         }
 
@@ -5032,7 +6628,7 @@ void Unit::AddGameObject(GameObject* gameObj)
         // Need disable spell use for owner
         if (createBySpell && createBySpell->HasAttribute(SPELL_ATTR_DISABLED_WHILE_ACTIVE))
             // note: item based cooldowns and cooldown spell mods with charges ignored (unknown existing cases)
-            ((Player*)this)->AddSpellAndCategoryCooldowns(createBySpell, 0, NULL, true);
+            AddSpellAndCategoryCooldowns(createBySpell, 0, true);
     }
 }
 
@@ -5124,19 +6720,19 @@ void Unit::RemoveAllGameObjects()
     m_wildGameObjs.clear();
 }
 
-void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log)
+void Unit::SendSpellNonMeleeDamageLog(DamageInfo *log)
 {
     uint32 targetHealth = log->target->GetHealth();
     uint32 overkill = log->damage > targetHealth ? log->damage - targetHealth : 0;
 
-    WorldPacket data(SMSG_SPELLNONMELEEDAMAGELOG, (16+4+4+4+1+4+4+1+1+4+4+1)); // we guess size
+    WorldPacket data(SMSG_SPELLNONMELEEDAMAGELOG, (9+9+4+4+4+1+4+4+1+1+4+4+1)); // we guess size
     data << log->target->GetPackGUID();
     data << log->attacker->GetPackGUID();
-    data << uint32(log->SpellID);
+    data << uint32(log->GetSpellId());
     data << uint32(log->damage);                            // damage amount
     data << uint32(overkill);                               // overkill
-    data << uint8 (log->schoolMask);                        // damage school
-    data << uint32(log->absorb);                            // AbsorbedDamage
+    data << uint8 (log->GetSchoolMask());                      // damage school
+    data << uint32(log->GetAbsorb());                       // AbsorbedDamage
     data << uint32(log->resist);                            // resist
     data << uint8 (log->physicalLog);                       // if 1, then client show spell name (example: %s's ranged shot hit %s for %u school or %s suffers %u school damage from %s's spell_name
     data << uint8 (log->unused);                            // unused
@@ -5148,14 +6744,13 @@ void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log)
 
 void Unit::SendSpellNonMeleeDamageLog(Unit *target, uint32 SpellID, uint32 Damage, SpellSchoolMask damageSchoolMask, uint32 AbsorbedDamage, uint32 Resist, bool PhysicalDamage, uint32 Blocked, bool CriticalHit)
 {
-    SpellNonMeleeDamage log(this, target, SpellID, damageSchoolMask);
-    log.damage = Damage - AbsorbedDamage - Resist - Blocked;
-    log.absorb = AbsorbedDamage;
+    DamageInfo log(this, target, SpellID,(Damage - AbsorbedDamage - Resist - Blocked));
+    log.SetAbsorb(AbsorbedDamage);
     log.resist = Resist;
     log.physicalLog = PhysicalDamage;
     log.blocked = Blocked;
     log.HitInfo = SPELL_HIT_TYPE_UNK1 | SPELL_HIT_TYPE_UNK3 | SPELL_HIT_TYPE_UNK6;
-    if(CriticalHit)
+    if (CriticalHit)
         log.HitInfo |= SPELL_HIT_TYPE_CRIT;
     SendSpellNonMeleeDamageLog(&log);
 }
@@ -5207,15 +6802,29 @@ void Unit::SendPeriodicAuraLog(SpellPeriodicAuraLogInfo *pInfo)
     aura->GetTarget()->SendMessageToSet(&data, true);
 }
 
-void Unit::ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVictim, uint32 procExtra, uint32 amount, WeaponAttackType attType, SpellEntry const *procSpell)
+void Unit::ProcDamageAndSpell(Unit* pVictim, uint32 procAttacker, uint32 procVictim, uint32 procExtra, uint32 amount, WeaponAttackType attType, SpellEntry const* procSpell)
+{
+    // wrapper for old call convention
+    DamageInfo damageInfo(this, pVictim, procSpell);
+    damageInfo.damage        = amount;
+    damageInfo.procAttacker  = procAttacker;
+    damageInfo.procVictim    = procVictim;
+    damageInfo.procEx        = procExtra;
+    damageInfo.attackType    = attType;
+    ProcDamageAndSpell(&damageInfo);
+}
+
+void Unit::ProcDamageAndSpell(DamageInfo* damageInfo)
 {
      // Not much to do if no flags are set.
-    if (procAttacker)
-        ProcDamageAndSpellFor(false,pVictim,procAttacker, procExtra,attType, procSpell, amount);
+    if (IsInWorld() && damageInfo->procAttacker)
+        ProcDamageAndSpellFor(false, damageInfo);
+
+    Unit* pVictim = damageInfo->target;
     // Now go on with a victim's events'n'auras
     // Not much to do if no flags are set or there is no victim
-    if(pVictim && pVictim->isAlive() && procVictim)
-        pVictim->ProcDamageAndSpellFor(true,this,procVictim, procExtra, attType, procSpell, amount);
+    if (pVictim && pVictim->IsInWorld() && pVictim->isAlive() && damageInfo->procVictim)
+        pVictim->ProcDamageAndSpellFor(true, damageInfo);
 }
 
 void Unit::SendSpellMiss(Unit *target, uint32 spellID, SpellMissInfo missInfo)
@@ -5232,7 +6841,7 @@ void Unit::SendSpellMiss(Unit *target, uint32 spellID, SpellMissInfo missInfo)
     SendMessageToSet(&data, true);
 }
 
-void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo)
+void Unit::SendAttackStateUpdate(DamageInfo* damageInfo)
 {
     DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "WORLD: Sending SMSG_ATTACKERSTATEUPDATE");
 
@@ -5250,18 +6859,18 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo)
 
     for(uint32 i = 0; i < count; ++i)
     {
-        data << uint32(damageInfo->damageSchoolMask);       // School of sub damage
+        data << uint32(damageInfo->GetSchoolMask());           // School of sub damage
         data << float(damageInfo->damage);                  // sub damage
         data << uint32(damageInfo->damage);                 // Sub Damage
     }
 
-    if(damageInfo->HitInfo & (HITINFO_ABSORB | HITINFO_ABSORB2))
+    if (damageInfo->HitInfo & (HITINFO_ABSORB | HITINFO_PARTIAL_ABSORB))
     {
         for(uint32 i = 0; i < count; ++i)
-            data << uint32(damageInfo->absorb);             // Absorb
+            data << uint32(damageInfo->GetAbsorb());             // Absorb
     }
 
-    if(damageInfo->HitInfo & (HITINFO_RESIST | HITINFO_RESIST2))
+    if (damageInfo->HitInfo & (HITINFO_RESIST | HITINFO_PARTIAL_RESIST))
     {
         for(uint32 i = 0; i < count; ++i)
             data << uint32(damageInfo->resist);             // Resist
@@ -5272,13 +6881,13 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo)
     data << uint32(0);                                      // spell id, seen with heroic strike and disarm as examples.
                                                             // HITINFO_NOACTION normally set if spell
 
-    if(damageInfo->HitInfo & HITINFO_BLOCK)
-        data << uint32(damageInfo->blocked_amount);
+    if (damageInfo->HitInfo & HITINFO_BLOCK)
+        data << uint32(damageInfo->blocked);
 
-    if(damageInfo->HitInfo & HITINFO_UNK22)
+    if (damageInfo->HitInfo & HITINFO_RAGE_GAIN)
         data << uint32(0);                                  // count of some sort?
 
-    if(damageInfo->HitInfo & HITINFO_UNK0)
+    if (damageInfo->HitInfo & HITINFO_UNK0)
     {
         data << uint32(0);
         data << float(0);
@@ -5300,26 +6909,13 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo)
     SendMessageToSet( &data, true );
 }
 
-void Unit::SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 /*SwingType*/, SpellSchoolMask damageSchoolMask, uint32 Damage, uint32 AbsorbDamage, uint32 Resist, VictimState TargetState, uint32 BlockedAmount)
-{
-    CalcDamageInfo dmgInfo;
-    dmgInfo.HitInfo = HitInfo;
-    dmgInfo.attacker = this;
-    dmgInfo.target = target;
-    dmgInfo.damage = Damage - AbsorbDamage - Resist - BlockedAmount;
-    dmgInfo.damageSchoolMask = damageSchoolMask;
-    dmgInfo.absorb = AbsorbDamage;
-    dmgInfo.resist = Resist;
-    dmgInfo.TargetState = TargetState;
-    dmgInfo.blocked_amount = BlockedAmount;
-    SendAttackStateUpdate(&dmgInfo);
-}
-
-void Unit::setPowerType(Powers new_powertype)
+void Unit::SetPowerType(Powers new_powertype)
 {
+    // set power type
     SetByteValue(UNIT_FIELD_BYTES_0, 3, new_powertype);
 
-    if(GetTypeId() == TYPEID_PLAYER)
+    // group updates
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         if(((Player*)this)->GetGroup())
             ((Player*)this)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POWER_TYPE);
@@ -5327,10 +6923,10 @@ void Unit::setPowerType(Powers new_powertype)
     else if(((Creature*)this)->IsPet())
     {
         Pet *pet = ((Pet*)this);
-        if(pet->isControlled())
+        if (pet->isControlled())
         {
             Unit *owner = GetOwner();
-            if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
+            if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_POWER_TYPE);
         }
     }
@@ -5367,8 +6963,12 @@ FactionTemplateEntry const* Unit::getFactionTemplateEntry() const
 
         if (GetObjectGuid() != guid)
         {
-            sLog.outError("%s have invalid faction (faction template id) #%u", GetGuidStr().c_str(), getFaction());
             guid = GetObjectGuid();
+
+            if (guid.GetHigh() == HIGHGUID_PET)
+                sLog.outError("%s (base creature entry %u) have invalid faction template id %u, owner %s", GetGuidStr().c_str(), GetEntry(), getFaction(), ((Pet*)this)->GetOwnerGuid().GetString().c_str());
+            else
+                sLog.outError("%s have invalid faction template id %u", GetGuidStr().c_str(), getFaction());
         }
     }
     return entry;
@@ -5376,6 +6976,9 @@ FactionTemplateEntry const* Unit::getFactionTemplateEntry() const
 
 bool Unit::IsHostileTo(Unit const* unit) const
 {
+    if (!unit || !unit->IsInWorld())
+        return false;
+
     // always non-hostile to self
     if (unit == this)
         return false;
@@ -5384,24 +6987,37 @@ bool Unit::IsHostileTo(Unit const* unit) const
     if (unit->GetTypeId() == TYPEID_PLAYER && ((Player const*)unit)->isGameMaster())
         return false;
 
+    Unit const* selfVictim = getVictim();
+    Unit const* unitVictim = unit->getVictim();
+
     // always hostile to enemy
-    if (getVictim() == unit || unit->getVictim() == this)
+    if (selfVictim == unit || unitVictim == this)
         return true;
 
     // test pet/charm masters instead pers/charmeds
     Unit const* testerOwner = GetCharmerOrOwner();
     Unit const* targetOwner = unit->GetCharmerOrOwner();
+    Unit* testerVictim;
+    Unit* targetVictim;
 
     // always hostile to owner's enemy
-    if (testerOwner && (testerOwner->getVictim() == unit || unit->getVictim() == testerOwner))
-        return true;
+    if (testerOwner)
+    {
+        testerVictim = testerOwner->getVictim();
+        if (testerVictim == unit || unitVictim == testerOwner)
+            return true;
+    }
 
     // always hostile to enemy owner
-    if (targetOwner && (getVictim() == targetOwner || targetOwner->getVictim() == this))
-        return true;
+    if (targetOwner)
+    {
+        targetVictim = targetOwner->getVictim();
+        if (selfVictim == targetOwner || targetVictim == this)
+            return true;
+    }
 
     // always hostile to owner of owner's enemy
-    if (testerOwner && targetOwner && (testerOwner->getVictim() == targetOwner || targetOwner->getVictim() == testerOwner))
+    if (testerOwner && targetOwner && (testerVictim == targetOwner || targetVictim == testerOwner))
         return true;
 
     Unit const* tester = testerOwner ? testerOwner : this;
@@ -5488,6 +7104,9 @@ bool Unit::IsHostileTo(Unit const* unit) const
 
 bool Unit::IsFriendlyTo(Unit const* unit) const
 {
+    if (!unit || !unit->IsInWorld())
+        return true;
+
     // always friendly to self
     if (unit == this)
         return true;
@@ -5496,24 +7115,37 @@ bool Unit::IsFriendlyTo(Unit const* unit) const
     if (unit->GetTypeId() == TYPEID_PLAYER && ((Player const*)unit)->isGameMaster())
         return true;
 
+    Unit const* selfVictim = getVictim();
+    Unit const* unitVictim = unit->getVictim();
+
     // always non-friendly to enemy
-    if (getVictim() == unit || unit->getVictim() == this)
+    if (selfVictim == unit || unitVictim == this)
         return false;
 
     // test pet/charm masters instead pers/charmeds
     Unit const* testerOwner = GetCharmerOrOwner();
     Unit const* targetOwner = unit->GetCharmerOrOwner();
+    Unit* testerVictim;
+    Unit* targetVictim;
 
     // always non-friendly to owner's enemy
-    if (testerOwner && (testerOwner->getVictim() == unit || unit->getVictim() == testerOwner))
-        return false;
-
+    if (testerOwner)
+    {
+        testerVictim = testerOwner->getVictim();
+        if (testerVictim == unit || unitVictim == testerOwner)
+            return false;
+    }
+
     // always non-friendly to enemy owner
-    if (targetOwner && (getVictim() == targetOwner || targetOwner->getVictim() == this))
-        return false;
+    if (targetOwner)
+    {
+        targetVictim = targetOwner->getVictim();
+        if (selfVictim == targetOwner || targetVictim == this)
+            return false;
+    }
 
     // always non-friendly to owner of owner's enemy
-    if (testerOwner && targetOwner && (testerOwner->getVictim() == targetOwner || targetOwner->getVictim() == testerOwner))
+    if (testerOwner && targetOwner && (testerVictim == targetOwner || targetVictim == testerOwner))
         return false;
 
     Unit const* tester = testerOwner ? testerOwner : this;
@@ -5555,8 +7187,8 @@ bool Unit::IsFriendlyTo(Unit const* unit) const
     }
 
     // faction base cases
-    FactionTemplateEntry const*tester_faction = tester->getFactionTemplateEntry();
-    FactionTemplateEntry const*target_faction = target->getFactionTemplateEntry();
+    FactionTemplateEntry const* tester_faction = tester->getFactionTemplateEntry();
+    FactionTemplateEntry const* target_faction = target->getFactionTemplateEntry();
     if (!tester_faction || !target_faction)
         return false;
 
@@ -5605,7 +7237,7 @@ bool Unit::IsHostileToPlayers() const
         return false;
 
     FactionEntry const* raw_faction = sFactionStore.LookupEntry(my_faction->faction);
-    if(raw_faction && raw_faction->reputationListID >=0 )
+    if (raw_faction && raw_faction->reputationListID >=0 )
         return false;
 
     return my_faction->IsHostileToPlayers();
@@ -5618,12 +7250,36 @@ bool Unit::IsNeutralToAll() const
         return true;
 
     FactionEntry const* raw_faction = sFactionStore.LookupEntry(my_faction->faction);
-    if(raw_faction && raw_faction->reputationListID >=0 )
+    if (raw_faction && raw_faction->reputationListID >=0 )
         return false;
 
     return my_faction->IsNeutralToAll();
 }
 
+Unit* Unit::getAttackerForHelper()
+{
+    if (Unit* pVictim = getVictim())
+        return pVictim;
+
+    if (!IsInCombat())
+        return NULL;
+
+    GuidSet& attackers = GetMap()->GetAttackersFor(GetObjectGuid());
+    if (!attackers.empty())
+    {
+        for (GuidSet::const_iterator itr = attackers.begin(); itr != attackers.end();)
+        {
+            ObjectGuid guid = *itr++;
+            Unit* attacker = GetMap()->GetUnit(guid);
+            if (!attacker || !attacker->isAlive())
+                GetMap()->RemoveAttackerFor(GetObjectGuid(), guid);
+            else
+                return attacker;
+        }
+    }
+    return NULL;
+}
+
 bool Unit::Attack(Unit *victim, bool meleeAttack)
 {
     if(!victim || victim == this)
@@ -5633,12 +7289,26 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
     if(!isAlive() || !victim->IsInWorld() || !victim->isAlive())
         return false;
 
-    // player cannot attack in mount state
-    if(GetTypeId()==TYPEID_PLAYER && IsMounted())
+    // player cannot attack while mounted or in vehicle (exclude special vehicles)if
+    if (GetTypeId() == TYPEID_PLAYER && IsMounted())
+        return false;
+
+    if (GetTypeId() == TYPEID_PLAYER)
+    {
+        if (VehicleKitPtr vehicle = GetVehicle())
+        {
+            if (VehicleSeatEntry const* seatInfo = vehicle->GetSeatInfo(this))
+                if (!(seatInfo->m_flags & (SEAT_FLAG_CAN_CAST | SEAT_FLAG_CAN_ATTACK)))
+                    return false;
+        }
+    }
+
+    // not attack pacified targets
+    if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
         return false;
 
     // nobody can attack GM in GM-mode
-    if(victim->GetTypeId()==TYPEID_PLAYER)
+    if (victim->GetTypeId()==TYPEID_PLAYER)
     {
         if(((Player*)victim)->isGameMaster())
             return false;
@@ -5650,16 +7320,16 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
     }
 
     // remove SPELL_AURA_MOD_UNATTACKABLE at attack (in case non-interruptible spells stun aura applied also that not let attack)
-    if(HasAuraType(SPELL_AURA_MOD_UNATTACKABLE))
+    if (HasAuraType(SPELL_AURA_MOD_UNATTACKABLE))
         RemoveSpellsCausingAura(SPELL_AURA_MOD_UNATTACKABLE);
 
     // in fighting already
-    if (m_attacking)
+    if (m_attackingGuid)
     {
-        if (m_attacking == victim)
+        if (m_attackingGuid == victim->GetObjectGuid())
         {
             // switch to melee attack from ranged/magic
-            if( meleeAttack && !hasUnitState(UNIT_STAT_MELEE_ATTACKING) )
+            if ( meleeAttack && !hasUnitState(UNIT_STAT_MELEE_ATTACKING) )
             {
                 addUnitState(UNIT_STAT_MELEE_ATTACKING);
                 SendMeleeAttackStart(victim);
@@ -5675,18 +7345,25 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
     else
     {
         // set position before any AI calls/assistance
-        if(GetTypeId()==TYPEID_UNIT)
+        if (GetTypeId() == TYPEID_UNIT && !((Creature*)this)->IsInEvadeMode())
             ((Creature*)this)->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ());
     }
 
+    if (!GetMap())
+        return false;
+
     // Set our target
     SetTargetGuid(victim->GetObjectGuid());
 
-    if(meleeAttack)
+    if (meleeAttack)
+    {
         addUnitState(UNIT_STAT_MELEE_ATTACKING);
+        SendMeleeAttackStart(victim);
+    }
 
-    m_attacking = victim;
-    m_attacking->_addAttacker(this);
+    m_attackingGuid = victim->GetObjectGuid();
+
+    GetMap()->AddAttackerFor(m_attackingGuid,GetObjectGuid());
 
     if (GetTypeId() == TYPEID_UNIT)
     {
@@ -5695,39 +7372,61 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
     }
 
     // delay offhand weapon attack to next attack time
-    if(haveOffhandWeapon())
+    if (haveOffhandWeapon())
         resetAttackTimer(OFF_ATTACK);
 
-    if(meleeAttack)
-        SendMeleeAttackStart(victim);
-
     return true;
 }
 
 void Unit::AttackedBy(Unit* attacker)
 {
-    // trigger AI reaction
-    if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->AI())
-        ((Creature*)this)->AI()->AttackedBy(attacker);
-
-    // do not pet reaction for self inflicted damage (like environmental)
-    if (attacker == this)
+    if (IsFriendlyTo(attacker) || attacker->IsFriendlyTo(this))
         return;
 
+    if (!isInCombat() || !getVictim())
+    {
+        // trigger AI reaction
+        if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->AI())
+            ((Creature*)this)->AI()->AttackedBy(attacker);
+    }
+
+    if (!isInCombat())
+    {
+        if (CanHaveThreatList())
+            AddThreat(attacker);
+
+        if (Player* attackedPlayer = GetCharmerOrOwnerPlayerOrPlayerItself())
+        {
+            attacker->SetContestedPvP(attackedPlayer);
+            attacker->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
+            RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
+        }
+
+        SetInCombatWith(attacker);
+        attacker->SetInCombatWith(this);
+
+    }
+
     // trigger pet AI reaction
-    if (Pet* pet = GetPet())
-        pet->AttackedBy(attacker);
+    if (attacker->IsHostileTo(this))
+        CallForAllControlledUnits(AttackedByHelper(attacker),CONTROLLED_PET|CONTROLLED_GUARDIANS|CONTROLLED_CHARM);
+
+    // Place reaction on attacks in combat state here
 }
 
 bool Unit::AttackStop(bool targetSwitch /*=false*/)
 {
-    if (!m_attacking)
+    if (!m_attackingGuid || !GetMap())
+    {
+        clearUnitState(UNIT_STAT_MELEE_ATTACKING);
+        SendMeleeAttackStop(NULL);
         return false;
+    }
 
-    Unit* victim = m_attacking;
-
-    m_attacking->_removeAttacker(this);
-    m_attacking = NULL;
+    Unit* victim = GetMap()->GetUnit(m_attackingGuid);
+    GetMap()->RemoveAttackerFor(m_attackingGuid, GetObjectGuid());
+    GetMap()->RemoveAttackerFor(GetObjectGuid(), m_attackingGuid);
+    m_attackingGuid.Clear();
 
     // Clear our target
     SetTargetGuid(ObjectGuid());
@@ -5750,6 +7449,9 @@ bool Unit::AttackStop(bool targetSwitch /*=false*/)
 
     SendMeleeAttackStop(victim);
 
+    if(GetObjectGuid().IsPet() && GetOwner() && GetOwner()->GetTypeId()==TYPEID_PLAYER)
+        SendCharmState();
+
     return true;
 }
 
@@ -5793,7 +7495,7 @@ struct IsAttackingPlayerHelper
 
 bool Unit::isAttackingPlayer() const
 {
-    if(hasUnitState(UNIT_STAT_ATTACK_PLAYER))
+    if (hasUnitState(UNIT_STAT_ATTACK_PLAYER))
         return true;
 
     return CheckAllControlledUnits(IsAttackingPlayerHelper(), CONTROLLED_PET|CONTROLLED_TOTEMS|CONTROLLED_GUARDIANS|CONTROLLED_CHARM);
@@ -5801,14 +7503,27 @@ bool Unit::isAttackingPlayer() const
 
 void Unit::RemoveAllAttackers()
 {
-    while (!m_attackers.empty())
+    if (!GetMap())
+        return;
+
+    GuidSet& attackers = GetMap()->GetAttackersFor(GetObjectGuid());
+    for (GuidSet::iterator itr = attackers.begin(); !attackers.empty() && itr != attackers.end();)
     {
-        AttackerSet::iterator iter = m_attackers.begin();
-        if(!(*iter)->AttackStop())
+        ObjectGuid guid = *itr;
+        Unit* attacker = GetMap()->GetUnit(guid);
+        if (!attacker || !attacker->AttackStop())
         {
-            sLog.outError("WORLD: Unit has an attacker that isn't attacking it!");
-            m_attackers.erase(iter);
+            sLog.outError("Unit::RemoveAllAttackers %s has attacker %s that isn't attacking it!", GetObjectGuid().GetString().c_str(), guid.GetString().c_str());
+            GetMap()->RemoveAttackerFor(GetObjectGuid(),guid);
         }
+        itr = attackers.begin();
+    }
+
+    // Cleanup
+    if (!attackers.empty())
+    {
+        sLog.outError("Unit::RemoveAllAttackers %s has %u attackers after step-to-step cleanup!", GetObjectGuid().GetString().c_str(), attackers.size());
+        GetMap()->RemoveAllAttackersFor(GetObjectGuid());
     }
 }
 
@@ -5825,7 +7540,7 @@ bool Unit::HasAuraStateForCaster(AuraState flag, ObjectGuid casterGuid) const
         {
             if ((*i)->GetCasterGuid() == casterGuid &&
                 //  Immolate or Shadowflame
-                (*i)->GetSpellProto()->IsFitToFamily(SPELLFAMILY_WARLOCK, UI64LIT(0x0000000000000004), 0x00000002))
+                (*i)->GetSpellProto()->IsFitToFamily<SPELLFAMILY_WARLOCK, CF_WARLOCK_IMMOLATE, CF_WARLOCK_SHADOWFLAME2>())
             {
                 return true;
             }
@@ -5844,16 +7559,23 @@ void Unit::ModifyAuraState(AuraState flag, bool apply)
         if (!HasFlag(UNIT_FIELD_AURASTATE, 1<<(flag-1)))
         {
             SetFlag(UNIT_FIELD_AURASTATE, 1<<(flag-1));
-            if(GetTypeId() == TYPEID_PLAYER)
+            if (GetTypeId() == TYPEID_PLAYER)
             {
-                const PlayerSpellMap& sp_list = ((Player*)this)->GetSpellMap();
-                for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr)
+                PlayerSpellMap const& sp_list = ((Player*)this)->GetSpellMap();
+                if (!sp_list.empty())
                 {
-                    if(itr->second.state == PLAYERSPELL_REMOVED) continue;
-                    SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
-                    if (!spellInfo || !IsPassiveSpell(spellInfo)) continue;
-                    if (AuraState(spellInfo->CasterAuraState) == flag)
-                        CastSpell(this, itr->first, true, NULL);
+                    for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr)
+                    {
+                        if (itr->second.state == PLAYERSPELL_REMOVED)
+                            continue;
+
+                        SpellEntry const* spellInfo = sSpellStore.LookupEntry(itr->first);
+                        if (!spellInfo || !IsPassiveSpell(spellInfo))
+                            continue;
+
+                        if (AuraState(spellInfo->CasterAuraState) == flag)
+                            CastSpell(this, spellInfo, true, NULL);
+                    }
                 }
             }
         }
@@ -5866,23 +7588,55 @@ void Unit::ModifyAuraState(AuraState flag, bool apply)
 
             if (flag != AURA_STATE_ENRAGE)                  // enrage aura state triggering continues auras
             {
-                Unit::SpellAuraHolderMap& tAuras = GetSpellAuraHolderMap();
-                for (Unit::SpellAuraHolderMap::iterator itr = tAuras.begin(); itr != tAuras.end();)
+                SpellAuraHolderQueue holdersToRemove;
+                Unit::SpellAuraHolderMap const& tAuras = GetSpellAuraHolderMap();
+                for (Unit::SpellAuraHolderMap::const_iterator itr = tAuras.begin(); itr != tAuras.end(); ++itr)
                 {
-                    SpellEntry const* spellProto = (*itr).second->GetSpellProto();
+                    if (!itr->second || itr->second->IsDeleted())
+                        continue;
+
+                    SpellEntry const* spellProto = itr->second->GetSpellProto();
                     if (AuraState(spellProto->CasterAuraState) == flag)
-                    {
-                        RemoveSpellAuraHolder(itr->second);
-                        itr = tAuras.begin();
-                    }
-                    else
-                        ++itr;
+                        holdersToRemove.push(itr->second);
+                }
+
+                while (!holdersToRemove.empty())
+                {
+                    if (holdersToRemove.front() && !holdersToRemove.front()->IsDeleted())
+                        RemoveSpellAuraHolder(holdersToRemove.front());
+                    holdersToRemove.pop();
                 }
             }
+
         }
     }
 }
 
+void Unit::SetOwnerGuid(ObjectGuid ownerGuid)
+{
+    if (GetOwnerGuid() == ownerGuid)
+        return;
+
+    SetGuidValue(UNIT_FIELD_SUMMONEDBY, ownerGuid);
+    if (!ownerGuid || !ownerGuid.IsPlayer())
+        return;
+
+    // Update owner dependent fields
+    Player* pPlayer = ObjectMgr::GetPlayer(ownerGuid, true);
+    if (!pPlayer || !pPlayer->HaveAtClient(GetObjectGuid())) // if player cannot see this unit yet, he will receive needed data with create object
+        return;
+
+    SetFieldNotifyFlag(UF_FLAG_OWNER);
+
+    UpdateData data;
+    WorldPacket packet;
+    BuildValuesUpdateBlockForPlayer(&data, pPlayer);
+    data.BuildPacket(&packet);
+    pPlayer->SendDirectMessage(&packet);
+
+    RemoveFieldNotifyFlag(UF_FLAG_OWNER);
+}
+
 Unit *Unit::GetOwner() const
 {
     if (ObjectGuid ownerid = GetOwnerGuid())
@@ -5897,6 +7651,14 @@ Unit *Unit::GetCharmer() const
     return NULL;
 }
 
+Unit *Unit::GetCreator() const
+{
+    ObjectGuid creatorid = GetCreatorGuid();
+    if(!creatorid.IsEmpty())
+        return ObjectAccessor::GetUnit(*this, creatorid);
+    return NULL;
+}
+
 bool Unit::IsCharmerOrOwnerPlayerOrPlayerItself() const
 {
     if (GetTypeId()==TYPEID_PLAYER)
@@ -5927,25 +7689,32 @@ Pet* Unit::GetPet() const
 {
     if (ObjectGuid pet_guid = GetPetGuid())
     {
-        if(Pet* pet = GetMap()->GetPet(pet_guid))
-            return pet;
+        if (IsInWorld())
+        {
+            if (Pet* pet = GetMap()->GetPet(pet_guid))
+                return pet;
+            else
+            {
+                sLog.outError("Unit::GetPet: %s not exist.", pet_guid.GetString().c_str());
+                const_cast<Unit*>(this)->SetPet(NULL);
+            }
+        }
 
         sLog.outError("Unit::GetPet: %s not exist.", pet_guid.GetString().c_str());
-        const_cast<Unit*>(this)->SetPet(0);
+        const_cast<Unit*>(this)->SetPet(NULL);
     }
-
     return NULL;
 }
 
 Pet* Unit::_GetPet(ObjectGuid guid) const
 {
-    return GetMap()->GetPet(guid);
+    return GetMap() ? GetMap()->GetPet(guid) : NULL;
 }
 
 void Unit::RemoveMiniPet()
 {
     if (Pet* pet = GetMiniPet())
-        pet->Unsummon(PET_SAVE_AS_DELETED, this);
+        pet->Unsummon(PET_SAVE_AS_DELETED,this);
     else
         SetCritterGuid(ObjectGuid());
 }
@@ -5979,24 +7748,22 @@ void Unit::Uncharm()
         charm->RemoveSpellsCausingAura(SPELL_AURA_MOD_CHARM);
         charm->RemoveSpellsCausingAura(SPELL_AURA_MOD_POSSESS);
         charm->RemoveSpellsCausingAura(SPELL_AURA_MOD_POSSESS_PET);
+        charm->SetCharmerGuid(ObjectGuid());
     }
 }
 
-float Unit::GetCombatDistance( const Unit* target ) const
-{
-    float radius = target->GetFloatValue(UNIT_FIELD_COMBATREACH) + GetFloatValue(UNIT_FIELD_COMBATREACH);
-    float dx = GetPositionX() - target->GetPositionX();
-    float dy = GetPositionY() - target->GetPositionY();
-    float dz = GetPositionZ() - target->GetPositionZ();
-    float dist = sqrt((dx*dx) + (dy*dy) + (dz*dz)) - radius;
-    return ( dist > 0 ? dist : 0);
-}
-
 void Unit::SetPet(Pet* pet)
 {
-    SetPetGuid(pet ? pet->GetObjectGuid() : ObjectGuid());
+    if (pet)
+    {
+        if (!pet->GetPetCounter())
+            SetPetGuid(pet->GetObjectGuid()) ;  //Using last pet guid for player
+        AddPetToList(pet);
+    }
+    else
+        SetPetGuid(ObjectGuid());
 
-    if(pet && GetTypeId() == TYPEID_PLAYER)
+    if ((!pet || !pet->GetPetCounter()) && GetTypeId() == TYPEID_PLAYER)
         ((Player*)this)->SendPetGUIDs();
 }
 
@@ -6005,6 +7772,24 @@ void Unit::SetCharm(Unit* pet)
     SetCharmGuid(pet ? pet->GetObjectGuid() : ObjectGuid());
 }
 
+void Unit::AddPetToList(Pet* pet)
+{
+    if (pet)
+        m_groupPets.insert(pet->GetObjectGuid());
+}
+
+void Unit::RemovePetFromList(Pet* pet)
+{
+    m_groupPets.erase(pet->GetObjectGuid());
+
+    GuidSet groupPetsCopy = GetPets();
+    for (GuidSet::const_iterator itr = groupPetsCopy.begin(); itr != groupPetsCopy.end(); ++itr)
+    {
+        if (!GetMap()->GetPet(*itr))
+            m_groupPets.erase(*itr);
+    }
+}
+
 void Unit::AddGuardian( Pet* pet )
 {
     m_guardianPets.insert(pet->GetObjectGuid());
@@ -6012,11 +7797,23 @@ void Unit::AddGuardian( Pet* pet )
 
 void Unit::RemoveGuardian( Pet* pet )
 {
+    if (GetTypeId() == TYPEID_PLAYER)
+    {
+        uint32 SpellID = pet->GetCreateSpellID();
+        SpellEntry const *spellInfo = sSpellStore.LookupEntry(SpellID);
+        if (spellInfo && spellInfo->HasAttribute(SPELL_ATTR_DISABLED_WHILE_ACTIVE))
+        {
+            ((Player*)this)->SendCooldownEvent(spellInfo);
+        }
+    }
     m_guardianPets.erase(pet->GetObjectGuid());
 }
 
 void Unit::RemoveGuardians()
 {
+    if (m_guardianPets.empty())
+        return;
+
     while (!m_guardianPets.empty())
     {
         ObjectGuid guid = *m_guardianPets.begin();
@@ -6026,11 +7823,12 @@ void Unit::RemoveGuardians()
 
         m_guardianPets.erase(guid);
     }
+
 }
 
 Pet* Unit::FindGuardianWithEntry(uint32 entry)
 {
-    for (GuardianPetList::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end(); ++itr)
+    for (GuidSet::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end(); ++itr)
         if (Pet* pet = GetMap()->GetPet(*itr))
             if (pet->GetEntry() == entry)
                 return pet;
@@ -6040,7 +7838,7 @@ Pet* Unit::FindGuardianWithEntry(uint32 entry)
 
 Pet* Unit::GetProtectorPet()
 {
-    for (GuardianPetList::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end(); ++itr)
+    for (GuidSet::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end(); ++itr)
         if (Pet* pet = GetMap()->GetPet(*itr))
             if (pet->getPetType() == PROTECTOR_PET)
                 return pet;
@@ -6094,9 +7892,25 @@ void Unit::UnsummonAllTotems()
             totem->UnSummon();
 }
 
+/*
+ * deprecated
+ */
 int32 Unit::DealHeal(Unit* pVictim, uint32 addhealth, SpellEntry const* spellProto, bool critical, uint32 absorb)
 {
-    int32 gain = pVictim->ModifyHealth(int32(addhealth));
+    DamageInfo healInfo = DamageInfo(this, pVictim, spellProto, addhealth);
+    healInfo.SetAbsorb(absorb);
+    return DealHeal(&healInfo, critical);
+}
+
+int32  Unit::DealHeal(DamageInfo* healInfo, bool critical/* = false*/)
+{
+    if (!healInfo || !healInfo->target)
+        return 0;
+
+    Unit* pVictim = healInfo->target;
+    SpellEntry const* spellProto = healInfo->GetSpellProto();
+
+    int32 gain = pVictim->ModifyHealth(healInfo->heal);
 
     Unit* unit = this;
 
@@ -6104,7 +7918,7 @@ int32 Unit::DealHeal(Unit* pVictim, uint32 addhealth, SpellEntry const* spellPro
         unit = GetOwner();
 
     // overheal = addhealth - gain
-    unit->SendHealSpellLog(pVictim, spellProto->Id, addhealth, addhealth - gain, critical, absorb);
+    unit->SendHealSpellLog(pVictim, spellProto->Id, healInfo->heal, healInfo->heal - gain, critical, healInfo->GetAbsorb());
 
     if (unit->GetTypeId() == TYPEID_PLAYER)
     {
@@ -6115,15 +7929,19 @@ int32 Unit::DealHeal(Unit* pVictim, uint32 addhealth, SpellEntry const* spellPro
         if (gain)
             ((Player*)unit)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HEALING_DONE, gain, 0, pVictim);
 
-        ((Player*)unit)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEAL_CASTED, addhealth);
+        ((Player*)unit)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEAL_CASTED, healInfo->heal);
     }
 
     if (pVictim->GetTypeId() == TYPEID_PLAYER)
     {
         ((Player*)pVictim)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_HEALING_RECEIVED, gain);
-        ((Player*)pVictim)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALING_RECEIVED, addhealth);
+        ((Player*)pVictim)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALING_RECEIVED, healInfo->heal);
     }
 
+    // Script Event HealedBy
+    if (pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->AI())
+        ((Creature*)pVictim)->AI()->HealedBy(this, healInfo->heal);
+
     return gain;
 }
 
@@ -6133,15 +7951,24 @@ Unit* Unit::SelectMagnetTarget(Unit *victim, Spell* spell, SpellEffectIndex eff)
         return NULL;
 
     // Magic case
-    if (spell && spell->m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MAGIC)
+    if (spell && (spell->m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE ||
+                  spell->m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MAGIC ||
+                  spell->m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_NONE ))
     {
-        Unit::AuraList const& magnetAuras = victim->GetAurasByType(SPELL_AURA_SPELL_MAGNET);
-        for(Unit::AuraList::const_iterator itr = magnetAuras.begin(); itr != magnetAuras.end(); ++itr)
+        AuraList const& magnetAuras = victim->GetAurasByType(SPELL_AURA_SPELL_MAGNET);
+        if (!magnetAuras.empty())
         {
-            if (Unit* magnet = (*itr)->GetCaster())
+            for (AuraList::const_iterator itr = magnetAuras.begin(); itr != magnetAuras.end(); ++itr)
             {
-                if (magnet->isAlive() && magnet->IsWithinLOSInMap(this) && spell->CheckTarget(magnet, eff))
-                    return magnet;
+                if (!(*itr)->GetHolder() || (*itr)->GetHolder()->IsDeleted())
+                    continue;
+
+                if (Unit* magnet = (*itr)->GetCaster())
+                {
+                    // spell->CheckTarget() include LOS check
+                    if (magnet && magnet->isAlive() && spell->CheckTarget(magnet, eff))
+                        return magnet;
+                }
             }
         }
     }
@@ -6149,14 +7976,21 @@ Unit* Unit::SelectMagnetTarget(Unit *victim, Spell* spell, SpellEffectIndex eff)
     else
     {
         AuraList const& hitTriggerAuras = victim->GetAurasByType(SPELL_AURA_ADD_CASTER_HIT_TRIGGER);
-        for(AuraList::const_iterator i = hitTriggerAuras.begin(); i != hitTriggerAuras.end(); ++i)
+        if (!hitTriggerAuras.empty())
         {
-            if (Unit* magnet = (*i)->GetCaster())
+            for (AuraList::const_iterator itr = hitTriggerAuras.begin(); itr != hitTriggerAuras.end(); ++itr)
             {
-                if (magnet->isAlive() && magnet->IsWithinLOSInMap(this) && (!spell || spell->CheckTarget(magnet, eff)))
+                if (!(*itr)->GetHolder() || (*itr)->GetHolder()->IsDeleted())
+                    continue;
+
+                if (Unit* magnet = (*itr)->GetCaster())
                 {
-                    if (roll_chance_i((*i)->GetModifier()->m_amount))
-                        return magnet;
+                    // spell->CheckTarget() include LOS check
+                    if (magnet && magnet->isAlive() && ((!spell && magnet->IsWithinLOSInMap(this)) || (spell && spell->CheckTarget(magnet, eff))))
+                    {
+                        if (roll_chance_i((*itr)->GetModifier()->m_amount))
+                            return magnet;
+                    }
                 }
             }
         }
@@ -6165,10 +7999,10 @@ Unit* Unit::SelectMagnetTarget(Unit *victim, Spell* spell, SpellEffectIndex eff)
     return victim;
 }
 
-void Unit::SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, bool critical, uint32 absorb)
+void Unit::SendHealSpellLog(Unit* pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, bool critical, uint32 absorb)
 {
     // we guess size
-    WorldPacket data(SMSG_SPELLHEALLOG, (8+8+4+4+1));
+    WorldPacket data(SMSG_SPELLHEALLOG, pVictim->GetPackGUID().size() + GetPackGUID().size() + 4 + 4 + 4 + 4 + 1 + 1);
     data << pVictim->GetPackGUID();
     data << GetPackGUID();
     data << uint32(SpellID);
@@ -6180,9 +8014,9 @@ void Unit::SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32
     SendMessageToSet(&data, true);
 }
 
-void Unit::SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers powertype)
+void Unit::SendEnergizeSpellLog(Unit* pVictim, uint32 SpellID, uint32 Damage, Powers powertype)
 {
-    WorldPacket data(SMSG_SPELLENERGIZELOG, (8+8+4+4+4+1));
+    WorldPacket data(SMSG_SPELLENERGIZELOG, pVictim->GetPackGUID().size() + GetPackGUID().size() + 4 + 4 + 4);
     data << pVictim->GetPackGUID();
     data << GetPackGUID();
     data << uint32(SpellID);
@@ -6193,6 +8027,10 @@ void Unit::SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, Po
 
 void Unit::EnergizeBySpell(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers powertype)
 {
+    // don't energize isolated units (banished)
+    if (pVictim->hasUnitState(UNIT_STAT_ISOLATED))
+        return;
+
     SendEnergizeSpellLog(pVictim, SpellID, Damage, powertype);
     // needs to be called after sending spell log
     pVictim->ModifyPower(powertype, Damage);
@@ -6200,6 +8038,11 @@ void Unit::EnergizeBySpell(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers
 
 int32 Unit::SpellBonusWithCoeffs(SpellEntry const *spellProto, int32 total, int32 benefit, int32 ap_benefit,  DamageEffectType damagetype, bool donePart, float defCoeffMod)
 {
+
+    // Not apply this to spells with SPELL_ATTR_EX3_DISABLE_MODS attribute
+    if (spellProto->HasAttribute(SPELL_ATTR_EX3_DISABLE_MODS))
+        return total;
+
     // Distribute Damage over multiple effects, reduce by AoE
     float coeff = 1.0f;
 
@@ -6235,7 +8078,7 @@ int32 Unit::SpellBonusWithCoeffs(SpellEntry const *spellProto, int32 total, int3
         float LvlPenalty = CalculateLevelPenalty(spellProto);
 
         // Spellmod SpellDamage
-        if(Player* modOwner = GetSpellModOwner())
+        if (Player* modOwner = GetSpellModOwner())
         {
             coeff *= 100.0f;
             modOwner->ApplySpellMod(spellProto->Id,SPELLMOD_SPELL_BONUS_DAMAGE, coeff);
@@ -6252,60 +8095,119 @@ int32 Unit::SpellBonusWithCoeffs(SpellEntry const *spellProto, int32 total, int3
  * Calculates caster part of spell damage bonuses,
  * also includes different bonuses dependent from target auras
  */
-uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, uint32 pdamage, DamageEffectType damagetype, uint32 stack)
+void Unit::SpellDamageBonusDone(DamageInfo* damageInfo, uint32 stack)
 {
-    if (!spellProto || !pVictim || damagetype == DIRECT_DAMAGE || spellProto->HasAttribute(SPELL_ATTR_EX6_NO_DMG_MODS))
-        return pdamage;
+    if (!damageInfo)
+        return;
+
+    if (!IsInWorld() || !damageInfo->GetSpellProto() || !damageInfo->target || !damageInfo->target->GetMap())
+        return;
+
+    Unit* pVictim = damageInfo->target;
+
+    if (damageInfo->damageType == DIRECT_DAMAGE || damageInfo->GetSpellProto()->HasAttribute(SPELL_ATTR_EX6_NO_DMG_MODS))
+        return;
+
+    // conflagrate gets damage mods from previously calculated immolate aura damage tick
+    if (damageInfo->GetSpellProto()->IsFitToFamily<SPELLFAMILY_WARLOCK, CF_WARLOCK_CONFLAGRATE>())
+        return;
+
 
     // For totems get damage bonus from owner (statue isn't totem in fact)
-    if( GetTypeId()==TYPEID_UNIT && ((Creature*)this)->IsTotem() && ((Totem*)this)->GetTotemType()!=TOTEM_STATUE)
+    if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsTotem() && ((Totem*)this)->GetTotemType() != TOTEM_STATUE)
     {
-        if(Unit* owner = GetOwner())
-            return owner->SpellDamageBonusDone(pVictim, spellProto, pdamage, damagetype);
+        if (Unit* owner = GetOwner())
+        {
+            owner->SpellDamageBonusDone(damageInfo);
+            return;
+        }
     }
 
+    uint32 creatureTypeMask = pVictim->GetCreatureTypeMask();
     float DoneTotalMod = 1.0f;
     int32 DoneTotal = 0;
 
+    MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+
     // Creature damage
-    if( GetTypeId() == TYPEID_UNIT && !((Creature*)this)->IsPet() )
-        DoneTotalMod *= ((Creature*)this)->GetSpellDamageMod(((Creature*)this)->GetCreatureInfo()->rank);
+    if (GetTypeId() == TYPEID_UNIT && !((Creature*)this)->IsPet())
+        DoneTotalMod *= Creature::_GetSpellDamageMod(((Creature*)this)->GetCreatureInfo()->Rank);
+
+    float nonStackingPos = 0.0f;
+    float nonStackingNeg = 0.0f;
 
     AuraList const& mModDamagePercentDone = GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
     for(AuraList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i)
     {
-        if (((*i)->GetModifier()->m_miscvalue & GetSpellSchoolMask(spellProto)) &&
-            (*i)->GetSpellProto()->EquippedItemClass == -1 &&
+        if (i->IsEmpty() || !(*i)->GetModifier() || !((*i)->GetModifier()->m_miscvalue & damageInfo->GetSchoolMask()))
+            continue;
+
+        SpellAuraHolderPtr holder = i->GetHolder();
+
+        int32 calculatedBonus = (*i)->GetModifier()->m_amount;
+
+        if (holder->GetSpellProto()->EquippedItemClass != -1 ||
                                                             // -1 == any item class (not wand then)
-            (*i)->GetSpellProto()->EquippedItemInventoryTypeMask == 0)
+            holder->GetSpellProto()->EquippedItemInventoryTypeMask != 0)
                                                             // 0 == any inventory type (not wand then)
+            continue;
+
+        // bonus stored in another auras basepoints
+        if (calculatedBonus == 0)
+        {
+            // Clearcasting - bonus from Elemental Oath
+            if ((*i)->GetSpellProto()->Id == 16246)
+            {
+                AuraList const& aurasCrit = GetAurasByType(SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
+                for (AuraList::const_iterator itr = aurasCrit.begin(); itr != aurasCrit.end(); itr++)
+                {
+                    if ((*itr)->GetSpellProto()->GetSpellIconID() == 3053)
+                    {
+                        calculatedBonus = (*itr)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_1);
+                        break;
+                    }
+                }
+            }
+        }
+
+        if ((*i)->IsStacking())
+            DoneTotalMod *= ((float)calculatedBonus+100.0f)/100.0f;
+        else
         {
-            DoneTotalMod *= ((*i)->GetModifier()->m_amount + 100.0f) / 100.0f;
+            if((float)calculatedBonus > nonStackingPos)
+                nonStackingPos = (float)calculatedBonus;
+            else if((float)calculatedBonus < nonStackingNeg)
+                nonStackingNeg = (float)calculatedBonus;
         }
     }
+    DoneTotalMod *= ((nonStackingPos + 100.0f) / 100.0f) * ((nonStackingNeg + 100.0f) / 100.0f);
 
-    uint32 creatureTypeMask = pVictim->GetCreatureTypeMask();
     // Add flat bonus from spell damage versus
     DoneTotal += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS, creatureTypeMask);
-    AuraList const& mDamageDoneVersus = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE_VERSUS);
-    for(AuraList::const_iterator i = mDamageDoneVersus.begin();i != mDamageDoneVersus.end(); ++i)
-        if(creatureTypeMask & uint32((*i)->GetModifier()->m_miscvalue))
-            DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
 
-    AuraList const& mDamageDoneCreature = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE_CREATURE);
-    for(AuraList::const_iterator i = mDamageDoneCreature.begin();i != mDamageDoneCreature.end(); ++i)
+    // Add pct bonus from spell damage versus
+    DoneTotalMod *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_DAMAGE_DONE_VERSUS, creatureTypeMask);
+
+    // Add flat bonus from spell damage creature
+    DoneTotal += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_DAMAGE_DONE_CREATURE, creatureTypeMask);
+
+    // Add pct bonus from aura state versus
+    AuraList const& mDamageDoneVersusAuraState = GetAurasByType(SPELL_AURA_DAMAGE_DONE_VERSUS_AURA_STATE_PCT);
+    for(AuraList::const_iterator i = mDamageDoneVersusAuraState.begin();i != mDamageDoneVersusAuraState.end(); ++i)
     {
-        if(creatureTypeMask & uint32((*i)->GetModifier()->m_miscvalue))
-            DoneTotalMod += ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
+        if (damageInfo->target->HasAuraState(AuraState((*i)->GetModifier()->m_miscvalue)))
+            DoneTotalMod *= ((*i)->GetModifier()->m_amount + 100.0f)/100.0f;
     }
 
     // done scripted mod (take it from owner)
     Unit *owner = GetOwner();
-    if (!owner) owner = this;
+    if (!owner)
+        owner = this;
+
     AuraList const& mOverrideClassScript= owner->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
     for(AuraList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i)
     {
-        if (!(*i)->isAffectedOnSpell(spellProto))
+        if (!(*i)->isAffectedOnSpell(damageInfo->GetSpellProto()))
             continue;
         switch((*i)->GetModifier()->m_miscvalue)
         {
@@ -6315,7 +8217,7 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u
             case 6926:
             case 6928:
             {
-                if(pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
+                if (pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
                     DoneTotalMod *= (100.0f+(*i)->GetModifier()->m_amount)/100.0f;
                 break;
             }
@@ -6327,13 +8229,20 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u
                 int32 maxPercent = (*i)->GetModifier()->m_amount;
                 // effect 0 m_amount
                 int32 stepPercent = CalculateSpellDamage(this, (*i)->GetSpellProto(), EFFECT_INDEX_0);
+
                 // count affliction effects and calc additional damage in percentage
                 int32 modPercent = 0;
+
                 SpellAuraHolderMap const& victimAuras = pVictim->GetSpellAuraHolderMap();
                 for (SpellAuraHolderMap::const_iterator itr = victimAuras.begin(); itr != victimAuras.end(); ++itr)
                 {
                     SpellEntry const* m_spell = itr->second->GetSpellProto();
-                    if (m_spell->SpellFamilyName != SPELLFAMILY_WARLOCK || !(m_spell->SpellFamilyFlags & UI64LIT(0x0004071B8044C402)))
+                    //FIXME: would need 15 argument ClassFamilyMask::test() template for this one:
+                    // CF_WARLOCK_CORRUPTION, CF_WARLOCK_CURSE_OF_AGONY, CF_WARLOCK_DRAIN_SOUL, CF_WARLOCK_CURSE_OF_WEAKNESS,
+                    // CF_WARLOCK_LIFE_TAP, CF_WARLOCK_SLOWING_CURSES, CF_WARLOCK_MISC_DEBUFFS, CF_WARLOCK_SIPHON_LIFE, CF_WARLOCK_CURSE_OF_DOOM,
+                    // CF_WARLOCK_HOWL_OF_TERROR, CF_WARLOCK_SEED_OF_CORRUPTION1, CF_WARLOCK_UNSTABLE_AFFLICTION, CF_WARLOCK_CURSE_OF_THE_ELEMENTS,
+                    // CF_WARLOCK_FEAR, CF_WARLOCK_HAUNT
+                    if (m_spell->SpellFamilyName != SPELLFAMILY_WARLOCK || !(m_spell->GetSpellFamilyFlags() & UI64LIT(0x0004071B8044C402)))
                         continue;
                     modPercent += stepPercent * itr->second->GetStackAmount();
                     if (modPercent >= maxPercent)
@@ -6353,7 +8262,7 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u
                 break;
             case 5481: // Starfire Bonus
             {
-                if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, UI64LIT(0x0000000000200002)))
+                if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, ClassFamilyMask::create<CF_DRUID_MOONFIRE, CF_DRUID_INSECT_SWARM>()))
                     DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
                 break;
             }
@@ -6374,15 +8283,15 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u
             case 7277:
             {
                 // Merciless Combat
-                if ((*i)->GetSpellProto()->SpellIconID == 2656)
+                if ((*i)->GetSpellProto()->GetSpellIconID() == 2656)
                 {
-                    if(pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
+                    if (pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
                         DoneTotalMod *= (100.0f+(*i)->GetModifier()->m_amount)/100.0f;
                 }
                 else // Tundra Stalker
                 {
                     // Frost Fever (target debuff)
-                    if (pVictim->GetAura(SPELL_AURA_MOD_MELEE_HASTE, SPELLFAMILY_DEATHKNIGHT, UI64LIT(0x0000000000000000), 0x00000002))
+                    if (pVictim->GetAura<SPELL_AURA_MOD_MELEE_HASTE, SPELLFAMILY_DEATHKNIGHT, CF_DEATHKNIGHT_FF_BP_ACTIVE>())
                         DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
                     break;
                 }
@@ -6390,14 +8299,14 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u
             }
             case 7293: // Rage of Rivendare
             {
-                if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DEATHKNIGHT, UI64LIT(0x0200000000000000)))
-                    DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
+                if (pVictim->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DEATHKNIGHT, CF_DEATHKNIGHT_BLOOD_PLAGUE>())
+                    DoneTotalMod *= ((*i)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_1)*2+100.0f)/100.0f;
                 break;
             }
             // Twisted Faith
             case 7377:
             {
-                if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, UI64LIT(0x0000000000008000), 0, GetObjectGuid()))
+                if (pVictim->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, CF_PRIEST_SHADOW_WORD_PAIN>(GetObjectGuid()))
                     DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
                 break;
             }
@@ -6408,46 +8317,77 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u
             case 7601:
             case 7602:
             {
-                if (pVictim->GetAura(SPELL_AURA_MOD_STALKED, SPELLFAMILY_HUNTER, UI64LIT(0x0000000000000400)))
+                if (pVictim->GetAura<SPELL_AURA_MOD_STALKED, SPELLFAMILY_HUNTER, CF_HUNTER_HUNTERS_MARK>())
                     DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
                 break;
             }
         }
     }
 
+    // custom scripted mod from dummy
+    AuraList const& mDummy = owner->GetAurasByType(SPELL_AURA_DUMMY);
+    for(AuraList::const_iterator i = mDummy.begin(); i != mDummy.end(); ++i)
+    {
+        SpellEntry const *spell = (*i)->GetSpellProto();
+        //Fire and Brimstone
+        if (spell->SpellFamilyName == SPELLFAMILY_WARLOCK && spell->GetSpellIconID() == 3173)
+        {
+            if (pVictim->HasAuraState(AURA_STATE_CONFLAGRATE) && (damageInfo->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARLOCK && damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_WARLOCK_INCINERATE, CF_WARLOCK_CHAOS_BOLT>()))
+            {
+                DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f) / 100.0f;
+                break;
+            }
+        }
+    }
+
      // Custom scripted damage
-    switch(spellProto->SpellFamilyName)
+    switch(damageInfo->GetSpellProto()->SpellFamilyName)
     {
+        case SPELLFAMILY_GENERIC:
+        {
+            switch(damageInfo->GetSpellId())
+            {
+                case 71341: // Pact of the Darkfallen (Lanathel)
+                    // dont get any damage done mods
+                    DoneTotalMod = 1.0f;
+                    break;
+            }
+            break;
+        }
         case SPELLFAMILY_MAGE:
         {
             // Ice Lance
-            if (spellProto->SpellIconID == 186)
+            if (damageInfo->GetSpellProto()->GetSpellIconID() == 186)
             {
-                if (pVictim->isFrozen() || IsIgnoreUnitState(spellProto, IGNORE_UNIT_TARGET_NON_FROZEN))
+                if (pVictim->isFrozen() || IsIgnoreUnitState(damageInfo->GetSpellProto(), IGNORE_UNIT_TARGET_NON_FROZEN))
                 {
                     float multiplier = 3.0f;
 
                     // if target have higher level
                     if (pVictim->getLevel() > getLevel())
                         // Glyph of Ice Lance
-                        if (Aura* glyph = GetDummyAura(56377))
+                        if (Aura const* glyph = GetDummyAura(56377))
                             multiplier = glyph->GetModifier()->m_amount;
 
                     DoneTotalMod *= multiplier;
                 }
             }
-            // Torment the weak affected (Arcane Barrage, Arcane Blast, Frostfire Bolt, Arcane Missiles, Fireball)
-            if ((spellProto->SpellFamilyFlags & UI64LIT(0x0000900020200021)) &&
-                (pVictim->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED) || pVictim->HasAuraType(SPELL_AURA_HASTE_ALL)))
+            // Torment the weak affected (Arcane Barrage, Arcane Blast, Frostfire Bolt, Arcane Missiles, Fireball, Pyroblast)
+            if (damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_MAGE_FIREBALL, CF_MAGE_FROSTBOLT, CF_MAGE_ARCANE_MISSILES2, CF_MAGE_ARCANE_BLAST, CF_MAGE_FROSTFIRE_BOLT, CF_MAGE_ARCANE_BARRAGE>())
             {
                 //Search for Torment the weak dummy aura
-                Unit::AuraList const& ttw = GetAurasByType(SPELL_AURA_DUMMY);
-                for(Unit::AuraList::const_iterator i = ttw.begin(); i != ttw.end(); ++i)
+                if (Aura* ttwAura = GetAuraByEffectMask(SPELL_AURA_DUMMY,SPELLFAMILY_GENERIC,ClassFamilyMask(0x00240000,0,0),GetObjectGuid()))
                 {
-                    if ((*i)->GetSpellProto()->SpellIconID == 3263)
+                    Unit::SpellAuraHolderMap const& holderMap = pVictim->GetSpellAuraHolderMap();
+                    for (Unit::SpellAuraHolderMap::const_iterator itr = holderMap.begin(); itr != holderMap.end(); ++itr)
                     {
-                        DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f) / 100.0f;
-                        break;
+                        if (itr->second &&
+                            !itr->second->IsDeleted() &&
+                            itr->second->HasMechanic(ttwAura->GetModifier()->m_miscvalue))
+                        {
+                            DoneTotalMod *= ((float)ttwAura->GetModifier()->m_amount + 100.0f) / 100.0f;
+                            break;
+                        }
                     }
                 }
             }
@@ -6456,7 +8396,7 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u
         case SPELLFAMILY_WARLOCK:
         {
             // Drain Soul
-            if (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000004000))
+            if (damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_WARLOCK_DRAIN_SOUL>())
             {
                 if (pVictim->GetHealth() * 100 / pVictim->GetMaxHealth() <= 25)
                     DoneTotalMod *= 4;
@@ -6465,23 +8405,44 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u
         }
         case SPELLFAMILY_PRIEST:
         {
+            // Mind Flay
+            if (damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_PRIEST_MIND_FLAY1>())
+            {
+                // Shadow Word: Pain
+                if (pVictim->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, CF_PRIEST_SHADOW_WORD_PAIN>())
+                {
+                    // Glyph of Mind Flay
+                    if (Aura *aur = GetAura(55687, EFFECT_INDEX_0))
+                        DoneTotalMod *= (aur->GetModifier()->m_amount+100.0f) / 100.0f;
+                    // Twisted Faith
+                    Unit::AuraList const& tf = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
+                    for(Unit::AuraList::const_iterator i = tf.begin(); i != tf.end(); ++i)
+                    {
+                        if ((*i)->GetSpellProto()->GetSpellIconID() == 2848 && (*i)->GetEffIndex() == 1)
+                        {
+                            DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f) / 100.0f;
+                            break;
+                        }
+                    }
+                }
+            }
             // Smite
-            if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000000080)))
+            else if (damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_PRIEST_SMITE>())
             {
                 // Holy Fire
-                if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, UI64LIT(0x00100000)))
+                if (pVictim->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, CF_PRIEST_HOLY_FIRE>())
                     // Glyph of Smite
                     if (Aura *aur = GetAura(55692, EFFECT_INDEX_0))
                         DoneTotalMod *= (aur->GetModifier()->m_amount+100.0f) / 100.0f;
             }
             // Shadow word: Death
-            else if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000000200000000)))
+            else if (damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_PRIEST_SHADOW_WORD_DEATH_TARGET>())
             {
                 // Glyph of Shadow word: Death
-                if (SpellAuraHolder const* glyph = GetSpellAuraHolder(55682))
+                if (SpellAuraHolderPtr glyph = GetSpellAuraHolder(55682))
                 {
-                    Aura const* hpPct = glyph->GetAuraByEffectIndex(EFFECT_INDEX_0);
-                    Aura const* dmPct = glyph->GetAuraByEffectIndex(EFFECT_INDEX_1);
+                    Aura* hpPct = glyph->GetAuraByEffectIndex(EFFECT_INDEX_0);
+                    Aura* dmPct = glyph->GetAuraByEffectIndex(EFFECT_INDEX_1);
                     if (hpPct && dmPct && pVictim->GetHealth() * 100 <= pVictim->GetMaxHealth() * hpPct->GetModifier()->m_amount)
                         DoneTotalMod *= (dmPct->GetModifier()->m_amount + 100.0f) / 100.0f;
                 }
@@ -6491,15 +8452,15 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u
         case SPELLFAMILY_DRUID:
         {
             // Improved Insect Swarm (Wrath part)
-            if (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000001))
+            if (damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_DRUID_WRATH>())
             {
                 // if Insect Swarm on target
-                if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, UI64LIT(0x000000000200000), 0, GetObjectGuid()))
+                if (pVictim->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, CF_DRUID_INSECT_SWARM>(GetObjectGuid()))
                 {
                     Unit::AuraList const& improvedSwarm = GetAurasByType(SPELL_AURA_DUMMY);
                     for(Unit::AuraList::const_iterator iter = improvedSwarm.begin(); iter != improvedSwarm.end(); ++iter)
                     {
-                        if ((*iter)->GetSpellProto()->SpellIconID == 1771)
+                        if ((*iter)->GetSpellProto()->GetSpellIconID() == 1771)
                         {
                             DoneTotalMod *= ((*iter)->GetModifier()->m_amount+100.0f) / 100.0f;
                             break;
@@ -6512,37 +8473,36 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u
         case SPELLFAMILY_DEATHKNIGHT:
         {
             // Icy Touch and Howling Blast
-            if (spellProto->SpellFamilyFlags & UI64LIT(0x0000000200000002))
+            if (damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_ICY_TOUCH_TALONS, CF_DEATHKNIGHT_HOWLING_BLAST>())
             {
                 // search disease
                 bool found = false;
                 Unit::SpellAuraHolderMap const& auras = pVictim->GetSpellAuraHolderMap();
                 for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
                 {
-                    if(itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE)
+                    if (itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE)
                     {
                         found = true;
                         break;
                     }
                 }
-                if(!found)
-                    break;
 
-                // search for Glacier Rot dummy aura
+                // search for Glacier Rot and  Improved Icy Touch dummy aura
+                bool isIcyTouch = damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_ICY_TOUCH_TALONS>();
                 Unit::AuraList const& dummyAuras = GetAurasByType(SPELL_AURA_DUMMY);
                 for(Unit::AuraList::const_iterator i = dummyAuras.begin(); i != dummyAuras.end(); ++i)
                 {
-                    if ((*i)->GetSpellProto()->EffectMiscValue[(*i)->GetEffIndex()] == 7244)
+                    if ((found && (*i)->GetSpellProto()->EffectMiscValue[(*i)->GetEffIndex()] == 7244) || //Glacier Rot
+                        (isIcyTouch && (*i)->GetSpellProto()->GetSpellIconID() == 2721))                       //Improved Icy Touch
                     {
                         DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f) / 100.0f;
-                        break;
                     }
                 }
             }
             // Death Coil (bonus from Item - Death Knight T8 DPS Relic)
-            else if (spellProto->SpellFamilyFlags & UI64LIT(0x00002000))
+            else if (damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_DEATH_COIL>())
             {
-                 if (Aura* sigil = GetDummyAura(64962))
+                 if (Aura const* sigil = GetDummyAura(64962))
                     DoneTotal += sigil->GetModifier()->m_amount;
             }
             break;
@@ -6552,118 +8512,104 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u
     }
 
     // Done fixed damage bonus auras
-    int32 DoneAdvertisedBenefit = SpellBaseDamageBonusDone(GetSpellSchoolMask(spellProto));
-
-    // Pets just add their bonus damage to their spell damage
-    // note that their spell damage is just gain of their own auras
-    if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsPet())
-        DoneAdvertisedBenefit += ((Pet*)this)->GetBonusDamage();
+    int32 DoneAdvertisedBenefit = SpellBaseDamageBonusDone(damageInfo->GetSchoolMask());
 
     // apply ap bonus and benefit affected by spell power implicit coeffs and spell level penalties
-    DoneTotal = SpellBonusWithCoeffs(spellProto, DoneTotal, DoneAdvertisedBenefit, 0, damagetype, true);
+    DoneTotal = SpellBonusWithCoeffs(damageInfo->GetSpellProto(), DoneTotal, DoneAdvertisedBenefit, 0, damageInfo->damageType, true);
 
-    float tmpDamage = (int32(pdamage) + DoneTotal * int32(stack)) * DoneTotalMod;
+    float tmpDamagef = float(int32(damageInfo->damage) + DoneTotal * int32(stack)) * DoneTotalMod;
     // apply spellmod to Done damage (flat and pct)
-    if(Player* modOwner = GetSpellModOwner())
-        modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, tmpDamage);
+    if (Player* modOwner = GetSpellModOwner())
+        modOwner->ApplySpellMod(damageInfo->GetSpellId(), damageInfo->damageType == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, tmpDamagef);
+
+    int32 tmpDamage = floor(tmpDamagef);
 
-    return tmpDamage > 0 ? uint32(tmpDamage) : 0;
+    if (tmpDamage > 0)
+    {
+        damageInfo->bonusDone  = tmpDamage - damageInfo->damage;
+        damageInfo->damage     = tmpDamage;
+    }
+    else
+    {
+        damageInfo->bonusDone  = -int32(damageInfo->damage);
+        damageInfo->damage     = 0;
+    }
 }
 
 /**
  * Calculates target part of spell damage bonuses,
  * will be called on each tick for periodic damage over time auras
  */
-uint32 Unit::SpellDamageBonusTaken(Unit *pCaster, SpellEntry const *spellProto, uint32 pdamage, DamageEffectType damagetype, uint32 stack)
+void Unit::SpellDamageBonusTaken(DamageInfo* damageInfo, uint32 stack)
 {
-    if(!spellProto || !pCaster || damagetype==DIRECT_DAMAGE )
-        return pdamage;
+    if (!damageInfo)
+        return;
+
+    if (!IsInWorld() || !damageInfo->GetSpellProto() || !damageInfo->attacker || !damageInfo->target->GetMap())
+        return;
+
+    Unit* pCaster = damageInfo->attacker;
 
-    uint32 schoolMask = spellProto->SchoolMask;
+    if (damageInfo->damageType == DIRECT_DAMAGE || damageInfo->GetSpellProto()->HasAttribute(SPELL_ATTR_EX6_NO_DMG_MODS))
+        return;
 
     // Taken total percent damage auras
     float TakenTotalMod = 1.0f;
     int32 TakenTotal = 0;
 
+    MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+
     // ..taken
-    TakenTotalMod *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, schoolMask);
+    TakenTotalMod *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, damageInfo->GetSchoolMask());
 
     // .. taken pct: dummy auras
-    AuraList const& mDummyAuras = GetAurasByType(SPELL_AURA_DUMMY);
-    for(AuraList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)
-    {
-        switch((*i)->GetId())
-        {
-            case 45182:                                     // Cheating Death
-                if((*i)->GetModifier()->m_miscvalue & SPELL_SCHOOL_MASK_NORMAL)
-                {
-                    if(GetTypeId() != TYPEID_PLAYER)
-                        continue;
-
-                    float mod = ((Player*)this)->GetRatingBonusValue(CR_CRIT_TAKEN_MELEE)*(-8.0f);
-                    if (mod < float((*i)->GetModifier()->m_amount))
-                        mod = float((*i)->GetModifier()->m_amount);
-
-                    TakenTotalMod *= (mod + 100.0f) / 100.0f;
-                }
-                break;
-            case 20911:                                     // Blessing of Sanctuary
-            case 25899:                                     // Greater Blessing of Sanctuary
-                TakenTotalMod *= ((*i)->GetModifier()->m_amount + 100.0f) / 100.0f;
-                break;
-            case 47580:                                     // Pain and Suffering (Rank 1)      TODO: can be pct modifier aura
-            case 47581:                                     // Pain and Suffering (Rank 2)
-            case 47582:                                     // Pain and Suffering (Rank 3)
-                // Shadow Word: Death
-                if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000000200000000)))
-                    TakenTotalMod *= ((*i)->GetModifier()->m_amount + 100.0f) / 100.0f;
-                break;
-        }
-    }
+    TakenTotalMod *= GetTotalAuraScriptedMultiplierForDamageTaken(damageInfo->GetSpellProto());
 
     // From caster spells
     AuraList const& mOwnerTaken = GetAurasByType(SPELL_AURA_MOD_DAMAGE_FROM_CASTER);
     for(AuraList::const_iterator i = mOwnerTaken.begin(); i != mOwnerTaken.end(); ++i)
     {
-        if ((*i)->GetCasterGuid() == pCaster->GetObjectGuid() && (*i)->isAffectedOnSpell(spellProto))
+        if ((*i)->GetCasterGuid() == pCaster->GetObjectGuid() && (*i)->isAffectedOnSpell(damageInfo->GetSpellProto()))
             TakenTotalMod *= ((*i)->GetModifier()->m_amount + 100.0f) / 100.0f;
     }
 
     // Mod damage from spell mechanic
-    TakenTotalMod *= GetTotalAuraMultiplierByMiscValueForMask(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT,GetAllSpellMechanicMask(spellProto));
+    TakenTotalMod *= GetTotalAuraMultiplierByMiscValueForMask(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT,GetAllSpellMechanicMask(damageInfo->GetSpellProto()));
 
     // Mod damage taken from AoE spells
-    if(IsAreaOfEffectSpell(spellProto))
+    if (IsAreaOfEffectSpell(damageInfo->GetSpellProto()))
     {
-        TakenTotalMod *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE, schoolMask);
+        TakenTotalMod *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE, damageInfo->GetSchoolMask());
         if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsPet())
-            TakenTotalMod *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_PET_AOE_DAMAGE_AVOIDANCE, schoolMask);
+            TakenTotalMod *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_PET_AOE_DAMAGE_AVOIDANCE, damageInfo->GetSchoolMask());
     }
 
     // Taken fixed damage bonus auras
-    int32 TakenAdvertisedBenefit = SpellBaseDamageBonusTaken(GetSpellSchoolMask(spellProto));
+    int32 TakenAdvertisedBenefit = SpellBaseDamageBonusTaken(damageInfo->GetSchoolMask());
 
     // apply benefit affected by spell power implicit coeffs and spell level penalties
-    TakenTotal = SpellBonusWithCoeffs(spellProto, TakenTotal, TakenAdvertisedBenefit, 0, damagetype, false);
+    TakenTotal = SpellBonusWithCoeffs(damageInfo->GetSpellProto(), TakenTotal, TakenAdvertisedBenefit, 0, damageInfo->damageType, false);
 
-    float tmpDamage = (int32(pdamage) + TakenTotal * int32(stack)) * TakenTotalMod;
-
-    return tmpDamage > 0 ? uint32(tmpDamage) : 0;
-}
+    int32 tmpDamage = floor(float((int32)damageInfo->damage + TakenTotal * stack) * TakenTotalMod);
+
+    if (tmpDamage > 0)
+    {
+        damageInfo->bonusTaken = tmpDamage - damageInfo->damage;
+        damageInfo->damage     = tmpDamage;
+    }
+    else
+    {
+        damageInfo->bonusTaken = -int32(damageInfo->damage);
+        damageInfo->damage     = 0;
+    }
+}
 
 int32 Unit::SpellBaseDamageBonusDone(SpellSchoolMask schoolMask)
 {
     int32 DoneAdvertisedBenefit = 0;
 
     // ..done
-    AuraList const& mDamageDone = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE);
-    for(AuraList::const_iterator i = mDamageDone.begin();i != mDamageDone.end(); ++i)
-    {
-        if (((*i)->GetModifier()->m_miscvalue & schoolMask) != 0 &&
-            (*i)->GetSpellProto()->EquippedItemClass == -1 &&                   // -1 == any item class (not wand then)
-            (*i)->GetSpellProto()->EquippedItemInventoryTypeMask == 0)          //  0 == any inventory type (not wand then)
-                DoneAdvertisedBenefit += (*i)->GetModifier()->m_amount;
-    }
+    DoneAdvertisedBenefit = GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_DAMAGE_DONE, schoolMask);
 
     if (GetTypeId() == TYPEID_PLAYER)
     {
@@ -6677,7 +8623,7 @@ int32 Unit::SpellBaseDamageBonusDone(SpellSchoolMask schoolMask)
             if((*i)->GetModifier()->m_miscvalue & schoolMask)
             {
                 // stat used stored in miscValueB for this aura
-                Stats usedStat = Stats((*i)->GetMiscBValue());
+                Stats usedStat = Stats((*i)->GetMiscValueB());
                 DoneAdvertisedBenefit += int32(GetStat(usedStat) * (*i)->GetModifier()->m_amount / 100.0f);
             }
         }
@@ -6710,15 +8656,30 @@ int32 Unit::SpellBaseDamageBonusTaken(SpellSchoolMask schoolMask)
 
 bool Unit::IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType)
 {
+    // creatures (except totems) can't crit with spells at all ( for creatures not sure - /dev/rsa)
+    if (GetObjectGuid().IsCreature() && !((Creature*)this)->IsTotem())
+        return false;
+
     // not critting spell
     if (spellProto->HasAttribute(SPELL_ATTR_EX2_CANT_CRIT))
         return false;
 
     float crit_chance = 0.0f;
-    switch(spellProto->DmgClass)
+    switch (spellProto->DmgClass)
     {
         case SPELL_DAMAGE_CLASS_NONE:
-            return false;
+            // Some heal should be able to crit
+            // We need more spells to find a general way (if there is any)
+            switch (spellProto->Id)
+            {
+                case 379:   // Earth Shield
+                case 33778: // Lifebloom Final Bloom
+                case 64844: // Divine Hymn
+                    break;
+                default:
+                    return false;
+            }
+            break;
         case SPELL_DAMAGE_CLASS_MAGIC:
         {
             if (schoolMask & SPELL_SCHOOL_MASK_NORMAL)
@@ -6785,7 +8746,7 @@ bool Unit::IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
                     case SPELLFAMILY_MAGE:
                     {
                         // Fire Blast
-                        if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000000002)) && spellProto->SpellIconID == 12)
+                        if (spellProto->GetSpellFamilyFlags().test<CF_MAGE_FIRE_BLAST>() && spellProto->GetSpellIconID() == 12)
                         {
                             // Glyph of Fire Blast
                             if (pVictim->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED) || pVictim->isInRoots())
@@ -6796,7 +8757,7 @@ bool Unit::IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
                     }
                     case SPELLFAMILY_PRIEST:
                         // Flash Heal
-                        if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000000800)))
+                        if (spellProto->GetSpellFamilyFlags().test<CF_PRIEST_FLASH_HEAL>())
                         {
                             if (pVictim->GetHealth() > pVictim->GetMaxHealth()/2)
                                 break;
@@ -6805,7 +8766,7 @@ bool Unit::IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
                             {
                                 // Improved Flash Heal
                                 if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_PRIEST &&
-                                    (*i)->GetSpellProto()->SpellIconID == 2542)
+                                    (*i)->GetSpellProto()->GetSpellIconID() == 2542)
                                 {
                                     crit_chance+=(*i)->GetModifier()->m_amount;
                                     break;
@@ -6815,15 +8776,15 @@ bool Unit::IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
                         break;
                     case SPELLFAMILY_DRUID:
                         // Improved Insect Swarm (Starfire part)
-                        if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000000000000004)))
+                        if (spellProto->GetSpellFamilyFlags().test<CF_DRUID_STARFIRE>())
                         {
                             // search for Moonfire on target
-                            if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, UI64LIT(0x000000000000002), 0, GetObjectGuid()))
+                            if (pVictim->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, CF_DRUID_MOONFIRE>(GetObjectGuid()))
                             {
                                 Unit::AuraList const& improvedSwarm = GetAurasByType(SPELL_AURA_DUMMY);
                                 for(Unit::AuraList::const_iterator iter = improvedSwarm.begin(); iter != improvedSwarm.end(); ++iter)
                                 {
-                                    if ((*iter)->GetSpellProto()->SpellIconID == 1771)
+                                    if ((*iter)->GetSpellProto()->GetSpellIconID() == 1771)
                                     {
                                         crit_chance += (*iter)->GetModifier()->m_amount;
                                         break;
@@ -6831,12 +8792,25 @@ bool Unit::IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
                                 }
                             }
                         }
+                        // Improved Faerie Fire
+                        if (pVictim->HasAura(770) || pVictim->HasAura(16857))
+                        {
+                            AuraList const& ImprovedAura = GetAurasByType(SPELL_AURA_DUMMY);
+                            for(AuraList::const_iterator iter = ImprovedAura.begin(); iter != ImprovedAura.end(); ++iter)
+                            {
+                                if((*iter)->GetEffIndex() == 0 && (*iter)->GetSpellProto()->GetSpellIconID() == 109 && (*iter)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DRUID)
+                                {
+                                    crit_chance += (*iter)->GetModifier()->m_amount;
+                                    break;
+                                }
+                            }
+                        }
                         break;
                     case SPELLFAMILY_PALADIN:
                         // Sacred Shield
-                        if (spellProto->SpellFamilyFlags & UI64LIT(0x0000000040000000))
+                        if (spellProto->GetSpellFamilyFlags().test<CF_PALADIN_FLASH_OF_LIGHT>())
                         {
-                            Aura *aura = pVictim->GetDummyAura(58597);
+                            Aura const* aura = pVictim->GetDummyAura(58597);
                             if (aura && aura->GetCasterGuid() == GetObjectGuid())
                                 crit_chance+=aura->GetModifier()->m_amount;
                         }
@@ -6844,16 +8818,24 @@ bool Unit::IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
                         else if (spellProto->Category == 19)
                         {
                             if (pVictim->GetCreatureTypeMask() & CREATURE_TYPEMASK_DEMON_OR_UNDEAD)
-                                return true;
+                            {
+                                // don't override auras that prevent critical strikes taken
+                                if (crit_chance > -100.0f)
+                                    return true;
+                            }
                         }
                         break;
                     case SPELLFAMILY_SHAMAN:
                         // Lava Burst
-                        if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000100000000000)))
+                        if (spellProto->GetSpellFamilyFlags().test<CF_SHAMAN_LAVA_BURST>())
                         {
                             // Flame Shock
-                            if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, UI64LIT(0x0000000010000000), 0, GetObjectGuid()))
-                                return true;
+                            if (pVictim->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, CF_SHAMAN_FLAME_SHOCK>(GetObjectGuid()))
+                            {
+                                // don't override auras that prevent critical strikes taken
+                                if (crit_chance > -100.0f)
+                                    return true;
+                            }
                         }
                         break;
                 }
@@ -6861,12 +8843,52 @@ bool Unit::IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
             break;
         }
         case SPELL_DAMAGE_CLASS_MELEE:
+        {
+            // Custom crit by class
+            switch (spellProto->SpellFamilyName)
+            {
+                case SPELLFAMILY_WARRIOR:
+                {
+                    // Victory Rush
+                    if (spellProto->GetSpellFamilyFlags().test<CF_WARRIOR_VICTORY_RUSH>())
+                    {
+                        // Glyph of Victory Rush
+                        if (Aura* aura = GetAura(58382, EFFECT_INDEX_0))
+                            crit_chance += aura->GetModifier()->m_amount;
+                    }
+                    break;
+                }
+                case SPELLFAMILY_DRUID:
+                {
+                    // Rend and Tear crit chance with Ferocious Bite on bleeding target
+                    if (spellProto->GetSpellFamilyFlags().test<CF_DRUID_RIP_BITE>())
+                    {
+                        if (pVictim && pVictim->HasAuraState(AURA_STATE_BLEEDING))
+                        {
+                            Unit::AuraList const& aura = GetAurasByType(SPELL_AURA_DUMMY);
+                            for(Unit::AuraList::const_iterator itr = aura.begin(); itr != aura.end(); ++itr)
+                            {
+                                if ((*itr)->GetSpellProto()->GetSpellIconID() == 2859 && (*itr)->GetEffIndex() == 1)
+                                {
+                                    crit_chance += (*itr)->GetModifier()->m_amount;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    break;
+                }
+                default:
+                    break;
+            }
+            /* no break */
+        }
         case SPELL_DAMAGE_CLASS_RANGED:
         {
             if (pVictim)
-                crit_chance = GetUnitCriticalChance(attackType, pVictim);
+                crit_chance += GetUnitCriticalChance(attackType, pVictim);
 
-            crit_chance+= GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL, schoolMask);
+            crit_chance += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL, schoolMask);
             break;
         }
         default:
@@ -6874,7 +8896,7 @@ bool Unit::IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
     }
     // percent done
     // only players use intelligence for critical chance computations
-    if(Player* modOwner = GetSpellModOwner())
+    if (Player* modOwner = GetSpellModOwner())
         modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CRITICAL_CHANCE, crit_chance);
 
     crit_chance = crit_chance > 0.0f ? crit_chance : 0.0f;
@@ -6898,17 +8920,14 @@ uint32 Unit::SpellCriticalDamageBonus(SpellEntry const *spellProto, uint32 damag
             break;
     }
 
-    // adds additional damage to crit_bonus (from talents)
-    if(Player* modOwner = GetSpellModOwner())
-        modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CRIT_DAMAGE_BONUS, crit_bonus);
-
     if(!pVictim)
-        return damage += crit_bonus;
+        return damage + crit_bonus;
 
+    // increased critical damage (auras, and some talents)
     int32 critPctDamageMod = 0;
-    if(spellProto->DmgClass >= SPELL_DAMAGE_CLASS_MELEE)
+    if (spellProto->DmgClass >= SPELL_DAMAGE_CLASS_MELEE)
     {
-        if(GetWeaponAttackType(spellProto) == RANGED_ATTACK)
+        if (GetWeaponAttackType(spellProto) == RANGED_ATTACK)
             critPctDamageMod += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_DAMAGE);
         else
             critPctDamageMod += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE);
@@ -6919,13 +8938,22 @@ uint32 Unit::SpellCriticalDamageBonus(SpellEntry const *spellProto, uint32 damag
     critPctDamageMod += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_CRIT_DAMAGE_BONUS, GetSpellSchoolMask(spellProto));
 
     uint32 creatureTypeMask = pVictim->GetCreatureTypeMask();
-    critPctDamageMod += GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_CRIT_PERCENT_VERSUS, creatureTypeMask);
+    critPctDamageMod += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_CRIT_PERCENT_VERSUS, creatureTypeMask);
 
-    if(critPctDamageMod!=0)
-        crit_bonus = int32(crit_bonus * float((100.0f + critPctDamageMod)/100.0f));
+    uint32 base_dmg = damage;
+    damage += crit_bonus;
 
-    if(crit_bonus > 0)
-        damage += crit_bonus;
+    if (critPctDamageMod!=0)
+        damage += int32(damage) * critPctDamageMod / 100;
+
+    // increased critical damage bonus (from talents)
+    if (damage > base_dmg)
+        if (Player* modOwner = GetSpellModOwner())
+        {
+            damage -= base_dmg;
+            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CRIT_DAMAGE_BONUS, damage);
+            damage += base_dmg;
+        }
 
     return damage;
 }
@@ -6946,13 +8974,7 @@ uint32 Unit::SpellCriticalHealingBonus(SpellEntry const *spellProto, uint32 dama
             break;
     }
 
-    if(pVictim)
-    {
-        uint32 creatureTypeMask = pVictim->GetCreatureTypeMask();
-        crit_bonus = int32(crit_bonus * GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_CRIT_PERCENT_VERSUS, creatureTypeMask));
-    }
-
-    if(crit_bonus > 0)
+    if (crit_bonus > 0)
         damage += crit_bonus;
 
     damage = int32(damage * GetTotalAuraMultiplier(SPELL_AURA_MOD_CRITICAL_HEALING_AMOUNT));
@@ -6967,8 +8989,8 @@ uint32 Unit::SpellCriticalHealingBonus(SpellEntry const *spellProto, uint32 dama
 uint32 Unit::SpellHealingBonusDone(Unit *pVictim, SpellEntry const *spellProto, int32 healamount, DamageEffectType damagetype, uint32 stack)
 {
     // For totems get healing bonus from owner (statue isn't totem in fact)
-    if( GetTypeId()==TYPEID_UNIT && ((Creature*)this)->IsTotem() && ((Totem*)this)->GetTotemType()!=TOTEM_STATUE)
-        if(Unit* owner = GetOwner())
+    if ( GetTypeId()==TYPEID_UNIT && ((Creature*)this)->IsTotem() && ((Totem*)this)->GetTotemType()!=TOTEM_STATUE)
+        if (Unit* owner = GetOwner())
             return owner->SpellHealingBonusDone(pVictim, spellProto, healamount, damagetype, stack);
 
     // No heal amount for this class spells
@@ -7013,7 +9035,7 @@ uint32 Unit::SpellHealingBonusDone(Unit *pVictim, SpellEntry const *spellProto,
                 break;
             case 7798: // Glyph of Regrowth
             {
-                if (pVictim->GetAura(SPELL_AURA_PERIODIC_HEAL, SPELLFAMILY_DRUID, UI64LIT(0x0000000000000040)))
+                if (pVictim->GetAura<SPELL_AURA_PERIODIC_HEAL, SPELLFAMILY_DRUID, CF_DRUID_REGROWTH>())
                     DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
                 break;
             }
@@ -7035,7 +9057,7 @@ uint32 Unit::SpellHealingBonusDone(Unit *pVictim, SpellEntry const *spellProto,
             }
             case 7871: // Glyph of Lesser Healing Wave
             {
-                if (pVictim->GetAura(SPELL_AURA_DUMMY, SPELLFAMILY_SHAMAN, UI64LIT(0x0000040000000000), 0, GetObjectGuid()))
+                if (pVictim->GetAura<SPELL_AURA_DUMMY, SPELLFAMILY_SHAMAN, CF_SHAMAN_EARTH_SHIELD>(GetObjectGuid()))
                     DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
                 break;
             }
@@ -7047,7 +9069,7 @@ uint32 Unit::SpellHealingBonusDone(Unit *pVictim, SpellEntry const *spellProto,
     if (spellProto->SpellFamilyName == SPELLFAMILY_DRUID)
     {
         // Nourish 20% of heal increase if target is affected by Druids HOTs
-        if (spellProto->SpellFamilyFlags & UI64LIT(0x0200000000000000))
+        if (spellProto->GetSpellFamilyFlags().test<CF_DRUID_NOURISH>())
         {
             int ownHotCount = 0;                        // counted HoT types amount, not stacks
             Unit::AuraList const& RejorRegr = pVictim->GetAurasByType(SPELL_AURA_PERIODIC_HEAL);
@@ -7065,7 +9087,7 @@ uint32 Unit::SpellHealingBonusDone(Unit *pVictim, SpellEntry const *spellProto,
             }
         }
         // Lifebloom
-        else if (spellProto->IsFitToFamilyMask(UI64LIT(0x0000001000000000)))
+        else if (spellProto->GetSpellFamilyFlags().test<CF_DRUID_LIFEBLOOM>())
         {
             AuraList const& dummyList = owner->GetAurasByType(SPELL_AURA_DUMMY);
             for(AuraList::const_iterator i = dummyList.begin(); i != dummyList.end(); ++i)
@@ -7090,7 +9112,7 @@ uint32 Unit::SpellHealingBonusDone(Unit *pVictim, SpellEntry const *spellProto,
     // use float as more appropriate for negative values and percent applying
     float heal = (healamount + DoneTotal * int32(stack))*DoneTotalMod;
     // apply spellmod to Done amount
-    if(Player* modOwner = GetSpellModOwner())
+    if (Player* modOwner = GetSpellModOwner())
         modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, heal);
 
     return heal < 0 ? 0 : uint32(heal);
@@ -7102,23 +9124,8 @@ uint32 Unit::SpellHealingBonusDone(Unit *pVictim, SpellEntry const *spellProto,
  */
 uint32 Unit::SpellHealingBonusTaken(Unit *pCaster, SpellEntry const *spellProto, int32 healamount, DamageEffectType damagetype, uint32 stack)
 {
-    float  TakenTotalMod = 1.0f;
-
     // Healing taken percent
-    float minval = float(GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT));
-    if (damagetype == DOT)
-    {
-        // overwrite max SPELL_AURA_MOD_HEALING_PCT if greater negative effect
-        float minDotVal = float(GetMaxNegativeAuraModifier(SPELL_AURA_MOD_PERIODIC_HEAL));
-        minval = (minDotVal < minval) ? minDotVal : minval;
-    }
-    if (minval)
-        TakenTotalMod *= (100.0f + minval) / 100.0f;
-
-    float maxval = float(GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HEALING_PCT));
-    // no SPELL_AURA_MOD_PERIODIC_HEAL positive cases
-    if (maxval)
-        TakenTotalMod *= (100.0f + maxval) / 100.0f;
+    float  TakenTotalMod = GetTotalAuraMultiplier(SPELL_AURA_MOD_HEALING_PCT);
 
     // No heal amount for this class spells
     if (spellProto->DmgClass == SPELL_DAMAGE_CLASS_NONE)
@@ -7150,12 +9157,7 @@ uint32 Unit::SpellHealingBonusTaken(Unit *pCaster, SpellEntry const *spellProto,
 
 int32 Unit::SpellBaseHealingBonusDone(SpellSchoolMask schoolMask)
 {
-    int32 AdvertisedBenefit = 0;
-
-    AuraList const& mHealingDone = GetAurasByType(SPELL_AURA_MOD_HEALING_DONE);
-    for(AuraList::const_iterator i = mHealingDone.begin();i != mHealingDone.end(); ++i)
-        if(!(*i)->GetModifier()->m_miscvalue || ((*i)->GetModifier()->m_miscvalue & schoolMask) != 0)
-            AdvertisedBenefit += (*i)->GetModifier()->m_amount;
+    int32 AdvertisedBenefit = GetTotalAuraModifier(SPELL_AURA_MOD_HEALING_DONE);
 
     // Healing bonus of spirit, intellect and strength
     if (GetTypeId() == TYPEID_PLAYER)
@@ -7192,47 +9194,67 @@ int32 Unit::SpellBaseHealingBonusTaken(SpellSchoolMask schoolMask)
     return AdvertisedBenefit;
 }
 
-bool Unit::IsImmunedToDamage(SpellSchoolMask shoolMask)
+bool Unit::IsImmunedToDamage(SpellSchoolMask schoolMask) const
 {
-    // If m_immuneToSchool type contain this school type, IMMUNE damage.
-    SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL];
-    for (SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr)
-        if (itr->type & shoolMask)
-            return true;
+    if (IsImmunedToSchool(schoolMask))
+        return true;
 
     // If m_immuneToDamage type contain magic, IMMUNE damage.
+    MAPLOCK_READ(const_cast<Unit*>(this), MAP_LOCK_TYPE_AURAS);
     SpellImmuneList const& damageList = m_spellImmune[IMMUNITY_DAMAGE];
-    for (SpellImmuneList::const_iterator itr = damageList.begin(); itr != damageList.end(); ++itr)
-        if (itr->type & shoolMask)
-            return true;
+    if (!damageList.empty())
+        for (SpellImmuneList::const_iterator itr = damageList.begin(); itr != damageList.end(); ++itr)
+            if (itr->type & schoolMask)
+                return true;
+
+    return false;
+}
+
+bool Unit::IsImmunedToSchool(SpellSchoolMask schoolMask) const
+{
+    // If m_immuneToSchool type contain this school type, IMMUNE damage.
+    MAPLOCK_READ(const_cast<Unit*>(this), MAP_LOCK_TYPE_AURAS);
+    SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL];
+    if (!schoolList.empty())
+        for (SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr)
+            if (itr->type & schoolMask)
+                return true;
 
     return false;
 }
 
-bool Unit::IsImmuneToSpell(SpellEntry const* spellInfo)
+bool Unit::IsImmuneToSpell(SpellEntry const* spellInfo, bool isFriendly) const
 {
     if (!spellInfo)
         return false;
 
-    //TODO add spellEffect immunity checks!, player with flag in bg is immune to immunity buffs from other friendly players!
-    //SpellImmuneList const& dispelList = m_spellImmune[IMMUNITY_EFFECT];
+    uint32 effectMask = 0;
+    for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        if (!IsImmuneToSpellEffect(spellInfo, SpellEffectIndex(i)))
+            effectMask |= (1 << i);
+    }
+    if (!effectMask)
+        return true;
 
+    MAPLOCK_READ(const_cast<Unit*>(this), MAP_LOCK_TYPE_AURAS);
     SpellImmuneList const& dispelList = m_spellImmune[IMMUNITY_DISPEL];
     for(SpellImmuneList::const_iterator itr = dispelList.begin(); itr != dispelList.end(); ++itr)
         if (itr->type == spellInfo->Dispel)
             return true;
 
-    if (!spellInfo->HasAttribute(SPELL_ATTR_EX_UNAFFECTED_BY_SCHOOL_IMMUNE) &&         // unaffected by school immunity
+    if (!spellInfo->HasAttribute(SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY) &&
+        !spellInfo->HasAttribute(SPELL_ATTR_EX_UNAFFECTED_BY_SCHOOL_IMMUNE) &&         // unaffected by school immunity
         !spellInfo->HasAttribute(SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY))              // can remove immune (by dispell or immune it)
     {
         SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL];
         for(SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr)
-            if (!(IsPositiveSpell(itr->spellId) && IsPositiveSpell(spellInfo->Id)) &&
-                (itr->type & GetSpellSchoolMask(spellInfo)))
+            if ((!(IsPositiveSpell(itr->spellId) && IsPositiveSpell(spellInfo->Id)) || (!isFriendly && IsPositiveSpell(itr->spellId) && IsNonPositiveSpell(spellInfo)))
+                && (itr->type & GetSpellSchoolMask(spellInfo)))
                 return true;
     }
 
-    if(uint32 mechanic = spellInfo->Mechanic)
+    if (uint32 mechanic = spellInfo->Mechanic)
     {
         SpellImmuneList const& mechanicList = m_spellImmune[IMMUNITY_MECHANIC];
         for(SpellImmuneList::const_iterator itr = mechanicList.begin(); itr != mechanicList.end(); ++itr)
@@ -7241,8 +9263,10 @@ bool Unit::IsImmuneToSpell(SpellEntry const* spellInfo)
 
         AuraList const& immuneAuraApply = GetAurasByType(SPELL_AURA_MECHANIC_IMMUNITY_MASK);
         for(AuraList::const_iterator iter = immuneAuraApply.begin(); iter != immuneAuraApply.end(); ++iter)
+        {
             if ((*iter)->GetModifier()->m_miscvalue & (1 << (mechanic-1)))
                 return true;
+        }
     }
 
     return false;
@@ -7250,12 +9274,25 @@ bool Unit::IsImmuneToSpell(SpellEntry const* spellInfo)
 
 bool Unit::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex index) const
 {
-    //If m_immuneToEffect type contain this effect type, IMMUNE effect.
-    uint32 effect = spellInfo->Effect[index];
-    SpellImmuneList const& effectList = m_spellImmune[IMMUNITY_EFFECT];
-    for (SpellImmuneList::const_iterator itr = effectList.begin(); itr != effectList.end(); ++itr)
-        if (itr->type == effect)
-            return true;
+    if (!spellInfo)
+        return false;
+
+    if (spellInfo->HasAttribute(SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY))
+        return false;
+
+    if (spellInfo->Effect[index] == SPELL_EFFECT_NONE)
+        return true;
+
+    MAPLOCK_READ(const_cast<Unit*>(this), MAP_LOCK_TYPE_AURAS);
+    if (!spellInfo->HasAttribute(SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY))
+    {
+        //If m_immuneToEffect type contain this effect type, IMMUNE effect.
+        uint32 effect = spellInfo->Effect[index];
+        SpellImmuneList const& effectList = m_spellImmune[IMMUNITY_EFFECT];
+        for (SpellImmuneList::const_iterator itr = effectList.begin(); itr != effectList.end(); ++itr)
+            if (itr->type == effect)
+                return true;
+    }
 
     if (uint32 mechanic = spellInfo->EffectMechanic[index])
     {
@@ -7266,8 +9303,10 @@ bool Unit::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex i
 
         AuraList const& immuneAuraApply = GetAurasByType(SPELL_AURA_MECHANIC_IMMUNITY_MASK);
         for(AuraList::const_iterator iter = immuneAuraApply.begin(); iter != immuneAuraApply.end(); ++iter)
+        {
             if ((*iter)->GetModifier()->m_miscvalue & (1 << (mechanic-1)))
                 return true;
+        }
     }
 
     if (uint32 aura = spellInfo->EffectApplyAuraName[index])
@@ -7279,6 +9318,7 @@ bool Unit::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex i
 
         // Check for immune to application of harmful magical effects
         AuraList const& immuneAuraApply = GetAurasByType(SPELL_AURA_MOD_IMMUNE_AURA_APPLY_SCHOOL);
+
         if (!immuneAuraApply.empty() &&
             spellInfo->Dispel == DISPEL_MAGIC &&            // Magic debuff)
             !IsPositiveEffect(spellInfo, index))            // Harmful
@@ -7298,16 +9338,24 @@ bool Unit::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex i
  * Calculates caster part of melee damage bonuses,
  * also includes different bonuses dependent from target auras
  */
-uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType attType, SpellEntry const *spellProto, DamageEffectType damagetype, uint32 stack)
+void Unit::MeleeDamageBonusDone(DamageInfo* damageInfo, uint32 stack)
 {
-    if (!pVictim || pdamage == 0 || (spellProto && spellProto->HasAttribute(SPELL_ATTR_EX6_NO_DMG_MODS)))
-        return pdamage;
+    if (!damageInfo || !IsInWorld() || !damageInfo->target || !damageInfo->target->IsInWorld())
+        return;
+
+    Unit* pVictim = damageInfo->target;
+
+    if (damageInfo->damage == 0 || ( damageInfo->GetSpellProto() && damageInfo->GetSpellProto()->HasAttribute(SPELL_ATTR_EX6_NO_DMG_MODS)))
+        return;
+
+    MAPLOCK_READ(this, MAP_LOCK_TYPE_AURAS);
+    if (GetMap() != pVictim->GetMap())
+        MAPLOCK_READ1(pVictim, MAP_LOCK_TYPE_AURAS);
 
     // differentiate for weapon damage based spells
-    bool isWeaponDamageBasedSpell = !(spellProto && (damagetype == DOT || IsSpellHaveEffect(spellProto, SPELL_EFFECT_SCHOOL_DAMAGE)));
-    Item*  pWeapon          = GetTypeId() == TYPEID_PLAYER ? ((Player*)this)->GetWeaponForAttack(attType,true,false) : NULL;
+    bool isWeaponDamageBasedSpell = !(damageInfo->GetSpellProto() && (damageInfo->damageType == DOT || IsSpellHaveEffect(damageInfo->GetSpellProto(), SPELL_EFFECT_SCHOOL_DAMAGE)));
+    Item*  pWeapon          = GetTypeId() == TYPEID_PLAYER ? ((Player*)this)->GetWeaponForAttack(damageInfo->attackType,true,false) : NULL;
     uint32 creatureTypeMask = pVictim->GetCreatureTypeMask();
-    uint32 schoolMask       = spellProto ? spellProto->SchoolMask : GetMeleeDamageSchoolMask();
 
     // FLAT damage bonus auras
     // =======================
@@ -7320,25 +9368,29 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
         AuraList const& mModDamageDone = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE);
         for(AuraList::const_iterator i = mModDamageDone.begin(); i != mModDamageDone.end(); ++i)
         {
-            if ((*i)->GetModifier()->m_miscvalue & schoolMask &&                         // schoolmask has to fit with the intrinsic spell school
-                (*i)->GetModifier()->m_miscvalue & GetMeleeDamageSchoolMask() &&         // AND schoolmask has to fit with weapon damage school (essential for non-physical spells)
-                (((*i)->GetSpellProto()->EquippedItemClass == -1) ||                     // general, weapon independent
-                (pWeapon && pWeapon->IsFitToSpellRequirements((*i)->GetSpellProto()))))  // OR used weapon fits aura requirements
+            if (i->IsEmpty())
+                continue;
+
+            SpellAuraHolderPtr holder = i->GetHolder();  // lock holder
+
+            if ((((*i)->GetModifier()->m_miscvalue & damageInfo->GetSchoolMask()) ||                          // schoolmask has to fit with the intrinsic spell school
+                (*i)->GetSpellProto()->HasAttribute(SPELL_ATTR_EX4_PET_SCALING_AURA)) &&   // completely schoolmask-independend: pet scaling auras
+                                                                                           // Those auras have SPELL_SCHOOL_MASK_MAGIC, but anyway should also affect
+                                                                                           // physical damage from non-weapon-damage-based spells (claw, swipe etc.)
+                ((*i)->GetModifier()->m_miscvalue & GetMeleeDamageSchoolMask()) &&           // AND schoolmask has to fit with weapon damage school (essential for non-physical spells)
+                ((holder->GetSpellProto()->EquippedItemClass == -1) ||                     // general, weapon independent
+                (pWeapon && pWeapon->IsFitToSpellRequirements(holder->GetSpellProto()))))  // OR used weapon fits aura requirements
             {
                 DoneFlat += (*i)->GetModifier()->m_amount;
             }
         }
-
-        // Pets just add their bonus damage to their melee damage
-        if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsPet())
-            DoneFlat += ((Pet*)this)->GetBonusDamage();
     }
 
     // ..done flat (by creature type mask)
     DoneFlat += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_DAMAGE_DONE_CREATURE, creatureTypeMask);
 
     // ..done flat (base at attack power for marked target and base at attack power for creature type)
-    if (attType == RANGED_ATTACK)
+    if (damageInfo->attackType == RANGED_ATTACK)
     {
         APbonus += pVictim->GetTotalAuraModifier(SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS);
         APbonus += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_RANGED_ATTACK_POWER_VERSUS, creatureTypeMask);
@@ -7359,16 +9411,21 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
         AuraList const& mModDamagePercentDone = GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
         for(AuraList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i)
         {
-            if ((*i)->GetModifier()->m_miscvalue & schoolMask &&                         // schoolmask has to fit with the intrinsic spell school
-                (*i)->GetModifier()->m_miscvalue & GetMeleeDamageSchoolMask() &&         // AND schoolmask has to fit with weapon damage school (essential for non-physical spells)
-                (((*i)->GetSpellProto()->EquippedItemClass == -1) ||                     // general, weapon independent
-                (pWeapon && pWeapon->IsFitToSpellRequirements((*i)->GetSpellProto()))))  // OR used weapon fits aura requirements
+            if (i->IsEmpty())
+                continue;
+
+            SpellAuraHolderPtr holder = i->GetHolder();  // lock holder
+
+            if (((*i)->GetModifier()->m_miscvalue & damageInfo->GetSchoolMask()) &&                         // schoolmask has to fit with the intrinsic spell school
+                ((*i)->GetModifier()->m_miscvalue & GetMeleeDamageSchoolMask()) &&         // AND schoolmask has to fit with weapon damage school (essential for non-physical spells)
+                ((holder->GetSpellProto()->EquippedItemClass == -1) ||                     // general, weapon independent
+                (pWeapon && pWeapon->IsFitToSpellRequirements(holder->GetSpellProto()))))  // OR used weapon fits aura requirements
             {
                 DonePercent *= ((*i)->GetModifier()->m_amount+100.0f) / 100.0f;
             }
         }
 
-        if (attType == OFF_ATTACK)
+        if (damageInfo->attackType == OFF_ATTACK)
             DonePercent *= GetModifierValue(UNIT_MOD_DAMAGE_OFFHAND, TOTAL_PCT);                    // no school check required
     }
 
@@ -7381,13 +9438,27 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
     if (!owner)
         owner = this;
 
+    AuraList const& mDamageDoneVersusAuraState = GetAurasByType(SPELL_AURA_DAMAGE_DONE_VERSUS_AURA_STATE_PCT);
+    for(AuraList::const_iterator i = mDamageDoneVersusAuraState.begin();i != mDamageDoneVersusAuraState.end(); ++i)
+    {
+        if (pVictim->HasAuraState(AuraState((*i)->GetModifier()->m_miscvalue)))
+            DonePercent *= ((*i)->GetModifier()->m_amount + 100.0f)/100.0f;
+    }
+
     // ..done (class scripts)
-    if(spellProto)
+    if (damageInfo->GetSpellProto())
     {
         AuraList const& mOverrideClassScript= owner->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
         for(AuraList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i)
         {
-            if (!(*i)->isAffectedOnSpell(spellProto))
+            if (!(*i))
+                continue;
+
+            SpellAuraHolderPtr holder = (*i)->GetHolder();  // lock holder
+            if (!holder || holder->IsDeleted())
+                continue;
+
+            if (!(*i)->isAffectedOnSpell(damageInfo->GetSpellProto()))
                 continue;
 
             switch((*i)->GetModifier()->m_miscvalue)
@@ -7397,15 +9468,15 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
                 case 7277:
                 {
                     // Merciless Combat
-                    if ((*i)->GetSpellProto()->SpellIconID == 2656)
+                    if ((*i)->GetSpellProto()->GetSpellIconID() == 2656)
                     {
-                        if(pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
+                        if (pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
                             DonePercent *= (100.0f+(*i)->GetModifier()->m_amount)/100.0f;
                     }
                     else // Tundra Stalker
                     {
                         // Frost Fever (target debuff)
-                        if (pVictim->GetAura(SPELL_AURA_MOD_MELEE_HASTE, SPELLFAMILY_DEATHKNIGHT, UI64LIT(0x0000000000000000), 0x00000002))
+                        if (pVictim->GetAura<SPELL_AURA_MOD_MELEE_HASTE, SPELLFAMILY_DEATHKNIGHT, CF_DEATHKNIGHT_FF_BP_ACTIVE>())
                             DonePercent *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
                         break;
                     }
@@ -7413,8 +9484,8 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
                 }
                 case 7293: // Rage of Rivendare
                 {
-                    if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DEATHKNIGHT, UI64LIT(0x0200000000000000)))
-                        DonePercent *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
+                    if (pVictim->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DEATHKNIGHT, CF_DEATHKNIGHT_BLOOD_PLAGUE>())
+                        DonePercent *= ((*i)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_1)*2+100.0f)/100.0f;
                     break;
                 }
                 // Marked for Death
@@ -7424,7 +9495,7 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
                 case 7601:
                 case 7602:
                 {
-                    if (pVictim->GetAura(SPELL_AURA_MOD_STALKED, SPELLFAMILY_HUNTER, UI64LIT(0x0000000000000400)))
+                    if (pVictim->GetAura<SPELL_AURA_MOD_STALKED, SPELLFAMILY_HUNTER, CF_HUNTER_HUNTERS_MARK>())
                         DonePercent *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
                     break;
                 }
@@ -7436,12 +9507,19 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
     AuraList const& mclassScritAuras = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
     for(AuraList::const_iterator i = mclassScritAuras.begin(); i != mclassScritAuras.end(); ++i)
     {
+        if (!(*i))
+            continue;
+
+        SpellAuraHolderPtr holder = (*i)->GetHolder();  // lock holder
+        if (!holder || holder->IsDeleted())
+            continue;
+
         switch((*i)->GetMiscValue())
         {
             // Dirty Deeds
             case 6427:
             case 6428:
-                if(pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
+                if (pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
                 {
                     Aura* eff0 = GetAura((*i)->GetId(), EFFECT_INDEX_0);
                     if (!eff0 || (*i)->GetEffIndex() != EFFECT_INDEX_1)
@@ -7457,24 +9535,24 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
         }
     }
 
-    if (spellProto)
+    if (damageInfo->GetSpellProto())
     {
         // Frost Strike
-        if (spellProto->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && spellProto->SpellFamilyFlags & UI64LIT(0x0000000400000000))
+        if (damageInfo->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_FROST_STRIKE>())
         {
             // search disease
             bool found = false;
             Unit::SpellAuraHolderMap const& auras = pVictim->GetSpellAuraHolderMap();
             for(Unit::SpellAuraHolderMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
             {
-                if(itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE)
+                if (itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE)
                 {
                     found = true;
                     break;
                 }
             }
 
-            if(found)
+            if (found)
             {
                 // search for Glacier Rot dummy aura
                 Unit::AuraList const& dummyAuras = GetAurasByType(SPELL_AURA_DUMMY);
@@ -7489,12 +9567,12 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
             }
         }
         // Glyph of Steady Shot (Steady Shot check)
-        else if (spellProto->SpellFamilyName == SPELLFAMILY_HUNTER && spellProto->SpellFamilyFlags & UI64LIT(0x0000000100000000))
+        else if (damageInfo->GetSpellProto()->SpellFamilyName == SPELLFAMILY_HUNTER && damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_HUNTER_STEADY_SHOT>())
         {
             // search for glyph dummy aura
-            if (Aura *aur = GetDummyAura(56826))
+            if (Aura const* aur = GetDummyAura(56826))
                 // check for Serpent Sting at target
-                if (pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_HUNTER, UI64LIT(0x0000000000004000)))
+                if (pVictim->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_HUNTER, CF_HUNTER_SERPENT_STING>())
                     DonePercent *= (aur->GetModifier()->m_amount+100.0f) / 100.0f;
         }
      }
@@ -7508,24 +9586,30 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
     if (!isWeaponDamageBasedSpell)
     {
         // apply ap bonus and benefit affected by spell power implicit coeffs and spell level penalties
-        DoneTotal = SpellBonusWithCoeffs(spellProto, DoneTotal, DoneFlat, APbonus, damagetype, true);
+        DoneTotal = SpellBonusWithCoeffs(damageInfo->GetSpellProto(), DoneTotal, DoneFlat, APbonus, damageInfo->damageType, true);
     }
     // weapon damage based spells
-    else if( APbonus || DoneFlat )
+    else if ( APbonus || DoneFlat )
     {
-        bool normalized = spellProto ? IsSpellHaveEffect(spellProto, SPELL_EFFECT_NORMALIZED_WEAPON_DMG) : false;
-        DoneTotal += int32(APbonus / 14.0f * GetAPMultiplier(attType,normalized));
+        bool normalized = damageInfo->GetSpellProto() ? IsSpellHaveEffect(damageInfo->GetSpellProto(), SPELL_EFFECT_NORMALIZED_WEAPON_DMG) : false;
+        DoneTotal += int32(APbonus / 14.0f * GetAPMultiplier(damageInfo->attackType,normalized));
 
         // for weapon damage based spells we still have to apply damage done percent mods
         // (that are already included into pdamage) to not-yet included DoneFlat
         // e.g. from doneVersusCreature, apBonusVs...
         UnitMods unitMod;
-        switch(attType)
+        switch (damageInfo->attackType)
         {
+            case OFF_ATTACK:
+                unitMod = UNIT_MOD_DAMAGE_OFFHAND;
+                break;
+            case RANGED_ATTACK:
+                unitMod = UNIT_MOD_DAMAGE_RANGED;
+                break;
+            case BASE_ATTACK:
             default:
-            case BASE_ATTACK:   unitMod = UNIT_MOD_DAMAGE_MAINHAND; break;
-            case OFF_ATTACK:    unitMod = UNIT_MOD_DAMAGE_OFFHAND;  break;
-            case RANGED_ATTACK: unitMod = UNIT_MOD_DAMAGE_RANGED;   break;
+                unitMod = UNIT_MOD_DAMAGE_MAINHAND;
+                break;
         }
 
         DoneTotal += DoneFlat;
@@ -7533,38 +9617,49 @@ uint32 Unit::MeleeDamageBonusDone(Unit *pVictim, uint32 pdamage,WeaponAttackType
         DoneTotal *= GetModifierValue(unitMod, TOTAL_PCT);
     }
 
-    float tmpDamage = float(int32(pdamage) + DoneTotal * int32(stack)) * DonePercent;
+    float tmpDamagef = float(int32(damageInfo->damage) + DoneTotal * int32(stack)) * DonePercent;
 
     // apply spellmod to Done damage
-    if(spellProto)
+    if (damageInfo->GetSpellProto())
     {
-        if(Player* modOwner = GetSpellModOwner())
-            modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, tmpDamage);
+        if (Player* modOwner = GetSpellModOwner())
+            modOwner->ApplySpellMod(damageInfo->GetSpellId(), damageInfo->damageType == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, tmpDamagef);
     }
 
-    // bonus result can be negative
-    return tmpDamage > 0 ? uint32(tmpDamage) : 0;
+    int32 tmpDamage = floor(tmpDamagef);
+
+    if (tmpDamage > 0)
+    {
+        damageInfo->bonusDone  = tmpDamage - damageInfo->damage;
+        damageInfo->damage     = tmpDamage;
+    }
+    else
+    {
+        damageInfo->bonusDone  = -int32(damageInfo->damage);
+        damageInfo->damage     = 0;
+    }
 }
 
 /**
  * Calculates target part of melee damage bonuses,
  * will be called on each tick for periodic damage over time auras
  */
-uint32 Unit::MeleeDamageBonusTaken(Unit *pCaster, uint32 pdamage,WeaponAttackType attType, SpellEntry const *spellProto, DamageEffectType damagetype, uint32 stack)
+void Unit::MeleeDamageBonusTaken(DamageInfo* damageInfo, uint32 stack)
 {
-    if (!pCaster)
-        return pdamage;
+    if (!damageInfo || !IsInWorld() || !damageInfo->attacker || !damageInfo->attacker->IsInWorld())
+        return;
+
+    Unit* pCaster = damageInfo->attacker;
 
-    if (pdamage == 0)
-        return pdamage;
+    if (damageInfo->damage == 0 || (damageInfo->GetSpellProto() && damageInfo->GetSpellProto()->HasAttribute(SPELL_ATTR_EX6_NO_DMG_MODS)))
+        return;
 
     // differentiate for weapon damage based spells
-    bool isWeaponDamageBasedSpell = !(spellProto && (damagetype == DOT || IsSpellHaveEffect(spellProto, SPELL_EFFECT_SCHOOL_DAMAGE)));
-    uint32 schoolMask       = spellProto ? spellProto->SchoolMask : GetMeleeDamageSchoolMask();
-    uint32 mechanicMask     = spellProto ? GetAllSpellMechanicMask(spellProto) : 0;
+    bool isWeaponDamageBasedSpell = !(damageInfo->GetSpellProto() && (damageInfo->damageType == DOT || IsSpellHaveEffect(damageInfo->GetSpellProto(), SPELL_EFFECT_SCHOOL_DAMAGE)));
+    uint32 mechanicMask           = damageInfo->GetSpellProto() ? GetAllSpellMechanicMask(damageInfo->GetSpellProto()) : 0;
 
-    // Shred also have bonus as MECHANIC_BLEED damages
-    if (spellProto && spellProto->SpellFamilyName==SPELLFAMILY_DRUID && spellProto->SpellFamilyFlags & UI64LIT(0x00008000))
+    // Shred and Maul also have bonus as MECHANIC_BLEED damages
+    if (damageInfo->GetSpellProto() && damageInfo->GetSpellProto()->SpellFamilyName==SPELLFAMILY_DRUID && damageInfo->GetSpellProto()->GetSpellFamilyFlags().test<CF_DRUID_MAUL, CF_DRUID_SHRED>())
         mechanicMask |= (1 << (MECHANIC_BLEED-1));
 
     // FLAT damage bonus auras
@@ -7572,66 +9667,54 @@ uint32 Unit::MeleeDamageBonusTaken(Unit *pCaster, uint32 pdamage,WeaponAttackTyp
     int32 TakenFlat = 0;
 
     // ..taken flat (base at attack power for marked target and base at attack power for creature type)
-    if (attType == RANGED_ATTACK)
+    if (damageInfo->attackType == RANGED_ATTACK)
         TakenFlat += GetTotalAuraModifier(SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN);
     else
         TakenFlat += GetTotalAuraModifier(SPELL_AURA_MOD_MELEE_DAMAGE_TAKEN);
 
     // ..taken flat (by school mask)
-    TakenFlat += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_DAMAGE_TAKEN, schoolMask);
+    TakenFlat += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_DAMAGE_TAKEN, damageInfo->GetSchoolMask());
 
     // PERCENT damage auras
     // ====================
     float TakenPercent  = 1.0f;
 
     // ..taken pct (by school mask)
-    TakenPercent *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, schoolMask);
+    TakenPercent *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, damageInfo->GetSchoolMask());
 
     // ..taken pct (by mechanic mask)
     TakenPercent *= GetTotalAuraMultiplierByMiscValueForMask(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT,mechanicMask);
 
     // ..taken pct (melee/ranged)
-    if(attType == RANGED_ATTACK)
+    if (damageInfo->attackType == RANGED_ATTACK)
         TakenPercent *= GetTotalAuraMultiplier(SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN_PCT);
     else
         TakenPercent *= GetTotalAuraMultiplier(SPELL_AURA_MOD_MELEE_DAMAGE_TAKEN_PCT);
 
+    if (damageInfo->GetSpellProto())
+    {
+        // ..taken pct (from caster spells)
+        AuraList const& mOwnerTaken = GetAurasByType(SPELL_AURA_MOD_DAMAGE_FROM_CASTER);
+        for(AuraList::const_iterator i = mOwnerTaken.begin(); i != mOwnerTaken.end(); ++i)
+        {
+            if ((*i)->GetCasterGuid() == pCaster->GetObjectGuid() && (*i)->isAffectedOnSpell(damageInfo->GetSpellProto()))
+                TakenPercent *= ((*i)->GetModifier()->m_amount + 100.0f) / 100.0f;
+        }
+    }
+
     // ..taken pct (aoe avoidance)
-    if(spellProto && IsAreaOfEffectSpell(spellProto))
+    if (damageInfo->GetSpellProto() && IsAreaOfEffectSpell(damageInfo->GetSpellProto()))
     {
-        TakenPercent *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE, schoolMask);
+        TakenPercent *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE, damageInfo->GetSchoolMask());
         if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsPet())
-            TakenPercent *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_PET_AOE_DAMAGE_AVOIDANCE, schoolMask);
+            TakenPercent *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_PET_AOE_DAMAGE_AVOIDANCE, damageInfo->GetSchoolMask());
     }
 
     // special dummys/class scripts and other effects
     // =============================================
 
     // .. taken (dummy auras)
-    AuraList const& mDummyAuras = GetAurasByType(SPELL_AURA_DUMMY);
-    for(AuraList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)
-    {
-        switch((*i)->GetId())
-        {
-            case 45182:                                     // Cheating Death
-                if((*i)->GetModifier()->m_miscvalue & SPELL_SCHOOL_MASK_NORMAL)
-                {
-                    if(GetTypeId() != TYPEID_PLAYER)
-                        continue;
-
-                    float mod = ((Player*)this)->GetRatingBonusValue(CR_CRIT_TAKEN_MELEE)*(-8.0f);
-                    if (mod < float((*i)->GetModifier()->m_amount))
-                        mod = float((*i)->GetModifier()->m_amount);
-
-                    TakenPercent *= (mod + 100.0f) / 100.0f;
-                }
-                break;
-            case 20911:                                     // Blessing of Sanctuary
-            case 25899:                                     // Greater Blessing of Sanctuary
-                TakenPercent *= ((*i)->GetModifier()->m_amount + 100.0f) / 100.0f;
-                break;
-        }
-    }
+    TakenPercent *= GetTotalAuraScriptedMultiplierForDamageTaken(damageInfo->GetSpellProto());
 
     // final calculation
     // =================
@@ -7640,23 +9723,32 @@ uint32 Unit::MeleeDamageBonusTaken(Unit *pCaster, uint32 pdamage,WeaponAttackTyp
     if (!isWeaponDamageBasedSpell)
     {
         // apply benefit affected by spell power implicit coeffs and spell level penalties
-        TakenFlat = SpellBonusWithCoeffs(spellProto, 0, TakenFlat, 0, damagetype, false);
+        TakenFlat = SpellBonusWithCoeffs(damageInfo->GetSpellProto(), 0, TakenFlat, 0, damageInfo->damageType, false);
     }
 
-    float tmpDamage = float(int32(pdamage) + TakenFlat * int32(stack)) * TakenPercent;
+    int32 tmpDamage = floor(float(int32(damageInfo->damage) + TakenFlat * int32(stack)) * TakenPercent);
 
-    // bonus result can be negative
-    return tmpDamage > 0 ? uint32(tmpDamage) : 0;
+    if (tmpDamage > 0)
+    {
+        damageInfo->bonusTaken = tmpDamage - damageInfo->damage;
+        damageInfo->damage     = tmpDamage;
+    }
+    else
+    {
+        damageInfo->bonusTaken = -int32(damageInfo->damage);
+        damageInfo->damage     = 0;
+    }
 }
 
 void Unit::ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply)
 {
     if (apply)
     {
+        MAPLOCK_WRITE(this, MAP_LOCK_TYPE_AURAS);
         for (SpellImmuneList::iterator itr = m_spellImmune[op].begin(), next; itr != m_spellImmune[op].end(); itr = next)
         {
             next = itr; ++next;
-            if(itr->type == type)
+            if (itr->type == type)
             {
                 m_spellImmune[op].erase(itr);
                 next = m_spellImmune[op].begin();
@@ -7669,9 +9761,10 @@ void Unit::ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply)
     }
     else
     {
+        MAPLOCK_WRITE(this, MAP_LOCK_TYPE_AURAS);
         for (SpellImmuneList::iterator itr = m_spellImmune[op].begin(); itr != m_spellImmune[op].end(); ++itr)
         {
-            if(itr->spellId == spellId)
+            if (itr->spellId == spellId)
             {
                 m_spellImmune[op].erase(itr);
                 break;
@@ -7684,6 +9777,10 @@ void Unit::ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType ty
 {
     ApplySpellImmune(spellProto->Id,IMMUNITY_DISPEL, type, apply);
 
+    // such dispell type should not remove auras but only return visibility
+    if (type == DISPEL_STEALTH || type == DISPEL_INVISIBILITY)
+        return;
+
     if (apply && spellProto->HasAttribute(SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY))
         RemoveAurasWithDispelType(type);
 }
@@ -7708,7 +9805,7 @@ float Unit::GetPPMProcChance(uint32 WeaponSpeed, float PPM) const
     return WeaponSpeed * PPM / 600.0f;                      // result is chance in percents (probability = Speed_in_sec * (PPM / 60))
 }
 
-void Unit::Mount(uint32 mount, uint32 spellId)
+void Unit::Mount(uint32 mount, uint32 spellId, uint32 vehicleId, uint32 creatureEntry)
 {
     if (!mount)
         return;
@@ -7739,9 +9836,31 @@ void Unit::Mount(uint32 mount, uint32 spellId)
                     ((Player*)this)->UnsummonPetTemporaryIfAny();
                 }
                 else
-                    pet->ApplyModeFlags(PET_MODE_DISABLE_ACTIONS,true);
+                {
+                    pet->GetCharmInfo()->SetState(CHARM_STATE_ACTION,ACTIONS_DISABLE);
+                    pet->SendCharmState();
+                }
+            }
+            else if (Pet* minipet = GetMiniPet())
+            {
+                if (sWorld.getConfig(CONFIG_BOOL_PET_UNSUMMON_AT_MOUNT))
+                    minipet->Unsummon(PET_SAVE_AS_DELETED, this);
             }
         }
+
+        if (vehicleId)
+        {
+            SetVehicleId(vehicleId);
+            GetVehicleKit()->Reset();
+            if (GetTypeId() != TYPEID_UNIT)
+                GetVehicleKit()->Initialize(creatureEntry);
+        }
+
+        WorldPacket data(SMSG_MOVE_SET_COLLISION_HGT, GetPackGUID().size() + 4 + 4);
+        data << GetPackGUID();
+        data << uint32(sWorld.GetGameTime());   // Packet counter
+        data << ((Player*)this)->GetCollisionHeight(true);
+        ((Player*)this)->GetSession()->SendPacket(&data);
     }
 }
 
@@ -7758,18 +9877,33 @@ void Unit::Unmount(bool from_aura)
     // Called NOT by Taxi system / GM command
     if (from_aura)
     {
-        WorldPacket data(SMSG_DISMOUNT, 8);
+        WorldPacket data(SMSG_DISMOUNT, GetPackGUID().size());
         data << GetPackGUID();
         SendMessageToSet(&data, true);
     }
 
+    if (GetVehicleKit())
+    {
+        GetVehicleKit()->Reset();
+        SetVehicleId(0);
+    }
+
     // only resummon old pet if the player is already added to a map
     // this prevents adding a pet to a not created map which would otherwise cause a crash
     // (it could probably happen when logging in after a previous crash)
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
-        if(Pet* pet = GetPet())
-            pet->ApplyModeFlags(PET_MODE_DISABLE_ACTIONS,false);
+        WorldPacket data(SMSG_MOVE_SET_COLLISION_HGT, GetPackGUID().size() + 4 + 4);
+        data << GetPackGUID();
+        data << uint32(sWorld.GetGameTime());   // Packet counter
+        data << ((Player*)this)->GetCollisionHeight(false);
+        ((Player*)this)->GetSession()->SendPacket(&data);
+
+        if (Pet* pet = GetPet())
+        {
+            pet->GetCharmInfo()->SetState(CHARM_STATE_ACTION,ACTIONS_ENABLE);
+            pet->SendCharmState();
+        }
         else
             ((Player*)this)->ResummonPetTemporaryUnSummonedIfAny();
     }
@@ -7778,7 +9912,7 @@ void Unit::Unmount(bool from_aura)
 void Unit::SetInCombatWith(Unit* enemy)
 {
     Unit* eOwner = enemy->GetCharmerOrOwnerOrSelf();
-    if (eOwner->IsPvP())
+    if (eOwner->IsPvP() || eOwner->IsFFAPvP())
     {
         SetInCombatState(true, enemy);
         return;
@@ -7822,6 +9956,8 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
             if (IsNonCombatSpell(spell->m_spellInfo))
                 InterruptSpell(CurrentSpellTypes(i),false);
 
+    RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_COMBAT);
+
     if (creatureNotInCombat)
     {
         // should probably be removed for the attacked (+ it's party/group) only, not global
@@ -7837,7 +9973,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
             pCreature->AI()->EnterCombat(enemy);
 
         // Some bosses are set into combat with zone
-        if (GetMap()->IsDungeon() && (pCreature->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_AGGRO_ZONE) && enemy && enemy->IsControlledByPlayer())
+        if (GetMap()->IsDungeon() && (pCreature->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_AGGRO_ZONE) && enemy && enemy->IsControlledByPlayer())
             pCreature->SetInCombatWithZone();
 
         if (InstanceData* mapInstance = GetInstanceData())
@@ -7853,24 +9989,26 @@ void Unit::ClearInCombat()
     m_CombatTimer = 0;
     RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
 
-    if(isCharmed() || (GetTypeId()!=TYPEID_PLAYER && ((Creature*)this)->IsPet()))
-        RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT);
-
     // Player's state will be cleared in Player::UpdateContestedPvP
-    if (GetTypeId() != TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_UNIT)
     {
-        if (((Creature*)this)->GetCreatureInfo()->unit_flags & UNIT_FLAG_OOC_NOT_ATTACKABLE)
+        Creature* cThis = static_cast<Creature*>(this);
+
+        if (isCharmed() || cThis->IsPet())
+            RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT);
+
+        if ((cThis->GetCreatureInfo()->UnitFlags & UNIT_FLAG_OOC_NOT_ATTACKABLE) && !(cThis->GetTemporaryFactionFlags() & TEMPFACTION_TOGGLE_OOC_NOT_ATTACK))
             SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
 
         clearUnitState(UNIT_STAT_ATTACK_PLAYER);
     }
-    else
+    else if (GetTypeId() == TYPEID_PLAYER)
         ((Player*)this)->UpdatePotionCooldown();
 }
 
 bool Unit::isTargetableForAttack(bool inverseAlive /*=false*/) const
 {
-    if (GetTypeId()==TYPEID_PLAYER && ((Player *)this)->isGameMaster())
+    if (GetTypeId() == TYPEID_PLAYER && ((Player*)this)->isGameMaster())
         return false;
 
     if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE))
@@ -7891,13 +10029,13 @@ int32 Unit::ModifyHealth(int32 dVal)
 {
     int32 gain = 0;
 
-    if(dVal==0)
+    if (dVal==0)
         return 0;
 
     int32 curHealth = (int32)GetHealth();
 
     int32 val = dVal + curHealth;
-    if(val <= 0)
+    if (val <= 0)
     {
         SetHealth(0);
         return -curHealth;
@@ -7905,12 +10043,12 @@ int32 Unit::ModifyHealth(int32 dVal)
 
     int32 maxHealth = (int32)GetMaxHealth();
 
-    if(val < maxHealth)
+    if (val < maxHealth)
     {
         SetHealth(val);
         gain = val - curHealth;
     }
-    else if(curHealth != maxHealth)
+    else
     {
         SetHealth(maxHealth);
         gain = maxHealth - curHealth;
@@ -7923,13 +10061,13 @@ int32 Unit::ModifyPower(Powers power, int32 dVal)
 {
     int32 gain = 0;
 
-    if(dVal==0)
+    if (dVal==0)
         return 0;
 
     int32 curPower = (int32)GetPower(power);
 
     int32 val = dVal + curPower;
-    if(val <= 0)
+    if (val <= 0)
     {
         SetPower(power,0);
         return -curPower;
@@ -7937,12 +10075,12 @@ int32 Unit::ModifyPower(Powers power, int32 dVal)
 
     int32 maxPower = (int32)GetMaxPower(power);
 
-    if(val < maxPower)
+    if (val < maxPower)
     {
         SetPower(power,val);
         gain = val - curPower;
     }
-    else if(curPower != maxPower)
+    else
     {
         SetPower(power,maxPower);
         gain = maxPower - curPower;
@@ -7951,37 +10089,32 @@ int32 Unit::ModifyPower(Powers power, int32 dVal)
     return gain;
 }
 
-bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, bool detect, bool inVisibleList, bool is3dDistance) const
+bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, bool detect, bool inVisibleList, bool is3dDistance, bool skipLOScheck) const
 {
-    if(!u || !IsInMap(u))
+    if (!u)
         return false;
 
     // Always can see self
-    if (u==this)
+    if (u == this)
         return true;
 
-    // player visible for other player if not logout and at same transport
-    // including case when player is out of world
-    bool at_same_transport =
-        GetTypeId() == TYPEID_PLAYER &&  u->GetTypeId()==TYPEID_PLAYER &&
-        !((Player*)this)->GetSession()->PlayerLogout() && !((Player*)u)->GetSession()->PlayerLogout() &&
-        !((Player*)this)->GetSession()->PlayerLoading() && !((Player*)u)->GetSession()->PlayerLoading() &&
-        ((Player*)this)->GetTransport() && ((Player*)this)->GetTransport() == ((Player*)u)->GetTransport();
+    bool at_same_transport = (IsBoarded() && (GetTransportInfo() == u->GetTransportInfo()));
 
     // not in world
-    if(!at_same_transport && (!IsInWorld() || !u->IsInWorld()))
+    if (!at_same_transport && (!IsInMap(u) || !IsInWorld() || !u->IsInWorld()))
         return false;
 
-    // forbidden to seen (at GM respawn command)
-    if(m_Visibility==VISIBILITY_RESPAWN)
+    // forbidden to seen (while Removing corpse)
+    if (m_Visibility == VISIBILITY_REMOVE_CORPSE)
         return false;
 
     Map& _map = *u->GetMap();
+
     // Grid dead/alive checks
-    if (u->GetTypeId()==TYPEID_PLAYER)
+    if (u->GetTypeId() == TYPEID_PLAYER)
     {
         // non visible at grid for any stealth state
-        if(!IsVisibleInGridForPlayer((Player *)u))
+        if (!IsVisibleInGridForPlayer((Player *)u))
             return false;
 
         // if player is dead then he can't detect anyone in any cases
@@ -8002,10 +10135,11 @@ bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo
         if (!IsWithinDistInMap(viewPoint,World::GetMaxVisibleDistanceInFlight()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), is3dDistance))
             return false;
     }
-    else if(!at_same_transport)                             // distance for show player/pet/creature (no transport case)
+    else if (!at_same_transport)                             // distance for show player/pet/creature (no transport case)
     {
         // Any units far than max visible distance for viewer or not in our map are not visible too
-        if (!IsWithinDistInMap(viewPoint, _map.GetVisibilityDistance() + (inVisibleList ? World::GetVisibleUnitGreyDistance() : 0.0f), is3dDistance))
+        // FIXME Visibility distance doubled for on-transport measurement
+        if (!IsWithinDistInMap(viewPoint, _map.GetVisibilityDistance() + (inVisibleList ? World::GetVisibleUnitGreyDistance() : 0.0f) + (IsBoarded() ? _map.GetVisibilityDistance() : 0.0f), is3dDistance))
             return false;
     }
 
@@ -8020,6 +10154,12 @@ bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo
         if (u->GetTypeId() != TYPEID_PLAYER || !((Player *)u)->isGameMaster())
             return false;
 
+    // Death Knights in starting zones with Undying Resolve buff or
+    // in Acherus with Dominion Over Acherus buff - won't see opposite faction
+    if (u->GetTypeId() == TYPEID_PLAYER && GetTypeId() == TYPEID_PLAYER && !((Player*)u)->isGameMaster() &&
+        ((Player*)u)->GetTeam() != ((Player*)this)->GetTeam() && (u->HasAura(51915) || u->HasAura(51721)))
+        return false;
+
     // Visible units, always are visible for all units, except for units under invisibility and phases
     if (m_Visibility == VISIBILITY_ON && u->m_invisibilityMask==0)
         return true;
@@ -8027,7 +10167,7 @@ bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo
     // GMs see any players, not higher GMs and all units in any phase
     if (u->GetTypeId() == TYPEID_PLAYER && ((Player *)u)->isGameMaster())
     {
-        if(GetTypeId() == TYPEID_PLAYER)
+        if (GetTypeId() == TYPEID_PLAYER)
             return ((Player *)this)->GetSession()->GetSecurity() <= ((Player *)u)->GetSession()->GetSecurity();
         else
             return true;
@@ -8037,11 +10177,16 @@ bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo
     if (m_Visibility == VISIBILITY_OFF)
         return false;
 
+    // Arena visibility before arena start
+    if (GetTypeId() == TYPEID_PLAYER && HasAura(32727)) // Arena Preparation
+        if (Player * p_target = ((Unit*)u)->GetCharmerOrOwnerPlayerOrPlayerItself())
+            return ((Player*)this)->GetBGTeam() == p_target->GetBGTeam();
+
     // raw invisibility
     bool invisible = (m_invisibilityMask != 0 || u->m_invisibilityMask !=0);
 
     // detectable invisibility case
-    if( invisible && (
+    if ( invisible && (
         // Invisible units, always are visible for units under same invisibility type
         (m_invisibilityMask & u->m_invisibilityMask)!=0 ||
         // Invisible units, always are visible for unit that can detect this invisibility (have appropriate level for detect)
@@ -8053,13 +10198,13 @@ bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo
     }
 
     // special cases for always overwrite invisibility/stealth
-    if(invisible || m_Visibility == VISIBILITY_GROUP_STEALTH)
+    if (invisible || m_Visibility == VISIBILITY_GROUP_STEALTH)
     {
         // non-hostile case
         if (!u->IsHostileTo(this))
         {
             // player see other player with stealth/invisibility only if he in same group or raid or same team (raid/team case dependent from conf setting)
-            if(GetTypeId()==TYPEID_PLAYER && u->GetTypeId()==TYPEID_PLAYER)
+            if (GetTypeId()==TYPEID_PLAYER && u->GetTypeId()==TYPEID_PLAYER)
             {
                 if(((Player*)this)->IsGroupVisibleFor(((Player*)u)))
                     return true;
@@ -8071,16 +10216,22 @@ bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo
         else
         {
             // Hunter mark functionality
-            AuraList const& auras = GetAurasByType(SPELL_AURA_MOD_STALKED);
-            for(AuraList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter)
+            AuraList const& aurasstalked = GetAurasByType(SPELL_AURA_MOD_STALKED);
+            for(AuraList::const_iterator iter = aurasstalked.begin(); iter != aurasstalked.end(); ++iter)
                 if ((*iter)->GetCasterGuid() == u->GetObjectGuid())
                     return true;
 
+            // Flare functionality
+            AuraList const& aurasimunity = GetAurasByType(SPELL_AURA_DISPEL_IMMUNITY);
+            for(AuraList::const_iterator iter = aurasimunity.begin(); iter != aurasimunity.end(); ++iter)
+                if((*iter)->GetMiscValue() == uint8(invisible ? DISPEL_INVISIBILITY : DISPEL_STEALTH))
+                    return true;
+
             // else apply detecting check for stealth
         }
 
         // none other cases for detect invisibility, so invisible
-        if(invisible)
+        if (invisible)
             return false;
 
         // else apply stealth detecting check
@@ -8094,18 +10245,22 @@ bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo
     if (m_Visibility != VISIBILITY_GROUP_STEALTH)
         return true;
 
+    // Check same transport/vehicle before stealth check
+    if (IsBoarded() && GetTransportInfo() == u->GetTransportInfo())
+        return true;
+
     // NOW ONLY STEALTH CASE
 
     //if in non-detect mode then invisible for unit
     //mobs always detect players (detect == true)... return 'false' for those mobs which have (detect == false)
     //players detect players only in Player::HandleStealthedUnitsDetection()
     if (!detect)
-        return (u->GetTypeId() == TYPEID_PLAYER) ? ((Player*)u)->HaveAtClient(this) : false;
+        return (u->GetTypeId() == TYPEID_PLAYER) ? ((Player*)u)->HaveAtClient(GetObjectGuid()) : false;
 
     // Special cases
 
     // If is attacked then stealth is lost, some creature can use stealth too
-    if( !getAttackers().empty() )
+    if (IsInCombat())
         return true;
 
     // If there is collision rogue is seen regardless of level difference
@@ -8138,19 +10293,23 @@ bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo
 
         //This allows to check talent tree and will add addition stealth dependent on used points)
         int32 stealthMod = GetTotalAuraModifier(SPELL_AURA_MOD_STEALTH_LEVEL);
-        if(stealthMod < 0)
+        if (stealthMod < 0)
             stealthMod = 0;
 
         //-Stealth Mod(positive like Master of Deception) and Stealth Detection(negative like paranoia)
         //based on wowwiki every 5 mod we have 1 more level diff in calculation
-        visibleDistance += (int32(u->GetTotalAuraModifier(SPELL_AURA_MOD_STEALTH_DETECT)) - stealthMod)/5.0f;
+        int32 detectMod = u->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_STEALTH_DETECT, 0); // skip Detect Traps
+        visibleDistance += (detectMod - stealthMod) / 5.0f;
         visibleDistance = visibleDistance > MAX_PLAYER_STEALTH_DETECT_RANGE ? MAX_PLAYER_STEALTH_DETECT_RANGE : visibleDistance;
 
         // recheck new distance
-        if(visibleDistance <= 0 || !IsWithinDist(viewPoint,visibleDistance))
+        if (visibleDistance <= 0 || !IsWithinDist(viewPoint,visibleDistance))
             return false;
     }
 
+    if (skipLOScheck)
+        return true;
+
     // Now check is target visible with LoS
     float ox,oy,oz;
     viewPoint->GetPosition(ox,oy,oz);
@@ -8163,23 +10322,22 @@ void Unit::UpdateVisibilityAndView()
     static const AuraType auratypes[] = {SPELL_AURA_BIND_SIGHT, SPELL_AURA_FAR_SIGHT, SPELL_AURA_NONE};
     for (AuraType const* type = &auratypes[0]; *type != SPELL_AURA_NONE; ++type)
     {
-        AuraList& alist = m_modAuras[*type];
-        if(alist.empty())
+        AuraList alist = m_modAuras[*type];
+        if (alist.empty())
             continue;
 
-        for (AuraList::iterator it = alist.begin(); it != alist.end();)
+        for (AuraList::iterator itr = alist.begin(); itr != alist.end();)
         {
-            Aura* aura = (*it);
-            Unit* owner = aura->GetCaster();
+            Unit* owner = (*itr)->GetCaster();
 
             if (!owner || !isVisibleForOrDetect(owner,this,false))
             {
-                alist.erase(it);
-                RemoveAura(aura);
-                it = alist.begin();
+                RemoveAura((*itr)());
+                alist.erase(itr);
+                itr = alist.begin();
             }
             else
-                ++it;
+                ++itr;
         }
     }
 
@@ -8193,7 +10351,7 @@ void Unit::SetVisibility(UnitVisibility x)
 {
     m_Visibility = x;
 
-    if(IsInWorld())
+    if (IsInWorld())
         UpdateVisibilityAndView();
 }
 
@@ -8233,6 +10391,13 @@ bool Unit::canDetectInvisibilityOf(Unit const* u) const
 
 void Unit::UpdateSpeed(UnitMoveType mtype, bool forced, float ratio)
 {
+    bool isPlayerPet = false;
+    if (GetTypeId() == TYPEID_UNIT)
+    {
+        Creature* pCreature = (Creature*)this;
+        if ((pCreature->IsPet() && pCreature->GetOwnerGuid().IsPlayer()))
+            isPlayerPet = true;
+    }
     // not in combat pet have same speed as owner
     switch(mtype)
     {
@@ -8241,7 +10406,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced, float ratio)
         case MOVE_SWIM:
             if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsPet() && hasUnitState(UNIT_STAT_FOLLOW))
             {
-                if(Unit* owner = GetOwner())
+                if (Unit* owner = GetOwner())
                 {
                     SetSpeedRate(mtype, owner->GetSpeedRate(mtype), forced);
                     return;
@@ -8262,6 +10427,9 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced, float ratio)
             break;
         case MOVE_RUN:
         {
+            if (GetTypeId() == TYPEID_UNIT && !isPlayerPet)
+                ratio *= ((Creature*)this)->GetCreatureInfo()->SpeedRun;
+
             if (IsMounted()) // Use on mount auras
             {
                 main_speed_mod  = GetMaxPositiveAuraModifier(SPELL_AURA_MOD_INCREASE_MOUNTED_SPEED);
@@ -8308,6 +10476,21 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced, float ratio)
             return;
     }
 
+    // Remove Druid Dash bonus if not in Cat Form
+    if (GetShapeshiftForm() != FORM_CAT)
+    {
+        AuraList const& speed_increase_auras = GetAurasByType(SPELL_AURA_MOD_INCREASE_SPEED);
+        for(AuraList::const_iterator itr = speed_increase_auras.begin(); itr != speed_increase_auras.end(); ++itr)
+        {
+            const SpellEntry* aura_proto = (*itr)->GetSpellProto();
+            if (aura_proto->SpellFamilyName == SPELLFAMILY_DRUID && aura_proto->GetSpellIconID() == 959)
+            {
+                main_speed_mod -= (*itr)->GetModifier()->m_amount;
+                break;
+            }
+        }
+    }
+
     float bonus = non_stack_bonus > stack_bonus ? non_stack_bonus : stack_bonus;
     // now we ready for speed calculation
     float speed  = main_speed_mod ? bonus*(100.0f + main_speed_mod)/100.0f : bonus;
@@ -8320,7 +10503,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced, float ratio)
         {
             // Normalize speed by 191 aura SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED if need
             // TODO: possible affect only on MOVE_RUN
-            if(int32 normalization = GetMaxPositiveAuraModifier(SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED))
+            if (int32 normalization = GetMaxPositiveAuraModifier(SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED))
             {
                 // Use speed from aura
                 float max_speed = normalization / baseMoveSpeed[mtype];
@@ -8356,15 +10539,15 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced, float ratio)
             speed = min_speed;
     }
 
-    if (GetTypeId() == TYPEID_UNIT)
+    if (GetTypeId() == TYPEID_UNIT && !isPlayerPet)
     {
         switch(mtype)
         {
             case MOVE_RUN:
-                speed *= ((Creature*)this)->GetCreatureInfo()->speed_run;
+                speed *= ((Creature*)this)->GetCreatureInfo()->SpeedRun;
                 break;
             case MOVE_WALK:
-                speed *= ((Creature*)this)->GetCreatureInfo()->speed_walk;
+                speed *= ((Creature*)this)->GetCreatureInfo()->SpeedWalk;
                 break;
             default:
                 break;
@@ -8389,7 +10572,7 @@ struct SetSpeedRateHelper
 
 void Unit::SetSpeedRate(UnitMoveType mtype, float rate, bool forced)
 {
-    if (rate < 0)
+    if (rate < 0.0f)
         rate = 0.0f;
 
     // Update speed only on change
@@ -8398,46 +10581,43 @@ void Unit::SetSpeedRate(UnitMoveType mtype, float rate, bool forced)
         m_speed_rate[mtype] = rate;
         propagateSpeedChange();
 
-        const uint16 SetSpeed2Opc_table[MAX_MOVE_TYPE][2]=
-        {
-            {MSG_MOVE_SET_WALK_SPEED,       SMSG_FORCE_WALK_SPEED_CHANGE},
-            {MSG_MOVE_SET_RUN_SPEED,        SMSG_FORCE_RUN_SPEED_CHANGE},
-            {MSG_MOVE_SET_RUN_BACK_SPEED,   SMSG_FORCE_RUN_BACK_SPEED_CHANGE},
-            {MSG_MOVE_SET_SWIM_SPEED,       SMSG_FORCE_SWIM_SPEED_CHANGE},
-            {MSG_MOVE_SET_SWIM_BACK_SPEED,  SMSG_FORCE_SWIM_BACK_SPEED_CHANGE},
-            {MSG_MOVE_SET_TURN_RATE,        SMSG_FORCE_TURN_RATE_CHANGE},
-            {MSG_MOVE_SET_FLIGHT_SPEED,     SMSG_FORCE_FLIGHT_SPEED_CHANGE},
-            {MSG_MOVE_SET_FLIGHT_BACK_SPEED,SMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE},
-            {MSG_MOVE_SET_PITCH_RATE,       SMSG_FORCE_PITCH_RATE_CHANGE},
+        const Opcodes SetSpeed2Opc_table[MAX_MOVE_TYPE][2]=
+        {
+            {MSG_MOVE_SET_WALK_SPEED,        SMSG_FORCE_WALK_SPEED_CHANGE},
+            {MSG_MOVE_SET_RUN_SPEED,         SMSG_FORCE_RUN_SPEED_CHANGE},
+            {MSG_MOVE_SET_RUN_BACK_SPEED,    SMSG_FORCE_RUN_BACK_SPEED_CHANGE},
+            {MSG_MOVE_SET_SWIM_SPEED,        SMSG_FORCE_SWIM_SPEED_CHANGE},
+            {MSG_MOVE_SET_SWIM_BACK_SPEED,   SMSG_FORCE_SWIM_BACK_SPEED_CHANGE},
+            {MSG_MOVE_SET_TURN_RATE,         SMSG_FORCE_TURN_RATE_CHANGE},
+            {MSG_MOVE_SET_FLIGHT_SPEED,      SMSG_FORCE_FLIGHT_SPEED_CHANGE},
+            {MSG_MOVE_SET_FLIGHT_BACK_SPEED, SMSG_FORCE_FLIGHT_BACK_SPEED_CHANGE},
+            {MSG_MOVE_SET_PITCH_RATE,        SMSG_FORCE_PITCH_RATE_CHANGE},
         };
 
-        if (forced)
+        if (forced && GetTypeId() == TYPEID_PLAYER)
         {
-            if (GetTypeId() == TYPEID_PLAYER)
-            {
-                // register forced speed changes for WorldSession::HandleForceSpeedChangeAck
-                // and do it only for real sent packets and use run for run/mounted as client expected
-                ++((Player*)this)->m_forced_speed_changes[mtype];
-            }
+            // register forced speed changes for WorldSession::HandleForceSpeedChangeAck
+            // and do it only for real sent packets and use run for run/mounted as client expected
+            ++((Player*)this)->m_forced_speed_changes[mtype];
 
-            WorldPacket data(SetSpeed2Opc_table[mtype][1], 18);
+            WorldPacket data(SetSpeed2Opc_table[mtype][1], GetPackGUID().size() + 4 + 1 + 4);
             data << GetPackGUID();
             data << (uint32)0;                                  // moveEvent, NUM_PMOVE_EVTS = 0x39
             if (mtype == MOVE_RUN)
                 data << uint8(0);                               // new 2.1.0
             data << float(GetSpeed(mtype));
-            SendMessageToSet(&data, true);
-        }
-        else
-        {
-            m_movementInfo.UpdateTime(WorldTimer::getMSTime());
 
-            WorldPacket data(SetSpeed2Opc_table[mtype][0], 64);
-            data << GetPackGUID();
-            data << m_movementInfo;
-            data << float(GetSpeed(mtype));
-            SendMessageToSet(&data, true);
+            ((Player*)this)->GetSession()->SendPacket(&data);
         }
+
+        m_movementInfo.UpdateTime(WorldTimer::getMSTime());
+
+        // TODO: Actually such opcodes should (always?) be packed with SMSG_COMPRESSED_MOVES
+        WorldPacket data(SetSpeed2Opc_table[mtype][0], 64);
+        data << GetPackGUID();
+        data << m_movementInfo;
+        data << float(GetSpeed(mtype));
+        SendMessageToSet(&data, false);
     }
 
     CallForAllControlledUnits(SetSpeedRateHelper(mtype,forced), CONTROLLED_PET|CONTROLLED_GUARDIANS|CONTROLLED_CHARM|CONTROLLED_MINIPET);
@@ -8447,11 +10627,12 @@ void Unit::SetDeathState(DeathState s)
 {
     if (s != ALIVE && s!= JUST_ALIVED)
     {
+        ExitVehicle(true);
         CombatStop();
         DeleteThreatList();
         ClearComboPointHolders();                           // any combo points pointed to unit lost at it death
 
-        if(IsNonMeleeSpellCasted(false))
+        if (IsNonMeleeSpellCasted(false))
             InterruptNonMeleeSpells(false);
     }
 
@@ -8462,20 +10643,27 @@ void Unit::SetDeathState(DeathState s)
         RemoveMiniPet();
         UnsummonAllTotems();
 
-        i_motionMaster.Clear(false,true);
-        i_motionMaster.MoveIdle();
+        GetUnitStateMgr().InitDefaults(false);
         StopMoving();
 
+        if (GetVehicleKit())
+            GetVehicleKit()->RemoveAllPassengers();
+
         ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
         ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
         // remove aurastates allowing special moves
         ClearAllReactives();
         ClearDiminishings();
+        ProcDamageAndSpell(this, PROC_FLAG_NONE, PROC_FLAG_ON_DEATH, PROC_EX_NONE, 0);
     }
-    else if(s == JUST_ALIVED)
+    else if (s == JUST_ALIVED)
     {
         RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); // clear skinnable for creature and player (at battleground)
     }
+    else if (s == DEAD || s == CORPSE)
+    {
+        GetUnitStateMgr().DropAllStates();
+    }
 
     if (m_deathState != ALIVE && s == ALIVE)
     {
@@ -8514,6 +10702,10 @@ bool Unit::CanHaveThreatList() const
     if (creature->GetCharmerGuid().IsPlayer())
         return false;
 
+    // Is it correct?
+    if (isCharmed())
+        return false;
+
     return true;
 }
 
@@ -8545,39 +10737,56 @@ void Unit::AddThreat(Unit* pVictim, float threat /*= 0.0f*/, bool crit /*= false
 
 void Unit::DeleteThreatList()
 {
-    if (CanHaveThreatList() && !m_ThreatManager.isThreatListEmpty())
-        SendThreatClear();
-
-    m_ThreatManager.clearReferences();
+    if (CanHaveThreatList())
+    {
+        if (!m_ThreatManager.isThreatListEmpty())
+            SendThreatClear();
+        m_ThreatManager.clearReferences();
+    }
 }
 
 //======================================================================
 
-void Unit::TauntApply(Unit* taunter)
+bool Unit::TauntApply(Unit* taunter, bool isSingleEffect)
 {
     MANGOS_ASSERT(GetTypeId() == TYPEID_UNIT);
 
-    if (!taunter || (taunter->GetTypeId() == TYPEID_PLAYER && ((Player*)taunter)->isGameMaster()))
-        return;
+    if (!taunter
+        || (taunter->GetTypeId() == TYPEID_PLAYER && ((Player*)taunter)->isGameMaster())
+        // FIXME - this checks really needed?
+        //|| !taunter->isVisibleForOrDetect(this,this,true)
+        //|| IsFriendlyTo(taunter)
+        )
+        return false;
+
+    Unit* target = getVictim();
+    if (target && target == taunter)
+        return false;
 
     if (!CanHaveThreatList())
-        return;
-
-    Unit *target = getVictim();
+        return false;
 
-    if (target && target == taunter)
-        return;
+    // if target immune to taunt don't change threat
+    if (GetDiminishing(DIMINISHING_TAUNT) == DIMINISHING_LEVEL_IMMUNE)
+        return false;
 
     // Only attack taunter if this is a valid target
     if (!hasUnitState(UNIT_STAT_STUNNED | UNIT_STAT_DIED) && !IsSecondChoiceTarget(taunter, true))
     {
-        SetInFront(taunter);
+        if (GetTargetGuid() || !target)
+            SetInFront(taunter);
 
         if (((Creature*)this)->AI())
             ((Creature*)this)->AI()->AttackStart(taunter);
     }
 
-    m_ThreatManager.tauntApply(taunter);
+    if (isSingleEffect)
+        getThreatManager().addThreat(taunter, getThreatManager().getCurrentVictim() ?
+                                              getThreatManager().getCurrentVictim()->getThreat() : 1.0f);
+    else
+        getThreatManager().tauntApply(taunter);
+
+    return true;
 }
 
 //======================================================================
@@ -8592,18 +10801,15 @@ void Unit::TauntFadeOut(Unit *taunter)
     if (!CanHaveThreatList())
         return;
 
-    Unit *target = getVictim();
-
+    Unit* target = getVictim();
     if (!target || target != taunter)
         return;
 
     if (m_ThreatManager.isThreatListEmpty())
     {
-        if (((Creature*)this)->AI())
-            ((Creature*)this)->AI()->EnterEvadeMode();
+        m_fixateTargetGuid.Clear();
 
-        if (InstanceData* mapInstance = GetInstanceData())
-            mapInstance->OnCreatureEvade((Creature*)this);
+        AddEvent(new EvadeDelayEvent(*this), EVADE_TIME_DELAY_MIN);
 
         if (m_isCreatureLinkingTrigger)
             GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_EVADE, (Creature*)this);
@@ -8616,13 +10822,35 @@ void Unit::TauntFadeOut(Unit *taunter)
 
     if (target && target != taunter)
     {
-        SetInFront(target);
+        if (GetTargetGuid())
+            SetInFront(target);
 
         if (((Creature*)this)->AI())
             ((Creature*)this)->AI()->AttackStart(target);
     }
 }
 
+//======================================================================
+/// if pVictim is given, the npc will fixate onto pVictim, if NULL it will remove current fixation
+void Unit::FixateTarget(Unit* pVictim)
+{
+    if (!pVictim)                                           // Remove Fixation
+        m_fixateTargetGuid.Clear();
+    else if (pVictim->isTargetableForAttack())              // Apply Fixation
+        m_fixateTargetGuid = pVictim->GetObjectGuid();
+
+    // Start attacking the fixated target or the next proper one
+    SelectHostileTarget();
+}
+
+Unit* Unit::GetFixatedTarget()
+{
+    if (!GetMap() || m_fixateTargetGuid.IsEmpty())
+        return NULL;
+
+    return GetMap()->GetUnit(m_fixateTargetGuid);
+}
+
 //======================================================================
 
 bool Unit::IsSecondChoiceTarget(Unit* pTarget, bool checkThreatArea) const
@@ -8632,12 +10860,12 @@ bool Unit::IsSecondChoiceTarget(Unit* pTarget, bool checkThreatArea) const
     return
         pTarget->IsImmunedToDamage(GetMeleeDamageSchoolMask()) ||
         pTarget->hasNegativeAuraWithInterruptFlag(AURA_INTERRUPT_FLAG_DAMAGE) ||
-        checkThreatArea && ((Creature*)this)->IsOutOfThreatArea(pTarget);
+        (checkThreatArea && ((Creature*)this)->IsOutOfThreatArea(pTarget));
 }
 
 //======================================================================
 
-bool Unit::SelectHostileTarget()
+bool Unit::SelectHostileTarget(bool withEvade)
 {
     //function provides main threat functionality
     //next-victim-selection algorithm and evade mode are called
@@ -8645,7 +10873,7 @@ bool Unit::SelectHostileTarget()
 
     MANGOS_ASSERT(GetTypeId() == TYPEID_UNIT);
 
-    if (!this->isAlive())
+    if (!GetMap() ||!isAlive())
         return false;
 
     //This function only useful once AI has been initialized
@@ -8655,27 +10883,44 @@ bool Unit::SelectHostileTarget()
     Unit* target = NULL;
     Unit* oldTarget = getVictim();
 
-    // First checking if we have some taunt on us
-    const AuraList& tauntAuras = GetAurasByType(SPELL_AURA_MOD_TAUNT);
-    if (!tauntAuras.empty())
+    // first check if we should fixate a target
+    if (m_fixateTargetGuid)
     {
-        Unit* caster;
+        if (oldTarget && oldTarget->GetObjectGuid() == m_fixateTargetGuid)
+            target = oldTarget;
+        else
+        {
+            Unit* pFixateTarget = GetMap()->GetUnit(m_fixateTargetGuid);
+            if (pFixateTarget && pFixateTarget->isAlive() && !IsSecondChoiceTarget(pFixateTarget, true))
+                target = pFixateTarget;
+        }
+    }
 
-        // Find first available taunter target
-        // Auras are pushed_back, last caster will be on the end
-        for (AuraList::const_reverse_iterator aura = tauntAuras.rbegin(); aura != tauntAuras.rend(); ++aura)
+    // then checking if we have some taunt on us
+    if (!target)
+    {
+        AuraList const& tauntAuras = GetAurasByType(SPELL_AURA_MOD_TAUNT);
+        if (!tauntAuras.empty())
         {
-            if ((caster = (*aura)->GetCaster()) && caster->IsInMap(this) &&
-                caster->isTargetableForAttack() && caster->isInAccessablePlaceFor((Creature*)this) &&
-                !IsSecondChoiceTarget(caster, true))
+            Unit* caster = NULL;
+
+            // Find first available taunter target
+            // Auras are pushed_back, last caster will be on the end
+            for (AuraList::const_reverse_iterator aura = tauntAuras.rbegin(); aura != tauntAuras.rend(); ++aura)
             {
-                target = caster;
-                break;
+                if ((caster = (*aura)->GetCaster()) && caster->IsInMap(this) &&
+                    caster->isTargetableForAttack() && caster->isInAccessablePlaceFor(this) &&
+                    (!IsCombatStationary() || CanReachWithMeleeAttack(caster)) &&
+                    !IsSecondChoiceTarget(caster, true))
+                {
+                    target = caster;
+                    break;
+                }
             }
         }
     }
 
-    // No taunt aura or taunt aura caster is dead, standard target selection
+    // No valid fixate target, taunt aura or taunt aura caster is dead, standard target selection
     if (!target && !m_ThreatManager.isThreatListEmpty())
         target = m_ThreatManager.getHostileTarget();
 
@@ -8683,13 +10928,10 @@ bool Unit::SelectHostileTarget()
     {
         if (!hasUnitState(UNIT_STAT_STUNNED | UNIT_STAT_DIED))
         {
-            SetInFront(target);
-            if (oldTarget != target)
-                ((Creature*)this)->AI()->AttackStart(target);
 
             // check if currently selected target is reachable
             // NOTE: path alrteady generated from AttackStart()
-            if(!GetMotionMaster()->operator->()->IsReachable())
+            if (!target->isInAccessablePlaceFor(this))
             {
                 // remove all taunts
                 RemoveSpellsCausingAura(SPELL_AURA_MOD_TAUNT);
@@ -8697,21 +10939,26 @@ bool Unit::SelectHostileTarget()
                 if(m_ThreatManager.getThreatList().size() < 2)
                 {
                     // only one target in list, we have to evade after timer
-                    // TODO: make timer - inside Creature class
-                    ((Creature*)this)->AI()->EnterEvadeMode();
+                    if (withEvade)
+                        AddEvent(new EvadeDelayEvent(*this), EVADE_TIME_DELAY);
                 }
                 else
                 {
                     // remove unreachable target from our threat list
                     // next iteration we will select next possible target
-                    m_HostileRefManager.deleteReference(target);
+                    m_HostileRefManager->deleteReference(target);
                     m_ThreatManager.modifyThreatPercent(target, -101);
-
-                    _removeAttacker(target);
+                    // remove target from current attacker, do not exit combat settings
+                    AttackStop(true);
                 }
-
                 return false;
             }
+            else
+            {
+                SetInFront(target);
+                if (oldTarget != target)
+                    ((Creature*)this)->AI()->AttackStart(target);
+            }
         }
         return true;
     }
@@ -8724,20 +10971,24 @@ bool Unit::SelectHostileTarget()
     // it in combat but attacker not make any damage and not enter to aggro radius to have record in threat list
     // for example at owner command to pet attack some far away creature
     // Note: creature not have targeted movement generator but have attacker in this case
-    if (GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
+    if (!IsInUnitState(UNIT_ACTION_CHASE))
     {
-        for(AttackerSet::const_iterator itr = m_attackers.begin(); itr != m_attackers.end(); ++itr)
+        GuidSet& attackers = GetMap()->GetAttackersFor(GetObjectGuid());
+
+        for (GuidSet::iterator itr = attackers.begin(); itr != attackers.end(); ++itr)
         {
-            if ((*itr)->IsInMap(this) && (*itr)->isTargetableForAttack() && (*itr)->isInAccessablePlaceFor((Creature*)this))
+            Unit* attacker = GetMap()->GetUnit(*itr);
+            if (attacker && attacker->IsInMap(this) && attacker->isTargetableForAttack() && attacker->isInAccessablePlaceFor(this))
                 return false;
         }
     }
+    if (!withEvade)
+        return false;
 
     // enter in evade mode in other case
-    ((Creature*)this)->AI()->EnterEvadeMode();
+    m_fixateTargetGuid.Clear();
 
-    if (InstanceData* mapInstance = GetInstanceData())
-        mapInstance->OnCreatureEvade((Creature*)this);
+    AddEvent(new EvadeDelayEvent(*this), EVADE_TIME_DELAY_MIN);
 
     if (m_isCreatureLinkingTrigger)
         GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_EVADE, (Creature*)this);
@@ -8753,7 +11004,7 @@ int32 Unit::CalculateSpellDamage(Unit const* target, SpellEntry const* spellProt
 {
     Player* unitPlayer = (GetTypeId() == TYPEID_PLAYER) ? (Player*)this : NULL;
 
-    uint8 comboPoints = unitPlayer ? unitPlayer->GetComboPoints() : 0;
+    uint8 comboPoints = GetComboPoints();
 
     int32 level = int32(getLevel());
     if (level > (int32)spellProto->maxLevel && spellProto->maxLevel > 0)
@@ -8786,11 +11037,20 @@ int32 Unit::CalculateSpellDamage(Unit const* target, SpellEntry const* spellProt
 
     int32 value = basePoints;
 
+    // Life Burst (Malygos) hack
+    if (spellProto->Id == 57143)
+    {
+        value /= 2;
+        comboDamage = value;
+    }
+
     // random damage
-    if (comboDamage != 0 && unitPlayer && target && (target->GetObjectGuid() == unitPlayer->GetComboTargetGuid()))
+    if (comboDamage != 0 && unitPlayer && target && (target->GetObjectGuid() == unitPlayer->GetComboTargetGuid() || IsAreaOfEffectSpell(spellProto)))
         value += (int32)(comboDamage * comboPoints);
 
-    if (Player* modOwner = GetSpellModOwner())
+    Player* modOwner = GetSpellModOwner();
+
+    if (modOwner && IsSpellAffectedBySpellMods(spellProto))
     {
         modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_ALL_EFFECTS, value);
 
@@ -8805,6 +11065,8 @@ int32 Unit::CalculateSpellDamage(Unit const* target, SpellEntry const* spellProt
             case EFFECT_INDEX_2:
                 modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_EFFECT3, value);
                 break;
+            default:
+                break;
         }
     }
 
@@ -8838,18 +11100,29 @@ int32 Unit::CalculateAuraDuration(SpellEntry const* spellProto, uint32 effectMas
 
     int32 dispelMod = 0;
     int32 dmgClassMod = 0;
+    bool  isAffectedByModifier = !IsPositiveSpell(spellProto);
 
-    if (!IsPositiveSpell(spellProto))
+    for (uint8 eff = 0; eff < MAX_EFFECT_INDEX; ++eff)
     {
+        if (effectMask & (1 << eff))
+        {
+            if (IsAuraApplyEffect(spellProto, SpellEffectIndex(eff)) && IsPositiveEffect(spellProto, SpellEffectIndex(eff)))
+                isAffectedByModifier = false;
+        }
+    }
+
+    if (isAffectedByModifier)
+    {
+        // This aura modifiers possible stacks. need more research (/dev/rsa)
         dispelMod   = GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DURATION_OF_EFFECTS_BY_DISPEL, spellProto->Dispel);
-        dmgClassMod = GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DURATION_OF_MAGIC_EFFECTS, spellProto->DmgClass);
+        dmgClassMod = GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DURATION_OF_MAGIC_EFFECTS,     spellProto->Dispel);
     }
 
     int32 durationMod = std::min(mechanicMod, std::min(dispelMod, dmgClassMod));
 
     if (durationMod != 0)
     {
-        duration = int32(int64(duration) * (100+durationMod) / 100);
+        duration = int32(floor((float)duration * ((100.0f + (float)durationMod) / 100.0f)));
 
         if (duration < 0)
             duration = 0;
@@ -8861,7 +11134,7 @@ int32 Unit::CalculateAuraDuration(SpellEntry const* spellProto, uint32 effectMas
         {
             case SPELLFAMILY_DRUID:
                 // Thorns
-                if (spellProto->SpellIconID == 53 && (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000100)))
+                if (spellProto->GetSpellIconID() == 53 && spellProto->GetSpellFamilyFlags().test<CF_DRUID_THORNS>())
                 {
                     // Glyph of Thorns
                     if (Aura *aur = GetAura(57862, EFFECT_INDEX_0))
@@ -8870,14 +11143,14 @@ int32 Unit::CalculateAuraDuration(SpellEntry const* spellProto, uint32 effectMas
                 break;
             case SPELLFAMILY_PALADIN:
                 // Blessing of Might
-                if (spellProto->SpellIconID == 298 && spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000002))
+                if (spellProto->GetSpellIconID() == 298 && spellProto->GetSpellFamilyFlags().test<CF_PALADIN_BLESSING_OF_MIGHT>())
                 {
                     // Glyph of Blessing of Might
                     if (Aura *aur = GetAura(57958, EFFECT_INDEX_0))
                         duration += aur->GetModifier()->m_amount * MINUTE * IN_MILLISECONDS;
                 }
                 // Blessing of Wisdom
-                else if (spellProto->SpellIconID == 306 && spellProto->SpellFamilyFlags & UI64LIT(0x0000000000010000))
+                else if (spellProto->GetSpellIconID() == 306 && spellProto->GetSpellFamilyFlags().test<CF_PALADIN_BLESSING_OF_WISDOM>())
                 {
                     // Glyph of Blessing of Wisdom
                     if (Aura *aur = GetAura(57979, EFFECT_INDEX_0))
@@ -8896,7 +11169,7 @@ DiminishingLevels Unit::GetDiminishing(DiminishingGroup group)
 {
     for(Diminishing::iterator i = m_Diminishing.begin(); i != m_Diminishing.end(); ++i)
     {
-        if(i->DRGroup != group)
+        if (i->DRGroup != group)
             continue;
 
         if(!i->hitCount)
@@ -8925,9 +11198,9 @@ void Unit::IncrDiminishing(DiminishingGroup group)
     // Checking for existing in the table
     for(Diminishing::iterator i = m_Diminishing.begin(); i != m_Diminishing.end(); ++i)
     {
-        if(i->DRGroup != group)
+        if (i->DRGroup != group)
             continue;
-        if(i->hitCount < DIMINISHING_LEVEL_IMMUNE)
+        if (i->hitCount < DIMINISHING_LEVEL_IMMUNE)
             i->hitCount += 1;
         return;
     }
@@ -8936,27 +11209,24 @@ void Unit::IncrDiminishing(DiminishingGroup group)
 
 void Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration,Unit* caster,DiminishingLevels Level, int32 limitduration, bool isReflected)
 {
-    if(duration == -1 || group == DIMINISHING_NONE || (!isReflected && caster->IsFriendlyTo(this)) )
+    if (duration == -1 || group == DIMINISHING_NONE || (!isReflected && caster->IsFriendlyTo(this)) )
         return;
 
+    // test pet/charm masters instead pets/charmeds
+    Player* target = GetCharmerOrOwnerPlayerOrPlayerItself();
+    Player* source = caster->GetCharmerOrOwnerPlayerOrPlayerItself();
+
     // Duration of crowd control abilities on pvp target is limited by 10 sec. (2.2.0)
-    if(limitduration > 0 && duration > limitduration)
+    if (limitduration > 0 && duration > limitduration)
     {
-        // test pet/charm masters instead pets/charmeds
-        Unit const* targetOwner = GetCharmerOrOwner();
-        Unit const* casterOwner = caster->GetCharmerOrOwner();
-
-        Unit const* target = targetOwner ? targetOwner : this;
-        Unit const* source = casterOwner ? casterOwner : caster;
-
-        if(target->GetTypeId() == TYPEID_PLAYER && source->GetTypeId() == TYPEID_PLAYER)
+        if (target && source)
             duration = limitduration;
     }
 
     float mod = 1.0f;
 
     // Some diminishings applies to mobs too (for example, Stun)
-    if((GetDiminishingReturnsGroupType(group) == DRTYPE_PLAYER && GetTypeId() == TYPEID_PLAYER) || GetDiminishingReturnsGroupType(group) == DRTYPE_ALL)
+    if ((GetDiminishingReturnsGroupType(group) == DRTYPE_PLAYER && target) || GetDiminishingReturnsGroupType(group) == DRTYPE_ALL)
     {
         DiminishingLevels diminish = Level;
         switch(diminish)
@@ -8964,6 +11234,22 @@ void Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration,Un
             case DIMINISHING_LEVEL_1: break;
             case DIMINISHING_LEVEL_2: mod = 0.5f; break;
             case DIMINISHING_LEVEL_3: mod = 0.25f; break;
+            case DIMINISHING_LEVEL_4:
+            case DIMINISHING_LEVEL_5:
+            case DIMINISHING_LEVEL_IMMUNE: mod = 0.0f;break;
+            default: break;
+        }
+    }
+    else if (GetTypeId() == TYPEID_UNIT && (((Creature*)this)->GetCreatureInfo()->ExtraFlags &  CREATURE_FLAG_EXTRA_TAUNT_DIMINISHING) && GetDiminishingReturnsGroupType(group) == DRTYPE_TAUNT)
+    {
+        DiminishingLevels diminish = Level;
+        switch(diminish)
+        {
+            case DIMINISHING_LEVEL_1: break;
+            case DIMINISHING_LEVEL_2: mod = 0.65f;   break;
+            case DIMINISHING_LEVEL_3: mod = 0.4225f; break;
+            case DIMINISHING_LEVEL_4: mod = 0.2747f; break;
+            case DIMINISHING_LEVEL_5: mod = 0.1785f; break;
             case DIMINISHING_LEVEL_IMMUNE: mod = 0.0f;break;
             default: break;
         }
@@ -8977,12 +11263,12 @@ void Unit::ApplyDiminishingAura( DiminishingGroup group, bool apply )
     // Checking for existing in the table
     for(Diminishing::iterator i = m_Diminishing.begin(); i != m_Diminishing.end(); ++i)
     {
-        if(i->DRGroup != group)
+        if (i->DRGroup != group)
             continue;
 
-        if(apply)
+        if (apply)
             i->stack += 1;
-        else if(i->stack)
+        else if (i->stack)
         {
             i->stack -= 1;
             // Remember time after last aura from group removed
@@ -9009,16 +11295,16 @@ bool Unit::isInvisibleForAlive() const
 
 uint32 Unit::GetCreatureType() const
 {
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         SpellShapeshiftFormEntry const* ssEntry = sSpellShapeshiftFormStore.LookupEntry(GetShapeshiftForm());
-        if(ssEntry && ssEntry->creatureType > 0)
+        if (ssEntry && ssEntry->creatureType > 0)
             return ssEntry->creatureType;
         else
             return CREATURE_TYPE_HUMANOID;
     }
     else
-        return ((Creature*)this)->GetCreatureInfo()->type;
+        return ((Creature*)this)->GetCreatureInfo()->CreatureType;
 }
 
 /*#######################################
@@ -9029,7 +11315,7 @@ uint32 Unit::GetCreatureType() const
 
 bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, float amount, bool apply)
 {
-    if(unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END)
+    if (unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END)
     {
         sLog.outError("ERROR in HandleStatModifier(): nonexistent UnitMods or wrong UnitModifierType!");
         return false;
@@ -9045,13 +11331,18 @@ bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, f
             break;
         case BASE_PCT:
         case TOTAL_PCT:
-            if(amount <= -100.0f)                           //small hack-fix for -100% modifiers
+            if (amount <= -100.0f)                           //small hack-fix for -100% modifiers
                 amount = -200.0f;
 
             val = (100.0f + amount) / 100.0f;
             m_auraModifiersGroup[unitMod][modifierType] *= apply ? val : (1.0f/val);
             break;
-
+        case NONSTACKING_PCT:
+        case NONSTACKING_PCT_MINOR:
+        case NONSTACKING_VALUE_POS:
+        case NONSTACKING_VALUE_NEG:
+            m_auraModifiersGroup[unitMod][modifierType] = amount;
+            break;
         default:
             break;
     }
@@ -9101,51 +11392,60 @@ bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, f
 
 float Unit::GetModifierValue(UnitMods unitMod, UnitModifierType modifierType) const
 {
-    if( unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END)
+    double retvalue = 0.0f;
+
+    if ( unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END)
     {
-        sLog.outError("attempt to access nonexistent modifier value from UnitMods!");
-        return 0.0f;
+        sLog.outError("Unit::GetModifierValue attempt to access nonexistent modifier value (type %u) from UnitMods!", modifierType);
     }
+    else if (modifierType == TOTAL_PCT)
+    {
+        if (m_auraModifiersGroup[unitMod][modifierType] > M_NULL_F)
+            retvalue = m_auraModifiersGroup[unitMod][TOTAL_PCT] * ((m_auraModifiersGroup[unitMod][NONSTACKING_PCT] + m_auraModifiersGroup[unitMod][NONSTACKING_PCT_MINOR] + 100.0f) / 100.0f);
+    }
+    else if(modifierType == TOTAL_VALUE)
+    {
+        retvalue = m_auraModifiersGroup[unitMod][TOTAL_VALUE] + m_auraModifiersGroup[unitMod][NONSTACKING_VALUE_POS] + m_auraModifiersGroup[unitMod][NONSTACKING_VALUE_NEG];
+    }
+    else
+        retvalue = m_auraModifiersGroup[unitMod][modifierType];
 
-    if(modifierType == TOTAL_PCT && m_auraModifiersGroup[unitMod][modifierType] <= 0.0f)
-        return 0.0f;
-
-    return m_auraModifiersGroup[unitMod][modifierType];
+    return round_pct(retvalue);
 }
 
 float Unit::GetTotalStatValue(Stats stat) const
 {
     UnitMods unitMod = UnitMods(UNIT_MOD_STAT_START + stat);
 
-    if(m_auraModifiersGroup[unitMod][TOTAL_PCT] <= 0.0f)
+    if (m_auraModifiersGroup[unitMod][TOTAL_PCT] <= M_NULL_F)
         return 0.0f;
 
     // value = ((base_value * base_pct) + total_value) * total_pct
-    float value  = m_auraModifiersGroup[unitMod][BASE_VALUE] + GetCreateStat(stat);
+    double value  = m_auraModifiersGroup[unitMod][BASE_VALUE] + GetCreateStat(stat);
     value *= m_auraModifiersGroup[unitMod][BASE_PCT];
-    value += m_auraModifiersGroup[unitMod][TOTAL_VALUE];
-    value *= m_auraModifiersGroup[unitMod][TOTAL_PCT];
+    value += (m_auraModifiersGroup[unitMod][TOTAL_VALUE] + m_auraModifiersGroup[unitMod][NONSTACKING_VALUE_POS] + m_auraModifiersGroup[unitMod][NONSTACKING_VALUE_NEG]);
+    value *= m_auraModifiersGroup[unitMod][TOTAL_PCT] * ((m_auraModifiersGroup[unitMod][NONSTACKING_PCT] + m_auraModifiersGroup[unitMod][NONSTACKING_PCT_MINOR] + 100.0f) / 100.0f);
 
-    return value;
+    return round_pct(value);
 }
 
 float Unit::GetTotalAuraModValue(UnitMods unitMod) const
 {
-    if(unitMod >= UNIT_MOD_END)
+    if (unitMod >= UNIT_MOD_END)
     {
         sLog.outError("attempt to access nonexistent UnitMods in GetTotalAuraModValue()!");
         return 0.0f;
     }
 
-    if(m_auraModifiersGroup[unitMod][TOTAL_PCT] <= 0.0f)
+    if (m_auraModifiersGroup[unitMod][TOTAL_PCT] <= M_NULL_F)
         return 0.0f;
 
-    float value  = m_auraModifiersGroup[unitMod][BASE_VALUE];
+    double value  = m_auraModifiersGroup[unitMod][BASE_VALUE];
     value *= m_auraModifiersGroup[unitMod][BASE_PCT];
-    value += m_auraModifiersGroup[unitMod][TOTAL_VALUE];
-    value *= m_auraModifiersGroup[unitMod][TOTAL_PCT];
+    value += (m_auraModifiersGroup[unitMod][TOTAL_VALUE] + m_auraModifiersGroup[unitMod][NONSTACKING_VALUE_POS] + m_auraModifiersGroup[unitMod][NONSTACKING_VALUE_NEG]);
+    value *= m_auraModifiersGroup[unitMod][TOTAL_PCT] * ((m_auraModifiersGroup[unitMod][NONSTACKING_PCT] + m_auraModifiersGroup[unitMod][NONSTACKING_PCT_MINOR] + 100.0f) / 100.0f);
 
-    return value;
+    return round_pct(value);
 }
 
 SpellSchools Unit::GetSpellSchoolByAuraGroup(UnitMods unitMod) const
@@ -9240,13 +11540,13 @@ void Unit::SetLevel(uint32 lvl)
 void Unit::SetHealth(uint32 val)
 {
     uint32 maxHealth = GetMaxHealth();
-    if(maxHealth < val)
+    if (maxHealth < val)
         val = maxHealth;
 
     SetUInt32Value(UNIT_FIELD_HEALTH, val);
 
     // group update
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         if(((Player*)this)->GetGroup())
             ((Player*)this)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_CUR_HP);
@@ -9254,10 +11554,10 @@ void Unit::SetHealth(uint32 val)
     else if(((Creature*)this)->IsPet())
     {
         Pet *pet = ((Pet*)this);
-        if(pet->isControlled())
+        if (pet->isControlled())
         {
             Unit *owner = GetOwner();
-            if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
+            if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_CUR_HP);
         }
     }
@@ -9269,7 +11569,7 @@ void Unit::SetMaxHealth(uint32 val)
     SetUInt32Value(UNIT_FIELD_MAXHEALTH, val);
 
     // group update
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         if(((Player*)this)->GetGroup())
             ((Player*)this)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_MAX_HP);
@@ -9277,15 +11577,15 @@ void Unit::SetMaxHealth(uint32 val)
     else if(((Creature*)this)->IsPet())
     {
         Pet *pet = ((Pet*)this);
-        if(pet->isControlled())
+        if (pet->isControlled())
         {
             Unit *owner = GetOwner();
-            if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
+            if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_MAX_HP);
         }
     }
 
-    if(val < health)
+    if (val < health)
         SetHealth(val);
 }
 
@@ -9297,23 +11597,23 @@ void Unit::SetHealthPercent(float percent)
 
 void Unit::SetPower(Powers power, uint32 val)
 {
-    if(GetPower(power) == val)
+    if (GetPower(power) == val)
         return;
 
     uint32 maxPower = GetMaxPower(power);
-    if(maxPower < val)
+    if (maxPower < val)
         val = maxPower;
 
     SetStatInt32Value(UNIT_FIELD_POWER1 + power, val);
 
-    WorldPacket data(SMSG_POWER_UPDATE);
+    WorldPacket data(SMSG_POWER_UPDATE, GetPackGUID().size() + 1 + 4);
     data << GetPackGUID();
     data << uint8(power);
     data << uint32(val);
     SendMessageToSet(&data, true);
 
     // group update
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         if(((Player*)this)->GetGroup())
             ((Player*)this)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_CUR_POWER);
@@ -9321,18 +11621,16 @@ void Unit::SetPower(Powers power, uint32 val)
     else if(((Creature*)this)->IsPet())
     {
         Pet *pet = ((Pet*)this);
-        if(pet->isControlled())
+        if (pet->isControlled())
         {
             Unit *owner = GetOwner();
-            if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
+            if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_CUR_POWER);
         }
 
         // Update the pet's character sheet with happiness damage bonus
-        if(pet->getPetType() == HUNTER_PET && power == POWER_HAPPINESS)
-        {
+        if (pet->getPetType() == HUNTER_PET && power == POWER_HAPPINESS)
             pet->UpdateDamagePhysical(BASE_ATTACK);
-        }
     }
 }
 
@@ -9342,7 +11640,7 @@ void Unit::SetMaxPower(Powers power, uint32 val)
     SetStatInt32Value(UNIT_FIELD_MAXPOWER1 + power, val);
 
     // group update
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         if(((Player*)this)->GetGroup())
             ((Player*)this)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_MAX_POWER);
@@ -9350,15 +11648,15 @@ void Unit::SetMaxPower(Powers power, uint32 val)
     else if(((Creature*)this)->IsPet())
     {
         Pet *pet = ((Pet*)this);
-        if(pet->isControlled())
+        if (pet->isControlled())
         {
             Unit *owner = GetOwner();
-            if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
+            if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_MAX_POWER);
         }
     }
 
-    if(val < cur_power)
+    if (val < cur_power)
         SetPower(power, val);
 }
 
@@ -9367,7 +11665,7 @@ void Unit::ApplyPowerMod(Powers power, uint32 val, bool apply)
     ApplyModUInt32Value(UNIT_FIELD_POWER1+power, val, apply);
 
     // group update
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         if(((Player*)this)->GetGroup())
             ((Player*)this)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_CUR_POWER);
@@ -9375,10 +11673,10 @@ void Unit::ApplyPowerMod(Powers power, uint32 val, bool apply)
     else if(((Creature*)this)->IsPet())
     {
         Pet *pet = ((Pet*)this);
-        if(pet->isControlled())
+        if (pet->isControlled())
         {
             Unit *owner = GetOwner();
-            if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
+            if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_CUR_POWER);
         }
     }
@@ -9389,7 +11687,7 @@ void Unit::ApplyMaxPowerMod(Powers power, uint32 val, bool apply)
     ApplyModUInt32Value(UNIT_FIELD_MAXPOWER1+power, val, apply);
 
     // group update
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         if(((Player*)this)->GetGroup())
             ((Player*)this)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_MAX_POWER);
@@ -9397,10 +11695,10 @@ void Unit::ApplyMaxPowerMod(Powers power, uint32 val, bool apply)
     else if(((Creature*)this)->IsPet())
     {
         Pet *pet = ((Pet*)this);
-        if(pet->isControlled())
+        if (pet->isControlled())
         {
             Unit *owner = GetOwner();
-            if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
+            if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_MAX_POWER);
         }
     }
@@ -9408,8 +11706,9 @@ void Unit::ApplyMaxPowerMod(Powers power, uint32 val, bool apply)
 
 void Unit::ApplyAuraProcTriggerDamage( Aura* aura, bool apply )
 {
+    MAPLOCK_WRITE(this,MAP_LOCK_TYPE_AURAS);
     AuraList& tAuraProcTriggerDamage = m_modAuras[SPELL_AURA_PROC_TRIGGER_DAMAGE];
-    if(apply)
+    if (apply)
         tAuraProcTriggerDamage.push_back(aura);
     else
         tAuraProcTriggerDamage.remove(aura);
@@ -9421,12 +11720,12 @@ uint32 Unit::GetCreatePowers( Powers power ) const
     {
         case POWER_HEALTH:      return 0;                   // is it really should be here?
         case POWER_MANA:        return GetCreateMana();
-        case POWER_RAGE:        return 1000;
-        case POWER_FOCUS:       return (GetTypeId() == TYPEID_PLAYER || !((Creature const*)this)->IsPet() || ((Pet const*)this)->getPetType() != HUNTER_PET ? 0 : 100);
-        case POWER_ENERGY:      return 100;
-        case POWER_HAPPINESS:   return (GetTypeId() == TYPEID_PLAYER || !((Creature const*)this)->IsPet() || ((Pet const*)this)->getPetType() != HUNTER_PET ? 0 : 1050000);
-        case POWER_RUNE:        return (GetTypeId() == TYPEID_PLAYER && ((Player const*)this)->getClass() == CLASS_DEATH_KNIGHT ? 8 : 0);
-        case POWER_RUNIC_POWER: return (GetTypeId() == TYPEID_PLAYER && ((Player const*)this)->getClass() == CLASS_DEATH_KNIGHT ? 1000 : 0);
+        case POWER_RAGE:        return POWER_RAGE_DEFAULT;
+        case POWER_FOCUS:       return (GetTypeId() == TYPEID_PLAYER || !((Creature const*)this)->IsPet() || ((Pet const*)this)->getPetType() != HUNTER_PET ? 0 : POWER_FOCUS_DEFAULT);
+        case POWER_ENERGY:      return POWER_ENERGY_DEFAULT;
+        case POWER_HAPPINESS:   return (GetTypeId() == TYPEID_PLAYER || !((Creature const*)this)->IsPet() || ((Pet const*)this)->getPetType() != HUNTER_PET ? 0 : POWER_HAPPINESS_DEFAULT);
+        case POWER_RUNE:        return (GetTypeId() == TYPEID_PLAYER && ((Player const*)this)->getClass() == CLASS_DEATH_KNIGHT ? POWER_RUNE_DEFAULT : 0);
+        case POWER_RUNIC_POWER: return (GetTypeId() == TYPEID_PLAYER && ((Player const*)this)->getClass() == CLASS_DEATH_KNIGHT ? POWER_RUNIC_POWER_DEFAULT : 0);
     }
 
     return 0;
@@ -9434,43 +11733,55 @@ uint32 Unit::GetCreatePowers( Powers power ) const
 
 void Unit::AddToWorld()
 {
-    Object::AddToWorld();
+    WorldObject::AddToWorld();
     ScheduleAINotify(0);
 }
 
-void Unit::RemoveFromWorld()
+void Unit::RemoveFromWorld(bool remove)
 {
     // cleanup
     if (IsInWorld())
     {
         Uncharm();
-        RemoveNotOwnSingleTargetAuras();
+        RemoveNotOwnTrackedTargetAuras();
         RemoveGuardians();
         RemoveMiniPet();
         UnsummonAllTotems();
         RemoveAllGameObjects();
         RemoveAllDynObjects();
-        CleanupDeletedAuras();
-        GetViewPoint().Event_RemovedFromWorld();
+        {
+            MAPLOCK_WRITE(this,MAP_LOCK_TYPE_AURAS);
+            CleanupDeletedHolders(true);
+        }
     }
+    GetViewPoint().Event_RemovedFromWorld();
 
-    Object::RemoveFromWorld();
+    WorldObject::RemoveFromWorld(remove);
 }
 
 void Unit::CleanupsBeforeDelete()
 {
-    if(m_uint32Values)                                      // only for fully created object
+    if (!IsInWorld())
+        return;
+
+    if (m_uint32Values)                                      // only for fully created object
     {
+        if (GetVehicle())
+            ExitVehicle(true);
+        if (GetVehicleKit())
+            RemoveVehicleKit();
         InterruptNonMeleeSpells(true);
-        m_Events.KillAllEvents(false);                      // non-delatable (currently casted spells) will not deleted now but it will deleted at call in Map::RemoveAllObjectsInRemoveList
+        KillAllEvents(false);                      // non-delatable (currently casted spells) will not deleted now but it will deleted at call in Map::RemoveAllObjectsInRemoveList
         CombatStop();
         ClearComboPointHolders();
-        DeleteThreatList();
-        if (GetTypeId()==TYPEID_PLAYER)
+        if (CanHaveThreatList())
+            DeleteThreatList();
+        if (GetTypeId() == TYPEID_PLAYER)
             getHostileRefManager().setOnlineOfflineState(false);
         else
             getHostileRefManager().deleteReferences();
         RemoveAllAuras(AURA_REMOVE_BY_DELETE);
+        GetUnitStateMgr().InitDefaults(false);
     }
     WorldObject::CleanupsBeforeDelete();
 }
@@ -9483,10 +11794,15 @@ CharmInfo* Unit::InitCharmInfo(Unit *charm)
 }
 
 CharmInfo::CharmInfo(Unit* unit)
-: m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_reactState(REACT_PASSIVE), m_petnumber(0)
+: m_unit(unit), m_State(0), m_petnumber(0)
 {
     for(int i = 0; i < CREATURE_MAX_SPELLS; ++i)
         m_charmspells[i].SetActionAndType(0,ACT_DISABLED);
+    m_petnumber = 0;
+
+    SetState(CHARM_STATE_REACT,REACT_PASSIVE);
+    SetState(CHARM_STATE_COMMAND,COMMAND_FOLLOW);
+    SetState(CHARM_STATE_ACTION,ACTIONS_ENABLE);
 }
 
 void CharmInfo::InitPetActionBar()
@@ -9504,6 +11820,21 @@ void CharmInfo::InitPetActionBar()
         SetActionBar(ACTION_BAR_INDEX_PET_SPELL_END + i,COMMAND_ATTACK - i,ACT_REACTION);
 }
 
+void CharmInfo::SetState(CharmStateType type, uint8 value)
+{
+    SetState((GetState() & ~(uint32(0x00FF) << (type * 8))) | (uint32(value) << (type * 8)));
+}
+
+uint8 CharmInfo::GetState(CharmStateType type)
+{
+    return uint8((GetState() & (uint32(0x00FF) << (type * 8))) >> (type * 8));
+}
+
+bool CharmInfo::HasState(CharmStateType type, uint8 value)
+{
+    return (GetState(type) == value);
+}
+
 void CharmInfo::InitEmptyActionBar()
 {
     SetActionBar(ACTION_BAR_INDEX_START,COMMAND_ATTACK,ACT_COMMAND);
@@ -9515,21 +11846,40 @@ void CharmInfo::InitPossessCreateSpells()
 {
     InitEmptyActionBar();                                   //charm action bar
 
-    if(m_unit->GetTypeId() == TYPEID_PLAYER)                //possessed players don't have spells, keep the action bar empty
+    if (m_unit->GetTypeId() == TYPEID_PLAYER)                //possessed players don't have spells, keep the action bar empty
         return;
 
-    for(uint32 x = 0; x < CREATURE_MAX_SPELLS; ++x)
+    for(uint32 x = 0; x <= ((Creature*)m_unit)->GetSpellMaxIndex(); ++x)
+    {
+        if (IsPassiveSpell(((Creature*)m_unit)->GetSpell(x)))
+            m_unit->CastSpell(m_unit, ((Creature*)m_unit)->GetSpell(x), true);
+        else
+            AddSpellToActionBar(((Creature*)m_unit)->GetSpell(x), ACT_PASSIVE);
+    }
+}
+
+void CharmInfo::InitVehicleCreateSpells(uint8 seatId)
+{
+    for (uint32 x = ACTION_BAR_INDEX_START; x < ACTION_BAR_INDEX_END; ++x)
+        SetActionBar(x, 0, ActiveStates(0x8 + x));
+
+    for (uint32 x = 0; x <= ((Creature*)m_unit)->GetSpellMaxIndex(seatId); ++x)
     {
-        if (IsPassiveSpell(((Creature*)m_unit)->m_spells[x]))
-            m_unit->CastSpell(m_unit, ((Creature*)m_unit)->m_spells[x], true);
+        uint32 spellId = ((Creature*)m_unit)->GetSpell(x,seatId);
+
+        if (!spellId)
+            continue;
+
+        if (IsPassiveSpell(spellId))
+            m_unit->CastSpell(m_unit, spellId, true);
         else
-            AddSpellToActionBar(((Creature*)m_unit)->m_spells[x], ACT_PASSIVE);
+            PetActionBar[x].SetAction(spellId);
     }
 }
 
 void CharmInfo::InitCharmCreateSpells()
 {
-    if(m_unit->GetTypeId() == TYPEID_PLAYER)                //charmed players don't have spells
+    if (m_unit->GetTypeId() == TYPEID_PLAYER)                //charmed players don't have spells
     {
         InitEmptyActionBar();
         return;
@@ -9537,9 +11887,9 @@ void CharmInfo::InitCharmCreateSpells()
 
     InitPetActionBar();
 
-    for(uint32 x = 0; x < CREATURE_MAX_SPELLS; ++x)
+    for(uint32 x = 0; x <= ((Creature*)m_unit)->GetSpellMaxIndex(); ++x)
     {
-        uint32 spellId = ((Creature*)m_unit)->m_spells[x];
+        uint32 spellId = ((Creature*)m_unit)->GetSpell(x);
 
         if(!spellId)
         {
@@ -9563,11 +11913,11 @@ void CharmInfo::InitCharmCreateSpells()
             if(!spellInfo) onlyselfcast = false;
             for(uint32 i = 0; i < 3 && onlyselfcast; ++i)   //nonexistent spell will not make any problems as onlyselfcast would be false -> break right away
             {
-                if(spellInfo->EffectImplicitTargetA[i] != TARGET_SELF && spellInfo->EffectImplicitTargetA[i] != 0)
+                if (spellInfo->EffectImplicitTargetA[i] != TARGET_SELF && spellInfo->EffectImplicitTargetA[i] != 0)
                     onlyselfcast = false;
             }
 
-            if(onlyselfcast || !IsPositiveSpell(spellId))   // only self cast and spells versus enemies are autocastable
+            if (onlyselfcast || !IsPositiveSpell(spellId))   // only self cast and spells versus enemies are autocastable
                 newstate = ACT_DISABLED;
             else
                 newstate = ACT_PASSIVE;
@@ -9627,18 +11977,18 @@ bool CharmInfo::RemoveSpellFromActionBar(uint32 spell_id)
 
 void CharmInfo::ToggleCreatureAutocast(uint32 spellid, bool apply)
 {
-    if(IsPassiveSpell(spellid))
+    if (IsPassiveSpell(spellid))
         return;
 
     for(uint32 x = 0; x < CREATURE_MAX_SPELLS; ++x)
-        if(spellid == m_charmspells[x].GetAction())
+        if (spellid == m_charmspells[x].GetAction())
             m_charmspells[x].SetType(apply ? ACT_ENABLED : ACT_DISABLED);
 }
 
 void CharmInfo::SetPetNumber(uint32 petnumber, bool statwindow)
 {
     m_petnumber = petnumber;
-    if(statwindow)
+    if (statwindow)
         m_unit->SetUInt32Value(UNIT_FIELD_PETNUMBER, m_petnumber);
     else
         m_unit->SetUInt32Value(UNIT_FIELD_PETNUMBER, 0);
@@ -9648,7 +11998,7 @@ void CharmInfo::LoadPetActionBar(const std::string& data )
 {
     InitPetActionBar();
 
-    Tokens tokens = StrSplit(data, " ");
+    Tokens tokens(data, ' ');
 
     if (tokens.size() != (ACTION_BAR_INDEX_END-ACTION_BAR_INDEX_START)*2)
         return;                                             // non critical, will reset to default
@@ -9658,14 +12008,14 @@ void CharmInfo::LoadPetActionBar(const std::string& data )
     for(iter = tokens.begin(), index = ACTION_BAR_INDEX_START; index < ACTION_BAR_INDEX_END; ++iter, ++index )
     {
         // use unsigned cast to avoid sign negative format use at long-> ActiveStates (int) conversion
-        uint8 type  = (uint8)atol((*iter).c_str());
+        uint8 type  = (uint8)atol(*iter);
         ++iter;
-        uint32 action = atol((*iter).c_str());
+        uint32 action = atol(*iter);
 
         PetActionBar[index].SetActionAndType(action,ActiveStates(type));
 
         // check correctness
-        if(PetActionBar[index].IsActionBarForSpell() && !sSpellStore.LookupEntry(PetActionBar[index].GetAction()))
+        if (PetActionBar[index].IsActionBarForSpell() && !sSpellStore.LookupEntry(PetActionBar[index].GetAction()))
             SetActionBar(index,0,ACT_DISABLED);
     }
 }
@@ -9680,7 +12030,7 @@ void CharmInfo::SetSpellAutocast( uint32 spell_id, bool state )
 {
     for(int i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i)
     {
-        if(spell_id == PetActionBar[i].GetAction() && PetActionBar[i].IsActionBarForSpell())
+        if (spell_id == PetActionBar[i].GetAction() && PetActionBar[i].IsActionBarForSpell())
         {
             PetActionBar[i].SetType(state ? ACT_ENABLED : ACT_DISABLED);
             break;
@@ -9688,172 +12038,541 @@ void CharmInfo::SetSpellAutocast( uint32 spell_id, bool state )
     }
 }
 
-bool Unit::isFrozen() const
-{
-    return HasAuraState(AURA_STATE_FROZEN);
-}
-
-struct ProcTriggeredData
+void Unit::DoPetAction( Player* owner, uint8 flag, uint32 spellid, ObjectGuid petGuid, ObjectGuid targetGuid)
 {
-    ProcTriggeredData(SpellProcEventEntry const * _spellProcEvent, SpellAuraHolder* _triggeredByHolder)
-        : spellProcEvent(_spellProcEvent), triggeredByHolder(_triggeredByHolder)
-        {}
-    SpellProcEventEntry const *spellProcEvent;
-    SpellAuraHolder* triggeredByHolder;
-};
-
-typedef std::list< ProcTriggeredData > ProcTriggeredList;
-typedef std::list< uint32> RemoveSpellList;
+    if (!IsInWorld() ||
+    (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsPet() &&  !GetCharmInfo()))
+        return;
 
-uint32 createProcExtendMask(SpellNonMeleeDamage *damageInfo, SpellMissInfo missCondition)
-{
-    uint32 procEx = PROC_EX_NONE;
-    // Check victim state
-    if (missCondition!=SPELL_MISS_NONE)
-    switch (missCondition)
-    {
-        case SPELL_MISS_MISS:    procEx|=PROC_EX_MISS;   break;
-        case SPELL_MISS_RESIST:  procEx|=PROC_EX_RESIST; break;
-        case SPELL_MISS_DODGE:   procEx|=PROC_EX_DODGE;  break;
-        case SPELL_MISS_PARRY:   procEx|=PROC_EX_PARRY;  break;
-        case SPELL_MISS_BLOCK:   procEx|=PROC_EX_BLOCK;  break;
-        case SPELL_MISS_EVADE:   procEx|=PROC_EX_EVADE;  break;
-        case SPELL_MISS_IMMUNE:  procEx|=PROC_EX_IMMUNE; break;
-        case SPELL_MISS_IMMUNE2: procEx|=PROC_EX_IMMUNE; break;
-        case SPELL_MISS_DEFLECT: procEx|=PROC_EX_DEFLECT;break;
-        case SPELL_MISS_ABSORB:  procEx|=PROC_EX_ABSORB; break;
-        case SPELL_MISS_REFLECT: procEx|=PROC_EX_REFLECT;break;
-        default:
-            break;
-    }
-    else
+    if (!isAlive())
     {
-        // On block
-        if (damageInfo->blocked)
-            procEx|=PROC_EX_BLOCK;
-        // On absorb
-        if (damageInfo->absorb)
-            procEx|=PROC_EX_ABSORB;
-        // On crit
-        if (damageInfo->HitInfo & SPELL_HIT_TYPE_CRIT)
-            procEx|=PROC_EX_CRITICAL_HIT;
-        else
-            procEx|=PROC_EX_NORMAL_HIT;
+        SendPetActionFeedback(FEEDBACK_PET_DEAD);
+        return;
     }
-    return procEx;
-}
 
-void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellEntry const * procSpell, uint32 damage )
-{
-    // For melee/ranged based attack need update skills and set some Aura states
-    if (!(procExtra & PROC_EX_CAST_END) && procFlag & MELEE_BASED_TRIGGER_MASK)
+    switch(flag)
     {
-        // Update skills here for players
-        if (GetTypeId() == TYPEID_PLAYER)
-        {
-            // On melee based hit/miss/resist need update skill (for victim and attacker)
-            if (procExtra&(PROC_EX_NORMAL_HIT|PROC_EX_MISS|PROC_EX_RESIST))
-            {
-                if (pTarget->GetTypeId() != TYPEID_PLAYER && pTarget->GetCreatureType() != CREATURE_TYPE_CRITTER)
-                    ((Player*)this)->UpdateCombatSkills(pTarget, attType, isVictim);
-            }
-            // Update defence if player is victim and parry/dodge/block
-            if (isVictim && procExtra&(PROC_EX_DODGE|PROC_EX_PARRY|PROC_EX_BLOCK))
-                ((Player*)this)->UpdateDefense();
-        }
-        // If exist crit/parry/dodge/block need update aura state (for victim and attacker)
-        if (procExtra & (PROC_EX_CRITICAL_HIT|PROC_EX_PARRY|PROC_EX_DODGE|PROC_EX_BLOCK))
+        case ACT_COMMAND:                                   //0x07
         {
-            // for victim
-            if (isVictim)
+        // Maybe exists some flag that disable it at client side
+            if (petGuid.IsVehicle())
+                return;
+
+
+            switch(spellid)
             {
-                // if victim and dodge attack
-                if (procExtra&PROC_EX_DODGE)
+                case COMMAND_STAY:                          //flat=1792  //STAY
                 {
-                    //Update AURA_STATE on dodge
-                    if (getClass() != CLASS_ROGUE) // skip Rogue Riposte
-                    {
-                        ModifyAuraState(AURA_STATE_DEFENSE, true);
-                        StartReactiveTimer( REACTIVE_DEFENSE );
-                    }
+                    if (IsNonMeleeSpellCasted(false))
+                        InterruptNonMeleeSpells(false);
+                    AttackStop();
+                    StopMoving();
+                    GetMotionMaster()->Clear(true);
+                    GetCharmInfo()->SetState(CHARM_STATE_COMMAND,COMMAND_STAY);
+                    GetMotionMaster()->MoveTargetedHome();
+                    SendCharmState();
+                    break;
                 }
-                // if victim and parry attack
-                if (procExtra & PROC_EX_PARRY)
+                case COMMAND_FOLLOW:                        //spellid=1792  //FOLLOW
                 {
-                    // For Hunters only Counterattack (skip Mongoose bite)
-                    if (getClass() == CLASS_HUNTER)
+                    if (IsNonMeleeSpellCasted(false))
+                        InterruptNonMeleeSpells(false);
+                    AttackStop();
+                    GetMotionMaster()->Clear(true);
+                    GetCharmInfo()->SetState(CHARM_STATE_COMMAND,COMMAND_FOLLOW);
+                    GetMotionMaster()->MoveTargetedHome();
+                    SendCharmState();
+                    break;
+                }
+                case COMMAND_ATTACK:                        //spellid=1792  //ATTACK
+                {
+                    Unit* TargetUnit = owner->GetMap()->GetUnit(targetGuid);
+                    if(!TargetUnit)
                     {
-                        ModifyAuraState(AURA_STATE_HUNTER_PARRY, true);
-                        StartReactiveTimer( REACTIVE_HUNTER_PARRY );
+                        SendPetActionFeedback(FEEDBACK_NOTHING_TO_ATT);
+                        return;
                     }
-                    else
+
+                    // not let attack friendly units.
+                    if (owner->IsFriendlyTo(TargetUnit))
                     {
-                        ModifyAuraState(AURA_STATE_DEFENSE, true);
-                        StartReactiveTimer( REACTIVE_DEFENSE );
+                        SendPetActionFeedback(FEEDBACK_CANT_ATT_TARGET);
+                        return;
+                    }
+
+                    // Not let attack through obstructions
+                    if(!IsWithinLOSInMap(TargetUnit) && !owner->IsWithinLOSInMap(TargetUnit) && !TargetUnit->isInAccessablePlaceFor(this))
+                    {
+                        SendPetActionFeedback(FEEDBACK_CANT_ATT_TARGET);
+                        return;
+                    }
+
+                    // This is true if pet has no target or has target but targets differs.
+                    Unit* pVictim = getVictim();
+                    if (pVictim != TargetUnit)
+                    {
+                        if (pVictim)
+                        {
+                            if (IsNonMeleeSpellCasted(false))
+                                InterruptNonMeleeSpells(false);
+                            AttackStop();
+                        }
+
+                        if (hasUnitState(UNIT_STAT_CONTROLLED))
+                        {
+                            Attack(TargetUnit, true);
+                            SendPetAIReaction();
+                        }
+                        else
+                        {
+                            if (((Creature*)this)->AI())
+                                ((Creature*)this)->AI()->AttackStart(TargetUnit);
+
+                            // 10% chance to play special pet attack talk, else growl
+                            if(((Creature*)this)->IsPet() && ((Pet*)this)->getPetType() == SUMMON_PET && roll_chance_i(10))
+                                SendPetTalk((uint32)PET_TALK_ATTACK);
+                            else
+                            {
+                                // 90% chance for pet and 100% chance for charmed creature
+                                SendPetAIReaction();
+                            }
+                        }
                     }
+                    break;
                 }
-                // if and victim block attack
-                if (procExtra & PROC_EX_BLOCK)
+                case COMMAND_ABANDON:                       // abandon (hunter pet) or dismiss (summoned pet)
                 {
-                    ModifyAuraState(AURA_STATE_DEFENSE,true);
-                    StartReactiveTimer( REACTIVE_DEFENSE );
+                    if (IsNonMeleeSpellCasted(false))
+                        InterruptNonMeleeSpells(false);
+                    AttackStop();
+                    StopMoving();
+                    GetMotionMaster()->Clear(true);
+
+                    if(((Creature*)this)->IsPet())
+                    {
+                        Pet* p = (Pet*)this;
+                        if (p->getPetType() == HUNTER_PET)
+                            p->Unsummon(PET_SAVE_AS_DELETED, owner);
+                        else
+                            //dismissing a summoned pet is like killing them (this prevents returning a soulshard...)
+                            p->SetDeathState(CORPSE);
+                    }
+                    else                                    // charmed
+                        owner->Uncharm();
+                    break;
                 }
+                default:
+                    sLog.outError("WORLD: unknown PET command Action %i and spellid %i.", uint32(flag), spellid);
             }
-            else //For attacker
+            break;
+        }
+        case ACT_REACTION:                                  // 0x6
+        {
+            switch(spellid)
             {
-                // Overpower on victim dodge
-                if (procExtra&PROC_EX_DODGE && GetTypeId() == TYPEID_PLAYER && getClass() == CLASS_WARRIOR)
-                {
-                    ((Player*)this)->AddComboPoints(pTarget, 1);
-                    StartReactiveTimer( REACTIVE_OVERPOWER );
-                }
+                case REACT_PASSIVE:                         //passive
+                case REACT_DEFENSIVE:                       //recovery
+                case REACT_AGGRESSIVE:                      //activete
+                    GetCharmInfo()->SetState(CHARM_STATE_REACT,ReactStates(spellid));
+                    SendCharmState();
+                    break;
             }
+            break;
         }
-    }
+        case ACT_DISABLED:                                  // 0x81    spell (disabled), ignore
+        case ACT_CASTABLE:                                  // 0x80    spell (disabled), toggle state
+        case ACT_PASSIVE:                                   // 0x01
+        case ACT_ENABLED:                                   // 0xC1    spell
+        case ACT_ACTIVE:                                    // 0xC0    spell
+        {
+            Unit* unit_target = NULL;
 
-    RemoveSpellList removedSpells;
-    ProcTriggeredList procTriggered;
-    // Fill procTriggered list
-    for(SpellAuraHolderMap::const_iterator itr = GetSpellAuraHolderMap().begin(); itr!= GetSpellAuraHolderMap().end(); ++itr)
-    {
-        // skip deleted auras (possible at recursive triggered call
-        if(itr->second->IsDeleted())
-            continue;
+            if (!targetGuid.IsEmpty())
+                unit_target = owner->GetMap()->GetUnit(targetGuid);
 
-        SpellProcEventEntry const* spellProcEvent = NULL;
-        if(!IsTriggeredAtSpellProcEvent(pTarget, itr->second, procSpell, procFlag, procExtra, attType, isVictim, spellProcEvent))
-           continue;
+            if (IsNonMeleeSpellCasted(false))
+                InterruptNonMeleeSpells(false);
 
-        itr->second->SetInUse(true);                        // prevent holder deletion
-        procTriggered.push_back( ProcTriggeredData(spellProcEvent, itr->second) );
+            DoPetCastSpell(unit_target, spellid);
+            break;
+        }
+        default:
+            sLog.outError("WORLD: unknown PET flag Action %i and spellid %i.", uint32(flag), spellid);
+            break;
     }
+}
 
-    // Nothing found
-    if (procTriggered.empty())
+void Unit::DoPetCastSpell(Unit* target, uint32 spellId)
+{
+    if (!IsInWorld())
         return;
 
-    // Handle effects proceed this time
-    for(ProcTriggeredList::const_iterator itr = procTriggered.begin(); itr != procTriggered.end(); ++itr)
+    if (!isAlive())
     {
-        // Some auras can be deleted in function called in this loop (except first, ofc)
-        SpellAuraHolder *triggeredByHolder = itr->triggeredByHolder;
-        if(triggeredByHolder->IsDeleted())
-            continue;
+        SendPetActionFeedback(FEEDBACK_PET_DEAD);
+        return;
+    }
 
-        SpellProcEventEntry const *spellProcEvent = itr->spellProcEvent;
-        bool useCharges = triggeredByHolder->GetAuraCharges() > 0;
-        bool procSuccess = true;
-        bool anyAuraProc = false;
+    // do not cast unknown spells
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
+    if(!spellInfo)
+    {
+        sLog.outError("WORLD: unknown PET spell id %i", spellInfo->Id);
+        return;
+    }
+
+    Unit*   owner  = GetObjectGuid().IsPet() ? ((Pet*)this)->GetOwner() : GetCharmerOrOwner();
+    Player* powner = (owner && owner->GetTypeId() == TYPEID_PLAYER) ? (Player*)owner : NULL;
+
+    SpellCastTargets targets;
+    targets.setUnitTarget(target);
+    uint8 cast_count = 1;
+
+    if (powner)
+        powner->CallForAllControlledUnits(DoPetCastWithHelper(powner, cast_count, &targets, spellInfo),CONTROLLED_PET|CONTROLLED_GUARDIANS|CONTROLLED_CHARM);
+    else
+        DoPetCastSpell(NULL, cast_count, &targets, spellInfo);
+
+}
+
+void Unit::DoPetCastSpell(Player* owner, uint8 cast_count, SpellCastTargets* targets, SpellEntry const* spellInfo )
+{
+    if (!IsInWorld())
+        return;
+
+    if (!isAlive())
+    {
+        SendPetActionFeedback(FEEDBACK_PET_DEAD);
+        return;
+    }
+
+    if (!spellInfo)
+        return;
+
+    if (GetCharmInfo() && GetCharmInfo()->GetGlobalCooldownMgr().HasGlobalCooldown(spellInfo))
+        return;
+
+    bool triggered = false;
+    SpellEntry const* triggeredBy = NULL;
+
+    Aura const* triggeredByAura = GetTriggeredByClientAura(spellInfo->Id);
+    if (triggeredByAura)
+    {
+        triggered = true;
+        triggeredBy = triggeredByAura->GetSpellProto();
+        cast_count = 0;
+    }
+
+    if (!triggered)
+    {
+        // do not cast passive and not learned spells
+        if (IsPassiveSpell(spellInfo->Id))
+            return;
+        else if((GetObjectGuid().IsPet() && !((Pet*)this)->HasSpell(spellInfo->Id)))
+            return;
+        else if ((GetObjectGuid().IsCreatureOrVehicle() && !((Creature*)this)->HasSpell(spellInfo->Id)))
+            return;
+    }
+
+    Creature* pet = dynamic_cast<Creature*>(this);
+
+    Unit* unit_target = targets ? targets->getUnitTarget() : NULL;
+
+    // target corrects
+    if (!unit_target && !(targets->m_targetMask & TARGET_FLAG_DEST_LOCATION))
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST,"Unit::DoPetCastSpell %s guid %u tryed to cast spell %u without target! Trying auto-search",GetObjectGuid().IsPet() ? "Pet" : "Creature",GetObjectGuid().GetCounter(), spellInfo->Id);
+    }
+    else if (targets && !unit_target && (targets->m_targetMask & TARGET_FLAG_DEST_LOCATION))
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST,"Unit::DoPetCastSpell %s tryed to cast spell %u with setted dest. location without target. Trying auto-search.",GetObjectGuid().GetString().c_str(), spellInfo->Id);
+    }
+    else if (unit_target && unit_target->isAlive() && IsFriendlyTo(unit_target) != IsPositiveSpell(spellInfo))
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST,"Unit::DoPetCastSpell %s tryed to cast spell %u, but target not good. Trying auto-search.",GetObjectGuid().GetString().c_str(), spellInfo->Id);
+        unit_target = NULL;
+    }
+
+    // autosearch for target
+    if (!unit_target)
+    {
+        unit_target =  GetObjectGuid().IsPet() ? ((Pet*)this)->SelectPreferredTargetForSpell(spellInfo) :
+                                                   pet->SelectPreferredTargetForSpell(spellInfo);
+        targets->setUnitTarget(unit_target);
+    }
+
+    Spell* spell = new Spell(this, spellInfo, triggered, GetObjectGuid(), triggeredBy);
+    spell->m_cast_count = cast_count;                       // probably pending spell cast
+
+    Unit* unit_target2 = spell->m_targets.getUnitTarget();
+
+    SpellCastResult result = triggered ? SPELL_CAST_OK : spell->CheckPetCast(unit_target);
+
+    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST,"Unit::DoPetCastSpell %s, spell %u preferred target %u target %s default target %s cast result %u",
+                            GetObjectGuid().GetString().c_str(),
+                            spellInfo->Id,
+                            GetPreferredTargetForSpell(spellInfo),
+                            unit_target ? unit_target->GetObjectGuid().GetString().c_str() : "<none>",
+                            unit_target2 ? unit_target2->GetObjectGuid().GetString().c_str() : "<none>",
+                            result);
+
+    //auto turn to target unless possessed
+    if (result == SPELL_FAILED_UNIT_NOT_INFRONT && !HasAuraType(SPELL_AURA_MOD_POSSESS))
+    {
+        if (unit_target)
+        {
+            SetInFront(unit_target);
+            if (unit_target->GetTypeId() == TYPEID_PLAYER)
+                SendCreateUpdateToPlayer( (Player*)unit_target );
+        }
+        else if (unit_target2)
+        {
+            SetInFront(unit_target2);
+            if (unit_target2->GetTypeId() == TYPEID_PLAYER)
+                SendCreateUpdateToPlayer( (Player*)unit_target2 );
+        }
+
+        if (owner)
+            SendCreateUpdateToPlayer(owner);
+        result = SPELL_CAST_OK;
+    }
+
+    SpellCastTargets tmpTargets = targets ? *targets : SpellCastTargets();
+
+    if (!targets)
+        tmpTargets.setUnitTarget(unit_target ? unit_target : unit_target2);
+
+    clearUnitState(UNIT_STAT_MOVING);
+
+    if (pet && result == SPELL_CAST_OK)
+    {
+        if (GetObjectGuid().IsPet())
+        {
+            //10% chance to play special pet attack talk, else growl
+            //actually this only seems to happen on special spells, fire shield for imp, torment for voidwalker, but it's stupid to check every spell
+            if(((Pet*)this)->getPetType() == SUMMON_PET && (urand(0, 100) < 10))
+                SendPetTalk((uint32)PET_TALK_SPECIAL_SPELL);
+            else
+                SendPetAIReaction();
+        }
+
+        if (unit_target && owner && !owner->IsFriendlyTo(unit_target) && !HasAuraType(SPELL_AURA_MOD_POSSESS))
+        {
+            // This is true if pet has no target or has target but targets differs.
+            Unit* pVictim = getVictim();
+            if (pVictim != unit_target)
+            {
+                if (pVictim)
+                    AttackStop();
+
+                GetMotionMaster()->Clear();
+
+                if (pet->AI() && unit_target->isAlive())
+                    pet->AI()->AttackStart(unit_target);
+            }
+        }
+
+        spell->prepare(&tmpTargets, triggeredByAura);
+    }
+    else if (pet)
+    {
+        if (owner)
+            Spell::SendCastResult(owner, spellInfo, 0, result, true);
+
+        if (owner && !HasSpellCooldown(spellInfo) && !triggered)
+            owner->SendClearCooldown(spellInfo->Id, pet);
+
+        spell->finish(false);
+        delete spell;
+    }
+    else
+    {
+        spell->finish(false);
+        delete spell;
+    }
+}
+
+bool Unit::isFrozen() const
+{
+    return HasAuraState(AURA_STATE_FROZEN);
+}
+
+typedef std::multimap<SpellAuraHolderPtr, SpellProcEventEntry const*> ProcTriggeredList;
+
+uint32 createProcExtendMask(DamageInfo *damageInfo, SpellMissInfo missCondition)
+{
+    uint32 procEx = PROC_EX_NONE;
+    // Check victim state
+    if (missCondition!=SPELL_MISS_NONE)
+    {
+        switch (missCondition)
+        {
+            case SPELL_MISS_MISS:    procEx|=PROC_EX_MISS;   break;
+            case SPELL_MISS_RESIST:  procEx|=PROC_EX_RESIST; break;
+            case SPELL_MISS_DODGE:   procEx|=PROC_EX_DODGE;  break;
+            case SPELL_MISS_PARRY:   procEx|=PROC_EX_PARRY;  break;
+            case SPELL_MISS_BLOCK:   procEx|=PROC_EX_BLOCK;  break;
+            case SPELL_MISS_EVADE:   procEx|=PROC_EX_EVADE;  break;
+            case SPELL_MISS_IMMUNE:  procEx|=PROC_EX_IMMUNE; break;
+            case SPELL_MISS_IMMUNE2: procEx|=PROC_EX_IMMUNE; break;
+            case SPELL_MISS_DEFLECT: procEx|=PROC_EX_DEFLECT;break;
+            case SPELL_MISS_ABSORB:  procEx|=PROC_EX_ABSORB; break;
+            case SPELL_MISS_REFLECT: procEx|=PROC_EX_REFLECT;break;
+            default:
+                break;
+        }
+    }
+    else
+    {
+        // On block
+        if (damageInfo->blocked)
+            procEx|=PROC_EX_BLOCK;
+        // On absorb
+        if (damageInfo->GetAbsorb())
+            procEx|=PROC_EX_ABSORB;
+        // On crit
+        if (damageInfo->HitInfo & SPELL_HIT_TYPE_CRIT)
+            procEx|=PROC_EX_CRITICAL_HIT;
+        else
+            procEx|=PROC_EX_NORMAL_HIT;
+    }
+    return procEx;
+}
+
+void Unit::ProcDamageAndSpellFor(bool isVictim, DamageInfo* damageInfo)
+{
+    // Fixme: need remove this check after make LocationManager
+    if (!IsInWorld() || !GetMap())
+        return;
+
+    Unit*  pTarget   = isVictim ? damageInfo->attacker : damageInfo->target;
+    uint32 procFlag  = isVictim ? damageInfo->procVictim : damageInfo->procAttacker;
+    uint32 procExtra = damageInfo->procEx;
+    SpellEntry const* procSpell = damageInfo->GetSpellProto();
+
+    // For melee/ranged based attack need update skills and set some Aura states
+    if (!(procExtra & PROC_EX_CAST_END) && (procFlag & MELEE_BASED_TRIGGER_MASK))
+    {
+        // Update skills here for players
+        if (GetTypeId() == TYPEID_PLAYER)
+        {
+            // On melee based hit/miss/resist need update skill (for victim and attacker)
+            if (procExtra & (PROC_EX_NORMAL_HIT|PROC_EX_MISS|PROC_EX_RESIST))
+            {
+                if (pTarget && pTarget->GetTypeId() != TYPEID_PLAYER && pTarget->GetCreatureType() != CREATURE_TYPE_CRITTER)
+                    ((Player*)this)->UpdateCombatSkills(pTarget, damageInfo->attackType, isVictim);
+            }
+            // Update defence if player is victim and parry/dodge/block
+            if (isVictim && (procExtra & (PROC_EX_DODGE|PROC_EX_PARRY|PROC_EX_BLOCK)))
+                ((Player*)this)->UpdateDefense();
+        }
+        // If exist crit/parry/dodge/block need update aura state (for victim and attacker)
+        if (procExtra & (PROC_EX_CRITICAL_HIT|PROC_EX_PARRY|PROC_EX_DODGE|PROC_EX_BLOCK))
+        {
+            // for victim
+            if (isVictim)
+            {
+                // if victim and dodge attack
+                if (procExtra & PROC_EX_DODGE)
+                {
+                    //Update AURA_STATE on dodge
+                    if (getClass() != CLASS_ROGUE) // skip Rogue Riposte
+                    {
+                        ModifyAuraState(AURA_STATE_DEFENSE, true);
+                        StartReactiveTimer( REACTIVE_DEFENSE );
+                    }
+                }
+                // if victim and parry attack
+                if (procExtra & PROC_EX_PARRY)
+                {
+                    // For Hunters only Counterattack (skip Mongoose bite)
+                    if (getClass() == CLASS_HUNTER)
+                    {
+                        ModifyAuraState(AURA_STATE_HUNTER_PARRY, true);
+                        StartReactiveTimer( REACTIVE_HUNTER_PARRY );
+                    }
+                    else
+                    {
+                        ModifyAuraState(AURA_STATE_DEFENSE, true);
+                        StartReactiveTimer( REACTIVE_DEFENSE );
+                    }
+                }
+                // if and victim block attack
+                if (procExtra & PROC_EX_BLOCK)
+                {
+                    ModifyAuraState(AURA_STATE_DEFENSE,true);
+                    StartReactiveTimer( REACTIVE_DEFENSE );
+                }
+            }
+            else //For attacker
+            {
+                // Overpower on victim dodge
+                if ((procExtra & PROC_EX_DODGE) && GetTypeId() == TYPEID_PLAYER && getClass() == CLASS_WARRIOR)
+                {
+                    AddComboPoints(pTarget, 1);
+                    StartReactiveTimer( REACTIVE_OVERPOWER );
+                }
+                // Wolverine Bite and similate
+                else if ((procExtra & PROC_EX_CRITICAL_HIT) && GetObjectGuid().IsPet() && isCharmedOwnedByPlayerOrPlayer())
+                {
+                    AddComboPoints(pTarget,1);
+                }
+            }
+        }
+    }
+
+    SpellIdSet removedSpells;
+    ProcTriggeredList procTriggered;
+    // Fill procTriggered list
+    {
+        SpellAuraHolderMap const& holderMap = GetSpellAuraHolderMap();
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        for (SpellAuraHolderMap::const_iterator itr = holderMap.begin(); itr != holderMap.end(); ++itr)
+        {
+            // skip deleted auras (possible at recursive triggered call
+            if (!itr->second || itr->second->IsDeleted())
+                continue;
+
+            SpellProcEventEntry const* spellProcEvent = sSpellMgr.GetSpellProcEvent(itr->first);
+            if(!IsTriggeredAtSpellProcEvent(pTarget, itr->second, procSpell, procFlag, procExtra, damageInfo->attackType, isVictim, spellProcEvent))
+               continue;
+
+            // Frost Nova: prevent to remove root effect on self damage
+            if (itr->second->GetCaster() == pTarget)
+               if (SpellEntry const* spellInfo = itr->second->GetSpellProto())
+                  if (procSpell && spellInfo->SpellFamilyName == SPELLFAMILY_MAGE && spellInfo->GetSpellFamilyFlags().test<CF_MAGE_FROST_NOVA>()
+                     && procSpell->SpellFamilyName == SPELLFAMILY_MAGE && procSpell->GetSpellFamilyFlags().test<CF_MAGE_FROST_NOVA>())
+                        continue;
+
+            procTriggered.insert(ProcTriggeredList::value_type(itr->second, spellProcEvent));
+        }
+    }
+
+    // Nothing found
+    if (procTriggered.empty())
+        return;
+
+    // Handle effects proceed this time
+    for (ProcTriggeredList::const_iterator itr = procTriggered.begin(); itr != procTriggered.end(); ++itr)
+    {
+        // Some auras can be deleted in function called in this loop (except first, ofc)
+        if (!itr->first || itr->first->IsDeleted())
+            continue;
+
+        SpellProcEventEntry const *spellProcEvent = itr->second;
+        bool useCharges = itr->first->GetAuraCharges() > 0;
+        bool procSuccess = false;
+        bool anyAuraProc = false;
 
         // For players set spell cooldown if need
         uint32 cooldown = 0;
-        if (GetTypeId() == TYPEID_PLAYER && spellProcEvent && spellProcEvent->cooldown)
+        if (spellProcEvent && spellProcEvent->cooldown)
             cooldown = spellProcEvent->cooldown;
 
         for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
         {
-            Aura *triggeredByAura = triggeredByHolder->GetAuraByEffectIndex(SpellEffectIndex(i));
-            if (!triggeredByAura)
+            Aura* triggeredByAura = itr->first->GetAuraByEffectIndex(SpellEffectIndex(i));
+            if (!triggeredByAura || triggeredByAura->IsDeleted())
                 continue;
 
             if (procSpell)
@@ -9867,7 +12586,7 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
 
                         // don't allow proc from cast end for non modifier spells
                         // unless they have proc ex defined for that
-                        if (IsCastEndProcModifierAura(triggeredByHolder->GetSpellProto(), SpellEffectIndex(i), procSpell))
+                        if (IsCastEndProcModifierAura(itr->first->GetSpellProto(), SpellEffectIndex(i), procSpell))
                         {
                             if (useCharges && procExtra != PROC_EX_CAST_END && spellProcEvent->procEx == PROC_EX_NONE)
                                 continue;
@@ -9877,46 +12596,63 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
 
                     }
                     // don't check dbc FamilyFlags if schoolMask exists
-                    else if (!triggeredByAura->CanProcFrom(procSpell, procFlag, spellProcEvent->procEx, procExtra, damage != 0, !spellProcEvent->schoolMask))
+                    else if (!triggeredByAura->CanProcFrom(procSpell, procFlag, spellProcEvent->procEx, procExtra, damageInfo->damage != 0, !spellProcEvent->schoolMask))
                         continue;
                 }
-                else if (!triggeredByAura->CanProcFrom(procSpell, procFlag, PROC_EX_NONE, procExtra, damage != 0, true))
+                else if (!triggeredByAura->CanProcFrom(procSpell, procFlag, PROC_EX_NONE, procExtra, damageInfo->damage != 0, true))
                     continue;
             }
 
-            SpellAuraProcResult procResult = (*this.*AuraProcHandler[triggeredByHolder->GetSpellProto()->EffectApplyAuraName[i]])(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown);
+            SpellAuraProcResult procResult = (*this.*AuraProcHandler[itr->first->GetSpellProto()->EffectApplyAuraName[i]])(pTarget, damageInfo, triggeredByAura, procSpell, procFlag, procExtra, cooldown);
+
             switch (procResult)
             {
                 case SPELL_AURA_PROC_CANT_TRIGGER:
                     continue;
                 case SPELL_AURA_PROC_FAILED:
-                    procSuccess = false;
                     break;
                 case SPELL_AURA_PROC_OK:
+                    procSuccess |= true;
                     break;
             }
-
             anyAuraProc = true;
+            DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST,"Unit::ProcDamageAndSpellFor: %s deal proc on %s, damage %u,  triggeredByAura %u (effect %u), procSpell %u, procFlag %u, procExtra %u, cooldown %u. Proc result %u",
+                GetObjectGuid().GetString().c_str(),
+                pTarget->GetObjectGuid().GetString().c_str(),
+                damageInfo->damage, triggeredByAura->GetId(), i,
+                procSpell ? procSpell->Id : 0,
+                procFlag, procExtra, cooldown, procResult);
         }
 
         // Remove charge (aura can be removed by triggers)
-        if(useCharges && procSuccess && anyAuraProc && !triggeredByHolder->IsDeleted())
+        if (useCharges && procSuccess && anyAuraProc && !itr->first->IsDeleted())
         {
+            DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST,"Unit::ProcDamageAndSpellFor: %s drop charge from %s, aura %u (current charges count %u)",
+                GetObjectGuid().GetString().c_str(),
+                pTarget->GetObjectGuid().GetString().c_str(),
+                itr->first->GetId(),
+                itr->first->GetAuraCharges());
             // If last charge dropped add spell to remove list
-            if(triggeredByHolder->DropAuraCharge())
-                removedSpells.push_back(triggeredByHolder->GetId());
+            if (itr->first->DropAuraCharge())
+                removedSpells.insert(itr->first->GetId());
         }
-
-        triggeredByHolder->SetInUse(false);
+        // If reflecting with Imp. Spell Reflection - we must also remove auras from the remaining aura's targets
+        if (itr->first->GetId() == 59725)
+            if (Unit* pImpSRCaster = itr->first->GetCaster() )
+                if (Group* group = ((Player*)pImpSRCaster)->GetGroup())
+                    for(GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
+                        if (Player* member = itr->getSource())
+                            if (Aura* pAura = member->GetAura(59725, EFFECT_INDEX_0) )
+                                if (pAura->GetCaster() == pImpSRCaster)
+                                    member->RemoveAura(pAura);
     }
 
+    procTriggered.clear();
+
     if (!removedSpells.empty())
     {
-        // Sort spells and remove duplicates
-        removedSpells.sort();
-        removedSpells.unique();
         // Remove auras from removedAuras
-        for(RemoveSpellList::const_iterator i = removedSpells.begin(); i != removedSpells.end();++i)
+        for (SpellIdSet::const_iterator i = removedSpells.begin(); i != removedSpells.end();++i)
             RemoveAurasDueToSpell(*i);
     }
 }
@@ -9928,46 +12664,19 @@ SpellSchoolMask Unit::GetMeleeDamageSchoolMask() const
 
 Player* Unit::GetSpellModOwner() const
 {
-    if(GetTypeId()==TYPEID_PLAYER)
+    if (GetTypeId()==TYPEID_PLAYER)
         return (Player*)this;
     if(((Creature*)this)->IsPet() || ((Creature*)this)->IsTotem())
     {
         Unit* owner = GetOwner();
-        if(owner && owner->GetTypeId()==TYPEID_PLAYER)
+        if (owner && owner->GetTypeId()==TYPEID_PLAYER)
             return (Player*)owner;
     }
     return NULL;
 }
 
 ///----------Pet responses methods-----------------
-void Unit::SendPetCastFail(uint32 spellid, SpellCastResult msg)
-{
-    if(msg == SPELL_CAST_OK)
-        return;
-
-    Unit *owner = GetCharmerOrOwner();
-    if(!owner || owner->GetTypeId() != TYPEID_PLAYER)
-        return;
-
-    WorldPacket data(SMSG_PET_CAST_FAILED, 1 + 4 + 1);
-    data << uint8(0);                                       // cast count?
-    data << uint32(spellid);
-    data << uint8(msg);
-
-    // More cases exist, see Spell::SendCastResult (can possibly be unified)
-    switch(msg)
-    {
-        case SPELL_FAILED_NOT_READY:
-            data << uint32(0);                              // unknown
-            break;
-        default:
-            break;
-    }
-
-    ((Player*)owner)->GetSession()->SendPacket(&data);
-}
-
-void Unit::SendPetActionFeedback (uint8 msg)
+void Unit::SendPetActionFeedback(uint8 msg)
 {
     Unit* owner = GetOwner();
     if(!owner || owner->GetTypeId() != TYPEID_PLAYER)
@@ -10002,21 +12711,64 @@ void Unit::SendPetAIReaction()
     ((Player*)owner)->GetSession()->SendPacket(&data);
 }
 
+void Unit::SendCharmState()
+{
+    CharmInfo* charmInfo = GetCharmInfo();
+
+    if (!charmInfo)
+    {
+        sLog.outError("Unit::SendCharmState unit (%s) is seems charmed-like but doesn't have a charminfo!", GetObjectGuid().GetString().c_str());
+        return;
+    }
+
+    Unit* owner = GetOwner();
+    if(!owner || owner->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    WorldPacket data(SMSG_PET_MODE, 12);
+    data << GetObjectGuid();
+    data << uint32(charmInfo->GetState());
+    ((Player*)owner)->GetSession()->SendPacket(&data);
+
+}
+
 ///----------End of Pet responses methods----------
 
-void Unit::StopMoving()
+void Unit::StopMoving(bool ignoreMoveState/*=false*/)
 {
+    if (IsStopped() && !ignoreMoveState)
+        return;
+
     clearUnitState(UNIT_STAT_MOVING);
 
     // not need send any packets if not in world
     if (!IsInWorld())
         return;
 
-    Movement::MoveSplineInit init(*this);
+    Movement::MoveSplineInit<Unit*> init(*this);
     init.SetFacing(GetOrientation());
     init.Launch();
 }
 
+void Unit::InterruptMoving(bool ignoreMoveState /*=false*/)
+{
+    if (!movespline)
+        return;
+
+    bool isMoving = false;
+
+    if (!movespline->Finalized())
+    {
+        Position pos = movespline->ComputePosition();
+        pos.SetPhaseMask(GetPhaseMask());
+        movespline->_Interrupt();
+        SetPosition(pos);
+        isMoving = true;
+    }
+
+    StopMoving(ignoreMoveState || isMoving);
+}
+
 void Unit::SetFeared(bool apply, ObjectGuid casterGuid, uint32 spellID, uint32 time)
 {
     if (apply)
@@ -10024,37 +12776,35 @@ void Unit::SetFeared(bool apply, ObjectGuid casterGuid, uint32 spellID, uint32 t
         if (HasAuraType(SPELL_AURA_PREVENTS_FLEEING))
             return;
 
-        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING);
-
-        GetMotionMaster()->MovementExpired(false);
         CastStop(GetObjectGuid() == casterGuid ? spellID : 0);
 
+        if (GetTypeId() == TYPEID_UNIT)
+            SetTargetGuid(ObjectGuid());                    // creature feared loose its target
+
         Unit* caster = IsInWorld() ?  GetMap()->GetUnit(casterGuid) : NULL;
 
+        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING);
+
         GetMotionMaster()->MoveFleeing(caster, time);       // caster==NULL processed in MoveFleeing
     }
     else
     {
-        RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING);
+        GetUnitStateMgr().DropAction(UNIT_ACTION_FEARED);
 
-        GetMotionMaster()->MovementExpired(false);
+        RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING);
 
+        // attack caster if can
         if (GetTypeId() != TYPEID_PLAYER && isAlive())
         {
-            Creature* c = ((Creature*)this);
-            // restore appropriate movement generator
             if (getVictim())
-                GetMotionMaster()->MoveChase(getVictim());
-            else
-                GetMotionMaster()->Initialize();
+                SetTargetGuid(getVictim()->GetObjectGuid());  // restore target
 
-            // attack caster if can
             if (Unit* caster = IsInWorld() ? GetMap()->GetUnit(casterGuid) : NULL)
-                c->AttackedBy(caster);
+                AttackedBy(caster);
         }
     }
 
-    if (GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER && !GetVehicle())
         ((Player*)this)->SetClientControl(this, !apply);
 }
 
@@ -10062,29 +12812,17 @@ void Unit::SetConfused(bool apply, ObjectGuid casterGuid, uint32 spellID)
 {
     if (apply)
     {
-        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CONFUSED);
-
         CastStop(GetObjectGuid() == casterGuid ? spellID : 0);
-
+        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CONFUSED);
         GetMotionMaster()->MoveConfused();
     }
     else
     {
         RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CONFUSED);
-
-        GetMotionMaster()->MovementExpired(false);
-
-        if (GetTypeId() != TYPEID_PLAYER && isAlive())
-        {
-            // restore appropriate movement generator
-            if(getVictim())
-                GetMotionMaster()->MoveChase(getVictim());
-            else
-                GetMotionMaster()->Initialize();
-        }
+        GetUnitStateMgr().DropAction(UNIT_ACTION_CONFUSED);
     }
 
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER && !GetVehicle())
         ((Player*)this)->SetClientControl(this, !apply);
 }
 
@@ -10094,59 +12832,28 @@ void Unit::SetFeignDeath(bool apply, ObjectGuid casterGuid, uint32 /*spellID*/)
     {
         /*
         WorldPacket data(SMSG_FEIGN_DEATH_RESISTED, 9);
-        data<<GetGUID();
+        data<<GetObjectGuid();
         data<<uint8(0);
         SendMessageToSet(&data,true);
         */
 
-        if (GetTypeId() != TYPEID_PLAYER)
-            StopMoving();
-        else
-            ((Player*)this)->m_movementInfo.SetMovementFlags(MOVEFLAG_NONE);
-
-                                                            // blizz like 2.0.x
-        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29);
-                                                            // blizz like 2.0.x
-        SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
-                                                            // blizz like 2.0.x
-        SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
-
-        addUnitState(UNIT_STAT_DIED);
-        CombatStop();
-        RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
-
         // prevent interrupt message
         if (casterGuid == GetObjectGuid())
             FinishSpell(CURRENT_GENERIC_SPELL,false);
-        InterruptNonMeleeSpells(true);
-        getHostileRefManager().deleteReferences();
+
+        GetUnitStateMgr().PushAction(UNIT_ACTION_FEIGNDEATH);
+        RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
     }
     else
     {
         /*
         WorldPacket data(SMSG_FEIGN_DEATH_RESISTED, 9);
-        data<<GetGUID();
+        data<<GetObjectGuid();
         data<<uint8(1);
         SendMessageToSet(&data,true);
         */
-                                                            // blizz like 2.0.x
-        RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29);
-                                                            // blizz like 2.0.x
-        RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
-                                                            // blizz like 2.0.x
-        RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
-
-        clearUnitState(UNIT_STAT_DIED);
-
-        if (GetTypeId() != TYPEID_PLAYER && isAlive())
-        {
-            // restore appropriate movement generator
-            if(getVictim())
-                GetMotionMaster()->MoveChase(getVictim());
-            else
-                GetMotionMaster()->Initialize();
-        }
 
+        GetUnitStateMgr().DropAction(UNIT_ACTION_FEIGNDEATH);
     }
 }
 
@@ -10172,7 +12879,7 @@ void Unit::SetStandState(uint8 state)
     if (IsStandState())
         RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_NOT_SEATED);
 
-    if(GetTypeId()==TYPEID_PLAYER)
+    if (GetTypeId()==TYPEID_PLAYER)
     {
         WorldPacket data(SMSG_STANDSTATE_UPDATE, 1);
         data << (uint8)state;
@@ -10185,50 +12892,119 @@ bool Unit::IsPolymorphed() const
     return GetSpellSpecific(getTransForm())==SPELL_MAGE_POLYMORPH;
 }
 
+bool Unit::IsCrowdControlled() const
+{
+    return  HasAuraType(SPELL_AURA_MOD_CONFUSE) ||
+            HasAuraType(SPELL_AURA_MOD_FEAR) ||
+            HasAuraType(SPELL_AURA_MOD_STUN) ||
+            HasAuraType(SPELL_AURA_MOD_ROOT) ||
+            HasAuraType(SPELL_AURA_TRANSFORM);
+}
+
 void Unit::SetDisplayId(uint32 modelId)
 {
     SetUInt32Value(UNIT_FIELD_DISPLAYID, modelId);
 
     UpdateModelData();
 
-    if(GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsPet())
+    if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsPet())
     {
         Pet *pet = ((Pet*)this);
         if(!pet->isControlled())
             return;
         Unit *owner = GetOwner();
-        if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
+        if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
             ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_MODEL_ID);
     }
 }
 
 void Unit::UpdateModelData()
 {
+    float boundingRadius, combatReach;
+
     if (CreatureModelInfo const* modelInfo = sObjectMgr.GetCreatureModelInfo(GetDisplayId()))
     {
-        // we expect values in database to be relative to scale = 1.0
-        SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, GetObjectScale() * modelInfo->bounding_radius);
-
-        // never actually update combat_reach for player, it's always the same. Below player case is for initialization
-        if (GetTypeId() == TYPEID_PLAYER)
-            SetFloatValue(UNIT_FIELD_COMBATREACH, 1.5f);
-        else
-            SetFloatValue(UNIT_FIELD_COMBATREACH, GetObjectScale() * modelInfo->combat_reach);
+        boundingRadius = modelInfo->bounding_radius;
+        combatReach = modelInfo->combat_reach;
     }
+    else
+    {
+        boundingRadius = DEFAULT_WORLD_OBJECT_SIZE;
+        combatReach = DEFAULT_COMBAT_REACH;
+    }
+
+    float scale = GetObjectScale();
+
+    SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, boundingRadius * scale);
+    SetFloatValue(UNIT_FIELD_COMBATREACH, combatReach * scale);
 }
 
 void Unit::ClearComboPointHolders()
 {
     while(!m_ComboPointHolders.empty())
     {
-        uint32 lowguid = *m_ComboPointHolders.begin();
+        ObjectGuid guid = *m_ComboPointHolders.begin();
 
-        Player* plr = sObjectMgr.GetPlayer(ObjectGuid(HIGHGUID_PLAYER, lowguid));
-        if (plr && plr->GetComboTargetGuid() == GetObjectGuid())// recheck for safe
-            plr->ClearComboPoints();                        // remove also guid from m_ComboPointHolders;
+        Unit* owner = ObjectAccessor::GetUnit(*this, guid);
+        if (owner && owner->GetComboTargetGuid() == GetObjectGuid())// recheck for safe
+            owner->ClearComboPoints();                        // remove also guid from m_ComboPointHolders;
         else
-            m_ComboPointHolders.erase(lowguid);             // or remove manually
+            m_ComboPointHolders.erase(guid);             // or remove manually
+    }
+}
+
+void Unit::AddComboPoints(Unit* target, int8 count)
+{
+    if (!count)
+        return;
+
+    // without combo points lost (duration checked in aura)
+    RemoveSpellsCausingAura(SPELL_AURA_RETAIN_COMBO_POINTS);
+
+    if (target->GetObjectGuid() == m_comboTargetGuid)
+    {
+        m_comboPoints += count;
+    }
+    else
+    {
+        if (!m_comboTargetGuid.IsEmpty())
+            if (Unit* target2 = ObjectAccessor::GetUnit(*this, m_comboTargetGuid))
+                target2->RemoveComboPointHolder(GetObjectGuid());
+
+        m_comboTargetGuid = target->GetObjectGuid();
+        m_comboPoints = count;
+
+        target->AddComboPointHolder(GetObjectGuid());
     }
+
+    if (m_comboPoints > 5) m_comboPoints = 5;
+    if (m_comboPoints < 0) m_comboPoints = 0;
+
+    if (GetObjectGuid().IsPlayer())
+        ((Player*)this)->SendComboPoints(m_comboTargetGuid, m_comboPoints);
+    else if ((GetObjectGuid().IsPet() || GetObjectGuid().IsVehicle()) && GetCharmerOrOwner() && GetCharmerOrOwner()->GetObjectGuid().IsPlayer())
+        ((Player*)GetCharmerOrOwner())->SendPetComboPoints(this,m_comboTargetGuid, m_comboPoints);
+}
+
+void Unit::ClearComboPoints()
+{
+    if (m_comboTargetGuid.IsEmpty())
+        return;
+
+    // without combopoints lost (duration checked in aura)
+    RemoveSpellsCausingAura(SPELL_AURA_RETAIN_COMBO_POINTS);
+
+    m_comboPoints = 0;
+
+    if (GetObjectGuid().IsPlayer())
+        ((Player*)this)->SendComboPoints(m_comboTargetGuid, m_comboPoints);
+    else if ((GetObjectGuid().IsPet() || GetObjectGuid().IsVehicle()) && GetCharmerOrOwner() && GetCharmerOrOwner()->GetObjectGuid().IsPlayer())
+        ((Player*)GetCharmerOrOwner())->SendPetComboPoints(this,m_comboTargetGuid, m_comboPoints);
+
+    if (Unit* target = ObjectAccessor::GetUnit(*this,m_comboTargetGuid))
+        target->RemoveComboPointHolder(GetObjectGuid());
+
+    m_comboTargetGuid.Clear();
 }
 
 void Unit::ClearAllReactives()
@@ -10241,8 +13017,8 @@ void Unit::ClearAllReactives()
     if (getClass() == CLASS_HUNTER && HasAuraState( AURA_STATE_HUNTER_PARRY))
         ModifyAuraState(AURA_STATE_HUNTER_PARRY, false);
 
-    if(getClass() == CLASS_WARRIOR && GetTypeId() == TYPEID_PLAYER)
-        ((Player*)this)->ClearComboPoints();
+    if (getClass() == CLASS_WARRIOR && GetTypeId() == TYPEID_PLAYER)
+        ClearComboPoints();
 }
 
 void Unit::UpdateReactives( uint32 p_time )
@@ -10269,8 +13045,8 @@ void Unit::UpdateReactives( uint32 p_time )
                         ModifyAuraState(AURA_STATE_HUNTER_PARRY, false);
                     break;
                 case REACTIVE_OVERPOWER:
-                    if(getClass() == CLASS_WARRIOR && GetTypeId() == TYPEID_PLAYER)
-                        ((Player*)this)->ClearComboPoints();
+                    if (getClass() == CLASS_WARRIOR && GetTypeId() == TYPEID_PLAYER)
+                        ClearComboPoints();
                     break;
                 default:
                     break;
@@ -10287,12 +13063,12 @@ Unit* Unit::SelectRandomUnfriendlyTarget(Unit* except /*= NULL*/, float radius /
 {
     std::list<Unit *> targets;
 
-    MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, this, radius);
+    MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, radius);
     MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck> searcher(targets, u_check);
     Cell::VisitAllObjects(this, searcher, radius);
 
     // remove current target
-    if(except)
+    if (except)
         targets.remove(except);
 
     // remove not LoS targets
@@ -10309,7 +13085,7 @@ Unit* Unit::SelectRandomUnfriendlyTarget(Unit* except /*= NULL*/, float radius /
     }
 
     // no appropriate targets
-    if(targets.empty())
+    if (targets.empty())
         return NULL;
 
     // select random
@@ -10331,7 +13107,7 @@ Unit* Unit::SelectRandomFriendlyTarget(Unit* except /*= NULL*/, float radius /*=
     Cell::VisitAllObjects(this, searcher, radius);
 
     // remove current target
-    if(except)
+    if (except)
         targets.remove(except);
 
     // remove not LoS targets
@@ -10348,7 +13124,7 @@ Unit* Unit::SelectRandomFriendlyTarget(Unit* except /*= NULL*/, float radius /*=
     }
 
     // no appropriate targets
-    if(targets.empty())
+    if (targets.empty())
         return NULL;
 
     // select random
@@ -10362,54 +13138,61 @@ Unit* Unit::SelectRandomFriendlyTarget(Unit* except /*= NULL*/, float radius /*=
 
 bool Unit::hasNegativeAuraWithInterruptFlag(uint32 flag)
 {
+    MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
     for (SpellAuraHolderMap::const_iterator iter = m_spellAuraHolders.begin(); iter != m_spellAuraHolders.end(); ++iter)
     {
-        if (!iter->second->IsPositive() && iter->second->GetSpellProto()->AuraInterruptFlags & flag)
+        if (!iter->second || iter->second->IsDeleted())
+            continue;
+
+        if (!iter->second->IsPositive() && (iter->second->GetSpellProto()->AuraInterruptFlags & flag))
             return true;
     }
     return false;
 }
 
-void Unit::ApplyAttackTimePercentMod( WeaponAttackType att,float val, bool apply )
+void Unit::ApplyAttackTimePercentMod(WeaponAttackType att,float val, bool apply)
 {
-    if(val > 0)
+    if (val > 0)
     {
         ApplyPercentModFloatVar(m_modAttackSpeedPct[att], val, !apply);
-        ApplyPercentModFloatValue(UNIT_FIELD_BASEATTACKTIME+att,val,!apply);
+        ApplyPercentModFloatValue(UNIT_FIELD_BASEATTACKTIME + att, val, !apply);
     }
     else
     {
         ApplyPercentModFloatVar(m_modAttackSpeedPct[att], -val, apply);
-        ApplyPercentModFloatValue(UNIT_FIELD_BASEATTACKTIME+att,-val,apply);
+        ApplyPercentModFloatValue(UNIT_FIELD_BASEATTACKTIME + att, -val, apply);
     }
+
+    if (GetTypeId() == TYPEID_PLAYER && IsInWorld())
+        ((Player*)this)->CallForAllControlledUnits(ApplyScalingBonusWithHelper(SCALING_TARGET_ATTACKSPEED, 0, false), CONTROLLED_PET | CONTROLLED_GUARDIANS);
 }
 
-void Unit::ApplyCastTimePercentMod(float val, bool apply )
+void Unit::ApplyCastTimePercentMod(float val, bool apply)
 {
-    if(val > 0)
-        ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED,val,!apply);
+    if (val > 0)
+        ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED, val, !apply);
     else
-        ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED,-val,apply);
+        ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED, -val, apply);
 }
 
 void Unit::UpdateAuraForGroup(uint8 slot)
 {
-    if(GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER)
     {
         Player* player = (Player*)this;
-        if(player->GetGroup())
+        if (player->GetGroup())
         {
             player->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_AURAS);
             player->SetAuraUpdateMask(slot);
         }
     }
-    else if(GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsPet())
+    else if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsPet())
     {
         Pet *pet = ((Pet*)this);
-        if(pet->isControlled())
+        if (pet->isControlled())
         {
             Unit *owner = GetOwner();
-            if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
+            if (owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
             {
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_AURAS);
                 pet->SetAuraUpdateMask(slot);
@@ -10443,13 +13226,17 @@ float Unit::GetAPMultiplier(WeaponAttackType attType, bool normalized)
     }
 }
 
-Aura* Unit::GetDummyAura( uint32 spell_id ) const
+Aura const* Unit::GetDummyAura(uint32 spell_id) const
 {
-    Unit::AuraList const& mDummy = GetAurasByType(SPELL_AURA_DUMMY);
-    for(Unit::AuraList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr)
-        if ((*itr)->GetId() == spell_id)
-            return *itr;
+    AuraList const& mDummy = GetAurasByType(SPELL_AURA_DUMMY);
+    for (AuraList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr)
+    {
+        if (itr->IsEmpty())
+            continue;
 
+        if ((*itr)->GetHolder()->GetId() == spell_id)
+            return (*itr)();
+    }
     return NULL;
 }
 
@@ -10459,11 +13246,13 @@ void Unit::SetContestedPvP(Player *attackedPlayer)
 
     if (!player || (attackedPlayer && (attackedPlayer == player || player->IsInDuelWith(attackedPlayer))))
         return;
-
     player->SetContestedPvPTimer(30000);
 
     if (!player->hasUnitState(UNIT_STAT_ATTACK_PLAYER))
     {
+        if (!player->IsPvP())
+            player->SetPvP(true);
+
         player->addUnitState(UNIT_STAT_ATTACK_PLAYER);
         player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_CONTESTED_PVP);
         // call MoveInLineOfSight for nearby contested guards
@@ -10481,38 +13270,127 @@ void Unit::SetContestedPvP(Player *attackedPlayer)
 void Unit::AddPetAura(PetAura const* petSpell)
 {
     m_petAuras.insert(petSpell);
-    if(Pet* pet = GetPet())
-        pet->CastPetAura(petSpell);
+
+    if (GetPet())
+    {
+        GuidSet groupPetsCopy = GetPets();
+        if (!groupPetsCopy.empty())
+        {
+            for (GuidSet::const_iterator itr = groupPetsCopy.begin(); itr != groupPetsCopy.end(); ++itr)
+            {
+                if (Pet* pPet = GetMap()->GetPet(*itr))
+                    pPet->CastPetAura(petSpell);
+            }
+        }
+    }
 }
 
 void Unit::RemovePetAura(PetAura const* petSpell)
 {
     m_petAuras.erase(petSpell);
-    if(Pet* pet = GetPet())
-        pet->RemoveAurasDueToSpell(petSpell->GetAura(pet->GetEntry()));
+
+    if (GetPet())
+    {
+        GuidSet groupPetsCopy = GetPets();
+        if (!groupPetsCopy.empty())
+        {
+            for (GuidSet::const_iterator itr = groupPetsCopy.begin(); itr != groupPetsCopy.end(); ++itr)
+            {
+                if (Pet* pPet = GetMap()->GetPet(*itr))
+                    pPet->RemoveAurasDueToSpell(petSpell->GetAura(pPet->GetEntry()));
+            }
+        }
+    }
 }
 
 void Unit::RemoveAurasAtMechanicImmunity(uint32 mechMask, uint32 exceptSpellId, bool non_positive /*= false*/)
 {
-    Unit::SpellAuraHolderMap& auras = GetSpellAuraHolderMap();
-    for(Unit::SpellAuraHolderMap::iterator iter = auras.begin(); iter != auras.end();)
+    SpellIdSet         spellsToRemove;
+    std::set<Aura*>    aurasToRemove;
+
     {
-        SpellEntry const *spell = iter->second->GetSpellProto();
-        if (spell->Id == exceptSpellId)
-            ++iter;
-        else if (non_positive && iter->second->IsPositive())
-            ++iter;
-        else if (spell->HasAttribute(SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY))
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+        SpellAuraHolderMap const& holders = GetSpellAuraHolderMap();
+
+        for (SpellAuraHolderMap::const_iterator iter = holders.begin(); iter != holders.end(); ++iter)
+        {
+            if (!iter->second ||
+                iter->second->IsDeleted() ||
+                iter->second->IsEmptyHolder() ||
+                iter->second->GetId() == exceptSpellId ||
+                iter->second->GetSpellProto()->HasAttribute(SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY) ||
+                (non_positive && iter->second->IsPositive()))
+                continue;
+
+            if (iter->second->HasMechanicMask(mechMask))
+            {
+                bool removedSingleAura = false;
+
+                for (int32 i = 0; i < MAX_EFFECT_INDEX; i++)
+                {
+                    uint8 mechanic  = iter->second->GetSpellProto()->EffectMechanic[SpellEffectIndex(i)] ?
+                                      iter->second->GetSpellProto()->EffectMechanic[SpellEffectIndex(i)] :
+                                      iter->second->GetSpellProto()->Mechanic;
+
+                    if ((1 << (mechanic - 1)) & mechMask)
+                    {
+                        Aura* aura = iter->second->GetAuraByEffectIndex(SpellEffectIndex(i));
+                        if (aura && !aura->IsDeleted())
+                        {
+                            if (!aura->IsLastAuraOnHolder())
+                            {
+                                // don't remove holder if it has other auras that may not have this mechanic
+                                aurasToRemove.insert(aura);
+                                removedSingleAura = true;
+                            }
+                            else
+                            {
+                                // if this is last aura then remove the holder (see below)
+                                removedSingleAura = false;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if (!removedSingleAura)
+                    spellsToRemove.insert(iter->second->GetId());
+
+            }
+        }
+    }
+
+    if (!aurasToRemove.empty())
+    {
+        for (std::set<Aura*>::const_iterator i = aurasToRemove.begin(); i != aurasToRemove.end(); ++i)
+            if (Aura* aura = *i)
+                if (!aura->IsDeleted())
+                    RemoveAura(*i);
+    }
+
+    if (!spellsToRemove.empty())
+    {
+        for (SpellIdSet::const_iterator i = spellsToRemove.begin(); i != spellsToRemove.end(); ++i)
+            RemoveAurasDueToSpell(*i);
+    }
+}
+
+void Unit::RemoveAurasBySpellMechanic(uint32 mechMask)
+{
+    Unit::SpellAuraHolderMap& holders = GetSpellAuraHolderMap();
+    for(Unit::SpellAuraHolderMap::iterator iter = holders.begin(); iter != holders.end();)
+    {
+        if (!iter->second || iter->second->IsDeleted() || !iter->second->IsPositive())
             ++iter;
-        else if (iter->second->HasMechanicMask(mechMask))
+        else if (iter->second->GetSpellProto()->Mechanic & mechMask)
         {
-            RemoveAurasDueToSpell(spell->Id);
+            RemoveAurasDueToSpell(iter->second->GetId());
 
-            if(auras.empty())
+            if (holders.empty())
                 break;
             else
-                iter = auras.begin();
-         }
+                iter = holders.begin();
+        }
         else
             ++iter;
     }
@@ -10535,47 +13413,56 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update)
 
     if (IsInWorld())
     {
-        RemoveNotOwnSingleTargetAuras(newPhaseMask);        // we can lost access to caster or target
+        RemoveNotOwnTrackedTargetAuras(newPhaseMask);       // we can lost access to caster or target
 
         // all controlled except not owned charmed units
-        CallForAllControlledUnits(SetPhaseMaskHelper(newPhaseMask), CONTROLLED_PET|CONTROLLED_GUARDIANS|CONTROLLED_MINIPET|CONTROLLED_TOTEMS);
+        CallForAllControlledUnits(SetPhaseMaskHelper(newPhaseMask), CONTROLLED_PET|CONTROLLED_GUARDIANS|CONTROLLED_MINIPET|CONTROLLED_TOTEMS|CONTROLLED_CHARM);
     }
 
     WorldObject::SetPhaseMask(newPhaseMask, update);
 }
 
 void Unit::NearTeleportTo( float x, float y, float z, float orientation, bool casting /*= false*/ )
+{
+    NearTeleportTo(WorldLocation(GetMapId(), x, y, z, orientation, GetPhaseMask()), TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET | (casting ? TELE_TO_SPELL : 0));
+}
+
+void Unit::NearTeleportTo(WorldLocation const& loc, uint32 options)
 {
     DisableSpline();
 
-    if(GetTypeId() == TYPEID_PLAYER)
-        ((Player*)this)->TeleportTo(GetMapId(), x, y, z, orientation, TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET | (casting ? TELE_TO_SPELL : 0));
+    if (GetTypeId() == TYPEID_PLAYER)
+        ((Player*)this)->TeleportTo(loc, options);
     else
     {
-        Creature* c = (Creature*)this;
-        // Creature relocation acts like instant movement generator, so current generator expects interrupt/reset calls to react properly
-        if (!c->GetMotionMaster()->empty())
-            if (MovementGenerator *movgen = c->GetMotionMaster()->top())
-                movgen->Interrupt(*c);
-
-        GetMap()->CreatureRelocation((Creature*)this, x, y, z, orientation);
-
+        ExitVehicle(true);
+        GetMap()->Relocation((Creature*)this, loc);
         SendHeartBeat();
-
-        // finished relocation, movegen can different from top before creature relocation,
-        // but apply Reset expected to be safe in any case
-        if (!c->GetMotionMaster()->empty())
-            if (MovementGenerator *movgen = c->GetMotionMaster()->top())
-                movgen->Reset(*c);
     }
 }
 
 void Unit::MonsterMoveWithSpeed(float x, float y, float z, float speed, bool generatePath, bool forceDestination)
 {
-    Movement::MoveSplineInit init(*this);
-    init.MoveTo(x,y,z, generatePath, forceDestination);
-    init.SetVelocity(speed);
-    init.Launch();
+    MaNGOS::NormalizeMapCoord(x);
+    MaNGOS::NormalizeMapCoord(y);
+
+    GetMotionMaster()->MoveWithSpeed(x, y, z, speed, generatePath, forceDestination);
+    SetFallInformation(0,z);
+}
+
+void Unit::MonsterMoveToDestination(float x, float y, float z, float o, float speed, float height, bool isKnockBack, Unit* target)
+{
+    MaNGOS::NormalizeMapCoord(x);
+    MaNGOS::NormalizeMapCoord(y);
+
+    if (isKnockBack && GetTypeId() != TYPEID_PLAYER)
+    {
+        // Interrupt spells cause of movement
+        InterruptNonMeleeSpells(false);
+    }
+
+    SetFallInformation(0,z);
+    GetMotionMaster()->MoveToDestination(x, y, z, o, target, speed, height, 0);
 }
 
 struct SetPvPHelper
@@ -10585,121 +13472,415 @@ struct SetPvPHelper
     bool state;
 };
 
-void Unit::SetPvP( bool state )
+void Unit::RemoveVehicleKit()
 {
-    if(state)
-        SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP);
-    else
-        RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP);
+    if (!m_pVehicleKit)
+        return;
 
-    CallForAllControlledUnits(SetPvPHelper(state), CONTROLLED_PET|CONTROLLED_TOTEMS|CONTROLLED_GUARDIANS|CONTROLLED_CHARM);
+    m_pVehicleKit->Reset();
+
+    m_pVehicleKit = VehicleKitPtr(NULL);
+
+    m_updateFlag &= ~UPDATEFLAG_VEHICLE;
+    RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
+    RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PLAYER_VEHICLE);
 }
 
-struct SetFFAPvPHelper
+void Unit::EnterVehicle(VehicleKitPtr vehicle, int8 seatId)
 {
-    explicit SetFFAPvPHelper(bool _state) : state(_state) {}
-    void operator()(Unit* unit) const { unit->SetFFAPvP(state); }
-    bool state;
+    if (vehicle)
+        EnterVehicle(vehicle->GetBase(), seatId);
 };
 
-void Unit::SetFFAPvP( bool state )
+void Unit::EnterVehicle(Unit* vehicleBase, int8 seatId)
 {
-    if(state)
-        SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP);
-    else
-        RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP);
+    if (!isAlive() ||
+        !vehicleBase ||
+        !vehicleBase->isAlive() ||
+        !vehicleBase->GetVehicleKit() ||
+        GetVehicleKit() == vehicleBase->GetVehicleKit())
+        return;
 
-    CallForAllControlledUnits(SetFFAPvPHelper(state), CONTROLLED_PET|CONTROLLED_TOTEMS|CONTROLLED_GUARDIANS|CONTROLLED_CHARM);
-}
+    if (seatId == -1)
+    {
+        if (vehicleBase->GetVehicleKit()->HasEmptySeat(seatId))
+            seatId = vehicleBase->GetVehicleKit()->GetNextEmptySeatWithFlag(0);
+        else
+        {
+            sLog.outError("Unit::EnterVehicle: unit %s try seat to  vehicle %s but no seats!", GetObjectGuid().GetString().c_str(), vehicleBase->GetObjectGuid().GetString().c_str());
+            return;
+        }
+    }
 
-void Unit::KnockBackFrom(Unit* target, float horizontalSpeed, float verticalSpeed)
-{
-    float angle = this == target ? GetOrientation() + M_PI_F : target->GetAngle(this);
-    float vsin = sin(angle);
-    float vcos = cos(angle);
+    SpellEntry const* spellInfo = NULL;
+    int32 bp[MAX_EFFECT_INDEX];
+    Unit* caster = NULL;
+    Unit* target = NULL;
 
-    if (GetTypeId() == TYPEID_PLAYER)
+    if (GetTypeId() == TYPEID_PLAYER && vehicleBase->GetTypeId() == TYPEID_UNIT)
     {
-        WorldPacket data(SMSG_MOVE_KNOCK_BACK, 9+4+4+4+4+4);
-        data << GetPackGUID();
-        data << uint32(0);                                  // Sequence
-        data << float(vcos);                                // x direction
-        data << float(vsin);                                // y direction
-        data << float(horizontalSpeed);                     // Horizontal speed
-        data << float(-verticalSpeed);                      // Z Movement speed (vertical)
-        ((Player*)this)->GetSession()->SendPacket(&data);
+        SpellClickInfoMapBounds clickPair = sObjectMgr.GetSpellClickInfoMapBounds(vehicleBase->GetEntry());
+        if (clickPair.first != clickPair.second)
+        {
+            for (SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr)
+            {
+                if (itr->second.IsFitToRequirements((Player*)this, (Creature*)vehicleBase))
+                {
+
+                    spellInfo = sSpellStore.LookupEntry(itr->second.spellId);
+
+                    if (!spellInfo)
+                        continue;
+
+                    bool b_controlAura = false;
+                    for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+                    {
+                        if (IsAuraApplyEffect(spellInfo, SpellEffectIndex(i)))
+                            if (spellInfo->EffectApplyAuraName[i] == SPELL_AURA_CONTROL_VEHICLE)
+                                b_controlAura = true;
+                    }
+
+                    if (b_controlAura)
+                    {
+                        caster = (itr->second.castFlags & 0x1) ? this : vehicleBase;
+                        target = (itr->second.castFlags & 0x2) ? this : vehicleBase;
+                        break;
+                    }
+
+                    spellInfo = NULL;
+                }
+            }
+        }
+    }
+
+    if (!spellInfo)
+    {
+        caster = this;
+        target = vehicleBase;
+        spellInfo = sSpellStore.LookupEntry(SPELL_RIDE_VEHICLE_HARDCODED);
     }
     else
     {
-        float moveTimeHalf = verticalSpeed / Movement::gravity;
-        float max_height = -Movement::computeFallElevation(moveTimeHalf,false,-verticalSpeed);
+        if (!caster)
+            caster = this;
+        if (!target)
+            target = vehicleBase;
+    }
 
-        float dis = 2 * moveTimeHalf * horizontalSpeed;
-        float ox, oy, oz;
-        GetPosition(ox, oy, oz);
-        float fx = ox + dis * vcos;
-        float fy = oy + dis * vsin;
-        float fz = oz;
-        float fx2, fy2, fz2;                                // getObjectHitPos overwrite last args in any result case
-        if(VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(GetMapId(), ox,oy,oz+0.5f, fx,fy,oz+0.5f,fx2,fy2,fz2, -0.5f))
+    for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        if (IsAuraApplyEffect(spellInfo, SpellEffectIndex(i)))
         {
-            fx = fx2;
-            fy = fy2;
-            fz = fz2;
+            if (spellInfo->EffectApplyAuraName[i] == SPELL_AURA_CONTROL_VEHICLE)
+            {
+                bp[i] = seatId + 1;
+            }
+            else
+                bp[i] = 0;
         }
-        UpdateAllowedPositionZ(fx, fy, fz);
-        GetMotionMaster()->MoveJump(fx,fy,fz,horizontalSpeed,max_height);
+        else
+            bp[i] = 0;
     }
+
+    caster->CastCustomSpell(target,spellInfo,&bp[EFFECT_INDEX_0],&bp[EFFECT_INDEX_1],&bp[EFFECT_INDEX_2],true,NULL,NULL,caster->GetObjectGuid());
+    DEBUG_LOG("Unit::EnterVehicle: unit %s enter vehicle %s with control aura %u", GetObjectGuid().GetString().c_str(), vehicleBase->GetObjectGuid().GetString().c_str(),spellInfo->Id);
 }
 
-float Unit::GetCombatRatingReduction(CombatRating cr) const
+void Unit::ExitVehicle(bool forceDismount)
 {
-    if (GetTypeId() == TYPEID_PLAYER)
-        return ((Player const*)this)->GetRatingBonusValue(cr);
-    else if (((Creature const*)this)->IsPet())
+    if (!GetVehicle())
+        return;
+
+    Unit* vehicleBase = GetVehicle()->GetBase();
+
+    if (!vehicleBase || !vehicleBase->IsInWorld() || !vehicleBase->IsInitialized())
     {
-        // Player's pet get 100% resilience from owner
-        if (Unit* owner = GetOwner())
-            if(owner->GetTypeId() == TYPEID_PLAYER)
-                return ((Player*)owner)->GetRatingBonusValue(cr);
+        sLog.outError("Unit::ExitVehicle: %s try leave vehicle, but no vehicle base in world!", GetObjectGuid().GetString().c_str());
+        _ExitVehicle();
+        return;
     }
 
-    return 0.0f;
-}
+    if (forceDismount)
+        GetVehicle()->DisableDismount(this);
 
-uint32 Unit::GetCombatRatingDamageReduction(CombatRating cr, float rate, float cap, uint32 damage) const
-{
-    float percent = GetCombatRatingReduction(cr) * rate;
-    if (percent > cap)
-        percent = cap;
-    return uint32 (percent * damage / 100.0f);
-}
+    bool dismiss = false;
 
-void Unit::SendThreatUpdate()
-{
-    ThreatList const& tlist = getThreatManager().getThreatList();
-    if (uint32 count = tlist.size())
+    if (vehicleBase->GetObjectGuid().IsAnyTypeCreature())
     {
-        DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "WORLD: Send SMSG_THREAT_UPDATE Message");
-        WorldPacket data(SMSG_THREAT_UPDATE, 8 + count * 8);
-        data << GetPackGUID();
-        data << uint32(count);
-        for (ThreatList::const_iterator itr = tlist.begin(); itr != tlist.end(); ++itr)
-        {
-            data << (*itr)->getUnitGuid().WriteAsPacked();
-            data << uint32((*itr)->getThreat());
-        }
-        SendMessageToSet(&data, false);
+        if (!vehicleBase->GetVehicle() && !(vehicleBase->GetVehicleInfo()->m_flags & VEHICLE_FLAG_NOT_DISMISS)
+            && ((Creature*)vehicleBase)->IsTemporarySummon())
+            dismiss = true;
+    }
+
+    if (!vehicleBase->RemoveSpellsCausingAuraByCaster(SPELL_AURA_CONTROL_VEHICLE, GetObjectGuid()))
+    {
+        _ExitVehicle(forceDismount);
+        sLog.outDetail("Unit::ExitVehicle: unit %s leave vehicle %s but no control aura!", GetObjectGuid().GetString().c_str(), vehicleBase->GetObjectGuid().GetString().c_str());
     }
+
+    // Need test!
+    if (vehicleBase->IsOnTransport())
+        vehicleBase->GetTransport()->AddPassenger(this, vehicleBase->GetTransport()->GetTransportPosition());
+
+    // While dismount process unit may lost VehicleKit
+    if (dismiss && !vehicleBase->HasAuraType(SPELL_AURA_CONTROL_VEHICLE))
+        ((Creature*)vehicleBase)->ForcedDespawn(1000);
 }
 
-void Unit::SendHighestThreatUpdate(HostileReference* pHostilReference)
+void Unit::ChangeSeat(int8 seatId, bool next)
 {
-    ThreatList const& tlist = getThreatManager().getThreatList();
-    if (uint32 count = tlist.size())
+    if (!GetVehicle())
+        return;
+
+    Unit* vehicleBase = GetVehicle()->GetBase();
+
+    if (!vehicleBase || !vehicleBase->IsInWorld())
+    {
+        sLog.outError("Unit::ChangeSeat %s try change seat on vehicle, but no vehicle base in world!", GetObjectGuid().GetString().c_str());
+        _ExitVehicle();
+        return;
+    }
+
+    if (seatId < 0)
+    {
+        seatId = GetVehicle()->GetNextEmptySeatWithFlag(m_movementInfo.GetTransportSeat(), next);
+        if (seatId < 0)
+            return;
+    }
+
+    DEBUG_LOG("Unit::ChangeSeat player %s try change seat on vehicle %s (to %u).", GetObjectGuid().GetString().c_str(),GetVehicle()->GetBase()->GetObjectGuid().GetString().c_str(), seatId);
+    ExitVehicle(true);
+    EnterVehicle(vehicleBase, seatId);
+}
+
+void Unit::_EnterVehicle(VehicleKitPtr vehicle, int8 seatId)
+{
+    if (!isAlive() || !vehicle || GetVehicleKit() == vehicle)
+        return;
+
+    if (GetVehicle())
+    {
+        if (GetVehicle() == vehicle)
+        {
+            if (seatId >= 0)
+                ChangeSeat(seatId);
+
+            return;
+        }
+        else
+            ExitVehicle();
+    }
+    else
+    {
+        InterruptNonMeleeSpells(false);
+        RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+
+        if (Pet* pet = GetPet())
+        {
+            if (GetTypeId() == TYPEID_PLAYER)
+                ((Player*)this)->UnsummonPetTemporaryIfAny(true);
+            else
+                pet->Unsummon(PET_SAVE_AS_CURRENT,this);
+        }
+    }
+
+    if (!vehicle->AddPassenger(this, seatId))
+        return;
+
+    m_pVehicle = vehicle;
+
+    if (GetTypeId() == TYPEID_PLAYER)
+    {
+        Player* player = (Player*)this;
+
+        if (BattleGround *bg = player->GetBattleGround())
+            bg->EventPlayerDroppedFlag(player);
+
+        WorldPacket data(SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA);
+        player->GetSession()->SendPacket(&data);
+
+        data.Initialize(SMSG_BREAK_TARGET, GetVehicle()->GetBase()->GetPackGUID().size());
+        data << GetVehicle()->GetBase()->GetPackGUID();
+        player->GetSession()->SendPacket(&data);
+    }
+
+    if (Transport* pTransport = GetTransport())
+    {
+        if (GetTypeId() == TYPEID_PLAYER)
+            pTransport->RemovePassenger((Player*)this);
+    }
+}
+
+void Unit::_ExitVehicle(bool forceDismount)
+{
+    if (!GetVehicle())
+        return;
+
+    DisableSpline();
+
+    if (GetVehicle()->GetBase() && GetVehicle()->GetBase()->IsInWorld())
+        GetVehicle()->RemovePassenger(this, !forceDismount);
+    else
+    {
+        ClearTransportData();
+        m_movementInfo.ClearTransportData();
+        m_movementInfo.RemoveMovementFlag(MOVEFLAG_ONTRANSPORT);
+    }
+
+    m_pVehicle = VehicleKitPtr(NULL);
+    clearUnitState(UNIT_STAT_ON_VEHICLE);
+
+    SendHeartBeat();
+
+    if (isAlive() && GetTypeId() == TYPEID_PLAYER)
+        ((Player*)this)->ResummonPetTemporaryUnSummonedIfAny();
+}
+
+void Unit::EjectVehiclePassenger(Unit* pPassenger)
+{
+    if (!pPassenger)
+        return;
+
+    VehicleKitPtr vehKit = GetVehicleKit();
+    if (!vehKit)
+        return;
+
+    int8 seatId = vehKit->GetSeatId(pPassenger);
+    if (seatId >= 0)
+        EjectVehiclePassenger(seatId);
+}
+
+void Unit::EjectVehiclePassenger(int8 seatId/*=-1*/)
+{
+    VehicleKitPtr vehKit = GetVehicleKit();
+    if (!vehKit)
+        return;
+
+    if (seatId < 0) // any passenger
+    {
+        for (int8 i = 0; i < MAX_VEHICLE_SEAT; ++i)
+        {
+            if (vehKit->GetPassenger(i))
+            {
+                seatId = i;
+                break;
+            }
+        }
+    }
+
+    if (seatId >= 0 && seatId < MAX_VEHICLE_SEAT)
+       AddEvent(new PassengerEjectEvent(seatId, *this), 1);
+}
+
+void Unit::SetPvP( bool state )
+{
+    if (state)
+        SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP);
+    else
+        RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP);
+
+    CallForAllControlledUnits(SetPvPHelper(state), CONTROLLED_PET|CONTROLLED_TOTEMS|CONTROLLED_GUARDIANS|CONTROLLED_CHARM);
+}
+
+struct SetFFAPvPHelper
+{
+    explicit SetFFAPvPHelper(bool _state) : state(_state) {}
+    void operator()(Unit* unit) const { unit->SetFFAPvP(state); }
+    bool state;
+};
+
+void Unit::SetFFAPvP( bool state )
+{
+    if (state)
+        SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP);
+    else
+        RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP);
+
+    CallForAllControlledUnits(SetFFAPvPHelper(state), CONTROLLED_PET|CONTROLLED_TOTEMS|CONTROLLED_GUARDIANS|CONTROLLED_CHARM);
+}
+
+void Unit::KnockBackFrom(Unit* target, float horizontalSpeed, float verticalSpeed)
+{
+    float angle = this == target ? GetOrientation() + M_PI_F : target->GetAngle(this);
+    KnockBackWithAngle(angle, horizontalSpeed, verticalSpeed);
+}
+
+void Unit::KnockBackWithAngle(float angle, float horizontalSpeed, float verticalSpeed)
+{
+    if (GetTypeId() == TYPEID_PLAYER)
+    {
+        SetFallInformation(0, GetPositionZ());
+        ((Player*)this)->GetAntiCheat()->SetImmune(uint32((3 * verticalSpeed / Movement::gravity) * 1000));
+        ((Player*)this)->GetSession()->SendKnockBack(angle, horizontalSpeed, verticalSpeed);
+    }
+    else
+    {
+        float vsin = sin(angle);
+        float vcos = cos(angle);
+
+        float moveTimeHalf = verticalSpeed / Movement::gravity;
+        float max_height = -Movement::computeFallElevation(moveTimeHalf,false,-verticalSpeed);
+
+        float dis = 2 * moveTimeHalf * horizontalSpeed;
+        float ox, oy, oz;
+        GetPosition(ox, oy, oz);
+        float fx = ox + dis * vcos;
+        float fy = oy + dis * vsin;
+        float fz = oz;
+
+        SetFallInformation(0, fz);
+        MonsterMoveToDestination(fx,fy,fz,GetOrientation(),horizontalSpeed,max_height, true);
+    }
+}
+
+float Unit::GetCombatRatingReduction(CombatRating cr) const
+{
+    if (GetTypeId() == TYPEID_PLAYER)
+        return ((Player const*)this)->GetRatingBonusValue(cr);
+    else if (((Creature const*)this)->IsPet())
+    {
+        // Player's pet get 100% resilience from owner
+        if (Unit* owner = GetOwner())
+            if (owner->GetTypeId() == TYPEID_PLAYER)
+                return ((Player*)owner)->GetRatingBonusValue(cr);
+    }
+
+    return 0.0f;
+}
+
+uint32 Unit::GetCombatRatingDamageReduction(CombatRating cr, float rate, float cap, uint32 damage) const
+{
+    float percent = GetCombatRatingReduction(cr) * rate;
+    if (percent > cap)
+        percent = cap;
+    return uint32 (percent * damage / 100.0f);
+}
+
+void Unit::SendThreatUpdate()
+{
+    ThreatList const& tlist = getThreatManager().getThreatList();
+    if (uint32 count = tlist.size())
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "WORLD: Send SMSG_THREAT_UPDATE Message");
+        WorldPacket data(SMSG_THREAT_UPDATE, GetPackGUID().size() + count * 8);
+        data << GetPackGUID();
+        data << uint32(count);
+        for (ThreatList::const_iterator itr = tlist.begin(); itr != tlist.end(); ++itr)
+        {
+            data << (*itr)->getUnitGuid().WriteAsPacked();
+            data << uint32((*itr)->getThreat());
+        }
+        SendMessageToSet(&data, false);
+    }
+}
+
+void Unit::SendHighestThreatUpdate(HostileReference* pHostilReference)
+{
+    ThreatList const& tlist = getThreatManager().getThreatList();
+    if (uint32 count = tlist.size())
     {
         DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "WORLD: Send SMSG_HIGHEST_THREAT_UPDATE Message");
-        WorldPacket data(SMSG_HIGHEST_THREAT_UPDATE, 8 + 8 + count * 8);
+        WorldPacket data(SMSG_HIGHEST_THREAT_UPDATE, GetPackGUID().size() + 9 + 4 + count * 8);
         data << GetPackGUID();
         data << pHostilReference->getUnitGuid().WriteAsPacked();
         data << uint32(count);
@@ -10715,7 +13896,7 @@ void Unit::SendHighestThreatUpdate(HostileReference* pHostilReference)
 void Unit::SendThreatClear()
 {
     DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "WORLD: Send SMSG_THREAT_CLEAR Message");
-    WorldPacket data(SMSG_THREAT_CLEAR, 8);
+    WorldPacket data(SMSG_THREAT_CLEAR, GetPackGUID().size());
     data << GetPackGUID();
     SendMessageToSet(&data, false);
 }
@@ -10723,7 +13904,7 @@ void Unit::SendThreatClear()
 void Unit::SendThreatRemove(HostileReference* pHostileReference)
 {
     DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "WORLD: Send SMSG_THREAT_REMOVE Message");
-    WorldPacket data(SMSG_THREAT_REMOVE, 8 + 8);
+    WorldPacket data(SMSG_THREAT_REMOVE, GetPackGUID().size() + 8);
     data << GetPackGUID();
     data << pHostileReference->getUnitGuid().WriteAsPacked();
     SendMessageToSet(&data, false);
@@ -10738,6 +13919,9 @@ struct StopAttackFactionHelper
 
 void Unit::StopAttackFaction(uint32 faction_id)
 {
+    if (!GetMap())
+        return;
+
     if (Unit* victim = getVictim())
     {
         if (victim->getFactionTemplateEntry()->faction==faction_id)
@@ -10752,16 +13936,20 @@ void Unit::StopAttackFaction(uint32 faction_id)
         }
     }
 
-    AttackerSet const& attackers = getAttackers();
-    for(AttackerSet::const_iterator itr = attackers.begin(); itr != attackers.end();)
+    GuidSet& attackers = GetMap()->GetAttackersFor(GetObjectGuid());
+
+    for (GuidSet::iterator itr = attackers.begin(); itr != attackers.end();)
     {
-        if ((*itr)->getFactionTemplateEntry()->faction==faction_id)
+        ObjectGuid guid = *itr++;
+        Unit* attacker = GetMap()->GetUnit(guid);
+
+        if (attacker && attacker->IsInWorld())
         {
-            (*itr)->AttackStop();
-            itr = attackers.begin();
+            if (attacker->getFactionTemplateEntry()->faction == faction_id)
+                attacker->AttackStop();
         }
         else
-            ++itr;
+            GetMap()->RemoveAttackerFor(GetObjectGuid(),guid);
     }
 
     getHostileRefManager().deleteReferencesForFaction(faction_id);
@@ -10788,43 +13976,90 @@ bool Unit::IsIgnoreUnitState(SpellEntry const *spell, IgnoreUnitState ignoreStat
     return false;
 }
 
-void Unit::CleanupDeletedAuras()
+void Unit::CleanupDeletedHolders(bool force)
 {
-    for (SpellAuraHolderList::const_iterator iter = m_deletedHolders.begin(); iter != m_deletedHolders.end(); ++iter)
-        delete *iter;
-    m_deletedHolders.clear();
+    if (m_deletedHolders.empty())
+        return;
 
-    // really delete auras "deleted" while processing its ApplyModify code
-    for(AuraList::const_iterator itr = m_deletedAuras.begin(); itr != m_deletedAuras.end(); ++itr)
-        delete *itr;
-    m_deletedAuras.clear();
+    while (!m_deletedHolders.empty())
+    {
+        if (m_deletedHolders.front())
+        {
+            m_deletedHolders.front()->CleanupsBeforeDelete();
+        }
+        m_deletedHolders.pop();
+    }
 }
 
-bool Unit::CheckAndIncreaseCastCounter()
+bool Unit::AddSpellAuraHolderToRemoveList(SpellAuraHolderPtr holder)
 {
-    uint32 maxCasts = sWorld.getConfig(CONFIG_UINT32_MAX_SPELL_CASTS_IN_CHAIN);
+    if (!holder || holder->IsDeleted())
+        return false;
+
+    holder->SetDeleted();
+    m_deletedHolders.push(holder);
+    return true;
+};
 
-    if (maxCasts && m_castCounter >= maxCasts)
+bool Unit::CheckAndIncreaseCastCounter()
+{
+    if ((sWorld.getConfig(CONFIG_UINT32_MAX_SPELL_CASTS_IN_CHAIN) > 0)  && (m_castCounter >= sWorld.getConfig(CONFIG_UINT32_MAX_SPELL_CASTS_IN_CHAIN)))
         return false;
 
     ++m_castCounter;
     return true;
 }
 
-SpellAuraHolder* Unit::GetSpellAuraHolder (uint32 spellid) const
+SpellAuraHolderPtr Unit::GetSpellAuraHolder (uint32 spellid) const
 {
     SpellAuraHolderMap::const_iterator itr = m_spellAuraHolders.find(spellid);
-    return itr != m_spellAuraHolders.end() ? itr->second : NULL;
+    return itr != m_spellAuraHolders.end() ? itr->second : SpellAuraHolderPtr(NULL);
 }
 
-SpellAuraHolder* Unit::GetSpellAuraHolder (uint32 spellid, ObjectGuid casterGuid) const
+SpellAuraHolderPtr Unit::GetSpellAuraHolder (uint32 spellid, ObjectGuid casterGuid) const
 {
     SpellAuraHolderConstBounds bounds = GetSpellAuraHolderBounds(spellid);
+    MAPLOCK_READ(const_cast<Unit*>(this), MAP_LOCK_TYPE_AURAS);
     for (SpellAuraHolderMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
         if (iter->second->GetCasterGuid() == casterGuid)
             return iter->second;
 
-    return NULL;
+    return SpellAuraHolderPtr(NULL);
+}
+
+void Unit::RemoveUnitFromHostileRefManager(Unit* pUnit)
+{
+    getHostileRefManager().deleteReference(pUnit);
+}
+
+SpellAuraHolderPtr Unit::_AddAura(uint32 spellID, uint32 duration, Unit* caster)
+{
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry( spellID );
+
+    if (spellInfo)
+    {
+        if (IsSpellAppliesAura(spellInfo, (1 << EFFECT_INDEX_0) | (1 << EFFECT_INDEX_1) | (1 << EFFECT_INDEX_2)) || IsSpellHaveEffect(spellInfo, SPELL_EFFECT_PERSISTENT_AREA_AURA))
+        {
+            SpellAuraHolderPtr holder = CreateSpellAuraHolder(spellInfo, this, caster ? caster : this);
+
+            for (uint8 i = 0; i < MAX_EFFECT_INDEX; ++i)
+            {
+                if (spellInfo->Effect[i] >= TOTAL_SPELL_EFFECTS)
+                    continue;
+                if ( IsAreaAuraEffect(spellInfo->Effect[i])           ||
+                    spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA  ||
+                    spellInfo->Effect[i] == SPELL_EFFECT_PERSISTENT_AREA_AURA )
+                {
+                    holder->CreateAura(spellInfo, SpellEffectIndex(i), NULL, holder, this, caster, NULL);
+                    holder->SetAuraDuration(duration);
+                    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Manually adding aura of spell %u, index %u, duration %u ms", spellID, i, duration);
+                }
+            }
+            AddSpellAuraHolder(holder);
+            return holder;
+        }
+    }
+    return SpellAuraHolderPtr(NULL);
 }
 
 bool Unit::IsAllowedDamageInArea(Unit* pVictim) const
@@ -10853,64 +14088,24 @@ bool Unit::IsAllowedDamageInArea(Unit* pVictim) const
 
     // can't damage player controlled unit by player controlled unit in sanctuary
     AreaTableEntry const* area = GetAreaEntryByAreaID(pVictim->GetAreaId());
-    if (area && area->flags & AREA_FLAG_SANCTUARY)
+    if (area && (area->flags & AREA_FLAG_SANCTUARY))
         return false;
 
     return true;
 }
 
-class RelocationNotifyEvent : public BasicEvent
-{
-public:
-    RelocationNotifyEvent(Unit& owner) : BasicEvent(), m_owner(owner)
-    {
-        m_owner._SetAINotifyScheduled(true);
-    }
-
-    bool Execute(uint64 /*e_time*/, uint32 /*p_time*/)
-    {
-        float radius = MAX_CREATURE_ATTACK_RADIUS * sWorld.getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO);
-        if (m_owner.GetTypeId() == TYPEID_PLAYER)
-        {
-            MaNGOS::PlayerRelocationNotifier notify((Player&)m_owner);
-            Cell::VisitAllObjects(&m_owner,notify,radius);
-        }
-        else //if(m_owner.GetTypeId() == TYPEID_UNIT)
-        {
-            MaNGOS::CreatureRelocationNotifier notify((Creature&)m_owner);
-            Cell::VisitAllObjects(&m_owner,notify,radius);
-        }
-        m_owner._SetAINotifyScheduled(false);
-        return true;
-    }
-
-    void Abort(uint64)
-    {
-        m_owner._SetAINotifyScheduled(false);
-    }
-
-private:
-    Unit& m_owner;
-};
-
 void Unit::ScheduleAINotify(uint32 delay)
 {
     if (!IsAINotifyScheduled())
-        m_Events.AddEvent(new RelocationNotifyEvent(*this), m_Events.CalculateTime(delay));
+        AddEvent(new RelocationNotifyEvent(*this), delay);
 }
 
 void Unit::OnRelocated()
 {
-    // switch to use G3D::Vector3 is good idea, maybe
-    float dx = m_last_notified_position.x - GetPositionX();
-    float dy = m_last_notified_position.y - GetPositionY();
-    float dz = m_last_notified_position.z - GetPositionZ();
-    float distsq = dx*dx+dy*dy+dz*dz;
-    if (distsq > World::GetRelocationLowerLimitSq())
+    float dist = GetDistance(m_last_notified_position);
+    if (dist > World::GetRelocationLowerLimit())
     {
-        m_last_notified_position.x = GetPositionX();
-        m_last_notified_position.y = GetPositionY();
-        m_last_notified_position.z = GetPositionZ();
+        m_last_notified_position = GetPosition();
 
         GetViewPoint().Call_UpdateVisibilityForOwner();
         UpdateObjectVisibility();
@@ -10918,38 +14113,270 @@ void Unit::OnRelocated()
     ScheduleAINotify(World::GetRelocationAINotifyDelay());
 }
 
-void Unit::SetVehicleId(uint32 entry)
+ObjectGuid const& Unit::GetCreatorGuid() const
 {
-    delete m_vehicleInfo;
+    switch(GetObjectGuid().GetHigh())
+    {
+        case HIGHGUID_VEHICLE:
+            {
+                if (!IsVehicle())
+                    return ObjectGuid::Null;
+
+                if (!(const_cast<Unit*>(this)->GetVehicleInfo()->m_flags & (VEHICLE_FLAG_NOT_DISMISS | VEHICLE_FLAG_ACCESSORY)))
+                    if (GetOwner())
+                        return GetOwner()->GetObjectGuid();
+            }
+        // No break here!
+        case HIGHGUID_UNIT:
+            if (((Creature*)this)->IsTemporarySummon())
+            {
+                return ((TemporarySummon*)this)->GetSummonerGuid();
+            }
+            else
+                return ObjectGuid::Null;
+
+        case HIGHGUID_PET:
+            return GetGuidValue(UNIT_FIELD_CREATEDBY);
+
+        case HIGHGUID_PLAYER:
+            return ObjectGuid::Null;
+
+        default:
+            return ObjectGuid::Null;
+    }
+}
 
+void Unit::SetVehicleId(uint32 entry)
+{
     if (entry)
     {
         VehicleEntry const* ventry = sVehicleStore.LookupEntry(entry);
         MANGOS_ASSERT(ventry != NULL);
 
-        m_vehicleInfo = new VehicleInfo(ventry);
         m_updateFlag |= UPDATEFLAG_VEHICLE;
+
+        m_pVehicleKit = VehicleKitPtr(new VehicleKit(this, ventry));
     }
     else
-    {
-        m_vehicleInfo = NULL;
-        m_updateFlag &= ~UPDATEFLAG_VEHICLE;
-    }
+        RemoveVehicleKit();
 
     if (GetTypeId() == TYPEID_PLAYER)
     {
-        WorldPacket data(SMSG_SET_VEHICLE_REC_ID, 16);
+        WorldPacket data(SMSG_SET_VEHICLE_REC_ID, GetPackGUID().size() + 4);
         data << GetPackGUID();
         data << uint32(entry);
         SendMessageToSet(&data, true);
+
+        if (entry)
+        {
+            WorldPacket data(SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA);
+            ((Player*)this)->GetSession()->SendPacket(&data);
+        }
+    }
+}
+
+VehicleEntry const* Unit::GetVehicleInfo() const
+{
+    return GetVehicleKit() ? GetVehicleKit()->GetEntry() : NULL;
+}
+
+uint32 Unit::CalculateAuraPeriodicTimeWithHaste(SpellEntry const* spellProto, uint32 oldPeriodicTime)
+{
+    if (!spellProto || oldPeriodicTime == 0)
+        return 0;
+
+    bool applyHaste = spellProto->HasAttribute(SPELL_ATTR_EX5_AFFECTED_BY_HASTE);
+
+    if (!applyHaste)
+    {
+        Unit::AuraList const& mModByHaste = GetAurasByType(SPELL_AURA_MOD_PERIODIC_HASTE);
+        for (Unit::AuraList::const_iterator itr = mModByHaste.begin(); itr != mModByHaste.end(); ++itr)
+        {
+            if ((*itr)->isAffectedOnSpell(spellProto))
+            {
+                applyHaste = true;
+                break;
+            }
+        }
+    }
+
+    if (!applyHaste)
+        return oldPeriodicTime;
+
+    uint32 _periodicTime = ceil(float(oldPeriodicTime) * GetFloatValue(UNIT_MOD_CAST_SPEED));
+
+    return _periodicTime;
+}
+
+uint32 Unit::CalculateSpellDurationWithHaste(SpellEntry const* spellProto, uint32 oldduration)
+{
+    if (!spellProto || oldduration == 0)
+        return 0;
+
+    bool applyHaste = spellProto->HasAttribute(SPELL_ATTR_EX5_AFFECTED_BY_HASTE);
+
+    if (!applyHaste)
+    {
+        Unit::AuraList const& mModByHaste = GetAurasByType(SPELL_AURA_MOD_PERIODIC_HASTE);
+        for (Unit::AuraList::const_iterator itr = mModByHaste.begin(); itr != mModByHaste.end(); ++itr)
+        {
+            if ((*itr)->isAffectedOnSpell(spellProto))
+            {
+                applyHaste = true;
+                break;
+            }
+        }
+    }
+
+    if (!applyHaste)
+        return oldduration;
+
+    // Apply haste to duration
+
+    uint32 duration = ceil(float(oldduration) * GetFloatValue(UNIT_MOD_CAST_SPEED));
+
+    return duration;
+}
+
+bool Unit::IsVisibleTargetForSpell(WorldObject const* caster, SpellEntry const* spellInfo, WorldLocation const* location) const
+{
+    bool no_stealth = false;
+    switch (spellInfo->SpellFamilyName)
+    {
+        case SPELLFAMILY_DRUID:
+        {
+            // Starfall (AoE dummy)
+            if (spellInfo->GetSpellFamilyFlags().test<CF_DRUID_STARFALL2>())
+                no_stealth = true;
+            break;
+        }
+        default:
+            break;
+    }
+
+    // spell can hit all targets in some cases:
+    if (!VMAP::VMapFactory::checkSpellForLoS(spellInfo->Id))
+        return true;
+
+    if (spellInfo->HasAttribute(SPELL_ATTR_EX6_IGNORE_DETECTION))
+        return true;
+
+    // some totem spells must ignore LOS, only visibility/detect checks applied
+    if (caster->GetTypeId() == TYPEID_UNIT && ((Creature*)caster)->IsTotem())
+        return isVisibleForOrDetect(static_cast<Unit const*>(caster), caster, true, false, true);
+
+    // spell can't hit stealth/invisible targets
+    if (no_stealth && caster->isType(TYPEMASK_UNIT) && !isVisibleForOrDetect(static_cast<Unit const*>(caster), caster, false, false, true, true))
+        return false;
+
+    if (spellInfo->HasAttribute(SPELL_ATTR_EX2_IGNORE_LOS))
+        return true;
+
+    if (location && location->HasMap()) // check only for fully initialized WorldLocation
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Unit::IsVisibleTargetForSpell check LOS for spell %u, caster %s, location %f %f %f, target %s",
+            spellInfo->Id, caster->GetObjectGuid().GetString().c_str(), location->x, location->y, location->z, GetObjectGuid().GetString().c_str());
+        return ((GetMapId() == location->GetMapId()) && IsWithinLOS(location->x, location->y, location->z));
+    }
+    else
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Unit::IsVisibleTargetForSpell check LOS for spell %u, caster %s, target %s",
+            spellInfo->Id, caster->GetObjectGuid().GetString().c_str(), GetObjectGuid().GetString().c_str());
+        return IsWithinLOSInMap(caster);
     }
 }
 
+uint32 Unit::GetModelForForm(SpellShapeshiftFormEntry const* ssEntry) const
+{
+    // i will asume that creatures will always take the defined model from the dbc
+    // since no field in creature_templates describes wether an alliance or
+    // horde modelid should be used at shapeshifting
+    return ssEntry->modelID_A;
+}
+
+uint32 Unit::GetModelForForm() const
+{
+    ShapeshiftForm form = GetShapeshiftForm();
+    SpellShapeshiftFormEntry const* ssEntry = sSpellShapeshiftFormStore.LookupEntry(form);
+    return ssEntry ? GetModelForForm(ssEntry) : 0;
+}
+
+bool Unit::IsCombatStationary()
+{
+    return isInCombat() && !IsInUnitState(UNIT_ACTION_CHASE);
+}
+
+bool Unit::HasMorePoweredBuff(uint32 spellId)
+{
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
+
+    if (!spellInfo || !spellInfo->HasAttribute(SPELL_ATTR_EX7_REPLACEABLE_AURA))
+        return false;
+
+    for (uint8 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        if ( spellInfo->Effect[i] != SPELL_EFFECT_APPLY_AURA  &&
+             spellInfo->Effect[i] != SPELL_EFFECT_APPLY_AREA_AURA_PARTY &&
+             spellInfo->Effect[i] != SPELL_EFFECT_APPLY_AREA_AURA_RAID
+            )
+            continue;
+
+        MAPLOCK_READ(this,MAP_LOCK_TYPE_AURAS);
+
+        AuraType auraType = AuraType(spellInfo->EffectApplyAuraName[SpellEffectIndex(i)]);
+
+        if (!auraType || auraType >= TOTAL_AURAS)
+            continue;
+
+        SpellAuraHolderMap const& holders = GetSpellAuraHolderMap();
+        for (SpellAuraHolderMap::const_iterator itr = holders.begin(); itr != holders.end(); ++itr)
+        {
+            if (!itr->second || itr->second->IsDeleted())
+                continue;
+
+            uint32 foundSpellId = itr->first;
+
+            if (!foundSpellId || foundSpellId == spellId)
+                continue;
+
+            SpellEntry const* foundSpellInfo = sSpellStore.LookupEntry(foundSpellId);;
+
+            if (!foundSpellInfo)
+                continue;
+
+            if (!foundSpellInfo->HasAttribute(SPELL_ATTR_EX7_REPLACEABLE_AURA))
+                continue;
+
+            for (uint8 j = 0; j < MAX_EFFECT_INDEX; ++j)
+            {
+                if ( foundSpellInfo->Effect[j] != SPELL_EFFECT_APPLY_AURA  &&
+                     foundSpellInfo->Effect[j] != SPELL_EFFECT_APPLY_AREA_AURA_PARTY &&
+                     foundSpellInfo->Effect[j] != SPELL_EFFECT_APPLY_AREA_AURA_RAID
+                    )
+                    continue;
+
+                if (foundSpellInfo->Effect[j] != spellInfo->Effect[i])
+                    continue;
+
+                if (foundSpellInfo->EffectApplyAuraName[j] != spellInfo->EffectApplyAuraName[i])
+                    continue;
+
+                if (foundSpellInfo->EffectMiscValue[j] != spellInfo->EffectMiscValue[i])
+                    continue;
+
+                if (spellInfo->CalculateSimpleValue(SpellEffectIndex(i)) < foundSpellInfo->CalculateSimpleValue(SpellEffectIndex(j)))
+                    return true;
+                else
+                    return false;
+            }
+        }
+    }
+
+    return false;
+}
+
 void Unit::UpdateSplineMovement(uint32 t_diff)
 {
-    enum{
-        POSITION_UPDATE_DELAY = 400,
-    };
 
     if (movespline->Finalized())
         return;
@@ -10963,13 +14390,17 @@ void Unit::UpdateSplineMovement(uint32 t_diff)
     m_movesplineTimer.Update(t_diff);
     if (m_movesplineTimer.Passed() || arrived)
     {
-        m_movesplineTimer.Reset(POSITION_UPDATE_DELAY);
-        Movement::Location loc = movespline->ComputePosition();
+        m_movesplineTimer.Reset(sWorld.getConfig(CONFIG_UINT32_POSITION_UPDATE_DELAY));
+        Position pos = movespline->ComputePosition();
+        pos.SetPhaseMask(GetPhaseMask());
 
-        if (GetTypeId() == TYPEID_PLAYER)
-            ((Player*)this)->SetPosition(loc.x,loc.y,loc.z,loc.orientation);
+        if (IsBoarded())
+        {
+            m_movementInfo.ChangeTransportPosition(pos);
+            GetTransportInfo()->SetLocalPosition(pos);
+        }
         else
-            GetMap()->CreatureRelocation((Creature*)this,loc.x,loc.y,loc.z,loc.orientation);
+            SetPosition(pos);
     }
 }
 
@@ -10978,3 +14409,341 @@ void Unit::DisableSpline()
     m_movementInfo.RemoveMovementFlag(MovementFlags(MOVEFLAG_SPLINE_ENABLED|MOVEFLAG_FORWARD));
     movespline->_Interrupt();
 }
+
+uint32 Unit::GetResistance(SpellSchoolMask schoolMask) const
+{
+    int32 resistance = 0;
+
+    for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
+    {
+        if (schoolMask & (1 << i))
+        {
+            int32 schoolRes = (GetObjectGuid().IsPlayer() || (GetObjectGuid().IsPet() && GetOwner() && GetOwner()->GetObjectGuid().IsPlayer())) ?
+                              GetResistance(SpellSchools(i)) :
+                              floor(GetResistanceBuffMods(SpellSchools(i), true) + GetResistanceBuffMods(SpellSchools(i), false));
+            if (resistance < schoolRes)
+                resistance = schoolRes;
+            // Use maximal resistance from mask (not lower then 0)
+        }
+    }
+    return (resistance >= 0) ? (uint32)resistance : 0;
+}
+
+void Unit::SendSpellDamageResist(Unit* target, uint32 spellId)
+{
+    if (!target)
+        return;
+
+    WorldPacket data(SMSG_PROCRESIST, 8+8+4+1);
+    data << GetObjectGuid();
+    data << target->GetObjectGuid();
+    data << spellId;
+    data << uint8(0);                 // bool - log format: 0-default, 1-debug
+    SendMessageToSet(&data, true);
+}
+
+void Unit::SendSpellDamageImmune(Unit* target, uint32 spellId)
+{
+    if (!target)
+        return;
+
+    WorldPacket data(SMSG_SPELLORDAMAGE_IMMUNE, 8+8+4+1);
+    data << GetObjectGuid();
+    data << target->GetObjectGuid();
+    data << uint32(spellId);
+    data << uint8(0);                 // bool - log format: 0-default, 1-debug
+    SendMessageToSet(&data, true);
+}
+
+void DamageInfo::Reset(uint32 _damage)
+{
+    if (SpellID > 0)
+        m_spellInfo = sSpellStore.LookupEntry(SpellID);
+    else if (m_spellInfo)
+        SpellID = m_spellInfo->Id;
+    else
+    {
+        m_spellInfo = NULL;
+        SpellID = 0;
+    }
+
+    damage        = _damage;
+    baseDamage    = _damage;
+    cleanDamage   = 0;
+    absorb        = 0;
+    resist        = 0;
+    blocked       = 0;
+    reduction     = 0;
+    bonusDone     = 0;
+    bonusCrit     = 0;
+    bonusTaken    = 0;
+    rage          = 0;
+    m_flags       = 0;
+    durabilityLoss= true;
+    unused        = false;
+    HitInfo       = HITINFO_NORMALSWING;
+    TargetState   = VICTIMSTATE_UNAFFECTED;
+    procAttacker  = PROC_FLAG_NONE;
+    procVictim    = PROC_FLAG_NONE;
+    procEx        = PROC_EX_NONE;
+    damageType    = GetSpellProto() ? SPELL_DIRECT_DAMAGE : DIRECT_DAMAGE;  // must be corrected after!
+    physicalLog   = IsMeleeDamage();
+    hitOutCome    = IsMeleeDamage() ? MELEE_HIT_EVADE : MELEE_HIT_NORMAL;
+    attackType    = GetWeaponAttackType(GetSpellProto());
+}
+
+SpellSchoolMask DamageInfo::GetSchoolMask() const
+{
+    return GetSpellProto() ?
+        GetSpellProto()->GetSchoolMask() :
+        attacker && attacker->GetMeleeDamageSchoolMask() ? attacker->GetMeleeDamageSchoolMask() : SPELL_SCHOOL_MASK_NORMAL;
+}
+
+uint32 DamageInfo::AddAbsorb(uint32 addvalue)
+{
+    uint32 realabsorb = addvalue;
+    if (damage < realabsorb)
+        realabsorb = damage;
+    absorb += realabsorb;
+    damage -= realabsorb;
+    return realabsorb - addvalue;
+}
+void DamageInfo::AddPctAbsorb(float aborbPct)
+{
+    uint32 realabsorb = damage * aborbPct/100.0f;
+    AddAbsorb(realabsorb);
+}
+
+void Unit::SetLastManaUse()
+{
+    if (GetTypeId() == TYPEID_PLAYER &&
+        !IsUnderLastManaUseEffect() &&
+        HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER))
+        RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER);
+
+    uint32 lastRegenInterval = IsUnderLastManaUseEffect() ? REGEN_TIME_PRECISE : REGEN_TIME_FULL;
+
+    m_lastManaUseTimer = 5000;
+
+    // Do first interrupted powers regen (not only PRECIZE interval), also set player mana regenerate interval to PRECIZE
+    if (GetTypeId() == TYPEID_PLAYER)
+    {
+        int32 diff = lastRegenInterval - ((Player*)this)->GetRegenTimer();
+        if (diff > 0)
+            ((Player*)this)->RegenerateAll(diff);
+    }
+}
+
+void Unit::AddSpellCooldown(uint32 spellid, uint32 itemid, time_t end_time)
+{
+    SpellCooldown sc;
+    sc.end = end_time;
+    sc.itemid = itemid;
+    MAPLOCK_WRITE(this, MAP_LOCK_TYPE_DEFAULT);
+    m_spellCooldowns[spellid] = sc;
+}
+
+void Unit::RemoveSpellCooldown(uint32 spell_id, bool update /* = false */)
+{
+    MAPLOCK_WRITE(this, MAP_LOCK_TYPE_DEFAULT);
+    m_spellCooldowns.erase(spell_id);
+
+    if (update && GetTypeId() == TYPEID_PLAYER)
+        ((Player*)this)->SendClearCooldown(spell_id, this);
+}
+
+void Unit::RemoveAllSpellCooldown()
+{
+    if (!m_spellCooldowns.empty())
+    {
+        if (GetTypeId() == TYPEID_PLAYER)
+        {
+            for (SpellCooldowns::const_iterator itr = m_spellCooldowns.begin();itr != m_spellCooldowns.end(); ++itr)
+                ((Player*)this)->SendClearCooldown(itr->first, this);
+        }
+        else if (Player* pOwner = GetSpellModOwner())
+        {
+            for (SpellCooldowns::const_iterator itr = m_spellCooldowns.begin();itr != m_spellCooldowns.end(); ++itr)
+                pOwner->SendClearCooldown(itr->first, this);
+        }
+
+
+        MAPLOCK_WRITE(this, MAP_LOCK_TYPE_DEFAULT);
+        m_spellCooldowns.clear();
+    }
+}
+
+void Unit::RemoveSpellCategoryCooldown(uint32 cat, bool update /* = false */)
+{
+    if (m_spellCooldowns.empty())
+        return;
+
+    SpellCategoryStore::const_iterator ct = sSpellCategoryStore.find(cat);
+    if (ct == sSpellCategoryStore.end())
+        return;
+
+    const SpellCategorySet& ct_set = ct->second;
+    SpellCategorySet current_set;
+    SpellCategorySet intersection_set;
+    {
+        MAPLOCK_READ(this, MAP_LOCK_TYPE_DEFAULT);
+        std::transform(m_spellCooldowns.begin(), m_spellCooldowns.end(), std::inserter(current_set, current_set.begin()), select1st<SpellCooldowns::value_type>());
+    }
+
+    std::set_intersection(ct_set.begin(),ct_set.end(), current_set.begin(),current_set.end(),std::inserter(intersection_set,intersection_set.begin()));
+
+    if (intersection_set.empty())
+        return;
+
+    for (SpellCategorySet::const_iterator itr = intersection_set.begin(); itr != intersection_set.end(); ++itr)
+        RemoveSpellCooldown(*itr, update);
+}
+
+void Unit::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 itemId /*= 0*/, bool infinityCooldown  /*= false*/)
+{
+    // init cooldown values
+    uint32 category   = 0;
+    int32 cooldown    = -1;
+    int32 categorycooldown = -1;
+
+    // some special item spells without correct cooldown in SpellInfo
+    // cooldown information stored in item prototype
+    // This used in same way in WorldSession::HandleItemQuerySingleOpcode data sending to client.
+
+    if (itemId)
+    {
+        if (ItemPrototype const* proto = ObjectMgr::GetItemPrototype(itemId))
+        {
+            for (int idx = 0; idx < MAX_ITEM_PROTO_SPELLS; ++idx)
+            {
+                if (proto->Spells[idx].SpellId == spellInfo->Id)
+                {
+                    category    = proto->Spells[idx].SpellCategory;
+                    cooldown    = proto->Spells[idx].SpellCooldown;
+                    categorycooldown = proto->Spells[idx].SpellCategoryCooldown;
+                    break;
+                }
+            }
+        }
+    }
+
+    // if no cooldown found above then base at DBC data
+    if (cooldown < 0 && categorycooldown < 0)
+    {
+        category = spellInfo->Category;
+        cooldown = spellInfo->RecoveryTime;
+        categorycooldown = spellInfo->CategoryRecoveryTime;
+    }
+
+    time_t curTime = time(NULL);
+
+    time_t catrecTime;
+    time_t recTime;
+
+    // overwrite time for selected category
+    if (infinityCooldown)
+    {
+        // use +MONTH as infinity mark for spell cooldown (will checked as MONTH/2 at save ans skipped)
+        // but not allow ignore until reset or re-login
+        catrecTime = categorycooldown > 0 ? curTime+infinityCooldownDelay : 0;
+        recTime    = cooldown    > 0 ? curTime+infinityCooldownDelay : catrecTime;
+    }
+    else
+    {
+        // shoot spells used equipped item cooldown values already assigned in GetAttackTime(RANGED_ATTACK)
+        // prevent 0 cooldowns set by another way
+        if (cooldown <= 0 && categorycooldown <= 0 && (category == 76 || (IsAutoRepeatRangedSpell(spellInfo) && spellInfo->Id != SPELL_ID_AUTOSHOT)))
+            cooldown = GetAttackTime(RANGED_ATTACK);
+
+        // Now we have cooldown data (if found any), time to apply mods if we are a player, or a pet from player
+        if (Player* modOwner = GetSpellModOwner())
+        {
+            if (cooldown > 0)
+                modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_COOLDOWN, cooldown);
+
+            if (categorycooldown > 0)
+                modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_COOLDOWN, categorycooldown);
+        }
+        else if (GetTypeId() == TYPEID_PLAYER)
+        {
+            if (cooldown > 0)
+                ((Player*)this)->ApplySpellMod(spellInfo->Id, SPELLMOD_COOLDOWN, cooldown);
+
+            if (categorycooldown > 0)
+                ((Player*)this)->ApplySpellMod(spellInfo->Id, SPELLMOD_COOLDOWN, categorycooldown);
+        }
+
+        // replace negative cooldowns by 0
+        if (cooldown < 0) cooldown = 0;
+        if (categorycooldown < 0) categorycooldown = 0;
+
+        // no cooldown after applying spell mods
+        if (cooldown == 0 && categorycooldown == 0)
+            return;
+
+        catrecTime = categorycooldown ? curTime+categorycooldown/IN_MILLISECONDS : 0;
+        recTime    = cooldown ? curTime+cooldown/IN_MILLISECONDS : catrecTime;
+    }
+
+    // self spell cooldown
+    if (recTime > 0)
+        AddSpellCooldown(spellInfo->Id, itemId, recTime);
+
+    // category spells
+    if (category && categorycooldown > 0)
+    {
+        SpellCategoryStore::const_iterator i_scstore = sSpellCategoryStore.find(category);
+        if (i_scstore != sSpellCategoryStore.end())
+        {
+            for (SpellCategorySet::const_iterator i_scset = i_scstore->second.begin(); i_scset != i_scstore->second.end(); ++i_scset)
+            {
+                if (*i_scset == spellInfo->Id)              // skip main spell, already handled above
+                    continue;
+
+                AddSpellCooldown(*i_scset, itemId, catrecTime);
+            }
+        }
+    }
+}
+
+bool Unit::HasSpellCooldown(SpellEntry const* spellInfo) const
+{
+    SpellCooldowns::const_iterator itr = m_spellCooldowns.find(spellInfo->Id);
+    return itr != m_spellCooldowns.end() && itr->second.end > time(NULL);
+}
+
+bool Unit::HasSpellCooldown(uint32 spellId) const
+{
+    SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
+    return HasSpellCooldown(spellInfo);
+}
+
+time_t Unit::GetSpellCooldownDelay(SpellEntry const* spellInfo) const
+{
+    SpellCooldowns::const_iterator itr = m_spellCooldowns.find(spellInfo->Id);
+    time_t t = time(NULL);
+    return itr != m_spellCooldowns.end() && itr->second.end > t ? itr->second.end - t : 0;
+}
+
+void Unit::RemoveOutdatedSpellCooldowns()
+{
+    // remove oudated
+    time_t curTime = time(NULL);
+    SpellCooldowns const* cm = GetSpellCooldownMap();
+    SpellCooldowns::const_iterator itr, next;
+    for( itr = cm->begin();itr != cm->end(); itr = next)
+    {
+        next = itr;
+        ++next;
+        if (itr->second.end <= curTime)
+        {
+            RemoveSpellCooldown(itr->first);
+        }
+    }
+}
+
+void Unit::KillSelf(uint32 keepHealthPoints/*=0*/)
+{
+    DealDamage(this, keepHealthPoints ? GetHealth() - keepHealthPoints : GetHealth(),
+        NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+}
diff --git a/src/game/Unit.h b/src/game/Unit.h
index 313f5cb2547..3cc0a5f2c19 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -29,13 +29,15 @@
 #include "HostileRefManager.h"
 #include "FollowerReference.h"
 #include "FollowerRefManager.h"
-#include "Utilities/EventProcessor.h"
+#include "MapManager.h"
 #include "MotionMaster.h"
 #include "DBCStructure.h"
 #include "Path.h"
 #include "WorldPacket.h"
+#include "SpellAuras.h"
 #include "Timer.h"
 #include <list>
+#include "StateMgr.h"
 
 enum SpellInterruptFlags
 {
@@ -58,9 +60,9 @@ enum SpellChannelInterruptFlags
 
 enum SpellAuraInterruptFlags
 {
-    AURA_INTERRUPT_FLAG_UNK0                        = 0x00000001,   // 0    removed when getting hit by a negative spell?
-    AURA_INTERRUPT_FLAG_DAMAGE                      = 0x00000002,   // 1    removed by any damage
-    AURA_INTERRUPT_FLAG_UNK2                        = 0x00000004,   // 2
+    AURA_INTERRUPT_FLAG_SPELLHIT                    = 0x00000001,   // 0    removed when getting hit by a negative spell?
+    AURA_INTERRUPT_FLAG_DAMAGE                      = 0x00000002,   // 1    removed by take any damage
+    AURA_INTERRUPT_FLAG_CAST                        = 0x00000004,   // 2    removed by cast any spell
     AURA_INTERRUPT_FLAG_MOVE                        = 0x00000008,   // 3    removed by any movement
     AURA_INTERRUPT_FLAG_TURNING                     = 0x00000010,   // 4    removed by any turning
     AURA_INTERRUPT_FLAG_ENTER_COMBAT                = 0x00000020,   // 5    removed by entering combat
@@ -68,21 +70,22 @@ enum SpellAuraInterruptFlags
     AURA_INTERRUPT_FLAG_NOT_ABOVEWATER              = 0x00000080,   // 7    removed by entering water
     AURA_INTERRUPT_FLAG_NOT_UNDERWATER              = 0x00000100,   // 8    removed by leaving water
     AURA_INTERRUPT_FLAG_NOT_SHEATHED                = 0x00000200,   // 9    removed by unsheathing
-    AURA_INTERRUPT_FLAG_UNK10                       = 0x00000400,   // 10
-    AURA_INTERRUPT_FLAG_UNK11                       = 0x00000800,   // 11
-    AURA_INTERRUPT_FLAG_UNK12                       = 0x00001000,   // 12   removed by attack?
-    AURA_INTERRUPT_FLAG_UNK13                       = 0x00002000,   // 13
+    AURA_INTERRUPT_FLAG_ACTION                      = 0x00000400,   // 10   removed by any action (talk/loot/gossip)
+    AURA_INTERRUPT_FLAG_USE                         = 0x00000800,   // 11   removed by use (or casting open spell)
+    AURA_INTERRUPT_FLAG_MELEE_ATTACK                = 0x00001000,   // 12   removed by melee attack?
+    AURA_INTERRUPT_FLAG_SPELL_ATTACK                = 0x00002000,   // 13   removed by spell attack?
     AURA_INTERRUPT_FLAG_UNK14                       = 0x00004000,   // 14
-    AURA_INTERRUPT_FLAG_UNK15                       = 0x00008000,   // 15   removed by casting a spell?
+    AURA_INTERRUPT_FLAG_TRANSFORM                   = 0x00008000,   // 15   removed by casting a transform spell?
     AURA_INTERRUPT_FLAG_UNK16                       = 0x00010000,   // 16
     AURA_INTERRUPT_FLAG_MOUNTING                    = 0x00020000,   // 17   removed by mounting
     AURA_INTERRUPT_FLAG_NOT_SEATED                  = 0x00040000,   // 18   removed by standing up (used by food and drink mostly and sleep/Fake Death like)
     AURA_INTERRUPT_FLAG_CHANGE_MAP                  = 0x00080000,   // 19   leaving map/getting teleported
     AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION    = 0x00100000,   // 20   removed by auras that make you invulnerable, or make other to loose selection on you
     AURA_INTERRUPT_FLAG_UNK21                       = 0x00200000,   // 21
-    AURA_INTERRUPT_FLAG_UNK22                       = 0x00400000,   // 22
+    AURA_INTERRUPT_FLAG_TELEPORTED                  = 0x00400000,   // 22
     AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT            = 0x00800000,   // 23   removed by entering pvp combat
-    AURA_INTERRUPT_FLAG_DIRECT_DAMAGE               = 0x01000000    // 24   removed by any direct damage
+    AURA_INTERRUPT_FLAG_DIRECT_DAMAGE               = 0x01000000,   // 24   removed by any direct damage
+    AURA_INTERRUPT_FLAG_LANDING                     = 0x02000000,   // 25   removed by hitting the ground
 };
 
 enum SpellModOp
@@ -100,7 +103,7 @@ enum SpellModOp
     SPELLMOD_CASTING_TIME           = 10,
     SPELLMOD_COOLDOWN               = 11,
     SPELLMOD_EFFECT2                = 12,
-    // spellmod 13 unused
+    SPELLMOD_IGNORE_ARMOR           = 13,
     SPELLMOD_COST                   = 14,
     SPELLMOD_CRIT_DAMAGE_BONUS      = 15,
     SPELLMOD_RESIST_MISS_CHANCE     = 16,
@@ -115,7 +118,9 @@ enum SpellModOp
     // spellmod 25 unused
     SPELLMOD_FREQUENCY_OF_SUCCESS   = 26,                   // Only used with SPELL_AURA_ADD_PCT_MODIFIER and affects used on proc spells
     SPELLMOD_MULTIPLE_VALUE         = 27,
-    SPELLMOD_RESIST_DISPEL_CHANCE   = 28
+    SPELLMOD_RESIST_DISPEL_CHANCE   = 28,
+    SPELLMOD_UNK29                  = 29,                   // used by single test spell 45365
+    SPELLMOD_COST_ON_HIT_FAIL       = 30
 };
 
 #define MAX_SPELLMOD 32
@@ -125,6 +130,8 @@ enum SpellFacingFlags
     SPELL_FACING_FLAG_INFRONT = 0x0001
 };
 
+#define DEFAULT_COMBAT_REACH   1.5f
+
 #define BASE_MELEERANGE_OFFSET 1.33f
 #define BASE_MINDAMAGE 1.0f
 #define BASE_MAXDAMAGE 2.0f
@@ -152,21 +159,18 @@ enum UnitStandFlags
 {
     UNIT_STAND_FLAGS_UNK1         = 0x01,
     UNIT_STAND_FLAGS_CREEP        = 0x02,
-    UNIT_STAND_FLAGS_UNK3         = 0x04,
+    UNIT_STAND_FLAGS_UNTRACKABLE  = 0x04,
     UNIT_STAND_FLAGS_UNK4         = 0x08,
     UNIT_STAND_FLAGS_UNK5         = 0x10,
     UNIT_STAND_FLAGS_ALL          = 0xFF
 };
 
-// byte flags value (UNIT_FIELD_BYTES_1,2)
-// This corresponds to free talent points (pet case)
-
 // byte flags value (UNIT_FIELD_BYTES_1,3)
 enum UnitBytes1_Flags
 {
     UNIT_BYTE1_FLAG_ALWAYS_STAND = 0x01,
-    UNIT_BYTE1_FLAG_UNK_2        = 0x02,                    // Creature that can fly and are not on the ground appear to have this flag. If they are on the ground, flag is not present.
-    UNIT_BYTE1_FLAG_UNTRACKABLE  = 0x04,
+    UNIT_BYTE1_FLAG_HOVER        = 0x02,                    // Creature that can fly and are not on the ground appear to have this flag. If they are on the ground, flag is not present.
+    UNIT_BYTE1_FLAG_UNK_3        = 0x04,
     UNIT_BYTE1_FLAG_ALL          = 0xFF
 };
 
@@ -200,7 +204,7 @@ enum UnitRename
     UNIT_CAN_BE_ABANDONED   = 0x02,
 };
 
-#define CREATURE_MAX_SPELLS     4
+#define CREATURE_MAX_SPELLS     8
 
 enum Swing
 {
@@ -226,20 +230,20 @@ enum HitInfo
 {
     HITINFO_NORMALSWING         = 0x00000000,
     HITINFO_UNK0                = 0x00000001,               // req correct packet structure
-    HITINFO_NORMALSWING2        = 0x00000002,
-    HITINFO_LEFTSWING           = 0x00000004,
+    HITINFO_AFFECTS_VICTIM      = 0x00000002,
+    HITINFO_OFFHAND             = 0x00000004,
     HITINFO_UNK3                = 0x00000008,
     HITINFO_MISS                = 0x00000010,
-    HITINFO_ABSORB              = 0x00000020,               // absorbed damage
-    HITINFO_ABSORB2             = 0x00000040,               // absorbed damage
-    HITINFO_RESIST              = 0x00000080,               // resisted atleast some damage
-    HITINFO_RESIST2             = 0x00000100,               // resisted atleast some damage
+    HITINFO_ABSORB              = 0x00000020,               // absorbed
+    HITINFO_PARTIAL_ABSORB      = 0x00000040,               // absorbed at least some damage
+    HITINFO_RESIST              = 0x00000080,               // resisted
+    HITINFO_PARTIAL_RESIST      = 0x00000100,               // resisted at least some damage
     HITINFO_CRITICALHIT         = 0x00000200,               // critical hit
     // 0x00000400
     // 0x00000800
     // 0x00001000
     HITINFO_BLOCK               = 0x00002000,               // blocked damage
-    // 0x00004000
+    HITINFO_NODAMAGE            = 0x00004000,               // Hides worldtext for 0 damage
     // 0x00008000
     HITINFO_GLANCING            = 0x00010000,
     HITINFO_CRUSHING            = 0x00020000,
@@ -248,7 +252,7 @@ enum HitInfo
     // 0x00100000
     HITINFO_SWINGNOHITSOUND     = 0x00200000,               // guessed
     // 0x00400000
-    HITINFO_UNK22               = 0x00800000
+    HITINFO_RAGE_GAIN           = 0x00800000
 };
 
 //i would like to remove this: (it is defined in item.h
@@ -263,18 +267,19 @@ struct Modifier;
 struct SpellEntry;
 struct SpellEntryExt;
 
-class Aura;
-class SpellAuraHolder;
 class Creature;
 class Spell;
 class DynamicObject;
 class GameObject;
+class SpellCastTargets;
 class Item;
 class Pet;
 class PetAura;
 class Totem;
 class VehicleInfo;
 
+typedef int8 SeatId;
+
 struct SpellImmune
 {
     uint32 type;
@@ -289,7 +294,11 @@ enum UnitModifierType
     BASE_PCT = 1,
     TOTAL_VALUE = 2,
     TOTAL_PCT = 3,
-    MODIFIER_TYPE_END = 4
+    NONSTACKING_VALUE_POS = 4,
+    NONSTACKING_VALUE_NEG = 5,
+    NONSTACKING_PCT = 6,
+    NONSTACKING_PCT_MINOR = 7,
+    MODIFIER_TYPE_END = 8
 };
 
 enum WeaponDamageRange
@@ -305,19 +314,6 @@ enum DamageTypeToSchool
     DAMAGE_TAKEN
 };
 
-enum AuraRemoveMode
-{
-    AURA_REMOVE_BY_DEFAULT,
-    AURA_REMOVE_BY_STACK,                                   // at replace by similar aura
-    AURA_REMOVE_BY_CANCEL,
-    AURA_REMOVE_BY_DISPEL,
-    AURA_REMOVE_BY_DEATH,
-    AURA_REMOVE_BY_DELETE,                                  // use for speedup and prevent unexpected effects at player logout/pet unsummon (must be used _only_ after save), delete.
-    AURA_REMOVE_BY_SHIELD_BREAK,                            // when absorb shield is removed by damage, heal absorb debuf
-    AURA_REMOVE_BY_EXPIRE,                                  // at duration end
-
-};
-
 enum UnitMods
 {
     UNIT_MOD_STAT_STRENGTH,                                 // UNIT_MOD_STAT_STRENGTH..UNIT_MOD_STAT_SPIRIT must be in existing order, it's accessed by index values of Stats enum.
@@ -361,6 +357,7 @@ enum BaseModGroup
     RANGED_CRIT_PERCENTAGE,
     OFFHAND_CRIT_PERCENTAGE,
     SHIELD_BLOCK_VALUE,
+    NONSTACKING_CRIT_PERCENTAGE,
     BASEMOD_END
 };
 
@@ -379,6 +376,7 @@ enum DeathState
     CORPSE         = 2,                                     // corpse state, for player this also meaning that player not leave corpse
     DEAD           = 3,                                     // for creature despawned state (corpse despawned), for player CORPSE/DEAD not clear way switches (FIXME), and use m_deathtimer > 0 check for real corpse state
     JUST_ALIVED    = 4,                                     // temporary state at resurrection, for creature auto converted to ALIVE, for player at next update call
+    GHOULED        = 5
 };
 
 // internal state flags for some auras and movement generators, other.
@@ -410,25 +408,36 @@ enum UnitState
     UNIT_STAT_FOLLOW_MOVE     = 0x00010000,
     UNIT_STAT_FLEEING         = 0x00020000,                     // FleeMovementGenerator/TimedFleeingMovementGenerator active/onstack
     UNIT_STAT_FLEEING_MOVE    = 0x00040000,
-    UNIT_STAT_IGNORE_PATHFINDING    = 0x00080000,               // do not use pathfinding in any MovementGenerator
+
+    // custom MMGen (may be removed)
+    UNIT_STAT_ON_VEHICLE      = 0x00080000,                     // Unit is on vehicle
+
+    // More room for other MMGens
+
+    // High-Level states (usually only with Creatures)
+    UNIT_STAT_NO_COMBAT_MOVEMENT    = 0x01000000,           // Combat Movement for MoveChase stopped
+    UNIT_STAT_RUNNING               = 0x02000000,           // SetRun for waypoints and such
+    UNIT_STAT_WAYPOINT_PAUSED       = 0x04000000,           // Waypoint-Movement paused genericly (ie by script)
+    UNIT_STAT_DELAYED_EVADE         = 0x08000000,           // Creature in delayed evade event
+    UNIT_STAT_IGNORE_PATHFINDING    = 0x10000000,           // do not use pathfinding in any MovementGenerator
 
     // masks (only for check)
 
     // can't move currently
-    UNIT_STAT_CAN_NOT_MOVE    = UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DIED,
+    UNIT_STAT_CAN_NOT_MOVE    = UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DIED | UNIT_STAT_ON_VEHICLE,
 
     // stay by different reasons
     UNIT_STAT_NOT_MOVE        = UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DIED |
-                                UNIT_STAT_DISTRACTED,
+                                UNIT_STAT_DISTRACTED | UNIT_STAT_ON_VEHICLE,
 
     // stay or scripted movement for effect( = in player case you can't move by client command)
     UNIT_STAT_NO_FREE_MOVE    = UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DIED |
                                 UNIT_STAT_TAXI_FLIGHT |
-                                UNIT_STAT_CONFUSED | UNIT_STAT_FLEEING,
+                                UNIT_STAT_CONFUSED | UNIT_STAT_FLEEING | UNIT_STAT_ON_VEHICLE,
 
     // not react at move in sight or other
     UNIT_STAT_CAN_NOT_REACT   = UNIT_STAT_STUNNED | UNIT_STAT_DIED |
-                                UNIT_STAT_CONFUSED | UNIT_STAT_FLEEING,
+                                UNIT_STAT_CONFUSED | UNIT_STAT_FLEEING | UNIT_STAT_ON_VEHICLE,
 
     // AI disabled by some reason
     UNIT_STAT_LOST_CONTROL    = UNIT_STAT_FLEEING | UNIT_STAT_CONTROLLED,
@@ -439,9 +448,12 @@ enum UnitState
     // masks (for check or reset)
 
     // for real move using movegen check and stop (except unstoppable flight)
-    UNIT_STAT_MOVING          = UNIT_STAT_ROAMING_MOVE | UNIT_STAT_CHASE_MOVE | UNIT_STAT_FOLLOW_MOVE | UNIT_STAT_FLEEING_MOVE,
+    UNIT_STAT_MOVING          = UNIT_STAT_CONFUSED_MOVE | UNIT_STAT_ROAMING_MOVE | UNIT_STAT_CHASE_MOVE | UNIT_STAT_FOLLOW_MOVE | UNIT_STAT_FLEEING_MOVE,
+
+    UNIT_STAT_RUNNING_STATE   = UNIT_STAT_CHASE_MOVE | UNIT_STAT_FLEEING_MOVE | UNIT_STAT_RUNNING,
 
-    UNIT_STAT_ALL_STATE       = 0xFFFFFFFF
+    UNIT_STAT_ALL_STATE       = 0xFFFFFFFF,
+    UNIT_STAT_ALL_DYN_STATES  = UNIT_STAT_ALL_STATE & ~(UNIT_STAT_NO_COMBAT_MOVEMENT | UNIT_STAT_RUNNING | UNIT_STAT_WAYPOINT_PAUSED | UNIT_STAT_IGNORE_PATHFINDING),
 };
 
 enum UnitMoveType
@@ -459,7 +471,7 @@ enum UnitMoveType
 
 #define MAX_MOVE_TYPE     9
 
-extern float baseMoveSpeed[MAX_MOVE_TYPE];
+#define BASE_CHARGE_SPEED 27.0f
 
 enum CombatRating
 {
@@ -505,7 +517,7 @@ enum UnitVisibility
     VISIBILITY_GROUP_STEALTH      = 2,                      // detect chance, seen and can see group members
     VISIBILITY_GROUP_INVISIBILITY = 3,                      // invisibility, can see and can be seen only another invisible unit or invisible detection unit, set only if not stealthed, and in checks not used (mask used instead)
     VISIBILITY_GROUP_NO_DETECT    = 4,                      // state just at stealth apply for update Grid state. Don't remove, otherwise stealth spells will break
-    VISIBILITY_RESPAWN            = 5                       // special totally not detectable visibility for force delete object at respawn command
+    VISIBILITY_REMOVE_CORPSE      = 5                       // special totally not detectable visibility for force delete object while removing a corpse
 };
 
 // Value masks for UNIT_FIELD_FLAGS
@@ -558,8 +570,9 @@ enum UnitFlags2
     UNIT_FLAG2_DISARM_OFFHAND       = 0x00000080,           // also shield case
     UNIT_FLAG2_UNK8                 = 0x00000100,
     UNIT_FLAG2_UNK9                 = 0x00000200,
-    UNIT_FLAG2_DISARM_RANGED        = 0x00000400,
+    UNIT_FLAG2_DISARM_RANGED        = 0x00000400,           // disarm or something
     UNIT_FLAG2_REGENERATE_POWER     = 0x00000800,
+    UNIT_FLAG2_GM_MODE              = 0x00040000,           // allows casting spells with AttributesEx7 & SPELL_ATTR_EX7_GM_ONLY
 };
 
 /// Non Player Character flags
@@ -591,6 +604,7 @@ enum NPCFlags
     UNIT_NPC_FLAG_STABLEMASTER          = 0x00400000,       // 100%
     UNIT_NPC_FLAG_GUILD_BANKER          = 0x00800000,       // cause client to send 997 opcode
     UNIT_NPC_FLAG_SPELLCLICK            = 0x01000000,       // cause client to send 1015 opcode (spell click), dynamic, set at loading and don't must be set in DB
+    UNIT_NPC_FLAG_PLAYER_VEHICLE        = 0x02000000,       // players with mounts that have vehicle data should have it set
 };
 
 // used in most movement packets (send and received)
@@ -621,13 +635,21 @@ enum MovementFlags
     MOVEFLAG_SWIMMING           = 0x00200000,               // appears with fly flag also
     MOVEFLAG_ASCENDING          = 0x00400000,               // swim up also
     MOVEFLAG_DESCENDING         = 0x00800000,               // swim down also
-    MOVEFLAG_CAN_FLY            = 0x01000000,               // can fly in 3.3?
-    MOVEFLAG_FLYING             = 0x02000000,               // Actual flying mode
+    MOVEFLAG_CAN_FLY            = 0x01000000,               // Appears when unit can fly AND also walk
+    MOVEFLAG_FLYING             = 0x02000000,               // unit is actually flying. pretty sure this is only used for players. creatures use disable_gravity
     MOVEFLAG_SPLINE_ELEVATION   = 0x04000000,               // used for flight paths
     MOVEFLAG_SPLINE_ENABLED     = 0x08000000,               // used for flight paths
     MOVEFLAG_WATERWALKING       = 0x10000000,               // prevent unit from falling through water
     MOVEFLAG_SAFE_FALL          = 0x20000000,               // active rogue safe fall spell (passive)
-    MOVEFLAG_HOVER              = 0x40000000
+    MOVEFLAG_HOVER              = 0x40000000,               // hover, cannot jump
+
+    MOVEFLAG_MASK_MOVING =
+        MOVEFLAG_FORWARD | MOVEFLAG_BACKWARD | MOVEFLAG_STRAFE_LEFT | MOVEFLAG_STRAFE_RIGHT |
+        MOVEFLAG_PITCH_UP | MOVEFLAG_PITCH_DOWN | MOVEFLAG_FALLING | MOVEFLAG_FALLINGFAR | MOVEFLAG_ASCENDING | MOVEFLAG_DESCENDING |
+        MOVEFLAG_SPLINE_ELEVATION,
+
+    MOVEFLAG_MASK_TURNING =
+        MOVEFLAG_TURN_LEFT | MOVEFLAG_TURN_RIGHT,
 };
 
 // flags that use in movement check for example at spell casting
@@ -664,15 +686,69 @@ enum MovementFlags2
     MOVEFLAG2_INTERP_MASK       = MOVEFLAG2_INTERP_MOVEMENT | MOVEFLAG2_INTERP_TURNING | MOVEFLAG2_INTERP_PITCHING
 };
 
+enum SplineFlags
+{
+    SPLINEFLAG_NONE         = 0x00000000,
+    SPLINEFLAG_FORWARD      = 0x00000001,
+    SPLINEFLAG_BACKWARD     = 0x00000002,
+    SPLINEFLAG_STRAFE_LEFT  = 0x00000004,
+    SPLINEFLAG_STRAFE_RIGHT = 0x00000008,
+    SPLINEFLAG_LEFT         = 0x00000010,
+    SPLINEFLAG_RIGHT        = 0x00000020,
+    SPLINEFLAG_PITCH_UP     = 0x00000040,
+    SPLINEFLAG_PITCH_DOWN   = 0x00000080,
+    SPLINEFLAG_DONE         = 0x00000100,
+    SPLINEFLAG_FALLING      = 0x00000200,
+    SPLINEFLAG_NO_SPLINE    = 0x00000400,
+    SPLINEFLAG_TRAJECTORY   = 0x00000800,
+    SPLINEFLAG_WALKMODE     = 0x00001000,
+    SPLINEFLAG_FLYING       = 0x00002000,
+    SPLINEFLAG_KNOCKBACK    = 0x00004000,
+    SPLINEFLAG_FINALPOINT   = 0x00008000,
+    SPLINEFLAG_FINALTARGET  = 0x00010000,
+    SPLINEFLAG_FINALFACING  = 0x00020000,
+    SPLINEFLAG_CATMULLROM   = 0x00040000,
+    SPLINEFLAG_CYCLIC       = 0x00080000,
+    SPLINEFLAG_ENTER_CYCLE  = 0x00100000,
+    SPLINEFLAG_ANIMATION    = 0x00200000,
+    SPLINEFLAG_FROZEN       = 0x00400000,
+    SPLINEFLAG_TRANSPORT    = 0x00800000,
+    SPLINEFLAG_TRANSPORT_EXIT = 0x01000000,
+    SPLINEFLAG_UNKNOWN7     = 0x02000000,
+    SPLINEFLAG_UNKNOWN8     = 0x04000000,
+    SPLINEFLAG_ORIENTATION_INVERCED = 0x08000000,
+    SPLINEFLAG_UNKNOWN10    = 0x10000000,
+    SPLINEFLAG_UNKNOWN11    = 0x20000000,
+    SPLINEFLAG_UNKNOWN12    = 0x40000000
+};
+
+enum SplineMode
+{
+    SPLINEMODE_LINEAR       = 0,
+    SPLINEMODE_CATMULLROM   = 1,
+    SPLINEMODE_BEZIER3      = 2
+};
+
+enum SplineType
+{
+    SPLINETYPE_NORMAL       = 0,
+    SPLINETYPE_STOP         = 1,
+    SPLINETYPE_FACINGSPOT   = 2,
+    SPLINETYPE_FACINGTARGET = 3,
+    SPLINETYPE_FACINGANGLE  = 4
+};
+
 class MovementInfo
 {
+    friend class AntiCheat;
+
     public:
         MovementInfo() : moveFlags(MOVEFLAG_NONE), moveFlags2(MOVEFLAG2_NONE), time(0),
-            t_time(0), t_seat(-1), t_time2(0), s_pitch(0.0f), fallTime(0), u_unk1(0.0f) {}
+            t_time(0), t_seat(-1), t_seatInfo(NULL), t_time2(0), s_pitch(0.0f), fallTime(0), splineElevation(0.0f) {}
 
         // Read/Write methods
-        void Read(ByteBuffer &data);
-        void Write(ByteBuffer &data) const;
+        void Read(ByteBuffer& data);
+        void Write(ByteBuffer& data) const;
 
         // Movement flags manipulations
         void AddMovementFlag(MovementFlags f) { moveFlags |= f; }
@@ -681,21 +757,21 @@ class MovementInfo
         MovementFlags GetMovementFlags() const { return MovementFlags(moveFlags); }
         void SetMovementFlags(MovementFlags f) { moveFlags = f; }
         MovementFlags2 GetMovementFlags2() const { return MovementFlags2(moveFlags2); }
+        void AddMovementFlag2(MovementFlags2 f) { moveFlags2 |= f; }
 
         // Position manipulations
-        Position const *GetPos() const { return &pos; }
-        void SetTransportData(ObjectGuid guid, float x, float y, float z, float o, uint32 time, int8 seat)
+        Position const* GetPos() const { return &pos; }
+        void SetTransportData(ObjectGuid guid, Position const& pos, uint32 time, SeatId seat, VehicleSeatEntry const* seatInfo = NULL)
         {
             t_guid = guid;
-            t_pos.x = x;
-            t_pos.y = y;
-            t_pos.z = z;
-            t_pos.o = o;
+            t_pos = pos;
             t_time = time;
             t_seat = seat;
+            t_seatInfo = seatInfo;
         }
         void ClearTransportData()
         {
+            moveFlags2 = MOVEFLAG2_NONE;
             t_guid = ObjectGuid();
             t_pos.x = 0.0f;
             t_pos.y = 0.0f;
@@ -703,23 +779,65 @@ class MovementInfo
             t_pos.o = 0.0f;
             t_time = 0;
             t_seat = -1;
+            t_seatInfo = NULL;
         }
         ObjectGuid const& GetTransportGuid() const { return t_guid; }
-        Position const *GetTransportPos() const { return &t_pos; }
-        int8 GetTransportSeat() const { return t_seat; }
+        Position const* GetTransportPos() const { return &t_pos; }
+        SeatId GetTransportSeat() const { return t_seat; }
+
+        uint32 GetTransportDBCSeat() const { return t_seatInfo ? t_seatInfo->m_ID : 0; }
+        uint32 GetVehicleSeatFlags() const { return t_seatInfo ? t_seatInfo->m_flags : 0; }
+
+        uint32 GetTime() const { return time; }
         uint32 GetTransportTime() const { return t_time; }
         uint32 GetFallTime() const { return fallTime; }
+
         void ChangeOrientation(float o) { pos.o = o; }
         void ChangePosition(float x, float y, float z, float o) { pos.x = x; pos.y = y; pos.z = z; pos.o = o; }
+        void ChangeTransportPosition(float x, float y, float z, float o) { t_pos.x = x; t_pos.y = y; t_pos.z = z; t_pos.o = o; }
+
+        void ChangePosition(Position const& _pos) { pos = _pos; }
+        void ChangeTransportPosition(Position const& _pos) { t_pos = _pos; }
+        Position const& GetPosition() const { return pos; }
+        Position const& GetTransportPosition() const { return t_pos; }
+
         void UpdateTime(uint32 _time) { time = _time; }
 
         struct JumpInfo
         {
             JumpInfo() : velocity(0.f), sinAngle(0.f), cosAngle(0.f), xyspeed(0.f) {}
-            float   velocity, sinAngle, cosAngle, xyspeed;
+            float velocity, sinAngle, cosAngle, xyspeed;
         };
 
         JumpInfo const& GetJumpInfo() const { return jump; }
+
+        MovementInfo& operator = (const MovementInfo& targetInfo)
+        {
+            uint32 moveFlagsTmp = targetInfo.moveFlags;
+            if (moveFlags & MOVEFLAG_ONTRANSPORT)
+                moveFlagsTmp |= MOVEFLAG_ONTRANSPORT;
+
+            moveFlags  = moveFlagsTmp;
+            splineElevation = targetInfo.splineElevation;
+            time       = targetInfo.time;
+            pos        = targetInfo.pos;
+            s_pitch    = targetInfo.s_pitch;
+            fallTime   = targetInfo.fallTime;
+            jump       = targetInfo.jump;
+
+            if (!t_guid || (t_guid && t_guid == targetInfo.t_guid))
+            {
+                moveFlags2 = targetInfo.moveFlags2;
+                t_guid     = targetInfo.t_guid;
+                t_pos      = targetInfo.t_pos;
+                t_time     = targetInfo.t_time;
+                t_seat     = targetInfo.t_seat;
+                t_seatInfo = targetInfo.t_seatInfo;
+                t_time2    = targetInfo.t_time2;
+            }
+            return *this;
+        }
+
     private:
         // common
         uint32   moveFlags;                                 // see enum MovementFlags
@@ -730,7 +848,8 @@ class MovementInfo
         ObjectGuid t_guid;
         Position t_pos;
         uint32   t_time;
-        int8     t_seat;
+        SeatId     t_seat;
+        VehicleSeatEntry const* t_seatInfo;
         uint32   t_time2;
         // swimming and flying
         float    s_pitch;
@@ -739,7 +858,7 @@ class MovementInfo
         // jumping
         JumpInfo jump;
         // spline
-        float    u_unk1;
+        float    splineElevation;
 };
 
 inline ByteBuffer& operator<< (ByteBuffer& buf, MovementInfo const& mi)
@@ -754,16 +873,14 @@ inline ByteBuffer& operator>> (ByteBuffer& buf, MovementInfo& mi)
     return buf;
 }
 
-namespace Movement{
-    class MoveSpline;
-}
-
 enum DiminishingLevels
 {
     DIMINISHING_LEVEL_1             = 0,
     DIMINISHING_LEVEL_2             = 1,
     DIMINISHING_LEVEL_3             = 2,
-    DIMINISHING_LEVEL_IMMUNE        = 3
+    DIMINISHING_LEVEL_4             = 3,
+    DIMINISHING_LEVEL_5             = 4,
+    DIMINISHING_LEVEL_IMMUNE        = 5
 };
 
 struct DiminishingReturn
@@ -792,58 +909,134 @@ enum MeleeHitOutcome
     MELEE_HIT_NORMAL    = 8,
 };
 
-struct CleanDamage
+enum DamageFlags
 {
-    CleanDamage(uint32 _damage, WeaponAttackType _attackType, MeleeHitOutcome _hitOutCome) :
-    damage(_damage), attackType(_attackType), hitOutCome(_hitOutCome) {}
-
-    uint32 damage;
-    WeaponAttackType attackType;
-    MeleeHitOutcome hitOutCome;
+    DAMAGE_FREEACTION   = 0,
+    DAMAGE_SHARED       = 1,
 };
 
+//struct CleanDamage
+//struct CalcDamageInfo
+//struct SpellNonMeleeDamage
+
 // Struct for use in Unit::CalculateMeleeDamage
-// Need create structure like in SMSG_ATTACKERSTATEUPDATE opcode
-struct CalcDamageInfo
+// Spell damage info structure based on structure sending in SMSG_SPELLNONMELEEDAMAGELOG opcode
+struct DamageInfo
 {
-    Unit  *attacker;             // Attacker
-    Unit  *target;               // Target for damage
-    SpellSchoolMask damageSchoolMask;
-    uint32 damage;
-    uint32 absorb;
-    uint32 resist;
-    uint32 blocked_amount;
-    uint32 HitInfo;
-    uint32 TargetState;
-    // Helper
-    WeaponAttackType attackType; //
-    uint32 procAttacker;
-    uint32 procVictim;
-    uint32 procEx;
-    uint32 cleanDamage;          // Used only for rage calculation
-    MeleeHitOutcome hitOutCome;  // TODO: remove this field (need use TargetState)
-};
+    public:
+        // Constructors for use with spell and melee damage
+        DamageInfo(Unit *_attacker, Unit *_target, uint32 _SpellID, uint32 _damage)
+            :  attacker(_attacker), target(_target), m_spellInfo(NULL), SpellID(_SpellID)
+        { Reset(_damage); };
 
-// Spell damage info structure based on structure sending in SMSG_SPELLNONMELEEDAMAGELOG opcode
-struct SpellNonMeleeDamage{
-    SpellNonMeleeDamage(Unit *_attacker, Unit *_target, uint32 _SpellID, SpellSchoolMask _schoolMask)
-        : target(_target), attacker(_attacker), SpellID(_SpellID), damage(0), schoolMask(_schoolMask),
-        absorb(0), resist(0), physicalLog(false), unused(false), blocked(0), HitInfo(0)
-    {}
+        DamageInfo(Unit *_attacker, Unit *_target, SpellEntry const* spellInfo, uint32 _damage = 0)
+            :  attacker(_attacker), target(_target), m_spellInfo(spellInfo), SpellID(0)
+        { Reset(_damage); };
 
-    Unit   *target;
-    Unit   *attacker;
-    uint32 SpellID;
-    uint32 damage;
-    SpellSchoolMask schoolMask;
-    uint32 absorb;
-    uint32 resist;
-    bool   physicalLog;
-    bool   unused;
-    uint32 blocked;
-    uint32 HitInfo;
+        // Constructors for use on temporary operation
+        DamageInfo(uint32 _damage)
+            : attacker(NULL), target(NULL), m_spellInfo(NULL), SpellID(0)
+        { Reset(_damage); };
+
+        DamageInfo(uint32 _damage, uint32 _SpellID)
+            : attacker(NULL), target(NULL), m_spellInfo(NULL), SpellID(_SpellID)
+        { Reset(_damage); };
+
+        DamageInfo(uint32 _damage, SpellEntry const* spellInfo)
+            : attacker(NULL), target(NULL), m_spellInfo(spellInfo), SpellID(0)
+        { Reset(_damage); };
+
+        // main operations
+        void Reset(uint32 _damage = 0);
+
+        // compartibility methods
+        void CleanDamage(int32 _signedDamage, uint32 _absorb, WeaponAttackType _attackType, MeleeHitOutcome _hitOutCome)
+        {
+            cleanDamage = _signedDamage;
+            absorb      = _absorb;
+            attackType  = _attackType;
+            hitOutCome  = _hitOutCome;
+        }
+
+        Unit*  attacker;             // Attacker
+        Unit*  target;               // Target for damage
+
+        // Spell parameters
+        uint32            GetSpellId()    const { return SpellID; }
+        SpellEntry const* GetSpellProto() const { return m_spellInfo; }
+        SpellSchoolMask   GetSchoolMask() const;
+
+        // Damage types
+        union {
+            uint32 damage;
+            uint32 heal;
+        };
+
+        int32  cleanDamage;          // Used for rage and healing calculation
+
+        // Damage calculation
+        uint32 baseDamage;
+        uint32 bonusCrit;
+        int32  bonusDone;
+        int32  bonusTaken;
+        uint32 reduction;
+        uint32 absorb;
+        uint32 resist;
+        uint32 blocked;
+        uint32 Damage() const
+        {
+            return IsHeal() ?
+                (baseDamage + bonusCrit + bonusDone + bonusTaken + reduction + absorb /*+ resist + blocked*/) :
+                (baseDamage + bonusCrit + bonusDone + bonusTaken - reduction - absorb - resist - blocked);
+        };
+
+        // Various types
+        WeaponAttackType attackType;
+        DamageEffectType damageType;
+        uint32 HitInfo;
+        uint32 TargetState;
+        MeleeHitOutcome hitOutCome;  // TODO: remove this field (need use TargetState)
+
+        uint32 rage;
+
+        // Proc states
+        uint32 procAttacker;
+        uint32 procVictim;
+        uint32 procEx;
+
+        // Helpers
+        bool   durabilityLoss;
+        bool   physicalLog;
+        bool   unused;
+        bool   IsMeleeDamage() const { return !m_spellInfo; };
+        bool   IsHeal()        const { return cleanDamage < 0; };
+
+        void           AddFlag(DamageFlags flag)       { m_flags |= (1 << flag); };
+        void           RemoveFlag(DamageFlags flag)    { m_flags &= ~(1 << flag); };
+        bool           HasFlag(DamageFlags flag) const { return (m_flags & (1 << flag)); };
+
+        // Attention: We now that this to function return the same (Remember the union from heal and damage)
+        // Exits Only for better reading!
+        uint32 GetRemainingHeal() { return heal; };
+        uint32 GetRemainingDamage() { return damage; };
+
+        // absorb
+        uint32 AddAbsorb(uint32 addvalue);
+        void AddPctAbsorb(float aborbPct);
+        uint32 GetAbsorb() const { return absorb; };
+        // should not be used, possible for some kinds of hacks
+        void SetAbsorb(uint32 value) { absorb = value; };
+
+
+
+    private:
+        DamageInfo();     // Don't allow plain initialization!
+        uint32            m_flags;
+        SpellEntry const* m_spellInfo;
+        uint32            SpellID;
 };
 
+
 struct SpellPeriodicAuraLogInfo
 {
     SpellPeriodicAuraLogInfo(Aura *_aura, uint32 _damage, uint32 _overDamage, uint32 _absorb, uint32 _resist, float _multiplier, bool _critical = false)
@@ -858,7 +1051,7 @@ struct SpellPeriodicAuraLogInfo
     bool   critical;
 };
 
-uint32 createProcExtendMask(SpellNonMeleeDamage *damageInfo, SpellMissInfo missCondition);
+uint32 createProcExtendMask(DamageInfo *damageInfo, SpellMissInfo missCondition);
 
 enum SpellAuraProcResult
 {
@@ -867,7 +1060,7 @@ enum SpellAuraProcResult
     SPELL_AURA_PROC_CANT_TRIGGER    = 2                     // aura can't trigger - skip charges taking, move to next aura if exists
 };
 
-typedef SpellAuraProcResult(Unit::*pAuraProcHandler)(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+typedef SpellAuraProcResult(Unit::*pAuraProcHandler)(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
 extern pAuraProcHandler AuraProcHandler[TOTAL_AURAS];
 
 #define MAX_DECLINED_NAME_CASES 5
@@ -908,14 +1101,26 @@ class GlobalCooldownMgr                                     // Shared by Player
         void AddGlobalCooldown(SpellEntry const* spellInfo, uint32 gcd);
         void CancelGlobalCooldown(SpellEntry const* spellInfo);
 
+        uint32 GetGlobalCooldown(SpellEntry const* spellInfo) const;
+
     private:
         GlobalCooldownList m_GlobalCooldowns;
 };
 
+enum CharmStateType
+{
+    CHARM_STATE_REACT    = 0,
+    CHARM_STATE_COMMAND  = 1,
+    CHARM_STATE_ACTIVITY = 2,
+    CHARM_STATE_ACTION   = 3,
+};
+
 enum ActiveStates
 {
     ACT_PASSIVE  = 0x01,                                    // 0x01 - passive
+    ACT_CASTABLE = 0x80,                                    // 0x80 - castable
     ACT_DISABLED = 0x81,                                    // 0x80 - castable
+    ACT_ACTIVE   = 0xC0,                                    // 0x40 | 0x80 - auto cast + castable
     ACT_ENABLED  = 0xC1,                                    // 0x40 | 0x80 - auto cast + castable
     ACT_COMMAND  = 0x07,                                    // 0x01 | 0x02 | 0x04
     ACT_REACTION = 0x06,                                    // 0x02 | 0x04
@@ -937,6 +1142,12 @@ enum CommandStates
     COMMAND_ABANDON = 3
 };
 
+enum ActionStates
+{
+    ACTIONS_ENABLE  = 0x00,
+    ACTIONS_DISABLE = 0x08
+};
+
 #define UNIT_ACTION_BUTTON_ACTION(X) (uint32(X) & 0x00FFFFFF)
 #define UNIT_ACTION_BUTTON_TYPE(X)   ((uint32(X) & 0xFF000000) >> 24)
 #define MAX_UNIT_ACTION_BUTTON_ACTION_VALUE (0x00FFFFFF+1)
@@ -985,35 +1196,40 @@ enum ActionBarIndex
 
 #define MAX_UNIT_ACTION_BAR_INDEX (ACTION_BAR_INDEX_END-ACTION_BAR_INDEX_START)
 
-struct CharmInfo
+struct MANGOS_DLL_SPEC CharmInfo
 {
     public:
         explicit CharmInfo(Unit* unit);
         uint32 GetPetNumber() const { return m_petnumber; }
         void SetPetNumber(uint32 petnumber, bool statwindow);
 
-        void SetCommandState(CommandStates st) { m_CommandState = st; }
-        CommandStates GetCommandState() { return m_CommandState; }
-        bool HasCommandState(CommandStates state) { return (m_CommandState == state); }
-        void SetReactState(ReactStates st) { m_reactState = st; }
-        ReactStates GetReactState() { return m_reactState; }
-        bool HasReactState(ReactStates state) { return (m_reactState == state); }
+        bool HasCommandState(CommandStates state) { return HasState(CHARM_STATE_COMMAND, state); }
+        bool HasReactState(ReactStates state) { return HasState(CHARM_STATE_REACT, state); }
+        void SetReactState(ReactStates state) { SetState(CHARM_STATE_REACT, state); }
+
+        uint32 GetState() const { return m_State; };
+        void   SetState(uint32 state) { m_State = state; };
+
+        uint8  GetState(CharmStateType type);
+        bool   HasState(CharmStateType type, uint8 value);
+        void   SetState(CharmStateType type, uint8 value);
 
         void InitPossessCreateSpells();
+        void InitVehicleCreateSpells(uint8 seatId = 0);
         void InitCharmCreateSpells();
         void InitPetActionBar();
         void InitEmptyActionBar();
-
                                                             //return true if successful
         bool AddSpellToActionBar(uint32 spellid, ActiveStates newstate = ACT_DECIDE);
         bool RemoveSpellFromActionBar(uint32 spell_id);
         void LoadPetActionBar(const std::string& data);
         void BuildActionBar(WorldPacket* data);
         void SetSpellAutocast(uint32 spell_id, bool state);
-        void SetActionBar(uint8 index, uint32 spellOrAction,ActiveStates type)
+        void SetActionBar(uint8 index, uint32 spellOrAction, ActiveStates type)
         {
-            PetActionBar[index].SetActionAndType(spellOrAction,type);
+            PetActionBar[index].SetActionAndType(spellOrAction, type);
         }
+
         UnitActionBarEntry const* GetActionBarEntry(uint8 index) const { return &(PetActionBar[index]); }
 
         void ToggleCreatureAutocast(uint32 spellid, bool apply);
@@ -1021,13 +1237,12 @@ struct CharmInfo
         CharmSpellEntry* GetCharmSpell(uint8 index) { return &(m_charmspells[index]); }
 
         GlobalCooldownMgr& GetGlobalCooldownMgr() { return m_GlobalCooldownMgr; }
-    private:
 
+    private:
         Unit* m_unit;
         UnitActionBarEntry PetActionBar[MAX_UNIT_ACTION_BAR_INDEX];
         CharmSpellEntry m_charmspells[CREATURE_MAX_SPELLS];
-        CommandStates   m_CommandState;
-        ReactStates     m_reactState;
+        uint32          m_State;                // 1st byte - ReactState, 2nd byte - CommandStates, 3d byte - unknown (Activity state), 4d byte - Action state
         uint32          m_petnumber;
         GlobalCooldownMgr m_GlobalCooldownMgr;
 };
@@ -1062,7 +1277,13 @@ enum IgnoreUnitState
     IGNORE_UNIT_TARGET_NON_FROZEN = 126,                    // ignore absent of frozen state
 };
 
-typedef std::set<ObjectGuid> GuardianPetList;
+struct SpellCooldown
+{
+    time_t end;
+    uint16 itemid;
+};
+
+typedef std::map<uint32, SpellCooldown> SpellCooldowns;
 
 // delay time next attack to prevent client attack animation problems
 #define ATTACK_DISPLAY_DELAY 200
@@ -1073,28 +1294,44 @@ typedef std::set<ObjectGuid> GuardianPetList;
 #define REGEN_TIME_FULL     2000                            // For this time difference is computed regen value
 #define REGEN_TIME_PRECISE  500                             // Used in Spell::CheckPower for precise regeneration in spell cast time
 
+// Power type values defines
+enum PowerDefaults
+{
+    POWER_RAGE_DEFAULT              = 1000,
+    POWER_FOCUS_DEFAULT             = 100,
+    POWER_ENERGY_DEFAULT            = 100,
+    POWER_HAPPINESS_DEFAULT         = 1000000,
+    POWER_RUNE_DEFAULT              = 8,
+    POWER_RUNIC_POWER_DEFAULT       = 1000,
+};
+
+// delay time for evading
+#define EVADE_TIME_DELAY     500
+#define EVADE_TIME_DELAY_MIN 50
+
 struct SpellProcEventEntry;                                 // used only privately
+class  VehicleKit;
 
 class MANGOS_DLL_SPEC Unit : public WorldObject
 {
     public:
-        typedef std::set<Unit*> AttackerSet;
-        typedef std::multimap< uint32, SpellAuraHolder*> SpellAuraHolderMap;
+        typedef UNORDERED_MULTIMAP<uint32 /*spellId*/, SpellAuraHolderPtr> SpellAuraHolderMap;
         typedef std::pair<SpellAuraHolderMap::iterator, SpellAuraHolderMap::iterator> SpellAuraHolderBounds;
         typedef std::pair<SpellAuraHolderMap::const_iterator, SpellAuraHolderMap::const_iterator> SpellAuraHolderConstBounds;
-        typedef std::list<SpellAuraHolder *> SpellAuraHolderList;
-        typedef std::list<Aura *> AuraList;
+        typedef std::queue<SpellAuraHolderPtr> SpellAuraHolderQueue;
+        typedef std::list<AuraPair> AuraList;
         typedef std::list<DiminishingReturn> Diminishing;
-        typedef std::set<uint32> ComboPointHolderSet;
-        typedef std::map<uint8, uint32> VisibleAuraMap;
-        typedef std::map<SpellEntry const*, ObjectGuid> SingleCastSpellTargetMap;
+        typedef UNORDERED_SET<ObjectGuid> ComboPointHolderSet;
+        typedef std::vector<SpellAuraHolderPtr> VisibleAuraMap;
+        typedef UNORDERED_MAP<SpellEntry const*, ObjectGuid /*targetGuid*/> TrackedAuraTargetMap;
+        typedef UNORDERED_SET<uint32> SpellIdSet;
 
         virtual ~Unit ( );
 
         void AddToWorld();
-        void RemoveFromWorld();
+        virtual void RemoveFromWorld(bool remove);
 
-        void CleanupsBeforeDelete();                        // used in ~Creature/~Player (or before mass creature delete to remove cross-references to already deleted units)
+        virtual void CleanupsBeforeDelete();                // used in ~Creature/~Player (or before mass creature delete to remove cross-references to already deleted units)
 
         float GetObjectBoundingRadius() const               // overwrite WorldObject version
         {
@@ -1107,7 +1344,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void ApplyDiminishingAura(DiminishingGroup  group, bool apply);
         void ClearDiminishings() { m_Diminishing.clear(); }
 
-        void Update(uint32 update_diff, uint32 time) override;
+        virtual void Update(uint32 update_diff, uint32 time) override;
 
         void setAttackTimer(WeaponAttackType type, uint32 time) { m_attackTimer[type] = time; }
         void resetAttackTimer(WeaponAttackType type = BASE_ATTACK);
@@ -1120,7 +1357,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
             if (IsInFeralForm())
                 return false;
 
-            switch(attackType)
+            switch (attackType)
             {
                 default:
                 case BASE_ATTACK:
@@ -1131,37 +1368,24 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
                     return !HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISARM_RANGED);
             }
         }
-        bool CanReachWithMeleeAttack(Unit* pVictim, float flat_mod = 0.0f) const;
-        uint32 m_extraAttacks;
 
-        void _addAttacker(Unit *pAttacker)                  // must be called only from Unit::Attack(Unit*)
-        {
-            AttackerSet::const_iterator itr = m_attackers.find(pAttacker);
-            if(itr == m_attackers.end())
-                m_attackers.insert(pAttacker);
-        }
-        void _removeAttacker(Unit *pAttacker)               // must be called only from Unit::AttackStop()
-        {
-            m_attackers.erase(pAttacker);
-        }
-        Unit * getAttackerForHelper()                       // If someone wants to help, who to give them
-        {
-            if (getVictim() != NULL)
-                return getVictim();
+        float GetCombatReach(bool forMeleeRange /*=true*/) const;
+        float GetCombatReach(Unit const* pVictim, bool forMeleeRange = true, float flatMod = 0.0f) const;
+        float GetCombatDistance(Unit const* pVictim, bool forMeleeRange = true) const;
+        bool CanReachWithMeleeAttack(Unit const* pVictim, float flatMod = 0.0f) const;
 
-            if (!m_attackers.empty())
-                return *(m_attackers.begin());
+        uint32 m_extraAttacks;
 
-            return NULL;
-        }
+        bool IsInCombat() const { return GetMap() ? GetMap()->IsInCombat(GetObjectGuid()) : false; }
+        Unit* getAttackerForHelper();                       // If someone wants to help, who to give them
         bool Attack(Unit *victim, bool meleeAttack);
         void AttackedBy(Unit* attacker);
         void CastStop(uint32 except_spellid = 0);
         bool AttackStop(bool targetSwitch = false);
         void RemoveAllAttackers();
-        AttackerSet const& getAttackers() const { return m_attackers; }
         bool isAttackingPlayer() const;
-        Unit* getVictim() const { return m_attacking; }
+        Unit* getVictim() const { return m_attackingGuid ? GetMap() ? GetMap()->GetUnit(m_attackingGuid) : NULL : NULL; }
+        virtual bool IsInEvadeMode() const { return false; };
         void CombatStop(bool includingCast = false);
         void CombatStopWithPets(bool includingCast = false);
         void StopAttackFaction(uint32 faction_id);
@@ -1195,6 +1419,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
 
         uint32 GetResistance(SpellSchools school) const { return GetUInt32Value(UNIT_FIELD_RESISTANCES+school); }
         void SetResistance(SpellSchools school, int32 val) { SetStatInt32Value(UNIT_FIELD_RESISTANCES+school,val); }
+        uint32 GetResistance(SpellSchoolMask schoolMask) const;
 
         uint32 GetHealth()    const { return GetUInt32Value(UNIT_FIELD_HEALTH); }
         uint32 GetMaxHealth() const { return GetUInt32Value(UNIT_FIELD_MAXHEALTH); }
@@ -1204,35 +1429,36 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void SetHealthPercent(float percent);
         int32 ModifyHealth(int32 val);
 
-        Powers getPowerType() const { return Powers(GetByteValue(UNIT_FIELD_BYTES_0, 3)); }
-        void setPowerType(Powers power);
-        uint32 GetPower(   Powers power) const { return GetUInt32Value(UNIT_FIELD_POWER1   +power); }
-        uint32 GetMaxPower(Powers power) const { return GetUInt32Value(UNIT_FIELD_MAXPOWER1+power); }
-        void SetPower(   Powers power, uint32 val);
+        Powers GetPowerType() const { return Powers(GetByteValue(UNIT_FIELD_BYTES_0, 3)); }
+        void SetPowerType(Powers power);
+        uint32 GetPower(Powers power) const { return GetUInt32Value(UNIT_FIELD_POWER1 + power); }
+        uint32 GetMaxPower(Powers power) const { return GetUInt32Value(UNIT_FIELD_MAXPOWER1 + power); }
+        void SetPower(Powers power, uint32 val);
         void SetMaxPower(Powers power, uint32 val);
         int32 ModifyPower(Powers power, int32 val);
         void ApplyPowerMod(Powers power, uint32 val, bool apply);
         void ApplyMaxPowerMod(Powers power, uint32 val, bool apply);
 
-        uint32 GetAttackTime(WeaponAttackType att) const { return (uint32)(GetFloatValue(UNIT_FIELD_BASEATTACKTIME+att)/m_modAttackSpeedPct[att]); }
-        void SetAttackTime(WeaponAttackType att, uint32 val) { SetFloatValue(UNIT_FIELD_BASEATTACKTIME+att,val*m_modAttackSpeedPct[att]); }
+        uint32 GetAttackTime(WeaponAttackType att) const { return uint32(GetFloatValue(UNIT_FIELD_BASEATTACKTIME + att) / m_modAttackSpeedPct[att]); }
+        void SetAttackTime(WeaponAttackType att, uint32 val) { SetFloatValue(UNIT_FIELD_BASEATTACKTIME + att, val * m_modAttackSpeedPct[att]); }
         void ApplyAttackTimePercentMod(WeaponAttackType att,float val, bool apply);
         void ApplyCastTimePercentMod(float val, bool apply);
 
         SheathState GetSheath() const { return SheathState(GetByteValue(UNIT_FIELD_BYTES_2, 0)); }
-        virtual void SetSheath( SheathState sheathed ) { SetByteValue(UNIT_FIELD_BYTES_2, 0, sheathed); }
+        virtual void SetSheath(SheathState sheathed) { SetByteValue(UNIT_FIELD_BYTES_2, 0, sheathed); }
 
         // faction template id
         uint32 getFaction() const { return GetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE); }
-        void setFaction(uint32 faction) { SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, faction ); }
+        uint32 GetOriginalFaction() const { return m_originalFaction; }
+        void setFaction(uint32 faction) { if (!m_originalFaction) m_originalFaction = faction; SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, faction); }
         FactionTemplateEntry const* getFactionTemplateEntry() const;
-        bool IsHostileTo(Unit const* unit) const;
+        virtual bool IsHostileTo(Unit const* unit) const override;
         bool IsHostileToPlayers() const;
-        bool IsFriendlyTo(Unit const* unit) const;
+        virtual bool IsFriendlyTo(Unit const* unit) const override;
         bool IsNeutralToAll() const;
         bool IsContestedGuard() const
         {
-            if(FactionTemplateEntry const* entry = getFactionTemplateEntry())
+            if (FactionTemplateEntry const* entry = getFactionTemplateEntry())
                 return entry->IsContestedGuardFaction();
 
             return false;
@@ -1242,7 +1468,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         bool IsFFAPvP() const { return HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP); }
         void SetFFAPvP(bool state);
         uint32 GetCreatureType() const;
-        uint32 GetCreatureTypeMask() const
+        virtual uint32 GetCreatureTypeMask() const
         {
             uint32 creatureType = GetCreatureType();
             return (creatureType >= 1) ? (1 << (creatureType - 1)) : 0;
@@ -1256,39 +1482,41 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void  SetStandFlags(uint8 flags) { SetByteFlag(UNIT_FIELD_BYTES_1, 2,flags); }
         void  RemoveStandFlags(uint8 flags) { RemoveByteFlag(UNIT_FIELD_BYTES_1, 2,flags); }
 
-        bool IsMounted() const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_MOUNT ); }
+        bool IsMounted() const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_MOUNT); }
         uint32 GetMountID() const { return GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID); }
-        void Mount(uint32 mount, uint32 spellId = 0);
+        void Mount(uint32 mount, uint32 spellId = 0, uint32 vehicleId = 0, uint32 creatureEntry = 0);
         void Unmount(bool from_aura = false);
 
-        VehicleInfo* GetVehicleInfo() { return m_vehicleInfo; }
-        bool IsVehicle() const { return m_vehicleInfo != NULL; }
-        void SetVehicleId(uint32 entry);
 
         uint16 GetMaxSkillValueForLevel(Unit const* target = NULL) const { return (target ? GetLevelForTarget(target) : getLevel()) * 5; }
-        void DealDamageMods(Unit *pVictim, uint32 &damage, uint32* absorb);
-        uint32 DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellEntry const *spellProto, bool durabilityLoss);
-        int32 DealHeal(Unit *pVictim, uint32 addhealth, SpellEntry const *spellProto, bool critical = false, uint32 absorb = 0);
+        void DealDamageMods(DamageInfo* damageInfo);
+        uint32 DealDamage(Unit *pVictim, uint32 damage, DamageInfo* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellEntry const *spellProto, bool durabilityLoss);
+        uint32 DealDamage(Unit* pVictim, DamageInfo* damageInfo, bool durabilityLoss);
+        uint32 DealDamage(DamageInfo* damageInfo);
+        int32  DealHeal(Unit* pVictim, uint32 addhealth, SpellEntry const* spellProto, bool critical = false, uint32 absorb = 0);
+        int32  DealHeal(DamageInfo* healInfo, bool critical = false);
 
         void PetOwnerKilledUnit(Unit* pVictim);
 
+        void ProcDamageAndSpell(DamageInfo* damageInfo);
+        void ProcDamageAndSpellFor( bool isVictim, DamageInfo* damage);
+        // wrapper for old proc methods
         void ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVictim, uint32 procEx, uint32 amount, WeaponAttackType attType = BASE_ATTACK, SpellEntry const *procSpell = NULL);
-        void ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellEntry const * procSpell, uint32 damage );
 
         void HandleEmote(uint32 emote_id);                  // auto-select command/state
         void HandleEmoteCommand(uint32 emote_id);
         void HandleEmoteState(uint32 emote_id);
-        void AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType = BASE_ATTACK, bool extra = false );
+        void AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType = BASE_ATTACK, bool extra = false);
 
         float MeleeMissChanceCalc(const Unit *pVictim, WeaponAttackType attType) const;
 
-        void CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *damageInfo, WeaponAttackType attackType = BASE_ATTACK);
-        void DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss);
+        void CalculateMeleeDamage(DamageInfo *damageInfo);
+        void DealMeleeDamage(DamageInfo *damageInfo, bool durabilityLoss);
 
-        bool IsAllowedDamageInArea(Unit * pVictim) const;
+        bool IsAllowedDamageInArea(Unit* pVictim) const;
 
-        void CalculateSpellDamage(SpellNonMeleeDamage *damageInfo, int32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType = BASE_ATTACK);
-        void DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss);
+        void CalculateSpellDamage(DamageInfo* damageInfo, float DamageMultiplier = 1.0f);
+        void DealSpellDamage(DamageInfo* damageInfo, bool durabilityLoss);
 
         // player or player's pet resilience (-1%)
         float GetMeleeCritChanceReduction() const { return GetCombatRatingReduction(CR_CRIT_TAKEN_MELEE); }
@@ -1305,15 +1533,17 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         uint32 GetRangedDamageReduction(uint32 damage) const { return GetCombatRatingDamageReduction(CR_CRIT_TAKEN_MELEE, 2.0f, 100.0f, damage); }
         uint32 GetSpellDamageReduction(uint32 damage) const { return GetCombatRatingDamageReduction(CR_CRIT_TAKEN_MELEE, 2.0f, 100.0f, damage); }
 
-        float  MeleeSpellMissChance(Unit *pVictim, WeaponAttackType attType, int32 skillDiff, SpellEntry const *spell);
-        SpellMissInfo MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell);
-        SpellMissInfo MagicSpellHitResult(Unit *pVictim, SpellEntry const *spell);
-        SpellMissInfo SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool canReflect = false);
+        float MeleeSpellMissChance(Unit* pVictim, WeaponAttackType attType, int32 skillDiff, SpellEntry const* spell);
+        SpellMissInfo MeleeSpellHitResult(Unit* pVictim, SpellEntry const* spell);
+        SpellMissInfo MagicSpellHitResult(Unit* pVictim, SpellEntry const* spell, bool dotDamage = false);
+        SpellMissInfo SpellHitResult(Unit* pVictim, SpellEntry const* spell, bool dotDamage = false);
+        SpellMissInfo SpellResistResult(Unit* pVictim, SpellEntry const* spell);
+        uint32 CalculateBaseSpellHitChance(Unit* pVictim);
 
-        float GetUnitDodgeChance()    const;
-        float GetUnitParryChance()    const;
-        float GetUnitBlockChance()    const;
-        float GetUnitCriticalChance(WeaponAttackType attackType, const Unit *pVictim) const;
+        float GetUnitDodgeChance() const;
+        float GetUnitParryChance() const;
+        float GetUnitBlockChance() const;
+        float GetUnitCriticalChance(WeaponAttackType attackType, const Unit* pVictim) const;
 
         virtual uint32 GetShieldBlockValue() const =0;
         uint32 GetUnitMeleeSkill(Unit const* target = NULL) const { return (target ? GetLevelForTarget(target) : getLevel()) * 5; }
@@ -1325,23 +1555,23 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         MeleeHitOutcome RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttackType attType) const;
         MeleeHitOutcome RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const;
 
-        bool isVendor()       const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_VENDOR ); }
-        bool isTrainer()      const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_TRAINER ); }
-        bool isQuestGiver()   const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER ); }
-        bool isGossip()       const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP ); }
-        bool isTaxi()         const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_FLIGHTMASTER ); }
-        bool isGuildMaster()  const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PETITIONER ); }
-        bool isBattleMaster() const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_BATTLEMASTER ); }
-        bool isBanker()       const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_BANKER ); }
-        bool isInnkeeper()    const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_INNKEEPER ); }
-        bool isSpiritHealer() const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITHEALER ); }
-        bool isSpiritGuide()  const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITGUIDE ); }
-        bool isTabardDesigner()const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_TABARDDESIGNER ); }
-        bool isAuctioner()    const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_AUCTIONEER ); }
-        bool isArmorer()      const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_REPAIR ); }
+        bool isVendor()       const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_VENDOR); }
+        bool isTrainer()      const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_TRAINER); }
+        bool isQuestGiver()   const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); }
+        bool isGossip()       const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); }
+        bool isTaxi()         const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_FLIGHTMASTER); }
+        bool isGuildMaster()  const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PETITIONER); }
+        bool isBattleMaster() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_BATTLEMASTER); }
+        bool isBanker()       const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_BANKER); }
+        bool isInnkeeper()    const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_INNKEEPER); }
+        bool isSpiritHealer() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITHEALER); }
+        bool isSpiritGuide()  const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITGUIDE); }
+        bool isTabardDesigner()const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_TABARDDESIGNER); }
+        bool isAuctioner()    const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_AUCTIONEER); }
+        bool isArmorer()      const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_REPAIR); }
         bool isServiceProvider() const
         {
-            return HasFlag( UNIT_NPC_FLAGS,
+            return HasFlag(UNIT_NPC_FLAGS,
                 UNIT_NPC_FLAG_VENDOR | UNIT_NPC_FLAG_TRAINER | UNIT_NPC_FLAG_FLIGHTMASTER |
                 UNIT_NPC_FLAG_PETITIONER | UNIT_NPC_FLAG_BATTLEMASTER | UNIT_NPC_FLAG_BANKER |
                 UNIT_NPC_FLAG_INNKEEPER | UNIT_NPC_FLAG_SPIRITHEALER |
@@ -1356,6 +1586,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void SetInCombatWith(Unit* enemy);
         void ClearInCombat();
         uint32 GetCombatTimer() const { return m_CombatTimer; }
+        virtual bool IsCombatStationary();
 
         SpellAuraHolderBounds GetSpellAuraHolderBounds(uint32 spell_id)
         {
@@ -1367,6 +1598,8 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         }
 
         bool HasAuraType(AuraType auraType) const;
+        bool HasAuraTypeWithCaster(AuraType auraType, ObjectGuid casterGuid) const;
+        bool HasNegativeAuraType(AuraType auraType) const;
         bool HasAffectedAura(AuraType auraType, SpellEntry const* spellProto) const;
         bool HasAura(uint32 spellId, SpellEffectIndex effIndex) const;
         bool HasAura(uint32 spellId) const
@@ -1383,6 +1616,8 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         bool isInRoots() const { return HasAuraType(SPELL_AURA_MOD_ROOT); }
         bool IsPolymorphed() const;
 
+        bool IsCrowdControlled() const;
+
         bool isFrozen() const;
         bool IsIgnoreUnitState(SpellEntry const *spell, IgnoreUnitState ignoreState);
 
@@ -1391,35 +1626,51 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
 
         virtual bool IsInWater() const;
         virtual bool IsUnderWater() const;
-        bool isInAccessablePlaceFor(Creature const* c) const;
+        bool isInAccessablePlaceFor(Unit const* unit) const;
 
         void SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, bool critical = false, uint32 absorb = 0);
         void SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage,Powers powertype);
         void EnergizeBySpell(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers powertype);
         uint32 SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage);
-        void CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem = NULL, Aura* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
-        void CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, Item *castItem= NULL, Aura* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
-        void CastCustomSpell(Unit* Victim, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem= NULL, Aura* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
-        void CastCustomSpell(Unit* Victim,SpellEntry const *spellInfo, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem= NULL, Aura* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
-        void CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem = NULL, Aura* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
-        void CastSpell(float x, float y, float z, SpellEntry const *spellInfo, bool triggered, Item *castItem = NULL, Aura* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
+        void CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem = NULL, Aura const* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
+        void CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, Item *castItem= NULL, Aura const* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
+        void CastCustomSpell(Unit* Victim, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem= NULL, Aura const* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
+        void CastCustomSpell(Unit* Victim,SpellEntry const *spellInfo, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem= NULL, Aura const* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
+        void CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem = NULL, Aura const* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
+        void CastSpell(float x, float y, float z, SpellEntry const *spellInfo, bool triggered, Item *castItem = NULL, Aura const* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
+        void CastSpell(WorldLocation const& loc, uint32 spellId, bool triggered, Item *castItem = NULL, Aura const* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
+        void CastSpell(WorldLocation const& loc, SpellEntry const *spellInfo, bool triggered, Item *castItem = NULL, Aura const* triggeredByAura = NULL, ObjectGuid originalCaster = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
 
         void DeMorph();
 
-        void SendAttackStateUpdate(CalcDamageInfo *damageInfo);
-        void SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType, SpellSchoolMask damageSchoolMask, uint32 Damage, uint32 AbsorbDamage, uint32 Resist, VictimState TargetState, uint32 BlockedAmount);
-        void SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log);
+        void SendAttackStateUpdate(DamageInfo* damageInfo);
+        void SendSpellNonMeleeDamageLog(DamageInfo *log);
         void SendSpellNonMeleeDamageLog(Unit *target,uint32 SpellID, uint32 Damage, SpellSchoolMask damageSchoolMask, uint32 AbsorbedDamage, uint32 Resist, bool PhysicalDamage, uint32 Blocked, bool CriticalHit = false);
         void SendPeriodicAuraLog(SpellPeriodicAuraLogInfo *pInfo);
         void SendSpellMiss(Unit *target, uint32 spellID, SpellMissInfo missInfo);
+        void SendSpellDamageResist(Unit* target, uint32 spellId);
+        void SendSpellDamageImmune(Unit* target, uint32 spellId);
 
+        void NearTeleportTo(WorldLocation const& loc, uint32 options = 0);
         void NearTeleportTo(float x, float y, float z, float orientation, bool casting = false);
-        void MonsterMoveWithSpeed(float x, float y, float z, float speed, bool generatePath = false, bool forceDestination = false);
+        void MonsterMoveToDestination(float x, float y, float z, float o, float speed, float height, bool isKnockBack = false, Unit* target = NULL);
+        // recommend use MonsterMove/MonsterMoveWithSpeed for most case that correctly work with movegens
+        // if used additional args in ... part then floats must explicitly casted to double
+        virtual bool SetPosition(Position const& pos, bool teleport = false);
+        virtual void SetFallInformation(uint32 time, float z) {};
+
+        void MonsterMoveWithSpeed(float x, float y, float z, float speed, bool generatePath = true, bool forceDestination = false);
         // recommend use MonsterMove/MonsterMoveWithSpeed for most case that correctly work with movegens
         // if used additional args in ... part then floats must explicitly casted to double
         void SendHeartBeat();
-        bool IsLevitating() const { return m_movementInfo.HasMovementFlag(MOVEFLAG_LEVITATING);}
-        bool IsWalking() const { return m_movementInfo.HasMovementFlag(MOVEFLAG_WALK_MODE);}
+        bool IsFalling() const { return m_movementInfo.HasMovementFlag(MovementFlags(MOVEFLAG_FALLING | MOVEFLAG_FALLINGFAR));};
+        bool IsLevitating() const { return m_movementInfo.HasMovementFlag(MOVEFLAG_LEVITATING); }
+        bool IsWalking() const { return m_movementInfo.HasMovementFlag(MOVEFLAG_WALK_MODE); }
+        bool IsRooted() const { return m_movementInfo.HasMovementFlag(MOVEFLAG_ROOT); }
+        bool IsSwimming() const { return m_movementInfo.HasMovementFlag(MOVEFLAG_SWIMMING); }
+
+        virtual void SetRoot(bool enabled) {}
+        virtual void SetWaterWalk(bool enabled) {}
 
         void SetInFront(Unit const* target);
         void SetFacingTo(float ori);
@@ -1435,9 +1686,9 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         DeathState getDeathState() const { return m_deathState; };
         virtual void SetDeathState(DeathState s);           // overwritten in Creature/Player/Pet
 
-        ObjectGuid const& GetOwnerGuid() const { return  GetGuidValue(UNIT_FIELD_SUMMONEDBY); }
-        void SetOwnerGuid(ObjectGuid owner) { SetGuidValue(UNIT_FIELD_SUMMONEDBY, owner); }
-        ObjectGuid const& GetCreatorGuid() const { return GetGuidValue(UNIT_FIELD_CREATEDBY); }
+        ObjectGuid const& GetOwnerGuid() const { return GetGuidValue(UNIT_FIELD_SUMMONEDBY); }
+        void SetOwnerGuid(ObjectGuid ownerGuid);
+        ObjectGuid const& GetCreatorGuid() const;
         void SetCreatorGuid(ObjectGuid creator) { SetGuidValue(UNIT_FIELD_CREATEDBY, creator); }
         ObjectGuid const& GetPetGuid() const { return GetGuidValue(UNIT_FIELD_SUMMON); }
         void SetPetGuid(ObjectGuid pet) { SetGuidValue(UNIT_FIELD_SUMMON, pet); }
@@ -1472,11 +1723,12 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         Pet* GetPet() const;
         Unit* GetCharmer() const;
         Unit* GetCharm() const;
+        Unit* GetCreator() const;
         void Uncharm();
         Unit* GetCharmerOrOwner() const { return GetCharmerGuid() ? GetCharmer() : GetOwner(); }
         Unit* GetCharmerOrOwnerOrSelf()
         {
-            if(Unit* u = GetCharmerOrOwner())
+            if (Unit* u = GetCharmerOrOwner())
                 return u;
 
             return this;
@@ -1484,22 +1736,29 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         bool IsCharmerOrOwnerPlayerOrPlayerItself() const;
         Player* GetCharmerOrOwnerPlayerOrPlayerItself();
         Player const* GetCharmerOrOwnerPlayerOrPlayerItself() const;
-        float GetCombatDistance( const Unit* target ) const;
 
         void SetPet(Pet* pet);
         void SetCharm(Unit* pet);
 
+        void AddPetToList(Pet* pet);
+        void RemovePetFromList(Pet* pet);
+        GuidSet const& GetPets() const { return m_groupPets; }
+
         void AddGuardian(Pet* pet);
         void RemoveGuardian(Pet* pet);
         void RemoveGuardians();
         Pet* FindGuardianWithEntry(uint32 entry);
+        GuidSet const& GetGuardians() const { return m_guardianPets; }
         Pet* GetProtectorPet();                             // expected single case in guardian list
 
         bool isCharmed() const { return !GetCharmerGuid().IsEmpty(); }
 
         CharmInfo* GetCharmInfo() { return m_charmInfo; }
+        uint8 GetCharmState(CharmStateType type) const { return m_charmInfo ? m_charmInfo->GetState(type) : 0; }
         CharmInfo* InitCharmInfo(Unit* charm);
 
+        void SendCharmState();
+
         ObjectGuid const& GetTotemGuid(TotemSlot slot) const { return m_TotemSlot[slot]; }
         Totem* GetTotem(TotemSlot slot) const;
         bool IsAllTotemSlotsUsed() const;
@@ -1512,36 +1771,51 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         template<typename Func>
         bool CheckAllControlledUnits(Func const& func, uint32 controlledMask) const;
 
-        bool AddSpellAuraHolder(SpellAuraHolder *holder);
+        bool AddSpellAuraHolder(SpellAuraHolderPtr holder);
         void AddAuraToModList(Aura *aura);
 
+        SpellAuraHolderPtr _AddAura(uint32 spellID, uint32 duration = 60000, Unit* caster = NULL);
+        float CheckAuraStackingAndApply(Aura *Aur, UnitMods unitMod, UnitModifierType modifierType, float amount, bool apply, int32 miscMask = 0, int32 miscValue = 0);
+
         // removing specific aura stack
         void RemoveAura(Aura* aura, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
         void RemoveAura(uint32 spellId, SpellEffectIndex effindex, Aura* except = NULL);
-        void RemoveSpellAuraHolder(SpellAuraHolder *holder, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
-        void RemoveSingleAuraFromSpellAuraHolder(SpellAuraHolder *holder, SpellEffectIndex index, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
+        void RemoveSpellAuraHolder(SpellAuraHolderPtr holder, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
+        void RemoveSingleAuraFromSpellAuraHolder(SpellAuraHolderPtr holder, SpellEffectIndex index, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
         void RemoveSingleAuraFromSpellAuraHolder(uint32 id, SpellEffectIndex index, ObjectGuid casterGuid, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
 
+        bool AddSpellAuraHolderToRemoveList(SpellAuraHolderPtr holder);
+
         // removing specific aura stacks by diff reasons and selections
-        void RemoveAurasDueToSpell(uint32 spellId, SpellAuraHolder* except = NULL, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
-        void RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId);
-        void RemoveAurasByCasterSpell(uint32 spellId, ObjectGuid casterGuid);
-        void RemoveAurasDueToSpellBySteal(uint32 spellId, ObjectGuid casterGuid, Unit *stealer);
+        void RemoveAurasDueToSpell(uint32 spellId, SpellAuraHolderPtr except = SpellAuraHolderPtr(NULL), AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
+        void RemoveAurasDueToItemSpell(Item* castItem, uint32 spellId);
+        void RemoveAurasByCasterSpell(uint32 spellId, ObjectGuid casterGuid, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
+        void RemoveAurasDueToSpellBySteal(uint32 spellId, ObjectGuid casterGuid, Unit* stealer);
         void RemoveAurasDueToSpellByCancel(uint32 spellId);
+        void RemoveAllGroupBuffsFromCaster(ObjectGuid guidCaster);
 
         // removing unknown aura stacks by diff reasons and selections
-        void RemoveNotOwnSingleTargetAuras(uint32 newPhase = 0x0);
+        void RemoveNotOwnTrackedTargetAuras(uint32 newPhase = 0x0);
         void RemoveAurasAtMechanicImmunity(uint32 mechMask, uint32 exceptSpellId, bool non_positive = false);
+        void RemoveAurasBySpellMechanic(uint32 mechMask);
         void RemoveSpellsCausingAura(AuraType auraType);
-        void RemoveSpellsCausingAura(AuraType auraType, SpellAuraHolder* except);
+        void RemoveSpellsCausingAura(AuraType auraType, SpellAuraHolderPtr except);
+        void RemoveSpellsCausingAura(AuraType auraType, ObjectGuid casterGuid);
         void RemoveRankAurasDueToSpell(uint32 spellId);
-        bool RemoveNoStackAurasDueToAuraHolder(SpellAuraHolder *holder);
+        bool RemoveNoStackAurasDueToAuraHolder(SpellAuraHolderPtr holder);
         void RemoveAurasWithInterruptFlags(uint32 flags);
-        void RemoveAurasWithAttribute(uint32 flags);
+        void RemoveAurasWithAttribute(uint32 flags, uint32 exclude = 0);
         void RemoveAurasWithDispelType(DispelType type, ObjectGuid casterGuid = ObjectGuid());
         void RemoveAllAuras(AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
         void RemoveArenaAuras(bool onleave = false);
         void RemoveAllAurasOnDeath();
+        void RemoveAllAurasOnEvade();
+
+        void HandleArenaPreparation(bool apply);
+        bool RemoveSpellsCausingAuraByCaster(AuraType auraType, ObjectGuid casterGuid, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
+
+        // Method for enable-disable auras (currently - passive only) affect
+        void TriggerPassiveAurasWithAttribute(bool active, uint32 flags);
 
         // removing specific aura FROM stack by diff reasons and selections
         void RemoveAuraHolderFromStack(uint32 spellId, uint32 stackAmount = 1, ObjectGuid casterGuid = ObjectGuid(), AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
@@ -1549,16 +1823,22 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
 
         void DelaySpellAuraHolder(uint32 spellId, int32 delaytime, ObjectGuid casterGuid);
 
-        float GetResistanceBuffMods(SpellSchools school, bool positive) const { return GetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school ); }
-        void SetResistanceBuffMods(SpellSchools school, bool positive, float val) { SetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school,val); }
-        void ApplyResistanceBuffModsMod(SpellSchools school, bool positive, float val, bool apply) { ApplyModSignedFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val, apply); }
-        void ApplyResistanceBuffModsPercentMod(SpellSchools school, bool positive, float val, bool apply) { ApplyPercentModFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val, apply); }
+        bool HasMorePoweredBuff(uint32 spellId);
+
+        float GetResistanceBuffMods(SpellSchools school, bool positive) const { return GetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + school); }
+        void SetResistanceBuffMods(SpellSchools school, bool positive, float val) { SetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + school,val); }
+        void ApplyResistanceBuffModsMod(SpellSchools school, bool positive, float val, bool apply) { ApplyModSignedFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + school, val, apply); }
+        void ApplyResistanceBuffModsPercentMod(SpellSchools school, bool positive, float val, bool apply) { ApplyPercentModFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + school, val, apply); }
         void InitStatBuffMods()
         {
-            for(int i = STAT_STRENGTH; i < MAX_STATS; ++i) SetFloatValue(UNIT_FIELD_POSSTAT0+i, 0);
-            for(int i = STAT_STRENGTH; i < MAX_STATS; ++i) SetFloatValue(UNIT_FIELD_NEGSTAT0+i, 0);
+            for (int i = STAT_STRENGTH; i < MAX_STATS; ++i) SetFloatValue(UNIT_FIELD_POSSTAT0+i, 0);
+            for (int i = STAT_STRENGTH; i < MAX_STATS; ++i) SetFloatValue(UNIT_FIELD_NEGSTAT0+i, 0);
+        }
+        void ApplyStatBuffMod(Stats stat, float val, bool apply)
+        {
+            val *= GetModifierValue(UnitMods(UNIT_MOD_STAT_STRENGTH+stat), TOTAL_PCT);
+            ApplyModSignedFloatValue((val > 0 ? UNIT_FIELD_POSSTAT0+stat : UNIT_FIELD_NEGSTAT0+stat), val, apply);
         }
-        void ApplyStatBuffMod(Stats stat, float val, bool apply) { ApplyModSignedFloatValue((val > 0 ? UNIT_FIELD_POSSTAT0+stat : UNIT_FIELD_NEGSTAT0+stat), val, apply); }
         void ApplyStatPercentBuffMod(Stats stat, float val, bool apply)
         {
             ApplyPercentModFloatValue(UNIT_FIELD_POSSTAT0+stat, val, apply);
@@ -1599,7 +1879,13 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         uint32 m_invisibilityMask;
 
         ShapeshiftForm GetShapeshiftForm() const { return ShapeshiftForm(GetByteValue(UNIT_FIELD_BYTES_2, 3)); }
-        void  SetShapeshiftForm(ShapeshiftForm form) { SetByteValue(UNIT_FIELD_BYTES_2, 3, form); }
+        void  SetShapeshiftForm(ShapeshiftForm form)
+        {
+            SetByteValue(UNIT_FIELD_BYTES_2, 3, form);
+            // always update this field to prevent problems with shapeshifting
+            if (GetTypeId() == TYPEID_PLAYER)
+                ForceValuesUpdateAtIndex(UNIT_FIELD_BYTES_2);
+        }
 
         bool IsInFeralForm() const
         {
@@ -1611,19 +1897,21 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         {
             ShapeshiftForm form = GetShapeshiftForm();
             return form != FORM_NONE && form != FORM_BATTLESTANCE && form != FORM_BERSERKERSTANCE && form != FORM_DEFENSIVESTANCE &&
-                form != FORM_SHADOW;
+                form != FORM_SHADOW && form != FORM_STEALTH;
         }
 
+        virtual uint32 GetModelForForm(SpellShapeshiftFormEntry const* ssEntry) const;
+        uint32 GetModelForForm() const;     // for current form
+
         float m_modMeleeHitChance;
         float m_modRangedHitChance;
         float m_modSpellHitChance;
         int32 m_baseSpellCritChance;
 
         float m_threatModifier[MAX_SPELL_SCHOOL];
-        float m_modAttackSpeedPct[3];
-
-        // Event handler
-        EventProcessor m_Events;
+        float m_modAttackSpeedPct[MAX_ATTACK_MOD];
+        float m_modSpellSpeedPctNeg;
+        float m_modSpellSpeedPctPos;
 
         // stat system
         bool HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, float amount, bool apply);
@@ -1639,9 +1927,11 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         virtual bool UpdateStats(Stats stat) = 0;
         virtual bool UpdateAllStats() = 0;
         virtual void UpdateResistances(uint32 school) = 0;
+        virtual void UpdateAllResistances();
         virtual void UpdateArmor() = 0;
         virtual void UpdateMaxHealth() = 0;
         virtual void UpdateMaxPower(Powers power) = 0;
+        virtual void UpdateAllMaxPower();
         virtual void UpdateAttackPowerAndDamage(bool ranged = false) = 0;
         virtual void UpdateDamagePhysical(WeaponAttackType attType) = 0;
         float GetTotalAttackPowerValue(WeaponAttackType attType) const;
@@ -1654,9 +1944,10 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void UpdateVisibilityAndView();                     // overwrite WorldObject::UpdateVisibilityAndView()
 
         // common function for visibility checks for player/creatures with detection code
-        bool isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, bool detect, bool inVisibleList = false, bool is3dDistance = true) const;
+        bool isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, bool detect, bool inVisibleList = false, bool is3dDistance = true, bool skipLOScheck = false) const;
         bool canDetectInvisibilityOf(Unit const* u) const;
         void SetPhaseMask(uint32 newPhaseMask, bool update);// overwrite WorldObject::SetPhaseMask
+        bool IsVisibleTargetForSpell(WorldObject const* caster, SpellEntry const* spellInfo, WorldLocation const* location = NULL) const;
 
         // virtual functions for all world objects types
         bool isVisibleForInState(Player const* u, WorldObject const* viewPoint, bool inVisibleList) const;
@@ -1664,8 +1955,9 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         virtual bool IsVisibleInGridForPlayer(Player* pl) const = 0;
         bool isInvisibleForAlive() const;
 
-        SingleCastSpellTargetMap      & GetSingleCastSpellTargets()       { return m_singleCastSpellTargets; }
-        SingleCastSpellTargetMap const& GetSingleCastSpellTargets() const { return m_singleCastSpellTargets; }
+        TrackedAuraTargetMap&       GetTrackedAuraTargets(TrackedAuraType type)       { return m_trackedAuraTargets[type]; }
+        TrackedAuraTargetMap const& GetTrackedAuraTargets(TrackedAuraType type) const { return m_trackedAuraTargets[type]; }
+
         SpellImmuneList m_spellImmune[MAX_SPELL_IMMUNITY];
 
         // Threat related methods
@@ -1674,61 +1966,74 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         float ApplyTotalThreatModifier(float threat, SpellSchoolMask schoolMask = SPELL_SCHOOL_MASK_NORMAL);
         void DeleteThreatList();
         bool IsSecondChoiceTarget(Unit* pTarget, bool checkThreatArea) const;
-        bool SelectHostileTarget();
-        void TauntApply(Unit* pVictim);
+        bool SelectHostileTarget(bool withEvade = true);
+        bool TauntApply(Unit* pVictim, bool isSingleEffect = false);
         void TauntFadeOut(Unit *taunter);
+
+        void FixateTarget(Unit* pVictim);
+        ObjectGuid const& GetFixatedTargetGuid() { return m_fixateTargetGuid; };
+        Unit* GetFixatedTarget();
+
         ThreatManager& getThreatManager() { return m_ThreatManager; }
         ThreatManager const& getThreatManager() const { return m_ThreatManager; }
-        void addHatedBy(HostileReference* pHostileReference) { m_HostileRefManager.insertFirst(pHostileReference); };
+        void addHatedBy(HostileReference* pHostileReference) { m_HostileRefManager->insertFirst(pHostileReference); };
         void removeHatedBy(HostileReference* /*pHostileReference*/ ) { /* nothing to do yet */ }
-        HostileRefManager& getHostileRefManager() { return m_HostileRefManager; }
+        HostileRefManager& getHostileRefManager() { return *m_HostileRefManager; }
+        void RemoveUnitFromHostileRefManager(Unit* pUnit);
 
-        uint32 GetVisibleAura(uint8 slot) const
+        SpellAuraHolderPtr GetVisibleAura(uint8 slot) const;
+        void SetVisibleAura(uint8 slot, SpellAuraHolderPtr holder);
+        VisibleAuraMap const& GetVisibleAuras() const { return m_visibleAuras; }
+        uint8 GetVisibleAurasCount() const;
+
+        Aura* GetAura(uint32 spellId, SpellEffectIndex effindex);
+        Aura* GetAura(AuraType type, SpellFamily family, ClassFamilyMask const& classMask, ObjectGuid casterGuid = ObjectGuid());
+        Aura* GetAuraByEffectMask(AuraType type, SpellFamily family, ClassFamilyMask const& classMask, ObjectGuid casterGuid = ObjectGuid());
+        Aura* GetAura(AuraType type, SpellFamily family, uint64 familyFlag, uint32 familyFlag2 = 0, ObjectGuid casterGuid = ObjectGuid())
         {
-            VisibleAuraMap::const_iterator itr = m_visibleAuras.find(slot);
-            if(itr != m_visibleAuras.end())
-                return itr->second;
-            return 0;
+            return GetAura(type, family, ClassFamilyMask(familyFlag, familyFlag2), casterGuid);
         }
-        void SetVisibleAura(uint8 slot, uint32 spellid)
+        template <AuraType type, SpellFamily family, CFM_ARGS_1>
+        Aura* GetAura(ObjectGuid casterGuid = ObjectGuid())
         {
-            if(spellid == 0)
-                m_visibleAuras.erase(slot);
-            else
-                m_visibleAuras[slot] = spellid;
+            return GetAura(type, family, ClassFamilyMask::create<CFM_VALUES_1>(), casterGuid);
         }
-        VisibleAuraMap const& GetVisibleAuras() const { return m_visibleAuras; }
-        uint8 GetVisibleAurasCount() const { return m_visibleAuras.size(); }
 
-        Aura* GetAura(uint32 spellId, SpellEffectIndex effindex);
-        Aura* GetAura(AuraType type, SpellFamily family, uint64 familyFlag, uint32 familyFlag2 = 0, ObjectGuid casterGuid = ObjectGuid());
-        SpellAuraHolder* GetSpellAuraHolder (uint32 spellid) const;
-        SpellAuraHolder* GetSpellAuraHolder (uint32 spellid, ObjectGuid casterGUID) const;
+        Aura* GetScalingAura(AuraType type, uint32 stat = 0);
+        Aura const* GetTriggeredByClientAura(uint32 spellId);
 
-        SpellAuraHolderMap      & GetSpellAuraHolderMap()       { return m_spellAuraHolders; }
+        SpellAuraHolderPtr GetSpellAuraHolder(uint32 spellid) const;
+        SpellAuraHolderPtr GetSpellAuraHolder(uint32 spellid, ObjectGuid casterGUID) const;
+
+        SpellAuraHolderMap&       GetSpellAuraHolderMap()       { return m_spellAuraHolders; }
         SpellAuraHolderMap const& GetSpellAuraHolderMap() const { return m_spellAuraHolders; }
-        AuraList const& GetAurasByType(AuraType type) const { return m_modAuras[type]; }
+        AuraList           const& GetAurasByType(AuraType type) const { return m_modAuras[type]; }
+        AuraList&                 GetAurasByType(AuraType type) { return m_modAuras[type]; }
         void ApplyAuraProcTriggerDamage(Aura* aura, bool apply);
 
         int32 GetTotalAuraModifier(AuraType auratype) const;
         float GetTotalAuraMultiplier(AuraType auratype) const;
-        int32 GetMaxPositiveAuraModifier(AuraType auratype) const;
-        int32 GetMaxNegativeAuraModifier(AuraType auratype) const;
+        int32 GetMaxPositiveAuraModifier(AuraType auratype, bool nonStackingOnly = false) const;
+        int32 GetMaxNegativeAuraModifier(AuraType auratype, bool nonStackingOnly = false) const;
 
         int32 GetTotalAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const;
         float GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask) const;
-        int32 GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const;
-        int32 GetMaxNegativeAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const;
+        int32 GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask, bool nonStackingOnly = false) const;
+        int32 GetMaxNegativeAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask, bool nonStackingOnly = false) const;
 
         int32 GetTotalAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const;
         float GetTotalAuraMultiplierByMiscValue(AuraType auratype, int32 misc_value) const;
-        int32 GetMaxPositiveAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const;
-        int32 GetMaxNegativeAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const;
+        int32 GetMaxPositiveAuraModifierByMiscValue(AuraType auratype, int32 misc_value, bool nonStackingOnly = false) const;
+        int32 GetMaxNegativeAuraModifierByMiscValue(AuraType auratype, int32 misc_value, bool nonStackingOnly = false) const;
 
         // misc have plain value but we check it fit to provided values mask (mask & (1 << (misc-1)))
         float GetTotalAuraMultiplierByMiscValueForMask(AuraType auratype, uint32 mask) const;
 
-        Aura* GetDummyAura(uint32 spell_id) const;
+        // Calculating custom multipliers (dummy && class script)
+        float GetTotalAuraScriptedMultiplierForDamageTaken(SpellEntry const* spellInfo) const;
+        float GetTotalAuraScriptedMultiplierForDamageDone(SpellEntry const* spellInfo) const;
+
+        Aura const* GetDummyAura(uint32 spell_id) const;
 
         uint32 m_AuraFlags;
 
@@ -1742,11 +2047,12 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         // at any changes to scale and/or displayId
         void UpdateModelData();
 
+        DynamicObject* GetEffectiveDynObject(uint32 spellId, SpellEffectIndex effIndex, Unit* pTarget);
         DynamicObject* GetDynObject(uint32 spellId, SpellEffectIndex effIndex);
         DynamicObject* GetDynObject(uint32 spellId);
         void AddDynObject(DynamicObject* dynObj);
         void RemoveDynObject(uint32 spellid);
-        void RemoveDynObjectWithGUID(ObjectGuid guid) { m_dynObjGUIDs.remove(guid); }
+        void RemoveDynObjectWithGuid(ObjectGuid const& guid) { m_dynObjGuids.remove(guid); }
         void RemoveAllDynObjects();
 
         GameObject* GetGameObject(uint32 spellId) const;
@@ -1767,61 +2073,66 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         int32 SpellBonusWithCoeffs(SpellEntry const *spellProto, int32 total, int32 benefit, int32 ap_benefit, DamageEffectType damagetype, bool donePart, float defCoeffMod = 1.0f);
         int32 SpellBaseDamageBonusDone(SpellSchoolMask schoolMask);
         int32 SpellBaseDamageBonusTaken(SpellSchoolMask schoolMask);
-        uint32 SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, uint32 pdamage, DamageEffectType damagetype, uint32 stack = 1);
-        uint32 SpellDamageBonusTaken(Unit *pCaster, SpellEntry const *spellProto, uint32 pdamage, DamageEffectType damagetype, uint32 stack = 1);
+
+        void SpellDamageBonusDone(DamageInfo* damageInfo, uint32 stack = 1);
+        void SpellDamageBonusTaken(DamageInfo* damageInfo, uint32 stack = 1);
+
         int32 SpellBaseHealingBonusDone(SpellSchoolMask schoolMask);
         int32 SpellBaseHealingBonusTaken(SpellSchoolMask schoolMask);
         uint32 SpellHealingBonusDone(Unit *pVictim, SpellEntry const *spellProto, int32 healamount, DamageEffectType damagetype, uint32 stack = 1);
         uint32 SpellHealingBonusTaken(Unit *pCaster, SpellEntry const *spellProto, int32 healamount, DamageEffectType damagetype, uint32 stack = 1);
-        uint32 MeleeDamageBonusDone(Unit *pVictim, uint32 damage, WeaponAttackType attType, SpellEntry const *spellProto = NULL, DamageEffectType damagetype = DIRECT_DAMAGE, uint32 stack = 1);
-        uint32 MeleeDamageBonusTaken(Unit *pCaster, uint32 pdamage,WeaponAttackType attType, SpellEntry const *spellProto = NULL, DamageEffectType damagetype = DIRECT_DAMAGE, uint32 stack = 1);
+
+        void MeleeDamageBonusDone(DamageInfo* damageInfo, uint32 stack = 1);
+        void MeleeDamageBonusTaken(DamageInfo* damageInfo, uint32 stack = 1);
+
+        virtual SpellSchoolMask GetMeleeDamageSchoolMask() const;
 
         bool   IsSpellBlocked(Unit *pCaster, SpellEntry const *spellProto, WeaponAttackType attackType = BASE_ATTACK);
         bool   IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType = BASE_ATTACK);
         uint32 SpellCriticalDamageBonus(SpellEntry const *spellProto, uint32 damage, Unit *pVictim);
         uint32 SpellCriticalHealingBonus(SpellEntry const *spellProto, uint32 damage, Unit *pVictim);
 
-        bool IsTriggeredAtSpellProcEvent(Unit *pVictim, SpellAuraHolder* holder, SpellEntry const* procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, SpellProcEventEntry const*& spellProcEvent );
+        bool IsTriggeredAtSpellProcEvent(Unit *pVictim, SpellAuraHolderPtr holder, SpellEntry const* procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, SpellProcEventEntry const*& spellProcEvent );
+        SpellAuraProcResult IsTriggeredAtCustomProcEvent(Unit *pVictim, SpellAuraHolderPtr holder, SpellEntry const* procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, SpellProcEventEntry const*& spellProcEvent );
         // Aura proc handlers
-        SpellAuraProcResult HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleHasteAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleProcTriggerDamageAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleMendingAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleModCastingSpeedNotStackAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleReflectSpellsSchoolAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleModPowerCostSchoolAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleMechanicImmuneResistanceAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleModDamageFromCasterAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleAddFlatModifierAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleAddPctModifierAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleModDamagePercentDoneAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleModRating(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleSpellMagnetAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleManaShieldAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleModResistanceAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleRemoveByDamageChanceProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
-        SpellAuraProcResult HandleNULLProc(Unit* /*pVictim*/, uint32 /*damage*/, Aura* /*triggeredByAura*/, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+        SpellAuraProcResult HandleDummyAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleHasteAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleSpellCritChanceAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleProcTriggerSpellAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleProcTriggerDamageAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleOverrideClassScriptAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleMendingAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleModCastingSpeedNotStackAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleReflectSpellsSchoolAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleModPowerCostSchoolAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleMechanicImmuneResistanceAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleModDamageFromCasterAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleAddFlatModifierAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleAddPctModifierAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleModDamagePercentDoneAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandlePeriodicDummyAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleModRating(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleRemoveByDamageProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleSpellMagnetAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleManaShieldAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleModResistanceAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleRemoveByDamageChanceProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleNULLProc(Unit* /*pVictim*/, DamageInfo* /*damage*/, Aura const* /*triggeredByAura*/, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
         {
             // no proc handler for this aura type
             return SPELL_AURA_PROC_OK;
         }
-        SpellAuraProcResult HandleCantTrigger(Unit* /*pVictim*/, uint32 /*damage*/, Aura* /*triggeredByAura*/, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+        SpellAuraProcResult HandleCantTrigger(Unit* /*pVictim*/, DamageInfo* /*damage*/, Aura const* /*triggeredByAura*/, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
         {
             // this aura type can't proc
             return SPELL_AURA_PROC_CANT_TRIGGER;
         }
+        SpellAuraProcResult HandleDamageShieldAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleDropChargeByDamageProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
+        SpellAuraProcResult HandleIgnoreUnitStateAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
 
-        void SetLastManaUse()
-        {
-            if (GetTypeId() == TYPEID_PLAYER && !IsUnderLastManaUseEffect())
-                RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER);
-
-            m_lastManaUseTimer = 5000;
-        }
-        bool IsUnderLastManaUseEffect() const { return m_lastManaUseTimer; }
+        void SetLastManaUse();
+        bool IsUnderLastManaUseEffect() const { return bool(m_lastManaUseTimer > 0); }
 
         uint32 GetRegenTimer() const { return m_regenTimer; }
 
@@ -1829,16 +2140,19 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
 
         void ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply);
         void ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType type, bool apply);
-        virtual bool IsImmuneToSpell(SpellEntry const* spellInfo);
+        virtual bool IsImmuneToSpell(SpellEntry const* spellInfo, bool isFriendly) const;
                                                             // redefined in Creature
-        bool IsImmunedToDamage(SpellSchoolMask meleeSchoolMask);
+        bool IsImmunedToDamage(SpellSchoolMask meleeSchoolMask) const;
+        bool IsImmunedToSchool(SpellSchoolMask meleeSchoolMask) const;
         virtual bool IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex index) const;
                                                             // redefined in Creature
 
+        static bool IsDamageReducedByArmor(SpellSchoolMask damageSchoolMask, SpellEntry const* spellProto = NULL, SpellEffectIndex effIndex = MAX_EFFECT_INDEX);
         uint32 CalcArmorReducedDamage(Unit* pVictim, const uint32 damage);
-        void CalculateDamageAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolMask, DamageEffectType damagetype, const uint32 damage, uint32 *absorb, uint32 *resist, bool canReflect = false);
-        void CalculateAbsorbResistBlock(Unit *pCaster, SpellNonMeleeDamage *damageInfo, SpellEntry const* spellProto, WeaponAttackType attType = BASE_ATTACK);
-        void CalculateHealAbsorb(uint32 heal, uint32 *absorb);
+        void CalculateResistance(Unit* pCaster, DamageInfo* damageInfo);
+        void CalculateDamageAbsorbAndResist(Unit* pCaster, DamageInfo* damageInfo, bool canReflect = false);
+        void CalculateAbsorbResistBlock(Unit* pCaster, DamageInfo* damageInfo, SpellEntry const* spellProto, WeaponAttackType attType = BASE_ATTACK);
+        void CalculateHealAbsorb(uint32 heal, uint32* absorb);
 
         void  UpdateSpeed(UnitMoveType mtype, bool forced, float ratio = 1.0f);
         float GetSpeed( UnitMoveType mtype ) const;
@@ -1846,15 +2160,18 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void SetSpeedRate(UnitMoveType mtype, float rate, bool forced = false);
 
         void KnockBackFrom(Unit* target, float horizontalSpeed, float verticalSpeed);
+        void KnockBackWithAngle(float angle, float horizontalSpeed, float verticalSpeed);
 
         void _RemoveAllAuraMods();
         void _ApplyAllAuraMods();
 
         int32 CalculateSpellDamage(Unit const* target, SpellEntry const* spellProto, SpellEffectIndex effect_index, int32 const* basePoints = NULL);
 
-        uint32 CalcNotIgnoreAbsorbDamage( uint32 damage, SpellSchoolMask damageSchoolMask, SpellEntry const* spellInfo = NULL);
-        uint32 CalcNotIgnoreDamageReduction(uint32 damage, SpellSchoolMask damageSchoolMask);
+        uint32 CalcNotIgnoreAbsorbDamage(DamageInfo* damageInfo);
+        uint32 CalcNotIgnoreDamageReduction(DamageInfo* damageInfo);
         int32 CalculateAuraDuration(SpellEntry const* spellProto, uint32 effectMask, int32 duration, Unit const* caster);
+        uint32 CalculateAuraPeriodicTimeWithHaste(SpellEntry const* spellProto, uint32 periodicTime);
+        uint32 CalculateSpellDurationWithHaste(SpellEntry const* spellProto, uint32 duration);
 
         float CalculateLevelPenalty(SpellEntry const* spellProto) const;
 
@@ -1862,24 +2179,35 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void removeFollower(FollowerReference* /*pRef*/ ) { /* nothing to do yet */ }
 
         MotionMaster* GetMotionMaster() { return &i_motionMaster; }
+        UnitStateMgr& GetUnitStateMgr() { return m_stateMgr; }
+        bool IsInUnitState(UnitActionId state) const { return m_stateMgr.GetCurrentState() == state; }
 
         bool IsStopped() const { return !(hasUnitState(UNIT_STAT_MOVING)); }
-        void StopMoving();
+        void StopMoving(bool ignoreMoveState = false);
+        void InterruptMoving(bool ignoreMoveState = false);
 
         void SetFeared(bool apply, ObjectGuid casterGuid = ObjectGuid(), uint32 spellID = 0, uint32 time = 0);
         void SetConfused(bool apply, ObjectGuid casterGuid = ObjectGuid(), uint32 spellID = 0);
         void SetFeignDeath(bool apply, ObjectGuid casterGuid = ObjectGuid(), uint32 spellID = 0);
 
-        void AddComboPointHolder(uint32 lowguid) { m_ComboPointHolders.insert(lowguid); }
-        void RemoveComboPointHolder(uint32 lowguid) { m_ComboPointHolders.erase(lowguid); }
+        void AddComboPointHolder(ObjectGuid guid) { m_ComboPointHolders.insert(guid); }
+        void RemoveComboPointHolder(ObjectGuid guid) { m_ComboPointHolders.erase(guid); }
         void ClearComboPointHolders();
 
+        uint8 GetComboPoints() const { return m_comboPoints; }
+        ObjectGuid const& GetComboTargetGuid() const { return m_comboTargetGuid; }
+
+        void AddComboPoints(Unit* target, int8 count);
+        void ClearComboPoints();
+
         ///----------Pet responses methods-----------------
-        void SendPetCastFail(uint32 spellid, SpellCastResult msg);
-        void SendPetActionFeedback (uint8 msg);
-        void SendPetTalk (uint32 pettalk);
+        void SendPetActionFeedback(uint8 msg);
+        void SendPetTalk(uint32 pettalk);
         void SendPetAIReaction();
         ///----------End of Pet responses methods----------
+        void DoPetAction(Player* owner, uint8 flag, uint32 spellid, ObjectGuid petGuid, ObjectGuid targetGuid);
+        void DoPetCastSpell(Player *owner, uint8 cast_count, SpellCastTargets* targets, SpellEntry const* spellInfo);
+        void DoPetCastSpell(Unit* target, uint32 spellId);
 
         void propagateSpeedChange() { GetMotionMaster()->propagateSpeedChange(); }
 
@@ -1897,9 +2225,41 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void AddPetAura(PetAura const* petSpell);
         void RemovePetAura(PetAura const* petSpell);
 
+        // Frozen Mod
+        inline void SetSpoofSamePlayerFaction(bool b) { m_spoofSamePlayerFaction = b; }
+        inline bool IsSpoofSamePlayerFaction(void)    { return m_spoofSamePlayerFaction; }
+        // Frozen Mod
+
         // Movement info
         MovementInfo m_movementInfo;
-        Movement::MoveSpline * movespline;
+        MovementInfo const& GetMovementInfo() const { return m_movementInfo; };
+
+        // Transports
+        uint32 GetTransTime() const { return m_movementInfo.GetTransportTime(); }
+        int8 GetTransSeat() const { return m_movementInfo.GetTransportSeat(); }
+
+        // Vehicle system (over-aura operation)
+        void EnterVehicle(Unit* base, int8 seatId = -1);
+        void EnterVehicle(VehicleKitPtr vehicle, int8 seatId = -1);
+        void ExitVehicle(bool forceDismount = false);
+        // Vehicle system (direct operation)
+        void _EnterVehicle(VehicleKitPtr vehicle, int8 seatId = -1);
+        void _ExitVehicle(bool forceDismount = false);
+
+        void EjectVehiclePassenger(Unit* pPassenger);
+        void EjectVehiclePassenger(int8 seatId = -1);
+
+        void ChangeSeat(int8 seatId, bool next = true);
+        VehicleKitPtr GetVehicle() const { return m_pVehicle; }
+        VehicleKitPtr GetVehicleKit() const { return m_pVehicleKit; }
+        void RemoveVehicleKit();
+
+        virtual bool IsTransport() const override { return bool(GetVehicleKit()); };
+        TransportBase* GetTransportBase() { return (TransportBase*)(&*GetVehicleKit()); };
+
+        VehicleEntry const* GetVehicleInfo() const;
+        virtual bool IsVehicle() const override { return GetVehicleInfo() != NULL; }
+        void SetVehicleId(uint32 entry);
 
         void ScheduleAINotify(uint32 delay);
         bool IsAINotifyScheduled() const { return m_AINotifyScheduled;}
@@ -1908,6 +2268,24 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
 
         bool IsLinkingEventTrigger() const { return m_isCreatureLinkingTrigger; }
 
+        // Cooldown System
+        static uint32 const infinityCooldownDelay = MONTH;  // used for set "infinity cooldowns" for spells and check
+        static uint32 const infinityCooldownDelayCheck = MONTH/2;
+        bool HasSpellCooldown(SpellEntry const* spellInfo) const;
+        bool HasSpellCooldown(uint32 spellId) const;
+        time_t GetSpellCooldownDelay(SpellEntry const* spellInfo) const;
+        SpellCooldowns const* GetSpellCooldownMap() const { return &m_spellCooldowns; }
+
+        void RemoveOutdatedSpellCooldowns();
+
+        void AddSpellCooldown(uint32 spell_id, uint32 itemid, time_t end_time);
+        void AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 itemId = 0, bool infinityCooldown = false );
+        void RemoveSpellCooldown(uint32 spell_id, bool update = false);
+        void RemoveAllSpellCooldown();
+        void RemoveSpellCategoryCooldown(uint32 cat, bool update = false);
+
+        void KillSelf(uint32 keepHealthPoints = 0); // used instead ForcedDespawn() when not need despawn unit
+
     protected:
         explicit Unit ();
 
@@ -1918,20 +2296,17 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
 
         float m_createStats[MAX_STATS];
 
-        AttackerSet m_attackers;
-        Unit* m_attacking;
+        ObjectGuid m_attackingGuid;
 
         DeathState m_deathState;
 
         SpellAuraHolderMap m_spellAuraHolders;
-        SpellAuraHolderMap::iterator m_spellAuraHoldersUpdateIterator; // != end() in Unit::m_spellAuraHolders update and point to next element
-        AuraList m_deletedAuras;                                       // auras removed while in ApplyModifier and waiting deleted
-        SpellAuraHolderList m_deletedHolders;
+        SpellAuraHolderQueue m_deletedHolders;
 
-        SingleCastSpellTargetMap m_singleCastSpellTargets;  // casted by unit single per-caster auras
+        // Store Auras for which the target must be tracked
+        TrackedAuraTargetMap m_trackedAuraTargets[MAX_TRACKED_AURA_TYPES];
 
-        typedef std::list<ObjectGuid> DynObjectGUIDs;
-        DynObjectGUIDs m_dynObjGUIDs;
+        GuidList m_dynObjGuids;
 
         typedef std::list<GameObject*> GameObjectList;
         GameObjectList m_gameObj;
@@ -1944,6 +2319,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         float m_auraModifiersGroup[UNIT_MOD_END][MODIFIER_TYPE_END];
         float m_weaponDamage[MAX_ATTACK][2];
         bool m_canModifyStats;
+
         //std::list< spellEffectPair > AuraSpells[TOTAL_AURAS];  // TODO: use this if ok for mem
         VisibleAuraMap m_visibleAuras;
 
@@ -1951,7 +2327,6 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
 
         CharmInfo *m_charmInfo;
 
-        virtual SpellSchoolMask GetMeleeDamageSchoolMask() const;
 
         MotionMaster i_motionMaster;
 
@@ -1959,13 +2334,19 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         uint32 m_regenTimer;
         uint32 m_lastManaUseTimer;
 
-        VehicleInfo* m_vehicleInfo;
+        // Frozen Mod
+        bool m_spoofSamePlayerFaction : 1;
+        // Frozen Mod
+
+        VehicleKitPtr m_pVehicleKit;
+        VehicleKitPtr m_pVehicle;
+
         void DisableSpline();
         bool m_isCreatureLinkingTrigger;
         bool m_isSpawningLinked;
 
     private:
-        void CleanupDeletedAuras();
+        void CleanupDeletedHolders(bool force = false);
         void UpdateSplineMovement(uint32 t_diff);
 
         // player or player's pet
@@ -1975,6 +2356,9 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         Unit* _GetTotem(TotemSlot slot) const;              // for templated function without include need
         Pet* _GetPet(ObjectGuid guid) const;                // for templated function without include need
 
+        // Wrapper called by DealDamage when a creature is killed
+        void JustKilledCreature(Creature* victim, Player* responsiblePlayer);
+
         uint32 m_state;                                     // Even derived shouldn't modify
         uint32 m_CombatTimer;
 
@@ -1982,23 +2366,32 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         uint32 m_castCounter;                               // count casts chain of triggered spells for prevent infinity cast crashes
 
         UnitVisibility m_Visibility;
-        Position m_last_notified_position;
+        WorldLocation m_last_notified_position;
         bool m_AINotifyScheduled;
-        ShortTimeTracker m_movesplineTimer;
 
         Diminishing m_Diminishing;
         // Manage all Units threatening us
         ThreatManager m_ThreatManager;
         // Manage all Units that are threatened by us
-        HostileRefManager m_HostileRefManager;
+        HostileRefManager* m_HostileRefManager;
 
         FollowerRefManager m_FollowingRefManager;
 
         ComboPointHolderSet m_ComboPointHolders;
+        ObjectGuid m_comboTargetGuid;
+        int8 m_comboPoints;
+
+        uint32 m_originalFaction;
 
-        GuardianPetList m_guardianPets;
+        GuidSet m_groupPets;
+        GuidSet m_guardianPets;
 
         ObjectGuid m_TotemSlot[MAX_TOTEM_SLOT];
+        UnitStateMgr m_stateMgr;
+
+        ObjectGuid m_fixateTargetGuid;                      //< Stores the Guid of a fixated target
+
+        SpellCooldowns m_spellCooldowns;
 
     private:                                                // Error traps for some wrong args using
         // this will catch and prevent build for any cases when all optional args skipped and instead triggered used non boolean type
@@ -2015,59 +2408,93 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void CastSpell(float x, float y, float z, uint32 spell, TR triggered);
         template <typename TR>
         void CastSpell(float x, float y, float z, SpellEntry const* spell, TR triggered);
+        template <typename TR>
+        void CastSpell(WorldLocation const& loc, uint32 spell, TR triggered);
+        template <typename TR>
+        void CastSpell(WorldLocation const& loc, SpellEntry const* spell, TR triggered);
 };
 
 template<typename Func>
 void Unit::CallForAllControlledUnits(Func const& func, uint32 controlledMask)
 {
     if (controlledMask & CONTROLLED_PET)
-        if (Pet* pet = GetPet())
-            func(pet);
+    {
+        if (!m_groupPets.empty())
+        {
+            GuidSet groupPetsCopy = GetPets();  // Original list may be modified in this function
+            for (GuidSet::const_iterator itr = groupPetsCopy.begin(); itr != groupPetsCopy.end(); ++itr)
+            {
+                if (Pet* pet = _GetPet(*itr))
+                    func(pet);
+            }
+        }
+    }
 
     if (controlledMask & CONTROLLED_MINIPET)
-        if (Unit* mini = GetMiniPet())
+    {
+        if (Unit* mini = (Unit*)GetMiniPet())
             func(mini);
+    }
 
     if (controlledMask & CONTROLLED_GUARDIANS)
     {
-        for(GuardianPetList::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end();)
+        for (GuidSet::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end();)
+        {
             if (Pet* guardian = _GetPet(*(itr++)))
                 func(guardian);
+        }
+    }
+
+    if (controlledMask & CONTROLLED_CHARM)
+    {
+        if (Unit* charm = GetCharm())
+            func(charm);
     }
 
     if (controlledMask & CONTROLLED_TOTEMS)
     {
         for (int i = 0; i < MAX_TOTEM_SLOT; ++i)
-            if (Unit *totem = _GetTotem(TotemSlot(i)))
+        {
+            if (Unit* totem = _GetTotem(TotemSlot(i)))
                 func(totem);
+        }
     }
-
-    if (controlledMask & CONTROLLED_CHARM)
-        if (Unit* charm = GetCharm())
-            func(charm);
 }
 
-
 template<typename Func>
 bool Unit::CheckAllControlledUnits(Func const& func, uint32 controlledMask) const
 {
     if (controlledMask & CONTROLLED_PET)
-        if (Pet const* pet = GetPet())
-            if (func(pet))
-                return true;
+    {
+        if (!m_groupPets.empty())
+        {
+            for (GuidSet::const_iterator itr = m_groupPets.begin(); itr != m_groupPets.end();)
+                if (Pet const* pet = _GetPet(*(itr++)))
+                    if (func(pet))
+                        return true;
+        }
+    }
 
     if (controlledMask & CONTROLLED_MINIPET)
-        if(Unit const* mini = GetMiniPet())
+    {
+        if (Unit* mini = (Unit*)GetMiniPet())
             if (func(mini))
                 return true;
+    }
 
     if (controlledMask & CONTROLLED_GUARDIANS)
     {
-        for(GuardianPetList::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end();)
+        for (GuidSet::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end();)
             if (Pet const* guardian = _GetPet(*(itr++)))
                 if (func(guardian))
                     return true;
+    }
 
+    if (controlledMask & CONTROLLED_CHARM)
+    {
+        if (Unit const* charm = GetCharm())
+            if (func(charm))
+                return true;
     }
 
     if (controlledMask & CONTROLLED_TOTEMS)
@@ -2078,11 +2505,6 @@ bool Unit::CheckAllControlledUnits(Func const& func, uint32 controlledMask) cons
                     return true;
     }
 
-    if (controlledMask & CONTROLLED_CHARM)
-        if (Unit const* charm = GetCharm())
-            if (func(charm))
-                return true;
-
     return false;
 }
 
diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/UnitAuraProcHandler.cpp
index 342508e49be..74286e3481d 100644
--- a/src/game/UnitAuraProcHandler.cpp
+++ b/src/game/UnitAuraProcHandler.cpp
@@ -37,20 +37,20 @@ pAuraProcHandler AuraProcHandler[TOTAL_AURAS]=
     &Unit::HandleNULLProc,                                  //  2 SPELL_AURA_MOD_POSSESS
     &Unit::HandleNULLProc,                                  //  3 SPELL_AURA_PERIODIC_DAMAGE
     &Unit::HandleDummyAuraProc,                             //  4 SPELL_AURA_DUMMY
-    &Unit::HandleNULLProc,                                  //  5 SPELL_AURA_MOD_CONFUSE
+    &Unit::HandleRemoveByDamageChanceProc,                  //  5 SPELL_AURA_MOD_CONFUSE
     &Unit::HandleNULLProc,                                  //  6 SPELL_AURA_MOD_CHARM
     &Unit::HandleRemoveByDamageChanceProc,                  //  7 SPELL_AURA_MOD_FEAR
     &Unit::HandleNULLProc,                                  //  8 SPELL_AURA_PERIODIC_HEAL
     &Unit::HandleNULLProc,                                  //  9 SPELL_AURA_MOD_ATTACKSPEED
     &Unit::HandleNULLProc,                                  // 10 SPELL_AURA_MOD_THREAT
     &Unit::HandleNULLProc,                                  // 11 SPELL_AURA_MOD_TAUNT
-    &Unit::HandleNULLProc,                                  // 12 SPELL_AURA_MOD_STUN
+    &Unit::HandleRemoveByDamageChanceProc,                  // 12 SPELL_AURA_MOD_STUN
     &Unit::HandleNULLProc,                                  // 13 SPELL_AURA_MOD_DAMAGE_DONE
     &Unit::HandleNULLProc,                                  // 14 SPELL_AURA_MOD_DAMAGE_TAKEN
-    &Unit::HandleNULLProc,                                  // 15 SPELL_AURA_DAMAGE_SHIELD
-    &Unit::HandleNULLProc,                                  // 16 SPELL_AURA_MOD_STEALTH
+    &Unit::HandleDamageShieldAuraProc,                      // 15 SPELL_AURA_DAMAGE_SHIELD
+    &Unit::HandleRemoveByDamageProc,                        // 16 SPELL_AURA_MOD_STEALTH
     &Unit::HandleNULLProc,                                  // 17 SPELL_AURA_MOD_STEALTH_DETECT
-    &Unit::HandleNULLProc,                                  // 18 SPELL_AURA_MOD_INVISIBILITY
+    &Unit::HandleRemoveByDamageProc,                        // 18 SPELL_AURA_MOD_INVISIBILITY
     &Unit::HandleNULLProc,                                  // 19 SPELL_AURA_MOD_INVISIBILITY_DETECTION
     &Unit::HandleNULLProc,                                  // 20 SPELL_AURA_OBS_MOD_HEALTH
     &Unit::HandleNULLProc,                                  // 21 SPELL_AURA_OBS_MOD_MANA
@@ -80,7 +80,7 @@ pAuraProcHandler AuraProcHandler[TOTAL_AURAS]=
     &Unit::HandleNULLProc,                                  // 45 SPELL_AURA_TRACK_RESOURCES
     &Unit::HandleNULLProc,                                  // 46 SPELL_AURA_46 (used in test spells 54054 and 54058, and spell 48050) (3.0.8a-3.2.2a)
     &Unit::HandleNULLProc,                                  // 47 SPELL_AURA_MOD_PARRY_PERCENT
-    &Unit::HandleNULLProc,                                  // 48 SPELL_AURA_48 spell Napalm (area damage spell with additional delayed damage effect)
+    &Unit::HandleNULLProc,                                  // 48 SPELL_AURA_PERIODIC_TRIGGER_BY_CLIENT (Client periodic trigger spell by self (3 spells in 3.3.5a))
     &Unit::HandleNULLProc,                                  // 49 SPELL_AURA_MOD_DODGE_PERCENT
     &Unit::HandleNULLProc,                                  // 50 SPELL_AURA_MOD_CRITICAL_HEALING_AMOUNT
     &Unit::HandleNULLProc,                                  // 51 SPELL_AURA_MOD_BLOCK_PERCENT
@@ -88,7 +88,7 @@ pAuraProcHandler AuraProcHandler[TOTAL_AURAS]=
     &Unit::HandleNULLProc,                                  // 53 SPELL_AURA_PERIODIC_LEECH
     &Unit::HandleNULLProc,                                  // 54 SPELL_AURA_MOD_HIT_CHANCE
     &Unit::HandleNULLProc,                                  // 55 SPELL_AURA_MOD_SPELL_HIT_CHANCE
-    &Unit::HandleNULLProc,                                  // 56 SPELL_AURA_TRANSFORM
+    &Unit::HandleRemoveByDamageChanceProc,                  // 56 SPELL_AURA_TRANSFORM
     &Unit::HandleSpellCritChanceAuraProc,                   // 57 SPELL_AURA_MOD_SPELL_CRIT_CHANCE
     &Unit::HandleNULLProc,                                  // 58 SPELL_AURA_MOD_INCREASE_SWIM_SPEED
     &Unit::HandleNULLProc,                                  // 59 SPELL_AURA_MOD_DAMAGE_DONE_CREATURE
@@ -98,7 +98,7 @@ pAuraProcHandler AuraProcHandler[TOTAL_AURAS]=
     &Unit::HandleNULLProc,                                  // 63 unused (3.0.8a-3.2.2a) old SPELL_AURA_PERIODIC_MANA_FUNNEL
     &Unit::HandleNULLProc,                                  // 64 SPELL_AURA_PERIODIC_MANA_LEECH
     &Unit::HandleModCastingSpeedNotStackAuraProc,           // 65 SPELL_AURA_MOD_CASTING_SPEED_NOT_STACK
-    &Unit::HandleNULLProc,                                  // 66 SPELL_AURA_FEIGN_DEATH
+    &Unit::HandleRemoveByDamageProc,                        // 66 SPELL_AURA_FEIGN_DEATH
     &Unit::HandleNULLProc,                                  // 67 SPELL_AURA_MOD_DISARM
     &Unit::HandleNULLProc,                                  // 68 SPELL_AURA_MOD_STALKED
     &Unit::HandleNULLProc,                                  // 69 SPELL_AURA_SCHOOL_ABSORB
@@ -136,14 +136,14 @@ pAuraProcHandler AuraProcHandler[TOTAL_AURAS]=
     &Unit::HandleNULLProc,                                  //101 SPELL_AURA_MOD_RESISTANCE_PCT
     &Unit::HandleNULLProc,                                  //102 SPELL_AURA_MOD_MELEE_ATTACK_POWER_VERSUS
     &Unit::HandleNULLProc,                                  //103 SPELL_AURA_MOD_TOTAL_THREAT
-    &Unit::HandleNULLProc,                                  //104 SPELL_AURA_WATER_WALK
+    &Unit::HandleRemoveByDamageProc,                        //104 SPELL_AURA_WATER_WALK
     &Unit::HandleNULLProc,                                  //105 SPELL_AURA_FEATHER_FALL
     &Unit::HandleNULLProc,                                  //106 SPELL_AURA_HOVER
     &Unit::HandleAddFlatModifierAuraProc,                   //107 SPELL_AURA_ADD_FLAT_MODIFIER
     &Unit::HandleAddPctModifierAuraProc,                    //108 SPELL_AURA_ADD_PCT_MODIFIER
     &Unit::HandleNULLProc,                                  //109 SPELL_AURA_ADD_TARGET_TRIGGER
     &Unit::HandleNULLProc,                                  //110 SPELL_AURA_MOD_POWER_REGEN_PERCENT
-    &Unit::HandleNULLProc,                                  //111 SPELL_AURA_ADD_CASTER_HIT_TRIGGER
+    &Unit::HandleDropChargeByDamageProc,                    //111 SPELL_AURA_ADD_CASTER_HIT_TRIGGER
     &Unit::HandleOverrideClassScriptAuraProc,               //112 SPELL_AURA_OVERRIDE_CLASS_SCRIPTS
     &Unit::HandleNULLProc,                                  //113 SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN
     &Unit::HandleNULLProc,                                  //114 SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN_PCT
@@ -258,7 +258,7 @@ pAuraProcHandler AuraProcHandler[TOTAL_AURAS]=
     &Unit::HandleNULLProc,                                  //223 dummy code (cast damage spell to attacker) and another dymmy (jump to another nearby raid member)
     &Unit::HandleNULLProc,                                  //224 unused (3.0.8a-3.2.2a)
     &Unit::HandleMendingAuraProc,                           //225 SPELL_AURA_PRAYER_OF_MENDING
-    &Unit::HandleNULLProc,                                  //226 SPELL_AURA_PERIODIC_DUMMY
+    &Unit::HandlePeriodicDummyAuraProc,                     //226 SPELL_AURA_PERIODIC_DUMMY
     &Unit::HandleNULLProc,                                  //227 SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE
     &Unit::HandleNULLProc,                                  //228 SPELL_AURA_DETECT_STEALTH
     &Unit::HandleNULLProc,                                  //229 SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE
@@ -294,7 +294,7 @@ pAuraProcHandler AuraProcHandler[TOTAL_AURAS]=
     &Unit::HandleNULLProc,                                  //259 corrupt healing over time spell
     &Unit::HandleNULLProc,                                  //260 SPELL_AURA_SCREEN_EFFECT (miscvalue = id in ScreenEffect.dbc) not required any code
     &Unit::HandleNULLProc,                                  //261 SPELL_AURA_PHASE undetectable invisibility?
-    &Unit::HandleNULLProc,                                  //262 SPELL_AURA_IGNORE_UNIT_STATE
+    &Unit::HandleIgnoreUnitStateAuraProc,                   //262 SPELL_AURA_IGNORE_UNIT_STATE
     &Unit::HandleNULLProc,                                  //263 SPELL_AURA_ALLOW_ONLY_ABILITY player can use only abilities set in SpellClassMask
     &Unit::HandleNULLProc,                                  //264 unused (3.0.8a-3.2.2a)
     &Unit::HandleNULLProc,                                  //265 unused (3.0.8a-3.2.2a)
@@ -351,29 +351,40 @@ pAuraProcHandler AuraProcHandler[TOTAL_AURAS]=
     &Unit::HandleNULLProc                                   //316 makes haste affect HOT/DOT ticks
 };
 
-bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, SpellAuraHolder* holder, SpellEntry const* procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, SpellProcEventEntry const*& spellProcEvent )
+bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, SpellAuraHolderPtr holder, SpellEntry const* procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, SpellProcEventEntry const*& spellProcEvent )
 {
-    SpellEntry const* spellProto = holder->GetSpellProto ();
+    if (!holder || holder->IsDeleted())
+        return false;
+
+    SpellEntry const* spellProto = holder->GetSpellProto();
+
+    if (!spellProto)
+        return false;
 
-    // Get proc Event Entry
-    spellProcEvent = sSpellMgr.GetSpellProcEvent(spellProto->Id);
+    switch (IsTriggeredAtCustomProcEvent(pVictim, holder, procSpell, procFlag, procExtra, attType, isVictim, spellProcEvent))
+    {
+        case SPELL_AURA_PROC_OK:
+            return true;
+        case SPELL_AURA_PROC_CANT_TRIGGER:
+            return false;
+        case SPELL_AURA_PROC_FAILED:
+        default:
+            break;
+    }
 
     // Get EventProcFlag
-    uint32 EventProcFlag;
-    if (spellProcEvent && spellProcEvent->procFlags) // if exist get custom spellProcEvent->procFlags
-        EventProcFlag = spellProcEvent->procFlags;
-    else
-        EventProcFlag = spellProto->procFlags;       // else get from spell proto
+    uint32 EventProcFlag = GetProcFlag(spellProto);
+
     // Continue if no trigger exist
     if (!EventProcFlag)
         return false;
 
     // Check spellProcEvent data requirements
-    if(!SpellMgr::IsSpellProcEventCanTriggeredBy(spellProcEvent, EventProcFlag, procSpell, procFlag, procExtra))
+    if (!SpellMgr::IsSpellProcEventCanTriggeredBy(spellProcEvent, EventProcFlag, procSpell, procFlag, procExtra))
         return false;
 
     // In most cases req get honor or XP from kill
-    if (EventProcFlag & PROC_FLAG_KILL && GetTypeId() == TYPEID_PLAYER)
+    if ((EventProcFlag & PROC_FLAG_KILL) && GetTypeId() == TYPEID_PLAYER)
     {
         bool allow = ((Player*)this)->isHonorOrXPTarget(pVictim);
         // Shadow Word: Death - can trigger from every kill
@@ -384,46 +395,67 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, SpellAuraHolder* holder, S
     }
     // Aura added by spell can`t trigger from self (prevent drop charges/do triggers)
     // But except periodic triggers (can triggered from self)
-    if(procSpell && procSpell->Id == spellProto->Id && !(EventProcFlag & PROC_FLAG_ON_TAKE_PERIODIC))
+    if (procSpell && procSpell->Id == spellProto->Id && !(EventProcFlag & PROC_FLAG_ON_TAKE_PERIODIC))
         return false;
 
     // Check if current equipment allows aura to proc
-    if(!isVictim && GetTypeId() == TYPEID_PLAYER)
+    if (!isVictim && GetTypeId() == TYPEID_PLAYER)
     {
-        if(spellProto->EquippedItemClass == ITEM_CLASS_WEAPON)
+        if (spellProto->EquippedItemClass == ITEM_CLASS_WEAPON)
         {
             Item *item = NULL;
-            if(attType == BASE_ATTACK)
+            if (attType == BASE_ATTACK)
                 item = ((Player*)this)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
             else if (attType == OFF_ATTACK)
                 item = ((Player*)this)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
             else
                 item = ((Player*)this)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED);
 
-            if(!item || item->IsBroken() || item->GetProto()->Class != ITEM_CLASS_WEAPON || !((1<<item->GetProto()->SubClass) & spellProto->EquippedItemSubClassMask))
+            if (!item || item->IsBroken() || item->GetProto()->Class != ITEM_CLASS_WEAPON || !((1<<item->GetProto()->SubClass) & spellProto->EquippedItemSubClassMask))
                 return false;
         }
-        else if(spellProto->EquippedItemClass == ITEM_CLASS_ARMOR)
+        else if (spellProto->EquippedItemClass == ITEM_CLASS_ARMOR)
         {
             // Check if player is wearing shield
             Item *item = ((Player*)this)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
-            if(!item || item->IsBroken() || !CanUseEquippedWeapon(OFF_ATTACK) || item->GetProto()->Class != ITEM_CLASS_ARMOR || !((1<<item->GetProto()->SubClass) & spellProto->EquippedItemSubClassMask))
+            if (!item || item->IsBroken() || !CanUseEquippedWeapon(OFF_ATTACK) || item->GetProto()->Class != ITEM_CLASS_ARMOR || !((1<<item->GetProto()->SubClass) & spellProto->EquippedItemSubClassMask))
                 return false;
         }
     }
     // Get chance from spell
     float chance = (float)spellProto->procChance;
     // If in spellProcEvent exist custom chance, chance = spellProcEvent->customChance;
-    if(spellProcEvent && spellProcEvent->customChance)
+    if (spellProcEvent && spellProcEvent->customChance)
         chance = spellProcEvent->customChance;
     // If PPM exist calculate chance from PPM
-    if(!isVictim && spellProcEvent && spellProcEvent->ppmRate != 0)
+    if (!isVictim && spellProcEvent && spellProcEvent->ppmRate != 0)
     {
         uint32 WeaponSpeed = GetAttackTime(attType);
         chance = GetPPMProcChance(WeaponSpeed, spellProcEvent->ppmRate);
     }
-    // Apply chance modifier aura
-    if(Player* modOwner = GetSpellModOwner())
+
+    // some spells has direct chance modifiers in dummy auras
+    switch(spellProto->SpellFamilyName)
+    {
+        case SPELLFAMILY_SHAMAN:
+        {
+            if (spellProto->GetSpellFamilyFlags().test<CF_SHAMAN_EARTHLIVING_WEAPON_PASSIVE>())
+            {
+                // only if target has < 35% health
+                if (!pVictim || !pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
+                    break;
+
+                // Blessing of the Eternals
+                if (Aura* modAura = GetAuraByEffectMask(SPELL_AURA_DUMMY,SPELLFAMILY_SHAMAN,spellProto->GetSpellFamilyFlags(),GetObjectGuid()))
+                    chance += (float)modAura->GetModifier()->m_amount;
+                break;
+            }
+        }
+        break;
+    }
+
+    // Apply cumulative chance modifier auras
+    if (Player* modOwner = GetSpellModOwner())
     {
         modOwner->ApplySpellMod(spellProto->Id,SPELLMOD_CHANCE_OF_SUCCESS,chance);
         modOwner->ApplySpellMod(spellProto->Id,SPELLMOD_FREQUENCY_OF_SUCCESS,chance);
@@ -432,7 +464,7 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, SpellAuraHolder* holder, S
     return roll_chance_f(chance);
 }
 
-SpellAuraProcResult Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown)
+SpellAuraProcResult Unit::HandleHasteAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown)
 {
     SpellEntry const *hasteSpell = triggeredByAura->GetSpellProto();
 
@@ -456,7 +488,8 @@ SpellAuraProcResult Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, Aura
                     target = SelectRandomUnfriendlyTarget(pVictim);
                     if(!target)
                         return SPELL_AURA_PROC_FAILED;
-                    basepoints0 = damage;
+
+                    basepoints0 = int32(damageInfo->damage);
                     triggered_spell_id = 22482;
                     break;
                 }
@@ -466,12 +499,12 @@ SpellAuraProcResult Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, Aura
     }
 
     // processed charge only counting case
-    if(!triggered_spell_id)
+    if (!triggered_spell_id)
         return SPELL_AURA_PROC_OK;
 
     SpellEntry const* triggerEntry = sSpellStore.LookupEntry(triggered_spell_id);
 
-    if(!triggerEntry)
+    if (!triggerEntry)
     {
         sLog.outError("Unit::HandleHasteAuraProc: Spell %u have nonexistent triggered spell %u",hasteSpell->Id,triggered_spell_id);
         return SPELL_AURA_PROC_FAILED;
@@ -481,7 +514,7 @@ SpellAuraProcResult Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, Aura
     if (!target || (target != this && !target->isAlive()))
         return SPELL_AURA_PROC_FAILED;
 
-    if (cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(triggered_spell_id))
+    if (cooldown && HasSpellCooldown(triggerEntry))
         return SPELL_AURA_PROC_FAILED;
 
     if (basepoints0)
@@ -489,18 +522,18 @@ SpellAuraProcResult Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, Aura
     else
         CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura);
 
-    if (cooldown && GetTypeId()==TYPEID_PLAYER)
-        ((Player*)this)->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
+    if (cooldown)
+        AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
 
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*damage*/, Aura* triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown)
+SpellAuraProcResult Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown)
 {
     if (!procSpell)
         return SPELL_AURA_PROC_FAILED;
 
-    SpellEntry const *triggeredByAuraSpell = triggeredByAura->GetSpellProto();
+    SpellEntry const* triggeredByAuraSpell = triggeredByAura->GetSpellProto();
 
     Item* castItem = triggeredByAura->GetCastItemGuid() && GetTypeId()==TYPEID_PLAYER
         ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetCastItemGuid()) : NULL;
@@ -527,7 +560,10 @@ SpellAuraProcResult Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*
                     break;
                 }
             }
+            break;
         }
+        default:
+            break;
     }
 
     // processed charge only counting case
@@ -536,7 +572,7 @@ SpellAuraProcResult Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*
 
     SpellEntry const* triggerEntry = sSpellStore.LookupEntry(triggered_spell_id);
 
-    if(!triggerEntry)
+    if (!triggerEntry)
     {
         sLog.outError("Unit::HandleHasteAuraProc: Spell %u have nonexistent triggered spell %u",triggeredByAuraSpell->Id,triggered_spell_id);
         return SPELL_AURA_PROC_FAILED;
@@ -546,7 +582,7 @@ SpellAuraProcResult Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*
     if (!target || (target != this && !target->isAlive()))
         return SPELL_AURA_PROC_FAILED;
 
-    if (cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(triggered_spell_id))
+    if (cooldown && HasSpellCooldown(triggered_spell_id))
         return SPELL_AURA_PROC_FAILED;
 
     if (basepoints0)
@@ -554,17 +590,18 @@ SpellAuraProcResult Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*
     else
         CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura);
 
-    if (cooldown && GetTypeId()==TYPEID_PLAYER)
-        ((Player*)this)->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
+    if (cooldown)
+        AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
 
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
+SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
 {
     SpellEntry const *dummySpell = triggeredByAura->GetSpellProto ();
     SpellEffectIndex effIndex = triggeredByAura->GetEffIndex();
     int32  triggerAmount = triggeredByAura->GetModifier()->m_amount;
+    uint32 damage = damageInfo->damage;
 
     Item* castItem = triggeredByAura->GetCastItemGuid() && GetTypeId()==TYPEID_PLAYER
         ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetCastItemGuid()) : NULL;
@@ -573,6 +610,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
     uint32 triggered_spell_id = dummySpell->EffectApplyAuraName[effIndex] == SPELL_AURA_DUMMY ? dummySpell->EffectTriggerSpell[effIndex] : 0;
     Unit* target = pVictim;
     int32  basepoints[MAX_EFFECT_INDEX] = {0, 0, 0};
+    ObjectGuid originalCaster = ObjectGuid();
 
     switch(dummySpell->SpellFamilyName)
     {
@@ -601,7 +639,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                         return SPELL_AURA_PROC_FAILED;
 
                     target = SelectRandomUnfriendlyTarget(pVictim);
-                    if(!target)
+                    if (!target)
                         return SPELL_AURA_PROC_FAILED;
 
                     triggered_spell_id = 26654;
@@ -630,7 +668,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Adaptive Warding (Frostfire Regalia set)
                 case 28764:
                 {
-                    if(!procSpell)
+                    if (!procSpell)
                         return SPELL_AURA_PROC_FAILED;
 
                     // find Mage Armor
@@ -638,16 +676,16 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     AuraList const& mRegenInterupt = GetAurasByType(SPELL_AURA_MOD_MANA_REGEN_INTERRUPT);
                     for(AuraList::const_iterator iter = mRegenInterupt.begin(); iter != mRegenInterupt.end(); ++iter)
                     {
-                        if(SpellEntry const* iterSpellProto = (*iter)->GetSpellProto())
+                        if (SpellEntry const* iterSpellProto = (*iter)->GetSpellProto())
                         {
-                            if(iterSpellProto->SpellFamilyName==SPELLFAMILY_MAGE && (iterSpellProto->SpellFamilyFlags & UI64LIT(0x10000000)))
+                            if (iterSpellProto->SpellFamilyName==SPELLFAMILY_MAGE && iterSpellProto->GetSpellFamilyFlags().test<CF_MAGE_MAGE_ARMOR>())
                             {
                                 found=true;
                                 break;
                             }
                         }
                     }
-                    if(!found)
+                    if (!found)
                         return SPELL_AURA_PROC_FAILED;
 
                     switch(GetFirstSchoolInMask(GetSpellSchoolMask(procSpell)))
@@ -670,7 +708,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Obsidian Armor (Justice Bearer`s Pauldrons shoulder)
                 case 27539:
                 {
-                    if(!procSpell)
+                    if (!procSpell)
                         return SPELL_AURA_PROC_FAILED;
 
                     switch(GetFirstSchoolInMask(GetSpellSchoolMask(procSpell)))
@@ -759,7 +797,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // 41409 Dementia: Every 5 seconds either gives you -5% damage/healing. (Druid, Shaman, Priest, Warlock, Mage, Paladin)
                 case 39446:
                 {
-                    if(GetTypeId() != TYPEID_PLAYER)
+                    if (GetTypeId() != TYPEID_PLAYER)
                         return SPELL_AURA_PROC_FAILED;
 
                     // Select class defined buff
@@ -808,7 +846,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // cast 45429 Arcane Bolt if Exalted by Scryers
                 case 45481:
                 {
-                    if(GetTypeId() != TYPEID_PLAYER)
+                    if (GetTypeId() != TYPEID_PLAYER)
                         return SPELL_AURA_PROC_FAILED;
 
                     // Get Aldor reputation rank
@@ -822,16 +860,16 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     if (((Player *)this)->GetReputationRank(934) == REP_EXALTED)
                     {
                         // triggered at positive/self casts also, current attack target used then
-                        if(IsFriendlyTo(target))
+                        if (IsFriendlyTo(target))
                         {
                             target = getVictim();
-                            if(!target)
+                            if (!target)
                             {
                                 target = ObjectAccessor::GetUnit(*this,((Player *)this)->GetSelectionGuid());
-                                if(!target)
+                                if (!target)
                                     return SPELL_AURA_PROC_FAILED;
                             }
-                            if(IsFriendlyTo(target))
+                            if (IsFriendlyTo(target))
                                 return SPELL_AURA_PROC_FAILED;
                         }
 
@@ -845,7 +883,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // cast 45428 Arcane Strike if Exalted by Scryers
                 case 45482:
                 {
-                    if(GetTypeId() != TYPEID_PLAYER)
+                    if (GetTypeId() != TYPEID_PLAYER)
                         return SPELL_AURA_PROC_FAILED;
 
                     // Get Aldor reputation rank
@@ -868,7 +906,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // cast 45432 Light's Ward if Exalted by Scryers
                 case 45483:
                 {
-                    if(GetTypeId() != TYPEID_PLAYER)
+                    if (GetTypeId() != TYPEID_PLAYER)
                         return SPELL_AURA_PROC_FAILED;
 
                     // Get Aldor reputation rank
@@ -892,7 +930,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // cast 45430 Arcane Surge if Exalted by Scryers
                 case 45484:
                 {
-                    if(GetTypeId() != TYPEID_PLAYER)
+                    if (GetTypeId() != TYPEID_PLAYER)
                         return SPELL_AURA_PROC_FAILED;
 
                     // Get Aldor reputation rank
@@ -924,6 +962,18 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     target = this;
                     break;
                 }
+                // Health Leech (used by Bloodworms)
+                case 50453:
+                {
+                    Unit *owner = GetOwner();
+                    if (!owner)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    triggered_spell_id = 50454;
+                    basepoints[0] = int32(damage*1.69);
+                    target = owner;
+                    break;
+                }
                 // Vampiric Touch (generic, used by some boss)
                 case 52723:
                 case 60501:
@@ -948,13 +998,53 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 case 58914:
                 {
                     // also decrease owner buff stack
-                    if (Unit* owner = GetOwner())
-                        owner->RemoveAuraHolderFromStack(34027);
+                    Unit* owner = GetOwner();
+                    if (!owner)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    owner->RemoveAuraHolderFromStack(34027);
 
                     // Remove only single aura from stack
-                    if (triggeredByAura->GetStackAmount() > 1 && !triggeredByAura->GetHolder()->ModStackAmount(-1))
-                        return SPELL_AURA_PROC_CANT_TRIGGER;
+                    SpellAuraHolderPtr holder = triggeredByAura->GetHolder();
+                    if (holder && !holder->IsDeleted())
+                    {
+                        if (holder->ModStackAmount(-1))
+                        {
+                            owner->RemoveAurasDueToSpell(34026);
+                            return SPELL_AURA_PROC_OK;
+                        }
+                        else
+                            return SPELL_AURA_PROC_CANT_TRIGGER;
+                    }
+                    else
+                        return SPELL_AURA_PROC_FAILED;
+                    break;
+                }
+                // Swift Hand of Justice
+                case 59906:
+                {
+                    triggered_spell_id = 59913;
+                    basepoints[0] = GetMaxHealth()/50;
+                    break;
                 }
+                // Discerning Eye of the Beast
+                case 59915:
+                {
+                    if (GetPowerType() != POWER_MANA)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    triggered_spell_id = 59914;
+                    break;
+                }
+                // Petrified Bark
+                case 62337:
+                 {
+                    triggered_spell_id = 62379;
+                    basepoints[0] = damage;
+                    // this == pVictim, why? :/ temp. workaround
+                    target = SelectRandomUnfriendlyTarget(getVictim());
+                    break;
+                 }
                 // Glyph of Life Tap
                 case 63320:
                     triggered_spell_id = 63321;
@@ -969,6 +1059,12 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 case 68160:
                     triggered_spell_id = 66809;
                     break;
+                // Dark Hunger (Lich King)
+                case 69383:
+                    basepoints[0] = 0.5f * damage;
+                    target = this;
+                    triggered_spell_id = 69384;
+                    break;
                 // Shiny Shard of the Scale - Equip Effect
                 case 69739:
                     // Cauterizing Heal or Searing Flame
@@ -979,6 +1075,106 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     // Cauterizing Heal or Searing Flame
                     triggered_spell_id = (procFlag & PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL) ? 69733 : 69729;
                     break;
+                // Vampiric Might (Cult Fanatic, Icecrown Citadel, Lady Deathwhisper encounter)
+                case 70674:
+                {
+                    if (damage <= 0)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    basepoints[0] = 3 * damage;
+                    triggered_spell_id = 70677;
+                    target = this;
+                    break;
+                }
+                // Essence of the Blood Queen
+                case 70871:
+                {
+                    triggered_spell_id = 70872;
+                    target = this;
+                    basepoints[0] = int32((damage * triggerAmount) / 100.0f);
+                    if (basepoints[0] < 0)
+                        return SPELL_AURA_PROC_FAILED;
+                    break;
+                }
+                case 71169:
+                {
+                    // Shadow's Fate
+                    if (GetTypeId() != TYPEID_UNIT)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    switch (((Creature*)this)->GetCreatureInfo()->Entry)
+                    {
+                        case 38431:  // Puthricide 25
+                        case 38586:
+                            CastSpell(this, 71518, true);
+                            break;
+                        case 38434:  // Lanathel 25
+                        case 38436:
+                            CastSpell(this, 72934, true);
+                            break;
+                        case 38265:  // Sindragosa 25
+                        case 38267:
+                            CastSpell(this, 72289, true);
+                            break;
+                        default:
+                            break;
+                    }
+                    CastSpell(triggeredByAura->GetCaster(), 71203, true);
+                    return SPELL_AURA_PROC_OK;
+                }
+                // Item - Deathbringer's Will
+                case 71519:
+                case 71562:
+                {
+                    uint32 const normal_spells[MAX_CLASSES*3] =
+                    {
+                        0, 0, 0,                // (unused)
+                        71491, 71484, 71492,    // Warrior
+                        71491, 71484, 71492,    // Paladin
+                        71485, 71491, 71486,    // Hunter
+                        71485, 71486, 71492,    // Rogue
+                        71492, 71492, 71492,    // Priest
+                        71491, 71484, 71492,    // Death Knight
+                        71485, 71486, 71492,    // Shaman
+                        71492, 71492, 71492,    // Mage
+                        71492, 71492, 71492,    // Warlock
+                        0, 0, 0,                // (unused)
+                        71485, 71484, 71492     // Druid
+                    };
+                    uint32 const heroic_spells[MAX_CLASSES*3] =
+                    {
+                        0, 0, 0,                // (unused)
+                        71559, 71561, 71560,    // Warrior
+                        71559, 71561, 71560,    // Paladin
+                        71556, 71559, 71558,    // Hunter
+                        71556, 71558, 71560,    // Rogue
+                        71560, 71560, 71560,    // Priest
+                        71559, 71561, 71560,    // Death Knight
+                        71556, 71558, 71560,    // Shaman
+                        71560, 71560, 71560,    // Mage
+                        71560, 71560, 71560,    // Warlock
+                        0, 0, 0,                // (unused)
+                        71556, 71561, 71560     // Druid
+                    };
+
+                    if (cooldown && HasSpellCooldown(dummySpell->Id))
+                        return SPELL_AURA_PROC_FAILED;
+
+                    uint32 const *proc_spells = NULL;
+                    switch (dummySpell->Id)
+                    {
+                        case 71519: proc_spells = normal_spells; break;
+                        case 71562: proc_spells = heroic_spells; break;
+                        default: return SPELL_AURA_PROC_FAILED;
+                    }
+
+                    CastSpell(this, proc_spells[getClass()*3 + urand(0,2)], true, castItem, triggeredByAura);
+
+                    if (cooldown)
+                        AddSpellCooldown(dummySpell->Id, 0, time(NULL) + cooldown);
+
+                    return SPELL_AURA_PROC_OK;
+                }
                 // Item - Shadowmourne Legendary
                 case 71903:
                 {
@@ -987,7 +1183,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
 
                     triggered_spell_id = 71905;             // Soul Fragment
 
-                    SpellAuraHolder *aurHolder = GetSpellAuraHolder(triggered_spell_id);
+                    SpellAuraHolderPtr aurHolder = GetSpellAuraHolder(triggered_spell_id);
 
                     // will added first to stack
                     if (!aurHolder)
@@ -1004,15 +1200,24 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     }
                     break;
                 }
+                // Necrotic Touch item 50692
+                case 71875:
+                case 71877:
+                {
+                    basepoints[0] = damage * triggerAmount / 100;
+                    target = pVictim;
+                    triggered_spell_id = 71879;
+                    break;
+                }
             }
             break;
         }
         case SPELLFAMILY_MAGE:
         {
             // Magic Absorption
-            if (dummySpell->SpellIconID == 459)             // only this spell have SpellIconID == 459 and dummy aura
+            if (dummySpell->GetSpellIconID() == 459)             // only this spell have SpellIconID == 459 and dummy aura
             {
-                if (getPowerType() != POWER_MANA)
+                if (GetPowerType() != POWER_MANA)
                     return SPELL_AURA_PROC_FAILED;
 
                 // mana reward
@@ -1022,9 +1227,9 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Master of Elements
-            if (dummySpell->SpellIconID == 1920)
+            if (dummySpell->GetSpellIconID() == 1920)
             {
-                if(!procSpell)
+                if (!procSpell)
                     return SPELL_AURA_PROC_FAILED;
 
                 // mana cost save
@@ -1039,16 +1244,20 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
             }
 
             // Arcane Potency
-            if (dummySpell->SpellIconID == 2120)
+            if (dummySpell->GetSpellIconID() == 2120)
             {
-                if(!procSpell)
+                if (!procSpell || procSpell->Id == 44401)
                     return SPELL_AURA_PROC_FAILED;
 
                 target = this;
                 switch (dummySpell->Id)
                 {
-                    case 31571: triggered_spell_id = 57529; break;
-                    case 31572: triggered_spell_id = 57531; break;
+                    case 31571:
+                        triggered_spell_id = 57529;
+                        break;
+                    case 31572:
+                        triggered_spell_id = 57531;
+                        break;
                     default:
                         sLog.outError("Unit::HandleDummyAuraProc: non handled spell id: %u",dummySpell->Id);
                         return SPELL_AURA_PROC_FAILED;
@@ -1057,7 +1266,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
             }
 
             // Hot Streak
-            if (dummySpell->SpellIconID == 2999)
+            if (dummySpell->GetSpellIconID() == 2999)
             {
                 if (effIndex != EFFECT_INDEX_0)
                     return SPELL_AURA_PROC_OK;
@@ -1080,15 +1289,17 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 return SPELL_AURA_PROC_OK;
             }
             // Burnout
-            if (dummySpell->SpellIconID == 2998)
+            if (dummySpell->GetSpellIconID() == 2998)
             {
                 if(!procSpell)
                     return SPELL_AURA_PROC_FAILED;
 
                 int32 cost = procSpell->manaCost + procSpell->ManaCostPercentage * GetCreateMana() / 100;
                 basepoints[0] = cost * triggerAmount/100;
+
                 if (basepoints[0] <=0)
                     return SPELL_AURA_PROC_FAILED;
+
                 triggered_spell_id = 44450;
                 target = this;
                 break;
@@ -1117,6 +1328,35 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     triggered_spell_id = 12654;
                     break;
                 }
+                // Empowered Fire (mana regen)
+                case 12654:
+                {
+                    Unit* caster = triggeredByAura->GetCaster();
+                    // it should not be triggered from other ignites
+                    if (caster && pVictim && caster->GetObjectGuid() == pVictim->GetObjectGuid())
+                    {
+                        Unit::AuraList const& auras = caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER);
+                        for (Unit::AuraList::const_iterator i = auras.begin(); i != auras.end(); i++)
+                        {
+                            switch((*i)->GetId())
+                            {
+                                case 31656:
+                                case 31657:
+                                case 31658:
+                                {
+                                    if (roll_chance_i(int32((*i)->GetSpellProto()->procChance)))
+                                    {
+                                        caster->CastSpell(caster, 67545, true);
+                                        return SPELL_AURA_PROC_OK;
+                                    }
+                                    else
+                                        return SPELL_AURA_PROC_FAILED;
+                                }
+                            }
+                        }
+                    }
+                    return SPELL_AURA_PROC_FAILED;
+                }
                 // Glyph of Ice Block
                 case 56372:
                 {
@@ -1124,7 +1364,25 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                         return SPELL_AURA_PROC_FAILED;
 
                     // not 100% safe with client version switches but for 3.1.3 no spells with cooldown that can have mage player except Frost Nova.
-                    ((Player*)this)->RemoveSpellCategoryCooldown(35, true);
+                    RemoveSpellCategoryCooldown(35, true);
+                    return SPELL_AURA_PROC_OK;
+                }
+                // Glyph of Icy Veins
+                case 56374:
+                {
+                    Unit::AuraList const& hasteAuras = GetAurasByType(SPELL_AURA_MOD_CASTING_SPEED_NOT_STACK);
+                    for(Unit::AuraList::const_iterator i = hasteAuras.begin(); i != hasteAuras.end();)
+                    {
+                        if (!IsPositiveSpell((*i)->GetId()))
+                        {
+                            RemoveAurasDueToSpell((*i)->GetId());
+                            i = hasteAuras.begin();
+                        }
+                        else
+                            ++i;
+                    }
+                    RemoveSpellsCausingAura(SPELL_AURA_HASTE_SPELLS);
+                    RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
                     return SPELL_AURA_PROC_OK;
                 }
                 // Glyph of Polymorph
@@ -1135,6 +1393,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
 
                     pVictim->RemoveSpellsCausingAura(SPELL_AURA_PERIODIC_DAMAGE);
                     pVictim->RemoveSpellsCausingAura(SPELL_AURA_PERIODIC_DAMAGE_PERCENT);
+                    pVictim->RemoveSpellsCausingAura(SPELL_AURA_PERIODIC_LEECH);
                     return SPELL_AURA_PROC_OK;
                 }
                 // Blessing of Ancient Kings
@@ -1148,13 +1407,54 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     basepoints[0] = damage * 15 / 100;
                     break;
                 }
+                // Item - Mage T8 4P Bonus
+                case 64869:
+                {
+                    if (!roll_chance_i(triggeredByAura->GetModifier()->m_amount))
+                        return SPELL_AURA_PROC_FAILED;
+
+                    SpellAuraHolderPtr holder;
+                    // Missile Barrage
+                    if (SpellAuraHolderPtr _holder = GetSpellAuraHolder(44401, GetObjectGuid()))
+                        holder = _holder;
+                    // Hot Streak
+                    else if (SpellAuraHolderPtr _holder = GetSpellAuraHolder(48108, GetObjectGuid()))
+                        holder = _holder;
+                    // Brain Freeze
+                    else if (SpellAuraHolderPtr _holder = GetSpellAuraHolder(57761, GetObjectGuid()))
+                        holder = _holder;
+
+                    if (!holder || holder->GetAuraCharges() > 1)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    holder->SetAuraCharges(holder->GetAuraCharges() + 1, false);
+                    return SPELL_AURA_PROC_OK;
+                }
+                // Fingers of Frost
+                case 74396:
+                {
+                    // Remove only single aura from stack
+                    SpellAuraHolderPtr holder = triggeredByAura->GetHolder();
+                    if (holder && !holder->IsDeleted())
+                    {
+                        if (holder->ModStackAmount(-1))
+                        {
+                            RemoveSpellAuraHolder(holder);
+                            RemoveAurasDueToSpell(44544);
+                        }
+                        return SPELL_AURA_PROC_OK;
+                    }
+                    else
+                        return SPELL_AURA_PROC_FAILED;
+                    break;
+                }
             }
             break;
         }
         case SPELLFAMILY_WARRIOR:
         {
             // Retaliation
-            if (dummySpell->IsFitToFamilyMask(UI64LIT(0x0000000800000000)))
+            if (dummySpell->GetSpellFamilyFlags().test<CF_WARRIOR_RETALIATION2>())
             {
                 // check attack comes not from behind
                 if (!HasInArc(M_PI_F, pVictim))
@@ -1164,7 +1464,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Second Wind
-            if (dummySpell->SpellIconID == 1697)
+            if (dummySpell->GetSpellIconID() == 1697)
             {
                 // only for spells and hit/crit (trigger start always) and not start from self casted spells (5530 Mace Stun Effect for example)
                 if (procSpell == 0 || !(procEx & (PROC_EX_NORMAL_HIT|PROC_EX_CRITICAL_HIT)) || this == pVictim)
@@ -1175,9 +1475,15 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
 
                 switch (dummySpell->Id)
                 {
-                    case 29838: triggered_spell_id=29842; break;
-                    case 29834: triggered_spell_id=29841; break;
-                    case 42770: triggered_spell_id=42771; break;
+                    case 29838:
+                        triggered_spell_id=29842;
+                        break;
+                    case 29834:
+                        triggered_spell_id=29841;
+                        break;
+                    case 42770:
+                        triggered_spell_id=42771;
+                        break;
                     default:
                         sLog.outError("Unit::HandleDummyAuraProc: non handled spell id: %u (SW)",dummySpell->Id);
                     return SPELL_AURA_PROC_FAILED;
@@ -1187,22 +1493,21 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Damage Shield
-            if (dummySpell->SpellIconID == 3214)
+            if (dummySpell->GetSpellIconID() == 3214)
             {
                 triggered_spell_id = 59653;
                 basepoints[0] = GetShieldBlockValue() * triggerAmount / 100;
                 break;
             }
-
             // Sweeping Strikes
             if (dummySpell->Id == 12328)
             {
                 // prevent chain of triggered spell from same triggered spell
-                if(procSpell && procSpell->Id == 26654)
+                if (procSpell && procSpell->Id == 26654)
                     return SPELL_AURA_PROC_FAILED;
 
                 target = SelectRandomUnfriendlyTarget(pVictim);
-                if(!target)
+                if (!target)
                     return SPELL_AURA_PROC_FAILED;
 
                 triggered_spell_id = 26654;
@@ -1213,11 +1518,11 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
         case SPELLFAMILY_WARLOCK:
         {
             // Seed of Corruption
-            if (dummySpell->SpellFamilyFlags & UI64LIT(0x0000001000000000))
+            if (dummySpell->GetSpellFamilyFlags().test<CF_WARLOCK_SEED_OF_CORRUPTION1>())
             {
-                Modifier* mod = triggeredByAura->GetModifier();
+                Modifier const* mod = triggeredByAura->GetModifier();
                 // if damage is more than need or target die from damage deal finish spell
-                if( mod->m_amount <= (int32)damage || GetHealth() <= damage )
+                if (mod->m_amount <= (int32)damage || GetHealth() <= damage)
                 {
                     // remember guid before aura delete
                     ObjectGuid casterGuid = triggeredByAura->GetCasterGuid();
@@ -1235,11 +1540,11 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 return SPELL_AURA_PROC_OK;
             }
             // Seed of Corruption (Mobs cast) - no die req
-            if (dummySpell->SpellFamilyFlags == UI64LIT(0x0) && dummySpell->SpellIconID == 1932)
+            else if (dummySpell->GetSpellIconID() == 1932)
             {
-                Modifier* mod = triggeredByAura->GetModifier();
+                Modifier const* mod = triggeredByAura->GetModifier();
                 // if damage is more than need deal finish spell
-                if( mod->m_amount <= (int32)damage )
+                if ( mod->m_amount <= (int32)damage )
                 {
                     // remember guid before aura delete
                     ObjectGuid casterGuid = triggeredByAura->GetCasterGuid();
@@ -1256,11 +1561,13 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 return SPELL_AURA_PROC_OK;
             }
             // Fel Synergy
-            if (dummySpell->SpellIconID == 3222)
+            if (dummySpell->GetSpellIconID() == 3222)
             {
                 target = GetPet();
+
                 if (!target)
                     return SPELL_AURA_PROC_FAILED;
+
                 basepoints[0] = damage * triggerAmount / 100;
                 triggered_spell_id = 54181;
                 break;
@@ -1285,6 +1592,27 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     basepoints[0] = int32(damage*triggerAmount/100);
                     target = this;
                     triggered_spell_id = 30294;
+
+                    // check for Improved Soul Leech
+                    AuraList const& pDummyAuras = GetAurasByType(SPELL_AURA_DUMMY);
+                    for (AuraList::const_iterator itr = pDummyAuras.begin(); itr != pDummyAuras.end(); ++itr)
+                    {
+                       SpellEntry const* spellInfo = (*itr)->GetSpellProto();
+                       if (spellInfo->SpellFamilyName != SPELLFAMILY_WARLOCK || (*itr)->GetSpellProto()->GetSpellIconID() != 3176)
+                            continue;
+                       if ((*itr)->GetEffIndex() == SpellEffectIndex(0))
+                       {
+                           // energize Proc pet (implicit target is pet)
+                           CastCustomSpell(this, 59118, &((*itr)->GetModifier()->m_amount), NULL, NULL, true, NULL, (*itr)());
+                           // energize Proc master
+                           CastCustomSpell(this, 59117, &((*itr)->GetModifier()->m_amount), NULL, NULL, true, NULL, (*itr)());
+                       }
+                       else if (roll_chance_i((*itr)->GetModifier()->m_amount))
+                       {
+                            // Replenishment proc
+                            CastSpell(this, 57669, true, NULL, (*itr)());
+                        }
+                    }
                     break;
                 }
                 // Shadowflame (Voidheart Raiment set bonus)
@@ -1311,6 +1639,16 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     triggered_spell_id = 37378;
                     break;
                 }
+                // Improved Felhunter (bad description in DBC for triggered aura!)
+                case 56249:
+                {
+                    target = this;
+                    triggered_spell_id = 54425;
+                    // mana gain amount (normal for aura 54037 and doubled for 54038)
+                    if (GetOwner() && GetOwner()->HasAura(54038))
+                        basepoints[0] = 8;
+                    break;
+                }
                 // Siphon Life
                 case 63108:
                 {
@@ -1328,7 +1666,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
         case SPELLFAMILY_PRIEST:
         {
             // Vampiric Touch
-            if (dummySpell->SpellFamilyFlags & UI64LIT(0x0000040000000000))
+            if (dummySpell->GetSpellFamilyFlags().test<CF_PRIEST_VAMPIRIC_TOUCH>())
             {
                 if (!pVictim || !pVictim->isAlive())
                     return SPELL_AURA_PROC_FAILED;
@@ -1342,7 +1680,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 return SPELL_AURA_PROC_OK;                                // no hidden cooldown
             }
 
-            switch(dummySpell->SpellIconID)
+            switch(dummySpell->GetSpellIconID())
             {
                 // Improved Shadowform
                 case 217:
@@ -1357,10 +1695,74 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Divine Aegis
                 case 2820:
                 {
-                    basepoints[0] = damage * triggerAmount/100;
+                    if (!pVictim || !pVictim->isAlive())
+                        return SPELL_AURA_PROC_FAILED;
+
+                    // find Divine Aegis on the target and get absorb amount
+                    Aura* DivineAegis = pVictim->GetAura(47753,EFFECT_INDEX_0);
+                    if (DivineAegis)
+                        basepoints[0] = DivineAegis->GetModifier()->m_amount;
+                    basepoints[0] += damage * triggerAmount/100;
+
+                    // limit absorb amount
+                    int32 levelbonus = pVictim->getLevel()*125;
+                    if (basepoints[0] > levelbonus)
+                        basepoints[0] = levelbonus;
                     triggered_spell_id = 47753;
                     break;
                 }
+                // Rapture
+                case 2894:
+                {
+                    if (!procSpell)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    // Proc only on first effect
+                    if (triggeredByAura->GetEffIndex() != EFFECT_INDEX_1)
+                        return SPELL_AURA_PROC_CANT_TRIGGER;
+
+                    Unit* pCaster = triggeredByAura->GetCaster();
+                    if (!pCaster || !pCaster->IsInWorld())
+                        return SPELL_AURA_PROC_FAILED;
+
+                    // only Power Word: Shield returns Mana to Priest
+                    if (procSpell->Id  != 47753)
+                    {
+                        // energize caster
+                        int32 manapct1000 = 5 * (sSpellMgr.GetSpellRank(triggeredByAura->GetId()) + 2);
+                        int32 bp0 = pCaster->GetMaxPower(POWER_MANA) * manapct1000 / 1000;
+                        pCaster->CastCustomSpell(pCaster, 47755, &bp0, NULL, NULL, true);
+                    }
+
+                    if (!roll_chance_i(triggeredByAura->GetModifier()->m_amount) || pCaster->HasAura(63853))
+                        return SPELL_AURA_PROC_FAILED;
+                    else
+                        //cooldown aura
+                        pCaster->CastSpell(pCaster, 63853, true);
+
+                    switch(pVictim->GetPowerType())
+                    {
+                        case POWER_RUNIC_POWER:
+                            triggered_spell_id = 63652;
+                            break;
+                        case POWER_RAGE:
+                            triggered_spell_id = 63653;
+                            break;
+                        case POWER_MANA:
+                        {
+                            basepoints[0] = pVictim->GetMaxPower(POWER_MANA) * 2 / 100;
+                            triggered_spell_id = 63654;
+                            break;
+                        }
+                        case POWER_ENERGY:
+                            triggered_spell_id = 63655;
+                            break;
+                        default:
+                            break;
+                    }
+                    target = pVictim;
+                    break;
+                }
                 // Empowered Renew
                 case 3021:
                 {
@@ -1368,7 +1770,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                         return SPELL_AURA_PROC_FAILED;
 
                     // Renew
-                    Aura* healingAura = pVictim->GetAura(SPELL_AURA_PERIODIC_HEAL, SPELLFAMILY_PRIEST, UI64LIT(0x40), 0, GetObjectGuid());
+                    Aura* healingAura = pVictim->GetAura<SPELL_AURA_PERIODIC_HEAL, SPELLFAMILY_PRIEST, CF_PRIEST_RENEW>(GetObjectGuid());
                     if (!healingAura)
                         return SPELL_AURA_PROC_FAILED;
 
@@ -1384,7 +1786,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     if (!procSpell)
                         return SPELL_AURA_PROC_FAILED;
 
-                    Aura* leachAura = pVictim->GetAura(SPELL_AURA_PERIODIC_LEECH, SPELLFAMILY_PRIEST, UI64LIT(0x02000000), 0, GetObjectGuid());
+                    Aura* leachAura = pVictim->GetAura<SPELL_AURA_PERIODIC_LEECH, SPELLFAMILY_PRIEST, CF_PRIEST_DEVOURING_PLAGUE>(GetObjectGuid());
                     if (!leachAura)
                         return SPELL_AURA_PROC_FAILED;
 
@@ -1414,10 +1816,10 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 case 40438:
                 {
                     // Shadow Word: Pain
-                    if (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000008000))
+                    if (procSpell->GetSpellFamilyFlags().test<CF_PRIEST_SHADOW_WORD_PAIN>())
                         triggered_spell_id = 40441;
                     // Renew
-                    else if (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000010))
+                    else if (procSpell->GetSpellFamilyFlags().test<CF_PRIEST_RENEW>())
                         triggered_spell_id = 40440;
                     else
                         return SPELL_AURA_PROC_FAILED;
@@ -1437,7 +1839,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Frozen Shadoweave (Shadow's Embrace set) warning! its not only priest set
                 case 39372:
                 {
-                    if(!procSpell || (GetSpellSchoolMask(procSpell) & (SPELL_SCHOOL_MASK_FROST | SPELL_SCHOOL_MASK_SHADOW))==0 )
+                    if (!procSpell || (GetSpellSchoolMask(procSpell) & (SPELL_SCHOOL_MASK_FROST | SPELL_SCHOOL_MASK_SHADOW))==0)
                         return SPELL_AURA_PROC_FAILED;
 
                     // heal amount
@@ -1455,10 +1857,13 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Glyph of Dispel Magic
                 case 55677:
                 {
-                    if(!target->IsFriendlyTo(this))
+                    if (!target->IsFriendlyTo(this))
                         return SPELL_AURA_PROC_FAILED;
 
-                    basepoints[0] = int32(target->GetMaxHealth() * triggerAmount / 100);
+                    if (target->GetTypeId() == TYPEID_PLAYER)
+                        basepoints[0] = int32(target->GetMaxHealth() * triggerAmount / 100);
+                    else if (Unit* caster = triggeredByAura->GetCaster())
+                        basepoints[0] = int32(caster->GetMaxHealth() * triggerAmount / 100);
                     // triggered_spell_id in spell data
                     break;
                 }
@@ -1492,7 +1897,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                         return SPELL_AURA_PROC_FAILED;
 
                     // check explicitly only to prevent mana cast when halth cast cooldown
-                    if (cooldown && ((Player*)this)->HasSpellCooldown(34299))
+                    if (cooldown && HasSpellCooldown(34299))
                         return SPELL_AURA_PROC_FAILED;
 
                     // health
@@ -1541,19 +1946,19 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     float  chance;
 
                     // Starfire
-                    if (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000004))
+                    if (procSpell->GetSpellFamilyFlags().test<CF_DRUID_STARFIRE>())
                     {
                         triggered_spell_id = 40445;
                         chance = 25.0f;
                     }
                     // Rejuvenation
-                    else if (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000010))
+                    else if (procSpell->GetSpellFamilyFlags().test<CF_DRUID_REJUVENATION>())
                     {
                         triggered_spell_id = 40446;
                         chance = 25.0f;
                     }
                     // Mangle (Bear) and Mangle (Cat)
-                    else if (procSpell->SpellFamilyFlags & UI64LIT(0x0000044000000000))
+                    else if (procSpell->GetSpellFamilyFlags().test<CF_DRUID_MANGLE_BEAR, CF_DRUID_MANGLE_CAT>())
                     {
                         triggered_spell_id = 40452;
                         chance = 40.0f;
@@ -1577,11 +1982,19 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Glyph of Rejuvenation
                 case 54754:
                 {
-                    // less 50% health
-                    if (pVictim->GetMaxHealth() < 2 * pVictim->GetHealth())
+                   if (!pVictim || pVictim->GetHealthPercent() >= 50.0f)
                         return SPELL_AURA_PROC_FAILED;
-                    basepoints[0] = triggerAmount * damage / 100;
+
+                    target = pVictim;
                     triggered_spell_id = 54755;
+                    basepoints[0] = int32(damage * triggerAmount  / 100);
+                    break;
+                }
+                // Glyph of Shred
+                case 54815:
+                {
+                    basepoints[1] = triggerAmount;
+                    triggered_spell_id = 63974;
                     break;
                 }
                 // Glyph of Rake
@@ -1590,6 +2003,12 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     triggered_spell_id = 54820;
                     break;
                 }
+                // Glyph of Starfire
+                case 54845:
+                {
+                    triggered_spell_id = 54846;
+                    break;
+                }
                 // Item - Druid T10 Restoration 4P Bonus (Rejuvenation)
                 case 70664:
                 {
@@ -1600,9 +2019,9 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     if (procSpell->EffectRadiusIndex[EFFECT_INDEX_0])
                         radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(procSpell->EffectRadiusIndex[EFFECT_INDEX_0]));
                     else
-                        radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(procSpell->rangeIndex));
+                        radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(procSpell->GetRangeIndex()));
 
-                    ((Player*)this)->ApplySpellMod(procSpell->Id, SPELLMOD_RADIUS, radius,NULL);
+                    ((Player*)this)->ApplySpellMod(procSpell->Id, SPELLMOD_RADIUS, radius);
 
                     Unit *second = pVictim->SelectRandomFriendlyTarget(pVictim, radius);
 
@@ -1621,7 +2040,32 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 }
             }
             // King of the Jungle
-            if (dummySpell->SpellIconID == 2850)
+            if (dummySpell->GetSpellIconID() == 2850)
+            {
+                if (!procSpell)
+                    return SPELL_AURA_PROC_FAILED;
+
+                // Enrage (bear) - single rank - the aura for the bear form from the 2 existing kotj auras has a miscValue == 126
+                if (procSpell->Id == 5229 && triggeredByAura->GetMiscValue() == 126)
+                {
+                    // note : the remove part is done in spellAuras/HandlePeriodicEnergize as RemoveAurasDueToSpell
+                    basepoints[0] = triggerAmount;
+                    triggered_spell_id = 51185;
+                    target = this;
+                    break;
+                }
+                // Tiger Fury (cat) - all ranks - the aura for the cat form from the 2 existing kotj auras has a miscValue != 126
+                if (procSpell->GetSpellFamilyFlags().test<CF_DRUID_TIGERS_FURY>()  && triggeredByAura->GetMiscValue() != 126)
+                {
+                    basepoints[0] = triggerAmount;
+                    triggered_spell_id = 51178;
+                    target = this;
+                    break;
+                }
+                return SPELL_AURA_PROC_FAILED;
+            }
+            // King of the Jungle
+            if (dummySpell->GetSpellIconID() == 2850)
             {
                 switch (effIndex)
                 {
@@ -1643,27 +2087,30 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 }
             }
             // Eclipse
-            if (dummySpell->SpellIconID == 2856)
+            else if (dummySpell->GetSpellIconID() == 2856)
             {
                 if (!procSpell)
                     return SPELL_AURA_PROC_FAILED;
 
                 // Wrath crit
-                if (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000001))
+                if (procSpell->GetSpellFamilyFlags().test<CF_DRUID_WRATH>())
                 {
                     if (HasAura(48517))
                         return SPELL_AURA_PROC_FAILED;
+
                     if (!roll_chance_i(60))
                         return SPELL_AURA_PROC_FAILED;
+
                     triggered_spell_id = 48518;
                     target = this;
                     break;
                 }
                 // Starfire crit
-                if (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000004))
+                if (procSpell->GetSpellFamilyFlags().test<CF_DRUID_STARFIRE>())
                 {
                     if (HasAura(48518))
                         return SPELL_AURA_PROC_FAILED;
+
                     triggered_spell_id = 48517;
                     target = this;
                     break;
@@ -1671,7 +2118,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 return SPELL_AURA_PROC_FAILED;
             }
             // Living Seed
-            else if (dummySpell->SpellIconID == 2860)
+            else if (dummySpell->GetSpellIconID() == 2860)
             {
                 triggered_spell_id = 48504;
                 basepoints[0] = triggerAmount * damage / 100;
@@ -1688,6 +2135,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     // triggered spell have same masks and etc with main Vanish spell
                     if (!procSpell || procSpell->Effect[EFFECT_INDEX_0] == SPELL_EFFECT_NONE)
                         return SPELL_AURA_PROC_FAILED;
+
                     triggered_spell_id = 23583;
                     break;
                 // Deadly Throw Interrupt
@@ -1705,6 +2153,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 {
                     triggered_spell_id = 57933;             // Tricks of the Trade, increased damage buff
                     target = getHostileRefManager().GetThreatRedirectionTarget();
+
                     if (!target)
                         return SPELL_AURA_PROC_FAILED;
 
@@ -1713,7 +2162,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 }
             }
             // Cut to the Chase
-            if (dummySpell->SpellIconID == 2909)
+            if (dummySpell->GetSpellIconID() == 2909)
             {
                 // "refresh your Slice and Dice duration to its 5 combo point maximum"
                 // lookup Slice and Dice
@@ -1722,8 +2171,12 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 {
                     SpellEntry const *spellProto = (*itr)->GetSpellProto();
                     if (spellProto->SpellFamilyName == SPELLFAMILY_ROGUE &&
-                        (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000040000)))
+                        spellProto->GetSpellFamilyFlags().test<CF_ROGUE_SLICE_AND_DICE>())
                     {
+                        int32 duration = GetSpellMaxDuration(spellProto);
+                        if (GetTypeId() == TYPEID_PLAYER)
+                            static_cast<Player*>(this)->ApplySpellMod(spellProto->Id, SPELLMOD_DURATION, duration);
+                        (*itr)->GetHolder()->SetAuraMaxDuration(duration);
                         (*itr)->GetHolder()->RefreshHolder();
                         return SPELL_AURA_PROC_OK;
                     }
@@ -1731,15 +2184,15 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 return SPELL_AURA_PROC_FAILED;
             }
             // Deadly Brew
-            if (dummySpell->SpellIconID == 2963)
+            if (dummySpell->GetSpellIconID() == 2963)
             {
                 triggered_spell_id = 44289;
                 break;
             }
             // Quick Recovery
-            if (dummySpell->SpellIconID == 2116)
+            if (dummySpell->GetSpellIconID() == 2116)
             {
-                if(!procSpell)
+                if (!procSpell)
                     return SPELL_AURA_PROC_FAILED;
 
                 // energy cost save
@@ -1756,7 +2209,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
         case SPELLFAMILY_HUNTER:
         {
             // Thrill of the Hunt
-            if (dummySpell->SpellIconID == 2236)
+            if (dummySpell->GetSpellIconID() == 2236)
             {
                 if (!procSpell)
                     return SPELL_AURA_PROC_FAILED;
@@ -1772,27 +2225,28 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Hunting Party
-            if (dummySpell->SpellIconID == 3406)
+            if (dummySpell->GetSpellIconID() == 3406)
             {
                 triggered_spell_id = 57669;
                 target = this;
                 break;
             }
             // Lock and Load
-            if ( dummySpell->SpellIconID == 3579 )
+            if (dummySpell->GetSpellIconID() == 3579)
             {
                 // Proc only from periodic (from trap activation proc another aura of this spell)
                 if (!(procFlag & PROC_FLAG_ON_DO_PERIODIC) || !roll_chance_i(triggerAmount))
                     return SPELL_AURA_PROC_FAILED;
+
                 triggered_spell_id = 56453;
                 target = this;
                 break;
             }
             // Rapid Recuperation
-            if ( dummySpell->SpellIconID == 3560 )
+            if (dummySpell->GetSpellIconID() == 3560)
             {
                 // This effect only from Rapid Killing (mana regen)
-                if (!(procSpell->SpellFamilyFlags & UI64LIT(0x0100000000000000)))
+                if (!procSpell->GetSpellFamilyFlags().test<CF_HUNTER_RAPID_KILLING>())
                     return SPELL_AURA_PROC_FAILED;
 
                 target = this;
@@ -1809,24 +2263,29 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Glyph of Mend Pet
-            if(dummySpell->Id == 57870)
+            if ( dummySpell->Id == 57870)
             {
                 pVictim->CastSpell(pVictim, 57894, true, NULL, NULL, GetObjectGuid());
                 return SPELL_AURA_PROC_OK;
             }
             // Misdirection
-            else if(dummySpell->Id == 34477)
+            else if (dummySpell->Id == 34477)
             {
                 triggered_spell_id = 35079;                 // 4 sec buff on self
                 target = this;
                 break;
             }
+            else if (dummySpell->Id == 37483)               // Improved Kill Command - Item set bonus
+            {
+                triggered_spell_id = 37482;                 // Exploited Weakness
+                break;
+            }
             break;
         }
         case SPELLFAMILY_PALADIN:
         {
             // Seal of Righteousness - melee proc dummy (addition ${$MWS*(0.022*$AP+0.044*$SPH)} damage)
-            if ((dummySpell->SpellFamilyFlags & UI64LIT(0x000000008000000)) && effIndex == EFFECT_INDEX_0)
+            if (dummySpell->GetSpellFamilyFlags().test<CF_PALADIN_SEAL_OF_JUST_RIGHT>() && effIndex == EFFECT_INDEX_0)
             {
                 triggered_spell_id = 25742;
                 float ap = GetTotalAttackPowerValue(BASE_ATTACK);
@@ -1837,14 +2296,14 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Righteous Vengeance
-            if (dummySpell->SpellIconID == 3025)
+            if (dummySpell->GetSpellIconID() == 3025)
             {
                 triggered_spell_id = 61840;
                 basepoints[0] = triggerAmount * damage / 100 / GetSpellAuraMaxTicks(triggered_spell_id);
                 break;
             }
             // Sheath of Light
-            if (dummySpell->SpellIconID == 3030)
+            if (dummySpell->GetSpellIconID() == 3030)
             {
                 triggered_spell_id = 54203;
                 basepoints[0] = triggerAmount * damage / 100 / GetSpellAuraMaxTicks(triggered_spell_id);
@@ -1855,6 +2314,9 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Judgement of Light
                 case 20185:
                 {
+                    if (pVictim == this)
+                       return SPELL_AURA_PROC_FAILED;
+
                     // only at real damage
                     if (!damage)
                         return SPELL_AURA_PROC_FAILED;
@@ -1870,7 +2332,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     if (!damage)
                         return SPELL_AURA_PROC_FAILED;
 
-                    if (pVictim->getPowerType() == POWER_MANA)
+                    if (pVictim->GetPowerType() == POWER_MANA)
                     {
                         // 2% of maximum base mana
                         basepoints[0] = int32(pVictim->GetCreateMana() * 2 / 100);
@@ -1894,7 +2356,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 case 25899:                                 // Greater Blessing of Sanctuary
                 {
                     target = this;
-                    switch (target->getPowerType())
+                    switch (target->GetPowerType())
                     {
                         case POWER_MANA:
                             triggered_spell_id = 57319;
@@ -1907,7 +2369,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Holy Power (Redemption Armor set)
                 case 28789:
                 {
-                    if(!pVictim)
+                    if (!pVictim)
                         return SPELL_AURA_PROC_FAILED;
 
                     // Set class defined buff
@@ -1945,8 +2407,10 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
 
                     // dont count overhealing
                     uint32 diff = GetMaxHealth()-GetHealth();
+
                     if (!diff)
                         return SPELL_AURA_PROC_FAILED;
+
                     basepoints[0] = triggerAmount * (damage > diff ? diff : damage) / 100;
                     target = this;
                     triggered_spell_id = 31786;
@@ -1981,6 +2445,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 case 31876:
                 case 31877:
                 case 31878:
+                {
                     // triggered only at casted Judgement spells, not at additional Judgement effects
                     if(!procSpell || procSpell->Category != 1210)
                         return SPELL_AURA_PROC_FAILED;
@@ -1991,6 +2456,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     // Replenishment
                     CastSpell(this, 57669, true, NULL, triggeredByAura);
                     break;
+                }
                 // Paladin Tier 6 Trinket (Ashtongue Talisman of Zeal)
                 case 40470:
                 {
@@ -2000,13 +2466,13 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     float  chance;
 
                     // Flash of light/Holy light
-                    if (procSpell->SpellFamilyFlags & UI64LIT(0x00000000C0000000))
+                    if (procSpell->GetSpellFamilyFlags().test<CF_PALADIN_FLASH_OF_LIGHT, CF_PALADIN_HOLY_LIGHT>())
                     {
                         triggered_spell_id = 40471;
                         chance = 15.0f;
                     }
                     // Judgement (any)
-                    else if (GetSpellSpecific(procSpell->Id)==SPELL_JUDGEMENT)
+                    else if (procSpell->GetSpellFamilyFlags().test<CF_PALADIN_JUDGEMENT_ACTIVATE>())
                     {
                         triggered_spell_id = 40472;
                         chance = 50.0f;
@@ -2016,7 +2482,6 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
 
                     if (!roll_chance_f(chance))
                         return SPELL_AURA_PROC_FAILED;
-
                     break;
                 }
                 // Light's Beacon (heal target area aura)
@@ -2031,14 +2496,17 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     if (!beacon)
                         return SPELL_AURA_PROC_FAILED;
 
+                    if (procSpell->Id == 20267)
+                        return SPELL_AURA_PROC_FAILED;
+
                     // find caster main aura at beacon
-                    Aura* dummy = NULL;
+                    Aura const* dummy = NULL;
                     Unit::AuraList const& baa = beacon->GetAurasByType(SPELL_AURA_PERIODIC_TRIGGER_SPELL);
                     for(Unit::AuraList::const_iterator i = baa.begin(); i != baa.end(); ++i)
                     {
                         if ((*i)->GetId() == 53563 && (*i)->GetCasterGuid() == pVictim->GetObjectGuid())
                         {
-                            dummy = (*i);
+                            dummy = (*i)();
                             break;
                         }
                     }
@@ -2048,6 +2516,14 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                         return SPELL_AURA_PROC_FAILED;
 
                     triggered_spell_id = 53652;             // Beacon of Light
+                    uint32 radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(sSpellStore.LookupEntry(triggered_spell_id)->GetRangeIndex()));
+
+                    if (!beacon->IsWithinDistInMap(this, radius) ||
+                        !beacon->IsWithinLOSInMap(this) ||
+                        !beacon->IsWithinDistInMap(pVictim, radius) ||
+                        !beacon->IsWithinLOSInMap(pVictim))
+                        return SPELL_AURA_PROC_FAILED;
+
                     basepoints[0] = triggeredByAura->GetModifier()->m_amount*damage/100;
 
                     // cast with original caster set but beacon to beacon for apply caster mods and avoid LoS check
@@ -2089,15 +2565,34 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Sacred Shield (buff)
                 case 58597:
                 {
-                    triggered_spell_id = 66922;
                     basepoints[0] = int32(damage / GetSpellAuraMaxTicks(triggered_spell_id));
+
                     target = this;
                     break;
                 }
                 // Sacred Shield (talent rank)
                 case 53601:
                 {
-                    // triggered_spell_id in spell data
+                    if (procSpell && IsFriendlyTo(pVictim))
+                    {
+                        if (procSpell->GetSpellFamilyFlags().test<CF_PALADIN_FLASH_OF_LIGHT>() && (pVictim->HasAura(53569, EFFECT_INDEX_0) || pVictim->HasAura(53576, EFFECT_INDEX_0)))
+                        {
+                            triggered_spell_id = 66922;
+                            basepoints[0] = int32(damage / GetSpellAuraMaxTicks(triggered_spell_id));
+
+                            // For first rank of Infusion of Light  has only 1/2 bonus
+                            if (pVictim->HasAura(53569, EFFECT_INDEX_0))
+                                basepoints[0] = basepoints[0] >> 1;
+
+                            // T9 - 4 paladin bonus cause double heal
+                            if (pVictim->HasAura(67191))
+                                basepoints[0] = basepoints[0] << 1;
+                        }
+                        else
+                            return SPELL_AURA_PROC_FAILED;
+                    }
+
+                    // triggered_spell_id in spell data
                     target = this;
                     break;
                 }
@@ -2108,6 +2603,21 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     basepoints[0] = int32(triggerAmount * damage / 100) / GetSpellAuraMaxTicks(triggered_spell_id);
                     break;
                 }
+                // Item - Paladin T10 Holy 2P Bonus
+                case 70755:
+                {
+                    triggered_spell_id = 71166;
+                    break;
+                }
+                // Item - Paladin T10 Retribution 2P Bonus
+                case 70765:
+                {
+                    if (GetTypeId() != TYPEID_PLAYER)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    triggered_spell_id = 70769;
+                    break;
+                }
                 // Anger Capacitor
                 case 71406:                                 // normal
                 case 71545:                                 // heroic
@@ -2116,11 +2626,13 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                         return SPELL_AURA_PROC_FAILED;
 
                     SpellEntry const* mote = sSpellStore.LookupEntry(71432);
+
                     if (!mote)
                         return SPELL_AURA_PROC_FAILED;
+
                     uint32 maxStack = mote->StackAmount - (dummySpell->Id == 71545 ? 1 : 0);
 
-                    SpellAuraHolder *aurHolder = GetSpellAuraHolder(71432);
+                    SpellAuraHolderPtr aurHolder = GetSpellAuraHolder(71432);
                     if (aurHolder && uint32(aurHolder->GetStackAmount() +1) >= maxStack)
                     {
                         RemoveAurasDueToSpell(71432);       // Mote of Anger
@@ -2137,14 +2649,23 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Heartpierce, Item - Icecrown 25 Normal Dagger Proc
                 case 71880:
                 {
-                    if(GetTypeId() != TYPEID_PLAYER)
+                    if (GetTypeId() != TYPEID_PLAYER)
                         return SPELL_AURA_PROC_FAILED;
 
-                    switch (this->getPowerType())
+                    switch (this->GetPowerType())
                     {
-                        case POWER_ENERGY: triggered_spell_id = 71882; break;
-                        case POWER_RAGE:   triggered_spell_id = 71883; break;
-                        case POWER_MANA:   triggered_spell_id = 71881; break;
+                        case POWER_ENERGY:
+                            triggered_spell_id = 71882;
+                            break;
+                        case POWER_RAGE:
+                            triggered_spell_id = 71883;
+                            break;
+                        case POWER_MANA:
+                            triggered_spell_id = 71881;
+                            break;
+                        case POWER_RUNIC_POWER:
+                            triggered_spell_id = 71884;
+                            break;
                         default:
                             return SPELL_AURA_PROC_FAILED;
                     }
@@ -2153,14 +2674,23 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Heartpierce, Item - Icecrown 25 Heroic Dagger Proc
                 case 71892:
                 {
-                    if(GetTypeId() != TYPEID_PLAYER)
+                    if (GetTypeId() != TYPEID_PLAYER)
                         return SPELL_AURA_PROC_FAILED;
 
-                    switch (this->getPowerType())
+                    switch (this->GetPowerType())
                     {
-                        case POWER_ENERGY: triggered_spell_id = 71887; break;
-                        case POWER_RAGE:   triggered_spell_id = 71886; break;
-                        case POWER_MANA:   triggered_spell_id = 71888; break;
+                        case POWER_ENERGY:
+                            triggered_spell_id = 71887;
+                            break;
+                        case POWER_RAGE:
+                            triggered_spell_id = 71886;
+                            break;
+                        case POWER_MANA:
+                            triggered_spell_id = 71888;
+                            break;
+                        case POWER_RUNIC_POWER:
+                            triggered_spell_id = 71885;
+                            break;
                         default:
                             return SPELL_AURA_PROC_FAILED;
                     }
@@ -2176,7 +2706,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Totemic Power (The Earthshatterer set)
                 case 28823:
                 {
-                    if( !pVictim )
+                    if (!pVictim )
                         return SPELL_AURA_PROC_FAILED;
 
                     // Set class defined buff
@@ -2214,14 +2744,14 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Windfury Weapon (Passive) 1-5 Ranks
                 case 33757:
                 {
-                    if(GetTypeId()!=TYPEID_PLAYER)
+                    if (GetTypeId()!=TYPEID_PLAYER)
                         return SPELL_AURA_PROC_FAILED;
 
-                    if(!castItem || !castItem->IsEquipped())
+                    if (!castItem || !castItem->IsEquipped())
                         return SPELL_AURA_PROC_FAILED;
 
                     // custom cooldown processing case
-                    if( cooldown && ((Player*)this)->HasSpellCooldown(dummySpell->Id))
+                    if (cooldown && HasSpellCooldown(dummySpell->Id))
                         return SPELL_AURA_PROC_FAILED;
 
                     // Now amount of extra power stored in 1 effect of Enchant spell
@@ -2274,8 +2804,8 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     }
 
                     // apply cooldown before cast to prevent processing itself
-                    if( cooldown )
-                        ((Player*)this)->AddSpellCooldown(dummySpell->Id,0,time(NULL) + cooldown);
+                    if (cooldown)
+                        AddSpellCooldown(dummySpell->Id,0,time(NULL) + cooldown);
 
                     // Attack Twice
                     for ( uint32 i = 0; i<2; ++i )
@@ -2286,21 +2816,21 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 // Shaman Tier 6 Trinket
                 case 40463:
                 {
-                    if( !procSpell )
+                    if ( !procSpell )
                         return SPELL_AURA_PROC_FAILED;
 
                     float  chance;
-                    if (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000001))
+                    if (procSpell->GetSpellFamilyFlags().test<CF_SHAMAN_LIGHTNING_BOLT>())
                     {
                         triggered_spell_id = 40465;         // Lightning Bolt
                         chance = 15.0f;
                     }
-                    else if (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000080))
+                    else if (procSpell->GetSpellFamilyFlags().test<CF_SHAMAN_LESSER_HEALING_WAVE>())
                     {
                         triggered_spell_id = 40465;         // Lesser Healing Wave
                         chance = 10.0f;
                     }
-                    else if (procSpell->SpellFamilyFlags & UI64LIT(0x0000001000000000))
+                    else if (procSpell->GetSpellFamilyFlags().test<CF_SHAMAN_STORMSTRIKE1>())
                     {
                         triggered_spell_id = 40466;         // Stormstrike
                         chance = 50.0f;
@@ -2314,6 +2844,13 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     target = this;
                     break;
                 }
+                // Earthen Power
+                case 51523:
+                case 51524:
+                {
+                    triggered_spell_id = 63532;
+                    break;
+                }
                 // Glyph of Healing Wave
                 case 55440:
                 {
@@ -2349,7 +2886,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     {
                         // select proper aura for format aura type in spell proto
                         if ((*i)->GetTarget()==totem && (*i)->GetSpellProto()->EffectApplyAuraName[(*i)->GetEffIndex()] == SPELL_AURA_MOD_HEALING_DONE &&
-                            (*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_SHAMAN && (*i)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000004000000))
+                            (*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_SHAMAN && (*i)->GetSpellProto()->GetSpellFamilyFlags().test<CF_SHAMAN_MISC_TOTEM_EFFECTS>())
                         {
                             basepoints[0] = triggerAmount * (*i)->GetModifier()->m_amount / 100;
                             break;
@@ -2385,12 +2922,42 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     basepoints[0] = int32(triggerAmount * damage / 100) / GetSpellAuraMaxTicks(triggered_spell_id);
                     break;
                 }
+                // Item - Shaman T10 Elemental 2P Bonus
+                case 70811:
+                {
+                    if (GetTypeId() != TYPEID_PLAYER)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    if (procSpell->GetSpellFamilyFlags().test<CF_SHAMAN_LIGHTNING_BOLT, CF_SHAMAN_CHAIN_LIGHTNING>())
+                    {
+                        ((Player*)this)->SendModifyCooldown(16166,-triggerAmount);
+                        return SPELL_AURA_PROC_OK;
+                    }
+                    return SPELL_AURA_PROC_FAILED;
+                }
+                // Item - Shaman T10 Elemental 4P Bonus
+                case 70817:
+                {
+                    Aura* aura = pVictim->GetAura<SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, CF_SHAMAN_FLAME_SHOCK>(GetObjectGuid());
+                    if (aura)
+                    {
+                        SpellAuraHolderPtr holder = aura->GetHolder();
+                        if (holder)
+                        {
+                            int32 duration = aura->GetAuraDuration() + triggerAmount * IN_MILLISECONDS;
+                            holder->SetAuraMaxDuration(duration);
+                            holder->RefreshHolder();
+                            return SPELL_AURA_PROC_OK;
+                        }
+                    }
+                    return SPELL_AURA_PROC_FAILED;
+                }
             }
             // Storm, Earth and Fire
-            if (dummySpell->SpellIconID == 3063)
+            if (dummySpell->GetSpellIconID() == 3063)
             {
                 // Earthbind Totem summon only
-                if(procSpell->Id != 2484)
+                if (procSpell->Id != 2484)
                     return SPELL_AURA_PROC_FAILED;
 
                 if (!roll_chance_i(triggerAmount))
@@ -2400,7 +2967,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Ancestral Awakening
-            if (dummySpell->SpellIconID == 3065)
+            if (dummySpell->GetSpellIconID() == 3065)
             {
                 triggered_spell_id = 52759;
                 basepoints[0] = triggerAmount * damage / 100;
@@ -2408,7 +2975,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Flametongue Weapon (Passive), Ranks
-            if (dummySpell->SpellFamilyFlags & UI64LIT(0x0000000000200000))
+            if (dummySpell->GetSpellFamilyFlags().test<CF_SHAMAN_FLAMETONGUE_WEAPON>())
             {
                 if (GetTypeId()!=TYPEID_PLAYER || !castItem)
                     return SPELL_AURA_PROC_FAILED;
@@ -2436,15 +3003,16 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Earth Shield
-            if (dummySpell->SpellFamilyFlags & UI64LIT(0x0000040000000000))
+            if (dummySpell->GetSpellFamilyFlags().test<CF_SHAMAN_EARTH_SHIELD>())
             {
+                originalCaster = triggeredByAura->GetCasterGuid();
                 target = this;
                 basepoints[0] = triggerAmount;
 
                 // Glyph of Earth Shield
                 if(Unit* caster = triggeredByAura->GetCaster())
                 {
-                    if (Aura* aur = caster->GetDummyAura(63279))
+                    if (Aura const* aur = caster->GetDummyAura(63279))
                     {
                         int32 aur_mod = aur->GetModifier()->m_amount;
                         basepoints[0] = int32(basepoints[0] * (aur_mod + 100.0f) / 100.0f);
@@ -2455,23 +3023,23 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Improved Water Shield
-            if (dummySpell->SpellIconID == 2287)
+            if (dummySpell->GetSpellIconID() == 2287)
             {
                 if (!procSpell)
                     return SPELL_AURA_PROC_FAILED;
 
                 // Lesser Healing Wave need aditional 60% roll
-                if ((procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000080)) && !roll_chance_i(60))
+                if (procSpell->GetSpellFamilyFlags().test<CF_SHAMAN_LESSER_HEALING_WAVE>() && !roll_chance_i(60))
                     return SPELL_AURA_PROC_FAILED;
                 // Chain Heal needs additional 30% roll
-                if ((procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000100)) && !roll_chance_i(30))
+                if (procSpell->GetSpellFamilyFlags().test<CF_SHAMAN_CHAIN_HEAL>() && !roll_chance_i(30))
                     return SPELL_AURA_PROC_FAILED;
                 // lookup water shield
                 AuraList const& vs = GetAurasByType(SPELL_AURA_PROC_TRIGGER_SPELL);
                 for(AuraList::const_iterator itr = vs.begin(); itr != vs.end(); ++itr)
                 {
                     if ((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_SHAMAN &&
-                        ((*itr)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000002000000000)))
+                        (*itr)->GetSpellProto()->GetSpellFamilyFlags().test<CF_SHAMAN_WATER_SHIELD>())
                     {
                         uint32 spell = (*itr)->GetSpellProto()->EffectTriggerSpell[(*itr)->GetEffIndex()];
                         CastSpell(this, spell, true, castItem, triggeredByAura);
@@ -2481,13 +3049,18 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 return SPELL_AURA_PROC_FAILED;
             }
             // Lightning Overload
-            if (dummySpell->SpellIconID == 2018)            // only this spell have SpellFamily Shaman SpellIconID == 2018 and dummy aura
+            if (dummySpell->GetSpellIconID() == 2018)            // only this spell have SpellFamily Shaman SpellIconID == 2018 and dummy aura
             {
                 if(!procSpell || GetTypeId() != TYPEID_PLAYER || !pVictim )
                     return SPELL_AURA_PROC_FAILED;
 
+                // proc for main target only
+                if (Spell *currSpell = GetCurrentSpell(CURRENT_GENERIC_SPELL))
+                    if (currSpell->m_targets.getUnitTarget() != pVictim)
+                        return SPELL_AURA_PROC_FAILED;
+
                 // custom cooldown processing case
-                if( cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(dummySpell->Id))
+                if ( cooldown && HasSpellCooldown(dummySpell->Id))
                     return SPELL_AURA_PROC_FAILED;
 
                 uint32 spellId = 0;
@@ -2524,25 +3097,25 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 }
 
                 // Remove cooldown (Chain Lightning - have Category Recovery time)
-                if (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000002))
-                    ((Player*)this)->RemoveSpellCooldown(spellId);
+                if (procSpell->GetSpellFamilyFlags().test<CF_SHAMAN_CHAIN_LIGHTNING>())
+                    RemoveSpellCooldown(spellId);
 
                 CastSpell(pVictim, spellId, true, castItem, triggeredByAura);
 
-                if (cooldown && GetTypeId() == TYPEID_PLAYER)
-                    ((Player*)this)->AddSpellCooldown(dummySpell->Id, 0, time(NULL) + cooldown);
+                if (cooldown)
+                    AddSpellCooldown(dummySpell->Id, 0, time(NULL) + cooldown);
 
                 return SPELL_AURA_PROC_OK;
             }
             // Static Shock
-            if(dummySpell->SpellIconID == 3059)
+            if (dummySpell->GetSpellIconID() == 3059)
             {
                 // lookup Lightning Shield
                 AuraList const& vs = GetAurasByType(SPELL_AURA_PROC_TRIGGER_SPELL);
                 for(AuraList::const_iterator itr = vs.begin(); itr != vs.end(); ++itr)
                 {
                     if ((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_SHAMAN &&
-                        ((*itr)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000000400)))
+                        ((*itr)->GetSpellProto()->GetSpellFamilyFlags().test<CF_SHAMAN_LIGHTNING_SHIELD>()))
                     {
                         uint32 spell = 0;
                         switch ((*itr)->GetId())
@@ -2570,7 +3143,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 return SPELL_AURA_PROC_FAILED;
             }
             // Frozen Power
-            if (dummySpell->SpellIconID == 3780)
+            if (dummySpell->GetSpellIconID() == 3780)
             {
                 Unit *caster = triggeredByAura->GetCaster();
 
@@ -2584,7 +3157,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                     return SPELL_AURA_PROC_FAILED;
 
                 // make triggered cast apply after current damage spell processing for prevent remove by it
-                if(Spell* spell = GetCurrentSpell(CURRENT_GENERIC_SPELL))
+                if (Spell* spell = GetCurrentSpell(CURRENT_GENERIC_SPELL))
                     spell->AddTriggeredSpell(63685);
                 return SPELL_AURA_PROC_OK;
             }
@@ -2593,7 +3166,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
         case SPELLFAMILY_DEATHKNIGHT:
         {
             // Butchery
-            if (dummySpell->SpellIconID == 2664)
+            if (dummySpell->GetSpellIconID() == 2664)
             {
                 basepoints[0] = triggerAmount;
                 triggered_spell_id = 50163;
@@ -2604,21 +3177,46 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
             if (dummySpell->Id == 49028)
             {
                 // 1 dummy aura for dismiss rune blade
-                if (effIndex != EFFECT_INDEX_2)
+                if (effIndex != EFFECT_INDEX_1)
+                    return SPELL_AURA_PROC_FAILED;
+
+                Pet* runeBlade = FindGuardianWithEntry(27893);
+
+                if (runeBlade && pVictim && damage && procSpell)
+                {
+                    int32 procDmg = damage * 0.5;
+                    runeBlade->CastCustomSpell(pVictim, procSpell->Id, &procDmg, NULL, NULL, true, NULL, NULL, runeBlade->GetObjectGuid());
+                    SendSpellNonMeleeDamageLog(pVictim, procSpell->Id, procDmg, SPELL_SCHOOL_MASK_NORMAL, 0, 0, false, 0, false);
+                    break;
+                }
+                else
                     return SPELL_AURA_PROC_FAILED;
-                // TODO: wite script for this "fights on its own, doing the same attacks"
-                // NOTE: Trigger here on every attack and spell cast
-                return SPELL_AURA_PROC_FAILED;
             }
             // Mark of Blood
             if (dummySpell->Id == 49005)
             {
+                if (!target || target->GetTypeId() != TYPEID_PLAYER)
+                    return SPELL_AURA_PROC_FAILED;
                 // TODO: need more info (cooldowns/PPM)
-                triggered_spell_id = 61607;
+                target->CastSpell(target, 61607, true, NULL, triggeredByAura);
+                return SPELL_AURA_PROC_OK;
+            }
+            // Unholy Blight
+            if (dummySpell->Id == 49194)
+            {
+                basepoints[0] = damage * triggerAmount / 100;
+
+                // Glyph of Unholy Blight
+                if (Aura const* aura = GetDummyAura(63332))
+                    basepoints[0] += basepoints[0] * aura->GetModifier()->m_amount / 100;
+
+                // Split between 10 ticks
+                basepoints[0] /= 10;
+                triggered_spell_id = 50536;
                 break;
             }
             // Vendetta
-            if (dummySpell->SpellFamilyFlags & UI64LIT(0x0000000000010000))
+            if (dummySpell->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_VENDETTA1>())
             {
                 basepoints[0] = triggerAmount * GetMaxHealth() / 100;
                 triggered_spell_id = 50181;
@@ -2626,7 +3224,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Necrosis
-            if (dummySpell->SpellIconID == 2709)
+            if (dummySpell->GetSpellIconID() == 2709)
             {
                 // only melee auto attack affected and Rune Strike
                 if (procSpell && procSpell->Id != 56815)
@@ -2637,7 +3235,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 break;
             }
             // Threat of Thassarian
-            if (dummySpell->SpellIconID == 2023)
+            if (dummySpell->GetSpellIconID() == 2023)
             {
                 // Must Dual Wield
                 if (!procSpell || !haveOffhandWeapon())
@@ -2728,8 +3326,33 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 target = this;
                 break;
             }
+            // Sudden Doom
+            if (dummySpell->GetSpellIconID() == 1939)
+            {
+                if (!target || !target->isAlive() || this->GetTypeId() != TYPEID_PLAYER)
+                    return SPELL_AURA_PROC_FAILED;
+
+                // get highest rank of Death Coil spell
+                const PlayerSpellMap& sp_list = ((Player*)this)->GetSpellMap();
+                for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr)
+                {
+                    if(!itr->second.active || itr->second.disabled || itr->second.state == PLAYERSPELL_REMOVED)
+                        continue;
+
+                    SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
+                    if (!spellInfo)
+                        continue;
+
+                    if (spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && spellInfo->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_DEATH_COIL>())
+                    {
+                        triggered_spell_id = spellInfo->Id;
+                        break;
+                    }
+                }
+                break;
+            }
             // Wandering Plague
-            if (dummySpell->SpellIconID == 1614)
+            if (dummySpell->GetSpellIconID() == 1614)
             {
                 if (!roll_chance_f(GetUnitCriticalChance(BASE_ATTACK, pVictim)))
                     return SPELL_AURA_PROC_FAILED;
@@ -2737,22 +3360,121 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
                 triggered_spell_id = 50526;
                 break;
             }
-            // Blood-Caked Blade
-            if (dummySpell->SpellIconID == 138)
+            // Blood of the North and Reaping
+            if (dummySpell->GetSpellIconID() == 3041 || dummySpell->GetSpellIconID() == 22)
+            {
+                if (GetTypeId()!=TYPEID_PLAYER)
+                    return SPELL_AURA_PROC_FAILED;
+
+                Player *player = (Player*)this;
+                for (uint32 i = 0; i < MAX_RUNES; ++i)
+                {
+                    if (player->GetCurrentRune(i) == RUNE_BLOOD)
+                    {
+                        if(!player->GetRuneCooldown(i))
+                            player->ConvertRune(i, RUNE_DEATH, dummySpell->Id);
+                        else
+                        {
+                            // search for another rune that might be available
+                            for (uint32 iter = i; iter < MAX_RUNES; ++iter)
+                            {
+                                if (player->GetCurrentRune(iter) == RUNE_BLOOD && !player->GetRuneCooldown(iter))
+                                {
+                                    player->ConvertRune(iter, RUNE_DEATH, dummySpell->Id);
+                                    const_cast<Aura*>(triggeredByAura)->SetAuraPeriodicTimer(0);
+                                    return SPELL_AURA_PROC_OK;
+                                }
+                            }
+                            player->SetNeedConvertRune(i, true, dummySpell->Id);
+                        }
+                        const_cast<Aura*>(triggeredByAura)->SetAuraPeriodicTimer(0);
+                        return SPELL_AURA_PROC_OK;
+                    }
+                }
+                return SPELL_AURA_PROC_FAILED;
+            }
+            // Death Rune Mastery
+            if (dummySpell->GetSpellIconID() == 2622)
             {
-                // only main hand melee auto attack affected and Rune Strike
-                if ((procFlag & PROC_FLAG_SUCCESSFUL_OFFHAND_HIT) || procSpell && procSpell->Id != 56815)
+                if (GetTypeId()!=TYPEID_PLAYER)
                     return SPELL_AURA_PROC_FAILED;
 
-                // triggered_spell_id in spell data
+                Player *player = (Player*)this;
+                for (uint32 i = 0; i < MAX_RUNES; ++i)
+                {
+                    RuneType currRune = player->GetCurrentRune(i);
+                    if (currRune == RUNE_UNHOLY || currRune == RUNE_FROST)
+                    {
+                        uint16 cd = player->GetRuneCooldown(i);
+                        if(!cd)
+                            player->ConvertRune(i, RUNE_DEATH, dummySpell->Id);
+                        else // there is a cd
+                            player->SetNeedConvertRune(i, true, dummySpell->Id);
+                        // no break because it converts all
+                    }
+                }
+                const_cast<Aura*>(triggeredByAura)->SetAuraPeriodicTimer(0);
+                return SPELL_AURA_PROC_OK;
+            }
+            // Blood-Caked Blade
+            if (dummySpell->GetSpellIconID() == 138)
+            {
+                // only melee auto attack affected and Rune Strike & Offhand Rune Strike
+                if ( procSpell && !procSpell->GetSpellFamilyFlags().test<CF_DEATHKNIGHT_RUNE_STRIKE>())
+                    return SPELL_AURA_PROC_FAILED;
+                if (procFlag & PROC_FLAG_SUCCESSFUL_OFFHAND_HIT)
+                    triggered_spell_id=61895; // Offhand Blood-Caked Strike
                 break;
             }
+            // Hungering Cold - not proc from dummy
+            if (dummySpell->GetSpellIconID() == 2797)
+            {
+                return SPELL_AURA_PROC_CANT_TRIGGER;
+            }
+            break;
+        }
+        case SPELLFAMILY_PET:
+        {
+            switch (dummySpell->GetSpellIconID())
+            {
+                // Guard Dog
+                case 201:
+                {
+                    triggered_spell_id = 54445;
+                    target = this;
+                    if (pVictim)
+                        pVictim->AddThreat(this,procSpell->EffectBasePoints[0] * triggerAmount / 100.0f);
+                    break;
+                }
+                // Silverback
+                case 1582:
+                    triggered_spell_id = dummySpell->Id == 62765 ? 62801 : 62800;
+                    target = this;
+                    break;
+            }
             break;
         }
         default:
             break;
     }
 
+    if (!triggered_spell_id)
+    {
+        // Linked spells (Proc chain)
+        SpellLinkedSet linkedSet = sSpellMgr.GetSpellLinked(dummySpell->Id, SPELL_LINKED_TYPE_PROC);
+        if (linkedSet.size() > 0)
+        {
+            for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+            {
+                if (target == NULL)
+                    target = !(procFlag & PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL) && IsPositiveSpell(*itr) ? this : pVictim;
+                CastSpell(target, *itr, true, castItem, triggeredByAura);
+                if (cooldown)
+                    AddSpellCooldown(*itr,0,time(NULL) + cooldown);
+            }
+        }
+    }
+
     // processed charge only counting case
     if (!triggered_spell_id)
         return SPELL_AURA_PROC_OK;
@@ -2769,38 +3491,39 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
     if (!target || (target != this && !target->isAlive()))
         return SPELL_AURA_PROC_FAILED;
 
-    if (cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(triggered_spell_id))
+    if (cooldown && HasSpellCooldown(triggered_spell_id))
         return SPELL_AURA_PROC_FAILED;
 
     if (basepoints[EFFECT_INDEX_0] || basepoints[EFFECT_INDEX_1] || basepoints[EFFECT_INDEX_2])
-        CastCustomSpell(target, triggered_spell_id,
+        CastCustomSpell(target, triggerEntry,
             basepoints[EFFECT_INDEX_0] ? &basepoints[EFFECT_INDEX_0] : NULL,
             basepoints[EFFECT_INDEX_1] ? &basepoints[EFFECT_INDEX_1] : NULL,
             basepoints[EFFECT_INDEX_2] ? &basepoints[EFFECT_INDEX_2] : NULL,
-            true, castItem, triggeredByAura);
+            true, castItem, triggeredByAura, originalCaster);
     else
-        CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura);
+        CastSpell(target, triggerEntry, true, castItem, triggeredByAura);
 
-    if (cooldown && GetTypeId()==TYPEID_PLAYER)
-        ((Player*)this)->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
+    if (cooldown)
+        AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
 
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlags, uint32 procEx, uint32 cooldown)
+SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlags, uint32 procEx, uint32 cooldown)
 {
     // Get triggered aura spell info
     SpellEntry const* auraSpellInfo = triggeredByAura->GetSpellProto();
 
     // Basepoints of trigger aura
     int32 triggerAmount = triggeredByAura->GetModifier()->m_amount;
+    uint32 damage = damageInfo->damage;
 
     // Set trigger spell id, target, custom basepoints
     uint32 trigger_spell_id = auraSpellInfo->EffectTriggerSpell[triggeredByAura->GetEffIndex()];
     Unit*  target = NULL;
     int32  basepoints[MAX_EFFECT_INDEX] = {0, 0, 0};
 
-    if(triggeredByAura->GetModifier()->m_auraname == SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE)
+    if (triggeredByAura->GetModifier()->m_auraname == SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE)
         basepoints[0] = triggerAmount;
 
     Item* castItem = triggeredByAura->GetCastItemGuid() && GetTypeId()==TYPEID_PLAYER
@@ -2872,6 +3595,10 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 //case 36207: break:                        // Steal Weapon
                 //case 36576: break:                        // Shaleskin (Shaleskin Flayer, Shaleskin Ripper) 30023 trigger
                 //case 37030: break;                        // Chaotic Temperament
+                case 38164:                                 // Unyielding Knights
+                    if (pVictim->GetEntry() != 19457)
+                        return SPELL_AURA_PROC_FAILED;
+                    break;
                 //case 38363: break;                        // Gushing Wound
                 //case 39215: break;                        // Gushing Wound
                 //case 40250: break;                        // Improved Duration
@@ -2890,6 +3617,11 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 //case 44819: break;                        // Hate Monster (Spar Buddy) (>30% Health)
                 //case 44820: break;                        // Hate Monster (Spar) (<30%)
                 case 45057:                                 // Evasive Maneuvers (Commendation of Kael`thas trinket)
+                case 52420:                                 // Deflection        ( Soul Harvester's Charm )
+                case 71634:                                 // Item - Icecrown 25 Normal Tank Trinket 1
+                case 71640:                                 // Item - Icecrown 25 Heroic Tank Trinket 1
+                case 75475:                                 // Item - Chamber of Aspects 25 Tank Trinket
+                case 75481:                                 // Item - Chamber of Aspects 25 Heroic Tank Trinket
                     // reduce you below $s1% health (in fact in this specific case can proc from any attack while health in result less $s1%)
                     if (int32(GetHealth()) - int32(damage) >= int32(GetMaxHealth() * triggerAmount / 100))
                         return SPELL_AURA_PROC_FAILED;
@@ -2914,6 +3646,11 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 //case 54072: break;                        // Knockback Ball Passive
                 //case 54476: break;                        // Blood Presence
                 //case 54775: break;                        // Abandon Vehicle on Poly
+                case 56702:                                 // Shadow Sickle
+                {
+                    trigger_spell_id = 56701;
+                    break;
+                }
                 case 57345:                                 // Darkmoon Card: Greatness
                 {
                     float stat = 0.0f;
@@ -2994,10 +3731,33 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
 
                     return SPELL_AURA_PROC_OK;
                 }
+                case 71494:                                 // Vengeful Blast
+                {
+                    // despawn Vengeful Shade after proc
+                    if  (GetTypeId() == TYPEID_UNIT)
+                        ((Creature*)this)->ForcedDespawn(1000);
+                    break;
+                }
+                case 72178:                                 // Blood link Saurfang aura
+                {
+                    target = this;
+                    trigger_spell_id = 72195;
+                    break;
+                }
+                case 72256:                                 // Mark of the Fallen Champion
+                {
+                    if (SpellEntry const* triggerSpell = sSpellStore.LookupEntry(trigger_spell_id))
+                    {
+                        if (SpellEntry const* difftrigEntry =  GetSpellEntryByDifficulty(triggerSpell->SpellDifficultyId, GetMap()->GetDifficulty(), GetMap()->IsRaid()))
+                            triggerSpell = difftrigEntry;
+                        basepoints[EFFECT_INDEX_0] = triggerSpell->CalculateSimpleValue(EFFECT_INDEX_0) + damage;
+                    }
+                    break;
+                }
             }
             break;
         case SPELLFAMILY_MAGE:
-            if (auraSpellInfo->SpellIconID == 2127)         // Blazing Speed
+            if (auraSpellInfo->GetSpellIconID() == 2127)         // Blazing Speed
             {
                 switch (auraSpellInfo->Id)
                 {
@@ -3010,51 +3770,80 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                         return SPELL_AURA_PROC_FAILED;
                 }
             }
-            else if(auraSpellInfo->Id == 26467)             // Persistent Shield (Scarab Brooch trinket)
+            else if (auraSpellInfo->Id == 26467)             // Persistent Shield (Scarab Brooch trinket)
             {
                 // This spell originally trigger 13567 - Dummy Trigger (vs dummy effect)
                 basepoints[0] = damage * 15 / 100;
                 target = pVictim;
                 trigger_spell_id = 26470;
             }
-            else if(auraSpellInfo->Id == 71761)             // Deep Freeze Immunity State
+            else if (auraSpellInfo->Id == 71761)             // Deep Freeze Immunity State
             {
                 // spell applied only to permanent immunes to stun targets (bosses)
                 if (pVictim->GetTypeId() != TYPEID_UNIT ||
                     (((Creature*)pVictim)->GetCreatureInfo()->MechanicImmuneMask & (1 << (MECHANIC_STUN - 1))) == 0)
                     return SPELL_AURA_PROC_FAILED;
             }
+            // Missile Barrage
+            else if (auraSpellInfo->GetSpellIconID() == 3261)
+            {
+                // proc chance for spells other than Arcane Blast is always 2 times lower, so we have to roll for 50% now
+                if (procSpell->GetSpellIconID() != 2294 && !roll_chance_i(50))
+                    return SPELL_AURA_PROC_FAILED;
+
+                if (HasAura(44401) || HasAura(57761))
+                    return SPELL_AURA_PROC_FAILED;
+            }
+            // Fingers of Frost
+            else if (auraSpellInfo->GetSpellIconID() == 2947)
+            {
+                // proc chance for spells in basepoints
+                if (!roll_chance_i(triggerAmount))
+                    return SPELL_AURA_PROC_FAILED;
+            }
             break;
         case SPELLFAMILY_WARRIOR:
             // Deep Wounds (replace triggered spells to directly apply DoT), dot spell have familyflags
-            if (auraSpellInfo->SpellFamilyFlags == UI64LIT(0x0) && auraSpellInfo->SpellIconID == 243)
+            if (auraSpellInfo->GetSpellIconID() == 243)
             {
-                float weaponDamage;
-                // DW should benefit of attack power, damage percent mods etc.
-                // TODO: check if using offhand damage is correct and if it should be divided by 2
-                if (haveOffhandWeapon() && getAttackTimer(BASE_ATTACK) > getAttackTimer(OFF_ATTACK))
-                    weaponDamage = (GetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE) + GetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE))/2;
-                else
-                    weaponDamage = (GetFloatValue(UNIT_FIELD_MINDAMAGE) + GetFloatValue(UNIT_FIELD_MAXDAMAGE))/2;
+                bool bOffHand = procFlags & PROC_FLAG_SUCCESSFUL_OFFHAND_HIT;
+                if (bOffHand && !haveOffhandWeapon())
+                {
+                    sLog.outError("Unit::HandleProcTriggerSpellAuraProc: offhand %u proc without offhand weapon!",auraSpellInfo->Id);
+                    return SPELL_AURA_PROC_FAILED;
+                }
+
+                float weaponSpeed = GetAttackTime(bOffHand ? OFF_ATTACK : BASE_ATTACK)/1000.0f;
+                float weaponDPS   = ((GetFloatValue(bOffHand ? UNIT_FIELD_MINOFFHANDDAMAGE : UNIT_FIELD_MINDAMAGE) +
+                                    GetFloatValue(bOffHand ? UNIT_FIELD_MAXOFFHANDDAMAGE : UNIT_FIELD_MAXDAMAGE))/2.0f) / weaponSpeed;
+                float attackPower = GetTotalAttackPowerValue(bOffHand ? OFF_ATTACK : BASE_ATTACK);
+                float f_damage    = 0.0f;
 
                 switch (auraSpellInfo->Id)
                 {
-                    case 12834: basepoints[0] = int32(weaponDamage * 16 / 100); break;
-                    case 12849: basepoints[0] = int32(weaponDamage * 32 / 100); break;
-                    case 12867: basepoints[0] = int32(weaponDamage * 48 / 100); break;
+                    case 12834: f_damage = ((weaponDPS + attackPower / 14.0f) * weaponSpeed)* 0.16f; break;
+                    case 12849: f_damage = ((weaponDPS + attackPower / 14.0f) * weaponSpeed)* 0.32f; break;
+                    case 12867: f_damage = ((weaponDPS + attackPower / 14.0f) * weaponSpeed)* 0.48f; break;
                     // Impossible case
                     default:
                         sLog.outError("Unit::HandleProcTriggerSpellAuraProc: DW unknown spell rank %u",auraSpellInfo->Id);
                         return SPELL_AURA_PROC_FAILED;
                 }
 
-                // 1 tick/sec * 6 sec = 6 ticks
-                basepoints[0] /= 6;
-
                 trigger_spell_id = 12721;
+
+                SpellEntry const* triggerspellInfo = sSpellStore.LookupEntry(trigger_spell_id);
+
+                if (!triggerspellInfo || f_damage < M_NULL_F)
+                    return SPELL_AURA_PROC_FAILED;
+
+                uint32 tickcount = GetSpellDuration(triggerspellInfo) / triggerspellInfo->EffectAmplitude[EFFECT_INDEX_0];
+
+                basepoints[0] = floor( f_damage / tickcount);
+
                 break;
             }
-            else if (auraSpellInfo->SpellIconID == 2961)    // Taste for Blood
+            else if (auraSpellInfo->GetSpellIconID() == 2961)    // Taste for Blood
             {
                 // only at real damage
                 if (!damage)
@@ -3066,13 +3855,13 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
         case SPELLFAMILY_WARLOCK:
         {
             // Drain Soul
-            if (auraSpellInfo->IsFitToFamilyMask(UI64LIT(0x0000000000004000)))
+            if (auraSpellInfo->GetSpellFamilyFlags().test<CF_WARLOCK_DRAIN_SOUL>())
             {
                 // search for "Improved Drain Soul" dummy aura
                 Unit::AuraList const& mDummyAura = GetAurasByType(SPELL_AURA_DUMMY);
                 for(Unit::AuraList::const_iterator i = mDummyAura.begin(); i != mDummyAura.end(); ++i)
                 {
-                    if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARLOCK && (*i)->GetSpellProto()->SpellIconID == 113)
+                    if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARLOCK && (*i)->GetSpellProto()->GetSpellIconID() == 113)
                     {
                         // basepoints of trigger spell stored in dummyeffect of spellProto
                         int32 basepoints = GetMaxPower(POWER_MANA) * (*i)->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_2) / 100;
@@ -3085,14 +3874,14 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 return SPELL_AURA_PROC_FAILED;
             }
             // Consume Shadows
-            else if (auraSpellInfo->IsFitToFamilyMask(UI64LIT(0x0000000002000000)))
+            else if (auraSpellInfo->GetSpellFamilyFlags().test<CF_WARLOCK_VOIDWALKER_SPELLS>())
             {
                 Aura* heal = triggeredByAura->GetHolder()->GetAuraByEffectIndex(EFFECT_INDEX_0);
                 if (!heal || heal->GetAuraTicks() > 1)
                     return SPELL_AURA_PROC_FAILED;
             }
             // Nether Protection
-            else if (auraSpellInfo->SpellIconID == 1985)
+            else if (auraSpellInfo->GetSpellIconID() == 1985)
             {
                 if (!procSpell)
                     return SPELL_AURA_PROC_FAILED;
@@ -3146,7 +3935,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 trigger_spell_id = 37595;
             }
             // Blessed Recovery
-            else if (auraSpellInfo->SpellIconID == 1875)
+            else if (auraSpellInfo->GetSpellIconID() == 1875)
             {
                 switch (auraSpellInfo->Id)
                 {
@@ -3159,10 +3948,27 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 }
                 basepoints[0] = damage * triggerAmount / 100 / 3;
                 target = this;
+                // increase healing factor with each critical strike. Patch 3.0.2
+                if (Aura* old_aura = GetAura(trigger_spell_id, EFFECT_INDEX_0))
+                    basepoints[0] += old_aura->GetModifier()->m_amount;
             }
             // Glyph of Shadow Word: Pain
-            else if (auraSpellInfo->Id == 55681)
-                basepoints[0] = triggerAmount * GetCreateMana() / 100;
+            else if (auraSpellInfo->Id == 55681 )
+            {
+                basepoints[0] = GetCreateMana() * triggerAmount / 100;
+            }
+            else if (auraSpellInfo->Id == 55689)
+            {
+                if(GetShapeshiftForm() != FORM_SHADOW)
+                    return SPELL_AURA_PROC_FAILED;
+            }
+            // Improved Spirit Tap
+            else if (auraSpellInfo->Id == 15337 || auraSpellInfo->Id == 15338)
+            {
+                // proc chance for Mind Flay is 2 times lower, so we have to roll for 50% now
+                if (procSpell->GetSpellIconID() == 548 && roll_chance_i(50))
+                    return SPELL_AURA_PROC_FAILED;
+            }
             break;
         }
         case SPELLFAMILY_DRUID:
@@ -3194,22 +4000,51 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                         return SPELL_AURA_PROC_FAILED;
                 }
             }
+            // Hunter T10 2P Bonus (bad spellfamily)
+            else if (auraSpellInfo->Id == 70727)
+            {
+                if (Pet* pet = GetPet())
+                {
+                    if (pet->isAlive())
+                    {
+                        pet->CastSpell(pet,trigger_spell_id,true);
+                        return SPELL_AURA_PROC_OK;
+                    }
+                }
+                return SPELL_AURA_PROC_FAILED;
+            }
             break;
         }
         case SPELLFAMILY_ROGUE:
         {
-            if (auraSpellInfo->SpellIconID == 2260)         // Combat Potency
+            if (auraSpellInfo->GetSpellIconID() == 2260)         // Combat Potency
             {
                 if (!(procFlags & PROC_FLAG_SUCCESSFUL_OFFHAND_HIT))
                     return SPELL_AURA_PROC_FAILED;
             }
-
+            // Item - Rogue T10 2P Bonus
+            else if (auraSpellInfo->Id == 70805)
+            {
+                if (pVictim != this)
+                    return SPELL_AURA_PROC_FAILED;
+            }
+            // Item - Rogue T10 4P Bonus
+            else if (auraSpellInfo->Id == 70803)
+            {
+                if (!procSpell)
+                    return SPELL_AURA_PROC_FAILED;
+                // only allow melee finishing move to proc
+                if (!procSpell->HasAttribute(SPELL_ATTR_EX_REQ_TARGET_COMBO_POINTS) || procSpell->Id == 26679)
+                    return SPELL_AURA_PROC_FAILED;
+                trigger_spell_id = 70802;
+                target = this;
+            }
             break;
         }
         case SPELLFAMILY_HUNTER:
         {
             // Piercing Shots
-            if (auraSpellInfo->SpellIconID == 3247 && auraSpellInfo->SpellVisual[0] == 0)
+            if (auraSpellInfo->GetSpellIconID() == 3247 && auraSpellInfo->GetSpellVisual() == 0)
             {
                 basepoints[0] = damage * triggerAmount / 100 / 8;
                 trigger_spell_id = 63468;
@@ -3219,11 +4054,15 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
             else if (auraSpellInfo->Id == 53228 || auraSpellInfo->Id == 53232)
             {
                 // This effect only from Rapid Fire (ability cast)
-                if (!(procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000020)))
+                if (!procSpell->GetSpellFamilyFlags().test<CF_HUNTER_RAPID_FIRE>())
                     return SPELL_AURA_PROC_FAILED;
             }
+            // Entrapment correction
+            else if ((auraSpellInfo->Id == 19184 || auraSpellInfo->Id == 19387 || auraSpellInfo->Id == 19388) &&
+                !procSpell->GetSpellFamilyFlags().test<CF_HUNTER_SNAKE_TRAP_EFFECT, CF_HUNTER_FROST_TRAP>())
+                    return SPELL_AURA_PROC_FAILED;
             // Lock and Load
-            else if (auraSpellInfo->SpellIconID == 3579)
+            else if (auraSpellInfo->GetSpellIconID() == 3579)
             {
                 // Check for Lock and Load Marker
                 if (HasAura(67544))
@@ -3241,7 +4080,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
         {
             /*
             // Blessed Life
-            if (auraSpellInfo->SpellIconID == 2137)
+            if (auraSpellInfo->GetSpellIconID() == 2137)
             {
                 switch (auraSpellInfo->Id)
                 {
@@ -3261,6 +4100,13 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 trigger_spell_id = 37706;
                 target = this;
             }
+            // Glyph of Seal of Command
+            else if (auraSpellInfo->Id == 54925)
+            {
+                 if (procSpell && procSpell->Id != 20467)   // Check Seal of Command (prevent double proccing and non-seal of command proccing)
+                     return SPELL_AURA_PROC_FAILED;
+                 break;
+            }
             // Soul Preserver
             if (auraSpellInfo->Id==60510)
             {
@@ -3268,14 +4114,14 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 target = this;
             }
             // Illumination
-            else if (auraSpellInfo->SpellIconID==241)
+            else if (auraSpellInfo->GetSpellIconID()==241)
             {
                 if(!procSpell)
                     return SPELL_AURA_PROC_FAILED;
                 // procspell is triggered spell but we need mana cost of original casted spell
                 uint32 originalSpellId = procSpell->Id;
                 // Holy Shock heal
-                if (procSpell->SpellFamilyFlags & UI64LIT(0x0001000000000000))
+                if (procSpell->GetSpellFamilyFlags().test<CF_PALADIN_HOLY_SHOCK>())
                 {
                     switch(procSpell->Id)
                     {
@@ -3311,7 +4157,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 // stacking
                 CastSpell(this, 37658, true, NULL, triggeredByAura);
 
-                Aura * dummy = GetDummyAura(37658);
+                Aura const* dummy = GetDummyAura(37658);
                 // release at 3 aura in stack (cont contain in basepoint of trigger aura)
                 if(!dummy || dummy->GetStackAmount() < uint32(triggerAmount))
                     return SPELL_AURA_PROC_FAILED;
@@ -3336,7 +4182,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 CastSpell(this, 54842, true, NULL, triggeredByAura);
 
                 // counting
-                Aura * dummy = GetDummyAura(54842);
+                Aura const* dummy = GetDummyAura(54842);
                 // release at 3 aura in stack (cont contain in basepoint of trigger aura)
                 if(!dummy || dummy->GetStackAmount() < uint32(triggerAmount))
                     return SPELL_AURA_PROC_FAILED;
@@ -3345,12 +4191,44 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 trigger_spell_id = 54843;
                 target = pVictim;
             }
+            // Item - Icecrown 25 Normal/Heroic Healer Weapon Proc
+            else if (auraSpellInfo->Id == 71865 || auraSpellInfo->Id == 71868)
+            {
+                // don't proc on self
+                if (procSpell->Id == 71864 || procSpell->Id == 71866)
+                    return SPELL_AURA_PROC_FAILED;
+
+                target = pVictim;
+            }
+            // Item - Coliseum 25 Normal and Heroic Caster Trinket
+            else if (auraSpellInfo->Id == 67712 || auraSpellInfo->Id == 67758)
+            {
+                if (!pVictim || !pVictim->isAlive())
+                    return SPELL_AURA_PROC_FAILED;
+
+                uint32 castSpell = auraSpellInfo->Id == 67758 ? 67759 : 67713;
+
+                // stacking
+                CastSpell(this, castSpell, true, NULL, triggeredByAura);
+
+                // counting
+                Aura const* dummy = GetDummyAura(castSpell);
+
+                // release at 3 aura in stack (count contained in basepoint of trigger aura)
+                if (!dummy || dummy->GetStackAmount() < uint32(triggerAmount))
+                    return SPELL_AURA_PROC_FAILED;
+
+                RemoveAurasDueToSpell(castSpell);
+                trigger_spell_id = castSpell + 1;
+                target = pVictim;
+                break;
+            }
             break;
         }
         case SPELLFAMILY_SHAMAN:
         {
             // Lightning Shield (overwrite non existing triggered spell call in spell.dbc
-            if (auraSpellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000400))
+            if (auraSpellInfo->GetSpellFamilyFlags().test<CF_SHAMAN_LIGHTNING_SHIELD>() && auraSpellInfo->GetSpellVisual() == 37)
             {
                 switch(auraSpellInfo->Id)
                 {
@@ -3400,26 +4278,45 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                 target = this;
             }
             // Nature's Guardian
-            else if (auraSpellInfo->SpellIconID == 2013)
+            else if (auraSpellInfo->GetSpellIconID() == 2013)
             {
                 // Check health condition - should drop to less 30% (trigger at any attack with result health less 30%, independent original health state)
                 int32 health30 = int32(GetMaxHealth()) * 3 / 10;
                 if (int32(GetHealth()) - int32(damage) >= health30)
                     return SPELL_AURA_PROC_FAILED;
 
-                if(pVictim && pVictim->isAlive())
+                if (pVictim && pVictim->isAlive())
                     pVictim->getThreatManager().modifyThreatPercent(this,-10);
 
                 basepoints[0] = triggerAmount * GetMaxHealth() / 100;
                 trigger_spell_id = 31616;
                 target = this;
             }
+            // Item - Shaman T10 Restoration 2P Bonus
+            else if (auraSpellInfo->Id == 70807)
+            {
+                if (!procSpell)
+                    return SPELL_AURA_PROC_FAILED;
+                // only allow Riptide to proc
+                switch(procSpell->Id)
+                {
+                    case 61295: // Rank 1
+                    case 61299: // Rank 2
+                    case 61300: // Rank 3
+                    case 61301: // Rank 4
+                        break;
+                    default:
+                        return SPELL_AURA_PROC_FAILED;
+                }
+                trigger_spell_id = 70806;
+                target = this;
+            }
             break;
         }
         case SPELLFAMILY_DEATHKNIGHT:
         {
             // Acclimation
-            if (auraSpellInfo->SpellIconID == 1930)
+            if (auraSpellInfo->GetSpellIconID() == 1930)
             {
                 if (!procSpell)
                     return SPELL_AURA_PROC_FAILED;
@@ -3437,8 +4334,31 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
                         return SPELL_AURA_PROC_FAILED;
                 }
             }
+            // Glyph of Death's Embrace
+            else if (auraSpellInfo->Id == 58677)
+            {
+                if (procSpell->Id != 47633)
+                    return SPELL_AURA_PROC_FAILED;
+            }
+            // Glyph of Death Grip
+            if (auraSpellInfo->Id == 62259)
+            {
+                // remove cooldown of Death Grip
+                RemoveSpellCooldown(49576, true);
+                return SPELL_AURA_PROC_OK;
+            }
+            // Item - Death Knight T10 Melee 4P Bonus
+            else if (auraSpellInfo->Id == 70656)
+            {
+                if (GetTypeId() != TYPEID_PLAYER || getClass() != CLASS_DEATH_KNIGHT)
+                    return SPELL_AURA_PROC_FAILED;
+
+                for(uint32 i = 0; i < MAX_RUNES; ++i)
+                    if (((Player*)this)->GetRuneCooldown(i) == 0)
+                        return SPELL_AURA_PROC_FAILED;
+            }
             // Blade Barrier
-            else if (auraSpellInfo->SpellIconID == 85)
+            else if (auraSpellInfo->GetSpellIconID() == 85)
             {
                 if (GetTypeId() != TYPEID_PLAYER || getClass() != CLASS_DEATH_KNIGHT ||
                     !((Player*)this)->IsBaseRuneSlotsOnCooldown(RUNE_BLOOD))
@@ -3447,7 +4367,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
             // Improved Blood Presence
             else if (auraSpellInfo->Id == 63611)
             {
-                if (GetTypeId() != TYPEID_PLAYER || !((Player*)this)->isHonorOrXPTarget(pVictim) || !damage)
+                if (!damage)
                     return SPELL_AURA_PROC_FAILED;
                 basepoints[0] = triggerAmount * damage / 100;
                 trigger_spell_id = 50475;
@@ -3519,7 +4439,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
         // Enlightenment (trigger only from mana cost spells)
         case 35095:
         {
-            if(!procSpell || procSpell->powerType!=POWER_MANA || procSpell->manaCost==0 && procSpell->ManaCostPercentage==0 && procSpell->manaCostPerlevel==0)
+            if (!procSpell || procSpell->GetPowerType() != POWER_MANA || (procSpell->manaCost == 0 && procSpell->ManaCostPercentage == 0 && procSpell->manaCostPerlevel == 0))
                 return SPELL_AURA_PROC_FAILED;
             break;
         }
@@ -3536,14 +4456,14 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
             if (Aura* aur = owner->GetAura(48090, EFFECT_INDEX_0))
                 curBonus = aur->GetModifier()->m_amount;
             int32 spellDamage  = owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_MAGIC) - curBonus;
-            if(spellDamage <= 0)
+            if (spellDamage <= 0)
                 return SPELL_AURA_PROC_FAILED;
 
             // percent stored in owner talent dummy
             AuraList const& dummyAuras = owner->GetAurasByType(SPELL_AURA_DUMMY);
             for (AuraList::const_iterator i = dummyAuras.begin(); i != dummyAuras.end(); ++i)
             {
-                if ((*i)->GetSpellProto()->SpellIconID == 3220)
+                if ((*i)->GetSpellProto()->GetSpellIconID() == 3220)
                 {
                     basepoints[0] = basepoints[1] = int32(spellDamage * (*i)->GetModifier()->m_amount / 100);
                     break;
@@ -3555,13 +4475,21 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
         case 50227:
         {
             // Remove cooldown on Shield Slam
-            if (GetTypeId() == TYPEID_PLAYER)
-                ((Player*)this)->RemoveSpellCategoryCooldown(1209, true);
+            RemoveSpellCategoryCooldown(1209, true);
             break;
         }
         // Maelstrom Weapon
         case 53817:
         {
+            // Item - Shaman T10 Enhancement 4P Bonus
+            // Calculate before roll_chance of ranks
+            if (Aura const* dummy = GetDummyAura(70832))
+            {
+              if (SpellAuraHolderPtr aurHolder = GetSpellAuraHolder(53817))
+                if ((aurHolder->GetStackAmount() == aurHolder->GetSpellProto()->StackAmount) && roll_chance_i(dummy->GetBasePoints()))
+                    CastSpell(this,70831,true,castItem,triggeredByAura);
+            }
+
             // have rank dependent proc chance, ignore too often cases
             // PPM = 2.5 * (rank of talent),
             uint32 rank = sSpellMgr.GetSpellRank(auraSpellInfo->Id);
@@ -3576,14 +4504,14 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
             if(!procSpell)
                 return SPELL_AURA_PROC_FAILED;
             // For trigger from Blizzard need exist Improved Blizzard
-            if (procSpell->SpellFamilyName==SPELLFAMILY_MAGE && (procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000080)))
+            if (procSpell->SpellFamilyName==SPELLFAMILY_MAGE && procSpell->GetSpellFamilyFlags().test<CF_MAGE_BLIZZARD>())
             {
                 bool found = false;
                 AuraList const& mOverrideClassScript = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
                 for(AuraList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i)
                 {
                     int32 script = (*i)->GetModifier()->m_miscvalue;
-                    if(script==836 || script==988 || script==989)
+                    if (script==836 || script==988 || script==989)
                     {
                         found=true;
                         break;
@@ -3619,16 +4547,23 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
         case 56453:
         {
             // Proc only from trap activation (from periodic proc another aura of this spell)
-            if (!(procFlags & PROC_FLAG_ON_TRAP_ACTIVATION) || !roll_chance_i(triggerAmount))
+            // because some spells have both flags (ON_TRAP_ACTIVATION and ON_PERIODIC), but should only proc ON_PERIODIC!!
+            if (!(procFlags & PROC_FLAG_ON_TRAP_ACTIVATION) || !procSpell ||
+                !(procSpell->GetSchoolMask() & (SPELL_SCHOOL_MASK_FROST | SPELL_SCHOOL_MASK_NATURE)) || !roll_chance_i(triggerAmount))
+            {
+                return SPELL_AURA_PROC_FAILED;
+            }
+            // don't proc Explosive Trap on triggering (only on periodic, in other aura proc)
+            else if (procSpell->GetSpellFamilyFlags().test<CF_HUNTER_FIRE_TRAP_EFFECTS>())
                 return SPELL_AURA_PROC_FAILED;
+
             break;
         }
         // Freezing Fog (Rime triggered)
         case 59052:
         {
             // Howling Blast cooldown reset
-            if (GetTypeId() == TYPEID_PLAYER)
-                ((Player*)this)->RemoveSpellCategoryCooldown(1248, true);
+            RemoveSpellCategoryCooldown(1248, true);
             break;
         }
         // Druid - Savage Defense
@@ -3639,7 +4574,24 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
         }
     }
 
-    if (cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(trigger_spell_id))
+    if (!trigger_spell_id)
+    {
+        // Linked spells (Proc chain)
+        SpellLinkedSet linkedSet = sSpellMgr.GetSpellLinked(auraSpellInfo->Id, SPELL_LINKED_TYPE_PROC);
+        if (linkedSet.size() > 0)
+        {
+            for (SpellLinkedSet::const_iterator itr = linkedSet.begin(); itr != linkedSet.end(); ++itr)
+            {
+                if (target == NULL)
+                    target = !(procFlags & PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL) && IsPositiveSpell(*itr) ? this : pVictim;
+                CastSpell(target, *itr, true, castItem, triggeredByAura);
+                if (cooldown)
+                    AddSpellCooldown(*itr,0,time(NULL) + cooldown);
+            }
+        }
+    }
+
+    if (cooldown && HasSpellCooldown(trigger_spell_id))
         return SPELL_AURA_PROC_FAILED;
 
     // try detect target manually if not set
@@ -3650,36 +4602,47 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d
     if (!target || (target != this && !target->isAlive()))
         return SPELL_AURA_PROC_FAILED;
 
-    if (basepoints[EFFECT_INDEX_0] || basepoints[EFFECT_INDEX_1] || basepoints[EFFECT_INDEX_2])
-        CastCustomSpell(target,trigger_spell_id,
-            basepoints[EFFECT_INDEX_0] ? &basepoints[EFFECT_INDEX_0] : NULL,
-            basepoints[EFFECT_INDEX_1] ? &basepoints[EFFECT_INDEX_1] : NULL,
-            basepoints[EFFECT_INDEX_2] ? &basepoints[EFFECT_INDEX_2] : NULL,
-            true, castItem, triggeredByAura);
+
+    if (SpellEntry const* triggeredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id))
+    {
+        if (basepoints[EFFECT_INDEX_0] || basepoints[EFFECT_INDEX_1] || basepoints[EFFECT_INDEX_2])
+            CastCustomSpell(target,triggeredSpellInfo,
+                basepoints[EFFECT_INDEX_0] ? &basepoints[EFFECT_INDEX_0] : NULL,
+                basepoints[EFFECT_INDEX_1] ? &basepoints[EFFECT_INDEX_1] : NULL,
+                basepoints[EFFECT_INDEX_2] ? &basepoints[EFFECT_INDEX_2] : NULL,
+                true, castItem, triggeredByAura);
+        else
+            CastSpell(target,triggeredSpellInfo,true,castItem,triggeredByAura);
+    }
     else
-        CastSpell(target,trigger_spell_id,true,castItem,triggeredByAura);
+    {
+        sLog.outError("HandleProcTriggerSpellAuraProc: unknown spell id %u by caster: %s triggered by aura %u (eff %u)", trigger_spell_id, GetGuidStr().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex());
+        return SPELL_AURA_PROC_FAILED;
+    }
 
-    if (cooldown && GetTypeId()==TYPEID_PLAYER)
-        ((Player*)this)->AddSpellCooldown(trigger_spell_id,0,time(NULL) + cooldown);
+    if (cooldown)
+        AddSpellCooldown(trigger_spell_id,0,time(NULL) + cooldown);
 
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleProcTriggerDamageAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlags, uint32 procEx, uint32 cooldown)
+SpellAuraProcResult Unit::HandleProcTriggerDamageAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlags, uint32 procEx, uint32 cooldown)
 {
     SpellEntry const *spellInfo = triggeredByAura->GetSpellProto();
     DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "ProcDamageAndSpell: doing %u damage from spell id %u (triggered by auratype %u of spell %u)",
         triggeredByAura->GetModifier()->m_amount, spellInfo->Id, triggeredByAura->GetModifier()->m_auraname, triggeredByAura->GetId());
-    SpellNonMeleeDamage damageInfo(this, pVictim, spellInfo->Id, SpellSchoolMask(spellInfo->SchoolMask));
-    CalculateSpellDamage(&damageInfo, triggeredByAura->GetModifier()->m_amount, spellInfo);
-    damageInfo.target->CalculateAbsorbResistBlock(this, &damageInfo, spellInfo);
-    DealDamageMods(damageInfo.target,damageInfo.damage,&damageInfo.absorb);
-    SendSpellNonMeleeDamageLog(&damageInfo);
-    DealSpellDamage(&damageInfo, true);
+
+    DamageInfo procDamageInfo(this, pVictim, spellInfo);
+    procDamageInfo.damage = triggeredByAura->GetModifier()->m_amount;
+    CalculateSpellDamage(&procDamageInfo);
+    procDamageInfo.target->CalculateAbsorbResistBlock(this, &procDamageInfo, spellInfo);
+    DealDamageMods(&procDamageInfo);
+    SendSpellNonMeleeDamageLog(&procDamageInfo);
+    DealSpellDamage(&procDamageInfo, true);
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 /*damage*/, Aura *triggeredByAura, SpellEntry const *procSpell, uint32 /*procFlag*/, uint32 /*procEx*/ ,uint32 cooldown)
+SpellAuraProcResult Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 /*procFlag*/, uint32 /*procEx*/ ,uint32 cooldown)
 {
     int32 scriptId = triggeredByAura->GetModifier()->m_miscvalue;
 
@@ -3698,21 +4661,21 @@ SpellAuraProcResult Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint3
     {
         case 836:                                           // Improved Blizzard (Rank 1)
         {
-            if (!procSpell || procSpell->SpellVisual[0] != 9487)
+            if (!procSpell || procSpell->GetSpellVisual() != 9487)
                 return SPELL_AURA_PROC_FAILED;
             triggered_spell_id = 12484;
             break;
         }
         case 988:                                           // Improved Blizzard (Rank 2)
         {
-            if (!procSpell || procSpell->SpellVisual[0] != 9487)
+            if (!procSpell || procSpell->GetSpellVisual() != 9487)
                 return SPELL_AURA_PROC_FAILED;
             triggered_spell_id = 12485;
             break;
         }
         case 989:                                           // Improved Blizzard (Rank 3)
         {
-            if (!procSpell || procSpell->SpellVisual[0] != 9487)
+            if (!procSpell || procSpell->GetSpellVisual() != 9487)
                 return SPELL_AURA_PROC_FAILED;
             triggered_spell_id = 12486;
             break;
@@ -3732,7 +4695,7 @@ SpellAuraProcResult Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint3
             if (!roll_chance_i(50))
                 return SPELL_AURA_PROC_FAILED;
 
-            switch (pVictim->getPowerType())
+            switch (pVictim->GetPowerType())
             {
                 case POWER_MANA:   triggered_spell_id = 28722; break;
                 case POWER_RAGE:   triggered_spell_id = 28723; break;
@@ -3746,8 +4709,8 @@ SpellAuraProcResult Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint3
             triggered_spell_id = 28750;                     // Blessing of the Claw
             break;
         case 5497:                                          // Improved Mana Gems (Serpent-Coil Braid)
-            triggered_spell_id = 37445;                     // Mana Surge
-            break;
+            CastSpell(pVictim, 37445, true);                // Mana Surge (direct because triggeredByAura has no duration)
+            return SPELL_AURA_PROC_OK;
         case 6953:                                          // Warbringer
             RemoveAurasAtMechanicImmunity(IMMUNE_TO_ROOT_AND_SNARE_MASK,0,true);
             return SPELL_AURA_PROC_OK;
@@ -3758,7 +4721,7 @@ SpellAuraProcResult Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint3
             if(!roll_chance_i(triggerAmount))
                 return SPELL_AURA_PROC_FAILED;
 
-            switch( pVictim->getPowerType() )
+            switch (pVictim->GetPowerType())
             {
                 case POWER_MANA:        triggered_spell_id = 48542; break;
                 case POWER_RAGE:        triggered_spell_id = 48541; break;
@@ -3768,6 +4731,40 @@ SpellAuraProcResult Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint3
             }
             break;
         }
+        case 7282:                                          // Crypt Fever & Ebon Plaguebringer
+        {
+            if (!procSpell || pVictim == this)
+                return SPELL_AURA_PROC_FAILED;
+
+            bool HasEP = false;
+            Unit::AuraList const& scriptAuras = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
+            for(Unit::AuraList::const_iterator i = scriptAuras.begin(); i != scriptAuras.end(); ++i)
+            {
+                if ((*i)->GetSpellProto()->GetSpellIconID() == 1766)
+                {
+                    HasEP = true;
+                    break;
+                }
+            }
+
+            if (!HasEP)
+                switch(triggeredByAura->GetId())
+                {
+                    case 49032: triggered_spell_id = 50508; break;
+                    case 49631: triggered_spell_id = 50509; break;
+                    case 49632: triggered_spell_id = 50510; break;
+                    default: return SPELL_AURA_PROC_FAILED;
+                }
+            else
+                switch(triggeredByAura->GetId())
+                {
+                    case 51099: triggered_spell_id = 51726; break;
+                    case 51160: triggered_spell_id = 51734; break;
+                    case 51161: triggered_spell_id = 51735; break;
+                    default: return SPELL_AURA_PROC_FAILED;
+                }
+            break;
+        }
     }
 
     // not processed
@@ -3783,18 +4780,18 @@ SpellAuraProcResult Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint3
         return SPELL_AURA_PROC_FAILED;
     }
 
-    if( cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(triggered_spell_id))
+    if ( cooldown && HasSpellCooldown(triggered_spell_id))
         return SPELL_AURA_PROC_FAILED;
 
     CastSpell(pVictim, triggered_spell_id, true, castItem, triggeredByAura);
 
-    if( cooldown && GetTypeId()==TYPEID_PLAYER )
-        ((Player*)this)->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
+    if (cooldown)
+        AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
 
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleMendingAuraProc( Unit* /*pVictim*/, uint32 /*damage*/, Aura* triggeredByAura, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/ )
+SpellAuraProcResult Unit::HandleMendingAuraProc(Unit* /*pVictim*/, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/ )
 {
     // aura can be deleted at casts
     SpellEntry const* spellProto = triggeredByAura->GetSpellProto();
@@ -3803,111 +4800,130 @@ SpellAuraProcResult Unit::HandleMendingAuraProc( Unit* /*pVictim*/, uint32 /*dam
     ObjectGuid caster_guid = triggeredByAura->GetCasterGuid();
 
     // jumps
-    int32 jumps = triggeredByAura->GetHolder()->GetAuraCharges()-1;
+    int32 jumps = triggeredByAura->GetHolder()->GetAuraCharges() - 1;
+
+    // current aura holder expire
+    triggeredByAura->GetHolder()->SetAuraCharges(1, false);
 
     // next target selection
-    if (jumps > 0 && GetTypeId()==TYPEID_PLAYER && caster_guid.IsPlayer())
+    if (jumps > 0 && GetTypeId() == TYPEID_PLAYER && caster_guid.IsPlayer())
     {
         float radius;
         if (spellProto->EffectRadiusIndex[effIdx])
             radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(spellProto->EffectRadiusIndex[effIdx]));
         else
-            radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(spellProto->rangeIndex));
+            radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(spellProto->GetRangeIndex()));
 
-        if(Player* caster = ((Player*)triggeredByAura->GetCaster()))
+        if (Player* caster = ((Player*)triggeredByAura->GetCaster()))
         {
-            caster->ApplySpellMod(spellProto->Id, SPELLMOD_RADIUS, radius, NULL);
+            caster->ApplySpellMod(spellProto->Id, SPELLMOD_RADIUS, radius);
 
-            if(Player* target = ((Player*)this)->GetNextRandomRaidMember(radius))
+            SpellAuraHolderPtr holder = GetSpellAuraHolder(spellProto->Id, caster->GetObjectGuid());
+
+            if (Player* target = ((Player*)this)->GetNextRandomRaidMember(radius, true))
             {
-                SpellAuraHolder *holder = GetSpellAuraHolder(spellProto->Id, caster->GetObjectGuid());
-                SpellAuraHolder *new_holder = CreateSpellAuraHolder(spellProto, target, caster);
+                SpellAuraHolderPtr new_holder = CreateSpellAuraHolder(spellProto, target, caster);
 
                 for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
                 {
-                    Aura *aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i));
+                    Aura* aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i));
                     if (!aur)
                         continue;
 
                     int32 basePoints = aur->GetBasePoints();
-                    Aura * new_aur = CreateAura(spellProto, aur->GetEffIndex(), &basePoints, new_holder, target, caster);
-                    new_holder->AddAura(new_aur, new_aur->GetEffIndex());
+                    new_holder->CreateAura(spellProto, aur->GetEffIndex(), &basePoints, new_holder, target, caster, NULL);
                 }
                 new_holder->SetAuraCharges(jumps, false);
 
                 // lock aura holder (currently SPELL_AURA_PRAYER_OF_MENDING is single target spell, so will attempt removing from old target
                 // when applied to new one)
-                triggeredByAura->SetInUse(true);
                 target->AddSpellAuraHolder(new_holder);
-                triggeredByAura->SetInUse(false);
             }
         }
     }
 
     // heal
-    CastCustomSpell(this,33110,&heal,NULL,NULL,true,NULL,NULL,caster_guid, spellProto);
+    CastCustomSpell(this, 33110, &heal, NULL, NULL, true, NULL, NULL, caster_guid, spellProto);
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleModCastingSpeedNotStackAuraProc(Unit* /*pVictim*/, uint32 /*damage*/, Aura* /*triggeredByAura*/, SpellEntry const* procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+SpellAuraProcResult Unit::HandleModCastingSpeedNotStackAuraProc(Unit* /*pVictim*/, DamageInfo* damageInfo, Aura const* /*triggeredByAura*/, SpellEntry const* procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
 {
     // Skip melee hits or instant cast spells
     return !(procSpell == NULL || GetSpellCastTime(procSpell) == 0) ? SPELL_AURA_PROC_OK : SPELL_AURA_PROC_FAILED;
 }
 
-SpellAuraProcResult Unit::HandleReflectSpellsSchoolAuraProc(Unit* /*pVictim*/, uint32 /*damage*/, Aura* triggeredByAura, SpellEntry const* procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+SpellAuraProcResult Unit::HandleReflectSpellsSchoolAuraProc(Unit* /*pVictim*/, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const* procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
 {
     // Skip Melee hits and spells ws wrong school
-    return !(procSpell == NULL || (triggeredByAura->GetModifier()->m_miscvalue & procSpell->SchoolMask) == 0) ? SPELL_AURA_PROC_OK : SPELL_AURA_PROC_FAILED;
+    return !(procSpell == NULL || (triggeredByAura->GetModifier()->m_miscvalue & procSpell->GetSchoolMask()) == 0) ? SPELL_AURA_PROC_OK : SPELL_AURA_PROC_FAILED;
 }
 
-SpellAuraProcResult Unit::HandleModPowerCostSchoolAuraProc(Unit* /*pVictim*/, uint32 /*damage*/, Aura* triggeredByAura, SpellEntry const* procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+SpellAuraProcResult Unit::HandleModPowerCostSchoolAuraProc(Unit* /*pVictim*/, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const* procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
 {
     // Skip melee hits and spells ws wrong school or zero cost
     return !(procSpell == NULL ||
             (procSpell->manaCost == 0 && procSpell->ManaCostPercentage == 0) ||           // Cost check
-            (triggeredByAura->GetModifier()->m_miscvalue & procSpell->SchoolMask) == 0) ? SPELL_AURA_PROC_OK : SPELL_AURA_PROC_FAILED;  // School check
+            (triggeredByAura->GetModifier()->m_miscvalue & procSpell->GetSchoolMask()) == 0) ? SPELL_AURA_PROC_OK : SPELL_AURA_PROC_FAILED;  // School check
 }
 
-SpellAuraProcResult Unit::HandleMechanicImmuneResistanceAuraProc(Unit* /*pVictim*/, uint32 /*damage*/, Aura* triggeredByAura, SpellEntry const* procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+SpellAuraProcResult Unit::HandleMechanicImmuneResistanceAuraProc(Unit* /*pVictim*/, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const* procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
 {
     // Compare mechanic
     return !(procSpell==NULL || int32(procSpell->Mechanic) != triggeredByAura->GetModifier()->m_miscvalue)
         ? SPELL_AURA_PROC_OK : SPELL_AURA_PROC_FAILED;
 }
 
-SpellAuraProcResult Unit::HandleModDamageFromCasterAuraProc(Unit* pVictim, uint32 /*damage*/, Aura* triggeredByAura, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+SpellAuraProcResult Unit::HandleModDamageFromCasterAuraProc(Unit* pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
 {
     // Compare casters
     return triggeredByAura->GetCasterGuid() == pVictim->GetObjectGuid() ? SPELL_AURA_PROC_OK : SPELL_AURA_PROC_FAILED;
 }
 
-SpellAuraProcResult Unit::HandleAddFlatModifierAuraProc(Unit* pVictim, uint32 /*damage*/, Aura* triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+SpellAuraProcResult Unit::HandleAddFlatModifierAuraProc(Unit* pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
 {
     SpellEntry const *spellInfo = triggeredByAura->GetSpellProto();
 
-    if (spellInfo->Id == 55166)                                 // Tidal Force
-    {
-        // Remove only single aura from stack
-        if (triggeredByAura->GetStackAmount() > 1 && !triggeredByAura->GetHolder()->ModStackAmount(-1))
-            return SPELL_AURA_PROC_CANT_TRIGGER;
-    }
-    else if (spellInfo->Id == 53695 || spellInfo->Id == 53696)   // Judgements of the Just
+    switch (spellInfo->Id)
     {
-        if (!procSpell)
-            return SPELL_AURA_PROC_FAILED;
+                                                // Remove only single aura from stack
+        case 53257:                             // Cobra strike
+        case 55166:                             // Tidal Force
+        {
+                SpellAuraHolderPtr holder = triggeredByAura->GetHolder();
+                if (!holder || holder->IsDeleted())
+                    return SPELL_AURA_PROC_FAILED;
 
-        if (GetSpellSpecific(procSpell->Id) != SPELL_JUDGEMENT)
-            return SPELL_AURA_PROC_FAILED;
+                if (holder->ModStackAmount(-1))
+                {
+                    RemoveSpellAuraHolder(holder);
+                    return SPELL_AURA_PROC_OK;
+                }
+                else
+                    return SPELL_AURA_PROC_CANT_TRIGGER;
+                break;
+        }
+        case 53695:
+        case 53696:                             // Judgements of the Just
+        {
+            if (!procSpell)
+                return SPELL_AURA_PROC_FAILED;
 
-        int bp = triggeredByAura->GetModifier()->m_amount;
-        CastCustomSpell(pVictim, 68055, &bp, NULL, NULL, true, NULL, triggeredByAura);
+            if (!procSpell->GetSpellFamilyFlags().test<CF_PALADIN_JUDGEMENT_ACTIVATE>())
+                return SPELL_AURA_PROC_FAILED;
+
+            int bp = triggeredByAura->GetModifier()->m_amount;
+            CastCustomSpell(pVictim, 68055, &bp, NULL, NULL, true, NULL, triggeredByAura);
+            break;
+        }
+        default:
+            break;
     }
 
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleAddPctModifierAuraProc(Unit* /*pVictim*/, uint32 /*damage*/, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 /*procFlag*/, uint32 procEx, uint32 /*cooldown*/)
+SpellAuraProcResult Unit::HandleAddPctModifierAuraProc(Unit* /*pVictim*/, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 /*procFlag*/, uint32 procEx, uint32 /*cooldown*/)
 {
     SpellEntry const *spellInfo = triggeredByAura->GetSpellProto();
     Item* castItem = triggeredByAura->GetCastItemGuid() && GetTypeId()==TYPEID_PLAYER
@@ -3929,6 +4945,16 @@ SpellAuraProcResult Unit::HandleAddPctModifierAuraProc(Unit* /*pVictim*/, uint32
             }
             break;
         }
+        case SPELLFAMILY_PRIEST:
+        {
+            // Serendipity
+            if (spellInfo->GetSpellIconID() == 2900)
+            {
+                RemoveAurasDueToSpell(spellInfo->Id);
+                return SPELL_AURA_PROC_OK;
+            }
+            break;
+        }
         case SPELLFAMILY_PALADIN:
         {
             // Glyph of Divinity
@@ -3948,36 +4974,164 @@ SpellAuraProcResult Unit::HandleAddPctModifierAuraProc(Unit* /*pVictim*/, uint32
             }
             break;
         }
+        case SPELLFAMILY_WARRIOR:
+        {
+            if (spellInfo->Id == 46916)           // Slam!
+            {
+                if (!(procSpell && procSpell->Id==50782))
+                    return SPELL_AURA_PROC_CANT_TRIGGER;
+            }
+            break;
+        }
+        case SPELLFAMILY_ROGUE:
+        {
+            if (spellInfo->Id == 70805)           // Item - Rogue T10 2P Bonus (Rank 3)
+                return SPELL_AURA_PROC_CANT_TRIGGER;
+            break;
+        }
+        case SPELLFAMILY_HUNTER:
+        {
+            // Lock and load triggered
+            if (spellInfo->Id == 56453)
+            {
+                // Proc only on first effect
+                if (triggeredByAura->GetEffIndex() != EFFECT_INDEX_0)
+                    return SPELL_AURA_PROC_CANT_TRIGGER;
+
+                // Remove only single aura from stack
+                if (triggeredByAura->GetStackAmount() > 1 && !triggeredByAura->GetHolder()->ModStackAmount(-1))
+                    return SPELL_AURA_PROC_CANT_TRIGGER;
+            }
+            break;
+        }
+        default:
+            break;
     }
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleModDamagePercentDoneAuraProc(Unit* /*pVictim*/, uint32 /*damage*/, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 /*procFlag*/, uint32 procEx, uint32 cooldown)
+SpellAuraProcResult Unit::HandleModDamagePercentDoneAuraProc(Unit* /*pVictim*/, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 /*procFlag*/, uint32 procEx, uint32 cooldown)
 {
     SpellEntry const *spellInfo = triggeredByAura->GetSpellProto();
     Item* castItem = triggeredByAura->GetCastItemGuid() && GetTypeId()==TYPEID_PLAYER
         ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetCastItemGuid()) : NULL;
 
     // Aspect of the Viper
-    if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && spellInfo->SpellFamilyFlags & UI64LIT(0x4000000000000))
+    if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && spellInfo->GetSpellFamilyFlags().test<CF_HUNTER_ASPECT_OF_THE_VIPER>())
     {
         uint32 maxmana = GetMaxPower(POWER_MANA);
         int32 bp = int32(maxmana* GetAttackTime(RANGED_ATTACK)/1000.0f/100.0f);
 
-        if(cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(34075))
+        if (cooldown && HasSpellCooldown(34075))
             return SPELL_AURA_PROC_FAILED;
 
         CastCustomSpell(this, 34075, &bp, NULL, NULL, true, castItem, triggeredByAura);
     }
     // Arcane Blast
-    else if (spellInfo->Id == 36032 && procSpell->SpellFamilyName == SPELLFAMILY_MAGE && procSpell->SpellIconID == 2294)
+    else if (spellInfo->Id == 36032 && procSpell->SpellFamilyName == SPELLFAMILY_MAGE && procSpell->GetSpellIconID() == 2294)
         // prevent proc from self(spell that triggered this aura)
         return SPELL_AURA_PROC_FAILED;
+    else if (spellInfo->Id == 16246)
+        // Shaman clearcasting - must proc only first effect
+        return SPELL_AURA_PROC_CANT_TRIGGER;
+
+    return SPELL_AURA_PROC_OK;
+}
+
+SpellAuraProcResult Unit::HandlePeriodicDummyAuraProc(Unit* /*pVictim*/, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+{
+    if (!triggeredByAura)
+        return SPELL_AURA_PROC_FAILED;
+
+    SpellEntry const *spellProto = triggeredByAura->GetSpellProto();
+    if (!spellProto)
+        return SPELL_AURA_PROC_FAILED;
+
+    switch (spellProto->SpellFamilyName)
+    {
+        case SPELLFAMILY_GENERIC:
+        {
+            switch (spellProto->Id)
+            {
+                case 66334:                                 // Mistress' Kiss (Trial of the Crusader, ->
+                case 67905:                                 // -> Lord Jaraxxus encounter, all difficulties)
+                case 67906:                                 // ----- // -----
+                case 67907:                                 // ----- // -----
+                {
+                    CastSpell(this, 66359, true, NULL, triggeredByAura);
+                    break;
+                }
+            }
+            break;
+        }
+        case SPELLFAMILY_DEATHKNIGHT:
+        {
+            switch (spellProto->GetSpellIconID())
+            {
+                // Reaping
+                // Death Rune Mastery
+                // Blood of the North
+                case 22:
+                case 2622:
+                case 3041:
+                {
+                    if(!procSpell)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    if (getClass() != CLASS_DEATH_KNIGHT)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    Player * plr = GetTypeId() == TYPEID_PLAYER? ((Player*)this) : NULL;
+                    if (!plr)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    //get spell rune cost
+                    SpellRuneCostEntry const *runeCost = sSpellRuneCostStore.LookupEntry(procSpell->runeCostID);
+                    if (!runeCost)
+                        return SPELL_AURA_PROC_FAILED;
+
+                    //convert runes to death
+                    for (uint32 i = 0; i < NUM_RUNE_TYPES -1/*don't count death rune*/; ++i)
+                    {
+                        uint32 remainingCost = runeCost->RuneCost[i];
 
+                        while(remainingCost)
+                        {
+                            int32  convertedRuneCooldown = -1;
+                            uint32 convertedRune = i;
+                            for(uint32 j = 0; j < MAX_RUNES; ++j)
+                            {
+                                // convert only valid runes
+                                if (RuneType(i) != plr->GetCurrentRune(j) &&
+                                    RuneType(i) != plr->GetBaseRune(j))
+                                    continue;
+
+                                // select rune with longest cooldown
+                                if (convertedRuneCooldown < plr->GetRuneCooldown(j))
+                                {
+                                    convertedRuneCooldown = int32(plr->GetRuneCooldown(j));
+                                    convertedRune = j;
+                                }
+                            }
+                            if (convertedRuneCooldown >= 0)
+                                plr->ConvertRune(convertedRune, RUNE_DEATH);
+                            --remainingCost;
+                        }
+                    }
+                    return SPELL_AURA_PROC_OK;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        default:
+            break;
+    }
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleModRating(Unit* /*pVictim*/, uint32 /*damage*/, Aura* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+SpellAuraProcResult Unit::HandleModRating(Unit* /*pVictim*/, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
 {
     SpellEntry const *spellInfo = triggeredByAura->GetSpellProto();
 
@@ -3991,21 +5145,45 @@ SpellAuraProcResult Unit::HandleModRating(Unit* /*pVictim*/, uint32 /*damage*/,
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleSpellMagnetAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
+SpellAuraProcResult Unit::HandleRemoveByDamageProc(Unit* pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
+{
+    SpellAuraHolderPtr holder    = triggeredByAura->GetHolder();
+    SpellEntry const*  spellInfo = triggeredByAura->GetSpellProto();
+
+    // Hungering Cold - not break from diseases
+    if (spellInfo->GetSpellIconID() == 2797)
+    {
+        if (procSpell && procSpell->Dispel == DISPEL_DISEASE)
+            return SPELL_AURA_PROC_FAILED;
+    }
+
+    if (procSpell && triggeredByAura->GetModifier()->m_auraname == SPELL_AURA_MOD_STEALTH)
+    {
+            if (procSpell->HasAttribute(SPELL_ATTR_EX_NOT_BREAK_STEALTH) || procSpell->HasAttribute(SPELL_ATTR_EX_NO_THREAT) ||
+                procSpell->HasAttribute(SPELL_ATTR_EX2_UNK28))
+            return SPELL_AURA_PROC_FAILED;
+    }
+
+    RemoveAurasByCasterSpell(triggeredByAura->GetSpellProto()->Id, triggeredByAura->GetCasterGuid());
+
+    return SPELL_AURA_PROC_OK;
+}
+
+SpellAuraProcResult Unit::HandleSpellMagnetAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
 {
     if (triggeredByAura->GetId() == 8178)                   // Grounding Totem Effect
     {
         // for spells that doesn't do damage but need to destroy totem anyway
-        if ((!damage || damage < GetHealth()) && GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsTotem())
+        if ((!damageInfo->damage || damageInfo->damage < GetHealth()) && GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsTotem())
         {
-            DealDamage(this, GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            KillSelf();
             return SPELL_AURA_PROC_OK;
         }
     }
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleManaShieldAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
+SpellAuraProcResult Unit::HandleManaShieldAuraProc(Unit *pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
 {
     SpellEntry const *dummySpell = triggeredByAura->GetSpellProto ();
 
@@ -4020,7 +5198,7 @@ SpellAuraProcResult Unit::HandleManaShieldAuraProc(Unit *pVictim, uint32 damage,
         case SPELLFAMILY_MAGE:
         {
             // Incanter's Regalia set (add trigger chance to Mana Shield)
-            if (dummySpell->SpellFamilyFlags & UI64LIT(0x0000000000008000))
+            if (dummySpell->GetSpellFamilyFlags().test<CF_MAGE_MANA_SHIELD>())
             {
                 if (GetTypeId() != TYPEID_PLAYER)
                     return SPELL_AURA_PROC_FAILED;
@@ -4051,44 +5229,214 @@ SpellAuraProcResult Unit::HandleManaShieldAuraProc(Unit *pVictim, uint32 damage,
     if (!target || (target != this && !target->isAlive()))
         return SPELL_AURA_PROC_FAILED;
 
-    if (cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(triggered_spell_id))
+    if (cooldown && HasSpellCooldown(triggered_spell_id))
         return SPELL_AURA_PROC_FAILED;
 
     CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura);
 
-    if (cooldown && GetTypeId()==TYPEID_PLAYER)
-        ((Player*)this)->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
+    if (cooldown)
+        AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
 
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleModResistanceAuraProc(Unit* /*pVictim*/, uint32 damage, Aura* triggeredByAura, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+SpellAuraProcResult Unit::HandleModResistanceAuraProc(Unit* /*pVictim*/, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
 {
     SpellEntry const *spellInfo = triggeredByAura->GetSpellProto();
 
     // Inner Fire
-    if (spellInfo->IsFitToFamily(SPELLFAMILY_PRIEST, UI64LIT(0x0000000000002)))
+    if (spellInfo->IsFitToFamily<SPELLFAMILY_PRIEST, CF_PRIEST_INNER_FIRE>())
     {
         // only at real damage
-        if (!damage)
+        if (!damageInfo->damage)
             return SPELL_AURA_PROC_FAILED;
     }
 
     return SPELL_AURA_PROC_OK;
 }
 
-SpellAuraProcResult Unit::HandleRemoveByDamageChanceProc(Unit* pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
+/**
+ * Function to operations with custom hardcoded proc-like effects, maked over proc system
+ *
+ * @param - as
+ * @retcode - enum SpellAuraProcResult
+        SPELL_AURA_PROC_OK           - aura must proc anyway
+        SPELL_AURA_PROC_CANT_TRIGGER - aura not may proc anyway
+        SPELL_AURA_PROC_FAILED       - aura may proc, if this defined by Unit::IsTriggeredAtSpellProcEvent
+ */
+
+SpellAuraProcResult Unit::IsTriggeredAtCustomProcEvent(Unit *pVictim, SpellAuraHolderPtr holder, SpellEntry const* procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, SpellProcEventEntry const*& spellProcEvent )
+{
+    if (!holder || holder->IsDeleted())
+        return SPELL_AURA_PROC_CANT_TRIGGER;
+
+    SpellEntry const* spellProto = holder->GetSpellProto();
+
+    if (procSpell == spellProto)
+        return SPELL_AURA_PROC_FAILED;
+
+    uint32 EventProcFlag = GetProcFlag(spellProto);
+
+    for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
+    {
+        if (holder->GetAuraByEffectIndex(SpellEffectIndex(i)))
+        {
+            AuraType auraName = AuraType(spellProto->EffectApplyAuraName[i]);
+
+            switch (auraName)
+            {
+                // Removable by damage auras (same rules as for CC auras)
+                case SPELL_AURA_WATER_WALK:
+                // Crowd Control auras
+                case SPELL_AURA_MOD_CONFUSE:
+                case SPELL_AURA_MOD_FEAR:
+                case SPELL_AURA_MOD_STUN:
+                case SPELL_AURA_MOD_ROOT:
+                case SPELL_AURA_TRANSFORM:
+                {
+                    if ((procFlag & PROC_FLAG_TAKEN_ANY_DAMAGE) &&
+                        ((spellProto->AuraInterruptFlags & AURA_INTERRUPT_FLAG_DAMAGE) ||
+                        (spellProto->HasAttribute(SPELL_ATTR_BREAKABLE_BY_DAMAGE))))
+                        return SPELL_AURA_PROC_OK;
+                    if (((procFlag & PROC_FLAG_TAKEN_ANY_DAMAGE) ||
+                        (procExtra & PROC_EX_ABSORB)) &&
+                        (spellProto->HasAttribute(SPELL_ATTR_EX_BREAKABLE_BY_ANY_DAMAGE) &&
+                        ((spellProto->AuraInterruptFlags & AURA_INTERRUPT_FLAG_DIRECT_DAMAGE) ||
+                        (spellProto->AuraInterruptFlags & AURA_INTERRUPT_FLAG_DAMAGE) ||
+                        spellProto->HasAttribute(SPELL_ATTR_BREAKABLE_BY_DAMAGE))))
+                        return SPELL_AURA_PROC_OK;
+                    else if (EventProcFlag || spellProcEvent)
+                        return SPELL_AURA_PROC_FAILED;
+                    else
+                        return SPELL_AURA_PROC_CANT_TRIGGER;
+                }
+                case SPELL_AURA_DAMAGE_SHIELD:
+                    if (procFlag & PROC_FLAG_TAKEN_MELEE_HIT)
+                        return SPELL_AURA_PROC_OK;
+                    break;
+                // Fake death auras
+                case SPELL_AURA_FEIGN_DEATH:
+                // Invisibility auras
+                case SPELL_AURA_MOD_STEALTH:
+                case SPELL_AURA_MOD_INVISIBILITY:
+                {
+                    if ((!EventProcFlag && !spellProcEvent) &&
+                        ((procFlag & PROC_FLAG_TAKEN_ANY_DAMAGE) ||
+                        (procExtra & PROC_EX_DIRECT_DAMAGE)) &&
+                        !((procFlag &  PROC_FLAG_TAKEN_AOE_SPELL_HIT) ||
+                        (procFlag &  PROC_FLAG_ON_TAKE_PERIODIC)) &&
+                        !((procFlag & PROC_FLAG_SUCCESSFUL_AOE_SPELL_HIT) ||
+                        (procFlag & PROC_FLAG_ON_DO_PERIODIC))
+                        )
+                        return SPELL_AURA_PROC_OK;
+                    else if (EventProcFlag || spellProcEvent)
+                        return SPELL_AURA_PROC_FAILED;
+                    else
+                        return SPELL_AURA_PROC_CANT_TRIGGER;
+                }
+                default:
+                {
+                // Default rules for all other auras.
+                    if (EventProcFlag || spellProcEvent)
+                        return SPELL_AURA_PROC_FAILED;
+                    else if ((procFlag & PROC_FLAG_TAKEN_ANY_DAMAGE) &&
+                        ((spellProto->AuraInterruptFlags & AURA_INTERRUPT_FLAG_DAMAGE) ||
+                        spellProto->HasAttribute(SPELL_ATTR_BREAKABLE_BY_DAMAGE)))
+                        return SPELL_AURA_PROC_OK;
+                    break;
+                }
+            }
+
+        }
+    }
+    return SPELL_AURA_PROC_FAILED;
+}
+
+SpellAuraProcResult Unit::HandleDamageShieldAuraProc(Unit* pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
+{
+    if (!triggeredByAura)
+        return SPELL_AURA_PROC_FAILED;
+
+    SpellEntry const *spellProto = triggeredByAura->GetSpellProto();
+
+    if (!spellProto)
+        return SPELL_AURA_PROC_FAILED;
+
+    DamageInfo procDamageInfo =  DamageInfo(this, pVictim, spellProto, triggeredByAura->GetModifier()->m_amount);
+    procDamageInfo.CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL);
+    procDamageInfo.damageType = SPELL_DIRECT_DAMAGE;
+
+    SpellDamageBonusDone(&procDamageInfo);
+    pVictim->SpellDamageBonusTaken(&procDamageInfo);
+    pVictim->CalculateDamageAbsorbAndResist(this, &procDamageInfo, !spellProto->HasAttribute(SPELL_ATTR_EX_CANT_REFLECTED));
+    DealDamageMods(&procDamageInfo);
+
+    uint32 targetHealth = pVictim->GetHealth();
+    uint32 overkill     = procDamageInfo.damage > targetHealth ? procDamageInfo.damage - targetHealth : 0;
+
+    WorldPacket data(SMSG_SPELLDAMAGESHIELD,(8+8+4+4+4+4));
+    data << GetObjectGuid();
+    data << pVictim->GetObjectGuid();
+    data << uint32(procDamageInfo.GetSpellId());
+    data << uint32(procDamageInfo.damage);                  // Damage
+    data << uint32(overkill);                   // Overkill
+    data << uint32(procDamageInfo.GetSchoolMask());
+    SendMessageToSet(&data, true);
+
+    DealDamage(pVictim, &procDamageInfo, true);
+
+    return SPELL_AURA_PROC_OK;
+}
+
+SpellAuraProcResult Unit::HandleDropChargeByDamageProc(Unit* pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
+{
+    if (!triggeredByAura)
+        return SPELL_AURA_PROC_FAILED;
+
+    if (SpellAuraHolderPtr holder = triggeredByAura->GetHolder())
+    {
+        if (holder->DropAuraCharge())
+            RemoveSpellAuraHolder(holder);
+    }
+    else
+        return SPELL_AURA_PROC_FAILED;
+
+    return SPELL_AURA_PROC_OK;
+}
+
+SpellAuraProcResult Unit::HandleRemoveByDamageChanceProc(Unit* pVictim, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
 {
+    if (!triggeredByAura)
+        return SPELL_AURA_PROC_FAILED;
+
+    SpellEntry const *spellProto = triggeredByAura->GetSpellProto();
+
+    if (!spellProto)
+        return SPELL_AURA_PROC_FAILED;
+
+    if ((spellProto->AuraInterruptFlags & AURA_INTERRUPT_FLAG_DAMAGE) || (procEx & PROC_EX_IGNORE_CC))
+        return HandleRemoveByDamageProc(pVictim, damageInfo, triggeredByAura, procSpell, procFlag, procEx, cooldown);
+
+    if (const_cast<Aura*>(triggeredByAura)->IsAffectedByCrowdControlEffect(damageInfo->damage + damageInfo->absorb))
+        return SPELL_AURA_PROC_FAILED;
+
     // The chance to dispel an aura depends on the damage taken with respect to the casters level.
     uint32 max_dmg = getLevel() > 8 ? 25 * getLevel() - 150 : 50;
-    float chance = float(damage) / max_dmg * 100.0f;
+    float chance = float(damageInfo->damage) / max_dmg * 100.0f;
+
     if (roll_chance_f(chance))
-    {
-        triggeredByAura->SetInUse(true);
-        RemoveAurasByCasterSpell(triggeredByAura->GetId(), triggeredByAura->GetCasterGuid());
-        triggeredByAura->SetInUse(false);
-        return SPELL_AURA_PROC_OK;
-    }
+        return HandleRemoveByDamageProc(pVictim, damageInfo, triggeredByAura, procSpell, procFlag, procEx, cooldown);
 
     return SPELL_AURA_PROC_FAILED;
-}
\ No newline at end of file
+}
+
+SpellAuraProcResult Unit::HandleIgnoreUnitStateAuraProc(Unit* /*pVictim*/, DamageInfo* damageInfo, Aura const* triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/)
+{
+    SpellEntry const *spellInfo = triggeredByAura->GetSpellProto();
+    if (spellInfo->Id == 52437 && procSpell && procSpell->Id==20647)   // Sudden Death must proc only from dummy part of Execute
+    {
+        //Remove only single aura from stack
+        return SPELL_AURA_PROC_CANT_TRIGGER;
+    }
+    return SPELL_AURA_PROC_OK;
+}
diff --git a/src/game/UpdateData.cpp b/src/game/UpdateData.cpp
index 1c1c9fedef3..dd51243bd0c 100644
--- a/src/game/UpdateData.cpp
+++ b/src/game/UpdateData.cpp
@@ -30,23 +30,23 @@ UpdateData::UpdateData() : m_blockCount(0)
 {
 }
 
-void UpdateData::AddOutOfRangeGUID(ObjectGuidSet& guids)
+void UpdateData::AddOutOfRangeGuids(GuidSet& guids)
 {
-    m_outOfRangeGUIDs.insert(guids.begin(),guids.end());
+    m_outOfRangeGuids.insert(guids.begin(), guids.end());
 }
 
-void UpdateData::AddOutOfRangeGUID(ObjectGuid const &guid)
+void UpdateData::AddOutOfRangeGuid(ObjectGuid const& guid)
 {
-    m_outOfRangeGUIDs.insert(guid);
+    m_outOfRangeGuids.insert(guid);
 }
 
-void UpdateData::AddUpdateBlock(const ByteBuffer &block)
+void UpdateData::AddUpdateBlock(ByteBuffer const& block)
 {
     m_data.append(block);
     ++m_blockCount;
 }
 
-void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size)
+void UpdateData::Compress(void* dst, uint32* dst_size, void* src, int src_size)
 {
     z_stream c_stream;
 
@@ -102,44 +102,51 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size)
     *dst_size = c_stream.total_out;
 }
 
-bool UpdateData::BuildPacket(WorldPacket *packet)
+bool UpdateData::BuildPacket(WorldPacket* packet)
 {
     MANGOS_ASSERT(packet->empty());                         // shouldn't happen
 
-    ByteBuffer buf(4 + (m_outOfRangeGUIDs.empty() ? 0 : 1 + 4 + 9 * m_outOfRangeGUIDs.size()) + m_data.wpos());
+    ByteBuffer buf(4 + (m_outOfRangeGuids.empty() ? 0 : 1 + 4 + 9 * m_outOfRangeGuids.size()) + m_data.wpos());
 
-    buf << (uint32) (!m_outOfRangeGUIDs.empty() ? m_blockCount + 1 : m_blockCount);
+    buf << uint32((!m_outOfRangeGuids.empty() ? m_blockCount + 1 : m_blockCount));
 
-    if(!m_outOfRangeGUIDs.empty())
+    if (!m_outOfRangeGuids.empty())
     {
-        buf << (uint8) UPDATETYPE_OUT_OF_RANGE_OBJECTS;
-        buf << (uint32) m_outOfRangeGUIDs.size();
+        buf << uint8(UPDATETYPE_OUT_OF_RANGE_OBJECTS);
+        buf << uint32(m_outOfRangeGuids.size());
 
-        for(ObjectGuidSet::const_iterator i = m_outOfRangeGUIDs.begin(); i != m_outOfRangeGUIDs.end(); ++i)
-            buf << i->WriteAsPacked();
+        for (GuidSet::const_iterator itr = m_outOfRangeGuids.begin(); itr != m_outOfRangeGuids.end(); ++itr)
+            buf << itr->WriteAsPacked();
     }
 
     buf.append(m_data);
 
-    size_t pSize = buf.wpos();                              // use real used data size
+    size_t pktSize = buf.wpos(); // use real used data size
 
-    if (pSize > 100 )                                       // compress large packets
-    {
-        uint32 destsize = compressBound(pSize);
-        packet->resize( destsize + sizeof(uint32) );
+    uint32 dstSize = compressBound(pktSize);
+    packet->resize(sizeof(uint32) + dstSize);
+    packet->put<uint32>(0, pktSize); // put uncompessed size
+
+    Compress(const_cast<uint8*>(packet->contents()) + sizeof(uint32), &dstSize, (void*)buf.contents(), pktSize);
 
-        packet->put<uint32>(0, pSize);
-        Compress(const_cast<uint8*>(packet->contents()) + sizeof(uint32), &destsize, (void*)buf.contents(), pSize);
-        if (destsize == 0)
-            return false;
+    // if compress error, send as uncompressed
+    if (!dstSize)
+        dstSize = pktSize;
 
-        packet->resize( destsize + sizeof(uint32) );
-        packet->SetOpcode( SMSG_COMPRESSED_UPDATE_OBJECT );
+    dstSize += sizeof(uint32);
+
+    // send compressed packet if size less
+    if (dstSize < pktSize)
+    {
+        packet->resize(dstSize);
+        packet->SetOpcode(SMSG_COMPRESSED_UPDATE_OBJECT);
     }
-    else                                                    // send small packets without compression
+    // send packets without compression
+    else
     {
-        packet->append( buf );
-        packet->SetOpcode( SMSG_UPDATE_OBJECT );
+        packet->clear(); // clear before append buf. in WorldSocket::SendPacket used pct.size(), not pct.wpos()
+        packet->append(buf);
+        packet->SetOpcode(SMSG_UPDATE_OBJECT);
     }
 
     return true;
@@ -148,6 +155,6 @@ bool UpdateData::BuildPacket(WorldPacket *packet)
 void UpdateData::Clear()
 {
     m_data.clear();
-    m_outOfRangeGUIDs.clear();
+    m_outOfRangeGuids.clear();
     m_blockCount = 0;
 }
diff --git a/src/game/UpdateData.h b/src/game/UpdateData.h
index 02329ff910c..9cbbe407fc4 100644
--- a/src/game/UpdateData.h
+++ b/src/game/UpdateData.h
@@ -54,20 +54,20 @@ class UpdateData
     public:
         UpdateData();
 
-        void AddOutOfRangeGUID(ObjectGuidSet& guids);
-        void AddOutOfRangeGUID(ObjectGuid const &guid);
-        void AddUpdateBlock(const ByteBuffer &block);
-        bool BuildPacket(WorldPacket *packet);
-        bool HasData() { return m_blockCount > 0 || !m_outOfRangeGUIDs.empty(); }
+        void AddOutOfRangeGuids(GuidSet& guids);
+        void AddOutOfRangeGuid(ObjectGuid const &guid);
+        void AddUpdateBlock(const ByteBuffer& block);
+        bool BuildPacket(WorldPacket* packet);
+        bool HasData() { return m_blockCount > 0 || !m_outOfRangeGuids.empty(); }
         void Clear();
 
-        ObjectGuidSet const& GetOutOfRangeGUIDs() const { return m_outOfRangeGUIDs; }
+        GuidSet const& GetOutOfRangeGuids() const { return m_outOfRangeGuids; }
 
     protected:
         uint32 m_blockCount;
-        ObjectGuidSet m_outOfRangeGUIDs;
+        GuidSet m_outOfRangeGuids;
         ByteBuffer m_data;
 
-        void Compress(void* dst, uint32 *dst_size, void* src, int src_size);
+        void Compress(void* dst, uint32* dst_size, void* src, int src_size);
 };
 #endif
diff --git a/src/game/UpdateFieldFlags.cpp b/src/game/UpdateFieldFlags.cpp
new file mode 100644
index 00000000000..4f91f2e774d
--- /dev/null
+++ b/src/game/UpdateFieldFlags.cpp
@@ -0,0 +1,1570 @@
+/*
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2011-2012 MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "UpdateFieldFlags.h"
+
+uint32 ItemUpdateFieldFlags[CONTAINER_END] =
+{
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_GUID
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_GUID+1
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_TYPE
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_ENTRY
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_SCALE_X
+    UF_FLAG_NONE,                                           // OBJECT_FIELD_PADDING
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_OWNER
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_OWNER+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_CONTAINED
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_CONTAINED+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_CREATOR
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_CREATOR+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_GIFTCREATOR
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_GIFTCREATOR+1
+    UF_FLAG_OWNER | UF_FLAG_ITEM_OWNER,                     // ITEM_FIELD_STACK_COUNT
+    UF_FLAG_OWNER | UF_FLAG_ITEM_OWNER,                     // ITEM_FIELD_DURATION
+    UF_FLAG_OWNER | UF_FLAG_ITEM_OWNER,                     // ITEM_FIELD_SPELL_CHARGES
+    UF_FLAG_OWNER | UF_FLAG_ITEM_OWNER,                     // ITEM_FIELD_SPELL_CHARGES+1
+    UF_FLAG_OWNER | UF_FLAG_ITEM_OWNER,                     // ITEM_FIELD_SPELL_CHARGES+2
+    UF_FLAG_OWNER | UF_FLAG_ITEM_OWNER,                     // ITEM_FIELD_SPELL_CHARGES+3
+    UF_FLAG_OWNER | UF_FLAG_ITEM_OWNER,                     // ITEM_FIELD_SPELL_CHARGES+4
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_FLAGS
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_1_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_1_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_1_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_2_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_2_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_2_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_3_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_3_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_3_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_4_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_4_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_4_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_5_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_5_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_5_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_6_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_6_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_6_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_7_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_7_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_7_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_8_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_8_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_8_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_9_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_9_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_9_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_10_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_10_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_10_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_11_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_11_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_11_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_12_1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_12_1+1
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_ENCHANTMENT_12_3
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_PROPERTY_SEED
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_RANDOM_PROPERTIES_ID
+    UF_FLAG_OWNER | UF_FLAG_ITEM_OWNER,                     // ITEM_FIELD_DURABILITY
+    UF_FLAG_OWNER | UF_FLAG_ITEM_OWNER,                     // ITEM_FIELD_MAXDURABILITY
+    UF_FLAG_PUBLIC,                                         // ITEM_FIELD_CREATE_PLAYED_TIME
+    UF_FLAG_NONE,                                           // ITEM_FIELD_PAD
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_NUM_SLOTS
+    UF_FLAG_NONE,                                           // CONTAINER_ALIGN_PAD
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+1
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+2
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+3
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+4
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+5
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+6
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+7
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+8
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+9
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+10
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+11
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+12
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+13
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+14
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+15
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+16
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+17
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+18
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+19
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+20
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+21
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+22
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+23
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+24
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+25
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+26
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+27
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+28
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+29
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+30
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+31
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+32
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+33
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+34
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+35
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+36
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+37
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+38
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+39
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+40
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+41
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+42
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+43
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+44
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+45
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+46
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+47
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+48
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+49
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+50
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+51
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+52
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+53
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+54
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+55
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+56
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+57
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+58
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+59
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+60
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+61
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+62
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+63
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+64
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+65
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+66
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+67
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+68
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+69
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+70
+    UF_FLAG_PUBLIC,                                         // CONTAINER_FIELD_SLOT_1+71
+};
+
+uint32 UnitUpdateFieldFlags[PLAYER_END] =
+{
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_GUID
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_GUID+1
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_TYPE
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_ENTRY
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_SCALE_X
+    UF_FLAG_NONE,                                           // OBJECT_FIELD_PADDING
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_CHARM
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_CHARM+1
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_SUMMON
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_SUMMON+1
+    UF_FLAG_PRIVATE,                                        // UNIT_FIELD_CRITTER
+    UF_FLAG_PRIVATE,                                        // UNIT_FIELD_CRITTER+1
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_CHARMEDBY
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_CHARMEDBY+1
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_SUMMONEDBY
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_SUMMONEDBY+1
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_CREATEDBY
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_CREATEDBY+1
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_TARGET
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_TARGET+1
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_CHANNEL_OBJECT
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_CHANNEL_OBJECT+1
+    UF_FLAG_PUBLIC,                                         // UNIT_CHANNEL_SPELL
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_BYTES_0
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_HEALTH
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_POWER1
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_POWER2
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_POWER3
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_POWER4
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_POWER5
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_POWER6
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_POWER7
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_MAXHEALTH
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_MAXPOWER1
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_MAXPOWER2
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_MAXPOWER3
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_MAXPOWER4
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_MAXPOWER5
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_MAXPOWER6
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_MAXPOWER7
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER+1
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER+2
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER+3
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER+4
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER+5
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER+6
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER+1
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER+2
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER+3
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER+4
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER+5
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER+6
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_LEVEL
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_FACTIONTEMPLATE
+    UF_FLAG_PUBLIC,                                         // UNIT_VIRTUAL_ITEM_SLOT_ID
+    UF_FLAG_PUBLIC,                                         // UNIT_VIRTUAL_ITEM_SLOT_ID+1
+    UF_FLAG_PUBLIC,                                         // UNIT_VIRTUAL_ITEM_SLOT_ID+2
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_FLAGS
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_FLAGS_2
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_AURASTATE
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_BASEATTACKTIME
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_BASEATTACKTIME+1
+    UF_FLAG_PRIVATE,                                        // UNIT_FIELD_RANGEDATTACKTIME
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_BOUNDINGRADIUS
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_COMBATREACH
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_DISPLAYID
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_NATIVEDISPLAYID
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_MOUNTDISPLAYID
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER | UF_FLAG_SPECIAL_INFO, // UNIT_FIELD_MINDAMAGE
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER | UF_FLAG_SPECIAL_INFO, // UNIT_FIELD_MAXDAMAGE
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER | UF_FLAG_SPECIAL_INFO, // UNIT_FIELD_MINOFFHANDDAMAGE
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER | UF_FLAG_SPECIAL_INFO, // UNIT_FIELD_MAXOFFHANDDAMAGE
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_BYTES_1
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_PETNUMBER
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_PET_NAME_TIMESTAMP
+    UF_FLAG_OWNER,                                          // UNIT_FIELD_PETEXPERIENCE
+    UF_FLAG_OWNER,                                          // UNIT_FIELD_PETNEXTLEVELEXP
+    UF_FLAG_DYNAMIC,                                        // UNIT_DYNAMIC_FLAGS
+    UF_FLAG_PUBLIC,                                         // UNIT_MOD_CAST_SPEED
+    UF_FLAG_PUBLIC,                                         // UNIT_CREATED_BY_SPELL
+    UF_FLAG_DYNAMIC,                                        // UNIT_NPC_FLAGS
+    UF_FLAG_PUBLIC,                                         // UNIT_NPC_EMOTESTATE
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_STAT0
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_STAT1
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_STAT2
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_STAT3
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_STAT4
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POSSTAT0
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POSSTAT1
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POSSTAT2
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POSSTAT3
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POSSTAT4
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_NEGSTAT0
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_NEGSTAT1
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_NEGSTAT2
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_NEGSTAT3
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_NEGSTAT4
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER | UF_FLAG_SPECIAL_INFO, // UNIT_FIELD_RESISTANCES
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER | UF_FLAG_SPECIAL_INFO, // UNIT_FIELD_RESISTANCES+1
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER | UF_FLAG_SPECIAL_INFO, // UNIT_FIELD_RESISTANCES+2
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER | UF_FLAG_SPECIAL_INFO, // UNIT_FIELD_RESISTANCES+3
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER | UF_FLAG_SPECIAL_INFO, // UNIT_FIELD_RESISTANCES+4
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER | UF_FLAG_SPECIAL_INFO, // UNIT_FIELD_RESISTANCES+5
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER | UF_FLAG_SPECIAL_INFO, // UNIT_FIELD_RESISTANCES+6
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+1
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+2
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+3
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+4
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+5
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+6
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+1
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+2
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+3
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+4
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+5
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+6
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_BASE_MANA
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_BASE_HEALTH
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_BYTES_2
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_ATTACK_POWER
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_ATTACK_POWER_MODS
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_ATTACK_POWER_MULTIPLIER
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RANGED_ATTACK_POWER
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RANGED_ATTACK_POWER_MODS
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_MINRANGEDDAMAGE
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_MAXRANGEDDAMAGE
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MODIFIER
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MODIFIER+1
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MODIFIER+2
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MODIFIER+3
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MODIFIER+4
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MODIFIER+5
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MODIFIER+6
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MULTIPLIER
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MULTIPLIER+1
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MULTIPLIER+2
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MULTIPLIER+3
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MULTIPLIER+4
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MULTIPLIER+5
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_POWER_COST_MULTIPLIER+6
+    UF_FLAG_PRIVATE | UF_FLAG_OWNER,                        // UNIT_FIELD_MAXHEALTHMODIFIER
+    UF_FLAG_PUBLIC,                                         // UNIT_FIELD_HOVERHEIGHT
+    UF_FLAG_NONE,                                           // UNIT_FIELD_PADDING
+    UF_FLAG_PUBLIC,                                         // PLAYER_DUEL_ARBITER
+    UF_FLAG_PUBLIC,                                         // PLAYER_DUEL_ARBITER+1
+    UF_FLAG_PUBLIC,                                         // PLAYER_FLAGS
+    UF_FLAG_PUBLIC,                                         // PLAYER_GUILDID
+    UF_FLAG_PUBLIC,                                         // PLAYER_GUILDRANK
+    UF_FLAG_PUBLIC,                                         // PLAYER_BYTES
+    UF_FLAG_PUBLIC,                                         // PLAYER_BYTES_2
+    UF_FLAG_PUBLIC,                                         // PLAYER_BYTES_3
+    UF_FLAG_PUBLIC,                                         // PLAYER_DUEL_TEAM
+    UF_FLAG_PUBLIC,                                         // PLAYER_GUILD_TIMESTAMP
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_1_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_1_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_1_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_1_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_1_4
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_2_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_2_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_2_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_2_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_2_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_3_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_3_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_3_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_3_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_3_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_4_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_4_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_4_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_4_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_4_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_5_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_5_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_5_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_5_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_5_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_6_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_6_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_6_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_6_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_6_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_7_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_7_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_7_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_7_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_7_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_8_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_8_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_8_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_8_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_8_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_9_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_9_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_9_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_9_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_9_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_10_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_10_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_10_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_10_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_10_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_11_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_11_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_11_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_11_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_11_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_12_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_12_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_12_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_12_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_12_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_13_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_13_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_13_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_13_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_13_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_14_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_14_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_14_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_14_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_14_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_15_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_15_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_15_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_15_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_15_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_16_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_16_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_16_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_16_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_16_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_17_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_17_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_17_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_17_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_17_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_18_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_18_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_18_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_18_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_18_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_19_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_19_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_19_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_19_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_19_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_20_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_20_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_20_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_20_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_20_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_21_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_21_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_21_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_21_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_21_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_22_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_22_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_22_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_22_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_22_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_23_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_23_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_23_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_23_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_23_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_24_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_24_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_24_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_24_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_24_5
+    UF_FLAG_PARTY_MEMBER,                                   // PLAYER_QUEST_LOG_25_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_25_2
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_25_3
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_25_3+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_QUEST_LOG_25_5
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_1_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_1_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_2_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_2_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_3_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_3_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_4_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_4_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_5_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_5_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_6_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_6_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_7_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_7_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_8_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_8_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_9_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_9_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_10_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_10_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_11_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_11_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_12_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_12_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_13_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_13_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_14_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_14_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_15_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_15_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_16_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_16_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_17_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_17_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_18_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_18_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_19_ENTRYID
+    UF_FLAG_PUBLIC,                                         // PLAYER_VISIBLE_ITEM_19_ENCHANTMENT
+    UF_FLAG_PUBLIC,                                         // PLAYER_CHOSEN_TITLE
+    UF_FLAG_PUBLIC,                                         // PLAYER_FAKE_INEBRIATION
+    UF_FLAG_NONE,                                           // PLAYER_FIELD_PAD_0
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+14
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+15
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+16
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+17
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+18
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+19
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+20
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+21
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+22
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+23
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+24
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+25
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+26
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+27
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+28
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+29
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+30
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+31
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+32
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+33
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+34
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+35
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+36
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+37
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+38
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+39
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+40
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+41
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+42
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+43
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+44
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_INV_SLOT_HEAD+45
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+14
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+15
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+16
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+17
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+18
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+19
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+20
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+21
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+22
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+23
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+24
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+25
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+26
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+27
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+28
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+29
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+30
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PACK_SLOT_1+31
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+14
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+15
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+16
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+17
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+18
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+19
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+20
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+21
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+22
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+23
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+24
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+25
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+26
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+27
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+28
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+29
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+30
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+31
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+32
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+33
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+34
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+35
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+36
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+37
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+38
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+39
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+40
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+41
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+42
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+43
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+44
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+45
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+46
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+47
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+48
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+49
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+50
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+51
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+52
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+53
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+54
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANK_SLOT_1+55
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BANKBAG_SLOT_1+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+14
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+15
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+16
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+17
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+18
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+19
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+20
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+21
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+22
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_VENDORBUYBACK_SLOT_1+23
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+14
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+15
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+16
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+17
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+18
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+19
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+20
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+21
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+22
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+23
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+24
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+25
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+26
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+27
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+28
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+29
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+30
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+31
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+32
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+33
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+34
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+35
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+36
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+37
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+38
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+39
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+40
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+41
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+42
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+43
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+44
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+45
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+46
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+47
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+48
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+49
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+50
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+51
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+52
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+53
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+54
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+55
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+56
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+57
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+58
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+59
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+60
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+61
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+62
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KEYRING_SLOT_1+63
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+14
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+15
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+16
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+17
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+18
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+19
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+20
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+21
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+22
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+23
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+24
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+25
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+26
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+27
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+28
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+29
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+30
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+31
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+32
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+33
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+34
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+35
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+36
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+37
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+38
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+39
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+40
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+41
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+42
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+43
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+44
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+45
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+46
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+47
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+48
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+49
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+50
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+51
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+52
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+53
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+54
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+55
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+56
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+57
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+58
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+59
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+60
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+61
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+62
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_CURRENCYTOKEN_SLOT_1+63
+    UF_FLAG_PRIVATE,                                        // PLAYER_FARSIGHT
+    UF_FLAG_PRIVATE,                                        // PLAYER_FARSIGHT+1
+    UF_FLAG_PRIVATE,                                        // PLAYER__FIELD_KNOWN_TITLES
+    UF_FLAG_PRIVATE,                                        // PLAYER__FIELD_KNOWN_TITLES+1
+    UF_FLAG_PRIVATE,                                        // PLAYER__FIELD_KNOWN_TITLES1
+    UF_FLAG_PRIVATE,                                        // PLAYER__FIELD_KNOWN_TITLES1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER__FIELD_KNOWN_TITLES2
+    UF_FLAG_PRIVATE,                                        // PLAYER__FIELD_KNOWN_TITLES2+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KNOWN_CURRENCIES
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KNOWN_CURRENCIES+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_XP
+    UF_FLAG_PRIVATE,                                        // PLAYER_NEXT_LEVEL_XP
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+14
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+15
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+16
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+17
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+18
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+19
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+20
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+21
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+22
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+23
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+24
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+25
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+26
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+27
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+28
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+29
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+30
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+31
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+32
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+33
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+34
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+35
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+36
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+37
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+38
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+39
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+40
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+41
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+42
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+43
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+44
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+45
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+46
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+47
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+48
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+49
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+50
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+51
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+52
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+53
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+54
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+55
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+56
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+57
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+58
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+59
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+60
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+61
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+62
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+63
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+64
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+65
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+66
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+67
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+68
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+69
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+70
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+71
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+72
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+73
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+74
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+75
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+76
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+77
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+78
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+79
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+80
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+81
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+82
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+83
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+84
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+85
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+86
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+87
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+88
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+89
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+90
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+91
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+92
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+93
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+94
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+95
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+96
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+97
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+98
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+99
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+100
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+101
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+102
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+103
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+104
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+105
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+106
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+107
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+108
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+109
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+110
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+111
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+112
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+113
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+114
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+115
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+116
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+117
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+118
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+119
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+120
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+121
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+122
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+123
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+124
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+125
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+126
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+127
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+128
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+129
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+130
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+131
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+132
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+133
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+134
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+135
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+136
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+137
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+138
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+139
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+140
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+141
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+142
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+143
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+144
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+145
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+146
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+147
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+148
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+149
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+150
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+151
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+152
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+153
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+154
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+155
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+156
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+157
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+158
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+159
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+160
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+161
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+162
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+163
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+164
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+165
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+166
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+167
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+168
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+169
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+170
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+171
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+172
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+173
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+174
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+175
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+176
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+177
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+178
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+179
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+180
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+181
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+182
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+183
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+184
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+185
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+186
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+187
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+188
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+189
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+190
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+191
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+192
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+193
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+194
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+195
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+196
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+197
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+198
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+199
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+200
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+201
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+202
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+203
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+204
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+205
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+206
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+207
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+208
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+209
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+210
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+211
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+212
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+213
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+214
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+215
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+216
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+217
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+218
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+219
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+220
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+221
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+222
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+223
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+224
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+225
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+226
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+227
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+228
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+229
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+230
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+231
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+232
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+233
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+234
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+235
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+236
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+237
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+238
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+239
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+240
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+241
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+242
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+243
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+244
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+245
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+246
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+247
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+248
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+249
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+250
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+251
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+252
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+253
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+254
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+255
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+256
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+257
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+258
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+259
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+260
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+261
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+262
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+263
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+264
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+265
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+266
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+267
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+268
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+269
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+270
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+271
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+272
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+273
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+274
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+275
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+276
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+277
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+278
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+279
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+280
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+281
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+282
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+283
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+284
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+285
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+286
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+287
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+288
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+289
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+290
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+291
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+292
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+293
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+294
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+295
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+296
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+297
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+298
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+299
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+300
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+301
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+302
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+303
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+304
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+305
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+306
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+307
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+308
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+309
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+310
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+311
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+312
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+313
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+314
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+315
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+316
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+317
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+318
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+319
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+320
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+321
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+322
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+323
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+324
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+325
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+326
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+327
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+328
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+329
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+330
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+331
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+332
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+333
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+334
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+335
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+336
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+337
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+338
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+339
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+340
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+341
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+342
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+343
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+344
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+345
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+346
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+347
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+348
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+349
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+350
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+351
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+352
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+353
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+354
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+355
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+356
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+357
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+358
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+359
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+360
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+361
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+362
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+363
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+364
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+365
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+366
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+367
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+368
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+369
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+370
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+371
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+372
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+373
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+374
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+375
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+376
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+377
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+378
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+379
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+380
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+381
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+382
+    UF_FLAG_PRIVATE,                                        // PLAYER_SKILL_INFO_1_1+383
+    UF_FLAG_PRIVATE,                                        // PLAYER_CHARACTER_POINTS1
+    UF_FLAG_PRIVATE,                                        // PLAYER_CHARACTER_POINTS2
+    UF_FLAG_PRIVATE,                                        // PLAYER_TRACK_CREATURES
+    UF_FLAG_PRIVATE,                                        // PLAYER_TRACK_RESOURCES
+    UF_FLAG_PRIVATE,                                        // PLAYER_BLOCK_PERCENTAGE
+    UF_FLAG_PRIVATE,                                        // PLAYER_DODGE_PERCENTAGE
+    UF_FLAG_PRIVATE,                                        // PLAYER_PARRY_PERCENTAGE
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPERTISE
+    UF_FLAG_PRIVATE,                                        // PLAYER_OFFHAND_EXPERTISE
+    UF_FLAG_PRIVATE,                                        // PLAYER_CRIT_PERCENTAGE
+    UF_FLAG_PRIVATE,                                        // PLAYER_RANGED_CRIT_PERCENTAGE
+    UF_FLAG_PRIVATE,                                        // PLAYER_OFFHAND_CRIT_PERCENTAGE
+    UF_FLAG_PRIVATE,                                        // PLAYER_SPELL_CRIT_PERCENTAGE1
+    UF_FLAG_PRIVATE,                                        // PLAYER_SPELL_CRIT_PERCENTAGE1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_SPELL_CRIT_PERCENTAGE1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_SPELL_CRIT_PERCENTAGE1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_SPELL_CRIT_PERCENTAGE1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_SPELL_CRIT_PERCENTAGE1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_SPELL_CRIT_PERCENTAGE1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_SHIELD_BLOCK
+    UF_FLAG_PRIVATE,                                        // PLAYER_SHIELD_BLOCK_CRIT_PERCENTAGE
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+14
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+15
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+16
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+17
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+18
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+19
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+20
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+21
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+22
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+23
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+24
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+25
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+26
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+27
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+28
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+29
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+30
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+31
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+32
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+33
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+34
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+35
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+36
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+37
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+38
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+39
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+40
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+41
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+42
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+43
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+44
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+45
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+46
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+47
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+48
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+49
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+50
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+51
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+52
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+53
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+54
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+55
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+56
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+57
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+58
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+59
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+60
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+61
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+62
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+63
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+64
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+65
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+66
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+67
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+68
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+69
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+70
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+71
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+72
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+73
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+74
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+75
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+76
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+77
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+78
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+79
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+80
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+81
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+82
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+83
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+84
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+85
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+86
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+87
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+88
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+89
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+90
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+91
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+92
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+93
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+94
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+95
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+96
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+97
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+98
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+99
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+100
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+101
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+102
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+103
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+104
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+105
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+106
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+107
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+108
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+109
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+110
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+111
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+112
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+113
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+114
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+115
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+116
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+117
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+118
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+119
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+120
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+121
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+122
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+123
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+124
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+125
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+126
+    UF_FLAG_PRIVATE,                                        // PLAYER_EXPLORED_ZONES_1+127
+    UF_FLAG_PRIVATE,                                        // PLAYER_REST_STATE_EXPERIENCE
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COINAGE
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_POS
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_POS+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_POS+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_POS+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_POS+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_POS+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_POS+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_NEG
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_NEG+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_NEG+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_NEG+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_NEG+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_NEG+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_NEG+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_PCT
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_PCT+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_PCT+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_PCT+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_PCT+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_PCT+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_DAMAGE_DONE_PCT+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_HEALING_DONE_POS
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_HEALING_PCT
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_HEALING_DONE_PCT
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_TARGET_RESISTANCE
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BYTES
+    UF_FLAG_PRIVATE,                                        // PLAYER_AMMO_ID
+    UF_FLAG_PRIVATE,                                        // PLAYER_SELF_RES_SPELL
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_PVP_MEDALS
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_PRICE_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BUYBACK_TIMESTAMP_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_KILLS
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_TODAY_CONTRIBUTION
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_YESTERDAY_CONTRIBUTION
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_LIFETIME_HONORBALE_KILLS
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_BYTES2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_WATCHED_FACTION_INDEX
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+14
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+15
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+16
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+17
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+18
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+19
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+20
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+21
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+22
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+23
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_COMBAT_RATING_1+24
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+14
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+15
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+16
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+17
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+18
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+19
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_TEAM_INFO_1_1+20
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_HONOR_CURRENCY
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_ARENA_CURRENCY
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_MAX_LEVEL
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+6
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+7
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+8
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+9
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+10
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+11
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+12
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+13
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+14
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+15
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+16
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+17
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+18
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+19
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+20
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+21
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+22
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+23
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_DAILY_QUESTS_1+24
+    UF_FLAG_PRIVATE,                                        // PLAYER_RUNE_REGEN_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_RUNE_REGEN_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_RUNE_REGEN_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_RUNE_REGEN_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_NO_REAGENT_COST_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_NO_REAGENT_COST_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_NO_REAGENT_COST_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPH_SLOTS_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPH_SLOTS_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPH_SLOTS_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPH_SLOTS_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPH_SLOTS_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPH_SLOTS_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPHS_1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPHS_1+1
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPHS_1+2
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPHS_1+3
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPHS_1+4
+    UF_FLAG_PRIVATE,                                        // PLAYER_FIELD_GLYPHS_1+5
+    UF_FLAG_PRIVATE,                                        // PLAYER_GLYPHS_ENABLED
+    UF_FLAG_PRIVATE,                                        // PLAYER_PET_SPELL_POWER
+};
+
+uint32 GameObjectUpdateFieldFlags[GAMEOBJECT_END] =
+{
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_GUID
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_GUID+1
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_TYPE
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_ENTRY
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_SCALE_X
+    UF_FLAG_NONE,                                           // OBJECT_FIELD_PADDING
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_CREATED_BY
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_CREATED_BY+1
+    UF_FLAG_PUBLIC,                                         // GAMEOBJECT_DISPLAYID
+    UF_FLAG_PUBLIC,                                         // GAMEOBJECT_FLAGS
+    UF_FLAG_PUBLIC,                                         // GAMEOBJECT_PARENTROTATION
+    UF_FLAG_PUBLIC,                                         // GAMEOBJECT_PARENTROTATION+1
+    UF_FLAG_PUBLIC,                                         // GAMEOBJECT_PARENTROTATION+2
+    UF_FLAG_PUBLIC,                                         // GAMEOBJECT_PARENTROTATION+3
+    UF_FLAG_DYNAMIC,                                        // GAMEOBJECT_DYNAMIC
+    UF_FLAG_PUBLIC,                                         // GAMEOBJECT_FACTION
+    UF_FLAG_PUBLIC,                                         // GAMEOBJECT_LEVEL
+    UF_FLAG_PUBLIC,                                         // GAMEOBJECT_BYTES_1
+};
+
+uint32 DynamicObjectUpdateFieldFlags[DYNAMICOBJECT_END] =
+{
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_GUID
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_GUID+1
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_TYPE
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_ENTRY
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_SCALE_X
+    UF_FLAG_NONE,                                           // OBJECT_FIELD_PADDING
+    UF_FLAG_PUBLIC,                                         // DYNAMICOBJECT_CASTER
+    UF_FLAG_PUBLIC,                                         // DYNAMICOBJECT_CASTER+1
+    UF_FLAG_PUBLIC,                                         // DYNAMICOBJECT_BYTES
+    UF_FLAG_PUBLIC,                                         // DYNAMICOBJECT_SPELLID
+    UF_FLAG_PUBLIC,                                         // DYNAMICOBJECT_RADIUS
+    UF_FLAG_PUBLIC,                                         // DYNAMICOBJECT_CASTTIME
+};
+
+uint32 CorpseUpdateFieldFlags[CORPSE_END] =
+{
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_GUID
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_GUID+1
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_TYPE
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_ENTRY
+    UF_FLAG_PUBLIC,                                         // OBJECT_FIELD_SCALE_X
+    UF_FLAG_NONE,                                           // OBJECT_FIELD_PADDING
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_OWNER
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_OWNER+1
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_PARTY
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_PARTY+1
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_DISPLAY_ID
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+1
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+2
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+3
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+4
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+5
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+6
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+7
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+8
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+9
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+10
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+11
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+12
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+13
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+14
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+15
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+16
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+17
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_ITEM+18
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_BYTES_1
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_BYTES_2
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_GUILD
+    UF_FLAG_PUBLIC,                                         // CORPSE_FIELD_FLAGS
+    UF_FLAG_DYNAMIC,                                        // CORPSE_FIELD_DYNAMIC_FLAGS
+    UF_FLAG_NONE,                                           // CORPSE_FIELD_PAD
+};
diff --git a/src/game/UpdateFieldFlags.h b/src/game/UpdateFieldFlags.h
new file mode 100644
index 00000000000..762b4a7224f
--- /dev/null
+++ b/src/game/UpdateFieldFlags.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2011-2012 MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _UPDATEFIELDFLAGS_H
+#define _UPDATEFIELDFLAGS_H
+
+#include "UpdateFields.h"
+#include "Common.h"
+
+enum UpdatefieldFlags
+{
+    UF_FLAG_NONE         = 0x000,
+    UF_FLAG_PUBLIC       = 0x001,
+    UF_FLAG_PRIVATE      = 0x002,
+    UF_FLAG_OWNER        = 0x004,
+    UF_FLAG_UNUSED1      = 0x008,
+    UF_FLAG_ITEM_OWNER   = 0x010,
+    UF_FLAG_SPECIAL_INFO = 0x020,
+    UF_FLAG_PARTY_MEMBER = 0x040,
+    UF_FLAG_UNUSED2      = 0x080,
+    UF_FLAG_DYNAMIC      = 0x100,
+};
+
+extern uint32 ItemUpdateFieldFlags[CONTAINER_END];
+extern uint32 UnitUpdateFieldFlags[PLAYER_END];
+extern uint32 GameObjectUpdateFieldFlags[GAMEOBJECT_END];
+extern uint32 DynamicObjectUpdateFieldFlags[DYNAMICOBJECT_END];
+extern uint32 CorpseUpdateFieldFlags[CORPSE_END];
+
+#endif
diff --git a/src/game/UpdateFields.h b/src/game/UpdateFields.h
index 5bec8787cc3..704ff902933 100644
--- a/src/game/UpdateFields.h
+++ b/src/game/UpdateFields.h
@@ -144,16 +144,16 @@ enum EUnitFields
     UNIT_FIELD_STAT2                          = OBJECT_END + 0x0050, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
     UNIT_FIELD_STAT3                          = OBJECT_END + 0x0051, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
     UNIT_FIELD_STAT4                          = OBJECT_END + 0x0052, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
-    UNIT_FIELD_POSSTAT0                       = OBJECT_END + 0x0053, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
-    UNIT_FIELD_POSSTAT1                       = OBJECT_END + 0x0054, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
-    UNIT_FIELD_POSSTAT2                       = OBJECT_END + 0x0055, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
-    UNIT_FIELD_POSSTAT3                       = OBJECT_END + 0x0056, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
-    UNIT_FIELD_POSSTAT4                       = OBJECT_END + 0x0057, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
-    UNIT_FIELD_NEGSTAT0                       = OBJECT_END + 0x0058, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
-    UNIT_FIELD_NEGSTAT1                       = OBJECT_END + 0x0059, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
-    UNIT_FIELD_NEGSTAT2                       = OBJECT_END + 0x005A, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
-    UNIT_FIELD_NEGSTAT3                       = OBJECT_END + 0x005B, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
-    UNIT_FIELD_NEGSTAT4                       = OBJECT_END + 0x005C, // Size: 1, Type: INT, Flags: PRIVATE, OWNER
+    UNIT_FIELD_POSSTAT0                       = OBJECT_END + 0x0053, // Size: 1, Type: FLOAT, Flags: PRIVATE, OWNER
+    UNIT_FIELD_POSSTAT1                       = OBJECT_END + 0x0054, // Size: 1, Type: FLOAT, Flags: PRIVATE, OWNER
+    UNIT_FIELD_POSSTAT2                       = OBJECT_END + 0x0055, // Size: 1, Type: FLOAT, Flags: PRIVATE, OWNER
+    UNIT_FIELD_POSSTAT3                       = OBJECT_END + 0x0056, // Size: 1, Type: FLOAT, Flags: PRIVATE, OWNER
+    UNIT_FIELD_POSSTAT4                       = OBJECT_END + 0x0057, // Size: 1, Type: FLOAT, Flags: PRIVATE, OWNER
+    UNIT_FIELD_NEGSTAT0                       = OBJECT_END + 0x0058, // Size: 1, Type: FLOAT, Flags: PRIVATE, OWNER
+    UNIT_FIELD_NEGSTAT1                       = OBJECT_END + 0x0059, // Size: 1, Type: FLOAT, Flags: PRIVATE, OWNER
+    UNIT_FIELD_NEGSTAT2                       = OBJECT_END + 0x005A, // Size: 1, Type: FLOAT, Flags: PRIVATE, OWNER
+    UNIT_FIELD_NEGSTAT3                       = OBJECT_END + 0x005B, // Size: 1, Type: FLOAT, Flags: PRIVATE, OWNER
+    UNIT_FIELD_NEGSTAT4                       = OBJECT_END + 0x005C, // Size: 1, Type: FLOAT, Flags: PRIVATE, OWNER
     UNIT_FIELD_RESISTANCES                    = OBJECT_END + 0x005D, // Size: 7, Type: INT, Flags: PRIVATE, OWNER, PARTY_LEADER
     UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE     = OBJECT_END + 0x0064, // Size: 7, Type: INT, Flags: PRIVATE, OWNER
     UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE     = OBJECT_END + 0x006B, // Size: 7, Type: INT, Flags: PRIVATE, OWNER
@@ -391,6 +391,45 @@ enum EUnitFields
     PLAYER_GLYPHS_ENABLED                     = UNIT_END + 0x0498, // Size: 1, Type: INT, Flags: PRIVATE
     PLAYER_PET_SPELL_POWER                    = UNIT_END + 0x0499, // Size: 1, Type: INT, Flags: PRIVATE
     PLAYER_END                                = UNIT_END + 0x049A,
+
+    // ----------------------------------------------------------------------------------------------
+
+    MANGOSR2_AP_MELEE_1                        = 0x007B, // TYPE: INT
+    MANGOSR2_AP_MELEE_2                        = 0x007C, // TYPE: INT
+    MANGOSR2_AP_RANGED_1                       = 0x007E, // TYPE: INT
+    MANGOSR2_AP_RANGED_2                       = 0x007F, // TYPE: INT
+
+    MANGOSR2_BLOCKRATING                       = 0x04D3, // TYPE: INT
+    MANGOSR2_DEFRATING                         = 0x04D0, // TYPE: INT
+    MANGOSR2_DODGERATING                       = 0x04D1, // TYPE: INT
+    MANGOSR2_PARRYRATING                       = 0x04D2, // TYPE: INT
+    MANGOSR2_RESILIENCE                        = 0x04DE, // TYPE: INT
+
+    MANGOSR2_MANAREGEN                         = 0x0028, // TYPE: FLOAT
+
+    MANGOSR2_MELEE_HITRATING                   = 0x04D4, // TYPE: INT
+    MANGOSR2_MELEE_CRITRATING                  = 0x04D7, // TYPE: INT
+    MANGOSR2_MELEE_HASTERATING                 = 0x04E0, // TYPE: INT
+    MANGOSR2_MELEE_MAINMINDMG                  = 0x0046, // TYPE: FLOAT
+    MANGOSR2_MELEE_MAINMAXDMG                  = 0x0047, // TYPE: FLOAT
+    MANGOSR2_MELEE_OFFMINDMG                   = 0x0046, // TYPE: FLOAT
+    MANGOSR2_MELEE_OFFMAXDMG                   = 0x0047, // TYPE: FLOAT
+    MANGOSR2_MELLE_OFFTIME                     = 0x003E, // TYPE: FLOAT
+    MANGOSR2_MELLE_MAINTIME                    = 0x003E, // TYPE: FLOAT
+
+    MANGOSR2_RANGED_CRITRATING                 = 0x04D8, // TYPE: INT
+    MANGOSR2_RANGED_HASTERATING                = 0x04E1, // TYPE: INT
+    MANGOSR2_RANGED_HITRATING                  = 0x04D5, // TYPE: INT
+    MANGOSR2_RANGED_MINDMG                     = 0x0081, // TYPE: FLOAT
+    MANGOSR2_RANGED_MAXDMG                     = 0x0082, // TYPE: FLOAT
+    MANGOSR2_RANGED_ATTACKTIME                 = 0x003F, // TYPE: FLOAT
+
+    MANGOSR2_SPELL_HITRATING                   = 0x04D6, // TYPE: INT
+    MANGOSR2_SPELL_CRITRATING                  = 0x04D9, // TYPE: INT
+    MANGOSR2_SPELL_HASTERATING                 = 0x04E2, // TYPE: INT
+    MANGOSR2_SPELL_BONUSDMG                    = 0x0496, // TYPE: INT
+    MANGOSR2_SPELL_BONUSHEAL                   = 0x04A8, // TYPE: INT
+    MANGOSR2_SPELL_CRITPROC                    = 0x040B, // TYPE: FLOAT
 };
 
 enum EGameObjectFields
diff --git a/src/game/UpdateMask.h b/src/game/UpdateMask.h
index 6766c0b5032..06324683f27 100644
--- a/src/game/UpdateMask.h
+++ b/src/game/UpdateMask.h
@@ -25,78 +25,78 @@
 class UpdateMask
 {
     public:
-        UpdateMask( ) : mCount( 0 ), mBlocks( 0 ), mUpdateMask( 0 ) { }
-        UpdateMask( const UpdateMask& mask ) : mUpdateMask( 0 ) { *this = mask; }
+        UpdateMask() : m_Count(0), m_Blocks(0), m_UpdateMask(0) {}
+        UpdateMask(UpdateMask const& mask) : m_UpdateMask(0) { *this = mask; }
 
-        ~UpdateMask( )
+        ~UpdateMask()
         {
-            if(mUpdateMask)
-                delete [] mUpdateMask;
+            if (m_UpdateMask)
+                delete[] m_UpdateMask;
         }
 
-        void SetBit (uint32 index)
+        void SetBit(uint32 index)
         {
-            ( (uint8 *)mUpdateMask )[ index >> 3 ] |= 1 << ( index & 0x7 );
+            ((uint8*)m_UpdateMask)[index >> 3] |= 1 << (index & 0x7);
         }
 
-        void UnsetBit (uint32 index)
+        void UnsetBit(uint32 index)
         {
-            ( (uint8 *)mUpdateMask )[ index >> 3 ] &= (0xff ^ (1 <<  ( index & 0x7 ) ) );
+            ((uint8*)m_UpdateMask)[index >> 3] &= (0xff ^ (1 << (index & 0x7)));
         }
 
-        bool GetBit (uint32 index) const
+        bool GetBit(uint32 index) const
         {
-            return ( ( (uint8 *)mUpdateMask)[ index >> 3 ] & ( 1 << ( index & 0x7 ) )) != 0;
+            return (((uint8*)m_UpdateMask)[index >> 3] & (1 << (index & 0x7))) != 0;
         }
 
-        uint32 GetBlockCount() const { return mBlocks; }
-        uint32 GetLength() const { return mBlocks << 2; }
-        uint32 GetCount() const { return mCount; }
-        uint8* GetMask() { return (uint8*)mUpdateMask; }
+        uint32 GetBlockCount() const { return m_Blocks; }
+        uint32 GetLength() const { return m_Blocks << 2; }
+        uint32 GetCount() const { return m_Count; }
+        uint8* GetMask() { return (uint8*)m_UpdateMask; }
 
-        void SetCount (uint32 valuesCount)
+        void SetCount(uint32 valuesCount)
         {
-            if(mUpdateMask)
-                delete [] mUpdateMask;
+            if (m_UpdateMask)
+                delete[] m_UpdateMask;
 
-            mCount = valuesCount;
-            mBlocks = (valuesCount + 31) / 32;
+            m_Count = valuesCount;
+            m_Blocks = (valuesCount + 31) / 32;
 
-            mUpdateMask = new uint32[mBlocks];
-            memset(mUpdateMask, 0, mBlocks << 2);
+            m_UpdateMask = new uint32[m_Blocks];
+            memset(m_UpdateMask, 0, m_Blocks << 2);
         }
 
         void Clear()
         {
-            if (mUpdateMask)
-                memset(mUpdateMask, 0, mBlocks << 2);
+            if (m_UpdateMask)
+                memset(m_UpdateMask, 0, m_Blocks << 2);
         }
 
-        UpdateMask& operator = ( const UpdateMask& mask )
+        UpdateMask& operator = (UpdateMask const& mask)
         {
-            SetCount(mask.mCount);
-            memcpy(mUpdateMask, mask.mUpdateMask, mBlocks << 2);
+            SetCount(mask.m_Count);
+            memcpy(m_UpdateMask, mask.m_UpdateMask, m_Blocks << 2);
 
             return *this;
         }
 
-        void operator &= ( const UpdateMask& mask )
+        void operator &= (UpdateMask const& mask)
         {
-            MANGOS_ASSERT(mask.mCount <= mCount);
-            for (uint32 i = 0; i < mBlocks; ++i)
-                mUpdateMask[i] &= mask.mUpdateMask[i];
+            MANGOS_ASSERT(mask.m_Count <= m_Count);
+            for (uint32 i = 0; i < m_Blocks; ++i)
+                m_UpdateMask[i] &= mask.m_UpdateMask[i];
         }
 
-        void operator |= ( const UpdateMask& mask )
+        void operator |= (UpdateMask const& mask)
         {
-            MANGOS_ASSERT(mask.mCount <= mCount);
-            for (uint32 i = 0; i < mBlocks; ++i)
-                mUpdateMask[i] |= mask.mUpdateMask[i];
+            MANGOS_ASSERT(mask.m_Count <= m_Count);
+            for (uint32 i = 0; i < m_Blocks; ++i)
+                m_UpdateMask[i] |= mask.m_UpdateMask[i];
         }
 
-        UpdateMask operator & ( const UpdateMask& mask ) const
+        UpdateMask operator & (UpdateMask const& mask) const
         {
-            MANGOS_ASSERT(mask.mCount <= mCount);
+            MANGOS_ASSERT(mask.m_Count <= m_Count);
 
             UpdateMask newmask;
             newmask = *this;
@@ -105,9 +105,9 @@ class UpdateMask
             return newmask;
         }
 
-        UpdateMask operator | ( const UpdateMask& mask ) const
+        UpdateMask operator | (UpdateMask const& mask) const
         {
-            MANGOS_ASSERT(mask.mCount <= mCount);
+            MANGOS_ASSERT(mask.m_Count <= m_Count);
 
             UpdateMask newmask;
             newmask = *this;
@@ -117,8 +117,9 @@ class UpdateMask
         }
 
     private:
-        uint32 mCount;
-        uint32 mBlocks;
-        uint32 *mUpdateMask;
+        uint32 m_Count;
+        uint32 m_Blocks;
+        uint32 *m_UpdateMask;
 };
+
 #endif
diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp
index 9d4b70efea2..866c212221a 100644
--- a/src/game/Vehicle.cpp
+++ b/src/game/Vehicle.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,9 +22,748 @@
 #include "ObjectMgr.h"
 #include "Vehicle.h"
 #include "Unit.h"
+#include "CreatureAI.h"
+#include "Transports.h"
 #include "Util.h"
+#include "WorldPacket.h"
+#include "movement/MoveSpline.h"
+#include "SQLStorages.h"
 
-VehicleInfo::VehicleInfo(VehicleEntry const* entry) :
-    m_vehicleEntry(entry)
+VehicleKit::VehicleKit(Unit* base, VehicleEntry const* entry) :
+    TransportBase(base), m_vehicleEntry(entry), m_uiNumFreeSeats(0), m_isInitialized(false),
+    m_dstSet(false)
 {
+    for (uint32 i = 0; i < MAX_VEHICLE_SEAT; ++i)
+    {
+        uint32 seatId = GetEntry()->m_seatID[i];
+        if (!seatId)
+            continue;
+
+        if (VehicleSeatEntry const* seatInfo = sVehicleSeatStore.LookupEntry(seatId))
+        {
+            m_Seats.insert(std::make_pair(i, VehicleSeat(seatInfo)));
+
+            if (seatInfo->IsUsable())
+                ++m_uiNumFreeSeats;
+        }
+    }
+
+    if (base)
+    {
+        if (GetEntry()->m_flags & VEHICLE_FLAG_NO_STRAFE)
+            GetBase()->m_movementInfo.AddMovementFlag2(MOVEFLAG2_NO_STRAFE);
+
+        if (GetEntry()->m_flags & VEHICLE_FLAG_NO_JUMPING)
+            GetBase()->m_movementInfo.AddMovementFlag2(MOVEFLAG2_NO_JUMPING);
+
+        if (GetEntry()->m_flags & VEHICLE_FLAG_FULLSPEEDTURNING)
+            GetBase()->m_movementInfo.AddMovementFlag2(MOVEFLAG2_FULLSPEEDTURNING);
+
+        if (GetEntry()->m_flags & VEHICLE_FLAG_ALLOW_PITCHING)
+            GetBase()->m_movementInfo.AddMovementFlag2(MOVEFLAG2_ALLOW_PITCHING);
+
+        if (GetEntry()->m_flags & VEHICLE_FLAG_FULLSPEEDPITCHING)
+        {
+            GetBase()->m_movementInfo.AddMovementFlag2(MOVEFLAG2_ALLOW_PITCHING);
+            GetBase()->m_movementInfo.AddMovementFlag2(MOVEFLAG2_FULLSPEEDPITCHING);
+        }
+
+    }
+    SetDestination();
+}
+
+VehicleKit::~VehicleKit()
+{
+    if (GetBase() && GetBase()->IsInitialized())
+    {
+        Reset();
+        GetBase()->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+    }
+}
+
+void VehicleKit::Initialize(uint32 creatureEntry)
+{
+    InstallAllAccessories(creatureEntry ? creatureEntry : GetBase()->GetEntry());
+    UpdateFreeSeatCount();
+
+    Unit* pVehicle = (Unit*)m_owner;
+
+    // Initialize power type based on DBC values (creatures only)
+    if (pVehicle->GetTypeId() == TYPEID_UNIT)
+    {
+        // Do not use the wrappers for setting power type in order to avoid side-effects
+        if (PowerDisplayEntry const* powerEntry = sPowerDisplayStore.LookupEntry(GetEntry()->m_powerDisplayID))
+            pVehicle->SetByteValue(UNIT_FIELD_BYTES_0, 3, powerEntry->power);
+    }
+
+    m_isInitialized = true;
+}
+
+void VehicleKit::RemoveAllPassengers()
+{
+    for (SeatMap::iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr)
+    {
+        if (Unit* passenger = GetBase()->GetMap()->GetUnit(itr->second.passenger))
+        {
+            passenger->ExitVehicle();
+
+            // remove creatures of player mounts
+            if (passenger->GetTypeId() == TYPEID_UNIT)
+                passenger->AddObjectToRemoveList();
+        }
+    }
+}
+
+/*
+ * Checks a specific seat for empty
+ * If seatId < 0, every seat check
+ */
+bool VehicleKit::HasEmptySeat(SeatId seatId) const
+{
+    if (seatId < 0)
+        return (GetNextEmptySeatWithFlag(0) != -1);
+
+    SeatMap::const_iterator seat = m_Seats.find(seatId);
+    // need add check on accessories-only seats...
+
+    if (seat == m_Seats.end())
+        return false;
+
+    return !seat->second.passenger;
+}
+
+/*
+ * return next free seat with a specific vehicleSeatFlag
+ * -1 will returned if no free seat found
+ */
+SeatId VehicleKit::GetNextEmptySeatWithFlag(SeatId seatId, bool next /*= true*/, uint32 vehicleSeatFlag /*= 0 */) const
+{
+
+    if (m_Seats.empty() || seatId >= MAX_VEHICLE_SEAT)
+        return -1;
+
+    if (next)
+    {
+        for (SeatMap::const_iterator seat = m_Seats.begin(); seat != m_Seats.end(); ++seat)
+            if ((seatId < 0 || seat->first >= seatId) && !seat->second.passenger && (!vehicleSeatFlag || (seat->second.seatInfo->m_flags & vehicleSeatFlag)))
+                return seat->first;
+    }
+    else
+    {
+        for (SeatMap::const_reverse_iterator seat = m_Seats.rbegin(); seat != m_Seats.rend(); ++seat)
+            if ((seatId < 0 || seat->first <= seatId) && !seat->second.passenger && (!vehicleSeatFlag || (seat->second.seatInfo->m_flags & vehicleSeatFlag)))
+                return seat->first;
+    }
+
+    return -1;
+}
+
+Unit* VehicleKit::GetPassenger(SeatId seatId) const
+{
+    SeatMap::const_iterator seat = m_Seats.find(seatId);
+
+    if (seat == m_Seats.end())
+        return NULL;
+
+    return GetBase()->GetMap()->GetUnit(seat->second.passenger);
+}
+
+// Helper function to undo the turning of the vehicle to calculate a relative position of the passenger when boarding
+Position VehicleKit::CalculateBoardingPositionOf(Position const& pos) const
+{
+    Position posl = pos;
+    NormalizeRotatedPosition(pos.x - GetBase()->GetPositionX(), pos.y - GetBase()->GetPositionY(), posl.x, posl.y);
+    posl.z = pos.z - GetBase()->GetPositionZ();
+    posl.o = MapManager::NormalizeOrientation(pos.o - GetBase()->GetOrientation());
+    return posl;
+}
+
+Position VehicleKit::CalculateSeatPositionOf(VehicleSeatEntry const* seatInfo) const
+{
+    MANGOS_ASSERT(seatInfo);
+
+    Position pos = Position();
+
+// FIXME - requires correct method for calculate seat offset
+/*
+    pos.x = seatInfo->m_attachmentOffsetX + m_dst_x;
+    pos.y = seatInfo->m_attachmentOffsetY + m_dst_y;
+    pos.z = seatInfo->m_attachmentOffsetZ + m_dst_z;
+    pos.o = seatInfo->m_passengerYaw      + m_dst_o;
+*/
+    return pos;
+}
+
+bool VehicleKit::AddPassenger(Unit* passenger, SeatId seatId)
+{
+    SeatMap::iterator seat;
+
+    if (seatId < 0) // no specific seat requirement
+    {
+        for (seat = m_Seats.begin(); seat != m_Seats.end(); ++seat)
+        {
+            if (!seat->second.passenger && (seat->second.seatInfo->IsUsable() || (seat->second.seatInfo->m_flags & SEAT_FLAG_UNCONTROLLED)))
+                break;
+        }
+
+        if (seat == m_Seats.end()) // no available seat
+            return false;
+    }
+    else
+    {
+        seat = m_Seats.find(seatId);
+
+        if (seat == m_Seats.end())
+            return false;
+
+        if (seat->second.passenger)
+            return false;
+    }
+
+    VehicleSeatEntry const* seatInfo = seat->second.seatInfo;
+    seat->second.passenger = passenger->GetObjectGuid();
+    seat->second.b_dismount = true;
+
+    if (!(seatInfo->m_flags & SEAT_FLAG_FREE_ACTION))
+        passenger->addUnitState(UNIT_STAT_ON_VEHICLE);
+
+    GetBase()->SetPhaseMask(passenger->GetPhaseMask(), true);
+
+    // Calculate passengers local position
+    Position localPos = CalculateBoardingPositionOf(passenger->GetPosition());
+
+    BoardPassenger(passenger, localPos, seat->first);        // Use TransportBase to store the passenger
+
+    if (passenger->GetTypeId() == TYPEID_PLAYER)
+    {
+        ((Player*)passenger)->SetViewPoint(GetBase());
+        passenger->SetRoot(true);
+    }
+
+    if (seat->second.IsProtectPassenger())
+    {
+        // make passenger attackable in some vehicles and allow him to cast when sitting on vehicle
+        switch (GetBase()->GetEntry())
+        {
+            case 30234:        // Nexus Lord's Hover Disk (Eye of Eternity, Malygos Encounter)
+            case 30248:        // Scion's of Eternity Hover Disk (Eye of Eternity, Malygos Encounter)
+            case 33118:        // Ignis (Ulduar)
+            case 33432:        // Leviathan MX
+            case 33651:        // VX 001
+                break;
+//            case 28817:        // Mine Car (quest Massacre At Light's Point)
+//            case 28864:        // Scourge Gryphon (quest Massacre At Light's Point)
+            default:
+                passenger->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                break;
+        }
+        passenger->RemoveSpellsCausingAura(SPELL_AURA_MOD_SHAPESHIFT);
+    }
+
+    if (seatInfo->m_flags & SEAT_FLAG_CAN_CONTROL)
+    {
+        if (!(GetEntry()->m_flags & VEHICLE_FLAG_ACCESSORY))
+        {
+            GetBase()->StopMoving();
+            GetBase()->GetMotionMaster()->Clear();
+            GetBase()->CombatStop(true);
+        }
+
+        GetBase()->DeleteThreatList();
+        GetBase()->getHostileRefManager().deleteReferences();
+        GetBase()->SetCharmerGuid(passenger->GetObjectGuid());
+        GetBase()->addUnitState(UNIT_STAT_CONTROLLED);
+
+        passenger->SetCharm(GetBase());
+
+        if (GetBase()->HasAuraType(SPELL_AURA_FLY) || GetBase()->HasAuraType(SPELL_AURA_MOD_FLIGHT_SPEED) ||
+            (GetBase()->GetTypeId() == TYPEID_UNIT && ((Creature*)GetBase())->CanFly()))
+        {
+            WorldPacket data(SMSG_MOVE_SET_CAN_FLY, GetBase()->GetPackGUID().size() + 4);
+            data << GetBase()->GetPackGUID();
+            data << uint32(0);
+            GetBase()->SendMessageToSet(&data, false);
+        }
+
+        if (passenger->GetTypeId() == TYPEID_PLAYER)
+        {
+            GetBase()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED);
+
+            if (CharmInfo* charmInfo = GetBase()->InitCharmInfo(GetBase()))
+            {
+                charmInfo->SetState(CHARM_STATE_ACTION, ACTIONS_DISABLE);
+                charmInfo->InitVehicleCreateSpells(seat->first);
+            }
+
+            Player* player = (Player*)passenger;
+            player->SetMover(GetBase());
+            player->SetClientControl(GetBase(), 1);
+            player->VehicleSpellInitialize();
+        }
+
+        // Allow to keep AI of controlled vehicle with CREATURE_FLAG_EXTRA_KEEP_AI extra-flag
+        if (!(((Creature*)GetBase())->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_KEEP_AI))
+            ((Creature*)GetBase())->AIM_Initialize();
+
+        if (GetBase()->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE))
+            GetBase()->SetRoot(true);
+
+        // Set owner's speedrate to vehicle at board.
+        else if (passenger->IsWalking() && !GetBase()->IsWalking())
+            ((Creature*)GetBase())->SetWalk(true, true);
+        else if (!passenger->IsWalking() && GetBase()->IsWalking())
+            ((Creature*)GetBase())->SetWalk(false, true);
+    }
+    else if ((seatInfo->m_flags & SEAT_FLAG_FREE_ACTION) || (seatInfo->m_flags & SEAT_FLAG_CAN_ATTACK))
+    {
+        if (passenger->GetTypeId() == TYPEID_PLAYER)
+            ((Player*)passenger)->SetClientControl(GetBase(), 0);
+    }
+
+    // Calculate passenger seat position (FIXME - requires correct calculation!)
+    Position seatpos = CalculateSeatPositionOf(seatInfo);
+    passenger->GetMotionMaster()->MoveBoardVehicle(seatpos.x, seatpos.y, seatpos.z, seatpos.o,
+        seatInfo->m_enterSpeed < M_NULL_F ? BASE_CHARGE_SPEED : seatInfo->m_enterSpeed,
+        0.0f);
+
+    UpdateFreeSeatCount();
+
+    if (GetBase()->GetTypeId() == TYPEID_UNIT)
+    {
+        if (((Creature*)GetBase())->AI())
+            ((Creature*)GetBase())->AI()->PassengerBoarded(passenger, seat->first, true);
+    }
+
+    if (passenger->GetTypeId() == TYPEID_UNIT)
+    {
+        if (((Creature*)passenger)->AI())
+        {
+            ((Creature*)passenger)->AI()->SetCombatMovement(false);
+            ((Creature*)passenger)->AI()->EnteredVehicle(GetBase(), seat->first, true);
+        }
+
+        // Not entirely sure how this must be handled in relation to CONTROL
+        // But in any way this at least would require some changes in the movement system most likely
+        passenger->GetMotionMaster()->Clear(false, true);
+    }
+
+    if (m_dstSet && (seatInfo->m_flagsB & VEHICLE_SEAT_FLAG_B_EJECTABLE_FORCED))
+    {
+        uint32 delay = seatInfo->m_exitMaxDuration * IN_MILLISECONDS;
+        GetBase()->AddEvent(new PassengerEjectEvent(seatId, *GetBase()), delay);
+        DEBUG_LOG("Vehicle::AddPassenger eject event for %s added, delay %u", passenger->GetGuidStr().c_str(), delay);
+    }
+
+    DEBUG_LOG("VehicleKit::AddPassenger passenger %s boarded on %s, transport offset %f %f %f %f (parent - %s)",
+            passenger->GetGuidStr().c_str(),
+            passenger->m_movementInfo.GetTransportGuid().GetString().c_str(),
+            passenger->m_movementInfo.GetTransportPos()->x,
+            passenger->m_movementInfo.GetTransportPos()->y,
+            passenger->m_movementInfo.GetTransportPos()->z,
+            passenger->m_movementInfo.GetTransportPos()->o,
+            GetBase()->m_movementInfo.GetTransportGuid().IsEmpty() ? "<none>" : GetBase()->m_movementInfo.GetTransportGuid().GetString().c_str());
+
+    return true;
+}
+
+void VehicleKit::RemovePassenger(Unit* passenger, bool dismount /*false*/)
+{
+    SeatMap::iterator seat;
+    for (seat = m_Seats.begin(); seat != m_Seats.end(); ++seat)
+    {
+        if (seat->second.passenger == passenger->GetObjectGuid())
+            break;
+    }
+
+    if (seat == m_Seats.end())
+        return;
+
+    seat->second.passenger.Clear();
+
+    passenger->clearUnitState(UNIT_STAT_ON_VEHICLE);
+
+    UnBoardPassenger(passenger);                            // Use TransportBase to remove the passenger from storage list
+
+    if (seat->second.IsProtectPassenger())
+    {
+        if (passenger->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+            passenger->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+    }
+
+    if (seat->second.seatInfo->m_flags & SEAT_FLAG_CAN_CONTROL)
+    {
+        passenger->SetCharm(NULL);
+        passenger->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+
+        GetBase()->SetCharmerGuid(ObjectGuid());
+        GetBase()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED);
+        GetBase()->clearUnitState(UNIT_STAT_CONTROLLED);
+
+        if (passenger->GetTypeId() == TYPEID_PLAYER)
+        {
+            Player* player = (Player*)passenger;
+            player->SetClientControl(GetBase(), 0);
+            player->RemovePetActionBar();
+        }
+
+        // Allow to keep AI of controlled vehicle with CREATURE_FLAG_EXTRA_KEEP_AI extra-flag
+        if (!(((Creature*)GetBase())->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_KEEP_AI))
+            ((Creature*)GetBase())->AIM_Initialize();
+    }
+
+    if (passenger->GetTypeId() == TYPEID_PLAYER)
+    {
+        Player* player = (Player*)passenger;
+        player->SetViewPoint(NULL);
+
+        passenger->SetRoot(false);
+
+        player->SetMover(player);
+        player->m_movementInfo.RemoveMovementFlag(MOVEFLAG_ROOT);
+
+        if ((GetBase()->HasAuraType(SPELL_AURA_FLY) || GetBase()->HasAuraType(SPELL_AURA_MOD_FLIGHT_SPEED) ||
+            (GetBase()->GetTypeId() == TYPEID_UNIT && ((Creature*)GetBase())->CanFly())) &&
+            (!player->HasAuraType(SPELL_AURA_FLY) && !player->HasAuraType(SPELL_AURA_MOD_FLIGHT_SPEED)))
+        {
+            WorldPacket dataCF(SMSG_MOVE_UNSET_CAN_FLY, player->GetPackGUID().size() + 4);
+            dataCF << player->GetPackGUID();
+            dataCF << uint32(0);
+            GetBase()->SendMessageToSet(&dataCF, false);
+
+            player->m_movementInfo.RemoveMovementFlag(MOVEFLAG_FLYING);
+            player->m_movementInfo.RemoveMovementFlag(MOVEFLAG_CAN_FLY);
+        }
+
+        if (GetBase()->IsLevitating())
+            player->m_movementInfo.RemoveMovementFlag(MOVEFLAG_LEVITATING);
+    }
+
+    UpdateFreeSeatCount();
+
+    if (GetBase()->GetTypeId() == TYPEID_UNIT)
+    {
+        if (((Creature*)GetBase())->AI())
+            ((Creature*)GetBase())->AI()->PassengerBoarded(passenger, seat->first, false);
+    }
+
+    if (passenger->GetTypeId() == TYPEID_UNIT)
+    {
+        if (((Creature*)passenger)->AI())
+        {
+            ((Creature*)passenger)->AI()->EnteredVehicle(GetBase(), seat->first, false);
+            ((Creature*)passenger)->AI()->SetCombatMovement(true, true);
+        }
+    }
+
+    if (dismount && seat->second.b_dismount)
+    {
+        Dismount(passenger, seat->second.seatInfo);
+        // only for flyable vehicles
+        if (GetBase()->m_movementInfo.HasMovementFlag(MOVEFLAG_FLYING))
+            GetBase()->CastSpell(passenger, 45472, true);    // Parachute
+    }
+}
+
+void VehicleKit::Reset()
+{
+    RemoveAllPassengers();
+    UpdateFreeSeatCount();
+    m_isInitialized = false;
+}
+
+void VehicleKit::InstallAllAccessories(uint32 entry)
+{
+    SQLMultiStorage::SQLMSIteratorBounds<VehicleAccessory> const& bounds = sVehicleAccessoryStorage.getBounds<VehicleAccessory>(entry);
+    for (SQLMultiStorage::SQLMultiSIterator<VehicleAccessory> itr = bounds.first; itr != bounds.second; ++itr)
+        InstallAccessory(*itr);
+}
+
+void VehicleKit::InstallAccessory(VehicleAccessory const* accessory)
+{
+    if (Unit* passenger = GetPassenger(accessory->seatId))
+    {
+        // already installed
+        if (passenger->GetEntry() == accessory->passengerEntry)
+            return;
+
+        GetBase()->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, passenger->GetObjectGuid());
+    }
+
+    if (Creature* summoned = GetBase()->SummonCreature(accessory->passengerEntry,
+        GetBase()->GetPositionX() + accessory->m_offsetX, GetBase()->GetPositionY() + accessory->m_offsetY, GetBase()->GetPositionZ() + accessory->m_offsetZ, GetBase()->GetOrientation() + accessory->m_offsetO,
+        TEMPSUMMON_DEAD_DESPAWN, 0))
+    {
+        summoned->SetCreatorGuid(ObjectGuid());
+        summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
+
+        bool hideAccessory = false;
+
+        SeatMap::const_iterator seat = m_Seats.find(accessory->seatId);
+        if (seat != m_Seats.end())
+        {
+            if (seat->second.seatInfo->m_flags & SEAT_FLAG_HIDE_PASSENGER)  // coommon case
+                hideAccessory = true;
+        }
+
+        if (!hideAccessory && (accessory->m_flags & ACCESSORY_FLAG_HIDE))
+            hideAccessory = true;
+
+        if (hideAccessory)
+            summoned->SetDisplayId(DEFAULT_HIDDEN_MODEL_ID); // set to empty model
+
+        SetDestination(accessory->m_offsetX, accessory->m_offsetY, accessory->m_offsetZ, accessory->m_offsetO, 0.0f, 0.0f);
+        int32 seatId = accessory->seatId + 1;
+        summoned->SetPhaseMask(GetBase()->GetPhaseMask(), true);
+        summoned->CastCustomSpell(GetBase(), SPELL_RIDE_VEHICLE_HARDCODED, &seatId, &seatId, NULL, true);
+
+        SetDestination();
+
+        if (summoned->GetVehicle())
+            DEBUG_LOG("Vehicle::InstallAccessory %s accessory added, seat %i (real %i) of %s", summoned->GetGuidStr().c_str(), accessory->seatId, GetSeatId(summoned), GetBase()->GetGuidStr().c_str());
+        else
+        {
+            sLog.outError("Vehicle::InstallAccessory cannot install %s to seat %u of %s", summoned->GetGuidStr().c_str(), accessory->seatId, GetBase()->GetGuidStr().c_str());
+            summoned->ForcedDespawn();
+        }
+    }
+    else
+        sLog.outError("Vehicle::InstallAccessory cannot summon creature id %u (seat %u of %s)", accessory->passengerEntry, accessory->seatId, GetBase()->GetGuidStr().c_str());
+}
+
+void VehicleKit::InstallAccessory(SeatId seatID)
+{
+    SQLMultiStorage::SQLMSIteratorBounds<VehicleAccessory> const& bounds = sVehicleAccessoryStorage.getBounds<VehicleAccessory>(GetBase()->GetEntry());
+    for (SQLMultiStorage::SQLMultiSIterator<VehicleAccessory> itr = bounds.first; itr != bounds.second; ++itr)
+    {
+        if ((*itr)->seatId == seatID)
+        {
+            InstallAccessory(*itr);
+            return;
+        }
+    }
+    sLog.outError("Vehicle::InstallAccessory can not find accessory for seat %i of %s", seatID, GetBase()->GetGuidStr().c_str());
+}
+
+void VehicleKit::UpdateFreeSeatCount()
+{
+    m_uiNumFreeSeats = 0;
+
+    for (SeatMap::const_iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr)
+    {
+        if (!itr->second.passenger && itr->second.seatInfo->IsUsable())
+            ++m_uiNumFreeSeats;
+    }
+
+    uint32 flag = GetBase()->GetTypeId() == TYPEID_PLAYER ? UNIT_NPC_FLAG_PLAYER_VEHICLE : UNIT_NPC_FLAG_SPELLCLICK;
+
+    if (m_uiNumFreeSeats)
+        GetBase()->SetFlag(UNIT_NPC_FLAGS, flag);
+    else
+        GetBase()->RemoveFlag(UNIT_NPC_FLAGS, flag);
+}
+
+VehicleSeatEntry const* VehicleKit::GetSeatInfo(Unit* passenger)
+{
+    if (m_Seats.empty() || !passenger || passenger->GetMap() != GetBase()->GetMap())
+        return NULL;
+
+    return GetSeatInfo(passenger->GetObjectGuid());
+}
+
+VehicleSeatEntry const* VehicleKit::GetSeatInfo(ObjectGuid const& guid)
+{
+    for (SeatMap::const_iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr)
+    {
+        if (guid == itr->second.passenger)
+            return itr->second.seatInfo;
+    }
+    return NULL;
+}
+
+SeatId VehicleKit::GetSeatId(Unit* passenger)
+{
+    if (m_Seats.empty() || !passenger || passenger->GetMap() != GetBase()->GetMap())
+        return -1;
+    return GetSeatId(passenger->GetObjectGuid());
+}
+
+SeatId VehicleKit::GetSeatId(ObjectGuid const& guid)
+{
+    for (SeatMap::const_iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr)
+    {
+        if (guid == itr->second.passenger)
+            return itr->first;
+    }
+    return -1;
+}
+
+void VehicleKit::Dismount(Unit* passenger, VehicleSeatEntry const* seatInfo)
+{
+    if (!passenger || !passenger->IsInWorld() || !GetBase()->IsInWorld())
+        return;
+
+    Unit* base = (GetBase()->GetVehicle() && GetBase()->GetVehicle()->GetBase()) ? GetBase()->GetVehicle()->GetBase() : GetBase();
+
+    WorldLocation const& pos = base->GetPosition();
+    // oo = base->GetOrientation();
+    float tRadius = base->GetObjectBoundingRadius();
+    if (tRadius < 1.0f || tRadius > 10.0f)
+        tRadius = 1.0f;
+
+    // Force update passenger position to base position
+    if (passenger->GetTypeId() == TYPEID_PLAYER)
+    {
+        passenger->SetPosition(pos);
+        ((Player*)passenger)->SetFallInformation(0, pos.z + 0.5f);
+    }
+
+    // FIXME temp method for unmount on transport
+    if (GetBase()->IsOnTransport())
+    {
+        passenger->Relocate(GetBase()->GetTransport()->GetPosition());
+        GetBase()->GetTransport()->AddPassenger(passenger, GetBase()->GetTransportPosition());
+    }
+    // Check for tru dismount while grid unload
+    else if (passenger->GetTypeId() != TYPEID_PLAYER && !GetBase()->GetMap()->IsLoaded(pos.x, pos.y))
+    {
+        passenger->Relocate(pos);
+    }
+    else if (m_dstSet)
+    {
+        // parabolic traectory (catapults, explode, other effects). mostly set destination in DummyEffect.
+        // destination Z not checked in this case! only limited on 8.0 delta. requred full correct set in spelleffects.
+        float speed = ((m_dst_speed > M_NULL_F) ? m_dst_speed : ((seatInfo && seatInfo->m_exitSpeed > M_NULL_F) ? seatInfo->m_exitSpeed : BASE_CHARGE_SPEED));
+        float verticalSpeed = speed * sin(m_dst_elevation);
+        float horisontalSpeed = speed * cos(m_dst_elevation);
+        float moveTimeHalf =  verticalSpeed / ((seatInfo && seatInfo->m_exitGravity > 0.0f) ? seatInfo->m_exitGravity : Movement::gravity);
+        float max_height = - Movement::computeFallElevation(moveTimeHalf, false, -verticalSpeed);
+
+        // Check for tru move unit/creature to unloaded grid (for players check maked in Map class)
+        if (passenger->GetTypeId() != TYPEID_PLAYER && !GetBase()->GetMap()->IsLoaded(m_dst_x, m_dst_y))
+        {
+            passenger->Relocate(pos);
+        }
+        else if (!GetBase()->m_movementInfo.HasMovementFlag(MOVEFLAG_FLYING))
+            passenger->GetMotionMaster()->MoveSkyDiving(m_dst_x, m_dst_y, m_dst_z, passenger->GetOrientation(), horisontalSpeed, max_height, true);
+        else
+            DismountFromFlyingVehicle(passenger);
+    }
+    else if (seatInfo)
+    {
+        // half-parabolic traectory (unmount)
+        float horisontalSpeed = seatInfo->m_exitSpeed;
+
+        if (horisontalSpeed < M_NULL_F)
+            horisontalSpeed = BASE_CHARGE_SPEED;
+
+        // may be under water
+        base->GetClosePoint(m_dst_x, m_dst_y, m_dst_z, tRadius, frand(2.0f, 3.0f), frand(M_PI_F / 2.0f, 3.0f * M_PI_F / 2.0f), passenger);
+        if (m_dst_z < pos.z && !base->IsLevitating())
+            m_dst_z = pos.z;
+
+        if (passenger->GetTypeId() != TYPEID_PLAYER && !GetBase()->GetMap()->IsLoaded(m_dst_x, m_dst_y))
+        {
+            passenger->Relocate(pos);
+        }
+        else if (!GetBase()->m_movementInfo.HasMovementFlag(MOVEFLAG_FLYING))
+            passenger->GetMotionMaster()->MoveSkyDiving(m_dst_x, m_dst_y, m_dst_z + 0.1f, passenger->GetOrientation(), horisontalSpeed, 0.0f);
+        else
+            DismountFromFlyingVehicle(passenger);
+    }
+    else
+    {
+        // jump from vehicle without seatInfo (? error case)
+        base->GetClosePoint(m_dst_x, m_dst_y, m_dst_z, tRadius, 2.0f, M_PI_F, passenger);
+        passenger->UpdateAllowedPositionZ(m_dst_x, m_dst_y, m_dst_z);
+        if (m_dst_z < pos.z && !base->IsLevitating())
+            m_dst_z = pos.z;
+
+        if (passenger->GetTypeId() != TYPEID_PLAYER && !GetBase()->GetMap()->IsLoaded(m_dst_x, m_dst_y))
+        {
+            passenger->Relocate(pos);
+        }
+        else if (!GetBase()->m_movementInfo.HasMovementFlag(MOVEFLAG_FLYING))
+            passenger->GetMotionMaster()->MoveSkyDiving(m_dst_x, m_dst_y, m_dst_z + 0.1f, passenger->GetOrientation(), BASE_CHARGE_SPEED, 0.0f);
+        else
+            DismountFromFlyingVehicle(passenger);
+    }
+
+    DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "VehicleKit::Dismount %s from %s (%f %f %f), destination point is %f %f %f",
+        passenger->GetGuidStr().c_str(),
+        base->GetGuidStr().c_str(),
+        pos.x, pos.y, pos.z,
+        m_dst_x, m_dst_y, m_dst_z);
+    SetDestination();
+}
+
+void VehicleKit::DismountFromFlyingVehicle(Unit* passenger)
+{
+    passenger->clearUnitState(UNIT_STAT_ON_VEHICLE);
+    passenger->m_movementInfo.ClearTransportData();
+
+    if (passenger->GetTypeId() == TYPEID_PLAYER)
+        ((Player*)passenger)->SetMover(passenger);
+
+    passenger->m_movementInfo.SetMovementFlags(MOVEFLAG_NONE);
+}
+
+void VehicleKit::SetDestination(float x, float y, float z, float o, float speed, float elevation)
+{
+    m_dst_x = x;
+    m_dst_y = y;
+    m_dst_z = z;
+    m_dst_o = o;
+
+    m_dst_speed = speed;
+    m_dst_elevation = elevation;
+
+    if (fabs(m_dst_x) > 0.001 ||
+        fabs(m_dst_y) > 0.001 ||
+        fabs(m_dst_z) > 0.001 ||
+        fabs(m_dst_o) > 0.001 ||
+        fabs(m_dst_speed) > 0.001 ||
+        fabs(m_dst_elevation) > 0.001)
+        m_dstSet = true;
+};
+
+bool VehicleSeat::IsProtectPassenger() const
+{
+    if (seatInfo &&
+        ((seatInfo->m_flags & SEAT_FLAG_UNATTACKABLE) ||
+        (seatInfo->m_flags & SEAT_FLAG_HIDE_PASSENGER) ||
+        (seatInfo->m_flags & SEAT_FLAG_CAN_CONTROL)) &&
+        !(seatInfo->m_flags &  SEAT_FLAG_FREE_ACTION))
+        return true;
+
+    return false;
+}
+
+Aura* VehicleKit::GetControlAura(Unit* passenger)
+{
+    if (!passenger)
+        return NULL;
+
+    ObjectGuid casterGuid = passenger->GetObjectGuid();
+
+    MAPLOCK_READ(GetBase(),MAP_LOCK_TYPE_AURAS);
+    Unit::AuraList& auras = GetBase()->GetAurasByType(SPELL_AURA_CONTROL_VEHICLE);
+    for (Unit::AuraList::iterator itr = auras.begin(); itr != auras.end(); ++itr)
+    {
+        if (!itr->IsEmpty() && (*itr)->GetCasterGuid() == casterGuid)
+            return (*itr)();
+    }
+
+    return NULL;
+}
+
+void VehicleKit::DisableDismount(Unit* passenger)
+{
+    if (!passenger)
+        return;
+
+    SeatId seatId = GetSeatId(passenger);
+    if (seatId == -1)
+        return;
+
+    m_Seats[seatId].b_dismount = false;
 }
diff --git a/src/game/Vehicle.h b/src/game/Vehicle.h
index 69bf223660c..44b76ecc043 100644
--- a/src/game/Vehicle.h
+++ b/src/game/Vehicle.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ * Copyright (C) 2010-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,19 +22,99 @@
 
 #include "Common.h"
 #include "ObjectGuid.h"
+#include "ObjectHandler.h"
 #include "Creature.h"
 #include "Unit.h"
 #include "SharedDefines.h"
+#include "TransportSystem.h"
+
+#define SPELL_RIDE_VEHICLE_HARDCODED 46598
 
 struct VehicleEntry;
 
-class VehicleInfo
+struct VehicleSeat
+{
+    VehicleSeat(VehicleSeatEntry const* pSeatInfo = NULL) : seatInfo(pSeatInfo), passenger(ObjectGuid()), b_dismount(true) {}
+
+    VehicleSeatEntry const* seatInfo;
+    ObjectGuid              passenger;
+    bool IsProtectPassenger() const;
+    bool b_dismount:1;
+};
+
+typedef std::map<SeatId, VehicleSeat> SeatMap;
+
+enum AccessoryFlags
+{
+    ACCESSORY_FLAG_NONE   = 0x00000000,
+    ACCESSORY_FLAG_MINION = 0x00000001,
+    ACCESSORY_FLAG_HIDE   = 0x00000002
+};
+
+struct VehicleAccessory
+{
+    uint32   vehicleEntry;
+    int32    seatId;
+    uint32   passengerEntry;
+    uint32   m_flags;
+    float    m_offsetX;
+    float    m_offsetY;
+    float    m_offsetZ;
+    float    m_offsetO;
+
+    void Offset(float x, float y, float z, float o = 0.0f) { m_offsetX = x; m_offsetY = y; m_offsetZ = z; m_offsetO = o; }
+};
+
+class MANGOS_DLL_SPEC VehicleKit : public TransportBase
 {
-        VehicleEntry const* m_vehicleEntry;
     public:
-        explicit VehicleInfo(VehicleEntry const* entry);
+        explicit VehicleKit(Unit* base, VehicleEntry const* entry);
+        ~VehicleKit();
 
         VehicleEntry const* GetEntry() const { return m_vehicleEntry; }
+
+        void Initialize(uint32 creatureEntry = 0);                                  ///< Initializes the accessories
+        bool IsInitialized() const { return m_isInitialized; }
+
+        void Reset();
+        void InstallAccessory(SeatId seatID);
+
+        bool HasEmptySeat(SeatId seatId) const;
+        SeatId GetNextEmptySeatWithFlag(SeatId seatId, bool next = true, uint32 VehicleSeatFlag = 0) const;
+        Unit* GetPassenger(SeatId seatId) const;
+        bool AddPassenger(Unit* passenger, SeatId seatId = -1);
+        void RemovePassenger(Unit* passenger, bool dismount = false);
+        void RemoveAllPassengers();
+        VehicleSeatEntry const* GetSeatInfo(Unit* passenger);
+        VehicleSeatEntry const* GetSeatInfo(ObjectGuid const& guid);
+        SeatId GetSeatId(Unit* passenger);
+        SeatId GetSeatId(ObjectGuid const& guid);
+        void SetDestination(float x, float y, float z, float o, float speed, float elevation);
+        void SetDestination() { m_dst_x = 0.0f; m_dst_y = 0.0f; m_dst_z = 0.0f; m_dst_o = 0.0f; m_dst_speed = 0.0f; m_dst_elevation = 0.0f; m_dstSet = false; }
+        void DisableDismount(Unit* passenger);
+
+        Unit* GetBase() const { return (Unit*)GetOwner(); }
+        Aura* GetControlAura(Unit* passenger);
+
+    private:
+        // Internal use to calculate the boarding position
+        virtual Position CalculateBoardingPositionOf(Position const& pos) const override;
+
+        Position CalculateSeatPositionOf(VehicleSeatEntry const* seatInfo) const;
+
+        void UpdateFreeSeatCount();
+        void InstallAccessory(VehicleAccessory const* accessory);
+        void InstallAllAccessories(uint32 entry);
+
+        void Dismount(Unit* passenger, VehicleSeatEntry const* pSeatInfo = NULL);
+        void DismountFromFlyingVehicle(Unit* passenger);
+
+        VehicleEntry const* m_vehicleEntry;
+        SeatMap m_Seats;
+        uint32  m_uiNumFreeSeats;
+        float   m_dst_x, m_dst_y, m_dst_z, m_dst_o, m_dst_speed, m_dst_elevation;
+        bool    m_isInitialized:1;                               // Internal use to store if the accessory is initialized
+        bool    m_dstSet:1;
 };
 
 #endif
diff --git a/src/game/VehicleHandler.cpp b/src/game/VehicleHandler.cpp
new file mode 100644
index 00000000000..3c354917c56
--- /dev/null
+++ b/src/game/VehicleHandler.cpp
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Common.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
+#include "Opcodes.h"
+#include "Log.h"
+#include "Player.h"
+#include "Vehicle.h"
+#include "ObjectMgr.h"
+#include "SpellAuras.h"
+#include "SpellMgr.h"
+#include "TemporarySummon.h"
+
+void WorldSession::HandleDismissControlledVehicle(WorldPacket &recv_data)
+{
+    DEBUG_LOG("WORLD: Received CMSG_DISMISS_CONTROLLED_VEHICLE");
+    //recv_data.hexlike();
+
+    ObjectGuid guid;
+    MovementInfo movementInfo;
+
+    recv_data >> guid.ReadAsPacked();
+    recv_data >> movementInfo;
+
+    if(!GetPlayer()->GetVehicle())
+        return;
+
+    Creature* vehicle = GetPlayer()->GetMap()->GetAnyTypeCreature(guid);
+
+    if (!vehicle || !vehicle->IsVehicle())
+        return;
+
+    GetPlayer()->m_movementInfo = movementInfo;
+
+    GetPlayer()->ExitVehicle();
+
+}
+
+void WorldSession::HandleRequestVehicleExit(WorldPacket &recv_data)
+{
+    DEBUG_LOG("WORLD: Received CMSG_REQUEST_VEHICLE_EXIT");
+
+    if(!GetPlayer()->GetVehicle())
+        return;
+
+    Unit* vehicle = GetPlayer()->GetVehicle()->GetBase();
+    if (!vehicle)
+        return;
+
+    if (!vehicle->RemoveSpellsCausingAuraByCaster(SPELL_AURA_CONTROL_VEHICLE, GetPlayer()->GetObjectGuid()))
+        GetPlayer()->ExitVehicle();
+}
+
+void WorldSession::HandleRequestVehiclePrevSeat(WorldPacket &recv_data)
+{
+    DEBUG_LOG("WORLD: Received CMSG_REQUEST_VEHICLE_PREV_SEAT");
+
+    GetPlayer()->ChangeSeat(-1, false);
+}
+
+void WorldSession::HandleRequestVehicleNextSeat(WorldPacket &recv_data)
+{
+    DEBUG_LOG("WORLD: Received CMSG_REQUEST_VEHICLE_NEXT_SEAT");
+
+    GetPlayer()->ChangeSeat(-1, true);
+}
+
+void WorldSession::HandleRequestVehicleSwitchSeat(WorldPacket &recv_data)
+{
+    DEBUG_LOG("WORLD: Received CMSG_REQUEST_VEHICLE_SWITCH_SEAT");
+    //recv_data.hexlike();
+
+    ObjectGuid guid;
+    recv_data >> guid.ReadAsPacked();
+
+    int8 seatId;
+    recv_data >> seatId;
+
+    VehicleKitPtr pVehicle = GetPlayer()->GetVehicle();
+
+    if (!pVehicle)
+        return;
+
+    if (pVehicle->GetEntry()->m_flags & VEHICLE_FLAG_DISABLE_SWITCH)
+        return;
+
+    if (pVehicle->GetBase()->GetObjectGuid() == guid)
+        GetPlayer()->ChangeSeat(seatId);
+
+    else if (Unit *Vehicle2 = GetPlayer()->GetMap()->GetUnit(guid))
+    {
+        if (VehicleKitPtr pVehicle2 = Vehicle2->GetVehicleKit())
+            if (pVehicle2->HasEmptySeat(seatId))
+            {
+                GetPlayer()->ExitVehicle();
+                GetPlayer()->EnterVehicle(pVehicle2, seatId);
+            }
+    }
+}
+
+void WorldSession::HandleEnterPlayerVehicle(WorldPacket &recv_data)
+{
+    DEBUG_LOG("WORLD: Received CMSG_RIDE_VEHICLE_INTERACT");
+    //recv_data.hexlike();
+
+    ObjectGuid guid;
+    recv_data >> guid;
+
+    Player* player = sObjectMgr.GetPlayer(guid);
+
+    if (!player)
+        return;
+
+    if (!GetPlayer()->IsInSameRaidWith(player))
+        return;
+
+    if (!GetPlayer()->IsWithinDistInMap(player, INTERACTION_DISTANCE))
+        return;
+
+    GetPlayer()->CastSpell(player, SPELL_RIDE_VEHICLE_HARDCODED, true);
+
+}
+
+void WorldSession::HandleEjectPassenger(WorldPacket &recv_data)
+{
+    //recv_data.hexlike();
+
+    ObjectGuid guid;
+    recv_data >> guid;
+
+    Unit* passenger = ObjectAccessor::GetUnit(*GetPlayer(), guid);
+
+    if (!passenger)
+        return;
+
+    VehicleKitPtr pVehicle = passenger->GetVehicle();
+
+    if (!pVehicle ||
+       ((pVehicle != GetPlayer()->GetVehicleKit()) &&
+        !(pVehicle->GetEntry()->m_flags & (VEHICLE_FLAG_ACCESSORY))))
+    {
+        sLog.outError("WorldSession::HandleEjectPassenger %s try eject %s, but not may do this!",GetPlayer()->GetObjectGuid().GetString().c_str(),guid.GetString().c_str());
+        return;
+    }
+    DEBUG_LOG("WorldSession::HandleEjectPassenger CMSG_CONTROLLER_EJECT_PASSENGER %s eject passenger %s",GetPlayer()->GetObjectGuid().GetString().c_str(),guid.GetString().c_str());
+
+    GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, guid);
+
+    // eject and remove creatures of player mounts
+    if (passenger->GetTypeId() == TYPEID_UNIT)
+    {
+        if (((Creature*)passenger)->IsTemporarySummon())
+        {
+            // Fixme: delay must be calculated not from this, but from creature template parameters (off traders ...?).
+            uint32 delay = passenger->IsVehicle() ? 1000: 60000;
+            ((TemporarySummon*)passenger)->UnSummon(delay);
+        }
+        else
+            passenger->AddObjectToRemoveList();
+    }
+}
+
+void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
+{
+    //sLog.outDebug("WORLD: Recvd CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE");
+    //recv_data.hexlike();
+
+    ObjectGuid guid, guid2;
+    recv_data >> guid.ReadAsPacked();
+
+    MovementInfo movementInfo;
+    recv_data >> movementInfo;
+
+    recv_data >> guid2.ReadAsPacked(); //guid of vehicle or of vehicle in target seat
+
+    int8 seatId;
+    recv_data >> seatId;
+
+    VehicleKitPtr pVehicle = GetPlayer()->GetVehicle();
+
+    if (!pVehicle)
+        return;
+
+    if (pVehicle->GetEntry()->m_flags & VEHICLE_FLAG_DISABLE_SWITCH)
+        return;
+
+    pVehicle->GetBase()->m_movementInfo = movementInfo;
+
+    if(!guid2 || guid.GetRawValue() == guid2.GetRawValue())
+    {
+        DEBUG_LOG("WorldSession::HandleChangeSeatsOnControlledVehicle player %s change seat on %s (to %u).",GetPlayer()->GetObjectGuid().GetString().c_str(),guid.GetString().c_str(), seatId);
+        GetPlayer()->ChangeSeat(seatId);
+    }
+    // seat to another vehicle or accessory
+    if (Unit* vehicle = GetPlayer()->GetMap()->GetUnit(guid2))
+    {
+        if (vehicle->IsInWorld() && vehicle->IsVehicle())
+        {
+            DEBUG_LOG("WorldSession::HandleChangeSeatsOnControlledVehicle player %s try move from %s, to %s (seat %u).",GetPlayer()->GetObjectGuid().GetString().c_str(),guid.GetString().c_str(),guid2.GetString().c_str(), seatId);
+            GetPlayer()->ExitVehicle(true);
+            GetPlayer()->EnterVehicle(vehicle, seatId);
+        }
+    }
+}
diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp
index d924905c357..2ca0f2d70e2 100644
--- a/src/game/WaypointManager.cpp
+++ b/src/game/WaypointManager.cpp
@@ -19,7 +19,7 @@
 #include "WaypointManager.h"
 #include "Database/DatabaseEnv.h"
 #include "GridDefines.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "ProgressBar.h"
 #include "MapManager.h"
 #include "ObjectMgr.h"
@@ -32,45 +32,43 @@ bool WaypointBehavior::isEmpty()
     if (emote || spell || model1 || model2)
         return false;
 
-    for(int i = 0; i < MAX_WAYPOINT_TEXT; ++i)
-        if(textid[i])
+    for (int i = 0; i < MAX_WAYPOINT_TEXT; ++i)
+        if (textid[i])
             return false;
 
     return true;
 }
 
-WaypointBehavior::WaypointBehavior(const WaypointBehavior &b)
+WaypointBehavior::WaypointBehavior(const WaypointBehavior& b)
 {
     emote = b.emote;
     spell = b.spell;
     model1 = b.model1;
     model2 = b.model2;
-    for(int i=0; i < MAX_WAYPOINT_TEXT; ++i)
+    for (int i = 0; i < MAX_WAYPOINT_TEXT; ++i)
         textid[i] = b.textid[i];
 }
 
 void WaypointManager::Load()
 {
-    Cleanup();
-
     uint32 total_paths = 0;
     uint32 total_nodes = 0;
     uint32 total_behaviors = 0;
 
     std::set<uint32> movementScriptSet;
 
-    for(ScriptMapMap::const_iterator itr = sCreatureMovementScripts.second.begin(); itr != sCreatureMovementScripts.second.end(); ++itr)
+    for (ScriptMapMap::const_iterator itr = sCreatureMovementScripts.second.begin(); itr != sCreatureMovementScripts.second.end(); ++itr)
         movementScriptSet.insert(itr->first);
 
     // creature_movement
-    QueryResult *result = WorldDatabase.Query("SELECT id, COUNT(point) FROM creature_movement GROUP BY id");
+    QueryResult* result = WorldDatabase.Query("SELECT id, COUNT(point) FROM creature_movement GROUP BY id");
 
     if (!result)
     {
         BarGoLink bar(1);
         bar.step();
         sLog.outString();
-        sLog.outString( ">> Loaded 0 paths. DB table `creature_movement` is empty." );
+        sLog.outString(">> Loaded 0 paths. DB table `creature_movement` is empty.");
     }
     else
     {
@@ -80,25 +78,24 @@ void WaypointManager::Load()
         do
         {
             bar.step();
-            Field *fields   = result->Fetch();
+            Field* fields   = result->Fetch();
 
             uint32 id       = fields[0].GetUInt32();
             uint32 count    = fields[1].GetUInt32();
 
-            m_pathMap[id].resize(count);
             total_nodes += count;
         }
-        while(result->NextRow());
+        while (result->NextRow());
 
         sLog.outString();
-        sLog.outString( ">> Paths loaded" );
+        sLog.outString(">> Paths loaded");
 
         delete result;
 
         //                                   0   1      2           3           4           5         6
         result = WorldDatabase.Query("SELECT id, point, position_x, position_y, position_z, waittime, script_id,"
-        //   7        8        9        10       11       12     13     14           15      16
-            "textid1, textid2, textid3, textid4, textid5, emote, spell, orientation, model1, model2 FROM creature_movement");
+                                     //   7        8        9        10       11       12     13     14           15      16
+                                     "textid1, textid2, textid3, textid4, textid5, emote, spell, orientation, model1, model2 FROM creature_movement");
 
         BarGoLink barRow((int)result->GetRowCount());
 
@@ -108,7 +105,7 @@ void WaypointManager::Load()
         do
         {
             barRow.step();
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
             uint32 id           = fields[0].GetUInt32();
             uint32 point        = fields[1].GetUInt32();
 
@@ -123,12 +120,8 @@ void WaypointManager::Load()
             if (cData->movementType != WAYPOINT_MOTION_TYPE)
                 creatureNoMoveType.insert(id);
 
-            WaypointPath &path  = m_pathMap[id];
-
-            // the cleanup queries make sure the following is true
-            MANGOS_ASSERT(point >= 1 && point <= path.size());
-
-            WaypointNode &node  = path[point-1];
+            WaypointPath& path  = m_pathMap[id];
+            WaypointNode& node  = path[point];
 
             node.x              = fields[2].GetFloat();
             node.y              = fields[3].GetFloat();
@@ -140,20 +133,20 @@ void WaypointManager::Load()
             // prevent using invalid coordinates
             if (!MaNGOS::IsValidMapCoord(node.x, node.y, node.z, node.orientation))
             {
-                QueryResult *result1 = WorldDatabase.PQuery("SELECT id, map FROM creature WHERE guid = '%u'", id);
+                QueryResult* result1 = WorldDatabase.PQuery("SELECT id, map FROM creature WHERE guid = '%u'", id);
                 if (result1)
                     sLog.outErrorDb("Creature (guidlow %d, entry %d) have invalid coordinates in his waypoint %d (X: %f, Y: %f).",
-                        id, result1->Fetch()[0].GetUInt32(), point, node.x, node.y);
+                                    id, result1->Fetch()[0].GetUInt32(), point, node.x, node.y);
                 else
                     sLog.outErrorDb("Waypoint path %d, have invalid coordinates in his waypoint %d (X: %f, Y: %f).",
-                        id, point, node.x, node.y);
+                                    id, point, node.x, node.y);
 
                 MaNGOS::NormalizeMapCoord(node.x);
                 MaNGOS::NormalizeMapCoord(node.y);
 
                 if (result1)
                 {
-                    node.z = sTerrainMgr.LoadTerrain(result1->Fetch()[1].GetUInt32())->GetHeight(node.x, node.y, node.z);
+                    node.z = sTerrainMgr.LoadTerrain(result1->Fetch()[1].GetUInt32())->GetHeightStatic(node.x, node.y, node.z);
                     delete result1;
                 }
 
@@ -164,7 +157,7 @@ void WaypointManager::Load()
             {
                 if (sCreatureMovementScripts.second.find(node.script_id) == sCreatureMovementScripts.second.end())
                 {
-                    sLog.outErrorDb("Table creature_movement for id %u, point %u have script_id %u that does not exist in `creature_movement_scripts`, ignoring", id, point, node.script_id);
+                    sLog.outErrorDb("Table creature_movement for id %u, point %u have script_id %u that does not exist in `dbscripts_on_creature_movement`, ignoring", id, point, node.script_id);
                     continue;
                 }
 
@@ -179,16 +172,16 @@ void WaypointManager::Load()
             be.emote            = fields[12].GetUInt32();
             be.spell            = fields[13].GetUInt32();
 
-            for(int i = 0; i < MAX_WAYPOINT_TEXT; ++i)
+            for (int i = 0; i < MAX_WAYPOINT_TEXT; ++i)
             {
-                be.textid[i]    = fields[7+i].GetUInt32();
+                be.textid[i]    = fields[7 + i].GetInt32();
 
                 if (be.textid[i])
                 {
                     if (be.textid[i] < MIN_DB_SCRIPT_STRING_ID || be.textid[i] >= MAX_DB_SCRIPT_STRING_ID)
                     {
-                        sLog.outErrorDb( "Table `db_script_string` not have string id  %u", be.textid[i]);
-                        continue;
+                        sLog.outErrorDb("Table `creature_movement` Id %u, point %u has textid%u has value %d out of range. Must be in %u-%u", id, point, i + 1, be.textid[i], MIN_DB_SCRIPT_STRING_ID, MAX_DB_SCRIPT_STRING_ID - 1);
+                        be.textid[i] = 0;
                     }
                 }
             }
@@ -202,7 +195,7 @@ void WaypointManager::Load()
             if (be.emote)
             {
                 if (!sEmotesStore.LookupEntry(be.emote))
-                    sLog.outErrorDb("Waypoint path %u (Point %u) are using emote %u, but emote does not exist.",id, point, be.emote);
+                    sLog.outErrorDb("Waypoint path %u (Point %u) are using emote %u, but emote does not exist.", id, point, be.emote);
             }
 
             // save memory by not storing empty behaviors
@@ -214,11 +207,11 @@ void WaypointManager::Load()
             else
                 node.behavior = NULL;
         }
-        while(result->NextRow());
+        while (result->NextRow());
 
         if (!creatureNoMoveType.empty())
         {
-            for(std::set<uint32>::const_iterator itr = creatureNoMoveType.begin(); itr != creatureNoMoveType.end(); ++itr)
+            for (std::set<uint32>::const_iterator itr = creatureNoMoveType.begin(); itr != creatureNoMoveType.end(); ++itr)
             {
                 const CreatureData* cData = sObjectMgr.GetCreatureData(*itr);
                 const CreatureInfo* cInfo = ObjectMgr::GetCreatureTemplate(cData->id);
@@ -231,9 +224,9 @@ void WaypointManager::Load()
         }
 
         sLog.outString();
-        sLog.outString( ">> Waypoints and behaviors loaded" );
+        sLog.outString(">> Waypoints and behaviors loaded");
         sLog.outString();
-        sLog.outString( ">>> Loaded %u paths, %u nodes and %u behaviors", total_paths, total_nodes, total_behaviors);
+        sLog.outString(">>> Loaded %u paths, %u nodes and %u behaviors", total_paths, total_nodes, total_behaviors);
 
         delete result;
     }
@@ -246,7 +239,7 @@ void WaypointManager::Load()
         BarGoLink bar(1);
         bar.step();
         sLog.outString();
-        sLog.outString( ">> Loaded 0 path templates. DB table `creature_movement_template` is empty." );
+        sLog.outString(">> Loaded 0 path templates. DB table `creature_movement_template` is empty.");
     }
     else
     {
@@ -258,15 +251,14 @@ void WaypointManager::Load()
         do
         {
             barRow.step();
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             uint32 entry    = fields[0].GetUInt32();
             uint32 count    = fields[1].GetUInt32();
 
-            m_pathTemplateMap[entry].resize(count);
             total_nodes += count;
         }
-        while(result->NextRow());
+        while (result->NextRow());
 
         delete result;
 
@@ -275,15 +267,15 @@ void WaypointManager::Load()
 
         //                                   0      1      2           3           4           5         6
         result = WorldDatabase.Query("SELECT entry, point, position_x, position_y, position_z, waittime, script_id,"
-        //   7        8        9        10       11       12     13     14           15      16
-            "textid1, textid2, textid3, textid4, textid5, emote, spell, orientation, model1, model2 FROM creature_movement_template");
+                                     //   7        8        9        10       11       12     13     14           15      16
+                                     "textid1, textid2, textid3, textid4, textid5, emote, spell, orientation, model1, model2 FROM creature_movement_template");
 
         BarGoLink bar(result->GetRowCount());
 
         do
         {
             bar.step();
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
             uint32 entry        = fields[0].GetUInt32();
             uint32 point        = fields[1].GetUInt32();
@@ -296,12 +288,8 @@ void WaypointManager::Load()
                 continue;
             }
 
-            WaypointPath &path  = m_pathTemplateMap[entry];
-
-            // the cleanup queries make sure the following is true
-            MANGOS_ASSERT(point >= 1 && point <= path.size());
-
-            WaypointNode &node  = path[point-1];
+            WaypointPath& path  = m_pathTemplateMap[entry];
+            WaypointNode& node  = path[point];
 
             node.x              = fields[2].GetFloat();
             node.y              = fields[3].GetFloat();
@@ -314,13 +302,13 @@ void WaypointManager::Load()
             if (!MaNGOS::IsValidMapCoord(node.x, node.y, node.z, node.orientation))
             {
                 sLog.outErrorDb("Table creature_movement_template for entry %u (point %u) are using invalid coordinates position_x: %f, position_y: %f)",
-                    entry, point, node.x, node.y);
+                                entry, point, node.x, node.y);
 
                 MaNGOS::NormalizeMapCoord(node.x);
                 MaNGOS::NormalizeMapCoord(node.y);
 
                 sLog.outErrorDb("Table creature_movement_template for entry %u (point %u) are auto corrected to normalized position_x=%f, position_y=%f",
-                    entry, point, node.x, node.y);
+                                entry, point, node.x, node.y);
 
                 WorldDatabase.PExecute("UPDATE creature_movement_template SET position_x = '%f', position_y = '%f' WHERE entry = %u AND point = %u", node.x, node.y, entry, point);
             }
@@ -329,7 +317,7 @@ void WaypointManager::Load()
             {
                 if (sCreatureMovementScripts.second.find(node.script_id) == sCreatureMovementScripts.second.end())
                 {
-                    sLog.outErrorDb("Table creature_movement_template for entry %u, point %u have script_id %u that does not exist in `creature_movement_scripts`, ignoring", entry, point, node.script_id);
+                    sLog.outErrorDb("Table creature_movement_template for entry %u, point %u have script_id %u that does not exist in `dbscripts_on_creature_movement`, ignoring", entry, point, node.script_id);
                     continue;
                 }
 
@@ -342,16 +330,16 @@ void WaypointManager::Load()
             be.emote            = fields[12].GetUInt32();
             be.spell            = fields[13].GetUInt32();
 
-            for(int i = 0; i < MAX_WAYPOINT_TEXT; ++i)
+            for (int i = 0; i < MAX_WAYPOINT_TEXT; ++i)
             {
-                be.textid[i]    = fields[7+i].GetUInt32();
+                be.textid[i]    = fields[7 + i].GetUInt32();
 
                 if (be.textid[i])
                 {
                     if (be.textid[i] < MIN_DB_SCRIPT_STRING_ID || be.textid[i] >= MAX_DB_SCRIPT_STRING_ID)
                     {
-                        sLog.outErrorDb( "Table `db_script_string` not have string id %u", be.textid[i]);
-                        continue;
+                        sLog.outErrorDb("Table `creature_movement_template` Entry %u, point %u has textid%u has value %d out of range. Must be in %u-%u", entry, point, i + 1, be.textid[i], MIN_DB_SCRIPT_STRING_ID, MAX_DB_SCRIPT_STRING_ID - 1);
+                        be.textid[i] = 0;
                     }
                 }
             }
@@ -377,69 +365,38 @@ void WaypointManager::Load()
             else
                 node.behavior   = NULL;
         }
-        while(result->NextRow());
+        while (result->NextRow());
 
         delete result;
 
         sLog.outString();
-        sLog.outString( ">> Waypoint templates loaded" );
+        sLog.outString(">> Waypoint templates loaded");
         sLog.outString();
-        sLog.outString( ">>> Loaded %u path templates with %u nodes and %u behaviors", total_paths, total_nodes, total_behaviors);
+        sLog.outString(">>> Loaded %u path templates with %u nodes and %u behaviors", total_paths, total_nodes, total_behaviors);
     }
 
     if (!movementScriptSet.empty())
     {
-        for(std::set<uint32>::const_iterator itr = movementScriptSet.begin(); itr != movementScriptSet.end(); ++itr)
-            sLog.outErrorDb("Table `creature_movement_scripts` contain unused script, id %u.", *itr);
-    }
-}
-
-void WaypointManager::Cleanup()
-{
-    // check if points need to be renumbered and do it
-    if (QueryResult *result = WorldDatabase.Query("SELECT 1 from creature_movement As T WHERE point <> (SELECT COUNT(*) FROM creature_movement WHERE id = T.id AND point <= T.point) LIMIT 1"))
-    {
-        delete result;
-        WorldDatabase.DirectExecute("CREATE TEMPORARY TABLE temp LIKE creature_movement");
-        WorldDatabase.DirectExecute("INSERT INTO temp SELECT * FROM creature_movement");
-        WorldDatabase.DirectExecute("ALTER TABLE creature_movement DROP PRIMARY KEY");
-        WorldDatabase.DirectExecute("UPDATE creature_movement AS T SET point = (SELECT COUNT(*) FROM temp WHERE id = T.id AND point <= T.point)");
-        WorldDatabase.DirectExecute("ALTER TABLE creature_movement ADD PRIMARY KEY (id, point)");
-        WorldDatabase.DirectExecute("DROP TABLE temp");
-
-        sLog.outErrorDb("Table `creature_movement` was auto corrected for using points out of order (invalid or points missing)");
-
-        MANGOS_ASSERT(!(result = WorldDatabase.Query("SELECT 1 from creature_movement As T WHERE point <> (SELECT COUNT(*) FROM creature_movement WHERE id = T.id AND point <= T.point) LIMIT 1")));
-    }
-
-    if (QueryResult *result = WorldDatabase.Query("SELECT 1 from creature_movement_template As T WHERE point <> (SELECT COUNT(*) FROM creature_movement_template WHERE entry = T.entry AND point <= T.point) LIMIT 1"))
-    {
-        delete result;
-        WorldDatabase.DirectExecute("CREATE TEMPORARY TABLE temp LIKE creature_movement_template");
-        WorldDatabase.DirectExecute("INSERT INTO temp SELECT * FROM creature_movement_template");
-        WorldDatabase.DirectExecute("ALTER TABLE creature_movement_template DROP PRIMARY KEY");
-        WorldDatabase.DirectExecute("UPDATE creature_movement_template AS T SET point = (SELECT COUNT(*) FROM temp WHERE entry = T.entry AND point <= T.point)");
-        WorldDatabase.DirectExecute("ALTER TABLE creature_movement_template ADD PRIMARY KEY (entry, point)");
-        WorldDatabase.DirectExecute("DROP TABLE temp");
-
-        sLog.outErrorDb("Table `creature_movement_template` was auto corrected for using points out of order (invalid or points missing)");
-
-        MANGOS_ASSERT(!(result = WorldDatabase.Query("SELECT 1 from creature_movement_template As T WHERE point <> (SELECT COUNT(*) FROM creature_movement_template WHERE entry = T.entry AND point <= T.point) LIMIT 1")));
+        for (std::set<uint32>::const_iterator itr = movementScriptSet.begin(); itr != movementScriptSet.end(); ++itr)
+            sLog.outErrorDb("Table `dbscripts_on_creature_movement` contain unused script, id %u.", *itr);
     }
 }
 
 void WaypointManager::Unload()
 {
-    for(WaypointPathMap::iterator itr = m_pathMap.begin(); itr != m_pathMap.end(); ++itr)
+    for (WaypointPathMap::iterator itr = m_pathMap.begin(); itr != m_pathMap.end(); ++itr)
         _clearPath(itr->second);
     m_pathMap.clear();
+
+    for (WaypointPathMap::iterator itr = m_pathTemplateMap.begin(); itr != m_pathTemplateMap.end(); ++itr)
+        _clearPath(itr->second);
+    m_pathTemplateMap.clear();
 }
 
-void WaypointManager::_clearPath(WaypointPath &path)
+void WaypointManager::_clearPath(WaypointPath& path)
 {
-    for(WaypointPath::const_iterator itr = path.begin(); itr != path.end(); ++itr)
-        if(itr->behavior)
-            delete itr->behavior;
+    for (WaypointPath::const_iterator itr = path.begin(); itr != path.end(); ++itr)
+        delete itr->second.behavior;
     path.clear();
 }
 
@@ -452,7 +409,7 @@ void WaypointManager::AddLastNode(uint32 id, float x, float y, float z, float o,
 /// - Insert after a certain point
 void WaypointManager::AddAfterNode(uint32 id, uint32 point, float x, float y, float z, float o, uint32 delay, uint32 wpGuid)
 {
-    for(uint32 i = GetLastPoint(id, 0); i > point; i--)
+    for (uint32 i = GetLastPoint(id, 0); i > point; --i)
         WorldDatabase.PExecuteLog("UPDATE creature_movement SET point=point+1 WHERE id=%u AND point=%u", id, i);
 
     _addNode(id, point + 1, x, y, z, o, delay, wpGuid);
@@ -461,46 +418,38 @@ void WaypointManager::AddAfterNode(uint32 id, uint32 point, float x, float y, fl
 /// - Insert without checking for collision
 void WaypointManager::_addNode(uint32 id, uint32 point, float x, float y, float z, float o, uint32 delay, uint32 wpGuid)
 {
-    if(point == 0) return;                                  // counted from 1 in the DB
     WorldDatabase.PExecuteLog("INSERT INTO creature_movement (id,point,position_x,position_y,position_z,orientation,wpguid,waittime) "
-        "VALUES (%u,%u, %f,%f,%f,%f, %u,%u)",
-        id, point, x, y, z, o, wpGuid, delay);
-    WaypointPathMap::iterator itr = m_pathMap.find(id);
-    if(itr == m_pathMap.end())
-        itr = m_pathMap.insert(WaypointPathMap::value_type(id, WaypointPath())).first;
-    itr->second.insert(itr->second.begin() + (point - 1), WaypointNode(x, y, z, o, delay, 0, NULL));
+                              "VALUES (%u,%u, %f,%f,%f,%f, %u,%u)",
+                              id, point, x, y, z, o, wpGuid, delay);
+
+    m_pathMap[id][point] = WaypointNode(x, y, z, o, delay, 0, NULL);
 }
 
 uint32 WaypointManager::GetLastPoint(uint32 id, uint32 default_notfound)
 {
-    uint32 point = default_notfound;
-    /*QueryResult *result = WorldDatabase.PQuery( "SELECT MAX(point) FROM creature_movement WHERE id = '%u'", id);
-    if( result )
-    {
-        point = (*result)[0].GetUInt32()+1;
-        delete result;
-    }*/
     WaypointPathMap::const_iterator itr = m_pathMap.find(id);
-    if(itr != m_pathMap.end() && itr->second.size() != 0)
-        point = itr->second.size();
-    return point;
+    if (itr != m_pathMap.end() && itr->second.rbegin() != itr->second.rend())
+        default_notfound = itr->second.rbegin()->first;
+
+    return default_notfound;
 }
 
 void WaypointManager::DeleteNode(uint32 id, uint32 point)
 {
-    if(point == 0) return;                                  // counted from 1 in the DB
     WorldDatabase.PExecuteLog("DELETE FROM creature_movement WHERE id=%u AND point=%u", id, point);
     WorldDatabase.PExecuteLog("UPDATE creature_movement SET point=point-1 WHERE id=%u AND point>%u", id, point);
     WaypointPathMap::iterator itr = m_pathMap.find(id);
-    if(itr != m_pathMap.end() && point <= itr->second.size())
-        itr->second.erase(itr->second.begin() + (point-1));
+    if (itr == m_pathMap.end())
+        return;
+
+    itr->second.erase(point);
 }
 
 void WaypointManager::DeletePath(uint32 id)
 {
     WorldDatabase.PExecuteLog("DELETE FROM creature_movement WHERE id=%u", id);
     WaypointPathMap::iterator itr = m_pathMap.find(id);
-    if(itr != m_pathMap.end())
+    if (itr != m_pathMap.end())
         _clearPath(itr->second);
     // the path is not removed from the map, just cleared
     // WMGs have pointers to the path, so deleting them would crash
@@ -510,25 +459,27 @@ void WaypointManager::DeletePath(uint32 id)
 
 void WaypointManager::SetNodePosition(uint32 id, uint32 point, float x, float y, float z)
 {
-    if(point == 0) return;                                  // counted from 1 in the DB
     WorldDatabase.PExecuteLog("UPDATE creature_movement SET position_x=%f, position_y=%f, position_z=%f WHERE id=%u AND point=%u", x, y, z, id, point);
     WaypointPathMap::iterator itr = m_pathMap.find(id);
-    if(itr != m_pathMap.end() && point <= itr->second.size())
+    if (itr == m_pathMap.end())
+        return;
+
+    WaypointPath::iterator find = itr->second.find(point);
+    if (find != itr->second.end())
     {
-        itr->second[point-1].x = x;
-        itr->second[point-1].y = y;
-        itr->second[point-1].z = z;
+        find->second.x = x;
+        find->second.y = y;
+        find->second.z = z;
     }
 }
 
-void WaypointManager::SetNodeText(uint32 id, uint32 point, const char *text_field, const char *text)
+void WaypointManager::SetNodeText(uint32 id, uint32 point, const char* text_field, const char* text)
 {
-    if(point == 0) return;                                  // counted from 1 in the DB
-    if(!text_field) return;
+    if (!text_field) return;
     std::string field = text_field;
     WorldDatabase.escape_string(field);
 
-    if(!text)
+    if (!text)
     {
         WorldDatabase.PExecuteLog("UPDATE creature_movement SET %s=NULL WHERE id='%u' AND point='%u'", field.c_str(), id, point);
     }
@@ -540,110 +491,70 @@ void WaypointManager::SetNodeText(uint32 id, uint32 point, const char *text_fiel
     }
 
     WaypointPathMap::iterator itr = m_pathMap.find(id);
-    if(itr != m_pathMap.end() && point <= itr->second.size())
+    if (itr == m_pathMap.end())
+        return;
+
+    WaypointPath::iterator find = itr->second.find(point);
+    if (find != itr->second.end())
     {
-        WaypointNode &node = itr->second[point-1];
-        if(!node.behavior) node.behavior = new WaypointBehavior();
+        WaypointNode& node = find->second;
+        if (!node.behavior) node.behavior = new WaypointBehavior();
 
 //        if(field == "text1") node.behavior->text[0] = text ? text : "";
 //        if(field == "text2") node.behavior->text[1] = text ? text : "";
 //        if(field == "text3") node.behavior->text[2] = text ? text : "";
 //        if(field == "text4") node.behavior->text[3] = text ? text : "";
 //        if(field == "text5") node.behavior->text[4] = text ? text : "";
-        if(field == "emote") node.behavior->emote   = text ? atoi(text) : 0;
-        if(field == "spell") node.behavior->spell   = text ? atoi(text) : 0;
-        if(field == "model1") node.behavior->model1 = text ? atoi(text) : 0;
-        if(field == "model2") node.behavior->model2 = text ? atoi(text) : 0;
+        if (field == "emote") node.behavior->emote   = text ? atoi(text) : 0;
+        if (field == "spell") node.behavior->spell   = text ? atoi(text) : 0;
+        if (field == "model1") node.behavior->model1 = text ? atoi(text) : 0;
+        if (field == "model2") node.behavior->model2 = text ? atoi(text) : 0;
     }
 }
 
-void WaypointManager::CheckTextsExistance(std::set<int32>& ids)
+inline void CheckWPText(bool isTemplate, uint32 entryOrGuid, uint32 point, WaypointBehavior* be, std::set<int32>& ids)
 {
-    WaypointPathMap::const_iterator pmItr = m_pathMap.begin();
-    for ( ; pmItr != m_pathMap.end(); ++pmItr)
+    int zeroCount = 0;                                      // Counting leading zeros for futher textid shift
+    for (int j = 0; j < MAX_WAYPOINT_TEXT; ++j)
     {
-        for (size_t i = 0; i < pmItr->second.size(); ++i)
+        if (!be->textid[j])
         {
-            WaypointBehavior* be = pmItr->second[i].behavior;
-            if (!be)
-                continue;
-
-            // Now we check text existence and put all zero texts ids to the end of array
-
-            // Counting leading zeros for futher textid shift
-            int zeroCount = 0;
-            for (int j = 0; j < MAX_WAYPOINT_TEXT; ++j)
-            {
-                if (!be->textid[j])
-                {
-                    ++zeroCount;
-                    continue;
-                }
-                else
-                {
-                    if (!sObjectMgr.GetMangosStringLocale(be->textid[j]))
-                    {
-                        sLog.outErrorDb("Some waypoint has textid%u with not existing %u text.", j, be->textid[j]);
-                        be->textid[j] = 0;
-                        ++zeroCount;
-                        continue;
-                    }
-                    else
-                        ids.erase(be->textid[j]);
+            ++zeroCount;
+            continue;
+        }
+        if (!sObjectMgr.GetMangosStringLocale(be->textid[j]))
+        {
+            sLog.outErrorDb("Table `creature_movement%s %u, PointId %u has textid%u with non existing textid %i.",
+                            isTemplate ? "_template` Entry:" : "` Id:", entryOrGuid, point, j, be->textid[j]);
+            be->textid[j] = 0;
+            ++zeroCount;
+            continue;
+        }
+        ids.erase(uint32(be->textid[j]));
 
-                    // Shifting check
-                    if (zeroCount)
-                    {
-                        // Correct textid but some zeros leading, so move it forward.
-                        be->textid[j-zeroCount] = be->textid[j];
-                        be->textid[j] = 0;
-                    }
-                }
-            }
+        // Shifting check
+        if (zeroCount)
+        {
+            // Correct textid but some zeros leading, so move it forward.
+            be->textid[j - zeroCount] = be->textid[j];
+            be->textid[j] = 0;
         }
     }
+}
 
-    WaypointPathTemplateMap::const_iterator wptItr = m_pathTemplateMap.begin();
-    for ( ; wptItr != m_pathTemplateMap.end(); ++wptItr)
+void WaypointManager::CheckTextsExistance(std::set<int32>& ids)
+{
+    for (WaypointPathMap::const_iterator pmItr = m_pathMap.begin(); pmItr != m_pathMap.end(); ++pmItr)
     {
-        for (size_t i = 0; i < wptItr->second.size(); ++i)
-        {
-            WaypointBehavior* be = wptItr->second[i].behavior;
-            if (!be)
-                continue;
-
-            // Now we check text existence and put all zero texts ids to the end of array
-
-            // Counting leading zeros for futher textid shift
-            int zeroCount = 0;
-            for (int j = 0; j < MAX_WAYPOINT_TEXT; ++j)
-            {
-                if (!be->textid[j])
-                {
-                    ++zeroCount;
-                    continue;
-                }
-                else
-                {
-                    if (!sObjectMgr.GetMangosStringLocale(be->textid[j]))
-                    {
-                        sLog.outErrorDb("Some waypoint has textid%u with not existing %u text.", j, be->textid[j]);
-                        be->textid[j] = 0;
-                        ++zeroCount;
-                        continue;
-                    }
-                    else
-                        ids.erase(be->textid[j]);
+        for (WaypointPath::const_iterator pItr = pmItr->second.begin(); pItr != pmItr->second.end(); ++pItr)
+            if (pItr->second.behavior)
+                CheckWPText(false, pmItr->first, pItr->first, pItr->second.behavior, ids);
+    }
 
-                    // Shifting check
-                    if (zeroCount)
-                    {
-                        // Correct textid but some zeros leading, so move it forward.
-                        be->textid[j-zeroCount] = be->textid[j];
-                        be->textid[j] = 0;
-                    }
-                }
-            }
-        }
+    for (WaypointPathMap::const_iterator pmItr = m_pathTemplateMap.begin(); pmItr != m_pathTemplateMap.end(); ++pmItr)
+    {
+        for (WaypointPath::const_iterator pItr = pmItr->second.begin(); pItr != pmItr->second.end(); ++pItr)
+            if (pItr->second.behavior)
+                CheckWPText(false, pmItr->first, pItr->first, pItr->second.behavior, ids);
     }
 }
diff --git a/src/game/WaypointManager.h b/src/game/WaypointManager.h
index 34cda88fa5b..85a786d964a 100644
--- a/src/game/WaypointManager.h
+++ b/src/game/WaypointManager.h
@@ -36,7 +36,7 @@ struct WaypointBehavior
 
     bool isEmpty();
     WaypointBehavior() {}
-    WaypointBehavior(const WaypointBehavior &b);
+    WaypointBehavior(const WaypointBehavior& b);
 };
 
 struct WaypointNode
@@ -47,13 +47,13 @@ struct WaypointNode
     float orientation;
     uint32 delay;
     uint32 script_id;                                       // Added may 2010. WaypointBehavior w/DB data should in time be removed.
-    WaypointBehavior * behavior;
+    WaypointBehavior* behavior;
     WaypointNode() : x(0.0f), y(0.0f), z(0.0f), orientation(0.0f), delay(0), script_id(0), behavior(NULL) {}
-    WaypointNode(float _x, float _y, float _z, float _o, uint32 _delay, uint32 _script_id, WaypointBehavior * _behavior)
-      : x(_x), y(_y), z(_z), orientation(_o), delay(_delay), script_id(_script_id), behavior(_behavior) {}
+    WaypointNode(float _x, float _y, float _z, float _o, uint32 _delay, uint32 _script_id, WaypointBehavior* _behavior)
+        : x(_x), y(_y), z(_z), orientation(_o), delay(_delay), script_id(_script_id), behavior(_behavior) {}
 };
 
-typedef std::vector<WaypointNode> WaypointPath;
+typedef std::map<uint32 /*pointId*/, WaypointNode> WaypointPath;
 
 class WaypointManager
 {
@@ -64,17 +64,15 @@ class WaypointManager
         void Load();
         void Unload();
 
-        void Cleanup();
-
-        WaypointPath *GetPath(uint32 id)
+        WaypointPath* GetPath(uint32 id)
         {
             WaypointPathMap::iterator itr = m_pathMap.find(id);
             return itr != m_pathMap.end() ? &itr->second : NULL;
         }
 
-        WaypointPath *GetPathTemplate(uint32 entry)
+        WaypointPath* GetPathTemplate(uint32 entry)
         {
-            WaypointPathTemplateMap::iterator itr = m_pathTemplateMap.find(entry);
+            WaypointPathMap::iterator itr = m_pathTemplateMap.find(entry);
             return itr != m_pathTemplateMap.end() ? &itr->second : NULL;
         }
 
@@ -84,17 +82,16 @@ class WaypointManager
         void DeleteNode(uint32 id, uint32 point);
         void DeletePath(uint32 id);
         void SetNodePosition(uint32 id, uint32 point, float x, float y, float z);
-        void SetNodeText(uint32 id, uint32 point, const char *text_field, const char *text);
+        void SetNodeText(uint32 id, uint32 point, const char* text_field, const char* text);
         void CheckTextsExistance(std::set<int32>& ids);
 
     private:
         void _addNode(uint32 id, uint32 point, float x, float y, float z, float o, uint32 delay, uint32 wpGuid);
-        void _clearPath(WaypointPath &path);
+        void _clearPath(WaypointPath& path);
 
-        typedef UNORDERED_MAP<uint32, WaypointPath> WaypointPathMap;
+        typedef UNORDERED_MAP<uint32 /*guidOrEntry*/, WaypointPath> WaypointPathMap;
         WaypointPathMap m_pathMap;
-        typedef UNORDERED_MAP<uint32, WaypointPath> WaypointPathTemplateMap;
-        WaypointPathTemplateMap m_pathTemplateMap;
+        WaypointPathMap m_pathTemplateMap;
 };
 
 #define sWaypointMgr MaNGOS::Singleton<WaypointManager>::Instance()
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
deleted file mode 100644
index fb3012aac31..00000000000
--- a/src/game/WaypointMovementGenerator.cpp
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/*
-creature_movement Table
-
-alter table creature_movement add `textid1` int(11) NOT NULL default '0';
-alter table creature_movement add `textid2` int(11) NOT NULL default '0';
-alter table creature_movement add `textid3` int(11) NOT NULL default '0';
-alter table creature_movement add `textid4` int(11) NOT NULL default '0';
-alter table creature_movement add `textid5` int(11) NOT NULL default '0';
-alter table creature_movement add `emote` int(10) unsigned default '0';
-alter table creature_movement add `spell` int(5) unsigned default '0';
-alter table creature_movement add `wpguid` int(11) default '0';
-
-*/
-
-#include <ctime>
-
-#include "WaypointMovementGenerator.h"
-#include "ObjectMgr.h"
-#include "Creature.h"
-#include "CreatureAI.h"
-#include "WaypointManager.h"
-#include "WorldPacket.h"
-#include "ScriptMgr.h"
-#include "movement/MoveSplineInit.h"
-#include "movement/MoveSpline.h"
-
-#include <cassert>
-
-//-----------------------------------------------//
-void WaypointMovementGenerator<Creature>::LoadPath(Creature &creature)
-{
-    DETAIL_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "LoadPath: loading waypoint path for %s", creature.GetGuidStr().c_str());
-
-    i_path = sWaypointMgr.GetPath(creature.GetGUIDLow());
-
-    // We may LoadPath() for several occasions:
-
-    // 1: When creature.MovementType=2
-    //    1a) Path is selected by creature.guid == creature_movement.id
-    //    1b) Path for 1a) does not exist and then use path from creature.GetEntry() == creature_movement_template.entry
-
-    // 2: When creature_template.MovementType=2
-    //    2a) Creature is summoned and has creature_template.MovementType=2
-    //        Creators need to be sure that creature_movement_template is always valid for summons.
-    //        Mob that can be summoned anywhere should not have creature_movement_template for example.
-
-    // No movement found for guid
-    if (!i_path)
-    {
-        i_path = sWaypointMgr.GetPathTemplate(creature.GetEntry());
-
-        // No movement found for entry
-        if (!i_path)
-        {
-            sLog.outErrorDb("WaypointMovementGenerator::LoadPath: creature %s (Entry: %u GUID: %u) doesn't have waypoint path",
-                creature.GetName(), creature.GetEntry(), creature.GetGUIDLow());
-            return;
-        }
-    }
-
-    StartMoveNow(creature);
-}
-
-void WaypointMovementGenerator<Creature>::Initialize(Creature &creature)
-{
-    LoadPath(creature);
-    creature.addUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-}
-
-void WaypointMovementGenerator<Creature>::Finalize(Creature &creature)
-{
-    creature.clearUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-    creature.SetWalk(false);
-}
-
-void WaypointMovementGenerator<Creature>::Interrupt(Creature &creature)
-{
-    creature.clearUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-    creature.SetWalk(false);
-}
-
-void WaypointMovementGenerator<Creature>::Reset(Creature &creature)
-{
-    creature.addUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
-    StartMoveNow(creature);
-}
-
-void WaypointMovementGenerator<Creature>::OnArrived(Creature& creature)
-{
-    if (!i_path || i_path->empty())
-        return;
-
-    if (m_isArrivalDone)
-        return;
-
-    creature.clearUnitState(UNIT_STAT_ROAMING_MOVE);
-    m_isArrivalDone = true;
-
-    if (i_path->at(i_currentNode).script_id)
-    {
-        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Creature movement start script %u at point %u for %s.", i_path->at(i_currentNode).script_id, i_currentNode, creature.GetGuidStr().c_str());
-        creature.GetMap()->ScriptsStart(sCreatureMovementScripts, i_path->at(i_currentNode).script_id, &creature, &creature);
-    }
-
-    // We have reached the destination and can process behavior
-    if (WaypointBehavior *behavior = i_path->at(i_currentNode).behavior)
-    {
-        if (behavior->emote != 0)
-            creature.HandleEmote(behavior->emote);
-
-        if (behavior->spell != 0)
-            creature.CastSpell(&creature, behavior->spell, false);
-
-        if (behavior->model1 != 0)
-            creature.SetDisplayId(behavior->model1);
-
-        if (behavior->textid[0])
-        {
-            // Not only one text is set
-            if (behavior->textid[1])
-            {
-                // Select one from max 5 texts (0 and 1 already checked)
-                int i = 2;
-                for(; i < MAX_WAYPOINT_TEXT; ++i)
-                {
-                    if (!behavior->textid[i])
-                        break;
-                }
-
-                creature.MonsterSay(behavior->textid[rand() % i], LANG_UNIVERSAL);
-            }
-            else
-                creature.MonsterSay(behavior->textid[0], LANG_UNIVERSAL);
-        }
-    }
-
-    // Inform script
-    MovementInform(creature);
-    Stop(i_path->at(i_currentNode).delay);
-}
-
-void WaypointMovementGenerator<Creature>::StartMove(Creature &creature)
-{
-    if (!i_path || i_path->empty())
-        return;
-
-    if (Stopped())
-        return;
-
-    if (WaypointBehavior *behavior = i_path->at(i_currentNode).behavior)
-    {
-        if (behavior->model2 != 0)
-            creature.SetDisplayId(behavior->model2);
-        creature.SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
-    }
-
-    if (m_isArrivalDone)
-        i_currentNode = (i_currentNode+1) % i_path->size();
-
-    m_isArrivalDone = false;
-
-    creature.addUnitState(UNIT_STAT_ROAMING_MOVE);
-
-    const WaypointNode &node = i_path->at(i_currentNode);
-    Movement::MoveSplineInit init(creature);
-    init.MoveTo(node.x, node.y, node.z, true);
-
-    if (node.orientation != 100 && node.delay != 0)
-        init.SetFacing(node.orientation);
-    init.SetWalk(!creature.IsLevitating());
-    init.Launch();
-}
-
-bool WaypointMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff)
-{
-    // Waypoint movement can be switched on/off
-    // This is quite handy for escort quests and other stuff
-    if (creature.hasUnitState(UNIT_STAT_NOT_MOVE))
-    {
-        creature.clearUnitState(UNIT_STAT_ROAMING_MOVE);
-        return true;
-    }
-
-    // prevent a crash at empty waypoint path.
-    if (!i_path || i_path->empty())
-    {
-        creature.clearUnitState(UNIT_STAT_ROAMING_MOVE);
-        return true;
-    }
-
-    if (Stopped())
-    {
-        if (CanMove(diff))
-            StartMove(creature);
-    }
-    else
-    {
-        if (creature.IsStopped())
-            Stop(STOP_TIME_FOR_PLAYER);
-        else if (creature.movespline->Finalized())
-        {
-            OnArrived(creature);
-            StartMove(creature);
-        }
-    }
-    return true;
-}
-
-void WaypointMovementGenerator<Creature>::MovementInform(Creature &creature)
-{
-    if (creature.AI())
-        creature.AI()->MovementInform(WAYPOINT_MOTION_TYPE, i_currentNode);
-}
-
-bool WaypointMovementGenerator<Creature>::GetResetPosition(Creature&, float& x, float& y, float& z)
-{
-    // prevent a crash at empty waypoint path.
-    if (!i_path || i_path->empty())
-        return false;
-
-    const WaypointNode& node = i_path->at(i_currentNode);
-    x = node.x; y = node.y; z = node.z;
-    return true;
-}
-
-//----------------------------------------------------//
-uint32 FlightPathMovementGenerator::GetPathAtMapEnd() const
-{
-    if (i_currentNode >= i_path->size())
-        return i_path->size();
-
-    uint32 curMapId = (*i_path)[i_currentNode].mapid;
-
-    for(uint32 i = i_currentNode; i < i_path->size(); ++i)
-    {
-        if ((*i_path)[i].mapid != curMapId)
-            return i;
-    }
-
-    return i_path->size();
-}
-
-void FlightPathMovementGenerator::Initialize(Player &player)
-{
-    Reset(player);
-}
-
-void FlightPathMovementGenerator::Finalize(Player & player)
-{
-    // remove flag to prevent send object build movement packets for flight state and crash (movement generator already not at top of stack)
-    player.clearUnitState(UNIT_STAT_TAXI_FLIGHT);
-
-    player.Unmount();
-    player.RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT);
-
-    if(player.m_taxi.empty())
-    {
-        player.getHostileRefManager().setOnlineOfflineState(true);
-        if(player.pvpInfo.inHostileArea)
-            player.CastSpell(&player, 2479, true);
-
-        // update z position to ground and orientation for landing point
-        // this prevent cheating with landing  point at lags
-        // when client side flight end early in comparison server side
-        player.StopMoving();
-    }
-}
-
-void FlightPathMovementGenerator::Interrupt(Player & player)
-{
-    player.clearUnitState(UNIT_STAT_TAXI_FLIGHT);
-}
-
-#define PLAYER_FLIGHT_SPEED        32.0f
-
-void FlightPathMovementGenerator::Reset(Player & player)
-{
-    player.getHostileRefManager().setOnlineOfflineState(false);
-    player.addUnitState(UNIT_STAT_TAXI_FLIGHT);
-    player.SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT);
-
-    Movement::MoveSplineInit init(player);
-    uint32 end = GetPathAtMapEnd();
-    for (uint32 i = GetCurrentNode(); i != end; ++i)
-    {
-        G3D::Vector3 vertice((*i_path)[i].x,(*i_path)[i].y,(*i_path)[i].z);
-        init.Path().push_back(vertice);
-    }
-    init.SetFirstPointId(GetCurrentNode());
-    init.SetFly();
-    init.SetVelocity(PLAYER_FLIGHT_SPEED);
-    init.Launch();
-}
-
-bool FlightPathMovementGenerator::Update(Player &player, const uint32 &diff)
-{
-    uint32 pointId = (uint32)player.movespline->currentPathIdx();
-    if (pointId > i_currentNode)
-    {
-        bool departureEvent = true;
-        do
-        {
-            DoEventIfAny(player,(*i_path)[i_currentNode],departureEvent);
-            if (pointId == i_currentNode)
-                break;
-            i_currentNode += (uint32)departureEvent;
-            departureEvent = !departureEvent;
-        } while(true);
-    }
-
-    return i_currentNode < (i_path->size()-1);
-}
-
-void FlightPathMovementGenerator::SetCurrentNodeAfterTeleport()
-{
-    if (i_path->empty())
-        return;
-
-    uint32 map0 = (*i_path)[0].mapid;
-
-    for (size_t i = 1; i < i_path->size(); ++i)
-    {
-        if ((*i_path)[i].mapid != map0)
-        {
-            i_currentNode = i;
-            return;
-        }
-    }
-}
-
-void FlightPathMovementGenerator::DoEventIfAny(Player& player, TaxiPathNodeEntry const& node, bool departure)
-{
-    if (uint32 eventid = departure ? node.departureEventID : node.arrivalEventID)
-    {
-        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Taxi %s event %u of node %u of path %u for player %s", departure ? "departure" : "arrival", eventid, node.index, node.path, player.GetName());
-
-        if (!sScriptMgr.OnProcessEvent(eventid, &player, &player, departure))
-            player.GetMap()->ScriptsStart(sEventScripts, eventid, &player, &player);
-    }
-}
-
-bool FlightPathMovementGenerator::GetResetPosition(Player&, float& x, float& y, float& z)
-{
-    const TaxiPathNodeEntry& node = (*i_path)[i_currentNode];
-    x = node.x; y = node.y; z = node.z;
-    return true;
-}
diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h
deleted file mode 100644
index 27541ea12d5..00000000000
--- a/src/game/WaypointMovementGenerator.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef MANGOS_WAYPOINTMOVEMENTGENERATOR_H
-#define MANGOS_WAYPOINTMOVEMENTGENERATOR_H
-
-/** @page PathMovementGenerator is used to generate movements
- * of waypoints and flight paths.  Each serves the purpose
- * of generate activities so that it generates updated
- * packets for the players.
- */
-
-#include "MovementGenerator.h"
-#include "WaypointManager.h"
-
-#include "Player.h"
-
-#include <vector>
-#include <set>
-
-#define FLIGHT_TRAVEL_UPDATE  100
-#define STOP_TIME_FOR_PLAYER  3 * MINUTE * IN_MILLISECONDS  // 3 Minutes
-
-template<class T, class P>
-class MANGOS_DLL_SPEC PathMovementBase
-{
-    public:
-        PathMovementBase() : i_currentNode(0) {}
-        virtual ~PathMovementBase() {};
-
-        // template pattern, not defined .. override required
-        void LoadPath(T &);
-        uint32 GetCurrentNode() const { return i_currentNode; }
-
-    protected:
-        P i_path;
-        uint32 i_currentNode;
-};
-
-/** WaypointMovementGenerator loads a series of way points
- * from the DB and apply it to the creature's movement generator.
- * Hence, the creature will move according to its predefined way points.
- */
-
-template<class T>
-class MANGOS_DLL_SPEC WaypointMovementGenerator;
-
-template<>
-class MANGOS_DLL_SPEC WaypointMovementGenerator<Creature>
-: public MovementGeneratorMedium< Creature, WaypointMovementGenerator<Creature> >,
-public PathMovementBase<Creature, WaypointPath const*>
-{
-    public:
-        WaypointMovementGenerator(Creature &) : i_nextMoveTime(0), m_isArrivalDone(false) {}
-        ~WaypointMovementGenerator() { i_path = NULL; }
-        void Initialize(Creature &u);
-        void Interrupt(Creature &);
-        void Finalize(Creature &);
-        void Reset(Creature &u);
-        bool Update(Creature &u, const uint32 &diff);
-
-        void MovementInform(Creature &);
-
-        MovementGeneratorType GetMovementGeneratorType() const { return WAYPOINT_MOTION_TYPE; }
-
-        // now path movement implmementation
-        void LoadPath(Creature &c);
-
-        bool GetResetPosition(Creature&, float& x, float& y, float& z);
-
-    private:
-
-        void Stop(int32 time) { i_nextMoveTime.Reset(time);}
-
-        bool Stopped() { return !i_nextMoveTime.Passed();}
-
-        bool CanMove(int32 diff)
-        {
-            i_nextMoveTime.Update(diff);
-            return i_nextMoveTime.Passed();
-        }
-
-        void OnArrived(Creature&);
-        void StartMove(Creature&);
-
-        void StartMoveNow(Creature& creature)
-        {
-            i_nextMoveTime.Reset(0);
-            StartMove(creature);
-        }
-
-        ShortTimeTracker i_nextMoveTime;
-        bool m_isArrivalDone;
-};
-
-/** FlightPathMovementGenerator generates movement of the player for the paths
- * and hence generates ground and activities for the player.
- */
-class MANGOS_DLL_SPEC FlightPathMovementGenerator
-: public MovementGeneratorMedium< Player, FlightPathMovementGenerator >,
-public PathMovementBase<Player,TaxiPathNodeList const*>
-{
-    public:
-        explicit FlightPathMovementGenerator(TaxiPathNodeList const& pathnodes, uint32 startNode = 0)
-        {
-            i_path = &pathnodes;
-            i_currentNode = startNode;
-        }
-        void Initialize(Player &);
-        void Finalize(Player &);
-        void Interrupt(Player &);
-        void Reset(Player &);
-        bool Update(Player &, const uint32 &);
-        MovementGeneratorType GetMovementGeneratorType() const { return FLIGHT_MOTION_TYPE; }
-
-        TaxiPathNodeList const& GetPath() { return *i_path; }
-        uint32 GetPathAtMapEnd() const;
-        bool HasArrived() const { return (i_currentNode >= i_path->size()); }
-        void SetCurrentNodeAfterTeleport();
-        void SkipCurrentNode() { ++i_currentNode; }
-        void DoEventIfAny(Player& player, TaxiPathNodeEntry const& node, bool departure);
-        bool GetResetPosition(Player&, float& x, float& y, float& z);
-};
-#endif
diff --git a/src/game/World.cpp b/src/game/World.cpp
index db9d33ca27f..285a8843b79 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -27,12 +27,11 @@
 #include "SystemConfig.h"
 #include "Log.h"
 #include "Opcodes.h"
+#include "ChatLog.h"
 #include "WorldSession.h"
 #include "WorldPacket.h"
 #include "Weather.h"
 #include "Player.h"
-#include "SkillExtraItems.h"
-#include "SkillDiscovery.h"
 #include "AccountMgr.h"
 #include "AchievementMgr.h"
 #include "AuctionHouseMgr.h"
@@ -46,10 +45,13 @@
 #include "LootMgr.h"
 #include "ItemEnchantmentMgr.h"
 #include "MapManager.h"
+#include "Group.h"
 #include "ScriptMgr.h"
 #include "CreatureAIRegistry.h"
-#include "Policies/SingletonImp.h"
-#include "BattleGroundMgr.h"
+#include "Policies/Singleton.h"
+#include "BattleGround/BattleGroundMgr.h"
+#include "Language.h"
+#include "OutdoorPvP/OutdoorPvP.h"
 #include "TemporarySummon.h"
 #include "VMapFactory.h"
 #include "MoveMap.h"
@@ -64,13 +66,19 @@
 #include "Util.h"
 #include "AuctionHouseBot/AuctionHouseBot.h"
 #include "CharacterDatabaseCleaner.h"
+#include "Calendar.h"
 #include "CreatureLinkingMgr.h"
+#include "LFGMgr.h"
+#include "warden/WardenDataStorage.h"
+#include "ahbot/AhBot.h"
+#include "playerbot/PlayerbotAIConfig.h"
+#include "playerbot/RandomPlayerbotMgr.h"
 
 INSTANTIATE_SINGLETON_1( World );
 
-volatile bool World::m_stopEvent = false;
+ACE_Atomic_Op<MANGOSR2_MUTEX_MODEL_2, bool> World::m_stopEvent = false;
 uint8 World::m_ExitCode = SHUTDOWN_EXIT_CODE;
-volatile uint32 World::m_worldLoopCounter = 0;
+ACE_Atomic_Op<MANGOSR2_MUTEX_MODEL_2, uint32> World::m_worldLoopCounter = 0;
 
 float World::m_MaxVisibleDistanceOnContinents = DEFAULT_VISIBILITY_DISTANCE;
 float World::m_MaxVisibleDistanceInInstances  = DEFAULT_VISIBILITY_INSTANCE;
@@ -80,7 +88,7 @@ float World::m_MaxVisibleDistanceInFlight     = DEFAULT_VISIBILITY_DISTANCE;
 float World::m_VisibleUnitGreyDistance        = 0;
 float World::m_VisibleObjectGreyDistance      = 0;
 
-float  World::m_relocation_lower_limit_sq     = 10.f * 10.f;
+float  World::m_relocation_lower_limit        = 10.0f;
 uint32 World::m_relocation_ai_notify_delay    = 1000u;
 
 /// World constructor
@@ -140,6 +148,14 @@ World::~World()
     //TODO free addSessQueue
 }
 
+/// Cleanups before world stop
+void World::CleanupsBeforeStop()
+{
+    KickAll();                                       // save and kick all players
+    UpdateSessions(1);                               // real players unload required UpdateSessions call
+    sBattleGroundMgr.DeleteAllBattleGrounds();       // unload battleground templates before different singletons destroyed
+}
+
 /// Find a player in a specified zone
 Player* World::FindPlayerInZone(uint32 zone)
 {
@@ -152,7 +168,7 @@ Player* World::FindPlayerInZone(uint32 zone)
         Player *player = itr->second->GetPlayer();
         if(!player)
             continue;
-        if( player->IsInWorld() && player->GetZoneId() == zone )
+        if ( player->IsInWorld() && player->GetZoneId() == zone )
         {
             // Used by the weather system. We return the player to broadcast the change weather message to him and all players in the zone.
             return player;
@@ -166,7 +182,7 @@ WorldSession* World::FindSession(uint32 id) const
 {
     SessionMap::const_iterator itr = m_sessions.find(id);
 
-    if(itr != m_sessions.end())
+    if (itr != m_sessions.end())
         return itr->second;                                 // also can return NULL for kicked session
     else
         return NULL;
@@ -178,7 +194,7 @@ bool World::RemoveSession(uint32 id)
     ///- Find the session, kick the user, but we can't delete session at this moment to prevent iterator invalidation
     SessionMap::const_iterator itr = m_sessions.find(id);
 
-    if(itr != m_sessions.end() && itr->second)
+    if (itr != m_sessions.end() && itr->second)
     {
         if (itr->second->PlayerLoading())
             return false;
@@ -217,10 +233,10 @@ World::AddSession_ (WorldSession* s)
     {
         SessionMap::const_iterator old = m_sessions.find(s->GetAccountId ());
 
-        if(old != m_sessions.end())
+        if (old != m_sessions.end())
         {
             // prevent decrease sessions count if session queued
-            if(RemoveQueuedSession(old->second))
+            if (RemoveQueuedSession(old->second))
                 decrease_session = false;
             // not remove replaced session form queue if listed
             delete old->second;
@@ -235,7 +251,7 @@ World::AddSession_ (WorldSession* s)
 
     //so we don't count the user trying to
     //login as a session and queue the socket that we are using
-    if(decrease_session)
+    if (decrease_session)
         --Sessions;
 
     if (pLimit > 0 && Sessions >= pLimit && s->GetSecurity () == SEC_PLAYER )
@@ -274,7 +290,7 @@ World::AddSession_ (WorldSession* s)
         static SqlStatementID id;
 
         SqlStatement stmt = LoginDatabase.CreateStatement(id, "UPDATE realmlist SET population = ? WHERE id = ?");
-        stmt.PExecute(popu, realmID);
+        stmt.PExecute(popu, getConfig(CONFIG_UINT32_REALMID));
 
         DETAIL_LOG("Server Population (%f).", popu);
     }
@@ -338,7 +354,7 @@ bool World::RemoveQueuedSession(WorldSession* sess)
         --sessions;
 
     // accept first in queue
-    if( (!m_playerLimit || (int32)sessions < m_playerLimit) && !m_QueuedSessions.empty() )
+    if ( (!m_playerLimit || (int32)sessions < m_playerLimit) && !m_QueuedSessions.empty() )
     {
         WorldSession* pop_sess = m_QueuedSessions.front();
         pop_sess->SetInQueue(false);
@@ -372,7 +388,7 @@ Weather* World::FindWeather(uint32 id) const
 {
     WeatherMap::const_iterator itr = m_weathers.find(id);
 
-    if(itr != m_weathers.end())
+    if (itr != m_weathers.end())
         return itr->second;
     else
         return 0;
@@ -384,7 +400,7 @@ void World::RemoveWeather(uint32 id)
     // not called at the moment. Kept for completeness
     WeatherMap::iterator itr = m_weathers.find(id);
 
-    if(itr != m_weathers.end())
+    if (itr != m_weathers.end())
     {
         delete itr->second;
         m_weathers.erase(itr);
@@ -442,9 +458,32 @@ void World::LoadConfigSettings(bool reload)
         }
     }
 
+    // Set Realm ID from config
+    setConfig(CONFIG_UINT32_REALMID, "RealmID",0);
+    MANGOS_ASSERT(getConfig(CONFIG_UINT32_REALMID) != 0);
+
     ///- Read the player limit and the Message of the day from the config file
     SetPlayerLimit( sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT), true );
-    SetMotd( sConfig.GetStringDefault("Motd", "Welcome to the Massive Network Game Object Server." ) );
+    SetMotd( sConfig.GetStringDefault("Motd", "Welcome to the MangosR2 game server." ) );
+
+    // VMSS system
+    setConfig(CONFIG_BOOL_VMSS_ENABLE,                "VMSS.Enable", false);
+#ifdef MANGOSR2_SINGLE_THREAD
+    if (getConfig(CONFIG_BOOL_VMSS_ENABLE))
+    {
+        sLog.outError(" Your OS (%s) not support VMSS! resetted to off", MANGOSR2_SINGLE_THREAD);
+        setConfig(CONFIG_BOOL_VMSS_ENABLE, "fakeString", false);
+    }
+#endif
+
+    setConfig(CONFIG_UINT32_VMSS_MAXTHREADBREAKS,     "VMSS.MaxThreadBreaks",3);
+    setConfig(CONFIG_UINT32_VMSS_TBREMTIME,           "VMSS.ThreadBreakRememberTime",3600);
+    setConfig(CONFIG_UINT32_VMSS_MAPFREEMETHOD,       "VMSS.MapFreeMethod",1);
+    setConfig(CONFIG_UINT32_VMSS_FREEZECHECKPERIOD,   "VMSS.FreezeCheckPeriod",1000);
+    setConfig(CONFIG_UINT32_VMSS_FREEZEDETECTTIME,    "VMSS.MapFreezeDetectTime",2000);
+    setConfig(CONFIG_UINT32_VMSS_FORCEUNLOADDELAY,    "VMSS.ForceUnloadDelay",3000);
+    setConfig(CONFIG_BOOL_VMSS_TRYSKIPFIRST,          "VMSS.TrySkipFirstThreadBreak", false);
+    setConfig(CONFIG_BOOL_VMSS_CONTINENTS_SKIP,       "VMSS.ContinentsSkip", true);
 
     ///- Read all rates from the config file
     setConfigPos(CONFIG_FLOAT_RATE_HEALTH, "Rate.Health", 1.0f);
@@ -466,6 +505,7 @@ void World::LoadConfigSettings(bool reload)
     setConfigPos(CONFIG_FLOAT_RATE_DROP_ITEM_REFERENCED, "Rate.Drop.Item.Referenced", 1.0f);
     setConfigPos(CONFIG_FLOAT_RATE_DROP_MONEY,           "Rate.Drop.Money", 1.0f);
     setConfig(CONFIG_FLOAT_RATE_XP_KILL,    "Rate.XP.Kill",    1.0f);
+    setConfig(CONFIG_FLOAT_RATE_XP_PETKILL, "Rate.XP.PetKill", 1.0f);
     setConfig(CONFIG_FLOAT_RATE_XP_QUEST,   "Rate.XP.Quest",   1.0f);
     setConfig(CONFIG_FLOAT_RATE_XP_EXPLORE, "Rate.XP.Explore", 1.0f);
     setConfig(CONFIG_FLOAT_RATE_REPUTATION_GAIN,           "Rate.Reputation.Gain", 1.0f);
@@ -487,6 +527,7 @@ void World::LoadConfigSettings(bool reload)
     setConfigPos(CONFIG_FLOAT_RATE_CREATURE_ELITE_WORLDBOSS_SPELLDAMAGE, "Rate.Creature.Elite.WORLDBOSS.SpellDamage", 1.0f);
     setConfigPos(CONFIG_FLOAT_RATE_CREATURE_ELITE_RARE_SPELLDAMAGE,      "Rate.Creature.Elite.RARE.SpellDamage", 1.0f);
     setConfigPos(CONFIG_FLOAT_RATE_CREATURE_AGGRO, "Rate.Creature.Aggro", 1.0f);
+    setConfigPos(CONFIG_FLOAT_RATE_CREATURE_AGGRO_IN_INSTANCE, "Rate.Creature.Aggro.Instance", 1.0f);
     setConfig(CONFIG_FLOAT_RATE_REST_INGAME,                    "Rate.Rest.InGame", 1.0f);
     setConfig(CONFIG_FLOAT_RATE_REST_OFFLINE_IN_TAVERN_OR_CITY, "Rate.Rest.Offline.InTavernOrCity", 1.0f);
     setConfig(CONFIG_FLOAT_RATE_REST_OFFLINE_IN_WILDERNESS,     "Rate.Rest.Offline.InWilderness", 1.0f);
@@ -521,6 +562,13 @@ void World::LoadConfigSettings(bool reload)
     setConfigPos(CONFIG_FLOAT_CREATURE_FAMILY_FLEE_ASSISTANCE_RADIUS, "CreatureFamilyFleeAssistanceRadius", 30.0f);
 
     ///- Read other configuration items from the config file
+
+    // Anticheat
+    setConfig(CONFIG_BOOL_ANTICHEAT_ENABLE,              "Anticheat.Enable", false);
+    setConfig(CONFIG_UINT32_ANTICHEAT_ACTION_DELAY,   "Anticheat.DelayAfterAction",30);
+    setConfig(CONFIG_UINT32_ANTICHEAT_GMLEVEL,        "Anticheat.GmLevel",0);
+    setConfig(CONFIG_BOOL_ANTICHEAT_WARDEN,              "Anticheat.Warden", false);
+
     setConfigMinMax(CONFIG_UINT32_COMPRESSION, "Compression", 1, 1, 9);
     setConfig(CONFIG_BOOL_ADDON_CHANNEL, "AddonChannel", true);
     setConfig(CONFIG_BOOL_CLEAN_CHARACTER_DB, "CleanCharacterDB", true);
@@ -530,13 +578,32 @@ void World::LoadConfigSettings(bool reload)
     setConfig(CONFIG_BOOL_STATS_SAVE_ONLY_ON_LOGOUT, "PlayerSave.Stats.SaveOnlyOnLogout", true);
 
     setConfigMin(CONFIG_UINT32_INTERVAL_GRIDCLEAN, "GridCleanUpDelay", 5 * MINUTE * IN_MILLISECONDS, MIN_GRID_DELAY);
-    if (reload)
-        sMapMgr.SetGridCleanUpDelay(getConfig(CONFIG_UINT32_INTERVAL_GRIDCLEAN));
+
+    setConfig(CONFIG_UINT32_NUMTHREADS, "MapUpdate.Threads", 3);
+    setConfig(CONFIG_BOOL_THREADS_DYNAMIC,"MapUpdate.DynamicThreadsCount", false);
+
+#ifdef MANGOSR2_SINGLE_THREAD
+    if (getConfig(CONFIG_UINT32_NUMTHREADS) > 1)
+    {
+        sLog.outError(" Your OS (%s) not support set MapUpdate.Threads > 1! Resetted to 1", MANGOSR2_SINGLE_THREAD);
+        setConfig(CONFIG_UINT32_NUMTHREADS, "fakeString", 1);
+    }
+#endif
+
+    setConfigMinMax(CONFIG_FLOAT_LOADBALANCE_HIGHVALUE, "MapUpdate.LoadBalanceHighValue", 0.8f, 0.5f, 1.0f);
+    setConfigMinMax(CONFIG_FLOAT_LOADBALANCE_LOWVALUE, "MapUpdate.LoadBalanceLowValue", 0.2f, 0.0f, 0.5f);
 
     setConfigMin(CONFIG_UINT32_INTERVAL_MAPUPDATE, "MapUpdateInterval", 100, MIN_MAP_UPDATE_DELAY);
     if (reload)
         sMapMgr.SetMapUpdateInterval(getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE));
 
+    setConfigMinMax(CONFIG_UINT32_MAPUPDATE_MAXVISITORS, "MapUpdate.MaxVisitorsInUpdate", 9, 1, 50);
+    setConfigMinMax(CONFIG_UINT32_MAPUPDATE_MAXVISITS, "MapUpdate.MaxVisitsInUpdate", 20, 10, 100);
+
+    setConfigMinMax(CONFIG_UINT32_POSITION_UPDATE_DELAY, "MapUpdate.PositionUpdateDelay", 400, 100, 2000);
+
+    setConfigMinMax(CONFIG_UINT32_OBJECTLOADINGSPLITTER_ALLOWEDTIME, "ObjectLoadingSplitter.MaxAllowedTime", 10, 5, 1000);
+
     setConfig(CONFIG_UINT32_INTERVAL_CHANGEWEATHER, "ChangeWeatherInterval", 10 * MINUTE * IN_MILLISECONDS);
 
     if (configNoReload(reload, CONFIG_UINT32_PORT_WORLD, "WorldServerPort", DEFAULT_WORLDSERVER_PORT))
@@ -555,6 +622,7 @@ void World::LoadConfigSettings(bool reload)
     setConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GUILD,   "AllowTwoSide.Interaction.Guild", false);
     setConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_AUCTION, "AllowTwoSide.Interaction.Auction", false);
     setConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_MAIL,    "AllowTwoSide.Interaction.Mail", false);
+    setConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CALENDAR,"AllowTwoSide.Interaction.Calendar", false);
     setConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_WHO_LIST,            "AllowTwoSide.WhoList", false);
     setConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_ADD_FRIEND,          "AllowTwoSide.AddFriend", false);
 
@@ -585,27 +653,81 @@ void World::LoadConfigSettings(bool reload)
     setConfigMinMax(CONFIG_UINT32_START_PLAYER_LEVEL, "StartPlayerLevel", 1, 1, getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL));
     setConfigMinMax(CONFIG_UINT32_START_HEROIC_PLAYER_LEVEL, "StartHeroicPlayerLevel", 55, 1, getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL));
 
+    setConfigMinMax(CONFIG_UINT32_RAF_MAXGRANTLEVEL, "RAF.MaxGrantLevel", 60, 1, 80);
+    setConfigMinMax(CONFIG_UINT32_RAF_MAXREFERALS, "RAF.MaxReferals", 5, 0, 15);
+    setConfigMinMax(CONFIG_UINT32_RAF_MAXREFERERS, "RAF.MaxReferers", 5, 0, 15);
+    setConfig(CONFIG_FLOAT_RATE_RAF_XP, "Rate.RAF.XP", 3.0f);
+    setConfig(CONFIG_FLOAT_RATE_RAF_LEVELPERLEVEL, "Rate.RAF.XP", 0.5f);
+
+    setConfig(CONFIG_BOOL_PLAYERBOT_DISABLE, "PlayerbotAI.DisableBots",true);
+    setConfig(CONFIG_BOOL_PLAYERBOT_DEBUGWHISPER, "PlayerbotAI.DebugWhisper",false);
+    setConfigMinMax(CONFIG_UINT32_PLAYERBOT_MAXBOTS, "PlayerbotAI.MaxNumBots", 3, 1, 9);
+    setConfigMinMax(CONFIG_UINT32_PLAYERBOT_RESTRICTLEVEL, "PlayerbotAI.RestrictBotLevel", getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL), 1, getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL));
+    setConfigMinMax(CONFIG_UINT32_PLAYERBOT_MINBOTLEVEL, "PlayerbotAI.MinBotLevel", 1, 1, getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL));
+    setConfig(CONFIG_FLOAT_PLAYERBOT_MINDISTANCE, "PlayerbotAI.FollowDistanceMin", 0.5f);
+    setConfig(CONFIG_FLOAT_PLAYERBOT_MAXDISTANCE, "PlayerbotAI.FollowDistanceMax", 1.0f);
+
+    setConfig(CONFIG_BOOL_PLAYERBOT_ALLOW_SUMMON_OPPOSITE_FACTION, "PlayerbotAI.AllowSummonOppositeFaction", false);
+    setConfig(CONFIG_BOOL_PLAYERBOT_COLLECT_COMBAT, "PlayerbotAI.Collect.Combat", true);
+    setConfig(CONFIG_BOOL_PLAYERBOT_COLLECT_QUESTS, "PlayerbotAI.Collect.Quest", true);
+    setConfig(CONFIG_BOOL_PLAYERBOT_COLLECT_PROFESSION, "PlayerbotAI.Collect.Profession", true);
+    setConfig(CONFIG_BOOL_PLAYERBOT_COLLECT_LOOT, "PlayerbotAI.Collect.Loot", true);
+    setConfig(CONFIG_BOOL_PLAYERBOT_COLLECT_SKIN, "PlayerbotAI.Collect.Skin", true);
+    setConfig(CONFIG_BOOL_PLAYERBOT_COLLECT_OBJECTS, "PlayerbotAI.Collect.Objects", true);
+    setConfig(CONFIG_BOOL_PLAYERBOT_SELL_TRASH, "PlayerbotAI.SellGarbage", true);
+
+    setConfig(CONFIG_BOOL_PLAYERBOT_SHAREDBOTS, "PlayerbotAI.SharedBots", true);
+
+    // Dungeon Finder
+    setConfig(CONFIG_BOOL_LFG_ENABLE, "LFG.Enable", false);
+    setConfig(CONFIG_BOOL_LFR_ENABLE, "LFR.Enable", false);
+    setConfig(CONFIG_BOOL_LFG_DEBUG_ENABLE, "LFG.Debug", false);
+    setConfig(CONFIG_BOOL_LFR_EXTEND, "LFR.Extend", false);
+    setConfig(CONFIG_BOOL_LFG_ONLYLASTENCOUNTER, "LFG.OnlyLastEncounterForCompleteDungeon", false);
+    setConfigMinMax(CONFIG_UINT32_LFG_MAXKICKS, "LFG.MaxKicks", 5, 1, 10);
+    std::string disabledMapIdForLFG = sConfig.GetStringDefault("LFG.DisableDungeonMapIds", "");
+    setDisabledMapIdForDungeonFinder(disabledMapIdForLFG.c_str());
+
+
+    setConfig(CONFIG_BOOL_ALLOW_CUSTOM_MAPS, "AllowTransferToCustomMap", false);
+
+    setConfigMinMax(CONFIG_UINT32_GEAR_CALC_BASE, "Player.GSCalculationBase", 190, 1, 384);
+
+    setConfigMinMax(CONFIG_FLOAT_CROWDCONTROL_HP_BASE, "CrowdControlHPBase", 0.1f, 0.0f, 1.0f);
+
+    setConfig(CONFIG_BOOL_RESILIENCE_ALTERNATIVE_CALCULATION, "ResilienceAlternativeCalculation", false);
+
+    setConfig(CONFIG_BOOL_BLINK_ANIMATION_TYPE, "BlinkAnimationType", false);
+
+    setConfig(CONFIG_BOOL_FACTION_AND_RACE_CHANGE_WITHOUT_RENAMING, "FactiomAndRaceChangeWithoutRenaming", false);
+
     setConfigMinMax(CONFIG_UINT32_START_PLAYER_MONEY, "StartPlayerMoney", 0, 0, MAX_MONEY_AMOUNT);
 
     setConfig(CONFIG_UINT32_MAX_HONOR_POINTS, "MaxHonorPoints", 75000);
 
     setConfigMinMax(CONFIG_UINT32_START_HONOR_POINTS, "StartHonorPoints", 0, 0, getConfig(CONFIG_UINT32_MAX_HONOR_POINTS));
 
+    setConfig(CONFIG_BOOL_ALLOW_HONOR_KILLS_TITLES, "AllowHonorKillsTitles", false);
+
     setConfig(CONFIG_UINT32_MAX_ARENA_POINTS, "MaxArenaPoints", 5000);
 
     setConfigMinMax(CONFIG_UINT32_START_ARENA_POINTS, "StartArenaPoints", 0, 0, getConfig(CONFIG_UINT32_MAX_ARENA_POINTS));
 
+
     setConfig(CONFIG_BOOL_ALL_TAXI_PATHS, "AllFlightPaths", false);
 
     setConfig(CONFIG_BOOL_INSTANCE_IGNORE_LEVEL, "Instance.IgnoreLevel", false);
     setConfig(CONFIG_BOOL_INSTANCE_IGNORE_RAID,  "Instance.IgnoreRaid", false);
 
     setConfig(CONFIG_BOOL_CAST_UNSTUCK, "CastUnstuck", true);
-    setConfig(CONFIG_UINT32_MAX_SPELL_CASTS_IN_CHAIN, "MaxSpellCastsInChain", 10);
+    setConfig(CONFIG_UINT32_MAX_SPELL_CASTS_IN_CHAIN, "MaxSpellCastsInChain", 255);
     setConfig(CONFIG_UINT32_BIRTHDAY_TIME, "BirthdayTime", 1125180000);
+    setConfig(CONFIG_UINT32_RABBIT_DAY, "RabbitDay", 0);
 
     setConfig(CONFIG_UINT32_INSTANCE_RESET_TIME_HOUR, "Instance.ResetTimeHour", 4);
-    setConfig(CONFIG_UINT32_INSTANCE_UNLOAD_DELAY,    "Instance.UnloadDelay", 30 * MINUTE * IN_MILLISECONDS);
+    setConfigMin(CONFIG_UINT32_INSTANCE_UNLOAD_DELAY, "Instance.UnloadDelay", 30 * MINUTE * IN_MILLISECONDS, 1);
+
+    setConfig(CONFIG_UINT32_WORLD_STATE_EXPIRETIME,    "WorldState.ExpireTime", WEEK);
 
     setConfigMinMax(CONFIG_UINT32_MAX_PRIMARY_TRADE_SKILL, "MaxPrimaryTradeSkill", 2, 0, 10);
 
@@ -629,19 +751,16 @@ void World::LoadConfigSettings(bool reload)
     setConfig(CONFIG_BOOL_GM_LOWER_SECURITY, "GM.LowerSecurity", false);
     setConfig(CONFIG_BOOL_GM_ALLOW_ACHIEVEMENT_GAINS, "GM.AllowAchievementGain", true);
 
+    setConfig(CONFIG_BOOL_GM_ANNOUNCE_BAN, "GM.AnnounceBan", false);
+
+    setConfig(CONFIG_UINT32_GM_INVISIBLE_AURA, "GM.InvisibleAura", 37800);
+
     setConfig(CONFIG_UINT32_GROUP_VISIBILITY, "Visibility.GroupMode", 0);
 
     setConfig(CONFIG_UINT32_MAIL_DELIVERY_DELAY, "MailDeliveryDelay", HOUR);
 
     setConfigMin(CONFIG_UINT32_MASS_MAILER_SEND_PER_TICK, "MassMailer.SendPerTick", 10, 1);
 
-    setConfig(CONFIG_UINT32_UPTIME_UPDATE, "UpdateUptimeInterval", 10);
-    if (reload)
-    {
-        m_timers[WUPDATE_UPTIME].SetInterval(getConfig(CONFIG_UINT32_UPTIME_UPDATE)*MINUTE*IN_MILLISECONDS);
-        m_timers[WUPDATE_UPTIME].Reset();
-    }
-
     setConfig(CONFIG_UINT32_SKILL_CHANCE_ORANGE, "SkillChance.Orange", 100);
     setConfig(CONFIG_UINT32_SKILL_CHANCE_YELLOW, "SkillChance.Yellow", 75);
     setConfig(CONFIG_UINT32_SKILL_CHANCE_GREEN,  "SkillChance.Green",  25);
@@ -683,12 +802,14 @@ void World::LoadConfigSettings(bool reload)
 
     setConfig(CONFIG_BOOL_EVENT_ANNOUNCE, "Event.Announce", false);
 
+    setConfig(CONFIG_BOOL_AUTOBROADCAST, "AutoBroadcast.On", false);
+    setConfigMinMax(CONFIG_UINT32_AUTOBROADCAST_CENTER, "AutoBroadcast.Center", 0, 0, 2);
+
     setConfig(CONFIG_UINT32_CREATURE_FAMILY_ASSISTANCE_DELAY, "CreatureFamilyAssistanceDelay", 1500);
     setConfig(CONFIG_UINT32_CREATURE_FAMILY_FLEE_DELAY,       "CreatureFamilyFleeDelay",       7000);
 
     setConfig(CONFIG_UINT32_WORLD_BOSS_LEVEL_DIFF, "WorldBossLevelDiff", 3);
 
-    // note: disable value (-1) will assigned as 0xFFFFFFF, to prevent overflow at calculations limit it to max possible player level MAX_LEVEL(100)
     setConfigMinMax(CONFIG_INT32_QUEST_LOW_LEVEL_HIDE_DIFF, "Quests.LowLevelHideDiff", 4, -1, MAX_LEVEL);
     setConfigMinMax(CONFIG_INT32_QUEST_HIGH_LEVEL_HIDE_DIFF, "Quests.HighLevelHideDiff", 7, -1, MAX_LEVEL);
 
@@ -698,6 +819,8 @@ void World::LoadConfigSettings(bool reload)
 
     setConfig(CONFIG_BOOL_QUEST_IGNORE_RAID, "Quests.IgnoreRaid", false);
 
+    setConfig(CONFIG_BOOL_LOOT_CHESTS_IGNORE_DB, "Loot.IgnoreChestGroupRulesFromDB", false);
+
     setConfig(CONFIG_BOOL_DETECT_POS_COLLISION, "DetectPosCollision", true);
 
     setConfig(CONFIG_BOOL_RESTRICTED_LFG_CHANNEL,      "Channel.RestrictedLfg", true);
@@ -726,6 +849,7 @@ void World::LoadConfigSettings(bool reload)
     setConfigMinMax(CONFIG_FLOAT_GHOST_RUN_SPEED_BG,      "Death.Ghost.RunSpeed.Battleground", 1.0f, 0.1f, 10.0f);
 
     setConfig(CONFIG_FLOAT_THREAT_RADIUS, "ThreatRadius", 100.0f);
+    setConfigMin(CONFIG_UINT32_CREATURE_RESPAWN_AGGRO_DELAY, "CreatureRespawnAggroDelay", 5000, 0);
 
     // always use declined names in the russian client
     if (getConfig(CONFIG_UINT32_REALM_ZONE) == REALM_ZONE_RUSSIAN)
@@ -739,35 +863,52 @@ void World::LoadConfigSettings(bool reload)
     setConfig(CONFIG_UINT32_BATTLEGROUND_INVITATION_TYPE,              "Battleground.InvitationType", 0);
     setConfig(CONFIG_UINT32_BATTLEGROUND_PREMATURE_FINISH_TIMER,       "BattleGround.PrematureFinishTimer", 5 * MINUTE * IN_MILLISECONDS);
     setConfig(CONFIG_UINT32_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH, "BattleGround.PremadeGroupWaitForMatch", 30 * MINUTE * IN_MILLISECONDS);
+    setConfigMinMax(CONFIG_UINT32_RANDOM_BG_RESET_HOUR,                "BattleGround.Random.ResetHour", 6, 0, 23);
     setConfig(CONFIG_UINT32_ARENA_MAX_RATING_DIFFERENCE,               "Arena.MaxRatingDifference", 150);
     setConfig(CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER,                "Arena.RatingDiscardTimer", 10 * MINUTE * IN_MILLISECONDS);
     setConfig(CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS,                "Arena.AutoDistributePoints", false);
     setConfig(CONFIG_UINT32_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS,       "Arena.AutoDistributeInterval", 7);
     setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_JOIN,                  "Arena.QueueAnnouncer.Join", false);
     setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_EXIT,                  "Arena.QueueAnnouncer.Exit", false);
-    setConfig(CONFIG_UINT32_ARENA_SEASON_ID,                           "Arena.ArenaSeason.ID", 1);
-    setConfig(CONFIG_UINT32_ARENA_SEASON_PREVIOUS_ID,                  "Arena.ArenaSeasonPrevious.ID", 0);
+    setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_START,                 "Arena.QueueAnnouncer.Start", false);
     setConfigMin(CONFIG_INT32_ARENA_STARTRATING,                       "Arena.StartRating", -1, -1);
     setConfigMin(CONFIG_INT32_ARENA_STARTPERSONALRATING,               "Arena.StartPersonalRating", -1, -1);
+    setConfig(CONFIG_UINT32_LOSERNOCHANGE,                             "Arena.LoserNoChange", 0);
+    setConfig(CONFIG_UINT32_LOSERHALFCHANGE,                           "Arena.LoserHalfChange", 0);
+
+    setConfigMinMax(CONFIG_UINT32_ARENA_AURAS_DURATION,                "Arena.RemoveAurasWithDurationLess", 30, 0, 60);
+
+    setConfig(CONFIG_BOOL_OUTDOORPVP_SI_ENABLED,                       "OutdoorPvp.SIEnabled", true);
+    setConfig(CONFIG_BOOL_OUTDOORPVP_EP_ENABLED,                       "OutdoorPvp.EPEnabled", true);
+    setConfig(CONFIG_BOOL_OUTDOORPVP_HP_ENABLED,                       "OutdoorPvp.HPEnabled", true);
+    setConfig(CONFIG_BOOL_OUTDOORPVP_ZM_ENABLED,                       "OutdoorPvp.ZMEnabled", true);
+    setConfig(CONFIG_BOOL_OUTDOORPVP_TF_ENABLED,                       "OutdoorPvp.TFEnabled", true);
+    setConfig(CONFIG_BOOL_OUTDOORPVP_NA_ENABLED,                       "OutdoorPvp.NAEnabled", true);
+    setConfig(CONFIG_BOOL_OUTDOORPVP_GH_ENABLED,                       "OutdoorPvp.GHEnabled", true);
+    setConfig(CONFIG_BOOL_OUTDOORPVP_WG_ENABLED,                       "OutdoorPvp.WGEnabled", true);
 
     setConfig(CONFIG_BOOL_OFFHAND_CHECK_AT_TALENTS_RESET, "OffhandCheckAtTalentsReset", false);
 
     setConfig(CONFIG_BOOL_KICK_PLAYER_ON_BAD_PACKET, "Network.KickOnBadPacket", false);
 
-    if(int clientCacheId = sConfig.GetIntDefault("ClientCacheVersion", 0))
+    setConfig(CONFIG_BOOL_PLAYER_COMMANDS, "PlayerCommands", true);
+
+    if (int clientCacheId = sConfig.GetIntDefault("ClientCacheVersion", 0))
     {
         // overwrite DB/old value
-        if(clientCacheId > 0)
+        if (clientCacheId > 0)
         {
             setConfig(CONFIG_UINT32_CLIENTCACHE_VERSION, clientCacheId);
-            sLog.outString("Client cache version set to: %u", clientCacheId);
+            sLog.outString("BOOT: Client cache version set to: %u", clientCacheId);
         }
         else
-            sLog.outError("ClientCacheVersion can't be negative %d, ignored.", clientCacheId);
+            sLog.outError("BOOT: ClientCacheVersion can't be negative %d, ignored.", clientCacheId);
     }
 
     setConfig(CONFIG_UINT32_INSTANT_LOGOUT, "InstantLogout", SEC_MODERATOR);
 
+    setConfig(CONFIG_UINT32_GROUPLEADER_RECONNECT_PERIOD, "GroupLeaderReconnectPeriod", 180);
+
     setConfigMin(CONFIG_UINT32_GUILD_EVENT_LOG_COUNT, "Guild.EventLogRecordsCount", GUILD_EVENTLOG_MAX_RECORDS, GUILD_EVENTLOG_MAX_RECORDS);
     setConfigMin(CONFIG_UINT32_GUILD_BANK_EVENT_LOG_COUNT, "Guild.BankEventLogRecordsCount", GUILD_BANK_MAX_LOGS, GUILD_BANK_MAX_LOGS);
 
@@ -780,65 +921,76 @@ void World::LoadConfigSettings(bool reload)
 
     setConfig(CONFIG_BOOL_PET_UNSUMMON_AT_MOUNT,      "PetUnsummonAtMount", true);
 
+    setConfig(CONFIG_BOOL_PET_SAVE_ALL,      "PetSaveAllInDB", false);
+
+    setConfig(CONFIG_BOOL_PET_ADVANCED_AI,      "PetAdvancedAI", false);
+    setConfig(CONFIG_BOOL_PET_ADVANCED_AI_SLACKER, "PetAdvancedAIWithSlacker", false);
+
+    setConfig(CONFIG_BOOL_RAID_FLAGS_UNIQUE,      "RaidFlags.Unique", false);
+
+    setConfig(CONFIG_BOOL_ALLOW_FLIGHT_ON_OLD_MAPS, "AllowFlightOnOldMaps", false);
+
+    setConfig(CONFIG_BOOL_DYNAMIC_VMAP_DOUBLE_CHECK,"vmap.Dynamic.DoubleCheck", false);
+
     m_relocation_ai_notify_delay = sConfig.GetIntDefault("Visibility.AIRelocationNotifyDelay", 1000u);
-    m_relocation_lower_limit_sq  = pow(sConfig.GetFloatDefault("Visibility.RelocationLowerLimit",10), 2);
+    m_relocation_lower_limit     = sConfig.GetFloatDefault("Visibility.RelocationLowerLimit", 10.0f);
 
     m_VisibleUnitGreyDistance = sConfig.GetFloatDefault("Visibility.Distance.Grey.Unit", 1);
-    if(m_VisibleUnitGreyDistance >  MAX_VISIBILITY_DISTANCE)
+    if (m_VisibleUnitGreyDistance >  MAX_VISIBILITY_DISTANCE)
     {
         sLog.outError("Visibility.Distance.Grey.Unit can't be greater %f",MAX_VISIBILITY_DISTANCE);
         m_VisibleUnitGreyDistance = MAX_VISIBILITY_DISTANCE;
     }
     m_VisibleObjectGreyDistance = sConfig.GetFloatDefault("Visibility.Distance.Grey.Object", 10);
-    if(m_VisibleObjectGreyDistance >  MAX_VISIBILITY_DISTANCE)
+    if (m_VisibleObjectGreyDistance >  MAX_VISIBILITY_DISTANCE)
     {
         sLog.outError("Visibility.Distance.Grey.Object can't be greater %f",MAX_VISIBILITY_DISTANCE);
         m_VisibleObjectGreyDistance = MAX_VISIBILITY_DISTANCE;
     }
 
-    //visibility on continents
-    m_MaxVisibleDistanceOnContinents      = sConfig.GetFloatDefault("Visibility.Distance.Continents",     DEFAULT_VISIBILITY_DISTANCE);
-    if(m_MaxVisibleDistanceOnContinents < 45*getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO))
+    // visibility on continents
+    m_MaxVisibleDistanceOnContinents = sConfig.GetFloatDefault("Visibility.Distance.Continents", DEFAULT_VISIBILITY_DISTANCE);
+    if (m_MaxVisibleDistanceOnContinents < 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO))
     {
-        sLog.outError("Visibility.Distance.Continents can't be less max aggro radius %f", 45*getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO));
-        m_MaxVisibleDistanceOnContinents = 45*getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO);
+        sLog.outError("Visibility.Distance.Continents can't be less max aggro radius %f", 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO));
+        m_MaxVisibleDistanceOnContinents = 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO);
     }
-    else if(m_MaxVisibleDistanceOnContinents + m_VisibleUnitGreyDistance >  MAX_VISIBILITY_DISTANCE)
+    else if (m_MaxVisibleDistanceOnContinents + m_VisibleUnitGreyDistance >  MAX_VISIBILITY_DISTANCE)
     {
-        sLog.outError("Visibility.Distance.Continents can't be greater %f",MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance);
+        sLog.outError("Visibility.Distance.Continents can't be greater %f", MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance);
         m_MaxVisibleDistanceOnContinents = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance;
     }
 
-    //visibility in instances
-    m_MaxVisibleDistanceInInstances        = sConfig.GetFloatDefault("Visibility.Distance.Instances",       DEFAULT_VISIBILITY_INSTANCE);
-    if(m_MaxVisibleDistanceInInstances < 45*getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO))
+    // visibility in instances
+    m_MaxVisibleDistanceInInstances = sConfig.GetFloatDefault("Visibility.Distance.Instances", DEFAULT_VISIBILITY_INSTANCE);
+    if (m_MaxVisibleDistanceInInstances < 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO_IN_INSTANCE))
     {
-        sLog.outError("Visibility.Distance.Instances can't be less max aggro radius %f",45*getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO));
-        m_MaxVisibleDistanceInInstances = 45*getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO);
+        sLog.outError("Visibility.Distance.Instances can't be less max aggro radius %f", 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO_IN_INSTANCE));
+        m_MaxVisibleDistanceInInstances = 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO_IN_INSTANCE);
     }
-    else if(m_MaxVisibleDistanceInInstances + m_VisibleUnitGreyDistance >  MAX_VISIBILITY_DISTANCE)
+    else if (m_MaxVisibleDistanceInInstances + m_VisibleUnitGreyDistance >  MAX_VISIBILITY_DISTANCE)
     {
-        sLog.outError("Visibility.Distance.Instances can't be greater %f",MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance);
+        sLog.outError("Visibility.Distance.Instances can't be greater %f", MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance);
         m_MaxVisibleDistanceInInstances = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance;
     }
 
-    //visibility in BG/Arenas
-    m_MaxVisibleDistanceInBGArenas        = sConfig.GetFloatDefault("Visibility.Distance.BGArenas",       DEFAULT_VISIBILITY_BGARENAS);
-    if(m_MaxVisibleDistanceInBGArenas < 45*getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO))
+    // visibility in BG/Arenas
+    m_MaxVisibleDistanceInBGArenas = sConfig.GetFloatDefault("Visibility.Distance.BGArenas", DEFAULT_VISIBILITY_BGARENAS);
+    if (m_MaxVisibleDistanceInBGArenas < 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO))
     {
-        sLog.outError("Visibility.Distance.BGArenas can't be less max aggro radius %f",45*getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO));
-        m_MaxVisibleDistanceInBGArenas = 45*getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO);
+        sLog.outError("Visibility.Distance.BGArenas can't be less max aggro radius %f", 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO));
+        m_MaxVisibleDistanceInBGArenas = 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO);
     }
-    else if(m_MaxVisibleDistanceInBGArenas + m_VisibleUnitGreyDistance >  MAX_VISIBILITY_DISTANCE)
+    else if (m_MaxVisibleDistanceInBGArenas + m_VisibleUnitGreyDistance > MAX_VISIBILITY_DISTANCE)
     {
         sLog.outError("Visibility.Distance.BGArenas can't be greater %f",MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance);
         m_MaxVisibleDistanceInBGArenas = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance;
     }
 
-    m_MaxVisibleDistanceInFlight    = sConfig.GetFloatDefault("Visibility.Distance.InFlight",      DEFAULT_VISIBILITY_DISTANCE);
-    if(m_MaxVisibleDistanceInFlight + m_VisibleObjectGreyDistance > MAX_VISIBILITY_DISTANCE)
+    m_MaxVisibleDistanceInFlight = sConfig.GetFloatDefault("Visibility.Distance.InFlight", DEFAULT_VISIBILITY_DISTANCE);
+    if (m_MaxVisibleDistanceInFlight + m_VisibleObjectGreyDistance > MAX_VISIBILITY_DISTANCE)
     {
-        sLog.outError("Visibility.Distance.InFlight can't be greater %f",MAX_VISIBILITY_DISTANCE-m_VisibleObjectGreyDistance);
+        sLog.outError("Visibility.Distance.InFlight can't be greater %f",MAX_VISIBILITY_DISTANCE - m_VisibleObjectGreyDistance);
         m_MaxVisibleDistanceInFlight = MAX_VISIBILITY_DISTANCE - m_VisibleObjectGreyDistance;
     }
 
@@ -872,30 +1024,165 @@ void World::LoadConfigSettings(bool reload)
     else
     {
         m_dataPath = dataPath;
-        sLog.outString("Using DataDir %s", m_dataPath.c_str());
+        sLog.outString("BOOT: Using DataDir %s", m_dataPath.c_str());
     }
 
     setConfig(CONFIG_BOOL_VMAP_INDOOR_CHECK, "vmap.enableIndoorCheck", true);
-    bool enableLOS = sConfig.GetBoolDefault("vmap.enableLOS", false);
-    bool enableHeight = sConfig.GetBoolDefault("vmap.enableHeight", false);
+    bool enableLOS = true;
+    bool enableHeight = true;
     std::string ignoreSpellIds = sConfig.GetStringDefault("vmap.ignoreSpellIds", "");
 
     if (!enableHeight)
-        sLog.outError("VMAP height use disabled! Creatures movements and other things will be in broken state.");
+        sLog.outError("BOOT: VMAP height use disabled! Creatures movements and other things will be in broken state.");
 
     VMAP::VMapFactory::createOrGetVMapManager()->setEnableLineOfSightCalc(enableLOS);
     VMAP::VMapFactory::createOrGetVMapManager()->setEnableHeightCalc(enableHeight);
     VMAP::VMapFactory::preventSpellsFromBeingTestedForLoS(ignoreSpellIds.c_str());
-    sLog.outString( "WORLD: VMap support included. LineOfSight:%i, getHeight:%i, indoorCheck:%i",
+    sLog.outString( "BOOT: VMap support included. LineOfSight:%i, getHeight:%i, indoorCheck:%i",
         enableLOS, enableHeight, getConfig(CONFIG_BOOL_VMAP_INDOOR_CHECK) ? 1 : 0);
-    sLog.outString( "WORLD: VMap data directory is: %svmaps",m_dataPath.c_str());
+    sLog.outString( "BOOT: VMap data directory is: %svmaps",m_dataPath.c_str());
 
     setConfig(CONFIG_BOOL_MMAP_ENABLED, "mmap.enabled", true);
     std::string ignoreMapIds = sConfig.GetStringDefault("mmap.ignoreMapIds", "");
     MMAP::MMapFactory::preventPathfindingOnMaps(ignoreMapIds.c_str());
-    sLog.outString("WORLD: mmap pathfinding %sabled", getConfig(CONFIG_BOOL_MMAP_ENABLED) ? "en" : "dis");
+    sLog.outString("BOOT: mmap pathfinding %sabled", getConfig(CONFIG_BOOL_MMAP_ENABLED) ? "en" : "dis");
+
+    // reset duel system
+    setConfig(CONFIG_BOOL_RESET_DUEL_AREA_ENABLED, "DuelReset.Enable", false);
+    std::string areaIdsEnabledDuel = sConfig.GetStringDefault("DuelReset.AreaIds", "");
+    setDuelResetEnableAreaIds(areaIdsEnabledDuel.c_str());
+    sLog.outString("BOOT: reset duel area %sabled", getConfig(CONFIG_BOOL_RESET_DUEL_AREA_ENABLED) ? "en" : "dis");
+
+    // chat log and lexics cutter settings
+    if (reload)
+    {
+        // reset chat logger / lexics cutter
+        sChatLog.Uninitialize();
+    }
+
+    // read chat log parameters
+    sChatLog.m_uiChatLogMethod = (ChatLogMethod)sConfig.GetIntDefault("ChatLogMethod", 0);
+
+    sChatLog.m_bChatLogDateSplit         = sConfig.GetBoolDefault("ChatLogDateSplit",         true);
+    sChatLog.m_bChatLogUTFHeader         = sConfig.GetBoolDefault("ChatLogUTFHeader",         true);
+    sChatLog.m_bChatLogIgnoreUnprintable = sConfig.GetBoolDefault("ChatLogIgnoreUnprintable", true);
+
+    // read chat log file names
+    sChatLog.m_sLogsDir                             = sConfig.GetStringDefault("ChatLogsDirectory",       "");
+    sChatLog.m_sLogFileNames[CHAT_LOG_CHAT]         = sConfig.GetStringDefault("ChatLogChatFile",         "main_chat-$d.log");
+    sChatLog.m_sLogFileNames[CHAT_LOG_PARTY]        = sConfig.GetStringDefault("ChatLogPartyFile",        "party_chat-$d.log");
+    sChatLog.m_sLogFileNames[CHAT_LOG_GUILD]        = sConfig.GetStringDefault("ChatLogGuildFile",        "guild_chat-$d.log");
+    sChatLog.m_sLogFileNames[CHAT_LOG_WHISPER]      = sConfig.GetStringDefault("ChatLogWhisperFile",      "whisper_chat-$d.log");
+    sChatLog.m_sLogFileNames[CHAT_LOG_CHANNEL]      = sConfig.GetStringDefault("ChatLogChannelFile",      "channel_chat-$d.log");
+    sChatLog.m_sLogFileNames[CHAT_LOG_RAID]         = sConfig.GetStringDefault("ChatLogRaidFile",         "raid_chat-$d.log");
+    sChatLog.m_sLogFileNames[CHAT_LOG_BATTLEGROUND] = sConfig.GetStringDefault("ChatLogBattleGroundFile", "bg_chat-$d.log");
+
+    // read screen log flags
+    sChatLog.m_bScreenFlag[CHAT_LOG_CHAT]         = sConfig.GetBoolDefault("ChatLogChatScreen",         false);
+    sChatLog.m_bScreenFlag[CHAT_LOG_PARTY]        = sConfig.GetBoolDefault("ChatLogPartyScreen",        false);
+    sChatLog.m_bScreenFlag[CHAT_LOG_GUILD]        = sConfig.GetBoolDefault("ChatLogGuildScreen",        false);
+    sChatLog.m_bScreenFlag[CHAT_LOG_WHISPER]      = sConfig.GetBoolDefault("ChatLogWhisperScreen",      false);
+    sChatLog.m_bScreenFlag[CHAT_LOG_CHANNEL]      = sConfig.GetBoolDefault("ChatLogChannelScreen",      false);
+    sChatLog.m_bScreenFlag[CHAT_LOG_RAID]         = sConfig.GetBoolDefault("ChatLogRaidScreen",         false);
+    sChatLog.m_bScreenFlag[CHAT_LOG_BATTLEGROUND] = sConfig.GetBoolDefault("ChatLogBattleGroundScreen", false);
+
+    // initialize lexics cutter parameters
+    sChatLog.m_bLexicsCutterEnable         = sConfig.GetBoolDefault("LexicsCutterEnable",         false);
+    sChatLog.m_bLexicsCutterInnormativeCut = sConfig.GetBoolDefault("LexicsCutterInnormativeCut", true);
+    sChatLog.m_bLexicsCutterNoActionOnGM   = sConfig.GetBoolDefault("LexicsCutterNoActionOnGM",   true);
+    sChatLog.m_bLexicsCutterScreenLog      = sConfig.GetBoolDefault("LexicsCutterScreenLog",      false);
+
+    sChatLog.m_iLexicsCutterAction         = sConfig.GetIntDefault("LexicsCutterAction",         LEXICS_ACTION_LOG);
+    sChatLog.m_iLexicsCutterActionDuration = sConfig.GetIntDefault("LexicsCutterActionDuration", 60000);
+
+    sChatLog.m_bLexicsCutterIgnoreLetterRepeat = sConfig.GetBoolDefault("LexicsCutterIgnoreRepeats", true);
+    sChatLog.m_bLexicsCutterIgnoreMiddleSpaces = sConfig.GetBoolDefault("LexicsCutterIgnoreSpaces",  true);
+
+    sChatLog.m_sLexicsCutterCutReplacement = sConfig.GetStringDefault("LexicsCutterCutReplacement", "&!@^%!^&*!!!");
+    sChatLog.m_sAnalogsFileName            = sConfig.GetStringDefault("LexicsCutterAnalogsFile",    "letter_analogs.txt");
+    sChatLog.m_sWordsFileName              = sConfig.GetStringDefault("LexicsCutterWordsFile",      "innormative_words.txt");
+    sChatLog.m_sInnormativeFileName        = sConfig.GetStringDefault("LexicsCutterLogFile",        "innormative-$d.log");
+
+    // read lexics cutter flags
+    sChatLog.m_bCutFlag[CHAT_LOG_CHAT]         = sConfig.GetBoolDefault("LexicsCutInChat",         true);
+    sChatLog.m_bCutFlag[CHAT_LOG_PARTY]        = sConfig.GetBoolDefault("LexicsCutInParty",        true);
+    sChatLog.m_bCutFlag[CHAT_LOG_GUILD]        = sConfig.GetBoolDefault("LexicsCutInGuild",        true);
+    sChatLog.m_bCutFlag[CHAT_LOG_WHISPER]      = sConfig.GetBoolDefault("LexicsCutInWhisper",      true);
+    sChatLog.m_bCutFlag[CHAT_LOG_CHANNEL]      = sConfig.GetBoolDefault("LexicsCutInChannel",      true);
+    sChatLog.m_bCutFlag[CHAT_LOG_RAID]         = sConfig.GetBoolDefault("LexicsCutInRaid",         true);
+    sChatLog.m_bCutFlag[CHAT_LOG_BATTLEGROUND] = sConfig.GetBoolDefault("LexicsCutInBattleGround", true);
+
+    // initialize chat logs (and lexics cutter)
+    sChatLog.Initialize();
+
+    // calendar
+    int32 delayHours = sConfig.GetIntDefault("Calendar.RemoveExpiredEvents", -1);
+    setConfig(CONFIG_INT32_CALENDAR_REMOVE_EXPIRED_EVENTS_DELAY, delayHours < 0 ? -1 : delayHours * HOUR /*convert to sec.*/);
+
+    // resistance calculation options
+    setConfigMinMax(CONFIG_UINT32_RESIST_CALC_METHOD, "Resistance.CalculationMethod", 1, 0, 1);
+    setConfig(CONFIG_BOOL_RESIST_ADD_BY_OVER_LEVEL, "Resistance.AddByOverLevel", false);
+
+    // Anounce reset of instance to whole party
+    setConfig(CONFIG_BOOL_INSTANCES_RESET_GROUP_ANNOUNCE,  "InstancesResetAnnounce", false);
+
+    setConfigMinMax(CONFIG_FLOAT_MELEE_DIST_ADDITION, "Melee.Distance.Addition", 4.0f, 0.0f, 10.0f);
+
+    setConfigMinMax(CONFIG_UINT32_FIX_MOVE_PACKETS_METHOD, "Player.FixMovementPackets.Method", 0, 0, 2);
+    setConfigMinMax(CONFIG_UINT32_FIX_MOVE_PACKETS_ADD_TIME, "Player.FixMovementPackets.AddTime", 50, 1, 1000);
+
+    // Set  world timers
+    m_timers[WUPDATE_AUCTIONS].SetInterval(sConfig.GetIntDefault("Auctions.Timer", 60000));
+    m_timers[WUPDATE_AUCTIONS].Reset();
+
+    m_timers[WUPDATE_WEATHERS].SetInterval(sConfig.GetIntDefault("Weathers.Timer", 60000));
+    m_timers[WUPDATE_WEATHERS].Reset();
+
+    m_timers[WUPDATE_UPTIME].SetInterval(sConfig.GetIntDefault("UpdateUptimeInterval", 10) * MINUTE * IN_MILLISECONDS);
+    m_timers[WUPDATE_UPTIME].Reset();
+
+    m_timers[WUPDATE_CORPSES].SetInterval(sConfig.GetIntDefault("Corpse.Timer", 20) * MINUTE * IN_MILLISECONDS);
+    m_timers[WUPDATE_CORPSES].Reset();
+
+    // wupdate_events - VARIABLE INTERVAL, setted by GemeEvents
+
+    m_timers[WUPDATE_DELETECHARS].SetInterval(sConfig.GetIntDefault("CharDelete.Timer", 8) * HOUR * IN_MILLISECONDS);
+    m_timers[WUPDATE_DELETECHARS].Reset();
+
+    m_timers[WUPDATE_AHBOT].SetInterval(sConfig.GetIntDefault("AHBot.Timer", 20000));
+    m_timers[WUPDATE_AHBOT].Reset();
+
+    m_timers[WUPDATE_AUTOBROADCAST].SetInterval(sConfig.GetIntDefault("AutoBroadcast.Timer", 60000));
+    m_timers[WUPDATE_AUTOBROADCAST].Reset();
+
+    m_timers[WUPDATE_WORLDSTATE].SetInterval(sConfig.GetIntDefault("WorldState.Timer", 60000));
+    m_timers[WUPDATE_WORLDSTATE].Reset();
+
+    m_timers[WUPDATE_CALENDAR].SetInterval(sConfig.GetIntDefault("Calendar.Timer", 30000));
+    m_timers[WUPDATE_CALENDAR].Reset();
+
+    m_timers[WUPDATE_GROUPS].SetInterval(sConfig.GetIntDefault("Groups.Timer", 1000));
+    m_timers[WUPDATE_GROUPS].Reset();
+
+    m_timers[WUPDATE_TERRAIN].SetInterval(sConfig.GetIntDefault("Terrain.Timer", 30000));
+    m_timers[WUPDATE_TERRAIN].Reset();
+
+    tm local;
+    time_t curr;
+    time(&curr);
+    local = *(localtime(&curr));
+
+    //to set mailtimer to return mails every day between 4 and 5 am
+    //mailtimer is increased when updating auctions
+    //one second is 1000 -(tested on win system)
+    mail_timer = uint32((((localtime( &m_gameTime )->tm_hour + 20) % 24)* HOUR * IN_MILLISECONDS) / m_timers[WUPDATE_AUCTIONS].GetInterval() );
+    mail_timer_expires = uint32( (DAY * IN_MILLISECONDS) / (m_timers[WUPDATE_AUCTIONS].GetInterval()));
+    sLog.outString("BOOT: Mail timer set to: %u, mail return is called every %u minutes", mail_timer, mail_timer_expires);
+
 }
 
+extern void LoadGameObjectModelList();
+
 /// Initialize the World
 void World::SetInitialWorldSettings()
 {
@@ -919,8 +1206,10 @@ void World::SetInitialWorldSettings()
         !MapManager::ExistMapAndVMap(0, 1676.35f, 1677.45f) ||
         !MapManager::ExistMapAndVMap(1, 10311.3f, 832.463f) ||
         !MapManager::ExistMapAndVMap(1,-2917.58f,-257.98f) ||
-        (m_configUint32Values[CONFIG_UINT32_EXPANSION] &&
-        (!MapManager::ExistMapAndVMap(530,10349.6f,-6357.29f) || !MapManager::ExistMapAndVMap(530,-3961.64f,-13931.2f))))
+        (m_configUint32Values[CONFIG_UINT32_EXPANSION] >= EXPANSION_TBC &&
+        (!MapManager::ExistMapAndVMap(530,10349.6f,-6357.29f) || !MapManager::ExistMapAndVMap(530,-3961.64f,-13931.2f))) ||
+        (m_configUint32Values[CONFIG_UINT32_EXPANSION] >= EXPANSION_WOTLK &&
+        !MapManager::ExistMapAndVMap(609,2355.84f,-5664.77f)))
     {
         sLog.outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map and vmap files in appropriate directories or correct the DataDir value in the mangosd.conf file.",m_dataPath.c_str(),m_dataPath.c_str());
         Log::WaitBeforeContinueIfNeed();
@@ -942,7 +1231,7 @@ void World::SetInitialWorldSettings()
     // not send custom type REALM_FFA_PVP to realm list
     uint32 server_type = IsFFAPvPRealm() ? REALM_TYPE_PVP : getConfig(CONFIG_UINT32_GAME_TYPE);
     uint32 realm_zone = getConfig(CONFIG_UINT32_REALM_ZONE);
-    LoginDatabase.PExecute("UPDATE realmlist SET icon = %u, timezone = %u WHERE id = '%u'", server_type, realm_zone, realmID);
+    LoginDatabase.PExecute("UPDATE realmlist SET icon = %u, timezone = %u WHERE id = '%u'", server_type, realm_zone, getConfig(CONFIG_UINT32_REALMID));
 
     ///- Remove the bones (they should not exist in DB though) and old corpses after a restart
     CharacterDatabase.PExecute("DELETE FROM corpse WHERE corpse_type = '0' OR time < (UNIX_TIMESTAMP()-'%u')", 3*DAY);
@@ -953,6 +1242,15 @@ void World::SetInitialWorldSettings()
     DetectDBCLang();
     sObjectMgr.SetDBCLocaleIndex(GetDefaultDbcLocale());    // Get once for all the locale index of DBC language (console/broadcasts)
 
+    sLog.outString("Loading opcodes for realm (client build %u)...",CLIENT_VERSION);
+    sObjectMgr.LoadOpcodes();
+
+    sLog.outString("Loading GameObject models...");
+    LoadGameObjectModelList();
+
+    sLog.outString( "Loading SpellDbc..." );
+    sSpellMgr.LoadSpellDbc();
+
     sLog.outString( "Loading SpellTemplate..." );
     sObjectMgr.LoadSpellTemplate();
 
@@ -1012,6 +1310,9 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Loading Spell Proc Item Enchant..." );
     sSpellMgr.LoadSpellProcItemEnchant();                   // must be after LoadSpellChains
 
+    sLog.outString( "Loading Spell Linked definitions..." );
+    sSpellMgr.LoadSpellLinked();                            // must be after LoadSpellChains
+
     sLog.outString( "Loading Aggro Spells Definitions...");
     sSpellMgr.LoadSpellThreats();
 
@@ -1036,7 +1337,14 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Loading Equipment templates...");
     sObjectMgr.LoadEquipmentTemplates();
 
-    sLog.outString( "Loading Creature templates..." );
+    // FIXME! currently spells must be loaded _before_ templates for correct detection.
+    sLog.outString( "Loading Creature spells..." );
+    sObjectMgr.LoadCreatureSpells();
+
+    sLog.outString("Loading Creature Stats...");
+    sObjectMgr.LoadCreatureClassLvlStats();
+
+    sLog.outString("Loading Creature templates...");
     sObjectMgr.LoadCreatureTemplates();
 
     sLog.outString( "Loading Creature Model for race..." ); // must be after creature templates
@@ -1045,6 +1353,9 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Loading SpellsScriptTarget...");
     sSpellMgr.LoadSpellScriptTarget();                      // must be after LoadCreatureTemplates and LoadGameobjectInfo
 
+    sLog.outString("Loading Vehicle Accessory...");         // must be after creature templates
+    sObjectMgr.LoadVehicleAccessory();
+
     sLog.outString( "Loading ItemRequiredTarget...");
     sObjectMgr.LoadItemRequiredTarget();
 
@@ -1115,7 +1426,7 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Creating map persistent states for non-instanceable maps..." );   // must be after PackInstances(), LoadCreatures(), sPoolMgr.LoadFromDB(), sGameEventMgr.LoadFromDB();
     sMapPersistentStateMgr.InitWorldMaps();
 
-    sLog.outString( "Loading Creature Respawn Data..." );   // must be after LoadCreatures(), and sMapPersistentStateMgr.InitWorldMaps()
+    sLog.outString( "Loading Creature Respawn Data..." );   // must be after LoadCreatures(), and sMapPersistentStateMgr.InitWorldMaps() , and PackInstances()
     sMapPersistentStateMgr.LoadCreatureRespawnTimes();
 
     sLog.outString( "Loading Gameobject Respawn Data..." ); // must be after LoadGameObjects(), and sMapPersistentStateMgr.InitWorldMaps()
@@ -1171,12 +1482,18 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Loading pet level stats..." );
     sObjectMgr.LoadPetLevelInfo();
 
+    sLog.outString( "Loading pet scaling data..." );
+    sObjectMgr.LoadPetScalingData();
+
     sLog.outString( "Loading Player Corpses..." );
     sObjectMgr.LoadCorpses();
 
     sLog.outString( "Loading Player level dependent mail rewards..." );
     sObjectMgr.LoadMailLevelRewards();
 
+    sLog.outString( "Loading Spell disabled..." );
+    sObjectMgr.LoadSpellDisabledEntrys();
+
     sLog.outString( "Loading Loot Tables..." );
     sLog.outString();
     LoadLootTables();
@@ -1184,10 +1501,10 @@ void World::SetInitialWorldSettings()
     sLog.outString();
 
     sLog.outString( "Loading Skill Discovery Table..." );
-    LoadSkillDiscoveryTable();
+    sSpellMgr.LoadSkillDiscoveryTable();
 
     sLog.outString( "Loading Skill Extra Item Table..." );
-    LoadSkillExtraItemTable();
+    sSpellMgr.LoadSkillExtraItemTable();
 
     sLog.outString( "Loading Skill Fishing base level requirements..." );
     sObjectMgr.LoadFishingBaseSkillLevel();
@@ -1206,9 +1523,6 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Loading Instance encounters data..." );  // must be after Creature loading
     sObjectMgr.LoadInstanceEncounters();
 
-    sLog.outString( "Loading Npc Text Id..." );
-    sObjectMgr.LoadNpcGossips();                            // must be after load Creature and LoadGossipText
-
     sLog.outString( "Loading Gossip scripts..." );
     sScriptMgr.LoadGossipScripts();                         // must be before gossip menu options
 
@@ -1242,6 +1556,9 @@ void World::SetInitialWorldSettings()
     sLog.outString( ">>> Localization strings loaded" );
     sLog.outString();
 
+    sLog.outString("Loading LFG rewards...");               // After load all static data
+    sLFGMgr.LoadRewards();
+
     ///- Load dynamic data tables from the database
     sLog.outString( "Loading Auctions..." );
     sLog.outString();
@@ -1274,9 +1591,18 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Loading GameTeleports..." );
     sObjectMgr.LoadGameTele();
 
+    sLog.outString( "Loading Calendar events/invites..." );
+    sCalendarMgr.LoadFromDB();
+
     sLog.outString( "Loading GM tickets...");
     sTicketMgr.LoadGMTickets();
 
+    sLog.outString( "Loading AntiCheat config..." );
+    sObjectMgr.LoadAntiCheatConfig();
+
+    sLog.outString( "Loading WorldState templates and data..." );
+    sWorldStateMgr.Initialize();
+
     ///- Handle outdated emails (delete/return)
     sLog.outString( "Returning old mails..." );
     sObjectMgr.ReturnOrDeleteOldMails(false);
@@ -1284,23 +1610,24 @@ void World::SetInitialWorldSettings()
     ///- Load and initialize scripts
     sLog.outString( "Loading Scripts..." );
     sLog.outString();
-    sScriptMgr.LoadQuestStartScripts();                         // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
-    sScriptMgr.LoadQuestEndScripts();                           // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
-    sScriptMgr.LoadSpellScripts();                              // must be after load Creature/Gameobject(Template/Data)
-    sScriptMgr.LoadGameObjectScripts();                         // must be after load Creature/Gameobject(Template/Data)
-    sScriptMgr.LoadGameObjectTemplateScripts();                 // must be after load Creature/Gameobject(Template/Data)
-    sScriptMgr.LoadEventScripts();                              // must be after load Creature/Gameobject(Template/Data)
-    sLog.outString( ">>> Scripts loaded" );
+    sScriptMgr.LoadQuestStartScripts();                     // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
+    sScriptMgr.LoadQuestEndScripts();                       // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
+    sScriptMgr.LoadSpellScripts();                          // must be after load Creature/Gameobject(Template/Data)
+    sScriptMgr.LoadGameObjectScripts();                     // must be after load Creature/Gameobject(Template/Data)
+    sScriptMgr.LoadGameObjectTemplateScripts();             // must be after load Creature/Gameobject(Template/Data)
+    sScriptMgr.LoadEventScripts();                          // must be after load Creature/Gameobject(Template/Data)
+    sScriptMgr.LoadCreatureDeathScripts();                  // must be after load Creature/Gameobject(Template/Data)
+    sLog.outString(">>> Scripts loaded");
     sLog.outString();
 
     sLog.outString( "Loading Scripts text locales..." );    // must be after Load*Scripts calls
     sScriptMgr.LoadDbScriptStrings();
 
-    sLog.outString( "Loading CreatureEventAI Texts...");
-    sEventAIMgr.LoadCreatureEventAI_Texts(false);       // false, will checked in LoadCreatureEventAI_Scripts
+    sLog.outString("Loading CreatureEventAI Texts...");
+    sEventAIMgr.LoadCreatureEventAI_Texts(false);           // false, will checked in LoadCreatureEventAI_Scripts
 
-    sLog.outString( "Loading CreatureEventAI Summons...");
-    sEventAIMgr.LoadCreatureEventAI_Summons(false);     // false, will checked in LoadCreatureEventAI_Scripts
+    sLog.outString("Loading CreatureEventAI Summons...");
+    sEventAIMgr.LoadCreatureEventAI_Summons(false);         // false, will checked in LoadCreatureEventAI_Scripts
 
     sLog.outString( "Loading CreatureEventAI Scripts...");
     sEventAIMgr.LoadCreatureEventAI_Scripts();
@@ -1335,43 +1662,28 @@ void World::SetInitialWorldSettings()
     sprintf( isoDate, "%04d-%02d-%02d %02d:%02d:%02d",
         local.tm_year+1900, local.tm_mon+1, local.tm_mday, local.tm_hour, local.tm_min, local.tm_sec);
 
-    LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, startstring, uptime) VALUES('%u', " UI64FMTD ", '%s', 0)",
-        realmID, uint64(m_startTime), isoDate);
-
-    m_timers[WUPDATE_WEATHERS].SetInterval(1*IN_MILLISECONDS);
-    m_timers[WUPDATE_AUCTIONS].SetInterval(MINUTE*IN_MILLISECONDS);
-    m_timers[WUPDATE_UPTIME].SetInterval(getConfig(CONFIG_UINT32_UPTIME_UPDATE)*MINUTE*IN_MILLISECONDS);
-                                                            //Update "uptime" table based on configuration entry in minutes.
-    m_timers[WUPDATE_CORPSES].SetInterval(20*MINUTE*IN_MILLISECONDS);
-    m_timers[WUPDATE_DELETECHARS].SetInterval(DAY*IN_MILLISECONDS); // check for chars to delete every day
+    LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, startstring, uptime) VALUES('%u', " UI64FMTD ", '%s', 0)", getConfig(CONFIG_UINT32_REALMID), uint64(m_startTime), isoDate);
 
-    // for AhBot
-    m_timers[WUPDATE_AHBOT].SetInterval(20*IN_MILLISECONDS); // every 20 sec
-
-    //to set mailtimer to return mails every day between 4 and 5 am
-    //mailtimer is increased when updating auctions
-    //one second is 1000 -(tested on win system)
-    mail_timer = uint32((((localtime( &m_gameTime )->tm_hour + 20) % 24)* HOUR * IN_MILLISECONDS) / m_timers[WUPDATE_AUCTIONS].GetInterval() );
-                                                            //1440
-    mail_timer_expires = uint32( (DAY * IN_MILLISECONDS) / (m_timers[WUPDATE_AUCTIONS].GetInterval()));
-    DEBUG_LOG("Mail timer set to: %u, mail return is called every %u minutes", mail_timer, mail_timer_expires);
 
     ///- Initialize static helper structures
     AIRegistry::Initialize();
-    Player::InitVisibleBits();
 
     ///- Initialize MapManager
-    sLog.outString( "Starting Map System" );
+    sLog.outString("Starting Map System");
     sMapMgr.Initialize();
 
     ///- Initialize Battlegrounds
-    sLog.outString( "Starting BattleGround System" );
+    sLog.outString("Starting BattleGround System");
     sBattleGroundMgr.CreateInitialBattleGrounds();
     sBattleGroundMgr.InitAutomaticArenaPointDistribution();
 
-    //Not sure if this can be moved up in the sequence (with static data loading) as it uses MapManager
-    sLog.outString( "Loading Transports..." );
-    sMapMgr.LoadTransports();
+    ///- Initialize Outdoor PvP
+    sLog.outString("Starting Outdoor PvP System");
+    sOutdoorPvPMgr.InitOutdoorPvP();
+
+    // Not sure if this can be moved up in the sequence (with static data loading) as it uses MapManager
+    sLog.outString("Loading Transports...");
+    sObjectMgr.LoadTransports();
 
     sLog.outString("Deleting expired bans..." );
     LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
@@ -1385,15 +1697,27 @@ void World::SetInitialWorldSettings()
     sLog.outString("Calculate next monthly quest reset time..." );
     SetMonthlyQuestResetTime();
 
+    sLog.outString("Calculate random battleground reset time..." );
+    InitRandomBGResetTime();
+
     sLog.outString("Starting Game Event system..." );
     uint32 nextGameEvent = sGameEventMgr.Initialize();
     m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);    //depend on next event
 
+    sLog.outString("Loading Warden Data..." );
+    WardenDataStorage.Init();
+
+    sLog.outString("Initializing AuctionHouseBot...");
+    auctionbot.Init();
+
     // Delete all characters which have been deleted X days before
     Player::DeleteOldCharacters();
 
+    sLog.outString("Starting Autobroadcast system by Xeross..." );
+
     sLog.outString("Initialize AuctionHouseBot...");
     sAuctionBot.Initialize();
+    sPlayerbotAIConfig.Initialize();
 
     sLog.outString( "WORLD: World initialized" );
 
@@ -1450,15 +1774,19 @@ void World::DetectDBCLang()
 /// Update the World !
 void World::Update(uint32 diff)
 {
+    m_updateTime = diff;
+
     ///- Update the different timers
-    for(int i = 0; i < WUPDATE_COUNT; ++i)
+    for (uint8 i = 0; i < WUPDATE_COUNT; ++i)
     {
-        if (m_timers[i].GetCurrent()>=0)
+        if (m_timers[i].GetCurrent() >= 0 )
             m_timers[i].Update(diff);
         else
             m_timers[i].SetCurrent(0);
     }
 
+    bool bSingletonUpdate = false;
+
     ///- Update the game time and check for shutdown time
     _UpdateGameTime();
 
@@ -1477,9 +1805,13 @@ void World::Update(uint32 diff)
     if (m_gameTime > m_NextMonthlyQuestReset)
         ResetMonthlyQuests();
 
+    if (m_gameTime > m_NextRandomBGReset)
+        ResetRandomBG();
+
     /// <ul><li> Handle auctions when the timer has passed
-    if (m_timers[WUPDATE_AUCTIONS].Passed())
+    if (!bSingletonUpdate && m_timers[WUPDATE_AUCTIONS].Passed())
     {
+        auctionbot.Update();
         m_timers[WUPDATE_AUCTIONS].Reset();
 
         ///- Update mails (return old mails with item, or delete them)
@@ -1492,20 +1824,42 @@ void World::Update(uint32 diff)
 
         ///- Handle expired auctions
         sAuctionMgr.Update();
+        bSingletonUpdate = true;
     }
 
     /// <li> Handle AHBot operations
-    if (m_timers[WUPDATE_AHBOT].Passed())
+    if (!bSingletonUpdate && m_timers[WUPDATE_AHBOT].Passed())
     {
         sAuctionBot.Update();
         m_timers[WUPDATE_AHBOT].Reset();
+        bSingletonUpdate = true;
     }
 
+    // playerbot mod
+    sRandomPlayerbotMgr.UpdateAI(diff);
+    sRandomPlayerbotMgr.UpdateSessions(diff);
+    // end of playerbot mod
+
     /// <li> Handle session updates
     UpdateSessions(diff);
 
+    /// <li> Update groups
+    if (!bSingletonUpdate && m_timers[WUPDATE_GROUPS].Passed())
+    {
+        ObjectMgr::GroupMap::iterator i_next;
+        for (ObjectMgr::GroupMap::iterator itr = sObjectMgr.GetGroupMapBegin(); itr != sObjectMgr.GetGroupMapEnd(); itr = i_next)
+        {
+            i_next = itr;
+            ++i_next;
+            if (Group* group = itr->second)
+                group->Update(m_timers[WUPDATE_GROUPS].GetInterval());
+        }
+        m_timers[WUPDATE_GROUPS].Reset();
+        bSingletonUpdate = true;
+    }
+
     /// <li> Handle weather updates when the timer has passed
-    if (m_timers[WUPDATE_WEATHERS].Passed())
+    if (!bSingletonUpdate && m_timers[WUPDATE_WEATHERS].Passed())
     {
         ///- Send an update signal to Weather objects
         for (WeatherMap::iterator itr = m_weathers.begin(); itr != m_weathers.end(); )
@@ -1520,49 +1874,81 @@ void World::Update(uint32 diff)
             else
                 ++itr;
         }
-
         m_timers[WUPDATE_WEATHERS].SetCurrent(0);
+        bSingletonUpdate = true;
     }
     /// <li> Update uptime table
-    if (m_timers[WUPDATE_UPTIME].Passed())
+    if (!bSingletonUpdate && m_timers[WUPDATE_UPTIME].Passed())
     {
         uint32 tmpDiff = uint32(m_gameTime - m_startTime);
         uint32 maxClientsNum = GetMaxActiveSessionCount();
 
         m_timers[WUPDATE_UPTIME].Reset();
-        LoginDatabase.PExecute("UPDATE uptime SET uptime = %u, maxplayers = %u WHERE realmid = %u AND starttime = " UI64FMTD, tmpDiff, maxClientsNum, realmID, uint64(m_startTime));
+        LoginDatabase.PExecute("UPDATE uptime SET uptime = %u, maxplayers = %u WHERE realmid = %u AND starttime = " UI64FMTD, tmpDiff, maxClientsNum, getConfig(CONFIG_UINT32_REALMID), uint64(m_startTime));
+        bSingletonUpdate = true;
     }
 
     /// <li> Handle all other objects
     ///- Update objects (maps, transport, creatures,...)
     sMapMgr.Update(diff);
     sBattleGroundMgr.Update(diff);
+    sOutdoorPvPMgr.Update(diff);
 
     ///- Delete all characters which have been deleted X days before
-    if (m_timers[WUPDATE_DELETECHARS].Passed())
+    if (!bSingletonUpdate && m_timers[WUPDATE_DELETECHARS].Passed())
     {
         m_timers[WUPDATE_DELETECHARS].Reset();
         Player::DeleteOldCharacters();
+        bSingletonUpdate = true;
+    }
+
+    // Update WorldStates (cleanup and save)
+    if (!bSingletonUpdate && m_timers[WUPDATE_WORLDSTATE].Passed())
+    {
+        m_timers[WUPDATE_WORLDSTATE].Reset();
+        sWorldStateMgr.Update();
+        bSingletonUpdate = true;
     }
 
+    // Update Calendar (cleanup and save)
+    if (!bSingletonUpdate && m_timers[WUPDATE_CALENDAR].Passed())
+    {
+        m_timers[WUPDATE_CALENDAR].Reset();
+        sCalendarMgr.Update();
+        bSingletonUpdate = true;
+    }
+
+    // Check if any group can be created by dungeon finder
+    sLFGMgr.Update(diff);
+
     // execute callbacks from sql queries that were queued recently
     UpdateResultQueue();
 
     ///- Erase corpses once every 20 minutes
-    if (m_timers[WUPDATE_CORPSES].Passed())
+    if (!bSingletonUpdate && m_timers[WUPDATE_CORPSES].Passed())
     {
         m_timers[WUPDATE_CORPSES].Reset();
-
         sObjectAccessor.RemoveOldCorpses();
+        bSingletonUpdate = true;
     }
 
     ///- Process Game events when necessary
-    if (m_timers[WUPDATE_EVENTS].Passed())
+    if (!bSingletonUpdate && m_timers[WUPDATE_EVENTS].Passed())
     {
         m_timers[WUPDATE_EVENTS].Reset();                   // to give time for Update() to be processed
         uint32 nextGameEvent = sGameEventMgr.Update();
         m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);
         m_timers[WUPDATE_EVENTS].Reset();
+        bSingletonUpdate = true;
+    }
+    if (getConfig(CONFIG_BOOL_AUTOBROADCAST))
+    {
+        if (!bSingletonUpdate && m_timers[WUPDATE_AUTOBROADCAST].Passed())
+        {
+            m_timers[WUPDATE_AUTOBROADCAST].Reset();
+            SendBroadcast();
+            bSingletonUpdate = true;
+        }
     }
 
     /// </ul>
@@ -1576,11 +1962,16 @@ void World::Update(uint32 diff)
     ProcessCliCommands();
 
     //cleanup unused GridMap objects as well as VMaps
-    sTerrainMgr.Update(diff);
+    if (!bSingletonUpdate && m_timers[WUPDATE_TERRAIN].Passed())
+    {
+        m_timers[WUPDATE_TERRAIN].Reset();
+        sTerrainMgr.Update(diff);
+        bSingletonUpdate = true;
+    }
 }
 
 /// Send a packet to all players (except self if mentioned)
-void World::SendGlobalMessage(WorldPacket* packet, WorldSession* self /*= NULL*/, Team team /*= TEAM_NONE*/)
+void World::SendGlobalMessage(WorldPacket* packet, WorldSession* self /*= NULL*/, Team team /*= TEAM_NONE*/, AccountTypes security)
 {
     SessionMap::const_iterator itr;
     for (itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
@@ -1588,6 +1979,7 @@ void World::SendGlobalMessage(WorldPacket* packet, WorldSession* self /*= NULL*/
         if (itr->second &&
             itr->second->GetPlayer() &&
             itr->second->GetPlayer()->IsInWorld() &&
+            itr->second->GetSecurity() >= security &&
             itr->second != self &&
             (team == TEAM_NONE || itr->second->GetPlayer()->GetTeam() == team))
         {
@@ -1607,7 +1999,7 @@ namespace MaNGOS
             {
                 char const* text = sObjectMgr.GetMangosString(i_textId,loc_idx);
 
-                if(i_args)
+                if (i_args)
                 {
                     // we need copy va_list before use or original va_list will corrupted
                     va_list ap;
@@ -1631,19 +2023,7 @@ namespace MaNGOS
                 while(char* line = lineFromMessage(pos))
                 {
                     WorldPacket* data = new WorldPacket();
-
-                    uint32 lineLength = (line ? strlen(line) : 0) + 1;
-
-                    data->Initialize(SMSG_MESSAGECHAT, 100);                // guess size
-                    *data << uint8(CHAT_MSG_SYSTEM);
-                    *data << uint32(LANG_UNIVERSAL);
-                    *data << uint64(0);
-                    *data << uint32(0);                                     // can be chat msg group or something
-                    *data << uint64(0);
-                    *data << uint32(lineLength);
-                    *data << line;
-                    *data << uint8(0);
-
+                    ChatHandler::BuildChatPacket(*data, CHAT_MSG_SYSTEM, line);
                     data_list.push_back(data);
                 }
             }
@@ -1653,7 +2033,7 @@ namespace MaNGOS
     };
 }                                                           // namespace MaNGOS
 
-/// Send a System Message to all players (except self if mentioned)
+/// Sends a system message to all players
 void World::SendWorldText(int32 string_id, ...)
 {
     va_list ap;
@@ -1672,22 +2052,81 @@ void World::SendWorldText(int32 string_id, ...)
     va_end(ap);
 }
 
-/// DEPRICATED, only for debug purpose. Send a System Message to all players (except self if mentioned)
-void World::SendGlobalText(const char* text, WorldSession* self)
+/// Send a System Message to all players (except self if mentioned)
+void World::SendWorldTextWithSecurity(AccountTypes security, int32 string_id, ...)
 {
-    WorldPacket data;
+    va_list ap;
+    va_start(ap, string_id);
 
-    // need copy to prevent corruption by strtok call in LineFromMessage original string
-    char* buf = mangos_strdup(text);
-    char* pos = buf;
+    MaNGOS::WorldWorldTextBuilder wt_builder(string_id, &ap);
+    MaNGOS::LocalizedPacketListDo<MaNGOS::WorldWorldTextBuilder> wt_do(wt_builder);
+    for(SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
+    {
+        if(!itr->second || !itr->second->GetPlayer() || !itr->second->GetPlayer()->IsInWorld() || itr->second->GetSecurity() < security )
+            continue;
 
-    while (char* line = ChatHandler::LineFromMessage(pos))
+        wt_do(itr->second->GetPlayer());
+    }
+
+    va_end(ap);
+}
+
+/// Sends a server message to the specified or all players
+void World::SendServerMessage(ServerMessageType type, const char* text /*=""*/, Player* player /*= NULL*/)
+{
+    WorldPacket data(SMSG_SERVER_MESSAGE, 50);              // guess size
+    data << uint32(type);
+    data << text;
+
+    if (player)
+        player->GetSession()->SendPacket(&data);
+    else
+        SendGlobalMessage(&data);
+}
+
+/// Sends a zone under attack message to all players not in an instance
+void World::SendZoneUnderAttackMessage(uint32 zoneId, Team team)
+{
+    WorldPacket data(SMSG_ZONE_UNDER_ATTACK, 4);
+    data << uint32(zoneId);
+
+    for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
     {
-        ChatHandler::FillMessageData(&data, NULL, CHAT_MSG_SYSTEM, LANG_UNIVERSAL, line);
-        SendGlobalMessage(&data, self);
+        if (itr->second &&
+            itr->second->GetPlayer() &&
+            itr->second->GetPlayer()->IsInWorld() &&
+            (team == TEAM_NONE || itr->second->GetPlayer()->GetTeam() == team)
+// As says stfx && Schmoo, this packet sended to all players in world. but i think, not need
+// cause useless traffic, if this maked by blizz. this - WoW emulator, but not "Fools of blizz" emulator. (/dev/rsa)
+            && itr->second->GetPlayer()->GetZoneId() == zoneId)
+// This requirements wrong, as i remember. but may be need in 4/5x
+//                && !itr->second->GetPlayer()->GetMap()->Instanceable())
+        {
+            itr->second->SendPacket(&data);
+        }
     }
+}
 
-    delete[] buf;
+/// Sends a world defense message to all players not in an instance
+void World::SendDefenseMessage(uint32 zoneId, int32 textId)
+{
+    for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
+    {
+        if (itr->second &&
+                itr->second->GetPlayer() &&
+                itr->second->GetPlayer()->IsInWorld() &&
+                !itr->second->GetPlayer()->GetMap()->Instanceable())
+        {
+            char const* message = itr->second->GetMangosString(textId);
+            uint32 messageLength = strlen(message) + 1;
+
+            WorldPacket data(SMSG_DEFENSE_MESSAGE, 4 + 4 + messageLength);
+            data << uint32(zoneId);
+            data << uint32(messageLength);
+            data << message;
+            itr->second->SendPacket(&data);
+        }
+    }
 }
 
 /// Send a packet to all players (or players selected team) in the zone (except self if mentioned)
@@ -1712,7 +2151,7 @@ void World::SendZoneMessage(uint32 zone, WorldPacket* packet, WorldSession* self
 void World::SendZoneText(uint32 zone, const char* text, WorldSession* self /*= NULL*/, Team team /*= TEAM_NONE*/)
 {
     WorldPacket data;
-    ChatHandler::FillMessageData(&data, NULL, CHAT_MSG_SYSTEM, LANG_UNIVERSAL, text);
+    ChatHandler::BuildChatPacket(data, CHAT_MSG_SYSTEM, text, LANG_UNIVERSAL);
     SendZoneMessage(zone, &data, self, team);
 }
 
@@ -1731,7 +2170,7 @@ void World::KickAllLess(AccountTypes sec)
 {
     // session not removed at kick and will removed in next update tick
     for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
-        if(itr->second->GetSecurity() < sec)
+        if (itr->second->GetSecurity() < sec)
             itr->second->KickPlayer();
 }
 
@@ -1767,7 +2206,7 @@ BanReturn World::BanAccount(BanMode mode, std::string nameOrIP, uint32 duration_
 
     if(!resultAccounts)
     {
-        if(mode==BAN_IP)
+        if (mode==BAN_IP)
             return BAN_SUCCESS;                             // ip correctly banned but nobody affected (yet)
         else
             return BAN_NOTFOUND;                                // Nobody to ban
@@ -1779,7 +2218,7 @@ BanReturn World::BanAccount(BanMode mode, std::string nameOrIP, uint32 duration_
         Field* fieldsAccount = resultAccounts->Fetch();
         uint32 account = fieldsAccount->GetUInt32();
 
-        if(mode!=BAN_IP)
+        if (mode!=BAN_IP)
         {
             //No SQL injection as strings are escaped
             LoginDatabase.PExecute("INSERT INTO account_banned VALUES ('%u', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+%u, '%s', '%s', '1')",
@@ -1787,7 +2226,7 @@ BanReturn World::BanAccount(BanMode mode, std::string nameOrIP, uint32 duration_
         }
 
         if (WorldSession* sess = FindSession(account))
-            if(std::string(sess->GetPlayerName()) != author)
+            if (std::string(sess->GetPlayerName()) != author)
                 sess->KickPlayer();
     }
     while( resultAccounts->NextRow() );
@@ -1810,7 +2249,7 @@ bool World::RemoveBanAccount(BanMode mode, std::string nameOrIP)
         if (mode == BAN_ACCOUNT)
             account = sAccountMgr.GetId (nameOrIP);
         else if (mode == BAN_CHARACTER)
-            account = sObjectMgr.GetPlayerAccountIdByPlayerName (nameOrIP);
+            account = sAccountMgr.GetPlayerAccountIdByPlayerName (nameOrIP);
 
         if (!account)
             return false;
@@ -1830,10 +2269,10 @@ void World::_UpdateGameTime()
     m_gameTime = thisTime;
 
     ///- if there is a shutdown timer
-    if(!m_stopEvent && m_ShutdownTimer > 0 && elapsed > 0)
+    if(!IsStopped() && m_ShutdownTimer > 0 && elapsed > 0)
     {
         ///- ... and it is overdue, stop the world (set m_stopEvent)
-        if( m_ShutdownTimer <= elapsed )
+        if ( m_ShutdownTimer <= elapsed )
         {
             if(!(m_ShutdownMask & SHUTDOWN_MASK_IDLE) || GetActiveAndQueuedSessionCount()==0)
                 m_stopEvent = true;                         // exist code already set
@@ -1854,14 +2293,14 @@ void World::_UpdateGameTime()
 void World::ShutdownServ(uint32 time, uint32 options, uint8 exitcode)
 {
     // ignore if server shutdown at next tick
-    if(m_stopEvent)
+    if (IsStopped())
         return;
 
     m_ShutdownMask = options;
     m_ExitCode = exitcode;
 
     ///- If the shutdown time is 0, set m_stopEvent (except if shutdown is 'idle' with remaining sessions)
-    if(time==0)
+    if (time==0)
     {
         if(!(options & SHUTDOWN_MASK_IDLE) || GetActiveAndQueuedSessionCount()==0)
             m_stopEvent = true;                             // exist code already set
@@ -1874,13 +2313,17 @@ void World::ShutdownServ(uint32 time, uint32 options, uint8 exitcode)
         m_ShutdownTimer = time;
         ShutdownMsg(true);
     }
+
+    // playerbot mod
+    sRandomPlayerbotMgr.LogoutAllBots();
+    // end of playerbot mod
 }
 
 /// Display a shutdown message to the user(s)
-void World::ShutdownMsg(bool show, Player* player)
+void World::ShutdownMsg(bool show /*= false*/, Player* player /*= NULL*/)
 {
     // not show messages for idle shutdown mode
-    if(m_ShutdownMask & SHUTDOWN_MASK_IDLE)
+    if (m_ShutdownMask & SHUTDOWN_MASK_IDLE)
         return;
 
     ///- Display a message every 12 hours, 1 hour, 5 minutes, 1 minute and 15 seconds
@@ -1904,7 +2347,7 @@ void World::ShutdownMsg(bool show, Player* player)
 void World::ShutdownCancel()
 {
     // nothing cancel or too later
-    if(!m_ShutdownTimer || m_stopEvent)
+    if(!m_ShutdownTimer || IsStopped())
         return;
 
     ServerMessageType msgid = (m_ShutdownMask & SHUTDOWN_MASK_RESTART) ? SERVER_MSG_RESTART_CANCELLED : SERVER_MSG_SHUTDOWN_CANCELLED;
@@ -1917,20 +2360,7 @@ void World::ShutdownCancel()
     DEBUG_LOG("Server %s cancelled.",(m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shutdown"));
 }
 
-/// Send a server message to the user(s)
-void World::SendServerMessage(ServerMessageType type, const char* text /*=""*/, Player* player /*= NULL*/)
-{
-    WorldPacket data(SMSG_SERVER_MESSAGE, 50);              // guess size
-    data << uint32(type);
-    data << text;
-
-    if (player)
-        player->GetSession()->SendPacket(&data);
-    else
-        SendGlobalMessage(&data);
-}
-
-void World::UpdateSessions( uint32 diff )
+void World::UpdateSessions(uint32 diff)
 {
     ///- Add new sessions
     WorldSession* sess;
@@ -1943,7 +2373,7 @@ void World::UpdateSessions( uint32 diff )
         next = itr;
         ++next;
         ///- and remove not active sessions from the list
-        WorldSession * pSession = itr->second;
+        WorldSession* pSession = itr->second;
         WorldSessionFilter updater(pSession);
 
         if(!pSession->Update(updater))
@@ -1969,13 +2399,67 @@ void World::ProcessCliCommands()
         CliHandler handler(command->m_cliAccountId, command->m_cliAccessLevel, callbackArg, zprint);
         handler.ParseCommands(command->m_command);
 
-        if(command->m_commandFinished)
+        if (command->m_commandFinished)
             command->m_commandFinished(callbackArg, !handler.HasSentErrorMessage());
 
         delete command;
     }
 }
 
+void World::SendBroadcast()
+{
+    std::string msg;
+    static int nextid;
+
+    QueryResult* result;
+    if (nextid != 0)
+    {
+        result = CharacterDatabase.PQuery("SELECT `text`, `next` FROM `autobroadcast` WHERE `id` = %u", nextid);
+    }
+    else
+    {
+        result = CharacterDatabase.PQuery("SELECT `text`, `next` FROM `autobroadcast` ORDER BY RAND() LIMIT 1");
+    }
+
+    if(!result)
+        return;
+
+    Field* fields = result->Fetch();
+    nextid  = fields[1].GetUInt32();
+    msg = fields[0].GetString();
+    delete result;
+
+    switch (getConfig(CONFIG_UINT32_AUTOBROADCAST_CENTER))
+    {
+        case 0:
+        {
+            sWorld.SendWorldText(LANG_AUTO_BROADCAST, msg.c_str());
+            sLog.outString("AutoBroadcast: '%s'",msg.c_str());
+            break;
+        }
+        case 1:
+        {
+            WorldPacket data(SMSG_NOTIFICATION, (msg.size()+1));
+            data << msg;
+            sWorld.SendGlobalMessage(&data);
+            sLog.outString("AutoBroadcast: '%s'",msg.c_str());
+            break;
+        }
+        case 2:
+        {
+            sWorld.SendWorldText(LANG_AUTO_BROADCAST, msg.c_str());
+            WorldPacket data(SMSG_NOTIFICATION, (msg.size()+1));
+            data << msg;
+            sWorld.SendGlobalMessage(&data);
+            sLog.outString("AutoBroadcast: '%s'",msg.c_str());
+            break;
+        }
+        default:
+            //sLog.outString("AutoBroadcast:ERROR '%s'",msg.c_str());
+            break;
+   }
+}
+
 void World::InitResultQueue()
 {
 }
@@ -1988,27 +2472,6 @@ void World::UpdateResultQueue()
     LoginDatabase.ProcessResultQueue();
 }
 
-void World::UpdateRealmCharCount(uint32 accountId)
-{
-    CharacterDatabase.AsyncPQuery(this, &World::_UpdateRealmCharCount, accountId,
-        "SELECT COUNT(guid) FROM characters WHERE account = '%u'", accountId);
-}
-
-void World::_UpdateRealmCharCount(QueryResult *resultCharCount, uint32 accountId)
-{
-    if (resultCharCount)
-    {
-        Field *fields = resultCharCount->Fetch();
-        uint32 charCount = fields[0].GetUInt32();
-        delete resultCharCount;
-
-        LoginDatabase.BeginTransaction();
-        LoginDatabase.PExecute("DELETE FROM realmcharacters WHERE acctid= '%u' AND realmid = '%u'", accountId, realmID);
-        LoginDatabase.PExecute("INSERT INTO realmcharacters (numchars, acctid, realmid) VALUES (%u, %u, %u)", charCount, accountId, realmID);
-        LoginDatabase.CommitTransaction();
-    }
-}
-
 void World::InitWeeklyQuestResetTime()
 {
     QueryResult * result = CharacterDatabase.Query("SELECT NextWeeklyQuestResetTime FROM saved_variables");
@@ -2038,7 +2501,7 @@ void World::InitWeeklyQuestResetTime()
     m_NextWeeklyQuestReset = m_NextWeeklyQuestReset < curTime ? nextWeekResetTime - WEEK : nextWeekResetTime;
 
     if (!result)
-        CharacterDatabase.PExecute("INSERT INTO saved_variables (NextWeeklyQuestResetTime) VALUES ('"UI64FMTD"')", uint64(m_NextWeeklyQuestReset));
+        CharacterDatabase.PExecute("INSERT INTO saved_variables (NextWeeklyQuestResetTime) VALUES ('" UI64FMTD "')", uint64(m_NextWeeklyQuestReset));
     else
         delete result;
 }
@@ -2069,7 +2532,38 @@ void World::InitDailyQuestResetTime()
     m_NextDailyQuestReset = m_NextDailyQuestReset < curTime ? nextDayResetTime - DAY : nextDayResetTime;
 
     if (!result)
-        CharacterDatabase.PExecute("INSERT INTO saved_variables (NextDailyQuestResetTime) VALUES ('"UI64FMTD"')", uint64(m_NextDailyQuestReset));
+        CharacterDatabase.PExecute("INSERT INTO saved_variables (NextDailyQuestResetTime) VALUES ('" UI64FMTD "')", uint64(m_NextDailyQuestReset));
+    else
+        delete result;
+}
+
+void World::InitRandomBGResetTime()
+{
+    QueryResult * result = CharacterDatabase.Query("SELECT NextRandomBGResetTime FROM saved_variables");
+    if (!result)
+        m_NextRandomBGReset = time_t(time(NULL));         // game time not yet init
+    else
+        m_NextRandomBGReset = time_t((*result)[0].GetUInt64());
+
+    // generate time by config
+    time_t curTime = time(NULL);
+    tm localTm = *localtime(&curTime);
+    localTm.tm_hour = getConfig(CONFIG_UINT32_RANDOM_BG_RESET_HOUR);
+    localTm.tm_min  = 0;
+    localTm.tm_sec  = 0;
+
+    // current day reset time
+    time_t nextDayResetTime = mktime(&localTm);
+
+    // next reset time before current moment
+    if (curTime >= nextDayResetTime)
+        nextDayResetTime += DAY;
+
+    // normalize reset time
+    m_NextRandomBGReset = m_NextRandomBGReset < curTime ? nextDayResetTime - DAY : nextDayResetTime;
+
+    if (!result)
+        CharacterDatabase.PExecute("INSERT INTO saved_variables (NextRandomBGResetTime) VALUES ('" UI64FMTD "')", uint64(m_NextRandomBGReset));
     else
         delete result;
 }
@@ -2117,7 +2611,7 @@ void World::SetMonthlyQuestResetTime(bool initialize)
     m_NextMonthlyQuestReset = (initialize && m_NextMonthlyQuestReset < nextMonthResetTime) ? m_NextMonthlyQuestReset : nextMonthResetTime;
 
     // Row must exist for this to work. Currently row is added by InitDailyQuestResetTime(), called before this function
-    CharacterDatabase.PExecute("UPDATE saved_variables SET NextMonthlyQuestResetTime = '"UI64FMTD"'", uint64(m_NextMonthlyQuestReset));
+    CharacterDatabase.PExecute("UPDATE saved_variables SET NextMonthlyQuestResetTime = '" UI64FMTD "'", uint64(m_NextMonthlyQuestReset));
 }
 
 void World::ResetDailyQuests()
@@ -2129,7 +2623,7 @@ void World::ResetDailyQuests()
             itr->second->GetPlayer()->ResetDailyQuestStatus();
 
     m_NextDailyQuestReset = time_t(m_NextDailyQuestReset + DAY);
-    CharacterDatabase.PExecute("UPDATE saved_variables SET NextDailyQuestResetTime = '"UI64FMTD"'", uint64(m_NextDailyQuestReset));
+    CharacterDatabase.PExecute("UPDATE saved_variables SET NextDailyQuestResetTime = '" UI64FMTD "'", uint64(m_NextDailyQuestReset));
 }
 
 void World::ResetWeeklyQuests()
@@ -2141,7 +2635,19 @@ void World::ResetWeeklyQuests()
             itr->second->GetPlayer()->ResetWeeklyQuestStatus();
 
     m_NextWeeklyQuestReset = time_t(m_NextWeeklyQuestReset + WEEK);
-    CharacterDatabase.PExecute("UPDATE saved_variables SET NextWeeklyQuestResetTime = '"UI64FMTD"'", uint64(m_NextWeeklyQuestReset));
+    CharacterDatabase.PExecute("UPDATE saved_variables SET NextWeeklyQuestResetTime = '" UI64FMTD "'", uint64(m_NextWeeklyQuestReset));
+}
+
+void World::ResetRandomBG()
+{
+    sLog.outDetail("Random BG status reset for all characters.");
+    CharacterDatabase.Execute("DELETE FROM character_battleground_random");
+    for(SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
+        if (itr->second->GetPlayer())
+            itr->second->GetPlayer()->SetRandomBGWinner(false);
+
+    m_NextRandomBGReset = time_t(m_NextRandomBGReset + DAY);
+    CharacterDatabase.PExecute("UPDATE saved_variables SET NextRandomBGResetTime = '" UI64FMTD "'", uint64(m_NextRandomBGReset));
 }
 
 void World::ResetMonthlyQuests()
@@ -2168,7 +2674,7 @@ void World::SetPlayerLimit( int32 limit, bool needUpdate )
 
     if (db_update_need)
         LoginDatabase.PExecute("UPDATE realmlist SET allowedSecurityLevel = '%u' WHERE id = '%u'",
-            uint32(GetPlayerSecurityLimit()), realmID);
+            uint32(GetPlayerSecurityLimit()), getConfig(CONFIG_UINT32_REALMID));
 }
 
 void World::UpdateMaxSessionCounters()
@@ -2180,7 +2686,7 @@ void World::UpdateMaxSessionCounters()
 void World::LoadDBVersion()
 {
     QueryResult* result = WorldDatabase.Query("SELECT version, creature_ai_version, cache_id FROM db_version LIMIT 1");
-    if(result)
+    if (result)
     {
         Field* fields = result->Fetch();
 
@@ -2192,10 +2698,10 @@ void World::LoadDBVersion()
         delete result;
     }
 
-    if(m_DBVersion.empty())
+    if (m_DBVersion.empty())
         m_DBVersion = "Unknown world database.";
 
-    if(m_CreatureEventAIVersion.empty())
+    if (m_CreatureEventAIVersion.empty())
         m_CreatureEventAIVersion = "Unknown creature EventAI.";
 }
 
@@ -2356,3 +2862,52 @@ bool World::configNoReload(bool reload, eConfigBoolValues index, char const* fie
 
     return false;
 }
+
+void World::setDuelResetEnableAreaIds(const char* areas)
+{
+    if (areaEnabledIds.empty())
+    {
+        Tokens areaEnabledIdsString(areas, ',');
+        Tokens::iterator it;
+        for(it = areaEnabledIdsString.begin(); it != areaEnabledIdsString.end(); ++it)
+        {
+           areaEnabledIds.insert(atoi(*it));
+        }
+    }
+}
+
+bool World::IsAreaIdEnabledDuelReset(uint32 areaId)
+{
+    return areaEnabledIds.find(areaId) != areaEnabledIds.end();
+}
+
+void World::setDisabledMapIdForDungeonFinder(const char* mapIds)
+{
+    disabledMapIdForDungeonFinder.clear();
+
+    Tokens disabledMapId(mapIds, ',');
+    for(Tokens::iterator it = disabledMapId.begin(); it != disabledMapId.end(); ++it)
+    {
+        disabledMapIdForDungeonFinder.insert(atoi(*it));
+    }
+}
+
+bool World::IsDungeonMapIdDisable(uint32 mapId)
+{
+    return disabledMapIdForDungeonFinder.find(mapId) != disabledMapIdForDungeonFinder.end();
+}
+
+void World::InvalidatePlayer(ObjectGuid const& guid)
+{
+    WorldPacket data(SMSG_INVALIDATE_PLAYER, 8);
+    data << guid;
+    SendGlobalMessage(&data);
+}
+
+float World::GetCreatureAggroRate(Unit const* unit) const
+{
+    if (unit && unit->GetMap() && unit->GetMap()->IsDungeon())
+        return getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO_IN_INSTANCE);
+    else
+        return getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO);
+}
diff --git a/src/game/World.h b/src/game/World.h
index 1a93600d038..12c04f2c6e8 100644
--- a/src/game/World.h
+++ b/src/game/World.h
@@ -24,18 +24,23 @@
 #define __WORLD_H
 
 #include "Common.h"
+#include "LockedQueue.h"
 #include "Timer.h"
 #include "Policies/Singleton.h"
 #include "SharedDefines.h"
+#include "ObjectGuid.h"
+#include "ObjectLock.h"
+#include "Util.h"
 
 #include <map>
 #include <set>
 #include <list>
 
 class Object;
+class Unit;
+class Player;
 class WorldPacket;
 class WorldSession;
-class Player;
 class Weather;
 class SqlResultQueue;
 class QueryResult;
@@ -71,24 +76,32 @@ enum ShutdownExitCode
 /// Timers for different object refresh rates
 enum WorldTimers
 {
-    WUPDATE_AUCTIONS    = 0,
-    WUPDATE_WEATHERS    = 1,
-    WUPDATE_UPTIME      = 2,
-    WUPDATE_CORPSES     = 3,
-    WUPDATE_EVENTS      = 4,
-    WUPDATE_DELETECHARS = 5,
-    WUPDATE_AHBOT       = 6,
-    WUPDATE_COUNT       = 7
+    WUPDATE_AUCTIONS = 0,
+    WUPDATE_WEATHERS,
+    WUPDATE_UPTIME,
+    WUPDATE_CORPSES,
+    WUPDATE_EVENTS,
+    WUPDATE_DELETECHARS,
+    WUPDATE_AHBOT,
+    WUPDATE_AUTOBROADCAST,
+    WUPDATE_WORLDSTATE,
+    WUPDATE_CALENDAR,
+    WUPDATE_GROUPS,
+    WUPDATE_TERRAIN,
+    WUPDATE_COUNT,
 };
 
 /// Configuration elements
 enum eConfigUInt32Values
 {
-    CONFIG_UINT32_COMPRESSION = 0,
+    CONFIG_UINT32_REALMID = 0,
+    CONFIG_UINT32_COMPRESSION,
     CONFIG_UINT32_INTERVAL_SAVE,
     CONFIG_UINT32_INTERVAL_GRIDCLEAN,
     CONFIG_UINT32_INTERVAL_MAPUPDATE,
     CONFIG_UINT32_INTERVAL_CHANGEWEATHER,
+    CONFIG_UINT32_MAPUPDATE_MAXVISITORS,
+    CONFIG_UINT32_MAPUPDATE_MAXVISITS,
     CONFIG_UINT32_PORT_WORLD,
     CONFIG_UINT32_GAME_TYPE,
     CONFIG_UINT32_REALM_ZONE,
@@ -116,6 +129,7 @@ enum eConfigUInt32Values
     CONFIG_UINT32_INSTANCE_UNLOAD_DELAY,
     CONFIG_UINT32_MAX_SPELL_CASTS_IN_CHAIN,
     CONFIG_UINT32_BIRTHDAY_TIME,
+    CONFIG_UINT32_RABBIT_DAY,
     CONFIG_UINT32_MAX_PRIMARY_TRADE_SKILL,
     CONFIG_UINT32_TRADE_SKILL_GMIGNORE_MAX_PRIMARY_COUNT,
     CONFIG_UINT32_TRADE_SKILL_GMIGNORE_LEVEL,
@@ -129,10 +143,10 @@ enum eConfigUInt32Values
     CONFIG_UINT32_GM_LEVEL_IN_GM_LIST,
     CONFIG_UINT32_GM_LEVEL_IN_WHO_LIST,
     CONFIG_UINT32_START_GM_LEVEL,
+    CONFIG_UINT32_GM_INVISIBLE_AURA,
     CONFIG_UINT32_GROUP_VISIBILITY,
     CONFIG_UINT32_MAIL_DELIVERY_DELAY,
     CONFIG_UINT32_MASS_MAILER_SEND_PER_TICK,
-    CONFIG_UINT32_UPTIME_UPDATE,
     CONFIG_UINT32_AUCTION_DEPOSIT_MIN,
     CONFIG_UINT32_SKILL_CHANCE_ORANGE,
     CONFIG_UINT32_SKILL_CHANCE_YELLOW,
@@ -170,8 +184,6 @@ enum eConfigUInt32Values
     CONFIG_UINT32_ARENA_MAX_RATING_DIFFERENCE,
     CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER,
     CONFIG_UINT32_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS,
-    CONFIG_UINT32_ARENA_SEASON_ID,
-    CONFIG_UINT32_ARENA_SEASON_PREVIOUS_ID,
     CONFIG_UINT32_CLIENTCACHE_VERSION,
     CONFIG_UINT32_GUILD_EVENT_LOG_COUNT,
     CONFIG_UINT32_GUILD_BANK_EVENT_LOG_COUNT,
@@ -185,9 +197,39 @@ enum eConfigUInt32Values
     CONFIG_UINT32_CHARDELETE_KEEP_DAYS,
     CONFIG_UINT32_CHARDELETE_METHOD,
     CONFIG_UINT32_CHARDELETE_MIN_LEVEL,
+    CONFIG_UINT32_AUTOBROADCAST_CENTER,
     CONFIG_UINT32_GUID_RESERVE_SIZE_CREATURE,
     CONFIG_UINT32_GUID_RESERVE_SIZE_GAMEOBJECT,
+    CONFIG_UINT32_ANTICHEAT_GMLEVEL,
+    CONFIG_UINT32_ANTICHEAT_ACTION_DELAY,
+    CONFIG_UINT32_NUMTHREADS,
+    CONFIG_UINT32_RANDOM_BG_RESET_HOUR,
+    CONFIG_UINT32_LOSERNOCHANGE,
+    CONFIG_UINT32_LOSERHALFCHANGE,
+    CONFIG_UINT32_RAF_MAXGRANTLEVEL,
+    CONFIG_UINT32_RAF_MAXREFERALS,
+    CONFIG_UINT32_RAF_MAXREFERERS,
+    CONFIG_UINT32_LFG_MAXKICKS,
     CONFIG_UINT32_MIN_LEVEL_FOR_RAID,
+    CONFIG_UINT32_PLAYERBOT_MAXBOTS,
+    CONFIG_UINT32_PLAYERBOT_RESTRICTLEVEL,
+    CONFIG_UINT32_PLAYERBOT_MINBOTLEVEL,
+    CONFIG_UINT32_GEAR_CALC_BASE,
+    CONFIG_UINT32_ARENA_AURAS_DURATION,
+    CONFIG_UINT32_VMSS_MAXTHREADBREAKS,
+    CONFIG_UINT32_VMSS_TBREMTIME,
+    CONFIG_UINT32_VMSS_MAPFREEMETHOD,
+    CONFIG_UINT32_VMSS_FREEZECHECKPERIOD,
+    CONFIG_UINT32_VMSS_FREEZEDETECTTIME,
+    CONFIG_UINT32_VMSS_FORCEUNLOADDELAY,
+    CONFIG_UINT32_WORLD_STATE_EXPIRETIME,
+    CONFIG_UINT32_OBJECTLOADINGSPLITTER_ALLOWEDTIME,
+    CONFIG_UINT32_POSITION_UPDATE_DELAY,
+    CONFIG_UINT32_RESIST_CALC_METHOD,
+    CONFIG_UINT32_GROUPLEADER_RECONNECT_PERIOD,
+    CONFIG_UINT32_CREATURE_RESPAWN_AGGRO_DELAY,
+    CONFIG_UINT32_FIX_MOVE_PACKETS_METHOD,
+    CONFIG_UINT32_FIX_MOVE_PACKETS_ADD_TIME,
     CONFIG_UINT32_VALUE_COUNT
 };
 
@@ -199,6 +241,7 @@ enum eConfigInt32Values
     CONFIG_INT32_ARENA_STARTPERSONALRATING,
     CONFIG_INT32_QUEST_LOW_LEVEL_HIDE_DIFF,
     CONFIG_INT32_QUEST_HIGH_LEVEL_HIDE_DIFF,
+    CONFIG_INT32_CALENDAR_REMOVE_EXPIRED_EVENTS_DELAY,
     CONFIG_INT32_VALUE_COUNT
 };
 
@@ -224,8 +267,11 @@ enum eConfigFloatValues
     CONFIG_FLOAT_RATE_DROP_ITEM_REFERENCED,
     CONFIG_FLOAT_RATE_DROP_MONEY,
     CONFIG_FLOAT_RATE_XP_KILL,
+    CONFIG_FLOAT_RATE_XP_PETKILL,
     CONFIG_FLOAT_RATE_XP_QUEST,
     CONFIG_FLOAT_RATE_XP_EXPLORE,
+    CONFIG_FLOAT_RATE_RAF_XP,
+    CONFIG_FLOAT_RATE_RAF_LEVELPERLEVEL,
     CONFIG_FLOAT_RATE_REPUTATION_GAIN,
     CONFIG_FLOAT_RATE_REPUTATION_LOWLEVEL_KILL,
     CONFIG_FLOAT_RATE_REPUTATION_LOWLEVEL_QUEST,
@@ -245,6 +291,7 @@ enum eConfigFloatValues
     CONFIG_FLOAT_RATE_CREATURE_ELITE_WORLDBOSS_SPELLDAMAGE,
     CONFIG_FLOAT_RATE_CREATURE_ELITE_RARE_SPELLDAMAGE,
     CONFIG_FLOAT_RATE_CREATURE_AGGRO,
+    CONFIG_FLOAT_RATE_CREATURE_AGGRO_IN_INSTANCE,
     CONFIG_FLOAT_RATE_REST_INGAME,
     CONFIG_FLOAT_RATE_REST_OFFLINE_IN_TAVERN_OR_CITY,
     CONFIG_FLOAT_RATE_REST_OFFLINE_IN_WILDERNESS,
@@ -274,6 +321,12 @@ enum eConfigFloatValues
     CONFIG_FLOAT_THREAT_RADIUS,
     CONFIG_FLOAT_GHOST_RUN_SPEED_WORLD,
     CONFIG_FLOAT_GHOST_RUN_SPEED_BG,
+    CONFIG_FLOAT_PLAYERBOT_MINDISTANCE,
+    CONFIG_FLOAT_PLAYERBOT_MAXDISTANCE,
+    CONFIG_FLOAT_CROWDCONTROL_HP_BASE,
+    CONFIG_FLOAT_LOADBALANCE_HIGHVALUE,
+    CONFIG_FLOAT_LOADBALANCE_LOWVALUE,
+    CONFIG_FLOAT_MELEE_DIST_ADDITION,
     CONFIG_FLOAT_VALUE_COUNT
 };
 
@@ -290,6 +343,7 @@ enum eConfigBoolValues
     CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_GUILD,
     CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_AUCTION,
     CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_MAIL,
+    CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CALENDAR,
     CONFIG_BOOL_ALLOW_TWO_SIDE_WHO_LIST,
     CONFIG_BOOL_ALLOW_TWO_SIDE_ADD_FRIEND,
     CONFIG_BOOL_INSTANCE_IGNORE_LEVEL,
@@ -298,10 +352,12 @@ enum eConfigBoolValues
     CONFIG_BOOL_GM_LOG_TRADE,
     CONFIG_BOOL_GM_LOWER_SECURITY,
     CONFIG_BOOL_GM_ALLOW_ACHIEVEMENT_GAINS,
+    CONFIG_BOOL_GM_ANNOUNCE_BAN,
     CONFIG_BOOL_SKILL_PROSPECTING,
     CONFIG_BOOL_ALWAYS_MAX_SKILL_FOR_LEVEL,
     CONFIG_BOOL_WEATHER,
     CONFIG_BOOL_EVENT_ANNOUNCE,
+    CONFIG_BOOL_AUTOBROADCAST,
     CONFIG_BOOL_QUEST_IGNORE_RAID,
     CONFIG_BOOL_DETECT_POS_COLLISION,
     CONFIG_BOOL_RESTRICTED_LFG_CHANNEL,
@@ -327,12 +383,59 @@ enum eConfigBoolValues
     CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS,
     CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_JOIN,
     CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_EXIT,
+    CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_START,
+    CONFIG_BOOL_OUTDOORPVP_SI_ENABLED,
+    CONFIG_BOOL_OUTDOORPVP_EP_ENABLED,
+    CONFIG_BOOL_OUTDOORPVP_HP_ENABLED,
+    CONFIG_BOOL_OUTDOORPVP_ZM_ENABLED,
+    CONFIG_BOOL_OUTDOORPVP_TF_ENABLED,
+    CONFIG_BOOL_OUTDOORPVP_NA_ENABLED,
+    CONFIG_BOOL_OUTDOORPVP_GH_ENABLED,
+    CONFIG_BOOL_OUTDOORPVP_WG_ENABLED,
     CONFIG_BOOL_KICK_PLAYER_ON_BAD_PACKET,
     CONFIG_BOOL_STATS_SAVE_ONLY_ON_LOGOUT,
     CONFIG_BOOL_CLEAN_CHARACTER_DB,
     CONFIG_BOOL_VMAP_INDOOR_CHECK,
+    CONFIG_BOOL_LOOT_CHESTS_IGNORE_DB,
     CONFIG_BOOL_PET_UNSUMMON_AT_MOUNT,
+    CONFIG_BOOL_RAID_FLAGS_UNIQUE,
+    CONFIG_BOOL_ANTICHEAT_ENABLE,
+    CONFIG_BOOL_ANTICHEAT_WARDEN,
+    CONFIG_BOOL_ALLOW_FLIGHT_ON_OLD_MAPS,
+    CONFIG_BOOL_LFG_ENABLE,
+    CONFIG_BOOL_LFR_ENABLE,
+    CONFIG_BOOL_LFG_DEBUG_ENABLE,
+    CONFIG_BOOL_LFR_EXTEND,
+    CONFIG_BOOL_LFG_ONLYLASTENCOUNTER,
+    CONFIG_BOOL_PLAYERBOT_DISABLE,
+    CONFIG_BOOL_PLAYERBOT_DEBUGWHISPER,
+    CONFIG_BOOL_PLAYERBOT_SHAREDBOTS,
+    CONFIG_BOOL_ALLOW_CUSTOM_MAPS,
+    CONFIG_BOOL_ALLOW_HONOR_KILLS_TITLES,
+    CONFIG_BOOL_PET_SAVE_ALL,
+    CONFIG_BOOL_THREADS_DYNAMIC,
+    CONFIG_BOOL_VMSS_ENABLE,
+    CONFIG_BOOL_VMSS_TRYSKIPFIRST,
+    CONFIG_BOOL_VMSS_CONTINENTS_SKIP,
+    CONFIG_BOOL_PLAYERBOT_ALLOW_SUMMON_OPPOSITE_FACTION,
+    CONFIG_BOOL_PLAYERBOT_COLLECT_COMBAT,
+    CONFIG_BOOL_PLAYERBOT_COLLECT_QUESTS,
+    CONFIG_BOOL_PLAYERBOT_COLLECT_PROFESSION,
+    CONFIG_BOOL_PLAYERBOT_COLLECT_LOOT,
+    CONFIG_BOOL_PLAYERBOT_COLLECT_SKIN,
+    CONFIG_BOOL_PLAYERBOT_COLLECT_OBJECTS,
+    CONFIG_BOOL_PLAYERBOT_SELL_TRASH,
     CONFIG_BOOL_MMAP_ENABLED,
+    CONFIG_BOOL_RESET_DUEL_AREA_ENABLED,
+    CONFIG_BOOL_PET_ADVANCED_AI,
+    CONFIG_BOOL_PET_ADVANCED_AI_SLACKER,
+    CONFIG_BOOL_RESILIENCE_ALTERNATIVE_CALCULATION,
+    CONFIG_BOOL_BLINK_ANIMATION_TYPE,
+    CONFIG_BOOL_FACTION_AND_RACE_CHANGE_WITHOUT_RENAMING,
+    CONFIG_BOOL_RESIST_ADD_BY_OVER_LEVEL,
+    CONFIG_BOOL_DYNAMIC_VMAP_DOUBLE_CHECK,
+    CONFIG_BOOL_INSTANCES_RESET_GROUP_ANNOUNCE,
+    CONFIG_BOOL_PLAYER_COMMANDS,
     CONFIG_BOOL_VALUE_COUNT
 };
 
@@ -434,13 +537,16 @@ struct CliCommandHolder
 class World
 {
     public:
-        static volatile uint32 m_worldLoopCounter;
+        static ACE_Atomic_Op<MANGOSR2_MUTEX_MODEL_2, uint32> m_worldLoopCounter;
 
         World();
         ~World();
 
+        void CleanupsBeforeStop();
+
         WorldSession* FindSession(uint32 id) const;
         void AddSession(WorldSession *s);
+        void SendBroadcast();
         bool RemoveSession(uint32 id);
         /// Get the number of current active sessions
         void UpdateMaxSessionCounters();
@@ -491,9 +597,12 @@ class World
         time_t const& GetGameTime() const { return m_gameTime; }
         /// Uptime (in secs)
         uint32 GetUptime() const { return uint32(m_gameTime - m_startTime); }
+        /// Update time
+        uint32 GetUpdateTime() const { return m_updateTime; }
         /// Next daily quests reset time
         time_t GetNextDailyQuestsResetTime() const { return m_NextDailyQuestReset; }
         time_t GetNextWeeklyQuestsResetTime() const { return m_NextWeeklyQuestReset; }
+        time_t GetNextRandomBGResetTime() const { return m_NextRandomBGReset; }
 
         /// Get the maximum skill level a player can reach
         uint16 GetConfigMaxSkillValue() const
@@ -506,11 +615,13 @@ class World
         void LoadConfigSettings(bool reload = false);
 
         void SendWorldText(int32 string_id, ...);
-        void SendGlobalText(const char* text, WorldSession* self);
-        void SendGlobalMessage(WorldPacket* packet, WorldSession* self = NULL, Team team = TEAM_NONE);
+        void SendWorldTextWithSecurity(AccountTypes security, int32 string_id, ...);
+        void SendGlobalMessage(WorldPacket* packet, WorldSession* self = NULL, Team team = TEAM_NONE, AccountTypes security = SEC_PLAYER);
         void SendZoneMessage(uint32 zone, WorldPacket* packet, WorldSession* self = NULL, Team team = TEAM_NONE);
         void SendZoneText(uint32 zone, const char* text, WorldSession* self = NULL, Team team = TEAM_NONE);
         void SendServerMessage(ServerMessageType type, const char* text = "", Player* player = NULL);
+        void SendZoneUnderAttackMessage(uint32 zoneId, Team team);
+        void SendDefenseMessage(uint32 zoneId, int32 textId);
 
         /// Are we in the middle of a shutdown?
         bool IsShutdowning() const { return m_ShutdownTimer > 0; }
@@ -519,7 +630,7 @@ class World
         void ShutdownMsg(bool show = false, Player* player = NULL);
         static uint8 GetExitCode() { return m_ExitCode; }
         static void StopNow(uint8 exitcode) { m_stopEvent = true; m_ExitCode = exitcode; }
-        static bool IsStopped() { return m_stopEvent; }
+        static bool IsStopped() { return m_stopEvent.value(); }
 
         void Update(uint32 diff);
 
@@ -554,6 +665,8 @@ class World
         BanReturn BanAccount(BanMode mode, std::string nameOrIP, uint32 duration_secs, std::string reason, std::string author);
         bool RemoveBanAccount(BanMode mode, std::string nameOrIP);
 
+        float GetCreatureAggroRate(Unit const* unit) const;
+
         // for max speed access
         static float GetMaxVisibleDistanceOnContinents()    { return m_MaxVisibleDistanceOnContinents; }
         static float GetMaxVisibleDistanceInInstances()     { return m_MaxVisibleDistanceInInstances;  }
@@ -563,7 +676,7 @@ class World
         static float GetVisibleUnitGreyDistance()           { return m_VisibleUnitGreyDistance;       }
         static float GetVisibleObjectGreyDistance()         { return m_VisibleObjectGreyDistance;     }
 
-        static float GetRelocationLowerLimitSq()            { return m_relocation_lower_limit_sq; }
+        static float GetRelocationLowerLimit()              { return m_relocation_lower_limit; }
         static uint32 GetRelocationAINotifyDelay()          { return m_relocation_ai_notify_delay; }
 
         void ProcessCliCommands();
@@ -572,8 +685,6 @@ class World
         void UpdateResultQueue();
         void InitResultQueue();
 
-        void UpdateRealmCharCount(uint32 accid);
-
         LocaleConstant GetAvailableDbcLocale(LocaleConstant locale) const { if(m_availableDbcLocaleMask & (1 << locale)) return locale; else return m_defaultDbcLocale; }
 
         //used World DB version
@@ -581,18 +692,33 @@ class World
         char const* GetDBVersion() { return m_DBVersion.c_str(); }
         char const* GetCreatureEventAIVersion() { return m_CreatureEventAIVersion.c_str(); }
 
+        // multithread locking (World locking used only if object map == NULL)
+        ObjectLockType& GetLock(MapLockType _locktype = MAP_LOCK_TYPE_DEFAULT) { return i_lock[_locktype]; }
+
+        // reset duel system
+        void setDuelResetEnableAreaIds(const char* areas);
+        bool IsAreaIdEnabledDuelReset(uint32 areaId);
+
+        // Disable dungeons for LFG system
+        void setDisabledMapIdForDungeonFinder(const char* areas);
+        bool IsDungeonMapIdDisable(uint32 mapId);
+
+        void InvalidatePlayer(ObjectGuid const& guid);
+
     protected:
         void _UpdateGameTime();
-        // callback for UpdateRealmCharacters
-        void _UpdateRealmCharCount(QueryResult *resultCharCount, uint32 accountId);
 
         void InitDailyQuestResetTime();
         void InitWeeklyQuestResetTime();
+
         void SetMonthlyQuestResetTime(bool initialize = true);
         void ResetDailyQuests();
         void ResetWeeklyQuests();
         void ResetMonthlyQuests();
 
+        void InitRandomBGResetTime();
+        void ResetRandomBG();
+
     private:
         void setConfig(eConfigUInt32Values index, char const* fieldname, uint32 defvalue);
         void setConfig(eConfigInt32Values index, char const* fieldname, int32 defvalue);
@@ -610,7 +736,7 @@ class World
         bool configNoReload(bool reload, eConfigFloatValues index, char const* fieldname, float defvalue);
         bool configNoReload(bool reload, eConfigBoolValues index, char const* fieldname, bool defvalue);
 
-        static volatile bool m_stopEvent;
+        static ACE_Atomic_Op<MANGOSR2_MUTEX_MODEL_2, bool> m_stopEvent;
         static uint8 m_ExitCode;
         uint32 m_ShutdownTimer;
         uint32 m_ShutdownMask;
@@ -620,6 +746,7 @@ class World
         IntervalTimer m_timers[WUPDATE_COUNT];
         uint32 mail_timer;
         uint32 mail_timer_expires;
+        uint32 m_updateTime;
 
         typedef UNORDERED_MAP<uint32, Weather*> WeatherMap;
         WeatherMap m_weathers;
@@ -650,30 +777,39 @@ class World
         static float m_VisibleUnitGreyDistance;
         static float m_VisibleObjectGreyDistance;
 
-        static float  m_relocation_lower_limit_sq;
+        static float  m_relocation_lower_limit;
         static uint32 m_relocation_ai_notify_delay;
 
         // CLI command holder to be thread safe
-        ACE_Based::LockedQueue<CliCommandHolder*,ACE_Thread_Mutex> cliCmdQueue;
+        ACE_Based::LockedQueue<CliCommandHolder*, MANGOSR2_MUTEX_MODEL_2> cliCmdQueue;
 
         // next daily quests reset time
         time_t m_NextDailyQuestReset;
         time_t m_NextWeeklyQuestReset;
         time_t m_NextMonthlyQuestReset;
 
+        time_t m_NextRandomBGReset;
+
         //Player Queue
         Queue m_QueuedSessions;
 
         //sessions that are added async
         void AddSession_(WorldSession* s);
-        ACE_Based::LockedQueue<WorldSession*, ACE_Thread_Mutex> addSessQueue;
+        ACE_Based::LockedQueue<WorldSession*, MANGOSR2_MUTEX_MODEL_2> addSessQueue;
 
         //used versions
         std::string m_DBVersion;
         std::string m_CreatureEventAIVersion;
-};
 
-extern uint32 realmID;
+        // World locking for global (not-in-map) objects.
+        mutable ObjectLockType   i_lock[MAP_LOCK_TYPE_MAX];
+
+        // reset duel system
+        UNORDERED_SET<uint32> areaEnabledIds; //set of areaIds where is enabled the Duel reset system
+        // Disable dungeons for LFG system
+        UNORDERED_SET<uint32> disabledMapIdForDungeonFinder; // set of MapIds which are disabled for DungeonFinder
+
+};
 
 #define sWorld MaNGOS::Singleton<World>::Instance()
 #endif
diff --git a/src/game/WorldLocation.cpp b/src/game/WorldLocation.cpp
new file mode 100644
index 00000000000..5156c28afff
--- /dev/null
+++ b/src/game/WorldLocation.cpp
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2012 MangosR2 <http://mangosR2.2x2forum.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "GridMap.h"
+#include "MapManager.h"
+#include "Object.h"
+#include "Unit.h"
+#include "World.h"
+#include "WorldLocation.h"
+
+Location& Location::operator = (Location const& loc)
+{
+    x = loc.getX();
+    y = loc.getY();
+    z = loc.getZ();
+    orientation = loc.getO();
+    return *this;
+}
+
+bool Location::operator == (Location const& loc) const
+{
+    return ((fabs(getX() - loc.getX()) < M_NULL_F)
+        && (fabs(getY() - loc.getY()) < M_NULL_F)
+        && (fabs(getZ() - loc.getZ()) < M_NULL_F));
+};
+
+float Location::GetDistance(Location const& loc) const
+{
+    return (*this - loc).magnitude();
+};
+
+bool Location::IsEmpty() const
+{
+    return fabs(getX()) < M_NULL_F && fabs(getY()) < M_NULL_F && fabs(getZ()) < M_NULL_F;
+}
+
+Position& Position::operator = (Position const& pos)
+{
+    x           = pos.getX();
+    y           = pos.getY();
+    z           = pos.getZ();
+    orientation = pos.getO();
+    m_phaseMask = pos.GetPhaseMask();
+
+    return *this;
+}
+
+bool Position::operator == (Position const& pos) const
+{
+    return (((Location)*this) == ((Location)pos)) && (GetPhaseMask() & pos.GetPhaseMask());
+};
+
+float Position::GetDistance(Position const& pos) const
+{
+    return (GetPhaseMask() & pos.GetPhaseMask()) ?
+        ((Location)*this).GetDistance((Location)pos) :
+        MAX_VISIBILITY_DISTANCE + 1.0f;
+};
+
+WorldLocation const WorldLocation::Null = WorldLocation();
+
+WorldLocation::WorldLocation(uint32 _mapid, float _x, float _y, float _z, float _o, uint32 phaseMask, uint32 _instance, uint32 _realmid)
+    : Position(_x, _y, _z, _o, phaseMask), mapid(_mapid), instance(_instance), realmid(_realmid), m_Tpos(Position()), m_Tguid(ObjectGuid())
+{
+    if (realmid == 0)
+        SetRealmId(sWorld.getConfig(CONFIG_UINT32_REALMID));
+};
+
+bool WorldLocation::IsValidMapCoord(WorldLocation const& loc)
+{
+    if (loc.HasMap())
+        return MapManager::IsValidMapCoord(loc);
+    else
+        return MaNGOS::IsValidMapCoord(loc.getX(), loc.getY(), loc.getZ(), loc.getO());
+}
+
+bool WorldLocation::operator == (WorldLocation const& loc) const
+{
+    return (
+            (realmid == 0 || realmid == loc.realmid)
+        && (!HasMap() || GetMapId()  == loc.GetMapId())
+        && (GetInstanceId() == 0 || GetInstanceId() == loc.GetInstanceId())
+        && ((Position)*this) == ((Position)loc)
+        && GetTransportPos() == loc.GetTransportPos());
+}
+
+void WorldLocation::SetMapId(uint32 value)
+{
+    //if (!MapManager::IsValidMAP(value))
+    //    sLog.outError("WorldLocation::SetMapId try set invalid map id!");
+    mapid = value;
+}
+
+void WorldLocation::SetOrientation(float value)
+{
+    if (fabs(value) > 2.0f * M_PI_F)
+        orientation = MapManager::NormalizeOrientation(value);
+    else
+        orientation = value;
+}
+
+WorldLocation& WorldLocation::operator = (WorldLocation const& loc)
+{
+    //if (!IsValidMapCoord(loc))
+    //    sLog.outError("WorldLocation::operator = try set invalid location!");
+
+    if (loc.HasMap())
+    {
+        mapid       = loc.GetMapId();
+        instance    = loc.GetInstanceId();
+    }
+    m_Tpos      = loc.GetTransportPos();
+    x           = loc.getX();
+    y           = loc.getY();
+    z           = loc.getZ();
+    orientation = loc.getO();
+    m_phaseMask = loc.GetPhaseMask();
+    m_Tguid     = loc.GetTransportGuid();
+    return *this;
+}
+
+WorldLocation& WorldLocation::operator = (Position const& pos)
+{
+    x           = pos.getX();
+    y           = pos.getY();
+    z           = pos.getZ();
+    orientation = pos.getO();
+    m_phaseMask = pos.GetPhaseMask();
+    return *this;
+}
+
+void WorldLocation::SetPosition(Position const& pos)
+{
+    if (GetTransportGuid().IsEmpty())
+    {
+        x           = pos.getX();
+        y           = pos.getY();
+        z           = pos.getZ();
+        orientation = pos.getO();
+        //m_phaseMask = pos.GetPhaseMask();
+    }
+    else
+        SetTransportPosition(pos);
+}
+
+void WorldLocation::SetPosition(WorldLocation const& loc)
+{
+    // This method not set transport position!
+    if (loc.HasMap())
+    {
+        mapid       = loc.GetMapId();
+        instance    = loc.GetInstanceId();
+    }
+    x           = loc.getX();
+    y           = loc.getY();
+    z           = loc.getZ();
+    orientation = loc.getO();
+    //m_phaseMask = loc.GetPhaseMask();
+}
+
+/*void WorldLocation::SetPosition(MovementInfo const& mi)
+{
+    // This method not set transport position!
+    if (mi.GetPosition().HasMap())
+    {
+        mapid       = mi.GetPosition().mapid;
+        instance    = mi.GetPosition().instance;
+    }
+    x           = mi.GetPosition().getX();
+    y           = mi.GetPosition().getY();
+    z           = mi.GetPosition().getZ();
+    orientation = mi.GetPosition().getO();
+    //m_phaseMask = loc.GetPhaseMask();
+
+    if (mi.GetTransportGuid())
+    {
+        SetTransportGuid(mi.GetTransportGuid());
+        SetTransportPosition(mi.GetTransportPosition());
+    }
+    else
+        ClearTransportData();
+}
+*/
+uint32 WorldLocation::GetAreaId() const
+{
+    if (!HasMap())
+        return 0;
+
+    return sTerrainMgr.GetAreaId(GetMapId(), getX(), getY(), getZ());
+}
+
+uint32 WorldLocation::GetZoneId() const
+{
+    if (!HasMap())
+        return 0;
+
+    return sTerrainMgr.GetZoneId(GetMapId(), getX(), getY(), getZ());
+}
+
+float WorldLocation::GetDistance(WorldLocation const& loc) const
+{
+    if (!HasMap() || !loc.HasMap() || ((GetMapId() == loc.GetMapId()) && (GetInstanceId() == loc.GetInstanceId())))
+    {
+        if (GetTransportPos().IsEmpty() && loc.GetTransportPos().IsEmpty())
+            return ((Position)*this).GetDistance((Position)loc);
+        else if (GetPhaseMask() & loc.GetPhaseMask() &&  GetTransportPos().GetPhaseMask() & loc.GetTransportPos().GetPhaseMask())
+            return (((Vector3)*this + (Vector3)GetTransportPos()) - ((Vector3)loc + (Vector3)loc.GetTransportPos())).magnitude();
+    }
+
+    return MAX_VISIBILITY_DISTANCE + 1.0f;
+};
+
+float WorldLocation::GetDistance(Location const& loc) const
+{
+    return (((Vector3)*this + (Vector3)GetTransportPos()) - (Vector3)loc).magnitude();
+};
+
+ByteBuffer& operator << (ByteBuffer& buf, Location const& loc)
+{
+    buf << loc.getX();
+    buf << loc.getY();
+    buf << loc.getZ();
+    return buf;
+}
+
+ByteBuffer& operator >> (ByteBuffer& buf, Location& loc)
+{
+    loc.x = buf.read<float>();
+    loc.y = buf.read<float>();
+    loc.z = buf.read<float>();
+    return buf;
+}
diff --git a/src/game/WorldLocation.h b/src/game/WorldLocation.h
new file mode 100644
index 00000000000..cffbcff6fc5
--- /dev/null
+++ b/src/game/WorldLocation.h
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2012-2013 /dev/rsa for MangosR2 <http://github.com/mangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _WORLDLOCATION_H
+#define _WORLDLOCATION_H
+
+#include "Common.h"
+#include "SharedDefines.h"
+#include "ByteBuffer.h"
+#include "ObjectGuid.h"
+#include <G3D/Vector3.h>
+
+class MovementInfo;
+
+using G3D::Vector3;
+
+struct MANGOS_DLL_SPEC Location : public Vector3
+{
+    Location() 
+        : Vector3(0.0f, 0.0f, 0.0f), orientation(0.0f)
+    {}
+
+    Location(float x, float y, float z, float o = 0.0f)
+        : Vector3(x, y, z), orientation(o)
+    {}
+
+    Location(const Vector3& v, float o = 0.0f)
+        : Vector3(v), orientation(o)
+    {}
+
+    Location(Location const &loc)
+        : Vector3(loc.x, loc.y, loc.z), orientation(loc.orientation)
+    {}
+
+    virtual ~Location()
+    {};
+
+    virtual bool HasMap() const { return false; };
+
+    Location& operator = (Location const& loc);
+    bool operator == (Location const& loc) const;
+
+    float GetDistance(Location const& loc) const;
+
+    bool IsEmpty() const;
+
+    float const& getX() const { return x; };
+    float const& getY() const { return y; };
+    float const& getZ() const { return z; };
+    float const& getO() const { return orientation; };
+
+    union
+    {
+        float orientation;
+        float o;
+    };
+};
+
+struct MANGOS_DLL_SPEC Position : public Location
+{
+    Position() 
+        : Location(), m_phaseMask(PHASEMASK_NORMAL)
+    {};
+
+    explicit Position(float _x, float _y, float _z, float _o = 0.0f)
+        : Location(_x, _y, _z, _o), m_phaseMask(PHASEMASK_NORMAL)
+    {};
+
+    explicit Position(float _x, float _y, float _z, float _o, uint32 phaseMask)
+        : Location(_x, _y, _z, _o), m_phaseMask(phaseMask)
+    {};
+
+    Position(Position const &pos)
+        : Location(pos.x, pos.y, pos.z, pos.orientation), m_phaseMask(pos.GetPhaseMask())
+    {}
+
+    Position(Position const &pos, uint32 phaseMask)
+        : Location(pos.x, pos.y, pos.z, pos.orientation), m_phaseMask(phaseMask)
+    {}
+
+    virtual ~Position()
+    {};
+
+    uint32 m_phaseMask;
+
+    virtual void SetPhaseMask(uint32 newPhaseMask) { m_phaseMask = newPhaseMask; };
+    uint32 GetPhaseMask() const { return m_phaseMask; }
+
+    virtual bool HasMap() const override { return false; };
+
+    Position& operator = (Position const& pos);
+    bool operator == (Position const& pos) const;
+
+    float GetDistance(Position const& pos) const;
+};
+
+class WorldObject;
+
+struct MANGOS_DLL_SPEC WorldLocation : public Position
+{
+
+    public:
+    WorldLocation()
+        : Position(), mapid(-1), instance(0), realmid(0), m_Tpos(Position()), m_Tguid(ObjectGuid())
+    {}
+
+    explicit WorldLocation(uint32 _mapid, float _x, float _y, float _z, float _o = 0.0f, uint32 phaseMask = PHASEMASK_NORMAL, uint32 _instance = 0, uint32 _realmid = 0);
+
+    explicit WorldLocation(uint32 _mapid, uint32 _instance, uint32 _realmid)
+        : Position(), mapid(_mapid), instance(_instance), realmid(_realmid), m_Tpos(Position()), m_Tguid(ObjectGuid())
+    {}
+
+    WorldLocation(WorldLocation const &loc)
+        : Position(loc.x, loc.y, loc.z, loc.orientation, loc.GetPhaseMask()), mapid(loc.mapid), instance(loc.instance), realmid(loc.realmid), m_Tpos(loc.m_Tpos), m_Tguid(ObjectGuid())
+    {}
+
+    virtual ~WorldLocation() 
+    {};
+
+    static WorldLocation const Null;
+
+    bool operator == (WorldLocation const& loc) const;
+
+    virtual bool HasMap() const override
+    {
+        return mapid >= 0;
+    }
+
+    // Returns and set current ACTIVE position!
+    Position const& value() { return GetPosition(); };
+    Position const& GetPosition() { return GetTransportGuid().IsEmpty() ? ((Position)*this) : GetTransportPos(); };
+    void SetPosition(Position const& pos);
+
+    uint32 GetZoneId() const;
+    uint32 GetAreaId() const;
+
+    uint32 GetRealmId()    const { return realmid; };
+    uint32 GetMapId()      const { return HasMap() ? uint32(mapid) :  UINT32_MAX; };
+    uint32 GetInstanceId() const { return HasMap() ? instance :  0; };
+
+
+    void SetMapId(uint32 value);
+    void SetInstanceId(uint32 value)  { instance = value; };
+    void SetRealmId(uint32 value)     { realmid  = value; }; // Currently not need make realm switch - awaiting multirealm implement.
+
+    bool IsValidMapCoord(WorldLocation const& loc);
+
+    void SetOrientation(float value);
+
+    WorldLocation& operator = (WorldLocation const& loc);
+    WorldLocation& operator = (Position const& pos);
+
+    void SetPosition(WorldLocation const& loc);
+    //void SetPosition(MovementInfo const& mi);
+
+    float GetDistance(WorldLocation const& loc) const;
+
+    float GetDistance(Location const& loc) const;
+
+    private:
+    int32     mapid;                      // mapid    = -1 for not fully initialized WorldLocation
+    uint32    instance;                   // instance = 0  for not fully initialized WorldLocation ("current instance")
+    uint32    realmid;                    // realmid  = 0  for "always current realm". 
+
+    // Transport relative position
+    public:
+    Position const& GetTransportPos() const { return m_Tpos; };
+    Position& GetTransportPosition() { return m_Tpos; };
+    void ClearTransportData() { m_Tguid = ObjectGuid(); m_Tpos = Position(); };
+    void SetTransportPosition(Position const& pos) { m_Tpos = pos; };
+    ObjectGuid const& GetTransportGuid() const { return m_Tguid; };
+    void SetTransportGuid(ObjectGuid const& guid) { m_Tguid = guid; };
+
+    private:
+    Position    m_Tpos;
+    ObjectGuid  m_Tguid;
+};
+
+ByteBuffer& operator << (ByteBuffer& buf, Location const& loc);
+ByteBuffer& operator >> (ByteBuffer& buf, Location&       loc);
+
+#endif
diff --git a/src/game/WorldObjectEvents.cpp b/src/game/WorldObjectEvents.cpp
new file mode 100644
index 00000000000..034a495b1c9
--- /dev/null
+++ b/src/game/WorldObjectEvents.cpp
@@ -0,0 +1,598 @@
+/*
+ * Copyright (C) 2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Object.h"
+#include "WorldObjectEvents.h"
+#include "Spell.h"
+#include "SpellMgr.h"
+#include "Unit.h"
+#include "Creature.h"
+#include "CreatureAI.h"
+#include "PetAI.h"
+#include "ObjectMgr.h"
+#include "Vehicle.h"
+#include "InstanceData.h"
+#include "GridNotifiersImpl.h"
+#include "CellImpl.h"
+#include "BattleGround/BattleGroundMgr.h"
+
+// Event processor
+
+WorldObjectEventProcessor::WorldObjectEventProcessor()
+{
+    //m_time = WorldTimer::getMSTime();
+    WriteGuard Guard(GetLock());
+    m_events.clear();
+}
+
+void WorldObjectEventProcessor::Update(uint32 p_time, bool force)
+{
+    if (force)
+        RenewEvents();
+
+    ReadGuard Guard(GetLock());
+    EventProcessor::Update(p_time);
+}
+
+void WorldObjectEventProcessor::KillAllEvents(bool force)
+{
+    if (force)
+    {
+        RenewEvents();
+        EventProcessor::KillAllEvents(force);
+    }
+    else
+        SetNeedKill(true);
+}
+
+void WorldObjectEventProcessor::AddEvent(BasicEvent* Event, uint64 e_time, bool set_addtime)
+{
+    if (set_addtime)
+        Event->m_addTime = m_time;
+
+    Event->m_execTime = e_time;
+    m_queue.push(std::pair<uint64, BasicEvent*>(e_time, Event));
+}
+
+void WorldObjectEventProcessor::RenewEvents()
+{
+    bool needInsert;
+    WriteGuard Guard(GetLock());
+
+    if (IsNeedKill())
+    {
+        EventProcessor::KillAllEvents(false);
+        SetNeedKill(false);
+    }
+
+    while (!m_queue.empty())
+    {
+        if (m_queue.front().second)
+        {
+            needInsert = true;
+            WorldObjectEventType eventType = WorldObjectEventType(m_queue.front().second->GetType());
+            switch (eventType)
+            {
+                case WORLDOBJECT_EVENT_TYPE_UNIQUE:
+                case WORLDOBJECT_EVENT_TYPE_EVADE_UNIQUE:
+                {
+                    for (EventList::const_iterator i = m_events.begin(); i != m_events.end(); ++i)
+                    {
+                        if (i->second->GetType() == eventType)
+                        {
+                            BasicEvent* event = m_queue.front().second;
+                            delete event;
+                            needInsert = false;
+                            break;
+                        }
+                    }
+                    break;
+                }
+                case WORLDOBJECT_EVENT_TYPE_REPEATABLE:
+                case WORLDOBJECT_EVENT_TYPE_DEATH:
+                case WORLDOBJECT_EVENT_TYPE_COMMON:
+                default:
+                    break;
+            }
+            if (needInsert)
+                m_events.insert(m_queue.front());
+        }
+        m_queue.pop();
+    }
+}
+
+void WorldObjectEventProcessor::CleanupEventList()
+{
+    KillAllEvents(false);
+}
+
+// Spell events
+SpellEvent::SpellEvent(Spell* spell) : BasicEvent(WORLDOBJECT_EVENT_TYPE_COMMON)
+{
+    m_Spell = spell;
+}
+
+SpellEvent::~SpellEvent()
+{
+    if (m_Spell->getState() != SPELL_STATE_FINISHED)
+        m_Spell->cancel();
+
+    if (m_Spell->IsDeletable())
+    {
+        delete m_Spell;
+    }
+    else
+    {
+        sLog.outError("~SpellEvent: %s %u tried to delete non-deletable spell %u. Was not deleted, causes memory leak.",
+            (m_Spell->GetCaster()->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), m_Spell->GetCaster()->GetGUIDLow(), m_Spell->m_spellInfo->Id);
+    }
+}
+
+bool SpellEvent::Execute(uint64 e_time, uint32 p_time)
+{
+    // update spell if it is not finished
+    if (m_Spell->getState() != SPELL_STATE_FINISHED)
+        m_Spell->update(p_time);
+
+    // check spell state to process
+    switch (m_Spell->getState())
+    {
+        case SPELL_STATE_FINISHED:
+        {
+            // spell was finished, check deletable state
+            if (m_Spell->IsDeletable())
+            {
+                // check, if we do have unfinished triggered spells
+                return true;                                // spell is deletable, finish event
+            }
+            // event will be re-added automatically at the end of routine)
+        } break;
+
+        case SPELL_STATE_CASTING:
+        {
+            // this spell is in channeled state, process it on the next update
+            // event will be re-added automatically at the end of routine)
+        } break;
+
+        case SPELL_STATE_DELAYED:
+        {
+            // first, check, if we have just started
+            if (m_Spell->GetDelayStart() != 0)
+            {
+                // no, we aren't, do the typical update
+                // check, if we have channeled spell on our hands
+                if (IsChanneledSpell(m_Spell->m_spellInfo))
+                {
+                    // evented channeled spell is processed separately, casted once after delay, and not destroyed till finish
+                    // check, if we have casting anything else except this channeled spell and autorepeat
+                    if (m_Spell->GetCaster()->IsNonMeleeSpellCasted(false, true, true))
+                    {
+                        // another non-melee non-delayed spell is casted now, abort
+                        m_Spell->cancel();
+                    }
+                    else
+                    {
+                        // do the action (pass spell to channeling state)
+                        m_Spell->handle_immediate();
+                    }
+                    // event will be re-added automatically at the end of routine)
+                }
+                else
+                {
+                    // run the spell handler and think about what we can do next
+                    uint64 t_offset = e_time - m_Spell->GetDelayStart();
+                    uint64 n_offset = m_Spell->handle_delayed(t_offset);
+                    if (n_offset)
+                    {
+                        // re-add us to the queue
+                        m_Spell->GetCaster()->AddEvent(this, m_Spell->GetDelayStart() + n_offset, false);
+                        return false;                       // event not complete
+                    }
+                    // event complete
+                    // finish update event will be re-added automatically at the end of routine)
+                }
+            }
+            else
+            {
+                // delaying had just started, record the moment
+                m_Spell->SetDelayStart(e_time);
+                // re-plan the event for the delay moment
+                m_Spell->GetCaster()->AddEvent(this, e_time + m_Spell->GetDelayMoment(), false);
+                return false;                               // event not complete
+            }
+        } break;
+
+        default:
+        {
+            // all other states
+            // event will be re-added automatically at the end of routine)
+        } break;
+    }
+
+    // spell processing not complete, plan event on the next update interval
+    m_Spell->GetCaster()->AddEvent(this, e_time + 1, false);
+    return false;                                           // event not complete
+}
+
+void SpellEvent::Abort(uint64 /*e_time*/)
+{
+    // oops, the spell we try to do is aborted
+    if (m_Spell->getState() != SPELL_STATE_FINISHED)
+        m_Spell->cancel(true);
+}
+
+bool SpellEvent::IsDeletable() const
+{
+    return m_Spell->IsDeletable();
+}
+
+// Unit events
+RelocationNotifyEvent::RelocationNotifyEvent(Unit& owner) : BasicEvent(WORLDOBJECT_EVENT_TYPE_COMMON), m_owner(owner)
+{
+    m_owner._SetAINotifyScheduled(true);
+}
+
+bool RelocationNotifyEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
+{
+    float radius = MAX_CREATURE_ATTACK_RADIUS * sWorld.GetCreatureAggroRate(&m_owner);
+    if (m_owner.GetTypeId() == TYPEID_PLAYER)
+    {
+        MaNGOS::PlayerRelocationNotifier notify((Player&)m_owner);
+        Cell::VisitAllObjects(&m_owner, notify, radius);
+    }
+    else //if(m_owner.GetTypeId() == TYPEID_UNIT)
+    {
+        MaNGOS::CreatureRelocationNotifier notify((Creature&)m_owner);
+        Cell::VisitAllObjects(&m_owner, notify, radius);
+    }
+    m_owner._SetAINotifyScheduled(false);
+    return true;
+};
+
+void RelocationNotifyEvent::Abort(uint64)
+{
+    m_owner._SetAINotifyScheduled(false);
+    to_Abort = true;
+};
+
+bool ManaUseEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
+{
+    m_caster.SetLastManaUse();
+    return true;
+}
+
+// Creature events
+AssistDelayEvent::AssistDelayEvent(ObjectGuid victim, Unit& owner, std::list<Creature*> const& assistants) : BasicEvent(WORLDOBJECT_EVENT_TYPE_COMMON), m_victimGuid(victim), m_owner(owner)
+{
+    // Pushing guids because in delay can happen some creature gets despawned => invalid pointer
+    for (std::list<Creature*>::const_iterator itr = assistants.begin(); itr != assistants.end(); ++itr)
+    {
+        if ((*itr) && (*itr)->IsInWorld())
+            m_assistantGuids.push_back((*itr)->GetObjectGuid());
+    }
+}
+
+bool AssistDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
+{
+    if (Unit* victim = m_owner.GetMap()->GetUnit(m_victimGuid))
+    {
+        while (!m_assistantGuids.empty())
+        {
+            Creature* assistant = m_owner.GetMap()->GetAnyTypeCreature(*m_assistantGuids.rbegin());
+            m_assistantGuids.pop_back();
+
+            if (assistant && assistant->CanAssistTo(&m_owner, victim))
+            {
+                assistant->SetNoCallAssistance(true);
+                if (assistant->AI())
+                    assistant->AI()->AttackStart(victim);
+            }
+        }
+    }
+    return true;
+}
+
+bool AttackResumeEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
+{
+    if (!m_owner.isAlive())
+        return true;
+
+    if (m_owner.hasUnitState(UNIT_STAT_CAN_NOT_REACT) || m_owner.HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
+        return true;
+
+    Unit* victim = m_owner.getVictim();
+    if (!victim || !victim->IsInMap(&m_owner))
+        return true;
+
+    switch (m_owner.GetObjectGuid().GetHigh())
+    {
+        case HIGHGUID_UNIT:
+        case HIGHGUID_VEHICLE:
+        {
+            m_owner.AttackStop(!b_force);
+            if (CreatureAI* ai = ((Creature*)&m_owner)->AI())
+            {
+            // Reset EventAI now unsafe, temp disabled (require correct writing EventAI scripts)
+            //    if (CreatureEventAI* eventai = (CreatureEventAI*)ai)
+            //        eventai->Reset();
+                ai->AttackStart(victim);
+            }
+            break;
+        }
+        case HIGHGUID_PET:
+        {
+            m_owner.AttackStop(!b_force);
+            ((Pet*)&m_owner)->AI()->AttackStart(victim);
+            break;
+        }
+        case HIGHGUID_PLAYER:
+            break;
+        default:
+            sLog.outError("AttackResumeEvent::Execute try execute for unsupported owner %s!", m_owner.GetGuidStr().c_str());
+        break;
+    }
+    return true;
+}
+
+
+bool ForcedDespawnDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
+{
+    m_owner.ForcedDespawn();
+    return true;
+}
+
+EvadeDelayEvent::EvadeDelayEvent(Unit& owner, bool force /*=false*/) :
+    BasicEvent(WORLDOBJECT_EVENT_TYPE_EVADE_UNIQUE), m_owner(owner), b_force(force)
+{
+    if (m_owner.GetTypeId() == TYPEID_UNIT)
+        m_owner.addUnitState(UNIT_STAT_DELAYED_EVADE);
+}
+
+bool EvadeDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
+{
+    m_owner.clearUnitState(UNIT_STAT_DELAYED_EVADE);
+
+    if (m_owner.IsInEvadeMode())
+        return true;
+
+    if (m_owner.SelectHostileTarget(false))
+        return true;
+
+    switch (m_owner.GetObjectGuid().GetHigh())
+    {
+        case HIGHGUID_UNIT:
+        case HIGHGUID_VEHICLE:
+        {
+            Creature* c_owner = (Creature*)(&m_owner);
+            if (!c_owner)
+                return true;
+
+            if (c_owner->IsAILocked())
+            {
+                m_owner.addUnitState(UNIT_STAT_DELAYED_EVADE);
+                return false;
+            }
+
+            if (c_owner->IsDespawned() || c_owner->isCharmed() || c_owner->hasUnitState(UNIT_STAT_CAN_NOT_REACT_OR_LOST_CONTROL))
+                return true;
+
+            c_owner->LockAI(true);
+            if (CreatureAI* ai = c_owner->AI())
+                ai->EnterEvadeMode();
+            c_owner->LockAI(false);
+
+            if (InstanceData* mapInstance = c_owner->GetInstanceData())
+                mapInstance->OnCreatureEvade(c_owner);
+            break;
+        }
+        case HIGHGUID_PET:
+        {
+            Creature* c_owner = (Creature*)(&m_owner);
+            if (!c_owner)
+                return true;
+
+            Unit* petOwner = m_owner.GetOwner();
+
+            if (petOwner && petOwner->GetTypeId() == TYPEID_UNIT && petOwner->SelectHostileTarget(false))
+                return true;
+
+            if (c_owner->IsAILocked())
+            {
+                m_owner.addUnitState(UNIT_STAT_DELAYED_EVADE);
+                return false;
+            }
+
+            if (c_owner->IsDespawned())
+                return true;
+
+            if (CreatureAI* ai = c_owner->AI())
+                ai->EnterEvadeMode();
+
+            if (petOwner && petOwner->GetTypeId() == TYPEID_UNIT)
+            {
+                if (InstanceData* mapInstance = c_owner->GetInstanceData())
+                    mapInstance->OnCreatureEvade(c_owner);
+            }
+            break;
+        }
+        // case HIGHGUID_PLAYER:
+        default:
+            sLog.outError("EvadeDelayEvent::Execute try execute for unsupported owner %s!", m_owner.GetGuidStr().c_str());
+        break;
+    }
+    return true;
+}
+
+AiDelayEventAround::AiDelayEventAround(AIEventType eventType, ObjectGuid invokerGuid, Creature& owner, std::list<Creature*> const& receivers, uint32 miscValue) :
+    BasicEvent(WORLDOBJECT_EVENT_TYPE_COMMON),
+    m_eventType(eventType),
+    m_invokerGuid(invokerGuid),
+    m_owner(owner),
+    m_miscValue(miscValue)
+{
+    // Pushing guids because in delay can happen some creature gets despawned => invalid pointer
+    m_receiverGuids.reserve(receivers.size());
+    for (std::list<Creature*>::const_iterator itr = receivers.begin(); itr != receivers.end(); ++itr)
+        m_receiverGuids.push_back((*itr)->GetObjectGuid());
+}
+
+bool AiDelayEventAround::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
+{
+    Unit* pInvoker = m_owner.GetMap()->GetUnit(m_invokerGuid);
+
+    for (GuidVector::const_reverse_iterator itr = m_receiverGuids.rbegin(); itr != m_receiverGuids.rend(); ++itr)
+    {
+        if (Creature* pReceiver = m_owner.GetMap()->GetAnyTypeCreature(*itr))
+        {
+            pReceiver->AI()->ReceiveAIEvent(m_eventType, &m_owner, pInvoker, m_miscValue);
+            // Special case for type 0 (call-assistance)
+            if (m_eventType == AI_EVENT_CALL_ASSISTANCE && pInvoker && pReceiver->CanAssistTo(&m_owner, pInvoker))
+            {
+                pReceiver->SetNoCallAssistance(true);
+                pReceiver->AI()->AttackStart(pInvoker);
+            }
+        }
+    }
+    m_receiverGuids.clear();
+
+    return true;
+}
+
+// Vehicle events
+bool PassengerEjectEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
+{
+    if (!m_vehicle.IsVehicle())
+        return true;
+
+    VehicleKitPtr pVehicle = m_vehicle.GetVehicleKit();
+
+    Unit* passenger = pVehicle->GetPassenger(m_seatId);
+
+    if (passenger && passenger->IsInWorld())
+    {
+        if (!m_vehicle.RemoveSpellsCausingAuraByCaster(SPELL_AURA_CONTROL_VEHICLE, passenger->GetObjectGuid()))
+            passenger->ExitVehicle();
+    }
+    return true;
+}
+
+// Player events
+bool TeleportDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
+{
+    if (!m_owner.GetSession() || m_owner.GetSession()->PlayerLogout())
+        return true;
+
+    m_owner.SetSemaphoreTeleportDelayEvent(false);
+    m_owner.TeleportTo(m_location, m_options);
+    return true;
+}
+
+// BattleGround events
+BGQueueInviteEvent::BGQueueInviteEvent(ObjectGuid pl_guid, uint32 BgInstanceGUID, BattleGroundTypeId BgTypeId, ArenaType arenaType, uint32 removeTime) :
+    BasicEvent(WORLDOBJECT_EVENT_TYPE_COMMON), m_PlayerGuid(pl_guid), m_BgInstanceGUID(BgInstanceGUID), m_BgTypeId(BgTypeId), m_ArenaType(arenaType), m_RemoveTime(removeTime)
+{
+};
+
+bool BGQueueInviteEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
+{
+    Player* plr = sObjectMgr.GetPlayer( m_PlayerGuid );
+    // player logged off (we should do nothing, he is correctly removed from queue in another procedure)
+    if (!plr)
+        return true;
+
+    BattleGround* bg = sBattleGroundMgr.GetBattleGround(m_BgInstanceGUID, m_BgTypeId);
+    //if battleground ended and its instance deleted - do nothing
+    if (!bg)
+        return true;
+
+    BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bg->GetTypeID(), bg->GetArenaType());
+    uint32 queueSlot = plr->GetBattleGroundQueueIndex(bgQueueTypeId);
+    if (queueSlot < PLAYER_MAX_BATTLEGROUND_QUEUES)         // player is in queue or in battleground
+    {
+        // check if player is invited to this bg
+        BattleGroundQueue &bgQueue = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId];
+        if (bgQueue.IsPlayerInvited(m_PlayerGuid, m_BgInstanceGUID, m_RemoveTime))
+        {
+            WorldPacket data;
+            //we must send remaining time in queue
+            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_JOIN, INVITE_ACCEPT_WAIT_TIME - INVITATION_REMIND_TIME, 0, m_ArenaType, TEAM_NONE);
+            plr->GetSession()->SendPacket(&data);
+        }
+    }
+    return true;                                            //event will be deleted
+}
+
+void BGQueueInviteEvent::Abort(uint64 /*e_time*/)
+{
+    //do nothing
+}
+
+/*
+    this event has many possibilities when it is executed:
+    1. player is in battleground ( he clicked enter on invitation window )
+    2. player left battleground queue and he isn't there any more
+    3. player left battleground queue and he joined it again and IsInvitedToBGInstanceGUID = 0
+    4. player left queue and he joined again and he has been invited to same battleground again -> we should not remove him from queue yet
+    5. player is invited to bg and he didn't choose what to do and timer expired - only in this condition we should call queue::RemovePlayer
+    we must remove player in the 5. case even if battleground object doesn't exist!
+*/
+BGQueueRemoveEvent::BGQueueRemoveEvent(ObjectGuid plGuid, uint32 bgInstanceGUID, BattleGroundTypeId BgTypeId, BattleGroundQueueTypeId bgQueueTypeId, uint32 removeTime)
+    : BasicEvent(WORLDOBJECT_EVENT_TYPE_COMMON), m_PlayerGuid(plGuid), m_BgInstanceGUID(bgInstanceGUID), m_RemoveTime(removeTime), m_BgTypeId(BgTypeId), m_BgQueueTypeId(bgQueueTypeId)
+{
+};
+
+bool BGQueueRemoveEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
+{
+    Player* plr = sObjectMgr.GetPlayer( m_PlayerGuid );
+    if (!plr)
+        // player logged off (we should do nothing, he is correctly removed from queue in another procedure)
+        return true;
+
+    BattleGround* bg = sBattleGroundMgr.GetBattleGround(m_BgInstanceGUID, m_BgTypeId);
+    //battleground can be deleted already when we are removing queue info
+    //bg pointer can be NULL! so use it carefully!
+
+    uint32 queueSlot = plr->GetBattleGroundQueueIndex(m_BgQueueTypeId);
+    if (queueSlot < PLAYER_MAX_BATTLEGROUND_QUEUES)         // player is in queue, or in Battleground
+    {
+        // check if player is in queue for this BG and if we are removing his invite event
+        BattleGroundQueue &bgQueue = sBattleGroundMgr.m_BattleGroundQueues[m_BgQueueTypeId];
+        if (bgQueue.IsPlayerInvited(m_PlayerGuid, m_BgInstanceGUID, m_RemoveTime))
+        {
+            DEBUG_LOG("Battleground: removing player %u from bg queue for instance %u because of not pressing enter battle in time.",plr->GetGUIDLow(),m_BgInstanceGUID);
+
+            plr->RemoveBattleGroundQueueId(m_BgQueueTypeId);
+            bgQueue.RemovePlayer(m_PlayerGuid, true);
+            //update queues if battleground isn't ended
+            if (bg && bg->isBattleGround() && bg->GetStatus() != STATUS_WAIT_LEAVE)
+                sBattleGroundMgr.ScheduleQueueUpdate(0, ARENA_TYPE_NONE, m_BgQueueTypeId, m_BgTypeId, bg->GetBracketId());
+
+            WorldPacket data;
+            sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_NONE, 0, 0, ARENA_TYPE_NONE, TEAM_NONE);
+            plr->GetSession()->SendPacket(&data);
+        }
+    }
+
+    //event will be deleted
+    return true;
+}
+
+void BGQueueRemoveEvent::Abort(uint64 /*e_time*/)
+{
+    //do nothing
+}
diff --git a/src/game/WorldObjectEvents.h b/src/game/WorldObjectEvents.h
new file mode 100644
index 00000000000..79ac0f7001e
--- /dev/null
+++ b/src/game/WorldObjectEvents.h
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _WORLDOBJECTEVENTS_H
+#define _WORLDOBJECTEVENTS_H
+
+#include "Utilities/EventProcessor.h"
+#include "ObjectGuid.h"
+#include "SharedDefines.h"
+#include "WorldLocation.h"
+
+class Spell;
+class Unit;
+class Creature;
+struct WorldLocation;
+
+enum WorldObjectEventType
+{
+    WORLDOBJECT_EVENT_TYPE_COMMON,
+    WORLDOBJECT_EVENT_TYPE_UNIQUE,
+    WORLDOBJECT_EVENT_TYPE_EVADE_UNIQUE,
+    WORLDOBJECT_EVENT_TYPE_REPEATABLE,
+    WORLDOBJECT_EVENT_TYPE_DEATH,
+    WORLDOBJECT_EVENT_TYPE_MAX
+};
+
+typedef std::queue<std::pair<uint64, BasicEvent*> > EventNewQueue;
+
+class MANGOS_DLL_SPEC WorldObjectEventProcessor : public EventProcessor
+{
+    public:
+        typedef   MANGOSR2_MUTEX_MODEL_2       LockType;
+        typedef   ACE_Read_Guard<LockType>     ReadGuard;
+        typedef   ACE_Write_Guard<LockType>    WriteGuard;
+
+        WorldObjectEventProcessor();
+        ~WorldObjectEventProcessor() {};
+
+        void Update(uint32 p_time, bool force = false);
+        void KillAllEvents(bool force);
+        void CleanupEventList();
+        void AddEvent(BasicEvent* Event, uint64 e_time, bool set_addtime = true);
+        void RenewEvents();
+
+        uint32 size(bool withQueue = false)  const { ReadGuard Guard(i_lock); return (withQueue ? (m_events.size() + m_queue.size()) :  m_events.size()); };
+        bool   empty() const { ReadGuard Guard(i_lock); return m_events.empty(); };
+
+    private:
+        void SetNeedKill(bool val) { bNeedKill = val; };
+        bool IsNeedKill() const { return bNeedKill; };
+
+    protected:
+        EventNewQueue m_queue;
+        bool bNeedKill;
+        LockType& GetLock() { return i_lock; }
+        mutable LockType    i_lock;
+};
+
+// Spell events
+class SpellEvent : public BasicEvent
+{
+    public:
+        SpellEvent(Spell* spell);
+        virtual ~SpellEvent();
+
+        virtual bool Execute(uint64 e_time, uint32 p_time);
+        virtual void Abort(uint64 e_time);
+        virtual bool IsDeletable() const;
+    protected:
+        Spell* m_Spell;
+};
+
+// Unit events
+class ManaUseEvent : public BasicEvent
+{
+    public:
+        ManaUseEvent(Unit& caster) : BasicEvent(WORLDOBJECT_EVENT_TYPE_COMMON), m_caster(caster) {}
+        bool Execute(uint64 e_time, uint32 p_time);
+
+    private:
+        Unit& m_caster;
+};
+
+class RelocationNotifyEvent : public BasicEvent
+{
+    public:
+        RelocationNotifyEvent(Unit& owner);
+
+        bool Execute(uint64 /*e_time*/, uint32 /*p_time*/);
+
+        void Abort(uint64);
+
+    private:
+        Unit& m_owner;
+};
+
+// Vehicle events
+class PassengerEjectEvent : public BasicEvent
+{
+    public:
+        PassengerEjectEvent(uint8 seatId, Unit& vehicle) : BasicEvent(WORLDOBJECT_EVENT_TYPE_UNIQUE), m_seatId(seatId), m_vehicle(vehicle) {}
+        bool Execute(uint64 e_time, uint32 p_time);
+
+    private:
+        uint8 m_seatId;
+        Unit& m_vehicle;
+};
+
+// Creature events
+class AssistDelayEvent : public BasicEvent
+{
+    public:
+        AssistDelayEvent(ObjectGuid victim, Unit& owner, std::list<Creature*> const& assistants);
+
+        bool Execute(uint64 e_time, uint32 p_time);
+    private:
+        AssistDelayEvent();
+
+        ObjectGuid m_victimGuid;
+        GuidVector m_assistantGuids;
+        Unit&      m_owner;
+};
+
+class ForcedDespawnDelayEvent : public BasicEvent
+{
+    public:
+        ForcedDespawnDelayEvent(Creature& owner) : BasicEvent(WORLDOBJECT_EVENT_TYPE_UNIQUE), m_owner(owner) { }
+        bool Execute(uint64 e_time, uint32 p_time);
+
+    private:
+        Creature& m_owner;
+};
+
+class AttackResumeEvent : public BasicEvent
+{
+    public:
+        AttackResumeEvent(Unit& owner) : BasicEvent(WORLDOBJECT_EVENT_TYPE_UNIQUE), m_owner(owner), b_force(false) {};
+        AttackResumeEvent(Unit& owner, bool force) : BasicEvent(WORLDOBJECT_EVENT_TYPE_UNIQUE), m_owner(owner), b_force(force) {};
+        bool Execute(uint64 e_time, uint32 p_time);
+    private:
+        AttackResumeEvent();
+        Unit&   m_owner;
+        bool    b_force;
+};
+
+class EvadeDelayEvent : public BasicEvent
+{
+    public:
+        EvadeDelayEvent(Unit& owner, bool force = false);
+        bool Execute(uint64 e_time, uint32 p_time);
+    private:
+        EvadeDelayEvent();
+        Unit&   m_owner;
+        bool    b_force;
+};
+
+class AiDelayEventAround : public BasicEvent
+{
+    public:
+        AiDelayEventAround(AIEventType eventType, ObjectGuid invokerGuid, Creature& owner, std::list<Creature*> const& receivers, uint32 miscValue);
+        bool Execute(uint64 /*e_time*/, uint32 /*p_time*/);
+
+    private:
+        AiDelayEventAround();
+
+        ObjectGuid m_invokerGuid;
+        GuidVector m_receiverGuids;
+        Creature&  m_owner;
+
+        AIEventType m_eventType;
+        uint32 m_miscValue;
+};
+
+
+// Player events
+class TeleportDelayEvent : public BasicEvent
+{
+    public:
+        explicit TeleportDelayEvent(Player& owner, WorldLocation const& _location, uint32 _options)
+            : BasicEvent(WORLDOBJECT_EVENT_TYPE_UNIQUE), m_owner(owner), m_location(_location), m_options(_options) {};
+        bool Execute(uint64 e_time, uint32 p_time);
+    private:
+        TeleportDelayEvent();
+        Player&         m_owner;
+        WorldLocation   m_location;
+        uint32          m_options;
+};
+
+// BattleGround events
+/*
+    This class is used to invite player to BG again, when minute lasts from his first invitation
+    it is capable to solve all possibilities
+*/
+class BGQueueInviteEvent : public BasicEvent
+{
+    public:
+        BGQueueInviteEvent(ObjectGuid pl_guid, uint32 BgInstanceGUID, BattleGroundTypeId BgTypeId, ArenaType arenaType, uint32 removeTime);
+        virtual ~BGQueueInviteEvent() {};
+
+        virtual bool Execute(uint64 e_time, uint32 p_time);
+        virtual void Abort(uint64 e_time);
+    private:
+        ObjectGuid m_PlayerGuid;
+        uint32 m_BgInstanceGUID;
+        BattleGroundTypeId m_BgTypeId;
+        ArenaType m_ArenaType;
+        uint32 m_RemoveTime;
+};
+
+/*
+    This class is used to remove player from BG queue after 1 minute 20 seconds from first invitation
+    We must store removeInvite time in case player left queue and joined and is invited again
+    We must store bgQueueTypeId, because battleground can be deleted already, when player entered it
+*/
+class BGQueueRemoveEvent : public BasicEvent
+{
+    public:
+        BGQueueRemoveEvent(ObjectGuid plGuid, uint32 bgInstanceGUID, BattleGroundTypeId BgTypeId, BattleGroundQueueTypeId bgQueueTypeId, uint32 removeTime);
+        virtual ~BGQueueRemoveEvent() {}
+
+        virtual bool Execute(uint64 e_time, uint32 p_time);
+        virtual void Abort(uint64 e_time);
+    private:
+        ObjectGuid m_PlayerGuid;
+        uint32 m_BgInstanceGUID;
+        uint32 m_RemoveTime;
+        BattleGroundTypeId m_BgTypeId;
+        BattleGroundQueueTypeId m_BgQueueTypeId;
+};
+
+#endif
diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp
index 837e7d69f2a..1f7e4a7c012 100644
--- a/src/game/WorldSession.cpp
+++ b/src/game/WorldSession.cpp
@@ -20,7 +20,7 @@
     \ingroup u2w
 */
 
-#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
+#include "WorldSocket.h"                                   // must be first to make ACE happy with ACE includes in it
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
@@ -33,12 +33,20 @@
 #include "Guild.h"
 #include "GuildMgr.h"
 #include "World.h"
-#include "BattleGroundMgr.h"
+#include "BattleGround/BattleGroundMgr.h"
+#include "OutdoorPvP/OutdoorPvPMgr.h"
+#include "BattleField/BattleField.h"
 #include "MapManager.h"
 #include "SocialMgr.h"
+#include "LFGMgr.h"
 #include "Auth/AuthCrypt.h"
 #include "Auth/HMACSHA1.h"
 #include "zlib/zlib.h"
+#include "warden/WardenWin.h"
+#include "warden/WardenMac.h"
+
+// Playerbot mod
+#include "playerbot/playerbot.h"
 
 // select opcodes appropriate for processing in Map::Update context for current session state
 static bool MapSessionFilterHelper(WorldSession* session, OpcodeHandler const& opHandle)
@@ -85,7 +93,7 @@ WorldSession::WorldSession(uint32 id, WorldSocket *sock, AccountTypes sec, uint8
 m_muteTime(mute_time), _player(NULL), m_Socket(sock),_security(sec), _accountId(id), m_expansion(expansion), _logoutTime(0),
 m_inQueue(false), m_playerLoading(false), m_playerLogout(false), m_playerRecentlyLogout(false), m_playerSave(false),
 m_sessionDbcLocale(sWorld.GetAvailableDbcLocale(locale)), m_sessionDbLocaleIndex(sObjectMgr.GetIndexForLocale(locale)),
-m_latency(0), m_tutorialState(TUTORIALDATA_UNCHANGED)
+m_latency(0), m_clientTimeDelay(0), m_tutorialState(TUTORIALDATA_UNCHANGED), m_Warden(NULL)
 {
     if (sock)
     {
@@ -109,6 +117,9 @@ WorldSession::~WorldSession()
         m_Socket = NULL;
     }
 
+    if (m_Warden)
+        delete m_Warden;
+
     ///- empty incoming packet queue
     WorldPacket* packet = NULL;
     while(_recvQueue.next(packet))
@@ -130,6 +141,15 @@ char const* WorldSession::GetPlayerName() const
 /// Send a packet to the client
 void WorldSession::SendPacket(WorldPacket const* packet)
 {
+	// Playerbot mod: send packet to bot AI
+    if (GetPlayer()) {
+        if (GetPlayer()->GetPlayerbotAI())
+            GetPlayer()->GetPlayerbotAI()->HandleBotOutgoingPacket(*packet);
+        else if (GetPlayer()->GetPlayerbotMgr())
+            GetPlayer()->GetPlayerbotMgr()->HandleMasterOutgoingPacket(*packet);
+    }
+
+
     if (!m_Socket)
         return;
 
@@ -227,6 +247,12 @@ bool WorldSession::Update(PacketFilter& updater)
                         ExecuteOpcode(opHandle, packet);
 
                     // lag can cause STATUS_LOGGEDIN opcodes to arrive after the player started a transfer
+
+					// playerbot mod
+					if (_player && _player->GetPlayerbotMgr())
+						_player->GetPlayerbotMgr()->HandleMasterIncomingPacket(*packet);
+					// playerbot mod end
+
                     break;
                 case STATUS_LOGGEDIN_OR_RECENTLY_LOGGEDOUT:
                     if(!_player && !m_playerRecentlyLogout)
@@ -299,10 +325,18 @@ bool WorldSession::Update(PacketFilter& updater)
         delete packet;
     }
 
+	// playerbot mod
+    if (GetPlayer() && GetPlayer()->GetPlayerbotMgr())
+        GetPlayer()->GetPlayerbotMgr()->UpdateSessions(0);
+    // end of playerbot mod
+
+    if (m_Socket && !m_Socket->IsClosed() && m_Warden && GetPlayer() && !GetPlayer()->GetPlayerbotAI())
+        m_Warden->Update();
+
     ///- Cleanup socket pointer if need
-    if (m_Socket && m_Socket->IsClosed ())
+    if (m_Socket && m_Socket->IsClosed())
     {
-        m_Socket->RemoveReference ();
+        m_Socket->RemoveReference();
         m_Socket = NULL;
     }
 
@@ -322,6 +356,17 @@ bool WorldSession::Update(PacketFilter& updater)
     return true;
 }
 
+void WorldSession::HandleBotPackets()
+{
+    WorldPacket* packet;
+    while (_recvQueue.next(packet))
+    {
+        OpcodeHandler& opHandle = opcodeTable[packet->GetOpcode()];
+        (this->*opHandle.handler)(*packet);
+        delete packet;
+    }
+}
+
 /// %Log the player out
 void WorldSession::LogoutPlayer(bool Save)
 {
@@ -334,165 +379,208 @@ void WorldSession::LogoutPlayer(bool Save)
 
     if (_player)
     {
+        // Getting map smartpointer - lock map from deleting while logout
+        // smartpointer may be NULL, if player not in any map
+        MapPtr mapPtr = GetPlayer()->GetMapPtr();
+
+        // Playerbot mod: log out all player bots owned by this toon
+        if (GetPlayer()->GetPlayerbotMgr())
+            GetPlayer()->GetPlayerbotMgr()->LogoutAllBots();
+
         sLog.outChar("Account: %d (IP: %s) Logout Character:[%s] (guid: %u)", GetAccountId(), GetRemoteAddress().c_str(), _player->GetName() ,_player->GetGUIDLow());
 
         if (ObjectGuid lootGuid = GetPlayer()->GetLootGuid())
             DoLootRelease(lootGuid);
 
+	// Playerbot mod: log out all player bots owned by this toon
+        if (_player->GetPlayerbotMgr())
+            _player->GetPlayerbotMgr()->LogoutAllBots();
+        sRandomPlayerbotMgr.OnPlayerLogout(_player);
+
+
         ///- If the player just died before logging out, make him appear as a ghost
         //FIXME: logout must be delayed in case lost connection with client in time of combat
-        if (_player->GetDeathTimer())
+        if (GetPlayer()->GetDeathTimer())
         {
-            _player->getHostileRefManager().deleteReferences();
-            _player->BuildPlayerRepop();
-            _player->RepopAtGraveyard();
+            GetPlayer()->getHostileRefManager().deleteReferences();
+            GetPlayer()->BuildPlayerRepop();
+            GetPlayer()->RepopAtGraveyard();
         }
-        else if (!_player->getAttackers().empty())
+        else if (mapPtr && GetPlayer()->IsInCombat())
         {
-            _player->CombatStop();
-            _player->getHostileRefManager().setOnlineOfflineState(false);
-            _player->RemoveAllAurasOnDeath();
+            GetPlayer()->CombatStop();
+            GetPlayer()->getHostileRefManager().setOnlineOfflineState(false);
+            GetPlayer()->RemoveAllAurasOnDeath();
 
             // build set of player who attack _player or who have pet attacking of _player
             std::set<Player*> aset;
-            for(Unit::AttackerSet::const_iterator itr = _player->getAttackers().begin(); itr != _player->getAttackers().end(); ++itr)
+            GuidSet& attackers = mapPtr->GetAttackersFor(GetPlayer()->GetObjectGuid());
+
+            for (GuidSet::const_iterator itr = attackers.begin(); itr != attackers.end();)
             {
-                Unit* owner = (*itr)->GetOwner();           // including player controlled case
+                Unit* attacker = mapPtr->GetUnit(*itr++);
+                if (!attacker)
+                    continue;
+
+                Unit* owner = attacker->GetOwner();           // including player controlled case
                 if(owner)
                 {
-                    if(owner->GetTypeId()==TYPEID_PLAYER)
+                    if(owner->GetTypeId() == TYPEID_PLAYER)
                         aset.insert((Player*)owner);
                 }
                 else
-                if((*itr)->GetTypeId()==TYPEID_PLAYER)
-                    aset.insert((Player*)(*itr));
+                    if(attacker->GetTypeId() == TYPEID_PLAYER)
+                        aset.insert((Player*)(attacker));
             }
 
-            _player->SetPvPDeath(!aset.empty());
-            _player->KillPlayer();
-            _player->BuildPlayerRepop();
-            _player->RepopAtGraveyard();
+            GetPlayer()->SetPvPDeath(!aset.empty());
+            GetPlayer()->KillPlayer();
+            GetPlayer()->BuildPlayerRepop();
+            GetPlayer()->RepopAtGraveyard();
 
             // give honor to all attackers from set like group case
             for(std::set<Player*>::const_iterator itr = aset.begin(); itr != aset.end(); ++itr)
-                (*itr)->RewardHonor(_player,aset.size());
+                (*itr)->RewardHonor(GetPlayer(),aset.size());
 
             // give bg rewards and update counters like kill by first from attackers
             // this can't be called for all attackers.
             if(!aset.empty())
-                if(BattleGround *bg = _player->GetBattleGround())
-                    bg->HandleKillPlayer(_player,*aset.begin());
+                if(BattleGround *bg = GetPlayer()->GetBattleGround())
+                    bg->HandleKillPlayer(GetPlayer(),*aset.begin());
         }
-        else if(_player->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
+        else if(GetPlayer()->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
         {
             // this will kill character by SPELL_AURA_SPIRIT_OF_REDEMPTION
-            _player->RemoveSpellsCausingAura(SPELL_AURA_MOD_SHAPESHIFT);
-            //_player->SetDeathPvP(*); set at SPELL_AURA_SPIRIT_OF_REDEMPTION apply time
-            _player->KillPlayer();
-            _player->BuildPlayerRepop();
-            _player->RepopAtGraveyard();
+            GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_MOD_SHAPESHIFT);
+            //GetPlayer()->SetDeathPvP(*); set at SPELL_AURA_SPIRIT_OF_REDEMPTION apply time
+            GetPlayer()->KillPlayer();
+            GetPlayer()->BuildPlayerRepop();
+            GetPlayer()->RepopAtGraveyard();
+        }
+        else if (GetPlayer()->HasPendingBind())
+        {
+            GetPlayer()->RepopAtGraveyard();
+            GetPlayer()->SetPendingBind(NULL, 0);
         }
+
         //drop a flag if player is carrying it
-        if(BattleGround *bg = _player->GetBattleGround())
-            bg->EventPlayerLoggedOut(_player);
+        if(BattleGround *bg = GetPlayer()->GetBattleGround())
+            bg->EventPlayerLoggedOut(GetPlayer());
 
         ///- Teleport to home if the player is in an invalid instance
-        if(!_player->m_InstanceValid && !_player->isGameMaster())
+        if(!GetPlayer()->m_InstanceValid && !GetPlayer()->isGameMaster())
         {
-            _player->TeleportToHomebind();
+            GetPlayer()->TeleportToHomebind();
             //this is a bad place to call for far teleport because we need player to be in world for successful logout
             //maybe we should implement delayed far teleport logout?
         }
 
         // FG: finish pending transfers after starting the logout
         // this should fix players beeing able to logout and login back with full hp at death position
-        while(_player->IsBeingTeleportedFar())
+        while(GetPlayer()->IsBeingTeleportedFar())
             HandleMoveWorldportAckOpcode();
 
         for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
         {
-            if(BattleGroundQueueTypeId bgQueueTypeId = _player->GetBattleGroundQueueTypeId(i))
+            if(BattleGroundQueueTypeId bgQueueTypeId = GetPlayer()->GetBattleGroundQueueTypeId(i))
             {
-                _player->RemoveBattleGroundQueueId(bgQueueTypeId);
-                sBattleGroundMgr.m_BattleGroundQueues[ bgQueueTypeId ].RemovePlayer(_player->GetObjectGuid(), true);
+                GetPlayer()->RemoveBattleGroundQueueId(bgQueueTypeId);
+                sBattleGroundMgr.m_BattleGroundQueues[ bgQueueTypeId ].RemovePlayer(GetPlayer()->GetObjectGuid(), true);
             }
         }
 
         ///- Reset the online field in the account table
         // no point resetting online in character table here as Player::SaveToDB() will set it to 1 since player has not been removed from world at this stage
         // No SQL injection as AccountID is uint32
-        static SqlStatementID id;
-
-        SqlStatement stmt = LoginDatabase.CreateStatement(id, "UPDATE account SET active_realm_id = ? WHERE id = ?");
-        stmt.PExecute(uint32(0), GetAccountId());
+        if (!GetPlayer()->GetPlayerbotAI())
+        {
+		static SqlStatementID id;
+		// playerbot mod
+		if (! _player->GetPlayerbotAI())
+		{
+			SqlStatement stmt = LoginDatabase.CreateStatement(id, "UPDATE account SET active_realm_id = ? WHERE id = ?");
+			stmt.PExecute(uint32(0), GetAccountId());
+		}
+        }
 
         ///- If the player is in a guild, update the guild roster and broadcast a logout message to other guild members
-        if (Guild* guild = sGuildMgr.GetGuildById(_player->GetGuildId()))
+        if (Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId()))
         {
-            if (MemberSlot* slot = guild->GetMemberSlot(_player->GetObjectGuid()))
-            {
-                slot->SetMemberStats(_player);
-                slot->UpdateLogoutTime();
-            }
-
-            guild->BroadcastEvent(GE_SIGNED_OFF, _player->GetObjectGuid(), _player->GetName());
+            guild->OnMemberLogout(GetPlayer());
+            guild->BroadcastEvent(GE_SIGNED_OFF, GetPlayer()->GetObjectGuid(), GetPlayer()->GetName());
         }
 
         ///- Remove pet
-        _player->RemovePet(PET_SAVE_AS_CURRENT);
+        GetPlayer()->RemovePet(PET_SAVE_AS_CURRENT);
+
+        GetPlayer()->InterruptNonMeleeSpells(true);
+
+        if (VehicleKitPtr vehicle = GetPlayer()->GetVehicle())
+            GetPlayer()->ExitVehicle();
 
         ///- empty buyback items and save the player in the database
         // some save parts only correctly work in case player present in map/player_lists (pets, etc)
         if(Save)
-            _player->SaveToDB();
+            GetPlayer()->SaveToDB();
 
         ///- Leave all channels before player delete...
-        _player->CleanupChannels();
+        GetPlayer()->CleanupChannels();
 
+        // LFG cleanup
+        sLFGMgr.Leave(GetPlayer());
+
+		// playerbot mod
         ///- If the player is in a group (or invited), remove him. If the group if then only 1 person, disband the group.
-        _player->UninviteFromGroup();
+        //_player->UninviteFromGroup();
 
         // remove player from the group if he is:
         // a) in group; b) not in raid group; c) logging out normally (not being kicked or disconnected)
-        if(_player->GetGroup() && !_player->GetGroup()->isRaidGroup() && m_Socket)
-            _player->RemoveFromGroup();
+        //if(_player->GetGroup() && !_player->GetGroup()->isRaidGroup() && m_Socket)
+        //    _player->RemoveFromGroup();
 
-        ///- Send update to group
-        if(_player->GetGroup())
-            _player->GetGroup()->SendUpdate();
+        ///- Inform the group about leaving and send update to other members
+        if (GetPlayer()->GetGroup())
+        {
+            GetPlayer()->GetGroup()->CheckLeader(GetPlayer()->GetObjectGuid(), true); // logout check leader
+            GetPlayer()->GetGroup()->SendUpdate();
+        }
 
         ///- Broadcast a logout message to the player's friends
-        sSocialMgr.SendFriendStatus(_player, FRIEND_OFFLINE, _player->GetObjectGuid(), true);
-        sSocialMgr.RemovePlayerSocial (_player->GetGUIDLow ());
+        sSocialMgr.SendFriendStatus(GetPlayer(), FRIEND_OFFLINE, GetPlayer()->GetObjectGuid(), true);
+        sSocialMgr.RemovePlayerSocial(GetPlayer()->GetObjectGuid());
+
+        // Playerbot - remember player GUID for update SQL below
+        uint32 guid = GetPlayer()->GetGUIDLow();
 
         ///- Remove the player from the world
         // the player may not be in the world when logging out
         // e.g if he got disconnected during a transfer to another map
         // calls to GetMap in this case may cause crashes
-        if (_player->IsInWorld())
+        if (GetPlayer()->IsInWorld() && mapPtr)
         {
-            Map* _map = _player->GetMap();
-            _map->Remove(_player, true);
+            mapPtr->Remove(GetPlayer(), true);
         }
         else
         {
-            _player->CleanupsBeforeDelete();
-            Map::DeleteFromWorld(_player);
+            GetPlayer()->CleanupsBeforeDelete();
+            if (mapPtr)
+                mapPtr->DeleteFromWorld(GetPlayer());
+            else
+            {
+                sObjectAccessor.RemoveObject(GetPlayer());
+                delete GetPlayer();
+            }
         }
 
         SetPlayer(NULL);                                    // deleted in Remove/DeleteFromWorld call
 
         ///- Send the 'logout complete' packet to the client
-        WorldPacket data( SMSG_LOGOUT_COMPLETE, 0 );
-        SendPacket( &data );
-
-        ///- Since each account can only have one online character at any given time, ensure all characters for active account are marked as offline
-        //No SQL injection as AccountId is uint32
-
-        static SqlStatementID updChars;
+        WorldPacket data(SMSG_LOGOUT_COMPLETE, 0);
+        SendPacket(&data);
 
-        stmt = CharacterDatabase.CreateStatement(updChars, "UPDATE characters SET online = 0 WHERE account = ?");
-        stmt.PExecute(GetAccountId());
+		static SqlStatementID updChars;
+        SqlStatement stmt = CharacterDatabase.CreateStatement(updChars, "UPDATE characters SET online = 0 WHERE guid = ?");
+        stmt.PExecute(guid);
 
         DEBUG_LOG( "SESSION: Sent SMSG_LOGOUT_COMPLETE Message" );
     }
@@ -792,6 +880,23 @@ void WorldSession::SaveTutorialsData()
     m_tutorialState = TUTORIALDATA_UNCHANGED;
 }
 
+// Send chat information about aborted transfer (mostly used by Player::SendTransferAbortedByLockstatus())
+void WorldSession::SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg)
+{
+    WorldPacket data(SMSG_TRANSFER_ABORTED, 4 + 2);
+    data << uint32(mapid);
+    data << uint8(reason);                                  // transfer abort reason
+    switch (reason)
+    {
+        case TRANSFER_ABORT_INSUF_EXPAN_LVL:
+        case TRANSFER_ABORT_DIFFICULTY:
+        case TRANSFER_ABORT_UNIQUE_MESSAGE:
+            data << uint8(arg);
+            break;
+    }
+    SendPacket(&data);
+}
+
 void WorldSession::ReadAddonsInfo(WorldPacket &data)
 {
     if (data.rpos() + 4 > data.size())
@@ -961,9 +1066,149 @@ void WorldSession::ExecuteOpcode( OpcodeHandler const& opHandle, WorldPacket* pa
         //we should execute delayed teleports only for alive(!) players
         //because we don't want player's ghost teleported from graveyard
         if (_player->IsHasDelayedTeleport())
-            _player->TeleportTo(_player->m_teleport_dest, _player->m_teleport_options);
+            _player->TeleportTo(_player->m_teleport_dest, _player->m_teleport_options | TELE_TO_NODELAY);
     }
 
     if (packet->rpos() < packet->wpos() && sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG))
         LogUnprocessedTail(packet);
 }
+
+void WorldSession::InitWarden(BigNumber *K, std::string os)
+{
+    if (!sWorld.getConfig(CONFIG_BOOL_ANTICHEAT_WARDEN))
+        return;
+
+    if (os == "niW")                                        // Windows
+        m_Warden = (WardenBase*)new WardenWin();
+    else                                                    // MacOS
+        m_Warden = (WardenBase*)new WardenMac();
+
+    m_Warden->Init(this, K);
+}
+
+void WorldSession::SendPlaySpellVisual(ObjectGuid guid, uint32 spellArtKit)
+{
+    WorldPacket data(SMSG_PLAY_SPELL_VISUAL, 8+4);          // visual effect on guid
+    data << guid;
+    data << spellArtKit;                                    // index from SpellVisualKit.dbc
+    SendPacket(&data);
+}
+
+// This send to player to invite him to teleport to battlefield
+// Param1: battlefield guid
+// Param2: zone id of battlefield (4197 for wg)
+// Param3: time for player to accept in seconds
+void WorldSession::SendBfInvitePlayerToWar(ObjectGuid battlefieldGuid, uint32 uiZoneId, uint32 uiTimeToAccept)
+{
+    WorldPacket data(SMSG_BATTLEFIELD_MANAGER_ENTRY_INVITE, 12);
+    data << uint32(battlefieldGuid);
+    data << uint32(uiZoneId);
+    data << uint32(time(NULL) + uiTimeToAccept);
+    SendPacket(&data);
+}
+
+// This is send to invite player to join the queue when he is in battlefield zone and it is about to start or by battlemaster
+// Param1: battlefield guid
+void WorldSession::SendBfInvitePlayerToQueue(ObjectGuid battlefieldGuid)
+{
+    bool warmup = true;
+    
+    WorldPacket data(SMSG_BATTLEFIELD_MANAGER_QUEUE_INVITE, 5);
+    data << uint32(battlefieldGuid);
+    data << uint8(warmup); // warmup ? used ?
+    SendPacket(&data);
+}
+
+// This packet is in response to inform player that he joins queue
+// Param1: battlefield guid
+// Param2: battlefield queue guid
+// Param3: zone id of battlefield (4197 for wg)
+// Param4: if players are able to queue
+// Param5: if battlefield is full
+void WorldSession::SendBfQueueInviteResponse(ObjectGuid battlefieldGuid, ObjectGuid queueGuid, uint32 uiZoneId, bool bCanQueue, bool bFull)
+{
+    WorldPacket data(SMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST_RESPONSE, 11);
+    data << uint32(battlefieldGuid);
+    data << uint32(uiZoneId);
+    data << uint8(bCanQueue ? 1 : 0); // Accepted // 0 you cannot queue wg // 1 you are queued
+    data << uint8(bFull ? 0 : 1); // Logging In // 0 wg full // 1 queue for upcoming
+    data << uint8(1); // Warmup
+    SendPacket(&data);
+}
+
+// This is called when player accepts invitation to battlefield
+// Param1: battlefield guid
+void WorldSession::SendBfEntered(ObjectGuid battlefieldGuid)
+{
+    WorldPacket data(SMSG_BATTLEFIELD_MANAGER_ENTERING, 7);
+    data << uint32(battlefieldGuid);
+    data << uint8(1); // unk
+    data << uint8(1); // unk
+    data << uint8(_player->isAFK() ? 1 : 0); // Clear AFK
+    SendPacket(&data);
+}
+
+void WorldSession::SendBfLeaveMessage(ObjectGuid battlefieldGuid, BattlefieldLeaveReason reason)
+{
+    WorldPacket data(SMSG_BATTLEFIELD_MANAGER_EJECTED, 7);
+    data << uint32(battlefieldGuid);
+    data << uint8(reason); // byte Reason
+    data << uint8(2); // byte BattleStatus
+    data << uint8(0); // bool Relocated
+    SendPacket(&data);
+}
+
+// Send by client when he click on accept for queue
+void WorldSession::HandleBfQueueInviteResponse(WorldPacket& recv_data)
+{
+    ObjectGuid battlefieldGuid;
+    bool bAccepted;
+
+    recv_data >> battlefieldGuid >> bAccepted;
+
+    DEBUG_LOG("HandleQueueInviteResponse: battlefieldGuid: " UI64FMTD " bAccepted: %u", battlefieldGuid.GetRawValue(), bAccepted);
+
+    if (BattleField* opvp = sOutdoorPvPMgr.GetBattlefieldByGuid(battlefieldGuid))
+        opvp->OnPlayerInviteResponse(_player, bAccepted);
+}
+
+void WorldSession::HandleBfQueueRequest(WorldPacket& recv_data)
+{
+    DEBUG_LOG("WORLD: Received CMSG_BATTLEFIELD_MANAGER_QUEUE_REQUEST");
+
+    ObjectGuid battlefieldGuid;
+    bool bAccepted;
+
+    recv_data >> battlefieldGuid >> bAccepted;
+
+    DEBUG_LOG("HandleBfQueueInviteResponse: battlefieldGuid: " UI64FMTD " bAccepted: %u", battlefieldGuid.GetRawValue(), bAccepted);
+
+    if (BattleField* opvp = sOutdoorPvPMgr.GetBattlefieldByGuid(battlefieldGuid))
+        opvp->OnPlayerInviteResponse(_player, true);
+}
+
+// Send by client when he clicks accept or denies invitation
+void WorldSession::HandleBfEntryInviteResponse(WorldPacket& recv_data)
+{
+    ObjectGuid battlefieldGuid;
+    bool bAccepted;
+
+    recv_data >> battlefieldGuid >> bAccepted;
+
+    DEBUG_LOG("HandleBattlefieldInviteResponse: battlefieldGuid: " UI64FMTD " bAccepted: %u", battlefieldGuid.GetRawValue(), bAccepted);
+
+    if (BattleField* opvp = sOutdoorPvPMgr.GetBattlefieldByGuid(battlefieldGuid))
+        opvp->OnPlayerPortResponse(GetPlayer(), bAccepted);
+}
+
+void WorldSession::HandleBfExitRequest(WorldPacket& recv_data)
+{
+    ObjectGuid battlefieldGuid;
+
+    recv_data >> battlefieldGuid;
+
+    DEBUG_LOG("HandleBfExitRequest: battlefieldGuid: " UI64FMTD " ", battlefieldGuid.GetRawValue());
+
+    if (BattleField* opvp = sOutdoorPvPMgr.GetBattlefieldByGuid(battlefieldGuid))
+        opvp->OnPlayerQueueExitRequest(_player);
+}
diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h
index 641ebc59523..68072a2f27f 100644
--- a/src/game/WorldSession.h
+++ b/src/game/WorldSession.h
@@ -24,10 +24,14 @@
 #define __WORLDSESSION_H
 
 #include "Common.h"
+#include "LockedQueue.h"
 #include "SharedDefines.h"
 #include "ObjectGuid.h"
+#include "LFG.h"
+#include "LFGMgr.h"
 #include "AuctionHouseMgr.h"
 #include "Item.h"
+#include "warden/WardenBase.h"
 
 struct ItemPrototype;
 struct AuctionEntry;
@@ -48,6 +52,7 @@ class CharacterHandler;
 class GMTicket;
 class MovementInfo;
 class WorldSession;
+class Quest;
 
 struct OpcodeHandler;
 
@@ -77,11 +82,11 @@ struct AccountData
 
 struct AddonInfo
 {
-    AddonInfo(const std::string& name, uint8 enabled, uint32 crc)
+    AddonInfo(const std::string& name, uint8 enabled, uint32 crc) :
+        Name(name),
+        Enabled(enabled),
+        CRC(crc)
     {
-        Name = name;
-        Enabled = enabled;
-        CRC = crc;
     }
 
     std::string Name;
@@ -131,43 +136,13 @@ enum PartyResult
     ERR_PARTY_LFG_TELEPORT_IN_COMBAT    = 30
 };
 
-enum LfgJoinResult
+enum BattlefieldLeaveReason
 {
-    ERR_LFG_OK                                  = 0x00,
-    ERR_LFG_ROLE_CHECK_FAILED                   = 0x01,
-    ERR_LFG_GROUP_FULL                          = 0x02,
-    ERR_LFG_NO_LFG_OBJECT                       = 0x04,
-    ERR_LFG_NO_SLOTS_PLAYER                     = 0x05,
-    ERR_LFG_NO_SLOTS_PARTY                      = 0x06,
-    ERR_LFG_MISMATCHED_SLOTS                    = 0x07,
-    ERR_LFG_PARTY_PLAYERS_FROM_DIFFERENT_REALMS = 0x08,
-    ERR_LFG_MEMBERS_NOT_PRESENT                 = 0x09,
-    ERR_LFG_GET_INFO_TIMEOUT                    = 0x0A,
-    ERR_LFG_INVALID_SLOT                        = 0x0B,
-    ERR_LFG_DESERTER_PLAYER                     = 0x0C,
-    ERR_LFG_DESERTER_PARTY                      = 0x0D,
-    ERR_LFG_RANDOM_COOLDOWN_PLAYER              = 0x0E,
-    ERR_LFG_RANDOM_COOLDOWN_PARTY               = 0x0F,
-    ERR_LFG_TOO_MANY_MEMBERS                    = 0x10,
-    ERR_LFG_CANT_USE_DUNGEONS                   = 0x11,
-    ERR_LFG_ROLE_CHECK_FAILED2                  = 0x12,
-};
-
-enum LfgUpdateType
-{
-    LFG_UPDATE_JOIN     = 5,
-    LFG_UPDATE_LEAVE    = 7,
-};
-
-enum LfgType
-{
-    LFG_TYPE_NONE                 = 0,
-    LFG_TYPE_DUNGEON              = 1,
-    LFG_TYPE_RAID                 = 2,
-    LFG_TYPE_QUEST                = 3,
-    LFG_TYPE_ZONE                 = 4,
-    LFG_TYPE_HEROIC_DUNGEON       = 5,
-    LFG_TYPE_RANDOM_DUNGEON       = 6
+    BATTLEFIELD_LEAVE_REASON_CLOSE     = 0x00000001,
+    //BATTLEFIELD_LEAVE_REASON_UNK1    = 0x00000002, (not used)
+    //BATTLEFIELD_LEAVE_REASON_UNK2    = 0x00000004, (not used)
+    BATTLEFIELD_LEAVE_REASON_EXITED    = 0x00000008,
+    BATTLEFIELD_LEAVE_REASON_LOW_LEVEL = 0x00000010,
 };
 
 enum ChatRestrictionType
@@ -193,7 +168,7 @@ class PacketFilter
         explicit PacketFilter(WorldSession * pSession) : m_pSession(pSession) {}
         virtual ~PacketFilter() {}
 
-        virtual bool Process(WorldPacket * packet) { return true; }
+        virtual bool Process(WorldPacket* /*packet*/) { return true; }
         virtual bool ProcessLogout() const { return true; }
 
     protected:
@@ -226,7 +201,8 @@ class WorldSessionFilter : public PacketFilter
 /// Player session in the World
 class MANGOS_DLL_SPEC WorldSession
 {
-    friend class CharacterHandler;
+        friend class CharacterHandler;
+
     public:
         WorldSession(uint32 id, WorldSocket *sock, AccountTypes sec, uint8 expansion, time_t mute_time, LocaleConstant locale);
         ~WorldSession();
@@ -244,11 +220,10 @@ class MANGOS_DLL_SPEC WorldSession
         void SendNotification(const char *format,...) ATTR_PRINTF(2,3);
         void SendNotification(int32 string_id,...);
         void SendPetNameInvalid(uint32 error, const std::string& name, DeclinedName *declinedName);
-        void SendLfgSearchResults(LfgType type, uint32 entry);
-        void SendLfgJoinResult(LfgJoinResult result);
-        void SendLfgUpdate(bool isGroup, LfgUpdateType updateType, uint32 id);
         void SendPartyResult(PartyOperation operation, const std::string& member, PartyResult res);
-        void SendAreaTriggerMessage(const char* Text, ...) ATTR_PRINTF(2,3);
+        void SendGroupInvite(Player* player, bool alreadyInGroup = false);
+        void SendAreaTriggerMessage(const char* Text, ...) ATTR_PRINTF(2, 3);
+        void SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg = 0);
         void SendSetPhaseShift(uint32 phaseShift);
         void SendQueryTimeResponse();
         void SendRedirectClient(std::string& ip, uint16 port);
@@ -262,6 +237,8 @@ class MANGOS_DLL_SPEC WorldSession
         void SetPlayer(Player *plr);
         uint8 Expansion() const { return m_expansion; }
 
+        void InitWarden(BigNumber *K, std::string os);
+
         /// Session in auth.queue currently
         void SetInQueue(bool state) { m_inQueue = state; }
 
@@ -308,8 +285,6 @@ class MANGOS_DLL_SPEC WorldSession
         void SendGMTicketGetTicket(uint32 status, GMTicket *ticket = NULL);
         void SendGMResponse(GMTicket *ticket);
 
-        void SendAttackStop(Unit const* enemy);
-
         void SendBattlegGroundList(ObjectGuid guid, BattleGroundTypeId bgTypeId);
 
         void SendTradeStatus(TradeStatus status);
@@ -369,9 +344,10 @@ class MANGOS_DLL_SPEC WorldSession
 
         //Taxi
         void SendTaxiStatus(ObjectGuid guid);
-        void SendTaxiMenu( Creature* unit );
-        void SendDoFlight( uint32 mountDisplayId, uint32 path, uint32 pathNode = 0 );
-        bool SendLearnNewTaxiNode( Creature* unit );
+        void SendTaxiMenu(Creature* unit);
+        void SendDoFlight(uint32 mountDisplayId, uint32 path, uint32 pathNode = 0);
+        bool SendLearnNewTaxiNode(Creature* unit);
+        void SendActivateTaxiReply(ActivateTaxiReply reply);
 
         // Guild/Arena Team
         void SendGuildCommandResult(uint32 typecmd, const std::string& str, uint32 cmdresult);
@@ -394,8 +370,19 @@ class MANGOS_DLL_SPEC WorldSession
 
         uint32 GetLatency() const { return m_latency; }
         void SetLatency(uint32 latency) { m_latency = latency; }
+        void ResetClientTimeDelay() { m_clientTimeDelay = 0; }
         uint32 getDialogStatus(Player *pPlayer, Object* questgiver, uint32 defstatus);
 
+        // LFG
+        // TRUE values set by client sending CMSG_LFG_SET_AUTOJOIN and CMSG_LFM_CLEAR_AUTOFILL before player login
+        bool LookingForGroup_auto_join;
+        bool LookingForGroup_auto_add;
+
+        // Misc
+        void SendKnockBack(float angle, float horizontalSpeed, float verticalSpeed);
+        void SendPlaySpellVisual(ObjectGuid guid, uint32 spellArtKit);
+        void SendItemPageInfo(ItemPrototype* itemProto);
+
     public:                                                 // opcodes handlers
 
         void Handle_NULL(WorldPacket& recvPacket);          // not used
@@ -511,9 +498,17 @@ class MANGOS_DLL_SPEC WorldSession
         void HandleMovementOpcodes(WorldPacket& recvPacket);
         void HandleSetActiveMoverOpcode(WorldPacket &recv_data);
         void HandleMoveNotActiveMoverOpcode(WorldPacket &recv_data);
-        void HandleDismissControlledVehicle(WorldPacket &recv_data);
         void HandleMoveTimeSkippedOpcode(WorldPacket &recv_data);
 
+        void HandleDismissControlledVehicle(WorldPacket &recv_data);
+        void HandleRequestVehicleExit(WorldPacket &recv_data);
+        void HandleRequestVehiclePrevSeat(WorldPacket &recv_data);
+        void HandleRequestVehicleNextSeat(WorldPacket &recv_data);
+        void HandleRequestVehicleSwitchSeat(WorldPacket &recv_data);
+        void HandleEnterPlayerVehicle(WorldPacket &recv_data);
+        void HandleEjectPassenger(WorldPacket &recv_data);
+        void HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data);
+
         void HandleRequestRaidInfoOpcode( WorldPacket & recv_data );
 
         void HandleGroupInviteOpcode(WorldPacket& recvPacket);
@@ -579,6 +574,7 @@ class MANGOS_DLL_SPEC WorldSession
         void HandleBuyBankSlotOpcode(WorldPacket& recvPacket);
         void HandleTrainerListOpcode(WorldPacket& recvPacket);
         void HandleTrainerBuySpellOpcode(WorldPacket& recvPacket);
+
         void HandlePetitionShowListOpcode(WorldPacket& recvPacket);
         void HandleGossipHelloOpcode(WorldPacket& recvPacket);
         void HandleGossipSelectOptionOpcode(WorldPacket& recvPacket);
@@ -607,30 +603,29 @@ class MANGOS_DLL_SPEC WorldSession
         void HandleUnacceptTradeOpcode(WorldPacket& recvPacket);
 
         void HandleAuctionHelloOpcode(WorldPacket& recvPacket);
-        void HandleAuctionListItems( WorldPacket & recv_data );
-        void HandleAuctionListBidderItems( WorldPacket & recv_data );
-        void HandleAuctionSellItem( WorldPacket & recv_data );
-
-        void HandleAuctionRemoveItem( WorldPacket & recv_data );
-        void HandleAuctionListOwnerItems( WorldPacket & recv_data );
-        void HandleAuctionPlaceBid( WorldPacket & recv_data );
-
-        void AuctionBind( uint32 price, AuctionEntry * auction, Player * pl, Player* auction_owner );
-        void HandleAuctionListPendingSales( WorldPacket & recv_data );
-
-        void HandleGetMailList( WorldPacket & recv_data );
-        void HandleSendMail( WorldPacket & recv_data );
-        void HandleMailTakeMoney( WorldPacket & recv_data );
-        void HandleMailTakeItem( WorldPacket & recv_data );
-        void HandleMailMarkAsRead( WorldPacket & recv_data );
-        void HandleMailReturnToSender( WorldPacket & recv_data );
-        void HandleMailDelete( WorldPacket & recv_data );
-        void HandleItemTextQuery( WorldPacket & recv_data);
-        void HandleMailCreateTextItem(WorldPacket & recv_data );
-        void HandleQueryNextMailTime(WorldPacket & recv_data );
-        void HandleCancelChanneling(WorldPacket & recv_data );
-
-        void SendItemPageInfo( ItemPrototype *itemProto );
+        void HandleAuctionListItems(WorldPacket& recv_data);
+        void HandleAuctionListBidderItems(WorldPacket& recv_data);
+        void HandleAuctionSellItem(WorldPacket& recv_data);
+
+        void HandleAuctionRemoveItem(WorldPacket& recv_data);
+        void HandleAuctionListOwnerItems(WorldPacket& recv_data);
+        void HandleAuctionPlaceBid(WorldPacket& recv_data);
+
+        void AuctionBind(uint32 price, AuctionEntry* auction, Player* pl, Player* auction_owner);
+        void HandleAuctionListPendingSales(WorldPacket& recv_data);
+
+        void HandleGetMailList(WorldPacket& recv_data);
+        void HandleSendMail(WorldPacket& recv_data);
+        void HandleMailTakeMoney(WorldPacket& recv_data);
+        void HandleMailTakeItem(WorldPacket& recv_data);
+        void HandleMailMarkAsRead(WorldPacket& recv_data);
+        void HandleMailReturnToSender(WorldPacket& recv_data);
+        void HandleMailDelete(WorldPacket& recv_data);
+        void HandleItemTextQuery(WorldPacket& recv_data);
+        void HandleMailCreateTextItem(WorldPacket& recv_data);
+        void HandleQueryNextMailTime(WorldPacket& recv_data);
+        void HandleCancelChanneling(WorldPacket& recv_data);
+
         void HandleSplitItemOpcode(WorldPacket& recvPacket);
         void HandleSwapInvItemOpcode(WorldPacket& recvPacket);
         void HandleDestroyItemOpcode(WorldPacket& recvPacket);
@@ -738,7 +733,6 @@ class MANGOS_DLL_SPEC WorldSession
         void HandlePetAbandon( WorldPacket & recv_data );
         void HandlePetRename( WorldPacket & recv_data );
         void HandlePetCancelAuraOpcode( WorldPacket& recvPacket );
-        void HandlePetUnlearnOpcode( WorldPacket& recvPacket );
         void HandlePetSpellAutocastOpcode( WorldPacket& recvPacket );
         void HandlePetCastSpellOpcode( WorldPacket& recvPacket );
         void HandlePetLearnTalent( WorldPacket& recvPacket );
@@ -772,17 +766,15 @@ class MANGOS_DLL_SPEC WorldSession
         void HandleSetDungeonDifficultyOpcode(WorldPacket& recv_data);
         void HandleSetRaidDifficultyOpcode(WorldPacket& recv_data);
         void HandleMoveSetCanFlyAckOpcode(WorldPacket& recv_data);
-        void HandleLfgJoinOpcode(WorldPacket& recv_data);
-        void HandleLfgLeaveOpcode(WorldPacket& recv_data);
-        void HandleSearchLfgJoinOpcode(WorldPacket& recv_data);
-        void HandleSearchLfgLeaveOpcode(WorldPacket& recv_data);
-        void HandleSetLfgCommentOpcode(WorldPacket& recv_data);
         void HandleSetTitleOpcode(WorldPacket& recv_data);
         void HandleRealmSplitOpcode(WorldPacket& recv_data);
         void HandleTimeSyncResp(WorldPacket& recv_data);
         void HandleWhoisOpcode(WorldPacket& recv_data);
         void HandleResetInstancesOpcode(WorldPacket& recv_data);
         void HandleHearthandResurrect(WorldPacket & recv_data);
+        void HandleInstanceLockResponse(WorldPacket& recv_data);
+        void HandleSetSavedInstanceExtend(WorldPacket& recv_data);
+        void HandleUpdateMissileTrajectory(WorldPacket& recv_data);
 
         // Arena Team
         void HandleInspectArenaTeamsOpcode(WorldPacket& recv_data);
@@ -807,7 +799,9 @@ class MANGOS_DLL_SPEC WorldSession
         void HandleSocketOpcode(WorldPacket& recv_data);
 
         void HandleCancelTempEnchantmentOpcode(WorldPacket& recv_data);
+
         void HandleItemRefundInfoRequest(WorldPacket& recv_data);
+        void HandleItemRefund(WorldPacket& recv_data);
 
         void HandleChannelVoiceOnOpcode(WorldPacket & recv_data);
         void HandleVoiceSessionEnableOpcode(WorldPacket& recv_data);
@@ -832,6 +826,7 @@ class MANGOS_DLL_SPEC WorldSession
         void HandleCalendarGetCalendar(WorldPacket& recv_data);
         void HandleCalendarGetEvent(WorldPacket& recv_data);
         void HandleCalendarGuildFilter(WorldPacket& recv_data);
+        void HandleCalendarEventSignup(WorldPacket& recvData);
         void HandleCalendarArenaTeam(WorldPacket& recv_data);
         void HandleCalendarAddEvent(WorldPacket& recv_data);
         void HandleCalendarUpdateEvent(WorldPacket& recv_data);
@@ -846,10 +841,12 @@ class MANGOS_DLL_SPEC WorldSession
         void HandleCalendarGetNumPending(WorldPacket& recv_data);
 
         void HandleSpellClick(WorldPacket& recv_data);
+        void HandleUpdateProjectilePosition(WorldPacket & recv_data);
         void HandleGetMirrorimageData(WorldPacket& recv_data);
         void HandleAlterAppearanceOpcode(WorldPacket& recv_data);
         void HandleRemoveGlyphOpcode(WorldPacket& recv_data);
         void HandleCharCustomizeOpcode(WorldPacket& recv_data);
+        void HandleCharFactionOrRaceChangeOpcode(WorldPacket& recv_data);
         void HandleQueryInspectAchievementsOpcode(WorldPacket& recv_data);
         void HandleEquipmentSetSaveOpcode(WorldPacket& recv_data);
         void HandleEquipmentSetDeleteOpcode(WorldPacket& recv_data);
@@ -858,17 +855,74 @@ class MANGOS_DLL_SPEC WorldSession
         void HandleReadyForAccountDataTimesOpcode(WorldPacket& recv_data);
         void HandleQueryQuestsCompletedOpcode(WorldPacket& recv_data);
         void HandleQuestPOIQueryOpcode(WorldPacket& recv_data);
+
+        // Refer-A-Friend
+        void HandleGrantLevel(WorldPacket& recv_data);
+        void HandleAcceptGrantLevel(WorldPacket& recv_data);
+
+        // LFG
+        void HandleLfgJoinOpcode(WorldPacket& recv_data);
+        void HandleLfgLeaveOpcode(WorldPacket& recv_data);
+        void HandleLfgClearOpcode(WorldPacket& recv_data);
+        void HandleSetLfgCommentOpcode(WorldPacket& recv_data);
+        void HandleLfgSetRolesOpcode(WorldPacket& recv_data);
+        void HandleLfgGetStatus(WorldPacket& recv_data);
+        //
+        void HandleLfgSetBootVoteOpcode(WorldPacket &recv_data);
+        void HandleLfgProposalResultOpcode(WorldPacket &recv_data);
+        void HandleLfgPlayerLockInfoRequestOpcode(WorldPacket &recv_data);
+        void HandleLfgTeleportOpcode(WorldPacket &recv_data);
+        void HandleLfgPartyLockInfoRequestOpcode(WorldPacket &recv_data);
+        // send data
+        void SendLfgUpdatePlayer(LFGUpdateType updateType, LFGType type);
+        void SendLfgUpdateParty(LFGUpdateType updateType, LFGType type);
+        void SendLfgUpdateSearch(bool update);
+        void SendLfgJoinResult(LFGJoinResult checkResult, uint8 checkValue = 0, bool withLockMap = false);
+        void SendLfgPlayerReward(LFGDungeonEntry const* dungeon, const LFGReward* reward, const Quest* qRew, bool isSecond = false);
+        void SendLfgQueueStatus(LFGDungeonEntry const* dungeon, LFGQueueStatus* status);
+        void SendLfgRoleChosen(ObjectGuid guid, uint8 roles);
+        void SendLfgRoleCheckUpdate();
+        void SendLfgBootPlayer();
+        void SendLfgUpdateProposal(LFGProposal* proposal);
+        void SendLfgOfferContinue(LFGDungeonEntry const* dungeon);
+        void SendLfgTeleportError(LFGTeleportError msg);
+        // LFR
+        void HandleLfrSearchOpcode(WorldPacket& recv_data);
+        void HandleLfrLeaveOpcode(WorldPacket& recv_data);
+        // send data
+        void SendLfgUpdateList(uint32 dungeonID);
+        void SendLfgDisabled();
+
+        // playerbot mod
+        void HandleBotPackets();
+        // end of playerbot mod
+
+
+        // BattleField system
+        void SendBfInvitePlayerToWar(ObjectGuid battlefieldGuid, uint32 uiZoneId, uint32 uiTimeToAccept);
+        void SendBfInvitePlayerToQueue(ObjectGuid battlefieldGuid);
+        void SendBfQueueInviteResponse(ObjectGuid battlefieldGuid, ObjectGuid queueGuid, uint32 uiZoneId, bool bCanQueue, bool bFull);
+        void SendBfEntered(ObjectGuid battlefieldGuid);
+        void SendBfLeaveMessage(ObjectGuid battlefieldGuid, BattlefieldLeaveReason reason);
+        void HandleBfQueueInviteResponse(WorldPacket& recv_data);
+        void HandleBfQueueRequest(WorldPacket& recv_data);
+        void HandleBfEntryInviteResponse(WorldPacket& recv_data);
+        void HandleBfExitRequest(WorldPacket& recv_data);
+
     private:
         // private trade methods
         void moveItems(Item* myItems[], Item* hisItems[]);
+
+        // movement
         bool VerifyMovementInfo(MovementInfo const& movementInfo, ObjectGuid const& guid) const;
-        void HandleMoverRelocation(MovementInfo& movementInfo);
+        void HandlePlayerRelocation(MovementInfo& movementInfo);
+        void UpdateMoverPosition(MovementInfo& movementInfo);
 
-        void ExecuteOpcode( OpcodeHandler const& opHandle, WorldPacket* packet );
+        void ExecuteOpcode(OpcodeHandler const& opHandle, WorldPacket* packet);
 
         // logging helper
-        void LogUnexpectedOpcode(WorldPacket *packet, const char * reason);
-        void LogUnprocessedTail(WorldPacket *packet);
+        void LogUnexpectedOpcode(WorldPacket* packet, const char* reason);
+        void LogUnprocessedTail(WorldPacket* packet);
 
         uint32 m_GUIDLow;                                   // set logged or recently logout player (while m_playerRecentlyLogout set)
         Player *_player;
@@ -888,11 +942,15 @@ class MANGOS_DLL_SPEC WorldSession
         LocaleConstant m_sessionDbcLocale;
         int m_sessionDbLocaleIndex;
         uint32 m_latency;
+        uint32 m_clientTimeDelay;
         AccountData m_accountData[NUM_ACCOUNT_DATA_TYPES];
         uint32 m_Tutorials[8];
         TutorialDataState m_tutorialState;
         AddonsList m_addonsList;
         ACE_Based::LockedQueue<WorldPacket*, ACE_Thread_Mutex> _recvQueue;
+
+        // Warden
+        WardenBase *m_Warden;
 };
 #endif
 /// @}
diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index 62beec03706..c72ca38aa1d 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -35,6 +35,7 @@
 #include "WorldPacket.h"
 #include "SharedDefines.h"
 #include "ByteBuffer.h"
+#include "ObjectMgr.h"
 #include "Opcodes.h"
 #include "Database/DatabaseEnv.h"
 #include "Auth/Sha1.h"
@@ -57,22 +58,22 @@ struct ServerPktHeader
     ServerPktHeader(uint32 size, uint16 cmd) : size(size)
     {
         uint8 headerIndex=0;
-        if(isLargePacket())
+        if (isLargePacket())
         {
             DEBUG_LOG("initializing large server to client packet. Size: %u, cmd: %u", size, cmd);
-            header[headerIndex++] = 0x80|(0xFF &(size>>16));
+            header[headerIndex++] = 0x80 | (0xFF & (size >> 16));
         }
-        header[headerIndex++] = 0xFF &(size>>8);
-        header[headerIndex++] = 0xFF &size;
+        header[headerIndex++] = 0xFF & (size >> 8);
+        header[headerIndex++] = 0xFF & size;
 
         header[headerIndex++] = 0xFF & cmd;
-        header[headerIndex++] = 0xFF & (cmd>>8);
+        header[headerIndex++] = 0xFF & (cmd >> 8);
     }
 
     uint8 getHeaderLength()
     {
         // cmd = 2 bytes, size= 2||3bytes
-        return 2+(isLargePacket()?3:2);
+        return 2 + (isLargePacket() ? 3 : 2);
     }
 
     bool isLargePacket()
@@ -96,44 +97,44 @@ struct ClientPktHeader
 #pragma pack(pop)
 #endif
 
-WorldSocket::WorldSocket (void) :
-WorldHandler (),
-m_LastPingTime (ACE_Time_Value::zero),
-m_OverSpeedPings (0),
-m_Session (0),
-m_RecvWPct (0),
-m_RecvPct (),
-m_Header (sizeof (ClientPktHeader)),
-m_OutBuffer (0),
-m_OutBufferSize (65536),
-m_OutActive (false),
-m_Seed (static_cast<uint32> (rand32 ()))
+WorldSocket::WorldSocket(void) :
+WorldHandler(),
+m_LastPingTime(ACE_Time_Value::zero),
+m_OverSpeedPings(0),
+m_Session(0),
+m_RecvWPct(0),
+m_RecvPct(),
+m_Header(sizeof(ClientPktHeader)),
+m_OutBuffer(0),
+m_OutBufferSize(65536),
+m_OutActive(false),
+m_Seed(static_cast<uint32>(rand32()))
 {
-    reference_counting_policy ().value (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
+    reference_counting_policy().value(ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
 
     msg_queue()->high_water_mark(8*1024*1024);
     msg_queue()->low_water_mark(8*1024*1024);
 }
 
-WorldSocket::~WorldSocket (void)
+WorldSocket::~WorldSocket(void)
 {
     if (m_RecvWPct)
         delete m_RecvWPct;
 
     if (m_OutBuffer)
-        m_OutBuffer->release ();
+        m_OutBuffer->release();
 
     closing_ = true;
 
-    peer ().close ();
+    peer().close();
 }
 
-bool WorldSocket::IsClosed (void) const
+bool WorldSocket::IsClosed(void) const
 {
     return closing_;
 }
 
-void WorldSocket::CloseSocket (void)
+void WorldSocket::CloseSocket(void)
 {
     {
         ACE_GUARD (LockType, Guard, m_OutBufferLock);
@@ -142,43 +143,50 @@ void WorldSocket::CloseSocket (void)
             return;
 
         closing_ = true;
-        peer ().close_writer ();
+        peer().close_writer();
     }
 
     {
-        ACE_GUARD (LockType, Guard, m_SessionLock);
+        ACE_GUARD(LockType, Guard, m_SessionLock);
 
         m_Session = NULL;
     }
 }
 
-const std::string& WorldSocket::GetRemoteAddress (void) const
+const std::string& WorldSocket::GetRemoteAddress(void) const
 {
     return m_Address;
 }
 
-int WorldSocket::SendPacket (const WorldPacket& pct)
+int WorldSocket::SendPacket(const WorldPacket& pct)
 {
-    ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, -1);
+    ACE_GUARD_RETURN(LockType, Guard, m_OutBufferLock, -1);
 
     if (closing_)
         return -1;
 
+    uint16 realOpcode = sObjectMgr.GetOpcodeValue(pct.GetOpcode());
+    if (realOpcode == 0)
+    {
+        DEBUG_LOG("WorldSocket::SendPacket try send packet with unhandled opcode %u (%s)", pct.GetOpcode(), LookupOpcodeName(pct.GetOpcode()));
+        return 0;
+    }
+
     // Dump outgoing packet.
     sLog.outWorldPacketDump(uint32(get_handle()), pct.GetOpcode(), LookupOpcodeName(pct.GetOpcode()), &pct, false);
 
-    ServerPktHeader header(pct.size()+2, pct.GetOpcode());
-    m_Crypt.EncryptSend ((uint8*)header.header, header.getHeaderLength());
+    ServerPktHeader header(pct.size()+2, realOpcode);
+    m_Crypt.EncryptSend((uint8*)header.header, header.getHeaderLength());
 
-    if (m_OutBuffer->space () >= pct.size () + header.getHeaderLength() && msg_queue()->is_empty())
+    if (m_OutBuffer->space() >= pct.size() + header.getHeaderLength() && msg_queue()->is_empty())
     {
         // Put the packet on the buffer.
-        if (m_OutBuffer->copy ((char*) header.header, header.getHeaderLength()) == -1)
-            MANGOS_ASSERT (false);
+        if (m_OutBuffer->copy((char*)header.header, header.getHeaderLength()) == -1)
+            MANGOS_ASSERT(false);
 
-        if (!pct.empty ())
-            if (m_OutBuffer->copy ((char*) pct.contents (), pct.size ()) == -1)
-                MANGOS_ASSERT (false);
+        if (!pct.empty())
+            if (m_OutBuffer->copy((char*)pct.contents(), pct.size()) == -1)
+                MANGOS_ASSERT(false);
     }
     else
     {
@@ -187,12 +195,12 @@ int WorldSocket::SendPacket (const WorldPacket& pct)
 
         ACE_NEW_RETURN(mb, ACE_Message_Block(pct.size () + header.getHeaderLength()), -1);
 
-        mb->copy((char*) header.header, header.getHeaderLength());
+        mb->copy((char*)header.header, header.getHeaderLength());
 
-        if (!pct.empty ())
-            mb->copy((const char*)pct.contents(), pct.size ());
+        if (!pct.empty())
+            mb->copy((const char*)pct.contents(), pct.size());
 
-        if(msg_queue()->enqueue_tail(mb,(ACE_Time_Value*)&ACE_Time_Value::zero) == -1)
+        if(msg_queue()->enqueue_tail(mb, (ACE_Time_Value*)&ACE_Time_Value::zero) == -1)
         {
             sLog.outError("WorldSocket::SendPacket enqueue_tail");
             mb->release();
@@ -203,19 +211,19 @@ int WorldSocket::SendPacket (const WorldPacket& pct)
     return 0;
 }
 
-long WorldSocket::AddReference (void)
+long WorldSocket::AddReference(void)
 {
-    return static_cast<long> (add_reference ());
+    return static_cast<long>(add_reference());
 }
 
-long WorldSocket::RemoveReference (void)
+long WorldSocket::RemoveReference(void)
 {
-    return static_cast<long> (remove_reference ());
+    return static_cast<long>(remove_reference());
 }
 
-int WorldSocket::open (void *a)
+int WorldSocket::open(void *a)
 {
-    ACE_UNUSED_ARG (a);
+    ACE_UNUSED_ARG(a);
 
     // Prevent double call to this func.
     if (m_OutBuffer)
@@ -226,22 +234,22 @@ int WorldSocket::open (void *a)
     m_OutActive = true;
 
     // Hook for the manager.
-    if (sWorldSocketMgr->OnSocketOpen (this) == -1)
+    if (sWorldSocketMgr->OnSocketOpen(this) == -1)
         return -1;
 
     // Allocate the buffer.
-    ACE_NEW_RETURN (m_OutBuffer, ACE_Message_Block (m_OutBufferSize), -1);
+    ACE_NEW_RETURN(m_OutBuffer, ACE_Message_Block(m_OutBufferSize), -1);
 
     // Store peer address.
     ACE_INET_Addr remote_addr;
 
-    if (peer ().get_remote_addr (remote_addr) == -1)
+    if (peer().get_remote_addr(remote_addr) == -1)
     {
-        sLog.outError ("WorldSocket::open: peer ().get_remote_addr errno = %s", ACE_OS::strerror (errno));
+        sLog.outError ("WorldSocket::open: peer ().get_remote_addr errno = %s", ACE_OS::strerror(errno));
         return -1;
     }
 
-    m_Address = remote_addr.get_host_addr ();
+    m_Address = remote_addr.get_host_addr();
 
     // Send startup packet.
     WorldPacket packet (SMSG_AUTH_CHALLENGE, 40);
@@ -256,56 +264,55 @@ int WorldSocket::open (void *a)
     seed2.SetRand(16 * 8);
     packet.append(seed2.AsByteArray(16), 16);               // new encryption seeds
 
-    if (SendPacket (packet) == -1)
+    if (SendPacket(packet) == -1)
         return -1;
 
     // Register with ACE Reactor
-    if (reactor ()->register_handler(this, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::WRITE_MASK) == -1)
+    if (reactor()->register_handler(this, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::WRITE_MASK) == -1)
     {
-        sLog.outError ("WorldSocket::open: unable to register client handler errno = %s", ACE_OS::strerror (errno));
+        sLog.outError("WorldSocket::open: unable to register client handler errno = %s", ACE_OS::strerror(errno));
         return -1;
     }
 
     // reactor takes care of the socket from now on
-    remove_reference ();
+    remove_reference();
 
     return 0;
 }
 
-int WorldSocket::close (int)
+int WorldSocket::close(int)
 {
-    shutdown ();
+    shutdown();
 
     closing_ = true;
 
-    remove_reference ();
+    remove_reference();
 
     return 0;
 }
 
-int WorldSocket::handle_input (ACE_HANDLE)
+int WorldSocket::handle_input(ACE_HANDLE)
 {
     if (closing_)
         return -1;
 
-    switch (handle_input_missing_data ())
+    switch (handle_input_missing_data())
     {
         case -1 :
         {
-            if ((errno == EWOULDBLOCK) ||
-                (errno == EAGAIN))
+            if ((errno == EWOULDBLOCK) || (errno == EAGAIN))
             {
-                return Update ();                           // interesting line ,isn't it ?
+                return Update();                            // interesting line,isn't it ?
             }
 
-            DEBUG_LOG ("WorldSocket::handle_input: Peer error closing connection errno = %s", ACE_OS::strerror (errno));
+            DEBUG_LOG("WorldSocket::handle_input: Peer error closing connection errno = %s", ACE_OS::strerror(errno));
 
             errno = ECONNRESET;
             return -1;
         }
         case 0:
         {
-            DEBUG_LOG ("WorldSocket::handle_input: Peer has closed connection");
+            DEBUG_LOG("WorldSocket::handle_input: Peer has closed connection");
 
             errno = ECONNRESET;
             return -1;
@@ -313,28 +320,28 @@ int WorldSocket::handle_input (ACE_HANDLE)
         case 1:
             return 1;
         default:
-            return Update ();                               // another interesting line ;)
+            return Update();                                // another interesting line ;)
     }
 
     ACE_NOTREACHED(return -1);
 }
 
-int WorldSocket::handle_output (ACE_HANDLE)
+int WorldSocket::handle_output(ACE_HANDLE)
 {
-    ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, -1);
+    ACE_GUARD_RETURN(LockType, Guard, m_OutBufferLock, -1);
 
     if (closing_)
         return -1;
 
-    const size_t send_len = m_OutBuffer->length ();
+    const size_t send_len = m_OutBuffer->length();
 
     if (send_len == 0)
-        return handle_output_queue (Guard);
+        return handle_output_queue(Guard);
 
 #ifdef MSG_NOSIGNAL
-    ssize_t n = peer ().send (m_OutBuffer->rd_ptr (), send_len, MSG_NOSIGNAL);
+    ssize_t n = peer().send(m_OutBuffer->rd_ptr(), send_len, MSG_NOSIGNAL);
 #else
-    ssize_t n = peer ().send (m_OutBuffer->rd_ptr (), send_len);
+    ssize_t n = peer().send(m_OutBuffer->rd_ptr(), send_len);
 #endif // MSG_NOSIGNAL
 
     if (n == 0)
@@ -342,48 +349,48 @@ int WorldSocket::handle_output (ACE_HANDLE)
     else if (n == -1)
     {
         if (errno == EWOULDBLOCK || errno == EAGAIN)
-            return schedule_wakeup_output (Guard);
+            return schedule_wakeup_output(Guard);
 
         return -1;
     }
     else if (n < (ssize_t)send_len) //now n > 0
     {
-        m_OutBuffer->rd_ptr (static_cast<size_t> (n));
+        m_OutBuffer->rd_ptr(static_cast<size_t>(n));
 
         // move the data to the base of the buffer
-        m_OutBuffer->crunch ();
+        m_OutBuffer->crunch();
 
-        return schedule_wakeup_output (Guard);
+        return schedule_wakeup_output(Guard);
     }
     else //now n == send_len
     {
-        m_OutBuffer->reset ();
+        m_OutBuffer->reset();
 
-        return handle_output_queue (Guard);
+        return handle_output_queue(Guard);
     }
 
-    ACE_NOTREACHED (return 0);
+    ACE_NOTREACHED(return 0);
 }
 
-int WorldSocket::handle_output_queue (GuardType& g)
+int WorldSocket::handle_output_queue(GuardType& g)
 {
-    if(msg_queue()->is_empty())
+    if (msg_queue()->is_empty())
         return cancel_wakeup_output(g);
 
     ACE_Message_Block *mblk;
 
-    if(msg_queue()->dequeue_head(mblk, (ACE_Time_Value*)&ACE_Time_Value::zero) == -1)
+    if (msg_queue()->dequeue_head(mblk, (ACE_Time_Value*)&ACE_Time_Value::zero) == -1)
     {
         sLog.outError("WorldSocket::handle_output_queue dequeue_head");
         return -1;
     }
 
-    const size_t send_len = mblk->length ();
+    const size_t send_len = mblk->length();
 
 #ifdef MSG_NOSIGNAL
-    ssize_t n = peer ().send (mblk->rd_ptr (), send_len, MSG_NOSIGNAL);
+    ssize_t n = peer().send (mblk->rd_ptr(), send_len, MSG_NOSIGNAL);
 #else
-    ssize_t n = peer ().send (mblk->rd_ptr (), send_len);
+    ssize_t n = peer().send (mblk->rd_ptr(), send_len);
 #endif // MSG_NOSIGNAL
 
     if (n == 0)
@@ -396,8 +403,8 @@ int WorldSocket::handle_output_queue (GuardType& g)
     {
         if (errno == EWOULDBLOCK || errno == EAGAIN)
         {
-            msg_queue()->enqueue_head(mblk, (ACE_Time_Value*) &ACE_Time_Value::zero);
-            return schedule_wakeup_output (g);
+            msg_queue()->enqueue_head(mblk, (ACE_Time_Value*)&ACE_Time_Value::zero);
+            return schedule_wakeup_output(g);
         }
 
         mblk->release();
@@ -407,14 +414,14 @@ int WorldSocket::handle_output_queue (GuardType& g)
     {
         mblk->rd_ptr (static_cast<size_t> (n));
 
-        if (msg_queue()->enqueue_head(mblk, (ACE_Time_Value*) &ACE_Time_Value::zero) == -1)
+        if (msg_queue()->enqueue_head(mblk, (ACE_Time_Value*)&ACE_Time_Value::zero) == -1)
         {
             sLog.outError("WorldSocket::handle_output_queue enqueue_head");
             mblk->release();
             return -1;
         }
 
-        return schedule_wakeup_output (g);
+        return schedule_wakeup_output(g);
     }
     else //now n == send_len
     {
@@ -426,21 +433,21 @@ int WorldSocket::handle_output_queue (GuardType& g)
     ACE_NOTREACHED(return -1);
 }
 
-int WorldSocket::handle_close (ACE_HANDLE h, ACE_Reactor_Mask)
+int WorldSocket::handle_close(ACE_HANDLE h, ACE_Reactor_Mask)
 {
     // Critical section
     {
-        ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, -1);
+        ACE_GUARD_RETURN(LockType, Guard, m_OutBufferLock, -1);
 
         closing_ = true;
 
         if (h == ACE_INVALID_HANDLE)
-            peer ().close_writer ();
+            peer().close_writer();
     }
 
     // Critical section
     {
-        ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1);
+        ACE_GUARD_RETURN(LockType, Guard, m_SessionLock, -1);
 
         m_Session = NULL;
     }
@@ -454,33 +461,39 @@ int WorldSocket::Update (void)
     if (closing_)
         return -1;
 
-    if (m_OutActive || (m_OutBuffer->length () == 0 && msg_queue()->is_empty()))
+    if (m_OutActive)
         return 0;
 
+    {
+        ACE_GUARD_RETURN(LockType, Guard, m_OutBufferLock, 0);
+        if (m_OutBuffer->length() == 0 && msg_queue()->is_empty())
+            return 0;
+    }
+
     int ret;
     do
-        ret = handle_output (get_handle ());
-    while( ret > 0 );
+        ret = handle_output(get_handle());
+    while (ret > 0);
 
     return ret;
 }
 
-int WorldSocket::handle_input_header (void)
+int WorldSocket::handle_input_header(void)
 {
-    MANGOS_ASSERT (m_RecvWPct == NULL);
+    MANGOS_ASSERT(m_RecvWPct == NULL);
 
-    MANGOS_ASSERT (m_Header.length () == sizeof (ClientPktHeader));
+    MANGOS_ASSERT(m_Header.length() == sizeof(ClientPktHeader));
 
-    m_Crypt.DecryptRecv ((uint8*) m_Header.rd_ptr (), sizeof (ClientPktHeader));
+    m_Crypt.DecryptRecv((uint8*)m_Header.rd_ptr(), sizeof(ClientPktHeader));
 
-    ClientPktHeader& header = *((ClientPktHeader*) m_Header.rd_ptr ());
+    ClientPktHeader &header = *((ClientPktHeader*)m_Header.rd_ptr());
 
     EndianConvertReverse(header.size);
     EndianConvert(header.cmd);
 
-    if ((header.size < 4) || (header.size > 10240) || (header.cmd  > 10240))
+    if ((header.size < 4) || (header.size > 10240) || (header.cmd > 10240))
     {
-        sLog.outError ("WorldSocket::handle_input_header: client sent malformed packet size = %d , cmd = %d",
+        sLog.outError("WorldSocket::handle_input_header: client sent malformed packet size = %d, cmd = %d",
                        header.size, header.cmd);
 
         errno = EINVAL;
@@ -489,12 +502,20 @@ int WorldSocket::handle_input_header (void)
 
     header.size -= 4;
 
-    ACE_NEW_RETURN (m_RecvWPct, WorldPacket ((uint16) header.cmd, header.size), -1);
+    Opcodes internalOpcode = sObjectMgr.GetOpcode(header.cmd);
+    if (internalOpcode == MSG_NULL_ACTION)
+    {
+        DEBUG_LOG("WorldSocket::handle_input_header received unhandled opcode %u", header.cmd);
+        errno = EINVAL;
+        return -1;
+    }
 
-    if(header.size > 0)
+    ACE_NEW_RETURN(m_RecvWPct, WorldPacket(internalOpcode, header.size), -1);
+
+    if (header.size > 0)
     {
-        m_RecvWPct->resize (header.size);
-        m_RecvPct.base ((char*) m_RecvWPct->contents (), m_RecvWPct->size ());
+        m_RecvWPct->resize(header.size);
+        m_RecvPct.base((char*)m_RecvWPct->contents(), m_RecvWPct->size());
     }
     else
     {
@@ -504,22 +525,22 @@ int WorldSocket::handle_input_header (void)
     return 0;
 }
 
-int WorldSocket::handle_input_payload (void)
+int WorldSocket::handle_input_payload(void)
 {
     // set errno properly here on error !!!
     // now have a header and payload
 
-    MANGOS_ASSERT (m_RecvPct.space () == 0);
-    MANGOS_ASSERT (m_Header.space () == 0);
-    MANGOS_ASSERT (m_RecvWPct != NULL);
+    MANGOS_ASSERT(m_RecvPct.space() == 0);
+    MANGOS_ASSERT(m_Header.space() == 0);
+    MANGOS_ASSERT(m_RecvWPct != NULL);
 
-    const int ret = ProcessIncoming (m_RecvWPct);
+    const int ret = ProcessIncoming(m_RecvWPct);
 
-    m_RecvPct.base (NULL, 0);
-    m_RecvPct.reset ();
+    m_RecvPct.base(NULL, 0);
+    m_RecvPct.reset();
     m_RecvWPct = NULL;
 
-    m_Header.reset ();
+    m_Header.reset();
 
     if (ret == -1)
         errno = EINVAL;
@@ -527,53 +548,44 @@ int WorldSocket::handle_input_payload (void)
     return ret;
 }
 
-int WorldSocket::handle_input_missing_data (void)
+int WorldSocket::handle_input_missing_data(void)
 {
-    char buf [4096];
+    char buf[4096];
 
-    ACE_Data_Block db ( sizeof (buf),
-                        ACE_Message_Block::MB_DATA,
-                        buf,
-                        0,
-                        0,
-                        ACE_Message_Block::DONT_DELETE,
-                        0);
+    ACE_Data_Block db(sizeof(buf), ACE_Message_Block::MB_DATA, buf, 0, 0, ACE_Message_Block::DONT_DELETE, 0);
 
-    ACE_Message_Block message_block(&db,
-                                    ACE_Message_Block::DONT_DELETE,
-                                    0);
+    ACE_Message_Block message_block(&db, ACE_Message_Block::DONT_DELETE, 0);
 
-    const size_t recv_size = message_block.space ();
+    const size_t recv_size = message_block.space();
 
-    const ssize_t n = peer ().recv (message_block.wr_ptr (),
-                                          recv_size);
+    const ssize_t n = peer().recv(message_block.wr_ptr(), recv_size);
 
     if (n <= 0)
         return (int)n;
 
-    message_block.wr_ptr (n);
+    message_block.wr_ptr(n);
 
-    while (message_block.length () > 0)
+    while (message_block.length() > 0)
     {
-        if (m_Header.space () > 0)
+        if (m_Header.space() > 0)
         {
             //need to receive the header
-            const size_t to_header = (message_block.length () > m_Header.space () ? m_Header.space () : message_block.length ());
-            m_Header.copy (message_block.rd_ptr (), to_header);
-            message_block.rd_ptr (to_header);
+            const size_t to_header = (message_block.length() > m_Header.space() ? m_Header.space() : message_block.length());
+            m_Header.copy(message_block.rd_ptr(), to_header);
+            message_block.rd_ptr(to_header);
 
-            if (m_Header.space () > 0)
+            if (m_Header.space() > 0)
             {
                 // Couldn't receive the whole header this time.
-                MANGOS_ASSERT (message_block.length () == 0);
+                MANGOS_ASSERT(message_block.length() == 0);
                 errno = EWOULDBLOCK;
                 return -1;
             }
 
             // We just received nice new header
-            if (handle_input_header () == -1)
+            if (handle_input_header() == -1)
             {
-                MANGOS_ASSERT ((errno != EWOULDBLOCK) && (errno != EAGAIN));
+                MANGOS_ASSERT((errno != EWOULDBLOCK) && (errno != EAGAIN));
                 return -1;
             }
         }
@@ -583,32 +595,32 @@ int WorldSocket::handle_input_missing_data (void)
         // hope this is not hack ,as proper m_RecvWPct is asserted around
         if (!m_RecvWPct)
         {
-            sLog.outError ("Forcing close on input m_RecvWPct = NULL");
+            sLog.outError("Forcing close on input m_RecvWPct = NULL");
             errno = EINVAL;
             return -1;
         }
 
         // We have full read header, now check the data payload
-        if (m_RecvPct.space () > 0)
+        if (m_RecvPct.space() > 0)
         {
             //need more data in the payload
-            const size_t to_data = (message_block.length () > m_RecvPct.space () ? m_RecvPct.space () : message_block.length ());
-            m_RecvPct.copy (message_block.rd_ptr (), to_data);
-            message_block.rd_ptr (to_data);
+            const size_t to_data = (message_block.length() > m_RecvPct.space() ? m_RecvPct.space() : message_block.length());
+            m_RecvPct.copy(message_block.rd_ptr(), to_data);
+            message_block.rd_ptr(to_data);
 
-            if (m_RecvPct.space () > 0)
+            if (m_RecvPct.space() > 0)
             {
                 // Couldn't receive the whole data this time.
-                MANGOS_ASSERT (message_block.length () == 0);
+                MANGOS_ASSERT(message_block.length() == 0);
                 errno = EWOULDBLOCK;
                 return -1;
             }
         }
 
         //just received fresh new payload
-        if (handle_input_payload () == -1)
+        if (handle_input_payload() == -1)
         {
-            MANGOS_ASSERT ((errno != EWOULDBLOCK) && (errno != EAGAIN));
+            MANGOS_ASSERT((errno != EWOULDBLOCK) && (errno != EAGAIN));
             return -1;
         }
     }
@@ -616,53 +628,53 @@ int WorldSocket::handle_input_missing_data (void)
     return size_t(n) == recv_size ? 1 : 2;
 }
 
-int WorldSocket::cancel_wakeup_output (GuardType& g)
+int WorldSocket::cancel_wakeup_output(GuardType& g)
 {
     if (!m_OutActive)
         return 0;
 
     m_OutActive = false;
 
-    g.release ();
+    g.release();
 
-    if (reactor ()->cancel_wakeup
+    if (reactor()->cancel_wakeup
         (this, ACE_Event_Handler::WRITE_MASK) == -1)
     {
         // would be good to store errno from reactor with errno guard
-        sLog.outError ("WorldSocket::cancel_wakeup_output");
+        sLog.outError("WorldSocket::cancel_wakeup_output");
         return -1;
     }
 
     return 0;
 }
 
-int WorldSocket::schedule_wakeup_output (GuardType& g)
+int WorldSocket::schedule_wakeup_output(GuardType& g)
 {
     if (m_OutActive)
         return 0;
 
     m_OutActive = true;
 
-    g.release ();
+    g.release();
 
-    if (reactor ()->schedule_wakeup
+    if (reactor()->schedule_wakeup
         (this, ACE_Event_Handler::WRITE_MASK) == -1)
     {
-        sLog.outError ("WorldSocket::schedule_wakeup_output");
+        sLog.outError("WorldSocket::schedule_wakeup_output");
         return -1;
     }
 
     return 0;
 }
 
-int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
+int WorldSocket::ProcessIncoming(WorldPacket* new_pct)
 {
-    MANGOS_ASSERT (new_pct);
+    MANGOS_ASSERT(new_pct);
 
     // manage memory ;)
-    ACE_Auto_Ptr<WorldPacket> aptr (new_pct);
+    ACE_Auto_Ptr<WorldPacket> aptr(new_pct);
 
-    const ACE_UINT16 opcode = new_pct->GetOpcode ();
+    const ACE_UINT16 opcode = new_pct->GetOpcode();
 
     if (opcode >= NUM_MSG_TYPES)
     {
@@ -681,22 +693,22 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
         switch(opcode)
         {
             case CMSG_PING:
-                return HandlePing (*new_pct);
+                return HandlePing(*new_pct);
             case CMSG_AUTH_SESSION:
                 if (m_Session)
                 {
-                    sLog.outError ("WorldSocket::ProcessIncoming: Player send CMSG_AUTH_SESSION again");
+                    sLog.outError("WorldSocket::ProcessIncoming: Player send CMSG_AUTH_SESSION again");
                     return -1;
                 }
 
-                return HandleAuthSession (*new_pct);
+                return HandleAuthSession(*new_pct);
             case CMSG_KEEP_ALIVE:
-                DEBUG_LOG ("CMSG_KEEP_ALIVE ,size: "SIZEFMTD" ", new_pct->size ());
+                DEBUG_LOG("CMSG_KEEP_ALIVE, size: " SIZEFMTD " ", new_pct->size());
 
                 return 0;
             default:
             {
-                ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1);
+                ACE_GUARD_RETURN(LockType, Guard, m_SessionLock, -1);
 
                 if (m_Session != NULL)
                 {
@@ -704,12 +716,12 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
                     aptr.release ();
                     // WARNING here we call it with locks held.
                     // Its possible to cause deadlock if QueuePacket calls back
-                    m_Session->QueuePacket (new_pct);
+                    m_Session->QueuePacket(new_pct);
                     return 0;
                 }
                 else
                 {
-                    sLog.outError ("WorldSocket::ProcessIncoming: Client not authed opcode = %u", uint32(opcode));
+                    sLog.outError("WorldSocket::ProcessIncoming: Client not authed opcode = %u", uint32(opcode));
                     return -1;
                 }
             }
@@ -718,7 +730,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
     catch (ByteBufferException &)
     {
         sLog.outError("WorldSocket::ProcessIncoming ByteBufferException occured while parsing an instant handled packet (opcode: %u) from client %s, accountid=%i.",
-                opcode, GetRemoteAddress().c_str(), m_Session?m_Session->GetAccountId():-1);
+                opcode, GetRemoteAddress().c_str(), m_Session ? m_Session->GetAccountId() : -1);
         if (sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG))
         {
             DEBUG_LOG("Dumping error-causing packet:");
@@ -728,7 +740,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
         if (sWorld.getConfig(CONFIG_BOOL_KICK_PLAYER_ON_BAD_PACKET))
         {
             DETAIL_LOG("Disconnecting session [account id %i / address %s] for badly formatted packet.",
-                m_Session?m_Session->GetAccountId():-1, GetRemoteAddress().c_str());
+                m_Session ? m_Session->GetAccountId() : -1, GetRemoteAddress().c_str());
 
             return -1;
         }
@@ -736,10 +748,10 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
             return 0;
     }
 
-    ACE_NOTREACHED (return 0);
+    ACE_NOTREACHED(return 0);
 }
 
-int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
+int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
 {
     // NOTE: ATM the socket is singlethread, have this in mind ...
     uint8 digest[20];
@@ -764,40 +776,40 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
     recvPacket.read_skip<uint64>();
     recvPacket.read (digest, 20);
 
-    DEBUG_LOG ("WorldSocket::HandleAuthSession: client build %u, account %s, clientseed %X",
+    DEBUG_LOG("WorldSocket::HandleAuthSession: client build %u, account %s, clientseed %X",
                 ClientBuild,
                 account.c_str(),
                 clientSeed);
 
     // Check the version of client trying to connect
-    if(!IsAcceptableClientBuild(ClientBuild))
+    if (!IsAcceptableClientBuild(ClientBuild))
     {
-        packet.Initialize (SMSG_AUTH_RESPONSE, 1);
-        packet << uint8 (AUTH_VERSION_MISMATCH);
+        packet.Initialize(SMSG_AUTH_RESPONSE, 1);
+        packet << uint8(AUTH_VERSION_MISMATCH);
 
-        SendPacket (packet);
+        SendPacket(packet);
 
-        sLog.outError ("WorldSocket::HandleAuthSession: Sent Auth Response (version mismatch).");
+        sLog.outError("WorldSocket::HandleAuthSession: Sent Auth Response (version mismatch).");
         return -1;
     }
 
     // Get the account information from the realmd database
     std::string safe_account = account; // Duplicate, else will screw the SHA hash verification below
-    LoginDatabase.escape_string (safe_account);
+    LoginDatabase.escape_string(safe_account);
     // No SQL injection, username escaped.
 
     QueryResult *result =
-          LoginDatabase.PQuery ("SELECT "
-                                "id, "                      //0
-                                "gmlevel, "                 //1
-                                "sessionkey, "              //2
-                                "last_ip, "                 //3
-                                "locked, "                  //4
-                                "v, "                       //5
-                                "s, "                       //6
-                                "expansion, "               //7
-                                "mutetime, "                //8
-                                "locale "                   //9
+          LoginDatabase.PQuery("SELECT "
+                                "`id`, "                      //0
+                                "`sessionkey`, "              //1
+                                "`last_ip`, "                 //2
+                                "`locked`, "                  //3
+                                "`v`, "                       //4
+                                "`s`, "                       //5
+                                "`expansion`, "               //6
+                                "`mutetime`, "                //7
+                                "`locale`, "                  //8
+                                "`os` "                       //9
                                 "FROM account "
                                 "WHERE username = '%s'",
                                 safe_account.c_str ());
@@ -805,44 +817,42 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
     // Stop if the account is not found
     if (!result)
     {
-        packet.Initialize (SMSG_AUTH_RESPONSE, 1);
-        packet << uint8 (AUTH_UNKNOWN_ACCOUNT);
+        packet.Initialize(SMSG_AUTH_RESPONSE, 1);
+        packet << uint8(AUTH_UNKNOWN_ACCOUNT);
 
-        SendPacket (packet);
+        SendPacket(packet);
 
-        sLog.outError ("WorldSocket::HandleAuthSession: Sent Auth Response (unknown account).");
+        sLog.outError("WorldSocket::HandleAuthSession: Sent Auth Response (unknown account).");
         return -1;
     }
 
-    Field* fields = result->Fetch ();
+    Field* fields = result->Fetch();
 
-    expansion = ((sWorld.getConfig(CONFIG_UINT32_EXPANSION) > fields[7].GetUInt8()) ? fields[7].GetUInt8() : sWorld.getConfig(CONFIG_UINT32_EXPANSION));
+    expansion = ((sWorld.getConfig(CONFIG_UINT32_EXPANSION) > fields[6].GetUInt8()) ? fields[6].GetUInt8() : sWorld.getConfig(CONFIG_UINT32_EXPANSION));
 
-    N.SetHexStr ("894B645E89E1535BBDAD5B8B290650530801B18EBFBF5E8FAB3C82872A3E9BB7");
-    g.SetDword (7);
+    N.SetHexStr("894B645E89E1535BBDAD5B8B290650530801B18EBFBF5E8FAB3C82872A3E9BB7");
+    g.SetDword(7);
 
-    v.SetHexStr(fields[5].GetString());
-    s.SetHexStr (fields[6].GetString());
+    v.SetHexStr(fields[4].GetString());
+    s.SetHexStr(fields[5].GetString());
     m_s = s;
 
-    const char* sStr = s.AsHexStr ();                       //Must be freed by OPENSSL_free()
-    const char* vStr = v.AsHexStr ();                       //Must be freed by OPENSSL_free()
+    const char* sStr = s.AsHexStr();                        // Must be freed by OPENSSL_free()
+    const char* vStr = v.AsHexStr();                        // Must be freed by OPENSSL_free()
 
-    DEBUG_LOG ("WorldSocket::HandleAuthSession: (s,v) check s: %s v: %s",
-                sStr,
-                vStr);
+    DEBUG_LOG("WorldSocket::HandleAuthSession: (s,v) check s: %s v: %s", sStr, vStr);
 
-    OPENSSL_free ((void*) sStr);
-    OPENSSL_free ((void*) vStr);
+    OPENSSL_free((void*)sStr);
+    OPENSSL_free((void*)vStr);
 
     ///- Re-check ip locking (same check as in realmd).
-    if (fields[4].GetUInt8 () == 1) // if ip is locked
+    if (fields[3].GetUInt8() == 1) // if ip is locked
     {
-        if (strcmp (fields[3].GetString (), GetRemoteAddress ().c_str ()))
+        if (strcmp(fields[2].GetString(), GetRemoteAddress().c_str()))
         {
-            packet.Initialize (SMSG_AUTH_RESPONSE, 1);
-            packet << uint8 (AUTH_FAILED);
-            SendPacket (packet);
+            packet.Initialize(SMSG_AUTH_RESPONSE, 1);
+            packet << uint8(AUTH_FAILED);
+            SendPacket(packet);
 
             delete result;
             BASIC_LOG("WorldSocket::HandleAuthSession: Sent Auth Response (Account IP differs).");
@@ -850,49 +860,63 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
         }
     }
 
-    id = fields[0].GetUInt32 ();
-    security = fields[1].GetUInt16 ();
-    if(security > SEC_ADMINISTRATOR)                        // prevent invalid security settings in DB
-        security = SEC_ADMINISTRATOR;
+    id = fields[0].GetUInt32();
 
-    K.SetHexStr (fields[2].GetString ());
+    K.SetHexStr(fields[1].GetString());
 
-    time_t mutetime = time_t (fields[8].GetUInt64 ());
+    time_t mutetime = time_t(fields[7].GetUInt64());
 
-    locale = LocaleConstant (fields[9].GetUInt8 ());
+    locale = LocaleConstant(fields[8].GetUInt8());
     if (locale >= MAX_LOCALE)
         locale = LOCALE_enUS;
 
+    std::string os = fields[9].GetString();
+
     delete result;
 
+    // Checks gmlevel per Realm
+    result = LoginDatabase.PQuery ("SELECT `RealmID`, `gmlevel` FROM `account_access` "
+                              "WHERE id = '%d' AND (RealmID = '%d'OR RealmID = '-1')", id, sWorld.getConfig(CONFIG_UINT32_REALMID));
+    if(!result)
+        security = SEC_PLAYER;
+    else
+    {
+        fields = result->Fetch();
+        security = fields[1].GetInt32();
+        delete result;
+    }
+
+    if (security > SEC_ADMINISTRATOR)                                                    // prevent invalid security settings in DB
+        security = SEC_ADMINISTRATOR;
+
     // Re-check account ban (same check as in realmd)
     QueryResult *banresult =
-          LoginDatabase.PQuery ("SELECT 1 FROM account_banned WHERE id = %u AND active = 1 AND (unbandate > UNIX_TIMESTAMP() OR unbandate = bandate)"
+          LoginDatabase.PQuery("SELECT 1 FROM account_banned WHERE id = %u AND active = 1 AND (unbandate > UNIX_TIMESTAMP() OR unbandate = bandate)"
                                 "UNION "
                                 "SELECT 1 FROM ip_banned WHERE (unbandate = bandate OR unbandate > UNIX_TIMESTAMP()) AND ip = '%s'",
                                 id, GetRemoteAddress().c_str());
 
     if (banresult) // if account banned
     {
-        packet.Initialize (SMSG_AUTH_RESPONSE, 1);
-        packet << uint8 (AUTH_BANNED);
-        SendPacket (packet);
+        packet.Initialize(SMSG_AUTH_RESPONSE, 1);
+        packet << uint8(AUTH_BANNED);
+        SendPacket(packet);
 
         delete banresult;
 
-        sLog.outError ("WorldSocket::HandleAuthSession: Sent Auth Response (Account banned).");
+        sLog.outError("WorldSocket::HandleAuthSession: Sent Auth Response (Account banned).");
         return -1;
     }
 
     // Check locked state for server
-    AccountTypes allowedAccountType = sWorld.GetPlayerSecurityLimit ();
+    AccountTypes allowedAccountType = sWorld.GetPlayerSecurityLimit();
 
     if (allowedAccountType > SEC_PLAYER && AccountTypes(security) < allowedAccountType)
     {
-        WorldPacket Packet (SMSG_AUTH_RESPONSE, 1);
-        Packet << uint8 (AUTH_UNAVAILABLE);
+        WorldPacket Packet(SMSG_AUTH_RESPONSE, 1);
+        Packet << uint8(AUTH_UNAVAILABLE);
 
-        SendPacket (packet);
+        SendPacket(packet);
 
         BASIC_LOG("WorldSocket::HandleAuthSession: User tries to login but his security level is not enough");
         return -1;
@@ -904,29 +928,29 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
     uint32 t = 0;
     uint32 seed = m_Seed;
 
-    sha.UpdateData (account);
-    sha.UpdateData ((uint8 *) & t, 4);
-    sha.UpdateData ((uint8 *) & clientSeed, 4);
-    sha.UpdateData ((uint8 *) & seed, 4);
-    sha.UpdateBigNumbers (&K, NULL);
-    sha.Finalize ();
+    sha.UpdateData(account);
+    sha.UpdateData((uint8*)&t, 4);
+    sha.UpdateData((uint8*)&clientSeed, 4);
+    sha.UpdateData((uint8*)&seed, 4);
+    sha.UpdateBigNumbers(&K, NULL);
+    sha.Finalize();
 
-    if (memcmp (sha.GetDigest (), digest, 20))
+    if (memcmp(sha.GetDigest(), digest, 20))
     {
-        packet.Initialize (SMSG_AUTH_RESPONSE, 1);
-        packet << uint8 (AUTH_FAILED);
+        packet.Initialize(SMSG_AUTH_RESPONSE, 1);
+        packet << uint8(AUTH_FAILED);
 
-        SendPacket (packet);
+        SendPacket(packet);
 
-        sLog.outError ("WorldSocket::HandleAuthSession: Sent Auth Response (authentification failed).");
+        sLog.outError("WorldSocket::HandleAuthSession: Sent Auth Response (authentification failed).");
         return -1;
     }
 
-    std::string address = GetRemoteAddress ();
+    std::string address = GetRemoteAddress();
 
-    DEBUG_LOG ("WorldSocket::HandleAuthSession: Client '%s' authenticated successfully from %s.",
-                account.c_str (),
-                address.c_str ());
+    DEBUG_LOG("WorldSocket::HandleAuthSession: Client '%s' authenticated successfully from %s.",
+                account.c_str(),
+                address.c_str());
 
     // Update the last_ip in the database
     // No SQL injection, username escaped.
@@ -936,23 +960,24 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
     stmt.PExecute(address.c_str(), account.c_str());
 
     // NOTE ATM the socket is single-threaded, have this in mind ...
-    ACE_NEW_RETURN (m_Session, WorldSession (id, this, AccountTypes(security), expansion, mutetime, locale), -1);
+    ACE_NEW_RETURN(m_Session, WorldSession(id, this, AccountTypes(security), expansion, mutetime, locale), -1);
 
     m_Crypt.Init(&K);
 
     m_Session->LoadGlobalAccountData();
     m_Session->LoadTutorialsData();
     m_Session->ReadAddonsInfo(recvPacket);
+    m_Session->InitWarden(&K, os);
 
     // In case needed sometime the second arg is in microseconds 1 000 000 = 1 sec
-    ACE_OS::sleep (ACE_Time_Value (0, 10000));
+    ACE_OS::sleep(ACE_Time_Value(0, 10000));
 
-    sWorld.AddSession (m_Session);
+    sWorld.AddSession(m_Session);
 
     return 0;
 }
 
-int WorldSocket::HandlePing (WorldPacket& recvPacket)
+int WorldSocket::HandlePing(WorldPacket& recvPacket)
 {
     uint32 ping;
     uint32 latency;
@@ -962,29 +987,29 @@ int WorldSocket::HandlePing (WorldPacket& recvPacket)
     recvPacket >> latency;
 
     if (m_LastPingTime == ACE_Time_Value::zero)
-        m_LastPingTime = ACE_OS::gettimeofday (); // for 1st ping
+        m_LastPingTime = ACE_OS::gettimeofday();            // for 1st ping
     else
     {
-        ACE_Time_Value cur_time = ACE_OS::gettimeofday ();
-        ACE_Time_Value diff_time (cur_time);
+        ACE_Time_Value cur_time = ACE_OS::gettimeofday();
+        ACE_Time_Value diff_time(cur_time);
         diff_time -= m_LastPingTime;
         m_LastPingTime = cur_time;
 
-        if (diff_time < ACE_Time_Value (27))
+        if (diff_time < ACE_Time_Value(27))
         {
             ++m_OverSpeedPings;
 
-            uint32 max_count = sWorld.getConfig (CONFIG_UINT32_MAX_OVERSPEED_PINGS);
+            uint32 max_count = sWorld.getConfig(CONFIG_UINT32_MAX_OVERSPEED_PINGS);
 
             if (max_count && m_OverSpeedPings > max_count)
             {
-                ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1);
+                ACE_GUARD_RETURN(LockType, Guard, m_SessionLock, -1);
 
-                if (m_Session && m_Session->GetSecurity () == SEC_PLAYER)
+                if (m_Session && m_Session->GetSecurity() == SEC_PLAYER)
                 {
                     sLog.outError  ("WorldSocket::HandlePing: Player kicked for "
                                     "overspeeded pings address = %s",
-                                    GetRemoteAddress ().c_str ());
+                                    GetRemoteAddress().c_str());
 
                     return -1;
                 }
@@ -996,21 +1021,24 @@ int WorldSocket::HandlePing (WorldPacket& recvPacket)
 
     // critical section
     {
-        ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1);
+        ACE_GUARD_RETURN(LockType, Guard, m_SessionLock, -1);
 
         if (m_Session)
-            m_Session->SetLatency (latency);
+        {
+            m_Session->SetLatency(latency);
+            m_Session->ResetClientTimeDelay();
+        }
         else
         {
-            sLog.outError ("WorldSocket::HandlePing: peer sent CMSG_PING, "
+            sLog.outError("WorldSocket::HandlePing: peer sent CMSG_PING, "
                             "but is not authenticated or got recently kicked,"
                             " address = %s",
-                            GetRemoteAddress ().c_str ());
+                            GetRemoteAddress().c_str());
              return -1;
         }
     }
 
-    WorldPacket packet (SMSG_PONG, 4);
+    WorldPacket packet(SMSG_PONG, 4);
     packet << ping;
-    return SendPacket (packet);
+    return SendPacket(packet);
 }
diff --git a/src/game/WorldSocket.h b/src/game/WorldSocket.h
index f931335e2d2..e2727aaeded 100644
--- a/src/game/WorldSocket.h
+++ b/src/game/WorldSocket.h
@@ -99,7 +99,7 @@ class WorldSocket : protected WorldHandler
         typedef ACE_Acceptor< WorldSocket, ACE_SOCK_ACCEPTOR > Acceptor;
 
         /// Mutex type used for various synchronizations.
-        typedef ACE_Thread_Mutex LockType;
+        typedef MANGOSR2_MUTEX_MODEL_2 LockType;
         typedef ACE_Guard<LockType> GuardType;
 
         /// Check if socket is closed.
diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp
index 24fbb6661b7..2b48162d48e 100644
--- a/src/game/WorldSocketMgr.cpp
+++ b/src/game/WorldSocketMgr.cpp
@@ -191,7 +191,7 @@ class ReactorRunnable : protected ACE_Task_Base
         }
 
     private:
-        typedef ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> AtomicInt;
+        typedef ACE_Atomic_Op<ACE_SYNCH_MUTEX, uint32> AtomicInt;
         typedef std::set<WorldSocket*> SocketSet;
 
         ACE_Reactor* m_Reactor;
diff --git a/src/game/WorldStateMgr.cpp b/src/game/WorldStateMgr.cpp
new file mode 100644
index 00000000000..a2f340336a9
--- /dev/null
+++ b/src/game/WorldStateMgr.cpp
@@ -0,0 +1,1511 @@
+/*
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/mangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Map.h"
+#include "World.h"
+#include "WorldStateMgr.h"
+#include "ProgressBar.h"
+#include "Player.h"
+#include "GameObject.h"
+#include "GridNotifiers.h"
+#include "SQLStorages.h"
+#include "BattleGround/BattleGroundMgr.h"
+#include "GridNotifiers.h"
+#include "CellImpl.h"
+
+INSTANTIATE_SINGLETON_1(WorldStateMgr);
+
+void WorldStateMgr::Initialize()
+{
+    // For reload case - cleanup states first
+    m_worldStateTemplates.clear();
+    // Load some template types
+    LoadTemplatesFromDB();
+    LoadTemplatesFromObjectTemplateDB();
+    // DBC templates loaded after DB - may be corrected in database
+    LoadTemplatesFromDBC();
+    // Load states data
+    LoadFromDB();
+    // Create all needed states (if not loaded)
+    CreateWorldStatesIfNeed();
+}
+
+void WorldStateMgr::Update()
+{
+    {
+        // Update part 1 - calculating (and mark for cleanup)
+        for (WorldStateMap::iterator itr = m_worldState.begin(); itr != m_worldState.end(); ++itr)
+        {
+            WorldState* state = &itr->second;
+            if (!state || state->HasFlag(WORLD_STATE_FLAG_DELETED))
+                continue;
+
+            switch (state->GetType())
+            {
+                case WORLD_STATE_TYPE_BGWEEKEND:
+                {
+                    for (uint32 i = 1; i < sBattlemasterListStore.GetNumRows(); ++i)
+                    {
+                        BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(i);
+                        if (bl && bl->HolidayWorldStateId == state->GetId())
+                        {
+                            if (BattleGroundMgr::IsBGWeekend(BattleGroundTypeId(bl->id)))
+                                state->SetValue(WORLD_STATE_ADD);
+                            else
+                                state->SetValue(WORLD_STATE_REMOVE);
+                        }
+                    }
+                    break;
+                }
+/*
+                case WORLD_STATE_TYPE_CUSTOM:
+                case WORLD_STATE_TYPE_WORLD:
+                case WORLD_STATE_TYPE_EVENT:
+                case WORLD_STATE_TYPE_MAP:
+                case WORLD_STATE_TYPE_ZONE:
+                case WORLD_STATE_TYPE_AREA:
+                case WORLD_STATE_TYPE_BATTLEGROUND:
+                case WORLD_STATE_TYPE_CAPTURE_POINT:
+                case WORLD_STATE_TYPE_WORLD_UNCOMMON:
+                case WORLD_STATE_TYPE_DESTRUCTIBLE_OBJECT:
+*/
+                default:
+                    break;
+            }
+
+            if (state->GetRenewTime() < time(NULL) - time_t(sWorld.getConfig(CONFIG_UINT32_WORLD_STATE_EXPIRETIME)))
+            {
+                if (state->HasFlag(WORLD_STATE_FLAG_NOT_EXPIREABLE))
+                    continue;
+
+                if (state->HasFlag(WORLD_STATE_FLAG_INITIAL_STATE))
+                {
+                    state->Initialize();
+                    continue;
+                }
+
+                state->RemoveFlag(WORLD_STATE_FLAG_ACTIVE);
+                state->AddFlag(WORLD_STATE_FLAG_DELETED);
+            }
+        }
+    }
+
+    // Saving data (and DB cleanup)
+    SaveToDB();
+
+    {
+        // Update part 2 - remove states with WORLD_STATE_FLAG_DELETED flag
+        for (WorldStateMap::iterator itr = m_worldState.begin(); itr != m_worldState.end();)
+        {
+            if (itr->second.HasFlag(WORLD_STATE_FLAG_DELETED))
+                m_worldState.erase(itr++);
+            else
+                ++itr;
+        }
+    }
+}
+
+void WorldStateMgr::LoadTemplatesFromDBC()
+{
+    uint32 count = 0;
+    for (uint32 i = 1; i < sBattlemasterListStore.GetNumRows(); ++i)
+    {
+        BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(i);
+        if (bl && bl->HolidayWorldStateId)
+        {
+            m_worldStateTemplates.insert(WorldStateTemplateMap::value_type(bl->HolidayWorldStateId,
+                WorldStateTemplate(bl->HolidayWorldStateId, WORLD_STATE_TYPE_BGWEEKEND, WORLD_STATE_TYPE_BGWEEKEND, (1 << WORLD_STATE_FLAG_INITIAL_STATE), BattleGroundMgr::IsBGWeekend(BattleGroundTypeId(bl->id)) ? 1 : 0, 0, 0)));
+            ++count;
+        }
+    }
+
+    for (uint32 i = 0; i < sWorldStateStore.GetNumRows(); ++i)
+    {
+        WorldStateEntry const* wsEntry = sWorldStateStore.LookupEntry(i);
+        if (!wsEntry)
+            continue;
+
+        uint32 stateId = wsEntry->m_state;
+        if (!stateId)
+            continue;
+
+        WorldStateType type;
+        uint32 condition;
+
+        WorldStatesLinkedSet linkedList;
+
+        if (!strcmp(wsEntry->m_uiType,"CAPTUREPOINT"))
+        {
+            type = WORLD_STATE_TYPE_CAPTURE_POINT;
+            condition = 0;
+            linkedList.insert(wsEntry->m_linked1);
+            linkedList.insert(wsEntry->m_linked2);
+        }
+        else if (wsEntry->map_id && !wsEntry->m_zone)
+        {
+            type = WORLD_STATE_TYPE_MAP;
+            condition = wsEntry->map_id;
+        }
+        else if (wsEntry->m_zone)
+        {
+            type = WORLD_STATE_TYPE_ZONE;
+            condition = wsEntry->m_zone;
+        }
+        else if (!wsEntry->map_id && !wsEntry->m_zone)
+        {
+            type = WORLD_STATE_TYPE_EVENT;
+            condition = wsEntry->m_flags;   // Phase currently
+        }
+        else
+        {
+            sLog.outErrorDb("WorldStateMgr::LoadTemplatesFromDBC unhandled template %u!", stateId);
+            continue;
+        }
+
+        // parse linked worldstates here
+        std::string message = wsEntry->m_uiMessage1[sWorld.GetDefaultDbcLocale()];
+        if (!message.empty())
+        {
+            std::string::size_type pos1, pos2;
+            pos1 = message.find_first_of("%");
+            pos2 = message.find_first_of("w", pos1);
+
+            while (pos1 != std::string::npos && pos2 != std::string::npos)
+            {
+                pos1 = message.find_first_of("%");
+                pos2 = message.find_first_of("w", pos1);
+                if ((pos2 - pos1) == 5)
+                {
+                    std::string digits = message.substr(pos1 + 1, 4);
+                    uint32 linkedId = atoi(digits.c_str());
+                    if (linkedId)
+                        linkedList.insert(linkedId);
+                }
+                message.erase(0, pos2 + 1);
+            }
+        }
+
+        WorldStateTemplate const* tmpl = FindTemplate(stateId, type, condition);
+        uint32 phasemask = wsEntry->m_flags;
+
+        if (!tmpl)
+        {
+            m_worldStateTemplates.insert(WorldStateTemplateMap::value_type(stateId,
+                WorldStateTemplate(stateId, type, condition, (1 << WORLD_STATE_FLAG_INITIAL_STATE), 0, 0, phasemask)));
+            ++count;
+        }
+        else
+        {
+            const_cast<WorldStateTemplate*>(tmpl)->m_phasemask |= phasemask;
+        }
+
+        tmpl = FindTemplate(stateId, type, condition);
+        MANGOS_ASSERT(tmpl);
+
+        if (!linkedList.empty())
+        {
+            for (WorldStatesLinkedSet::const_iterator itr = linkedList.begin(); itr != linkedList.end(); ++itr)
+            {
+                uint32 linkedstateId = *itr;
+                if (!linkedstateId || linkedstateId == stateId)
+                    continue;
+
+                // Check linked templates
+                WorldStateTemplate const* downlinktmpl = FindTemplate(linkedstateId, type, condition);
+                if (downlinktmpl)
+                {
+                    if (downlinktmpl->m_linkedId != stateId)
+                    {
+                        sLog.outDetail("WorldStateMgr::LoadTemplatesFromDBC template %u present, but linked to %u instead of %u (condition %u) in DBC, %s!",
+                            linkedstateId, downlinktmpl->m_linkedId, stateId, condition, downlinktmpl->m_linkedId ? "need correct" : "corrected");
+
+                        if (downlinktmpl->m_linkedId == 0)
+                        {
+                            const_cast<WorldStateTemplate*>(tmpl)->m_linkedList.insert(linkedstateId);
+                            const_cast<WorldStateTemplate*>(downlinktmpl)->m_linkedId = stateId;
+                        }
+                    }
+                }
+                else
+                {
+                    m_worldStateTemplates.insert(WorldStateTemplateMap::value_type(linkedstateId,
+                        WorldStateTemplate(linkedstateId, type, condition, (1 << WORLD_STATE_FLAG_INITIAL_STATE), 0, stateId, tmpl->m_phasemask)));
+                    ++count;
+                    const_cast<WorldStateTemplate*>(tmpl)->m_linkedList.insert(linkedstateId);
+                }
+            }
+        }
+    }
+    sLog.outString();
+    sLog.outString(">> Loaded static DBC templates for %u WorldStates", count);
+}
+
+void WorldStateMgr::LoadTemplatesFromDB()
+{
+    //                                                        0       1            2        3          4            5
+    QueryResult* result = WorldDatabase.Query("SELECT `state_id`, `type`, `condition`, `flags`, `default`, `linked_id` FROM `worldstate_template`");
+    if (!result)
+    {
+        sLog.outString(">> Table worldstate_template is empty.");
+        sLog.outString();
+        return;
+    }
+
+    std::map<uint32, WorldStatesLinkedSet> m_worldStateLink;
+    uint32 count = 0;
+    uint32 count2 = 0;
+    BarGoLink bar(result->GetRowCount());
+    do
+    {
+        Field* fields = result->Fetch();
+
+        bar.step();
+
+        uint32   stateId        = fields[0].GetUInt32();
+        uint32   type           = fields[1].GetUInt32();
+        uint32   condition      = fields[2].GetUInt32();
+        uint32   flags          = fields[3].GetUInt32();
+        uint32   default_value  = fields[4].GetUInt32();
+        uint32   linkedId       = fields[5].GetUInt32();
+        //uint32   phasemask       = fields[6].GetUInt32();
+
+        // Store the state data
+        m_worldStateTemplates.insert(WorldStateTemplateMap::value_type(stateId, WorldStateTemplate(stateId, type, condition, flags, default_value, linkedId, 0 /*phasemask*/)));
+
+        ++count;
+    }
+    while (result->NextRow());
+
+    for (WorldStateTemplateMap::const_iterator itr = m_worldStateTemplates.begin(); itr != m_worldStateTemplates.end(); ++itr)
+    {
+        if (itr->second.m_linkedId != 0)
+        {
+            if (WorldStateTemplate const* tmpl = FindTemplate(itr->second.m_linkedId, itr->second.m_stateType, itr->second.m_condition))
+            {
+                const_cast<WorldStateTemplate*>(tmpl)->m_linkedList.insert(itr->second.m_stateId);
+                ++count2;
+            }
+        }
+    }
+
+    sLog.outString();
+    sLog.outString(">> Loaded static templates for %u WorldStates, %u - with uplinks", count, count2);
+    delete result;
+}
+
+void WorldStateMgr::LoadTemplatesFromObjectTemplateDB()
+{
+    //                                                     0
+    QueryResult* result = WorldDatabase.PQuery("SELECT `entry` FROM `gameobject_template` WHERE `type` = %u",(uint32)GAMEOBJECT_TYPE_CAPTURE_POINT);
+    if (!result)
+    {
+        sLog.outString(">> No templates for object type 29 found in DB!");
+        sLog.outString();
+        return;
+    }
+
+    uint32 count = 0;
+    BarGoLink bar(result->GetRowCount());
+    do
+    {
+        Field* fields = result->Fetch();
+
+        bar.step();
+
+        uint32 goEntry = fields[0].GetUInt32();
+
+        GameObjectInfo const* goInfo = sGOStorage.LookupEntry<GameObjectInfo>(goEntry);
+        if (!goInfo)
+            continue;
+
+        // setup state 1
+        if (!goInfo->capturePoint.worldState1)
+            continue;
+
+        m_worldStateTemplates.insert(WorldStateTemplateMap::value_type(goInfo->capturePoint.worldState1,
+            WorldStateTemplate(goInfo->capturePoint.worldState1, WORLD_STATE_TYPE_CAPTURE_POINT, goEntry, (1 << WORLD_STATE_FLAG_ACTIVE), WORLD_STATE_ADD, 0, PHASEMASK_NONE)));
+        ++count;
+
+        WorldStateTemplate* tmpl = const_cast<WorldStateTemplate*>(FindTemplate(goInfo->capturePoint.worldState1, WORLD_STATE_TYPE_CAPTURE_POINT, goEntry));
+        if (!tmpl)
+            continue;
+
+        // setup state 2
+        if (!goInfo->capturePoint.worldState2)
+            continue;
+
+        m_worldStateTemplates.insert(WorldStateTemplateMap::value_type(goInfo->capturePoint.worldState2,
+            WorldStateTemplate(goInfo->capturePoint.worldState2, WORLD_STATE_TYPE_CAPTURE_POINT, goEntry, (1 << WORLD_STATE_FLAG_ACTIVE), CAPTURE_SLIDER_NEUTRAL, goInfo->capturePoint.worldState1, PHASEMASK_NONE)));
+        tmpl->m_linkedList.insert(goInfo->capturePoint.worldState2);
+        ++count;
+
+        // setup state 3
+        if (!goInfo->capturePoint.worldState3)
+            continue;
+
+        m_worldStateTemplates.insert(WorldStateTemplateMap::value_type(goInfo->capturePoint.worldState3,
+            WorldStateTemplate(goInfo->capturePoint.worldState3, WORLD_STATE_TYPE_CAPTURE_POINT, goEntry, (1 << WORLD_STATE_FLAG_ACTIVE), goInfo->capturePoint.neutralPercent, goInfo->capturePoint.worldState1, PHASEMASK_NONE)));
+        tmpl->m_linkedList.insert(goInfo->capturePoint.worldState3);
+        ++count;
+    }
+    while (result->NextRow());
+
+    sLog.outString();
+    sLog.outString(">> Loaded static templates for %u GAMEOBJECT_TYPE_CAPTURE_POINT linked WorldStates", count);
+    delete result;
+}
+
+void WorldStateMgr::LoadFromDB()
+{
+    // cannot be reloaded!
+    m_worldState.clear();
+    //                                                            0           1       2            3        4        5            6
+    QueryResult* result = CharacterDatabase.Query("SELECT `state_id`, `instance`, `type`, `condition`, `flags`, `value`, `renewtime` FROM `worldstate_data`");
+
+    if (!result)
+    {
+        sLog.outString(">> Table worldstate_data is empty.");
+        sLog.outString();
+        return;
+    }
+
+    BarGoLink bar(result->GetRowCount());
+    do
+    {
+        Field* fields = result->Fetch();
+
+        bar.step();
+
+        uint32   stateId        = fields[0].GetUInt32();
+        uint32   instanceId     = fields[1].GetUInt32();
+        uint32   type           = fields[2].GetUInt32();
+        uint32   condition      = fields[3].GetUInt32();
+        uint32   flags          = fields[4].GetUInt32();
+        uint32   _value         = fields[5].GetUInt32();
+        time_t   renewtime      = time_t(fields[6].GetUInt64());
+
+        // Store the state data
+        WorldStateTemplate const* tmpl = FindTemplate(stateId, type, condition);
+        if (tmpl)
+        {
+            // Some worldstates loaded after creating (linked). need only set value.
+            if (WorldState const* state = GetWorldState(tmpl, instanceId))
+            {
+                if (state->GetValue() != _value)
+                    const_cast<WorldState*>(state)->SetValue(_value);
+            }
+            else
+                m_worldState.insert(WorldStateMap::value_type(stateId, WorldState(tmpl, instanceId, flags, _value, renewtime)));
+        }
+        else if (type == WORLD_STATE_TYPE_CUSTOM)
+        {
+            DEBUG_FILTER_LOG(LOG_FILTER_DB_STRICTED_CHECK,"WorldStateMgr::LoadFromDB loaded custom state %u (%u %u %u %u %u %ld)",
+                stateId, instanceId, type, condition, flags, _value, renewtime);
+            m_worldState.insert(WorldStateMap::value_type(stateId, WorldState(stateId, instanceId, flags, _value, renewtime)));
+        }
+        else
+        {
+            sLog.outError("WorldStateMgr::LoadFromDB unknown state %u (%u %u %u %u %u %ld)",
+                stateId, instanceId, type, condition, flags, _value, renewtime);
+        }
+    }
+    while (result->NextRow());
+
+    sLog.outString();
+    sLog.outString(">> Loaded data for " SIZEFMTD " WorldStates", m_worldState.size());
+    delete result;
+}
+
+void WorldStateMgr::CreateWorldStatesIfNeed()
+{
+    for (WorldStateTemplateMap::const_iterator itr = m_worldStateTemplates.begin(); itr != m_worldStateTemplates.end(); ++itr)
+    {
+        if (itr->second.HasFlag(WORLD_STATE_FLAG_INITIAL_STATE) &&
+            (itr->second.m_stateType == WORLD_STATE_TYPE_WORLD ||
+            itr->second.m_stateType == WORLD_STATE_TYPE_BGWEEKEND))
+        {
+            if (GetWorldState(&itr->second, 0))
+                continue;
+
+            CreateWorldState(&itr->second, 0);
+        }
+    }
+}
+
+void WorldStateMgr::CreateLinkedWorldStatesIfNeed(WorldObject* object)
+{
+    if (!object)
+        return;
+
+    ObjectGuid guid = object->GetObjectGuid();
+    uint32 instanceId = guid ? guid.GetCounter() : 0;
+
+    switch (guid.GetHigh())
+    {
+        case HIGHGUID_GAMEOBJECT:
+        {
+            GameObjectInfo const* goInfo = sGOStorage.LookupEntry<GameObjectInfo>(guid.GetEntry());
+            switch (goInfo->type)
+            {
+                case GAMEOBJECT_TYPE_CAPTURE_POINT:
+                {
+                    // state 1
+                    if (goInfo->capturePoint.worldState1)
+                    {
+                        WorldState const* _state = NULL;
+                        WorldStateTemplate const* tmpl = FindTemplate(goInfo->capturePoint.worldState1, WORLD_STATE_TYPE_CAPTURE_POINT, goInfo->id);
+                        MANGOS_ASSERT(tmpl);
+                        if (_state = GetWorldState(tmpl, instanceId))
+                        {
+                            if (_state->GetValue() != WORLD_STATE_ADD)
+                                DEBUG_LOG("WorldStateMgr::CreateLinkedWorldStatesIfNeed Warning - at load WorldState %u for %s current value %u not equal default %u!",
+                                    goInfo->capturePoint.worldState1,
+                                    guid.GetString().c_str(),
+                                    _state->GetValue(),
+                                    WORLD_STATE_ADD);
+                        }
+                        else
+                            _state = CreateWorldState(tmpl, instanceId);
+
+                        const_cast<WorldState*>(_state)->SetLinkedGuid(guid);
+                    }
+
+                    // state 2
+                    if (goInfo->capturePoint.worldState2)
+                    {
+                        WorldState const* _state = NULL;
+                        WorldStateTemplate const* tmpl = FindTemplate(goInfo->capturePoint.worldState2, WORLD_STATE_TYPE_CAPTURE_POINT, goInfo->id);
+                        MANGOS_ASSERT(tmpl);
+                        if (_state = GetWorldState(tmpl, instanceId))
+                        {
+                            if (_state->GetValue() != CAPTURE_SLIDER_NEUTRAL)
+                                DEBUG_LOG("WorldStateMgr::CreateLinkedWorldStatesIfNeed Warning - at load WorldState %u for %s current value %u not equal default %u!",
+                                    goInfo->capturePoint.worldState2,
+                                    guid.GetString().c_str(),
+                                    _state->GetValue(),
+                                    CAPTURE_SLIDER_NEUTRAL);
+                        }
+                        else
+                             _state = CreateWorldState(tmpl, instanceId);
+
+                        const_cast<WorldState*>(_state)->SetLinkedGuid(guid);
+                    }
+
+                    // state 3
+                    if (goInfo->capturePoint.worldState3)
+                    {
+                        WorldState const* _state = NULL;
+                        WorldStateTemplate const* tmpl = FindTemplate(goInfo->capturePoint.worldState3, WORLD_STATE_TYPE_CAPTURE_POINT, goInfo->id);
+                        MANGOS_ASSERT(tmpl);
+                        if (_state  = GetWorldState(tmpl, instanceId))
+                        {
+                            if (_state->GetValue() != goInfo->capturePoint.neutralPercent)
+                                DEBUG_LOG("WorldStateMgr::CreateLinkedWorldStatesIfNeed Warning - at load WorldState %u for %s current value %u not equal default %u!",
+                                    goInfo->capturePoint.worldState3,
+                                    guid.GetString().c_str(),
+                                    _state->GetValue(),
+                                    goInfo->capturePoint.neutralPercent);
+                        }
+                        else
+                            _state = CreateWorldState(tmpl, instanceId);
+
+                        const_cast<WorldState*>(_state)->SetLinkedGuid(guid);
+                    }
+                    break;
+                }
+                case GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING:
+                {
+                    if (CheckWorldState(goInfo->destructibleBuilding.linkedWorldState))
+                    {
+                        WorldState const* _state = NULL;
+                        WorldStateTemplate const* tmpl = FindTemplate(goInfo->destructibleBuilding.linkedWorldState, WORLD_STATE_TYPE_DESTRUCTIBLE_OBJECT, object->GetZoneId());
+                        MANGOS_ASSERT(tmpl);
+                        if (_state = GetWorldState(tmpl, instanceId))
+                        {
+                            if (_state->GetValue() != OBJECT_STATE_NONE)
+                                DEBUG_LOG("WorldStateMgr::CreateLinkedWorldStatesIfNeed Warning - at load WorldState %u for %s current value %u not equal default %u!",
+                                    goInfo->destructibleBuilding.linkedWorldState,
+                                    guid.GetString().c_str(),
+                                    _state->GetValue(),
+                                    OBJECT_STATE_NONE);
+                        }
+                        else
+                            _state = CreateWorldState(tmpl, instanceId);
+
+                        if (_state)
+                            const_cast<WorldState*>(_state)->SetLinkedGuid(guid);
+                        else
+                            sLog.outDetail("WorldStateMgr::CreateLinkedWorldStatesIfNeed unsupported state id %u for %s found", goInfo->destructibleBuilding.linkedWorldState, guid.GetString().c_str());
+                    }
+                    else
+                        return;
+                    break;
+                }
+                default:
+                {
+                    sLog.outError("WorldStateMgr::CreateLinkedWorldStatesIfNeed try create linked WorldStates for %s, but currently this GameObject type (%u) not supported!", guid.GetString().c_str(), goInfo->type);
+                    break;
+                }
+            }
+            break;
+        }
+/*
+        case HIGHGUID_UNIT:
+        case HIGHGUID_VEHICLE:
+        case HIGHGUID_PET:
+        case HIGHGUID_PLAYER:
+*/
+        default:
+            sLog.outError("WorldStateMgr::CreateLinkedWorldStatesIfNeed try create linked WorldStates for %s, but currently this object type %u not supported!", guid.GetString().c_str(), object->GetTypeId());
+            return;
+    }
+    DEBUG_LOG("WorldStateMgr::CreateLinkedWorldStatesIfNeed created linked WorldState(s) for %s", object->GetGuidStr().c_str());
+}
+
+void WorldStateMgr::SaveToDB()
+{
+    CharacterDatabase.BeginTransaction();
+    for (WorldStateMap::iterator iter = m_worldState.begin(); iter != m_worldState.end(); ++iter)
+    {
+        if (!iter->second.HasFlag(WORLD_STATE_FLAG_SAVED))
+            Save(&iter->second);
+    }
+    CharacterDatabase.CommitTransaction();
+}
+
+void WorldStateMgr::Save(WorldState const* state)
+{
+    static SqlStatementID wsDel;
+    SqlStatement stmt = CharacterDatabase.CreateStatement(wsDel, "DELETE FROM `worldstate_data` WHERE `state_id` = ? AND `instance` = ?");
+    stmt.PExecute(state->GetId(), state->GetInstance());
+
+    if (!state->HasFlag(WORLD_STATE_FLAG_DELETED))
+    {
+        static SqlStatementID wsSave;
+        SqlStatement stmt1 = CharacterDatabase.CreateStatement(wsSave, "INSERT INTO `worldstate_data` (`state_id`, `instance`, `type`, `condition`, `flags`, `value`, `renewtime`) VALUES (?,?,?,?,?,?,?)");
+
+        const_cast<WorldState*>(state)->AddFlag(WORLD_STATE_FLAG_SAVED);
+
+        stmt1.addUInt32(state->GetId());
+        stmt1.addUInt32(state->GetInstance());
+        stmt1.addUInt32(state->GetType());
+        stmt1.addUInt32(state->GetCondition());
+        stmt1.addUInt32(state->GetFlags());
+        stmt1.addUInt32(state->GetValue());
+        stmt1.addUInt64(state->GetRenewTime());
+        stmt1.Execute();
+    }
+}
+
+void WorldStateMgr::DeleteWorldState(WorldState* state)
+{
+    if (!state)
+        return;
+
+    static SqlStatementID wsDel;
+    SqlStatement stmt = CharacterDatabase.CreateStatement(wsDel, "DELETE FROM `worldstate_data` WHERE `state_id` = ? AND `instance` = ?");
+    stmt.PExecute(state->GetId(), state->GetInstance());
+
+    for (WorldStateMap::iterator iter = m_worldState.begin(); iter != m_worldState.end();)
+    {
+        if (&iter->second == state)
+        {
+            // currently not need remove states immediately, remove his in World update cycle.
+            //m_worldState.erase(iter++);
+            iter->second.RemoveFlag(WORLD_STATE_FLAG_ACTIVE);
+            iter->second.AddFlag(WORLD_STATE_FLAG_DELETED);
+            break;
+        }
+        else
+            ++iter;
+    }
+}
+
+WorldStateTemplate const* WorldStateMgr::FindTemplate(uint32 stateId, uint32 type, uint32 condition, uint32 linkedId)
+{
+    if (type == WORLD_STATE_TYPE_MAX && condition == 0 && linkedId == 0 && ((int)m_worldStateTemplates.count(stateId) > 1))
+    {
+        sLog.outError("WorldStateMgr::FindTemplate tru find template with simple rules, but in DB not one template Id %u!", stateId);
+        return NULL;
+    }
+
+    WorldStateTemplateBounds bounds = m_worldStateTemplates.equal_range(stateId);
+
+    if (bounds.first == bounds.second)
+        return NULL;
+
+    for (WorldStateTemplateMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+    {
+        if (iter->second.m_stateId == stateId
+            && (type == WORLD_STATE_TYPE_MAX || iter->second.m_stateType == type)
+            && (condition == 0 || iter->second.m_condition == condition)
+            && (linkedId == 0 || iter->second.m_linkedId == linkedId))
+            return &iter->second;
+    }
+    return NULL;
+}
+
+void WorldStateMgr::MapUpdate(Map* map)
+{
+//    if (!map)
+//        return;
+
+    // Currently this part disabled
+    if (true)
+        return;
+
+    for (WorldStateMap::iterator itr = m_worldState.begin(); itr != m_worldState.end(); ++itr)
+    {
+        WorldState* state = &itr->second;
+        if (!state || state->HasFlag(WORLD_STATE_FLAG_DELETED) || !IsFitToCondition(map, state))
+            continue;
+
+        switch (state->GetType())
+        {
+            case WORLD_STATE_TYPE_CAPTURE_POINT:
+            {
+                break;
+            }
+            case WORLD_STATE_TYPE_MAP:
+            case WORLD_STATE_TYPE_BATTLEGROUND:
+            {
+                break;
+            }
+            case WORLD_STATE_TYPE_ZONE:
+            case WORLD_STATE_TYPE_AREA:
+            {
+                for (GuidSet::const_iterator itr = state->GetClients().begin(); itr != state->GetClients().end();)
+                {
+                    Player* player = map->GetPlayer(*itr);
+                    if (!player || !player->IsInWorld())
+                    {
+                        state->RemoveClient(*itr);
+                    }
+                    else
+                    {
+                        uint32 zone, area;
+                        player->GetZoneAndAreaId(zone, area);
+                        if (state->GetType() == WORLD_STATE_TYPE_ZONE && state->GetCondition() != zone)
+                        {
+                            // send state clean here
+                            state->RemoveClient(*itr);
+                        }
+                        else if (state->GetType() == WORLD_STATE_TYPE_AREA && state->GetCondition() != area)
+                        {
+                            // send state clean here
+                            state->RemoveClient(*itr);
+                        }
+                        else
+                            ++itr;
+                    }
+                }
+                break;
+            }
+/*
+            case WORLD_STATE_TYPE_EVENT:
+            case WORLD_STATE_TYPE_BGWEEKEND:
+            case WORLD_STATE_TYPE_CUSTOM:
+            case WORLD_STATE_TYPE_WORLD:
+            case WORLD_STATE_TYPE_WORLD_UNCOMMON:
+*/
+            default:
+                break;
+        }
+    }
+}
+
+WorldStateSet* WorldStateMgr::GetWorldStatesFor(Player* player, uint32 flags)
+{
+    WorldStateSet* stateSet = NULL;
+
+    bool bFull = player ? !player->IsInWorld() : true;
+
+    for (WorldStateMap::iterator itr = m_worldState.begin(); itr != m_worldState.end(); ++itr)
+    {
+        WorldState* state = &itr->second;
+        if (!state || state->HasFlag(WORLD_STATE_FLAG_DELETED))
+            continue;
+
+        if (state->GetFlags() & flags)
+        {
+            if (bFull || IsFitToCondition(player, state))
+                AddToWorldStateSet(&stateSet, state);
+        }
+    }
+    return stateSet;
+}
+
+WorldStateSet* WorldStateMgr::GetUpdatedWorldStatesFor(Player* player, time_t updateTime)
+{
+    WorldStateSet* stateSet = NULL;
+
+    for (WorldStateMap::iterator itr = m_worldState.begin(); itr != m_worldState.end(); ++itr)
+    {
+        WorldState* state = &itr->second;
+
+        if (!state || state->HasFlag(WORLD_STATE_FLAG_DELETED))
+            continue;
+
+        if (state->HasFlag(WORLD_STATE_FLAG_ACTIVE) &&
+            state->GetRenewTime() >= updateTime &&
+            state->GetRenewTime() != time(NULL) &&
+            IsFitToCondition(player, state))
+        {
+            // Always send UpLinked worldstate with own chains
+            // Attention! possible need sent ALL linked chain in this case. need tests.
+            if (state->GetTemplate() && state->GetTemplate()->m_linkedId)
+                if (WorldStateTemplate const* tmpl = FindTemplate(state->GetTemplate()->m_linkedId, state->GetType(), state->GetCondition()))
+                    if (WorldState const* state1 = GetWorldState(tmpl, state->GetInstance()))
+                        AddToWorldStateSet(&stateSet, state1);
+
+            AddToWorldStateSet(&stateSet, state);
+        }
+    }
+    return stateSet;
+}
+
+bool WorldStateMgr::IsFitToCondition(Player* player, WorldState const* state)
+{
+    if (!player || !state)
+        return false;
+
+    if (state->HasFlag(WORLD_STATE_FLAG_DELETED))
+        return false;
+
+    if (state->GetPhaseMask() && !(state->GetPhaseMask() & player->GetPhaseMask()))
+        return false;
+
+    switch (state->GetType())
+    {
+        case WORLD_STATE_TYPE_WORLD:
+        case WORLD_STATE_TYPE_EVENT:
+            return true;
+
+        case WORLD_STATE_TYPE_BGWEEKEND:
+        {
+            if (player->IsPvP())
+                return true;
+            break;
+        }
+        case WORLD_STATE_TYPE_MAP:
+        case WORLD_STATE_TYPE_BATTLEGROUND:
+        {
+            if (player->GetMapId() == state->GetCondition() && player->GetInstanceId() == state->GetInstance())
+                return true;
+//            else if (player->GetMapId() != state->GetCondition() && state->HasFlag(WORLD_STATE_FLAG_INITIAL_STATE) && state->GetInstance() == 0)
+//                return true;
+            break;
+        }
+        case WORLD_STATE_TYPE_ZONE:
+        {
+            if (player->GetZoneId() == state->GetCondition() && player->GetInstanceId() == state->GetInstance())
+                return true;
+            break;
+        }
+        case WORLD_STATE_TYPE_AREA:
+        {
+            if (player->GetAreaId() == state->GetCondition() && player->GetInstanceId() == state->GetInstance())
+                return true;
+            break;
+        }
+        case WORLD_STATE_TYPE_CAPTURE_POINT:
+        {
+            if (state->HasClient(player))
+                return true;
+            if (GameObject* point = player->GetMap()->GetGameObject(state->GetLinkedGuid()))
+            {
+                GameObjectInfo const* goInfo = point->GetGOInfo();
+                if (!goInfo || goInfo->type != GAMEOBJECT_TYPE_CAPTURE_POINT)
+                    return false;
+
+                if (player->IsWithinDistInMap(point, goInfo->capturePoint.radius, true))
+                    return true;
+            }
+            return false;
+        }
+        case  WORLD_STATE_TYPE_DESTRUCTIBLE_OBJECT:
+        {
+            // Need more correct limitation
+            if (player->GetZoneId() == state->GetCondition())
+                return true;
+            break;
+        }
+        case WORLD_STATE_TYPE_CUSTOM:
+        {
+            if (!state->GetCondition())
+                return true;
+            else if (
+                (player->GetMapId() == state->GetCondition() ||
+                player->GetAreaId() == state->GetCondition() ||
+                player->GetZoneId() == state->GetCondition()) &&
+                player->GetInstanceId() == state->GetInstance())
+                return true;
+            break;
+        }
+        default:
+            break;
+    }
+    return false;
+}
+
+bool WorldStateMgr::IsFitToCondition(Map* map, WorldState const* state)
+{
+    if (!map || !state)
+        return false;
+    return IsFitToCondition(map->GetId(), map->GetInstanceId(), 0, 0, state);
+}
+
+bool WorldStateMgr::IsFitToCondition(uint32 mapId, uint32 instanceId, uint32 zoneId, uint32 areaId, WorldState const* state)
+{
+    if (!state)
+        return false;
+
+    if (state->HasFlag(WORLD_STATE_FLAG_DELETED))
+        return false;
+
+    switch (state->GetType())
+    {
+        case WORLD_STATE_TYPE_WORLD:
+        case WORLD_STATE_TYPE_EVENT:
+        case WORLD_STATE_TYPE_BGWEEKEND:
+            return true;
+        case WORLD_STATE_TYPE_MAP:
+        case WORLD_STATE_TYPE_BATTLEGROUND:
+        {
+            if (mapId == state->GetCondition() && instanceId == state->GetInstance())
+                return true;
+            break;
+        }
+        case WORLD_STATE_TYPE_ZONE:
+        {
+            if (zoneId == 0)
+                return false;
+
+            if (zoneId == state->GetCondition() && instanceId == state->GetInstance())
+                return true;
+            break;
+        }
+        case WORLD_STATE_TYPE_AREA:
+        {
+            if (areaId == 0)
+                return false;
+
+            if (areaId == state->GetCondition() && instanceId == state->GetInstance())
+                return true;
+            break;
+        }
+        case WORLD_STATE_TYPE_CAPTURE_POINT:
+        {
+            return (instanceId == state->GetInstance());
+        }
+        case  WORLD_STATE_TYPE_DESTRUCTIBLE_OBJECT:
+        {
+            if (instanceId)
+                return (instanceId == state->GetInstance());
+            else
+                return zoneId == state->GetCondition();
+            break;
+        }
+        case WORLD_STATE_TYPE_CUSTOM:
+        {
+            if (!state->GetCondition())
+                return true;
+            else if (mapId == state->GetCondition() &&
+                instanceId == state->GetInstance())
+                return true;
+            break;
+        }
+        default:
+            break;
+    }
+    return false;
+}
+
+uint32 WorldStateMgr::GetWorldStateValue(uint32 stateId)
+{
+    WorldStateBounds bounds = m_worldState.equal_range(stateId);
+
+    if (bounds.first == bounds.second)
+        return UINT32_MAX;
+
+    return bounds.first->second.GetValue();
+}
+
+uint32 WorldStateMgr::GetWorldStateValueFor(Player* player, uint32 stateId)
+{
+    if (!player)
+        return UINT32_MAX;
+
+    WorldStateBounds bounds = m_worldState.equal_range(stateId);
+    if (bounds.first == bounds.second)
+        return UINT32_MAX;
+
+    for (WorldStateMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+    {
+        if (IsFitToCondition(player, &iter->second))
+            return iter->second.GetValue();
+    }
+    return UINT32_MAX;
+}
+
+uint32 WorldStateMgr::GetWorldStateValueFor(Map* map, uint32 stateId)
+{
+    if (!map)
+        return UINT32_MAX;
+
+    WorldStateBounds bounds = m_worldState.equal_range(stateId);
+    if (bounds.first == bounds.second)
+        return UINT32_MAX;
+
+    for (WorldStateMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+    {
+        if (IsFitToCondition(map, &iter->second))
+            return iter->second.GetValue();
+    }
+    return UINT32_MAX;
+}
+
+uint32 WorldStateMgr::GetWorldStateValueFor(uint32 mapId, uint32 instanceId, uint32 zoneId, uint32 areaId, uint32 stateId)
+{
+    WorldStateBounds bounds = m_worldState.equal_range(stateId);
+    if (bounds.first == bounds.second)
+        return UINT32_MAX;
+
+    for (WorldStateMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+    {
+        if (IsFitToCondition(mapId, instanceId, zoneId, areaId, &iter->second))
+            return iter->second.GetValue();
+    }
+    return UINT32_MAX;
+}
+
+uint32 WorldStateMgr::GetWorldStateValueFor(WorldObject* object, uint32 stateId)
+{
+    if (!object)
+        return UINT32_MAX;
+
+    if (!object->GetObjectGuid().IsGameObject())
+        return object->GetObjectGuid().IsPlayer() ?
+            GetWorldStateValueFor(((Player*)object), stateId) : GetWorldStateValueFor(object->GetMap(), stateId);
+
+    GameObjectInfo const* goInfo = ((GameObject*)object)->GetGOInfo();
+    if (!goInfo || goInfo->type != GAMEOBJECT_TYPE_CAPTURE_POINT)
+        return GetWorldStateValueFor(object->GetMap(), stateId);
+
+    WorldStateBounds bounds = m_worldState.equal_range(stateId);
+
+    if (bounds.first != bounds.second)
+    {
+        for (WorldStateMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+        {
+            if (IsFitToCondition(object->GetMap()->GetId(), object->GetObjectGuid().GetCounter(), 0, 0, &iter->second))
+                return iter->second.GetValue();
+        }
+    }
+    return UINT32_MAX;
+}
+
+uint32 WorldStateMgr::GetWorldStateValueFor(uint32 zoneId, uint32 stateId)
+{
+    if (!zoneId || !CheckWorldState(stateId))
+        return UINT32_MAX;
+
+    uint32 mapId = GetMapIdByZoneId(zoneId);
+
+    return GetWorldStateValueFor(mapId, 0, zoneId, 0, stateId);
+}
+
+void WorldStateMgr::SetWorldStateValueFor(Player* player, uint32 stateId, uint32 value)
+{
+    if (!player)
+        return;
+
+    WorldStateBounds bounds = m_worldState.equal_range(stateId);
+    if (bounds.first != bounds.second)
+    {
+        for (WorldStateMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+        {
+            if (IsFitToCondition(player, &itr->second))
+            {
+                if ((&itr->second)->GetValue() != value)
+                    const_cast<WorldState*>(&itr->second)->SetValue(value);
+                return;
+            }
+        }
+    }
+
+    CreateWorldState(stateId, player->GetInstanceId(), value);
+}
+
+void WorldStateMgr::SetWorldStateValueFor(Map* map, uint32 stateId, uint32 value)
+{
+    if (!map)
+        return;
+
+    WorldStateBounds bounds = m_worldState.equal_range(stateId);
+    if (bounds.first != bounds.second)
+    {
+        for (WorldStateMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+        {
+            if (IsFitToCondition(map, &itr->second))
+            {
+                if ((&itr->second)->GetValue() != value)
+                    const_cast<WorldState*>(&itr->second)->SetValue(value);
+                return;
+            }
+        }
+    }
+
+    CreateWorldState(stateId, map->GetInstanceId(), value);
+}
+
+void WorldStateMgr::SetWorldStateValueFor(uint32 zoneId, uint32 stateId, uint32 value)
+{
+    if (!zoneId || !CheckWorldState(stateId))
+        return;
+
+    uint32 mapId = GetMapIdByZoneId(zoneId);
+
+    WorldStateBounds bounds = m_worldState.equal_range(stateId);
+    if (bounds.first != bounds.second)
+    {
+        for (WorldStateMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+        {
+            if (IsFitToCondition(mapId, 0, zoneId, 0, &itr->second))
+            {
+                if ((&itr->second)->GetValue() != value)
+                    const_cast<WorldState*>(&itr->second)->SetValue(value);
+                return;
+            }
+        }
+    }
+
+    CreateWorldState(stateId, 0, value);
+}
+
+void WorldStateMgr::SetWorldStateValueFor(WorldObject* object, uint32 stateId, uint32 value)
+{
+    if (!object)
+        return;
+
+    if (!object->GetObjectGuid().IsGameObject())
+    {
+        object->GetObjectGuid().IsPlayer() ?
+            SetWorldStateValueFor(((Player*)object), stateId, value) : SetWorldStateValueFor(object->GetMap(), stateId, value);
+        return;
+    }
+
+    GameObjectInfo const* goInfo = ((GameObject*)object)->GetGOInfo();
+
+    if (!goInfo ||
+        (goInfo->type != GAMEOBJECT_TYPE_CAPTURE_POINT &&
+        goInfo->type != GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING))
+    {
+        SetWorldStateValueFor(object->GetMap(), stateId, value);
+        return;
+    }
+
+    WorldStateBounds bounds = m_worldState.equal_range(stateId);
+    if (bounds.first != bounds.second)
+    {
+        for (WorldStateMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
+        {
+            WorldState const* _state = &itr->second;
+            if (!_state)
+                continue;
+
+            if (IsFitToCondition(object->GetMap()->GetId(), object->GetObjectGuid().GetCounter(), 0, 0, _state))
+            {
+                if (_state->GetValue() != value)
+                    const_cast<WorldState*>(_state)->SetValue(value);
+
+                DEBUG_LOG("WorldStateMgr::SetWorldStateValueFor tru set state %u instance %u, type %u  value %u (%u)  for %s",
+                    _state->GetId(), _state->GetInstance(),
+                    _state->GetType(),
+                    value, _state->GetValue(),
+                    object->GetGuidStr().c_str());
+
+                return;
+            }
+        }
+    }
+
+    CreateWorldState(stateId, object->GetObjectGuid().GetCounter(), value);
+}
+
+WorldState const* WorldStateMgr::CreateWorldState(uint32 stateId, uint32 instanceId, uint32 value)
+{
+    // Don't create special states as custom!
+    if (stateId == 0)
+        return NULL;
+
+    WorldStateTemplate const* tmpl = FindTemplate(stateId);
+    return CreateWorldState(tmpl, instanceId, value);
+}
+
+WorldState const* WorldStateMgr::CreateWorldState(WorldStateTemplate const* tmpl, uint32 instanceId, uint32 value)
+{
+    if (!tmpl)
+        return NULL;
+
+    if (tmpl->IsGlobal() && instanceId > 0)
+    {
+        sLog.outError("WorldStateMgr::CreateWorldState tru create GLOBAL state %u  with instance Id %u.",tmpl->m_stateId, instanceId);
+        return NULL;
+    }
+
+    if (WorldState const* _state = GetWorldState(tmpl, instanceId))
+    {
+        DEBUG_LOG("WorldStateMgr::CreateWorldState tru create  state %u  instance %u type %u (value %u) but state exists (value %u).",
+            tmpl->m_stateId, instanceId, tmpl->m_stateType, value, _state->GetValue());
+        const_cast<WorldState*>(_state)->SetValue(value);
+        return _state;
+    }
+
+    // Store the state data
+    {
+        m_worldState.insert(WorldStateMap::value_type(tmpl->m_stateId, WorldState(tmpl, instanceId)));
+    }
+    WorldState* _state  = const_cast<WorldState*>(GetWorldState(tmpl, instanceId));
+
+    if (value != UINT32_MAX)
+        _state->SetValue(value);
+    else
+        _state->RemoveFlag(WORLD_STATE_FLAG_SAVED);
+
+    if (!tmpl->HasFlag(WORLD_STATE_FLAG_PASSIVE_AT_CREATE))
+        _state->AddFlag(WORLD_STATE_FLAG_ACTIVE);
+
+    DEBUG_LOG("WorldStateMgr::CreateWorldState state %u instance %u created, type %u (%u) flags %u (%u) value %u (%u, %u)",
+        _state->GetId(), _state->GetInstance(),
+        _state->GetType(), tmpl->m_stateType,
+        _state->GetFlags(), tmpl->m_flags,
+        _state->GetValue(), value, tmpl->m_defaultValue);
+
+    return _state;
+}
+
+WorldState const* WorldStateMgr::GetWorldState(uint32 stateId, uint32 instanceId, WorldStateType type, uint32 condition)
+{
+    WorldStateBounds bounds = m_worldState.equal_range(stateId);
+    if (bounds.first == bounds.second)
+        return NULL;
+
+    for (WorldStateMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+    {
+        if (iter->second.GetInstance() == instanceId
+            && type == iter->second.GetType()
+            && condition == iter->second.GetCondition())
+            return &iter->second;
+    }
+    return NULL;
+}
+
+WorldState const* WorldStateMgr::GetWorldState(uint32 stateId, uint32 instanceId, Player* player)
+{
+    WorldStateBounds bounds = m_worldState.equal_range(stateId);
+    if (bounds.first == bounds.second)
+        return NULL;
+
+    for (WorldStateMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+    {
+        if (iter->second.GetInstance() == instanceId
+            && (!player || IsFitToCondition(player, &iter->second)))
+            return &iter->second;
+    }
+    return NULL;
+}
+
+WorldState const* WorldStateMgr::GetWorldState(WorldStateTemplate const* tmpl, uint32 instanceId)
+{
+    if (!tmpl)
+        return NULL;
+
+    WorldStateBounds bounds = m_worldState.equal_range(tmpl->m_stateId);
+    if (bounds.first == bounds.second)
+        return NULL;
+
+    for (WorldStateMap::const_iterator iter = bounds.first; iter != bounds.second; ++iter)
+    {
+        if (iter->second.GetInstance() == instanceId && iter->second.GetTemplate() == tmpl)
+            return &iter->second;
+    }
+    return NULL;
+}
+
+void WorldStateMgr::AddWorldStateFor(Player* player, uint32 stateId, uint32 instanceId)
+{
+    if (!player)
+        return;
+
+    WorldState const* state = GetWorldState(stateId,instanceId,player);
+    if (state && !state->HasClient(player))
+    {
+        const_cast<WorldState*>(state)->AddClient(player);
+
+        if (player->IsInWorld())
+        {
+            // DownLinked states sended always before main!
+            if (state->HasDownLink())
+            {
+                if (WorldStateSet* stateSet = GetDownLinkedWorldStates(state))
+                {
+                    for (uint8 i = 0; i < stateSet->count(); ++i)
+                    {
+                        WorldState* ws = (*stateSet)[i];
+                        ws->AddClient(player);
+                        player->_SendUpdateWorldState(ws->GetId(), ws->GetValue());
+                        DEBUG_LOG("WorldStateMgr::AddWorldStateFor  send linked state %u value %u for %s",
+                            ws->GetId(), ws->GetValue(), player->GetGuidStr().c_str());
+                    }
+                    delete stateSet;
+                }
+            }
+            player->_SendUpdateWorldState(stateId, WORLD_STATE_ADD);
+            DEBUG_LOG("WorldStateMgr::AddWorldStateFor send main state %u value %u for %s",
+                stateId, WORLD_STATE_ADD,
+                player->GetGuidStr().c_str());
+        }
+    }
+}
+
+void WorldStateMgr::RemoveWorldStateFor(Player* player, uint32 stateId, uint32 instanceId)
+{
+    if (!player || !player->IsInWorld())
+        return;
+
+    WorldState const* state = GetWorldState(stateId, instanceId, player);
+    if (state && state->HasClient(player))
+    {
+        // DownLinked states - only client removed
+        if (state->HasDownLink())
+        {
+            if (WorldStateSet* stateSet = GetDownLinkedWorldStates(state))
+            {
+                for (uint8 i = 0; i < stateSet->count(); ++i)
+                    (*stateSet)[i]->RemoveClient(player);
+                delete stateSet;
+            }
+        }
+
+        const_cast<WorldState*>(state)->RemoveClient(player);
+        player->_SendUpdateWorldState(stateId, WORLD_STATE_REMOVE);
+        DEBUG_LOG("WorldStateMgr::RemoveWorldStateFor remove main state %u (value %u) for %s",
+            stateId, WORLD_STATE_REMOVE,
+            player->GetGuidStr().c_str());
+    }
+}
+
+void WorldStateMgr::CreateInstanceState(uint32 mapId, uint32 instanceId)
+{
+    for (WorldStateTemplateMap::const_iterator itr = m_worldStateTemplates.begin(); itr != m_worldStateTemplates.end(); ++itr)
+    {
+        if (itr->second.HasFlag(WORLD_STATE_FLAG_INITIAL_STATE) &&
+            (itr->second.m_stateType == WORLD_STATE_TYPE_MAP || itr->second.m_stateType == WORLD_STATE_TYPE_BATTLEGROUND) &&
+            itr->second.m_condition == mapId)
+        {
+            CreateWorldState(&itr->second, instanceId);
+        }
+    }
+}
+
+void WorldStateMgr::CreateZoneAreaStateIfNeed(Player* player, uint32 zone, uint32 area)
+{
+    if (!player)
+        return;
+
+    // temporary - not create zone/area states for instances!
+    if (player->GetInstanceId() != 0)
+        return;
+
+    for (WorldStateTemplateMap::const_iterator itr = m_worldStateTemplates.begin(); itr != m_worldStateTemplates.end(); ++itr)
+    {
+        if (itr->second.HasFlag(WORLD_STATE_FLAG_ACTIVE))
+        {
+            if (itr->second.m_stateType == WORLD_STATE_TYPE_ZONE && itr->second.m_condition == zone)
+            {
+                if (GetWorldState(&itr->second, player->GetInstanceId()))
+                    continue;
+                CreateWorldState(&itr->second, player->GetInstanceId());
+            }
+            else if (itr->second.m_stateType == WORLD_STATE_TYPE_AREA && itr->second.m_condition == area)
+            {
+                if (GetWorldState(&itr->second, player->GetInstanceId()))
+                    continue;
+                CreateWorldState(&itr->second, player->GetInstanceId());
+            }
+        }
+    }
+}
+
+void WorldStateMgr::DeleteInstanceState(uint32 mapId, uint32 instanceId)
+{
+    // Not delete states for 0 instance by standart way! only cleanup in ::Update
+    if (instanceId == 0)
+        return;
+
+    MapEntry const* targetMapEntry = sMapStore.LookupEntry(mapId);
+    if (!targetMapEntry || targetMapEntry->IsContinent() || !targetMapEntry->Instanceable())
+    {
+        sLog.outError("WorldStateMgr::DeleteInstanceState map %u not exists or not instanceable!", mapId);
+        return;
+    }
+
+    if (WorldStateSet* stateSet = GetInstanceStates(mapId, instanceId))
+    {
+        for (uint8 i = 0; i < stateSet->count(); ++i)
+            DeleteWorldState((*stateSet)[i]);
+        delete stateSet;
+    }
+}
+
+WorldStateSet* WorldStateMgr::GetInstanceStates(Map* map, uint32 flags, bool full)
+{
+    if (!map)
+        return NULL;
+
+    return GetInstanceStates(map->GetId(), map->GetInstanceId(), flags, full);
+}
+
+WorldStateSet* WorldStateMgr::GetInstanceStates(uint32 mapId, uint32 instanceId, uint32 flags, bool full)
+{
+    WorldStateSet* stateSet = NULL;
+
+    for (WorldStateMap::iterator itr = m_worldState.begin(); itr != m_worldState.end(); ++itr)
+    {
+        WorldState* state = &itr->second;
+        if (!state || state->HasFlag(WORLD_STATE_FLAG_DELETED))
+            continue;
+
+        if (!flags || (state->GetFlags() & flags))
+        {
+            if (state->GetType() == WORLD_STATE_TYPE_MAP &&
+                state->GetCondition() == mapId &&
+                state->GetInstance() == instanceId)
+            {
+                AddToWorldStateSet(&stateSet, state);
+            }
+            else if (full)
+            {
+                Map* map = sMapMgr.FindMap(mapId, instanceId);
+                if (IsFitToCondition(map, state))
+                    AddToWorldStateSet(&stateSet, state);
+            }
+        }
+    }
+    return stateSet;
+}
+
+WorldStateSet* WorldStateMgr::GetInitWorldStates(uint32 mapId, uint32 instanceId, uint32 zoneId, uint32 areaId)
+{
+    WorldStateSet* stateSet = NULL;
+
+    for (WorldStateMap::const_iterator itr = m_worldState.begin(); itr != m_worldState.end(); ++itr)
+    {
+        WorldState const* state = &itr->second;
+        if (!state || state->HasFlag(WORLD_STATE_FLAG_DELETED))
+            continue;
+
+        if ((state->HasFlag(WORLD_STATE_FLAG_INITIAL_STATE) ||
+            state->HasFlag(WORLD_STATE_FLAG_ACTIVE)) &&
+            IsFitToCondition(mapId, instanceId, zoneId, areaId, state))
+        {
+            // DownLinked states sended always before main!
+            if (state->HasDownLink())
+            {
+                if (WorldStateSet* linkedStateSet = GetDownLinkedWorldStates(state))
+                {
+                    for (uint8 i = 0; i < linkedStateSet->count(); ++i)
+                        AddToWorldStateSet(&stateSet, (*linkedStateSet)[i]);
+                    delete linkedStateSet;
+                }
+            }
+            AddToWorldStateSet(&stateSet, &itr->second);
+        }
+    }
+    return stateSet;
+}
+
+WorldStateSet* WorldStateMgr::GetDownLinkedWorldStates(WorldState const* state)
+{
+    // This method get DownLinked worldstates with this
+    if (!state->HasDownLink())
+        return NULL;
+
+    WorldStateSet* stateSet = NULL;
+
+    for (WorldStatesLinkedSet::const_iterator itr = state->GetLinkedSet()->begin(); itr != state->GetLinkedSet()->end(); ++itr)
+    {
+        WorldStateTemplate const* tmpl = FindTemplate(*itr, state->GetType(), state->GetCondition(), state->GetId());
+        if (!tmpl)
+            continue;
+
+        if (WorldState const* linkedState = GetWorldState(tmpl, state->GetInstance()))
+            AddToWorldStateSet(&stateSet, linkedState);
+    }
+    return stateSet;
+}
+
+WorldState const* WorldStateMgr::GetUpLinkWorldState(WorldState const* state)
+{
+    if (!state->HasUpLink())
+        return NULL;
+
+    WorldStateTemplate const* tmpl = FindTemplate(state->GetTemplate()->m_linkedId, state->GetType(), state->GetCondition());
+    if (!tmpl)
+        return NULL;
+
+    return GetWorldState(tmpl, state->GetInstance());
+}
+
+uint32 WorldStateMgr::GetMapIdByZoneId(uint32 zoneId) const
+{
+    if (zoneId)
+    {
+        for (uint32 i = 1; i < sAreaStore.GetNumRows(); ++i)
+        {
+            if (AreaTableEntry const* areaEntry = sAreaStore.LookupEntry(i))
+                if (areaEntry->zone == zoneId)
+                    return areaEntry->mapid;
+        }
+    }
+
+    return 451; /*Programmers Isle. possible need assert here.*/
+}
+
+bool WorldState::IsExpired() const
+{
+    return time(NULL) > time_t(m_renewTime + sWorld.getConfig(CONFIG_UINT32_WORLD_STATE_EXPIRETIME));
+}
+
+void WorldState::AddClient(Player* player)
+{
+    if (player)
+        AddClient(player->GetObjectGuid());
+}
+
+bool WorldState::HasClient(Player* player) const
+{
+    return player ? HasClient(player->GetObjectGuid()) : false;
+}
+
+void WorldState::RemoveClient(Player* player)
+{
+    if (player)
+        RemoveClient(player->GetObjectGuid());
+}
diff --git a/src/game/WorldStateMgr.h b/src/game/WorldStateMgr.h
new file mode 100644
index 00000000000..569d86e40f2
--- /dev/null
+++ b/src/game/WorldStateMgr.h
@@ -0,0 +1,410 @@
+/*
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/mangosR2>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOS_WORLD_STATE_MGR_H
+#define MANGOS_WORLD_STATE_MGR_H
+
+#include "Common.h"
+#include "World.h"
+
+class Player;
+
+enum WorldStatesLimits
+{
+    WORLDSTATES_BEGIN                           = 1000,
+    WORLDSTATES_END                             = 9999,
+};
+
+enum WorldStateType
+{
+    WORLD_STATE_TYPE_CUSTOM                     = 0,
+    WORLD_STATE_TYPE_WORLD                      = 1,
+    WORLD_STATE_TYPE_BGWEEKEND                  = 2,
+    WORLD_STATE_TYPE_EVENT                      = 3,
+    WORLD_STATE_TYPE_MAP                        = 4,
+    WORLD_STATE_TYPE_ZONE                       = 5,
+    WORLD_STATE_TYPE_AREA                       = 6,
+    WORLD_STATE_TYPE_BATTLEGROUND               = 7,
+    WORLD_STATE_TYPE_CAPTURE_POINT              = 8,
+    WORLD_STATE_TYPE_WORLD_UNCOMMON             = 9,
+    WORLD_STATE_TYPE_DESTRUCTIBLE_OBJECT        = 10,
+    WORLD_STATE_TYPE_MAX
+};
+
+enum WorldStateFlags
+{
+    // 0 byte - dynamic states
+    WORLD_STATE_FLAG_INITIALIZED                = 0,
+    WORLD_STATE_FLAG_ACTIVE                     = 1,
+    WORLD_STATE_FLAG_SAVED                      = 2,
+    WORLD_STATE_FLAG_EXPIRED                    = 3,
+    WORLD_STATE_FLAG_UPDATED                    = 4,
+    WORLD_STATE_FLAG_DELETED                    = 7,
+    // 1 byte - dynamic states
+    WORLD_STATE_FLAG_TRISTATE_NEUTRAL           = 8,
+    WORLD_STATE_FLAG_TRISTATE_ALLIANCE          = 9,
+    WORLD_STATE_FLAG_TRISTATE_HORDE             = 10,
+    // 2 byte - static states
+    WORLD_STATE_FLAG_INITIAL_STATE              = 16,
+    WORLD_STATE_FLAG_PASSIVE_AT_CREATE          = 17,
+    WORLD_STATE_FLAG_NOT_EXPIREABLE             = 18,
+    // 3 byte - custom states
+    WORLD_STATE_FLAG_CUSTOM_FORMAT              = 24,
+    WORLD_STATE_FLAG_CUSTOM_GLOBAL              = 25,
+    WORLD_STATE_FLAG_CUSTOM_HIDDEN              = 26,
+    WORLD_STATE_FLAG_CUSTOM                     = 31,
+    WORLD_STATE_FLAG_MAX,
+};
+
+enum WorldStateFlagMask
+{
+    WORLD_STATE_FLAG_MASK_INITED                = 1 << WORLD_STATE_FLAG_INITIALIZED | 1 << WORLD_STATE_FLAG_ACTIVE | 1 << WORLD_STATE_FLAG_UPDATED,
+    WORLD_STATE_FLAG_MASK_TRISTATE              = 1 << WORLD_STATE_FLAG_TRISTATE_HORDE | 1 << WORLD_STATE_FLAG_TRISTATE_ALLIANCE | 1 << WORLD_STATE_FLAG_TRISTATE_NEUTRAL,
+    WORLD_STATE_FLAG_MASK_NOT_EXPIRE            = 1 << WORLD_STATE_FLAG_NOT_EXPIREABLE | 1 << WORLD_STATE_FLAG_INITIAL_STATE,
+};
+
+enum WorldStateInitialValueType
+{
+    WORLD_STATE_REMOVE              = 0,
+    WORLD_STATE_ADD                 = 1
+};
+
+enum GameObjectWorldState
+{
+    OBJECT_STATE_NONE                = 0,
+    OBJECT_STATE_NEUTRAL_INTACT      = 1,
+    OBJECT_STATE_NEUTRAL_DAMAGE      = 2,
+    OBJECT_STATE_NEUTRAL_DESTROY     = 3,
+    OBJECT_STATE_HORDE_INTACT        = 4,
+    OBJECT_STATE_HORDE_DAMAGE        = 5,
+    OBJECT_STATE_HORDE_DESTROY       = 6,
+    OBJECT_STATE_ALLIANCE_INTACT     = 7,
+    OBJECT_STATE_ALLIANCE_DAMAGE     = 8,
+    OBJECT_STATE_ALLIANCE_DESTROY    = 9,
+
+    // Counters redefinition
+    OBJECT_STATE_INTACT              = 1,
+    OBJECT_STATE_DAMAGE              = 2,
+    OBJECT_STATE_DESTROY             = 3,
+    OBJECT_STATE_PERIOD              = 3,
+    OBJECT_STATE_REBUILD             = 4,
+    OBJECT_STATE_LAST_INDEX          = OBJECT_STATE_ALLIANCE_DESTROY,
+};
+
+typedef UNORDERED_SET<uint32> WorldStatesLinkedSet;
+
+struct WorldStateTemplate
+{
+    // Constructor for use with DB templates data
+    WorldStateTemplate(uint32 _stateid, uint32 _type, uint32 _condition, uint32 _flags, uint32 _default, uint32 _linked, uint32 phasemask)
+        : m_stateId(_stateid), m_stateType(_type), m_condition(_condition), m_flags(_flags), m_defaultValue(_default), m_linkedId(_linked),
+        m_phasemask(phasemask)
+    {
+    };
+
+    public:
+
+    bool IsGlobal() const
+    {
+        return (m_stateType == WORLD_STATE_TYPE_WORLD || m_stateType == WORLD_STATE_TYPE_BGWEEKEND || m_stateType == WORLD_STATE_TYPE_EVENT);
+    }
+
+    uint32             const m_stateId;         // WorldState ID (0 - for BG and some OutDoor PvP)
+    uint32             const m_stateType;       // WorldState type
+    uint32             const m_condition;       // contains some conditions type (by m_stateType):
+                                                // Map Id
+                                                // Zone id (0 for world, some instance and BG states)
+                                                // Area id (0 for world, some instance and BG states)
+    uint32             const m_flags;
+    uint32             const m_defaultValue;    // Default value from DB (0 for DBC states)
+    uint32                   m_linkedId;        // Linked (uplink) state Id
+    uint32                   m_phasemask;       // Phase mask for this template. May accumulate some DBC values.
+
+    WorldStatesLinkedSet   m_linkedList;        // Linked (downlink) states
+
+    bool               HasFlag(WorldStateFlags flag) const { return (m_flags & (1 << flag)); };
+};
+
+typedef UNORDERED_MULTIMAP<uint32 /* state id */, WorldStateTemplate> WorldStateTemplateMap;
+typedef std::pair<WorldStateTemplateMap::const_iterator,WorldStateTemplateMap::const_iterator> WorldStateTemplateBounds;
+
+struct WorldState
+{
+    public:
+    // For create new state
+    WorldState(WorldStateTemplate const* _state, uint32 _instance)
+        : m_pState(_state), m_stateId(m_pState->m_stateId), m_instanceId(_instance), m_type(m_pState->m_stateType)
+    {
+        Initialize();
+    }
+
+    // For load
+    WorldState(WorldStateTemplate const* _state, uint32 _instance, uint32 _flags, uint32 _value, time_t _renewtime)
+        : m_pState(_state), m_stateId(m_pState->m_stateId), m_instanceId(_instance), m_type(m_pState->m_stateType), m_flags(_flags), m_value(_value), m_renewTime(_renewtime)
+    {
+        m_linkedGuid.Clear();
+        m_clientGuids.clear();
+        Reload();
+    }
+
+    // For load custom state
+    WorldState(uint32 _stateid, uint32 _instance, uint32 _flags, uint32 _value, time_t _renewtime)
+        : m_pState(NULL), m_stateId(_stateid), m_instanceId(_instance), m_type(WORLD_STATE_TYPE_CUSTOM), m_flags(_flags), m_value(_value), m_renewTime(_renewtime)
+    {
+        Initialize();
+    }
+
+    // For create new custom state
+    WorldState(uint32 _stateid, uint32 _instance, uint32 value)
+        : m_pState(NULL), m_stateId(_stateid), m_instanceId(_instance), m_type(WORLD_STATE_TYPE_CUSTOM), m_value(value)
+    {
+        Initialize();
+    }
+
+    bool IsGlobal()
+    {
+        return (m_type == WORLD_STATE_TYPE_WORLD || m_type == WORLD_STATE_TYPE_BGWEEKEND || m_type == WORLD_STATE_TYPE_EVENT) ||
+            (m_type == WORLD_STATE_TYPE_CUSTOM && HasFlag(WORLD_STATE_FLAG_CUSTOM) && HasFlag(WORLD_STATE_FLAG_CUSTOM_GLOBAL));
+    }
+
+    void Initialize()
+    {
+        m_linkedGuid.Clear();
+        m_clientGuids.clear();
+        if (m_pState)
+        {
+            m_condition = m_pState->m_condition;
+            m_flags     = m_pState->m_flags;
+            m_value     = m_pState->m_defaultValue;
+            m_phasemask = m_pState->m_phasemask;
+        }
+        else
+        {
+            m_condition = 0;
+            m_flags     = 0;
+            m_value     = 0;
+            m_phasemask = PHASEMASK_NONE;
+            AddFlag(WORLD_STATE_FLAG_CUSTOM);
+        };
+        Renew();
+    }
+
+    void Reload()
+    {
+        if (m_pState)
+        {
+            m_condition = m_pState->m_condition;
+            m_flags     = m_pState->m_flags;
+            m_value     = m_pState->m_defaultValue;
+            m_phasemask = m_pState->m_phasemask;
+        }
+        else
+        {
+            m_phasemask = PHASEMASK_NONE;
+            AddFlag(WORLD_STATE_FLAG_CUSTOM);
+        }
+    }
+
+    // Client operations
+    void AddClient(Player* player);
+    void AddClient(ObjectGuid const& guid)       { if (guid.IsPlayer()) m_clientGuids.insert(guid);};
+
+    bool HasClients()                      const { return !m_clientGuids.empty();};
+    bool HasClient(Player* player)         const;
+    bool HasClient(ObjectGuid const& guid) const { return m_clientGuids.find(guid) != m_clientGuids.end();};
+
+    void RemoveClient(Player* player);
+    void RemoveClient(ObjectGuid const& guid)    { if (guid.IsPlayer()) m_clientGuids.erase(guid);};
+
+    GuidSet const& GetClients()                  { return m_clientGuids; };
+
+    // Linked Guid operations
+    ObjectGuid const& GetLinkedGuid()      const { return m_linkedGuid;};
+    void              SetLinkedGuid(ObjectGuid const& guid)    { m_linkedGuid = guid;};
+
+    bool IsExpired() const;
+
+    WorldStateTemplate const* GetTemplate() const { return m_pState; }
+
+    // Linked state wrappers
+    bool HasUpLink()   const { return GetTemplate() ? GetTemplate()->m_linkedId != 0 : false; };
+    bool HasDownLink() const { return GetTemplate() ? !GetTemplate()->m_linkedList.empty() : false; };
+    bool HasDownLink(uint32 stateId) const { return GetTemplate() ? (GetTemplate()->m_linkedList.find(stateId) != GetTemplate()->m_linkedList.end()) : false; };
+    WorldStatesLinkedSet const* GetLinkedSet() const { return GetTemplate() ? &GetTemplate()->m_linkedList : NULL; };
+
+    void AddFlag(WorldStateFlags flag)    { m_flags |= (1 << flag); };
+    void RemoveFlag(WorldStateFlags flag) { m_flags &= ~(1 << flag); };
+    bool HasFlag(WorldStateFlags flag) const   { return bool(m_flags & (1 << flag)); };
+
+    uint32 const& GetId()        const { return m_stateId; }
+    uint32 const& GetCondition() const { return m_condition; }
+    uint32 const& GetType()      const { return m_type; }
+    uint32 const& GetInstance()  const { return m_instanceId; }
+    uint32 const& GetFlags()     const { return m_flags; }
+    time_t const& GetRenewTime() const { return m_renewTime; }
+    uint32 const& GetPhaseMask() const { return m_phasemask; }
+
+    uint32 const& GetValue()     const { return m_value; }
+    void          SetValue(uint32 value)
+    {
+        m_value = value;
+        RemoveFlag(WORLD_STATE_FLAG_SAVED);
+        Renew();
+    }
+    void          Renew()
+    {
+        AddFlag(WORLD_STATE_FLAG_UPDATED);
+        m_renewTime = time(NULL);
+    }
+
+    private:
+    // const parameters (must be setted in constructor)
+    const WorldStateTemplate*          m_pState;        // pointer to template (may be NULL for custom states)
+    const uint32                       m_stateId;       // state id  (not unique, 0 for custom and BG states)
+    const uint32                       m_instanceId;    // instance Id
+    const uint32                       m_type;          // type
+    // not-const variables (may be changed later)
+    uint32                             m_flags;         // in initialize copyed from template
+    uint32                             m_value;         // current value (NU for BG states)
+    uint32                             m_condition;     // condition (for custom states)
+    time_t                             m_renewTime;     // time of last renew
+    ObjectGuid                         m_linkedGuid;    // Guid of GO/creature/etc, which linked to WorldState (CapturePoint mostly)
+    GuidSet                            m_clientGuids;   // List of player Guids, wich already received this WorldState update
+    uint32                             m_phasemask;     // Phase mask for this state
+};
+
+typedef UNORDERED_MULTIMAP<uint32 /* state id */, WorldState> WorldStateMap;
+typedef std::pair<WorldStateMap::const_iterator, WorldStateMap::const_iterator> WorldStateBounds;
+
+#define MAX_WORD_STATE_SET_COUNT 254
+
+class WorldStateSet
+{
+    private:
+        WorldState* m_states[MAX_WORD_STATE_SET_COUNT];
+        uint8 m_count;
+    public:
+        WorldStateSet(): m_count(0) {}
+
+        void add(WorldState const* wState)
+        {
+            MANGOS_ASSERT(m_count < MAX_WORD_STATE_SET_COUNT);
+            m_states[m_count++] = (WorldState*)wState;
+        }
+        uint8 count() const { return m_count; }
+
+        WorldState* operator[](uint8 idx) const { return m_states[idx]; }
+};
+
+inline void AddToWorldStateSet(WorldStateSet** wss, WorldState const* wState)
+{
+    if (!*wss)
+        *wss = new WorldStateSet;
+    (*wss)->add(wState);
+}
+
+class MANGOS_DLL_DECL WorldStateMgr : public MaNGOS::Singleton<WorldStateMgr, MaNGOS::ClassLevelLockable<WorldStateMgr, MANGOSR2_MUTEX_MODEL_2> >
+{
+    public:
+        WorldStateMgr() {}
+
+    public:
+        void Initialize();
+
+        // Load
+        void LoadTemplatesFromDB();
+        void LoadTemplatesFromObjectTemplateDB();
+        void LoadTemplatesFromDBC();
+        void LoadFromDB();
+        uint32 GetWorldStateTemplatesCount() const { return m_worldStateTemplates.size(); };
+        uint32 GetWorldStatesCount() const         { return m_worldState.size(); };
+
+        // Save
+        void SaveToDB();
+        void Save(WorldState const* state);
+
+        // create state operation
+        void CreateWorldStatesIfNeed();
+        void CreateZoneAreaStateIfNeed(Player* player, uint32 zone, uint32 area);
+        void CreateLinkedWorldStatesIfNeed(WorldObject* object);
+
+        // instance operations
+        void CreateInstanceState(uint32 mapId, uint32 instanceId);
+        void DeleteInstanceState(uint32 mapId, uint32 instanceId);
+
+        // Cleanup states
+        void Update();
+
+        // In-map operations
+        void MapUpdate(Map* map);
+
+        // WorldState operations
+        WorldState const* CreateWorldState(WorldStateTemplate const* tmpl, uint32 instanceId, uint32 value = UINT32_MAX);
+        WorldState const* CreateWorldState(uint32 stateId, uint32 instanceId, uint32 value = UINT32_MAX);
+        WorldState const* GetWorldState(uint32 stateId, uint32 instanceId, WorldStateType type, uint32 condition);
+        WorldState const* GetWorldState(uint32 stateId, uint32 instanceId, Player* player = NULL);
+        WorldState const* GetWorldState(WorldStateTemplate const* tmpl, uint32 instanceId);
+        void DeleteWorldState(WorldState* state);
+        WorldStateTemplate const* FindTemplate(uint32 stateId, uint32 type = WORLD_STATE_TYPE_MAX, uint32 condition = 0, uint32 linkedId = 0);
+
+        // External WorldState operations
+        uint32 GetWorldStateValue(uint32 stateId);
+        uint32 GetWorldStateValueFor(Player* player, uint32 stateId);
+        uint32 GetWorldStateValueFor(Map* map, uint32 stateId);
+        uint32 GetWorldStateValueFor(uint32 zoneId, uint32 stateId);
+        uint32 GetWorldStateValueFor(uint32 mapId, uint32 instanceId, uint32 zoneId, uint32 areaId, uint32 stateId);
+        uint32 GetWorldStateValueFor(WorldObject* object, uint32 stateId);
+
+        void   SetWorldStateValueFor(Player* player, uint32 stateId, uint32 value);
+        void   SetWorldStateValueFor(Map* map, uint32 stateId, uint32 value);
+        void   SetWorldStateValueFor(WorldObject* object, uint32 stateId, uint32 value);
+        void   SetWorldStateValueFor(uint32 zoneId, uint32 stateId, uint32 value);
+
+        WorldStateSet* GetWorldStates(uint32 flags) { return GetWorldStatesFor(NULL, flags); };
+        WorldStateSet* GetWorldStatesFor(Player* player, WorldStateFlags flag) { return GetWorldStatesFor(player, (1 << flag)); };
+        WorldStateSet* GetWorldStatesFor(Player* player, uint32 flags = UINT32_MAX);
+
+        WorldStateSet* GetUpdatedWorldStatesFor(Player* player, time_t lastUpdateTime = 0);
+
+        WorldStateSet* GetInstanceStates(Map* map, uint32 flags = 0, bool full = false);
+        WorldStateSet* GetInstanceStates(uint32 mapId, uint32 instanceId, uint32 flags = 0, bool full = false);
+        WorldStateSet* GetInitWorldStates(uint32 mapId, uint32 instanceId, uint32 zoneId, uint32 areaId);
+
+        bool          IsFitToCondition(Player* player, WorldState const* state);
+        bool          IsFitToCondition(Map* map, WorldState const* state);
+        bool          IsFitToCondition(uint32 mapId, uint32 instanceId, uint32 zoneId, uint32 areaId, WorldState const* state);
+
+        // Create and manage asynchronous player update lists
+        void AddWorldStateFor(Player* player, uint32 stateId, uint32 instanceId);
+        void RemoveWorldStateFor(Player* player, uint32 stateId, uint32 instanceId);
+
+        WorldStateSet* GetDownLinkedWorldStates(WorldState const* state);
+        WorldState const* GetUpLinkWorldState(WorldState const* state);
+
+        static bool CheckWorldState(uint32 stateId)  { return (stateId >= WORLDSTATES_BEGIN) && (stateId <= WORLDSTATES_END); };
+
+        uint32 GetMapIdByZoneId(uint32 zoneId) const;
+
+    private:
+        WorldStateTemplateMap   m_worldStateTemplates;    // templates storage
+        WorldStateMap           m_worldState;             // data storage
+};
+
+#define sWorldStateMgr MaNGOS::Singleton<WorldStateMgr>::Instance()
+#endif
diff --git a/src/game/ahbot/AhBot.cpp b/src/game/ahbot/AhBot.cpp
new file mode 100644
index 00000000000..928abc4b9b6
--- /dev/null
+++ b/src/game/ahbot/AhBot.cpp
@@ -0,0 +1,995 @@
+#include "Category.h"
+#include "ItemBag.h"
+#include "AhBot.h"
+#include "../World.h"
+#include "Config/Config.h"
+#include "../Chat.h"
+#include "AhBotConfig.h"
+#include "../AuctionHouseMgr.h"
+#include "../WorldSession.h"
+#include "../../game/Player.h"
+#include "../ObjectAccessor.h"
+#include "../ObjectGuid.h"
+#include "../ObjectMgr.h"
+#include "../playerbot/PlayerbotAIConfig.h"
+#include "../AccountMgr.h"
+#include "../playerbot/playerbot.h"
+#include "../Player.h"
+
+using namespace ahbot;
+
+bool Player::MinimalLoadFromDB( QueryResult *result, uint32 guid )
+{
+    bool delete_result = true;
+    if (!result)
+    {
+        //                                        0     1           2           3           4    5          6          7
+        result = CharacterDatabase.PQuery("SELECT name, position_x, position_y, position_z, map, totaltime, leveltime, at_login FROM characters WHERE guid = '%u'",guid);
+        if (!result)
+            return false;
+    }
+    else
+        delete_result = false;
+
+    Field *fields = result->Fetch();
+
+    // overwrite possible wrong/corrupted guid
+    Object::_Create( guid, 0, HIGHGUID_PLAYER );
+
+    m_name = fields[0].GetCppString();
+
+    Relocate(fields[1].GetFloat(),fields[2].GetFloat(),fields[3].GetFloat());
+    SetLocationMapId(fields[4].GetUInt32());
+
+    m_Played_time[PLAYED_TIME_TOTAL] = fields[5].GetUInt32();
+    m_Played_time[PLAYED_TIME_LEVEL] = fields[6].GetUInt32();
+
+    m_atLoginFlags = fields[7].GetUInt32();
+
+    if (delete_result)
+        delete result;
+
+    for (int i = 0; i < PLAYER_SLOTS_COUNT; ++i)
+        m_items[i] = NULL;
+
+    if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
+        m_deathState = DEAD;
+
+    return true;
+}
+
+bool ChatHandler::HandleAhBotCommand(char* args)
+{
+    auctionbot.HandleCommand(args);
+    return true;
+}
+
+INSTANTIATE_SINGLETON_1( ahbot::AhBot );
+
+uint32 AhBot::auctionIds[MAX_AUCTIONS] = {1,2,3,4,5,6,7};
+map<uint32, uint32> AhBot::factions;
+
+void AhBot::Init()
+{
+    sLog.outString("Initializing AhBot by ike3");
+
+    if (!sAhBotConfig.Initialize())
+        return;
+
+    factions[1] = 1;
+    factions[2] = 1;
+    factions[3] = 1;
+    factions[4] = 2;
+    factions[5] = 2;
+    factions[6] = 2;
+    factions[7] = 3;
+
+    availableItems.Init();
+
+    sLog.outString("AhBot configuration loaded");
+}
+
+AhBot::~AhBot()
+{
+}
+
+ObjectGuid AhBot::GetAHBplayerGUID()
+{
+    return ObjectGuid(sAhBotConfig.guid);
+}
+
+class AhbotThread: public ACE_Task <ACE_MT_SYNCH>
+{
+private:
+    AhBot* bot;
+public:
+    AhbotThread(AhBot* bot) : bot(bot) {}
+    int svc(void) { bot->ForceUpdate(); return 0; }
+};
+
+void AhBot::Update()
+{
+    time_t now = time(0);
+
+    if (now < nextAICheckTime)
+        return;
+
+    if (updating)
+        return;
+
+    nextAICheckTime = time(0) + sAhBotConfig.updateInterval;
+
+    AhbotThread *thread = new AhbotThread(this);
+    thread->activate();
+}
+
+void AhBot::ForceUpdate()
+{
+    if (!sAhBotConfig.enabled)
+        return;
+
+    if (updating)
+        return;
+
+    sLog.outString("AhBot is now checking auctions");
+    updating = true;
+
+    if (!allBidders.size())
+        LoadRandomBots();
+
+    if (!allBidders.size())
+    {
+        sLog.outError("Ahbot is disabled but there is no bidders available");
+        return;
+    }
+
+    CheckCategoryMultipliers();
+
+    int answered = 0, added = 0;
+    for (int i = 0; i < MAX_AUCTIONS; i++)
+    {
+        InAuctionItemsBag inAuctionItems(auctionIds[i]);
+        inAuctionItems.Init(true);
+
+        for (int j = 0; j < CategoryList::instance.size(); j++)
+        {
+            Category* category = CategoryList::instance[j];
+            answered += Answer(i, category, &inAuctionItems);
+            added += AddAuctions(i, category, &inAuctionItems);
+        }
+    }
+
+    CleanupHistory();
+
+    sLog.outString("AhBot auction check finished. %d auctions answered, %d new auctions added. Next check in %d seconds",
+            answered, added, sAhBotConfig.updateInterval);
+    updating = false;
+}
+
+struct SortByPricePredicate
+{
+    bool operator()(AuctionEntry* const & a, AuctionEntry* const & b) const
+    {
+        if (a->startbid == b->startbid)
+            return a->buyout < b->buyout;
+
+        return a->startbid < b->startbid;
+    }
+};
+
+vector<AuctionEntry*> AhBot::LoadAuctions(const AuctionHouseObject::AuctionEntryMap& auctionEntryMap,
+        Category*& category, int& auction)
+{
+    vector<AuctionEntry*> entries;
+    for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = auctionEntryMap.begin();
+            itr != auctionEntryMap.end(); ++itr)
+    {
+        AuctionEntry *entry = itr->second;
+        if (IsBotAuction(entry->owner) || IsBotAuction(entry->bidder))
+            continue;
+
+        Item *item = sAuctionMgr.GetAItem(entry->itemGuidLow);
+        if (!item)
+            continue;
+
+        if (!category->Contains(item->GetProto()))
+            continue;
+
+        uint32 price = category->GetPricingStrategy()->GetBuyPrice(item->GetProto(), auctionIds[auction]);
+        if (!price || !item->GetCount())
+        {
+            sLog.outDetail("%s (x%d) in auction %d: price cannot be determined",
+                    item->GetProto()->Name1, item->GetCount(), auctionIds[auction]);
+            continue;
+        }
+
+        entries.push_back(entry);
+    }
+    sort(entries.begin(), entries.end(), SortByPricePredicate());
+    return entries;
+}
+
+void AhBot::FindMinPrice(const AuctionHouseObject::AuctionEntryMap& auctionEntryMap, AuctionEntry*& entry, Item*& item, uint32* minBid,
+        uint32* minBuyout)
+{
+    *minBid = 0;
+    *minBuyout = 0;
+    for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = auctionEntryMap.begin();
+            itr != auctionEntryMap.end(); ++itr)
+    {
+        AuctionEntry *other = itr->second;
+        if (other->owner == entry->owner)
+            continue;
+
+        Item *otherItem = sAuctionMgr.GetAItem(other->itemGuidLow);
+        if (!otherItem || !otherItem->GetCount() || otherItem->GetProto()->ItemId != item->GetProto()->ItemId)
+            continue;
+
+        uint32 startbid = other->startbid / otherItem->GetCount() * item->GetCount();
+        uint32 bid = other->bid / otherItem->GetCount() * item->GetCount();
+        uint32 buyout = other->buyout / otherItem->GetCount() * item->GetCount();
+
+        if (!bid && startbid && (!*minBid || *minBid > startbid))
+            *minBid = startbid;
+
+        if (bid && (*minBid || *minBid > bid))
+            *minBid = bid;
+
+        if (buyout && (!*minBuyout || *minBuyout > buyout))
+            *minBuyout = buyout;
+    }
+}
+
+int AhBot::Answer(int auction, Category* category, ItemBag* inAuctionItems)
+{
+    const AuctionHouseEntry* ahEntry = sAuctionHouseStore.LookupEntry(auctionIds[auction]);
+    if (!ahEntry)
+        return 0;
+
+    int answered = 0;
+    AuctionHouseObject* auctionHouse = sAuctionMgr.GetAuctionsMap(ahEntry);
+    const AuctionHouseObject::AuctionEntryMap& auctionEntryMap = auctionHouse->GetAuctions();
+    int64 availableMoney = GetAvailableMoney(auctionIds[auction]);
+
+    vector<AuctionEntry*> entries = LoadAuctions(auctionEntryMap, category, auction);
+    for (vector<AuctionEntry*>::iterator itr = entries.begin(); itr != entries.end(); ++itr)
+    {
+        AuctionEntry *entry = *itr;
+
+        Item *item = sAuctionMgr.GetAItem(entry->itemGuidLow);
+        if (!item || !item->GetCount())
+            continue;
+
+        const ItemPrototype* proto = item->GetProto();
+        vector<uint32> items = availableItems.Get(category);
+        if (find(items.begin(), items.end(), proto->ItemId) == items.end())
+        {
+            sLog.outDetail("%s (x%d) in auction %d: unavailable item",
+                    item->GetProto()->Name1, item->GetCount(), auctionIds[auction]);
+            continue;
+        }
+
+        uint32 answerCount = GetAnswerCount(proto->ItemId, auctionIds[auction], sAhBotConfig.itemBuyInterval);
+        uint32 maxAnswerCount = category->GetMaxAllowedItemAuctionCount(proto);
+        if (maxAnswerCount && answerCount > maxAnswerCount)
+        {
+            sLog.outDetail("%s (x%d) in auction %d: answer count %d > %d (max)",
+                    item->GetProto()->Name1, item->GetCount(), auctionIds[auction], answerCount, maxAnswerCount);
+            continue;
+        }
+
+        if (proto->RequiredLevel > sAhBotConfig.maxRequiredLevel || proto->ItemLevel > sAhBotConfig.maxItemLevel)
+        {
+            sLog.outDetail("%s (x%d) in auction %d: above max required or item level",
+                    item->GetProto()->Name1, item->GetCount(), auctionIds[auction]);
+            continue;
+        }
+
+        uint32 price = category->GetPricingStrategy()->GetBuyPrice(proto, auctionIds[auction]);
+        if (!price)
+        {
+            sLog.outDetail("%s (x%d) in auction %d: cannot determine price",
+                    item->GetProto()->Name1, item->GetCount(), auctionIds[auction]);
+            continue;
+        }
+
+        uint32 bidPrice = item->GetCount() * price;
+        uint32 buyoutPrice = item->GetCount() * urand(price, 4 * price / 3);
+
+        uint32 curPrice = entry->bid;
+        if (!curPrice) curPrice = entry->startbid;
+        if (!curPrice) curPrice = entry->buyout;
+
+        if (curPrice > buyoutPrice)
+        {
+            sLog.outDetail("%s (x%d) in auction %d: price %d > %d (buyout price)",
+                    proto->Name1, item->GetCount(), auctionIds[auction], curPrice, buyoutPrice);
+            continue;
+        }
+
+        if (availableMoney < curPrice)
+        {
+            sLog.outDetail("%s (x%d) in auction %d: price %d > %d (available money)",
+                    proto->Name1, item->GetCount(), auctionIds[auction], curPrice, availableMoney);
+            continue;
+        }
+
+        uint32 minBid = 0, minBuyout = 0;
+        FindMinPrice(auctionEntryMap, entry, item, &minBid, &minBuyout);
+
+        if (minBid && entry->bid && minBid < entry->bid)
+        {
+            sLog.outDetail("%s (x%d) in auction %d: %d (bid) > %d (minBid)",
+                    proto->Name1, item->GetCount(), auctionIds[auction], entry->bid, minBid);
+            continue;
+        }
+
+        if (minBid && entry->startbid && minBid < entry->startbid)
+        {
+            sLog.outDetail("%s (x%d) in auction %d: %d (startbid) > %d (minBid)",
+                    proto->Name1, item->GetCount(), auctionIds[auction], entry->startbid, minBid);
+            continue;
+        }
+
+        double priceLevel = (double)curPrice / (double)buyoutPrice;
+        uint32 buytime = GetBuyTime(entry->Id, proto->ItemId, auctionIds[auction], category, priceLevel);
+        if (time(0) < buytime)
+        {
+            sLog.outDetail("%s (x%d) in auction %d: will buy/bid in %d seconds",
+                    proto->Name1, item->GetCount(), auctionIds[auction], buytime - time(0));
+            continue;
+        }
+
+        uint32 bidder = GetRandomBidder(auctionIds[auction]);
+        if (!bidder)
+        {
+            sLog.outError("No bidders for auction %d", auctionIds[auction]);
+            break;
+        }
+
+        entry->bidder = bidder;
+        entry->bid = curPrice + urand(1, 1 + bidPrice / 10);
+        availableMoney -= curPrice;
+
+        updateMarketPrice(item->GetProto()->ItemId, entry->buyout / item->GetCount(), auctionIds[auction]);
+
+        if ((entry->buyout && (entry->bid >= entry->buyout || 100 * (entry->buyout - entry->bid) / price < 25)) &&
+                !(minBuyout && entry->buyout && minBuyout < entry->buyout))
+        {
+            sLog.outDetail("AhBot %d won %s (x%d) in auction %d for %d",
+                    bidder, item->GetProto()->Name1, item->GetCount(), auctionIds[auction], entry->buyout);
+
+            entry->bid = entry->buyout;
+            entry->AuctionBidWinning(NULL);
+        }
+        else
+        {
+            sLog.outDetail("AhBot %d placed bid %d for %s (x%d) in auction %d",
+                    bidder, entry->bid, item->GetProto()->Name1, item->GetCount(), auctionIds[auction]);
+
+            CharacterDatabase.PExecute("UPDATE auction SET buyguid = '%u',lastbid = '%u' WHERE id = '%u'",
+                entry->bidder, entry->bid, entry->Id);
+            AddToHistory(entry, AHBOT_WON_BID);
+        }
+
+        CharacterDatabase.PExecute("DELETE FROM ahbot_history WHERE item = '%u' AND won = 4 AND auction_house = '%u' ",
+                proto->ItemId, factions[auctionIds[auction]]);
+
+        answered++;
+    }
+
+    return answered;
+}
+
+uint32 AhBot::GetTime(string category, uint32 id, uint32 auctionHouse, uint32 type)
+{
+    QueryResult* results = CharacterDatabase.PQuery("SELECT MAX(buytime) FROM ahbot_history WHERE item = '%u' AND won = '%u' AND auction_house = '%u' AND category = '%s'",
+        id, type, factions[auctionHouse], category.c_str());
+
+    if (!results)
+        return 0;
+
+    Field* fields = results->Fetch();
+    uint32 result = fields[0].GetUInt32();
+    delete results;
+
+    return result;
+}
+
+void AhBot::SetTime(string category, uint32 id, uint32 auctionHouse, uint32 type, uint32 value)
+{
+    CharacterDatabase.PExecute("DELETE FROM ahbot_history WHERE item = '%u' AND won = '%u' AND auction_house = '%u' AND category = '%s'",
+        id, type, factions[auctionHouse], category.c_str());
+
+    CharacterDatabase.PExecute("INSERT INTO ahbot_history (buytime, item, bid, buyout, category, won, auction_house) "
+        "VALUES ('%u', '%u', '%u', '%u', '%s', '%u', '%u')",
+        value, id, 0, 0,
+        category.c_str(), type, factions[auctionHouse]);
+}
+
+uint32 AhBot::GetBuyTime(uint32 entry, uint32 itemId, uint32 auctionHouse, Category*& category, double priceLevel)
+{
+    uint32 entryTime = GetTime("entry", entry, auctionHouse, AHBOT_WON_DELAY);
+    if (entryTime > time(0))
+        return entryTime;
+
+    uint32 result = entryTime;
+
+    string categoryName = category->GetName();
+    uint32 categoryTime = GetTime(categoryName, 0, auctionHouse, AHBOT_WON_DELAY);
+    uint32 itemTime = GetTime("item", itemId, auctionHouse, AHBOT_WON_DELAY);
+
+    if (categoryTime < time(0)) categoryTime = time(0);
+    if (itemTime < time(0)) itemTime = time(0);
+
+    double rarity = category->GetPricingStrategy()->GetRarityPriceMultiplier(itemId);
+    categoryTime += urand(sAhBotConfig.updateInterval, sAhBotConfig.itemBuyInterval / 2) * priceLevel / rarity;
+    itemTime += urand(sAhBotConfig.updateInterval, sAhBotConfig.itemBuyInterval) * priceLevel / rarity;
+    entryTime = max(categoryTime, itemTime);
+
+    SetTime(categoryName, 0, auctionHouse, AHBOT_WON_DELAY, categoryTime);
+    SetTime("item", itemId, auctionHouse, AHBOT_WON_DELAY, itemTime);
+    SetTime("entry", entry, auctionHouse, AHBOT_WON_DELAY, entryTime);
+
+    return result ? result : entryTime;
+}
+
+uint32 AhBot::GetSellTime(uint32 itemId, uint32 auctionHouse, Category*& category)
+{
+    uint32 itemSellTime = GetTime("item", itemId, auctionHouse, AHBOT_SELL_DELAY);
+    uint32 itemBuyTime = GetTime("item", itemId, auctionHouse, AHBOT_WON_DELAY);
+    uint32 itemTime = max(itemSellTime, itemBuyTime);
+
+    if (itemTime > time(0))
+        return itemTime;
+
+    uint32 result = itemTime;
+
+    string categoryName = category->GetName();
+    uint32 categorySellTime = GetTime(categoryName, 0, auctionHouse, AHBOT_SELL_DELAY);
+    uint32 categoryBuyTime = GetTime(categoryName, 0, auctionHouse, AHBOT_WON_DELAY);
+    uint32 categoryTime = max(categorySellTime, categoryBuyTime);
+
+    if (categoryTime < time(0)) categoryTime = time(0);
+    if (itemTime < time(0)) itemTime = time(0);
+
+    double rarity = category->GetPricingStrategy()->GetRarityPriceMultiplier(itemId);
+    categoryTime += urand(sAhBotConfig.updateInterval, sAhBotConfig.itemSellInterval / 2) * rarity;
+    itemTime += urand(sAhBotConfig.updateInterval, sAhBotConfig.itemSellInterval) * rarity;
+    itemTime = max(itemTime, categoryTime);
+
+    SetTime(categoryName, 0, auctionHouse, AHBOT_SELL_DELAY, categoryTime);
+    SetTime("item", itemId, auctionHouse, AHBOT_SELL_DELAY, itemTime);
+
+    return result ? result : itemTime;
+}
+
+int AhBot::AddAuctions(int auction, Category* category, ItemBag* inAuctionItems)
+{
+    vector<uint32>& inAuction = inAuctionItems->Get(category);
+
+    int32 maxAllowedAuctionCount = categoryMaxAuctionCount[category->GetName()];
+    if (inAuctionItems->GetCount(category) >= maxAllowedAuctionCount)
+        return 0;
+
+    int added = 0;
+    vector<uint32> available = availableItems.Get(category);
+    for (int32 i = 0; i <= maxAllowedAuctionCount && available.size() > 0 && inAuctionItems->GetCount(category) < maxAllowedAuctionCount; ++i)
+    {
+        uint32 index = urand(0, available.size() - 1);
+        uint32 itemId = available[index];
+
+        ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+        if (!proto)
+            continue;
+
+        int32 maxAllowedItems = category->GetMaxAllowedItemAuctionCount(proto);
+        if (maxAllowedItems && inAuctionItems->GetCount(category, proto->ItemId) >= maxAllowedItems)
+            continue;
+
+        uint32 sellTime = GetSellTime(proto->ItemId, auctionIds[auction], category);
+        if (time(0) < sellTime)
+        {
+            sLog.outDetail("%s in auction %d: will add in %d seconds",
+                    proto->Name1, auctionIds[auction], sellTime - time(0));
+            continue;
+        }
+        else if (time(0) - sellTime > sAhBotConfig.maxSellInterval)
+        {
+            sLog.outDetail("%s in auction %d: too old (%d secs)",
+                    proto->Name1, auctionIds[auction], time(0) - sellTime);
+            continue;
+        }
+
+        inAuctionItems->Add(proto);
+        added += AddAuction(auction, category, proto);
+    }
+
+    return added;
+}
+
+int AhBot::AddAuction(int auction, Category* category, ItemPrototype const* proto)
+{
+    Item* item = Item::CreateItem(proto->ItemId, 1, NULL);
+    if (!item)
+        return 0;
+
+    uint32 randomPropertyId = Item::GenerateItemRandomPropertyId(proto->ItemId);
+    if (randomPropertyId)
+        item->SetItemRandomProperties(randomPropertyId);
+
+    uint32 price = category->GetPricingStrategy()->GetSellPrice(proto, auctionIds[auction]);
+
+    sLog.outDebug("AddAuction: market price adjust");
+    updateMarketPrice(proto->ItemId, price, auctionIds[auction]);
+
+    price = category->GetPricingStrategy()->GetBuyPrice(proto, auctionIds[auction]);
+
+    uint32 stackCount = category->GetStackCount(proto);
+    if (!price || !stackCount)
+        return 0;
+
+    if (urand(0, 100) <= sAhBotConfig.underPriceProbability * 100)
+        price = price * 100 / urand(100, 200);
+
+    uint32 bidPrice = stackCount * price;
+    uint32 buyoutPrice = stackCount * urand(price, 4 * price / 3);
+    item->SetCount(stackCount);
+
+    AuctionHouseEntry const* ahEntry = sAuctionHouseStore.LookupEntry(auctionIds[auction]);
+    if(!ahEntry)
+        return 0;
+
+    AuctionHouseObject* auctionHouse = sAuctionMgr.GetAuctionsMap(ahEntry);
+
+    uint32 owner = GetRandomBidder(auctionIds[auction]);
+    if (!owner)
+    {
+        sLog.outError("No bidders for auction %d", auctionIds[auction]);
+        return 0;
+    }
+
+    AuctionEntry* auctionEntry = new AuctionEntry;
+    auctionEntry->Id = sObjectMgr.GenerateAuctionID();
+    auctionEntry->itemGuidLow = item->GetGUIDLow();
+    auctionEntry->itemTemplate = item->GetEntry();
+    auctionEntry->owner = owner;
+    auctionEntry->startbid = bidPrice;
+    auctionEntry->buyout = buyoutPrice;
+    auctionEntry->bidder = 0;
+    auctionEntry->bid = 0;
+    auctionEntry->deposit = 0;
+    auctionEntry->expireTime = (time_t) (urand(8, 24) * 60 * 60 + time(NULL));
+    auctionEntry->moneyDeliveryTime = 0;
+    auctionEntry->auctionHouseEntry = ahEntry;
+    item->SaveToDB();
+
+    sAuctionMgr.AddAItem(item);
+
+    auctionHouse->AddAuction(auctionEntry);
+    auctionEntry->SaveToDB();
+
+    sLog.outDetail("AhBot %d added %d of %s to auction %d for %d..%d", owner, stackCount, proto->Name1, auctionIds[auction], bidPrice, buyoutPrice);
+    return 1;
+}
+
+void AhBot::HandleCommand(string command)
+{
+    if (!sAhBotConfig.enabled)
+        return;
+
+    if (command == "expire")
+    {
+        for (int i = 0; i < MAX_AUCTIONS; i++)
+            Expire(i);
+
+        return;
+    }
+
+    if (command == "stats")
+    {
+        for (int i = 0; i < MAX_AUCTIONS; i++)
+            PrintStats(i);
+
+        return;
+    }
+
+    if (command == "update")
+    {
+        AhbotThread *thread = new AhbotThread(this);
+        thread->activate();
+        return;
+    }
+
+    uint32 itemId = atoi(command.c_str());
+    if (!itemId)
+    {
+        sLog.outString("ahbot stats - show short summary");
+        sLog.outString("ahbot expire - expire all auctions");
+        sLog.outString("ahbot update - update all auctions");
+        sLog.outString("ahbot <itemId> - show item price");
+        return;
+    }
+
+    ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+    if (!proto)
+        return;
+
+    for (int i=0; i<CategoryList::instance.size(); i++)
+    {
+        Category* category = CategoryList::instance[i];
+        if (category->Contains(proto))
+        {
+            vector<uint32> items = availableItems.Get(category);
+            if (find(items.begin(), items.end(), proto->ItemId) == items.end())
+                continue;
+
+            ostringstream out;
+            out << proto->Name1 << " (" << category->GetDisplayName() << "), "
+                    << category->GetMaxAllowedAuctionCount() << "x" << category->GetMaxAllowedItemAuctionCount(proto)
+                    << "x" << category->GetStackCount(proto) << " max"
+                    << "\n";
+            for (int auction = 0; auction < MAX_AUCTIONS; auction++)
+            {
+                const AuctionHouseEntry* ahEntry = sAuctionHouseStore.LookupEntry(auctionIds[auction]);
+                out << "--- auction house " << auctionIds[auction] << "(faction: " << factions[auctionIds[auction]] << ", money: "
+                    << GetAvailableMoney(auctionIds[auction])
+                    << ") ---\n";
+
+                out << "sell: " << category->GetPricingStrategy()->GetSellPrice(proto, auctionIds[auction])
+                    << " ("  << category->GetPricingStrategy()->ExplainSellPrice(proto, auctionIds[auction]) << ")"
+                    << "\n";
+
+                out << "buy: " << category->GetPricingStrategy()->GetBuyPrice(proto, auctionIds[auction])
+                    << " ("  << category->GetPricingStrategy()->ExplainBuyPrice(proto, auctionIds[auction]) << ")"
+                    << "\n";
+            }
+            sLog.outString(out.str().c_str());
+            break;
+        }
+    }
+}
+
+void AhBot::Expire(int auction)
+{
+    if (!sAhBotConfig.enabled)
+        return;
+
+    AuctionHouseEntry const* ahEntry = sAuctionHouseStore.LookupEntry(auctionIds[auction]);
+    if(!ahEntry)
+        return;
+
+    AuctionHouseObject* auctionHouse = sAuctionMgr.GetAuctionsMap(ahEntry);
+
+    AuctionHouseObject::AuctionEntryMap const& auctions = auctionHouse->GetAuctions();
+    AuctionHouseObject::AuctionEntryMap::const_iterator itr = auctions.begin();
+
+    int count = 0;
+    while (itr != auctions.end())
+    {
+        if (IsBotAuction(itr->second->owner))
+        {
+            itr->second->expireTime = sWorld.GetGameTime();
+            count++;
+        }
+
+        ++itr;
+    }
+
+    CharacterDatabase.PExecute("DELETE FROM ahbot_category");
+    sLog.outString("%d auctions marked as expired in auction %d", count, auctionIds[auction]);
+}
+
+void AhBot::PrintStats(int auction)
+{
+    if (!sAhBotConfig.enabled)
+        return;
+
+    AuctionHouseEntry const* ahEntry = sAuctionHouseStore.LookupEntry(auctionIds[auction]);
+    if(!ahEntry)
+        return;
+
+    AuctionHouseObject* auctionHouse = sAuctionMgr.GetAuctionsMap(ahEntry);
+    AuctionHouseObject::AuctionEntryMap const& auctions = auctionHouse->GetAuctions();
+
+    sLog.outString("%d auctions available on auction house %d", auctions.size(), auctionIds[auction]);
+}
+
+void AhBot::AddToHistory(AuctionEntry* entry, uint32 won)
+{
+    if (!sAhBotConfig.enabled || !entry)
+        return;
+
+    if (!IsBotAuction(entry->owner) && !IsBotAuction(entry->bidder))
+        return;
+
+    ItemPrototype const* proto = sObjectMgr.GetItemPrototype(entry->itemTemplate);
+    if (!proto)
+        return;
+
+    string category = "";
+    for (int i = 0; i < CategoryList::instance.size(); i++)
+    {
+        if (CategoryList::instance[i]->Contains(proto))
+        {
+            category = CategoryList::instance[i]->GetName();
+            break;
+        }
+    }
+
+    if (!won)
+    {
+        won = AHBOT_WON_PLAYER;
+        if (IsBotAuction(entry->bidder))
+            won = AHBOT_WON_SELF;
+    }
+
+    sLog.outDebug("AddToHistory: market price adjust");
+    int count = entry->itemCount ? entry->itemCount : 1;
+    updateMarketPrice(proto->ItemId, entry->buyout / count, entry->auctionHouseEntry->houseId);
+
+    uint32 now = time(0);
+    CharacterDatabase.PExecute("INSERT INTO ahbot_history (buytime, item, bid, buyout, category, won, auction_house) "
+        "VALUES ('%u', '%u', '%u', '%u', '%s', '%u', '%u')",
+        now, entry->itemTemplate, entry->bid ? entry->bid : entry->startbid, entry->buyout,
+        category.c_str(), won, factions[entry->auctionHouseEntry->houseId]);
+}
+
+uint32 AhBot::GetAnswerCount(uint32 itemId, uint32 auctionHouse, uint32 withinTime)
+{
+    uint32 count = 0;
+
+    QueryResult* results = CharacterDatabase.PQuery("SELECT COUNT(*) FROM ahbot_history WHERE "
+        "item = '%u' AND won in (2, 3) AND auction_house = '%u' AND buytime > '%u'",
+        itemId, factions[auctionHouse], time(0) - withinTime);
+    if (results)
+    {
+        do
+        {
+            Field* fields = results->Fetch();
+            count = fields[0].GetUInt32();
+        } while (results->NextRow());
+
+        delete results;
+    }
+
+    return count;
+}
+
+void AhBot::CleanupHistory()
+{
+    uint32 when = time(0) - 3600 * 24 * sAhBotConfig.historyDays;
+    CharacterDatabase.PExecute("DELETE FROM ahbot_history WHERE buytime < '%u'", when);
+}
+
+uint32 AhBot::GetAvailableMoney(uint32 auctionHouse)
+{
+    int64 result = sAhBotConfig.alwaysAvailableMoney;
+
+    map<uint32, uint32> data;
+    data[AHBOT_WON_PLAYER] = 0;
+    data[AHBOT_WON_SELF] = 0;
+
+    const AuctionHouseEntry* ahEntry = sAuctionHouseStore.LookupEntry(auctionHouse);
+    QueryResult* results = CharacterDatabase.PQuery(
+        "SELECT won, SUM(bid) FROM ahbot_history WHERE auction_house = '%u' GROUP BY won HAVING won > 0 ORDER BY won",
+        factions[auctionHouse]);
+    if (results)
+    {
+        do
+        {
+            Field* fields = results->Fetch();
+            data[fields[0].GetUInt32()] = fields[1].GetUInt32();
+
+        } while (results->NextRow());
+
+        delete results;
+    }
+
+    results = CharacterDatabase.PQuery(
+        "SELECT max(buytime) FROM ahbot_history WHERE auction_house = '%u' AND won = '2'",
+        factions[auctionHouse]);
+    if (results)
+    {
+        Field* fields = results->Fetch();
+        uint32 lastBuyTime = fields[0].GetUInt32();
+        uint32 now = time(0);
+        if (lastBuyTime && now > lastBuyTime)
+        result += (now - lastBuyTime) / 3600 / 24 * sAhBotConfig.alwaysAvailableMoney;
+
+        delete results;
+    }
+
+    AuctionHouseObject::AuctionEntryMap const& auctionEntryMap = sAuctionMgr.GetAuctionsMap(ahEntry)->GetAuctions();
+    for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = auctionEntryMap.begin(); itr != auctionEntryMap.end(); ++itr)
+    {
+        AuctionEntry *entry = itr->second;
+        if (!IsBotAuction(entry->bidder))
+            continue;
+
+        result -= entry->bid;
+    }
+
+    result += (data[AHBOT_WON_PLAYER] - data[AHBOT_WON_SELF]);
+    return result < 0 ? 0 : (uint32)result;
+}
+
+void AhBot::CheckCategoryMultipliers()
+{
+    QueryResult* results = CharacterDatabase.PQuery("SELECT category, multiplier, max_auction_count, expire_time FROM ahbot_category");
+    if (results)
+    {
+        do
+        {
+            Field* fields = results->Fetch();
+            categoryMultipliers[fields[0].GetCppString()] = fields[1].GetFloat();
+            categoryMaxAuctionCount[fields[0].GetCppString()] = fields[2].GetInt32();
+            categoryMultiplierExpireTimes[fields[0].GetCppString()] = fields[3].GetUInt64();
+
+        } while (results->NextRow());
+
+        delete results;
+    }
+
+    CharacterDatabase.PExecute("DELETE FROM ahbot_category");
+
+    for (int i = 0; i < CategoryList::instance.size(); i++)
+    {
+        string name = CategoryList::instance[i]->GetName();
+        if (categoryMultiplierExpireTimes[name] <= time(0) || categoryMultipliers[name] <= 0)
+        {
+            categoryMultipliers[name] = (double)urand(20, 100) / 20.0;
+            uint32 maxAllowedAuctionCount = CategoryList::instance[i]->GetMaxAllowedAuctionCount();
+            categoryMaxAuctionCount[name] = urand(maxAllowedAuctionCount / 2, maxAllowedAuctionCount);
+            categoryMultiplierExpireTimes[name] = time(0) + urand(4, 7) * 3600 * 24;
+        }
+
+        CharacterDatabase.PExecute("INSERT INTO ahbot_category (category, multiplier, max_auction_count, expire_time) "
+                "VALUES ('%s', '%f', '%u', '%u')",
+                name.c_str(), categoryMultipliers[name], categoryMaxAuctionCount[name], categoryMultiplierExpireTimes[name]);
+    }
+}
+
+
+void AhBot::updateMarketPrice(uint32 itemId, double price, uint32 auctionHouse)
+{
+    double marketPrice = 0;
+
+    QueryResult* results = CharacterDatabase.PQuery("SELECT price FROM ahbot_price WHERE item = '%u' AND auction_house = '%u'", itemId, auctionHouse);
+    if (results)
+    {
+        marketPrice = results->Fetch()[0].GetFloat();
+        delete results;
+    }
+
+    if (marketPrice > 0)
+        marketPrice = (marketPrice + price) / 2;
+    else
+        marketPrice = price;
+
+    CharacterDatabase.PExecute("DELETE FROM ahbot_price WHERE item = '%u' AND auction_house = '%u'", itemId, auctionHouse);
+    CharacterDatabase.PExecute("INSERT INTO ahbot_price (item, price, auction_house) VALUES ('%u', '%lf', '%u')", itemId, marketPrice, auctionHouse);
+}
+
+bool AhBot::IsBotAuction(uint32 bidder)
+{
+    return allBidders.find(bidder) != allBidders.end();
+}
+
+uint32 AhBot::GetRandomBidder(uint32 auctionHouse)
+{
+    vector<uint32> guids = bidders[factions[auctionHouse]];
+    if (guids.empty())
+        return 0;
+
+    int index = urand(0, guids.size() - 1);
+    return guids[index];
+}
+
+void AhBot::LoadRandomBots()
+{
+    for (list<uint32>::iterator i = sPlayerbotAIConfig.randomBotAccounts.begin(); i != sPlayerbotAIConfig.randomBotAccounts.end(); i++)
+    {
+        uint32 accountId = *i;
+        if (!sAccountMgr.GetCharactersCount(accountId))
+            continue;
+
+        QueryResult *result = CharacterDatabase.PQuery("SELECT guid, race FROM characters WHERE account = '%u'", accountId);
+        if (!result)
+            continue;
+
+        do
+        {
+            Field* fields = result->Fetch();
+            uint32 guid = fields[0].GetUInt32();
+            uint32 race = fields[1].GetUInt32();
+            uint32 auctionHouse = PlayerbotAI::IsOpposing(race, RACE_HUMAN) ? 2 : 1;
+            bidders[auctionHouse].push_back(guid);
+            bidders[3].push_back(guid);
+            allBidders.insert(guid);
+        } while (result->NextRow());
+        delete result;
+    }
+
+    if (allBidders.empty() && sAhBotConfig.guid)
+    {
+        uint32 guid = sAhBotConfig.guid;
+        allBidders.insert(guid);
+        for (int i = 1; i <= 3; i++)
+        {
+            bidders[i].push_back(guid);
+        }
+    }
+
+    sLog.outDetail("{A=%d,H=%d,N=%d} bidders loaded", bidders[1].size(), bidders[2].size(), bidders[3].size());
+}
+
+int32 AhBot::GetSellPrice(ItemPrototype const* proto)
+{
+    if (!sAhBotConfig.enabled)
+        return 0;
+
+    int32 maxPrice = 0;
+    for (int i=0; i<CategoryList::instance.size(); i++)
+    {
+        Category* category = CategoryList::instance[i];
+        if (!category->Contains(proto))
+            continue;
+
+        for (int auction = 0; auction < MAX_AUCTIONS; auction++)
+        {
+            int32 price = (int32)category->GetPricingStrategy()->GetSellPrice(proto, auctionIds[auction]);
+            if (!price)
+                price = (int32)category->GetPricingStrategy()->GetBuyPrice(proto, auctionIds[auction]);
+
+            if (price > maxPrice)
+                maxPrice = price;
+        }
+    }
+
+    return maxPrice;
+}
+
+int32 AhBot::GetBuyPrice(ItemPrototype const* proto)
+{
+    if (!sAhBotConfig.enabled)
+        return 0;
+
+    int32 maxPrice = 0;
+    for (int i=0; i<CategoryList::instance.size(); i++)
+    {
+        Category* category = CategoryList::instance[i];
+        if (!category->Contains(proto))
+            continue;
+
+        for (int auction = 0; auction < MAX_AUCTIONS; auction++)
+        {
+            int32 price = (int32)category->GetPricingStrategy()->GetBuyPrice(proto, auctionIds[auction]);
+            if (!price)
+                continue;
+
+            if (price > maxPrice)
+                maxPrice = price;
+        }
+    }
+
+    return maxPrice;
+}
+
+double AhBot::GetRarityPriceMultiplier(const ItemPrototype* proto)
+{
+    if (!sAhBotConfig.enabled)
+        return 1.0;
+
+    for (int i=0; i<CategoryList::instance.size(); i++)
+    {
+        Category* category = CategoryList::instance[i];
+        if (!category->Contains(proto))
+            continue;
+
+        return category->GetPricingStrategy()->GetRarityPriceMultiplier(proto->ItemId);
+    }
+
+    return 1.0;
+
+}
diff --git a/src/game/ahbot/AhBot.h b/src/game/ahbot/AhBot.h
new file mode 100644
index 00000000000..171b3e42e03
--- /dev/null
+++ b/src/game/ahbot/AhBot.h
@@ -0,0 +1,86 @@
+#pragma once;
+
+#include "Category.h"
+#include "ItemBag.h"
+#include "../playerbot/PlayerbotAIBase.h"
+#include "../AuctionHouseMgr.h"
+#include "../ObjectGuid.h"
+#include "../WorldSession.h"
+
+#define MAX_AUCTIONS 7
+#define AHBOT_WON_EXPIRE 0
+#define AHBOT_WON_PLAYER 1
+#define AHBOT_WON_SELF 2
+#define AHBOT_WON_BID 3
+#define AHBOT_WON_DELAY 4
+#define AHBOT_SELL_DELAY 5
+
+namespace ahbot
+{
+    using namespace std;
+
+    class AhBot
+    {
+    public:
+        AhBot() : nextAICheckTime(0), updating(false) {}
+        virtual ~AhBot();
+
+    public:
+        ObjectGuid GetAHBplayerGUID();
+        void Init();
+        void Update();
+        void ForceUpdate();
+        void HandleCommand(string command);
+        void Won(AuctionEntry* entry) { AddToHistory(entry); }
+        void Expired(AuctionEntry* entry) {}
+
+        double GetCategoryMultiplier(string category)
+        {
+            return categoryMultipliers[category];
+        }
+
+        int32 GetSellPrice(const ItemPrototype* proto);
+        int32 GetBuyPrice(const ItemPrototype* proto);
+        double GetRarityPriceMultiplier(const ItemPrototype* proto);
+
+    private:
+        int Answer(int auction, Category* category, ItemBag* inAuctionItems);
+        int AddAuctions(int auction, Category* category, ItemBag* inAuctionItems);
+        int AddAuction(int auction, Category* category, const ItemPrototype* proto);
+        void Expire(int auction);
+        void PrintStats(int auction);
+        void AddToHistory(AuctionEntry* entry, uint32 won = 0);
+        void CleanupHistory();
+        uint32 GetAvailableMoney(uint32 auctionHouse);
+        void CheckCategoryMultipliers();
+        void updateMarketPrice(uint32 itemId, double price, uint32 auctionHouse);
+        bool IsBotAuction(uint32 bidder);
+        uint32 GetRandomBidder(uint32 auctionHouse);
+        void LoadRandomBots();
+        uint32 GetAnswerCount(uint32 itemId, uint32 auctionHouse, uint32 withinTime);
+        vector<AuctionEntry*> LoadAuctions(const AuctionHouseObject::AuctionEntryMap& auctionEntryMap, Category*& category,
+                int& auction);
+        void FindMinPrice(const AuctionHouseObject::AuctionEntryMap& auctionEntryMap, AuctionEntry*& entry, Item*& item, uint32* minBid,
+                uint32* minBuyout);
+        uint32 GetBuyTime(uint32 entry, uint32 itemId, uint32 auctionHouse, Category*& category, double priceLevel);
+        uint32 GetTime(string category, uint32 id, uint32 auctionHouse, uint32 type);
+        void SetTime(string category, uint32 id, uint32 auctionHouse, uint32 type, uint32 value);
+        uint32 GetSellTime(uint32 itemId, uint32 auctionHouse, Category*& category);
+
+    public:
+        static uint32 auctionIds[MAX_AUCTIONS];
+        static map<uint32, uint32> factions;
+
+    private:
+        AvailableItemsBag availableItems;
+        time_t nextAICheckTime;
+        map<string, double> categoryMultipliers;
+        map<string, uint32> categoryMaxAuctionCount;
+        map<string, uint64> categoryMultiplierExpireTimes;
+        map<uint32, vector<uint32> > bidders;
+        set<uint32> allBidders;
+        bool updating;
+    };
+};
+
+#define auctionbot MaNGOS::Singleton<ahbot::AhBot>::Instance()
diff --git a/src/game/ahbot/AhBotConfig.cpp b/src/game/ahbot/AhBotConfig.cpp
new file mode 100644
index 00000000000..83e87f4cc12
--- /dev/null
+++ b/src/game/ahbot/AhBotConfig.cpp
@@ -0,0 +1,58 @@
+#include "../pchdef.h"
+#include "AhBotConfig.h"
+#include "SystemConfig.h"
+std::vector<std::string> split(const std::string &s, char delim);
+
+using namespace std;
+
+INSTANTIATE_SINGLETON_1(AhBotConfig);
+
+AhBotConfig::AhBotConfig()
+{
+}
+
+template <class T>
+void LoadSet(string value, T &res)
+{
+    vector<string> ids = split(value, ',');
+    for (vector<string>::iterator i = ids.begin(); i != ids.end(); i++)
+    {
+        uint32 id = atoi((*i).c_str());
+        if (!id)
+            continue;
+
+        res.insert(id);
+    }
+}
+
+bool AhBotConfig::Initialize()
+{
+    if (!config.SetSource(_AUCTIONHOUSEBOT_CONFIG))
+    {
+        sLog.outString("AhBot is Disabled. Unable to open configuration file ahbot.conf");
+        return false;
+    }
+
+    enabled = config.GetBoolDefault("AhBot.Enabled", true);
+
+    if (!enabled)
+        sLog.outString("AhBot is Disabled in ahbot.conf");
+
+    guid = (uint64)config.GetIntDefault("AhBot.GUID", 0);
+    updateInterval = config.GetIntDefault("AhBot.UpdateIntervalInSeconds", 300);
+    historyDays = config.GetIntDefault("AhBot.History.Days", 30);
+    itemBuyInterval = config.GetIntDefault("AhBot.ItemBuyInterval", 28800);
+    itemSellInterval = config.GetIntDefault("AhBot.ItemSellInterval", 14400);
+    maxSellInterval = config.GetIntDefault("AhBot.MaxSellInterval", 3600 * 8);
+    alwaysAvailableMoney = config.GetIntDefault("AhBot.AlwaysAvailableMoney", 200000);
+    priceMultiplier = config.GetFloatDefault("AhBot.PriceMultiplier", 1.0f);
+    defaultMinPrice = config.GetIntDefault("AhBot.DefaultMinPrice", 20);
+    maxItemLevel = config.GetIntDefault("AhBot.MaxItemLevel", 199);
+    maxRequiredLevel = config.GetIntDefault("AhBot.MaxRequiredLevel", 80);
+    priceQualityMultiplier = config.GetFloatDefault("AhBot.PriceQualityMultiplier", 1.0f);
+    underPriceProbability = config.GetFloatDefault("AhBot.UnderPriceProbability", 0.05f);
+    LoadSet<set<uint32> >(config.GetStringDefault("AhBot.IgnoreItemIds", "49283,52200,8494,6345,6891,2460,37164,34835"), ignoreItemIds);
+
+
+    return enabled;
+}
diff --git a/src/game/ahbot/AhBotConfig.h b/src/game/ahbot/AhBotConfig.h
new file mode 100644
index 00000000000..68f7d4fff2d
--- /dev/null
+++ b/src/game/ahbot/AhBotConfig.h
@@ -0,0 +1,86 @@
+#pragma once
+
+#include "../../shared/Config/Config.h"
+
+using namespace std;
+
+class AhBotConfig
+{
+public:
+    AhBotConfig();
+
+public:
+    bool Initialize();
+
+    bool enabled;
+    uint64 guid;
+    uint32 updateInterval;
+    uint32 historyDays, itemBuyInterval, itemSellInterval, maxSellInterval;
+    uint32 alwaysAvailableMoney;
+    float priceMultiplier, priceQualityMultiplier;
+    uint32 defaultMinPrice;
+    uint32 maxItemLevel, maxRequiredLevel;
+    float underPriceProbability;
+    std::set<uint32> ignoreItemIds;
+
+    float GetSellPriceMultiplier(string category)
+    {
+        return GetCategoryParameter(sellPriceMultipliers, "PriceMultiplier.Sell", category, 1.0f);
+    }
+
+    float GetBuyPriceMultiplier(string category)
+    {
+        return GetCategoryParameter(buyPriceMultipliers, "PriceMultiplier.Buy", category, 1.0f);
+    }
+
+    float GetItemPriceMultiplier(string name)
+    {
+        return GetCategoryParameter(itemPriceMultipliers, "PriceMultiplier.Item", name, 1.0f);
+    }
+
+    int32 GetMaxAllowedAuctionCount(string category)
+    {
+        return (int32)GetCategoryParameter(maxAuctionCount, "MaxAuctionCount", category, 5);
+    }
+
+    std::string GetStringDefault(const char* name, const char* def)
+    {
+        return config.GetStringDefault(name, def);
+    }
+
+    bool GetBoolDefault(const char* name, const bool def = false)
+    {
+        return config.GetBoolDefault(name, def);
+    }
+
+    int32 GetIntDefault(const char* name, const int32 def)
+    {
+        return config.GetIntDefault(name, def);
+    }
+
+    float GetFloatDefault(const char* name, const float def)
+    {
+        return config.GetFloatDefault(name, def);
+    }
+
+private:
+    float GetCategoryParameter(map<string, float>& cache, string type, string category, float defaultValue)
+    {
+        if (cache.find(category) == cache.end())
+        {
+            ostringstream out; out << "AhBot."<< type << "." << category;
+            cache[category] = config.GetFloatDefault(out.str().c_str(), defaultValue);
+        }
+
+        return cache[category];
+    }
+
+private:
+    Config config;
+    map<string, float> sellPriceMultipliers;
+    map<string, float> buyPriceMultipliers;
+    map<string, float> itemPriceMultipliers;
+    map<string, float> maxAuctionCount;
+};
+
+#define sAhBotConfig MaNGOS::Singleton<AhBotConfig>::Instance()
diff --git a/src/game/ahbot/Category.cpp b/src/game/ahbot/Category.cpp
new file mode 100644
index 00000000000..507b34f5a47
--- /dev/null
+++ b/src/game/ahbot/Category.cpp
@@ -0,0 +1,75 @@
+#include "Category.h"
+#include "ItemBag.h"
+#include "AhBotConfig.h"
+#include "PricingStrategy.h"
+
+using namespace ahbot;
+
+uint32 Category::GetStackCount(ItemPrototype const* proto)
+{
+    if (proto->Quality > ITEM_QUALITY_UNCOMMON)
+        return 1;
+
+    return urand(1, proto->GetMaxStackSize());
+}
+
+uint32 Category::GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+{
+    return 0;
+}
+
+uint32 Category::GetMaxAllowedAuctionCount()
+{
+    return sAhBotConfig.GetMaxAllowedAuctionCount(GetName());
+}
+
+PricingStrategy* Category::GetPricingStrategy()
+{
+    if (pricingStrategy)
+        return pricingStrategy;
+
+    ostringstream out; out << "AhBot.PricingStrategy." << GetName();
+    string name = sAhBotConfig.GetStringDefault(out.str().c_str(), "default");
+    return pricingStrategy = PricingStrategyFactory::Create(name, this);
+}
+
+QualityCategoryWrapper::QualityCategoryWrapper(Category* category, uint32 quality) : Category(), quality(quality), category(category)
+{
+    ostringstream out; out << category->GetName() << ".";
+    switch (quality)
+    {
+    case ITEM_QUALITY_POOR:
+        out << "gray";
+        break;
+    case ITEM_QUALITY_NORMAL:
+        out << "white";
+        break;
+    case ITEM_QUALITY_UNCOMMON:
+        out << "green";
+        break;
+    case ITEM_QUALITY_RARE:
+        out << "blue";
+        break;
+    default:
+        out << "epic";
+        break;
+    }
+
+    combinedName = out.str();
+}
+
+bool QualityCategoryWrapper::Contains(ItemPrototype const* proto)
+{
+    return proto->Quality == quality && category->Contains(proto);
+}
+
+uint32 QualityCategoryWrapper::GetMaxAllowedAuctionCount()
+{
+    uint32 count = sAhBotConfig.GetMaxAllowedAuctionCount(combinedName);
+    return count > 0 ? count : category->GetMaxAllowedAuctionCount();
+}
+
+uint32 QualityCategoryWrapper::GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+{
+    return category->GetMaxAllowedItemAuctionCount(proto);
+}
diff --git a/src/game/ahbot/Category.h b/src/game/ahbot/Category.h
new file mode 100644
index 00000000000..e12bb1dc4a5
--- /dev/null
+++ b/src/game/ahbot/Category.h
@@ -0,0 +1,357 @@
+#pragma once;
+#include "Config/Config.h"
+#include "PricingStrategy.h"
+#include "../ItemPrototype.h"
+#include "../SharedDefines.h"
+#include "../../shared/Util.h"
+
+using namespace std;
+
+namespace ahbot
+{
+    class Category
+    {
+    public:
+        Category() : pricingStrategy(NULL) {}
+        virtual ~Category() { if (pricingStrategy) delete pricingStrategy; }
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto) { return false; }
+        virtual string GetName() { return "default"; }
+        virtual string GetDisplayName() { return GetName(); }
+
+        virtual uint32 GetMaxAllowedAuctionCount();
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto);
+        virtual uint32 GetStackCount(ItemPrototype const* proto);
+
+        virtual PricingStrategy* GetPricingStrategy();
+
+    private:
+        PricingStrategy *pricingStrategy;
+    };
+
+    class Consumable : public Category
+    {
+    public:
+        Consumable() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_CONSUMABLE;
+        }
+
+        virtual string GetName() { return "consumable"; }
+
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+        {
+            return 10;
+        }
+
+        virtual uint32 GetStackCount(ItemPrototype const* proto)
+        {
+            if (proto->Quality > ITEM_QUALITY_UNCOMMON)
+                return 1;
+
+            uint32 maxStackSize = proto->GetMaxStackSize();
+            if (maxStackSize == 1)
+                return 1;
+
+            if (maxStackSize <= 10)
+                return urand(1, 10);
+
+            return urand(1, 4) * maxStackSize / 5;
+        }
+    };
+
+    class Quest : public Category
+    {
+    public:
+        Quest() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_QUEST;
+        }
+        virtual string GetName() { return "quest"; }
+
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+        {
+            return 5;
+        }
+
+        virtual uint32 GetStackCount(ItemPrototype const* proto)
+        {
+            if (proto->Quality > ITEM_QUALITY_UNCOMMON)
+                return 1;
+
+            uint32 maxStackSize = proto->GetMaxStackSize();
+            if (proto->Quality == ITEM_QUALITY_UNCOMMON && maxStackSize > 10)
+                maxStackSize = urand(1, 10);
+
+            if (maxStackSize > 20)
+                maxStackSize = urand(1, 20);
+
+            return maxStackSize;
+        }
+    };
+
+    class Trade : public Category
+    {
+    public:
+        Trade() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_TRADE_GOODS;
+        }
+        virtual string GetName() { return "trade"; }
+
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+        {
+            return 5;
+        }
+
+        virtual uint32 GetStackCount(ItemPrototype const* proto)
+        {
+            uint32 maxStack = proto->GetMaxStackSize();
+            if (maxStack < 2)
+                return maxStack;
+
+            switch (proto->Quality)
+            {
+            case ITEM_QUALITY_NORMAL:
+                return maxStack;
+            case ITEM_QUALITY_UNCOMMON:
+                return urand(1, maxStack);
+            }
+
+            return 1;
+        }
+    };
+
+    class Enchant : public Category
+    {
+    public:
+        Enchant() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_PERMANENT && proto->ItemLevel > 1;
+        }
+        virtual string GetName() { return "enchant"; }
+
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+        {
+            return 5;
+        }
+
+        virtual uint32 GetStackCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+    };
+
+    class Reagent : public Category
+    {
+    public:
+        Reagent() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_REAGENT && proto->ItemLevel > 1;
+        }
+        virtual string GetName() { return "reagent"; }
+    };
+
+    class Recipe : public Category
+    {
+    public:
+        Recipe() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_RECIPE && proto->ItemLevel > 1;
+        }
+        virtual string GetName() { return "recipe"; }
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+
+        virtual uint32 GetStackCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+    };
+
+    class Equip : public Category
+    {
+    public:
+        Equip() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return (proto->Class == ITEM_CLASS_WEAPON ||
+                proto->Class == ITEM_CLASS_ARMOR) && proto->ItemLevel > 1;
+        }
+        virtual string GetName() { return "equip"; }
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+
+        virtual uint32 GetStackCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+    };
+
+    class Other : public Category
+    {
+    public:
+        Other() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Quality > ITEM_QUALITY_POOR && (
+                proto->Class == ITEM_CLASS_MISC ||
+                proto->Class == ITEM_CLASS_GENERIC ||
+                proto->Class == ITEM_CLASS_MONEY) && proto->ItemLevel > 1 && proto->SubClass != ITEM_SUBCLASS_JUNK_MOUNT;
+        }
+        virtual string GetName() { return "other"; }
+
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+
+        virtual uint32 GetStackCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+    };
+
+    class Quiver : public Category
+    {
+    public:
+        Quiver() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_QUIVER && proto->ItemLevel > 1;
+        }
+
+        virtual string GetName() { return "quiver"; }
+
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+
+        virtual uint32 GetStackCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+    };
+
+    class Projectile : public Category
+    {
+    public:
+        Projectile() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_PROJECTILE;
+        }
+
+        virtual string GetName() { return "projectile"; }
+
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+        {
+            return 5;
+        }
+
+        virtual uint32 GetStackCount(ItemPrototype const* proto)
+        {
+            return proto->GetMaxStackSize();
+        }
+    };
+
+    class Container : public Category
+    {
+    public:
+        Container() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_CONTAINER && proto->ItemLevel > 1;
+        }
+
+        virtual string GetName() { return "container"; }
+
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+
+        virtual uint32 GetStackCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+    };
+
+    class Glyph : public Category
+    {
+    public:
+        Glyph() : Category() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_GLYPH;
+        }
+
+        virtual string GetName() { return "glyph"; }
+
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+
+        virtual uint32 GetStackCount(ItemPrototype const* proto)
+        {
+            return 1;
+        }
+    };
+
+    class QualityCategoryWrapper : public Category
+    {
+    public:
+        QualityCategoryWrapper(Category* category, uint32 quality);
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto);
+        virtual uint32 GetMaxAllowedAuctionCount();
+        virtual string GetName() { return category->GetName(); }
+        virtual string GetDisplayName() { return combinedName; }
+        virtual uint32 GetMaxAllowedItemAuctionCount(ItemPrototype const* proto);
+        virtual uint32 GetStackCount(ItemPrototype const* proto) { return category->GetStackCount(proto); }
+        virtual PricingStrategy* GetPricingStrategy() { return category->GetPricingStrategy(); }
+
+    private:
+        uint32 quality;
+        Category* category;
+        string combinedName;
+    };
+};
diff --git a/src/game/ahbot/ConsumableCategory.cpp b/src/game/ahbot/ConsumableCategory.cpp
new file mode 100644
index 00000000000..087faca6280
--- /dev/null
+++ b/src/game/ahbot/ConsumableCategory.cpp
@@ -0,0 +1,4 @@
+#include "ConsumableCategory.h"
+#include "ItemBag.h"
+
+using namespace ahbot;
diff --git a/src/game/ahbot/ConsumableCategory.h b/src/game/ahbot/ConsumableCategory.h
new file mode 100644
index 00000000000..90e4678f463
--- /dev/null
+++ b/src/game/ahbot/ConsumableCategory.h
@@ -0,0 +1,87 @@
+#pragma once;
+#include "Config/Config.h"
+#include "Category.h"
+
+using namespace std;
+
+namespace ahbot
+{
+    class Alchemy : public Consumable
+    {
+    public:
+        Alchemy() : Consumable() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Consumable::Contains(proto) &&
+                    (proto->SubClass == ITEM_SUBCLASS_POTION ||
+                    proto->SubClass == ITEM_SUBCLASS_ELIXIR ||
+                    proto->SubClass == ITEM_SUBCLASS_FLASK);
+        }
+
+        virtual string GetName() { return "Alchemy"; }
+    };
+
+    class Scroll : public Consumable
+    {
+    public:
+        Scroll() : Consumable() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Consumable::Contains(proto) &&
+                    (proto->SubClass == ITEM_SUBCLASS_SCROLL ||
+                    proto->SubClass == ITEM_SUBCLASS_ITEM_ENHANCEMENT);
+        }
+
+        virtual string GetName() { return "Scroll"; }
+    };
+
+    class Food : public Consumable
+    {
+    public:
+        Food() : Consumable() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Consumable::Contains(proto) &&
+                    proto->SubClass == ITEM_SUBCLASS_FOOD;
+        }
+
+        virtual string GetName() { return "Food"; }
+    };
+
+    class Bandage : public Consumable
+    {
+    public:
+        Bandage() : Consumable() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Consumable::Contains(proto) &&
+                    proto->SubClass == ITEM_SUBCLASS_BANDAGE;
+        }
+
+        virtual string GetName() { return "Bandage"; }
+    };
+
+    class OtherConsumable : public Consumable
+    {
+    public:
+        OtherConsumable() : Consumable() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Consumable::Contains(proto) &&
+                    (proto->SubClass == ITEM_SUBCLASS_CONSUMABLE ||
+                    proto->SubClass == ITEM_SUBCLASS_CONSUMABLE_OTHER) && (proto->RequiredSkill || proto->Flags & ITEM_FLAG_UNK6);
+        }
+
+        virtual string GetName() { return "OtherConsumable"; }
+    };
+};
diff --git a/src/game/ahbot/ItemBag.cpp b/src/game/ahbot/ItemBag.cpp
new file mode 100644
index 00000000000..a4378872aac
--- /dev/null
+++ b/src/game/ahbot/ItemBag.cpp
@@ -0,0 +1,189 @@
+#include "Category.h"
+#include "ItemBag.h"
+#include "ConsumableCategory.h"
+#include "TradeCategory.h"
+#include "AhBotConfig.h"
+#include "../DBCStructure.h"
+#include "../../shared/Log.h"
+#include "../../shared/Database/QueryResult.h"
+#include "../../shared/Database/DatabaseEnv.h"
+#include "../../shared/Database/SQLStorage.h"
+#include "../../shared/Database/DBCStore.h"
+#include "../SQLStorages.h"
+#include "../AuctionHouseMgr.h"
+#include "../ObjectMgr.h"
+
+using namespace ahbot;
+char * strstri (const char* str1, const char* str2);
+
+CategoryList CategoryList::instance;
+
+CategoryList::CategoryList()
+{
+    Add(new Equip());
+    Add(new ahbot::Quest());
+    Add(new Quiver());
+    Add(new Projectile());
+
+    Add(new Recipe());
+    Add(new Container());
+
+    Add(new Reagent());
+    Add(new Enchant());
+    Add(new Alchemy());
+    Add(new Scroll());
+    Add(new Food());
+    Add(new Bandage());
+
+    Add(new Cloth());
+    Add(new Leather());
+    Add(new Herb());
+    Add(new Metal());
+    Add(new Disenchants());
+    Add(new Meat());
+    Add(new Engineering());
+    Add(new SimpleGems());
+    Add(new SocketGems());
+    Add(new Elemental());
+
+    Add(new Glyph());
+
+    Add(new OtherConsumable());
+    Add(new OtherTrade());
+    Add(new Other());
+}
+
+void CategoryList::Add(Category* category)
+{
+    for (uint32 quality = ITEM_QUALITY_NORMAL; quality <= ITEM_QUALITY_EPIC; ++quality)
+        categories.push_back(new QualityCategoryWrapper(category, quality));
+}
+
+CategoryList::~CategoryList()
+{
+    for (vector<Category*>::const_iterator i = categories.begin(); i != categories.end(); ++i)
+        delete *i;
+}
+
+ItemBag::ItemBag()
+{
+    for (int i = 0; i < CategoryList::instance.size(); i++)
+    {
+        content[CategoryList::instance[i]] = vector<uint32>();
+    }
+}
+
+void ItemBag::Init(bool silent)
+{
+    if (silent)
+    {
+        Load();
+        return;
+    }
+
+    sLog.outString("Loading/Scanning %s...", GetName().c_str());
+
+    Load();
+
+    for (int i = 0; i < CategoryList::instance.size(); i++)
+    {
+        Category* category = CategoryList::instance[i];
+        Shuffle(content[category]);
+        sLog.outString("loaded %d %s items", content[category].size(), category->GetDisplayName().c_str());
+    }
+}
+
+int32 ItemBag::GetCount(Category* category, uint32 item)
+{
+    uint32 count = 0;
+
+    vector<uint32>& items = content[category];
+    for (vector<uint32>::iterator i = items.begin(); i != items.end(); ++i)
+    {
+        if (*i == item)
+            count++;
+    }
+
+    return count;
+}
+
+bool ItemBag::Add(ItemPrototype const* proto)
+{
+    if (!proto ||
+        proto->Bonding == BIND_WHEN_PICKED_UP ||
+        proto->Bonding == BIND_QUEST_ITEM)
+        return false;
+
+    if (proto->RequiredLevel > sAhBotConfig.maxRequiredLevel || proto->ItemLevel > sAhBotConfig.maxItemLevel)
+        return false;
+
+    if (proto->Duration & 0x80000000)
+        return false;
+
+    if (sAhBotConfig.ignoreItemIds.find(proto->ItemId) != sAhBotConfig.ignoreItemIds.end())
+        return false;
+
+    if (strstri(proto->Name1, "qa") || strstri(proto->Name1, "test"))
+        return false;
+
+    for (int i = 0; i < CategoryList::instance.size(); i++)
+    {
+        if (CategoryList::instance[i]->Contains(proto))
+        {
+            content[CategoryList::instance[i]].push_back(proto->ItemId);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void AvailableItemsBag::Load()
+{
+    set<uint32> vendorItems;
+
+      QueryResult* results = WorldDatabase.PQuery("SELECT item FROM npc_vendor where maxcount = 0");
+      if (results != NULL)
+      {
+          do
+          {
+              Field* fields = results->Fetch();
+              vendorItems.insert(fields[0].GetUInt32());
+          } while (results->NextRow());
+
+          delete results;
+      }
+
+      for (uint32 itemId = 0; itemId < sItemStorage.GetMaxEntry(); ++itemId)
+      {
+          if (vendorItems.find(itemId) != vendorItems.end())
+              continue;
+
+        Add(sObjectMgr.GetItemPrototype(itemId));
+    }
+
+}
+
+void InAuctionItemsBag::Load()
+{
+    AuctionHouseEntry const* ahEntry = sAuctionHouseStore.LookupEntry(auctionId);
+    if(!ahEntry)
+        return;
+
+    AuctionHouseObject* auctionHouse = sAuctionMgr.GetAuctionsMap(ahEntry);
+    AuctionHouseObject::AuctionEntryMap const& auctionEntryMap = auctionHouse->GetAuctions();
+    for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = auctionEntryMap.begin(); itr != auctionEntryMap.end(); ++itr)
+    {
+        ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itr->second->itemTemplate);
+        if (!proto)
+            continue;
+
+        Add(proto);
+    }
+}
+
+string InAuctionItemsBag::GetName()
+{
+    ostringstream out; out << "auction house " << auctionId;
+    return out.str();
+}
diff --git a/src/game/ahbot/ItemBag.h b/src/game/ahbot/ItemBag.h
new file mode 100644
index 00000000000..45f79666ab0
--- /dev/null
+++ b/src/game/ahbot/ItemBag.h
@@ -0,0 +1,82 @@
+#pragma once;
+#include "Category.h"
+
+namespace ahbot
+{
+    using namespace std;
+
+    class CategoryList
+    {
+    public:
+        CategoryList();
+        virtual ~CategoryList();
+
+        Category* operator[](int index) { return categories[index]; }
+        int32 size() { return categories.size(); }
+        static CategoryList instance;
+
+    private:
+        void Add(Category* category);
+
+    private:
+        vector<Category*> categories;
+    };
+
+    template<class T>
+    void Shuffle(vector<T>& items) 
+    {
+        uint32 count = items.size();
+        for (uint32 i = 0; i < count * 5; i++)
+        {
+            int i1 = urand(0, count - 1);
+            int i2 = urand(0, count - 1);
+
+            T item = items[i1];
+            items[i1] = items[i2];
+            items[i2] = item;
+        }
+    }
+
+    class ItemBag 
+    {
+    public:
+        ItemBag();
+
+    public:
+        void Init(bool silent = false);
+        vector<uint32>& Get(Category* category) { return content[category]; }
+        int32 GetCount(Category* category) { return content[category].size(); }
+        int32 GetCount(Category* category, uint32 item);
+        bool Add(ItemPrototype const* proto);
+
+    protected:
+        virtual void Load() = 0;
+        virtual string GetName() = 0;
+
+    protected:
+        map<Category*,vector<uint32> > content;
+    };
+
+    class AvailableItemsBag : public ItemBag
+    {
+    public:
+        AvailableItemsBag() {}
+
+    protected:
+        virtual void Load();
+        virtual string GetName() { return "available"; }
+    };
+
+    class InAuctionItemsBag : public ItemBag
+    {
+    public:
+        InAuctionItemsBag(uint32 auctionId) : auctionId(auctionId) {}
+
+    protected:
+        virtual void Load();
+        virtual string GetName();
+
+    private:
+        uint32 auctionId;
+    };
+};
diff --git a/src/game/ahbot/PricingStrategy.cpp b/src/game/ahbot/PricingStrategy.cpp
new file mode 100644
index 00000000000..c7668842441
--- /dev/null
+++ b/src/game/ahbot/PricingStrategy.cpp
@@ -0,0 +1,228 @@
+#include "PricingStrategy.h"
+#include "Category.h"
+#include "ItemBag.h"
+#include "AhBotConfig.h"
+#include "../../shared/Database/DatabaseEnv.h"
+#include "AhBot.h"
+
+using namespace ahbot;
+
+uint32 PricingStrategy::GetSellPrice(ItemPrototype const* proto, uint32 auctionHouse)
+{
+    uint32 now = time(0);
+    double price = sAhBotConfig.GetItemPriceMultiplier(proto->Name1) *
+        auctionbot.GetCategoryMultiplier(category->GetName()) *
+        GetRarityPriceMultiplier(proto->ItemId) *
+        GetCategoryPriceMultiplier(now, auctionHouse) *
+        GetItemPriceMultiplier(proto, now, auctionHouse) *
+        sAhBotConfig.GetSellPriceMultiplier(category->GetName()) *
+        GetDefaultSellPrice(proto);
+    return (uint32)price;
+}
+
+double PricingStrategy::GetMarketPrice(uint32 itemId, uint32 auctionHouse)
+{
+    double marketPrice = 0;
+
+    QueryResult* results = CharacterDatabase.PQuery("SELECT price FROM ahbot_price WHERE item = '%u' AND auction_house = '%u'", itemId, auctionHouse);
+    if (results)
+    {
+        marketPrice = results->Fetch()[0].GetFloat();
+        delete results;
+    }
+
+    return marketPrice;
+}
+
+uint32 PricingStrategy::GetBuyPrice(ItemPrototype const* proto, uint32 auctionHouse)
+{
+    double marketPrice = GetMarketPrice(proto->ItemId, auctionHouse);
+
+    if (marketPrice > 0)
+        return marketPrice;
+
+    uint32 untilTime = time(0) - 3600 * 12;
+    double price = sAhBotConfig.GetItemPriceMultiplier(proto->Name1) *
+        auctionbot.GetCategoryMultiplier(category->GetName()) *
+        GetRarityPriceMultiplier(proto->ItemId) *
+        GetCategoryPriceMultiplier(untilTime, auctionHouse) *
+        GetItemPriceMultiplier(proto, untilTime, auctionHouse) *
+        sAhBotConfig.GetBuyPriceMultiplier(category->GetName()) *
+        GetDefaultBuyPrice(proto);
+    return (uint32)price;
+}
+
+string PricingStrategy::ExplainSellPrice(ItemPrototype const* proto, uint32 auctionHouse)
+{
+    ostringstream out;
+
+    uint32 untilTime = time(0);
+    out << sAhBotConfig.GetItemPriceMultiplier(proto->Name1) << " (item const) * " <<
+        auctionbot.GetCategoryMultiplier(category->GetName()) << " (random) * " <<
+        GetRarityPriceMultiplier(proto->ItemId) << " (rariry) * " <<
+        GetCategoryPriceMultiplier(untilTime, auctionHouse) << " (category) * " <<
+        GetItemPriceMultiplier(proto, untilTime, auctionHouse) << " (item) * " <<
+        sAhBotConfig.GetSellPriceMultiplier(category->GetName()) << " (sell) * " <<
+        GetDefaultSellPrice(proto) << " (price)";
+    return out.str();
+}
+
+string PricingStrategy::ExplainBuyPrice(ItemPrototype const* proto, uint32 auctionHouse)
+{
+    ostringstream out;
+
+    double marketPrice = GetMarketPrice(proto->ItemId, auctionHouse);
+    if (marketPrice > 0)
+    {
+        out << marketPrice << " (market)";
+        return out.str();
+    }
+
+    uint32 untilTime = time(0) - 3600 * 12;
+    out << sAhBotConfig.GetItemPriceMultiplier(proto->Name1) << " (item const) * " <<
+        auctionbot.GetCategoryMultiplier(category->GetName()) << " (random) * " <<
+        GetRarityPriceMultiplier(proto->ItemId) << " (rarity) * " <<
+        GetCategoryPriceMultiplier(untilTime, auctionHouse) << " (category) * " <<
+        GetItemPriceMultiplier(proto, untilTime, auctionHouse) << " (item) * " <<
+        sAhBotConfig.GetBuyPriceMultiplier(category->GetName()) << " (buy) * " <<
+        GetDefaultBuyPrice(proto) << " (price)";
+    return out.str();
+}
+
+double PricingStrategy::GetRarityPriceMultiplier(uint32 itemId)
+{
+    double result = 1.0;
+
+    QueryResult* results = WorldDatabase.PQuery(
+        "select max(ChanceOrQuestChance) from ( "
+        "select ChanceOrQuestChance from gameobject_loot_template where item = '%u' "
+        "union select ChanceOrQuestChance from spell_loot_template where item = '%u' "
+        "union select ChanceOrQuestChance from disenchant_loot_template where item = '%u' "
+        "union select ChanceOrQuestChance from fishing_loot_template where item = '%u' "
+        "union select ChanceOrQuestChance from item_loot_template where item = '%u' "
+        "union select ChanceOrQuestChance from milling_loot_template where item = '%u' "
+        "union select ChanceOrQuestChance from pickpocketing_loot_template where item = '%u' "
+        "union select ChanceOrQuestChance from prospecting_loot_template where item = '%u' "
+        "union select ChanceOrQuestChance from reference_loot_template where item = '%u' "
+        "union select ChanceOrQuestChance from skinning_loot_template where item = '%u' "
+        "union select ChanceOrQuestChance from creature_loot_template where item = '%u' "
+        "union select 0 "
+        ") a",
+        itemId,itemId,itemId,itemId,itemId,itemId,itemId,itemId,itemId,itemId,itemId);
+
+    if (results)
+    {
+        Field* fields = results->Fetch();
+        float chance = fields[0].GetFloat();
+
+        if (chance > 0 && chance <= 90.0)
+            result = sqrt((100.0 - chance) / 10.0);
+
+        delete results;
+    }
+
+    return result >= 1.0 ? result : 1.0;
+}
+
+
+double PricingStrategy::GetCategoryPriceMultiplier(uint32 untilTime, uint32 auctionHouse)
+{
+    double result = 1.0;
+
+    QueryResult* results = CharacterDatabase.PQuery(
+        "SELECT count(*) FROM (SELECT round(buytime/3600/24/5) as days FROM ahbot_history WHERE category = '%s' AND won = '1' AND buytime <= '%u' AND auction_house = '%u' group by days) q",
+        category->GetName().c_str(), untilTime, AhBot::factions[auctionHouse]);
+    if (results)
+    {
+        Field* fields = results->Fetch();
+        uint32 count = fields[0].GetUInt32();
+
+        if (count)
+            result += count;
+
+        delete results;
+    }
+
+    return result;
+}
+
+double PricingStrategy::GetMultiplier(double count, double firstBuyTime, double lastBuyTime)
+{
+    double k1 = (double)count / (double)((time(0) - firstBuyTime) / 3600 / 24 + 1);
+    double k2 = (double)count / (double)((time(0) - lastBuyTime) / 3600 / 24 + 1);
+    return max(1.0, k1 + k2) * sAhBotConfig.priceMultiplier;
+}
+
+double PricingStrategy::GetItemPriceMultiplier(ItemPrototype const* proto, uint32 untilTime, uint32 auctionHouse)
+{
+    double result = 1.0;
+
+    QueryResult* results = CharacterDatabase.PQuery(
+        "SELECT count(*) FROM (SELECT round(buytime/3600/24/5) as days FROM ahbot_history WHERE won = '1' AND item = '%u' AND buytime <= '%u' AND auction_house = '%u' group by days) q",
+        proto->ItemId, untilTime, AhBot::factions[auctionHouse]);
+    if (results)
+    {
+        Field* fields = results->Fetch();
+        uint32 count = fields[0].GetUInt32();
+
+        if (count)
+            result += count;
+
+        delete results;
+    }
+
+    return result;
+}
+
+uint32 PricingStrategy::ApplyQualityMultiplier(ItemPrototype const* proto, uint32 price)
+{
+    if (proto->Quality == ITEM_QUALITY_POOR)
+        return price;
+
+    return (uint32)(price * sqrt((double)proto->Quality) * sAhBotConfig.priceQualityMultiplier);
+}
+
+uint32 PricingStrategy::GetDefaultBuyPrice(ItemPrototype const* proto)
+{
+    uint32 price = 0;
+
+    if (proto->SellPrice)
+        price = proto->SellPrice;
+    if (proto->BuyPrice)
+        price = max(price, proto->BuyPrice / 4);
+
+    uint32 level = max(proto->ItemLevel, proto->RequiredLevel);
+    if (proto->Class == ITEM_CLASS_QUEST)
+    {
+        double result = 1.0;
+
+        QueryResult* results = WorldDatabase.PQuery(
+            "select max(QuestLevel), max(MinLevel) from quest_template where ReqItemId1 = %u or ReqItemId2 = %u or ReqItemId3 = %u or ReqItemId4 = %u or ReqItemId5 = %u or ReqItemId6 = %u",
+            proto->ItemId, proto->ItemId, proto->ItemId, proto->ItemId, proto->ItemId, proto->ItemId);
+        if (results)
+        {
+            Field* fields = results->Fetch();
+            level = max(fields[0].GetUInt32(), fields[1].GetUInt32());
+            delete results;
+        }
+    }
+    price = max(price, sAhBotConfig.defaultMinPrice * level * level / 10);
+    price = max(price, (uint32)100);
+
+    return ApplyQualityMultiplier(proto, price) * sAhBotConfig.priceMultiplier;
+}
+
+uint32 PricingStrategy::GetDefaultSellPrice(ItemPrototype const* proto)
+{
+    return GetDefaultBuyPrice(proto);
+}
+
+
+uint32 BuyOnlyRarePricingStrategy::GetBuyPrice(ItemPrototype const* proto, uint32 auctionHouse)
+{
+    if (proto->Quality < ITEM_QUALITY_RARE)
+        return 0;
+
+    return PricingStrategy::GetBuyPrice(proto, auctionHouse);
+}
+
diff --git a/src/game/ahbot/PricingStrategy.h b/src/game/ahbot/PricingStrategy.h
new file mode 100644
index 00000000000..ad3fb9503ef
--- /dev/null
+++ b/src/game/ahbot/PricingStrategy.h
@@ -0,0 +1,56 @@
+#pragma once;
+#include "Config/Config.h"
+#include "../ItemPrototype.h"
+
+using namespace std;
+
+namespace ahbot
+{
+    class Category;
+
+    class PricingStrategy
+    {
+    public:
+        PricingStrategy(Category* category) : category(category) {}
+
+    public:
+        virtual uint32 GetSellPrice(ItemPrototype const* proto, uint32 auctionHouse);
+        virtual uint32 GetBuyPrice(ItemPrototype const* proto, uint32 auctionHouse);
+        string ExplainSellPrice(ItemPrototype const* proto, uint32 auctionHouse);
+        string ExplainBuyPrice(ItemPrototype const* proto, uint32 auctionHouse);
+        virtual double GetRarityPriceMultiplier(uint32 itemId);
+
+    protected:
+        virtual uint32 GetDefaultBuyPrice(ItemPrototype const* proto);
+        virtual uint32 GetDefaultSellPrice(ItemPrototype const* proto);
+        virtual uint32 ApplyQualityMultiplier(ItemPrototype const* proto, uint32 price);
+        virtual double GetCategoryPriceMultiplier(uint32 untilTime, uint32 auctionHouse);
+        virtual double GetItemPriceMultiplier(ItemPrototype const* proto, uint32 untilTime, uint32 auctionHouse);
+        double GetMultiplier(double count, double firstBuyTime, double lastBuyTime);
+        double GetMarketPrice(uint32 itemId, uint32 auctionHouse);
+
+    protected:
+        Category* category;
+    };
+
+    class BuyOnlyRarePricingStrategy : public PricingStrategy
+    {
+    public:
+        BuyOnlyRarePricingStrategy(Category* category) : PricingStrategy(category) {}
+
+    public:
+        virtual uint32 GetBuyPrice(ItemPrototype const* proto, uint32 auctionHouse);
+    };
+
+    class PricingStrategyFactory
+    {
+    public:
+        static PricingStrategy* Create(string name, Category* category)
+        {
+            if (name == "buyOnlyRare")
+                return new BuyOnlyRarePricingStrategy(category);
+
+            return new PricingStrategy(category);
+        }
+    };
+};
diff --git a/src/game/ahbot/TradeCategory.cpp b/src/game/ahbot/TradeCategory.cpp
new file mode 100644
index 00000000000..f0a814cd145
--- /dev/null
+++ b/src/game/ahbot/TradeCategory.cpp
@@ -0,0 +1,4 @@
+#include "TradeCategory.h"
+#include "ItemBag.h"
+
+using namespace ahbot;
diff --git a/src/game/ahbot/TradeCategory.h b/src/game/ahbot/TradeCategory.h
new file mode 100644
index 00000000000..efbced2d9cf
--- /dev/null
+++ b/src/game/ahbot/TradeCategory.h
@@ -0,0 +1,184 @@
+#pragma once;
+#include "Config/Config.h"
+#include "Category.h"
+
+using namespace std;
+
+namespace ahbot
+{
+    class Cloth : public Trade
+    {
+    public:
+        Cloth() : Trade() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Trade::Contains(proto) &&
+                    proto->SubClass == ITEM_SUBCLASS_CLOTH;
+        }
+
+        virtual string GetName() { return "Cloth"; }
+    };
+
+    class Leather : public Trade
+    {
+    public:
+        Leather() : Trade() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Trade::Contains(proto) &&
+                    proto->SubClass == ITEM_SUBCLASS_LEATHER;
+        }
+
+        virtual string GetName() { return "Leather"; }
+    };
+
+    class Elemental : public Trade
+    {
+    public:
+        Elemental() : Trade() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Trade::Contains(proto) &&
+                proto->SubClass == ITEM_SUBCLASS_ELEMENTAL;
+        }
+
+        virtual string GetName() { return "Elemental"; }
+    };
+
+    class Herb : public Trade
+    {
+    public:
+        Herb() : Trade() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Trade::Contains(proto) &&
+                    proto->SubClass == ITEM_SUBCLASS_HERB;
+        }
+
+        virtual string GetName() { return "Herb"; }
+    };
+
+    class Meat : public Trade
+    {
+    public:
+        Meat() : Trade() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Trade::Contains(proto) &&
+                    proto->SubClass == ITEM_SUBCLASS_MEAT;
+        }
+
+        virtual string GetName() { return "Meat"; }
+    };
+
+    class Metal : public Trade
+    {
+    public:
+        Metal() : Trade() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Trade::Contains(proto) &&
+                    proto->SubClass == ITEM_SUBCLASS_METAL_STONE;
+        }
+
+        virtual string GetName() { return "Metal"; }
+    };
+
+    class Disenchants : public Trade
+    {
+    public:
+        Disenchants() : Trade() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Trade::Contains(proto) &&
+                    proto->SubClass == ITEM_SUBCLASS_ENCHANTING;
+        }
+
+        virtual string GetName() { return "Disenchants"; }
+    };
+
+    class SimpleGems : public Trade
+    {
+    public:
+        SimpleGems() : Trade() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_GEM && proto->SubClass == ITEM_SUBCLASS_GEM_SIMPLE;
+        }
+
+        virtual string GetName() { return "SimpleGems"; }
+    };
+
+    class SocketGems : public Trade
+    {
+    public:
+        SocketGems() : Trade() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return proto->Class == ITEM_CLASS_GEM && proto->SubClass != ITEM_SUBCLASS_GEM_SIMPLE;
+        }
+
+        virtual string GetName() { return "SocketGems"; }
+    };
+
+    class Engineering : public Trade
+    {
+    public:
+        Engineering() : Trade() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Trade::Contains(proto) &&
+                    (proto->SubClass == ITEM_SUBCLASS_PARTS ||
+                    proto->SubClass == ITEM_SUBCLASS_DEVICES ||
+                    proto->SubClass == ITEM_SUBCLASS_MATERIAL ||
+                    proto->SubClass == ITEM_SUBCLASS_EXPLOSIVES);
+        }
+
+        virtual string GetName() { return "Engineering"; }
+    };
+
+    class OtherTrade : public Trade
+    {
+    public:
+        OtherTrade() : Trade() {}
+
+    public:
+        virtual bool Contains(ItemPrototype const* proto)
+        {
+            return Trade::Contains(proto) &&
+                    proto->SubClass != ITEM_SUBCLASS_PARTS &&
+                    proto->SubClass != ITEM_SUBCLASS_DEVICES &&
+                    proto->SubClass != ITEM_SUBCLASS_MATERIAL &&
+                    proto->SubClass != ITEM_SUBCLASS_EXPLOSIVES &&
+                    proto->SubClass != ITEM_SUBCLASS_ENCHANTING &&
+                    proto->SubClass != ITEM_SUBCLASS_JEWELCRAFTING &&
+                    proto->SubClass != ITEM_SUBCLASS_METAL_STONE &&
+                    proto->SubClass != ITEM_SUBCLASS_MEAT &&
+                    proto->SubClass != ITEM_SUBCLASS_HERB &&
+                    proto->SubClass != ITEM_SUBCLASS_LEATHER &&
+                    proto->SubClass != ITEM_SUBCLASS_CLOTH;
+        }
+
+        virtual string GetName() { return "OtherTrade"; }
+    };
+};
diff --git a/src/game/ahbot/ahbot.conf.dist.in b/src/game/ahbot/ahbot.conf.dist.in
new file mode 100644
index 00000000000..fb4576b66c8
--- /dev/null
+++ b/src/game/ahbot/ahbot.conf.dist.in
@@ -0,0 +1,203 @@
+################################################
+# MANGOS Auction House Bot Configuration file  #
+################################################
+
+[AhbotConf]
+ConfVersion=2010102201
+
+###################################################################################################################
+# AUCTION HOUSE BOT SETTINGS
+#
+###################################################################################################################
+
+# Disable original AuctionHouseBot
+AuctionHouseBot.Seller.Enabled = 0
+AuctionHouseBot.Buyer.Enabled = 0
+
+# Replace with the new AhBot
+AhBot.Enabled = 1
+
+# Should be used only if random bots are disabled
+# AhBot.GUID = 0
+
+# 199 for 80, 80 for 70, 70 for 60, ..., 25 for 20
+AhBot.MaxItemLevel = 199
+# Same as level cap
+AhBot.MaxRequiredLevel = 80
+
+# Ignore items by ID
+AhBot.IgnoreItemIds = 49283,52200,8494,6345,6891,2460
+
+AhBot.PriceMultiplier = 1.0
+AhBot.DefaultMinPrice = 20
+AhBot.PriceQualityMultiplier = 1.0
+AhBot.AlwaysAvailableMoney = 2000000
+
+#
+# Items
+#
+
+AhBot.MaxAuctionCount.equip.green = 0
+AhBot.MaxAuctionCount.equip.blue = 40
+AhBot.MaxAuctionCount.equip.epic = 20
+AhBot.PriceMultiplier.Sell.equip = 1.0
+AhBot.PriceMultiplier.Buy.equip = 1.0
+AhBot.PricingStrategy.equip = buyOnlyRare
+
+AhBot.MaxAuctionCount.reagent.white = 6
+AhBot.MaxAuctionCount.reagent.green = 2
+AhBot.PriceMultiplier.Sell.reagent = 1.0
+AhBot.PriceMultiplier.Buy.reagent = 1.0
+AhBot.PricingStrategy.reagent = buyOnlyRare
+
+AhBot.MaxAuctionCount.other.white = 20
+AhBot.MaxAuctionCount.other.green = 10
+AhBot.MaxAuctionCount.other.blue = 6
+AhBot.PriceMultiplier.Sell.other = 1.0
+AhBot.PriceMultiplier.Buy.other = 1.0
+AhBot.PricingStrategy.other = buyOnlyRare
+
+#
+# Container
+#
+
+AhBot.MaxAuctionCount.quiver.white = 2
+AhBot.PriceMultiplier.Sell.quiver = 1.0
+AhBot.PriceMultiplier.Buy.quiver = 1.0
+AhBot.PricingStrategy.quiver = buyOnlyRare
+
+AhBot.MaxAuctionCount.container.white = 6
+AhBot.MaxAuctionCount.container.green = 2
+AhBot.MaxAuctionCount.container.blue = 2
+AhBot.PriceMultiplier.Sell.container = 1.0
+AhBot.PriceMultiplier.Buy.container = 1.0
+
+#
+# Glyph
+#
+
+AhBot.MaxAuctionCount.glyph.white = 50
+AhBot.MaxAuctionCount.glyph.green = 20
+AhBot.MaxAuctionCount.glyph.blue = 10
+AhBot.PriceMultiplier.Sell.glyph = 1.0
+AhBot.PriceMultiplier.Buy.glyph = 1.0
+
+#
+# Quest
+#
+
+AhBot.MaxAuctionCount.quest.white = 14
+AhBot.MaxAuctionCount.quest.green = 2
+AhBot.MaxAuctionCount.quest.blue = 2
+AhBot.PriceMultiplier.Sell.quest = 1.0
+AhBot.PriceMultiplier.Buy.quest = 1.0
+
+#
+# Consumables
+#
+
+AhBot.MaxAuctionCount.alchemy.white = 50
+AhBot.MaxAuctionCount.alchemy.green = 20
+AhBot.MaxAuctionCount.alchemy.blue = 10
+AhBot.PriceMultiplier.Sell.alchemy = 1.0
+AhBot.PriceMultiplier.Buy.alchemy = 1.0
+
+AhBot.MaxAuctionCount.scroll.white = 40
+AhBot.MaxAuctionCount.scroll.green = 6
+AhBot.MaxAuctionCount.scroll.blue = 4
+AhBot.PriceMultiplier.Sell.scroll = 1.0
+AhBot.PriceMultiplier.Buy.scroll = 1.0
+
+AhBot.MaxAuctionCount.Food.white = 40
+AhBot.PriceMultiplier.Sell.Food = 1.0
+AhBot.PriceMultiplier.Buy.Food = 1.0
+
+AhBot.MaxAuctionCount.bandage.white = 10
+AhBot.PriceMultiplier.Sell.bandage = 1.0
+AhBot.PriceMultiplier.Buy.bandage = 1.0
+
+AhBot.MaxAuctionCount.OtherConsumable.white = 20
+AhBot.MaxAuctionCount.OtherConsumable.green = 10
+AhBot.MaxAuctionCount.OtherConsumable.blue = 5
+AhBot.PriceMultiplier.Sell.OtherConsumable = 1.0
+AhBot.PriceMultiplier.Buy.OtherConsumable = 1.0
+
+#
+# Recipe
+#
+
+AhBot.MaxAuctionCount.recipe.white = 8
+AhBot.MaxAuctionCount.recipe.green = 4
+AhBot.MaxAuctionCount.recipe.blue = 2
+AhBot.MaxAuctionCount.recipe.epic = 2
+AhBot.PriceMultiplier.Sell.recipe = 1.0
+AhBot.PriceMultiplier.Buy.recipe = 1.0
+
+#
+# Trade
+#
+
+AhBot.MaxAuctionCount.Elemental.white = 30
+AhBot.MaxAuctionCount.Elemental.green = 20
+AhBot.MaxAuctionCount.Elemental.blue = 6
+AhBot.PriceMultiplier.Sell.Elemental = 1.0
+AhBot.PriceMultiplier.Buy.Elemental = 1.0
+
+AhBot.MaxAuctionCount.Cloth.white = 50
+AhBot.MaxAuctionCount.Cloth.green = 14
+AhBot.MaxAuctionCount.Cloth.blue = 6
+AhBot.PriceMultiplier.Sell.Cloth = 1.0
+AhBot.PriceMultiplier.Buy.Cloth = 1.0
+
+AhBot.MaxAuctionCount.Leather.white = 50
+AhBot.MaxAuctionCount.Leather.green = 14
+AhBot.MaxAuctionCount.Leather.blue = 6
+AhBot.PriceMultiplier.Sell.Leather = 1.0
+AhBot.PriceMultiplier.Buy.Leather = 1.0
+
+AhBot.MaxAuctionCount.Herb.white = 50
+AhBot.MaxAuctionCount.Herb.green = 14
+AhBot.PriceMultiplier.Sell.Herb = 1.0
+AhBot.PriceMultiplier.Buy.Herb = 1.0
+
+AhBot.MaxAuctionCount.Meat.white = 50
+AhBot.PriceMultiplier.Sell.Meat = 1.0
+AhBot.PriceMultiplier.Buy.Meat = 1.0
+
+AhBot.MaxAuctionCount.Metal.white = 50
+AhBot.MaxAuctionCount.Metal.green = 14
+AhBot.MaxAuctionCount.Metal.blue = 6
+AhBot.PriceMultiplier.Sell.Metal = 1.0
+AhBot.PriceMultiplier.Buy.Metal = 1.0
+
+AhBot.MaxAuctionCount.Engineering.white = 20
+AhBot.MaxAuctionCount.Engineering.green = 10
+AhBot.MaxAuctionCount.Engineering.blue = 4
+AhBot.PriceMultiplier.Sell.Engineering = 1.0
+AhBot.PriceMultiplier.Buy.Engineering = 1.0
+
+AhBot.MaxAuctionCount.Disenchants.white = 40
+AhBot.MaxAuctionCount.Disenchants.green = 20
+AhBot.MaxAuctionCount.Disenchants.blue = 20
+AhBot.PriceMultiplier.Sell.Disenchants = 1.0
+AhBot.PriceMultiplier.Buy.Disenchants = 1.0
+
+AhBot.MaxAuctionCount.SimpleGems.green = 30
+AhBot.MaxAuctionCount.SimpleGems.blue = 20
+AhBot.MaxAuctionCount.SimpleGems.epic = 4
+AhBot.PriceMultiplier.Sell.SimpleGems = 1.0
+AhBot.PriceMultiplier.Buy.SimpleGems = 1.0
+
+AhBot.MaxAuctionCount.SocketGems.green = 50
+AhBot.MaxAuctionCount.SocketGems.blue = 20
+AhBot.MaxAuctionCount.SocketGems.epic = 4
+AhBot.PriceMultiplier.Sell.SocketGems = 1.0
+AhBot.PriceMultiplier.Buy.SocketGems = 1.0
+
+AhBot.MaxAuctionCount.OtherTrade.white = 10
+AhBot.PriceMultiplier.Sell.OtherTrade = 1.0
+AhBot.PriceMultiplier.Buy.OtherTrade = 1.0
+
+AhBot.PriceMultiplier.Sell.projectile = 1.0
+AhBot.PriceMultiplier.Buy.projectile = 1.0
+AhBot.PricingStrategy.projectile = buyOnlyRare
diff --git a/src/game/debugcmds.cpp b/src/game/debugcmds.cpp
index a20050bcad5..df0d63e3316 100644
--- a/src/game/debugcmds.cpp
+++ b/src/game/debugcmds.cpp
@@ -26,7 +26,7 @@
 #include "Unit.h"
 #include "GossipDef.h"
 #include "Language.h"
-#include "BattleGroundMgr.h"
+#include "BattleGround/BattleGroundMgr.h"
 #include <fstream>
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
@@ -63,6 +63,24 @@ bool ChatHandler::HandleDebugSendSpellFailCommand(char* args)
     return true;
 }
 
+bool ChatHandler::HandleDebugSendCalendarResultCommand(char* args)
+{
+    if (!*args)
+        return false;
+
+    char* c_val = strtok((char*)args, " ");
+    if (!c_val)
+        return false;
+
+    int Value = atoi(c_val);
+
+    char* c_str = strtok(NULL, "");
+    std::string str = c_str;
+
+    m_session->GetPlayer()->SendCalendarResult(CalendarResponseResult(Value), str);
+    return true;
+}
+
 bool ChatHandler::HandleDebugSendPoiCommand(char* args)
 {
     Player *pPlayer = m_session->GetPlayer();
@@ -126,10 +144,10 @@ bool ChatHandler::HandleDebugSendOpcodeCommand(char* /*args*/)
     if (ifs.bad())
         return false;
 
-    uint32 opcode;
-    ifs >> opcode;
+    uint32 _opcode;
+    ifs >> _opcode;
 
-    WorldPacket data(opcode, 0);
+    WorldPacket data(Opcodes(_opcode), 0);
 
     while(!ifs.eof())
     {
@@ -193,20 +211,6 @@ bool ChatHandler::HandleDebugSendOpcodeCommand(char* /*args*/)
     return true;
 }
 
-bool ChatHandler::HandleDebugUpdateWorldStateCommand(char* args)
-{
-    uint32 world;
-    if (!ExtractUInt32(&args, world))
-        return false;
-
-    uint32 state;
-    if (!ExtractUInt32(&args, state))
-        return false;
-
-    m_session->GetPlayer()->SendUpdateWorldState(world, state);
-    return true;
-}
-
 bool ChatHandler::HandleDebugPlayCinematicCommand(char* args)
 {
     // USAGE: .debug play cinematic #cinematicid
@@ -306,7 +310,7 @@ bool ChatHandler::HandleDebugSendChatMsgCommand(char* args)
         return false;
 
     WorldPacket data;
-    ChatHandler::FillMessageData(&data, m_session, type, 0, "chan", m_session->GetPlayer()->GetObjectGuid(), msg, m_session->GetPlayer());
+    ChatHandler::BuildChatPacket(data, ChatMsg(type), msg, LANG_UNIVERSAL, CHAT_TAG_NONE, m_session->GetPlayer()->GetObjectGuid(), m_session->GetPlayerName());
     m_session->SendPacket(&data);
     return true;
 }
@@ -857,6 +861,7 @@ bool ChatHandler::HandleGetValueHelper(Object* target, uint32 field, char* typeS
             default:
                 DEBUG_LOG(GetMangosString(LANG_GET_UINT), guid.GetString().c_str(), field, iValue);
                 PSendSysMessage(LANG_GET_UINT_FIELD, guid.GetString().c_str(), field, iValue);
+                break;
         }
     }
     else
@@ -1097,7 +1102,7 @@ bool ChatHandler::HandleDebugSpellModsCommand(char* args)
     if (!typeStr)
         return false;
 
-    uint16 opcode;
+    Opcodes opcode;
     if (strncmp(typeStr, "flat", strlen(typeStr)) == 0)
         opcode = SMSG_SET_FLAT_SPELL_MODIFIER;
     else if (strncmp(typeStr, "pct", strlen(typeStr)) == 0)
@@ -1143,3 +1148,28 @@ bool ChatHandler::HandleDebugSpellModsCommand(char* args)
 
     return true;
 }
+
+bool ChatHandler::HandleDebugEnterVehicleCommand(char* args)
+{
+    Unit* target = getSelectedUnit();
+    if (!target)
+    {
+        SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    if (!target->GetVehicleKit())
+        return false;
+
+    if (!*args)
+        return false;
+
+    uint32 seat = atoi(args);
+
+    if (!target->GetVehicleKit()->HasEmptySeat(seat))
+        return false;
+
+    m_session->GetPlayer()->EnterVehicle(target->GetVehicleKit(), seat);
+    return true;
+}
diff --git a/src/game/movement/MoveSpline.cpp b/src/game/movement/MoveSpline.cpp
index bfbee4506e6..891cb4a844f 100644
--- a/src/game/movement/MoveSpline.cpp
+++ b/src/game/movement/MoveSpline.cpp
@@ -19,298 +19,304 @@
 #include "MoveSpline.h"
 #include <sstream>
 #include "Log.h"
+#include "Unit.h"
 
-namespace Movement{
+namespace Movement
+{
 
-extern float computeFallTime(float path_length, bool isSafeFall);
-extern float computeFallElevation(float time_passed, bool isSafeFall, float start_velocy);
-extern float computeFallElevation(float time_passed);
+    extern float computeFallTime(float path_length, bool isSafeFall);
+    extern float computeFallElevation(float time_passed, bool isSafeFall, float start_velocy);
+    extern float computeFallElevation(float time_passed);
 
-Location MoveSpline::ComputePosition() const
-{
-    MANGOS_ASSERT(Initialized());
-
-    float u = 1.f;
-    int32 seg_time = spline.length(point_Idx,point_Idx+1);
-    if (seg_time > 0)
-        u = (time_passed - spline.length(point_Idx)) / (float)seg_time;
-    Location c;
-    c.orientation = initialOrientation;
-    spline.evaluate_percent(point_Idx, u, c);
-
-    if (splineflags.animation)
-        ;// MoveSplineFlag::Animation disables falling or parabolic movement
-    else if (splineflags.parabolic)
-        computeParabolicElevation(c.z);
-    else if (splineflags.falling)
-        computeFallElevation(c.z);
-
-    if (splineflags.done && splineflags.isFacing())
-    {
-        if (splineflags.final_angle)
-            c.orientation = facing.angle;
-        else if (splineflags.final_point)
-            c.orientation = atan2(facing.f.y-c.y, facing.f.x-c.x);
-        //nothing to do for MoveSplineFlag::Final_Target flag
-    }
-    else
+    Position MoveSpline::ComputePosition() const
     {
-        if (!splineflags.hasFlag(MoveSplineFlag::OrientationFixed|MoveSplineFlag::Falling))
+        MANGOS_ASSERT(Initialized());
+
+        float u = 1.f;
+        int32 seg_time = spline.length(point_Idx, point_Idx + 1);
+        if (seg_time > 0)
+            u = (time_passed - spline.length(point_Idx)) / (float)seg_time;
+        Position c;
+        c.orientation = initialOrientation;
+        spline.evaluate_percent(point_Idx, u, c);
+
+        if (splineflags.animation)
+            ;// MoveSplineFlag::Animation disables falling or parabolic movement
+        else if (splineflags.parabolic)
+            computeParabolicElevation(c.z);
+        else if (splineflags.falling)
+            computeFallElevation(c.z);
+
+        if (splineflags.done && splineflags.isFacing())
         {
-            Vector3 hermite;
-            spline.evaluate_derivative(point_Idx,u,hermite);
-            c.orientation = atan2(hermite.y, hermite.x);
+            if (splineflags.final_angle)
+                c.orientation = facing.angle;
+            else if (splineflags.final_point)
+                c.orientation = atan2(facing.f.y - c.y, facing.f.x - c.x);
+            // nothing to do for MoveSplineFlag::Final_Target flag
+        }
+        else
+        {
+            if (!splineflags.hasFlag(MoveSplineFlag::OrientationFixed | MoveSplineFlag::Falling))
+            {
+                Vector3 hermite;
+                spline.evaluate_derivative(point_Idx, u, hermite);
+                c.orientation = atan2(hermite.y, hermite.x);
+            }
+
+            if (splineflags.orientationInversed)
+                c.orientation = -c.orientation;
         }
 
-        if (splineflags.orientationInversed)
-            c.orientation = -c.orientation;
+        c.orientation = G3D::wrap(c.orientation, 0.0f, float(G3D::twoPi()));
+        return c;
     }
-    return c;
-}
 
-void MoveSpline::computeParabolicElevation(float& el) const
-{
-    if (time_passed > effect_start_time)
+    void MoveSpline::computeParabolicElevation(float& el) const
     {
-        float t_passedf = MSToSec(time_passed - effect_start_time);
-        float t_durationf = MSToSec(Duration() - effect_start_time); //client use not modified duration here
+        if (time_passed > effect_start_time)
+        {
+            float t_passedf = MSToSec(time_passed - effect_start_time);
+            float t_durationf = MSToSec(Duration() - effect_start_time); // client use not modified duration here
 
-        // -a*x*x + bx + c:
-        //(dur * v3->z_acceleration * dt)/2 - (v3->z_acceleration * dt * dt)/2 + Z;
-        el += (t_durationf - t_passedf) * 0.5f * vertical_acceleration * t_passedf;
+            // -a*x*x + bx + c:
+            //(dur * v3->z_acceleration * dt)/2 - (v3->z_acceleration * dt * dt)/2 + Z;
+            el += (t_durationf - t_passedf) * 0.5f * vertical_acceleration * t_passedf;
+        }
     }
-}
-
-void MoveSpline::computeFallElevation(float& el) const
-{
-    float z_now = spline.getPoint(spline.first()).z - Movement::computeFallElevation(MSToSec(time_passed));
-    float final_z = FinalDestination().z;
-    if (z_now < final_z)
-        el = final_z;
-    else
-        el = z_now;
-}
-
-inline uint32 computeDuration(float length, float velocity)
-{
-    return SecToMS(length / velocity);
-}
 
-struct FallInitializer
-{
-    FallInitializer(float _start_elevation) : start_elevation(_start_elevation) {}
-    float start_elevation;
-    inline int32 operator()(Spline<int32>& s, int32 i)
+    void MoveSpline::computeFallElevation(float& el) const
     {
-        return Movement::computeFallTime(start_elevation - s.getPoint(i+1).z,false) * 1000.f;
+        float z_now = spline.getPoint(spline.first()).z - Movement::computeFallElevation(MSToSec(time_passed));
+        float final_z = FinalDestination().z;
+        if (z_now < final_z)
+            el = final_z;
+        else
+            el = z_now;
     }
-};
-
-enum{
-    minimal_duration = 1,
-};
 
-struct CommonInitializer
-{
-    CommonInitializer(float _velocity) : velocityInv(1000.f/_velocity), time(minimal_duration) {}
-    float velocityInv;
-    int32 time;
-    inline int32 operator()(Spline<int32>& s, int32 i)
+    inline uint32 computeDuration(float length, float velocity)
     {
-        time += (s.SegLength(i) * velocityInv);
-        return time;
+        return SecToMS(length / velocity);
     }
-};
 
-void MoveSpline::init_spline(const MoveSplineInitArgs& args)
-{
-    const SplineBase::EvaluationMode modes[2] = {SplineBase::ModeLinear,SplineBase::ModeCatmullrom};
-    if (args.flags.cyclic)
-    {
-        uint32 cyclic_point = 0;
-        // MoveSplineFlag::Enter_Cycle support dropped
-        //if (splineflags & SPLINEFLAG_ENTER_CYCLE)
-        //cyclic_point = 1;   // shouldn't be modified, came from client
-        spline.init_cyclic_spline(&args.path[0], args.path.size(), modes[args.flags.isSmooth()], cyclic_point);
-    }
-    else
+    struct FallInitializer
     {
-        spline.init_spline(&args.path[0], args.path.size(), modes[args.flags.isSmooth()]);
-    }
+        FallInitializer(float _start_elevation) : start_elevation(_start_elevation) {}
+        float start_elevation;
+        inline int32 operator()(Spline<int32>& s, int32 i)
+        {
+            return Movement::computeFallTime(start_elevation - s.getPoint(i + 1).z, false) * 1000.f;
+        }
+    };
 
-    // init spline timestamps
-    if (splineflags.falling)
+    enum
     {
-        FallInitializer init(spline.getPoint(spline.first()).z);
-        spline.initLengths(init);
-    }
-    else
+        minimal_duration = 1,
+    };
+
+    struct CommonInitializer
     {
-        CommonInitializer init(args.velocity);
-        spline.initLengths(init);
-    }
+        CommonInitializer(float _velocity) : velocityInv(1000.f / _velocity), time(minimal_duration) {}
+        float velocityInv;
+        int32 time;
+        inline int32 operator()(Spline<int32>& s, int32 i)
+        {
+            time += (s.SegLength(i) * velocityInv);
+            return time;
+        }
+    };
 
-    // TODO: what to do in such cases? problem is in input data (all points are at same coords)
-    if (spline.length() < minimal_duration)
+    void MoveSpline::init_spline(const MoveSplineInitArgs& args)
     {
-        sLog.outError("MoveSpline::init_spline: zero length spline, wrong input data?");
-        spline.set_length(spline.last(), spline.isCyclic() ? 1000 : 1);
+        const SplineBase::EvaluationMode modes[2] = {SplineBase::ModeLinear, SplineBase::ModeCatmullrom};
+        if (args.flags.cyclic)
+        {
+            uint32 cyclic_point = 0;
+            // MoveSplineFlag::Enter_Cycle support dropped
+            // if (splineflags & SPLINEFLAG_ENTER_CYCLE)
+            // cyclic_point = 1;   // shouldn't be modified, came from client
+            spline.init_cyclic_spline(&args.path[0], args.path.size(), modes[args.flags.isSmooth()], cyclic_point);
+        }
+        else
+        {
+            spline.init_spline(&args.path[0], args.path.size(), modes[args.flags.isSmooth()]);
+        }
+
+        // init spline timestamps
+        if (splineflags.falling)
+        {
+            FallInitializer init(spline.getPoint(spline.first()).z);
+            spline.initLengths(init);
+        }
+        else
+        {
+            CommonInitializer init(args.velocity);
+            spline.initLengths(init);
+        }
+
+        // TODO: what to do in such cases? problem is in input data (all points are at same coords)
+        if (spline.length() < minimal_duration)
+        {
+            sLog.outError("MoveSpline::init_spline: zero length spline, wrong input data?");
+            spline.set_length(spline.last(), spline.isCyclic() ? 1000 : 1);
+        }
+        point_Idx = spline.first();
     }
-    point_Idx = spline.first();
-}
 
-void MoveSpline::Initialize(const MoveSplineInitArgs& args)
-{
-    splineflags = args.flags;
-    facing = args.facing;
-    m_Id = args.splineId;
-    point_Idx_offset = args.path_Idx_offset;
-    initialOrientation = args.initialOrientation;
+    void MoveSpline::Initialize(const MoveSplineInitArgs& args)
+    {
+        splineflags = args.flags;
+        facing = args.facing;
+        m_Id = args.splineId;
+        point_Idx_offset = args.path_Idx_offset;
+        initialOrientation = args.initialOrientation;
 
-    time_passed = 0;
-    vertical_acceleration = 0.f;
-    effect_start_time = 0;
+        time_passed = 0;
+        vertical_acceleration = 0.f;
+        effect_start_time = 0;
 
-    init_spline(args);
+        init_spline(args);
 
-    // init parabolic / animation
-    // spline initialized, duration known and i able to compute parabolic acceleration
-    if (args.flags & (MoveSplineFlag::Parabolic | MoveSplineFlag::Animation))
-    {
-        effect_start_time = Duration() * args.time_perc;
-        if (args.flags.parabolic && effect_start_time < Duration())
+        // init parabolic / animation
+        // spline initialized, duration known and i able to compute parabolic acceleration
+        if (args.flags & (MoveSplineFlag::Parabolic | MoveSplineFlag::Animation))
         {
-            float f_duration = MSToSec(Duration() - effect_start_time);
-            vertical_acceleration = args.parabolic_amplitude * 8.f / (f_duration * f_duration);
+            effect_start_time = Duration() * args.time_perc;
+            if (args.flags.parabolic && effect_start_time < Duration())
+            {
+                float f_duration = MSToSec(Duration() - effect_start_time);
+                vertical_acceleration = args.parabolic_amplitude * 8.f / (f_duration * f_duration);
+            }
         }
     }
-}
 
-MoveSpline::MoveSpline() : m_Id(0), time_passed(0),
-    vertical_acceleration(0.f), effect_start_time(0), point_Idx(0), point_Idx_offset(0), initialOrientation(0.f)
-{
-    splineflags.done = true;
-}
+    MoveSpline::MoveSpline() : m_Id(0), time_passed(0),
+        vertical_acceleration(0.0f), initialOrientation(0.0f), effect_start_time(0), point_Idx(0), point_Idx_offset(0)
+    {
+        splineflags.done = true;
+    }
 
 /// ============================================================================================
 
-bool MoveSplineInitArgs::Validate() const
-{
+    bool MoveSplineInitArgs::Validate(Unit* unit) const
+    {
 #define CHECK(exp) \
     if (!(exp))\
     {\
-        sLog.outError("MoveSplineInitArgs::Validate: expression '%s' failed", #exp);\
+        sLog.outError("MoveSplineInitArgs::Validate expression '%s' failed for %s", #exp, unit ? unit->GetGuidStr().c_str(): "<none>");\
         return false;\
     }
-    CHECK(path.size() > 1);
-    CHECK(velocity > 0.f);
-    CHECK(time_perc >= 0.f && time_perc <= 1.f);
-    //CHECK(_checkPathBounds());
-    return true;
+        CHECK(path.size() > 1);
+        CHECK(velocity > 0.f);
+        CHECK(time_perc >= 0.f && time_perc <= 1.f);
+        // CHECK(_checkPathBounds());
+        return true;
 #undef CHECK
-}
+    }
 
-// MONSTER_MOVE packet format limitation for not CatmullRom movement:
-// each vertex offset packed into 11 bytes
-bool MoveSplineInitArgs::_checkPathBounds() const
-{
-    if (!(flags & MoveSplineFlag::Mask_CatmullRom) && path.size() > 2)
+    // MONSTER_MOVE packet format limitation for not CatmullRom movement:   
+    // each vertex offset packed into 11 bytes
+    bool MoveSplineInitArgs::_checkPathBounds() const
     {
-        enum{
-            MAX_OFFSET = (1 << 11) / 2,
-        };
-        Vector3 middle = (path.front()+path.back()) / 2;
-        Vector3 offset;
-        for (uint32 i = 1; i < path.size()-1; ++i)
+        if (!(flags & MoveSplineFlag::Mask_CatmullRom) && path.size() > 2)
         {
-            offset = path[i] - middle;
-            if (fabs(offset.x) >= MAX_OFFSET || fabs(offset.y) >= MAX_OFFSET || fabs(offset.z) >= MAX_OFFSET)
+            enum
+            {
+                MAX_OFFSET = (1 << 11) / 2,
+            };
+            Vector3 middle = (path.front() + path.back()) / 2;
+            Vector3 offset;
+            for (uint32 i = 1; i < path.size() - 1; ++i)
             {
-                sLog.outError("MoveSplineInitArgs::_checkPathBounds check failed");
-                return false;
+                offset = path[i] - middle;
+                if (fabs(offset.x) >= MAX_OFFSET || fabs(offset.y) >= MAX_OFFSET || fabs(offset.z) >= MAX_OFFSET)
+                {
+                    sLog.outError("MoveSplineInitArgs::_checkPathBounds check failed");
+                    return false;
+                }
             }
         }
+        return true;
     }
-    return true;
-}
 
 /// ============================================================================================
 
-MoveSpline::UpdateResult MoveSpline::_updateState(int32& ms_time_diff)
-{
-    if (Finalized())
+    MoveSpline::UpdateResult MoveSpline::_updateState(int32& ms_time_diff)
     {
-        ms_time_diff = 0;
-        return Result_Arrived;
-    }
+        if (Finalized())
+        {
+            ms_time_diff = 0;
+            return Result_Arrived;
+        }
 
-    UpdateResult result = Result_None;
+        UpdateResult result = Result_None;
 
-    int32 minimal_diff = std::min(ms_time_diff, segment_time_elapsed());
-    MANGOS_ASSERT(minimal_diff >= 0);
-    time_passed += minimal_diff;
-    ms_time_diff -= minimal_diff;
+        int32 minimal_diff = std::min(ms_time_diff, segment_time_elapsed());
+        MANGOS_ASSERT(minimal_diff >= 0);
+        time_passed += minimal_diff;
+        ms_time_diff -= minimal_diff;
 
-    if (time_passed >= next_timestamp())
-    {
-        ++point_Idx;
-        if (point_Idx < spline.last())
-        {
-            result = Result_NextSegment;
-        }
-        else
+        if (time_passed >= next_timestamp())
         {
-            if (spline.isCyclic())
+            ++point_Idx;
+            if (point_Idx < spline.last())
             {
-                point_Idx = spline.first();
-                time_passed = time_passed % Duration();
                 result = Result_NextSegment;
             }
             else
             {
-                _Finalize();
-                ms_time_diff = 0;
-                result = Result_Arrived;
+                if (spline.isCyclic())
+                {
+                    point_Idx = spline.first();
+                    time_passed = time_passed % Duration();
+                    result = Result_NextSegment;
+                }
+                else
+                {
+                    _Finalize();
+                    ms_time_diff = 0;
+                    result = Result_Arrived;
+                }
             }
         }
-    }
 
-    return result;
-}
+        return result;
+    }
 
-std::string MoveSpline::ToString() const
-{
-    std::stringstream str;
-    str << "MoveSpline" << std::endl;
-    str << "spline Id: " << GetId() << std::endl;
-    str << "flags: " << splineflags.ToString() << std::endl;
-    if (splineflags.final_angle)
-        str << "facing  angle: " << facing.angle;
-    else if (splineflags.final_target)
-        str << "facing target: " << facing.target;
-    else if(splineflags.final_point)
-        str << "facing  point: " << facing.f.x << " " << facing.f.y << " " << facing.f.z;
-    str << std::endl;
-    str << "time passed: " << time_passed << std::endl;
-    str << "total  time: " << Duration() << std::endl;
-    str << "spline point Id: " << point_Idx << std::endl;
-    str << "path  point  Id: " << currentPathIdx() << std::endl;
-    str << spline.ToString();
-    return str.str();
-}
+    std::string MoveSpline::ToString() const
+    {
+        std::stringstream str;
+        str << "MoveSpline" << std::endl;
+        str << "spline Id: " << GetId() << std::endl;
+        str << "flags: " << splineflags.ToString() << std::endl;
+        if (splineflags.final_angle)
+            str << "facing  angle: " << facing.angle;
+        else if (splineflags.final_target)
+            str << "facing target: " << facing.target;
+        else if (splineflags.final_point)
+            str << "facing  point: " << facing.f.x << " " << facing.f.y << " " << facing.f.z;
+        str << std::endl;
+        str << "time passed: " << time_passed << std::endl;
+        str << "total  time: " << Duration() << std::endl;
+        str << "spline point Id: " << point_Idx << std::endl;
+        str << "path  point  Id: " << currentPathIdx() << std::endl;
+        str << spline.ToString();
+        return str.str();
+    }
 
-void MoveSpline::_Finalize()
-{
-    splineflags.done = true;
-    point_Idx = spline.last() - 1;
-    time_passed = Duration();
-}
+    void MoveSpline::_Finalize()
+    {
+        splineflags.done = true;
+        point_Idx = spline.last() - 1;
+        time_passed = Duration();
+    }
 
-int32 MoveSpline::currentPathIdx() const
-{
-    int32 point = point_Idx_offset + point_Idx - spline.first() + (int)Finalized();
-    if (isCyclic())
-        point = point % (spline.last()-spline.first());
-    return point;
-}
+    int32 MoveSpline::currentPathIdx() const
+    {
+        int32 point = point_Idx_offset + point_Idx - spline.first() + (int)Finalized();
+        if (isCyclic())
+            point = point % (spline.last() - spline.first());
+        return point;
+    }
 }
diff --git a/src/game/movement/MoveSpline.h b/src/game/movement/MoveSpline.h
index e40054edef6..ce7ecc0d8a9 100644
--- a/src/game/movement/MoveSpline.h
+++ b/src/game/movement/MoveSpline.h
@@ -21,106 +21,98 @@
 
 #include "spline.h"
 #include "MoveSplineInitArgs.h"
+#include "WorldLocation.h"
 
 namespace Movement
 {
-    struct Location : public Vector3
-    {
-        Location() : orientation(0) {}
-        Location(float x, float y, float z, float o) : Vector3(x,y,z), orientation(o) {}
-        Location(const Vector3& v) : Vector3(v), orientation(0) {}
-        Location(const Vector3& v, float o) : Vector3(v), orientation(o) {}
-
-        float orientation;
-    };
-
     // MoveSpline represents smooth catmullrom or linear curve and point that moves belong it
     // curve can be cyclic - in this case movement will be cyclic
     // point can have vertical acceleration motion componemt(used in fall, parabolic movement)
     class MoveSpline
     {
-    public:
-        typedef Spline<int32> MySpline;
-        enum UpdateResult{
-            Result_None         = 0x01,
-            Result_Arrived      = 0x02,
-            Result_NextCycle    = 0x04,
-            Result_NextSegment  = 0x08,
-        };
-        friend class PacketBuilder;
-    protected:
-        MySpline        spline;
-
-        FacingInfo      facing;
-
-        uint32          m_Id;
-
-        MoveSplineFlag  splineflags;
-
-        int32           time_passed;
-        // currently duration mods are unused, but its _currently_
-        //float           duration_mod;
-        //float           duration_mod_next;
-        float           vertical_acceleration;
-        float           initialOrientation;
-        int32           effect_start_time;
-        int32           point_Idx;
-        int32           point_Idx_offset;
-
-        void init_spline(const MoveSplineInitArgs& args);
-    protected:
-
-        const MySpline::ControlArray& getPath() const { return spline.getPoints();}
-        void computeParabolicElevation(float& el) const;
-        void computeFallElevation(float& el) const;
-
-        UpdateResult _updateState(int32& ms_time_diff);
-        int32 next_timestamp() const { return spline.length(point_Idx+1);}
-        int32 segment_time_elapsed() const { return next_timestamp()-time_passed;}
-        int32 timeElapsed() const { return Duration() - time_passed;}
-        int32 timePassed() const { return time_passed;}
-
-    public:
-        const MySpline& _Spline() const { return spline;}
-        int32 _currentSplineIdx() const { return point_Idx;}
-        void _Finalize();
-        void _Interrupt() { splineflags.done = true;}
-
-    public:
-
-        void Initialize(const MoveSplineInitArgs&);
-        bool Initialized() const { return !spline.empty();}
-
-        explicit MoveSpline();
-
-        template<class UpdateHandler>
-        void updateState(int32 difftime, UpdateHandler& handler)
-        {
-            MANGOS_ASSERT(Initialized());
-            do
-                handler(_updateState(difftime));
-            while(difftime > 0);
-        }
-
-        void updateState(int32 difftime)
-        {
-            MANGOS_ASSERT(Initialized());
-            do _updateState(difftime);
-            while(difftime > 0);
-        }
-
-        Location ComputePosition() const;
-
-        uint32 GetId() const { return m_Id;}
-        bool Finalized() const { return splineflags.done; }
-        bool isCyclic() const { return splineflags.cyclic;}
-        const Vector3 FinalDestination() const { return Initialized() ? spline.getPoint(spline.last()) : Vector3();}
-        const Vector3 CurrentDestination() const { return Initialized() ? spline.getPoint(point_Idx+1) : Vector3();}
-        int32 currentPathIdx() const;
-
-        int32 Duration() const { return spline.length();}
-
-        std::string ToString() const;
+        public:
+            typedef Spline<int32> MySpline;
+            enum UpdateResult
+            {
+                Result_None         = 0x01,
+                Result_Arrived      = 0x02,
+                Result_NextCycle    = 0x04,
+                Result_NextSegment  = 0x08,
+            };
+            friend class PacketBuilder;
+        protected:
+            MySpline        spline;
+
+            FacingInfo      facing;
+
+            uint32          m_Id;
+
+            MoveSplineFlag  splineflags;
+
+            int32           time_passed;
+            // currently duration mods are unused, but its _currently_
+            // float           duration_mod;
+            // float           duration_mod_next;
+            float           vertical_acceleration;
+            float           initialOrientation;
+            int32           effect_start_time;
+            int32           point_Idx;
+            int32           point_Idx_offset;
+
+            void init_spline(const MoveSplineInitArgs& args);
+        protected:
+
+            const MySpline::ControlArray& getPath() const { return spline.getPoints();}
+            void computeParabolicElevation(float& el) const;
+            void computeFallElevation(float& el) const;
+
+            UpdateResult _updateState(int32& ms_time_diff);
+            int32 next_timestamp() const { return spline.length(point_Idx + 1);}
+            int32 segment_time_elapsed() const { return next_timestamp() - time_passed;}
+            int32 timeElapsed() const { return Duration() - time_passed;}
+            int32 timePassed() const { return time_passed;}
+
+        public:
+            const MySpline& _Spline() const { return spline;}
+            int32 _currentSplineIdx() const { return point_Idx;}
+            void _Finalize();
+            void _Interrupt() { splineflags.done = true;}
+
+        public:
+
+            void Initialize(const MoveSplineInitArgs&);
+            bool Initialized() const { return !spline.empty();}
+
+            explicit MoveSpline();
+
+            template<class UpdateHandler>
+            void updateState(int32 difftime, UpdateHandler& handler)
+            {
+                MANGOS_ASSERT(Initialized());
+                do
+                    handler(_updateState(difftime));
+                while (difftime > 0);
+            }
+
+            void updateState(int32 difftime)
+            {
+                MANGOS_ASSERT(Initialized());
+                do _updateState(difftime);
+                while (difftime > 0);
+            }
+
+            Position ComputePosition() const;
+
+            uint32 GetId() const { return m_Id;}
+            bool Finalized() const { return splineflags.done; }
+            bool isCyclic() const { return splineflags.cyclic;}
+            const Vector3 FinalDestination() const { return Initialized() ? spline.getPoint(spline.last()) : Vector3();}
+            const Vector3 CurrentDestination() const { return Initialized() ? spline.getPoint(point_Idx + 1) : Vector3();}
+            int32 currentPathIdx() const;
+
+            int32 Duration() const { return spline.length();}
+
+            std::string ToString() const;
     };
 }
 #endif // MANGOSSERVER_MOVEPLINE_H
diff --git a/src/game/movement/MoveSplineFlag.h b/src/game/movement/MoveSplineFlag.h
index 6b1f92db44f..a7a6c12827d 100644
--- a/src/game/movement/MoveSplineFlag.h
+++ b/src/game/movement/MoveSplineFlag.h
@@ -32,106 +32,109 @@ namespace Movement
 
     class MoveSplineFlag
     {
-    public:
-        enum eFlags{
-            None         = 0x00000000,
-                                                 // x00-xFF(first byte) used as animation Ids storage in pair with Animation flag
-            Done         = 0x00000100,
-            Falling      = 0x00000200,           // Affects elevation computation, can't be combined with Parabolic flag
-            No_Spline    = 0x00000400,
-            Parabolic    = 0x00000800,           // Affects elevation computation, can't be combined with Falling flag
-            Walkmode     = 0x00001000,
-            Flying       = 0x00002000,           // Smooth movement(Catmullrom interpolation mode), flying animation
-            OrientationFixed = 0x00004000,       // Model orientation fixed
-            Final_Point  = 0x00008000,
-            Final_Target = 0x00010000,
-            Final_Angle  = 0x00020000,
-            Catmullrom   = 0x00040000,           // Used Catmullrom interpolation mode
-            Cyclic       = 0x00080000,           // Movement by cycled spline
-            Enter_Cycle  = 0x00100000,           // Everytimes appears with cyclic flag in monster move packet, erases first spline vertex after first cycle done
-            Animation    = 0x00200000,           // Plays animation after some time passed
-            Frozen       = 0x00400000,           // Will never arrive
-            Unknown5     = 0x00800000,
-            Unknown6     = 0x01000000,
-            Unknown7     = 0x02000000,
-            Unknown8     = 0x04000000,
-            OrientationInversed = 0x08000000,
-            Unknown10    = 0x10000000,
-            Unknown11    = 0x20000000,
-            Unknown12    = 0x40000000,
-            Unknown13    = 0x80000000,
+        public:
+            enum eFlags
+            {
+                None         = 0x00000000,
+                // x00-xFF(first byte) used as animation Ids storage in pair with Animation flag
+                Done         = 0x00000100,
+                Falling      = 0x00000200,           // Affects elevation computation, can't be combined with Parabolic flag
+                No_Spline    = 0x00000400,
+                Parabolic    = 0x00000800,           // Affects elevation computation, can't be combined with Falling flag
+                Walkmode     = 0x00001000,
+                Flying       = 0x00002000,           // Smooth movement(Catmullrom interpolation mode), flying animation
+                OrientationFixed = 0x00004000,       // Model orientation fixed
+                Final_Point  = 0x00008000,
+                Final_Target = 0x00010000,
+                Final_Angle  = 0x00020000,
+                Catmullrom   = 0x00040000,           // Used Catmullrom interpolation mode
+                Cyclic       = 0x00080000,           // Movement by cycled spline
+                Enter_Cycle  = 0x00100000,           // Everytimes appears with cyclic flag in monster move packet, erases first spline vertex after first cycle done
+                Animation    = 0x00200000,           // Plays animation after some time passed
+                Frozen       = 0x00400000,           // Will never arrive
+                BoardVehicle = 0x00800000,
+                ExitVehicle  = 0x01000000,
+                Unknown7     = 0x02000000,
+                Unknown8     = 0x04000000,
+                OrientationInversed = 0x08000000,
+                Unknown10    = 0x10000000,
+                Unknown11    = 0x20000000,
+                Unknown12    = 0x40000000,
+                Unknown13    = 0x80000000,
 
-            // Masks
-            Mask_Final_Facing = Final_Point | Final_Target | Final_Angle,
-            // animation ids stored here, see AnimType enum, used with Animation flag
-            Mask_Animations = 0xFF,
-            // flags that shouldn't be appended into SMSG_MONSTER_MOVE\SMSG_MONSTER_MOVE_TRANSPORT packet, should be more probably
-            Mask_No_Monster_Move = Mask_Final_Facing | Mask_Animations | Done,
-            // CatmullRom interpolation mode used
-            Mask_CatmullRom = Flying | Catmullrom,
-            // Unused, not suported flags
-            Mask_Unused = No_Spline|Enter_Cycle|Frozen|Unknown5|Unknown6|Unknown7|Unknown8|Unknown10|Unknown11|Unknown12|Unknown13,
-        };
+                // Masks
+                Mask_Final_Facing = Final_Point | Final_Target | Final_Angle,
+                // animation ids stored here, see AnimType enum, used with Animation flag
+                Mask_Animations = 0xFF,
+                // flags that shouldn't be appended into SMSG_MONSTER_MOVE\SMSG_MONSTER_MOVE_TRANSPORT packet, should be more probably
+                Mask_No_Monster_Move = Mask_Final_Facing | Mask_Animations | Done,
+                // CatmullRom interpolation mode used
+                Mask_CatmullRom = Flying | Catmullrom,
+                // Unused, not suported flags
+                Mask_Unused = No_Spline | Enter_Cycle | Frozen | Unknown7 | Unknown8 | Unknown10 | Unknown11 | Unknown12 | Unknown13,
+            };
 
-        inline uint32& raw() { return (uint32&)*this;}
-        inline const uint32& raw() const { return (const uint32&)*this;}
+            inline uint32& raw() { return *reinterpret_cast<uint32*>(this);}
+            inline const uint32& raw() const { return *reinterpret_cast<uint32 const*>(this);}
 
-        MoveSplineFlag() { raw() = 0; }
-        MoveSplineFlag(uint32 f) { raw() = f; }
-        MoveSplineFlag(const MoveSplineFlag& f) { raw() = f.raw(); }
+            MoveSplineFlag() { raw() = 0; }
+            MoveSplineFlag(uint32 f) { raw() = f; }
+            MoveSplineFlag(const MoveSplineFlag& f) { raw() = f.raw(); }
 
-        // Constant interface
+            // Constant interface
 
-        bool isSmooth() const { return raw() & Mask_CatmullRom;}
-        bool isLinear() const { return !isSmooth();}
-        bool isFacing() const { return raw() & Mask_Final_Facing;}
+            bool isSmooth() const { return raw() & Mask_CatmullRom;}
+            bool isLinear() const { return !isSmooth();}
+            bool isFacing() const { return raw() & Mask_Final_Facing;}
 
-        uint8 getAnimationId() const { return animId;}
-        bool hasAllFlags(uint32 f) const { return (raw() & f) == f;}
-        bool hasFlag(uint32 f) const { return (raw() & f) != 0;}
-        uint32 operator & (uint32 f) const { return (raw() & f);}
-        uint32 operator | (uint32 f) const { return (raw() | f);}
-        std::string ToString() const;
+            uint8 getAnimationId() const { return animId;}
+            bool hasAllFlags(uint32 f) const { return (raw() & f) == f;}
+            bool hasFlag(uint32 f) const { return (raw() & f) != 0;}
+            uint32 operator & (uint32 f) const { return (raw() & f);}
+            uint32 operator | (uint32 f) const { return (raw() | f);}
+            std::string ToString() const;
 
-        // Not constant interface
+            // Not constant interface
 
-        void operator &= (uint32 f) { raw() &= f;}
-        void operator |= (uint32 f) { raw() |= f;}
+            void operator &= (uint32 f) { raw() &= f;}
+            void operator |= (uint32 f) { raw() |= f;}
 
-        void EnableAnimation(uint8 anim) { raw() = raw() & ~(Mask_Animations|Falling|Parabolic) | Animation|anim;}
-        void EnableParabolic() { raw() = raw() & ~(Mask_Animations|Falling|Animation) | Parabolic;}
-        void EnableFalling() { raw() = raw() & ~(Mask_Animations|Parabolic|Animation) | Falling;}
-        void EnableFlying() { raw() = raw() & ~Catmullrom | Flying; }
-        void EnableCatmullRom() { raw() = raw() & ~Flying | Catmullrom; }
-        void EnableFacingPoint() { raw() = raw() & ~Mask_Final_Facing | Final_Point;}
-        void EnableFacingAngle() { raw() = raw() & ~Mask_Final_Facing | Final_Angle;}
-        void EnableFacingTarget() { raw() = raw() & ~Mask_Final_Facing | Final_Target;}
+            void EnableAnimation(uint8 anim) { raw() = (raw() & ~(Mask_Animations | Falling | Parabolic))   | Animation | anim;}
+            void EnableParabolic()           { raw() = (raw() & ~(Mask_Animations | Falling | Animation))   | Parabolic;}
+            void EnableFalling()             { raw() = (raw() & ~(Mask_Animations | Parabolic | Animation)) | Falling;}
+            void EnableFlying()              { raw() = (raw() & ~Catmullrom)                                | Flying; }
+            void EnableCatmullRom()          { raw() = (raw() & ~Flying)                                    | Catmullrom; }
+            void EnableFacingPoint()         { raw() = (raw() & ~Mask_Final_Facing)                         | Final_Point;}
+            void EnableFacingAngle()         { raw() = (raw() & ~Mask_Final_Facing)                         | Final_Angle;}
+            void EnableFacingTarget()        { raw() = (raw() & ~Mask_Final_Facing)                         | Final_Target;}
+            void EnableBoardVehicle()        { raw() = (raw() & ~(Catmullrom | ExitVehicle))                | BoardVehicle; }
+            void EnableExitVehicle()         { raw() = (raw() & ~BoardVehicle)                              | ExitVehicle; }
 
-        uint8 animId       : 8;
-        bool done          : 1;
-        bool falling       : 1;
-        bool no_spline     : 1;
-        bool parabolic     : 1;
-        bool walkmode      : 1;
-        bool flying        : 1;
-        bool orientationFixed : 1;
-        bool final_point   : 1;
-        bool final_target  : 1;
-        bool final_angle   : 1;
-        bool catmullrom    : 1;
-        bool cyclic        : 1;
-        bool enter_cycle   : 1;
-        bool animation     : 1;
-        bool frozen        : 1;
-        bool unknown5      : 1;
-        bool unknown6      : 1;
-        bool unknown7      : 1;
-        bool unknown8      : 1;
-        bool orientationInversed : 1;
-        bool unknown10     : 1;
-        bool unknown11     : 1;
-        bool unknown12     : 1;
-        bool unknown13     : 1;
+            uint8 animId       : 8;
+            bool done          : 1;
+            bool falling       : 1;
+            bool no_spline     : 1;
+            bool parabolic     : 1;
+            bool walkmode      : 1;
+            bool flying        : 1;
+            bool orientationFixed : 1;
+            bool final_point   : 1;
+            bool final_target  : 1;
+            bool final_angle   : 1;
+            bool catmullrom    : 1;
+            bool cyclic        : 1;
+            bool enter_cycle   : 1;
+            bool animation     : 1;
+            bool frozen        : 1;
+            bool boardVehicle  : 1;
+            bool exitVehicle   : 1;
+            bool unknown7      : 1;
+            bool unknown8      : 1;
+            bool orientationInversed : 1;
+            bool unknown10     : 1;
+            bool unknown11     : 1;
+            bool unknown12     : 1;
+            bool unknown13     : 1;
     };
 #if defined( __GNUC__ )
 #pragma pack()
diff --git a/src/game/movement/MoveSplineInit.cpp b/src/game/movement/MoveSplineInit.cpp
index eccef0ccdcb..75cb2dd38bb 100644
--- a/src/game/movement/MoveSplineInit.cpp
+++ b/src/game/movement/MoveSplineInit.cpp
@@ -20,6 +20,8 @@
 #include "MoveSpline.h"
 #include "packet_builder.h"
 #include "../Unit.h"
+#include "../GameObject.h"
+#include "../TransportSystem.h"
 
 namespace Movement
 {
@@ -27,7 +29,7 @@ namespace Movement
     {
         if (moveFlags & MOVEFLAG_FLYING)
         {
-            if ( moveFlags & MOVEFLAG_BACKWARD /*&& speed_obj.flight >= speed_obj.flight_back*/ )
+            if (moveFlags & MOVEFLAG_BACKWARD /*&& speed_obj.flight >= speed_obj.flight_back*/)
                 return MOVE_FLIGHT_BACK;
             else
                 return MOVE_FLIGHT;
@@ -41,7 +43,7 @@ namespace Movement
         }
         else if (moveFlags & MOVEFLAG_WALK_MODE)
         {
-            //if ( speed_obj.run > speed_obj.walk )
+            // if ( speed_obj.run > speed_obj.walk )
             return MOVE_WALK;
         }
         else if (moveFlags & MOVEFLAG_BACKWARD /*&& speed_obj.run >= speed_obj.run_back*/)
@@ -50,38 +52,58 @@ namespace Movement
         return MOVE_RUN;
     }
 
-    int32 MoveSplineInit::Launch()
+    int32 MoveSplineInit<Unit*>::Launch()
     {
         MoveSpline& move_spline = *unit.movespline;
+        TransportInfo* transportInfo = unit.GetTransportInfo();
+
+        Position real_position = transportInfo ?
+                                    transportInfo->GetLocalPosition() :
+                                    unit.GetPosition();
 
-        Location real_position(unit.GetPositionX(),unit.GetPositionY(),unit.GetPositionZ(),unit.GetOrientation());
         // there is a big chane that current position is unknown if current state is not finalized, need compute it
         // this also allows calculate spline position and update map position in much greater intervals
-        if (!move_spline.Finalized())
+        if (!move_spline.Finalized() && !transportInfo)
             real_position = move_spline.ComputePosition();
 
         if (args.path.empty())
         {
-            // should i do the things that user should do?
+            // form final position only for rotate
+            if (!args.flags.isFacing())
+                return 0;
             MoveTo(real_position);
         }
+        else
+        {
+            // check path equivalence
+            if (!args.flags.isFacing() && args.path.size() == 2 && args.path[0] == args.path[1])
+                return 0;
+        }
 
         // corrent first vertex
         args.path[0] = real_position;
         args.initialOrientation = real_position.orientation;
 
         uint32 moveFlags = unit.m_movementInfo.GetMovementFlags();
-        if (args.flags.walkmode)
-            moveFlags |= MOVEFLAG_WALK_MODE;
-        else
-            moveFlags &= ~MOVEFLAG_WALK_MODE;
+        moveFlags |= (MOVEFLAG_SPLINE_ENABLED | MOVEFLAG_FORWARD);
 
-        moveFlags |= (MOVEFLAG_SPLINE_ENABLED|MOVEFLAG_FORWARD);
+        if (moveFlags & MOVEFLAG_ROOT)
+            moveFlags &= ~MOVEFLAG_MASK_MOVING;
 
-        if (args.velocity == 0.f)
-            args.velocity = unit.GetSpeed(SelectSpeedType(moveFlags));
+        if (fabs(args.velocity) < M_NULL_F)
+        {
+            // Add or remove walk mode flag for select speed depending from call SetWalk()
+            // in spline initialization. Not need change the real unit move flags.
+            uint32 moveFlagsForSpeed = moveFlags;
+            if (args.flags.walkmode)
+                moveFlagsForSpeed |= MOVEFLAG_WALK_MODE;
+            else
+                moveFlagsForSpeed &= ~MOVEFLAG_WALK_MODE;
 
-        if (!args.Validate())
+            args.velocity = unit.GetSpeed(SelectSpeedType(moveFlagsForSpeed));
+        }
+
+        if (!args.Validate(&unit))
             return 0;
 
         unit.m_movementInfo.SetMovementFlags((MovementFlags)moveFlags);
@@ -89,28 +111,80 @@ namespace Movement
 
         WorldPacket data(SMSG_MONSTER_MOVE, 64);
         data << unit.GetPackGUID();
+
+        if (transportInfo)
+        {
+            data.SetOpcode(SMSG_MONSTER_MOVE_TRANSPORT);
+            data << transportInfo->GetTransportGuid().WriteAsPacked();
+            data << int8(transportInfo->GetTransportSeat());
+        }
+
         PacketBuilder::WriteMonsterMove(move_spline, data);
-        unit.SendMessageToSet(&data,true);
+        unit.SendMessageToSet(&data, true);
 
         return move_spline.Duration();
     }
 
-    MoveSplineInit::MoveSplineInit(Unit& m) : unit(m)
+    MoveSplineInit<Unit*>::MoveSplineInit(Unit& m) : unit(m)
     {
         // mix existing state into new
         args.flags.walkmode = unit.m_movementInfo.HasMovementFlag(MOVEFLAG_WALK_MODE);
-        args.flags.flying = unit.m_movementInfo.HasMovementFlag((MovementFlags)(MOVEFLAG_FLYING|MOVEFLAG_LEVITATING));
+        args.flags.flying = unit.m_movementInfo.HasMovementFlag((MovementFlags)(MOVEFLAG_FLYING | MOVEFLAG_LEVITATING));
     }
 
-    void MoveSplineInit::SetFacing(const Unit * target)
+    void MoveSplineInit<Unit*>::SetFacing(const Unit* target)
     {
         args.flags.EnableFacingTarget();
         args.facing.target = target->GetObjectGuid().GetRawValue();
     }
 
-    void MoveSplineInit::SetFacing(float angle)
+    void MoveSplineInit<Unit*>::SetFacing(float angle)
     {
         args.facing.angle = G3D::wrap(angle, 0.f, (float)G3D::twoPi());
         args.flags.EnableFacingAngle();
     }
+
+    MoveSplineInit<GameObject*>::MoveSplineInit(GameObject& go) : gameobject(go)
+    {
+    }
+
+    int32 MoveSplineInit<GameObject*>::Launch()
+    {
+        MoveSpline& move_spline = *gameobject.movespline;
+        TransportInfo* transportInfo = gameobject.GetTransportInfo();
+
+        Position real_position = transportInfo ?
+                                    transportInfo->GetLocalPosition() :
+                                    gameobject.GetPosition();
+
+        // there is a big chane that current position is unknown if current state is not finalized, need compute it
+        // this also allows calculate spline position and update map position in much greater intervals
+        if (!move_spline.Finalized())
+            real_position = move_spline.ComputePosition();
+
+        if (args.path.empty())
+        {
+            // form final position only for rotate
+            if (!args.flags.isFacing())
+                return 0;
+            MoveTo(real_position);
+        }
+        else
+        {
+            // check path equivalence
+            if (!args.flags.isFacing() && args.path.size() == 2 && args.path[0] == args.path[1])
+                return 0;
+        }
+
+        // corrent first vertex
+        args.path[0] = real_position;
+        args.initialOrientation = real_position.orientation;
+
+        if (fabs(args.velocity) < M_NULL_F)
+            return 0;
+//            args.velocity = gameobject.GetSpeed();
+
+        move_spline.Initialize(args);
+        return move_spline.Duration();
+    }
 }
diff --git a/src/game/movement/MoveSplineInit.h b/src/game/movement/MoveSplineInit.h
index 0149c7b3a23..3256565cbf2 100644
--- a/src/game/movement/MoveSplineInit.h
+++ b/src/game/movement/MoveSplineInit.h
@@ -23,6 +23,7 @@
 #include "../PathFinder.h"
 
 class Unit;
+class GameObject;
 
 namespace Movement
 {
@@ -34,116 +35,133 @@ namespace Movement
         FlyToGround = 3, // 463 = FlyToGround
     };
 
+    template <class T> class MANGOS_DLL_SPEC MoveSplineInit;
+
     /*  Initializes and launches spline movement
      */
-    class MANGOS_DLL_SPEC MoveSplineInit
+    template <> class MANGOS_DLL_SPEC MoveSplineInit<Unit*>
     {
-    public:
-
-        explicit MoveSplineInit(Unit& m);
-
-        /* Final pass of initialization that launches spline movement.
-         * @return duration - estimated travel time
-         */
-        int32 Launch();
-
-        /* Adds movement by parabolic trajectory
-         * @param amplitude  - the maximum height of parabola, value could be negative and positive
-         * @param start_time - delay between movement starting time and beginning to move by parabolic trajectory
-         * can't be combined with final animation
-         */
-        void SetParabolic(float amplitude, float start_time);
-        /* Plays animation after movement done
-         * can't be combined with parabolic movement
-         */
-        void SetAnimation(AnimType anim);
-
-        /* Adds final facing animation
-         * sets unit's facing to specified point/angle after all path done
-         * you can have only one final facing: previous will be overriden
-         */
-        void SetFacing(float angle);
-        void SetFacing(Vector3 const& point);
-        void SetFacing(const Unit * target);
-
-        /* Initializes movement by path
-         * @param path - array of points, shouldn't be empty
-         * @param pointId - Id of fisrt point of the path. Example: when third path point will be done it will notify that pointId + 3 done
-         */
-        void MovebyPath(const PointsArray& path, int32 pointId = 0);
-
-        /* Initializes simple A to B mition, A is current unit's position, B is destination
-         */
-        void MoveTo(const Vector3& destination, bool generatePath = false, bool forceDestination = false);
-        void MoveTo(float x, float y, float z, bool generatePath = false, bool forceDestination = false);
-
-        /* Sets Id of fisrt point of the path. When N-th path point will be done ILisener will notify that pointId + N done
-         * Needed for waypoint movement where path splitten into parts
-         */
-        void SetFirstPointId(int32 pointId) { args.path_Idx_offset = pointId; }
-
-        /* Enables CatmullRom spline interpolation mode(makes path smooth)
-         * if not enabled linear spline mode will be choosen. Disabled by default
-         */
-        void SetSmooth();
-        /* Enables CatmullRom spline interpolation mode, enables flying animation. Disabled by default
-         */
-        void SetFly();
-        /* Enables walk mode. Disabled by default
-         */
-        void SetWalk(bool enable);
-        /* Makes movement cyclic. Disabled by default
-         */
-        void SetCyclic();
-        /* Enables falling mode. Disabled by default
-         */
-        void SetFall();
-        /* Inverses unit model orientation. Disabled by default
-         */
-        void SetOrientationInversed();
-        /* Fixes unit's model rotation. Disabled by default
-         */
-        void SetOrientationFixed(bool enable);
-
-        /* Sets the velocity (in case you want to have custom movement velocity)
-         * if no set, speed will be selected based on unit's speeds and current movement mode
-         * Has no effect if falling mode enabled
-         * velocity shouldn't be negative
-         */
-        void SetVelocity(float velocity);
-
-        PointsArray& Path() { return args.path; }
-
-    protected:
-
-        MoveSplineInitArgs args;
-        Unit&  unit;
+        public:
+
+            explicit MoveSplineInit(Unit& m);
+
+            /* Final pass of initialization that launches spline movement.
+             * @return duration - estimated travel time
+             */
+            int32 Launch();
+
+            /* Adds movement by parabolic trajectory
+             * @param amplitude  - the maximum height of parabola, value could be negative and positive
+             * @param start_time - delay between movement starting time and beginning to move by parabolic trajectory
+             * can't be combined with final animation
+             */
+            void SetParabolic(float amplitude, float start_time);
+            /* Plays animation after movement done
+             * can't be combined with parabolic movement
+             */
+            void SetAnimation(AnimType anim);
+
+            /* Adds final facing animation
+             * sets unit's facing to specified point/angle after all path done
+             * you can have only one final facing: previous will be overriden
+             */
+            void SetFacing(float angle);
+            void SetFacing(Vector3 const& point);
+            void SetFacing(const Unit* target);
+
+            /* Initializes movement by path
+             * @param path - array of points, shouldn't be empty
+             * @param pointId - Id of fisrt point of the path. Example: when third path point will be done it will notify that pointId + 3 done
+             */
+            void MovebyPath(const PointsArray& path, int32 pointId = 0);
+
+            /* Initializes simple A to B mition, A is current unit's position, B is destination
+             */
+            void MoveTo(const Vector3& destination, bool generatePath = false, bool forceDestination = false);
+            void MoveTo(float x, float y, float z, bool generatePath = false, bool forceDestination = false);
+
+            /* Sets Id of fisrt point of the path. When N-th path point will be done ILisener will notify that pointId + N done
+             * Needed for waypoint movement where path splitten into parts
+             */
+            void SetFirstPointId(int32 pointId) { args.path_Idx_offset = pointId; }
+
+            /* Enables CatmullRom spline interpolation mode(makes path smooth)
+             * if not enabled linear spline mode will be choosen. Disabled by default
+             */
+            void SetSmooth();
+            /* Enables CatmullRom spline interpolation mode, enables flying animation. Disabled by default
+             */
+            void SetFly();
+            /* Enables walk mode. Disabled by default
+             */
+            void SetWalk(bool enable);
+            /* Makes movement cyclic. Disabled by default
+             */
+            void SetCyclic();
+            /* Enables falling mode. Disabled by default
+             */
+            void SetFall();
+            /* Inverses unit model orientation. Disabled by default
+             */
+            void SetOrientationInversed();
+            /* Fixes unit's model rotation. Disabled by default
+             */
+            void SetOrientationFixed(bool enable);
+
+            /* Enables transport enter/exit modes
+             */
+            void SetTransportEnter();
+            void SetTransportExit();
+
+            /* Sets the velocity (in case you want to have custom movement velocity)
+             * if no set, speed will be selected based on unit's speeds and current movement mode
+             * Has no effect if falling mode enabled
+             * velocity shouldn't be negative
+             */
+            void SetVelocity(float velocity);
+
+            /* Sets BoardVehicle flag
+             */
+            void SetBoardVehicle();
+
+            /* Sets ExitVehicle flag
+             */
+            void SetExitVehicle();
+
+            PointsArray& Path() { return args.path; }
+
+        protected:
+
+            MoveSplineInitArgs args;
+            Unit&  unit;
     };
 
-    inline void MoveSplineInit::SetFly() { args.flags.EnableFlying();}
-    inline void MoveSplineInit::SetWalk(bool enable) { args.flags.walkmode = enable;}
-    inline void MoveSplineInit::SetSmooth() { args.flags.EnableCatmullRom();}
-    inline void MoveSplineInit::SetCyclic() { args.flags.cyclic = true;}
-    inline void MoveSplineInit::SetFall() { args.flags.EnableFalling();}
-    inline void MoveSplineInit::SetVelocity(float vel){  args.velocity = vel;}
-    inline void MoveSplineInit::SetOrientationInversed() { args.flags.orientationInversed = true;}
-    inline void MoveSplineInit::SetOrientationFixed(bool enable) { args.flags.orientationFixed = enable;}
-
-    inline void MoveSplineInit::MovebyPath(const PointsArray& controls, int32 path_offset)
+    inline void MoveSplineInit<Unit*>::SetFly() { args.flags.EnableFlying();}
+    inline void MoveSplineInit<Unit*>::SetWalk(bool enable) { args.flags.walkmode = enable;}
+    inline void MoveSplineInit<Unit*>::SetSmooth() { args.flags.EnableCatmullRom();}
+    inline void MoveSplineInit<Unit*>::SetCyclic() { args.flags.cyclic = true;}
+    inline void MoveSplineInit<Unit*>::SetFall() { args.flags.EnableFalling();}
+    inline void MoveSplineInit<Unit*>::SetVelocity(float vel) {  args.velocity = vel;}
+    inline void MoveSplineInit<Unit*>::SetOrientationInversed() { args.flags.orientationInversed = true;}
+    inline void MoveSplineInit<Unit*>::SetOrientationFixed(bool enable) { args.flags.orientationFixed = enable;}
+    inline void MoveSplineInit<Unit*>::SetBoardVehicle() { args.flags.EnableBoardVehicle(); }
+    inline void MoveSplineInit<Unit*>::SetExitVehicle() { args.flags.EnableExitVehicle(); }
+
+    inline void MoveSplineInit<Unit*>::MovebyPath(const PointsArray& controls, int32 path_offset)
     {
         args.path_Idx_offset = path_offset;
-        args.path.assign(controls.begin(),controls.end());
+        args.path.assign(controls.begin(), controls.end());
     }
 
-    inline void MoveSplineInit::MoveTo(float x, float y, float z, bool generatePath, bool forceDestination)
+    inline void MoveSplineInit<Unit*>::MoveTo(float x, float y, float z, bool generatePath, bool forceDestination)
     {
-        Vector3 v(x,y,z);
+        Vector3 v(x, y, z);
         MoveTo(v, generatePath, forceDestination);
     }
 
-    inline void MoveSplineInit::MoveTo(const Vector3& dest, bool generatePath, bool forceDestination)
+    inline void MoveSplineInit<Unit*>::MoveTo(const Vector3& dest, bool generatePath, bool forceDestination)
     {
-        if(generatePath)
+        if (generatePath)
         {
             PathFinder path(&unit);
             path.calculate(dest.x, dest.y, dest.z, forceDestination);
@@ -157,25 +175,75 @@ namespace Movement
         }
     }
 
-    inline void MoveSplineInit::SetParabolic(float amplitude, float time_shift)
+    inline void MoveSplineInit<Unit*>::SetParabolic(float amplitude, float time_shift)
     {
         args.time_perc = time_shift;
         args.parabolic_amplitude = amplitude;
         args.flags.EnableParabolic();
     }
 
-    inline void MoveSplineInit::SetAnimation(AnimType anim)
+    inline void MoveSplineInit<Unit*>::SetAnimation(AnimType anim)
     {
         args.time_perc = 0.f;
         args.flags.EnableAnimation((uint8)anim);
     }
 
-    inline void MoveSplineInit::SetFacing(Vector3 const& spot)
+    inline void MoveSplineInit<Unit*>::SetFacing(Vector3 const& spot)
     {
         args.facing.f.x = spot.x;
         args.facing.f.y = spot.y;
         args.facing.f.z = spot.z;
         args.flags.EnableFacingPoint();
     }
+
+    template <> class MANGOS_DLL_SPEC MoveSplineInit<GameObject*>
+    {
+        public:
+            explicit MoveSplineInit(GameObject& go);
+            int32 Launch();
+            void SetParabolic(float amplitude, float start_time);
+            void MovebyPath(const PointsArray& path, int32 pointId = 0);
+            void MoveTo(const Vector3& destination);
+            void MoveTo(float x, float y, float z);
+            void SetFirstPointId(int32 pointId) { args.path_Idx_offset = pointId; }
+            void SetSmooth();
+            void SetFly();
+            void SetCyclic();
+            void SetFall();
+            void SetOrientationInversed();
+            void SetOrientationFixed(bool enable);
+            void SetVelocity(float velocity);
+
+            PointsArray& Path() { return args.path; }
+
+        protected:
+            MoveSplineInitArgs args;
+            GameObject&  gameobject;
+    };
+
+    inline void MoveSplineInit<GameObject*>::SetFly() { args.flags.EnableFlying();}
+    inline void MoveSplineInit<GameObject*>::SetSmooth() { args.flags.EnableCatmullRom();}
+    inline void MoveSplineInit<GameObject*>::SetCyclic() { args.flags.cyclic = true;}
+    inline void MoveSplineInit<GameObject*>::SetFall() { args.flags.EnableFalling();}
+    inline void MoveSplineInit<GameObject*>::SetVelocity(float vel) {  args.velocity = vel;}
+    inline void MoveSplineInit<GameObject*>::SetOrientationInversed() { args.flags.orientationInversed = true;}
+    inline void MoveSplineInit<GameObject*>::SetParabolic(float amplitude, float time_shift)
+    {
+        args.time_perc = time_shift;
+        args.parabolic_amplitude = amplitude;
+        args.flags.EnableParabolic();
+    }
+    inline void MoveSplineInit<GameObject*>::MoveTo(float x, float y, float z)
+    {
+        Vector3 v(x, y, z);
+        MoveTo(v);
+    }
+
+    inline void MoveSplineInit<GameObject*>::MoveTo(const Vector3& dest)
+    {
+        args.path_Idx_offset = 0;
+        args.path.resize(2);
+        args.path[1] = dest;
+    }
 }
 #endif // MANGOSSERVER_MOVESPLINEINIT_H
diff --git a/src/game/movement/MoveSplineInitArgs.h b/src/game/movement/MoveSplineInitArgs.h
index 51459faebe0..28d4bbfa665 100644
--- a/src/game/movement/MoveSplineInitArgs.h
+++ b/src/game/movement/MoveSplineInitArgs.h
@@ -22,15 +22,18 @@
 #include "MoveSplineFlag.h"
 #include <G3D/Vector3.h>
 
+class Unit;
+
 namespace Movement
 {
     typedef std::vector<Vector3> PointsArray;
 
     union FacingInfo
     {
-        struct{
-            float x,y,z;
-        }f;
+        struct
+        {
+            float x, y, z;
+        } f;
         uint64  target;
         float   angle;
 
@@ -41,26 +44,26 @@ namespace Movement
 
     struct MoveSplineInitArgs
     {
-        MoveSplineInitArgs(size_t path_capacity = 16) : path_Idx_offset(0),
-            velocity(0.f), parabolic_amplitude(0.f), time_perc(0.f), splineId(0), initialOrientation(0.f)
-        {
-            path.reserve(path_capacity);
-        }
+            MoveSplineInitArgs(size_t path_capacity = 16) : path_Idx_offset(0),
+                velocity(0.f), parabolic_amplitude(0.f), time_perc(0.f), splineId(0), initialOrientation(0.f)
+            {
+                path.reserve(path_capacity);
+            }
 
-        PointsArray path;
-        FacingInfo facing;
-        MoveSplineFlag flags;
-        int32 path_Idx_offset;
-        float velocity;
-        float parabolic_amplitude;
-        float time_perc;
-        uint32 splineId;
-        float initialOrientation;
+            PointsArray path;
+            FacingInfo facing;
+            MoveSplineFlag flags;
+            int32 path_Idx_offset;
+            float velocity;
+            float parabolic_amplitude;
+            float time_perc;
+            uint32 splineId;
+            float initialOrientation;
 
-        /** Returns true to show that the arguments were configured correctly and MoveSpline initialization will succeed. */
-        bool Validate() const;
-    private:
-        bool _checkPathBounds() const;
+            /** Returns true to show that the arguments were configured correctly and MoveSpline initialization will succeed. */
+            bool Validate(Unit* unit) const;
+        private:
+            bool _checkPathBounds() const;
     };
 }
 
diff --git a/src/game/movement/packet_builder.cpp b/src/game/movement/packet_builder.cpp
index 7c1488773fe..752e99bb44b 100644
--- a/src/game/movement/packet_builder.cpp
+++ b/src/game/movement/packet_builder.cpp
@@ -56,23 +56,23 @@ namespace Movement
         data << move_spline.spline.getPoint(move_spline.spline.first());
         data << move_spline.GetId();
 
-        switch(splineflags & MoveSplineFlag::Mask_Final_Facing)
+        switch (splineflags & MoveSplineFlag::Mask_Final_Facing)
         {
-        default:
-            data << uint8(MonsterMoveNormal);
-            break;
-        case MoveSplineFlag::Final_Target:
-            data << uint8(MonsterMoveFacingTarget);
-            data << move_spline.facing.target;
-            break;
-        case MoveSplineFlag::Final_Angle:
-            data << uint8(MonsterMoveFacingAngle);
-            data << move_spline.facing.angle;
-            break;
-        case MoveSplineFlag::Final_Point:
-            data << uint8(MonsterMoveFacingSpot);
-            data << move_spline.facing.f.x << move_spline.facing.f.y << move_spline.facing.f.z;
-            break;
+            default:
+                data << uint8(MonsterMoveNormal);
+                break;
+            case MoveSplineFlag::Final_Target:
+                data << uint8(MonsterMoveFacingTarget);
+                data << move_spline.facing.target;
+                break;
+            case MoveSplineFlag::Final_Angle:
+                data << uint8(MonsterMoveFacingAngle);
+                data << move_spline.facing.angle;
+                break;
+            case MoveSplineFlag::Final_Point:
+                data << uint8(MonsterMoveFacingSpot);
+                data << move_spline.facing.f.x << move_spline.facing.f.y << move_spline.facing.f.z;
+                break;
         }
 
         // add fake Enter_Cycle flag - needed for client-side cyclic movement (client will erase first spline vertex after first cycle done)
@@ -97,7 +97,7 @@ namespace Movement
     void WriteLinearPath(const Spline<int32>& spline, ByteBuffer& data)
     {
         uint32 last_idx = spline.getPointCount() - 3;
-        const Vector3 * real_path = &spline.getPoint(1);
+        const Vector3* real_path = &spline.getPoint(1);
 
         data << last_idx;
         data << real_path[last_idx];   // destination
@@ -106,7 +106,7 @@ namespace Movement
             Vector3 middle = (real_path[0] + real_path[last_idx]) / 2.f;
             Vector3 offset;
             // first and last points already appended
-            for(uint32 i = 1; i < last_idx; ++i)
+            for (uint32 i = 1; i < last_idx; ++i)
             {
                 offset = middle - real_path[i];
                 data.appendPackXYZ(offset.x, offset.y, offset.z);
@@ -148,9 +148,9 @@ namespace Movement
 
     void PacketBuilder::WriteCreate(const MoveSpline& move_spline, ByteBuffer& data)
     {
-        //WriteClientStatus(mov,data);
-        //data.append<float>(&mov.m_float_values[SpeedWalk], SpeedMaxCount);
-        //if (mov.SplineEnabled())
+        // WriteClientStatus(mov,data);
+        // data.append<float>(&mov.m_float_values[SpeedWalk], SpeedMaxCount);
+        // if (mov.SplineEnabled())
         {
             MoveSplineFlag splineFlags = move_spline.splineflags;
 
@@ -164,7 +164,7 @@ namespace Movement
             {
                 data << move_spline.facing.target;
             }
-            else if(splineFlags.final_point)
+            else if (splineFlags.final_point)
             {
                 data << move_spline.facing.f.x << move_spline.facing.f.y << move_spline.facing.f.z;
             }
diff --git a/src/game/movement/packet_builder.h b/src/game/movement/packet_builder.h
index f1536078639..7d91bdda760 100644
--- a/src/game/movement/packet_builder.h
+++ b/src/game/movement/packet_builder.h
@@ -27,11 +27,11 @@ namespace Movement
     class MoveSpline;
     class PacketBuilder
     {
-        static void WriteCommonMonsterMovePart(const MoveSpline& mov, WorldPacket& data);
-    public:
+            static void WriteCommonMonsterMovePart(const MoveSpline& mov, WorldPacket& data);
+        public:
 
-        static void WriteMonsterMove(const MoveSpline& mov, WorldPacket& data);
-        static void WriteCreate(const MoveSpline& mov, ByteBuffer& data);
+            static void WriteMonsterMove(const MoveSpline& mov, WorldPacket& data);
+            static void WriteCreate(const MoveSpline& mov, ByteBuffer& data);
     };
 }
 #endif // MANGOSSERVER_PACKET_BUILDER_H
diff --git a/src/game/movement/spline.cpp b/src/game/movement/spline.cpp
index 5f6d70bb837..94aef891dab 100644
--- a/src/game/movement/spline.cpp
+++ b/src/game/movement/spline.cpp
@@ -20,288 +20,289 @@
 #include <sstream>
 #include <G3D/Matrix4.h>
 
-namespace Movement{
-
-SplineBase::EvaluationMethtod SplineBase::evaluators[SplineBase::ModesEnd] =
+namespace Movement
 {
-    &SplineBase::EvaluateLinear,
-    &SplineBase::EvaluateCatmullRom,
-    &SplineBase::EvaluateBezier3,
-    (EvaluationMethtod)&SplineBase::UninitializedSpline,
-};
 
-SplineBase::EvaluationMethtod SplineBase::derivative_evaluators[SplineBase::ModesEnd] =
-{
-    &SplineBase::EvaluateDerivativeLinear,
-    &SplineBase::EvaluateDerivativeCatmullRom,
-    &SplineBase::EvaluateDerivativeBezier3,
-    (EvaluationMethtod)&SplineBase::UninitializedSpline,
-};
+    SplineBase::EvaluationMethtod SplineBase::evaluators[SplineBase::ModesEnd] =
+    {
+        &SplineBase::EvaluateLinear,
+        &SplineBase::EvaluateCatmullRom,
+        &SplineBase::EvaluateBezier3,
+        (EvaluationMethtod)& SplineBase::UninitializedSpline,
+    };
 
-SplineBase::SegLenghtMethtod SplineBase::seglengths[SplineBase::ModesEnd] =
-{
-    &SplineBase::SegLengthLinear,
-    &SplineBase::SegLengthCatmullRom,
-    &SplineBase::SegLengthBezier3,
-    (SegLenghtMethtod)&SplineBase::UninitializedSpline,
-};
+    SplineBase::EvaluationMethtod SplineBase::derivative_evaluators[SplineBase::ModesEnd] =
+    {
+        &SplineBase::EvaluateDerivativeLinear,
+        &SplineBase::EvaluateDerivativeCatmullRom,
+        &SplineBase::EvaluateDerivativeBezier3,
+        (EvaluationMethtod)& SplineBase::UninitializedSpline,
+    };
 
-SplineBase::InitMethtod SplineBase::initializers[SplineBase::ModesEnd] =
-{
-    //&SplineBase::InitLinear,
-    &SplineBase::InitCatmullRom,    // we should use catmullrom initializer even for linear mode! (client's internal structure limitation)
-    &SplineBase::InitCatmullRom,
-    &SplineBase::InitBezier3,
-    (InitMethtod)&SplineBase::UninitializedSpline,
-};
+    SplineBase::SegLenghtMethtod SplineBase::seglengths[SplineBase::ModesEnd] =
+    {
+        &SplineBase::SegLengthLinear,
+        &SplineBase::SegLengthCatmullRom,
+        &SplineBase::SegLengthBezier3,
+        (SegLenghtMethtod)& SplineBase::UninitializedSpline,
+    };
 
-///////////
-#pragma region evaluation methtods
-
-using G3D::Matrix4;
-static const Matrix4 s_catmullRomCoeffs(
-    -0.5f, 1.5f,-1.5f, 0.5f,
-    1.f, -2.5f, 2.f, -0.5f,
-    -0.5f, 0.f,  0.5f, 0.f,
-    0.f,  1.f,  0.f,  0.f);
-
-static const Matrix4 s_Bezier3Coeffs(
-    -1.f,  3.f, -3.f, 1.f,
-    3.f, -6.f,  3.f, 0.f,
-    -3.f,  3.f,  0.f, 0.f,
-    1.f,  0.f,  0.f, 0.f);
-
-/*  classic view:
-inline void C_Evaluate(const Vector3 *vertice, float t, const float (&matrix)[4][4], Vector3 &position)
-{
-    Vector3 tvec(t*t*t, t*t, t);
-    int i = 0;
-    double c;
-    double x = 0, y = 0, z = 0;
-    while ( i < 4 )
+    SplineBase::InitMethtod SplineBase::initializers[SplineBase::ModesEnd] =
     {
-        c = matrix[0][i]*tvec.x + matrix[1][i]*tvec.y + matrix[2][i]*tvec.z + matrix[3][i];
+        //&SplineBase::InitLinear,
+        &SplineBase::InitCatmullRom,    // we should use catmullrom initializer even for linear mode! (client's internal structure limitation)
+        &SplineBase::InitCatmullRom,
+        &SplineBase::InitBezier3,
+        (InitMethtod)& SplineBase::UninitializedSpline,
+    };
 
-        x += c * vertice->x;
-        y += c * vertice->y;
-        z += c * vertice->z;
+///////////
+    #pragma region evaluation methtods
+
+    using G3D::Matrix4;
+    static const Matrix4 s_catmullRomCoeffs(
+        -0.5f, 1.5f, -1.5f, 0.5f,
+        1.f, -2.5f, 2.f, -0.5f,
+        -0.5f, 0.f,  0.5f, 0.f,
+        0.f,  1.f,  0.f,  0.f);
+
+    static const Matrix4 s_Bezier3Coeffs(
+        -1.f,  3.f, -3.f, 1.f,
+        3.f, -6.f,  3.f, 0.f,
+        -3.f,  3.f,  0.f, 0.f,
+        1.f,  0.f,  0.f, 0.f);
+
+    /*  classic view:
+    inline void C_Evaluate(const Vector3 *vertice, float t, const float (&matrix)[4][4], Vector3 &position)
+    {
+        Vector3 tvec(t*t*t, t*t, t);
+        int i = 0;
+        double c;
+        double x = 0, y = 0, z = 0;
+        while ( i < 4 )
+        {
+            c = matrix[0][i]*tvec.x + matrix[1][i]*tvec.y + matrix[2][i]*tvec.z + matrix[3][i];
+
+            x += c * vertice->x;
+            y += c * vertice->y;
+            z += c * vertice->z;
+
+            ++i;
+            ++vertice;
+        }
+
+        position.x = x;
+        position.y = y;
+        position.z = z;
+    }*/
+
+    inline void C_Evaluate(const Vector3* vertice, float t, const Matrix4& matr, Vector3& result)
+    {
+        Vector4 tvec(t * t * t, t * t, t, 1.f);
+        Vector4 weights(tvec * matr);
 
-        ++i;
-        ++vertice;
+        result = vertice[0] * weights[0] + vertice[1] * weights[1]
+                 + vertice[2] * weights[2] + vertice[3] * weights[3];
     }
 
-    position.x = x;
-    position.y = y;
-    position.z = z;
-}*/
-
-inline void C_Evaluate(const Vector3 *vertice, float t, const Matrix4& matr, Vector3 &result)
-{
-    Vector4 tvec(t*t*t, t*t, t, 1.f);
-    Vector4 weights(tvec * matr);
-
-    result = vertice[0] * weights[0] + vertice[1] * weights[1]
-           + vertice[2] * weights[2] + vertice[3] * weights[3];
-}
-
-inline void C_Evaluate_Derivative(const Vector3 *vertice, float t, const Matrix4& matr, Vector3 &result)
-{
-    Vector4 tvec(3.f*t*t, 2.f*t, 1.f, 0.f);
-    Vector4 weights(tvec * matr);
-
-    result = vertice[0] * weights[0] + vertice[1] * weights[1]
-           + vertice[2] * weights[2] + vertice[3] * weights[3];
-}
-
-void SplineBase::EvaluateLinear(index_type index, float u, Vector3& result) const
-{
-    MANGOS_ASSERT(index >= index_lo && index < index_hi);
-    result = points[index] + (points[index+1] - points[index]) * u;
-}
-
-void SplineBase::EvaluateCatmullRom( index_type index, float t, Vector3& result) const
-{
-    MANGOS_ASSERT(index >= index_lo && index < index_hi);
-    C_Evaluate(&points[index - 1], t, s_catmullRomCoeffs, result);
-}
+    inline void C_Evaluate_Derivative(const Vector3* vertice, float t, const Matrix4& matr, Vector3& result)
+    {
+        Vector4 tvec(3.f * t * t, 2.f * t, 1.f, 0.f);
+        Vector4 weights(tvec * matr);
 
-void SplineBase::EvaluateBezier3(index_type index, float t, Vector3& result) const
-{
-    index *= 3u;
-    MANGOS_ASSERT(index >= index_lo && index < index_hi);
-    C_Evaluate(&points[index], t, s_Bezier3Coeffs, result);
-}
+        result = vertice[0] * weights[0] + vertice[1] * weights[1]
+                 + vertice[2] * weights[2] + vertice[3] * weights[3];
+    }
 
-void SplineBase::EvaluateDerivativeLinear(index_type index, float, Vector3& result) const
-{
-    MANGOS_ASSERT(index >= index_lo && index < index_hi);
-    result = points[index+1] - points[index];
-}
+    void SplineBase::EvaluateLinear(index_type index, float u, Vector3& result) const
+    {
+        MANGOS_ASSERT(index >= index_lo && index < index_hi);
+        result = points[index] + (points[index + 1] - points[index]) * u;
+    }
 
-void SplineBase::EvaluateDerivativeCatmullRom(index_type index, float t, Vector3& result) const
-{
-    MANGOS_ASSERT(index >= index_lo && index < index_hi);
-    C_Evaluate_Derivative(&points[index - 1], t, s_catmullRomCoeffs, result);
-}
+    void SplineBase::EvaluateCatmullRom(index_type index, float t, Vector3& result) const
+    {
+        MANGOS_ASSERT(index >= index_lo && index < index_hi);
+        C_Evaluate(&points[index - 1], t, s_catmullRomCoeffs, result);
+    }
 
-void SplineBase::EvaluateDerivativeBezier3(index_type index, float t, Vector3& result) const
-{
-    index *= 3u;
-    MANGOS_ASSERT(index >= index_lo && index < index_hi);
-    C_Evaluate_Derivative(&points[index], t, s_Bezier3Coeffs, result);
-}
+    void SplineBase::EvaluateBezier3(index_type index, float t, Vector3& result) const
+    {
+        index *= 3u;
+        MANGOS_ASSERT(index >= index_lo && index < index_hi);
+        C_Evaluate(&points[index], t, s_Bezier3Coeffs, result);
+    }
 
-float SplineBase::SegLengthLinear(index_type index) const
-{
-    MANGOS_ASSERT(index >= index_lo && index < index_hi);
-    return (points[index] - points[index+1]).length();
-}
+    void SplineBase::EvaluateDerivativeLinear(index_type index, float, Vector3& result) const
+    {
+        MANGOS_ASSERT(index >= index_lo && index < index_hi);
+        result = points[index + 1] - points[index];
+    }
 
-float SplineBase::SegLengthCatmullRom( index_type index ) const
-{
-    MANGOS_ASSERT(index >= index_lo && index < index_hi);
+    void SplineBase::EvaluateDerivativeCatmullRom(index_type index, float t, Vector3& result) const
+    {
+        MANGOS_ASSERT(index >= index_lo && index < index_hi);
+        C_Evaluate_Derivative(&points[index - 1], t, s_catmullRomCoeffs, result);
+    }
 
-    Vector3 curPos, nextPos;
-    const Vector3 * p = &points[index - 1];
-    curPos = nextPos = p[1];
+    void SplineBase::EvaluateDerivativeBezier3(index_type index, float t, Vector3& result) const
+    {
+        index *= 3u;
+        MANGOS_ASSERT(index >= index_lo && index < index_hi);
+        C_Evaluate_Derivative(&points[index], t, s_Bezier3Coeffs, result);
+    }
 
-    index_type i = 1;
-    double length = 0;
-    while (i <= STEPS_PER_SEGMENT)
+    float SplineBase::SegLengthLinear(index_type index) const
     {
-        C_Evaluate(p, float(i) / float(STEPS_PER_SEGMENT), s_catmullRomCoeffs, nextPos);
-        length += (nextPos - curPos).length();
-        curPos = nextPos;
-        ++i;
+        MANGOS_ASSERT(index >= index_lo && index < index_hi);
+        return (points[index] - points[index + 1]).length();
     }
-    return length;
-}
 
-float SplineBase::SegLengthBezier3(index_type index) const
-{
-    index *= 3u;
-    MANGOS_ASSERT(index >= index_lo && index < index_hi);
+    float SplineBase::SegLengthCatmullRom(index_type index) const
+    {
+        MANGOS_ASSERT(index >= index_lo && index < index_hi);
+
+        Vector3 curPos, nextPos;
+        const Vector3* p = &points[index - 1];
+        curPos = nextPos = p[1];
+
+        index_type i = 1;
+        double length = 0;
+        while (i <= STEPS_PER_SEGMENT)
+        {
+            C_Evaluate(p, float(i) / float(STEPS_PER_SEGMENT), s_catmullRomCoeffs, nextPos);
+            length += (nextPos - curPos).length();
+            curPos = nextPos;
+            ++i;
+        }
+        return length;
+    }
 
-    Vector3 curPos, nextPos;
-    const Vector3 * p = &points[index];
+    float SplineBase::SegLengthBezier3(index_type index) const
+    {
+        index *= 3u;
+        MANGOS_ASSERT(index >= index_lo && index < index_hi);
 
-    C_Evaluate(p, 0.f, s_Bezier3Coeffs, nextPos);
-    curPos = nextPos;
+        Vector3 curPos, nextPos;
+        const Vector3* p = &points[index];
 
-    index_type i = 1;
-    double length = 0;
-    while (i <= STEPS_PER_SEGMENT)
-    {
-        C_Evaluate(p, float(i) / float(STEPS_PER_SEGMENT), s_Bezier3Coeffs, nextPos);
-        length += (nextPos - curPos).length();
+        C_Evaluate(p, 0.f, s_Bezier3Coeffs, nextPos);
         curPos = nextPos;
-        ++i;
+
+        index_type i = 1;
+        double length = 0;
+        while (i <= STEPS_PER_SEGMENT)
+        {
+            C_Evaluate(p, float(i) / float(STEPS_PER_SEGMENT), s_Bezier3Coeffs, nextPos);
+            length += (nextPos - curPos).length();
+            curPos = nextPos;
+            ++i;
+        }
+        return length;
     }
-    return length;
-}
-#pragma endregion
+    #pragma endregion
 
-void SplineBase::init_spline(const Vector3 * controls, index_type count, EvaluationMode m)
-{
-    m_mode = m;
-    cyclic = false;
+    void SplineBase::init_spline(const Vector3* controls, index_type count, EvaluationMode m)
+    {
+        m_mode = m;
+        cyclic = false;
 
-    (this->*initializers[m_mode])(controls, count, cyclic, 0);
-}
+        (this->*initializers[m_mode])(controls, count, cyclic, 0);
+    }
 
-void SplineBase::init_cyclic_spline(const Vector3 * controls, index_type count, EvaluationMode m, index_type cyclic_point)
-{
-    m_mode = m;
-    cyclic = true;
+    void SplineBase::init_cyclic_spline(const Vector3* controls, index_type count, EvaluationMode m, index_type cyclic_point)
+    {
+        m_mode = m;
+        cyclic = true;
 
-    (this->*initializers[m_mode])(controls, count, cyclic, cyclic_point);
-}
+        (this->*initializers[m_mode])(controls, count, cyclic, cyclic_point);
+    }
 
-void SplineBase::InitLinear(const Vector3* controls, index_type count, bool cyclic, index_type cyclic_point)
-{
-    MANGOS_ASSERT(count >= 2);
-    const int real_size = count + 1;
+    void SplineBase::InitLinear(const Vector3* controls, index_type count, bool cyclic, index_type cyclic_point)
+    {
+        MANGOS_ASSERT(count >= 2);
+        const int real_size = count + 1;
 
-    points.resize(real_size);
+        points.resize(real_size);
 
-    memcpy(&points[0],controls, sizeof(Vector3) * count);
+        memcpy(&points[0], controls, sizeof(Vector3) * count);
 
-    // first and last two indexes are space for special 'virtual points'
-    // these points are required for proper C_Evaluate and C_Evaluate_Derivative methtod work
-    if (cyclic)
-        points[count] = controls[cyclic_point];
-    else
-        points[count] = controls[count-1];
+        // first and last two indexes are space for special 'virtual points'
+        // these points are required for proper C_Evaluate and C_Evaluate_Derivative methtod work
+        if (cyclic)
+            points[count] = controls[cyclic_point];
+        else
+            points[count] = controls[count - 1];
 
-    index_lo = 0;
-    index_hi = cyclic ? count : (count - 1);
-}
+        index_lo = 0;
+        index_hi = cyclic ? count : (count - 1);
+    }
 
-void SplineBase::InitCatmullRom(const Vector3* controls, index_type count, bool cyclic, index_type cyclic_point)
-{
-    const int real_size = count + (cyclic ? (1+2) : (1+1));
+    void SplineBase::InitCatmullRom(const Vector3* controls, index_type count, bool cyclic, index_type cyclic_point)
+    {
+        const int real_size = count + (cyclic ? (1 + 2) : (1 + 1));
 
-    points.resize(real_size);
+        points.resize(real_size);
 
-    int lo_index = 1;
-    int high_index = lo_index + count - 1;
+        int lo_index = 1;
+        int high_index = lo_index + count - 1;
 
-    memcpy(&points[lo_index],controls, sizeof(Vector3) * count);
+        memcpy(&points[lo_index], controls, sizeof(Vector3) * count);
 
-    // first and last two indexes are space for special 'virtual points'
-    // these points are required for proper C_Evaluate and C_Evaluate_Derivative methtod work
-    if (cyclic)
-    {
-        if (cyclic_point == 0)
-            points[0] = controls[count-1];
+        // first and last two indexes are space for special 'virtual points'
+        // these points are required for proper C_Evaluate and C_Evaluate_Derivative methtod work
+        if (cyclic)
+        {
+            if (cyclic_point == 0)
+                points[0] = controls[count - 1];
+            else
+                points[0] = controls[0].lerp(controls[1], -1);
+
+            points[high_index + 1] = controls[cyclic_point];
+            points[high_index + 2] = controls[cyclic_point + 1];
+        }
         else
+        {
             points[0] = controls[0].lerp(controls[1], -1);
+            points[high_index + 1] = controls[count - 1];
+        }
 
-        points[high_index+1] = controls[cyclic_point];
-        points[high_index+2] = controls[cyclic_point+1];
-    }
-    else
-    {
-        points[0] = controls[0].lerp(controls[1], -1);
-        points[high_index+1] = controls[count-1];
+        index_lo = lo_index;
+        index_hi = high_index + (cyclic ? 1 : 0);
     }
 
-    index_lo = lo_index;
-    index_hi = high_index + (cyclic ? 1 : 0);
-}
-
-void SplineBase::InitBezier3(const Vector3* controls, index_type count, bool /*cyclic*/, index_type /*cyclic_point*/)
-{
-    index_type c = count / 3u * 3u;
-    index_type t = c / 3u;
+    void SplineBase::InitBezier3(const Vector3* controls, index_type count, bool /*cyclic*/, index_type /*cyclic_point*/)
+    {
+        index_type c = count / 3u * 3u;
+        index_type t = c / 3u;
 
-    points.resize(c);
-    memcpy(&points[0],controls, sizeof(Vector3) * c);
+        points.resize(c);
+        memcpy(&points[0], controls, sizeof(Vector3) * c);
 
-    index_lo = 0;
-    index_hi = t-1;
-    //mov_assert(points.size() % 3 == 0);
-}
+        index_lo = 0;
+        index_hi = t - 1;
+        // mov_assert(points.size() % 3 == 0);
+    }
 
-void SplineBase::clear()
-{
-    index_lo = 0;
-    index_hi = 0;
-    points.clear();
-}
+    void SplineBase::clear()
+    {
+        index_lo = 0;
+        index_hi = 0;
+        points.clear();
+    }
 
-std::string SplineBase::ToString() const
-{
-    std::stringstream str;
-    const char * mode_str[ModesEnd] = {"Linear", "CatmullRom", "Bezier3", "Uninitialized"};
+    std::string SplineBase::ToString() const
+    {
+        std::stringstream str;
+        const char* mode_str[ModesEnd] = {"Linear", "CatmullRom", "Bezier3", "Uninitialized"};
 
-    index_type count = this->points.size();
-    str << "mode: " << mode_str[mode()] << std::endl;
-    str << "points count: " << count << std::endl;
-    for (index_type i = 0; i < count; ++i)
-        str << "point " << i << " : " << points[i].toString() << std::endl;
+        index_type count = this->points.size();
+        str << "mode: " << mode_str[mode()] << std::endl;
+        str << "points count: " << count << std::endl;
+        for (index_type i = 0; i < count; ++i)
+            str << "point " << i << " : " << points[i].toString() << std::endl;
 
-    return str.str();
-}
+        return str.str();
+    }
 
 }
diff --git a/src/game/movement/spline.h b/src/game/movement/spline.h
index dd345670a83..61e6958eb00 100644
--- a/src/game/movement/spline.h
+++ b/src/game/movement/spline.h
@@ -22,184 +22,186 @@
 #include "typedefs.h"
 #include <G3D/Vector3.h>
 
-namespace Movement {
-
-class SplineBase
+namespace Movement
 {
-public:
-    typedef int index_type;
-    typedef std::vector<Vector3> ControlArray;
 
-    enum EvaluationMode
+    class SplineBase
     {
-        ModeLinear,
-        ModeCatmullrom,
-        ModeBezier3_Unused,
-        UninitializedMode,
-        ModesEnd
+        public:
+            typedef int index_type;
+            typedef std::vector<Vector3> ControlArray;
+
+            enum EvaluationMode
+            {
+                ModeLinear,
+                ModeCatmullrom,
+                ModeBezier3_Unused,
+                UninitializedMode,
+                ModesEnd
+            };
+
+        protected:
+            ControlArray points;
+
+            index_type index_lo;
+            index_type index_hi;
+
+            uint8 m_mode;
+            bool cyclic;
+
+            enum
+            {
+                // could be modified, affects segment length evaluation precision
+                // lesser value saves more performance in cost of lover precision
+                // minimal value is 1
+                // client's value is 20, blizzs use 2-3 steps to compute length
+                STEPS_PER_SEGMENT = 3,
+            };
+            static_assert(STEPS_PER_SEGMENT > 0, "shouldn't be lesser than 1");
+
+        protected:
+            void EvaluateLinear(index_type, float, Vector3&) const;
+            void EvaluateCatmullRom(index_type, float, Vector3&) const;
+            void EvaluateBezier3(index_type, float, Vector3&) const;
+            typedef void (SplineBase::*EvaluationMethtod)(index_type, float, Vector3&) const;
+            static EvaluationMethtod evaluators[ModesEnd];
+
+            void EvaluateDerivativeLinear(index_type, float, Vector3&) const;
+            void EvaluateDerivativeCatmullRom(index_type, float, Vector3&) const;
+            void EvaluateDerivativeBezier3(index_type, float, Vector3&) const;
+            static EvaluationMethtod derivative_evaluators[ModesEnd];
+
+            float SegLengthLinear(index_type) const;
+            float SegLengthCatmullRom(index_type) const;
+            float SegLengthBezier3(index_type) const;
+            typedef float(SplineBase::*SegLenghtMethtod)(index_type) const;
+            static SegLenghtMethtod seglengths[ModesEnd];
+
+            void InitLinear(const Vector3*, index_type, bool, index_type);
+            void InitCatmullRom(const Vector3*, index_type, bool, index_type);
+            void InitBezier3(const Vector3*, index_type, bool, index_type);
+            typedef void (SplineBase::*InitMethtod)(const Vector3*, index_type, bool, index_type);
+            static InitMethtod initializers[ModesEnd];
+
+            void UninitializedSpline() const { MANGOS_ASSERT(false);}
+
+        public:
+
+            explicit SplineBase() : index_lo(0), index_hi(0), m_mode(UninitializedMode), cyclic(false) {}
+
+            /** Caclulates the position for given segment Idx, and percent of segment length t
+                @param t - percent of segment length, assumes that t in range [0, 1]
+                @param Idx - spline segment index, should be in range [first, last)
+             */
+            void evaluate_percent(index_type Idx, float u, Vector3& c) const {(this->*evaluators[m_mode])(Idx, u, c);}
+
+            /** Caclulates derivation in index Idx, and percent of segment length t
+                @param Idx - spline segment index, should be in range [first, last)
+                @param t  - percent of spline segment length, assumes that t in range [0, 1]
+             */
+            void evaluate_derivative(index_type Idx, float u, Vector3& hermite) const {(this->*derivative_evaluators[m_mode])(Idx, u, hermite);}
+
+            /**  Bounds for spline indexes. All indexes should be in range [first, last). */
+            index_type first() const { return index_lo;}
+            index_type last()  const { return index_hi;}
+
+            bool empty() const { return index_lo == index_hi;}
+            EvaluationMode mode() const { return (EvaluationMode)m_mode;}
+            bool isCyclic() const { return cyclic;}
+
+            const ControlArray& getPoints() const { return points;}
+            index_type getPointCount() const { return points.size();}
+            const Vector3& getPoint(index_type i) const { return points[i];}
+
+            /** Initializes spline. Don't call other methods while spline not initialized. */
+            void init_spline(const Vector3* controls, index_type count, EvaluationMode m);
+            void init_cyclic_spline(const Vector3* controls, index_type count, EvaluationMode m, index_type cyclic_point);
+
+            /** As i can see there are a lot of ways how spline can be initialized
+                would be no harm to have some custom initializers. */
+            template<class Init> inline void init_spline(Init& initializer)
+            {
+                initializer(m_mode, cyclic, points, index_lo, index_hi);
+            }
+
+            void clear();
+
+            /** Calculates distance between [i; i+1] points, assumes that index i is in bounds. */
+            float SegLength(index_type i) const { return (this->*seglengths[m_mode])(i);}
+
+            std::string ToString() const;
     };
 
-protected:
-    ControlArray points;
-
-    index_type index_lo;
-    index_type index_hi;
-
-    uint8 m_mode;
-    bool cyclic;
-
-    enum{
-        // could be modified, affects segment length evaluation precision
-        // lesser value saves more performance in cost of lover precision
-        // minimal value is 1
-        // client's value is 20, blizzs use 2-3 steps to compute length
-        STEPS_PER_SEGMENT = 3,
-    };
-    static_assert(STEPS_PER_SEGMENT > 0, "shouldn't be lesser than 1");
-
-protected:
-    void EvaluateLinear(index_type, float, Vector3&) const;
-    void EvaluateCatmullRom(index_type, float, Vector3&) const;
-    void EvaluateBezier3(index_type, float, Vector3&) const;
-    typedef void (SplineBase::*EvaluationMethtod)(index_type,float,Vector3&) const;
-    static EvaluationMethtod evaluators[ModesEnd];
-
-    void EvaluateDerivativeLinear(index_type, float, Vector3&) const;
-    void EvaluateDerivativeCatmullRom(index_type, float, Vector3&) const;
-    void EvaluateDerivativeBezier3(index_type, float, Vector3&) const;
-    static EvaluationMethtod derivative_evaluators[ModesEnd];
-
-    float SegLengthLinear(index_type) const;
-    float SegLengthCatmullRom(index_type) const;
-    float SegLengthBezier3(index_type) const;
-    typedef float (SplineBase::*SegLenghtMethtod)(index_type) const;
-    static SegLenghtMethtod seglengths[ModesEnd];
-
-    void InitLinear(const Vector3*, index_type, bool, index_type);
-    void InitCatmullRom(const Vector3*, index_type, bool, index_type);
-    void InitBezier3(const Vector3*, index_type, bool, index_type);
-    typedef void (SplineBase::*InitMethtod)(const Vector3*, index_type, bool, index_type);
-    static InitMethtod initializers[ModesEnd];
-
-    void UninitializedSpline() const { MANGOS_ASSERT(false);}
-
-public:
-
-    explicit SplineBase() : index_lo(0), index_hi(0), m_mode(UninitializedMode), cyclic(false) {}
-
-    /** Caclulates the position for given segment Idx, and percent of segment length t
-        @param t - percent of segment length, assumes that t in range [0, 1]
-        @param Idx - spline segment index, should be in range [first, last)
-     */
-    void evaluate_percent(index_type Idx, float u, Vector3& c) const {(this->*evaluators[m_mode])(Idx,u,c);}
-
-    /** Caclulates derivation in index Idx, and percent of segment length t
-        @param Idx - spline segment index, should be in range [first, last)
-        @param t  - percent of spline segment length, assumes that t in range [0, 1]
-     */
-    void evaluate_derivative(index_type Idx, float u, Vector3& hermite) const {(this->*derivative_evaluators[m_mode])(Idx,u,hermite);}
-
-    /**  Bounds for spline indexes. All indexes should be in range [first, last). */
-    index_type first() const { return index_lo;}
-    index_type last()  const { return index_hi;}
-
-    bool empty() const { return index_lo == index_hi;}
-    EvaluationMode mode() const { return (EvaluationMode)m_mode;}
-    bool isCyclic() const { return cyclic;}
-
-    const ControlArray& getPoints() const { return points;}
-    index_type getPointCount() const { return points.size();}
-    const Vector3& getPoint(index_type i) const { return points[i];}
-
-    /** Initializes spline. Don't call other methods while spline not initialized. */
-    void init_spline(const Vector3 * controls, index_type count, EvaluationMode m);
-    void init_cyclic_spline(const Vector3 * controls, index_type count, EvaluationMode m, index_type cyclic_point);
-
-    /** As i can see there are a lot of ways how spline can be initialized
-        would be no harm to have some custom initializers. */
-    template<class Init> inline void init_spline(Init& initializer)
+    template<typename length_type>
+    class Spline : public SplineBase
     {
-        initializer(m_mode,cyclic,points,index_lo,index_hi);
-    }
-
-    void clear();
-
-    /** Calculates distance between [i; i+1] points, assumes that index i is in bounds. */
-    float SegLength(index_type i) const { return (this->*seglengths[m_mode])(i);}
-
-    std::string ToString() const;
-};
-
-template<typename length_type>
-class Spline : public SplineBase
-{
-public:
-    typedef length_type LengthType;
-    typedef std::vector<length_type> LengthArray;
-protected:
-
-    LengthArray lengths;
-
-    index_type computeIndexInBounds(length_type length) const;
-public:
-
-    explicit Spline(){}
-
-    /** Calculates the position for given t
-        @param t - percent of spline's length, assumes that t in range [0, 1]. */
-    void evaluate_percent(float t, Vector3 & c) const;
-
-    /** Calculates derivation for given t
-        @param t - percent of spline's length, assumes that t in range [0, 1]. */
-    void evaluate_derivative(float t, Vector3& hermite) const;
-
-    /** Calculates the position for given segment Idx, and percent of segment length t
-        @param t = partial_segment_length / whole_segment_length
-        @param Idx - spline segment index, should be in range [first, last). */
-    void evaluate_percent(index_type Idx, float u, Vector3& c) const { SplineBase::evaluate_percent(Idx,u,c);}
-
-    /** Caclulates derivation for index Idx, and percent of segment length t
-        @param Idx - spline segment index, should be in range [first, last)
-        @param t  - percent of spline segment length, assumes that t in range [0, 1]. */
-    void evaluate_derivative(index_type Idx, float u, Vector3& c) const { SplineBase::evaluate_derivative(Idx,u,c);}
-
-    // Assumes that t in range [0, 1]
-    index_type computeIndexInBounds(float t) const;
-    void computeIndex(float t, index_type& out_idx, float& out_u) const;
-
-    /** Initializes spline. Don't call other methods while spline not initialized. */
-    void init_spline(const Vector3 * controls, index_type count, EvaluationMode m) { SplineBase::init_spline(controls,count,m);}
-    void init_cyclic_spline(const Vector3 * controls, index_type count, EvaluationMode m, index_type cyclic_point) { SplineBase::init_cyclic_spline(controls,count,m,cyclic_point);}
-
-    /**  Initializes lengths with SplineBase::SegLength method. */
-    void initLengths();
-
-    /** Initializes lengths in some custom way
-        Note that value returned by cacher must be greater or equal to previous value. */
-    template<class T> inline void initLengths(T& cacher)
-    {
-        index_type i = index_lo;
-        lengths.resize(index_hi+1);
-        length_type prev_length = 0, new_length = 0;
-        while(i < index_hi)
-        {
-            new_length = cacher(*this, i);
-            lengths[++i] = new_length;
-
-            MANGOS_ASSERT(prev_length <= new_length);
-            prev_length = new_length;
-        }
-    }
-
-    /** Returns length of the whole spline. */
-    length_type length() const { return lengths[index_hi];}
-    /** Returns length between given nodes. */
-    length_type length(index_type first, index_type last) const { return lengths[last]-lengths[first];}
-    length_type length(index_type Idx) const { return lengths[Idx];}
-
-    void set_length(index_type i, length_type length) { lengths[i] = length;}
-    void clear();
-};
+        public:
+            typedef length_type LengthType;
+            typedef std::vector<length_type> LengthArray;
+        protected:
+
+            LengthArray lengths;
+
+            index_type computeIndexInBounds(length_type length) const;
+        public:
+
+            explicit Spline() {}
+
+            /** Calculates the position for given t
+                @param t - percent of spline's length, assumes that t in range [0, 1]. */
+            void evaluate_percent(float t, Vector3& c) const;
+
+            /** Calculates derivation for given t
+                @param t - percent of spline's length, assumes that t in range [0, 1]. */
+            void evaluate_derivative(float t, Vector3& hermite) const;
+
+            /** Calculates the position for given segment Idx, and percent of segment length t
+                @param t = partial_segment_length / whole_segment_length
+                @param Idx - spline segment index, should be in range [first, last). */
+            void evaluate_percent(index_type Idx, float u, Vector3& c) const { SplineBase::evaluate_percent(Idx, u, c);}
+
+            /** Caclulates derivation for index Idx, and percent of segment length t
+                @param Idx - spline segment index, should be in range [first, last)
+                @param t  - percent of spline segment length, assumes that t in range [0, 1]. */
+            void evaluate_derivative(index_type Idx, float u, Vector3& c) const { SplineBase::evaluate_derivative(Idx, u, c);}
+
+            // Assumes that t in range [0, 1]
+            index_type computeIndexInBounds(float t) const;
+            void computeIndex(float t, index_type& out_idx, float& out_u) const;
+
+            /** Initializes spline. Don't call other methods while spline not initialized. */
+            void init_spline(const Vector3* controls, index_type count, EvaluationMode m) { SplineBase::init_spline(controls, count, m);}
+            void init_cyclic_spline(const Vector3* controls, index_type count, EvaluationMode m, index_type cyclic_point) { SplineBase::init_cyclic_spline(controls, count, m, cyclic_point);}
+
+            /**  Initializes lengths with SplineBase::SegLength method. */
+            void initLengths();
+
+            /** Initializes lengths in some custom way
+                Note that value returned by cacher must be greater or equal to previous value. */
+            template<class T> inline void initLengths(T& cacher)
+            {
+                index_type i = index_lo;
+                lengths.resize(index_hi + 1);
+                length_type prev_length = 0, new_length = 0;
+                while (i < index_hi)
+                {
+                    new_length = cacher(*this, i);
+                    lengths[++i] = new_length;
+
+                    MANGOS_ASSERT(prev_length <= new_length);
+                    prev_length = new_length;
+                }
+            }
+
+            /** Returns length of the whole spline. */
+            length_type length() const { return lengths[index_hi];}
+            /** Returns length between given nodes. */
+            length_type length(index_type first, index_type last) const { return lengths[last] - lengths[first];}
+            length_type length(index_type Idx) const { return lengths[Idx];}
+
+            void set_length(index_type i, length_type length) { lengths[i] = length;}
+            void clear();
+    };
 
 }
 
diff --git a/src/game/movement/spline.impl.h b/src/game/movement/spline.impl.h
index 928058a60fb..ff297610cc1 100644
--- a/src/game/movement/spline.impl.h
+++ b/src/game/movement/spline.impl.h
@@ -18,80 +18,80 @@
 
 namespace Movement
 {
-template<typename length_type> void Spline<length_type>::evaluate_percent( float t, Vector3 & c ) const
-{
-    index_type Index;
-    float u;
-    computeIndex(t, Index, u);
-    evaluate_percent(Index, u, c);
-}
+    template<typename length_type> void Spline<length_type>::evaluate_percent(float t, Vector3& c) const
+    {
+        index_type Index;
+        float u;
+        computeIndex(t, Index, u);
+        evaluate_percent(Index, u, c);
+    }
 
-template<typename length_type> void Spline<length_type>::evaluate_derivative(float t, Vector3& hermite) const
-{
-    index_type Index;
-    float u;
-    computeIndex(t, Index, u);
-    evaluate_derivative(Index, u, hermite);
-}
+    template<typename length_type> void Spline<length_type>::evaluate_derivative(float t, Vector3& hermite) const
+    {
+        index_type Index;
+        float u;
+        computeIndex(t, Index, u);
+        evaluate_derivative(Index, u, hermite);
+    }
 
-template<typename length_type> SplineBase::index_type Spline<length_type>::computeIndexInBounds(length_type length_) const
-{
+    template<typename length_type> SplineBase::index_type Spline<length_type>::computeIndexInBounds(length_type length_) const
+    {
 // Temporary disabled: causes infinite loop with t = 1.f
-/*
-    index_type hi = index_hi;
-    index_type lo = index_lo;
+        /*
+            index_type hi = index_hi;
+            index_type lo = index_lo;
 
-    index_type i = lo + (float)(hi - lo) * t;
+            index_type i = lo + (float)(hi - lo) * t;
 
-    while ((lengths[i] > length) || (lengths[i + 1] <= length))
-    {
-        if (lengths[i] > length)
-            hi = i - 1; // too big
-        else if (lengths[i + 1] <= length)
-            lo = i + 1; // too small
+            while ((lengths[i] > length) || (lengths[i + 1] <= length))
+            {
+                if (lengths[i] > length)
+                    hi = i - 1; // too big
+                else if (lengths[i + 1] <= length)
+                    lo = i + 1; // too small
 
-        i = (hi + lo) / 2;
-    }*/
+                i = (hi + lo) / 2;
+            }*/
 
-    index_type i = index_lo;
-    index_type N = index_hi;
-    while (i+1 < N && lengths[i+1] < length_)
-        ++i;
+        index_type i = index_lo;
+        index_type N = index_hi;
+        while (i + 1 < N && lengths[i + 1] < length_)
+            ++i;
 
-    return i;
-}
+        return i;
+    }
 
-template<typename length_type> void Spline<length_type>::computeIndex(float t, index_type& index, float& u) const
-{
-    MANGOS_ASSERT(t >= 0.f && t <= 1.f);
-    length_type length_ = t * length();
-    index = computeIndexInBounds(length_);
-    MANGOS_ASSERT(index < index_hi);
-    u = (length_ - length(index)) / (float)length(index, index+1);
-}
+    template<typename length_type> void Spline<length_type>::computeIndex(float t, index_type& index, float& u) const
+    {
+        MANGOS_ASSERT(t >= 0.f && t <= 1.f);
+        length_type length_ = t * length();
+        index = computeIndexInBounds(length_);
+        MANGOS_ASSERT(index < index_hi);
+        u = (length_ - length(index)) / (float)length(index, index + 1);
+    }
 
-template<typename length_type> SplineBase::index_type Spline<length_type>::computeIndexInBounds( float t ) const
-{
-    MANGOS_ASSERT(t >= 0.f && t <= 1.f);
-    return computeIndexInBounds(t * length());
-}
+    template<typename length_type> SplineBase::index_type Spline<length_type>::computeIndexInBounds(float t) const
+    {
+        MANGOS_ASSERT(t >= 0.f && t <= 1.f);
+        return computeIndexInBounds(t * length());
+    }
 
-template<typename length_type> void Spline<length_type>::initLengths()
-{
-    index_type i = index_lo;
-    length_type length = 0;
-    lengths.resize(index_hi+1);
-    while(i < index_hi )
+    template<typename length_type> void Spline<length_type>::initLengths()
     {
-        length += SegLength(i);
-        lengths[++i] = length;
+        index_type i = index_lo;
+        length_type length = 0;
+        lengths.resize(index_hi + 1);
+        while (i < index_hi)
+        {
+            length += SegLength(i);
+            lengths[++i] = length;
+        }
     }
-}
 
-template<typename length_type> void Spline<length_type>::clear()
-{
-    SplineBase::clear();
-    lengths.clear();
-}
+    template<typename length_type> void Spline<length_type>::clear()
+    {
+        SplineBase::clear();
+        lengths.clear();
+    }
 
 }
diff --git a/src/game/movement/typedefs.h b/src/game/movement/typedefs.h
index 936f8c497ee..02d64ae37f9 100644
--- a/src/game/movement/typedefs.h
+++ b/src/game/movement/typedefs.h
@@ -44,32 +44,26 @@ namespace Movement
         return ms / 1000.f;
     }
 
-#ifndef static_assert
-    #define CONCAT(x, y) CONCAT1 (x, y)
-    #define CONCAT1(x, y) x##y
-    #define static_assert(expr, msg) typedef char CONCAT(static_assert_failed_at_line_, __LINE__) [(expr) ? 1 : -1]
-#endif
-
     template<class T, T limit>
     class counter
     {
-    public:
-        counter() { init();}
+        public:
+            counter() { init();}
 
-        void Increase()
-        {
-            if (m_counter == limit)
-                init();
-            else
-                ++m_counter;
-        }
+            void Increase()
+            {
+                if (m_counter == limit)
+                    init();
+                else
+                    ++m_counter;
+            }
 
-        T NewId() { Increase(); return m_counter;}
-        T getCurrent() const { return m_counter;}
+            T NewId() { Increase(); return m_counter;}
+            T getCurrent() const { return m_counter;}
 
-    private:
-        void init() { m_counter = 0; }
-        T m_counter;
+        private:
+            void init() { m_counter = 0; }
+            T m_counter;
     };
 
     typedef counter<uint32, 0xFFFFFFFF> UInt32Counter;
diff --git a/src/game/movement/util.cpp b/src/game/movement/util.cpp
index 7cbcec12617..e6c86f56a55 100644
--- a/src/game/movement/util.cpp
+++ b/src/game/movement/util.cpp
@@ -30,7 +30,7 @@ namespace Movement
 
     const float terminal_length = float(terminalVelocity * terminalVelocity) / (2.f * gravity);
     const float terminal_savefall_length = (terminalSavefallVelocity * terminalSavefallVelocity) / (2.f * gravity);
-    const float terminalFallTime = float(terminalVelocity/gravity); // the time that needed to reach terminalVelocity
+    const float terminalFallTime = float(terminalVelocity / gravity); // the time that needed to reach terminalVelocity
 
     float computeFallTime(float path_length, bool isSafeFall)
     {
@@ -38,19 +38,19 @@ namespace Movement
             return 0.f;
 
         float time;
-        if ( isSafeFall )
+        if (isSafeFall)
         {
             if (path_length >= terminal_savefall_length)
-                time = (path_length - terminal_savefall_length)/terminalSavefallVelocity + terminalSavefallVelocity/gravity;
+                time = (path_length - terminal_savefall_length) / terminalSavefallVelocity + terminalSavefallVelocity / gravity;
             else
-                time = sqrtf(2.f * path_length/gravity);
+                time = sqrtf(2.f * path_length / gravity);
         }
         else
         {
             if (path_length >= terminal_length)
-                time = (path_length - terminal_length)/terminalVelocity + terminalFallTime;
+                time = (path_length - terminal_length) / terminalVelocity + terminalFallTime;
             else
-                time = sqrtf(2.f * path_length/gravity);
+                time = sqrtf(2.f * path_length / gravity);
         }
 
         return time;
@@ -61,20 +61,20 @@ namespace Movement
         float termVel;
         float result;
 
-        if ( isSafeFall )
+        if (isSafeFall)
             termVel = terminalSavefallVelocity;
         else
             termVel = terminalVelocity;
 
-        if ( start_velocity > termVel )
+        if (start_velocity > termVel)
             start_velocity = termVel;
 
         float terminal_time = terminalFallTime - start_velocity / gravity; // the time that needed to reach terminalVelocity
 
-        if ( t_passed > terminal_time )
+        if (t_passed > terminal_time)
         {
-            result = terminalVelocity*(t_passed - terminal_time) +
-                start_velocity*terminal_time + gravity*terminal_time*terminal_time*0.5f;
+            result = terminalVelocity * (t_passed - terminal_time) +
+                     start_velocity * terminal_time + gravity * terminal_time * terminal_time * 0.5f;
         }
         else
             result = t_passed * (start_velocity + t_passed * gravity * 0.5f);
@@ -88,7 +88,7 @@ namespace Movement
 
         if (t_passed > terminalFallTime)
         {
-            //result = terminalVelocity * (t_passed - terminal_time) + gravity*terminal_time*terminal_time*0.5f;
+            // result = terminalVelocity * (t_passed - terminal_time) + gravity*terminal_time*terminal_time*0.5f;
             // simplified view:
             result = terminalVelocity * (t_passed - terminalFallTime) + terminal_length;
         }
@@ -98,95 +98,95 @@ namespace Movement
         return result;
     }
 
-    #define STR(x) #x
+#define STR(x) #x
 
-    const char * g_MovementFlag_names[]=
+    const char* g_MovementFlag_names[] =
     {
-        STR(Forward            ),// 0x00000001,
-        STR(Backward           ),// 0x00000002,
-        STR(Strafe_Left        ),// 0x00000004,
-        STR(Strafe_Right       ),// 0x00000008,
-        STR(Turn_Left          ),// 0x00000010,
-        STR(Turn_Right         ),// 0x00000020,
-        STR(Pitch_Up           ),// 0x00000040,
-        STR(Pitch_Down         ),// 0x00000080,
-
-        STR(Walk               ),// 0x00000100,               // Walking
-        STR(Ontransport        ),// 0x00000200,
-        STR(Levitation         ),// 0x00000400,
-        STR(Root               ),// 0x00000800,
-        STR(Falling            ),// 0x00001000,
-        STR(Fallingfar         ),// 0x00002000,
-        STR(Pendingstop        ),// 0x00004000,
-        STR(PendingSTRafestop  ),// 0x00008000,
-        STR(Pendingforward     ),// 0x00010000,
-        STR(Pendingbackward    ),// 0x00020000,
-        STR(PendingSTRafeleft  ),// 0x00040000,
-        STR(PendingSTRaferight ),// 0x00080000,
-        STR(Pendingroot        ),// 0x00100000,
-        STR(Swimming           ),// 0x00200000,               // Appears With Fly Flag Also
-        STR(Ascending          ),// 0x00400000,               // Swim Up Also
-        STR(Descending         ),// 0x00800000,               // Swim Down Also
-        STR(Can_Fly            ),// 0x01000000,               // Can Fly In 3.3?
-        STR(Flying             ),// 0x02000000,               // Actual Flying Mode
-        STR(Spline_Elevation   ),// 0x04000000,               // Used For Flight Paths
-        STR(Spline_Enabled     ),// 0x08000000,               // Used For Flight Paths
-        STR(Waterwalking       ),// 0x10000000,               // Prevent Unit From Falling Through Water
-        STR(Safe_Fall          ),// 0x20000000,               // Active Rogue Safe Fall Spell (Passive)
-        STR(Hover              ),// 0x40000000
-        STR(Unknown13          ),// 0x80000000
-        STR(Unk1              ),
-        STR(Unk2              ),
-        STR(Unk3              ),
-        STR(Fullspeedturning  ),
-        STR(Fullspeedpitching ),
-        STR(Allow_Pitching    ),
-        STR(Unk4              ),
-        STR(Unk5              ),
-        STR(Unk6              ),
-        STR(Unk7              ),
-        STR(Interp_Move       ),
-        STR(Interp_Turning    ),
-        STR(Interp_Pitching   ),
-        STR(Unk8              ),
-        STR(Unk9              ),
-        STR(Unk10             ),
+        STR(Forward),            // 0x00000001,
+        STR(Backward),           // 0x00000002,
+        STR(Strafe_Left),        // 0x00000004,
+        STR(Strafe_Right),       // 0x00000008,
+        STR(Turn_Left),          // 0x00000010,
+        STR(Turn_Right),         // 0x00000020,
+        STR(Pitch_Up),           // 0x00000040,
+        STR(Pitch_Down),         // 0x00000080,
+
+        STR(Walk),               // 0x00000100,             // Walking
+        STR(Ontransport),        // 0x00000200,
+        STR(Levitation),         // 0x00000400,
+        STR(Root),               // 0x00000800,
+        STR(Falling),            // 0x00001000,
+        STR(Fallingfar),         // 0x00002000,
+        STR(Pendingstop),        // 0x00004000,
+        STR(PendingSTRafestop),  // 0x00008000,
+        STR(Pendingforward),     // 0x00010000,
+        STR(Pendingbackward),    // 0x00020000,
+        STR(PendingSTRafeleft),  // 0x00040000,
+        STR(PendingSTRaferight), // 0x00080000,
+        STR(Pendingroot),        // 0x00100000,
+        STR(Swimming),           // 0x00200000,             // Appears With Fly Flag Also
+        STR(Ascending),          // 0x00400000,             // Swim Up Also
+        STR(Descending),         // 0x00800000,             // Swim Down Also
+        STR(Can_Fly),            // 0x01000000,             // Can Fly In 3.3?
+        STR(Flying),             // 0x02000000,             // Actual Flying Mode
+        STR(Spline_Elevation),   // 0x04000000,             // Used For Flight Paths
+        STR(Spline_Enabled),     // 0x08000000,             // Used For Flight Paths
+        STR(Waterwalking),       // 0x10000000,             // Prevent Unit From Falling Through Water
+        STR(Safe_Fall),          // 0x20000000,             // Active Rogue Safe Fall Spell (Passive)
+        STR(Hover),              // 0x40000000
+        STR(Unknown13),          // 0x80000000
+        STR(Unk1),
+        STR(Unk2),
+        STR(Unk3),
+        STR(Fullspeedturning),
+        STR(Fullspeedpitching),
+        STR(Allow_Pitching),
+        STR(Unk4),
+        STR(Unk5),
+        STR(Unk6),
+        STR(Unk7),
+        STR(Interp_Move),
+        STR(Interp_Turning),
+        STR(Interp_Pitching),
+        STR(Unk8),
+        STR(Unk9),
+        STR(Unk10),
     };
 
-    const char * g_SplineFlag_names[32]=
+    const char* g_SplineFlag_names[32] =
     {
-        STR(AnimBit1     ),// 0x00000001,
-        STR(AnimBit2     ),// 0x00000002,
-        STR(AnimBit3     ),// 0x00000004,
-        STR(AnimBit4     ),// 0x00000008,
-        STR(AnimBit5     ),// 0x00000010,
-        STR(AnimBit6     ),// 0x00000020,
-        STR(AnimBit7     ),// 0x00000040,
-        STR(AnimBit8     ),// 0x00000080,
-        STR(Done         ),// 0x00000100,
-        STR(Falling      ),// 0x00000200,           // Not Compartible With Trajectory Movement
-        STR(No_Spline    ),// 0x00000400,
-        STR(Trajectory   ),// 0x00000800,           // Not Compartible With Fall Movement
-        STR(Walkmode     ),// 0x00001000,
-        STR(Flying       ),// 0x00002000,           // Smooth Movement(Catmullrom Interpolation Mode), Flying Animation
-        STR(Knockback    ),// 0x00004000,           // Model Orientation Fixed
-        STR(Final_Point  ),// 0x00008000,
-        STR(Final_Target ),// 0x00010000,
-        STR(Final_Angle  ),// 0x00020000,
-        STR(Catmullrom   ),// 0x00040000,           // Used Catmullrom Interpolation Mode
-        STR(Cyclic       ),// 0x00080000,           // Movement By Cycled Spline
-        STR(Enter_Cycle  ),// 0x00100000,           // Everytime Appears With Cyclic Flag In Monster Move Packet
-        STR(Animation    ),// 0x00200000,           // Animationid (0...3), Uint32 Time, Not Compartible With Trajectory And Fall Movement
-        STR(Unknown4     ),// 0x00400000,           // Disables Movement By Path
-        STR(Unknown5     ),// 0x00800000,
-        STR(Unknown6     ),// 0x01000000,
-        STR(Unknown7     ),// 0x02000000,
-        STR(Unknown8     ),// 0x04000000,
-        STR(OrientationInversed ),// 0x08000000,           // Appears With Runmode Flag, Nodes ),// 1, Handles Orientation
-        STR(Unknown10    ),// 0x10000000,
-        STR(Unknown11    ),// 0x20000000,
-        STR(Unknown12    ),// 0x40000000,
-        STR(Unknown13    ),// 0x80000000,
+        STR(AnimBit1),     // 0x00000001,
+        STR(AnimBit2),     // 0x00000002,
+        STR(AnimBit3),     // 0x00000004,
+        STR(AnimBit4),     // 0x00000008,
+        STR(AnimBit5),     // 0x00000010,
+        STR(AnimBit6),     // 0x00000020,
+        STR(AnimBit7),     // 0x00000040,
+        STR(AnimBit8),     // 0x00000080,
+        STR(Done),         // 0x00000100,
+        STR(Falling),      // 0x00000200,           // Not Compartible With Trajectory Movement
+        STR(No_Spline),    // 0x00000400,
+        STR(Trajectory),   // 0x00000800,           // Not Compartible With Fall Movement
+        STR(Walkmode),     // 0x00001000,
+        STR(Flying),       // 0x00002000,           // Smooth Movement(Catmullrom Interpolation Mode), Flying Animation
+        STR(Knockback),    // 0x00004000,           // Model Orientation Fixed
+        STR(Final_Point),  // 0x00008000,
+        STR(Final_Target), // 0x00010000,
+        STR(Final_Angle),  // 0x00020000,
+        STR(Catmullrom),   // 0x00040000,           // Used Catmullrom Interpolation Mode
+        STR(Cyclic),       // 0x00080000,           // Movement By Cycled Spline
+        STR(Enter_Cycle),  // 0x00100000,           // Everytime Appears With Cyclic Flag In Monster Move Packet
+        STR(Animation),    // 0x00200000,           // Animationid (0...3), Uint32 Time, Not Compartible With Trajectory And Fall Movement
+        STR(Unknown4),     // 0x00400000,           // Disables Movement By Path
+        STR(Unknown5),     // 0x00800000,
+        STR(Unknown6),     // 0x01000000,
+        STR(Unknown7),     // 0x02000000,
+        STR(Unknown8),     // 0x04000000,
+        STR(OrientationInversed), // 0x08000000,           // Appears With Runmode Flag, Nodes ),// 1, Handles Orientation
+        STR(Unknown10),    // 0x10000000,
+        STR(Unknown11),    // 0x20000000,
+        STR(Unknown12),    // 0x40000000,
+        STR(Unknown13),    // 0x80000000,
     };
 
     template<class Flags, int N>
@@ -202,7 +202,7 @@ namespace Movement
     std::string MoveSplineFlag::ToString() const
     {
         std::string str;
-        print_flags(raw(),g_SplineFlag_names,str);
+        print_flags(raw(), g_SplineFlag_names, str);
         return str;
     }
 }
diff --git a/src/game/movementGenerators/ConfusedMovementGenerator.cpp b/src/game/movementGenerators/ConfusedMovementGenerator.cpp
new file mode 100644
index 00000000000..2297ef51c33
--- /dev/null
+++ b/src/game/movementGenerators/ConfusedMovementGenerator.cpp
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ConfusedMovementGenerator.h"
+#include "MapManager.h"
+#include "Creature.h"
+#include "Player.h"
+#include "movement/MoveSplineInit.h"
+#include "movement/MoveSpline.h"
+#include "PathFinder.h"
+
+template<class T>
+void ConfusedMovementGenerator<T>::Initialize(T& unit)
+{
+    unit.addUnitState(UNIT_STAT_CONFUSED);
+
+    // set initial position
+    unit.GetPosition(i_x, i_y, i_z);
+
+    if (!unit.isAlive() || unit.hasUnitState(UNIT_STAT_NOT_MOVE))
+        return;
+
+    unit.StopMoving();
+    unit.addUnitState(UNIT_STAT_CONFUSED_MOVE);
+}
+
+template<class T>
+void ConfusedMovementGenerator<T>::Interrupt(T& unit)
+{
+    unit.InterruptMoving();
+    // confused state still applied while movegen disabled
+    unit.clearUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_CONFUSED_MOVE);
+}
+
+template<class T>
+void ConfusedMovementGenerator<T>::Reset(T& unit)
+{
+    i_nextMoveTime.Reset(0);
+
+    if (!unit.isAlive() || unit.hasUnitState(UNIT_STAT_NOT_MOVE))
+        return;
+
+    unit.StopMoving();
+    unit.addUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_CONFUSED_MOVE);
+}
+
+template<class T>
+bool ConfusedMovementGenerator<T>::Update(T& unit, const uint32& diff)
+{
+    if (i_nextMoveTime.Passed())
+    {
+        // currently moving, update location
+        unit.addUnitState(UNIT_STAT_CONFUSED_MOVE);
+
+        if (unit.movespline->Finalized())
+            i_nextMoveTime.Reset(urand(800, 1500));
+    }
+    else
+    {
+        // waiting for next move
+        i_nextMoveTime.Update(diff);
+        if (i_nextMoveTime.Passed())
+        {
+            // start moving
+            unit.addUnitState(UNIT_STAT_CONFUSED_MOVE);
+
+            float x,y,z;
+            unit.GetNearPoint(&unit, x, y, z, unit.GetObjectBoundingRadius(), 10.0f, rand_norm_f() * M_PI_F * 2.0f);
+
+            unit.UpdateAllowedPositionZ(x, y, z);
+
+            PathFinder path(&unit);
+            path.setPathLengthLimit(30.0f);
+            path.calculate(x, y, z);
+            if (path.getPathType() & PATHFIND_NOPATH)
+            {
+                i_nextMoveTime.Reset(urand(800, 1000));
+                return true;
+            }
+
+            Movement::MoveSplineInit<Unit*> init(unit);
+            init.MovebyPath(path.getPath());
+            init.SetWalk(true);
+            init.Launch();
+        }
+    }
+
+    return true;
+}
+
+template<>
+void ConfusedMovementGenerator<Player>::Finalize(Player& unit)
+{
+    unit.StopMoving();
+    unit.clearUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_CONFUSED_MOVE);
+}
+
+template<>
+void ConfusedMovementGenerator<Creature>::Finalize(Creature& unit)
+{
+    unit.clearUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_CONFUSED_MOVE);
+}
+
+template void ConfusedMovementGenerator<Player>::Initialize(Player& player);
+template void ConfusedMovementGenerator<Creature>::Initialize(Creature& creature);
+template void ConfusedMovementGenerator<Player>::Interrupt(Player& player);
+template void ConfusedMovementGenerator<Creature>::Interrupt(Creature& creature);
+template void ConfusedMovementGenerator<Player>::Reset(Player& player);
+template void ConfusedMovementGenerator<Creature>::Reset(Creature& creature);
+template bool ConfusedMovementGenerator<Player>::Update(Player& player, const uint32& diff);
+template bool ConfusedMovementGenerator<Creature>::Update(Creature& creature, const uint32& diff);
diff --git a/src/game/ConfusedMovementGenerator.h b/src/game/movementGenerators/ConfusedMovementGenerator.h
similarity index 81%
rename from src/game/ConfusedMovementGenerator.h
rename to src/game/movementGenerators/ConfusedMovementGenerator.h
index b6956669f12..90b3103f100 100644
--- a/src/game/ConfusedMovementGenerator.h
+++ b/src/game/movementGenerators/ConfusedMovementGenerator.h
@@ -24,18 +24,20 @@
 
 template<class T>
 class MANGOS_DLL_SPEC ConfusedMovementGenerator
-: public MovementGeneratorMedium< T, ConfusedMovementGenerator<T> >
+    : public MovementGeneratorMedium< T, ConfusedMovementGenerator<T> >
 {
     public:
         explicit ConfusedMovementGenerator() : i_nextMoveTime(0) {}
 
-        void Initialize(T &);
-        void Finalize(T &);
-        void Interrupt(T &);
-        void Reset(T &);
-        bool Update(T &, const uint32 &);
+        void Initialize(T&);
+        void Finalize(T&);
+        void Interrupt(T&);
+        void Reset(T&);
+        bool Update(T&, const uint32&);
 
         MovementGeneratorType GetMovementGeneratorType() const { return CONFUSED_MOTION_TYPE; }
+
+        const char* Name() const { return "<Confused>"; }
     private:
         TimeTracker i_nextMoveTime;
         float i_x, i_y, i_z;
diff --git a/src/game/movementGenerators/FleeingMovementGenerator.cpp b/src/game/movementGenerators/FleeingMovementGenerator.cpp
new file mode 100644
index 00000000000..d9f46f12d48
--- /dev/null
+++ b/src/game/movementGenerators/FleeingMovementGenerator.cpp
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Creature.h"
+#include "CreatureAI.h"
+#include "MapManager.h"
+#include "FleeingMovementGenerator.h"
+#include "ObjectAccessor.h"
+#include "movement/MoveSplineInit.h"
+#include "movement/MoveSpline.h"
+#include "PathFinder.h"
+#include "World.h"
+
+#define MIN_QUIET_DISTANCE 28.0f
+#define MAX_QUIET_DISTANCE 43.0f
+
+template<class T>
+void FleeingMovementGenerator<T>::_setTargetLocation(T& owner)
+{
+    if (!&owner)
+        return;
+
+    float x, y, z;
+    if (!_getPoint(owner, x, y, z))
+        return;
+
+    owner.addUnitState(UNIT_STAT_FLEEING_MOVE);
+
+    PathFinder path(&owner);
+    path.setPathLengthLimit(30.0f);
+    path.calculate(x, y, z);
+    if (path.getPathType() & PATHFIND_NOPATH)
+    {
+        i_nextCheckTime.Reset(urand(1000, 1500));
+        return;
+    }
+
+    Movement::MoveSplineInit<Unit*> init(owner);
+    init.MovebyPath(path.getPath());
+    init.SetWalk(false);
+    int32 traveltime = init.Launch();
+    i_nextCheckTime.Reset(traveltime + urand(800, 1500));
+}
+
+template<class T>
+bool FleeingMovementGenerator<T>::_getPoint(T& owner, float& x, float& y, float& z)
+{
+    if (!&owner)
+        return false;
+
+    float dist_from_caster, angle_to_caster;
+    if (Unit* fright = ObjectAccessor::GetUnit(owner, i_frightGuid))
+    {
+        dist_from_caster = fright->GetDistance(&owner);
+        if (dist_from_caster > 0.2f)
+            angle_to_caster = fright->GetAngle(&owner);
+        else
+            angle_to_caster = frand(0, 2 * M_PI_F);
+    }
+    else
+    {
+        dist_from_caster = 0.0f;
+        angle_to_caster = frand(0, 2 * M_PI_F);
+    }
+
+    float dist, angle;
+    if (dist_from_caster < MIN_QUIET_DISTANCE)
+    {
+        dist = frand(0.4f, 1.3f) * (MIN_QUIET_DISTANCE - dist_from_caster);
+        angle = angle_to_caster + frand(-M_PI_F / 8, M_PI_F / 8);
+    }
+    else if (dist_from_caster > MAX_QUIET_DISTANCE)
+    {
+        dist = frand(0.4f, 1.0f) * (MAX_QUIET_DISTANCE - MIN_QUIET_DISTANCE);
+        angle = -angle_to_caster + frand(-M_PI_F / 4, M_PI_F / 4);
+    }
+    else    // we are inside quiet range
+    {
+        dist = frand(0.6f, 1.2f) * (MAX_QUIET_DISTANCE - MIN_QUIET_DISTANCE);
+        angle = frand(0, 2 * M_PI_F);
+    }
+
+    owner.GetNearPoint(&owner, x, y, z, owner.GetObjectBoundingRadius(), dist, angle);
+
+    return true;
+}
+
+template<class T>
+void FleeingMovementGenerator<T>::Initialize(T& owner)
+{
+    owner.StopMoving();
+    owner.addUnitState(UNIT_STAT_FLEEING | UNIT_STAT_FLEEING_MOVE);
+
+    if (owner.GetTypeId() == TYPEID_UNIT)
+        owner.SetTargetGuid(ObjectGuid());
+
+    _setTargetLocation(owner);
+}
+
+template<>
+void FleeingMovementGenerator<Player>::Finalize(Player& owner)
+{
+    owner.StopMoving();
+    owner.clearUnitState(UNIT_STAT_FLEEING | UNIT_STAT_FLEEING_MOVE);
+}
+
+template<>
+void FleeingMovementGenerator<Creature>::Finalize(Creature& owner)
+{
+    owner.clearUnitState(UNIT_STAT_FLEEING | UNIT_STAT_FLEEING_MOVE);
+    owner.AddEvent(new AttackResumeEvent(owner), ATTACK_DISPLAY_DELAY);
+}
+
+template<class T>
+void FleeingMovementGenerator<T>::Interrupt(T& owner)
+{
+    owner.InterruptMoving();
+    // flee state still applied while movegen disabled
+    owner.clearUnitState(UNIT_STAT_FLEEING | UNIT_STAT_FLEEING_MOVE);
+}
+
+template<class T>
+void FleeingMovementGenerator<T>::Reset(T& owner)
+{
+    Initialize(owner);
+}
+
+template<class T>
+bool FleeingMovementGenerator<T>::Update(T& owner, const uint32& time_diff)
+{
+    if (!&owner || !owner.isAlive())
+        return false;
+
+    i_nextCheckTime.Update(time_diff);
+    if (i_nextCheckTime.Passed() && owner.movespline->Finalized())
+        _setTargetLocation(owner);
+
+    return true;
+}
+
+template void FleeingMovementGenerator<Player>::Initialize(Player&);
+template void FleeingMovementGenerator<Creature>::Initialize(Creature&);
+template bool FleeingMovementGenerator<Player>::_getPoint(Player&, float&, float&, float&);
+template bool FleeingMovementGenerator<Creature>::_getPoint(Creature&, float&, float&, float&);
+template void FleeingMovementGenerator<Player>::_setTargetLocation(Player&);
+template void FleeingMovementGenerator<Creature>::_setTargetLocation(Creature&);
+template void FleeingMovementGenerator<Player>::Interrupt(Player&);
+template void FleeingMovementGenerator<Creature>::Interrupt(Creature&);
+template void FleeingMovementGenerator<Player>::Reset(Player&);
+template void FleeingMovementGenerator<Creature>::Reset(Creature&);
+template bool FleeingMovementGenerator<Player>::Update(Player&, const uint32&);
+template bool FleeingMovementGenerator<Creature>::Update(Creature&, const uint32&);
+
+void TimedFleeingMovementGenerator::Finalize(Unit& owner)
+{
+    owner.clearUnitState(UNIT_STAT_FLEEING | UNIT_STAT_FLEEING_MOVE);
+    owner.AddEvent(new AttackResumeEvent(owner), ATTACK_DISPLAY_DELAY);
+}
+
+bool TimedFleeingMovementGenerator::Update(Unit& owner, const uint32& time_diff)
+{
+    if (!owner.isAlive())
+        return false;
+
+    i_totalFleeTime.Update(time_diff);
+    if (i_totalFleeTime.Passed())
+        return false;
+
+    // This calls grant-parent Update method hiden by FleeingMovementGenerator::Update(Creature &, const uint32 &) version
+    // This is done instead of casting Unit& to Creature& and call parent method, then we can use Unit directly
+    return MovementGeneratorMedium< Creature, FleeingMovementGenerator<Creature> >::Update(owner, time_diff);
+}
diff --git a/src/game/movementGenerators/FleeingMovementGenerator.h b/src/game/movementGenerators/FleeingMovementGenerator.h
new file mode 100644
index 00000000000..fde9a341efa
--- /dev/null
+++ b/src/game/movementGenerators/FleeingMovementGenerator.h
@@ -0,0 +1,66 @@
+/*
+* Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef MANGOS_FLEEINGMOVEMENTGENERATOR_H
+#define MANGOS_FLEEINGMOVEMENTGENERATOR_H
+
+#include "MovementGenerator.h"
+#include "ObjectGuid.h"
+
+template<class T>
+class MANGOS_DLL_SPEC FleeingMovementGenerator
+    : public MovementGeneratorMedium< T, FleeingMovementGenerator<T> >
+{
+    public:
+        FleeingMovementGenerator(ObjectGuid fright) : i_frightGuid(fright), i_nextCheckTime(0) {}
+
+        void Initialize(T&);
+        void Finalize(T&);
+        void Interrupt(T&);
+        void Reset(T&);
+        bool Update(T&, const uint32&);
+
+        MovementGeneratorType GetMovementGeneratorType() const { return FLEEING_MOTION_TYPE; }
+        const char* Name() const { return "<Fleeing>"; }
+
+    private:
+        void _setTargetLocation(T& owner);
+        bool _getPoint(T& owner, float& x, float& y, float& z);
+
+        ObjectGuid i_frightGuid;
+        TimeTracker i_nextCheckTime;
+};
+
+class MANGOS_DLL_SPEC TimedFleeingMovementGenerator
+    : public FleeingMovementGenerator<Creature>
+{
+    public:
+        TimedFleeingMovementGenerator(ObjectGuid fright, uint32 time) :
+            FleeingMovementGenerator<Creature>(fright),
+            i_totalFleeTime(time) {}
+
+        MovementGeneratorType GetMovementGeneratorType() const { return TIMED_FLEEING_MOTION_TYPE; }
+        bool Update(Unit&, const uint32&);
+        void Finalize(Unit&);
+        const char* Name() const { return "<TimedFleeing>"; }
+
+    private:
+        TimeTracker i_totalFleeTime;
+};
+
+#endif
diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/movementGenerators/HomeMovementGenerator.cpp
similarity index 80%
rename from src/game/HomeMovementGenerator.cpp
rename to src/game/movementGenerators/HomeMovementGenerator.cpp
index 13f207c7b79..c11a74b186b 100644
--- a/src/game/HomeMovementGenerator.cpp
+++ b/src/game/movementGenerators/HomeMovementGenerator.cpp
@@ -24,24 +24,24 @@
 #include "movement/MoveSplineInit.h"
 #include "movement/MoveSpline.h"
 
-void HomeMovementGenerator<Creature>::Initialize(Creature & owner)
+void HomeMovementGenerator<Creature>::Initialize(Creature& owner)
 {
     _setTargetLocation(owner);
 }
 
-void HomeMovementGenerator<Creature>::Reset(Creature &)
+void HomeMovementGenerator<Creature>::Reset(Creature&)
 {
 }
 
-void HomeMovementGenerator<Creature>::_setTargetLocation(Creature & owner)
+void HomeMovementGenerator<Creature>::_setTargetLocation(Creature& owner)
 {
     if (owner.hasUnitState(UNIT_STAT_NOT_MOVE))
         return;
 
-    Movement::MoveSplineInit init(owner);
+    Movement::MoveSplineInit<Unit*> init(owner);
     float x, y, z, o;
     // at apply we can select more nice return points base at current movegen
-    if (owner.GetMotionMaster()->empty() || !owner.GetMotionMaster()->top()->GetResetPosition(owner,x,y,z))
+    if (owner.GetMotionMaster()->empty() || !owner.GetMotionMaster()->CurrentMovementGenerator()->GetResetPosition(owner, x, y, z))
     {
         owner.GetRespawnCoord(x, y, z, &o);
         init.SetFacing(o);
@@ -52,10 +52,10 @@ void HomeMovementGenerator<Creature>::_setTargetLocation(Creature & owner)
     init.Launch();
 
     arrived = false;
-    owner.clearUnitState(UNIT_STAT_ALL_STATE);
+    owner.clearUnitState(UNIT_STAT_ALL_DYN_STATES);
 }
 
-bool HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff)
+bool HomeMovementGenerator<Creature>::Update(Creature& owner, const uint32& time_diff)
 {
     arrived = owner.movespline->Finalized();
     return !arrived;
@@ -68,7 +68,7 @@ void HomeMovementGenerator<Creature>::Finalize(Creature& owner)
         if (owner.GetTemporaryFactionFlags() & TEMPFACTION_RESTORE_REACH_HOME)
             owner.ClearTemporaryFaction();
 
-        owner.SetWalk(true);
+        owner.SetWalk(!owner.hasUnitState(UNIT_STAT_RUNNING_STATE) && !owner.IsLevitating(), false);
         owner.LoadCreatureAddon(true);
         owner.AI()->JustReachedHome();
     }
diff --git a/src/game/HomeMovementGenerator.h b/src/game/movementGenerators/HomeMovementGenerator.h
similarity index 77%
rename from src/game/HomeMovementGenerator.h
rename to src/game/movementGenerators/HomeMovementGenerator.h
index 30d2ba2d1de..66141ac326e 100644
--- a/src/game/HomeMovementGenerator.h
+++ b/src/game/movementGenerators/HomeMovementGenerator.h
@@ -28,22 +28,23 @@ class MANGOS_DLL_SPEC HomeMovementGenerator;
 
 template <>
 class MANGOS_DLL_SPEC HomeMovementGenerator<Creature>
-: public MovementGeneratorMedium< Creature, HomeMovementGenerator<Creature> >
+    : public MovementGeneratorMedium< Creature, HomeMovementGenerator<Creature> >
 {
     public:
 
         HomeMovementGenerator() : arrived(false) {}
         ~HomeMovementGenerator() {}
 
-        void Initialize(Creature &);
-        void Finalize(Creature &);
-        void Interrupt(Creature &) {}
-        void Reset(Creature &);
-        bool Update(Creature &, const uint32 &);
+        void Initialize(Creature&);
+        void Finalize(Creature&);
+        void Interrupt(Creature&) {}
+        void Reset(Creature&);
+        bool Update(Creature&, const uint32&);
         MovementGeneratorType GetMovementGeneratorType() const { return HOME_MOTION_TYPE; }
+        const char* Name() const { return "<Home>"; }
 
     private:
-        void _setTargetLocation(Creature &);
+        void _setTargetLocation(Creature&);
         bool arrived;
 };
 #endif
diff --git a/src/game/IdleMovementGenerator.cpp b/src/game/movementGenerators/IdleMovementGenerator.cpp
similarity index 84%
rename from src/game/IdleMovementGenerator.cpp
rename to src/game/movementGenerators/IdleMovementGenerator.cpp
index 7f14cb63482..6f0782aeafc 100644
--- a/src/game/IdleMovementGenerator.cpp
+++ b/src/game/movementGenerators/IdleMovementGenerator.cpp
@@ -53,7 +53,7 @@ DistractMovementGenerator::Interrupt(Unit& /*owner*/)
 bool
 DistractMovementGenerator::Update(Unit& /*owner*/, const uint32& time_diff)
 {
-    if(time_diff > m_timer)
+    if (time_diff > m_timer)
         return false;
 
     m_timer -= time_diff;
@@ -61,15 +61,8 @@ DistractMovementGenerator::Update(Unit& /*owner*/, const uint32& time_diff)
 }
 
 void
-AssistanceDistractMovementGenerator::Finalize(Unit &unit)
+AssistanceDistractMovementGenerator::Finalize(Unit& unit)
 {
     unit.clearUnitState(UNIT_STAT_DISTRACTED);
-    if (Unit* victim = unit.getVictim())
-    {
-        if (unit.isAlive())
-        {
-            unit.AttackStop(true);
-            ((Creature*)&unit)->AI()->AttackStart(victim);
-        }
-    }
+    unit.AddEvent(new AttackResumeEvent(unit), ATTACK_DISPLAY_DELAY);
 }
diff --git a/src/game/IdleMovementGenerator.h b/src/game/movementGenerators/IdleMovementGenerator.h
similarity index 82%
rename from src/game/IdleMovementGenerator.h
rename to src/game/movementGenerators/IdleMovementGenerator.h
index 2e1f8988b26..d46cc78e09c 100644
--- a/src/game/IdleMovementGenerator.h
+++ b/src/game/movementGenerators/IdleMovementGenerator.h
@@ -25,12 +25,13 @@ class MANGOS_DLL_SPEC IdleMovementGenerator : public MovementGenerator
 {
     public:
 
-        void Initialize(Unit &) {}
-        void Finalize(Unit &) {}
-        void Interrupt(Unit &) {}
-        void Reset(Unit &);
-        bool Update(Unit &, const uint32 &) { return true; }
+        void Initialize(Unit&) {}
+        void Finalize(Unit&) {}
+        void Interrupt(Unit&) {}
+        void Reset(Unit&);
+        bool Update(Unit&, const uint32&) { return true; }
         MovementGeneratorType GetMovementGeneratorType() const { return IDLE_MOTION_TYPE; }
+        const char* Name() const { return "<Idle>"; }
 };
 
 extern IdleMovementGenerator si_idleMovement;
@@ -42,10 +43,11 @@ class MANGOS_DLL_SPEC DistractMovementGenerator : public MovementGenerator
 
         void Initialize(Unit& owner);
         void Finalize(Unit& owner);
-        void Interrupt(Unit& );
-        void Reset(Unit& );
+        void Interrupt(Unit&);
+        void Reset(Unit&);
         bool Update(Unit& owner, const uint32& time_diff);
         MovementGeneratorType GetMovementGeneratorType() const { return DISTRACT_MOTION_TYPE; }
+        const char* Name() const { return "<Distract>"; }
 
     private:
         uint32 m_timer;
@@ -59,6 +61,7 @@ class MANGOS_DLL_SPEC AssistanceDistractMovementGenerator : public DistractMovem
 
         MovementGeneratorType GetMovementGeneratorType() const { return ASSISTANCE_DISTRACT_MOTION_TYPE; }
         void Finalize(Unit& unit);
+        const char* Name() const { return "<AssistanceDistract>"; }
 };
 
 #endif
diff --git a/src/game/MovementGenerator.cpp b/src/game/movementGenerators/MovementGenerator.cpp
similarity index 77%
rename from src/game/MovementGenerator.cpp
rename to src/game/movementGenerators/MovementGenerator.cpp
index 365ed3ad6e9..c2b649bb2e6 100644
--- a/src/game/MovementGenerator.cpp
+++ b/src/game/movementGenerators/MovementGenerator.cpp
@@ -23,9 +23,7 @@ MovementGenerator::~MovementGenerator()
 {
 }
 
-bool MovementGenerator::IsActive( Unit& u )
+bool MovementGenerator::IsActive(Unit& u)
 {
-    // When movement generator list modified from Update movegen object erase delayed,
-    // so pointer still valid and be used for check
-    return !u.GetMotionMaster()->empty() && u.GetMotionMaster()->top() == this;
+    return u.GetMotionMaster()->CurrentMovementGenerator() == this;
 }
diff --git a/src/game/MovementGenerator.h b/src/game/movementGenerators/MovementGenerator.h
similarity index 89%
rename from src/game/MovementGenerator.h
rename to src/game/movementGenerators/MovementGenerator.h
index ebd7bdd161b..82725191883 100644
--- a/src/game/MovementGenerator.h
+++ b/src/game/movementGenerators/MovementGenerator.h
@@ -25,10 +25,14 @@
 #include "Dynamic/ObjectRegistry.h"
 #include "Dynamic/FactoryHolder.h"
 #include "MotionMaster.h"
+#include "StateMgr.h"
+#include "Timer.h"
 
 class Unit;
+class Creature;
+class Player;
 
-class MANGOS_DLL_SPEC MovementGenerator
+class MANGOS_DLL_SPEC MovementGenerator : public UnitAction
 {
     public:
         virtual ~MovementGenerator();
@@ -47,12 +51,10 @@ class MANGOS_DLL_SPEC MovementGenerator
 
         virtual MovementGeneratorType GetMovementGeneratorType() const = 0;
 
-        virtual void unitSpeedChanged() { }
-
-        virtual void UpdateFinalDistance(float /*fDistance*/) { }
+        virtual void UnitSpeedChanged() { }
 
         // used by Evade code for select point to evade with expected restart default movement
-        virtual bool GetResetPosition(Unit &, float& /*x*/, float& /*y*/, float& /*z*/) { return false; }
+        virtual bool GetResetPosition(Unit&, float& /*x*/, float& /*y*/, float& /*z*/) const { return false; }
 
         // given destination unreachable? due to pathfinsing or other
         virtual bool IsReachable() const { return true; }
@@ -91,10 +93,10 @@ class MANGOS_DLL_SPEC MovementGeneratorMedium : public MovementGenerator
             //u->AssertIsType<T>();
             return (static_cast<D*>(this))->Update(*((T*)&u), time_diff);
         }
-        bool GetResetPosition(Unit& u, float& x, float& y, float& z)
+        bool GetResetPosition(Unit& u, float& x, float& y, float& z) const override
         {
-            //u->AssertIsType<T>();
-            return (static_cast<D*>(this))->GetResetPosition(*((T*)&u), x, y, z);
+            // u->AssertIsType<T>();
+            return (static_cast<D const*>(this))->GetResetPosition(*((T*)&u), x, y, z);
         }
     public:
         // will not link if not overridden in the generators
@@ -105,7 +107,7 @@ class MANGOS_DLL_SPEC MovementGeneratorMedium : public MovementGenerator
         bool Update(T &u, const uint32 &time_diff);
 
         // not need always overwrites
-        bool GetResetPosition(T& /*u*/, float& /*x*/, float& /*y*/, float& /*z*/) { return false; }
+        bool GetResetPosition(T& /*u*/, float& /*x*/, float& /*y*/, float& /*z*/) const { return false; }
 };
 
 struct SelectableMovement : public FactoryHolder<MovementGenerator,MovementGeneratorType>
diff --git a/src/game/MovementGeneratorImpl.h b/src/game/movementGenerators/MovementGeneratorImpl.h
similarity index 100%
rename from src/game/MovementGeneratorImpl.h
rename to src/game/movementGenerators/MovementGeneratorImpl.h
diff --git a/src/game/movementGenerators/PointMovementGenerator.cpp b/src/game/movementGenerators/PointMovementGenerator.cpp
new file mode 100644
index 00000000000..0e9b11c4bac
--- /dev/null
+++ b/src/game/movementGenerators/PointMovementGenerator.cpp
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "PointMovementGenerator.h"
+#include "Errors.h"
+#include "Creature.h"
+#include "CreatureAI.h"
+#include "TemporarySummon.h"
+#include "World.h"
+#include "movement/MoveSplineInit.h"
+#include "movement/MoveSpline.h"
+
+//----- Point Movement Generator
+template<class T>
+void PointMovementGenerator<T>::Initialize(T &unit)
+{
+    unit.StopMoving();
+    unit.addUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
+    Movement::MoveSplineInit<Unit*> init(unit);
+    init.MoveTo(i_x, i_y, i_z, m_generatePath);
+    init.Launch();
+}
+
+template<class T>
+void PointMovementGenerator<T>::Finalize(T &unit)
+{
+    unit.clearUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
+
+    if (unit.movespline->Finalized())
+        MovementInform(unit);
+}
+
+template<class T>
+void PointMovementGenerator<T>::Interrupt(T& unit)
+{
+    unit.InterruptMoving();
+    unit.clearUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
+}
+
+template<class T>
+void PointMovementGenerator<T>::Reset(T &unit)
+{
+    unit.StopMoving();
+    unit.addUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
+}
+
+template<class T>
+bool PointMovementGenerator<T>::Update(T &unit, const uint32 &diff)
+{
+    if(!&unit)
+        return false;
+
+    if(unit.hasUnitState(UNIT_STAT_CAN_NOT_MOVE))
+    {
+        unit.clearUnitState(UNIT_STAT_ROAMING_MOVE);
+        return true;
+    }
+
+    unit.addUnitState(UNIT_STAT_ROAMING_MOVE);
+    return !unit.movespline->Finalized();
+}
+
+template<>
+void PointMovementGenerator<Player>::MovementInform(Player&)
+{
+}
+
+template <>
+void PointMovementGenerator<Creature>::MovementInform(Creature &unit)
+{
+    if (unit.AI())
+        unit.AI()->MovementInform(POINT_MOTION_TYPE, id);
+
+    if (unit.IsTemporarySummon())
+    {
+        TemporarySummon* pSummon = (TemporarySummon*)(&unit);
+        if (pSummon->GetSummonerGuid().IsCreatureOrVehicle())
+            if(Creature* pSummoner = unit.GetMap()->GetCreature(pSummon->GetSummonerGuid()))
+                if (pSummoner->AI())
+                    pSummoner->AI()->SummonedMovementInform(&unit, POINT_MOTION_TYPE, id);
+    }
+}
+
+template void PointMovementGenerator<Player>::Initialize(Player&);
+template void PointMovementGenerator<Creature>::Initialize(Creature&);
+template void PointMovementGenerator<Player>::Finalize(Player&);
+template void PointMovementGenerator<Creature>::Finalize(Creature&);
+template void PointMovementGenerator<Player>::Interrupt(Player&);
+template void PointMovementGenerator<Creature>::Interrupt(Creature&);
+template void PointMovementGenerator<Player>::Reset(Player&);
+template void PointMovementGenerator<Creature>::Reset(Creature&);
+template bool PointMovementGenerator<Player>::Update(Player &, const uint32 &diff);
+template bool PointMovementGenerator<Creature>::Update(Creature&, const uint32 &diff);
+
+void AssistanceMovementGenerator::Finalize(Unit &unit)
+{
+    unit.clearUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
+
+    ((Creature*)&unit)->SetNoCallAssistance(false);
+    ((Creature*)&unit)->CallAssistance();
+    if (unit.isAlive())
+        unit.GetMotionMaster()->MoveSeekAssistanceDistract(sWorld.getConfig(CONFIG_UINT32_CREATURE_FAMILY_ASSISTANCE_DELAY));
+}
+
+bool EffectMovementGenerator::Update(Unit &unit, const uint32 &)
+{
+    return !unit.movespline->Finalized();
+}
+
+void EffectMovementGenerator::Finalize(Unit &unit)
+{
+    if (unit.GetTypeId() != TYPEID_UNIT)
+        return;
+
+    if (((Creature&)unit).AI() && unit.movespline->Finalized())
+        ((Creature&)unit).AI()->MovementInform(EFFECT_MOTION_TYPE, m_Id);
+}
+
+bool EjectMovementGenerator::Update(Unit &unit, const uint32 &)
+{
+    return !unit.movespline->Finalized();
+}
+
+void EjectMovementGenerator::Initialize(Unit &unit)
+{
+    if (unit.GetTypeId() == TYPEID_PLAYER)
+        ((Player&)unit).SetMover(&unit);
+}
+
+void EjectMovementGenerator::Finalize(Unit &unit)
+{
+    if (unit.GetTypeId() == TYPEID_UNIT && ((Creature&)unit).AI() && unit.movespline->Finalized())
+        ((Creature&)unit).AI()->MovementInform(EFFECT_MOTION_TYPE, m_Id);
+
+    if (unit.hasUnitState(UNIT_STAT_ON_VEHICLE))
+    {
+        unit.clearUnitState(UNIT_STAT_ON_VEHICLE);
+        unit.m_movementInfo.ClearTransportData();
+
+        if (unit.GetTypeId() == TYPEID_PLAYER)
+            ((Player&)unit).SetMover(&unit);
+    }
+
+    unit.m_movementInfo.SetMovementFlags(MOVEFLAG_NONE);
+    unit.StopMoving(true);
+}
+
+void FlyOrLandMovementGenerator::Initialize(Unit& unit)
+{
+    if (unit.hasUnitState(UNIT_STAT_CAN_NOT_REACT | UNIT_STAT_NOT_MOVE))
+        return;
+
+    unit.StopMoving();
+
+    float x, y, z;
+    GetDestination(x, y, z);
+    unit.addUnitState(UNIT_STAT_ROAMING | UNIT_STAT_ROAMING_MOVE);
+    Movement::MoveSplineInit<Unit*> init(unit);
+    init.SetFly();
+    init.SetAnimation((m_liftOff ? Movement::FlyToGround : Movement::ToGround));
+    init.MoveTo(x, y, z, false);
+    init.Launch();
+}
diff --git a/src/game/movementGenerators/PointMovementGenerator.h b/src/game/movementGenerators/PointMovementGenerator.h
new file mode 100644
index 00000000000..6777a665e61
--- /dev/null
+++ b/src/game/movementGenerators/PointMovementGenerator.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOS_POINTMOVEMENTGENERATOR_H
+#define MANGOS_POINTMOVEMENTGENERATOR_H
+
+#include "MovementGenerator.h"
+#include "FollowerReference.h"
+#include "Creature.h"
+
+template<class T>
+class MANGOS_DLL_SPEC PointMovementGenerator
+: public MovementGeneratorMedium< T, PointMovementGenerator<T> >
+{
+    public:
+        PointMovementGenerator(uint32 _id, float _x, float _y, float _z, bool _generatePath) :
+          id(_id), i_x(_x), i_y(_y), i_z(_z), m_generatePath(_generatePath) {}
+
+        void Initialize(T &);
+        void Finalize(T &);
+        void Interrupt(T &);
+        void Reset(T &unit);
+        bool Update(T &, const uint32 &diff);
+
+        void MovementInform(T &);
+
+        MovementGeneratorType GetMovementGeneratorType() const { return POINT_MOTION_TYPE; }
+        const char* Name() const { return "<Point>"; }
+
+        bool GetDestination(float& x, float& y, float& z) const { x=i_x; y=i_y; z=i_z; return true; }
+    private:
+        uint32 id;
+        float i_x,i_y,i_z;
+        bool m_generatePath;
+};
+
+class MANGOS_DLL_SPEC AssistanceMovementGenerator
+: public PointMovementGenerator<Creature>
+{
+    public:
+        AssistanceMovementGenerator(float _x, float _y, float _z) :
+            PointMovementGenerator<Creature>(0, _x, _y, _z, true) {}
+
+        MovementGeneratorType GetMovementGeneratorType() const { return ASSISTANCE_MOTION_TYPE; }
+        void Finalize(Unit &);
+};
+
+// Does almost nothing - just doesn't allows previous movegen interrupt current effect. Can be reused for charge effect
+class EffectMovementGenerator : public MovementGenerator
+{
+    public:
+        explicit EffectMovementGenerator(uint32 Id) : m_Id(Id) {}
+        void Initialize(Unit &) {}
+        void Finalize(Unit &unit);
+        void Interrupt(Unit &) {}
+        void Reset(Unit &) {}
+        bool Update(Unit &u, const uint32 &);
+        MovementGeneratorType GetMovementGeneratorType() const { return EFFECT_MOTION_TYPE; }
+        const char* Name() const { return "<Effect>"; }
+    private:
+        uint32 m_Id;
+};
+
+// Does same es Effect, but cleanup transport flags after finalize.
+class EjectMovementGenerator : public MovementGenerator
+{
+    public:
+        explicit EjectMovementGenerator(uint32 Id) : m_Id(Id) {}
+        void Initialize(Unit& unit);
+        void Finalize(Unit& unit);
+        void Interrupt(Unit &) {}
+        void Reset(Unit &) {}
+        bool Update(Unit &u, const uint32 &);
+        MovementGeneratorType GetMovementGeneratorType() const { return EFFECT_MOTION_TYPE; }
+        const char* Name() const { return "<Eject>"; }
+    private:
+        uint32 m_Id;
+};
+
+class MANGOS_DLL_SPEC FlyOrLandMovementGenerator : public PointMovementGenerator<Creature>
+{
+    public:
+        FlyOrLandMovementGenerator(uint32 _id, float _x, float _y, float _z, bool liftOff) :
+            PointMovementGenerator<Creature>(_id, _x, _y, _z, false),
+            m_liftOff(liftOff) {}
+
+        void Initialize(Unit& unit) override;
+    private:
+        bool m_liftOff;
+};
+
+#endif
diff --git a/src/game/movementGenerators/RandomMovementGenerator.cpp b/src/game/movementGenerators/RandomMovementGenerator.cpp
new file mode 100644
index 00000000000..029ebf817b3
--- /dev/null
+++ b/src/game/movementGenerators/RandomMovementGenerator.cpp
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Creature.h"
+#include "MapManager.h"
+#include "RandomMovementGenerator.h"
+#include "Map.h"
+#include "Util.h"
+#include "movement/MoveSplineInit.h"
+#include "movement/MoveSpline.h"
+
+template<>
+RandomMovementGenerator<Creature>::RandomMovementGenerator(const Creature & creature)
+{
+    float respX, respY, respZ, respO, wander_distance;
+    creature.GetRespawnCoord(respX, respY, respZ, &respO, &wander_distance);
+    i_nextMoveTime = ShortTimeTracker(0);
+    i_x = respX;
+    i_y = respY;
+    i_z = respZ;
+    i_radius = wander_distance;
+    // TODO - add support for flying mobs using some distance
+    i_verticalZ = 0.0f;
+}
+
+template<>
+void RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature)
+{
+    const float angle = rand_norm_f() * (M_PI_F*2.0f);
+    const float range = rand_norm_f() * i_radius;
+
+    float destX,destY,destZ;
+    creature.GetNearPoint(&creature, destX, destY, destZ, creature.GetObjectBoundingRadius(), range, angle);
+    creature.UpdateAllowedPositionZ(destX, destY, destZ);
+
+    float dx = i_x - destX;
+    float dy = i_y - destY;
+    // TODO: Limitation creatutre travel range.
+    if (sqrt((dx*dx) + (dy*dy)) > i_radius)
+    {
+        destX = i_x;
+        destY = i_y;
+        destZ = i_z;
+    }
+    else if (creature.IsLevitating())
+        destZ = i_z;
+
+    creature.addUnitState(UNIT_STAT_ROAMING_MOVE);
+
+    Movement::MoveSplineInit<Unit*> init(creature);
+    init.MoveTo(destX, destY, destZ, true);
+
+    if (!creature.IsLevitating() && !creature.IsSwimming())
+        init.SetWalk(true);
+
+    init.Launch();
+
+    if (creature.CanFly())
+        i_nextMoveTime.Reset(0);
+    else
+    {
+        if (roll_chance_i(MOVEMENT_RANDOM_MMGEN_CHANCE_NO_BREAK))
+            i_nextMoveTime.Reset(50);
+        else
+            i_nextMoveTime.Reset(urand(3000, 10000));       // keep a short wait time
+    }
+}
+
+template<>
+void RandomMovementGenerator<Creature>::Initialize(Creature &creature)
+{
+    if (!creature.isAlive())
+        return;
+
+    creature.addUnitState(UNIT_STAT_ROAMING|UNIT_STAT_ROAMING_MOVE);
+    _setRandomLocation(creature);
+}
+
+template<>
+void RandomMovementGenerator<Creature>::Reset(Creature &creature)
+{
+    Initialize(creature);
+}
+
+template<>
+void RandomMovementGenerator<Creature>::Interrupt(Creature &creature)
+{
+    creature.InterruptMoving();
+    creature.clearUnitState(UNIT_STAT_ROAMING | UNIT_STAT_ROAMING_MOVE);
+    creature.SetWalk(!creature.hasUnitState(UNIT_STAT_RUNNING_STATE), false);
+}
+
+template<>
+void RandomMovementGenerator<Creature>::Finalize(Creature &creature)
+{
+    creature.clearUnitState(UNIT_STAT_ROAMING | UNIT_STAT_ROAMING_MOVE);
+    creature.SetWalk(!creature.hasUnitState(UNIT_STAT_RUNNING_STATE), false);
+}
+
+template<>
+bool RandomMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff)
+{
+    if (creature.hasUnitState(UNIT_STAT_NOT_MOVE))
+    {
+        i_nextMoveTime.Reset(0);  // Expire the timer
+        creature.clearUnitState(UNIT_STAT_ROAMING_MOVE);
+        return true;
+    }
+
+    if (creature.movespline->Finalized())
+    {
+        i_nextMoveTime.Update(diff);
+        if (i_nextMoveTime.Passed())
+            _setRandomLocation(creature);
+    }
+    return true;
+}
diff --git a/src/game/movementGenerators/RandomMovementGenerator.h b/src/game/movementGenerators/RandomMovementGenerator.h
new file mode 100644
index 00000000000..f339d101207
--- /dev/null
+++ b/src/game/movementGenerators/RandomMovementGenerator.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOS_RANDOMMOTIONGENERATOR_H
+#define MANGOS_RANDOMMOTIONGENERATOR_H
+
+#include "MovementGenerator.h"
+
+// define chance for creature to not stop after reaching a waypoint
+#define MOVEMENT_RANDOM_MMGEN_CHANCE_NO_BREAK 30
+
+template<class T>
+class MANGOS_DLL_SPEC RandomMovementGenerator
+: public MovementGeneratorMedium< T, RandomMovementGenerator<T> >
+{
+    public:
+        explicit RandomMovementGenerator(const Creature &);
+        explicit RandomMovementGenerator(float x, float y, float z, float radius, float verticalZ = 0.0f) :
+                        i_nextMoveTime(0), i_x(x), i_y(y), i_z(z), i_radius(radius), i_verticalZ(verticalZ) {}
+
+        void _setRandomLocation(T &);
+        void Initialize(T &);
+        void Finalize(T &);
+        void Interrupt(T &);
+        void Reset(T &);
+        bool Update(T &, const uint32 &);
+        MovementGeneratorType GetMovementGeneratorType() const { return RANDOM_MOTION_TYPE; }
+        const char* Name() const { return "<Random>"; }
+
+    private:
+        ShortTimeTracker i_nextMoveTime;
+        float i_x, i_y, i_z;
+        float i_radius;
+        float i_verticalZ;
+};
+
+#endif
diff --git a/src/game/movementGenerators/TargetedMovementGenerator.cpp b/src/game/movementGenerators/TargetedMovementGenerator.cpp
new file mode 100644
index 00000000000..f442db5fa30
--- /dev/null
+++ b/src/game/movementGenerators/TargetedMovementGenerator.cpp
@@ -0,0 +1,432 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ * Copyright (c) 2013 MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "TargetedMovementGenerator.h"
+#include "ByteBuffer.h"
+#include "Errors.h"
+#include "Creature.h"
+#include "CreatureAI.h"
+#include "Player.h"
+#include "World.h"
+#include "movement/MoveSplineInit.h"
+#include "movement/MoveSpline.h"
+
+//-----------------------------------------------//
+
+// some spells should be able to be cast while moving
+// maybe some attribute? here, check the entry of creatures useing these spells
+bool IsAbleMoveWhenCast(uint32 npcId)
+{
+    switch (npcId)
+    {
+        case 36633: // Ice Sphere (Lich King)
+        case 37562: // Volatile Ooze and Gas Cloud (Putricide)
+        case 37697: // Volatile Ooze
+            return true;
+    }
+    return false;
+}
+
+//-----------------------------------------------//
+
+template<class T, typename D>
+void TargetedMovementGeneratorMedium<T, D>::_setTargetLocation(T& owner, bool updateDestination)
+{
+    if (!m_target.isValid() || !m_target->IsInWorld())
+        return;
+
+    if (owner.hasUnitState(UNIT_STAT_NOT_MOVE))
+        return;
+
+    if (!IsAbleMoveWhenCast(owner.GetEntry()) && owner.IsNonMeleeSpellCasted(false))
+        return;
+
+    if (!m_target->isInAccessablePlaceFor(&owner))
+        return;
+
+    float x, y, z;
+
+    // m_path can be NULL in case this is the first call for this MMGen (via Update)
+    // Can happen for example if no path was created on MMGen-Initialize because of the owner being stunned
+    if (updateDestination || !m_path)
+    {
+        owner.GetPosition(x, y, z);
+
+        // Prevent redundant micro-movement for pets, other followers.
+        if (!RequiresNewPosition(owner, x, y, z))
+        {
+            if (!owner.movespline->Finalized())
+                return;
+        }
+        else
+        {
+            float absAngle;
+
+            // Chase Movement and angle == 0 case: Chase to current angle
+            if (this->GetMovementGeneratorType() == CHASE_MOTION_TYPE && m_angle == 0.0f)
+                absAngle = m_target->GetAngle(&owner);
+            // Targeted movement to at m_offset distance from target and m_angle from target facing
+            else
+                absAngle = m_target->GetOrientation() + m_angle;
+
+            m_target->GetNearPoint(&owner, x, y, z, owner.GetObjectBoundingRadius(),
+                static_cast<D*>(this)->GetDynamicTargetDistance(owner, false), absAngle);
+
+            // Add hover height
+            if (owner.IsLevitating())
+                z += owner.GetFloatValue(UNIT_FIELD_HOVERHEIGHT);
+        }
+    }
+    else
+    {
+        // the destination has not changed, we just need to refresh the path (usually speed change)
+        G3D::Vector3 endPos = m_path->getEndPosition();
+        x = endPos.x;
+        y = endPos.y;
+        z = endPos.z;
+    }
+
+    if (!m_path)
+        m_path = new PathFinder(&owner);
+
+    // allow pets following their master to cheat while generating paths
+    bool forceDest = (owner.GetTypeId() == TYPEID_UNIT &&
+        ((Creature*)&owner)->IsPet() && owner.hasUnitState(UNIT_STAT_FOLLOW));
+
+    m_path->calculate(x, y, z, forceDest);
+
+    m_speedChanged = false;
+
+    // don't move if path points equivalent
+    if (m_path->getStartPosition() == m_path->getEndPosition())
+    {
+        owner.StopMoving(true);
+        return;
+    }
+
+    if (m_path->getPathType() & PATHFIND_NOPATH)
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS,"TargetedMovementGeneratorMedium::  unit %s cannot find path to %s (%f, %f, %f),  gained PATHFIND_NOPATH! Owerride used.",
+            owner.GetGuidStr().c_str(),
+            m_target.isValid() ? m_target->GetObjectGuid().GetString().c_str() : "<none>",
+            x, y, z);
+        //return;
+    }
+
+    D::_addUnitStateMove(owner);
+    m_targetReached = false;
+
+    Movement::MoveSplineInit<Unit*> init(owner);
+    init.MovebyPath(m_path->getPath());
+    init.SetSmooth(); // fix broken fly movement for old creatures
+    init.SetWalk(
+        ((D*)this)->EnableWalking() ||
+        // hack for old creatures with bugged fly animation
+        (owner.GetTypeId() == TYPEID_UNIT && owner.IsLevitating() && owner.GetFloatValue(UNIT_FIELD_HOVERHEIGHT) == 0.0f));
+    init.Launch();
+}
+
+enum
+{
+    RECHECK_DISTANCE_TIMER_FOLLOW   = 50,
+    RECHECK_DISTANCE_TIMER          = 100,
+    TARGET_NOT_ACCESSIBLE_MAX_TIMER = 5000
+};
+
+template<class T, typename D>
+bool TargetedMovementGeneratorMedium<T, D>::Update(T& owner, const uint32& time_diff)
+{
+    if (!m_target.isValid() || !m_target->IsInWorld())
+        return false;
+
+    if (!owner.isAlive())
+        return true;
+
+    if (owner.hasUnitState(UNIT_STAT_NOT_MOVE) || (owner.IsInUnitState(UNIT_ACTION_CHASE) && owner.hasUnitState(UNIT_STAT_NO_COMBAT_MOVEMENT)))
+    {
+        D::_clearUnitStateMove(owner);
+        return true;
+    }
+
+    // prevent movement while casting spells with cast time or channel time
+    if (!IsAbleMoveWhenCast(owner.GetEntry()) && owner.IsNonMeleeSpellCasted(false, false, true))
+    {
+        owner.StopMoving();
+        return true;
+    }
+
+    // prevent crash after creature killed pet
+    if (static_cast<D*>(this)->_lostTarget(owner))
+    {
+        D::_clearUnitStateMove(owner);
+        if (m_waitTargetTimer >= TARGET_NOT_ACCESSIBLE_MAX_TIMER)
+            return false;
+        else
+        {
+            m_waitTargetTimer += 5 * time_diff;
+            return true;
+        }
+    }
+
+    if (!m_target->isInAccessablePlaceFor(&owner))
+        return true;
+
+    bool moveToTarget = false;
+
+    m_recheckDistanceTimer.Update(time_diff);
+    if (m_recheckDistanceTimer.Passed())
+    {
+        m_recheckDistanceTimer.Reset(this->GetMovementGeneratorType() == FOLLOW_MOTION_TYPE
+            ? RECHECK_DISTANCE_TIMER_FOLLOW
+            : RECHECK_DISTANCE_TIMER);
+
+        G3D::Vector3 dest = owner.movespline->FinalDestination();
+        moveToTarget = dest == Vector3() ? true : RequiresNewPosition(owner, dest.x, dest.y, dest.z);
+
+        if (owner.GetTypeId() == TYPEID_UNIT && !((Creature*)&owner)->IsPet())
+        {
+            Unit* pVictim = owner.getVictim();
+            if (pVictim && pVictim->GetObjectGuid() == m_target->GetObjectGuid())
+            {
+                if (!pVictim->isAlive() && owner.movespline->Finalized())
+                    return false;
+
+                if (!m_offset && owner.movespline->Finalized() && !owner.CanReachWithMeleeAttack(pVictim) &&
+                    !m_target->m_movementInfo.HasMovementFlag(MOVEFLAG_PENDINGSTOP))
+                {
+                    if (m_waitTargetTimer < TARGET_NOT_ACCESSIBLE_MAX_TIMER)
+                        m_waitTargetTimer += m_recheckDistanceTimer.GetExpiry();
+                    else
+                        return false;
+                }
+                else
+                    m_waitTargetTimer = 0;
+            }
+        }
+    }
+
+    if (m_speedChanged || moveToTarget)
+        _setTargetLocation(owner, moveToTarget);
+
+    if (owner.movespline->Finalized())
+    {
+        if (fabs(m_angle) < M_NULL_F && !owner.HasInArc(0.01f, m_target.getTarget()))
+            owner.SetInFront(m_target.getTarget());
+
+        if (!m_targetReached)
+        {
+            m_targetReached = true;
+            static_cast<D*>(this)->_reachTarget(owner);
+        }
+    }
+    return true;
+}
+
+template<class T, typename D>
+bool TargetedMovementGeneratorMedium<T, D>::RequiresNewPosition(T& owner, float x, float y, float z)
+{
+    if ((owner.GetTypeId() == TYPEID_UNIT && ((Creature*)&owner)->CanFly()) || owner.IsLevitating())
+        return !m_target->IsWithinDist3d(x, y, z, static_cast<D*>(this)->GetDynamicTargetDistance(owner, true));
+    else
+        return !m_target->IsWithinDist2d(x, y, static_cast<D*>(this)->GetDynamicTargetDistance(owner, true));
+}
+
+//-----------------------------------------------//
+
+template<class T>
+void ChaseMovementGenerator<T>::_reachTarget(T& owner)
+{
+    if (owner.CanReachWithMeleeAttack(this->m_target.getTarget()))
+        owner.Attack(this->m_target.getTarget(), true);
+}
+
+template<>
+void ChaseMovementGenerator<Player>::Initialize(Player& owner)
+{
+    owner.addUnitState(UNIT_STAT_CHASE | UNIT_STAT_CHASE_MOVE);
+    _setTargetLocation(owner, true);
+}
+
+template<>
+void ChaseMovementGenerator<Creature>::Initialize(Creature& owner)
+{
+    owner.SetWalk(false, false);                            // Chase movement is running
+    owner.addUnitState(UNIT_STAT_CHASE | UNIT_STAT_CHASE_MOVE);
+
+    Unit* pVictim = owner.getVictim();
+    if (pVictim && !owner.hasUnitState(UNIT_STAT_MELEE_ATTACKING))
+        owner.Attack(pVictim, !owner.IsNonMeleeSpellCasted(true));
+}
+
+template<class T>
+void ChaseMovementGenerator<T>::Finalize(T& owner)
+{
+    owner.clearUnitState(UNIT_STAT_CHASE | UNIT_STAT_CHASE_MOVE);
+}
+
+template<class T>
+void ChaseMovementGenerator<T>::Interrupt(T& owner)
+{
+    owner.InterruptMoving();
+    owner.clearUnitState(UNIT_STAT_CHASE | UNIT_STAT_CHASE_MOVE);
+}
+
+template<class T>
+void ChaseMovementGenerator<T>::Reset(T& owner)
+{
+    Initialize(owner);
+}
+
+// Chase-Movement: These factors depend on combat-reach distance
+#define CHASE_DEFAULT_RANGE_FACTOR  0.50f
+#define CHASE_RECHASE_RANGE_FACTOR  0.75f
+
+template<class T>
+float ChaseMovementGenerator<T>::GetDynamicTargetDistance(T& owner, bool forRangeCheck) const
+{
+    float dist;
+
+    if (forRangeCheck)
+        dist = CHASE_RECHASE_RANGE_FACTOR * this->m_target->GetCombatReach(&owner) - this->m_target->GetObjectBoundingRadius();
+    else
+        dist = CHASE_DEFAULT_RANGE_FACTOR * this->m_target->GetCombatReach(&owner);
+
+    return dist + this->m_offset;
+}
+
+//-----------------------------------------------//
+
+template<class T>
+void FollowMovementGenerator<T>::_reachTarget(T& u)
+{
+    if (u.GetTypeId() == TYPEID_PLAYER)
+        return;
+
+    if (Unit* pOwner = u.GetOwner())
+    {
+        if (fabs(pOwner->GetOrientation() - u.GetOrientation()) > M_PI_F / 8.0f)
+            u.SetFacingTo(pOwner->GetOrientation());
+    }
+}
+
+template<>
+bool FollowMovementGenerator<Creature>::EnableWalking() const
+{
+    return m_target.isValid() && m_target->IsWalking();
+}
+
+template<>
+bool FollowMovementGenerator<Player>::EnableWalking() const
+{
+    return false;
+}
+
+template<>
+void FollowMovementGenerator<Player>::_updateSpeed(Player& /*u*/)
+{
+    // nothing to do for Player
+}
+
+template<>
+void FollowMovementGenerator<Creature>::_updateSpeed(Creature& u)
+{
+    u.UpdateSpeed(MOVE_RUN, true);
+    u.UpdateSpeed(MOVE_WALK, true);
+    u.UpdateSpeed(MOVE_SWIM, true);
+}
+
+template<>
+void FollowMovementGenerator<Player>::Initialize(Player& owner)
+{
+    owner.addUnitState(UNIT_STAT_FOLLOW | UNIT_STAT_FOLLOW_MOVE);
+    _updateSpeed(owner);
+    _setTargetLocation(owner, true);
+}
+
+template<>
+void FollowMovementGenerator<Creature>::Initialize(Creature& owner)
+{
+    owner.addUnitState(UNIT_STAT_FOLLOW | UNIT_STAT_FOLLOW_MOVE);
+    _updateSpeed(owner);
+    _setTargetLocation(owner, true);
+}
+
+template<class T>
+void FollowMovementGenerator<T>::Finalize(T& owner)
+{
+    owner.clearUnitState(UNIT_STAT_FOLLOW | UNIT_STAT_FOLLOW_MOVE);
+    _updateSpeed(owner);
+}
+
+template<class T>
+void FollowMovementGenerator<T>::Interrupt(T& owner)
+{
+    owner.InterruptMoving();
+    owner.clearUnitState(UNIT_STAT_FOLLOW | UNIT_STAT_FOLLOW_MOVE);
+    _updateSpeed(owner);
+}
+
+template<class T>
+void FollowMovementGenerator<T>::Reset(T& owner)
+{
+    Initialize(owner);
+}
+
+template<class T>
+float FollowMovementGenerator<T>::GetDynamicTargetDistance(T& owner, bool forRangeCheck) const
+{
+    float addRange = forRangeCheck
+        ? sWorld.getConfig(CONFIG_FLOAT_RATE_TARGET_POS_RECALCULATION_RANGE)
+        : this->m_offset;
+
+    return owner.GetObjectBoundingRadius() + this->m_target->GetObjectBoundingRadius() + addRange;
+}
+
+//-----------------------------------------------//
+
+template void TargetedMovementGeneratorMedium<Player, ChaseMovementGenerator<Player> >::_setTargetLocation(Player&, bool);
+template void TargetedMovementGeneratorMedium<Player, FollowMovementGenerator<Player> >::_setTargetLocation(Player&, bool);
+template void TargetedMovementGeneratorMedium<Creature, ChaseMovementGenerator<Creature> >::_setTargetLocation(Creature&, bool);
+template void TargetedMovementGeneratorMedium<Creature, FollowMovementGenerator<Creature> >::_setTargetLocation(Creature&, bool);
+template bool TargetedMovementGeneratorMedium<Player, ChaseMovementGenerator<Player> >::Update(Player&, const uint32&);
+template bool TargetedMovementGeneratorMedium<Player, FollowMovementGenerator<Player> >::Update(Player&, const uint32&);
+template bool TargetedMovementGeneratorMedium<Creature, ChaseMovementGenerator<Creature> >::Update(Creature&, const uint32&);
+template bool TargetedMovementGeneratorMedium<Creature, FollowMovementGenerator<Creature> >::Update(Creature&, const uint32&);
+
+template void ChaseMovementGenerator<Player>::_reachTarget(Player&);
+template void ChaseMovementGenerator<Creature>::_reachTarget(Creature&);
+template void ChaseMovementGenerator<Player>::Finalize(Player&);
+template void ChaseMovementGenerator<Creature>::Finalize(Creature&);
+template void ChaseMovementGenerator<Player>::Interrupt(Player&);
+template void ChaseMovementGenerator<Creature>::Interrupt(Creature&);
+template void ChaseMovementGenerator<Player>::Reset(Player&);
+template void ChaseMovementGenerator<Creature>::Reset(Creature&);
+template float ChaseMovementGenerator<Creature>::GetDynamicTargetDistance(Creature&, bool) const;
+template float ChaseMovementGenerator<Player>::GetDynamicTargetDistance(Player&, bool) const;
+
+template void FollowMovementGenerator<Player>::_reachTarget(Player&);
+template void FollowMovementGenerator<Creature>::_reachTarget(Creature&);
+template void FollowMovementGenerator<Player>::Finalize(Player&);
+template void FollowMovementGenerator<Creature>::Finalize(Creature&);
+template void FollowMovementGenerator<Player>::Interrupt(Player&);
+template void FollowMovementGenerator<Creature>::Interrupt(Creature&);
+template void FollowMovementGenerator<Player>::Reset(Player&);
+template void FollowMovementGenerator<Creature>::Reset(Creature&);
+template float FollowMovementGenerator<Creature>::GetDynamicTargetDistance(Creature&, bool) const;
+template float FollowMovementGenerator<Player>::GetDynamicTargetDistance(Player&, bool) const;
diff --git a/src/game/movementGenerators/TargetedMovementGenerator.h b/src/game/movementGenerators/TargetedMovementGenerator.h
new file mode 100644
index 00000000000..eb1e05702ac
--- /dev/null
+++ b/src/game/movementGenerators/TargetedMovementGenerator.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ * Copyright (c) 2013 MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOS_TARGETEDMOVEMENTGENERATOR_H
+#define MANGOS_TARGETEDMOVEMENTGENERATOR_H
+
+#include "MovementGenerator.h"
+#include "FollowerReference.h"
+#include "PathFinder.h"
+#include "Unit.h"
+
+class MANGOS_DLL_SPEC TargetedMovementGeneratorBase
+{
+    public:
+        TargetedMovementGeneratorBase(Unit &target) { m_target.link(&target, this); }
+        void stopFollowing() {}
+    protected:
+        FollowerReference m_target;
+};
+
+template<class T, typename D>
+class MANGOS_DLL_SPEC TargetedMovementGeneratorMedium : public MovementGeneratorMedium< T, D >, public TargetedMovementGeneratorBase
+{
+    protected:
+        TargetedMovementGeneratorMedium(Unit& target, float offset, float angle) :
+            TargetedMovementGeneratorBase(target),
+            m_recheckDistanceTimer(0), m_waitTargetTimer(0),
+            m_offset(offset), m_angle(angle),
+            m_speedChanged(false), m_targetReached(false),
+            m_path(NULL) {}
+        virtual ~TargetedMovementGeneratorMedium() { delete m_path; }
+
+    public:
+        bool Update(T&, const uint32&);
+
+        bool IsReachable() const
+        {
+            return (m_path) ? (m_path->getPathType() & PATHFIND_NORMAL) : true;
+        }
+
+        Unit* GetTarget() const { return m_target.getTarget(); }
+
+        void UnitSpeedChanged() { m_speedChanged = true; }
+        char const* Name() const { return "<TargetedMedium>"; }
+
+    protected:
+        void _setTargetLocation(T&, bool updateDestination);
+        bool RequiresNewPosition(T& owner, float x, float y, float z);
+
+        ShortTimeTracker m_recheckDistanceTimer;
+        uint32 m_waitTargetTimer;
+        float m_offset;
+        float m_angle;
+        bool m_speedChanged : 1;
+        bool m_targetReached : 1;
+
+        PathFinder* m_path;
+};
+
+template<class T>
+class MANGOS_DLL_SPEC ChaseMovementGenerator : public TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >
+{
+    public:
+        ChaseMovementGenerator(Unit& target)
+            : TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >(target, 0.0f, 0.0f) {}
+        ChaseMovementGenerator(Unit& target, float offset, float angle)
+            : TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >(target, offset, angle) {}
+        ~ChaseMovementGenerator() {}
+
+        MovementGeneratorType GetMovementGeneratorType() const override { return CHASE_MOTION_TYPE; }
+
+        void Initialize(T&);
+        void Finalize(T&);
+        void Interrupt(T&);
+        void Reset(T&);
+        char const* Name() const { return "<Chase>"; }
+
+        static void _clearUnitStateMove(T& u) { u.clearUnitState(UNIT_STAT_CHASE_MOVE); }
+        static void _addUnitStateMove(T& u)  { u.addUnitState(UNIT_STAT_CHASE_MOVE); }
+        bool EnableWalking() const { return false;}
+        bool _lostTarget(T& u) const { return u.getVictim() != this->GetTarget(); }
+        void _reachTarget(T&);
+        float GetDynamicTargetDistance(T& owner, bool forRangeCheck) const;
+};
+
+template<class T>
+class MANGOS_DLL_SPEC FollowMovementGenerator : public TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >
+{
+    public:
+        FollowMovementGenerator(Unit& target)
+            : TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >(target) {}
+        FollowMovementGenerator(Unit& target, float offset, float angle)
+            : TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >(target, offset, angle) {}
+        ~FollowMovementGenerator() {}
+
+        MovementGeneratorType GetMovementGeneratorType() const override { return FOLLOW_MOTION_TYPE; }
+
+        void Initialize(T&);
+        void Finalize(T&);
+        void Interrupt(T&);
+        void Reset(T&);
+        char const* Name() const { return "<Follow>"; }
+
+        static void _clearUnitStateMove(T& u) { u.clearUnitState(UNIT_STAT_FOLLOW_MOVE); }
+        static void _addUnitStateMove(T& u)  { u.addUnitState(UNIT_STAT_FOLLOW_MOVE); }
+        bool EnableWalking() const;
+        bool _lostTarget(T&) const { return false; }
+        void _reachTarget(T&);
+        float GetDynamicTargetDistance(T& owner, bool forRangeCheck) const;
+
+    private:
+        void _updateSpeed(T& u);
+};
+
+#endif
diff --git a/src/game/movementGenerators/WaypointMovementGenerator.cpp b/src/game/movementGenerators/WaypointMovementGenerator.cpp
new file mode 100644
index 00000000000..6d194d5214c
--- /dev/null
+++ b/src/game/movementGenerators/WaypointMovementGenerator.cpp
@@ -0,0 +1,500 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <ctime>
+
+#include "WaypointMovementGenerator.h"
+#include "ObjectMgr.h"
+#include "Player.h"
+#include "Creature.h"
+#include "CreatureAI.h"
+#include "GameObject.h"
+#include "WaypointManager.h"
+#include "WorldPacket.h"
+#include "ScriptMgr.h"
+#include "movement/MoveSplineInit.h"
+#include "movement/MoveSpline.h"
+
+#include <cassert>
+
+//-----------------------------------------------//
+void WaypointMovementGenerator<Creature>::LoadPath(Creature &creature)
+{
+    DETAIL_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "LoadPath: loading waypoint path for %s", creature.GetGuidStr().c_str());
+
+    i_path = sWaypointMgr.GetPath(creature.GetGUIDLow());
+
+    // We may LoadPath() for several occasions:
+
+    // 1: When creature.MovementType=2
+    //    1a) Path is selected by creature.guid == creature_movement.id
+    //    1b) Path for 1a) does not exist and then use path from creature.GetEntry() == creature_movement_template.entry
+
+    // 2: When creature_template.MovementType=2
+    //    2a) Creature is summoned and has creature_template.MovementType=2
+    //        Creators need to be sure that creature_movement_template is always valid for summons.
+    //        Mob that can be summoned anywhere should not have creature_movement_template for example.
+
+    // No movement found for guid
+    if (!i_path)
+    {
+        i_path = sWaypointMgr.GetPathTemplate(creature.GetEntry());
+
+        // No movement found for entry
+        if (!i_path)
+        {
+            sLog.outErrorDb("WaypointMovementGenerator::LoadPath: creature %s (Entry: %u GUID: %u) doesn't have waypoint path",
+                creature.GetName(), creature.GetEntry(), creature.GetGUIDLow());
+            return;
+        }
+    }
+
+    // Initialize the i_currentNode to point to the first node
+    if (i_path->empty())
+        return;
+    i_currentNode = i_path->begin()->first;
+    m_lastReachedWaypoint = 0;
+}
+
+void WaypointMovementGenerator<Creature>::Initialize(Creature &creature)
+{
+    creature.addUnitState(UNIT_STAT_ROAMING);
+    creature.clearUnitState(UNIT_STAT_WAYPOINT_PAUSED);
+
+    LoadPath(creature);
+
+    StartMoveNow(creature);
+}
+
+void WaypointMovementGenerator<Creature>::Finalize(Creature &creature)
+{
+    creature.clearUnitState(UNIT_STAT_ROAMING | UNIT_STAT_ROAMING_MOVE);
+    creature.SetWalk(!creature.hasUnitState(UNIT_STAT_RUNNING_STATE), false);
+}
+
+void WaypointMovementGenerator<Creature>::Interrupt(Creature &creature)
+{
+    creature.InterruptMoving();
+    creature.clearUnitState(UNIT_STAT_ROAMING | UNIT_STAT_ROAMING_MOVE);
+    creature.SetWalk(!creature.hasUnitState(UNIT_STAT_RUNNING_STATE), false);
+}
+
+void WaypointMovementGenerator<Creature>::Reset(Creature &creature)
+{
+    creature.addUnitState(UNIT_STAT_ROAMING);
+    StartMove(creature);
+}
+
+void WaypointMovementGenerator<Creature>::OnArrived(Creature& creature)
+{
+    if (!i_path || i_path->empty())
+        return;
+
+    m_lastReachedWaypoint = i_currentNode;
+
+    if (m_isArrivalDone)
+        return;
+
+    creature.clearUnitState(UNIT_STAT_ROAMING_MOVE);
+    m_isArrivalDone = true;
+
+    WaypointPath::const_iterator currPoint = i_path->find(i_currentNode);
+    MANGOS_ASSERT(currPoint != i_path->end());
+    WaypointNode const& node = currPoint->second;
+
+    if (node.script_id)
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Creature movement start script %u at point %u for %s.", node.script_id, i_currentNode, creature.GetGuidStr().c_str());
+        creature.GetMap()->ScriptsStart(sCreatureMovementScripts, node.script_id, &creature, &creature);
+    }
+
+    // We have reached the destination and can process behavior
+    if (WaypointBehavior* behavior = node.behavior)
+    {
+        if (behavior->emote != 0)
+            creature.HandleEmote(behavior->emote);
+
+        if (behavior->spell != 0)
+            creature.CastSpell(&creature, behavior->spell, false);
+
+        if (behavior->model1 != 0)
+            creature.SetDisplayId(behavior->model1);
+
+        if (behavior->textid[0])
+        {
+            int32 textId = behavior->textid[0];
+            // Not only one text is set
+            if (behavior->textid[1])
+            {
+                // Select one from max 5 texts (0 and 1 already checked)
+                int i = 2;
+                for(; i < MAX_WAYPOINT_TEXT; ++i)
+                {
+                    if (!behavior->textid[i])
+                        break;
+                }
+
+                textId = behavior->textid[urand(0, i - 1)];
+            }
+
+            if (MangosStringLocale const* textData = sObjectMgr.GetMangosStringLocale(textId))
+                creature.MonsterText(textData, NULL);
+            else
+                sLog.outErrorDb("%s reached waypoint %u, attempted to do text %i, but required text-data could not be found", creature.GetGuidStr().c_str(), i_currentNode, textId);
+        }
+    }
+
+    // Inform script
+    MovementInform(creature);
+    Stop(node.delay);
+}
+
+void WaypointMovementGenerator<Creature>::StartMoveNow(Creature& creature)
+{
+    i_nextMoveTime.Reset(0);
+    StartMove(creature);
+}
+
+void WaypointMovementGenerator<Creature>::StartMove(Creature& creature)
+{
+    if (!i_path || i_path->empty())
+        return;
+
+    if (Stopped(creature))
+        return;
+
+    if (!creature.isAlive() || creature.hasUnitState(UNIT_STAT_NOT_MOVE))
+        return;
+
+    WaypointPath::const_iterator currPoint = i_path->find(i_currentNode);
+    MANGOS_ASSERT(currPoint != i_path->end());
+
+    if (WaypointBehavior* behavior = currPoint->second.behavior)
+    {
+        if (behavior->model2 != 0)
+            creature.SetDisplayId(behavior->model2);
+        creature.SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
+    }
+
+    if (m_isArrivalDone)
+    {
+        ++currPoint;
+        if (currPoint == i_path->end())
+            currPoint = i_path->begin();
+
+        i_currentNode = currPoint->first;
+    }
+
+    m_isArrivalDone = false;
+
+    creature.addUnitState(UNIT_STAT_ROAMING_MOVE);
+
+    WaypointNode const& nextNode = currPoint->second;;
+    Movement::MoveSplineInit<Unit*> init(creature);
+    init.MoveTo(nextNode.x, nextNode.y, nextNode.z, true);
+
+    if (nextNode.orientation != 100 && nextNode.delay != 0)
+        init.SetFacing(nextNode.orientation);
+    creature.SetWalk(!creature.hasUnitState(UNIT_STAT_RUNNING_STATE) && !creature.IsLevitating(), false);
+    init.Launch();
+}
+
+bool WaypointMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff)
+{
+    // Waypoint movement can be switched on/off
+    // This is quite handy for escort quests and other stuff
+    if (creature.hasUnitState(UNIT_STAT_NOT_MOVE))
+    {
+        creature.clearUnitState(UNIT_STAT_ROAMING_MOVE);
+        return true;
+    }
+
+    // prevent a crash at empty waypoint path.
+    if (!i_path || i_path->empty())
+    {
+        creature.clearUnitState(UNIT_STAT_ROAMING_MOVE);
+        return true;
+    }
+
+    if (Stopped(creature))
+    {
+        if (CanMove(diff, creature))
+            StartMove(creature);
+    }
+    else
+    {
+        if (creature.IsStopped())
+            Stop(STOP_TIME_FOR_PLAYER);
+        else if (creature.movespline->Finalized())
+        {
+            OnArrived(creature);
+            StartMove(creature);
+        }
+    }
+    return true;
+}
+
+void WaypointMovementGenerator<Creature>::MovementInform(Creature &creature)
+{
+    if (creature.AI())
+        creature.AI()->MovementInform(WAYPOINT_MOTION_TYPE, i_currentNode);
+}
+
+bool WaypointMovementGenerator<Creature>::GetResetPosition(Creature&, float& x, float& y, float& z) const
+{
+    // prevent a crash at empty waypoint path.
+    if (!i_path || i_path->empty())
+        return false;
+
+    WaypointPath::const_iterator lastPoint = i_path->find(m_lastReachedWaypoint);
+    // Special case: Before the first waypoint is reached, m_lastReachedWaypoint is set to 0 (which may not be contained in i_path)
+    if (!m_lastReachedWaypoint && lastPoint == i_path->end())
+        return false;
+
+    MANGOS_ASSERT(lastPoint != i_path->end());
+
+    x = lastPoint->second.x; y = lastPoint->second.y; z = lastPoint->second.z;
+    return true;
+}
+
+bool WaypointMovementGenerator<Creature>::Stopped(Creature& u)
+{
+    return !i_nextMoveTime.Passed() || u.hasUnitState(UNIT_STAT_WAYPOINT_PAUSED);
+}
+
+bool WaypointMovementGenerator<Creature>::CanMove(int32 diff, Creature& u)
+{
+    i_nextMoveTime.Update(diff);
+    if (i_nextMoveTime.Passed() && u.hasUnitState(UNIT_STAT_WAYPOINT_PAUSED))
+        i_nextMoveTime.Reset(1);
+
+    return i_nextMoveTime.Passed() && !u.hasUnitState(UNIT_STAT_WAYPOINT_PAUSED);
+}
+
+void WaypointMovementGenerator<Creature>::AddToWaypointPauseTime(int32 waitTimeDiff)
+{
+    if (!i_nextMoveTime.Passed())
+    {
+        // Prevent <= 0, the code in Update requires to catch the change from moving to not moving
+        int32 newWaitTime = i_nextMoveTime.GetExpiry() + waitTimeDiff;
+        i_nextMoveTime.Reset(newWaitTime > 0 ? newWaitTime : 1);
+    }
+}
+
+//----------------------------------------------------//
+uint32 FlightPathMovementGenerator::GetPathAtMapEnd() const
+{
+    if (i_currentNode >= i_path->size())
+        return i_path->size();
+
+    uint32 curMapId = (*i_path)[i_currentNode].mapid;
+
+    for(uint32 i = i_currentNode; i < i_path->size(); ++i)
+    {
+        if ((*i_path)[i].mapid != curMapId)
+            return i;
+    }
+
+    return i_path->size();
+}
+
+void FlightPathMovementGenerator::_Initialize(Player &player)
+{
+    _Reset(player);
+}
+
+void FlightPathMovementGenerator::_Finalize(Player & player)
+{
+    if (player.m_taxi.empty())
+    {
+        // update z position to ground and orientation for landing point
+        // this prevent cheating with landing  point at lags
+        // when client side flight end early in comparison server side
+        player.StopMoving(true);
+    }
+}
+
+void FlightPathMovementGenerator::_Interrupt(Player & player)
+{
+}
+
+#define PLAYER_FLIGHT_SPEED        32.0f
+
+void FlightPathMovementGenerator::_Reset(Player & player)
+{
+    Movement::MoveSplineInit<Unit*> init(player);
+    uint32 end = GetPathAtMapEnd();
+    for (uint32 i = GetCurrentNode(); i != end; ++i)
+    {
+        G3D::Vector3 vertice((*i_path)[i].x,(*i_path)[i].y,(*i_path)[i].z);
+        init.Path().push_back(vertice);
+    }
+    init.SetFirstPointId(GetCurrentNode());
+    init.SetFly();
+    init.SetVelocity(PLAYER_FLIGHT_SPEED);
+    init.Launch();
+}
+
+bool FlightPathMovementGenerator::Update(Player &player, const uint32 &diff)
+{
+    uint32 pointId = (uint32)player.movespline->currentPathIdx();
+    if (pointId > i_currentNode)
+    {
+        bool departureEvent = true;
+        do
+        {
+            DoEventIfAny(player,(*i_path)[i_currentNode],departureEvent);
+            if (pointId == i_currentNode)
+                break;
+            i_currentNode += (uint32)departureEvent;
+            departureEvent = !departureEvent;
+        } while(true);
+    }
+
+    return !(player.movespline->Finalized() || i_currentNode >= (i_path->size()-1));
+}
+
+void FlightPathMovementGenerator::SetCurrentNodeAfterTeleport()
+{
+    if (i_path->empty())
+        return;
+
+    uint32 map0 = (*i_path)[0].mapid;
+
+    for (size_t i = 1; i < i_path->size(); ++i)
+    {
+        if ((*i_path)[i].mapid != map0)
+        {
+            i_currentNode = i;
+            return;
+        }
+    }
+}
+
+void FlightPathMovementGenerator::DoEventIfAny(Player& player, TaxiPathNodeEntry const& node, bool departure)
+{
+    if (uint32 eventid = departure ? node.departureEventID : node.arrivalEventID)
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Taxi %s event %u of node %u of path %u for player %s", departure ? "departure" : "arrival", eventid, node.index, node.path, player.GetName());
+        StartEvents_Event(player.GetMap(), eventid, &player, &player, departure);
+    }
+}
+
+bool FlightPathMovementGenerator::GetResetPosition(Player&, float& x, float& y, float& z) const
+{
+    const TaxiPathNodeEntry& node = (*i_path)[i_currentNode];
+    x = node.x; y = node.y; z = node.z;
+    return true;
+}
+
+//----------------------------------------------------//
+uint32 TransportPathMovementGenerator::GetPathAtMapEnd() const
+{
+    if (i_currentNode >= i_path->size())
+        return i_path->size();
+
+    uint32 curMapId = (*i_path)[i_currentNode].mapid;
+
+    for(uint32 i = i_currentNode; i < i_path->size(); ++i)
+    {
+        if ((*i_path)[i].mapid != curMapId)
+            return i;
+    }
+
+    return i_path->size();
+}
+
+void TransportPathMovementGenerator::Initialize(GameObject& go)
+{
+}
+
+void TransportPathMovementGenerator::Finalize(GameObject& go)
+{
+    //go.StopMoving();
+}
+
+void TransportPathMovementGenerator::Interrupt(GameObject& go)
+{
+}
+
+void TransportPathMovementGenerator::Reset(GameObject& go)
+{
+    Movement::MoveSplineInit<GameObject*> init(go);
+    uint32 end = GetPathAtMapEnd();
+    for (uint32 i = GetCurrentNode(); i != end; ++i)
+    {
+        G3D::Vector3 vertice((*i_path)[i].x,(*i_path)[i].y,(*i_path)[i].z);
+        init.Path().push_back(vertice);
+    }
+    init.SetFirstPointId(GetCurrentNode());
+    init.SetFly();
+    init.SetVelocity(PLAYER_FLIGHT_SPEED);
+    init.Launch();
+}
+
+bool TransportPathMovementGenerator::Update(GameObject& go, uint32 const& diff)
+{
+    uint32 pointId = (uint32)go.movespline->currentPathIdx();
+    if (pointId > i_currentNode)
+    {
+        bool departureEvent = true;
+        do
+        {
+            DoEventIfAny(go,(*i_path)[i_currentNode],departureEvent);
+            if (pointId == i_currentNode)
+                break;
+            i_currentNode += (uint32)departureEvent;
+            departureEvent = !departureEvent;
+        } while(true);
+    }
+
+    return !(go.movespline->Finalized() || i_currentNode >= (i_path->size()-1));
+}
+
+void TransportPathMovementGenerator::SetCurrentNodeAfterTeleport()
+{
+    if (i_path->empty())
+        return;
+
+    uint32 map0 = (*i_path)[0].mapid;
+
+    for (size_t i = 1; i < i_path->size(); ++i)
+    {
+        if ((*i_path)[i].mapid != map0)
+        {
+            i_currentNode = i;
+            return;
+        }
+    }
+}
+
+void TransportPathMovementGenerator::DoEventIfAny(GameObject& go, TaxiPathNodeEntry const& node, bool departure)
+{
+    if (uint32 eventid = departure ? node.departureEventID : node.arrivalEventID)
+    {
+        DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Transport %s event %u of node %u of path %u for GO %s", departure ? "departure" : "arrival", eventid, node.index, node.path, go.GetObjectGuid().GetString().c_str());
+//        StartEvents_Event(player.GetMap(), eventid, &player, &go, departure);
+    }
+}
+
+bool TransportPathMovementGenerator::GetResetPosition(GameObject& go, float& x, float& y, float& z) const
+{
+    const TaxiPathNodeEntry& node = (*i_path)[i_currentNode];
+    x = node.x; y = node.y; z = node.z;
+    return true;
+}
diff --git a/src/game/movementGenerators/WaypointMovementGenerator.h b/src/game/movementGenerators/WaypointMovementGenerator.h
new file mode 100644
index 00000000000..2afe9f5369e
--- /dev/null
+++ b/src/game/movementGenerators/WaypointMovementGenerator.h
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOS_WAYPOINTMOVEMENTGENERATOR_H
+#define MANGOS_WAYPOINTMOVEMENTGENERATOR_H
+
+/** @page PathMovementGenerator is used to generate movements
+ * of waypoints and flight paths.  Each serves the purpose
+ * of generate activities so that it generates updated
+ * packets for the players.
+ */
+
+#include "MovementGenerator.h"
+#include "WaypointManager.h"
+#include "DBCStructure.h"
+
+#include <vector>
+#include <set>
+
+#define FLIGHT_TRAVEL_UPDATE  100
+#define STOP_TIME_FOR_PLAYER  (3 * MINUTE * IN_MILLISECONDS)// 3 Minutes
+
+class GameObject;
+
+template<class T, class P>
+class MANGOS_DLL_SPEC PathMovementBase
+{
+    public:
+        PathMovementBase() : i_currentNode(0) {}
+        virtual ~PathMovementBase() {};
+
+        // template pattern, not defined .. override required
+        void LoadPath(T &);
+        uint32 GetCurrentNode() const { return i_currentNode; }
+
+    protected:
+        P i_path;
+        uint32 i_currentNode;
+};
+
+/** WaypointMovementGenerator loads a series of way points
+ * from the DB and apply it to the creature's movement generator.
+ * Hence, the creature will move according to its predefined way points.
+ */
+
+template<class T>
+class MANGOS_DLL_SPEC WaypointMovementGenerator;
+
+template<>
+class MANGOS_DLL_SPEC WaypointMovementGenerator<Creature>
+: public MovementGeneratorMedium< Creature, WaypointMovementGenerator<Creature> >,
+public PathMovementBase<Creature, WaypointPath const*>
+{
+    public:
+        WaypointMovementGenerator(Creature&) : i_nextMoveTime(0), m_isArrivalDone(false), m_lastReachedWaypoint(0) {}
+        ~WaypointMovementGenerator() { i_path = NULL; }
+        void Initialize(Creature &u);
+        void Interrupt(Creature &);
+        void Finalize(Creature &);
+        void Reset(Creature &u);
+        bool Update(Creature &u, const uint32 &diff);
+
+        void MovementInform(Creature &);
+
+        MovementGeneratorType GetMovementGeneratorType() const { return WAYPOINT_MOTION_TYPE; }
+
+        const char* Name() const { return "<Waypoint>"; }
+
+        // now path movement implmementation
+        void LoadPath(Creature &c);
+
+        bool GetResetPosition(Creature&, float& x, float& y, float& z) const;
+
+        void AddToWaypointPauseTime(int32 waitTimeDiff);
+
+        uint32 getLastReachedWaypoint() const { return m_lastReachedWaypoint; }
+
+    private:
+        void Stop(int32 time) { i_nextMoveTime.Reset(time); }
+        bool Stopped(Creature& u);
+        bool CanMove(int32 diff, Creature& u);
+
+        void OnArrived(Creature&);
+        void StartMove(Creature&);
+
+        void StartMoveNow(Creature& creature);
+
+        ShortTimeTracker i_nextMoveTime;
+        bool m_isArrivalDone;
+        uint32 m_lastReachedWaypoint;
+};
+
+/** FlightPathMovementGenerator generates movement of the player for the paths
+ * and hence generates ground and activities for the player.
+ */
+class MANGOS_DLL_SPEC FlightPathMovementGenerator
+: public MovementGeneratorMedium< Player, FlightPathMovementGenerator >,
+public PathMovementBase<Player,TaxiPathNodeList const*>
+{
+    public:
+        explicit FlightPathMovementGenerator(TaxiPathNodeList const& pathnodes, uint32 startNode = 0)
+        {
+            i_path = &pathnodes;
+            i_currentNode = startNode;
+        }
+        virtual void Initialize(Player &u) {_Initialize(u);};
+        virtual void Finalize(Player &u)   {_Finalize(u);};
+        virtual void Interrupt(Player &u)  {_Interrupt(u);};
+        virtual void Reset(Player &u)      {_Reset(u);};
+
+        bool Update(Player &, const uint32 &);
+        MovementGeneratorType GetMovementGeneratorType() const { return FLIGHT_MOTION_TYPE; }
+
+        TaxiPathNodeList const& GetPath() { return *i_path; }
+        uint32 GetPathAtMapEnd() const;
+        bool HasArrived() const { return (i_currentNode >= i_path->size()); }
+        void SetCurrentNodeAfterTeleport();
+        void SkipCurrentNode() { ++i_currentNode; }
+        void DoEventIfAny(Player& player, TaxiPathNodeEntry const& node, bool departure);
+        bool GetResetPosition(Player&, float& x, float& y, float& z) const;
+
+    protected:
+        void _Initialize(Player &);
+        void _Finalize(Player &);
+        void _Interrupt(Player &);
+        void _Reset(Player &);
+
+};
+
+/** TransportPathMovementGenerator generates movement of the MO_TRANSPORT and elevators for the paths
+ * and hence generates ground and activities.
+ */
+class MANGOS_DLL_SPEC TransportPathMovementGenerator
+    : public PathMovementBase<GameObject,TaxiPathNodeList const*>
+{
+    public:
+        explicit TransportPathMovementGenerator(TaxiPathNodeList const& pathnodes, uint32 startNode = 0)
+        {
+            i_path = &pathnodes;
+            i_currentNode = startNode;
+        }
+        virtual void Initialize(GameObject &go);
+        virtual void Finalize(GameObject &go);
+        virtual void Interrupt(GameObject &go);
+        virtual void Reset(GameObject &go);
+
+        bool Update(GameObject&, const uint32&);
+        MovementGeneratorType GetMovementGeneratorType() const { return FLIGHT_MOTION_TYPE; }
+
+        TaxiPathNodeList const& GetPath() { return *i_path; }
+        uint32 GetPathAtMapEnd() const;
+        bool HasArrived() const { return (i_currentNode >= i_path->size()); }
+        void SetCurrentNodeAfterTeleport();
+        void SkipCurrentNode() { ++i_currentNode; }
+        void DoEventIfAny(GameObject& go, TaxiPathNodeEntry const& node, bool departure);
+        bool GetResetPosition(GameObject& go, float& x, float& y, float& z) const;
+};
+
+#endif
diff --git a/src/game/playerbot/AiFactory.cpp b/src/game/playerbot/AiFactory.cpp
new file mode 100644
index 00000000000..86d605e5534
--- /dev/null
+++ b/src/game/playerbot/AiFactory.cpp
@@ -0,0 +1,212 @@
+#include "../pchdef.h"
+#include "playerbot.h"
+#include "AiFactory.h"
+#include "strategy/Engine.h"
+
+#include "strategy/priest/PriestAiObjectContext.h"
+#include "strategy/mage/MageAiObjectContext.h"
+#include "strategy/warlock/WarlockAiObjectContext.h"
+#include "strategy/warrior/WarriorAiObjectContext.h"
+#include "strategy/shaman/ShamanAiObjectContext.h"
+#include "strategy/paladin/PaladinAiObjectContext.h"
+#include "strategy/druid/DruidAiObjectContext.h"
+#include "strategy/hunter/HunterAiObjectContext.h"
+#include "strategy/rogue/RogueAiObjectContext.h"
+#include "../Player.h"
+#include "PlayerbotAIConfig.h"
+#include "RandomPlayerbotMgr.h"
+
+
+AiObjectContext* AiFactory::createAiObjectContext(Player* player, PlayerbotAI* ai)
+{
+    switch (player->getClass())
+    {
+    case CLASS_PRIEST:
+        return new PriestAiObjectContext(ai);
+        break;
+    case CLASS_MAGE:
+        return new MageAiObjectContext(ai);
+        break;
+    case CLASS_WARLOCK:
+        return new WarlockAiObjectContext(ai);
+        break;
+    case CLASS_WARRIOR:
+        return new WarriorAiObjectContext(ai);
+        break;
+    case CLASS_SHAMAN:
+        return new ShamanAiObjectContext(ai);
+        break;
+    case CLASS_PALADIN:
+        return new PaladinAiObjectContext(ai);
+        break;
+    case CLASS_DRUID:
+        return new DruidAiObjectContext(ai);
+        break;
+    case CLASS_HUNTER:
+        return new HunterAiObjectContext(ai);
+        break;
+    case CLASS_ROGUE:
+        return new RogueAiObjectContext(ai);
+        break;
+    }
+    return new AiObjectContext(ai);
+}
+
+int AiFactory::GetPlayerSpecTab(Player* player)
+{
+    int c0 = player->GetTalentsCount(0);
+    int c1 = player->GetTalentsCount(1);
+    int c2 = player->GetTalentsCount(2);
+
+    if (c0 >= c1 && c0 >= c2)
+        return 0;
+
+    if (c1 >= c0 && c1 >= c2)
+        return 1;
+
+    return 2;
+}
+
+void AiFactory::AddDefaultCombatStrategies(Player* player, PlayerbotAI* const facade, Engine* engine)
+{
+    int tab = GetPlayerSpecTab(player);
+
+    engine->addStrategies("attack weak", "racials", "chat", "default", "aoe", "potions", "cast time", "conserve mana", "duel", "pvp", NULL);
+
+    switch (player->getClass())
+    {
+        case CLASS_PRIEST:
+            if (tab == 2)
+            {
+                engine->addStrategies("dps", "threat", NULL);
+                if (player->getLevel() > 19)
+                    engine->addStrategy("dps debuff");
+            }
+            else
+                engine->addStrategy("heal");
+
+            engine->addStrategy("flee");
+            break;
+        case CLASS_MAGE:
+            if (tab == 0)
+                engine->addStrategies("arcane", "threat", NULL);
+            else if (tab == 1)
+                engine->addStrategies("fire", "fire aoe", "threat", NULL);
+            else
+                engine->addStrategies("frost", "frost aoe", "threat", NULL);
+
+            engine->addStrategy("flee");
+            break;
+        case CLASS_WARRIOR:
+            if (tab == 2)
+                engine->addStrategies("tank", "tank aoe", NULL);
+            else
+                engine->addStrategies("dps", "threat", NULL);
+            break;
+        case CLASS_SHAMAN:
+            if (tab == 0)
+                engine->addStrategies("caster", "caster aoe", "bmana", "threat", "flee", NULL);
+            else if (tab == 2)
+                engine->addStrategies("heal", "bmana", "flee", NULL);
+            else
+                engine->addStrategies("dps", "melee aoe", "bdps", "threat", NULL);
+            break;
+        case CLASS_PALADIN:
+            if (tab == 1)
+                engine->addStrategies("tank", "tank aoe", "barmor", NULL);
+            else
+                engine->addStrategies("dps", "bdps", "threat", NULL);
+            break;
+        case CLASS_DRUID:
+            if (tab == 0)
+            {
+                engine->addStrategies("caster", "caster aoe", "threat", "flee", NULL);
+                if (player->getLevel() > 19)
+                    engine->addStrategy("caster debuff");
+            }
+            else if (tab == 2)
+                engine->addStrategies("heal", "flee", NULL);
+            else
+                engine->addStrategies("bear", "tank aoe", "threat", "flee", NULL);
+            break;
+        case CLASS_HUNTER:
+            engine->addStrategies("dps", "bdps", "threat", NULL);
+            if (player->getLevel() > 19)
+                engine->addStrategy("dps debuff");
+            break;
+        case CLASS_ROGUE:
+            engine->addStrategies("dps", "threat", NULL);
+            break;
+        case CLASS_WARLOCK:
+            if (tab == 1)
+                engine->addStrategies("tank", "threat", NULL);
+            else
+                engine->addStrategies("dps", "threat", NULL);
+
+            if (player->getLevel() > 19)
+                engine->addStrategy("dps debuff");
+
+            engine->addStrategy("flee");
+            break;
+    }
+
+    if (sRandomPlayerbotMgr.IsRandomBot(player) && !player->GetGroup())
+    {
+        engine->ChangeStrategy(sPlayerbotAIConfig.randomBotCombatStrategies);
+    }
+}
+
+Engine* AiFactory::createCombatEngine(Player* player, PlayerbotAI* const facade, AiObjectContext* AiObjectContext) {
+	Engine* engine = new Engine(facade, AiObjectContext);
+    AddDefaultCombatStrategies(player, facade, engine);
+    return engine;
+}
+
+void AiFactory::AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const facade, Engine* nonCombatEngine)
+{
+    int tab = GetPlayerSpecTab(player);
+
+    switch (player->getClass()){
+        case CLASS_PALADIN:
+        case CLASS_HUNTER:
+        case CLASS_SHAMAN:
+            nonCombatEngine->addStrategy("bmana");
+            break;
+        case CLASS_MAGE:
+            if (tab == 1)
+                nonCombatEngine->addStrategy("bdps");
+            else
+                nonCombatEngine->addStrategy("bmana");
+            break;
+    }
+    nonCombatEngine->addStrategies("nc", "attack weak", "food", "stay", "chat",
+            "default", "quest", "loot", "gather", "duel", "emote", NULL);
+
+    if (sRandomPlayerbotMgr.IsRandomBot(player) && !player->GetGroup())
+    {
+        nonCombatEngine->ChangeStrategy(sPlayerbotAIConfig.randomBotNonCombatStrategies);
+    }
+
+}
+
+Engine* AiFactory::createNonCombatEngine(Player* player, PlayerbotAI* const facade, AiObjectContext* AiObjectContext) {
+	Engine* nonCombatEngine = new Engine(facade, AiObjectContext);
+
+    AddDefaultNonCombatStrategies(player, facade, nonCombatEngine);
+	return nonCombatEngine;
+}
+
+void AiFactory::AddDefaultDeadStrategies(Player* player, PlayerbotAI* const facade, Engine* deadEngine)
+{
+    deadEngine->addStrategies("dead", "stay", "chat", "default", "follow", NULL);
+    if (sRandomPlayerbotMgr.IsRandomBot(player) && !player->GetGroup())
+    {
+        deadEngine->removeStrategy("follow");
+    }
+}
+
+Engine* AiFactory::createDeadEngine(Player* player, PlayerbotAI* const facade, AiObjectContext* AiObjectContext) {
+    Engine* deadEngine = new Engine(facade, AiObjectContext);
+    AddDefaultDeadStrategies(player, facade, deadEngine);
+    return deadEngine;
+}
diff --git a/src/game/playerbot/AiFactory.h b/src/game/playerbot/AiFactory.h
new file mode 100644
index 00000000000..a14576b247a
--- /dev/null
+++ b/src/game/playerbot/AiFactory.h
@@ -0,0 +1,20 @@
+#pragma once
+
+class Player;
+
+using namespace ai;
+
+class AiFactory
+{
+public:
+    static AiObjectContext* createAiObjectContext(Player* player, PlayerbotAI* ai);
+	static Engine* createCombatEngine(Player* player, PlayerbotAI* const facade, AiObjectContext* AiObjectContext);
+	static Engine* createNonCombatEngine(Player* player, PlayerbotAI* const facade, AiObjectContext* AiObjectContext);
+    static Engine* createDeadEngine(Player* player, PlayerbotAI* const facade, AiObjectContext* AiObjectContext);
+    static void AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const facade, Engine* nonCombatEngine);
+    static void AddDefaultDeadStrategies(Player* player, PlayerbotAI* const facade, Engine* deadEngine);
+    static void AddDefaultCombatStrategies(Player* player, PlayerbotAI* const facade, Engine* engine);
+
+public:
+    static int GetPlayerSpecTab(Player* player);
+};
diff --git a/src/game/playerbot/ChatFilter.cpp b/src/game/playerbot/ChatFilter.cpp
new file mode 100644
index 00000000000..38803ab45b6
--- /dev/null
+++ b/src/game/playerbot/ChatFilter.cpp
@@ -0,0 +1,257 @@
+#include "../pchdef.h"
+#include "playerbot.h"
+#include "ChatFilter.h"
+#include "strategy/values/RtiTargetValue.h"
+
+using namespace ai;
+using namespace std;
+
+string ChatFilter::Filter(string message)
+{
+    if (message.find("@") == string::npos)
+        return message;
+
+    return message.substr(message.find(" ") + 1);
+}
+
+class StrategyChatFilter : public ChatFilter
+{
+public:
+    StrategyChatFilter(PlayerbotAI* ai) : ChatFilter(ai) {}
+
+    virtual string Filter(string message)
+    {
+        Player* bot = ai->GetBot();
+
+        bool tank = message.find("@tank") == 0;
+        if (tank && !ai->IsTank(bot))
+            return "";
+
+        bool dps = message.find("@dps") == 0;
+        if (dps && ai->IsTank(bot))
+            return "";
+
+        bool heal = message.find("@heal") == 0;
+        if (heal && !ai->IsHeal(bot))
+            return "";
+
+        if (tank || dps)
+            return ChatFilter::Filter(message);
+
+        return message;
+    }
+};
+
+class LevelChatFilter : public ChatFilter
+{
+public:
+    LevelChatFilter(PlayerbotAI* ai) : ChatFilter(ai) {}
+
+    virtual string Filter(string message)
+    {
+        Player* bot = ai->GetBot();
+
+        if (message[0] != '@')
+            return message;
+
+        if (message.find("-") != string::npos)
+        {
+            int fromLevel = atoi(message.substr(message.find("@") + 1, message.find("-")).c_str());
+            int toLevel = atoi(message.substr(message.find("-") + 1, message.find(" ")).c_str());
+
+            if (bot->getLevel() >= fromLevel && bot->getLevel() <= toLevel)
+                return ChatFilter::Filter(message);
+
+            return message;
+        }
+
+		int level = atoi(message.substr(message.find("@") + 1, message.find(" ")).c_str());
+        if (bot->getLevel() == level)
+            return ChatFilter::Filter(message);
+
+        return message;
+    }
+};
+
+class CombatTypeChatFilter : public ChatFilter
+{
+public:
+    CombatTypeChatFilter(PlayerbotAI* ai) : ChatFilter(ai) {}
+
+    virtual string Filter(string message)
+    {
+        Player* bot = ai->GetBot();
+
+        bool melee = message.find("@melee") == 0;
+        bool ranged = message.find("@ranged") == 0;
+
+        if (!melee && !ranged)
+            return message;
+
+        switch (bot->getClass())
+        {
+            case CLASS_WARRIOR:
+            case CLASS_PALADIN:
+            case CLASS_ROGUE:
+            case CLASS_DEATH_KNIGHT:
+                if (ranged)
+                    return "";
+                break;
+
+            case CLASS_HUNTER:
+            case CLASS_PRIEST:
+            case CLASS_MAGE:
+            case CLASS_WARLOCK:
+                if (melee)
+                    return "";
+                break;
+
+            case CLASS_DRUID:
+                if (ranged && ai->IsTank(bot))
+                    return "";
+                if (melee && !ai->IsTank(bot))
+                    return "";
+                break;
+
+            case CLASS_SHAMAN:
+                if (melee && ai->IsHeal(bot))
+                    return "";
+                if (ranged && !ai->IsHeal(bot))
+                    return "";
+                break;
+        }
+
+        return ChatFilter::Filter(message);
+    }
+};
+
+class RtiChatFilter : public ChatFilter
+{
+public:
+    RtiChatFilter(PlayerbotAI* ai) : ChatFilter(ai)
+    {
+        rtis.push_back("@star");
+        rtis.push_back("@circle");
+        rtis.push_back("@diamond");
+        rtis.push_back("@triangle");
+        rtis.push_back("@moon");
+        rtis.push_back("@square");
+        rtis.push_back("@cross");
+        rtis.push_back("@skull");
+    }
+
+    virtual string Filter(string message)
+    {
+        Player* bot = ai->GetBot();
+        Group *group = bot->GetGroup();
+        if(!group)
+            return message;
+
+        bool found = false;
+        for (list<string>::iterator i = rtis.begin(); i != rtis.end(); i++)
+        {
+            string rti = *i;
+
+            bool isRti = message.find(rti) == 0;
+            if (!isRti)
+                continue;
+
+            ObjectGuid rtiTarget = group->GetTargetIcon(RtiTargetValue::GetRtiIndex(rti.substr(1)));
+            if (bot->GetObjectGuid() == rtiTarget)
+                return ChatFilter::Filter(message);
+
+            Unit* target = *ai->GetAiObjectContext()->GetValue<Unit*>("current target");
+            if (!target)
+                return "";
+
+            if (target->GetObjectGuid() != rtiTarget)
+                return "";
+
+            if (found |= isRti)
+                break;
+        }
+
+        if (found)
+            return ChatFilter::Filter(message);
+
+        return message;
+    }
+
+private:
+    list<string> rtis;
+};
+
+class ClassChatFilter : public ChatFilter
+{
+public:
+    ClassChatFilter(PlayerbotAI* ai) : ChatFilter(ai)
+    {
+        classNames["@death_knight"] = CLASS_DEATH_KNIGHT;
+        classNames["@druid"] = CLASS_DRUID;
+        classNames["@hunter"] = CLASS_HUNTER;
+        classNames["@mage"] = CLASS_MAGE;
+        classNames["@paladin"] = CLASS_PALADIN;
+        classNames["@priest"] = CLASS_PRIEST;
+        classNames["@rogue"] = CLASS_ROGUE;
+        classNames["@shaman"] = CLASS_SHAMAN;
+        classNames["@warlock"] = CLASS_WARLOCK;
+        classNames["@warrior"] = CLASS_WARRIOR;
+    }
+
+    virtual string Filter(string message)
+    {
+        Player* bot = ai->GetBot();
+
+        bool found = false;
+        for (map<string, uint8>::iterator i = classNames.begin(); i != classNames.end(); i++)
+        {
+            bool isClass = message.find(i->first) == 0;
+            if (isClass && bot->getClass() != i->second)
+                return "";
+
+            if (found |= isClass)
+                break;
+        }
+
+        if (found)
+            return ChatFilter::Filter(message);
+
+        return message;
+    }
+
+private:
+    map<string, uint8> classNames;
+};
+
+
+
+CompositeChatFilter::CompositeChatFilter(PlayerbotAI* ai) : ChatFilter(ai)
+{
+    filters.push_back(new StrategyChatFilter(ai));
+    filters.push_back(new ClassChatFilter(ai));
+    filters.push_back(new RtiChatFilter(ai));
+    filters.push_back(new CombatTypeChatFilter(ai));
+    filters.push_back(new LevelChatFilter(ai));
+}
+
+CompositeChatFilter::~CompositeChatFilter()
+{
+    for (list<ChatFilter*>::iterator i = filters.begin(); i != filters.end(); i++)
+        delete (*i);
+}
+
+string CompositeChatFilter::Filter(string message)
+{
+    for (int j = 0; j < filters.size(); ++j)
+    {
+        for (list<ChatFilter*>::iterator i = filters.begin(); i != filters.end(); i++)
+        {
+            message = (*i)->Filter(message);
+            if (message.empty())
+                break;
+        }
+    }
+
+    return message;
+}
+
diff --git a/src/game/playerbot/ChatFilter.h b/src/game/playerbot/ChatFilter.h
new file mode 100644
index 00000000000..16dde4dfee3
--- /dev/null
+++ b/src/game/playerbot/ChatFilter.h
@@ -0,0 +1,24 @@
+#pragma once
+
+using namespace std;
+
+namespace ai
+{
+    class ChatFilter : public PlayerbotAIAware
+    {
+    public:
+        ChatFilter(PlayerbotAI* ai) : PlayerbotAIAware(ai) {}
+        virtual string Filter(string message);
+    };
+
+    class CompositeChatFilter : public ChatFilter
+    {
+    public:
+        CompositeChatFilter(PlayerbotAI* ai);
+        virtual ~CompositeChatFilter();
+        string Filter(string message);
+
+    private:
+        list<ChatFilter*> filters;
+    };
+};
diff --git a/src/game/playerbot/ChatHelper.cpp b/src/game/playerbot/ChatHelper.cpp
new file mode 100644
index 00000000000..f5d5f602630
--- /dev/null
+++ b/src/game/playerbot/ChatHelper.cpp
@@ -0,0 +1,434 @@
+#include "../pchdef.h"
+#include "playerbot.h"
+#include "ChatHelper.h"
+
+using namespace ai;
+using namespace std;
+
+map<string, uint32> ChatHelper::consumableSubClasses;
+map<string, uint32> ChatHelper::tradeSubClasses;
+map<string, uint32> ChatHelper::itemQualities;
+map<string, uint32> ChatHelper::slots;
+map<string, ChatMsg> ChatHelper::chats;
+map<uint8, string> ChatHelper::classes;
+map<uint8, string> ChatHelper::races;
+map<uint8, map<uint8, string> > ChatHelper::specs;
+
+template<class T>
+static bool substrContainsInMap(string searchTerm, map<string, T> searchIn)
+{
+    for (typename map<string, T>::iterator i = searchIn.begin(); i != searchIn.end(); ++i)
+    {
+		string term = i->first;
+		if (term.size() > 1 && searchTerm.find(term) != string::npos)
+            return true;
+    }
+
+    return false;
+}
+
+ChatHelper::ChatHelper(PlayerbotAI* ai) : PlayerbotAIAware(ai)
+{
+    itemQualities["poor"] = ITEM_QUALITY_POOR;
+    itemQualities["gray"] = ITEM_QUALITY_POOR;
+    itemQualities["normal"] = ITEM_QUALITY_NORMAL;
+    itemQualities["white"] = ITEM_QUALITY_NORMAL;
+    itemQualities["uncommon"] = ITEM_QUALITY_UNCOMMON;
+    itemQualities["green"] = ITEM_QUALITY_UNCOMMON;
+    itemQualities["rare"] = ITEM_QUALITY_RARE;
+    itemQualities["blue"] = ITEM_QUALITY_RARE;
+    itemQualities["epic"] = ITEM_QUALITY_EPIC;
+    itemQualities["violet"] = ITEM_QUALITY_EPIC;
+
+    consumableSubClasses["potion"] = ITEM_SUBCLASS_POTION;
+    consumableSubClasses["elixir"] = ITEM_SUBCLASS_ELIXIR;
+    consumableSubClasses["flask"] = ITEM_SUBCLASS_FLASK;
+    consumableSubClasses["scroll"] = ITEM_SUBCLASS_SCROLL;
+    consumableSubClasses["food"] = ITEM_SUBCLASS_FOOD;
+    consumableSubClasses["bandage"] = ITEM_SUBCLASS_BANDAGE;
+    consumableSubClasses["enchant"] = ITEM_SUBCLASS_CONSUMABLE_OTHER;
+
+    tradeSubClasses["cloth"] = ITEM_SUBCLASS_CLOTH;
+    tradeSubClasses["leather"] = ITEM_SUBCLASS_LEATHER;
+    tradeSubClasses["metal"] = ITEM_SUBCLASS_METAL_STONE;
+    tradeSubClasses["stone"] = ITEM_SUBCLASS_METAL_STONE;
+    tradeSubClasses["ore"] = ITEM_SUBCLASS_METAL_STONE;
+    tradeSubClasses["meat"] = ITEM_SUBCLASS_MEAT;
+    tradeSubClasses["herb"] = ITEM_SUBCLASS_HERB;
+    tradeSubClasses["elemental"] = ITEM_SUBCLASS_ELEMENTAL;
+    tradeSubClasses["disenchants"] = ITEM_SUBCLASS_ENCHANTING;
+    tradeSubClasses["enchanting"] = ITEM_SUBCLASS_ENCHANTING;
+    tradeSubClasses["gems"] = ITEM_SUBCLASS_JEWELCRAFTING;
+    tradeSubClasses["jewels"] = ITEM_SUBCLASS_JEWELCRAFTING;
+    tradeSubClasses["jewelcrafting"] = ITEM_SUBCLASS_JEWELCRAFTING;
+
+    slots["head"] = EQUIPMENT_SLOT_HEAD;
+    slots["neck"] = EQUIPMENT_SLOT_NECK;
+    slots["shoulder"] = EQUIPMENT_SLOT_SHOULDERS;
+    slots["shirt"] = EQUIPMENT_SLOT_BODY;
+    slots["chest"] = EQUIPMENT_SLOT_CHEST;
+    slots["waist"] = EQUIPMENT_SLOT_WAIST;
+    slots["legs"] = EQUIPMENT_SLOT_LEGS;
+    slots["feet"] = EQUIPMENT_SLOT_FEET;
+    slots["wrist"] = EQUIPMENT_SLOT_WRISTS;
+    slots["hands"] = EQUIPMENT_SLOT_HANDS;
+    slots["finger 1"] = EQUIPMENT_SLOT_FINGER1;
+    slots["finger 2"] = EQUIPMENT_SLOT_FINGER2;
+    slots["trinket 1"] = EQUIPMENT_SLOT_TRINKET1;
+    slots["trinket 2"] = EQUIPMENT_SLOT_TRINKET2;
+    slots["back"] = EQUIPMENT_SLOT_BACK;
+    slots["main hand"] = EQUIPMENT_SLOT_MAINHAND;
+    slots["off hand"] = EQUIPMENT_SLOT_OFFHAND;
+    slots["ranged"] = EQUIPMENT_SLOT_RANGED;
+    slots["tabard"] = EQUIPMENT_SLOT_TABARD;
+
+    chats["party"] = CHAT_MSG_PARTY;
+    chats["p"] = CHAT_MSG_PARTY;
+    chats["guild"] = CHAT_MSG_GUILD;
+    chats["g"] = CHAT_MSG_GUILD;
+    chats["raid"] = CHAT_MSG_RAID;
+    chats["r"] = CHAT_MSG_RAID;
+    chats["whisper"] = CHAT_MSG_WHISPER;
+    chats["w"] = CHAT_MSG_WHISPER;
+
+    classes[CLASS_DRUID] = "druid";
+    specs[CLASS_DRUID][0] = "balance";
+    specs[CLASS_DRUID][1] = "feral combat";
+    specs[CLASS_DRUID][2] = "restoration";
+
+    classes[CLASS_HUNTER] = "hunter";
+    specs[CLASS_HUNTER][0] = "beast mastery";
+    specs[CLASS_HUNTER][1] = "marksmanship";
+    specs[CLASS_HUNTER][2] = "survival";
+
+    classes[CLASS_MAGE] = "mage";
+    specs[CLASS_MAGE][0] = "arcane";
+    specs[CLASS_MAGE][1] = "fire";
+    specs[CLASS_MAGE][2] = "frost";
+
+    classes[CLASS_PALADIN] = "paladin";
+    specs[CLASS_PALADIN][0] = "holy";
+    specs[CLASS_PALADIN][1] = "protection";
+    specs[CLASS_PALADIN][2] = "retribution";
+
+    classes[CLASS_PRIEST] = "priest";
+    specs[CLASS_PRIEST][0] = "discipline";
+    specs[CLASS_PRIEST][1] = "holy";
+    specs[CLASS_PRIEST][2] = "shadow";
+
+    classes[CLASS_ROGUE] = "rogue";
+    specs[CLASS_ROGUE][0] = "assasination";
+    specs[CLASS_ROGUE][1] = "combat";
+    specs[CLASS_ROGUE][2] = "subtlety";
+
+    classes[CLASS_SHAMAN] = "shaman";
+    specs[CLASS_SHAMAN][0] = "elemental";
+    specs[CLASS_SHAMAN][1] = "enhancement";
+    specs[CLASS_SHAMAN][2] = "restoration";
+
+    classes[CLASS_WARLOCK] = "warlock";
+    specs[CLASS_WARLOCK][0] = "affliction";
+    specs[CLASS_WARLOCK][1] = "demonology";
+    specs[CLASS_WARLOCK][2] = "destruction";
+
+    classes[CLASS_WARRIOR] = "warrior";
+    specs[CLASS_WARRIOR][0] = "arms";
+    specs[CLASS_WARRIOR][1] = "fury";
+    specs[CLASS_WARRIOR][2] = "protection";
+
+    races[RACE_BLOODELF] = "Blood Elf";
+    races[RACE_DRAENEI] = "Draenei";
+    races[RACE_DWARF] = "Dwarf";
+    races[RACE_GNOME] = "Gnome";
+    races[RACE_HUMAN] = "Human";
+    races[RACE_NIGHTELF] = "Night Elf";
+    races[RACE_ORC] = "Orc";
+    races[RACE_TAUREN] = "Tauren";
+    races[RACE_TROLL] = "Troll";
+    races[RACE_UNDEAD] = "Undead";
+}
+
+string ChatHelper::formatMoney(uint32 copper)
+{
+    ostringstream out;
+	if (!copper)
+	{
+		out << "0|TInterface\\AddOns\\AtlasLoot\\Images\\bronze:0|t";
+		return out.str();
+	}
+
+    uint32 gold = uint32(copper / 10000);
+    copper -= (gold * 10000);
+    uint32 silver = uint32(copper / 100);
+    copper -= (silver * 100);
+    out << " ";
+    if (gold > 0)
+        out << gold <<  "|TInterface\\AddOns\\AtlasLoot\\Images\\gold:0|t ";
+    if (silver > 0 && gold < 50)
+        out << silver <<  "|TInterface\\AddOns\\AtlasLoot\\Images\\silver:0|t ";
+	if (copper > 0 && gold < 10)
+		out << copper <<  "|TInterface\\AddOns\\AtlasLoot\\Images\\bronze:0|t";
+
+    return out.str();
+}
+
+uint32 ChatHelper::parseMoney(string& text)
+{
+    // if user specified money in ##g##s##c format
+    string acum = "";
+    uint32 copper = 0;
+    for (uint8 i = 0; i < text.length(); i++)
+    {
+        if (text[i] == 'g')
+        {
+            copper += (atol(acum.c_str()) * 100 * 100);
+            acum = "";
+        }
+        else if (text[i] == 'c')
+        {
+            copper += atol(acum.c_str());
+            acum = "";
+        }
+        else if (text[i] == 's')
+        {
+            copper += (atol(acum.c_str()) * 100);
+            acum = "";
+        }
+        else if (text[i] == ' ')
+            break;
+        else if (text[i] >= 48 && text[i] <= 57)
+            acum += text[i];
+        else
+        {
+            copper = 0;
+            break;
+        }
+    }
+    return copper;
+}
+
+ItemIds ChatHelper::parseItems(string& text)
+{
+    ItemIds itemIds;
+
+    uint8 pos = 0;
+    while (true)
+    {
+        int i = text.find("Hitem:", pos);
+        if (i == -1)
+            break;
+        pos = i + 6;
+        int endPos = text.find(':', pos);
+        if (endPos == -1)
+            break;
+        string idC = text.substr(pos, endPos - pos);
+        uint32 id = atol(idC.c_str());
+        pos = endPos;
+        if (id)
+            itemIds.insert(id);
+    }
+
+    return itemIds;
+}
+
+string ChatHelper::formatQuest(Quest const* quest)
+{
+    ostringstream out;
+    out << "|cFFFFFF00|Hquest:" << quest->GetQuestId() << ':' << quest->GetQuestLevel() << "|h[" << quest->GetTitle() << "]|h|r";
+    return out.str();
+}
+
+string ChatHelper::formatGameobject(GameObject* go)
+{
+    ostringstream out;
+    out << "|cFFFFFF00|Hfound:" << go->GetObjectGuid().GetRawValue() << ":" << go->GetEntry() << ":" <<  "|h[" << go->GetGOInfo()->name << "]|h|r";
+    return out.str();
+}
+
+string ChatHelper::formatSpell(SpellEntry const *sInfo)
+{
+    ostringstream out;
+    out << "|cffffffff|Hspell:" << sInfo->Id << "|h[" << sInfo->SpellName[LOCALE_enUS] << "]|h|r";
+    return out.str();
+}
+
+string ChatHelper::formatItem(ItemPrototype const * proto, int count)
+{
+    char color[32];
+    sprintf(color, "%x", ItemQualityColors[proto->Quality]);
+
+    ostringstream out;
+    out << "|c" << color << "|Hitem:" << proto->ItemId
+        << ":0:0:0:0:0:0:0" << "|h[" << proto->Name1
+        << "]|h|r";
+
+    if (count > 1)
+        out << "x" << count;
+
+    return out.str();
+}
+
+ChatMsg ChatHelper::parseChat(string& text)
+{
+    if (chats.find(text) != chats.end())
+        return chats[text];
+
+    return CHAT_MSG_SYSTEM;
+}
+
+string ChatHelper::formatChat(ChatMsg chat)
+{
+    switch (chat)
+    {
+    case CHAT_MSG_GUILD:
+        return "guild";
+    case CHAT_MSG_PARTY:
+        return "party";
+    case CHAT_MSG_WHISPER:
+        return "whisper";
+    case CHAT_MSG_RAID:
+        return "raid";
+    }
+
+    return "unknown";
+}
+
+
+uint32 ChatHelper::parseSpell(string& text)
+{
+    PlayerbotChatHandler handler(ai->GetBot());
+    return handler.extractSpellId(text);
+}
+
+list<ObjectGuid> ChatHelper::parseGameobjects(string& text)
+{
+    list<ObjectGuid> gos;
+    //    Link format
+    //    |cFFFFFF00|Hfound:" << guid << ':'  << entry << ':'  <<  "|h[" << gInfo->name << "]|h|r";
+    //    |cFFFFFF00|Hfound:9582:1731|h[Copper Vein]|h|r
+
+    uint8 pos = 0;
+    while (true)
+    {
+        // extract GO guid
+        int i = text.find("Hfound:", pos);     // base H = 11
+        if (i == -1)     // break if error
+            break;
+
+        pos = i + 7;     //start of window in text 11 + 7 = 18
+        int endPos = text.find(':', pos);     // end of window in text 22
+        if (endPos == -1)     //break if error
+            break;
+        istringstream stream(text.substr(pos, endPos - pos));
+        uint64 guid; stream >> guid;
+
+        // extract GO entry
+        pos = endPos + 1;
+        endPos = text.find(':', pos);     // end of window in text
+        if (endPos == -1)     //break if error
+            break;
+
+        std::string entryC = text.substr(pos, endPos - pos);     // get string within window i.e entry
+        uint32 entry = atol(entryC.c_str());     // convert ascii to float
+
+        ObjectGuid lootCurrent = ObjectGuid(guid);
+
+        if (guid)
+            gos.push_back(lootCurrent);
+    }
+
+    return gos;
+}
+
+string ChatHelper::formatQuestObjective(string name, int available, int required)
+{
+    ostringstream out;
+    out << "|cFFFFFFFF" << name << (available >= required ? "|c0000FF00: " : "|c00FF0000: ")
+        << available << "/" << required << "|r";
+
+    return out.str();
+}
+
+
+uint32 ChatHelper::parseItemQuality(string text)
+{
+    if (itemQualities.find(text) == itemQualities.end())
+        return MAX_ITEM_QUALITY;
+
+    return itemQualities[text];
+}
+
+bool ChatHelper::parseItemClass(string text, uint32 *itemClass, uint32 *itemSubClass)
+{
+    if (text == "questitem")
+    {
+        *itemClass = ITEM_CLASS_QUEST;
+        *itemSubClass = ITEM_SUBCLASS_QUEST;
+        return true;
+    }
+
+    if (consumableSubClasses.find(text) != consumableSubClasses.end())
+    {
+        *itemClass = ITEM_CLASS_CONSUMABLE;
+        *itemSubClass = consumableSubClasses[text];
+        return true;
+    }
+
+    if (tradeSubClasses.find(text) != tradeSubClasses.end())
+    {
+        *itemClass = ITEM_CLASS_TRADE_GOODS;
+        *itemSubClass = tradeSubClasses[text];
+        return true;
+    }
+
+    return false;
+}
+
+uint32 ChatHelper::parseSlot(string text)
+{
+    if (slots.find(text) != slots.end())
+        return slots[text];
+
+    return EQUIPMENT_SLOT_END;
+}
+
+bool ChatHelper::parseable(string text)
+{
+    return text.find("|H") != string::npos ||
+            text == "questitem" ||
+            substrContainsInMap<uint32>(text, consumableSubClasses) ||
+            substrContainsInMap<uint32>(text, tradeSubClasses) ||
+            substrContainsInMap<uint32>(text, itemQualities) ||
+            substrContainsInMap<uint32>(text, slots) ||
+            substrContainsInMap<ChatMsg>(text, chats) ||
+            parseMoney(text) > 0;
+}
+
+string ChatHelper::formatClass(Player* player, int spec)
+{
+    uint8 cls = player->getClass();
+
+    ostringstream out;
+    out << specs[cls][spec] << " (";
+
+    int c0 = (int)player->GetTalentsCount(0);
+    int c1 = (int)player->GetTalentsCount(1);
+    int c2 = (int)player->GetTalentsCount(2);
+
+    out << (c0 ? "|h|cff00ff00" : "") << c0 << "|h|cffffffff/";
+    out << (c1 ? "|h|cff00ff00" : "") << c1 << "|h|cffffffff/";
+    out << (c2 ? "|h|cff00ff00" : "") << c2 << "|h|cffffffff";
+
+    out <<  ") " << classes[cls];
+    return out.str();
+}
+
+string ChatHelper::formatClass(uint8 cls)
+{
+    return classes[cls];
+}
+
+string ChatHelper::formatRace(uint8 race)
+{
+    return races[race];
+}
diff --git a/src/game/playerbot/ChatHelper.h b/src/game/playerbot/ChatHelper.h
new file mode 100644
index 00000000000..d1a4d5d020f
--- /dev/null
+++ b/src/game/playerbot/ChatHelper.h
@@ -0,0 +1,50 @@
+#pragma once
+
+using namespace std;
+
+typedef set<uint32> ItemIds;
+typedef set<uint32> SpellIds;
+
+namespace ai
+{
+    class ChatHelper : public PlayerbotAIAware
+    {
+    public:
+        ChatHelper(PlayerbotAI* ai);
+
+    public:
+        static string formatMoney(uint32 copper);
+        static uint32 parseMoney(string& text);
+        static ItemIds parseItems(string& text);
+        uint32 parseSpell(string& text);
+        static string formatQuest(Quest const* quest);
+        static string formatItem(ItemPrototype const * proto, int count = 0);
+        static string formatSpell(SpellEntry const *sInfo);
+        static string formatGameobject(GameObject* go);
+        static string formatQuestObjective(string name, int available, int required);
+        static list<ObjectGuid> parseGameobjects(string& text);
+
+        static ChatMsg parseChat(string& text);
+        static string formatChat(ChatMsg chat);
+
+        static string formatClass(Player* player, int spec);
+        static string formatClass(uint8 cls);
+        static string formatRace(uint8 race);
+
+        static uint32 parseItemQuality(string text);
+        static bool parseItemClass(string text, uint32 *itemClass, uint32 *itemSubClass);
+        static uint32 parseSlot(string text);
+
+        static bool parseable(string text);
+
+    private:
+        static map<string, uint32> consumableSubClasses;
+        static map<string, uint32> tradeSubClasses;
+        static map<string, uint32> itemQualities;
+        static map<string, uint32> slots;
+        static map<string, ChatMsg> chats;
+        static map<uint8, string> classes;
+        static map<uint8, string> races;
+        static map<uint8, map<uint8, string> > specs;
+    };
+};
diff --git a/src/game/playerbot/FleeManager.cpp b/src/game/playerbot/FleeManager.cpp
new file mode 100644
index 00000000000..efe15883a39
--- /dev/null
+++ b/src/game/playerbot/FleeManager.cpp
@@ -0,0 +1,159 @@
+#include "../pchdef.h"
+#include "playerbot.h"
+#include "FleeManager.h"
+#include "PlayerbotAIConfig.h"
+
+using namespace ai;
+using namespace std;
+
+void FleeManager::calculateDistanceToPlayers(FleePoint *point)
+{
+	Group* group = bot->GetGroup();
+	if (!group)
+		return;
+
+	for (GroupReference *gref = group->GetFirstMember(); gref; gref = gref->next())
+    {
+		Player* player = gref->getSource();
+		if(player == bot)
+			continue;
+
+		float d = player->GetDistance(point->x, point->y, point->z);
+		point->toAllPlayers.probe(d);
+		switch (player->getClass()) {
+			case CLASS_HUNTER:
+			case CLASS_MAGE:
+			case CLASS_PRIEST:
+			case CLASS_WARLOCK:
+				point->toRangedPlayers.probe(d);
+				break;
+			case CLASS_PALADIN:
+			case CLASS_ROGUE:
+			case CLASS_WARRIOR:
+				point->toMeleePlayers.probe(d);
+				break;
+		}
+	}
+}
+
+void FleeManager::calculateDistanceToCreatures(FleePoint *point)
+{
+	RangePair &distance = point->toCreatures;
+
+	list<ObjectGuid> units = *bot->GetPlayerbotAI()->GetAiObjectContext()->GetValue<list<ObjectGuid> >("possible targets");
+	for (list<ObjectGuid>::iterator i = units.begin(); i != units.end(); ++i)
+    {
+		Unit* unit = bot->GetPlayerbotAI()->GetUnit(*i);
+		if (!unit)
+		    continue;
+
+		float d = unit->GetDistance(point->x, point->y, point->z);
+		if (d <= sPlayerbotAIConfig.tooCloseDistance)
+		    continue;
+
+		distance.probe(d);
+	}
+}
+
+void FleeManager::calculatePossibleDestinations(list<FleePoint*> &points)
+{
+	float botPosX = bot->GetPositionX();
+	float botPosY = bot->GetPositionY();
+	float botPosZ = bot->GetPositionZ();
+
+	for (float distance = maxAllowedDistance; distance > sPlayerbotAIConfig.tooCloseDistance + 5.0f; distance -= 5.0f)
+	{
+        for (float angle = -M_PI + followAngle; angle < M_PI + followAngle; angle += M_PI / 16)
+        {
+            float x = botPosX + cos(angle) * distance;
+            float y = botPosY + sin(angle) * distance;
+
+            if (!bot->IsWithinLOS(x, y, botPosZ))
+                continue;
+
+            FleePoint *point = new FleePoint(x, y, botPosZ);
+            calculateDistanceToPlayers(point);
+            calculateDistanceToCreatures(point);
+            points.push_back(point);
+        }
+	}
+}
+
+void FleeManager::cleanup(list<FleePoint*> &points)
+{
+	for (list<FleePoint*>::iterator i = points.begin(); i != points.end(); i++)
+    {
+		FleePoint* point = *i;
+		delete point;
+	}
+	points.clear();
+}
+
+bool FleePoint::isReasonable()
+{
+	return toAllPlayers.max <= sPlayerbotAIConfig.sightDistance && toCreatures.min >= sPlayerbotAIConfig.spellDistance;
+}
+
+bool FleePoint::isBetterByCreatures(FleePoint* other)
+{
+    return toCreatures.min > 0 && other->toCreatures.min > 0 &&
+            (toCreatures.min - other->toCreatures.min) >= 1.0f;
+}
+
+bool FleePoint::isBetterByAll(FleePoint* other)
+{
+    bool isFartherFromCreatures = isBetterByCreatures(other);
+    bool isNearerToRangedPlayers = toRangedPlayers.max > 0 && other->toRangedPlayers.max > 0 &&
+            (toRangedPlayers.max - other->toRangedPlayers.max) <= 1.0f;
+    bool isFartherFromMeleePlayers = toMeleePlayers.min > 0 && other->toMeleePlayers.min > 0 &&
+            (toMeleePlayers.min - other->toMeleePlayers.min) >= 1.0f;
+
+    return isFartherFromCreatures && (isNearerToRangedPlayers || isFartherFromMeleePlayers);
+}
+
+FleePoint* FleeManager::selectOptimalDestination(list<FleePoint*> &points)
+{
+	FleePoint* byCreatures = NULL;
+	for (list<FleePoint*>::iterator i = points.begin(); i != points.end(); i++)
+    {
+		FleePoint* point = *i;
+		if (point->isReasonable() && (!byCreatures || point->isBetterByCreatures(byCreatures)))
+			byCreatures = point;
+	}
+
+	FleePoint* byAll = NULL;
+	for (list<FleePoint*>::iterator i = points.begin(); i != points.end(); i++)
+    {
+		FleePoint* point = *i;
+		if (point->isReasonable() && (!byAll || point->isBetterByAll(byAll)))
+		    byAll = point;
+	}
+
+	if (byAll && byCreatures)
+	{
+	    if (byAll->isBetterByCreatures(byCreatures))
+	        return byAll;
+	}
+
+	return byCreatures;
+}
+
+bool FleeManager::CalculateDestination(float* rx, float* ry, float* rz)
+{
+	list<FleePoint*> points;
+	calculatePossibleDestinations(points);
+
+    FleePoint* point = selectOptimalDestination(points);
+    if (!point)
+    {
+        cleanup(points);
+        return false;
+    }
+
+	*rx = point->x;
+	*ry = point->y;
+	*rz = bot->GetPositionZ();
+
+    cleanup(points);
+	return true;
+}
diff --git a/src/game/playerbot/FleeManager.h b/src/game/playerbot/FleeManager.h
new file mode 100644
index 00000000000..3084cdd94d2
--- /dev/null
+++ b/src/game/playerbot/FleeManager.h
@@ -0,0 +1,83 @@
+#pragma once
+
+using namespace std;
+
+class Player;
+
+namespace ai
+{
+    class Engine;
+
+	class RangePair {
+	public:
+		RangePair() {
+			min = -1.0f;
+			max = -1.0f;
+		}
+
+	public:
+		float min;
+		float max;
+
+	public:
+		void probe(float d) {
+			if (min < 0 || min > d)
+				min = d;
+
+			if (max < 0 || max < d)
+				max = d;
+		}
+	};
+
+	class FleePoint {
+	public:
+		FleePoint(float x, float y, float z) {
+			this->x = x;
+			this->y = y;
+			this->z = z;
+		}
+
+    public:
+        bool isReasonable();
+        bool isBetterByCreatures(FleePoint* other);
+        bool isBetterByAll(FleePoint* other);
+
+	public:
+		float x;
+		float y;
+		float z;
+
+		RangePair toCreatures;
+		RangePair toAllPlayers;
+		RangePair toMeleePlayers;
+		RangePair toRangedPlayers;
+	};
+
+	class FleeManager
+	{
+	public:
+		FleeManager(Player* bot, float maxAllowedDistance, float followAngle) {
+			this->bot = bot;
+			this->maxAllowedDistance = maxAllowedDistance;
+			this->followAngle = followAngle;
+		}
+
+	public:
+		bool CalculateDestination(float* rx, float* ry, float* rz);
+
+	private:
+		void calculatePossibleDestinations(list<FleePoint*> &points);
+		void calculateDistanceToPlayers(FleePoint *point);
+		void calculateDistanceToCreatures(FleePoint *point);
+		void cleanup(list<FleePoint*> &points);
+		FleePoint* selectOptimalDestination(list<FleePoint*> &points);
+		bool isReasonable(FleePoint* point);
+		bool isBetterThan(FleePoint* point, FleePoint* other);
+
+	private:
+		Player* bot;
+		float maxAllowedDistance;
+		float followAngle;
+	};
+
+};
diff --git a/src/game/playerbot/Helpers.cpp b/src/game/playerbot/Helpers.cpp
new file mode 100644
index 00000000000..2023f64d5da
--- /dev/null
+++ b/src/game/playerbot/Helpers.cpp
@@ -0,0 +1,90 @@
+#include "../pchdef.h"
+#include "playerbot.h"
+#include <algorithm>
+#include <functional>
+#include <cctype>
+#include <locale>
+
+vector<string>& split(const string &s, char delim, vector<string> &elems)
+{
+    stringstream ss(s);
+    string item;
+    while(getline(ss, item, delim))
+    {
+        elems.push_back(item);
+    }
+    return elems;
+}
+
+
+vector<string> split(const string &s, char delim)
+{
+    vector<string> elems;
+    return split(s, delim, elems);
+}
+
+char *strstri(const char *haystack, const char *needle)
+{
+    if ( !*needle )
+    {
+        return (char*)haystack;
+    }
+    for ( ; *haystack; ++haystack )
+    {
+        if ( tolower(*haystack) == tolower(*needle) )
+        {
+            const char *h = haystack, *n = needle;
+            for ( ; *h && *n; ++h, ++n )
+            {
+                if ( tolower(*h) != tolower(*n) )
+                {
+                    break;
+                }
+            }
+            if ( !*n )
+            {
+                return (char*)haystack;
+            }
+        }
+    }
+    return 0;
+}
+
+
+
+uint64 extractGuid(WorldPacket& packet)
+{
+    uint8 mask;
+    packet >> mask;
+    uint64 guid = 0;
+    uint8 bit = 0;
+    uint8 testMask = 1;
+    while (true)
+    {
+        if (mask & testMask)
+        {
+            uint8 word;
+            packet >> word;
+            guid += (word << bit);
+        }
+        if (bit == 7)
+            break;
+        ++bit;
+        testMask <<= 1;
+    }
+    return guid;
+}
+
+std::string &ltrim(std::string &s) {
+        s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
+        return s;
+}
+
+std::string &rtrim(std::string &s) {
+        s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
+        return s;
+}
+
+std::string &trim(std::string &s) {
+        return ltrim(rtrim(s));
+}
diff --git a/src/game/playerbot/LazyCalculatedValue.h b/src/game/playerbot/LazyCalculatedValue.h
new file mode 100644
index 00000000000..f7d3d312680
--- /dev/null
+++ b/src/game/playerbot/LazyCalculatedValue.h
@@ -0,0 +1,42 @@
+#pragma once
+
+using namespace std;
+
+namespace ai 
+{
+    template <class TValue, class TOwner>
+    class LazyCalculatedValue
+    {
+    public:
+        typedef TValue (TOwner::*Calculator)();
+
+    public:
+        LazyCalculatedValue(TOwner* owner, Calculator calculator) 
+        {
+            this->calculator = calculator;
+            this->owner = owner;
+            Reset();
+        }
+
+    public:
+        TValue GetValue()
+        {
+            if (!calculated)
+            {
+                value = (owner->*calculator)();
+                calculated = true;
+            }
+            return value;
+        }
+        void Reset() 
+        {
+            calculated = false;
+        }
+
+    protected:
+        Calculator calculator;
+        TOwner* owner;
+        bool calculated;
+        TValue value;
+    };
+};
\ No newline at end of file
diff --git a/src/game/playerbot/LootObjectStack.cpp b/src/game/playerbot/LootObjectStack.cpp
new file mode 100644
index 00000000000..6e8c12eb217
--- /dev/null
+++ b/src/game/playerbot/LootObjectStack.cpp
@@ -0,0 +1,244 @@
+#include "../pchdef.h"
+#include "LootObjectStack.h"
+#include "playerbot.h"
+
+using namespace ai;
+using namespace std;
+
+#define MAX_LOOT_OBJECT_COUNT 10
+
+LootTarget::LootTarget(ObjectGuid guid) : guid(guid), asOfTime(time(0))
+{
+}
+
+LootTarget::LootTarget(LootTarget const& other)
+{
+    guid = other.guid;
+    asOfTime = other.asOfTime;
+}
+
+LootTarget& LootTarget::operator=(LootTarget const& other)
+{
+    if((void*)this == (void*)&other)
+        return *this;
+
+    guid = other.guid;
+    asOfTime = other.asOfTime;
+
+    return *this;
+}
+
+bool LootTarget::operator< (const LootTarget& other) const
+{
+    return guid < other.guid;
+}
+
+void LootTargetList::shrink(time_t fromTime)
+{
+    for (set<LootTarget>::iterator i = begin(); i != end(); )
+    {
+        if (i->asOfTime <= fromTime)
+            erase(i++);
+		else
+			++i;
+    }
+}
+
+LootObject::LootObject(Player* bot, ObjectGuid guid)
+	: guid(), skillId(SKILL_NONE), reqSkillValue(0), reqItem(NULL)
+{
+    Refresh(bot, guid);
+}
+
+void LootObject::Refresh(Player* bot, ObjectGuid guid)
+{
+    skillId = SKILL_NONE;
+    reqSkillValue = 0;
+    reqItem = NULL;
+    this->guid = ObjectGuid();
+
+    PlayerbotAI* ai = bot->GetPlayerbotAI();
+    Creature *creature = ai->GetCreature(guid);
+    if (creature && creature->getDeathState() == CORPSE)
+    {
+        if (creature->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE))
+            this->guid = guid;
+
+        if (creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE))
+        {
+            skillId = creature->GetCreatureInfo()->GetRequiredLootSkill();
+            uint32 targetLevel = creature->getLevel();
+            reqSkillValue = targetLevel < 10 ? 0 : targetLevel < 20 ? (targetLevel - 10) * 10 : targetLevel * 5;
+            if (bot->HasSkill(skillId) && bot->GetSkillValue(skillId) >= reqSkillValue)
+                this->guid = guid;
+        }
+
+        return;
+    }
+
+    GameObject* go = ai->GetGameObject(guid);
+    if (go && go->isSpawned())
+    {
+        uint32 lockId = go->GetGOInfo()->GetLockId();
+        LockEntry const *lockInfo = sLockStore.LookupEntry(lockId);
+        if (!lockInfo)
+            return;
+
+        for(uint32 i = 0; i < 6; ++i)
+        {
+            if (go->GetGOInfo()->questItems[i])
+            {
+                this->guid = guid;
+                return;
+            }
+        }
+
+        for (int i = 0; i < 8; ++i)
+        {
+            switch (lockInfo->Type[i])
+            {
+            case LOCK_KEY_ITEM:
+                if (lockInfo->Index[i] > 0)
+                {
+                    reqItem = lockInfo->Index[i];
+                    this->guid = guid;
+                }
+                break;
+            case LOCK_KEY_SKILL:
+                if (SkillByLockType(LockType(lockInfo->Index[i])) > 0)
+                {
+                    skillId = SkillByLockType(LockType(lockInfo->Index[i]));
+                    reqSkillValue = lockInfo->Skill[i];
+                    this->guid = guid;
+                }
+                break;
+            default:
+                break;
+            }
+        }
+    }
+}
+
+WorldObject* LootObject::GetWorldObject(Player* bot)
+{
+    Refresh(bot, guid);
+
+    PlayerbotAI* ai = bot->GetPlayerbotAI();
+
+    Creature *creature = ai->GetCreature(guid);
+    if (creature && creature->getDeathState() == CORPSE)
+        return creature;
+
+    GameObject* go = ai->GetGameObject(guid);
+    if (go && go->isSpawned())
+        return go;
+
+    return NULL;
+}
+
+LootObject::LootObject(const LootObject& other)
+{
+    guid = other.guid;
+    skillId = other.skillId;
+    reqSkillValue = other.reqSkillValue;
+    reqItem = other.reqItem;
+}
+
+bool LootObject::IsLootPossible(Player* bot)
+{
+    if (IsEmpty() || !GetWorldObject(bot))
+        return false;
+
+    PlayerbotAI* ai = bot->GetPlayerbotAI();
+
+    if (reqItem && !bot->HasItemCount(reqItem, 1))
+        return false;
+
+    if (skillId == SKILL_NONE)
+        return true;
+
+    if (skillId == SKILL_FISHING)
+        return false;
+
+    if (!bot->HasSkill(skillId))
+        return false;
+
+    if (!reqSkillValue)
+        return true;
+
+    uint32 skillValue = uint32(bot->GetPureSkillValue(skillId));
+    if (reqSkillValue > skillValue)
+        return false;
+
+    if (skillId == SKILL_MINING && !bot->HasItemTotemCategory(TC_MINING_PICK))
+        return false;
+
+    if (skillId == SKILL_SKINNING && !bot->HasItemTotemCategory(TC_SKINNING_KNIFE))
+        return false;
+
+    return true;
+}
+
+bool LootObjectStack::Add(ObjectGuid guid)
+{
+    if (!availableLoot.insert(guid).second)
+        return false;
+
+    if (availableLoot.size() < MAX_LOOT_OBJECT_COUNT)
+        return true;
+
+    vector<LootObject> ordered = OrderByDistance();
+    for (size_t i = MAX_LOOT_OBJECT_COUNT; i < ordered.size(); i++)
+        Remove(ordered[i].guid);
+
+    return true;
+}
+
+void LootObjectStack::Remove(ObjectGuid guid)
+{
+    LootTargetList::iterator i = availableLoot.find(guid);
+    if (i != availableLoot.end())
+        availableLoot.erase(i);
+}
+
+void LootObjectStack::Clear()
+{
+    availableLoot.clear();
+}
+
+bool LootObjectStack::CanLoot(float maxDistance)
+{
+    vector<LootObject> ordered = OrderByDistance(maxDistance);
+    return !ordered.empty();
+}
+
+LootObject LootObjectStack::GetLoot(float maxDistance)
+{
+    vector<LootObject> ordered = OrderByDistance(maxDistance);
+    return ordered.empty() ? LootObject() : *ordered.begin();
+}
+
+vector<LootObject> LootObjectStack::OrderByDistance(float maxDistance)
+{
+    availableLoot.shrink(time(0) - 30);
+
+    map<float, LootObject> sortedMap;
+    LootTargetList safeCopy(availableLoot);
+    for (LootTargetList::iterator i = safeCopy.begin(); i != safeCopy.end(); i++)
+    {
+        ObjectGuid guid = i->guid;
+        LootObject lootObject(bot, guid);
+        if (!lootObject.IsLootPossible(bot))
+            continue;
+
+        float distance = bot->GetDistance(lootObject.GetWorldObject(bot));
+        if (!maxDistance || distance <= maxDistance)
+            sortedMap[distance] = lootObject;
+    }
+
+    vector<LootObject> result;
+    for (map<float, LootObject>::iterator i = sortedMap.begin(); i != sortedMap.end(); i++)
+        result.push_back(i->second);
+    return result;
+}
+
diff --git a/src/game/playerbot/LootObjectStack.h b/src/game/playerbot/LootObjectStack.h
new file mode 100644
index 00000000000..35b8710b279
--- /dev/null
+++ b/src/game/playerbot/LootObjectStack.h
@@ -0,0 +1,76 @@
+#pragma once
+
+using namespace std;
+
+namespace ai
+{
+    enum LootStrategy
+    {
+        LOOTSTRATEGY_QUEST = 1,
+        LOOTSTRATEGY_SKILL = 2,
+        LOOTSTRATEGY_GRAY = 3,
+        LOOTSTRATEGY_NORMAL = 4,
+        LOOTSTRATEGY_ALL = 5
+    };
+
+    class LootObject
+    {
+    public:
+        LootObject() {}
+        LootObject(Player* bot, ObjectGuid guid);
+        LootObject(const LootObject& other);
+
+    public:
+        bool IsEmpty() { return !guid; }
+        bool IsLootPossible(Player* bot);
+        void Refresh(Player* bot, ObjectGuid guid);
+        WorldObject* GetWorldObject(Player* bot);
+        ObjectGuid guid;
+
+        uint32 skillId;
+        uint32 reqSkillValue;
+        uint32 reqItem;
+    };
+
+    class LootTarget
+    {
+    public:
+        LootTarget(ObjectGuid guid);
+        LootTarget(LootTarget const& other);
+
+    public:
+        LootTarget& operator=(LootTarget const& other);
+        bool operator< (const LootTarget& other) const;
+
+    public:
+        ObjectGuid guid;
+        time_t asOfTime;
+    };
+
+    class LootTargetList : public set<LootTarget>
+    {
+    public:
+        void shrink(time_t fromTime);
+    };
+
+    class LootObjectStack
+    {
+    public:
+        LootObjectStack(Player* bot) : bot(bot) {}
+
+    public:
+        bool Add(ObjectGuid guid);
+        void Remove(ObjectGuid guid);
+        void Clear();
+        bool CanLoot(float maxDistance);
+        LootObject GetLoot(float maxDistance = 0);
+
+    private:
+        vector<LootObject> OrderByDistance(float maxDistance = 0);
+
+    private:
+        Player* bot;
+        LootTargetList availableLoot;
+    };
+
+};
diff --git a/src/game/playerbot/PlayerbotAI.cpp b/src/game/playerbot/PlayerbotAI.cpp
new file mode 100644
index 00000000000..57cabce0aa8
--- /dev/null
+++ b/src/game/playerbot/PlayerbotAI.cpp
@@ -0,0 +1,1175 @@
+#include "../pchdef.h"
+#include "PlayerbotMgr.h"
+#include "playerbot.h"
+
+#include "AiFactory.h"
+
+#include "../GridNotifiers.h"
+#include "../GridNotifiersImpl.h"
+#include "../CellImpl.h"
+#include "strategy/values/LastMovementValue.h"
+#include "strategy/actions/LogLevelAction.h"
+#include "strategy/values/LastSpellCastValue.h"
+#include "LootObjectStack.h"
+#include "PlayerbotAIConfig.h"
+#include "PlayerbotAI.h"
+#include "PlayerbotFactory.h"
+#include "PlayerbotSecurity.h"
+
+using namespace ai;
+using namespace std;
+
+vector<string>& split(const string &s, char delim, vector<string> &elems);
+vector<string> split(const string &s, char delim);
+char * strstri (string str1, string str2);
+uint64 extractGuid(WorldPacket& packet);
+std::string &trim(std::string &s);
+
+uint32 PlayerbotChatHandler::extractQuestId(string str)
+{
+    char* source = (char*)str.c_str();
+    char* cId = ExtractKeyFromLink(&source,"Hquest");
+    return cId ? atol(cId) : 0;
+}
+
+void PacketHandlingHelper::AddHandler(uint16 opcode, string handler)
+{
+    handlers[opcode] = handler;
+}
+
+void PacketHandlingHelper::Handle(ExternalEventHelper &helper)
+{
+    while (!queue.empty())
+    {
+        helper.HandlePacket(handlers, queue.top());
+        queue.pop();
+    }
+}
+
+void PacketHandlingHelper::AddPacket(const WorldPacket& packet)
+{
+	if (handlers.find(packet.GetOpcode()) != handlers.end())
+        queue.push(WorldPacket(packet));
+}
+
+
+PlayerbotAI::PlayerbotAI() : PlayerbotAIBase(), bot(NULL), aiObjectContext(NULL),
+    currentEngine(NULL), chatHelper(this), chatFilter(this), accountId(0), security(NULL), master(NULL)
+{
+    for (int i = 0 ; i < BOT_STATE_MAX; i++)
+        engines[i] = NULL;
+}
+
+PlayerbotAI::PlayerbotAI(Player* bot) :
+    PlayerbotAIBase(), chatHelper(this), chatFilter(this), security(bot), master(NULL)
+{
+	this->bot = bot;
+
+	accountId = sObjectMgr.GetPlayerAccountIdByGUID(bot->GetObjectGuid());
+
+    aiObjectContext = AiFactory::createAiObjectContext(bot, this);
+
+    engines[BOT_STATE_COMBAT] = AiFactory::createCombatEngine(bot, this, aiObjectContext);
+    engines[BOT_STATE_NON_COMBAT] = AiFactory::createNonCombatEngine(bot, this, aiObjectContext);
+    engines[BOT_STATE_DEAD] = AiFactory::createDeadEngine(bot, this, aiObjectContext);
+    currentEngine = engines[BOT_STATE_NON_COMBAT];
+
+    masterIncomingPacketHandlers.AddHandler(CMSG_GAMEOBJ_REPORT_USE, "use game object");
+    masterIncomingPacketHandlers.AddHandler(CMSG_AREATRIGGER, "area trigger");
+    masterIncomingPacketHandlers.AddHandler(CMSG_GAMEOBJ_USE, "use game object");
+    masterIncomingPacketHandlers.AddHandler(CMSG_LOOT_ROLL, "loot roll");
+    masterIncomingPacketHandlers.AddHandler(CMSG_GOSSIP_HELLO, "gossip hello");
+    masterIncomingPacketHandlers.AddHandler(CMSG_QUESTGIVER_HELLO, "gossip hello");
+    masterIncomingPacketHandlers.AddHandler(CMSG_QUESTGIVER_COMPLETE_QUEST, "complete quest");
+    masterIncomingPacketHandlers.AddHandler(CMSG_QUESTGIVER_ACCEPT_QUEST, "accept quest");
+    masterIncomingPacketHandlers.AddHandler(CMSG_ACTIVATETAXI, "activate taxi");
+    masterIncomingPacketHandlers.AddHandler(CMSG_ACTIVATETAXIEXPRESS, "activate taxi");
+    masterIncomingPacketHandlers.AddHandler(CMSG_MOVE_SPLINE_DONE, "taxi done");
+    masterIncomingPacketHandlers.AddHandler(CMSG_GROUP_UNINVITE_GUID, "uninvite");
+    masterIncomingPacketHandlers.AddHandler(CMSG_PUSHQUESTTOPARTY, "quest share");
+    masterIncomingPacketHandlers.AddHandler(CMSG_GUILD_INVITE, "guild invite");
+
+    botOutgoingPacketHandlers.AddHandler(SMSG_GROUP_INVITE, "group invite");
+    botOutgoingPacketHandlers.AddHandler(BUY_ERR_NOT_ENOUGHT_MONEY, "not enough money");
+    botOutgoingPacketHandlers.AddHandler(BUY_ERR_REPUTATION_REQUIRE, "not enough reputation");
+    botOutgoingPacketHandlers.AddHandler(SMSG_GROUP_SET_LEADER, "group set leader");
+    botOutgoingPacketHandlers.AddHandler(SMSG_FORCE_RUN_SPEED_CHANGE, "check mount state");
+    botOutgoingPacketHandlers.AddHandler(SMSG_RESURRECT_REQUEST, "resurrect request");
+    botOutgoingPacketHandlers.AddHandler(SMSG_INVENTORY_CHANGE_FAILURE, "cannot equip");
+    botOutgoingPacketHandlers.AddHandler(SMSG_TRADE_STATUS, "trade status");
+    botOutgoingPacketHandlers.AddHandler(SMSG_LOOT_RESPONSE, "loot response");
+    botOutgoingPacketHandlers.AddHandler(SMSG_QUESTUPDATE_ADD_KILL, "quest objective completed");
+    botOutgoingPacketHandlers.AddHandler(SMSG_ITEM_PUSH_RESULT, "item push result");
+    botOutgoingPacketHandlers.AddHandler(SMSG_PARTY_COMMAND_RESULT, "party command");
+    botOutgoingPacketHandlers.AddHandler(SMSG_CAST_FAILED, "cast failed");
+    botOutgoingPacketHandlers.AddHandler(SMSG_DUEL_REQUESTED, "duel requested");
+    botOutgoingPacketHandlers.AddHandler(SMSG_LFG_ROLE_CHECK_UPDATE, "lfg role check");
+    botOutgoingPacketHandlers.AddHandler(SMSG_LFG_PROPOSAL_UPDATE, "lfg proposal");
+
+    masterOutgoingPacketHandlers.AddHandler(SMSG_PARTY_COMMAND_RESULT, "party command");
+    masterOutgoingPacketHandlers.AddHandler(MSG_RAID_READY_CHECK, "ready check");
+    masterOutgoingPacketHandlers.AddHandler(MSG_RAID_READY_CHECK_FINISHED, "ready check finished");
+}
+
+PlayerbotAI::~PlayerbotAI()
+{
+    for (int i = 0 ; i < BOT_STATE_MAX; i++)
+    {
+        if (engines[i])
+            delete engines[i];
+    }
+
+    if (aiObjectContext)
+        delete aiObjectContext;
+}
+
+void PlayerbotAI::UpdateAI(uint32 elapsed)
+{
+    if (bot->IsBeingTeleported())
+        return;
+
+    if (nextAICheckDelay > sPlayerbotAIConfig.globalCoolDown &&
+            bot->IsNonMeleeSpellCasted(true, true, false) &&
+            *GetAiObjectContext()->GetValue<bool>("invalid target", "current target"))
+    {
+        Spell* spell = bot->GetCurrentSpell(CURRENT_GENERIC_SPELL);
+        if (spell && !IsPositiveSpell(spell->m_spellInfo))
+        {
+            InterruptSpell();
+            SetNextCheckDelay(sPlayerbotAIConfig.globalCoolDown);
+        }
+    }
+
+    if (nextAICheckDelay > sPlayerbotAIConfig.maxWaitForMove && bot->isInCombat() && !bot->GetCurrentSpell(CURRENT_CHANNELED_SPELL))
+    {
+        nextAICheckDelay = sPlayerbotAIConfig.maxWaitForMove;
+    }
+
+    PlayerbotAIBase::UpdateAI(elapsed);
+}
+
+void PlayerbotAI::UpdateAIInternal(uint32 elapsed)
+{
+    ExternalEventHelper helper(aiObjectContext);
+    while (!chatCommands.empty())
+    {
+        ChatCommandHolder holder = chatCommands.top();
+        string command = holder.GetCommand();
+        Player* owner = holder.GetOwner();
+        if (!helper.ParseChatCommand(command, owner) && holder.GetType() == CHAT_MSG_WHISPER)
+        {
+            ostringstream out; out << "Unknown command " << command;
+            TellMaster(out);
+            helper.ParseChatCommand("help");
+        }
+        chatCommands.pop();
+    }
+
+    botOutgoingPacketHandlers.Handle(helper);
+    masterIncomingPacketHandlers.Handle(helper);
+    masterOutgoingPacketHandlers.Handle(helper);
+
+	DoNextAction();
+}
+
+void PlayerbotAI::HandleTeleportAck()
+{
+	bot->GetMotionMaster()->Clear(true);
+	if (bot->IsBeingTeleportedNear())
+	{
+		WorldPacket p = WorldPacket(MSG_MOVE_TELEPORT_ACK, 8 + 4 + 4);
+		p.appendPackGUID(bot->GetObjectGuid().GetRawValue());
+		p << (uint32) 0; // supposed to be flags? not used currently
+		p << (uint32) time(0); // time - not currently used
+		bot->GetSession()->HandleMoveTeleportAckOpcode(p);
+	}
+	else if (bot->IsBeingTeleportedFar())
+	{
+		bot->GetSession()->HandleMoveWorldportAckOpcode();
+		SetNextCheckDelay(1000);
+	}
+}
+
+void PlayerbotAI::Reset()
+{
+    if (bot->IsTaxiFlying())
+        return;
+
+    currentEngine = engines[BOT_STATE_NON_COMBAT];
+    nextAICheckDelay = 0;
+
+    aiObjectContext->GetValue<Unit*>("old target")->Set(NULL);
+    aiObjectContext->GetValue<Unit*>("current target")->Set(NULL);
+    aiObjectContext->GetValue<LootObject>("loot target")->Set(LootObject());
+    aiObjectContext->GetValue<uint32>("lfg proposal")->Set(0);
+
+    LastSpellCast & lastSpell = aiObjectContext->GetValue<LastSpellCast& >("last spell cast")->Get();
+    lastSpell.Reset();
+
+    LastMovement & lastMovement = aiObjectContext->GetValue<LastMovement& >("last movement")->Get();
+    lastMovement.Set(NULL);
+
+    bot->GetMotionMaster()->Clear();
+    bot->m_taxi.ClearTaxiDestinations();
+    InterruptSpell();
+
+    for (int i = 0 ; i < BOT_STATE_MAX; i++)
+    {
+        engines[i]->Init();
+    }
+}
+
+void PlayerbotAI::HandleCommand(uint32 type, const string& text, Player& fromPlayer)
+{
+    if (!GetSecurity()->CheckLevelFor(PLAYERBOT_SECURITY_INVITE, type != CHAT_MSG_WHISPER, &fromPlayer))
+        return;
+
+    if (type == CHAT_MSG_ADDON)
+        return;
+
+    string filtered = chatFilter.Filter(trim((string&)text));
+    if (filtered.empty())
+        return;
+
+    if (filtered.find("who") != 0 && !GetSecurity()->CheckLevelFor(PLAYERBOT_SECURITY_ALLOW_ALL, type != CHAT_MSG_WHISPER, &fromPlayer))
+        return;
+
+    if (type == CHAT_MSG_RAID_WARNING && filtered.find(bot->GetName()) != string::npos && filtered.find("award") == string::npos)
+    {
+        ChatCommandHolder cmd("warning", &fromPlayer, type);
+        chatCommands.push(cmd);
+        return;
+    }
+
+    if (filtered.size() > 2 && filtered.substr(0, 2) == "d " || filtered.size() > 3 && filtered.substr(0, 3) == "do ")
+    {
+        std::string action = filtered.substr(filtered.find(" ") + 1);
+        DoSpecificAction(action);
+    }
+    else if (filtered == "reset")
+    {
+        Reset();
+    }
+    else
+    {
+        ChatCommandHolder cmd(filtered, &fromPlayer, type);
+        chatCommands.push(cmd);
+    }
+}
+
+void PlayerbotAI::HandleBotOutgoingPacket(const WorldPacket& packet)
+{
+    switch (packet.GetOpcode())
+    {
+    case SMSG_MOVE_SET_CAN_FLY:
+        {
+            WorldPacket p(packet);
+            uint64 guid = p.readPackGUID();
+            if (guid != bot->GetObjectGuid().GetRawValue())
+                return;
+
+            bot->m_movementInfo.SetMovementFlags((MovementFlags)(MOVEFLAG_FLYING|MOVEFLAG_CAN_FLY));
+            return;
+        }
+    case SMSG_MOVE_UNSET_CAN_FLY:
+        {
+            WorldPacket p(packet);
+            uint64 guid = p.readPackGUID();
+            if (guid != bot->GetObjectGuid().GetRawValue())
+                return;
+            bot->m_movementInfo.RemoveMovementFlag(MOVEFLAG_FLYING);
+            return;
+        }
+    case SMSG_CAST_FAILED:
+        {
+            WorldPacket p(packet);
+            p.rpos(0);
+            uint8 castCount, result;
+            uint32 spellId;
+            p >> castCount >> spellId >> result;
+            if (result != SPELL_CAST_OK)
+            {
+                SpellInterrupted(spellId);
+                botOutgoingPacketHandlers.AddPacket(packet);
+            }
+            return;
+        }
+    case SMSG_SPELL_FAILURE:
+        {
+            WorldPacket p(packet);
+            p.rpos(0);
+            ObjectGuid casterGuid;
+            p >> casterGuid.ReadAsPacked();
+            if (casterGuid != bot->GetObjectGuid().GetRawValue())
+                return;
+
+            uint8 castCount;
+            uint32 spellId;
+            p >> castCount;
+            p >> spellId;
+            SpellInterrupted(spellId);
+            return;
+        }
+    case SMSG_SPELL_DELAYED:
+        {
+            WorldPacket p(packet);
+            p.rpos(0);
+            ObjectGuid casterGuid;
+            p >> casterGuid.ReadAsPacked();
+
+            if (casterGuid != bot->GetObjectGuid())
+                return;
+
+            uint32 delaytime;
+            p >> delaytime;
+            if (delaytime <= 1000)
+                IncreaseNextCheckDelay(delaytime);
+            return;
+        }
+    default:
+        botOutgoingPacketHandlers.AddPacket(packet);
+    }
+}
+
+void PlayerbotAI::SpellInterrupted(uint32 spellid)
+{
+    LastSpellCast& lastSpell = aiObjectContext->GetValue<LastSpellCast&>("last spell cast")->Get();
+    if (lastSpell.id != spellid)
+        return;
+
+    lastSpell.Reset();
+
+    time_t now = time(0);
+    if (now <= lastSpell.time)
+        return;
+
+    uint32 castTimeSpent = 1000 * (now - lastSpell.time);
+
+    int32 globalCooldown = CalculateGlobalCooldown(lastSpell.id);
+    if (castTimeSpent < globalCooldown)
+        SetNextCheckDelay(globalCooldown - castTimeSpent);
+    else
+        SetNextCheckDelay(0);
+
+    lastSpell.id = 0;
+}
+
+int32 PlayerbotAI::CalculateGlobalCooldown(uint32 spellid)
+{
+    if (!spellid)
+        return 0;
+
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid );
+
+    if (bot->GetGlobalCooldownMgr().HasGlobalCooldown(spellInfo))
+        return sPlayerbotAIConfig.globalCoolDown;
+
+    return sPlayerbotAIConfig.reactDelay;
+}
+
+void PlayerbotAI::HandleMasterIncomingPacket(const WorldPacket& packet)
+{
+    masterIncomingPacketHandlers.AddPacket(packet);
+}
+
+void PlayerbotAI::HandleMasterOutgoingPacket(const WorldPacket& packet)
+{
+    masterOutgoingPacketHandlers.AddPacket(packet);
+}
+
+void PlayerbotAI::ChangeEngine(BotState type)
+{
+    Engine* engine = engines[type];
+
+    if (currentEngine != engine)
+    {
+        currentEngine = engine;
+        ReInitCurrentEngine();
+
+        switch (type)
+        {
+        case BOT_STATE_COMBAT:
+            sLog.outDebug("=== %s COMBAT ===", bot->GetName());
+            break;
+        case BOT_STATE_NON_COMBAT:
+            sLog.outDebug("=== %s NON-COMBAT ===", bot->GetName());
+            break;
+        case BOT_STATE_DEAD:
+            sLog.outDebug("=== %s DEAD ===", bot->GetName());
+            break;
+        }
+    }
+}
+
+void PlayerbotAI::DoNextAction()
+{
+    if (bot->IsBeingTeleported() || bot->IsBeingTeleportedDelayEvent() || (GetMaster() && GetMaster()->IsBeingTeleported()))
+        return;
+
+    currentEngine->DoNextAction(NULL);
+
+    if (!bot->GetAurasByType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED).empty())
+    {
+        bot->m_movementInfo.SetMovementFlags((MovementFlags)(MOVEFLAG_FLYING|MOVEFLAG_CAN_FLY));
+
+        WorldPacket packet(CMSG_MOVE_SET_FLY);
+        packet << bot->GetObjectGuid().WriteAsPacked();
+        packet << bot->m_movementInfo;
+        bot->SetMover(bot);
+        bot->GetSession()->HandleMovementOpcodes(packet);
+    }
+
+    Player* master = GetMaster();
+    if (bot->IsMounted() && bot->IsFlying())
+    {
+        bot->m_movementInfo.SetMovementFlags((MovementFlags)(MOVEFLAG_FLYING|MOVEFLAG_CAN_FLY));
+
+        bot->SetSpeedRate(MOVE_FLIGHT, 1.0f, true);
+        bot->SetSpeedRate(MOVE_RUN, 1.0f, true);
+
+        if (master)
+        {
+            bot->SetSpeedRate(MOVE_FLIGHT, master->GetSpeedRate(MOVE_FLIGHT), true);
+            bot->SetSpeedRate(MOVE_RUN, master->GetSpeedRate(MOVE_FLIGHT), true);
+        }
+
+    }
+
+    if (currentEngine != engines[BOT_STATE_DEAD] && !bot->isAlive())
+    {
+        ChangeEngine(BOT_STATE_DEAD);
+    }
+
+    Group *group = bot->GetGroup();
+    if (!master && group)
+    {
+        for (GroupReference *gref = group->GetFirstMember(); gref; gref = gref->next())
+        {
+            Player* member = gref->getSource();
+            PlayerbotAI* ai = bot->GetPlayerbotAI();
+            if (member && member->IsInWorld() && !member->GetPlayerbotAI() && (!master || master->GetPlayerbotAI()))
+            {
+                ai->SetMaster(member);
+                ai->ResetStrategies();
+                ai->TellMaster("Hello");
+                break;
+            }
+        }
+    }
+}
+
+void PlayerbotAI::ReInitCurrentEngine()
+{
+    InterruptSpell();
+    currentEngine->Init();
+}
+
+void PlayerbotAI::ChangeStrategy(string names, BotState type)
+{
+    Engine* e = engines[type];
+    if (!e)
+        return;
+
+    e->ChangeStrategy(names);
+}
+
+void PlayerbotAI::DoSpecificAction(string name)
+{
+    for (int i = 0 ; i < BOT_STATE_MAX; i++)
+    {
+        ostringstream out;
+        ActionResult res = engines[i]->ExecuteAction(name);
+        switch (res)
+        {
+        case ACTION_RESULT_UNKNOWN:
+            continue;
+        case ACTION_RESULT_OK:
+            out << name << ": done";
+            TellMaster(out);
+            return;
+        case ACTION_RESULT_IMPOSSIBLE:
+            out << name << ": impossible";
+            TellMaster(out);
+            return;
+        case ACTION_RESULT_USELESS:
+            out << name << ": useless";
+            TellMaster(out);
+            return;
+        case ACTION_RESULT_FAILED:
+            out << name << ": failed";
+            TellMaster(out);
+            return;
+        }
+    }
+    ostringstream out;
+    out << name << ": unknown action";
+    TellMaster(out);
+}
+
+bool PlayerbotAI::ContainsStrategy(StrategyType type)
+{
+    for (int i = 0 ; i < BOT_STATE_MAX; i++)
+    {
+        if (engines[i]->ContainsStrategy(type))
+            return true;
+    }
+    return false;
+}
+
+bool PlayerbotAI::HasStrategy(string name, BotState type)
+{
+    return engines[type]->HasStrategy(name);
+}
+
+void PlayerbotAI::ResetStrategies()
+{
+    for (int i = 0 ; i < BOT_STATE_MAX; i++)
+        engines[i]->removeAllStrategies();
+
+    AiFactory::AddDefaultCombatStrategies(bot, this, engines[BOT_STATE_COMBAT]);
+    AiFactory::AddDefaultNonCombatStrategies(bot, this, engines[BOT_STATE_NON_COMBAT]);
+    AiFactory::AddDefaultDeadStrategies(bot, this, engines[BOT_STATE_DEAD]);
+}
+
+bool PlayerbotAI::IsRanged(Player* player)
+{
+    PlayerbotAI* botAi = player->GetPlayerbotAI();
+    if (botAi)
+        return botAi->ContainsStrategy(STRATEGY_TYPE_RANGED);
+
+    switch (player->getClass())
+    {
+    case CLASS_DEATH_KNIGHT:
+    case CLASS_PALADIN:
+    case CLASS_WARRIOR:
+    case CLASS_ROGUE:
+        return false;
+    case CLASS_DRUID:
+        return !HasAnyAuraOf(player, "cat form", "bear form", "dire bear form", NULL);
+    }
+    return true;
+}
+
+bool PlayerbotAI::IsTank(Player* player)
+{
+    PlayerbotAI* botAi = player->GetPlayerbotAI();
+    if (botAi)
+        return botAi->ContainsStrategy(STRATEGY_TYPE_TANK);
+
+    switch (player->getClass())
+    {
+    case CLASS_DEATH_KNIGHT:
+    case CLASS_PALADIN:
+    case CLASS_WARRIOR:
+        return true;
+    case CLASS_DRUID:
+        return HasAnyAuraOf(player, "bear form", "dire bear form", NULL);
+    }
+    return false;
+}
+
+bool PlayerbotAI::IsHeal(Player* player)
+{
+    PlayerbotAI* botAi = player->GetPlayerbotAI();
+    if (botAi)
+        return botAi->ContainsStrategy(STRATEGY_TYPE_HEAL);
+
+    switch (player->getClass())
+    {
+    case CLASS_PRIEST:
+        return true;
+    case CLASS_DRUID:
+        return HasAnyAuraOf(player, "tree of life form", NULL);
+    }
+    return false;
+}
+
+
+
+namespace MaNGOS
+{
+
+    class UnitByGuidInRangeCheck
+    {
+    public:
+        UnitByGuidInRangeCheck(WorldObject const* obj, ObjectGuid guid, float range) : i_obj(obj), i_range(range), i_guid(guid) {}
+        WorldObject const& GetFocusObject() const { return *i_obj; }
+        bool operator()(Unit* u)
+        {
+            return u->GetObjectGuid() == i_guid && i_obj->IsWithinDistInMap(u, i_range);
+        }
+    private:
+        WorldObject const* i_obj;
+        float i_range;
+        ObjectGuid i_guid;
+    };
+
+    class GameObjectByGuidInRangeCheck
+    {
+    public:
+        GameObjectByGuidInRangeCheck(WorldObject const* obj, ObjectGuid guid, float range) : i_obj(obj), i_range(range), i_guid(guid) {}
+        WorldObject const& GetFocusObject() const { return *i_obj; }
+        bool operator()(GameObject* u)
+        {
+            if (u && i_obj->IsWithinDistInMap(u, i_range) && u->isSpawned() && u->GetGOInfo() && u->GetObjectGuid() == i_guid)
+                return true;
+
+            return false;
+        }
+    private:
+        WorldObject const* i_obj;
+        float i_range;
+        ObjectGuid i_guid;
+    };
+
+};
+
+
+Unit* PlayerbotAI::GetUnit(ObjectGuid guid)
+{
+    if (!guid)
+        return NULL;
+
+    list<Unit*> targets;
+
+    MaNGOS::UnitByGuidInRangeCheck u_check(bot, guid, sPlayerbotAIConfig.sightDistance);
+    MaNGOS::UnitListSearcher<MaNGOS::UnitByGuidInRangeCheck> searcher(targets, u_check);
+    Cell::VisitAllObjects(bot, searcher, sPlayerbotAIConfig.sightDistance);
+
+    if (targets.empty())
+        return NULL;
+
+    return *targets.begin();
+}
+
+
+Creature* PlayerbotAI::GetCreature(ObjectGuid guid)
+{
+    if (!guid)
+        return NULL;
+
+    list<Unit *> targets;
+
+    MaNGOS::UnitByGuidInRangeCheck u_check(bot, guid, sPlayerbotAIConfig.sightDistance);
+    MaNGOS::UnitListSearcher<MaNGOS::UnitByGuidInRangeCheck> searcher(targets, u_check);
+    Cell::VisitAllObjects(bot, searcher, sPlayerbotAIConfig.sightDistance);
+
+    for(list<Unit *>::iterator i = targets.begin(); i != targets.end(); i++)
+    {
+        Creature* creature = dynamic_cast<Creature*>(*i);
+        if (creature)
+            return creature;
+    }
+
+    return NULL;
+}
+
+GameObject* PlayerbotAI::GetGameObject(ObjectGuid guid)
+{
+    if (!guid)
+        return NULL;
+
+    list<GameObject*> targets;
+
+    MaNGOS::GameObjectByGuidInRangeCheck u_check(bot, guid, sPlayerbotAIConfig.sightDistance);
+    MaNGOS::GameObjectListSearcher<MaNGOS::GameObjectByGuidInRangeCheck> searcher(targets, u_check);
+    Cell::VisitAllObjects(bot, searcher, sPlayerbotAIConfig.sightDistance);
+
+    for(list<GameObject*>::iterator i = targets.begin(); i != targets.end(); i++)
+    {
+        GameObject* go = *i;
+        if (go && go->isSpawned())
+            return go;
+    }
+
+    return NULL;
+}
+
+bool PlayerbotAI::TellMasterNoFacing(string text, PlayerbotSecurityLevel securityLevel)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    if (!GetSecurity()->CheckLevelFor(securityLevel, true, master))
+        return false;
+
+    if (sPlayerbotAIConfig.whisperDistance && !bot->GetGroup() && sRandomPlayerbotMgr.IsRandomBot(bot) &&
+            master->GetSession()->GetSecurity() < SEC_GAMEMASTER &&
+            (bot->GetMapId() != master->GetMapId() || bot->GetDistance(master) > sPlayerbotAIConfig.whisperDistance))
+        return false;
+
+    bot->Whisper(text, LANG_UNIVERSAL, master->GetObjectGuid());
+    return true;
+}
+
+bool PlayerbotAI::TellMaster(string text, PlayerbotSecurityLevel securityLevel)
+{
+    if (!TellMasterNoFacing(text, securityLevel))
+        return false;
+
+    if (!bot->isMoving() && !bot->IsInCombat() && bot->GetMapId() == master->GetMapId())
+    {
+        if (!bot->isInFront(master, sPlayerbotAIConfig.sightDistance, M_PI / 2))
+            bot->SetFacingTo(bot->GetAngle(master));
+
+        bot->HandleEmoteCommand(EMOTE_ONESHOT_TALK);
+    }
+
+    return true;
+}
+
+bool IsRealAura(Player* bot, AuraPair* aura, Unit* unit)
+{
+    if (!aura)
+        return false;
+
+    if (!unit->IsHostileTo(bot))
+        return true;
+
+    uint32 stacks = aura->GetHolder()->GetStackAmount();
+    if (stacks >= aura->GetHolder()->GetSpellProto()->StackAmount)
+        return true;
+
+    if (aura->GetHolder()->GetCaster() == bot || aura->GetHolder()->IsPositive() || aura->GetHolder()->IsAreaAura())
+        return true;
+
+    return false;
+}
+
+bool IsRealAura(Player* bot, Aura* aura, Unit* unit)
+{
+    if (!aura)
+        return false;
+
+    if (!unit->IsHostileTo(bot))
+        return true;
+
+    uint32 stacks = aura->GetHolder()->GetStackAmount();
+    if (stacks >= aura->GetHolder()->GetSpellProto()->StackAmount)
+        return true;
+
+    if (aura->GetHolder()->GetCaster() == bot || aura->GetHolder()->IsPositive() || aura->GetHolder()->IsAreaAura())
+        return true;
+
+    return false;
+}
+
+bool PlayerbotAI::HasAura(string name, Unit* unit)
+{
+    if (!unit)
+        return false;
+
+    uint32 spellId = aiObjectContext->GetValue<uint32>("spell id", name)->Get();
+    if (spellId)
+        return HasAura(spellId, unit);
+
+    wstring wnamepart;
+    if (!Utf8toWStr(name, wnamepart))
+        return 0;
+
+    wstrToLower(wnamepart);
+
+    for (uint32 auraType = SPELL_AURA_BIND_SIGHT; auraType < TOTAL_AURAS; auraType++)
+    {
+        Unit::AuraList& auras = unit->GetAurasByType((AuraType)auraType);
+        for (Unit::AuraList::iterator i = auras.begin(); i != auras.end(); i++)
+        {
+            AuraPair aura = *i;
+            if (!aura)
+                continue;
+
+            const string auraName = aura->GetSpellProto()->SpellName[0];
+            if (auraName.empty() || auraName.length() != wnamepart.length() || !Utf8FitTo(auraName, wnamepart))
+                continue;
+
+            if (IsRealAura(bot, &aura, unit))
+                return true;
+        }
+    }
+
+    return false;
+}
+
+bool PlayerbotAI::HasAura(uint32 spellId, const Unit* unit)
+{
+    if (!spellId || !unit)
+        return false;
+
+    for (uint32 effect = EFFECT_INDEX_0; effect <= EFFECT_INDEX_2; effect++)
+    {
+        Aura* aura = ((Unit*)unit)->GetAura(spellId, (SpellEffectIndex)effect);
+
+        if (IsRealAura(bot, aura, (Unit*)unit))
+            return true;
+    }
+
+    return false;
+}
+
+bool PlayerbotAI::HasAnyAuraOf(Unit* player, ...)
+{
+    if (!player)
+        return false;
+
+    va_list vl;
+    va_start(vl, player);
+
+    const char* cur;
+    do {
+        cur = va_arg(vl, const char*);
+        if (cur && HasAura(cur, player)) {
+            va_end(vl);
+            return true;
+        }
+    }
+    while (cur);
+
+    va_end(vl);
+    return false;
+}
+
+bool PlayerbotAI::CanCastSpell(string name, Unit* target)
+{
+    return CanCastSpell(aiObjectContext->GetValue<uint32>("spell id", name)->Get(), target);
+}
+
+bool PlayerbotAI::CanCastSpell(uint32 spellid, Unit* target, bool checkHasSpell)
+{
+    if (!spellid)
+        return false;
+
+    if (!target)
+        target = bot;
+
+    if (checkHasSpell && !bot->HasSpell(spellid))
+        return false;
+
+    if (bot->HasSpellCooldown(spellid))
+        return false;
+
+    bool positiveSpell = IsPositiveSpell(spellid);
+    if (positiveSpell && bot->IsHostileTo(target))
+        return false;
+
+    if (!positiveSpell && bot->IsFriendlyTo(target))
+        return false;
+
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid );
+    if (!spellInfo)
+        return false;
+
+    if (target->IsImmuneToSpell(spellInfo, false))
+        return false;
+
+    ObjectGuid oldSel = bot->GetSelectionGuid();
+    bot->SetSelectionGuid(target->GetObjectGuid());
+    Spell *spell = new Spell(bot, spellInfo, false );
+
+    spell->m_targets.setUnitTarget(target);
+    spell->m_CastItem = aiObjectContext->GetValue<Item*>("item for spell", spellid)->Get();
+    spell->m_targets.setItemTarget(spell->m_CastItem);
+    SpellCastResult result = spell->CheckCast(false);
+    delete spell;
+    bot->SetSelectionGuid(oldSel);
+
+    switch (result)
+    {
+    case SPELL_FAILED_NOT_INFRONT:
+    case SPELL_FAILED_NOT_STANDING:
+    case SPELL_FAILED_UNIT_NOT_INFRONT:
+    case SPELL_FAILED_SUCCESS:
+    case SPELL_FAILED_MOVING:
+    case SPELL_FAILED_TRY_AGAIN:
+    case SPELL_FAILED_NOT_IDLE:
+    case SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW:
+    case SPELL_FAILED_SUMMON_PENDING:
+    case SPELL_FAILED_BAD_IMPLICIT_TARGETS:
+    case SPELL_FAILED_BAD_TARGETS:
+    case SPELL_CAST_OK:
+    case SPELL_FAILED_ITEM_NOT_FOUND:
+        return true;
+    default:
+        return false;
+    }
+}
+
+
+bool PlayerbotAI::CastSpell(string name, Unit* target)
+{
+    bool result = CastSpell(aiObjectContext->GetValue<uint32>("spell id", name)->Get(), target);
+    if (result)
+    {
+        aiObjectContext->GetValue<time_t>("last spell cast time", name)->Set(time(0));
+    }
+
+    return result;
+}
+
+bool PlayerbotAI::CastSpell(uint32 spellId, Unit* target)
+{
+    if (!spellId)
+        return false;
+
+    if (!target)
+        target = bot;
+
+    Pet* pet = bot->GetPet();
+    if (pet && pet->HasSpell(spellId))
+    {
+        pet->ToggleAutocast(spellId, true);
+        TellMaster("My pet will auto-cast this spell");
+        return true;
+    }
+
+    aiObjectContext->GetValue<LastSpellCast&>("last spell cast")->Get().Set(spellId, target->GetObjectGuid(), time(0));
+    aiObjectContext->GetValue<LastMovement&>("last movement")->Get().Set(NULL);
+
+    const SpellEntry* const pSpellInfo = sSpellStore.LookupEntry(spellId);
+
+    MotionMaster &mm = *bot->GetMotionMaster();
+    if (bot->isMoving() && GetSpellCastTime(pSpellInfo, NULL))
+    {
+        return false;
+    }
+
+    if (bot->IsTaxiFlying())
+        return false;
+
+    bot->clearUnitState( UNIT_STAT_CHASE );
+    bot->clearUnitState( UNIT_STAT_FOLLOW );
+
+    ObjectGuid oldSel = bot->GetSelectionGuid();
+    bot->SetSelectionGuid(target->GetObjectGuid());
+
+    Spell *spell = new Spell(bot, pSpellInfo, false);
+
+    SpellCastTargets targets;
+    WorldObject* faceTo = target;
+
+    if (pSpellInfo->Targets & TARGET_FLAG_SOURCE_LOCATION ||
+            pSpellInfo->Targets & TARGET_FLAG_DEST_LOCATION)
+    {
+        targets.setDestination(target->GetPosition());
+    }
+    else
+    {
+        targets.setUnitTarget(target);
+    }
+
+    if (pSpellInfo->Targets & TARGET_FLAG_ITEM)
+    {
+        spell->m_CastItem = aiObjectContext->GetValue<Item*>("item for spell", spellId)->Get();
+        targets.setItemTarget(spell->m_CastItem);
+    }
+
+    if (pSpellInfo->Effect[0] == SPELL_EFFECT_OPEN_LOCK ||
+        pSpellInfo->Effect[0] == SPELL_EFFECT_SKINNING)
+    {
+        LootObject loot = *aiObjectContext->GetValue<LootObject>("loot target");
+        if (!loot.IsLootPossible(bot))
+            return false;
+
+        GameObject* go = GetGameObject(loot.guid);
+        if (go && go->isSpawned())
+        {
+            WorldPacket* const packetgouse = new WorldPacket(CMSG_GAMEOBJ_REPORT_USE, 8);
+            *packetgouse << loot.guid;
+            bot->GetSession()->QueuePacket(packetgouse);
+            targets.setGOTarget(go);
+            faceTo = go;
+        }
+        else
+        {
+            Unit* creature = GetUnit(loot.guid);
+            if (creature)
+            {
+                targets.setUnitTarget(creature);
+                faceTo = creature;
+            }
+        }
+    }
+
+
+    if (!bot->isInFront(faceTo, sPlayerbotAIConfig.sightDistance))
+    {
+        bot->SetFacingTo(bot->GetAngle(faceTo));
+        return false;
+    }
+
+    WaitForSpellCast(spellId);
+
+    spell->prepare(&targets, false);
+    bot->SetSelectionGuid(oldSel);
+
+    LastSpellCast& lastSpell = aiObjectContext->GetValue<LastSpellCast&>("last spell cast")->Get();
+    return lastSpell.id == spellId;
+}
+
+void PlayerbotAI::WaitForSpellCast(uint32 spellId)
+{
+    const SpellEntry* const pSpellInfo = sSpellStore.LookupEntry(spellId);
+
+    float castTime = GetSpellCastTime(pSpellInfo) + sPlayerbotAIConfig.reactDelay;
+    if (IsChanneledSpell(pSpellInfo))
+    {
+        int32 duration = GetSpellDuration(pSpellInfo);
+        if (duration > 0)
+            castTime += duration;
+    }
+
+    castTime = ceil(castTime);
+
+    uint32 globalCooldown = CalculateGlobalCooldown(spellId);
+    if (castTime < globalCooldown)
+        castTime = globalCooldown;
+
+    SetNextCheckDelay(castTime);
+}
+
+void PlayerbotAI::InterruptSpell()
+{
+    if (bot->GetCurrentSpell(CURRENT_CHANNELED_SPELL))
+        return;
+
+    LastSpellCast& lastSpell = aiObjectContext->GetValue<LastSpellCast&>("last spell cast")->Get();
+
+    for (int type = CURRENT_MELEE_SPELL; type < CURRENT_CHANNELED_SPELL; type++)
+    {
+        Spell* spell = bot->GetCurrentSpell((CurrentSpellTypes)type);
+        if (!spell)
+            continue;
+
+        bot->InterruptSpell((CurrentSpellTypes)type);
+
+        WorldPacket data(SMSG_SPELL_FAILURE, 8 + 1 + 4 + 1);
+        data << bot->GetPackGUID();
+        data << uint8(1);
+        data << uint32(spell->m_spellInfo->Id);
+        data << uint8(0);
+        bot->SendMessageToSet(&data, true);
+
+        data.Initialize(SMSG_SPELL_FAILED_OTHER, 8 + 1 + 4 + 1);
+        data << bot->GetObjectGuid();
+        data << uint8(1);
+        data << uint32(spell->m_spellInfo->Id);
+        data << uint8(0);
+        bot->SendMessageToSet(&data, true);
+
+        SpellInterrupted(spell->m_spellInfo->Id);
+    }
+
+    SpellInterrupted(lastSpell.id);
+}
+
+
+void PlayerbotAI::RemoveAura(string name)
+{
+    uint32 spellid = aiObjectContext->GetValue<uint32>("spell id", name)->Get();
+    if (spellid && HasAura(spellid, bot))
+        bot->RemoveAurasDueToSpell(spellid);
+}
+
+bool PlayerbotAI::IsInterruptableSpellCasting(Unit* target, string spell)
+{
+    uint32 spellid = aiObjectContext->GetValue<uint32>("spell id", spell)->Get();
+    if (!spellid || !target->IsNonMeleeSpellCasted(true))
+        return false;
+
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid );
+    if (!spellInfo)
+        return false;
+
+    if (target->IsImmuneToSpell(spellInfo, false))
+        return false;
+
+    for (int32 i = EFFECT_INDEX_0; i <= EFFECT_INDEX_2; i++)
+    {
+        if ((spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_INTERRUPT) && spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE)
+            return true;
+
+        if ((spellInfo->Effect[i] == SPELL_EFFECT_CANCEL_AURA || spellInfo->Effect[i] == SPELL_EFFECT_INTERRUPT_CAST) &&
+                !target->IsImmuneToSpellEffect(spellInfo, (SpellEffectIndex)i))
+            return true;
+    }
+
+    return false;
+}
+
+bool PlayerbotAI::HasAuraToDispel(Unit* target, uint32 dispelType)
+{
+    for (uint32 type = SPELL_AURA_NONE; type < TOTAL_AURAS; ++type)
+    {
+        Unit::AuraList& auras = target->GetAurasByType((AuraType)type);
+        for (Unit::AuraList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
+        {
+            const AuraPair aura = *itr;
+			const SpellEntry* entry = aura.GetHolder()->GetSpellProto();
+            uint32 spellId = entry->Id;
+
+            bool isPositiveSpell = IsPositiveSpell(spellId);
+            if (isPositiveSpell && bot->IsFriendlyTo(target))
+                continue;
+
+            if (!isPositiveSpell && bot->IsHostileTo(target))
+                continue;
+
+            if (canDispel(entry, dispelType))
+                return true;
+        }
+    }
+    return false;
+}
+
+
+#ifndef WIN32
+inline int strcmpi(const char* s1, const char* s2)
+{
+    for (; *s1 && *s2 && (toupper(*s1) == toupper(*s2)); ++s1, ++s2);
+    return *s1 - *s2;
+}
+#endif
+
+bool PlayerbotAI::canDispel(const SpellEntry* entry, uint32 dispelType)
+{
+    if (entry->Dispel != dispelType)
+        return false;
+
+    return !entry->SpellName[0] ||
+        (strcmpi((const char*)entry->SpellName[0], "demon skin") &&
+        strcmpi((const char*)entry->SpellName[0], "mage armor") &&
+        strcmpi((const char*)entry->SpellName[0], "frost armor") &&
+        strcmpi((const char*)entry->SpellName[0], "wavering will") &&
+        strcmpi((const char*)entry->SpellName[0], "chilled") &&
+        strcmpi((const char*)entry->SpellName[0], "ice armor"));
+}
+
+bool IsAlliance(uint8 race)
+{
+    return race == RACE_HUMAN || race == RACE_DWARF || race == RACE_NIGHTELF ||
+            race == RACE_GNOME || race == RACE_DRAENEI;
+}
+
+bool PlayerbotAI::IsOpposing(Player* player)
+{
+    return IsOpposing(player->getRace(), bot->getRace());
+}
+
+bool PlayerbotAI::IsOpposing(uint8 race1, uint8 race2)
+{
+    return (IsAlliance(race1) && !IsAlliance(race2)) || (!IsAlliance(race1) && IsAlliance(race2));
+}
+
+void PlayerbotAI::RemoveShapeshift()
+{
+    RemoveAura("bear form");
+    RemoveAura("dire bear form");
+    RemoveAura("moonkin form");
+    RemoveAura("travel form");
+    RemoveAura("cat form");
+    RemoveAura("flight form");
+    RemoveAura("swift flight form");
+    RemoveAura("aquatic form");
+    RemoveAura("ghost wolf");
+    RemoveAura("tree of life");
+}
diff --git a/src/game/playerbot/PlayerbotAI.h b/src/game/playerbot/PlayerbotAI.h
new file mode 100644
index 00000000000..455ac5ad55e
--- /dev/null
+++ b/src/game/playerbot/PlayerbotAI.h
@@ -0,0 +1,180 @@
+#pragma once
+
+#include "PlayerbotMgr.h"
+#include "PlayerbotAIBase.h"
+#include "strategy/AiObjectContext.h"
+#include "strategy/Engine.h"
+#include "strategy/ExternalEventHelper.h"
+#include "ChatFilter.h"
+#include "PlayerbotSecurity.h"
+
+class Player;
+class PlayerbotMgr;
+class ChatHandler;
+
+using namespace std;
+using namespace ai;
+
+bool IsAlliance(uint8 race);
+
+class PlayerbotChatHandler: protected ChatHandler
+{
+public:
+    explicit PlayerbotChatHandler(Player* pMasterPlayer) : ChatHandler(pMasterPlayer) {}
+    bool revive(const Player& botPlayer) { return HandleReviveCommand((char*)botPlayer.GetName()); }
+    bool teleport(const Player& botPlayer) { return HandleNamegoCommand((char*)botPlayer.GetName()); }
+    void sysmessage(string str) { SendSysMessage(str.c_str()); }
+    bool dropQuest(string str) { return HandleQuestRemoveCommand((char*)str.c_str()); }
+    uint32 extractQuestId(string str);
+    uint32 extractSpellId(string str)
+    {
+        char* source = (char*)str.c_str();
+        return ExtractSpellIdFromLink(&source);
+    }
+};
+
+namespace ai
+{
+	class MinValueCalculator {
+	public:
+		MinValueCalculator(float def = 0.0f) {
+			param = NULL;
+			minValue = def;
+		}
+
+	public:
+		void probe(float value, void* p) {
+			if (!param || minValue >= value) {
+				minValue = value;
+				param = p;
+			}
+		}
+
+	public:
+		void* param;
+		float minValue;
+	};
+};
+
+enum BotState
+{
+    BOT_STATE_COMBAT = 0,
+    BOT_STATE_NON_COMBAT = 1,
+    BOT_STATE_DEAD = 2
+};
+
+#define BOT_STATE_MAX 3
+
+class PacketHandlingHelper
+{
+public:
+    void AddHandler(uint16 opcode, string handler);
+    void Handle(ExternalEventHelper &helper);
+    void AddPacket(const WorldPacket& packet);
+
+private:
+    map<uint16, string> handlers;
+    stack<WorldPacket> queue;
+};
+
+class ChatCommandHolder
+{
+public:
+    ChatCommandHolder(string command, Player* owner = NULL, uint32 type = CHAT_MSG_WHISPER) : command(command), owner(owner), type(type) {}
+    ChatCommandHolder(ChatCommandHolder const& other)
+    {
+        this->command = other.command;
+        this->owner = other.owner;
+        this->type = other.type;
+    }
+
+public:
+    string GetCommand() { return command; }
+    Player* GetOwner() { return owner; }
+    uint32 GetType() { return type; }
+
+private:
+    string command;
+    Player* owner;
+    uint32 type;
+};
+
+class PlayerbotAI : public PlayerbotAIBase
+{
+public:
+	PlayerbotAI();
+	PlayerbotAI(Player* bot);
+	virtual ~PlayerbotAI();
+
+public:
+	virtual void UpdateAI(uint32 elapsed);
+	virtual void UpdateAIInternal(uint32 elapsed);
+    void HandleCommand(uint32 type, const string& text, Player& fromPlayer);
+	void HandleBotOutgoingPacket(const WorldPacket& packet);
+    void HandleMasterIncomingPacket(const WorldPacket& packet);
+    void HandleMasterOutgoingPacket(const WorldPacket& packet);
+	void HandleTeleportAck();
+    void ChangeEngine(BotState type);
+    void DoNextAction();
+    void DoSpecificAction(string name);
+    void ChangeStrategy(string name, BotState type);
+    bool ContainsStrategy(StrategyType type);
+    bool HasStrategy(string name, BotState type);
+    void ResetStrategies();
+    void ReInitCurrentEngine();
+    void Reset();
+    bool IsTank(Player* player);
+    bool IsHeal(Player* player);
+    bool IsRanged(Player* player);
+    Creature* GetCreature(ObjectGuid guid);
+    Unit* GetUnit(ObjectGuid guid);
+    GameObject* GetGameObject(ObjectGuid guid);
+    bool TellMaster(ostringstream &stream, PlayerbotSecurityLevel securityLevel = PLAYERBOT_SECURITY_ALLOW_ALL) { return TellMaster(stream.str(), securityLevel); }
+    bool TellMaster(string text, PlayerbotSecurityLevel securityLevel = PLAYERBOT_SECURITY_ALLOW_ALL);
+    bool TellMasterNoFacing(string text, PlayerbotSecurityLevel securityLevel = PLAYERBOT_SECURITY_ALLOW_ALL);
+    void SpellInterrupted(uint32 spellid);
+    int32 CalculateGlobalCooldown(uint32 spellid);
+    void InterruptSpell();
+    void RemoveAura(string name);
+    void RemoveShapeshift();
+    void WaitForSpellCast(uint32 spellId);
+
+    virtual bool CanCastSpell(string name, Unit* target);
+    virtual bool CastSpell(string name, Unit* target);
+    virtual bool HasAura(string spellName, Unit* player);
+    virtual bool HasAnyAuraOf(Unit* player, ...);
+
+    virtual bool IsInterruptableSpellCasting(Unit* player, string spell);
+    virtual bool HasAuraToDispel(Unit* player, uint32 dispelType);
+    bool CanCastSpell(uint32 spellid, Unit* target, bool checkHasSpell = true);
+
+    bool HasAura(uint32 spellId, const Unit* player);
+    bool CastSpell(uint32 spellId, Unit* target);
+    bool canDispel(const SpellEntry* entry, uint32 dispelType);
+
+public:
+	Player* GetBot() { return bot; }
+    Player* GetMaster() { return master; }
+    void SetMaster(Player* master) { this->master = master; }
+    AiObjectContext* GetAiObjectContext() { return aiObjectContext; }
+    ChatHelper* GetChatHelper() { return &chatHelper; }
+    bool IsOpposing(Player* player);
+    static bool IsOpposing(uint8 race1, uint8 race2);
+    PlayerbotSecurity* GetSecurity() { return &security; }
+
+protected:
+	Player* bot;
+	Player* master;
+	uint32 accountId;
+    AiObjectContext* aiObjectContext;
+    Engine* currentEngine;
+    Engine* engines[BOT_STATE_MAX];
+    ChatHelper chatHelper;
+    stack<ChatCommandHolder> chatCommands;
+    PacketHandlingHelper botOutgoingPacketHandlers;
+    PacketHandlingHelper masterIncomingPacketHandlers;
+    PacketHandlingHelper masterOutgoingPacketHandlers;
+    CompositeChatFilter chatFilter;
+    PlayerbotSecurity security;
+};
+
diff --git a/src/game/playerbot/PlayerbotAIAware.h b/src/game/playerbot/PlayerbotAIAware.h
new file mode 100644
index 00000000000..740628ac53f
--- /dev/null
+++ b/src/game/playerbot/PlayerbotAIAware.h
@@ -0,0 +1,13 @@
+#pragma once
+
+namespace ai
+{
+    class PlayerbotAIAware 
+    {
+    public:
+        PlayerbotAIAware(PlayerbotAI* const ai) : ai(ai) { }
+
+    protected:
+        PlayerbotAI* ai;
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/PlayerbotAIBase.cpp b/src/game/playerbot/PlayerbotAIBase.cpp
new file mode 100644
index 00000000000..5db3b6d7eba
--- /dev/null
+++ b/src/game/playerbot/PlayerbotAIBase.cpp
@@ -0,0 +1,51 @@
+#include "../pchdef.h"
+#include "playerbot.h"
+#include "PlayerbotAIConfig.h"
+
+using namespace ai;
+using namespace std;
+
+PlayerbotAIBase::PlayerbotAIBase() : nextAICheckDelay(0)
+{
+}
+
+void PlayerbotAIBase::UpdateAI(uint32 elapsed)
+{
+    if (nextAICheckDelay > elapsed)
+        nextAICheckDelay -= elapsed;
+    else
+        nextAICheckDelay = 0;
+
+    if (!CanUpdateAI())
+        return;
+
+    UpdateAIInternal(elapsed);
+    YieldThread();
+}
+
+void PlayerbotAIBase::SetNextCheckDelay(const uint32 delay)
+{
+    nextAICheckDelay = delay;
+
+    if (nextAICheckDelay > sPlayerbotAIConfig.globalCoolDown)
+        sLog.outDebug("set next check delay: %d", nextAICheckDelay);
+}
+
+void PlayerbotAIBase::IncreaseNextCheckDelay(uint32 delay)
+{
+    nextAICheckDelay += delay;
+
+    if (nextAICheckDelay > sPlayerbotAIConfig.globalCoolDown)
+        sLog.outDebug("increase next check delay: %d", nextAICheckDelay);
+}
+
+bool PlayerbotAIBase::CanUpdateAI()
+{
+    return nextAICheckDelay < 100;
+}
+
+void PlayerbotAIBase::YieldThread()
+{
+    if (nextAICheckDelay < sPlayerbotAIConfig.reactDelay)
+        nextAICheckDelay = sPlayerbotAIConfig.reactDelay;
+}
diff --git a/src/game/playerbot/PlayerbotAIBase.h b/src/game/playerbot/PlayerbotAIBase.h
new file mode 100644
index 00000000000..8e72bf08b73
--- /dev/null
+++ b/src/game/playerbot/PlayerbotAIBase.h
@@ -0,0 +1,24 @@
+#pragma once
+
+class Player;
+class PlayerbotMgr;
+class ChatHandler;
+
+using namespace std;
+
+class PlayerbotAIBase
+{
+public:
+	PlayerbotAIBase();
+
+public:
+	bool CanUpdateAI();
+	void SetNextCheckDelay(const uint32 delay);
+    void IncreaseNextCheckDelay(uint32 delay);
+	void YieldThread();
+    virtual void UpdateAI(uint32 elapsed);
+    virtual void UpdateAIInternal(uint32 elapsed) = 0;
+
+protected:
+	uint32 nextAICheckDelay;
+};
diff --git a/src/game/playerbot/PlayerbotAIConfig.cpp b/src/game/playerbot/PlayerbotAIConfig.cpp
new file mode 100644
index 00000000000..442f48fd823
--- /dev/null
+++ b/src/game/playerbot/PlayerbotAIConfig.cpp
@@ -0,0 +1,295 @@
+#include "../pchdef.h"
+#include "PlayerbotAIConfig.h"
+#include "playerbot.h"
+#include "RandomPlayerbotFactory.h"
+#include "../AccountMgr.h"
+#include "../../shared/SystemConfig.h"
+
+using namespace std;
+
+INSTANTIATE_SINGLETON_1(PlayerbotAIConfig);
+
+PlayerbotAIConfig::PlayerbotAIConfig()
+{
+}
+
+template <class T>
+void LoadList(string value, T &list)
+{
+    vector<string> ids = split(value, ',');
+    for (vector<string>::iterator i = ids.begin(); i != ids.end(); i++)
+    {
+        uint32 id = atoi((*i).c_str());
+        if (!id)
+            continue;
+
+        list.push_back(id);
+    }
+}
+
+bool PlayerbotAIConfig::Initialize()
+{
+    sLog.outString("Initializing AI Playerbot by ike3, based on the original Playerbot by blueboy");
+
+    if (!config.SetSource(SYSCONFDIR"aiplayerbot.conf"))
+    {
+        sLog.outString("AI Playerbot is Disabled. Unable to open configuration file aiplayerbot.conf");
+        return false;
+    }
+
+    enabled = config.GetBoolDefault("AiPlayerbot.Enabled", true);
+    if (!enabled)
+    {
+        sLog.outString("AI Playerbot is Disabled in aiplayerbot.conf");
+        return false;
+    }
+
+    globalCoolDown = (uint32) config.GetIntDefault("AiPlayerbot.GlobalCooldown", 500);
+    maxWaitForMove = config.GetIntDefault("AiPlayerbot.MaxWaitForMove", 3000);
+    reactDelay = (uint32) config.GetIntDefault("AiPlayerbot.ReactDelay", 100);
+
+    sightDistance = config.GetFloatDefault("AiPlayerbot.SightDistance", 75.0f);
+    spellDistance = config.GetFloatDefault("AiPlayerbot.SpellDistance", 30.0f);
+    reactDistance = config.GetFloatDefault("AiPlayerbot.ReactDistance", 150.0f);
+    grindDistance = config.GetFloatDefault("AiPlayerbot.GrindDistance", 100.0f);
+    lootDistance = config.GetFloatDefault("AiPlayerbot.LootDistance", 20.0f);
+    fleeDistance = config.GetFloatDefault("AiPlayerbot.FleeDistance", 20.0f);
+    tooCloseDistance = config.GetFloatDefault("AiPlayerbot.TooCloseDistance", 7.0f);
+    meleeDistance = config.GetFloatDefault("AiPlayerbot.MeleeDistance", 2.0f);
+    followDistance = config.GetFloatDefault("AiPlayerbot.FollowDistance", 2.0f);
+    whisperDistance = config.GetFloatDefault("AiPlayerbot.WhisperDistance", 6000.0f);
+
+    criticalHealth = config.GetIntDefault("AiPlayerbot.CriticalHealth", 20);
+    lowHealth = config.GetIntDefault("AiPlayerbot.LowHealth", 50);
+    mediumHealth = config.GetIntDefault("AiPlayerbot.MediumHealth", 70);
+    almostFullHealth = config.GetIntDefault("AiPlayerbot.AlmostFullHealth", 85);
+    lowMana = config.GetIntDefault("AiPlayerbot.LowMana", 15);
+    mediumMana = config.GetIntDefault("AiPlayerbot.MediumMana", 40);
+
+    randomGearLoweringChance = config.GetFloatDefault("AiPlayerbot.RandomGearLoweringChance", 0.15);
+    randomBotMaxLevelChance = config.GetFloatDefault("AiPlayerbot.RandomBotMaxLevelChance", 0.4);
+
+    iterationsPerTick = config.GetIntDefault("AiPlayerbot.IterationsPerTick", 4);
+
+    allowGuildBots = config.GetBoolDefault("AiPlayerbot.AllowGuildBots", true);
+
+    randomBotMapsAsString = config.GetStringDefault("AiPlayerbot.RandomBotMaps", "0,1,530,571");
+    LoadList<vector<uint32> >(randomBotMapsAsString, randomBotMaps);
+    LoadList<list<uint32> >(config.GetStringDefault("AiPlayerbot.RandomBotQuestItems", "6948,5175,5176,5177,5178"), randomBotQuestItems);
+    LoadList<list<uint32> >(config.GetStringDefault("AiPlayerbot.RandomBotSpellIds", "54197"), randomBotSpellIds);
+
+    randomBotAutologin = config.GetBoolDefault("AiPlayerbot.RandomBotAutologin", true);
+    minRandomBots = config.GetIntDefault("AiPlayerbot.MinRandomBots", 50);
+    maxRandomBots = config.GetIntDefault("AiPlayerbot.MaxRandomBots", 200);
+    randomBotUpdateInterval = config.GetIntDefault("AiPlayerbot.RandomBotUpdateInterval", 60);
+    randomBotCountChangeMinInterval = config.GetIntDefault("AiPlayerbot.RandomBotCountChangeMinInterval", 24 * 3600);
+    randomBotCountChangeMaxInterval = config.GetIntDefault("AiPlayerbot.RandomBotCountChangeMaxInterval", 3 * 24 * 3600);
+    minRandomBotInWorldTime = config.GetIntDefault("AiPlayerbot.MinRandomBotInWorldTime", 2 * 3600);
+    maxRandomBotInWorldTime = config.GetIntDefault("AiPlayerbot.MaxRandomBotInWorldTime", 14 * 24 * 3600);
+    minRandomBotRandomizeTime = config.GetIntDefault("AiPlayerbot.MinRandomBotRandomizeTime", 2 * 3600);
+    maxRandomBotRandomizeTime = config.GetIntDefault("AiPlayerbot.MaxRandomRandomizeTime", 14 * 24 * 3600);
+    minRandomBotReviveTime = config.GetIntDefault("AiPlayerbot.MinRandomBotReviveTime", 60);
+    maxRandomBotReviveTime = config.GetIntDefault("AiPlayerbot.MaxRandomReviveTime", 300);
+    randomBotTeleportDistance = config.GetIntDefault("AiPlayerbot.RandomBotTeleportDistance", 1000);
+    minRandomBotsPerInterval = config.GetIntDefault("AiPlayerbot.MinRandomBotsPerInterval", 50);
+    maxRandomBotsPerInterval = config.GetIntDefault("AiPlayerbot.MaxRandomBotsPerInterval", 100);
+    minRandomBotsPriceChangeInterval = config.GetIntDefault("AiPlayerbot.MinRandomBotsPriceChangeInterval", 2 * 3600);
+    maxRandomBotsPriceChangeInterval = config.GetIntDefault("AiPlayerbot.MaxRandomBotsPriceChangeInterval", 48 * 3600);
+    randomBotJoinLfg = config.GetBoolDefault("AiPlayerbot.RandomBotJoinLfg", true);
+    logInGroupOnly = config.GetBoolDefault("AiPlayerbot.LogInGroupOnly", true);
+    logValuesPerTick = config.GetBoolDefault("AiPlayerbot.LogValuesPerTick", false);
+    fleeingEnabled = config.GetBoolDefault("AiPlayerbot.FleeingEnabled", true);
+    randomBotMinLevel = config.GetIntDefault("AiPlayerbot.RandomBotMinLevel", 1);
+    randomBotMaxLevel = config.GetIntDefault("AiPlayerbot.RandomBotMaxLevel", 255);
+    randomBotLoginAtStartup = config.GetBoolDefault("AiPlayerbot.RandomBotLoginAtStartup", true);
+
+    randomChangeMultiplier = config.GetFloatDefault("AiPlayerbot.RandomChangeMultiplier", 1.0);
+
+    randomBotCombatStrategies = config.GetStringDefault("AiPlayerbot.RandomBotCombatStrategies", "+dps,+attack weak");
+    randomBotNonCombatStrategies = config.GetStringDefault("AiPlayerbot.RandomBotNonCombatStrategies", "+grind,+move random,+loot");
+
+    for (uint32 cls = 0; cls < MAX_CLASSES; ++cls)
+    {
+        for (uint32 spec = 0; spec < 3; ++spec)
+        {
+            ostringstream os; os << "AiPlayerbot.RandomClassSpecProbability." << cls << "." << spec;
+            specProbability[cls][spec] = config.GetIntDefault(os.str().c_str(), 33);
+        }
+    }
+
+    CreateRandomBots();
+    sLog.outString("AI Playerbot configuration loaded");
+
+    return true;
+}
+
+
+bool PlayerbotAIConfig::IsInRandomAccountList(uint32 id)
+{
+    return find(randomBotAccounts.begin(), randomBotAccounts.end(), id) != randomBotAccounts.end();
+}
+
+bool PlayerbotAIConfig::IsInRandomQuestItemList(uint32 id)
+{
+    return find(randomBotQuestItems.begin(), randomBotQuestItems.end(), id) != randomBotQuestItems.end();
+}
+
+string PlayerbotAIConfig::GetValue(string name)
+{
+    ostringstream out;
+
+    if (name == "GlobalCooldown")
+        out << globalCoolDown;
+    else if (name == "ReactDelay")
+        out << reactDelay;
+
+    else if (name == "SightDistance")
+        out << sightDistance;
+    else if (name == "SpellDistance")
+        out << spellDistance;
+    else if (name == "ReactDistance")
+        out << reactDistance;
+    else if (name == "GrindDistance")
+        out << grindDistance;
+    else if (name == "LootDistance")
+        out << lootDistance;
+    else if (name == "FleeDistance")
+        out << fleeDistance;
+
+    else if (name == "CriticalHealth")
+        out << criticalHealth;
+    else if (name == "LowHealth")
+        out << lowHealth;
+    else if (name == "MediumHealth")
+        out << mediumHealth;
+    else if (name == "AlmostFullHealth")
+        out << almostFullHealth;
+    else if (name == "LowMana")
+        out << lowMana;
+
+    else if (name == "IterationsPerTick")
+        out << iterationsPerTick;
+
+    return out.str();
+}
+
+void PlayerbotAIConfig::SetValue(string name, string value)
+{
+    istringstream out(value, istringstream::in);
+
+    if (name == "GlobalCooldown")
+        out >> globalCoolDown;
+    else if (name == "ReactDelay")
+        out >> reactDelay;
+
+    else if (name == "SightDistance")
+        out >> sightDistance;
+    else if (name == "SpellDistance")
+        out >> spellDistance;
+    else if (name == "ReactDistance")
+        out >> reactDistance;
+    else if (name == "GrindDistance")
+        out >> grindDistance;
+    else if (name == "LootDistance")
+        out >> lootDistance;
+    else if (name == "FleeDistance")
+        out >> fleeDistance;
+
+    else if (name == "CriticalHealth")
+        out >> criticalHealth;
+    else if (name == "LowHealth")
+        out >> lowHealth;
+    else if (name == "MediumHealth")
+        out >> mediumHealth;
+    else if (name == "AlmostFullHealth")
+        out >> almostFullHealth;
+    else if (name == "LowMana")
+        out >> lowMana;
+
+    else if (name == "IterationsPerTick")
+        out >> iterationsPerTick;
+}
+
+
+void PlayerbotAIConfig::CreateRandomBots()
+{
+    string randomBotAccountPrefix = config.GetStringDefault("AiPlayerbot.RandomBotAccountPrefix", "rndbot");
+    uint32 randomBotAccountCount = config.GetIntDefault("AiPlayerbot.RandomBotAccountCount", 50);
+
+    if (config.GetBoolDefault("AiPlayerbot.DeleteRandomBotAccounts", false))
+    {
+        sLog.outBasic("Deleting random bot accounts...");
+        QueryResult *results = LoginDatabase.PQuery("SELECT id FROM account where username like '%s%%'", randomBotAccountPrefix.c_str());
+        if (results)
+        {
+            do
+            {
+                Field* fields = results->Fetch();
+                sAccountMgr.DeleteAccount(fields[0].GetUInt32());
+            } while (results->NextRow());
+
+            delete results;
+        }
+
+        CharacterDatabase.Execute("DELETE FROM ai_playerbot_random_bots");
+        sLog.outBasic("Random bot accounts deleted");
+    }
+
+    for (int accountNumber = 0; accountNumber < randomBotAccountCount; ++accountNumber)
+    {
+        ostringstream out; out << randomBotAccountPrefix << accountNumber;
+        string accountName = out.str();
+        QueryResult *results = LoginDatabase.PQuery("SELECT id FROM account where username = '%s'", accountName.c_str());
+        if (results)
+        {
+            delete results;
+            continue;
+        }
+
+        string password = "";
+        for (int i = 0; i < 10; i++)
+        {
+            password += (char)urand('!', 'z');
+        }
+        sAccountMgr.CreateAccount(accountName, password);
+
+        sLog.outDetail("Account %s created for random bots", accountName.c_str());
+    }
+
+    LoginDatabase.PExecute("UPDATE account SET expansion = '%u' where username like '%s%%'", 2, randomBotAccountPrefix.c_str());
+
+    int totalRandomBotChars = 0;
+    for (int accountNumber = 0; accountNumber < randomBotAccountCount; ++accountNumber)
+    {
+        ostringstream out; out << randomBotAccountPrefix << accountNumber;
+        string accountName = out.str();
+
+        QueryResult *results = LoginDatabase.PQuery("SELECT id FROM account where username = '%s'", accountName.c_str());
+        if (!results)
+            continue;
+
+        Field* fields = results->Fetch();
+        uint32 accountId = fields[0].GetUInt32();
+        delete results;
+
+        randomBotAccounts.push_back(accountId);
+
+        int count = sAccountMgr.GetCharactersCount(accountId);
+        if (count >= 10)
+        {
+            totalRandomBotChars += count;
+            continue;
+        }
+
+        RandomPlayerbotFactory factory(accountId);
+        for (uint8 cls = CLASS_WARRIOR; cls < MAX_CLASSES; ++cls)
+        {
+            if (cls != 10 && cls != CLASS_DEATH_KNIGHT)
+                factory.CreateRandomBot(cls);
+        }
+
+        totalRandomBotChars += sAccountMgr.GetCharactersCount(accountId);
+    }
+
+    sLog.outBasic("%d random bot accounts with %d characters available", randomBotAccounts.size(), totalRandomBotChars);
+}
diff --git a/src/game/playerbot/PlayerbotAIConfig.h b/src/game/playerbot/PlayerbotAIConfig.h
new file mode 100644
index 00000000000..242531b48e4
--- /dev/null
+++ b/src/game/playerbot/PlayerbotAIConfig.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include "../../shared/Config/Config.h"
+
+class Player;
+class PlayerbotMgr;
+class ChatHandler;
+
+class PlayerbotAIConfig
+{
+public:
+    PlayerbotAIConfig();
+
+public:
+    bool Initialize();
+    bool IsInRandomAccountList(uint32 id);
+    bool IsInRandomQuestItemList(uint32 id);
+
+    bool enabled;
+    bool allowGuildBots;
+    uint32 globalCoolDown, reactDelay, maxWaitForMove;
+    float sightDistance, spellDistance, reactDistance, grindDistance, lootDistance,
+        fleeDistance, tooCloseDistance, meleeDistance, followDistance, whisperDistance;
+    uint32 criticalHealth, lowHealth, mediumHealth, almostFullHealth;
+    uint32 lowMana, mediumMana;
+
+    bool randomBotAutologin;
+    std::string randomBotMapsAsString;
+    std::vector<uint32> randomBotMaps;
+    std::list<uint32> randomBotQuestItems;
+    std::list<uint32> randomBotAccounts;
+    std::list<uint32> randomBotSpellIds;
+    uint32 randomBotTeleportDistance;
+    float randomGearLoweringChance;
+    float randomBotMaxLevelChance;
+    uint32 minRandomBots, maxRandomBots;
+    uint32 randomBotUpdateInterval, randomBotCountChangeMinInterval, randomBotCountChangeMaxInterval;
+    uint32 minRandomBotInWorldTime, maxRandomBotInWorldTime;
+    uint32 minRandomBotRandomizeTime, maxRandomBotRandomizeTime;
+    uint32 minRandomBotReviveTime, maxRandomBotReviveTime;
+    uint32 minRandomBotPvpTime, maxRandomBotPvpTime;
+    uint32 minRandomBotsPerInterval, maxRandomBotsPerInterval;
+    uint32 minRandomBotsPriceChangeInterval, maxRandomBotsPriceChangeInterval;
+    bool randomBotJoinLfg;
+    bool randomBotLoginAtStartup;
+    bool logInGroupOnly, logValuesPerTick;
+    bool fleeingEnabled;
+    std::string randomBotCombatStrategies, randomBotNonCombatStrategies;
+    uint32 randomBotMinLevel, randomBotMaxLevel;
+    float randomChangeMultiplier;
+    uint32 specProbability[MAX_CLASSES][3];
+
+    uint32 iterationsPerTick;
+
+    std::string GetValue(std::string name);
+    void SetValue(std::string name, std::string value);
+
+private:
+    void CreateRandomBots();
+    Config config;
+};
+
+#define sPlayerbotAIConfig MaNGOS::Singleton<PlayerbotAIConfig>::Instance()
diff --git a/src/game/playerbot/PlayerbotFactory.cpp b/src/game/playerbot/PlayerbotFactory.cpp
new file mode 100644
index 00000000000..c9c34f22a32
--- /dev/null
+++ b/src/game/playerbot/PlayerbotFactory.cpp
@@ -0,0 +1,1659 @@
+#include "../pchdef.h"
+#include "playerbot.h"
+#include "PlayerbotFactory.h"
+#include "../SQLStorages.h"
+#include "../ItemPrototype.h"
+#include "PlayerbotAIConfig.h"
+#include "../AccountMgr.h"
+#include "../../shared/Database/DBCStore.h"
+#include "../SharedDefines.h"
+#include "../ahbot/AhBot.h"
+
+using namespace ai;
+using namespace std;
+
+uint32 PlayerbotFactory::tradeSkills[] =
+{
+    SKILL_ALCHEMY,
+    SKILL_ENCHANTING,
+    SKILL_SKINNING,
+    SKILL_JEWELCRAFTING,
+    SKILL_INSCRIPTION,
+    SKILL_TAILORING,
+    SKILL_LEATHERWORKING,
+    SKILL_ENGINEERING,
+    SKILL_HERBALISM,
+    SKILL_MINING,
+    SKILL_BLACKSMITHING,
+    SKILL_COOKING,
+    SKILL_FIRST_AID,
+    SKILL_FISHING
+};
+
+void PlayerbotFactory::Randomize()
+{
+    Randomize(true);
+}
+
+void PlayerbotFactory::Refresh()
+{
+    Prepare();
+    InitEquipment(true);
+    InitAmmo();
+    InitFood();
+    InitPotions();
+
+    uint32 money = urand(level * 1000, level * 5 * 1000);
+    if (bot->GetMoney() < money)
+        bot->SetMoney(money);
+    bot->SaveToDB();
+}
+
+void PlayerbotFactory::CleanRandomize()
+{
+    Randomize(false);
+}
+
+void PlayerbotFactory::Prepare()
+{
+    if (!itemQuality)
+    {
+        if (level <= 10)
+            itemQuality = urand(ITEM_QUALITY_NORMAL, ITEM_QUALITY_UNCOMMON);
+        else if (level <= 20)
+            itemQuality = urand(ITEM_QUALITY_UNCOMMON, ITEM_QUALITY_RARE);
+        else if (level <= 40)
+            itemQuality = urand(ITEM_QUALITY_UNCOMMON, ITEM_QUALITY_EPIC);
+        else if (level < 60)
+            itemQuality = urand(ITEM_QUALITY_UNCOMMON, ITEM_QUALITY_EPIC);
+        else
+            itemQuality = urand(ITEM_QUALITY_RARE, ITEM_QUALITY_EPIC);
+    }
+
+    if (bot->isDead())
+        bot->ResurrectPlayer(1.0f, false);
+
+    bot->CombatStop(true);
+    bot->SetLevel(level);
+    bot->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_HELM);
+    bot->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_CLOAK);
+}
+
+void PlayerbotFactory::Randomize(bool incremental)
+{
+    Prepare();
+
+    bot->resetTalents(true, true);
+    ClearSpells();
+    ClearInventory();
+    bot->SaveToDB();
+
+    InitQuests();
+    // quest rewards boost bot level, so reduce back
+    bot->SetLevel(level);
+    ClearInventory();
+    bot->SetUInt32Value(PLAYER_XP, 0);
+    CancelAuras();
+    bot->SaveToDB();
+
+    InitAvailableSpells();
+    InitSkills();
+    InitTradeSkills();
+    InitTalents();
+    InitAvailableSpells();
+    InitSpecialSpells();
+    InitMounts();
+    UpdateTradeSkills();
+    bot->SaveToDB();
+
+    InitEquipment(incremental);
+    InitBags();
+    InitAmmo();
+    InitFood();
+    InitPotions();
+    InitSecondEquipmentSet();
+    InitInventory();
+    InitGlyphs();
+    bot->SetMoney(urand(level * 1000, level * 5 * 1000));
+    bot->SaveToDB();
+
+    InitPet();
+    bot->SaveToDB();
+}
+
+void PlayerbotFactory::InitPet()
+{
+    Pet* pet = bot->GetPet();
+    if (!pet)
+    {
+        if (bot->getClass() != CLASS_HUNTER)
+            return;
+
+        MapPtr map = bot->GetMapPtr();
+        if (!map)
+            return;
+
+		vector<uint32> ids;
+        for (uint32 id = 0; id < sCreatureStorage.GetMaxEntry(); ++id)
+        {
+            CreatureInfo const* co = sCreatureStorage.LookupEntry<CreatureInfo>(id);
+            if (!co || !co->isTameable(false))
+                continue;
+
+            if (co->MinLevel > bot->getLevel())
+                continue;
+
+			PetLevelInfo const* petInfo = sObjectMgr.GetPetLevelInfo(co->Entry, bot->getLevel());
+            if (!petInfo)
+                continue;
+
+			ids.push_back(id);
+		}
+
+        if (ids.empty())
+        {
+            sLog.outError("No pets available for bot %s (%d level)", bot->GetName(), bot->getLevel());
+            return;
+        }
+
+		for (int i = 0; i < 100; i++)
+		{
+			int index = urand(0, ids.size() - 1);
+			CreatureInfo const* co = sCreatureStorage.LookupEntry<CreatureInfo>(ids[index]);
+
+            PetLevelInfo const* petInfo = sObjectMgr.GetPetLevelInfo(co->Entry, bot->getLevel());
+            if (!petInfo)
+                continue;
+
+            uint32 guid = map->GenerateLocalLowGuid(HIGHGUID_PET);
+			CreatureCreatePos pos(map.get(), bot->GetPositionX(), bot->GetPositionY(), bot->GetPositionZ(), bot->GetOrientation(), bot->GetPhaseMask());
+            pet = new Pet(HUNTER_PET);
+            if (!pet->Create(guid, pos, co, 0, bot))
+            {
+                delete pet;
+                pet = NULL;
+                continue;
+            }
+
+            pet->SetOwnerGuid(bot->GetObjectGuid());
+            pet->SetCreatorGuid(bot->GetObjectGuid());
+            pet->setFaction(bot->getFaction());
+            pet->SetLevel(bot->getLevel());
+            bot->SetPet(pet);
+
+            sLog.outDetail("Bot %s: assign pet %d (%d level)", bot->GetName(), co->Entry, bot->getLevel());
+            pet->Summon();
+            pet->SavePetToDB(PET_SAVE_AS_CURRENT);
+            break;
+        }
+		map = MapPtr();
+    }
+
+    if (!pet)
+    {
+        sLog.outError("Cannot create pet for bot %s", bot->GetName());
+        return;
+    }
+
+    for (PetSpellMap::const_iterator itr = pet->m_spells.begin(); itr != pet->m_spells.end(); ++itr)
+    {
+        if(itr->second.state == PETSPELL_REMOVED)
+            continue;
+
+        uint32 spellId = itr->first;
+        if(IsPassiveSpell(spellId))
+            continue;
+
+        pet->ToggleAutocast(spellId, true);
+    }
+}
+
+void PlayerbotFactory::ClearSpells()
+{
+    list<uint32> spells;
+    for(PlayerSpellMap::iterator itr = bot->GetSpellMap().begin(); itr != bot->GetSpellMap().end(); ++itr)
+    {
+        uint32 spellId = itr->first;
+        if(itr->second.state == PLAYERSPELL_REMOVED || itr->second.disabled || IsPassiveSpell(spellId))
+            continue;
+
+        spells.push_back(spellId);
+    }
+
+    for (list<uint32>::iterator i = spells.begin(); i != spells.end(); ++i)
+    {
+        bot->removeSpell(*i);
+    }
+}
+
+void PlayerbotFactory::InitSpells()
+{
+    for (int i = 0; i < 15; i++)
+        InitAvailableSpells();
+}
+
+void PlayerbotFactory::InitTalents()
+{
+    uint32 point = urand(0, 100);
+    uint8 cls = bot->getClass();
+    uint32 p1 = sPlayerbotAIConfig.specProbability[cls][0];
+    uint32 p2 = p1 + sPlayerbotAIConfig.specProbability[cls][1];
+
+    uint32 specNo = (point < p1 ? 0 : (point < p2 ? 1 : 2));
+    InitTalents(specNo);
+
+    if (bot->GetFreeTalentPoints())
+        InitTalents(2 - specNo);
+}
+
+
+class DestroyItemsVisitor : public IterateItemsVisitor
+{
+public:
+    DestroyItemsVisitor(Player* bot) : IterateItemsVisitor(), bot(bot) {}
+
+    virtual bool Visit(Item* item)
+    {
+        uint32 id = item->GetProto()->ItemId;
+        if (CanKeep(id))
+        {
+            keep.insert(id);
+            return true;
+        }
+
+        bot->DestroyItem(item->GetBagSlot(), item->GetSlot(), true);
+        return true;
+    }
+
+private:
+    bool CanKeep(uint32 id)
+    {
+        if (keep.find(id) != keep.end())
+            return false;
+
+        if (sPlayerbotAIConfig.IsInRandomQuestItemList(id))
+            return true;
+
+        ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(id);
+        if (proto->Class == ITEM_CLASS_MISC && (proto->SubClass == ITEM_SUBCLASS_JUNK_REAGENT || proto->SubClass == ITEM_SUBCLASS_JUNK))
+            return true;
+
+        return false;
+    }
+
+private:
+    Player* bot;
+    set<uint32> keep;
+
+};
+
+bool PlayerbotFactory::CanEquipArmor(ItemPrototype const* proto)
+{
+    if (bot->HasSkill(SKILL_SHIELD) && proto->SubClass == ITEM_SUBCLASS_ARMOR_SHIELD)
+        return true;
+
+    if (bot->HasSkill(SKILL_PLATE_MAIL))
+    {
+        if (proto->SubClass != ITEM_SUBCLASS_ARMOR_PLATE)
+            return false;
+    }
+    else if (bot->HasSkill(SKILL_MAIL))
+    {
+        if (proto->SubClass != ITEM_SUBCLASS_ARMOR_MAIL)
+            return false;
+    }
+    else if (bot->HasSkill(SKILL_LEATHER))
+    {
+        if (proto->SubClass != ITEM_SUBCLASS_ARMOR_LEATHER)
+            return false;
+    }
+
+    if (proto->Quality <= ITEM_QUALITY_NORMAL)
+        return true;
+
+    uint8 sp = 0, ap = 0, tank = 0;
+    for (int j = 0; j < MAX_ITEM_PROTO_STATS; ++j)
+    {
+        // for ItemStatValue != 0
+        if(!proto->ItemStat[j].ItemStatValue)
+            continue;
+
+        AddItemStats(proto->ItemStat[j].ItemStatType, sp, ap, tank);
+    }
+
+    return CheckItemStats(sp, ap, tank);
+}
+
+bool PlayerbotFactory::CheckItemStats(uint8 sp, uint8 ap, uint8 tank)
+{
+    switch (bot->getClass())
+    {
+    case CLASS_PRIEST:
+    case CLASS_MAGE:
+    case CLASS_WARLOCK:
+        if (!sp || ap > sp || tank > sp)
+            return false;
+        break;
+    case CLASS_PALADIN:
+    case CLASS_WARRIOR:
+        if ((!ap && !tank) || sp > ap || sp > tank)
+            return false;
+        break;
+    case CLASS_HUNTER:
+    case CLASS_ROGUE:
+        if (!ap || sp > ap || sp > tank)
+            return false;
+        break;
+    }
+
+    return sp || ap || tank;
+}
+
+void PlayerbotFactory::AddItemStats(uint32 mod, uint8 &sp, uint8 &ap, uint8 &tank)
+{
+    switch (mod)
+    {
+    case ITEM_MOD_HIT_RATING:
+    case ITEM_MOD_CRIT_RATING:
+    case ITEM_MOD_HASTE_RATING:
+    case ITEM_MOD_HEALTH:
+    case ITEM_MOD_STAMINA:
+    case ITEM_MOD_HEALTH_REGEN:
+    case ITEM_MOD_MANA:
+    case ITEM_MOD_INTELLECT:
+    case ITEM_MOD_SPIRIT:
+    case ITEM_MOD_MANA_REGENERATION:
+    case ITEM_MOD_SPELL_POWER:
+    case ITEM_MOD_SPELL_PENETRATION:
+    case ITEM_MOD_HIT_SPELL_RATING:
+    case ITEM_MOD_CRIT_SPELL_RATING:
+    case ITEM_MOD_HASTE_SPELL_RATING:
+        sp++;
+        break;
+    }
+
+    switch (mod)
+    {
+    case ITEM_MOD_HIT_RATING:
+    case ITEM_MOD_CRIT_RATING:
+    case ITEM_MOD_HASTE_RATING:
+    case ITEM_MOD_AGILITY:
+    case ITEM_MOD_STRENGTH:
+    case ITEM_MOD_HEALTH:
+    case ITEM_MOD_STAMINA:
+    case ITEM_MOD_HEALTH_REGEN:
+    case ITEM_MOD_DEFENSE_SKILL_RATING:
+    case ITEM_MOD_DODGE_RATING:
+    case ITEM_MOD_PARRY_RATING:
+    case ITEM_MOD_BLOCK_RATING:
+    case ITEM_MOD_HIT_TAKEN_MELEE_RATING:
+    case ITEM_MOD_HIT_TAKEN_RANGED_RATING:
+    case ITEM_MOD_HIT_TAKEN_SPELL_RATING:
+    case ITEM_MOD_CRIT_TAKEN_MELEE_RATING:
+    case ITEM_MOD_CRIT_TAKEN_RANGED_RATING:
+    case ITEM_MOD_CRIT_TAKEN_SPELL_RATING:
+    case ITEM_MOD_HIT_TAKEN_RATING:
+    case ITEM_MOD_CRIT_TAKEN_RATING:
+    case ITEM_MOD_RESILIENCE_RATING:
+    case ITEM_MOD_BLOCK_VALUE:
+        tank++;
+        break;
+    }
+
+    switch (mod)
+    {
+    case ITEM_MOD_HEALTH:
+    case ITEM_MOD_STAMINA:
+    case ITEM_MOD_HEALTH_REGEN:
+    case ITEM_MOD_AGILITY:
+    case ITEM_MOD_STRENGTH:
+    case ITEM_MOD_HIT_MELEE_RATING:
+    case ITEM_MOD_HIT_RANGED_RATING:
+    case ITEM_MOD_CRIT_MELEE_RATING:
+    case ITEM_MOD_CRIT_RANGED_RATING:
+    case ITEM_MOD_HASTE_MELEE_RATING:
+    case ITEM_MOD_HASTE_RANGED_RATING:
+    case ITEM_MOD_HIT_RATING:
+    case ITEM_MOD_CRIT_RATING:
+    case ITEM_MOD_HASTE_RATING:
+    case ITEM_MOD_EXPERTISE_RATING:
+    case ITEM_MOD_ATTACK_POWER:
+    case ITEM_MOD_RANGED_ATTACK_POWER:
+    case ITEM_MOD_ARMOR_PENETRATION_RATING:
+        ap++;
+        break;
+    }
+}
+
+bool PlayerbotFactory::CanEquipWeapon(ItemPrototype const* proto)
+{
+    switch (bot->getClass())
+    {
+    case CLASS_PRIEST:
+        if (proto->SubClass != ITEM_SUBCLASS_WEAPON_STAFF &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_WAND &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_MACE)
+            return false;
+        break;
+    case CLASS_MAGE:
+    case CLASS_WARLOCK:
+        if (proto->SubClass != ITEM_SUBCLASS_WEAPON_STAFF &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_WAND &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_SWORD)
+            return false;
+        break;
+    case CLASS_WARRIOR:
+        if (proto->SubClass != ITEM_SUBCLASS_WEAPON_MACE2 &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_SWORD2 &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_MACE &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_SWORD &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_GUN &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_CROSSBOW &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_BOW &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_THROWN)
+            return false;
+        break;
+    case CLASS_PALADIN:
+        if (proto->SubClass != ITEM_SUBCLASS_WEAPON_MACE2 &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_SWORD2 &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_MACE &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_SWORD)
+            return false;
+        break;
+    case CLASS_SHAMAN:
+        if (proto->SubClass != ITEM_SUBCLASS_WEAPON_MACE &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_MACE2 &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_STAFF)
+            return false;
+        break;
+    case CLASS_DRUID:
+        if (proto->SubClass != ITEM_SUBCLASS_WEAPON_MACE &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_MACE2 &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_DAGGER &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_STAFF)
+            return false;
+        break;
+    case CLASS_HUNTER:
+        if (proto->SubClass != ITEM_SUBCLASS_WEAPON_AXE2 &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_SWORD2 &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_GUN &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_CROSSBOW &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_BOW)
+            return false;
+        break;
+    case CLASS_ROGUE:
+        if (proto->SubClass != ITEM_SUBCLASS_WEAPON_DAGGER &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_SWORD &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_MACE &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_GUN &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_CROSSBOW &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_BOW &&
+                proto->SubClass != ITEM_SUBCLASS_WEAPON_THROWN)
+            return false;
+        break;
+    }
+
+    return true;
+}
+
+bool PlayerbotFactory::CanEquipItem(ItemPrototype const* proto, uint32 desiredQuality)
+{
+    if (proto->Duration & 0x80000000)
+        return false;
+
+    if (proto->Quality != desiredQuality)
+        return false;
+
+    if (proto->Bonding == BIND_QUEST_ITEM || proto->Bonding == BIND_WHEN_USE)
+        return false;
+
+    if (proto->Class == ITEM_CLASS_CONTAINER)
+        return true;
+
+    uint32 requiredLevel = proto->RequiredLevel;
+    if (!requiredLevel)
+        return false;
+
+    uint32 level = bot->getLevel();
+    uint32 delta = 2;
+    if (level < 15)
+        delta = urand(7, 15);
+    else if (proto->Class == ITEM_CLASS_WEAPON || proto->SubClass == ITEM_SUBCLASS_ARMOR_SHIELD)
+        delta = urand(2, 3);
+    else if (!(level % 10) || (level % 10) == 9)
+        delta = 2;
+    else if (level < 40)
+        delta = urand(5, 10);
+    else if (level < 60)
+        delta = urand(3, 7);
+    else if (level < 70)
+        delta = urand(2, 5);
+    else if (level < 80)
+        delta = urand(2, 4);
+
+    if (desiredQuality > ITEM_QUALITY_NORMAL &&
+            (requiredLevel > level || requiredLevel < level - delta))
+        return false;
+
+    for (uint32 gap = 60; gap <= 80; gap += 10)
+    {
+        if (level > gap && requiredLevel <= gap)
+            return false;
+    }
+
+    return true;
+}
+
+void PlayerbotFactory::InitEquipment(bool incremental)
+{
+    DestroyItemsVisitor visitor(bot);
+    IterateItems(&visitor, ITERATE_ALL_ITEMS);
+
+    map<uint8, vector<uint32> > items;
+    for(uint8 slot = 0; slot < EQUIPMENT_SLOT_END; ++slot)
+    {
+        if (slot == EQUIPMENT_SLOT_TABARD || slot == EQUIPMENT_SLOT_BODY)
+            continue;
+
+        uint32 desiredQuality = itemQuality;
+        if (urand(0, 100) < 100 * sPlayerbotAIConfig.randomGearLoweringChance && desiredQuality > ITEM_QUALITY_NORMAL) {
+            desiredQuality--;
+        }
+
+        do
+        {
+            for (uint32 itemId = 0; itemId < sItemStorage.GetMaxEntry(); ++itemId)
+            {
+                ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+                if (!proto)
+                    continue;
+
+                if (proto->Class != ITEM_CLASS_WEAPON &&
+                    proto->Class != ITEM_CLASS_ARMOR &&
+                    proto->Class != ITEM_CLASS_CONTAINER &&
+                    proto->Class != ITEM_CLASS_PROJECTILE)
+                    continue;
+
+                if (!CanEquipItem(proto, desiredQuality))
+                    continue;
+
+                if (proto->Class == ITEM_CLASS_ARMOR && (
+                    slot == EQUIPMENT_SLOT_HEAD ||
+                    slot == EQUIPMENT_SLOT_SHOULDERS ||
+                    slot == EQUIPMENT_SLOT_CHEST ||
+                    slot == EQUIPMENT_SLOT_WAIST ||
+                    slot == EQUIPMENT_SLOT_LEGS ||
+                    slot == EQUIPMENT_SLOT_FEET ||
+                    slot == EQUIPMENT_SLOT_WRISTS ||
+                    slot == EQUIPMENT_SLOT_HANDS) && !CanEquipArmor(proto))
+                        continue;
+
+                if (proto->Class == ITEM_CLASS_WEAPON && !CanEquipWeapon(proto))
+                    continue;
+
+                if (slot == EQUIPMENT_SLOT_OFFHAND && bot->getClass() == CLASS_ROGUE && proto->Class != ITEM_CLASS_WEAPON)
+                    continue;
+
+                uint16 dest = 0;
+                if (CanEquipUnseenItem(slot, dest, itemId))
+                    items[slot].push_back(itemId);
+            }
+        } while (items[slot].empty() && desiredQuality-- > ITEM_QUALITY_NORMAL);
+    }
+
+    for(uint8 slot = 0; slot < EQUIPMENT_SLOT_END; ++slot)
+    {
+        if (slot == EQUIPMENT_SLOT_TABARD || slot == EQUIPMENT_SLOT_BODY)
+            continue;
+
+        vector<uint32>& ids = items[slot];
+        if (ids.empty())
+        {
+            sLog.outDetail("%s: no items to equip for slot %d", bot->GetName(), slot);
+            continue;
+        }
+
+        for (int attempts = 0; attempts < 15; attempts++)
+        {
+            uint32 index = urand(0, ids.size() - 1);
+            uint32 newItemId = ids[index];
+            Item* oldItem = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, slot);
+
+            if (incremental && !IsDesiredReplacement(oldItem)) {
+                continue;
+            }
+
+            uint16 dest;
+            if (!CanEquipUnseenItem(slot, dest, newItemId))
+                continue;
+
+            if (oldItem)
+            {
+                bot->RemoveItem(INVENTORY_SLOT_BAG_0, slot, true);
+                oldItem->DestroyForPlayer(bot, false);
+            }
+
+            Item* newItem = bot->EquipNewItem(dest, newItemId, true);
+            if (newItem)
+            {
+                newItem->AddToWorld();
+                newItem->AddToUpdateQueueOf(bot);
+                bot->AutoUnequipOffhandIfNeed();
+                EnchantItem(newItem);
+                break;
+            }
+        }
+    }
+}
+
+bool PlayerbotFactory::IsDesiredReplacement(Item* item)
+{
+    if (!item)
+        return true;
+
+    ItemPrototype const* proto = item->GetProto();
+    int delta = 1 + (80 - bot->getLevel()) / 10;
+    return (int)bot->getLevel() - (int)proto->RequiredLevel > delta;
+}
+
+void PlayerbotFactory::InitSecondEquipmentSet()
+{
+    if (bot->getClass() == CLASS_MAGE || bot->getClass() == CLASS_WARLOCK || bot->getClass() == CLASS_PRIEST)
+        return;
+
+    map<uint32, vector<uint32> > items;
+
+    uint32 desiredQuality = itemQuality;
+    while (urand(0, 100) < 100 * sPlayerbotAIConfig.randomGearLoweringChance && desiredQuality > ITEM_QUALITY_NORMAL) {
+        desiredQuality--;
+    }
+
+    do
+    {
+        for (uint32 itemId = 0; itemId < sItemStorage.GetMaxEntry(); ++itemId)
+        {
+            ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+            if (!proto)
+                continue;
+
+            if (!CanEquipItem(proto, desiredQuality))
+                continue;
+
+            if (proto->Class == ITEM_CLASS_WEAPON)
+            {
+                if (!CanEquipWeapon(proto))
+                    continue;
+
+                Item* existingItem = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
+                if (existingItem)
+                {
+                    switch (existingItem->GetProto()->SubClass)
+                    {
+                    case ITEM_SUBCLASS_WEAPON_AXE:
+                    case ITEM_SUBCLASS_WEAPON_DAGGER:
+                    case ITEM_SUBCLASS_WEAPON_FIST:
+                    case ITEM_SUBCLASS_WEAPON_MACE:
+                    case ITEM_SUBCLASS_WEAPON_SWORD:
+                        if (proto->SubClass == ITEM_SUBCLASS_WEAPON_AXE || proto->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER ||
+                            proto->SubClass == ITEM_SUBCLASS_WEAPON_FIST || proto->SubClass == ITEM_SUBCLASS_WEAPON_MACE ||
+                            proto->SubClass == ITEM_SUBCLASS_WEAPON_SWORD)
+                            continue;
+                        break;
+                    default:
+                        if (proto->SubClass != ITEM_SUBCLASS_WEAPON_AXE && proto->SubClass != ITEM_SUBCLASS_WEAPON_DAGGER &&
+                            proto->SubClass != ITEM_SUBCLASS_WEAPON_FIST && proto->SubClass != ITEM_SUBCLASS_WEAPON_MACE &&
+                            proto->SubClass != ITEM_SUBCLASS_WEAPON_SWORD)
+                            continue;
+                        break;
+                    }
+                }
+            }
+            else if (proto->Class == ITEM_CLASS_ARMOR && proto->SubClass == ITEM_SUBCLASS_ARMOR_SHIELD)
+            {
+                if (!CanEquipArmor(proto))
+                    continue;
+
+                Item* existingItem = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
+                if (existingItem && existingItem->GetProto()->SubClass == ITEM_SUBCLASS_ARMOR_SHIELD)
+                    continue;
+            }
+            else
+                continue;
+
+            items[proto->Class].push_back(itemId);
+        }
+    } while (items[ITEM_CLASS_ARMOR].empty() && items[ITEM_CLASS_WEAPON].empty() && desiredQuality-- > ITEM_QUALITY_NORMAL);
+
+    for (map<uint32, vector<uint32> >::iterator i = items.begin(); i != items.end(); ++i)
+    {
+        vector<uint32>& ids = i->second;
+        if (ids.empty())
+        {
+            sLog.outDetail("%s: no items to make second equipment set for slot %d", bot->GetName(), i->first);
+            continue;
+        }
+
+        for (int attempts = 0; attempts < 15; attempts++)
+        {
+            uint32 index = urand(0, ids.size() - 1);
+            uint32 newItemId = ids[index];
+
+            Item* newItem = bot->StoreNewItemInInventorySlot(newItemId, 1);
+            if (newItem)
+            {
+                EnchantItem(newItem);
+                newItem->AddToWorld();
+                newItem->AddToUpdateQueueOf(bot);
+                break;
+            }
+        }
+    }
+}
+
+void PlayerbotFactory::InitBags()
+{
+    vector<uint32> ids;
+
+    for (uint32 itemId = 0; itemId < sItemStorage.GetMaxEntry(); ++itemId)
+    {
+        ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+        if (!proto || proto->Class != ITEM_CLASS_CONTAINER)
+            continue;
+
+        if (!CanEquipItem(proto, ITEM_QUALITY_NORMAL))
+            continue;
+
+        ids.push_back(itemId);
+    }
+
+    if (ids.empty())
+    {
+        sLog.outError("%s: no bags found", bot->GetName());
+        return;
+    }
+
+    for (uint8 slot = INVENTORY_SLOT_BAG_START; slot < INVENTORY_SLOT_BAG_END; ++slot)
+    {
+        for (int attempts = 0; attempts < 15; attempts++)
+        {
+            uint32 index = urand(0, ids.size() - 1);
+            uint32 newItemId = ids[index];
+
+            uint16 dest;
+            if (!CanEquipUnseenItem(slot, dest, newItemId))
+                continue;
+
+            Item* newItem = bot->EquipNewItem(dest, newItemId, true);
+            if (newItem)
+            {
+                newItem->AddToWorld();
+                newItem->AddToUpdateQueueOf(bot);
+                break;
+            }
+        }
+    }
+}
+
+void PlayerbotFactory::EnchantItem(Item* item)
+{
+    if (urand(0, 100) < 100 * sPlayerbotAIConfig.randomGearLoweringChance)
+        return;
+
+    if (bot->getLevel() < urand(40, 50))
+        return;
+
+    ItemPrototype const* proto = item->GetProto();
+    int32 itemLevel = proto->ItemLevel;
+
+    vector<uint32> ids;
+    for (int id = 0; id < sSpellStore.GetNumRows(); ++id)
+    {
+        SpellEntry const *entry = sSpellStore.LookupEntry(id);
+        if (!entry)
+            continue;
+
+        int32 requiredLevel = (int32)entry->baseLevel;
+        if (requiredLevel && (requiredLevel > itemLevel || requiredLevel < itemLevel - 35))
+            continue;
+
+        if (entry->maxLevel && level > entry->maxLevel)
+            continue;
+
+        uint32 spellLevel = entry->spellLevel;
+        if (spellLevel && (spellLevel > level || spellLevel < level - 10))
+            continue;
+
+        for (int j = 0; j < 3; ++j)
+        {
+            if (entry->Effect[j] != SPELL_EFFECT_ENCHANT_ITEM)
+                continue;
+
+            uint32 enchant_id = entry->EffectMiscValue[j];
+            if (!enchant_id)
+                continue;
+
+            SpellItemEnchantmentEntry const* enchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+            if (!enchant || enchant->slot != PERM_ENCHANTMENT_SLOT)
+                continue;
+
+            if (enchant->requiredLevel && enchant->requiredLevel > level)
+                continue;
+
+            uint8 sp = 0, ap = 0, tank = 0;
+            for (int i = 0; i < 3; ++i)
+            {
+                if (enchant->type[i] != ITEM_ENCHANTMENT_TYPE_STAT)
+                    continue;
+
+                AddItemStats(enchant->spellid[i], sp, ap, tank);
+            }
+
+            if (!CheckItemStats(sp, ap, tank))
+                continue;
+
+            if (enchant->EnchantmentCondition && !bot->EnchantmentFitsRequirements(enchant->EnchantmentCondition, -1))
+                continue;
+
+            if (!item->IsFitToSpellRequirements(entry))
+                continue;
+
+            ids.push_back(enchant_id);
+        }
+    }
+
+    if (ids.empty())
+    {
+        sLog.outDetail("%s: no enchantments found for item %d", bot->GetName(), item->GetProto()->ItemId);
+        return;
+    }
+
+    int index = urand(0, ids.size() - 1);
+    uint32 id = ids[index];
+
+    SpellItemEnchantmentEntry const* enchant = sSpellItemEnchantmentStore.LookupEntry(id);
+    if (!enchant)
+        return;
+
+    bot->ApplyEnchantment(item, PERM_ENCHANTMENT_SLOT, false);
+    item->SetEnchantment(PERM_ENCHANTMENT_SLOT, id, 0, 0);
+    bot->ApplyEnchantment(item, PERM_ENCHANTMENT_SLOT, true);
+}
+
+bool PlayerbotFactory::CanEquipUnseenItem(uint8 slot, uint16 &dest, uint32 item)
+{
+    dest = 0;
+    Item *pItem = Item::CreateItem(item, 1, bot);
+    if (pItem)
+    {
+        InventoryResult result = bot->CanEquipItem(slot, dest, pItem, true, false);
+        pItem->RemoveFromUpdateQueueOf(bot);
+        delete pItem;
+        return result == EQUIP_ERR_OK;
+    }
+
+    return false;
+}
+
+void PlayerbotFactory::InitTradeSkills()
+{
+    for (int i = 0; i < sizeof(tradeSkills) / sizeof(uint32); ++i)
+    {
+        bot->SetSkill(tradeSkills[i], 0, 0);
+    }
+
+    vector<uint32> firstSkills;
+    vector<uint32> secondSkills;
+    switch (bot->getClass())
+    {
+    case CLASS_WARRIOR:
+    case CLASS_PALADIN:
+        firstSkills.push_back(SKILL_MINING);
+        secondSkills.push_back(SKILL_BLACKSMITHING);
+        secondSkills.push_back(SKILL_ENGINEERING);
+        break;
+    case CLASS_SHAMAN:
+    case CLASS_DRUID:
+    case CLASS_HUNTER:
+    case CLASS_ROGUE:
+        firstSkills.push_back(SKILL_SKINNING);
+        secondSkills.push_back(SKILL_LEATHERWORKING);
+        break;
+    default:
+        firstSkills.push_back(SKILL_TAILORING);
+        secondSkills.push_back(SKILL_ENCHANTING);
+    }
+
+    SetRandomSkill(SKILL_FIRST_AID);
+    SetRandomSkill(SKILL_FISHING);
+    SetRandomSkill(SKILL_COOKING);
+
+    switch (urand(0, 3))
+    {
+    case 0:
+        SetRandomSkill(SKILL_HERBALISM);
+        SetRandomSkill(SKILL_ALCHEMY);
+        break;
+    case 1:
+        SetRandomSkill(SKILL_HERBALISM);
+        SetRandomSkill(SKILL_INSCRIPTION);
+        break;
+    case 2:
+        SetRandomSkill(SKILL_MINING);
+        SetRandomSkill(SKILL_JEWELCRAFTING);
+        break;
+    case 3:
+        SetRandomSkill(firstSkills[urand(0, firstSkills.size() - 1)]);
+        SetRandomSkill(secondSkills[urand(0, secondSkills.size() - 1)]);
+        break;
+    }
+}
+
+void PlayerbotFactory::UpdateTradeSkills()
+{
+    for (int i = 0; i < sizeof(tradeSkills) / sizeof(uint32); ++i)
+    {
+        if (bot->GetSkillValue(tradeSkills[i]) == 1)
+            bot->SetSkill(tradeSkills[i], 0, 0);
+    }
+}
+
+void PlayerbotFactory::InitSkills()
+{
+    uint32 maxValue = level * 5;
+    SetRandomSkill(SKILL_DEFENSE);
+    SetRandomSkill(SKILL_SWORDS);
+    SetRandomSkill(SKILL_AXES);
+    SetRandomSkill(SKILL_BOWS);
+    SetRandomSkill(SKILL_GUNS);
+    SetRandomSkill(SKILL_MACES);
+    SetRandomSkill(SKILL_2H_SWORDS);
+    SetRandomSkill(SKILL_STAVES);
+    SetRandomSkill(SKILL_2H_MACES);
+    SetRandomSkill(SKILL_2H_AXES);
+    SetRandomSkill(SKILL_DAGGERS);
+    SetRandomSkill(SKILL_THROWN);
+    SetRandomSkill(SKILL_CROSSBOWS);
+    SetRandomSkill(SKILL_WANDS);
+    SetRandomSkill(SKILL_POLEARMS);
+    SetRandomSkill(SKILL_FIST_WEAPONS);
+
+    if (bot->getLevel() >= 70)
+        bot->SetSkill(SKILL_RIDING, 300, 300);
+    else if (bot->getLevel() >= 60)
+        bot->SetSkill(SKILL_RIDING, 225, 225);
+    else if (bot->getLevel() >= 40)
+        bot->SetSkill(SKILL_RIDING, 150, 150);
+    else if (bot->getLevel() >= 20)
+        bot->SetSkill(SKILL_RIDING, 75, 75);
+    else
+        bot->SetSkill(SKILL_RIDING, 0, 0);
+
+    uint32 skillLevel = bot->getLevel() < 40 ? 0 : 1;
+    switch (bot->getClass())
+    {
+    case CLASS_DEATH_KNIGHT:
+    case CLASS_WARRIOR:
+    case CLASS_PALADIN:
+        bot->SetSkill(SKILL_PLATE_MAIL, skillLevel, skillLevel);
+        break;
+    case CLASS_SHAMAN:
+    case CLASS_HUNTER:
+        bot->SetSkill(SKILL_MAIL, skillLevel, skillLevel);
+    }
+}
+
+void PlayerbotFactory::SetRandomSkill(uint16 id)
+{
+    uint32 maxValue = level * 5;
+    uint32 curValue = urand(maxValue - level, maxValue);
+    bot->SetSkill(id, curValue, maxValue);
+
+}
+
+void PlayerbotFactory::InitAvailableSpells()
+{
+    bot->learnDefaultSpells();
+
+    for (uint32 id = 0; id < sCreatureStorage.GetMaxEntry(); ++id)
+    {
+        CreatureInfo const* co = sCreatureStorage.LookupEntry<CreatureInfo>(id);
+        if (!co)
+            continue;
+
+        if (co->TrainerType != TRAINER_TYPE_TRADESKILLS && co->TrainerType != TRAINER_TYPE_CLASS)
+            continue;
+
+        if (co->TrainerType == TRAINER_TYPE_CLASS && co->TrainerClass != bot->getClass())
+            continue;
+
+		uint32 trainerId = co->TrainerTemplateId;
+        if (!trainerId)
+            trainerId = co->Entry;
+
+		TrainerSpellData const* trainer_spells = sObjectMgr.GetNpcTrainerTemplateSpells(trainerId);
+        if (!trainer_spells)
+            trainer_spells = sObjectMgr.GetNpcTrainerSpells(trainerId);
+
+        if (!trainer_spells)
+            continue;
+
+        for (TrainerSpellMap::const_iterator itr =  trainer_spells->spellList.begin(); itr !=  trainer_spells->spellList.end(); ++itr)
+        {
+            TrainerSpell const* tSpell = &itr->second;
+
+            if (!tSpell)
+                continue;
+
+            uint32 reqLevel = 0;
+            if (!tSpell->learnedSpell && !bot->IsSpellFitByClassAndRace(tSpell->learnedSpell, &reqLevel))
+                continue;
+
+            reqLevel = tSpell->isProvidedReqLevel ? tSpell->reqLevel : std::max(reqLevel, tSpell->reqLevel);
+            TrainerSpellState state = bot->GetTrainerSpellState(tSpell, reqLevel);
+            if (state != TRAINER_SPELL_GREEN)
+                continue;
+
+            if (tSpell->learnedSpell)
+                bot->learnSpell(tSpell->learnedSpell, false);
+            else
+                ai->CastSpell(tSpell->spell, bot);
+        }
+    }
+}
+
+void PlayerbotFactory::InitSpecialSpells()
+{
+    for (list<uint32>::iterator i = sPlayerbotAIConfig.randomBotSpellIds.begin(); i != sPlayerbotAIConfig.randomBotSpellIds.end(); ++i)
+    {
+        uint32 spellId = *i;
+        bot->learnSpell(spellId, false);
+    }
+}
+
+void PlayerbotFactory::InitTalents(uint32 specNo)
+{
+    uint32 classMask = bot->getClassMask();
+
+    map<uint32, vector<TalentEntry const*> > spells;
+    for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i)
+    {
+        TalentEntry const *talentInfo = sTalentStore.LookupEntry(i);
+        if(!talentInfo)
+            continue;
+
+        TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab );
+        if(!talentTabInfo || talentTabInfo->tabpage != specNo)
+            continue;
+
+        if( (classMask & talentTabInfo->ClassMask) == 0 )
+            continue;
+
+        spells[talentInfo->Row].push_back(talentInfo);
+    }
+
+    uint32 freePoints = bot->GetFreeTalentPoints();
+    for (map<uint32, vector<TalentEntry const*> >::iterator i = spells.begin(); i != spells.end(); ++i)
+    {
+        vector<TalentEntry const*> &spells = i->second;
+        if (spells.empty())
+        {
+            sLog.outError("%s: No spells for talent row %d", bot->GetName(), i->first);
+            continue;
+        }
+
+        int attemptCount = 0;
+        while (!spells.empty() && (int)freePoints - (int)bot->GetFreeTalentPoints() < 5 && attemptCount++ < 3 && bot->GetFreeTalentPoints())
+        {
+            int index = urand(0, spells.size() - 1);
+            TalentEntry const *talentInfo = spells[index];
+            for (int rank = 0; rank < MAX_TALENT_RANK && bot->GetFreeTalentPoints(); ++rank)
+            {
+                uint32 spellId = talentInfo->RankID[rank];
+                if (!spellId)
+                    continue;
+                bot->learnSpell(spellId, false);
+                bot->UpdateFreeTalentPoints(false);
+            }
+			spells.erase(spells.begin() + index);
+        }
+
+        freePoints = bot->GetFreeTalentPoints();
+    }
+
+    for (uint32 i = 0; i < MAX_TALENT_SPEC_COUNT; ++i)
+    {
+        for (PlayerTalentMap::iterator itr = bot->GetTalentMap(i).begin(); itr != bot->GetTalentMap(i).end(); ++itr)
+        {
+            if (itr->second.state != PLAYERSPELL_REMOVED)
+                itr->second.state = PLAYERSPELL_CHANGED;
+        }
+    }
+}
+
+ObjectGuid PlayerbotFactory::GetRandomBot()
+{
+    vector<ObjectGuid> guids;
+    for (list<uint32>::iterator i = sPlayerbotAIConfig.randomBotAccounts.begin(); i != sPlayerbotAIConfig.randomBotAccounts.end(); i++)
+    {
+        uint32 accountId = *i;
+        if (!sAccountMgr.GetCharactersCount(accountId))
+            continue;
+
+        QueryResult *result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE account = '%u'", accountId);
+        if (!result)
+            continue;
+
+        do
+        {
+            Field* fields = result->Fetch();
+            ObjectGuid guid = ObjectGuid(fields[0].GetUInt64());
+            if (!sObjectMgr.GetPlayer(guid))
+                guids.push_back(guid);
+        } while (result->NextRow());
+
+        delete result;
+    }
+
+    if (guids.empty())
+        return ObjectGuid();
+
+    int index = urand(0, guids.size() - 1);
+    return guids[index];
+}
+
+void PlayerbotFactory::InitQuests()
+{
+    QueryResult *results = WorldDatabase.PQuery("SELECT entry, RequiredClasses, RequiredRaces FROM quest_template where QuestLevel = -1 and MinLevel <= '%u'",
+            bot->getLevel());
+    if (!results)
+        return;
+
+    list<uint32> ids;
+    do
+    {
+        Field* fields = results->Fetch();
+        uint32 questId = fields[0].GetUInt32();
+        uint32 requiredClasses = fields[1].GetUInt32();
+        uint32 requiredRaces = fields[2].GetUInt32();
+        if ((requiredClasses & bot->getClassMask()) && (requiredRaces & bot->getRaceMask()))
+            ids.push_back(questId);
+    } while (results->NextRow());
+
+    delete results;
+
+    for (int i = 0; i < 15; i++)
+    {
+        for (list<uint32>::iterator i = ids.begin(); i != ids.end(); ++i)
+        {
+			uint32 questId = *i;
+            Quest const *quest = sObjectMgr.GetQuestTemplate(questId);
+
+            bot->SetQuestStatus(questId, QUEST_STATUS_NONE);
+
+            if (!bot->SatisfyQuestClass(quest, false) ||
+                    !bot->SatisfyQuestRace(quest, false) ||
+                    !bot->SatisfyQuestStatus(quest, false))
+                continue;
+
+            if (quest->IsDailyOrWeekly() || quest->IsRepeatable() || quest->IsMonthly())
+                continue;
+
+            bot->SetQuestStatus(questId, QUEST_STATUS_COMPLETE);
+            bot->RewardQuest(quest, 0, bot, false);
+            ClearInventory();
+        }
+    }
+}
+
+void PlayerbotFactory::ClearInventory()
+{
+    DestroyItemsVisitor visitor(bot);
+    IterateItems(&visitor);
+}
+
+void PlayerbotFactory::InitAmmo()
+{
+    if (bot->getClass() != CLASS_HUNTER && bot->getClass() != CLASS_ROGUE && bot->getClass() != CLASS_WARRIOR)
+        return;
+
+    Item* const pItem = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED);
+    if (!pItem)
+        return;
+
+    uint32 subClass = 0;
+    switch (pItem->GetProto()->SubClass)
+    {
+    case ITEM_SUBCLASS_WEAPON_GUN:
+        subClass = ITEM_SUBCLASS_BULLET;
+        break;
+    case ITEM_SUBCLASS_WEAPON_BOW:
+    case ITEM_SUBCLASS_WEAPON_CROSSBOW:
+        subClass = ITEM_SUBCLASS_ARROW;
+        break;
+    }
+
+    if (!subClass)
+        return;
+
+    QueryResult *results = WorldDatabase.PQuery("select max(entry), max(RequiredLevel) from item_template where class = '%u' and subclass = '%u' and RequiredLevel <= '%u'",
+            ITEM_CLASS_PROJECTILE, subClass, bot->getLevel());
+    if (!results)
+        return;
+
+    Field* fields = results->Fetch();
+    if (fields)
+    {
+        uint32 entry = fields[0].GetUInt32();
+        for (int i = 0; i < 5; i++)
+        {
+            Item* newItem = bot->StoreNewItemInInventorySlot(entry, 1000);
+            if (newItem)
+                newItem->AddToUpdateQueueOf(bot);
+        }
+        bot->SetAmmo(entry);
+    }
+
+    delete results;
+}
+
+void PlayerbotFactory::InitMounts()
+{
+    map<uint32, map<int32, vector<uint32> > > allSpells;
+
+    for (uint32 spellId = 0; spellId < sSpellStore.GetNumRows(); ++spellId)
+    {
+        SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
+        if (!spellInfo || spellInfo->EffectApplyAuraName[0] != SPELL_AURA_MOUNTED)
+            continue;
+
+        if (GetSpellCastTime(spellInfo) < 500 || GetSpellDuration(spellInfo) != -1)
+            continue;
+
+        int32 effect = max(spellInfo->EffectBasePoints[1], spellInfo->EffectBasePoints[2]);
+        if (effect < 50)
+            continue;
+
+        uint32 index = (spellInfo->EffectApplyAuraName[1] == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED ||
+                spellInfo->EffectApplyAuraName[2] == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED) ? 1 : 0;
+        allSpells[index][effect].push_back(spellId);
+    }
+
+    for (uint32 type = 0; type < 2; ++type)
+    {
+        map<int32, vector<uint32> >& spells = allSpells[type];
+        for (map<int32, vector<uint32> >::iterator i = spells.begin(); i != spells.end(); ++i)
+        {
+            int32 effect = i->first;
+            vector<uint32>& ids = i->second;
+            uint32 index = urand(0, ids.size() - 1);
+            if (index >= ids.size())
+                continue;
+
+            bot->learnSpell(ids[index], false);
+        }
+    }
+}
+
+void PlayerbotFactory::InitPotions()
+{
+    map<uint32, vector<uint32> > items;
+    for (uint32 itemId = 0; itemId < sItemStorage.GetMaxEntry(); ++itemId)
+    {
+        ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+        if (!proto)
+            continue;
+
+        if (proto->Class != ITEM_CLASS_CONSUMABLE ||
+            proto->SubClass != ITEM_SUBCLASS_POTION ||
+            proto->Spells[0].SpellCategory != 4 ||
+            proto->Bonding != NO_BIND)
+            continue;
+
+        if (proto->RequiredLevel > bot->getLevel() || proto->RequiredLevel < bot->getLevel() - 10)
+            continue;
+
+        if (proto->RequiredSkill && !bot->HasSkill(proto->RequiredSkill))
+            continue;
+
+        if (proto->Area || proto->Map || proto->RequiredCityRank || proto->RequiredHonorRank)
+            continue;
+
+        for (int j = 0; j < MAX_ITEM_PROTO_SPELLS; j++)
+        {
+            const SpellEntry* const spellInfo = sSpellStore.LookupEntry(proto->Spells[j].SpellId);
+            if (!spellInfo)
+                continue;
+
+            for (int i = 0 ; i < 3; i++)
+            {
+                if (spellInfo->Effect[i] == SPELL_EFFECT_HEAL || spellInfo->Effect[i] == SPELL_EFFECT_ENERGIZE)
+                {
+                    items[spellInfo->Effect[i]].push_back(itemId);
+                    break;
+                }
+            }
+        }
+    }
+
+    uint32 effects[] = { SPELL_EFFECT_HEAL, SPELL_EFFECT_ENERGIZE };
+    for (int i = 0; i < sizeof(effects) / sizeof(uint32); ++i)
+    {
+        uint32 effect = effects[i];
+        vector<uint32>& ids = items[effect];
+        uint32 index = urand(0, ids.size() - 1);
+        if (index >= ids.size())
+            continue;
+
+        uint32 itemId = ids[index];
+        ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+        Item* newItem = bot->StoreNewItemInInventorySlot(itemId, urand(1, proto->GetMaxStackSize()));
+        if (newItem)
+            newItem->AddToUpdateQueueOf(bot);
+   }
+}
+
+void PlayerbotFactory::InitFood()
+{
+    map<uint32, vector<uint32> > items;
+    for (uint32 itemId = 0; itemId < sItemStorage.GetMaxEntry(); ++itemId)
+    {
+        ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+        if (!proto)
+            continue;
+
+        if (proto->Class != ITEM_CLASS_CONSUMABLE ||
+            proto->SubClass != ITEM_SUBCLASS_FOOD ||
+            (proto->Spells[0].SpellCategory != 11 && proto->Spells[0].SpellCategory != 59) ||
+            proto->Bonding != NO_BIND)
+            continue;
+
+        if (proto->RequiredLevel > bot->getLevel() || proto->RequiredLevel < bot->getLevel() - 10)
+            continue;
+
+        if (proto->RequiredSkill && !bot->HasSkill(proto->RequiredSkill))
+            continue;
+
+        if (proto->Area || proto->Map || proto->RequiredCityRank || proto->RequiredHonorRank)
+            continue;
+
+        items[proto->Spells[0].SpellCategory].push_back(itemId);
+    }
+
+    uint32 categories[] = { 11, 59 };
+    for (int i = 0; i < sizeof(categories) / sizeof(uint32); ++i)
+    {
+        uint32 category = categories[i];
+        vector<uint32>& ids = items[category];
+        uint32 index = urand(0, ids.size() - 1);
+        if (index >= ids.size())
+            continue;
+
+        uint32 itemId = ids[index];
+        ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+        Item* newItem = bot->StoreNewItemInInventorySlot(itemId, urand(1, proto->GetMaxStackSize()));
+        if (newItem)
+            newItem->AddToUpdateQueueOf(bot);
+   }
+}
+
+
+void PlayerbotFactory::CancelAuras()
+{
+    bot->RemoveAllAuras();
+}
+
+void PlayerbotFactory::InitInventory()
+{
+    InitInventoryTrade();
+    InitInventoryEquip();
+    InitInventorySkill();
+}
+
+void PlayerbotFactory::InitInventorySkill()
+{
+    if (bot->HasSkill(SKILL_MINING)) {
+        StoreItem(2901, 1); // Mining Pick
+    }
+    if (bot->HasSkill(SKILL_JEWELCRAFTING)) {
+        StoreItem(20815, 1); // Jeweler's Kit
+        StoreItem(20824, 1); // Simple Grinder
+    }
+    if (bot->HasSkill(SKILL_BLACKSMITHING) || bot->HasSkill(SKILL_ENGINEERING)) {
+        StoreItem(5956, 1); // Blacksmith Hammer
+    }
+    if (bot->HasSkill(SKILL_ENGINEERING)) {
+        StoreItem(6219, 1); // Arclight Spanner
+    }
+    if (bot->HasSkill(SKILL_ENCHANTING)) {
+        StoreItem(44452, 1); // Runed Titanium Rod
+    }
+    if (bot->HasSkill(SKILL_INSCRIPTION)) {
+        StoreItem(39505, 1); // Virtuoso Inking Set
+    }
+    if (bot->HasSkill(SKILL_SKINNING)) {
+        StoreItem(7005, 1); // Skinning Knife
+    }
+}
+
+Item* PlayerbotFactory::StoreItem(uint32 itemId, uint32 count)
+{
+    ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+    Item* newItem = bot->StoreNewItemInInventorySlot(itemId, min(count, proto->GetMaxStackSize()));
+    if (newItem)
+        newItem->AddToUpdateQueueOf(bot);
+
+    return newItem;
+}
+
+void PlayerbotFactory::InitInventoryTrade()
+{
+    vector<uint32> ids;
+    for (uint32 itemId = 0; itemId < sItemStorage.GetMaxEntry(); ++itemId)
+    {
+        ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+        if (!proto)
+            continue;
+
+        if (proto->Class != ITEM_CLASS_TRADE_GOODS || proto->Bonding != NO_BIND)
+            continue;
+
+        if (proto->ItemLevel < bot->getLevel())
+            continue;
+
+        if (proto->RequiredLevel > bot->getLevel() || proto->RequiredLevel < bot->getLevel() - 10)
+            continue;
+
+        if (proto->RequiredSkill && !bot->HasSkill(proto->RequiredSkill))
+            continue;
+
+        ids.push_back(itemId);
+    }
+
+    if (ids.empty())
+    {
+        sLog.outError("No trade items available for bot %s (%d level)", bot->GetName(), bot->getLevel());
+        return;
+    }
+
+    uint32 index = urand(0, ids.size() - 1);
+    if (index >= ids.size())
+        return;
+
+    uint32 itemId = ids[index];
+    ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+    if (!proto)
+        return;
+
+    uint32 count = 1, stacks = 1;
+    switch (proto->Quality)
+    {
+    case ITEM_QUALITY_NORMAL:
+        count = proto->GetMaxStackSize();
+        stacks = urand(1, 7) / auctionbot.GetRarityPriceMultiplier(proto);
+        break;
+    case ITEM_QUALITY_UNCOMMON:
+        stacks = 1;
+        count = urand(1, proto->GetMaxStackSize());
+        break;
+    case ITEM_QUALITY_RARE:
+        stacks = 1;
+        count = urand(1, min(uint32(3), proto->GetMaxStackSize()));
+        break;
+    }
+
+    for (uint32 i = 0; i < stacks; i++)
+        StoreItem(itemId, count);
+}
+
+void PlayerbotFactory::InitInventoryEquip()
+{
+    vector<uint32> ids;
+
+    uint32 desiredQuality = itemQuality;
+    if (urand(0, 100) < 100 * sPlayerbotAIConfig.randomGearLoweringChance && desiredQuality > ITEM_QUALITY_NORMAL) {
+        desiredQuality--;
+    }
+
+    for (uint32 itemId = 0; itemId < sItemStorage.GetMaxEntry(); ++itemId)
+    {
+        ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+        if (!proto)
+            continue;
+
+        if (proto->Class != ITEM_CLASS_ARMOR && proto->Class != ITEM_CLASS_WEAPON || (proto->Bonding == BIND_WHEN_PICKED_UP ||
+                proto->Bonding == BIND_WHEN_USE))
+            continue;
+
+        if (proto->Class == ITEM_CLASS_ARMOR && !CanEquipArmor(proto))
+            continue;
+
+        if (proto->Class == ITEM_CLASS_WEAPON && !CanEquipWeapon(proto))
+            continue;
+
+        if (!CanEquipItem(proto, desiredQuality))
+            continue;
+
+        ids.push_back(itemId);
+    }
+
+    int maxCount = urand(0, 3);
+    int count = 0;
+    for (int attempts = 0; attempts < 15; attempts++)
+    {
+        uint32 index = urand(0, ids.size() - 1);
+        if (index >= ids.size())
+            continue;
+
+        uint32 itemId = ids[index];
+        if (StoreItem(itemId, 1) && count++ >= maxCount)
+            break;
+   }
+}
+
+void PlayerbotFactory::InitGlyphs()
+{
+    bot->InitGlyphsForLevel();
+
+    for (uint32 slotIndex = 0; slotIndex < MAX_GLYPH_SLOT_INDEX; ++slotIndex)
+    {
+        bot->SetGlyph(slotIndex, 0);
+        bot->ApplyGlyph(slotIndex, false);
+    }
+
+    uint32 level = bot->getLevel();
+    uint32 maxSlot = 0;
+    if (level >= 15)
+        maxSlot = 2;
+    if (level >= 30)
+        maxSlot = 3;
+    if (level >= 50)
+        maxSlot = 4;
+    if (level >= 70)
+        maxSlot = 5;
+    if (level >= 80)
+        maxSlot = 6;
+
+    if (!maxSlot)
+        return;
+
+    list<uint32> glyphs;
+    for (uint32 itemId = 0; itemId < sItemStorage.GetMaxEntry(); ++itemId)
+    {
+        ItemPrototype const* proto = sObjectMgr.GetItemPrototype(itemId);
+        if (!proto)
+            continue;
+
+        if (proto->Class != ITEM_CLASS_GLYPH)
+            continue;
+
+        if ((proto->AllowableClass & bot->getClassMask()) == 0 || (proto->AllowableRace & bot->getRaceMask()) == 0)
+            continue;
+
+        for (uint32 spell = 0; spell < MAX_ITEM_PROTO_SPELLS; spell++)
+        {
+            uint32 spellId = proto->Spells[spell].SpellId;
+            SpellEntry const *entry = sSpellStore.LookupEntry(spellId);
+            if (!entry)
+                continue;
+
+            for (uint32 effect = 0; effect < MAX_EFFECT_INDEX; ++effect)
+            {
+                if (entry->Effect[effect] != SPELL_EFFECT_APPLY_GLYPH)
+                    continue;
+
+                uint32 glyph = entry->EffectMiscValue[effect];
+                glyphs.push_back(glyph);
+            }
+        }
+    }
+
+    if (glyphs.empty())
+    {
+        sLog.outError("No glyphs found for bot %s", bot->GetName());
+        return;
+    }
+
+    set<uint32> chosen;
+    for (uint32 slotIndex = 0; slotIndex < maxSlot; ++slotIndex)
+    {
+        uint32 slot = bot->GetGlyphSlot(slotIndex);
+        GlyphSlotEntry const *gs = sGlyphSlotStore.LookupEntry(slot);
+        if (!gs)
+            continue;
+
+        vector<uint32> ids;
+        for (list<uint32>::iterator i = glyphs.begin(); i != glyphs.end(); ++i)
+        {
+            uint32 id = *i;
+            GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(id);
+            if (!gp || gp->TypeFlags != gs->TypeFlags)
+                continue;
+
+            ids.push_back(id);
+        }
+
+        int maxCount = urand(0, 3);
+        int count = 0;
+        bool found = false;
+        for (int attempts = 0; attempts < 15; ++attempts)
+        {
+            uint32 index = urand(0, ids.size() - 1);
+            if (index >= ids.size())
+                continue;
+
+            uint32 id = ids[index];
+            if (chosen.find(id) != chosen.end())
+                continue;
+
+            chosen.insert(id);
+
+            bot->SetGlyph(slotIndex, id);
+            found = true;
+            break;
+        }
+        if (!found)
+            sLog.outError("No glyphs found for bot %s index %d slot %d", bot->GetName(), slotIndex, slot);
+    }
+
+    bot->ApplyGlyphs(true);
+}
diff --git a/src/game/playerbot/PlayerbotFactory.h b/src/game/playerbot/PlayerbotFactory.h
new file mode 100644
index 00000000000..a3e76440159
--- /dev/null
+++ b/src/game/playerbot/PlayerbotFactory.h
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "strategy/actions/InventoryAction.h"
+
+class Player;
+class PlayerbotMgr;
+class ChatHandler;
+
+using namespace std;
+using ai::InventoryAction;
+
+class PlayerbotFactory : public InventoryAction
+{
+public:
+    PlayerbotFactory(Player* bot, uint32 level, uint32 itemQuality = 0) :
+        bot(bot), level(level), itemQuality(itemQuality), InventoryAction(bot->GetPlayerbotAI(), "factory") {}
+
+    static ObjectGuid GetRandomBot();
+    void CleanRandomize();
+    void Randomize();
+    void Refresh();
+
+private:
+    void Randomize(bool incremental);
+    void Prepare();
+    void InitSecondEquipmentSet();
+    void InitEquipment(bool incremental);
+    bool CanEquipItem(ItemPrototype const* proto, uint32 desiredQuality);
+    bool CanEquipUnseenItem(uint8 slot, uint16 &dest, uint32 item);
+    void InitSkills();
+    void InitTradeSkills();
+    void UpdateTradeSkills();
+    void SetRandomSkill(uint16 id);
+    void InitSpells();
+    void ClearSpells();
+    void InitAvailableSpells();
+    void InitSpecialSpells();
+    void InitTalents();
+    void InitTalents(uint32 specNo);
+    void InitQuests();
+    void InitPet();
+    void ClearInventory();
+    void InitAmmo();
+    void InitMounts();
+    void InitPotions();
+    void InitFood();
+    bool CanEquipArmor(ItemPrototype const* proto);
+    bool CanEquipWeapon(ItemPrototype const* proto);
+    void EnchantItem(Item* item);
+    void AddItemStats(uint32 mod, uint8 &sp, uint8 &ap, uint8 &tank);
+    bool CheckItemStats(uint8 sp, uint8 ap, uint8 tank);
+    void CancelAuras();
+    bool IsDesiredReplacement(Item* item);
+    void InitBags();
+    void InitInventory();
+    void InitInventoryTrade();
+    void InitInventoryEquip();
+    void InitInventorySkill();
+    Item* StoreItem(uint32 itemId, uint32 count);
+    void InitGlyphs();
+
+private:
+    Player* bot;
+    uint32 level;
+    uint32 itemQuality;
+    static uint32 tradeSkills[];
+};
diff --git a/src/game/playerbot/PlayerbotMgr.cpp b/src/game/playerbot/PlayerbotMgr.cpp
new file mode 100644
index 00000000000..ffc3bc9fa09
--- /dev/null
+++ b/src/game/playerbot/PlayerbotMgr.cpp
@@ -0,0 +1,469 @@
+#include "Config/Config.h"
+#include "../pchdef.h"
+#include "playerbot.h"
+#include "PlayerbotAIConfig.h"
+#include "PlayerbotFactory.h"
+#include "../AccountMgr.h"
+#include "RandomPlayerbotMgr.h"
+
+
+class LoginQueryHolder;
+class CharacterHandler;
+
+PlayerbotHolder::PlayerbotHolder() : PlayerbotAIBase()
+{
+    for (uint32 spellId = 0; spellId < sSpellStore.GetNumRows(); spellId++)
+        sSpellStore.LookupEntry(spellId);
+}
+
+PlayerbotHolder::~PlayerbotHolder()
+{
+    LogoutAllBots();
+}
+
+
+void PlayerbotHolder::UpdateAIInternal(uint32 elapsed)
+{
+}
+
+void PlayerbotHolder::UpdateSessions(uint32 elapsed)
+{
+    for (PlayerBotMap::const_iterator itr = GetPlayerBotsBegin(); itr != GetPlayerBotsEnd(); ++itr)
+    {
+        Player* const bot = itr->second;
+        if (bot->IsBeingTeleported())
+        {
+            bot->GetPlayerbotAI()->HandleTeleportAck();
+        }
+        else if (bot->IsInWorld())
+        {
+            bot->GetSession()->HandleBotPackets();
+        }
+    }
+}
+
+void PlayerbotHolder::LogoutAllBots()
+{
+    while (true)
+    {
+        PlayerBotMap::const_iterator itr = GetPlayerBotsBegin();
+        if (itr == GetPlayerBotsEnd()) break;
+        Player* bot= itr->second;
+        LogoutPlayerBot(bot->GetObjectGuid().GetRawValue());
+    }
+}
+
+void PlayerbotHolder::LogoutPlayerBot(uint64 guid)
+{
+    Player* bot = GetPlayerBot(guid);
+    if (bot)
+    {
+        bot->GetPlayerbotAI()->TellMaster("Goodbye!");
+        //bot->SaveToDB();
+
+        WorldSession * botWorldSessionPtr = bot->GetSession();
+        playerBots.erase(guid);    // deletes bot player ptr inside this WorldSession PlayerBotMap
+        botWorldSessionPtr->LogoutPlayer(true); // this will delete the bot Player object and PlayerbotAI object
+        delete botWorldSessionPtr;  // finally delete the bot's WorldSession
+    }
+}
+
+Player* PlayerbotHolder::GetPlayerBot(uint64 playerGuid) const
+{
+    PlayerBotMap::const_iterator it = playerBots.find(playerGuid);
+    return (it == playerBots.end()) ? 0 : it->second;
+}
+
+void PlayerbotHolder::OnBotLogin(Player * const bot)
+{
+    PlayerbotAI* ai = new PlayerbotAI(bot);
+    bot->SetPlayerbotAI(ai);
+    OnBotLoginInternal(bot);
+
+    playerBots[bot->GetObjectGuid().GetRawValue()] = bot;
+
+    Player* master = ai->GetMaster();
+    if (master)
+    {
+        ObjectGuid masterGuid = master->GetObjectGuid();
+        if (master->GetGroup() &&
+            ! master->GetGroup()->IsLeader(masterGuid))
+            master->GetGroup()->ChangeLeader(masterGuid);
+    }
+
+    Group *group = bot->GetGroup();
+    if (group)
+    {
+        bool groupValid = false;
+        Group::MemberSlotList const& slots = group->GetMemberSlots();
+        for (Group::MemberSlotList::const_iterator i = slots.begin(); i != slots.end(); ++i)
+        {
+            ObjectGuid member = i->guid;
+            uint32 account = sAccountMgr.GetPlayerAccountIdByGUID(member);
+            if (!sPlayerbotAIConfig.IsInRandomAccountList(account))
+            {
+                groupValid = true;
+                break;
+            }
+        }
+
+        if (!groupValid)
+        {
+            WorldPacket p;
+            string member = bot->GetName();
+            p << uint32(PARTY_OP_LEAVE) << member << uint32(0);
+            bot->GetSession()->HandleGroupDisbandOpcode(p);
+        }
+    }
+
+    ai->ResetStrategies();
+    ai->TellMaster("Hello!");
+}
+
+bool PlayerbotHolder::ProcessBotCommand(string cmd, ObjectGuid guid, bool admin, uint32 masterAccountId, uint32 masterGuildId)
+{
+    if (!sPlayerbotAIConfig.enabled || guid.IsEmpty())
+        return false;
+
+    uint32 botAccount = sObjectMgr.GetPlayerAccountIdByGUID(guid);
+    bool isRandomBot = sRandomPlayerbotMgr.IsRandomBot(guid);
+    bool isRandomAccount = sPlayerbotAIConfig.IsInRandomAccountList(botAccount);
+    bool isMasterAccount = (masterAccountId == botAccount);
+
+    if (isRandomAccount && !isRandomBot && !admin)
+    {
+        Player* bot = sObjectMgr.GetPlayer(guid, false);
+        if (bot->GetGuildId() != masterGuildId)
+            return false;
+    }
+
+    if (!isRandomAccount && !isMasterAccount && !admin)
+        return false;
+
+    if (cmd == "add" || cmd == "login")
+    {
+        if (sObjectMgr.GetPlayer(guid, true))
+            return false;
+
+        AddPlayerBot(guid.GetRawValue(), masterAccountId);
+        return true;
+    }
+    else if (cmd == "remove" || cmd == "logout" || cmd == "rm")
+    {
+        if (!GetPlayerBot(guid.GetRawValue()))
+            return false;
+
+        LogoutPlayerBot(guid.GetRawValue());
+        return true;
+    }
+
+    if (admin)
+    {
+        Player* bot = GetPlayerBot(guid.GetRawValue());
+        if (!bot)
+            return false;
+
+        Player* master = bot->GetPlayerbotAI()->GetMaster();
+        if (master)
+        {
+            if (cmd == "init=white" || cmd == "init=common")
+            {
+                PlayerbotFactory factory(bot, master->getLevel(), ITEM_QUALITY_NORMAL);
+                factory.CleanRandomize();
+                return true;
+            }
+            else if (cmd == "init=green" || cmd == "init=uncommon")
+            {
+                PlayerbotFactory factory(bot, master->getLevel(), ITEM_QUALITY_UNCOMMON);
+                factory.CleanRandomize();
+                return true;
+            }
+            else if (cmd == "init=blue" || cmd == "init=rare")
+            {
+                PlayerbotFactory factory(bot, master->getLevel(), ITEM_QUALITY_RARE);
+                factory.CleanRandomize();
+                return true;
+            }
+            else if (cmd == "init=epic" || cmd == "init=purple")
+            {
+                PlayerbotFactory factory(bot, master->getLevel(), ITEM_QUALITY_EPIC);
+                factory.CleanRandomize();
+                return true;
+            }
+        }
+
+        if (cmd == "update")
+        {
+            PlayerbotFactory factory(bot, bot->getLevel());
+            factory.Refresh();
+            return true;
+        }
+        else if (cmd == "random")
+        {
+            sRandomPlayerbotMgr.Randomize(bot);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool ChatHandler::HandlePlayerbotCommand(char* args)
+{
+	if (!sPlayerbotAIConfig.enabled)
+	{
+		PSendSysMessage("|cffff0000Playerbot system is currently disabled!");
+        SetSentErrorMessage(true);
+        return false;
+	}
+
+    if (!m_session)
+    {
+        PSendSysMessage("You may only add bots from an active session");
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    Player* player = m_session->GetPlayer();
+    PlayerbotMgr* mgr = player->GetPlayerbotMgr();
+    if (!mgr)
+    {
+        PSendSysMessage("you cannot control bots yet");
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    list<string> messages = mgr->HandlePlayerbotCommand(args, player);
+    if (messages.empty())
+        return true;
+
+    for (list<string>::iterator i = messages.begin(); i != messages.end(); ++i)
+    {
+        PSendSysMessage(i->c_str());
+    }
+    SetSentErrorMessage(true);
+    return false;
+}
+
+list<string> PlayerbotHolder::HandlePlayerbotCommand(char* args, Player* master)
+{
+    list<string> messages;
+
+    if (!*args)
+    {
+        messages.push_back("usage: add/init/remove PLAYERNAME");
+        return messages;
+    }
+
+    char *cmd = strtok ((char*)args, " ");
+    char *charname = strtok (NULL, " ");
+    if (!cmd || !charname)
+    {
+        messages.push_back("usage: add/init/remove PLAYERNAME");
+        return messages;
+    }
+
+    std::string cmdStr = cmd;
+    std::string charnameStr = charname;
+
+    set<string> bots;
+    if (charnameStr == "*" && master)
+    {
+        Group* group = master->GetGroup();
+        if (!group)
+        {
+            messages.push_back("you must be in group");
+            return messages;
+        }
+
+        Group::MemberSlotList slots = group->GetMemberSlots();
+        for (Group::member_citerator i = slots.begin(); i != slots.end(); i++)
+        {
+			ObjectGuid member = i->guid;
+
+			if (member == master->GetObjectGuid())
+				continue;
+
+			string bot;
+			if (sObjectMgr.GetPlayerNameByGUID(member, bot))
+			    bots.insert(bot);
+        }
+    }
+
+    if (charnameStr == "!" && master && master->GetSession()->GetSecurity() > SEC_GAMEMASTER)
+    {
+        for (PlayerBotMap::const_iterator i = GetPlayerBotsBegin(); i != GetPlayerBotsEnd(); ++i)
+        {
+            Player* bot = i->second;
+            if (bot && bot->IsInWorld())
+                bots.insert(bot->GetName());
+        }
+    }
+
+    vector<string> chars = split(charnameStr, ',');
+    for (vector<string>::iterator i = chars.begin(); i != chars.end(); i++)
+    {
+        string s = *i;
+
+        uint32 accountId = GetAccountId(s);
+        if (!accountId)
+        {
+            bots.insert(s);
+            continue;
+        }
+
+        QueryResult* results = CharacterDatabase.PQuery(
+            "SELECT name FROM characters WHERE account = '%u'",
+            accountId);
+        if (results)
+        {
+            do
+            {
+                Field* fields = results->Fetch();
+                string charName = fields[0].GetCppString();
+                bots.insert(charName);
+            } while (results->NextRow());
+
+            delete results;
+        }
+	}
+
+    for (set<string>::iterator i = bots.begin(); i != bots.end(); ++i)
+    {
+        string bot = *i;
+        ostringstream out;
+        out << cmdStr << ": " << bot << " - ";
+
+        ObjectGuid member = sObjectMgr.GetPlayerGuidByName(bot);
+        bool result = false;
+        if (master && member != master->GetObjectGuid())
+        {
+            result = ProcessBotCommand(cmdStr, member,
+                    master->GetSession()->GetSecurity() >= SEC_GAMEMASTER,
+                    master->GetSession()->GetAccountId(),
+                    master->GetGuildId());
+        }
+        else if (!master)
+        {
+            result = ProcessBotCommand(cmdStr, member, true, -1, -1);
+        }
+
+        out << (result ? "ok" : "not allowed");
+        messages.push_back(out.str());
+    }
+
+    return messages;
+}
+
+uint32 PlayerbotHolder::GetAccountId(string name)
+{
+    uint32 accountId = 0;
+
+    QueryResult *results = LoginDatabase.PQuery("SELECT id FROM account WHERE username = '%s'", name.c_str());
+    if(results)
+    {
+        Field* fields = results->Fetch();
+        accountId = fields[0].GetUInt32();
+        delete results;
+    }
+
+    return accountId;
+}
+
+
+
+PlayerbotMgr::PlayerbotMgr(Player* const master) : PlayerbotHolder(),  master(master)
+{
+}
+
+PlayerbotMgr::~PlayerbotMgr()
+{
+}
+
+void PlayerbotMgr::UpdateAIInternal(uint32 elapsed)
+{
+    SetNextCheckDelay(sPlayerbotAIConfig.reactDelay);
+}
+
+void PlayerbotMgr::HandleCommand(uint32 type, const string& text)
+{
+    Player *master = GetMaster();
+    if (!master)
+        return;
+
+    for (PlayerBotMap::const_iterator it = GetPlayerBotsBegin(); it != GetPlayerBotsEnd(); ++it)
+    {
+        Player* const bot = it->second;
+        bot->GetPlayerbotAI()->HandleCommand(type, text, *master);
+    }
+
+    for (PlayerBotMap::const_iterator it = sRandomPlayerbotMgr.GetPlayerBotsBegin(); it != sRandomPlayerbotMgr.GetPlayerBotsEnd(); ++it)
+    {
+        Player* const bot = it->second;
+        if (bot->GetPlayerbotAI()->GetMaster() == master)
+            bot->GetPlayerbotAI()->HandleCommand(type, text, *master);
+    }
+}
+
+void PlayerbotMgr::HandleMasterIncomingPacket(const WorldPacket& packet)
+{
+    for (PlayerBotMap::const_iterator it = GetPlayerBotsBegin(); it != GetPlayerBotsEnd(); ++it)
+    {
+        Player* const bot = it->second;
+        bot->GetPlayerbotAI()->HandleMasterIncomingPacket(packet);
+    }
+
+    for (PlayerBotMap::const_iterator it = sRandomPlayerbotMgr.GetPlayerBotsBegin(); it != sRandomPlayerbotMgr.GetPlayerBotsEnd(); ++it)
+    {
+        Player* const bot = it->second;
+        if (bot->GetPlayerbotAI()->GetMaster() == GetMaster())
+            bot->GetPlayerbotAI()->HandleMasterIncomingPacket(packet);
+    }
+
+    switch (packet.GetOpcode())
+    {
+        // if master is logging out, log out all bots
+        case CMSG_LOGOUT_REQUEST:
+        {
+            LogoutAllBots();
+            return;
+        }
+    }
+}
+void PlayerbotMgr::HandleMasterOutgoingPacket(const WorldPacket& packet)
+{
+    for (PlayerBotMap::const_iterator it = GetPlayerBotsBegin(); it != GetPlayerBotsEnd(); ++it)
+    {
+        Player* const bot = it->second;
+        bot->GetPlayerbotAI()->HandleMasterOutgoingPacket(packet);
+    }
+
+    for (PlayerBotMap::const_iterator it = sRandomPlayerbotMgr.GetPlayerBotsBegin(); it != sRandomPlayerbotMgr.GetPlayerBotsEnd(); ++it)
+    {
+        Player* const bot = it->second;
+        if (bot->GetPlayerbotAI()->GetMaster() == GetMaster())
+            bot->GetPlayerbotAI()->HandleMasterOutgoingPacket(packet);
+    }
+}
+
+void PlayerbotMgr::SaveToDB()
+{
+    for (PlayerBotMap::const_iterator it = GetPlayerBotsBegin(); it != GetPlayerBotsEnd(); ++it)
+    {
+        Player* const bot = it->second;
+        bot->SaveToDB();
+    }
+    for (PlayerBotMap::const_iterator it = sRandomPlayerbotMgr.GetPlayerBotsBegin(); it != sRandomPlayerbotMgr.GetPlayerBotsEnd(); ++it)
+    {
+        Player* const bot = it->second;
+        if (bot->GetPlayerbotAI()->GetMaster() == GetMaster())
+            bot->SaveToDB();
+    }
+}
+
+void PlayerbotMgr::OnBotLoginInternal(Player * const bot)
+{
+    bot->GetPlayerbotAI()->SetMaster(master);
+    bot->GetPlayerbotAI()->ResetStrategies();
+}
+
diff --git a/src/game/playerbot/PlayerbotMgr.h b/src/game/playerbot/PlayerbotMgr.h
new file mode 100644
index 00000000000..d675cee2815
--- /dev/null
+++ b/src/game/playerbot/PlayerbotMgr.h
@@ -0,0 +1,67 @@
+#ifndef _PLAYERBOTMGR_H
+#define _PLAYERBOTMGR_H
+
+#include "Common.h"
+#include "PlayerbotAIBase.h"
+
+class WorldPacket;
+class Player;
+class Unit;
+class Object;
+class Item;
+
+typedef UNORDERED_MAP<uint64, Player*> PlayerBotMap;
+
+class MANGOS_DLL_SPEC PlayerbotHolder : public PlayerbotAIBase
+{
+public:
+    PlayerbotHolder();
+    virtual ~PlayerbotHolder();
+
+    void AddPlayerBot(uint64 guid, uint32 masterAccountId);
+    void LogoutPlayerBot(uint64 guid);
+    Player* GetPlayerBot (uint64 guid) const;
+    PlayerBotMap::const_iterator GetPlayerBotsBegin() const { return playerBots.begin(); }
+    PlayerBotMap::const_iterator GetPlayerBotsEnd()   const { return playerBots.end();   }
+
+    virtual void UpdateAIInternal(uint32 elapsed);
+    void UpdateSessions(uint32 elapsed);
+
+    void LogoutAllBots();
+    void OnBotLogin(Player * const bot);
+
+    list<string> HandlePlayerbotCommand(char* args, Player* master = NULL);
+    bool ProcessBotCommand(string cmd, ObjectGuid guid, bool admin, uint32 masterAccountId, uint32 masterGuildId);
+    uint32 GetAccountId(string name);
+
+protected:
+    virtual void OnBotLoginInternal(Player * const bot) = 0;
+
+protected:
+    PlayerBotMap playerBots;
+};
+
+class MANGOS_DLL_SPEC PlayerbotMgr : public PlayerbotHolder
+{
+public:
+    PlayerbotMgr(Player* const master);
+    virtual ~PlayerbotMgr();
+
+    void HandleMasterIncomingPacket(const WorldPacket& packet);
+    void HandleMasterOutgoingPacket(const WorldPacket& packet);
+    void HandleCommand(uint32 type, const string& text);
+
+    virtual void UpdateAIInternal(uint32 elapsed);
+
+    Player* GetMaster() const { return master; };
+
+    void SaveToDB();
+
+protected:
+    virtual void OnBotLoginInternal(Player * const bot);
+
+private:
+    Player* const master;
+};
+
+#endif
diff --git a/src/game/playerbot/PlayerbotSecurity.cpp b/src/game/playerbot/PlayerbotSecurity.cpp
new file mode 100644
index 00000000000..285aff67fff
--- /dev/null
+++ b/src/game/playerbot/PlayerbotSecurity.cpp
@@ -0,0 +1,188 @@
+#include "Config/Config.h"
+#include "../pchdef.h"
+#include "PlayerbotMgr.h"
+#include "playerbot.h"
+#include "PlayerbotAIConfig.h"
+#include "PlayerbotAI.h"
+#include "ChatHelper.h"
+
+PlayerbotSecurity::PlayerbotSecurity(Player* const bot) : bot(bot)
+{
+    if (bot)
+        account = sObjectMgr.GetPlayerAccountIdByGUID(bot->GetObjectGuid());
+}
+
+PlayerbotSecurityLevel PlayerbotSecurity::LevelFor(Player* from, DenyReason* reason, bool ignoreGroup)
+{
+    if (from->GetSession()->GetSecurity() >= SEC_GAMEMASTER)
+        return PLAYERBOT_SECURITY_ALLOW_ALL;
+
+    if (from->GetPlayerbotAI())
+    {
+        if (reason) *reason = PLAYERBOT_DENY_IS_BOT;
+        return PLAYERBOT_SECURITY_DENY_ALL;
+    }
+
+    if (bot->GetPlayerbotAI()->IsOpposing(from))
+    {
+        if (reason) *reason = PLAYERBOT_DENY_OPPOSING;
+        return PLAYERBOT_SECURITY_DENY_ALL;
+    }
+
+    if (sPlayerbotAIConfig.IsInRandomAccountList(account))
+    {
+        if (bot->GetPlayerbotAI()->IsOpposing(from))
+        {
+            if (reason) *reason = PLAYERBOT_DENY_OPPOSING;
+            return PLAYERBOT_SECURITY_DENY_ALL;
+        }
+
+        Group* group = from->GetGroup();
+        if (group)
+        {
+            for (GroupReference *gref = group->GetFirstMember(); gref; gref = gref->next())
+            {
+                Player* player = gref->getSource();
+                if (player == bot && !ignoreGroup)
+                    return PLAYERBOT_SECURITY_ALLOW_ALL;
+            }
+        }
+
+        if ((int)bot->getLevel() - (int)from->getLevel() > 5)
+        {
+            if (reason) *reason = PLAYERBOT_DENY_LOW_LEVEL;
+            return PLAYERBOT_SECURITY_TALK;
+        }
+
+        if (bot->GetMapId() != from->GetMapId() || bot->GetDistance(from) > sPlayerbotAIConfig.whisperDistance)
+        {
+            if (!bot->GetGuildId() || bot->GetGuildId() != from->GetGuildId())
+            {
+                if (reason) *reason = PLAYERBOT_DENY_FAR;
+                return PLAYERBOT_SECURITY_TALK;
+            }
+        }
+
+        int botGS = (int)bot->GetEquipGearScore(false, false);
+        int fromGS = (int)from->GetEquipGearScore(false, false);
+        if (botGS && bot->getLevel() > 15 && (100 * (botGS - fromGS) / botGS) >= 20)
+        {
+            if (reason) *reason = PLAYERBOT_DENY_GEARSCORE;
+            return PLAYERBOT_SECURITY_TALK;
+        }
+
+        if (bot->isDead())
+        {
+            if (reason) *reason = PLAYERBOT_DENY_DEAD;
+            return PLAYERBOT_SECURITY_TALK;
+        }
+
+        group = bot->GetGroup();
+        if (!group)
+        {
+            if (reason) *reason = PLAYERBOT_DENY_INVITE;
+            return PLAYERBOT_SECURITY_INVITE;
+        }
+
+        for (GroupReference *gref = group->GetFirstMember(); gref; gref = gref->next())
+        {
+            Player* player = gref->getSource();
+            if (player == from)
+                return PLAYERBOT_SECURITY_ALLOW_ALL;
+        }
+
+        if (group->IsFull())
+        {
+            if (reason) *reason = PLAYERBOT_DENY_FULL_GROUP;
+            return PLAYERBOT_SECURITY_TALK;
+        }
+
+        if (reason) *reason = PLAYERBOT_DENY_INVITE;
+        return PLAYERBOT_SECURITY_INVITE;
+    }
+
+    return PLAYERBOT_SECURITY_ALLOW_ALL;
+}
+
+bool PlayerbotSecurity::CheckLevelFor(PlayerbotSecurityLevel level, bool silent, Player* from, bool ignoreGroup)
+{
+    DenyReason reason = PLAYERBOT_DENY_NONE;
+    PlayerbotSecurityLevel realLevel = LevelFor(from, &reason, ignoreGroup);
+    if (realLevel >= level)
+        return true;
+
+    if (silent || from->GetPlayerbotAI())
+        return false;
+
+    Player* master = bot->GetPlayerbotAI()->GetMaster();
+    if (master && bot->GetPlayerbotAI() && bot->GetPlayerbotAI()->IsOpposing(master) && master->GetSession()->GetSecurity() < SEC_GAMEMASTER)
+        return false;
+
+    ostringstream out;
+    switch (realLevel)
+    {
+    case PLAYERBOT_SECURITY_DENY_ALL:
+        out << "I'm kind of busy now";
+        break;
+    case PLAYERBOT_SECURITY_TALK:
+        switch (reason)
+        {
+        case PLAYERBOT_DENY_NONE:
+            out << "I'll do it later";
+            break;
+        case PLAYERBOT_DENY_LOW_LEVEL:
+            out << "You are too low level: |cffff0000" << from->getLevel() << "|cffffffff/|cff00ff00" << bot->getLevel();
+            break;
+        case PLAYERBOT_DENY_GEARSCORE:
+            {
+                int botGS = (int)bot->GetEquipGearScore(false, false);
+                int fromGS = (int)from->GetEquipGearScore(false, false);
+                out << "Your gearscore is too low: |cffff0000" << fromGS << "|cffffffff/|cff00ff00" << botGS;
+            }
+            break;
+        case PLAYERBOT_DENY_NOT_YOURS:
+            out << "I have a master already";
+            break;
+        case PLAYERBOT_DENY_IS_BOT:
+            out << "You are a bot";
+            break;
+        case PLAYERBOT_DENY_OPPOSING:
+            out << "You are the enemy";
+            break;
+        case PLAYERBOT_DENY_DEAD:
+            out << "I'm dead. Will do it later";
+            break;
+        case PLAYERBOT_DENY_INVITE:
+            out << "Invite me to your group first";
+            break;
+        case PLAYERBOT_DENY_FAR:
+            {
+                out << "I am too far away";
+
+                uint32 area = bot->GetAreaId();
+                if (area)
+                {
+                    const AreaTableEntry* entry = sAreaStore.LookupEntry(area);
+                    if (entry)
+                    {
+                        out << " |cffffffff(|cffff0000" << entry->area_name[0] << "|cffffffff)";
+                    }
+                }
+            }
+            break;
+        case PLAYERBOT_DENY_FULL_GROUP:
+            out << "I am in a full group. Will do it later";
+            break;
+        default:
+            out << "I can't do that";
+            break;
+        }
+        break;
+    case PLAYERBOT_SECURITY_INVITE:
+        out << "Invite me to your group first";
+        break;
+    }
+
+	bot->Whisper(out.str(), LANG_UNIVERSAL, from->GetObjectGuid());
+    return false;
+}
diff --git a/src/game/playerbot/PlayerbotSecurity.h b/src/game/playerbot/PlayerbotSecurity.h
new file mode 100644
index 00000000000..5491765c265
--- /dev/null
+++ b/src/game/playerbot/PlayerbotSecurity.h
@@ -0,0 +1,42 @@
+#ifndef _PlayerbotSecurity_H
+#define _PlayerbotSecurity_H
+
+using namespace std;
+
+enum PlayerbotSecurityLevel
+{
+    PLAYERBOT_SECURITY_DENY_ALL = 0,
+    PLAYERBOT_SECURITY_TALK = 1,
+    PLAYERBOT_SECURITY_INVITE = 2,
+    PLAYERBOT_SECURITY_ALLOW_ALL = 3
+};
+
+enum DenyReason
+{
+    PLAYERBOT_DENY_NONE,
+    PLAYERBOT_DENY_LOW_LEVEL,
+    PLAYERBOT_DENY_GEARSCORE,
+    PLAYERBOT_DENY_NOT_YOURS,
+    PLAYERBOT_DENY_IS_BOT,
+    PLAYERBOT_DENY_OPPOSING,
+    PLAYERBOT_DENY_DEAD,
+    PLAYERBOT_DENY_FAR,
+    PLAYERBOT_DENY_INVITE,
+    PLAYERBOT_DENY_FULL_GROUP
+};
+
+class MANGOS_DLL_SPEC PlayerbotSecurity
+{
+    public:
+        PlayerbotSecurity(Player* const bot);
+
+	public:
+        PlayerbotSecurityLevel LevelFor(Player* from, DenyReason* reason = NULL, bool ignoreGroup = false);
+        bool CheckLevelFor(PlayerbotSecurityLevel level, bool silent, Player* from, bool ignoreGroup = false);
+
+    private:
+        Player* const bot;
+        uint32 account;
+};
+
+#endif
diff --git a/src/game/playerbot/RandomPlayerbotFactory.cpp b/src/game/playerbot/RandomPlayerbotFactory.cpp
new file mode 100644
index 00000000000..537a6821b40
--- /dev/null
+++ b/src/game/playerbot/RandomPlayerbotFactory.cpp
@@ -0,0 +1,149 @@
+#include "Config/Config.h"
+#include "../pchdef.h"
+#include "playerbot.h"
+#include "PlayerbotAIConfig.h"
+#include "PlayerbotFactory.h"
+#include "../AccountMgr.h"
+#include "../ObjectMgr.h"
+#include "../../shared/Database/DatabaseEnv.h"
+#include "PlayerbotAI.h"
+#include "../Player.h"
+#include "RandomPlayerbotFactory.h"
+#include "SystemConfig.h"
+
+map<uint8, vector<uint8> > RandomPlayerbotFactory::availableRaces;
+
+RandomPlayerbotFactory::RandomPlayerbotFactory(uint32 accountId) : accountId(accountId)
+{
+    availableRaces[CLASS_WARRIOR].push_back(RACE_HUMAN);
+    availableRaces[CLASS_WARRIOR].push_back(RACE_NIGHTELF);
+    availableRaces[CLASS_WARRIOR].push_back(RACE_GNOME);
+    availableRaces[CLASS_WARRIOR].push_back(RACE_DWARF);
+    availableRaces[CLASS_WARRIOR].push_back(RACE_ORC);
+    availableRaces[CLASS_WARRIOR].push_back(RACE_UNDEAD);
+    availableRaces[CLASS_WARRIOR].push_back(RACE_TAUREN);
+    availableRaces[CLASS_WARRIOR].push_back(RACE_TROLL);
+    availableRaces[CLASS_WARRIOR].push_back(RACE_DRAENEI);
+
+    availableRaces[CLASS_PALADIN].push_back(RACE_HUMAN);
+    availableRaces[CLASS_PALADIN].push_back(RACE_DWARF);
+    availableRaces[CLASS_PALADIN].push_back(RACE_DRAENEI);
+    availableRaces[CLASS_PALADIN].push_back(RACE_BLOODELF);
+
+    availableRaces[CLASS_ROGUE].push_back(RACE_HUMAN);
+    availableRaces[CLASS_ROGUE].push_back(RACE_DWARF);
+    availableRaces[CLASS_ROGUE].push_back(RACE_NIGHTELF);
+    availableRaces[CLASS_ROGUE].push_back(RACE_GNOME);
+    availableRaces[CLASS_ROGUE].push_back(RACE_ORC);
+    availableRaces[CLASS_ROGUE].push_back(RACE_TROLL);
+    availableRaces[CLASS_ROGUE].push_back(RACE_BLOODELF);
+
+    availableRaces[CLASS_PRIEST].push_back(RACE_HUMAN);
+    availableRaces[CLASS_PRIEST].push_back(RACE_DWARF);
+    availableRaces[CLASS_PRIEST].push_back(RACE_NIGHTELF);
+    availableRaces[CLASS_PRIEST].push_back(RACE_DRAENEI);
+    availableRaces[CLASS_PRIEST].push_back(RACE_TROLL);
+    availableRaces[CLASS_PRIEST].push_back(RACE_UNDEAD);
+    availableRaces[CLASS_PRIEST].push_back(RACE_BLOODELF);
+
+    availableRaces[CLASS_MAGE].push_back(RACE_HUMAN);
+    availableRaces[CLASS_MAGE].push_back(RACE_GNOME);
+    availableRaces[CLASS_MAGE].push_back(RACE_DRAENEI);
+    availableRaces[CLASS_MAGE].push_back(RACE_UNDEAD);
+    availableRaces[CLASS_MAGE].push_back(RACE_TROLL);
+    availableRaces[CLASS_MAGE].push_back(RACE_BLOODELF);
+
+    availableRaces[CLASS_WARLOCK].push_back(RACE_HUMAN);
+    availableRaces[CLASS_WARLOCK].push_back(RACE_GNOME);
+    availableRaces[CLASS_WARLOCK].push_back(RACE_UNDEAD);
+    availableRaces[CLASS_WARLOCK].push_back(RACE_ORC);
+    availableRaces[CLASS_WARLOCK].push_back(RACE_BLOODELF);
+
+    availableRaces[CLASS_SHAMAN].push_back(RACE_DRAENEI);
+    availableRaces[CLASS_SHAMAN].push_back(RACE_ORC);
+    availableRaces[CLASS_SHAMAN].push_back(RACE_TAUREN);
+    availableRaces[CLASS_SHAMAN].push_back(RACE_TROLL);
+
+    availableRaces[CLASS_HUNTER].push_back(RACE_DWARF);
+    availableRaces[CLASS_HUNTER].push_back(RACE_NIGHTELF);
+    availableRaces[CLASS_HUNTER].push_back(RACE_DRAENEI);
+    availableRaces[CLASS_HUNTER].push_back(RACE_ORC);
+    availableRaces[CLASS_HUNTER].push_back(RACE_TAUREN);
+    availableRaces[CLASS_HUNTER].push_back(RACE_TROLL);
+    availableRaces[CLASS_HUNTER].push_back(RACE_BLOODELF);
+
+    availableRaces[CLASS_DRUID].push_back(RACE_NIGHTELF);
+    availableRaces[CLASS_DRUID].push_back(RACE_TAUREN);
+}
+
+bool RandomPlayerbotFactory::CreateRandomBot(uint8 cls)
+{
+    sLog.outDetail("Creating new random bot for class %d", cls);
+
+    uint8 gender = rand() % 2 ? GENDER_MALE : GENDER_FEMALE;
+
+    uint8 race = availableRaces[cls][urand(0, availableRaces[cls].size() - 1)];
+    string name = CreateRandomBotName();
+
+    uint8 skin = urand(0, 7);
+    uint8 face = urand(0, 7);
+    uint8 hairStyle = urand(0, 7);
+    uint8 hairColor = urand(0, 7);
+    uint8 facialHair = urand(0, 7);
+    uint8 outfitId = 0;
+
+    WorldSession* session = new WorldSession(accountId, NULL, SEC_PLAYER, MAX_EXPANSION, 0, LOCALE_enUS);
+    if (!session)
+    {
+        sLog.outError("Couldn't create session for random bot account %d", accountId);
+        delete session;
+        return false;
+    }
+
+    Player *player = new Player(session);
+    if (!player->Create(sObjectMgr.GeneratePlayerLowGuid(), name, race, cls, gender, skin, face, hairStyle,hairColor, facialHair, outfitId))
+    {
+        player->DeleteFromDB(player->GetObjectGuid(), accountId, true, true);
+        delete session;
+        delete player;
+        sLog.outError("Unable to create random bot for account %d - name: \"%s\"; race: %u; class: %u; gender: %u; skin: %u; face: %u; hairStyle: %u; hairColor: %u; facialHair: %u; outfitId: %u",
+                accountId, name.c_str(), race, cls, gender, skin, face, hairStyle, hairColor, facialHair, outfitId);
+        return false;
+    }
+
+    player->setCinematic(2);
+    player->SetAtLoginFlag(AT_LOGIN_NONE);
+    player->SaveToDB();
+
+    sLog.outDetail("Random bot created for account %d - name: \"%s\"; race: %u; class: %u; gender: %u; skin: %u; face: %u; hairStyle: %u; hairColor: %u; facialHair: %u; outfitId: %u",
+            accountId, name.c_str(), race, cls, gender, skin, face, hairStyle, hairColor, facialHair, outfitId);
+
+    return true;
+}
+
+string RandomPlayerbotFactory::CreateRandomBotName()
+{
+    QueryResult *result = CharacterDatabase.Query("SELECT MAX(name_id) FROM ai_playerbot_names");
+    if (!result)
+        return false;
+
+    Field *fields = result->Fetch();
+    uint32 maxId = fields[0].GetUInt32();
+    delete result;
+
+    uint32 id = urand(0, maxId);
+    result = CharacterDatabase.PQuery("SELECT n.name FROM ai_playerbot_names n "
+            "LEFT OUTER JOIN characters e ON e.name = n.name "
+            "WHERE e.guid IS NULL AND n.name_id >= '%u' LIMIT 1", id);
+    if (!result)
+    {
+        sLog.outError("No more names left for random bots");
+        return false;
+    }
+
+    string name = fields[0].GetCppString();
+    delete result;
+
+    return name;
+}
+
diff --git a/src/game/playerbot/RandomPlayerbotFactory.h b/src/game/playerbot/RandomPlayerbotFactory.h
new file mode 100644
index 00000000000..f27471c76fb
--- /dev/null
+++ b/src/game/playerbot/RandomPlayerbotFactory.h
@@ -0,0 +1,32 @@
+#ifndef _RandomPlayerbotFactory_H
+#define _RandomPlayerbotFactory_H
+
+#include "Common.h"
+#include "PlayerbotAIBase.h"
+
+class WorldPacket;
+class Player;
+class Unit;
+class Object;
+class Item;
+
+using namespace std;
+
+class MANGOS_DLL_SPEC RandomPlayerbotFactory
+{
+    public:
+        RandomPlayerbotFactory(uint32 accountId);
+		virtual ~RandomPlayerbotFactory() {}
+
+	public:
+        bool CreateRandomBot(uint8 cls);
+
+	private:
+        string CreateRandomBotName();
+
+    private:
+        uint32 accountId;
+        static map<uint8, vector<uint8> > availableRaces;
+};
+
+#endif
diff --git a/src/game/playerbot/RandomPlayerbotMgr.cpp b/src/game/playerbot/RandomPlayerbotMgr.cpp
new file mode 100644
index 00000000000..bed802d5da0
--- /dev/null
+++ b/src/game/playerbot/RandomPlayerbotMgr.cpp
@@ -0,0 +1,849 @@
+#include "Config/Config.h"
+#include "../pchdef.h"
+#include "playerbot.h"
+#include "PlayerbotAIConfig.h"
+#include "PlayerbotFactory.h"
+#include "../AccountMgr.h"
+#include "../ObjectMgr.h"
+#include "../../shared/Database/DatabaseEnv.h"
+#include "PlayerbotAI.h"
+#include "../Player.h"
+#include "AiFactory.h"
+
+INSTANTIATE_SINGLETON_1(RandomPlayerbotMgr);
+
+RandomPlayerbotMgr::RandomPlayerbotMgr() : PlayerbotHolder(), processTicks(0)
+{
+}
+
+RandomPlayerbotMgr::~RandomPlayerbotMgr()
+{
+}
+
+void RandomPlayerbotMgr::UpdateAIInternal(uint32 elapsed)
+{
+    SetNextCheckDelay(sPlayerbotAIConfig.randomBotUpdateInterval * 1000);
+
+    if (!sPlayerbotAIConfig.randomBotAutologin || !sPlayerbotAIConfig.enabled)
+        return;
+
+    sLog.outBasic("Processing random bots...");
+
+    int maxAllowedBotCount = GetEventValue(0, "bot_count");
+    if (!maxAllowedBotCount)
+    {
+        maxAllowedBotCount = urand(sPlayerbotAIConfig.minRandomBots, sPlayerbotAIConfig.maxRandomBots);
+        SetEventValue(0, "bot_count", maxAllowedBotCount,
+                urand(sPlayerbotAIConfig.randomBotCountChangeMinInterval, sPlayerbotAIConfig.randomBotCountChangeMaxInterval));
+    }
+
+    list<uint32> bots = GetBots();
+    int botCount = bots.size();
+    int allianceNewBots = 0, hordeNewBots = 0;
+    int randomBotsPerInterval = (int)urand(sPlayerbotAIConfig.minRandomBotsPerInterval, sPlayerbotAIConfig.maxRandomBotsPerInterval);
+    if (!processTicks)
+    {
+        if (sPlayerbotAIConfig.randomBotLoginAtStartup)
+            randomBotsPerInterval = bots.size();
+    }
+
+    while (botCount++ < maxAllowedBotCount)
+    {
+        bool alliance = botCount % 2;
+        uint32 bot = AddRandomBot(alliance);
+        if (bot)
+        {
+            if (alliance)
+                allianceNewBots++;
+            else
+                hordeNewBots++;
+
+            bots.push_back(bot);
+        }
+        else
+            break;
+    }
+
+    int botProcessed = 0;
+    for (list<uint32>::iterator i = bots.begin(); i != bots.end(); ++i)
+    {
+        uint32 bot = *i;
+        if (ProcessBot(bot))
+            botProcessed++;
+
+        if (botProcessed >= randomBotsPerInterval)
+            break;
+    }
+
+    sLog.outString("%d bots processed. %d alliance and %d horde bots added. %d bots online. Next check in %d seconds",
+            botProcessed, allianceNewBots, hordeNewBots, playerBots.size(), sPlayerbotAIConfig.randomBotUpdateInterval);
+
+    if (processTicks++ == 1)
+        PrintStats();
+}
+
+uint32 RandomPlayerbotMgr::AddRandomBot(bool alliance)
+{
+    vector<uint32> bots = GetFreeBots(alliance);
+    if (bots.size() == 0)
+        return 0;
+
+    int index = urand(0, bots.size() - 1);
+    uint32 bot = bots[index];
+    SetEventValue(bot, "add", 1, urand(sPlayerbotAIConfig.minRandomBotInWorldTime, sPlayerbotAIConfig.maxRandomBotInWorldTime));
+    uint32 randomTime = 30 + urand(sPlayerbotAIConfig.randomBotUpdateInterval, sPlayerbotAIConfig.randomBotUpdateInterval * 3);
+    ScheduleRandomize(bot, randomTime);
+    sLog.outDetail("Random bot %d added", bot);
+    return bot;
+}
+
+void RandomPlayerbotMgr::ScheduleRandomize(uint32 bot, uint32 time)
+{
+    SetEventValue(bot, "randomize", 1, time);
+    SetEventValue(bot, "logout", 1, time + 30 + urand(sPlayerbotAIConfig.randomBotUpdateInterval, sPlayerbotAIConfig.randomBotUpdateInterval * 3));
+}
+
+void RandomPlayerbotMgr::ScheduleTeleport(uint32 bot)
+{
+    SetEventValue(bot, "teleport", 1, 60 + urand(sPlayerbotAIConfig.randomBotUpdateInterval, sPlayerbotAIConfig.randomBotUpdateInterval * 3));
+}
+
+bool RandomPlayerbotMgr::ProcessBot(uint32 bot)
+{
+    uint32 isValid = GetEventValue(bot, "add");
+    if (!isValid)
+    {
+		Player* player = GetPlayerBot(bot);
+		if (!player || !player->GetGroup())
+		{
+			sLog.outDetail("Bot %d expired", bot);
+			SetEventValue(bot, "add", 0, 0);
+		}
+        return true;
+    }
+
+    if (!GetPlayerBot(bot))
+    {
+        sLog.outDetail("Bot %d logged in", bot);
+        AddPlayerBot(bot, 0);
+        if (!GetEventValue(bot, "online"))
+        {
+            SetEventValue(bot, "online", 1, sPlayerbotAIConfig.minRandomBotInWorldTime);
+        }
+        return true;
+    }
+
+    Player* player = GetPlayerBot(bot);
+    if (!player)
+        return false;
+
+    PlayerbotAI* ai = player->GetPlayerbotAI();
+    if (!ai)
+        return false;
+
+    if (player->GetGroup())
+    {
+        sLog.outDetail("Skipping bot %d as it is in group", bot);
+        return false;
+    }
+
+    if (player->isDead())
+    {
+        if (!GetEventValue(bot, "dead"))
+        {
+            sLog.outDetail("Setting dead flag for bot %d", bot);
+            uint32 randomTime = urand(sPlayerbotAIConfig.minRandomBotReviveTime, sPlayerbotAIConfig.maxRandomBotReviveTime);
+            SetEventValue(bot, "dead", 1, randomTime);
+            SetEventValue(bot, "revive", 1, randomTime - 60);
+            return false;
+        }
+
+        if (!GetEventValue(bot, "revive"))
+        {
+            sLog.outDetail("Reviving dead bot %d", bot);
+            SetEventValue(bot, "dead", 0, 0);
+            SetEventValue(bot, "revive", 0, 0);
+            RandomTeleport(player, player->GetMapId(), player->GetPositionX(), player->GetPositionY(), player->GetPositionZ());
+            return true;
+        }
+
+        return false;
+    }
+
+    uint32 randomize = GetEventValue(bot, "randomize");
+    if (!randomize)
+    {
+        sLog.outDetail("Randomizing bot %d", bot);
+        Randomize(player);
+        uint32 randomTime = urand(sPlayerbotAIConfig.minRandomBotRandomizeTime, sPlayerbotAIConfig.maxRandomBotRandomizeTime);
+        ScheduleRandomize(bot, randomTime);
+        return true;
+    }
+
+    uint32 logout = GetEventValue(bot, "logout");
+    if (!logout)
+    {
+        sLog.outDetail("Logging out bot %d", bot);
+        LogoutPlayerBot(bot);
+        SetEventValue(bot, "logout", 1, sPlayerbotAIConfig.maxRandomBotInWorldTime);
+        return true;
+    }
+
+    uint32 teleport = GetEventValue(bot, "teleport");
+    if (!teleport)
+    {
+        sLog.outDetail("Random teleporting bot %d", bot);
+        RandomTeleportForLevel(ai->GetBot());
+        SetEventValue(bot, "teleport", 1, sPlayerbotAIConfig.maxRandomBotInWorldTime);
+        return true;
+    }
+
+    return false;
+}
+
+void RandomPlayerbotMgr::RandomTeleport(Player* bot, vector<WorldLocation> &locs)
+{
+    if (bot->IsBeingTeleported() || bot->IsBeingTeleportedDelayEvent())
+        return;
+
+    if (locs.empty())
+    {
+        sLog.outError("Cannot teleport bot %s - no locations available", bot->GetName());
+        return;
+    }
+
+    for (int attemtps = 0; attemtps < 10; ++attemtps)
+    {
+        int index = urand(0, locs.size() - 1);
+        WorldLocation loc = locs[index];
+        float x = loc.getX() + urand(0, sPlayerbotAIConfig.grindDistance) - sPlayerbotAIConfig.grindDistance / 2;
+        float y = loc.getY() + urand(0, sPlayerbotAIConfig.grindDistance) - sPlayerbotAIConfig.grindDistance / 2;
+        float z = loc.getZ();
+
+        MapPtr map = sMapMgr.GetMapPtr(loc.GetMapId(), 0);
+        if (!map)
+            continue;
+
+        const TerrainInfoPtr terrain = map->GetTerrain();
+        if (!terrain)
+            continue;
+
+        AreaTableEntry const* area = sAreaStore.LookupEntry(terrain->GetAreaId(x, y, z));
+        if (!area)
+            continue;
+
+        if (!terrain->IsOutdoors(x, y, z) ||
+                terrain->IsAboveWater(x, y, z) ||
+                terrain->IsUnderWater(x, y, z) ||
+                terrain->IsInWater(x, y, z))
+            continue;
+
+        sLog.outDetail("Random teleporting bot %s to %s %f,%f,%f", bot->GetName(), area->area_name[0], x, y, z);
+        z = 0.05f + map->GetTerrain()->GetHeightStatic(x, y, 0.05f + z, true, MAX_HEIGHT);
+        map = MapPtr();
+
+        bot->GetMotionMaster()->Clear();
+        bot->TeleportTo(loc.GetMapId(), x, y, z, 0);
+        return;
+    }
+
+    sLog.outError("Cannot teleport bot %s - no locations available", bot->GetName());
+}
+
+void RandomPlayerbotMgr::RandomTeleportForLevel(Player* bot)
+{
+    vector<WorldLocation> locs;
+    QueryResult* results = WorldDatabase.PQuery("select map, position_x, position_y, position_z "
+        "from (select map, position_x, position_y, position_z, avg(t.maxlevel), avg(t.minlevel), "
+        "(avg(t.maxlevel) + avg(t.minlevel)) / 2 - %u delta "
+        "from creature c inner join creature_template t on c.id = t.entry group by t.entry) q "
+        "where delta >= 0 and delta <= 1 and map in (%s)",
+        bot->getLevel(), sPlayerbotAIConfig.randomBotMapsAsString.c_str());
+    if (results)
+    {
+        do
+        {
+            Field* fields = results->Fetch();
+            uint32 mapId = fields[0].GetUInt32();
+            float x = fields[1].GetFloat();
+            float y = fields[2].GetFloat();
+            float z = fields[3].GetFloat();
+            WorldLocation loc(mapId, x, y, z, 0);
+            locs.push_back(loc);
+        } while (results->NextRow());
+        delete results;
+    }
+
+    RandomTeleport(bot, locs);
+}
+
+void RandomPlayerbotMgr::RandomTeleport(Player* bot, uint32 mapId, float teleX, float teleY, float teleZ)
+{
+    vector<WorldLocation> locs;
+    QueryResult* results = WorldDatabase.PQuery("select position_x, position_y, position_z from creature where map = '%u' and abs(position_x - '%f') < '%u' and abs(position_y - '%f') < '%u'",
+            mapId, teleX, sPlayerbotAIConfig.randomBotTeleportDistance / 2, teleY, sPlayerbotAIConfig.randomBotTeleportDistance / 2);
+    if (results)
+    {
+        do
+        {
+            Field* fields = results->Fetch();
+            float x = fields[0].GetFloat();
+            float y = fields[1].GetFloat();
+            float z = fields[2].GetFloat();
+            WorldLocation loc(mapId, x, y, z, 0);
+            locs.push_back(loc);
+        } while (results->NextRow());
+        delete results;
+    }
+
+    RandomTeleport(bot, locs);
+    Refresh(bot);
+}
+
+void RandomPlayerbotMgr::Randomize(Player* bot)
+{
+    if (bot->getLevel() == 1)
+        RandomizeFirst(bot);
+    else
+        IncreaseLevel(bot);
+}
+
+void RandomPlayerbotMgr::IncreaseLevel(Player* bot)
+{
+    uint32 maxLevel = sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL);
+    uint32 level = min(bot->getLevel() + 1, maxLevel);
+    PlayerbotFactory factory(bot, level);
+    if (bot->GetGuildId())
+        factory.Refresh();
+    else
+        factory.Randomize();
+    RandomTeleportForLevel(bot);
+}
+
+void RandomPlayerbotMgr::RandomizeFirst(Player* bot)
+{
+    uint32 maxLevel = sPlayerbotAIConfig.randomBotMaxLevel;
+    if (maxLevel > sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
+        maxLevel = sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL);
+
+    for (int attempt = 0; attempt < 100; ++attempt)
+    {
+        int index = urand(0, sPlayerbotAIConfig.randomBotMaps.size() - 1);
+        uint32 mapId = sPlayerbotAIConfig.randomBotMaps[index];
+
+        vector<GameTele const*> locs;
+        GameTeleMap const & teleMap = sObjectMgr.GetGameTeleMap();
+        for(GameTeleMap::const_iterator itr = teleMap.begin(); itr != teleMap.end(); ++itr)
+        {
+            GameTele const* tele = &itr->second;
+            if (tele->loc.GetMapId() == mapId)
+                locs.push_back(tele);
+        }
+
+        index = urand(0, locs.size() - 1);
+        GameTele const* tele = locs[index];
+        uint32 level = GetZoneLevel(tele->loc.GetMapId(), tele->loc.getX(), tele->loc.getY(), tele->loc.getZ());
+        if (level > maxLevel + 5)
+            continue;
+
+        level = min(level, maxLevel);
+        if (!level) level = 1;
+
+        if (urand(0, 100) < 100 * sPlayerbotAIConfig.randomBotMaxLevelChance)
+            level = maxLevel;
+
+        if (level < sPlayerbotAIConfig.randomBotMinLevel)
+            continue;
+
+        PlayerbotFactory factory(bot, level);
+        factory.CleanRandomize();
+        RandomTeleport(bot, tele->loc.GetMapId(), tele->loc.getX(), tele->loc.getY(), tele->loc.getZ());
+        break;
+    }
+}
+
+uint32 RandomPlayerbotMgr::GetZoneLevel(uint32 mapId, float teleX, float teleY, float teleZ)
+{
+    uint32 maxLevel = sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL);
+
+	uint32 level;
+    QueryResult *results = WorldDatabase.PQuery("select avg(t.minlevel) minlevel, avg(t.maxlevel) maxlevel from creature c "
+            "inner join creature_template t on c.id = t.entry "
+            "where map = '%u' and minlevel > 1 and abs(position_x - '%f') < '%u' and abs(position_y - '%f') < '%u'",
+            mapId, teleX, sPlayerbotAIConfig.randomBotTeleportDistance / 2, teleY, sPlayerbotAIConfig.randomBotTeleportDistance / 2);
+
+    if (results)
+    {
+        Field* fields = results->Fetch();
+        uint32 minLevel = fields[0].GetUInt32();
+        uint32 maxLevel = fields[1].GetUInt32();
+        level = urand(minLevel, maxLevel);
+        if (level > maxLevel)
+            level = maxLevel;
+        delete results;
+    }
+    else
+    {
+        level = urand(1, maxLevel);
+    }
+
+    return level;
+}
+
+void RandomPlayerbotMgr::Refresh(Player* bot)
+{
+    if (bot->isDead())
+    {
+        PlayerbotChatHandler ch(bot);
+        ch.revive(*bot);
+        bot->GetPlayerbotAI()->ResetStrategies();
+    }
+
+    bot->GetPlayerbotAI()->Reset();
+
+    HostileReference *ref = bot->getHostileRefManager().getFirst();
+    while( ref )
+    {
+        ThreatManager *threatManager = ref->getSource();
+        Unit *unit = threatManager->getOwner();
+        float threat = ref->getThreat();
+
+        unit->RemoveAllAttackers();
+        unit->ClearInCombat();
+
+        ref = ref->next();
+    }
+
+    bot->RemoveAllAttackers();
+    bot->ClearInCombat();
+
+    bot->DurabilityRepairAll(false, 1.0f, false);
+    bot->SetHealthPercent(100);
+    bot->SetPvP(true);
+
+    if (bot->GetMaxPower(POWER_MANA) > 0)
+        bot->SetPower(POWER_MANA, bot->GetMaxPower(POWER_MANA));
+
+    if (bot->GetMaxPower(POWER_ENERGY) > 0)
+        bot->SetPower(POWER_ENERGY, bot->GetMaxPower(POWER_ENERGY));
+}
+
+
+bool RandomPlayerbotMgr::IsRandomBot(Player* bot)
+{
+    return IsRandomBot(bot->GetObjectGuid());
+}
+
+bool RandomPlayerbotMgr::IsRandomBot(uint32 bot)
+{
+    return GetEventValue(bot, "add");
+}
+
+list<uint32> RandomPlayerbotMgr::GetBots()
+{
+    list<uint32> bots;
+
+    QueryResult* results = CharacterDatabase.Query(
+            "select bot from ai_playerbot_random_bots where owner = 0 and event = 'add'");
+
+    if (results)
+    {
+        do
+        {
+            Field* fields = results->Fetch();
+            uint32 bot = fields[0].GetUInt32();
+            bots.push_back(bot);
+        } while (results->NextRow());
+        delete results;
+    }
+
+    return bots;
+}
+
+vector<uint32> RandomPlayerbotMgr::GetFreeBots(bool alliance)
+{
+    set<uint32> bots;
+
+    QueryResult* results = CharacterDatabase.PQuery(
+            "select `bot` from ai_playerbot_random_bots where event = 'add'");
+
+    if (results)
+    {
+        do
+        {
+            Field* fields = results->Fetch();
+            uint32 bot = fields[0].GetUInt32();
+            bots.insert(bot);
+        } while (results->NextRow());
+        delete results;
+    }
+
+    vector<uint32> guids;
+    for (list<uint32>::iterator i = sPlayerbotAIConfig.randomBotAccounts.begin(); i != sPlayerbotAIConfig.randomBotAccounts.end(); i++)
+    {
+        uint32 accountId = *i;
+        if (!sAccountMgr.GetCharactersCount(accountId))
+            continue;
+
+        QueryResult *result = CharacterDatabase.PQuery("SELECT guid, race FROM characters WHERE account = '%u'", accountId);
+        if (!result)
+            continue;
+
+        do
+        {
+            Field* fields = result->Fetch();
+            uint32 guid = fields[0].GetUInt32();
+            uint32 race = fields[1].GetUInt32();
+            if (bots.find(guid) == bots.end() &&
+                    ((alliance && IsAlliance(race)) || ((!alliance && !IsAlliance(race))
+            )))
+                guids.push_back(guid);
+        } while (result->NextRow());
+        delete result;
+    }
+
+
+    return guids;
+}
+
+uint32 RandomPlayerbotMgr::GetEventValue(uint32 bot, string event)
+{
+    uint32 value = 0;
+
+    QueryResult* results = CharacterDatabase.PQuery(
+            "select `value`, `time`, validIn from ai_playerbot_random_bots where owner = 0 and bot = '%u' and event = '%s'",
+            bot, event.c_str());
+
+    if (results)
+    {
+        Field* fields = results->Fetch();
+        value = fields[0].GetUInt32();
+        uint32 lastChangeTime = fields[1].GetUInt32();
+        uint32 validIn = fields[2].GetUInt32();
+        if ((time(0) - lastChangeTime) >= validIn)
+            value = 0;
+        delete results;
+    }
+
+    return value;
+}
+
+uint32 RandomPlayerbotMgr::SetEventValue(uint32 bot, string event, uint32 value, uint32 validIn)
+{
+    CharacterDatabase.PExecute("delete from ai_playerbot_random_bots where owner = 0 and bot = '%u' and event = '%s'",
+            bot, event.c_str());
+    if (value)
+    {
+        CharacterDatabase.PExecute(
+                "insert into ai_playerbot_random_bots (owner, bot, `time`, validIn, event, `value`) values ('%u', '%u', '%u', '%u', '%s', '%u')",
+                0, bot, (uint32)time(0), validIn, event.c_str(), value);
+    }
+
+    return value;
+}
+
+bool ChatHandler::HandlePlayerbotConsoleCommand(char* args)
+{
+    if (!sPlayerbotAIConfig.enabled)
+    {
+        PSendSysMessage("Playerbot system is currently disabled!");
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    if (!args || !*args)
+    {
+        sLog.outError("Usage: rndbot stats/update/reset/init/refresh/add/remove");
+        return false;
+    }
+
+    string cmd = args;
+
+    if (cmd == "reset")
+    {
+        CharacterDatabase.PExecute("delete from ai_playerbot_random_bots");
+        sLog.outBasic("Random bots were reset for all players");
+        return true;
+    }
+    else if (cmd == "stats")
+    {
+        sRandomPlayerbotMgr.PrintStats();
+        return true;
+    }
+    else if (cmd == "update")
+    {
+        sRandomPlayerbotMgr.UpdateAIInternal(0);
+        return true;
+    }
+    else if (cmd == "init" || cmd == "refresh")
+    {
+		sLog.outString("Randomizing bots for %d accounts", sPlayerbotAIConfig.randomBotAccounts.size());
+        BarGoLink bar(sPlayerbotAIConfig.randomBotAccounts.size());
+        for (list<uint32>::iterator i = sPlayerbotAIConfig.randomBotAccounts.begin(); i != sPlayerbotAIConfig.randomBotAccounts.end(); ++i)
+        {
+            uint32 account = *i;
+            bar.step();
+            if (QueryResult *results = CharacterDatabase.PQuery("SELECT guid FROM characters where account = '%u'", account))
+            {
+                do
+                {
+                    Field* fields = results->Fetch();
+                    ObjectGuid guid = ObjectGuid(fields[0].GetUInt64());
+                    Player* bot = sObjectMgr.GetPlayer(guid, true);
+                    if (!bot)
+                        continue;
+
+                    if (cmd == "init")
+                    {
+                        sLog.outDetail("Randomizing bot %s for account %u", bot->GetName(), account);
+                        sRandomPlayerbotMgr.RandomizeFirst(bot);
+                    }
+                    else
+                    {
+                        sLog.outDetail("Refreshing bot %s for account %u", bot->GetName(), account);
+                        bot->SetLevel(bot->getLevel() - 1);
+                        sRandomPlayerbotMgr.IncreaseLevel(bot);
+                    }
+                    uint32 randomTime = urand(sPlayerbotAIConfig.minRandomBotRandomizeTime, sPlayerbotAIConfig.maxRandomBotRandomizeTime);
+                    CharacterDatabase.PExecute("update ai_playerbot_random_bots set validIn = '%u' where event = 'randomize' and bot = '%u'",
+                            randomTime, bot->GetGUIDLow());
+                    CharacterDatabase.PExecute("update ai_playerbot_random_bots set validIn = '%u' where event = 'logout' and bot = '%u'",
+                            sPlayerbotAIConfig.maxRandomBotInWorldTime, bot->GetGUIDLow());
+                } while (results->NextRow());
+
+                delete results;
+            }
+        }
+        return true;
+    }
+    else
+    {
+        list<string> messages = sRandomPlayerbotMgr.HandlePlayerbotCommand(args, NULL);
+        for (list<string>::iterator i = messages.begin(); i != messages.end(); ++i)
+        {
+            sLog.outString(i->c_str());
+        }
+        return true;
+    }
+
+    return false;
+}
+
+void RandomPlayerbotMgr::HandleCommand(uint32 type, const string& text, Player& fromPlayer)
+{
+    for (PlayerBotMap::const_iterator it = GetPlayerBotsBegin(); it != GetPlayerBotsEnd(); ++it)
+    {
+        Player* const bot = it->second;
+        bot->GetPlayerbotAI()->HandleCommand(type, text, fromPlayer);
+    }
+}
+
+void RandomPlayerbotMgr::OnPlayerLogout(Player* player)
+{
+    for (PlayerBotMap::const_iterator it = GetPlayerBotsBegin(); it != GetPlayerBotsEnd(); ++it)
+    {
+        Player* const bot = it->second;
+        PlayerbotAI* ai = bot->GetPlayerbotAI();
+        if (player == ai->GetMaster())
+        {
+            ai->SetMaster(NULL);
+            ai->ResetStrategies();
+        }
+    }
+
+    if (!player->GetPlayerbotAI())
+    {
+        vector<Player*>::iterator i = find(players.begin(), players.end(), player);
+        if (i != players.end())
+            players.erase(i);
+    }
+}
+
+void RandomPlayerbotMgr::OnPlayerLogin(Player* player)
+{
+    for (PlayerBotMap::const_iterator it = GetPlayerBotsBegin(); it != GetPlayerBotsEnd(); ++it)
+    {
+        Player* const bot = it->second;
+        if (player == bot || player->GetPlayerbotAI())
+            continue;
+
+        Group* group = bot->GetGroup();
+        if (!group)
+            continue;
+
+        for (GroupReference *gref = group->GetFirstMember(); gref; gref = gref->next())
+        {
+            Player* member = gref->getSource();
+            PlayerbotAI* ai = bot->GetPlayerbotAI();
+            if (member == player && (!ai->GetMaster() || ai->GetMaster()->GetPlayerbotAI()))
+            {
+                ai->SetMaster(player);
+                ai->ResetStrategies();
+                ai->TellMaster("Hello");
+                break;
+            }
+        }
+    }
+
+    if (!player->GetPlayerbotAI())
+        players.push_back(player);
+}
+
+Player* RandomPlayerbotMgr::GetRandomPlayer()
+{
+    if (players.empty())
+        return NULL;
+
+    uint32 index = urand(0, players.size() - 1);
+    return players[index];
+}
+
+void RandomPlayerbotMgr::PrintStats()
+{
+    sLog.outString("%d Random Bots online", playerBots.size());
+
+    map<uint32, int> alliance, horde;
+    for (uint32 i = 0; i < 10; ++i)
+    {
+        alliance[i] = 0;
+        horde[i] = 0;
+    }
+
+    map<uint8, int> perRace, perClass;
+    for (uint8 race = RACE_HUMAN; race < MAX_RACES; ++race)
+    {
+        perRace[race] = 0;
+    }
+    for (uint8 cls = CLASS_WARRIOR; cls < MAX_CLASSES; ++cls)
+    {
+        perClass[cls] = 0;
+    }
+
+    int dps = 0, heal = 0, tank = 0;
+    for (PlayerBotMap::iterator i = playerBots.begin(); i != playerBots.end(); ++i)
+    {
+        Player* bot = i->second;
+        if (IsAlliance(bot->getRace()))
+            alliance[bot->getLevel() / 10]++;
+        else
+            horde[bot->getLevel() / 10]++;
+
+        perRace[bot->getRace()]++;
+        perClass[bot->getClass()]++;
+
+        int spec = AiFactory::GetPlayerSpecTab(bot);
+        switch (bot->getClass())
+        {
+        case CLASS_DRUID:
+            if (spec == 2)
+                heal++;
+            else
+                dps++;
+            break;
+        case CLASS_PALADIN:
+            if (spec == 1)
+                tank++;
+            else if (spec == 0)
+                heal++;
+            else
+                dps++;
+            break;
+        case CLASS_PRIEST:
+            if (spec != 2)
+                heal++;
+            else
+                dps++;
+            break;
+        case CLASS_SHAMAN:
+            if (spec == 2)
+                heal++;
+            else
+                dps++;
+            break;
+        case CLASS_WARRIOR:
+            if (spec == 2)
+                tank++;
+            else
+                dps++;
+            break;
+        default:
+            dps++;
+            break;
+        }
+    }
+
+    sLog.outString("Per level:");
+    uint32 maxLevel = sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL);
+    for (uint32 i = 0; i < 10; ++i)
+    {
+        if (!alliance[i] && !horde[i])
+            continue;
+
+        uint32 from = i*10;
+        uint32 to = min(from + 9, maxLevel);
+        if (!from) from = 1;
+        sLog.outString("    %d..%d: %d alliance, %d horde", from, to, alliance[i], horde[i]);
+    }
+    sLog.outString("Per race:");
+    for (uint8 race = RACE_HUMAN; race < MAX_RACES; ++race)
+    {
+        if (perRace[race])
+            sLog.outString("    %s: %d", ChatHelper::formatRace(race).c_str(), perRace[race]);
+    }
+    sLog.outString("Per class:");
+    for (uint8 cls = CLASS_WARRIOR; cls < MAX_CLASSES; ++cls)
+    {
+        if (perClass[cls])
+            sLog.outString("    %s: %d", ChatHelper::formatClass(cls).c_str(), perClass[cls]);
+    }
+    sLog.outString("Per role:");
+    sLog.outString("    tank: %d", tank);
+    sLog.outString("    heal: %d", heal);
+    sLog.outString("    dps: %d", dps);
+}
+
+double RandomPlayerbotMgr::GetBuyMultiplier(Player* bot)
+{
+    uint32 id = bot->GetObjectGuid();
+    uint32 value = GetEventValue(id, "buymultiplier");
+    if (!value)
+    {
+        value = urand(1, 120);
+        uint32 validIn = urand(sPlayerbotAIConfig.minRandomBotsPriceChangeInterval, sPlayerbotAIConfig.maxRandomBotsPriceChangeInterval);
+        SetEventValue(id, "buymultiplier", value, validIn);
+    }
+
+    return (double)value / 100.0;
+}
+
+double RandomPlayerbotMgr::GetSellMultiplier(Player* bot)
+{
+    uint32 id = bot->GetObjectGuid();
+    uint32 value = GetEventValue(id, "sellmultiplier");
+    if (!value)
+    {
+        value = urand(80, 250);
+        uint32 validIn = urand(sPlayerbotAIConfig.minRandomBotsPriceChangeInterval, sPlayerbotAIConfig.maxRandomBotsPriceChangeInterval);
+        SetEventValue(id, "sellmultiplier", value, validIn);
+    }
+
+    return (double)value / 100.0;
+}
+
+uint32 RandomPlayerbotMgr::GetLootAmount(Player* bot)
+{
+    uint32 id = bot->GetObjectGuid();
+    return GetEventValue(id, "lootamount");
+}
+
+void RandomPlayerbotMgr::SetLootAmount(Player* bot, uint32 value)
+{
+    uint32 id = bot->GetObjectGuid();
+    SetEventValue(id, "lootamount", value, 24 * 3600);
+}
+
+uint32 RandomPlayerbotMgr::GetTradeDiscount(Player* bot)
+{
+    Group* group = bot->GetGroup();
+    return GetLootAmount(bot) / (group ? group->GetMembersCount() : 10);
+}
diff --git a/src/game/playerbot/RandomPlayerbotMgr.h b/src/game/playerbot/RandomPlayerbotMgr.h
new file mode 100644
index 00000000000..ccf03b5747d
--- /dev/null
+++ b/src/game/playerbot/RandomPlayerbotMgr.h
@@ -0,0 +1,66 @@
+#ifndef _RandomPlayerbotMgr_H
+#define _RandomPlayerbotMgr_H
+
+#include "Common.h"
+#include "PlayerbotAIBase.h"
+#include "PlayerbotMgr.h"
+
+class WorldPacket;
+class Player;
+class Unit;
+class Object;
+class Item;
+
+using namespace std;
+
+class MANGOS_DLL_SPEC RandomPlayerbotMgr : public PlayerbotHolder
+{
+    public:
+        RandomPlayerbotMgr();
+        virtual ~RandomPlayerbotMgr();
+
+        virtual void UpdateAIInternal(uint32 elapsed);
+
+	public:
+        bool IsRandomBot(Player* bot);
+        bool IsRandomBot(uint32 bot);
+        void Randomize(Player* bot);
+        void RandomizeFirst(Player* bot);
+        void IncreaseLevel(Player* bot);
+        void ScheduleTeleport(uint32 bot);
+        void HandleCommand(uint32 type, const string& text, Player& fromPlayer);
+        void OnPlayerLogout(Player* player);
+        void OnPlayerLogin(Player* player);
+        Player* GetRandomPlayer();
+        void PrintStats();
+        double GetBuyMultiplier(Player* bot);
+        double GetSellMultiplier(Player* bot);
+        uint32 GetLootAmount(Player* bot);
+        void SetLootAmount(Player* bot, uint32 value);
+        uint32 GetTradeDiscount(Player* bot);
+        void Refresh(Player* bot);
+
+	protected:
+	    virtual void OnBotLoginInternal(Player * const bot) {}
+
+    private:
+        uint32 GetEventValue(uint32 bot, string event);
+        uint32 SetEventValue(uint32 bot, string event, uint32 value, uint32 validIn);
+        list<uint32> GetBots();
+        vector<uint32> GetFreeBots(bool alliance);
+        uint32 AddRandomBot(bool alliance);
+        bool ProcessBot(uint32 bot);
+        void ScheduleRandomize(uint32 bot, uint32 time);
+        void RandomTeleport(Player* bot, uint32 mapId, float teleX, float teleY, float teleZ);
+        void RandomTeleportForLevel(Player* bot);
+        void RandomTeleport(Player* bot, vector<WorldLocation> &locs);
+        uint32 GetZoneLevel(uint32 mapId, float teleX, float teleY, float teleZ);
+
+    private:
+        vector<Player*> players;
+        int processTicks;
+};
+
+#define sRandomPlayerbotMgr MaNGOS::Singleton<RandomPlayerbotMgr>::Instance()
+
+#endif
diff --git a/src/game/playerbot/aiplayerbot.conf.dist.in b/src/game/playerbot/aiplayerbot.conf.dist.in
new file mode 100644
index 00000000000..8915349be72
--- /dev/null
+++ b/src/game/playerbot/aiplayerbot.conf.dist.in
@@ -0,0 +1,155 @@
+##########################################
+# MANGOS Ai Playerbot Configuration file #
+##########################################
+
+[AiPlayerbotConf]
+ConfVersion=2010102201
+
+# Enable or disable AI Playerbot
+AiPlayerbot.Enabled = 1
+
+# Warrior
+AiPlayerbot.RandomClassSpecProbability.1.0 = 20
+AiPlayerbot.RandomClassSpecProbability.1.1 = 30
+AiPlayerbot.RandomClassSpecProbability.1.2 = 50
+# Paladin
+AiPlayerbot.RandomClassSpecProbability.2.0 = 20
+AiPlayerbot.RandomClassSpecProbability.2.1 = 50
+AiPlayerbot.RandomClassSpecProbability.2.2 = 30
+# Hunter
+AiPlayerbot.RandomClassSpecProbability.3.0 = 25
+AiPlayerbot.RandomClassSpecProbability.3.1 = 50
+AiPlayerbot.RandomClassSpecProbability.3.2 = 25
+# Rogue
+AiPlayerbot.RandomClassSpecProbability.4.0 = 40
+AiPlayerbot.RandomClassSpecProbability.4.1 = 50
+AiPlayerbot.RandomClassSpecProbability.4.2 = 10
+# Priest
+AiPlayerbot.RandomClassSpecProbability.5.0 = 40
+AiPlayerbot.RandomClassSpecProbability.5.1 = 40
+AiPlayerbot.RandomClassSpecProbability.5.2 = 20
+# Shaman
+AiPlayerbot.RandomClassSpecProbability.7.0 = 10
+AiPlayerbot.RandomClassSpecProbability.7.1 = 45
+AiPlayerbot.RandomClassSpecProbability.7.2 = 45
+# Mage
+AiPlayerbot.RandomClassSpecProbability.8.0 = 20
+AiPlayerbot.RandomClassSpecProbability.8.1 = 10
+AiPlayerbot.RandomClassSpecProbability.8.2 = 70
+# Warlock
+AiPlayerbot.RandomClassSpecProbability.9.0 = 33
+AiPlayerbot.RandomClassSpecProbability.9.1 = 33
+AiPlayerbot.RandomClassSpecProbability.9.2 = 33
+# Druid
+AiPlayerbot.RandomClassSpecProbability.11.0 = 10
+AiPlayerbot.RandomClassSpecProbability.11.1 = 45
+AiPlayerbot.RandomClassSpecProbability.11.2 = 45
+
+#
+# All other parameters are optional but can be changed by uncommenting them here
+#
+
+# Max AI iterations per tick
+#AiPlayerbot.IterationsPerTick = 10
+
+# Allow/deny bots from your guild
+#AiPlayerbot.AllowGuildBots = 1
+
+# Delay between two short-time spells cast
+#AiPlayerbot.GlobalCooldown = 500
+
+# Max wait time when moving
+#AiPlayerbot.MaxWaitForMove = 5000
+
+# Delay between two bot actions
+#AiPlayerbot.ReactDelay = 100
+
+# Distances
+#AiPlayerbot.SightDistance = 75.0
+#AiPlayerbot.SpellDistance = 30.0
+#AiPlayerbot.ReactDistance = 150.0
+#AiPlayerbot.GrindDistance = 100.0
+#AiPlayerbot.LootDistance = 20.0
+#AiPlayerbot.FleeDistance = 20.0
+#AiPlayerbot.TooCloseDistance = 7.0
+#AiPlayerbot.MeleeDistance = 2.0
+#AiPlayerbot.FollowDistance = 2.0
+#AiPlayerbot.WhisperDistance = 6000.0
+
+# Bot can flee for enemy
+#AiPlayerbot.FleeingEnabled = 1
+
+# Health/Mana levels
+#AiPlayerbot.CriticalHealth = 25
+#AiPlayerbot.LowHealth = 45
+#AiPlayerbot.MediumHealth = 65
+#AiPlayerbot.AlmostFullHealth = 85
+#AiPlayerbot.LowMana = 15
+#AiPlayerbot.MediumMana = 40
+
+# Enable random bot system
+#AiPlayerbot.RandomBotAutologin = 1
+
+# Random bot default strategies (applied after defaults)
+#AiPlayerbot.RandomBotCombatStrategies = +dps,+attack weak
+#AiPlayerbot.RandomBotNonCombatStrategies = +grind,+move random,+loot
+
+# Create random bot characters automatically
+#AiPlayerbot.RandomBotAutoCreate = 1
+
+# Random bot count
+#AiPlayerbot.MinRandomBots = 50
+#AiPlayerbot.MaxRandomBots = 200
+#AiPlayerbot.RandomBotMinLevel = 1
+#AiPlayerbot.RandomBotMaxLevel = 255 (ignored if more than MaxPlayerLevel mangosd.conf value)
+
+# Accounts to create for random bots
+#AiPlayerbot.RandomBotAccountPrefix = rndbot
+#AiPlayerbot.RandomBotAccountCount = 50
+
+# Delete all random bot accounts
+#AiPlayerbot.DeleteRandomBotAccounts = 0
+
+# Maps to teleport random bots
+#AiPlayerbot.RandomBotMaps = 0,1,530,571
+
+# Change random bot has lower gear
+#AiPlayerbot.RandomGearLoweringChance = 0.15
+
+# Chance random bot has max level on first randomize
+#AiPlayerbot.RandomBotMaxLevelChance = 0.4
+
+# Quest items to leave (do not destroy)
+#AiPlayerbot.RandomBotQuestItems = 6948,5175,5176,5177,5178
+
+# Spells every random bot will learn on randomize (54197 - cold weather flying)
+#AiPlayerbot.RandomBotSpellIds = 54197
+
+# Enable LFG for random bots
+#AiPlayerbot.RandomBotJoinLfg = 1
+
+# Intervals
+#AiPlayerbot.RandomBotUpdateInterval = 60
+#AiPlayerbot.RandomBotCountChangeMinInterval = 86400
+#AiPlayerbot.RandomBotCountChangeMaxInterval = 259200
+#AiPlayerbot.MinRandomBotInWorldTime = 7200
+#AiPlayerbot.MaxRandomBotInWorldTime = 1209600
+#AiPlayerbot.MinRandomBotRandomizeTime = 7200
+#AiPlayerbot.MaxRandomRandomizeTime = 1209600
+#AiPlayerbot.MinRandomBotsPerInterval = 50
+#AiPlayerbot.MaxRandomBotsPerInterval = 100
+#AiPlayerbot.MinRandomBotsPriceChangeInterval = 7200
+#AiPlayerbot.MaxRandomBotsPriceChangeInterval = 172800
+
+# Log on all random bots on start
+#AiPlayerbot.RandomBotLoginAtStartup = 1
+
+# How far random bots are teleported after death
+#AiPlayerbot.RandomBotTeleportDistance = 1000
+
+# Debug switches
+#AiPlayerbot.SpellDump = 0
+#AiPlayerbot.LogInGroupOnly = 1
+#AiPlayerbot.LogValuesPerTick = 0
+#AiPlayerbot.RandomChangeMultiplier = 1
+
diff --git a/src/game/playerbot/playerbot.h b/src/game/playerbot/playerbot.h
new file mode 100644
index 00000000000..00a7511b206
--- /dev/null
+++ b/src/game/playerbot/playerbot.h
@@ -0,0 +1,28 @@
+#pragma once
+
+std::vector<std::string> split(const std::string &s, char delim);
+#ifndef WIN32
+int strcmpi(std::string s1, std::string s2);
+#endif
+
+#include "../Spell.h"
+#include "../../../src/shared/WorldPacket.h"
+#include "../LootMgr.h"
+#include "../GossipDef.h"
+#include "../Chat.h"
+#include "../../../src/shared/Common.h"
+#include "../World.h"
+#include "../SpellMgr.h"
+#include "../ObjectMgr.h"
+#include "../Unit.h"
+#include "../SharedDefines.h"
+#include "../MotionMaster.h"
+#include "../SpellAuras.h"
+#include "../Guild.h"
+
+#include "playerbotDefs.h"
+#include "PlayerbotAIAware.h"
+#include "PlayerbotMgr.h"
+#include "RandomPlayerbotMgr.h"
+#include "ChatHelper.h"
+#include "PlayerbotAI.h"
diff --git a/src/game/playerbot/playerbotDefs.h b/src/game/playerbot/playerbotDefs.h
new file mode 100644
index 00000000000..3f59c932d39
--- /dev/null
+++ b/src/game/playerbot/playerbotDefs.h
@@ -0,0 +1,2 @@
+#pragma once
+
diff --git a/src/game/playerbot/strategy/Action.cpp b/src/game/playerbot/strategy/Action.cpp
new file mode 100644
index 00000000000..75e3301a292
--- /dev/null
+++ b/src/game/playerbot/strategy/Action.cpp
@@ -0,0 +1,93 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+#include "AiObjectContext.h"
+#include "Action.h"
+
+using namespace ai;
+
+int NextAction::size(NextAction** actions)
+{
+    if (!actions)
+        return 0;
+
+    int size;
+    for (size=0; size<10 && actions[size]; ) 
+        size++;
+    return size;
+}
+
+NextAction** NextAction::clone(NextAction** actions)
+{
+    if (!actions)
+        return NULL;
+
+    int size = NextAction::size(actions);
+
+    NextAction** res = new NextAction*[size + 1];
+    for (int i=0; i<size; i++)
+        res[i] = new NextAction(*actions[i]);
+    res[size] = NULL;
+    return res;
+}
+
+NextAction** NextAction::merge(NextAction** left, NextAction** right)
+{
+    int leftSize = NextAction::size(left);
+    int rightSize = NextAction::size(right);
+
+    NextAction** res = new NextAction*[leftSize + rightSize + 1];
+    for (int i=0; i<leftSize; i++)
+        res[i] = new NextAction(*left[i]);
+    for (int i=0; i<rightSize; i++)
+        res[leftSize + i] = new NextAction(*right[i]);
+    res[leftSize + rightSize] = NULL;
+
+    NextAction::destroy(left);
+    NextAction::destroy(right);
+
+    return res;
+}
+
+NextAction** NextAction::array(uint8 nil, ...)
+{
+    va_list vl;
+    va_start(vl, nil);
+    
+    int size = 0;
+    NextAction* cur = NULL;
+    do 
+    {
+        cur = va_arg(vl, NextAction*);
+        size++;
+    }
+    while (cur);
+
+    va_end(vl);
+
+    NextAction** res = new NextAction*[size];
+    va_start(vl, nil);
+    for (int i=0; i<size; i++)
+        res[i] = va_arg(vl, NextAction*);
+    va_end(vl);
+
+    return res;
+}
+
+void NextAction::destroy(NextAction** actions)
+{
+    if (!actions)
+        return;
+
+    for (int i=0; i<10 && actions[i]; i++)
+        delete actions[i];
+}
+
+Value<Unit*>* Action::GetTargetValue()
+{
+    return context->GetValue<Unit*>(GetTargetName());
+}
+
+Unit* Action::GetTarget()
+{
+    return GetTargetValue()->Get();
+}
diff --git a/src/game/playerbot/strategy/Action.h b/src/game/playerbot/strategy/Action.h
new file mode 100644
index 00000000000..b8d2a1cd8e0
--- /dev/null
+++ b/src/game/playerbot/strategy/Action.h
@@ -0,0 +1,138 @@
+#pragma once
+#include "Event.h"
+#include "Value.h"
+#include "AiObject.h"
+
+namespace ai
+{
+    class NextAction
+    {
+    public:
+        NextAction(string name, float relevance = 0.0f)
+        {
+            this->name = name;
+            this->relevance = relevance;
+        }
+        NextAction(const NextAction& o)
+        {
+            this->name = o.name;
+            this->relevance = o.relevance;
+        }
+
+    public:
+        string getName() { return name; }
+        float getRelevance() {return relevance;}
+
+    public:
+        static int size(NextAction** actions);
+        static NextAction** clone(NextAction** actions);
+        static NextAction** merge(NextAction** what, NextAction** with);
+        static NextAction** array(uint8 nil,...);
+        static void destroy(NextAction** actions);
+
+    private:
+        float relevance;
+        std::string name;
+    };
+
+    //---------------------------------------------------------------------------------------------------------------------
+
+    class ActionBasket;
+
+    enum ActionThreatType
+    {
+        ACTION_THREAT_NONE = 0,
+        ACTION_THREAT_SINGLE= 1,
+        ACTION_THREAT_AOE = 2
+    };
+
+    class Action : public AiNamedObject
+	{
+	public:
+        Action(PlayerbotAI* ai, string name = "action") : verbose(false), AiNamedObject(ai, name) { }
+        virtual ~Action(void) {}
+
+    public:
+        virtual bool Execute(Event event) { return true; }
+        virtual bool isPossible() { return true; }
+        virtual bool isUseful() { return true; }
+        virtual NextAction** getPrerequisites() { return NULL; }
+        virtual NextAction** getAlternatives() { return NULL; }
+        virtual NextAction** getContinuers() { return NULL; }
+        virtual ActionThreatType getThreatType() { return ACTION_THREAT_NONE; }
+        void Update() {}
+        void Reset() {}
+        virtual Unit* GetTarget();
+        virtual Value<Unit*>* GetTargetValue();
+        virtual string GetTargetName() { return "self target"; }
+        void MakeVerbose() { verbose = true; }
+
+    protected:
+        bool verbose;
+	};
+
+    class ActionNode
+    {
+    public:
+        ActionNode(string name, NextAction** prerequisites = NULL, NextAction** alternatives = NULL, NextAction** continuers = NULL)
+        {
+            this->action = NULL;
+            this->name = name;
+            this->prerequisites = prerequisites;
+            this->alternatives = alternatives;
+            this->continuers = continuers;
+        }
+        virtual ~ActionNode()
+        {
+            NextAction::destroy(prerequisites);
+            NextAction::destroy(alternatives);
+            NextAction::destroy(continuers);
+        }
+
+    public:
+        Action* getAction() { return action; }
+        void setAction(Action* action) { this->action = action; }
+        string getName() { return name; }
+
+    public:
+        NextAction** getContinuers() { return NextAction::merge(NextAction::clone(continuers), action->getContinuers()); }
+        NextAction** getAlternatives() { return NextAction::merge(NextAction::clone(alternatives), action->getAlternatives()); }
+        NextAction** getPrerequisites() { return NextAction::merge(NextAction::clone(prerequisites), action->getPrerequisites()); }
+
+    private:
+        string name;
+        Action* action;
+        NextAction** continuers;
+        NextAction** alternatives;
+        NextAction** prerequisites;
+    };
+
+    //---------------------------------------------------------------------------------------------------------------------
+
+	class ActionBasket
+	{
+	public:
+        ActionBasket(ActionNode* action, float relevance, bool skipPrerequisites, Event event) :
+          action(action), relevance(relevance), skipPrerequisites(skipPrerequisites), event(event) {}
+        virtual ~ActionBasket(void) {}
+	public:
+		float getRelevance() {return relevance;}
+		ActionNode* getAction() {return action;}
+        Event getEvent() { return event; }
+        bool isSkipPrerequisites() { return skipPrerequisites; }
+        void AmendRelevance(float k) {relevance *= k; }
+        void setRelevance(float relevance) { this->relevance = relevance; }
+	private:
+		ActionNode* action;
+		float relevance;
+        bool skipPrerequisites;
+        Event event;
+	};
+
+    //---------------------------------------------------------------------------------------------------------------------
+
+
+}
+
+#define AI_VALUE(type, name) context->GetValue<type>(name)->Get()
+#define AI_VALUE2(type, name, param) context->GetValue<type>(name, param)->Get()
diff --git a/src/game/playerbot/strategy/ActionBasket.cpp b/src/game/playerbot/strategy/ActionBasket.cpp
new file mode 100644
index 00000000000..ef8e4b9558b
--- /dev/null
+++ b/src/game/playerbot/strategy/ActionBasket.cpp
@@ -0,0 +1,4 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+#include "ActionBasket.h"
+
diff --git a/src/game/playerbot/strategy/ActionBasket.h b/src/game/playerbot/strategy/ActionBasket.h
new file mode 100644
index 00000000000..d85293b018c
--- /dev/null
+++ b/src/game/playerbot/strategy/ActionBasket.h
@@ -0,0 +1,5 @@
+#pragma once
+namespace ai
+{
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/AiObject.cpp b/src/game/playerbot/strategy/AiObject.cpp
new file mode 100644
index 00000000000..3b807e26615
--- /dev/null
+++ b/src/game/playerbot/strategy/AiObject.cpp
@@ -0,0 +1,16 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+#include "AiObject.h"
+
+AiObject::AiObject(PlayerbotAI* ai) :
+    PlayerbotAIAware(ai),
+    bot(ai->GetBot()),
+    context(ai->GetAiObjectContext()),
+    chat(ai->GetChatHelper())
+{
+}
+
+Player* AiObject::GetMaster()
+{
+    return ai->GetMaster();
+}
diff --git a/src/game/playerbot/strategy/AiObject.h b/src/game/playerbot/strategy/AiObject.h
new file mode 100644
index 00000000000..0b4f2140391
--- /dev/null
+++ b/src/game/playerbot/strategy/AiObject.h
@@ -0,0 +1,33 @@
+#pragma once
+
+class PlayerbotAI;
+
+namespace ai
+{
+    class AiObjectContext;
+    class ChatHelper;
+
+    class AiObject : public PlayerbotAIAware
+	{
+	public:
+        AiObject(PlayerbotAI* ai);
+
+    protected:
+        Player* bot;
+        Player* GetMaster();
+        AiObjectContext* context;
+        ChatHelper* chat;
+	};
+
+    class AiNamedObject : public AiObject
+    {
+    public:
+        AiNamedObject(PlayerbotAI* ai, string name) : AiObject(ai), name(name) {}
+
+    public:
+        virtual string getName() { return name; }
+
+    protected:
+        string name;
+    };
+}
diff --git a/src/game/playerbot/strategy/AiObjectContext.cpp b/src/game/playerbot/strategy/AiObjectContext.cpp
new file mode 100644
index 00000000000..3c75542c9e8
--- /dev/null
+++ b/src/game/playerbot/strategy/AiObjectContext.cpp
@@ -0,0 +1,48 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+#include "AiObjectContext.h"
+#include "NamedObjectContext.h"
+#include "StrategyContext.h"
+#include "triggers/TriggerContext.h"
+#include "actions/ActionContext.h"
+#include "triggers/ChatTriggerContext.h"
+#include "actions/ChatActionContext.h"
+#include "triggers/WorldPacketTriggerContext.h"
+#include "actions/WorldPacketActionContext.h"
+#include "values/ValueContext.h"
+
+using namespace ai;
+
+AiObjectContext::AiObjectContext(PlayerbotAI* ai) : PlayerbotAIAware(ai)
+{
+    strategyContexts.Add(new StrategyContext());
+    strategyContexts.Add(new MovementStrategyContext());
+    strategyContexts.Add(new AssistStrategyContext());
+    strategyContexts.Add(new QuestStrategyContext());
+
+    actionContexts.Add(new ActionContext());
+    actionContexts.Add(new ChatActionContext());
+    actionContexts.Add(new WorldPacketActionContext());
+
+    triggerContexts.Add(new TriggerContext());
+    triggerContexts.Add(new ChatTriggerContext());
+    triggerContexts.Add(new WorldPacketTriggerContext());
+
+    valueContexts.Add(new ValueContext());
+}
+
+void AiObjectContext::Update()
+{
+    strategyContexts.Update();
+    triggerContexts.Update();
+    actionContexts.Update();
+    valueContexts.Update();
+}
+
+void AiObjectContext::Reset()
+{
+    strategyContexts.Reset();
+    triggerContexts.Reset();
+    actionContexts.Reset();
+    valueContexts.Reset();
+}
diff --git a/src/game/playerbot/strategy/AiObjectContext.h b/src/game/playerbot/strategy/AiObjectContext.h
new file mode 100644
index 00000000000..f9313bc5f3e
--- /dev/null
+++ b/src/game/playerbot/strategy/AiObjectContext.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include "../PlayerbotAIAware.h"
+#include "Action.h"
+#include "Value.h"
+#include "NamedObjectContext.h"
+#include "Strategy.h"
+
+namespace ai
+{
+    class AiObjectContext : public PlayerbotAIAware
+    {
+    public:
+        AiObjectContext(PlayerbotAI* ai);
+        virtual ~AiObjectContext() {}
+
+    public:
+        virtual Strategy* GetStrategy(string name) { return strategyContexts.GetObject(name, ai); }
+        virtual set<string> GetSiblingStrategy(string name) { return strategyContexts.GetSiblings(name); }
+        virtual Trigger* GetTrigger(string name) { return triggerContexts.GetObject(name, ai); }
+        virtual Action* GetAction(string name) { return actionContexts.GetObject(name, ai); }
+        virtual UntypedValue* GetUntypedValue(string name) { return valueContexts.GetObject(name, ai); }
+
+        template<class T>
+        Value<T>* GetValue(string name)
+        {
+            return dynamic_cast<Value<T>*>(GetUntypedValue(name));
+        }
+
+        template<class T>
+        Value<T>* GetValue(string name, string param)
+        {
+            return GetValue<T>((string(name) + "::" + param));
+        }
+
+        template<class T>
+        Value<T>* GetValue(string name, uint32 param)
+        {
+        	ostringstream out; out << param;
+            return GetValue<T>(name, out.str());
+        }
+
+        set<string> GetSupportedStrategies()
+        {
+            return strategyContexts.supports();
+        }
+
+        string FormatValues()
+        {
+            ostringstream out;
+            set<string> names = valueContexts.GetCreated();
+            for (set<string>::iterator i = names.begin(); i != names.end(); ++i)
+            {
+                UntypedValue* value = GetUntypedValue(*i);
+                if (!value)
+                    continue;
+
+                string text = value->Format();
+                if (text == "?")
+                    continue;
+
+                out << "{" << *i << "=" << text << "} ";
+            }
+            return out.str();
+        }
+
+    public:
+        virtual void Update();
+        virtual void Reset();
+        virtual void AddShared(NamedObjectContext<UntypedValue>* sharedValues)
+        {
+            valueContexts.Add(sharedValues);
+        }
+
+    protected:
+        NamedObjectContextList<Strategy> strategyContexts;
+        NamedObjectContextList<Action> actionContexts;
+        NamedObjectContextList<Trigger> triggerContexts;
+        NamedObjectContextList<UntypedValue> valueContexts;
+    };
+}
diff --git a/src/game/playerbot/strategy/Engine.cpp b/src/game/playerbot/strategy/Engine.cpp
new file mode 100644
index 00000000000..c316b5872df
--- /dev/null
+++ b/src/game/playerbot/strategy/Engine.cpp
@@ -0,0 +1,522 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+
+#include "Engine.h"
+#include "../PlayerbotAIConfig.h"
+
+using namespace ai;
+using namespace std;
+
+Engine::Engine(PlayerbotAI* ai, AiObjectContext *factory) : PlayerbotAIAware(ai), aiObjectContext(factory)
+{
+    lastRelevance = 0.0f;
+    testMode = false;
+}
+
+bool ActionExecutionListeners::Before(Action* action, Event event)
+{
+    bool result = true;
+    for (list<ActionExecutionListener*>::iterator i = listeners.begin(); i!=listeners.end(); i++)
+    {
+        result &= (*i)->Before(action, event);
+    }
+    return result;
+}
+
+void ActionExecutionListeners::After(Action* action, bool executed, Event event)
+{
+    for (list<ActionExecutionListener*>::iterator i = listeners.begin(); i!=listeners.end(); i++)
+    {
+        (*i)->After(action, executed, event);
+    }
+}
+
+bool ActionExecutionListeners::OverrideResult(Action* action, bool executed, Event event)
+{
+    bool result = executed;
+    for (list<ActionExecutionListener*>::iterator i = listeners.begin(); i!=listeners.end(); i++)
+    {
+        result = (*i)->OverrideResult(action, result, event);
+    }
+    return result;
+}
+
+bool ActionExecutionListeners::AllowExecution(Action* action, Event event)
+{
+    bool result = true;
+    for (list<ActionExecutionListener*>::iterator i = listeners.begin(); i!=listeners.end(); i++)
+    {
+        result &= (*i)->AllowExecution(action, event);
+    }
+    return result;
+}
+
+ActionExecutionListeners::~ActionExecutionListeners()
+{
+    for (list<ActionExecutionListener*>::iterator i = listeners.begin(); i!=listeners.end(); i++)
+    {
+        delete *i;
+    }
+    listeners.clear();
+}
+
+
+Engine::~Engine(void)
+{
+    Reset();
+
+    strategies.clear();
+}
+
+void Engine::Reset()
+{
+    ActionNode* action = NULL;
+    do
+    {
+        action = queue.Pop();
+    } while (action);
+
+    triggers.clear();
+
+    for (list<Multiplier*>::iterator i = multipliers.begin(); i != multipliers.end(); i++)
+    {
+        Multiplier* multiplier = *i;
+        delete multiplier;
+    }
+    multipliers.clear();
+}
+
+void Engine::Init()
+{
+    Reset();
+
+    for (map<string, Strategy*>::iterator i = strategies.begin(); i != strategies.end(); i++)
+    {
+        Strategy* strategy = i->second;
+        strategy->InitMultipliers(multipliers);
+        strategy->InitTriggers(triggers);
+        Event emptyEvent;
+        MultiplyAndPush(strategy->getDefaultActions(), 0.0f, false, emptyEvent);
+    }
+
+	if (testMode)
+	{
+        FILE* file = fopen("test.log", "w");
+        fprintf(file, "\n");
+        fclose(file);
+	}
+}
+
+
+bool Engine::DoNextAction(Unit* unit, int depth)
+{
+    LogAction("--- AI Tick ---");
+    if (sPlayerbotAIConfig.logValuesPerTick)
+        LogValues();
+
+    bool actionExecuted = false;
+    ActionBasket* basket = NULL;
+
+    time_t currentTime = time(0);
+    aiObjectContext->Update();
+    ProcessTriggers();
+
+    int iterations = 0;
+    int iterationsPerTick = queue.Size() * sPlayerbotAIConfig.iterationsPerTick;
+    do {
+        basket = queue.Peek();
+        if (basket) {
+            if (++iterations > iterationsPerTick)
+                break;
+
+            float relevance = basket->getRelevance(); // just for reference
+            bool skipPrerequisites = basket->isSkipPrerequisites();
+            Event event = basket->getEvent();
+            // NOTE: queue.Pop() deletes basket
+            ActionNode* actionNode = queue.Pop();
+            Action* action = InitializeAction(actionNode);
+
+            if (!action)
+            {
+                LogAction("A:%s - UNKNOWN", actionNode->getName().c_str());
+            }
+            else if (action->isUseful())
+            {
+                for (list<Multiplier*>::iterator i = multipliers.begin(); i!= multipliers.end(); i++)
+                {
+                    Multiplier* multiplier = *i;
+                    relevance *= multiplier->GetValue(action);
+                    if (!relevance)
+                    {
+                        LogAction("Multiplier %s made action %s useless", multiplier->getName().c_str(), action->getName().c_str());
+                        break;
+                    }
+                }
+
+                if (action->isPossible() && relevance)
+                {
+                    if ((!skipPrerequisites || lastRelevance-relevance > 0.04) &&
+                            MultiplyAndPush(actionNode->getPrerequisites(), relevance + 0.02, false, event))
+                    {
+                        PushAgain(actionNode, relevance + 0.01, event);
+                        continue;
+                    }
+
+                    actionExecuted = ListenAndExecute(action, event);
+
+                    if (actionExecuted)
+                    {
+                        LogAction("A:%s - OK", action->getName().c_str());
+                        MultiplyAndPush(actionNode->getContinuers(), 0, false, event);
+                        lastRelevance = relevance;
+                        delete actionNode;
+                        break;
+                    }
+                    else
+                    {
+                        MultiplyAndPush(actionNode->getAlternatives(), relevance + 0.03, false, event);
+                        LogAction("A:%s - FAILED", action->getName().c_str());
+                    }
+                }
+                else
+                {
+                    MultiplyAndPush(actionNode->getAlternatives(), relevance + 0.03, false, event);
+                    LogAction("A:%s - IMPOSSIBLE", action->getName().c_str());
+                }
+            }
+            else
+            {
+                lastRelevance = relevance;
+                LogAction("A:%s - USELESS", action->getName().c_str());
+            }
+            delete actionNode;
+        }
+    }
+    while (basket);
+
+    if (!basket)
+    {
+        lastRelevance = 0.0f;
+        PushDefaultActions();
+        if (queue.Peek() && depth < 2)
+            return DoNextAction(unit, depth + 1);
+    }
+
+    if (time(0) - currentTime > 1) {
+        LogAction("too long execution");
+    }
+
+    if (!actionExecuted)
+        LogAction("no actions executed");
+
+    return actionExecuted;
+}
+
+ActionNode* Engine::CreateActionNode(string name)
+{
+    for (map<string, Strategy*>::iterator i = strategies.begin(); i != strategies.end(); i++)
+    {
+        Strategy* strategy = i->second;
+        ActionNode* node = strategy->GetAction(name);
+        if (node)
+            return node;
+    }
+    return new ActionNode (name,
+        /*P*/ NULL,
+        /*A*/ NULL,
+        /*C*/ NULL);
+}
+
+bool Engine::MultiplyAndPush(NextAction** actions, float forceRelevance, bool skipPrerequisites, Event event)
+{
+    bool pushed = false;
+    if (actions)
+    {
+        for (int j=0; j<10; j++) // TODO: remove 10
+        {
+            NextAction* nextAction = actions[j];
+            if (nextAction)
+            {
+                ActionNode* action = CreateActionNode(nextAction->getName());
+                InitializeAction(action);
+
+                float k = nextAction->getRelevance();
+                if (forceRelevance > 0.0f)
+                {
+                    k = forceRelevance;
+                }
+
+                if (k > 0)
+                {
+                    LogAction("PUSH:%s %f", action->getName().c_str(), k);
+                    queue.Push(new ActionBasket(action, k, skipPrerequisites, event));
+                    pushed = true;
+                }
+
+                delete nextAction;
+            }
+            else
+                break;
+        }
+        delete actions;
+    }
+    return pushed;
+}
+
+ActionResult Engine::ExecuteAction(string name)
+{
+	bool result = false;
+
+    ActionNode *actionNode = CreateActionNode(name);
+    if (!actionNode)
+        return ACTION_RESULT_UNKNOWN;
+
+    Action* action = InitializeAction(actionNode);
+    if (!action)
+        return ACTION_RESULT_UNKNOWN;
+
+    if (!action->isPossible())
+        return ACTION_RESULT_IMPOSSIBLE;
+
+    if (!action->isUseful())
+        return ACTION_RESULT_USELESS;
+
+    action->MakeVerbose();
+    Event emptyEvent;
+    result = ListenAndExecute(action, emptyEvent);
+    MultiplyAndPush(action->getContinuers(), 0.0f, false, emptyEvent);
+	return result ? ACTION_RESULT_OK : ACTION_RESULT_FAILED;
+}
+
+void Engine::addStrategy(string name)
+{
+    removeStrategy(name);
+
+    Strategy* strategy = aiObjectContext->GetStrategy(name);
+    if (strategy)
+    {
+        set<string> siblings = aiObjectContext->GetSiblingStrategy(name);
+        for (set<string>::iterator i = siblings.begin(); i != siblings.end(); i++)
+            removeStrategy(*i);
+
+        LogAction("S:+%s", strategy->getName().c_str());
+        strategies[strategy->getName()] = strategy;
+    }
+    Init();
+}
+
+void Engine::addStrategies(string first, ...)
+{
+	addStrategy(first);
+
+	va_list vl;
+	va_start(vl, first);
+
+	const char* cur;
+	do
+	{
+		cur = va_arg(vl, const char*);
+		if (cur)
+			addStrategy(cur);
+	}
+	while (cur);
+
+	va_end(vl);
+}
+
+bool Engine::removeStrategy(string name)
+{
+    map<string, Strategy*>::iterator i = strategies.find(name);
+    if (i == strategies.end())
+        return false;
+
+    LogAction("S:-%s", name.c_str());
+    strategies.erase(i);
+    Init();
+    return true;
+}
+
+void Engine::removeAllStrategies()
+{
+    strategies.clear();
+    Init();
+}
+
+void Engine::toggleStrategy(string name)
+{
+    if (!removeStrategy(name))
+        addStrategy(name);
+}
+
+bool Engine::HasStrategy(string name)
+{
+    return strategies.find(name) != strategies.end();
+}
+
+void Engine::ProcessTriggers()
+{
+    for (list<TriggerNode*>::iterator i = triggers.begin(); i != triggers.end(); i++)
+    {
+        TriggerNode* node = *i;
+        if (!node)
+            continue;
+
+        Trigger* trigger = node->getTrigger();
+        if (!trigger)
+        {
+            trigger = aiObjectContext->GetTrigger(node->getName());
+            node->setTrigger(trigger);
+        }
+
+        if (!trigger)
+            continue;
+
+        if (testMode || trigger->needCheck())
+        {
+            Event event = trigger->Check();
+            if (!event)
+                continue;
+
+            LogAction("T:%s", trigger->getName().c_str());
+            MultiplyAndPush(node->getHandlers(), 0.0f, false, event);
+        }
+    }
+    for (list<TriggerNode*>::iterator i = triggers.begin(); i != triggers.end(); i++)
+    {
+        Trigger* trigger = (*i)->getTrigger();
+        if (trigger) trigger->Reset();
+    }
+}
+
+void Engine::PushDefaultActions()
+{
+    for (map<string, Strategy*>::iterator i = strategies.begin(); i != strategies.end(); i++)
+    {
+        Strategy* strategy = i->second;
+        Event emptyEvent;
+        MultiplyAndPush(strategy->getDefaultActions(), 0.0f, false, emptyEvent);
+    }
+}
+
+string Engine::ListStrategies()
+{
+    string s = "Strategies: ";
+
+    if (strategies.empty())
+        return s;
+
+    for (map<string, Strategy*>::iterator i = strategies.begin(); i != strategies.end(); i++)
+    {
+        s.append(i->first);
+        s.append(", ");
+    }
+    return s.substr(0, s.length() - 2);
+}
+
+void Engine::PushAgain(ActionNode* actionNode, float relevance, Event event)
+{
+    NextAction** nextAction = new NextAction*[2];
+    nextAction[0] = new NextAction(actionNode->getName(), relevance);
+    nextAction[1] = NULL;
+    MultiplyAndPush(nextAction, relevance, true, event);
+    delete actionNode;
+}
+
+bool Engine::ContainsStrategy(StrategyType type)
+{
+	for (map<string, Strategy*>::iterator i = strategies.begin(); i != strategies.end(); i++)
+	{
+		Strategy* strategy = i->second;
+		if (strategy->GetType() & type)
+			return true;
+	}
+	return false;
+}
+
+Action* Engine::InitializeAction(ActionNode* actionNode)
+{
+    Action* action = actionNode->getAction();
+    if (!action)
+    {
+        action = aiObjectContext->GetAction(actionNode->getName());
+        actionNode->setAction(action);
+    }
+    return action;
+}
+
+bool Engine::ListenAndExecute(Action* action, Event event)
+{
+    bool actionExecuted = false;
+
+    if (actionExecutionListeners.Before(action, event))
+    {
+        actionExecuted = actionExecutionListeners.AllowExecution(action, event) ? action->Execute(event) : true;
+    }
+
+    actionExecuted = actionExecutionListeners.OverrideResult(action, actionExecuted, event);
+    actionExecutionListeners.After(action, actionExecuted, event);
+    return actionExecuted;
+}
+
+void Engine::LogAction(const char* format, ...)
+{
+    char buf[1024];
+
+    va_list ap;
+    va_start(ap, format);
+    vsprintf(buf, format, ap);
+    va_end(ap);
+
+    if (testMode)
+    {
+        FILE* file = fopen("test.log", "a");
+        fprintf(file, buf);
+        fprintf(file, "\n");
+        fclose(file);
+    }
+    else
+    {
+        Player* bot = ai->GetBot();
+        if (sPlayerbotAIConfig.logInGroupOnly && !bot->GetGroup())
+            return;
+
+        sLog.outDebug("%s %s", bot->GetName(), buf);
+    }
+}
+
+void Engine::ChangeStrategy(string names)
+{
+    vector<string> splitted = split(names, ',');
+    for (vector<string>::iterator i = splitted.begin(); i != splitted.end(); i++)
+    {
+        const char* name = i->c_str();
+        switch (name[0])
+        {
+        case '+':
+            addStrategy(name+1);
+            break;
+        case '-':
+            removeStrategy(name+1);
+            break;
+        case '~':
+            toggleStrategy(name+1);
+            break;
+        case '?':
+            ai->TellMaster(ListStrategies());
+            break;
+        }
+    }
+}
+
+void Engine::LogValues()
+{
+    if (testMode)
+        return;
+
+    Player* bot = ai->GetBot();
+    if (sPlayerbotAIConfig.logInGroupOnly && !bot->GetGroup())
+        return;
+
+    string text = ai->GetAiObjectContext()->FormatValues();
+    sLog.outDebug("Values for %s: %s", bot->GetName(), text.c_str());
+}
diff --git a/src/game/playerbot/strategy/Engine.h b/src/game/playerbot/strategy/Engine.h
new file mode 100644
index 00000000000..364dcbb8339
--- /dev/null
+++ b/src/game/playerbot/strategy/Engine.h
@@ -0,0 +1,121 @@
+#pragma once
+
+#include "Action.h"
+#include "Queue.h"
+#include "Trigger.h"
+#include "Multiplier.h"
+#include "AiObjectContext.h"
+#include "Strategy.h"
+
+namespace ai
+{
+    class ActionExecutionListener
+    {
+    public:
+        virtual bool Before(Action* action, Event event) = 0;
+        virtual bool AllowExecution(Action* action, Event event) = 0;
+        virtual void After(Action* action, bool executed, Event event) = 0;
+        virtual bool OverrideResult(Action* action, bool executed, Event event) = 0;
+    };
+
+    // -----------------------------------------------------------------------------------------------------------------------
+
+    class ActionExecutionListeners : public ActionExecutionListener
+    {
+    public:
+        virtual ~ActionExecutionListeners();
+
+    // ActionExecutionListener
+    public:
+        virtual bool Before(Action* action, Event event);
+        virtual bool AllowExecution(Action* action, Event event);
+        virtual void After(Action* action, bool executed, Event event);
+        virtual bool OverrideResult(Action* action, bool executed, Event event);
+
+    public:
+        void Add(ActionExecutionListener* listener)
+        {
+            listeners.push_back(listener);
+        }
+        void Remove(ActionExecutionListener* listener)
+        {
+            listeners.remove(listener);
+        }
+
+    private:
+        std::list<ActionExecutionListener*> listeners;
+    };
+
+    // -----------------------------------------------------------------------------------------------------------------------
+
+    enum ActionResult
+    {
+        ACTION_RESULT_UNKNOWN,
+        ACTION_RESULT_OK,
+        ACTION_RESULT_IMPOSSIBLE,
+        ACTION_RESULT_USELESS,
+        ACTION_RESULT_FAILED
+    };
+
+    class Engine : public PlayerbotAIAware
+    {
+    public:
+        Engine(PlayerbotAI* ai, AiObjectContext *factory);
+
+	    void Init();
+        void addStrategy(string name);
+		void addStrategies(string first, ...);
+        bool removeStrategy(string name);
+        bool HasStrategy(string name);
+        void removeAllStrategies();
+        void toggleStrategy(string name);
+        std::string ListStrategies();
+		bool ContainsStrategy(StrategyType type);
+		void ChangeStrategy(string names);
+
+    public:
+	    virtual bool DoNextAction(Unit*, int depth = 0);
+	    ActionResult ExecuteAction(string name);
+
+    public:
+        void AddActionExecutionListener(ActionExecutionListener* listener)
+        {
+            actionExecutionListeners.Add(listener);
+        }
+        void removeActionExecutionListener(ActionExecutionListener* listener)
+        {
+            actionExecutionListeners.Remove(listener);
+        }
+
+    public:
+	    virtual ~Engine(void);
+
+    private:
+        bool MultiplyAndPush(NextAction** actions, float forceRelevance, bool skipPrerequisites, Event event);
+        void Reset();
+        void ProcessTriggers();
+        void PushDefaultActions();
+        void PushAgain(ActionNode* actionNode, float relevance, Event event);
+        ActionNode* CreateActionNode(string name);
+        Action* InitializeAction(ActionNode* actionNode);
+        bool ListenAndExecute(Action* action, Event event);
+
+    private:
+        void LogAction(const char* format, ...);
+        void LogValues();
+
+    protected:
+	    Queue queue;
+	    std::list<TriggerNode*> triggers;
+        std::list<Multiplier*> multipliers;
+        AiObjectContext* aiObjectContext;
+        std::map<string, Strategy*> strategies;
+        float lastRelevance;
+
+    public:
+		bool testMode;
+
+    private:
+        ActionExecutionListeners actionExecutionListeners;
+    };
+}
diff --git a/src/game/playerbot/strategy/Event.cpp b/src/game/playerbot/strategy/Event.cpp
new file mode 100644
index 00000000000..1a0f28c6012
--- /dev/null
+++ b/src/game/playerbot/strategy/Event.cpp
@@ -0,0 +1,20 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+#include "Event.h"
+
+
+using namespace ai;
+
+ObjectGuid Event::getObject()
+{
+    if (packet.empty())
+        return ObjectGuid();
+
+    WorldPacket p(packet);
+    p.rpos(0);
+    
+    ObjectGuid guid;
+    p >> guid;
+
+    return guid;
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/Event.h b/src/game/playerbot/strategy/Event.h
new file mode 100644
index 00000000000..86ea279280a
--- /dev/null
+++ b/src/game/playerbot/strategy/Event.h
@@ -0,0 +1,36 @@
+#pragma once
+
+namespace ai
+{
+    class Event
+	{
+	public:
+        Event(Event const& other)
+        {
+            source = other.source;
+            param = other.param;
+            packet = other.packet;
+            owner = other.owner;
+        }
+        Event() {}
+        Event(string source) : source(source) {}
+        Event(string source, string param, Player* owner = NULL) : source(source), param(param), owner(owner) {}
+        Event(string source, WorldPacket &packet, Player* owner = NULL) : source(source), packet(packet), owner(owner) {}
+        virtual ~Event() {}
+
+	public:
+        string getSource() { return source; }
+        string getParam() { return param; }
+        WorldPacket& getPacket() { return packet; }
+        ObjectGuid getObject();
+        Player* getOwner() { return owner; }
+        bool operator! () const { return source.empty(); }
+
+    protected:
+        string source;
+        string param;
+        WorldPacket packet;
+        ObjectGuid object;
+        Player* owner;
+	};
+}
diff --git a/src/game/playerbot/strategy/ExternalEventHelper.h b/src/game/playerbot/strategy/ExternalEventHelper.h
new file mode 100644
index 00000000000..a25154e1073
--- /dev/null
+++ b/src/game/playerbot/strategy/ExternalEventHelper.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include "Trigger.h"
+
+namespace ai
+{
+    class ExternalEventHelper {
+    public:
+        ExternalEventHelper(AiObjectContext* aiObjectContext) : aiObjectContext(aiObjectContext) {}
+
+        bool ParseChatCommand(string command, Player* owner = NULL)
+        {
+            if (HandleCommand(command, "", owner))
+                return true;
+
+            size_t i = string::npos;
+            while (true)
+            {
+                size_t found = command.rfind(" ", i);
+                if (found == string::npos || !found)
+                    break;
+
+                string name = command.substr(0, found);
+                string param = command.substr(found + 1);
+
+                i = found - 1;
+
+                if (HandleCommand(name, param, owner))
+                    return true;
+            }
+
+            if (!ChatHelper::parseable(command))
+                return false;
+
+            HandleCommand("q", command, owner);
+            HandleCommand("c", command, owner);
+            HandleCommand("t", command, owner);
+            return true;
+        }
+
+        void HandlePacket(map<uint16, string> &handlers, const WorldPacket &packet, Player* owner = NULL)
+        {
+            uint16 opcode = packet.GetOpcode();
+            string name = handlers[opcode];
+            if (name.empty())
+                return;
+
+            Trigger* trigger = aiObjectContext->GetTrigger(name);
+            if (!trigger)
+                return;
+
+            WorldPacket p(packet);
+            trigger->ExternalEvent(p, owner);
+        }
+
+        bool HandleCommand(string name, string param, Player* owner = NULL)
+        {
+            Trigger* trigger = aiObjectContext->GetTrigger(name);
+            if (!trigger)
+                return false;
+
+            trigger->ExternalEvent(param, owner);
+            return true;
+        }
+
+    private:
+        AiObjectContext* aiObjectContext;
+    };
+}
diff --git a/src/game/playerbot/strategy/ItemVisitors.h b/src/game/playerbot/strategy/ItemVisitors.h
new file mode 100644
index 00000000000..0fdc2ee4673
--- /dev/null
+++ b/src/game/playerbot/strategy/ItemVisitors.h
@@ -0,0 +1,258 @@
+#pragma once
+
+char * strstri (const char* str1, const char* str2);
+
+namespace ai
+{
+    class IterateItemsVisitor
+    {
+    public:
+        IterateItemsVisitor() {}
+
+        virtual bool Visit(Item* item) = 0;
+    };
+
+    class FindItemVisitor : public IterateItemsVisitor {
+    public:
+        FindItemVisitor() : IterateItemsVisitor(), result(NULL) {}
+
+        virtual bool Visit(Item* item)
+        {
+            if (!Accept(item->GetProto()))
+                return true;
+
+            result.push_back(item);
+            return true;
+        }
+
+        list<Item*>& GetResult() { return result; }
+
+    protected:
+        virtual bool Accept(const ItemPrototype* proto) = 0;
+
+    private:
+        list<Item*> result;
+    };
+
+    enum IterateItemsMask
+    {
+        ITERATE_ITEMS_IN_BAGS = 1,
+        ITERATE_ITEMS_IN_EQUIP = 2,
+        ITERATE_ALL_ITEMS = 255
+    };
+
+    class FindUsableItemVisitor : public FindItemVisitor {
+    public:
+        FindUsableItemVisitor(Player* bot) : FindItemVisitor()
+        {
+            this->bot = bot;
+        }
+
+        virtual bool Visit(Item* item)
+        {
+            if (bot->CanUseItem(item->GetProto()) == EQUIP_ERR_OK)
+                return FindItemVisitor::Visit(item);
+
+            return true;
+        }
+
+    private:
+        Player* bot;
+    };
+
+
+    class FindItemsByQualityVisitor : public IterateItemsVisitor
+    {
+    public:
+        FindItemsByQualityVisitor(uint32 quality, int count) : IterateItemsVisitor()
+        {
+            this->quality = quality;
+            this->count = count;
+        }
+
+        virtual bool Visit(Item* item)
+        {
+            if (item->GetProto()->Quality != quality)
+                return true;
+
+            if (result.size() >= (size_t)count)
+                return false;
+
+            result.push_back(item);
+            return true;
+        }
+
+        list<Item*>& GetResult()
+        {
+            return result;
+        }
+
+    private:
+        uint32 quality;
+        int count;
+        list<Item*> result;
+    };
+
+    class FindItemsToTradeByQualityVisitor : public FindItemsByQualityVisitor
+    {
+    public:
+        FindItemsToTradeByQualityVisitor(uint32 quality, int count) : FindItemsByQualityVisitor(quality, count) {}
+
+        virtual bool Visit(Item* item)
+        {
+            if (item->IsSoulBound())
+                return true;
+
+            return FindItemsByQualityVisitor::Visit(item);
+        }
+    };
+
+    class FindItemsToTradeByClassVisitor : public IterateItemsVisitor
+    {
+    public:
+        FindItemsToTradeByClassVisitor(uint32 itemClass, uint32 itemSubClass, int count)
+            : IterateItemsVisitor(), count(count), itemClass(itemClass), itemSubClass(itemSubClass) {}
+
+        virtual bool Visit(Item* item)
+        {
+            if (item->IsSoulBound())
+                return true;
+
+            if (item->GetProto()->Class != itemClass || item->GetProto()->SubClass != itemSubClass)
+                return true;
+
+            if (result.size() >= (size_t)count)
+                return false;
+
+            result.push_back(item);
+            return true;
+        }
+
+        list<Item*>& GetResult()
+        {
+            return result;
+        }
+
+    private:
+        uint32 itemClass;
+        uint32 itemSubClass;
+        int count;
+        list<Item*> result;
+    };
+
+    class QueryItemCountVisitor : public IterateItemsVisitor
+    {
+    public:
+        QueryItemCountVisitor(uint32 itemId)
+        {
+            count = 0;
+            this->itemId = itemId;
+        }
+
+        virtual bool Visit(Item* item)
+        {
+            if (item->GetProto()->ItemId == itemId)
+                count += item->GetCount();
+
+            return true;
+        }
+
+        int GetCount() { return count; }
+
+    protected:
+        int count;
+        uint32 itemId;
+    };
+
+
+    class QueryNamedItemCountVisitor : public QueryItemCountVisitor
+    {
+    public:
+        QueryNamedItemCountVisitor(string name) : QueryItemCountVisitor(0)
+        {
+            this->name = name;
+        }
+
+        virtual bool Visit(Item* item)
+        {
+            const ItemPrototype* proto = item->GetProto();
+            if (proto && proto->Name1 && strstri(proto->Name1, name.c_str()))
+                count += item->GetCount();
+
+            return true;
+        }
+
+    private:
+        string name;
+    };
+
+    class FindUsableNamedItemVisitor : public FindUsableItemVisitor {
+    public:
+        FindUsableNamedItemVisitor(Player* bot, string name) : FindUsableItemVisitor(bot)
+        {
+            this->name = name;
+        }
+
+        virtual bool Accept(const ItemPrototype* proto)
+        {
+            return proto && proto->Name1 && strstri(proto->Name1, name.c_str());
+        }
+
+    private:
+        string name;
+    };
+
+    class FindItemByIdVisitor : public FindItemVisitor {
+    public:
+        FindItemByIdVisitor(uint32 id) : FindItemVisitor()
+        {
+            this->id = id;
+        }
+
+        virtual bool Accept(const ItemPrototype* proto)
+        {
+            return proto->ItemId == id;
+        }
+
+    private:
+        uint32 id;
+    };
+
+    class ListItemsVisitor : public IterateItemsVisitor
+    {
+    public:
+        ListItemsVisitor() : IterateItemsVisitor() {}
+
+        map<uint32, int> items;
+
+        virtual bool Visit(Item* item)
+        {
+            uint32 id = item->GetProto()->ItemId;
+
+            if (items.find(id) == items.end())
+                items[id] = 0;
+
+            items[id] += item->GetCount();
+            return true;
+        }
+    };
+
+    class ItemCountByQuality : public IterateItemsVisitor
+    {
+    public:
+        ItemCountByQuality() : IterateItemsVisitor()
+        {
+            for (uint32 i = 0; i < MAX_ITEM_QUALITY; ++i)
+                count[i] = 0;
+        }
+
+        virtual bool Visit(Item* item)
+        {
+            count[item->GetProto()->Quality]++;
+            return true;
+        }
+
+    public:
+        map<uint32, int> count;
+    };
+}
diff --git a/src/game/playerbot/strategy/Multiplier.cpp b/src/game/playerbot/strategy/Multiplier.cpp
new file mode 100644
index 00000000000..893d7f36c83
--- /dev/null
+++ b/src/game/playerbot/strategy/Multiplier.cpp
@@ -0,0 +1,5 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+#include "Multiplier.h"
+
+using namespace ai;
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/Multiplier.h b/src/game/playerbot/strategy/Multiplier.h
new file mode 100644
index 00000000000..e86fa05c28a
--- /dev/null
+++ b/src/game/playerbot/strategy/Multiplier.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "Action.h"
+
+namespace ai
+{
+    class Multiplier : public AiNamedObject
+    {
+    public:
+        Multiplier(PlayerbotAI* ai, string name) : AiNamedObject(ai, name) {}
+        virtual ~Multiplier() {}
+
+    public:
+        virtual float GetValue(Action* action) { return 1.0f; }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/NamedObjectContext.h b/src/game/playerbot/strategy/NamedObjectContext.h
new file mode 100644
index 00000000000..61081cf53fb
--- /dev/null
+++ b/src/game/playerbot/strategy/NamedObjectContext.h
@@ -0,0 +1,249 @@
+#pragma once;
+
+namespace ai
+{
+    using namespace std;
+
+    class Qualified
+    {
+    public:
+        Qualified() {};
+
+    public:
+        void Qualify(string qualifier) { this->qualifier = qualifier; }
+
+    protected:
+        string qualifier;
+    };
+
+    template <class T> class NamedObjectFactory
+    {
+    protected:
+        typedef T* (*ActionCreator) (PlayerbotAI* ai);
+        map<string, ActionCreator> creators;
+
+    public:
+        T* create(string name, PlayerbotAI* ai)
+        {
+            size_t found = name.find("::");
+            string qualifier;
+            if (found != string::npos)
+            {
+                qualifier = name.substr(found + 2);
+                name = name.substr(0, found);
+            }
+
+            if (creators.find(name) == creators.end())
+                return NULL;
+
+            ActionCreator creator = creators[name];
+            if (!creator)
+                return NULL;
+
+            T *object = (*creator)(ai);
+            Qualified *q = dynamic_cast<Qualified *>(object);
+            if (q)
+                q->Qualify(qualifier);
+
+            return object;
+        }
+
+        set<string> supports()
+        {
+            set<string> keys;
+            for (typename map<string, ActionCreator>::iterator it = creators.begin(); it != creators.end(); it++)
+                keys.insert(it->first);
+            return keys;
+        }
+    };
+
+
+    template <class T> class NamedObjectContext : public NamedObjectFactory<T>
+    {
+    public:
+        NamedObjectContext(bool shared = false, bool supportsSiblings = false) :
+            NamedObjectFactory<T>(), shared(shared), supportsSiblings(supportsSiblings) {}
+
+        T* create(string name, PlayerbotAI* ai)
+        {
+            if (created.find(name) == created.end())
+                return created[name] = NamedObjectFactory<T>::create(name, ai);
+
+            return created[name];
+        }
+
+        virtual ~NamedObjectContext()
+        {
+            Clear();
+        }
+
+        void Clear()
+        {
+            for (typename map<string, T*>::iterator i = created.begin(); i != created.end(); i++)
+            {
+                if (i->second)
+                    delete i->second;
+            }
+
+            created.clear();
+        }
+
+        void Update()
+        {
+            for (typename map<string, T*>::iterator i = created.begin(); i != created.end(); i++)
+            {
+                if (i->second)
+                    i->second->Update();
+            }
+        }
+
+        void Reset()
+        {
+            for (typename map<string, T*>::iterator i = created.begin(); i != created.end(); i++)
+            {
+                if (i->second)
+                    i->second->Reset();
+            }
+        }
+
+        bool IsShared() { return shared; }
+        bool IsSupportsSiblings() { return supportsSiblings; }
+
+        set<string> GetCreated()
+        {
+            set<string> keys;
+            for (typename map<string, T*>::iterator it = created.begin(); it != created.end(); it++)
+                keys.insert(it->first);
+            return keys;
+        }
+
+    protected:
+        map<string, T*> created;
+        bool shared;
+        bool supportsSiblings;
+    };
+
+    template <class T> class NamedObjectContextList
+    {
+    public:
+        virtual ~NamedObjectContextList()
+        {
+            for (typename list<NamedObjectContext<T>*>::iterator i = contexts.begin(); i != contexts.end(); i++)
+            {
+                NamedObjectContext<T>* context = *i;
+                if (!context->IsShared())
+                    delete context;
+            }
+        }
+
+        void Add(NamedObjectContext<T>* context)
+        {
+            contexts.push_back(context);
+        }
+
+        T* GetObject(string name, PlayerbotAI* ai)
+        {
+            for (typename list<NamedObjectContext<T>*>::iterator i = contexts.begin(); i != contexts.end(); i++)
+            {
+                T* object = (*i)->create(name, ai);
+                if (object) return object;
+            }
+            return NULL;
+        }
+
+        void Update()
+        {
+            for (typename list<NamedObjectContext<T>*>::iterator i = contexts.begin(); i != contexts.end(); i++)
+            {
+                if (!(*i)->IsShared())
+                    (*i)->Update();
+            }
+        }
+
+        void Reset()
+        {
+            for (typename list<NamedObjectContext<T>*>::iterator i = contexts.begin(); i != contexts.end(); i++)
+            {
+                (*i)->Reset();
+            }
+        }
+
+        set<string> GetSiblings(string name)
+        {
+            for (typename list<NamedObjectContext<T>*>::iterator i = contexts.begin(); i != contexts.end(); i++)
+            {
+                if (!(*i)->IsSupportsSiblings())
+                    continue;
+
+                set<string> supported = (*i)->supports();
+                set<string>::iterator found = supported.find(name);
+                if (found == supported.end())
+                    continue;
+
+                supported.erase(found);
+                return supported;
+            }
+
+            return set<string>();
+        }
+
+        set<string> supports()
+        {
+            set<string> result;
+
+            for (typename list<NamedObjectContext<T>*>::iterator i = contexts.begin(); i != contexts.end(); i++)
+            {
+                set<string> supported = (*i)->supports();
+
+                for (set<string>::iterator j = supported.begin(); j != supported.end(); j++)
+                    result.insert(*j);
+            }
+            return result;
+        }
+
+        set<string> GetCreated()
+        {
+            set<string> result;
+
+            for (typename list<NamedObjectContext<T>*>::iterator i = contexts.begin(); i != contexts.end(); i++)
+            {
+                set<string> createdKeys = (*i)->GetCreated();
+
+                for (set<string>::iterator j = createdKeys.begin(); j != createdKeys.end(); j++)
+                    result.insert(*j);
+            }
+            return result;
+        }
+
+    private:
+        list<NamedObjectContext<T>*> contexts;
+    };
+
+    template <class T> class NamedObjectFactoryList
+    {
+    public:
+        virtual ~NamedObjectFactoryList()
+        {
+            for (typename list<NamedObjectFactory<T>*>::iterator i = factories.begin(); i != factories.end(); i++)
+                delete *i;
+        }
+
+        void Add(NamedObjectFactory<T>* context)
+        {
+            factories.push_front(context);
+        }
+
+        T* GetObject(string name, PlayerbotAI* ai)
+        {
+            for (typename list<NamedObjectFactory<T>*>::iterator i = factories.begin(); i != factories.end(); i++)
+            {
+                T* object = (*i)->create(name, ai);
+                if (object) return object;
+            }
+            return NULL;
+        }
+
+    private:
+        list<NamedObjectFactory<T>*> factories;
+    };
+};
diff --git a/src/game/playerbot/strategy/PassiveMultiplier.cpp b/src/game/playerbot/strategy/PassiveMultiplier.cpp
new file mode 100644
index 00000000000..f987438f270
--- /dev/null
+++ b/src/game/playerbot/strategy/PassiveMultiplier.cpp
@@ -0,0 +1,47 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+#include "PassiveMultiplier.h"
+
+using namespace ai;
+
+list<string> PassiveMultiplier::allowedActions;
+list<string> PassiveMultiplier::allowedParts;
+
+PassiveMultiplier::PassiveMultiplier(PlayerbotAI* ai) : Multiplier(ai, "passive")
+{
+    if (allowedActions.empty())
+    {
+        allowedActions.push_back("co");
+        allowedActions.push_back("nc");
+        allowedActions.push_back("reset ai");
+        allowedActions.push_back("check mount state");
+    }
+
+    if (allowedParts.empty())
+    {
+        allowedParts.push_back("follow");
+        allowedParts.push_back("stay");
+        allowedParts.push_back("chat shortcut");
+    }
+}
+
+float PassiveMultiplier::GetValue(Action* action) {
+    if (!action)
+		return 1.0f;
+
+    string name = action->getName();
+
+    for (list<string>::iterator i = allowedActions.begin(); i != allowedActions.end(); i++)
+    {
+        if (name == *i)
+            return 1.0f;
+    }
+
+    for (list<string>::iterator i = allowedParts.begin(); i != allowedParts.end(); i++)
+    {
+        if (name.find(*i) != string::npos)
+            return 1.0f;
+    }
+
+    return 0;
+}
diff --git a/src/game/playerbot/strategy/PassiveMultiplier.h b/src/game/playerbot/strategy/PassiveMultiplier.h
new file mode 100644
index 00000000000..37985a06e33
--- /dev/null
+++ b/src/game/playerbot/strategy/PassiveMultiplier.h
@@ -0,0 +1,20 @@
+#pragma once
+#include "Action.h"
+#include "Multiplier.h"
+
+namespace ai
+{
+    class PassiveMultiplier : public Multiplier
+    {
+    public:
+        PassiveMultiplier(PlayerbotAI* ai);
+
+    public:
+        virtual float GetValue(Action* action);
+
+    private:
+        static list<string> allowedActions;
+        static list<string> allowedParts;
+    };
+
+}
diff --git a/src/game/playerbot/strategy/Queue.cpp b/src/game/playerbot/strategy/Queue.cpp
new file mode 100644
index 00000000000..8553b44232a
--- /dev/null
+++ b/src/game/playerbot/strategy/Queue.cpp
@@ -0,0 +1,81 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+#include "Action.h"
+#include "Queue.h"
+
+using namespace ai;
+
+
+void Queue::Push(ActionBasket *action)
+{
+	if (action)
+    {
+        for (std::list<ActionBasket*>::iterator iter = actions.begin(); iter != actions.end(); iter++)
+        {
+            ActionBasket* basket = *iter;
+            if (action->getAction()->getName() == basket->getAction()->getName())
+            {
+				if (basket->getRelevance() < action->getRelevance())
+					basket->setRelevance(action->getRelevance());
+                delete action;
+                return;
+            }
+        }
+		actions.push_back(action);
+    }
+}
+
+void Queue::Push(ActionBasket **actions)
+{
+	if (actions)
+	{
+		for (int i=0; i<sizeof(actions)/sizeof(ActionBasket*); i++)
+		{
+			Push(actions[i]);
+		}
+	}
+}
+
+ActionNode* Queue::Pop()
+{
+	float max = -1;
+	ActionBasket* selection = NULL;
+	for (std::list<ActionBasket*>::iterator iter = actions.begin(); iter != actions.end(); iter++)
+	{
+		ActionBasket* basket = *iter;
+		if (basket->getRelevance() > max)
+		{
+			max = basket->getRelevance();
+			selection = basket;
+		}
+	}
+	if (selection != NULL)
+	{
+		ActionNode* action = selection->getAction();
+		actions.remove(selection);
+		delete selection;
+		return action;
+	}
+	return NULL;
+}
+
+ActionBasket* Queue::Peek()
+{
+    float max = -1;
+    ActionBasket* selection = NULL;
+    for (std::list<ActionBasket*>::iterator iter = actions.begin(); iter != actions.end(); iter++)
+    {
+        ActionBasket* basket = *iter;
+        if (basket->getRelevance() > max)
+        {
+            max = basket->getRelevance();
+            selection = basket;
+        }
+    }
+    return selection;
+}
+
+int Queue::Size()
+{
+	return actions.size();
+}
diff --git a/src/game/playerbot/strategy/Queue.h b/src/game/playerbot/strategy/Queue.h
new file mode 100644
index 00000000000..b70a526cb3b
--- /dev/null
+++ b/src/game/playerbot/strategy/Queue.h
@@ -0,0 +1,21 @@
+#include "ActionBasket.h"
+
+#pragma once
+namespace ai
+{
+class Queue
+{
+public:
+    Queue(void) {}
+public:
+    ~Queue(void) {}
+public:
+	void Push(ActionBasket *action);
+	void Push(ActionBasket **actions);
+	ActionNode* Pop();
+    ActionBasket* Peek();
+	int Size();
+private:
+	std::list<ActionBasket*> actions;
+};
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/Strategy.cpp b/src/game/playerbot/strategy/Strategy.cpp
new file mode 100644
index 00000000000..5275ae02c06
--- /dev/null
+++ b/src/game/playerbot/strategy/Strategy.cpp
@@ -0,0 +1,117 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+#include "Strategy.h"
+#include "NamedObjectContext.h"
+
+using namespace ai;
+using namespace std;
+
+
+class ActionNodeFactoryInternal : public NamedObjectFactory<ActionNode>
+{
+public:
+    ActionNodeFactoryInternal()
+    {
+        creators["melee"] = &melee;
+        creators["healthstone"] = &healthstone;
+        creators["be near"] = &follow_master_random;
+        creators["attack anything"] = &attack_anything;
+        creators["move random"] = &move_random;
+        creators["move to loot"] = &move_to_loot;
+        creators["food"] = &food;
+        creators["drink"] = &drink;
+        creators["mana potion"] = &mana_potion;
+        creators["healing potion"] = &healing_potion;
+        creators["flee"] = &flee;
+    }
+
+private:
+    static ActionNode* melee(PlayerbotAI* ai)
+    {
+        return new ActionNode ("melee",
+            /*P*/ NextAction::array(0, new NextAction("reach melee"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* healthstone(PlayerbotAI* ai)
+    {
+        return new ActionNode ("healthstone",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("healing potion"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* follow_master_random(PlayerbotAI* ai)
+    {
+        return new ActionNode ("be near",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("follow"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* attack_anything(PlayerbotAI* ai)
+    {
+        return new ActionNode ("attack anything",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* move_random(PlayerbotAI* ai)
+    {
+        return new ActionNode ("move random",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("stay line"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* move_to_loot(PlayerbotAI* ai)
+    {
+        return new ActionNode ("move to loot",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* food(PlayerbotAI* ai)
+    {
+        return new ActionNode ("food",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* drink(PlayerbotAI* ai)
+    {
+        return new ActionNode ("drink",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* mana_potion(PlayerbotAI* ai)
+    {
+        return new ActionNode ("mana potion",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("drink"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* healing_potion(PlayerbotAI* ai)
+    {
+        return new ActionNode ("healing potion",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("food"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* flee(PlayerbotAI* ai)
+    {
+        return new ActionNode ("flee",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+};
+
+Strategy::Strategy(PlayerbotAI* ai) : PlayerbotAIAware(ai)
+{
+    actionNodeFactories.Add(new ActionNodeFactoryInternal());
+}
+
+ActionNode* Strategy::GetAction(string name)
+{
+    return actionNodeFactories.GetObject(name, ai);
+}
+
diff --git a/src/game/playerbot/strategy/Strategy.h b/src/game/playerbot/strategy/Strategy.h
new file mode 100644
index 00000000000..12e98eb26fd
--- /dev/null
+++ b/src/game/playerbot/strategy/Strategy.h
@@ -0,0 +1,55 @@
+#pragma once
+#include "Action.h"
+#include "Multiplier.h"
+#include "Trigger.h"
+#include "NamedObjectContext.h"
+
+namespace ai
+{
+	enum StrategyType
+	{
+		STRATEGY_TYPE_GENERIC = 0,
+		STRATEGY_TYPE_COMBAT = 1,
+		STRATEGY_TYPE_NONCOMBAT = 2,
+		STRATEGY_TYPE_TANK = 4,
+		STRATEGY_TYPE_DPS = 8,
+		STRATEGY_TYPE_HEAL = 16,
+		STRATEGY_TYPE_RANGED = 32,
+		STRATEGY_TYPE_MELEE = 64
+	};
+
+	enum ActionPriority
+	{
+	    ACTION_IDLE = 0,
+	    ACTION_NORMAL = 10,
+	    ACTION_HIGH = 20,
+	    ACTION_MOVE = 30,
+	    ACTION_INTERRUPT = 40,
+	    ACTION_DISPEL = 50,
+	    ACTION_LIGHT_HEAL = 60,
+	    ACTION_MEDIUM_HEAL = 70,
+	    ACTION_CRITICAL_HEAL = 80,
+	    ACTION_EMERGENCY = 90
+	};
+
+    class Strategy : public PlayerbotAIAware
+    {
+    public:
+        Strategy(PlayerbotAI* ai);
+        virtual ~Strategy() {}
+
+    public:
+        virtual NextAction** getDefaultActions() { return NULL; }
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers) {}
+        virtual void InitMultipliers(std::list<Multiplier*> &multipliers) {}
+        virtual string getName() = 0;
+		virtual int GetType() { return STRATEGY_TYPE_GENERIC; }
+        virtual ActionNode* GetAction(string name);
+        void Update() {}
+        void Reset() {}
+
+    protected:
+        NamedObjectFactoryList<ActionNode> actionNodeFactories;
+    };
+
+}
diff --git a/src/game/playerbot/strategy/StrategyContext.h b/src/game/playerbot/strategy/StrategyContext.h
new file mode 100644
index 00000000000..db0076f59fb
--- /dev/null
+++ b/src/game/playerbot/strategy/StrategyContext.h
@@ -0,0 +1,141 @@
+#pragma once;
+
+#include "generic/NonCombatStrategy.h"
+#include "generic/RacialsStrategy.h"
+#include "generic/ChatCommandHandlerStrategy.h"
+#include "generic/WorldPacketHandlerStrategy.h"
+#include "generic/DeadStrategy.h"
+#include "generic/QuestStrategies.h"
+#include "generic/LootNonCombatStrategy.h"
+#include "generic/DuelStrategy.h"
+#include "generic/KiteStrategy.h"
+#include "generic/FleeStrategy.h"
+#include "generic/FollowMasterStrategy.h"
+#include "generic/RunawayStrategy.h"
+#include "generic/StayStrategy.h"
+#include "generic/UseFoodStrategy.h"
+#include "generic/ConserveManaStrategy.h"
+#include "generic/EmoteStrategy.h"
+#include "generic/AttackRtiStrategy.h"
+#include "generic/AttackWeakStrategy.h"
+#include "generic/TankAoeStrategy.h"
+#include "generic/TankAssistStrategy.h"
+#include "generic/DpsAoeStrategy.h"
+#include "generic/DpsAssistStrategy.h"
+#include "generic/PassiveStrategy.h"
+#include "generic/GrindingStrategy.h"
+#include "generic/UsePotionsStrategy.h"
+#include "generic/GuardStrategy.h"
+#include "generic/CastTimeStrategy.h"
+#include "generic/ThreatStrategy.h"
+#include "generic/TellTargetStrategy.h"
+#include "generic/AttackEnemyPlayersStrategy.h"
+
+namespace ai
+{
+    class StrategyContext : public NamedObjectContext<Strategy>
+    {
+    public:
+        StrategyContext()
+        {
+            creators["racials"] = &StrategyContext::racials;
+            creators["loot"] = &StrategyContext::loot;
+            creators["gather"] = &StrategyContext::gather;
+            creators["emote"] = &StrategyContext::emote;
+            creators["passive"] = &StrategyContext::passive;
+            creators["conserve mana"] = &StrategyContext::conserve_mana;
+            creators["food"] = &StrategyContext::food;
+            creators["chat"] = &StrategyContext::chat;
+            creators["default"] = &StrategyContext::world_packet;
+            creators["ready check"] = &StrategyContext::ready_check;
+            creators["dead"] = &StrategyContext::dead;
+            creators["flee"] = &StrategyContext::flee;
+            creators["duel"] = &StrategyContext::duel;
+            creators["kite"] = &StrategyContext::kite;
+            creators["potions"] = &StrategyContext::potions;
+            creators["cast time"] = &StrategyContext::cast_time;
+            creators["threat"] = &StrategyContext::threat;
+            creators["tell target"] = &StrategyContext::tell_target;
+            creators["pvp"] = &StrategyContext::pvp;
+        }
+
+    private:
+        static Strategy* tell_target(PlayerbotAI* ai) { return new TellTargetStrategy(ai); }
+        static Strategy* threat(PlayerbotAI* ai) { return new ThreatStrategy(ai); }
+        static Strategy* cast_time(PlayerbotAI* ai) { return new CastTimeStrategy(ai); }
+        static Strategy* potions(PlayerbotAI* ai) { return new UsePotionsStrategy(ai); }
+        static Strategy* kite(PlayerbotAI* ai) { return new KiteStrategy(ai); }
+        static Strategy* duel(PlayerbotAI* ai) { return new DuelStrategy(ai); }
+        static Strategy* flee(PlayerbotAI* ai) { return new FleeStrategy(ai); }
+        static Strategy* dead(PlayerbotAI* ai) { return new DeadStrategy(ai); }
+        static Strategy* racials(PlayerbotAI* ai) { return new RacialsStrategy(ai); }
+        static Strategy* loot(PlayerbotAI* ai) { return new LootNonCombatStrategy(ai); }
+        static Strategy* gather(PlayerbotAI* ai) { return new GatherStrategy(ai); }
+        static Strategy* emote(PlayerbotAI* ai) { return new EmoteStrategy(ai); }
+        static Strategy* passive(PlayerbotAI* ai) { return new PassiveStrategy(ai); }
+        static Strategy* conserve_mana(PlayerbotAI* ai) { return new ConserveManaStrategy(ai); }
+        static Strategy* food(PlayerbotAI* ai) { return new UseFoodStrategy(ai); }
+        static Strategy* chat(PlayerbotAI* ai) { return new ChatCommandHandlerStrategy(ai); }
+        static Strategy* world_packet(PlayerbotAI* ai) { return new WorldPacketHandlerStrategy(ai); }
+        static Strategy* ready_check(PlayerbotAI* ai) { return new ReadyCheckStrategy(ai); }
+        static Strategy* pvp(PlayerbotAI* ai) { return new AttackEnemyPlayersStrategy(ai); }
+    };
+
+    class MovementStrategyContext : public NamedObjectContext<Strategy>
+    {
+    public:
+        MovementStrategyContext() : NamedObjectContext<Strategy>(false, true)
+        {
+            creators["follow"] = &MovementStrategyContext::follow_master;
+            creators["stay"] = &MovementStrategyContext::stay;
+            creators["runaway"] = &MovementStrategyContext::runaway;
+            creators["flee from adds"] = &MovementStrategyContext::flee_from_adds;
+            creators["guard"] = &MovementStrategyContext::guard;
+        }
+
+    private:
+        static Strategy* guard(PlayerbotAI* ai) { return new GuardStrategy(ai); }
+        static Strategy* follow_master(PlayerbotAI* ai) { return new FollowMasterStrategy(ai); }
+        static Strategy* stay(PlayerbotAI* ai) { return new StayStrategy(ai); }
+        static Strategy* runaway(PlayerbotAI* ai) { return new RunawayStrategy(ai); }
+        static Strategy* flee_from_adds(PlayerbotAI* ai) { return new FleeFromAddsStrategy(ai); }
+    };
+
+    class AssistStrategyContext : public NamedObjectContext<Strategy>
+    {
+    public:
+        AssistStrategyContext() : NamedObjectContext<Strategy>(false, true)
+        {
+            creators["dps assist"] = &AssistStrategyContext::dps_assist;
+            creators["dps aoe"] = &AssistStrategyContext::dps_aoe;
+            creators["tank assist"] = &AssistStrategyContext::tank_assist;
+            creators["tank aoe"] = &AssistStrategyContext::tank_aoe;
+            creators["attack weak"] = &AssistStrategyContext::attack_weak;
+            creators["grind"] = &AssistStrategyContext::grind;
+            creators["attack rti"] = &AssistStrategyContext::attack_rti;
+        }
+
+    private:
+        static Strategy* dps_assist(PlayerbotAI* ai) { return new DpsAssistStrategy(ai); }
+        static Strategy* dps_aoe(PlayerbotAI* ai) { return new DpsAoeStrategy(ai); }
+        static Strategy* tank_assist(PlayerbotAI* ai) { return new TankAssistStrategy(ai); }
+        static Strategy* tank_aoe(PlayerbotAI* ai) { return new TankAoeStrategy(ai); }
+        static Strategy* attack_weak(PlayerbotAI* ai) { return new AttackWeakStrategy(ai); }
+        static Strategy* grind(PlayerbotAI* ai) { return new GrindingStrategy(ai); }
+        static Strategy* attack_rti(PlayerbotAI* ai) { return new AttackRtiStrategy(ai); }
+    };
+
+    class QuestStrategyContext : public NamedObjectContext<Strategy>
+    {
+    public:
+        QuestStrategyContext() : NamedObjectContext<Strategy>(false, true)
+        {
+            creators["quest"] = &QuestStrategyContext::quest;
+            creators["accept all quests"] = &QuestStrategyContext::accept_all_quests;
+        }
+
+    private:
+        static Strategy* quest(PlayerbotAI* ai) { return new DefaultQuestStrategy(ai); }
+        static Strategy* accept_all_quests(PlayerbotAI* ai) { return new AcceptAllQuestsStrategy(ai); }
+    };
+};
diff --git a/src/game/playerbot/strategy/Trigger.cpp b/src/game/playerbot/strategy/Trigger.cpp
new file mode 100644
index 00000000000..7487f33adb1
--- /dev/null
+++ b/src/game/playerbot/strategy/Trigger.cpp
@@ -0,0 +1,27 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+#include "Trigger.h"
+#include "Action.h"
+
+using namespace ai;
+
+Event Trigger::Check()
+{
+	if (IsActive())
+	{
+		Event event(getName());
+		return event;
+	}
+	Event event;
+	return event;
+}
+
+Value<Unit*>* Trigger::GetTargetValue()
+{
+    return context->GetValue<Unit*>(GetTargetName());
+}
+
+Unit* Trigger::GetTarget()
+{
+    return GetTargetValue()->Get();
+}
diff --git a/src/game/playerbot/strategy/Trigger.h b/src/game/playerbot/strategy/Trigger.h
new file mode 100644
index 00000000000..2ae7276beb2
--- /dev/null
+++ b/src/game/playerbot/strategy/Trigger.h
@@ -0,0 +1,84 @@
+#pragma once
+#include "Action.h"
+#include "Event.h"
+#include "../PlayerbotAIAware.h"
+
+#define NEXT_TRIGGERS(name, relevance) \
+    virtual NextAction* getNextAction() { return new NextAction(name, relevance); }
+
+#define BEGIN_TRIGGER(clazz, super) \
+class clazz : public super \
+    { \
+    public: \
+        clazz(PlayerbotAI* ai) : super(ai) {} \
+    public: \
+        virtual bool IsActive();
+
+#define END_TRIGGER() \
+    };
+
+namespace ai
+{
+    class Trigger : public AiNamedObject
+	{
+	public:
+        Trigger(PlayerbotAI* ai, string name = "trigger", int checkInterval = 1) : AiNamedObject(ai, name) {
+			this->checkInterval = checkInterval;
+			ticksElapsed = 0;
+        }
+        virtual ~Trigger() {}
+
+	public:
+        virtual Event Check();
+        virtual void ExternalEvent(string param, Player* owner = NULL) {}
+        virtual void ExternalEvent(WorldPacket &packet, Player* owner = NULL) {}
+        virtual bool IsActive() { return false; }
+        virtual NextAction** getHandlers() { return NULL; }
+        void Update() {}
+        virtual void Reset() {}
+        virtual Unit* GetTarget();
+        virtual Value<Unit*>* GetTargetValue();
+        virtual string GetTargetName() { return "self target"; }
+
+		bool needCheck() {
+			if (++ticksElapsed >= checkInterval) {
+				ticksElapsed = 0;
+				return true;
+			}
+			return false;
+		}
+
+    protected:
+		int checkInterval;
+		int ticksElapsed;
+	};
+
+
+    class TriggerNode
+    {
+    public:
+        TriggerNode(string name, NextAction** handlers = NULL)
+        {
+            this->name = name;
+            this->handlers = handlers;
+            this->trigger = NULL;
+        }
+        virtual ~TriggerNode()
+        {
+            NextAction::destroy(handlers);
+        }
+
+    public:
+        Trigger* getTrigger() { return trigger; }
+        void setTrigger(Trigger* trigger) { this->trigger = trigger; }
+        string getName() { return name; }
+
+    public:
+        NextAction** getHandlers() { return NextAction::merge(NextAction::clone(handlers), trigger->getHandlers()); }
+
+    private:
+        Trigger* trigger;
+        NextAction** handlers;
+        std::string name;
+    };
+}
diff --git a/src/game/playerbot/strategy/Value.cpp b/src/game/playerbot/strategy/Value.cpp
new file mode 100644
index 00000000000..8b87c262268
--- /dev/null
+++ b/src/game/playerbot/strategy/Value.cpp
@@ -0,0 +1,5 @@
+#include "../../pchdef.h"
+#include "../playerbot.h"
+#include "Value.h"
+
+using namespace ai;
diff --git a/src/game/playerbot/strategy/Value.h b/src/game/playerbot/strategy/Value.h
new file mode 100644
index 00000000000..930e3f423a2
--- /dev/null
+++ b/src/game/playerbot/strategy/Value.h
@@ -0,0 +1,177 @@
+#pragma once
+#include "Action.h"
+#include "Event.h"
+#include "../PlayerbotAIAware.h"
+#include "AiObject.h"
+
+namespace ai
+{
+    class UntypedValue : public AiNamedObject
+    {
+    public:
+        UntypedValue(PlayerbotAI* ai, string name) : AiNamedObject(ai, name) {}
+        virtual void Update() {}
+        virtual void Reset() {}
+        virtual string Format() { return "?"; }
+    };
+
+    template<class T>
+    class Value
+    {
+    public:
+        virtual T Get() = 0;
+        virtual void Set(T value) = 0;
+        operator T() { return Get(); }
+    };
+
+    template<class T>
+    class CalculatedValue : public UntypedValue, public Value<T>
+	{
+	public:
+        CalculatedValue(PlayerbotAI* ai, string name = "value", int checkInterval = 1) : UntypedValue(ai, name),
+            checkInterval(checkInterval), ticksElapsed(checkInterval)
+        { }
+        virtual ~CalculatedValue() {}
+
+	public:
+        virtual T Get()
+        {
+            if (ticksElapsed >= checkInterval) {
+                ticksElapsed = 0;
+                value = Calculate();
+            }
+            return value;
+        }
+        virtual void Set(T value) { this->value = value; }
+        virtual void Update()
+        {
+            if (ticksElapsed < checkInterval) {
+                ticksElapsed++;
+            }
+        }
+
+    protected:
+        virtual T Calculate() = 0;
+
+    protected:
+		int checkInterval;
+		int ticksElapsed;
+        T value;
+	};
+
+    class Uint8CalculatedValue : public CalculatedValue<uint8>
+    {
+    public:
+        Uint8CalculatedValue(PlayerbotAI* ai, string name = "value", int checkInterval = 1) :
+            CalculatedValue<uint8>(ai, name, checkInterval) {}
+
+        virtual string Format()
+        {
+            ostringstream out; out << (int)Calculate();
+            return out.str();
+        }
+    };
+
+    class Uint32CalculatedValue : public CalculatedValue<uint32>
+    {
+    public:
+        Uint32CalculatedValue(PlayerbotAI* ai, string name = "value", int checkInterval = 1) :
+            CalculatedValue<uint32>(ai, name, checkInterval) {}
+
+        virtual string Format()
+        {
+            ostringstream out; out << (int)Calculate();
+            return out.str();
+        }
+    };
+
+    class FloatCalculatedValue : public CalculatedValue<float>
+    {
+    public:
+        FloatCalculatedValue(PlayerbotAI* ai, string name = "value", int checkInterval = 1) :
+            CalculatedValue<float>(ai, name, checkInterval) {}
+
+        virtual string Format()
+        {
+            ostringstream out; out << Calculate();
+            return out.str();
+        }
+    };
+
+    class BoolCalculatedValue : public CalculatedValue<bool>
+    {
+    public:
+        BoolCalculatedValue(PlayerbotAI* ai, string name = "value", int checkInterval = 1) :
+            CalculatedValue<bool>(ai, name, checkInterval) {}
+
+        virtual string Format()
+        {
+            return Calculate() ? "true" : "false";
+        }
+    };
+
+    class UnitCalculatedValue : public CalculatedValue<Unit*>
+    {
+    public:
+        UnitCalculatedValue(PlayerbotAI* ai, string name = "value", int checkInterval = 1) :
+            CalculatedValue<Unit*>(ai, name, checkInterval) {}
+
+        virtual string Format()
+        {
+            Unit* unit = Calculate();
+            return unit ? unit->GetName() : "<none>";
+        }
+    };
+
+    class ObjectGuidListCalculatedValue : public CalculatedValue<list<ObjectGuid> >
+    {
+    public:
+        ObjectGuidListCalculatedValue(PlayerbotAI* ai, string name = "value", int checkInterval = 1) :
+            CalculatedValue<list<ObjectGuid> >(ai, name, checkInterval) {}
+
+        virtual string Format()
+        {
+            ostringstream out; out << "{";
+            list<ObjectGuid> guids = Calculate();
+            for (list<ObjectGuid>::iterator i = guids.begin(); i != guids.end(); ++i)
+            {
+                ObjectGuid guid = *i;
+                out << guid.GetRawValue() << ",";
+            }
+            out << "}";
+            return out.str();
+        }
+    };
+
+    template<class T>
+    class ManualSetValue : public UntypedValue, public Value<T>
+    {
+    public:
+        ManualSetValue(PlayerbotAI* ai, T defaultValue, string name = "value") :
+            UntypedValue(ai, name), value(defaultValue), defaultValue(defaultValue) {}
+        virtual ~ManualSetValue() {}
+
+    public:
+        virtual T Get() { return value; }
+        virtual void Set(T value) { this->value = value; }
+        virtual void Update() { }
+        virtual void Reset() { value = defaultValue; }
+
+    protected:
+        T value;
+        T defaultValue;
+    };
+
+    class UnitManualSetValue : public ManualSetValue<Unit*>
+    {
+    public:
+        UnitManualSetValue(PlayerbotAI* ai, Unit* defaultValue, string name = "value") :
+            ManualSetValue<Unit*>(ai, defaultValue, name) {}
+
+        virtual string Format()
+        {
+            Unit* unit = Get();
+            return unit ? unit->GetName() : "<none>";
+        }
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/AcceptDuelAction.h b/src/game/playerbot/strategy/actions/AcceptDuelAction.h
new file mode 100644
index 00000000000..fb8db06a764
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/AcceptDuelAction.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class AcceptDuelAction : public Action
+    {
+    public:
+        AcceptDuelAction(PlayerbotAI* ai) : Action(ai, "accept duel")
+        {}
+
+        virtual bool Execute(Event event)
+        {
+            WorldPacket p(event.getPacket());
+
+            ObjectGuid flagGuid;
+            p >> flagGuid;
+            ObjectGuid playerGuid;
+            p >> playerGuid;
+
+            WorldPacket* const packet = new WorldPacket(CMSG_DUEL_ACCEPTED, 8);
+            *packet << flagGuid;
+            bot->GetSession()->QueuePacket(packet);
+
+            ai->ResetStrategies();
+            return true;
+        }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/AcceptInvitationAction.h b/src/game/playerbot/strategy/actions/AcceptInvitationAction.h
new file mode 100644
index 00000000000..61f4bad844b
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/AcceptInvitationAction.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class AcceptInvitationAction : public Action {
+    public:
+        AcceptInvitationAction(PlayerbotAI* ai) : Action(ai, "accept invitation") {}
+
+        virtual bool Execute(Event event)
+        {
+            Player* master = GetMaster();
+
+            Group* grp = sObjectMgr.GetGroup(bot->GetGroupInvite());
+            if (!grp)
+                return false;
+
+            Player* inviter = sObjectMgr.GetPlayer(grp->GetLeaderGuid());
+            if (!inviter)
+                return false;
+
+			if (!ai->GetSecurity()->CheckLevelFor(PLAYERBOT_SECURITY_INVITE, false, inviter))
+            {
+                WorldPacket data(SMSG_GROUP_DECLINE, 10);
+                data << bot->GetName();
+                inviter->GetSession()->SendPacket(&data);
+                bot->UninviteFromGroup();
+                return false;
+            }
+
+            WorldPacket p;
+            uint32 roles_mask = 0;
+            p << roles_mask;
+            bot->GetSession()->HandleGroupAcceptOpcode(p);
+
+            if (sRandomPlayerbotMgr.IsRandomBot(bot))
+                bot->GetPlayerbotAI()->SetMaster(inviter);
+
+            ai->ResetStrategies();
+            ai->TellMaster("Hello");
+            return true;
+        }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/AcceptQuestAction.cpp b/src/game/playerbot/strategy/actions/AcceptQuestAction.cpp
new file mode 100644
index 00000000000..db7b3e2b0d9
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/AcceptQuestAction.cpp
@@ -0,0 +1,105 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "AcceptQuestAction.h"
+
+using namespace ai;
+
+void AcceptAllQuestsAction::ProcessQuest(Quest const* quest, WorldObject* questGiver)
+{
+    AcceptQuest(quest, questGiver->GetObjectGuid());
+}
+
+bool AcceptQuestAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+
+    if (!master)
+        return false;
+
+    Player *bot = ai->GetBot();
+    uint64 guid;
+    uint32 quest;
+
+    string text = event.getParam();
+    PlayerbotChatHandler ch(master);
+    quest = ch.extractQuestId(text);
+    if (quest)
+    {
+        guid = master->GetSelectionGuid().GetRawValue();
+        if (!guid)
+        {
+            ai->TellMaster("Please select quest giver NPC");
+            return false;
+        }
+    }
+    else if (!event.getPacket().empty())
+    {
+        WorldPacket& p = event.getPacket();
+        p.rpos(0);
+        p >> guid >> quest;
+    }
+    else if (text == "*")
+    {
+        return QuestAction::Execute(event);
+    }
+    else
+        return false;
+
+    Quest const* qInfo = sObjectMgr.GetQuestTemplate(quest);
+    if (!qInfo)
+        return false;
+
+    return AcceptQuest(qInfo, guid);
+}
+
+bool AcceptQuestShareAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    Player *bot = ai->GetBot();
+
+    WorldPacket& p = event.getPacket();
+    p.rpos(0);
+    uint32 quest;
+    p >> quest;
+    Quest const* qInfo = sObjectMgr.GetQuestTemplate(quest);
+
+    if (!qInfo || !bot->GetDividerGuid())
+        return false;
+
+    quest = qInfo->GetQuestId();
+    if( !bot->CanTakeQuest( qInfo, false ) )
+    {
+        // can't take quest
+        bot->SetDividerGuid( ObjectGuid() );
+        ai->TellMaster("I can't take this quest");
+
+        return false;
+    }
+
+    if( !bot->GetDividerGuid().IsEmpty() )
+    {
+        // send msg to quest giving player
+        master->SendPushToPartyResponse( bot, QUEST_PARTY_MSG_ACCEPT_QUEST );
+        bot->SetDividerGuid( ObjectGuid() );
+    }
+
+    if( bot->CanAddQuest( qInfo, false ) )
+    {
+        bot->AddQuest( qInfo, master );
+
+        if( bot->CanCompleteQuest( quest ) )
+            bot->CompleteQuest( quest );
+
+        // Runsttren: did not add typeid switch from WorldSession::HandleQuestgiverAcceptQuestOpcode!
+        // I think it's not needed, cause typeid should be TYPEID_PLAYER - and this one is not handled
+        // there and there is no default case also.
+
+        if( qInfo->GetSrcSpell() > 0 )
+            bot->CastSpell( bot, qInfo->GetSrcSpell(), true );
+
+        ai->TellMaster("Quest accepted");
+        return true;
+    }
+
+    return false;
+}
diff --git a/src/game/playerbot/strategy/actions/AcceptQuestAction.h b/src/game/playerbot/strategy/actions/AcceptQuestAction.h
new file mode 100644
index 00000000000..856c6971807
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/AcceptQuestAction.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "../Action.h"
+#include "QuestAction.h"
+
+namespace ai
+{
+    class AcceptAllQuestsAction : public QuestAction {
+    public:
+        AcceptAllQuestsAction(PlayerbotAI* ai, string name = "accept all quests") : QuestAction(ai, name) {}
+
+    protected:
+        virtual void ProcessQuest(Quest const* quest, WorldObject* questGiver);
+    };
+
+    class AcceptQuestAction : public AcceptAllQuestsAction {
+    public:
+        AcceptQuestAction(PlayerbotAI* ai) : AcceptAllQuestsAction(ai, "accept quest") {}
+        virtual bool Execute(Event event);
+    };
+
+    class AcceptQuestShareAction : public Action {
+    public:
+        AcceptQuestShareAction(PlayerbotAI* ai) : Action(ai, "accept quest share") {}
+        virtual bool Execute(Event event);
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/AcceptResurrectAction.h b/src/game/playerbot/strategy/actions/AcceptResurrectAction.h
new file mode 100644
index 00000000000..87ddea03c2d
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/AcceptResurrectAction.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class AcceptResurrectAction : public Action {
+    public:
+        AcceptResurrectAction(PlayerbotAI* ai) : Action(ai, "accept resurrect") {}
+
+        virtual bool Execute(Event event)
+        {
+            if (bot->isAlive())
+                return false;
+
+            WorldPacket p(event.getPacket());
+            p.rpos(0);
+            ObjectGuid guid;
+            p >> guid;
+
+            WorldPacket* const packet = new WorldPacket(CMSG_RESURRECT_RESPONSE, 8+1);
+            *packet << guid;
+            *packet << uint8(1);                        // accept
+            bot->GetSession()->QueuePacket(packet);   // queue the packet to get around race condition
+
+            ai->ChangeEngine(BOT_STATE_NON_COMBAT);
+            return true;
+        }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/ActionContext.h b/src/game/playerbot/strategy/actions/ActionContext.h
new file mode 100644
index 00000000000..71743ae023e
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ActionContext.h
@@ -0,0 +1,107 @@
+#pragma once;
+
+#include "GenericActions.h"
+#include "NonCombatActions.h"
+#include "EmoteAction.h"
+#include "AddLootAction.h"
+#include "LootAction.h"
+#include "AddLootAction.h"
+#include "StayActions.h"
+#include "FollowActions.h"
+#include "ChangeStrategyAction.h"
+#include "ChooseTargetActions.h"
+#include "SuggestWhatToDoAction.h"
+#include "PositionAction.h"
+#include "AttackAction.h"
+
+namespace ai
+{
+    class ActionContext : public NamedObjectContext<Action>
+    {
+    public:
+        ActionContext()
+        {
+            creators["attack"] = &ActionContext::melee;
+            creators["melee"] = &ActionContext::melee;
+            creators["reach spell"] = &ActionContext::ReachSpell;
+            creators["reach melee"] = &ActionContext::ReachMelee;
+            creators["flee"] = &ActionContext::flee;
+            creators["gift of the naaru"] = &ActionContext::gift_of_the_naaru;
+            creators["shoot"] = &ActionContext::shoot;
+            creators["lifeblood"] = &ActionContext::lifeblood;
+            creators["arcane torrent"] = &ActionContext::arcane_torrent;
+            creators["end pull"] = &ActionContext::end_pull;
+            creators["healthstone"] = &ActionContext::healthstone;
+            creators["healing potion"] = &ActionContext::healing_potion;
+            creators["mana potion"] = &ActionContext::mana_potion;
+            creators["food"] = &ActionContext::food;
+            creators["drink"] = &ActionContext::drink;
+            creators["tank assist"] = &ActionContext::tank_assist;
+            creators["dps assist"] = &ActionContext::dps_assist;
+            creators["attack rti target"] = &ActionContext::attack_rti_target;
+            creators["loot"] = &ActionContext::loot;
+            creators["add loot"] = &ActionContext::add_loot;
+            creators["add gathering loot"] = &ActionContext::add_gathering_loot;
+            creators["add all loot"] = &ActionContext::add_all_loot;
+            creators["shoot"] = &ActionContext::shoot;
+            creators["follow"] = &ActionContext::follow;
+            creators["follow"] = &ActionContext::follow;
+            creators["runaway"] = &ActionContext::runaway;
+            creators["stay"] = &ActionContext::stay;
+            creators["attack anything"] = &ActionContext::attack_anything;
+            creators["attack least hp target"] = &ActionContext::attack_least_hp_target;
+            creators["attack enemy player"] = &ActionContext::enemy_player_target;
+            creators["emote"] = &ActionContext::emote;
+            creators["suggest what to do"] = &ActionContext::suggest_what_to_do;
+            creators["move random"] = &ActionContext::move_random;
+            creators["move to loot"] = &ActionContext::move_to_loot;
+            creators["open loot"] = &ActionContext::open_loot;
+            creators["guard"] = &ActionContext::guard;
+            creators["move out of enemy contact"] = &ActionContext::move_out_of_enemy_contact;
+            creators["set facing"] = &ActionContext::set_facing;
+            creators["attack duel opponent"] = &ActionContext::attack_duel_opponent;
+            creators["drop target"] = &ActionContext::drop_target;
+        }
+
+    private:
+        static Action* drop_target(PlayerbotAI* ai) { return new DropTargetAction(ai); }
+        static Action* attack_duel_opponent(PlayerbotAI* ai) { return new AttackDuelOpponentAction(ai); }
+        static Action* guard(PlayerbotAI* ai) { return new GuardAction(ai); }
+        static Action* open_loot(PlayerbotAI* ai) { return new OpenLootAction(ai); }
+        static Action* move_to_loot(PlayerbotAI* ai) { return new MoveToLootAction(ai); }
+        static Action* move_random(PlayerbotAI* ai) { return new MoveRandomAction(ai); }
+        static Action* shoot(PlayerbotAI* ai) { return new CastShootAction(ai); }
+        static Action* melee(PlayerbotAI* ai) { return new MeleeAction(ai); }
+        static Action* ReachSpell(PlayerbotAI* ai) { return new ReachSpellAction(ai); }
+        static Action* ReachMelee(PlayerbotAI* ai) { return new ReachMeleeAction(ai); }
+        static Action* flee(PlayerbotAI* ai) { return new FleeAction(ai); }
+        static Action* gift_of_the_naaru(PlayerbotAI* ai) { return new CastGiftOfTheNaaruAction(ai); }
+        static Action* lifeblood(PlayerbotAI* ai) { return new CastLifeBloodAction(ai); }
+        static Action* arcane_torrent(PlayerbotAI* ai) { return new CastArcaneTorrentAction(ai); }
+        static Action* end_pull(PlayerbotAI* ai) { return new ChangeCombatStrategyAction(ai, "-pull"); }
+
+        static Action* emote(PlayerbotAI* ai) { return new EmoteAction(ai); }
+        static Action* suggest_what_to_do(PlayerbotAI* ai) { return new SuggestWhatToDoAction(ai); }
+        static Action* attack_anything(PlayerbotAI* ai) { return new AttackAnythingAction(ai); }
+        static Action* attack_least_hp_target(PlayerbotAI* ai) { return new AttackLeastHpTargetAction(ai); }
+        static Action* enemy_player_target(PlayerbotAI* ai) { return new AttackEnemyPlayerAction(ai); }
+        static Action* stay(PlayerbotAI* ai) { return new StayAction(ai); }
+        static Action* runaway(PlayerbotAI* ai) { return new RunAwayAction(ai); }
+        static Action* follow(PlayerbotAI* ai) { return new FollowAction(ai); }
+        static Action* add_gathering_loot(PlayerbotAI* ai) { return new AddGatheringLootAction(ai); }
+        static Action* add_loot(PlayerbotAI* ai) { return new AddLootAction(ai); }
+        static Action* add_all_loot(PlayerbotAI* ai) { return new AddAllLootAction(ai); }
+        static Action* loot(PlayerbotAI* ai) { return new LootAction(ai); }
+        static Action* dps_assist(PlayerbotAI* ai) { return new DpsAssistAction(ai); }
+        static Action* attack_rti_target(PlayerbotAI* ai) { return new AttackRtiTargetAction(ai); }
+        static Action* tank_assist(PlayerbotAI* ai) { return new TankAssistAction(ai); }
+        static Action* drink(PlayerbotAI* ai) { return new DrinkAction(ai); }
+        static Action* food(PlayerbotAI* ai) { return new EatAction(ai); }
+        static Action* mana_potion(PlayerbotAI* ai) { return new UseManaPotion(ai); }
+        static Action* healing_potion(PlayerbotAI* ai) { return new UseHealingPotion(ai); }
+        static Action* healthstone(PlayerbotAI* ai) { return new UseItemAction(ai, "healthstone"); }
+        static Action* move_out_of_enemy_contact(PlayerbotAI* ai) { return new MoveOutOfEnemyContactAction(ai); }
+        static Action* set_facing(PlayerbotAI* ai) { return new SetFacingTargetAction(ai); }
+    };
+
+};
diff --git a/src/game/playerbot/strategy/actions/AddLootAction.cpp b/src/game/playerbot/strategy/actions/AddLootAction.cpp
new file mode 100644
index 00000000000..4d2c3aecac3
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/AddLootAction.cpp
@@ -0,0 +1,62 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "AddLootAction.h"
+
+#include "../../LootObjectStack.h"
+
+using namespace ai;
+
+bool AddLootAction::Execute(Event event)
+{
+    ObjectGuid guid = event.getObject();
+    if (!guid)
+        return false;
+
+    return AI_VALUE(LootObjectStack*, "available loot")->Add(guid);
+}
+
+bool AddAllLootAction::Execute(Event event)
+{
+    bool added = false;
+
+    list<ObjectGuid> gos = context->GetValue<list<ObjectGuid> >("nearest game objects")->Get();
+    for (list<ObjectGuid>::iterator i = gos.begin(); i != gos.end(); i++)
+        added |= AddLoot(*i);
+
+    list<ObjectGuid> corpses = context->GetValue<list<ObjectGuid> >("nearest corpses")->Get();
+    for (list<ObjectGuid>::iterator i = corpses.begin(); i != corpses.end(); i++)
+        added |= AddLoot(*i);
+
+    return added;
+}
+
+bool AddLootAction::isUseful()
+{
+    return AI_VALUE(uint8, "bag space") < 80;
+}
+
+bool AddAllLootAction::isUseful()
+{
+    return AI_VALUE(uint8, "bag space") < 80;
+}
+
+bool AddAllLootAction::AddLoot(ObjectGuid guid)
+{
+    return AI_VALUE(LootObjectStack*, "available loot")->Add(guid);
+}
+
+bool AddGatheringLootAction::AddLoot(ObjectGuid guid)
+{
+    LootObject loot(bot, guid);
+
+    if (loot.IsEmpty() || !loot.GetWorldObject(bot))
+        return false;
+
+    if (loot.skillId == SKILL_NONE)
+        return false;
+
+    if (!loot.IsLootPossible(bot))
+        return false;
+
+    return AddAllLootAction::AddLoot(guid);
+}
diff --git a/src/game/playerbot/strategy/actions/AddLootAction.h b/src/game/playerbot/strategy/actions/AddLootAction.h
new file mode 100644
index 00000000000..402c50ad4d7
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/AddLootAction.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class AddLootAction : public Action {
+    public:
+        AddLootAction(PlayerbotAI* ai) : Action(ai, "add loot") {}
+        virtual bool Execute(Event event);
+        virtual bool isUseful();
+    };
+
+    class AddAllLootAction : public Action {
+    public:
+        AddAllLootAction(PlayerbotAI* ai, string name = "add all loot") : Action(ai, name) {}
+        virtual bool Execute(Event event);
+        virtual bool isUseful();
+
+    protected:
+        virtual bool AddLoot(ObjectGuid guid);
+    };
+
+    class AddGatheringLootAction : public AddAllLootAction {
+    public:
+        AddGatheringLootAction(PlayerbotAI* ai) : AddAllLootAction(ai, "add gathering loot") {}
+
+    protected:
+        virtual bool AddLoot(ObjectGuid guid);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/AreaTriggerAction.cpp b/src/game/playerbot/strategy/actions/AreaTriggerAction.cpp
new file mode 100644
index 00000000000..e3bd846cc37
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/AreaTriggerAction.cpp
@@ -0,0 +1,87 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "AreaTriggerAction.h"
+#include "../../PlayerbotAIConfig.h"
+
+
+using namespace ai;
+
+bool ReachAreaTriggerAction::Execute(Event event)
+{
+    uint32 triggerId;
+    WorldPacket p(event.getPacket());
+    p.rpos(0);
+    p >> triggerId;
+
+    AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(triggerId);
+    if(!atEntry)
+        return false;
+
+    AreaTrigger const* at = sObjectMgr.GetAreaTrigger(triggerId);
+    if (!at)
+    {
+        WorldPacket p1(CMSG_AREATRIGGER);
+        p1 << triggerId;
+        p1.rpos(0);
+        bot->GetSession()->HandleAreaTriggerOpcode(p1);
+
+        return true;
+    }
+
+    if (at->requiredLevel > bot->getLevel())
+    {
+        ostringstream out; out << "I won't follow: |h|cff00ff00" << (int)at->requiredLevel << "|h|cffffffff level is required";
+        ai->TellMaster(out);
+        return false;
+    }
+
+    if (bot->GetMapId() != atEntry->mapid || bot->GetDistance(atEntry->x, atEntry->y, atEntry->z) > sPlayerbotAIConfig.sightDistance)
+    {
+        ai->TellMaster("I won't follow: too far away");
+        return true;
+    }
+
+    ai->ChangeStrategy("-follow,+stay", BOT_STATE_NON_COMBAT);
+
+    MotionMaster &mm = *bot->GetMotionMaster();
+    mm.Clear();
+	mm.MovePoint(atEntry->mapid, atEntry->x, atEntry->y, atEntry->z);
+    float distance = bot->GetDistance(atEntry->x, atEntry->y, atEntry->z);
+    float delay = 1000.0f * distance / bot->GetSpeed(MOVE_RUN) + sPlayerbotAIConfig.reactDelay;
+    ai->TellMaster("Wait for me");
+    ai->SetNextCheckDelay(delay);
+    context->GetValue<LastMovement&>("last movement")->Get().lastAreaTrigger = triggerId;
+
+    return true;
+}
+
+
+
+bool AreaTriggerAction::Execute(Event event)
+{
+    LastMovement& movement = context->GetValue<LastMovement&>("last movement")->Get();
+
+    uint32 triggerId = movement.lastAreaTrigger;
+    movement.lastAreaTrigger = 0;
+
+    AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(triggerId);
+    if(!atEntry)
+        return false;
+
+    AreaTrigger const* at = sObjectMgr.GetAreaTrigger(triggerId);
+    if (!at)
+        return true;
+
+    ai->ChangeStrategy("-follow,+stay", BOT_STATE_NON_COMBAT);
+
+    MotionMaster &mm = *bot->GetMotionMaster();
+    mm.Clear();
+
+    WorldPacket p(CMSG_AREATRIGGER);
+    p << triggerId;
+    p.rpos(0);
+    bot->GetSession()->HandleAreaTriggerOpcode(p);
+
+    ai->TellMaster("Hello");
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/AreaTriggerAction.h b/src/game/playerbot/strategy/actions/AreaTriggerAction.h
new file mode 100644
index 00000000000..de2b63aaa57
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/AreaTriggerAction.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "../Action.h"
+#include "MovementActions.h"
+#include "../values/LastMovementValue.h"
+
+namespace ai
+{
+    class ReachAreaTriggerAction : public MovementAction {
+    public:
+        ReachAreaTriggerAction(PlayerbotAI* ai) : MovementAction(ai, "reach area trigger") {}
+
+        virtual bool Execute(Event event);
+    };
+
+    class AreaTriggerAction : public MovementAction {
+    public:
+        AreaTriggerAction(PlayerbotAI* ai) : MovementAction(ai, "area trigger") {}
+
+        virtual bool Execute(Event event);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/AttackAction.cpp b/src/game/playerbot/strategy/actions/AttackAction.cpp
new file mode 100644
index 00000000000..e3f34b9c300
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/AttackAction.cpp
@@ -0,0 +1,102 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "AttackAction.h"
+#include "../../../movementGenerators/MovementGenerator.h"
+#include "../../../CreatureAI.h"
+#include "../../LootObjectStack.h"
+
+using namespace ai;
+
+bool AttackAction::Execute(Event event)
+{
+    Unit* target = GetTarget();
+
+    if (!target)
+        return false;
+
+    return Attack(target);
+}
+
+bool AttackMyTargetAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    ObjectGuid guid = master->GetSelectionGuid();
+    if (!guid)
+    {
+        if (verbose) ai->TellMaster("You have no target");
+        return false;
+    }
+
+    return Attack(ai->GetUnit(guid));
+}
+
+bool AttackAction::Attack(Unit* target)
+{
+    MotionMaster &mm = *bot->GetMotionMaster();
+    if (mm.GetCurrentMovementGeneratorType() == FLIGHT_MOTION_TYPE || bot->IsTaxiFlying())
+    {
+        if (verbose) ai->TellMaster("I cannot attack in flight");
+        return false;
+    }
+
+    if (!target)
+    {
+        if (verbose) ai->TellMaster("I have no target");
+        return false;
+    }
+
+    ostringstream msg;
+    msg << target->GetName();
+    if (bot->IsFriendlyTo(target))
+    {
+        msg << " is friendly to me";
+        if (verbose) ai->TellMaster(msg.str());
+        return false;
+    }
+    if (!bot->IsWithinLOSInMap(target))
+    {
+        msg << " is not on my sight";
+        if (verbose) ai->TellMaster(msg.str());
+        return false;
+    }
+
+    if (bot->IsMounted())
+    {
+        WorldPacket emptyPacket;
+        bot->GetSession()->HandleCancelMountAuraOpcode(emptyPacket);
+    }
+
+    ObjectGuid guid = target->GetObjectGuid();
+    bot->SetSelectionGuid(target->GetObjectGuid());
+
+    Unit* oldTarget = context->GetValue<Unit*>("current target")->Get();
+    context->GetValue<Unit*>("old target")->Set(oldTarget);
+
+    context->GetValue<Unit*>("current target")->Set(target);
+    context->GetValue<LootObjectStack*>("available loot")->Get()->Add(guid);
+
+    Pet* pet = bot->GetPet();
+    if (pet)
+    {
+        CreatureAI* creatureAI = ((Creature*)pet)->AI();
+        if (creatureAI)
+            creatureAI->AttackStart(target);
+    }
+
+    bot->Attack(target, true);
+    ai->ChangeEngine(BOT_STATE_COMBAT);
+    return true;
+}
+
+bool AttackDuelOpponentAction::isUseful()
+{
+    return AI_VALUE(Unit*, "duel target");
+}
+
+bool AttackDuelOpponentAction::Execute(Event event)
+{
+    return Attack(AI_VALUE(Unit*, "duel target"));
+}
diff --git a/src/game/playerbot/strategy/actions/AttackAction.h b/src/game/playerbot/strategy/actions/AttackAction.h
new file mode 100644
index 00000000000..ede665dc88a
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/AttackAction.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include "../Action.h"
+#include "MovementActions.h"
+
+namespace ai
+{
+	class AttackAction : public MovementAction
+	{
+	public:
+		AttackAction(PlayerbotAI* ai, string name) : MovementAction(ai, name) {}
+
+    public:
+        virtual bool Execute(Event event);
+
+    protected:
+        bool Attack(Unit* target);
+    };
+
+    class AttackMyTargetAction : public AttackAction
+    {
+    public:
+        AttackMyTargetAction(PlayerbotAI* ai, string name = "attack my target") : AttackAction(ai, name) {}
+
+    public:
+        virtual bool Execute(Event event);
+    };
+
+    class AttackDuelOpponentAction : public AttackAction
+    {
+    public:
+        AttackDuelOpponentAction(PlayerbotAI* ai, string name = "attack duel opponent") : AttackAction(ai, name) {}
+
+    public:
+        virtual bool Execute(Event event);
+        virtual bool isUseful();
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/BankAction.cpp b/src/game/playerbot/strategy/actions/BankAction.cpp
new file mode 100644
index 00000000000..424e0ec3e0f
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/BankAction.cpp
@@ -0,0 +1,168 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "BankAction.h"
+
+#include "../values/ItemCountValue.h"
+
+using namespace std;
+using namespace ai;
+
+bool BankAction::Execute(Event event)
+{
+    string text = event.getParam();
+
+    list<ObjectGuid> npcs = AI_VALUE(list<ObjectGuid>, "nearest npcs");
+    for (list<ObjectGuid>::iterator i = npcs.begin(); i != npcs.end(); i++)
+    {
+        Unit* npc = ai->GetUnit(*i);
+        if (!npc || !bot->GetNPCIfCanInteractWith(npc->GetObjectGuid(), UNIT_NPC_FLAG_BANKER))
+            continue;
+
+        return Execute(text, npc);
+    }
+
+    ai->TellMaster("Cannot find banker nearby");
+    return false;
+}
+
+bool BankAction::Execute(string text, Unit* bank)
+{
+    if (text.empty() || text == "?")
+    {
+        ListItems();
+        return true;
+    }
+
+    bool result = false;
+    if (text[0] == '-')
+    {
+        ItemIds found = chat->parseItems(text);
+        for (ItemIds::iterator i = found.begin(); i != found.end(); i++)
+        {
+            uint32 itemId = *i;
+            result &= Withdraw(itemId);
+        }
+    }
+    else
+    {
+        list<Item*> found = parseItems(text);
+        if (found.empty())
+            return false;
+
+        for (list<Item*>::iterator i = found.begin(); i != found.end(); i++)
+        {
+            Item* item = *i;
+            if (!item)
+                continue;
+
+            result &= Deposit(item);
+        }
+    }
+
+    return result;
+}
+
+bool BankAction::Withdraw(const uint32 itemid)
+{
+    Item* pItem = FindItemInBank(itemid);
+    if (!pItem)
+        return false;
+
+    ItemPosCountVec dest;
+    InventoryResult msg = bot->CanStoreItem(NULL_BAG, NULL_SLOT, dest, pItem, false);
+    if (msg != EQUIP_ERR_OK)
+    {
+        bot->SendEquipError(msg, pItem, NULL);
+        return false;
+    }
+
+    bot->RemoveItem(pItem->GetBagSlot(), pItem->GetSlot(), true);
+    bot->StoreItem(dest, pItem, true);
+
+    std::ostringstream out;
+    out << "got " << chat->formatItem(pItem->GetProto(), pItem->GetCount()) << " from bank";
+    ai->TellMaster(out.str());
+    return true;
+}
+
+bool BankAction::Deposit(Item* pItem)
+{
+    std::ostringstream out;
+
+    ItemPosCountVec dest;
+    InventoryResult msg = bot->CanBankItem(NULL_BAG, NULL_SLOT, dest, pItem, false);
+    if (msg != EQUIP_ERR_OK)
+    {
+        bot->SendEquipError(msg, pItem, NULL);
+        return false;
+    }
+
+    bot->RemoveItem(pItem->GetBagSlot(), pItem->GetSlot(), true);
+    bot->BankItem(dest, pItem, true);
+
+    out << "put " << chat->formatItem(pItem->GetProto(), pItem->GetCount()) << " to bank";
+    ai->TellMaster(out.str());
+	return true;
+}
+
+void BankAction::ListItems()
+{
+    ai->TellMaster("=== Bank ===");
+
+    map<uint32, int> items;
+    for (uint8 bag = BANK_SLOT_BAG_START; bag < BANK_SLOT_BAG_END; ++bag)
+    {
+        const Bag* const pBag = static_cast<Bag *>(bot->GetItemByPos(INVENTORY_SLOT_BAG_0, bag));
+        if (pBag)
+        {
+            const ItemPrototype* const pBagProto = pBag->GetProto();
+            std::string bagName = pBagProto->Name1;
+
+            for (uint8 slot = 0; slot < pBag->GetBagSize(); ++slot)
+            {
+                Item* const item = bot->GetItemByPos(bag, slot);
+                if (item)
+                    items[item->GetProto()->ItemId] = item->GetCount();
+            }
+        }
+    }
+
+    TellItems(items);
+}
+
+Item* BankAction::FindItemInBank(uint32 ItemId)
+{
+    for (uint8 slot = BANK_SLOT_ITEM_START; slot < BANK_SLOT_ITEM_END; slot++)
+    {
+        Item* const pItem = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, slot);
+        if (pItem)
+        {
+            const ItemPrototype* const pItemProto = pItem->GetProto();
+            if (!pItemProto)
+                continue;
+
+            if (pItemProto->ItemId == ItemId)   // have required item
+                return pItem;
+        }
+    }
+
+    for (uint8 bag = BANK_SLOT_BAG_START; bag < BANK_SLOT_BAG_END; ++bag)
+    {
+        const Bag* const pBag = (Bag *) bot->GetItemByPos(INVENTORY_SLOT_BAG_0, bag);
+        if (pBag)
+            for (uint8 slot = 0; slot < pBag->GetBagSize(); ++slot)
+            {
+                Item* const pItem = bot->GetItemByPos(bag, slot);
+                if (pItem)
+                {
+                    const ItemPrototype* const pItemProto = pItem->GetProto();
+                    if (!pItemProto)
+                        continue;
+
+                    if (pItemProto->ItemId == ItemId)
+                        return pItem;
+                }
+            }
+    }
+    return NULL;
+}
diff --git a/src/game/playerbot/strategy/actions/BankAction.h b/src/game/playerbot/strategy/actions/BankAction.h
new file mode 100644
index 00000000000..6b22095e53b
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/BankAction.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class BankAction : public InventoryAction {
+    public:
+        BankAction(PlayerbotAI* ai) : InventoryAction(ai, "bank") {}
+        virtual bool Execute(Event event);
+
+    private:
+        bool Execute(string text, Unit* bank);
+        void ListItems();
+        bool Withdraw(const uint32 itemid);
+        bool Deposit(Item* pItem);
+        Item* FindItemInBank(uint32 ItemId);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/BuffAction.cpp b/src/game/playerbot/strategy/actions/BuffAction.cpp
new file mode 100644
index 00000000000..12c97d48721
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/BuffAction.cpp
@@ -0,0 +1,118 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "BuffAction.h"
+
+#include "../values/ItemCountValue.h"
+
+using namespace ai;
+
+class FindBuffVisitor : public IterateItemsVisitor {
+public:
+    FindBuffVisitor(Player* bot) : IterateItemsVisitor(), bot(bot)
+    {
+    }
+
+    virtual bool Visit(Item* item)
+    {
+        if (bot->CanUseItem(item->GetProto()) != EQUIP_ERR_OK)
+            return true;
+
+        const ItemPrototype* proto = item->GetProto();
+
+        if (proto->Class != ITEM_CLASS_CONSUMABLE)
+            return true;
+
+        if (proto->SubClass != ITEM_SUBCLASS_ELIXIR && 
+            proto->SubClass != ITEM_SUBCLASS_FLASK &&
+            proto->SubClass != ITEM_SUBCLASS_SCROLL && 
+            proto->SubClass != ITEM_SUBCLASS_FOOD &&
+            proto->SubClass != ITEM_SUBCLASS_CONSUMABLE_OTHER &&
+            proto->SubClass != ITEM_SUBCLASS_ITEM_ENHANCEMENT)
+            return true;
+
+        for (int i=0; i<MAX_ITEM_PROTO_SPELLS; i++)
+        {
+            uint32 spellId = proto->Spells[i].SpellId;
+            if (!spellId)
+                continue;
+
+            if (bot->HasAura(spellId))
+                return true;
+
+            Item* itemForSpell = *bot->GetPlayerbotAI()->GetAiObjectContext()->GetValue<Item*>("item for spell", spellId);
+            if (itemForSpell && itemForSpell->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT))
+                return true;
+        
+            if (items.find(proto->SubClass) == items.end())
+                items[proto->SubClass] = list<Item*>();
+
+            items[proto->SubClass].push_back(item);
+            break;
+        }
+
+        return true;
+    }
+
+public:
+    map<uint32, list<Item*> > items;
+
+private:
+    Player* bot;
+};
+
+void BuffAction::TellHeader(uint32 subClass)
+{
+    switch (subClass)
+    {
+    case ITEM_SUBCLASS_ELIXIR:
+        ai->TellMaster("--- Elixir ---");
+        return;
+    case ITEM_SUBCLASS_FLASK:
+        ai->TellMaster("--- Flask ---");
+        return;
+    case ITEM_SUBCLASS_SCROLL:
+        ai->TellMaster("--- Scroll ---");
+        return;
+    case ITEM_SUBCLASS_FOOD:
+        ai->TellMaster("--- Food ---");
+        return;
+    case ITEM_SUBCLASS_GENERIC:
+        ai->TellMaster("--- Other ---");
+        return;
+    case ITEM_SUBCLASS_ITEM_ENHANCEMENT:
+        ai->TellMaster("--- Enchant ---");
+        return;
+    }
+}
+
+
+bool BuffAction::Execute(Event event)
+{
+    string text = event.getParam();
+
+    FindBuffVisitor visitor(bot);
+    IterateItems(&visitor);
+
+    uint32 oldSubClass = -1;
+    for (map<uint32, list<Item*> >::iterator i = visitor.items.begin(); i != visitor.items.end(); ++i)
+    {
+        list<Item*> items = i->second;
+
+        uint32 subClass = i->first;
+        if (oldSubClass != subClass)
+        {
+            if (!items.empty())
+                TellHeader(subClass);
+            oldSubClass = subClass;
+        }
+        for (list<Item*>::iterator j = items.begin(); j != items.end(); ++j)
+        {
+            Item* item = *j;
+            ostringstream out;
+            out << chat->formatItem(item->GetProto(), item->GetCount());
+            ai->TellMaster(out);
+        }
+    }
+    
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/BuffAction.h b/src/game/playerbot/strategy/actions/BuffAction.h
new file mode 100644
index 00000000000..da8b6a62509
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/BuffAction.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class BuffAction : public InventoryAction {
+    public:
+        BuffAction(PlayerbotAI* ai) : InventoryAction(ai, "buff") {}
+        virtual bool Execute(Event event);
+
+    private:
+        void TellHeader(uint32 subClass);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/BuyAction.cpp b/src/game/playerbot/strategy/actions/BuyAction.cpp
new file mode 100644
index 00000000000..7dcb263ed00
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/BuyAction.cpp
@@ -0,0 +1,53 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "BuyAction.h"
+#include "../ItemVisitors.h"
+#include "../values/ItemCountValue.h"
+
+using namespace ai;
+
+bool BuyAction::Execute(Event event)
+{
+    string link = event.getParam();
+
+    ItemIds itemIds = chat->parseItems(link);
+    if (itemIds.empty())
+        return false;
+
+    Player* master = GetMaster();
+
+    if (!master)
+        return false;
+
+    ObjectGuid vendorguid = master->GetSelectionGuid();
+    if (!vendorguid)
+        return false;
+
+    Creature *pCreature = bot->GetNPCIfCanInteractWith(vendorguid,UNIT_NPC_FLAG_VENDOR);
+    if (!pCreature)
+    {
+        ai->TellMaster("Cannot talk to vendor");
+        return false;
+    }
+
+    VendorItemData const* tItems = pCreature->GetVendorItems();
+    if (!tItems)
+    {
+        ai->TellMaster("This vendor has no items");
+        return false;
+    }
+
+    for (ItemIds::iterator i = itemIds.begin(); i != itemIds.end(); i++)
+    {
+        for (uint32 slot = 0; slot < tItems->GetItemCount(); slot++)
+        {
+            if (tItems->GetItem(slot)->item == *i)
+            {
+                bot->BuyItemFromVendorSlot(vendorguid, slot, *i, 1, NULL_BAG, NULL_SLOT);
+                ai->TellMaster("Bought item");
+            }
+        }
+    }
+
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/BuyAction.h b/src/game/playerbot/strategy/actions/BuyAction.h
new file mode 100644
index 00000000000..2e0822c2227
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/BuyAction.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class BuyAction : public InventoryAction {
+    public:
+        BuyAction(PlayerbotAI* ai) : InventoryAction(ai, "buy") {}
+        virtual bool Execute(Event event);
+
+    private:
+        bool TradeItem(FindItemVisitor *visitor, int8 slot);
+        bool TradeItem(const Item& item, int8 slot);
+
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/CastCustomSpellAction.cpp b/src/game/playerbot/strategy/actions/CastCustomSpellAction.cpp
new file mode 100644
index 00000000000..eb99ec44a37
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/CastCustomSpellAction.cpp
@@ -0,0 +1,41 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "CastCustomSpellAction.h"
+
+using namespace ai;
+
+bool CastCustomSpellAction::Execute(Event event)
+{
+    Unit* target = NULL;
+
+    Player* master = GetMaster();
+    if (master && master->GetSelectionGuid())
+        target = ai->GetUnit(master->GetSelectionGuid());
+
+    if (!target)
+        target = bot;
+
+    string text = event.getParam();
+
+    uint32 spell = chat->parseSpell(text);
+
+    bool result = false;
+    if (spell)
+        result = ai->CastSpell(spell, target);
+    else
+        ai->CastSpell(text, target);
+
+    ostringstream msg;
+    if (result)
+    {
+        msg << "Casting " << text << " on " << target->GetName();
+        ai->TellMasterNoFacing(msg.str());
+    }
+    else
+    {
+        msg << "Cast " << text << " on " << target->GetName() << " is failed";
+        ai->TellMaster(msg.str());
+    }
+
+    return result;
+}
diff --git a/src/game/playerbot/strategy/actions/CastCustomSpellAction.h b/src/game/playerbot/strategy/actions/CastCustomSpellAction.h
new file mode 100644
index 00000000000..976a9e464af
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/CastCustomSpellAction.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "../Action.h"
+#include "QuestAction.h"
+
+namespace ai
+{
+    class CastCustomSpellAction : public Action
+    {
+    public:
+        CastCustomSpellAction(PlayerbotAI* ai) : Action(ai, "cast custom spell") {}
+        virtual bool Execute(Event event);
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/ChangeChatAction.cpp b/src/game/playerbot/strategy/actions/ChangeChatAction.cpp
new file mode 100644
index 00000000000..32328dba0de
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ChangeChatAction.cpp
@@ -0,0 +1,26 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ChangeChatAction.h"
+
+
+using namespace ai;
+
+
+bool ChangeChatAction::Execute(Event event)
+{
+    string text = event.getParam();
+    ChatMsg parsed = chat->parseChat(text);
+    if (parsed == CHAT_MSG_SYSTEM)
+    {
+        ostringstream out; out << "Current chat is " << chat->formatChat(*context->GetValue<ChatMsg>("chat"));
+        ai->TellMaster(out);
+    }
+    else
+    {
+        context->GetValue<ChatMsg>("chat")->Set(parsed);
+        ostringstream out; out << "Chat set to " << chat->formatChat(parsed);
+        ai->TellMaster(out);
+    }
+    
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/ChangeChatAction.h b/src/game/playerbot/strategy/actions/ChangeChatAction.h
new file mode 100644
index 00000000000..450a81a8bff
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ChangeChatAction.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class ChangeChatAction : public Action {
+    public:
+        ChangeChatAction(PlayerbotAI* ai) : Action(ai, "chat") {}
+        virtual bool Execute(Event event);
+   
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/ChangeStrategyAction.cpp b/src/game/playerbot/strategy/actions/ChangeStrategyAction.cpp
new file mode 100644
index 00000000000..cc254e75dd7
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ChangeStrategyAction.cpp
@@ -0,0 +1,38 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ChangeStrategyAction.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+bool ChangeCombatStrategyAction::Execute(Event event)
+{
+    string text = event.getParam();
+    ai->ChangeStrategy(text.empty() ? getName() : text, BOT_STATE_COMBAT);
+    return true;
+}
+
+bool ChangeNonCombatStrategyAction::Execute(Event event)
+{
+    string text = event.getParam();
+
+    uint32 account = sObjectMgr.GetPlayerAccountIdByGUID(bot->GetObjectGuid());
+    if (sPlayerbotAIConfig.IsInRandomAccountList(account) && ai->GetMaster() && ai->GetMaster()->GetSession()->GetSecurity() < SEC_GAMEMASTER)
+    {
+        if (text.find("loot") != string::npos || text.find("gather") != string::npos)
+        {
+            ai->TellMaster("You can change any strategy except loot and gather");
+            return false;
+        }
+    }
+
+    ai->ChangeStrategy(text, BOT_STATE_NON_COMBAT);
+    return true;
+}
+
+bool ChangeDeadStrategyAction::Execute(Event event)
+{
+    string text = event.getParam();
+    ai->ChangeStrategy(text, BOT_STATE_DEAD);
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/ChangeStrategyAction.h b/src/game/playerbot/strategy/actions/ChangeStrategyAction.h
new file mode 100644
index 00000000000..9c3f4c5efb9
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ChangeStrategyAction.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+	class ChangeCombatStrategyAction : public Action {
+	public:
+		ChangeCombatStrategyAction(PlayerbotAI* ai, string name = "co") : Action(ai, name) {}
+
+    public:
+        virtual bool Execute(Event event);
+    };
+
+    class ChangeNonCombatStrategyAction : public Action {
+    public:
+        ChangeNonCombatStrategyAction(PlayerbotAI* ai) : Action(ai, "nc") {}
+
+    public:
+        virtual bool Execute(Event event);
+    };
+
+    class ChangeDeadStrategyAction : public Action {
+    public:
+        ChangeDeadStrategyAction(PlayerbotAI* ai) : Action(ai, "dead") {}
+
+    public:
+        virtual bool Execute(Event event);
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/ChangeTalentsAction.cpp b/src/game/playerbot/strategy/actions/ChangeTalentsAction.cpp
new file mode 100644
index 00000000000..3a7dc715ea5
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ChangeTalentsAction.cpp
@@ -0,0 +1,37 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ChangeTalentsAction.h"
+
+using namespace ai;
+
+bool ChangeTalentsAction::Execute(Event event)
+{
+    
+
+    string text = event.getParam();
+    if (text == "1" || text == "primary")
+    {
+        bot->ActivateSpec(0);
+        ai->TellMaster("Primary talents activated");
+    }
+    else if (text == "2" || text == "secondary")
+    {
+        bot->ActivateSpec(1);
+        ai->TellMaster("Secondary talents activated");
+    }
+    else
+    {
+        ostringstream out; 
+        switch (bot->GetActiveSpec())
+        {
+        case 0: out << "Primary";
+            break;
+        default: out << "Secondary";
+            break;
+        }
+        out << " talents are active";
+        ai->TellMaster(out);
+    }
+
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/ChangeTalentsAction.h b/src/game/playerbot/strategy/actions/ChangeTalentsAction.h
new file mode 100644
index 00000000000..dd9941af5dc
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ChangeTalentsAction.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+	class ChangeTalentsAction : public Action {
+	public:
+		ChangeTalentsAction(PlayerbotAI* ai) : Action(ai, "talents") {}
+
+    public:
+        virtual bool Execute(Event event);
+
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/ChatActionContext.h b/src/game/playerbot/strategy/actions/ChatActionContext.h
new file mode 100644
index 00000000000..3469bf460cc
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ChatActionContext.h
@@ -0,0 +1,184 @@
+#pragma once;
+
+#include "ListQuestsActions.h"
+#include "StatsAction.h"
+#include "LeaveGroupAction.h"
+#include "TellReputationAction.h"
+#include "LogLevelAction.h"
+#include "TellLosAction.h"
+#include "DropQuestAction.h"
+#include "QueryQuestAction.h"
+#include "QueryItemUsageAction.h"
+#include "LootStrategyAction.h"
+#include "AddLootAction.h"
+#include "ReleaseSpiritAction.h"
+#include "TeleportAction.h"
+#include "TaxiAction.h"
+#include "RepairAllAction.h"
+#include "UseItemAction.h"
+#include "TellItemCountAction.h"
+#include "RewardAction.h"
+#include "BuyAction.h"
+#include "SellAction.h"
+#include "UnequipAction.h"
+#include "EquipAction.h"
+#include "TradeAction.h"
+#include "ChangeTalentsAction.h"
+#include "ListSpellsAction.h"
+#include "ChangeStrategyAction.h"
+#include "TrainerAction.h"
+#include "ChangeChatAction.h"
+#include "SetHomeAction.h"
+#include "ResetAiAction.h"
+#include "DestroyItemAction.h"
+#include "BuffAction.h"
+#include "AttackAction.h"
+#include "HelpAction.h"
+#include "GuildBankAction.h"
+#include "ChatShortcutActions.h"
+#include "GossipHelloAction.h"
+#include "CastCustomSpellAction.h"
+#include "InviteToGroupAction.h"
+#include "TellCastFailedAction.h"
+#include "RtiAction.h"
+#include "ReviveFromCorpseAction.h"
+#include "BankAction.h"
+#include "PositionAction.h"
+#include "TellTargetAction.h"
+#include "UseMeetingStoneAction.h"
+#include "WhoAction.h"
+#include "SaveManaAction.h"
+#include "../values/Formations.h"
+
+namespace ai
+{
+    class ChatActionContext : public NamedObjectContext<Action>
+    {
+    public:
+        ChatActionContext()
+        {
+            creators["stats"] = &ChatActionContext::stats;
+            creators["quests"] = &ChatActionContext::quests;
+            creators["leave"] = &ChatActionContext::leave;
+            creators["reputation"] = &ChatActionContext::reputation;
+            creators["log"] = &ChatActionContext::log;
+            creators["los"] = &ChatActionContext::los;
+            creators["drop"] = &ChatActionContext::drop;
+            creators["query quest"] = &ChatActionContext::query_quest;
+            creators["query item usage"] = &ChatActionContext::query_item_usage;
+            creators["ll"] = &ChatActionContext::ll;
+            creators["add all loot"] = &ChatActionContext::add_all_loot;
+            creators["release"] = &ChatActionContext::release;
+            creators["teleport"] = &ChatActionContext::teleport;
+            creators["taxi"] = &ChatActionContext::taxi;
+            creators["repair"] = &ChatActionContext::repair;
+            creators["use"] = &ChatActionContext::use;
+            creators["item count"] = &ChatActionContext::item_count;
+            creators["equip"] = &ChatActionContext::equip;
+            creators["unequip"] = &ChatActionContext::unequip;
+            creators["sell"] = &ChatActionContext::sell;
+            creators["buy"] = &ChatActionContext::buy;
+            creators["reward"] = &ChatActionContext::reward;
+            creators["trade"] = &ChatActionContext::trade;
+            creators["talents"] = &ChatActionContext::talents;
+            creators["spells"] = &ChatActionContext::spells;
+            creators["co"] = &ChatActionContext::co;
+            creators["nc"] = &ChatActionContext::nc;
+            creators["dead"] = &ChatActionContext::dead;
+            creators["trainer"] = &ChatActionContext::trainer;
+            creators["attack my target"] = &ChatActionContext::attack_my_target;
+            creators["chat"] = &ChatActionContext::chat;
+            creators["home"] = &ChatActionContext::home;
+            creators["destroy"] = &ChatActionContext::destroy;
+            creators["reset ai"] = &ChatActionContext::reset_ai;
+            creators["buff"] = &ChatActionContext::buff;
+            creators["help"] = &ChatActionContext::help;
+            creators["gb"] = &ChatActionContext::gb;
+            creators["bank"] = &ChatActionContext::bank;
+            creators["follow chat shortcut"] = &ChatActionContext::follow_chat_shortcut;
+            creators["stay chat shortcut"] = &ChatActionContext::stay_chat_shortcut;
+            creators["flee chat shortcut"] = &ChatActionContext::flee_chat_shortcut;
+            creators["runaway chat shortcut"] = &ChatActionContext::runaway_chat_shortcut;
+            creators["grind chat shortcut"] = &ChatActionContext::grind_chat_shortcut;
+            creators["tank attack chat shortcut"] = &ChatActionContext::tank_attack_chat_shortcut;
+            creators["gossip hello"] = &ChatActionContext::gossip_hello;
+            creators["cast custom spell"] = &ChatActionContext::cast_custom_spell;
+            creators["invite"] = &ChatActionContext::invite;
+            creators["spell"] = &ChatActionContext::spell;
+            creators["rti"] = &ChatActionContext::rti;
+            creators["spirit healer"] = &ChatActionContext::spirit_healer;
+            creators["position"] = &ChatActionContext::position;
+            creators["tell target"] = &ChatActionContext::tell_target;
+            creators["summon"] = &ChatActionContext::summon;
+            creators["who"] = &ChatActionContext::who;
+            creators["save mana"] = &ChatActionContext::save_mana;
+            creators["max dps chat shortcut"] = &ChatActionContext::max_dps_chat_shortcut;
+            creators["tell attackers"] = &ChatActionContext::tell_attackers;
+            creators["formation"] = &ChatActionContext::formation;
+        }
+
+    private:
+        static Action* formation(PlayerbotAI* ai) { return new SetFormationAction(ai); }
+        static Action* tell_attackers(PlayerbotAI* ai) { return new TellAttackersAction(ai); }
+        static Action* max_dps_chat_shortcut(PlayerbotAI* ai) { return new MaxDpsChatShortcutAction(ai); }
+        static Action* save_mana(PlayerbotAI* ai) { return new SaveManaAction(ai); }
+        static Action* who(PlayerbotAI* ai) { return new WhoAction(ai); }
+        static Action* summon(PlayerbotAI* ai) { return new SummonAction(ai); }
+        static Action* tell_target(PlayerbotAI* ai) { return new TellTargetAction(ai); }
+        static Action* position(PlayerbotAI* ai) { return new PositionAction(ai); }
+        static Action* spirit_healer(PlayerbotAI* ai) { return new SpiritHealerAction(ai); }
+        static Action* rti(PlayerbotAI* ai) { return new RtiAction(ai); }
+        static Action* invite(PlayerbotAI* ai) { return new InviteToGroupAction(ai); }
+        static Action* spell(PlayerbotAI* ai) { return new TellSpellAction(ai); }
+        static Action* cast_custom_spell(PlayerbotAI* ai) { return new CastCustomSpellAction(ai); }
+        static Action* tank_attack_chat_shortcut(PlayerbotAI* ai) { return new TankAttackChatShortcutAction(ai); }
+        static Action* grind_chat_shortcut(PlayerbotAI* ai) { return new GrindChatShortcutAction(ai); }
+        static Action* flee_chat_shortcut(PlayerbotAI* ai) { return new FleeChatShortcutAction(ai); }
+        static Action* runaway_chat_shortcut(PlayerbotAI* ai) { return new GoawayChatShortcutAction(ai); }
+        static Action* stay_chat_shortcut(PlayerbotAI* ai) { return new StayChatShortcutAction(ai); }
+        static Action* follow_chat_shortcut(PlayerbotAI* ai) { return new FollowChatShortcutAction(ai); }
+        static Action* gb(PlayerbotAI* ai) { return new GuildBankAction(ai); }
+        static Action* bank(PlayerbotAI* ai) { return new BankAction(ai); }
+        static Action* help(PlayerbotAI* ai) { return new HelpAction(ai); }
+        static Action* buff(PlayerbotAI* ai) { return new BuffAction(ai); }
+        static Action* destroy(PlayerbotAI* ai) { return new DestroyItemAction(ai); }
+        static Action* home(PlayerbotAI* ai) { return new SetHomeAction(ai); }
+        static Action* chat(PlayerbotAI* ai) { return new ChangeChatAction(ai); }
+        static Action* attack_my_target(PlayerbotAI* ai) { return new AttackMyTargetAction(ai); }
+        static Action* trainer(PlayerbotAI* ai) { return new TrainerAction(ai); }
+        static Action* co(PlayerbotAI* ai) { return new ChangeCombatStrategyAction(ai); }
+        static Action* nc(PlayerbotAI* ai) { return new ChangeNonCombatStrategyAction(ai); }
+        static Action* dead(PlayerbotAI* ai) { return new ChangeDeadStrategyAction(ai); }
+        static Action* spells(PlayerbotAI* ai) { return new ListSpellsAction(ai); }
+        static Action* talents(PlayerbotAI* ai) { return new ChangeTalentsAction(ai); }
+
+        static Action* equip(PlayerbotAI* ai) { return new EquipAction(ai); }
+        static Action* unequip(PlayerbotAI* ai) { return new UnequipAction(ai); }
+        static Action* sell(PlayerbotAI* ai) { return new SellAction(ai); }
+        static Action* buy(PlayerbotAI* ai) { return new BuyAction(ai); }
+        static Action* reward(PlayerbotAI* ai) { return new RewardAction(ai); }
+        static Action* trade(PlayerbotAI* ai) { return new TradeAction(ai); }
+
+        static Action* item_count(PlayerbotAI* ai) { return new TellItemCountAction(ai); }
+        static Action* use(PlayerbotAI* ai) { return new UseItemAction(ai); }
+        static Action* repair(PlayerbotAI* ai) { return new RepairAllAction(ai); }
+        static Action* taxi(PlayerbotAI* ai) { return new TaxiAction(ai); }
+        static Action* teleport(PlayerbotAI* ai) { return new TeleportAction(ai); }
+        static Action* release(PlayerbotAI* ai) { return new ReleaseSpiritAction(ai); }
+        static Action* query_item_usage(PlayerbotAI* ai) { return new QueryItemUsageAction(ai); }
+        static Action* query_quest(PlayerbotAI* ai) { return new QueryQuestAction(ai); }
+        static Action* drop(PlayerbotAI* ai) { return new DropQuestAction(ai); }
+        static Action* stats(PlayerbotAI* ai) { return new StatsAction(ai); }
+        static Action* quests(PlayerbotAI* ai) { return new ListQuestsAction(ai); }
+        static Action* leave(PlayerbotAI* ai) { return new LeaveGroupAction(ai); }
+        static Action* reputation(PlayerbotAI* ai) { return new TellReputationAction(ai); }
+        static Action* log(PlayerbotAI* ai) { return new LogLevelAction(ai); }
+        static Action* los(PlayerbotAI* ai) { return new TellLosAction(ai); }
+        static Action* ll(PlayerbotAI* ai) { return new LootStrategyAction(ai); }
+        static Action* add_all_loot(PlayerbotAI* ai) { return new AddAllLootAction(ai); }
+        static Action* reset_ai(PlayerbotAI* ai) { return new ResetAiAction(ai); }
+        static Action* gossip_hello(PlayerbotAI* ai) { return new GossipHelloAction(ai); }
+    };
+
+
+};
diff --git a/src/game/playerbot/strategy/actions/ChatShortcutActions.cpp b/src/game/playerbot/strategy/actions/ChatShortcutActions.cpp
new file mode 100644
index 00000000000..e0c3f129446
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ChatShortcutActions.cpp
@@ -0,0 +1,108 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ChatShortcutActions.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+bool FollowChatShortcutAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    ai->Reset();
+    ai->ChangeStrategy("+follow,-passive", BOT_STATE_NON_COMBAT);
+    ai->ChangeStrategy("-follow,-passive", BOT_STATE_COMBAT);
+    if (bot->GetMapId() != master->GetMapId() || bot->GetDistance(master) > sPlayerbotAIConfig.sightDistance)
+    {
+        ai->TellMaster("I will not follow you - too far away");
+        return true;
+    }
+    ai->TellMaster("Following");
+    return true;
+}
+
+bool StayChatShortcutAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    ai->Reset();
+    ai->ChangeStrategy("+stay,-passive", BOT_STATE_NON_COMBAT);
+    ai->ChangeStrategy("-follow,-passive", BOT_STATE_COMBAT);
+    ai->TellMaster("Staying");
+    return true;
+}
+
+bool FleeChatShortcutAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    ai->Reset();
+    ai->ChangeStrategy("+follow,+passive", BOT_STATE_NON_COMBAT);
+    ai->ChangeStrategy("+follow,+passive", BOT_STATE_COMBAT);
+    if (bot->GetMapId() != master->GetMapId() || bot->GetDistance(master) > sPlayerbotAIConfig.sightDistance)
+    {
+        ai->TellMaster("I will not flee with you - too far away");
+        return true;
+    }
+    ai->TellMaster("Fleeing");
+    return true;
+}
+
+bool GoawayChatShortcutAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    ai->Reset();
+    ai->ChangeStrategy("+runaway", BOT_STATE_NON_COMBAT);
+    ai->ChangeStrategy("+runaway", BOT_STATE_COMBAT);
+    ai->TellMaster("Running away");
+    return true;
+}
+
+bool GrindChatShortcutAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    ai->Reset();
+    ai->ChangeStrategy("+grind,-passive", BOT_STATE_NON_COMBAT);
+    ai->TellMaster("Grinding");
+    return true;
+}
+
+bool TankAttackChatShortcutAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    if (!ai->IsTank(bot))
+        return false;
+
+    ai->Reset();
+    ai->ChangeStrategy("-passive", BOT_STATE_NON_COMBAT);
+    ai->ChangeStrategy("-passive", BOT_STATE_COMBAT);
+    ai->TellMaster("Attacking");
+    return true;
+}
+
+bool MaxDpsChatShortcutAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    ai->Reset();
+    ai->ChangeStrategy("-threat,-conserve mana,-cast time,+dps debuff", BOT_STATE_COMBAT);
+    ai->TellMaster("Max DPS");
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/ChatShortcutActions.h b/src/game/playerbot/strategy/actions/ChatShortcutActions.h
new file mode 100644
index 00000000000..de9a86a52e4
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ChatShortcutActions.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class FollowChatShortcutAction : public Action
+    {
+    public:
+        FollowChatShortcutAction(PlayerbotAI* ai) : Action(ai, "follow chat shortcut") {}
+        virtual bool Execute(Event event);
+    };
+
+    class StayChatShortcutAction : public Action
+    {
+    public:
+        StayChatShortcutAction(PlayerbotAI* ai) : Action(ai, "stay chat shortcut") {}
+        virtual bool Execute(Event event);
+    };
+
+    class FleeChatShortcutAction : public Action
+    {
+    public:
+        FleeChatShortcutAction(PlayerbotAI* ai) : Action(ai, "flee chat shortcut") {}
+        virtual bool Execute(Event event);
+    };
+
+    class GoawayChatShortcutAction : public Action
+    {
+    public:
+        GoawayChatShortcutAction(PlayerbotAI* ai) : Action(ai, "runaway chat shortcut") {}
+        virtual bool Execute(Event event);
+    };
+
+    class GrindChatShortcutAction : public Action
+    {
+    public:
+        GrindChatShortcutAction(PlayerbotAI* ai) : Action(ai, "grind chat shortcut") {}
+        virtual bool Execute(Event event);
+    };
+
+    class TankAttackChatShortcutAction : public Action
+    {
+    public:
+        TankAttackChatShortcutAction(PlayerbotAI* ai) : Action(ai, "tank attack chat shortcut") {}
+        virtual bool Execute(Event event);
+    };
+
+    class MaxDpsChatShortcutAction : public Action
+    {
+    public:
+        MaxDpsChatShortcutAction(PlayerbotAI* ai) : Action(ai, "max dps chat shortcut") {}
+        virtual bool Execute(Event event);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/CheckMountStateAction.cpp b/src/game/playerbot/strategy/actions/CheckMountStateAction.cpp
new file mode 100644
index 00000000000..8f61fa86314
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/CheckMountStateAction.cpp
@@ -0,0 +1,79 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "CheckMountStateAction.h"
+
+using namespace ai;
+
+uint64 extractGuid(WorldPacket& packet);
+
+bool CheckMountStateAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!bot->GetGroup() || !master)
+        return false;
+
+    if (bot->IsTaxiFlying())
+        return false;
+
+    if (master->IsMounted() && !bot->IsMounted())
+    {
+        if (!master->GetAurasByType(SPELL_AURA_MOUNTED).empty())
+        {
+            return Mount();
+        }
+    }
+    else if (!master->IsMounted() && bot->IsMounted())
+    {
+        WorldPacket emptyPacket;
+        bot->GetSession()->HandleCancelMountAuraOpcode(emptyPacket);
+        return true;
+    }
+    return false;
+}
+
+
+bool CheckMountStateAction::Mount()
+{
+    Player* master = GetMaster();
+    ai->RemoveShapeshift();
+
+    const SpellEntry* masterSpell = master->GetAurasByType(SPELL_AURA_MOUNTED).front()->GetSpellProto();
+    int32 masterSpeed = max(masterSpell->EffectBasePoints[1], masterSpell->EffectBasePoints[2]);
+
+    map<uint32, map<int32, vector<uint32> > > allSpells;
+    for(PlayerSpellMap::iterator itr = bot->GetSpellMap().begin(); itr != bot->GetSpellMap().end(); ++itr)
+    {
+        uint32 spellId = itr->first;
+        if(itr->second.state == PLAYERSPELL_REMOVED || itr->second.disabled || IsPassiveSpell(spellId))
+            continue;
+
+        const SpellEntry* spellInfo = sSpellStore.LookupEntry(spellId);
+        if (!spellInfo || spellInfo->EffectApplyAuraName[0] != SPELL_AURA_MOUNTED)
+            continue;
+
+        int32 effect = max(spellInfo->EffectBasePoints[1], spellInfo->EffectBasePoints[2]);
+        if (effect < masterSpeed)
+            continue;
+
+        uint32 index = (spellInfo->EffectApplyAuraName[1] == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED ||
+                spellInfo->EffectApplyAuraName[2] == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED) ? 1 : 0;
+        allSpells[index][effect].push_back(spellId);
+    }
+
+    int masterMountType = (masterSpell->EffectApplyAuraName[1] == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED ||
+            masterSpell->EffectApplyAuraName[2] == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED) ? 1 : 0;
+
+    map<int32, vector<uint32> >& spells = allSpells[masterMountType];
+    for (map<int32,vector<uint32> >::iterator i = spells.begin(); i != spells.end(); ++i)
+    {
+		vector<uint32>& ids = i->second;
+        int index = urand(0, ids.size() - 1);
+        if (index >= ids.size())
+            continue;
+
+        ai->CastSpell(ids[index], bot);
+        return true;
+    }
+
+    return false;
+}
diff --git a/src/game/playerbot/strategy/actions/CheckMountStateAction.h b/src/game/playerbot/strategy/actions/CheckMountStateAction.h
new file mode 100644
index 00000000000..c5b087e9be7
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/CheckMountStateAction.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../Action.h"
+#include "MovementActions.h"
+#include "../values/LastMovementValue.h"
+
+namespace ai
+{
+    class CheckMountStateAction : public Action {
+    public:
+        CheckMountStateAction(PlayerbotAI* ai) : Action(ai, "check mount state") {}
+
+        virtual bool Execute(Event event);
+
+    private:
+        bool Mount();
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/ChooseTargetActions.h b/src/game/playerbot/strategy/actions/ChooseTargetActions.h
new file mode 100644
index 00000000000..bc975f33003
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ChooseTargetActions.h
@@ -0,0 +1,80 @@
+#pragma once
+
+#include "../Action.h"
+#include "AttackAction.h"
+
+namespace ai
+{
+    class DpsAssistAction : public AttackAction
+    {
+    public:
+        DpsAssistAction(PlayerbotAI* ai) : AttackAction(ai, "dps assist") {}
+
+        virtual string GetTargetName() { return "dps target"; }
+    };
+
+    class TankAssistAction : public AttackAction
+    {
+    public:
+        TankAssistAction(PlayerbotAI* ai) : AttackAction(ai, "tank assist") {}
+        virtual string GetTargetName() { return "tank target"; }
+    };
+
+    class AttackAnythingAction : public AttackAction
+    {
+    public:
+        AttackAnythingAction(PlayerbotAI* ai) : AttackAction(ai, "attack anything") {}
+        virtual string GetTargetName() { return "grind target"; }
+        virtual bool Execute(Event event)
+        {
+            if (sLFGMgr.GetQueueInfo(bot->GetObjectGuid()))
+                sLFGMgr.Leave(bot);
+
+            return AttackAction::Execute(event);
+        }
+        virtual bool isUseful() { return GetTarget(); }
+        virtual bool isPossible()
+        {
+            return AttackAction::isPossible() && GetTarget() &&
+                    AI_VALUE2(uint8, "health", "self target") > sPlayerbotAIConfig.mediumHealth &&
+                    (!AI_VALUE2(uint8, "mana", "self target") || AI_VALUE2(uint8, "mana", "self target") > sPlayerbotAIConfig.mediumMana);
+        }
+    };
+
+    class AttackLeastHpTargetAction : public AttackAction
+    {
+    public:
+        AttackLeastHpTargetAction(PlayerbotAI* ai) : AttackAction(ai, "attack least hp target") {}
+        virtual string GetTargetName() { return "least hp target"; }
+    };
+
+    class AttackEnemyPlayerAction : public AttackAction
+    {
+    public:
+        AttackEnemyPlayerAction(PlayerbotAI* ai) : AttackAction(ai, "attack enemy player") {}
+        virtual string GetTargetName() { return "enemy player target"; }
+    };
+
+    class AttackRtiTargetAction : public AttackAction
+    {
+    public:
+        AttackRtiTargetAction(PlayerbotAI* ai) : AttackAction(ai, "attack rti target") {}
+        virtual string GetTargetName() { return "rti target"; }
+    };
+
+    class DropTargetAction : public Action
+    {
+    public:
+        DropTargetAction(PlayerbotAI* ai) : Action(ai, "drop target") {}
+
+        virtual bool Execute(Event event)
+        {
+            context->GetValue<Unit*>("current target")->Set(NULL);
+            bot->SetSelectionGuid(ObjectGuid());
+            ai->ChangeEngine(BOT_STATE_NON_COMBAT);
+            ai->InterruptSpell();
+			return true;
+        }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/DestroyItemAction.cpp b/src/game/playerbot/strategy/actions/DestroyItemAction.cpp
new file mode 100644
index 00000000000..a643c420b72
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/DestroyItemAction.cpp
@@ -0,0 +1,35 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DestroyItemAction.h"
+
+#include "../values/ItemCountValue.h"
+
+using namespace ai;
+
+bool DestroyItemAction::Execute(Event event)
+{
+    string text = event.getParam();
+    ItemIds ids = chat->parseItems(text);
+
+    for (ItemIds::iterator i =ids.begin(); i != ids.end(); i++)
+    {
+        FindItemByIdVisitor visitor(*i);
+        DestroyItem(&visitor);
+    }
+
+    return true;
+}
+
+void DestroyItemAction::DestroyItem(FindItemVisitor* visitor)
+{
+    IterateItems(visitor);
+    list<Item*> items = visitor->GetResult();
+	for (list<Item*>::iterator i = items.begin(); i != items.end(); ++i)
+    {
+		Item* item = *i;
+        bot->DestroyItem(item->GetBagSlot(),item->GetSlot(), true);
+        bot->SaveInventoryAndGoldToDB();
+        ostringstream out; out << chat->formatItem(item->GetProto()) << " destroyed";
+        ai->TellMaster(out);
+    }
+}
diff --git a/src/game/playerbot/strategy/actions/DestroyItemAction.h b/src/game/playerbot/strategy/actions/DestroyItemAction.h
new file mode 100644
index 00000000000..ad1ab05b216
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/DestroyItemAction.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class DestroyItemAction : public InventoryAction {
+    public:
+        DestroyItemAction(PlayerbotAI* ai) : InventoryAction(ai, "destroy") {}
+        virtual bool Execute(Event event);
+
+    private:
+        void DestroyItem(FindItemVisitor* visitor);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/DropQuestAction.cpp b/src/game/playerbot/strategy/actions/DropQuestAction.cpp
new file mode 100644
index 00000000000..567c096bb78
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/DropQuestAction.cpp
@@ -0,0 +1,22 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DropQuestAction.h"
+
+
+using namespace ai;
+
+bool DropQuestAction::Execute(Event event)
+{
+    string link = event.getParam();
+
+    PlayerbotChatHandler ch(bot);
+    if (!ch.dropQuest(link))
+    {
+        ostringstream out; out << "Could not drop quest: " << link;
+        ai->TellMaster(out);
+        return false;
+    }
+
+    ai->TellMaster("Quest removed");
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/DropQuestAction.h b/src/game/playerbot/strategy/actions/DropQuestAction.h
new file mode 100644
index 00000000000..af5d4ca670f
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/DropQuestAction.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class DropQuestAction : public Action {
+    public:
+        DropQuestAction(PlayerbotAI* ai) : Action(ai, "drop quest") {}
+        virtual bool Execute(Event event);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/EmoteAction.cpp b/src/game/playerbot/strategy/actions/EmoteAction.cpp
new file mode 100644
index 00000000000..efa5df7a234
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/EmoteAction.cpp
@@ -0,0 +1,99 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "EmoteAction.h"
+
+using namespace ai;
+
+map<string, uint32> EmoteAction::emotes;
+
+bool EmoteAction::Execute(Event event)
+{
+    if (emotes.empty())
+        InitEmotes();
+
+    uint32 emote = 0;
+
+    string param = event.getParam();
+	if (param.empty() || emotes.find(param) == emotes.end())
+    {
+        int index = rand() % emotes.size();
+		for (map<string, uint32>::iterator i = emotes.begin(); i != emotes.end() && index; ++i, --index)
+			emote = i->second;
+    }
+    else
+    {
+        emote = emotes[param];
+    }
+
+	bot->CastStop();
+	ai->InterruptSpell();
+	bot->SetStandState(UNIT_STAND_STATE_STAND);
+
+    Player* master = GetMaster();
+	if (master)
+	{
+        ObjectGuid masterSelection = master->GetSelectionGuid();
+        if (masterSelection)
+        {
+            ObjectGuid oldSelection = bot->GetSelectionGuid();
+            bot->SetSelectionGuid(masterSelection);
+            bot->HandleEmoteCommand(emote);
+            bot->SetSelectionGuid(oldSelection);
+            return true;
+        }
+	}
+
+    bot->HandleEmoteCommand(emote);
+    return true;
+}
+
+void EmoteAction::InitEmotes()
+{
+    emotes["cower"] = EMOTE_ONESHOT_COWER;
+    emotes["dance"] = EMOTE_ONESHOT_DANCE;
+    emotes["drown"] = EMOTE_ONESHOT_DROWN;
+    emotes["emerge"] = EMOTE_ONESHOT_EMERGE;
+    emotes["land"] = EMOTE_ONESHOT_LAND;
+    emotes["laugh_nosheathe"] = EMOTE_ONESHOT_LAUGH_NOSHEATHE;
+    emotes["liftoff"] = EMOTE_ONESHOT_LIFTOFF;
+    emotes["loot"] = EMOTE_ONESHOT_LOOT;
+    emotes["no"] = EMOTE_ONESHOT_NO;
+    emotes["one_shot_stun"] = EMOTE_ONE_SHOT_STUN;
+    emotes["point_nosheathe"] = EMOTE_ONESHOT_POINT_NOSHEATHE;
+    emotes["roar"] = EMOTE_STATE_ROAR;
+    emotes["salute"] = EMOTE_ONESHOT_SALUTE;
+    emotes["stomp"] = EMOTE_ONESHOT_STOMP;
+    emotes["train"] = EMOTE_ONESHOT_TRAIN;
+    emotes["yes"] = EMOTE_ONESHOT_YES;
+    emotes["applaud"] = EMOTE_ONESHOT_APPLAUD;
+    emotes["battleroar"] = EMOTE_ONESHOT_BATTLEROAR;
+    emotes["beg"] = EMOTE_ONESHOT_BEG;
+    emotes["bow"] = EMOTE_ONESHOT_BOW;
+    emotes["cheer"] = EMOTE_ONESHOT_CHEER;
+    emotes["chicken"] = EMOTE_ONESHOT_CHICKEN;
+    emotes["cry"] = EMOTE_ONESHOT_CRY;
+    emotes["dance"] = EMOTE_STATE_DANCE;
+    emotes["eat"] = EMOTE_ONESHOT_EAT;
+    emotes["exclamation"] = EMOTE_ONESHOT_EXCLAMATION;
+    emotes["flex"] = EMOTE_ONESHOT_FLEX;
+    emotes["kick"] = EMOTE_ONESHOT_KICK;
+    emotes["kiss"] = EMOTE_ONESHOT_KISS;
+    emotes["kneel"] = EMOTE_ONESHOT_KNEEL;
+    emotes["laugh"] = EMOTE_ONESHOT_LAUGH;
+    emotes["parryshield"] = EMOTE_ONESHOT_PARRYSHIELD;
+    emotes["parryunarmed"] = EMOTE_ONESHOT_PARRYUNARMED;
+    emotes["point"] = EMOTE_ONESHOT_POINT;
+    emotes["question"] = EMOTE_ONESHOT_QUESTION;
+    emotes["ready1h"] = EMOTE_ONESHOT_READY1H;
+    emotes["readybow"] = EMOTE_ONESHOT_READYBOW;
+    emotes["readyunarmed"] = EMOTE_ONESHOT_READYUNARMED;
+    emotes["roar"] = EMOTE_ONESHOT_ROAR;
+    emotes["rude"] = EMOTE_ONESHOT_RUDE;
+    emotes["shout"] = EMOTE_ONESHOT_SHOUT;
+    emotes["shy"] = EMOTE_ONESHOT_SHY;
+    emotes["sleep"] = EMOTE_STATE_SLEEP;
+    emotes["talk"] = EMOTE_ONESHOT_TALK;
+    emotes["wave"] = EMOTE_ONESHOT_WAVE;
+    emotes["woundcritical"] = EMOTE_ONESHOT_WOUNDCRITICAL;
+    emotes["wound"] = EMOTE_ONESHOT_WOUND;
+}
diff --git a/src/game/playerbot/strategy/actions/EmoteAction.h b/src/game/playerbot/strategy/actions/EmoteAction.h
new file mode 100644
index 00000000000..8aa8fdad2e0
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/EmoteAction.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class EmoteAction : public Action
+    {
+    public:
+        EmoteAction(PlayerbotAI* ai) : Action(ai, "emote") {}
+        virtual bool Execute(Event event);
+
+    private:
+        void InitEmotes();
+        static map<string, uint32> emotes;
+
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/EquipAction.cpp b/src/game/playerbot/strategy/actions/EquipAction.cpp
new file mode 100644
index 00000000000..20daa6ca535
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/EquipAction.cpp
@@ -0,0 +1,105 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "EquipAction.h"
+
+#include "../values/ItemCountValue.h"
+
+using namespace ai;
+
+bool EquipAction::Execute(Event event)
+{
+    string text = event.getParam();
+    if (text == "?")
+    {
+        TellEquipmentSets();
+        return true;
+    }
+
+    if (UseEquipmentSet(text))
+        return true;
+
+    ItemIds ids = chat->parseItems(text);
+
+    for (ItemIds::iterator i =ids.begin(); i != ids.end(); i++)
+    {
+        FindItemByIdVisitor visitor(*i);
+        EquipItem(&visitor);
+    }
+
+    return true;
+}
+
+bool EquipAction::UseEquipmentSet(string& name)
+{
+    EquipmentSets &sets = bot->GetEquipmentSets();
+    for (EquipmentSets::iterator i = sets.begin(); i != sets.end(); i++)
+    {
+        if (i->second.state == EQUIPMENT_SET_DELETED || i->second.Name != name)
+            continue;
+
+        UseEquipmentSet(i->second);
+
+        ostringstream out; out << name << " set equipped";
+        ai->TellMaster(out);
+        return true;
+    }
+    return false;
+}
+
+bool EquipAction::UseEquipmentSet(EquipmentSet& set)
+{
+    WorldPacket* p = new WorldPacket(CMSG_USE_EQUIPMENT_SET);
+    uint8 srcbag = 0;
+    for(uint8 slot = 0; slot < EQUIPMENT_SLOT_END; ++slot)
+    {
+        ObjectGuid guid;
+        uint32 itemId = set.Items[slot];
+        if (set.IgnoreMask & (1 << slot))
+            *p << ObjectGuid(uint64(1)).WriteAsPacked();
+        else
+            *p << ObjectGuid(HIGHGUID_ITEM, itemId).WriteAsPacked();
+        *p << srcbag << slot;
+    }
+    bot->GetSession()->QueuePacket(p);
+    return true;
+}
+
+void EquipAction::TellEquipmentSets()
+{
+    ai->TellMaster("=== Equipment sets ===");
+    EquipmentSets &sets = bot->GetEquipmentSets();
+    for (EquipmentSets::iterator i = sets.begin(); i != sets.end(); i++)
+    {
+        if (i->second.state != EQUIPMENT_SET_DELETED)
+            ai->TellMaster(i->second.Name);
+    }
+}
+
+void EquipAction::EquipItem(FindItemVisitor* visitor)
+{
+    IterateItems(visitor);
+    list<Item*> items = visitor->GetResult();
+	if (!items.empty()) EquipItem(**items.begin());
+}
+
+
+void EquipAction::EquipItem(Item& item)
+{
+    uint8 bagIndex = item.GetBagSlot();
+    uint8 slot = item.GetSlot();
+    uint32 itemId = item.GetProto()->ItemId;
+
+    if (item.GetProto()->InventoryType == INVTYPE_AMMO)
+    {
+        bot->SetAmmo(itemId);
+    }
+    else
+    {
+        WorldPacket* const packet = new WorldPacket(CMSG_AUTOEQUIP_ITEM, 2);
+            *packet << bagIndex << slot;
+        bot->GetSession()->QueuePacket(packet);
+    }
+
+    ostringstream out; out << "equipping " << chat->formatItem(item.GetProto());
+    ai->TellMaster(out);
+}
diff --git a/src/game/playerbot/strategy/actions/EquipAction.h b/src/game/playerbot/strategy/actions/EquipAction.h
new file mode 100644
index 00000000000..d23223c5d5a
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/EquipAction.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class EquipAction : public InventoryAction {
+    public:
+        EquipAction(PlayerbotAI* ai) : InventoryAction(ai, "equip") {}
+        virtual bool Execute(Event event);
+
+    private:
+        void EquipItem(FindItemVisitor* visitor);
+        void EquipItem(Item& item);
+        void TellEquipmentSets();
+        bool UseEquipmentSet(string& name);
+        bool UseEquipmentSet(EquipmentSet& set);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/FollowActions.cpp b/src/game/playerbot/strategy/actions/FollowActions.cpp
new file mode 100644
index 00000000000..bf51d79c88e
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/FollowActions.cpp
@@ -0,0 +1,49 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "FollowActions.h"
+#include "../../PlayerbotAIConfig.h"
+#include "../values/Formations.h"
+
+using namespace ai;
+
+bool FollowAction::Execute(Event event)
+{
+    Formation* formation = AI_VALUE(Formation*, "formation");
+    string target = formation->GetTargetName();
+    if (!target.empty())
+    {
+        return Follow(AI_VALUE(Unit*, target));
+    }
+    else
+    {
+        WorldLocation loc = formation->GetLocation();
+        if (loc == WorldLocation::Null || loc.GetMapId() == -1)
+            return false;
+
+        return MoveTo(loc.GetMapId(), loc.x, loc.y, loc.z);
+    }
+}
+
+bool FollowAction::isUseful()
+{
+    Formation* formation = AI_VALUE(Formation*, "formation");
+    float distance = 0;
+    string target = formation->GetTargetName();
+
+    if (!target.empty())
+    {
+        distance = AI_VALUE2(float, "distance", target);
+    }
+    else
+    {
+        WorldLocation loc = formation->GetLocation();
+        if (loc == WorldLocation::Null || bot->GetMapId() != loc.GetMapId())
+            return false;
+
+        distance = bot->GetDistance(loc);
+    }
+
+    return distance > formation->GetMaxDistance() &&
+            !AI_VALUE(bool, "can loot");
+}
+
diff --git a/src/game/playerbot/strategy/actions/FollowActions.h b/src/game/playerbot/strategy/actions/FollowActions.h
new file mode 100644
index 00000000000..971ca998eac
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/FollowActions.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "../Action.h"
+#include "MovementActions.h"
+
+namespace ai
+{
+	class FollowAction : public MovementAction {
+	public:
+		FollowAction(PlayerbotAI* ai) : MovementAction(ai, "follow") {}
+		virtual bool Execute(Event event);
+        virtual bool isUseful();
+	};
+}
diff --git a/src/game/playerbot/strategy/actions/GenericActions.cpp b/src/game/playerbot/strategy/actions/GenericActions.cpp
new file mode 100644
index 00000000000..22285f0c19c
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/GenericActions.cpp
@@ -0,0 +1,5 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GenericActions.h"
+
+using namespace ai;
diff --git a/src/game/playerbot/strategy/actions/GenericActions.h b/src/game/playerbot/strategy/actions/GenericActions.h
new file mode 100644
index 00000000000..b32a8e385d7
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/GenericActions.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../Action.h"
+#include "GenericSpellActions.h"
+#include "ReachTargetActions.h"
+#include "ChooseTargetActions.h"
+#include "MovementActions.h"
+
+namespace ai
+{
+    class MeleeAction : public AttackAction 
+    {
+    public:
+        MeleeAction(PlayerbotAI* ai) : AttackAction(ai, "melee") {}
+
+        virtual string GetTargetName() { return "current target"; }
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/GenericSpellActions.cpp b/src/game/playerbot/strategy/actions/GenericSpellActions.cpp
new file mode 100644
index 00000000000..0ffecccc7af
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/GenericSpellActions.cpp
@@ -0,0 +1,58 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GenericActions.h"
+
+using namespace ai;
+
+bool CastSpellAction::Execute(Event event) 
+{
+	return ai->CastSpell(spell, GetTarget()); 
+}
+
+bool CastSpellAction::isPossible() 
+{
+    if (AI_VALUE2(float, "distance", GetTargetName()) > range)
+        return false;
+
+	return ai->CanCastSpell(spell, GetTarget());
+}
+
+bool CastSpellAction::isUseful() 
+{
+	return GetTarget() && AI_VALUE2(bool, "spell cast useful", spell);
+}
+
+bool CastAuraSpellAction::isUseful() 
+{
+	return CastSpellAction::isUseful() && !ai->HasAura(spell, GetTarget());
+}
+
+bool CastEnchantItemAction::isUseful()
+{
+    if (!CastSpellAction::isUseful())
+        return false;
+
+    uint32 spellId = AI_VALUE2(uint32, "spell id", spell);
+    return spellId && AI_VALUE2(Item*, "item for spell", spellId);
+}
+
+bool CastHealingSpellAction::isUseful() 
+{
+	return CastAuraSpellAction::isUseful() && AI_VALUE2(uint8, "health", GetTargetName()) < (100 - estAmount);
+}
+
+bool CastAoeHealSpellAction::isUseful()
+{
+	return CastSpellAction::isUseful() && AI_VALUE2(uint8, "aoe heal", "medium") > 0;
+}
+
+
+Value<Unit*>* CurePartyMemberAction::GetTargetValue()
+{
+    return context->GetValue<Unit*>("party member to dispel", dispelType);
+}
+
+Value<Unit*>* BuffOnPartyAction::GetTargetValue()
+{
+    return context->GetValue<Unit*>("party member without aura", spell);
+}
diff --git a/src/game/playerbot/strategy/actions/GenericSpellActions.h b/src/game/playerbot/strategy/actions/GenericSpellActions.h
new file mode 100644
index 00000000000..e286a172c11
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/GenericSpellActions.h
@@ -0,0 +1,271 @@
+#pragma once
+
+#include "../Action.h"
+#include "../../PlayerbotAIConfig.h"
+
+#define BEGIN_SPELL_ACTION(clazz, name) \
+class clazz : public CastSpellAction \
+        { \
+        public: \
+        clazz(PlayerbotAI* ai) : CastSpellAction(ai, name) {} \
+
+
+#define END_SPELL_ACTION() \
+    };
+
+#define BEGIN_DEBUFF_ACTION(clazz, name) \
+class clazz : public CastDebuffSpellAction \
+        { \
+        public: \
+        clazz(PlayerbotAI* ai) : CastDebuffSpellAction(ai, name) {} \
+
+#define BEGIN_RANGED_SPELL_ACTION(clazz, name) \
+class clazz : public CastSpellAction \
+        { \
+        public: \
+        clazz(PlayerbotAI* ai) : CastSpellAction(ai, name) {} \
+
+#define BEGIN_MELEE_SPELL_ACTION(clazz, name) \
+class clazz : public CastMeleeSpellAction \
+        { \
+        public: \
+        clazz(PlayerbotAI* ai) : CastMeleeSpellAction(ai, name) {} \
+
+
+#define END_RANGED_SPELL_ACTION() \
+    };
+
+
+#define BEGIN_BUFF_ON_PARTY_ACTION(clazz, name) \
+class clazz : public BuffOnPartyAction \
+        { \
+        public: \
+        clazz(PlayerbotAI* ai) : BuffOnPartyAction(ai, name) {}
+
+namespace ai
+{
+    class CastSpellAction : public Action
+    {
+    public:
+        CastSpellAction(PlayerbotAI* ai, string spell) : Action(ai, spell),
+			range(sPlayerbotAIConfig.spellDistance)
+        {
+            this->spell = spell;
+        }
+
+		virtual string GetTargetName() { return "current target"; };
+        virtual bool Execute(Event event);
+        virtual bool isPossible();
+		virtual bool isUseful();
+        virtual ActionThreatType getThreatType() { return ACTION_THREAT_SINGLE; }
+
+		virtual NextAction** getPrerequisites()
+		{
+			if (range > sPlayerbotAIConfig.spellDistance)
+				return NULL;
+			else if (range > ATTACK_DISTANCE)
+				return NextAction::merge( NextAction::array(0, new NextAction("reach spell"), NULL), Action::getPrerequisites());
+			else
+				return NextAction::merge( NextAction::array(0, new NextAction("reach melee"), NULL), Action::getPrerequisites());
+		}
+
+    protected:
+        string spell;
+		float range;
+    };
+
+	//---------------------------------------------------------------------------------------------------------------------
+	class CastAuraSpellAction : public CastSpellAction
+	{
+	public:
+		CastAuraSpellAction(PlayerbotAI* ai, string spell) : CastSpellAction(ai, spell) {}
+
+		virtual bool isUseful();
+	};
+
+    //---------------------------------------------------------------------------------------------------------------------
+    class CastMeleeSpellAction : public CastSpellAction
+    {
+    public:
+        CastMeleeSpellAction(PlayerbotAI* ai, string spell) : CastSpellAction(ai, spell) {
+			range = ATTACK_DISTANCE;
+		}
+    };
+
+    //---------------------------------------------------------------------------------------------------------------------
+    class CastDebuffSpellAction : public CastAuraSpellAction
+    {
+    public:
+        CastDebuffSpellAction(PlayerbotAI* ai, string spell) : CastAuraSpellAction(ai, spell) {}
+    };
+
+    class CastDebuffSpellOnAttackerAction : public CastAuraSpellAction
+    {
+    public:
+        CastDebuffSpellOnAttackerAction(PlayerbotAI* ai, string spell) : CastAuraSpellAction(ai, spell) {}
+        Value<Unit*>* GetTargetValue()
+        {
+            return context->GetValue<Unit*>("attacker without aura", spell);
+        }
+        virtual string getName() { return spell + " on attacker"; }
+        virtual ActionThreatType getThreatType() { return ACTION_THREAT_AOE; }
+    };
+
+	class CastBuffSpellAction : public CastAuraSpellAction
+	{
+	public:
+		CastBuffSpellAction(PlayerbotAI* ai, string spell) : CastAuraSpellAction(ai, spell)
+		{
+			range = sPlayerbotAIConfig.spellDistance;
+		}
+
+        virtual string GetTargetName() { return "self target"; }
+	};
+
+	class CastEnchantItemAction : public CastSpellAction
+	{
+	public:
+	    CastEnchantItemAction(PlayerbotAI* ai, string spell) : CastSpellAction(ai, spell)
+		{
+			range = sPlayerbotAIConfig.spellDistance;
+		}
+
+        virtual bool isUseful();
+        virtual string GetTargetName() { return "self target"; }
+	};
+
+    //---------------------------------------------------------------------------------------------------------------------
+
+    class CastHealingSpellAction : public CastAuraSpellAction
+    {
+    public:
+        CastHealingSpellAction(PlayerbotAI* ai, string spell, uint8 estAmount = 15.0f) : CastAuraSpellAction(ai, spell)
+		{
+            this->estAmount = estAmount;
+			range = sPlayerbotAIConfig.spellDistance;
+        }
+		virtual string GetTargetName() { return "self target"; }
+        virtual bool isUseful();
+        virtual ActionThreatType getThreatType() { return ACTION_THREAT_AOE; }
+
+    protected:
+        uint8 estAmount;
+    };
+
+    class CastAoeHealSpellAction : public CastHealingSpellAction
+    {
+    public:
+    	CastAoeHealSpellAction(PlayerbotAI* ai, string spell, uint8 estAmount = 15.0f) : CastHealingSpellAction(ai, spell, estAmount) {}
+		virtual string GetTargetName() { return "party member to heal"; }
+        virtual bool isUseful();
+    };
+
+	class CastCureSpellAction : public CastSpellAction
+	{
+	public:
+		CastCureSpellAction(PlayerbotAI* ai, string spell) : CastSpellAction(ai, spell)
+		{
+			range = sPlayerbotAIConfig.spellDistance;
+		}
+
+		virtual string GetTargetName() { return "self target"; }
+	};
+
+	class PartyMemberActionNameSupport {
+	public:
+		PartyMemberActionNameSupport(string spell)
+		{
+			name = string(spell) + " on party";
+		}
+
+		virtual string getName() { return name; }
+
+	private:
+		string name;
+	};
+
+    class HealPartyMemberAction : public CastHealingSpellAction, public PartyMemberActionNameSupport
+    {
+    public:
+        HealPartyMemberAction(PlayerbotAI* ai, string spell, uint8 estAmount = 15.0f) :
+			CastHealingSpellAction(ai, spell, estAmount), PartyMemberActionNameSupport(spell) {}
+
+		virtual string GetTargetName() { return "party member to heal"; }
+		virtual string getName() { return PartyMemberActionNameSupport::getName(); }
+    };
+
+	class ResurrectPartyMemberAction : public CastSpellAction
+	{
+	public:
+		ResurrectPartyMemberAction(PlayerbotAI* ai, string spell) : CastSpellAction(ai, spell) {}
+
+		virtual string GetTargetName() { return "party member to resurrect"; }
+	};
+    //---------------------------------------------------------------------------------------------------------------------
+
+    class CurePartyMemberAction : public CastSpellAction, public PartyMemberActionNameSupport
+    {
+    public:
+        CurePartyMemberAction(PlayerbotAI* ai, string spell, uint32 dispelType) :
+			CastSpellAction(ai, spell), PartyMemberActionNameSupport(spell)
+        {
+            this->dispelType = dispelType;
+        }
+
+		virtual Value<Unit*>* GetTargetValue();
+		virtual string getName() { return PartyMemberActionNameSupport::getName(); }
+
+    protected:
+        uint32 dispelType;
+    };
+
+    //---------------------------------------------------------------------------------------------------------------------
+
+    class BuffOnPartyAction : public CastBuffSpellAction, public PartyMemberActionNameSupport
+    {
+    public:
+        BuffOnPartyAction(PlayerbotAI* ai, string spell) :
+			CastBuffSpellAction(ai, spell), PartyMemberActionNameSupport(spell) {}
+    public:
+		virtual Value<Unit*>* GetTargetValue();
+		virtual string getName() { return PartyMemberActionNameSupport::getName(); }
+    };
+
+    //---------------------------------------------------------------------------------------------------------------------
+
+    class CastShootAction : public CastSpellAction
+    {
+    public:
+        CastShootAction(PlayerbotAI* ai) : CastSpellAction(ai, "shoot") {}
+        virtual ActionThreatType getThreatType() { return ACTION_THREAT_NONE; }
+    };
+
+	class CastLifeBloodAction : public CastHealingSpellAction
+	{
+	public:
+		CastLifeBloodAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "lifeblood") {}
+	};
+
+	class CastGiftOfTheNaaruAction : public CastHealingSpellAction
+	{
+	public:
+		CastGiftOfTheNaaruAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "gift of the naaru") {}
+	};
+
+    class CastArcaneTorrentAction : public CastBuffSpellAction
+    {
+    public:
+        CastArcaneTorrentAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "arcane torrent") {}
+    };
+
+    class CastSpellOnEnemyHealerAction : public CastSpellAction
+    {
+    public:
+        CastSpellOnEnemyHealerAction(PlayerbotAI* ai, string spell) : CastSpellAction(ai, spell) {}
+        Value<Unit*>* GetTargetValue()
+        {
+            return context->GetValue<Unit*>("enemy healer target", spell);
+        }
+        virtual string getName() { return spell + " on enemy healer"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/GossipHelloAction.cpp b/src/game/playerbot/strategy/actions/GossipHelloAction.cpp
new file mode 100644
index 00000000000..f8564d4dd47
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/GossipHelloAction.cpp
@@ -0,0 +1,71 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GossipHelloAction.h"
+
+
+using namespace ai;
+
+bool GossipHelloAction::Execute(Event event)
+{
+    ObjectGuid guid;
+
+    WorldPacket &p = event.getPacket();
+    if (p.empty())
+    {
+        Player* master = GetMaster();
+        if (master)
+            guid = master->GetSelectionGuid();
+    }
+    else
+    {
+        p.rpos(0);
+        p >> guid;
+    }
+
+    if (!guid)
+        return false;
+
+    Creature *pCreature = bot->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE);
+    if (!pCreature)
+    {
+        DEBUG_LOG ("[PlayerbotMgr]: HandleMasterIncomingPacket - Received  CMSG_GOSSIP_HELLO %s not found or you can't interact with him.", guid.GetString().c_str());
+        return false;
+    }
+
+    GossipMenuItemsMapBounds pMenuItemBounds = sObjectMgr.GetGossipMenuItemsMapBounds(pCreature->GetCreatureInfo()->GossipMenuId);
+    if (pMenuItemBounds.first == pMenuItemBounds.second)
+        return false;
+
+    WorldPacket p1;
+    p1 << guid;
+    bot->GetSession()->HandleGossipHelloOpcode(p1);
+    bot->SetFacingToObject(pCreature);
+
+    ostringstream out; out << "--- " << pCreature->GetName() << " ---";
+    ai->TellMasterNoFacing(out.str());
+
+    GossipMenu& menu = bot->PlayerTalkClass->GetGossipMenu();
+    int i = 0, loops = 0;
+    set<uint32> alreadyTalked;
+    while (i < menu.MenuItemCount() && loops++ < 100)
+    {
+        GossipMenuItem const& item = menu.GetItem(i);
+        ai->TellMasterNoFacing(item.m_gMessage);
+
+        if (item.m_gOptionId < 1000 && item.m_gOptionId != GOSSIP_OPTION_GOSSIP)
+        {
+            i++;
+            continue;
+        }
+
+        WorldPacket p1;
+        std::string code;
+        p1 << guid << menu.GetMenuId() << i << code;
+        bot->GetSession()->HandleGossipSelectOptionOpcode(p1);
+
+        i = 0;
+    }
+
+    bot->TalkedToCreature(pCreature->GetEntry(), pCreature->GetObjectGuid());
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/GossipHelloAction.h b/src/game/playerbot/strategy/actions/GossipHelloAction.h
new file mode 100644
index 00000000000..603737cef62
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/GossipHelloAction.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class GossipHelloAction : public Action {
+    public:
+        GossipHelloAction(PlayerbotAI* ai) : Action(ai, "gossip hello") {}
+        virtual bool Execute(Event event);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/GuildAcceptAction.cpp b/src/game/playerbot/strategy/actions/GuildAcceptAction.cpp
new file mode 100644
index 00000000000..49d71cc5d04
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/GuildAcceptAction.cpp
@@ -0,0 +1,42 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GuildAcceptAction.h"
+
+using namespace std;
+using namespace ai;
+
+bool GuildAcceptAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    bool accept = true;
+    uint32 guildId = master->GetGuildId();
+    if (!guildId)
+    {
+        ai->TellMaster("You are not in a guild");
+        accept = false;
+    }
+    else if (bot->GetGuildId())
+    {
+        ai->TellMaster("Sorry, I am in a guild already");
+        accept = false;
+    }
+    else if (!ai->GetSecurity()->CheckLevelFor(PLAYERBOT_SECURITY_INVITE, false, master, true))
+    {
+        accept = false;
+    }
+
+    WorldPacket packet;
+    if (accept)
+    {
+        bot->SetGuildIdInvited(guildId);
+        bot->GetSession()->HandleGuildAcceptOpcode(packet);
+    }
+    else
+    {
+        bot->GetSession()->HandleGuildDeclineOpcode(packet);
+    }
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/GuildAcceptAction.h b/src/game/playerbot/strategy/actions/GuildAcceptAction.h
new file mode 100644
index 00000000000..ab8910cc64b
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/GuildAcceptAction.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class GuildAcceptAction : public Action {
+    public:
+        GuildAcceptAction(PlayerbotAI* ai) : Action(ai, "guild accept") {}
+        virtual bool Execute(Event event);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/GuildBankAction.cpp b/src/game/playerbot/strategy/actions/GuildBankAction.cpp
new file mode 100644
index 00000000000..7b06e6ab6e5
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/GuildBankAction.cpp
@@ -0,0 +1,59 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GuildBankAction.h"
+
+#include "../values/ItemCountValue.h"
+
+using namespace std;
+using namespace ai;
+
+bool GuildBankAction::Execute(Event event)
+{
+    string text = event.getParam();
+    if (text.empty())
+        return false;
+
+    list<ObjectGuid> gos = AI_VALUE(list<ObjectGuid>, "nearest game objects");
+    for (list<ObjectGuid>::iterator i = gos.begin(); i != gos.end(); i++)
+    {
+        GameObject* go = ai->GetGameObject(*i);
+        if (!go || !bot->GetGameObjectIfCanInteractWith(go->GetObjectGuid(), GAMEOBJECT_TYPE_GUILD_BANK))
+            continue;
+
+        return Execute(text, go);
+    }
+
+    ai->TellMaster("Cannot find the guild bank nearby");
+    return false;
+}
+
+bool GuildBankAction::Execute(string text, GameObject* bank)
+{
+    bool result = true;
+
+    list<Item*> found = parseItems(text);
+    if (found.empty())
+        return false;
+
+    for (list<Item*>::iterator i = found.begin(); i != found.end(); i++)
+    {
+        Item* item = *i;
+        if (item)
+            result &= MoveFromCharToBank(item, bank);
+    }
+
+    return result;
+}
+
+bool GuildBankAction::MoveFromCharToBank(Item* item, GameObject* bank)
+{
+    uint32 playerSlot = item->GetSlot();
+    uint32 playerBag = item->GetBagSlot();
+
+    Guild* guild = sGuildMgr.GetGuildById(bot->GetGuildId());
+    guild->MoveFromCharToBank(bot, playerBag, playerSlot, 0, INVENTORY_SLOT_BAG_0, 0);
+
+    ostringstream out; out << chat->formatItem(item->GetProto()) << " put to guild bank";
+    ai->TellMaster(out);
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/GuildBankAction.h b/src/game/playerbot/strategy/actions/GuildBankAction.h
new file mode 100644
index 00000000000..374fc0fdeac
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/GuildBankAction.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class GuildBankAction : public InventoryAction {
+    public:
+        GuildBankAction(PlayerbotAI* ai) : InventoryAction(ai, "guild bank") {}
+        virtual bool Execute(Event event);
+
+    private:
+        bool Execute(string text, GameObject* bank);
+        bool MoveFromCharToBank(Item* item, GameObject* bank);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/HelpAction.cpp b/src/game/playerbot/strategy/actions/HelpAction.cpp
new file mode 100644
index 00000000000..6e7b776dc05
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/HelpAction.cpp
@@ -0,0 +1,54 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "HelpAction.h"
+#include "ChatActionContext.h"
+
+using namespace ai;
+
+HelpAction::HelpAction(PlayerbotAI* ai) : Action(ai, "help")
+{
+    chatContext = new ChatActionContext();
+}
+
+HelpAction::~HelpAction()
+{
+    delete chatContext;
+}
+
+bool HelpAction::Execute(Event event)
+{
+    TellChatCommands();
+    TellStrategies();
+    return true;
+}
+
+void HelpAction::TellChatCommands()
+{
+    ostringstream out;
+    out << "Whisper any of: ";
+    out << CombineSupported(chatContext->supports());
+    out << ", [item], [quest] or [object] link";
+    ai->TellMaster(out);
+}
+
+void HelpAction::TellStrategies()
+{
+    ostringstream out;
+    out << "Possible strategies (co/nc/dead commands): ";
+    out << CombineSupported(ai->GetAiObjectContext()->GetSupportedStrategies());
+    ai->TellMaster(out);
+}
+
+string HelpAction::CombineSupported(set<string> commands)
+{
+    ostringstream out;
+
+    for (set<string>::iterator i = commands.begin(); i != commands.end(); )
+	{
+        out << *i;
+		if (++i != commands.end())
+			out << ", ";
+	}
+
+    return out.str();
+}
diff --git a/src/game/playerbot/strategy/actions/HelpAction.h b/src/game/playerbot/strategy/actions/HelpAction.h
new file mode 100644
index 00000000000..c0bc5e32780
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/HelpAction.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class HelpAction : public Action {
+    public:
+        HelpAction(PlayerbotAI* ai);
+        virtual ~HelpAction();
+        virtual bool Execute(Event event);
+
+    private:
+        void TellChatCommands();
+        void TellStrategies();
+        string CombineSupported(set<string> commands);
+
+    private:
+        NamedObjectContext<Action>* chatContext;
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/InventoryAction.cpp b/src/game/playerbot/strategy/actions/InventoryAction.cpp
new file mode 100644
index 00000000000..6255bd69b14
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/InventoryAction.cpp
@@ -0,0 +1,288 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "InventoryAction.h"
+
+#include "../values/ItemCountValue.h"
+
+using namespace ai;
+
+
+class FindPotionVisitor : public FindUsableItemVisitor
+{
+public:
+    FindPotionVisitor(Player* bot, uint32 effectId) : FindUsableItemVisitor(bot), effectId(effectId) {}
+
+    virtual bool Accept(const ItemPrototype* proto)
+    {
+        if (proto->Class == ITEM_CLASS_CONSUMABLE &&
+            proto->SubClass == ITEM_SUBCLASS_POTION &&
+            proto->Spells[0].SpellCategory == 4)
+        {
+            for (int j = 0; j < MAX_ITEM_PROTO_SPELLS; j++)
+            {
+                const SpellEntry* const spellInfo = sSpellStore.LookupEntry(proto->Spells[j].SpellId);
+                if (!spellInfo)
+                    return false;
+
+                for (int i = 0 ; i < 3; i++)
+                {
+                    if (spellInfo->Effect[i] == effectId)
+                        return true;
+                }
+            }
+        }
+        return false;
+    }
+
+private:
+    uint32 effectId;
+};
+
+class FindFoodVisitor : public FindUsableItemVisitor
+{
+public:
+    FindFoodVisitor(Player* bot, uint32 spellCategory) : FindUsableItemVisitor(bot)
+    {
+        this->spellCategory = spellCategory;
+    }
+
+    virtual bool Accept(const ItemPrototype* proto)
+    {
+        return proto->Class == ITEM_CLASS_CONSUMABLE &&
+            proto->SubClass == ITEM_SUBCLASS_FOOD &&
+            proto->Spells[0].SpellCategory == spellCategory;
+    }
+
+private:
+    uint32 spellCategory;
+};
+
+void InventoryAction::IterateItems(IterateItemsVisitor* visitor, IterateItemsMask mask)
+{
+    if (mask & ITERATE_ITEMS_IN_BAGS)
+        IterateItemsInBags(visitor);
+
+    if (mask & ITERATE_ITEMS_IN_EQUIP)
+        IterateItemsInEquip(visitor);
+}
+
+void InventoryAction::IterateItemsInBags(IterateItemsVisitor* visitor)
+{
+
+
+    for(int i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+        if (Item *pItem = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            if (!visitor->Visit(pItem))
+                return;
+
+    for(int i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
+        if (Item *pItem = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            if (!visitor->Visit(pItem))
+                return;
+
+    for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
+        if (Bag *pBag = (Bag*)bot->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+            for(uint32 j = 0; j < pBag->GetBagSize(); ++j)
+                if (Item* pItem = pBag->GetItemByPos(j))
+                    if (!visitor->Visit(pItem))
+                        return;
+}
+
+void InventoryAction::IterateItemsInEquip(IterateItemsVisitor* visitor)
+{
+    for (uint8 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; slot++)
+    {
+        Item* const pItem = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, slot);
+        if(!pItem)
+            continue;
+
+        if (!visitor->Visit(pItem))
+            return;
+    }
+}
+
+bool compare_items(const ItemPrototype *proto1, const ItemPrototype *proto2)
+{
+    if (proto1->Class != proto2->Class)
+        return proto1->Class > proto2->Class;
+
+    if (proto1->SubClass != proto2->SubClass)
+        return proto1->SubClass < proto2->SubClass;
+
+    if (proto1->Quality != proto2->Quality)
+        return proto1->Quality < proto2->Quality;
+
+    if (proto1->ItemLevel != proto2->ItemLevel)
+        return proto1->ItemLevel > proto2->ItemLevel;
+
+    return false;
+}
+
+bool compare_items_by_level(const Item* item1, const Item* item2)
+{
+    return compare_items(item1->GetProto(), item2->GetProto());
+}
+
+void InventoryAction::TellItems(map<uint32, int> itemMap)
+{
+    list<ItemPrototype const*> items;
+    for (map<uint32, int>::iterator i = itemMap.begin(); i != itemMap.end(); i++)
+    {
+        items.push_back(sItemStorage.LookupEntry<ItemPrototype>(i->first));
+    }
+
+    items.sort(compare_items);
+
+    uint32 oldClass = -1;
+    for (list<ItemPrototype const*>::iterator i = items.begin(); i != items.end(); i++)
+    {
+        ItemPrototype const *proto = *i;
+
+        if (proto->Class != oldClass)
+        {
+            oldClass = proto->Class;
+            switch (proto->Class)
+            {
+            case ITEM_CLASS_CONSUMABLE:
+                ai->TellMaster("--- consumable ---");
+                break;
+            case ITEM_CLASS_CONTAINER:
+                ai->TellMaster("--- container ---");
+                break;
+            case ITEM_CLASS_WEAPON:
+                ai->TellMaster("--- weapon ---");
+                break;
+            case ITEM_CLASS_GEM:
+                ai->TellMaster("--- gem ---");
+                break;
+            case ITEM_CLASS_ARMOR:
+                ai->TellMaster("--- armor ---");
+                break;
+            case ITEM_CLASS_REAGENT:
+                ai->TellMaster("--- reagent ---");
+                break;
+            case ITEM_CLASS_PROJECTILE:
+                ai->TellMaster("--- projectile ---");
+                break;
+            case ITEM_CLASS_TRADE_GOODS:
+                ai->TellMaster("--- trade goods ---");
+                break;
+            case ITEM_CLASS_GENERIC:
+                ai->TellMaster("--- generic ---");
+                break;
+            case ITEM_CLASS_RECIPE:
+                ai->TellMaster("--- recipe ---");
+                break;
+            case ITEM_CLASS_MONEY:
+                ai->TellMaster("--- money ---");
+                break;
+            case ITEM_CLASS_QUIVER:
+                ai->TellMaster("--- quiver ---");
+                break;
+            case ITEM_CLASS_QUEST:
+                ai->TellMaster("--- quest items ---");
+                break;
+            case ITEM_CLASS_KEY:
+                ai->TellMaster("--- keys ---");
+                break;
+            case ITEM_CLASS_PERMANENT:
+                ai->TellMaster("--- permanent ---");
+                break;
+            case ITEM_CLASS_MISC:
+                ai->TellMaster("--- other ---");
+                break;
+            case ITEM_CLASS_GLYPH:
+                ai->TellMaster("--- glyph ---");
+                break;
+            }
+        }
+
+        TellItem(proto, itemMap[proto->ItemId]);
+    }
+}
+
+void InventoryAction::TellItem(ItemPrototype const * proto, int count)
+{
+    ai->TellMaster(chat->formatItem(proto, count));
+}
+
+list<Item*> InventoryAction::parseItems(string text)
+{
+    set<Item*> found;
+    size_t pos = text.find(" ");
+    int count = pos!=string::npos ? atoi(text.substr(pos + 1).c_str()) : TRADE_SLOT_TRADED_COUNT;
+    if (count < 1) count = 1;
+    else if (count > TRADE_SLOT_TRADED_COUNT) count = TRADE_SLOT_TRADED_COUNT;
+
+    if (text == "food")
+    {
+        FindFoodVisitor visitor(bot, 11);
+        IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS);
+        found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
+    }
+
+    if (text == "drink")
+    {
+        FindFoodVisitor visitor(bot, 59);
+        IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS);
+        found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
+    }
+
+    if (text == "mana potion")
+    {
+        FindPotionVisitor visitor(bot, SPELL_EFFECT_ENERGIZE);
+        IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS);
+        found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
+    }
+
+    if (text == "healing potion")
+    {
+        FindPotionVisitor visitor(bot, SPELL_EFFECT_HEAL);
+        IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS);
+        found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
+    }
+
+    FindUsableNamedItemVisitor visitor(bot, text);
+    IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS);
+    found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
+
+    uint32 quality = chat->parseItemQuality(text);
+    if (quality != MAX_ITEM_QUALITY)
+    {
+        FindItemsToTradeByQualityVisitor visitor(quality, count);
+        IterateItems(&visitor);
+        found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
+    }
+
+    uint32 itemClass = MAX_ITEM_CLASS, itemSubClass = 0;
+    if (chat->parseItemClass(text, &itemClass, &itemSubClass))
+    {
+        FindItemsToTradeByClassVisitor visitor(itemClass, itemSubClass, count);
+        IterateItems(&visitor);
+        found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
+    }
+
+    uint32 fromSlot = chat->parseSlot(text);
+    if (fromSlot != EQUIPMENT_SLOT_END)
+    {
+        Item* item = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, fromSlot);
+        if (item)
+            found.insert(item);
+    }
+
+    ItemIds ids = chat->parseItems(text);
+    for (ItemIds::iterator i = ids.begin(); i != ids.end(); i++)
+    {
+        FindItemByIdVisitor visitor(*i);
+        IterateItems(&visitor, ITERATE_ALL_ITEMS);
+        found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
+    }
+
+    list<Item*> result;
+    for (set<Item*>::iterator i = found.begin(); i != found.end(); ++i)
+        result.push_back(*i);
+
+    result.sort(compare_items_by_level);
+
+    return result;
+}
diff --git a/src/game/playerbot/strategy/actions/InventoryAction.h b/src/game/playerbot/strategy/actions/InventoryAction.h
new file mode 100644
index 00000000000..ab90bf6f9d7
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/InventoryAction.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "../Action.h"
+#include "../ItemVisitors.h"
+
+namespace ai
+{
+
+
+    class InventoryAction : public Action {
+    public:
+        InventoryAction(PlayerbotAI* ai, string name) : Action(ai, name) {}
+
+    protected:
+        void IterateItems(IterateItemsVisitor* visitor, IterateItemsMask mask = ITERATE_ITEMS_IN_BAGS);
+        void TellItems(map<uint32, int> items);
+        void TellItem(ItemPrototype const * proto, int count);
+        list<Item*> parseItems(string text);
+
+    private:
+        void IterateItemsInBags(IterateItemsVisitor* visitor);
+        void IterateItemsInEquip(IterateItemsVisitor* visitor);
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/InventoryChangeFailureAction.cpp b/src/game/playerbot/strategy/actions/InventoryChangeFailureAction.cpp
new file mode 100644
index 00000000000..88285a59263
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/InventoryChangeFailureAction.cpp
@@ -0,0 +1,55 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "InventoryChangeFailureAction.h"
+
+
+using namespace ai;
+
+bool InventoryChangeFailureAction::Execute(Event event)
+{
+    WorldPacket p(event.getPacket());
+    p.rpos(0);
+    uint8 err;
+    p >> err;
+    if (err == EQUIP_ERR_OK)
+        return false;
+
+    switch (err)
+    {
+    case EQUIP_ERR_CANT_CARRY_MORE_OF_THIS:
+        ai->TellMaster("I can't carry anymore of those.");
+        break;
+    case EQUIP_ERR_MISSING_REAGENT:
+        ai->TellMaster("I'm missing some reagents for that.");
+        break;
+    case EQUIP_ERR_ITEM_LOCKED:
+        ai->TellMaster("That item is locked.");
+        break;
+    case EQUIP_ERR_ALREADY_LOOTED:
+        break;
+    case EQUIP_ERR_INVENTORY_FULL:
+        ai->TellMaster("My inventory is full.");
+        break;
+    case EQUIP_ERR_NOT_IN_COMBAT:
+        ai->TellMaster("I can't use that in combat.");
+        break;
+    case EQUIP_ERR_LOOT_CANT_LOOT_THAT_NOW:
+        ai->TellMaster("I can't get that now.");
+        break;
+    case EQUIP_ERR_ITEM_UNIQUE_EQUIPABLE:
+        ai->TellMaster("I can only have one of those equipped.");
+        break;
+    case EQUIP_ERR_BANK_FULL:
+        ai->TellMaster("My bank is full.");
+        break;
+    case EQUIP_ERR_ITEM_NOT_FOUND:
+        ai->TellMaster("I can't find the item.");
+        break;
+    case EQUIP_ERR_TOO_FAR_AWAY_FROM_BANK:
+        ai->TellMaster("I'm too far from the bank.");
+        break;
+    default:
+        ai->TellMaster("I can't use that.");
+    }
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/InventoryChangeFailureAction.h b/src/game/playerbot/strategy/actions/InventoryChangeFailureAction.h
new file mode 100644
index 00000000000..4125cd289b3
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/InventoryChangeFailureAction.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class InventoryChangeFailureAction : public Action {
+    public:
+        InventoryChangeFailureAction(PlayerbotAI* ai) : Action(ai, "inventory change failure") {}
+        virtual bool Execute(Event event);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/InviteToGroupAction.h b/src/game/playerbot/strategy/actions/InviteToGroupAction.h
new file mode 100644
index 00000000000..d57ee5062f0
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/InviteToGroupAction.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class InviteToGroupAction : public Action
+    {
+    public:
+        InviteToGroupAction(PlayerbotAI* ai) : Action(ai, "invite") {}
+
+        virtual bool Execute(Event event)
+        {
+            Player* master = event.getOwner();
+            if (!master)
+                return false;
+
+            WorldPacket p;
+            uint32 roles_mask = 0;
+            p << master->GetName();
+            p << roles_mask;
+            bot->GetSession()->HandleGroupInviteOpcode(p);
+
+            return true;
+        }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/LeaveGroupAction.h b/src/game/playerbot/strategy/actions/LeaveGroupAction.h
new file mode 100644
index 00000000000..f5ccc506916
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/LeaveGroupAction.h
@@ -0,0 +1,79 @@
+#pragma once
+
+#include "../Action.h"
+#include "../../RandomPlayerbotMgr.h"
+
+namespace ai
+{
+    class LeaveGroupAction : public Action {
+    public:
+        LeaveGroupAction(PlayerbotAI* ai, string name = "leave") : Action(ai, name) {}
+
+        virtual bool Execute(Event event)
+        {
+            if (!bot->GetGroup())
+                return false;
+
+            ai->TellMaster("Goodbye!", PLAYERBOT_SECURITY_TALK);
+
+            WorldPacket p;
+            string member = bot->GetName();
+            p << uint32(PARTY_OP_LEAVE) << member << uint32(0);
+            bot->GetSession()->HandleGroupDisbandOpcode(p);
+
+            if (sRandomPlayerbotMgr.IsRandomBot(bot))
+            {
+                bot->GetPlayerbotAI()->SetMaster(NULL);
+                sRandomPlayerbotMgr.ScheduleTeleport(bot->GetGUIDLow());
+                sRandomPlayerbotMgr.SetLootAmount(bot, 0);
+            }
+
+            ai->ResetStrategies();
+            return true;
+        }
+    };
+
+    class PartyCommandAction : public LeaveGroupAction {
+    public:
+        PartyCommandAction(PlayerbotAI* ai) : LeaveGroupAction(ai, "party command") {}
+
+        virtual bool Execute(Event event)
+        {
+            WorldPacket& p = event.getPacket();
+            p.rpos(0);
+            uint32 operation;
+            string member;
+
+            p >> operation >> member;
+
+            if (operation != PARTY_OP_LEAVE)
+                return false;
+
+            Player* master = GetMaster();
+            if (master && member == master->GetName())
+                return LeaveGroupAction::Execute(event);
+
+            return false;
+        }
+    };
+
+    class UninviteAction : public LeaveGroupAction {
+    public:
+        UninviteAction(PlayerbotAI* ai) : LeaveGroupAction(ai, "party command") {}
+
+        virtual bool Execute(Event event)
+        {
+            WorldPacket& p = event.getPacket();
+            p.rpos(0);
+            ObjectGuid guid;
+
+            p >> guid;
+
+            if (bot->GetObjectGuid() == guid)
+                return LeaveGroupAction::Execute(event);
+
+            return false;
+        }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/LfgActions.cpp b/src/game/playerbot/strategy/actions/LfgActions.cpp
new file mode 100644
index 00000000000..f2016de71a8
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/LfgActions.cpp
@@ -0,0 +1,221 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "LfgActions.h"
+#include "../../AiFactory.h"
+#include "../../PlayerbotAIConfig.h"
+#include "../ItemVisitors.h"
+#include "../../RandomPlayerbotMgr.h"
+#include "../../../LFGMgr.h"
+
+using namespace ai;
+
+bool LfgJoinAction::Execute(Event event)
+{
+    if (!sPlayerbotAIConfig.randomBotJoinLfg)
+        return false;
+
+    if (bot->isDead())
+        return false;
+
+    if (!sRandomPlayerbotMgr.IsRandomBot(bot))
+        return false;
+
+    if (sLFGMgr.GetQueueInfo(bot->GetObjectGuid()))
+        return false;
+
+    if (bot->IsBeingTeleported())
+        return false;
+
+    Map* map = bot->GetMap();
+    if (map && map->Instanceable())
+        return false;
+
+    return JoinProposal();
+}
+
+bool LfgJoinAction::SetRoles()
+{
+    LFGPlayerState* state = sLFGMgr.GetLFGPlayerState(bot->GetObjectGuid());
+    if (!state)
+        return false;
+
+    int spec = AiFactory::GetPlayerSpecTab(bot);
+    switch (bot->getClass())
+    {
+    case CLASS_DRUID:
+        if (spec == 2)
+            state->SetRoles(LFG_ROLE_MASK_HEALER);
+        else if (spec == 1 && bot->getLevel() >= 40)
+            state->SetRoles(LFG_ROLE_MASK_TANK_DAMAGE);
+        else
+            state->SetRoles(LFG_ROLE_MASK_DAMAGE);
+        break;
+    case CLASS_PALADIN:
+        if (spec == 1)
+            state->SetRoles(LFG_ROLE_MASK_TANK);
+        else if (spec == 0)
+            state->SetRoles(LFG_ROLE_MASK_HEALER);
+        else
+            state->SetRoles(LFG_ROLE_MASK_DAMAGE);
+        break;
+    case CLASS_PRIEST:
+        if (spec != 2)
+            state->SetRoles(LFG_ROLE_MASK_HEALER);
+        else
+            state->SetRoles(LFG_ROLE_MASK_DAMAGE);
+        break;
+    case CLASS_SHAMAN:
+        if (spec == 2)
+            state->SetRoles(LFG_ROLE_MASK_HEALER);
+        else
+            state->SetRoles(LFG_ROLE_MASK_DAMAGE);
+        break;
+    case CLASS_WARRIOR:
+        if (spec == 2)
+            state->SetRoles(LFG_ROLE_MASK_TANK);
+        else
+            state->SetRoles(LFG_ROLE_MASK_DAMAGE);
+        break;
+    default:
+        state->SetRoles(LFG_ROLE_MASK_DAMAGE);
+        break;
+    }
+
+	return true;
+}
+
+bool LfgJoinAction::JoinProposal()
+{
+    LFGPlayerState* state = sLFGMgr.GetLFGPlayerState(bot->GetObjectGuid());
+    if (!state)
+        return false;
+
+    if (state->GetDungeons() && !state->GetDungeons()->empty())
+        return false;
+
+    if (!SetRoles())
+        return false;
+
+    ItemCountByQuality visitor;
+    IterateItems(&visitor, ITERATE_ITEMS_IN_EQUIP);
+	bool heroic = urand(0, 100) < 50 && (visitor.count[ITEM_QUALITY_EPIC] >= 3 || visitor.count[ITEM_QUALITY_RARE] >= 10) && bot->getLevel() >= 70;
+    bool random = urand(0, 100) < 25;
+    bool raid = urand(0, 100) < 50 && visitor.count[ITEM_QUALITY_EPIC] >= 5 && (bot->getLevel() == 60 || bot->getLevel() == 70 || bot->getLevel() == 80);
+
+    LFGDungeonSet list;
+    for (uint32 i = 0; i < sLFGDungeonStore.GetNumRows(); ++i)
+    {
+        LFGDungeonEntry const* dungeon = sLFGDungeonStore.LookupEntry(i);
+        if (!dungeon || (dungeon->type != LFG_TYPE_RANDOM_DUNGEON && dungeon->type != LFG_TYPE_DUNGEON && dungeon->type != LFG_TYPE_HEROIC_DUNGEON &&
+                dungeon->type != LFG_TYPE_RAID))
+            continue;
+
+        int botLevel = (int)bot->getLevel();
+        if (dungeon->minlevel && botLevel < (int)dungeon->minlevel)
+            continue;
+
+        if (dungeon->minlevel && botLevel > (int)dungeon->minlevel + 10)
+            continue;
+
+        if (dungeon->maxlevel && botLevel > (int)dungeon->maxlevel)
+            continue;
+
+        if (heroic && !dungeon->difficulty)
+            continue;
+
+        if (raid && dungeon->type != LFG_TYPE_RAID)
+            continue;
+
+        list.insert(dungeon);
+    }
+
+    if (random)
+	{
+		sLog.outDebug("Bot %s joined to LFG_TYPE_RANDOM_DUNGEON", bot->GetName());
+        state->SetType(LFG_TYPE_RANDOM_DUNGEON);
+	}
+    else if (heroic)
+	{
+		sLog.outDebug("Bot %s joined to LFG_TYPE_HEROIC_DUNGEON", bot->GetName());
+        state->SetType(LFG_TYPE_HEROIC_DUNGEON);
+	}
+    else if (raid)
+	{
+		sLog.outDebug("Bot %s joined to LFG_TYPE_RAID", bot->GetName());
+        state->SetType(LFG_TYPE_RAID);
+	}
+    else
+	{
+		sLog.outDebug("Bot %s joined to LFG_TYPE_DUNGEON", bot->GetName());
+        state->SetType(LFG_TYPE_DUNGEON);
+	}
+
+    if (list.empty())
+        return false;
+
+    state->SetComment("bot");
+    state->SetDungeons(list);
+
+    sLFGMgr.Join(bot);
+    return true;
+}
+
+bool LfgRoleCheckAction::Execute(Event event)
+{
+    Group* group = bot->GetGroup();
+    if (group)
+    {
+        if (!SetRoles())
+            return false;
+
+        sLFGMgr.UpdateRoleCheck(group);
+        return true;
+    }
+
+    return false;
+}
+
+bool LfgAcceptAction::Execute(Event event)
+{
+    LFGPlayerState* botState = sLFGMgr.GetLFGPlayerState(bot->GetObjectGuid());
+    if (!botState || botState->GetState() != LFG_STATE_PROPOSAL)
+        return false;
+
+    uint32 id = AI_VALUE(uint32, "lfg proposal");
+    if (id)
+    {
+        if (urand(0, 1 + 10 / sPlayerbotAIConfig.randomChangeMultiplier))
+            return false;
+
+        sLog.outDetail("Bot %s updated proposal %d", bot->GetName(), id);
+        ai->GetAiObjectContext()->GetValue<uint32>("lfg proposal")->Set(0);
+        sLFGMgr.UpdateProposal(id, bot->GetObjectGuid(), true);
+
+        ai->Reset();
+        if (sRandomPlayerbotMgr.IsRandomBot(bot) && !bot->GetGroup())
+        {
+            sRandomPlayerbotMgr.Refresh(bot);
+            ai->ResetStrategies();
+            bot->TeleportToHomebind();
+        }
+        return true;
+    }
+
+    WorldPacket p(event.getPacket());
+
+    uint32 dungeon;
+    uint8 state;
+    p >> dungeon >> state >> id;
+
+    ai->GetAiObjectContext()->GetValue<uint32>("lfg proposal")->Set(id);
+    return true;
+}
+
+bool LfgLeaveAction::Execute(Event event)
+{
+    if (!sLFGMgr.GetQueueInfo(bot->GetObjectGuid()))
+        return false;
+
+    sLFGMgr.Leave(bot);
+	return true;
+}
diff --git a/src/game/playerbot/strategy/actions/LfgActions.h b/src/game/playerbot/strategy/actions/LfgActions.h
new file mode 100644
index 00000000000..2c44ff03838
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/LfgActions.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class LfgJoinAction : public InventoryAction {
+    public:
+        LfgJoinAction(PlayerbotAI* ai, string name = "lfg join") : InventoryAction(ai, name) {}
+        virtual bool Execute(Event event);
+
+    protected:
+        bool JoinProposal();
+        bool SetRoles();
+    };
+
+    class LfgAcceptAction : public LfgJoinAction {
+    public:
+        LfgAcceptAction(PlayerbotAI* ai) : LfgJoinAction(ai, "lfg accept") {}
+        virtual bool Execute(Event event);
+    };
+
+    class LfgRoleCheckAction : public LfgJoinAction {
+    public:
+        LfgRoleCheckAction(PlayerbotAI* ai) : LfgJoinAction(ai, "lfg role check") {}
+        virtual bool Execute(Event event);
+    };
+
+    class LfgLeaveAction : public Action {
+    public:
+        LfgLeaveAction(PlayerbotAI* ai) : Action(ai, "lfg leave") {}
+        virtual bool Execute(Event event);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/ListQuestsActions.cpp b/src/game/playerbot/strategy/actions/ListQuestsActions.cpp
new file mode 100644
index 00000000000..def672b3a54
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ListQuestsActions.cpp
@@ -0,0 +1,71 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ListQuestsActions.h"
+
+
+using namespace ai;
+
+bool ListQuestsAction::Execute(Event event)
+{
+    if (event.getParam() == "completed")
+    {
+        ListQuests(QUEST_LIST_FILTER_COMPLETED);
+    }
+    else if (event.getParam() == "incompleted")
+    {
+        ListQuests(QUEST_LIST_FILTER_INCOMPLETED);
+    }
+    else if (event.getParam() == "all")
+    {
+        ListQuests(QUEST_LIST_FILTER_ALL);
+    }
+    else
+    {
+        ListQuests(QUEST_LIST_FILTER_SUMMARY);
+    }
+    return true;
+}
+
+void ListQuestsAction::ListQuests(QuestListFilter filter)
+{
+    bool showIncompleted = filter & QUEST_LIST_FILTER_INCOMPLETED;
+    bool showCompleted = filter & QUEST_LIST_FILTER_COMPLETED;
+
+    if (showIncompleted)
+        ai->TellMaster("--- Incomplete quests ---");
+    int incompleteCount = ListQuests(false, !showIncompleted);
+
+    if (showCompleted)
+        ai->TellMaster("--- Complete quests ---");
+    int completeCount = ListQuests(true, !showCompleted);
+
+    ai->TellMaster("--- Summary ---");
+    std::ostringstream out;
+    out << "Total: " << (completeCount + incompleteCount) << " / 25 (incomplete: " << incompleteCount << ", complete: " << completeCount << ")";
+    ai->TellMaster(out);
+}
+
+int ListQuestsAction::ListQuests(bool completed, bool silent)
+{
+    int count = 0;
+    for (uint16 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot)
+    {
+        uint32 questId = bot->GetQuestSlotQuestId(slot);
+        if (!questId)
+            continue;
+
+        Quest const* pQuest = sObjectMgr.GetQuestTemplate(questId);
+        bool isCompletedQuest = bot->GetQuestStatus(questId) == QUEST_STATUS_COMPLETE;
+        if (completed != isCompletedQuest)
+            continue;
+
+        count++;
+
+        if (silent)
+            continue;
+
+        ai->TellMaster(chat->formatQuest(pQuest));
+    }
+
+    return count;
+}
diff --git a/src/game/playerbot/strategy/actions/ListQuestsActions.h b/src/game/playerbot/strategy/actions/ListQuestsActions.h
new file mode 100644
index 00000000000..961acb874fb
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ListQuestsActions.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    enum QuestListFilter {
+        QUEST_LIST_FILTER_SUMMARY = 0,
+        QUEST_LIST_FILTER_COMPLETED = 1,
+        QUEST_LIST_FILTER_INCOMPLETED = 2,
+        QUEST_LIST_FILTER_ALL = QUEST_LIST_FILTER_COMPLETED | QUEST_LIST_FILTER_INCOMPLETED
+    };
+
+    class ListQuestsAction : public Action {
+    public:
+        ListQuestsAction(PlayerbotAI* ai) : Action(ai, "quests") {}
+        virtual bool Execute(Event event);
+
+    private:
+        int ListQuests(bool completed, bool silent);
+        void ListQuests(QuestListFilter filter);
+
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/ListSpellsAction.cpp b/src/game/playerbot/strategy/actions/ListSpellsAction.cpp
new file mode 100644
index 00000000000..a59a76e03c3
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ListSpellsAction.cpp
@@ -0,0 +1,65 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ListSpellsAction.h"
+#include "../ItemVisitors.h"
+
+using namespace ai;
+
+bool ListSpellsAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    int loc = master->GetSession()->GetSessionDbcLocale();
+
+    std::ostringstream posOut;
+    std::ostringstream negOut;
+
+    string filter = event.getParam();
+
+    const std::string ignoreList = ",Opening,Closing,Stuck,Remove Insignia,Opening - No Text,Grovel,Duel,Honorless Target,";
+    std::string alreadySeenList = ",";
+
+    for (PlayerSpellMap::iterator itr = bot->GetSpellMap().begin(); itr != bot->GetSpellMap().end(); ++itr) {
+        const uint32 spellId = itr->first;
+
+        if (itr->second.state == PLAYERSPELL_REMOVED || itr->second.disabled || IsPassiveSpell(spellId))
+            continue;
+
+        const SpellEntry* const pSpellInfo = sSpellStore.LookupEntry(spellId);
+        if (!pSpellInfo)
+            continue;
+
+        //|| name.find("Teleport") != -1
+
+        std::string comp = ",";
+        comp.append(pSpellInfo->SpellName[loc]);
+        comp.append(",");
+
+        if (!(ignoreList.find(comp) == std::string::npos && alreadySeenList.find(comp) == std::string::npos))
+            continue;
+
+        if (!filter.empty() && !strstri(pSpellInfo->SpellName[loc], filter.c_str()))
+            continue;
+
+        alreadySeenList += pSpellInfo->SpellName[loc];
+        alreadySeenList += ",";
+
+        if (IsPositiveSpell(spellId))
+            posOut << " |cffffffff|Hspell:" << spellId << "|h["
+            << pSpellInfo->SpellName[loc] << "]|h|r";
+        else
+            negOut << " |cffffffff|Hspell:" << spellId << "|h["
+            << pSpellInfo->SpellName[loc] << "]|h|r";
+    }
+
+    ai->TellMaster("here's my non-attack spells:");
+    ai->TellMaster(posOut);
+
+    ai->TellMaster("here's my attack spells:");
+    ai->TellMaster(negOut);
+
+    return true;
+}
+
diff --git a/src/game/playerbot/strategy/actions/ListSpellsAction.h b/src/game/playerbot/strategy/actions/ListSpellsAction.h
new file mode 100644
index 00000000000..24470552e67
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ListSpellsAction.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../Action.h"
+
+
+namespace ai
+{
+    class ListSpellsAction : public Action {
+    public:
+        ListSpellsAction(PlayerbotAI* ai) : Action(ai, "spells") {}
+
+        virtual bool Execute(Event event);
+  
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/LogLevelAction.cpp b/src/game/playerbot/strategy/actions/LogLevelAction.cpp
new file mode 100644
index 00000000000..5580e47eb45
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/LogLevelAction.cpp
@@ -0,0 +1,51 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "LogLevelAction.h"
+
+
+using namespace ai;
+
+bool LogLevelAction::Execute(Event event)
+{
+    string param = event.getParam();
+    Value<LogLevel> *value = ai->GetAiObjectContext()->GetValue<LogLevel>("log level");
+
+    ostringstream out; 
+    if (param != "?")
+    {
+        value->Set(string2logLevel(param));
+        out << "My log level set to " << logLevel2string(value->Get());
+    }
+    else
+    {
+        out << "My log level is " << logLevel2string(value->Get());
+    }
+    ai->TellMaster(out);
+    return true;    
+}
+
+string LogLevelAction::logLevel2string(LogLevel level)
+{
+    switch (level) 
+    {
+    case LOG_LVL_BASIC:
+        return "basic";
+    case LOG_LVL_MINIMAL:
+        return "minimal";
+    case LOG_LVL_DETAIL:
+        return "detail";
+    default:
+        return "debug";
+    }
+}
+LogLevel LogLevelAction::string2logLevel(string level)
+{
+    if (level == "debug")
+        return LOG_LVL_DEBUG;
+    else if (level == "minimal")
+        return LOG_LVL_MINIMAL;
+    else if (level == "detail")
+        return LOG_LVL_DETAIL;
+    else 
+        return LOG_LVL_BASIC;
+}
diff --git a/src/game/playerbot/strategy/actions/LogLevelAction.h b/src/game/playerbot/strategy/actions/LogLevelAction.h
new file mode 100644
index 00000000000..4ad2a33f119
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/LogLevelAction.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class LogLevelAction : public Action {
+    public:
+        LogLevelAction(PlayerbotAI* ai) : Action(ai, "log") {}
+        virtual bool Execute(Event event);
+
+    public:
+        static string logLevel2string(LogLevel level);
+        static LogLevel string2logLevel(string level);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/LootAction.cpp b/src/game/playerbot/strategy/actions/LootAction.cpp
new file mode 100644
index 00000000000..824ac25a460
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/LootAction.cpp
@@ -0,0 +1,396 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "LootAction.h"
+
+#include "../../LootObjectStack.h"
+#include "../../PlayerbotAIConfig.h"
+#include "../../../ahbot/AhBot.h"
+#include "../../RandomPlayerbotMgr.h"
+
+using namespace ai;
+
+bool LootAction::Execute(Event event)
+{
+    if (!AI_VALUE(bool, "has available loot"))
+        return false;
+
+    LootObject const& lootObject = AI_VALUE(LootObjectStack*, "available loot")->GetLoot(sPlayerbotAIConfig.lootDistance);
+    context->GetValue<LootObject>("loot target")->Set(lootObject);
+    return true;
+}
+
+enum ProfessionSpells
+{
+    ALCHEMY                      = 2259,
+    BLACKSMITHING                = 2018,
+    COOKING                      = 2550,
+    ENCHANTING                   = 7411,
+    ENGINEERING                  = 49383,
+    FIRST_AID                    = 3273,
+    FISHING                      = 7620,
+    HERB_GATHERING               = 2366,
+    INSCRIPTION                  = 45357,
+    JEWELCRAFTING                = 25229,
+    MINING                       = 2575,
+    SKINNING                     = 8613,
+    TAILORING                    = 3908
+};
+
+bool OpenLootAction::Execute(Event event)
+{
+    LootObject lootObject = AI_VALUE(LootObject, "loot target");
+    bool result = DoLoot(lootObject);
+    if (result)
+    {
+        AI_VALUE(LootObjectStack*, "available loot")->Remove(lootObject.guid);
+        context->GetValue<LootObject>("loot target")->Set(LootObject());
+    }
+    return result;
+}
+
+bool OpenLootAction::DoLoot(LootObject& lootObject)
+{
+    if (lootObject.IsEmpty())
+        return false;
+
+    Creature* creature = ai->GetCreature(lootObject.guid);
+    if (creature && bot->GetDistance(creature) > INTERACTION_DISTANCE)
+        return false;
+
+    if (creature && creature->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE))
+    {
+        bot->GetMotionMaster()->Clear();
+        WorldPacket* const packet = new WorldPacket(CMSG_LOOT, 8);
+        *packet << lootObject.guid;
+        bot->GetSession()->QueuePacket(packet);
+        return true;
+    }
+
+    if (creature)
+    {
+        SkillType skill = creature->GetCreatureInfo()->GetRequiredLootSkill();
+        if (!CanOpenLock(skill, lootObject.reqSkillValue))
+            return false;
+
+        bot->GetMotionMaster()->Clear();
+        switch (skill)
+        {
+        case SKILL_ENGINEERING:
+            return bot->HasSkill(SKILL_ENGINEERING) ? ai->CastSpell(ENGINEERING, creature) : false;
+        case SKILL_HERBALISM:
+            return bot->HasSkill(SKILL_HERBALISM) ? ai->CastSpell(32605, creature) : false;
+        case SKILL_MINING:
+            return bot->HasSkill(SKILL_MINING) ? ai->CastSpell(32606, creature) : false;
+        default:
+            return bot->HasSkill(SKILL_SKINNING) ? ai->CastSpell(SKINNING, creature) : false;
+        }
+    }
+
+    GameObject* go = ai->GetGameObject(lootObject.guid);
+    if (go && bot->GetDistance(go) > INTERACTION_DISTANCE)
+        return false;
+
+    bot->GetMotionMaster()->Clear();
+    if (lootObject.skillId == SKILL_MINING)
+        return bot->HasSkill(SKILL_MINING) ? ai->CastSpell(MINING, bot) : false;
+
+    if (lootObject.skillId == SKILL_HERBALISM)
+        return bot->HasSkill(SKILL_HERBALISM) ? ai->CastSpell(HERB_GATHERING, bot) : false;
+
+    uint32 spellId = GetOpeningSpell(lootObject);
+    if (!spellId)
+        return false;
+
+    return ai->CastSpell(spellId, bot);
+}
+
+uint32 OpenLootAction::GetOpeningSpell(LootObject& lootObject)
+{
+    GameObject* go = ai->GetGameObject(lootObject.guid);
+    if (go && go->isSpawned())
+        return GetOpeningSpell(lootObject, go);
+
+    return 0;
+}
+
+uint32 OpenLootAction::GetOpeningSpell(LootObject& lootObject, GameObject* go)
+{
+    for (PlayerSpellMap::iterator itr = bot->GetSpellMap().begin(); itr != bot->GetSpellMap().end(); ++itr)
+    {
+        uint32 spellId = itr->first;
+
+        if (itr->second.state == PLAYERSPELL_REMOVED || itr->second.disabled || IsPassiveSpell(spellId))
+            continue;
+
+        if (spellId == MINING || spellId == HERB_GATHERING)
+            continue;
+
+        const SpellEntry* pSpellInfo = sSpellStore.LookupEntry(spellId);
+        if (!pSpellInfo)
+            continue;
+
+        if (CanOpenLock(lootObject, pSpellInfo, go))
+            return spellId;
+    }
+
+    for (uint32 spellId = 0; spellId < sSpellStore.GetNumRows(); spellId++)
+    {
+        if (spellId == MINING || spellId == HERB_GATHERING)
+            continue;
+
+        const SpellEntry* pSpellInfo = sSpellStore.LookupEntry(spellId);
+        if (!pSpellInfo)
+            continue;
+
+        if (CanOpenLock(lootObject, pSpellInfo, go))
+            return spellId;
+    }
+
+    return 0; //Spell 3365 = Opening?
+}
+
+bool OpenLootAction::CanOpenLock(LootObject& lootObject, const SpellEntry* pSpellInfo, GameObject* go)
+{
+    for (int effIndex = 0; effIndex < MAX_EFFECT_INDEX; effIndex++)
+    {
+        if (pSpellInfo->Effect[effIndex] != SPELL_EFFECT_OPEN_LOCK && pSpellInfo->Effect[effIndex] != SPELL_EFFECT_SKINNING)
+            return false;
+
+        uint32 lockId = go->GetGOInfo()->GetLockId();
+        if (!lockId)
+            return false;
+
+        LockEntry const *lockInfo = sLockStore.LookupEntry(lockId);
+        if (!lockInfo)
+            return false;
+
+        bool reqKey = false;                                    // some locks not have reqs
+
+        for(int j = 0; j < 8; ++j)
+        {
+            switch(lockInfo->Type[j])
+            {
+            /*
+            case LOCK_KEY_ITEM:
+                return true;
+            */
+            case LOCK_KEY_SKILL:
+                {
+                    if(uint32(pSpellInfo->EffectMiscValue[effIndex]) != lockInfo->Index[j])
+                        continue;
+
+                    uint32 skillId = SkillByLockType(LockType(lockInfo->Index[j]));
+                    if (skillId == SKILL_NONE)
+                        return true;
+
+                    if (CanOpenLock(skillId, lockInfo->Skill[j]))
+                        return true;
+                }
+            }
+        }
+    }
+
+    return false;
+}
+
+bool OpenLootAction::CanOpenLock(uint32 skillId, uint32 reqSkillValue)
+{
+    uint32 skillValue = bot->GetSkillValue(skillId);
+    return skillValue >= reqSkillValue || !reqSkillValue;
+}
+
+bool StoreLootAction::Execute(Event event)
+{
+    WorldPacket p(event.getPacket()); // (8+1+4+1+1+4+4+4+4+4+1)
+    ObjectGuid guid;
+    uint8 loot_type;
+    uint32 gold;
+    uint8 items;
+
+    p.rpos(0);
+    p >> guid;      // 8 corpse guid
+    p >> loot_type; // 1 loot type
+    p >> gold;      // 4 money on corpse
+    p >> items;     // 1 number of items on corpse
+
+    if (gold > 0)
+    {
+        WorldPacket* const packet = new WorldPacket(CMSG_LOOT_MONEY, 0);
+        bot->GetSession()->QueuePacket(packet);
+    }
+
+    for (uint8 i = 0; i < items; ++i)
+    {
+        uint32 itemid;
+        uint32 itemcount;
+        uint8 lootslot_type;
+        uint8 itemindex;
+        bool grab = false;
+
+        p >> itemindex;
+        p >> itemid;
+        p >> itemcount;
+        p.read_skip<uint32>();  // display id
+        p.read_skip<uint32>();  // randomSuffix
+        p.read_skip<uint32>();  // randomPropertyId
+        p >> lootslot_type;     // 0 = can get, 1 = look only, 2 = master get
+
+        if (lootslot_type != LOOT_SLOT_NORMAL && lootslot_type != LOOT_SLOT_OWNER)
+            continue;
+
+        if (loot_type != LOOT_SKINNING && !IsLootAllowed(itemid))
+            continue;
+
+        if (sRandomPlayerbotMgr.IsRandomBot(bot))
+        {
+            ItemPrototype const *proto = sItemStorage.LookupEntry<ItemPrototype>(itemid);
+            if (proto)
+            {
+                uint32 price = itemcount * auctionbot.GetSellPrice(proto) * sRandomPlayerbotMgr.GetSellMultiplier(bot) + gold;
+                uint32 lootAmount = sRandomPlayerbotMgr.GetLootAmount(bot);
+                if (bot->GetGroup() && price)
+                {
+                    sRandomPlayerbotMgr.SetLootAmount(bot, lootAmount + price);
+                }
+                else if (lootAmount)
+                {
+                    sRandomPlayerbotMgr.SetLootAmount(bot, 0);
+                }
+            }
+        }
+
+        WorldPacket* const packet = new WorldPacket(CMSG_AUTOSTORE_LOOT_ITEM, 1);
+        *packet << itemindex;
+        bot->GetSession()->QueuePacket(packet);
+    }
+
+    AI_VALUE(LootObjectStack*, "available loot")->Remove(guid);
+
+    // release loot
+    WorldPacket* const packet = new WorldPacket(CMSG_LOOT_RELEASE, 8);
+    *packet << guid;
+    bot->GetSession()->QueuePacket(packet);
+    return true;
+}
+
+bool StoreLootAction::IsLootAllowedBySkill(ItemPrototype const * proto)
+{
+    switch (proto->Class)
+    {
+    case ITEM_CLASS_KEY:
+    case ITEM_CLASS_CONSUMABLE:
+        return true;
+    case ITEM_CLASS_GEM:
+        if (proto->SubClass == ITEM_SUBCLASS_GEM_SIMPLE && bot->HasSkill(SKILL_JEWELCRAFTING))
+            return true;
+        if (proto->SubClass != ITEM_SUBCLASS_GEM_SIMPLE)
+            return true;
+        break;
+    case ITEM_CLASS_TRADE_GOODS:
+        switch (proto->SubClass)
+        {
+        case ITEM_SUBCLASS_PARTS:
+        case ITEM_SUBCLASS_EXPLOSIVES:
+        case ITEM_SUBCLASS_DEVICES:
+            return bot->HasSkill(SKILL_ENGINEERING);
+        case ITEM_SUBCLASS_JEWELCRAFTING:
+            return bot->HasSkill(SKILL_JEWELCRAFTING);
+        case ITEM_SUBCLASS_CLOTH:
+            return bot->HasSkill(SKILL_TAILORING);
+        case ITEM_SUBCLASS_LEATHER:
+            return bot->HasSkill(SKILL_LEATHERWORKING) || bot->HasSkill(SKILL_SKINNING);
+        case ITEM_SUBCLASS_METAL_STONE:
+            return (bot->HasSkill(SKILL_BLACKSMITHING) ||
+                bot->HasSkill(SKILL_ENGINEERING) ||
+                bot->HasSkill(SKILL_MINING));
+        case ITEM_SUBCLASS_MEAT:
+            return bot->HasSkill(SKILL_COOKING);
+        case ITEM_SUBCLASS_HERB:
+            return (bot->HasSkill(SKILL_HERBALISM) ||
+                bot->HasSkill(SKILL_ALCHEMY) ||
+                bot->HasSkill(SKILL_INSCRIPTION));
+        case ITEM_SUBCLASS_ELEMENTAL:
+            return true;
+        case ITEM_SUBCLASS_ENCHANTING:
+            return bot->HasSkill(SKILL_ENCHANTING);
+        }
+        break;
+    case ITEM_CLASS_RECIPE:
+        {
+            if (bot->HasSpell(proto->Spells[2].SpellId))
+                break;
+
+            switch (proto->SubClass)
+            {
+            case ITEM_SUBCLASS_LEATHERWORKING_PATTERN:
+                return bot->HasSkill(SKILL_LEATHERWORKING);
+            case ITEM_SUBCLASS_TAILORING_PATTERN:
+                return bot->HasSkill(SKILL_TAILORING);
+            case ITEM_SUBCLASS_ENGINEERING_SCHEMATIC:
+                return bot->HasSkill(SKILL_ENGINEERING);
+            case ITEM_SUBCLASS_BLACKSMITHING:
+                return bot->HasSkill(SKILL_BLACKSMITHING);
+            case ITEM_SUBCLASS_COOKING_RECIPE:
+                return bot->HasSkill(SKILL_COOKING);
+            case ITEM_SUBCLASS_ALCHEMY_RECIPE:
+                return bot->HasSkill(SKILL_ALCHEMY);
+            case ITEM_SUBCLASS_FIRST_AID_MANUAL:
+                return bot->HasSkill(SKILL_FIRST_AID);
+            case ITEM_SUBCLASS_ENCHANTING_FORMULA:
+                return bot->HasSkill(SKILL_ENCHANTING);
+            case ITEM_SUBCLASS_FISHING_MANUAL:
+                return bot->HasSkill(SKILL_FISHING);
+            case ITEM_SUBCLASS_JEWELCRAFTING_RECIPE:
+                return bot->HasSkill(SKILL_JEWELCRAFTING);
+            }
+        }
+    }
+    return false;
+}
+
+
+bool StoreLootAction::IsLootAllowed(uint32 itemid)
+{
+    LootStrategy lootStrategy = AI_VALUE(LootStrategy, "loot strategy");
+
+    if (lootStrategy == LOOTSTRATEGY_ALL)
+        return true;
+
+    set<uint32>& lootItems = AI_VALUE(set<uint32>&, "always loot list");
+    if (lootItems.find(itemid) != lootItems.end())
+        return true;
+
+    ItemPrototype const *proto = sItemStorage.LookupEntry<ItemPrototype>(itemid);
+    if (!proto)
+        return false;
+
+    uint32 max = proto->MaxCount;
+    if (max > 0 && bot->HasItemCount(itemid, max, true))
+        return false;
+
+    if (proto->StartQuest ||
+        proto->Bonding == BIND_QUEST_ITEM ||
+        proto->Bonding == BIND_QUEST_ITEM1 ||
+        proto->Class == ITEM_CLASS_QUEST)
+        return true;
+
+    if (lootStrategy == LOOTSTRATEGY_QUEST)
+        return false;
+
+    if (IsLootAllowedBySkill(proto))
+        return true;
+
+    if (lootStrategy == LOOTSTRATEGY_SKILL)
+        return false;
+
+    if (proto->Class == ITEM_CLASS_MONEY || proto->Quality == ITEM_QUALITY_POOR)
+        return true;
+
+    if (lootStrategy == LOOTSTRATEGY_GRAY)
+        return true;
+
+    if (proto->Bonding == BIND_WHEN_PICKED_UP)
+        return false;
+
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/LootAction.h b/src/game/playerbot/strategy/actions/LootAction.h
new file mode 100644
index 00000000000..ef0554474ca
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/LootAction.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "../Action.h"
+#include "../../LootObjectStack.h"
+#include "MovementActions.h"
+
+namespace ai
+{
+    class LootAction : public MovementAction
+    {
+    public:
+        LootAction(PlayerbotAI* ai) : MovementAction(ai, "loot") {}
+        virtual bool Execute(Event event);
+    };
+
+    class OpenLootAction : public MovementAction
+    {
+    public:
+        OpenLootAction(PlayerbotAI* ai) : MovementAction(ai, "open loot") {}
+        virtual bool Execute(Event event);
+
+    private:
+        bool DoLoot(LootObject& lootObject);
+        uint32 GetOpeningSpell(LootObject& lootObject);
+        uint32 GetOpeningSpell(LootObject& lootObject, GameObject* go);
+        bool CanOpenLock(LootObject& lootObject, const SpellEntry* pSpellInfo, GameObject* go);
+        bool CanOpenLock(uint32 skillId, uint32 reqSkillValue);
+    };
+
+    class StoreLootAction : public MovementAction
+    {
+    public:
+        StoreLootAction(PlayerbotAI* ai) : MovementAction(ai, "store loot") {}
+        virtual bool Execute(Event event);
+
+    protected:
+        bool IsLootAllowed(uint32 itemid);
+        bool IsLootAllowedBySkill(ItemPrototype const * proto);
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/LootRollAction.cpp b/src/game/playerbot/strategy/actions/LootRollAction.cpp
new file mode 100644
index 00000000000..42d0bd35a16
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/LootRollAction.cpp
@@ -0,0 +1,76 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "LootRollAction.h"
+
+
+using namespace ai;
+
+bool LootRollAction::Execute(Event event)
+{
+    Player *bot = QueryItemUsageAction::ai->GetBot();
+
+    WorldPacket p(event.getPacket()); //WorldPacket packet for CMSG_LOOT_ROLL, (8+4+1)
+    ObjectGuid guid;
+    uint32 slot;
+    uint8 rollType;
+    p.rpos(0); //reset packet pointer
+    p >> guid; //guid of the item rolled
+    p >> slot; //number of players invited to roll
+    p >> rollType; //need,greed or pass on roll
+
+    Group* group = bot->GetGroup();
+    if(!group)
+        return false;
+
+    RollVote vote = ROLL_PASS;
+    for (vector<Roll*>::iterator i = group->GetRolls()->begin(); i != group->GetRolls()->end(); ++i)
+    {
+        if ((*i)->isValid() && (*i)->lootedTargetGUID == guid && (*i)->itemSlot == slot)
+        {
+            uint32 itemId = (*i)->itemid;
+            ItemPrototype const *proto = sItemStorage.LookupEntry<ItemPrototype>(itemId);
+            if (!proto)
+                continue;
+
+            switch (proto->Class)
+            {
+            case ITEM_CLASS_WEAPON:
+            case ITEM_CLASS_ARMOR:
+                if (QueryItemUsage(proto))
+                    vote = ROLL_NEED;
+                else if (bot->HasSkill(SKILL_ENCHANTING))
+                    vote = ROLL_DISENCHANT;
+                break;
+            default:
+                if (IsLootAllowed(itemId))
+                    vote = ROLL_NEED;
+                break;
+            }
+            break;
+        }
+    }
+
+    switch (group->GetLootMethod())
+    {
+    case MASTER_LOOT:
+    case FREE_FOR_ALL:
+        group->CountRollVote(bot, guid, slot, ROLL_PASS);
+        break;
+    default:
+        group->CountRollVote(bot, guid, slot, vote);
+        break;
+    }
+
+    switch (rollType)
+    {
+    case ROLL_NEED:
+        bot->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED, 1);
+        break;
+    case ROLL_GREED:
+        bot->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED, 1);
+        break;
+    }
+
+
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/LootRollAction.h b/src/game/playerbot/strategy/actions/LootRollAction.h
new file mode 100644
index 00000000000..05651a4e5c6
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/LootRollAction.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "../Action.h"
+#include "QueryItemUsageAction.h"
+#include "LootAction.h"
+
+namespace ai
+{
+    class LootRollAction : public QueryItemUsageAction, public StoreLootAction {
+    public:
+        LootRollAction(PlayerbotAI* ai) : QueryItemUsageAction(ai, "loot roll"), StoreLootAction(ai) {}
+        virtual bool Execute(Event event);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/LootStrategyAction.cpp b/src/game/playerbot/strategy/actions/LootStrategyAction.cpp
new file mode 100644
index 00000000000..5764a38fc2b
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/LootStrategyAction.cpp
@@ -0,0 +1,100 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "LootStrategyAction.h"
+
+
+using namespace ai;
+
+
+bool LootStrategyAction::Execute(Event event)
+{
+    string strategy = event.getParam();
+    
+    LootObjectStack* lootItems = AI_VALUE(LootObjectStack*, "available loot");
+    set<uint32>& alwaysLootItems = AI_VALUE(set<uint32>&, "always loot list");
+    Value<LootStrategy>* lootStrategy = context->GetValue<LootStrategy>("loot strategy");
+
+    if (strategy == "?")
+    {
+        ostringstream out;
+        out << "Loot strategy: ";
+        out << LootStrategy2string(lootStrategy->Get());
+        out << ", always loot items: ";
+
+        for (set<uint32>::iterator i = alwaysLootItems.begin(); i != alwaysLootItems.end(); i++)
+        {
+            ItemPrototype const *proto = sItemStorage.LookupEntry<ItemPrototype>(*i);
+            if (!proto)
+                continue;
+
+            out << chat->formatItem(proto);
+        }
+        ai->TellMaster(out);
+    }
+    else
+    {
+        ItemIds items = chat->parseItems(strategy);
+
+        if (items.size() == 0)
+        {
+            lootStrategy->Set(String2LootStrategy(strategy));
+            ostringstream out;
+            out << "Loot strategy set to " << LootStrategy2string(lootStrategy->Get());
+            ai->TellMaster(out);
+            return true;
+        }
+
+        bool remove = strategy.size() > 1 && strategy.substr(0, 1) == "-";
+        for (ItemIds::iterator i = items.begin(); i != items.end(); i++)
+        {
+            uint32 itemid = *i;
+            if (remove)
+            {
+                set<uint32>::iterator j = alwaysLootItems.find(itemid);
+                if (j != alwaysLootItems.end())
+                    alwaysLootItems.erase(j);
+                
+                ai->TellMaster("Item(s) removed from always loot list");
+            }
+            else
+            {
+                alwaysLootItems.insert(itemid);
+                ai->TellMaster("Item(s) added to always loot list");
+            }
+        }
+    }    
+
+    return true;
+}
+
+
+LootStrategy LootStrategyAction::String2LootStrategy(string strategy)
+{
+    if (strategy == "*" || strategy == "all")
+        return LOOTSTRATEGY_ALL;
+    else if (strategy == "q" || strategy == "quest")
+        return LOOTSTRATEGY_QUEST;
+    else if (strategy == "s" || strategy == "skill")
+        return LOOTSTRATEGY_SKILL;
+    else if (strategy == "g" || strategy == "gray")
+        return LOOTSTRATEGY_GRAY;
+    else 
+        return LOOTSTRATEGY_NORMAL;
+}
+
+string LootStrategyAction::LootStrategy2string(LootStrategy lootStrategy)
+{
+    switch (lootStrategy)
+    {
+    case LOOTSTRATEGY_ALL:
+        return "all";
+    case LOOTSTRATEGY_QUEST:
+        return "quest";
+    case LOOTSTRATEGY_SKILL:
+        return "skill";
+    case LOOTSTRATEGY_GRAY:
+        return "gray";
+    default:
+        return "normal";
+    }
+}
diff --git a/src/game/playerbot/strategy/actions/LootStrategyAction.h b/src/game/playerbot/strategy/actions/LootStrategyAction.h
new file mode 100644
index 00000000000..51e1f238359
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/LootStrategyAction.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../Action.h"
+#include "../../LootObjectStack.h"
+
+namespace ai
+{
+    class LootStrategyAction : public Action {
+    public:
+        LootStrategyAction(PlayerbotAI* ai) : Action(ai, "ll") {}
+        virtual bool Execute(Event event);
+
+    private:
+        static LootStrategy String2LootStrategy(string strategy);
+        static string LootStrategy2string(LootStrategy lootStrategy);
+   
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/MovementActions.cpp b/src/game/playerbot/strategy/actions/MovementActions.cpp
new file mode 100644
index 00000000000..4ed576e9a97
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/MovementActions.cpp
@@ -0,0 +1,386 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "../values/LastMovementValue.h"
+#include "MovementActions.h"
+#include "../../../MotionMaster.h"
+#include "../../../movementGenerators/MovementGenerator.h"
+#include "../../FleeManager.h"
+#include "../../LootObjectStack.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+bool MovementAction::MoveNear(uint32 mapId, float x, float y, float z, float distance)
+{
+    float angle = GetFollowAngle();
+    return MoveTo(mapId, x + cos(angle) * distance, y + sin(angle) * distance, z);
+}
+
+bool MovementAction::MoveNear(WorldObject* target, float distance)
+{
+    if (!target)
+        return false;
+
+    distance += target->GetObjectBoundingRadius();
+
+    float followAngle = GetFollowAngle();
+    for (float angle = followAngle - M_PI; angle <= followAngle + M_PI; angle += M_PI / 4)
+    {
+        bool moved = MoveTo(target->GetMapId(),
+            target->GetPositionX() + cos(angle) * distance,
+            target->GetPositionY()+ sin(angle) * distance,
+            target->GetPositionZ());
+        if (moved)
+            return true;
+    }
+    return false;
+}
+
+bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z)
+{
+    if (!IsMovingAllowed(mapId, x, y, z))
+        return false;
+
+    bot->UpdateGroundPositionZ(x, y, z);
+
+    float botZ = bot->GetPositionZ();
+    if (z - botZ > 0.5f)
+    {
+        WaitForReach(0.5f);
+        MotionMaster &mm = *bot->GetMotionMaster();
+        mm.Clear();
+        mm.MoveJump(x, y, botZ + 0.5f, bot->GetSpeed(MOVE_RUN), 0.5f);
+        return true;
+    }
+
+    float distance = bot->GetDistance(x, y, z);
+    if (distance > sPlayerbotAIConfig.meleeDistance / 2)
+    {
+        WaitForReach(distance);
+
+        if (bot->IsSitState())
+            bot->SetStandState(UNIT_STAND_STATE_STAND);
+
+        if (bot->IsNonMeleeSpellCasted(true))
+        {
+            bot->CastStop();
+            ai->InterruptSpell();
+        }
+
+        bool generatePath = bot->GetAurasByType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED).empty() &&
+                !bot->IsFlying() && !bot->IsUnderWater();
+        MotionMaster &mm = *bot->GetMotionMaster();
+        mm.Clear();
+        mm.MovePoint(mapId, x, y, z, generatePath);
+    }
+
+    AI_VALUE(LastMovement&, "last movement").Set(x, y, z, bot->GetOrientation());
+    return true;
+}
+
+bool MovementAction::MoveTo(Unit* target, float distance)
+{
+    if (!IsMovingAllowed(target))
+        return false;
+
+    float bx = bot->GetPositionX();
+    float by = bot->GetPositionY();
+    float bz = bot->GetPositionZ();
+
+    float tx = target->GetPositionX();
+    float ty = target->GetPositionY();
+    float tz = target->GetPositionZ();
+
+    float distanceToTarget = bot->GetDistance(target);
+    float angle = bot->GetAngle(target);
+    float needToGo = distanceToTarget - distance;
+
+    float maxDistance = 2 * bot->GetSpeed(MOVE_RUN);
+    if (needToGo > 0 && needToGo > maxDistance)
+        needToGo = maxDistance;
+    else if (needToGo < 0 && needToGo < -maxDistance)
+        needToGo = -maxDistance;
+
+    MotionMaster &mm = *bot->GetMotionMaster();
+    if (abs(needToGo) <= sPlayerbotAIConfig.meleeDistance)
+        return true;
+
+    float dx = cos(angle) * needToGo + bx;
+    float dy = sin(angle) * needToGo + by;
+
+    return MoveTo(target->GetMapId(), dx, dy, tz);
+}
+
+float MovementAction::GetFollowAngle()
+{
+    Player* master = GetMaster();
+    Group* group = master ? master->GetGroup() : bot->GetGroup();
+    if (!group)
+        return 0.0f;
+
+    int index = 1;
+    for (GroupReference *ref = group->GetFirstMember(); ref; ref = ref->next())
+    {
+        if( ref->getSource() == master)
+            continue;
+
+        if( ref->getSource() == bot)
+            return 2 * M_PI / (group->GetMembersCount() -1) * index;
+
+        index++;
+    }
+    return 0;
+}
+
+bool MovementAction::IsMovingAllowed(Unit* target)
+{
+    if (!target)
+        return false;
+
+    if (bot->GetMapId() != target->GetMapId())
+        return false;
+
+    float distance = bot->GetDistance(target);
+    if (distance > sPlayerbotAIConfig.reactDistance)
+        return false;
+
+    return IsMovingAllowed();
+}
+
+bool MovementAction::IsMovingAllowed(uint32 mapId, float x, float y, float z)
+{
+    float distance = bot->GetDistance(x, y, z);
+    if (distance > sPlayerbotAIConfig.reactDistance)
+        return false;
+
+    return IsMovingAllowed();
+}
+
+bool MovementAction::IsMovingAllowed()
+{
+    if (bot->isFrozen() || bot->IsPolymorphed() ||
+            (bot->isDead() && !bot->GetCorpse()) ||
+            bot->IsBeingTeleported() || bot->IsBeingTeleportedDelayEvent() ||
+            bot->isInRoots() ||
+            bot->HasAuraType(SPELL_AURA_MOD_CONFUSE) || bot->isCharmed() ||
+            bot->HasAuraType(SPELL_AURA_MOD_STUN) || bot->IsTaxiFlying())
+        return false;
+
+    MotionMaster &mm = *bot->GetMotionMaster();
+    return mm.GetCurrentMovementGeneratorType() != FLIGHT_MOTION_TYPE;
+}
+
+bool MovementAction::Follow(Unit* target, float distance)
+{
+    return Follow(target, distance, GetFollowAngle());
+}
+
+bool MovementAction::Follow(Unit* target, float distance, float angle)
+{
+    MotionMaster &mm = *bot->GetMotionMaster();
+
+    if (!target)
+        return false;
+
+    if (bot->GetDistance2d(target->GetPositionX(), target->GetPositionY()) <= sPlayerbotAIConfig.sightDistance &&
+            abs(bot->GetPositionZ() - target->GetPositionZ()) >= sPlayerbotAIConfig.spellDistance)
+    {
+        mm.Clear();
+        float x = bot->GetPositionX(), y = bot->GetPositionY(), z = target->GetPositionZ();
+        if (target->GetMapId() && bot->GetMapId() != target->GetMapId())
+        {
+            bot->TeleportTo(target->GetMapId(), x, y, z, bot->GetOrientation());
+        }
+        else
+        {
+            Position pos(x, y, z, bot->GetOrientation());
+            bot->SetPosition(pos, true);
+        }
+        AI_VALUE(LastMovement&, "last movement").Set(target);
+        return true;
+    }
+
+    if (!IsMovingAllowed(target))
+        return false;
+
+    if (target->IsFriendlyTo(bot) && bot->IsMounted() && AI_VALUE(list<ObjectGuid>, "possible targets").empty())
+        distance += angle;
+
+    if (bot->GetDistance(target) <= sPlayerbotAIConfig.followDistance)
+        return false;
+
+    if (bot->IsSitState())
+        bot->SetStandState(UNIT_STAND_STATE_STAND);
+
+    if (bot->IsNonMeleeSpellCasted(true))
+    {
+        bot->CastStop();
+        ai->InterruptSpell();
+    }
+
+    mm.MoveFollow(target, distance, angle);
+
+    AI_VALUE(LastMovement&, "last movement").Set(target);
+    return true;
+}
+
+void MovementAction::WaitForReach(float distance)
+{
+    float delay = 1000.0f * distance / bot->GetSpeed(MOVE_RUN) + sPlayerbotAIConfig.reactDelay;
+
+    if (delay > sPlayerbotAIConfig.maxWaitForMove)
+        delay = sPlayerbotAIConfig.maxWaitForMove;
+
+    Unit* target = *ai->GetAiObjectContext()->GetValue<Unit*>("current target");
+    Unit* player = *ai->GetAiObjectContext()->GetValue<Unit*>("enemy player target");
+    if ((player || target) && delay > sPlayerbotAIConfig.globalCoolDown)
+        delay = sPlayerbotAIConfig.globalCoolDown;
+
+    ai->SetNextCheckDelay((uint32)delay);
+}
+
+bool MovementAction::Flee(Unit *target)
+{
+    Player* master = GetMaster();
+    if (!target)
+        target = master;
+
+    if (!target)
+        return false;
+
+    if (!sPlayerbotAIConfig.fleeingEnabled)
+        return false;
+
+    if (!IsMovingAllowed())
+        return false;
+
+    FleeManager manager(bot, sPlayerbotAIConfig.fleeDistance, GetFollowAngle());
+
+    float rx, ry, rz;
+    if (!manager.CalculateDestination(&rx, &ry, &rz))
+        return false;
+
+    return MoveTo(0, rx, ry, rz);
+}
+
+bool FleeAction::Execute(Event event)
+{
+    return Flee(AI_VALUE(Unit*, "current target"));
+}
+
+bool FleeAction::isUseful()
+{
+    return AI_VALUE(uint8, "attacker count") > 0 &&
+            AI_VALUE2(float, "distance", "current target") <= sPlayerbotAIConfig.tooCloseDistance;
+}
+
+bool RunAwayAction::Execute(Event event)
+{
+    return Flee(AI_VALUE(Unit*, "master target"));
+}
+
+bool MoveRandomAction::Execute(Event event)
+{
+    WorldObject* target = NULL;
+
+    if (!(rand() % 3))
+    {
+        list<ObjectGuid> npcs = AI_VALUE(list<ObjectGuid>, "nearest npcs");
+        for (list<ObjectGuid>::iterator i = npcs.begin(); i != npcs.end(); i++)
+        {
+            target = ai->GetUnit(*i);
+
+            if (target && bot->GetDistance(target) > sPlayerbotAIConfig.tooCloseDistance)
+                break;
+        }
+    }
+
+    if (!target || !(rand() % 3))
+    {
+        list<ObjectGuid> gos = AI_VALUE(list<ObjectGuid>, "nearest game objects");
+        for (list<ObjectGuid>::iterator i = gos.begin(); i != gos.end(); i++)
+        {
+            target = ai->GetGameObject(*i);
+
+            if (target && bot->GetDistance(target) > sPlayerbotAIConfig.tooCloseDistance)
+                break;
+        }
+    }
+
+    float distance = sPlayerbotAIConfig.tooCloseDistance + sPlayerbotAIConfig.grindDistance * urand(3, 10) / 10.0f;
+
+    MapPtr map = bot->GetMapPtr();
+    const TerrainInfoPtr terrain = map->GetTerrain();
+    if (target)
+    {
+        float x = target->GetPositionX();
+        float y = target->GetPositionY();
+        float z = target->GetPositionZ();
+        if (!terrain->IsInWater(x, y, z) && !terrain->IsUnderWater(x, y, z))
+        {
+            bool moved = MoveNear(target);
+            map = MapPtr();
+            return moved;
+        }
+    }
+
+    for (int i = 0; i < 10; ++i)
+    {
+        float x = bot->GetPositionX();
+        float y = bot->GetPositionY();
+        float z = bot->GetPositionZ();
+        x += urand(0, distance) - distance / 2;
+        y += urand(0, distance) - distance / 2;
+        bot->UpdateGroundPositionZ(x, y, z);
+
+        if (terrain->IsInWater(x, y, z) || terrain->IsUnderWater(x, y, z))
+            continue;
+
+        bool moved = MoveNear(bot->GetMapId(), x, y, z);
+        map = MapPtr();
+        if (moved)
+            return true;
+    }
+
+    map = MapPtr();
+    return false;
+}
+
+bool MoveToLootAction::Execute(Event event)
+{
+    LootObject loot = AI_VALUE(LootObject, "loot target");
+    if (!loot.IsLootPossible(bot))
+        return false;
+
+    return MoveNear(loot.GetWorldObject(bot));
+}
+
+bool MoveOutOfEnemyContactAction::Execute(Event event)
+{
+    Unit* target = AI_VALUE(Unit*, "current target");
+    if (!target)
+        return false;
+
+    return MoveNear(target, sPlayerbotAIConfig.meleeDistance);
+}
+
+bool MoveOutOfEnemyContactAction::isUseful()
+{
+    return AI_VALUE2(float, "distance", "current target") <= sPlayerbotAIConfig.meleeDistance / 2;
+}
+
+bool SetFacingTargetAction::Execute(Event event)
+{
+    Unit* target = AI_VALUE(Unit*, "current target");
+    if (!target)
+        return false;
+
+    bot->SetFacingTo(bot->GetAngle(target));
+    ai->SetNextCheckDelay(sPlayerbotAIConfig.globalCoolDown);
+    return true;
+}
+
+bool SetFacingTargetAction::isUseful()
+{
+    return !AI_VALUE2(bool, "facing", "current target");
+}
diff --git a/src/game/playerbot/strategy/actions/MovementActions.h b/src/game/playerbot/strategy/actions/MovementActions.h
new file mode 100644
index 00000000000..dc27b92ad93
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/MovementActions.h
@@ -0,0 +1,92 @@
+#pragma once
+
+#include "../Action.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class MovementAction : public Action {
+    public:
+        MovementAction(PlayerbotAI* ai, string name) : Action(ai, name)
+        {
+            bot = ai->GetBot();
+        }
+
+    protected:
+        bool MoveNear(uint32 mapId, float x, float y, float z, float distance = sPlayerbotAIConfig.followDistance);
+        bool MoveTo(uint32 mapId, float x, float y, float z);
+        bool MoveTo(Unit* target, float distance = 0.0f);
+        bool MoveNear(WorldObject* target, float distance = sPlayerbotAIConfig.followDistance);
+        float GetFollowAngle();
+        bool Follow(Unit* target, float distance = sPlayerbotAIConfig.followDistance);
+        bool Follow(Unit* target, float distance, float angle);
+        void WaitForReach(float distance);
+        bool IsMovingAllowed(Unit* target);
+        bool IsMovingAllowed(uint32 mapId, float x, float y, float z);
+        bool IsMovingAllowed();
+        bool Flee(Unit *target);
+
+    protected:
+        Player* bot;
+    };
+
+    class FleeAction : public MovementAction
+    {
+    public:
+        FleeAction(PlayerbotAI* ai, float distance = sPlayerbotAIConfig.spellDistance) : MovementAction(ai, "flee")
+        {
+			this->distance = distance;
+		}
+
+        virtual bool Execute(Event event);
+        virtual bool isUseful();
+
+	private:
+		float distance;
+    };
+
+
+    class RunAwayAction : public MovementAction
+    {
+    public:
+        RunAwayAction(PlayerbotAI* ai) : MovementAction(ai, "runaway") {}
+        virtual bool Execute(Event event);
+    };
+
+    class MoveRandomAction : public MovementAction
+    {
+    public:
+        MoveRandomAction(PlayerbotAI* ai) : MovementAction(ai, "move random") {}
+        virtual bool Execute(Event event);
+        virtual bool isPossible()
+        {
+            return MovementAction::isPossible() &&
+                    AI_VALUE2(uint8, "health", "self target") > sPlayerbotAIConfig.mediumHealth &&
+                    (!AI_VALUE2(uint8, "mana", "self target") || AI_VALUE2(uint8, "mana", "self target") > sPlayerbotAIConfig.mediumMana);
+        }
+    };
+
+    class MoveToLootAction : public MovementAction
+    {
+    public:
+        MoveToLootAction(PlayerbotAI* ai) : MovementAction(ai, "move to loot") {}
+        virtual bool Execute(Event event);
+    };
+
+    class MoveOutOfEnemyContactAction : public MovementAction
+    {
+    public:
+        MoveOutOfEnemyContactAction(PlayerbotAI* ai) : MovementAction(ai, "move out of enemy contact") {}
+        virtual bool Execute(Event event);
+        virtual bool isUseful();
+    };
+
+    class SetFacingTargetAction : public MovementAction
+    {
+    public:
+        SetFacingTargetAction(PlayerbotAI* ai) : MovementAction(ai, "set facing") {}
+        virtual bool Execute(Event event);
+        virtual bool isUseful();
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/NonCombatActions.cpp b/src/game/playerbot/strategy/actions/NonCombatActions.cpp
new file mode 100644
index 00000000000..56961c3c145
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/NonCombatActions.cpp
@@ -0,0 +1,6 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "NonCombatActions.h"
+
+using namespace ai;
+
diff --git a/src/game/playerbot/strategy/actions/NonCombatActions.h b/src/game/playerbot/strategy/actions/NonCombatActions.h
new file mode 100644
index 00000000000..82db78bc018
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/NonCombatActions.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "../Action.h"
+#include "UseItemAction.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class DrinkAction : public UseItemAction
+    {
+    public:
+        DrinkAction(PlayerbotAI* ai) : UseItemAction(ai, "drink") {}
+
+        virtual bool Execute(Event event)
+        {
+            if (bot->isInCombat())
+                return false;
+
+            return UseItemAction::Execute(event);
+        }
+
+        virtual bool isUseful()
+        {
+            return UseItemAction::isUseful() && AI_VALUE2(uint8, "mana", "self target") < sPlayerbotAIConfig.lowMana;
+        }
+    };
+
+    class EatAction : public UseItemAction
+    {
+    public:
+        EatAction(PlayerbotAI* ai) : UseItemAction(ai, "food") {}
+
+        virtual bool Execute(Event event)
+        {
+            if (bot->isInCombat())
+                return false;
+
+            return UseItemAction::Execute(event);
+        }
+
+        virtual bool isUseful()
+        {
+            return UseItemAction::isUseful() && AI_VALUE2(uint8, "health", "self target") < sPlayerbotAIConfig.lowHealth;
+        }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/PassLeadershipToMasterAction.h b/src/game/playerbot/strategy/actions/PassLeadershipToMasterAction.h
new file mode 100644
index 00000000000..15e631c5495
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/PassLeadershipToMasterAction.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class PassLeadershipToMasterAction : public Action {
+    public:
+        PassLeadershipToMasterAction(PlayerbotAI* ai) : Action(ai, "leader") {}
+
+        virtual bool Execute(Event event)
+        {
+            Player* master = GetMaster();
+            if (master && bot->GetGroup() && bot->GetGroup()->IsMember(master->GetObjectGuid()))
+            {
+                WorldPacket p(SMSG_GROUP_SET_LEADER, 8);
+                p << master->GetObjectGuid();
+                bot->GetSession()->HandleGroupSetLeaderOpcode(p);
+                return true;
+            }
+
+            return false;
+        }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/PositionAction.cpp b/src/game/playerbot/strategy/actions/PositionAction.cpp
new file mode 100644
index 00000000000..242c7fb97c1
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/PositionAction.cpp
@@ -0,0 +1,38 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PositionAction.h"
+#include "../values/PositionValue.h"
+
+using namespace ai;
+
+bool PositionAction::Execute(Event event)
+{
+	string qualifier = event.getParam();
+	if (qualifier.empty())
+		return false;
+
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+	ai::Position& pos = context->GetValue<ai::Position&>("position", qualifier)->Get();
+    pos.Set( master->GetPositionX(), master->GetPositionY(), master->GetPositionZ());
+
+    ostringstream out; out << "Position " << qualifier << " is set";
+    ai->TellMaster(out);
+    return true;
+}
+
+bool MoveToPositionAction::Execute(Event event)
+{
+	ai::Position& pos = context->GetValue<ai::Position&>("position", qualifier)->Get();
+    if (!pos.isSet())
+    {
+        ostringstream out; out << "Position " << qualifier << " is not set";
+        ai->TellMaster(out);
+        return false;
+    }
+
+    return MoveTo(bot->GetMapId(), pos.x, pos.y, pos.z);
+}
+
diff --git a/src/game/playerbot/strategy/actions/PositionAction.h b/src/game/playerbot/strategy/actions/PositionAction.h
new file mode 100644
index 00000000000..f96553b6ca6
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/PositionAction.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "../Action.h"
+#include "MovementActions.h"
+
+namespace ai
+{
+    class PositionAction : public Action
+    {
+    public:
+        PositionAction(PlayerbotAI* ai) : Action(ai, "position")
+        {}
+
+        virtual bool Execute(Event event);
+
+    };
+
+    class MoveToPositionAction : public MovementAction
+    {
+    public:
+        MoveToPositionAction(PlayerbotAI* ai, string qualifier) : MovementAction(ai, "move to position"), qualifier(qualifier)
+        {}
+
+        virtual bool Execute(Event event);
+
+    protected:
+        string qualifier;
+    };
+
+    class GuardAction : public MoveToPositionAction
+    {
+    public:
+        GuardAction(PlayerbotAI* ai) : MoveToPositionAction(ai, "guard")
+        {}
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/QueryItemUsageAction.cpp b/src/game/playerbot/strategy/actions/QueryItemUsageAction.cpp
new file mode 100644
index 00000000000..e694d914bcb
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/QueryItemUsageAction.cpp
@@ -0,0 +1,195 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "QueryItemUsageAction.h"
+#include "../../../ahbot/AhBot.h"
+#include "../../RandomPlayerbotMgr.h"
+
+
+using namespace ai;
+
+
+bool QueryItemUsageAction::Execute(Event event)
+{
+    WorldPacket& data = event.getPacket();
+    if (!data.empty())
+    {
+        data.rpos(0);
+
+        ObjectGuid guid;
+        data >> guid;
+        if (guid != bot->GetObjectGuid())
+            return false;
+
+        uint32 received, created, isShowChatMessage, notUsed, itemId,
+            suffixFactor, itemRandomPropertyId, count, invCount;
+        uint8 bagSlot;
+
+        data >> received;                               // 0=looted, 1=from npc
+        data >> created;                                // 0=received, 1=created
+        data >> isShowChatMessage;                                      // IsShowChatMessage
+        data >> bagSlot;
+                                                                // item slot, but when added to stack: 0xFFFFFFFF
+        data >> notUsed;
+        data >> itemId;
+        data >> suffixFactor;
+        data >> itemRandomPropertyId;
+        data >> count;
+        data >> invCount;
+
+        ItemPrototype const *item = sItemStorage.LookupEntry<ItemPrototype>(itemId);
+        if (!item)
+            return false;
+
+        ostringstream out; out << chat->formatItem(item, count);
+        if (created)
+            out << " created";
+        else if (received)
+            out << " received";
+        ai->TellMaster(out);
+
+        QueryItemUsage(item);
+        QueryQuestItem(itemId);
+        return true;
+    }
+
+    string text = event.getParam();
+
+    ItemIds items = chat->parseItems(text);
+    QueryItemsUsage(items);
+    return true;
+}
+
+bool QueryItemUsageAction::QueryItemUsage(ItemPrototype const *item)
+{
+    Player *bot = ai->GetBot();
+    if (bot->CanUseItem(item) != EQUIP_ERR_OK)
+        return false;
+
+    if (item->InventoryType == INVTYPE_NON_EQUIP)
+        return false;
+
+    Item *pItem = Item::CreateItem(item->ItemId, 1, bot);
+    if (!pItem)
+        return false;
+
+    uint16 dest;
+    InventoryResult result = bot->CanEquipItem(NULL_SLOT, dest, pItem, true, false);
+    pItem->RemoveFromUpdateQueueOf(bot);
+    delete pItem;
+
+    if( result != EQUIP_ERR_OK )
+        return false;
+
+    Item* existingItem = bot->GetItemByPos(dest);
+    if (!existingItem)
+    {
+        ai->TellMaster("Equip");
+        return true;
+    }
+
+    bool equip = false;
+    const ItemPrototype* oldItem = existingItem->GetProto();
+    if (oldItem->ItemLevel < item->ItemLevel && oldItem->ItemId != item->ItemId)
+    {
+        switch (item->Class)
+        {
+        case ITEM_CLASS_ARMOR:
+            equip = (oldItem->SubClass <= item->SubClass);
+            break;
+        default:
+            equip = true;
+        }
+    }
+
+    if (equip)
+    {
+        ostringstream out;
+        out << "Replace +";
+        out << (item->ItemLevel - oldItem->ItemLevel);
+        out << " lvl";
+        ai->TellMaster(out.str());
+        return true;
+    }
+
+    return false;
+}
+
+void QueryItemUsageAction::QueryItemPrice(ItemPrototype const *item)
+{
+    if (!sRandomPlayerbotMgr.IsRandomBot(bot))
+        return;
+
+    if (item->Bonding == BIND_WHEN_PICKED_UP)
+        return;
+
+    list<Item*> items = InventoryAction::parseItems(item->Name1);
+    if (!items.empty())
+    {
+        for (list<Item*>::iterator i = items.begin(); i != items.end(); ++i)
+        {
+            Item* sell = *i;
+            int32 sellPrice = sell->GetCount() * auctionbot.GetSellPrice(sell->GetProto()) * sRandomPlayerbotMgr.GetSellMultiplier(bot);
+            ostringstream out;
+            out << "Selling " << chat->formatItem(sell->GetProto(), sell->GetCount()) << " for " << chat->formatMoney(sellPrice);
+            ai->TellMaster(out.str());
+        }
+    }
+
+    int32 buyPrice = auctionbot.GetBuyPrice(item) * sRandomPlayerbotMgr.GetBuyMultiplier(bot);
+    if (buyPrice)
+    {
+        ostringstream out;
+        out << "Will buy for " << chat->formatMoney(buyPrice);
+        ai->TellMaster(out.str());
+    }
+}
+
+void QueryItemUsageAction::QueryItemsUsage(ItemIds items)
+{
+    for (ItemIds::iterator i = items.begin(); i != items.end(); i++)
+    {
+        ItemPrototype const *item = sItemStorage.LookupEntry<ItemPrototype>(*i);
+        QueryItemUsage(item);
+        QueryQuestItem(*i);
+        QueryItemPrice(item);
+    }
+}
+
+void QueryItemUsageAction::QueryQuestItem(uint32 itemId)
+{
+    Player *bot = ai->GetBot();
+    QuestStatusMap const& questMap = bot->GetQuestStatusMap();
+    for (QuestStatusMap::const_iterator i = questMap.begin(); i != questMap.end(); i++)
+    {
+        const Quest *questTemplate = sObjectMgr.GetQuestTemplate( i->first );
+        if( !questTemplate )
+            continue;
+
+        uint32 questId = questTemplate->GetQuestId();
+        QuestStatus status = bot->GetQuestStatus(questId);
+        if (status == QUEST_STATUS_INCOMPLETE || (status == QUEST_STATE_COMPLETE && !bot->GetQuestRewardStatus(questId)))
+        {
+            QuestStatusData const& questStatus = i->second;
+            QueryQuestItem(itemId, questTemplate, &questStatus);
+        }
+    }
+}
+
+
+void QueryItemUsageAction::QueryQuestItem(uint32 itemId, const Quest *questTemplate, const QuestStatusData *questStatus)
+{
+    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; i++)
+    {
+        if (questTemplate->ReqItemId[i] != itemId)
+            continue;
+
+        int required = questTemplate->ReqItemCount[i];
+        int available = questStatus->m_itemcount[i];
+
+        if (!required)
+            continue;
+
+        ai->TellMaster(chat->formatQuestObjective(chat->formatQuest(questTemplate), available, required));
+    }
+}
+
diff --git a/src/game/playerbot/strategy/actions/QueryItemUsageAction.h b/src/game/playerbot/strategy/actions/QueryItemUsageAction.h
new file mode 100644
index 00000000000..11899cb96e2
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/QueryItemUsageAction.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class QueryItemUsageAction : public InventoryAction {
+    public:
+        QueryItemUsageAction(PlayerbotAI* ai, string name = "query item usage") : InventoryAction(ai, name) {}
+        virtual bool Execute(Event event);
+
+    protected:
+        void QueryItemsUsage(ItemIds items);
+        bool QueryItemUsage(ItemPrototype const *item);
+        void QueryItemPrice(ItemPrototype const *item);
+        void QueryQuestItem(uint32 itemId, const Quest *questTemplate, const QuestStatusData *questStatus);
+        void QueryQuestItem(uint32 itemId);
+
+    private:
+        ostringstream out;
+
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/QueryQuestAction.cpp b/src/game/playerbot/strategy/actions/QueryQuestAction.cpp
new file mode 100644
index 00000000000..46526874600
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/QueryQuestAction.cpp
@@ -0,0 +1,89 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "QueryQuestAction.h"
+
+
+using namespace ai;
+
+void QueryQuestAction::TellObjective(string name, int available, int required)
+{
+    ai->TellMaster(chat->formatQuestObjective(name, available, required));
+}
+
+
+bool QueryQuestAction::Execute(Event event)
+{
+
+    Player *bot = ai->GetBot();
+    string text = event.getParam();
+
+    PlayerbotChatHandler ch(bot);
+    uint32 questId = ch.extractQuestId(text);
+    if (!questId)
+        return false;
+
+    for (uint16 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot)
+    {
+        if(questId != bot->GetQuestSlotQuestId(slot))
+            continue;
+
+        ostringstream out;
+        out << "--- " << chat->formatQuest(sObjectMgr.GetQuestTemplate(questId)) << " ";
+        if (bot->GetQuestStatus(questId) == QUEST_STATUS_COMPLETE)
+        {
+            out << "|c0000FF00completed|r ---";
+            ai->TellMaster(out);
+        }
+        else
+        {
+            out << "|c00FF0000not completed|r ---";
+            ai->TellMaster(out);
+            TellObjectives(questId);
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+void QueryQuestAction::TellObjectives(uint32 questId)
+{
+    Quest const* questTemplate = sObjectMgr.GetQuestTemplate(questId);
+    QuestStatusMap &questMap = (QuestStatusMap&)bot->GetQuestStatusMap();
+    QuestStatusData questStatus = questMap[questId];
+
+    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; i++)
+    {
+        if (!questTemplate->ObjectiveText[i].empty())
+            ai->TellMaster(questTemplate->ObjectiveText[i]);
+
+        if (questTemplate->ReqItemId[i])
+        {
+            int required = questTemplate->ReqItemCount[i];
+            int available = questStatus.m_itemcount[i];
+            ItemPrototype const* proto = sObjectMgr.GetItemPrototype(questTemplate->ReqItemId[i]);
+            TellObjective(chat->formatItem(proto), available, required);
+        }
+
+        if (questTemplate->ReqCreatureOrGOId[i])
+        {
+            int required = questTemplate->ReqCreatureOrGOCount[i];
+            int available = questStatus.m_creatureOrGOcount[i];
+
+            if (questTemplate->ReqCreatureOrGOId[i] < 0)
+            {
+                GameObjectInfo const* info = sObjectMgr.GetGameObjectInfo(-questTemplate->ReqCreatureOrGOId[i]);
+                if (info)
+                    TellObjective(info->name, available, required);
+            }
+            else
+            {
+
+                CreatureInfo const* info = sObjectMgr.GetCreatureTemplate(questTemplate->ReqCreatureOrGOId[i]);
+                if (info)
+                    TellObjective(info->Name, available, required);
+            }
+        }
+    }
+}
diff --git a/src/game/playerbot/strategy/actions/QueryQuestAction.h b/src/game/playerbot/strategy/actions/QueryQuestAction.h
new file mode 100644
index 00000000000..18222935589
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/QueryQuestAction.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class QueryQuestAction : public Action {
+    public:
+        QueryQuestAction(PlayerbotAI* ai) : Action(ai, "query quest") {}
+        virtual bool Execute(Event event);
+
+    private:
+        void TellObjectives(uint32 questId);
+        void TellObjective(string name, int available, int required);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/QuestAction.cpp b/src/game/playerbot/strategy/actions/QuestAction.cpp
new file mode 100644
index 00000000000..ac1c75035af
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/QuestAction.cpp
@@ -0,0 +1,133 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "QuestAction.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+bool QuestAction::Execute(Event event)
+{
+    ObjectGuid guid = event.getObject();
+
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    if (!guid)
+        guid = master->GetSelectionGuid();
+
+    if (!guid)
+        return false;
+
+    return ProcessQuests(guid);
+}
+
+bool QuestAction::ProcessQuests(ObjectGuid questGiver)
+{
+    GameObject *gameObject = ai->GetGameObject(questGiver);
+    if (gameObject && gameObject->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
+        return ProcessQuests(gameObject);
+
+    Creature* creature = ai->GetCreature(questGiver);
+    if (creature)
+        return ProcessQuests(creature);
+
+    return false;
+}
+
+bool QuestAction::ProcessQuests(WorldObject* questGiver)
+{
+    ObjectGuid guid = questGiver->GetObjectGuid();
+
+    if (bot->GetDistance(questGiver) > INTERACTION_DISTANCE)
+    {
+        ai->TellMaster("Cannot talk to quest giver");
+        return false;
+    }
+
+    if (!bot->isInFront(questGiver, sPlayerbotAIConfig.sightDistance, M_PI / 2))
+        bot->SetFacingTo(bot->GetAngle(questGiver));
+
+    bot->SetSelectionGuid(guid);
+    bot->PrepareQuestMenu(guid);
+    QuestMenu& questMenu = bot->PlayerTalkClass->GetQuestMenu();
+    for (uint32 i = 0; i < questMenu.MenuItemCount(); ++i)
+    {
+        QuestMenuItem const& menuItem = questMenu.GetItem(i);
+        uint32 questID = menuItem.m_qId;
+        Quest const* quest = sObjectMgr.GetQuestTemplate(questID);
+        if (!quest)
+            continue;
+
+        ProcessQuest(quest, questGiver);
+    }
+
+    return true;
+}
+
+bool QuestAction::AcceptQuest(Quest const* quest, uint64 questGiver)
+{
+    std::ostringstream out;
+
+    uint32 questId = quest->GetQuestId();
+
+    if (bot->GetQuestStatus(questId) == QUEST_STATUS_COMPLETE)
+        out << "Already completed";
+    else if (! bot->CanTakeQuest(quest, false))
+    {
+        if (! bot->SatisfyQuestStatus(quest, false))
+            out << "Already on";
+        else
+            out << "Can't take";
+    }
+    else if (! bot->SatisfyQuestLog(false))
+        out << "Quest log is full";
+    else if (! bot->CanAddQuest(quest, false))
+        out << "Bags are full";
+
+    else
+    {
+        WorldPacket p(CMSG_QUESTGIVER_ACCEPT_QUEST);
+        uint32 unk1 = 0;
+        p << questGiver << questId << unk1;
+        p.rpos(0);
+        bot->GetSession()->HandleQuestgiverAcceptQuestOpcode(p);
+
+        if (bot->GetQuestStatus(questId) != QUEST_STATUS_NONE && bot->GetQuestStatus(questId) != QUEST_STATUS_AVAILABLE)
+        {
+            out << "Accepted " << chat->formatQuest(quest);
+            ai->TellMaster(out);
+            return true;
+        }
+    }
+
+    out << " " << chat->formatQuest(quest);
+    ai->TellMaster(out);
+    return false;
+}
+
+bool QuestObjectiveCompletedAction::Execute(Event event)
+{
+    WorldPacket p(event.getPacket());
+    p.rpos(0);
+
+    uint32 entry, questId, available, required;
+    ObjectGuid guid;
+    p >> questId >> entry >> available >> required >> guid;
+
+    if (entry & 0x80000000)
+    {
+        entry &= 0x7FFFFFFF;
+        GameObjectInfo const* info = sObjectMgr.GetGameObjectInfo(entry);
+        if (info)
+            ai->TellMaster(chat->formatQuestObjective(info->name, available, required));
+    }
+    else
+    {
+        CreatureInfo const* info = sObjectMgr.GetCreatureTemplate(entry);
+        if (info)
+            ai->TellMaster(chat->formatQuestObjective(info->Name, available, required));
+    }
+
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/QuestAction.h b/src/game/playerbot/strategy/actions/QuestAction.h
new file mode 100644
index 00000000000..36b680642b9
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/QuestAction.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "../Action.h"
+#include "../../../QuestDef.h"
+
+namespace ai
+{
+    class QuestAction : public Action 
+    {
+    public:
+        QuestAction(PlayerbotAI* ai, string name) : Action(ai, name) {}
+
+    public:
+        virtual bool Execute(Event event);
+
+    protected:
+        virtual void ProcessQuest(Quest const* quest, WorldObject* questGiver) = 0;
+
+    protected:
+        bool AcceptQuest(Quest const* quest, uint64 questGiver);
+        bool ProcessQuests(ObjectGuid questGiver);
+        bool ProcessQuests(WorldObject* questGiver);
+    };
+    
+    class QuestObjectiveCompletedAction : public Action 
+    {
+    public:
+        QuestObjectiveCompletedAction(PlayerbotAI* ai) : Action(ai, "quest objective completed") {}
+
+    public:
+        virtual bool Execute(Event event);
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/ReachTargetActions.h b/src/game/playerbot/strategy/actions/ReachTargetActions.h
new file mode 100644
index 00000000000..c9883659119
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ReachTargetActions.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include "../Action.h"
+#include "MovementActions.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class ReachTargetAction : public MovementAction
+    {
+    public:
+        ReachTargetAction(PlayerbotAI* ai, string name, float distance) : MovementAction(ai, name)
+		{
+            this->distance = distance;
+        }
+        virtual bool Execute(Event event)
+		{
+			return MoveTo(AI_VALUE(Unit*, "current target"), distance);
+        }
+        virtual bool isUseful()
+		{
+            return AI_VALUE2(float, "distance", "current target") > distance;
+        }
+        virtual string GetTargetName() { return "current target"; }
+
+    protected:
+        float distance;
+    };
+
+    class CastReachTargetSpellAction : public CastSpellAction
+    {
+    public:
+        CastReachTargetSpellAction(PlayerbotAI* ai, string spell, float distance) : CastSpellAction(ai, spell)
+		{
+            this->distance = distance;
+        }
+		virtual bool isUseful()
+		{
+			return AI_VALUE2(float, "distance", "current target") > distance;
+		}
+
+    protected:
+        float distance;
+    };
+
+    class ReachMeleeAction : public ReachTargetAction
+	{
+    public:
+        ReachMeleeAction(PlayerbotAI* ai) : ReachTargetAction(ai, "reach melee", sPlayerbotAIConfig.meleeDistance) {}
+    };
+
+    class ReachSpellAction : public ReachTargetAction
+	{
+    public:
+        ReachSpellAction(PlayerbotAI* ai, float distance = sPlayerbotAIConfig.spellDistance) : ReachTargetAction(ai, "reach spell", distance) {}
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/ReadyCheckAction.cpp b/src/game/playerbot/strategy/actions/ReadyCheckAction.cpp
new file mode 100644
index 00000000000..c38521ab618
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ReadyCheckAction.cpp
@@ -0,0 +1,83 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ReadyCheckAction.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+bool ReadyCheckAction::Execute(Event event)
+{
+    WorldPacket &p = event.getPacket();
+	ObjectGuid player;
+	p.rpos(0);
+    if (!p.empty())
+        p >> player;
+
+	if (player == bot->GetObjectGuid())
+        return false;
+
+	return ReadyCheck();
+}
+
+bool ReadyCheckAction::ReadyCheck()
+{
+    bool health = AI_VALUE2(uint8, "health", "self target") > sPlayerbotAIConfig.almostFullHealth;
+    if (!health)
+    {
+        ai->TellMaster("Low health!");
+        return false;
+    }
+
+    bool mana = !AI_VALUE2(bool, "has mana", "self target") || AI_VALUE2(uint8, "mana", "self target") > sPlayerbotAIConfig.mediumHealth;
+    if (!mana)
+    {
+        ai->TellMaster("Low mana!");
+        return false;
+    }
+
+    Player* master = GetMaster();
+    if (master)
+    {
+        bool distance = bot->GetDistance(master) <= sPlayerbotAIConfig.sightDistance;
+        if (!distance)
+        {
+            ai->TellMaster("Too far away!");
+            return false;
+        }
+    }
+
+    if (bot->getClass() == CLASS_HUNTER)
+    {
+        if (!bot->GetUInt32Value(PLAYER_AMMO_ID))
+        {
+            ai->TellMaster("Out of ammo!");
+            return false;
+        }
+
+        if (!bot->GetPet())
+        {
+            ai->TellMaster("No pet!");
+            return false;
+        }
+
+        if (bot->GetPet()->GetHappinessState() == UNHAPPY)
+        {
+            ai->TellMaster("Pet is unhappy!");
+            return false;
+        }
+    }
+
+    WorldPacket* const packet = new WorldPacket(MSG_RAID_READY_CHECK);
+    *packet << bot->GetObjectGuid();
+    *packet << uint8(1);
+    bot->GetSession()->QueuePacket(packet);
+
+    ai->ChangeStrategy("-ready check", BOT_STATE_NON_COMBAT);
+
+    return true;
+}
+
+bool FinishReadyCheckAction::Execute(Event event)
+{
+    return ReadyCheck();
+}
diff --git a/src/game/playerbot/strategy/actions/ReadyCheckAction.h b/src/game/playerbot/strategy/actions/ReadyCheckAction.h
new file mode 100644
index 00000000000..0e26b616ade
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ReadyCheckAction.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class ReadyCheckAction : public Action
+    {
+    public:
+        ReadyCheckAction(PlayerbotAI* ai, string name = "ready check") : Action(ai, name) {}
+
+        virtual bool Execute(Event event);
+
+    protected:
+        bool ReadyCheck();
+    };
+
+    class FinishReadyCheckAction : public ReadyCheckAction
+    {
+    public:
+        FinishReadyCheckAction(PlayerbotAI* ai) : ReadyCheckAction(ai, "finish ready check") {}
+
+        virtual bool Execute(Event event);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/ReleaseSpiritAction.h b/src/game/playerbot/strategy/actions/ReleaseSpiritAction.h
new file mode 100644
index 00000000000..a2efef41425
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ReleaseSpiritAction.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "../Action.h"
+#include "MovementActions.h"
+#include "../values/LastMovementValue.h"
+
+namespace ai
+{
+	class ReleaseSpiritAction : public Action {
+	public:
+		ReleaseSpiritAction(PlayerbotAI* ai) : Action(ai, "release") {}
+
+    public:
+        virtual bool Execute(Event event)
+        {
+            if (bot->isAlive() || bot->GetCorpse())
+                return false;
+
+            ai->ChangeStrategy("-follow,+stay", BOT_STATE_NON_COMBAT);
+			
+            bot->SetBotDeathTimer();
+            bot->BuildPlayerRepop();
+
+            bot->RepopAtGraveyard();
+            return true;
+        }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/RememberTaxiAction.cpp b/src/game/playerbot/strategy/actions/RememberTaxiAction.cpp
new file mode 100644
index 00000000000..7b170962930
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/RememberTaxiAction.cpp
@@ -0,0 +1,46 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RememberTaxiAction.h"
+#include "../values/LastMovementValue.h"
+
+using namespace ai;
+
+bool RememberTaxiAction::Execute(Event event)
+{
+    
+
+    WorldPacket p(event.getPacket());
+    p.rpos(0);
+
+    switch (p.GetOpcode())
+    {
+    case CMSG_ACTIVATETAXI:
+        {
+            LastMovement& movement = context->GetValue<LastMovement&>("last movement")->Get();
+            movement.taxiNodes.clear();
+            movement.taxiNodes.resize(2);
+
+            p >> movement.taxiMaster >> movement.taxiNodes[0] >> movement.taxiNodes[1];
+            return true;
+        }
+    case CMSG_ACTIVATETAXIEXPRESS:
+        {
+            ObjectGuid guid;
+            uint32 node_count;
+            p >> guid >> node_count;
+
+            LastMovement& movement = context->GetValue<LastMovement&>("last movement")->Get();
+            movement.taxiNodes.clear();
+            for (uint32 i = 0; i < node_count; ++i)
+            {
+                uint32 node;
+                p >> node;
+                movement.taxiNodes.push_back(node);
+            }
+
+            return true;
+        }
+    }
+
+    return false;
+}
diff --git a/src/game/playerbot/strategy/actions/RememberTaxiAction.h b/src/game/playerbot/strategy/actions/RememberTaxiAction.h
new file mode 100644
index 00000000000..16c1f07f379
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/RememberTaxiAction.h
@@ -0,0 +1,13 @@
+#pragma once
+
+namespace ai
+{
+	class RememberTaxiAction : public Action {
+	public:
+		RememberTaxiAction(PlayerbotAI* ai) : Action(ai, "remember taxi") {}
+
+    public:
+        virtual bool Execute(Event event);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/RepairAllAction.cpp b/src/game/playerbot/strategy/actions/RepairAllAction.cpp
new file mode 100644
index 00000000000..519a11e6da7
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/RepairAllAction.cpp
@@ -0,0 +1,33 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RepairAllAction.h"
+
+
+using namespace ai;
+
+bool RepairAllAction::Execute(Event event)
+{
+    list<ObjectGuid> npcs = AI_VALUE(list<ObjectGuid>, "nearest npcs");
+    for (list<ObjectGuid>::iterator i = npcs.begin(); i != npcs.end(); i++)
+    {
+        Creature *unit = bot->GetNPCIfCanInteractWith(*i, UNIT_NPC_FLAG_REPAIR);
+        if (!unit)
+            continue;
+
+        if(bot->hasUnitState(UNIT_STAT_DIED))
+            bot->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+
+        bot->SetFacingToObject(unit);
+        float discountMod = bot->GetReputationPriceDiscount(unit);
+        uint32 totalCost = bot->DurabilityRepairAll(true, discountMod, false);
+
+        ostringstream out;
+        out << "Repair: " << chat->formatMoney(totalCost) << " (" << unit->GetName() << ")";
+        ai->TellMasterNoFacing(out.str());
+
+        return true;
+    }
+
+    ai->TellMaster("Cannot find any npc to repair at");
+    return false;
+}
diff --git a/src/game/playerbot/strategy/actions/RepairAllAction.h b/src/game/playerbot/strategy/actions/RepairAllAction.h
new file mode 100644
index 00000000000..33c7abfcd38
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/RepairAllAction.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class RepairAllAction : public Action 
+    {
+    public:
+        RepairAllAction(PlayerbotAI* ai) : Action(ai, "repair") {}
+        virtual bool Execute(Event event);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/ResetAiAction.cpp b/src/game/playerbot/strategy/actions/ResetAiAction.cpp
new file mode 100644
index 00000000000..995f2413f7a
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ResetAiAction.cpp
@@ -0,0 +1,12 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ResetAiAction.h"
+
+using namespace ai;
+
+bool ResetAiAction::Execute(Event event)
+{
+    ai->ResetStrategies();
+    ai->TellMaster("AI was reset to defaults");
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/ResetAiAction.h b/src/game/playerbot/strategy/actions/ResetAiAction.h
new file mode 100644
index 00000000000..929abcb54fc
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ResetAiAction.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class ResetAiAction : public Action {
+    public:
+        ResetAiAction(PlayerbotAI* ai) : Action(ai, "reset ai") {}
+        virtual bool Execute(Event event);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/ReviveFromCorpseAction.cpp b/src/game/playerbot/strategy/actions/ReviveFromCorpseAction.cpp
new file mode 100644
index 00000000000..b4db9f5eda4
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ReviveFromCorpseAction.cpp
@@ -0,0 +1,56 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ReviveFromCorpseAction.h"
+#include "../../PlayerbotFactory.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+bool ReviveFromCorpseAction::Execute(Event event)
+{
+    Corpse* corpse = bot->GetCorpse();
+    if (!corpse)
+        return false;
+
+    time_t reclaimTime = corpse->GetGhostTime() + bot->GetCorpseReclaimDelay( corpse->GetType()==CORPSE_RESURRECTABLE_PVP );
+    if (reclaimTime > time(0) || corpse->GetDistance(bot) > sPlayerbotAIConfig.spellDistance)
+        return false;
+
+    PlayerbotChatHandler ch(bot);
+    if (! ch.revive(*bot))
+    {
+        ai->TellMaster(".. could not be revived ..");
+        return false;
+    }
+    context->GetValue<Unit*>("current target")->Set(NULL);
+    bot->SetSelectionGuid(ObjectGuid());
+    return true;
+}
+
+bool SpiritHealerAction::Execute(Event event)
+{
+    Corpse* corpse = bot->GetCorpse();
+    if (!corpse)
+        return false;
+
+    list<ObjectGuid> npcs = AI_VALUE(list<ObjectGuid>, "nearest npcs");
+    for (list<ObjectGuid>::iterator i = npcs.begin(); i != npcs.end(); i++)
+    {
+        Unit* unit = ai->GetUnit(*i);
+        if (unit && unit->isSpiritHealer())
+        {
+            PlayerbotChatHandler ch(bot);
+            if (! ch.revive(*bot))
+            {
+                ai->TellMaster(".. could not be revived ..");
+                return false;
+            }
+            context->GetValue<Unit*>("current target")->Set(NULL);
+            bot->SetSelectionGuid(ObjectGuid());
+            return true;
+        }
+    }
+
+    ai->TellMaster("Cannot find any spirit healer nearby");
+    return false;
+}
diff --git a/src/game/playerbot/strategy/actions/ReviveFromCorpseAction.h b/src/game/playerbot/strategy/actions/ReviveFromCorpseAction.h
new file mode 100644
index 00000000000..0e3a8cb9ccf
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/ReviveFromCorpseAction.h
@@ -0,0 +1,21 @@
+#pragma once
+
+namespace ai
+{
+	class ReviveFromCorpseAction : public Action {
+	public:
+		ReviveFromCorpseAction(PlayerbotAI* ai) : Action(ai, "revive") {}
+
+    public:
+        virtual bool Execute(Event event);
+    };
+
+	class SpiritHealerAction : public Action {
+	public:
+	    SpiritHealerAction(PlayerbotAI* ai) : Action(ai, "spirit healer") {}
+
+    public:
+        virtual bool Execute(Event event);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/RewardAction.cpp b/src/game/playerbot/strategy/actions/RewardAction.cpp
new file mode 100644
index 00000000000..c2fb3f9e345
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/RewardAction.cpp
@@ -0,0 +1,75 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RewardAction.h"
+#include "../ItemVisitors.h"
+#include "../values/ItemCountValue.h"
+
+using namespace ai;
+
+bool RewardAction::Execute(Event event)
+{
+    string link = event.getParam();
+
+    ItemIds itemIds = chat->parseItems(link);
+    if (itemIds.empty())
+        return false;
+
+    uint32 itemId = *itemIds.begin();
+
+    list<ObjectGuid> npcs = AI_VALUE(list<ObjectGuid>, "nearest npcs");
+    for (list<ObjectGuid>::iterator i = npcs.begin(); i != npcs.end(); i++)
+    {
+        Unit* npc = ai->GetUnit(*i);
+        if (npc && Reward(itemId, npc))
+            return true;
+    }
+
+    list<ObjectGuid> gos = AI_VALUE(list<ObjectGuid>, "nearest game objects");
+    for (list<ObjectGuid>::iterator i = gos.begin(); i != gos.end(); i++)
+    {
+        GameObject* go = ai->GetGameObject(*i);
+        if (go && Reward(itemId, go))
+            return true;
+    }
+
+    ai->TellMaster("Cannot talk to quest giver");
+    return false;
+}
+
+bool RewardAction::Reward(uint32 itemId, Object* questGiver)
+{
+    QuestMenu& questMenu = bot->PlayerTalkClass->GetQuestMenu();
+    for (uint32 iI = 0; iI < questMenu.MenuItemCount(); ++iI)
+    {
+        QuestMenuItem const& qItem = questMenu.GetItem(iI);
+
+        uint32 questID = qItem.m_qId;
+        Quest const* pQuest = sObjectMgr.GetQuestTemplate(questID);
+        QuestStatus status = bot->GetQuestStatus(questID);
+
+        // if quest is complete, turn it in
+        if (status == QUEST_STATUS_COMPLETE &&
+            ! bot->GetQuestRewardStatus(questID) &&
+            pQuest->GetRewChoiceItemsCount() > 1 &&
+            bot->CanRewardQuest(pQuest, false))
+        {
+            for (uint8 rewardIdx=0; rewardIdx < pQuest->GetRewChoiceItemsCount(); ++rewardIdx)
+            {
+                ItemPrototype const * const pRewardItem = sObjectMgr.GetItemPrototype(pQuest->RewChoiceItemId[rewardIdx]);
+                if (itemId == pRewardItem->ItemId)
+                {
+                    bot->RewardQuest(pQuest, rewardIdx, questGiver, false);
+
+                    string questTitle  = pQuest->GetTitle();
+                    string itemName = pRewardItem->Name1;
+
+                    ostringstream out; out << chat->formatItem(pRewardItem) << " rewarded";
+                    ai->TellMaster(out);
+                    return true;
+                }
+            }
+        }
+    }
+
+    return false;
+}
diff --git a/src/game/playerbot/strategy/actions/RewardAction.h b/src/game/playerbot/strategy/actions/RewardAction.h
new file mode 100644
index 00000000000..f4eda1335af
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/RewardAction.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class RewardAction : public InventoryAction {
+    public:
+        RewardAction(PlayerbotAI* ai) : InventoryAction(ai, "reward") {}
+        virtual bool Execute(Event event);
+
+    private:
+        bool Reward(uint32 itemId, Object* pNpc);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/RtiAction.h b/src/game/playerbot/strategy/actions/RtiAction.h
new file mode 100644
index 00000000000..f0cca94db76
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/RtiAction.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class RtiAction : public Action
+    {
+    public:
+        RtiAction(PlayerbotAI* ai) : Action(ai, "rti")
+        {}
+
+        virtual bool Execute(Event event)
+        {
+            string text = event.getParam();
+            if (text.empty() || text == "?")
+            {
+                ostringstream out; out << "RTI: ";
+                AppendRti(out);
+                ai->TellMaster(out);
+                return true;
+            }
+
+            context->GetValue<string>("rti")->Set(text);
+            ostringstream out; out << "RTI set to: ";
+            AppendRti(out);
+            ai->TellMaster(out);
+            return true;
+        }
+
+    private:
+        void AppendRti(ostringstream & out)
+        {
+            out << AI_VALUE(string, "rti");
+
+            Unit* target = AI_VALUE(Unit*, "rti target");
+            if(target)
+                out << " (" << target->GetName() << ")";
+
+        }
+
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/SaveManaAction.cpp b/src/game/playerbot/strategy/actions/SaveManaAction.cpp
new file mode 100644
index 00000000000..c5d56a85356
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/SaveManaAction.cpp
@@ -0,0 +1,73 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "SaveManaAction.h"
+#include "../../AiFactory.h"
+#include "../ItemVisitors.h"
+
+using namespace ai;
+
+bool SaveManaAction::Execute(Event event)
+{
+    string text = event.getParam();
+    double value = AI_VALUE(double, "mana save level");
+
+    if (text == "?")
+    {
+        ostringstream out; out << "Mana save level: " << format(value);
+        ai->TellMaster(out);
+        return true;
+    }
+
+    if (text == "*")
+    {
+        switch (bot->getClass())
+        {
+        case CLASS_HUNTER:
+        case CLASS_SHAMAN:
+        case CLASS_DRUID:
+            value = 5.0;
+            break;
+        case CLASS_MAGE:
+        case CLASS_PRIEST:
+        case CLASS_WARLOCK:
+            value = 2.0;
+            break;
+        default:
+            value = 3.0;
+        }
+    }
+    else if (text.empty())
+    {
+        value = 1.0;
+    }
+    else
+    {
+        value = atof(text.c_str());
+    }
+
+    value = min(10.0, value);
+    value = max(1.0, value);
+    value = floor(value * 100 + 0.5) / 100.0;
+
+    ai->GetAiObjectContext()->GetValue<double>("mana save level")->Set(value);
+
+    ostringstream out; out << "Mana save level set: " << format(value);
+    ai->TellMaster(out);
+
+    return true;
+}
+
+string SaveManaAction::format(double value)
+{
+    ostringstream out;
+    if (value <= 1.0)
+        out << "|cFF808080";
+    else if (value <= 5.0)
+        out << "|cFF00FF00";
+    else if (value <= 7.0)
+        out << "|cFFFFFF00";
+    else
+        out << "|cFFFF0000";
+    out << value << "|cffffffff";
+    return out.str();
+}
diff --git a/src/game/playerbot/strategy/actions/SaveManaAction.h b/src/game/playerbot/strategy/actions/SaveManaAction.h
new file mode 100644
index 00000000000..3d9b3e0f8b9
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/SaveManaAction.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class SaveManaAction : public Action
+    {
+    public:
+        SaveManaAction(PlayerbotAI* ai) : Action(ai, "save mana") {}
+
+    public:
+        virtual bool Execute(Event event);
+
+    private:
+        string format(double value);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/SecurityCheckAction.cpp b/src/game/playerbot/strategy/actions/SecurityCheckAction.cpp
new file mode 100644
index 00000000000..ccdc14cff99
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/SecurityCheckAction.cpp
@@ -0,0 +1,30 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "../../RandomPlayerbotMgr.h"
+#include "SecurityCheckAction.h"
+
+using namespace ai;
+
+
+bool SecurityCheckAction::isUseful()
+{
+    return sRandomPlayerbotMgr.IsRandomBot(bot) && ai->GetMaster() && ai->GetMaster()->GetSession()->GetSecurity() < SEC_GAMEMASTER;
+}
+
+bool SecurityCheckAction::Execute(Event event)
+{
+    Group* group = bot->GetGroup();
+    if (group)
+    {
+        LootMethod method = group->GetLootMethod();
+        ItemQualities threshold = group->GetLootThreshold();
+        if (method == MASTER_LOOT || method == FREE_FOR_ALL || threshold > ITEM_QUALITY_UNCOMMON)
+        {
+            ai->TellMaster("I won't do anything until you change loot type to group loot with green threshold");
+            ai->ChangeStrategy("+passive,+stay", BOT_STATE_NON_COMBAT);
+            ai->ChangeStrategy("+passive,+stay", BOT_STATE_COMBAT);
+            return true;
+        }
+    }
+    return false;
+}
diff --git a/src/game/playerbot/strategy/actions/SecurityCheckAction.h b/src/game/playerbot/strategy/actions/SecurityCheckAction.h
new file mode 100644
index 00000000000..4ae38f05d32
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/SecurityCheckAction.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class SecurityCheckAction : public Action
+    {
+    public:
+        SecurityCheckAction(PlayerbotAI* ai) : Action(ai, "security check") {}
+        virtual bool isUseful();
+        virtual bool Execute(Event event);
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/SellAction.cpp b/src/game/playerbot/strategy/actions/SellAction.cpp
new file mode 100644
index 00000000000..43ccd5bb084
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/SellAction.cpp
@@ -0,0 +1,95 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "SellAction.h"
+#include "../ItemVisitors.h"
+
+using namespace ai;
+
+class SellItemsVisitor : public IterateItemsVisitor
+{
+public:
+    SellItemsVisitor(SellAction* action) : IterateItemsVisitor()
+    {
+        this->action = action;
+    }
+
+    virtual bool Visit(Item* item)
+    {
+        action->Sell(item);
+        return true;
+    }
+
+private:
+    SellAction* action;
+};
+
+class SellGrayItemsVisitor : public SellItemsVisitor
+{
+public:
+    SellGrayItemsVisitor(SellAction* action) : SellItemsVisitor(action) {}
+
+    virtual bool Visit(Item* item)
+    {
+        if (item->GetProto()->Quality != ITEM_QUALITY_POOR)
+            return true;
+
+        return SellItemsVisitor::Visit(item);
+    }
+};
+
+
+bool SellAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    string text = event.getParam();
+
+    if (text == "gray" || text == "*")
+    {
+        SellGrayItemsVisitor visitor(this);
+        IterateItems(&visitor);
+        return true;
+    }
+
+    ItemIds ids = chat->parseItems(text);
+
+    for (ItemIds::iterator i =ids.begin(); i != ids.end(); i++)
+    {
+        FindItemByIdVisitor visitor(*i);
+        Sell(&visitor);
+    }
+
+    return true;
+}
+
+
+void SellAction::Sell(FindItemVisitor* visitor)
+{
+    IterateItems(visitor);
+    list<Item*> items = visitor->GetResult();
+    for (list<Item*>::iterator i = items.begin(); i != items.end(); ++i)
+        Sell(*i);
+}
+
+void SellAction::Sell(Item* item)
+{
+    Player* master = GetMaster();
+    ObjectGuid vendorguid = master->GetSelectionGuid();
+    if (!vendorguid)
+    {
+        ai->TellMaster("Select a vendor first");
+        return;
+    }
+
+    ObjectGuid itemguid = item->GetObjectGuid();
+    uint32 count = item->GetCount();
+
+    WorldPacket p;
+    p << vendorguid << itemguid << count;
+    bot->GetSession()->HandleSellItemOpcode(p);
+
+    ostringstream out; out << chat->formatItem(item->GetProto()) << " sold";
+    ai->TellMaster(out);
+}
diff --git a/src/game/playerbot/strategy/actions/SellAction.h b/src/game/playerbot/strategy/actions/SellAction.h
new file mode 100644
index 00000000000..c1f091548a0
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/SellAction.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class SellAction : public InventoryAction {
+    public:
+        SellAction(PlayerbotAI* ai) : InventoryAction(ai, "sell") {}
+        virtual bool Execute(Event event);
+
+        void Sell(FindItemVisitor* visitor);
+        void Sell(Item* item);
+
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/SetHomeAction.cpp b/src/game/playerbot/strategy/actions/SetHomeAction.cpp
new file mode 100644
index 00000000000..a8830a6e452
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/SetHomeAction.cpp
@@ -0,0 +1,48 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "SetHomeAction.h"
+#include "../../PlayerbotAIConfig.h"
+
+
+using namespace ai;
+
+bool SetHomeAction::Execute(Event event)
+{
+    Player* master = ai->GetMaster();
+    if (!master)
+        return false;
+
+    ObjectGuid selection = master->GetSelectionGuid();
+    if (selection)
+    {
+        MapPtr map = bot->GetMapPtr();
+        Unit* unit = map->GetUnit(selection);
+        map = MapPtr();
+        if (unit && unit->isInnkeeper())
+        {
+            float angle = GetFollowAngle();
+            float x = unit->GetPositionX() + sPlayerbotAIConfig.followDistance * cos(angle);
+            float y = unit->GetPositionY() + sPlayerbotAIConfig.followDistance * sin(angle);
+            float z = unit->GetPositionZ();
+            WorldLocation loc(unit->GetMapId(), x, y, z);
+            bot->SetHomebindToLocation(loc);
+            ai->TellMaster("This inn is my new home");
+            return true;
+        }
+    }
+
+    list<ObjectGuid> npcs = AI_VALUE(list<ObjectGuid>, "nearest npcs");
+    for (list<ObjectGuid>::iterator i = npcs.begin(); i != npcs.end(); i++)
+    {
+        Creature *unit = bot->GetNPCIfCanInteractWith(*i, UNIT_NPC_FLAG_INNKEEPER);
+        if (!unit)
+            continue;
+
+        bot->GetSession()->SendBindPoint(unit);
+        ai->TellMaster("This inn is my new home");
+        return true;
+    }
+
+    ai->TellMaster("Can't find any innkeeper around");
+    return false;
+}
diff --git a/src/game/playerbot/strategy/actions/SetHomeAction.h b/src/game/playerbot/strategy/actions/SetHomeAction.h
new file mode 100644
index 00000000000..b98a5b55ef2
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/SetHomeAction.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "MovementActions.h"
+
+namespace ai
+{
+    class SetHomeAction : public MovementAction {
+    public:
+        SetHomeAction(PlayerbotAI* ai) : MovementAction(ai, "home") {}
+        virtual bool Execute(Event event);
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/StatsAction.cpp b/src/game/playerbot/strategy/actions/StatsAction.cpp
new file mode 100644
index 00000000000..ca80210e704
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/StatsAction.cpp
@@ -0,0 +1,145 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "StatsAction.h"
+
+
+using namespace ai;
+
+bool StatsAction::Execute(Event event)
+{
+    ostringstream out;
+
+    ListGold(out);
+
+    out << ", ";
+    ListBagSlots(out);
+
+    out << ", ";
+    ListRepairCost(out);
+
+    if (bot->GetUInt32Value(PLAYER_NEXT_LEVEL_XP))
+    {
+        out << ", ";
+        ListXP(out);
+    }
+
+    ai->TellMaster(out);
+    return true;
+}
+
+void StatsAction::ListGold(ostringstream &out)
+{
+    out << chat->formatMoney(bot->GetMoney());
+}
+
+void StatsAction::ListBagSlots(ostringstream &out)
+{
+    uint32 totalused = 0, total = 16;
+    // list out items in main backpack
+    for (uint8 slot = INVENTORY_SLOT_ITEM_START; slot < INVENTORY_SLOT_ITEM_END; slot++)
+    {
+        const Item* const pItem = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, slot);
+        if (pItem)
+            totalused++;
+    }
+    uint32 totalfree = 16 - totalused;
+    // list out items in other removable backpacks
+    for (uint8 bag = INVENTORY_SLOT_BAG_START; bag < INVENTORY_SLOT_BAG_END; ++bag)
+    {
+        const Bag* const pBag = (Bag*) bot->GetItemByPos(INVENTORY_SLOT_BAG_0, bag);
+        if (pBag)
+        {
+            ItemPrototype const* pBagProto = pBag->GetProto();
+            if (pBagProto->Class == ITEM_CLASS_CONTAINER && pBagProto->SubClass == ITEM_SUBCLASS_CONTAINER)
+            {
+                total += pBag->GetBagSize();
+                totalfree += pBag->GetFreeSlots();
+            }
+        }
+
+    }
+
+	string color = "ff00ff00";
+	if (totalfree < total / 2)
+		color = "ffffff00";
+	if (totalfree < total / 4)
+		color = "ffff0000";
+    out << "|h|c" << color << (total - totalfree) << "/" << total << "|h|cffffffff Bag";
+}
+
+void StatsAction::ListXP( ostringstream &out )
+{
+    uint32 curXP = bot->GetUInt32Value(PLAYER_XP);
+    uint32 nextLevelXP = bot->GetUInt32Value(PLAYER_NEXT_LEVEL_XP);
+    uint32 xpPercent = 0;
+    if (nextLevelXP)
+        xpPercent = 100 * curXP / nextLevelXP;
+
+    out << "|r|cff00ff00" << xpPercent << "|r|cffffd333%" << "|h|cffffffff XP";
+}
+
+void StatsAction::ListRepairCost(ostringstream &out)
+{
+    out << chat->formatMoney(EstRepairAll()) << " Repair";
+}
+
+uint32 StatsAction::EstRepairAll()
+{
+    uint32 TotalCost = 0;
+    // equipped, backpack, bags itself
+    for(int i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i)
+        TotalCost += EstRepair(( (INVENTORY_SLOT_BAG_0 << 8) | i ));
+
+    // bank, buyback and keys not repaired
+
+    // items in inventory bags
+    for(int j = INVENTORY_SLOT_BAG_START; j < INVENTORY_SLOT_BAG_END; ++j)
+        for(int i = 0; i < MAX_BAG_SIZE; ++i)
+            TotalCost += EstRepair(( (j << 8) | i ));
+    return TotalCost;
+}
+
+uint32 StatsAction::EstRepair(uint16 pos)
+{
+    Item* item = bot->GetItemByPos(pos);
+
+    uint32 TotalCost = 0;
+    if(!item)
+        return TotalCost;
+
+    uint32 maxDurability = item->GetUInt32Value(ITEM_FIELD_MAXDURABILITY);
+    if(!maxDurability)
+        return TotalCost;
+
+    uint32 curDurability = item->GetUInt32Value(ITEM_FIELD_DURABILITY);
+
+    uint32 LostDurability = maxDurability - curDurability;
+    if(LostDurability>0)
+    {
+        ItemPrototype const *ditemProto = item->GetProto();
+
+        DurabilityCostsEntry const *dcost = sDurabilityCostsStore.LookupEntry(ditemProto->ItemLevel);
+        if(!dcost)
+        {
+            sLog.outError("RepairDurability: Wrong item lvl %u", ditemProto->ItemLevel);
+            return TotalCost;
+        }
+
+        uint32 dQualitymodEntryId = (ditemProto->Quality+1)*2;
+        DurabilityQualityEntry const *dQualitymodEntry = sDurabilityQualityStore.LookupEntry(dQualitymodEntryId);
+        if(!dQualitymodEntry)
+        {
+            sLog.outError("RepairDurability: Wrong dQualityModEntry %u", dQualitymodEntryId);
+            return TotalCost;
+        }
+
+        uint32 dmultiplier = dcost->multiplier[ItemSubClassToDurabilityMultiplierId(ditemProto->Class,ditemProto->SubClass)];
+        uint32 costs = uint32(LostDurability*dmultiplier*double(dQualitymodEntry->quality_mod));
+
+        if (costs==0)                                   //fix for ITEM_QUALITY_ARTIFACT
+            costs = 1;
+
+        TotalCost = costs;
+    }
+    return TotalCost;
+}
diff --git a/src/game/playerbot/strategy/actions/StatsAction.h b/src/game/playerbot/strategy/actions/StatsAction.h
new file mode 100644
index 00000000000..e30558c1db2
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/StatsAction.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class StatsAction : public Action {
+    public:
+        StatsAction(PlayerbotAI* ai) : Action(ai, "stats") {}
+        virtual bool Execute(Event event);
+
+    private:
+        void ListBagSlots(ostringstream &out);
+        void ListXP(ostringstream &out);
+        void ListRepairCost(ostringstream &out);
+        void ListGold(ostringstream &out);
+        uint32 EstRepairAll();
+        uint32 EstRepair(uint16 pos);
+
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/StayActions.cpp b/src/game/playerbot/strategy/actions/StayActions.cpp
new file mode 100644
index 00000000000..991805b605d
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/StayActions.cpp
@@ -0,0 +1,36 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "StayActions.h"
+#include "../values/LastMovementValue.h"
+#include "../../../movementGenerators/MovementGenerator.h"
+
+using namespace ai;
+
+void StayActionBase::Stay()
+{
+    AI_VALUE(LastMovement&, "last movement").Set(NULL);
+
+    MotionMaster &mm = *bot->GetMotionMaster();
+    if (mm.GetCurrentMovementGeneratorType() == FLIGHT_MOTION_TYPE || bot->IsTaxiFlying())
+        return;
+
+    mm.Clear();
+    mm.MoveIdle();
+    bot->clearUnitState( UNIT_STAT_CHASE );
+    bot->clearUnitState( UNIT_STAT_FOLLOW );
+
+    if (!bot->IsStandState())
+        bot->SetStandState(UNIT_STAND_STATE_STAND);
+}
+
+bool StayAction::Execute(Event event)
+{
+    Stay();
+
+    return true;
+}
+
+bool StayAction::isUseful()
+{
+    return !AI_VALUE2(bool, "moving", "self target");
+}
diff --git a/src/game/playerbot/strategy/actions/StayActions.h b/src/game/playerbot/strategy/actions/StayActions.h
new file mode 100644
index 00000000000..ccbe2e3b274
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/StayActions.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "../Action.h"
+#include "MovementActions.h"
+
+namespace ai
+{
+    class StayActionBase : public MovementAction {
+    public:
+        StayActionBase(PlayerbotAI* ai, string name) : MovementAction(ai, name) {}
+
+    protected:
+        void Stay();
+    };
+
+    class StayAction : public StayActionBase {
+    public:
+        StayAction(PlayerbotAI* ai) : StayActionBase(ai, "stay") {}
+        virtual bool Execute(Event event);
+        virtual bool isUseful();
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/SuggestWhatToDoAction.cpp b/src/game/playerbot/strategy/actions/SuggestWhatToDoAction.cpp
new file mode 100644
index 00000000000..f0f00f56409
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/SuggestWhatToDoAction.cpp
@@ -0,0 +1,256 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "SuggestWhatToDoAction.h"
+#include "../../../ahbot/AhBot.h"
+#include "../../../ChannelMgr.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+SuggestWhatToDoAction::SuggestWhatToDoAction(PlayerbotAI* ai) : InventoryAction(ai, "suggest what to do"), suggested(false)
+{
+    suggestions.push_back(&SuggestWhatToDoAction::instance);
+    suggestions.push_back(&SuggestWhatToDoAction::specificQuest);
+    suggestions.push_back(&SuggestWhatToDoAction::newQuest);
+    suggestions.push_back(&SuggestWhatToDoAction::grindMaterials);
+    suggestions.push_back(&SuggestWhatToDoAction::trade);
+    suggestions.push_back(&SuggestWhatToDoAction::grindReputation);
+    suggestions.push_back(&SuggestWhatToDoAction::nothing);
+    suggestions.push_back(&SuggestWhatToDoAction::relax);
+    suggestions.push_back(&SuggestWhatToDoAction::achievement);
+}
+
+bool SuggestWhatToDoAction::Execute(Event event)
+{
+    if (suggested)
+    {
+        trade();
+        return true;
+    }
+
+    if (bot->GetInstanceId() || suggested)
+        return false;
+
+    int index = rand() % suggestions.size();
+    (this->*suggestions[index])();
+
+    return suggested = true;
+}
+
+void SuggestWhatToDoAction::instance()
+{
+    uint32 level = bot->getLevel();
+    if (level > 15)
+    {
+        switch (urand(0, 5))
+        {
+        case 0:
+            spam("Need a tank for an instance run");
+            break;
+        case 1:
+            spam("Need a healer for an instance run");
+            break;
+        case 2:
+            spam("I would like to do an instance run. Would you like to join me?");
+            break;
+        case 3:
+            spam("Need better equipment. Why not do an instance run?");
+            break;
+        case 4:
+            spam("Have dungeon quests? Can join your group!");
+            break;
+        case 5:
+            spam("Have group quests? Invite me!");
+            break;
+        default:
+            spam("Hey, why not join Dungeon Finder?");
+        }
+    }
+}
+
+vector<uint32> SuggestWhatToDoAction::GetIncompletedQuests()
+{
+    vector<uint32> result;
+
+    for (uint16 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot)
+    {
+        uint32 questId = bot->GetQuestSlotQuestId(slot);
+        if (!questId)
+            continue;
+
+        QuestStatus status = bot->GetQuestStatus(questId);
+        if (status == QUEST_STATUS_INCOMPLETE || status == QUEST_STATUS_NONE)
+            result.push_back(questId);
+    }
+
+    return result;
+}
+
+void SuggestWhatToDoAction::specificQuest()
+{
+    vector<uint32> quests = GetIncompletedQuests();
+    if (quests.empty())
+        return;
+
+    int index = rand() % quests.size();
+
+    Quest const* quest = sObjectMgr.GetQuestTemplate(quests[index]);
+    ostringstream out; out << "We could do some quest, for instance " << chat->formatQuest(quest);
+    spam(out.str());
+}
+
+void SuggestWhatToDoAction::newQuest()
+{
+    vector<uint32> quests = GetIncompletedQuests();
+    if (quests.size() < MAX_QUEST_LOG_SIZE - 5)
+        spam("I would like to pick up and do a new quest. Just invite me!");
+}
+
+void SuggestWhatToDoAction::grindMaterials()
+{
+    if (bot->getLevel() <= 5)
+        return;
+
+    switch (urand(0, 5))
+    {
+    case 0:
+        spam("Need help for tradeskill?");
+        break;
+    case 1:
+        spam("Can we have some trade material grinding?");
+        break;
+    case 2:
+        spam("I have some trade materials for sell");
+        break;
+    default:
+        spam("I am going to grind some trade materials. Would you like to join me?");
+    }
+}
+
+void SuggestWhatToDoAction::grindReputation()
+{
+    if (bot->getLevel() > 15)
+        ai->TellMasterNoFacing("I think we should do something to improve our reputation", PLAYERBOT_SECURITY_ALLOW_ALL);
+}
+
+void SuggestWhatToDoAction::nothing()
+{
+    ai->TellMasterNoFacing("I don't want to do anything", PLAYERBOT_SECURITY_ALLOW_ALL);
+}
+
+void SuggestWhatToDoAction::relax()
+{
+    ai->TellMasterNoFacing("It is so boring... We could relax a bit", PLAYERBOT_SECURITY_ALLOW_ALL);
+}
+
+void SuggestWhatToDoAction::achievement()
+{
+    if (bot->getLevel() > 15)
+        spam("I would like to get some achievement. Would you like to join me?");
+}
+
+class FindTradeItemsVisitor : public IterateItemsVisitor
+{
+public:
+    FindTradeItemsVisitor(uint32 quality) : quality(quality), IterateItemsVisitor() {}
+
+    virtual bool Visit(Item* item)
+    {
+        ItemPrototype const* proto = item->GetProto();
+        if (proto->Quality != quality)
+            return true;
+
+        if (proto->Class == ITEM_CLASS_TRADE_GOODS && proto->Bonding == NO_BIND)
+        {
+            if(proto->Quality == ITEM_QUALITY_NORMAL && item->GetCount() > 1 && item->GetCount() == item->GetMaxStackCount())
+                stacks.push_back(proto->ItemId);
+
+            items.push_back(proto->ItemId);
+            count[proto->ItemId] += item->GetCount();
+        }
+
+        return true;
+    }
+
+    map<uint32, int > count;
+    vector<uint32> stacks;
+    vector<uint32> items;
+
+private:
+    uint32 quality;
+};
+
+
+void SuggestWhatToDoAction::trade()
+{
+    if (!sRandomPlayerbotMgr.IsRandomBot(bot))
+        return;
+
+    uint32 quality = urand(0, 100);
+    if (quality > 90)
+        quality = ITEM_QUALITY_EPIC;
+    else if (quality >75)
+        quality = ITEM_QUALITY_RARE;
+    else if (quality > 50)
+        quality = ITEM_QUALITY_UNCOMMON;
+    else
+        quality = ITEM_QUALITY_NORMAL;
+
+    uint32 item = 0, count = 0;
+    while (quality-- > ITEM_QUALITY_POOR)
+    {
+        FindTradeItemsVisitor visitor(quality);
+        IterateItems(&visitor);
+        if (!visitor.stacks.empty())
+        {
+            int index = urand(0, visitor.stacks.size() - 1);
+            item = visitor.stacks[index];
+        }
+
+        if (!item)
+        {
+            if (!visitor.items.empty())
+            {
+                int index = urand(0, visitor.items.size() - 1);
+                item = visitor.items[index];
+            }
+        }
+
+        if (item)
+        {
+            count = visitor.count[item];
+            break;
+        }
+    }
+
+    if (!item || !count)
+        return;
+
+    ItemPrototype const* proto = sObjectMgr.GetItemPrototype(item);
+    if (!proto)
+        return;
+
+    uint32 price = auctionbot.GetSellPrice(proto) * sRandomPlayerbotMgr.GetSellMultiplier(bot) * count;
+    if (!price)
+        return;
+
+    ostringstream out; out << "Selling " << chat->formatItem(proto, count) << " for " << chat->formatMoney(price);
+    spam(out.str());
+}
+
+void SuggestWhatToDoAction::spam(string msg)
+{
+    Player* player = sRandomPlayerbotMgr.GetRandomPlayer();
+    if (!player || !player->IsInWorld())
+        return;
+
+    if (!ai->GetSecurity()->CheckLevelFor(PLAYERBOT_SECURITY_TALK, true, player))
+        return;
+
+    if (sPlayerbotAIConfig.whisperDistance && !bot->GetGroup() && sRandomPlayerbotMgr.IsRandomBot(bot) &&
+            player->GetSession()->GetSecurity() < SEC_GAMEMASTER &&
+            (bot->GetMapId() != player->GetMapId() || bot->GetDistance(player) > sPlayerbotAIConfig.whisperDistance))
+        return;
+
+    bot->Whisper(msg, LANG_UNIVERSAL, player->GetObjectGuid());
+}
diff --git a/src/game/playerbot/strategy/actions/SuggestWhatToDoAction.h b/src/game/playerbot/strategy/actions/SuggestWhatToDoAction.h
new file mode 100644
index 00000000000..750bb08ecb6
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/SuggestWhatToDoAction.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class SuggestWhatToDoAction : public InventoryAction
+    {
+    public:
+        SuggestWhatToDoAction(PlayerbotAI* ai);
+        virtual bool Execute(Event event);
+
+    private:
+        typedef void (SuggestWhatToDoAction::*Suggestion) ();
+        vector<Suggestion> suggestions;
+
+    private:
+        void instance();
+        void specificQuest();
+        void newQuest();
+        void grindMaterials();
+        void grindReputation();
+        void nothing();
+        void relax();
+        void achievement();
+        void trade();
+        void spam(string msg);
+
+        vector<uint32> GetIncompletedQuests();
+
+    private:
+        bool suggested;
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/TalkToQuestGiverAction.cpp b/src/game/playerbot/strategy/actions/TalkToQuestGiverAction.cpp
new file mode 100644
index 00000000000..576b8ee044e
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TalkToQuestGiverAction.cpp
@@ -0,0 +1,91 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TalkToQuestGiverAction.h"
+
+
+using namespace ai;
+
+void TalkToQuestGiverAction::ProcessQuest(Quest const* quest, WorldObject* questGiver)
+{
+    std::ostringstream out; out << "Quest ";
+
+    QuestStatus status = bot->GetQuestStatus(quest->GetQuestId());
+    switch (status)
+    {
+    case QUEST_STATUS_COMPLETE:
+        TurnInQuest(quest, questGiver, out);
+        break;
+    case QUEST_STATUS_INCOMPLETE:
+        out << "|cffff0000Incompleted|r";
+        break;
+    case QUEST_STATUS_AVAILABLE:
+    case QUEST_STATUS_NONE:
+        out << "|cff00ff00Available|r";
+        break;
+    case QUEST_STATUS_FAILED:
+        out << "|cffff0000Failed|r";
+        break;
+    }
+
+    out << ": " << chat->formatQuest(quest);
+    ai->TellMaster(out);
+}
+
+void TalkToQuestGiverAction::TurnInQuest(Quest const* quest, WorldObject* questGiver, ostringstream& out) 
+{
+    uint32 questID = quest->GetQuestId();
+        
+    if (bot->GetQuestRewardStatus(questID))
+        return;
+
+    if (quest->GetRewChoiceItemsCount() == 0)
+        RewardNoItem(quest, questGiver, out);
+    else if (quest->GetRewChoiceItemsCount() == 1)
+        RewardSingleItem(quest, questGiver, out);
+    else {
+        AskToSelectReward(quest, out);
+    }
+}
+
+void TalkToQuestGiverAction::RewardNoItem(Quest const* quest, WorldObject* questGiver, ostringstream& out) 
+{
+    if (bot->CanRewardQuest(quest, false))
+    {
+        bot->RewardQuest(quest, 0, questGiver, false);
+        out << "Completed";
+    }
+    else
+    {
+        out << "|cffff0000Unable to turn in|r";
+    }
+}
+
+void TalkToQuestGiverAction::RewardSingleItem(Quest const* quest, WorldObject* questGiver, ostringstream& out) 
+{
+    int index = 0;
+    ItemPrototype const *item = sObjectMgr.GetItemPrototype(quest->RewChoiceItemId[index]);
+    if (bot->CanRewardQuest(quest, index, false))
+    {
+        bot->RewardQuest(quest, index, questGiver, true);
+
+        out << "Rewarded " << chat->formatItem(item);
+    }
+    else
+    {
+        out << "|cffff0000Unable to turn in:|r, reward: " << chat->formatItem(item);
+    }
+}
+
+void TalkToQuestGiverAction::AskToSelectReward(Quest const* quest, ostringstream& out) 
+{
+    ostringstream msg;
+    msg << "Choose reward: ";
+    for (uint8 i=0; i < quest->GetRewChoiceItemsCount(); ++i)
+    {
+        ItemPrototype const* item = sObjectMgr.GetItemPrototype(quest->RewChoiceItemId[i]);
+        msg << chat->formatItem(item);
+    }
+    ai->TellMaster(msg);
+
+    out << "Reward pending";
+}
diff --git a/src/game/playerbot/strategy/actions/TalkToQuestGiverAction.h b/src/game/playerbot/strategy/actions/TalkToQuestGiverAction.h
new file mode 100644
index 00000000000..374dc69cabc
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TalkToQuestGiverAction.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "../Action.h"
+#include "QuestAction.h"
+
+namespace ai
+{
+    class TalkToQuestGiverAction : public QuestAction {
+    public:
+        TalkToQuestGiverAction(PlayerbotAI* ai) : QuestAction(ai, "talk to quest giver") {}
+
+    protected:
+        virtual void ProcessQuest(Quest const* quest, WorldObject* questGiver);
+
+    private:
+        void TurnInQuest(Quest const* quest, WorldObject* questGiver, ostringstream& out);
+        void RewardNoItem(Quest const* quest, WorldObject* questGiver, ostringstream& out);
+        void RewardSingleItem(Quest const* quest, WorldObject* questGiver, ostringstream& out);
+        void AskToSelectReward(Quest const* quest, ostringstream& out);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/TaxiAction.cpp b/src/game/playerbot/strategy/actions/TaxiAction.cpp
new file mode 100644
index 00000000000..80376793ae9
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TaxiAction.cpp
@@ -0,0 +1,51 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TaxiAction.h"
+#include "../values/LastMovementValue.h"
+
+using namespace ai;
+
+bool TaxiAction::Execute(Event event)
+{
+    ai->RemoveShapeshift();
+
+    LastMovement& movement = context->GetValue<LastMovement&>("last movement")->Get();
+
+    WorldPacket& p = event.getPacket();
+	if (!p.empty() && p.GetOpcode() == CMSG_MOVE_SPLINE_DONE)
+    {
+        WorldPacket p1(p);
+        p1.rpos(0);
+        bot->GetSession()->HandleMoveSplineDoneOpcode(p1);
+        movement.taxiNodes.clear();
+        movement.Set(NULL);
+        return true;
+    }
+
+    list<ObjectGuid> units = *context->GetValue<list<ObjectGuid> >("nearest npcs");
+    for (list<ObjectGuid>::iterator i = units.begin(); i != units.end(); i++)
+    {
+        Creature *npc = bot->GetNPCIfCanInteractWith(*i, UNIT_NPC_FLAG_FLIGHTMASTER);
+        if (!npc)
+            continue;
+
+        if (movement.taxiNodes.empty())
+        {
+            ostringstream out;
+            out << "I will order the taxi from " << npc->GetName() << ". Please start flying, then instruct me again";
+            ai->TellMaster(out);
+            return true;
+        }
+
+        if (!bot->ActivateTaxiPathTo(movement.taxiNodes, npc))
+        {
+            ai->TellMaster("I can't fly with you");
+            return false;
+        }
+
+        return true;
+    }
+
+    ai->TellMaster("Cannot find any flightmaster to talk");
+    return false;
+}
diff --git a/src/game/playerbot/strategy/actions/TaxiAction.h b/src/game/playerbot/strategy/actions/TaxiAction.h
new file mode 100644
index 00000000000..84bbe4dda81
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TaxiAction.h
@@ -0,0 +1,13 @@
+#pragma once
+
+namespace ai
+{
+	class TaxiAction : public Action {
+	public:
+		TaxiAction(PlayerbotAI* ai) : Action(ai, "taxi") {}
+
+    public:
+        virtual bool Execute(Event event);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/TeleportAction.cpp b/src/game/playerbot/strategy/actions/TeleportAction.cpp
new file mode 100644
index 00000000000..930f7e03146
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TeleportAction.cpp
@@ -0,0 +1,54 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TeleportAction.h"
+#include "../values/LastMovementValue.h"
+
+using namespace ai;
+
+bool TeleportAction::Execute(Event event)
+{
+    list<ObjectGuid> gos = *context->GetValue<list<ObjectGuid> >("nearest game objects");
+    for (list<ObjectGuid>::iterator i = gos.begin(); i != gos.end(); i++)
+    {
+        GameObject* go = ai->GetGameObject(*i);
+        if (!go)
+            continue;
+
+        GameObjectInfo const *goInfo = go->GetGOInfo();
+        if (goInfo->type != GAMEOBJECT_TYPE_SPELLCASTER)
+            continue;
+
+        uint32 spellId = goInfo->spellcaster.spellId;
+        const SpellEntry* const pSpellInfo = sSpellStore.LookupEntry(spellId);
+        if (pSpellInfo->Effect[0] != SPELL_EFFECT_TELEPORT_UNITS && pSpellInfo->Effect[1] != SPELL_EFFECT_TELEPORT_UNITS && pSpellInfo->Effect[2] != SPELL_EFFECT_TELEPORT_UNITS)
+            continue;
+
+        ostringstream out; out << "Teleporting using " << goInfo->name;
+        ai->TellMasterNoFacing(out.str());
+
+        ai->ChangeStrategy("-follow,+stay", BOT_STATE_NON_COMBAT);
+
+        Spell *spell = new Spell(bot, pSpellInfo, false);
+        SpellCastTargets targets;
+        targets.setUnitTarget(bot);
+        spell->prepare(&targets, false);
+        spell->cast(true);
+        return true;
+    }
+
+
+    LastMovement& movement = context->GetValue<LastMovement&>("last movement")->Get();
+    if (movement.lastAreaTrigger)
+    {
+        WorldPacket p(CMSG_AREATRIGGER);
+        p << movement.lastAreaTrigger;
+        p.rpos(0);
+
+        bot->GetSession()->HandleAreaTriggerOpcode(p);
+        movement.lastAreaTrigger = 0;
+        return true;
+    }
+
+    ai->TellMaster("Cannot find any portal to teleport");
+    return false;
+}
diff --git a/src/game/playerbot/strategy/actions/TeleportAction.h b/src/game/playerbot/strategy/actions/TeleportAction.h
new file mode 100644
index 00000000000..96b59739818
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TeleportAction.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../Action.h"
+#include "MovementActions.h"
+
+namespace ai
+{
+	class TeleportAction : public Action {
+	public:
+		TeleportAction(PlayerbotAI* ai) : Action(ai, "teleport") {}
+
+    public:
+        virtual bool Execute(Event event);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/TellCastFailedAction.cpp b/src/game/playerbot/strategy/actions/TellCastFailedAction.cpp
new file mode 100644
index 00000000000..50ff3ceddc7
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TellCastFailedAction.cpp
@@ -0,0 +1,71 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TellCastFailedAction.h"
+
+
+using namespace ai;
+
+bool TellCastFailedAction::Execute(Event event)
+{
+    WorldPacket p(event.getPacket());
+    p.rpos(0);
+    uint8 castCount, result;
+    uint32 spellId;
+    p >> castCount >> spellId >> result;
+    ai->SpellInterrupted(spellId);
+
+    if (result == SPELL_CAST_OK)
+        return false;
+
+    const SpellEntry *const pSpellInfo =  sSpellStore.LookupEntry(spellId);
+    ostringstream out; out << chat->formatSpell(pSpellInfo) << ": ";
+    switch (result)
+    {
+    case SPELL_FAILED_NOT_READY:
+        out << "not ready";
+        break;
+    case SPELL_FAILED_REQUIRES_SPELL_FOCUS:
+        out << "requires spell focus";
+        break;
+    case SPELL_FAILED_REQUIRES_AREA:
+        out << "cannot cast here";
+        break;
+    case SPELL_FAILED_TOTEMS:
+    case SPELL_FAILED_TOTEM_CATEGORY:
+        out << "requires totem";
+        break;
+    case SPELL_FAILED_EQUIPPED_ITEM_CLASS:
+        out << "requires item";
+        break;
+    case SPELL_FAILED_EQUIPPED_ITEM_CLASS_MAINHAND:
+    case SPELL_FAILED_EQUIPPED_ITEM_CLASS_OFFHAND:
+        out << "requires weapon";
+        break;
+    case SPELL_FAILED_PREVENTED_BY_MECHANIC:
+        out << "interrupted";
+        break;
+    default:
+        out << "cannot cast";
+    }
+    int32 castTime = GetSpellCastTime(pSpellInfo);
+    if (castTime >= 2000)
+        ai->TellMasterNoFacing(out.str());
+    return true;
+}
+
+
+bool TellSpellAction::Execute(Event event)
+{
+    string spell = event.getParam();
+    uint32 spellId = AI_VALUE2(uint32, "spell id", spell);
+    if (!spellId)
+        return false;
+
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
+    if (!spellInfo)
+        return false;
+
+    ostringstream out; out << chat->formatSpell(spellInfo);
+    ai->TellMaster(out);
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/TellCastFailedAction.h b/src/game/playerbot/strategy/actions/TellCastFailedAction.h
new file mode 100644
index 00000000000..e4545961112
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TellCastFailedAction.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class TellSpellAction : public Action
+    {
+    public:
+        TellSpellAction(PlayerbotAI* ai) : Action(ai, "spell") {}
+
+        virtual bool Execute(Event event);
+    };
+
+    class TellCastFailedAction : public Action 
+    {
+    public:
+        TellCastFailedAction(PlayerbotAI* ai) : Action(ai, "tell cast failed") {}
+
+        virtual bool Execute(Event event);
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/TellItemCountAction.cpp b/src/game/playerbot/strategy/actions/TellItemCountAction.cpp
new file mode 100644
index 00000000000..2d55c0e5703
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TellItemCountAction.cpp
@@ -0,0 +1,16 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TellItemCountAction.h"
+#include "../values/ItemCountValue.h"
+
+using namespace ai;
+
+bool TellItemCountAction::Execute(Event event)
+{
+    string text = event.getParam();
+    list<Item*> found = parseItems(text);
+    for (list<Item*>::iterator i = found.begin(); i != found.end(); i++)
+        TellItem((*i)->GetProto(), (*i)->GetCount());
+
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/TellItemCountAction.h b/src/game/playerbot/strategy/actions/TellItemCountAction.h
new file mode 100644
index 00000000000..093b0e0464d
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TellItemCountAction.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class TellItemCountAction : public InventoryAction {
+    public:
+        TellItemCountAction(PlayerbotAI* ai) : InventoryAction(ai, "c") {}
+        virtual bool Execute(Event event);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/TellLosAction.cpp b/src/game/playerbot/strategy/actions/TellLosAction.cpp
new file mode 100644
index 00000000000..02227f994bf
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TellLosAction.cpp
@@ -0,0 +1,61 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TellLosAction.h"
+
+
+using namespace ai;
+
+bool TellLosAction::Execute(Event event)
+{
+    string param = event.getParam();
+
+    if (param.empty() || param == "targets")
+    {
+        list<ObjectGuid> targets = *context->GetValue<list<ObjectGuid> >("possible targets");
+        ListUnits("--- Targets ---", targets);
+    }
+
+    if (param.empty() || param == "npcs")
+    {
+        list<ObjectGuid> npcs = *context->GetValue<list<ObjectGuid> >("nearest npcs");
+        ListUnits("--- NPCs ---", npcs);
+    }
+
+    if (param.empty() || param == "corpses")
+    {
+        list<ObjectGuid> corpses = *context->GetValue<list<ObjectGuid> >("nearest corpses");
+        ListUnits("--- Corpses ---", corpses);
+    }
+
+    if (param.empty() || param == "gos" || param == "game objects")
+    {
+        list<ObjectGuid> gos = *context->GetValue<list<ObjectGuid> >("nearest game objects");
+        ListGameObjects("--- Game objects ---", gos);
+    }
+
+    return true;
+}
+
+void TellLosAction::ListUnits(string title, list<ObjectGuid> units)
+{
+    ai->TellMaster(title);
+
+    for (list<ObjectGuid>::iterator i = units.begin(); i != units.end(); i++)
+    {
+        Unit* unit = ai->GetUnit(*i);
+        if (unit)
+            ai->TellMaster(unit->GetName());
+    }
+
+}
+void TellLosAction::ListGameObjects(string title, list<ObjectGuid> gos)
+{
+    ai->TellMaster(title);
+
+    for (list<ObjectGuid>::iterator i = gos.begin(); i != gos.end(); i++)
+    {
+        GameObject* go = ai->GetGameObject(*i);
+        if (go)
+            ai->TellMaster(chat->formatGameobject(go));
+    }
+}
diff --git a/src/game/playerbot/strategy/actions/TellLosAction.h b/src/game/playerbot/strategy/actions/TellLosAction.h
new file mode 100644
index 00000000000..15d83fbc01d
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TellLosAction.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class TellLosAction : public Action {
+    public:
+        TellLosAction(PlayerbotAI* ai) : Action(ai, "los") {}
+        virtual bool Execute(Event event);
+
+    private:
+        void ListUnits(string title, list<ObjectGuid> units);
+        void ListGameObjects(string title, list<ObjectGuid> gos);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/TellMasterAction.h b/src/game/playerbot/strategy/actions/TellMasterAction.h
new file mode 100644
index 00000000000..4174708d573
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TellMasterAction.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class TellMasterAction : public Action {
+    public:
+        TellMasterAction(PlayerbotAI* ai, string text) : Action(ai, "tell master"), text(text) {}
+
+        virtual bool Execute(Event event)
+        {
+            ai->TellMaster(text);
+            return true;
+        }
+
+    private:
+        string text;
+    };
+
+    class OutOfReactRangeAction : public MovementAction {
+    public:
+        OutOfReactRangeAction(PlayerbotAI* ai) : MovementAction(ai, "tell out of react range") {}
+
+        virtual bool Execute(Event event)
+        {
+            bool canFollow = Follow(AI_VALUE(Unit*, "master target"));
+            if (!canFollow)
+            {
+                ai->SetNextCheckDelay(5000);
+                return false;
+            }
+
+            ai->TellMaster("Wait for me!");
+            return true;
+        }
+   };
+}
diff --git a/src/game/playerbot/strategy/actions/TellReputationAction.cpp b/src/game/playerbot/strategy/actions/TellReputationAction.cpp
new file mode 100644
index 00000000000..845e7860c93
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TellReputationAction.cpp
@@ -0,0 +1,73 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TellReputationAction.h"
+
+
+using namespace ai;
+
+bool TellReputationAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    ObjectGuid selection = master->GetSelectionGuid();
+    if (selection.IsEmpty())
+        return false;
+
+    MapPtr map = bot->GetMapPtr();
+    Unit* unit = map->GetUnit(selection);
+    map = MapPtr();
+    if (!unit)
+        return false;
+
+    const FactionTemplateEntry *factionTemplate = unit->getFactionTemplateEntry();
+    uint32 faction = factionTemplate->faction;
+    const FactionEntry* entry = sFactionStore.LookupEntry(faction);
+    int32 reputation = bot->GetReputationMgr().GetReputation(faction);
+
+    ostringstream out;
+    out << entry->name[0] << ": ";
+    out << "|cff";
+    ReputationRank rank = bot->GetReputationMgr().GetRank(entry);
+    switch (rank) {
+        case REP_HATED:
+            out << "cc2222hated";
+            break;
+        case REP_HOSTILE:
+            out << "ff0000hostile";
+            break;
+        case REP_UNFRIENDLY:
+            out << "ee6622unfriendly";
+            break;
+        case REP_NEUTRAL:
+            out << "ffff00neutral";
+            break;
+        case REP_FRIENDLY:
+            out << "00ff00friendly";
+            break;
+        case REP_HONORED:
+            out << "00ff88honored";
+            break;
+        case REP_REVERED:
+            out << "00ffccrevered";
+            break;
+        case REP_EXALTED:
+            out << "00ffffexalted";
+            break;
+        default:
+            out << "808080unknown";
+            break;
+    }
+
+    out << "|cffffffff";
+
+    int32 base = ReputationMgr::Reputation_Cap + 1;
+    for (int i = MAX_REPUTATION_RANK - 1; i >= rank; --i)
+        base -= ReputationMgr::PointsInRank[i];
+
+    out << " (" << (reputation - base) << "/" << ReputationMgr::PointsInRank[rank] << ")";
+    ai->TellMaster(out);
+
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/TellReputationAction.h b/src/game/playerbot/strategy/actions/TellReputationAction.h
new file mode 100644
index 00000000000..449e67f2d09
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TellReputationAction.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class TellReputationAction : public Action {
+    public:
+        TellReputationAction(PlayerbotAI* ai) : Action(ai, "reputation") {}
+        virtual bool Execute(Event event);
+
+    private:
+
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/TellTargetAction.cpp b/src/game/playerbot/strategy/actions/TellTargetAction.cpp
new file mode 100644
index 00000000000..cfa2049fbf0
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TellTargetAction.cpp
@@ -0,0 +1,54 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TellTargetAction.h"
+#include "../../../ThreatManager.h"
+
+
+using namespace ai;
+
+bool TellTargetAction::Execute(Event event)
+{
+    Unit* target = context->GetValue<Unit*>("current target")->Get();
+    if (target)
+    {
+        ostringstream out;
+		out << "Attacking " << target->GetName();
+        ai->TellMaster(out);
+
+        context->GetValue<Unit*>("old target")->Set(target);
+    }
+    return true;
+}
+
+bool TellAttackersAction::Execute(Event event)
+{
+    ai->TellMaster("--- Attackers ---");
+
+    list<ObjectGuid> attackers = context->GetValue<list<ObjectGuid> >("attackers")->Get();
+    for (list<ObjectGuid>::iterator i = attackers.begin(); i != attackers.end(); i++)
+    {
+        Unit* unit = ai->GetUnit(*i);
+        if (!unit || !unit->isAlive())
+            continue;
+
+        ai->TellMaster(unit->GetName());
+    }
+
+    ai->TellMaster("--- Threat ---");
+    HostileReference *ref = bot->getHostileRefManager().getFirst();
+    if (!ref)
+        return true;
+
+    while( ref )
+    {
+        ThreatManager *threatManager = ref->getSource();
+        Unit *unit = threatManager->getOwner();
+        float threat = ref->getThreat();
+
+        ostringstream out; out << unit->GetName() << " (" << threat << ")";
+        ai->TellMaster(out);
+
+        ref = ref->next();
+    }
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/TellTargetAction.h b/src/game/playerbot/strategy/actions/TellTargetAction.h
new file mode 100644
index 00000000000..799510096e4
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TellTargetAction.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+    class TellTargetAction : public Action
+    {
+    public:
+        TellTargetAction(PlayerbotAI* ai) : Action(ai, "tell target") {}
+        virtual bool Execute(Event event);
+    };
+
+    class TellAttackersAction : public Action
+    {
+    public:
+        TellAttackersAction(PlayerbotAI* ai) : Action(ai, "tell attackers") {}
+        virtual bool Execute(Event event);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/TradeAction.cpp b/src/game/playerbot/strategy/actions/TradeAction.cpp
new file mode 100644
index 00000000000..62f1c4586d2
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TradeAction.cpp
@@ -0,0 +1,83 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TradeAction.h"
+#include "../ItemVisitors.h"
+#include "../values/ItemCountValue.h"
+
+using namespace ai;
+
+bool TradeAction::Execute(Event event)
+{
+    string text = event.getParam();
+    uint32 copper = chat->parseMoney(text);
+    if (copper > 0)
+    {
+        WorldPacket* const packet = new WorldPacket(CMSG_SET_TRADE_GOLD, 4);
+        *packet << copper;
+        bot->GetSession()->QueuePacket(packet);
+    }
+
+    int8 slot = -1;
+
+    list<Item*> found = parseItems(text);
+    if (found.empty())
+        return false;
+
+    for (list<Item*>::iterator i = found.begin(); i != found.end(); i++)
+        TradeItem(**i, slot);
+
+    return true;
+}
+
+bool TradeAction::TradeItem(const Item& item, int8 slot)
+{
+    if (!bot->GetTrader() || item.IsInTrade())
+        return false;
+
+    if (!item.CanBeTraded() && slot != TRADE_SLOT_NONTRADED)
+        slot = TRADE_SLOT_NONTRADED;
+
+    int8 tradeSlot = -1;
+    Item* itemPtr = const_cast<Item*>(&item);
+
+    TradeData* pTrade = bot->GetTradeData();
+    if ((slot >= 0 && slot < TRADE_SLOT_COUNT) && pTrade->GetItem(TradeSlots(slot)) == NULL)
+        tradeSlot = slot;
+
+    if (slot == TRADE_SLOT_NONTRADED)
+        pTrade->SetItem(TRADE_SLOT_NONTRADED, itemPtr);
+    else
+    {
+        for (uint8 i = 0; i < TRADE_SLOT_TRADED_COUNT && tradeSlot == -1; i++)
+        {
+            if (pTrade->GetItem(TradeSlots(i)) == itemPtr)
+            {
+                tradeSlot = i;
+
+                WorldPacket* const packet = new WorldPacket(CMSG_CLEAR_TRADE_ITEM, 1);
+                *packet << (uint8) tradeSlot;
+                bot->GetSession()->QueuePacket(packet);
+                pTrade->SetItem(TradeSlots(i), NULL);
+                return true;
+            }
+        }
+
+        for (uint8 i = 0; i < TRADE_SLOT_TRADED_COUNT && tradeSlot == -1; i++)
+        {
+            if (pTrade->GetItem(TradeSlots(i)) == NULL)
+            {
+                pTrade->SetItem(TradeSlots(i), itemPtr);
+                tradeSlot = i;
+            }
+        }
+    }
+
+    if (tradeSlot == -1) return false;
+
+    WorldPacket* const packet = new WorldPacket(CMSG_SET_TRADE_ITEM, 3);
+    *packet << (uint8) tradeSlot << (uint8) item.GetBagSlot()
+        << (uint8) item.GetSlot();
+    bot->GetSession()->QueuePacket(packet);
+    return true;
+}
+
diff --git a/src/game/playerbot/strategy/actions/TradeAction.h b/src/game/playerbot/strategy/actions/TradeAction.h
new file mode 100644
index 00000000000..050a583deb2
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TradeAction.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class TradeAction : public InventoryAction {
+    public:
+        TradeAction(PlayerbotAI* ai) : InventoryAction(ai, "trade") {}
+        virtual bool Execute(Event event);
+
+    private:
+        bool TradeItem(const Item& item, int8 slot);
+
+        static map<string, uint32> slots;
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/TradeStatusAction.cpp b/src/game/playerbot/strategy/actions/TradeStatusAction.cpp
new file mode 100644
index 00000000000..f8cf57667ec
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TradeStatusAction.cpp
@@ -0,0 +1,171 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TradeStatusAction.h"
+
+#include "../ItemVisitors.h"
+#include "../../PlayerbotAIConfig.h"
+#include "../../../ahbot/AhBot.h"
+#include "../../RandomPlayerbotMgr.h"
+
+using namespace ai;
+
+
+
+bool TradeStatusAction::Execute(Event event)
+{
+    Player* trader = bot->GetTrader();
+    Player* master = GetMaster();
+    if (!trader)
+        return false;
+
+    if (trader != master)
+    {
+		bot->Whisper("I'm kind of busy now", LANG_UNIVERSAL, trader->GetObjectGuid());
+    }
+
+    if (trader != master || !ai->GetSecurity()->CheckLevelFor(PLAYERBOT_SECURITY_ALLOW_ALL, true, master))
+    {
+        WorldPacket p;
+        uint32 status = 0;
+        p << status;
+        bot->GetSession()->HandleCancelTradeOpcode(p);
+        return false;
+    }
+
+    WorldPacket p(event.getPacket());
+    p.rpos(0);
+    uint32 status;
+    p >> status;
+
+    if (status == TRADE_STATUS_TRADE_ACCEPT)
+    {
+        WorldPacket p;
+        uint32 status = 0;
+        p << status;
+
+        if (CheckTrade())
+        {
+            int32 botMoney = CalculateCost(bot->GetTradeData(), true);
+
+            bot->GetSession()->HandleAcceptTradeOpcode(p);
+            if (bot->GetTradeData())
+                return false;
+
+            if (sRandomPlayerbotMgr.IsRandomBot(bot))
+            {
+                int32 lootAmount = sRandomPlayerbotMgr.GetLootAmount(bot);
+                sRandomPlayerbotMgr.SetLootAmount(bot, max(0, lootAmount - botMoney * 10));
+            }
+            return true;
+        }
+    }
+    else if (status == TRADE_STATUS_BEGIN_TRADE)
+    {
+        if (!bot->isInFront(trader, sPlayerbotAIConfig.sightDistance, M_PI / 2))
+            bot->SetFacingToObject(trader);
+        BeginTrade();
+        return true;
+    }
+
+    return false;
+}
+
+
+void TradeStatusAction::BeginTrade()
+{
+    WorldPacket p;
+    bot->GetSession()->HandleBeginTradeOpcode(p);
+
+    ListItemsVisitor visitor;
+    IterateItems(&visitor);
+
+    ai->TellMaster("=== Trade ===");
+    TellItems(visitor.items);
+
+    if (sRandomPlayerbotMgr.IsRandomBot(bot))
+    {
+        uint32 discount = sRandomPlayerbotMgr.GetTradeDiscount(bot);
+        if (discount)
+        {
+            ostringstream out; out << "Free trade: " << chat->formatMoney(discount);
+            ai->TellMaster(out);
+        }
+    }
+}
+
+bool TradeStatusAction::CheckTrade()
+{
+    if (!sRandomPlayerbotMgr.IsRandomBot(bot))
+        return true;
+
+    Player* master = GetMaster();
+    if (!bot->GetTradeData() || !master->GetTradeData())
+        return false;
+
+    for (uint32 slot = 0; slot < TRADE_SLOT_TRADED_COUNT; ++slot)
+    {
+        Item* item = bot->GetTradeData()->GetItem((TradeSlots)slot);
+        if (item && !auctionbot.GetSellPrice(item->GetProto()))
+        {
+            ostringstream out;
+            out << chat->formatItem(item->GetProto()) << " - This is not for sale";
+            ai->TellMaster(out);
+            return false;
+        }
+
+        item = master->GetTradeData()->GetItem((TradeSlots)slot);
+        if (item && !auctionbot.GetBuyPrice(item->GetProto()))
+        {
+            ostringstream out;
+            out << chat->formatItem(item->GetProto()) << " - I don't need this";
+            ai->TellMaster(out);
+            return false;
+        }
+    }
+
+    int32 botMoney = CalculateCost(bot->GetTradeData(), true);
+    int32 playerMoney = CalculateCost(master->GetTradeData(), false);
+
+    int32 discount = sRandomPlayerbotMgr.GetTradeDiscount(bot);
+    botMoney = max(0, botMoney - discount);
+
+    if (playerMoney >= botMoney)
+        return true;
+
+    ostringstream out;
+    out << "I want " << chat->formatMoney(botMoney - playerMoney) << " for this";
+    ai->TellMaster(out);
+    return false;
+}
+
+int32 TradeStatusAction::CalculateCost(TradeData* data, bool sell)
+{
+    if (!data)
+        return 0;
+
+    uint32 sum = data->GetMoney();
+    for (uint32 slot = 0; slot < TRADE_SLOT_TRADED_COUNT; ++slot)
+    {
+        Item* item = data->GetItem((TradeSlots)slot);
+        if (!item)
+            continue;
+
+        ItemPrototype const* proto = item->GetProto();
+        if (!proto)
+            continue;
+
+        if (proto->Quality < ITEM_QUALITY_NORMAL)
+            return 0;
+
+        if (sell)
+        {
+            sum += item->GetCount() * auctionbot.GetSellPrice(proto) * sRandomPlayerbotMgr.GetSellMultiplier(bot);
+        }
+        else
+        {
+            sum += item->GetCount() * auctionbot.GetBuyPrice(proto) * sRandomPlayerbotMgr.GetBuyMultiplier(bot);
+        }
+    }
+
+    return sum;
+}
diff --git a/src/game/playerbot/strategy/actions/TradeStatusAction.h b/src/game/playerbot/strategy/actions/TradeStatusAction.h
new file mode 100644
index 00000000000..8298ca2b7e3
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TradeStatusAction.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class TradeStatusAction : public InventoryAction
+    {
+    public:
+        TradeStatusAction(PlayerbotAI* ai) : InventoryAction(ai, "accept trade") {}
+        virtual bool Execute(Event event);
+
+    private:
+        void BeginTrade();
+        bool CheckTrade();
+        int32 CalculateCost(TradeData* data, bool sell);
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/TrainerAction.cpp b/src/game/playerbot/strategy/actions/TrainerAction.cpp
new file mode 100644
index 00000000000..3095a8eee9d
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TrainerAction.cpp
@@ -0,0 +1,126 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TrainerAction.h"
+
+using namespace ai;
+
+void TrainerAction::Learn(uint32 cost, TrainerSpell const* tSpell, ostringstream& msg)
+{
+    if (bot->GetMoney() < cost)
+        return;
+
+    bot->ModifyMoney(-int32(cost));
+    if (tSpell->IsCastable())
+        bot->CastSpell(bot, tSpell->spell, true);
+    else
+        bot->learnSpell(tSpell->learnedSpell, false);
+
+    msg << " - learned";
+}
+
+void TrainerAction::List(Creature* creature, TrainerSpellAction action, SpellIds& spells)
+{
+    TellHeader(creature);
+
+    TrainerSpellData const* cSpells = creature->GetTrainerSpells();
+    TrainerSpellData const* tSpells = creature->GetTrainerTemplateSpells();
+    float fDiscountMod =  bot->GetReputationPriceDiscount(creature);
+    uint32 totalCost = 0;
+
+    TrainerSpellData const* trainer_spells = cSpells;
+    if (!trainer_spells)
+        trainer_spells = tSpells;
+
+    for (TrainerSpellMap::const_iterator itr =  trainer_spells->spellList.begin(); itr !=  trainer_spells->spellList.end(); ++itr)
+    {
+        TrainerSpell const* tSpell = &itr->second;
+
+        if (!tSpell)
+            continue;
+
+        uint32 reqLevel = 0;
+        if (!tSpell->learnedSpell && !bot->IsSpellFitByClassAndRace(tSpell->learnedSpell, &reqLevel))
+            continue;
+
+        if  (sSpellMgr.IsPrimaryProfessionFirstRankSpell(tSpell->learnedSpell) && bot->HasSpell(tSpell->learnedSpell))
+            continue;
+
+        reqLevel = tSpell->isProvidedReqLevel ? tSpell->reqLevel : std::max(reqLevel, tSpell->reqLevel);
+        TrainerSpellState state = bot->GetTrainerSpellState(tSpell, reqLevel);
+        if (state != TRAINER_SPELL_GREEN)
+            continue;
+
+        uint32 spellId = tSpell->spell;
+        const SpellEntry *const pSpellInfo =  sSpellStore.LookupEntry(spellId);
+        if (!pSpellInfo)
+            continue;
+
+        uint32 cost = uint32(floor(tSpell->spellCost *  fDiscountMod));
+        totalCost += cost;
+
+        ostringstream out;
+        out << chat->formatSpell(pSpellInfo) << chat->formatMoney(cost);
+
+        if (action && (spells.empty() || spells.find(tSpell->spell) != spells.end() || spells.find(tSpell->learnedSpell) != spells.end()))
+            (this->*action)(cost, tSpell, out);
+
+        ai->TellMaster(out);
+    }
+
+    TellFooter(totalCost);
+}
+
+
+bool TrainerAction::Execute(Event event)
+{
+    string text = event.getParam();
+
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    Creature *creature = ai->GetCreature(master->GetSelectionGuid());
+    if (!creature)
+        return false;
+
+    if (!creature->IsTrainerOf(bot, false))
+    {
+        return false;
+    }
+
+    // check present spell in trainer spell list
+    TrainerSpellData const* cSpells = creature->GetTrainerSpells();
+    TrainerSpellData const* tSpells = creature->GetTrainerTemplateSpells();
+    if (!cSpells && !tSpells)
+    {
+        ai->TellMaster("No spells can be learned from this trainer");
+        return false;
+    }
+
+    uint32 spell = chat->parseSpell(text);
+    SpellIds spells;
+    if (spell)
+        spells.insert(spell);
+
+    if (text == "learn")
+        List(creature, &TrainerAction::Learn, spells);
+    else
+        List(creature, NULL, spells);
+
+    return true;
+}
+
+void TrainerAction::TellHeader(Creature* creature)
+{
+    ostringstream out; out << "--- can learn from " << creature->GetName() << " ---";
+    ai->TellMaster(out);
+}
+
+void TrainerAction::TellFooter(uint32 totalCost)
+{
+    if (totalCost)
+    {
+        ostringstream out; out << "Total cost: " << chat->formatMoney(totalCost);
+        ai->TellMaster(out);
+    }
+}
diff --git a/src/game/playerbot/strategy/actions/TrainerAction.h b/src/game/playerbot/strategy/actions/TrainerAction.h
new file mode 100644
index 00000000000..3dbe18f0916
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/TrainerAction.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+	class TrainerAction : public Action {
+	public:
+		TrainerAction(PlayerbotAI* ai) : Action(ai, "trainer") {}
+
+    public:
+        virtual bool Execute(Event event);
+
+    private:
+        typedef void (TrainerAction::*TrainerSpellAction)(uint32, TrainerSpell const*, ostringstream& msg);
+        void List(Creature* creature, TrainerSpellAction action, SpellIds& spells);
+        void Learn(uint32 cost, TrainerSpell const* tSpell, ostringstream& msg);
+        void TellHeader(Creature* creature);
+        void TellFooter(uint32 totalCost);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/UnequipAction.cpp b/src/game/playerbot/strategy/actions/UnequipAction.cpp
new file mode 100644
index 00000000000..f1ad3291d92
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/UnequipAction.cpp
@@ -0,0 +1,45 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "UnequipAction.h"
+
+#include "../values/ItemCountValue.h"
+
+using namespace ai;
+
+bool UnequipAction::Execute(Event event)
+{
+    string text = event.getParam();
+
+    ItemIds ids = chat->parseItems(text);
+    for (ItemIds::iterator i =ids.begin(); i != ids.end(); i++)
+    {
+        FindItemByIdVisitor visitor(*i);
+        UnequipItem(&visitor);
+    }
+
+    return true;
+}
+
+
+void UnequipAction::UnequipItem(FindItemVisitor* visitor)
+{
+    IterateItems(visitor, ITERATE_ALL_ITEMS);
+    list<Item*> items = visitor->GetResult();
+	if (!items.empty()) UnequipItem(**items.begin());
+}
+
+void UnequipAction::UnequipItem(Item& item)
+{
+    uint8 bagIndex = item.GetBagSlot();
+    uint8 slot = item.GetSlot();
+    uint8 dstBag = NULL_BAG;
+
+
+    WorldPacket* const packet = new WorldPacket(CMSG_AUTOSTORE_BAG_ITEM, 3);
+    *packet << bagIndex << slot << dstBag;
+    bot->GetSession()->QueuePacket(packet);
+
+    ostringstream out; out << chat->formatItem(item.GetProto()) << " unequipped";
+    ai->TellMaster(out);
+}
+
diff --git a/src/game/playerbot/strategy/actions/UnequipAction.h b/src/game/playerbot/strategy/actions/UnequipAction.h
new file mode 100644
index 00000000000..fdf7ebb1cba
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/UnequipAction.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class UnequipAction : public InventoryAction {
+    public:
+        UnequipAction(PlayerbotAI* ai) : InventoryAction(ai, "unequip") {}
+        virtual bool Execute(Event event);
+
+    private:
+        void UnequipItem(Item& item);
+        void UnequipItem(FindItemVisitor* visitor);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/actions/UseItemAction.cpp b/src/game/playerbot/strategy/actions/UseItemAction.cpp
new file mode 100644
index 00000000000..994737d0734
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/UseItemAction.cpp
@@ -0,0 +1,312 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "UseItemAction.h"
+#include "../../../../shared/Database/DBCStore.h"
+
+using namespace ai;
+
+bool UseItemAction::Execute(Event event)
+{
+    string name = event.getParam();
+    if (name.empty())
+        name = getName();
+
+    list<Item*> items = AI_VALUE2(list<Item*>, "inventory items", name);
+    list<ObjectGuid> gos = chat->parseGameobjects(name);
+
+    if (gos.empty())
+    {
+        if (items.size() > 1)
+        {
+            list<Item*>::iterator i = items.begin();
+            Item* itemTarget = *i++;
+            Item* item = *i;
+            return UseItemOnItem(item, itemTarget);
+        }
+        else if (!items.empty())
+            return UseItemAuto(*items.begin());
+    }
+    else
+    {
+        if (items.empty())
+            return UseGameObject(*gos.begin());
+        else
+            return UseItemOnGameObject(*items.begin(), *gos.begin());
+    }
+
+    ai->TellMaster("No items (or game objects) available");
+    return false;
+}
+
+bool UseItemAction::UseGameObject(ObjectGuid guid)
+{
+    GameObject* go = ai->GetGameObject(guid);
+    if (!go || !go->isSpawned())
+        return false;
+
+    go->Use(bot);
+    ostringstream out; out << "Using " << chat->formatGameobject(go);
+    ai->TellMasterNoFacing(out.str());
+    return true;
+}
+
+bool UseItemAction::UseItemAuto(Item* item)
+{
+    return UseItem(item, ObjectGuid(), NULL);
+}
+
+bool UseItemAction::UseItemOnGameObject(Item* item, ObjectGuid go)
+{
+    return UseItem(item, go, NULL);
+}
+
+bool UseItemAction::UseItemOnItem(Item* item, Item* itemTarget)
+{
+    return UseItem(item, ObjectGuid(), itemTarget);
+}
+
+bool UseItemAction::UseItem(Item* item, ObjectGuid goGuid, Item* itemTarget)
+{
+    if (bot->CanUseItem(item) != EQUIP_ERR_OK)
+        return false;
+
+    if (bot->IsNonMeleeSpellCasted(true))
+        return false;
+
+    if (bot->isInCombat())
+    {
+        for(int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
+        {
+            SpellEntry const *spellInfo = sSpellStore.LookupEntry(item->GetProto()->Spells[i].SpellId);
+            if (spellInfo && IsNonCombatSpell(spellInfo))
+                return false;
+        }
+
+        if (item->IsPotion() && bot->GetLastPotionId())
+            return false;
+    }
+
+    uint8 bagIndex = item->GetBagSlot();
+    uint8 slot = item->GetSlot();
+    uint8 cast_count = 1;
+    uint64 item_guid = item->GetObjectGuid().GetRawValue();
+    uint32 glyphIndex = 0;
+    uint8 unk_flags = 0;
+
+    WorldPacket* const packet = new WorldPacket(CMSG_USE_ITEM, 1 + 1 + 1 + 4 + 8 + 4 + 1 + 8 + 1);
+    *packet << bagIndex << slot << cast_count << uint32(0) << item_guid
+        << glyphIndex << unk_flags;
+
+    bool targetSelected = false;
+    ostringstream out; out << "Using " << chat->formatItem(item->GetProto());
+    if (item->GetProto()->Stackable)
+    {
+        uint32 count = item->GetCount();
+        if (count > 1)
+            out << " (" << count << " available) ";
+        else
+            out << " (the last one!)";
+    }
+
+    if (goGuid)
+    {
+        GameObject* go = ai->GetGameObject(goGuid);
+        if (go && go->isSpawned())
+        {
+            uint32 targetFlag = TARGET_FLAG_OBJECT;
+            *packet << targetFlag << goGuid.WriteAsPacked();
+            out << " on " << chat->formatGameobject(go);
+            targetSelected = true;
+        }
+    }
+
+    if (itemTarget)
+    {
+        if (item->GetProto()->Class == ITEM_CLASS_GEM)
+        {
+            bool fit = SocketItem(itemTarget, item) || SocketItem(itemTarget, item, true);
+            if (!fit)
+                ai->TellMaster("Socket does not fit");
+            return fit;
+        }
+        else
+        {
+            uint32 targetFlag = TARGET_FLAG_ITEM;
+            *packet << targetFlag << itemTarget->GetPackGUID();
+            out << " on " << chat->formatItem(itemTarget->GetProto());
+            targetSelected = true;
+        }
+    }
+
+    Player* master = GetMaster();
+    if (!targetSelected && item->GetProto()->Class != ITEM_CLASS_CONSUMABLE && master)
+    {
+        ObjectGuid masterSelection = master->GetSelectionGuid();
+        if (masterSelection)
+        {
+            Unit* unit = ai->GetUnit(masterSelection);
+            if (unit)
+            {
+                uint32 targetFlag = TARGET_FLAG_UNIT;
+                *packet << targetFlag << masterSelection.WriteAsPacked();
+                out << " on " << unit->GetName();
+                targetSelected = true;
+            }
+        }
+    }
+
+    if(uint32 questid = item->GetProto()->StartQuest)
+    {
+        Quest const* qInfo = sObjectMgr.GetQuestTemplate(questid);
+        if (qInfo)
+        {
+            WorldPacket* const packet = new WorldPacket(CMSG_QUESTGIVER_ACCEPT_QUEST, 8+4+4);
+            *packet << item_guid;
+            *packet << questid;
+            *packet << uint32(0);
+            bot->GetSession()->QueuePacket(packet); // queue the packet to get around race condition
+            ostringstream out; out << "Got quest " << chat->formatQuest(qInfo);
+            ai->TellMasterNoFacing(out.str());
+            return true;
+        }
+    }
+
+    MotionMaster &mm = *bot->GetMotionMaster();
+    mm.Clear();
+    bot->clearUnitState( UNIT_STAT_CHASE );
+    bot->clearUnitState( UNIT_STAT_FOLLOW );
+
+    if (bot->isMoving())
+        return false;
+
+    for (int i=0; i<MAX_ITEM_PROTO_SPELLS; i++)
+    {
+        uint32 spellId = item->GetProto()->Spells[i].SpellId;
+        if (!spellId)
+            continue;
+
+        if (!ai->CanCastSpell(spellId, bot, false))
+            continue;
+
+        const SpellEntry* const pSpellInfo = sSpellStore.LookupEntry(spellId);
+        if (pSpellInfo->Targets & TARGET_FLAG_ITEM)
+        {
+            Item* itemForSpell = AI_VALUE2(Item*, "item for spell", spellId);
+            if (!itemForSpell)
+                continue;
+
+            if (itemForSpell->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT))
+                continue;
+
+            if (bot->GetTrader())
+            {
+                if (selfOnly)
+                    return false;
+
+                *packet << TARGET_FLAG_TRADE_ITEM << (uint8)1 << (uint64)TRADE_SLOT_NONTRADED;
+                targetSelected = true;
+                out << " on traded item";
+                ai->WaitForSpellCast(spellId);
+            }
+            else
+            {
+                *packet << TARGET_FLAG_ITEM;
+                *packet << itemForSpell->GetPackGUID();
+                targetSelected = true;
+                out << " on "<< chat->formatItem(itemForSpell->GetProto());
+                ai->WaitForSpellCast(spellId);
+            }
+        }
+        else
+        {
+            *packet << TARGET_FLAG_SELF;
+            targetSelected = true;
+            out << " on self";
+        }
+        break;
+    }
+
+    if (!targetSelected)
+        return false;
+
+    if (item->GetProto()->Class == ITEM_CLASS_CONSUMABLE && item->GetProto()->SubClass == ITEM_SUBCLASS_FOOD)
+    {
+        if (bot->isInCombat())
+            return false;
+
+        ai->InterruptSpell();
+        ai->SetNextCheckDelay(30000);
+    }
+
+    ai->TellMasterNoFacing(out.str());
+    bot->GetSession()->QueuePacket(packet);
+    return true;
+}
+
+bool UseItemAction::SocketItem(Item* item, Item* gem, bool replace)
+{
+    WorldPacket* const packet = new WorldPacket(CMSG_SOCKET_GEMS);
+    *packet << item->GetObjectGuid();
+
+    bool fits = false;
+    for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT + MAX_GEM_SOCKETS; ++enchant_slot)
+    {
+        uint8 SocketColor = item->GetProto()->Socket[enchant_slot-SOCK_ENCHANTMENT_SLOT].Color;
+        GemPropertiesEntry const* gemProperty = sGemPropertiesStore.LookupEntry(gem->GetProto()->GemProperties);
+        if (gemProperty && (gemProperty->color & SocketColor))
+        {
+            if (fits)
+            {
+                *packet << ObjectGuid();
+                continue;
+            }
+
+            uint32 enchant_id = item->GetEnchantmentId(EnchantmentSlot(enchant_slot));
+            if (!enchant_id)
+            {
+                *packet << gem->GetObjectGuid();
+                fits = true;
+                continue;
+            }
+
+            SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
+            if (!enchantEntry || !enchantEntry->GemID)
+            {
+                *packet << gem->GetObjectGuid();
+                fits = true;
+                continue;
+            }
+
+			if (replace && enchantEntry->GemID != gem->GetProto()->ItemId)
+            {
+                *packet << gem->GetObjectGuid();
+                fits = true;
+                continue;
+            }
+
+        }
+
+        *packet << ObjectGuid();
+    }
+
+    if (fits)
+    {
+        ostringstream out; out << "Socketing " << chat->formatItem(item->GetProto());
+        out << " with "<< chat->formatItem(gem->GetProto());
+        ai->TellMasterNoFacing(out.str());
+
+        bot->GetSession()->QueuePacket(packet);
+    }
+    return fits;
+}
+
+
+bool UseItemAction::isPossible()
+{
+    return getName() == "use" || AI_VALUE2(uint8, "item count", getName()) > 0;
+}
+
+bool UseSpellItemAction::isUseful()
+{
+    return AI_VALUE2(bool, "spell cast useful", getName());
+}
diff --git a/src/game/playerbot/strategy/actions/UseItemAction.h b/src/game/playerbot/strategy/actions/UseItemAction.h
new file mode 100644
index 00000000000..ef6556111e9
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/UseItemAction.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "../Action.h"
+
+namespace ai
+{
+	class UseItemAction : public Action {
+	public:
+		UseItemAction(PlayerbotAI* ai, string name = "use", bool selfOnly = false) : Action(ai, name), selfOnly(selfOnly) {}
+
+    public:
+        virtual bool Execute(Event event);
+        virtual bool isPossible();
+
+    private:
+        bool UseItemAuto(Item* item);
+        bool UseItemOnGameObject(Item* item, ObjectGuid go);
+        bool UseItemOnItem(Item* item, Item* itemTarget);
+        bool UseItem(Item* item, ObjectGuid go, Item* itemTarget);
+        bool UseGameObject(ObjectGuid guid);
+        bool SocketItem(Item* item, Item* gem, bool replace = false);
+
+    private:
+        bool selfOnly;
+    };
+
+    class UseSpellItemAction : public UseItemAction {
+    public:
+        UseSpellItemAction(PlayerbotAI* ai, string name, bool selfOnly = false) : UseItemAction(ai, name, selfOnly) {}
+
+    public:
+        virtual bool isUseful();
+    };
+
+    class UseHealingPotion : public UseItemAction {
+    public:
+        UseHealingPotion(PlayerbotAI* ai) : UseItemAction(ai, "healing potion") {}
+        virtual bool isUseful() { return AI_VALUE2(bool, "combat", "self target"); }
+    };
+
+    class UseManaPotion : public UseItemAction
+    {
+    public:
+        UseManaPotion(PlayerbotAI* ai) : UseItemAction(ai, "mana potion") {}
+        virtual bool isUseful() { return AI_VALUE2(bool, "combat", "self target"); }
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/UseMeetingStoneAction.cpp b/src/game/playerbot/strategy/actions/UseMeetingStoneAction.cpp
new file mode 100644
index 00000000000..a57a286fcae
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/UseMeetingStoneAction.cpp
@@ -0,0 +1,129 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "UseMeetingStoneAction.h"
+
+#include "../../../GridNotifiers.h"
+#include "../../../GridNotifiersImpl.h"
+#include "../../../CellImpl.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace MaNGOS
+{
+    class GameObjectByGuidInRangeCheck
+    {
+    public:
+        GameObjectByGuidInRangeCheck(WorldObject const* obj, ObjectGuid guid, float range) : i_obj(obj), i_range(range), i_guid(guid) {}
+        WorldObject const& GetFocusObject() const { return *i_obj; }
+        bool operator()(GameObject* u)
+        {
+            if (u && i_obj->IsWithinDistInMap(u, i_range) && u->isSpawned() && u->GetGOInfo() && u->GetObjectGuid() == i_guid)
+                return true;
+
+            return false;
+        }
+    private:
+        WorldObject const* i_obj;
+        float i_range;
+        ObjectGuid i_guid;
+    };
+};
+
+bool UseMeetingStoneAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    WorldPacket p(event.getPacket());
+    p.rpos(0);
+    ObjectGuid guid;
+    p >> guid;
+
+    if (master->GetSelectionGuid() && master->GetSelectionGuid() != bot->GetObjectGuid())
+        return false;
+
+    if (!master->GetSelectionGuid() && master->GetGroup() != bot->GetGroup())
+        return false;
+
+    if (master->IsBeingTeleported())
+        return false;
+
+    if (bot->IsInCombat())
+    {
+        ai->TellMasterNoFacing("I am in combat");
+        return false;
+    }
+
+    list<GameObject*> targets;
+
+    MaNGOS::GameObjectByGuidInRangeCheck u_check(master, guid, sPlayerbotAIConfig.sightDistance);
+    MaNGOS::GameObjectListSearcher<MaNGOS::GameObjectByGuidInRangeCheck> searcher(targets, u_check);
+    Cell::VisitAllObjects(master, searcher, sPlayerbotAIConfig.sightDistance);
+
+    GameObject* gameObject = NULL;
+    for(list<GameObject*>::iterator i = targets.begin(); i != targets.end(); i++)
+    {
+        GameObject* go = *i;
+        if (go && go->isSpawned())
+        {
+            gameObject = go;
+            break;
+        }
+    }
+
+    if (!gameObject)
+        return false;
+
+    const GameObjectInfo* goInfo = gameObject->GetGOInfo();
+    if (!goInfo || goInfo->type != GAMEOBJECT_TYPE_SUMMONING_RITUAL)
+        return false;
+
+    return Teleport();
+}
+
+
+bool SummonAction::Execute(Event event)
+{
+    Player* master = GetMaster();
+    if (!master)
+        return false;
+
+    if (master->GetSession()->GetSecurity() < SEC_GAMEMASTER)
+    {
+        ai->TellMasterNoFacing("You cannot summon me");
+        return false;
+    }
+
+    return Teleport();
+}
+
+bool SummonAction::Teleport()
+{
+    Player* master = GetMaster();
+    if (!master->IsBeingTeleported())
+    {
+        float followAngle = GetFollowAngle();
+        for (float angle = followAngle - M_PI; angle <= followAngle + M_PI; angle += M_PI / 4)
+        {
+            uint32 mapId = master->GetMapId();
+            float x = master->GetPositionX() + cos(angle) * sPlayerbotAIConfig.followDistance;
+            float y = master->GetPositionY()+ sin(angle) * sPlayerbotAIConfig.followDistance;
+            float z = master->GetPositionZ();
+            if (master->IsWithinLOS(x, y, z))
+            {
+                bot->GetMotionMaster()->Clear();
+                bot->TeleportTo(mapId, x, y, z, 0);
+                return true;
+            }
+        }
+    }
+
+    PlayerbotChatHandler ch(master);
+    if (!ch.teleport(*bot))
+    {
+        ai->TellMasterNoFacing("You cannot summon me");
+        return false;
+    }
+
+    return true;
+}
diff --git a/src/game/playerbot/strategy/actions/UseMeetingStoneAction.h b/src/game/playerbot/strategy/actions/UseMeetingStoneAction.h
new file mode 100644
index 00000000000..e787d24d4d2
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/UseMeetingStoneAction.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "../Action.h"
+#include "MovementActions.h"
+
+namespace ai
+{
+    class SummonAction : public MovementAction
+    {
+    public:
+        SummonAction(PlayerbotAI* ai, string name = "summon") : MovementAction(ai, name) {}
+
+        virtual bool Execute(Event event);
+
+    protected:
+        bool Teleport();
+    };
+
+    class UseMeetingStoneAction : public SummonAction
+    {
+    public:
+        UseMeetingStoneAction(PlayerbotAI* ai) : SummonAction(ai, "use meeting stone") {}
+
+        virtual bool Execute(Event event);
+    };
+}
diff --git a/src/game/playerbot/strategy/actions/WhoAction.cpp b/src/game/playerbot/strategy/actions/WhoAction.cpp
new file mode 100644
index 00000000000..6aabdb8fcfd
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/WhoAction.cpp
@@ -0,0 +1,160 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WhoAction.h"
+#include "../../AiFactory.h"
+#include "../ItemVisitors.h"
+#include "../../../ahbot/AhBot.h"
+#include "../../RandomPlayerbotMgr.h"
+
+using namespace ai;
+
+map<uint32, string> WhoAction::skills;
+
+#ifndef WIN32
+inline int strcmpi(const char* s1, const char* s2)
+{
+    for (; *s1 && *s2 && (toupper(*s1) == toupper(*s2)); ++s1, ++s2);
+    return *s1 - *s2;
+}
+#endif
+
+bool WhoAction::Execute(Event event)
+{
+    Player* owner = event.getOwner();
+    if (!owner)
+        return false;
+
+    string tell = "";
+    string text = event.getParam();
+    if (!text.empty())
+    {
+        if (!sRandomPlayerbotMgr.IsRandomBot(bot))
+            return false;
+
+        tell = QuerySkill(text);
+        if (tell.empty())
+        {
+            tell = QueryTrade(text);
+        }
+    }
+    else
+    {
+        tell = QuerySpec(text);
+    }
+
+    if (tell.empty())
+        return false;
+
+    // ignore random bot chat filter
+	bot->Whisper(tell, LANG_UNIVERSAL, owner->GetObjectGuid());
+    return true;
+}
+
+
+string WhoAction::QueryTrade(string text)
+{
+    ostringstream out;
+
+    list<Item*> items = InventoryAction::parseItems(text);
+    for (list<Item*>::iterator i = items.begin(); i != items.end(); ++i)
+    {
+        Item* sell = *i;
+        int32 sellPrice = auctionbot.GetSellPrice(sell->GetProto()) * sRandomPlayerbotMgr.GetSellMultiplier(bot) * sell->GetCount();
+        if (!sellPrice)
+            continue;
+
+        out << "Selling " << chat->formatItem(sell->GetProto(), sell->GetCount()) << " for " << chat->formatMoney(sellPrice);
+        return out.str();
+    }
+
+    return "";
+}
+
+string WhoAction::QuerySkill(string text)
+{
+    ostringstream out;
+    InitSkills();
+
+    for (map<uint32, string>::iterator i = skills.begin(); i != skills.end(); ++i)
+    {
+        string name = i->second;
+        uint16 skill = i->first;
+        if (!strcmpi(text.c_str(), name.c_str()) && bot->HasSkill(skill))
+        {
+            string skillName = i->second;
+            uint32 spellId = AI_VALUE2(uint32, "spell id", skillName);
+            uint16 value = bot->GetSkillValue(skill);
+            uint16 maxSkill = bot->GetMaxSkillValue(skill);
+            ObjectGuid guid = bot->GetObjectGuid();
+            string data = "0";
+            out << "|cFFFFFF00|Htrade:" << spellId << ":" << value << ":" << maxSkill << ":"
+                    << std::hex << std::uppercase << guid.GetRawValue()
+                    << std::nouppercase << std::dec << ":" << data
+                    << "|h[" << skills[skill] << "]|h|r"
+                    << " |h|cff00ff00" << value << "|h|cffffffff/"
+                    << "|h|cff00ff00" << maxSkill << "|h|cffffffff ";
+        }
+    }
+
+    return out.str();
+}
+
+string WhoAction::QuerySpec(string text)
+{
+    ostringstream out;
+
+    int spec = AiFactory::GetPlayerSpecTab(bot);
+    out << "|h|cffffffff" << chat->formatClass(bot, spec);
+    out << " (|h|cff00ff00" << bot->getLevel() << "|h|cffffffff lvl), ";
+    out << "|h|cff00ff00" << bot->GetEquipGearScore(false, false) << "|h|cffffffff GS (";
+
+    ItemCountByQuality visitor;
+    IterateItems(&visitor, ITERATE_ITEMS_IN_EQUIP);
+
+    bool needSlash = false;
+    if (visitor.count[ITEM_QUALITY_EPIC])
+    {
+        out << "|h|cffff00ff" << visitor.count[ITEM_QUALITY_EPIC] << "|h|cffffffff";
+        needSlash = true;
+    }
+
+    if (visitor.count[ITEM_QUALITY_RARE])
+    {
+        if (needSlash) out << "/";
+        out << "|h|cff8080ff" << visitor.count[ITEM_QUALITY_RARE] << "|h|cffffffff";
+        needSlash = true;
+    }
+
+    if (visitor.count[ITEM_QUALITY_UNCOMMON])
+    {
+        if (needSlash) out << "/";
+        out << "|h|cff00ff00" << visitor.count[ITEM_QUALITY_UNCOMMON] << "|h|cffffffff";
+        needSlash = true;
+    }
+
+    out << ")";
+
+    return out.str();
+}
+
+
+void WhoAction::InitSkills()
+{
+    if (!skills.empty())
+        return;
+
+    skills[SKILL_ALCHEMY] = "Alchemy";
+    skills[SKILL_ENCHANTING] = "Enchanting";
+    skills[SKILL_SKINNING] = "Skinning";
+    skills[SKILL_JEWELCRAFTING] = "Jewelcrafting";
+    skills[SKILL_INSCRIPTION] = "Inscription";
+    skills[SKILL_TAILORING] = "Tailoring";
+    skills[SKILL_LEATHERWORKING] = "Leatherworking";
+    skills[SKILL_ENGINEERING] = "Engineering";
+    skills[SKILL_HERBALISM] = "Herbalism";
+    skills[SKILL_MINING] = "Mining";
+    skills[SKILL_BLACKSMITHING] = "Blacksmithing";
+    skills[SKILL_COOKING] = "Cooking";
+    skills[SKILL_FIRST_AID] = "First Aid";
+    skills[SKILL_FISHING] = "Fishing";
+}
diff --git a/src/game/playerbot/strategy/actions/WhoAction.h b/src/game/playerbot/strategy/actions/WhoAction.h
new file mode 100644
index 00000000000..92ed834ace1
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/WhoAction.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "../Action.h"
+#include "InventoryAction.h"
+
+namespace ai
+{
+    class WhoAction : public InventoryAction {
+    public:
+        WhoAction(PlayerbotAI* ai) : InventoryAction(ai, "who") {}
+
+    public:
+        virtual bool Execute(Event event);
+        static map<uint32, string> skills;
+
+    private:
+        void InitSkills();
+        string QueryTrade(string text);
+        string QuerySkill(string text);
+        string QuerySpec(string text);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/actions/WorldPacketActionContext.h b/src/game/playerbot/strategy/actions/WorldPacketActionContext.h
new file mode 100644
index 00000000000..5864bb8aa04
--- /dev/null
+++ b/src/game/playerbot/strategy/actions/WorldPacketActionContext.h
@@ -0,0 +1,106 @@
+#pragma once;
+
+#include "AcceptInvitationAction.h"
+#include "PassLeadershipToMasterAction.h"
+#include "TellMasterAction.h"
+#include "TalkToQuestGiverAction.h"
+#include "AcceptQuestAction.h"
+#include "LootRollAction.h"
+#include "ReviveFromCorpseAction.h"
+#include "AcceptResurrectAction.h"
+#include "UseMeetingStoneAction.h"
+#include "AreaTriggerAction.h"
+#include "CheckMountStateAction.h"
+#include "RememberTaxiAction.h"
+#include "TradeStatusAction.h"
+#include "InventoryChangeFailureAction.h"
+#include "LootAction.h"
+#include "QuestAction.h"
+#include "LeaveGroupAction.h"
+#include "TellCastFailedAction.h"
+#include "AcceptDuelAction.h"
+#include "ReadyCheckAction.h"
+#include "LfgActions.h"
+#include "SecurityCheckAction.h"
+#include "GuildAcceptAction.h"
+
+namespace ai
+{
+    class WorldPacketActionContext : public NamedObjectContext<Action>
+    {
+    public:
+        WorldPacketActionContext()
+        {
+            creators["accept invitation"] = &WorldPacketActionContext::accept_invitation;
+            creators["leader"] = &WorldPacketActionContext::pass_leadership_to_master;
+            creators["tell not enough money"] = &WorldPacketActionContext::tell_not_enough_money;
+            creators["tell not enough reputation"] = &WorldPacketActionContext::tell_not_enough_reputation;
+            creators["tell cannot equip"] = &WorldPacketActionContext::tell_cannot_equip;
+            creators["talk to quest giver"] = &WorldPacketActionContext::turn_in_quest;
+            creators["accept quest"] = &WorldPacketActionContext::accept_quest;
+            creators["accept all quests"] = &WorldPacketActionContext::accept_all_quests;
+            creators["accept quest share"] = &WorldPacketActionContext::accept_quest_share;
+            creators["loot roll"] = &WorldPacketActionContext::loot_roll;
+            creators["revive from corpse"] = &WorldPacketActionContext::revive_from_corpse;
+            creators["accept resurrect"] = &WorldPacketActionContext::accept_resurrect;
+            creators["use meeting stone"] = &WorldPacketActionContext::use_meeting_stone;
+            creators["area trigger"] = &WorldPacketActionContext::area_trigger;
+            creators["reach area trigger"] = &WorldPacketActionContext::reach_area_trigger;
+            creators["check mount state"] = &WorldPacketActionContext::check_mount_state;
+            creators["remember taxi"] = &WorldPacketActionContext::remember_taxi;
+            creators["accept trade"] = &WorldPacketActionContext::accept_trade;
+            creators["store loot"] = &WorldPacketActionContext::store_loot;
+            creators["tell out of react range"] = &WorldPacketActionContext::tell_out_of_react_range;
+            creators["quest objective completed"] = &WorldPacketActionContext::quest_objective_completed;
+            creators["party command"] = &WorldPacketActionContext::party_command;
+            creators["tell cast failed"] = &WorldPacketActionContext::tell_cast_failed;
+            creators["accept duel"] = &WorldPacketActionContext::accept_duel;
+            creators["ready check"] = &WorldPacketActionContext::ready_check;
+            creators["ready check finished"] = &WorldPacketActionContext::ready_check_finished;
+            creators["uninvite"] = &WorldPacketActionContext::uninvite;
+            creators["lfg join"] = &WorldPacketActionContext::lfg_join;
+            creators["lfg accept"] = &WorldPacketActionContext::lfg_accept;
+            creators["lfg role check"] = &WorldPacketActionContext::lfg_role_check;
+            creators["lfg leave"] = &WorldPacketActionContext::lfg_leave;
+            creators["security check"] = &WorldPacketActionContext::security_check;
+            creators["guild accept"] = &WorldPacketActionContext::guild_accept;
+        }
+
+    private:
+        static Action* guild_accept(PlayerbotAI* ai) { return new GuildAcceptAction(ai); }
+        static Action* security_check(PlayerbotAI* ai) { return new SecurityCheckAction(ai); }
+        static Action* lfg_leave(PlayerbotAI* ai) { return new LfgLeaveAction(ai); }
+        static Action* lfg_accept(PlayerbotAI* ai) { return new LfgAcceptAction(ai); }
+        static Action* lfg_role_check(PlayerbotAI* ai) { return new LfgRoleCheckAction(ai); }
+        static Action* lfg_join(PlayerbotAI* ai) { return new LfgJoinAction(ai); }
+        static Action* uninvite(PlayerbotAI* ai) { return new UninviteAction(ai); }
+        static Action* ready_check_finished(PlayerbotAI* ai) { return new FinishReadyCheckAction(ai); }
+        static Action* ready_check(PlayerbotAI* ai) { return new ReadyCheckAction(ai); }
+        static Action* accept_duel(PlayerbotAI* ai) { return new AcceptDuelAction(ai); }
+        static Action* tell_cast_failed(PlayerbotAI* ai) { return new TellCastFailedAction(ai); }
+        static Action* party_command(PlayerbotAI* ai) { return new PartyCommandAction(ai); }
+        static Action* quest_objective_completed(PlayerbotAI* ai) { return new QuestObjectiveCompletedAction(ai); }
+        static Action* store_loot(PlayerbotAI* ai) { return new StoreLootAction(ai); }
+        static Action* tell_out_of_react_range(PlayerbotAI* ai) { return new OutOfReactRangeAction(ai); }
+        static Action* accept_trade(PlayerbotAI* ai) { return new TradeStatusAction(ai); }
+        static Action* remember_taxi(PlayerbotAI* ai) { return new RememberTaxiAction(ai); }
+        static Action* check_mount_state(PlayerbotAI* ai) { return new CheckMountStateAction(ai); }
+        static Action* area_trigger(PlayerbotAI* ai) { return new AreaTriggerAction(ai); }
+        static Action* reach_area_trigger(PlayerbotAI* ai) { return new ReachAreaTriggerAction(ai); }
+        static Action* use_meeting_stone(PlayerbotAI* ai) { return new UseMeetingStoneAction(ai); }
+        static Action* accept_resurrect(PlayerbotAI* ai) { return new AcceptResurrectAction(ai); }
+        static Action* revive_from_corpse(PlayerbotAI* ai) { return new ReviveFromCorpseAction(ai); }
+        static Action* accept_invitation(PlayerbotAI* ai) { return new AcceptInvitationAction(ai); }
+        static Action* pass_leadership_to_master(PlayerbotAI* ai) { return new PassLeadershipToMasterAction(ai); }
+        static Action* tell_not_enough_money(PlayerbotAI* ai) { return new TellMasterAction(ai, "Not enough money"); }
+        static Action* tell_not_enough_reputation(PlayerbotAI* ai) { return new TellMasterAction(ai, "Not enough reputation"); }
+        static Action* tell_cannot_equip(PlayerbotAI* ai) { return new InventoryChangeFailureAction(ai); }
+        static Action* turn_in_quest(PlayerbotAI* ai) { return new TalkToQuestGiverAction(ai); }
+        static Action* accept_quest(PlayerbotAI* ai) { return new AcceptQuestAction(ai); }
+        static Action* accept_all_quests(PlayerbotAI* ai) { return new AcceptAllQuestsAction(ai); }
+        static Action* accept_quest_share(PlayerbotAI* ai) { return new AcceptQuestShareAction(ai); }
+        static Action* loot_roll(PlayerbotAI* ai) { return (QueryItemUsageAction*)new LootRollAction(ai); }
+    };
+
+
+};
diff --git a/src/game/playerbot/strategy/druid/BearTankDruidStrategy.cpp b/src/game/playerbot/strategy/druid/BearTankDruidStrategy.cpp
new file mode 100644
index 00000000000..fa86bb14fc8
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/BearTankDruidStrategy.cpp
@@ -0,0 +1,171 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DruidMultipliers.h"
+#include "BearTankDruidStrategy.h"
+
+using namespace ai;
+
+class BearTankDruidStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    BearTankDruidStrategyActionNodeFactory()
+    {
+        creators["melee"] = &melee;
+        creators["feral charge - bear"] = &feral_charge_bear;
+        creators["swipe (bear)"] = &swipe_bear;
+        creators["faerie fire (feral)"] = &faerie_fire_feral;
+        creators["bear form"] = &bear_form;
+        creators["dire bear form"] = &dire_bear_form;
+        creators["mangle (bear)"] = &mangle_bear;
+        creators["maul"] = &maul;
+        creators["bash"] = &bash;
+        creators["swipe"] = &swipe;
+        creators["lacerate"] = &lacerate;
+        creators["demoralizing roar"] = &demoralizing_roar;
+    }
+private:
+    static ActionNode* melee(PlayerbotAI* ai)
+    {
+        return new ActionNode ("melee",
+            /*P*/ NextAction::array(0, new NextAction("feral charge - bear"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* feral_charge_bear(PlayerbotAI* ai)
+    {
+        return new ActionNode ("feral charge - bear",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("reach melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* swipe_bear(PlayerbotAI* ai)
+    {
+        return new ActionNode ("swipe (bear)",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* faerie_fire_feral(PlayerbotAI* ai)
+    {
+        return new ActionNode ("faerie fire (feral)",
+            /*P*/ NextAction::array(0, new NextAction("feral charge - bear"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* bear_form(PlayerbotAI* ai)
+    {
+        return new ActionNode ("bear form",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* dire_bear_form(PlayerbotAI* ai)
+    {
+        return new ActionNode ("dire bear form",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("bear form"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* mangle_bear(PlayerbotAI* ai)
+    {
+        return new ActionNode ("mangle (bear)",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("lacerate"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* maul(PlayerbotAI* ai)
+    {
+        return new ActionNode ("maul",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* bash(PlayerbotAI* ai)
+    {
+        return new ActionNode ("bash",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* swipe(PlayerbotAI* ai)
+    {
+        return new ActionNode ("swipe",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* lacerate(PlayerbotAI* ai)
+    {
+        return new ActionNode ("lacerate",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("maul"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* growl(PlayerbotAI* ai)
+    {
+        return new ActionNode ("growl",
+            /*P*/ NextAction::array(0, new NextAction("reach spell"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* demoralizing_roar(PlayerbotAI* ai)
+    {
+        return new ActionNode ("demoralizing roar",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+};
+
+BearTankDruidStrategy::BearTankDruidStrategy(PlayerbotAI* ai) : FeralDruidStrategy(ai)
+{
+    actionNodeFactories.Add(new BearTankDruidStrategyActionNodeFactory());
+}
+
+NextAction** BearTankDruidStrategy::getDefaultActions()
+{
+    return NextAction::array(0,
+            new NextAction("lacerate", ACTION_NORMAL + 4),
+            new NextAction("mangle (bear)", ACTION_NORMAL + 3),
+            new NextAction("maul", ACTION_NORMAL + 2),
+            new NextAction("faerie fire (feral)", ACTION_NORMAL + 1),
+            NULL);
+}
+
+void BearTankDruidStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    FeralDruidStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "thorns",
+        NextAction::array(0, new NextAction("thorns", ACTION_HIGH + 9), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "bear form",
+        NextAction::array(0, new NextAction("dire bear form", ACTION_HIGH + 8), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "faerie fire (feral)",
+        NextAction::array(0, new NextAction("faerie fire (feral)", ACTION_HIGH + 7), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "lose aggro",
+        NextAction::array(0, new NextAction("growl", ACTION_HIGH + 8), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("demoralizing roar", ACTION_HIGH + 6), new NextAction("swipe (bear)", ACTION_HIGH + 6), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "light aoe",
+        NextAction::array(0, new NextAction("swipe (bear)", ACTION_HIGH + 5), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "bash",
+        NextAction::array(0, new NextAction("bash", ACTION_INTERRUPT + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "bash on enemy healer",
+        NextAction::array(0, new NextAction("bash on enemy healer", ACTION_INTERRUPT + 1), NULL)));
+
+}
diff --git a/src/game/playerbot/strategy/druid/BearTankDruidStrategy.h b/src/game/playerbot/strategy/druid/BearTankDruidStrategy.h
new file mode 100644
index 00000000000..1e8a3f42ad3
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/BearTankDruidStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "FeralDruidStrategy.h"
+
+namespace ai
+{
+    class BearTankDruidStrategy : public FeralDruidStrategy
+    {
+    public:
+        BearTankDruidStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "bear"; }
+        virtual NextAction** getDefaultActions();
+		virtual int GetType() { return STRATEGY_TYPE_TANK | STRATEGY_TYPE_MELEE; }
+    };
+}
diff --git a/src/game/playerbot/strategy/druid/CasterDruidStrategy.cpp b/src/game/playerbot/strategy/druid/CasterDruidStrategy.cpp
new file mode 100644
index 00000000000..bb07940a2ee
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/CasterDruidStrategy.cpp
@@ -0,0 +1,177 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DruidMultipliers.h"
+#include "CasterDruidStrategy.h"
+#include "FeralDruidStrategy.h"
+
+using namespace ai;
+
+class CasterDruidStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    CasterDruidStrategyActionNodeFactory()
+    {
+        creators["faerie fire"] = &faerie_fire;
+        creators["hibernate"] = &hibernate;
+        creators["entangling roots"] = &entangling_roots;
+        creators["entangling roots on cc"] = &entangling_roots_on_cc;
+        creators["wrath"] = &wrath;
+        creators["starfall"] = &starfall;
+        creators["insect swarm"] = &insect_swarm;
+        creators["moonfire"] = &moonfire;
+        creators["starfire"] = &starfire;
+        creators["nature's grasp"] = &natures_grasp;
+    }
+private:
+    static ActionNode* faerie_fire(PlayerbotAI* ai)
+    {
+        return new ActionNode ("faerie fire",
+            /*P*/ NextAction::array(0, new NextAction("moonkin form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* hibernate(PlayerbotAI* ai)
+    {
+        return new ActionNode ("hibernate",
+            /*P*/ NextAction::array(0, new NextAction("moonkin form"), NULL),
+            /*A*/ NextAction::array(0, new NextAction("entangling roots"), NULL),
+            /*C*/ NextAction::array(0, new NextAction("flee", 49.0f), NULL));
+    }
+    static ActionNode* entangling_roots(PlayerbotAI* ai)
+    {
+        return new ActionNode ("entangling roots",
+            /*P*/ NextAction::array(0, new NextAction("moonkin form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NextAction::array(0, new NextAction("flee", 49.0f), NULL));
+    }
+    static ActionNode* entangling_roots_on_cc(PlayerbotAI* ai)
+    {
+        return new ActionNode ("entangling roots on cc",
+            /*P*/ NextAction::array(0, new NextAction("moonkin form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* wrath(PlayerbotAI* ai)
+    {
+        return new ActionNode ("wrath",
+            /*P*/ NextAction::array(0, new NextAction("moonkin form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* starfall(PlayerbotAI* ai)
+    {
+        return new ActionNode ("starfall",
+            /*P*/ NextAction::array(0, new NextAction("moonkin form"), NULL),
+            /*A*/ NextAction::array(0, new NextAction("hurricane"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* insect_swarm(PlayerbotAI* ai)
+    {
+        return new ActionNode ("insect swarm",
+            /*P*/ NextAction::array(0, new NextAction("moonkin form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* moonfire(PlayerbotAI* ai)
+    {
+        return new ActionNode ("moonfire",
+            /*P*/ NextAction::array(0, new NextAction("moonkin form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* starfire(PlayerbotAI* ai)
+    {
+        return new ActionNode ("starfire",
+            /*P*/ NextAction::array(0, new NextAction("moonkin form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* natures_grasp(PlayerbotAI* ai)
+    {
+        return new ActionNode ("nature's grasp",
+            /*P*/ NextAction::array(0, new NextAction("moonkin form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+};
+
+CasterDruidStrategy::CasterDruidStrategy(PlayerbotAI* ai) : GenericDruidStrategy(ai)
+{
+    actionNodeFactories.Add(new CasterDruidStrategyActionNodeFactory());
+    actionNodeFactories.Add(new ShapeshiftDruidStrategyActionNodeFactory());
+}
+
+NextAction** CasterDruidStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("starfire", ACTION_NORMAL + 2), new NextAction("wrath", ACTION_NORMAL + 1), NULL);
+}
+
+void CasterDruidStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericDruidStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "enemy out of spell",
+        NextAction::array(0, new NextAction("reach spell", ACTION_MOVE), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_MEDIUM_HEAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member medium health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_MEDIUM_HEAL + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "almost full health",
+        NextAction::array(0, new NextAction("rejuvenation", ACTION_LIGHT_HEAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member almost full health",
+        NextAction::array(0, new NextAction("rejuvenation on party", ACTION_LIGHT_HEAL + 1), NULL)));
+
+
+	triggers.push_back(new TriggerNode(
+		"insect swarm",
+		NextAction::array(0, new NextAction("insect swarm", ACTION_NORMAL + 5), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"moonfire",
+		NextAction::array(0, new NextAction("moonfire", ACTION_NORMAL + 4), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "eclipse (solar)",
+        NextAction::array(0, new NextAction("wrath", ACTION_NORMAL + 6), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "eclipse (lunar)",
+        NextAction::array(0, new NextAction("starfire", ACTION_NORMAL + 6), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "moonfire",
+        NextAction::array(0, new NextAction("moonfire", ACTION_NORMAL + 4), NULL)));
+
+
+
+	triggers.push_back(new TriggerNode(
+		"nature's grasp",
+		NextAction::array(0, new NextAction("nature's grasp", ACTION_EMERGENCY), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "entangling roots",
+        NextAction::array(0, new NextAction("entangling roots on cc", ACTION_HIGH + 2), NULL)));
+}
+
+void CasterDruidAoeStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+	triggers.push_back(new TriggerNode(
+		"high aoe",
+		NextAction::array(0, new NextAction("starfall", ACTION_HIGH + 1), NULL)));
+}
+
+void CasterDruidDebuffStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "faerie fire",
+        NextAction::array(0, new NextAction("faerie fire", ACTION_HIGH), NULL)));
+}
diff --git a/src/game/playerbot/strategy/druid/CasterDruidStrategy.h b/src/game/playerbot/strategy/druid/CasterDruidStrategy.h
new file mode 100644
index 00000000000..66ac8386baf
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/CasterDruidStrategy.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "GenericDruidStrategy.h"
+#include "../generic/CombatStrategy.h"
+
+namespace ai
+{
+    class CasterDruidStrategy : public GenericDruidStrategy
+    {
+    public:
+        CasterDruidStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "caster"; }
+        virtual NextAction** getDefaultActions();
+        virtual int GetType() { return STRATEGY_TYPE_COMBAT | STRATEGY_TYPE_DPS | STRATEGY_TYPE_RANGED; }
+    };
+
+    class CasterDruidAoeStrategy : public CombatStrategy
+    {
+    public:
+        CasterDruidAoeStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "caster aoe"; }
+    };
+
+    class CasterDruidDebuffStrategy : public CombatStrategy
+    {
+    public:
+        CasterDruidDebuffStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "caster debuff"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/druid/CatDpsDruidStrategy.cpp b/src/game/playerbot/strategy/druid/CatDpsDruidStrategy.cpp
new file mode 100644
index 00000000000..67515b71570
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/CatDpsDruidStrategy.cpp
@@ -0,0 +1,139 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DruidMultipliers.h"
+#include "CatDpsDruidStrategy.h"
+
+using namespace ai;
+
+class CatDpsDruidStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    CatDpsDruidStrategyActionNodeFactory()
+    {
+        creators["faerie fire (feral)"] = &faerie_fire_feral;
+        creators["melee"] = &melee;
+        creators["feral charge - cat"] = &feral_charge_cat;
+        creators["cat form"] = &cat_form;
+        creators["claw"] = &claw;
+        creators["mangle (cat)"] = &mangle_cat;
+        creators["rake"] = &rake;
+        creators["ferocious bite"] = &ferocious_bite;
+        creators["rip"] = &rip;
+    }
+private:
+    static ActionNode* faerie_fire_feral(PlayerbotAI* ai)
+    {
+        return new ActionNode ("faerie fire (feral)",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* melee(PlayerbotAI* ai)
+    {
+        return new ActionNode ("melee",
+            /*P*/ NextAction::array(0, new NextAction("feral charge - cat"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* feral_charge_cat(PlayerbotAI* ai)
+    {
+        return new ActionNode ("feral charge - cat",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("reach melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* cat_form(PlayerbotAI* ai)
+    {
+        return new ActionNode ("cat form",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* claw(PlayerbotAI* ai)
+    {
+        return new ActionNode ("claw",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* mangle_cat(PlayerbotAI* ai)
+    {
+        return new ActionNode ("mangle (cat)",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("claw"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* rake(PlayerbotAI* ai)
+    {
+        return new ActionNode ("rake",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* ferocious_bite(PlayerbotAI* ai)
+    {
+        return new ActionNode ("ferocious bite",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("rip"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* rip(PlayerbotAI* ai)
+    {
+        return new ActionNode ("rip",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+};
+
+CatDpsDruidStrategy::CatDpsDruidStrategy(PlayerbotAI* ai) : FeralDruidStrategy(ai)
+{
+    actionNodeFactories.Add(new CatDpsDruidStrategyActionNodeFactory());
+}
+
+NextAction** CatDpsDruidStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("mangle (cat)", ACTION_NORMAL + 1), NULL);
+}
+
+void CatDpsDruidStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    FeralDruidStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "cat form",
+        NextAction::array(0, new NextAction("cat form", ACTION_MOVE + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "rake",
+        NextAction::array(0, new NextAction("rake", ACTION_NORMAL + 5), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "combo points available",
+        NextAction::array(0, new NextAction("ferocious bite", ACTION_NORMAL + 9), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium threat",
+        NextAction::array(0, new NextAction("cower", ACTION_EMERGENCY + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "faerie fire (feral)",
+        NextAction::array(0, new NextAction("faerie fire (feral)", ACTION_HIGH + 1), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"tiger's fury",
+		NextAction::array(0, new NextAction("tiger's fury", ACTION_EMERGENCY + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "entangling roots",
+        NextAction::array(0, new NextAction("entangling roots on cc", ACTION_HIGH + 1), NULL)));
+
+}
+
+void CatAoeDruidStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("swipe (cat)", ACTION_HIGH + 2), NULL)));
+}
+
diff --git a/src/game/playerbot/strategy/druid/CatDpsDruidStrategy.h b/src/game/playerbot/strategy/druid/CatDpsDruidStrategy.h
new file mode 100644
index 00000000000..397f0b36e69
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/CatDpsDruidStrategy.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "FeralDruidStrategy.h"
+#include "../generic/CombatStrategy.h"
+
+namespace ai
+{
+    class CatDpsDruidStrategy : public FeralDruidStrategy
+    {
+    public:
+        CatDpsDruidStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "cat"; }
+        virtual NextAction** getDefaultActions();
+        virtual int GetType() { return STRATEGY_TYPE_COMBAT | STRATEGY_TYPE_MELEE; }
+    };
+
+    class CatAoeDruidStrategy : public CombatStrategy
+    {
+    public:
+        CatAoeDruidStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "cat aoe"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/druid/DruidActions.cpp b/src/game/playerbot/strategy/druid/DruidActions.cpp
new file mode 100644
index 00000000000..fc49e68c151
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/DruidActions.cpp
@@ -0,0 +1,31 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DruidActions.h"
+
+using namespace ai;
+
+bool CastCasterFormAction::Execute(Event event)
+{
+    ai->RemoveShapeshift();
+    return true;
+}
+
+NextAction** CastAbolishPoisonAction::getAlternatives()
+{
+    return NextAction::merge( NextAction::array(0, new NextAction("cure poison"), NULL), CastSpellAction::getPrerequisites());
+}
+
+NextAction** CastAbolishPoisonOnPartyAction::getAlternatives()
+{
+    return NextAction::merge( NextAction::array(0, new NextAction("cure poison on party"), NULL), CastSpellAction::getPrerequisites());
+}
+
+Value<Unit*>* CastEntanglingRootsCcAction::GetTargetValue()
+{
+    return context->GetValue<Unit*>("cc target", "entangling roots");
+}
+
+bool CastEntanglingRootsCcAction::Execute(Event event)
+{
+    return ai->CastSpell("entangling roots", GetTarget()); 
+}
diff --git a/src/game/playerbot/strategy/druid/DruidActions.h b/src/game/playerbot/strategy/druid/DruidActions.h
new file mode 100644
index 00000000000..965f4541f36
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/DruidActions.h
@@ -0,0 +1,205 @@
+#pragma once
+
+#include "../actions/GenericActions.h"
+#include "DruidShapeshiftActions.h"
+#include "DruidBearActions.h"
+#include "DruidCatActions.h"
+
+namespace ai
+{
+	class CastFaerieFireAction : public CastSpellAction
+	{
+	public:
+		CastFaerieFireAction(PlayerbotAI* ai) : CastSpellAction(ai, "faerie fire") {}
+	};
+
+    class CastFaerieFireFeralAction : public CastSpellAction
+    {
+    public:
+        CastFaerieFireFeralAction(PlayerbotAI* ai) : CastSpellAction(ai, "faerie fire (feral)") {}
+    };
+
+	class CastRejuvenationAction : public CastHealingSpellAction {
+	public:
+		CastRejuvenationAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "rejuvenation") {}
+	};
+
+	class CastRegrowthAction : public CastHealingSpellAction {
+	public:
+		CastRegrowthAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "regrowth") {}
+
+	};
+
+    class CastHealingTouchAction : public CastHealingSpellAction {
+    public:
+        CastHealingTouchAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "healing touch") {}
+
+    };
+
+    class CastRejuvenationOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastRejuvenationOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "rejuvenation") {}
+    };
+
+    class CastRegrowthOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastRegrowthOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "regrowth") {}
+    };
+
+    class CastHealingTouchOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastHealingTouchOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "healing touch") {}
+    };
+
+	class CastReviveAction : public ResurrectPartyMemberAction
+	{
+	public:
+		CastReviveAction(PlayerbotAI* ai) : ResurrectPartyMemberAction(ai, "revive") {}
+
+		virtual NextAction** getPrerequisites() {
+			return NextAction::merge( NextAction::array(0, new NextAction("caster form"), NULL), ResurrectPartyMemberAction::getPrerequisites());
+		}
+	};
+
+	class CastRebirthAction : public ResurrectPartyMemberAction
+	{
+	public:
+		CastRebirthAction(PlayerbotAI* ai) : ResurrectPartyMemberAction(ai, "rebirth") {}
+
+		virtual NextAction** getPrerequisites() {
+			return NextAction::merge( NextAction::array(0, new NextAction("caster form"), NULL), ResurrectPartyMemberAction::getPrerequisites());
+		}
+	};
+
+	class CastMarkOfTheWildAction : public CastBuffSpellAction {
+	public:
+		CastMarkOfTheWildAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "mark of the wild") {}
+	};
+
+	class CastMarkOfTheWildOnPartyAction : public BuffOnPartyAction {
+	public:
+		CastMarkOfTheWildOnPartyAction(PlayerbotAI* ai) : BuffOnPartyAction(ai, "mark of the wild") {}
+	};
+
+	class CastSurvivalInstinctsAction : public CastBuffSpellAction {
+	public:
+		CastSurvivalInstinctsAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "survival instincts") {}
+	};
+
+	class CastThornsAction : public CastBuffSpellAction {
+	public:
+		CastThornsAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "thorns") {}
+	};
+
+	class CastWrathAction : public CastSpellAction
+	{
+	public:
+		CastWrathAction(PlayerbotAI* ai) : CastSpellAction(ai, "wrath") {}
+	};
+
+	class CastStarfallAction : public CastSpellAction
+	{
+	public:
+		CastStarfallAction(PlayerbotAI* ai) : CastSpellAction(ai, "starfall") {}
+	};
+
+	class CastHurricaneAction : public CastSpellAction
+	{
+	public:
+	    CastHurricaneAction(PlayerbotAI* ai) : CastSpellAction(ai, "hurricane") {}
+	};
+
+	class CastMoonfireAction : public CastDebuffSpellAction
+	{
+	public:
+		CastMoonfireAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "moonfire") {}
+	};
+
+	class CastInsectSwarmAction : public CastDebuffSpellAction
+	{
+	public:
+		CastInsectSwarmAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "insect swarm") {}
+	};
+
+	class CastStarfireAction : public CastSpellAction
+	{
+	public:
+		CastStarfireAction(PlayerbotAI* ai) : CastSpellAction(ai, "starfire") {}
+	};
+
+	class CastEntanglingRootsAction : public CastSpellAction
+	{
+	public:
+		CastEntanglingRootsAction(PlayerbotAI* ai) : CastSpellAction(ai, "entangling roots") {}
+	};
+
+    class CastEntanglingRootsCcAction : public CastSpellAction
+    {
+    public:
+        CastEntanglingRootsCcAction(PlayerbotAI* ai) : CastSpellAction(ai, "entangling roots on cc") {}
+        virtual Value<Unit*>* GetTargetValue();
+        virtual bool Execute(Event event);
+    };
+
+	class CastNaturesGraspAction : public CastBuffSpellAction
+	{
+	public:
+		CastNaturesGraspAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "nature's grasp") {}
+	};
+
+	class CastHibernateAction : public CastSpellAction
+	{
+	public:
+		CastHibernateAction(PlayerbotAI* ai) : CastSpellAction(ai, "hibernate") {}
+	};
+
+	class CastCurePoisonAction : public CastCureSpellAction
+	{
+	public:
+		CastCurePoisonAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "cure poison") {}
+	};
+
+    class CastCurePoisonOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastCurePoisonOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "cure poison", DISPEL_POISON) {}
+    };
+
+	class CastAbolishPoisonAction : public CastCureSpellAction
+	{
+	public:
+		CastAbolishPoisonAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "abolish poison") {}
+		virtual NextAction** getAlternatives();
+	};
+
+    class CastAbolishPoisonOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastAbolishPoisonOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "abolish poison", DISPEL_POISON) {}
+
+        virtual NextAction** getAlternatives();
+    };
+
+    class CastBarskinAction : public CastBuffSpellAction
+    {
+    public:
+        CastBarskinAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "barskin") {}
+    };
+
+    class CastInnervateAction : public CastSpellAction
+    {
+    public:
+        CastInnervateAction(PlayerbotAI* ai) : CastSpellAction(ai, "innervate") {}
+
+        virtual string GetTargetName() { return "self target"; }
+    };
+
+    class CastTranquilityAction : public CastAoeHealSpellAction
+    {
+    public:
+        CastTranquilityAction(PlayerbotAI* ai) : CastAoeHealSpellAction(ai, "tranquility") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/druid/DruidAiObjectContext.cpp b/src/game/playerbot/strategy/druid/DruidAiObjectContext.cpp
new file mode 100644
index 00000000000..65c9fc90bb6
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/DruidAiObjectContext.cpp
@@ -0,0 +1,258 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DruidActions.h"
+#include "DruidAiObjectContext.h"
+#include "BearTankDruidStrategy.h"
+#include "CatDpsDruidStrategy.h"
+#include "CasterDruidStrategy.h"
+#include "GenericDruidNonCombatStrategy.h"
+#include "../NamedObjectContext.h"
+#include "DruidTriggers.h"
+#include "HealDruidStrategy.h"
+
+using namespace ai;
+
+namespace ai
+{
+    namespace druid
+    {
+        using namespace ai;
+
+        class StrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            StrategyFactoryInternal()
+            {
+                creators["nc"] = &druid::StrategyFactoryInternal::nc;
+                creators["cat aoe"] = &druid::StrategyFactoryInternal::cat_aoe;
+                creators["caster aoe"] = &druid::StrategyFactoryInternal::caster_aoe;
+                creators["caster debuff"] = &druid::StrategyFactoryInternal::caster_debuff;
+                creators["dps debuff"] = &druid::StrategyFactoryInternal::caster_debuff;
+            }
+
+        private:
+            static Strategy* nc(PlayerbotAI* ai) { return new GenericDruidNonCombatStrategy(ai); }
+            static Strategy* cat_aoe(PlayerbotAI* ai) { return new CatAoeDruidStrategy(ai); }
+            static Strategy* caster_aoe(PlayerbotAI* ai) { return new CasterDruidAoeStrategy(ai); }
+            static Strategy* caster_debuff(PlayerbotAI* ai) { return new CasterDruidDebuffStrategy(ai); }
+        };
+
+        class DruidStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            DruidStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["bear"] = &druid::DruidStrategyFactoryInternal::bear;
+                creators["tank"] = &druid::DruidStrategyFactoryInternal::bear;
+                creators["cat"] = &druid::DruidStrategyFactoryInternal::cat;
+                creators["caster"] = &druid::DruidStrategyFactoryInternal::caster;
+                creators["dps"] = &druid::DruidStrategyFactoryInternal::cat;
+                creators["heal"] = &druid::DruidStrategyFactoryInternal::heal;
+            }
+
+        private:
+            static Strategy* bear(PlayerbotAI* ai) { return new BearTankDruidStrategy(ai); }
+            static Strategy* cat(PlayerbotAI* ai) { return new CatDpsDruidStrategy(ai); }
+            static Strategy* caster(PlayerbotAI* ai) { return new CasterDruidStrategy(ai); }
+            static Strategy* heal(PlayerbotAI* ai) { return new HealDruidStrategy(ai); }
+        };
+    };
+};
+
+namespace ai
+{
+    namespace druid
+    {
+        using namespace ai;
+
+        class TriggerFactoryInternal : public NamedObjectContext<Trigger>
+        {
+        public:
+            TriggerFactoryInternal()
+            {
+                creators["thorns"] = &TriggerFactoryInternal::Thorns;
+                creators["bash"] = &TriggerFactoryInternal::bash;
+                creators["faerie fire (feral)"] = &TriggerFactoryInternal::faerie_fire_feral;
+                creators["faerie fire"] = &TriggerFactoryInternal::faerie_fire;
+                creators["insect swarm"] = &TriggerFactoryInternal::insect_swarm;
+                creators["moonfire"] = &TriggerFactoryInternal::moonfire;
+                creators["nature's grasp"] = &TriggerFactoryInternal::natures_grasp;
+                creators["tiger's fury"] = &TriggerFactoryInternal::tigers_fury;
+                creators["rake"] = &TriggerFactoryInternal::rake;
+                creators["mark of the wild"] = &TriggerFactoryInternal::mark_of_the_wild;
+                creators["mark of the wild on party"] = &TriggerFactoryInternal::mark_of_the_wild_on_party;
+                creators["cure poison"] = &TriggerFactoryInternal::cure_poison;
+                creators["party member cure poison"] = &TriggerFactoryInternal::party_member_cure_poison;
+                creators["entangling roots"] = &TriggerFactoryInternal::entangling_roots;
+                creators["bear form"] = &TriggerFactoryInternal::bear_form;
+                creators["cat form"] = &TriggerFactoryInternal::cat_form;
+                creators["tree form"] = &TriggerFactoryInternal::tree_form;
+                creators["eclipse (solar)"] = &TriggerFactoryInternal::eclipse_solar;
+                creators["eclipse (lunar)"] = &TriggerFactoryInternal::eclipse_lunar;
+                creators["bash on enemy healer"] = &TriggerFactoryInternal::bash_on_enemy_healer;
+            }
+
+        private:
+            static Trigger* eclipse_solar(PlayerbotAI* ai) { return new EclipseSolarTrigger(ai); }
+            static Trigger* eclipse_lunar(PlayerbotAI* ai) { return new EclipseLunarTrigger(ai); }
+            static Trigger* Thorns(PlayerbotAI* ai) { return new ThornsTrigger(ai); }
+            static Trigger* bash(PlayerbotAI* ai) { return new BashInterruptSpellTrigger(ai); }
+            static Trigger* faerie_fire_feral(PlayerbotAI* ai) { return new FaerieFireFeralTrigger(ai); }
+            static Trigger* insect_swarm(PlayerbotAI* ai) { return new InsectSwarmTrigger(ai); }
+            static Trigger* moonfire(PlayerbotAI* ai) { return new MoonfireTrigger(ai); }
+            static Trigger* faerie_fire(PlayerbotAI* ai) { return new FaerieFireTrigger(ai); }
+            static Trigger* natures_grasp(PlayerbotAI* ai) { return new NaturesGraspTrigger(ai); }
+            static Trigger* tigers_fury(PlayerbotAI* ai) { return new TigersFuryTrigger(ai); }
+            static Trigger* rake(PlayerbotAI* ai) { return new RakeTrigger(ai); }
+            static Trigger* mark_of_the_wild(PlayerbotAI* ai) { return new MarkOfTheWildTrigger(ai); }
+            static Trigger* mark_of_the_wild_on_party(PlayerbotAI* ai) { return new MarkOfTheWildOnPartyTrigger(ai); }
+            static Trigger* cure_poison(PlayerbotAI* ai) { return new CurePoisonTrigger(ai); }
+            static Trigger* party_member_cure_poison(PlayerbotAI* ai) { return new PartyMemberCurePoisonTrigger(ai); }
+            static Trigger* entangling_roots(PlayerbotAI* ai) { return new EntanglingRootsTrigger(ai); }
+            static Trigger* bear_form(PlayerbotAI* ai) { return new BearFormTrigger(ai); }
+            static Trigger* cat_form(PlayerbotAI* ai) { return new CatFormTrigger(ai); }
+            static Trigger* tree_form(PlayerbotAI* ai) { return new TreeFormTrigger(ai); }
+            static Trigger* bash_on_enemy_healer(PlayerbotAI* ai) { return new BashInterruptEnemyHealerSpellTrigger(ai); }
+        };
+    };
+};
+
+namespace ai
+{
+    namespace druid
+    {
+        using namespace ai;
+
+        class AiObjectContextInternal : public NamedObjectContext<Action>
+        {
+        public:
+            AiObjectContextInternal()
+            {
+                creators["feral charge - bear"] = &AiObjectContextInternal::feral_charge_bear;
+                creators["feral charge - cat"] = &AiObjectContextInternal::feral_charge_cat;
+                creators["swipe (bear)"] = &AiObjectContextInternal::swipe_bear;
+                creators["faerie fire (feral)"] = &AiObjectContextInternal::faerie_fire_feral;
+                creators["faerie fire"] = &AiObjectContextInternal::faerie_fire;
+                creators["bear form"] = &AiObjectContextInternal::bear_form;
+                creators["dire bear form"] = &AiObjectContextInternal::dire_bear_form;
+                creators["moonkin form"] = &AiObjectContextInternal::moonkin_form;
+                creators["cat form"] = &AiObjectContextInternal::cat_form;
+                creators["tree form"] = &AiObjectContextInternal::tree_form;
+                creators["caster form"] = &AiObjectContextInternal::caster_form;
+                creators["mangle (bear)"] = &AiObjectContextInternal::mangle_bear;
+                creators["maul"] = &AiObjectContextInternal::maul;
+                creators["bash"] = &AiObjectContextInternal::bash;
+                creators["swipe"] = &AiObjectContextInternal::swipe;
+                creators["growl"] = &AiObjectContextInternal::growl;
+                creators["demoralizing roar"] = &AiObjectContextInternal::demoralizing_roar;
+                creators["hibernate"] = &AiObjectContextInternal::hibernate;
+                creators["entangling roots"] = &AiObjectContextInternal::entangling_roots;
+                creators["entangling roots on cc"] = &AiObjectContextInternal::entangling_roots_on_cc;
+                creators["wrath"] = &AiObjectContextInternal::wrath;
+                creators["starfall"] = &AiObjectContextInternal::starfall;
+                creators["insect swarm"] = &AiObjectContextInternal::insect_swarm;
+                creators["moonfire"] = &AiObjectContextInternal::moonfire;
+                creators["starfire"] = &AiObjectContextInternal::starfire;
+                creators["nature's grasp"] = &AiObjectContextInternal::natures_grasp;
+                creators["claw"] = &AiObjectContextInternal::claw;
+                creators["mangle (cat)"] = &AiObjectContextInternal::mangle_cat;
+                creators["swipe (cat)"] = &AiObjectContextInternal::swipe_cat;
+                creators["rake"] = &AiObjectContextInternal::rake;
+                creators["ferocious bite"] = &AiObjectContextInternal::ferocious_bite;
+                creators["rip"] = &AiObjectContextInternal::rip;
+                creators["cower"] = &AiObjectContextInternal::cower;
+                creators["survival instincts"] = &AiObjectContextInternal::survival_instincts;
+                creators["thorns"] = &AiObjectContextInternal::thorns;
+                creators["cure poison"] = &AiObjectContextInternal::cure_poison;
+                creators["cure poison on party"] = &AiObjectContextInternal::cure_poison_on_party;
+                creators["abolish poison"] = &AiObjectContextInternal::abolish_poison;
+                creators["abolish poison on party"] = &AiObjectContextInternal::abolish_poison_on_party;
+                creators["berserk"] = &AiObjectContextInternal::berserk;
+                creators["tiger's fury"] = &AiObjectContextInternal::tigers_fury;
+                creators["mark of the wild"] = &AiObjectContextInternal::mark_of_the_wild;
+                creators["mark of the wild on party"] = &AiObjectContextInternal::mark_of_the_wild_on_party;
+                creators["regrowth"] = &AiObjectContextInternal::regrowth;
+                creators["rejuvenation"] = &AiObjectContextInternal::rejuvenation;
+                creators["healing touch"] = &AiObjectContextInternal::healing_touch;
+                creators["regrowth on party"] = &AiObjectContextInternal::regrowth_on_party;
+                creators["rejuvenation on party"] = &AiObjectContextInternal::rejuvenation_on_party;
+                creators["healing touch on party"] = &AiObjectContextInternal::healing_touch_on_party;
+                creators["rebirth"] = &AiObjectContextInternal::rebirth;
+                creators["revive"] = &AiObjectContextInternal::revive;
+                creators["barskin"] = &AiObjectContextInternal::barskin;
+                creators["lacerate"] = &AiObjectContextInternal::lacerate;
+                creators["hurricane"] = &AiObjectContextInternal::hurricane;
+                creators["innervate"] = &AiObjectContextInternal::innervate;
+                creators["tranquility"] = &AiObjectContextInternal::tranquility;
+                creators["bash on enemy healer"] = &AiObjectContextInternal::bash_on_enemy_healer;
+            }
+
+        private:
+            static Action* tranquility(PlayerbotAI* ai) { return new CastTranquilityAction(ai); }
+            static Action* feral_charge_bear(PlayerbotAI* ai) { return new CastFeralChargeBearAction(ai); }
+            static Action* feral_charge_cat(PlayerbotAI* ai) { return new CastFeralChargeCatAction(ai); }
+            static Action* swipe_bear(PlayerbotAI* ai) { return new CastSwipeBearAction(ai); }
+            static Action* faerie_fire_feral(PlayerbotAI* ai) { return new CastFaerieFireFeralAction(ai); }
+            static Action* faerie_fire(PlayerbotAI* ai) { return new CastFaerieFireAction(ai); }
+            static Action* bear_form(PlayerbotAI* ai) { return new CastBearFormAction(ai); }
+            static Action* dire_bear_form(PlayerbotAI* ai) { return new CastDireBearFormAction(ai); }
+            static Action* cat_form(PlayerbotAI* ai) { return new CastCatFormAction(ai); }
+            static Action* tree_form(PlayerbotAI* ai) { return new CastTreeFormAction(ai); }
+            static Action* caster_form(PlayerbotAI* ai) { return new CastCasterFormAction(ai); }
+            static Action* mangle_bear(PlayerbotAI* ai) { return new CastMangleBearAction(ai); }
+            static Action* maul(PlayerbotAI* ai) { return new CastMaulAction(ai); }
+            static Action* bash(PlayerbotAI* ai) { return new CastBashAction(ai); }
+            static Action* swipe(PlayerbotAI* ai) { return new CastSwipeAction(ai); }
+            static Action* growl(PlayerbotAI* ai) { return new CastGrowlAction(ai); }
+            static Action* demoralizing_roar(PlayerbotAI* ai) { return new CastDemoralizingRoarAction(ai); }
+            static Action* moonkin_form(PlayerbotAI* ai) { return new CastMoonkinFormAction(ai); }
+            static Action* hibernate(PlayerbotAI* ai) { return new CastHibernateAction(ai); }
+            static Action* entangling_roots(PlayerbotAI* ai) { return new CastEntanglingRootsAction(ai); }
+            static Action* entangling_roots_on_cc(PlayerbotAI* ai) { return new CastEntanglingRootsCcAction(ai); }
+            static Action* wrath(PlayerbotAI* ai) { return new CastWrathAction(ai); }
+            static Action* starfall(PlayerbotAI* ai) { return new CastStarfallAction(ai); }
+            static Action* insect_swarm(PlayerbotAI* ai) { return new CastInsectSwarmAction(ai); }
+            static Action* moonfire(PlayerbotAI* ai) { return new CastMoonfireAction(ai); }
+            static Action* starfire(PlayerbotAI* ai) { return new CastStarfireAction(ai); }
+            static Action* natures_grasp(PlayerbotAI* ai) { return new CastNaturesGraspAction(ai); }
+            static Action* claw(PlayerbotAI* ai) { return new CastClawAction(ai); }
+            static Action* mangle_cat(PlayerbotAI* ai) { return new CastMangleCatAction(ai); }
+            static Action* swipe_cat(PlayerbotAI* ai) { return new CastSwipeCatAction(ai); }
+            static Action* rake(PlayerbotAI* ai) { return new CastRakeAction(ai); }
+            static Action* ferocious_bite(PlayerbotAI* ai) { return new CastFerociousBiteAction(ai); }
+            static Action* rip(PlayerbotAI* ai) { return new CastRipAction(ai); }
+            static Action* cower(PlayerbotAI* ai) { return new CastCowerAction(ai); }
+            static Action* survival_instincts(PlayerbotAI* ai) { return new CastSurvivalInstinctsAction(ai); }
+            static Action* thorns(PlayerbotAI* ai) { return new CastThornsAction(ai); }
+            static Action* cure_poison(PlayerbotAI* ai) { return new CastCurePoisonAction(ai); }
+            static Action* cure_poison_on_party(PlayerbotAI* ai) { return new CastCurePoisonOnPartyAction(ai); }
+            static Action* abolish_poison(PlayerbotAI* ai) { return new CastAbolishPoisonAction(ai); }
+            static Action* abolish_poison_on_party(PlayerbotAI* ai) { return new CastAbolishPoisonOnPartyAction(ai); }
+            static Action* berserk(PlayerbotAI* ai) { return new CastBerserkAction(ai); }
+            static Action* tigers_fury(PlayerbotAI* ai) { return new CastTigersFuryAction(ai); }
+            static Action* mark_of_the_wild(PlayerbotAI* ai) { return new CastMarkOfTheWildAction(ai); }
+            static Action* mark_of_the_wild_on_party(PlayerbotAI* ai) { return new CastMarkOfTheWildOnPartyAction(ai); }
+            static Action* regrowth(PlayerbotAI* ai) { return new CastRegrowthAction(ai); }
+            static Action* rejuvenation(PlayerbotAI* ai) { return new CastRejuvenationAction(ai); }
+            static Action* healing_touch(PlayerbotAI* ai) { return new CastHealingTouchAction(ai); }
+            static Action* regrowth_on_party(PlayerbotAI* ai) { return new CastRegrowthOnPartyAction(ai); }
+            static Action* rejuvenation_on_party(PlayerbotAI* ai) { return new CastRejuvenationOnPartyAction(ai); }
+            static Action* healing_touch_on_party(PlayerbotAI* ai) { return new CastHealingTouchOnPartyAction(ai); }
+            static Action* rebirth(PlayerbotAI* ai) { return new CastRebirthAction(ai); }
+            static Action* revive(PlayerbotAI* ai) { return new CastReviveAction(ai); }
+            static Action* barskin(PlayerbotAI* ai) { return new CastBarskinAction(ai); }
+            static Action* lacerate(PlayerbotAI* ai) { return new CastLacerateAction(ai); }
+            static Action* hurricane(PlayerbotAI* ai) { return new CastHurricaneAction(ai); }
+            static Action* innervate(PlayerbotAI* ai) { return new CastInnervateAction(ai); }
+            static Action* bash_on_enemy_healer(PlayerbotAI* ai) { return new CastBashOnEnemyHealerAction(ai); }
+        };
+    };
+};
+
+DruidAiObjectContext::DruidAiObjectContext(PlayerbotAI* ai) : AiObjectContext(ai)
+{
+    strategyContexts.Add(new ai::druid::StrategyFactoryInternal());
+    strategyContexts.Add(new ai::druid::DruidStrategyFactoryInternal());
+    actionContexts.Add(new ai::druid::AiObjectContextInternal());
+    triggerContexts.Add(new ai::druid::TriggerFactoryInternal());
+}
diff --git a/src/game/playerbot/strategy/druid/DruidAiObjectContext.h b/src/game/playerbot/strategy/druid/DruidAiObjectContext.h
new file mode 100644
index 00000000000..b5d7a2cd123
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/DruidAiObjectContext.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../AiObjectContext.h"
+
+namespace ai
+{
+    class DruidAiObjectContext : public AiObjectContext
+    {
+    public:
+        DruidAiObjectContext(PlayerbotAI* ai);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/druid/DruidBearActions.h b/src/game/playerbot/strategy/druid/DruidBearActions.h
new file mode 100644
index 00000000000..81bc8ab58a3
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/DruidBearActions.h
@@ -0,0 +1,64 @@
+#pragma once
+
+namespace ai {
+	class CastFeralChargeBearAction : public CastReachTargetSpellAction
+	{
+	public:
+		CastFeralChargeBearAction(PlayerbotAI* ai) : CastReachTargetSpellAction(ai, "feral charge - bear", 1.5f) {}
+	};
+
+	class CastGrowlAction : public CastSpellAction
+	{
+	public:
+		CastGrowlAction(PlayerbotAI* ai) : CastSpellAction(ai, "growl") {}
+	};
+
+	class CastMaulAction : public CastMeleeSpellAction
+	{
+	public:
+		CastMaulAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "maul") {}
+		virtual bool isUseful() { return CastMeleeSpellAction::isUseful() && AI_VALUE2(uint8, "rage", "self target") >= 45; }
+	};
+
+	class CastBashAction : public CastMeleeSpellAction
+	{
+	public:
+		CastBashAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "bash") {}
+	};
+
+	class CastSwipeAction : public CastMeleeSpellAction
+	{
+	public:
+		CastSwipeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "swipe") {}
+	};
+
+	class CastDemoralizingRoarAction : public CastDebuffSpellAction
+	{
+	public:
+		CastDemoralizingRoarAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "demoralizing roar") {}
+	};
+
+	class CastMangleBearAction : public CastMeleeSpellAction
+	{
+	public:
+		CastMangleBearAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "mangle (bear)") {}
+	};
+
+	class CastSwipeBearAction : public CastMeleeSpellAction
+	{
+	public:
+		CastSwipeBearAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "swipe (bear)") {}
+	};
+
+    class CastLacerateAction : public CastMeleeSpellAction
+    {
+    public:
+        CastLacerateAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "lacerate") {}
+    };
+
+    class CastBashOnEnemyHealerAction : public CastSpellOnEnemyHealerAction
+    {
+    public:
+        CastBashOnEnemyHealerAction(PlayerbotAI* ai) : CastSpellOnEnemyHealerAction(ai, "bash") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/druid/DruidCatActions.h b/src/game/playerbot/strategy/druid/DruidCatActions.h
new file mode 100644
index 00000000000..90f50c940a3
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/DruidCatActions.h
@@ -0,0 +1,69 @@
+#pragma once
+
+namespace ai {
+	class CastFeralChargeCatAction : public CastReachTargetSpellAction
+	{
+	public:
+		CastFeralChargeCatAction(PlayerbotAI* ai) : CastReachTargetSpellAction(ai, "feral charge - cat", 1.5f) {}
+	};
+
+	class CastCowerAction : public CastBuffSpellAction
+	{
+	public:
+		CastCowerAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "cower") {}
+	};
+
+
+	class CastBerserkAction : public CastBuffSpellAction
+	{
+	public:
+		CastBerserkAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "berserk") {}
+	};
+
+	class CastTigersFuryAction : public CastBuffSpellAction
+	{
+	public:
+		CastTigersFuryAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "tiger's fury") {}
+	};
+
+	class CastRakeAction : public CastDebuffSpellAction
+	{
+	public:
+		CastRakeAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "rake") {}
+
+        virtual NextAction** getPrerequisites()
+        {
+            return NextAction::merge( NextAction::array(0, new NextAction("reach melee"), NULL), CastDebuffSpellAction::getPrerequisites());
+        }
+	};
+
+
+	class CastClawAction : public CastMeleeSpellAction {
+	public:
+		CastClawAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "claw") {}
+	};
+
+	class CastMangleCatAction : public CastMeleeSpellAction {
+	public:
+		CastMangleCatAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "mangle (cat)") {}
+	};
+
+	class CastSwipeCatAction : public CastMeleeSpellAction {
+	public:
+		CastSwipeCatAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "swipe (cat)") {}
+	};
+
+	class CastFerociousBiteAction : public CastMeleeSpellAction {
+	public:
+		CastFerociousBiteAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "ferocious bite") {}
+	};
+
+
+	class CastRipAction : public CastMeleeSpellAction {
+	public:
+		CastRipAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "rip") {}
+	};
+
+
+
+}
diff --git a/src/game/playerbot/strategy/druid/DruidMultipliers.cpp b/src/game/playerbot/strategy/druid/DruidMultipliers.cpp
new file mode 100644
index 00000000000..d273c7c6fb9
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/DruidMultipliers.cpp
@@ -0,0 +1,6 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DruidMultipliers.h"
+#include "DruidActions.h"
+
+using namespace ai;
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/druid/DruidMultipliers.h b/src/game/playerbot/strategy/druid/DruidMultipliers.h
new file mode 100644
index 00000000000..7cfbdd46e87
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/DruidMultipliers.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace ai
+{
+   
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/druid/DruidShapeshiftActions.h b/src/game/playerbot/strategy/druid/DruidShapeshiftActions.h
new file mode 100644
index 00000000000..746c635b721
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/DruidShapeshiftActions.h
@@ -0,0 +1,53 @@
+#pragma once
+
+namespace ai {
+	class CastBearFormAction : public CastBuffSpellAction { 
+	public: 
+		CastBearFormAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "bear form") {} 
+
+        virtual bool isPossible() {
+			return CastBuffSpellAction::isPossible() && !ai->HasAura("dire bear form", GetTarget());
+		}
+        virtual bool isUseful() {
+			return CastBuffSpellAction::isUseful() && !ai->HasAura("dire bear form", GetTarget());
+		}
+	};
+
+	class CastDireBearFormAction : public CastBuffSpellAction { 
+	public: 
+		CastDireBearFormAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "dire bear form") {} 
+        
+        virtual NextAction** getAlternatives() {
+			return NextAction::merge(NextAction::array(0, new NextAction("bear form"), NULL), CastSpellAction::getAlternatives());
+		}
+	};
+
+	class CastCatFormAction : public CastBuffSpellAction { 
+	public: 
+		CastCatFormAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "cat form") {} 
+	};
+
+	class CastTreeFormAction : public CastBuffSpellAction {
+	public:
+		CastTreeFormAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "tree of life") {}
+	};
+
+	class CastMoonkinFormAction : public CastBuffSpellAction { 
+	public: 
+		CastMoonkinFormAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "moonkin form") {} 
+	};
+
+	class CastCasterFormAction : public CastBuffSpellAction { 
+	public: 
+		CastCasterFormAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "caster form") {} 
+
+		virtual bool isUseful() {
+			return ai->HasAnyAuraOf(GetTarget(), "dire bear form", "bear form", "cat form", "travel form", "aquatic form", 
+				"flight form", "swift flight form", "moonkin form", "tree of life", NULL);
+		}
+		virtual bool isPossible() { return true; }
+		
+		virtual bool Execute(Event event);
+	};
+
+}
diff --git a/src/game/playerbot/strategy/druid/DruidTriggers.cpp b/src/game/playerbot/strategy/druid/DruidTriggers.cpp
new file mode 100644
index 00000000000..963c9fec58e
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/DruidTriggers.cpp
@@ -0,0 +1,7 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DruidTriggers.h"
+#include "DruidActions.h"
+
+using namespace ai;
+
diff --git a/src/game/playerbot/strategy/druid/DruidTriggers.h b/src/game/playerbot/strategy/druid/DruidTriggers.h
new file mode 100644
index 00000000000..1c0d4d46618
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/DruidTriggers.h
@@ -0,0 +1,127 @@
+#pragma once
+#include "../triggers/GenericTriggers.h"
+
+namespace ai {
+    class MarkOfTheWildOnPartyTrigger : public BuffOnPartyTrigger
+    {
+    public:
+        MarkOfTheWildOnPartyTrigger(PlayerbotAI* ai) : BuffOnPartyTrigger(ai, "mark of the wild") {}
+    };
+
+    class MarkOfTheWildTrigger : public BuffTrigger
+    {
+    public:
+        MarkOfTheWildTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "mark of the wild") {}
+    };
+
+    class ThornsTrigger : public BuffTrigger
+    {
+    public:
+        ThornsTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "thorns") {}
+    };
+
+    class RakeTrigger : public DebuffTrigger
+    {
+    public:
+        RakeTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "rake") {}
+    };
+
+    class InsectSwarmTrigger : public DebuffTrigger
+    {
+    public:
+        InsectSwarmTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "insect swarm") {}
+    };
+
+    class MoonfireTrigger : public DebuffTrigger
+    {
+    public:
+        MoonfireTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "moonfire") {}
+    };
+
+    class FaerieFireTrigger : public DebuffTrigger
+    {
+    public:
+        FaerieFireTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "faerie fire") {}
+    };
+
+    class FaerieFireFeralTrigger : public DebuffTrigger
+    {
+    public:
+        FaerieFireFeralTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "faerie fire (feral)") {}
+    };
+
+    class BashInterruptSpellTrigger : public InterruptSpellTrigger
+    {
+    public:
+        BashInterruptSpellTrigger(PlayerbotAI* ai) : InterruptSpellTrigger(ai, "bash") {}
+    };
+
+    class TigersFuryTrigger : public BoostTrigger
+    {
+    public:
+        TigersFuryTrigger(PlayerbotAI* ai) : BoostTrigger(ai, "tiger's fury") {}
+    };
+
+    class NaturesGraspTrigger : public BoostTrigger
+    {
+    public:
+        NaturesGraspTrigger(PlayerbotAI* ai) : BoostTrigger(ai, "nature's grasp") {}
+    };
+
+    class EntanglingRootsTrigger : public HasCcTargetTrigger
+    {
+    public:
+        EntanglingRootsTrigger(PlayerbotAI* ai) : HasCcTargetTrigger(ai, "entangling roots") {}
+    };
+
+    class CurePoisonTrigger : public NeedCureTrigger
+    {
+    public:
+        CurePoisonTrigger(PlayerbotAI* ai) : NeedCureTrigger(ai, "cure poison", DISPEL_POISON) {}
+    };
+
+    class PartyMemberCurePoisonTrigger : public PartyMemberNeedCureTrigger
+    {
+    public:
+        PartyMemberCurePoisonTrigger(PlayerbotAI* ai) : PartyMemberNeedCureTrigger(ai, "cure poison", DISPEL_POISON) {}
+    };
+
+    class BearFormTrigger : public BuffTrigger
+    {
+    public:
+        BearFormTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "bear form") {}
+        virtual bool IsActive() { return !ai->HasAnyAuraOf(bot, "bear form", "dire bear form", NULL); }
+    };
+
+    class TreeFormTrigger : public BuffTrigger
+    {
+    public:
+        TreeFormTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "tree of life") {}
+        virtual bool IsActive() { return !ai->HasAura("tree of life", bot); }
+    };
+
+    class CatFormTrigger : public BuffTrigger
+    {
+    public:
+        CatFormTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "cat form") {}
+        virtual bool IsActive() { return !ai->HasAura("cat form", bot); }
+    };
+
+    class EclipseSolarTrigger : public HasAuraTrigger
+    {
+    public:
+        EclipseSolarTrigger(PlayerbotAI* ai) : HasAuraTrigger(ai, "eclipse (solar)") {}
+    };
+
+    class EclipseLunarTrigger : public HasAuraTrigger
+    {
+    public:
+        EclipseLunarTrigger(PlayerbotAI* ai) : HasAuraTrigger(ai, "eclipse (lunar)") {}
+    };
+
+    class BashInterruptEnemyHealerSpellTrigger : public InterruptEnemyHealerTrigger
+    {
+    public:
+        BashInterruptEnemyHealerSpellTrigger(PlayerbotAI* ai) : InterruptEnemyHealerTrigger(ai, "bash") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/druid/FeralDruidStrategy.cpp b/src/game/playerbot/strategy/druid/FeralDruidStrategy.cpp
new file mode 100644
index 00000000000..19565732c97
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/FeralDruidStrategy.cpp
@@ -0,0 +1,90 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "FeralDruidStrategy.h"
+
+using namespace ai;
+
+class FeralDruidStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    FeralDruidStrategyActionNodeFactory()
+    {
+        creators["survival instincts"] = &survival_instincts;
+        creators["thorns"] = &thorns;
+        creators["cure poison"] = &cure_poison;
+        creators["cure poison on party"] = &cure_poison_on_party;
+        creators["abolish poison"] = &abolish_poison;
+        creators["abolish poison on party"] = &abolish_poison_on_party;
+    }
+private:
+    static ActionNode* survival_instincts(PlayerbotAI* ai)
+    {
+        return new ActionNode ("survival instincts",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("barskin"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* thorns(PlayerbotAI* ai)
+    {
+        return new ActionNode ("thorns",
+            /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* cure_poison(PlayerbotAI* ai)
+    {
+        return new ActionNode ("cure poison",
+            /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* cure_poison_on_party(PlayerbotAI* ai)
+    {
+        return new ActionNode ("cure poison on party",
+            /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* abolish_poison(PlayerbotAI* ai)
+    {
+        return new ActionNode ("abolish poison",
+            /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* abolish_poison_on_party(PlayerbotAI* ai)
+    {
+        return new ActionNode ("abolish poison on party",
+            /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+};
+
+FeralDruidStrategy::FeralDruidStrategy(PlayerbotAI* ai) : GenericDruidStrategy(ai)
+{
+    actionNodeFactories.Add(new FeralDruidStrategyActionNodeFactory());
+    actionNodeFactories.Add(new ShapeshiftDruidStrategyActionNodeFactory());
+}
+
+void FeralDruidStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericDruidStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "not facing target",
+        NextAction::array(0, new NextAction("set facing", ACTION_NORMAL + 7), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "enemy out of melee",
+        NextAction::array(0, new NextAction("reach melee", ACTION_NORMAL + 8), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "enemy too close for melee",
+        NextAction::array(0, new NextAction("move out of enemy contact", ACTION_NORMAL + 8), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("survival instincts", ACTION_EMERGENCY + 1), NULL)));
+}
+
diff --git a/src/game/playerbot/strategy/druid/FeralDruidStrategy.h b/src/game/playerbot/strategy/druid/FeralDruidStrategy.h
new file mode 100644
index 00000000000..0ee4a8c077b
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/FeralDruidStrategy.h
@@ -0,0 +1,75 @@
+#pragma once
+
+#include "GenericDruidStrategy.h"
+#include "DruidAiObjectContext.h"
+
+namespace ai
+{
+    class ShapeshiftDruidStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+    {
+    public:
+        ShapeshiftDruidStrategyActionNodeFactory()
+        {
+            creators["rejuvenation"] = &rejuvenation;
+            creators["regrowth"] = &regrowth;
+            creators["healing touch"] = &healing_touch;
+            creators["rejuvenation on party"] = &rejuvenation_on_party;
+            creators["regrowth on party"] = &regrowth_on_party;
+            creators["healing touch on party"] = &healing_touch_on_party;
+        }
+    private:
+        static ActionNode* regrowth(PlayerbotAI* ai)
+        {
+            return new ActionNode ("regrowth",
+                /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("healing touch"), NULL),
+                /*C*/ NextAction::array(0, new NextAction("melee", 10.0f), NULL));
+        }
+        static ActionNode* rejuvenation(PlayerbotAI* ai)
+        {
+            return new ActionNode ("rejuvenation",
+                /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* healing_touch(PlayerbotAI* ai)
+        {
+            return new ActionNode ("healing touch",
+                /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* regrowth_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("regrowth on party",
+                /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("healing touch on party"), NULL),
+                /*C*/ NextAction::array(0, new NextAction("melee", 10.0f), NULL));
+        }
+        static ActionNode* rejuvenation_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("rejuvenation on party",
+                /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* healing_touch_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("healing touch on party",
+                /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+    };
+
+    class FeralDruidStrategy : public GenericDruidStrategy
+    {
+    protected:
+        FeralDruidStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual int GetType() { return STRATEGY_TYPE_COMBAT | STRATEGY_TYPE_MELEE; }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/druid/GenericDruidNonCombatStrategy.cpp b/src/game/playerbot/strategy/druid/GenericDruidNonCombatStrategy.cpp
new file mode 100644
index 00000000000..e6377da42d4
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/GenericDruidNonCombatStrategy.cpp
@@ -0,0 +1,73 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DruidMultipliers.h"
+#include "GenericDruidNonCombatStrategy.h"
+
+using namespace ai;
+
+class GenericDruidNonCombatStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    GenericDruidNonCombatStrategyActionNodeFactory()
+    {
+        creators["mark of the wild"] = &mark_of_the_wild;
+        creators["mark of the wild on party"] = &mark_of_the_wild_on_party;
+        creators["innervate"] = &innervate;
+    }
+private:
+    static ActionNode* mark_of_the_wild(PlayerbotAI* ai)
+    {
+        return new ActionNode ("mark of the wild",
+            /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* mark_of_the_wild_on_party(PlayerbotAI* ai)
+    {
+        return new ActionNode ("mark of the wild on party",
+            /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* innervate(PlayerbotAI* ai)
+    {
+        return new ActionNode ("innervate",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("drink"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+GenericDruidNonCombatStrategy::GenericDruidNonCombatStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericDruidNonCombatStrategyActionNodeFactory());
+}
+
+void GenericDruidNonCombatStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    NonCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "mark of the wild",
+        NextAction::array(0, new NextAction("mark of the wild", 12.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "mark of the wild on party",
+        NextAction::array(0, new NextAction("mark of the wild on party", 11.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cure poison",
+        NextAction::array(0, new NextAction("abolish poison", 21.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member cure poison",
+        NextAction::array(0, new NextAction("abolish poison on party", 20.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"party member dead",
+		NextAction::array(0, new NextAction("revive", 22.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low mana",
+        NextAction::array(0, new NextAction("innervate", ACTION_EMERGENCY + 5), NULL)));
+}
diff --git a/src/game/playerbot/strategy/druid/GenericDruidNonCombatStrategy.h b/src/game/playerbot/strategy/druid/GenericDruidNonCombatStrategy.h
new file mode 100644
index 00000000000..82cba1587ac
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/GenericDruidNonCombatStrategy.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../generic/NonCombatStrategy.h"
+
+namespace ai
+{
+    class GenericDruidNonCombatStrategy : public NonCombatStrategy
+    {
+    public:
+        GenericDruidNonCombatStrategy(PlayerbotAI* ai);
+        virtual string getName() { return "nc"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+}
diff --git a/src/game/playerbot/strategy/druid/GenericDruidStrategy.cpp b/src/game/playerbot/strategy/druid/GenericDruidStrategy.cpp
new file mode 100644
index 00000000000..e4f1921a0b1
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/GenericDruidStrategy.cpp
@@ -0,0 +1,132 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GenericDruidStrategy.h"
+#include "DruidAiObjectContext.h"
+
+using namespace ai;
+
+class GenericDruidStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    GenericDruidStrategyActionNodeFactory()
+    {
+        creators["melee"] = &melee;
+        creators["caster form"] = &caster_form;
+        creators["cure poison"] = &cure_poison;
+        creators["cure poison on party"] = &cure_poison_on_party;
+        creators["abolish poison"] = &abolish_poison;
+        creators["abolish poison on party"] = &abolish_poison_on_party;
+        creators["rebirth"] = &rebirth;
+        creators["entangling roots on cc"] = &entangling_roots_on_cc;
+        creators["innervate"] = &innervate;
+    }
+
+private:
+    static ActionNode* melee(PlayerbotAI* ai)
+    {
+        return new ActionNode ("melee",
+            /*P*/ NextAction::array(0, new NextAction("reach melee"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* caster_form(PlayerbotAI* ai)
+    {
+        return new ActionNode ("caster form",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* cure_poison(PlayerbotAI* ai)
+    {
+        return new ActionNode ("cure poison",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* cure_poison_on_party(PlayerbotAI* ai)
+    {
+        return new ActionNode ("cure poison on party",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* abolish_poison(PlayerbotAI* ai)
+    {
+        return new ActionNode ("abolish poison",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* abolish_poison_on_party(PlayerbotAI* ai)
+    {
+        return new ActionNode ("abolish poison on party",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* rebirth(PlayerbotAI* ai)
+    {
+        return new ActionNode ("rebirth",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* entangling_roots_on_cc(PlayerbotAI* ai)
+    {
+        return new ActionNode ("entangling roots on cc",
+            /*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* innervate(PlayerbotAI* ai)
+    {
+        return new ActionNode ("innervate",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("mana potion"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+GenericDruidStrategy::GenericDruidStrategy(PlayerbotAI* ai) : CombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericDruidStrategyActionNodeFactory());
+}
+
+void GenericDruidStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    CombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_MEDIUM_HEAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member low health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_MEDIUM_HEAL + 1), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_CRITICAL_HEAL + 2), new NextAction("healing touch", ACTION_CRITICAL_HEAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member critical health",
+        NextAction::array(0,  new NextAction("regrowth on party", ACTION_CRITICAL_HEAL + 1), new NextAction("healing touch on party", ACTION_CRITICAL_HEAL + 1), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "cure poison",
+        NextAction::array(0, new NextAction("abolish poison", ACTION_DISPEL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member cure poison",
+        NextAction::array(0, new NextAction("abolish poison on party", ACTION_DISPEL + 1), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"party member dead",
+		NextAction::array(0, new NextAction("rebirth", ACTION_HIGH + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low mana",
+        NextAction::array(0, new NextAction("innervate", ACTION_EMERGENCY + 5), NULL)));
+}
diff --git a/src/game/playerbot/strategy/druid/GenericDruidStrategy.h b/src/game/playerbot/strategy/druid/GenericDruidStrategy.h
new file mode 100644
index 00000000000..dc12a85d45c
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/GenericDruidStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "../Strategy.h"
+#include "../generic/CombatStrategy.h"
+
+namespace ai
+{
+    class AiObjectContext;
+
+    class GenericDruidStrategy : public CombatStrategy
+    {
+    protected:
+        GenericDruidStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+}
diff --git a/src/game/playerbot/strategy/druid/HealDruidStrategy.cpp b/src/game/playerbot/strategy/druid/HealDruidStrategy.cpp
new file mode 100644
index 00000000000..5b1cfb3af75
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/HealDruidStrategy.cpp
@@ -0,0 +1,57 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DruidMultipliers.h"
+#include "HealDruidStrategy.h"
+
+using namespace ai;
+
+class HealDruidStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    HealDruidStrategyActionNodeFactory()
+    {
+    }
+private:
+};
+
+HealDruidStrategy::HealDruidStrategy(PlayerbotAI* ai) : GenericDruidStrategy(ai)
+{
+    actionNodeFactories.Add(new HealDruidStrategyActionNodeFactory());
+}
+
+void HealDruidStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericDruidStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "enemy out of spell",
+        NextAction::array(0, new NextAction("reach spell", ACTION_NORMAL + 9), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "tree form",
+        NextAction::array(0, new NextAction("tree form", ACTION_HIGH + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_MEDIUM_HEAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member medium health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_MEDIUM_HEAL + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "almost full health",
+        NextAction::array(0, new NextAction("rejuvenation", ACTION_LIGHT_HEAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member almost full health",
+        NextAction::array(0, new NextAction("rejuvenation on party", ACTION_LIGHT_HEAL + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe heal",
+        NextAction::array(0, new NextAction("tranquility", ACTION_MEDIUM_HEAL + 3), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "entangling roots",
+        NextAction::array(0, new NextAction("entangling roots on cc", ACTION_HIGH + 1), NULL)));
+}
diff --git a/src/game/playerbot/strategy/druid/HealDruidStrategy.h b/src/game/playerbot/strategy/druid/HealDruidStrategy.h
new file mode 100644
index 00000000000..a0440ba4bf7
--- /dev/null
+++ b/src/game/playerbot/strategy/druid/HealDruidStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "GenericDruidStrategy.h"
+
+namespace ai
+{
+    class HealDruidStrategy : public GenericDruidStrategy
+    {
+    public:
+        HealDruidStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "heal"; }
+        virtual int GetType() { return STRATEGY_TYPE_HEAL; }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/AttackEnemyPlayersStrategy.cpp b/src/game/playerbot/strategy/generic/AttackEnemyPlayersStrategy.cpp
new file mode 100644
index 00000000000..43db0657985
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/AttackEnemyPlayersStrategy.cpp
@@ -0,0 +1,13 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "AttackEnemyPlayersStrategy.h"
+
+using namespace ai;
+
+void AttackEnemyPlayersStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "enemy player is attacking",
+        NextAction::array(0, new NextAction("attack enemy player", 61.0f), NULL)));
+}
+
diff --git a/src/game/playerbot/strategy/generic/AttackEnemyPlayersStrategy.h b/src/game/playerbot/strategy/generic/AttackEnemyPlayersStrategy.h
new file mode 100644
index 00000000000..cd9ce7cf961
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/AttackEnemyPlayersStrategy.h
@@ -0,0 +1,16 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class AttackEnemyPlayersStrategy : public NonCombatStrategy
+    {
+    public:
+        AttackEnemyPlayersStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "pvp"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/AttackRtiStrategy.cpp b/src/game/playerbot/strategy/generic/AttackRtiStrategy.cpp
new file mode 100644
index 00000000000..d33bb74777a
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/AttackRtiStrategy.cpp
@@ -0,0 +1,14 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "AttackRtiStrategy.h"
+
+using namespace ai;
+
+
+void AttackRtiStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "no attackers",
+        NextAction::array(0, new NextAction("attack rti target", 60.0f), NULL)));
+}
+
diff --git a/src/game/playerbot/strategy/generic/AttackRtiStrategy.h b/src/game/playerbot/strategy/generic/AttackRtiStrategy.h
new file mode 100644
index 00000000000..ad9662afdd8
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/AttackRtiStrategy.h
@@ -0,0 +1,16 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class AttackRtiStrategy : public NonCombatStrategy
+    {
+    public:
+        AttackRtiStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "attack rti"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/AttackWeakStrategy.cpp b/src/game/playerbot/strategy/generic/AttackWeakStrategy.cpp
new file mode 100644
index 00000000000..d3a832a445e
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/AttackWeakStrategy.cpp
@@ -0,0 +1,13 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "AttackWeakStrategy.h"
+
+using namespace ai;
+
+void AttackWeakStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "not least hp target active",
+        NextAction::array(0, new NextAction("attack least hp target", 60.0f), NULL)));
+}
+
diff --git a/src/game/playerbot/strategy/generic/AttackWeakStrategy.h b/src/game/playerbot/strategy/generic/AttackWeakStrategy.h
new file mode 100644
index 00000000000..c6c20c25c25
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/AttackWeakStrategy.h
@@ -0,0 +1,16 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class AttackWeakStrategy : public NonCombatStrategy
+    {
+    public:
+        AttackWeakStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "attack weak"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/CastTimeStrategy.cpp b/src/game/playerbot/strategy/generic/CastTimeStrategy.cpp
new file mode 100644
index 00000000000..4357d0b9028
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/CastTimeStrategy.cpp
@@ -0,0 +1,36 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "CastTimeStrategy.h"
+#include "../actions/GenericSpellActions.h"
+
+using namespace ai;
+
+float CastTimeMultiplier::GetValue(Action* action)
+{
+    if (action == NULL) return 1.0f;
+
+    uint8 targetHealth = AI_VALUE2(uint8, "health", "current target");
+    string name = action->getName();
+
+    if (action->GetTarget() != AI_VALUE(Unit*, "current target"))
+        return 1.0f;
+
+    if (targetHealth < sPlayerbotAIConfig.lowHealth && dynamic_cast<CastSpellAction*>(action))
+    {
+        uint32 spellId = AI_VALUE2(uint32, "spell id", name);
+        const SpellEntry* const pSpellInfo = sSpellStore.LookupEntry(spellId);
+
+        if (spellId && GetSpellCastTime(pSpellInfo) >= 3000)
+            return 0.0f;
+        else if (spellId && GetSpellCastTime(pSpellInfo) >= 1500)
+            return 0.5f;
+    }
+
+    return 1.0f;
+}
+
+
+void CastTimeStrategy::InitMultipliers(std::list<Multiplier*> &multipliers)
+{
+    multipliers.push_back(new CastTimeMultiplier(ai));
+}
diff --git a/src/game/playerbot/strategy/generic/CastTimeStrategy.h b/src/game/playerbot/strategy/generic/CastTimeStrategy.h
new file mode 100644
index 00000000000..a483fc03152
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/CastTimeStrategy.h
@@ -0,0 +1,26 @@
+#pragma once
+
+namespace ai
+{
+
+    class CastTimeMultiplier : public Multiplier
+    {
+    public:
+        CastTimeMultiplier(PlayerbotAI* ai) : Multiplier(ai, "cast time") {}
+
+    public:
+        virtual float GetValue(Action* action);
+    };
+
+    class CastTimeStrategy : public Strategy
+    {
+    public:
+        CastTimeStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitMultipliers(std::list<Multiplier*> &multipliers);
+        virtual string getName() { return "cast time"; }
+    };
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/ChatCommandHandlerStrategy.cpp b/src/game/playerbot/strategy/generic/ChatCommandHandlerStrategy.cpp
new file mode 100644
index 00000000000..991551e4b32
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/ChatCommandHandlerStrategy.cpp
@@ -0,0 +1,177 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ChatCommandHandlerStrategy.h"
+
+using namespace ai;
+
+class ChatCommandActionNodeFactoryInternal : public NamedObjectFactory<ActionNode>
+{
+public:
+    ChatCommandActionNodeFactoryInternal()
+    {
+        creators["tank attack chat shortcut"] = &tank_attack_chat_shortcut;
+    }
+
+private:
+    static ActionNode* tank_attack_chat_shortcut(PlayerbotAI* ai)
+    {
+        return new ActionNode ("tank attack chat shortcut",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NextAction::array(0, new NextAction("attack my target", 100.0f), NULL));
+    }
+};
+
+void ChatCommandHandlerStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    PassTroughStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "rep",
+        NextAction::array(0, new NextAction("reputation", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "q",
+        NextAction::array(0,
+            new NextAction("query quest", relevance),
+            new NextAction("query item usage", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "add all loot",
+        NextAction::array(0, new NextAction("add all loot", relevance), new NextAction("loot", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "u",
+        NextAction::array(0, new NextAction("use", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "c",
+        NextAction::array(0, new NextAction("item count", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "e",
+        NextAction::array(0, new NextAction("equip", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "ue",
+        NextAction::array(0, new NextAction("unequip", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "t",
+        NextAction::array(0, new NextAction("trade", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "nt",
+        NextAction::array(0, new NextAction("trade", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "s",
+        NextAction::array(0, new NextAction("sell", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "b",
+        NextAction::array(0, new NextAction("buy", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "r",
+        NextAction::array(0, new NextAction("reward", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "attack",
+        NextAction::array(0, new NextAction("attack my target", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "accept",
+        NextAction::array(0, new NextAction("accept quest", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "follow",
+        NextAction::array(0, new NextAction("follow chat shortcut", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "stay",
+        NextAction::array(0, new NextAction("stay chat shortcut", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "flee",
+        NextAction::array(0, new NextAction("flee chat shortcut", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "tank attack",
+        NextAction::array(0, new NextAction("tank attack chat shortcut", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "grind",
+        NextAction::array(0, new NextAction("grind chat shortcut", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "talk",
+        NextAction::array(0, new NextAction("gossip hello", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cast",
+        NextAction::array(0, new NextAction("cast custom spell", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "revive",
+        NextAction::array(0, new NextAction("spirit healer", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "runaway",
+        NextAction::array(0, new NextAction("runaway chat shortcut", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "warning",
+        NextAction::array(0, new NextAction("runaway chat shortcut", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "max dps",
+        NextAction::array(0, new NextAction("max dps chat shortcut", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "attackers",
+        NextAction::array(0, new NextAction("tell attackers", relevance), NULL)));
+}
+
+
+
+ChatCommandHandlerStrategy::ChatCommandHandlerStrategy(PlayerbotAI* ai) : PassTroughStrategy(ai)
+{
+    actionNodeFactories.Add(new ChatCommandActionNodeFactoryInternal());
+
+    supported.push_back("quests");
+    supported.push_back("stats");
+    supported.push_back("leave");
+    supported.push_back("reputation");
+    supported.push_back("log");
+    supported.push_back("los");
+    supported.push_back("drop");
+    supported.push_back("ll");
+    supported.push_back("release");
+    supported.push_back("teleport");
+    supported.push_back("taxi");
+    supported.push_back("repair");
+    supported.push_back("talents");
+    supported.push_back("spells");
+    supported.push_back("co");
+    supported.push_back("nc");
+    supported.push_back("dead");
+    supported.push_back("trainer");
+    supported.push_back("chat");
+    supported.push_back("home");
+    supported.push_back("destroy");
+    supported.push_back("reset ai");
+    supported.push_back("emote");
+    supported.push_back("buff");
+    supported.push_back("help");
+    supported.push_back("gb");
+    supported.push_back("bank");
+    supported.push_back("invite");
+    supported.push_back("spell");
+    supported.push_back("rti");
+    supported.push_back("position");
+    supported.push_back("summon");
+    supported.push_back("who");
+    supported.push_back("save mana");
+    supported.push_back("formation");
+}
diff --git a/src/game/playerbot/strategy/generic/ChatCommandHandlerStrategy.h b/src/game/playerbot/strategy/generic/ChatCommandHandlerStrategy.h
new file mode 100644
index 00000000000..c8c93b2f03e
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/ChatCommandHandlerStrategy.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "PassTroughStrategy.h"
+
+namespace ai
+{
+    class ChatCommandHandlerStrategy : public PassTroughStrategy
+    {
+    public:
+        ChatCommandHandlerStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "chat"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/generic/CombatStrategy.cpp b/src/game/playerbot/strategy/generic/CombatStrategy.cpp
new file mode 100644
index 00000000000..4ef95b1d419
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/CombatStrategy.cpp
@@ -0,0 +1,12 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "CombatStrategy.h"
+
+using namespace ai;
+
+void CombatStrategy::InitTriggers(list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "invalid target",
+        NextAction::array(0, new NextAction("drop target", ACTION_HIGH + 9), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/CombatStrategy.h b/src/game/playerbot/strategy/generic/CombatStrategy.h
new file mode 100644
index 00000000000..475922f680d
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/CombatStrategy.h
@@ -0,0 +1,13 @@
+#pragma once
+
+namespace ai
+{
+    class CombatStrategy : public Strategy
+    {
+    public:
+        CombatStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual int GetType() { return STRATEGY_TYPE_COMBAT; }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/ConserveManaStrategy.cpp b/src/game/playerbot/strategy/generic/ConserveManaStrategy.cpp
new file mode 100644
index 00000000000..aa8166d6d15
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/ConserveManaStrategy.cpp
@@ -0,0 +1,88 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ConserveManaStrategy.h"
+#include "../../PlayerbotAIConfig.h"
+#include "../actions/GenericSpellActions.h"
+#include "../values/LastSpellCastValue.h"
+
+using namespace ai;
+
+float ConserveManaMultiplier::GetValue(Action* action)
+{
+    if (action == NULL) return 1.0f;
+
+    uint8 health = AI_VALUE2(uint8, "health", "self target");
+    uint8 targetHealth = AI_VALUE2(uint8, "health", "current target");
+    uint8 mana = AI_VALUE2(uint8, "mana", "self target");
+    bool hasMana = AI_VALUE2(bool, "has mana", "self target");
+    bool mediumMana = hasMana && mana < sPlayerbotAIConfig.mediumMana;
+
+    string name = action->getName();
+
+    if (health < sPlayerbotAIConfig.lowHealth)
+        return 1.0f;
+
+    if (name == "melee" || name == "reach melee" || name == "reach spell")
+        return 1.0f;
+
+    if (mediumMana && dynamic_cast<CastBuffSpellAction*>(action))
+        return 0.0f;
+
+    if (action->GetTarget() != AI_VALUE(Unit*, "current target"))
+        return 1.0f;
+
+    if (AI_VALUE(uint8, "balance") <= 50)
+        return 1.0f;
+
+    if (targetHealth < sPlayerbotAIConfig.lowHealth && dynamic_cast<CastDebuffSpellAction*>(action))
+        return 0.0f;
+
+    if (mediumMana && dynamic_cast<CastDebuffSpellAction*>(action))
+        return 0.0f;
+
+    return 1.0f;
+}
+
+float SaveManaMultiplier::GetValue(Action* action)
+{
+    if (action == NULL)
+        return 1.0f;
+
+    double saveLevel = AI_VALUE(double, "mana save level");
+    if (saveLevel <= 1.0)
+        return 1.0f;
+
+    CastSpellAction* spellAction = dynamic_cast<CastSpellAction*>(action);
+    if (!spellAction)
+        return 1.0f;
+
+    string spell = spellAction->getName();
+    uint32 spellId = AI_VALUE2(uint32, "spell id", spell);
+    const SpellEntry* const spellInfo = sSpellStore.LookupEntry(spellId);
+    if (!spellInfo || spellInfo->powerType != POWER_MANA)
+        return 1.0f;
+
+    int32 cost = spellInfo->manaCost;
+    if (spellInfo->ManaCostPercentage)
+        cost += spellInfo->ManaCostPercentage * bot->GetCreateMana() / 100;
+
+    uint32 mana = bot->GetMaxPower(POWER_MANA);
+    double percent = (double)cost / (double)mana * 100.0f;
+
+    time_t lastCastTime = AI_VALUE2(time_t, "last spell cast time", spell);
+    if (!lastCastTime)
+        return 1.0f;
+
+    time_t elapsed = time(0) - lastCastTime;
+    if ((double)elapsed < 10 + pow(saveLevel, sqrt(percent)))
+        return 0.0f;
+
+    return 1.0f;
+}
+
+
+void ConserveManaStrategy::InitMultipliers(std::list<Multiplier*> &multipliers)
+{
+    multipliers.push_back(new ConserveManaMultiplier(ai));
+    multipliers.push_back(new SaveManaMultiplier(ai));
+}
diff --git a/src/game/playerbot/strategy/generic/ConserveManaStrategy.h b/src/game/playerbot/strategy/generic/ConserveManaStrategy.h
new file mode 100644
index 00000000000..a20693420f6
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/ConserveManaStrategy.h
@@ -0,0 +1,32 @@
+#pragma once
+
+namespace ai
+{
+    class ConserveManaMultiplier : public Multiplier
+    {
+    public:
+        ConserveManaMultiplier(PlayerbotAI* ai) : Multiplier(ai, "conserve mana") {}
+
+    public:
+        virtual float GetValue(Action* action);
+    };
+
+    class SaveManaMultiplier : public Multiplier
+    {
+    public:
+        SaveManaMultiplier(PlayerbotAI* ai) : Multiplier(ai, "save mana") {}
+
+    public:
+        virtual float GetValue(Action* action);
+    };
+
+    class ConserveManaStrategy : public Strategy
+    {
+    public:
+        ConserveManaStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitMultipliers(std::list<Multiplier*> &multipliers);
+        virtual string getName() { return "conserve mana"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/generic/DeadStrategy.cpp b/src/game/playerbot/strategy/generic/DeadStrategy.cpp
new file mode 100644
index 00000000000..1c31adb4e0a
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/DeadStrategy.cpp
@@ -0,0 +1,23 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "../Strategy.h"
+#include "DeadStrategy.h"
+
+using namespace ai;
+
+void DeadStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    PassTroughStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "dead",
+        NextAction::array(0, new NextAction("revive from corpse", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "resurrect request",
+        NextAction::array(0, new NextAction("accept resurrect", relevance), NULL)));
+}
+
+DeadStrategy::DeadStrategy(PlayerbotAI* ai) : PassTroughStrategy(ai)
+{
+}
diff --git a/src/game/playerbot/strategy/generic/DeadStrategy.h b/src/game/playerbot/strategy/generic/DeadStrategy.h
new file mode 100644
index 00000000000..4008570dd64
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/DeadStrategy.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "PassTroughStrategy.h"
+
+namespace ai
+{
+    class DeadStrategy : public PassTroughStrategy
+    {
+    public:
+        DeadStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "dead"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/generic/DpsAoeStrategy.cpp b/src/game/playerbot/strategy/generic/DpsAoeStrategy.cpp
new file mode 100644
index 00000000000..40fa7036718
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/DpsAoeStrategy.cpp
@@ -0,0 +1,12 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DpsAoeStrategy.h"
+
+using namespace ai;
+
+void DpsAoeStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "timer",
+        NextAction::array(0, new NextAction("dps assist", 50.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/DpsAoeStrategy.h b/src/game/playerbot/strategy/generic/DpsAoeStrategy.h
new file mode 100644
index 00000000000..61ac9b251b5
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/DpsAoeStrategy.h
@@ -0,0 +1,18 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class DpsAoeStrategy : public NonCombatStrategy
+    {
+    public:
+        DpsAoeStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "dps aoe"; }
+        virtual int GetType() { return STRATEGY_TYPE_DPS; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/DpsAssistStrategy.cpp b/src/game/playerbot/strategy/generic/DpsAssistStrategy.cpp
new file mode 100644
index 00000000000..c38860d1494
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/DpsAssistStrategy.cpp
@@ -0,0 +1,15 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DpsAssistStrategy.h"
+
+using namespace ai;
+
+void DpsAssistStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "no attackers",
+        NextAction::array(0, new NextAction("dps assist", 50.0f), NULL)));
+}
+
+
+
diff --git a/src/game/playerbot/strategy/generic/DpsAssistStrategy.h b/src/game/playerbot/strategy/generic/DpsAssistStrategy.h
new file mode 100644
index 00000000000..4368d7b2ed1
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/DpsAssistStrategy.h
@@ -0,0 +1,16 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class DpsAssistStrategy : public NonCombatStrategy
+    {
+    public:
+        DpsAssistStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "dps assist"; }
+		virtual int GetType() { return STRATEGY_TYPE_DPS; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+}
diff --git a/src/game/playerbot/strategy/generic/DuelStrategy.cpp b/src/game/playerbot/strategy/generic/DuelStrategy.cpp
new file mode 100644
index 00000000000..92e90497f39
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/DuelStrategy.cpp
@@ -0,0 +1,24 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DuelStrategy.h"
+
+using namespace ai;
+
+void DuelStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    PassTroughStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "duel requested",
+        NextAction::array(0, new NextAction("accept duel", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "no attackers",
+        NextAction::array(0, new NextAction("attack duel opponent", 70.0f), NULL)));
+}
+
+
+
+DuelStrategy::DuelStrategy(PlayerbotAI* ai) : PassTroughStrategy(ai)
+{
+}
diff --git a/src/game/playerbot/strategy/generic/DuelStrategy.h b/src/game/playerbot/strategy/generic/DuelStrategy.h
new file mode 100644
index 00000000000..58284061fb4
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/DuelStrategy.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "PassTroughStrategy.h"
+
+namespace ai
+{
+    class DuelStrategy : public PassTroughStrategy
+    {
+    public:
+        DuelStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "duel"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/generic/EmoteStrategy.cpp b/src/game/playerbot/strategy/generic/EmoteStrategy.cpp
new file mode 100644
index 00000000000..408ecd13c12
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/EmoteStrategy.cpp
@@ -0,0 +1,17 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "EmoteStrategy.h"
+
+using namespace ai;
+
+
+void EmoteStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "random",
+        NextAction::array(0, new NextAction("emote", 1.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "seldom",
+        NextAction::array(0, new NextAction("suggest what to do", 1.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/EmoteStrategy.h b/src/game/playerbot/strategy/generic/EmoteStrategy.h
new file mode 100644
index 00000000000..7acbc704b4b
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/EmoteStrategy.h
@@ -0,0 +1,16 @@
+#pragma once
+
+namespace ai
+{
+    class EmoteStrategy : public Strategy
+    {
+    public:
+        EmoteStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "emote"; }
+    };
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/FleeStrategy.cpp b/src/game/playerbot/strategy/generic/FleeStrategy.cpp
new file mode 100644
index 00000000000..4b16bc2af20
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/FleeStrategy.cpp
@@ -0,0 +1,26 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "FleeStrategy.h"
+
+using namespace ai;
+
+void FleeStrategy::InitTriggers(list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "panic",
+        NextAction::array(0, new NextAction("flee", ACTION_EMERGENCY + 9), NULL)));
+
+    triggers.push_back(new TriggerNode(
+       "critical health",
+       NextAction::array(0, new NextAction("flee", ACTION_MOVE + 9), NULL)));
+
+   triggers.push_back(new TriggerNode(
+       "low mana",
+       NextAction::array(0,  new NextAction("flee", ACTION_MOVE + 9), NULL)));}
+
+void FleeFromAddsStrategy::InitTriggers(list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "has nearest adds",
+        NextAction::array(0, new NextAction("runaway", 50.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/FleeStrategy.h b/src/game/playerbot/strategy/generic/FleeStrategy.h
new file mode 100644
index 00000000000..4aa96b9605a
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/FleeStrategy.h
@@ -0,0 +1,21 @@
+#pragma once
+
+namespace ai
+{
+    class FleeStrategy : public Strategy
+    {
+    public:
+        FleeStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "flee"; };
+    };
+
+    class FleeFromAddsStrategy : public Strategy
+    {
+    public:
+        FleeFromAddsStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "flee from adds"; };
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/FollowMasterStrategy.cpp b/src/game/playerbot/strategy/generic/FollowMasterStrategy.cpp
new file mode 100644
index 00000000000..753811b5228
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/FollowMasterStrategy.cpp
@@ -0,0 +1,17 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "FollowMasterStrategy.h"
+
+using namespace ai;
+
+NextAction** FollowMasterStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("follow", 1.0f), NULL);
+}
+
+void FollowMasterStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "out of react range",
+        NextAction::array(0, new NextAction("tell out of react range", 10.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/FollowMasterStrategy.h b/src/game/playerbot/strategy/generic/FollowMasterStrategy.h
new file mode 100644
index 00000000000..a43e330c1a0
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/FollowMasterStrategy.h
@@ -0,0 +1,16 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class FollowMasterStrategy : public NonCombatStrategy
+    {
+    public:
+        FollowMasterStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "follow"; }
+        virtual NextAction** getDefaultActions();
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/GrindingStrategy.cpp b/src/game/playerbot/strategy/generic/GrindingStrategy.cpp
new file mode 100644
index 00000000000..259cc96ca44
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/GrindingStrategy.cpp
@@ -0,0 +1,20 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GrindingStrategy.h"
+
+using namespace ai;
+
+
+NextAction** GrindingStrategy::getDefaultActions()
+{
+    return NULL;
+}
+
+void GrindingStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "no target",
+        NextAction::array(0,
+        new NextAction("attack anything", 5.0f), NULL)));
+}
+
diff --git a/src/game/playerbot/strategy/generic/GrindingStrategy.h b/src/game/playerbot/strategy/generic/GrindingStrategy.h
new file mode 100644
index 00000000000..ce421407016
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/GrindingStrategy.h
@@ -0,0 +1,20 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class GrindingStrategy : public NonCombatStrategy
+    {
+    public:
+        GrindingStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "grind"; }
+        virtual int GetType() { return STRATEGY_TYPE_DPS; }
+        NextAction** getDefaultActions();
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/GuardStrategy.cpp b/src/game/playerbot/strategy/generic/GuardStrategy.cpp
new file mode 100644
index 00000000000..301322c5585
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/GuardStrategy.cpp
@@ -0,0 +1,16 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GuardStrategy.h"
+
+using namespace ai;
+
+
+NextAction** GuardStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("guard", 4.0f), NULL);
+}
+
+void GuardStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+}
+
diff --git a/src/game/playerbot/strategy/generic/GuardStrategy.h b/src/game/playerbot/strategy/generic/GuardStrategy.h
new file mode 100644
index 00000000000..8705ba3dca5
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/GuardStrategy.h
@@ -0,0 +1,19 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class GuardStrategy : public NonCombatStrategy
+    {
+    public:
+        GuardStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "guard"; }
+        NextAction** getDefaultActions();
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/KiteStrategy.cpp b/src/game/playerbot/strategy/generic/KiteStrategy.cpp
new file mode 100644
index 00000000000..e329162645f
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/KiteStrategy.cpp
@@ -0,0 +1,16 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "KiteStrategy.h"
+
+using namespace ai;
+
+KiteStrategy::KiteStrategy(PlayerbotAI* ai) : Strategy(ai)
+{
+}
+
+void KiteStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "has aggro",
+        NextAction::array(0, new NextAction("runaway", 51.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/KiteStrategy.h b/src/game/playerbot/strategy/generic/KiteStrategy.h
new file mode 100644
index 00000000000..2436a3ddb91
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/KiteStrategy.h
@@ -0,0 +1,15 @@
+#pragma once
+
+namespace ai
+{
+    class KiteStrategy : public Strategy
+    {
+    public:
+        KiteStrategy(PlayerbotAI* ai);
+        virtual string getName() { return "kite"; }
+    
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/LootNonCombatStrategy.cpp b/src/game/playerbot/strategy/generic/LootNonCombatStrategy.cpp
new file mode 100644
index 00000000000..0701cf55455
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/LootNonCombatStrategy.cpp
@@ -0,0 +1,29 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "LootNonCombatStrategy.h"
+
+using namespace ai;
+
+void LootNonCombatStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "loot available",
+        NextAction::array(0, new NextAction("loot", 6.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "far from loot target",
+        NextAction::array(0, new NextAction("move to loot", 7.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "can loot",
+        NextAction::array(0, new NextAction("open loot", 8.0f), NULL)));
+}
+
+void GatherStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "no possible targets",
+        NextAction::array(0, new NextAction("add gathering loot", 2.0f), NULL)));
+}
+
+
diff --git a/src/game/playerbot/strategy/generic/LootNonCombatStrategy.h b/src/game/playerbot/strategy/generic/LootNonCombatStrategy.h
new file mode 100644
index 00000000000..5eecd634db6
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/LootNonCombatStrategy.h
@@ -0,0 +1,24 @@
+#pragma once
+
+namespace ai
+{
+    class LootNonCombatStrategy : public Strategy
+    {
+    public:
+        LootNonCombatStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "loot"; }
+    };
+
+    class GatherStrategy : public Strategy
+    {
+    public:
+        GatherStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "gather"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/generic/MeleeCombatStrategy.cpp b/src/game/playerbot/strategy/generic/MeleeCombatStrategy.cpp
new file mode 100644
index 00000000000..6bc82679ad0
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/MeleeCombatStrategy.cpp
@@ -0,0 +1,23 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "MeleeCombatStrategy.h"
+
+using namespace ai;
+
+
+void MeleeCombatStrategy::InitTriggers(list<TriggerNode*> &triggers)
+{
+    CombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "not facing target",
+        NextAction::array(0, new NextAction("set facing", ACTION_NORMAL + 7), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "enemy out of melee",
+        NextAction::array(0, new NextAction("reach melee", ACTION_NORMAL + 8), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "enemy too close for melee",
+        NextAction::array(0, new NextAction("move out of enemy contact", ACTION_NORMAL + 8), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/MeleeCombatStrategy.h b/src/game/playerbot/strategy/generic/MeleeCombatStrategy.h
new file mode 100644
index 00000000000..eeeb90a35b8
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/MeleeCombatStrategy.h
@@ -0,0 +1,16 @@
+#include "CombatStrategy.h"
+#include "../generic/CombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class MeleeCombatStrategy : public CombatStrategy
+    {
+    public:
+        MeleeCombatStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual int GetType() { return STRATEGY_TYPE_COMBAT | STRATEGY_TYPE_MELEE; }
+    };
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/NonCombatStrategy.cpp b/src/game/playerbot/strategy/generic/NonCombatStrategy.cpp
new file mode 100644
index 00000000000..5a874b8d745
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/NonCombatStrategy.cpp
@@ -0,0 +1,12 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "NonCombatStrategy.h"
+
+using namespace ai;
+
+void NonCombatStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "timer",
+        NextAction::array(0, new NextAction("check mount state", 1.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/NonCombatStrategy.h b/src/game/playerbot/strategy/generic/NonCombatStrategy.h
new file mode 100644
index 00000000000..bab0b7d7f7f
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/NonCombatStrategy.h
@@ -0,0 +1,12 @@
+#pragma once
+
+namespace ai
+{
+    class NonCombatStrategy : public Strategy
+    {
+    public:
+        NonCombatStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+		virtual int GetType() { return STRATEGY_TYPE_NONCOMBAT; }
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+}
diff --git a/src/game/playerbot/strategy/generic/PassTroughStrategy.h b/src/game/playerbot/strategy/generic/PassTroughStrategy.h
new file mode 100644
index 00000000000..eddb0314a13
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/PassTroughStrategy.h
@@ -0,0 +1,26 @@
+#pragma once
+
+namespace ai
+{
+    class PassTroughStrategy : public Strategy
+    {
+    public:
+        PassTroughStrategy(PlayerbotAI* ai, float relevance = 100.0f) : Strategy(ai), relevance(relevance) {}
+
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers)
+        {
+            for (list<string>::iterator i = supported.begin(); i != supported.end(); i++)
+            {
+                string s = i->c_str();
+
+                triggers.push_back(new TriggerNode(
+                    s, 
+                    NextAction::array(0, new NextAction(s, relevance), NULL)));
+            }
+        }
+
+    protected:
+        list<string> supported;
+        float relevance;
+    };
+}
diff --git a/src/game/playerbot/strategy/generic/PassiveStrategy.cpp b/src/game/playerbot/strategy/generic/PassiveStrategy.cpp
new file mode 100644
index 00000000000..a4bb3fa85aa
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/PassiveStrategy.cpp
@@ -0,0 +1,13 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PassiveStrategy.h"
+#include "../PassiveMultiplier.h"
+
+using namespace ai;
+
+
+void PassiveStrategy::InitMultipliers(std::list<Multiplier*> &multipliers)
+{
+    multipliers.push_back(new PassiveMultiplier(ai));
+}
+
diff --git a/src/game/playerbot/strategy/generic/PassiveStrategy.h b/src/game/playerbot/strategy/generic/PassiveStrategy.h
new file mode 100644
index 00000000000..8e963885a73
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/PassiveStrategy.h
@@ -0,0 +1,16 @@
+#pragma once
+
+namespace ai
+{
+    class PassiveStrategy : public Strategy
+    {
+    public:
+        PassiveStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitMultipliers(std::list<Multiplier*> &multipliers);
+        virtual string getName() { return "passive"; }
+    };
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/PullStrategy.cpp b/src/game/playerbot/strategy/generic/PullStrategy.cpp
new file mode 100644
index 00000000000..5d82db38377
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/PullStrategy.cpp
@@ -0,0 +1,52 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "../PassiveMultiplier.h"
+#include "PullStrategy.h"
+
+using namespace ai;
+
+class MagePullMultiplier : public PassiveMultiplier
+{
+public:
+    MagePullMultiplier(PlayerbotAI* ai, string action) : PassiveMultiplier(ai)
+    {
+        this->action = action;
+    }
+
+public:
+    virtual float GetValue(Action* action);
+
+private:
+    string action;
+};
+
+float MagePullMultiplier::GetValue(Action* action) 
+{
+    if (!action) 
+        return 1.0f;
+
+    string name = action->getName();
+    if (this->action == name ||
+        name == "reach spell" ||
+        name == "change strategy")
+        return 1.0f;
+
+    return PassiveMultiplier::GetValue(action);
+}
+
+NextAction** PullStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction(action, 105.0f), new NextAction("follow", 104.0f), new NextAction("end pull", 103.0f), NULL);
+}
+
+void PullStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    RangedCombatStrategy::InitTriggers(triggers);
+}
+
+void PullStrategy::InitMultipliers(std::list<Multiplier*> &multipliers)
+{
+    multipliers.push_back(new MagePullMultiplier(ai, action));
+    RangedCombatStrategy::InitMultipliers(multipliers);
+}
+
diff --git a/src/game/playerbot/strategy/generic/PullStrategy.h b/src/game/playerbot/strategy/generic/PullStrategy.h
new file mode 100644
index 00000000000..b19210a0723
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/PullStrategy.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "RangedCombatStrategy.h"
+
+namespace ai
+{
+    class PullStrategy : public RangedCombatStrategy
+    {
+    public:
+        PullStrategy(PlayerbotAI* ai, string action) : RangedCombatStrategy(ai) 
+        {
+            this->action = action;
+        }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual void InitMultipliers(std::list<Multiplier*> &multipliers);
+        virtual string getName() { return "pull"; }
+        virtual NextAction** getDefaultActions();
+
+    private:
+        string action;
+    };
+}
diff --git a/src/game/playerbot/strategy/generic/QuestStrategies.cpp b/src/game/playerbot/strategy/generic/QuestStrategies.cpp
new file mode 100644
index 00000000000..62b3e43061d
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/QuestStrategies.cpp
@@ -0,0 +1,69 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "QuestStrategies.h"
+
+using namespace ai;
+
+QuestStrategy::QuestStrategy(PlayerbotAI* ai) : PassTroughStrategy(ai)
+{
+    supported.push_back("accept quest");
+}
+
+void QuestStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    PassTroughStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "quest share",
+        NextAction::array(0, new NextAction("accept quest share", relevance), NULL)));
+}
+
+
+void DefaultQuestStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    QuestStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "use game object",
+        NextAction::array(0,
+            new NextAction("talk to quest giver", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "gossip hello",
+        NextAction::array(0,
+            new NextAction("talk to quest giver", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "complete quest",
+        NextAction::array(0, new NextAction("talk to quest giver", relevance), NULL)));
+}
+
+DefaultQuestStrategy::DefaultQuestStrategy(PlayerbotAI* ai) : QuestStrategy(ai)
+{
+}
+
+
+
+void AcceptAllQuestsStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    QuestStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "use game object",
+        NextAction::array(0,
+            new NextAction("talk to quest giver", relevance), new NextAction("accept all quests", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "gossip hello",
+        NextAction::array(0,
+            new NextAction("talk to quest giver", relevance), new NextAction("accept all quests", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "complete quest",
+        NextAction::array(0, 
+            new NextAction("talk to quest giver", relevance), new NextAction("accept all quests", relevance), NULL)));
+}
+
+AcceptAllQuestsStrategy::AcceptAllQuestsStrategy(PlayerbotAI* ai) : QuestStrategy(ai)
+{
+}
diff --git a/src/game/playerbot/strategy/generic/QuestStrategies.h b/src/game/playerbot/strategy/generic/QuestStrategies.h
new file mode 100644
index 00000000000..08423dd4929
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/QuestStrategies.h
@@ -0,0 +1,34 @@
+#pragma once
+#include "PassTroughStrategy.h"
+
+namespace ai
+{
+    class QuestStrategy : public PassTroughStrategy
+    {
+    public:
+        QuestStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+    class DefaultQuestStrategy : public QuestStrategy
+    {
+    public:
+        DefaultQuestStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "quest"; }
+    };
+
+    class AcceptAllQuestsStrategy : public QuestStrategy
+    {
+    public:
+        AcceptAllQuestsStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "accept all quests"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/generic/RacialsStrategy.cpp b/src/game/playerbot/strategy/generic/RacialsStrategy.cpp
new file mode 100644
index 00000000000..58fa904742f
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/RacialsStrategy.cpp
@@ -0,0 +1,39 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RacialsStrategy.h"
+
+using namespace ai;
+
+
+class RacialsStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    RacialsStrategyActionNodeFactory()
+    {
+        creators["lifeblood"] = &lifeblood;
+    }
+private:
+    static ActionNode* lifeblood(PlayerbotAI* ai)
+    {
+        return new ActionNode ("lifeblood",  
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("gift of the naaru"), NULL), 
+            /*C*/ NULL);
+    }
+};
+
+void RacialsStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+	triggers.push_back(new TriggerNode(
+		"low health", 
+		NextAction::array(0, new NextAction("lifeblood", 71.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low mana", 
+        NextAction::array(0, new NextAction("arcane torrent", ACTION_EMERGENCY + 6), NULL)));
+}
+
+RacialsStrategy::RacialsStrategy(PlayerbotAI* ai) : Strategy(ai)
+{
+    actionNodeFactories.Add(new RacialsStrategyActionNodeFactory());
+}
diff --git a/src/game/playerbot/strategy/generic/RacialsStrategy.h b/src/game/playerbot/strategy/generic/RacialsStrategy.h
new file mode 100644
index 00000000000..68021789f22
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/RacialsStrategy.h
@@ -0,0 +1,15 @@
+#pragma once
+
+namespace ai
+{
+    class RacialsStrategy : public Strategy
+    {
+    public:
+        RacialsStrategy(PlayerbotAI* ai);
+        virtual string getName() { return "racials"; }
+    
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/generic/RangedCombatStrategy.cpp b/src/game/playerbot/strategy/generic/RangedCombatStrategy.cpp
new file mode 100644
index 00000000000..9fd6ad9ed1d
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/RangedCombatStrategy.cpp
@@ -0,0 +1,15 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RangedCombatStrategy.h"
+
+using namespace ai;
+
+
+void RangedCombatStrategy::InitTriggers(list<TriggerNode*> &triggers)
+{
+    CombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "enemy out of spell",
+        NextAction::array(0, new NextAction("reach spell", ACTION_NORMAL + 9), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/RangedCombatStrategy.h b/src/game/playerbot/strategy/generic/RangedCombatStrategy.h
new file mode 100644
index 00000000000..a00cbc1c388
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/RangedCombatStrategy.h
@@ -0,0 +1,15 @@
+#include "CombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class RangedCombatStrategy : public CombatStrategy
+    {
+    public:
+        RangedCombatStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual int GetType() { return STRATEGY_TYPE_COMBAT | STRATEGY_TYPE_RANGED; }
+    };
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/RunawayStrategy.cpp b/src/game/playerbot/strategy/generic/RunawayStrategy.cpp
new file mode 100644
index 00000000000..5ac877b089b
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/RunawayStrategy.cpp
@@ -0,0 +1,18 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RunawayStrategy.h"
+
+using namespace ai;
+
+
+NextAction** RunawayStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("runaway", 50.0f), NULL);
+}
+
+void RunawayStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "enemy too close for spell",
+        NextAction::array(0, new NextAction("runaway", 50.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/RunawayStrategy.h b/src/game/playerbot/strategy/generic/RunawayStrategy.h
new file mode 100644
index 00000000000..d1c3ef50f42
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/RunawayStrategy.h
@@ -0,0 +1,16 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class RunawayStrategy : public NonCombatStrategy
+       {
+       public:
+           RunawayStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+           virtual string getName() { return "runaway"; }
+           virtual NextAction** getDefaultActions();
+           virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+       };
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/StayStrategy.cpp b/src/game/playerbot/strategy/generic/StayStrategy.cpp
new file mode 100644
index 00000000000..f8cbf96f24e
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/StayStrategy.cpp
@@ -0,0 +1,11 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "StayStrategy.h"
+
+using namespace ai;
+
+NextAction** StayStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("stay", 1.0f), NULL);
+}
+
diff --git a/src/game/playerbot/strategy/generic/StayStrategy.h b/src/game/playerbot/strategy/generic/StayStrategy.h
new file mode 100644
index 00000000000..d9f4229e538
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/StayStrategy.h
@@ -0,0 +1,14 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class StayStrategy : public NonCombatStrategy
+    {
+    public:
+        StayStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "stay"; }
+        virtual NextAction** getDefaultActions();
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/TankAoeStrategy.cpp b/src/game/playerbot/strategy/generic/TankAoeStrategy.cpp
new file mode 100644
index 00000000000..29afdec2bbb
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/TankAoeStrategy.cpp
@@ -0,0 +1,12 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TankAoeStrategy.h"
+
+using namespace ai;
+
+void TankAoeStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "tank aoe",
+        NextAction::array(0, new NextAction("tank assist", 50.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/TankAoeStrategy.h b/src/game/playerbot/strategy/generic/TankAoeStrategy.h
new file mode 100644
index 00000000000..f9ed2fb7304
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/TankAoeStrategy.h
@@ -0,0 +1,18 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class TankAoeStrategy : public NonCombatStrategy
+    {
+    public:
+        TankAoeStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "tank aoe"; }
+        virtual int GetType() { return STRATEGY_TYPE_TANK; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/TankAssistStrategy.cpp b/src/game/playerbot/strategy/generic/TankAssistStrategy.cpp
new file mode 100644
index 00000000000..d54b8efe12f
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/TankAssistStrategy.cpp
@@ -0,0 +1,13 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TankAssistStrategy.h"
+
+using namespace ai;
+
+
+void TankAssistStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "no attackers",
+        NextAction::array(0, new NextAction("tank assist", 50.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/TankAssistStrategy.h b/src/game/playerbot/strategy/generic/TankAssistStrategy.h
new file mode 100644
index 00000000000..3ecbbb94902
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/TankAssistStrategy.h
@@ -0,0 +1,17 @@
+#include "../generic/NonCombatStrategy.h"
+#pragma once
+
+namespace ai
+{
+    class TankAssistStrategy : public NonCombatStrategy
+    {
+    public:
+        TankAssistStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "tank assist"; }
+        virtual int GetType() { return STRATEGY_TYPE_TANK; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/TellTargetStrategy.cpp b/src/game/playerbot/strategy/generic/TellTargetStrategy.cpp
new file mode 100644
index 00000000000..ce1340d4c0f
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/TellTargetStrategy.cpp
@@ -0,0 +1,13 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TellTargetStrategy.h"
+
+using namespace ai;
+
+
+void TellTargetStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "target changed",
+        NextAction::array(0, new NextAction("tell target", 51.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/TellTargetStrategy.h b/src/game/playerbot/strategy/generic/TellTargetStrategy.h
new file mode 100644
index 00000000000..22b2e2f2e81
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/TellTargetStrategy.h
@@ -0,0 +1,16 @@
+#pragma once
+
+namespace ai
+{
+    class TellTargetStrategy : public Strategy
+    {
+    public:
+        TellTargetStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "TellTarget"; }
+    };
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/ThreatStrategy.cpp b/src/game/playerbot/strategy/generic/ThreatStrategy.cpp
new file mode 100644
index 00000000000..155dc247d12
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/ThreatStrategy.cpp
@@ -0,0 +1,32 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ThreatStrategy.h"
+#include "../../PlayerbotAIConfig.h"
+#include "../actions/GenericSpellActions.h"
+
+using namespace ai;
+
+float ThreatMultiplier::GetValue(Action* action)
+{
+    if (action == NULL || action->getThreatType() == ACTION_THREAT_NONE)
+        return 1.0f;
+
+    if (action->getThreatType() == ACTION_THREAT_AOE)
+    {
+        uint8 threat = AI_VALUE2(uint8, "threat", "aoe");
+        if (threat >= 90)
+            return 0.0f;
+    }
+
+    uint8 threat = AI_VALUE2(uint8, "threat", "current target");
+
+    if (threat >= 90)
+        return 0.0f;
+
+    return 1.0f;
+}
+
+void ThreatStrategy::InitMultipliers(std::list<Multiplier*> &multipliers)
+{
+    multipliers.push_back(new ThreatMultiplier(ai));
+}
diff --git a/src/game/playerbot/strategy/generic/ThreatStrategy.h b/src/game/playerbot/strategy/generic/ThreatStrategy.h
new file mode 100644
index 00000000000..406f43320af
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/ThreatStrategy.h
@@ -0,0 +1,25 @@
+#pragma once
+
+namespace ai
+{
+    class ThreatMultiplier : public Multiplier
+    {
+    public:
+        ThreatMultiplier(PlayerbotAI* ai) : Multiplier(ai, "threat") {}
+
+    public:
+        virtual float GetValue(Action* action);
+    };
+
+    class ThreatStrategy : public Strategy
+    {
+    public:
+        ThreatStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitMultipliers(std::list<Multiplier*> &multipliers);
+        virtual string getName() { return "threat"; }
+    };
+
+
+}
diff --git a/src/game/playerbot/strategy/generic/UseFoodStrategy.cpp b/src/game/playerbot/strategy/generic/UseFoodStrategy.cpp
new file mode 100644
index 00000000000..b141a46ad71
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/UseFoodStrategy.cpp
@@ -0,0 +1,18 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "UseFoodStrategy.h"
+
+using namespace ai;
+
+void UseFoodStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    Strategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("food", 2.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low mana",
+        NextAction::array(0, new NextAction("drink", 2.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/UseFoodStrategy.h b/src/game/playerbot/strategy/generic/UseFoodStrategy.h
new file mode 100644
index 00000000000..b68ab35e777
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/UseFoodStrategy.h
@@ -0,0 +1,15 @@
+#pragma once
+
+namespace ai
+{
+    class UseFoodStrategy : public Strategy
+    {
+    public:
+        UseFoodStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "food"; }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/UsePotionsStrategy.cpp b/src/game/playerbot/strategy/generic/UsePotionsStrategy.cpp
new file mode 100644
index 00000000000..09616bb09ea
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/UsePotionsStrategy.cpp
@@ -0,0 +1,18 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "UsePotionsStrategy.h"
+
+using namespace ai;
+
+void UsePotionsStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    Strategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("healing potion", ACTION_MEDIUM_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low mana",
+        NextAction::array(0,  new NextAction("mana potion", ACTION_EMERGENCY), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/UsePotionsStrategy.h b/src/game/playerbot/strategy/generic/UsePotionsStrategy.h
new file mode 100644
index 00000000000..b48f89f98d7
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/UsePotionsStrategy.h
@@ -0,0 +1,15 @@
+#pragma once
+
+namespace ai
+{
+    class UsePotionsStrategy : public Strategy
+    {
+    public:
+        UsePotionsStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "potions"; }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/generic/WorldPacketHandlerStrategy.cpp b/src/game/playerbot/strategy/generic/WorldPacketHandlerStrategy.cpp
new file mode 100644
index 00000000000..83fbb52f9a9
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/WorldPacketHandlerStrategy.cpp
@@ -0,0 +1,116 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WorldPacketHandlerStrategy.h"
+
+using namespace ai;
+
+void WorldPacketHandlerStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    PassTroughStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "group invite",
+        NextAction::array(0, new NextAction("accept invitation", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "group set leader",
+        NextAction::array(0, new NextAction("leader", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "not enough money",
+        NextAction::array(0, new NextAction("tell not enough money", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "not enough reputation",
+        NextAction::array(0, new NextAction("tell not enough reputation", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cannot equip",
+        NextAction::array(0, new NextAction("tell cannot equip", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "use game object",
+        NextAction::array(0,
+            new NextAction("add loot", relevance),
+            new NextAction("use meeting stone", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "gossip hello",
+        NextAction::array(0,
+            new NextAction("trainer", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "activate taxi",
+        NextAction::array(0, new NextAction("remember taxi", relevance), new NextAction("taxi", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "taxi done",
+        NextAction::array(0, new NextAction("taxi", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "trade status",
+        NextAction::array(0, new NextAction("accept trade", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "area trigger",
+        NextAction::array(0, new NextAction("reach area trigger", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "within area trigger",
+        NextAction::array(0, new NextAction("area trigger", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "loot response",
+        NextAction::array(0, new NextAction("store loot", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "item push result",
+        NextAction::array(0, new NextAction("query item usage", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "ready check finished",
+        NextAction::array(0, new NextAction("finish ready check", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "no possible targets",
+        NextAction::array(0, new NextAction("lfg join", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "seldom",
+        NextAction::array(0, new NextAction("lfg leave", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "lfg proposal",
+        NextAction::array(0, new NextAction("lfg accept", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "lfg proposal active",
+        NextAction::array(0, new NextAction("lfg accept", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "often",
+        NextAction::array(0, new NextAction("security check", relevance), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "guild invite",
+        NextAction::array(0, new NextAction("guild accept", relevance), NULL)));
+}
+
+WorldPacketHandlerStrategy::WorldPacketHandlerStrategy(PlayerbotAI* ai) : PassTroughStrategy(ai)
+{
+    supported.push_back("loot roll");
+    supported.push_back("check mount state");
+    supported.push_back("quest objective completed");
+    supported.push_back("party command");
+    supported.push_back("ready check");
+    supported.push_back("uninvite");
+    supported.push_back("lfg role check");
+}
+
+
+void ReadyCheckStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "timer",
+        NextAction::array(0, new NextAction("ready check", relevance), NULL)));
+}
diff --git a/src/game/playerbot/strategy/generic/WorldPacketHandlerStrategy.h b/src/game/playerbot/strategy/generic/WorldPacketHandlerStrategy.h
new file mode 100644
index 00000000000..6a5a44d83ef
--- /dev/null
+++ b/src/game/playerbot/strategy/generic/WorldPacketHandlerStrategy.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "PassTroughStrategy.h"
+
+namespace ai
+{
+    class WorldPacketHandlerStrategy : public PassTroughStrategy
+    {
+    public:
+        WorldPacketHandlerStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "default"; }
+    };
+
+    class ReadyCheckStrategy : public PassTroughStrategy
+    {
+    public:
+        ReadyCheckStrategy(PlayerbotAI* ai) : PassTroughStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "ready check"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/hunter/DpsHunterStrategy.cpp b/src/game/playerbot/strategy/hunter/DpsHunterStrategy.cpp
new file mode 100644
index 00000000000..bb6c4772cba
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/DpsHunterStrategy.cpp
@@ -0,0 +1,118 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+
+#include "HunterMultipliers.h"
+#include "DpsHunterStrategy.h"
+
+using namespace ai;
+
+class DpsHunterStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    DpsHunterStrategyActionNodeFactory()
+    {
+        creators["aimed shot"] = &aimed_shot;
+        creators["chimera shot"] = &chimera_shot;
+        creators["explosive shot"] = &explosive_shot;
+        creators["concussive shot"] = &concussive_shot;
+        creators["viper sting"] = &viper_sting;
+    }
+private:
+    static ActionNode* viper_sting(PlayerbotAI* ai)
+    {
+        return new ActionNode ("viper sting",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("mana potion", 10.0f), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* aimed_shot(PlayerbotAI* ai)
+    {
+        return new ActionNode ("aimed shot",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("chimera shot", 10.0f), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* chimera_shot(PlayerbotAI* ai)
+    {
+        return new ActionNode ("chimera shot",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("arcane shot", 10.0f), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* explosive_shot(PlayerbotAI* ai)
+    {
+        return new ActionNode ("explosive shot",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("aimed shot"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* concussive_shot(PlayerbotAI* ai)
+    {
+        return new ActionNode ("concussive shot",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NextAction::array(0, new NextAction("wyvern sting", 11.0f), NULL));
+    }
+
+};
+
+DpsHunterStrategy::DpsHunterStrategy(PlayerbotAI* ai) : GenericHunterStrategy(ai)
+{
+    actionNodeFactories.Add(new DpsHunterStrategyActionNodeFactory());
+}
+
+NextAction** DpsHunterStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("explosive shot", 11.0f), new NextAction("auto shot", 10.0f), NULL);
+}
+
+void DpsHunterStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericHunterStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "black arrow",
+        NextAction::array(0, new NextAction("black arrow", 51.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low mana",
+        NextAction::array(0, new NextAction("viper sting", ACTION_EMERGENCY + 5), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "no pet",
+        NextAction::array(0, new NextAction("call pet", 60.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "hunters pet low health",
+        NextAction::array(0, new NextAction("mend pet", 60.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "hunter's mark",
+        NextAction::array(0, new NextAction("hunter's mark", 52.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "freezing trap",
+        NextAction::array(0, new NextAction("freezing trap", 83.0f), NULL)));
+}
+
+void DpsAoeHunterStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("multi-shot", 20.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"high aoe",
+		NextAction::array(0, new NextAction("volley", 20.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"serpent sting on attacker",
+		NextAction::array(0, new NextAction("serpent sting on attacker", 49.0f), NULL)));
+}
+
+void DpsHunterDebuffStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "no stings",
+        NextAction::array(0, new NextAction("serpent sting", 50.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/hunter/DpsHunterStrategy.h b/src/game/playerbot/strategy/hunter/DpsHunterStrategy.h
new file mode 100644
index 00000000000..4992e0e15ea
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/DpsHunterStrategy.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "GenericHunterStrategy.h"
+#include "../generic/CombatStrategy.h"
+
+namespace ai
+{
+    class DpsHunterStrategy : public GenericHunterStrategy
+    {
+    public:
+        DpsHunterStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "dps"; }
+        virtual NextAction** getDefaultActions();
+
+    };
+
+    class DpsAoeHunterStrategy : public CombatStrategy
+    {
+    public:
+        DpsAoeHunterStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "aoe"; }
+    };
+
+    class DpsHunterDebuffStrategy : public CombatStrategy
+    {
+    public:
+        DpsHunterDebuffStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "dps debuff"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/hunter/GenericHunterNonCombatStrategy.cpp b/src/game/playerbot/strategy/hunter/GenericHunterNonCombatStrategy.cpp
new file mode 100644
index 00000000000..6fab572b728
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/GenericHunterNonCombatStrategy.cpp
@@ -0,0 +1,58 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "HunterMultipliers.h"
+#include "GenericHunterNonCombatStrategy.h"
+
+using namespace ai;
+
+class GenericHunterNonCombatStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    GenericHunterNonCombatStrategyActionNodeFactory()
+    {
+        creators["rapid fire"] = &rapid_fire;
+        creators["boost"] = &rapid_fire;
+        creators["aspect of the pack"] = &aspect_of_the_pack;
+    }
+private:
+    static ActionNode* rapid_fire(PlayerbotAI* ai)
+    {
+        return new ActionNode ("rapid fire",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("readiness"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* aspect_of_the_pack(PlayerbotAI* ai)
+    {
+        return new ActionNode ("aspect of the pack",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("aspect of the cheetah"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+GenericHunterNonCombatStrategy::GenericHunterNonCombatStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericHunterNonCombatStrategyActionNodeFactory());
+}
+
+void GenericHunterNonCombatStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    NonCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "trueshot aura",
+        NextAction::array(0, new NextAction("trueshot aura", 2.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "no pet",
+        NextAction::array(0, new NextAction("call pet", 60.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "hunters pet dead",
+        NextAction::array(0, new NextAction("revive pet", 60.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "hunters pet low health",
+        NextAction::array(0, new NextAction("mend pet", 60.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/hunter/GenericHunterNonCombatStrategy.h b/src/game/playerbot/strategy/hunter/GenericHunterNonCombatStrategy.h
new file mode 100644
index 00000000000..d01486d6d51
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/GenericHunterNonCombatStrategy.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "../generic/NonCombatStrategy.h"
+
+namespace ai
+{
+    class GenericHunterNonCombatStrategy : public NonCombatStrategy
+    {
+    public:
+        GenericHunterNonCombatStrategy(PlayerbotAI* ai);
+        virtual string getName() { return "nc"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+}
diff --git a/src/game/playerbot/strategy/hunter/GenericHunterStrategy.cpp b/src/game/playerbot/strategy/hunter/GenericHunterStrategy.cpp
new file mode 100644
index 00000000000..e4c5d450e62
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/GenericHunterStrategy.cpp
@@ -0,0 +1,66 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GenericHunterStrategy.h"
+#include "HunterAiObjectContext.h"
+
+using namespace ai;
+
+class GenericHunterStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    GenericHunterStrategyActionNodeFactory()
+    {
+        creators["rapid fire"] = &rapid_fire;
+        creators["boost"] = &rapid_fire;
+        creators["aspect of the pack"] = &aspect_of_the_pack;
+        creators["feign death"] = &feign_death;
+    }
+private:
+    static ActionNode* rapid_fire(PlayerbotAI* ai)
+    {
+        return new ActionNode ("rapid fire",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("readiness"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* aspect_of_the_pack(PlayerbotAI* ai)
+    {
+        return new ActionNode ("aspect of the pack",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("aspect of the cheetah"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* feign_death(PlayerbotAI* ai)
+    {
+        return new ActionNode ("feign death",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("flee"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+GenericHunterStrategy::GenericHunterStrategy(PlayerbotAI* ai) : RangedCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericHunterStrategyActionNodeFactory());
+}
+
+void GenericHunterStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    RangedCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "enemy too close for spell",
+        NextAction::array(0, new NextAction("wing clip", 50.0f), new NextAction("flee",49.0f), new NextAction("concussive shot", 48.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium threat",
+        NextAction::array(0, new NextAction("feign death", 52.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "hunters pet low health",
+        NextAction::array(0, new NextAction("mend pet", 60.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "rapid fire",
+        NextAction::array(0, new NextAction("rapid fire", 55.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/hunter/GenericHunterStrategy.h b/src/game/playerbot/strategy/hunter/GenericHunterStrategy.h
new file mode 100644
index 00000000000..f2db28ceab8
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/GenericHunterStrategy.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "../Strategy.h"
+#include "../generic/RangedCombatStrategy.h"
+
+namespace ai
+{
+    class AiObjectContext;
+
+    class GenericHunterStrategy : public RangedCombatStrategy
+    {
+    public:
+        GenericHunterStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "hunter"; }
+    };
+}
+
diff --git a/src/game/playerbot/strategy/hunter/HunterActions.cpp b/src/game/playerbot/strategy/hunter/HunterActions.cpp
new file mode 100644
index 00000000000..bdf67610464
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/HunterActions.cpp
@@ -0,0 +1,26 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "../actions/GenericActions.h"
+#include "HunterActions.h"
+
+using namespace ai;
+
+bool CastSerpentStingAction::isUseful()
+{
+    return AI_VALUE2(uint8, "health", "current target") > 50;
+}
+
+bool CastViperStingAction::isUseful()
+{
+    return AI_VALUE2(uint8, "mana", "self target") < 50 && AI_VALUE2(uint8, "mana", "current target") >= 30;
+}
+
+bool CastAspectOfTheCheetahAction::isUseful() 
+{
+    return !ai->HasAnyAuraOf(GetTarget(), "aspect of the cheetah", "aspect of the pack", NULL);
+}
+
+Value<Unit*>* CastFreezingTrap::GetTargetValue()
+{
+    return context->GetValue<Unit*>("cc target", "freezing trap");
+}
diff --git a/src/game/playerbot/strategy/hunter/HunterActions.h b/src/game/playerbot/strategy/hunter/HunterActions.h
new file mode 100644
index 00000000000..74611cedc52
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/HunterActions.h
@@ -0,0 +1,154 @@
+#pragma once
+
+#include "../actions/GenericActions.h"
+
+namespace ai
+{
+    BEGIN_RANGED_SPELL_ACTION(CastHuntersMarkAction, "hunter's mark")
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastAutoShotAction, "auto shot")
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastArcaneShotAction, "arcane shot")
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastExplosiveShotAction, "explosive shot")
+    END_SPELL_ACTION()
+
+
+    BEGIN_RANGED_SPELL_ACTION(CastAimedShotAction, "aimed shot")
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastChimeraShotAction, "chimera shot")
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastConcussiveShotAction, "concussive shot")
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastDistractingShotAction, "distracting shot")
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastMultiShotAction, "multi-shot")
+    END_SPELL_ACTION()
+
+	BEGIN_RANGED_SPELL_ACTION(CastVolleyAction, "volley")
+	END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastSerpentStingAction, "serpent sting")
+    virtual bool isUseful();
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastWyvernStingAction, "wyvern sting")
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastViperStingAction, "viper sting")
+    virtual bool isUseful();
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastScorpidStingAction, "scorpid sting")
+    END_SPELL_ACTION()
+
+	class CastAspectOfTheHawkAction : public CastBuffSpellAction
+	{
+	public:
+		CastAspectOfTheHawkAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "aspect of the hawk") {}
+	};
+
+	class CastAspectOfTheWildAction : public CastBuffSpellAction
+	{
+	public:
+		CastAspectOfTheWildAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "aspect of the wild") {}
+	};
+
+	class CastAspectOfTheCheetahAction : public CastBuffSpellAction
+	{
+	public:
+		CastAspectOfTheCheetahAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "aspect of the cheetah") {}
+		virtual bool isUseful();
+	};
+
+	class CastAspectOfThePackAction : public CastBuffSpellAction
+	{
+	public:
+		CastAspectOfThePackAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "aspect of the pack") {}
+	};
+
+	class CastAspectOfTheViperAction : public CastBuffSpellAction
+	{
+	public:
+		CastAspectOfTheViperAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "aspect of the viper") {}
+	};
+
+	class CastCallPetAction : public CastBuffSpellAction
+	{
+	public:
+		CastCallPetAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "call pet") {}
+	};
+
+	class CastMendPetAction : public CastAuraSpellAction
+	{
+	public:
+		CastMendPetAction(PlayerbotAI* ai) : CastAuraSpellAction(ai, "mend pet") {}
+		virtual string GetTargetName() { return "pet target"; }
+	};
+
+	class CastRevivePetAction : public CastBuffSpellAction
+	{
+	public:
+		CastRevivePetAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "revive pet") {}
+	};
+
+    class CastTrueshotAuraAction : public CastBuffSpellAction
+    {
+    public:
+        CastTrueshotAuraAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "trueshot aura") {}
+    };
+
+    class CastFeignDeathAction : public CastBuffSpellAction
+    {
+    public:
+        CastFeignDeathAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "feign death") {}
+    };
+
+	class CastRapidFireAction : public CastBuffSpellAction
+	{
+	public:
+		CastRapidFireAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "rapid fire") {}
+	};
+
+	class CastReadinessAction : public CastBuffSpellAction
+	{
+	public:
+		CastReadinessAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "readiness") {}
+	};
+
+	class CastBlackArrow : public CastDebuffSpellAction
+	{
+	public:
+		CastBlackArrow(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "black arrow") {}
+	};
+
+    class CastFreezingTrap : public CastDebuffSpellAction
+    {
+    public:
+        CastFreezingTrap(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "freezing trap") {}
+        virtual Value<Unit*>* GetTargetValue();
+    };
+
+    class CastWingClipAction : public CastMeleeSpellAction
+    {
+    public:
+        CastWingClipAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "wing clip") {}
+        virtual bool isUseful()
+        {
+            return CastMeleeSpellAction::isUseful() && !ai->HasAura(spell, GetTarget());
+        }
+    };
+
+    class CastSerpentStingOnAttackerAction : public CastDebuffSpellOnAttackerAction
+    {
+    public:
+        CastSerpentStingOnAttackerAction(PlayerbotAI* ai) : CastDebuffSpellOnAttackerAction(ai, "serpent sting") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/hunter/HunterAiObjectContext.cpp b/src/game/playerbot/strategy/hunter/HunterAiObjectContext.cpp
new file mode 100644
index 00000000000..dd625232a1b
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/HunterAiObjectContext.cpp
@@ -0,0 +1,191 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "HunterActions.h"
+#include "HunterTriggers.h"
+#include "HunterAiObjectContext.h"
+#include "DpsHunterStrategy.h"
+#include "GenericHunterNonCombatStrategy.h"
+#include "HunterBuffStrategies.h"
+#include "../NamedObjectContext.h"
+
+using namespace ai;
+
+
+namespace ai
+{
+    namespace hunter
+    {
+        using namespace ai;
+
+        class StrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            StrategyFactoryInternal()
+            {
+                creators["dps"] = &hunter::StrategyFactoryInternal::dps;
+                creators["nc"] = &hunter::StrategyFactoryInternal::nc;
+                creators["aoe"] = &hunter::StrategyFactoryInternal::aoe;
+                creators["dps debuff"] = &hunter::StrategyFactoryInternal::dps_debuff;
+            }
+
+        private:
+            static Strategy* aoe(PlayerbotAI* ai) { return new DpsAoeHunterStrategy(ai); }
+            static Strategy* dps(PlayerbotAI* ai) { return new DpsHunterStrategy(ai); }
+            static Strategy* nc(PlayerbotAI* ai) { return new GenericHunterNonCombatStrategy(ai); }
+            static Strategy* dps_debuff(PlayerbotAI* ai) { return new DpsHunterDebuffStrategy(ai); }
+        };
+
+        class BuffStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            BuffStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["bspeed"] = &hunter::BuffStrategyFactoryInternal::bspeed;
+                creators["bdps"] = &hunter::BuffStrategyFactoryInternal::bdps;
+                creators["bmana"] = &hunter::BuffStrategyFactoryInternal::bmana;
+                creators["rnature"] = &hunter::BuffStrategyFactoryInternal::rnature;
+            }
+
+        private:
+            static Strategy* bspeed(PlayerbotAI* ai) { return new HunterBuffSpeedStrategy(ai); }
+            static Strategy* bdps(PlayerbotAI* ai) { return new HunterBuffDpsStrategy(ai); }
+            static Strategy* bmana(PlayerbotAI* ai) { return new HunterBuffManaStrategy(ai); }
+            static Strategy* rnature(PlayerbotAI* ai) { return new HunterNatureResistanceStrategy(ai); }
+        };
+    };
+};
+
+
+namespace ai
+{
+    namespace hunter
+    {
+        using namespace ai;
+
+        class TriggerFactoryInternal : public NamedObjectContext<Trigger>
+        {
+        public:
+            TriggerFactoryInternal()
+            {
+                creators["aspect of the viper"] = &TriggerFactoryInternal::aspect_of_the_viper;
+                creators["black arrow"] = &TriggerFactoryInternal::black_arrow;
+                creators["no stings"] = &TriggerFactoryInternal::NoStings;
+                creators["hunters pet dead"] = &TriggerFactoryInternal::hunters_pet_dead;
+                creators["hunters pet low health"] = &TriggerFactoryInternal::hunters_pet_low_health;
+                creators["hunter's mark"] = &TriggerFactoryInternal::hunters_mark;
+                creators["freezing trap"] = &TriggerFactoryInternal::freezing_trap;
+                creators["aspect of the pack"] = &TriggerFactoryInternal::aspect_of_the_pack;
+                creators["rapid fire"] = &TriggerFactoryInternal::rapid_fire;
+                creators["aspect of the hawk"] = &TriggerFactoryInternal::aspect_of_the_hawk;
+                creators["aspect of the wild"] = &TriggerFactoryInternal::aspect_of_the_wild;
+                creators["aspect of the viper"] = &TriggerFactoryInternal::aspect_of_the_viper;
+                creators["trueshot aura"] = &TriggerFactoryInternal::trueshot_aura;
+                creators["serpent sting on attacker"] = &TriggerFactoryInternal::serpent_sting_on_attacker;
+            }
+
+        private:
+            static Trigger* serpent_sting_on_attacker(PlayerbotAI* ai) { return new SerpentStingOnAttackerTrigger(ai); }
+            static Trigger* trueshot_aura(PlayerbotAI* ai) { return new TrueshotAuraTrigger(ai); }
+            static Trigger* aspect_of_the_viper(PlayerbotAI* ai) { return new HunterAspectOfTheViperTrigger(ai); }
+            static Trigger* black_arrow(PlayerbotAI* ai) { return new BlackArrowTrigger(ai); }
+            static Trigger* NoStings(PlayerbotAI* ai) { return new HunterNoStingsActiveTrigger(ai); }
+            static Trigger* hunters_pet_dead(PlayerbotAI* ai) { return new HuntersPetDeadTrigger(ai); }
+            static Trigger* hunters_pet_low_health(PlayerbotAI* ai) { return new HuntersPetLowHealthTrigger(ai); }
+            static Trigger* hunters_mark(PlayerbotAI* ai) { return new HuntersMarkTrigger(ai); }
+            static Trigger* freezing_trap(PlayerbotAI* ai) { return new FreezingTrapTrigger(ai); }
+            static Trigger* aspect_of_the_pack(PlayerbotAI* ai) { return new HunterAspectOfThePackTrigger(ai); }
+            static Trigger* rapid_fire(PlayerbotAI* ai) { return new RapidFireTrigger(ai); }
+            static Trigger* aspect_of_the_hawk(PlayerbotAI* ai) { return new HunterAspectOfTheHawkTrigger(ai); }
+            static Trigger* aspect_of_the_wild(PlayerbotAI* ai) { return new HunterAspectOfTheWildTrigger(ai); }
+        };
+    };
+};
+
+
+
+namespace ai
+{
+    namespace hunter
+    {
+        using namespace ai;
+
+        class AiObjectContextInternal : public NamedObjectContext<Action>
+        {
+        public:
+            AiObjectContextInternal()
+            {
+                creators["auto shot"] = &AiObjectContextInternal::auto_shot;
+                creators["aimed shot"] = &AiObjectContextInternal::aimed_shot;
+                creators["chimera shot"] = &AiObjectContextInternal::chimera_shot;
+                creators["explosive shot"] = &AiObjectContextInternal::explosive_shot;
+                creators["arcane shot"] = &AiObjectContextInternal::arcane_shot;
+                creators["concussive shot"] = &AiObjectContextInternal::concussive_shot;
+                creators["distracting shot"] = &AiObjectContextInternal::distracting_shot;
+                creators["multi-shot"] = &AiObjectContextInternal::multi_shot;
+                creators["volley"] = &AiObjectContextInternal::volley;
+                creators["serpent sting"] = &AiObjectContextInternal::serpent_sting;
+                creators["serpent sting on attacker"] = &AiObjectContextInternal::serpent_sting_on_attacker;
+                creators["wyvern sting"] = &AiObjectContextInternal::wyvern_sting;
+                creators["viper sting"] = &AiObjectContextInternal::viper_sting;
+                creators["scorpid sting"] = &AiObjectContextInternal::scorpid_sting;
+                creators["hunter's mark"] = &AiObjectContextInternal::hunters_mark;
+                creators["mend pet"] = &AiObjectContextInternal::mend_pet;
+                creators["revive pet"] = &AiObjectContextInternal::revive_pet;
+                creators["call pet"] = &AiObjectContextInternal::call_pet;
+                creators["black arrow"] = &AiObjectContextInternal::black_arrow;
+                creators["freezing trap"] = &AiObjectContextInternal::freezing_trap;
+                creators["rapid fire"] = &AiObjectContextInternal::rapid_fire;
+                creators["boost"] = &AiObjectContextInternal::rapid_fire;
+                creators["readiness"] = &AiObjectContextInternal::readiness;
+                creators["aspect of the hawk"] = &AiObjectContextInternal::aspect_of_the_hawk;
+                creators["aspect of the wild"] = &AiObjectContextInternal::aspect_of_the_wild;
+                creators["aspect of the viper"] = &AiObjectContextInternal::aspect_of_the_viper;
+                creators["aspect of the pack"] = &AiObjectContextInternal::aspect_of_the_pack;
+                creators["aspect of the cheetah"] = &AiObjectContextInternal::aspect_of_the_cheetah;
+                creators["trueshot aura"] = &AiObjectContextInternal::trueshot_aura;
+                creators["feign death"] = &AiObjectContextInternal::feign_death;
+                creators["wing clip"] = &AiObjectContextInternal::wing_clip;
+            }
+
+        private:
+            static Action* feign_death(PlayerbotAI* ai) { return new CastFeignDeathAction(ai); }
+            static Action* trueshot_aura(PlayerbotAI* ai) { return new CastTrueshotAuraAction(ai); }
+            static Action* auto_shot(PlayerbotAI* ai) { return new CastAutoShotAction(ai); }
+            static Action* aimed_shot(PlayerbotAI* ai) { return new CastAimedShotAction(ai); }
+            static Action* chimera_shot(PlayerbotAI* ai) { return new CastChimeraShotAction(ai); }
+            static Action* explosive_shot(PlayerbotAI* ai) { return new CastExplosiveShotAction(ai); }
+            static Action* arcane_shot(PlayerbotAI* ai) { return new CastArcaneShotAction(ai); }
+            static Action* concussive_shot(PlayerbotAI* ai) { return new CastConcussiveShotAction(ai); }
+            static Action* distracting_shot(PlayerbotAI* ai) { return new CastDistractingShotAction(ai); }
+            static Action* multi_shot(PlayerbotAI* ai) { return new CastMultiShotAction(ai); }
+            static Action* volley(PlayerbotAI* ai) { return new CastVolleyAction(ai); }
+            static Action* serpent_sting(PlayerbotAI* ai) { return new CastSerpentStingAction(ai); }
+            static Action* serpent_sting_on_attacker(PlayerbotAI* ai) { return new CastSerpentStingOnAttackerAction(ai); }
+            static Action* wyvern_sting(PlayerbotAI* ai) { return new CastWyvernStingAction(ai); }
+            static Action* viper_sting(PlayerbotAI* ai) { return new CastViperStingAction(ai); }
+            static Action* scorpid_sting(PlayerbotAI* ai) { return new CastScorpidStingAction(ai); }
+            static Action* hunters_mark(PlayerbotAI* ai) { return new CastHuntersMarkAction(ai); }
+            static Action* mend_pet(PlayerbotAI* ai) { return new CastMendPetAction(ai); }
+            static Action* revive_pet(PlayerbotAI* ai) { return new CastRevivePetAction(ai); }
+            static Action* call_pet(PlayerbotAI* ai) { return new CastCallPetAction(ai); }
+            static Action* black_arrow(PlayerbotAI* ai) { return new CastBlackArrow(ai); }
+            static Action* freezing_trap(PlayerbotAI* ai) { return new CastFreezingTrap(ai); }
+            static Action* rapid_fire(PlayerbotAI* ai) { return new CastRapidFireAction(ai); }
+            static Action* readiness(PlayerbotAI* ai) { return new CastReadinessAction(ai); }
+            static Action* aspect_of_the_hawk(PlayerbotAI* ai) { return new CastAspectOfTheHawkAction(ai); }
+            static Action* aspect_of_the_wild(PlayerbotAI* ai) { return new CastAspectOfTheWildAction(ai); }
+            static Action* aspect_of_the_viper(PlayerbotAI* ai) { return new CastAspectOfTheViperAction(ai); }
+            static Action* aspect_of_the_pack(PlayerbotAI* ai) { return new CastAspectOfThePackAction(ai); }
+            static Action* aspect_of_the_cheetah(PlayerbotAI* ai) { return new CastAspectOfTheCheetahAction(ai); }
+            static Action* wing_clip(PlayerbotAI* ai) { return new CastWingClipAction(ai); }
+        };
+    };
+};
+
+HunterAiObjectContext::HunterAiObjectContext(PlayerbotAI* ai) : AiObjectContext(ai)
+{
+    strategyContexts.Add(new ai::hunter::StrategyFactoryInternal());
+    strategyContexts.Add(new ai::hunter::BuffStrategyFactoryInternal());
+    actionContexts.Add(new ai::hunter::AiObjectContextInternal());
+    triggerContexts.Add(new ai::hunter::TriggerFactoryInternal());
+}
diff --git a/src/game/playerbot/strategy/hunter/HunterAiObjectContext.h b/src/game/playerbot/strategy/hunter/HunterAiObjectContext.h
new file mode 100644
index 00000000000..8891a54894a
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/HunterAiObjectContext.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../AiObjectContext.h"
+
+namespace ai
+{
+    class HunterAiObjectContext : public AiObjectContext
+    {
+    public:
+        HunterAiObjectContext(PlayerbotAI* ai);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/hunter/HunterBuffStrategies.cpp b/src/game/playerbot/strategy/hunter/HunterBuffStrategies.cpp
new file mode 100644
index 00000000000..33f761286c1
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/HunterBuffStrategies.cpp
@@ -0,0 +1,35 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "HunterMultipliers.h"
+#include "HunterBuffStrategies.h"
+
+using namespace ai;
+
+void HunterBuffDpsStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+	triggers.push_back(new TriggerNode(
+		"aspect of the hawk", 
+		NextAction::array(0, new NextAction("aspect of the hawk", 90.0f), NULL)));
+}
+
+void HunterNatureResistanceStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+	triggers.push_back(new TriggerNode(
+		"aspect of the wild", 
+		NextAction::array(0, new NextAction("aspect of the wild", 90.0f), NULL)));
+}
+
+
+void HunterBuffSpeedStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "aspect of the pack",
+        NextAction::array(0, new NextAction("aspect of the pack", 10.0f), NULL)));
+}
+
+void HunterBuffManaStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "aspect of the viper",
+        NextAction::array(0, new NextAction("aspect of the viper", 10.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/hunter/HunterBuffStrategies.h b/src/game/playerbot/strategy/hunter/HunterBuffStrategies.h
new file mode 100644
index 00000000000..d59f2452ca7
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/HunterBuffStrategies.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "GenericHunterStrategy.h"
+#include "../generic/NonCombatStrategy.h"
+
+namespace ai
+{
+    class HunterBuffSpeedStrategy : public NonCombatStrategy
+    {
+    public:
+        HunterBuffSpeedStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "bspeed"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+    class HunterBuffManaStrategy : public NonCombatStrategy
+    {
+    public:
+        HunterBuffManaStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "bmana"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+	class HunterBuffDpsStrategy : public NonCombatStrategy
+	{
+	public:
+		HunterBuffDpsStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+		virtual string getName() { return "bdps"; }
+
+	public:
+		virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+	};
+
+	class HunterNatureResistanceStrategy : public NonCombatStrategy
+	{
+	public:
+		HunterNatureResistanceStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+		virtual string getName() { return "rnature"; }
+
+	public:
+		virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+	};
+}
diff --git a/src/game/playerbot/strategy/hunter/HunterMultipliers.cpp b/src/game/playerbot/strategy/hunter/HunterMultipliers.cpp
new file mode 100644
index 00000000000..9d0bdecc02c
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/HunterMultipliers.cpp
@@ -0,0 +1,5 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "HunterMultipliers.h"
+
+using namespace ai;
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/hunter/HunterMultipliers.h b/src/game/playerbot/strategy/hunter/HunterMultipliers.h
new file mode 100644
index 00000000000..7cfbdd46e87
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/HunterMultipliers.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace ai
+{
+   
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/hunter/HunterTriggers.cpp b/src/game/playerbot/strategy/hunter/HunterTriggers.cpp
new file mode 100644
index 00000000000..c356a0ef3b9
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/HunterTriggers.cpp
@@ -0,0 +1,29 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "HunterTriggers.h"
+#include "HunterActions.h"
+
+using namespace ai;
+
+bool HunterNoStingsActiveTrigger::IsActive()
+{
+	Unit* target = AI_VALUE(Unit*, "current target");
+    return target && AI_VALUE2(uint8, "health", "current target") > 40 &&
+        !ai->HasAura("serpent sting", target) &&
+        !ai->HasAura("scorpid sting", target) &&
+        !ai->HasAura("viper sting", target);
+}
+
+bool HuntersPetDeadTrigger::IsActive()
+{
+    Unit* pet = AI_VALUE(Unit*, "pet target");
+    return pet && AI_VALUE2(bool, "dead", "pet target") && !AI_VALUE2(bool, "mounted", "self target");
+}
+
+
+bool HuntersPetLowHealthTrigger::IsActive()
+{
+    Unit* pet = AI_VALUE(Unit*, "pet target");
+    return pet && AI_VALUE2(uint8, "health", "pet target") < 40 &&
+        !AI_VALUE2(bool, "dead", "pet target") && !AI_VALUE2(bool, "mounted", "self target");
+}
diff --git a/src/game/playerbot/strategy/hunter/HunterTriggers.h b/src/game/playerbot/strategy/hunter/HunterTriggers.h
new file mode 100644
index 00000000000..9466218824e
--- /dev/null
+++ b/src/game/playerbot/strategy/hunter/HunterTriggers.h
@@ -0,0 +1,86 @@
+#pragma once
+
+#include "../triggers/GenericTriggers.h"
+
+namespace ai
+{
+    BEGIN_TRIGGER(HunterNoStingsActiveTrigger, Trigger)
+    END_TRIGGER()
+
+    class HunterAspectOfTheHawkTrigger : public BuffTrigger
+    {
+    public:
+        HunterAspectOfTheHawkTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "aspect of the hawk") {
+			checkInterval = 1;
+		}
+    };
+
+	class HunterAspectOfTheWildTrigger : public BuffTrigger
+	{
+	public:
+		HunterAspectOfTheWildTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "aspect of the wild") {
+			checkInterval = 1;
+		}
+	};
+
+    class HunterAspectOfTheViperTrigger : public BuffTrigger
+    {
+    public:
+        HunterAspectOfTheViperTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "aspect of the viper") {}
+        virtual bool IsActive()
+        {
+            return SpellTrigger::IsActive() && !ai->HasAura(spell, GetTarget());
+        }
+    };
+
+    class HunterAspectOfThePackTrigger : public BuffTrigger
+    {
+    public:
+        HunterAspectOfThePackTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "aspect of the pack") {}
+        virtual bool IsActive() {
+			return BuffTrigger::IsActive() && !ai->HasAura("aspect of the cheetah", GetTarget());
+        };
+    };
+
+    BEGIN_TRIGGER(HuntersPetDeadTrigger, Trigger)
+    END_TRIGGER()
+
+    BEGIN_TRIGGER(HuntersPetLowHealthTrigger, Trigger)
+    END_TRIGGER()
+
+    class BlackArrowTrigger : public DebuffTrigger
+    {
+    public:
+        BlackArrowTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "black arrow") {}
+    };
+
+    class HuntersMarkTrigger : public DebuffTrigger
+    {
+    public:
+        HuntersMarkTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "hunter's mark") {}
+    };
+
+    class FreezingTrapTrigger : public HasCcTargetTrigger
+    {
+    public:
+        FreezingTrapTrigger(PlayerbotAI* ai) : HasCcTargetTrigger(ai, "freezing trap") {}
+    };
+
+    class RapidFireTrigger : public BoostTrigger
+    {
+    public:
+        RapidFireTrigger(PlayerbotAI* ai) : BoostTrigger(ai, "rapid fire") {}
+    };
+
+    class TrueshotAuraTrigger : public BuffTrigger
+    {
+    public:
+        TrueshotAuraTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "trueshot aura") {}
+    };
+
+    class SerpentStingOnAttackerTrigger : public DebuffOnAttackerTrigger
+    {
+    public:
+        SerpentStingOnAttackerTrigger(PlayerbotAI* ai) : DebuffOnAttackerTrigger(ai, "serpent sting") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/mage/ArcaneMageStrategy.cpp b/src/game/playerbot/strategy/mage/ArcaneMageStrategy.cpp
new file mode 100644
index 00000000000..07794778684
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/ArcaneMageStrategy.cpp
@@ -0,0 +1,64 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "MageMultipliers.h"
+#include "ArcaneMageStrategy.h"
+
+using namespace ai;
+
+class ArcaneMageStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    ArcaneMageStrategyActionNodeFactory()
+    {
+        creators["arcane blast"] = &arcane_blast;
+        creators["arcane barrage"] = &arcane_barrage;
+        creators["arcane missiles"] = &arcane_missiles;
+    }
+private:
+    static ActionNode* arcane_blast(PlayerbotAI* ai)
+    {
+        return new ActionNode ("arcane blast",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("arcane missiles"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* arcane_barrage(PlayerbotAI* ai)
+    {
+        return new ActionNode ("arcane barrage",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("arcane missiles"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* arcane_missiles(PlayerbotAI* ai)
+    {
+        return new ActionNode ("arcane missiles",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("shoot"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+ArcaneMageStrategy::ArcaneMageStrategy(PlayerbotAI* ai) : GenericMageStrategy(ai)
+{
+    actionNodeFactories.Add(new ArcaneMageStrategyActionNodeFactory());
+}
+
+NextAction** ArcaneMageStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("arcane barrage", 10.0f), NULL);
+}
+
+void ArcaneMageStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericMageStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "arcane blast",
+        NextAction::array(0, new NextAction("arcane blast", 15.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "missile barrage",
+        NextAction::array(0, new NextAction("arcane missiles", 15.0f), NULL)));
+
+}
+
diff --git a/src/game/playerbot/strategy/mage/ArcaneMageStrategy.h b/src/game/playerbot/strategy/mage/ArcaneMageStrategy.h
new file mode 100644
index 00000000000..ac053a821e8
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/ArcaneMageStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "GenericMageStrategy.h"
+
+namespace ai
+{
+    class ArcaneMageStrategy : public GenericMageStrategy
+    {
+    public:
+        ArcaneMageStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "arcane"; }
+        virtual NextAction** getDefaultActions();
+    };
+
+}
diff --git a/src/game/playerbot/strategy/mage/FireMageStrategy.cpp b/src/game/playerbot/strategy/mage/FireMageStrategy.cpp
new file mode 100644
index 00000000000..47c4bc24308
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/FireMageStrategy.cpp
@@ -0,0 +1,44 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "MageMultipliers.h"
+#include "FireMageStrategy.h"
+
+using namespace ai;
+
+NextAction** FireMageStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("scorch", 7.0f), new NextAction("fireball", 6.0f), new NextAction("fire blast", 5.0f), NULL);
+}
+
+void FireMageStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericMageStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "pyroblast",
+        NextAction::array(0, new NextAction("pyroblast", 10.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "hot streak",
+        NextAction::array(0, new NextAction("pyroblast", 25.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "combustion",
+        NextAction::array(0, new NextAction("combustion", 50.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "enemy too close for spell",
+        NextAction::array(0, new NextAction("dragon's breath", 70.0f), NULL)));
+}
+
+void FireMageAoeStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("flamestrike", 20.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "living bomb",
+        NextAction::array(0, new NextAction("living bomb", 25.0f), NULL)));
+}
+
diff --git a/src/game/playerbot/strategy/mage/FireMageStrategy.h b/src/game/playerbot/strategy/mage/FireMageStrategy.h
new file mode 100644
index 00000000000..fc0cd7f8562
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/FireMageStrategy.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "GenericMageStrategy.h"
+#include "../generic/CombatStrategy.h"
+
+namespace ai
+{
+    class FireMageStrategy : public GenericMageStrategy
+    {
+    public:
+        FireMageStrategy(PlayerbotAI* ai) : GenericMageStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "fire"; }
+        virtual NextAction** getDefaultActions();
+    };
+
+    class FireMageAoeStrategy : public CombatStrategy
+    {
+    public:
+        FireMageAoeStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "fire aoe"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/mage/FrostMageStrategy.cpp b/src/game/playerbot/strategy/mage/FrostMageStrategy.cpp
new file mode 100644
index 00000000000..e6fb861893b
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/FrostMageStrategy.cpp
@@ -0,0 +1,32 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "MageMultipliers.h"
+#include "FrostMageStrategy.h"
+
+using namespace ai;
+
+
+FrostMageStrategy::FrostMageStrategy(PlayerbotAI* ai) : GenericMageStrategy(ai)
+{
+}
+
+NextAction** FrostMageStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("frostbolt", 7.0f), NULL);
+}
+
+void FrostMageStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericMageStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "icy veins",
+        NextAction::array(0, new NextAction("icy veins", 50.0f), NULL)));
+}
+
+void FrostMageAoeStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+	triggers.push_back(new TriggerNode(
+		"high aoe",
+		NextAction::array(0, new NextAction("blizzard", 40.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/mage/FrostMageStrategy.h b/src/game/playerbot/strategy/mage/FrostMageStrategy.h
new file mode 100644
index 00000000000..15fac2f61c7
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/FrostMageStrategy.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "GenericMageStrategy.h"
+#include "../generic/CombatStrategy.h"
+
+namespace ai
+{
+    class FrostMageStrategy : public GenericMageStrategy
+    {
+    public:
+        FrostMageStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "frost"; }
+        virtual NextAction** getDefaultActions();
+    };
+
+    class FrostMageAoeStrategy : public CombatStrategy
+    {
+    public:
+        FrostMageAoeStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "frost aoe"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/mage/GenericMageNonCombatStrategy.cpp b/src/game/playerbot/strategy/mage/GenericMageNonCombatStrategy.cpp
new file mode 100644
index 00000000000..f4111dee463
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/GenericMageNonCombatStrategy.cpp
@@ -0,0 +1,87 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "MageMultipliers.h"
+#include "GenericMageNonCombatStrategy.h"
+
+using namespace ai;
+
+class GenericMageNonCombatStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    GenericMageNonCombatStrategyActionNodeFactory()
+    {
+        creators["molten armor"] = &molten_armor;
+        creators["mage armor"] = &mage_armor;
+        creators["ice armor"] = &ice_armor;
+    }
+private:
+    static ActionNode* molten_armor(PlayerbotAI* ai)
+    {
+        return new ActionNode ("molten armor",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("mage armor"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* mage_armor(PlayerbotAI* ai)
+    {
+        return new ActionNode ("mage armor",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("ice armor"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* ice_armor(PlayerbotAI* ai)
+    {
+        return new ActionNode ("ice armor",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("frost armor"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+GenericMageNonCombatStrategy::GenericMageNonCombatStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericMageNonCombatStrategyActionNodeFactory());
+}
+
+void GenericMageNonCombatStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    NonCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "arcane intellect",
+        NextAction::array(0, new NextAction("arcane intellect", 21.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "arcane intellect on party",
+        NextAction::array(0, new NextAction("arcane intellect on party", 20.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"no drink",
+		NextAction::array(0, new NextAction("conjure water", 16.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"no food",
+		NextAction::array(0, new NextAction("conjure food", 15.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "remove curse",
+        NextAction::array(0, new NextAction("remove curse", 41.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "remove curse on party",
+        NextAction::array(0, new NextAction("remove curse on party", 40.0f), NULL)));
+}
+
+void MageBuffManaStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "mage armor",
+        NextAction::array(0, new NextAction("mage armor", 19.0f), NULL)));
+}
+
+void MageBuffDpsStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "mage armor",
+        NextAction::array(0, new NextAction("molten armor", 19.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/mage/GenericMageNonCombatStrategy.h b/src/game/playerbot/strategy/mage/GenericMageNonCombatStrategy.h
new file mode 100644
index 00000000000..5319bf9be14
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/GenericMageNonCombatStrategy.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "GenericMageStrategy.h"
+#include "../generic/NonCombatStrategy.h"
+
+namespace ai
+{
+    class GenericMageNonCombatStrategy : public NonCombatStrategy
+    {
+    public:
+        GenericMageNonCombatStrategy(PlayerbotAI* ai);
+        virtual string getName() { return "nc"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+
+    class MageBuffManaStrategy : public Strategy
+    {
+    public:
+        MageBuffManaStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "bmana"; }
+    };
+
+    class MageBuffDpsStrategy : public Strategy
+    {
+    public:
+        MageBuffDpsStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "bdps"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/mage/GenericMageStrategy.cpp b/src/game/playerbot/strategy/mage/GenericMageStrategy.cpp
new file mode 100644
index 00000000000..7f137c26e5f
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/GenericMageStrategy.cpp
@@ -0,0 +1,137 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "MageMultipliers.h"
+#include "GenericMageStrategy.h"
+
+using namespace ai;
+
+class GenericMageStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    GenericMageStrategyActionNodeFactory()
+    {
+        creators["frostbolt"] = &frostbolt;
+        creators["fire blast"] = &fire_blast;
+        creators["scorch"] = &scorch;
+        creators["frost nova"] = &frost_nova;
+        creators["icy veins"] = &icy_veins;
+        creators["combustion"] = &combustion;
+        creators["evocation"] = &evocation;
+        creators["dragon's breath"] = &dragons_breath;
+        creators["blast wave"] = &blast_wave;
+    }
+private:
+    static ActionNode* frostbolt(PlayerbotAI* ai)
+    {
+        return new ActionNode ("frostbolt",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("shoot"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* fire_blast(PlayerbotAI* ai)
+    {
+        return new ActionNode ("fire blast",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("scorch"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* scorch(PlayerbotAI* ai)
+    {
+        return new ActionNode ("scorch",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("shoot"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* frost_nova(PlayerbotAI* ai)
+    {
+        return new ActionNode ("frost nova",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("flee"), NULL),
+            /*C*/ NextAction::array(0, new NextAction("flee"), NULL));
+    }
+    static ActionNode* icy_veins(PlayerbotAI* ai)
+    {
+        return new ActionNode ("icy veins",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* combustion(PlayerbotAI* ai)
+    {
+        return new ActionNode ("combustion",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* evocation(PlayerbotAI* ai)
+    {
+        return new ActionNode ("evocation",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("mana potion"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* dragons_breath(PlayerbotAI* ai)
+    {
+        return new ActionNode ("dragon's breath",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("blast wave"), NULL),
+            /*C*/ NextAction::array(0, new NextAction("flamestrike", 71.0f), NULL));
+    }
+    static ActionNode* blast_wave(PlayerbotAI* ai)
+    {
+        return new ActionNode ("blast wave",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("frost nova"), NULL),
+            /*C*/ NextAction::array(0, new NextAction("flamestrike", 71.0f), NULL));
+    }
+};
+
+GenericMageStrategy::GenericMageStrategy(PlayerbotAI* ai) : RangedCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericMageStrategyActionNodeFactory());
+}
+
+void GenericMageStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    RangedCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "remove curse",
+        NextAction::array(0, new NextAction("remove curse", 41.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "remove curse on party",
+        NextAction::array(0, new NextAction("remove curse on party", 40.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "enemy too close for spell",
+        NextAction::array(0, new NextAction("frost nova", 50.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "counterspell",
+        NextAction::array(0, new NextAction("counterspell", 40.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "counterspell on enemy healer",
+        NextAction::array(0, new NextAction("counterspell on enemy healer", 40.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"critical health",
+		NextAction::array(0, new NextAction("ice block", 80.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "polymorph",
+        NextAction::array(0, new NextAction("polymorph", 30.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"spellsteal",
+		NextAction::array(0, new NextAction("spellsteal", 40.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium threat",
+        NextAction::array(0, new NextAction("invisibility", 60.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low mana",
+        NextAction::array(0, new NextAction("evocation", ACTION_EMERGENCY + 5), NULL)));
+}
diff --git a/src/game/playerbot/strategy/mage/GenericMageStrategy.h b/src/game/playerbot/strategy/mage/GenericMageStrategy.h
new file mode 100644
index 00000000000..4dcb9d9c0ed
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/GenericMageStrategy.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "../Strategy.h"
+#include "../generic/RangedCombatStrategy.h"
+
+namespace ai
+{
+    class GenericMageStrategy : public RangedCombatStrategy
+    {
+    public:
+        GenericMageStrategy(PlayerbotAI* ai);
+        virtual string getName() { return "mage"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+}
diff --git a/src/game/playerbot/strategy/mage/MageActions.cpp b/src/game/playerbot/strategy/mage/MageActions.cpp
new file mode 100644
index 00000000000..ee4d6fcfbb2
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/MageActions.cpp
@@ -0,0 +1,10 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "MageActions.h"
+
+using namespace ai;
+
+Value<Unit*>* CastPolymorphAction::GetTargetValue()
+{
+    return context->GetValue<Unit*>("cc target", getName());
+}
diff --git a/src/game/playerbot/strategy/mage/MageActions.h b/src/game/playerbot/strategy/mage/MageActions.h
new file mode 100644
index 00000000000..ea541a9d7a4
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/MageActions.h
@@ -0,0 +1,205 @@
+#pragma once
+
+#include "../actions/GenericActions.h"
+
+namespace ai
+{
+    class CastFireballAction : public CastSpellAction
+    {
+    public:
+        CastFireballAction(PlayerbotAI* ai) : CastSpellAction(ai, "fireball") {}
+    };
+
+    class CastScorchAction : public CastSpellAction
+    {
+    public:
+        CastScorchAction(PlayerbotAI* ai) : CastSpellAction(ai, "scorch") {}
+    };
+
+    class CastFireBlastAction : public CastSpellAction
+    {
+    public:
+        CastFireBlastAction(PlayerbotAI* ai) : CastSpellAction(ai, "fire blast") {}
+    };
+
+    class CastArcaneBlastAction : public CastBuffSpellAction
+    {
+    public:
+        CastArcaneBlastAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "arcane blast") {}
+        virtual string GetTargetName() { return "current target"; }
+    };
+
+    class CastArcaneBarrageAction : public CastSpellAction
+    {
+    public:
+        CastArcaneBarrageAction(PlayerbotAI* ai) : CastSpellAction(ai, "arcane barrage") {}
+    };
+
+    class CastArcaneMissilesAction : public CastSpellAction
+    {
+    public:
+        CastArcaneMissilesAction(PlayerbotAI* ai) : CastSpellAction(ai, "arcane missiles") {}
+    };
+
+    class CastPyroblastAction : public CastSpellAction
+    {
+    public:
+        CastPyroblastAction(PlayerbotAI* ai) : CastSpellAction(ai, "pyroblast") {}
+    };
+
+    class CastFlamestrikeAction : public CastSpellAction
+    {
+    public:
+        CastFlamestrikeAction(PlayerbotAI* ai) : CastSpellAction(ai, "flamestrike") {}
+    };
+
+    class CastFrostNovaAction : public CastSpellAction
+    {
+    public:
+        CastFrostNovaAction(PlayerbotAI* ai) : CastSpellAction(ai, "frost nova") {}
+        virtual bool isUseful() { return AI_VALUE2(float, "distance", GetTargetName()) <= sPlayerbotAIConfig.tooCloseDistance; }
+    };
+
+	class CastFrostboltAction : public CastSpellAction
+	{
+	public:
+		CastFrostboltAction(PlayerbotAI* ai) : CastSpellAction(ai, "frostbolt") {}
+	};
+
+	class CastBlizzardAction : public CastSpellAction
+	{
+	public:
+		CastBlizzardAction(PlayerbotAI* ai) : CastSpellAction(ai, "blizzard") {}
+	};
+
+	class CastArcaneIntellectAction : public CastBuffSpellAction
+    {
+	public:
+		CastArcaneIntellectAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "arcane intellect") {}
+	};
+
+	class CastArcaneIntellectOnPartyAction : public BuffOnPartyAction
+    {
+	public:
+		CastArcaneIntellectOnPartyAction(PlayerbotAI* ai) : BuffOnPartyAction(ai, "arcane intellect") {}
+	};
+
+	class CastRemoveCurseAction : public CastCureSpellAction
+    {
+	public:
+		CastRemoveCurseAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "remove curse") {}
+	};
+
+	class CastIcyVeinsAction : public CastBuffSpellAction
+    {
+	public:
+		CastIcyVeinsAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "icy veins") {}
+	};
+
+	class CastCombustionAction : public CastBuffSpellAction
+    {
+	public:
+		CastCombustionAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "combustion") {}
+	};
+
+    BEGIN_SPELL_ACTION(CastCounterspellAction, "counterspell")
+    END_SPELL_ACTION()
+
+    class CastRemoveCurseOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastRemoveCurseOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "remove curse", DISPEL_CURSE) {}
+    };
+
+	class CastConjureFoodAction : public CastBuffSpellAction
+    {
+	public:
+		CastConjureFoodAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "conjure food") {}
+	};
+
+	class CastConjureWaterAction : public CastBuffSpellAction
+    {
+	public:
+		CastConjureWaterAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "conjure water") {}
+	};
+
+	class CastIceBlockAction : public CastBuffSpellAction
+    {
+	public:
+		CastIceBlockAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "ice block") {}
+	};
+
+    class CastMoltenArmorAction : public CastBuffSpellAction
+    {
+    public:
+        CastMoltenArmorAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "molten armor") {}
+    };
+
+    class CastMageArmorAction : public CastBuffSpellAction
+    {
+    public:
+        CastMageArmorAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "mage armor") {}
+    };
+
+    class CastIceArmorAction : public CastBuffSpellAction
+    {
+    public:
+        CastIceArmorAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "ice armor") {}
+    };
+
+    class CastFrostArmorAction : public CastBuffSpellAction
+    {
+    public:
+        CastFrostArmorAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "frost armor") {}
+    };
+
+    class CastPolymorphAction : public CastBuffSpellAction
+    {
+    public:
+        CastPolymorphAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "polymorph") {}
+        virtual Value<Unit*>* GetTargetValue();
+    };
+
+	class CastSpellstealAction : public CastSpellAction
+	{
+	public:
+		CastSpellstealAction(PlayerbotAI* ai) : CastSpellAction(ai, "spellsteal") {}
+	};
+
+	class CastLivingBombAction : public CastDebuffSpellAction
+	{
+	public:
+	    CastLivingBombAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "living bomb") {}
+	};
+
+	class CastDragonsBreathAction : public CastSpellAction
+	{
+	public:
+	    CastDragonsBreathAction(PlayerbotAI* ai) : CastSpellAction(ai, "dragon's breath") {}
+	};
+
+	class CastBlastWaveAction : public CastSpellAction
+	{
+	public:
+	    CastBlastWaveAction(PlayerbotAI* ai) : CastSpellAction(ai, "blast wave") {}
+	};
+
+	class CastInvisibilityAction : public CastBuffSpellAction
+	{
+	public:
+	    CastInvisibilityAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "invisibility") {}
+	};
+
+	class CastEvocationAction : public CastSpellAction
+	{
+	public:
+	    CastEvocationAction(PlayerbotAI* ai) : CastSpellAction(ai, "evocation") {}
+	    virtual string GetTargetName() { return "self target"; }
+	};
+
+    class CastCounterspellOnEnemyHealerAction : public CastSpellOnEnemyHealerAction
+    {
+    public:
+	    CastCounterspellOnEnemyHealerAction(PlayerbotAI* ai) : CastSpellOnEnemyHealerAction(ai, "counterspell") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/mage/MageAiObjectContext.cpp b/src/game/playerbot/strategy/mage/MageAiObjectContext.cpp
new file mode 100644
index 00000000000..366ef77ec21
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/MageAiObjectContext.cpp
@@ -0,0 +1,221 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "../Strategy.h"
+#include "MageActions.h"
+#include "MageAiObjectContext.h"
+#include "FrostMageStrategy.h"
+#include "ArcaneMageStrategy.h"
+#include "GenericMageNonCombatStrategy.h"
+#include "FireMageStrategy.h"
+#include "../generic/PullStrategy.h"
+#include "MageTriggers.h"
+#include "../NamedObjectContext.h"
+
+using namespace ai;
+
+
+namespace ai
+{
+    namespace mage
+    {
+        using namespace ai;
+
+        class StrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            StrategyFactoryInternal()
+            {
+                creators["nc"] = &mage::StrategyFactoryInternal::nc;
+                creators["pull"] = &mage::StrategyFactoryInternal::pull;
+                creators["fire aoe"] = &mage::StrategyFactoryInternal::fire_aoe;
+                creators["frost aoe"] = &mage::StrategyFactoryInternal::frost_aoe;
+            }
+
+        private:
+            static Strategy* nc(PlayerbotAI* ai) { return new GenericMageNonCombatStrategy(ai); }
+            static Strategy* pull(PlayerbotAI* ai) { return new PullStrategy(ai, "shoot"); }
+            static Strategy* fire_aoe(PlayerbotAI* ai) { return new FireMageAoeStrategy(ai); }
+            static Strategy* frost_aoe(PlayerbotAI* ai) { return new FrostMageAoeStrategy(ai); }
+        };
+
+        class MageStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            MageStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["frost"] = &mage::MageStrategyFactoryInternal::frost;
+                creators["fire"] = &mage::MageStrategyFactoryInternal::fire;
+                creators["arcane"] = &mage::MageStrategyFactoryInternal::arcane;
+            }
+
+        private:
+            static Strategy* frost(PlayerbotAI* ai) { return new FrostMageStrategy(ai); }
+            static Strategy* fire(PlayerbotAI* ai) { return new FireMageStrategy(ai); }
+            static Strategy* arcane(PlayerbotAI* ai) { return new ArcaneMageStrategy(ai); }
+        };
+
+        class MageBuffStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            MageBuffStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["bmana"] = &mage::MageBuffStrategyFactoryInternal::bmana;
+                creators["bdps"] = &mage::MageBuffStrategyFactoryInternal::bdps;
+            }
+
+        private:
+            static Strategy* bmana(PlayerbotAI* ai) { return new MageBuffManaStrategy(ai); }
+            static Strategy* bdps(PlayerbotAI* ai) { return new MageBuffDpsStrategy(ai); }
+        };
+    };
+};
+
+
+namespace ai
+{
+    namespace mage
+    {
+        using namespace ai;
+
+        class TriggerFactoryInternal : public NamedObjectContext<Trigger>
+        {
+        public:
+            TriggerFactoryInternal()
+            {
+                creators["fireball"] = &TriggerFactoryInternal::fireball;
+                creators["pyroblast"] = &TriggerFactoryInternal::pyroblast;
+                creators["combustion"] = &TriggerFactoryInternal::combustion;
+                creators["icy veins"] = &TriggerFactoryInternal::icy_veins;
+                creators["arcane intellect"] = &TriggerFactoryInternal::arcane_intellect;
+                creators["arcane intellect on party"] = &TriggerFactoryInternal::arcane_intellect_on_party;
+                creators["mage armor"] = &TriggerFactoryInternal::mage_armor;
+                creators["remove curse"] = &TriggerFactoryInternal::remove_curse;
+                creators["remove curse on party"] = &TriggerFactoryInternal::remove_curse_on_party;
+                creators["counterspell"] = &TriggerFactoryInternal::counterspell;
+                creators["polymorph"] = &TriggerFactoryInternal::polymorph;
+                creators["spellsteal"] = &TriggerFactoryInternal::spellsteal;
+                creators["hot streak"] = &TriggerFactoryInternal::hot_streak;
+                creators["living bomb"] = &TriggerFactoryInternal::living_bomb;
+                creators["missile barrage"] = &TriggerFactoryInternal::missile_barrage;
+                creators["arcane blast"] = &TriggerFactoryInternal::arcane_blast;
+                creators["counterspell on enemy healer"] = &TriggerFactoryInternal::counterspell_enemy_healer;
+
+            }
+
+        private:
+            static Trigger* hot_streak(PlayerbotAI* ai) { return new HotStreakTrigger(ai); }
+            static Trigger* fireball(PlayerbotAI* ai) { return new FireballTrigger(ai); }
+            static Trigger* pyroblast(PlayerbotAI* ai) { return new PyroblastTrigger(ai); }
+            static Trigger* combustion(PlayerbotAI* ai) { return new CombustionTrigger(ai); }
+            static Trigger* icy_veins(PlayerbotAI* ai) { return new IcyVeinsTrigger(ai); }
+            static Trigger* arcane_intellect(PlayerbotAI* ai) { return new ArcaneIntellectTrigger(ai); }
+            static Trigger* arcane_intellect_on_party(PlayerbotAI* ai) { return new ArcaneIntellectOnPartyTrigger(ai); }
+            static Trigger* mage_armor(PlayerbotAI* ai) { return new MageArmorTrigger(ai); }
+            static Trigger* remove_curse(PlayerbotAI* ai) { return new RemoveCurseTrigger(ai); }
+            static Trigger* remove_curse_on_party(PlayerbotAI* ai) { return new PartyMemberRemoveCurseTrigger(ai); }
+            static Trigger* counterspell(PlayerbotAI* ai) { return new CounterspellInterruptSpellTrigger(ai); }
+            static Trigger* polymorph(PlayerbotAI* ai) { return new PolymorphTrigger(ai); }
+            static Trigger* spellsteal(PlayerbotAI* ai) { return new SpellstealTrigger(ai); }
+            static Trigger* living_bomb(PlayerbotAI* ai) { return new LivingBombTrigger(ai); }
+            static Trigger* missile_barrage(PlayerbotAI* ai) { return new MissileBarrageTrigger(ai); }
+            static Trigger* arcane_blast(PlayerbotAI* ai) { return new ArcaneBlastTrigger(ai); }
+            static Trigger* counterspell_enemy_healer(PlayerbotAI* ai) { return new CounterspellEnemyHealerTrigger(ai); }
+        };
+    };
+};
+
+
+namespace ai
+{
+    namespace mage
+    {
+        using namespace ai;
+
+        class AiObjectContextInternal : public NamedObjectContext<Action>
+        {
+        public:
+            AiObjectContextInternal()
+            {
+                creators["frostbolt"] = &AiObjectContextInternal::frostbolt;
+                creators["blizzard"] = &AiObjectContextInternal::blizzard;
+                creators["frost nova"] = &AiObjectContextInternal::frost_nova;
+                creators["arcane intellect"] = &AiObjectContextInternal::arcane_intellect;
+                creators["arcane intellect on party"] = &AiObjectContextInternal::arcane_intellect_on_party;
+                creators["conjure water"] = &AiObjectContextInternal::conjure_water;
+                creators["conjure food"] = &AiObjectContextInternal::conjure_food;
+                creators["molten armor"] = &AiObjectContextInternal::molten_armor;
+                creators["mage armor"] = &AiObjectContextInternal::mage_armor;
+                creators["ice armor"] = &AiObjectContextInternal::ice_armor;
+                creators["frost armor"] = &AiObjectContextInternal::frost_armor;
+                creators["fireball"] = &AiObjectContextInternal::fireball;
+                creators["pyroblast"] = &AiObjectContextInternal::pyroblast;
+                creators["flamestrike"] = &AiObjectContextInternal::flamestrike;
+                creators["fire blast"] = &AiObjectContextInternal::fire_blast;
+                creators["scorch"] = &AiObjectContextInternal::scorch;
+                creators["counterspell"] = &AiObjectContextInternal::counterspell;
+                creators["remove curse"] = &AiObjectContextInternal::remove_curse;
+                creators["remove curse on party"] = &AiObjectContextInternal::remove_curse_on_party;
+                creators["icy veins"] = &AiObjectContextInternal::icy_veins;
+                creators["combustion"] = &AiObjectContextInternal::combustion;
+                creators["ice block"] = &AiObjectContextInternal::ice_block;
+                creators["polymorph"] = &AiObjectContextInternal::polymorph;
+                creators["spellsteal"] = &AiObjectContextInternal::spellsteal;
+                creators["living bomb"] = &AiObjectContextInternal::living_bomb;
+                creators["dragon's breath"] = &AiObjectContextInternal::dragons_breath;
+                creators["blast wave"] = &AiObjectContextInternal::blast_wave;
+                creators["invisibility"] = &AiObjectContextInternal::invisibility;
+                creators["evocation"] = &AiObjectContextInternal::evocation;
+                creators["arcane blast"] = &AiObjectContextInternal::arcane_blast;
+                creators["arcane barrage"] = &AiObjectContextInternal::arcane_barrage;
+                creators["arcane missiles"] = &AiObjectContextInternal::arcane_missiles;
+                creators["counterspell on enemy healer"] = &AiObjectContextInternal::counterspell_on_enemy_healer;
+            }
+
+        private:
+            static Action* arcane_missiles(PlayerbotAI* ai) { return new CastArcaneMissilesAction(ai); }
+            static Action* arcane_barrage(PlayerbotAI* ai) { return new CastArcaneBarrageAction(ai); }
+            static Action* arcane_blast(PlayerbotAI* ai) { return new CastArcaneBlastAction(ai); }
+            static Action* frostbolt(PlayerbotAI* ai) { return new CastFrostboltAction(ai); }
+            static Action* blizzard(PlayerbotAI* ai) { return new CastBlizzardAction(ai); }
+            static Action* frost_nova(PlayerbotAI* ai) { return new CastFrostNovaAction(ai); }
+            static Action* arcane_intellect(PlayerbotAI* ai) { return new CastArcaneIntellectAction(ai); }
+            static Action* arcane_intellect_on_party(PlayerbotAI* ai) { return new CastArcaneIntellectOnPartyAction(ai); }
+            static Action* conjure_water(PlayerbotAI* ai) { return new CastConjureWaterAction(ai); }
+            static Action* conjure_food(PlayerbotAI* ai) { return new CastConjureFoodAction(ai); }
+            static Action* molten_armor(PlayerbotAI* ai) { return new CastMoltenArmorAction(ai); }
+            static Action* mage_armor(PlayerbotAI* ai) { return new CastMageArmorAction(ai); }
+            static Action* ice_armor(PlayerbotAI* ai) { return new CastIceArmorAction(ai); }
+            static Action* frost_armor(PlayerbotAI* ai) { return new CastFrostArmorAction(ai); }
+            static Action* fireball(PlayerbotAI* ai) { return new CastFireballAction(ai); }
+            static Action* pyroblast(PlayerbotAI* ai) { return new CastPyroblastAction(ai); }
+            static Action* flamestrike(PlayerbotAI* ai) { return new CastFlamestrikeAction(ai); }
+            static Action* fire_blast(PlayerbotAI* ai) { return new CastFireBlastAction(ai); }
+            static Action* scorch(PlayerbotAI* ai) { return new CastScorchAction(ai); }
+            static Action* counterspell(PlayerbotAI* ai) { return new CastCounterspellAction(ai); }
+            static Action* remove_curse(PlayerbotAI* ai) { return new CastRemoveCurseAction(ai); }
+            static Action* remove_curse_on_party(PlayerbotAI* ai) { return new CastRemoveCurseOnPartyAction(ai); }
+            static Action* icy_veins(PlayerbotAI* ai) { return new CastIcyVeinsAction(ai); }
+            static Action* combustion(PlayerbotAI* ai) { return new CastCombustionAction(ai); }
+            static Action* ice_block(PlayerbotAI* ai) { return new CastIceBlockAction(ai); }
+            static Action* polymorph(PlayerbotAI* ai) { return new CastPolymorphAction(ai); }
+            static Action* spellsteal(PlayerbotAI* ai) { return new CastSpellstealAction(ai); }
+            static Action* living_bomb(PlayerbotAI* ai) { return new CastLivingBombAction(ai); }
+            static Action* dragons_breath(PlayerbotAI* ai) { return new CastDragonsBreathAction(ai); }
+            static Action* blast_wave(PlayerbotAI* ai) { return new CastBlastWaveAction(ai); }
+            static Action* invisibility(PlayerbotAI* ai) { return new CastInvisibilityAction(ai); }
+            static Action* evocation(PlayerbotAI* ai) { return new CastEvocationAction(ai); }
+            static Action* counterspell_on_enemy_healer(PlayerbotAI* ai) { return new CastCounterspellOnEnemyHealerAction(ai); }
+        };
+    };
+};
+
+
+
+MageAiObjectContext::MageAiObjectContext(PlayerbotAI* ai) : AiObjectContext(ai)
+{
+    strategyContexts.Add(new ai::mage::StrategyFactoryInternal());
+    strategyContexts.Add(new ai::mage::MageStrategyFactoryInternal());
+    strategyContexts.Add(new ai::mage::MageBuffStrategyFactoryInternal());
+    actionContexts.Add(new ai::mage::AiObjectContextInternal());
+    triggerContexts.Add(new ai::mage::TriggerFactoryInternal());
+}
diff --git a/src/game/playerbot/strategy/mage/MageAiObjectContext.h b/src/game/playerbot/strategy/mage/MageAiObjectContext.h
new file mode 100644
index 00000000000..0fe90e2a0d0
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/MageAiObjectContext.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../AiObjectContext.h"
+
+namespace ai
+{
+    class MageAiObjectContext : public AiObjectContext
+    {
+    public:
+        MageAiObjectContext(PlayerbotAI* ai);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/mage/MageMultipliers.cpp b/src/game/playerbot/strategy/mage/MageMultipliers.cpp
new file mode 100644
index 00000000000..8ebe45fe9dc
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/MageMultipliers.cpp
@@ -0,0 +1,6 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "MageMultipliers.h"
+#include "MageActions.h"
+
+using namespace ai;
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/mage/MageMultipliers.h b/src/game/playerbot/strategy/mage/MageMultipliers.h
new file mode 100644
index 00000000000..7cfbdd46e87
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/MageMultipliers.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace ai
+{
+   
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/mage/MageTriggers.cpp b/src/game/playerbot/strategy/mage/MageTriggers.cpp
new file mode 100644
index 00000000000..48750fefc42
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/MageTriggers.cpp
@@ -0,0 +1,15 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "MageTriggers.h"
+#include "MageActions.h"
+
+using namespace ai;
+
+bool MageArmorTrigger::IsActive()
+{
+    Unit* target = GetTarget();
+    return !ai->HasAura("ice armor", target) &&
+        !ai->HasAura("frost armor", target) &&
+        !ai->HasAura("molten armor", target) &&
+        !ai->HasAura("mage armor", target);
+}
diff --git a/src/game/playerbot/strategy/mage/MageTriggers.h b/src/game/playerbot/strategy/mage/MageTriggers.h
new file mode 100644
index 00000000000..a07b4f2bffc
--- /dev/null
+++ b/src/game/playerbot/strategy/mage/MageTriggers.h
@@ -0,0 +1,92 @@
+#pragma once
+#include "../triggers/GenericTriggers.h"
+
+namespace ai
+{
+    BUFF_ON_PARTY_TRIGGER(ArcaneIntellectOnPartyTrigger, "arcane intellect", "arcane intellect on party")
+    BUFF_TRIGGER(ArcaneIntellectTrigger, "arcane intellect", "arcane intellect")
+
+    class MageArmorTrigger : public BuffTrigger {
+    public:
+        MageArmorTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "mage armor") {}
+        virtual bool IsActive();
+    };
+
+    class LivingBombTrigger : public DebuffTrigger {
+    public:
+        LivingBombTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "living bomb") {}
+	};
+
+    class FireballTrigger : public DebuffTrigger {
+    public:
+        FireballTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "fireball") {}
+	};
+
+    class PyroblastTrigger : public DebuffTrigger {
+    public:
+        PyroblastTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "pyroblast") {}
+    };
+
+    class HotStreakTrigger : public HasAuraTrigger {
+    public:
+        HotStreakTrigger(PlayerbotAI* ai) : HasAuraTrigger(ai, "hot streak") {}
+    };
+
+    class MissileBarrageTrigger : public HasAuraTrigger {
+    public:
+        MissileBarrageTrigger(PlayerbotAI* ai) : HasAuraTrigger(ai, "missile barrage") {}
+    };
+
+    class ArcaneBlastTrigger : public BuffTrigger {
+    public:
+        ArcaneBlastTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "arcane blast") {}
+    };
+
+    class CounterspellInterruptSpellTrigger : public InterruptSpellTrigger
+    {
+    public:
+        CounterspellInterruptSpellTrigger(PlayerbotAI* ai) : InterruptSpellTrigger(ai, "counterspell") {}
+    };
+
+    class CombustionTrigger : public BoostTrigger
+    {
+    public:
+        CombustionTrigger(PlayerbotAI* ai) : BoostTrigger(ai, "combustion") {}
+    };
+
+    class IcyVeinsTrigger : public BoostTrigger
+    {
+    public:
+        IcyVeinsTrigger(PlayerbotAI* ai) : BoostTrigger(ai, "icy veins") {}
+    };
+
+    class PolymorphTrigger : public HasCcTargetTrigger
+    {
+    public:
+        PolymorphTrigger(PlayerbotAI* ai) : HasCcTargetTrigger(ai, "polymorph") {}
+    };
+
+    class RemoveCurseTrigger : public NeedCureTrigger
+    {
+    public:
+        RemoveCurseTrigger(PlayerbotAI* ai) : NeedCureTrigger(ai, "remove curse", DISPEL_CURSE) {}
+    };
+
+    class PartyMemberRemoveCurseTrigger : public PartyMemberNeedCureTrigger
+    {
+    public:
+        PartyMemberRemoveCurseTrigger(PlayerbotAI* ai) : PartyMemberNeedCureTrigger(ai, "remove curse", DISPEL_CURSE) {}
+    };
+
+    class SpellstealTrigger : public TargetAuraDispelTrigger
+    {
+    public:
+        SpellstealTrigger(PlayerbotAI* ai) : TargetAuraDispelTrigger(ai, "spellsteal", DISPEL_MAGIC) {}
+    };
+
+    class CounterspellEnemyHealerTrigger : public InterruptEnemyHealerTrigger
+    {
+    public:
+        CounterspellEnemyHealerTrigger(PlayerbotAI* ai) : InterruptEnemyHealerTrigger(ai, "counterspell") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/paladin/DpsPaladinStrategy.cpp b/src/game/playerbot/strategy/paladin/DpsPaladinStrategy.cpp
new file mode 100644
index 00000000000..02c4a5748c0
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/DpsPaladinStrategy.cpp
@@ -0,0 +1,83 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PaladinMultipliers.h"
+#include "DpsPaladinStrategy.h"
+
+using namespace ai;
+
+class DpsPaladinStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    DpsPaladinStrategyActionNodeFactory()
+    {
+        creators["seal of vengeance"] = &seal_of_vengeance;
+        creators["seal of command"] = &seal_of_command;
+        creators["blessing of might"] = &blessing_of_might;
+        creators["crusader strike"] = &crusader_strike;
+    }
+
+private:
+    static ActionNode* seal_of_vengeance(PlayerbotAI* ai)
+    {
+        return new ActionNode ("seal of vengeance",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("seal of command"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* seal_of_command(PlayerbotAI* ai)
+    {
+        return new ActionNode ("seal of command",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("seal of wisdom"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* blessing_of_might(PlayerbotAI* ai)
+    {
+        return new ActionNode ("blessing of might",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("blessing of kings"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* crusader_strike(PlayerbotAI* ai)
+    {
+        return new ActionNode ("crusader strike",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("melee"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+DpsPaladinStrategy::DpsPaladinStrategy(PlayerbotAI* ai) : GenericPaladinStrategy(ai)
+{
+    actionNodeFactories.Add(new DpsPaladinStrategyActionNodeFactory());
+}
+
+NextAction** DpsPaladinStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("crusader strike", ACTION_NORMAL + 1), NULL);
+}
+
+void DpsPaladinStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericPaladinStrategy::InitTriggers(triggers);
+    
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("divine shield", ACTION_CRITICAL_HEAL + 2), new NextAction("holy light", ACTION_CRITICAL_HEAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "judgement of wisdom",
+        NextAction::array(0, new NextAction("judgement of wisdom", ACTION_NORMAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "blessing",
+        NextAction::array(0, new NextAction("blessing of might", ACTION_HIGH + 8), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"medium aoe",
+		NextAction::array(0, new NextAction("divine storm", ACTION_HIGH + 1), new NextAction("consecration", ACTION_HIGH + 1), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"art of war",
+		NextAction::array(0, new NextAction("exorcism", ACTION_HIGH + 2), NULL)));
+}
diff --git a/src/game/playerbot/strategy/paladin/DpsPaladinStrategy.h b/src/game/playerbot/strategy/paladin/DpsPaladinStrategy.h
new file mode 100644
index 00000000000..cff5fd22429
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/DpsPaladinStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "GenericPaladinStrategy.h"
+
+namespace ai
+{
+    class DpsPaladinStrategy : public GenericPaladinStrategy
+    {
+    public:
+        DpsPaladinStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "dps"; }
+        virtual NextAction** getDefaultActions();
+        virtual int GetType() { return STRATEGY_TYPE_COMBAT | STRATEGY_TYPE_DPS | STRATEGY_TYPE_MELEE; }
+    };
+}
diff --git a/src/game/playerbot/strategy/paladin/GenericPaladinNonCombatStrategy.cpp b/src/game/playerbot/strategy/paladin/GenericPaladinNonCombatStrategy.cpp
new file mode 100644
index 00000000000..fda1619dca9
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/GenericPaladinNonCombatStrategy.cpp
@@ -0,0 +1,65 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PaladinMultipliers.h"
+#include "GenericPaladinNonCombatStrategy.h"
+#include "GenericPaladinStrategyActionNodeFactory.h"
+
+using namespace ai;
+
+GenericPaladinNonCombatStrategy::GenericPaladinNonCombatStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericPaladinStrategyActionNodeFactory());
+}
+
+void GenericPaladinNonCombatStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    NonCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "blessing of kings on party",
+        NextAction::array(0, new NextAction("blessing of kings on party", 11.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"party member dead",
+		NextAction::array(0, new NextAction("redemption", 30.0f), NULL)));
+
+	 triggers.push_back(new TriggerNode(
+        "medium health",
+        NextAction::array(0, new NextAction("flash of light", 25.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member medium health",
+        NextAction::array(0, new NextAction("flash of light on party", 26.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("holy light", 50.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member low health",
+        NextAction::array(0, new NextAction("holy light on party", 40.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse cure disease",
+        NextAction::array(0, new NextAction("cleanse disease", 41.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse party member cure disease",
+        NextAction::array(0, new NextAction("cleanse disease on party", 40.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse cure poison",
+        NextAction::array(0, new NextAction("cleanse poison", 41.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse party member cure poison",
+        NextAction::array(0, new NextAction("cleanse poison on party", 40.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse cure magic",
+        NextAction::array(0, new NextAction("cleanse magic", 41.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse party member cure magic",
+        NextAction::array(0, new NextAction("cleanse magic on party", 40.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/paladin/GenericPaladinNonCombatStrategy.h b/src/game/playerbot/strategy/paladin/GenericPaladinNonCombatStrategy.h
new file mode 100644
index 00000000000..cf03f6d38dd
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/GenericPaladinNonCombatStrategy.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../generic/NonCombatStrategy.h"
+
+namespace ai
+{
+    class GenericPaladinNonCombatStrategy : public NonCombatStrategy
+    {
+    public:
+        GenericPaladinNonCombatStrategy(PlayerbotAI* ai);
+        virtual string getName() { return "nc"; }
+    
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+   };
+}
diff --git a/src/game/playerbot/strategy/paladin/GenericPaladinStrategy.cpp b/src/game/playerbot/strategy/paladin/GenericPaladinStrategy.cpp
new file mode 100644
index 00000000000..d218be1130c
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/GenericPaladinStrategy.cpp
@@ -0,0 +1,77 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GenericPaladinStrategy.h"
+#include "GenericPaladinStrategyActionNodeFactory.h"
+
+using namespace ai;
+
+
+GenericPaladinStrategy::GenericPaladinStrategy(PlayerbotAI* ai) : MeleeCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericPaladinStrategyActionNodeFactory());
+}
+
+void GenericPaladinStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    MeleeCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "medium health",
+        NextAction::array(0, new NextAction("flash of light", ACTION_MEDIUM_HEAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member medium health",
+        NextAction::array(0, new NextAction("flash of light on party", ACTION_MEDIUM_HEAL + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("divine protection", ACTION_CRITICAL_HEAL + 2), new NextAction("holy light", ACTION_CRITICAL_HEAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member low health",
+        NextAction::array(0, new NextAction("holy light on party", ACTION_CRITICAL_HEAL + 1), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"hammer of justice interrupt",
+		NextAction::array(0, new NextAction("hammer of justice", ACTION_INTERRUPT), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"hammer of justice on enemy healer",
+		NextAction::array(0, new NextAction("hammer of justice on enemy healer", ACTION_INTERRUPT), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"critical health",
+		NextAction::array(0, new NextAction("lay on hands", ACTION_EMERGENCY), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"party member critical health",
+		NextAction::array(0, new NextAction("lay on hands on party", ACTION_EMERGENCY), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"target critical health",
+		NextAction::array(0, new NextAction("hammer of wrath", ACTION_HIGH + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse cure disease",
+        NextAction::array(0, new NextAction("cleanse disease", ACTION_DISPEL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse party member cure disease",
+        NextAction::array(0, new NextAction("cleanse disease on party", ACTION_DISPEL + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse cure poison",
+        NextAction::array(0, new NextAction("cleanse poison", ACTION_DISPEL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse party member cure poison",
+        NextAction::array(0, new NextAction("cleanse poison on party", ACTION_DISPEL + 1), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"cleanse cure magic",
+		NextAction::array(0, new NextAction("cleanse magic", ACTION_DISPEL + 2), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"cleanse party member cure magic",
+		NextAction::array(0, new NextAction("cleanse magic on party", ACTION_DISPEL + 1), NULL)));
+}
diff --git a/src/game/playerbot/strategy/paladin/GenericPaladinStrategy.h b/src/game/playerbot/strategy/paladin/GenericPaladinStrategy.h
new file mode 100644
index 00000000000..000f785c3d7
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/GenericPaladinStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "../Strategy.h"
+#include "PaladinAiObjectContext.h"
+#include "../generic/MeleeCombatStrategy.h"
+
+namespace ai
+{
+    class GenericPaladinStrategy : public MeleeCombatStrategy
+    {
+    public:
+        GenericPaladinStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "paladin"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/paladin/GenericPaladinStrategyActionNodeFactory.h b/src/game/playerbot/strategy/paladin/GenericPaladinStrategyActionNodeFactory.h
new file mode 100644
index 00000000000..f0773011864
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/GenericPaladinStrategyActionNodeFactory.h
@@ -0,0 +1,142 @@
+#pragma once
+
+namespace ai
+{
+    class GenericPaladinStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+    {
+    public:
+        GenericPaladinStrategyActionNodeFactory()
+        {
+            creators["seal of light"] = &seal_of_light;
+            creators["cleanse poison"] = &cleanse_poison;
+            creators["cleanse disease"] = &cleanse_disease;
+            creators["cleanse magic"] = &cleanse_magic;
+            creators["cleanse poison on party"] = &cleanse_poison_on_party;
+            creators["cleanse disease on party"] = &cleanse_disease_on_party;
+            creators["seal of wisdom"] = &seal_of_wisdom;
+            creators["seal of justice"] = &seal_of_justice;
+            creators["hand of reckoning"] = &hand_of_reckoning;
+            creators["judgement of wisdom"] = &judgement_of_wisdom;
+            creators["divine shield"] = &divine_shield;
+            creators["flash of light"] = &flash_of_light;
+            creators["flash of light on party"] = &flash_of_light_on_party;
+            creators["holy wrath"] = &holy_wrath;
+            creators["lay on hands"] = &lay_on_hands;
+            creators["lay on hands on party"] = &lay_on_hands_on_party;
+        }
+    private:
+        static ActionNode* lay_on_hands(PlayerbotAI* ai)
+        {
+            return new ActionNode ("lay on hands",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("divine shield"), new NextAction("flash of light"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* lay_on_hands_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("lay on hands on party",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("flash of light"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* seal_of_light(PlayerbotAI* ai)
+        {
+            return new ActionNode ("seal of light",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("seal of justice"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* cleanse_poison(PlayerbotAI* ai)
+        {
+            return new ActionNode ("cleanse poison",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("purify poison"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* cleanse_magic(PlayerbotAI* ai)
+        {
+            return new ActionNode ("cleanse magic",
+                /*P*/ NULL,
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* cleanse_disease(PlayerbotAI* ai)
+        {
+            return new ActionNode ("cleanse disease",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("purify disease"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* cleanse_poison_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("cleanse poison on party",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("purify poison on party"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* cleanse_disease_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("cleanse disease on party",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("purify disease on party"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* seal_of_wisdom(PlayerbotAI* ai)
+        {
+            return new ActionNode ("seal of wisdom",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("seal of justice"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* seal_of_justice(PlayerbotAI* ai)
+        {
+            return new ActionNode ("seal of justice",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("seal of righteousness"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* hand_of_reckoning(PlayerbotAI* ai)
+        {
+            return new ActionNode ("hand of reckoning",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("judgement of justice"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* judgement_of_wisdom(PlayerbotAI* ai)
+        {
+            return new ActionNode ("judgement of wisdom",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("judgement of light"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* divine_shield(PlayerbotAI* ai)
+        {
+            return new ActionNode ("divine shield",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("divine protection"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* flash_of_light(PlayerbotAI* ai)
+        {
+            return new ActionNode ("flash of light",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("holy light"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* flash_of_light_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("flash of light on party",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("holy light on party"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* holy_wrath(PlayerbotAI* ai)
+        {
+            return new ActionNode ("holy wrath",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("consecration"), NULL),
+                /*C*/ NULL);
+        }
+    };
+
+};
diff --git a/src/game/playerbot/strategy/paladin/PaladinActions.cpp b/src/game/playerbot/strategy/paladin/PaladinActions.cpp
new file mode 100644
index 00000000000..47def407205
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/PaladinActions.cpp
@@ -0,0 +1,6 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PaladinActions.h"
+
+using namespace ai;
+
diff --git a/src/game/playerbot/strategy/paladin/PaladinActions.h b/src/game/playerbot/strategy/paladin/PaladinActions.h
new file mode 100644
index 00000000000..78f782c75d6
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/PaladinActions.h
@@ -0,0 +1,365 @@
+#pragma once
+#include "../actions/GenericActions.h"
+
+namespace ai
+{
+    class CastJudgementOfLightAction : public CastMeleeSpellAction
+    {
+    public:
+        CastJudgementOfLightAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "judgement of light") {}
+    };
+
+    class CastJudgementOfWisdomAction : public CastMeleeSpellAction
+    {
+    public:
+        CastJudgementOfWisdomAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "judgement of wisdom") {}
+    };
+
+    class CastJudgementOfJusticeAction : public CastMeleeSpellAction
+    {
+    public:
+        CastJudgementOfJusticeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "judgement of justice") {}
+    };
+
+	class CastRighteousFuryAction : public CastBuffSpellAction
+	{
+	public:
+		CastRighteousFuryAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "righteous fury") {}
+	};
+
+	class CastDevotionAuraAction : public CastBuffSpellAction
+	{
+	public:
+		CastDevotionAuraAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "devotion aura") {}
+	};
+
+	class CastRetributionAuraAction : public CastBuffSpellAction
+	{
+	public:
+		CastRetributionAuraAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "retribution aura") {}
+	};
+
+	class CastConcentrationAuraAction : public CastBuffSpellAction
+	{
+	public:
+		CastConcentrationAuraAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "concentration aura") {}
+	};
+
+	class CastDivineStormAction : public CastBuffSpellAction
+	{
+	public:
+		CastDivineStormAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "divine storm") {}
+	};
+
+	class CastCrusaderStrikeAction : public CastMeleeSpellAction
+	{
+	public:
+		CastCrusaderStrikeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "crusader strike") {}
+	};
+
+	class CastShadowResistanceAuraAction : public CastBuffSpellAction
+	{
+	public:
+		CastShadowResistanceAuraAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "shadow resistance aura") {}
+	};
+
+	class CastFrostResistanceAuraAction : public CastBuffSpellAction
+	{
+	public:
+		CastFrostResistanceAuraAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "frost resistance aura") {}
+	};
+
+	class CastFireResistanceAuraAction : public CastBuffSpellAction
+	{
+	public:
+		CastFireResistanceAuraAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "fire resistance aura") {}
+	};
+
+	class CastCrusaderAuraAction : public CastBuffSpellAction
+	{
+	public:
+		CastCrusaderAuraAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "crusader aura") {}
+	};
+
+	class CastSealOfRighteousnessAction : public CastBuffSpellAction
+	{
+	public:
+		CastSealOfRighteousnessAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "seal of righteousness") {}
+	};
+
+	class CastSealOfJusticeAction : public CastBuffSpellAction
+	{
+	public:
+		CastSealOfJusticeAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "seal of justice") {}
+	};
+
+
+	class CastSealOfLightAction : public CastBuffSpellAction
+	{
+	public:
+		CastSealOfLightAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "seal of light") {}
+	};
+
+	class CastSealOfWisdomAction : public CastBuffSpellAction
+	{
+	public:
+		CastSealOfWisdomAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "seal of wisdom") {}
+	};
+
+	class CastSealOfCommandAction : public CastBuffSpellAction
+	{
+	public:
+		CastSealOfCommandAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "seal of command") {}
+	};
+
+	class CastSealOfVengeanceAction : public CastBuffSpellAction
+	{
+	public:
+	    CastSealOfVengeanceAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "seal of vengeance") {}
+	};
+
+
+	class CastBlessingOfMightAction : public CastBuffSpellAction
+	{
+	public:
+		CastBlessingOfMightAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "blessing of might") {}
+	};
+
+	class CastBlessingOfMightOnPartyAction : public BuffOnPartyAction
+	{
+	public:
+		CastBlessingOfMightOnPartyAction(PlayerbotAI* ai) : BuffOnPartyAction(ai, "blessing of might") {}
+        virtual string getName() { return "blessing of might on party";}
+	};
+
+	class CastBlessingOfWisdomAction : public CastBuffSpellAction
+	{
+	public:
+		CastBlessingOfWisdomAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "blessing of wisdom") {}
+	};
+
+	class CastBlessingOfWisdomOnPartyAction : public BuffOnPartyAction
+	{
+	public:
+		CastBlessingOfWisdomOnPartyAction(PlayerbotAI* ai) : BuffOnPartyAction(ai, "blessing of wisdom") {}
+        virtual string getName() { return "blessing of wisdom on party";}
+	};
+
+	class CastBlessingOfKingsAction : public CastBuffSpellAction
+	{
+	public:
+		CastBlessingOfKingsAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "blessing of kings") {}
+	};
+
+	class CastBlessingOfKingsOnPartyAction : public BuffOnPartyAction
+	{
+	public:
+		CastBlessingOfKingsOnPartyAction(PlayerbotAI* ai) : BuffOnPartyAction(ai, "blessing of kings") {}
+        virtual string getName() { return "blessing of kings on party";}
+	};
+
+	class CastBlessingOfSanctuaryAction : public CastBuffSpellAction
+	{
+	public:
+		CastBlessingOfSanctuaryAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "blessing of sanctuary") {}
+	};
+
+	class CastBlessingOfSanctuaryOnPartyAction : public BuffOnPartyAction
+	{
+	public:
+		CastBlessingOfSanctuaryOnPartyAction(PlayerbotAI* ai) : BuffOnPartyAction(ai, "blessing of sanctuary") {}
+        virtual string getName() { return "blessing of sanctuary on party";}
+	};
+
+    class CastHolyLightAction : public CastHealingSpellAction
+    {
+    public:
+        CastHolyLightAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "holy light") {}
+    };
+
+    class CastHolyLightOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastHolyLightOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "holy light") {}
+
+        virtual string getName() { return "holy light on party"; }
+    };
+
+    class CastFlashOfLightAction : public CastHealingSpellAction
+    {
+    public:
+        CastFlashOfLightAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "flash of light") {}
+    };
+
+    class CastFlashOfLightOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastFlashOfLightOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "flash of light") {}
+
+        virtual string getName() { return "flash of light on party"; }
+    };
+
+    class CastLayOnHandsAction : public CastHealingSpellAction
+    {
+    public:
+        CastLayOnHandsAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "lay on hands") {}
+    };
+
+    class CastLayOnHandsOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastLayOnHandsOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "lay on hands") {}
+
+        virtual string getName() { return "lay on hands on party"; }
+    };
+
+	class CastDivineProtectionAction : public CastBuffSpellAction
+	{
+	public:
+		CastDivineProtectionAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "divine protection") {}
+	};
+
+    class CastDivineProtectionOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastDivineProtectionOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "divine protection") {}
+
+        virtual string getName() { return "divine protection on party"; }
+    };
+
+	class CastDivineShieldAction: public CastBuffSpellAction
+	{
+	public:
+		CastDivineShieldAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "divine shield") {}
+	};
+
+    class CastConsecrationAction : public CastMeleeSpellAction
+    {
+    public:
+	    CastConsecrationAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "consecration") {}
+    };
+
+    class CastHolyWrathAction : public CastMeleeSpellAction
+    {
+    public:
+        CastHolyWrathAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "holy wrath") {}
+    };
+
+    class CastHammerOfJusticeAction : public CastMeleeSpellAction
+    {
+    public:
+        CastHammerOfJusticeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "hammer of justice") {}
+    };
+
+	class CastHammerOfWrathAction : public CastMeleeSpellAction
+	{
+	public:
+		CastHammerOfWrathAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "hammer of wrath") {}
+	};
+
+	class CastHammerOfTheRighteousAction : public CastMeleeSpellAction
+	{
+	public:
+		CastHammerOfTheRighteousAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "hammer of the righteous") {}
+	};
+
+	class CastPurifyPoisonAction : public CastCureSpellAction
+	{
+	public:
+		CastPurifyPoisonAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "purify") {}
+	};
+
+	class CastPurifyDiseaseAction : public CastCureSpellAction
+	{
+	public:
+		CastPurifyDiseaseAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "purify") {}
+	};
+
+    class CastPurifyPoisonOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastPurifyPoisonOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "purify", DISPEL_POISON) {}
+
+        virtual string getName() { return "purify poison on party"; }
+    };
+
+	class CastPurifyDiseaseOnPartyAction : public CurePartyMemberAction
+	{
+	public:
+		CastPurifyDiseaseOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "purify", DISPEL_DISEASE) {}
+
+		virtual string getName() { return "purify disease on party"; }
+	};
+
+	class CastHandOfReckoningAction : public CastSpellAction
+	{
+	public:
+		CastHandOfReckoningAction(PlayerbotAI* ai) : CastSpellAction(ai, "hand of reckoning") {}
+	};
+
+	class CastCleansePoisonAction : public CastCureSpellAction
+	{
+	public:
+		CastCleansePoisonAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "cleanse") {}
+	};
+
+	class CastCleanseDiseaseAction : public CastCureSpellAction
+	{
+	public:
+		CastCleanseDiseaseAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "cleanse") {}
+	};
+
+	class CastCleanseMagicAction : public CastCureSpellAction
+	{
+	public:
+		CastCleanseMagicAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "cleanse") {}
+	};
+
+    class CastCleansePoisonOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastCleansePoisonOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "cleanse", DISPEL_POISON) {}
+
+        virtual string getName() { return "cleanse poison on party"; }
+    };
+
+	class CastCleanseDiseaseOnPartyAction : public CurePartyMemberAction
+	{
+	public:
+		CastCleanseDiseaseOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "cleanse", DISPEL_DISEASE) {}
+
+		virtual string getName() { return "cleanse disease on party"; }
+	};
+
+	class CastCleanseMagicOnPartyAction : public CurePartyMemberAction
+	{
+	public:
+		CastCleanseMagicOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "cleanse", DISPEL_MAGIC) {}
+
+		virtual string getName() { return "cleanse magic on party"; }
+	};
+
+    BEGIN_SPELL_ACTION(CastAvengersShieldAction, "avenger's shield")
+    END_SPELL_ACTION()
+
+	BEGIN_SPELL_ACTION(CastExorcismAction, "exorcism")
+	END_SPELL_ACTION()
+
+	class CastHolyShieldAction : public CastBuffSpellAction
+	{
+	public:
+		CastHolyShieldAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "holy shield") {}
+	};
+
+	class CastRedemptionAction : public ResurrectPartyMemberAction
+	{
+	public:
+		CastRedemptionAction(PlayerbotAI* ai) : ResurrectPartyMemberAction(ai, "redemption") {}
+	};
+
+    class CastHammerOfJusticeOnEnemyHealerAction : public CastSpellOnEnemyHealerAction
+    {
+    public:
+        CastHammerOfJusticeOnEnemyHealerAction(PlayerbotAI* ai) : CastSpellOnEnemyHealerAction(ai, "hammer of justice") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/paladin/PaladinAiObjectContext.cpp b/src/game/playerbot/strategy/paladin/PaladinAiObjectContext.cpp
new file mode 100644
index 00000000000..37c746812c4
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/PaladinAiObjectContext.cpp
@@ -0,0 +1,279 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PaladinActions.h"
+#include "PaladinTriggers.h"
+#include "PaladinAiObjectContext.h"
+#include "GenericPaladinNonCombatStrategy.h"
+#include "TankPaladinStrategy.h"
+#include "DpsPaladinStrategy.h"
+#include "PaladinBuffStrategies.h"
+#include "../NamedObjectContext.h"
+
+using namespace ai;
+
+namespace ai
+{
+    namespace paladin
+    {
+        using namespace ai;
+
+        class StrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            StrategyFactoryInternal()
+            {
+                creators["nc"] = &paladin::StrategyFactoryInternal::nc;
+            }
+
+        private:
+            static Strategy* nc(PlayerbotAI* ai) { return new GenericPaladinNonCombatStrategy(ai); }
+        };
+
+        class ResistanceStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            ResistanceStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["rshadow"] = &paladin::ResistanceStrategyFactoryInternal::rshadow;
+                creators["rfrost"] = &paladin::ResistanceStrategyFactoryInternal::rfrost;
+                creators["rfire"] = &paladin::ResistanceStrategyFactoryInternal::rfire;
+            }
+
+        private:
+            static Strategy* rshadow(PlayerbotAI* ai) { return new PaladinShadowResistanceStrategy(ai); }
+            static Strategy* rfrost(PlayerbotAI* ai) { return new PaladinFrostResistanceStrategy(ai); }
+            static Strategy* rfire(PlayerbotAI* ai) { return new PaladinFireResistanceStrategy(ai); }
+        };
+
+        class BuffStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            BuffStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["bhealth"] = &paladin::BuffStrategyFactoryInternal::bhealth;
+                creators["bmana"] = &paladin::BuffStrategyFactoryInternal::bmana;
+                creators["bdps"] = &paladin::BuffStrategyFactoryInternal::bdps;
+                creators["barmor"] = &paladin::BuffStrategyFactoryInternal::barmor;
+                creators["bspeed"] = &paladin::BuffStrategyFactoryInternal::bspeed;
+            }
+
+        private:
+            static Strategy* bhealth(PlayerbotAI* ai) { return new PaladinBuffHealthStrategy(ai); }
+            static Strategy* bmana(PlayerbotAI* ai) { return new PaladinBuffManaStrategy(ai); }
+            static Strategy* bdps(PlayerbotAI* ai) { return new PaladinBuffDpsStrategy(ai); }
+            static Strategy* barmor(PlayerbotAI* ai) { return new PaladinBuffArmorStrategy(ai); }
+            static Strategy* bspeed(PlayerbotAI* ai) { return new PaladinBuffSpeedStrategy(ai); }
+        };
+
+        class CombatStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            CombatStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["tank"] = &paladin::CombatStrategyFactoryInternal::tank;
+                creators["dps"] = &paladin::CombatStrategyFactoryInternal::dps;
+            }
+
+        private:
+            static Strategy* tank(PlayerbotAI* ai) { return new TankPaladinStrategy(ai); }
+            static Strategy* dps(PlayerbotAI* ai) { return new DpsPaladinStrategy(ai); }
+        };
+    };
+};
+
+namespace ai
+{
+    namespace paladin
+    {
+        using namespace ai;
+
+        class TriggerFactoryInternal : public NamedObjectContext<Trigger>
+        {
+        public:
+            TriggerFactoryInternal()
+            {
+                creators["judgement of wisdom"] = &TriggerFactoryInternal::judgement_of_wisdom;
+                creators["judgement of light"] = &TriggerFactoryInternal::judgement_of_light;
+                creators["blessing"] = &TriggerFactoryInternal::blessing;
+                creators["seal"] = &TriggerFactoryInternal::seal;
+                creators["art of war"] = &TriggerFactoryInternal::art_of_war;
+                creators["blessing of kings on party"] = &TriggerFactoryInternal::blessing_of_kings_on_party;
+                creators["crusader aura"] = &TriggerFactoryInternal::crusader_aura;
+                creators["retribution aura"] = &TriggerFactoryInternal::retribution_aura;
+                creators["devotion aura"] = &TriggerFactoryInternal::devotion_aura;
+                creators["shadow resistance aura"] = &TriggerFactoryInternal::shadow_resistance_aura;
+                creators["frost resistance aura"] = &TriggerFactoryInternal::frost_resistance_aura;
+                creators["fire resistance aura"] = &TriggerFactoryInternal::fire_resistance_aura;
+                creators["hammer of justice snare"] = &TriggerFactoryInternal::hammer_of_justice_snare;
+                creators["hammer of justice interrupt"] = &TriggerFactoryInternal::hammer_of_justice_interrupt;
+                creators["cleanse cure disease"] = &TriggerFactoryInternal::CleanseCureDisease;
+                creators["cleanse party member cure disease"] = &TriggerFactoryInternal::CleanseCurePartyMemberDisease;
+                creators["cleanse cure poison"] = &TriggerFactoryInternal::CleanseCurePoison;
+                creators["cleanse party member cure poison"] = &TriggerFactoryInternal::CleanseCurePartyMemberPoison;
+                creators["cleanse cure magic"] = &TriggerFactoryInternal::CleanseCureMagic;
+                creators["cleanse party member cure magic"] = &TriggerFactoryInternal::CleanseCurePartyMemberMagic;
+                creators["righteous fury"] = &TriggerFactoryInternal::righteous_fury;
+                creators["holy shield"] = &TriggerFactoryInternal::holy_shield;
+                creators["hammer of justice on enemy healer"] = &TriggerFactoryInternal::hammer_of_justice_on_enemy_target;
+            }
+
+        private:
+            static Trigger* holy_shield(PlayerbotAI* ai) { return new HolyShieldTrigger(ai); }
+            static Trigger* righteous_fury(PlayerbotAI* ai) { return new RighteousFuryTrigger(ai); }
+            static Trigger* judgement_of_wisdom(PlayerbotAI* ai) { return new JudgementOfWisdomTrigger(ai); }
+            static Trigger* judgement_of_light(PlayerbotAI* ai) { return new JudgementOfLightTrigger(ai); }
+            static Trigger* blessing(PlayerbotAI* ai) { return new BlessingTrigger(ai); }
+            static Trigger* seal(PlayerbotAI* ai) { return new SealTrigger(ai); }
+            static Trigger* art_of_war(PlayerbotAI* ai) { return new ArtOfWarTrigger(ai); }
+            static Trigger* blessing_of_kings_on_party(PlayerbotAI* ai) { return new BlessingOfKingsOnPartyTrigger(ai); }
+            static Trigger* crusader_aura(PlayerbotAI* ai) { return new CrusaderAuraTrigger(ai); }
+            static Trigger* retribution_aura(PlayerbotAI* ai) { return new RetributionAuraTrigger(ai); }
+            static Trigger* devotion_aura(PlayerbotAI* ai) { return new DevotionAuraTrigger(ai); }
+            static Trigger* shadow_resistance_aura(PlayerbotAI* ai) { return new ShadowResistanceAuraTrigger(ai); }
+            static Trigger* frost_resistance_aura(PlayerbotAI* ai) { return new FrostResistanceAuraTrigger(ai); }
+            static Trigger* fire_resistance_aura(PlayerbotAI* ai) { return new FireResistanceAuraTrigger(ai); }
+            static Trigger* hammer_of_justice_snare(PlayerbotAI* ai) { return new HammerOfJusticeSnareTrigger(ai); }
+            static Trigger* hammer_of_justice_interrupt(PlayerbotAI* ai) { return new HammerOfJusticeInterruptSpellTrigger(ai); }
+            static Trigger* CleanseCureDisease(PlayerbotAI* ai) { return new CleanseCureDiseaseTrigger(ai); }
+            static Trigger* CleanseCurePartyMemberDisease(PlayerbotAI* ai) { return new CleanseCurePartyMemberDiseaseTrigger(ai); }
+            static Trigger* CleanseCurePoison(PlayerbotAI* ai) { return new CleanseCurePoisonTrigger(ai); }
+            static Trigger* CleanseCurePartyMemberPoison(PlayerbotAI* ai) { return new CleanseCurePartyMemberPoisonTrigger(ai); }
+            static Trigger* CleanseCureMagic(PlayerbotAI* ai) { return new CleanseCureMagicTrigger(ai); }
+            static Trigger* CleanseCurePartyMemberMagic(PlayerbotAI* ai) { return new CleanseCurePartyMemberMagicTrigger(ai); }
+            static Trigger* hammer_of_justice_on_enemy_target(PlayerbotAI* ai) { return new HammerOfJusticeEnemyHealerTrigger(ai); }
+        };
+    };
+};
+
+namespace ai
+{
+    namespace paladin
+    {
+        using namespace ai;
+
+        class AiObjectContextInternal : public NamedObjectContext<Action>
+        {
+        public:
+            AiObjectContextInternal()
+            {
+                creators["seal of command"] = &AiObjectContextInternal::seal_of_command;
+                creators["seal of vengeance"] = &AiObjectContextInternal::seal_of_vengeance;
+                creators["blessing of might"] = &AiObjectContextInternal::blessing_of_might;
+                creators["divine storm"] = &AiObjectContextInternal::divine_storm;
+                creators["blessing of kings on party"] = &AiObjectContextInternal::blessing_of_kings_on_party;
+                creators["redemption"] = &AiObjectContextInternal::redemption;
+                creators["crusader strike"] = &AiObjectContextInternal::crusader_strike;
+                creators["crusader aura"] = &AiObjectContextInternal::crusader_aura;
+                creators["seal of light"] = &AiObjectContextInternal::seal_of_light;
+                creators["devotion aura"] = &AiObjectContextInternal::devotion_aura;
+                creators["holy wrath"] = &AiObjectContextInternal::holy_wrath;
+                creators["consecration"] = &AiObjectContextInternal::consecration;
+                creators["cleanse disease"] = &AiObjectContextInternal::cleanse_disease;
+                creators["cleanse poison"] = &AiObjectContextInternal::cleanse_poison;
+                creators["cleanse magic"] = &AiObjectContextInternal::cleanse_magic;
+                creators["purify disease"] = &AiObjectContextInternal::purify_disease;
+                creators["purify poison"] = &AiObjectContextInternal::purify_poison;
+                creators["cleanse poison on party"] = &AiObjectContextInternal::cleanse_poison_on_party;
+                creators["cleanse disease on party"] = &AiObjectContextInternal::cleanse_disease_on_party;
+                creators["cleanse magic on party"] = &AiObjectContextInternal::cleanse_magic_on_party;
+                creators["purify poison on party"] = &AiObjectContextInternal::purify_poison_on_party;
+                creators["purify disease on party"] = &AiObjectContextInternal::purify_disease_on_party;
+                creators["seal of wisdom"] = &AiObjectContextInternal::seal_of_wisdom;
+                creators["seal of justice"] = &AiObjectContextInternal::seal_of_justice;
+                creators["seal of righteousness"] = &AiObjectContextInternal::seal_of_righteousness;
+                creators["flash of light"] = &AiObjectContextInternal::flash_of_light;
+                creators["hand of reckoning"] = &AiObjectContextInternal::hand_of_reckoning;
+                creators["avenger's shield"] = &AiObjectContextInternal::avengers_shield;
+                creators["exorcism"] = &AiObjectContextInternal::exorcism;
+                creators["judgement of light"] = &AiObjectContextInternal::judgement_of_light;
+                creators["judgement of wisdom"] = &AiObjectContextInternal::judgement_of_wisdom;
+                creators["divine shield"] = &AiObjectContextInternal::divine_shield;
+                creators["divine protection"] = &AiObjectContextInternal::divine_protection;
+                creators["divine protection on party"] =&AiObjectContextInternal::divine_protection_on_party;
+                creators["hammer of justice"] = &AiObjectContextInternal::hammer_of_justice;
+                creators["flash of light on party"] = &AiObjectContextInternal::flash_of_light_on_party;
+                creators["holy light"] = &AiObjectContextInternal::holy_light;
+                creators["holy light on party"] = &AiObjectContextInternal::holy_light_on_party;
+                creators["lay on hands"] = &AiObjectContextInternal::lay_on_hands;
+                creators["lay on hands on party"] = &AiObjectContextInternal::lay_on_hands_on_party;
+                creators["judgement of justice"] = &AiObjectContextInternal::judgement_of_justice;
+                creators["hammer of wrath"] = &AiObjectContextInternal::hammer_of_wrath;
+                creators["holy shield"] = &AiObjectContextInternal::holy_shield;
+                creators["hammer of the righteous"] = &AiObjectContextInternal::hammer_of_the_righteous;
+                creators["blessing of kings"] = &AiObjectContextInternal::blessing_of_kings;
+                creators["retribution aura"] = &AiObjectContextInternal::retribution_aura;
+                creators["shadow resistance aura"] = &AiObjectContextInternal::shadow_resistance_aura;
+                creators["frost resistance aura"] = &AiObjectContextInternal::frost_resistance_aura;
+                creators["fire resistance aura"] = &AiObjectContextInternal::fire_resistance_aura;
+                creators["righteous fury"] = &AiObjectContextInternal::righteous_fury;
+                creators["blessing of sanctuary"] = &AiObjectContextInternal::blessing_of_sanctuary;
+                creators["hammer of justice on enemy healer"] = &AiObjectContextInternal::hammer_of_justice_on_enemy_healer;
+            }
+
+        private:
+            static Action* righteous_fury(PlayerbotAI* ai) { return new CastRighteousFuryAction(ai); }
+            static Action* blessing_of_sanctuary(PlayerbotAI* ai) { return new CastBlessingOfSanctuaryAction(ai); }
+            static Action* seal_of_command(PlayerbotAI* ai) { return new CastSealOfCommandAction(ai); }
+            static Action* seal_of_vengeance(PlayerbotAI* ai) { return new CastSealOfVengeanceAction(ai); }
+            static Action* blessing_of_might(PlayerbotAI* ai) { return new CastBlessingOfMightAction(ai); }
+            static Action* divine_storm(PlayerbotAI* ai) { return new CastDivineStormAction(ai); }
+            static Action* blessing_of_kings_on_party(PlayerbotAI* ai) { return new CastBlessingOfKingsOnPartyAction(ai); }
+            static Action* redemption(PlayerbotAI* ai) { return new CastRedemptionAction(ai); }
+            static Action* crusader_strike(PlayerbotAI* ai) { return new CastCrusaderStrikeAction(ai); }
+            static Action* crusader_aura(PlayerbotAI* ai) { return new CastCrusaderAuraAction(ai); }
+            static Action* seal_of_light(PlayerbotAI* ai) { return new CastSealOfLightAction(ai); }
+            static Action* devotion_aura(PlayerbotAI* ai) { return new CastDevotionAuraAction(ai); }
+            static Action* holy_wrath(PlayerbotAI* ai) { return new CastHolyWrathAction(ai); }
+            static Action* consecration(PlayerbotAI* ai) { return new CastConsecrationAction(ai); }
+            static Action* cleanse_poison(PlayerbotAI* ai) { return new CastCleansePoisonAction(ai); }
+            static Action* cleanse_disease(PlayerbotAI* ai) { return new CastCleanseDiseaseAction(ai); }
+            static Action* cleanse_magic(PlayerbotAI* ai) { return new CastCleanseMagicAction(ai); }
+            static Action* purify_poison(PlayerbotAI* ai) { return new CastPurifyPoisonAction(ai); }
+            static Action* purify_disease(PlayerbotAI* ai) { return new CastPurifyDiseaseAction(ai); }
+            static Action* cleanse_poison_on_party(PlayerbotAI* ai) { return new CastCleansePoisonOnPartyAction(ai); }
+            static Action* cleanse_disease_on_party(PlayerbotAI* ai) { return new CastCleanseDiseaseOnPartyAction(ai); }
+            static Action* cleanse_magic_on_party(PlayerbotAI* ai) { return new CastCleanseMagicOnPartyAction(ai); }
+            static Action* purify_poison_on_party(PlayerbotAI* ai) { return new CastPurifyPoisonOnPartyAction(ai); }
+            static Action* purify_disease_on_party(PlayerbotAI* ai) { return new CastPurifyDiseaseOnPartyAction(ai); }
+            static Action* seal_of_wisdom(PlayerbotAI* ai) { return new CastSealOfWisdomAction(ai); }
+            static Action* seal_of_justice(PlayerbotAI* ai) { return new CastSealOfJusticeAction(ai); }
+            static Action* seal_of_righteousness(PlayerbotAI* ai) { return new CastSealOfRighteousnessAction(ai); }
+            static Action* flash_of_light(PlayerbotAI* ai) { return new CastFlashOfLightAction(ai); }
+            static Action* hand_of_reckoning(PlayerbotAI* ai) { return new CastHandOfReckoningAction(ai); }
+            static Action* avengers_shield(PlayerbotAI* ai) { return new CastAvengersShieldAction(ai); }
+            static Action* exorcism(PlayerbotAI* ai) { return new CastExorcismAction(ai); }
+            static Action* judgement_of_light(PlayerbotAI* ai) { return new CastJudgementOfLightAction(ai); }
+            static Action* judgement_of_wisdom(PlayerbotAI* ai) { return new CastJudgementOfWisdomAction(ai); }
+            static Action* divine_shield(PlayerbotAI* ai) { return new CastDivineShieldAction(ai); }
+            static Action* divine_protection(PlayerbotAI* ai) { return new CastDivineProtectionAction(ai); }
+            static Action* divine_protection_on_party(PlayerbotAI* ai) { return new CastDivineProtectionOnPartyAction(ai); }
+            static Action* hammer_of_justice(PlayerbotAI* ai) { return new CastHammerOfJusticeAction(ai); }
+            static Action* flash_of_light_on_party(PlayerbotAI* ai) { return new CastFlashOfLightOnPartyAction(ai); }
+            static Action* holy_light(PlayerbotAI* ai) { return new CastHolyLightAction(ai); }
+            static Action* holy_light_on_party(PlayerbotAI* ai) { return new CastHolyLightOnPartyAction(ai); }
+            static Action* lay_on_hands(PlayerbotAI* ai) { return new CastLayOnHandsAction(ai); }
+            static Action* lay_on_hands_on_party(PlayerbotAI* ai) { return new CastLayOnHandsOnPartyAction(ai); }
+            static Action* judgement_of_justice(PlayerbotAI* ai) { return new CastJudgementOfJusticeAction(ai); }
+            static Action* hammer_of_wrath(PlayerbotAI* ai) { return new CastHammerOfWrathAction(ai); }
+            static Action* holy_shield(PlayerbotAI* ai) { return new CastHolyShieldAction(ai); }
+            static Action* hammer_of_the_righteous(PlayerbotAI* ai) { return new CastHammerOfTheRighteousAction(ai); }
+            static Action* blessing_of_kings(PlayerbotAI* ai) { return new CastBlessingOfKingsAction(ai); }
+            static Action* retribution_aura(PlayerbotAI* ai) { return new CastRetributionAuraAction(ai); }
+            static Action* shadow_resistance_aura(PlayerbotAI* ai) { return new CastShadowResistanceAuraAction(ai); }
+            static Action* frost_resistance_aura(PlayerbotAI* ai) { return new CastFrostResistanceAuraAction(ai); }
+            static Action* fire_resistance_aura(PlayerbotAI* ai) { return new CastFireResistanceAuraAction(ai); }
+            static Action* hammer_of_justice_on_enemy_healer(PlayerbotAI* ai) { return new CastHammerOfJusticeOnEnemyHealerAction(ai); }
+        };
+    };
+};
+
+
+PaladinAiObjectContext::PaladinAiObjectContext(PlayerbotAI* ai) : AiObjectContext(ai)
+{
+    strategyContexts.Add(new ai::paladin::StrategyFactoryInternal());
+    strategyContexts.Add(new ai::paladin::CombatStrategyFactoryInternal());
+    strategyContexts.Add(new ai::paladin::BuffStrategyFactoryInternal());
+    strategyContexts.Add(new ai::paladin::ResistanceStrategyFactoryInternal());
+    actionContexts.Add(new ai::paladin::AiObjectContextInternal());
+    triggerContexts.Add(new ai::paladin::TriggerFactoryInternal());
+}
diff --git a/src/game/playerbot/strategy/paladin/PaladinAiObjectContext.h b/src/game/playerbot/strategy/paladin/PaladinAiObjectContext.h
new file mode 100644
index 00000000000..1af334341af
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/PaladinAiObjectContext.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../AiObjectContext.h"
+
+namespace ai
+{
+    class PaladinAiObjectContext : public AiObjectContext
+    {
+    public:
+        PaladinAiObjectContext(PlayerbotAI* ai);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/paladin/PaladinBuffStrategies.cpp b/src/game/playerbot/strategy/paladin/PaladinBuffStrategies.cpp
new file mode 100644
index 00000000000..5124024d3ab
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/PaladinBuffStrategies.cpp
@@ -0,0 +1,72 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PaladinMultipliers.h"
+#include "PaladinBuffStrategies.h"
+
+using namespace ai;
+
+void PaladinBuffManaStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "seal",
+        NextAction::array(0, new NextAction("seal of wisdom", 90.0f), NULL)));
+}
+
+void PaladinBuffHealthStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "seal",
+        NextAction::array(0, new NextAction("seal of light", 90.0f), NULL)));
+}
+
+void PaladinBuffSpeedStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "crusader aura",
+        NextAction::array(0, new NextAction("crusader aura", 40.0f), NULL)));
+}
+
+void PaladinBuffDpsStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "seal",
+        NextAction::array(0, new NextAction("seal of vengeance", 89.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"retribution aura",
+		NextAction::array(0, new NextAction("retribution aura", 90.0f), NULL)));
+}
+
+void PaladinShadowResistanceStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+	triggers.push_back(new TriggerNode(
+		"shadow resistance aura",
+		NextAction::array(0, new NextAction("shadow resistance aura", 90.0f), NULL)));
+}
+
+void PaladinFrostResistanceStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+	triggers.push_back(new TriggerNode(
+		"frost resistance aura",
+		NextAction::array(0, new NextAction("frost resistance aura", 90.0f), NULL)));
+}
+
+void PaladinFireResistanceStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+	triggers.push_back(new TriggerNode(
+		"fire resistance aura",
+		NextAction::array(0, new NextAction("fire resistance aura", 90.0f), NULL)));
+}
+
+
+void PaladinBuffArmorStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "seal",
+        NextAction::array(0, new NextAction("seal of light", 89.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"devotion aura",
+		NextAction::array(0, new NextAction("devotion aura", 90.0f), NULL)));
+}
+
diff --git a/src/game/playerbot/strategy/paladin/PaladinBuffStrategies.h b/src/game/playerbot/strategy/paladin/PaladinBuffStrategies.h
new file mode 100644
index 00000000000..e5051a17df3
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/PaladinBuffStrategies.h
@@ -0,0 +1,86 @@
+#pragma once
+
+#include "GenericPaladinStrategy.h"
+
+namespace ai
+{
+    class PaladinBuffManaStrategy : public Strategy
+    {
+    public:
+        PaladinBuffManaStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "bmana"; }
+    };
+
+    class PaladinBuffHealthStrategy : public Strategy
+    {
+    public:
+        PaladinBuffHealthStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "bhealth"; }
+    };
+
+    class PaladinBuffDpsStrategy : public Strategy
+    {
+    public:
+        PaladinBuffDpsStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "bdps"; }
+    };
+
+	class PaladinBuffArmorStrategy : public Strategy
+	{
+	public:
+		PaladinBuffArmorStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+	public:
+		virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+		virtual string getName() { return "barmor"; }
+	};
+
+	class PaladinBuffSpeedStrategy : public Strategy
+	{
+	public:
+		PaladinBuffSpeedStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+	public:
+		virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+		virtual string getName() { return "bspeed"; }
+	};
+
+	class PaladinShadowResistanceStrategy : public Strategy
+	{
+	public:
+		PaladinShadowResistanceStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+	public:
+		virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+		virtual string getName() { return "rshadow"; }
+	};
+
+	class PaladinFrostResistanceStrategy : public Strategy
+	{
+	public:
+		PaladinFrostResistanceStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+	public:
+		virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+		virtual string getName() { return "rfrost"; }
+	};
+
+	class PaladinFireResistanceStrategy : public Strategy
+	{
+	public:
+		PaladinFireResistanceStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+	public:
+		virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+		virtual string getName() { return "rfire"; }
+	};
+}
diff --git a/src/game/playerbot/strategy/paladin/PaladinMultipliers.cpp b/src/game/playerbot/strategy/paladin/PaladinMultipliers.cpp
new file mode 100644
index 00000000000..3082abb664b
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/PaladinMultipliers.cpp
@@ -0,0 +1,6 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PaladinMultipliers.h"
+#include "PaladinActions.h"
+
+using namespace ai;
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/paladin/PaladinMultipliers.h b/src/game/playerbot/strategy/paladin/PaladinMultipliers.h
new file mode 100644
index 00000000000..7cfbdd46e87
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/PaladinMultipliers.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace ai
+{
+   
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/paladin/PaladinTriggers.cpp b/src/game/playerbot/strategy/paladin/PaladinTriggers.cpp
new file mode 100644
index 00000000000..194844171ab
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/PaladinTriggers.cpp
@@ -0,0 +1,23 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PaladinTriggers.h"
+#include "PaladinActions.h"
+
+using namespace ai;
+
+bool SealTrigger::IsActive() 
+{
+	Unit* target = GetTarget();
+	return !ai->HasAura("seal of justice", target) &&
+        !ai->HasAura("seal of command", target) &&
+        !ai->HasAura("seal of vengeance", target) &&
+		!ai->HasAura("seal of righteousness", target) &&
+		!ai->HasAura("seal of light", target) &&
+		!ai->HasAura("seal of wisdom", target);
+}
+
+bool CrusaderAuraTrigger::IsActive() 
+{
+	Unit* target = GetTarget();
+	return AI_VALUE2(bool, "mounted", "self target") && !ai->HasAura("crusader aura", target);
+}
diff --git a/src/game/playerbot/strategy/paladin/PaladinTriggers.h b/src/game/playerbot/strategy/paladin/PaladinTriggers.h
new file mode 100644
index 00000000000..3f53b4e3080
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/PaladinTriggers.h
@@ -0,0 +1,114 @@
+#pragma once
+#include "../triggers/GenericTriggers.h"
+
+namespace ai
+{
+	BUFF_TRIGGER(HolyShieldTrigger, "holy shield", "holy shield")
+    BUFF_TRIGGER(RighteousFuryTrigger, "righteous fury", "righteous fury")
+
+    BUFF_TRIGGER(RetributionAuraTrigger, "retribution aura", "retribution aura")
+
+	class CrusaderAuraTrigger : public BuffTrigger
+	{
+	public:
+		CrusaderAuraTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "crusader aura") {}
+		virtual bool IsActive();
+	};
+
+	class SealTrigger : public BuffTrigger
+	{
+	public:
+		SealTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "seal of justice") {}
+		virtual bool IsActive();
+	};
+
+    DEBUFF_TRIGGER(JudgementOfLightTrigger, "judgement of light", "judgement of light")
+    DEBUFF_TRIGGER(JudgementOfWisdomTrigger, "judgement of wisdom", "judgement of wisdom")
+
+    BUFF_ON_PARTY_TRIGGER(BlessingOfKingsOnPartyTrigger, "blessing of kings", "blessing of kings on party")
+    BUFF_TRIGGER(BlessingTrigger, "blessing of sanctuary", "blessing of sanctuary")
+
+    class HammerOfJusticeInterruptSpellTrigger : public InterruptSpellTrigger
+    {
+    public:
+        HammerOfJusticeInterruptSpellTrigger(PlayerbotAI* ai) : InterruptSpellTrigger(ai, "hammer of justice") {}
+    };
+
+    class HammerOfJusticeSnareTrigger : public SnareTargetTrigger
+    {
+    public:
+        HammerOfJusticeSnareTrigger(PlayerbotAI* ai) : SnareTargetTrigger(ai, "hammer of justice") {}
+    };
+
+    class ArtOfWarTrigger : public HasAuraTrigger
+    {
+    public:
+        ArtOfWarTrigger(PlayerbotAI* ai) : HasAuraTrigger(ai, "the art of war") {}
+    };
+
+    class ShadowResistanceAuraTrigger : public BuffTrigger
+    {
+    public:
+        ShadowResistanceAuraTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "shadow resistance aura") {}
+    };
+
+    class FrostResistanceAuraTrigger : public BuffTrigger
+    {
+    public:
+        FrostResistanceAuraTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "frost resistance aura") {}
+    };
+
+    class FireResistanceAuraTrigger : public BuffTrigger
+    {
+    public:
+        FireResistanceAuraTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "fire resistance aura") {}
+    };
+
+    class DevotionAuraTrigger : public BuffTrigger
+    {
+    public:
+        DevotionAuraTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "devotion aura") {}
+    };
+
+    class CleanseCureDiseaseTrigger : public NeedCureTrigger
+    {
+    public:
+        CleanseCureDiseaseTrigger(PlayerbotAI* ai) : NeedCureTrigger(ai, "cleanse", DISPEL_DISEASE) {}
+    };
+
+    class CleanseCurePartyMemberDiseaseTrigger : public PartyMemberNeedCureTrigger
+    {
+    public:
+        CleanseCurePartyMemberDiseaseTrigger(PlayerbotAI* ai) : PartyMemberNeedCureTrigger(ai, "cleanse", DISPEL_DISEASE) {}
+    };
+
+    class CleanseCurePoisonTrigger : public NeedCureTrigger
+    {
+    public:
+        CleanseCurePoisonTrigger(PlayerbotAI* ai) : NeedCureTrigger(ai, "cleanse", DISPEL_POISON) {}
+    };
+
+    class CleanseCurePartyMemberPoisonTrigger : public PartyMemberNeedCureTrigger
+    {
+    public:
+        CleanseCurePartyMemberPoisonTrigger(PlayerbotAI* ai) : PartyMemberNeedCureTrigger(ai, "cleanse", DISPEL_POISON) {}
+    };
+
+    class CleanseCureMagicTrigger : public NeedCureTrigger
+    {
+    public:
+        CleanseCureMagicTrigger(PlayerbotAI* ai) : NeedCureTrigger(ai, "cleanse", DISPEL_MAGIC) {}
+    };
+
+    class CleanseCurePartyMemberMagicTrigger : public PartyMemberNeedCureTrigger
+    {
+    public:
+        CleanseCurePartyMemberMagicTrigger(PlayerbotAI* ai) : PartyMemberNeedCureTrigger(ai, "cleanse", DISPEL_MAGIC) {}
+    };
+
+    class HammerOfJusticeEnemyHealerTrigger : public InterruptEnemyHealerTrigger
+    {
+    public:
+        HammerOfJusticeEnemyHealerTrigger(PlayerbotAI* ai) : InterruptEnemyHealerTrigger(ai, "hammer of justice") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/paladin/TankPaladinStrategy.cpp b/src/game/playerbot/strategy/paladin/TankPaladinStrategy.cpp
new file mode 100644
index 00000000000..6e6b51f2303
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/TankPaladinStrategy.cpp
@@ -0,0 +1,70 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PaladinMultipliers.h"
+#include "TankPaladinStrategy.h"
+
+using namespace ai;
+
+class TankPaladinStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    TankPaladinStrategyActionNodeFactory()
+    {
+        creators["blessing of sanctuary"] = &blessing_of_sanctuary;
+    }
+private:
+    static ActionNode* blessing_of_sanctuary(PlayerbotAI* ai)
+    {
+        return new ActionNode ("blessing of sanctuary",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("blessing of kings"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+TankPaladinStrategy::TankPaladinStrategy(PlayerbotAI* ai) : GenericPaladinStrategy(ai)
+{
+    actionNodeFactories.Add(new TankPaladinStrategyActionNodeFactory());
+}
+
+NextAction** TankPaladinStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("melee", ACTION_NORMAL), NULL);
+}
+
+void TankPaladinStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericPaladinStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "judgement of light",
+        NextAction::array(0, new NextAction("judgement of light", ACTION_NORMAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium mana",
+        NextAction::array(0, new NextAction("judgement of wisdom", ACTION_NORMAL + 3), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "righteous fury",
+        NextAction::array(0, new NextAction("righteous fury", ACTION_HIGH + 8), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "light aoe",
+        NextAction::array(0, new NextAction("hammer of the righteous", ACTION_HIGH + 6), new NextAction("avenger's shield", ACTION_HIGH + 6), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("consecration", ACTION_HIGH + 6), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "lose aggro",
+        NextAction::array(0, new NextAction("hand of reckoning", ACTION_HIGH + 7), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"holy shield",
+		NextAction::array(0, new NextAction("holy shield", ACTION_HIGH + 7), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "blessing",
+        NextAction::array(0, new NextAction("blessing of sanctuary", ACTION_HIGH + 9), NULL)));
+}
diff --git a/src/game/playerbot/strategy/paladin/TankPaladinStrategy.h b/src/game/playerbot/strategy/paladin/TankPaladinStrategy.h
new file mode 100644
index 00000000000..d5cf955352f
--- /dev/null
+++ b/src/game/playerbot/strategy/paladin/TankPaladinStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "GenericPaladinStrategy.h"
+
+namespace ai
+{
+    class TankPaladinStrategy : public GenericPaladinStrategy
+    {
+    public:
+        TankPaladinStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "tank"; }
+        virtual NextAction** getDefaultActions();
+		virtual int GetType() { return STRATEGY_TYPE_TANK | STRATEGY_TYPE_MELEE; }
+    };
+}
diff --git a/src/game/playerbot/strategy/priest/GenericPriestStrategy.cpp b/src/game/playerbot/strategy/priest/GenericPriestStrategy.cpp
new file mode 100644
index 00000000000..19103dae747
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/GenericPriestStrategy.cpp
@@ -0,0 +1,67 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PriestMultipliers.h"
+#include "HealPriestStrategy.h"
+#include "GenericPriestStrategyActionNodeFactory.h"
+
+using namespace ai;
+
+GenericPriestStrategy::GenericPriestStrategy(PlayerbotAI* ai) : CombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericPriestStrategyActionNodeFactory());
+}
+
+void GenericPriestStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    CombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "medium health",
+        NextAction::array(0, new NextAction("flash heal", 25.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member medium health",
+        NextAction::array(0, new NextAction("flash heal on party", 20.0f), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("power word: shield", 70.0f), new NextAction("flash heal", 70.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member critical health",
+        NextAction::array(0, new NextAction("power word: shield on party", 60.0f), new NextAction("flash heal on party", 60.0f), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("power word: shield", 60.0f), new NextAction("greater heal", 60.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member low health",
+        NextAction::array(0, new NextAction("power word: shield on party", 50.0f), new NextAction("greater heal on party", 50.0f), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "dispel magic",
+        NextAction::array(0, new NextAction("dispel magic", 41.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "dispel magic on party",
+        NextAction::array(0, new NextAction("dispel magic on party", 40.0f), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "cure disease",
+        NextAction::array(0, new NextAction("abolish disease", 31.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member cure disease",
+        NextAction::array(0, new NextAction("abolish disease on party", 30.0f), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "medium threat",
+        NextAction::array(0, new NextAction("psychic scream", 50.0f), NULL)));
+
+}
diff --git a/src/game/playerbot/strategy/priest/GenericPriestStrategy.h b/src/game/playerbot/strategy/priest/GenericPriestStrategy.h
new file mode 100644
index 00000000000..4633e8d0879
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/GenericPriestStrategy.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "../Strategy.h"
+#include "../generic/CombatStrategy.h"
+
+namespace ai
+{
+    class GenericPriestStrategy : public CombatStrategy
+    {
+    public:
+        GenericPriestStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+
+    };
+}
diff --git a/src/game/playerbot/strategy/priest/GenericPriestStrategyActionNodeFactory.h b/src/game/playerbot/strategy/priest/GenericPriestStrategyActionNodeFactory.h
new file mode 100644
index 00000000000..d8353663b4a
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/GenericPriestStrategyActionNodeFactory.h
@@ -0,0 +1,173 @@
+#pragma once
+
+namespace ai
+{
+    class GenericPriestStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+    {
+    public:
+        GenericPriestStrategyActionNodeFactory()
+        {
+            creators["inner fire"] = &inner_fire;
+            creators["holy nova"] = &holy_nova;
+            creators["power word: fortitude"] = &power_word_fortitude;
+            creators["power word: fortitude on party"] = &power_word_fortitude_on_party;
+            creators["divine spirit"] = &divine_spirit;
+            creators["divine spirit on party"] = &divine_spirit_on_party;
+            creators["power word: shield"] = &power_word_shield;
+            creators["power word: shield on party"] = &power_word_shield_on_party;
+            creators["renew"] = &renew;
+            creators["renew on party"] = &renew_on_party;
+            creators["greater heal"] = &greater_heal;
+            creators["greater heal on party"] = &greater_heal_on_party;
+            creators["heal"] = &heal;
+            creators["heal on party"] = &heal_on_party;
+            creators["lesser heal"] = &lesser_heal;
+            creators["lesser heal on party"] = &lesser_heal_on_party;
+            creators["flash heal"] = &flash_heal;
+            creators["flash heal on party"] = &flash_heal_on_party;
+            creators["psychic scream"] = &psychic_scream;
+            creators["fade"] = &fade;
+        }
+    private:
+        static ActionNode* inner_fire(PlayerbotAI* ai)
+        {
+            return new ActionNode ("inner fire",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* holy_nova(PlayerbotAI* ai)
+        {
+            return new ActionNode ("holy nova",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* power_word_fortitude(PlayerbotAI* ai)
+        {
+            return new ActionNode ("power word: fortitude",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* power_word_fortitude_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("power word: fortitude on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* divine_spirit(PlayerbotAI* ai)
+        {
+            return new ActionNode ("divine spirit",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* divine_spirit_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("divine spirit on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* power_word_shield(PlayerbotAI* ai)
+        {
+            return new ActionNode ("power word: shield",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("renew", 50.0f), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* power_word_shield_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("power word: shield on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("renew on party", 50.0f), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* renew(PlayerbotAI* ai)
+        {
+            return new ActionNode ("renew",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* renew_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("renew on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* greater_heal(PlayerbotAI* ai)
+        {
+            return new ActionNode ("greater heal",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("heal"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* greater_heal_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("greater heal on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("heal on party"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* heal(PlayerbotAI* ai)
+        {
+            return new ActionNode ("heal",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("lesser heal"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* heal_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("heal on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("lesser heal on party"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* lesser_heal(PlayerbotAI* ai)
+        {
+            return new ActionNode ("lesser heal",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* lesser_heal_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("lesser heal on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* flash_heal(PlayerbotAI* ai)
+        {
+            return new ActionNode ("flash heal",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("greater heal"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* flash_heal_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("flash heal on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("greater heal on party"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* psychic_scream(PlayerbotAI* ai)
+        {
+            return new ActionNode ("psychic scream",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("fade"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* fade(PlayerbotAI* ai)
+        {
+            return new ActionNode ("fade",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("flee"), NULL),
+                /*C*/ NULL);
+        }
+    };
+};
diff --git a/src/game/playerbot/strategy/priest/HealPriestStrategy.cpp b/src/game/playerbot/strategy/priest/HealPriestStrategy.cpp
new file mode 100644
index 00000000000..68e6f37513e
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/HealPriestStrategy.cpp
@@ -0,0 +1,36 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PriestMultipliers.h"
+#include "HealPriestStrategy.h"
+
+using namespace ai;
+
+NextAction** HealPriestStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("shoot", 10.0f), NULL);
+}
+
+void HealPriestStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericPriestStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "enemy out of spell",
+        NextAction::array(0, new NextAction("reach spell", ACTION_NORMAL + 9), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"medium aoe heal",
+		NextAction::array(0, new NextAction("circle of healing", 27.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "almost full health",
+        NextAction::array(0, new NextAction("renew", 15.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member almost full health",
+        NextAction::array(0, new NextAction("renew on party", 10.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "enemy too close for spell",
+        NextAction::array(0, new NextAction("fade", 50.0f), new NextAction("flee", 49.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/priest/HealPriestStrategy.h b/src/game/playerbot/strategy/priest/HealPriestStrategy.h
new file mode 100644
index 00000000000..7f5603f29b5
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/HealPriestStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "GenericPriestStrategy.h"
+
+namespace ai
+{
+    class HealPriestStrategy : public GenericPriestStrategy
+    {
+    public:
+        HealPriestStrategy(PlayerbotAI* ai) : GenericPriestStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual NextAction** getDefaultActions();
+        virtual string getName() { return "heal"; }
+		virtual int GetType() { return STRATEGY_TYPE_HEAL; }
+    };
+}
diff --git a/src/game/playerbot/strategy/priest/HolyPriestStrategy.cpp b/src/game/playerbot/strategy/priest/HolyPriestStrategy.cpp
new file mode 100644
index 00000000000..abeea314b95
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/HolyPriestStrategy.cpp
@@ -0,0 +1,46 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PriestMultipliers.h"
+#include "HolyPriestStrategy.h"
+
+namespace ai
+{
+    class HolyPriestStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+    {
+    public:
+        HolyPriestStrategyActionNodeFactory()
+        {
+            creators["smite"] = &smite;
+        }
+    private:
+        static ActionNode* smite(PlayerbotAI* ai)
+        {
+            return new ActionNode ("smite",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("shoot"), NULL),
+                /*C*/ NULL);
+        }
+    };
+};
+
+using namespace ai;
+
+HolyPriestStrategy::HolyPriestStrategy(PlayerbotAI* ai) : HealPriestStrategy(ai)
+{
+    actionNodeFactories.Add(new HolyPriestStrategyActionNodeFactory());
+}
+
+NextAction** HolyPriestStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("holy fire", 10.0f), new NextAction("smite", 10.0f), NULL);
+}
+
+void HolyPriestStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    HealPriestStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "enemy out of spell",
+        NextAction::array(0, new NextAction("reach spell", ACTION_NORMAL + 9), NULL)));
+
+}
diff --git a/src/game/playerbot/strategy/priest/HolyPriestStrategy.h b/src/game/playerbot/strategy/priest/HolyPriestStrategy.h
new file mode 100644
index 00000000000..c21bcf178e8
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/HolyPriestStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "HealPriestStrategy.h"
+
+namespace ai
+{
+    class HolyPriestStrategy : public HealPriestStrategy
+    {
+    public:
+        HolyPriestStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual NextAction** getDefaultActions();
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "holy"; }
+        virtual int GetType() { return STRATEGY_TYPE_DPS|STRATEGY_TYPE_RANGED; }
+    };
+}
diff --git a/src/game/playerbot/strategy/priest/PriestActions.cpp b/src/game/playerbot/strategy/priest/PriestActions.cpp
new file mode 100644
index 00000000000..8760005b8bb
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/PriestActions.cpp
@@ -0,0 +1,17 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PriestActions.h"
+
+using namespace ai;
+
+
+NextAction** CastAbolishDiseaseAction::getAlternatives()
+{
+    return NextAction::merge(NextAction::array(0, new NextAction("cure disease"), NULL), CastSpellAction::getAlternatives());
+}
+
+NextAction** CastAbolishDiseaseOnPartyAction::getAlternatives()
+{
+    return NextAction::merge(NextAction::array(0, new NextAction("cure disease on party"), NULL), CastSpellAction::getAlternatives());
+}
+
diff --git a/src/game/playerbot/strategy/priest/PriestActions.h b/src/game/playerbot/strategy/priest/PriestActions.h
new file mode 100644
index 00000000000..bf2ea2d64ba
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/PriestActions.h
@@ -0,0 +1,246 @@
+#pragma once
+
+#include "../actions/GenericActions.h"
+
+namespace ai
+{
+    class CastGreaterHealAction : public CastHealingSpellAction {
+    public:
+        CastGreaterHealAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "greater heal") {}
+    };
+
+    class CastGreaterHealOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastGreaterHealOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "greater heal") {}
+
+        virtual string getName() { return "greater heal on party"; }
+    };
+
+    class CastLesserHealAction : public CastHealingSpellAction {
+    public:
+        CastLesserHealAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "lesser heal") {}
+    };
+
+    class CastLesserHealOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastLesserHealOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "lesser heal") {}
+
+        virtual string getName() { return "lesser heal on party"; }
+    };
+
+    class CastFlashHealAction : public CastHealingSpellAction {
+    public:
+        CastFlashHealAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "flash heal") {}
+    };
+
+    class CastFlashHealOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastFlashHealOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "flash heal") {}
+
+        virtual string getName() { return "flash heal on party"; }
+    };
+
+    class CastHealAction : public CastHealingSpellAction {
+    public:
+        CastHealAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "heal") {}
+    };
+
+    class CastHealOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastHealOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "heal") {}
+
+        virtual string getName() { return "heal on party"; }
+    };
+
+    class CastRenewAction : public CastHealingSpellAction {
+    public:
+        CastRenewAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "renew") {}
+    };
+
+    class CastRenewOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastRenewOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "renew") {}
+
+        virtual string getName() { return "renew on party"; }
+    };
+
+    class CastFadeAction : public CastBuffSpellAction {
+    public:
+        CastFadeAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "fade") {}
+    };
+
+    class CastShadowformAction : public CastBuffSpellAction {
+    public:
+        CastShadowformAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "shadowform") {}
+    };
+
+    class CastRemoveShadowformAction : public Action {
+    public:
+        CastRemoveShadowformAction(PlayerbotAI* ai) : Action(ai, "remove shadowform") {}
+        virtual bool isUseful() { return ai->HasAura("shadowform", AI_VALUE(Unit*, "self target")); }
+        virtual bool isPossible() { return true; }
+        virtual bool Execute(Event event) {
+            ai->RemoveAura("shadowform");
+            return true;
+        }
+    };
+
+	class CastVampiricEmbraceAction : public CastBuffSpellAction {
+	public:
+		CastVampiricEmbraceAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "vampiric embrace") {}
+	};
+
+	class CastPowerWordShieldAction : public CastBuffSpellAction {
+	public:
+		CastPowerWordShieldAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "power word: shield") {}
+	};
+
+    class CastPowerWordShieldOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastPowerWordShieldOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "power word: shield") {}
+
+        virtual string getName() { return "power word: shield on party"; }
+    };
+
+	class CastPowerWordFortitudeAction : public CastBuffSpellAction {
+	public:
+		CastPowerWordFortitudeAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "power word: fortitude") {}
+	};
+
+	class CastDivineSpiritAction : public CastBuffSpellAction {
+	public:
+		CastDivineSpiritAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "divine spirit") {}
+	};
+
+	class CastInnerFireAction : public CastBuffSpellAction {
+	public:
+		CastInnerFireAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "inner fire") {}
+	};
+
+    BEGIN_SPELL_ACTION(CastHolyNovaAction, "holy nova")
+    virtual bool isUseful() {
+        return !ai->HasAura("shadowform", AI_VALUE(Unit*, "self target"));
+    }
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastHolyFireAction, "holy fire")
+        virtual bool isUseful() {
+            return !ai->HasAura("shadowform", AI_VALUE(Unit*, "self target"));
+        }
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastSmiteAction, "smite")
+        virtual bool isUseful() {
+			return !ai->HasAura("shadowform", AI_VALUE(Unit*, "self target"));
+        }
+    END_SPELL_ACTION()
+
+	class CastPowerWordFortitudeOnPartyAction : public BuffOnPartyAction {
+	public:
+		CastPowerWordFortitudeOnPartyAction(PlayerbotAI* ai) : BuffOnPartyAction(ai, "power word: fortitude") {}
+	};
+
+	class CastDivineSpiritOnPartyAction : public BuffOnPartyAction {
+	public:
+		CastDivineSpiritOnPartyAction(PlayerbotAI* ai) : BuffOnPartyAction(ai, "divine spirit") {}
+	};
+
+	class CastPowerWordPainAction : public CastDebuffSpellAction
+	{
+    public:
+	    CastPowerWordPainAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "shadow word: pain") {}
+	};
+
+	class CastPowerWordPainOnAttackerAction : public CastDebuffSpellOnAttackerAction
+	{
+    public:
+	    CastPowerWordPainOnAttackerAction(PlayerbotAI* ai) : CastDebuffSpellOnAttackerAction(ai, "shadow word: pain") {}
+	};
+
+    BEGIN_DEBUFF_ACTION(CastDevouringPlagueAction, "devouring plague")
+    END_SPELL_ACTION()
+
+    BEGIN_DEBUFF_ACTION(CastVampiricTouchAction, "vampiric touch")
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastMindBlastAction, "mind blast")
+    END_SPELL_ACTION()
+
+    BEGIN_RANGED_SPELL_ACTION(CastMindFlayAction, "mind flay")
+    END_SPELL_ACTION()
+
+	class CastCureDiseaseAction : public CastCureSpellAction {
+	public:
+		CastCureDiseaseAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "cure disease") {}
+	};
+
+    class CastCureDiseaseOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastCureDiseaseOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "cure disease", DISPEL_DISEASE) {}
+        virtual string getName() { return "cure disease on party"; }
+    };
+
+	class CastAbolishDiseaseAction : public CastCureSpellAction {
+	public:
+		CastAbolishDiseaseAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "abolish disease") {}
+		virtual NextAction** getAlternatives();
+	};
+
+    class CastAbolishDiseaseOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastAbolishDiseaseOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "abolish disease", DISPEL_DISEASE) {}
+        virtual string getName() { return "abolish disease on party"; }
+        virtual NextAction** getAlternatives();
+    };
+
+	class CastDispelMagicAction : public CastCureSpellAction {
+	public:
+		CastDispelMagicAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "dispel magic") {}
+	};
+
+    class CastDispelMagicOnTargetAction : public CastSpellAction {
+    public:
+        CastDispelMagicOnTargetAction(PlayerbotAI* ai) : CastSpellAction(ai, "dispel magic") {}
+    };
+
+    class CastDispelMagicOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastDispelMagicOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "dispel magic", DISPEL_MAGIC) {}
+        virtual string getName() { return "dispel magic on party"; }
+    };
+
+	class CastResurrectionAction : public ResurrectPartyMemberAction
+	{
+	public:
+		CastResurrectionAction(PlayerbotAI* ai) : ResurrectPartyMemberAction(ai, "resurrection") {}
+	};
+
+	class CastCircleOfHealingAction : public CastAoeHealSpellAction
+	{
+	public:
+		CastCircleOfHealingAction(PlayerbotAI* ai) : CastAoeHealSpellAction(ai, "circle of healing") {}
+	};
+
+	class CastPsychicScreamAction : public CastSpellAction
+	{
+	public:
+	    CastPsychicScreamAction(PlayerbotAI* ai) : CastSpellAction(ai, "psychic scream") {}
+	};
+
+	class CastDispersionAction : public CastSpellAction
+	{
+	public:
+	    CastDispersionAction(PlayerbotAI* ai) : CastSpellAction(ai, "dispersion") {}
+	    virtual string GetTargetName() { return "self target"; }
+	};
+
+}
diff --git a/src/game/playerbot/strategy/priest/PriestAiObjectContext.cpp b/src/game/playerbot/strategy/priest/PriestAiObjectContext.cpp
new file mode 100644
index 00000000000..8a40b2b20d6
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/PriestAiObjectContext.cpp
@@ -0,0 +1,217 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PriestActions.h"
+#include "PriestAiObjectContext.h"
+#include "PriestNonCombatStrategy.h"
+#include "ShadowPriestStrategy.h"
+#include "../generic/PullStrategy.h"
+#include "PriestTriggers.h"
+#include "../NamedObjectContext.h"
+#include "HolyPriestStrategy.h"
+
+using namespace ai;
+
+
+namespace ai
+{
+    namespace priest
+    {
+        using namespace ai;
+
+        class StrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            StrategyFactoryInternal()
+            {
+                creators["nc"] = &priest::StrategyFactoryInternal::nc;
+                creators["pull"] = &priest::StrategyFactoryInternal::pull;
+                creators["aoe"] = &priest::StrategyFactoryInternal::shadow_aoe;
+                creators["shadow aoe"] = &priest::StrategyFactoryInternal::shadow_aoe;
+                creators["dps debuff"] = &priest::StrategyFactoryInternal::shadow_debuff;
+                creators["shadow debuff"] = &priest::StrategyFactoryInternal::shadow_debuff;
+            }
+
+        private:
+            static Strategy* nc(PlayerbotAI* ai) { return new PriestNonCombatStrategy(ai); }
+            static Strategy* shadow_aoe(PlayerbotAI* ai) { return new ShadowPriestAoeStrategy(ai); }
+            static Strategy* pull(PlayerbotAI* ai) { return new PullStrategy(ai, "shoot"); }
+            static Strategy* shadow_debuff(PlayerbotAI* ai) { return new ShadowPriestDebuffStrategy(ai); }
+        };
+
+        class CombatStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            CombatStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["heal"] = &priest::CombatStrategyFactoryInternal::heal;
+                creators["shadow"] = &priest::CombatStrategyFactoryInternal::dps;
+                creators["dps"] = &priest::CombatStrategyFactoryInternal::dps;
+                creators["holy"] = &priest::CombatStrategyFactoryInternal::holy;
+            }
+
+        private:
+            static Strategy* heal(PlayerbotAI* ai) { return new HealPriestStrategy(ai); }
+            static Strategy* dps(PlayerbotAI* ai) { return new ShadowPriestStrategy(ai); }
+            static Strategy* holy(PlayerbotAI* ai) { return new HolyPriestStrategy(ai); }
+        };
+    };
+};
+
+namespace ai
+{
+    namespace priest
+    {
+        using namespace ai;
+
+        class TriggerFactoryInternal : public NamedObjectContext<Trigger>
+        {
+        public:
+            TriggerFactoryInternal()
+            {
+                creators["devouring plague"] = &TriggerFactoryInternal::devouring_plague;
+                creators["shadow word: pain"] = &TriggerFactoryInternal::shadow_word_pain;
+                creators["shadow word: pain on attacker"] = &TriggerFactoryInternal::shadow_word_pain_on_attacker;
+                creators["dispel magic"] = &TriggerFactoryInternal::dispel_magic;
+                creators["dispel magic on party"] = &TriggerFactoryInternal::dispel_magic_party_member;
+                creators["cure disease"] = &TriggerFactoryInternal::cure_disease;
+                creators["party member cure disease"] = &TriggerFactoryInternal::party_member_cure_disease;
+                creators["power word: fortitude"] = &TriggerFactoryInternal::power_word_fortitude;
+                creators["power word: fortitude on party"] = &TriggerFactoryInternal::power_word_fortitude_on_party;
+                creators["divine spirit"] = &TriggerFactoryInternal::divine_spirit;
+                creators["divine spirit on party"] = &TriggerFactoryInternal::divine_spirit_on_party;
+                creators["inner fire"] = &TriggerFactoryInternal::inner_fire;
+                creators["vampiric touch"] = &TriggerFactoryInternal::vampiric_touch;
+                creators["shadowform"] = &TriggerFactoryInternal::shadowform;
+                creators["vampiric embrace"] = &TriggerFactoryInternal::vampiric_embrace;
+
+            }
+
+        private:
+            static Trigger* vampiric_embrace(PlayerbotAI* ai) { return new VampiricEmbraceTrigger(ai); }
+            static Trigger* shadowform(PlayerbotAI* ai) { return new ShadowformTrigger(ai); }
+            static Trigger* vampiric_touch(PlayerbotAI* ai) { return new VampiricTouchTrigger(ai); }
+            static Trigger* devouring_plague(PlayerbotAI* ai) { return new DevouringPlagueTrigger(ai); }
+            static Trigger* shadow_word_pain(PlayerbotAI* ai) { return new PowerWordPainTrigger(ai); }
+            static Trigger* shadow_word_pain_on_attacker(PlayerbotAI* ai) { return new PowerWordPainOnAttackerTrigger(ai); }
+            static Trigger* dispel_magic(PlayerbotAI* ai) { return new DispelMagicTrigger(ai); }
+            static Trigger* dispel_magic_party_member(PlayerbotAI* ai) { return new DispelMagicPartyMemberTrigger(ai); }
+            static Trigger* cure_disease(PlayerbotAI* ai) { return new CureDiseaseTrigger(ai); }
+            static Trigger* party_member_cure_disease(PlayerbotAI* ai) { return new PartyMemberCureDiseaseTrigger(ai); }
+            static Trigger* power_word_fortitude(PlayerbotAI* ai) { return new PowerWordFortitudeTrigger(ai); }
+            static Trigger* power_word_fortitude_on_party(PlayerbotAI* ai) { return new PowerWordFortitudeOnPartyTrigger(ai); }
+            static Trigger* divine_spirit(PlayerbotAI* ai) { return new DivineSpiritTrigger(ai); }
+            static Trigger* divine_spirit_on_party(PlayerbotAI* ai) { return new DivineSpiritOnPartyTrigger(ai); }
+            static Trigger* inner_fire(PlayerbotAI* ai) { return new InnerFireTrigger(ai); }
+        };
+    };
+};
+
+
+
+namespace ai
+{
+    namespace priest
+    {
+        using namespace ai;
+
+        class AiObjectContextInternal : public NamedObjectContext<Action>
+        {
+        public:
+            AiObjectContextInternal()
+            {
+                creators["shadow word: pain"] = &AiObjectContextInternal::shadow_word_pain;
+                creators["shadow word: pain on attacker"] = &AiObjectContextInternal::shadow_word_pain_on_attacker;
+                creators["devouring plague"] = &AiObjectContextInternal::devouring_plague;
+                creators["mind flay"] = &AiObjectContextInternal::mind_flay;
+                creators["holy fire"] = &AiObjectContextInternal::holy_fire;
+                creators["smite"] = &AiObjectContextInternal::smite;
+                creators["mind blast"] = &AiObjectContextInternal::mind_blast;
+                creators["shadowform"] = &AiObjectContextInternal::shadowform;
+                creators["remove shadowform"] = &AiObjectContextInternal::remove_shadowform;
+                creators["holy nova"] = &AiObjectContextInternal::holy_nova;
+                creators["power word: fortitude"] = &AiObjectContextInternal::power_word_fortitude;
+                creators["power word: fortitude on party"] = &AiObjectContextInternal::power_word_fortitude_on_party;
+                creators["divine spirit"] = &AiObjectContextInternal::divine_spirit;
+                creators["divine spirit on party"] = &AiObjectContextInternal::divine_spirit_on_party;
+                creators["power word: shield"] = &AiObjectContextInternal::power_word_shield;
+                creators["power word: shield on party"] = &AiObjectContextInternal::power_word_shield_on_party;
+                creators["renew"] = &AiObjectContextInternal::renew;
+                creators["renew on party"] = &AiObjectContextInternal::renew_on_party;
+                creators["greater heal"] = &AiObjectContextInternal::greater_heal;
+                creators["greater heal on party"] = &AiObjectContextInternal::greater_heal_on_party;
+                creators["heal"] = &AiObjectContextInternal::heal;
+                creators["heal on party"] = &AiObjectContextInternal::heal_on_party;
+                creators["lesser heal"] = &AiObjectContextInternal::lesser_heal;
+                creators["lesser heal on party"] = &AiObjectContextInternal::lesser_heal_on_party;
+                creators["flash heal"] = &AiObjectContextInternal::flash_heal;
+                creators["flash heal on party"] = &AiObjectContextInternal::flash_heal_on_party;
+                creators["dispel magic"] = &AiObjectContextInternal::dispel_magic;
+                creators["dispel magic on party"] = &AiObjectContextInternal::dispel_magic_on_party;
+                creators["dispel magic on target"] = &AiObjectContextInternal::dispel_magic_on_target;
+                creators["cure disease"] = &AiObjectContextInternal::cure_disease;
+                creators["cure disease on party"] = &AiObjectContextInternal::cure_disease_on_party;
+                creators["abolish disease"] = &AiObjectContextInternal::abolish_disease;
+                creators["abolish disease on party"] = &AiObjectContextInternal::abolish_disease_on_party;
+                creators["fade"] = &AiObjectContextInternal::fade;
+                creators["inner fire"] = &AiObjectContextInternal::inner_fire;
+                creators["resurrection"] = &AiObjectContextInternal::resurrection;
+                creators["circle of healing"] = &AiObjectContextInternal::circle_of_healing;
+                creators["psychic scream"] = &AiObjectContextInternal::psychic_scream;
+                creators["vampiric touch"] = &AiObjectContextInternal::vampiric_touch;
+                creators["vampiric embrace"] = &AiObjectContextInternal::vampiric_embrace;
+                creators["dispersion"] = &AiObjectContextInternal::dispersion;
+            }
+
+        private:
+            static Action* dispersion(PlayerbotAI* ai) { return new CastDispersionAction(ai); }
+            static Action* vampiric_embrace(PlayerbotAI* ai) { return new CastVampiricEmbraceAction(ai); }
+            static Action* vampiric_touch(PlayerbotAI* ai) { return new CastVampiricTouchAction(ai); }
+            static Action* psychic_scream(PlayerbotAI* ai) { return new CastPsychicScreamAction(ai); }
+            static Action* circle_of_healing(PlayerbotAI* ai) { return new CastCircleOfHealingAction(ai); }
+            static Action* resurrection(PlayerbotAI* ai) { return new CastResurrectionAction(ai); }
+            static Action* shadow_word_pain(PlayerbotAI* ai) { return new CastPowerWordPainAction(ai); }
+            static Action* shadow_word_pain_on_attacker(PlayerbotAI* ai) { return new CastPowerWordPainOnAttackerAction(ai); }
+            static Action* devouring_plague(PlayerbotAI* ai) { return new CastDevouringPlagueAction(ai); }
+            static Action* mind_flay(PlayerbotAI* ai) { return new CastMindFlayAction(ai); }
+            static Action* holy_fire(PlayerbotAI* ai) { return new CastHolyFireAction(ai); }
+            static Action* smite(PlayerbotAI* ai) { return new CastSmiteAction(ai); }
+            static Action* mind_blast(PlayerbotAI* ai) { return new CastMindBlastAction(ai); }
+            static Action* shadowform(PlayerbotAI* ai) { return new CastShadowformAction(ai); }
+            static Action* remove_shadowform(PlayerbotAI* ai) { return new CastRemoveShadowformAction(ai); }
+            static Action* holy_nova(PlayerbotAI* ai) { return new CastHolyNovaAction(ai); }
+            static Action* power_word_fortitude(PlayerbotAI* ai) { return new CastPowerWordFortitudeAction(ai); }
+            static Action* power_word_fortitude_on_party(PlayerbotAI* ai) { return new CastPowerWordFortitudeOnPartyAction(ai); }
+            static Action* divine_spirit(PlayerbotAI* ai) { return new CastDivineSpiritAction(ai); }
+            static Action* divine_spirit_on_party(PlayerbotAI* ai) { return new CastDivineSpiritOnPartyAction(ai); }
+            static Action* power_word_shield(PlayerbotAI* ai) { return new CastPowerWordShieldAction(ai); }
+            static Action* power_word_shield_on_party(PlayerbotAI* ai) { return new CastPowerWordShieldOnPartyAction(ai); }
+            static Action* renew(PlayerbotAI* ai) { return new CastRenewAction(ai); }
+            static Action* renew_on_party(PlayerbotAI* ai) { return new CastRenewOnPartyAction(ai); }
+            static Action* greater_heal(PlayerbotAI* ai) { return new CastGreaterHealAction(ai); }
+            static Action* greater_heal_on_party(PlayerbotAI* ai) { return new CastGreaterHealOnPartyAction(ai); }
+            static Action* heal(PlayerbotAI* ai) { return new CastHealAction(ai); }
+            static Action* heal_on_party(PlayerbotAI* ai) { return new CastHealOnPartyAction(ai); }
+            static Action* lesser_heal(PlayerbotAI* ai) { return new CastLesserHealAction(ai); }
+            static Action* lesser_heal_on_party(PlayerbotAI* ai) { return new CastLesserHealOnPartyAction(ai); }
+            static Action* flash_heal(PlayerbotAI* ai) { return new CastFlashHealAction(ai); }
+            static Action* flash_heal_on_party(PlayerbotAI* ai) { return new CastFlashHealOnPartyAction(ai); }
+            static Action* dispel_magic(PlayerbotAI* ai) { return new CastDispelMagicAction(ai); }
+            static Action* dispel_magic_on_party(PlayerbotAI* ai) { return new CastDispelMagicOnPartyAction(ai); }
+            static Action* dispel_magic_on_target(PlayerbotAI* ai) { return new CastDispelMagicOnTargetAction(ai); }
+            static Action* cure_disease(PlayerbotAI* ai) { return new CastCureDiseaseAction(ai); }
+            static Action* cure_disease_on_party(PlayerbotAI* ai) { return new CastCureDiseaseOnPartyAction(ai); }
+            static Action* abolish_disease(PlayerbotAI* ai) { return new CastAbolishDiseaseAction(ai); }
+            static Action* abolish_disease_on_party(PlayerbotAI* ai) { return new CastAbolishDiseaseOnPartyAction(ai); }
+            static Action* fade(PlayerbotAI* ai) { return new CastFadeAction(ai); }
+            static Action* inner_fire(PlayerbotAI* ai) { return new CastInnerFireAction(ai); }
+        };
+    };
+};
+
+PriestAiObjectContext::PriestAiObjectContext(PlayerbotAI* ai) : AiObjectContext(ai)
+{
+    strategyContexts.Add(new ai::priest::StrategyFactoryInternal());
+    strategyContexts.Add(new ai::priest::CombatStrategyFactoryInternal());
+    actionContexts.Add(new ai::priest::AiObjectContextInternal());
+    triggerContexts.Add(new ai::priest::TriggerFactoryInternal());
+}
diff --git a/src/game/playerbot/strategy/priest/PriestAiObjectContext.h b/src/game/playerbot/strategy/priest/PriestAiObjectContext.h
new file mode 100644
index 00000000000..315c3353305
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/PriestAiObjectContext.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../AiObjectContext.h"
+
+namespace ai
+{
+    class PriestAiObjectContext : public AiObjectContext
+    {
+    public:
+        PriestAiObjectContext(PlayerbotAI* ai);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/priest/PriestMultipliers.cpp b/src/game/playerbot/strategy/priest/PriestMultipliers.cpp
new file mode 100644
index 00000000000..fced53ef032
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/PriestMultipliers.cpp
@@ -0,0 +1,6 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PriestMultipliers.h"
+#include "PriestActions.h"
+
+using namespace ai;
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/priest/PriestMultipliers.h b/src/game/playerbot/strategy/priest/PriestMultipliers.h
new file mode 100644
index 00000000000..7cfbdd46e87
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/PriestMultipliers.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace ai
+{
+   
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/priest/PriestNonCombatStrategy.cpp b/src/game/playerbot/strategy/priest/PriestNonCombatStrategy.cpp
new file mode 100644
index 00000000000..a4d846b90c1
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/PriestNonCombatStrategy.cpp
@@ -0,0 +1,82 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PriestMultipliers.h"
+#include "PriestNonCombatStrategy.h"
+#include "PriestNonCombatStrategyActionNodeFactory.h"
+
+using namespace ai;
+
+PriestNonCombatStrategy::PriestNonCombatStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new PriestNonCombatStrategyActionNodeFactory());
+}
+
+void PriestNonCombatStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    NonCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "power word: fortitude",
+        NextAction::array(0, new NextAction("power word: fortitude", 12.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "power word: fortitude on party",
+        NextAction::array(0, new NextAction("power word: fortitude on party", 11.0f), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "divine spirit",
+        NextAction::array(0, new NextAction("divine spirit", 14.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "divine spirit on party",
+        NextAction::array(0, new NextAction("divine spirit on party", 13.0f), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "inner fire",
+        NextAction::array(0, new NextAction("inner fire", 10.0f), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("power word: shield", 70.0f), new NextAction("greater heal", 70.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member critical health",
+        NextAction::array(0, new NextAction("power word: shield on party", 60.0f), new NextAction("greater heal on party", 60.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("flash heal", 21.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member low health",
+        NextAction::array(0, new NextAction("flash heal on party", 20.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe heal",
+        NextAction::array(0, new NextAction("circle of healing", 27.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"party member dead",
+		NextAction::array(0, new NextAction("resurrection", 30.0f), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "dispel magic",
+        NextAction::array(0, new NextAction("dispel magic", 41.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "dispel magic on party",
+        NextAction::array(0, new NextAction("dispel magic on party", 40.0f), NULL)));
+
+
+    triggers.push_back(new TriggerNode(
+        "cure disease",
+        NextAction::array(0, new NextAction("abolish disease", 31.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member cure disease",
+        NextAction::array(0, new NextAction("abolish disease on party", 30.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/priest/PriestNonCombatStrategy.h b/src/game/playerbot/strategy/priest/PriestNonCombatStrategy.h
new file mode 100644
index 00000000000..da82e1ae2fc
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/PriestNonCombatStrategy.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "../Strategy.h"
+#include "../generic/NonCombatStrategy.h"
+
+namespace ai
+{
+    class PriestNonCombatStrategy : public NonCombatStrategy
+    {
+    public:
+        PriestNonCombatStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "nc"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/priest/PriestNonCombatStrategyActionNodeFactory.h b/src/game/playerbot/strategy/priest/PriestNonCombatStrategyActionNodeFactory.h
new file mode 100644
index 00000000000..7af5e3d88de
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/PriestNonCombatStrategyActionNodeFactory.h
@@ -0,0 +1,126 @@
+#pragma once
+
+namespace ai
+{
+    class PriestNonCombatStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+    {
+    public:
+        PriestNonCombatStrategyActionNodeFactory()
+        {
+            creators["holy nova"] = &holy_nova;
+            creators["power word: shield"] = &power_word_shield;
+            creators["power word: shield on party"] = &power_word_shield_on_party;
+            creators["renew"] = &renew;
+            creators["renew on party"] = &renew_on_party;
+            creators["greater heal"] = &greater_heal;
+            creators["greater heal on party"] = &greater_heal_on_party;
+            creators["heal"] = &heal;
+            creators["heal on party"] = &heal_on_party;
+            creators["lesser heal"] = &lesser_heal;
+            creators["lesser heal on party"] = &lesser_heal_on_party;
+            creators["flash heal"] = &flash_heal;
+            creators["flash heal on party"] = &flash_heal_on_party;
+            creators["circle of healing"] = &circle_of_healing;
+        }
+    private:
+        static ActionNode* holy_nova(PlayerbotAI* ai)
+        {
+            return new ActionNode ("holy nova",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* power_word_shield(PlayerbotAI* ai)
+        {
+            return new ActionNode ("power word: shield",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("renew", 50.0f), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* power_word_shield_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("power word: shield on party",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("renew on party", 50.0f), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* renew(PlayerbotAI* ai)
+        {
+            return new ActionNode ("renew",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* renew_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("renew on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* greater_heal(PlayerbotAI* ai)
+        {
+            return new ActionNode ("greater heal",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("heal"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* greater_heal_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("greater heal on party",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("heal on party"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* heal(PlayerbotAI* ai)
+        {
+            return new ActionNode ("heal",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("lesser heal"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* heal_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("heal on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("lesser heal on party"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* lesser_heal(PlayerbotAI* ai)
+        {
+            return new ActionNode ("lesser heal",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* lesser_heal_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("lesser heal on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* flash_heal(PlayerbotAI* ai)
+        {
+            return new ActionNode ("flash heal",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* flash_heal_on_party(PlayerbotAI* ai)
+        {
+            return new ActionNode ("flash heal on party",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        static ActionNode* circle_of_healing(PlayerbotAI* ai)
+        {
+            return new ActionNode ("circle of healing",
+                /*P*/ NextAction::array(0, new NextAction("remove shadowform"), NULL),
+                /*A*/ NextAction::array(0, new NextAction("flash heal on party"), NULL),
+                /*C*/ NULL);
+        }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/priest/PriestTriggers.cpp b/src/game/playerbot/strategy/priest/PriestTriggers.cpp
new file mode 100644
index 00000000000..941041c8dd9
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/PriestTriggers.cpp
@@ -0,0 +1,7 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PriestTriggers.h"
+#include "PriestActions.h"
+
+using namespace ai;
+
diff --git a/src/game/playerbot/strategy/priest/PriestTriggers.h b/src/game/playerbot/strategy/priest/PriestTriggers.h
new file mode 100644
index 00000000000..83b43c2e93e
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/PriestTriggers.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "../triggers/GenericTriggers.h"
+
+namespace ai
+{
+    BUFF_ON_PARTY_TRIGGER(PowerWordFortitudeOnPartyTrigger, "power word: fortitude", "power word: fortitude on party")
+    BUFF_TRIGGER(PowerWordFortitudeTrigger, "power word: fortitude", "power word: fortitude")
+
+    BUFF_ON_PARTY_TRIGGER(DivineSpiritOnPartyTrigger, "divine spirit", "divine spirit on party")
+    BUFF_TRIGGER(DivineSpiritTrigger, "divine spirit", "divine spirit")
+    BUFF_TRIGGER(InnerFireTrigger, "inner fire", "inner fire")
+    BUFF_TRIGGER(VampiricEmbraceTrigger, "vampiric embrace", "vampiric embrace")
+
+    class PowerWordPainOnAttackerTrigger : public DebuffOnAttackerTrigger
+    {
+    public:
+        PowerWordPainOnAttackerTrigger(PlayerbotAI* ai) : DebuffOnAttackerTrigger(ai, "shadow word: pain") {}
+    };
+
+    DEBUFF_TRIGGER(PowerWordPainTrigger, "shadow word: pain", "shadow word: pain")
+    DEBUFF_TRIGGER(DevouringPlagueTrigger, "devouring plague", "devouring plague")
+    DEBUFF_TRIGGER(VampiricTouchTrigger, "vampiric touch", "vampiric touch")
+
+    class DispelMagicTrigger : public NeedCureTrigger
+    {
+    public:
+        DispelMagicTrigger(PlayerbotAI* ai) : NeedCureTrigger(ai, "dispel magic", DISPEL_MAGIC) {}
+    };
+
+    class DispelMagicPartyMemberTrigger : public PartyMemberNeedCureTrigger
+    {
+    public:
+        DispelMagicPartyMemberTrigger(PlayerbotAI* ai) : PartyMemberNeedCureTrigger(ai, "dispel magic", DISPEL_MAGIC) {}
+    };
+
+    class CureDiseaseTrigger : public NeedCureTrigger
+    {
+    public:
+        CureDiseaseTrigger(PlayerbotAI* ai) : NeedCureTrigger(ai, "cure disease", DISPEL_DISEASE) {}
+    };
+
+    class PartyMemberCureDiseaseTrigger : public PartyMemberNeedCureTrigger
+    {
+    public:
+        PartyMemberCureDiseaseTrigger(PlayerbotAI* ai) : PartyMemberNeedCureTrigger(ai, "cure disease", DISPEL_DISEASE) {}
+    };
+
+    class ShadowformTrigger : public BuffTrigger {
+    public:
+        ShadowformTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "shadowform") {}
+        virtual bool IsActive() { return !ai->HasAura("shadowform", bot); }
+    };
+}
diff --git a/src/game/playerbot/strategy/priest/ShadowPriestStrategy.cpp b/src/game/playerbot/strategy/priest/ShadowPriestStrategy.cpp
new file mode 100644
index 00000000000..718794c99f1
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/ShadowPriestStrategy.cpp
@@ -0,0 +1,60 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PriestMultipliers.h"
+#include "ShadowPriestStrategy.h"
+#include "ShadowPriestStrategyActionNodeFactory.h"
+
+using namespace ai;
+
+ShadowPriestStrategy::ShadowPriestStrategy(PlayerbotAI* ai) : GenericPriestStrategy(ai)
+{
+    actionNodeFactories.Add(new ShadowPriestStrategyActionNodeFactory());
+}
+
+NextAction** ShadowPriestStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("mind blast", 10.0f), NULL);
+}
+
+void ShadowPriestStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericPriestStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "enemy out of spell",
+        NextAction::array(0, new NextAction("reach spell", ACTION_NORMAL + 9), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "shadowform",
+        NextAction::array(0, new NextAction("shadowform", 15.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low mana",
+        NextAction::array(0, new NextAction("dispersion", ACTION_EMERGENCY + 5), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "vampiric embrace",
+        NextAction::array(0, new NextAction("vampiric embrace", 16.0f), NULL)));
+}
+
+void ShadowPriestAoeStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "shadow word: pain on attacker",
+        NextAction::array(0, new NextAction("shadow word: pain on attacker", 11.0f), NULL)));
+}
+
+void ShadowPriestDebuffStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "devouring plague",
+        NextAction::array(0, new NextAction("devouring plague", 13.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "vampiric touch",
+        NextAction::array(0, new NextAction("vampiric touch", 11.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "shadow word: pain",
+        NextAction::array(0, new NextAction("shadow word: pain", 12.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/priest/ShadowPriestStrategy.h b/src/game/playerbot/strategy/priest/ShadowPriestStrategy.h
new file mode 100644
index 00000000000..3097f4ae8f2
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/ShadowPriestStrategy.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include "HealPriestStrategy.h"
+
+namespace ai
+{
+    class ShadowPriestStrategy : public GenericPriestStrategy
+    {
+    public:
+        ShadowPriestStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual NextAction** getDefaultActions();
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "shadow"; }
+        virtual int GetType() { return STRATEGY_TYPE_DPS|STRATEGY_TYPE_RANGED; }
+    };
+
+    class ShadowPriestAoeStrategy : public CombatStrategy
+    {
+    public:
+        ShadowPriestAoeStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "shadow aoe"; }
+    };
+
+    class ShadowPriestDebuffStrategy : public CombatStrategy
+    {
+    public:
+        ShadowPriestDebuffStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "shadow debuff"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/priest/ShadowPriestStrategyActionNodeFactory.h b/src/game/playerbot/strategy/priest/ShadowPriestStrategyActionNodeFactory.h
new file mode 100644
index 00000000000..bae7d23960c
--- /dev/null
+++ b/src/game/playerbot/strategy/priest/ShadowPriestStrategyActionNodeFactory.h
@@ -0,0 +1,37 @@
+#pragma once
+
+namespace ai
+{
+    class ShadowPriestStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+    {
+    public:
+        ShadowPriestStrategyActionNodeFactory()
+        {
+            creators["mind flay"] = &mind_flay;
+            creators["mind blast"] = &mind_blast;
+            creators["dispersion"] = &dispersion;
+        }
+    private:
+        static ActionNode* mind_flay(PlayerbotAI* ai)
+        {
+            return new ActionNode ("mind flay",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("shoot"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* mind_blast(PlayerbotAI* ai)
+        {
+            return new ActionNode ("mind blast",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("mind flay"), NULL),
+                /*C*/ NULL);
+        }
+        static ActionNode* dispersion(PlayerbotAI* ai)
+        {
+            return new ActionNode ("dispersion",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("mana potion"), NULL),
+                /*C*/ NULL);
+        }
+    };
+};
diff --git a/src/game/playerbot/strategy/rogue/DpsRogueStrategy.cpp b/src/game/playerbot/strategy/rogue/DpsRogueStrategy.cpp
new file mode 100644
index 00000000000..650ac600914
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/DpsRogueStrategy.cpp
@@ -0,0 +1,110 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RogueMultipliers.h"
+#include "DpsRogueStrategy.h"
+
+using namespace ai;
+
+class DpsRogueStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    DpsRogueStrategyActionNodeFactory()
+    {
+        creators["riposte"] = &riposte;
+        creators["mutilate"] = &mutilate;
+        creators["sinister strike"] = &sinister_strike;
+        creators["kick"] = &kick;
+        creators["kidney shot"] = &kidney_shot;
+        creators["rupture"] = &rupture;
+        creators["backstab"] = &backstab;
+    }
+private:
+    static ActionNode* riposte(PlayerbotAI* ai)
+    {
+        return new ActionNode ("riposte",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("mutilate"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* mutilate(PlayerbotAI* ai)
+    {
+        return new ActionNode ("mutilate",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("sinister strike"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* sinister_strike(PlayerbotAI* ai)
+    {
+        return new ActionNode ("sinister strike",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* kick(PlayerbotAI* ai)
+    {
+        return new ActionNode ("kick",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("kidney shot"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* kidney_shot(PlayerbotAI* ai)
+    {
+        return new ActionNode ("kidney shot",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* rupture(PlayerbotAI* ai)
+    {
+        return new ActionNode ("rupture",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("eviscerate"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* backstab(PlayerbotAI* ai)
+    {
+        return new ActionNode ("backstab",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("mutilate"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+DpsRogueStrategy::DpsRogueStrategy(PlayerbotAI* ai) : MeleeCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new DpsRogueStrategyActionNodeFactory());
+}
+
+NextAction** DpsRogueStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("riposte", ACTION_NORMAL), NULL);
+}
+
+void DpsRogueStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    MeleeCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "combo points available",
+        NextAction::array(0, new NextAction("rupture", ACTION_HIGH + 2), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"medium threat",
+		NextAction::array(0, new NextAction("vanish", ACTION_HIGH), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"low health",
+		NextAction::array(0, new NextAction("evasion", ACTION_EMERGENCY), new NextAction("feint", ACTION_EMERGENCY), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"kick",
+		NextAction::array(0, new NextAction("kick", ACTION_INTERRUPT + 2), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"kick on enemy healer",
+		NextAction::array(0, new NextAction("kick on enemy healer", ACTION_INTERRUPT + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "behind target",
+        NextAction::array(0, new NextAction("backstab", ACTION_NORMAL), NULL)));
+}
diff --git a/src/game/playerbot/strategy/rogue/DpsRogueStrategy.h b/src/game/playerbot/strategy/rogue/DpsRogueStrategy.h
new file mode 100644
index 00000000000..77e22495ad5
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/DpsRogueStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "../Strategy.h"
+#include "../generic/MeleeCombatStrategy.h"
+
+namespace ai
+{
+    class DpsRogueStrategy : public MeleeCombatStrategy
+    {
+    public:
+        DpsRogueStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "dps"; }
+        virtual NextAction** getDefaultActions();
+    };
+}
diff --git a/src/game/playerbot/strategy/rogue/GenericRogueNonCombatStrategy.cpp b/src/game/playerbot/strategy/rogue/GenericRogueNonCombatStrategy.cpp
new file mode 100644
index 00000000000..0afb767afdf
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/GenericRogueNonCombatStrategy.cpp
@@ -0,0 +1,14 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RogueTriggers.h"
+#include "RogueMultipliers.h"
+#include "GenericRogueNonCombatStrategy.h"
+#include "RogueActions.h"
+
+using namespace ai;
+
+void GenericRogueNonCombatStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    NonCombatStrategy::InitTriggers(triggers);
+        
+}
diff --git a/src/game/playerbot/strategy/rogue/GenericRogueNonCombatStrategy.h b/src/game/playerbot/strategy/rogue/GenericRogueNonCombatStrategy.h
new file mode 100644
index 00000000000..2d78612866b
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/GenericRogueNonCombatStrategy.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../generic/NonCombatStrategy.h"
+
+namespace ai
+{
+    class GenericRogueNonCombatStrategy : public NonCombatStrategy
+    {
+    public:
+        GenericRogueNonCombatStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "nc"; }
+    
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/rogue/RogueActions.cpp b/src/game/playerbot/strategy/rogue/RogueActions.cpp
new file mode 100644
index 00000000000..aba6061f5a7
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/RogueActions.cpp
@@ -0,0 +1,5 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RogueActions.h"
+
+using namespace ai;
diff --git a/src/game/playerbot/strategy/rogue/RogueActions.h b/src/game/playerbot/strategy/rogue/RogueActions.h
new file mode 100644
index 00000000000..a7a78eba2f6
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/RogueActions.h
@@ -0,0 +1,82 @@
+#pragma once
+
+#include "../actions/GenericActions.h"
+#include "RogueComboActions.h"
+#include "RogueOpeningActions.h"
+#include "RogueFinishingActions.h"
+
+namespace ai
+{
+	class CastEvasionAction : public CastBuffSpellAction
+	{
+	public:
+		CastEvasionAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "evasion") {}
+	};
+
+	class CastSprintAction : public CastBuffSpellAction
+	{
+	public:
+		CastSprintAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "sprint") {}
+	};
+
+	class CastKickAction : public CastSpellAction
+	{
+	public:
+		CastKickAction(PlayerbotAI* ai) : CastSpellAction(ai, "kick") {}
+	};
+
+	class CastFeintAction : public CastBuffSpellAction
+	{
+	public:
+		CastFeintAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "feint") {}
+	};
+
+	class CastDismantleAction : public CastSpellAction
+	{
+	public:
+		CastDismantleAction(PlayerbotAI* ai) : CastSpellAction(ai, "dismantle") {}
+	};
+
+	class CastDistractAction : public CastSpellAction
+	{
+	public:
+		CastDistractAction(PlayerbotAI* ai) : CastSpellAction(ai, "distract") {}
+	};
+
+	class CastVanishAction : public CastBuffSpellAction
+	{
+	public:
+		CastVanishAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "vanish") {}
+	};
+
+	class CastBlindAction : public CastDebuffSpellAction
+	{
+	public:
+		CastBlindAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "blind") {}
+	};
+
+
+	class CastBladeFlurryAction : public CastBuffSpellAction
+	{
+	public:
+		CastBladeFlurryAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "blade flurry") {}
+	};
+
+	class CastAdrenalineRushAction : public CastBuffSpellAction
+	{
+	public:
+		CastAdrenalineRushAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "adrenaline rush") {}
+	};
+
+	class CastKillingSpreeAction : public CastBuffSpellAction
+	{
+	public:
+		CastKillingSpreeAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "killing spree") {}
+	};
+
+    class CastKickOnEnemyHealerAction : public CastSpellOnEnemyHealerAction
+    {
+    public:
+        CastKickOnEnemyHealerAction(PlayerbotAI* ai) : CastSpellOnEnemyHealerAction(ai, "kick") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/rogue/RogueAiObjectContext.cpp b/src/game/playerbot/strategy/rogue/RogueAiObjectContext.cpp
new file mode 100644
index 00000000000..fdca0c051c7
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/RogueAiObjectContext.cpp
@@ -0,0 +1,119 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RogueActions.h"
+#include "RogueTriggers.h"
+#include "RogueAiObjectContext.h"
+#include "DpsRogueStrategy.h"
+#include "GenericRogueNonCombatStrategy.h"
+#include "../generic/PullStrategy.h"
+#include "../NamedObjectContext.h"
+
+using namespace ai;
+
+
+namespace ai
+{
+    namespace rogue
+    {
+        using namespace ai;
+
+        class StrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            StrategyFactoryInternal()
+            {
+                creators["dps"] = &rogue::StrategyFactoryInternal::dps;
+                creators["nc"] = &rogue::StrategyFactoryInternal::nc;
+                creators["pull"] = &rogue::StrategyFactoryInternal::pull;
+            }
+
+        private:
+            static Strategy* dps(PlayerbotAI* ai) { return new DpsRogueStrategy(ai); }
+            static Strategy* nc(PlayerbotAI* ai) { return new GenericRogueNonCombatStrategy(ai); }
+            static Strategy* pull(PlayerbotAI* ai) { return new PullStrategy(ai, "shoot"); }
+        };
+    };
+};
+
+namespace ai
+{
+    namespace rogue
+    {
+        using namespace ai;
+
+        class TriggerFactoryInternal : public NamedObjectContext<Trigger>
+        {
+        public:
+            TriggerFactoryInternal()
+            {
+                creators["kick"] = &TriggerFactoryInternal::kick;
+                creators["rupture"] = &TriggerFactoryInternal::rupture;
+                creators["slice and dice"] = &TriggerFactoryInternal::slice_and_dice;
+                creators["expose armor"] = &TriggerFactoryInternal::expose_armor;
+                creators["kick on enemy healer"] = &TriggerFactoryInternal::kick_on_enemy_healer;
+
+            }
+
+        private:
+            static Trigger* kick(PlayerbotAI* ai) { return new KickInterruptSpellTrigger(ai); }
+            static Trigger* rupture(PlayerbotAI* ai) { return new RuptureTrigger(ai); }
+            static Trigger* slice_and_dice(PlayerbotAI* ai) { return new SliceAndDiceTrigger(ai); }
+            static Trigger* expose_armor(PlayerbotAI* ai) { return new ExposeArmorTrigger(ai); }
+            static Trigger* kick_on_enemy_healer(PlayerbotAI* ai) { return new KickInterruptEnemyHealerSpellTrigger(ai); }
+        };
+    };
+};
+
+
+namespace ai
+{
+    namespace rogue
+    {
+        using namespace ai;
+
+        class AiObjectContextInternal : public NamedObjectContext<Action>
+        {
+        public:
+            AiObjectContextInternal()
+            {
+                creators["riposte"] = &AiObjectContextInternal::riposte;
+                creators["mutilate"] = &AiObjectContextInternal::mutilate;
+                creators["sinister strike"] = &AiObjectContextInternal::sinister_strike;
+                creators["kidney shot"] = &AiObjectContextInternal::kidney_shot;
+                creators["rupture"] = &AiObjectContextInternal::rupture;
+                creators["slice and dice"] = &AiObjectContextInternal::slice_and_dice;
+                creators["eviscerate"] = &AiObjectContextInternal::eviscerate;
+                creators["vanish"] = &AiObjectContextInternal::vanish;
+                creators["evasion"] = &AiObjectContextInternal::evasion;
+                creators["kick"] = &AiObjectContextInternal::kick;
+                creators["feint"] = &AiObjectContextInternal::feint;
+                creators["backstab"] = &AiObjectContextInternal::backstab;
+                creators["expose armor"] = &AiObjectContextInternal::expose_armor;
+                creators["kick on enemy healer"] = &AiObjectContextInternal::kick_on_enemy_healer;
+            }
+
+        private:
+            static Action* riposte(PlayerbotAI* ai) { return new CastRiposteAction(ai); }
+            static Action* mutilate(PlayerbotAI* ai) { return new CastMutilateAction(ai); }
+            static Action* sinister_strike(PlayerbotAI* ai) { return new CastSinisterStrikeAction(ai); }
+            static Action* kidney_shot(PlayerbotAI* ai) { return new CastKidneyShotAction(ai); }
+            static Action* rupture(PlayerbotAI* ai) { return new CastRuptureAction(ai); }
+            static Action* slice_and_dice(PlayerbotAI* ai) { return new CastSliceAndDiceAction(ai); }
+            static Action* eviscerate(PlayerbotAI* ai) { return new CastEviscerateAction(ai); }
+            static Action* vanish(PlayerbotAI* ai) { return new CastVanishAction(ai); }
+            static Action* evasion(PlayerbotAI* ai) { return new CastEvasionAction(ai); }
+            static Action* kick(PlayerbotAI* ai) { return new CastKickAction(ai); }
+            static Action* feint(PlayerbotAI* ai) { return new CastFeintAction(ai); }
+            static Action* backstab(PlayerbotAI* ai) { return new CastBackstabAction(ai); }
+            static Action* expose_armor(PlayerbotAI* ai) { return new CastExposeArmorAction(ai); }
+            static Action* kick_on_enemy_healer(PlayerbotAI* ai) { return new CastKickOnEnemyHealerAction(ai); }
+        };
+    };
+};
+
+RogueAiObjectContext::RogueAiObjectContext(PlayerbotAI* ai) : AiObjectContext(ai)
+{
+    strategyContexts.Add(new ai::rogue::StrategyFactoryInternal());
+    actionContexts.Add(new ai::rogue::AiObjectContextInternal());
+    triggerContexts.Add(new ai::rogue::TriggerFactoryInternal());
+}
diff --git a/src/game/playerbot/strategy/rogue/RogueAiObjectContext.h b/src/game/playerbot/strategy/rogue/RogueAiObjectContext.h
new file mode 100644
index 00000000000..ba346266cdb
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/RogueAiObjectContext.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../AiObjectContext.h"
+
+namespace ai
+{
+    class RogueAiObjectContext : public AiObjectContext
+    {
+    public:
+        RogueAiObjectContext(PlayerbotAI* ai);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/rogue/RogueComboActions.h b/src/game/playerbot/strategy/rogue/RogueComboActions.h
new file mode 100644
index 00000000000..186e2eb3ce3
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/RogueComboActions.h
@@ -0,0 +1,45 @@
+#pragma once
+
+namespace ai
+{
+	class CastComboAction : public CastMeleeSpellAction
+	{
+	public:
+	    CastComboAction(PlayerbotAI* ai, string name) : CastMeleeSpellAction(ai, name) {}
+
+	    virtual bool isUseful()
+	    {
+	        return CastMeleeSpellAction::isUseful() && AI_VALUE2(uint8, "combo", "self target") < 5;
+	    }
+	};
+
+	class CastSinisterStrikeAction : public CastComboAction
+	{
+	public:
+		CastSinisterStrikeAction(PlayerbotAI* ai) : CastComboAction(ai, "sinister strike") {}
+	};
+
+    class CastMutilateAction : public CastComboAction
+    {
+    public:
+        CastMutilateAction(PlayerbotAI* ai) : CastComboAction(ai, "mutilate") {}
+    };
+
+    class CastRiposteAction : public CastComboAction
+    {
+    public:
+        CastRiposteAction(PlayerbotAI* ai) : CastComboAction(ai, "riposte") {}
+    };
+
+	class CastGougeAction : public CastComboAction
+	{
+	public:
+		CastGougeAction(PlayerbotAI* ai) : CastComboAction(ai, "gouge") {}
+	};
+
+    class CastBackstabAction : public CastComboAction
+    {
+    public:
+        CastBackstabAction(PlayerbotAI* ai) : CastComboAction(ai, "backstab") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/rogue/RogueFinishingActions.h b/src/game/playerbot/strategy/rogue/RogueFinishingActions.h
new file mode 100644
index 00000000000..91a078b63d6
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/RogueFinishingActions.h
@@ -0,0 +1,35 @@
+#pragma once
+
+namespace ai
+{
+	class CastEviscerateAction : public CastMeleeSpellAction 
+	{ 
+	public: 
+		CastEviscerateAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "eviscerate") {} 
+	};
+
+	class CastSliceAndDiceAction : public CastMeleeSpellAction 
+	{ 
+	public: 
+		CastSliceAndDiceAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "slice and dice") {} 
+	};
+
+	class CastExposeArmorAction : public CastMeleeSpellAction 
+	{ 
+	public: 
+		CastExposeArmorAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "expose armor") {} 
+	};
+
+	class CastRuptureAction : public CastMeleeSpellAction 
+	{ 
+	public: 
+		CastRuptureAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "rupture") {} 
+	};
+	
+	class CastKidneyShotAction : public CastMeleeSpellAction 
+	{ 
+	public: 
+		CastKidneyShotAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "kidney shot") {} 
+	};
+	
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/rogue/RogueMultipliers.cpp b/src/game/playerbot/strategy/rogue/RogueMultipliers.cpp
new file mode 100644
index 00000000000..136fd0de894
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/RogueMultipliers.cpp
@@ -0,0 +1,6 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RogueMultipliers.h"
+#include "RogueActions.h"
+
+using namespace ai;
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/rogue/RogueMultipliers.h b/src/game/playerbot/strategy/rogue/RogueMultipliers.h
new file mode 100644
index 00000000000..7cfbdd46e87
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/RogueMultipliers.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace ai
+{
+   
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/rogue/RogueOpeningActions.h b/src/game/playerbot/strategy/rogue/RogueOpeningActions.h
new file mode 100644
index 00000000000..35e0fc34559
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/RogueOpeningActions.h
@@ -0,0 +1,24 @@
+#pragma once
+
+namespace ai
+{
+	class CastSapAction : public CastMeleeSpellAction
+	{ 
+	public: 
+		CastSapAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "sap") {} 
+	};
+
+	class CastGarroteAction : public CastMeleeSpellAction 
+	{ 
+	public: 
+		CastGarroteAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "garrote") {} 
+	};
+
+
+	class CastCheapShotAction : public CastMeleeSpellAction 
+	{ 
+	public: 
+		CastCheapShotAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "cheap shot") {} 
+	};
+	
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/rogue/RogueTriggers.cpp b/src/game/playerbot/strategy/rogue/RogueTriggers.cpp
new file mode 100644
index 00000000000..8f57d248f1b
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/RogueTriggers.cpp
@@ -0,0 +1,7 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RogueTriggers.h"
+#include "RogueActions.h"
+
+using namespace ai;
+
diff --git a/src/game/playerbot/strategy/rogue/RogueTriggers.h b/src/game/playerbot/strategy/rogue/RogueTriggers.h
new file mode 100644
index 00000000000..8d20e12b8a0
--- /dev/null
+++ b/src/game/playerbot/strategy/rogue/RogueTriggers.h
@@ -0,0 +1,36 @@
+#pragma once
+#include "../triggers/GenericTriggers.h"
+
+namespace ai
+{
+
+    class KickInterruptSpellTrigger : public InterruptSpellTrigger
+    {
+    public:
+        KickInterruptSpellTrigger(PlayerbotAI* ai) : InterruptSpellTrigger(ai, "kick") {}
+    };
+
+    class SliceAndDiceTrigger : public BuffTrigger
+    {
+    public:
+        SliceAndDiceTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "slice and dice") {}
+    };
+
+    class RuptureTrigger : public DebuffTrigger
+    {
+    public:
+        RuptureTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "rupture") {}
+    };
+
+    class ExposeArmorTrigger : public DebuffTrigger
+    {
+    public:
+        ExposeArmorTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "expose armor") {}
+    };
+
+    class KickInterruptEnemyHealerSpellTrigger : public InterruptEnemyHealerTrigger
+    {
+    public:
+        KickInterruptEnemyHealerSpellTrigger(PlayerbotAI* ai) : InterruptEnemyHealerTrigger(ai, "kick") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/shaman/CasterShamanStrategy.cpp b/src/game/playerbot/strategy/shaman/CasterShamanStrategy.cpp
new file mode 100644
index 00000000000..aa1b6a5a497
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/CasterShamanStrategy.cpp
@@ -0,0 +1,75 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ShamanMultipliers.h"
+#include "CasterShamanStrategy.h"
+
+using namespace ai;
+
+class CasterShamanStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    CasterShamanStrategyActionNodeFactory()
+    {
+        creators["magma totem"] = &magma_totem;
+    }
+private:
+    static ActionNode* magma_totem(PlayerbotAI* ai)
+    {
+        return new ActionNode ("magma totem",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NextAction::array(0, new NextAction("fire nova"), NULL));
+    }
+};
+
+CasterShamanStrategy::CasterShamanStrategy(PlayerbotAI* ai) : GenericShamanStrategy(ai)
+{
+    actionNodeFactories.Add(new CasterShamanStrategyActionNodeFactory());
+}
+
+NextAction** CasterShamanStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("lightning bolt", 10.0f), NULL);
+}
+
+void CasterShamanStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericShamanStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "enemy out of spell",
+        NextAction::array(0, new NextAction("reach spell", ACTION_NORMAL + 9), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "shaman weapon",
+        NextAction::array(0, new NextAction("flametongue weapon", 23.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "searing totem",
+        NextAction::array(0, new NextAction("searing totem", 19.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "shock",
+        NextAction::array(0, new NextAction("earth shock", 20.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "frost shock snare",
+        NextAction::array(0, new NextAction("frost shock", 21.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("flametongue totem", ACTION_LIGHT_HEAL), NULL)));
+}
+
+void CasterAoeShamanStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    MeleeAoeShamanStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "light aoe",
+        NextAction::array(0, new NextAction("chain lightning", 25.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("thunderstorm", 26.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/shaman/CasterShamanStrategy.h b/src/game/playerbot/strategy/shaman/CasterShamanStrategy.h
new file mode 100644
index 00000000000..f9444c69357
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/CasterShamanStrategy.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "GenericShamanStrategy.h"
+#include "MeleeShamanStrategy.h"
+
+namespace ai
+{
+    class CasterShamanStrategy : public GenericShamanStrategy
+    {
+    public:
+        CasterShamanStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual NextAction** getDefaultActions();
+        virtual string getName() { return "caster"; }
+        virtual int GetType() { return STRATEGY_TYPE_COMBAT | STRATEGY_TYPE_DPS | STRATEGY_TYPE_RANGED; }
+    };
+
+    class CasterAoeShamanStrategy : public MeleeAoeShamanStrategy
+    {
+    public:
+        CasterAoeShamanStrategy(PlayerbotAI* ai) : MeleeAoeShamanStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "caster aoe"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/shaman/GenericShamanStrategy.cpp b/src/game/playerbot/strategy/shaman/GenericShamanStrategy.cpp
new file mode 100644
index 00000000000..18a9c3c8958
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/GenericShamanStrategy.cpp
@@ -0,0 +1,159 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ShamanMultipliers.h"
+#include "HealShamanStrategy.h"
+
+using namespace ai;
+
+class GenericShamanStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    GenericShamanStrategyActionNodeFactory()
+    {
+        creators["flametongue weapon"] = &flametongue_weapon;
+        creators["frostbrand weapon"] = &frostbrand_weapon;
+        creators["windfury weapon"] = &windfury_weapon;
+        creators["lesser healing wave"] = &lesser_healing_wave;
+        creators["lesser healing wave on party"] = &lesser_healing_wave_on_party;
+        creators["chain heal"] = &chain_heal;
+        creators["riptide"] = &riptide;
+        creators["chain heal on party"] = &chain_heal_on_party;
+        creators["riptide on party"] = &riptide_on_party;
+        creators["earth shock"] = &earth_shock;
+    }
+private:
+    static ActionNode* earth_shock(PlayerbotAI* ai)
+    {
+        return new ActionNode ("earth shock",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("flame shock"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* flametongue_weapon(PlayerbotAI* ai)
+    {
+        return new ActionNode ("flametongue weapon",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("frostbrand weapon"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* frostbrand_weapon(PlayerbotAI* ai)
+    {
+        return new ActionNode ("frostbrand weapon",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("rockbiter weapon"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* windfury_weapon(PlayerbotAI* ai)
+    {
+        return new ActionNode ("windfury weapon",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("rockbiter weapon"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* lesser_healing_wave(PlayerbotAI* ai)
+    {
+        return new ActionNode ("lesser healing wave",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("healing wave"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* lesser_healing_wave_on_party(PlayerbotAI* ai)
+    {
+        return new ActionNode ("lesser healing wave on party",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("healing wave on party"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* chain_heal(PlayerbotAI* ai)
+    {
+        return new ActionNode ("chain heal",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("lesser healing wave"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* riptide(PlayerbotAI* ai)
+    {
+        return new ActionNode ("riptide",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("healing wave"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* chain_heal_on_party(PlayerbotAI* ai)
+    {
+        return new ActionNode ("chain heal on party",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("lesser healing wave on party"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* riptide_on_party(PlayerbotAI* ai)
+    {
+        return new ActionNode ("riptide on party",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("healing wave on party"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+GenericShamanStrategy::GenericShamanStrategy(PlayerbotAI* ai) : CombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericShamanStrategyActionNodeFactory());
+}
+
+void GenericShamanStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    CombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "wind shear",
+        NextAction::array(0, new NextAction("wind shear", 23.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "wind shear on enemy healer",
+        NextAction::array(0, new NextAction("wind shear on enemy healer", 23.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+        "purge",
+		NextAction::array(0, new NextAction("purge", 10.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+        "party member medium health",
+		NextAction::array(0, new NextAction("lesser healing wave on party", 25.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+        "party member low health",
+		NextAction::array(0, new NextAction("riptide on party", 25.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"medium aoe heal",
+		NextAction::array(0, new NextAction("chain heal", 27.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"medium health",
+		NextAction::array(0, new NextAction("lesser healing wave", 26.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"low health",
+		NextAction::array(0, new NextAction("riptide", 26.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"heroism",
+		NextAction::array(0, new NextAction("heroism", 31.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"bloodlust",
+		NextAction::array(0, new NextAction("bloodlust", 30.0f), NULL)));
+}
+
+void ShamanBuffDpsStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "lightning shield",
+        NextAction::array(0, new NextAction("lightning shield", 22.0f), NULL)));
+}
+
+void ShamanBuffManaStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "water shield",
+        NextAction::array(0, new NextAction("water shield", 22.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/shaman/GenericShamanStrategy.h b/src/game/playerbot/strategy/shaman/GenericShamanStrategy.h
new file mode 100644
index 00000000000..fdac4601787
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/GenericShamanStrategy.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "../Strategy.h"
+#include "../generic/CombatStrategy.h"
+
+namespace ai
+{
+    class GenericShamanStrategy : public CombatStrategy
+    {
+    public:
+        GenericShamanStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+
+    };
+
+    class ShamanBuffDpsStrategy : public Strategy
+    {
+    public:
+        ShamanBuffDpsStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "bdps"; }
+
+    };
+
+    class ShamanBuffManaStrategy : public Strategy
+    {
+    public:
+        ShamanBuffManaStrategy(PlayerbotAI* ai) : Strategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "bmana"; }
+
+    };
+}
diff --git a/src/game/playerbot/strategy/shaman/HealShamanStrategy.cpp b/src/game/playerbot/strategy/shaman/HealShamanStrategy.cpp
new file mode 100644
index 00000000000..0d053264e05
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/HealShamanStrategy.cpp
@@ -0,0 +1,82 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ShamanMultipliers.h"
+#include "HealShamanStrategy.h"
+
+using namespace ai;
+
+class HealShamanStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    HealShamanStrategyActionNodeFactory()
+    {
+        creators["earthliving weapon"] = &earthliving_weapon;
+        creators["mana tide totem"] = &mana_tide_totem;
+    }
+private:
+    static ActionNode* earthliving_weapon(PlayerbotAI* ai)
+    {
+        return new ActionNode ("earthliving weapon",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("flametongue weapon"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* mana_tide_totem(PlayerbotAI* ai)
+    {
+        return new ActionNode ("mana tide totem",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("mana potion"), NULL),
+            /*C*/ NULL);
+    }
+
+};
+
+HealShamanStrategy::HealShamanStrategy(PlayerbotAI* ai) : GenericShamanStrategy(ai)
+{
+    actionNodeFactories.Add(new HealShamanStrategyActionNodeFactory());
+}
+
+void HealShamanStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericShamanStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "enemy out of spell",
+        NextAction::array(0, new NextAction("reach spell", ACTION_NORMAL + 9), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "shaman weapon",
+        NextAction::array(0, new NextAction("earthliving weapon", 22.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low mana",
+        NextAction::array(0, new NextAction("mana tide totem", ACTION_EMERGENCY + 5), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse spirit poison",
+        NextAction::array(0, new NextAction("cleanse spirit", 24.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse spirit curse",
+        NextAction::array(0, new NextAction("cleanse spirit", 24.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "cleanse spirit disease",
+        NextAction::array(0, new NextAction("cleanse spirit", 24.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member cleanse spirit poison",
+        NextAction::array(0, new NextAction("cleanse spirit poison on party", 23.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member cleanse spirit curse",
+        NextAction::array(0, new NextAction("cleanse spirit curse on party", 23.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member cleanse spirit disease",
+        NextAction::array(0, new NextAction("cleanse spirit disease on party", 23.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("healing stream totem", ACTION_LIGHT_HEAL), NULL)));
+}
diff --git a/src/game/playerbot/strategy/shaman/HealShamanStrategy.h b/src/game/playerbot/strategy/shaman/HealShamanStrategy.h
new file mode 100644
index 00000000000..e5d4ff1bf8d
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/HealShamanStrategy.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "GenericShamanStrategy.h"
+
+namespace ai
+{
+    class HealShamanStrategy : public GenericShamanStrategy
+    {
+    public:
+        HealShamanStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "heal"; }
+		virtual int GetType() { return STRATEGY_TYPE_HEAL; }
+    };
+}
diff --git a/src/game/playerbot/strategy/shaman/MeleeShamanStrategy.cpp b/src/game/playerbot/strategy/shaman/MeleeShamanStrategy.cpp
new file mode 100644
index 00000000000..34eab8c0e39
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/MeleeShamanStrategy.cpp
@@ -0,0 +1,93 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ShamanMultipliers.h"
+#include "MeleeShamanStrategy.h"
+
+using namespace ai;
+
+class MeleeShamanStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    MeleeShamanStrategyActionNodeFactory()
+    {
+        creators["stormstrike"] = &stormstrike;
+        creators["lava lash"] = &lava_lash;
+        creators["magma totem"] = &magma_totem;
+    }
+private:
+    static ActionNode* stormstrike(PlayerbotAI* ai)
+    {
+        return new ActionNode ("stormstrike",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("lava lash"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* lava_lash(PlayerbotAI* ai)
+    {
+        return new ActionNode ("lava lash",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* magma_totem(PlayerbotAI* ai)
+    {
+        return new ActionNode ("magma totem",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NextAction::array(0, new NextAction("fire nova"), NULL));
+    }
+};
+
+MeleeShamanStrategy::MeleeShamanStrategy(PlayerbotAI* ai) : GenericShamanStrategy(ai)
+{
+    actionNodeFactories.Add(new MeleeShamanStrategyActionNodeFactory());
+}
+
+NextAction** MeleeShamanStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("stormstrike", 10.0f), NULL);
+}
+
+void MeleeShamanStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericShamanStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "shaman weapon",
+        NextAction::array(0, new NextAction("windfury weapon", 22.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "searing totem",
+        NextAction::array(0, new NextAction("searing totem", 22.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "shock",
+        NextAction::array(0, new NextAction("earth shock", 20.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "not facing target",
+        NextAction::array(0, new NextAction("set facing", ACTION_NORMAL + 7), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "enemy too close for melee",
+        NextAction::array(0, new NextAction("move out of enemy contact", ACTION_NORMAL + 8), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("strength of earth totem", ACTION_LIGHT_HEAL), NULL)));
+}
+
+void MeleeAoeShamanStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "enemy out of melee",
+        NextAction::array(0, new NextAction("reach melee", ACTION_NORMAL + 8), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "magma totem",
+        NextAction::array(0, new NextAction("magma totem", 26.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("fire nova", 25.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/shaman/MeleeShamanStrategy.h b/src/game/playerbot/strategy/shaman/MeleeShamanStrategy.h
new file mode 100644
index 00000000000..6c18fb60144
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/MeleeShamanStrategy.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "GenericShamanStrategy.h"
+
+namespace ai
+{
+    class MeleeShamanStrategy : public GenericShamanStrategy
+    {
+    public:
+        MeleeShamanStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual NextAction** getDefaultActions();
+        virtual string getName() { return "melee"; }
+        virtual int GetType() { return STRATEGY_TYPE_COMBAT | STRATEGY_TYPE_DPS | STRATEGY_TYPE_MELEE; }
+    };
+
+    class MeleeAoeShamanStrategy : public CombatStrategy
+    {
+    public:
+        MeleeAoeShamanStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "melee aoe"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/shaman/ShamanActions.cpp b/src/game/playerbot/strategy/shaman/ShamanActions.cpp
new file mode 100644
index 00000000000..ab8b0702776
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/ShamanActions.cpp
@@ -0,0 +1,6 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ShamanActions.h"
+
+using namespace ai;
+
diff --git a/src/game/playerbot/strategy/shaman/ShamanActions.h b/src/game/playerbot/strategy/shaman/ShamanActions.h
new file mode 100644
index 00000000000..478d08af19b
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/ShamanActions.h
@@ -0,0 +1,304 @@
+#pragma once
+
+#include "../actions/GenericActions.h"
+
+namespace ai
+{
+    class CastLesserHealingWaveAction : public CastHealingSpellAction {
+    public:
+        CastLesserHealingWaveAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "lesser healing wave") {}
+    };
+
+    class CastLesserHealingWaveOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastLesserHealingWaveOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "lesser healing wave") {}
+    };
+
+
+    class CastHealingWaveAction : public CastHealingSpellAction {
+    public:
+        CastHealingWaveAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "healing wave") {}
+    };
+
+    class CastHealingWaveOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastHealingWaveOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "healing wave") {}
+    };
+
+    class CastChainHealAction : public CastAoeHealSpellAction {
+    public:
+        CastChainHealAction(PlayerbotAI* ai) : CastAoeHealSpellAction(ai, "chain heal") {}
+    };
+
+    class CastRiptideAction : public CastHealingSpellAction {
+    public:
+        CastRiptideAction(PlayerbotAI* ai) : CastHealingSpellAction(ai, "riptide") {}
+    };
+
+    class CastRiptideOnPartyAction : public HealPartyMemberAction
+    {
+    public:
+        CastRiptideOnPartyAction(PlayerbotAI* ai) : HealPartyMemberAction(ai, "riptide") {}
+    };
+
+
+    class CastEarthShieldAction : public CastBuffSpellAction {
+    public:
+        CastEarthShieldAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "earth shield") {}
+    };
+
+    class CastEarthShieldOnPartyAction : public BuffOnPartyAction
+    {
+    public:
+        CastEarthShieldOnPartyAction(PlayerbotAI* ai) : BuffOnPartyAction(ai, "earth shield") {}
+    };
+
+    class CastWaterShieldAction : public CastBuffSpellAction {
+    public:
+        CastWaterShieldAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "water shield") {}
+    };
+
+	class CastLightningShieldAction : public CastBuffSpellAction {
+	public:
+		CastLightningShieldAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "lightning shield") {}
+	};
+
+    class CastEarthlivingWeaponAction : public CastEnchantItemAction {
+    public:
+        CastEarthlivingWeaponAction(PlayerbotAI* ai) : CastEnchantItemAction(ai, "earthliving weapon") {}
+    };
+
+    class CastRockbiterWeaponAction : public CastEnchantItemAction {
+    public:
+        CastRockbiterWeaponAction(PlayerbotAI* ai) : CastEnchantItemAction(ai, "rockbiter weapon") {}
+    };
+
+    class CastFlametongueWeaponAction : public CastEnchantItemAction {
+    public:
+        CastFlametongueWeaponAction(PlayerbotAI* ai) : CastEnchantItemAction(ai, "flametongue weapon") {}
+    };
+
+    class CastFrostbrandWeaponAction : public CastEnchantItemAction {
+    public:
+        CastFrostbrandWeaponAction(PlayerbotAI* ai) : CastEnchantItemAction(ai, "frostbrand weapon") {}
+    };
+
+    class CastWindfuryWeaponAction : public CastEnchantItemAction {
+    public:
+        CastWindfuryWeaponAction(PlayerbotAI* ai) : CastEnchantItemAction(ai, "windfury weapon") {}
+    };
+
+    class CastTotemAction : public CastBuffSpellAction
+    {
+    public:
+        CastTotemAction(PlayerbotAI* ai, string spell) : CastBuffSpellAction(ai, spell) {}
+        virtual bool isUseful() { return CastBuffSpellAction::isUseful() && !AI_VALUE2(bool, "has totem", name); }
+    };
+
+    class CastStoneskinTotemAction : public CastTotemAction
+    {
+    public:
+        CastStoneskinTotemAction(PlayerbotAI* ai) : CastTotemAction(ai, "stoneskin totem") {}
+    };
+
+    class CastEarthbindTotemAction : public CastTotemAction
+    {
+    public:
+        CastEarthbindTotemAction(PlayerbotAI* ai) : CastTotemAction(ai, "earthbind totem") {}
+    };
+
+    class CastStrengthOfEarthTotemAction : public CastTotemAction
+    {
+    public:
+        CastStrengthOfEarthTotemAction(PlayerbotAI* ai) : CastTotemAction(ai, "strength of earth totem") {}
+    };
+
+    class CastManaSpringTotemAction : public CastTotemAction
+    {
+    public:
+        CastManaSpringTotemAction(PlayerbotAI* ai) : CastTotemAction(ai, "mana spring totem") {}
+    };
+
+	class CastManaTideTotemAction : public CastTotemAction
+	{
+	public:
+		CastManaTideTotemAction(PlayerbotAI* ai) : CastTotemAction(ai, "mana tide totem") {}
+		virtual string GetTargetName() { return "self target"; }
+	};
+
+	class CastHealingStreamTotemAction : public CastTotemAction
+	{
+	public:
+		CastHealingStreamTotemAction(PlayerbotAI* ai) : CastTotemAction(ai, "healing stream totem") {}
+	};
+
+    class CastCleansingTotemAction : public CastTotemAction
+    {
+    public:
+        CastCleansingTotemAction(PlayerbotAI* ai) : CastTotemAction(ai, "cleansing totem") {}
+    };
+
+    class CastFlametongueTotemAction : public CastTotemAction
+    {
+    public:
+        CastFlametongueTotemAction(PlayerbotAI* ai) : CastTotemAction(ai, "flametongue totem") {}
+    };
+
+    class CastWindfuryTotemAction : public CastTotemAction
+    {
+    public:
+        CastWindfuryTotemAction(PlayerbotAI* ai) : CastTotemAction(ai, "windfury totem") {}
+    };
+
+    class CastSearingTotemAction : public CastTotemAction
+    {
+    public:
+        CastSearingTotemAction(PlayerbotAI* ai) : CastTotemAction(ai, "searing totem") {}
+        virtual string GetTargetName() { return "self target"; }
+    };
+
+    class CastMagmaTotemAction : public CastMeleeSpellAction
+    {
+    public:
+        CastMagmaTotemAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "magma totem") {}
+        virtual string GetTargetName() { return "self target"; }
+        virtual bool isUseful() { return CastMeleeSpellAction::isUseful() && !AI_VALUE2(bool, "has totem", name); }
+    };
+
+    class CastFireNovaAction : public CastSpellAction {
+    public:
+        CastFireNovaAction(PlayerbotAI* ai) : CastSpellAction(ai, "fire nova") {}
+    };
+
+    class CastWindShearAction : public CastSpellAction {
+    public:
+        CastWindShearAction(PlayerbotAI* ai) : CastSpellAction(ai, "wind shear") {}
+    };
+
+	class CastAncestralSpiritAction : public ResurrectPartyMemberAction
+	{
+	public:
+		CastAncestralSpiritAction(PlayerbotAI* ai) : ResurrectPartyMemberAction(ai, "ancestral spirit") {}
+	};
+
+
+	class CastPurgeAction : public CastSpellAction
+	{
+	public:
+		CastPurgeAction(PlayerbotAI* ai) : CastSpellAction(ai, "purge") {}
+	};
+
+	class CastStormstrikeAction : public CastMeleeSpellAction {
+	public:
+		CastStormstrikeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "stormstrike") {}
+	};
+
+	class CastLavaLashAction : public CastMeleeSpellAction {
+	public:
+		CastLavaLashAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "lava lash") {}
+	};
+
+    class CastWaterBreathingAction : public CastBuffSpellAction {
+    public:
+        CastWaterBreathingAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "water breathing") {}
+    };
+
+    class CastWaterWalkingAction : public CastBuffSpellAction {
+    public:
+        CastWaterWalkingAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "water walking") {}
+    };
+
+    class CastWaterBreathingOnPartyAction : public BuffOnPartyAction {
+    public:
+        CastWaterBreathingOnPartyAction(PlayerbotAI* ai) : BuffOnPartyAction(ai, "water breathing") {}
+    };
+
+    class CastWaterWalkingOnPartyAction : public BuffOnPartyAction {
+    public:
+        CastWaterWalkingOnPartyAction(PlayerbotAI* ai) : BuffOnPartyAction(ai, "water walking") {}
+    };
+
+
+    class CastCleanseSpiritAction : public CastCureSpellAction {
+    public:
+        CastCleanseSpiritAction(PlayerbotAI* ai) : CastCureSpellAction(ai, "cleanse spirit") {}
+    };
+
+    class CastCleanseSpiritPoisonOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastCleanseSpiritPoisonOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "cleanse spirit", DISPEL_POISON) {}
+
+        virtual string getName() { return "cleanse spirit poison on party"; }
+    };
+    class CastCleanseSpiritCurseOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastCleanseSpiritCurseOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "cleanse spirit", DISPEL_CURSE) {}
+
+        virtual string getName() { return "cleanse spirit curse on party"; }
+    };
+    class CastCleanseSpiritDiseaseOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastCleanseSpiritDiseaseOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "cleanse spirit", DISPEL_DISEASE) {}
+
+        virtual string getName() { return "cleanse spirit disease on party"; }
+    };
+
+    class CastFlameShockAction : public CastDebuffSpellAction
+    {
+    public:
+        CastFlameShockAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "flame shock") {}
+    };
+
+    class CastEarthShockAction : public CastDebuffSpellAction
+    {
+    public:
+        CastEarthShockAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "earth shock") {}
+    };
+
+    class CastFrostShockAction : public CastDebuffSpellAction
+    {
+    public:
+        CastFrostShockAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "frost shock") {}
+    };
+
+    class CastChainLightningAction : public CastSpellAction
+    {
+    public:
+        CastChainLightningAction(PlayerbotAI* ai) : CastSpellAction(ai, "chain lightning") {}
+    };
+
+    class CastLightningBoltAction : public CastSpellAction
+    {
+    public:
+        CastLightningBoltAction(PlayerbotAI* ai) : CastSpellAction(ai, "lightning bolt") {}
+    };
+
+    class CastThunderstormAction : public CastMeleeSpellAction
+    {
+    public:
+        CastThunderstormAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "thunderstorm") {}
+    };
+
+    class CastHeroismAction : public CastBuffSpellAction
+    {
+    public:
+        CastHeroismAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "heroism") {}
+    };
+
+    class CastBloodlustAction : public CastBuffSpellAction
+    {
+    public:
+        CastBloodlustAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "bloodlust") {}
+    };
+
+    class CastWindShearOnEnemyHealerAction : public CastSpellOnEnemyHealerAction
+    {
+    public:
+        CastWindShearOnEnemyHealerAction(PlayerbotAI* ai) : CastSpellOnEnemyHealerAction(ai, "wind shear") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/shaman/ShamanAiObjectContext.cpp b/src/game/playerbot/strategy/shaman/ShamanAiObjectContext.cpp
new file mode 100644
index 00000000000..cbd8ec32527
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/ShamanAiObjectContext.cpp
@@ -0,0 +1,268 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ShamanActions.h"
+#include "ShamanAiObjectContext.h"
+#include "ShamanNonCombatStrategy.h"
+#include "HealShamanStrategy.h"
+#include "MeleeShamanStrategy.h"
+#include "ShamanTriggers.h"
+#include "../NamedObjectContext.h"
+#include "TotemsShamanStrategy.h"
+#include "CasterShamanStrategy.h"
+
+using namespace ai;
+
+
+
+namespace ai
+{
+    namespace shaman
+    {
+        using namespace ai;
+
+        class StrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            StrategyFactoryInternal()
+            {
+                creators["nc"] = &shaman::StrategyFactoryInternal::nc;
+                creators["totems"] = &shaman::StrategyFactoryInternal::totems;
+                creators["melee aoe"] = &shaman::StrategyFactoryInternal::melee_aoe;
+                creators["caster aoe"] = &shaman::StrategyFactoryInternal::caster_aoe;
+            }
+
+        private:
+            static Strategy* nc(PlayerbotAI* ai) { return new ShamanNonCombatStrategy(ai); }
+            static Strategy* totems(PlayerbotAI* ai) { return new TotemsShamanStrategy(ai); }
+            static Strategy* melee_aoe(PlayerbotAI* ai) { return new MeleeAoeShamanStrategy(ai); }
+            static Strategy* caster_aoe(PlayerbotAI* ai) { return new CasterAoeShamanStrategy(ai); }
+        };
+
+        class BuffStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            BuffStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["bmana"] = &shaman::BuffStrategyFactoryInternal::bmana;
+                creators["bdps"] = &shaman::BuffStrategyFactoryInternal::bdps;
+            }
+
+        private:
+            static Strategy* bmana(PlayerbotAI* ai) { return new ShamanBuffManaStrategy(ai); }
+            static Strategy* bdps(PlayerbotAI* ai) { return new ShamanBuffDpsStrategy(ai); }
+        };
+
+        class CombatStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            CombatStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["heal"] = &shaman::CombatStrategyFactoryInternal::heal;
+                creators["melee"] = &shaman::CombatStrategyFactoryInternal::dps;
+                creators["dps"] = &shaman::CombatStrategyFactoryInternal::dps;
+                creators["caster"] = &shaman::CombatStrategyFactoryInternal::caster;
+            }
+
+        private:
+            static Strategy* heal(PlayerbotAI* ai) { return new HealShamanStrategy(ai); }
+            static Strategy* dps(PlayerbotAI* ai) { return new MeleeShamanStrategy(ai); }
+            static Strategy* caster(PlayerbotAI* ai) { return new CasterShamanStrategy(ai); }
+        };
+    };
+};
+
+namespace ai
+{
+    namespace shaman
+    {
+        using namespace ai;
+
+        class TriggerFactoryInternal : public NamedObjectContext<Trigger>
+        {
+        public:
+            TriggerFactoryInternal()
+            {
+                creators["windfury totem"] = &TriggerFactoryInternal::windfury_totem;
+                creators["mana spring totem"] = &TriggerFactoryInternal::mana_spring_totem;
+                creators["flametongue totem"] = &TriggerFactoryInternal::flametongue_totem;
+                creators["strength of earth totem"] = &TriggerFactoryInternal::strength_of_earth_totem;
+                creators["magma totem"] = &TriggerFactoryInternal::magma_totem;
+                creators["searing totem"] = &TriggerFactoryInternal::searing_totem;
+                creators["wind shear"] = &TriggerFactoryInternal::wind_shear;
+                creators["purge"] = &TriggerFactoryInternal::purge;
+                creators["shaman weapon"] = &TriggerFactoryInternal::shaman_weapon;
+                creators["water shield"] = &TriggerFactoryInternal::water_shield;
+                creators["lightning shield"] = &TriggerFactoryInternal::lightning_shield;
+                creators["water breathing"] = &TriggerFactoryInternal::water_breathing;
+                creators["water walking"] = &TriggerFactoryInternal::water_walking;
+                creators["water breathing on party"] = &TriggerFactoryInternal::water_breathing_on_party;
+                creators["water walking on party"] = &TriggerFactoryInternal::water_walking_on_party;
+                creators["cleanse spirit poison"] = &TriggerFactoryInternal::cleanse_poison;
+                creators["cleanse spirit curse"] = &TriggerFactoryInternal::cleanse_curse;
+                creators["cleanse spirit disease"] = &TriggerFactoryInternal::cleanse_disease;
+                creators["party member cleanse spirit poison"] = &TriggerFactoryInternal::party_member_cleanse_poison;
+                creators["party member cleanse spirit curse"] = &TriggerFactoryInternal::party_member_cleanse_curse;
+                creators["party member cleanse spirit disease"] = &TriggerFactoryInternal::party_member_cleanse_disease;
+                creators["shock"] = &TriggerFactoryInternal::shock;
+                creators["frost shock snare"] = &TriggerFactoryInternal::frost_shock_snare;
+                creators["heroism"] = &TriggerFactoryInternal::heroism;
+                creators["bloodlust"] = &TriggerFactoryInternal::bloodlust;
+                creators["maelstrom weapon"] = &TriggerFactoryInternal::maelstrom_weapon;
+                creators["wind shear on enemy healer"] = &TriggerFactoryInternal::wind_shear_on_enemy_healer;
+            }
+
+        private:
+            static Trigger* maelstrom_weapon(PlayerbotAI* ai) { return new MaelstromWeaponTrigger(ai); }
+            static Trigger* heroism(PlayerbotAI* ai) { return new HeroismTrigger(ai); }
+            static Trigger* bloodlust(PlayerbotAI* ai) { return new BloodlustTrigger(ai); }
+            static Trigger* party_member_cleanse_disease(PlayerbotAI* ai) { return new PartyMemberCleanseSpiritDiseaseTrigger(ai); }
+            static Trigger* party_member_cleanse_curse(PlayerbotAI* ai) { return new PartyMemberCleanseSpiritCurseTrigger(ai); }
+            static Trigger* party_member_cleanse_poison(PlayerbotAI* ai) { return new PartyMemberCleanseSpiritPoisonTrigger(ai); }
+            static Trigger* cleanse_disease(PlayerbotAI* ai) { return new CleanseSpiritDiseaseTrigger(ai); }
+            static Trigger* cleanse_curse(PlayerbotAI* ai) { return new CleanseSpiritCurseTrigger(ai); }
+            static Trigger* cleanse_poison(PlayerbotAI* ai) { return new CleanseSpiritPoisonTrigger(ai); }
+            static Trigger* water_breathing(PlayerbotAI* ai) { return new WaterBreathingTrigger(ai); }
+            static Trigger* water_walking(PlayerbotAI* ai) { return new WaterWalkingTrigger(ai); }
+            static Trigger* water_breathing_on_party(PlayerbotAI* ai) { return new WaterBreathingOnPartyTrigger(ai); }
+            static Trigger* water_walking_on_party(PlayerbotAI* ai) { return new WaterWalkingOnPartyTrigger(ai); }
+            static Trigger* windfury_totem(PlayerbotAI* ai) { return new WindfuryTotemTrigger(ai); }
+            static Trigger* mana_spring_totem(PlayerbotAI* ai) { return new ManaSpringTotemTrigger(ai); }
+            static Trigger* flametongue_totem(PlayerbotAI* ai) { return new FlametongueTotemTrigger(ai); }
+            static Trigger* strength_of_earth_totem(PlayerbotAI* ai) { return new StrengthOfEarthTotemTrigger(ai); }
+            static Trigger* magma_totem(PlayerbotAI* ai) { return new MagmaTotemTrigger(ai); }
+            static Trigger* searing_totem(PlayerbotAI* ai) { return new SearingTotemTrigger(ai); }
+            static Trigger* wind_shear(PlayerbotAI* ai) { return new WindShearInterruptSpellTrigger(ai); }
+            static Trigger* purge(PlayerbotAI* ai) { return new PurgeTrigger(ai); }
+            static Trigger* shaman_weapon(PlayerbotAI* ai) { return new ShamanWeaponTrigger(ai); }
+            static Trigger* water_shield(PlayerbotAI* ai) { return new WaterShieldTrigger(ai); }
+            static Trigger* lightning_shield(PlayerbotAI* ai) { return new LightningShieldTrigger(ai); }
+            static Trigger* shock(PlayerbotAI* ai) { return new ShockTrigger(ai); }
+            static Trigger* frost_shock_snare(PlayerbotAI* ai) { return new FrostShockSnareTrigger(ai); }
+            static Trigger* wind_shear_on_enemy_healer(PlayerbotAI* ai) { return new WindShearInterruptEnemyHealerSpellTrigger(ai); }
+        };
+    };
+};
+
+
+namespace ai
+{
+    namespace shaman
+    {
+        using namespace ai;
+
+        class AiObjectContextInternal : public NamedObjectContext<Action>
+        {
+        public:
+            AiObjectContextInternal()
+            {
+                creators["water shield"] = &AiObjectContextInternal::water_shield;
+                creators["lightning shield"] = &AiObjectContextInternal::lightning_shield;
+                creators["strength of earth totem"] = &AiObjectContextInternal::strength_of_earth_totem;
+                creators["flametongue totem"] = &AiObjectContextInternal::flametongue_totem;
+                creators["searing totem"] = &AiObjectContextInternal::searing_totem;
+                creators["magma totem"] = &AiObjectContextInternal::magma_totem;
+                creators["windfury totem"] = &AiObjectContextInternal::windfury_totem;
+                creators["mana spring totem"] = &AiObjectContextInternal::mana_spring_totem;
+                creators["mana tide totem"] = &AiObjectContextInternal::mana_tide_totem;
+                creators["healing stream totem"] = &AiObjectContextInternal::healing_stream_totem;
+                creators["wind shear"] = &AiObjectContextInternal::wind_shear;
+                creators["wind shear on enemy healer"] = &AiObjectContextInternal::wind_shear_on_enemy_healer;
+                creators["rockbiter weapon"] = &AiObjectContextInternal::rockbiter_weapon;
+                creators["flametongue weapon"] = &AiObjectContextInternal::flametongue_weapon;
+                creators["frostbrand weapon"] = &AiObjectContextInternal::frostbrand_weapon;
+                creators["windfury weapon"] = &AiObjectContextInternal::windfury_weapon;
+                creators["earthliving weapon"] = &AiObjectContextInternal::earthliving_weapon;
+                creators["purge"] = &AiObjectContextInternal::purge;
+                creators["healing wave"] = &AiObjectContextInternal::healing_wave;
+                creators["lesser healing wave"] = &AiObjectContextInternal::lesser_healing_wave;
+                creators["healing wave on party"] = &AiObjectContextInternal::healing_wave_on_party;
+                creators["lesser healing wave on party"] = &AiObjectContextInternal::lesser_healing_wave_on_party;
+                creators["earth shield"] = &AiObjectContextInternal::earth_shield;
+                creators["earth shield on party"] = &AiObjectContextInternal::earth_shield_on_party;
+                creators["chain heal"] = &AiObjectContextInternal::chain_heal;
+                creators["riptide"] = &AiObjectContextInternal::riptide;
+                creators["riptide on party"] = &AiObjectContextInternal::riptide_on_party;
+                creators["stormstrike"] = &AiObjectContextInternal::stormstrike;
+                creators["lava lash"] = &AiObjectContextInternal::lava_lash;
+                creators["fire nova"] = &AiObjectContextInternal::fire_nova;
+                creators["ancestral spirit"] = &AiObjectContextInternal::ancestral_spirit;
+                creators["water walking"] = &AiObjectContextInternal::water_walking;
+                creators["water breathing"] = &AiObjectContextInternal::water_breathing;
+                creators["water walking on party"] = &AiObjectContextInternal::water_walking_on_party;
+                creators["water breathing on party"] = &AiObjectContextInternal::water_breathing_on_party;
+                creators["cleanse spirit"] = &AiObjectContextInternal::cleanse_spirit;
+                creators["cleanse spirit poison on party"] = &AiObjectContextInternal::cleanse_spirit_poison_on_party;
+                creators["cleanse spirit disease on party"] = &AiObjectContextInternal::cleanse_spirit_disease_on_party;
+                creators["cleanse spirit curse on party"] = &AiObjectContextInternal::cleanse_spirit_curse_on_party;
+                creators["flame shock"] = &AiObjectContextInternal::flame_shock;
+                creators["earth shock"] = &AiObjectContextInternal::earth_shock;
+                creators["frost shock"] = &AiObjectContextInternal::frost_shock;
+                creators["chain lightning"] = &AiObjectContextInternal::chain_lightning;
+                creators["lightning bolt"] = &AiObjectContextInternal::lightning_bolt;
+                creators["thunderstorm"] = &AiObjectContextInternal::thunderstorm;
+                creators["heroism"] = &AiObjectContextInternal::heroism;
+                creators["bloodlust"] = &AiObjectContextInternal::bloodlust;
+            }
+
+        private:
+            static Action* heroism(PlayerbotAI* ai) { return new CastHeroismAction(ai); }
+            static Action* bloodlust(PlayerbotAI* ai) { return new CastBloodlustAction(ai); }
+            static Action* thunderstorm(PlayerbotAI* ai) { return new CastThunderstormAction(ai); }
+            static Action* lightning_bolt(PlayerbotAI* ai) { return new CastLightningBoltAction(ai); }
+            static Action* chain_lightning(PlayerbotAI* ai) { return new CastChainLightningAction(ai); }
+            static Action* frost_shock(PlayerbotAI* ai) { return new CastFrostShockAction(ai); }
+            static Action* earth_shock(PlayerbotAI* ai) { return new CastEarthShockAction(ai); }
+            static Action* flame_shock(PlayerbotAI* ai) { return new CastFlameShockAction(ai); }
+            static Action* cleanse_spirit_poison_on_party(PlayerbotAI* ai) { return new CastCleanseSpiritPoisonOnPartyAction(ai); }
+            static Action* cleanse_spirit_disease_on_party(PlayerbotAI* ai) { return new CastCleanseSpiritDiseaseOnPartyAction(ai); }
+            static Action* cleanse_spirit_curse_on_party(PlayerbotAI* ai) { return new CastCleanseSpiritCurseOnPartyAction(ai); }
+            static Action* cleanse_spirit(PlayerbotAI* ai) { return new CastCleanseSpiritAction(ai); }
+            static Action* water_walking(PlayerbotAI* ai) { return new CastWaterWalkingAction(ai); }
+            static Action* water_breathing(PlayerbotAI* ai) { return new CastWaterBreathingAction(ai); }
+            static Action* water_walking_on_party(PlayerbotAI* ai) { return new CastWaterWalkingOnPartyAction(ai); }
+            static Action* water_breathing_on_party(PlayerbotAI* ai) { return new CastWaterBreathingOnPartyAction(ai); }
+            static Action* water_shield(PlayerbotAI* ai) { return new CastWaterShieldAction(ai); }
+            static Action* lightning_shield(PlayerbotAI* ai) { return new CastLightningShieldAction(ai); }
+            static Action* strength_of_earth_totem(PlayerbotAI* ai) { return new CastStrengthOfEarthTotemAction(ai); }
+            static Action* flametongue_totem(PlayerbotAI* ai) { return new CastFlametongueTotemAction(ai); }
+            static Action* magma_totem(PlayerbotAI* ai) { return new CastMagmaTotemAction(ai); }
+            static Action* searing_totem(PlayerbotAI* ai) { return new CastSearingTotemAction(ai); }
+            static Action* fire_nova(PlayerbotAI* ai) { return new CastFireNovaAction(ai); }
+            static Action* windfury_totem(PlayerbotAI* ai) { return new CastWindfuryTotemAction(ai); }
+            static Action* mana_spring_totem(PlayerbotAI* ai) { return new CastManaSpringTotemAction(ai); }
+            static Action* mana_tide_totem(PlayerbotAI* ai) { return new CastManaTideTotemAction(ai); }
+            static Action* healing_stream_totem(PlayerbotAI* ai) { return new CastHealingStreamTotemAction(ai); }
+            static Action* wind_shear(PlayerbotAI* ai) { return new CastWindShearAction(ai); }
+            static Action* rockbiter_weapon(PlayerbotAI* ai) { return new CastRockbiterWeaponAction(ai); }
+            static Action* flametongue_weapon(PlayerbotAI* ai) { return new CastFlametongueWeaponAction(ai); }
+            static Action* frostbrand_weapon(PlayerbotAI* ai) { return new CastFrostbrandWeaponAction(ai); }
+            static Action* windfury_weapon(PlayerbotAI* ai) { return new CastWindfuryWeaponAction(ai); }
+            static Action* earthliving_weapon(PlayerbotAI* ai) { return new CastEarthlivingWeaponAction(ai); }
+            static Action* purge(PlayerbotAI* ai) { return new CastPurgeAction(ai); }
+            static Action* healing_wave(PlayerbotAI* ai) { return new CastHealingWaveAction(ai); }
+            static Action* lesser_healing_wave(PlayerbotAI* ai) { return new CastLesserHealingWaveAction(ai); }
+            static Action* healing_wave_on_party(PlayerbotAI* ai) { return new CastHealingWaveOnPartyAction(ai); }
+            static Action* lesser_healing_wave_on_party(PlayerbotAI* ai) { return new CastLesserHealingWaveOnPartyAction(ai); }
+            static Action* earth_shield(PlayerbotAI* ai) { return new CastEarthShieldAction(ai); }
+            static Action* earth_shield_on_party(PlayerbotAI* ai) { return new CastEarthShieldOnPartyAction(ai); }
+            static Action* chain_heal(PlayerbotAI* ai) { return new CastChainHealAction(ai); }
+            static Action* riptide(PlayerbotAI* ai) { return new CastRiptideAction(ai); }
+            static Action* riptide_on_party(PlayerbotAI* ai) { return new CastRiptideOnPartyAction(ai); }
+            static Action* stormstrike(PlayerbotAI* ai) { return new CastStormstrikeAction(ai); }
+            static Action* lava_lash(PlayerbotAI* ai) { return new CastLavaLashAction(ai); }
+            static Action* ancestral_spirit(PlayerbotAI* ai) { return new CastAncestralSpiritAction(ai); }
+            static Action* wind_shear_on_enemy_healer(PlayerbotAI* ai) { return new CastWindShearOnEnemyHealerAction(ai); }
+        };
+    };
+};
+
+
+
+ShamanAiObjectContext::ShamanAiObjectContext(PlayerbotAI* ai) : AiObjectContext(ai)
+{
+    strategyContexts.Add(new ai::shaman::StrategyFactoryInternal());
+    strategyContexts.Add(new ai::shaman::CombatStrategyFactoryInternal());
+    strategyContexts.Add(new ai::shaman::BuffStrategyFactoryInternal());
+    actionContexts.Add(new ai::shaman::AiObjectContextInternal());
+    triggerContexts.Add(new ai::shaman::TriggerFactoryInternal());
+}
diff --git a/src/game/playerbot/strategy/shaman/ShamanAiObjectContext.h b/src/game/playerbot/strategy/shaman/ShamanAiObjectContext.h
new file mode 100644
index 00000000000..718084a6aad
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/ShamanAiObjectContext.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../AiObjectContext.h"
+
+namespace ai
+{
+    class ShamanAiObjectContext : public AiObjectContext
+    {
+    public:
+        ShamanAiObjectContext(PlayerbotAI* ai);
+    };
+}
diff --git a/src/game/playerbot/strategy/shaman/ShamanMultipliers.cpp b/src/game/playerbot/strategy/shaman/ShamanMultipliers.cpp
new file mode 100644
index 00000000000..6c72f20e295
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/ShamanMultipliers.cpp
@@ -0,0 +1,6 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ShamanMultipliers.h"
+#include "ShamanActions.h"
+
+using namespace ai;
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/shaman/ShamanMultipliers.h b/src/game/playerbot/strategy/shaman/ShamanMultipliers.h
new file mode 100644
index 00000000000..7cfbdd46e87
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/ShamanMultipliers.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace ai
+{
+   
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/shaman/ShamanNonCombatStrategy.cpp b/src/game/playerbot/strategy/shaman/ShamanNonCombatStrategy.cpp
new file mode 100644
index 00000000000..044c6bc401d
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/ShamanNonCombatStrategy.cpp
@@ -0,0 +1,49 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ShamanMultipliers.h"
+#include "ShamanNonCombatStrategy.h"
+
+using namespace ai;
+
+void ShamanNonCombatStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    NonCombatStrategy::InitTriggers(triggers);
+
+	triggers.push_back(new TriggerNode(
+		"party member dead",
+		NextAction::array(0, new NextAction("ancestral spirit", 33.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"water breathing",
+		NextAction::array(0, new NextAction("water breathing", 12.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"water walking",
+		NextAction::array(0, new NextAction("water walking", 12.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "water breathing on party",
+        NextAction::array(0, new NextAction("water breathing on party", 11.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "water walking on party",
+        NextAction::array(0, new NextAction("water walking on party", 11.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("healing wave", 70.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member critical health",
+        NextAction::array(0, new NextAction("healing wave on party", 60.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe heal",
+        NextAction::array(0, new NextAction("chain heal", 27.0f), NULL)));
+}
+
+void ShamanNonCombatStrategy::InitMultipliers(std::list<Multiplier*> &multipliers)
+{
+    NonCombatStrategy::InitMultipliers(multipliers);
+}
+
diff --git a/src/game/playerbot/strategy/shaman/ShamanNonCombatStrategy.h b/src/game/playerbot/strategy/shaman/ShamanNonCombatStrategy.h
new file mode 100644
index 00000000000..a6859ee7110
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/ShamanNonCombatStrategy.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../Strategy.h"
+#include "../generic/NonCombatStrategy.h"
+
+namespace ai
+{
+    class ShamanNonCombatStrategy : public NonCombatStrategy
+    {
+    public:
+        ShamanNonCombatStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual void InitMultipliers(std::list<Multiplier*> &multipliers);
+        virtual string getName() { return "nc"; }
+
+    };
+}
diff --git a/src/game/playerbot/strategy/shaman/ShamanTriggers.cpp b/src/game/playerbot/strategy/shaman/ShamanTriggers.cpp
new file mode 100644
index 00000000000..2a6c51e9792
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/ShamanTriggers.cpp
@@ -0,0 +1,38 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ShamanTriggers.h"
+#include "ShamanActions.h"
+
+using namespace ai;
+
+list<string> ShamanWeaponTrigger::spells;
+
+bool ShamanWeaponTrigger::IsActive()
+{
+    if (spells.empty())
+    {
+        spells.push_back("frostbrand weapon");
+        spells.push_back("rockbiter weapon");
+        spells.push_back("flametongue weapon");
+        spells.push_back("earthliving weapon");
+        spells.push_back("windfury weapon");
+    }
+
+    for (list<string>::iterator i = spells.begin(); i != spells.end(); ++i)
+    {
+        uint32 spellId = AI_VALUE2(uint32, "spell id", spell);
+        if (!spellId)
+            continue;
+
+        if (AI_VALUE2(Item*, "item for spell", spellId))
+            return true;
+    }
+
+    return false;
+}
+
+bool ShockTrigger::IsActive()
+{
+    return SpellTrigger::IsActive()
+            && !ai->HasAnyAuraOf(GetTarget(), "frost shock", "earth shock", "flame shock", NULL);
+}
diff --git a/src/game/playerbot/strategy/shaman/ShamanTriggers.h b/src/game/playerbot/strategy/shaman/ShamanTriggers.h
new file mode 100644
index 00000000000..afa6d62f23c
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/ShamanTriggers.h
@@ -0,0 +1,197 @@
+#pragma once
+#include "../triggers/GenericTriggers.h"
+
+namespace ai
+{
+    class ShamanWeaponTrigger : public BuffTrigger {
+    public:
+        ShamanWeaponTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "rockbiter weapon") {}
+        virtual bool IsActive();
+    private:
+        static list<string> spells;
+    };
+
+    class TotemTrigger : public Trigger {
+    public:
+        TotemTrigger(PlayerbotAI* ai, string spell, int attackerCount = 0) : Trigger(ai, spell), attackerCount(attackerCount) {}
+
+        virtual bool IsActive()
+		{
+            return AI_VALUE(uint8, "attacker count") >= attackerCount && !AI_VALUE2(bool, "has totem", name);
+        }
+
+    protected:
+        int attackerCount;
+    };
+
+    class WindfuryTotemTrigger : public TotemTrigger {
+    public:
+        WindfuryTotemTrigger(PlayerbotAI* ai) : TotemTrigger(ai, "windfury totem") {}
+    };
+
+    class ManaSpringTotemTrigger : public TotemTrigger {
+    public:
+        ManaSpringTotemTrigger(PlayerbotAI* ai) : TotemTrigger(ai, "mana spring totem") {}
+        virtual bool IsActive()
+        {
+            return AI_VALUE(uint8, "attacker count") >= attackerCount &&
+                    !AI_VALUE2(bool, "has totem", "mana tide totem") &&
+                    !AI_VALUE2(bool, "has totem", name);
+        }
+    };
+
+    class FlametongueTotemTrigger : public TotemTrigger {
+    public:
+        FlametongueTotemTrigger(PlayerbotAI* ai) : TotemTrigger(ai, "flametongue totem") {}
+    };
+
+    class StrengthOfEarthTotemTrigger : public TotemTrigger {
+    public:
+        StrengthOfEarthTotemTrigger(PlayerbotAI* ai) : TotemTrigger(ai, "strength of earth totem") {}
+    };
+
+    class MagmaTotemTrigger : public TotemTrigger {
+    public:
+        MagmaTotemTrigger(PlayerbotAI* ai) : TotemTrigger(ai, "magma totem", 3) {}
+    };
+
+    class SearingTotemTrigger : public TotemTrigger {
+    public:
+        SearingTotemTrigger(PlayerbotAI* ai) : TotemTrigger(ai, "searing totem", 1) {}
+    };
+
+    class WindShearInterruptSpellTrigger : public InterruptSpellTrigger
+    {
+    public:
+        WindShearInterruptSpellTrigger(PlayerbotAI* ai) : InterruptSpellTrigger(ai, "wind shear") {}
+    };
+
+    class WaterShieldTrigger : public BuffTrigger
+    {
+    public:
+        WaterShieldTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "water shield") {}
+    };
+
+    class LightningShieldTrigger : public BuffTrigger
+    {
+    public:
+        LightningShieldTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "lightning shield") {}
+    };
+
+    class PurgeTrigger : public TargetAuraDispelTrigger
+    {
+    public:
+        PurgeTrigger(PlayerbotAI* ai) : TargetAuraDispelTrigger(ai, "purge", DISPEL_MAGIC) {}
+    };
+
+    class WaterWalkingTrigger : public BuffTrigger {
+    public:
+        WaterWalkingTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "water walking") {}
+
+        virtual bool IsActive()
+        {
+            return BuffTrigger::IsActive() && AI_VALUE2(bool, "swimming", "self target");
+        }
+    };
+
+    class WaterBreathingTrigger : public BuffTrigger {
+    public:
+        WaterBreathingTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "water breathing") {}
+
+        virtual bool IsActive()
+        {
+            return BuffTrigger::IsActive() && AI_VALUE2(bool, "swimming", "self target");
+        }
+    };
+
+    class WaterWalkingOnPartyTrigger : public BuffOnPartyTrigger {
+    public:
+        WaterWalkingOnPartyTrigger(PlayerbotAI* ai) : BuffOnPartyTrigger(ai, "water walking on party") {}
+
+        virtual bool IsActive()
+        {
+            return BuffOnPartyTrigger::IsActive() && AI_VALUE2(bool, "swimming", "self target");
+        }
+    };
+
+    class WaterBreathingOnPartyTrigger : public BuffOnPartyTrigger {
+    public:
+        WaterBreathingOnPartyTrigger(PlayerbotAI* ai) : BuffOnPartyTrigger(ai, "water breathing on party") {}
+
+        virtual bool IsActive()
+        {
+            return BuffOnPartyTrigger::IsActive() && AI_VALUE2(bool, "swimming", "self target");
+        }
+    };
+
+    class CleanseSpiritPoisonTrigger : public NeedCureTrigger
+    {
+    public:
+        CleanseSpiritPoisonTrigger(PlayerbotAI* ai) : NeedCureTrigger(ai, "cleanse spirit", DISPEL_POISON) {}
+    };
+
+    class PartyMemberCleanseSpiritPoisonTrigger : public PartyMemberNeedCureTrigger
+    {
+    public:
+        PartyMemberCleanseSpiritPoisonTrigger(PlayerbotAI* ai) : PartyMemberNeedCureTrigger(ai, "cleanse spirit", DISPEL_POISON) {}
+    };
+
+    class CleanseSpiritCurseTrigger : public NeedCureTrigger
+    {
+    public:
+        CleanseSpiritCurseTrigger(PlayerbotAI* ai) : NeedCureTrigger(ai, "cleanse spirit", DISPEL_CURSE) {}
+    };
+
+    class PartyMemberCleanseSpiritCurseTrigger : public PartyMemberNeedCureTrigger
+    {
+    public:
+        PartyMemberCleanseSpiritCurseTrigger(PlayerbotAI* ai) : PartyMemberNeedCureTrigger(ai, "cleanse spirit", DISPEL_CURSE) {}
+    };
+
+    class CleanseSpiritDiseaseTrigger : public NeedCureTrigger
+    {
+    public:
+        CleanseSpiritDiseaseTrigger(PlayerbotAI* ai) : NeedCureTrigger(ai, "cleanse spirit", DISPEL_DISEASE) {}
+    };
+
+    class PartyMemberCleanseSpiritDiseaseTrigger : public PartyMemberNeedCureTrigger
+    {
+    public:
+        PartyMemberCleanseSpiritDiseaseTrigger(PlayerbotAI* ai) : PartyMemberNeedCureTrigger(ai, "cleanse spirit", DISPEL_DISEASE) {}
+    };
+
+    class ShockTrigger : public DebuffTrigger {
+    public:
+        ShockTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "earth shock") {}
+        virtual bool IsActive();
+    };
+
+    class FrostShockSnareTrigger : public SnareTargetTrigger {
+    public:
+        FrostShockSnareTrigger(PlayerbotAI* ai) : SnareTargetTrigger(ai, "frost shock") {}
+    };
+
+    class HeroismTrigger : public BoostTrigger
+    {
+    public:
+        HeroismTrigger(PlayerbotAI* ai) : BoostTrigger(ai, "heroism") {}
+    };
+
+    class BloodlustTrigger : public BoostTrigger
+    {
+    public:
+        BloodlustTrigger(PlayerbotAI* ai) : BoostTrigger(ai, "bloodlust") {}
+    };
+
+    class MaelstromWeaponTrigger : public HasAuraTrigger
+    {
+    public:
+        MaelstromWeaponTrigger(PlayerbotAI* ai) : HasAuraTrigger(ai, "maelstrom weapon") {}
+    };
+
+    class WindShearInterruptEnemyHealerSpellTrigger : public InterruptEnemyHealerTrigger
+    {
+    public:
+        WindShearInterruptEnemyHealerSpellTrigger(PlayerbotAI* ai) : InterruptEnemyHealerTrigger(ai, "wind shear") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/shaman/TotemsShamanStrategy.cpp b/src/game/playerbot/strategy/shaman/TotemsShamanStrategy.cpp
new file mode 100644
index 00000000000..e23c97d6a55
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/TotemsShamanStrategy.cpp
@@ -0,0 +1,31 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ShamanMultipliers.h"
+#include "TotemsShamanStrategy.h"
+
+using namespace ai;
+
+TotemsShamanStrategy::TotemsShamanStrategy(PlayerbotAI* ai) : GenericShamanStrategy(ai)
+{
+}
+
+void TotemsShamanStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericShamanStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "windfury totem",
+        NextAction::array(0, new NextAction("windfury totem", 16.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "mana spring totem",
+        NextAction::array(0, new NextAction("mana spring totem", 19.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "strength of earth totem",
+        NextAction::array(0, new NextAction("strength of earth totem", 18.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "flametongue totem",
+        NextAction::array(0, new NextAction("flametongue totem", 17.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/shaman/TotemsShamanStrategy.h b/src/game/playerbot/strategy/shaman/TotemsShamanStrategy.h
new file mode 100644
index 00000000000..978fa2600db
--- /dev/null
+++ b/src/game/playerbot/strategy/shaman/TotemsShamanStrategy.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "GenericShamanStrategy.h"
+
+namespace ai
+{
+    class TotemsShamanStrategy : public GenericShamanStrategy
+    {
+    public:
+        TotemsShamanStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "totems"; }
+		virtual int GetType() { return STRATEGY_TYPE_HEAL; }
+    };
+}
diff --git a/src/game/playerbot/strategy/triggers/ChatCommandTrigger.h b/src/game/playerbot/strategy/triggers/ChatCommandTrigger.h
new file mode 100644
index 00000000000..0e43d16e463
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/ChatCommandTrigger.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "../Trigger.h"
+
+namespace ai
+{
+    class ChatCommandTrigger : public Trigger {
+    public:
+        ChatCommandTrigger(PlayerbotAI* ai, string command) : Trigger(ai, command), triggered(false) {}
+
+        virtual void ExternalEvent(string param, Player* owner = NULL)
+        {
+            this->param = param;
+            this->owner = owner;
+            triggered = true;
+        }
+
+        virtual Event Check()
+        {
+            if (!triggered)
+                return Event();
+
+            return Event(getName(), param, owner);
+        }
+
+        virtual void Reset()
+        {
+            triggered = false;
+        }
+
+   private:
+        string param;
+        bool triggered;
+        Player* owner;
+    };
+}
diff --git a/src/game/playerbot/strategy/triggers/ChatTriggerContext.h b/src/game/playerbot/strategy/triggers/ChatTriggerContext.h
new file mode 100644
index 00000000000..4ce17026315
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/ChatTriggerContext.h
@@ -0,0 +1,140 @@
+#pragma once;
+
+#include "ChatCommandTrigger.h"
+
+namespace ai
+{
+    class ChatTriggerContext : public NamedObjectContext<Trigger>
+    {
+    public:
+        ChatTriggerContext()
+        {
+            creators["quests"] = &ChatTriggerContext::quests;
+            creators["stats"] = &ChatTriggerContext::stats;
+            creators["leave"] = &ChatTriggerContext::leave;
+            creators["rep"] = &ChatTriggerContext::reputation;
+            creators["reputation"] = &ChatTriggerContext::reputation;
+            creators["log"] = &ChatTriggerContext::log;
+            creators["los"] = &ChatTriggerContext::los;
+            creators["drop"] = &ChatTriggerContext::drop;
+            creators["q"] = &ChatTriggerContext::q;
+            creators["ll"] = &ChatTriggerContext::ll;
+            creators["loot all"] = &ChatTriggerContext::loot_all;
+            creators["add all loot"] = &ChatTriggerContext::loot_all;
+            creators["release"] = &ChatTriggerContext::release;
+            creators["teleport"] = &ChatTriggerContext::teleport;
+            creators["taxi"] = &ChatTriggerContext::taxi;
+            creators["repair"] = &ChatTriggerContext::repair;
+            creators["u"] = &ChatTriggerContext::use;
+            creators["use"] = &ChatTriggerContext::use;
+            creators["c"] = &ChatTriggerContext::item_count;
+            creators["e"] = &ChatTriggerContext::equip;
+            creators["ue"] = &ChatTriggerContext::uneqip;
+            creators["s"] = &ChatTriggerContext::sell;
+            creators["b"] = &ChatTriggerContext::buy;
+            creators["r"] = &ChatTriggerContext::reward;
+            creators["t"] = &ChatTriggerContext::trade;
+            creators["nt"] = &ChatTriggerContext::nontrade;
+            creators["talents"] = &ChatTriggerContext::talents;
+            creators["spells"] = &ChatTriggerContext::spells;
+            creators["co"] = &ChatTriggerContext::co;
+            creators["nc"] = &ChatTriggerContext::nc;
+            creators["dead"] = &ChatTriggerContext::dead;
+            creators["trainer"] = &ChatTriggerContext::trainer;
+            creators["attack"] = &ChatTriggerContext::attack;
+            creators["chat"] = &ChatTriggerContext::chat;
+            creators["accept"] = &ChatTriggerContext::accept;
+            creators["home"] = &ChatTriggerContext::home;
+            creators["reset ai"] = &ChatTriggerContext::reset_ai;
+            creators["destroy"] = &ChatTriggerContext::destroy;
+            creators["emote"] = &ChatTriggerContext::emote;
+            creators["buff"] = &ChatTriggerContext::buff;
+            creators["help"] = &ChatTriggerContext::help;
+            creators["gb"] = &ChatTriggerContext::gb;
+            creators["bank"] = &ChatTriggerContext::bank;
+            creators["follow"] = &ChatTriggerContext::follow;
+            creators["stay"] = &ChatTriggerContext::stay;
+            creators["flee"] = &ChatTriggerContext::flee;
+            creators["grind"] = &ChatTriggerContext::grind;
+            creators["tank attack"] = &ChatTriggerContext::tank_attack;
+            creators["talk"] = &ChatTriggerContext::talk;
+            creators["cast"] = &ChatTriggerContext::talk;
+            creators["invite"] = &ChatTriggerContext::invite;
+            creators["spell"] = &ChatTriggerContext::spell;
+            creators["rti"] = &ChatTriggerContext::rti;
+            creators["revive"] = &ChatTriggerContext::revive;
+            creators["runaway"] = &ChatTriggerContext::runaway;
+            creators["warning"] = &ChatTriggerContext::warning;
+            creators["position"] = &ChatTriggerContext::position;
+            creators["summon"] = &ChatTriggerContext::summon;
+            creators["who"] = &ChatTriggerContext::who;
+            creators["save mana"] = &ChatTriggerContext::save_mana;
+            creators["max dps"] = &ChatTriggerContext::max_dps;
+            creators["attackers"] = &ChatTriggerContext::attackers;
+            creators["formation"] = &ChatTriggerContext::formation;
+        }
+
+    private:
+        static Trigger* formation(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "formation"); }
+        static Trigger* attackers(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "attackers"); }
+        static Trigger* max_dps(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "max dps"); }
+        static Trigger* save_mana(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "save mana"); }
+        static Trigger* who(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "who"); }
+        static Trigger* summon(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "summon"); }
+        static Trigger* position(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "position"); }
+        static Trigger* runaway(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "runaway"); }
+        static Trigger* warning(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "warning"); }
+        static Trigger* revive(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "revive"); }
+        static Trigger* rti(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "rti"); }
+        static Trigger* invite(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "invite"); }
+        static Trigger* cast(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "cast"); }
+        static Trigger* talk(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "talk"); }
+        static Trigger* flee(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "flee"); }
+        static Trigger* grind(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "grind"); }
+        static Trigger* tank_attack(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "tank attack"); }
+        static Trigger* stay(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "stay"); }
+        static Trigger* follow(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "follow"); }
+        static Trigger* gb(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "gb"); }
+        static Trigger* bank(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "bank"); }
+        static Trigger* help(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "help"); }
+        static Trigger* buff(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "buff"); }
+        static Trigger* emote(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "emote"); }
+        static Trigger* destroy(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "destroy"); }
+        static Trigger* home(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "home"); }
+        static Trigger* accept(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "accept"); }
+        static Trigger* chat(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "chat"); }
+        static Trigger* attack(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "attack"); }
+        static Trigger* trainer(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "trainer"); }
+        static Trigger* co(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "co"); }
+        static Trigger* nc(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "nc"); }
+        static Trigger* dead(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "dead"); }
+        static Trigger* spells(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "spells"); }
+        static Trigger* talents(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "talents"); }
+        static Trigger* equip(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "e"); }
+        static Trigger* uneqip(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "ue"); }
+        static Trigger* sell(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "s"); }
+        static Trigger* buy(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "b"); }
+        static Trigger* reward(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "r"); }
+        static Trigger* trade(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "t"); }
+        static Trigger* nontrade(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "nt"); }
+
+        static Trigger* item_count(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "c"); }
+        static Trigger* use(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "use"); }
+        static Trigger* repair(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "repair"); }
+        static Trigger* taxi(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "taxi"); }
+        static Trigger* teleport(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "teleport"); }
+        static Trigger* q(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "q"); }
+        static Trigger* ll(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "ll"); }
+        static Trigger* drop(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "drop"); }
+        static Trigger* quests(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "quests"); }
+        static Trigger* stats(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "stats"); }
+        static Trigger* leave(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "leave"); }
+        static Trigger* reputation(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "reputation"); }
+        static Trigger* log(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "log"); }
+        static Trigger* los(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "los"); }
+        static Trigger* loot_all(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "add all loot"); }
+        static Trigger* release(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "release"); }
+        static Trigger* reset_ai(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "reset ai"); }
+        static Trigger* spell(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "spell"); }
+    };
+};
diff --git a/src/game/playerbot/strategy/triggers/CureTriggers.cpp b/src/game/playerbot/strategy/triggers/CureTriggers.cpp
new file mode 100644
index 00000000000..0be6ff6b443
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/CureTriggers.cpp
@@ -0,0 +1,17 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GenericTriggers.h"
+#include "CureTriggers.h"
+
+using namespace ai;
+
+bool NeedCureTrigger::IsActive() 
+{
+	Unit* target = GetTarget();
+	return target && ai->HasAuraToDispel(target, dispelType);
+}
+
+Value<Unit*>* PartyMemberNeedCureTrigger::GetTargetValue()
+{
+	return context->GetValue<Unit*>("party member to dispel", dispelType);
+}
diff --git a/src/game/playerbot/strategy/triggers/CureTriggers.h b/src/game/playerbot/strategy/triggers/CureTriggers.h
new file mode 100644
index 00000000000..2321953fa65
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/CureTriggers.h
@@ -0,0 +1,35 @@
+#pragma once
+#include "../Trigger.h"
+
+namespace ai
+{
+	class SpellTrigger;
+
+    class NeedCureTrigger : public SpellTrigger {
+    public:
+        NeedCureTrigger(PlayerbotAI* ai, string spell, uint32 dispelType) : SpellTrigger(ai, spell) 
+  	    {
+			this->dispelType = dispelType;
+        }
+        virtual string GetTargetName() { return "self target"; }
+        virtual bool IsActive();
+
+    protected:
+        uint32 dispelType;
+    };
+
+    class TargetAuraDispelTrigger : public NeedCureTrigger {
+    public:
+        TargetAuraDispelTrigger(PlayerbotAI* ai, string spell, uint32 dispelType) : 
+			NeedCureTrigger(ai, spell, dispelType) {}
+		virtual string GetTargetName() { return "current target"; }
+    };
+
+    class PartyMemberNeedCureTrigger : public NeedCureTrigger {
+    public:
+        PartyMemberNeedCureTrigger(PlayerbotAI* ai, string spell, uint32 dispelType) : 
+            NeedCureTrigger(ai, spell, dispelType) {}
+
+		virtual Value<Unit*>* GetTargetValue();
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/triggers/GenericTriggers.cpp b/src/game/playerbot/strategy/triggers/GenericTriggers.cpp
new file mode 100644
index 00000000000..e66fdb46282
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/GenericTriggers.cpp
@@ -0,0 +1,242 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GenericTriggers.h"
+#include "../../LootObjectStack.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+bool LowManaTrigger::IsActive()
+{
+    return AI_VALUE2(bool, "has mana", "self target") && AI_VALUE2(uint8, "mana", "self target") < sPlayerbotAIConfig.lowMana;
+}
+
+bool MediumManaTrigger::IsActive()
+{
+    return AI_VALUE2(bool, "has mana", "self target") && AI_VALUE2(uint8, "mana", "self target") < sPlayerbotAIConfig.mediumMana;
+}
+
+
+bool RageAvailable::IsActive()
+{
+    return AI_VALUE2(uint8, "rage", "self target") >= amount;
+}
+
+bool EnergyAvailable::IsActive()
+{
+	return AI_VALUE2(uint8, "energy", "self target") >= amount;
+}
+
+bool ComboPointsAvailableTrigger::IsActive()
+{
+    return AI_VALUE2(uint8, "combo", "current target") >= amount;
+}
+
+bool LoseAggroTrigger::IsActive()
+{
+    return !AI_VALUE2(bool, "has aggro", "current target");
+}
+
+bool HasAggroTrigger::IsActive()
+{
+    return AI_VALUE2(bool, "has aggro", "current target");
+}
+
+bool PanicTrigger::IsActive()
+{
+    return AI_VALUE2(uint8, "health", "self target") < sPlayerbotAIConfig.criticalHealth &&
+		(!AI_VALUE2(bool, "has mana", "self target") || AI_VALUE2(uint8, "mana", "self target") < sPlayerbotAIConfig.lowMana);
+}
+
+bool BuffTrigger::IsActive()
+{
+    Unit* target = GetTarget();
+	return SpellTrigger::IsActive() &&
+		!ai->HasAura(spell, target) &&
+		(!AI_VALUE2(bool, "has mana", "self target") || AI_VALUE2(uint8, "mana", "self target") > sPlayerbotAIConfig.lowMana);
+}
+
+Value<Unit*>* BuffOnPartyTrigger::GetTargetValue()
+{
+	return context->GetValue<Unit*>("party member without aura", spell);
+}
+
+Value<Unit*>* DebuffOnAttackerTrigger::GetTargetValue()
+{
+	return context->GetValue<Unit*>("attacker without aura", spell);
+}
+
+bool NoAttackersTrigger::IsActive()
+{
+    return !AI_VALUE(Unit*, "current target") && AI_VALUE(uint8, "attacker count") > 0;
+}
+
+bool InvalidTargetTrigger::IsActive()
+{
+    return AI_VALUE2(bool, "invalid target", "current target");
+}
+
+bool NoTargetTrigger::IsActive()
+{
+	return !AI_VALUE(Unit*, "current target");
+}
+
+bool MyAttackerCountTrigger::IsActive()
+{
+    return AI_VALUE(uint8, "my attacker count") >= amount;
+}
+
+bool AoeTrigger::IsActive()
+{
+    return AI_VALUE(uint8, "attacker count") >= amount;
+}
+
+bool DebuffTrigger::IsActive()
+{
+	return BuffTrigger::IsActive() && AI_VALUE2(uint8, "health", "current target") > 25;
+}
+
+bool SpellTrigger::IsActive()
+{
+	return GetTarget();
+}
+
+bool SpellCanBeCastTrigger::IsActive()
+{
+	Unit* target = GetTarget();
+	return target && ai->CanCastSpell(spell, target);
+}
+
+bool RandomTrigger::IsActive()
+{
+    int vl  = rand() % (int)(1 + probability * 10 / sPlayerbotAIConfig.randomChangeMultiplier);
+    return vl == 0;
+}
+
+bool AndTrigger::IsActive()
+{
+    return ls->IsActive() && rs->IsActive();
+}
+
+string AndTrigger::getName()
+{
+    std::string name(ls->getName());
+    name = name + " and ";
+    name = name + rs->getName();
+    return name;
+}
+
+bool BoostTrigger::IsActive()
+{
+	return BuffTrigger::IsActive() && AI_VALUE(uint8, "balance") <= balance;
+}
+
+bool SnareTargetTrigger::IsActive()
+{
+	Unit* target = GetTarget();
+	return DebuffTrigger::IsActive() && AI_VALUE2(bool, "moving", "current target") && !ai->HasAura(spell, target);
+}
+
+bool ItemCountTrigger::IsActive()
+{
+	return AI_VALUE2(uint8, "item count", item) < count;
+}
+
+bool InterruptSpellTrigger::IsActive()
+{
+	return SpellTrigger::IsActive() && ai->IsInterruptableSpellCasting(GetTarget(), getName());
+}
+
+bool HasAuraTrigger::IsActive()
+{
+	return ai->HasAura(getName(), GetTarget());
+}
+
+bool TankAoeTrigger::IsActive()
+{
+    if (!AI_VALUE(uint8, "attacker count"))
+        return false;
+
+    Unit* currentTarget = AI_VALUE(Unit*, "current target");
+    if (!currentTarget)
+        return true;
+
+    Unit* tankTarget = AI_VALUE(Unit*, "tank target");
+    if (!tankTarget || currentTarget == tankTarget)
+        return false;
+
+    return currentTarget->getVictim() == AI_VALUE(Unit*, "self target");
+}
+
+bool IsBehindTargetTrigger::IsActive()
+{
+    Unit* target = AI_VALUE(Unit*, "current target");
+    return target && AI_VALUE2(bool, "behind", "current target");
+}
+
+bool IsNotFacingTargetTrigger::IsActive()
+{
+    return !AI_VALUE2(bool, "facing", "current target");
+}
+
+bool HasCcTargetTrigger::IsActive()
+{
+    return AI_VALUE(uint8, "attacker count") > 2 && AI_VALUE2(Unit*, "cc target", getName()) &&
+        !AI_VALUE2(Unit*, "current cc target", getName());
+}
+
+bool NoMovementTrigger::IsActive()
+{
+	return !AI_VALUE2(bool, "moving", "self target");
+}
+
+bool NoPossibleTargetsTrigger::IsActive()
+{
+    list<ObjectGuid> targets = AI_VALUE(list<ObjectGuid>, "possible targets");
+    return !targets.size();
+}
+
+bool NotLeastHpTargetActiveTrigger::IsActive()
+{
+    Unit* leastHp = AI_VALUE(Unit*, "least hp target");
+    Unit* target = AI_VALUE(Unit*, "current target");
+    return leastHp && target != leastHp;
+}
+
+bool EnemyPlayerIsAttacking::IsActive()
+{
+    Unit* enemyPlayer = AI_VALUE(Unit*, "enemy player target");
+    Unit* target = AI_VALUE(Unit*, "current target");
+    return enemyPlayer && target != enemyPlayer;
+}
+
+bool IsSwimmingTrigger::IsActive()
+{
+    return AI_VALUE2(bool, "swimming", "self target");
+}
+
+bool HasNearestAddsTrigger::IsActive()
+{
+    list<ObjectGuid> targets = AI_VALUE(list<ObjectGuid>, "nearest adds");
+    return targets.size();
+}
+
+bool HasItemForSpellTrigger::IsActive()
+{
+	string spell = getName();
+    uint32 spellId = AI_VALUE2(uint32, "spell id", spell);
+    return spellId && AI_VALUE2(Item*, "item for spell", spellId);
+}
+
+
+bool TargetChangedTrigger::IsActive()
+{
+    Unit* oldTarget = context->GetValue<Unit*>("old target")->Get();
+    Unit* target = context->GetValue<Unit*>("current target")->Get();
+    return target && oldTarget != target;
+}
+
+Value<Unit*>* InterruptEnemyHealerTrigger::GetTargetValue()
+{
+    return context->GetValue<Unit*>("enemy healer target", spell);
+}
diff --git a/src/game/playerbot/strategy/triggers/GenericTriggers.h b/src/game/playerbot/strategy/triggers/GenericTriggers.h
new file mode 100644
index 00000000000..f176429ec74
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/GenericTriggers.h
@@ -0,0 +1,540 @@
+#pragma once
+#include "../Trigger.h"
+#include "../../PlayerbotAIConfig.h"
+
+#define BUFF_TRIGGER(clazz, spell, action) \
+    class clazz : public BuffTrigger \
+    { \
+    public: \
+        clazz(PlayerbotAI* ai) : BuffTrigger(ai, spell) {} \
+    };
+
+#define BUFF_ON_PARTY_TRIGGER(clazz, spell, action) \
+    class clazz : public BuffOnPartyTrigger \
+    { \
+    public: \
+        clazz(PlayerbotAI* ai) : BuffOnPartyTrigger(ai, spell) {}  \
+    };
+
+#define DEBUFF_TRIGGER(clazz, spell, action) \
+    class clazz : public DebuffTrigger \
+    { \
+    public: \
+        clazz(PlayerbotAI* ai) : DebuffTrigger(ai, spell) {} \
+    };
+
+namespace ai
+{
+	class StatAvailable : public Trigger
+	{
+	public:
+		StatAvailable(PlayerbotAI* ai, int amount, string name = "stat available") : Trigger(ai, name)
+		{
+			this->amount = amount;
+		}
+
+	protected:
+		int amount;
+	};
+
+	class RageAvailable : public StatAvailable
+    {
+    public:
+        RageAvailable(PlayerbotAI* ai, int amount) : StatAvailable(ai, amount, "rage available") {}
+        virtual bool IsActive();
+    };
+
+    class LightRageAvailableTrigger : public RageAvailable
+    {
+    public:
+        LightRageAvailableTrigger(PlayerbotAI* ai) : RageAvailable(ai, 20) {}
+    };
+
+    class MediumRageAvailableTrigger : public RageAvailable
+    {
+    public:
+        MediumRageAvailableTrigger(PlayerbotAI* ai) : RageAvailable(ai, 40) {}
+    };
+
+    class HighRageAvailableTrigger : public RageAvailable
+    {
+    public:
+        HighRageAvailableTrigger(PlayerbotAI* ai) : RageAvailable(ai, 60) {}
+    };
+
+	class EnergyAvailable : public StatAvailable
+	{
+	public:
+		EnergyAvailable(PlayerbotAI* ai, int amount) : StatAvailable(ai, amount, "energy available") {}
+		virtual bool IsActive();
+	};
+
+    class LightEnergyAvailableTrigger : public EnergyAvailable
+    {
+    public:
+        LightEnergyAvailableTrigger(PlayerbotAI* ai) : EnergyAvailable(ai, 20) {}
+    };
+
+    class MediumEnergyAvailableTrigger : public EnergyAvailable
+    {
+    public:
+        MediumEnergyAvailableTrigger(PlayerbotAI* ai) : EnergyAvailable(ai, 40) {}
+    };
+
+    class HighEnergyAvailableTrigger : public EnergyAvailable
+    {
+    public:
+        HighEnergyAvailableTrigger(PlayerbotAI* ai) : EnergyAvailable(ai, 60) {}
+    };
+
+	class ComboPointsAvailableTrigger : public StatAvailable
+	{
+	public:
+	    ComboPointsAvailableTrigger(PlayerbotAI* ai, int amount = 5) : StatAvailable(ai, amount, "combo points available") {}
+		virtual bool IsActive();
+	};
+
+	class LoseAggroTrigger : public Trigger {
+	public:
+		LoseAggroTrigger(PlayerbotAI* ai) : Trigger(ai, "lose aggro") {}
+		virtual bool IsActive();
+	};
+
+	class HasAggroTrigger : public Trigger {
+	public:
+	    HasAggroTrigger(PlayerbotAI* ai) : Trigger(ai, "have aggro") {}
+		virtual bool IsActive();
+	};
+
+	class SpellTrigger : public Trigger
+	{
+	public:
+		SpellTrigger(PlayerbotAI* ai, string spell, int checkInterval = 1) : Trigger(ai, spell, checkInterval)
+		{
+			this->spell = spell;
+		}
+
+		virtual string GetTargetName() { return "current target"; }
+		virtual string getName() { return spell; }
+		virtual bool IsActive();
+
+	protected:
+		string spell;
+	};
+
+	class SpellCanBeCastTrigger : public SpellTrigger
+	{
+	public:
+		SpellCanBeCastTrigger(PlayerbotAI* ai, string spell) : SpellTrigger(ai, spell) {}
+		virtual bool IsActive();
+	};
+
+	// TODO: check other targets
+    class InterruptSpellTrigger : public SpellTrigger
+	{
+    public:
+        InterruptSpellTrigger(PlayerbotAI* ai, string spell) : SpellTrigger(ai, spell) {}
+        virtual bool IsActive();
+    };
+
+
+    class AttackerCountTrigger : public Trigger
+    {
+    public:
+        AttackerCountTrigger(PlayerbotAI* ai, int amount, float distance = sPlayerbotAIConfig.sightDistance) : Trigger(ai)
+        {
+            this->amount = amount;
+            this->distance = distance;
+        }
+    public:
+        virtual bool IsActive()
+		{
+            return AI_VALUE(uint8, "attacker count") >= amount;
+        }
+        virtual string getName() { return "attacker count"; }
+
+    protected:
+        int amount;
+        float distance;
+    };
+
+    class HasAttackersTrigger : public AttackerCountTrigger
+    {
+    public:
+        HasAttackersTrigger(PlayerbotAI* ai) : AttackerCountTrigger(ai, 1) {}
+    };
+
+    class MyAttackerCountTrigger : public AttackerCountTrigger
+    {
+    public:
+        MyAttackerCountTrigger(PlayerbotAI* ai, int amount) : AttackerCountTrigger(ai, amount) {}
+    public:
+        virtual bool IsActive();
+        virtual string getName() { return "my attacker count"; }
+    };
+
+    class MediumThreatTrigger : public MyAttackerCountTrigger
+    {
+    public:
+        MediumThreatTrigger(PlayerbotAI* ai) : MyAttackerCountTrigger(ai, 2) {}
+    };
+
+    class AoeTrigger : public AttackerCountTrigger
+    {
+    public:
+        AoeTrigger(PlayerbotAI* ai, int amount = 3, float range = 15.0f) : AttackerCountTrigger(ai, amount)
+        {
+            this->range = range;
+        }
+    public:
+        virtual bool IsActive();
+        virtual string getName() { return "aoe"; }
+
+    private:
+        float range;
+    };
+
+    class NoFoodTrigger : public Trigger {
+    public:
+        NoFoodTrigger(PlayerbotAI* ai) : Trigger(ai, "no food trigger") {}
+        virtual bool IsActive() { return AI_VALUE2(list<Item*>, "inventory items", "food").empty(); }
+    };
+
+    class NoDrinkTrigger : public Trigger {
+    public:
+        NoDrinkTrigger(PlayerbotAI* ai) : Trigger(ai, "no drink trigger") {}
+        virtual bool IsActive() { return AI_VALUE2(list<Item*>, "inventory items", "drink").empty(); }
+    };
+
+    class LightAoeTrigger : public AoeTrigger
+    {
+    public:
+        LightAoeTrigger(PlayerbotAI* ai) : AoeTrigger(ai, 2, 15.0f) {}
+    };
+
+    class MediumAoeTrigger : public AoeTrigger
+    {
+    public:
+        MediumAoeTrigger(PlayerbotAI* ai) : AoeTrigger(ai, 3, 17.0f) {}
+    };
+
+    class HighAoeTrigger : public AoeTrigger
+    {
+    public:
+        HighAoeTrigger(PlayerbotAI* ai) : AoeTrigger(ai, 4, 20.0f) {}
+    };
+
+    class BuffTrigger : public SpellTrigger
+    {
+    public:
+        BuffTrigger(PlayerbotAI* ai, string spell) : SpellTrigger(ai, spell, 5) {}
+    public:
+		virtual string GetTargetName() { return "self target"; }
+        virtual bool IsActive();
+    };
+
+    class BuffOnPartyTrigger : public BuffTrigger
+    {
+    public:
+        BuffOnPartyTrigger(PlayerbotAI* ai, string spell) : BuffTrigger(ai, spell) {}
+    public:
+		virtual Value<Unit*>* GetTargetValue();
+    };
+
+    BEGIN_TRIGGER(NoAttackersTrigger, Trigger)
+    END_TRIGGER()
+
+    BEGIN_TRIGGER(NoTargetTrigger, Trigger)
+    END_TRIGGER()
+
+    BEGIN_TRIGGER(InvalidTargetTrigger, Trigger)
+    END_TRIGGER()
+
+    class TargetInSightTrigger : public Trigger {
+    public:
+        TargetInSightTrigger(PlayerbotAI* ai) : Trigger(ai, "target in sight") {}
+        virtual bool IsActive() { return AI_VALUE(Unit*, "grind target"); }
+    };
+
+    class DebuffTrigger : public BuffTrigger
+    {
+    public:
+        DebuffTrigger(PlayerbotAI* ai, string spell) : BuffTrigger(ai, spell) {
+			checkInterval = 1;
+		}
+    public:
+		virtual string GetTargetName() { return "current target"; }
+        virtual bool IsActive();
+    };
+
+    class DebuffOnAttackerTrigger : public DebuffTrigger
+    {
+    public:
+        DebuffOnAttackerTrigger(PlayerbotAI* ai, string spell) : DebuffTrigger(ai, spell) {}
+    public:
+        virtual Value<Unit*>* GetTargetValue();
+        virtual string getName() { return spell + " on attacker"; }
+    };
+
+	class BoostTrigger : public BuffTrigger
+	{
+	public:
+		BoostTrigger(PlayerbotAI* ai, string spell, float balance = 50) : BuffTrigger(ai, spell)
+		{
+			this->balance = balance;
+		}
+	public:
+		virtual bool IsActive();
+
+	protected:
+		float balance;
+	};
+
+    class RandomTrigger : public Trigger
+    {
+    public:
+        RandomTrigger(PlayerbotAI* ai, int probability = 200) : Trigger(ai)
+        {
+            this->probability = probability;
+        }
+    public:
+        virtual bool IsActive();
+        virtual string getName() { return "random"; }
+
+    protected:
+        int probability;
+    };
+
+    class SeldomTrigger : public RandomTrigger
+    {
+    public:
+        SeldomTrigger(PlayerbotAI* ai) : RandomTrigger(ai, 9000) {}
+        virtual string getName() { return "seldom"; }
+    };
+
+    class OftenTrigger : public RandomTrigger
+    {
+    public:
+        OftenTrigger(PlayerbotAI* ai) : RandomTrigger(ai, 50) {}
+        virtual string getName() { return "often"; }
+    };
+
+    class AndTrigger : public Trigger
+    {
+    public:
+        AndTrigger(PlayerbotAI* ai, Trigger* ls, Trigger* rs) : Trigger(ai)
+        {
+            this->ls = ls;
+            this->rs = rs;
+        }
+        virtual ~AndTrigger()
+        {
+            delete ls;
+            delete rs;
+        }
+    public:
+        virtual bool IsActive();
+        virtual string getName();
+
+    protected:
+        Trigger* ls;
+        Trigger* rs;
+    };
+
+    class SnareTargetTrigger : public DebuffTrigger
+    {
+    public:
+        SnareTargetTrigger(PlayerbotAI* ai, string aura) : DebuffTrigger(ai, aura) {}
+    public:
+        virtual bool IsActive();
+        virtual string getName() { return "target is moving"; }
+    };
+
+	class LowManaTrigger : public Trigger
+	{
+	public:
+		LowManaTrigger(PlayerbotAI* ai) : Trigger(ai, "low mana") {}
+
+		virtual bool IsActive();
+	};
+
+	class MediumManaTrigger : public Trigger
+	{
+	public:
+		MediumManaTrigger(PlayerbotAI* ai) : Trigger(ai, "medium mana") {}
+
+		virtual bool IsActive();
+	};
+
+    BEGIN_TRIGGER(PanicTrigger, Trigger)
+        virtual string getName() { return "panic"; }
+    END_TRIGGER()
+
+
+	class NoPetTrigger : public Trigger
+	{
+	public:
+		NoPetTrigger(PlayerbotAI* ai) : Trigger(ai, "no pet", 5) {}
+
+		virtual bool IsActive() {
+			return !AI_VALUE(Unit*, "pet target") && !AI_VALUE2(bool, "mounted", "self target");
+		}
+	};
+
+	class ItemCountTrigger : public Trigger {
+	public:
+		ItemCountTrigger(PlayerbotAI* ai, string item, int count) : Trigger(ai, item, 5) {
+			this->item = item;
+			this->count = count;
+		}
+	public:
+		virtual bool IsActive();
+		virtual string getName() { return "item count"; }
+
+	protected:
+		string item;
+		int count;
+	};
+
+	class HasAuraTrigger : public Trigger {
+	public:
+		HasAuraTrigger(PlayerbotAI* ai, string spell) : Trigger(ai, spell, 5) {}
+
+		virtual string GetTargetName() { return "self target"; }
+		virtual bool IsActive();
+
+	};
+
+    class TimerTrigger : public Trigger
+    {
+    public:
+        TimerTrigger(PlayerbotAI* ai, int checkInterval = 5) : Trigger(ai, "timer", checkInterval) {}
+
+    public:
+        virtual bool IsActive() { return true; }
+    };
+
+	class TankAoeTrigger : public NoAttackersTrigger
+	{
+	public:
+		TankAoeTrigger(PlayerbotAI* ai) : NoAttackersTrigger(ai) {}
+
+	public:
+		virtual bool IsActive();
+
+	};
+
+    class IsBehindTargetTrigger : public Trigger
+    {
+    public:
+        IsBehindTargetTrigger(PlayerbotAI* ai) : Trigger(ai) {}
+
+    public:
+        virtual bool IsActive();
+    };
+
+    class IsNotFacingTargetTrigger : public Trigger
+    {
+    public:
+        IsNotFacingTargetTrigger(PlayerbotAI* ai) : Trigger(ai) {}
+
+    public:
+        virtual bool IsActive();
+    };
+
+    class HasCcTargetTrigger : public Trigger
+    {
+    public:
+        HasCcTargetTrigger(PlayerbotAI* ai, string name) : Trigger(ai, name) {}
+
+    public:
+        virtual bool IsActive();
+    };
+
+	class NoMovementTrigger : public Trigger
+	{
+	public:
+		NoMovementTrigger(PlayerbotAI* ai, string name) : Trigger(ai, name) {}
+
+	public:
+		virtual bool IsActive();
+	};
+
+
+    class NoPossibleTargetsTrigger : public Trigger
+    {
+    public:
+        NoPossibleTargetsTrigger(PlayerbotAI* ai) : Trigger(ai, "no possible targets") {}
+
+    public:
+        virtual bool IsActive();
+    };
+
+    class NotLeastHpTargetActiveTrigger : public Trigger
+    {
+    public:
+        NotLeastHpTargetActiveTrigger(PlayerbotAI* ai) : Trigger(ai, "not least hp target active") {}
+
+    public:
+        virtual bool IsActive();
+    };
+
+    class EnemyPlayerIsAttacking : public Trigger
+    {
+    public:
+        EnemyPlayerIsAttacking(PlayerbotAI* ai) : Trigger(ai, "enemy player is attacking") {}
+
+    public:
+        virtual bool IsActive();
+    };
+
+    class IsSwimmingTrigger : public Trigger
+    {
+    public:
+        IsSwimmingTrigger(PlayerbotAI* ai) : Trigger(ai, "swimming") {}
+
+    public:
+        virtual bool IsActive();
+    };
+
+    class HasNearestAddsTrigger : public Trigger
+    {
+    public:
+        HasNearestAddsTrigger(PlayerbotAI* ai) : Trigger(ai, "has nearest adds") {}
+
+    public:
+        virtual bool IsActive();
+    };
+
+    class HasItemForSpellTrigger : public Trigger
+    {
+    public:
+        HasItemForSpellTrigger(PlayerbotAI* ai, string spell) : Trigger(ai, spell) {}
+
+    public:
+        virtual bool IsActive();
+    };
+
+    class TargetChangedTrigger : public Trigger
+    {
+    public:
+        TargetChangedTrigger(PlayerbotAI* ai) : Trigger(ai, "target changed") {}
+
+    public:
+        virtual bool IsActive();
+    };
+
+    class InterruptEnemyHealerTrigger : public SpellTrigger
+    {
+    public:
+        InterruptEnemyHealerTrigger(PlayerbotAI* ai, string spell) : SpellTrigger(ai, spell) {}
+    public:
+        virtual Value<Unit*>* GetTargetValue();
+        virtual string getName() { return spell + " on enemy healer"; }
+    };
+
+}
+
+#include "RangeTriggers.h"
+#include "HealthTriggers.h"
+#include "CureTriggers.h"
diff --git a/src/game/playerbot/strategy/triggers/HealthTriggers.cpp b/src/game/playerbot/strategy/triggers/HealthTriggers.cpp
new file mode 100644
index 00000000000..703f00cd62a
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/HealthTriggers.cpp
@@ -0,0 +1,26 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "HealthTriggers.h"
+
+using namespace ai;
+
+float HealthInRangeTrigger::GetValue()
+{
+    return AI_VALUE2(uint8, "health", GetTargetName());
+}
+
+bool PartyMemberDeadTrigger::IsActive()
+{
+	return GetTarget();
+}
+
+bool DeadTrigger::IsActive()
+{
+    return AI_VALUE2(bool, "dead", GetTargetName());
+}
+
+bool AoeHealTrigger::IsActive()
+{
+    return AI_VALUE2(uint8, "aoe heal", type) >= count;
+}
+
diff --git a/src/game/playerbot/strategy/triggers/HealthTriggers.h b/src/game/playerbot/strategy/triggers/HealthTriggers.h
new file mode 100644
index 00000000000..49dc17b8b39
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/HealthTriggers.h
@@ -0,0 +1,139 @@
+#pragma once
+#include "../Trigger.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class ValueInRangeTrigger : public Trigger
+    {
+    public:
+        ValueInRangeTrigger(PlayerbotAI* ai, string name, float maxValue, float minValue) : Trigger(ai, name) {
+            this->maxValue = maxValue;
+            this->minValue = minValue;
+        }
+    public:
+        virtual float GetValue() = 0;
+        virtual bool IsActive() {
+            float value = GetValue();
+            return value < maxValue && value >= minValue;
+        }
+
+    protected:
+        float maxValue, minValue;
+    };
+
+	class HealthInRangeTrigger : public ValueInRangeTrigger
+	{
+	public:
+		HealthInRangeTrigger(PlayerbotAI* ai, string name, float maxValue, float minValue = 0) :
+		  ValueInRangeTrigger(ai, name, maxValue, minValue) {}
+
+		virtual bool IsActive()
+		{
+		    return ValueInRangeTrigger::IsActive() && !AI_VALUE2(bool, "dead", GetTargetName());
+		}
+
+		virtual float GetValue();
+	};
+
+    class LowHealthTrigger : public HealthInRangeTrigger
+    {
+    public:
+        LowHealthTrigger(PlayerbotAI* ai, string name = "low health",
+            float value = sPlayerbotAIConfig.lowHealth, float minValue = sPlayerbotAIConfig.criticalHealth) :
+            HealthInRangeTrigger(ai, name, value, minValue) {}
+
+		virtual string GetTargetName() { return "self target"; }
+    };
+
+    class CriticalHealthTrigger : public LowHealthTrigger
+    {
+    public:
+        CriticalHealthTrigger(PlayerbotAI* ai) :
+            LowHealthTrigger(ai, "critical health", sPlayerbotAIConfig.criticalHealth, 0) {}
+    };
+
+    class MediumHealthTrigger : public LowHealthTrigger
+    {
+    public:
+        MediumHealthTrigger(PlayerbotAI* ai) :
+            LowHealthTrigger(ai, "medium health", sPlayerbotAIConfig.mediumHealth, sPlayerbotAIConfig.lowHealth) {}
+    };
+
+    class AlmostFullHealthTrigger : public LowHealthTrigger
+    {
+    public:
+        AlmostFullHealthTrigger(PlayerbotAI* ai) :
+            LowHealthTrigger(ai, "almost full health", sPlayerbotAIConfig.almostFullHealth, sPlayerbotAIConfig.mediumHealth) {}
+    };
+
+    class PartyMemberLowHealthTrigger : public HealthInRangeTrigger
+    {
+    public:
+        PartyMemberLowHealthTrigger(PlayerbotAI* ai, string name = "party member low health", float value = sPlayerbotAIConfig.lowHealth, float minValue = sPlayerbotAIConfig.criticalHealth) :
+            HealthInRangeTrigger(ai, name, value, minValue) {}
+
+        virtual string GetTargetName() { return "party member to heal"; }
+    };
+
+    class PartyMemberCriticalHealthTrigger : public PartyMemberLowHealthTrigger
+    {
+    public:
+        PartyMemberCriticalHealthTrigger(PlayerbotAI* ai) :
+            PartyMemberLowHealthTrigger(ai, "party member critical health", sPlayerbotAIConfig.criticalHealth, 0) {}
+    };
+
+    class PartyMemberMediumHealthTrigger : public PartyMemberLowHealthTrigger
+    {
+    public:
+        PartyMemberMediumHealthTrigger(PlayerbotAI* ai) :
+            PartyMemberLowHealthTrigger(ai, "party member medium health", sPlayerbotAIConfig.mediumHealth,sPlayerbotAIConfig.lowHealth) {}
+    };
+
+    class PartyMemberAlmostFullHealthTrigger : public PartyMemberLowHealthTrigger
+    {
+    public:
+        PartyMemberAlmostFullHealthTrigger(PlayerbotAI* ai) :
+            PartyMemberLowHealthTrigger(ai, "party member almost full health", sPlayerbotAIConfig.almostFullHealth,sPlayerbotAIConfig.mediumHealth) {}
+    };
+
+    class TargetLowHealthTrigger : public HealthInRangeTrigger {
+    public:
+        TargetLowHealthTrigger(PlayerbotAI* ai, float value, float minValue = 0) :
+            HealthInRangeTrigger(ai, "target low health", value, minValue) {}
+        virtual string GetTargetName() { return "current target"; }
+    };
+
+    class TargetCriticalHealthTrigger : public TargetLowHealthTrigger
+    {
+    public:
+        TargetCriticalHealthTrigger(PlayerbotAI* ai) : TargetLowHealthTrigger(ai, 20) {}
+    };
+
+	class PartyMemberDeadTrigger : public Trigger {
+	public:
+		PartyMemberDeadTrigger(PlayerbotAI* ai) : Trigger(ai, "resurrect", 10) {}
+        virtual string GetTargetName() { return "party member to resurrect"; }
+		virtual bool IsActive();
+	};
+
+    class DeadTrigger : public Trigger {
+    public:
+        DeadTrigger(PlayerbotAI* ai) : Trigger(ai, "dead", 10) {}
+        virtual string GetTargetName() { return "self target"; }
+        virtual bool IsActive();
+    };
+
+    class AoeHealTrigger : public Trigger {
+    public:
+    	AoeHealTrigger(PlayerbotAI* ai, string name, string type, int count) :
+    		Trigger(ai, name), type(type), count(count) {}
+    public:
+        virtual bool IsActive();
+
+    protected:
+        int count;
+        string type;
+    };
+
+}
diff --git a/src/game/playerbot/strategy/triggers/LfgTriggers.h b/src/game/playerbot/strategy/triggers/LfgTriggers.h
new file mode 100644
index 00000000000..ec8133e9b3f
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/LfgTriggers.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "../Trigger.h"
+
+namespace ai
+{
+class LfgProposalActiveTrigger : public Trigger
+{
+public:
+    LfgProposalActiveTrigger(PlayerbotAI* ai) : Trigger(ai, "lfg proposal active", 5) {}
+
+    virtual bool IsActive()
+    {
+        return AI_VALUE(uint32, "lfg proposal");
+    }
+};
+}
diff --git a/src/game/playerbot/strategy/triggers/LootTriggers.cpp b/src/game/playerbot/strategy/triggers/LootTriggers.cpp
new file mode 100644
index 00000000000..cac9b60be33
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/LootTriggers.cpp
@@ -0,0 +1,20 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "LootTriggers.h"
+
+using namespace ai;
+
+bool LootAvailableTrigger::IsActive()
+{
+    return AI_VALUE(bool, "has available loot") && AI_VALUE(uint8, "bag space") < 80;
+}
+
+bool FarFromCurrentLootTrigger::IsActive()
+{
+    return AI_VALUE2(float, "distance", "loot target") > INTERACTION_DISTANCE;
+}
+
+bool CanLootTrigger::IsActive()
+{
+    return AI_VALUE(bool, "can loot");
+}
diff --git a/src/game/playerbot/strategy/triggers/LootTriggers.h b/src/game/playerbot/strategy/triggers/LootTriggers.h
new file mode 100644
index 00000000000..063456b88d6
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/LootTriggers.h
@@ -0,0 +1,30 @@
+#pragma once
+#include "../Trigger.h"
+#include "../values/LastMovementValue.h"
+
+namespace ai
+{
+    class LootAvailableTrigger : public Trigger
+    {
+    public:
+        LootAvailableTrigger(PlayerbotAI* ai) : Trigger(ai, "loot available") {}
+
+        virtual bool IsActive();
+    };
+
+    class FarFromCurrentLootTrigger : public Trigger
+    {
+    public:
+        FarFromCurrentLootTrigger(PlayerbotAI* ai) : Trigger(ai, "far from current loot") {}
+
+        virtual bool IsActive();
+    };
+
+    class CanLootTrigger : public Trigger
+    {
+    public:
+        CanLootTrigger(PlayerbotAI* ai) : Trigger(ai, "can loot") {}
+
+        virtual bool IsActive();
+    };
+}
diff --git a/src/game/playerbot/strategy/triggers/RangeTriggers.h b/src/game/playerbot/strategy/triggers/RangeTriggers.h
new file mode 100644
index 00000000000..0237062a497
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/RangeTriggers.h
@@ -0,0 +1,81 @@
+#pragma once
+#include "../Trigger.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class EnemyTooCloseForSpellTrigger : public Trigger {
+    public:
+        EnemyTooCloseForSpellTrigger(PlayerbotAI* ai) : Trigger(ai, "enemy too close for spell") {}
+        virtual bool IsActive()
+		{
+			Unit* target = AI_VALUE(Unit*, "current target");
+            return target && AI_VALUE2(float, "distance", "current target") <= sPlayerbotAIConfig.spellDistance / 2;
+        }
+    };
+
+    class EnemyTooCloseForMeleeTrigger : public Trigger {
+    public:
+        EnemyTooCloseForMeleeTrigger(PlayerbotAI* ai) : Trigger(ai, "enemy too close for melee", 5) {}
+        virtual bool IsActive()
+		{
+			Unit* target = AI_VALUE(Unit*, "current target");
+            return target && AI_VALUE2(float, "distance", "current target") <= sPlayerbotAIConfig.meleeDistance / 2;
+        }
+    };
+
+    class OutOfRangeTrigger : public Trigger {
+    public:
+        OutOfRangeTrigger(PlayerbotAI* ai, string name, float distance) : Trigger(ai, name)
+		{
+            this->distance = distance;
+        }
+        virtual bool IsActive()
+		{
+			Unit* target = AI_VALUE(Unit*, GetTargetName());
+			return target && AI_VALUE2(float, "distance", GetTargetName()) > distance;
+        }
+        virtual string GetTargetName() { return "current target"; }
+
+    protected:
+        float distance;
+    };
+
+    class EnemyOutOfMeleeTrigger : public OutOfRangeTrigger
+	{
+    public:
+        EnemyOutOfMeleeTrigger(PlayerbotAI* ai) : OutOfRangeTrigger(ai, "enemy out of melee range", sPlayerbotAIConfig.meleeDistance) {}
+    };
+
+    class EnemyOutOfSpellRangeTrigger : public OutOfRangeTrigger
+	{
+    public:
+        EnemyOutOfSpellRangeTrigger(PlayerbotAI* ai) : OutOfRangeTrigger(ai, "enemy out of spell range", sPlayerbotAIConfig.spellDistance) {}
+    };
+
+    class PartyMemberToHealOutOfSpellRangeTrigger : public OutOfRangeTrigger
+	{
+    public:
+        PartyMemberToHealOutOfSpellRangeTrigger(PlayerbotAI* ai) : OutOfRangeTrigger(ai, "party member to heal out of spell range", sPlayerbotAIConfig.spellDistance) {}
+        virtual string GetTargetName() { return "party member to heal"; }
+    };
+
+    class FarFromMasterTrigger : public Trigger {
+    public:
+        FarFromMasterTrigger(PlayerbotAI* ai, string name = "far from master", float distance = 12.0f, int checkInterval = 1) : Trigger(ai, name, checkInterval), distance(distance) {}
+
+        virtual bool IsActive()
+        {
+            return AI_VALUE2(float, "distance", "master target") > distance;
+        }
+
+    private:
+        float distance;
+    };
+
+    class OutOfReactRangeTrigger : public FarFromMasterTrigger
+    {
+    public:
+        OutOfReactRangeTrigger(PlayerbotAI* ai) : FarFromMasterTrigger(ai, "out of react range", sPlayerbotAIConfig.reactDistance / 2, 10) {}
+    };
+}
diff --git a/src/game/playerbot/strategy/triggers/TriggerContext.h b/src/game/playerbot/strategy/triggers/TriggerContext.h
new file mode 100644
index 00000000000..2bd41fb0d1f
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/TriggerContext.h
@@ -0,0 +1,158 @@
+#pragma once;
+
+#include "HealthTriggers.h"
+#include "GenericTriggers.h"
+#include "LootTriggers.h"
+#include "../triggers/GenericTriggers.h"
+#include "LfgTriggers.h"
+
+namespace ai
+{
+
+    class TriggerContext : public NamedObjectContext<Trigger>
+    {
+    public:
+        TriggerContext()
+        {
+            creators["timer"] = &TriggerContext::Timer;
+            creators["random"] = &TriggerContext::Random;
+            creators["seldom"] = &TriggerContext::seldom;
+            creators["often"] = &TriggerContext::often;
+
+            creators["target critical health"] = &TriggerContext::TargetCriticalHealth;
+
+            creators["critical health"] = &TriggerContext::CriticalHealth;
+            creators["low health"] = &TriggerContext::LowHealth;
+            creators["medium health"] = &TriggerContext::MediumHealth;
+            creators["almost full health"] = &TriggerContext::AlmostFullHealth;
+
+            creators["low mana"] = &TriggerContext::LowMana;
+            creators["medium mana"] = &TriggerContext::MediumMana;
+
+            creators["party member critical health"] = &TriggerContext::PartyMemberCriticalHealth;
+            creators["party member low health"] = &TriggerContext::PartyMemberLowHealth;
+            creators["party member medium health"] = &TriggerContext::PartyMemberMediumHealth;
+            creators["party member almost full health"] = &TriggerContext::PartyMemberAlmostFullHealth;
+
+            creators["light rage available"] = &TriggerContext::LightRageAvailable;
+            creators["medium rage available"] = &TriggerContext::MediumRageAvailable;
+            creators["high rage available"] = &TriggerContext::HighRageAvailable;
+
+            creators["light energy available"] = &TriggerContext::LightEnergyAvailable;
+            creators["medium energy available"] = &TriggerContext::MediumEnergyAvailable;
+            creators["high energy available"] = &TriggerContext::HighEnergyAvailable;
+
+            creators["loot available"] = &TriggerContext::LootAvailable;
+            creators["no attackers"] = &TriggerContext::NoAttackers;
+            creators["no target"] = &TriggerContext::NoTarget;
+            creators["target in sight"] = &TriggerContext::TargetInSight;
+            creators["not least hp target active"] = &TriggerContext::not_least_hp_target_active;
+            creators["has nearest adds"] = &TriggerContext::has_nearest_adds;
+            creators["enemy player is attacking"] = &TriggerContext::enemy_player_is_attacking;
+
+            creators["tank aoe"] = &TriggerContext::TankAoe;
+            creators["lose aggro"] = &TriggerContext::LoseAggro;
+            creators["has aggro"] = &TriggerContext::HasAggro;
+
+            creators["light aoe"] = &TriggerContext::LightAoe;
+            creators["medium aoe"] = &TriggerContext::MediumAoe;
+            creators["high aoe"] = &TriggerContext::HighAoe;
+
+            creators["enemy out of melee"] = &TriggerContext::EnemyOutOfMelee;
+            creators["enemy out of spell"] = &TriggerContext::EnemyOutOfSpell;
+            creators["enemy too close for spell"] = &TriggerContext::enemy_too_close_for_spell;
+            creators["enemy too close for melee"] = &TriggerContext::enemy_too_close_for_melee;
+
+            creators["combo points available"] = &TriggerContext::ComboPointsAvailable;
+
+            creators["medium threat"] = &TriggerContext::MediumThreat;
+
+            creators["dead"] = &TriggerContext::Dead;
+            creators["party member dead"] = &TriggerContext::PartyMemberDead;
+            creators["no pet"] = &TriggerContext::no_pet;
+            creators["has attackers"] = &TriggerContext::has_attackers;
+            creators["no possible targets"] = &TriggerContext::no_possible_targets;
+
+            creators["no drink"] = &TriggerContext::no_drink;
+            creators["no food"] = &TriggerContext::no_food;
+
+            creators["panic"] = &TriggerContext::panic;
+            creators["behind target"] = &TriggerContext::behind_target;
+            creators["not facing target"] = &TriggerContext::not_facing_target;
+            creators["far from master"] = &TriggerContext::far_from_master;
+            creators["far from loot target"] = &TriggerContext::far_from_loot_target;
+            creators["can loot"] = &TriggerContext::can_loot;
+            creators["swimming"] = &TriggerContext::swimming;
+            creators["target changed"] = &TriggerContext::target_changed;
+
+            creators["critical aoe heal"] = &TriggerContext::critical_aoe_heal;
+            creators["low aoe heal"] = &TriggerContext::low_aoe_heal;
+            creators["medium aoe heal"] = &TriggerContext::medium_aoe_heal;
+            creators["invalid target"] = &TriggerContext::invalid_target;
+            creators["lfg proposal active"] = &TriggerContext::lfg_proposal_active;
+        }
+
+    private:
+        static Trigger* lfg_proposal_active(PlayerbotAI* ai) { return new LfgProposalActiveTrigger(ai); }
+        static Trigger* invalid_target(PlayerbotAI* ai) { return new InvalidTargetTrigger(ai); }
+        static Trigger* critical_aoe_heal(PlayerbotAI* ai) { return new AoeHealTrigger(ai, "critical aoe heal", "critical", 2); }
+        static Trigger* low_aoe_heal(PlayerbotAI* ai) { return new AoeHealTrigger(ai, "low aoe heal", "low", 2); }
+        static Trigger* medium_aoe_heal(PlayerbotAI* ai) { return new AoeHealTrigger(ai, "medium aoe heal", "medium", 2); }
+        static Trigger* target_changed(PlayerbotAI* ai) { return new TargetChangedTrigger(ai); }
+        static Trigger* swimming(PlayerbotAI* ai) { return new IsSwimmingTrigger(ai); }
+        static Trigger* no_possible_targets(PlayerbotAI* ai) { return new NoPossibleTargetsTrigger(ai); }
+        static Trigger* can_loot(PlayerbotAI* ai) { return new CanLootTrigger(ai); }
+        static Trigger* far_from_loot_target(PlayerbotAI* ai) { return new FarFromCurrentLootTrigger(ai); }
+        static Trigger* far_from_master(PlayerbotAI* ai) { return new FarFromMasterTrigger(ai); }
+        static Trigger* behind_target(PlayerbotAI* ai) { return new IsBehindTargetTrigger(ai); }
+        static Trigger* not_facing_target(PlayerbotAI* ai) { return new IsNotFacingTargetTrigger(ai); }
+        static Trigger* panic(PlayerbotAI* ai) { return new PanicTrigger(ai); }
+        static Trigger* no_drink(PlayerbotAI* ai) { return new NoDrinkTrigger(ai); }
+        static Trigger* no_food(PlayerbotAI* ai) { return new NoFoodTrigger(ai); }
+        static Trigger* LightAoe(PlayerbotAI* ai) { return new LightAoeTrigger(ai); }
+        static Trigger* MediumAoe(PlayerbotAI* ai) { return new MediumAoeTrigger(ai); }
+        static Trigger* HighAoe(PlayerbotAI* ai) { return new HighAoeTrigger(ai); }
+        static Trigger* LoseAggro(PlayerbotAI* ai) { return new LoseAggroTrigger(ai); }
+        static Trigger* HasAggro(PlayerbotAI* ai) { return new HasAggroTrigger(ai); }
+        static Trigger* LowHealth(PlayerbotAI* ai) { return new LowHealthTrigger(ai); }
+        static Trigger* MediumHealth(PlayerbotAI* ai) { return new MediumHealthTrigger(ai); }
+        static Trigger* AlmostFullHealth(PlayerbotAI* ai) { return new AlmostFullHealthTrigger(ai); }
+        static Trigger* CriticalHealth(PlayerbotAI* ai) { return new CriticalHealthTrigger(ai); }
+        static Trigger* TargetCriticalHealth(PlayerbotAI* ai) { return new TargetCriticalHealthTrigger(ai); }
+        static Trigger* LowMana(PlayerbotAI* ai) { return new LowManaTrigger(ai); }
+        static Trigger* MediumMana(PlayerbotAI* ai) { return new MediumManaTrigger(ai); }
+        static Trigger* LightRageAvailable(PlayerbotAI* ai) { return new LightRageAvailableTrigger(ai); }
+        static Trigger* MediumRageAvailable(PlayerbotAI* ai) { return new MediumRageAvailableTrigger(ai); }
+        static Trigger* HighRageAvailable(PlayerbotAI* ai) { return new HighRageAvailableTrigger(ai); }
+        static Trigger* LightEnergyAvailable(PlayerbotAI* ai) { return new LightEnergyAvailableTrigger(ai); }
+        static Trigger* MediumEnergyAvailable(PlayerbotAI* ai) { return new MediumEnergyAvailableTrigger(ai); }
+        static Trigger* HighEnergyAvailable(PlayerbotAI* ai) { return new HighEnergyAvailableTrigger(ai); }
+        static Trigger* LootAvailable(PlayerbotAI* ai) { return new LootAvailableTrigger(ai); }
+        static Trigger* NoAttackers(PlayerbotAI* ai) { return new NoAttackersTrigger(ai); }
+        static Trigger* TankAoe(PlayerbotAI* ai) { return new TankAoeTrigger(ai); }
+        static Trigger* Timer(PlayerbotAI* ai) { return new TimerTrigger(ai); }
+        static Trigger* NoTarget(PlayerbotAI* ai) { return new NoTargetTrigger(ai); }
+        static Trigger* TargetInSight(PlayerbotAI* ai) { return new TargetInSightTrigger(ai); }
+        static Trigger* not_least_hp_target_active(PlayerbotAI* ai) { return new NotLeastHpTargetActiveTrigger(ai); }
+        static Trigger* has_nearest_adds(PlayerbotAI* ai) { return new HasNearestAddsTrigger(ai); }
+        static Trigger* enemy_player_is_attacking(PlayerbotAI* ai) { return new EnemyPlayerIsAttacking(ai); }
+        static Trigger* Random(PlayerbotAI* ai) { return new RandomTrigger(ai); }
+        static Trigger* seldom(PlayerbotAI* ai) { return new SeldomTrigger(ai); }
+        static Trigger* often(PlayerbotAI* ai) { return new OftenTrigger(ai); }
+        static Trigger* EnemyOutOfMelee(PlayerbotAI* ai) { return new EnemyOutOfMeleeTrigger(ai); }
+        static Trigger* EnemyOutOfSpell(PlayerbotAI* ai) { return new EnemyOutOfSpellRangeTrigger(ai); }
+        static Trigger* enemy_too_close_for_spell(PlayerbotAI* ai) { return new EnemyTooCloseForSpellTrigger(ai); }
+        static Trigger* enemy_too_close_for_melee(PlayerbotAI* ai) { return new EnemyTooCloseForMeleeTrigger(ai); }
+        static Trigger* ComboPointsAvailable(PlayerbotAI* ai) { return new ComboPointsAvailableTrigger(ai); }
+        static Trigger* MediumThreat(PlayerbotAI* ai) { return new MediumThreatTrigger(ai); }
+        static Trigger* Dead(PlayerbotAI* ai) { return new DeadTrigger(ai); }
+        static Trigger* PartyMemberDead(PlayerbotAI* ai) { return new PartyMemberDeadTrigger(ai); }
+        static Trigger* PartyMemberLowHealth(PlayerbotAI* ai) { return new PartyMemberLowHealthTrigger(ai); }
+        static Trigger* PartyMemberMediumHealth(PlayerbotAI* ai) { return new PartyMemberMediumHealthTrigger(ai); }
+        static Trigger* PartyMemberAlmostFullHealth(PlayerbotAI* ai) { return new PartyMemberAlmostFullHealthTrigger(ai); }
+        static Trigger* PartyMemberCriticalHealth(PlayerbotAI* ai) { return new PartyMemberCriticalHealthTrigger(ai); }
+        static Trigger* no_pet(PlayerbotAI* ai) { return new NoPetTrigger(ai); }
+        static Trigger* has_attackers(PlayerbotAI* ai) { return new HasAttackersTrigger(ai); }
+
+    };
+};
diff --git a/src/game/playerbot/strategy/triggers/WithinAreaTrigger.h b/src/game/playerbot/strategy/triggers/WithinAreaTrigger.h
new file mode 100644
index 00000000000..313f2e338dc
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/WithinAreaTrigger.h
@@ -0,0 +1,30 @@
+#pragma once
+#include "../Trigger.h"
+#include "../values/LastMovementValue.h"
+
+namespace ai
+{
+    class WithinAreaTrigger : public Trigger {
+    public:
+        WithinAreaTrigger(PlayerbotAI* ai) : Trigger(ai, "within area trigger") {}
+
+        virtual bool IsActive()
+		{
+            
+
+            LastMovement& movement = context->GetValue<LastMovement&>("last movement")->Get();
+            if (!movement.lastAreaTrigger)
+                return false;
+
+            AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(movement.lastAreaTrigger);
+            if(!atEntry)
+                return false;
+
+            AreaTrigger const* at = sObjectMgr.GetAreaTrigger(movement.lastAreaTrigger);
+            if (!at)
+                return false;
+
+            return IsPointInAreaTriggerZone(atEntry, bot->GetMapId(), bot->GetPositionX(), bot->GetPositionY(), bot->GetPositionZ(), 0.5f);
+        }
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/triggers/WorldPacketTrigger.h b/src/game/playerbot/strategy/triggers/WorldPacketTrigger.h
new file mode 100644
index 00000000000..b0f8b8759b8
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/WorldPacketTrigger.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "../Trigger.h"
+
+namespace ai
+{
+    class WorldPacketTrigger : public Trigger {
+    public:
+        WorldPacketTrigger(PlayerbotAI* ai, string command) : Trigger(ai, command), triggered(false) {}
+
+        virtual void ExternalEvent(WorldPacket &packet, Player* owner = NULL)
+        {
+            this->packet = packet;
+            this->owner = owner;
+            triggered = true;
+        }
+
+        virtual Event Check()
+        {
+            if (!triggered)
+                return Event();
+
+            return Event(getName(), packet, owner);
+        }
+
+        virtual void Reset()
+        {
+            triggered = false;
+        }
+
+    private:
+        WorldPacket packet;
+        bool triggered;
+        Player* owner;
+    };
+}
diff --git a/src/game/playerbot/strategy/triggers/WorldPacketTriggerContext.h b/src/game/playerbot/strategy/triggers/WorldPacketTriggerContext.h
new file mode 100644
index 00000000000..b1b5e419104
--- /dev/null
+++ b/src/game/playerbot/strategy/triggers/WorldPacketTriggerContext.h
@@ -0,0 +1,83 @@
+#pragma once;
+
+#include "WorldPacketTrigger.h"
+#include "WithinAreaTrigger.h"
+
+namespace ai
+{
+    class WorldPacketTriggerContext : public NamedObjectContext<Trigger>
+    {
+    public:
+        WorldPacketTriggerContext()
+        {
+            creators["gossip hello"] = &WorldPacketTriggerContext::gossip_hello;
+            creators["group invite"] = &WorldPacketTriggerContext::group_invite;
+            creators["group set leader"] = &WorldPacketTriggerContext::group_set_leader;
+            creators["not enough money"] = &WorldPacketTriggerContext::no_money;
+            creators["not enough reputation"] = &WorldPacketTriggerContext::no_reputation;
+            creators["cannot equip"] = &WorldPacketTriggerContext::cannot_equip;
+            creators["use game object"] = &WorldPacketTriggerContext::use_game_object;
+            creators["complete quest"] = &WorldPacketTriggerContext::complete_quest;
+            creators["accept quest"] = &WorldPacketTriggerContext::accept_quest;
+            creators["quest share"] = &WorldPacketTriggerContext::quest_share;
+            creators["loot roll"] = &WorldPacketTriggerContext::loot_roll;
+            creators["resurrect request"] = &WorldPacketTriggerContext::resurrect_request;
+            creators["area trigger"] = &WorldPacketTriggerContext::area_trigger;
+            creators["within area trigger"] = &WorldPacketTriggerContext::within_area_trigger;
+            creators["check mount state"] = &WorldPacketTriggerContext::check_mount_state;
+            creators["activate taxi"] = &WorldPacketTriggerContext::taxi;
+            creators["trade status"] = &WorldPacketTriggerContext::trade_status;
+            creators["loot response"] = &WorldPacketTriggerContext::loot_response;
+            creators["out of react range"] = &WorldPacketTriggerContext::out_of_react_range;
+            creators["quest objective completed"] = &WorldPacketTriggerContext::quest_objective_completed;
+            creators["item push result"] = &WorldPacketTriggerContext::item_push_result;
+            creators["party command"] = &WorldPacketTriggerContext::party_command;
+            creators["taxi done"] = &WorldPacketTriggerContext::taxi_done;
+            creators["cast failed"] = &WorldPacketTriggerContext::cast_failed;
+            creators["duel requested"] = &WorldPacketTriggerContext::duel_requested;
+            creators["ready check"] = &WorldPacketTriggerContext::ready_check;
+            creators["ready check finished"] = &WorldPacketTriggerContext::ready_check_finished;
+            creators["uninvite"] = &WorldPacketTriggerContext::uninvite;
+            creators["lfg join"] = &WorldPacketTriggerContext::lfg_update;
+            creators["lfg proposal"] = &WorldPacketTriggerContext::lfg_proposal;
+            creators["lfg role check"] = &WorldPacketTriggerContext::lfg_role_check;
+            creators["lfg leave"] = &WorldPacketTriggerContext::lfg_leave;
+            creators["guild invite"] = &WorldPacketTriggerContext::guild_invite;
+        }
+
+    private:
+        static Trigger* guild_invite(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "guild invite"); }
+        static Trigger* lfg_leave(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "lfg leave"); }
+        static Trigger* lfg_proposal(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "lfg proposal"); }
+        static Trigger* lfg_role_check(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "lfg role check"); }
+        static Trigger* lfg_update(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "lfg join"); }
+        static Trigger* uninvite(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "uninvite"); }
+        static Trigger* ready_check_finished(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "ready check finished"); }
+        static Trigger* ready_check(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "ready check"); }
+        static Trigger* duel_requested(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "duel requested"); }
+        static Trigger* cast_failed(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "cast failed"); }
+        static Trigger* taxi_done(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "taxi done"); }
+        static Trigger* party_command(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "party command"); }
+        static Trigger* item_push_result(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "item push result"); }
+        static Trigger* quest_objective_completed(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "quest objective completed"); }
+        static Trigger* out_of_react_range(PlayerbotAI* ai) { return new OutOfReactRangeTrigger(ai); }
+        static Trigger* loot_response(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "loot response"); }
+        static Trigger* trade_status(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "trade status"); }
+        static Trigger* cannot_equip(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "cannot equip"); }
+        static Trigger* check_mount_state(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "check mount state"); }
+        static Trigger* area_trigger(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "area trigger"); }
+        static Trigger* within_area_trigger(PlayerbotAI* ai) { return new WithinAreaTrigger(ai); }
+        static Trigger* resurrect_request(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "resurrect request"); }
+        static Trigger* gossip_hello(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "gossip hello"); }
+        static Trigger* group_invite(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "group invite"); }
+        static Trigger* group_set_leader(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "group set leader"); }
+        static Trigger* no_money(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "not enough money"); }
+        static Trigger* no_reputation(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "not enough reputation"); }
+        static Trigger* use_game_object(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "use game object"); }
+        static Trigger* complete_quest(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "complete quest"); }
+        static Trigger* accept_quest(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "accept quest"); }
+        static Trigger* quest_share(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "quest share"); }
+        static Trigger* loot_roll(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "loot roll"); }
+        static Trigger* taxi(PlayerbotAI* ai) { return new WorldPacketTrigger(ai, "activate taxi"); }
+    };
+};
diff --git a/src/game/playerbot/strategy/values/AlwaysLootListValue.h b/src/game/playerbot/strategy/values/AlwaysLootListValue.h
new file mode 100644
index 00000000000..22c2f3aaf81
--- /dev/null
+++ b/src/game/playerbot/strategy/values/AlwaysLootListValue.h
@@ -0,0 +1,14 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class AlwaysLootListValue : public ManualSetValue<set<uint32>&>
+	{
+	public:
+        AlwaysLootListValue(PlayerbotAI* ai) : ManualSetValue<set<uint32>&>(ai, list) {}
+
+    private:
+        set<uint32> list;
+    };
+}
diff --git a/src/game/playerbot/strategy/values/AoeHealValues.cpp b/src/game/playerbot/strategy/values/AoeHealValues.cpp
new file mode 100644
index 00000000000..f1e71b994d4
--- /dev/null
+++ b/src/game/playerbot/strategy/values/AoeHealValues.cpp
@@ -0,0 +1,37 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "AoeHealValues.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+uint8 AoeHealValue::Calculate()
+{
+    Group* group = bot->GetGroup();
+    if (!group)
+    	return 0;
+
+    float range = 0;
+    if (qualifier == "low")
+    	range = sPlayerbotAIConfig.lowHealth;
+    else if (qualifier == "medium")
+    	range = sPlayerbotAIConfig.mediumHealth;
+    else if (qualifier == "critical")
+    	range = sPlayerbotAIConfig.criticalHealth;
+
+    uint8 count = 0;
+	Group::MemberSlotList const& groupSlot = group->GetMemberSlots();
+	for (Group::member_citerator itr = groupSlot.begin(); itr != groupSlot.end(); itr++)
+	{
+		Player *player = sObjectMgr.GetPlayer(itr->guid);
+		if( !player || !player->isAlive())
+			continue;
+
+	    float percent = (static_cast<float> (player->GetHealth()) / player->GetMaxHealth()) * 100;
+	    if (percent <= range)
+	    	count++;
+	}
+
+	return count;
+}
+
diff --git a/src/game/playerbot/strategy/values/AoeHealValues.h b/src/game/playerbot/strategy/values/AoeHealValues.h
new file mode 100644
index 00000000000..d7d52c75e21
--- /dev/null
+++ b/src/game/playerbot/strategy/values/AoeHealValues.h
@@ -0,0 +1,14 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class AoeHealValue : public Uint8CalculatedValue, public Qualified
+	{
+	public:
+    	AoeHealValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai) {}
+
+    public:
+    	virtual uint8 Calculate();
+    };
+}
diff --git a/src/game/playerbot/strategy/values/AttackerCountValues.cpp b/src/game/playerbot/strategy/values/AttackerCountValues.cpp
new file mode 100644
index 00000000000..693cc5eeae3
--- /dev/null
+++ b/src/game/playerbot/strategy/values/AttackerCountValues.cpp
@@ -0,0 +1,110 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "AttackerCountValues.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+uint8 MyAttackerCountValue::Calculate()
+{
+    MapPtr map = bot->GetMapPtr();
+    uint8 count = map->GetAttackersFor(bot->GetObjectGuid()).size();
+    map = MapPtr();
+    return count;
+}
+
+bool HasAggroValue::Calculate()
+{
+    Unit* target = GetTarget();
+    if (!target)
+        return true;
+
+    HostileReference *ref = bot->getHostileRefManager().getFirst();
+    if (!ref)
+        return true; // simulate as target is not atacking anybody yet
+
+    while( ref )
+    {
+        ThreatManager *threatManager = ref->getSource();
+        Unit *attacker = threatManager->getOwner();
+        Unit *victim = attacker->getVictim();
+        if (victim == bot && target == attacker)
+            return true;
+        ref = ref->next();
+    }
+    return false;
+}
+
+uint8 AttackerCountValue::Calculate()
+{
+    int count = 0;
+    float range = sPlayerbotAIConfig.sightDistance;
+
+    list<ObjectGuid> attackers = context->GetValue<list<ObjectGuid> >("attackers")->Get();
+    for (list<ObjectGuid>::iterator i = attackers.begin(); i != attackers.end(); i++)
+    {
+        Unit* unit = ai->GetUnit(*i);
+        if (!unit || !unit->isAlive())
+            continue;
+
+        float distance = bot->GetDistance(unit);
+        if (distance <= range)
+            count++;
+    }
+
+    return count;
+}
+
+uint8 BalancePercentValue::Calculate()
+{
+    float playerLevel = 0,
+        attackerLevel = 0;
+
+    Group* group = bot->GetGroup();
+    if (group)
+    {
+        Group::MemberSlotList const& groupSlot = group->GetMemberSlots();
+        for (Group::member_citerator itr = groupSlot.begin(); itr != groupSlot.end(); itr++)
+        {
+            Player *player = sObjectMgr.GetPlayer(itr->guid);
+            if( !player || !player->isAlive())
+                continue;
+
+            playerLevel += player->getLevel();
+        }
+    }
+
+    list<ObjectGuid> v = context->GetValue<list<ObjectGuid> >("attackers")->Get();
+
+    for (list<ObjectGuid>::iterator i = v.begin(); i!=v.end(); i++)
+    {
+        Creature* creature = ai->GetCreature((*i));
+        if (!creature || !creature->isAlive())
+            continue;
+
+        uint32 level = creature->getLevel();
+
+        switch (creature->GetCreatureInfo()->Rank) {
+        case CREATURE_ELITE_RARE:
+            level *= 2;
+            break;
+        case CREATURE_ELITE_ELITE:
+            level *= 3;
+            break;
+        case CREATURE_ELITE_RAREELITE:
+            level *= 3;
+            break;
+        case CREATURE_ELITE_WORLDBOSS:
+            level *= 5;
+            break;
+        }
+        attackerLevel += level;
+    }
+
+    if (!attackerLevel)
+        return 100;
+
+    float percent = playerLevel * 100 / attackerLevel;
+    return percent <= 200 ? (uint8)percent : 200;
+}
+
diff --git a/src/game/playerbot/strategy/values/AttackerCountValues.h b/src/game/playerbot/strategy/values/AttackerCountValues.h
new file mode 100644
index 00000000000..9c77a3f482d
--- /dev/null
+++ b/src/game/playerbot/strategy/values/AttackerCountValues.h
@@ -0,0 +1,59 @@
+#pragma once
+#include "StatsValues.h"
+
+namespace ai
+{
+
+    class AttackerCountValue : public Uint8CalculatedValue, public Qualified
+    {
+    public:
+        AttackerCountValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual uint8 Calculate();
+    };
+
+    class MyAttackerCountValue : public Uint8CalculatedValue, public Qualified
+    {
+    public:
+        MyAttackerCountValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual uint8 Calculate();
+    };
+
+    class HasAggroValue : public BoolCalculatedValue, public Qualified
+    {
+    public:
+        HasAggroValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual bool Calculate();
+    };
+
+    class BalancePercentValue : public Uint8CalculatedValue, public Qualified
+    {
+    public:
+        BalancePercentValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual uint8 Calculate();
+    };
+
+}
diff --git a/src/game/playerbot/strategy/values/AttackerWithoutAuraTargetValue.cpp b/src/game/playerbot/strategy/values/AttackerWithoutAuraTargetValue.cpp
new file mode 100644
index 00000000000..10da8d22819
--- /dev/null
+++ b/src/game/playerbot/strategy/values/AttackerWithoutAuraTargetValue.cpp
@@ -0,0 +1,26 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "AttackerWithoutAuraTargetValue.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+Unit* AttackerWithoutAuraTargetValue::Calculate()
+{
+    list<ObjectGuid> attackers = ai->GetAiObjectContext()->GetValue<list<ObjectGuid> >("attackers")->Get();
+    Unit* target = ai->GetAiObjectContext()->GetValue<Unit*>("current target")->Get();
+    for (list<ObjectGuid>::iterator i = attackers.begin(); i != attackers.end(); ++i)
+    {
+        Unit* unit = ai->GetUnit(*i);
+        if (!unit || unit == target)
+            continue;
+
+        if (bot->GetDistance(unit) > sPlayerbotAIConfig.spellDistance)
+            continue;
+
+        if (!ai->HasAura(qualifier, unit))
+            return unit;
+    }
+
+    return NULL;
+}
diff --git a/src/game/playerbot/strategy/values/AttackerWithoutAuraTargetValue.h b/src/game/playerbot/strategy/values/AttackerWithoutAuraTargetValue.h
new file mode 100644
index 00000000000..70a89836388
--- /dev/null
+++ b/src/game/playerbot/strategy/values/AttackerWithoutAuraTargetValue.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class AttackerWithoutAuraTargetValue : public UnitCalculatedValue, public Qualified
+	{
+	public:
+        AttackerWithoutAuraTargetValue(PlayerbotAI* ai) :
+            UnitCalculatedValue(ai, "attacker without aura") {}
+
+    protected:
+        virtual Unit* Calculate();
+	};
+}
diff --git a/src/game/playerbot/strategy/values/AttackersValue.cpp b/src/game/playerbot/strategy/values/AttackersValue.cpp
new file mode 100644
index 00000000000..aa94ce0918a
--- /dev/null
+++ b/src/game/playerbot/strategy/values/AttackersValue.cpp
@@ -0,0 +1,85 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "AttackersValue.h"
+
+#include "../../../GridNotifiers.h"
+#include "../../../GridNotifiersImpl.h"
+#include "../../../CellImpl.h"
+
+using namespace ai;
+using namespace MaNGOS;
+
+list<ObjectGuid> AttackersValue::Calculate()
+{
+    set<Unit*> targets;
+
+    AddAttackersOf(bot, targets);
+
+    Group* group = bot->GetGroup();
+    if (group)
+        AddAttackersOf(group, targets);
+
+    RemoveNonThreating(targets);
+
+    list<ObjectGuid> result;
+	for (set<Unit*>::iterator i = targets.begin(); i != targets.end(); i++)
+		result.push_back((*i)->GetObjectGuid());
+
+    if (bot->duel && bot->duel->opponent)
+        result.push_back(bot->duel->opponent->GetObjectGuid());
+
+	return result;
+}
+
+void AttackersValue::AddAttackersOf(Group* group, set<Unit*>& targets)
+{
+    Group::MemberSlotList const& groupSlot = group->GetMemberSlots();
+    for (Group::member_citerator itr = groupSlot.begin(); itr != groupSlot.end(); itr++)
+    {
+        Player *member = sObjectMgr.GetPlayer(itr->guid);
+        if (!member || !member->isAlive() || member == bot)
+            continue;
+
+        AddAttackersOf(member, targets);
+    }
+}
+
+void AttackersValue::AddAttackersOf(Player* player, set<Unit*>& targets)
+{
+    if (player->IsBeingTeleported() || player->IsBeingTeleportedDelayEvent())
+        return;
+
+	list<Unit*> units;
+	MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck u_check(player, sPlayerbotAIConfig.sightDistance);
+    MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck> searcher(units, u_check);
+    Cell::VisitAllObjects(player, searcher, sPlayerbotAIConfig.sightDistance);
+	for (list<Unit*>::iterator i = units.begin(); i != units.end(); i++)
+		targets.insert(*i);
+}
+
+void AttackersValue::RemoveNonThreating(set<Unit*>& targets)
+{
+    for(set<Unit *>::iterator tIter = targets.begin(); tIter != targets.end();)
+    {
+        Unit* unit = *tIter;
+        if(!bot->IsWithinLOSInMap(unit) || bot->GetMapId() != unit->GetMapId() || !hasRealThreat(unit))
+        {
+            set<Unit *>::iterator tIter2 = tIter;
+            ++tIter;
+            targets.erase(tIter2);
+        }
+        else
+            ++tIter;
+    }
+}
+
+bool AttackersValue::hasRealThreat(Unit *attacker)
+{
+    return attacker &&
+        attacker->IsInWorld() &&
+        attacker->isAlive() &&
+        !attacker->IsPolymorphed() &&
+        !attacker->isInRoots() &&
+        !attacker->IsFriendlyTo(bot) &&
+        (attacker->getThreatManager().getCurrentVictim() || attacker->GetObjectGuid().IsPlayer());
+}
diff --git a/src/game/playerbot/strategy/values/AttackersValue.h b/src/game/playerbot/strategy/values/AttackersValue.h
new file mode 100644
index 00000000000..a7d9d6c2da9
--- /dev/null
+++ b/src/game/playerbot/strategy/values/AttackersValue.h
@@ -0,0 +1,20 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+#include "NearestUnitsValue.h"
+
+namespace ai
+{
+    class AttackersValue : public ObjectGuidListCalculatedValue
+	{
+	public:
+        AttackersValue(PlayerbotAI* ai) : ObjectGuidListCalculatedValue(ai, "attackers", 5) {}
+        list<ObjectGuid> Calculate();
+
+	private:
+        void AddAttackersOf(Group* group, set<Unit*>& targets);
+        void AddAttackersOf(Player* player, set<Unit*>& targets);
+		void RemoveNonThreating(set<Unit*>& targets);
+		bool hasRealThreat(Unit* attacker);
+    };
+}
diff --git a/src/game/playerbot/strategy/values/AvailableLootValue.h b/src/game/playerbot/strategy/values/AvailableLootValue.h
new file mode 100644
index 00000000000..806f2ef5d33
--- /dev/null
+++ b/src/game/playerbot/strategy/values/AvailableLootValue.h
@@ -0,0 +1,40 @@
+#pragma once
+#include "../Value.h"
+#include "../../LootObjectStack.h"
+
+namespace ai
+{
+   
+    class AvailableLootValue : public ManualSetValue<LootObjectStack*>
+	{
+	public:
+        AvailableLootValue(PlayerbotAI* ai) : ManualSetValue<LootObjectStack*>(ai, NULL) 
+        {
+            value = new LootObjectStack(ai->GetBot());
+        }
+
+        virtual ~AvailableLootValue()
+        {
+            if (value) 
+                delete value;
+        }
+    };
+
+    class LootTargetValue : public ManualSetValue<LootObject>
+    {
+    public:
+        LootTargetValue(PlayerbotAI* ai) : ManualSetValue<LootObject>(ai, LootObject()) {}
+    };
+
+    class CanLootValue : public BoolCalculatedValue
+    {
+    public:
+        CanLootValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+        virtual bool Calculate()
+        {
+            LootObject loot = AI_VALUE(LootObject, "loot target");
+            return !loot.IsEmpty() && loot.GetWorldObject(bot) && AI_VALUE2(float, "distance", "loot target") <= INTERACTION_DISTANCE;
+        }
+    };
+}
diff --git a/src/game/playerbot/strategy/values/CcTargetValue.cpp b/src/game/playerbot/strategy/values/CcTargetValue.cpp
new file mode 100644
index 00000000000..a400802f93e
--- /dev/null
+++ b/src/game/playerbot/strategy/values/CcTargetValue.cpp
@@ -0,0 +1,88 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "CcTargetValue.h"
+#include "../../PlayerbotAIConfig.h"
+#include "../Action.h"
+
+using namespace ai;
+
+class FindTargetForCcStrategy : public FindTargetStrategy
+{
+public:
+    FindTargetForCcStrategy(PlayerbotAI* ai, string spell) : FindTargetStrategy(ai)
+    {
+        this->spell = spell;
+        maxDistance = 0;
+    }
+
+public:
+    virtual void CheckAttacker(Unit* creature, ThreatManager* threatManager)
+    {
+        Player* bot = ai->GetBot();
+        if (*ai->GetAiObjectContext()->GetValue<Unit*>("current target") == creature)
+            return;
+
+        uint8 health = creature->GetHealthPercent();
+        if (health < sPlayerbotAIConfig.mediumHealth)
+            return;
+
+        if (!ai->CanCastSpell(spell, creature))
+            return;
+
+        if (*ai->GetAiObjectContext()->GetValue<Unit*>("rti target") == creature)
+        {
+            result = creature;
+            return;
+        }
+
+        float minDistance = sPlayerbotAIConfig.spellDistance;
+        Group* group = bot->GetGroup();
+        if (!group)
+            return;
+
+        if (group->GetTargetIcon(4) == creature->GetObjectGuid())
+        {
+            result = creature;
+            return;
+        }
+
+        int tankCount, dpsCount;
+        GetPlayerCount(creature, &tankCount, &dpsCount);
+        if (!tankCount || !dpsCount)
+        {
+            result = creature;
+            return;
+        }
+
+        Group::MemberSlotList const& groupSlot = group->GetMemberSlots();
+        for (Group::member_citerator itr = groupSlot.begin(); itr != groupSlot.end(); itr++)
+        {
+            Player *member = sObjectMgr.GetPlayer(itr->guid);
+            if( !member || !member->isAlive() || member == bot)
+                continue;
+
+            if (!ai->IsTank(member))
+                continue;
+
+            float distance = member->GetDistance(creature);
+            if (distance < minDistance)
+                minDistance = distance;
+        }
+
+        if (!result || minDistance > maxDistance)
+        {
+            result = creature;
+            maxDistance = minDistance;
+        }
+    }
+
+private:
+    string spell;
+    float maxDistance;
+};
+
+Unit* CcTargetValue::Calculate()
+{
+    FindTargetForCcStrategy strategy(ai, qualifier);
+    return FindTarget(&strategy);
+}
diff --git a/src/game/playerbot/strategy/values/CcTargetValue.h b/src/game/playerbot/strategy/values/CcTargetValue.h
new file mode 100644
index 00000000000..a27f8c7c368
--- /dev/null
+++ b/src/game/playerbot/strategy/values/CcTargetValue.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+
+namespace ai
+{
+   
+    class CcTargetValue : public TargetValue, public Qualified
+	{
+	public:
+        CcTargetValue(PlayerbotAI* ai) : TargetValue(ai) {}
+
+    public:
+        Unit* Calculate();
+    };
+}
diff --git a/src/game/playerbot/strategy/values/ChatValue.h b/src/game/playerbot/strategy/values/ChatValue.h
new file mode 100644
index 00000000000..b39a5830035
--- /dev/null
+++ b/src/game/playerbot/strategy/values/ChatValue.h
@@ -0,0 +1,11 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class ChatValue : public ManualSetValue<ChatMsg>
+	{
+	public:
+        ChatValue(PlayerbotAI* ai) : ManualSetValue<ChatMsg>(ai, CHAT_MSG_WHISPER) {}
+    };
+}
diff --git a/src/game/playerbot/strategy/values/CurrentCcTargetValue.cpp b/src/game/playerbot/strategy/values/CurrentCcTargetValue.cpp
new file mode 100644
index 00000000000..932b0c006fd
--- /dev/null
+++ b/src/game/playerbot/strategy/values/CurrentCcTargetValue.cpp
@@ -0,0 +1,31 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "CurrentCcTargetValue.h"
+
+using namespace ai;
+
+class FindCurrentCcTargetStrategy : public FindTargetStrategy
+{
+public:
+    FindCurrentCcTargetStrategy(PlayerbotAI* ai, string spell) : FindTargetStrategy(ai)
+    {
+        this->spell = spell;
+    }
+
+public:
+    virtual void CheckAttacker(Unit* attacker, ThreatManager* threatManager)
+    {
+        if (ai->HasAura(spell, attacker))
+            result = attacker;
+    }
+
+private:
+    string spell;
+};
+
+
+Unit* CurrentCcTargetValue::Calculate()
+{
+    FindCurrentCcTargetStrategy strategy(ai, qualifier);
+    return FindTarget(&strategy);
+}
diff --git a/src/game/playerbot/strategy/values/CurrentCcTargetValue.h b/src/game/playerbot/strategy/values/CurrentCcTargetValue.h
new file mode 100644
index 00000000000..30646c73d67
--- /dev/null
+++ b/src/game/playerbot/strategy/values/CurrentCcTargetValue.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+
+namespace ai
+{
+   
+    class CurrentCcTargetValue : public TargetValue, public Qualified
+	{
+	public:
+        CurrentCcTargetValue(PlayerbotAI* ai) : TargetValue(ai) {}
+
+    public:
+        Unit* Calculate();
+    };
+}
diff --git a/src/game/playerbot/strategy/values/CurrentTargetValue.cpp b/src/game/playerbot/strategy/values/CurrentTargetValue.cpp
new file mode 100644
index 00000000000..08e66890bef
--- /dev/null
+++ b/src/game/playerbot/strategy/values/CurrentTargetValue.cpp
@@ -0,0 +1,24 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "CurrentTargetValue.h"
+
+using namespace ai;
+
+Unit* CurrentTargetValue::Get()
+{
+    
+
+    if (selection.IsEmpty())
+        return NULL;
+
+    Unit* unit = sObjectAccessor.GetUnit(*bot, selection);
+    if (unit && !bot->IsWithinLOSInMap(unit))
+        return NULL;
+
+    return unit;
+}
+
+void CurrentTargetValue::Set(Unit* target)
+{
+    selection = target ? target->GetObjectGuid() : ObjectGuid(); 
+}
diff --git a/src/game/playerbot/strategy/values/CurrentTargetValue.h b/src/game/playerbot/strategy/values/CurrentTargetValue.h
new file mode 100644
index 00000000000..6b9fb691f69
--- /dev/null
+++ b/src/game/playerbot/strategy/values/CurrentTargetValue.h
@@ -0,0 +1,17 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class CurrentTargetValue : public UnitManualSetValue
+	{
+	public:
+        CurrentTargetValue(PlayerbotAI* ai) : UnitManualSetValue(ai, NULL) {}
+
+        virtual Unit* Get();
+        virtual void Set(Unit* unit);
+
+    private:
+        ObjectGuid selection;
+    };
+}
diff --git a/src/game/playerbot/strategy/values/DistanceValue.h b/src/game/playerbot/strategy/values/DistanceValue.h
new file mode 100644
index 00000000000..43277fdb988
--- /dev/null
+++ b/src/game/playerbot/strategy/values/DistanceValue.h
@@ -0,0 +1,35 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+#include "../../LootObjectStack.h"
+
+namespace ai
+{
+    class DistanceValue : public FloatCalculatedValue, public Qualified
+	{
+	public:
+        DistanceValue(PlayerbotAI* ai) : FloatCalculatedValue(ai) {}
+
+    public:
+        float Calculate()
+        {
+            if (qualifier == "loot target")
+            {
+                LootObject loot = AI_VALUE(LootObject, qualifier);
+                if (loot.IsEmpty())
+                    return 0.0f;
+
+                WorldObject* obj = loot.GetWorldObject(bot);
+                if (!obj)
+                    return 0.0f;
+
+                return ai->GetBot()->GetDistance(obj);
+            }
+            Unit* target = AI_VALUE(Unit*, qualifier);
+            if (!target || !target->IsInWorld())
+                return 0.0f;
+
+            return ai->GetBot()->GetDistance(target);
+        }
+    };
+}
diff --git a/src/game/playerbot/strategy/values/DpsTargetValue.cpp b/src/game/playerbot/strategy/values/DpsTargetValue.cpp
new file mode 100644
index 00000000000..afcdcbca7c9
--- /dev/null
+++ b/src/game/playerbot/strategy/values/DpsTargetValue.cpp
@@ -0,0 +1,45 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DpsTargetValue.h"
+
+using namespace ai;
+
+class FindTargetForDpsStrategy : public FindTargetStrategy
+{
+public:
+    FindTargetForDpsStrategy(PlayerbotAI* ai) : FindTargetStrategy(ai)
+    {
+        minThreat = 0;
+        maxTankCount = 0;
+        minDpsCount = 0;
+    }
+
+public:
+    virtual void CheckAttacker(Unit* creature, ThreatManager* threatManager)
+    {
+        float threat = threatManager->getThreat(ai->GetBot());
+        int tankCount, dpsCount;
+        GetPlayerCount(creature, &tankCount, &dpsCount);
+
+        if (!result ||
+            minThreat >= threat && (maxTankCount <= tankCount || minDpsCount >= dpsCount))
+        {
+            minThreat = threat;
+            maxTankCount = tankCount;
+            minDpsCount = dpsCount;
+            result = creature;
+        }
+    }
+
+protected:
+    float minThreat;
+    int maxTankCount;
+    int minDpsCount;
+};
+
+
+Unit* DpsTargetValue::Calculate()
+{
+    FindTargetForDpsStrategy strategy(ai);
+    return FindTarget(&strategy);
+}
diff --git a/src/game/playerbot/strategy/values/DpsTargetValue.h b/src/game/playerbot/strategy/values/DpsTargetValue.h
new file mode 100644
index 00000000000..dcfcc8bca59
--- /dev/null
+++ b/src/game/playerbot/strategy/values/DpsTargetValue.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+
+namespace ai
+{
+   
+    class DpsTargetValue : public TargetValue
+	{
+	public:
+        DpsTargetValue(PlayerbotAI* ai) : TargetValue(ai) {}
+
+    public:
+        Unit* Calculate();
+    };
+}
diff --git a/src/game/playerbot/strategy/values/DuelTargetValue.cpp b/src/game/playerbot/strategy/values/DuelTargetValue.cpp
new file mode 100644
index 00000000000..06c9bf35c32
--- /dev/null
+++ b/src/game/playerbot/strategy/values/DuelTargetValue.cpp
@@ -0,0 +1,10 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "DuelTargetValue.h"
+
+using namespace ai;
+
+Unit* DuelTargetValue::Calculate()
+{
+    return bot->duel ? bot->duel->opponent : NULL;
+}
diff --git a/src/game/playerbot/strategy/values/DuelTargetValue.h b/src/game/playerbot/strategy/values/DuelTargetValue.h
new file mode 100644
index 00000000000..9e7d2d681a4
--- /dev/null
+++ b/src/game/playerbot/strategy/values/DuelTargetValue.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+
+namespace ai
+{
+    class DuelTargetValue : public TargetValue
+	{
+	public:
+        DuelTargetValue(PlayerbotAI* ai) : TargetValue(ai) {}
+
+    public:
+        Unit* Calculate();
+    };
+}
diff --git a/src/game/playerbot/strategy/values/EnemyHealerTargetValue.cpp b/src/game/playerbot/strategy/values/EnemyHealerTargetValue.cpp
new file mode 100644
index 00000000000..25b5d261e3d
--- /dev/null
+++ b/src/game/playerbot/strategy/values/EnemyHealerTargetValue.cpp
@@ -0,0 +1,36 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "EnemyHealerTargetValue.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+Unit* EnemyHealerTargetValue::Calculate()
+{
+    string spell = qualifier;
+
+    list<ObjectGuid> attackers = ai->GetAiObjectContext()->GetValue<list<ObjectGuid> >("attackers")->Get();
+    Unit* target = ai->GetAiObjectContext()->GetValue<Unit*>("current target")->Get();
+    for (list<ObjectGuid>::iterator i = attackers.begin(); i != attackers.end(); ++i)
+    {
+        Unit* unit = ai->GetUnit(*i);
+        if (!unit || unit == target)
+            continue;
+
+        if (bot->GetDistance(unit) > sPlayerbotAIConfig.spellDistance)
+            continue;
+
+        if (!ai->IsInterruptableSpellCasting(unit, spell))
+            continue;
+
+        Spell* spell = unit->GetCurrentSpell(CURRENT_GENERIC_SPELL);
+        if (spell && IsPositiveSpell(spell->m_spellInfo))
+            return unit;
+
+        spell = unit->GetCurrentSpell(CURRENT_CHANNELED_SPELL);
+        if (spell && IsPositiveSpell(spell->m_spellInfo))
+            return unit;
+    }
+
+    return NULL;
+}
diff --git a/src/game/playerbot/strategy/values/EnemyHealerTargetValue.h b/src/game/playerbot/strategy/values/EnemyHealerTargetValue.h
new file mode 100644
index 00000000000..bea36c4b9bc
--- /dev/null
+++ b/src/game/playerbot/strategy/values/EnemyHealerTargetValue.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class EnemyHealerTargetValue : public UnitCalculatedValue, public Qualified
+	{
+	public:
+        EnemyHealerTargetValue(PlayerbotAI* ai) :
+            UnitCalculatedValue(ai, "enemy healer target") {}
+
+    protected:
+        virtual Unit* Calculate();
+	};
+}
diff --git a/src/game/playerbot/strategy/values/EnemyPlayerValue.cpp b/src/game/playerbot/strategy/values/EnemyPlayerValue.cpp
new file mode 100644
index 00000000000..5576e75f20d
--- /dev/null
+++ b/src/game/playerbot/strategy/values/EnemyPlayerValue.cpp
@@ -0,0 +1,34 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "EnemyPlayerValue.h"
+#include "TargetValue.h"
+
+using namespace ai;
+using namespace std;
+
+class FindEnemyPlayerStrategy : public FindTargetStrategy
+{
+public:
+    FindEnemyPlayerStrategy(PlayerbotAI* ai) : FindTargetStrategy(ai)
+    {
+    }
+
+public:
+    virtual void CheckAttacker(Unit* attacker, ThreatManager* threatManager)
+    {
+        if (!result)
+        {
+            Player* enemy = dynamic_cast<Player*>(attacker);
+            if (enemy && ai->IsOpposing(enemy) && enemy->IsOutdoorPvPActive())
+                result = attacker;
+        }
+    }
+
+};
+
+
+Unit* EnemyPlayerValue::Calculate()
+{
+    FindEnemyPlayerStrategy strategy(ai);
+    return FindTarget(&strategy);
+}
diff --git a/src/game/playerbot/strategy/values/EnemyPlayerValue.h b/src/game/playerbot/strategy/values/EnemyPlayerValue.h
new file mode 100644
index 00000000000..ea507399fe9
--- /dev/null
+++ b/src/game/playerbot/strategy/values/EnemyPlayerValue.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+
+namespace ai
+{
+    class EnemyPlayerValue : public TargetValue
+	{
+	public:
+        EnemyPlayerValue(PlayerbotAI* ai) : TargetValue(ai) {}
+
+    public:
+        Unit* Calculate();
+    };
+}
diff --git a/src/game/playerbot/strategy/values/Formations.cpp b/src/game/playerbot/strategy/values/Formations.cpp
new file mode 100644
index 00000000000..eaa72c1a7be
--- /dev/null
+++ b/src/game/playerbot/strategy/values/Formations.cpp
@@ -0,0 +1,331 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "Formations.h"
+#include "formations/Arrow.h"
+
+using namespace ai;
+
+namespace ai
+{
+    class MeleeFormation : public FollowFormation
+    {
+    public:
+        MeleeFormation(PlayerbotAI* ai) : FollowFormation(ai, "melee") {}
+        virtual string GetTargetName() { return "master target"; }
+    };
+
+    class QueueFormation : public FollowFormation
+    {
+    public:
+        QueueFormation(PlayerbotAI* ai) : FollowFormation(ai, "queue") {}
+        virtual string GetTargetName() { return "line target"; }
+    };
+
+    class ChaosFormation : public MoveFormation
+    {
+    public:
+        ChaosFormation(PlayerbotAI* ai) : MoveFormation(ai, "chaos") {}
+        virtual WorldLocation GetLocation()
+        {
+            Player* master = GetMaster();
+            if (!master)
+                return WorldLocation();
+
+            float range = sPlayerbotAIConfig.lootDistance * (float)(rand() % 10) / 10;
+			float angle = GetFollowAngle();
+            float x = master->GetPositionX() + cos(angle) * range;
+            float y = master->GetPositionY() + sin(angle) * range;
+            float z = master->GetPositionZ();
+
+            return WorldLocation(master->GetMapId(), x, y, z);
+        }
+
+        virtual float GetMaxDistance() { return sPlayerbotAIConfig.lootDistance; }
+    };
+
+    class CircleFormation : public MoveFormation
+    {
+    public:
+        CircleFormation(PlayerbotAI* ai) : MoveFormation(ai, "circle") {}
+        virtual WorldLocation GetLocation()
+        {
+            float range = 2.0f;
+
+            Unit* target = AI_VALUE(Unit*, "current target");
+            Player* master = GetMaster();
+            if (!target)
+                target = master;
+
+            if (!target)
+				return WorldLocation::Null;
+
+            switch (bot->getClass())
+            {
+            case CLASS_HUNTER:
+            case CLASS_MAGE:
+            case CLASS_PRIEST:
+            case CLASS_WARLOCK:
+                range = sPlayerbotAIConfig.fleeDistance;
+                break;
+            case CLASS_DRUID:
+                if (!ai->IsTank(bot))
+                    range = sPlayerbotAIConfig.fleeDistance;
+                break;
+            case CLASS_SHAMAN:
+                if (ai->IsHeal(bot))
+                    range = sPlayerbotAIConfig.fleeDistance;
+                break;
+            }
+
+            float x = target->GetPositionX();
+            float y = target->GetPositionY();
+            float z = target->GetPositionZ();
+            float angle = GetFollowAngle();
+
+            return WorldLocation(bot->GetMapId(), x + cos(angle) * range, y + sin(angle) * range, z);
+        }
+    };
+
+    class LineFormation : public MoveFormation
+    {
+    public:
+        LineFormation(PlayerbotAI* ai) : MoveFormation(ai, "line") {}
+        virtual WorldLocation GetLocation()
+        {
+            Group* group = bot->GetGroup();
+            if (!group)
+                return WorldLocation::Null;
+
+            float range = 2.0f;
+
+            Player* master = GetMaster();
+            if (!master)
+                return WorldLocation::Null;
+
+            float x = master->GetPositionX();
+            float y = master->GetPositionY();
+            float z = master->GetPositionZ();
+            float orientation = master->GetOrientation();
+
+            vector<Player*> players;
+            GroupReference *gref = group->GetFirstMember();
+            while( gref )
+            {
+                Player* member = gref->getSource();
+                if (member != master)
+                    players.push_back(member);
+
+                gref = gref->next();
+            }
+
+            players.insert(players.begin() + group->GetMembersCount() / 2, master);
+
+            return MoveLine(players, 0.0f, x, y, z, orientation, range);
+        }
+    };
+
+    class ShieldFormation : public MoveFormation
+    {
+    public:
+        ShieldFormation(PlayerbotAI* ai) : MoveFormation(ai, "shield") {}
+        virtual WorldLocation GetLocation()
+        {
+            Group* group = bot->GetGroup();
+            if (!group)
+                return WorldLocation::Null;
+
+            float range = sPlayerbotAIConfig.followDistance;
+
+            Player* master = GetMaster();
+            if (!master)
+                return WorldLocation::Null;
+
+            float x = master->GetPositionX();
+            float y = master->GetPositionY();
+            float z = master->GetPositionZ();
+            float orientation = master->GetOrientation();
+
+            vector<Player*> tanks;
+            vector<Player*> dps;
+            GroupReference *gref = group->GetFirstMember();
+            while( gref )
+            {
+                Player* member = gref->getSource();
+                if (member != master)
+                {
+                    if (ai->IsTank(member))
+                        tanks.push_back(member);
+                    else
+                        dps.push_back(member);
+                }
+
+                gref = gref->next();
+            }
+
+            if (ai->IsTank(master))
+                tanks.insert(tanks.begin() + (tanks.size() + 1) / 2, master);
+            else
+                dps.insert(dps.begin() + (dps.size() + 1) / 2, master);
+
+            if (ai->IsTank(bot) && ai->IsTank(master))
+            {
+                return MoveLine(tanks, 0.0f, x, y, z, orientation, range);
+            }
+            if (!ai->IsTank(bot) && !ai->IsTank(master))
+            {
+                return MoveLine(dps, 0.0f, x, y, z, orientation, range);
+            }
+            if (ai->IsTank(bot) && !ai->IsTank(master))
+            {
+                float diff = tanks.size() % 2 == 0 ? -sPlayerbotAIConfig.tooCloseDistance / 2.0f : 0.0f;
+                return MoveLine(tanks, diff, x + cos(orientation) * range, y + sin(orientation) * range, z, orientation, range);
+            }
+            if (!ai->IsTank(bot) && ai->IsTank(master))
+            {
+                float diff = dps.size() % 2 == 0 ? -sPlayerbotAIConfig.tooCloseDistance / 2.0f : 0.0f;
+                return MoveLine(dps, diff, x - cos(orientation) * range, y - sin(orientation) * range, z, orientation, range);
+            }
+            return WorldLocation::Null;
+        }
+    };
+};
+
+float Formation::GetFollowAngle()
+{
+    Player* master = GetMaster();
+    Group* group = master ? master->GetGroup() : bot->GetGroup();
+    if (!group)
+        return 0.0f;
+
+    int index = 1;
+    for (GroupReference *ref = group->GetFirstMember(); ref; ref = ref->next())
+    {
+        if( ref->getSource() == master)
+            continue;
+
+        if( ref->getSource() == bot)
+            return 2 * M_PI / (group->GetMembersCount() -1) * index;
+
+        index++;
+    }
+    return 0;
+}
+
+FormationValue::FormationValue(PlayerbotAI* ai) : ManualSetValue<Formation*>(ai, new MeleeFormation(ai), "formation")
+{
+}
+
+bool SetFormationAction::Execute(Event event)
+{
+    string formation = event.getParam();
+
+	Value<Formation*>* value = context->GetValue<Formation*>("formation");
+    if (formation == "?" || formation.empty())
+    {
+        ostringstream str; str << "Formation: |cff00ff00" << value->Get()->getName();
+        ai->TellMaster(str);
+        return true;
+    }
+
+    if (formation == "melee" || formation == "default")
+    {
+        if (value->Get()) delete value->Get();
+        value->Set(new MeleeFormation(ai));
+    }
+    else if (formation == "queue")
+    {
+        if (value->Get()) delete value->Get();
+        value->Set(new QueueFormation(ai));
+    }
+    else if (formation == "chaos")
+    {
+        if (value->Get()) delete value->Get();
+        value->Set(new ChaosFormation(ai));
+    }
+    else if (formation == "circle")
+    {
+        if (value->Get()) delete value->Get();
+        value->Set(new CircleFormation(ai));
+    }
+    else if (formation == "line")
+    {
+        if (value->Get()) delete value->Get();
+        value->Set(new LineFormation(ai));
+    }
+    else if (formation == "shield")
+    {
+        if (value->Get()) delete value->Get();
+        value->Set(new ShieldFormation(ai));
+    }
+    else if (formation == "arrow")
+    {
+        if (value->Get()) delete value->Get();
+        value->Set(new ArrowFormation(ai));
+    }
+    else
+    {
+        ostringstream str; str << "Invalid formation: |cffff0000" << formation;
+        ai->TellMaster(str);
+        ai->TellMaster("Please set to any of:|cffffffff melee (default), queue, chaos, circle, line, shield, arrow");
+        return false;
+    }
+
+    ostringstream str; str << "Formation set to: " << formation;
+    ai->TellMaster(str);
+    return true;
+}
+
+
+WorldLocation MoveFormation::MoveLine(vector<Player*> line, float diff, float cx, float cy, float cz, float orientation, float range)
+{
+    if (line.size() < 5)
+    {
+        return MoveSingleLine(line, diff, cx, cy, cz, orientation, range);
+    }
+
+    int lines = ceil((double)line.size() / 5.0);
+    for (int i = 0; i < lines; i++)
+    {
+        float radius = range * i;
+        float x = cx + cos(orientation) * radius;
+        float y = cy + sin(orientation) * radius;
+        vector<Player*> singleLine;
+        for (int j = 0; j < 5 && !line.empty(); j++)
+        {
+            singleLine.push_back(line[line.size() - 1]);
+            line.pop_back();
+        }
+
+        WorldLocation loc = MoveSingleLine(singleLine, diff, x, y,cz, orientation, range);
+        if (loc != WorldLocation::Null)
+            return loc;
+    }
+
+    return WorldLocation::Null;
+}
+
+WorldLocation MoveFormation::MoveSingleLine(vector<Player*> line, float diff, float cx, float cy, float cz, float orientation, float range)
+{
+    float count = line.size();
+    float angle = orientation - M_PI / 2.0f;
+    float x = cx + cos(angle) * (range * floor(count / 2.0f) + diff);
+    float y = cy + sin(angle) * (range * floor(count / 2.0f) + diff);
+
+    int index = 0;
+    for (vector<Player*>::iterator i = line.begin(); i != line.end(); i++)
+    {
+        Player* member = *i;
+
+        if (member == bot)
+        {
+            float angle = orientation + M_PI / 2.0f;
+            float radius = range * index;
+
+            return WorldLocation(bot->GetMapId(), x + cos(angle) * radius, y + sin(angle) * radius, cz);
+        }
+
+        index++;
+    }
+
+    return WorldLocation::Null;
+}
diff --git a/src/game/playerbot/strategy/values/Formations.h b/src/game/playerbot/strategy/values/Formations.h
new file mode 100644
index 00000000000..e28c3b3b927
--- /dev/null
+++ b/src/game/playerbot/strategy/values/Formations.h
@@ -0,0 +1,51 @@
+#pragma once
+#include "../Value.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class Formation : public AiNamedObject
+    {
+    public:
+        Formation(PlayerbotAI* ai, string name) : AiNamedObject (ai, name) {}
+
+    public:
+        virtual string GetTargetName() { return ""; }
+        virtual WorldLocation GetLocation() { return WorldLocation::Null; }
+        virtual float GetMaxDistance() { return sPlayerbotAIConfig.followDistance; }
+
+    protected:
+        float GetFollowAngle();
+    };
+
+    class FollowFormation : public Formation
+    {
+    public:
+        FollowFormation(PlayerbotAI* ai, string name) : Formation(ai, name) {}
+    };
+
+    class MoveFormation : public Formation
+    {
+    public:
+        MoveFormation(PlayerbotAI* ai, string name) : Formation(ai, name) {}
+
+    protected:
+        WorldLocation MoveLine(vector<Player*> line, float diff, float cx, float cy, float cz, float orientation, float range);
+        WorldLocation MoveSingleLine(vector<Player*> line, float diff, float cx, float cy, float cz, float orientation, float range);
+    };
+
+    class FormationValue : public ManualSetValue<Formation*>
+	{
+	public:
+        FormationValue(PlayerbotAI* ai);
+        ~FormationValue() { if (value) { delete value; value = NULL; } }
+    };
+
+    class SetFormationAction : public Action
+    {
+    public:
+        SetFormationAction(PlayerbotAI* ai) : Action(ai, "set formation") {}
+        virtual bool Execute(Event event);
+    };
+};
+
diff --git a/src/game/playerbot/strategy/values/GrindTargetValue.cpp b/src/game/playerbot/strategy/values/GrindTargetValue.cpp
new file mode 100644
index 00000000000..18f971b30f7
--- /dev/null
+++ b/src/game/playerbot/strategy/values/GrindTargetValue.cpp
@@ -0,0 +1,116 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GrindTargetValue.h"
+#include "../../PlayerbotAIConfig.h"
+#include "../../RandomPlayerbotMgr.h"
+
+using namespace ai;
+
+Unit* GrindTargetValue::Calculate()
+{
+    uint32 memberCount = 1;
+    Group* group = bot->GetGroup();
+    if (group)
+        memberCount = group->GetMembersCount();
+
+    Unit* target = NULL;
+    uint32 assistCount = 0;
+    while (!target && assistCount < memberCount)
+    {
+        target = FindTargetForGrinding(assistCount++);
+    }
+
+    return target;
+}
+
+
+Unit* GrindTargetValue::FindTargetForGrinding(int assistCount)
+{
+    uint32 memberCount = 1;
+    Group* group = bot->GetGroup();
+    Player* master = GetMaster();
+
+    list<ObjectGuid> targets = *context->GetValue<list<ObjectGuid> >("possible targets");
+
+    if(targets.empty())
+        return NULL;
+
+    float distance = 0;
+    Unit* result = NULL;
+    for(list<ObjectGuid>::iterator tIter = targets.begin(); tIter != targets.end(); tIter++)
+    {
+        Unit* unit = ai->GetUnit(*tIter);
+        if (!unit)
+            continue;
+
+        if (abs(bot->GetPositionZ() - unit->GetPositionZ()) > sPlayerbotAIConfig.spellDistance)
+            continue;
+
+        if (GetTargetingPlayerCount(unit) > assistCount)
+            continue;
+
+		if (master && master->GetDistance(unit) >= sPlayerbotAIConfig.grindDistance && !sRandomPlayerbotMgr.IsRandomBot(bot))
+            continue;
+
+		if ((int)unit->getLevel() - (int)bot->getLevel() > 3)
+		    continue;
+
+		Creature* creature = dynamic_cast<Creature*>(unit);
+		if (creature && creature->GetCreatureInfo() && creature->GetCreatureInfo()->Rank > CREATURE_ELITE_NORMAL)
+		    continue;
+
+        if (group)
+        {
+            Group::MemberSlotList const& groupSlot = group->GetMemberSlots();
+            for (Group::member_citerator itr = groupSlot.begin(); itr != groupSlot.end(); itr++)
+            {
+                Player *member = sObjectMgr.GetPlayer(itr->guid);
+                if( !member || !member->isAlive())
+                    continue;
+
+                float d = member->GetDistance(unit);
+                if (!result || d < distance)
+                {
+                    distance = d;
+                    result = unit;
+                }
+            }
+        }
+        else
+        {
+            float d = bot->GetDistance(unit);
+            if (!result || d < distance)
+            {
+                distance = d;
+                result = unit;
+            }
+        }
+    }
+
+    return result;
+}
+
+
+int GrindTargetValue::GetTargetingPlayerCount( Unit* unit )
+{
+    Group* group = bot->GetGroup();
+    if (!group)
+        return 0;
+
+    int count = 0;
+    Group::MemberSlotList const& groupSlot = group->GetMemberSlots();
+    for (Group::member_citerator itr = groupSlot.begin(); itr != groupSlot.end(); itr++)
+    {
+        Player *member = sObjectMgr.GetPlayer(itr->guid);
+        if( !member || !member->isAlive() || member == bot)
+            continue;
+
+        PlayerbotAI* ai = member->GetPlayerbotAI();
+        if ((ai && *ai->GetAiObjectContext()->GetValue<Unit*>("current target") == unit) ||
+            (!ai && member->GetSelectionGuid() == unit->GetObjectGuid()))
+            count++;
+    }
+
+    return count;
+}
+
diff --git a/src/game/playerbot/strategy/values/GrindTargetValue.h b/src/game/playerbot/strategy/values/GrindTargetValue.h
new file mode 100644
index 00000000000..f333297647f
--- /dev/null
+++ b/src/game/playerbot/strategy/values/GrindTargetValue.h
@@ -0,0 +1,20 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+
+namespace ai
+{
+   
+    class GrindTargetValue : public TargetValue
+	{
+	public:
+        GrindTargetValue(PlayerbotAI* ai) : TargetValue(ai) {}
+
+    public:
+        Unit* Calculate();
+
+    private:
+        int GetTargetingPlayerCount(Unit* unit);
+        Unit* FindTargetForGrinding(int assistCount);
+    };
+}
diff --git a/src/game/playerbot/strategy/values/HasAvailableLootValue.h b/src/game/playerbot/strategy/values/HasAvailableLootValue.h
new file mode 100644
index 00000000000..3dac17fb3ab
--- /dev/null
+++ b/src/game/playerbot/strategy/values/HasAvailableLootValue.h
@@ -0,0 +1,20 @@
+#pragma once
+#include "../Value.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class HasAvailableLootValue : public BoolCalculatedValue
+	{
+	public:
+        HasAvailableLootValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+    public:
+        virtual bool Calculate()
+        {
+            return !AI_VALUE(bool, "can loot") &&
+                    AI_VALUE(LootObjectStack*, "available loot")->CanLoot(sPlayerbotAIConfig.lootDistance) &&
+                    !bot->IsMounted();
+        }
+    };
+}
diff --git a/src/game/playerbot/strategy/values/HasTotemValue.h b/src/game/playerbot/strategy/values/HasTotemValue.h
new file mode 100644
index 00000000000..ef1ab23e2ce
--- /dev/null
+++ b/src/game/playerbot/strategy/values/HasTotemValue.h
@@ -0,0 +1,34 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+#include "../../LootObjectStack.h"
+
+namespace ai
+{
+    class HasTotemValue : public BoolCalculatedValue, public Qualified
+	{
+	public:
+        HasTotemValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+    public:
+        bool Calculate()
+        {
+            list<ObjectGuid> units = *context->GetValue<list<ObjectGuid> >("nearest npcs");
+            for (list<ObjectGuid>::iterator i = units.begin(); i != units.end(); i++)
+            {
+                Unit* unit = ai->GetUnit(*i);
+                if (!unit)
+                    continue;
+
+                Creature* creature = dynamic_cast<Creature*>(unit);
+                if (!creature || !creature->IsTotem())
+                    continue;
+
+                if (strstri(creature->GetName(), qualifier.c_str()) && bot->GetDistance(creature) <= sPlayerbotAIConfig.spellDistance)
+                    return true;
+            }
+
+            return false;
+        }
+    };
+}
diff --git a/src/game/playerbot/strategy/values/InvalidTargetValue.cpp b/src/game/playerbot/strategy/values/InvalidTargetValue.cpp
new file mode 100644
index 00000000000..33a0fa60ab4
--- /dev/null
+++ b/src/game/playerbot/strategy/values/InvalidTargetValue.cpp
@@ -0,0 +1,26 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "InvalidTargetValue.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+bool InvalidTargetValue::Calculate()
+{
+    Unit* target = AI_VALUE(Unit*, qualifier);
+    if (qualifier == "current target")
+    {
+        return !target ||
+                target->GetMapId() != bot->GetMapId() ||
+                target->isDead() ||
+                target->IsPolymorphed() ||
+                target->isCharmed() ||
+                target->isFeared() ||
+                target->hasUnitState(UNIT_STAT_ISOLATED) ||
+                target->IsFriendlyTo(bot) ||
+                !bot->IsWithinDistInMap(target, sPlayerbotAIConfig.sightDistance) ||
+                !bot->IsWithinLOSInMap(target);
+    }
+
+    return !target;
+}
diff --git a/src/game/playerbot/strategy/values/InvalidTargetValue.h b/src/game/playerbot/strategy/values/InvalidTargetValue.h
new file mode 100644
index 00000000000..5d277fd2ef2
--- /dev/null
+++ b/src/game/playerbot/strategy/values/InvalidTargetValue.h
@@ -0,0 +1,14 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class InvalidTargetValue : public BoolCalculatedValue, public Qualified
+	{
+	public:
+        InvalidTargetValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+	public:
+        virtual bool Calculate();
+    };
+}
diff --git a/src/game/playerbot/strategy/values/IsBehindValue.h b/src/game/playerbot/strategy/values/IsBehindValue.h
new file mode 100644
index 00000000000..da61670ecde
--- /dev/null
+++ b/src/game/playerbot/strategy/values/IsBehindValue.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class IsBehindValue : public BoolCalculatedValue, public Qualified
+	{
+	public:
+        IsBehindValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+        virtual bool Calculate() 
+        {
+            Unit* target = AI_VALUE(Unit*, qualifier);
+            if (!target)
+                return false;
+
+            
+            float targetOrientation = target->GetOrientation();
+            float orientation = bot->GetOrientation();
+            float distance = bot->GetDistance(target);
+
+            return distance <= ATTACK_DISTANCE && abs(targetOrientation - orientation) < M_PI / 2;
+        }
+    };
+}
diff --git a/src/game/playerbot/strategy/values/IsFacingValue.h b/src/game/playerbot/strategy/values/IsFacingValue.h
new file mode 100644
index 00000000000..b43cf3ccc05
--- /dev/null
+++ b/src/game/playerbot/strategy/values/IsFacingValue.h
@@ -0,0 +1,20 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class IsFacingValue : public BoolCalculatedValue, public Qualified
+	{
+	public:
+        IsFacingValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+        virtual bool Calculate()
+        {
+            Unit* target = AI_VALUE(Unit*, qualifier);
+            if (!target)
+                return false;
+
+            return bot->isInFront(target, sPlayerbotAIConfig.sightDistance, M_PI_F / 3.0f);
+        }
+    };
+}
diff --git a/src/game/playerbot/strategy/values/IsMovingValue.h b/src/game/playerbot/strategy/values/IsMovingValue.h
new file mode 100644
index 00000000000..bbee8bdb1b6
--- /dev/null
+++ b/src/game/playerbot/strategy/values/IsMovingValue.h
@@ -0,0 +1,42 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class IsMovingValue : public BoolCalculatedValue, public Qualified
+	{
+	public:
+        IsMovingValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+        virtual bool Calculate()
+        {
+            Unit* target = AI_VALUE(Unit*, qualifier);
+
+            if (!target)
+                return false;
+
+            switch (target->GetMotionMaster()->GetCurrentMovementGeneratorType())
+            {
+            case IDLE_MOTION_TYPE:
+                return false;
+            }
+            return true;
+        }
+    };
+
+    class IsSwimmingValue : public BoolCalculatedValue, public Qualified
+	{
+	public:
+        IsSwimmingValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+        virtual bool Calculate()
+        {
+            Unit* target = AI_VALUE(Unit*, qualifier);
+
+            if (!target)
+                return false;
+
+            return target->IsUnderWater() || target->IsInWater();
+        }
+    };
+}
diff --git a/src/game/playerbot/strategy/values/ItemCountValue.cpp b/src/game/playerbot/strategy/values/ItemCountValue.cpp
new file mode 100644
index 00000000000..2b6c0a268c9
--- /dev/null
+++ b/src/game/playerbot/strategy/values/ItemCountValue.cpp
@@ -0,0 +1,37 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ItemCountValue.h"
+
+using namespace ai;
+
+list<Item*> InventoryItemValueBase::Find(string qualifier)
+{
+    list<Item*> result;
+
+    Player* bot = InventoryAction::ai->GetBot();
+
+    list<Item*> items = InventoryAction::parseItems(qualifier);
+    for (list<Item*>::iterator i = items.begin(); i != items.end(); i++)
+        result.push_back(*i);
+
+    return result;
+}
+
+
+uint8 ItemCountValue::Calculate()
+{
+    uint8 count = 0;
+    list<Item*> items = Find(qualifier);
+    for (list<Item*>::iterator i = items.begin(); i != items.end(); ++i)
+    {
+        Item* item = *i;
+        count += item->GetCount();
+    }
+
+    return count;
+}
+
+list<Item*> InventoryItemValue::Calculate()
+{
+    return Find(qualifier);
+}
diff --git a/src/game/playerbot/strategy/values/ItemCountValue.h b/src/game/playerbot/strategy/values/ItemCountValue.h
new file mode 100644
index 00000000000..f81d9b35fa6
--- /dev/null
+++ b/src/game/playerbot/strategy/values/ItemCountValue.h
@@ -0,0 +1,35 @@
+#pragma once
+#include "../Value.h"
+#include "../ItemVisitors.h"
+#include "../actions/InventoryAction.h"
+
+namespace ai
+{
+    class InventoryItemValueBase : public InventoryAction
+    {
+    public:
+        InventoryItemValueBase(PlayerbotAI* ai) : InventoryAction(ai, "empty") {}
+        virtual bool Execute(Event event) { return false; }
+
+    protected:
+        list<Item*> Find(string qualifier);
+    };
+
+    class ItemCountValue : public Uint8CalculatedValue, public Qualified, InventoryItemValueBase
+	{
+	public:
+        ItemCountValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai), InventoryItemValueBase(ai) {}
+
+    public:
+        virtual uint8 Calculate();
+	};
+
+    class InventoryItemValue : public CalculatedValue<list<Item*> >, public Qualified, InventoryItemValueBase
+    {
+    public:
+        InventoryItemValue(PlayerbotAI* ai) : CalculatedValue<list<Item*> >(ai), InventoryItemValueBase(ai) {}
+
+    public:
+        virtual list<Item*> Calculate();
+    };
+}
diff --git a/src/game/playerbot/strategy/values/ItemForSpellValue.cpp b/src/game/playerbot/strategy/values/ItemForSpellValue.cpp
new file mode 100644
index 00000000000..899ee0535f6
--- /dev/null
+++ b/src/game/playerbot/strategy/values/ItemForSpellValue.cpp
@@ -0,0 +1,70 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ItemForSpellValue.h"
+
+using namespace ai;
+
+#ifndef WIN32
+inline int strcmpi(const char* s1, const char* s2)
+{
+    for (; *s1 && *s2 && (toupper(*s1) == toupper(*s2)); ++s1, ++s2);
+    return *s1 - *s2;
+}
+#endif
+
+Item* ItemForSpellValue::Calculate()
+{
+    uint32 spellid = atoi(qualifier.c_str());
+    if (!spellid)
+        return NULL;
+
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid );
+    if (!spellInfo)
+        return NULL;
+
+    Item* itemForSpell = NULL;
+    Player* trader = bot->GetTrader();
+    if (trader)
+    {
+        itemForSpell = trader->GetTradeData()->GetItem(TRADE_SLOT_NONTRADED);
+        if (itemForSpell && itemForSpell->IsFitToSpellRequirements(spellInfo))
+            return itemForSpell;
+    }
+
+    // Workaround as some spells have no item mask (e.g. shaman weapon enhancements)
+    if (!strcmpi(spellInfo->SpellName[0], "rockbiter weapon") ||
+            !strcmpi(spellInfo->SpellName[0], "flametongue weapon") ||
+            !strcmpi(spellInfo->SpellName[0], "earthliving weapon") ||
+            !strcmpi(spellInfo->SpellName[0], "frostbrand weapon") ||
+            !strcmpi(spellInfo->SpellName[0], "windfury weapon"))
+    {
+        itemForSpell = GetItemFitsToSpellRequirements(EQUIPMENT_SLOT_MAINHAND, spellInfo);
+        if (itemForSpell && itemForSpell->GetProto()->Class == ITEM_CLASS_WEAPON)
+            return itemForSpell;
+
+        itemForSpell = GetItemFitsToSpellRequirements(EQUIPMENT_SLOT_OFFHAND, spellInfo);
+        if (itemForSpell && itemForSpell->GetProto()->Class == ITEM_CLASS_WEAPON)
+            return itemForSpell;
+
+        return NULL;
+    }
+
+    for( uint8 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; slot++ ) {
+        itemForSpell = GetItemFitsToSpellRequirements(slot, spellInfo);
+        if (itemForSpell)
+            return itemForSpell;
+    }
+    return NULL;
+}
+
+Item* ItemForSpellValue::GetItemFitsToSpellRequirements(uint8 slot, SpellEntry const *spellInfo)
+{
+    Item* const itemForSpell = bot->GetItemByPos( INVENTORY_SLOT_BAG_0, slot );
+    if (!itemForSpell || itemForSpell->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT))
+        return NULL;
+
+    if (itemForSpell->IsFitToSpellRequirements(spellInfo))
+        return itemForSpell;
+
+    return NULL;
+}
diff --git a/src/game/playerbot/strategy/values/ItemForSpellValue.h b/src/game/playerbot/strategy/values/ItemForSpellValue.h
new file mode 100644
index 00000000000..0fb66637040
--- /dev/null
+++ b/src/game/playerbot/strategy/values/ItemForSpellValue.h
@@ -0,0 +1,20 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+
+namespace ai
+{
+
+    class ItemForSpellValue : public CalculatedValue<Item*>, public Qualified
+	{
+	public:
+        ItemForSpellValue(PlayerbotAI* ai) : CalculatedValue<Item*>(ai) {}
+
+    public:
+        virtual Item* Calculate();
+
+    private:
+        Item* GetItemFitsToSpellRequirements(uint8 slot, SpellEntry const *spellInfo);
+
+    };
+}
diff --git a/src/game/playerbot/strategy/values/LastMovementValue.h b/src/game/playerbot/strategy/values/LastMovementValue.h
new file mode 100644
index 00000000000..0467833694c
--- /dev/null
+++ b/src/game/playerbot/strategy/values/LastMovementValue.h
@@ -0,0 +1,61 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class LastMovement
+    {
+    public:
+        LastMovement() 
+        {
+            lastMoveToX = 0;
+            lastMoveToY = 0;
+            lastMoveToZ = 0;
+            lastMoveToOri = 0;
+            lastFollow = NULL;
+        }
+
+        LastMovement(LastMovement& other)
+        {
+            taxiNodes = other.taxiNodes;
+            taxiMaster = other.taxiMaster;
+            lastFollow = other.lastFollow;
+            lastAreaTrigger = other.lastAreaTrigger;
+            lastMoveToX = other.lastMoveToX;
+            lastMoveToY = other.lastMoveToY;
+            lastMoveToZ = other.lastMoveToZ;
+            lastMoveToOri = other.lastMoveToOri;
+        }
+        
+        void Set(Unit* lastFollow)
+        {
+            Set(0.0f, 0.0f, 0.0f, 0.0f);
+            this->lastFollow = lastFollow;
+        }
+
+        void Set(float x, float y, float z, float ori)
+        {
+            lastMoveToX = x;
+            lastMoveToY = y;
+            lastMoveToZ = z;
+            lastMoveToOri = ori;
+            lastFollow = NULL;
+        }
+
+    public:
+        vector<uint32> taxiNodes;
+        ObjectGuid taxiMaster;
+        Unit* lastFollow;
+        uint32 lastAreaTrigger;
+        float lastMoveToX, lastMoveToY, lastMoveToZ, lastMoveToOri;
+    };
+
+    class LastMovementValue : public ManualSetValue<LastMovement&>
+	{
+	public:
+        LastMovementValue(PlayerbotAI* ai) : ManualSetValue<LastMovement&>(ai, data) {}
+
+    private:
+        LastMovement data;
+    };
+}
diff --git a/src/game/playerbot/strategy/values/LastSpellCastTimeValue.h b/src/game/playerbot/strategy/values/LastSpellCastTimeValue.h
new file mode 100644
index 00000000000..bf0a17ea26f
--- /dev/null
+++ b/src/game/playerbot/strategy/values/LastSpellCastTimeValue.h
@@ -0,0 +1,11 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class LastSpellCastTimeValue : public ManualSetValue<time_t>, public Qualified
+	{
+	public:
+        LastSpellCastTimeValue(PlayerbotAI* ai) : ManualSetValue<time_t>(ai, 0), Qualified() {}
+    };
+}
diff --git a/src/game/playerbot/strategy/values/LastSpellCastValue.h b/src/game/playerbot/strategy/values/LastSpellCastValue.h
new file mode 100644
index 00000000000..5d055412272
--- /dev/null
+++ b/src/game/playerbot/strategy/values/LastSpellCastValue.h
@@ -0,0 +1,39 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class LastSpellCast 
+    {
+    public:
+        LastSpellCast() : id(0),time(0) {}
+
+    public:
+        void Set(uint32 id, ObjectGuid target, time_t time)
+        {
+            this->id = id;
+            this->target = target;
+            this->time = time;
+        }
+        
+        void Reset()
+        {
+            id = 0;
+            target.Set(0);
+            time = 0;
+        }
+    public:
+        uint32 id;
+        ObjectGuid target;
+        time_t time;
+    };
+   
+    class LastSpellCastValue : public ManualSetValue<LastSpellCast&>
+	{
+	public:
+        LastSpellCastValue(PlayerbotAI* ai) : ManualSetValue<LastSpellCast&>(ai, data) {}
+
+    private:
+        LastSpellCast data;
+    };
+}
diff --git a/src/game/playerbot/strategy/values/LeastHpTargetValue.cpp b/src/game/playerbot/strategy/values/LeastHpTargetValue.cpp
new file mode 100644
index 00000000000..39021c5dbc1
--- /dev/null
+++ b/src/game/playerbot/strategy/values/LeastHpTargetValue.cpp
@@ -0,0 +1,33 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "LeastHpTargetValue.h"
+#include "TargetValue.h"
+
+using namespace ai;
+using namespace std;
+
+class FindLeastHpTargetStrategy : public FindTargetStrategy
+{
+public:
+    FindLeastHpTargetStrategy(PlayerbotAI* ai) : FindTargetStrategy(ai)
+    {
+        minHealth = 0;
+    }
+
+public:
+    virtual void CheckAttacker(Unit* attacker, ThreatManager* threatManager)
+    {
+        if (!result || result->GetHealth() > attacker->GetHealth())
+            result = attacker;
+    }
+
+protected:
+    float minHealth;
+};
+
+
+Unit* LeastHpTargetValue::Calculate()
+{
+    FindLeastHpTargetStrategy strategy(ai);
+    return FindTarget(&strategy);
+}
diff --git a/src/game/playerbot/strategy/values/LeastHpTargetValue.h b/src/game/playerbot/strategy/values/LeastHpTargetValue.h
new file mode 100644
index 00000000000..e748e7f1d7a
--- /dev/null
+++ b/src/game/playerbot/strategy/values/LeastHpTargetValue.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+
+namespace ai
+{
+    class LeastHpTargetValue : public TargetValue
+	{
+	public:
+        LeastHpTargetValue(PlayerbotAI* ai) : TargetValue(ai) {}
+
+    public:
+        Unit* Calculate();
+    };
+}
diff --git a/src/game/playerbot/strategy/values/LfgValues.h b/src/game/playerbot/strategy/values/LfgValues.h
new file mode 100644
index 00000000000..290a4c43023
--- /dev/null
+++ b/src/game/playerbot/strategy/values/LfgValues.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../Value.h"
+
+namespace ai
+{
+class LfgProposalValue : public ManualSetValue<uint32>
+{
+public:
+    LfgProposalValue(PlayerbotAI* ai) : ManualSetValue<uint32>(ai, 0, "lfg proposal") {}
+};
+}
diff --git a/src/game/playerbot/strategy/values/LineTargetValue.cpp b/src/game/playerbot/strategy/values/LineTargetValue.cpp
new file mode 100644
index 00000000000..5ad04be0b56
--- /dev/null
+++ b/src/game/playerbot/strategy/values/LineTargetValue.cpp
@@ -0,0 +1,33 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "LineTargetValue.h"
+
+using namespace ai;
+
+Unit* LineTargetValue::Calculate()
+{
+    Player* master = GetMaster();
+    if (!master)
+        return NULL;
+
+    Group* group = master->GetGroup();
+    if (!group)
+        return NULL;
+
+    Player *prev = master;
+    Group::MemberSlotList const& groupSlot = group->GetMemberSlots();
+    for (Group::member_citerator itr = groupSlot.begin(); itr != groupSlot.end(); itr++)
+    {
+        Player *player = sObjectMgr.GetPlayer(itr->guid);
+        if( !player || !player->isAlive() || player == master)
+            continue;
+
+        if (player == bot)
+            return prev;
+
+        prev = player;
+    }
+
+    return master;
+}
+
diff --git a/src/game/playerbot/strategy/values/LineTargetValue.h b/src/game/playerbot/strategy/values/LineTargetValue.h
new file mode 100644
index 00000000000..57998fadfa5
--- /dev/null
+++ b/src/game/playerbot/strategy/values/LineTargetValue.h
@@ -0,0 +1,14 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class LineTargetValue : public UnitCalculatedValue
+	{
+	public:
+        LineTargetValue(PlayerbotAI* ai) : UnitCalculatedValue(ai) {}
+
+    public:
+        virtual Unit* Calculate();
+	};
+}
diff --git a/src/game/playerbot/strategy/values/LogLevelValue.h b/src/game/playerbot/strategy/values/LogLevelValue.h
new file mode 100644
index 00000000000..e7d06894bc3
--- /dev/null
+++ b/src/game/playerbot/strategy/values/LogLevelValue.h
@@ -0,0 +1,12 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class LogLevelValue : public ManualSetValue<LogLevel>
+	{
+	public:
+        LogLevelValue(PlayerbotAI* ai) : 
+            ManualSetValue<LogLevel>(ai, LOG_LVL_BASIC) {}    
+	};
+}
diff --git a/src/game/playerbot/strategy/values/LootStrategyValue.h b/src/game/playerbot/strategy/values/LootStrategyValue.h
new file mode 100644
index 00000000000..210e518c848
--- /dev/null
+++ b/src/game/playerbot/strategy/values/LootStrategyValue.h
@@ -0,0 +1,11 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class LootStrategyValue : public ManualSetValue<LootStrategy>
+	{
+	public:
+        LootStrategyValue(PlayerbotAI* ai) : ManualSetValue<LootStrategy>(ai, LOOTSTRATEGY_SKILL) {}
+    };
+}
diff --git a/src/game/playerbot/strategy/values/ManaSaveLevelValue.h b/src/game/playerbot/strategy/values/ManaSaveLevelValue.h
new file mode 100644
index 00000000000..6c29f1fb977
--- /dev/null
+++ b/src/game/playerbot/strategy/values/ManaSaveLevelValue.h
@@ -0,0 +1,11 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class ManaSaveLevelValue : public ManualSetValue<double>
+	{
+	public:
+        ManaSaveLevelValue(PlayerbotAI* ai) : ManualSetValue<double>(ai, 1.0, "mana save level") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/values/MasterTargetValue.h b/src/game/playerbot/strategy/values/MasterTargetValue.h
new file mode 100644
index 00000000000..a1376942606
--- /dev/null
+++ b/src/game/playerbot/strategy/values/MasterTargetValue.h
@@ -0,0 +1,13 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class MasterTargetValue : public UnitCalculatedValue
+	{
+	public:
+        MasterTargetValue(PlayerbotAI* ai) : UnitCalculatedValue(ai) {}
+
+        virtual Unit* Calculate() { return ai->GetMaster(); }
+    };
+}
diff --git a/src/game/playerbot/strategy/values/NearestAdsValue.cpp b/src/game/playerbot/strategy/values/NearestAdsValue.cpp
new file mode 100644
index 00000000000..337083660eb
--- /dev/null
+++ b/src/game/playerbot/strategy/values/NearestAdsValue.cpp
@@ -0,0 +1,11 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "NearestAdsValue.h"
+
+using namespace ai;
+
+bool NearestAdsValue::AcceptUnit(Unit* unit)
+{
+    Unit* target = AI_VALUE(Unit*, "current target");
+    return unit != target;
+}
diff --git a/src/game/playerbot/strategy/values/NearestAdsValue.h b/src/game/playerbot/strategy/values/NearestAdsValue.h
new file mode 100644
index 00000000000..16e4a8452fe
--- /dev/null
+++ b/src/game/playerbot/strategy/values/NearestAdsValue.h
@@ -0,0 +1,18 @@
+#pragma once
+#include "../Value.h"
+#include "NearestUnitsValue.h"
+#include "../../PlayerbotAIConfig.h"
+#include "PossibleTargetsValue.h"
+
+namespace ai
+{
+    class NearestAdsValue : public PossibleTargetsValue
+	{
+	public:
+        NearestAdsValue(PlayerbotAI* ai, float range = sPlayerbotAIConfig.tooCloseDistance) :
+            PossibleTargetsValue(ai, range) {}
+
+    protected:
+        bool AcceptUnit(Unit* unit);
+	};
+}
diff --git a/src/game/playerbot/strategy/values/NearestCorpsesValue.cpp b/src/game/playerbot/strategy/values/NearestCorpsesValue.cpp
new file mode 100644
index 00000000000..5cd3111cb22
--- /dev/null
+++ b/src/game/playerbot/strategy/values/NearestCorpsesValue.cpp
@@ -0,0 +1,36 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "NearestCorpsesValue.h"
+
+#include "../../../GridNotifiers.h"
+#include "../../../GridNotifiersImpl.h"
+#include "../../../CellImpl.h"
+
+using namespace ai;
+using namespace MaNGOS;
+
+class AnyDeadUnitInObjectRangeCheck
+{
+public:
+    AnyDeadUnitInObjectRangeCheck(WorldObject const* obj, float range) : i_obj(obj), i_range(range) {}
+    WorldObject const& GetFocusObject() const { return *i_obj; }
+    bool operator()(Unit* u)
+    {
+        return !u->isAlive() && i_obj->IsWithinDistInMap(u, i_range);
+    }
+private:
+    WorldObject const* i_obj;
+    float i_range;
+};
+
+void NearestCorpsesValue::FindUnits(list<Unit*> &targets)
+{
+    AnyDeadUnitInObjectRangeCheck u_check(bot,  range);
+    UnitListSearcher<AnyDeadUnitInObjectRangeCheck> searcher(targets, u_check);
+    Cell::VisitAllObjects(bot, searcher, range);
+}
+
+bool NearestCorpsesValue::AcceptUnit(Unit* unit)
+{
+    return true;
+}
diff --git a/src/game/playerbot/strategy/values/NearestCorpsesValue.h b/src/game/playerbot/strategy/values/NearestCorpsesValue.h
new file mode 100644
index 00000000000..c23a5b82d9a
--- /dev/null
+++ b/src/game/playerbot/strategy/values/NearestCorpsesValue.h
@@ -0,0 +1,19 @@
+#pragma once
+#include "../Value.h"
+#include "NearestUnitsValue.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class NearestCorpsesValue : public NearestUnitsValue
+	{
+	public:
+        NearestCorpsesValue(PlayerbotAI* ai, float range = sPlayerbotAIConfig.sightDistance) :
+          NearestUnitsValue(ai) {}
+
+    protected:
+        void FindUnits(list<Unit*> &targets);
+        bool AcceptUnit(Unit* unit);
+
+	};
+}
diff --git a/src/game/playerbot/strategy/values/NearestGameObjects.cpp b/src/game/playerbot/strategy/values/NearestGameObjects.cpp
new file mode 100644
index 00000000000..95b680fb9af
--- /dev/null
+++ b/src/game/playerbot/strategy/values/NearestGameObjects.cpp
@@ -0,0 +1,47 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "NearestGameObjects.h"
+
+#include "../../../GridNotifiers.h"
+#include "../../../GridNotifiersImpl.h"
+#include "../../../CellImpl.h"
+
+using namespace ai;
+using namespace MaNGOS;
+
+class AnyGameObjectInObjectRangeCheck
+{
+public:
+    AnyGameObjectInObjectRangeCheck(WorldObject const* obj, float range) : i_obj(obj), i_range(range) {}
+    WorldObject const& GetFocusObject() const { return *i_obj; }
+    bool operator()(GameObject* u)
+    {
+        if (u && i_obj->IsWithinDistInMap(u, i_range) && u->isSpawned() && u->GetGOInfo())
+            return true;
+
+        return false;
+    }
+
+private:
+    WorldObject const* i_obj;
+    float i_range;
+};
+
+list<ObjectGuid> NearestGameObjects::Calculate()
+{
+    list<GameObject*> targets;
+
+    AnyGameObjectInObjectRangeCheck u_check(bot, range);
+    GameObjectListSearcher<AnyGameObjectInObjectRangeCheck> searcher(targets, u_check);
+    Cell::VisitAllObjects((const WorldObject*)bot, searcher, range);
+
+    list<ObjectGuid> result;
+    for(list<GameObject*>::iterator tIter = targets.begin(); tIter != targets.end(); ++tIter)
+    {
+		GameObject* go = *tIter;
+        if(bot->IsWithinLOSInMap(go))
+			result.push_back(go->GetObjectGuid());
+    }
+
+    return result;
+}
diff --git a/src/game/playerbot/strategy/values/NearestGameObjects.h b/src/game/playerbot/strategy/values/NearestGameObjects.h
new file mode 100644
index 00000000000..78dcf5754ce
--- /dev/null
+++ b/src/game/playerbot/strategy/values/NearestGameObjects.h
@@ -0,0 +1,19 @@
+#pragma once
+#include "../Value.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class NearestGameObjects : public ObjectGuidListCalculatedValue
+	{
+	public:
+        NearestGameObjects(PlayerbotAI* ai, float range = sPlayerbotAIConfig.sightDistance) :
+            ObjectGuidListCalculatedValue(ai), range(range) {}
+
+    protected:
+        virtual list<ObjectGuid> Calculate();
+
+    private:
+        float range;
+	};
+}
diff --git a/src/game/playerbot/strategy/values/NearestNpcsValue.cpp b/src/game/playerbot/strategy/values/NearestNpcsValue.cpp
new file mode 100644
index 00000000000..64ef2bccf6b
--- /dev/null
+++ b/src/game/playerbot/strategy/values/NearestNpcsValue.cpp
@@ -0,0 +1,22 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "NearestNpcsValue.h"
+
+#include "../../../GridNotifiers.h"
+#include "../../../GridNotifiersImpl.h"
+#include "../../../CellImpl.h"
+
+using namespace ai;
+using namespace MaNGOS;
+
+void NearestNpcsValue::FindUnits(list<Unit*> &targets)
+{
+    AnyFriendlyUnitInObjectRangeCheck u_check(bot, range);
+    UnitListSearcher<AnyFriendlyUnitInObjectRangeCheck> searcher(targets, u_check);
+    Cell::VisitAllObjects(bot, searcher, range);
+}
+
+bool NearestNpcsValue::AcceptUnit(Unit* unit)
+{
+    return !dynamic_cast<Player*>(unit);
+}
diff --git a/src/game/playerbot/strategy/values/NearestNpcsValue.h b/src/game/playerbot/strategy/values/NearestNpcsValue.h
new file mode 100644
index 00000000000..ebbbd754442
--- /dev/null
+++ b/src/game/playerbot/strategy/values/NearestNpcsValue.h
@@ -0,0 +1,18 @@
+#pragma once
+#include "../Value.h"
+#include "NearestUnitsValue.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class NearestNpcsValue : public NearestUnitsValue
+	{
+	public:
+        NearestNpcsValue(PlayerbotAI* ai, float range = sPlayerbotAIConfig.sightDistance) :
+          NearestUnitsValue(ai) {}
+
+    protected:
+        void FindUnits(list<Unit*> &targets);
+        bool AcceptUnit(Unit* unit);
+	};
+}
diff --git a/src/game/playerbot/strategy/values/NearestUnitsValue.h b/src/game/playerbot/strategy/values/NearestUnitsValue.h
new file mode 100644
index 00000000000..9624a986fa0
--- /dev/null
+++ b/src/game/playerbot/strategy/values/NearestUnitsValue.h
@@ -0,0 +1,36 @@
+#pragma once
+#include "../Value.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class NearestUnitsValue : public ObjectGuidListCalculatedValue
+	{
+	public:
+        NearestUnitsValue(PlayerbotAI* ai, float range = sPlayerbotAIConfig.sightDistance) :
+            ObjectGuidListCalculatedValue(ai, "nearest units", 5), range(range) {}
+
+	public:
+        list<ObjectGuid> Calculate()
+        {
+            list<Unit*> targets;
+            FindUnits(targets);
+
+            list<ObjectGuid> results;
+            for(list<Unit *>::iterator i = targets.begin(); i!= targets.end(); ++i)
+            {
+                Unit* unit = *i;
+                if(bot->IsWithinLOSInMap(unit) && AcceptUnit(unit))
+                    results.push_back(unit->GetObjectGuid());
+            }
+            return results;
+        }
+
+    protected:
+        virtual void FindUnits(list<Unit*> &targets) = 0;
+        virtual bool AcceptUnit(Unit* unit) = 0;
+
+    protected:
+        float range;
+	};
+}
diff --git a/src/game/playerbot/strategy/values/PartyMemberToDispel.cpp b/src/game/playerbot/strategy/values/PartyMemberToDispel.cpp
new file mode 100644
index 00000000000..b32ebab2ca9
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PartyMemberToDispel.cpp
@@ -0,0 +1,33 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PartyMemberToDispel.h"
+
+using namespace ai;
+
+class PartyMemberToDispelPredicate : public FindPlayerPredicate, public PlayerbotAIAware
+{
+public:
+    PartyMemberToDispelPredicate(PlayerbotAI* ai, uint32 dispelType) :
+        PlayerbotAIAware(ai), FindPlayerPredicate(), dispelType(dispelType) {}
+
+public:
+    virtual bool Check(Unit* unit)
+    {
+        Pet* pet = dynamic_cast<Pet*>(unit);
+        if (pet && (pet->getPetType() == MINI_PET || pet->getPetType() == SUMMON_PET))
+            return false;
+
+        return unit->isAlive() && ai->HasAuraToDispel(unit, dispelType);
+    }
+
+private:
+    uint32 dispelType;
+};
+
+Unit* PartyMemberToDispel::Calculate()
+{
+    uint32 dispelType = atoi(qualifier.c_str());
+
+    PartyMemberToDispelPredicate predicate(ai, dispelType);
+    return FindPartyMember(predicate);
+}
diff --git a/src/game/playerbot/strategy/values/PartyMemberToDispel.h b/src/game/playerbot/strategy/values/PartyMemberToDispel.h
new file mode 100644
index 00000000000..dfbc809e2b5
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PartyMemberToDispel.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "../Value.h"
+#include "PartyMemberValue.h"
+
+namespace ai
+{
+    class PartyMemberToDispel : public PartyMemberValue, Qualified
+	{
+	public:
+        PartyMemberToDispel(PlayerbotAI* ai) : 
+          PartyMemberValue(ai) {}
+    
+    protected:
+        virtual Unit* Calculate();
+	};
+}
diff --git a/src/game/playerbot/strategy/values/PartyMemberToHeal.cpp b/src/game/playerbot/strategy/values/PartyMemberToHeal.cpp
new file mode 100644
index 00000000000..b1899a79d44
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PartyMemberToHeal.cpp
@@ -0,0 +1,59 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PartyMemberToHeal.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+class IsTargetOfHealingSpell : public SpellEntryPredicate
+{
+public:
+    virtual bool Check(SpellEntry const* spell) {
+        for (int i=0; i<3; i++) {
+            if (spell->Effect[i] == SPELL_EFFECT_HEAL ||
+                spell->Effect[i] == SPELL_EFFECT_HEAL_MAX_HEALTH ||
+                spell->Effect[i] == SPELL_EFFECT_HEAL_MECHANICAL || 
+                spell->Effect[i] == SPELL_EFFECT_HEAL_PCT)
+                return true;
+        }
+        return false;
+    }
+
+};
+
+Unit* PartyMemberToHeal::Calculate()
+{
+    
+    IsTargetOfHealingSpell predicate;
+
+    Group* group = bot->GetGroup();
+    if (!group)
+        return NULL;
+
+    bool isRaid = bot->GetGroup()->isRaidGroup();
+    MinValueCalculator calc(100);
+    for (GroupReference *gref = group->GetFirstMember(); gref; gref = gref->next()) 
+    {
+        Player* player = gref->getSource();
+        if (!Check(player) || !player->isAlive())
+            continue;
+
+        uint8 health = player->GetHealthPercent();
+        if (isRaid || health < sPlayerbotAIConfig.mediumHealth || !IsTargetOfSpellCast(player, predicate))
+            calc.probe(health, player);
+
+        Pet* pet = player->GetPet();
+        if (pet && CanHealPet(pet)) 
+        {
+            health = pet->GetHealthPercent();
+            if (isRaid || health < sPlayerbotAIConfig.mediumHealth || !IsTargetOfSpellCast(player, predicate))
+                calc.probe(health, player);
+        }
+    }
+    return (Unit*)calc.param;
+}
+
+bool PartyMemberToHeal::CanHealPet(Pet* pet) 
+{
+    return MINI_PET != pet->getPetType();
+}
diff --git a/src/game/playerbot/strategy/values/PartyMemberToHeal.h b/src/game/playerbot/strategy/values/PartyMemberToHeal.h
new file mode 100644
index 00000000000..bbbc2f45332
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PartyMemberToHeal.h
@@ -0,0 +1,17 @@
+#pragma once
+#include "../Value.h"
+#include "PartyMemberValue.h"
+
+namespace ai
+{
+    class PartyMemberToHeal : public PartyMemberValue
+	{
+	public:
+        PartyMemberToHeal(PlayerbotAI* ai) : 
+          PartyMemberValue(ai) {}
+    
+    protected:
+        virtual Unit* Calculate();
+        bool CanHealPet(Pet* pet);
+	};
+}
diff --git a/src/game/playerbot/strategy/values/PartyMemberToResurrect.cpp b/src/game/playerbot/strategy/values/PartyMemberToResurrect.cpp
new file mode 100644
index 00000000000..2253bda3e3a
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PartyMemberToResurrect.cpp
@@ -0,0 +1,44 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PartyMemberToResurrect.h"
+
+using namespace ai;
+
+class IsTargetOfResurrectSpell : public SpellEntryPredicate
+{
+public:
+    virtual bool Check(SpellEntry const* spell)
+    {
+        for (int i=0; i<3; i++)
+        {
+            if (spell->Effect[i] == SPELL_EFFECT_RESURRECT ||
+                spell->Effect[i] == SPELL_EFFECT_RESURRECT_NEW ||
+                spell->Effect[i] == SPELL_EFFECT_SELF_RESURRECT)
+                return true;
+        }
+        return false;
+    }
+
+};
+
+class FindDeadPlayer : public FindPlayerPredicate
+{
+public:
+    FindDeadPlayer(PartyMemberValue* value) : value(value) {}
+
+    virtual bool Check(Unit* unit)
+    {
+        Player* player = dynamic_cast<Player*>(unit);
+        return player && player->getDeathState() == CORPSE && !value->IsTargetOfSpellCast(player, predicate);
+    }
+
+private:
+    PartyMemberValue* value;
+    IsTargetOfResurrectSpell predicate;
+};
+
+Unit* PartyMemberToResurrect::Calculate()
+{
+	FindDeadPlayer finder(this);
+    return FindPartyMember(finder);
+}
diff --git a/src/game/playerbot/strategy/values/PartyMemberToResurrect.h b/src/game/playerbot/strategy/values/PartyMemberToResurrect.h
new file mode 100644
index 00000000000..36815f0433b
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PartyMemberToResurrect.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "../Value.h"
+#include "PartyMemberValue.h"
+
+namespace ai
+{
+    class PartyMemberToResurrect : public PartyMemberValue
+	{
+	public:
+        PartyMemberToResurrect(PlayerbotAI* ai) : 
+          PartyMemberValue(ai) {}
+    
+    protected:
+        virtual Unit* Calculate();
+	};
+}
diff --git a/src/game/playerbot/strategy/values/PartyMemberValue.cpp b/src/game/playerbot/strategy/values/PartyMemberValue.cpp
new file mode 100644
index 00000000000..6dffea85e30
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PartyMemberValue.cpp
@@ -0,0 +1,107 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PartyMemberValue.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+using namespace std;
+
+Unit* PartyMemberValue::FindPartyMember(list<Player*>* party, FindPlayerPredicate &predicate)
+{
+    for (list<Player*>::iterator i = party->begin(); i != party->end(); ++i)
+    {
+        Player* player = *i;
+
+        if (!player)
+            continue;
+
+        if (Check(player) && predicate.Check(player))
+            return player;
+
+        Pet* pet = player->GetPet();
+        if (pet && Check(pet) && predicate.Check(pet))
+            return pet;
+    }
+
+    return NULL;
+}
+
+Unit* PartyMemberValue::FindPartyMember(FindPlayerPredicate &predicate)
+{
+    Player* master = GetMaster();
+    Group* group = bot->GetGroup();
+    if (!group)
+        return NULL;
+
+    list<Player*> healers, tanks, others, masters;
+    masters.push_back(master);
+    for (GroupReference *gref = group->GetFirstMember(); gref; gref = gref->next())
+    {
+        Player* player = gref->getSource();
+
+        if (ai->IsHeal(player))
+            healers.push_back(player);
+        else if (ai->IsTank(player))
+            tanks.push_back(player);
+        else if (player != master)
+            others.push_back(player);
+    }
+
+    list<list<Player*>* > lists;
+    lists.push_back(&healers);
+    lists.push_back(&tanks);
+    lists.push_back(&masters);
+    lists.push_back(&others);
+
+    for (list<list<Player*>* >::iterator i = lists.begin(); i != lists.end(); ++i)
+    {
+        list<Player*>* party = *i;
+        Unit* target = FindPartyMember(party, predicate);
+        if (target)
+            return target;
+    }
+
+    return NULL;
+}
+
+bool PartyMemberValue::Check(Unit* player)
+{
+
+
+    return player && player != bot && player->GetMapId() == bot->GetMapId() &&
+        bot->GetDistance(player) < sPlayerbotAIConfig.spellDistance &&
+        bot->IsWithinLOS(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ());
+}
+
+bool PartyMemberValue::IsTargetOfSpellCast(Player* target, SpellEntryPredicate &predicate)
+{
+
+    Group* group = bot->GetGroup();
+    ObjectGuid targetGuid = target ? target->GetObjectGuid() : bot->GetObjectGuid();
+    ObjectGuid corpseGuid = target && target->GetCorpse() ? target->GetCorpse()->GetObjectGuid() : ObjectGuid();
+
+    for (GroupReference *gref = group->GetFirstMember(); gref; gref = gref->next())
+    {
+        Player* player = gref->getSource();
+        if (player == bot)
+            continue;
+
+        if (player->IsNonMeleeSpellCasted(true))
+        {
+            for (int type = CURRENT_GENERIC_SPELL; type < CURRENT_MAX_SPELL; type++) {
+                Spell* spell = player->GetCurrentSpell((CurrentSpellTypes)type);
+                if (spell && predicate.Check(spell->m_spellInfo)) {
+                    ObjectGuid unitTarget = spell->m_targets.getUnitTargetGuid();
+                    if (unitTarget == targetGuid)
+                        return true;
+
+                    ObjectGuid corpseTarget = spell->m_targets.getCorpseTargetGuid();
+                    if (corpseTarget == corpseGuid)
+                        return true;
+                }
+            }
+        }
+    }
+
+    return false;
+}
diff --git a/src/game/playerbot/strategy/values/PartyMemberValue.h b/src/game/playerbot/strategy/values/PartyMemberValue.h
new file mode 100644
index 00000000000..f8c6e364c96
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PartyMemberValue.h
@@ -0,0 +1,31 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class FindPlayerPredicate
+    {
+    public:
+        virtual bool Check(Unit*) = 0;
+    };
+
+    class SpellEntryPredicate
+    {
+    public:
+        virtual bool Check(SpellEntry const*) = 0;
+    };
+
+    class PartyMemberValue : public UnitCalculatedValue
+	{
+	public:
+        PartyMemberValue(PlayerbotAI* ai) : UnitCalculatedValue(ai) {}
+
+    public:
+        bool IsTargetOfSpellCast(Player* target, SpellEntryPredicate &predicate);
+
+    protected:
+        Unit* FindPartyMember(FindPlayerPredicate &predicate);
+        Unit* FindPartyMember(list<Player*>* party, FindPlayerPredicate &predicate);
+        bool Check(Unit* player);
+	};
+}
diff --git a/src/game/playerbot/strategy/values/PartyMemberWithoutAuraValue.cpp b/src/game/playerbot/strategy/values/PartyMemberWithoutAuraValue.cpp
new file mode 100644
index 00000000000..3193b02463b
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PartyMemberWithoutAuraValue.cpp
@@ -0,0 +1,31 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PartyMemberWithoutAuraValue.h"
+
+using namespace ai;
+
+class PlayerWithoutAuraPredicate : public FindPlayerPredicate, public PlayerbotAIAware
+{
+public:
+    PlayerWithoutAuraPredicate(PlayerbotAI* ai, string aura) : 
+        PlayerbotAIAware(ai), FindPlayerPredicate(), aura(aura) {}
+
+public:
+    virtual bool Check(Unit* unit)
+    {
+        Pet* pet = dynamic_cast<Pet*>(unit);
+        if (pet && (pet->getPetType() == MINI_PET || pet->getPetType() == SUMMON_PET))
+            return false;
+
+        return unit->isAlive() && !ai->HasAura(aura, unit);
+    }
+
+private:
+    string aura;
+};
+
+Unit* PartyMemberWithoutAuraValue::Calculate()
+{
+	PlayerWithoutAuraPredicate predicate(ai, qualifier);
+    return FindPartyMember(predicate);
+}
diff --git a/src/game/playerbot/strategy/values/PartyMemberWithoutAuraValue.h b/src/game/playerbot/strategy/values/PartyMemberWithoutAuraValue.h
new file mode 100644
index 00000000000..63961de76b7
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PartyMemberWithoutAuraValue.h
@@ -0,0 +1,17 @@
+#pragma once
+#include "../Value.h"
+#include "PartyMemberValue.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class PartyMemberWithoutAuraValue : public PartyMemberValue, public Qualified
+	{
+	public:
+        PartyMemberWithoutAuraValue(PlayerbotAI* ai, float range = sPlayerbotAIConfig.sightDistance) :
+          PartyMemberValue(ai) {}
+
+    protected:
+        virtual Unit* Calculate();
+	};
+}
diff --git a/src/game/playerbot/strategy/values/PetTargetValue.h b/src/game/playerbot/strategy/values/PetTargetValue.h
new file mode 100644
index 00000000000..4ff74767944
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PetTargetValue.h
@@ -0,0 +1,13 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class PetTargetValue : public UnitCalculatedValue
+	{
+	public:
+        PetTargetValue(PlayerbotAI* ai) : UnitCalculatedValue(ai) {}
+
+        virtual Unit* Calculate() { return ai->GetBot()->GetPet(); }
+    };
+}
diff --git a/src/game/playerbot/strategy/values/PositionValue.cpp b/src/game/playerbot/strategy/values/PositionValue.cpp
new file mode 100644
index 00000000000..70424b0f950
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PositionValue.cpp
@@ -0,0 +1,10 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PositionValue.h"
+
+using namespace ai;
+
+PositionValue::PositionValue(PlayerbotAI* ai)
+    : ManualSetValue<ai::Position&>(ai, position), Qualified()
+{
+}
diff --git a/src/game/playerbot/strategy/values/PositionValue.h b/src/game/playerbot/strategy/values/PositionValue.h
new file mode 100644
index 00000000000..4d453e1c40e
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PositionValue.h
@@ -0,0 +1,26 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class Position
+    {
+    public:
+        Position() : valueSet(false) {}
+        void Set(double x, double y, double z) { this->x = x; this->y = y; this->z = z; this->valueSet = true; }
+        void Reset() { valueSet = false; }
+        bool isSet() { return valueSet; }
+
+        double x, y, z;
+        bool valueSet;
+    };
+
+    class PositionValue : public ManualSetValue<Position&>, public Qualified
+	{
+	public:
+        PositionValue(PlayerbotAI* ai);
+
+	private:
+        Position position;
+    };
+}
diff --git a/src/game/playerbot/strategy/values/PossibleTargetsValue.cpp b/src/game/playerbot/strategy/values/PossibleTargetsValue.cpp
new file mode 100644
index 00000000000..4361dbcdbfc
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PossibleTargetsValue.cpp
@@ -0,0 +1,23 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "PossibleTargetsValue.h"
+
+#include "../../../GridNotifiers.h"
+#include "../../../GridNotifiersImpl.h"
+#include "../../../CellImpl.h"
+
+using namespace ai;
+using namespace MaNGOS;
+
+void PossibleTargetsValue::FindUnits(list<Unit*> &targets)
+{
+    MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck u_check(bot, range);
+    MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck> searcher(targets, u_check);
+    Cell::VisitAllObjects(bot, searcher, range);
+}
+
+bool PossibleTargetsValue::AcceptUnit(Unit* unit)
+{
+    return !unit->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE) &&
+            (unit->IsHostileTo(bot) || (unit->getLevel() > 1 && !unit->IsFriendlyTo(bot)));
+}
diff --git a/src/game/playerbot/strategy/values/PossibleTargetsValue.h b/src/game/playerbot/strategy/values/PossibleTargetsValue.h
new file mode 100644
index 00000000000..5a97a711df2
--- /dev/null
+++ b/src/game/playerbot/strategy/values/PossibleTargetsValue.h
@@ -0,0 +1,19 @@
+#pragma once
+#include "../Value.h"
+#include "NearestUnitsValue.h"
+#include "../../PlayerbotAIConfig.h"
+
+namespace ai
+{
+    class PossibleTargetsValue : public NearestUnitsValue
+	{
+	public:
+        PossibleTargetsValue(PlayerbotAI* ai, float range = sPlayerbotAIConfig.sightDistance) :
+          NearestUnitsValue(ai) {}
+
+    protected:
+        virtual void FindUnits(list<Unit*> &targets);
+        virtual bool AcceptUnit(Unit* unit);
+
+	};
+}
diff --git a/src/game/playerbot/strategy/values/RtiTargetValue.h b/src/game/playerbot/strategy/values/RtiTargetValue.h
new file mode 100644
index 00000000000..81ca072d7c1
--- /dev/null
+++ b/src/game/playerbot/strategy/values/RtiTargetValue.h
@@ -0,0 +1,50 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class RtiTargetValue : public UnitCalculatedValue
+    {
+    public:
+        RtiTargetValue(PlayerbotAI* ai) : UnitCalculatedValue(ai)
+        {}
+
+    public:
+        static int GetRtiIndex(string rti)
+        {
+            int index = -1;
+            if(rti == "star") index = 0;
+            else if(rti == "circle") index = 1;
+            else if(rti == "diamond") index = 2;
+            else if(rti == "triangle") index = 3;
+            else if(rti == "moon") index = 4;
+            else if(rti == "square") index = 5;
+            else if(rti == "cross") index = 6;
+            else if(rti == "skull") index = 7;
+            return index;
+        }
+
+        Unit *Calculate()
+        {
+            Group *group = bot->GetGroup();
+            if(!group)
+                return NULL;
+
+            string rti = AI_VALUE(string, "rti");
+            int index = GetRtiIndex(rti);
+
+            if (index == -1)
+                return NULL;
+
+            ObjectGuid guid = group->GetTargetIcon(index);
+            if (!guid)
+                return NULL;
+
+            Unit* unit = ai->GetUnit(guid);
+            if (!unit || unit->isDead())
+                return NULL;
+
+            return unit;
+        }
+    };
+}
diff --git a/src/game/playerbot/strategy/values/RtiValue.cpp b/src/game/playerbot/strategy/values/RtiValue.cpp
new file mode 100644
index 00000000000..e10938938f4
--- /dev/null
+++ b/src/game/playerbot/strategy/values/RtiValue.cpp
@@ -0,0 +1,37 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "RtiValue.h"
+
+using namespace ai;
+using namespace MaNGOS;
+
+RtiValue::RtiValue(PlayerbotAI* ai)
+    : ManualSetValue<string>(ai, "none")
+{
+    switch (ai->GetBot()->getClass())
+    {
+    case CLASS_DRUID:
+        value = "circle";
+        break;
+    case CLASS_ROGUE:
+        value = "star";
+        break;
+    case CLASS_SHAMAN:
+        value = "square";
+        break;
+    case CLASS_HUNTER:
+        value = "triangle";
+        break;
+    case CLASS_WARLOCK:
+    case CLASS_PALADIN:
+        value = "diamond";
+        break;
+    case CLASS_PRIEST:
+    case CLASS_MAGE:
+        value = "moon";
+        break;
+    default:
+        value = "skull";
+        break;
+    }
+}
diff --git a/src/game/playerbot/strategy/values/RtiValue.h b/src/game/playerbot/strategy/values/RtiValue.h
new file mode 100644
index 00000000000..760485e2d8e
--- /dev/null
+++ b/src/game/playerbot/strategy/values/RtiValue.h
@@ -0,0 +1,11 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class RtiValue : public ManualSetValue<string>
+	{
+	public:
+        RtiValue(PlayerbotAI* ai);
+    };
+}
diff --git a/src/game/playerbot/strategy/values/SelfTargetValue.h b/src/game/playerbot/strategy/values/SelfTargetValue.h
new file mode 100644
index 00000000000..f64a0fee2e2
--- /dev/null
+++ b/src/game/playerbot/strategy/values/SelfTargetValue.h
@@ -0,0 +1,13 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class SelfTargetValue : public UnitCalculatedValue
+	{
+	public:
+        SelfTargetValue(PlayerbotAI* ai) : UnitCalculatedValue(ai) {}
+
+        virtual Unit* Calculate() { return ai->GetBot(); }
+    };
+}
diff --git a/src/game/playerbot/strategy/values/SpellCastUsefulValue.cpp b/src/game/playerbot/strategy/values/SpellCastUsefulValue.cpp
new file mode 100644
index 00000000000..3b2c58bca60
--- /dev/null
+++ b/src/game/playerbot/strategy/values/SpellCastUsefulValue.cpp
@@ -0,0 +1,44 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "SpellCastUsefulValue.h"
+#include "LastSpellCastValue.h"
+
+using namespace ai;
+
+bool SpellCastUsefulValue::Calculate()
+{
+    uint32 spellid = AI_VALUE2(uint32, "spell id", qualifier);
+	if (!spellid)
+		return true; // there can be known alternatives
+
+	SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid);
+	if (!spellInfo)
+		return true; // there can be known alternatives
+
+	if (spellInfo->Attributes & SPELL_ATTR_ON_NEXT_SWING_1 || 
+		spellInfo->Attributes & SPELL_ATTR_ON_NEXT_SWING_2)
+	{
+		Spell* spell = bot->GetCurrentSpell(CURRENT_MELEE_SPELL);
+		if (spell && spell->m_spellInfo->Id == spellid && spell->IsNextMeleeSwingSpell())
+			return false;
+	}
+
+    uint32 lastSpellId = AI_VALUE(LastSpellCast&, "last spell cast").id;
+    if (spellid == lastSpellId) 
+    {
+        Spell* const pSpell = bot->FindCurrentSpellBySpellId(lastSpellId);
+        if (pSpell)
+            return false;
+    }
+
+    // TODO: workaround
+    if (qualifier == "windfury weapon" || qualifier == "flametongue weapon" || qualifier == "frostbrand weapon" ||
+            qualifier == "rockbiter weapon" || qualifier == "earthliving weapon" || qualifier == "spellstone")
+    {
+        Item *item = AI_VALUE2(Item*, "item for spell", spellid);
+        if (item && item->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT))
+            return false;
+    }
+
+	return true;
+}
diff --git a/src/game/playerbot/strategy/values/SpellCastUsefulValue.h b/src/game/playerbot/strategy/values/SpellCastUsefulValue.h
new file mode 100644
index 00000000000..8fa93869e91
--- /dev/null
+++ b/src/game/playerbot/strategy/values/SpellCastUsefulValue.h
@@ -0,0 +1,17 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+
+namespace ai
+{
+   
+    class SpellCastUsefulValue : public BoolCalculatedValue, public Qualified
+	{
+	public:
+        SpellCastUsefulValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+      
+    public:
+        virtual bool Calculate();
+
+    };
+}
diff --git a/src/game/playerbot/strategy/values/SpellIdValue.cpp b/src/game/playerbot/strategy/values/SpellIdValue.cpp
new file mode 100644
index 00000000000..503fcf3251d
--- /dev/null
+++ b/src/game/playerbot/strategy/values/SpellIdValue.cpp
@@ -0,0 +1,89 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "SpellIdValue.h"
+#include "../../PlayerbotAIConfig.h"
+
+using namespace ai;
+
+SpellIdValue::SpellIdValue(PlayerbotAI* ai) :
+        CalculatedValue<uint32>(ai, "spell id", 5)
+{
+}
+
+uint32 SpellIdValue::Calculate()
+{
+    string namepart = qualifier;
+    wstring wnamepart;
+
+    if (!Utf8toWStr(namepart, wnamepart))
+        return 0;
+
+    wstrToLower(wnamepart);
+    char firstSymbol = tolower(qualifier[0]);
+    int spellLength = wnamepart.length();
+
+    int loc = bot->GetSession()->GetSessionDbcLocale();
+
+    uint32 foundSpellId = 0;
+    bool foundMatchUsesNoReagents = false;
+
+    for (PlayerSpellMap::iterator itr = bot->GetSpellMap().begin(); itr != bot->GetSpellMap().end(); ++itr)
+    {
+        uint32 spellId = itr->first;
+
+        if (itr->second.state == PLAYERSPELL_REMOVED || itr->second.disabled || IsPassiveSpell(spellId))
+            continue;
+
+        const SpellEntry* pSpellInfo = sSpellStore.LookupEntry(spellId);
+        if (!pSpellInfo)
+            continue;
+
+        if (pSpellInfo->Effect[0] == SPELL_EFFECT_LEARN_SPELL)
+            continue;
+
+        char* spellName = pSpellInfo->SpellName[loc];
+        if (tolower(spellName[0]) != firstSymbol || strlen(spellName) != spellLength || !Utf8FitTo(spellName, wnamepart))
+            continue;
+
+        bool usesNoReagents = (pSpellInfo->Reagent[0] <= 0);
+
+        // if we already found a spell
+        bool useThisSpell = true;
+        if (foundSpellId > 0) {
+            if (usesNoReagents && !foundMatchUsesNoReagents) {}
+            else if (spellId > foundSpellId) {}
+            else
+                useThisSpell = false;
+        }
+        if (useThisSpell) {
+            foundSpellId = spellId;
+            foundMatchUsesNoReagents = usesNoReagents;
+        }
+    }
+
+    Pet* pet = bot->GetPet();
+    if (!foundSpellId && pet)
+    {
+        for (PetSpellMap::const_iterator itr = pet->m_spells.begin(); itr != pet->m_spells.end(); ++itr)
+        {
+            if(itr->second.state == PETSPELL_REMOVED)
+                continue;
+
+            uint32 spellId = itr->first;
+            const SpellEntry* pSpellInfo = sSpellStore.LookupEntry(spellId);
+            if (!pSpellInfo)
+                continue;
+
+            if (pSpellInfo->Effect[0] == SPELL_EFFECT_LEARN_SPELL)
+                continue;
+
+            char* spellName = pSpellInfo->SpellName[loc];
+            if (tolower(spellName[0]) != firstSymbol || strlen(spellName) != spellLength || !Utf8FitTo(spellName, wnamepart))
+                continue;
+
+            foundSpellId = spellId;
+        }
+    }
+
+    return foundSpellId;
+}
diff --git a/src/game/playerbot/strategy/values/SpellIdValue.h b/src/game/playerbot/strategy/values/SpellIdValue.h
new file mode 100644
index 00000000000..1281b385366
--- /dev/null
+++ b/src/game/playerbot/strategy/values/SpellIdValue.h
@@ -0,0 +1,17 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+
+namespace ai
+{
+
+    class SpellIdValue : public CalculatedValue<uint32>, public Qualified
+	{
+	public:
+        SpellIdValue(PlayerbotAI* ai);
+
+    public:
+        virtual uint32 Calculate();
+
+    };
+}
diff --git a/src/game/playerbot/strategy/values/StatsValues.cpp b/src/game/playerbot/strategy/values/StatsValues.cpp
new file mode 100644
index 00000000000..126d28961ac
--- /dev/null
+++ b/src/game/playerbot/strategy/values/StatsValues.cpp
@@ -0,0 +1,111 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "StatsValues.h"
+
+using namespace ai;
+
+uint8 HealthValue::Calculate()
+{
+    Unit* target = GetTarget();
+    if (!target)
+        return 100;
+    return (static_cast<float> (target->GetHealth()) / target->GetMaxHealth()) * 100;
+}
+
+bool IsDeadValue::Calculate()
+{
+    Unit* target = GetTarget();
+    if (!target)
+        return false;
+    return target->getDeathState() != ALIVE;
+}
+
+
+uint8 RageValue::Calculate()
+{
+    Unit* target = GetTarget();
+    if (!target)
+        return 0;
+    return (static_cast<float> (target->GetPower(POWER_RAGE)));
+}
+
+uint8 EnergyValue::Calculate()
+{
+    Unit* target = GetTarget();
+    if (!target)
+        return 0;
+    return (static_cast<float> (target->GetPower(POWER_ENERGY)));
+}
+
+uint8 ManaValue::Calculate()
+{
+    Unit* target = GetTarget();
+    if (!target)
+        return 100;
+    return (static_cast<float> (target->GetPower(POWER_MANA)) / target->GetMaxPower(POWER_MANA)) * 100;
+}
+
+bool HasManaValue::Calculate()
+{
+    Unit* target = GetTarget();
+    if (!target)
+        return false;
+    return target->GetPower(POWER_MANA);
+}
+
+
+uint8 ComboPointsValue::Calculate()
+{
+    Unit *target = GetTarget();
+    if (!target || target->GetObjectGuid() != bot->GetComboTargetGuid())
+        return 0;
+
+    return bot->GetComboPoints();
+}
+
+bool IsMountedValue::Calculate()
+{
+    Unit* target = GetTarget();
+    if (!target)
+        return false;
+
+    return target->IsMounted();
+}
+
+
+bool IsInCombatValue::Calculate()
+{
+    Unit* target = GetTarget();
+    if (!target)
+        return false;
+
+    return target->IsInCombat();
+}
+
+uint8 BagSpaceValue::Calculate()
+{
+    uint32 totalused = 0, total = 16;
+    for (uint8 slot = INVENTORY_SLOT_ITEM_START; slot < INVENTORY_SLOT_ITEM_END; slot++)
+    {
+        if (bot->GetItemByPos(INVENTORY_SLOT_BAG_0, slot))
+            totalused++;
+    }
+
+    uint32 totalfree = 16 - totalused;
+    for (uint8 bag = INVENTORY_SLOT_BAG_START; bag < INVENTORY_SLOT_BAG_END; ++bag)
+    {
+        const Bag* const pBag = (Bag*) bot->GetItemByPos(INVENTORY_SLOT_BAG_0, bag);
+        if (pBag)
+        {
+            ItemPrototype const* pBagProto = pBag->GetProto();
+            if (pBagProto->Class == ITEM_CLASS_CONTAINER && pBagProto->SubClass == ITEM_SUBCLASS_CONTAINER)
+            {
+                total += pBag->GetBagSize();
+                totalfree += pBag->GetFreeSlots();
+            }
+        }
+
+    }
+
+    return (static_cast<float> (totalused) / total) * 100;
+}
diff --git a/src/game/playerbot/strategy/values/StatsValues.h b/src/game/playerbot/strategy/values/StatsValues.h
new file mode 100644
index 00000000000..4fcdbaf2bb3
--- /dev/null
+++ b/src/game/playerbot/strategy/values/StatsValues.h
@@ -0,0 +1,133 @@
+#pragma once
+#include "../Value.h"
+
+class Unit;
+
+namespace ai
+{
+    class HealthValue : public Uint8CalculatedValue, public Qualified
+    {
+    public:
+        HealthValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual uint8 Calculate();
+    };
+
+    class IsDeadValue : public BoolCalculatedValue, public Qualified
+    {
+    public:
+        IsDeadValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual bool Calculate();
+    };
+
+    class RageValue : public Uint8CalculatedValue, public Qualified
+    {
+    public:
+        RageValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual uint8 Calculate();
+    };
+
+    class EnergyValue : public Uint8CalculatedValue, public Qualified
+    {
+    public:
+        EnergyValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual uint8 Calculate();
+    };
+
+    class ManaValue : public Uint8CalculatedValue, public Qualified
+    {
+    public:
+        ManaValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual uint8 Calculate();
+    };
+
+    class HasManaValue : public BoolCalculatedValue, public Qualified
+    {
+    public:
+        HasManaValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual bool Calculate();
+    };
+
+    class ComboPointsValue : public Uint8CalculatedValue, public Qualified
+    {
+    public:
+        ComboPointsValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual uint8 Calculate();
+    };
+
+    class IsMountedValue : public BoolCalculatedValue, public Qualified
+    {
+    public:
+        IsMountedValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual bool Calculate();
+    };
+
+    class IsInCombatValue : public BoolCalculatedValue, public Qualified
+    {
+    public:
+        IsInCombatValue(PlayerbotAI* ai) : BoolCalculatedValue(ai) {}
+
+        Unit* GetTarget()
+        {
+            AiObjectContext* ctx = AiObject::context;
+            return ctx->GetValue<Unit*>(qualifier)->Get();
+        }
+        virtual bool Calculate() ;
+    };
+
+    class BagSpaceValue : public Uint8CalculatedValue
+    {
+    public:
+        BagSpaceValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai) {}
+
+        virtual uint8 Calculate();
+    };
+
+}
diff --git a/src/game/playerbot/strategy/values/TankTargetValue.cpp b/src/game/playerbot/strategy/values/TankTargetValue.cpp
new file mode 100644
index 00000000000..01967f886d9
--- /dev/null
+++ b/src/game/playerbot/strategy/values/TankTargetValue.cpp
@@ -0,0 +1,47 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TankTargetValue.h"
+
+using namespace ai;
+
+class FindTargetForTankStrategy : public FindTargetStrategy
+{
+public:
+    FindTargetForTankStrategy(PlayerbotAI* ai) : FindTargetStrategy(ai)
+    {
+        minThreat = 0;
+        minTankCount = 0;
+        maxDpsCount = 0;
+    }
+
+public:
+    virtual void CheckAttacker(Unit* creature, ThreatManager* threatManager)
+    {
+        Player* bot = ai->GetBot();
+        float threat = threatManager->getThreat(bot);
+        int tankCount, dpsCount;
+        GetPlayerCount(creature, &tankCount, &dpsCount);
+
+        if (!result ||
+            (minThreat >= threat &&
+            (minTankCount >= tankCount || maxDpsCount <= dpsCount)))
+        {
+            minThreat = threat;
+            minTankCount = tankCount;
+            maxDpsCount = dpsCount;
+            result = creature;
+        }
+    }
+
+protected:
+    float minThreat;
+    int minTankCount;
+    int maxDpsCount;
+};
+
+
+Unit* TankTargetValue::Calculate()
+{
+    FindTargetForTankStrategy strategy(ai);
+    return FindTarget(&strategy);
+}
diff --git a/src/game/playerbot/strategy/values/TankTargetValue.h b/src/game/playerbot/strategy/values/TankTargetValue.h
new file mode 100644
index 00000000000..f297eb0cc0e
--- /dev/null
+++ b/src/game/playerbot/strategy/values/TankTargetValue.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "../Value.h"
+#include "TargetValue.h"
+
+namespace ai
+{
+   
+    class TankTargetValue : public TargetValue
+	{
+	public:
+        TankTargetValue(PlayerbotAI* ai) : TargetValue(ai) {}
+
+    public:
+        Unit* Calculate();
+    };
+}
diff --git a/src/game/playerbot/strategy/values/TargetValue.cpp b/src/game/playerbot/strategy/values/TargetValue.cpp
new file mode 100644
index 00000000000..4c03735544e
--- /dev/null
+++ b/src/game/playerbot/strategy/values/TargetValue.cpp
@@ -0,0 +1,58 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "TargetValue.h"
+#include "../Unit.h"
+
+using namespace ai;
+
+Unit* TargetValue::FindTarget(FindTargetStrategy* strategy)
+{
+    list<ObjectGuid> attackers = ai->GetAiObjectContext()->GetValue<list<ObjectGuid> >("attackers")->Get();
+    for (list<ObjectGuid>::iterator i = attackers.begin(); i != attackers.end(); ++i)
+    {
+        Unit* unit = ai->GetUnit(*i);
+        if (!unit)
+            continue;
+
+        ThreatManager &threatManager = unit->getThreatManager();
+        strategy->CheckAttacker(unit, &threatManager);
+    }
+
+    return strategy->GetResult();
+}
+
+void FindTargetStrategy::GetPlayerCount(Unit* creature, int* tankCount, int* dpsCount)
+{
+    Player* bot = ai->GetBot();
+    if (tankCountCache.find(creature) != tankCountCache.end())
+    {
+        *tankCount = tankCountCache[creature];
+        *dpsCount = dpsCountCache[creature];
+        return;
+    }
+
+    *tankCount = 0;
+    *dpsCount = 0;
+
+    MapPtr map = bot->GetMapPtr();
+    GuidSet attackers = map->GetAttackersFor(bot->GetObjectGuid());
+    for (GuidSet::const_iterator i = attackers.begin(); i != attackers.end(); i++)
+    {
+        ObjectGuid guid = *i;
+        if (!guid.IsPlayer())
+            continue;
+
+        Player* attacker = sObjectMgr.GetPlayer(guid, true);
+        if (!attacker || !attacker->isAlive() || attacker == bot)
+            continue;
+
+        if (ai->IsTank(attacker))
+            (*tankCount)++;
+        else
+            (*dpsCount)++;
+    }
+    map = MapPtr();
+
+    tankCountCache[creature] = *tankCount;
+    dpsCountCache[creature] = *dpsCount;
+}
diff --git a/src/game/playerbot/strategy/values/TargetValue.h b/src/game/playerbot/strategy/values/TargetValue.h
new file mode 100644
index 00000000000..700d51ddba2
--- /dev/null
+++ b/src/game/playerbot/strategy/values/TargetValue.h
@@ -0,0 +1,39 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class FindTargetStrategy
+    {
+    public:
+        FindTargetStrategy(PlayerbotAI* ai)
+        {
+            result = NULL;
+            this->ai = ai;
+        }
+
+    public:
+        Unit* GetResult() { return result; }
+
+    public:
+        virtual void CheckAttacker(Unit* attacker, ThreatManager* threatManager) = 0;
+        void GetPlayerCount(Unit* creature, int* tankCount, int* dpsCount);
+
+    protected:
+        Unit* result;
+        PlayerbotAI* ai;
+
+    protected:
+        map<Unit*, int> tankCountCache;
+        map<Unit*, int> dpsCountCache;
+    };
+
+    class TargetValue : public UnitCalculatedValue
+	{
+	public:
+        TargetValue(PlayerbotAI* ai) : UnitCalculatedValue(ai) {}
+
+    protected:
+        Unit* FindTarget(FindTargetStrategy* strategy);
+    };
+}
diff --git a/src/game/playerbot/strategy/values/ThreatValues.cpp b/src/game/playerbot/strategy/values/ThreatValues.cpp
new file mode 100644
index 00000000000..d34f84eec5e
--- /dev/null
+++ b/src/game/playerbot/strategy/values/ThreatValues.cpp
@@ -0,0 +1,63 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "ThreatValues.h"
+#include "../../../ThreatManager.h"
+
+using namespace ai;
+
+uint8 ThreatValue::Calculate()
+{
+    if (qualifier == "aoe")
+    {
+        uint8 maxThreat = 0;
+        list<ObjectGuid> attackers = context->GetValue<list<ObjectGuid> >("attackers")->Get();
+        for (list<ObjectGuid>::iterator i = attackers.begin(); i != attackers.end(); i++)
+        {
+            Unit* unit = ai->GetUnit(*i);
+            if (!unit || !unit->isAlive())
+                continue;
+
+            uint8 threat = Calculate(unit);
+            if (!maxThreat || threat > maxThreat)
+                maxThreat = threat;
+        }
+
+        return maxThreat;
+    }
+
+    Unit* target = AI_VALUE(Unit*, qualifier);
+    return Calculate(target);
+}
+
+uint8 ThreatValue::Calculate(Unit* target)
+{
+    if (!target)
+        return 0;
+
+    if (target->GetObjectGuid().IsPlayer())
+        return 0;
+
+    Group* group = bot->GetGroup();
+    if (!group)
+        return 0;
+
+    float botThreat = target->getThreatManager().getThreat(bot);
+    float maxThreat = 0;
+
+    Group::MemberSlotList const& groupSlot = group->GetMemberSlots();
+    for (Group::member_citerator itr = groupSlot.begin(); itr != groupSlot.end(); itr++)
+    {
+        Player *player = sObjectMgr.GetPlayer(itr->guid);
+        if( !player || !player->isAlive() || player == bot)
+            continue;
+
+        float threat = target->getThreatManager().getThreat(player);
+        if (maxThreat < threat)
+            maxThreat = threat;
+    }
+
+    if (maxThreat <= 0)
+        return 0;
+
+    return botThreat * 100 / maxThreat;
+}
diff --git a/src/game/playerbot/strategy/values/ThreatValues.h b/src/game/playerbot/strategy/values/ThreatValues.h
new file mode 100644
index 00000000000..7301f7902d8
--- /dev/null
+++ b/src/game/playerbot/strategy/values/ThreatValues.h
@@ -0,0 +1,17 @@
+#pragma once
+#include "../Value.h"
+
+namespace ai
+{
+    class ThreatValue : public Uint8CalculatedValue, public Qualified
+	{
+	public:
+        ThreatValue(PlayerbotAI* ai) : Uint8CalculatedValue(ai) {}
+
+    public:
+    	virtual uint8 Calculate();
+
+    protected:
+    	uint8 Calculate(Unit* target);
+    };
+}
diff --git a/src/game/playerbot/strategy/values/ValueContext.h b/src/game/playerbot/strategy/values/ValueContext.h
new file mode 100644
index 00000000000..468b2c9cd1c
--- /dev/null
+++ b/src/game/playerbot/strategy/values/ValueContext.h
@@ -0,0 +1,222 @@
+#pragma once;
+
+#include "NearestGameObjects.h"
+#include "LogLevelValue.h"
+#include "NearestNpcsValue.h"
+#include "PossibleTargetsValue.h"
+#include "NearestAdsValue.h"
+#include "NearestCorpsesValue.h"
+#include "PartyMemberWithoutAuraValue.h"
+#include "PartyMemberToHeal.h"
+#include "PartyMemberToResurrect.h"
+#include "CurrentTargetValue.h"
+#include "SelfTargetValue.h"
+#include "MasterTargetValue.h"
+#include "LineTargetValue.h"
+#include "TankTargetValue.h"
+#include "DpsTargetValue.h"
+#include "CcTargetValue.h"
+#include "CurrentCcTargetValue.h"
+#include "PetTargetValue.h"
+#include "GrindTargetValue.h"
+#include "RtiTargetValue.h"
+#include "PartyMemberToDispel.h"
+#include "StatsValues.h"
+#include "AttackerCountValues.h"
+#include "AttackersValue.h"
+#include "AvailableLootValue.h"
+#include "AlwaysLootListValue.h"
+#include "LootStrategyValue.h"
+#include "HasAvailableLootValue.h"
+#include "LastMovementValue.h"
+#include "DistanceValue.h"
+#include "IsMovingValue.h"
+#include "IsBehindValue.h"
+#include "IsFacingValue.h"
+#include "ItemCountValue.h"
+#include "SpellIdValue.h"
+#include "ItemForSpellValue.h"
+#include "SpellCastUsefulValue.h"
+#include "LastSpellCastValue.h"
+#include "ChatValue.h"
+#include "HasTotemValue.h"
+#include "LeastHpTargetValue.h"
+#include "AoeHealValues.h"
+#include "RtiValue.h"
+#include "PositionValue.h"
+#include "ThreatValues.h"
+#include "DuelTargetValue.h"
+#include "InvalidTargetValue.h"
+#include "EnemyPlayerValue.h"
+#include "AttackerWithoutAuraTargetValue.h"
+#include "LastSpellCastTimeValue.h"
+#include "ManaSaveLevelValue.h"
+#include "LfgValues.h"
+#include "EnemyHealerTargetValue.h"
+#include "Formations.h"
+
+namespace ai
+{
+    class ValueContext : public NamedObjectContext<UntypedValue>
+    {
+    public:
+        ValueContext()
+        {
+            creators["nearest game objects"] = &ValueContext::nearest_game_objects;
+            creators["nearest npcs"] = &ValueContext::nearest_npcs;
+            creators["possible targets"] = &ValueContext::possible_targets;
+            creators["nearest adds"] = &ValueContext::nearest_adds;
+            creators["nearest corpses"] = &ValueContext::nearest_corpses;
+            creators["log level"] = &ValueContext::log_level;
+            creators["party member without aura"] = &ValueContext::party_member_without_aura;
+            creators["attacker without aura"] = &ValueContext::attacker_without_aura;
+            creators["party member to heal"] = &ValueContext::party_member_to_heal;
+            creators["party member to resurrect"] = &ValueContext::party_member_to_resurrect;
+            creators["current target"] = &ValueContext::current_target;
+            creators["self target"] = &ValueContext::self_target;
+            creators["master target"] = &ValueContext::master;
+            creators["line target"] = &ValueContext::line_target;
+            creators["tank target"] = &ValueContext::tank_target;
+            creators["dps target"] = &ValueContext::dps_target;
+            creators["least hp target"] = &ValueContext::least_hp_target;
+            creators["enemy player target"] = &ValueContext::enemy_player_target;
+            creators["cc target"] = &ValueContext::cc_target;
+            creators["current cc target"] = &ValueContext::current_cc_target;
+            creators["pet target"] = &ValueContext::pet_target;
+            creators["old target"] = &ValueContext::old_target;
+            creators["grind target"] = &ValueContext::grind_target;
+            creators["rti target"] = &ValueContext::rti_target;
+            creators["duel target"] = &ValueContext::duel_target;
+            creators["party member to dispel"] = &ValueContext::party_member_to_dispel;
+            creators["health"] = &ValueContext::health;
+            creators["rage"] = &ValueContext::rage;
+            creators["energy"] = &ValueContext::energy;
+            creators["mana"] = &ValueContext::mana;
+            creators["combo"] = &ValueContext::combo;
+            creators["dead"] = &ValueContext::dead;
+            creators["has mana"] = &ValueContext::has_mana;
+            creators["attacker count"] = &ValueContext::attacker_count;
+            creators["my attacker count"] = &ValueContext::my_attacker_count;
+            creators["has aggro"] = &ValueContext::has_aggro;
+            creators["mounted"] = &ValueContext::mounted;
+
+            creators["can loot"] = &ValueContext::can_loot;
+            creators["loot target"] = &ValueContext::loot_target;
+            creators["available loot"] = &ValueContext::available_loot;
+            creators["has available loot"] = &ValueContext::has_available_loot;
+            creators["always loot list"] = &ValueContext::always_loot_list;
+            creators["loot strategy"] = &ValueContext::loot_strategy;
+            creators["last movement"] = &ValueContext::last_movement;
+            creators["distance"] = &ValueContext::distance;
+            creators["moving"] = &ValueContext::moving;
+            creators["swimming"] = &ValueContext::swimming;
+            creators["behind"] = &ValueContext::behind;
+            creators["facing"] = &ValueContext::facing;
+
+            creators["item count"] = &ValueContext::item_count;
+            creators["inventory items"] = &ValueContext::inventory_item;
+
+            creators["spell id"] = &ValueContext::spell_id;
+            creators["item for spell"] = &ValueContext::item_for_spell;
+            creators["spell cast useful"] = &ValueContext::spell_cast_useful;
+            creators["last spell cast"] = &ValueContext::last_spell_cast;
+            creators["last spell cast time"] = &ValueContext::last_spell_cast_time;
+            creators["chat"] = &ValueContext::chat;
+            creators["has totem"] = &ValueContext::has_totem;
+
+            creators["aoe heal"] = &ValueContext::aoe_heal;
+
+            creators["rti"] = &ValueContext::rti;
+            creators["position"] = &ValueContext::position;
+            creators["threat"] = &ValueContext::threat;
+
+            creators["balance"] = &ValueContext::balance;
+            creators["attackers"] = &ValueContext::attackers;
+            creators["invalid target"] = &ValueContext::invalid_target;
+            creators["mana save level"] = &ValueContext::mana_save_level;
+            creators["combat"] = &ValueContext::combat;
+            creators["lfg proposal"] = &ValueContext::lfg_proposal;
+            creators["bag space"] = &ValueContext::bag_space;
+            creators["enemy healer target"] = &ValueContext::enemy_healer_target;
+            creators["formation"] = &ValueContext::formation;
+        }
+
+    private:
+        static UntypedValue* formation(PlayerbotAI* ai) { return new FormationValue(ai); }
+        static UntypedValue* mana_save_level(PlayerbotAI* ai) { return new ManaSaveLevelValue(ai); }
+        static UntypedValue* invalid_target(PlayerbotAI* ai) { return new InvalidTargetValue(ai); }
+        static UntypedValue* balance(PlayerbotAI* ai) { return new BalancePercentValue(ai); }
+        static UntypedValue* attackers(PlayerbotAI* ai) { return new AttackersValue(ai); }
+
+        static UntypedValue* position(PlayerbotAI* ai) { return new PositionValue(ai); }
+        static UntypedValue* rti(PlayerbotAI* ai) { return new RtiValue(ai); }
+
+        static UntypedValue* aoe_heal(PlayerbotAI* ai) { return new AoeHealValue(ai); }
+
+        static UntypedValue* chat(PlayerbotAI* ai) { return new ChatValue(ai); }
+        static UntypedValue* last_spell_cast(PlayerbotAI* ai) { return new LastSpellCastValue(ai); }
+        static UntypedValue* last_spell_cast_time(PlayerbotAI* ai) { return new LastSpellCastTimeValue(ai); }
+        static UntypedValue* spell_cast_useful(PlayerbotAI* ai) { return new SpellCastUsefulValue(ai); }
+        static UntypedValue* item_for_spell(PlayerbotAI* ai) { return new ItemForSpellValue(ai); }
+        static UntypedValue* spell_id(PlayerbotAI* ai) { return new SpellIdValue(ai); }
+        static UntypedValue* inventory_item(PlayerbotAI* ai) { return new InventoryItemValue(ai); }
+        static UntypedValue* item_count(PlayerbotAI* ai) { return new ItemCountValue(ai); }
+        static UntypedValue* behind(PlayerbotAI* ai) { return new IsBehindValue(ai); }
+        static UntypedValue* facing(PlayerbotAI* ai) { return new IsFacingValue(ai); }
+        static UntypedValue* moving(PlayerbotAI* ai) { return new IsMovingValue(ai); }
+        static UntypedValue* swimming(PlayerbotAI* ai) { return new IsSwimmingValue(ai); }
+        static UntypedValue* distance(PlayerbotAI* ai) { return new DistanceValue(ai); }
+        static UntypedValue* last_movement(PlayerbotAI* ai) { return new LastMovementValue(ai); }
+
+        static UntypedValue* can_loot(PlayerbotAI* ai) { return new CanLootValue(ai); }
+        static UntypedValue* available_loot(PlayerbotAI* ai) { return new AvailableLootValue(ai); }
+        static UntypedValue* loot_target(PlayerbotAI* ai) { return new LootTargetValue(ai); }
+        static UntypedValue* has_available_loot(PlayerbotAI* ai) { return new HasAvailableLootValue(ai); }
+        static UntypedValue* always_loot_list(PlayerbotAI* ai) { return new AlwaysLootListValue(ai); }
+        static UntypedValue* loot_strategy(PlayerbotAI* ai) { return new LootStrategyValue(ai); }
+
+        static UntypedValue* attacker_count(PlayerbotAI* ai) { return new AttackerCountValue(ai); }
+        static UntypedValue* my_attacker_count(PlayerbotAI* ai) { return new MyAttackerCountValue(ai); }
+        static UntypedValue* has_aggro(PlayerbotAI* ai) { return new HasAggroValue(ai); }
+        static UntypedValue* mounted(PlayerbotAI* ai) { return new IsMountedValue(ai); }
+        static UntypedValue* health(PlayerbotAI* ai) { return new HealthValue(ai); }
+        static UntypedValue* rage(PlayerbotAI* ai) { return new RageValue(ai); }
+        static UntypedValue* energy(PlayerbotAI* ai) { return new EnergyValue(ai); }
+        static UntypedValue* mana(PlayerbotAI* ai) { return new ManaValue(ai); }
+        static UntypedValue* combo(PlayerbotAI* ai) { return new ComboPointsValue(ai); }
+        static UntypedValue* dead(PlayerbotAI* ai) { return new IsDeadValue(ai); }
+        static UntypedValue* has_mana(PlayerbotAI* ai) { return new HasManaValue(ai); }
+        static UntypedValue* nearest_game_objects(PlayerbotAI* ai) { return new NearestGameObjects(ai); }
+        static UntypedValue* log_level(PlayerbotAI* ai) { return new LogLevelValue(ai); }
+        static UntypedValue* nearest_npcs(PlayerbotAI* ai) { return new NearestNpcsValue(ai); }
+        static UntypedValue* nearest_corpses(PlayerbotAI* ai) { return new NearestCorpsesValue(ai); }
+        static UntypedValue* possible_targets(PlayerbotAI* ai) { return new PossibleTargetsValue(ai); }
+        static UntypedValue* nearest_adds(PlayerbotAI* ai) { return new NearestAdsValue(ai); }
+        static UntypedValue* party_member_without_aura(PlayerbotAI* ai) { return new PartyMemberWithoutAuraValue(ai); }
+        static UntypedValue* attacker_without_aura(PlayerbotAI* ai) { return new AttackerWithoutAuraTargetValue(ai); }
+        static UntypedValue* party_member_to_heal(PlayerbotAI* ai) { return new PartyMemberToHeal(ai); }
+        static UntypedValue* party_member_to_resurrect(PlayerbotAI* ai) { return new PartyMemberToResurrect(ai); }
+        static UntypedValue* party_member_to_dispel(PlayerbotAI* ai) { return new PartyMemberToDispel(ai); }
+        static UntypedValue* current_target(PlayerbotAI* ai) { return new CurrentTargetValue(ai); }
+        static UntypedValue* old_target(PlayerbotAI* ai) { return new CurrentTargetValue(ai); }
+        static UntypedValue* self_target(PlayerbotAI* ai) { return new SelfTargetValue(ai); }
+        static UntypedValue* master(PlayerbotAI* ai) { return new MasterTargetValue(ai); }
+        static UntypedValue* line_target(PlayerbotAI* ai) { return new LineTargetValue(ai); }
+        static UntypedValue* tank_target(PlayerbotAI* ai) { return new TankTargetValue(ai); }
+        static UntypedValue* dps_target(PlayerbotAI* ai) { return new DpsTargetValue(ai); }
+        static UntypedValue* least_hp_target(PlayerbotAI* ai) { return new LeastHpTargetValue(ai); }
+        static UntypedValue* enemy_player_target(PlayerbotAI* ai) { return new EnemyPlayerValue(ai); }
+        static UntypedValue* cc_target(PlayerbotAI* ai) { return new CcTargetValue(ai); }
+        static UntypedValue* current_cc_target(PlayerbotAI* ai) { return new CurrentCcTargetValue(ai); }
+        static UntypedValue* pet_target(PlayerbotAI* ai) { return new PetTargetValue(ai); }
+        static UntypedValue* grind_target(PlayerbotAI* ai) { return new GrindTargetValue(ai); }
+        static UntypedValue* rti_target(PlayerbotAI* ai) { return new RtiTargetValue(ai); }
+        static UntypedValue* duel_target(PlayerbotAI* ai) { return new DuelTargetValue(ai); }
+        static UntypedValue* has_totem(PlayerbotAI* ai) { return new HasTotemValue(ai); }
+        static UntypedValue* threat(PlayerbotAI* ai) { return new ThreatValue(ai); }
+        static UntypedValue* combat(PlayerbotAI* ai) { return new IsInCombatValue(ai); }
+        static UntypedValue* lfg_proposal(PlayerbotAI* ai) { return new LfgProposalValue(ai); }
+        static UntypedValue* bag_space(PlayerbotAI* ai) { return new BagSpaceValue(ai); }
+        static UntypedValue* enemy_healer_target(PlayerbotAI* ai) { return new EnemyHealerTargetValue(ai); }
+    };
+};
diff --git a/src/game/playerbot/strategy/values/formations/Arrow.cpp b/src/game/playerbot/strategy/values/formations/Arrow.cpp
new file mode 100644
index 00000000000..3fd2587e96f
--- /dev/null
+++ b/src/game/playerbot/strategy/values/formations/Arrow.cpp
@@ -0,0 +1,157 @@
+#include "../../../../pchdef.h"
+#include "../../../playerbot.h"
+#include "../Formations.h"
+#include "Arrow.h"
+
+using namespace ai;
+
+WorldLocation ArrowFormation::GetLocation()
+{
+    Build();
+
+    int tankLines = 1 + tanks.Size() / 6;
+    int meleeLines = 1 + melee.Size() / 6;
+    int rangedLines = 1 + ranged.Size() / 6;
+    int healerLines = 1 + healers.Size() / 6;
+    float offset = 0;
+
+    Player* master = ai->GetMaster();
+    float orientation = master->GetOrientation();
+    MultiLineUnitPlacer placer(orientation);
+
+    tanks.PlaceUnits(&placer);
+
+    offset = tankLines * sPlayerbotAIConfig.followDistance;
+    melee.PlaceUnits(&placer);
+    melee.Move(-cos(orientation) * offset, -sin(orientation) * offset);
+
+    offset += meleeLines * sPlayerbotAIConfig.followDistance + sPlayerbotAIConfig.tooCloseDistance;
+    ranged.PlaceUnits(&placer);
+    ranged.Move(-cos(orientation) * offset, -sin(orientation) * offset);
+
+    offset += rangedLines * sPlayerbotAIConfig.followDistance;
+    healers.PlaceUnits(&placer);
+    healers.Move(-cos(orientation) * offset, -sin(orientation) * offset);
+
+    return WorldLocation(master->GetMapId(),
+            master->GetPositionX() - masterUnit->GetX() + botUnit->GetX(),
+            master->GetPositionY() - masterUnit->GetY() + botUnit->GetY(),
+            master->GetPositionZ());
+
+
+}
+
+void ArrowFormation::Build()
+{
+    if (built)
+        return;
+
+    FillSlotsExceptMaster();
+    AddMasterToSlot();
+
+    built = true;
+}
+
+FormationSlot* ArrowFormation::FindSlot(Player* member)
+{
+    if (ai->IsTank(member))
+        return &tanks;
+    else if (ai->IsHeal(member))
+        return &healers;
+    else if (ai->IsRanged(member))
+        return &ranged;
+    else
+        return &melee;
+}
+
+void ArrowFormation::FillSlotsExceptMaster()
+{
+    Group* group = bot->GetGroup();
+    GroupReference *gref = group->GetFirstMember();
+    uint32 index = 0;
+    while (gref)
+    {
+        Player* member = gref->getSource();
+
+        if (member == bot)
+            FindSlot(member)->AddLast(botUnit = new FormationUnit(index, false));
+        else if (member != ai->GetMaster())
+            FindSlot(member)->AddLast(new FormationUnit(index, false));
+
+        gref = gref->next();
+        index++;
+    }
+}
+
+void ArrowFormation::AddMasterToSlot()
+{
+    Group* group = bot->GetGroup();
+    GroupReference *gref = group->GetFirstMember();
+    uint32 index = 0;
+    while (gref)
+    {
+        Player* member = gref->getSource();
+
+        if (member == ai->GetMaster())
+        {
+            FindSlot(member)->InsertAtCenter(masterUnit = new FormationUnit(index, true));
+            break;
+        }
+
+        gref = gref->next();
+        index++;
+    }
+}
+
+void FormationSlot::PlaceUnits(UnitPlacer* placer)
+{
+    uint32 index = 0;
+    uint32 count = units.size();
+    for (vector<FormationUnit*>::iterator i = units.begin(); i != units.end(); ++i)
+    {
+        FormationUnit* unit = *i;
+        unit->SetLocation(placer->Place(unit, index, count));
+        index++;
+    }
+}
+
+UnitPosition MultiLineUnitPlacer::Place(FormationUnit *unit, uint32 index, uint32 count)
+{
+    SingleLineUnitPlacer placer(orientation);
+    if (count <= 6)
+        return placer.Place(unit, index, count);
+
+    int lineNo = index / 6;
+    int indexInLine = index % 6;
+    int lineSize = max(count - lineNo * 6, uint32(6));
+    float x = cos(orientation) * sPlayerbotAIConfig.followDistance * lineNo;
+    float y = sin(orientation) * sPlayerbotAIConfig.followDistance * lineNo;
+    return placer.Place(unit, indexInLine, lineSize);
+}
+
+UnitPosition SingleLineUnitPlacer::Place(FormationUnit *unit, uint32 index, uint32 count)
+{
+    float angle = orientation - M_PI / 2.0f;
+    float x = cos(angle) * sPlayerbotAIConfig.followDistance * ((float)index - (float)count / 2);
+    float y = sin(angle) * sPlayerbotAIConfig.followDistance * ((float)index - (float)count / 2);
+    return UnitPosition(x, y);
+}
+
+void FormationSlot::Move(float dx, float dy)
+{
+    for (vector<FormationUnit*>::iterator i = units.begin(); i != units.end(); ++i)
+    {
+        FormationUnit* unit = *i;
+        unit->SetLocation(unit->GetX() + dx, unit->GetY() + dy);
+    }
+}
+
+FormationSlot::~FormationSlot()
+{
+    for (vector<FormationUnit*>::iterator i = units.begin(); i != units.end(); ++i)
+    {
+        FormationUnit* unit = *i;
+        delete unit;
+    }
+    units.clear();
+}
diff --git a/src/game/playerbot/strategy/values/formations/Arrow.h b/src/game/playerbot/strategy/values/formations/Arrow.h
new file mode 100644
index 00000000000..e302c87fe78
--- /dev/null
+++ b/src/game/playerbot/strategy/values/formations/Arrow.h
@@ -0,0 +1,109 @@
+#pragma once
+
+namespace ai
+{
+    class UnitPosition
+    {
+    public:
+        UnitPosition(float x, float y) : x(x), y(y) {}
+        UnitPosition(const UnitPosition& other) { x = other.x; y = other.y; }
+        float x, y;
+    };
+
+    class FormationUnit
+    {
+    public:
+        FormationUnit(uint32 groupIndex, bool master) : groupIndex(groupIndex), master(master), position(0, 0) {}
+        FormationUnit(const FormationUnit& other) : position(other.position.x, other.position.y)
+        {
+            groupIndex = other.groupIndex;
+            master = other.master;
+        }
+
+    public:
+        uint32 GetGroupIdex() { return groupIndex; }
+        void SetLocation(UnitPosition pos) { position = pos; }
+        void SetLocation(float x, float y) { position.x = x; position.y = y; }
+        float GetX() { return position.x; }
+        float GetY() { return position.y; }
+
+    private:
+        uint32 groupIndex;
+        bool master;
+        UnitPosition position;
+    };
+
+    class UnitPlacer
+    {
+    public:
+        UnitPlacer() {}
+
+    public:
+        virtual UnitPosition Place(FormationUnit *unit, uint32 index, uint32 count) = 0;
+    };
+
+    class FormationSlot
+    {
+    public:
+        FormationSlot() {}
+        virtual ~FormationSlot();
+
+    public:
+        void AddLast(FormationUnit* unit) { units.push_back(unit); }
+        void InsertAtCenter(FormationUnit* unit) { units.insert(units.begin() + (units.size() + 1) / 2, unit); }
+        void PlaceUnits(UnitPlacer* placer);
+        void Move(float dx, float dy);
+        int Size() { return units.size(); }
+
+    private:
+        WorldLocation center;
+        vector<FormationUnit*> units;
+    };
+
+
+    class MultiLineUnitPlacer : public UnitPlacer
+    {
+    public:
+        MultiLineUnitPlacer(float orientation) : UnitPlacer(), orientation(orientation) {}
+
+    public:
+        virtual UnitPosition Place(FormationUnit *unit, uint32 index, uint32 count);
+
+    private:
+        float orientation;
+    };
+
+    class SingleLineUnitPlacer
+    {
+    public:
+        SingleLineUnitPlacer(float orientation) : orientation(orientation) {}
+
+    public:
+        virtual UnitPosition Place(FormationUnit *unit, uint32 index, uint32 count);
+
+    private:
+        float orientation;
+    };
+
+    class ArrowFormation : public MoveFormation
+    {
+    public:
+        ArrowFormation(PlayerbotAI* ai) : MoveFormation(ai, "arrow"), built(false), masterUnit(NULL), botUnit(NULL) {}
+
+    public:
+        virtual WorldLocation GetLocation();
+
+    private:
+        void Build();
+        void FillSlotsExceptMaster();
+        void AddMasterToSlot();
+        FormationSlot* FindSlot(Player* member);
+
+    private:
+        FormationSlot tanks, melee, ranged, healers;
+        FormationUnit *masterUnit, *botUnit;
+        bool built;
+    };
+
+}
+
diff --git a/src/game/playerbot/strategy/warlock/DpsWarlockStrategy.cpp b/src/game/playerbot/strategy/warlock/DpsWarlockStrategy.cpp
new file mode 100644
index 00000000000..039fd536a71
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/DpsWarlockStrategy.cpp
@@ -0,0 +1,76 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarlockTriggers.h"
+#include "WarlockMultipliers.h"
+#include "DpsWarlockStrategy.h"
+#include "WarlockActions.h"
+
+using namespace ai;
+
+class DpsWarlockStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    DpsWarlockStrategyActionNodeFactory()
+    {
+        creators["shadow bolt"] = &shadow_bolt;
+    }
+private:
+    static ActionNode* shadow_bolt(PlayerbotAI* ai)
+    {
+        return new ActionNode ("shadow bolt",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("shoot"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+DpsWarlockStrategy::DpsWarlockStrategy(PlayerbotAI* ai) : GenericWarlockStrategy(ai)
+{
+    actionNodeFactories.Add(new DpsWarlockStrategyActionNodeFactory());
+}
+
+
+NextAction** DpsWarlockStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("incinirate", 10.0f), new NextAction("shadow bolt", 10.0f), NULL);
+}
+
+void DpsWarlockStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericWarlockStrategy::InitTriggers(triggers);
+
+	triggers.push_back(new TriggerNode(
+		"shadow trance",
+		NextAction::array(0, new NextAction("shadow bolt", 20.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"backlash",
+		NextAction::array(0, new NextAction("shadow bolt", 20.0f), NULL)));
+}
+
+void DpsAoeWarlockStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "high aoe",
+        NextAction::array(0, new NextAction("rain of fire", 30.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("seed of corruption", 31.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "light aoe",
+        NextAction::array(0, new NextAction("shadowfury", 29.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "corruption on attacker",
+        NextAction::array(0, new NextAction("corruption on attacker", 28.0f), NULL)));
+
+}
+
+void DpsWarlockDebuffStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "corruption",
+        NextAction::array(0, new NextAction("corruption", 12.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/warlock/DpsWarlockStrategy.h b/src/game/playerbot/strategy/warlock/DpsWarlockStrategy.h
new file mode 100644
index 00000000000..846f9df36a2
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/DpsWarlockStrategy.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "GenericWarlockStrategy.h"
+#include "../generic/CombatStrategy.h"
+
+namespace ai
+{
+    class DpsWarlockStrategy : public GenericWarlockStrategy
+    {
+    public:
+        DpsWarlockStrategy(PlayerbotAI* ai);
+        virtual string getName() { return "dps"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual NextAction** getDefaultActions();
+    };
+
+    class DpsAoeWarlockStrategy : public CombatStrategy
+    {
+    public:
+        DpsAoeWarlockStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "aoe"; }
+    };
+
+    class DpsWarlockDebuffStrategy : public CombatStrategy
+    {
+    public:
+        DpsWarlockDebuffStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "dps debuff"; }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/warlock/GenericWarlockNonCombatStrategy.cpp b/src/game/playerbot/strategy/warlock/GenericWarlockNonCombatStrategy.cpp
new file mode 100644
index 00000000000..3dc73c68eba
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/GenericWarlockNonCombatStrategy.cpp
@@ -0,0 +1,65 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarlockMultipliers.h"
+#include "GenericWarlockNonCombatStrategy.h"
+
+using namespace ai;
+
+class GenericWarlockNonCombatStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    GenericWarlockNonCombatStrategyActionNodeFactory()
+    {
+        creators["fel armor"] = &fel_armor;
+        creators["demon armor"] = &demon_armor;
+    }
+private:
+    static ActionNode* fel_armor(PlayerbotAI* ai)
+    {
+        return new ActionNode ("fel armor",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("demon armor"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* demon_armor(PlayerbotAI* ai)
+    {
+        return new ActionNode ("demon armor",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("demon skin"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+GenericWarlockNonCombatStrategy::GenericWarlockNonCombatStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericWarlockNonCombatStrategyActionNodeFactory());
+}
+
+void GenericWarlockNonCombatStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    NonCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "demon armor",
+        NextAction::array(0, new NextAction("fel armor", 21.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"no healthstone",
+		NextAction::array(0, new NextAction("create healthstone", 15.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"no firestone",
+		NextAction::array(0, new NextAction("create firestone", 14.0f), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"no spellstone",
+		NextAction::array(0, new NextAction("create spellstone", 13.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "spellstone",
+        NextAction::array(0, new NextAction("spellstone", 13.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "no pet",
+        NextAction::array(0, new NextAction("summon imp", 10.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/warlock/GenericWarlockNonCombatStrategy.h b/src/game/playerbot/strategy/warlock/GenericWarlockNonCombatStrategy.h
new file mode 100644
index 00000000000..c5e483f8a0d
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/GenericWarlockNonCombatStrategy.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../generic/NonCombatStrategy.h"
+
+namespace ai
+{
+    class GenericWarlockNonCombatStrategy : public NonCombatStrategy
+    {
+    public:
+        GenericWarlockNonCombatStrategy(PlayerbotAI* ai);
+        virtual string getName() { return "nc"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+    };
+}
diff --git a/src/game/playerbot/strategy/warlock/GenericWarlockStrategy.cpp b/src/game/playerbot/strategy/warlock/GenericWarlockStrategy.cpp
new file mode 100644
index 00000000000..e8800612bd8
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/GenericWarlockStrategy.cpp
@@ -0,0 +1,74 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarlockMultipliers.h"
+#include "GenericWarlockStrategy.h"
+
+using namespace ai;
+
+class GenericWarlockStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    GenericWarlockStrategyActionNodeFactory()
+    {
+        creators["summon voidwalker"] = &summon_voidwalker;
+        creators["banish"] = &banish;
+    }
+private:
+    static ActionNode* summon_voidwalker(PlayerbotAI* ai)
+    {
+        return new ActionNode ("summon voidwalker",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("drain soul"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* banish(PlayerbotAI* ai)
+    {
+        return new ActionNode ("banish",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("fear"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+GenericWarlockStrategy::GenericWarlockStrategy(PlayerbotAI* ai) : RangedCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericWarlockStrategyActionNodeFactory());
+}
+
+NextAction** GenericWarlockStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("shoot", 10.0f), NULL);
+}
+
+void GenericWarlockStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    RangedCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "curse of agony",
+        NextAction::array(0, new NextAction("curse of agony", 11.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium health",
+        NextAction::array(0, new NextAction("drain life", 40.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low mana",
+        NextAction::array(0, new NextAction("life tap", ACTION_EMERGENCY + 5), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"target critical health",
+		NextAction::array(0, new NextAction("drain soul", 30.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "banish",
+        NextAction::array(0, new NextAction("banish", 21.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "fear",
+        NextAction::array(0, new NextAction("fear on cc", 20.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "immolate",
+        NextAction::array(0, new NextAction("immolate", 19.0f), new NextAction("conflagrate", 19.0f), NULL)));
+}
diff --git a/src/game/playerbot/strategy/warlock/GenericWarlockStrategy.h b/src/game/playerbot/strategy/warlock/GenericWarlockStrategy.h
new file mode 100644
index 00000000000..473da590307
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/GenericWarlockStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "../Strategy.h"
+#include "../generic/RangedCombatStrategy.h"
+
+namespace ai
+{
+    class GenericWarlockStrategy : public RangedCombatStrategy
+    {
+    public:
+        GenericWarlockStrategy(PlayerbotAI* ai);
+        virtual string getName() { return "warlock"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual NextAction** getDefaultActions();
+    };
+}
diff --git a/src/game/playerbot/strategy/warlock/TankWarlockStrategy.cpp b/src/game/playerbot/strategy/warlock/TankWarlockStrategy.cpp
new file mode 100644
index 00000000000..cb4f5a540de
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/TankWarlockStrategy.cpp
@@ -0,0 +1,51 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarlockMultipliers.h"
+#include "TankWarlockStrategy.h"
+
+using namespace ai;
+
+class GenericWarlockStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    GenericWarlockStrategyActionNodeFactory()
+    {
+        creators["summon voidwalker"] = &summon_voidwalker;
+        creators["summon felguard"] = &summon_felguard;
+    }
+private:
+    static ActionNode* summon_voidwalker(PlayerbotAI* ai)
+    {
+        return new ActionNode ("summon voidwalker",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("drain soul"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* summon_felguard(PlayerbotAI* ai)
+    {
+        return new ActionNode ("summon felguard",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("summon voidwalker"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+TankWarlockStrategy::TankWarlockStrategy(PlayerbotAI* ai) : GenericWarlockStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericWarlockStrategyActionNodeFactory());
+}
+
+NextAction** TankWarlockStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("shoot", 10.0f), NULL);
+}
+
+void TankWarlockStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericWarlockStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "no pet",
+        NextAction::array(0, new NextAction("summon felguard", 50.0f), NULL)));
+
+}
diff --git a/src/game/playerbot/strategy/warlock/TankWarlockStrategy.h b/src/game/playerbot/strategy/warlock/TankWarlockStrategy.h
new file mode 100644
index 00000000000..9cdd6e62fee
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/TankWarlockStrategy.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "GenericWarlockStrategy.h"
+
+namespace ai
+{
+    class TankWarlockStrategy : public GenericWarlockStrategy
+    {
+    public:
+        TankWarlockStrategy(PlayerbotAI* ai);
+        virtual string getName() { return "tank"; }
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual NextAction** getDefaultActions();
+    };
+}
diff --git a/src/game/playerbot/strategy/warlock/WarlockActions.cpp b/src/game/playerbot/strategy/warlock/WarlockActions.cpp
new file mode 100644
index 00000000000..0a01ebbfaae
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/WarlockActions.cpp
@@ -0,0 +1,5 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarlockActions.h"
+
+using namespace ai;
diff --git a/src/game/playerbot/strategy/warlock/WarlockActions.h b/src/game/playerbot/strategy/warlock/WarlockActions.h
new file mode 100644
index 00000000000..fb1689ac673
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/WarlockActions.h
@@ -0,0 +1,176 @@
+#pragma once
+
+#include "../actions/GenericActions.h"
+
+namespace ai
+{
+	class CastDemonSkinAction : public CastBuffSpellAction {
+	public:
+		CastDemonSkinAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "demon skin") {}
+	};
+
+	class CastDemonArmorAction : public CastBuffSpellAction
+	{
+	public:
+		CastDemonArmorAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "demon armor") {}
+	};
+
+	class CastFelArmorAction : public CastBuffSpellAction
+	{
+	public:
+		CastFelArmorAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "fel armor") {}
+	};
+
+    BEGIN_RANGED_SPELL_ACTION(CastShadowBoltAction, "shadow bolt")
+    END_SPELL_ACTION()
+
+	class CastDrainSoulAction : public CastSpellAction
+	{
+	public:
+		CastDrainSoulAction(PlayerbotAI* ai) : CastSpellAction(ai, "drain soul") {}
+		virtual bool isUseful()
+		{
+			return AI_VALUE2(uint8, "item count", "soul shard") < 2;
+		}
+	};
+
+	class CastDrainManaAction : public CastSpellAction
+	{
+	public:
+		CastDrainManaAction(PlayerbotAI* ai) : CastSpellAction(ai, "drain mana") {}
+	};
+
+	class CastDrainLifeAction : public CastSpellAction
+	{
+	public:
+		CastDrainLifeAction(PlayerbotAI* ai) : CastSpellAction(ai, "drain life") {}
+	};
+
+	class CastCurseOfAgonyAction : public CastDebuffSpellAction
+	{
+	public:
+		CastCurseOfAgonyAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "curse of agony") {}
+	};
+
+	class CastCurseOfWeaknessAction : public CastDebuffSpellAction
+	{
+	public:
+		CastCurseOfWeaknessAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "curse of weakness") {}
+	};
+
+	class CastCorruptionAction : public CastDebuffSpellAction
+	{
+	public:
+		CastCorruptionAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "corruption") {}
+	};
+
+	class CastCorruptionOnAttackerAction : public CastDebuffSpellOnAttackerAction
+	{
+	public:
+	    CastCorruptionOnAttackerAction(PlayerbotAI* ai) : CastDebuffSpellOnAttackerAction(ai, "corruption") {}
+	};
+
+
+	class CastSummonVoidwalkerAction : public CastBuffSpellAction
+	{
+	public:
+		CastSummonVoidwalkerAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "summon voidwalker") {}
+	};
+
+	class CastSummonFelguardAction : public CastBuffSpellAction
+	{
+	public:
+		CastSummonFelguardAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "summon felguard") {}
+	};
+
+	class CastSummonImpAction : public CastBuffSpellAction
+	{
+	public:
+		CastSummonImpAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "summon imp") {}
+	};
+
+	class CastCreateHealthstoneAction : public CastBuffSpellAction
+	{
+	public:
+		CastCreateHealthstoneAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "create healthstone") {}
+	};
+
+	class CastCreateFirestoneAction : public CastBuffSpellAction
+	{
+	public:
+		CastCreateFirestoneAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "create firestone") {}
+	};
+
+	class CastCreateSpellstoneAction : public CastBuffSpellAction
+	{
+	public:
+		CastCreateSpellstoneAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "create spellstone") {}
+	};
+
+    class CastBanishAction : public CastBuffSpellAction
+    {
+    public:
+        CastBanishAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "banish on cc") {}
+        virtual Value<Unit*>* GetTargetValue() { return context->GetValue<Unit*>("cc target", "banish"); }
+        virtual bool Execute(Event event) { return ai->CastSpell("banish", GetTarget()); }
+    };
+
+    class CastSeedOfCorruptionAction : public CastDebuffSpellAction
+    {
+    public:
+        CastSeedOfCorruptionAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "seed of corruption") {}
+    };
+
+    class CastRainOfFireAction : public CastSpellAction
+    {
+    public:
+        CastRainOfFireAction(PlayerbotAI* ai) : CastSpellAction(ai, "rain of fire") {}
+    };
+
+    class CastShadowfuryAction : public CastSpellAction
+    {
+    public:
+        CastShadowfuryAction(PlayerbotAI* ai) : CastSpellAction(ai, "shadowfury") {}
+    };
+
+    class CastImmolateAction : public CastDebuffSpellAction
+    {
+    public:
+        CastImmolateAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "immolate") {}
+    };
+
+    class CastConflagrateAction : public CastSpellAction
+    {
+    public:
+        CastConflagrateAction(PlayerbotAI* ai) : CastSpellAction(ai, "conflagrate") {}
+    };
+
+    class CastIncinirateAction : public CastSpellAction
+    {
+    public:
+        CastIncinirateAction(PlayerbotAI* ai) : CastSpellAction(ai, "incinirate") {}
+    };
+
+    class CastFearAction : public CastDebuffSpellAction
+    {
+    public:
+        CastFearAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "fear") {}
+    };
+
+    class CastFearOnCcAction : public CastBuffSpellAction
+    {
+    public:
+        CastFearOnCcAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "fear on cc") {}
+        virtual Value<Unit*>* GetTargetValue() { return context->GetValue<Unit*>("cc target", "fear"); }
+        virtual bool Execute(Event event) { return ai->CastSpell("fear", GetTarget()); }
+    };
+
+    class CastLifeTapAction: public CastSpellAction
+    {
+    public:
+        CastLifeTapAction(PlayerbotAI* ai) : CastSpellAction(ai, "life tap") {}
+        virtual string GetTargetName() { return "self target"; }
+        virtual bool isUseful() { return AI_VALUE2(uint8, "health", "self target") > sPlayerbotAIConfig.lowHealth; }
+    };
+
+}
diff --git a/src/game/playerbot/strategy/warlock/WarlockAiObjectContext.cpp b/src/game/playerbot/strategy/warlock/WarlockAiObjectContext.cpp
new file mode 100644
index 00000000000..8c25fd485aa
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/WarlockAiObjectContext.cpp
@@ -0,0 +1,183 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarlockActions.h"
+#include "WarlockAiObjectContext.h"
+#include "DpsWarlockStrategy.h"
+#include "GenericWarlockNonCombatStrategy.h"
+#include "TankWarlockStrategy.h"
+#include "../generic/PullStrategy.h"
+#include "WarlockTriggers.h"
+#include "../NamedObjectContext.h"
+#include "../actions/UseItemAction.h"
+
+using namespace ai;
+
+namespace ai
+{
+    namespace warlock
+    {
+        using namespace ai;
+
+        class StrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            StrategyFactoryInternal()
+            {
+                creators["nc"] = &warlock::StrategyFactoryInternal::nc;
+                creators["pull"] = &warlock::StrategyFactoryInternal::pull;
+                creators["aoe"] = &warlock::StrategyFactoryInternal::aoe;
+                creators["dps debuff"] = &warlock::StrategyFactoryInternal::dps_debuff;
+            }
+
+        private:
+            static Strategy* nc(PlayerbotAI* ai) { return new GenericWarlockNonCombatStrategy(ai); }
+            static Strategy* aoe(PlayerbotAI* ai) { return new DpsAoeWarlockStrategy(ai); }
+            static Strategy* dps_debuff(PlayerbotAI* ai) { return new DpsWarlockDebuffStrategy(ai); }
+            static Strategy* pull(PlayerbotAI* ai) { return new PullStrategy(ai, "shoot"); }
+        };
+
+        class CombatStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            CombatStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["dps"] = &warlock::CombatStrategyFactoryInternal::dps;
+                creators["tank"] = &warlock::CombatStrategyFactoryInternal::tank;
+            }
+
+        private:
+            static Strategy* tank(PlayerbotAI* ai) { return new TankWarlockStrategy(ai); }
+            static Strategy* dps(PlayerbotAI* ai) { return new DpsWarlockStrategy(ai); }
+        };
+    };
+};
+
+namespace ai
+{
+    namespace warlock
+    {
+        using namespace ai;
+
+        class TriggerFactoryInternal : public NamedObjectContext<Trigger>
+        {
+        public:
+            TriggerFactoryInternal()
+            {
+                creators["shadow trance"] = &TriggerFactoryInternal::shadow_trance;
+                creators["demon armor"] = &TriggerFactoryInternal::demon_armor;
+                creators["no healthstone"] = &TriggerFactoryInternal::HasHealthstone;
+                creators["no firestone"] = &TriggerFactoryInternal::HasFirestone;
+                creators["no spellstone"] = &TriggerFactoryInternal::HasSpellstone;
+                creators["corruption"] = &TriggerFactoryInternal::corruption;
+                creators["corruption on attacker"] = &TriggerFactoryInternal::corruption_on_attacker;
+                creators["curse of agony"] = &TriggerFactoryInternal::curse_of_agony;
+                creators["banish"] = &TriggerFactoryInternal::banish;
+                creators["spellstone"] = &TriggerFactoryInternal::spellstone;
+                creators["backlash"] = &TriggerFactoryInternal::backlash;
+                creators["fear"] = &TriggerFactoryInternal::fear;
+                creators["immolate"] = &TriggerFactoryInternal::immolate;
+
+
+            }
+
+        private:
+            static Trigger* shadow_trance(PlayerbotAI* ai) { return new ShadowTranceTrigger(ai); }
+            static Trigger* demon_armor(PlayerbotAI* ai) { return new DemonArmorTrigger(ai); }
+            static Trigger* HasHealthstone(PlayerbotAI* ai) { return new HasHealthstoneTrigger(ai); }
+            static Trigger* HasFirestone(PlayerbotAI* ai) { return new HasFirestoneTrigger(ai); }
+            static Trigger* HasSpellstone(PlayerbotAI* ai) { return new HasSpellstoneTrigger(ai); }
+            static Trigger* corruption(PlayerbotAI* ai) { return new CorruptionTrigger(ai); }
+            static Trigger* corruption_on_attacker(PlayerbotAI* ai) { return new CorruptionOnAttackerTrigger(ai); }
+            static Trigger* curse_of_agony(PlayerbotAI* ai) { return new CurseOfAgonyTrigger(ai); }
+            static Trigger* banish(PlayerbotAI* ai) { return new BanishTrigger(ai); }
+            static Trigger* spellstone(PlayerbotAI* ai) { return new SpellstoneTrigger(ai); }
+            static Trigger* backlash(PlayerbotAI* ai) { return new BacklashTrigger(ai); }
+            static Trigger* fear(PlayerbotAI* ai) { return new FearTrigger(ai); }
+            static Trigger* immolate(PlayerbotAI* ai) { return new ImmolateTrigger(ai); }
+
+        };
+    };
+};
+
+namespace ai
+{
+    namespace warlock
+    {
+        using namespace ai;
+
+        class AiObjectContextInternal : public NamedObjectContext<Action>
+        {
+        public:
+            AiObjectContextInternal()
+            {
+                creators["summon imp"] = &AiObjectContextInternal::summon_imp;
+                creators["fel armor"] = &AiObjectContextInternal::fel_armor;
+                creators["demon armor"] = &AiObjectContextInternal::demon_armor;
+                creators["demon skin"] = &AiObjectContextInternal::demon_skin;
+                creators["create healthstone"] = &AiObjectContextInternal::create_healthstone;
+                creators["create firestone"] = &AiObjectContextInternal::create_firestone;
+                creators["create spellstone"] = &AiObjectContextInternal::create_spellstone;
+                creators["spellstone"] = &AiObjectContextInternal::spellstone;
+                creators["summon voidwalker"] = &AiObjectContextInternal::summon_voidwalker;
+                creators["summon felguard"] = &AiObjectContextInternal::summon_felguard;
+                creators["immolate"] = &AiObjectContextInternal::immolate;
+                creators["corruption"] = &AiObjectContextInternal::corruption;
+                creators["corruption on attacker"] = &AiObjectContextInternal::corruption_on_attacker;
+                creators["curse of agony"] = &AiObjectContextInternal::curse_of_agony;
+                creators["shadow bolt"] = &AiObjectContextInternal::shadow_bolt;
+                creators["drain soul"] = &AiObjectContextInternal::drain_soul;
+                creators["drain mana"] = &AiObjectContextInternal::drain_mana;
+                creators["drain life"] = &AiObjectContextInternal::drain_life;
+                creators["banish"] = &AiObjectContextInternal::banish;
+                creators["seed of corruption"] = &AiObjectContextInternal::seed_of_corruption;
+                creators["rain of fire"] = &AiObjectContextInternal::rain_of_fire;
+                creators["shadowfury"] = &AiObjectContextInternal::shadowfury;
+                creators["life tap"] = &AiObjectContextInternal::life_tap;
+                creators["fear"] = &AiObjectContextInternal::fear;
+                creators["fear on cc"] = &AiObjectContextInternal::fear_on_cc;
+                creators["incinirate"] = &AiObjectContextInternal::incinirate;
+                creators["conflagrate"] = &AiObjectContextInternal::conflagrate;
+            }
+
+        private:
+            static Action* conflagrate(PlayerbotAI* ai) { return new CastConflagrateAction(ai); }
+            static Action* incinirate(PlayerbotAI* ai) { return new CastIncinirateAction(ai); }
+            static Action* fear_on_cc(PlayerbotAI* ai) { return new CastFearOnCcAction(ai); }
+            static Action* fear(PlayerbotAI* ai) { return new CastFearAction(ai); }
+            static Action* immolate(PlayerbotAI* ai) { return new CastImmolateAction(ai); }
+            static Action* summon_imp(PlayerbotAI* ai) { return new CastSummonImpAction(ai); }
+            static Action* fel_armor(PlayerbotAI* ai) { return new CastFelArmorAction(ai); }
+            static Action* demon_armor(PlayerbotAI* ai) { return new CastDemonArmorAction(ai); }
+            static Action* demon_skin(PlayerbotAI* ai) { return new CastDemonSkinAction(ai); }
+            static Action* create_healthstone(PlayerbotAI* ai) { return new CastCreateHealthstoneAction(ai); }
+            static Action* create_firestone(PlayerbotAI* ai) { return new CastCreateFirestoneAction(ai); }
+            static Action* create_spellstone(PlayerbotAI* ai) { return new CastCreateSpellstoneAction(ai); }
+            static Action* spellstone(PlayerbotAI* ai) { return new UseSpellItemAction(ai, "spellstone", true); }
+            static Action* summon_voidwalker(PlayerbotAI* ai) { return new CastSummonVoidwalkerAction(ai); }
+            static Action* summon_felguard(PlayerbotAI* ai) { return new CastSummonFelguardAction(ai); }
+            static Action* corruption(PlayerbotAI* ai) { return new CastCorruptionAction(ai); }
+            static Action* corruption_on_attacker(PlayerbotAI* ai) { return new CastCorruptionOnAttackerAction(ai); }
+            static Action* curse_of_agony(PlayerbotAI* ai) { return new CastCurseOfAgonyAction(ai); }
+            static Action* shadow_bolt(PlayerbotAI* ai) { return new CastShadowBoltAction(ai); }
+            static Action* drain_soul(PlayerbotAI* ai) { return new CastDrainSoulAction(ai); }
+            static Action* drain_mana(PlayerbotAI* ai) { return new CastDrainManaAction(ai); }
+            static Action* drain_life(PlayerbotAI* ai) { return new CastDrainLifeAction(ai); }
+            static Action* banish(PlayerbotAI* ai) { return new CastBanishAction(ai); }
+            static Action* seed_of_corruption(PlayerbotAI* ai) { return new CastSeedOfCorruptionAction(ai); }
+            static Action* rain_of_fire(PlayerbotAI* ai) { return new CastRainOfFireAction(ai); }
+            static Action* shadowfury(PlayerbotAI* ai) { return new CastShadowfuryAction(ai); }
+            static Action* life_tap(PlayerbotAI* ai) { return new CastLifeTapAction(ai); }
+
+        };
+    };
+};
+
+
+
+WarlockAiObjectContext::WarlockAiObjectContext(PlayerbotAI* ai) : AiObjectContext(ai)
+{
+    strategyContexts.Add(new ai::warlock::StrategyFactoryInternal());
+    strategyContexts.Add(new ai::warlock::CombatStrategyFactoryInternal());
+    actionContexts.Add(new ai::warlock::AiObjectContextInternal());
+    triggerContexts.Add(new ai::warlock::TriggerFactoryInternal());
+}
diff --git a/src/game/playerbot/strategy/warlock/WarlockAiObjectContext.h b/src/game/playerbot/strategy/warlock/WarlockAiObjectContext.h
new file mode 100644
index 00000000000..0d3fa27f368
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/WarlockAiObjectContext.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../AiObjectContext.h"
+
+namespace ai
+{
+    class WarlockAiObjectContext : public AiObjectContext
+    {
+    public:
+        WarlockAiObjectContext(PlayerbotAI* ai);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/warlock/WarlockMultipliers.cpp b/src/game/playerbot/strategy/warlock/WarlockMultipliers.cpp
new file mode 100644
index 00000000000..a75926a896b
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/WarlockMultipliers.cpp
@@ -0,0 +1,6 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarlockMultipliers.h"
+#include "WarlockActions.h"
+
+using namespace ai;
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/warlock/WarlockMultipliers.h b/src/game/playerbot/strategy/warlock/WarlockMultipliers.h
new file mode 100644
index 00000000000..7cfbdd46e87
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/WarlockMultipliers.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace ai
+{
+   
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/warlock/WarlockTriggers.cpp b/src/game/playerbot/strategy/warlock/WarlockTriggers.cpp
new file mode 100644
index 00000000000..660e58446cd
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/WarlockTriggers.cpp
@@ -0,0 +1,19 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarlockTriggers.h"
+#include "WarlockActions.h"
+
+using namespace ai;
+
+bool DemonArmorTrigger::IsActive() 
+{
+	Unit* target = GetTarget();
+	return !ai->HasAura("demon skin", target) &&
+		!ai->HasAura("demon armor", target) &&
+		!ai->HasAura("fel armor", target);
+}
+
+bool SpellstoneTrigger::IsActive() 
+{
+    return BuffTrigger::IsActive() && AI_VALUE2(uint8, "item count", getName()) > 0;
+}
diff --git a/src/game/playerbot/strategy/warlock/WarlockTriggers.h b/src/game/playerbot/strategy/warlock/WarlockTriggers.h
new file mode 100644
index 00000000000..796f8840fd3
--- /dev/null
+++ b/src/game/playerbot/strategy/warlock/WarlockTriggers.h
@@ -0,0 +1,81 @@
+#pragma once
+#include "../triggers/GenericTriggers.h"
+
+namespace ai
+{
+	class DemonArmorTrigger : public BuffTrigger
+	{
+	public:
+		DemonArmorTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "demon armor") {}
+		virtual bool IsActive();
+	};
+
+    class SpellstoneTrigger : public BuffTrigger
+    {
+    public:
+        SpellstoneTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "spellstone") {}
+        virtual bool IsActive();
+    };
+
+    DEBUFF_TRIGGER(CurseOfAgonyTrigger, "curse of agony", "curse of agony");
+    DEBUFF_TRIGGER(CorruptionTrigger, "corruption", "corruption");
+
+    class CorruptionOnAttackerTrigger : public DebuffOnAttackerTrigger
+    {
+    public:
+        CorruptionOnAttackerTrigger(PlayerbotAI* ai) : DebuffOnAttackerTrigger(ai, "corruption") {}
+    };
+
+    DEBUFF_TRIGGER(ImmolateTrigger, "immolate", "immolate");
+
+    class ShadowTranceTrigger : public HasAuraTrigger
+    {
+    public:
+        ShadowTranceTrigger(PlayerbotAI* ai) : HasAuraTrigger(ai, "shadow trance") {}
+    };
+
+    class BacklashTrigger : public HasAuraTrigger
+    {
+    public:
+        BacklashTrigger(PlayerbotAI* ai) : HasAuraTrigger(ai, "backlash") {}
+    };
+
+    class BanishTrigger : public HasCcTargetTrigger
+    {
+    public:
+        BanishTrigger(PlayerbotAI* ai) : HasCcTargetTrigger(ai, "banish") {}
+    };
+
+    class WarlockConjuredItemTrigger : public ItemCountTrigger
+    {
+    public:
+        WarlockConjuredItemTrigger(PlayerbotAI* ai, string item) : ItemCountTrigger(ai, item, 1) {}
+
+        virtual bool IsActive() { return ItemCountTrigger::IsActive() && AI_VALUE2(uint8, "item count", "soul shard") > 0; }
+    };
+
+    class HasSpellstoneTrigger : public WarlockConjuredItemTrigger
+    {
+    public:
+        HasSpellstoneTrigger(PlayerbotAI* ai) : WarlockConjuredItemTrigger(ai, "spellstone") {}
+    };
+
+    class HasFirestoneTrigger : public WarlockConjuredItemTrigger
+    {
+    public:
+        HasFirestoneTrigger(PlayerbotAI* ai) : WarlockConjuredItemTrigger(ai, "firestone") {}
+    };
+
+    class HasHealthstoneTrigger : public WarlockConjuredItemTrigger
+    {
+    public:
+        HasHealthstoneTrigger(PlayerbotAI* ai) : WarlockConjuredItemTrigger(ai, "healthstone") {}
+    };
+
+    class FearTrigger : public HasCcTargetTrigger
+    {
+    public:
+        FearTrigger(PlayerbotAI* ai) : HasCcTargetTrigger(ai, "fear") {}
+    };
+
+}
diff --git a/src/game/playerbot/strategy/warrior/DpsWarriorStrategy.cpp b/src/game/playerbot/strategy/warrior/DpsWarriorStrategy.cpp
new file mode 100644
index 00000000000..7b13bec5b49
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/DpsWarriorStrategy.cpp
@@ -0,0 +1,130 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarriorMultipliers.h"
+#include "DpsWarriorStrategy.h"
+
+using namespace ai;
+
+class DpsWarriorStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    DpsWarriorStrategyActionNodeFactory()
+    {
+        creators["overpower"] = &overpower;
+        creators["melee"] = &melee;
+        creators["charge"] = &charge;
+        creators["bloodthirst"] = &bloodthirst;
+        creators["rend"] = &rend;
+        creators["mocking blow"] = &mocking_blow;
+        creators["death wish"] = &death_wish;
+        creators["execute"] = &execute;
+    }
+private:
+    static ActionNode* overpower(PlayerbotAI* ai)
+    {
+        return new ActionNode ("overpower",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* melee(PlayerbotAI* ai)
+    {
+        return new ActionNode ("melee",
+            /*P*/ NextAction::array(0, new NextAction("charge"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* charge(PlayerbotAI* ai)
+    {
+        return new ActionNode ("charge",
+            /*P*/ NextAction::array(0, new NextAction("battle stance"), NULL),
+            /*A*/ NextAction::array(0, new NextAction("reach melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* bloodthirst(PlayerbotAI* ai)
+    {
+        return new ActionNode ("bloodthirst",
+            /*P*/ NextAction::array(0, new NextAction("battle stance"), NULL),
+            /*A*/ NextAction::array(0, new NextAction("heroic strike"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* rend(PlayerbotAI* ai)
+    {
+        return new ActionNode ("rend",
+            /*P*/ NextAction::array(0, new NextAction("battle stance"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* mocking_blow(PlayerbotAI* ai)
+    {
+        return new ActionNode ("mocking blow",
+            /*P*/ NextAction::array(0, new NextAction("battle stance"), NULL),
+            /*A*/ NextAction::array(0, NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* death_wish(PlayerbotAI* ai)
+    {
+        return new ActionNode ("death wish",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("berserker rage"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* execute(PlayerbotAI* ai)
+    {
+        return new ActionNode ("execute",
+            /*P*/ NextAction::array(0, new NextAction("battle stance"), NULL),
+            /*A*/ NextAction::array(0, new NextAction("heroic strike"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+DpsWarriorStrategy::DpsWarriorStrategy(PlayerbotAI* ai) : GenericWarriorStrategy(ai)
+{
+    actionNodeFactories.Add(new DpsWarriorStrategyActionNodeFactory());
+}
+
+NextAction** DpsWarriorStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("bloodthirst", ACTION_NORMAL + 1), NULL);
+}
+
+void DpsWarriorStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericWarriorStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "enemy out of melee",
+        NextAction::array(0, new NextAction("charge", ACTION_NORMAL + 9), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "target critical health",
+        NextAction::array(0, new NextAction("execute", ACTION_HIGH + 4), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"hamstring",
+		NextAction::array(0, new NextAction("hamstring", ACTION_INTERRUPT), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"victory rush",
+		NextAction::array(0, new NextAction("victory rush", ACTION_HIGH + 3), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "death wish",
+        NextAction::array(0, new NextAction("death wish", ACTION_HIGH + 2), NULL)));
+}
+
+
+void DpsWarrirorAoeStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    triggers.push_back(new TriggerNode(
+        "rend on attacker",
+        NextAction::array(0, new NextAction("rend on attacker", ACTION_HIGH + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "light aoe",
+        NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 2), new NextAction("demoralizing shout", ACTION_HIGH + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium aoe",
+        NextAction::array(0, new NextAction("cleave", ACTION_HIGH + 3), NULL)));
+}
diff --git a/src/game/playerbot/strategy/warrior/DpsWarriorStrategy.h b/src/game/playerbot/strategy/warrior/DpsWarriorStrategy.h
new file mode 100644
index 00000000000..3ef29c33548
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/DpsWarriorStrategy.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "GenericWarriorStrategy.h"
+
+namespace ai
+{
+    class DpsWarriorStrategy : public GenericWarriorStrategy
+    {
+    public:
+        DpsWarriorStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "dps"; }
+        virtual NextAction** getDefaultActions();
+        virtual int GetType() { return STRATEGY_TYPE_COMBAT | STRATEGY_TYPE_DPS | STRATEGY_TYPE_MELEE; }
+    };
+
+    class DpsWarrirorAoeStrategy : public CombatStrategy
+    {
+    public:
+        DpsWarrirorAoeStrategy(PlayerbotAI* ai) : CombatStrategy(ai) {}
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "aoe"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/warrior/GenericWarriorNonCombatStrategy.cpp b/src/game/playerbot/strategy/warrior/GenericWarriorNonCombatStrategy.cpp
new file mode 100644
index 00000000000..6bd7d08accd
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/GenericWarriorNonCombatStrategy.cpp
@@ -0,0 +1,7 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarriorMultipliers.h"
+#include "GenericWarriorNonCombatStrategy.h"
+
+using namespace ai;
+
diff --git a/src/game/playerbot/strategy/warrior/GenericWarriorNonCombatStrategy.h b/src/game/playerbot/strategy/warrior/GenericWarriorNonCombatStrategy.h
new file mode 100644
index 00000000000..1041a2eeb22
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/GenericWarriorNonCombatStrategy.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "../generic/NonCombatStrategy.h"
+
+namespace ai
+{
+    class GenericWarriorNonCombatStrategy : public NonCombatStrategy
+    {
+    public:
+        GenericWarriorNonCombatStrategy(PlayerbotAI* ai) : NonCombatStrategy(ai) {}
+        virtual string getName() { return "nc"; }
+   };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/warrior/GenericWarriorStrategy.cpp b/src/game/playerbot/strategy/warrior/GenericWarriorStrategy.cpp
new file mode 100644
index 00000000000..4d7b851e20d
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/GenericWarriorStrategy.cpp
@@ -0,0 +1,73 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "GenericWarriorStrategy.h"
+#include "WarriorAiObjectContext.h"
+
+using namespace ai;
+
+class GenericWarriorStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    GenericWarriorStrategyActionNodeFactory()
+    {
+        creators["hamstring"] = &hamstring;
+        creators["heroic strike"] = &heroic_strike;
+        creators["battle shout"] = &battle_shout;
+    }
+private:
+    static ActionNode* hamstring(PlayerbotAI* ai)
+    {
+        return new ActionNode ("hamstring",
+            /*P*/ NextAction::array(0, new NextAction("battle stance"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* heroic_strike(PlayerbotAI* ai)
+    {
+        return new ActionNode ("heroic strike",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* battle_shout(PlayerbotAI* ai)
+    {
+        return new ActionNode ("battle shout",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("melee"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+GenericWarriorStrategy::GenericWarriorStrategy(PlayerbotAI* ai) : MeleeCombatStrategy(ai)
+{
+    actionNodeFactories.Add(new GenericWarriorStrategyActionNodeFactory());
+}
+
+void GenericWarriorStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    MeleeCombatStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "battle shout",
+        NextAction::array(0, new NextAction("battle shout", ACTION_HIGH + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "rend",
+        NextAction::array(0, new NextAction("rend", ACTION_NORMAL + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "bloodrage",
+        NextAction::array(0, new NextAction("bloodrage", ACTION_HIGH + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "shield bash",
+        NextAction::array(0, new NextAction("shield bash", ACTION_INTERRUPT + 4), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "shield bash on enemy healer",
+        NextAction::array(0, new NextAction("shield bash on enemy healer", ACTION_INTERRUPT + 3), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"critical health",
+		NextAction::array(0, new NextAction("intimidating shout", ACTION_EMERGENCY), NULL)));
+}
diff --git a/src/game/playerbot/strategy/warrior/GenericWarriorStrategy.h b/src/game/playerbot/strategy/warrior/GenericWarriorStrategy.h
new file mode 100644
index 00000000000..0ef2dcf8f59
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/GenericWarriorStrategy.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../Strategy.h"
+#include "../generic/MeleeCombatStrategy.h"
+
+namespace ai
+{
+    class AiObjectContext;
+
+    class GenericWarriorStrategy : public MeleeCombatStrategy
+    {
+    public:
+        GenericWarriorStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "warrior"; }
+    };
+}
diff --git a/src/game/playerbot/strategy/warrior/TankWarriorStrategy.cpp b/src/game/playerbot/strategy/warrior/TankWarriorStrategy.cpp
new file mode 100644
index 00000000000..5bf206cfed9
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/TankWarriorStrategy.cpp
@@ -0,0 +1,126 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarriorMultipliers.h"
+#include "TankWarriorStrategy.h"
+
+using namespace ai;
+
+class TankWarriorStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
+{
+public:
+    TankWarriorStrategyActionNodeFactory()
+    {
+        creators["melee"] = &melee;
+        creators["shield wall"] = &shield_wall;
+        creators["rend"] = &rend;
+        creators["revenge"] = &revenge;
+        creators["devastate"] = &devastate;
+        creators["shockwave"] = &shockwave;
+        creators["taunt"] = &taunt;
+    }
+private:
+    static ActionNode* melee(PlayerbotAI* ai)
+    {
+        return new ActionNode ("melee",
+            /*P*/ NextAction::array(0, new NextAction("defensive stance"), new NextAction("reach melee"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* shield_wall(PlayerbotAI* ai)
+    {
+        return new ActionNode ("shield wall",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("shield block"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* rend(PlayerbotAI* ai)
+    {
+        return new ActionNode ("rend",
+            /*P*/ NextAction::array(0, new NextAction("defensive stance"), NULL),
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
+    static ActionNode* revenge(PlayerbotAI* ai)
+    {
+        return new ActionNode ("revenge",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("melee"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* devastate(PlayerbotAI* ai)
+    {
+        return new ActionNode ("devastate",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("sunder armor"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* shockwave(PlayerbotAI* ai)
+    {
+        return new ActionNode ("shockwave",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("cleave"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* taunt(PlayerbotAI* ai)
+    {
+        return new ActionNode ("taunt",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("mocking blow"), NULL),
+            /*C*/ NULL);
+    }
+};
+
+TankWarriorStrategy::TankWarriorStrategy(PlayerbotAI* ai) : GenericWarriorStrategy(ai)
+{
+    actionNodeFactories.Add(new TankWarriorStrategyActionNodeFactory());
+}
+
+NextAction** TankWarriorStrategy::getDefaultActions()
+{
+    return NextAction::array(0, new NextAction("devastate", ACTION_NORMAL + 1), new NextAction("revenge", ACTION_NORMAL + 1), NULL);
+}
+
+void TankWarriorStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
+{
+    GenericWarriorStrategy::InitTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "medium rage available",
+        NextAction::array(0, new NextAction("shield slam", ACTION_NORMAL + 2), new NextAction("heroic strike", ACTION_NORMAL + 2), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "disarm",
+        NextAction::array(0, new NextAction("disarm", ACTION_NORMAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "lose aggro",
+        NextAction::array(0, new NextAction("taunt", ACTION_HIGH + 9), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "medium health",
+        NextAction::array(0, new NextAction("shield wall", ACTION_MEDIUM_HEAL), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"critical health",
+		NextAction::array(0, new NextAction("last stand", ACTION_EMERGENCY + 3), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"medium aoe",
+		NextAction::array(0, new NextAction("shockwave", ACTION_HIGH + 2), NULL)));
+
+	triggers.push_back(new TriggerNode(
+        "light aoe",
+        NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 2), new NextAction("demoralizing shout", ACTION_HIGH + 2),  new NextAction("cleave", ACTION_HIGH + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "high aoe",
+        NextAction::array(0, new NextAction("challenging shout", ACTION_HIGH + 3), NULL)));
+
+	triggers.push_back(new TriggerNode(
+		"concussion blow",
+		NextAction::array(0, new NextAction("concussion blow", ACTION_INTERRUPT), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "sword and board",
+        NextAction::array(0, new NextAction("shield slam", ACTION_HIGH + 3), NULL)));
+}
diff --git a/src/game/playerbot/strategy/warrior/TankWarriorStrategy.h b/src/game/playerbot/strategy/warrior/TankWarriorStrategy.h
new file mode 100644
index 00000000000..0f989460a88
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/TankWarriorStrategy.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "GenericWarriorStrategy.h"
+
+namespace ai
+{
+    class TankWarriorStrategy : public GenericWarriorStrategy
+    {
+    public:
+        TankWarriorStrategy(PlayerbotAI* ai);
+
+    public:
+        virtual void InitTriggers(std::list<TriggerNode*> &triggers);
+        virtual string getName() { return "tank"; }
+        virtual NextAction** getDefaultActions();
+        virtual int GetType() { return STRATEGY_TYPE_TANK | STRATEGY_TYPE_MELEE; }
+    };
+}
diff --git a/src/game/playerbot/strategy/warrior/WarriorActions.cpp b/src/game/playerbot/strategy/warrior/WarriorActions.cpp
new file mode 100644
index 00000000000..b6d44fe8ece
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/WarriorActions.cpp
@@ -0,0 +1,30 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarriorActions.h"
+
+using namespace ai;
+
+NextAction** CastRendAction::getPrerequisites()
+{
+    return NextAction::merge( NextAction::array(0, new NextAction("reach melee"), NULL), CastDebuffSpellAction::getPrerequisites());
+}
+
+NextAction** CastRendOnAttackerAction::getPrerequisites()
+{
+    return NextAction::merge( NextAction::array(0, new NextAction("reach melee"), NULL), CastDebuffSpellOnAttackerAction::getPrerequisites());
+}
+
+NextAction** CastDisarmAction::getPrerequisites()
+{
+    return NextAction::merge( NextAction::array(0, new NextAction("reach melee"), new NextAction("defensive stance"), NULL), CastDebuffSpellAction::getPrerequisites());
+}
+
+NextAction** CastSunderArmorAction::getPrerequisites()
+{
+    return NextAction::merge( NextAction::array(0, new NextAction("reach melee"), NULL), CastDebuffSpellAction::getPrerequisites());
+}
+
+NextAction** CastRevengeAction::getPrerequisites()
+{
+    return NextAction::merge( NextAction::array(0, new NextAction("defensive stance"), NULL), CastMeleeSpellAction::getPrerequisites());
+}
diff --git a/src/game/playerbot/strategy/warrior/WarriorActions.h b/src/game/playerbot/strategy/warrior/WarriorActions.h
new file mode 100644
index 00000000000..65ac0ae21b0
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/WarriorActions.h
@@ -0,0 +1,210 @@
+#pragma once
+#include "../actions/GenericActions.h"
+
+namespace ai
+{
+    // battle
+    class CastBattleMeleeSpellAction : public CastMeleeSpellAction {
+    public:
+        CastBattleMeleeSpellAction(PlayerbotAI* ai, string spell) : CastMeleeSpellAction(ai, spell) {}
+        virtual NextAction** getPrerequisites() {
+            return NextAction::merge( NextAction::array(0, new NextAction("battle stance"), NULL), CastMeleeSpellAction::getPrerequisites());
+        }
+    };
+
+    // defensive
+    class CastDefensiveMeleeSpellAction : public CastMeleeSpellAction {
+    public:
+        CastDefensiveMeleeSpellAction(PlayerbotAI* ai, string spell) : CastMeleeSpellAction(ai, spell) {}
+        virtual NextAction** getPrerequisites() {
+            return NextAction::merge( NextAction::array(0, new NextAction("defensive stance"), NULL), CastMeleeSpellAction::getPrerequisites());
+        }
+    };
+
+    // all
+    class CastHeroicStrikeAction : public CastMeleeSpellAction {
+    public:
+        CastHeroicStrikeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "heroic strike") {}
+    };
+
+    // all
+    class CastCleaveAction : public CastMeleeSpellAction {
+    public:
+        CastCleaveAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "cleave") {}
+    };
+
+    // battle, berserker
+    class CastMockingBlowAction : public CastMeleeSpellAction {
+    public:
+        CastMockingBlowAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "mocking blow") {}
+    };
+
+    class CastBloodthirstAction : public CastMeleeSpellAction {
+    public:
+        CastBloodthirstAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "bloodthirst") {}
+    };
+
+    // battle, berserker
+    class CastExecuteAction : public CastMeleeSpellAction {
+    public:
+        CastExecuteAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "execute") {}
+    };
+
+    // battle
+    class CastOverpowerAction : public CastBattleMeleeSpellAction {
+    public:
+        CastOverpowerAction(PlayerbotAI* ai) : CastBattleMeleeSpellAction(ai, "overpower") {}
+    };
+
+    // battle, berserker
+    class CastHamstringAction : public CastMeleeSpellAction {
+    public:
+        CastHamstringAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "hamstring") {}
+    };
+
+    // defensive
+    class CastTauntAction : public CastSpellAction {
+    public:
+        CastTauntAction(PlayerbotAI* ai) : CastSpellAction(ai, "taunt") {}
+        virtual NextAction** getPrerequisites() {
+            return NextAction::merge( NextAction::array(0, new NextAction("defensive stance"), NULL), CastSpellAction::getPrerequisites());
+        }
+    };
+
+    // defensive
+    class CastShieldBlockAction : public CastBuffSpellAction {
+    public:
+        CastShieldBlockAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "shield block") {}
+		virtual NextAction** getPrerequisites() {
+			return NextAction::merge( NextAction::array(0, new NextAction("defensive stance"), NULL), CastSpellAction::getPrerequisites());
+		}
+    };
+
+    // defensive
+    class CastShieldWallAction : public CastDefensiveMeleeSpellAction {
+    public:
+        CastShieldWallAction(PlayerbotAI* ai) : CastDefensiveMeleeSpellAction(ai, "shield wall") {}
+    };
+
+    class CastBloodrageAction : public CastBuffSpellAction {
+    public:
+        CastBloodrageAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "bloodrage") {}
+    };
+
+    // defensive
+    class CastDevastateAction : public CastDefensiveMeleeSpellAction {
+    public:
+        CastDevastateAction(PlayerbotAI* ai) : CastDefensiveMeleeSpellAction(ai, "devastate") {}
+    };
+
+    // all
+    class CastSlamAction : public CastMeleeSpellAction {
+    public:
+        CastSlamAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "slam") {}
+    };
+
+	// all
+	class CastShieldSlamAction : public CastMeleeSpellAction {
+	public:
+		CastShieldSlamAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "shield slam") {}
+	};
+
+    // after dodge
+    BEGIN_MELEE_SPELL_ACTION(CastRevengeAction, "revenge")
+        virtual NextAction** getPrerequisites();
+    END_SPELL_ACTION()
+
+
+    //debuffs
+    BEGIN_DEBUFF_ACTION(CastRendAction, "rend")
+        virtual NextAction** getPrerequisites();
+    END_SPELL_ACTION()
+
+    class CastRendOnAttackerAction : public CastDebuffSpellOnAttackerAction
+    {
+    public:
+        CastRendOnAttackerAction(PlayerbotAI* ai) : CastDebuffSpellOnAttackerAction(ai, "rend") {}
+        virtual NextAction** getPrerequisites();
+    };
+
+    BEGIN_DEBUFF_ACTION(CastDisarmAction, "disarm")
+        virtual NextAction** getPrerequisites();
+    END_SPELL_ACTION()
+
+    BEGIN_DEBUFF_ACTION(CastSunderArmorAction, "sunder armor") // 5 times
+        virtual NextAction** getPrerequisites();
+    END_SPELL_ACTION()
+
+    class CastDemoralizingShoutAction : public CastDebuffSpellAction {
+    public:
+        CastDemoralizingShoutAction(PlayerbotAI* ai) : CastDebuffSpellAction(ai, "demoralizing shout") {}
+    };
+
+    BEGIN_MELEE_SPELL_ACTION(CastChallengingShoutAction, "challenging shout")
+    END_SPELL_ACTION()
+
+    // stuns
+    BEGIN_MELEE_SPELL_ACTION(CastShieldBashAction, "shield bash")
+    END_SPELL_ACTION()
+
+    BEGIN_MELEE_SPELL_ACTION(CastIntimidatingShoutAction, "intimidating shout")
+    END_SPELL_ACTION()
+
+    BEGIN_MELEE_SPELL_ACTION(CastThunderClapAction, "thunder clap")
+    END_SPELL_ACTION()
+
+    // buffs
+	class CastBattleShoutAction : public CastBuffSpellAction {
+	public:
+		CastBattleShoutAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "battle shout") {}
+	};
+
+	class CastDefensiveStanceAction : public CastBuffSpellAction {
+	public:
+		CastDefensiveStanceAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "defensive stance") {}
+	};
+
+	class CastBattleStanceAction : public CastBuffSpellAction {
+	public:
+		CastBattleStanceAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "battle stance") {}
+	};
+
+    BEGIN_RANGED_SPELL_ACTION(CastChargeAction, "charge")
+    END_SPELL_ACTION()
+
+	class CastDeathWishAction : public CastBuffSpellAction {
+	public:
+		CastDeathWishAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "death wish") {}
+	};
+
+	class CastBerserkerRageAction : public CastBuffSpellAction {
+	public:
+		CastBerserkerRageAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "berserker rage") {}
+	};
+
+	class CastLastStandAction : public CastBuffSpellAction {
+	public:
+		CastLastStandAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "last stand") {}
+	};
+
+	// defensive
+	class CastShockwaveAction : public CastDefensiveMeleeSpellAction {
+	public:
+		CastShockwaveAction(PlayerbotAI* ai) : CastDefensiveMeleeSpellAction(ai, "shockwave") {}
+	};
+
+	// defensive
+	class CastConcussionBlowAction : public CastDefensiveMeleeSpellAction {
+	public:
+		CastConcussionBlowAction(PlayerbotAI* ai) : CastDefensiveMeleeSpellAction(ai, "concussion blow") {}
+	};
+
+	BEGIN_MELEE_SPELL_ACTION(CastVictoryRushAction, "victory rush")
+	END_SPELL_ACTION()
+
+    class CastShieldBashOnEnemyHealerAction : public CastSpellOnEnemyHealerAction
+    {
+    public:
+        CastShieldBashOnEnemyHealerAction(PlayerbotAI* ai) : CastSpellOnEnemyHealerAction(ai, "shield bash") {}
+    };
+}
diff --git a/src/game/playerbot/strategy/warrior/WarriorAiObjectContext.cpp b/src/game/playerbot/strategy/warrior/WarriorAiObjectContext.cpp
new file mode 100644
index 00000000000..bc74075d801
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/WarriorAiObjectContext.cpp
@@ -0,0 +1,192 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarriorActions.h"
+#include "WarriorAiObjectContext.h"
+#include "GenericWarriorNonCombatStrategy.h"
+#include "TankWarriorStrategy.h"
+#include "DpsWarriorStrategy.h"
+#include "../generic/PullStrategy.h"
+#include "WarriorTriggers.h"
+#include "../NamedObjectContext.h"
+
+using namespace ai;
+
+
+namespace ai
+{
+    namespace warrior
+    {
+        using namespace ai;
+
+        class StrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            StrategyFactoryInternal()
+            {
+                creators["nc"] = &warrior::StrategyFactoryInternal::nc;
+                creators["pull"] = &warrior::StrategyFactoryInternal::pull;
+                creators["aoe"] = &warrior::StrategyFactoryInternal::aoe;
+            }
+
+        private:
+            static Strategy* nc(PlayerbotAI* ai) { return new GenericWarriorNonCombatStrategy(ai); }
+            static Strategy* aoe(PlayerbotAI* ai) { return new DpsWarrirorAoeStrategy(ai); }
+            static Strategy* pull(PlayerbotAI* ai) { return new PullStrategy(ai, "shoot"); }
+        };
+
+        class CombatStrategyFactoryInternal : public NamedObjectContext<Strategy>
+        {
+        public:
+            CombatStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
+            {
+                creators["tank"] = &warrior::CombatStrategyFactoryInternal::tank;
+                creators["dps"] = &warrior::CombatStrategyFactoryInternal::dps;
+            }
+
+        private:
+            static Strategy* tank(PlayerbotAI* ai) { return new TankWarriorStrategy(ai); }
+            static Strategy* dps(PlayerbotAI* ai) { return new DpsWarriorStrategy(ai); }
+        };
+    };
+};
+
+namespace ai
+{
+    namespace warrior
+    {
+        using namespace ai;
+
+        class TriggerFactoryInternal : public NamedObjectContext<Trigger>
+        {
+        public:
+            TriggerFactoryInternal()
+            {
+                creators["hamstring"] = &TriggerFactoryInternal::hamstring;
+                creators["victory rush"] = &TriggerFactoryInternal::victory_rush;
+                creators["death wish"] = &TriggerFactoryInternal::death_wish;
+                creators["battle shout"] = &TriggerFactoryInternal::battle_shout;
+                creators["rend"] = &TriggerFactoryInternal::rend;
+                creators["rend on attacker"] = &TriggerFactoryInternal::rend_on_attacker;
+                creators["bloodrage"] = &TriggerFactoryInternal::bloodrage;
+                creators["shield bash"] = &TriggerFactoryInternal::shield_bash;
+                creators["disarm"] = &TriggerFactoryInternal::disarm;
+                creators["concussion blow"] = &TriggerFactoryInternal::concussion_blow;
+                creators["sword and board"] = &TriggerFactoryInternal::SwordAndBoard;
+                creators["shield bash on enemy healer"] = &TriggerFactoryInternal::shield_bash_on_enemy_healer;
+
+            }
+
+        private:
+            static Trigger* hamstring(PlayerbotAI* ai) { return new HamstringTrigger(ai); }
+            static Trigger* victory_rush(PlayerbotAI* ai) { return new VictoryRushTrigger(ai); }
+            static Trigger* death_wish(PlayerbotAI* ai) { return new DeathWishTrigger(ai); }
+            static Trigger* battle_shout(PlayerbotAI* ai) { return new BattleShoutTrigger(ai); }
+            static Trigger* rend(PlayerbotAI* ai) { return new RendDebuffTrigger(ai); }
+            static Trigger* rend_on_attacker(PlayerbotAI* ai) { return new RendDebuffOnAttackerTrigger(ai); }
+            static Trigger* bloodrage(PlayerbotAI* ai) { return new BloodrageDebuffTrigger(ai); }
+            static Trigger* shield_bash(PlayerbotAI* ai) { return new ShieldBashInterruptSpellTrigger(ai); }
+            static Trigger* disarm(PlayerbotAI* ai) { return new DisarmDebuffTrigger(ai); }
+            static Trigger* concussion_blow(PlayerbotAI* ai) { return new ConcussionBlowTrigger(ai); }
+            static Trigger* SwordAndBoard(PlayerbotAI* ai) { return new SwordAndBoardTrigger(ai); }
+            static Trigger* shield_bash_on_enemy_healer(PlayerbotAI* ai) { return new ShieldBashInterruptEnemyHealerSpellTrigger(ai); }
+        };
+    };
+};
+
+
+namespace ai
+{
+    namespace warrior
+    {
+        using namespace ai;
+
+        class AiObjectContextInternal : public NamedObjectContext<Action>
+        {
+        public:
+            AiObjectContextInternal()
+            {
+                creators["devastate"] = &AiObjectContextInternal::devastate;
+                creators["overpower"] = &AiObjectContextInternal::overpower;
+                creators["charge"] = &AiObjectContextInternal::charge;
+                creators["bloodthirst"] = &AiObjectContextInternal::bloodthirst;
+                creators["rend"] = &AiObjectContextInternal::rend;
+                creators["rend on attacker"] = &AiObjectContextInternal::rend_on_attacker;
+                creators["mocking blow"] = &AiObjectContextInternal::mocking_blow;
+                creators["death wish"] = &AiObjectContextInternal::death_wish;
+                creators["berserker rage"] = &AiObjectContextInternal::berserker_rage;
+                creators["victory rush"] = &AiObjectContextInternal::victory_rush;
+                creators["execute"] = &AiObjectContextInternal::execute;
+                creators["defensive stance"] = &AiObjectContextInternal::defensive_stance;
+                creators["hamstring"] = &AiObjectContextInternal::hamstring;
+                creators["shield bash"] = &AiObjectContextInternal::shield_bash;
+                creators["shield block"] = &AiObjectContextInternal::shield_block;
+                creators["bloodrage"] = &AiObjectContextInternal::bloodrage;
+                creators["battle stance"] = &AiObjectContextInternal::battle_stance;
+                creators["heroic strike"] = &AiObjectContextInternal::heroic_strike;
+                creators["intimidating shout"] = &AiObjectContextInternal::intimidating_shout;
+                creators["demoralizing shout"] = &AiObjectContextInternal::demoralizing_shout;
+                creators["challenging shout"] = &AiObjectContextInternal::challenging_shout;
+                creators["shield wall"] = &AiObjectContextInternal::shield_wall;
+                creators["battle shout"] = &AiObjectContextInternal::battle_shout;
+                creators["thunder clap"] = &AiObjectContextInternal::thunder_clap;
+                creators["taunt"] = &AiObjectContextInternal::taunt;
+                creators["revenge"] = &AiObjectContextInternal::revenge;
+                creators["slam"] = &AiObjectContextInternal::slam;
+                creators["shield slam"] = &AiObjectContextInternal::shield_slam;
+                creators["disarm"] = &AiObjectContextInternal::disarm;
+                creators["sunder armor"] = &AiObjectContextInternal::sunder_armor;
+                creators["last stand"] = &AiObjectContextInternal::last_stand;
+                creators["shockwave"] = &AiObjectContextInternal::shockwave;
+                creators["cleave"] = &AiObjectContextInternal::cleave;
+                creators["concussion blow"] = &AiObjectContextInternal::concussion_blow;
+                creators["shield bash on enemy healer"] = &AiObjectContextInternal::shield_bash_on_enemy_healer;
+            }
+
+        private:
+            static Action* devastate(PlayerbotAI* ai) { return new CastDevastateAction(ai); }
+            static Action* last_stand(PlayerbotAI* ai) { return new CastLastStandAction(ai); }
+            static Action* shockwave(PlayerbotAI* ai) { return new CastShockwaveAction(ai); }
+            static Action* cleave(PlayerbotAI* ai) { return new CastCleaveAction(ai); }
+            static Action* concussion_blow(PlayerbotAI* ai) { return new CastConcussionBlowAction(ai); }
+            static Action* taunt(PlayerbotAI* ai) { return new CastTauntAction(ai); }
+            static Action* revenge(PlayerbotAI* ai) { return new CastRevengeAction(ai); }
+            static Action* slam(PlayerbotAI* ai) { return new CastSlamAction(ai); }
+            static Action* shield_slam(PlayerbotAI* ai) { return new CastShieldSlamAction(ai); }
+            static Action* disarm(PlayerbotAI* ai) { return new CastDisarmAction(ai); }
+            static Action* sunder_armor(PlayerbotAI* ai) { return new CastSunderArmorAction(ai); }
+            static Action* overpower(PlayerbotAI* ai) { return new CastOverpowerAction(ai); }
+            static Action* charge(PlayerbotAI* ai) { return new CastChargeAction(ai); }
+            static Action* bloodthirst(PlayerbotAI* ai) { return new CastBloodthirstAction(ai); }
+            static Action* rend(PlayerbotAI* ai) { return new CastRendAction(ai); }
+            static Action* rend_on_attacker(PlayerbotAI* ai) { return new CastRendOnAttackerAction(ai); }
+            static Action* mocking_blow(PlayerbotAI* ai) { return new CastMockingBlowAction(ai); }
+            static Action* death_wish(PlayerbotAI* ai) { return new CastDeathWishAction(ai); }
+            static Action* berserker_rage(PlayerbotAI* ai) { return new CastBerserkerRageAction(ai); }
+            static Action* victory_rush(PlayerbotAI* ai) { return new CastVictoryRushAction(ai); }
+            static Action* execute(PlayerbotAI* ai) { return new CastExecuteAction(ai); }
+            static Action* defensive_stance(PlayerbotAI* ai) { return new CastDefensiveStanceAction(ai); }
+            static Action* hamstring(PlayerbotAI* ai) { return new CastHamstringAction(ai); }
+            static Action* shield_bash(PlayerbotAI* ai) { return new CastShieldBashAction(ai); }
+            static Action* shield_block(PlayerbotAI* ai) { return new CastShieldBlockAction(ai); }
+            static Action* bloodrage(PlayerbotAI* ai) { return new CastBloodrageAction(ai); }
+            static Action* battle_stance(PlayerbotAI* ai) { return new CastBattleStanceAction(ai); }
+            static Action* heroic_strike(PlayerbotAI* ai) { return new CastHeroicStrikeAction(ai); }
+            static Action* intimidating_shout(PlayerbotAI* ai) { return new CastIntimidatingShoutAction(ai); }
+            static Action* demoralizing_shout(PlayerbotAI* ai) { return new CastDemoralizingShoutAction(ai); }
+            static Action* challenging_shout(PlayerbotAI* ai) { return new CastChallengingShoutAction(ai); }
+            static Action* shield_wall(PlayerbotAI* ai) { return new CastShieldWallAction(ai); }
+            static Action* battle_shout(PlayerbotAI* ai) { return new CastBattleShoutAction(ai); }
+            static Action* thunder_clap(PlayerbotAI* ai) { return new CastThunderClapAction(ai); }
+            static Action* shield_bash_on_enemy_healer(PlayerbotAI* ai) { return new CastShieldBashOnEnemyHealerAction(ai); }
+
+        };
+    };
+};
+
+WarriorAiObjectContext::WarriorAiObjectContext(PlayerbotAI* ai) : AiObjectContext(ai)
+{
+    strategyContexts.Add(new ai::warrior::StrategyFactoryInternal());
+    strategyContexts.Add(new ai::warrior::CombatStrategyFactoryInternal());
+    actionContexts.Add(new ai::warrior::AiObjectContextInternal());
+    triggerContexts.Add(new ai::warrior::TriggerFactoryInternal());
+}
diff --git a/src/game/playerbot/strategy/warrior/WarriorAiObjectContext.h b/src/game/playerbot/strategy/warrior/WarriorAiObjectContext.h
new file mode 100644
index 00000000000..bc1b5d49a2e
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/WarriorAiObjectContext.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../AiObjectContext.h"
+
+namespace ai
+{
+    class WarriorAiObjectContext : public AiObjectContext
+    {
+    public:
+        WarriorAiObjectContext(PlayerbotAI* ai);
+    };
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/warrior/WarriorMultipliers.cpp b/src/game/playerbot/strategy/warrior/WarriorMultipliers.cpp
new file mode 100644
index 00000000000..0698aa1f0e6
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/WarriorMultipliers.cpp
@@ -0,0 +1,6 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarriorMultipliers.h"
+#include "WarriorActions.h"
+
+using namespace ai;
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/warrior/WarriorMultipliers.h b/src/game/playerbot/strategy/warrior/WarriorMultipliers.h
new file mode 100644
index 00000000000..7cfbdd46e87
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/WarriorMultipliers.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace ai
+{
+   
+}
\ No newline at end of file
diff --git a/src/game/playerbot/strategy/warrior/WarriorTriggers.cpp b/src/game/playerbot/strategy/warrior/WarriorTriggers.cpp
new file mode 100644
index 00000000000..0b8d1838ad8
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/WarriorTriggers.cpp
@@ -0,0 +1,7 @@
+#include "../../../pchdef.h"
+#include "../../playerbot.h"
+#include "WarriorTriggers.h"
+#include "WarriorActions.h"
+
+using namespace ai;
+
diff --git a/src/game/playerbot/strategy/warrior/WarriorTriggers.h b/src/game/playerbot/strategy/warrior/WarriorTriggers.h
new file mode 100644
index 00000000000..72a1285cf78
--- /dev/null
+++ b/src/game/playerbot/strategy/warrior/WarriorTriggers.h
@@ -0,0 +1,78 @@
+#pragma once
+#include "../triggers/GenericTriggers.h"
+
+namespace ai
+{
+    BUFF_TRIGGER(BattleShoutTrigger, "battle shout", "battle shout")
+
+    DEBUFF_TRIGGER(RendDebuffTrigger, "rend", "rend")
+    DEBUFF_TRIGGER(DisarmDebuffTrigger, "disarm", "disarm")
+    DEBUFF_TRIGGER(SunderArmorDebuffTrigger, "sunder armor", "sunder armor")
+
+    class RendDebuffOnAttackerTrigger : public DebuffOnAttackerTrigger
+    {
+    public:
+        RendDebuffOnAttackerTrigger(PlayerbotAI* ai) : DebuffOnAttackerTrigger(ai, "rend") {}
+    };
+
+	class RevengeAvailableTrigger : public SpellCanBeCastTrigger
+	{
+	public:
+		RevengeAvailableTrigger(PlayerbotAI* ai) : SpellCanBeCastTrigger(ai, "revenge") {}
+	};
+
+    class BloodrageDebuffTrigger : public DebuffTrigger
+    {
+    public:
+        BloodrageDebuffTrigger(PlayerbotAI* ai) : DebuffTrigger(ai, "bloodrage") {}
+        virtual bool IsActive()
+        {
+            return DebuffTrigger::IsActive() &&
+                AI_VALUE2(uint8, "health", "self target") >= 75 &&
+                AI_VALUE2(uint8, "rage", "self target") < 20;
+        }
+    };
+
+    class ShieldBashInterruptSpellTrigger : public InterruptSpellTrigger
+    {
+    public:
+        ShieldBashInterruptSpellTrigger(PlayerbotAI* ai) : InterruptSpellTrigger(ai, "shield bash") {}
+    };
+
+    class VictoryRushTrigger : public HasAuraTrigger
+    {
+    public:
+        VictoryRushTrigger(PlayerbotAI* ai) : HasAuraTrigger(ai, "victory rush") {}
+    };
+
+    class SwordAndBoardTrigger : public HasAuraTrigger
+    {
+    public:
+        SwordAndBoardTrigger(PlayerbotAI* ai) : HasAuraTrigger(ai, "sword and board") {}
+    };
+
+    class ConcussionBlowTrigger : public SnareTargetTrigger
+    {
+    public:
+        ConcussionBlowTrigger(PlayerbotAI* ai) : SnareTargetTrigger(ai, "concussion blow") {}
+    };
+
+    class HamstringTrigger : public SnareTargetTrigger
+    {
+    public:
+        HamstringTrigger(PlayerbotAI* ai) : SnareTargetTrigger(ai, "hamstring") {}
+    };
+
+    class DeathWishTrigger : public BoostTrigger
+    {
+    public:
+        DeathWishTrigger(PlayerbotAI* ai) : BoostTrigger(ai, "death wish") {}
+    };
+
+    class ShieldBashInterruptEnemyHealerSpellTrigger : public InterruptEnemyHealerTrigger
+    {
+    public:
+        ShieldBashInterruptEnemyHealerSpellTrigger(PlayerbotAI* ai) : InterruptEnemyHealerTrigger(ai, "shield bash") {}
+    };
+
+}
diff --git a/src/game/vmap/BIH.cpp b/src/game/vmap/BIH.cpp
index f642df394a3..5d4e80e2052 100644
--- a/src/game/vmap/BIH.cpp
+++ b/src/game/vmap/BIH.cpp
@@ -18,12 +18,12 @@
 
 #include "BIH.h"
 
-void BIH::buildHierarchy(std::vector<uint32> &tempTree, buildData &dat, BuildStats &stats)
+void BIH::buildHierarchy(std::vector<uint32>& tempTree, buildData& dat, BuildStats& stats)
 {
     // create space for the first node
     tempTree.push_back(3 << 30); // dummy leaf
     tempTree.insert(tempTree.end(), 2, 0);
-    //tempTree.add(0);
+    // tempTree.add(0);
 
     // seed bbox
     AABound gridBox = { bounds.low(), bounds.high() };
@@ -32,7 +32,7 @@ void BIH::buildHierarchy(std::vector<uint32> &tempTree, buildData &dat, BuildSta
     subdivide(0, dat.numPrims - 1, tempTree, dat, gridBox, nodeBox, 0, 1, stats);
 }
 
-void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildData &dat, AABound &gridBox, AABound &nodeBox, int nodeIndex, int depth, BuildStats &stats)
+void BIH::subdivide(int left, int right, std::vector<uint32>& tempTree, buildData& dat, AABound& gridBox, AABound& nodeBox, int nodeIndex, int depth, BuildStats& stats)
 {
     if ((right - left + 1) <= dat.maxPrims || depth >= MAX_STACK_SIZE)
     {
@@ -51,14 +51,14 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat
         prevAxis = axis;
         prevSplit = split;
         // perform quick consistency checks
-        Vector3 d( gridBox.hi - gridBox.lo );
+        Vector3 d(gridBox.hi - gridBox.lo);
         if (d.x < 0 || d.y < 0 || d.z < 0)
             throw std::logic_error("negative node extents");
-        for (int i = 0; i < 3; i++)
+        for (int i = 0; i < 3; ++i)
         {
             if (nodeBox.hi[i] < gridBox.lo[i] || nodeBox.lo[i] > gridBox.hi[i])
             {
-                //UI.printError(Module.ACCEL, "Reached tree area in error - discarding node with: %d objects", right - left + 1);
+                // UI.printError(Module.ACCEL, "Reached tree area in error - discarding node with: %d objects", right - left + 1);
                 throw std::logic_error("invalid node overlap");
             }
         }
@@ -80,7 +80,7 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat
             if (center <= split)
             {
                 // stay left
-                i++;
+                ++i;
                 if (clipL < maxb)
                     clipL = maxb;
             }
@@ -90,7 +90,7 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat
                 int t = dat.indices[i];
                 dat.indices[i] = dat.indices[right];
                 dat.indices[right] = t;
-                right--;
+                --right;
                 if (clipR > minb)
                     clipR = minb;
             }
@@ -127,13 +127,15 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat
         if (right == rightOrig)
         {
             // all left
-            if (prevAxis == axis && G3D::fuzzyEq(prevSplit, split)) {
+            if (prevAxis == axis && G3D::fuzzyEq(prevSplit, split))
+            {
                 // we are stuck here - create a leaf
                 stats.updateLeaf(depth, right - left + 1);
                 createNode(tempTree, nodeIndex, left, right);
                 return;
             }
-            if (clipL <= split) {
+            if (clipL <= split)
+            {
                 // keep looping on left half
                 gridBox.hi[axis] = split;
                 prevClip = clipL;
@@ -146,14 +148,16 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat
         else if (left > right)
         {
             // all right
-            if (prevAxis == axis && G3D::fuzzyEq(prevSplit, split)) {
+            if (prevAxis == axis && G3D::fuzzyEq(prevSplit, split))
+            {
                 // we are stuck here - create a leaf
                 stats.updateLeaf(depth, right - left + 1);
                 createNode(tempTree, nodeIndex, left, right);
                 return;
             }
             right = rightOrig;
-            if (clipR >= split) {
+            if (clipR >= split)
+            {
                 // keep looping on right half
                 gridBox.lo[axis] = split;
                 prevClip = clipR;
@@ -175,14 +179,17 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat
                 tempTree.push_back(0);
                 tempTree.push_back(0);
                 tempTree.push_back(0);
-                if (wasLeft) {
+                if (wasLeft)
+                {
                     // create a node with a left child
                     // write leaf node
                     stats.updateInner();
                     tempTree[nodeIndex + 0] = (prevAxis << 30) | nextIndex;
                     tempTree[nodeIndex + 1] = floatToRawIntBits(prevClip);
                     tempTree[nodeIndex + 2] = floatToRawIntBits(G3D::inf());
-                } else {
+                }
+                else
+                {
                     // create a node with a right child
                     // write leaf node
                     stats.updateInner();
@@ -191,7 +198,7 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat
                     tempTree[nodeIndex + 2] = floatToRawIntBits(prevClip);
                 }
                 // count stats for the unused leaf
-                depth++;
+                ++depth;
                 stats.updateLeaf(depth, 0);
                 // now we keep going as we are, with a new nodeIndex:
                 nodeIndex = nextIndex;
@@ -204,14 +211,17 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat
     // allocate left node
     int nl = right - left + 1;
     int nr = rightOrig - (right + 1) + 1;
-    if (nl > 0) {
+    if (nl > 0)
+    {
         tempTree.push_back(0);
         tempTree.push_back(0);
         tempTree.push_back(0);
-    } else
+    }
+    else
         nextIndex -= 3;
     // allocate right node
-    if (nr > 0) {
+    if (nr > 0)
+    {
         tempTree.push_back(0);
         tempTree.push_back(0);
         tempTree.push_back(0);
@@ -238,25 +248,25 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat
         stats.updateLeaf(depth + 1, 0);
 }
 
-bool BIH::writeToFile(FILE *wf) const
+bool BIH::writeToFile(FILE* wf) const
 {
     uint32 treeSize = tree.size();
-    uint32 check=0, count=0;
+    uint32 check = 0;
+    uint32 count = objects.size();
     check += fwrite(&bounds.low(), sizeof(float), 3, wf);
     check += fwrite(&bounds.high(), sizeof(float), 3, wf);
     check += fwrite(&treeSize, sizeof(uint32), 1, wf);
     check += fwrite(&tree[0], sizeof(uint32), treeSize, wf);
-    count = objects.size();
     check += fwrite(&count, sizeof(uint32), 1, wf);
     check += fwrite(&objects[0], sizeof(uint32), count, wf);
     return check == (3 + 3 + 2 + treeSize + count);
 }
 
-bool BIH::readFromFile(FILE *rf)
+bool BIH::readFromFile(FILE* rf)
 {
     uint32 treeSize;
     Vector3 lo, hi;
-    uint32 check=0, count=0;
+    uint32 check = 0, count = 0;
     check += fread(&lo, sizeof(float), 3, rf);
     check += fread(&hi, sizeof(float), 3, rf);
     bounds = AABox(lo, hi);
@@ -271,7 +281,7 @@ bool BIH::readFromFile(FILE *rf)
 
 void BIH::BuildStats::updateLeaf(int depth, int n)
 {
-    numLeaves++;
+    ++numLeaves;
     minDepth = std::min(depth, minDepth);
     maxDepth = std::max(depth, maxDepth);
     sumDepth += depth;
diff --git a/src/game/vmap/BIH.h b/src/game/vmap/BIH.h
index c263ddf0962..02cb5d944e9 100644
--- a/src/game/vmap/BIH.h
+++ b/src/game/vmap/BIH.h
@@ -34,15 +34,17 @@
 #define MAX_STACK_SIZE 64
 
 #ifdef _MSC_VER
-    #define isnan(x) _isnan(x)
+#define isnan(x) _isnan(x)
 #else
-    #define isnan(x) std::isnan(x)
+#define isnan(x) std::isnan(x)
 #endif
 
 using G3D::Vector3;
 using G3D::AABox;
 using G3D::Ray;
 
+typedef std::vector<uint32> BIHVector;
+
 static inline uint32 floatToRawIntBits(float f)
 {
     union
@@ -50,7 +52,7 @@ static inline uint32 floatToRawIntBits(float f)
         uint32 ival;
         float fval;
     } temp;
-    temp.fval=f;
+    temp.fval = f;
     return temp.ival;
 }
 
@@ -61,7 +63,7 @@ static inline float intBitsToFloat(uint32 i)
         uint32 ival;
         float fval;
     } temp;
-    temp.ival=i;
+    temp.ival = i;
     return temp.fval;
 }
 
@@ -79,36 +81,49 @@ struct AABound
 
 class BIH
 {
+    private:
+        void init_empty()
+        {
+            tree.clear();
+            objects.clear();
+            // create space for the first node
+            tree.push_back(3 << 30); // dummy leaf
+            tree.insert(tree.end(), 2, 0);
+        }
+
     public:
-        BIH() {};
-        template< class T, class BoundsFunc >
-        void build(const std::vector<T> &primitives, BoundsFunc &getBounds, uint32 leafSize = 3, bool printStats=false)
+        BIH() {init_empty();}
+        template< class BoundsFunc, class PrimArray >
+        void build(const PrimArray& primitives, BoundsFunc& getBounds, uint32 leafSize = 3, bool printStats = false)
         {
-            if(primitives.size() == 0)
+            if (primitives.size() == 0)
+            {
+                init_empty();
                 return;
+            }
             buildData dat;
             dat.maxPrims = leafSize;
             dat.numPrims = primitives.size();
             dat.indices = new uint32[dat.numPrims];
             dat.primBound = new AABox[dat.numPrims];
             getBounds(primitives[0], bounds);
-            for (uint32 i=0; i<dat.numPrims; ++i)
+            for (uint32 i = 0; i < dat.numPrims; ++i)
             {
                 dat.indices[i] = i;
                 AABox tb;
                 getBounds(primitives[i], dat.primBound[i]);
                 bounds.merge(dat.primBound[i]);
             }
-            std::vector<uint32> tempTree;
+            BIHVector tempTree;
             BuildStats stats;
             buildHierarchy(tempTree, dat, stats);
             if (printStats)
                 stats.printStats();
 
             objects.resize(dat.numPrims);
-            for (uint32 i=0; i<dat.numPrims; ++i)
+            for (uint32 i = 0; i < dat.numPrims; ++i)
                 objects[i] = dat.indices[i];
-            //nObjects = dat.numPrims;
+            // nObjects = dat.numPrims;
             tree = tempTree;
             delete[] dat.primBound;
             delete[] dat.indices;
@@ -116,14 +131,14 @@ class BIH
         uint32 primCount() { return objects.size(); }
 
         template<typename RayCallback>
-        void intersectRay(const Ray &r, RayCallback& intersectCallback, float &maxDist, bool stopAtFirst=false) const
+        void intersectRay(const Ray& r, RayCallback& intersectCallback, float& maxDist, bool stopAtFirst = false) const
         {
             float intervalMin = -1.f;
             float intervalMax = -1.f;
             Vector3 org = r.origin();
             Vector3 dir = r.direction();
             Vector3 invDir;
-            for (int i=0; i<3; ++i)
+            for (int i = 0; i < 3; ++i)
             {
                 invDir[i] = 1.f / dir[i];
                 if (G3D::fuzzyNe(dir[i], 0.0f))
@@ -154,7 +169,7 @@ class BIH
             uint32 offsetBack3[3];
             // compute custom offsets from direction sign bit
 
-            for(int i=0; i<3; ++i)
+            for (int i = 0; i < 3; ++i)
             {
                 offsetFront[i] = floatToRawIntBits(dir[i]) >> 31;
                 offsetBack[i] = offsetFront[i] ^ 1;
@@ -170,7 +185,8 @@ class BIH
             int stackPos = 0;
             int node = 0;
 
-            while (true) {
+            while (true)
+            {
                 while (true)
                 {
                     uint32 tn = tree[node];
@@ -190,13 +206,15 @@ class BIH
                             int back = offset + offsetBack3[axis];
                             node = back;
                             // ray passes through far node only
-                            if (tf < intervalMin) {
+                            if (tf < intervalMin)
+                            {
                                 intervalMin = (tb >= intervalMin) ? tb : intervalMin;
                                 continue;
                             }
                             node = offset + offsetFront3[axis]; // front
                             // ray passes through near node only
-                            if (tb > intervalMax) {
+                            if (tb > intervalMax)
+                            {
                                 intervalMax = (tf <= intervalMax) ? tf : intervalMax;
                                 continue;
                             }
@@ -205,7 +223,7 @@ class BIH
                             stack[stackPos].node = back;
                             stack[stackPos].tnear = (tb >= intervalMin) ? tb : intervalMin;
                             stack[stackPos].tfar = intervalMax;
-                            stackPos++;
+                            ++stackPos;
                             // update ray interval for front node
                             intervalMax = (tf <= intervalMax) ? tf : intervalMax;
                             continue;
@@ -214,9 +232,10 @@ class BIH
                         {
                             // leaf - test some objects
                             int n = tree[node + 1];
-                            while (n > 0) {
+                            while (n > 0)
+                            {
                                 bool hit = intersectCallback(r, objects[offset], maxDist, stopAtFirst);
-                                if(stopAtFirst && hit) return;
+                                if (stopAtFirst && hit) return;
                                 --n;
                                 ++offset;
                             }
@@ -225,7 +244,7 @@ class BIH
                     }
                     else
                     {
-                        if (axis>2)
+                        if (axis > 2)
                             return; // should not happen
                         float tf = (intBitsToFloat(tree[node + offsetFront[axis]]) - org[axis]) * invDir[axis];
                         float tb = (intBitsToFloat(tree[node + offsetBack[axis]]) - org[axis]) * invDir[axis];
@@ -243,19 +262,20 @@ class BIH
                     if (stackPos == 0)
                         return;
                     // move back up the stack
-                    stackPos--;
+                    --stackPos;
                     intervalMin = stack[stackPos].tnear;
                     if (maxDist < intervalMin)
                         continue;
                     node = stack[stackPos].node;
                     intervalMax = stack[stackPos].tfar;
                     break;
-                } while (true);
+                }
+                while (true);
             }
         }
 
         template<typename IsectCallback>
-        void intersectPoint(const Vector3 &p, IsectCallback& intersectCallback) const
+        void intersectPoint(const Vector3& p, IsectCallback& intersectCallback) const
         {
             if (!bounds.contains(p))
                 return;
@@ -264,7 +284,8 @@ class BIH
             int stackPos = 0;
             int node = 0;
 
-            while (true) {
+            while (true)
+            {
                 while (true)
                 {
                     uint32 tn = tree[node];
@@ -284,25 +305,28 @@ class BIH
                             int right = offset + 3;
                             node = right;
                             // point is in right node only
-                            if (tl < p[axis]) {
+                            if (tl < p[axis])
+                            {
                                 continue;
                             }
                             node = offset; // left
                             // point is in left node only
-                            if (tr > p[axis]) {
+                            if (tr > p[axis])
+                            {
                                 continue;
                             }
                             // point is in both nodes
                             // push back right node
                             stack[stackPos].node = right;
-                            stackPos++;
+                            ++stackPos;
                             continue;
                         }
                         else
                         {
                             // leaf - test some objects
                             int n = tree[node + 1];
-                            while (n > 0) {
+                            while (n > 0)
+                            {
                                 intersectCallback(p, objects[offset]); // !!!
                                 --n;
                                 ++offset;
@@ -312,7 +336,7 @@ class BIH
                     }
                     else // BVH2 node (empty space cut off left and right)
                     {
-                        if (axis>2)
+                        if (axis > 2)
                             return; // should not happen
                         float tl = intBitsToFloat(tree[node + 1]);
                         float tr = intBitsToFloat(tree[node + 2]);
@@ -327,23 +351,23 @@ class BIH
                 if (stackPos == 0)
                     return;
                 // move back up the stack
-                stackPos--;
+                --stackPos;
                 node = stack[stackPos].node;
             }
         }
 
-        bool writeToFile(FILE *wf) const;
-        bool readFromFile(FILE *rf);
+        bool writeToFile(FILE* wf) const;
+        bool readFromFile(FILE* rf);
 
     protected:
-        std::vector<uint32> tree;
-        std::vector<uint32> objects;
+        BIHVector tree;
+        BIHVector objects;
         AABox bounds;
 
         struct buildData
         {
-            uint32 *indices;
-            AABox *primBound;
+            uint32* indices;
+            AABox* primBound;
             uint32 numPrims;
             int maxPrims;
         };
@@ -369,29 +393,30 @@ class BIH
                 int numBVH2;
 
             public:
-            BuildStats():
-                numNodes(0), numLeaves(0), sumObjects(0), minObjects(0x0FFFFFFF),
-                maxObjects(0xFFFFFFFF), sumDepth(0), minDepth(0x0FFFFFFF),
-                maxDepth(0xFFFFFFFF), numBVH2(0)
-            {
-                for(int i=0; i<6; ++i) numLeavesN[i] = 0;
-            }
+                BuildStats():
+                    numNodes(0), numLeaves(0), sumObjects(0), minObjects(0x0FFFFFFF),
+                    maxObjects(0xFFFFFFFF), sumDepth(0), minDepth(0x0FFFFFFF),
+                    maxDepth(0xFFFFFFFF), numBVH2(0)
+                {
+                    for (int i = 0; i < 6; ++i) numLeavesN[i] = 0;
+                }
 
-            void updateInner() { numNodes++; }
-            void updateBVH2() { numBVH2++; }
-            void updateLeaf(int depth, int n);
-            void printStats();
+                void updateInner() { ++numNodes; }
+                void updateBVH2() { ++numBVH2; }
+                void updateLeaf(int depth, int n);
+                void printStats();
         };
 
-        void buildHierarchy(std::vector<uint32> &tempTree, buildData &dat, BuildStats &stats);
+        void buildHierarchy(std::vector<uint32>& tempTree, buildData& dat, BuildStats& stats);
 
-        void createNode(std::vector<uint32> &tempTree, int nodeIndex, uint32 left, uint32 right) {
+        void createNode(std::vector<uint32>& tempTree, int nodeIndex, uint32 left, uint32 right)
+        {
             // write leaf node
             tempTree[nodeIndex + 0] = (3 << 30) | left;
             tempTree[nodeIndex + 1] = right - left + 1;
         }
 
-        void subdivide(int left, int right, std::vector<uint32> &tempTree, buildData &dat, AABound &gridBox, AABound &nodeBox, int nodeIndex, int depth, BuildStats &stats);
+        void subdivide(int left, int right, std::vector<uint32>& tempTree, buildData& dat, AABound& gridBox, AABound& nodeBox, int nodeIndex, int depth, BuildStats& stats);
 };
 
 #endif // _BIH_H
diff --git a/src/game/vmap/BIHWrap.h b/src/game/vmap/BIHWrap.h
new file mode 100644
index 00000000000..6c193f65c1b
--- /dev/null
+++ b/src/game/vmap/BIHWrap.h
@@ -0,0 +1,89 @@
+#pragma once
+
+#include <G3D/Table.h>
+#include <G3D/Array.h>
+#include <G3D/Set.h>
+#include "BIH.h"
+
+template<class T, class BoundsFunc = BoundsTrait<T> >
+class BIHWrap
+{
+    template<class RayCallback>
+    struct MDLCallback
+    {
+        RayCallback& cb;
+        const T *const* objects;
+
+        MDLCallback(RayCallback& callback, const T * const* objects_array) : cb(callback), objects(objects_array){}
+
+        bool operator() (const Ray& r, uint32 Idx, float &MaxDist, bool /*stopAtFirst*/)
+        {
+            if (const T * obj = objects[Idx])
+                return cb(r, *obj, MaxDist/*, stopAtFirst*/);
+            return false;
+        }
+
+        void operator() (const Vector3& p, uint32 Idx)
+        {
+            if (const T * obj = objects[Idx])
+                cb(p, *obj);
+        }
+    };
+
+    typedef G3D::Array<const T*> ObjArray;
+
+    BIH m_tree;
+    ObjArray m_objects;
+    G3D::Table<const T*, uint32> m_obj2Idx;
+    G3D::Set<const T*> m_objects_to_push;
+    int unbalanced_times;
+
+public:
+
+    BIHWrap() : unbalanced_times(0) {}
+
+    void insert(const T& obj)
+    {
+        ++unbalanced_times;
+        m_objects_to_push.insert(&obj);
+    }
+
+    void remove(const T& obj)
+    {
+        ++unbalanced_times;
+        uint32 Idx = 0;
+        const T * temp;
+        if (m_obj2Idx.getRemove(&obj, temp, Idx))
+            m_objects[Idx] = NULL;
+        else
+            m_objects_to_push.remove(&obj);
+    }
+
+    void balance()
+    {
+        if (unbalanced_times == 0)
+            return;
+
+        unbalanced_times = 0;
+        m_objects.fastClear();
+        m_obj2Idx.getKeys(m_objects);
+        m_objects_to_push.getMembers(m_objects);
+
+        m_tree.build(m_objects, BoundsFunc::getBounds2);
+    }
+
+    template<typename RayCallback>
+    void intersectRay(const Ray& r, RayCallback& intersectCallback, float& maxDist) const
+    {
+        MDLCallback<RayCallback> temp_cb(intersectCallback, m_objects.getCArray());
+        m_tree.intersectRay(r, temp_cb, maxDist, true);
+    }
+
+    template<typename IsectCallback>
+    void intersectPoint(const Vector3& p, IsectCallback& intersectCallback) const
+    {
+        MDLCallback<IsectCallback> temp_cb(intersectCallback, m_objects.getCArray());
+        m_tree.intersectPoint(p, temp_cb);
+    }
+};
+
diff --git a/src/game/vmap/DynamicTree.cpp b/src/game/vmap/DynamicTree.cpp
new file mode 100644
index 00000000000..544f49937dd
--- /dev/null
+++ b/src/game/vmap/DynamicTree.cpp
@@ -0,0 +1,314 @@
+/*
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "DynamicTree.h"
+#include "Log.h"
+#include "Timer.h"
+#include "BIHWrap.h"
+#include "RegularGrid.h"
+#include "GameObjectModel.h"
+#include "VMapDefinitions.h"
+#include "../World.h"
+
+template<> struct HashTrait< GameObjectModel>
+{
+    static size_t hashCode(const GameObjectModel& g) { return (size_t)(void*)&g; }
+};
+
+template<> struct PositionTrait< GameObjectModel>
+{
+    static void getPosition(const GameObjectModel& g, Vector3& p) { p = g.getPosition(); }
+};
+
+template<> struct BoundsTrait< GameObjectModel>
+{
+    static void getBounds(const GameObjectModel& g, G3D::AABox& out) { out = g.getBounds();}
+    static void getBounds2(const GameObjectModel* g, G3D::AABox& out) { out = g->getBounds();}
+};
+
+/*
+static bool operator == (const GameObjectModel& mdl, const GameObjectModel& mdl2){
+    return &mdl == &mdl2;
+}
+*/
+
+// int valuesPerNode = 5, numMeanSplits = 3;
+
+//int UNBALANCED_TIMES_LIMIT = 5;
+int CHECK_TREE_PERIOD = 200;
+
+typedef RegularGrid2D<GameObjectModel, BIHWrap<GameObjectModel> > ParentTree;
+
+struct DynTreeImpl : public ParentTree/*, public Intersectable*/
+{
+    typedef GameObjectModel Model;
+    typedef ParentTree base;
+
+    DynTreeImpl() :
+        rebalance_timer(CHECK_TREE_PERIOD),
+        unbalanced_times(0)
+    {
+    }
+
+    void insert(const Model& mdl)
+    {
+        base::insert(mdl);
+        ++unbalanced_times;
+    }
+
+    void remove(const Model& mdl)
+    {
+        base::remove(mdl);
+        ++unbalanced_times;
+    }
+
+    void balance()
+    {
+        base::balance();
+        unbalanced_times = 0;
+    }
+
+    void update(uint32 difftime)
+    {
+        if (!size())
+            return;
+
+        rebalance_timer.Update(difftime);
+        if (rebalance_timer.Passed())
+        {
+            rebalance_timer.Reset(CHECK_TREE_PERIOD);
+            if (unbalanced_times > 0)
+                balance();
+        }
+    }
+
+    ShortTimeTracker rebalance_timer;
+    int unbalanced_times;
+};
+
+DynamicMapTree::DynamicMapTree() : impl(*new DynTreeImpl())
+{
+}
+
+DynamicMapTree::~DynamicMapTree()
+{
+    delete &impl;
+}
+
+void DynamicMapTree::insert(const GameObjectModel& mdl)
+{
+    impl.insert(mdl);
+}
+
+void DynamicMapTree::remove(const GameObjectModel& mdl)
+{
+    impl.remove(mdl);
+}
+
+bool DynamicMapTree::contains(const GameObjectModel& mdl) const
+{
+    return impl.contains(mdl);
+}
+
+void DynamicMapTree::balance()
+{
+    impl.balance();
+}
+
+int DynamicMapTree::size() const
+{
+    return impl.size();
+}
+
+void DynamicMapTree::update(uint32 t_diff)
+{
+    impl.update(t_diff);
+}
+
+struct DynamicTreeIntersectionCallback
+{
+    bool did_hit;
+    uint32 phase_mask;
+    DynamicTreeIntersectionCallback(uint32 phasemask) : did_hit(false), phase_mask(phasemask) {}
+    bool operator()(const G3D::Ray& r, const GameObjectModel& obj, float& distance)
+    {
+        did_hit = obj.intersectRay(r, distance, true, phase_mask);
+        return did_hit;
+    }
+    bool didHit() const { return did_hit;}
+};
+
+struct DynamicTreeIntersectionCallback_WithLogger
+{
+    bool did_hit;
+    uint32 phase_mask;
+    DynamicTreeIntersectionCallback_WithLogger(uint32 phasemask) : did_hit(false), phase_mask(phasemask)
+    {
+        DEBUG_LOG("Dynamic Intersection log");
+    }
+    bool operator()(const G3D::Ray& r, const GameObjectModel& obj, float& distance)
+    {
+        DEBUG_LOG("testing intersection with %s", obj.name.c_str());
+        bool hit = obj.intersectRay(r, distance, true, phase_mask);
+        if (hit)
+        {
+            did_hit = true;
+            DEBUG_LOG("result: intersects");
+        }
+        return hit;
+    }
+    bool didHit() const { return did_hit;}
+};
+
+//=========================================================
+/**
+If intersection is found within pMaxDist, sets pMaxDist to intersection distance and returns true.
+Else, pMaxDist is not modified and returns false;
+*/
+
+bool DynamicMapTree::getIntersectionTime(const uint32 phasemask, const G3D::Ray& ray, const Vector3& endPos, float& pMaxDist) const
+{
+    float distance = pMaxDist;
+    DynamicTreeIntersectionCallback callback(phasemask);
+    impl.intersectRay(ray, callback, distance, endPos);
+    if (callback.didHit())
+        pMaxDist = distance;
+    return callback.didHit();
+}
+//=========================================================
+
+bool DynamicMapTree::getObjectHitPos(uint32 phasemask, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float pModifyDist) const
+{
+    // Don't calculate hit position, if wrong src/dest points provided!
+    if (!VMAP::CheckPosition(x1, y1, z1) || !VMAP::CheckPosition(x2, y2, z2))
+        return false;
+
+    Vector3 pos1 = Vector3(x1, y1, z1);
+    Vector3 pos2 = Vector3(x2, y2, z2);
+    Vector3 resultPos;
+    bool result = getObjectHitPos(phasemask, pos1, pos2, resultPos, pModifyDist);
+    rx = resultPos.x;
+    ry = resultPos.y;
+    rz = resultPos.z;
+    return result;
+}
+
+//=========================================================
+/**
+When moving from pos1 to pos2 check if we hit an object. Return true and the position if we hit one
+Return the hit pos or the original dest pos
+*/
+bool DynamicMapTree::getObjectHitPos(const uint32 phasemask, const Vector3& pPos1, const Vector3& pPos2, Vector3& pResultHitPos, float pModifyDist) const
+{
+    bool result = false;
+    float maxDist = (pPos2 - pPos1).magnitude();
+    // valid map coords should *never ever* produce float overflow, but this would produce NaNs too:
+    MANGOS_ASSERT(maxDist < std::numeric_limits<float>::max());
+    // prevent NaN values which can cause BIH intersection to enter infinite loop
+    if (maxDist < 1e-10f)
+    {
+        pResultHitPos = pPos2;
+        return false;
+    }
+    Vector3 dir = (pPos2 - pPos1) / maxDist;            // direction with length of 1
+    G3D::Ray ray(pPos1, dir);
+    float dist = maxDist;
+    if (getIntersectionTime(phasemask, ray, pPos2, dist))
+    {
+        pResultHitPos = pPos1 + dir * dist;
+        if (pModifyDist < 0)
+        {
+            if ((pResultHitPos - pPos1).magnitude() > -pModifyDist)
+            {
+                pResultHitPos = pResultHitPos + dir * pModifyDist;
+            }
+            else
+            {
+                pResultHitPos = pPos1;
+            }
+        }
+        else
+        {
+            pResultHitPos = pResultHitPos + dir * pModifyDist;
+        }
+        result = true;
+    }
+    else
+    {
+        pResultHitPos = pPos2;
+        result = false;
+    }
+    return result;
+}
+
+bool DynamicMapTree::isInLineOfSight(float x1, float y1, float z1, float x2, float y2, float z2, uint32 phasemask) const
+{
+    // Don't calculate hit position, if wrong src/dest points provided!
+    if (!VMAP::CheckPosition(x1, y1, z1) || !VMAP::CheckPosition(x2, y2, z2))
+        return false;
+
+    if (!size())
+        return true;
+
+    Vector3 v1(x1, y1, z1), v2(x2, y2, z2);
+
+    float maxDist = (v2 - v1).magnitude();
+
+    if (!G3D::fuzzyGt(maxDist, 0))
+        return true;
+
+    G3D::Ray r(v1, (v2 - v1) / maxDist);
+    DynamicTreeIntersectionCallback callback(phasemask);
+    impl.intersectRay(r, callback, maxDist, v2);
+
+    // search for intersect only one surface (may appears if method called for check
+    // LOS for objects, placed into other objects (cast "in GO" for example)
+    // MAY HEAVILY INCREASE CPU USAGE! /dev/rsa
+    bool result = !callback.did_hit;
+    if (!result && sWorld.getConfig(CONFIG_BOOL_DYNAMIC_VMAP_DOUBLE_CHECK))
+    {
+        Vector3 vRes1, vRes2;
+        bool ray1 = getObjectHitPos(phasemask, v1, v2, vRes1, 0.0f);
+        bool ray2 = getObjectHitPos(phasemask, v2, v1, vRes2, 0.0f);
+        if ((vRes1 - vRes2).magnitude() < M_NULL_F)
+            result = true;
+    }
+    return result;
+}
+
+float DynamicMapTree::getHeight(float x, float y, float z, float maxSearchDist, uint32 phasemask) const
+{
+    if (!size())
+        return -G3D::inf();
+
+    // Don't calculate hit position, if wrong src/dest points provided!
+    if (!VMAP::CheckPosition(x, y, z))
+        return -G3D::inf();
+
+    Vector3 v(x, y, z);
+    G3D::Ray r(v, Vector3(0, 0, -1));
+
+    DynamicTreeIntersectionCallback callback(phasemask);
+    impl.intersectZAllignedRay(r, callback, maxSearchDist);
+
+    if (callback.didHit())
+        return v.z - maxSearchDist;
+
+    return -G3D::inf();
+}
diff --git a/src/game/vmap/DynamicTree.h b/src/game/vmap/DynamicTree.h
new file mode 100644
index 00000000000..c0e5ec26c7e
--- /dev/null
+++ b/src/game/vmap/DynamicTree.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef DYNAMICMAP_TREE_H
+#define DYNAMICMAP_TREE_H
+#include "Platform/Define.h"
+namespace G3D
+{
+    class Vector3;
+    class Matrix3;
+    class AABox;
+    class Ray;
+}
+class GameObjectModel;
+
+class MANGOS_DLL_SPEC DynamicMapTree
+{
+public:
+    DynamicMapTree();
+    ~DynamicMapTree();
+
+    bool isInLineOfSight(float x1, float y1, float z1, float x2, float y2, float z2, uint32 phasemask) const;
+    bool getIntersectionTime(uint32 phasemask, const G3D::Ray& ray, const G3D::Vector3& endPos, float& maxDist) const;
+    bool getObjectHitPos(uint32 phasemask, const G3D::Vector3& pPos1, const G3D::Vector3& pPos2, G3D::Vector3& pResultHitPos, float pModifyDist) const;
+    bool getObjectHitPos(uint32 phasemask, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz,float pModifyDist) const;
+    float getHeight(float x, float y, float z, float maxSearchDist, uint32 phasemask) const;
+
+    void insert(const GameObjectModel&);
+    void remove(const GameObjectModel&);
+    bool contains(const GameObjectModel&) const;
+    int size() const;
+
+    void balance();
+    void update(uint32 diff);
+private:
+    struct DynTreeImpl& impl;
+};
+
+#endif
diff --git a/src/game/vmap/GameObjectModel.cpp b/src/game/vmap/GameObjectModel.cpp
new file mode 100644
index 00000000000..4c51c60f4bd
--- /dev/null
+++ b/src/game/vmap/GameObjectModel.cpp
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "VMapFactory.h"
+#include "VMapManager2.h"
+#include "VMapDefinitions.h"
+#include "WorldModel.h"
+
+#include "../GameObject.h"
+#include "../World.h"
+#include "GameObjectModel.h"
+#include "../DBCStores.h"
+#include "../Creature.h"
+
+struct GameobjectModelData
+{
+    GameobjectModelData(const std::string& name_, const G3D::AABox& box) :
+        name(name_), bound(box) {}
+
+    std::string name;
+    G3D::AABox bound;
+};
+
+typedef UNORDERED_MAP<uint32, GameobjectModelData> ModelList;
+ModelList model_list;
+
+void LoadGameObjectModelList()
+{
+    FILE* model_list_file = fopen((sWorld.GetDataPath() + "vmaps/" + VMAP::GAMEOBJECT_MODELS).c_str(), "rb");
+    if (!model_list_file)
+        return;
+
+    uint32 name_length, displayId;
+    char buff[500];
+    while (!feof(model_list_file))
+    {
+        fread(&displayId, sizeof(uint32), 1, model_list_file);
+        fread(&name_length, sizeof(uint32), 1, model_list_file);
+
+        if (name_length >= sizeof(buff))
+        {
+            sLog.outDebug("File %s seems to be corrupted", VMAP::GAMEOBJECT_MODELS);
+            break;
+        }
+
+        fread(&buff, sizeof(char), name_length, model_list_file);
+        Vector3 v1, v2;
+        fread(&v1, sizeof(Vector3), 1, model_list_file);
+        fread(&v2, sizeof(Vector3), 1, model_list_file);
+
+        model_list.insert(ModelList::value_type(displayId, GameobjectModelData(std::string(buff, name_length), AABox(v1, v2))));
+    }
+    fclose(model_list_file);
+}
+
+GameObjectModel::~GameObjectModel()
+{
+    if (iModel)
+        ((VMAP::VMapManager2*)VMAP::VMapFactory::createOrGetVMapManager())->releaseModelInstance(name);
+}
+
+bool GameObjectModel::initialize(const GameObject* const pGo, const GameObjectDisplayInfoEntry* const pDisplayInfo)
+{
+    ModelList::const_iterator it = model_list.find(pDisplayInfo->Displayid);
+    if (it == model_list.end())
+        return false;
+
+    G3D::AABox mdl_box(it->second.bound);
+    // ignore models with no bounds
+    if (mdl_box == G3D::AABox::zero())
+    {
+        sLog.outDebug("Model %s has zero bounds, loading skipped", it->second.name.c_str());
+        return false;
+    }
+
+    iModel = ((VMAP::VMapManager2*)VMAP::VMapFactory::createOrGetVMapManager())->acquireModelInstance(sWorld.GetDataPath() + "vmaps/", it->second.name);
+
+    if (!iModel)
+        return false;
+
+    name = it->second.name;
+    iPos = Vector3(pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ());
+    phasemask = pGo->GetPhaseMask();
+    iScale = pGo->GetObjectScale();
+    iInvScale = 1.f / iScale;
+
+    G3D::Matrix3 iRotation = G3D::Matrix3::fromEulerAnglesZYX(pGo->GetOrientation(), 0, 0);
+    iInvRot = iRotation.inverse();
+    // transform bounding box:
+    mdl_box = AABox(mdl_box.low() * iScale, mdl_box.high() * iScale);
+    AABox rotated_bounds;
+    for (int i = 0; i < 8; ++i)
+        rotated_bounds.merge(iRotation * mdl_box.corner(i));
+
+    this->iBound = rotated_bounds + iPos;
+
+#ifdef SPAWN_CORNERS
+    // test:
+    for (int i = 0; i < 8; ++i)
+    {
+        Vector3 pos(iBound.corner(i));
+        if (Creature* c = const_cast<GameObject*>(pGo)->SummonCreature(24440, pos.x, pos.y, pos.z, 0.0f, TEMPSUMMON_MANUAL_DESPAWN, 0))
+        {
+            c->setFaction(35);
+            c->SetObjectScale(0.1f);
+        }
+    }
+#endif
+
+    return true;
+}
+
+GameObjectModel* GameObjectModel::construct(const GameObject* const pGo)
+{
+    const GameObjectDisplayInfoEntry* info = sGameObjectDisplayInfoStore.LookupEntry(pGo->GetDisplayId());
+    if (!info)
+        return NULL;
+
+    GameObjectModel* mdl = new GameObjectModel();
+    if (!mdl->initialize(pGo, info))
+    {
+        delete mdl;
+        return NULL;
+    }
+
+    return mdl;
+}
+
+bool GameObjectModel::intersectRay(const G3D::Ray& ray, float& MaxDist, bool StopAtFirstHit, uint32 ph_mask) const
+{
+    if (!(phasemask & ph_mask))
+        return false;
+
+    WorldModelPtr tModel = iModel;
+    if (!tModel)
+        return false;
+
+    float time = ray.intersectionTime(iBound);
+    if (time == G3D::inf())
+        return false;
+
+    // child bounds are defined in object space:
+    Vector3 p = iInvRot * (ray.origin() - iPos) * iInvScale;
+    Ray modRay(p, iInvRot * ray.direction());
+    float distance = MaxDist * iInvScale;
+    bool hit = iModel->IntersectRay(modRay, distance, StopAtFirstHit);
+    if (hit)
+    {
+        distance *= iScale;
+        MaxDist = distance;
+    }
+    return hit;
+}
diff --git a/src/game/vmap/GameObjectModel.h b/src/game/vmap/GameObjectModel.h
new file mode 100644
index 00000000000..3cf8bccde79
--- /dev/null
+++ b/src/game/vmap/GameObjectModel.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOSSERVER_GAMEOBJECTMODEL_H
+#define MANGOSSERVER_GAMEOBJECTMODEL_H
+
+#include <G3D/Matrix3.h>
+#include <G3D/Vector3.h>
+#include <G3D/AABox.h>
+#include <G3D/Ray.h>
+#include "../DBCStructure.h"
+#include "../GameObject.h"
+#include "VMapManager2.h"
+
+#include "Platform/Define.h"
+
+class GameObjectModel
+{
+    uint32 phasemask;
+    G3D::AABox iBound;
+    G3D::Matrix3 iInvRot;
+    G3D::Vector3 iPos;
+    //G3D::Vector3 iRot;
+    float iInvScale;
+    float iScale;
+    WorldModelPtr iModel;
+
+    GameObjectModel() : phasemask(0), iModel(WorldModelPtr()) {}
+    bool initialize(const GameObject* const pGo, const GameObjectDisplayInfoEntry* info);
+
+public:
+    std::string name;
+
+    const G3D::AABox& getBounds() const { return iBound; }
+
+    ~GameObjectModel();
+
+    const G3D::Vector3& getPosition() const { return iPos;}
+
+    /**	Enables\disables collision. */
+    void disable() { phasemask = 0;}
+    void enable(uint32 ph_mask) { phasemask = ph_mask;}
+
+    bool intersectRay(const G3D::Ray& Ray, float& MaxDist, bool StopAtFirstHit, uint32 ph_mask) const;
+
+    static GameObjectModel* construct(const GameObject* const pGo);
+};
+#endif
diff --git a/src/game/vmap/IVMapManager.h b/src/game/vmap/IVMapManager.h
index 793f010fd89..71c17760c85 100644
--- a/src/game/vmap/IVMapManager.h
+++ b/src/game/vmap/IVMapManager.h
@@ -38,8 +38,8 @@ namespace VMAP
         VMAP_LOAD_RESULT_IGNORED,
     };
 
-    #define VMAP_INVALID_HEIGHT       -100000.0f            // for check
-    #define VMAP_INVALID_HEIGHT_VALUE -200000.0f            // real assigned value in unknown height case
+#define VMAP_INVALID_HEIGHT       -100000.0f            // for check
+#define VMAP_INVALID_HEIGHT_VALUE -200000.0f            // real assigned value in unknown height case
 
     //===========================================================
     class IVMapManager
@@ -66,11 +66,11 @@ namespace VMAP
             test if we hit an object. return true if we hit one. rx,ry,rz will hold the hit position or the dest position, if no intersection was found
             return a position, that is pReduceDist closer to the origin
             */
-            virtual bool getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float pModifyDist) = 0;
+            virtual bool getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float pModifyDist) = 0;
             /**
             send debug commands
             */
-            virtual bool processCommand(char *pCommand)= 0;
+            virtual bool processCommand(char* pCommand) = 0;
 
             /**
             Enable/disable LOS calculation
@@ -83,17 +83,17 @@ namespace VMAP
             */
             void setEnableHeightCalc(bool pVal) { iEnableHeightCalc = pVal; }
 
-            bool isLineOfSightCalcEnabled() const { return(iEnableLineOfSightCalc); }
-            bool isHeightCalcEnabled() const { return(iEnableHeightCalc); }
-            bool isMapLoadingEnabled() const { return(iEnableLineOfSightCalc || iEnableHeightCalc  ); }
+            bool isLineOfSightCalcEnabled() const { return iEnableLineOfSightCalc; }
+            bool isHeightCalcEnabled() const { return iEnableHeightCalc; }
+            bool isMapLoadingEnabled() const { return iEnableLineOfSightCalc || iEnableHeightCalc; }
 
-            virtual std::string getDirFileName(unsigned int pMapId, int x, int y) const =0;
+            virtual std::string getDirFileName(unsigned int pMapId, int x, int y) const = 0;
             /**
             Query world model area info.
             \param z gets adjusted to the ground height for which this are info is valid
             */
-            virtual bool getAreaInfo(unsigned int pMapId, float x, float y, float &z, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const=0;
-            virtual bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float &level, float &floor, uint32 &type) const=0;
+            virtual bool getAreaInfo(unsigned int pMapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const = 0;
+            virtual bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float& level, float& floor, uint32& type) const = 0;
     };
 
 }
diff --git a/src/game/vmap/MapTree.cpp b/src/game/vmap/MapTree.cpp
index a88d2fb62a5..b89ecd11ef4 100644
--- a/src/game/vmap/MapTree.cpp
+++ b/src/game/vmap/MapTree.cpp
@@ -30,28 +30,27 @@ using G3D::Vector3;
 
 namespace VMAP
 {
-
     class MapRayCallback
     {
         public:
-            MapRayCallback(ModelInstance *val): prims(val), hit(false) {}
-            bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit=true)
+            MapRayCallback(ModelInstance* val): prims(val), hit(false) {}
+            bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit = true)
             {
                 bool result = prims[entry].intersectRay(ray, distance, pStopAtFirstHit);
                 if (result)
                     hit = true;
                 return result;
             }
-            bool didHit(){ return hit; }
+            bool didHit() { return hit; }
         protected:
-            ModelInstance *prims;
+            ModelInstance* prims;
             bool hit;
     };
 
     class AreaInfoCallback
     {
         public:
-            AreaInfoCallback(ModelInstance *val): prims(val) {}
+            AreaInfoCallback(ModelInstance* val): prims(val) {}
             void operator()(const Vector3& point, uint32 entry)
             {
 #ifdef VMAP_DEBUG
@@ -60,14 +59,14 @@ namespace VMAP
                 prims[entry].intersectPoint(point, aInfo);
             }
 
-            ModelInstance *prims;
+            ModelInstance* prims;
             AreaInfo aInfo;
     };
 
     class LocationInfoCallback
     {
         public:
-            LocationInfoCallback(ModelInstance *val, LocationInfo &info): prims(val), locInfo(info), result(false) {}
+            LocationInfoCallback(ModelInstance* val, LocationInfo& info): prims(val), locInfo(info), result(false) {}
             void operator()(const Vector3& point, uint32 entry)
             {
 #ifdef VMAP_DEBUG
@@ -77,8 +76,8 @@ namespace VMAP
                     result = true;
             }
 
-            ModelInstance *prims;
-            LocationInfo &locInfo;
+            ModelInstance* prims;
+            LocationInfo& locInfo;
             bool result;
     };
 
@@ -90,12 +89,12 @@ namespace VMAP
         std::stringstream tilefilename;
         tilefilename.fill('0');
         tilefilename << std::setw(3) << mapID << "_";
-        //tilefilename << std::setw(2) << tileX << "_" << std::setw(2) << tileY << ".vmtile";
+        // tilefilename << std::setw(2) << tileX << "_" << std::setw(2) << tileY << ".vmtile";
         tilefilename << std::setw(2) << tileY << "_" << std::setw(2) << tileX << ".vmtile";
         return tilefilename.str();
     }
 
-    bool StaticMapTree::getAreaInfo(Vector3 &pos, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const
+    bool StaticMapTree::getAreaInfo(Vector3& pos, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const
     {
         AreaInfoCallback intersectionCallBack(iTreeValues);
         iTree.intersectPoint(pos, intersectionCallBack);
@@ -111,18 +110,20 @@ namespace VMAP
         return false;
     }
 
-    bool StaticMapTree::GetLocationInfo(const Vector3 &pos, LocationInfo &info) const
+    bool StaticMapTree::GetLocationInfo(const Vector3& pos, LocationInfo& info) const
     {
         LocationInfoCallback intersectionCallBack(iTreeValues, info);
         iTree.intersectPoint(pos, intersectionCallBack);
         return intersectionCallBack.result;
     }
 
-    StaticMapTree::StaticMapTree(uint32 mapID, const std::string &basePath):
+    StaticMapTree::StaticMapTree(uint32 mapID, const std::string& basePath):
         iMapID(mapID), iTreeValues(0), iBasePath(basePath)
     {
-        if (iBasePath.length() > 0 && (iBasePath[iBasePath.length()-1] != '/' && iBasePath[iBasePath.length()-1] != '\\'))
+        if (iBasePath.length() > 0 && (iBasePath[iBasePath.length() - 1] != '/' && iBasePath[iBasePath.length() - 1] != '\\'))
             iBasePath.append("/");
+        iLoadedTiles.clear();
+        iLoadedSpawns.clear();
     }
 
     //=========================================================
@@ -138,7 +139,7 @@ namespace VMAP
     Else, pMaxDist is not modified and returns false;
     */
 
-    bool StaticMapTree::getIntersectionTime(const G3D::Ray& pRay, float &pMaxDist, bool pStopAtFirstHit) const
+    bool StaticMapTree::getIntersectionTime(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const
     {
         float distance = pMaxDist;
         MapRayCallback intersectionCallBack(iTreeValues);
@@ -158,7 +159,7 @@ namespace VMAP
         if (maxDist < 1e-10f)
             return true;
         // direction with length of 1
-        G3D::Ray ray = G3D::Ray::fromOriginAndDirection(pos1, (pos2 - pos1)/maxDist);
+        G3D::Ray ray = G3D::Ray::fromOriginAndDirection(pos1, (pos2 - pos1) / maxDist);
         if (getIntersectionTime(ray, maxDist, true))
             return false;
 
@@ -172,7 +173,7 @@ namespace VMAP
 
     bool StaticMapTree::getObjectHitPos(const Vector3& pPos1, const Vector3& pPos2, Vector3& pResultHitPos, float pModifyDist) const
     {
-        bool result=false;
+        bool result = false;
         float maxDist = (pPos2 - pPos1).magnitude();
         // valid map coords should *never ever* produce float overflow, but this would produce NaNs too:
         MANGOS_ASSERT(maxDist < std::numeric_limits<float>::max());
@@ -182,7 +183,7 @@ namespace VMAP
             pResultHitPos = pPos2;
             return false;
         }
-        Vector3 dir = (pPos2 - pPos1)/maxDist;              // direction with length of 1
+        Vector3 dir = (pPos2 - pPos1) / maxDist;            // direction with length of 1
         G3D::Ray ray(pPos1, dir);
         float dist = maxDist;
         if (getIntersectionTime(ray, dist, false))
@@ -192,7 +193,7 @@ namespace VMAP
             {
                 if ((pResultHitPos - pPos1).magnitude() > -pModifyDist)
                 {
-                    pResultHitPos = pResultHitPos + dir*pModifyDist;
+                    pResultHitPos = pResultHitPos + dir * pModifyDist;
                 }
                 else
                 {
@@ -201,7 +202,7 @@ namespace VMAP
             }
             else
             {
-                pResultHitPos = pResultHitPos + dir*pModifyDist;
+                pResultHitPos = pResultHitPos + dir * pModifyDist;
             }
             result = true;
         }
@@ -218,26 +219,26 @@ namespace VMAP
     float StaticMapTree::getHeight(const Vector3& pPos, float maxSearchDist) const
     {
         float height = G3D::inf();
-        Vector3 dir = Vector3(0,0,-1);
+        Vector3 dir = Vector3(0, 0, -1);
         G3D::Ray ray(pPos, dir);   // direction with length of 1
         float maxDist = maxSearchDist;
         if (getIntersectionTime(ray, maxDist, false))
         {
             height = pPos.z - maxDist;
         }
-        return(height);
+        return height;
     }
 
     //=========================================================
 
-    bool StaticMapTree::CanLoadMap(const std::string &vmapPath, uint32 mapID, uint32 tileX, uint32 tileY)
+    bool StaticMapTree::CanLoadMap(const std::string& vmapPath, uint32 mapID, uint32 tileX, uint32 tileY)
     {
         std::string basePath = vmapPath;
-        if (basePath.length() > 0 && (basePath[basePath.length()-1] != '/' && basePath[basePath.length()-1] != '\\'))
+        if (basePath.length() > 0 && (basePath[basePath.length() - 1] != '/' && basePath[basePath.length() - 1] != '\\'))
             basePath.append("/");
         std::string fullname = basePath + VMapManager2::getMapFileName(mapID);
         bool success = true;
-        FILE *rf = fopen(fullname.c_str(), "rb");
+        FILE* rf = fopen(fullname.c_str(), "rb");
         if (!rf)
             return false;
         // TODO: check magic number when implemented...
@@ -267,42 +268,53 @@ namespace VMAP
 
     //=========================================================
 
-    bool StaticMapTree::InitMap(const std::string &fname, VMapManager2 *vm)
+    bool StaticMapTree::InitMap(const std::string& fname, VMapManager2* vm)
     {
-        DEBUG_LOG("Initializing StaticMapTree '%s'", fname.c_str());
+        DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "Initializing StaticMapTree '%s'", fname.c_str());
         bool success = true;
         std::string fullname = iBasePath + fname;
-        FILE *rf = fopen(fullname.c_str(), "rb");
+        FILE* rf = fopen(fullname.c_str(), "rb");
         if (!rf)
             return false;
         else
         {
             char chunk[8];
-            //general info
-            if (!readChunk(rf, chunk, VMAP_MAGIC, 8)) success = false;
-            char tiled;
-            if (success && fread(&tiled, sizeof(char), 1, rf) != 1) success = false;
+            // general info
+            if (!readChunk(rf, chunk, VMAP_MAGIC, 8))
+                success = false;
+
+            char tiled = 0;
+            if (success && fread(&tiled, sizeof(char), 1, rf) != 1)
+                success = false;
+
             iIsTiled = bool(tiled);
+
             // Nodes
-            if (success && !readChunk(rf, chunk, "NODE", 4)) success = false;
-            if (success) success = iTree.readFromFile(rf);
+            if (success && !readChunk(rf, chunk, "NODE", 4))
+                success = false;
+
+            if (success)
+                success = iTree.readFromFile(rf);
+
             if (success)
             {
                 iNTreeValues = iTree.primCount();
                 iTreeValues = new ModelInstance[iNTreeValues];
             }
 
-            if (success && !readChunk(rf, chunk, "GOBJ", 4)) success = false;
+            if (success && !readChunk(rf, chunk, "GOBJ", 4))
+                success = false;
+
             // global model spawns
             // only non-tiled maps have them, and if so exactly one (so far at least...)
             ModelSpawn spawn;
 #ifdef VMAP_DEBUG
             DEBUG_LOG("Map isTiled: %u", static_cast<uint32>(iIsTiled));
 #endif
-            if (!iIsTiled && ModelSpawn::readFromFile(rf, spawn))
+            if (success && !iIsTiled && ModelSpawn::readFromFile(rf, spawn))
             {
-                WorldModel *model = vm->acquireModelInstance(iBasePath, spawn.name);
-                DEBUG_LOG("StaticMapTree::InitMap(): loading %s", spawn.name.c_str());
+                WorldModelPtr model = vm->acquireModelInstance(iBasePath, spawn.name);
+                DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "StaticMapTree::InitMap(): loading %s", spawn.name.c_str());
                 if (model)
                 {
                     // assume that global model always is the first and only tree value (could be improved...)
@@ -311,6 +323,9 @@ namespace VMAP
                 }
                 else
                 {
+                    delete[] iTreeValues;
+                    iTreeValues = NULL;
+
                     success = false;
                     ERROR_LOG("StaticMapTree::InitMap() could not acquire WorldModel pointer for '%s'!", spawn.name.c_str());
                 }
@@ -323,7 +338,7 @@ namespace VMAP
 
     //=========================================================
 
-    void StaticMapTree::UnloadMap(VMapManager2 *vm)
+    void StaticMapTree::UnloadMap(VMapManager2* vm)
     {
         for (loadedSpawnMap::iterator i = iLoadedSpawns.begin(); i != iLoadedSpawns.end(); ++i)
         {
@@ -337,7 +352,7 @@ namespace VMAP
 
     //=========================================================
 
-    bool StaticMapTree::LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm)
+    bool StaticMapTree::LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm)
     {
         if (!iIsTiled)
         {
@@ -360,10 +375,10 @@ namespace VMAP
             char chunk[8];
             if (!readChunk(tf, chunk, VMAP_MAGIC, 8))
                 result = false;
-            uint32 numSpawns;
+            uint32 numSpawns = 0;
             if (result && fread(&numSpawns, sizeof(uint32), 1, tf) != 1)
                 result = false;
-            for (uint32 i=0; i<numSpawns && result; ++i)
+            for (uint32 i = 0; i < numSpawns && result; ++i)
             {
                 // read model spawns
                 ModelSpawn spawn;
@@ -371,7 +386,7 @@ namespace VMAP
                 if (result)
                 {
                     // acquire model instance
-                    WorldModel *model = vm->acquireModelInstance(iBasePath, spawn.name);
+                    WorldModelPtr model = vm->acquireModelInstance(iBasePath, spawn.name);
                     if (!model)
                         ERROR_LOG("StaticMapTree::LoadMapTile() could not acquire WorldModel pointer for '%s'!", spawn.name.c_str());
 
@@ -413,7 +428,7 @@ namespace VMAP
 
     //=========================================================
 
-    void StaticMapTree::UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm)
+    void StaticMapTree::UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm)
     {
         uint32 tileID = packTileID(tileX, tileY);
         loadedTileMap::iterator tile = iLoadedTiles.find(tileID);
@@ -428,14 +443,14 @@ namespace VMAP
             FILE* tf = fopen(tilefile.c_str(), "rb");
             if (tf)
             {
-                bool result=true;
+                bool result = true;
                 char chunk[8];
                 if (!readChunk(tf, chunk, VMAP_MAGIC, 8))
                     result = false;
                 uint32 numSpawns;
                 if (fread(&numSpawns, sizeof(uint32), 1, tf) != 1)
                     result = false;
-                for (uint32 i=0; i<numSpawns && result; ++i)
+                for (uint32 i = 0; i < numSpawns && result; ++i)
                 {
                     // read model spawns
                     ModelSpawn spawn;
@@ -449,7 +464,7 @@ namespace VMAP
                         uint32 referencedNode;
 
                         fread(&referencedNode, sizeof(uint32), 1, tf);
-                        if (!iLoadedSpawns.count(referencedNode))
+                        if (iLoadedSpawns.empty() || iLoadedSpawns.count(referencedNode) == 0)
                         {
                             ERROR_LOG("Trying to unload non-referenced model '%s' (ID:%u)", spawn.name.c_str(), spawn.ID);
                         }
diff --git a/src/game/vmap/MapTree.h b/src/game/vmap/MapTree.h
index 661504d0b74..69775b8fed2 100644
--- a/src/game/vmap/MapTree.h
+++ b/src/game/vmap/MapTree.h
@@ -32,20 +32,20 @@ namespace VMAP
     struct LocationInfo
     {
         LocationInfo(): hitInstance(0), hitModel(0), ground_Z(-G3D::inf()) {};
-        const ModelInstance *hitInstance;
-        const GroupModel *hitModel;
+        const ModelInstance* hitInstance;
+        const GroupModel* hitModel;
         float ground_Z;
     };
 
     class StaticMapTree
     {
-        typedef UNORDERED_MAP<uint32, bool> loadedTileMap;
-        typedef UNORDERED_MAP<uint32, uint32> loadedSpawnMap;
+            typedef UNORDERED_MAP<uint32, bool> loadedTileMap;
+            typedef UNORDERED_MAP<uint32, uint32> loadedSpawnMap;
         private:
             uint32 iMapID;
             bool iIsTiled;
             BIH iTree;
-            ModelInstance *iTreeValues; // the tree entries
+            ModelInstance* iTreeValues; // the tree entries
             uint32 iNTreeValues;
 
             // Store all the map tile idents that are loaded for that map
@@ -57,33 +57,33 @@ namespace VMAP
             std::string iBasePath;
 
         private:
-            bool getIntersectionTime(const G3D::Ray& pRay, float &pMaxDist, bool pStopAtFirstHit) const;
-            //bool containsLoadedMapTile(unsigned int pTileIdent) const { return(iLoadedMapTiles.containsKey(pTileIdent)); }
+            bool getIntersectionTime(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const;
+            // bool containsLoadedMapTile(unsigned int pTileIdent) const { return(iLoadedMapTiles.containsKey(pTileIdent)); }
         public:
             static std::string getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY);
-            static uint32 packTileID(uint32 tileX, uint32 tileY) { return tileX<<16 | tileY; }
-            static void unpackTileID(uint32 ID, uint32 &tileX, uint32 &tileY) { tileX = ID>>16; tileY = ID&0xFF; }
-            static bool CanLoadMap(const std::string &basePath, uint32 mapID, uint32 tileX, uint32 tileY);
+            static uint32 packTileID(uint32 tileX, uint32 tileY) { return tileX << 16 | tileY; }
+            static void unpackTileID(uint32 ID, uint32& tileX, uint32& tileY) { tileX = ID >> 16; tileY = ID & 0xFF; }
+            static bool CanLoadMap(const std::string& basePath, uint32 mapID, uint32 tileX, uint32 tileY);
 
-            StaticMapTree(uint32 mapID, const std::string &basePath);
+            StaticMapTree(uint32 mapID, const std::string& basePath);
             ~StaticMapTree();
 
             bool isInLineOfSight(const G3D::Vector3& pos1, const G3D::Vector3& pos2) const;
             bool getObjectHitPos(const G3D::Vector3& pos1, const G3D::Vector3& pos2, G3D::Vector3& pResultHitPos, float pModifyDist) const;
             float getHeight(const G3D::Vector3& pPos, float maxSearchDist) const;
-            bool getAreaInfo(G3D::Vector3 &pos, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const;
-            bool GetLocationInfo(const Vector3 &pos, LocationInfo &info) const;
+            bool getAreaInfo(G3D::Vector3& pos, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const;
+            bool GetLocationInfo(const Vector3& pos, LocationInfo& info) const;
 
-            bool InitMap(const std::string &fname, VMapManager2 *vm);
-            void UnloadMap(VMapManager2 *vm);
-            bool LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm);
-            void UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm);
+            bool InitMap(const std::string& fname, VMapManager2* vm);
+            void UnloadMap(VMapManager2* vm);
+            bool LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm);
+            void UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm);
             bool isTiled() const { return iIsTiled; }
             uint32 numLoadedTiles() const { return iLoadedTiles.size(); }
 
 #ifdef MMAP_GENERATOR
         public:
-            void getModelInstances(ModelInstance* &models, uint32 &count);
+            void getModelInstances(ModelInstance*& models, uint32& count);
 #endif
     };
 
diff --git a/src/game/vmap/ModelInstance.cpp b/src/game/vmap/ModelInstance.cpp
index 33889c06900..588c967736a 100644
--- a/src/game/vmap/ModelInstance.cpp
+++ b/src/game/vmap/ModelInstance.cpp
@@ -26,10 +26,10 @@ using G3D::Ray;
 
 namespace VMAP
 {
-    ModelInstance::ModelInstance(const ModelSpawn &spawn, WorldModel *model): ModelSpawn(spawn), iModel(model)
+    ModelInstance::ModelInstance(const ModelSpawn& spawn, WorldModelPtr model): ModelSpawn(spawn), iModel(model)
     {
-        iInvRot = G3D::Matrix3::fromEulerAnglesZYX(G3D::pi()*iRot.y/180.f, G3D::pi()*iRot.x/180.f, G3D::pi()*iRot.z/180.f).inverse();
-        iInvScale = 1.f/iScale;
+        iInvRot = G3D::Matrix3::fromEulerAnglesZYX(G3D::pi() * iRot.y / 180.f, G3D::pi() * iRot.x / 180.f, G3D::pi() * iRot.z / 180.f).inverse();
+        iInvScale = 1.f / iScale;
     }
 
     bool ModelInstance::intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const
@@ -54,7 +54,7 @@ namespace VMAP
         Ray modRay(p, iInvRot * pRay.direction());
         float distance = pMaxDist * iInvScale;
         bool hit = iModel->IntersectRay(modRay, distance, pStopAtFirstHit);
-        if(hit)
+        if (hit)
         {
             distance *= iScale;
             pMaxDist = distance;
@@ -62,7 +62,7 @@ namespace VMAP
         return hit;
     }
 
-    void ModelInstance::intersectPoint(const G3D::Vector3& p, AreaInfo &info) const
+    void ModelInstance::intersectPoint(const G3D::Vector3& p, AreaInfo& info) const
     {
         if (!iModel)
         {
@@ -96,7 +96,7 @@ namespace VMAP
         }
     }
 
-    bool ModelInstance::GetLocationInfo(const G3D::Vector3& p, LocationInfo &info) const
+    bool ModelInstance::GetLocationInfo(const G3D::Vector3& p, LocationInfo& info) const
     {
         if (!iModel)
         {
@@ -132,11 +132,11 @@ namespace VMAP
         return false;
     }
 
-    bool ModelInstance::GetLiquidLevel(const G3D::Vector3& p, LocationInfo &info, float &liqHeight) const
+    bool ModelInstance::GetLiquidLevel(const G3D::Vector3& p, LocationInfo& info, float& liqHeight) const
     {
         // child bounds are defined in object space:
         Vector3 pModel = iInvRot * (p - iPos) * iInvScale;
-        //Vector3 zDirModel = iInvRot * Vector3(0.f, 0.f, -1.f);
+        // Vector3 zDirModel = iInvRot * Vector3(0.f, 0.f, -1.f);
         float zLevel;
         if (info.hitModel->GetLiquidLevel(pModel, zLevel))
         {
@@ -150,9 +150,9 @@ namespace VMAP
         return false;
     }
 
-    bool ModelSpawn::readFromFile(FILE *rf, ModelSpawn &spawn)
+    bool ModelSpawn::readFromFile(FILE* rf, ModelSpawn& spawn)
     {
-        uint32 check=0, nameLen;
+        uint32 check = 0, nameLen;
         check += fread(&spawn.flags, sizeof(uint32), 1, rf);
         // EoF?
         if (!check)
@@ -175,13 +175,13 @@ namespace VMAP
             spawn.iBound = G3D::AABox(bLow, bHigh);
         }
         check += fread(&nameLen, sizeof(uint32), 1, rf);
-        if(check != (has_bound ? 17 : 11))
+        if (check != uint32(has_bound ? 17 : 11))
         {
             ERROR_LOG("Error reading ModelSpawn!");
             return false;
         }
         char nameBuff[500];
-        if (nameLen>500) // file names should never be that long, must be file error
+        if (nameLen > 500) // file names should never be that long, must be file error
         {
             ERROR_LOG("Error reading ModelSpawn, file name too long!");
             return false;
@@ -196,9 +196,9 @@ namespace VMAP
         return true;
     }
 
-    bool ModelSpawn::writeToFile(FILE *wf, const ModelSpawn &spawn)
+    bool ModelSpawn::writeToFile(FILE* wf, const ModelSpawn& spawn)
     {
-        uint32 check=0;
+        uint32 check = 0;
         check += fwrite(&spawn.flags, sizeof(uint32), 1, wf);
         check += fwrite(&spawn.adtId, sizeof(uint16), 1, wf);
         check += fwrite(&spawn.ID, sizeof(uint32), 1, wf);
@@ -206,16 +206,16 @@ namespace VMAP
         check += fwrite(&spawn.iRot, sizeof(float), 3, wf);
         check += fwrite(&spawn.iScale, sizeof(float), 1, wf);
         bool has_bound = (spawn.flags & MOD_HAS_BOUND);
-        if(has_bound) // only WMOs have bound in MPQ, only available after computation
+        if (has_bound) // only WMOs have bound in MPQ, only available after computation
         {
             check += fwrite(&spawn.iBound.low(), sizeof(float), 3, wf);
             check += fwrite(&spawn.iBound.high(), sizeof(float), 3, wf);
         }
         uint32 nameLen = spawn.name.length();
         check += fwrite(&nameLen, sizeof(uint32), 1, wf);
-        if(check != (has_bound ? 17 : 11)) return false;
+        if (check != uint32(has_bound ? 17 : 11)) return false;
         check = fwrite(spawn.name.c_str(), sizeof(char), nameLen, wf);
-        if(check != nameLen) return false;
+        if (check != nameLen) return false;
         return true;
     }
 
diff --git a/src/game/vmap/ModelInstance.h b/src/game/vmap/ModelInstance.h
index 6c9ea6fc105..8de4b5f41b3 100644
--- a/src/game/vmap/ModelInstance.h
+++ b/src/game/vmap/ModelInstance.h
@@ -24,6 +24,8 @@
 #include <G3D/AABox.h>
 #include <G3D/Ray.h>
 
+#include "VMapManager2.h"
+
 #include "Platform/Define.h"
 
 namespace VMAP
@@ -35,14 +37,14 @@ namespace VMAP
     enum ModelFlags
     {
         MOD_M2 = 1,
-        MOD_WORLDSPAWN = 1<<1,
-        MOD_HAS_BOUND = 1<<2
+        MOD_WORLDSPAWN = 1 << 1,
+        MOD_HAS_BOUND = 1 << 2
     };
 
     class ModelSpawn
     {
         public:
-            //mapID, tileX, tileY, Flags, ID, Pos, Rot, Scale, Bound_lo, Bound_hi, name
+            // mapID, tileX, tileY, Flags, ID, Pos, Rot, Scale, Bound_lo, Bound_hi, name
             uint32 flags;
             uint16 adtId;
             uint32 ID;
@@ -51,30 +53,30 @@ namespace VMAP
             float iScale;
             G3D::AABox iBound;
             std::string name;
-            bool operator==(const ModelSpawn &other) const { return ID == other.ID; }
-            //uint32 hashCode() const { return ID; }
+            bool operator==(const ModelSpawn& other) const { return ID == other.ID; }
+            // uint32 hashCode() const { return ID; }
             // temp?
             const G3D::AABox& getBounds() const { return iBound; }
 
 
-            static bool readFromFile(FILE *rf, ModelSpawn &spawn);
-            static bool writeToFile(FILE *rw, const ModelSpawn &spawn);
+            static bool readFromFile(FILE* rf, ModelSpawn& spawn);
+            static bool writeToFile(FILE* rw, const ModelSpawn& spawn);
     };
 
     class ModelInstance: public ModelSpawn
     {
         public:
-            ModelInstance(): iModel(0) {}
-            ModelInstance(const ModelSpawn &spawn, WorldModel *model);
-            void setUnloaded() { iModel = 0; }
+            ModelInstance(): iModel(WorldModelPtr()) {}
+            ModelInstance(const ModelSpawn& spawn, WorldModelPtr model);
+            void setUnloaded() { iModel = WorldModelPtr(); }
             bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const;
-            void intersectPoint(const G3D::Vector3& p, AreaInfo &info) const;
-            bool GetLocationInfo(const G3D::Vector3& p, LocationInfo &info) const;
-            bool GetLiquidLevel(const G3D::Vector3& p, LocationInfo &info, float &liqHeight) const;
+            void intersectPoint(const G3D::Vector3& p, AreaInfo& info) const;
+            bool GetLocationInfo(const G3D::Vector3& p, LocationInfo& info) const;
+            bool GetLiquidLevel(const G3D::Vector3& p, LocationInfo& info, float& liqHeight) const;
         protected:
             G3D::Matrix3 iInvRot;
             float iInvScale;
-            WorldModel *iModel;
+            WorldModelPtr iModel;
 
 #ifdef MMAP_GENERATOR
         public:
diff --git a/src/game/vmap/RegularGrid.h b/src/game/vmap/RegularGrid.h
new file mode 100644
index 00000000000..206bccf5b6b
--- /dev/null
+++ b/src/game/vmap/RegularGrid.h
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) Continued-MaNGOS Project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _REGULAR_GRID_H
+#define _REGULAR_GRID_H
+
+
+#include <G3D/Ray.h>
+#include <G3D/AABox.h>
+#include <G3D/Table.h>
+#include <G3D/BoundsTrait.h>
+#include <G3D/PositionTrait.h>
+
+#include "Errors.h"
+
+using G3D::Vector2;
+using G3D::Vector3;
+using G3D::AABox;
+using G3D::Ray;
+
+template<class Node>
+struct NodeCreator
+{
+    static Node* makeNode(int /*x*/, int /*y*/) { return new Node();}
+};
+
+template < class T,
+         class Node,
+         class NodeCreatorFunc = NodeCreator<Node>,
+         /*class BoundsFunc = BoundsTrait<T>,*/
+         class PositionFunc = PositionTrait<T>
+         >
+class RegularGrid2D
+{
+    public:
+
+        enum
+        {
+            CELL_NUMBER = 64,
+        };
+
+#define HGRID_MAP_SIZE  (533.33333f * 64.f)     // shouldn't be changed
+#define CELL_SIZE       float(HGRID_MAP_SIZE / (float)CELL_NUMBER)
+
+        typedef G3D::Table<const T*, Node*> MemberTable;
+
+        MemberTable memberTable;
+        Node* nodes[CELL_NUMBER][CELL_NUMBER];
+
+        RegularGrid2D()
+        {
+            memset(nodes, 0, sizeof(nodes));
+        }
+
+        ~RegularGrid2D()
+        {
+            for (int x = 0; x < CELL_NUMBER; ++x)
+                for (int y = 0; y < CELL_NUMBER; ++y)
+                    delete nodes[x][y];
+        }
+
+        void insert(const T& value)
+        {
+            Vector3 pos;
+            PositionFunc::getPosition(value, pos);
+            Node& node = getGridFor(pos.x, pos.y);
+            node.insert(value);
+            memberTable.set(&value, &node);
+        }
+
+        void remove(const T& value)
+        {
+            memberTable[&value]->remove(value);
+            // Remove the member
+            memberTable.remove(&value);
+        }
+
+        void balance()
+        {
+            for (int x = 0; x < CELL_NUMBER; ++x)
+                for (int y = 0; y < CELL_NUMBER; ++y)
+                    if (Node* n = nodes[x][y])
+                        n->balance();
+        }
+
+        bool contains(const T& value) const { return memberTable.containsKey(&value); }
+        int size() const { return memberTable.size(); }
+
+        struct Cell
+        {
+            int x, y;
+            bool operator == (const Cell& c2) const { return x == c2.x && y == c2.y;}
+
+            static Cell ComputeCell(float fx, float fy)
+            {
+                Cell c = {int(fx * (1.f/CELL_SIZE) + ((float)CELL_NUMBER/2.0f)), int(fy * (1.f/CELL_SIZE) + ((float)CELL_NUMBER/2.0f))};
+                return c;
+            }
+
+            bool isValid() const { return x >= 0 && x < CELL_NUMBER && y >= 0 && y < CELL_NUMBER;}
+        };
+
+        Node& getGridFor(float fx, float fy)
+        {
+            Cell c = Cell::ComputeCell(fx, fy);
+            return getGrid(c.x, c.y);
+        }
+
+        Node& getGrid(int x, int y)
+        {
+            MANGOS_ASSERT(x < CELL_NUMBER && y < CELL_NUMBER);
+            if (!nodes[x][y])
+                nodes[x][y] = NodeCreatorFunc::makeNode(x, y);
+            return *nodes[x][y];
+        }
+
+        template<typename RayCallback>
+        void intersectRay(const Ray& ray, RayCallback& intersectCallback, float max_dist)
+        {
+            intersectRay(ray, intersectCallback, max_dist, ray.origin() + ray.direction() * max_dist);
+        }
+
+        template<typename RayCallback>
+        void intersectRay(const Ray& ray, RayCallback& intersectCallback, float& max_dist, const Vector3& end)
+        {
+            Cell cell = Cell::ComputeCell(ray.origin().x, ray.origin().y);
+            if (!cell.isValid())
+                return;
+
+            Cell last_cell = Cell::ComputeCell(end.x, end.y);
+
+            if (cell == last_cell)
+            {
+                if (Node* node = nodes[cell.x][cell.y])
+                    node->intersectRay(ray, intersectCallback, max_dist);
+                return;
+            }
+
+            float voxel = (float)CELL_SIZE;
+            float kx_inv = ray.invDirection().x, bx = ray.origin().x;
+            float ky_inv = ray.invDirection().y, by = ray.origin().y;
+
+            int stepX, stepY;
+            float tMaxX, tMaxY;
+            if (kx_inv >= 0)
+            {
+                stepX = 1;
+                float x_border = (cell.x + 1) * voxel;
+                tMaxX = (x_border - bx) * kx_inv;
+            }
+            else
+            {
+                stepX = -1;
+                float x_border = (cell.x - 1) * voxel;
+                tMaxX = (x_border - bx) * kx_inv;
+            }
+
+            if (ky_inv >= 0)
+            {
+                stepY = 1;
+                float y_border = (cell.y + 1) * voxel;
+                tMaxY = (y_border - by) * ky_inv;
+            }
+            else
+            {
+                stepY = -1;
+                float y_border = (cell.y - 1) * voxel;
+                tMaxY = (y_border - by) * ky_inv;
+            }
+
+            //int Cycles = std::max((int)ceilf(max_dist/tMaxX),(int)ceilf(max_dist/tMaxY));
+            //int i = 0;
+
+            float tDeltaX = voxel * fabs(kx_inv);
+            float tDeltaY = voxel * fabs(ky_inv);
+            do
+            {
+                if (Node* node = nodes[cell.x][cell.y])
+                {
+                    //float enterdist = max_dist;
+                    node->intersectRay(ray, intersectCallback, max_dist);
+                }
+                if (cell == last_cell)
+                    break;
+                if (tMaxX < tMaxY)
+                {
+                    tMaxX += tDeltaX;
+                    cell.x += stepX;
+                }
+                else
+                {
+                    tMaxY += tDeltaY;
+                    cell.y += stepY;
+                }
+                //++i;
+            }
+            while (cell.isValid());
+        }
+
+        template<typename IsectCallback>
+        void intersectPoint(const Vector3& point, IsectCallback& intersectCallback)
+        {
+            Cell cell = Cell::ComputeCell(point.x, point.y);
+            if (!cell.isValid())
+                return;
+            if (Node* node = nodes[cell.x][cell.y])
+                node->intersectPoint(point, intersectCallback);
+        }
+
+        // Optimized verson of intersectRay function for rays with vertical directions
+        template<typename RayCallback>
+        void intersectZAllignedRay(const Ray& ray, RayCallback& intersectCallback, float& max_dist)
+        {
+            Cell cell = Cell::ComputeCell(ray.origin().x, ray.origin().y);
+            if (!cell.isValid())
+                return;
+            if (Node* node = nodes[cell.x][cell.y])
+                node->intersectRay(ray, intersectCallback, max_dist);
+        }
+};
+
+#undef CELL_SIZE
+#undef HGRID_MAP_SIZE
+
+#endif
diff --git a/src/game/vmap/TileAssembler.cpp b/src/game/vmap/TileAssembler.cpp
index 8acf0d25fa9..be57a1ab134 100644
--- a/src/game/vmap/TileAssembler.cpp
+++ b/src/game/vmap/TileAssembler.cpp
@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "WorldModel.h"
 #include "TileAssembler.h"
 #include "MapTree.h"
 #include "BIH.h"
@@ -34,12 +33,12 @@ using std::pair;
 
 template<> struct BoundsTrait<VMAP::ModelSpawn*>
 {
-    static void getBounds(const VMAP::ModelSpawn* const &obj, G3D::AABox& out) { out = obj->getBounds(); }
+    static void getBounds(const VMAP::ModelSpawn* const& obj, G3D::AABox& out) { out = obj->getBounds(); }
 };
 
 namespace VMAP
 {
-    bool readChunk(FILE *rf, char *dest, const char *compare, uint32 len)
+    bool readChunk(FILE* rf, char* dest, const char* compare, uint32 len)
     {
         if (fread(dest, sizeof(char), len, rf) != len) return false;
         return memcmp(dest, compare, len) == 0;
@@ -49,7 +48,7 @@ namespace VMAP
     {
         Vector3 out = pIn * iScale;
         out = iRotation * out;
-        return(out);
+        return out;
     }
 
     //=================================================================
@@ -60,18 +59,17 @@ namespace VMAP
         iFilterMethod = NULL;
         iSrcDir = pSrcDirName;
         iDestDir = pDestDirName;
-        //mkdir(iDestDir);
-        //init();
+        // mkdir(iDestDir);
+        // init();
     }
 
     TileAssembler::~TileAssembler()
     {
-        //delete iCoordModelMapping;
+        // delete iCoordModelMapping;
     }
 
     bool TileAssembler::convertWorld2()
     {
-        std::set<std::string> spawnedModelFiles;
         bool success = readMapSpawns();
         if (!success)
             return false;
@@ -94,8 +92,8 @@ namespace VMAP
                 else if (entry->second.flags & MOD_WORLDSPAWN) // WMO maps and terrain maps use different origin, so we need to adapt :/
                 {
                     // TODO: remove extractor hack and uncomment below line:
-                    //entry->second.iPos += Vector3(533.33333f*32, 533.33333f*32, 0.f);
-                    entry->second.iBound = entry->second.iBound + Vector3(533.33333f*32, 533.33333f*32, 0.f);
+                    // entry->second.iPos += Vector3(533.33333f*32, 533.33333f*32, 0.f);
+                    entry->second.iBound = entry->second.iBound + Vector3(533.33333f * 32, 533.33333f * 32, 0.f);
                 }
                 mapSpawns.push_back(&(entry->second));
                 spawnedModelFiles.insert(entry->second.name);
@@ -107,13 +105,13 @@ namespace VMAP
 
             // ===> possibly move this code to StaticMapTree class
             std::map<uint32, uint32> modelNodeIdx;
-            for (uint32 i=0; i<mapSpawns.size(); ++i)
+            for (uint32 i = 0; i < mapSpawns.size(); ++i)
                 modelNodeIdx.insert(pair<uint32, uint32>(mapSpawns[i]->ID, i));
 
             // write map tree file
             std::stringstream mapfilename;
             mapfilename << iDestDir << "/" << std::setfill('0') << std::setw(3) << map_iter->first << ".vmtree";
-            FILE *mapfile = fopen(mapfilename.str().c_str(), "wb");
+            FILE* mapfile = fopen(mapfilename.str().c_str(), "wb");
             if (!mapfile)
             {
                 success = false;
@@ -121,7 +119,7 @@ namespace VMAP
                 break;
             }
 
-            //general info
+            // general info
             if (success && fwrite(VMAP_MAGIC, 1, 8, mapfile) != 8) success = false;
             uint32 globalTileID = StaticMapTree::packTileID(65, 65);
             pair<TileMap::iterator, TileMap::iterator> globalRange = map_iter->second->TileEntries.equal_range(globalTileID);
@@ -133,7 +131,7 @@ namespace VMAP
             // global map spawns (WDT), if any (most instances)
             if (success && fwrite("GOBJ", 4, 1, mapfile) != 1) success = false;
 
-            for (TileMap::iterator glob=globalRange.first; glob != globalRange.second && success; ++glob)
+            for (TileMap::iterator glob = globalRange.first; glob != globalRange.second && success; ++glob)
             {
                 success = ModelSpawn::writeToFile(mapfile, map_iter->second->UniqueEntries[glob->second]);
             }
@@ -143,12 +141,12 @@ namespace VMAP
             // <====
 
             // write map tile files, similar to ADT files, only with extra BSP tree node info
-            TileMap &tileEntries = map_iter->second->TileEntries;
+            TileMap& tileEntries = map_iter->second->TileEntries;
             TileMap::iterator tile;
             for (tile = tileEntries.begin(); tile != tileEntries.end(); ++tile)
             {
-                const ModelSpawn &spawn = map_iter->second->UniqueEntries[tile->second];
-                if (spawn.flags & MOD_WORLDSPAWN) // WDT spawn, saved as tile 65/65 currently...
+                const ModelSpawn& spawn = map_iter->second->UniqueEntries[tile->second];
+                if (spawn.flags & MOD_WORLDSPAWN)           // WDT spawn, saved as tile 65/65 currently...
                     continue;
                 uint32 nSpawns = tileEntries.count(tile->first);
                 std::stringstream tilefilename;
@@ -157,17 +155,17 @@ namespace VMAP
                 uint32 x, y;
                 StaticMapTree::unpackTileID(tile->first, x, y);
                 tilefilename << std::setw(2) << x << "_" << std::setw(2) << y << ".vmtile";
-                FILE *tilefile = fopen(tilefilename.str().c_str(), "wb");
+                FILE* tilefile = fopen(tilefilename.str().c_str(), "wb");
                 // file header
                 if (success && fwrite(VMAP_MAGIC, 1, 8, tilefile) != 8) success = false;
                 // write number of tile spawns
                 if (success && fwrite(&nSpawns, sizeof(uint32), 1, tilefile) != 1) success = false;
                 // write tile spawns
-                for (uint32 s=0; s<nSpawns; ++s)
+                for (uint32 s = 0; s < nSpawns; ++s)
                 {
                     if (s)
                         ++tile;
-                    const ModelSpawn &spawn2 = map_iter->second->UniqueEntries[tile->second];
+                    const ModelSpawn& spawn2 = map_iter->second->UniqueEntries[tile->second];
                     success = success && ModelSpawn::writeToFile(tilefile, spawn2);
                     // MapTree nodes to update when loading tile:
                     std::map<uint32, uint32>::iterator nIdx = modelNodeIdx.find(spawn2.ID);
@@ -175,9 +173,12 @@ namespace VMAP
                 }
                 fclose(tilefile);
             }
-            // break; //test, extract only first map; TODO: remvoe this line
+            // break; // test, extract only first map; TODO: remvoe this line
         }
 
+        // add an object models, listed in temp_gameobject_models file
+        exportGameobjectModels();
+
         // export objects
         std::cout << "\nConverting Model Files" << std::endl;
         for (std::set<std::string>::iterator mfile = spawnedModelFiles.begin(); mfile != spawnedModelFiles.end(); ++mfile)
@@ -191,7 +192,7 @@ namespace VMAP
             }
         }
 
-        //cleanup:
+        // cleanup:
         for (MapData::iterator map_iter = mapData.begin(); map_iter != mapData.end(); ++map_iter)
         {
             delete map_iter->second;
@@ -202,14 +203,14 @@ namespace VMAP
     bool TileAssembler::readMapSpawns()
     {
         std::string fname = iSrcDir + "/dir_bin";
-        FILE *dirf = fopen(fname.c_str(), "rb");
+        FILE* dirf = fopen(fname.c_str(), "rb");
         if (!dirf)
         {
             printf("Could not read dir_bin file!\n");
             return false;
         }
         printf("Read coordinate mapping...\n");
-        uint32 mapID, tileX, tileY, check=0;
+        uint32 mapID, tileX, tileY, check = 0;
         G3D::Vector3 v1, v2;
         ModelSpawn spawn;
         while (!feof(dirf))
@@ -224,7 +225,7 @@ namespace VMAP
             if (!ModelSpawn::readFromFile(dirf, spawn))
                 break;
 
-            MapSpawns *current;
+            MapSpawns* current;
             MapData::iterator map_iter = mapData.find(mapID);
             if (map_iter == mapData.end())
             {
@@ -240,7 +241,7 @@ namespace VMAP
         return success;
     }
 
-    bool TileAssembler::calculateTransformedBound(ModelSpawn &spawn)
+    bool TileAssembler::calculateTransformedBound(ModelSpawn& spawn)
     {
         std::string modelFilename = iSrcDir + "/" + spawn.name;
         ModelPosition modelPosition;
@@ -248,93 +249,38 @@ namespace VMAP
         modelPosition.iScale = spawn.iScale;
         modelPosition.init();
 
-        FILE *rf = fopen(modelFilename.c_str(), "rb");
-        if (!rf)
-        {
-            printf("ERROR: Can't open model file: %s\n", modelFilename.c_str());
+        WorldModel_Raw raw_model;
+        if (!raw_model.Read(modelFilename.c_str()))
             return false;
-        }
-
-        AABox modelBound;
-        bool boundEmpty=true;
-        char ident[8];
-
-        int readOperation = 1;
-
-        // temporary use defines to simplify read/check code (close file and return at fail)
-        #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { \
-                                        fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++;
-        #define CMP_OR_RETURN(V,S)  if(strcmp((V),(S)) != 0)        { \
-                                        fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); }
-
-        READ_OR_RETURN(&ident, 8);
-        CMP_OR_RETURN(ident, RAW_VMAP_MAGIC);
 
-        // we have to read one int. This is needed during the export and we have to skip it here
-        uint32 tempNVectors;
-        READ_OR_RETURN(&tempNVectors, sizeof(tempNVectors));
-
-        uint32 groups, wmoRootId;
-        char blockId[5];
-        blockId[4] = 0;
-        int blocksize;
-        float *vectorarray = 0;
+        uint32 groups = raw_model.groupsArray.size();
+        if (groups != 1)
+            printf("Warning: '%s' does not seem to be a M2 model!\n", modelFilename.c_str());
 
-        READ_OR_RETURN(&groups, sizeof(uint32));
-        READ_OR_RETURN(&wmoRootId, sizeof(uint32));
-        if (groups != 1) printf("Warning: '%s' does not seem to be a M2 model!\n", modelFilename.c_str());
-
-        for (uint32 g=0; g<groups; ++g) // should be only one for M2 files...
+        AABox modelBound;
+        bool boundEmpty = true;
+        for (uint32 g = 0; g < groups; ++g) // should be only one for M2 files...
         {
-            fseek(rf, 3*sizeof(uint32) + 6*sizeof(float), SEEK_CUR);
-
-            READ_OR_RETURN(&blockId, 4);
-            CMP_OR_RETURN(blockId, "GRP ");
-            READ_OR_RETURN(&blocksize, sizeof(int));
-            fseek(rf, blocksize, SEEK_CUR);
-
-            // ---- indexes
-            READ_OR_RETURN(&blockId, 4);
-            CMP_OR_RETURN(blockId, "INDX");
-            READ_OR_RETURN(&blocksize, sizeof(int));
-            fseek(rf, blocksize, SEEK_CUR);
+            std::vector<Vector3>& vertices = raw_model.groupsArray[g].vertexArray;
 
-            // ---- vectors
-            READ_OR_RETURN(&blockId, 4);
-            CMP_OR_RETURN(blockId, "VERT");
-            READ_OR_RETURN(&blocksize, sizeof(int));
-            uint32 nvectors;
-            READ_OR_RETURN(&nvectors, sizeof(uint32));
-
-            if (nvectors >0)
-            {
-                vectorarray = new float[nvectors*3];
-                READ_OR_RETURN(vectorarray, nvectors*sizeof(float)*3);
-            }
-            else
+            if (vertices.empty())
             {
                 std::cout << "error: model '" << spawn.name << "' has no geometry!" << std::endl;
-                return false;
+                continue;
             }
 
-            for (uint32 i=0, indexNo=0; indexNo<nvectors; indexNo++, i+=3)
+            uint32 nvectors = vertices.size();
+            for (uint32 i = 0; i < nvectors; ++i)
             {
-                Vector3 v = Vector3(vectorarray[i+0], vectorarray[i+1], vectorarray[i+2]);
-                v = modelPosition.transform(v);
-
+                Vector3 v = modelPosition.transform(vertices[i]);
                 if (boundEmpty)
-                    modelBound = AABox(v, v), boundEmpty=false;
+                    modelBound = AABox(v, v), boundEmpty = false;
                 else
                     modelBound.merge(v);
             }
-            delete[] vectorarray;
-            // drop of temporary use defines
-            #undef READ_OR_RETURN
-            #undef CMP_OR_RETURN
         }
         spawn.iBound = modelBound + spawn.iPos;
         spawn.flags |= MOD_HAS_BOUND;
-        fclose(rf);
         return true;
     }
 
@@ -351,146 +297,243 @@ namespace VMAP
     {
         bool success = true;
         std::string filename = iSrcDir;
-        if (filename.length() >0)
+        if (filename.length() > 0)
             filename.append("/");
         filename.append(pModelFilename);
-        FILE *rf = fopen(filename.c_str(), "rb");
 
-        if (!rf)
-        {
-            printf("ERROR: Can't open model file in form: %s",pModelFilename.c_str());
-            printf("...                          or form: %s",filename.c_str() );
+        WorldModel_Raw raw_model;
+        if (!raw_model.Read(filename.c_str()))
             return false;
-        }
-
-        char ident[8];
 
-        int readOperation = 1;
+        // write WorldModel
+        WorldModel model;
+        model.setRootWmoID(raw_model.RootWMOID);
+        if (raw_model.groupsArray.size())
+        {
+            std::vector<GroupModel> groupsArray;
 
-        // temporary use defines to simplify read/check code (close file and return at fail)
-        #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { \
-                                        fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++;
-        #define CMP_OR_RETURN(V,S)  if(strcmp((V),(S)) != 0)        { \
-                                        fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); }
+            uint32 groups = raw_model.groupsArray.size();
+            for (uint32 g = 0; g < groups; ++g)
+            {
+                GroupModel_Raw& raw_group = raw_model.groupsArray[g];
+                groupsArray.push_back(GroupModel(raw_group.mogpflags, raw_group.GroupWMOID, raw_group.bounds));
+                groupsArray.back().setMeshData(raw_group.vertexArray, raw_group.triangles);
+                groupsArray.back().setLiquidData(raw_group.liquid);
+            }
 
-        READ_OR_RETURN(&ident, 8);
-        CMP_OR_RETURN(ident, RAW_VMAP_MAGIC);
+            model.setGroupModels(groupsArray);
+        }
 
-        // we have to read one int. This is needed during the export and we have to skip it here
-        uint32 tempNVectors;
-        READ_OR_RETURN(&tempNVectors, sizeof(tempNVectors));
+        success = model.writeFile(iDestDir + "/" + pModelFilename + ".vmo");
 
-        uint32 groups;
-        uint32 RootWMOID;
-        char blockId[5];
-        blockId[4] = 0;
-        int blocksize;
+        //std::cout << "readRawFile2: '" << pModelFilename << "' tris: " << nElements << " nodes: " << nNodes << std::endl;
+        return success;
+    }
 
-        READ_OR_RETURN(&groups, sizeof(uint32));
-        READ_OR_RETURN(&RootWMOID, sizeof(uint32));
+    void TileAssembler::exportGameobjectModels()
+    {
+        FILE* model_list = fopen((iSrcDir + "/" + GAMEOBJECT_MODELS).c_str(), "rb");
+        if (!model_list)
+            return;
 
-        std::vector<GroupModel> groupsArray;
+        FILE* model_list_copy = fopen((iDestDir + "/" + GAMEOBJECT_MODELS).c_str(), "wb");
+        if (!model_list_copy)
+        {
+            fclose(model_list);
+            return;
+        }
 
-        for (uint32 g=0; g<groups; ++g)
+        uint32 name_length, displayId;
+        char buff[500];
+        while (!feof(model_list))
         {
-            std::vector<MeshTriangle> triangles;
-            std::vector<Vector3> vertexArray;
+            fread(&displayId, sizeof(uint32), 1, model_list);
+            fread(&name_length, sizeof(uint32), 1, model_list);
 
-            uint32 mogpflags, GroupWMOID;
-            READ_OR_RETURN(&mogpflags, sizeof(uint32));
-            READ_OR_RETURN(&GroupWMOID, sizeof(uint32));
+            if (name_length >= sizeof(buff))
+            {
+                std::cout << "\nFile '" << GAMEOBJECT_MODELS << "' seems to be corrupted" << std::endl;
+                break;
+            }
 
-            float bbox1[3], bbox2[3];
-            READ_OR_RETURN(bbox1, sizeof(float)*3);
-            READ_OR_RETURN(bbox2, sizeof(float)*3);
+            fread(&buff, sizeof(char), name_length, model_list);
+            std::string model_name(buff, name_length);
 
-            uint32 liquidflags;
-            READ_OR_RETURN(&liquidflags, sizeof(uint32));
+            WorldModel_Raw raw_model;
+            if (!raw_model.Read((iSrcDir + "/" + model_name).c_str()))
+                continue;
 
-            // will this ever be used? what is it good for anyway??
-            uint32 branches;
-            READ_OR_RETURN(&blockId, 4);
-            CMP_OR_RETURN(blockId, "GRP ");
-            READ_OR_RETURN(&blocksize, sizeof(int));
-            READ_OR_RETURN(&branches, sizeof(uint32));
-            for (uint32 b=0; b<branches; ++b)
-            {
-                uint32 indexes;
-                // indexes for each branch (not used jet)
-                READ_OR_RETURN(&indexes, sizeof(uint32));
-            }
+            spawnedModelFiles.insert(model_name);
 
-            // ---- indexes
-            READ_OR_RETURN(&blockId, 4);
-            CMP_OR_RETURN(blockId, "INDX");
-            READ_OR_RETURN(&blocksize, sizeof(int));
-            uint32 nindexes;
-            READ_OR_RETURN(&nindexes, sizeof(uint32));
-            if (nindexes >0)
+            AABox bounds;
+            bool boundEmpty = true;
+            for (uint32 g = 0; g < raw_model.groupsArray.size(); ++g)
             {
-                uint16 *indexarray = new uint16[nindexes];
-                READ_OR_RETURN(indexarray, nindexes*sizeof(uint16));
-                for (uint32 i=0; i<nindexes; i+=3)
+                std::vector<Vector3>& vertices = raw_model.groupsArray[g].vertexArray;
+
+                uint32 nvectors = vertices.size();
+                for (uint32 i = 0; i < nvectors; ++i)
                 {
-                    triangles.push_back(MeshTriangle(indexarray[i], indexarray[i+1], indexarray[i+2]));
+                    Vector3& v = vertices[i];
+                    if (boundEmpty)
+                        bounds = AABox(v, v), boundEmpty = false;
+                    else
+                        bounds.merge(v);
                 }
-                delete[] indexarray;
             }
 
-            // ---- vectors
-            READ_OR_RETURN(&blockId, 4);
-            CMP_OR_RETURN(blockId, "VERT");
-            READ_OR_RETURN(&blocksize, sizeof(int));
-            uint32 nvectors;
-            READ_OR_RETURN(&nvectors, sizeof(uint32));
+            fwrite(&displayId, sizeof(uint32), 1, model_list_copy);
+            fwrite(&name_length, sizeof(uint32), 1, model_list_copy);
+            fwrite(&buff, sizeof(char), name_length, model_list_copy);
+            fwrite(&bounds.low(), sizeof(Vector3), 1, model_list_copy);
+            fwrite(&bounds.high(), sizeof(Vector3), 1, model_list_copy);
+        }
+        fclose(model_list);
+        fclose(model_list_copy);
+    }
+
+    // temporary use defines to simplify read/check code (close file and return at fail)
+    #define READ_OR_RETURN(V,S) if (fread((V), (S), 1, rf) != 1) { \
+                                    fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }
+    #define CMP_OR_RETURN(V,S)  if (strcmp((V),(S)) != 0)        { \
+                                    fclose(rf); printf("cmpfail, %s!=%s\n", V, S); return(false); }
+
+bool GroupModel_Raw::Read(FILE* rf)
+    {
+        char blockId[5];
+        blockId[4] = 0;
+        int blocksize;
+        int readOperation = 0;
+
+        READ_OR_RETURN(&mogpflags, sizeof(uint32));
+        READ_OR_RETURN(&GroupWMOID, sizeof(uint32));
+
+        Vector3 vec1, vec2;
+        READ_OR_RETURN(&vec1, sizeof(Vector3));
+        READ_OR_RETURN(&vec2, sizeof(Vector3));
+        bounds.set(vec1, vec2);
+
+        READ_OR_RETURN(&liquidflags, sizeof(uint32));
 
-            if (nvectors >0)
+        // will this ever be used? what is it good for anyway??
+        uint32 branches;
+        READ_OR_RETURN(&blockId, 4);
+        CMP_OR_RETURN(blockId, "GRP ");
+        READ_OR_RETURN(&blocksize, sizeof(int));
+        READ_OR_RETURN(&branches, sizeof(uint32));
+        for (uint32 b = 0; b < branches; ++b)
+        {
+            uint32 indexes;
+            // indexes for each branch (not used jet)
+            READ_OR_RETURN(&indexes, sizeof(uint32));
+        }
+
+        // ---- indexes
+        READ_OR_RETURN(&blockId, 4);
+        CMP_OR_RETURN(blockId, "INDX");
+        READ_OR_RETURN(&blocksize, sizeof(int));
+        uint32 nindexes;
+        READ_OR_RETURN(&nindexes, sizeof(uint32));
+        if (nindexes > 0)
+        {
+            uint16* indexarray = new uint16[nindexes];
+            if (fread(indexarray, nindexes * sizeof(uint16), 1, rf) != 1)
             {
-                float *vectorarray = new float[nvectors*3];
-                READ_OR_RETURN(vectorarray, nvectors*sizeof(float)*3);
-                for (uint32 i=0; i<nvectors; ++i)
-                {
-                    vertexArray.push_back( Vector3(vectorarray + 3*i) );
-                }
-                delete[] vectorarray;
+                fclose(rf);
+                delete[] indexarray;
+                printf("readfail, op = %i\n", readOperation);
+                return false;
             }
-            // ----- liquid
-            WmoLiquid *liquid = 0;
-            if (liquidflags& 1)
+            triangles.reserve(nindexes / 3);
+            for (uint32 i = 0; i < nindexes; i += 3)
             {
-                WMOLiquidHeader hlq;
-                READ_OR_RETURN(&blockId, 4);
-                CMP_OR_RETURN(blockId, "LIQU");
-                READ_OR_RETURN(&blocksize, sizeof(int));
-                READ_OR_RETURN(&hlq, sizeof(WMOLiquidHeader));
-                liquid = new WmoLiquid(hlq.xtiles, hlq.ytiles, Vector3(hlq.pos_x, hlq.pos_y, hlq.pos_z), hlq.type);
-                uint32 size = hlq.xverts*hlq.yverts;
-                READ_OR_RETURN(liquid->GetHeightStorage(), size*sizeof(float));
-                size = hlq.xtiles*hlq.ytiles;
-                READ_OR_RETURN(liquid->GetFlagsStorage(), size);
+                triangles.push_back(MeshTriangle(indexarray[i], indexarray[i + 1], indexarray[i + 2]));
             }
+            delete[] indexarray;
+        }
+
+        // ---- vectors
+        READ_OR_RETURN(&blockId, 4);
+        CMP_OR_RETURN(blockId, "VERT");
+        READ_OR_RETURN(&blocksize, sizeof(int));
+        uint32 nvectors;
+        READ_OR_RETURN(&nvectors, sizeof(uint32));
 
-            groupsArray.push_back(GroupModel(mogpflags, GroupWMOID, AABox(Vector3(bbox1), Vector3(bbox2))));
-            groupsArray.back().setMeshData(vertexArray, triangles);
-            groupsArray.back().setLiquidData(liquid);
+        if (nvectors > 0)
+        {
+            float* vectorarray = new float[nvectors * 3];
+            if (fread(vectorarray, nvectors * sizeof(float) * 3, 1, rf) != 1)
+            {
+                fclose(rf);
+                delete[] vectorarray;
+                printf("readfail, op = %i\n", readOperation);
+                return false;
+            }
 
-            // drop of temporary use defines
-            #undef READ_OR_RETURN
-            #undef CMP_OR_RETURN
+            for (uint32 i = 0; i < nvectors; ++i)
+            {
+                vertexArray.push_back(Vector3(vectorarray + 3 * i));
+            }
+            delete[] vectorarray;
+        }
 
+        // ----- liquid
+        liquid = 0;
+        if (liquidflags & 1)
+        {
+            WMOLiquidHeader hlq;
+            READ_OR_RETURN(&blockId, 4);
+            CMP_OR_RETURN(blockId, "LIQU");
+            READ_OR_RETURN(&blocksize, sizeof(int));
+            READ_OR_RETURN(&hlq, sizeof(WMOLiquidHeader));
+            liquid = new WmoLiquid(hlq.xtiles, hlq.ytiles, Vector3(hlq.pos_x, hlq.pos_y, hlq.pos_z), hlq.type);
+            uint32 size = hlq.xverts * hlq.yverts;
+            READ_OR_RETURN(liquid->GetHeightStorage(), size * sizeof(float));
+            size = hlq.xtiles * hlq.ytiles;
+            READ_OR_RETURN(liquid->GetFlagsStorage(), size);
         }
-        fclose(rf);
+        return true;
+    }
 
-        // write WorldModel
-        WorldModel model;
-        model.setRootWmoID(RootWMOID);
-        if (groupsArray.size())
+    GroupModel_Raw::~GroupModel_Raw()
+    {
+        delete liquid;
+    }
+
+    bool WorldModel_Raw::Read(const char* path)
+    {
+        FILE* rf = fopen(path, "rb");
+        if (!rf)
         {
-            model.setGroupModels(groupsArray);
-            success = model.writeFile(iDestDir + "/" + pModelFilename + ".vmo");
+            printf("ERROR: Can't open raw model file: %s\n", path);
+            return false;
         }
 
-        //std::cout << "readRawFile2: '" << pModelFilename << "' tris: " << nElements << " nodes: " << nNodes << std::endl;
-        return success;
+        char ident[9];
+        ident[8] = 0;
+        int readOperation = 0;
+
+        READ_OR_RETURN(&ident, 8);
+        CMP_OR_RETURN(ident, RAW_VMAP_MAGIC);
+
+        // we have to read one int. This is needed during the export and we have to skip it here
+        uint32 tempNVectors;
+        READ_OR_RETURN(&tempNVectors, sizeof(tempNVectors));
+
+        uint32 groups;
+        READ_OR_RETURN(&groups, sizeof(uint32));
+        READ_OR_RETURN(&RootWMOID, sizeof(uint32));
+
+        groupsArray.resize(groups);
+        bool succeed = true;
+        for (uint32 g = 0; g < groups && succeed; ++g)
+            succeed = groupsArray[g].Read(rf);
+
+        fclose(rf);
+        return succeed;
     }
+    // drop of temporary use defines
+    #undef READ_OR_RETURN
+    #undef CMP_OR_RETURN
+
 }
diff --git a/src/game/vmap/TileAssembler.h b/src/game/vmap/TileAssembler.h
index 88afc6965ea..9210ba576e0 100644
--- a/src/game/vmap/TileAssembler.h
+++ b/src/game/vmap/TileAssembler.h
@@ -22,8 +22,10 @@
 #include <G3D/Vector3.h>
 #include <G3D/Matrix3.h>
 #include <map>
+#include <set>
 
 #include "ModelInstance.h"
+#include "WorldModel.h"
 
 namespace VMAP
 {
@@ -43,7 +45,7 @@ namespace VMAP
             float iScale;
             void init()
             {
-                iRotation = G3D::Matrix3::fromEulerAnglesZYX(G3D::pi()*iDir.y/180.f, G3D::pi()*iDir.x/180.f, G3D::pi()*iDir.z/180.f);
+                iRotation = G3D::Matrix3::fromEulerAnglesZYX(G3D::pi() * iDir.y / 180.f, G3D::pi() * iDir.x / 180.f, G3D::pi() * iDir.z / 180.f);
             }
             G3D::Vector3 transform(const G3D::Vector3& pIn) const;
             void moveToBasePos(const G3D::Vector3& pBasePos) { iPos -= pBasePos; }
@@ -61,15 +63,41 @@ namespace VMAP
     typedef std::map<uint32, MapSpawns*> MapData;
     //===============================================
 
+    struct GroupModel_Raw
+    {
+        uint32 mogpflags;
+        uint32 GroupWMOID;
+
+        G3D::AABox bounds;
+        uint32 liquidflags;
+        std::vector<MeshTriangle> triangles;
+        std::vector<G3D::Vector3> vertexArray;
+        class WmoLiquid *liquid;
+
+        GroupModel_Raw() : liquid(0) {}
+        ~GroupModel_Raw();
+
+        bool Read(FILE * f);
+    };
+
+    struct WorldModel_Raw
+    {
+        uint32 RootWMOID;
+        std::vector<GroupModel_Raw> groupsArray;
+
+        bool Read(const char * path);
+    };
+
     class TileAssembler
     {
         private:
             std::string iDestDir;
             std::string iSrcDir;
-            bool (*iFilterMethod)(char *pName);
+            bool (*iFilterMethod)(char* pName);
             G3D::Table<std::string, unsigned int > iUniqueNameIds;
             unsigned int iCurrentUniqueNameId;
             MapData mapData;
+            std::set<std::string> spawnedModelFiles;
 
         public:
             TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName);
@@ -77,10 +105,11 @@ namespace VMAP
 
             bool convertWorld2();
             bool readMapSpawns();
-            bool calculateTransformedBound(ModelSpawn &spawn);
+            bool calculateTransformedBound(ModelSpawn& spawn);
 
+            void exportGameobjectModels();
             bool convertRawFile(const std::string& pModelFilename);
-            void setModelNameFilterMethod(bool (*pFilterMethod)(char *pName)) { iFilterMethod = pFilterMethod; }
+            void setModelNameFilterMethod(bool (*pFilterMethod)(char* pName)) { iFilterMethod = pFilterMethod; }
             std::string getDirEntryNameFromModName(unsigned int pMapId, const std::string& pModPosName);
             unsigned int getUniqueNameId(const std::string pName);
     };
diff --git a/src/game/vmap/VMapDefinitions.h b/src/game/vmap/VMapDefinitions.h
index 05f33e56218..b0daf6471e8 100644
--- a/src/game/vmap/VMapDefinitions.h
+++ b/src/game/vmap/VMapDefinitions.h
@@ -19,34 +19,44 @@
 #ifndef _VMAPDEFINITIONS_H
 #define _VMAPDEFINITIONS_H
 #include <cstring>
+#include "../GridDefines.h"
 
 #define LIQUID_TILE_SIZE (533.333f / 128.f)
 
 namespace VMAP
 {
-    const char VMAP_MAGIC[] = "VMAP_3.0";                   // used in final vmap files
-    const char RAW_VMAP_MAGIC[] = "VMAP003";                // used in extracted vmap files with raw data
+    const char VMAP_MAGIC[] = "VMAP_4.0";                   // used in final vmap files
+    const char RAW_VMAP_MAGIC[] = "VMAP004";                // used in extracted vmap files with raw data
+    const char GAMEOBJECT_MODELS[] = "temp_gameobject_models";
 
     // defined in TileAssembler.cpp currently...
-    bool readChunk(FILE *rf, char *dest, const char *compare, uint32 len);
+    bool readChunk(FILE* rf, char* dest, const char* compare, uint32 len);
+
+    inline bool CheckPosition(float const& x, float const& y, float const& z) 
+    {
+        return
+            std::fabs(z) < MAX_HEIGHT   &&
+            std::fabs(y) < MAP_HALFSIZE &&
+            std::fabs(x) < MAP_HALFSIZE;
+    };
 }
 
 #ifndef NO_CORE_FUNCS
-    #include "Errors.h"
-    #include "Log.h"
-    #define ERROR_LOG(...) sLog.outError(__VA_ARGS__);
+#include "Errors.h"
+#include "Log.h"
+#define ERROR_LOG(...) sLog.outError(__VA_ARGS__);
 #elif defined MMAP_GENERATOR
-    #include <assert.h>
-    #define MANGOS_ASSERT(x) assert(x)
-    #define DEBUG_LOG(...) 0
-    #define DETAIL_LOG(...) 0
-    #define ERROR_LOG(...) do{ printf("ERROR:"); printf(__VA_ARGS__); printf("\n"); } while(0)
+#include <assert.h>
+#define MANGOS_ASSERT(x) assert(x)
+#define DEBUG_LOG(...) 0
+#define DETAIL_LOG(...) 0
+#define ERROR_LOG(...) do{ printf("ERROR:"); printf(__VA_ARGS__); printf("\n"); } while(0)
 #else
-    #include <assert.h>
-    #define MANGOS_ASSERT(x) assert(x)
-    #define DEBUG_LOG(...) do{ printf(__VA_ARGS__); printf("\n"); } while(0)
-    #define DETAIL_LOG(...) do{ printf(__VA_ARGS__); printf("\n"); } while(0)
-    #define ERROR_LOG(...) do{ printf("ERROR:"); printf(__VA_ARGS__); printf("\n"); } while(0)
+#include <assert.h>
+#define MANGOS_ASSERT(x) assert(x)
+#define DEBUG_LOG(...) do{ printf(__VA_ARGS__); printf("\n"); } while(0)
+#define DETAIL_LOG(...) do{ printf(__VA_ARGS__); printf("\n"); } while(0)
+#define ERROR_LOG(...) do{ printf("ERROR:"); printf(__VA_ARGS__); printf("\n"); } while(0)
 #endif
 
 #endif // _VMAPDEFINITIONS_H
diff --git a/src/game/vmap/VMapFactory.cpp b/src/game/vmap/VMapFactory.cpp
index dee1386aa6f..68d05de0fde 100644
--- a/src/game/vmap/VMapFactory.cpp
+++ b/src/game/vmap/VMapFactory.cpp
@@ -26,24 +26,24 @@ namespace VMAP
 {
     void chompAndTrim(std::string& str)
     {
-        while(str.length() >0)
+        while (str.length() > 0)
         {
-            char lc = str[str.length()-1];
-            if(lc == '\r' || lc == '\n' || lc == ' ' || lc == '"' || lc == '\'')
+            char lc = str[str.length() - 1];
+            if (lc == '\r' || lc == '\n' || lc == ' ' || lc == '"' || lc == '\'')
             {
-                str = str.substr(0,str.length()-1);
+                str = str.substr(0, str.length() - 1);
             }
             else
             {
                 break;
             }
         }
-        while(str.length() >0)
+        while (str.length() > 0)
         {
             char lc = str[0];
-            if(lc == ' ' || lc == '"' || lc == '\'')
+            if (lc == ' ' || lc == '"' || lc == '\'')
             {
-                str = str.substr(1,str.length()-1);
+                str = str.substr(1, str.length() - 1);
             }
             else
             {
@@ -52,8 +52,8 @@ namespace VMAP
         }
     }
 
-    IVMapManager *gVMapManager = 0;
-    Table<unsigned int , bool>* iIgnoreSpellIds=0;
+    IVMapManager* gVMapManager = 0;
+    Table<unsigned int , bool>* iIgnoreSpellIds = 0;
 
     //===============================================
     // result false, if no more id are found
@@ -62,22 +62,22 @@ namespace VMAP
     {
         bool result = false;
         unsigned int i;
-        for(i=pStartPos;i<pString.size(); ++i)
+        for (i = pStartPos; i < pString.size(); ++i)
         {
-            if(pString[i] == ',')
+            if (pString[i] == ',')
             {
                 break;
             }
         }
-        if(i>pStartPos)
+        if (i > pStartPos)
         {
-            std::string idString = pString.substr(pStartPos, i-pStartPos);
-            pStartPos = i+1;
+            std::string idString = pString.substr(pStartPos, i - pStartPos);
+            pStartPos = i + 1;
             chompAndTrim(idString);
             pId = atoi(idString.c_str());
             result = true;
         }
-        return(result);
+        return result;
     }
 
     //===============================================
@@ -87,15 +87,15 @@ namespace VMAP
 
     void VMapFactory::preventSpellsFromBeingTestedForLoS(const char* pSpellIdString)
     {
-        if(!iIgnoreSpellIds)
+        if (!iIgnoreSpellIds)
             iIgnoreSpellIds = new Table<unsigned int , bool>();
-        if(pSpellIdString != NULL)
+        if (pSpellIdString != NULL)
         {
-            unsigned int pos =0;
+            unsigned int pos = 0;
             unsigned int id;
             std::string confString(pSpellIdString);
             chompAndTrim(confString);
-            while(getNextId(confString, pos, id))
+            while (getNextId(confString, pos, id))
             {
                 iIgnoreSpellIds->set(id, true);
             }
@@ -106,15 +106,15 @@ namespace VMAP
 
     bool VMapFactory::checkSpellForLoS(unsigned int pSpellId)
     {
-        return(!iIgnoreSpellIds->containsKey(pSpellId));
+        return !iIgnoreSpellIds->containsKey(pSpellId);
     }
 
     //===============================================
     // just return the instance
     IVMapManager* VMapFactory::createOrGetVMapManager()
     {
-        if(gVMapManager == 0)
-            gVMapManager= new VMapManager2();                // should be taken from config ... Please change if you like :-)
+        if (!gVMapManager)
+            gVMapManager = new VMapManager2();              // should be taken from config ... Please change if you like :-)
         return gVMapManager;
     }
 
@@ -122,12 +122,12 @@ namespace VMAP
     // delete all internal data structures
     void VMapFactory::clear()
     {
-        if(iIgnoreSpellIds)
+        if (iIgnoreSpellIds)
         {
             delete iIgnoreSpellIds;
             iIgnoreSpellIds = NULL;
         }
-        if(gVMapManager)
+        if (gVMapManager)
         {
             delete gVMapManager;
             gVMapManager = NULL;
diff --git a/src/game/vmap/VMapManager2.cpp b/src/game/vmap/VMapManager2.cpp
index a8da984a51c..241e5fe0287 100644
--- a/src/game/vmap/VMapManager2.cpp
+++ b/src/game/vmap/VMapManager2.cpp
@@ -45,10 +45,6 @@ namespace VMAP
         {
             delete i->second;
         }
-        for (ModelFileMap::iterator i = iLoadedModelFiles.begin(); i != iLoadedModelFiles.end(); ++i)
-        {
-            delete i->second.getModel();
-        }
     }
 
     //=========================================================
@@ -64,20 +60,6 @@ namespace VMAP
         return pos;
     }
 
-    //=========================================================
-
-    Vector3 VMapManager2::convertPositionToMangosRep(float x, float y, float z) const
-    {
-        Vector3 pos;
-        const float mid = 0.5f * 64.0f * 533.33333333f;
-        pos.x = mid - x;
-        pos.y = mid - y;
-        pos.z = z;
-
-        return pos;
-    }
-    //=========================================================
-
     // move to MapTree too?
     std::string VMapManager2::getMapFileName(unsigned int pMapId)
     {
@@ -105,15 +87,18 @@ namespace VMAP
     //=========================================================
     // load one tile (internal use only)
 
-    bool VMapManager2::_loadMap(unsigned int pMapId, const std::string &basePath, uint32 tileX, uint32 tileY)
+    bool VMapManager2::_loadMap(unsigned int pMapId, const std::string& basePath, uint32 tileX, uint32 tileY)
     {
         InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId);
         if (instanceTree == iInstanceMapTrees.end())
         {
             std::string mapFileName = getMapFileName(pMapId);
-            StaticMapTree *newTree = new StaticMapTree(pMapId, basePath);
+            StaticMapTree* newTree = new StaticMapTree(pMapId, basePath);
             if (!newTree->InitMap(mapFileName, this))
+            {
+                delete newTree;
                 return false;
+            }
             instanceTree = iInstanceMapTrees.insert(InstanceTreeMap::value_type(pMapId, newTree)).first;
         }
         return instanceTree->second->LoadMapTile(tileX, tileY, this);
@@ -160,8 +145,12 @@ namespace VMAP
         InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId);
         if (instanceTree != iInstanceMapTrees.end())
         {
-            Vector3 pos1 = convertPositionToInternalRep(x1,y1,z1);
-            Vector3 pos2 = convertPositionToInternalRep(x2,y2,z2);
+            // Don't calculate hit position, if wrong src/dest points provided!
+            if (!VMAP::CheckPosition(x1, y1, z1) || !VMAP::CheckPosition(x2, y2, z2))
+                return false;
+
+            Vector3 pos1 = convertPositionToInternalRep(x1, y1, z1);
+            Vector3 pos2 = convertPositionToInternalRep(x2, y2, z2);
             if (pos1 != pos2)
             {
                 result = instanceTree->second->isInLineOfSight(pos1, pos2);
@@ -174,22 +163,26 @@ namespace VMAP
     get the hit position and return true if we hit something
     otherwise the result pos will be the dest pos
     */
-    bool VMapManager2::getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float pModifyDist)
+    bool VMapManager2::getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float pModifyDist)
     {
         bool result = false;
-        rx=x2;
-        ry=y2;
-        rz=z2;
+        rx = x2;
+        ry = y2;
+        rz = z2;
         if (isLineOfSightCalcEnabled())
         {
+            // Don't calculate hit position, if wrong src/dest points provided!
+            if (!VMAP::CheckPosition(x1, y1, z1) || !VMAP::CheckPosition(x2, y2, z2))
+                return false;
+
             InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId);
             if (instanceTree != iInstanceMapTrees.end())
             {
-                Vector3 pos1 = convertPositionToInternalRep(x1,y1,z1);
-                Vector3 pos2 = convertPositionToInternalRep(x2,y2,z2);
+                Vector3 pos1 = convertPositionToInternalRep(x1, y1, z1);
+                Vector3 pos2 = convertPositionToInternalRep(x2, y2, z2);
                 Vector3 resultPos;
                 result = instanceTree->second->getObjectHitPos(pos1, pos2, resultPos, pModifyDist);
-                resultPos = convertPositionToMangosRep(resultPos.x,resultPos.y,resultPos.z);
+                resultPos = convertPositionToInternalRep(resultPos.x, resultPos.y, resultPos.z);
                 rx = resultPos.x;
                 ry = resultPos.y;
                 rz = resultPos.z;
@@ -205,17 +198,17 @@ namespace VMAP
 
     float VMapManager2::getHeight(unsigned int pMapId, float x, float y, float z, float maxSearchDist)
     {
-        float height = VMAP_INVALID_HEIGHT_VALUE;           //no height
+        float height = VMAP_INVALID_HEIGHT_VALUE;           // no height
         if (isHeightCalcEnabled())
         {
             InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId);
             if (instanceTree != iInstanceMapTrees.end())
             {
-                Vector3 pos = convertPositionToInternalRep(x,y,z);
+                Vector3 pos = convertPositionToInternalRep(x, y, z);
                 height = instanceTree->second->getHeight(pos, maxSearchDist);
                 if (!(height < G3D::inf()))
                 {
-                    height = VMAP_INVALID_HEIGHT_VALUE;         //no height
+                    height = VMAP_INVALID_HEIGHT_VALUE;     // no height
                 }
             }
         }
@@ -224,9 +217,9 @@ namespace VMAP
 
     //=========================================================
 
-    bool VMapManager2::getAreaInfo(unsigned int pMapId, float x, float y, float &z, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const
+    bool VMapManager2::getAreaInfo(unsigned int pMapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const
     {
-        bool result=false;
+        bool result = false;
         InstanceTreeMap::const_iterator instanceTree = iInstanceMapTrees.find(pMapId);
         if (instanceTree != iInstanceMapTrees.end())
         {
@@ -235,20 +228,24 @@ namespace VMAP
             // z is not touched by convertPositionToMangosRep(), so just copy
             z = pos.z;
         }
-        return(result);
+        return result;
     }
 
-    bool VMapManager2::GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float &level, float &floor, uint32 &type) const
+    bool VMapManager2::GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float& level, float& floor, uint32& type) const
     {
         InstanceTreeMap::const_iterator instanceTree = iInstanceMapTrees.find(pMapId);
         if (instanceTree != iInstanceMapTrees.end())
         {
+            // Don't calculate hit position, if wrong src/dest points provided!
+            if (!VMAP::CheckPosition(x, y, z))
+                return false;
+
             LocationInfo info;
             Vector3 pos = convertPositionToInternalRep(x, y, z);
             if (instanceTree->second->GetLocationInfo(pos, info))
             {
                 floor = info.ground_Z;
-                type = info.hitModel->GetLiquidType();
+                type = info.hitModel->GetLiquidType();  // entry from LiquidType.dbc
                 if (ReqLiquidType && !(type & ReqLiquidType))
                     return false;
                 if (info.hitInstance->GetLiquidLevel(pos, info, level))
@@ -260,41 +257,47 @@ namespace VMAP
 
     //=========================================================
 
-    WorldModel* VMapManager2::acquireModelInstance(const std::string &basepath, const std::string &filename)
+    WorldModelPtr VMapManager2::acquireModelInstance(std::string const& basepath, std::string const& filename)
     {
-        ModelFileMap::iterator model = iLoadedModelFiles.find(filename);
+        ModelFileMap::iterator model = getModelInstance(filename);
         if (model == iLoadedModelFiles.end())
         {
-            WorldModel *worldmodel = new WorldModel();
+            WorldModelPtr worldmodel = WorldModelPtr(new WorldModel());
             if (!worldmodel->readFile(basepath + filename + ".vmo"))
             {
-                ERROR_LOG("VMapManager2: could not load '%s%s.vmo'!", basepath.c_str(), filename.c_str());
-                delete worldmodel;
-                return NULL;
+                ERROR_LOG("VMapManager2::acquireModelInstance could not load '%s%s.vmo'!", basepath.c_str(), filename.c_str());
+                return WorldModelPtr();
             }
-            DEBUG_LOG("VMapManager2: loading file '%s%s'.", basepath.c_str(), filename.c_str());
-            model = iLoadedModelFiles.insert(std::pair<std::string, ManagedModel>(filename, ManagedModel())).first;
-            model->second.setModel(worldmodel);
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "VMapManager2::acquireModelInstance loading file '%s%s'.", basepath.c_str(), filename.c_str());
+            WriteGuard Guard(GetLock());
+            model = (iLoadedModelFiles.insert(ModelFileMap::value_type(filename, worldmodel))).first;
         }
-        model->second.incRefCount();
-        return model->second.getModel();
+        return model->second;
     }
 
-    void VMapManager2::releaseModelInstance(const std::string &filename)
+    void VMapManager2::releaseModelInstance(std::string const& filename)
     {
-        ModelFileMap::iterator model = iLoadedModelFiles.find(filename);
+        ModelFileMap::iterator model = getModelInstance(filename);
         if (model == iLoadedModelFiles.end())
         {
-            ERROR_LOG("VMapManager2: trying to unload non-loaded file '%s'!", filename.c_str());
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING,"VMapManager2::releaseModelInstance concurrent unloading file %s", filename.c_str());
             return;
         }
-        if( model->second.decRefCount() == 0)
+        if (model->second.count() == 0)
         {
-            DEBUG_LOG("VMapManager2: unloading file '%s'", filename.c_str());
-            delete model->second.getModel();
+            DEBUG_FILTER_LOG(LOG_FILTER_MAP_LOADING, "VMapManager2::releaseModelInstance unloading file '%s'", filename.c_str());
+            WriteGuard Guard(GetLock());
             iLoadedModelFiles.erase(model);
+            // model be auto-erased after method finish
         }
     }
+
+    ModelFileMap::iterator VMapManager2::getModelInstance(std::string const& filename)
+    {
+        ReadGuard Guard(GetLock());
+        return iLoadedModelFiles.find(filename);
+    }
+
     //=========================================================
 
     bool VMapManager2::existsMap(const char* pBasePath, unsigned int pMapId, int x, int y)
diff --git a/src/game/vmap/VMapManager2.h b/src/game/vmap/VMapManager2.h
index ee43bc83fff..6a77ad2cd72 100644
--- a/src/game/vmap/VMapManager2.h
+++ b/src/game/vmap/VMapManager2.h
@@ -23,6 +23,7 @@
 #include "Utilities/UnorderedMapSet.h"
 #include "Platform/Define.h"
 #include <G3D/Vector3.h>
+#include <ObjectHandler.h>
 
 //===========================================================
 
@@ -45,21 +46,12 @@ namespace VMAP
     class StaticMapTree;
     class WorldModel;
 
-    class ManagedModel
-    {
-        public:
-            ManagedModel(): iModel(0), iRefCount(0) {}
-            void setModel(WorldModel *model) { iModel = model; }
-            WorldModel *getModel() { return iModel; }
-            void incRefCount() { ++iRefCount; }
-            int decRefCount() { return --iRefCount; }
-        protected:
-            WorldModel *iModel;
-            int iRefCount;
-    };
+    typedef UNORDERED_MAP<uint32 , StaticMapTree*> InstanceTreeMap;
+    typedef UNORDERED_MAP<std::string, WorldModelPtr> ModelFileMap;
 
-    typedef UNORDERED_MAP<uint32 , StaticMapTree *> InstanceTreeMap;
-    typedef UNORDERED_MAP<std::string, ManagedModel> ModelFileMap;
+    typedef   MANGOSR2_MUTEX_MODEL_2       LockType;
+    typedef   ACE_Read_Guard<LockType>     ReadGuard;
+    typedef   ACE_Write_Guard<LockType>    WriteGuard;
 
     class VMapManager2 : public IVMapManager
     {
@@ -68,13 +60,16 @@ namespace VMAP
             ModelFileMap iLoadedModelFiles;
             InstanceTreeMap iInstanceMapTrees;
 
-            bool _loadMap(uint32 pMapId, const std::string &basePath, uint32 tileX, uint32 tileY);
+            bool _loadMap(uint32 pMapId, const std::string& basePath, uint32 tileX, uint32 tileY);
             /* void _unloadMap(uint32 pMapId, uint32 x, uint32 y); */
 
+            LockType&       GetLock() { return i_lock; }
+            LockType&       GetLock() const { return i_lock; }
+            mutable LockType           i_lock;
+
         public:
             // public for debug
             G3D::Vector3 convertPositionToInternalRep(float x, float y, float z) const;
-            G3D::Vector3 convertPositionToMangosRep(float x, float y, float z) const;
             static std::string getMapFileName(unsigned int pMapId);
 
             VMapManager2();
@@ -97,8 +92,9 @@ namespace VMAP
             bool getAreaInfo(unsigned int pMapId, float x, float y, float &z, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const;
             bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float &level, float &floor, uint32 &type) const;
 
-            WorldModel* acquireModelInstance(const std::string &basepath, const std::string &filename);
-            void releaseModelInstance(const std::string &filename);
+            WorldModelPtr acquireModelInstance(std::string const& basepath, std::string const& filename);
+            void releaseModelInstance(std::string const& filename);
+            ModelFileMap::iterator getModelInstance(std::string const& filename);
 
             // what's the use of this? o.O
             virtual std::string getDirFileName(unsigned int pMapId, int x, int y) const
@@ -109,7 +105,7 @@ namespace VMAP
 
 #ifdef MMAP_GENERATOR
         public:
-            void getInstanceMapTree(InstanceTreeMap &instanceMapTree);
+            void getInstanceMapTree(InstanceTreeMap& instanceMapTree);
 #endif
     };
 }
diff --git a/src/game/vmap/VMapTools.h b/src/game/vmap/VMapTools.h
index 9fb1500ce88..40ce92e5192 100644
--- a/src/game/vmap/VMapTools.h
+++ b/src/game/vmap/VMapTools.h
@@ -33,15 +33,17 @@ The collision detection is modified to return true, if we are inside an object.
 namespace VMAP
 {
     template<class TValue>
-    class IntersectionCallBack {
-    public:
-        TValue*      closestEntity;
-        G3D::Vector3 hitLocation;
-        G3D::Vector3 hitNormal;
-
-        void operator()(const G3D::Ray& ray, const TValue* entity, bool pStopAtFirstHit, float& distance) {
-            entity->intersect(ray, distance, pStopAtFirstHit, hitLocation, hitNormal);
-        }
+    class IntersectionCallBack
+    {
+        public:
+            TValue*      closestEntity;
+            G3D::Vector3 hitLocation;
+            G3D::Vector3 hitNormal;
+
+            void operator()(const G3D::Ray& ray, const TValue* entity, bool pStopAtFirstHit, float& distance)
+            {
+                entity->intersect(ray, distance, pStopAtFirstHit, hitLocation, hitNormal);
+            }
     };
 
     //==============================================================
@@ -50,101 +52,101 @@ namespace VMAP
 
     class MyCollisionDetection
     {
-    private:
-    public:
-
-        static bool collisionLocationForMovingPointFixedAABox(
-            const G3D::Vector3&     origin,
-            const G3D::Vector3&     dir,
-            const G3D::AABox&       box,
-            G3D::Vector3&           location,
-            bool&                   Inside)
-        {
-
-            // Integer representation of a floating-point value.
+        private:
+        public:
+
+            static bool collisionLocationForMovingPointFixedAABox(
+                const G3D::Vector3&     origin,
+                const G3D::Vector3&     dir,
+                const G3D::AABox&       box,
+                G3D::Vector3&           location,
+                bool&                   Inside)
+            {
+
+                // Integer representation of a floating-point value.
 #define IR(x)   (reinterpret_cast<G3D::uint32 const&>(x))
 
-            Inside = true;
-            const G3D::Vector3& MinB = box.low();
-            const G3D::Vector3& MaxB = box.high();
-            G3D::Vector3 MaxT(-1.0f, -1.0f, -1.0f);
+                Inside = true;
+                const G3D::Vector3& MinB = box.low();
+                const G3D::Vector3& MaxB = box.high();
+                G3D::Vector3 MaxT(-1.0f, -1.0f, -1.0f);
 
-            // Find candidate planes.
-            for (int i = 0; i < 3; ++i)
-            {
-                if (origin[i] < MinB[i])
+                // Find candidate planes.
+                for (int i = 0; i < 3; ++i)
                 {
-                    location[i] = MinB[i];
-                    Inside      = false;
-
-                    // Calculate T distances to candidate planes
-                    if (IR(dir[i]))
+                    if (origin[i] < MinB[i])
                     {
-                        MaxT[i] = (MinB[i] - origin[i]) / dir[i];
+                        location[i] = MinB[i];
+                        Inside      = false;
+
+                        // Calculate T distances to candidate planes
+                        if (IR(dir[i]))
+                        {
+                            MaxT[i] = (MinB[i] - origin[i]) / dir[i];
+                        }
                     }
-                }
-                else if (origin[i] > MaxB[i])
-                {
-                    location[i] = MaxB[i];
-                    Inside      = false;
-
-                    // Calculate T distances to candidate planes
-                    if (IR(dir[i]))
+                    else if (origin[i] > MaxB[i])
                     {
-                        MaxT[i] = (MaxB[i] - origin[i]) / dir[i];
+                        location[i] = MaxB[i];
+                        Inside      = false;
+
+                        // Calculate T distances to candidate planes
+                        if (IR(dir[i]))
+                        {
+                            MaxT[i] = (MaxB[i] - origin[i]) / dir[i];
+                        }
                     }
                 }
-            }
 
-            if (Inside)
-            {
-                // definite hit
-                location = origin;
-                return true;
-            }
+                if (Inside)
+                {
+                    // definite hit
+                    location = origin;
+                    return true;
+                }
 
-            // Get largest of the maxT's for final choice of intersection
-            int WhichPlane = 0;
-            if (MaxT[1] > MaxT[WhichPlane])
-            {
-                WhichPlane = 1;
-            }
+                // Get largest of the maxT's for final choice of intersection
+                int WhichPlane = 0;
+                if (MaxT[1] > MaxT[WhichPlane])
+                {
+                    WhichPlane = 1;
+                }
 
-            if (MaxT[2] > MaxT[WhichPlane])
-            {
-                WhichPlane = 2;
-            }
+                if (MaxT[2] > MaxT[WhichPlane])
+                {
+                    WhichPlane = 2;
+                }
 
-            // Check final candidate actually inside box
-            if (IR(MaxT[WhichPlane]) & 0x80000000)
-            {
-                // Miss the box
-                return false;
-            }
+                // Check final candidate actually inside box
+                if (IR(MaxT[WhichPlane]) & 0x80000000)
+                {
+                    // Miss the box
+                    return false;
+                }
 
-            for (int i = 0; i < 3; ++i)
-            {
-                if (i != WhichPlane)
+                for (int i = 0; i < 3; ++i)
                 {
-                    location[i] = origin[i] + MaxT[WhichPlane] * dir[i];
-                    if ((location[i] < MinB[i]) ||
-                        (location[i] > MaxB[i]))
+                    if (i != WhichPlane)
                     {
-                        // On this plane we're outside the box extents, so
-                        // we miss the box
-                        return false;
+                        location[i] = origin[i] + MaxT[WhichPlane] * dir[i];
+                        if ((location[i] < MinB[i]) ||
+                                (location[i] > MaxB[i]))
+                        {
+                            // On this plane we're outside the box extents, so
+                            // we miss the box
+                            return false;
+                        }
                     }
                 }
-            }
-            /*
-            // Choose the normal to be the plane normal facing into the ray
-            normal = G3D::Vector3::zero();
-            normal[WhichPlane] = (dir[WhichPlane] > 0) ? -1.0 : 1.0;
-            */
-            return true;
+                /*
+                // Choose the normal to be the plane normal facing into the ray
+                normal = G3D::Vector3::zero();
+                normal[WhichPlane] = (dir[WhichPlane] > 0) ? -1.0 : 1.0;
+                */
+                return true;
 
 #undef IR
-        }
+            }
     };
 }
 #endif
diff --git a/src/game/vmap/WorldModel.cpp b/src/game/vmap/WorldModel.cpp
index 51bd6a6bcb9..b4a461f7d06 100644
--- a/src/game/vmap/WorldModel.cpp
+++ b/src/game/vmap/WorldModel.cpp
@@ -28,10 +28,9 @@ template<> struct BoundsTrait<VMAP::GroupModel>
     static void getBounds(const VMAP::GroupModel& obj, G3D::AABox& out) { out = obj.GetBound(); }
 };
 
-
 namespace VMAP
 {
-    bool IntersectTriangle(const MeshTriangle &tri, std::vector<Vector3>::const_iterator points, const G3D::Ray &ray, float &distance)
+    bool IntersectTriangle(const MeshTriangle& tri, std::vector<Vector3>::const_iterator points, const G3D::Ray& ray, float& distance)
     {
         static const float EPS = 1e-5f;
 
@@ -42,7 +41,8 @@ namespace VMAP
         const Vector3 p(ray.direction().cross(e2));
         const float a = e1.dot(p);
 
-        if (abs(a) < EPS) {
+        if (fabs(a) < EPS)
+        {
             // Determinant is ill-conditioned; abort early
             return false;
         }
@@ -51,7 +51,8 @@ namespace VMAP
         const Vector3 s(ray.origin() - points[tri.idx0]);
         const float u = f * s.dot(p);
 
-        if ((u < 0.0f) || (u > 1.0f)) {
+        if ((u < 0.0f) || (u > 1.0f))
+        {
             // We hit the plane of the m_geometry, but outside the m_geometry
             return false;
         }
@@ -59,7 +60,8 @@ namespace VMAP
         const Vector3 q(s.cross(e1));
         const float v = f * ray.direction().dot(q);
 
-        if ((v < 0.0f) || ((u + v) > 1.0f)) {
+        if ((v < 0.0f) || ((u + v) > 1.0f))
+        {
             // We hit the plane of the triangle, but outside the triangle
             return false;
         }
@@ -84,8 +86,8 @@ namespace VMAP
     class TriBoundFunc
     {
         public:
-            TriBoundFunc(std::vector<Vector3> &vert): vertices(vert.begin()) {}
-            void operator()(const MeshTriangle &tri, G3D::AABox &out) const
+            TriBoundFunc(std::vector<Vector3>& vert): vertices(vert.begin()) {}
+            void operator()(const MeshTriangle& tri, G3D::AABox& out) const
             {
                 G3D::Vector3 lo = vertices[tri.idx0];
                 G3D::Vector3 hi = lo;
@@ -101,16 +103,16 @@ namespace VMAP
 
     // ===================== WmoLiquid ==================================
 
-    WmoLiquid::WmoLiquid(uint32 width, uint32 height, const Vector3 &corner, uint32 type):
+    WmoLiquid::WmoLiquid(uint32 width, uint32 height, const Vector3& corner, uint32 type):
         iTilesX(width), iTilesY(height), iCorner(corner), iType(type)
     {
-        iHeight = new float[(width+1)*(height+1)];
-        iFlags = new uint8[width*height];
+        iHeight = new float[(width + 1) * (height + 1)];
+        iFlags = new uint8[width * height];
     }
 
-    WmoLiquid::WmoLiquid(const WmoLiquid &other): iHeight(0), iFlags(0)
+    WmoLiquid::WmoLiquid(const WmoLiquid& other): iHeight(NULL), iFlags(NULL)
     {
-        *this = other; // use assignment operator...
+        *this = other;                                      // use assignment operator defined below
     }
 
     WmoLiquid::~WmoLiquid()
@@ -119,47 +121,50 @@ namespace VMAP
         delete[] iFlags;
     }
 
-    WmoLiquid& WmoLiquid::operator=(const WmoLiquid &other)
+    WmoLiquid& WmoLiquid::operator=(const WmoLiquid& other)
     {
         if (this == &other)
             return *this;
+
         iTilesX = other.iTilesX;
         iTilesY = other.iTilesY;
         iCorner = other.iCorner;
         iType = other.iType;
-        delete iHeight;
-        delete iFlags;
+        delete[] iHeight;
+        delete[] iFlags;
+
         if (other.iHeight)
         {
-            iHeight = new float[(iTilesX+1)*(iTilesY+1)];
-            memcpy(iHeight, other.iHeight, (iTilesX+1)*(iTilesY+1)*sizeof(float));
+            iHeight = new float[(iTilesX + 1) * (iTilesY + 1)];
+            memcpy(iHeight, other.iHeight, (iTilesX + 1) * (iTilesY + 1) * sizeof(float));
         }
         else
-            iHeight = 0;
+            iHeight = NULL;
         if (other.iFlags)
         {
             iFlags = new uint8[iTilesX * iTilesY];
             memcpy(iFlags, other.iFlags, iTilesX * iTilesY);
         }
         else
-            iFlags = 0;
+            iFlags = NULL;
+
         return *this;
     }
 
-    bool WmoLiquid::GetLiquidHeight(const Vector3 &pos, float &liqHeight) const
+    bool WmoLiquid::GetLiquidHeight(const Vector3& pos, float& liqHeight) const
     {
-        float tx_f = (pos.x - iCorner.x)/LIQUID_TILE_SIZE;
+        float tx_f = (pos.x - iCorner.x) / LIQUID_TILE_SIZE;
         uint32 tx = uint32(tx_f);
         if (tx_f < 0.0f || tx >= iTilesX)
             return false;
-        float ty_f = (pos.y - iCorner.y)/LIQUID_TILE_SIZE;
+        float ty_f = (pos.y - iCorner.y) / LIQUID_TILE_SIZE;
         uint32 ty = uint32(ty_f);
         if (ty_f < 0.0f || ty >= iTilesY)
             return false;
 
         // check if tile shall be used for liquid level
         // checking for 0x08 *might* be enough, but disabled tiles always are 0x?F:
-        if ((iFlags[tx + ty*iTilesX] & 0x0F) == 0x0F)
+        if ((iFlags[tx + ty * iTilesX] & 0x0F) == 0x0F)
             return false;
 
         // (dx, dy) coordinates inside tile, in [0,1]^2
@@ -181,14 +186,14 @@ namespace VMAP
         const uint32 rowOffset = iTilesX + 1;
         if (dx > dy) // case (a)
         {
-            float sx = iHeight[tx+1 +  ty    * rowOffset] - iHeight[tx   + ty * rowOffset];
-            float sy = iHeight[tx+1 + (ty+1) * rowOffset] - iHeight[tx+1 + ty * rowOffset];
+            float sx = iHeight[tx + 1 +  ty    * rowOffset] - iHeight[tx   + ty * rowOffset];
+            float sy = iHeight[tx + 1 + (ty + 1) * rowOffset] - iHeight[tx + 1 + ty * rowOffset];
             liqHeight = iHeight[tx + ty * rowOffset] + dx * sx + dy * sy;
         }
         else // case (b)
         {
-            float sx = iHeight[tx+1 + (ty+1) * rowOffset] - iHeight[tx + (ty+1) * rowOffset];
-            float sy = iHeight[tx   + (ty+1) * rowOffset] - iHeight[tx +  ty    * rowOffset];
+            float sx = iHeight[tx + 1 + (ty + 1) * rowOffset] - iHeight[tx + (ty + 1) * rowOffset];
+            float sy = iHeight[tx   + (ty + 1) * rowOffset] - iHeight[tx +  ty    * rowOffset];
             liqHeight = iHeight[tx + ty * rowOffset] + dx * sx + dy * sy;
         }
         return true;
@@ -197,34 +202,34 @@ namespace VMAP
     uint32 WmoLiquid::GetFileSize()
     {
         return 2 * sizeof(uint32) +
-                sizeof(Vector3) +
-                (iTilesX + 1)*(iTilesY + 1) * sizeof(float) +
-                iTilesX * iTilesY;
+               sizeof(Vector3) +
+               (iTilesX + 1) * (iTilesY + 1) * sizeof(float) +
+               iTilesX * iTilesY;
     }
 
-    bool WmoLiquid::writeToFile(FILE *wf)
+    bool WmoLiquid::writeToFile(FILE* wf)
     {
         bool result = true;
         if (result && fwrite(&iTilesX, sizeof(uint32), 1, wf) != 1) result = false;
         if (result && fwrite(&iTilesY, sizeof(uint32), 1, wf) != 1) result = false;
         if (result && fwrite(&iCorner, sizeof(Vector3), 1, wf) != 1) result = false;
         if (result && fwrite(&iType, sizeof(uint32), 1, wf) != 1) result = false;
-        uint32 size = (iTilesX + 1)*(iTilesY + 1);
+        uint32 size = (iTilesX + 1) * (iTilesY + 1);
         if (result && fwrite(iHeight, sizeof(float), size, wf) != size) result = false;
-        size = iTilesX*iTilesY;
+        size = iTilesX * iTilesY;
         if (result && fwrite(iFlags, sizeof(uint8), size, wf) != size) result = false;
         return result;
     }
 
-    bool WmoLiquid::readFromFile(FILE *rf, WmoLiquid *&out)
+    bool WmoLiquid::readFromFile(FILE* rf, WmoLiquid*& out)
     {
         bool result = true;
-        WmoLiquid *liquid = new WmoLiquid();
+        WmoLiquid* liquid = new WmoLiquid();
         if (result && fread(&liquid->iTilesX, sizeof(uint32), 1, rf) != 1) result = false;
         if (result && fread(&liquid->iTilesY, sizeof(uint32), 1, rf) != 1) result = false;
         if (result && fread(&liquid->iCorner, sizeof(Vector3), 1, rf) != 1) result = false;
         if (result && fread(&liquid->iType, sizeof(uint32), 1, rf) != 1) result = false;
-        uint32 size = (liquid->iTilesX + 1)*(liquid->iTilesY + 1);
+        uint32 size = (liquid->iTilesX + 1) * (liquid->iTilesY + 1);
         liquid->iHeight = new float[size];
         if (result && fread(liquid->iHeight, sizeof(float), size, rf) != size) result = false;
         size = liquid->iTilesX * liquid->iTilesY;
@@ -238,7 +243,7 @@ namespace VMAP
 
     // ===================== GroupModel ==================================
 
-    GroupModel::GroupModel(const GroupModel &other):
+    GroupModel::GroupModel(const GroupModel& other):
         iBound(other.iBound), iMogpFlags(other.iMogpFlags), iGroupWMOID(other.iGroupWMOID),
         vertices(other.vertices), triangles(other.triangles), meshTree(other.meshTree), iLiquid(0)
     {
@@ -246,7 +251,7 @@ namespace VMAP
             iLiquid = new WmoLiquid(*other.iLiquid);
     }
 
-    void GroupModel::setMeshData(std::vector<Vector3> &vert, std::vector<MeshTriangle> &tri)
+    void GroupModel::setMeshData(std::vector<Vector3>& vert, std::vector<MeshTriangle>& tri)
     {
         vertices.swap(vert);
         triangles.swap(tri);
@@ -254,7 +259,7 @@ namespace VMAP
         meshTree.build(triangles, bFunc);
     }
 
-    bool GroupModel::writeToFile(FILE *wf)
+    bool GroupModel::writeToFile(FILE* wf)
     {
         bool result = true;
         uint32 chunkSize, count;
@@ -266,7 +271,7 @@ namespace VMAP
         // write vertices
         if (result && fwrite("VERT", 1, 4, wf) != 4) result = false;
         count = vertices.size();
-        chunkSize = sizeof(uint32)+ sizeof(Vector3)*count;
+        chunkSize = sizeof(uint32) + sizeof(Vector3) * count;
         if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false;
         if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1) result = false;
         if (!count) // models without (collision) geometry end here, unsure if they are useful
@@ -276,10 +281,11 @@ namespace VMAP
         // write triangle mesh
         if (result && fwrite("TRIM", 1, 4, wf) != 4) result = false;
         count = triangles.size();
-        chunkSize = sizeof(uint32)+ sizeof(MeshTriangle)*count;
+        chunkSize = sizeof(uint32) + sizeof(MeshTriangle) * count;
         if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false;
         if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1) result = false;
-        if (result && fwrite(&triangles[0], sizeof(MeshTriangle), count, wf) != count) result = false;
+        if (count)
+            if (result && fwrite(&triangles[0], sizeof(MeshTriangle), count, wf) != count) result = false;
 
         // write mesh BIH
         if (result && fwrite("MBIH", 1, 4, wf) != 4) result = false;
@@ -287,24 +293,19 @@ namespace VMAP
 
         // write liquid data
         if (result && fwrite("LIQU", 1, 4, wf) != 4) result = false;
-        if (!iLiquid)
-        {
-            chunkSize = 0;
-            if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false;
-            return result;
-        }
-        chunkSize = iLiquid->GetFileSize();
+        chunkSize = iLiquid ? iLiquid->GetFileSize() : 0;
         if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false;
-        if (result) result = iLiquid->writeToFile(wf);
+        if (chunkSize)
+            if (result) result = iLiquid->writeToFile(wf);
 
         return result;
     }
 
-    bool GroupModel::readFromFile(FILE *rf)
+    bool GroupModel::readFromFile(FILE* rf)
     {
         char chunk[8];
         bool result = true;
-        uint32 chunkSize, count;
+        uint32 chunkSize, count = 0;
         triangles.clear();
         vertices.clear();
         delete iLiquid;
@@ -327,14 +328,17 @@ namespace VMAP
         if (result && !readChunk(rf, chunk, "TRIM", 4)) result = false;
         if (result && fread(&chunkSize, sizeof(uint32), 1, rf) != 1) result = false;
         if (result && fread(&count, sizeof(uint32), 1, rf) != 1) result = false;
-        if (result) triangles.resize(count);
-        if (result && fread(&triangles[0], sizeof(MeshTriangle), count, rf) != count) result = false;
+        if (count)
+        {
+            if (result) triangles.resize(count);
+            if (result && fread(&triangles[0], sizeof(MeshTriangle), count, rf) != count) result = false;
+        }
 
         // read mesh BIH
         if (result && !readChunk(rf, chunk, "MBIH", 4)) result = false;
         if (result) result = meshTree.readFromFile(rf);
 
-        // write liquid data
+        // read liquid data
         if (result && !readChunk(rf, chunk, "LIQU", 4)) result = false;
         if (result && fread(&chunkSize, sizeof(uint32), 1, rf) != 1) result = false;
         if (result && chunkSize > 0)
@@ -344,12 +348,12 @@ namespace VMAP
 
     struct GModelRayCallback
     {
-        GModelRayCallback(const std::vector<MeshTriangle> &tris, const std::vector<Vector3> &vert):
+        GModelRayCallback(const std::vector<MeshTriangle>& tris, const std::vector<Vector3>& vert):
             vertices(vert.begin()), triangles(tris.begin()), hit(false) {}
-        bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit)
+        bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool /*pStopAtFirstHit*/)
         {
             bool result = IntersectTriangle(triangles[entry], vertices, ray, distance);
-            if (result)  hit=true;
+            if (result)  hit = true;
             return hit;
         }
         std::vector<Vector3>::const_iterator vertices;
@@ -357,18 +361,19 @@ namespace VMAP
         bool hit;
     };
 
-    bool GroupModel::IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const
+    bool GroupModel::IntersectRay(const G3D::Ray& ray, float& distance, bool stopAtFirstHit) const
     {
-        if (!triangles.size())
+        if (triangles.empty())
             return false;
+
         GModelRayCallback callback(triangles, vertices);
         meshTree.intersectRay(ray, callback, distance, stopAtFirstHit);
         return callback.hit;
     }
 
-    bool GroupModel::IsInsideObject(const Vector3 &pos, const Vector3 &down, float &z_dist) const
+    bool GroupModel::IsInsideObject(const Vector3& pos, const Vector3& down, float& z_dist) const
     {
-        if (!triangles.size() || !iBound.contains(pos))
+        if (triangles.empty() || !iBound.contains(pos))
             return false;
         GModelRayCallback callback(triangles, vertices);
         Vector3 rPos = pos - 0.1f * down;
@@ -380,7 +385,7 @@ namespace VMAP
         return hit;
     }
 
-    bool GroupModel::GetLiquidLevel(const Vector3 &pos, float &liqHeight) const
+    bool GroupModel::GetLiquidLevel(const Vector3& pos, float& liqHeight) const
     {
         if (iLiquid)
             return iLiquid->GetLiquidHeight(pos, liqHeight);
@@ -389,15 +394,14 @@ namespace VMAP
 
     uint32 GroupModel::GetLiquidType() const
     {
-        // convert to type mask, matching MAP_LIQUID_TYPE_* defines in Map.h
         if (iLiquid)
-            return (1 << iLiquid->GetType());
+            return iLiquid->GetType();
         return 0;
     }
 
     // ===================== WorldModel ==================================
 
-    void WorldModel::setGroupModels(std::vector<GroupModel> &models)
+    void WorldModel::setGroupModels(std::vector<GroupModel>& models)
     {
         groupModels.swap(models);
         groupTree.build(groupModels, BoundsTrait<GroupModel>::getBounds, 1);
@@ -405,18 +409,18 @@ namespace VMAP
 
     struct WModelRayCallBack
     {
-        WModelRayCallBack(const std::vector<GroupModel> &mod): models(mod.begin()), hit(false) {}
+        WModelRayCallBack(const std::vector<GroupModel>& mod): models(mod.begin()), hit(false) {}
         bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit)
         {
             bool result = models[entry].IntersectRay(ray, distance, pStopAtFirstHit);
-            if (result)  hit=true;
+            if (result)  hit = true;
             return hit;
         }
         std::vector<GroupModel>::const_iterator models;
         bool hit;
     };
 
-    bool WorldModel::IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const
+    bool WorldModel::IntersectRay(const G3D::Ray& ray, float& distance, bool stopAtFirstHit) const
     {
         // small M2 workaround, maybe better make separate class with virtual intersection funcs
         // in any case, there's no need to use a bound tree if we only have one submodel
@@ -428,9 +432,10 @@ namespace VMAP
         return isc.hit;
     }
 
-    class WModelAreaCallback {
+    class WModelAreaCallback
+    {
         public:
-            WModelAreaCallback(const std::vector<GroupModel> &vals, const Vector3 &down):
+            WModelAreaCallback(const std::vector<GroupModel>& vals, const Vector3& down):
                 prims(vals.begin()), hit(vals.end()), minVol(G3D::inf()), zDist(G3D::inf()), zVec(down) {}
             std::vector<GroupModel>::const_iterator prims;
             std::vector<GroupModel>::const_iterator hit;
@@ -440,35 +445,36 @@ namespace VMAP
             void operator()(const Vector3& point, uint32 entry)
             {
                 float group_Z;
-                //float pVol = prims[entry].GetBound().volume();
-                //if(pVol < minVol)
+                // float pVol = prims[entry].GetBound().volume();
+                // if(pVol < minVol)
                 //{
-                    /* if (prims[entry].iBound.contains(point)) */
-                    if (prims[entry].IsInsideObject(point, zVec, group_Z))
+                /* if (prims[entry].iBound.contains(point)) */
+                if (prims[entry].IsInsideObject(point, zVec, group_Z))
+                {
+                    // minVol = pVol;
+                    // hit = prims + entry;
+                    if (group_Z < zDist)
                     {
-                        //minVol = pVol;
-                        //hit = prims + entry;
-                        if (group_Z < zDist)
-                        {
-                            zDist = group_Z;
-                            hit = prims + entry;
-                        }
+                        zDist = group_Z;
+                        hit = prims + entry;
+                    }
 #ifdef VMAP_DEBUG
-                        const GroupModel &gm = prims[entry];
-                        printf("%10u %8X %7.3f,%7.3f,%7.3f | %7.3f,%7.3f,%7.3f | z=%f, p_z=%f\n", gm.GetWmoID(), gm.GetMogpFlags(),
-                        gm.GetBound().low().x, gm.GetBound().low().y, gm.GetBound().low().z,
-                        gm.GetBound().high().x, gm.GetBound().high().y, gm.GetBound().high().z, group_Z, point.z);
+                    const GroupModel& gm = prims[entry];
+                    printf("%10u %8X %7.3f,%7.3f,%7.3f | %7.3f,%7.3f,%7.3f | z=%f, p_z=%f\n", gm.GetWmoID(), gm.GetMogpFlags(),
+                           gm.GetBound().low().x, gm.GetBound().low().y, gm.GetBound().low().z,
+                           gm.GetBound().high().x, gm.GetBound().high().y, gm.GetBound().high().z, group_Z, point.z);
 #endif
-                    }
+                }
                 //}
-                //std::cout << "trying to intersect '" << prims[entry].name << "'\n";
+                // std::cout << "trying to intersect '" << prims[entry].name << "'\n";
             }
     };
 
-    bool WorldModel::IntersectPoint(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, AreaInfo &info) const
+    bool WorldModel::IntersectPoint(const G3D::Vector3& p, const G3D::Vector3& down, float& dist, AreaInfo& info) const
     {
-        if (!groupModels.size())
+        if (groupModels.empty())
             return false;
+
         WModelAreaCallback callback(groupModels, down);
         groupTree.intersectPoint(p, callback);
         if (callback.hit != groupModels.end())
@@ -483,10 +489,11 @@ namespace VMAP
         return false;
     }
 
-    bool WorldModel::GetLocationInfo(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, LocationInfo &info) const
+    bool WorldModel::GetLocationInfo(const G3D::Vector3& p, const G3D::Vector3& down, float& dist, LocationInfo& info) const
     {
-        if (!groupModels.size())
+        if (groupModels.empty())
             return false;
+
         WModelAreaCallback callback(groupModels, down);
         groupTree.intersectPoint(p, callback);
         if (callback.hit != groupModels.end())
@@ -498,29 +505,28 @@ namespace VMAP
         return false;
     }
 
-    bool WorldModel::writeFile(const std::string &filename)
+    bool WorldModel::writeFile(const std::string& filename)
     {
-        FILE *wf = fopen(filename.c_str(), "wb");
+        FILE* wf = fopen(filename.c_str(), "wb");
         if (!wf)
             return false;
 
-        bool result = true;
         uint32 chunkSize, count;
-        result = fwrite(VMAP_MAGIC,1,8,wf) == 8;
+        bool result = fwrite(VMAP_MAGIC, 1, 8, wf) == 8;
         if (result && fwrite("WMOD", 1, 4, wf) != 4) result = false;
         chunkSize = sizeof(uint32) + sizeof(uint32);
         if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false;
         if (result && fwrite(&RootWMOID, sizeof(uint32), 1, wf) != 1) result = false;
 
         // write group models
-        count=groupModels.size();
+        count = groupModels.size();
         if (count)
         {
             if (result && fwrite("GMOD", 1, 4, wf) != 4) result = false;
-            //chunkSize = sizeof(uint32)+ sizeof(GroupModel)*count;
-            //if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false;
+            // chunkSize = sizeof(uint32)+ sizeof(GroupModel)*count;
+            // if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false;
             if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1) result = false;
-            for (uint32 i=0; i<groupModels.size() && result; ++i)
+            for (uint32 i = 0; i < groupModels.size() && result; ++i)
                 result = groupModels[i].writeToFile(wf);
 
             // write group BIH
@@ -532,14 +538,15 @@ namespace VMAP
         return result;
     }
 
-    bool WorldModel::readFile(const std::string &filename)
+    bool WorldModel::readFile(const std::string& filename)
     {
-        FILE *rf = fopen(filename.c_str(), "rb");
+        FILE* rf = fopen(filename.c_str(), "rb");
         if (!rf)
             return false;
 
         bool result = true;
-        uint32 chunkSize, count;
+        uint32 chunkSize = 0;
+        uint32 count = 0;
         char chunk[8];                          // Ignore the added magic header
         if (!readChunk(rf, chunk, VMAP_MAGIC, 8)) result = false;
 
@@ -550,12 +557,12 @@ namespace VMAP
         // read group models
         if (result && readChunk(rf, chunk, "GMOD", 4))
         {
-            //if (fread(&chunkSize, sizeof(uint32), 1, rf) != 1) result = false;
+            // if (fread(&chunkSize, sizeof(uint32), 1, rf) != 1) result = false;
 
             if (result && fread(&count, sizeof(uint32), 1, rf) != 1) result = false;
             if (result) groupModels.resize(count);
-            //if (result && fread(&groupModels[0], sizeof(GroupModel), count, rf) != count) result = false;
-            for (uint32 i=0; i<count && result; ++i)
+            // if (result && fread(&groupModels[0], sizeof(GroupModel), count, rf) != count) result = false;
+            for (uint32 i = 0; i < count && result; ++i)
                 result = groupModels[i].readFromFile(rf);
 
             // read group BIH
diff --git a/src/game/vmap/WorldModel.h b/src/game/vmap/WorldModel.h
index c5020f74bfd..c2be1c7ddac 100644
--- a/src/game/vmap/WorldModel.h
+++ b/src/game/vmap/WorldModel.h
@@ -36,8 +36,8 @@ namespace VMAP
     class MeshTriangle
     {
         public:
-            MeshTriangle(){};
-            MeshTriangle(uint32 na, uint32 nb, uint32 nc): idx0(na), idx1(nb), idx2(nc) {};
+            MeshTriangle() : idx0(0), idx1(0), idx2(0) {}
+            MeshTriangle(uint32 na, uint32 nb, uint32 nc): idx0(na), idx1(nb), idx2(nc) {}
 
             uint32 idx0;
             uint32 idx1;
@@ -47,28 +47,28 @@ namespace VMAP
     class WmoLiquid
     {
         public:
-            WmoLiquid(uint32 width, uint32 height, const Vector3 &corner, uint32 type);
-            WmoLiquid(const WmoLiquid &other);
+            WmoLiquid(uint32 width, uint32 height, const Vector3& corner, uint32 type);
+            WmoLiquid(const WmoLiquid& other);
             ~WmoLiquid();
-            WmoLiquid& operator=(const WmoLiquid &other);
-            bool GetLiquidHeight(const Vector3 &pos, float &liqHeight) const;
+            WmoLiquid& operator=(const WmoLiquid& other);
+            bool GetLiquidHeight(const Vector3& pos, float& liqHeight) const;
             uint32 GetType() const { return iType; }
-            float *GetHeightStorage() { return iHeight; }
-            uint8 *GetFlagsStorage() { return iFlags; }
+            float* GetHeightStorage() { return iHeight; }
+            uint8* GetFlagsStorage() { return iFlags; }
             uint32 GetFileSize();
-            bool writeToFile(FILE *wf);
-            static bool readFromFile(FILE *rf, WmoLiquid *&liquid);
+            bool writeToFile(FILE* wf);
+            static bool readFromFile(FILE* rf, WmoLiquid*& liquid);
         private:
-            WmoLiquid(): iHeight(0), iFlags(0) {};
+            WmoLiquid() : iTilesX(0), iTilesY(0), iType(0), iHeight(0), iFlags(0) {}
             uint32 iTilesX;  //!< number of tiles in x direction, each
             uint32 iTilesY;
             Vector3 iCorner; //!< the lower corner
             uint32 iType;    //!< liquid type
-            float *iHeight;  //!< (tilesX + 1)*(tilesY + 1) height values
-            uint8 *iFlags;   //!< info if liquid tile is used
+            float* iHeight;  //!< (tilesX + 1)*(tilesY + 1) height values
+            uint8* iFlags;   //!< info if liquid tile is used
 #ifdef MMAP_GENERATOR
         public:
-            void getPosInfo(uint32 &tilesX, uint32 &tilesY, Vector3 &corner) const;
+            void getPosInfo(uint32& tilesX, uint32& tilesY, Vector3& corner) const;
 #endif
     };
 
@@ -76,21 +76,21 @@ namespace VMAP
     class GroupModel
     {
         public:
-            GroupModel(): iLiquid(0) {}
-            GroupModel(const GroupModel &other);
-            GroupModel(uint32 mogpFlags, uint32 groupWMOID, const AABox &bound):
-                        iBound(bound), iMogpFlags(mogpFlags), iGroupWMOID(groupWMOID), iLiquid(0) {}
+            GroupModel() : iMogpFlags(0), iGroupWMOID(0), iLiquid(NULL) {}
+            GroupModel(const GroupModel& other);
+            GroupModel(uint32 mogpFlags, uint32 groupWMOID, const AABox& bound) :
+                iBound(bound), iMogpFlags(mogpFlags), iGroupWMOID(groupWMOID), iLiquid(NULL) {}
             ~GroupModel() { delete iLiquid; }
 
             //! pass mesh data to object and create BIH. Passed vectors get get swapped with old geometry!
-            void setMeshData(std::vector<Vector3> &vert, std::vector<MeshTriangle> &tri);
-            void setLiquidData(WmoLiquid *liquid) { iLiquid = liquid; }
-            bool IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const;
-            bool IsInsideObject(const Vector3 &pos, const Vector3 &down, float &z_dist) const;
-            bool GetLiquidLevel(const Vector3 &pos, float &liqHeight) const;
+            void setMeshData(std::vector<Vector3>& vert, std::vector<MeshTriangle>& tri);
+            void setLiquidData(WmoLiquid*& liquid) { iLiquid = liquid; liquid = NULL; }
+            bool IntersectRay(const G3D::Ray& ray, float& distance, bool stopAtFirstHit) const;
+            bool IsInsideObject(const Vector3& pos, const Vector3& down, float& z_dist) const;
+            bool GetLiquidLevel(const Vector3& pos, float& liqHeight) const;
             uint32 GetLiquidType() const;
-            bool writeToFile(FILE *wf);
-            bool readFromFile(FILE *rf);
+            bool writeToFile(FILE* wf);
+            bool readFromFile(FILE* rf);
             const G3D::AABox& GetBound() const { return iBound; }
             uint32 GetMogpFlags() const { return iMogpFlags; }
             uint32 GetWmoID() const { return iGroupWMOID; }
@@ -101,11 +101,11 @@ namespace VMAP
             std::vector<Vector3> vertices;
             std::vector<MeshTriangle> triangles;
             BIH meshTree;
-            WmoLiquid *iLiquid;
+            WmoLiquid* iLiquid;
 
 #ifdef MMAP_GENERATOR
         public:
-            void getMeshData(std::vector<Vector3> &vertices, std::vector<MeshTriangle> &triangles, WmoLiquid* &liquid);
+            void getMeshData(std::vector<Vector3>& vertices, std::vector<MeshTriangle>& triangles, WmoLiquid*& liquid);
 #endif
     };
     /*! Holds a model (converted M2 or WMO) in its original coordinate space */
@@ -115,13 +115,13 @@ namespace VMAP
             WorldModel(): RootWMOID(0) {}
 
             //! pass group models to WorldModel and create BIH. Passed vector is swapped with old geometry!
-            void setGroupModels(std::vector<GroupModel> &models);
+            void setGroupModels(std::vector<GroupModel>& models);
             void setRootWmoID(uint32 id) { RootWMOID = id; }
-            bool IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const;
-            bool IntersectPoint(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, AreaInfo &info) const;
-            bool GetLocationInfo(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, LocationInfo &info) const;
-            bool writeFile(const std::string &filename);
-            bool readFile(const std::string &filename);
+            bool IntersectRay(const G3D::Ray& ray, float& distance, bool stopAtFirstHit) const;
+            bool IntersectPoint(const G3D::Vector3& p, const G3D::Vector3& down, float& dist, AreaInfo& info) const;
+            bool GetLocationInfo(const G3D::Vector3& p, const G3D::Vector3& down, float& dist, LocationInfo& info) const;
+            bool writeFile(const std::string& filename);
+            bool readFile(const std::string& filename);
         protected:
             uint32 RootWMOID;
             std::vector<GroupModel> groupModels;
@@ -129,7 +129,7 @@ namespace VMAP
 
 #ifdef MMAP_GENERATOR
         public:
-            void getGroupModels(std::vector<GroupModel> &groupModels);
+            void getGroupModels(std::vector<GroupModel>& groupModels);
 #endif
     };
 } // namespace VMAP
diff --git a/src/game/warden/WardenBase.cpp b/src/game/warden/WardenBase.cpp
new file mode 100644
index 00000000000..aee06b68787
--- /dev/null
+++ b/src/game/warden/WardenBase.cpp
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Common.h"
+#include "WorldPacket.h"
+#include "../WorldSession.h"
+#include "Log.h"
+#include "../Opcodes.h"
+#include "ByteBuffer.h"
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#include "../World.h"
+#include "../Player.h"
+#include "Util.h"
+#include "WardenBase.h"
+#include "WardenWin.h"
+
+WardenBase::WardenBase() : iCrypto(16), oCrypto(16), m_WardenCheckTimer(10000/*10 sec*/), m_WardenKickTimer(0), m_WardenDataSent(false), m_initialized(false)
+{
+}
+
+WardenBase::~WardenBase()
+{
+    delete[] Module->CompressedData;
+    delete Module;
+    Module = NULL;
+    m_initialized = false;
+}
+
+void WardenBase::Init(WorldSession *pClient, BigNumber *K)
+{
+    MANGOS_ASSERT(false);
+}
+
+ClientWardenModule *WardenBase::GetModuleForClient(WorldSession *session)
+{
+    MANGOS_ASSERT(false);
+    return NULL;
+}
+
+void WardenBase::InitializeModule()
+{
+    MANGOS_ASSERT(false);
+}
+
+void WardenBase::RequestHash()
+{
+    MANGOS_ASSERT(false);
+}
+
+void WardenBase::HandleHashResult(ByteBuffer &buff)
+{
+    MANGOS_ASSERT(false);
+}
+
+void WardenBase::RequestData()
+{
+    MANGOS_ASSERT(false);
+}
+
+void WardenBase::HandleData(ByteBuffer &buff)
+{
+    MANGOS_ASSERT(false);
+}
+
+void WardenBase::SendModuleToClient()
+{
+    DEBUG_LOG("WARDEN: Send module to client");
+
+    // Create packet structure
+    WardenModuleTransfer pkt;
+
+    uint32 size_left = Module->CompressedSize;
+    uint32 pos = 0;
+    uint16 burst_size;
+    while (size_left > 0)
+    {
+        burst_size = size_left < 500 ? size_left : 500;
+        pkt.Command = WARDEN_SMSG_MODULE_CACHE;
+        pkt.DataSize = burst_size;
+        memcpy(pkt.Data, &Module->CompressedData[pos], burst_size);
+        size_left -= burst_size;
+        pos += burst_size;
+
+        EncryptData((uint8*)&pkt, burst_size + 3);
+        WorldPacket pkt1(SMSG_WARDEN_DATA, burst_size + 3);
+        pkt1.append((uint8*)&pkt, burst_size + 3);
+        Client->SendPacket(&pkt1);
+    }
+}
+
+void WardenBase::RequestModule()
+{
+    DEBUG_LOG("WARDEN: Request module");
+
+    // Create packet structure
+    WardenModuleUse Request;
+    Request.Command = WARDEN_SMSG_MODULE_USE;
+
+    memcpy(Request.Module_Id, Module->ID, 16);
+    memcpy(Request.Module_Key, Module->Key, 16);
+    Request.Size = Module->CompressedSize;
+
+    // Encrypt with warden RC4 key.
+    EncryptData((uint8*)&Request, sizeof(WardenModuleUse));
+
+    WorldPacket pkt(SMSG_WARDEN_DATA, sizeof(WardenModuleUse));
+    pkt.append((uint8*)&Request, sizeof(WardenModuleUse));
+    Client->SendPacket(&pkt);
+}
+
+void WardenBase::Update()
+{
+    if (m_initialized)
+    {
+        uint32 ticks = WorldTimer::getMSTime();
+        uint32 diff = ticks - m_WardenTimer;
+        m_WardenTimer = ticks;
+
+        if (m_WardenDataSent)
+        {
+            // 1.5 minutes after send packet
+            if (m_WardenKickTimer > 90 * IN_MILLISECONDS)
+            {
+                if (Client->GetPlayer())
+                    Client->GetPlayer()->GetAntiCheat()->DoAntiCheatCheck(CHECK_WARDEN_TIMEOUT,0,true);
+            }
+            else
+                m_WardenKickTimer += diff;
+        }
+        else if (m_WardenCheckTimer > 0)
+        {
+            if (diff >= m_WardenCheckTimer)
+            {
+                RequestData();
+                // 25-35 second
+                m_WardenCheckTimer = irand(25, 35) * IN_MILLISECONDS;
+            }
+            else
+                m_WardenCheckTimer -= diff;
+        }
+    }
+}
+
+void WardenBase::DecryptData(uint8 *Buffer, uint32 Len)
+{
+    iCrypto.UpdateData(Len, Buffer);
+}
+
+void WardenBase::EncryptData(uint8 *Buffer, uint32 Len)
+{
+    oCrypto.UpdateData(Len, Buffer);
+}
+
+void WardenBase::PrintHexArray(const char *Before, const uint8 *Buffer, uint32 Len, bool BreakWithNewline)
+{
+    printf("%s", Before);
+    for (uint32 i = 0; i < Len; ++i)
+        printf("%02X ", Buffer[i]);
+    if (BreakWithNewline)
+        printf("\n");
+}
+
+bool WardenBase::IsValidCheckSum(uint32 checksum, const uint8 *Data, const uint16 Length)
+{
+    uint32 newchecksum = BuildChecksum(Data, Length);
+
+    if (checksum != newchecksum)
+    {
+        sLog.outError("WARDEN: CHECKSUM IS NOT VALID");
+        return false;
+    }
+    else
+    {
+        DEBUG_LOG("WARDEN: CHECKSUM IS VALID");
+        return true;
+    }
+}
+
+uint32 WardenBase::BuildChecksum(const uint8* data, uint32 dataLen)
+{
+    uint8 hash[20];
+    SHA1(data, dataLen, hash);
+    uint32 checkSum = 0;
+    for (uint8 i = 0; i < 5; ++i)
+        checkSum = checkSum ^ *(uint32*)(&hash[0] + i * 4);
+    return checkSum;
+}
+
+void WorldSession::HandleWardenDataOpcode(WorldPacket & recv_data)
+{
+    if (!m_Warden)
+        return;
+
+    m_Warden->DecryptData(const_cast<uint8*>(recv_data.contents()), recv_data.size());
+    uint8 Opcode;
+    recv_data >> Opcode;
+    DEBUG_LOG("WARDEN: Got packet, opcode %02X, size " SIZEFMTD, Opcode, recv_data.size());
+    recv_data.hexlike();
+
+    switch(Opcode)
+    {
+        case WARDEN_CMSG_MODULE_MISSING:
+            m_Warden->SendModuleToClient();
+            break;
+        case WARDEN_CMSG_MODULE_OK:
+            m_Warden->RequestHash();
+            break;
+        case WARDEN_CMSG_CHEAT_CHECKS_RESULT:
+            m_Warden->HandleData(recv_data);
+            break;
+        case WARDEN_CMSG_MEM_CHECKS_RESULT:
+            DEBUG_LOG("WARDEN: NYI WARDEN_CMSG_MEM_CHECKS_RESULT received!");
+            break;
+        case WARDEN_CMSG_HASH_RESULT:
+            m_Warden->HandleHashResult(recv_data);
+            m_Warden->InitializeModule();
+            break;
+        case WARDEN_CMSG_MODULE_FAILED:
+            sLog.outError("WARDEN: NYI WARDEN_CMSG_MODULE_FAILED received!");
+            break;
+        default:
+            DEBUG_LOG("WARDEN: Got unknown warden opcode %02X of size " SIZEFMTD, Opcode, recv_data.size() - 1);
+            break;
+    }
+}
diff --git a/src/game/warden/WardenBase.h b/src/game/warden/WardenBase.h
new file mode 100644
index 00000000000..0612961438c
--- /dev/null
+++ b/src/game/warden/WardenBase.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _WARDEN_BASE_H
+#define _WARDEN_BASE_H
+
+#include "Auth/SARC4.h"
+#include <map>
+#include "Auth/BigNumber.h"
+#include "ByteBuffer.h"
+
+enum WardenOpcodes
+{
+    // Client->Server
+    WARDEN_CMSG_MODULE_MISSING                  = 0,
+    WARDEN_CMSG_MODULE_OK                       = 1,
+    WARDEN_CMSG_CHEAT_CHECKS_RESULT             = 2,
+    WARDEN_CMSG_MEM_CHECKS_RESULT               = 3,        // only sent if MEM_CHECK bytes doesn't match
+    WARDEN_CMSG_HASH_RESULT                     = 4,
+    WARDEN_CMSG_MODULE_FAILED                   = 5,        // this is sent when client failed to load uploaded module due to cache fail
+
+    // Server->Client
+    WARDEN_SMSG_MODULE_USE                      = 0,
+    WARDEN_SMSG_MODULE_CACHE                    = 1,
+    WARDEN_SMSG_CHEAT_CHECKS_REQUEST            = 2,
+    WARDEN_SMSG_MODULE_INITIALIZE               = 3,
+    WARDEN_SMSG_MEM_CHECKS_REQUEST              = 4,        // byte len; whole(!EOF) { byte unk(1); byte index(++); string module(can be 0); int offset; byte len; byte[] bytes_to_compare[len]; }
+    WARDEN_SMSG_HASH_REQUEST                    = 5
+};
+
+#if defined(__GNUC__)
+#pragma pack(1)
+#else
+#pragma pack(push,1)
+#endif
+
+struct WardenModuleUse
+{
+    uint8 Command;
+    uint8 Module_Id[16];
+    uint8 Module_Key[16];
+    uint32 Size;
+};
+
+struct WardenModuleTransfer
+{
+    uint8 Command;
+    uint16 DataSize;
+    uint8 Data[500];
+};
+
+struct WardenHashRequest
+{
+    uint8 Command;
+    uint8 Seed[16];
+};
+
+#if defined(__GNUC__)
+#pragma pack()
+#else
+#pragma pack(pop)
+#endif
+
+struct ClientWardenModule
+{
+    uint8 ID[16];
+    uint8 Key[16];
+    uint32 CompressedSize;
+    uint8 *CompressedData;
+};
+
+class WorldSession;
+
+class WardenBase
+{
+    friend class WardenWin;
+    friend class WardenMac;
+
+    public:
+        WardenBase();
+        virtual ~WardenBase();
+
+        virtual void Init(WorldSession *pClient, BigNumber *K);
+        virtual ClientWardenModule *GetModuleForClient(WorldSession *session);
+        virtual void InitializeModule();
+        virtual void RequestHash();
+        virtual void HandleHashResult(ByteBuffer &buff);
+        virtual void RequestData();
+        virtual void HandleData(ByteBuffer &buff);
+
+        void SendModuleToClient();
+        void RequestModule();
+        void Update();
+        void DecryptData(uint8 *Buffer, uint32 Len);
+        void EncryptData(uint8 *Buffer, uint32 Len);
+
+        static void PrintHexArray(const char *Before, const uint8 *Buffer, uint32 Len, bool BreakWithNewline);
+        static bool IsValidCheckSum(uint32 checksum, const uint8 *Data, const uint16 Length);
+        static uint32 BuildChecksum(const uint8 *data, uint32 dataLen);
+
+    private:
+        WorldSession *Client;
+        uint8 InputKey[16];
+        uint8 OutputKey[16];
+        uint8 Seed[16];
+        SARC4 iCrypto;
+        SARC4 oCrypto;
+        uint32 m_WardenCheckTimer;                          // timer between data packets
+        uint32 m_WardenKickTimer;                           // time after send packet
+        bool m_WardenDataSent;
+        uint32 m_WardenTimer;
+        ClientWardenModule *Module;
+        bool m_initialized;
+};
+
+#endif
diff --git a/src/game/warden/WardenDataStorage.cpp b/src/game/warden/WardenDataStorage.cpp
new file mode 100644
index 00000000000..48561e24100
--- /dev/null
+++ b/src/game/warden/WardenDataStorage.cpp
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Common.h"
+#include "WorldPacket.h"
+#include "../WorldSession.h"
+#include "Log.h"
+#include "ProgressBar.h"
+#include "Database/DatabaseEnv.h"
+#include "Util.h"
+#include "WardenDataStorage.h"
+#include "WardenWin.h"
+#include "../World.h"
+
+CWardenDataStorage::CWardenDataStorage()
+{
+    InternalDataID = 1;
+}
+
+CWardenDataStorage::~CWardenDataStorage()
+{
+    std::map<uint32, WardenData*>::iterator itr1 = _data_map.begin();
+    for (; itr1 != _data_map.end(); ++itr1)
+        delete itr1->second;
+
+    std::map<uint32, WardenDataResult*>::iterator itr2 = _result_map.begin();
+    for (; itr2 != _result_map.end(); ++itr2)
+        delete itr2->second;
+}
+
+void CWardenDataStorage::Init()
+{
+    LoadWardenDataResult();
+}
+
+void CWardenDataStorage::LoadWardenDataResult()
+{
+    // Check if Warden is enabled by config before loading anything
+    if (!sWorld.getConfig(CONFIG_BOOL_ANTICHEAT_WARDEN))
+    {
+        sLog.outString(">> Warden disabled, loading checks skipped.");
+        sLog.outString();
+        return;
+    }
+
+    QueryResult *result = LoginDatabase.Query("SELECT `check`, `data`, `result`, `address`, `length`, `str` FROM warden_data_result");
+
+    uint32 count = 0;
+
+    if (!result)
+    {
+        BarGoLink bar(1);
+        bar.step();
+
+        sLog.outString();
+        sLog.outString(">> Loaded %u warden data and results", count);
+        return;
+    }
+
+    BarGoLink bar((int)result->GetRowCount());
+
+    do
+    {
+        ++count;
+        bar.step();
+
+        Field *fields = result->Fetch();
+
+        uint8 type = fields[0].GetUInt8();
+
+        uint32 id = GenerateInternalDataID();
+        WardenData *wd = new WardenData();
+        wd->Type = type;
+
+        if (type == PAGE_CHECK_A || type == PAGE_CHECK_B || type == DRIVER_CHECK)
+        {
+            std::string data = fields[1].GetCppString();
+            wd->i.SetHexStr(data.c_str());
+            int len = data.size() / 2;
+            if (wd->i.GetNumBytes() < len)
+            {
+                uint8 temp[24];
+                memset(temp, 0, len);
+                memcpy(temp, wd->i.AsByteArray(), wd->i.GetNumBytes());
+                std::reverse(temp, temp + len);
+                wd->i.SetBinary((uint8*)temp, len);
+            }
+        }
+
+        if (type == MEM_CHECK || type == MODULE_CHECK)
+            MemCheckIds.push_back(id);
+
+        if (type == MEM_CHECK || type == PAGE_CHECK_A || type == PAGE_CHECK_B || type == PROC_CHECK)
+        {
+            wd->Address = fields[3].GetUInt32();
+            wd->Length = fields[4].GetUInt8();
+        }
+
+        // PROC_CHECK support missing
+        if (type == MEM_CHECK || type == MPQ_CHECK || type == LUA_STR_CHECK || type == DRIVER_CHECK || type == MODULE_CHECK)
+            wd->str = fields[5].GetCppString();
+
+        _data_map[id] = wd;
+
+        if (type == MPQ_CHECK || type == MEM_CHECK)
+        {
+            std::string result = fields[2].GetCppString();
+            WardenDataResult *wr = new WardenDataResult();
+            wr->res.SetHexStr(result.c_str());
+            int len = result.size() / 2;
+            if (wr->res.GetNumBytes() < len)
+            {
+                uint8 *temp = new uint8[len];
+                memset(temp, 0, len);
+                memcpy(temp, wr->res.AsByteArray(), wr->res.GetNumBytes());
+                std::reverse(temp, temp + len);
+                wr->res.SetBinary((uint8*)temp, len);
+                delete [] temp;
+            }
+            _result_map[id] = wr;
+        }
+    } while (result->NextRow());
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u warden data and results", count);
+}
+
+WardenData *CWardenDataStorage::GetWardenDataById(uint32 Id)
+{
+    std::map<uint32, WardenData*>::const_iterator itr = _data_map.find(Id);
+    if (itr != _data_map.end())
+        return itr->second;
+    return NULL;
+}
+
+WardenDataResult *CWardenDataStorage::GetWardenResultById(uint32 Id)
+{
+    std::map<uint32, WardenDataResult*>::const_iterator itr = _result_map.find(Id);
+    if (itr != _result_map.end())
+        return itr->second;
+    return NULL;
+}
diff --git a/src/game/warden/WardenDataStorage.h b/src/game/warden/WardenDataStorage.h
new file mode 100644
index 00000000000..26339fd4ce0
--- /dev/null
+++ b/src/game/warden/WardenDataStorage.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _WARDEN_DATA_STORAGE_H
+#define _WARDEN_DATA_STORAGE_H
+
+#include <map>
+#include "Auth/BigNumber.h"
+
+struct WardenData
+{
+    uint8 Type;
+    BigNumber i;
+    uint32 Address;                                         // PROC_CHECK, MEM_CHECK, PAGE_CHECK
+    uint8 Length;                                           // PROC_CHECK, MEM_CHECK, PAGE_CHECK
+    std::string str;                                        // LUA, MPQ, DRIVER
+};
+
+struct WardenDataResult
+{
+    BigNumber res;                                          // MEM_CHECK
+};
+
+class CWardenDataStorage
+{
+    public:
+        CWardenDataStorage();
+        ~CWardenDataStorage();
+        uint32 InternalDataID;
+        std::vector<uint32> MemCheckIds;
+
+    private:
+        std::map<uint32, WardenData*> _data_map;
+        std::map<uint32, WardenDataResult*> _result_map;
+
+    public:
+        inline uint32 GenerateInternalDataID() { return InternalDataID++; }
+        WardenData *GetWardenDataById(uint32 Id);
+        WardenDataResult *GetWardenResultById(uint32 Id);
+        void Init();
+
+    protected:
+        void LoadWardenDataResult();
+};
+
+extern CWardenDataStorage WardenDataStorage;
+#endif
diff --git a/src/game/warden/WardenMac.cpp b/src/game/warden/WardenMac.cpp
new file mode 100644
index 00000000000..e3254181c4a
--- /dev/null
+++ b/src/game/warden/WardenMac.cpp
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Auth/WardenKeyGeneration.h"
+#include "Common.h"
+#include "WorldPacket.h"
+#include "../WorldSession.h"
+#include "Log.h"
+#include "../Opcodes.h"
+#include "ByteBuffer.h"
+#include <openssl/md5.h>
+#include "../World.h"
+#include "../Player.h"
+#include "Util.h"
+#include "WardenMac.h"
+#include "WardenModuleMac.h"
+
+WardenMac::WardenMac()
+{
+}
+
+WardenMac::~WardenMac()
+{
+}
+
+void WardenMac::Init(WorldSession *pClient, BigNumber *K)
+{
+    Client = pClient;
+    // Generate Warden Key
+    SHA1Randx WK(K->AsByteArray(), K->GetNumBytes());
+    WK.generate(InputKey, 16);
+    WK.generate(OutputKey, 16);
+    /*
+    Seed: 4D808D2C77D905C41A6380EC08586AFE (0x05 packet)
+    Hash: <?> (0x04 packet)
+    Module MD5: 0DBBF209A27B1E279A9FEC5C168A15F7
+    New Client Key: <?>
+    New Cerver Key: <?>
+    */
+    uint8 mod_seed[16] = { 0x4D, 0x80, 0x8D, 0x2C, 0x77, 0xD9, 0x05, 0xC4, 0x1A, 0x63, 0x80, 0xEC, 0x08, 0x58, 0x6A, 0xFE };
+
+    memcpy(Seed, mod_seed, 16);
+
+    iCrypto.Init(InputKey);
+    oCrypto.Init(OutputKey);
+    DEBUG_LOG("WARDEN: Server side warden for client %u initializing...", pClient->GetAccountId());
+    PrintHexArray("  C->S Key: ", InputKey, 16, true);
+    PrintHexArray("  S->C Key: ", OutputKey, 16, true);
+    PrintHexArray("  Seed: ", Seed, 16, true);
+    DEBUG_LOG("WARDEN: Loading Module...");
+
+    Module = GetModuleForClient(Client);
+
+    PrintHexArray("  Module Key: ", Module->Key, 16, true);
+    PrintHexArray("  Module ID: ", Module->ID, 16, true);
+    RequestModule();
+}
+
+ClientWardenModule *WardenMac::GetModuleForClient(WorldSession *session)
+{
+    ClientWardenModule *mod = new ClientWardenModule;
+
+    uint32 len = sizeof(Module_0DBBF209A27B1E279A9FEC5C168A15F7_Data);
+
+    // data assign
+    mod->CompressedSize = len;
+    mod->CompressedData = new uint8[len];
+    memcpy(mod->CompressedData, Module_0DBBF209A27B1E279A9FEC5C168A15F7_Data, len);
+    memcpy(mod->Key, Module_0DBBF209A27B1E279A9FEC5C168A15F7_Key, 16);
+
+    // md5 hash
+    MD5_CTX ctx;
+    MD5_Init(&ctx);
+    MD5_Update(&ctx, mod->CompressedData, len);
+    MD5_Final((uint8*)&mod->ID, &ctx);
+
+    return mod;
+}
+
+void WardenMac::InitializeModule()
+{
+    DEBUG_LOG("WARDEN: Initialize module");
+}
+
+void WardenMac::RequestHash()
+{
+    DEBUG_LOG("WARDEN: Request hash");
+
+    // Create packet structure
+    WardenHashRequest Request;
+    Request.Command = WARDEN_SMSG_HASH_REQUEST;
+    memcpy(Request.Seed, Seed, 16);
+
+    // Encrypt with warden RC4 key.
+    EncryptData((uint8*)&Request, sizeof(WardenHashRequest));
+
+    WorldPacket pkt(SMSG_WARDEN_DATA, sizeof(WardenHashRequest));
+    pkt.append((uint8*)&Request, sizeof(WardenHashRequest));
+    Client->SendPacket(&pkt);
+}
+
+void WardenMac::HandleHashResult(ByteBuffer &buff)
+{
+
+    // test
+    int keyIn[4];
+
+    uint8 mod_seed[16] = { 0x4D, 0x80, 0x8D, 0x2C, 0x77, 0xD9, 0x05, 0xC4, 0x1A, 0x63, 0x80, 0xEC, 0x08, 0x58, 0x6A, 0xFE };
+
+    for(int i = 0; i < 4; ++i)
+    {
+        keyIn[i] = *(int*)(&mod_seed[0] + i * 4);
+    }
+
+    int keyOut[4];
+    int keyIn1, keyIn2;
+    keyOut[0] = keyIn[0];
+    keyIn[0] ^= 0xDEADBEEFu;
+    keyIn1 = keyIn[1];
+    keyIn[1] -= 0x35014542u;
+    keyIn2 = keyIn[2];
+    keyIn[2] += 0x5313F22u;
+    keyIn[3] *= 0x1337F00Du;
+    keyOut[1] = keyIn1 - 0x6A028A84;
+    keyOut[2] = keyIn2 + 0xA627E44;
+    keyOut[3] = 0x1337F00D * keyIn[3];
+    // end test
+
+    buff.rpos(buff.wpos());
+
+    Sha1Hash sha1;
+    sha1.UpdateData((uint8*)keyIn, 16);
+    sha1.Finalize();
+
+    //const uint8 validHash[20] = { 0x56, 0x8C, 0x05, 0x4C, 0x78, 0x1A, 0x97, 0x2A, 0x60, 0x37, 0xA2, 0x29, 0x0C, 0x22, 0xB5, 0x25, 0x71, 0xA0, 0x6F, 0x4E };
+
+    // verify key not equal kick player
+    if (memcmp(buff.contents() + 1, sha1.GetDigest(), 20) != 0)
+    {
+        sLog.outError("WARDEN: Request hash reply: failed");
+        if (Client->GetPlayer())
+            Client->GetPlayer()->GetAntiCheat()->DoAntiCheatCheck(CHECK_WARDEN_KEY,0,true);
+        return;
+    }
+
+    DEBUG_LOG("WARDEN: Request hash reply: succeed");
+
+    // client 7F96EEFDA5B63D20A4DF8E00CBF48304
+    //const uint8 client_key[16] = { 0x7F, 0x96, 0xEE, 0xFD, 0xA5, 0xB6, 0x3D, 0x20, 0xA4, 0xDF, 0x8E, 0x00, 0xCB, 0xF4, 0x83, 0x04 };
+
+    // server C2B7ADEDFCCCA9C2BFB3F85602BA809B
+    //const uint8 server_key[16] = { 0xC2, 0xB7, 0xAD, 0xED, 0xFC, 0xCC, 0xA9, 0xC2, 0xBF, 0xB3, 0xF8, 0x56, 0x02, 0xBA, 0x80, 0x9B };
+
+    // change keys here
+    memcpy(InputKey, keyIn, 16);
+    memcpy(OutputKey, keyOut, 16);
+
+    iCrypto.Init(InputKey);
+    oCrypto.Init(OutputKey);
+
+    m_initialized = true;
+
+    m_WardenTimer = WorldTimer::getMSTime();
+}
+
+void WardenMac::RequestData()
+{
+    DEBUG_LOG("WARDEN: Request data");
+
+    ByteBuffer buff;
+    buff << uint8(WARDEN_SMSG_CHEAT_CHECKS_REQUEST);
+
+    std::string str = "Test string!";
+
+    buff << uint8(str.size());
+    buff.append(str.c_str(), str.size());
+
+    buff.hexlike();
+
+    // Encrypt with warden RC4 key.
+    EncryptData(const_cast<uint8*>(buff.contents()), buff.size());
+
+    WorldPacket pkt(SMSG_WARDEN_DATA, buff.size());
+    pkt.append(buff);
+    Client->SendPacket(&pkt);
+
+    m_WardenDataSent = true;
+}
+
+void WardenMac::HandleData(ByteBuffer &buff)
+{
+    DEBUG_LOG("WARDEN: Handle data");
+
+    m_WardenDataSent = false;
+    m_WardenKickTimer = 0;
+
+    //uint16 Length;
+    //buff >> Length;
+    //uint32 Checksum;
+    //buff >> Checksum;
+
+    //if (!IsValidCheckSum(Checksum, buff.contents() + buff.rpos(), Length))
+    //{
+    //    buff.rpos(buff.wpos());
+    //    if (sWorld.getConfig(CONFIG_BOOL_WARDEN_KICK))
+    //        Client->KickPlayer();
+    //    return;
+    //}
+
+    bool found = false;
+
+    std::string str = "Test string!";
+
+    Sha1Hash sha1;
+    sha1.UpdateData(str);
+    uint32 magic = 0xFEEDFACE;                              // unsure
+    sha1.UpdateData((uint8*)&magic, 4);
+    sha1.Finalize();
+
+    uint8 sha1Hash[20];
+    buff.read(sha1Hash, 20);
+
+    if (memcmp(sha1Hash, sha1.GetDigest(), 20))
+    {
+        sLog.outError("WARDEN: Handle data failed: SHA1 hash is wrong!");
+        found = true;
+    }
+
+    MD5_CTX ctx;
+    MD5_Init(&ctx);
+    MD5_Update(&ctx, str.c_str(), str.size());
+    uint8 ourMD5Hash[16];
+    MD5_Final(ourMD5Hash, &ctx);
+
+    uint8 theirsMD5Hash[16];
+    buff.read(theirsMD5Hash, 16);
+
+    if (memcmp(ourMD5Hash, theirsMD5Hash, 16))
+    {
+        sLog.outError("WARDEN: Handle data failed: MD5 hash is wrong!");
+        found = true;
+    }
+
+    if (Client->GetPlayer())
+        Client->GetPlayer()->GetAntiCheat()->DoAntiCheatCheck(CHECK_WARDEN_MEMORY,FAKE_CHECK,found);
+
+}
diff --git a/src/game/warden/WardenMac.h b/src/game/warden/WardenMac.h
new file mode 100644
index 00000000000..a861b7bbe0b
--- /dev/null
+++ b/src/game/warden/WardenMac.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _WARDEN_MAC_H
+#define _WARDEN_MAC_H
+
+#include "Auth/SARC4.h"
+#include <map>
+#include "Auth/BigNumber.h"
+#include "ByteBuffer.h"
+
+class WorldSession;
+class WardenBase;
+
+enum WardenCheckTypeMac
+{
+    FAKE_CHECK              = 0xFF,
+};
+
+class WardenMac : WardenBase
+{
+    public:
+        WardenMac();
+        ~WardenMac();
+
+        void Init(WorldSession *pClient, BigNumber *K);
+        ClientWardenModule *GetModuleForClient(WorldSession *session);
+        void InitializeModule();
+        void RequestHash();
+        void HandleHashResult(ByteBuffer &buff);
+        void RequestData();
+        void HandleData(ByteBuffer &buff);
+};
+
+#endif
diff --git a/src/game/warden/WardenModuleMac.h b/src/game/warden/WardenModuleMac.h
new file mode 100644
index 00000000000..e94f53dec06
--- /dev/null
+++ b/src/game/warden/WardenModuleMac.h
@@ -0,0 +1,614 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _WARDEN_MODULE_MAC_H
+#define _WARDEN_MODULE_MAC_H
+
+uint8 Module_0DBBF209A27B1E279A9FEC5C168A15F7_Data[9318] =
+{
+	0x07, 0x0C, 0x44, 0xCD, 0xC9, 0xFB, 0x99, 0xBC, 0x7C, 0x77, 0xDC, 0xE8, 0x8D, 0x07, 0xBE, 0x55, 
+	0x37, 0x5C, 0x84, 0x10, 0x23, 0xE1, 0x36, 0x5B, 0xF1, 0xBC, 0x60, 0xF3, 0x68, 0xBA, 0x60, 0x69, 
+	0xDF, 0x48, 0x54, 0xFF, 0x49, 0x1F, 0xA6, 0x28, 0x08, 0x5A, 0x77, 0xFE, 0x4C, 0x3A, 0x9A, 0x28, 
+	0xA5, 0x9E, 0x01, 0x93, 0x05, 0xE4, 0xCD, 0x26, 0x41, 0xD7, 0xD6, 0x73, 0x81, 0xFD, 0xF5, 0xDB, 
+	0xA5, 0xF7, 0xF9, 0x1D, 0xFE, 0xF4, 0x06, 0x7C, 0xD0, 0xF8, 0x5A, 0xE8, 0x11, 0xFF, 0xE5, 0xF9, 
+	0x54, 0x49, 0xF7, 0xF0, 0xF8, 0x66, 0x22, 0x97, 0xA4, 0xB2, 0x86, 0xFE, 0xA6, 0x3A, 0x7F, 0x3B, 
+	0xF6, 0x47, 0xB4, 0x14, 0xEB, 0x9E, 0xC9, 0xEA, 0x0B, 0x41, 0xB4, 0x5B, 0xC2, 0xFB, 0x63, 0x1C, 
+	0x46, 0xC4, 0xAB, 0x3F, 0x30, 0x70, 0x7F, 0x35, 0xA3, 0xD2, 0x1A, 0xDE, 0x36, 0x79, 0x02, 0x05, 
+	0x0E, 0x47, 0xFF, 0xDF, 0x1F, 0xB7, 0xE0, 0x11, 0x7F, 0xB8, 0x43, 0x8C, 0x46, 0xF0, 0x4D, 0x39, 
+	0x83, 0x7C, 0x44, 0xE7, 0xD0, 0x02, 0x54, 0xAB, 0x84, 0xB3, 0x64, 0xCA, 0xD2, 0xB6, 0xF5, 0xDC, 
+	0x06, 0x2B, 0x39, 0x27, 0x5B, 0x18, 0x82, 0xC4, 0xD6, 0x95, 0xB1, 0xDE, 0x2F, 0x0C, 0xAD, 0x96, 
+	0x12, 0xBF, 0x82, 0x0B, 0x78, 0x77, 0x7B, 0x42, 0x96, 0x87, 0xF6, 0x7B, 0xE2, 0x0B, 0x36, 0x2C, 
+	0x34, 0xCD, 0xFA, 0x01, 0x60, 0x3F, 0x52, 0x9B, 0xAB, 0xAC, 0x25, 0xF1, 0xDE, 0xD0, 0x61, 0x12, 
+	0x21, 0xF2, 0xDE, 0xB7, 0xA4, 0x5F, 0x5F, 0xA2, 0xA7, 0x31, 0xAC, 0x2D, 0xA3, 0x42, 0xCF, 0x73, 
+	0x88, 0x53, 0x02, 0x60, 0x9A, 0x11, 0xCB, 0xDF, 0xB9, 0x97, 0x10, 0x3F, 0xBD, 0xF6, 0x14, 0x38, 
+	0x1D, 0xAD, 0xC5, 0x22, 0x99, 0x40, 0x1C, 0xA3, 0x3D, 0x2E, 0x2E, 0x93, 0x70, 0xE4, 0x5B, 0x3E, 
+	0x9E, 0xDC, 0x6E, 0x4D, 0xC2, 0xDA, 0x2D, 0x54, 0x4A, 0xDF, 0xFD, 0x30, 0x4C, 0xAF, 0x5D, 0xDE, 
+	0xEB, 0xFF, 0xCF, 0xE3, 0x9A, 0x3C, 0x4F, 0xB3, 0x7D, 0x61, 0xEB, 0x66, 0xD8, 0xBC, 0x12, 0xC1, 
+	0xD4, 0x66, 0xBD, 0x89, 0x64, 0x8E, 0x68, 0xA6, 0xD4, 0xDC, 0xA4, 0x00, 0x84, 0x9A, 0x53, 0x1E, 
+	0x4D, 0x1B, 0x84, 0x19, 0xF8, 0x0A, 0x85, 0x96, 0x99, 0x64, 0xEB, 0xAE, 0x11, 0xFB, 0xC8, 0xBB, 
+	0xC0, 0x8E, 0x5B, 0x8E, 0xE3, 0x95, 0x50, 0x8A, 0xD4, 0x68, 0x0A, 0x11, 0xED, 0xC2, 0x8F, 0x87, 
+	0xA7, 0x3F, 0xB4, 0x99, 0xDF, 0x37, 0xF6, 0x4F, 0x32, 0x4E, 0x0B, 0x99, 0x35, 0xD0, 0x1E, 0x40, 
+	0x00, 0x8C, 0x3C, 0xCE, 0xC8, 0xE3, 0x89, 0x7B, 0x09, 0xA3, 0xA7, 0x35, 0x5B, 0x2B, 0x82, 0x98, 
+	0xC3, 0xEE, 0xD8, 0xAF, 0x59, 0x0C, 0xFB, 0x28, 0x57, 0x21, 0x79, 0x33, 0xDC, 0x3E, 0xD7, 0x66, 
+	0x02, 0x47, 0xC1, 0x1E, 0xB8, 0x85, 0x28, 0x1A, 0x1C, 0x5C, 0xA2, 0x11, 0x18, 0x9C, 0xB7, 0x54, 
+	0x4B, 0x97, 0x6D, 0x90, 0x93, 0x31, 0x6C, 0x07, 0x3B, 0xE9, 0x35, 0xD7, 0x3B, 0x59, 0x7A, 0x5B, 
+	0xEC, 0xE1, 0x63, 0xC4, 0xB6, 0x1A, 0x97, 0xEE, 0x1A, 0xD0, 0xF5, 0xF6, 0xBF, 0x10, 0x55, 0xCB, 
+	0x7F, 0xF7, 0x3C, 0x2D, 0x7D, 0xDF, 0x5C, 0xE1, 0x84, 0xF1, 0xD5, 0x87, 0x05, 0xEE, 0x94, 0xE3, 
+	0x55, 0xF3, 0x8B, 0xD1, 0x4B, 0xBF, 0x7E, 0x93, 0xEB, 0xAB, 0x09, 0x36, 0x3E, 0x8D, 0xA6, 0x90, 
+	0xC5, 0x2E, 0x0A, 0xF4, 0x2B, 0x9E, 0xBC, 0xDA, 0xC1, 0x3A, 0x77, 0x96, 0x8E, 0xA2, 0x28, 0x53, 
+	0x0B, 0x37, 0xEC, 0x3F, 0xA6, 0xED, 0xF7, 0x32, 0x3A, 0x7D, 0xE5, 0x64, 0x1C, 0xAE, 0x6B, 0xB4, 
+	0x08, 0xDA, 0xCD, 0x3E, 0x32, 0xC7, 0x0F, 0xDF, 0xDE, 0x9D, 0x4D, 0x20, 0xE0, 0x71, 0x7C, 0xB7, 
+	0xAF, 0x87, 0x99, 0x4B, 0xCC, 0x3B, 0xFB, 0x26, 0xAA, 0x01, 0xF3, 0x77, 0x01, 0x7E, 0x8C, 0x0D, 
+	0x09, 0x9D, 0x40, 0xFD, 0x3D, 0xA1, 0xEA, 0x53, 0x99, 0x68, 0x87, 0xE2, 0xCA, 0x1B, 0x1F, 0x45, 
+	0x83, 0xF1, 0x74, 0xBB, 0x65, 0x49, 0x46, 0xD2, 0x43, 0xDA, 0xE1, 0x4D, 0x29, 0x3A, 0x41, 0x81, 
+	0xF6, 0x46, 0x03, 0x43, 0x19, 0xBA, 0x2F, 0x79, 0xF0, 0xA3, 0xB4, 0x92, 0x08, 0x74, 0xE0, 0x61, 
+	0x0F, 0x26, 0xEF, 0xDE, 0x3B, 0x52, 0x9F, 0xB4, 0x06, 0x5D, 0xC6, 0xBC, 0x3C, 0xA5, 0x86, 0x7C, 
+	0x35, 0x21, 0xF7, 0x05, 0xCD, 0x05, 0x15, 0x31, 0xE0, 0xC0, 0xF6, 0x12, 0x70, 0x56, 0xF9, 0x25, 
+	0xB7, 0x91, 0x34, 0x85, 0x5D, 0xE9, 0x5D, 0xB8, 0x4F, 0x4C, 0xFB, 0xB5, 0xB6, 0x2F, 0xAE, 0xA3, 
+	0x2A, 0x99, 0x25, 0x4D, 0x17, 0x41, 0x47, 0xC3, 0xF5, 0x04, 0x52, 0xCC, 0xDE, 0x4E, 0xA3, 0x42, 
+	0x30, 0x19, 0xA5, 0xD5, 0x94, 0x46, 0xC0, 0x78, 0xF7, 0x7D, 0xD9, 0x9D, 0x0A, 0xCF, 0xEE, 0x0C, 
+	0x5C, 0x92, 0x85, 0x10, 0xF5, 0xEC, 0x2E, 0x48, 0xC1, 0x35, 0x86, 0x1E, 0x6A, 0xBE, 0xF0, 0x89, 
+	0x64, 0xF7, 0x4A, 0x71, 0xE7, 0x10, 0x6B, 0xEC, 0xC0, 0xC9, 0xB7, 0x94, 0x66, 0x27, 0x22, 0x2D, 
+	0xA2, 0x94, 0xAB, 0xBE, 0x36, 0xAC, 0x76, 0xB9, 0x2D, 0x8A, 0x04, 0xEF, 0x08, 0x3D, 0xA7, 0x9A, 
+	0xC7, 0x73, 0x78, 0xB2, 0xCD, 0x9E, 0x59, 0x90, 0x39, 0x1E, 0x54, 0x51, 0x18, 0x25, 0x22, 0x2A, 
+	0x38, 0x20, 0x73, 0xF1, 0x7F, 0x01, 0x07, 0x81, 0xA9, 0x3F, 0xE8, 0x90, 0x9C, 0xF6, 0x45, 0x14, 
+	0x8D, 0x82, 0xCB, 0xB0, 0x7D, 0x77, 0xA5, 0x97, 0x34, 0x81, 0x28, 0x6C, 0x1B, 0x0F, 0x60, 0x4B, 
+	0x35, 0xC5, 0x1C, 0xE4, 0xE2, 0x4C, 0x0A, 0xE1, 0xF9, 0xD0, 0xE8, 0xCC, 0x18, 0x25, 0xF6, 0xA0, 
+	0x41, 0xDF, 0x9B, 0x68, 0x75, 0x64, 0x0D, 0xE3, 0x1F, 0xA4, 0xA7, 0xFF, 0x02, 0xB5, 0x68, 0xA3, 
+	0x62, 0xAE, 0xD2, 0x1D, 0x36, 0x37, 0x18, 0x6C, 0xCE, 0x20, 0x25, 0xAF, 0xDD, 0x20, 0xB5, 0xF4, 
+	0xCF, 0x05, 0x3B, 0xF0, 0xD7, 0xB0, 0x43, 0xDB, 0xD7, 0xC7, 0x87, 0x1D, 0xD6, 0xD1, 0xD0, 0x33, 
+	0x20, 0x66, 0x10, 0x3C, 0x5E, 0x9D, 0xA8, 0x21, 0x48, 0x31, 0x65, 0x4C, 0xBD, 0xF5, 0x40, 0x97, 
+	0xC8, 0x0A, 0x87, 0x25, 0x0C, 0x54, 0x35, 0xCE, 0xEC, 0x76, 0xE8, 0xAD, 0x95, 0xCD, 0xC6, 0x7E, 
+	0xCD, 0x7C, 0xFD, 0x5F, 0x5B, 0xD6, 0x6B, 0xC6, 0xC4, 0x26, 0xA9, 0x16, 0xD7, 0xC8, 0xCE, 0x9E, 
+	0x3E, 0xB0, 0x81, 0xA1, 0x9A, 0xBE, 0x8A, 0xF9, 0x7D, 0xB0, 0x1B, 0x03, 0x9B, 0xBA, 0xF7, 0xF5, 
+	0x74, 0x13, 0x0F, 0x44, 0x51, 0x98, 0xAC, 0x56, 0x69, 0x24, 0xB1, 0xEA, 0xCD, 0x27, 0x25, 0xE5, 
+	0x58, 0x26, 0xCA, 0x44, 0xBA, 0x6D, 0xAA, 0x6E, 0x2F, 0xC8, 0x5E, 0x18, 0x6F, 0x08, 0xA0, 0xE8, 
+	0x57, 0xFB, 0x77, 0x99, 0x8A, 0xBD, 0x56, 0x1D, 0xD2, 0xD8, 0x63, 0x7A, 0xCE, 0xD3, 0xC9, 0xE2, 
+	0x99, 0xC2, 0x96, 0xB8, 0x8E, 0x88, 0x09, 0x80, 0xC6, 0x9A, 0xC3, 0xC5, 0xFB, 0xF5, 0x3C, 0x90, 
+	0x70, 0xAB, 0xF1, 0xA6, 0x80, 0x17, 0x2A, 0x25, 0xD3, 0xD2, 0x2B, 0xEE, 0xF5, 0xD2, 0x7F, 0xBD, 
+	0x2D, 0x83, 0xCC, 0x2A, 0x8C, 0xE2, 0xB4, 0xC4, 0xF4, 0x84, 0x34, 0x68, 0x04, 0xAD, 0x62, 0x27, 
+	0xE5, 0x19, 0x40, 0x17, 0xD7, 0x0A, 0xC4, 0x0A, 0x7E, 0x24, 0xBB, 0x38, 0xBC, 0xA3, 0x3B, 0x4A, 
+	0x58, 0x7C, 0x6B, 0xD2, 0x29, 0x46, 0xD6, 0xCF, 0x1C, 0x4B, 0xCC, 0x4E, 0x99, 0x28, 0xFC, 0x10, 
+	0xB1, 0x8B, 0x59, 0xF8, 0x2B, 0x6F, 0x43, 0x67, 0x01, 0x24, 0xFB, 0xCA, 0xB4, 0xBD, 0x35, 0x4B, 
+	0x7D, 0x50, 0xC0, 0x83, 0xD4, 0xB9, 0xC7, 0x37, 0x45, 0xB9, 0x24, 0xD7, 0x6D, 0x9D, 0xA6, 0x9C, 
+	0x7C, 0x1F, 0xE6, 0xB9, 0x97, 0x2C, 0x47, 0x5E, 0xCA, 0x30, 0xEB, 0xE5, 0xFD, 0x70, 0xD2, 0x37, 
+	0xE7, 0x6A, 0x3A, 0xEF, 0x00, 0xCF, 0x10, 0xF3, 0x3B, 0xA1, 0x62, 0xF0, 0x7D, 0xEA, 0x32, 0x50, 
+	0x87, 0x73, 0xAC, 0xB5, 0x61, 0x85, 0x6D, 0xDD, 0xD9, 0xD8, 0x84, 0xCD, 0x23, 0x3F, 0x11, 0x63, 
+	0xB1, 0xAB, 0xDF, 0x37, 0xAF, 0x84, 0x7C, 0x12, 0x77, 0x41, 0xFF, 0xF1, 0xF7, 0x5F, 0xF5, 0x40, 
+	0x23, 0xE1, 0x07, 0xC6, 0x89, 0x95, 0xF3, 0xA8, 0x5F, 0x1C, 0xE4, 0xE3, 0x86, 0x04, 0xD2, 0x17, 
+	0x52, 0xA3, 0x74, 0x51, 0x53, 0x6E, 0x44, 0x42, 0x92, 0x10, 0xBD, 0x7F, 0x5A, 0x13, 0x14, 0x85, 
+	0x59, 0x08, 0xF2, 0x87, 0x9A, 0x20, 0x98, 0xE8, 0x2E, 0xF1, 0x0F, 0x3D, 0x42, 0x79, 0x75, 0x88, 
+	0x45, 0x19, 0x8E, 0x6B, 0xF0, 0xCE, 0x22, 0x47, 0x30, 0x29, 0xC1, 0x94, 0xFE, 0x79, 0x4E, 0xDC, 
+	0xE3, 0x7F, 0x00, 0x4E, 0x67, 0x7D, 0xD7, 0x84, 0x2A, 0x01, 0x4E, 0x17, 0x07, 0x17, 0xD7, 0x1E, 
+	0x4D, 0xC5, 0x0B, 0x1C, 0x76, 0x8F, 0x02, 0x33, 0x26, 0xC6, 0x75, 0x35, 0xD2, 0x76, 0xAD, 0x8C, 
+	0xE9, 0x08, 0x9E, 0xCD, 0x07, 0x72, 0x3A, 0x61, 0x29, 0x2C, 0x99, 0xB9, 0x72, 0x6F, 0xF7, 0x69, 
+	0xAF, 0xEA, 0x3E, 0x56, 0xBE, 0xD8, 0x3A, 0xD7, 0xFC, 0x86, 0xE7, 0xB8, 0x45, 0x37, 0xF7, 0xE0, 
+	0x47, 0xD4, 0x0B, 0x36, 0xD4, 0xF1, 0x4B, 0x28, 0x2B, 0xE5, 0x1E, 0xB1, 0x06, 0x5B, 0x39, 0x59, 
+	0x34, 0x3D, 0x05, 0x23, 0x49, 0x8D, 0x9D, 0xC9, 0xEA, 0xC3, 0x42, 0x00, 0x65, 0x75, 0x09, 0xEC, 
+	0x30, 0xB6, 0xDB, 0xFB, 0x93, 0xFA, 0x93, 0x6D, 0x8D, 0xBE, 0xF5, 0x8D, 0x1E, 0x22, 0xB3, 0xAB, 
+	0x90, 0xB1, 0xA4, 0xE8, 0xCD, 0xB0, 0xBB, 0x2A, 0xF7, 0x39, 0xF2, 0x9C, 0x73, 0x18, 0xCF, 0xD4, 
+	0x14, 0xB5, 0xDD, 0x1A, 0x65, 0x6B, 0x47, 0x11, 0x16, 0xAD, 0xB4, 0xFC, 0xA3, 0x31, 0x56, 0xBD, 
+	0xBD, 0xB2, 0xC4, 0xCC, 0x39, 0xDA, 0x60, 0x86, 0x4E, 0x7F, 0x37, 0x99, 0xCF, 0x88, 0x47, 0x2A, 
+	0x1D, 0x09, 0xDA, 0xE1, 0x07, 0xF0, 0x1B, 0x97, 0x9E, 0x13, 0x43, 0x9E, 0x99, 0xA9, 0x2B, 0x1C, 
+	0x2D, 0xDB, 0xED, 0x0C, 0x58, 0xD2, 0xBE, 0x25, 0x25, 0x44, 0x62, 0x37, 0x7A, 0x50, 0x9A, 0x68, 
+	0x3E, 0x9A, 0xE5, 0xE2, 0xCA, 0x3F, 0xFF, 0x01, 0xF8, 0x17, 0xF4, 0xA8, 0xFF, 0x8E, 0x99, 0xDB, 
+	0x6E, 0x13, 0xD7, 0x7F, 0x1F, 0xDE, 0xDE, 0x2F, 0x9F, 0x37, 0x60, 0x41, 0xF0, 0xA0, 0xB7, 0x4F, 
+	0x80, 0x7D, 0xBA, 0xF9, 0xF1, 0xA6, 0x2C, 0x03, 0xD7, 0x3F, 0x3C, 0xC6, 0x45, 0x7C, 0xFF, 0x40, 
+	0x7C, 0x6D, 0x73, 0x6D, 0x42, 0x8F, 0x87, 0xDA, 0x66, 0xB3, 0xDF, 0x20, 0x17, 0x27, 0x86, 0x28, 
+	0xD6, 0x7F, 0x90, 0x0D, 0xFC, 0x62, 0x87, 0x59, 0x6B, 0x15, 0xB3, 0xBD, 0xF5, 0x15, 0x5F, 0x12, 
+	0x21, 0xE3, 0x50, 0x6A, 0xEA, 0x83, 0x9A, 0x1B, 0xC9, 0x29, 0x44, 0x32, 0xD7, 0x72, 0x68, 0x1B, 
+	0xA6, 0x1B, 0xDD, 0x65, 0xDB, 0x0A, 0xF7, 0xEE, 0xF1, 0xF2, 0xA6, 0x68, 0x6D, 0xEB, 0xB9, 0xF2, 
+	0x5A, 0xF9, 0xEE, 0xA3, 0xD0, 0xAE, 0xE2, 0x18, 0x29, 0xFF, 0xFD, 0x9B, 0x94, 0x6C, 0x03, 0xFC, 
+	0x3C, 0xF2, 0xEB, 0x3D, 0x50, 0x16, 0xA5, 0xB6, 0x64, 0x25, 0xFC, 0x3F, 0x79, 0xC0, 0x7F, 0x22, 
+	0x0C, 0x06, 0xFB, 0xAA, 0xAC, 0x2D, 0xC1, 0x1F, 0x24, 0x3F, 0x72, 0x87, 0xBE, 0xE5, 0xFD, 0x25, 
+	0x70, 0x65, 0x31, 0xA1, 0xD8, 0x63, 0xD3, 0xB6, 0x67, 0x99, 0xAF, 0xC4, 0x78, 0x44, 0xC7, 0x60, 
+	0x95, 0x9B, 0x2F, 0x3C, 0x0A, 0x44, 0xEB, 0x80, 0x34, 0x50, 0xE9, 0x01, 0x37, 0xF8, 0x55, 0x4D, 
+	0xE1, 0x73, 0x24, 0xC5, 0xF2, 0x9D, 0xCD, 0x70, 0x1A, 0x77, 0x57, 0x19, 0xF6, 0xA8, 0xEC, 0x69, 
+	0x25, 0xEF, 0xE4, 0xE2, 0x8C, 0x9A, 0x51, 0x90, 0x95, 0x21, 0xC5, 0xC1, 0x0C, 0xAD, 0x33, 0xF7, 
+	0x0E, 0xC5, 0xC4, 0xFF, 0x3D, 0xA9, 0xEA, 0x36, 0xCF, 0x15, 0x57, 0xB8, 0x37, 0xB7, 0x9A, 0x92, 
+	0x59, 0xDF, 0x91, 0x5C, 0x07, 0x78, 0xAD, 0xE6, 0xE0, 0x71, 0xD7, 0x17, 0x65, 0x8A, 0x62, 0x52, 
+	0x30, 0x95, 0xA1, 0xC5, 0x2F, 0xC7, 0x6D, 0x94, 0xDA, 0xA8, 0xFE, 0xF8, 0x28, 0x99, 0xC9, 0x9D, 
+	0x28, 0xFB, 0x6D, 0x22, 0xD0, 0x44, 0xAE, 0x02, 0x89, 0xEA, 0x93, 0xC6, 0x11, 0xC9, 0x19, 0x35, 
+	0x82, 0x7A, 0x76, 0x87, 0x9A, 0x5D, 0x39, 0x9E, 0x5A, 0x6B, 0x53, 0x45, 0x2F, 0x10, 0x6E, 0x86, 
+	0x95, 0xB5, 0x8F, 0x87, 0xB6, 0x37, 0x58, 0x48, 0x16, 0x01, 0x4D, 0xE1, 0xD1, 0x13, 0x21, 0xC3, 
+	0xAA, 0x8F, 0xDE, 0xE1, 0xFF, 0x5F, 0xEA, 0xBC, 0xBC, 0xDF, 0xF2, 0xB9, 0x0D, 0x96, 0x53, 0xF0, 
+	0x08, 0xB9, 0x01, 0x9E, 0x70, 0x87, 0xF3, 0x89, 0xFA, 0x1A, 0xB0, 0x06, 0xF3, 0xEC, 0x13, 0xC5, 
+	0x8D, 0x21, 0xF5, 0x2B, 0x47, 0x35, 0x48, 0x01, 0x34, 0xA2, 0x8D, 0x55, 0x24, 0x37, 0xFC, 0x5A, 
+	0x43, 0x0D, 0x0B, 0x3E, 0x0A, 0x95, 0x5B, 0xEF, 0x9F, 0x38, 0x41, 0x25, 0x52, 0xE3, 0x1C, 0xBF, 
+	0x7D, 0x3B, 0x1C, 0x32, 0x83, 0xBF, 0xBF, 0x69, 0xD2, 0xB5, 0x73, 0xD4, 0x5F, 0x4F, 0x0E, 0xBA, 
+	0xFF, 0x6C, 0xB6, 0xB4, 0xBB, 0x62, 0xD7, 0xEB, 0x5C, 0xC8, 0x44, 0x50, 0x38, 0xAD, 0x4F, 0xA0, 
+	0xB2, 0x90, 0x0F, 0x58, 0x2E, 0x93, 0x0F, 0xE8, 0xEB, 0x2F, 0x65, 0x76, 0x56, 0xD9, 0xDD, 0x79, 
+	0x75, 0xE1, 0xAD, 0x4A, 0x1A, 0x24, 0x5F, 0xE0, 0x82, 0x62, 0xF9, 0x96, 0x90, 0xD6, 0x4F, 0xFC, 
+	0xF6, 0x9E, 0xAE, 0x1C, 0xDA, 0x4D, 0x3B, 0xC4, 0x44, 0x4B, 0xAC, 0x69, 0xD7, 0x0E, 0x89, 0xAD, 
+	0xED, 0xF8, 0x6A, 0x8C, 0x4B, 0xAE, 0xC4, 0xEA, 0x02, 0x78, 0x0B, 0x41, 0xF6, 0x98, 0xE9, 0x1E, 
+	0xE2, 0x17, 0x0A, 0x0A, 0xA3, 0x1E, 0xE3, 0xF4, 0xEE, 0x7E, 0x3C, 0x81, 0x52, 0xCB, 0x2E, 0xF2, 
+	0x75, 0x0F, 0xD9, 0xD3, 0x58, 0xE0, 0xFF, 0x14, 0xA1, 0x4F, 0x7F, 0x19, 0xCA, 0xD1, 0xDA, 0x32, 
+	0x1F, 0xCD, 0x74, 0x41, 0x22, 0x8A, 0xBF, 0x96, 0x04, 0x35, 0xB7, 0x44, 0x86, 0x39, 0x59, 0xC6, 
+	0x96, 0x17, 0x99, 0x72, 0x72, 0xA1, 0x4E, 0x33, 0x65, 0x02, 0x1C, 0xA7, 0x1D, 0x6C, 0x24, 0xE1, 
+	0x85, 0x6A, 0x1E, 0x02, 0x88, 0xCE, 0x0E, 0x6D, 0x5F, 0x6B, 0x38, 0xD5, 0xA0, 0x5F, 0x15, 0x3C, 
+	0x4B, 0xBD, 0xD3, 0x6E, 0x0A, 0x70, 0x10, 0x3F, 0x6A, 0xB5, 0xAB, 0x72, 0x7D, 0x78, 0x42, 0x79, 
+	0x23, 0x16, 0x49, 0x4F, 0x97, 0x15, 0xF3, 0xA7, 0x6E, 0x73, 0x41, 0xB2, 0x78, 0x21, 0x3F, 0x32, 
+	0x17, 0x7F, 0x97, 0xBB, 0xA8, 0xDE, 0x17, 0xD6, 0xFB, 0x32, 0x95, 0x3D, 0x93, 0x07, 0x9D, 0xD2, 
+	0x5E, 0x99, 0xCD, 0x7C, 0x3E, 0x92, 0x1B, 0xCE, 0xA8, 0xA9, 0xAC, 0xF5, 0xFA, 0xAB, 0x23, 0xCB, 
+	0xA1, 0xD6, 0xF9, 0x09, 0x30, 0x5E, 0x7E, 0xF5, 0x24, 0x80, 0x5B, 0x5C, 0x5B, 0x3E, 0x76, 0xA6, 
+	0xE5, 0x21, 0x7E, 0xB3, 0x40, 0x5F, 0x75, 0xE7, 0x1D, 0x93, 0x41, 0x90, 0xF6, 0xAB, 0x98, 0x72, 
+	0x56, 0x8C, 0xFF, 0x06, 0xC5, 0x2C, 0xE0, 0xAE, 0xE6, 0xD0, 0x38, 0xC9, 0x3D, 0x88, 0x35, 0xF5, 
+	0x31, 0x36, 0x95, 0x49, 0x9C, 0x0C, 0x3F, 0x8D, 0xBC, 0xAA, 0xEC, 0x1B, 0x94, 0xCB, 0x77, 0x35, 
+	0xE8, 0xD8, 0xBF, 0x03, 0x81, 0xB2, 0x84, 0x06, 0x7C, 0x98, 0x58, 0x7D, 0x49, 0x7C, 0x87, 0xDF, 
+	0x69, 0xCB, 0xC7, 0xA4, 0x02, 0x68, 0xFD, 0x5F, 0x2C, 0x0B, 0xEB, 0xA5, 0x3A, 0xF3, 0x8F, 0x9A, 
+	0xA6, 0xA0, 0x10, 0x22, 0x05, 0x88, 0xFD, 0x85, 0x52, 0x14, 0x8F, 0x94, 0x2F, 0xA6, 0x1F, 0xE5, 
+	0x90, 0xE8, 0xFF, 0xEB, 0x1B, 0xD1, 0x76, 0x9B, 0xA2, 0x69, 0x83, 0x3F, 0x38, 0xC0, 0x58, 0x62, 
+	0xDA, 0x85, 0x7C, 0x59, 0xD1, 0xFD, 0x70, 0xCC, 0x16, 0xE8, 0xE5, 0x57, 0xBB, 0x2D, 0xE8, 0x99, 
+	0x5D, 0xC0, 0x9C, 0x07, 0x21, 0x56, 0x14, 0xEE, 0xA5, 0x28, 0x6B, 0x4E, 0x1A, 0x1E, 0x41, 0xBB, 
+	0x60, 0x63, 0x53, 0x5D, 0xAA, 0xB3, 0x9A, 0x7A, 0xB2, 0xAD, 0x6E, 0x2A, 0x2A, 0x6A, 0x00, 0xF7, 
+	0xEA, 0x92, 0xB8, 0x12, 0x73, 0x5D, 0xA7, 0x58, 0xA3, 0xE1, 0xB3, 0xB2, 0x6B, 0x79, 0x1E, 0xCD, 
+	0xD1, 0x1C, 0xFB, 0x89, 0xF9, 0xE5, 0xD8, 0xF9, 0x7C, 0xEA, 0xEF, 0x1D, 0x13, 0x86, 0x2E, 0xDD, 
+	0xFE, 0x52, 0x81, 0xC8, 0xF9, 0xE9, 0x42, 0x44, 0x36, 0x0B, 0x3C, 0xD9, 0x14, 0x09, 0x73, 0xCD, 
+	0x78, 0x19, 0xEF, 0x9D, 0xC5, 0x90, 0xB6, 0xE7, 0x45, 0x47, 0xEE, 0x0E, 0x7C, 0x0F, 0x5D, 0x4B, 
+	0xCC, 0x1D, 0x66, 0xC5, 0xC4, 0x4D, 0xAB, 0x55, 0xF0, 0x83, 0x68, 0xFE, 0x5C, 0xAB, 0x11, 0x71, 
+	0xB7, 0x45, 0xB4, 0x55, 0x1B, 0xDA, 0x77, 0x44, 0x07, 0x6A, 0x13, 0x99, 0xF4, 0x9D, 0x2B, 0xF8, 
+	0x78, 0x6B, 0x2E, 0x4C, 0x6B, 0xC5, 0x18, 0x9B, 0x7D, 0x26, 0xF8, 0x78, 0x53, 0x27, 0x14, 0x83, 
+	0x94, 0xA3, 0x9F, 0x5C, 0xAF, 0x84, 0x9B, 0x76, 0x9F, 0x77, 0xC8, 0x18, 0xA6, 0x00, 0x38, 0x67, 
+	0x6A, 0x08, 0xEE, 0xE3, 0x43, 0x3D, 0x09, 0xD9, 0xDD, 0xC9, 0x29, 0x33, 0x80, 0x56, 0x70, 0xD6, 
+	0x98, 0x50, 0x0C, 0x12, 0xC7, 0xF8, 0x3C, 0xC4, 0xFB, 0x9F, 0xFE, 0xFD, 0x5D, 0xAE, 0x9E, 0x1B, 
+	0x1E, 0x09, 0x99, 0xBC, 0xA5, 0x2A, 0x1A, 0xD0, 0x03, 0x41, 0x2D, 0xCC, 0xEB, 0x28, 0x6A, 0xCC, 
+	0xEE, 0x1F, 0x3F, 0x97, 0xDA, 0x97, 0xD5, 0x1A, 0xFF, 0x9B, 0xFD, 0xAC, 0x5A, 0x3F, 0xAB, 0x6F, 
+	0x73, 0x76, 0x5C, 0x28, 0xBE, 0x3D, 0x41, 0x01, 0x25, 0xFD, 0x3A, 0x72, 0x41, 0xA5, 0x8F, 0x99, 
+	0x03, 0x77, 0x11, 0x81, 0xEB, 0x35, 0x3D, 0x46, 0xA7, 0xA0, 0x1C, 0xDE, 0x9C, 0xD7, 0x8B, 0xD7, 
+	0x0A, 0x3C, 0x5D, 0x25, 0xEC, 0xF3, 0x3D, 0x54, 0xEF, 0x6A, 0x15, 0x59, 0x9B, 0xD5, 0x6F, 0xC5, 
+	0x1E, 0x7F, 0x55, 0x28, 0x50, 0x6F, 0xFA, 0xE8, 0x05, 0x59, 0x50, 0xD6, 0x80, 0x8C, 0xFD, 0x42, 
+	0x15, 0xEB, 0xC6, 0x0D, 0x62, 0xE2, 0xF3, 0x52, 0x76, 0xF7, 0x1A, 0xA0, 0x25, 0x34, 0x5F, 0x66, 
+	0xEA, 0xE7, 0xD9, 0x3A, 0x9C, 0x6C, 0x56, 0x7E, 0x13, 0x8F, 0xC7, 0xD1, 0xC1, 0x93, 0x69, 0x19, 
+	0x7C, 0xBE, 0xCE, 0x16, 0x6F, 0x4D, 0xDB, 0xC6, 0x80, 0x09, 0xCC, 0xB9, 0x72, 0xBA, 0x5B, 0xF3, 
+	0x49, 0xB1, 0x86, 0xBB, 0x49, 0xA0, 0x2C, 0xF1, 0x82, 0x88, 0x9F, 0xF7, 0x99, 0xB9, 0x2A, 0x94, 
+	0xE5, 0xA7, 0xB7, 0xDB, 0x7B, 0x7B, 0xBF, 0x6A, 0xDA, 0x69, 0xB5, 0x6B, 0xB9, 0x8A, 0x07, 0xF3, 
+	0xF8, 0x89, 0x1B, 0x9D, 0xA7, 0x46, 0x3A, 0x13, 0x04, 0xFD, 0x3A, 0x2D, 0x76, 0xCA, 0xD6, 0x00, 
+	0xF3, 0xED, 0x42, 0x1C, 0x98, 0x46, 0x1E, 0x50, 0xE0, 0x59, 0xE2, 0x67, 0x03, 0x7E, 0xAF, 0xEB, 
+	0xD3, 0x76, 0x7E, 0x01, 0xF8, 0x85, 0x33, 0x0F, 0x07, 0x99, 0x87, 0x6A, 0x37, 0xE9, 0x29, 0x30, 
+	0xA4, 0xE6, 0x04, 0xF0, 0x1E, 0x25, 0xE5, 0x88, 0x37, 0xF1, 0x18, 0x85, 0xE6, 0xD0, 0x53, 0x52, 
+	0x47, 0x45, 0xE0, 0x07, 0x0F, 0x27, 0xE1, 0x8D, 0xBB, 0x21, 0xBD, 0xA8, 0xC8, 0x93, 0xBD, 0xD3, 
+	0x66, 0x7C, 0xED, 0x24, 0x33, 0xE1, 0xC5, 0x5D, 0x7E, 0xE2, 0xDA, 0x71, 0x21, 0xD0, 0x3A, 0x70, 
+	0xB0, 0xB3, 0x70, 0x33, 0x64, 0x7B, 0x8D, 0x4E, 0x0F, 0xAA, 0x2B, 0x25, 0xBF, 0x54, 0x5C, 0x08, 
+	0xFD, 0x3B, 0x0A, 0xE0, 0x70, 0x2E, 0xFF, 0x4B, 0x1B, 0xA5, 0x6D, 0x19, 0x46, 0x1E, 0x84, 0xAF, 
+	0x32, 0x42, 0x55, 0xC9, 0xDB, 0x32, 0xC6, 0xCD, 0x06, 0x33, 0x53, 0xE5, 0x95, 0x71, 0x4E, 0xDE, 
+	0xE5, 0x83, 0xD2, 0x48, 0xCB, 0x32, 0x69, 0xA6, 0xFA, 0xA2, 0x8F, 0xC5, 0x45, 0x3A, 0x04, 0xEB, 
+	0x5B, 0xAB, 0x1B, 0x9F, 0xFF, 0xB7, 0x80, 0x50, 0x34, 0xB3, 0x17, 0xBC, 0xD3, 0x29, 0x5E, 0x53, 
+	0x0E, 0x98, 0xA7, 0x2D, 0x8D, 0xE0, 0xB5, 0x45, 0xEB, 0x24, 0x3D, 0xB6, 0x4E, 0xFF, 0x95, 0x6E, 
+	0x17, 0xAC, 0xA6, 0x8A, 0x1D, 0x6F, 0x7F, 0xDB, 0x74, 0x13, 0x81, 0x51, 0x40, 0x82, 0x8B, 0xAB, 
+	0x70, 0x71, 0x7F, 0x19, 0x63, 0x41, 0x1A, 0x12, 0x80, 0x97, 0x3E, 0x58, 0xFE, 0xE7, 0x9C, 0xA9, 
+	0x08, 0xB1, 0x41, 0x30, 0x69, 0xBA, 0xC0, 0x81, 0xE1, 0x0B, 0x87, 0x14, 0xBB, 0xD8, 0x9E, 0x4A, 
+	0x33, 0x92, 0x3B, 0xBD, 0x7F, 0xD4, 0x95, 0x3C, 0x2D, 0x45, 0xB1, 0x2A, 0x9B, 0x9B, 0xC2, 0x86, 
+	0xA0, 0x25, 0x7C, 0x94, 0x55, 0x05, 0xE5, 0x2D, 0xCB, 0xA4, 0x0B, 0x0B, 0x25, 0xBF, 0x8B, 0xFE, 
+	0xA0, 0xF2, 0x65, 0xA0, 0x9C, 0x90, 0x4F, 0xE1, 0xE9, 0x2B, 0x40, 0x60, 0x7F, 0x23, 0x82, 0x8A, 
+	0x89, 0x50, 0x72, 0x9C, 0x07, 0xBD, 0xD0, 0x84, 0x88, 0xA6, 0xB6, 0x3A, 0x43, 0x87, 0xBB, 0xDB, 
+	0x3E, 0x35, 0x6C, 0xBA, 0x51, 0x2E, 0xB4, 0xE7, 0xF6, 0xC4, 0x05, 0xE0, 0x95, 0x42, 0x96, 0x3E, 
+	0xE2, 0x39, 0xE9, 0x18, 0x8F, 0xD4, 0x9B, 0xEC, 0x18, 0x95, 0x8F, 0x79, 0xB8, 0xE3, 0xF4, 0x0D, 
+	0xD1, 0x15, 0x52, 0x26, 0xDA, 0x04, 0x9C, 0xA2, 0x08, 0xE4, 0x00, 0xB1, 0xD1, 0x38, 0x5C, 0x54, 
+	0x1E, 0xFB, 0x00, 0xFE, 0x22, 0xF8, 0x1D, 0xC6, 0x94, 0x8E, 0xA6, 0xEE, 0x6D, 0x07, 0x1F, 0x2B, 
+	0x06, 0x2C, 0x92, 0x6D, 0xEF, 0x86, 0x2F, 0x03, 0x7A, 0xBF, 0x05, 0x63, 0x2F, 0x43, 0x3E, 0xA7, 
+	0xF0, 0x5D, 0xD3, 0x82, 0xBF, 0x0B, 0xE6, 0x76, 0xEC, 0x8E, 0x5E, 0x6F, 0xD4, 0x88, 0xEF, 0xBB, 
+	0xED, 0xAF, 0x14, 0xC0, 0xA6, 0x51, 0x04, 0x7B, 0x60, 0x98, 0xB8, 0x7A, 0xF9, 0x1A, 0x5A, 0x28, 
+	0xC4, 0x40, 0x10, 0xBA, 0x4A, 0x8D, 0x0D, 0x30, 0xF9, 0x09, 0xDA, 0x6E, 0x1C, 0x78, 0xF7, 0x6A, 
+	0xAC, 0x2F, 0x49, 0xC6, 0x31, 0x56, 0x9D, 0x58, 0x63, 0x74, 0x6E, 0xAB, 0xA9, 0xD4, 0xF4, 0xC9, 
+	0x84, 0xA3, 0x9B, 0x97, 0x7A, 0x0E, 0x9E, 0xED, 0x7A, 0xC4, 0x01, 0xFB, 0xC3, 0xD6, 0x4F, 0x97, 
+	0x38, 0x84, 0x2F, 0x97, 0xF0, 0x33, 0x9B, 0x8A, 0x9C, 0x40, 0x23, 0x11, 0xDA, 0xC2, 0x5E, 0x28, 
+	0x5A, 0x78, 0x95, 0xF1, 0xB9, 0x41, 0x12, 0x4A, 0x77, 0x90, 0x86, 0xEC, 0xB3, 0xCC, 0x6D, 0x4C, 
+	0x40, 0x68, 0xAE, 0x40, 0x2F, 0x96, 0x9A, 0x1B, 0xA1, 0x46, 0x67, 0x1C, 0xE3, 0x54, 0xB7, 0x8A, 
+	0xF1, 0xAC, 0x38, 0x92, 0x1E, 0xBA, 0xD4, 0xD2, 0xCE, 0x46, 0x11, 0xA7, 0xCC, 0x73, 0xE3, 0x49, 
+	0x00, 0x9B, 0x93, 0xDE, 0xA6, 0x81, 0x3E, 0x85, 0x51, 0xB7, 0x43, 0x41, 0x64, 0xAC, 0x5B, 0x15, 
+	0xB7, 0xBC, 0x61, 0xF5, 0x87, 0xC4, 0x3D, 0xD1, 0x92, 0x57, 0x05, 0x27, 0x3E, 0x82, 0x5A, 0xCE, 
+	0xED, 0x5A, 0x59, 0x3B, 0x21, 0x01, 0x13, 0xB2, 0x67, 0x0F, 0x4D, 0xC4, 0x01, 0x9D, 0x19, 0x15, 
+	0x67, 0x02, 0xFF, 0xF7, 0xB7, 0xDD, 0xCB, 0xDB, 0x81, 0x13, 0xBA, 0x0C, 0x69, 0x32, 0x43, 0xBD, 
+	0x1A, 0x4F, 0xC8, 0x57, 0xD5, 0x3F, 0xE9, 0xBB, 0xC0, 0x0F, 0x98, 0xB5, 0x35, 0x65, 0x44, 0x7C, 
+	0x49, 0x05, 0x0B, 0x49, 0xE1, 0x6D, 0x34, 0x28, 0x2A, 0x77, 0xFE, 0x86, 0xC2, 0x87, 0x37, 0x2F, 
+	0x02, 0x53, 0x68, 0xC7, 0xDA, 0xF8, 0xAE, 0xA6, 0xE1, 0x47, 0xFA, 0xB8, 0xEE, 0x2D, 0x7E, 0xF0, 
+	0xB1, 0xE5, 0x64, 0xB6, 0x30, 0xC8, 0x0A, 0x5F, 0xB1, 0x6B, 0x11, 0xB2, 0x86, 0xD7, 0x4B, 0x0F, 
+	0x34, 0x4D, 0xEC, 0x5C, 0x72, 0x70, 0x05, 0xE8, 0xB4, 0x26, 0x76, 0x0F, 0x6E, 0x2D, 0x5E, 0x1E, 
+	0x80, 0x02, 0x6D, 0x4C, 0xCF, 0x92, 0x55, 0x5D, 0x2A, 0x2D, 0xDC, 0xBB, 0x01, 0xCD, 0x53, 0x06, 
+	0x02, 0xE7, 0x29, 0x1C, 0x34, 0x40, 0x88, 0x39, 0x8E, 0xD3, 0x58, 0x9A, 0x80, 0x18, 0xA1, 0xDD, 
+	0xC9, 0xB1, 0x59, 0x6B, 0x1D, 0xA2, 0xAE, 0xE6, 0x39, 0x1E, 0x37, 0x99, 0xFA, 0x1A, 0x88, 0x0F, 
+	0x26, 0x6A, 0x0D, 0xEF, 0x16, 0xE1, 0x2A, 0xEB, 0x22, 0x5D, 0x7B, 0xD3, 0x25, 0x93, 0x2C, 0x84, 
+	0xE5, 0x8D, 0xFA, 0xD6, 0x67, 0xE4, 0x36, 0x68, 0x80, 0x72, 0x78, 0xD3, 0x3B, 0xD1, 0xEF, 0xC0, 
+	0xA8, 0x1E, 0x32, 0x13, 0x2E, 0x02, 0xB1, 0xDF, 0x05, 0xA7, 0x3F, 0x7C, 0xAC, 0x5E, 0xC2, 0x15, 
+	0x4B, 0xD0, 0x94, 0xA1, 0x3C, 0x6C, 0x65, 0xDF, 0x6B, 0x05, 0x1F, 0x09, 0x09, 0x7D, 0xEA, 0x11, 
+	0x38, 0x85, 0x12, 0x7F, 0xE2, 0x0C, 0x8E, 0xF5, 0xED, 0xF8, 0x24, 0x6F, 0xCA, 0xDB, 0xDA, 0x65, 
+	0x08, 0xCA, 0x1F, 0x17, 0x3E, 0xFF, 0x68, 0x7B, 0xAA, 0x12, 0xDD, 0x98, 0x65, 0x94, 0x14, 0x63, 
+	0x8A, 0xC7, 0x56, 0xE2, 0x07, 0x2A, 0x53, 0xAB, 0xA9, 0x42, 0xB9, 0xF9, 0xBE, 0x38, 0x06, 0xB7, 
+	0xD1, 0xE6, 0xDF, 0x5A, 0xE3, 0x83, 0xFF, 0xE1, 0xAF, 0xE1, 0xF7, 0x89, 0xE9, 0x3B, 0xDC, 0x9A, 
+	0x23, 0x3B, 0x4C, 0xD1, 0xC6, 0xA0, 0xD5, 0x40, 0x01, 0x20, 0x7D, 0x2B, 0xEB, 0x60, 0x8E, 0x40, 
+	0x62, 0xC9, 0x26, 0xD7, 0x1C, 0xE6, 0x6D, 0xB6, 0x87, 0xC4, 0xCE, 0x19, 0xFC, 0xBB, 0x59, 0x3A, 
+	0x66, 0x21, 0x22, 0x91, 0x0C, 0x59, 0x66, 0x54, 0x4D, 0x86, 0xCA, 0xA2, 0x11, 0x72, 0xB6, 0xE6, 
+	0x04, 0x50, 0x25, 0x38, 0x9F, 0x87, 0x40, 0x9C, 0x5C, 0xB4, 0xFC, 0xD1, 0x04, 0xC0, 0xE1, 0xE2, 
+	0xC9, 0xFB, 0xD2, 0xBC, 0xE7, 0xB2, 0x38, 0x6B, 0x98, 0xAB, 0x90, 0x24, 0xBB, 0xB0, 0x45, 0xBA, 
+	0xEB, 0x29, 0xBD, 0xA6, 0xCD, 0xCC, 0x91, 0x7A, 0xEA, 0x2E, 0x84, 0x78, 0x6E, 0x07, 0x78, 0x1D, 
+	0x73, 0x14, 0xC4, 0x1F, 0x3D, 0x75, 0x72, 0x8E, 0xA0, 0x70, 0xE9, 0x93, 0xC2, 0x2C, 0x2F, 0x98, 
+	0x46, 0x07, 0x07, 0x12, 0x32, 0xFE, 0xDE, 0x2E, 0x24, 0xD5, 0xD0, 0xA3, 0x5A, 0x0C, 0xB4, 0x1D, 
+	0xD7, 0x57, 0xAB, 0x51, 0xAE, 0x0A, 0x19, 0xBD, 0x0D, 0x0B, 0xCA, 0x8A, 0x3B, 0x64, 0xFB, 0xF5, 
+	0x43, 0xC5, 0x04, 0xB1, 0x16, 0xC5, 0x34, 0xF7, 0x63, 0xEF, 0xC9, 0xBA, 0x94, 0x6A, 0xA4, 0x04, 
+	0x49, 0xB8, 0xF4, 0xF5, 0x3C, 0x0D, 0x84, 0xC3, 0x4B, 0xDE, 0xF1, 0xD5, 0x62, 0x15, 0x76, 0x84, 
+	0xED, 0xA4, 0x8A, 0x25, 0x3D, 0x87, 0xB7, 0xEA, 0x26, 0xDA, 0xCE, 0xB8, 0x7E, 0x8A, 0xDB, 0xAB, 
+	0x70, 0xB1, 0x18, 0x53, 0xEA, 0xF4, 0x74, 0xCB, 0x9A, 0x2B, 0x10, 0x5A, 0x4F, 0x06, 0x2B, 0x6B, 
+	0x4A, 0xF0, 0xF3, 0xB2, 0x10, 0x14, 0x9D, 0xBD, 0x18, 0x46, 0x3E, 0x7F, 0xAD, 0xB3, 0x03, 0xDD, 
+	0x80, 0xE2, 0xA5, 0x5D, 0x87, 0xAD, 0x67, 0x1C, 0x20, 0x06, 0xFD, 0x62, 0x65, 0x5D, 0x12, 0xC5, 
+	0x0A, 0x8C, 0x99, 0x8B, 0x97, 0xA1, 0x1F, 0x06, 0x8A, 0x78, 0x7A, 0xA5, 0x46, 0x65, 0xA8, 0xFA, 
+	0xC4, 0x81, 0x99, 0x02, 0x16, 0x7C, 0xB4, 0x09, 0xAD, 0xE8, 0x35, 0x2E, 0x6B, 0x4F, 0x55, 0xAC, 
+	0x23, 0x41, 0xA8, 0x5A, 0x0C, 0x71, 0x7E, 0x08, 0x3E, 0x6D, 0x5B, 0x46, 0x92, 0x3B, 0x8B, 0x8C, 
+	0xBE, 0x09, 0x52, 0xEA, 0xC5, 0xAE, 0x1B, 0x2A, 0xC8, 0x2D, 0x36, 0xE7, 0x2E, 0xCF, 0xA6, 0x30, 
+	0x9F, 0x14, 0xB2, 0xFA, 0xA2, 0xA3, 0xFF, 0xC7, 0x0B, 0xA6, 0xC8, 0x8C, 0xCD, 0xB3, 0x0B, 0xFC, 
+	0x76, 0x9F, 0xA1, 0xB9, 0x34, 0x86, 0xB5, 0x5B, 0x4C, 0x3D, 0x87, 0xA0, 0x5D, 0xE2, 0x95, 0x65, 
+	0xCF, 0xCD, 0x16, 0x40, 0x7D, 0x1B, 0xB1, 0xB8, 0x83, 0x37, 0x14, 0x6E, 0x02, 0xB2, 0x8E, 0x17, 
+	0x9E, 0x10, 0x87, 0x83, 0x62, 0x57, 0x60, 0x98, 0xA7, 0xE5, 0xCB, 0x82, 0x6E, 0xCC, 0xC7, 0x63, 
+	0x99, 0xB8, 0x1D, 0xA9, 0xED, 0x5B, 0xE9, 0x0E, 0xC8, 0x7D, 0xCE, 0x48, 0xE4, 0xE4, 0x3F, 0x1C, 
+	0x77, 0xBF, 0xEF, 0x3A, 0x63, 0x25, 0xAA, 0xDE, 0x2D, 0xC2, 0x42, 0x22, 0xEC, 0x99, 0xB6, 0xBF, 
+	0x65, 0xA0, 0x2A, 0x5C, 0x51, 0x63, 0x9D, 0xFB, 0x3F, 0xA0, 0x7E, 0x2B, 0xCC, 0x04, 0xE1, 0x74, 
+	0x13, 0x61, 0x80, 0x15, 0x3C, 0x2F, 0x9E, 0x3E, 0x63, 0x24, 0xA2, 0x13, 0xF9, 0xCD, 0xF6, 0xA9, 
+	0x88, 0x3A, 0xC9, 0x1F, 0xE9, 0xF2, 0x5F, 0x04, 0xD3, 0xE7, 0x00, 0x4B, 0xCD, 0xA5, 0x60, 0xBE, 
+	0x49, 0x89, 0xCC, 0x68, 0x48, 0x51, 0xEC, 0x7D, 0x8B, 0xDD, 0x23, 0xF0, 0x5D, 0xDC, 0x46, 0xA7, 
+	0x35, 0x77, 0xBF, 0x2D, 0x5C, 0xDB, 0x8B, 0x11, 0xE9, 0x15, 0xE6, 0xC7, 0x50, 0xEF, 0x01, 0x5A, 
+	0x4D, 0x04, 0x5D, 0xBF, 0xF9, 0x52, 0x36, 0xDE, 0x74, 0xE5, 0xF6, 0xF3, 0x37, 0x45, 0x28, 0x85, 
+	0x86, 0x9E, 0x1E, 0xFA, 0xF9, 0xB9, 0x1A, 0x04, 0xD7, 0xE7, 0xCB, 0xDC, 0x47, 0xFB, 0x49, 0x34, 
+	0x3A, 0x63, 0x26, 0x2D, 0x73, 0x6F, 0xC6, 0x28, 0xEE, 0x83, 0xBD, 0x8F, 0x2D, 0xF2, 0x1A, 0x19, 
+	0x75, 0x1B, 0xB6, 0x60, 0x4C, 0x38, 0x3D, 0xD7, 0x4D, 0x66, 0x7F, 0x01, 0xCF, 0x20, 0x1D, 0x45, 
+	0xD5, 0x32, 0x24, 0x96, 0x15, 0x0E, 0x5C, 0x6A, 0xD3, 0xE9, 0xC5, 0xD1, 0xF9, 0x11, 0x94, 0x41, 
+	0xD0, 0xC8, 0xBD, 0xBD, 0x17, 0xFB, 0x0A, 0x20, 0x89, 0x05, 0xBA, 0xCB, 0xF6, 0xBF, 0x9E, 0x83, 
+	0x44, 0x04, 0x54, 0x54, 0xA3, 0xDC, 0x1D, 0xEF, 0x3C, 0x01, 0x07, 0x80, 0x8A, 0x4F, 0x15, 0x3E, 
+	0x2D, 0xFE, 0xAF, 0xEB, 0x71, 0xA3, 0xE7, 0x20, 0x56, 0x2A, 0x19, 0x37, 0x8C, 0xDA, 0xE2, 0xB2, 
+	0xAB, 0xB4, 0x39, 0x3C, 0xC6, 0x7C, 0x7D, 0xD2, 0x91, 0xBE, 0x62, 0xF8, 0x4D, 0x01, 0x4E, 0xB4, 
+	0x3A, 0x19, 0xE2, 0x3E, 0x26, 0xD6, 0x2A, 0x55, 0x96, 0xC0, 0x0F, 0xA5, 0x35, 0x28, 0x0A, 0x5C, 
+	0xC1, 0x55, 0xD3, 0x72, 0x60, 0xF9, 0x65, 0xD0, 0xB2, 0x6C, 0x58, 0xAF, 0x8B, 0x00, 0x2B, 0x4C, 
+	0xF0, 0x4E, 0x8D, 0x15, 0x2F, 0xE5, 0x93, 0x05, 0x94, 0xF0, 0x02, 0x80, 0xDF, 0xFA, 0xEA, 0xA8, 
+	0xE8, 0x93, 0x50, 0xEB, 0xE1, 0x4D, 0x26, 0x34, 0xD3, 0x33, 0x83, 0x64, 0x30, 0x7D, 0x19, 0x51, 
+	0x50, 0x79, 0xF5, 0xF1, 0xD1, 0x2F, 0x7C, 0xC9, 0xF0, 0x3F, 0xF8, 0x60, 0x3B, 0x7E, 0x5D, 0x06, 
+	0x63, 0xED, 0x92, 0x0D, 0x0F, 0xD8, 0x9C, 0x6F, 0x74, 0x40, 0xF1, 0x40, 0xEC, 0x81, 0xAD, 0xAE, 
+	0xF0, 0xB2, 0x5E, 0x79, 0x71, 0x99, 0x89, 0x4F, 0xB9, 0xB2, 0x82, 0x15, 0x0D, 0x80, 0x7A, 0x68, 
+	0x13, 0x85, 0x4A, 0x6C, 0x6B, 0x1B, 0xD3, 0xA7, 0x67, 0x84, 0x14, 0xC5, 0xCE, 0xC9, 0xF2, 0x61, 
+	0x45, 0x7E, 0xEE, 0x7E, 0x6F, 0xD4, 0xB5, 0x15, 0xEE, 0x2C, 0x6C, 0xCC, 0x9D, 0x88, 0x38, 0x55, 
+	0x65, 0x78, 0xCF, 0x65, 0x8D, 0x2F, 0x22, 0xDD, 0xD9, 0x58, 0x9B, 0x60, 0x48, 0xEB, 0x96, 0xD5, 
+	0x17, 0xEE, 0x40, 0xFC, 0xA1, 0x9C, 0x70, 0x51, 0x2B, 0x0F, 0xCB, 0x80, 0x2C, 0x4A, 0x28, 0x4E, 
+	0x49, 0xAF, 0xA0, 0x6D, 0xA5, 0xF7, 0x58, 0x7E, 0x23, 0x30, 0xE9, 0x22, 0xE5, 0xC0, 0xD5, 0x65, 
+	0x13, 0xE6, 0xC1, 0x71, 0x94, 0xAF, 0xDE, 0x6A, 0x53, 0x4C, 0xDE, 0xB8, 0x35, 0xFE, 0x1F, 0xF0, 
+	0x51, 0x61, 0x5F, 0xC2, 0xA4, 0xA9, 0x66, 0x92, 0x93, 0x89, 0xC2, 0x4E, 0xDB, 0x7B, 0x9C, 0x11, 
+	0x62, 0xE5, 0xE6, 0xD7, 0x86, 0xD0, 0x8B, 0x33, 0x9E, 0x15, 0x78, 0x11, 0xF1, 0xC9, 0xA6, 0x4B, 
+	0xA9, 0xB8, 0x38, 0xDE, 0xB2, 0x55, 0xB6, 0x0E, 0xEF, 0x6E, 0xC9, 0xC8, 0x5A, 0x39, 0x1C, 0xEE, 
+	0x0F, 0x5C, 0x83, 0x2A, 0x46, 0x22, 0x4C, 0xA6, 0xD3, 0x38, 0xBA, 0x19, 0xA6, 0xB5, 0x70, 0x80, 
+	0xCF, 0x84, 0x6B, 0x02, 0x98, 0xAB, 0x4C, 0x48, 0x4F, 0xF2, 0x19, 0xDB, 0xBB, 0xB3, 0x1E, 0x21, 
+	0x41, 0xD2, 0x67, 0x16, 0x05, 0xC9, 0x21, 0x03, 0x3C, 0xC5, 0x7C, 0x0E, 0x85, 0xD8, 0x6F, 0x9D, 
+	0x57, 0x12, 0xE4, 0xC7, 0xCB, 0x73, 0xC3, 0xFE, 0xA3, 0x9E, 0xCD, 0x4D, 0x50, 0x4F, 0x4F, 0xDE, 
+	0x4A, 0x54, 0x17, 0x64, 0x6B, 0x13, 0x07, 0x7D, 0x48, 0x14, 0x92, 0x4D, 0x29, 0x1C, 0xF9, 0x4D, 
+	0xB9, 0xAE, 0x56, 0xF8, 0xF5, 0xCB, 0x8B, 0x8B, 0x0E, 0xD1, 0x91, 0xD5, 0xE5, 0xB9, 0x2B, 0xA5, 
+	0x1E, 0x55, 0x2C, 0xC3, 0x48, 0x31, 0x81, 0x7C, 0xD1, 0x36, 0x36, 0x52, 0x59, 0xC6, 0xCA, 0xEB, 
+	0x65, 0x8E, 0x89, 0x1A, 0x65, 0xC8, 0xF3, 0xC4, 0x67, 0x2B, 0x5A, 0xD3, 0xD4, 0x35, 0x01, 0x4A, 
+	0x2C, 0xA8, 0x7F, 0xA2, 0xC2, 0x52, 0xA1, 0x2C, 0xB2, 0x55, 0x7C, 0x5C, 0xF9, 0xC2, 0xD2, 0x77, 
+	0x5E, 0xF3, 0x31, 0xFD, 0xD7, 0x79, 0x8D, 0x0E, 0xE1, 0x37, 0x87, 0xC9, 0x47, 0x43, 0x4E, 0xA9, 
+	0x7D, 0x9E, 0x51, 0x83, 0x57, 0x15, 0x4E, 0x6A, 0x43, 0x1F, 0xC8, 0x83, 0xA3, 0x31, 0xE8, 0x19, 
+	0x7E, 0xC3, 0x0D, 0x2A, 0x3A, 0x15, 0x85, 0xBE, 0x16, 0xA3, 0x4C, 0xCD, 0xC6, 0x1A, 0xB1, 0x48, 
+	0xDB, 0x02, 0xED, 0xA6, 0xFF, 0x9B, 0xC2, 0x6E, 0x7C, 0x3B, 0xC6, 0xCC, 0x8F, 0x0C, 0xDB, 0xE0, 
+	0x11, 0x66, 0xDA, 0x0F, 0x85, 0x68, 0x25, 0x34, 0x7A, 0x7C, 0x4D, 0x13, 0x19, 0xA7, 0x37, 0xBA, 
+	0x1B, 0x8A, 0xBA, 0x99, 0x0B, 0x39, 0x7D, 0x37, 0xA6, 0x32, 0x81, 0xD3, 0x73, 0x21, 0x6E, 0x4A, 
+	0x32, 0x26, 0xC5, 0xE6, 0x8F, 0x33, 0x52, 0x48, 0x23, 0x4A, 0x21, 0xBD, 0xF9, 0x12, 0xC0, 0xFD, 
+	0xDC, 0x39, 0x1B, 0x4B, 0xCE, 0x56, 0x44, 0xC4, 0x9B, 0x9C, 0xF4, 0xBE, 0xC0, 0x9A, 0xFD, 0x28, 
+	0xA1, 0xB2, 0xAE, 0xA7, 0xFB, 0x31, 0xB6, 0xF6, 0x62, 0x68, 0xC9, 0x44, 0xCA, 0x0F, 0x51, 0xFF, 
+	0xCB, 0x7C, 0x67, 0xAE, 0xF4, 0xFD, 0xC0, 0x71, 0x50, 0x35, 0x65, 0xF3, 0x9C, 0x08, 0xA0, 0x1B, 
+	0x3B, 0x42, 0x69, 0x95, 0x42, 0x7A, 0xE3, 0x87, 0xF3, 0xD6, 0xE9, 0xA7, 0x22, 0x5B, 0x83, 0x0B, 
+	0x5B, 0xE9, 0x0A, 0x0A, 0xFA, 0x2D, 0x82, 0x42, 0x73, 0xDF, 0x76, 0xAF, 0xE6, 0xD3, 0x9D, 0xB1, 
+	0xA4, 0xD8, 0xB6, 0xC5, 0x5F, 0xC7, 0x98, 0xCC, 0x80, 0xA3, 0xB7, 0x67, 0xF4, 0x28, 0xA4, 0x98, 
+	0xB5, 0x5D, 0xB3, 0x0E, 0x77, 0xF4, 0xD0, 0x7E, 0xE2, 0x1C, 0xE2, 0x6B, 0xB4, 0x67, 0x42, 0x40, 
+	0xCB, 0x5A, 0x59, 0x43, 0x80, 0xA4, 0x92, 0xEC, 0xEB, 0x1E, 0xFB, 0x08, 0xFA, 0x17, 0xFE, 0x5E, 
+	0xF5, 0xD5, 0x1E, 0x12, 0xEB, 0xE8, 0x91, 0x78, 0x0E, 0x13, 0x67, 0xF9, 0x51, 0x0B, 0xBF, 0xA6, 
+	0x9B, 0x19, 0x26, 0x1D, 0xAE, 0xF7, 0x3A, 0xBB, 0xD7, 0x61, 0x62, 0xFA, 0xDB, 0x75, 0x26, 0x34, 
+	0xB7, 0xAF, 0x8C, 0xDD, 0xF5, 0xC1, 0x1C, 0x65, 0x23, 0xF2, 0xEC, 0x58, 0xA1, 0x9E, 0x82, 0x66, 
+	0x58, 0x4C, 0xF8, 0x44, 0x20, 0x87, 0x26, 0xCA, 0x09, 0xD6, 0xCD, 0x19, 0x4C, 0x39, 0x2A, 0x63, 
+	0xC8, 0xE2, 0x04, 0x18, 0x32, 0xBC, 0x87, 0x39, 0x7A, 0x0A, 0x59, 0xAA, 0xD5, 0xEB, 0xAE, 0x20, 
+	0x10, 0x9A, 0xBD, 0xB5, 0x14, 0xFC, 0x59, 0xCE, 0x86, 0x96, 0x42, 0x4A, 0xB0, 0xAE, 0xA5, 0x65, 
+	0x56, 0x34, 0x04, 0x13, 0x7C, 0xA0, 0x8B, 0x44, 0x11, 0xCE, 0xC3, 0x3C, 0x32, 0x56, 0xE4, 0xE0, 
+	0xFC, 0xAF, 0x7E, 0x89, 0xFB, 0x44, 0x4A, 0x34, 0x1C, 0x02, 0x7F, 0x69, 0xF1, 0x38, 0x8B, 0x3C, 
+	0x23, 0x54, 0x4A, 0xD8, 0xF5, 0x69, 0x70, 0xCA, 0x04, 0x99, 0x2A, 0xB0, 0x66, 0x22, 0x55, 0x14, 
+	0x82, 0x2A, 0x4B, 0x63, 0xA5, 0x05, 0x1E, 0x62, 0x49, 0x6B, 0xC1, 0x83, 0x6B, 0xA5, 0x74, 0xDD, 
+	0x20, 0x26, 0xAD, 0xDD, 0xD1, 0x37, 0x2C, 0x7E, 0x36, 0xE0, 0xBF, 0xC1, 0xEA, 0x37, 0x89, 0x5F, 
+	0x74, 0x6F, 0xAC, 0x05, 0x71, 0x94, 0x8D, 0x79, 0x1B, 0xAB, 0x03, 0xD9, 0x96, 0x9E, 0x40, 0x69, 
+	0x47, 0x23, 0x77, 0x35, 0x35, 0x60, 0x6C, 0xAA, 0x0B, 0x07, 0xC7, 0x64, 0xF7, 0x7F, 0x43, 0x6B, 
+	0x02, 0x69, 0x41, 0xCA, 0x1B, 0x51, 0xD9, 0x87, 0xEB, 0x36, 0xDD, 0x9E, 0xFF, 0xA1, 0x50, 0x6A, 
+	0x33, 0x5F, 0x25, 0x04, 0x97, 0x46, 0x99, 0x4D, 0xA4, 0x37, 0xD9, 0xA2, 0x23, 0x6E, 0x4C, 0x1B, 
+	0x36, 0xED, 0x9F, 0x09, 0x30, 0x26, 0xAB, 0x6F, 0x98, 0x0F, 0xF6, 0x13, 0x44, 0x4F, 0xF1, 0x61, 
+	0x73, 0x53, 0x39, 0x90, 0x88, 0xAE, 0x32, 0xC7, 0x33, 0x6B, 0x1A, 0xA1, 0xE8, 0x6F, 0x82, 0x99, 
+	0x73, 0x20, 0x44, 0xCF, 0x27, 0x17, 0xF8, 0x88, 0x19, 0x45, 0xD2, 0x41, 0x0A, 0xDB, 0x68, 0xA8, 
+	0x59, 0xBC, 0x73, 0xF7, 0xF1, 0x2D, 0x58, 0xBA, 0x60, 0x26, 0xA2, 0xB8, 0x93, 0x31, 0x32, 0xAB, 
+	0x13, 0xDE, 0x61, 0x0D, 0xD7, 0xA0, 0xFC, 0x44, 0x2A, 0xEE, 0xA3, 0xCF, 0x37, 0x17, 0xF9, 0xF8, 
+	0x63, 0x5A, 0x0C, 0x94, 0x78, 0x57, 0x24, 0xC0, 0x20, 0x12, 0xDA, 0xF0, 0x91, 0x22, 0x0D, 0x8E, 
+	0x3D, 0x48, 0xA0, 0x41, 0xFC, 0x65, 0x34, 0x0A, 0x4B, 0xE4, 0xFF, 0xEE, 0xB9, 0xF6, 0xD5, 0x48, 
+	0x60, 0xD1, 0x08, 0x75, 0x19, 0x7D, 0x23, 0xE6, 0x48, 0x80, 0xA4, 0x80, 0x72, 0x25, 0xE8, 0xF5, 
+	0x08, 0xFA, 0x70, 0xB5, 0x93, 0x6C, 0xA0, 0xFD, 0x28, 0xD4, 0xC6, 0xB5, 0xE3, 0x6D, 0x70, 0x6B, 
+	0x6D, 0x3F, 0x61, 0x01, 0xEB, 0xC9, 0xE7, 0xE1, 0x55, 0x67, 0x43, 0xE7, 0xBE, 0x1B, 0xE5, 0xA6, 
+	0xB7, 0x6C, 0x8F, 0x6D, 0xE4, 0x22, 0xCF, 0x8C, 0x6C, 0x67, 0xE6, 0xF3, 0xEC, 0x07, 0xB3, 0xE9, 
+	0x51, 0xBE, 0xBD, 0xC8, 0xCE, 0x67, 0xF2, 0x14, 0x7B, 0xDD, 0x8C, 0x70, 0x6E, 0x4C, 0x3E, 0x1E, 
+	0xA6, 0xCB, 0xD7, 0x4B, 0x0F, 0x61, 0x76, 0x39, 0x91, 0xE9, 0xD2, 0x43, 0x51, 0x8E, 0x86, 0x82, 
+	0x7B, 0xB2, 0xCD, 0xF6, 0x0E, 0x74, 0x0F, 0xA3, 0xD4, 0x25, 0xC2, 0x16, 0xCB, 0xFB, 0x8A, 0x2A, 
+	0x0B, 0xFA, 0xCF, 0xC0, 0x99, 0x38, 0x48, 0xCD, 0x87, 0xB6, 0x39, 0x74, 0x5C, 0x9F, 0x0A, 0x12, 
+	0xA7, 0x42, 0x1B, 0xF2, 0xBC, 0x9A, 0x38, 0x12, 0xA1, 0x5F, 0x64, 0x54, 0x2A, 0x0C, 0xFB, 0xF9, 
+	0xF0, 0xB3, 0x4B, 0xC5, 0xD1, 0xAE, 0x15, 0x52, 0x14, 0xDE, 0x91, 0x16, 0x38, 0xAF, 0x01, 0x16, 
+	0x8D, 0x29, 0x3E, 0xFE, 0x62, 0xF3, 0x57, 0x10, 0x6C, 0x21, 0x10, 0x9F, 0x8F, 0x4C, 0xF9, 0xE8, 
+	0x7F, 0x77, 0xFF, 0xF7, 0x01, 0x53, 0x7E, 0xB8, 0xC3, 0xFC, 0x88, 0xF1, 0xB1, 0x5A, 0x63, 0xAB, 
+	0xC2, 0x78, 0x8C, 0x15, 0x96, 0x61, 0xC7, 0x88, 0xC5, 0x45, 0x16, 0xE9, 0xE1, 0xD5, 0x77, 0xB4, 
+	0xC9, 0xA6, 0xAB, 0x47, 0xEE, 0x86, 0xFE, 0xD1, 0x2C, 0xAB, 0x23, 0x18, 0xA7, 0xB0, 0x4D, 0x18, 
+	0x52, 0xB7, 0xEF, 0x68, 0xCB, 0x80, 0xF9, 0x05, 0x15, 0x7A, 0xCB, 0x61, 0xC5, 0xCE, 0xCF, 0x92, 
+	0x3B, 0xCA, 0x7C, 0xEC, 0x02, 0x6F, 0x6B, 0x1E, 0x27, 0xAC, 0x07, 0xF2, 0x63, 0xB8, 0xDC, 0x1C, 
+	0x6A, 0x52, 0xB5, 0xF2, 0x90, 0xEB, 0x16, 0xA1, 0x2C, 0x9C, 0x3D, 0x20, 0x4B, 0xB3, 0xB9, 0x3B, 
+	0xD3, 0xE0, 0x7A, 0xCC, 0x9E, 0xF8, 0x95, 0x32, 0x2A, 0x34, 0x4A, 0xBC, 0x1E, 0x21, 0x05, 0x02, 
+	0x1A, 0xF4, 0x19, 0x32, 0x7B, 0x4A, 0x08, 0x15, 0x1B, 0xB1, 0xD5, 0x25, 0x53, 0x78, 0x99, 0xD8, 
+	0x9D, 0x8E, 0x45, 0xAE, 0x44, 0x52, 0x90, 0xC3, 0x89, 0xE7, 0xA5, 0x3E, 0xFA, 0xBC, 0x1C, 0x43, 
+	0x7B, 0x2E, 0x6B, 0x26, 0x84, 0x19, 0xA7, 0x4D, 0xDC, 0xD6, 0x4D, 0x29, 0x0F, 0x3A, 0xA5, 0xBC, 
+	0x09, 0x07, 0x53, 0x20, 0x8E, 0xE2, 0x91, 0x38, 0x73, 0x70, 0xA0, 0xAE, 0x10, 0xE0, 0x62, 0x49, 
+	0xAD, 0x71, 0x64, 0xC7, 0x8F, 0x15, 0x04, 0x42, 0xB4, 0xA6, 0x37, 0xEB, 0x9A, 0xB2, 0x00, 0x20, 
+	0xC6, 0x55, 0x3C, 0x14, 0xAB, 0xC2, 0x15, 0xF5, 0xB7, 0x79, 0x81, 0x5D, 0x36, 0xC2, 0xEC, 0xBA, 
+	0xC3, 0xB5, 0xAC, 0xF5, 0x2A, 0x92, 0x2A, 0xAC, 0x4D, 0x7F, 0x71, 0x5A, 0xFE, 0x74, 0xAC, 0xFE, 
+	0x70, 0x58, 0x9F, 0x61, 0x10, 0x95, 0xED, 0x04, 0xF7, 0x1E, 0x49, 0x99, 0xCD, 0xAB, 0x2C, 0x3A, 
+	0x8F, 0x00, 0x26, 0x48, 0x5F, 0x0F, 0x80, 0xFF, 0x72, 0x05, 0x82, 0xE4, 0xDD, 0x6F, 0x7C, 0xDA, 
+	0x42, 0x91, 0x94, 0x57, 0x8F, 0xC0, 0xA7, 0xBA, 0x46, 0x8C, 0x15, 0xE9, 0xEA, 0x5E, 0xCD, 0xE7, 
+	0x63, 0xB3, 0x15, 0x50, 0x5E, 0x71, 0x35, 0xEE, 0x84, 0xFA, 0x23, 0x4B, 0xEE, 0x5B, 0x99, 0xDF, 
+	0x0D, 0xE5, 0x69, 0xC7, 0xD7, 0xF7, 0x49, 0xC4, 0xEF, 0x19, 0x88, 0x57, 0xB5, 0x4F, 0x3E, 0x18, 
+	0xF9, 0x61, 0x1A, 0xFE, 0xFB, 0x15, 0xE3, 0x65, 0x49, 0x19, 0x17, 0xBA, 0xC0, 0x26, 0x8A, 0x5E, 
+	0x8D, 0x29, 0x50, 0x62, 0x19, 0x6E, 0xFA, 0x22, 0x7E, 0xEA, 0xE6, 0x2F, 0x90, 0xEF, 0x71, 0x21, 
+	0xAD, 0x2A, 0xFC, 0x97, 0xBA, 0xC7, 0x71, 0x7D, 0x68, 0x1C, 0x53, 0xB1, 0xD4, 0x59, 0xED, 0xE1, 
+	0x56, 0x54, 0xD1, 0x89, 0xC4, 0xB0, 0xB8, 0x88, 0x78, 0xCA, 0xF7, 0x85, 0x7E, 0xA0, 0xE8, 0xF4, 
+	0xE5, 0x12, 0xE8, 0x24, 0x9A, 0x51, 0xE9, 0xA3, 0x52, 0x96, 0x59, 0x47, 0x07, 0x63, 0xAE, 0x18, 
+	0x41, 0xAB, 0x17, 0xE8, 0x94, 0xDF, 0x94, 0x2F, 0x8F, 0x36, 0x34, 0x91, 0x20, 0x52, 0xE0, 0x11, 
+	0x2E, 0xFF, 0xBD, 0xBD, 0x6E, 0x49, 0xE2, 0x41, 0xA6, 0xD0, 0x10, 0xD0, 0x2C, 0xE4, 0x2E, 0x9F, 
+	0xBF, 0x36, 0xAD, 0xDA, 0xA5, 0xFE, 0xD9, 0xEC, 0xC1, 0x55, 0x20, 0xCB, 0x10, 0xAD, 0x4D, 0xE3, 
+	0xD2, 0xE7, 0x09, 0xFB, 0x14, 0xC2, 0x11, 0x33, 0x2C, 0xFA, 0xDE, 0x82, 0x15, 0x4D, 0xF0, 0xB6, 
+	0x71, 0x3C, 0x58, 0x80, 0xD2, 0x87, 0x05, 0x89, 0xEF, 0x00, 0x6C, 0x8A, 0xFB, 0x14, 0xF3, 0x65, 
+	0x22, 0xCD, 0xBF, 0x25, 0x03, 0x60, 0x12, 0x38, 0x2B, 0x0A, 0xF1, 0xFB, 0xCB, 0x80, 0x11, 0x3B, 
+	0x59, 0xE2, 0xEF, 0x07, 0xC8, 0x97, 0x50, 0xFE, 0x56, 0x4C, 0x52, 0x4F, 0x73, 0xD9, 0xCA, 0x89, 
+	0x7B, 0xEA, 0x50, 0x5E, 0xCB, 0xB9, 0xEE, 0xC8, 0xFF, 0xC5, 0x13, 0x62, 0x00, 0x9F, 0xBF, 0x61, 
+	0xC7, 0x2F, 0x0F, 0xBF, 0x75, 0xC3, 0x0E, 0x72, 0x2C, 0xF7, 0xDF, 0xA5, 0xAE, 0x94, 0x15, 0x8F, 
+	0xBB, 0x1D, 0x26, 0xA0, 0xCB, 0x8B, 0x40, 0x78, 0x48, 0xB4, 0x41, 0x47, 0x6B, 0x7D, 0x45, 0xBE, 
+	0x39, 0xA5, 0xE2, 0xB7, 0x11, 0xEF, 0xE8, 0x19, 0xA0, 0x62, 0x26, 0xE1, 0xD5, 0x94, 0x54, 0x9D, 
+	0xA4, 0x28, 0xEE, 0x7F, 0x7F, 0x25, 0xAD, 0xDB, 0x28, 0x2C, 0xDB, 0xA7, 0x63, 0xF8, 0x0E, 0x6E, 
+	0xE2, 0x0F, 0x8F, 0xC7, 0x17, 0x31, 0xB2, 0x8D, 0xA8, 0x92, 0x7A, 0x81, 0xD5, 0x88, 0x2E, 0xD3, 
+	0xF2, 0xE5, 0x08, 0x76, 0xC7, 0x93, 0xDB, 0xC0, 0x0B, 0x38, 0x58, 0xF7, 0x6F, 0xC4, 0x58, 0xAD, 
+	0xB0, 0x3B, 0xDC, 0xE6, 0xD1, 0xB3, 0xC2, 0x39, 0x25, 0xE7, 0x48, 0x19, 0xC8, 0x27, 0xD1, 0xDF, 
+	0x9F, 0x5F, 0xB8, 0x5A, 0x50, 0xE9, 0x0B, 0x51, 0x43, 0x2C, 0xA6, 0x09, 0x39, 0x14, 0xF5, 0x3E, 
+	0x03, 0x6E, 0x55, 0x7D, 0xE3, 0x42, 0xE5, 0xBB, 0x40, 0xA0, 0x71, 0xAA, 0xF1, 0xAF, 0x6E, 0xF2, 
+	0xE2, 0x59, 0x94, 0xF2, 0x9F, 0x79, 0x67, 0x23, 0x6F, 0xCA, 0x85, 0xF6, 0x1F, 0xA3, 0x87, 0x7B, 
+	0xE6, 0x62, 0xEE, 0x8F, 0x0D, 0x48, 0x89, 0x98, 0x37, 0x35, 0x91, 0x05, 0x58, 0xA3, 0x83, 0x28, 
+	0x13, 0xA2, 0x1E, 0xD1, 0x49, 0x5F, 0x68, 0x59, 0x47, 0x49, 0xED, 0x7B, 0xC2, 0x45, 0x58, 0xCB, 
+	0xB7, 0xC8, 0x91, 0x3B, 0xF5, 0xB4, 0xC4, 0x8C, 0x01, 0xE3, 0x78, 0x3A, 0x3D, 0xD9, 0x58, 0x0B, 
+	0xA3, 0xB2, 0x8C, 0xFA, 0xF1, 0x8C, 0xC5, 0x77, 0x93, 0xC9, 0x88, 0x80, 0x67, 0xB5, 0x62, 0x55, 
+	0x6E, 0x01, 0x74, 0xF3, 0x81, 0x9E, 0xAE, 0x27, 0xB0, 0x20, 0xC6, 0xE1, 0xAE, 0xE7, 0xBB, 0x8D, 
+	0x12, 0x27, 0x6D, 0x23, 0xF3, 0x1D, 0xCD, 0x5E, 0x20, 0xAC, 0x10, 0x06, 0x1D, 0x3C, 0xB4, 0x86, 
+	0xB7, 0x0E, 0x8C, 0x9D, 0x14, 0xD5, 0xAC, 0xFF, 0xFE, 0xE5, 0x6B, 0xEB, 0xED, 0x3F, 0xF5, 0x40, 
+	0xBA, 0x69, 0x66, 0x90, 0xFA, 0x54, 0xAC, 0xB9, 0xCB, 0x07, 0x38, 0xAF, 0xE4, 0x40, 0x41, 0x0C, 
+	0x0A, 0x44, 0x2D, 0x31, 0x46, 0x4E, 0x2B, 0x75, 0xFA, 0x06, 0xA3, 0x59, 0xC3, 0x27, 0x53, 0xFC, 
+	0xB6, 0xEF, 0xBA, 0x10, 0xAA, 0x65, 0x1D, 0x1C, 0xAB, 0x19, 0x8C, 0x54, 0x1D, 0x3B, 0xBB, 0x10, 
+	0x05, 0xAA, 0xAE, 0xEF, 0x80, 0x03, 0x28, 0xA7, 0x4D, 0xA9, 0xD8, 0xA8, 0x34, 0x75, 0xC6, 0x2B, 
+	0x43, 0x82, 0x59, 0x00, 0x2E, 0xEE, 0xF9, 0x8A, 0x8F, 0x8E, 0x1C, 0x21, 0xA0, 0xDC, 0xAA, 0xFC, 
+	0xBF, 0x15, 0x2F, 0x6D, 0x00, 0x33, 0x81, 0x24, 0x86, 0x58, 0xCF, 0xD5, 0x5A, 0xC4, 0xB3, 0x28, 
+	0x97, 0xC5, 0x45, 0xAB, 0x8D, 0x48, 0xDE, 0xEA, 0xB2, 0xFD, 0x1E, 0xD3, 0x13, 0x57, 0xFF, 0xFB, 
+	0x24, 0xDE, 0x7A, 0x9D, 0x43, 0xF8, 0xC7, 0xDD, 0x1A, 0x28, 0x7C, 0x39, 0xA4, 0xDA, 0x58, 0xB7, 
+	0xBD, 0x1D, 0x24, 0xDE, 0xCF, 0x85, 0x7E, 0xEF, 0x5A, 0x4F, 0xF1, 0xB4, 0xCB, 0xA6, 0x5E, 0xC0, 
+	0x80, 0xE6, 0x0B, 0xC0, 0x69, 0xAD, 0x5D, 0xB4, 0x88, 0xBD, 0xFB, 0x78, 0x2C, 0x3C, 0xA6, 0x69, 
+	0x77, 0x16, 0xD6, 0xA9, 0xFF, 0x4A, 0x6C, 0xC0, 0x48, 0x27, 0x64, 0x41, 0x51, 0x79, 0xC6, 0xF9, 
+	0x85, 0x71, 0x9C, 0x89, 0xD2, 0x68, 0xF5, 0xBB, 0xE5, 0x83, 0xF5, 0xD0, 0xEB, 0x25, 0xC7, 0x1E, 
+	0x50, 0xA8, 0x1F, 0x50, 0x86, 0xEE, 0x1F, 0xE9, 0x4A, 0xB3, 0xA0, 0x18, 0xF8, 0xCE, 0xD6, 0x0B, 
+	0xF2, 0x41, 0xFC, 0x21, 0x20, 0x1A, 0xA3, 0x9D, 0xB7, 0xD1, 0x49, 0x79, 0xE2, 0x7B, 0xF3, 0x8B, 
+	0x40, 0x6F, 0xE2, 0x45, 0x00, 0x5A, 0x81, 0x7D, 0x39, 0x93, 0x3B, 0x59, 0xE0, 0x3E, 0xCA, 0xC5, 
+	0x61, 0x80, 0x65, 0x2D, 0xC9, 0xAD, 0x2C, 0x26, 0x66, 0x11, 0x3A, 0xA6, 0xBA, 0xF5, 0x3B, 0x49, 
+	0xC5, 0xB1, 0xAA, 0xB6, 0xBC, 0x68, 0x00, 0x51, 0x82, 0x1A, 0x39, 0x2B, 0x28, 0x5C, 0x39, 0xF2, 
+	0xB4, 0x7E, 0x93, 0x63, 0xEA, 0xD7, 0xBE, 0x7F, 0xA0, 0xCC, 0x47, 0x31, 0x2E, 0xBA, 0x9C, 0xD0, 
+	0x67, 0xBF, 0xE0, 0xDE, 0x46, 0xCA, 0xA1, 0x84, 0x57, 0x6B, 0x15, 0x0A, 0xC6, 0xAB, 0x32, 0x74, 
+	0x37, 0x34, 0xDA, 0x1A, 0x95, 0xA6, 0xA4, 0xEE, 0xF6, 0xC6, 0xFB, 0x70, 0x56, 0x0C, 0xC4, 0xCA, 
+	0x0D, 0xD5, 0xCB, 0x03, 0xA3, 0x21, 0xF5, 0x6D, 0x0F, 0xD1, 0xEE, 0x77, 0x73, 0xA4, 0xF9, 0x95, 
+	0x34, 0x2F, 0x0C, 0x5B, 0x7F, 0x48, 0x6A, 0x02, 0x4A, 0xA4, 0x59, 0x68, 0x0F, 0xF4, 0x64, 0x73, 
+	0x84, 0xCE, 0xED, 0x43, 0x54, 0x46, 0xD9, 0x42, 0x4C, 0x84, 0xD5, 0xFE, 0x5B, 0xD3, 0x51, 0x17, 
+	0x4E, 0xB8, 0x7A, 0x42, 0x87, 0x45, 0xDB, 0xC3, 0x2C, 0xC8, 0x8B, 0x86, 0xB3, 0x95, 0x0B, 0xCF, 
+	0x27, 0xC4, 0xA8, 0xEE, 0x60, 0x13, 0xD3, 0x9F, 0xFC, 0xD0, 0x7F, 0x84, 0x5B, 0x24, 0x5D, 0xCF, 
+	0xE4, 0xA4, 0x83, 0x35, 0xD1, 0x7A, 0x72, 0x78, 0xB6, 0xB4, 0xA2, 0x32, 0x0F, 0x68, 0x61, 0x7C, 
+	0xB7, 0x46, 0x20, 0x1A, 0xA5, 0x94, 0x63, 0x71, 0xAA, 0xA0, 0x77, 0x95, 0x28, 0x63, 0xCE, 0xFE, 
+	0x69, 0xB6, 0x44, 0x10, 0xF6, 0xC1, 0xD7, 0xED, 0x11, 0x73, 0x9E, 0x46, 0xDE, 0xC3, 0xFF, 0x9E, 
+	0xB9, 0xEC, 0xEC, 0xE4, 0xE3, 0xFD, 0x1E, 0xD3, 0x55, 0x08, 0x36, 0xC8, 0xDC, 0xD1, 0x0E, 0x00, 
+	0xEE, 0x86, 0x78, 0x08, 0xB7, 0xAD, 0xD8, 0xE1, 0x59, 0x60, 0x33, 0x14, 0xF4, 0x5C, 0x55, 0xA4, 
+	0xF1, 0x0D, 0x0E, 0x16, 0xCD, 0x1C, 0x72, 0x6D, 0x89, 0xEB, 0x41, 0x42, 0xB1, 0xF5, 0x63, 0x80, 
+	0xD6, 0x06, 0xC3, 0x1C, 0xBE, 0x7B, 0x95, 0x2A, 0x5B, 0x27, 0x08, 0xDC, 0xB7, 0x2A, 0xDC, 0x8E, 
+	0x3C, 0xA0, 0x84, 0x5F, 0xA8, 0xF1, 0x7B, 0x1F, 0xE1, 0x70, 0x37, 0x2D, 0x28, 0xDC, 0x7C, 0xB8, 
+	0xA7, 0x47, 0x60, 0x77, 0xAC, 0x55, 0xE3, 0x97, 0x5A, 0xC1, 0xA6, 0xA2, 0xFF, 0xCB, 0xF6, 0x45, 
+	0x28, 0x1E, 0xD2, 0x1C, 0xE8, 0x9E, 0x45, 0xF7, 0x1E, 0xD5, 0x92, 0xB4, 0x5A, 0x5E, 0x6A, 0xE0, 
+	0xF7, 0x1A, 0x81, 0xD7, 0x96, 0x62, 0xB5, 0xD9, 0xE7, 0x0E, 0x3A, 0xA3, 0xE8, 0x60, 0x30, 0x45, 
+	0x96, 0x86, 0x58, 0xDD, 0xBA, 0x04, 0x5E, 0xF4, 0x5D, 0xE3, 0x82, 0x7D, 0x3B, 0xD5, 0xD6, 0x28, 
+	0xFF, 0xC6, 0xDE, 0x3A, 0x3D, 0xF8, 0xB5, 0x6A, 0x5A, 0x1D, 0x34, 0x63, 0x48, 0x6F, 0xE9, 0xC8, 
+	0x5F, 0x56, 0x17, 0x14, 0x56, 0xC7, 0xE4, 0xC2, 0x38, 0x68, 0x8A, 0x81, 0x0F, 0x4D, 0x4A, 0x91, 
+	0x79, 0x85, 0x40, 0xB1, 0x7A, 0xA5, 0x4A, 0xF1, 0xC2, 0xA2, 0x3B, 0x62, 0x4D, 0xD8, 0xD8, 0x41, 
+	0x80, 0x66, 0x48, 0x7A, 0x96, 0xF7, 0xB2, 0x05, 0xDC, 0xB2, 0xD7, 0xBF, 0xB8, 0xB3, 0x0C, 0xD5, 
+	0x12, 0x90, 0xBA, 0x86, 0xDB, 0x2D, 0x2D, 0x2F, 0x1A, 0xBE, 0xA8, 0xF0, 0x42, 0xA1, 0xE6, 0x9B, 
+	0x89, 0x57, 0x69, 0xFD, 0x1B, 0x18, 0x94, 0xC2, 0xE1, 0x53, 0xD3, 0xAD, 0x2D, 0x90, 0x8B, 0xEA, 
+	0xAB, 0x29, 0x47, 0x08, 0xE6, 0x4B, 0xAC, 0x3A, 0xFC, 0x8C, 0x40, 0xC3, 0x45, 0xD9, 0xCF, 0x24, 
+	0xA9, 0x17, 0xC4, 0xAD, 0x46, 0xAC, 0x27, 0xAD, 0xE6, 0xEE, 0xF2, 0xF7, 0x5F, 0x6C, 0xD7, 0xE7, 
+	0xF2, 0x01, 0xED, 0x98, 0x4E, 0x7A, 0x03, 0x94, 0x4C, 0x26, 0x69, 0x5E, 0x8D, 0xDC, 0x13, 0xD6, 
+	0x3A, 0x2D, 0x4A, 0x70, 0x0E, 0x39, 0x94, 0x63, 0xDE, 0x08, 0x7A, 0x72, 0x4D, 0xFE, 0x89, 0xCA, 
+	0x8C, 0x4D, 0x39, 0x6A, 0x99, 0xAD, 0xAC, 0xE7, 0x8F, 0x6E, 0xD2, 0x18, 0x98, 0xF4, 0x1B, 0xD7, 
+	0x0A, 0x60, 0xA2, 0x00, 0x1B, 0xB3, 0xE6, 0x37, 0xA1, 0x1F, 0x30, 0xBD, 0xFD, 0xA8, 0x58, 0xB7, 
+	0xFF, 0xF1, 0x45, 0x74, 0x9B, 0xE9, 0xA8, 0x80, 0x12, 0x0F, 0x98, 0xF7, 0x9E, 0x62, 0xF5, 0x4A, 
+	0x0C, 0x32, 0x58, 0x87, 0x65, 0x2D, 0xE4, 0x90, 0x44, 0xB2, 0xB1, 0x8A, 0xFB, 0x29, 0x99, 0x3C, 
+	0xE8, 0xEB, 0x4F, 0x99, 0x21, 0x47, 0x0D, 0xAA, 0x9F, 0x54, 0xAA, 0xFC, 0x47, 0xB6, 0x35, 0xFE, 
+	0x24, 0x73, 0xC2, 0x26, 0x18, 0x1E, 0x61, 0x18, 0xC7, 0xF5, 0xE1, 0xD9, 0x5C, 0x7E, 0xCA, 0x71, 
+	0xA5, 0xA6, 0x4D, 0x91, 0xC0, 0xC5, 0x0C, 0x65, 0x98, 0x69, 0x9B, 0x51, 0xDF, 0xC2, 0x88, 0x51, 
+	0x21, 0x49, 0x8D, 0x23, 0x52, 0x27, 0xAD, 0x83, 0xD7, 0xB3, 0x73, 0x34, 0x90, 0xD3, 0xA7, 0xDE, 
+	0x9D, 0x8C, 0x5F, 0xCA, 0xA6, 0x2C, 0x95, 0x01, 0xCC, 0x24, 0x59, 0x70, 0x74, 0xBB, 0x72, 0xD7, 
+	0x80, 0x25, 0x03, 0xD1, 0xB2, 0x0A, 0xF8, 0x0A, 0x53, 0x9E, 0x03, 0x6F, 0xA4, 0xFB, 0x20, 0x52, 
+	0x46, 0x0C, 0x2B, 0xD8, 0x25, 0x4D, 0xE8, 0xBA, 0xB7, 0x97, 0x8E, 0x77, 0x52, 0xA6, 0x18, 0x92, 
+	0xBE, 0x86, 0x89, 0x0B, 0x57, 0xBD, 0xBE, 0xAC, 0x74, 0xE5, 0x64, 0xEA, 0x0C, 0xEE, 0xA2, 0x70, 
+	0x09, 0x0A, 0x07, 0x97, 0xCD, 0x42, 0xD1, 0x91, 0x7E, 0x7F, 0xDE, 0xF5, 0x06, 0xBA, 0xBB, 0x91, 
+	0xF5, 0x90, 0x4D, 0x67, 0xDF, 0x02, 0x94, 0x7C, 0xAE, 0xC8, 0xD9, 0x80, 0x20, 0xF2, 0xFE, 0xA9, 
+	0x1B, 0x91, 0x34, 0x34, 0x18, 0xFE, 0xF2, 0xD1, 0xD2, 0xB6, 0xE4, 0xA6, 0x77, 0xD3, 0x63, 0x2C, 
+	0x82, 0x8A, 0xE0, 0x87, 0xEB, 0x30, 0xC5, 0x14, 0x7E, 0x55, 0x0E, 0x87, 0x7F, 0xD3, 0x5B, 0x88, 
+	0xA9, 0xA7, 0x1B, 0xB8, 0x55, 0xE1, 0x60, 0x1B, 0xF3, 0x09, 0x8D, 0xE4, 0x31, 0xFF, 0xAA, 0xB0, 
+	0xFC, 0x29, 0xD2, 0x3F, 0xEE, 0x8C, 0x99, 0x0B, 0x79, 0x1F, 0x60, 0x6F, 0xF7, 0xE0, 0x5A, 0x5E, 
+	0xD2, 0xB2, 0x52, 0x6C, 0xD4, 0xF5, 0x96, 0x76, 0xAC, 0x51, 0x07, 0xA0, 0xEC, 0x01, 0x34, 0x37, 
+	0xDB, 0xB0, 0xBE, 0x04, 0x2C, 0x1D, 0xCF, 0x1C, 0x8B, 0xF4, 0xAE, 0x03, 0x7A, 0x9C, 0x6A, 0xDA, 
+	0xC6, 0xD7, 0xB2, 0xE8, 0x9C, 0x2D, 0xCB, 0x42, 0x7C, 0xFA, 0x49, 0x3E, 0xCA, 0x93, 0xA3, 0x2E, 
+	0x34, 0x16, 0x35, 0xC7, 0xEB, 0x14, 0x65, 0x95, 0xDD, 0x50, 0x3F, 0xE2, 0xA7, 0xB8, 0x31, 0x30, 
+	0x19, 0xC5, 0x39, 0xE6, 0xD6, 0xD8, 0xCB, 0x8B, 0x35, 0x85, 0xB9, 0x2F, 0x5F, 0x72, 0x38, 0xA0, 
+	0x32, 0x7D, 0x0B, 0x30, 0x69, 0x4E, 0xEB, 0x97, 0x1B, 0x5A, 0xCC, 0xCB, 0x9F, 0x14, 0xD1, 0xC4, 
+	0x66, 0x03, 0xE3, 0xC9, 0xC8, 0x70, 0xD0, 0x08, 0xE6, 0x1B, 0x08, 0xEF, 0xB2, 0x13, 0xF3, 0xAE, 
+	0x61, 0x5E, 0xE2, 0xF9, 0x72, 0x7B, 0x20, 0x63, 0x86, 0x8A, 0x3A, 0xBD, 0xFB, 0x08, 0xA9, 0x90, 
+	0xA6, 0xFF, 0xC4, 0xF7, 0xDA, 0x6D, 0x2C, 0x96, 0x5F, 0xB8, 0xE0, 0x73, 0x7C, 0x92, 0xA1, 0xE5, 
+	0xF9, 0x10, 0x01, 0x6F, 0xCD, 0xFF, 0x16, 0xCE, 0x54, 0x2E, 0x16, 0x87, 0x65, 0xA4, 0xB1, 0xD4, 
+	0xA2, 0x7E, 0xD2, 0x09, 0xC5, 0x97, 0x7C, 0xDA, 0xAC, 0x7B, 0xA4, 0xA1, 0x0A, 0xD3, 0x84, 0x1E, 
+	0xEA, 0xE3, 0x8E, 0xA3, 0xB2, 0x30, 0x23, 0x84, 0x51, 0x0C, 0x78, 0x43, 0x46, 0x86, 0xF0, 0x10, 
+	0xED, 0xF6, 0x57, 0xA7, 0x40, 0x33, 0xCC, 0x19, 0xC6, 0xB7, 0xFA, 0x45, 0x7C, 0x22, 0x26, 0x07, 
+	0x0F, 0xC7, 0x6E, 0x86, 0xB7, 0x71, 0xA4, 0xC3, 0x1E, 0x54, 0x9F, 0xAF, 0x84, 0x94, 0xEB, 0x84, 
+	0x6E, 0xE8, 0xDE, 0xA6, 0xC8, 0xA6, 0xBB, 0x93, 0xF6, 0x06, 0x1B, 0x49, 0x82, 0x06, 0x01, 0xAC, 
+	0x6A, 0x69, 0x9C, 0x44, 0xC2, 0xFF, 0x84, 0xA0, 0xDD, 0x87, 0xD2, 0xF7, 0xFB, 0xF8, 0x05, 0x14, 
+	0x59, 0x3F, 0x6B, 0x68, 0x90, 0x11, 0x78, 0x8F, 0xA1, 0x6F, 0x0F, 0x7B, 0x62, 0x47, 0xD0, 0xB1, 
+	0xBB, 0x80, 0x7D, 0x3C, 0x1F, 0x09, 0x7B, 0xE9, 0x60, 0x32, 0x78, 0xB1, 0xE6, 0x1B, 0xD0, 0x9C, 
+	0x9D, 0xA5, 0x56, 0x47, 0xB7, 0x47, 0x4B, 0x42, 0xCA, 0xBA, 0x34, 0x40, 0x30, 0xE4, 0x80, 0x9F, 
+	0x74, 0xD9, 0x4F, 0x64, 0x4B, 0x3F, 0x7C, 0x04, 0x76, 0x45, 0x1C, 0x58, 0xA2, 0xC8, 0x5C, 0xC6, 
+	0x08, 0x5B, 0xD2, 0x80, 0x58, 0xC1, 0x22, 0x3F, 0x9C, 0x99, 0xCD, 0xB8, 0x4A, 0xF6, 0x3E, 0xD4, 
+	0xFF, 0x26, 0x4C, 0xBF, 0xD5, 0xA0, 0x38, 0x40, 0x30, 0x1D, 0x04, 0x9A, 0xE0, 0x8C, 0x04, 0x6A, 
+	0x87, 0xB6, 0x16, 0x3F, 0x0C, 0xF9, 0xC5, 0x85, 0x43, 0x77, 0x50, 0x9B, 0xF8, 0x75, 0xA3, 0x9A, 
+	0xAD, 0x2A, 0x1D, 0x7C, 0xF9, 0xD3, 0x00, 0x7D, 0xFC, 0xA8, 0x5F, 0x7C, 0xC8, 0xEB, 0x69, 0xC4, 
+	0xAC, 0x16, 0xEB, 0xED, 0x53, 0xBE, 0x66, 0x95, 0xFC, 0x81, 0x65, 0x17, 0x65, 0xEB, 0x0B, 0x7F, 
+	0xF7, 0x57, 0x35, 0x50, 0x43, 0xBB, 0xC5, 0x1A, 0xC9, 0xA2, 0xCF, 0x7B, 0x1D, 0xC0, 0x9E, 0x02, 
+	0x79, 0x29, 0x23, 0xB6, 0x24, 0xCF, 0x55, 0x5A, 0x52, 0x3A, 0x51, 0xCE, 0x03, 0xB9, 0x0F, 0xF7, 
+	0x45, 0x5F, 0x10, 0xE7, 0x78, 0xD6, 0x2B, 0xF8, 0xD0, 0x8C, 0x7F, 0xE8, 0xA1, 0xA5, 0x7F, 0x07, 
+	0x51, 0xE4, 0xF6, 0xB8, 0xC4, 0xB5, 0xF1, 0xC4, 0xC0, 0x18, 0x2A, 0xD2, 0xC3, 0x86, 0xB9, 0xB1, 
+	0x35, 0xD8, 0xDD, 0xD3, 0x77, 0x73, 0xAB, 0x01, 0x4A, 0xDE, 0x76, 0x5F, 0x3C, 0x6E, 0x56, 0xB3, 
+	0x82, 0xC3, 0x7B, 0x03, 0x81, 0x29, 0x7F, 0xE0, 0x83, 0x40, 0xF4, 0x52, 0xF5, 0x32, 0x6A, 0x12, 
+	0x32, 0x84, 0xBE, 0xBE, 0x92, 0xDA, 0x04, 0x32, 0x40, 0xCF, 0x13, 0xE8, 0x5E, 0x6D, 0x79, 0x71, 
+	0x5C, 0x98, 0x8C, 0x83, 0xEE, 0x37, 0xE2, 0x65, 0xAA, 0x83, 0xF9, 0xD5, 0xD8, 0xDF, 0x5B, 0x70, 
+	0x46, 0x64, 0xAB, 0xAA, 0x16, 0x53, 0x66, 0x4B, 0x7F, 0xA6, 0x79, 0x24, 0xBC, 0xD5, 0x35, 0xEF, 
+	0x14, 0xF6, 0xEA, 0x75, 0xF1, 0xD3, 0x41, 0x18, 0x44, 0x58, 0xD8, 0xA0, 0x49, 0x52, 0x99, 0x7B, 
+	0x25, 0x6B, 0x65, 0x4B, 0x1B, 0xC7, 0x1D, 0xFB, 0x87, 0x27, 0x8D, 0x3B, 0xBD, 0xC1, 0xF7, 0xD3, 
+	0x51, 0xED, 0x7F, 0x43, 0xB6, 0x23, 0xC2, 0x70, 0x61, 0xB3, 0xB0, 0x0D, 0xB2, 0xE9, 0x58, 0x5E, 
+	0xFA, 0x23, 0xD1, 0xC7, 0x06, 0x76, 0xBF, 0x48, 0x06, 0xF4, 0xF9, 0xFC, 0x1C, 0x6F, 0xD6, 0xF8, 
+	0xFF, 0x9E, 0x40, 0xCF, 0xAD, 0xB7, 0x95, 0xF7, 0x2C, 0x5B, 0xD2, 0xD5, 0x49, 0xA3, 0xAB, 0xCA, 
+	0x3E, 0x5B, 0xB0, 0x8B, 0x2E, 0x70, 0x27, 0x7D, 0x36, 0x88, 0xB5, 0x25, 0xBA, 0xE9, 0x67, 0x62, 
+	0xB0, 0xA8, 0x26, 0x8C, 0xA4, 0xB7, 0x14, 0xAE, 0xEC, 0xF1, 0x0D, 0xF1, 0x3E, 0xFC, 0x76, 0x5A, 
+	0x27, 0x32, 0x60, 0xBE, 0x71, 0x74, 0xE2, 0x54, 0x66, 0xC1, 0xAF, 0x6E, 0xBD, 0x11, 0x3A, 0x1F, 
+	0x0A, 0x0B, 0xF5, 0x61, 0x04, 0xF3, 0x0A, 0x2B, 0x8B, 0x90, 0x8F, 0x82, 0x42, 0x03, 0x18, 0x1B, 
+	0xC5, 0x08, 0x53, 0xB9, 0x53, 0x35, 0xB1, 0x05, 0x9F, 0x05, 0x59, 0x85, 0x2C, 0x25, 0x48, 0xD3, 
+	0x2C, 0xB6, 0xFE, 0xF8, 0x3B, 0x08, 0x49, 0xF3, 0xC1, 0x56, 0x87, 0x49, 0xEB, 0x4D, 0x05, 0x1F, 
+	0xE5, 0x0F, 0xB5, 0x99, 0xDA, 0xBF, 0x78, 0xC9, 0xFA, 0x1F, 0x62, 0x66, 0x4B, 0xB8, 0x76, 0xAF, 
+	0x69, 0xDD, 0x4A, 0x80, 0x52, 0x58, 0xB2, 0x04, 0x0B, 0x87, 0x66, 0xF9, 0xE2, 0xF0, 0x66, 0x15, 
+	0x7F, 0x4C, 0x40, 0x6B, 0x4A, 0xD6, 0x47, 0xD8, 0x81, 0xF1, 0x3B, 0xEF, 0x5C, 0xF7, 0x10, 0x7D, 
+	0x5C, 0xBC, 0x53, 0x11, 0xFF, 0x8B, 0x6D, 0x4C, 0x08, 0x16, 0x47, 0x48, 0xF2, 0xA0, 0x2C, 0xEF, 
+	0x33, 0x31, 0x90, 0x94, 0x45, 0x66, 0xC8, 0x3F, 0x84, 0x11, 0xDA, 0x8C, 0xD7, 0x90, 0x8F, 0xF0, 
+	0x3D, 0xF2, 0xBB, 0x86, 0xFF, 0x90, 0xF3, 0xFB, 0x52, 0xF5, 0x60, 0x3E, 0xF3, 0xBD, 0xAC, 0x3A, 
+	0x6C, 0x74, 0x7D, 0x03, 0x85, 0xB6, 0xFA, 0xA4, 0x75, 0xD6, 0x52, 0xDB, 0xD2, 0xB8, 0x30, 0xF1, 
+	0x78, 0x7B, 0xCF, 0xC5, 0x57, 0xDF, 0x52, 0xB9, 0xEF, 0xC5, 0xEF, 0xCA, 0x6D, 0x38, 0x0E, 0x28, 
+	0xC4, 0x9D, 0x93, 0x4D, 0x73, 0x0A, 0xD1, 0x11, 0xAD, 0x33, 0x27, 0xC9, 0x7E, 0xF8, 0x85, 0x1D, 
+	0x05, 0x41, 0x6A, 0xAA, 0x6A, 0xA5, 0xBE, 0xD0, 0x93, 0x05, 0x8A, 0x73, 0xF2, 0xF0, 0x61, 0x94, 
+	0x25, 0xF0, 0xA9, 0x12, 0x12, 0xD8, 0xFF, 0xB1, 0xF0, 0x06, 0xA5, 0x47, 0x69, 0x15, 0xCC, 0xE9, 
+	0x6B, 0x9D, 0x6E, 0xD9, 0x96, 0xA7, 0xEF, 0x9D, 0x75, 0x9A, 0xD0, 0xD7, 0x90, 0xFE, 0xAF, 0xEB, 
+	0xC1, 0xBA, 0x83, 0x48, 0x46, 0x54, 0x7C, 0x86, 0x4B, 0x45, 0x4B, 0xA6, 0xE4, 0x3A, 0x33, 0x52, 
+	0xFD, 0xAF, 0x45, 0x92, 0xF4, 0xB0, 0x88, 0x62, 0x28, 0x9D, 0x52, 0x14, 0xBE, 0x5F, 0xD8, 0xCB, 
+	0x32, 0x69, 0xC8, 0xB3, 0xB3, 0x27, 0xE4, 0xDC, 0x85, 0xCD, 0x3D, 0x84, 0x51, 0xC1, 0xB6, 0x1F, 
+	0x50, 0x9F, 0x80, 0x9B, 0xF2, 0xA8, 0xCE, 0x59, 0xAF, 0x25, 0xA7, 0x5A, 0xD6, 0x23, 0xDA, 0xFF, 
+	0xDC, 0x0A, 0xF1, 0xF8, 0x93, 0x1D, 0xE3, 0x00, 0x90, 0x64, 0x91, 0xCF, 0xEC, 0xDC, 0x40, 0xB8, 
+	0x64, 0x10, 0xBC, 0x1E, 0x07, 0xF6, 0x98, 0xC1, 0xDE, 0x1B, 0xF3, 0x7D, 0x3A, 0x63, 0x2D, 0x82, 
+	0xD0, 0x55, 0x0A, 0x45, 0x3F, 0x12, 0x9D, 0xF1, 0x97, 0x9E, 0x5C, 0xAD, 0x2F, 0x1E, 0x36, 0x13, 
+	0x56, 0xFC, 0xEF, 0xF5, 0x59, 0x9A, 0x2B, 0xE5, 0x99, 0xBB, 0x58, 0xD8, 0x18, 0xD4, 0xB0, 0x0C, 
+	0x6E, 0x84, 0x7A, 0x50, 0x4C, 0x37, 0x52, 0x32, 0x77, 0xE8, 0x4D, 0x4B, 0x98, 0x42, 0x74, 0x98, 
+	0x92, 0x42, 0xA9, 0x38, 0x78, 0xBE, 0x51, 0xC0, 0x87, 0x66, 0x5B, 0x20, 0x1C, 0xBC, 0xE6, 0x60, 
+	0xA4, 0x4F, 0x19, 0x13, 0x61, 0x5E, 0x85, 0x3B, 0xE4, 0xC6, 0x98, 0xCE, 0x13, 0x0A, 0xA1, 0x97, 
+	0xA8, 0x28, 0x6A, 0x8A, 0xFA, 0x9D, 0x55, 0xA6, 0x64, 0x23, 0x96, 0x1D, 0xB2, 0x2A, 0x51, 0x27, 
+	0xB6, 0x00, 0x83, 0x96, 0xF6, 0x05, 0x0F, 0x8F, 0xF4, 0x7D, 0x17, 0x20, 0x10, 0xB9, 0x7C, 0xA2, 
+	0x70, 0x81, 0x58, 0x15, 0x06, 0x49, 0xCA, 0xD1, 0x22, 0x21, 0xC4, 0x9E, 0x07, 0xD2, 0x1F, 0x34, 
+	0x57, 0x6F, 0xB5, 0xED, 0x81, 0x3D, 0x88, 0x5F, 0x8F, 0x9C, 0x0D, 0xEC, 0x65, 0xCC, 0x52, 0x7F, 
+	0x26, 0xCC, 0x3E, 0xB4, 0xEF, 0x7E, 0xD6, 0x6F, 0x18, 0xA8, 0xF7, 0xA0, 0xA8, 0x87, 0x78, 0x6A, 
+	0x4C, 0xFB, 0xEC, 0x5C, 0x4A, 0xE5, 0x2D, 0x99, 0xF2, 0x13, 0x0F, 0x6D, 0xA3, 0xD9, 0x0D, 0x40, 
+	0xFD, 0xF3, 0xC8, 0x5C, 0xE8, 0xCA, 0xF1, 0x10, 0xE7, 0x40, 0xAA, 0xE5, 0x26, 0x22, 0x6D, 0xF0, 
+	0xE9, 0x5B, 0xB0, 0x5F, 0x2F, 0x48, 0xD1, 0x74, 0x93, 0xC7, 0x62, 0x1E, 0x5D, 0xE8, 0x6B, 0xBA, 
+	0x3B, 0xC6, 0xB5, 0x0E, 0x7D, 0x5B, 0x0F, 0x1B, 0x4A, 0x9E, 0x28, 0xBC, 0x78, 0xDF, 0x8C, 0x61, 
+	0x3A, 0xCD, 0xB6, 0xEF, 0x9D, 0xAE, 0x35, 0x4F, 0xEB, 0x43, 0x9E, 0xCC, 0xA2, 0x1C, 0xAC, 0x40, 
+	0x94, 0xE8, 0x96, 0x97, 0x1C, 0x54, 0xBB, 0x59, 0x49, 0x01, 0x71, 0xA6, 0x95, 0xB2, 0x58, 0x2C, 
+	0xAD, 0x91, 0x01, 0x39, 0x53, 0x9B, 0xF4, 0x7F, 0xC3, 0x26, 0xFB, 0x95, 0x5D, 0x56, 0xB8, 0x98, 
+	0x30, 0x48, 0xC6, 0xE5, 0xC8, 0xBA, 0xE2, 0x88, 0x9C, 0x1F, 0x7B, 0x6F, 0xAD, 0x63, 0xB6, 0xAB, 
+	0x93, 0xB5, 0xEE, 0xBF, 0x42, 0xEC, 0x8F, 0xA6, 0x09, 0xC4, 0xB4, 0x6B, 0x5B, 0x16, 0x14, 0xCB, 
+	0xA4, 0xCC, 0x94, 0x62, 0xA7, 0x82, 0x6B, 0xED, 0xAC, 0x51, 0x23, 0x78, 0x8B, 0xF1, 0x48, 0xD6, 
+	0x12, 0x5F, 0xE7, 0x1D, 0x14, 0xD8, 0xF9, 0x42, 0xCA, 0xB9, 0x12, 0xFD, 0xDC, 0x29, 0xCB, 0x70, 
+	0xD8, 0x2B, 0x70, 0x75, 0xFC, 0x74, 0xAA, 0xA4, 0xEF, 0xFE, 0xD7, 0xF0, 0x29, 0xD5, 0xA8, 0xA7, 
+	0x9D, 0x9A, 0x88, 0x93, 0xE0, 0xFD, 0xC8, 0xD2, 0x4C, 0x81, 0x3D, 0x71, 0x25, 0x7A, 0x5C, 0xE8, 
+	0xC8, 0xBA, 0xBA, 0x15, 0x71, 0x1D, 0x77, 0x15, 0x3B, 0x34, 0x87, 0x61, 0xD1, 0xA5, 0xF4, 0x59, 
+	0x75, 0x18, 0x5D, 0x85, 0x4B, 0xE7, 0x15, 0x9B, 0xCE, 0xD0, 0x9C, 0x08, 0x90, 0x97, 0x55, 0x0B, 
+	0x06, 0x8E, 0xFA, 0x18, 0x99, 0xBC, 0xB1, 0x78, 0x80, 0xC7, 0x59, 0xEC, 0x43, 0x8C, 0x55, 0x32, 
+	0xCF, 0x2E, 0xDE, 0xC6, 0x23, 0xFA, 0xAE, 0xE5, 0xFC, 0x44, 0x78, 0x4A, 0xB9, 0xD2, 0xE5, 0xDC, 
+	0xE3, 0x47, 0x0D, 0xF2, 0x33, 0x77, 0xB3, 0xA7, 0x0A, 0x6B, 0xFC, 0xDA, 0xD3, 0x9B, 0x4A, 0x09, 
+	0x30, 0xC7, 0xE2, 0xB2, 0x9C, 0xE1, 0x46, 0xEA, 0xD7, 0xE5, 0x25, 0x1E, 0xA5, 0x08, 0xDD, 0x50, 
+	0xA3, 0x1F, 0x20, 0xCF, 0xF4, 0x85, 0x3F, 0xFD, 0x3C, 0xBC, 0xE5, 0xF3, 0x4A, 0xF9, 0xE8, 0x8C, 
+	0xF0, 0xAD, 0xCC, 0x27, 0x60, 0x29, 0xE2, 0xCD, 0x8C, 0xA0, 0x96, 0x0E, 0xD0, 0x2B, 0x9E, 0xB4, 
+	0x58, 0x11, 0x9C, 0x20, 0xC7, 0xB8, 0x3D, 0xB3, 0xA2, 0x85, 0x0F, 0x01, 0xBE, 0x19, 0x17, 0xC1, 
+	0x7E, 0x37, 0x75, 0xA1, 0xDB, 0x65, 0x85, 0x6F, 0xA0, 0x31, 0xE5, 0x11, 0x72, 0x1E, 0x91, 0x11, 
+	0x85, 0x88, 0xE1, 0x2F, 0xD6, 0xFC, 0xBA, 0x98, 0x13, 0x1E, 0xC5, 0xBF, 0xC1, 0xB6, 0xFA, 0xCC, 
+	0xBC, 0x73, 0x39, 0x2C, 0xC6, 0xFE, 0xF6, 0x4C, 0x70, 0xBC, 0xEA, 0x14, 0xEA, 0x61, 0x86, 0x93, 
+	0x38, 0x29, 0xFF, 0x1B, 0x83, 0x30, 0x0F, 0xEF, 0xE5, 0x58, 0xAF, 0x03, 0x72, 0x9F, 0xD3, 0x24, 
+	0xB3, 0x7E, 0x7F, 0x33, 0x76, 0x0E, 0x51, 0x5C, 0x41, 0x47, 0xBC, 0x30, 0x73, 0xF1, 0x64, 0xCA, 
+	0x87, 0x7F, 0xD0, 0xB7, 0x74, 0x03, 0x50, 0xA4, 0x0D, 0xBA, 0xB3, 0x24, 0x6F, 0x5E, 0x22, 0x89, 
+	0x6B, 0xD4, 0x07, 0xD3, 0x6B, 0x4D, 0x36, 0x5B, 0x8F, 0x85, 0xE6, 0xF3, 0x8A, 0x94, 0xDD, 0x60, 
+	0x70, 0x49, 0x14, 0x7F, 0x0A, 0xBC, 0x7B, 0xB2, 0xD0, 0x11, 0x87, 0x9E, 0xA2, 0x8D, 0xCF, 0x89, 
+	0x56, 0x34, 0x66, 0x71, 0x03, 0xB8, 0xF2, 0x93, 0xC3, 0x12, 0x10, 0x49, 0x29, 0x4B, 0x0A, 0xC8, 
+	0x88, 0x4C, 0x87, 0x0F, 0x84, 0x50, 0x74, 0x5B, 0x22, 0x78, 0xCF, 0xF7, 0xC8, 0xAB, 0x92, 0x4F, 
+	0x96, 0x54, 0x7B, 0xAB, 0xAE, 0xC2, 0x53, 0x8C, 0x5A, 0xF8, 0x0D, 0x8E, 0x8D, 0x25, 0x4A, 0xDA, 
+	0x94, 0xBE, 0x9A, 0x84, 0x56, 0x88, 0x08, 0x59, 0xA0, 0x44, 0x81, 0x48, 0x29, 0xF4, 0x38, 0x1B, 
+	0xD9, 0xBA, 0xB2, 0x1E, 0xA7, 0x9A, 0xA8, 0x06, 0x77, 0x76, 0x92, 0x7B, 0x25, 0x21, 0x4F, 0x41, 
+	0x3B, 0x2D, 0xE4, 0xD9, 0xC7, 0xE2, 0xE6, 0x43, 0x5A, 0x18, 0xA3, 0x92, 0xFE, 0xAB, 0x24, 0xC0, 
+	0x58, 0xC8, 0x02, 0xD8, 0xD1, 0x6C, 0xDD, 0xC9, 0x40, 0x1F, 0xD2, 0xF7, 0x90, 0xDB, 0x29, 0x22, 
+	0x26, 0x26, 0x83, 0xEA, 0xEB, 0xE2, 0x8A, 0x83, 0x56, 0x32, 0xDB, 0xE8, 0xF6, 0x06, 0x40, 0xE5, 
+	0x8B, 0xC4, 0xA8, 0xFC, 0x45, 0x2A, 0x22, 0xCF, 0xAB, 0xF6, 0x85, 0x73, 0x97, 0xC6, 0x91, 0xF1, 
+	0x2B, 0x31, 0xDC, 0x1C, 0xB2, 0x62, 0x9B, 0x6A, 0x02, 0xAC, 0x94, 0xDC, 0x5B, 0x39, 0xF0, 0xB6, 
+	0x57, 0xE8, 0x39, 0x9A, 0xA9, 0x87, 0x3F, 0x65, 0x5F, 0xD4, 0x49, 0x84, 0x91, 0x74, 0xEA, 0x7E, 
+	0xD2, 0x44, 0x74, 0x2A, 0xA7, 0x82, 0x28, 0x64, 0x85, 0x2E, 0x0D, 0xB1, 0x93, 0x51, 0x04, 0x0C, 
+	0x16, 0x3D, 0x42, 0xE2, 0x8F, 0xE9, 0x9F, 0x78, 0xD7, 0xD4, 0x18, 0xC2, 0x9F, 0x9C, 0x9A, 0x6B, 
+	0x03, 0x95, 0xF1, 0x23, 0xD1, 0x2B, 0x4C, 0x05, 0x1B, 0x8F, 0x21, 0x3B, 0x49, 0x91, 0xD6, 0xBB, 
+	0xE6, 0x7F, 0xF7, 0x41, 0x52, 0x67, 0x1E, 0x76, 0xDF, 0xF6, 0x8B, 0x7E, 0x84, 0xCD, 0x5A, 0x4F, 
+	0xB9, 0x7B, 0xEB, 0xBF, 0xFF, 0xC9, 0xC4, 0x69, 0x1D, 0x34, 0xDE, 0x2D, 0x33, 0xDE, 0x02, 0x4C, 
+	0x7F, 0x38, 0x7D, 0x84, 0xEF, 0x1E, 0x82, 0x6C, 0x28, 0x9E, 0x51, 0xB4, 0x94, 0x40, 0x1F, 0x93, 
+	0x20, 0x29, 0xE9, 0x6D, 0x61, 0x48, 0x19, 0x84, 0xC1, 0x70, 0xE5, 0xE1, 0x94, 0xAA, 0x43, 0x73, 
+	0xF6, 0x99, 0xC3, 0x1F, 0x5F, 0x52, 0xE6, 0x34, 0x70, 0x8C, 0x76, 0x26, 0xE7, 0xAA, 0x44, 0x26, 
+	0xB4, 0x00, 0x3F, 0x2D, 0xA0, 0x5B, 0xDE, 0xC6, 0x02, 0xE2, 0x5B, 0xF6, 0xDB, 0xB2, 0xA0, 0x76, 
+	0xFA, 0xA0, 0x95, 0x44, 0x11, 0xEE, 0x8D, 0x42, 0x16, 0x2E, 0x5E, 0xAC, 0xBB, 0xC5, 0x65, 0xE8, 
+	0x49, 0x29, 0xC1, 0x3B, 0x6A, 0x8D, 0x27, 0xEB, 0x25, 0x3B, 0x41, 0x19, 0x4A, 0xB3, 0x0A, 0x95, 
+	0x20, 0xEB, 0xA6, 0x0B, 0x20, 0xC3, 0xE1, 0xFC, 0x2A, 0x5C, 0xD6, 0xA2, 0x31, 0x70, 0xB0, 0xE6, 
+	0xEA, 0xC9, 0x11, 0xAB, 0xD2, 0x41, 0xF2, 0xB4, 0x13, 0xDC, 0x79, 0xAB, 0xA0, 0xF3, 0x3C, 0x13, 
+	0xC9, 0xE3, 0x19, 0xC0, 0x1F, 0x7A, 0x48, 0xEB, 0x06, 0x62, 0x4D, 0xEC, 0x67, 0x14, 0x60, 0x83, 
+	0xD6, 0xA8, 0xBF, 0xDF, 0x08, 0x21, 0xDF, 0x04, 0x94, 0x26, 0xC9, 0xDA, 0xD0, 0xA3, 0x04, 0xDC, 
+	0x03, 0x14, 0x90, 0x17, 0xB8, 0x5A, 0x4B, 0xF6, 0x75, 0x9B, 0xAB, 0xB3, 0xA5, 0xC3, 0xC9, 0xFE, 
+	0x75, 0xE1, 0x47, 0x59, 0xB5, 0xD4, 0x17, 0x94, 0xD5, 0xF4, 0x2A, 0x52, 0x7D, 0xCC, 0xC6, 0x4F, 
+	0x99, 0x14, 0x65, 0xDE, 0x5C, 0xD7, 0x32, 0xAB, 0x75, 0xA9, 0x6E, 0x82, 0xE3, 0xE7, 0xF4, 0xF3, 
+	0xC1, 0x4A, 0xE3, 0x19, 0x4F, 0xD2, 0xA7, 0xFE, 0xE5, 0x42, 0x6E, 0x38, 0xF4, 0x33, 0x6E, 0xF9, 
+	0x0C, 0x76, 0xF1, 0x89, 0x55, 0xAB, 0x08, 0x3D, 0xC5, 0x47, 0x4E, 0xB5, 0x2F, 0x00, 0x33, 0x84, 
+	0xCD, 0xCE, 0x24, 0xEA, 0xDB, 0x3D, 0x25, 0x9B, 0x24, 0xC1, 0xCA, 0xA3, 0xB6, 0x3A, 0x7D, 0xBF, 
+	0x8A, 0xB9, 0x60, 0xEF, 0xE6, 0x2B, 0x8C, 0x4A, 0xAC, 0x3F, 0xA4, 0x0D, 0x82, 0x8E, 0xD1, 0x70, 
+	0x67, 0x97, 0xA7, 0x17, 0xB9, 0x52, 0xB2, 0x5A, 0xE8, 0xEC, 0x8D, 0x94, 0xC5, 0x96, 0xFC, 0x9B, 
+	0xD3, 0x10, 0x7E, 0xD3, 0x06, 0xB4, 0xAA, 0xC7, 0x63, 0xA1, 0x56, 0x9F, 0x04, 0x7F, 0x96, 0xEE, 
+	0x39, 0xDC, 0x18, 0x60, 0x2F, 0x71, 0x2D, 0xEB, 0xF5, 0x1A, 0x4D, 0xFE, 0xB3, 0x49, 0x37, 0xFE, 
+	0xC5, 0x7F, 0x6C, 0xEE, 0x17, 0x48, 0xF5, 0xED, 0xA7, 0xB9, 0x95, 0x0B, 0x61, 0x2E, 0x2C, 0x87, 
+	0xA7, 0x5D, 0xA5, 0xAC, 0x89, 0xEC, 0x11, 0x0C, 0xD5, 0xCD, 0xE1, 0xB6, 0x9C, 0x4B, 0x8F, 0xCF, 
+	0x21, 0x75, 0xA1, 0x1B, 0x35, 0x41, 0x4D, 0x4E, 0x9B, 0xDE, 0xE2, 0xE8, 0x0E, 0x23, 0x9A, 0x9A, 
+	0x2B, 0xAC, 0x41, 0x6E, 0xEF, 0xD1, 0xAC, 0x7E, 0x74, 0xB7, 0x16, 0x83, 0x10, 0x85, 0x84, 0x60, 
+	0x28, 0xF0, 0xD1, 0xA0, 0x5E, 0xB7, 0x8E, 0xEF, 0x7B, 0x4C, 0x27, 0xAF, 0x8A, 0x9E, 0x3F, 0x29, 
+	0x1B, 0x12, 0x01, 0x07, 0xF1, 0xAA, 0xFE, 0x2E, 0xFF, 0x18, 0x9A, 0xCD, 0xF4, 0x0E, 0xC1, 0x74, 
+	0x6D, 0xD4, 0xCE, 0xF3, 0xF9, 0x3C, 0xE2, 0x12, 0x03, 0x07, 0x1B, 0x9D, 0x3D, 0x6E, 0xD9, 0x79, 
+	0xB3, 0x56, 0x14, 0xC5, 0xEA, 0x06, 0xD1, 0xAD, 0x2C, 0x07, 0x58, 0x90, 0x0E, 0x80, 0x6B, 0x60, 
+	0x43, 0x82, 0xAA, 0x0C, 0xEE, 0x1B
+};
+
+uint8 Module_0DBBF209A27B1E279A9FEC5C168A15F7_Key[16] =
+{
+	0x5B, 0x27, 0x27, 0x01, 0x24, 0x56, 0xB4, 0xD4, 0x2D, 0xD0, 0x96, 0x77, 0x49, 0x51, 0xDC, 0x0A
+};
+
+#endif
diff --git a/src/game/warden/WardenModuleWin.h b/src/game/warden/WardenModuleWin.h
new file mode 100644
index 00000000000..48b9b3a6953
--- /dev/null
+++ b/src/game/warden/WardenModuleWin.h
@@ -0,0 +1,1204 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _WARDEN_MODULE_WIN_H
+#define _WARDEN_MODULE_WIN_H
+
+uint8 Module_79C0768D657977D697E10BAD956CCED1_Data[18756] =
+{
+	0x21, 0x6C, 0xBB, 0x6A, 0xB9, 0xAF, 0xE8, 0xA1, 0x9A, 0x79, 0x18, 0xF1, 0x27, 0x9A, 0x14, 0xF5, 
+	0x42, 0x5D, 0x00, 0xBA, 0x74, 0x57, 0x0E, 0xAF, 0xD2, 0xAE, 0x8E, 0x51, 0xA5, 0xC1, 0x17, 0x4E, 
+	0xEC, 0x7F, 0xAC, 0xBC, 0xDD, 0x42, 0x87, 0xA6, 0xF9, 0xC1, 0x4A, 0xCE, 0xB5, 0xDD, 0xB3, 0xF8, 
+	0x06, 0x52, 0x9D, 0xF2, 0xAE, 0x2A, 0x49, 0x2B, 0x7B, 0x72, 0x5F, 0x40, 0x01, 0x16, 0xDB, 0x98, 
+	0x77, 0x1F, 0xE3, 0x61, 0x5A, 0x99, 0x39, 0x66, 0x2F, 0x2F, 0x35, 0xBF, 0x00, 0x20, 0xE4, 0xE0, 
+	0x8F, 0x98, 0xAD, 0xFC, 0xDB, 0x7D, 0xDD, 0xE8, 0x7A, 0xE9, 0x21, 0x6C, 0x86, 0x80, 0x3A, 0xE7, 
+	0x75, 0x66, 0x0E, 0xD9, 0xC6, 0xC5, 0xD8, 0xD8, 0xA9, 0x9B, 0x84, 0x09, 0xF0, 0xB3, 0x7C, 0x72, 
+	0x53, 0xE2, 0x29, 0xF9, 0x64, 0x8C, 0x17, 0xFD, 0x90, 0xAE, 0x48, 0x5A, 0x30, 0xFA, 0x30, 0xB7, 
+	0x54, 0x58, 0x59, 0x61, 0xA0, 0x24, 0x57, 0xE4, 0xF0, 0x05, 0xA2, 0x3F, 0x7A, 0xA6, 0x51, 0x7E, 
+	0x4F, 0x35, 0xF4, 0xE5, 0xFF, 0x98, 0xE9, 0x3E, 0x1F, 0xF1, 0x66, 0x48, 0x5B, 0xF8, 0xCF, 0x3B, 
+	0x37, 0x3B, 0x60, 0x47, 0x1C, 0xF7, 0xBE, 0x59, 0x70, 0x3A, 0x03, 0x4C, 0xE6, 0xBD, 0xB6, 0xED, 
+	0x46, 0xAF, 0x04, 0x5A, 0xAA, 0xC4, 0x30, 0xCF, 0x0B, 0x05, 0x86, 0xA9, 0x56, 0x5B, 0x09, 0xF0, 
+	0x92, 0x59, 0xC8, 0x48, 0x58, 0x33, 0xBF, 0x81, 0x70, 0x51, 0x92, 0x98, 0xE9, 0x4F, 0x2B, 0xDD, 
+	0x5B, 0x0A, 0x42, 0x51, 0x73, 0x97, 0xF6, 0x66, 0x00, 0xF2, 0x04, 0x50, 0x4A, 0x54, 0x62, 0x7A, 
+	0x00, 0x10, 0x5B, 0xAD, 0x0E, 0xFC, 0xE1, 0x44, 0x55, 0x4E, 0x21, 0x76, 0xC6, 0x4B, 0xD5, 0x2E, 
+	0xF5, 0xF4, 0x0E, 0xFC, 0x55, 0xE1, 0xDE, 0x32, 0x20, 0x22, 0x03, 0x98, 0xF0, 0xD3, 0x4A, 0xE5, 
+	0x45, 0x49, 0x0C, 0xE8, 0x76, 0xE1, 0xBF, 0x4A, 0x53, 0xD3, 0xCE, 0x64, 0xCF, 0x82, 0xCF, 0x67, 
+	0xA9, 0x3F, 0xF1, 0x06, 0x24, 0x33, 0x0A, 0x98, 0x6A, 0x5C, 0xAB, 0xEE, 0x7F, 0x64, 0xE3, 0x65, 
+	0x1F, 0xF6, 0xBE, 0xAF, 0x9C, 0x63, 0x53, 0x54, 0x06, 0x84, 0x4F, 0xF2, 0x7D, 0xC5, 0xBD, 0x70, 
+	0xC7, 0x6F, 0x59, 0x93, 0x7C, 0xEE, 0xC0, 0xCA, 0xF5, 0x56, 0x21, 0x58, 0x5B, 0xD8, 0x1D, 0xB4, 
+	0xB7, 0x60, 0x72, 0x46, 0xA2, 0x60, 0x3F, 0xC3, 0x30, 0xAB, 0xE0, 0x3B, 0xAC, 0x9E, 0xB9, 0x64, 
+	0xA8, 0xEF, 0xD0, 0xE1, 0xE5, 0xE1, 0x83, 0x48, 0xB8, 0x35, 0xA7, 0x12, 0x11, 0x00, 0xC9, 0x29, 
+	0x1A, 0x41, 0x1D, 0x3B, 0xFB, 0x33, 0x0B, 0x66, 0x45, 0x86, 0x61, 0x70, 0x35, 0x4C, 0x5F, 0x64, 
+	0x8E, 0xF5, 0x57, 0xBE, 0xA6, 0xFA, 0x49, 0xC9, 0x89, 0xA4, 0x74, 0x02, 0x9E, 0xE7, 0x67, 0x14, 
+	0x8B, 0xB9, 0xE7, 0xA8, 0xB0, 0x75, 0x65, 0x22, 0xB7, 0xCD, 0xFA, 0x55, 0x18, 0x00, 0x55, 0xB5, 
+	0x09, 0x70, 0x7E, 0x05, 0x0B, 0x11, 0x42, 0xF0, 0x80, 0x58, 0x2F, 0xFE, 0x3B, 0x2C, 0x4A, 0xCA, 
+	0x50, 0x34, 0xD0, 0x6F, 0xF1, 0xCC, 0x7F, 0x35, 0xD7, 0x9B, 0xF2, 0x97, 0x16, 0xFE, 0x5F, 0x6C, 
+	0x94, 0xDC, 0xAC, 0x63, 0xC8, 0x85, 0x2E, 0x60, 0x41, 0x34, 0x89, 0xD3, 0xDD, 0xBF, 0x2D, 0x69, 
+	0xC2, 0xF7, 0x74, 0xB2, 0x56, 0xD9, 0x76, 0xA2, 0x35, 0x30, 0x60, 0x35, 0xAB, 0x50, 0x21, 0xAE, 
+	0xFC, 0xFA, 0x19, 0x06, 0xDE, 0x89, 0x46, 0xFF, 0x34, 0x2F, 0x19, 0x84, 0x85, 0xF5, 0x1E, 0x60, 
+	0x91, 0x0D, 0x8C, 0x94, 0xDB, 0x2E, 0xEE, 0x4D, 0x0A, 0x29, 0x64, 0x81, 0xAD, 0x4C, 0xBF, 0x41, 
+	0x51, 0x04, 0xCD, 0x1C, 0x5C, 0x89, 0xD3, 0x3A, 0x91, 0xD9, 0x5C, 0x7E, 0xF3, 0xE9, 0x5B, 0x9E, 
+	0xC2, 0xD2, 0xE4, 0xD5, 0xEF, 0x47, 0x63, 0xD2, 0xD4, 0x19, 0x3E, 0xDF, 0xCF, 0xA4, 0x10, 0x47, 
+	0x16, 0x93, 0xC2, 0xF2, 0x22, 0xED, 0x1D, 0x9E, 0x21, 0x63, 0xC4, 0xCB, 0x89, 0xBB, 0x3E, 0xF7, 
+	0x89, 0x68, 0x6D, 0x2C, 0xDF, 0x2C, 0x6F, 0xB2, 0x8D, 0x75, 0xF8, 0xC6, 0x57, 0x98, 0x47, 0x86, 
+	0x40, 0x72, 0xBB, 0xD7, 0x32, 0xCD, 0x7A, 0x15, 0x64, 0x83, 0xD9, 0x50, 0x2E, 0xDE, 0x0C, 0x8C, 
+	0x30, 0xCD, 0xB0, 0x64, 0xD6, 0x7F, 0xE7, 0xAD, 0x6E, 0x01, 0x3E, 0x14, 0x8A, 0x24, 0x86, 0x1F, 
+	0x92, 0xAB, 0x1A, 0xE5, 0xD6, 0xBF, 0x64, 0xE5, 0xF6, 0x34, 0x62, 0xD5, 0x92, 0x5B, 0x64, 0xC4, 
+	0xFC, 0x1B, 0x7F, 0xA0, 0x13, 0xC1, 0xD4, 0xEB, 0x92, 0x90, 0xEF, 0x8C, 0x5E, 0x75, 0x4B, 0x78, 
+	0x56, 0x5F, 0xA2, 0x55, 0x4B, 0x1B, 0xE3, 0xDD, 0x80, 0x7E, 0xCF, 0x69, 0x97, 0x5A, 0x76, 0xD5, 
+	0xAA, 0x7D, 0x85, 0x73, 0x10, 0x4E, 0x79, 0x9A, 0x10, 0x10, 0x01, 0xD8, 0xD7, 0x85, 0x41, 0x8D, 
+	0x3D, 0xEA, 0xE3, 0x59, 0xD9, 0x31, 0x4B, 0x23, 0xC6, 0x53, 0x11, 0xA6, 0x35, 0x29, 0x64, 0x7E, 
+	0x28, 0xD7, 0x8D, 0x03, 0x70, 0x5C, 0x53, 0xA7, 0x6D, 0x81, 0x30, 0x7B, 0xDF, 0x2B, 0xAE, 0xAB, 
+	0x6F, 0x52, 0x93, 0xCF, 0xDD, 0x00, 0x35, 0xE9, 0x65, 0x4A, 0x04, 0x79, 0x11, 0x30, 0xCA, 0xC7, 
+	0xD2, 0xF3, 0x34, 0xAC, 0x32, 0x1F, 0xE4, 0xE5, 0x83, 0x12, 0x66, 0xD6, 0xA6, 0xE4, 0xEB, 0x67, 
+	0x7E, 0xDD, 0x64, 0x3E, 0xF1, 0x0C, 0xE6, 0x1C, 0xB6, 0xE1, 0xB0, 0x2B, 0xE7, 0x83, 0xB4, 0x4A, 
+	0x82, 0xDD, 0xC1, 0x22, 0x3F, 0x03, 0x38, 0x90, 0xB2, 0xA9, 0x7B, 0x60, 0x57, 0xF9, 0xDD, 0x04, 
+	0x60, 0x5D, 0x7C, 0x2C, 0xD3, 0xE6, 0xFE, 0x02, 0x5A, 0x7D, 0x2A, 0x48, 0x81, 0x42, 0x20, 0x84, 
+	0xFF, 0x1D, 0xCC, 0x64, 0x11, 0x70, 0xE5, 0x4F, 0x9F, 0xE0, 0x11, 0xFB, 0xF0, 0xE2, 0xC4, 0x9B, 
+	0x11, 0x30, 0x7F, 0x2F, 0x7F, 0xA1, 0xB1, 0xBC, 0x5F, 0x29, 0x21, 0xDF, 0xB4, 0xEB, 0xB2, 0x4F, 
+	0xAA, 0x2D, 0x95, 0x60, 0x47, 0x78, 0x37, 0x67, 0xCD, 0xFA, 0x36, 0x17, 0x8F, 0x64, 0x15, 0xAF, 
+	0x04, 0xAA, 0x5C, 0x76, 0x23, 0x07, 0x64, 0x96, 0xB2, 0x5A, 0xCF, 0x03, 0xDC, 0xC3, 0x2D, 0xFB, 
+	0x0D, 0x2D, 0xA8, 0xBD, 0xCE, 0x58, 0xF8, 0x44, 0x75, 0xA1, 0x07, 0xAA, 0xDF, 0x25, 0xDC, 0x25, 
+	0x32, 0xCF, 0xA8, 0x92, 0xC5, 0xC0, 0xD5, 0x70, 0x21, 0x19, 0x6F, 0x32, 0xCA, 0x16, 0xFA, 0x8C, 
+	0xB2, 0x86, 0xF6, 0xD5, 0x2E, 0xD9, 0x0A, 0x9C, 0x96, 0xDB, 0x4D, 0xA4, 0x11, 0x02, 0x4C, 0x33, 
+	0x99, 0xB3, 0x5E, 0x45, 0x5C, 0xF1, 0x99, 0x61, 0x04, 0x20, 0xC9, 0xC8, 0xB3, 0xB4, 0xD3, 0x8B, 
+	0x24, 0x78, 0x55, 0x2E, 0xB7, 0x48, 0x43, 0x17, 0xBF, 0xB9, 0x2A, 0xCC, 0xD5, 0x4A, 0x49, 0xB2, 
+	0x4E, 0x1E, 0xC7, 0x45, 0x4E, 0x55, 0xC4, 0xBC, 0xB1, 0xD2, 0xA6, 0x62, 0xE9, 0x95, 0xBB, 0xCD, 
+	0x87, 0xD2, 0x7C, 0xE5, 0xC6, 0x77, 0x5B, 0xFF, 0xAF, 0xDD, 0x44, 0x9D, 0x3D, 0x10, 0x05, 0x3C, 
+	0x77, 0x7A, 0xF8, 0x84, 0x0D, 0x04, 0x55, 0xB5, 0x20, 0xEA, 0xD2, 0x3F, 0x04, 0x33, 0xFF, 0xE2, 
+	0x01, 0x3B, 0x51, 0x46, 0x3E, 0x34, 0xAA, 0x40, 0xCA, 0x7C, 0x85, 0x46, 0x57, 0xD9, 0xB7, 0xE1, 
+	0xDC, 0x65, 0xEF, 0x11, 0x66, 0x0B, 0xBA, 0xD8, 0x37, 0x66, 0x96, 0x64, 0x54, 0x8B, 0x05, 0x81, 
+	0x47, 0x87, 0x70, 0xA8, 0x54, 0xC6, 0x02, 0x08, 0xB4, 0xAD, 0x69, 0x3C, 0xC0, 0x03, 0x69, 0x19, 
+	0xE6, 0xAC, 0x13, 0xD5, 0x3F, 0x2C, 0x9D, 0x61, 0xCC, 0xA8, 0x60, 0xB5, 0x60, 0x85, 0x19, 0x5B, 
+	0x3E, 0x82, 0xCA, 0x34, 0x70, 0x06, 0xCD, 0x37, 0x3E, 0x91, 0x2F, 0x49, 0x82, 0x0A, 0x87, 0xE8, 
+	0x09, 0x18, 0xB3, 0xF4, 0x16, 0xA4, 0xA5, 0x46, 0xC5, 0x76, 0x6D, 0x73, 0xB1, 0x93, 0xDC, 0x69, 
+	0xF4, 0x49, 0xF8, 0x2F, 0x97, 0xB4, 0xAA, 0x19, 0x4A, 0x60, 0xD2, 0xF9, 0x7B, 0x5A, 0xF0, 0x57, 
+	0x45, 0xC6, 0xA2, 0x64, 0x37, 0x56, 0xED, 0x6B, 0x5E, 0x1D, 0x9E, 0x35, 0x5E, 0xFE, 0xDE, 0x04, 
+	0x08, 0x3B, 0x62, 0x40, 0x82, 0xD4, 0xF9, 0xF3, 0x54, 0x95, 0x3E, 0x57, 0x49, 0x3A, 0x41, 0x41, 
+	0xDA, 0xD4, 0x78, 0x80, 0xC7, 0xF1, 0xDE, 0xA7, 0xFF, 0xDC, 0x53, 0xC9, 0x3A, 0x37, 0xA5, 0x83, 
+	0xDE, 0xE8, 0x51, 0x33, 0x7B, 0xE6, 0xAC, 0xA5, 0xC4, 0x7D, 0x34, 0xB0, 0x99, 0x0D, 0x03, 0x34, 
+	0x0F, 0x8D, 0xB8, 0x10, 0x4E, 0x30, 0x38, 0x10, 0xFC, 0x62, 0xC3, 0xC0, 0xF5, 0x67, 0x69, 0xF5, 
+	0x23, 0xB4, 0xF2, 0x6B, 0x79, 0xA8, 0xEE, 0xF0, 0xDD, 0x06, 0xA1, 0x50, 0x41, 0x3E, 0x1D, 0x04, 
+	0xB0, 0xB7, 0xC8, 0x58, 0x20, 0x72, 0xF6, 0x41, 0x53, 0x58, 0xAA, 0xAB, 0xA1, 0x19, 0xB0, 0x99, 
+	0xE4, 0x35, 0x44, 0x32, 0xF0, 0x34, 0x52, 0x4E, 0xD0, 0xBC, 0x1D, 0xD2, 0x14, 0x6A, 0x22, 0x46, 
+	0x93, 0x52, 0xFF, 0xD5, 0xD9, 0xEF, 0x19, 0xAF, 0xFB, 0x9A, 0x0D, 0x4A, 0x14, 0x49, 0xAE, 0xC0, 
+	0x09, 0x5E, 0x40, 0x36, 0x63, 0xE7, 0xC3, 0xFA, 0x84, 0x1C, 0xBF, 0x65, 0x17, 0xED, 0xED, 0x49, 
+	0x93, 0xB9, 0xCD, 0x85, 0x3F, 0x95, 0x57, 0xF9, 0xE7, 0x59, 0x55, 0x59, 0xED, 0x3A, 0xA1, 0x90, 
+	0x24, 0x36, 0xB8, 0x38, 0x91, 0x57, 0x59, 0xDB, 0xDE, 0x8E, 0x8B, 0x3A, 0xBB, 0x31, 0x76, 0x39, 
+	0x0D, 0x20, 0x84, 0x8A, 0x05, 0x5A, 0xC1, 0x93, 0x04, 0x5E, 0x9E, 0x2E, 0x41, 0x13, 0xC9, 0x7F, 
+	0xAB, 0x45, 0x86, 0x99, 0xB2, 0x5C, 0x7E, 0x1A, 0x1C, 0x9C, 0x7C, 0xCF, 0x60, 0x38, 0xF7, 0x02, 
+	0x8A, 0xE6, 0x74, 0x4F, 0x31, 0x67, 0x99, 0x96, 0xC3, 0x79, 0xEB, 0x19, 0x07, 0xAD, 0xBB, 0xD2, 
+	0xD7, 0x51, 0x75, 0xDD, 0xD5, 0x44, 0xC2, 0x9A, 0xDE, 0x01, 0x68, 0x8C, 0xBF, 0x11, 0xFE, 0x5F, 
+	0xB9, 0xCF, 0x25, 0x35, 0xD2, 0xF7, 0x29, 0xE0, 0x63, 0x0F, 0x0A, 0xCA, 0xB9, 0x38, 0xB6, 0xDA, 
+	0xDD, 0x66, 0xD9, 0x5F, 0x67, 0x42, 0x15, 0xD8, 0x1C, 0xD1, 0x1C, 0xCC, 0xD6, 0xB9, 0x29, 0x85, 
+	0x99, 0xD6, 0xDD, 0xCE, 0x8E, 0x3D, 0x63, 0x1C, 0x31, 0x32, 0x37, 0xCD, 0xE1, 0xF8, 0xEA, 0x4E, 
+	0x31, 0x25, 0xF7, 0x2D, 0xE1, 0xCA, 0x36, 0x5B, 0xEC, 0xAC, 0x2B, 0xB0, 0xA5, 0x69, 0x3B, 0x4C, 
+	0xAE, 0xD7, 0x15, 0xF7, 0x7F, 0x5C, 0x5F, 0x82, 0xF0, 0x1D, 0x44, 0x62, 0xA0, 0x72, 0x57, 0xAD, 
+	0xB3, 0xD7, 0x1B, 0xA9, 0xE2, 0x76, 0xFF, 0x18, 0xA6, 0x3E, 0xF9, 0xF5, 0x6F, 0xB5, 0x13, 0x26, 
+	0x72, 0x0F, 0xF4, 0xE1, 0x7D, 0x43, 0x86, 0x48, 0x42, 0x0B, 0x94, 0x96, 0xBF, 0x0E, 0x32, 0x1C, 
+	0xE0, 0x18, 0x69, 0xA9, 0xAE, 0x83, 0x6F, 0x36, 0xE7, 0x04, 0x20, 0xEE, 0x34, 0xFF, 0x21, 0xE9, 
+	0xBA, 0x3B, 0x38, 0x48, 0x2D, 0x81, 0x38, 0x48, 0x25, 0xE5, 0x4A, 0xAD, 0x81, 0xA9, 0xE8, 0x33, 
+	0x0A, 0x4C, 0x60, 0xAE, 0xBB, 0xCC, 0x24, 0x96, 0x44, 0xF3, 0x1A, 0x2A, 0x89, 0xCB, 0xD9, 0x5E, 
+	0x89, 0x4C, 0xFD, 0x62, 0xA8, 0x38, 0x1E, 0x73, 0x63, 0xB3, 0xF1, 0x3E, 0xAC, 0xB1, 0x0B, 0x5D, 
+	0x10, 0xE5, 0xCC, 0x88, 0x2F, 0x9D, 0x57, 0xF1, 0x33, 0xA6, 0x50, 0x13, 0x2C, 0x54, 0x81, 0x1B, 
+	0x90, 0xD8, 0x6F, 0x7C, 0x02, 0x86, 0xA8, 0x02, 0x5F, 0xCE, 0x24, 0x22, 0x76, 0x73, 0xE8, 0x66, 
+	0xDC, 0x7F, 0x8F, 0x69, 0x4E, 0xBB, 0x63, 0xEB, 0xCD, 0x38, 0xE6, 0xEE, 0x84, 0x70, 0x97, 0x2F, 
+	0xD1, 0x77, 0xEE, 0x63, 0xE4, 0x2D, 0x42, 0xDE, 0x17, 0x95, 0x18, 0xB5, 0xA9, 0x4D, 0xFD, 0x2A, 
+	0xA8, 0x07, 0x1F, 0xCC, 0x3F, 0x22, 0x3B, 0x03, 0x49, 0xCF, 0x83, 0x83, 0x85, 0xAA, 0x87, 0xA0, 
+	0xC6, 0x30, 0x8C, 0x8F, 0x91, 0x88, 0x67, 0xA7, 0x1F, 0xE0, 0xE2, 0x40, 0x1E, 0xE9, 0x12, 0x2E, 
+	0x5C, 0x33, 0x44, 0x29, 0x0D, 0xEA, 0x34, 0x8B, 0x1A, 0x48, 0x80, 0x67, 0x45, 0x2A, 0xF2, 0x82, 
+	0xD8, 0x78, 0x7E, 0x36, 0x59, 0x6C, 0x32, 0x58, 0x3B, 0x0F, 0x2C, 0x0B, 0xD1, 0xFA, 0x67, 0x2B, 
+	0x0C, 0xFF, 0x16, 0x57, 0x04, 0x38, 0x51, 0x4F, 0x34, 0xEE, 0x94, 0x8B, 0xBB, 0x7B, 0xBE, 0xEA, 
+	0x37, 0xB5, 0x9F, 0xBA, 0xDE, 0xC1, 0xC6, 0x34, 0x2D, 0x36, 0xE6, 0xC8, 0x67, 0x6A, 0x74, 0x56, 
+	0xB5, 0x05, 0x53, 0xAE, 0x5C, 0x94, 0x83, 0xF9, 0xE0, 0xD7, 0x21, 0xC2, 0x71, 0x4B, 0x0F, 0x9C, 
+	0x64, 0x1C, 0xF4, 0x6A, 0xF8, 0xE3, 0x3C, 0x8F, 0xD2, 0x20, 0xCF, 0x14, 0xAC, 0x21, 0xF5, 0x2A, 
+	0xE7, 0xEC, 0x5C, 0x49, 0xAB, 0x21, 0xF2, 0x41, 0x2C, 0x3B, 0xA0, 0x49, 0x43, 0xF3, 0x14, 0xFE, 
+	0x68, 0x7C, 0x83, 0x05, 0xF3, 0x71, 0x77, 0x02, 0x2B, 0xD4, 0x94, 0x2B, 0x28, 0x5E, 0x4A, 0x5E, 
+	0x6E, 0x81, 0x1A, 0xD3, 0xDA, 0x58, 0x9F, 0xD6, 0x7B, 0x6D, 0xAD, 0x14, 0xBC, 0x60, 0xFC, 0xC4, 
+	0x83, 0x0A, 0x8E, 0x9B, 0x8D, 0x5B, 0x24, 0x77, 0x10, 0x34, 0x78, 0xC9, 0x8F, 0xA5, 0x2D, 0x0F, 
+	0x6A, 0x88, 0x7F, 0x24, 0x40, 0x46, 0x25, 0x3A, 0xDE, 0xB9, 0x9E, 0xA2, 0xE7, 0x8D, 0x52, 0xA2, 
+	0xFF, 0xDE, 0xB4, 0x95, 0xDB, 0x05, 0x2E, 0xDF, 0x29, 0x28, 0xB5, 0x76, 0xD6, 0x1D, 0x09, 0x45, 
+	0x69, 0x29, 0xF9, 0x95, 0xAA, 0x36, 0x71, 0xD9, 0x3F, 0xFF, 0x6B, 0x04, 0xFE, 0xED, 0x63, 0xC8, 
+	0x3C, 0x4B, 0x6B, 0x0B, 0xF3, 0xD8, 0x71, 0x15, 0xDA, 0xC0, 0xC9, 0xE2, 0x0D, 0x87, 0x94, 0x61, 
+	0xBE, 0xEF, 0x79, 0x92, 0x4C, 0x14, 0x92, 0xBF, 0x0C, 0x4E, 0xA0, 0x1B, 0x58, 0x00, 0x30, 0xF6, 
+	0xD0, 0x09, 0xD6, 0x1E, 0x81, 0xA0, 0xE7, 0xFD, 0xFD, 0xFF, 0x21, 0x47, 0xAB, 0xDE, 0x67, 0xC6, 
+	0xF4, 0x19, 0x60, 0x0C, 0x49, 0xE5, 0xC4, 0xBD, 0x64, 0x05, 0xED, 0x89, 0xD7, 0xBD, 0x74, 0xF7, 
+	0xD4, 0xCC, 0x4B, 0x9E, 0xEB, 0x6E, 0xB7, 0x87, 0xB6, 0x31, 0x07, 0xCB, 0x6E, 0x0D, 0xDF, 0x3A, 
+	0xD8, 0x64, 0x1F, 0xF9, 0x2C, 0xEE, 0xC0, 0x61, 0x22, 0x0E, 0x5A, 0x20, 0x0C, 0xD4, 0x4F, 0xC5, 
+	0x2D, 0x82, 0x63, 0x39, 0x36, 0x34, 0x07, 0xC6, 0x23, 0xBC, 0xF1, 0x56, 0xC6, 0x8C, 0x39, 0x23, 
+	0x43, 0xFF, 0xEC, 0xBE, 0x95, 0x7B, 0xC7, 0xFD, 0xA9, 0x99, 0x3D, 0xDF, 0x50, 0x28, 0x39, 0xCA, 
+	0x80, 0xCF, 0x1C, 0xE7, 0x81, 0x06, 0xB4, 0x43, 0x55, 0xFB, 0xB0, 0xA4, 0x5D, 0x78, 0x39, 0x71, 
+	0x88, 0xEC, 0xBB, 0x01, 0x69, 0x5E, 0x85, 0x97, 0x1F, 0xEB, 0x6C, 0x82, 0x07, 0xF4, 0x00, 0x1B, 
+	0x90, 0x03, 0x1B, 0x92, 0x9A, 0x4A, 0x95, 0x9D, 0x45, 0x45, 0x65, 0x6F, 0x8B, 0x70, 0x4C, 0xFE, 
+	0x48, 0x94, 0x5B, 0x71, 0x86, 0x70, 0x45, 0xB7, 0x85, 0xD9, 0x59, 0x29, 0x94, 0x47, 0x5A, 0x17, 
+	0x96, 0xA1, 0x0E, 0xFD, 0x72, 0x71, 0xE1, 0x3F, 0x7B, 0xE6, 0x59, 0x2A, 0x91, 0x5A, 0x6B, 0x82, 
+	0xB1, 0xA1, 0x31, 0xC2, 0xE4, 0xE3, 0xB9, 0x8E, 0x5A, 0x68, 0xC1, 0x18, 0xD4, 0x4B, 0x02, 0x2E, 
+	0x50, 0x3D, 0x73, 0x53, 0x2B, 0x13, 0x77, 0x19, 0xC7, 0x03, 0x0B, 0xB5, 0xAD, 0x5C, 0x0B, 0x6B, 
+	0x66, 0x12, 0xF0, 0xE8, 0x67, 0xB7, 0xF7, 0x88, 0x64, 0xA8, 0x2C, 0x51, 0xA7, 0xF8, 0x5E, 0xB3, 
+	0x39, 0xEC, 0x1B, 0xDF, 0x6C, 0x89, 0x16, 0xFD, 0x51, 0x26, 0x29, 0x8D, 0x0E, 0xBE, 0x1B, 0xCE, 
+	0x61, 0xE5, 0x22, 0x09, 0xC1, 0x0F, 0xAD, 0x0C, 0xA1, 0x61, 0xF8, 0x49, 0x29, 0x11, 0x7C, 0x93, 
+	0x0C, 0xBE, 0xD0, 0x11, 0x6F, 0x24, 0x4E, 0x4B, 0xF5, 0xEF, 0x41, 0x3D, 0x0C, 0x69, 0xC6, 0xA6, 
+	0xBF, 0x87, 0x68, 0xFF, 0x2F, 0x76, 0xD9, 0xFD, 0x1D, 0x8E, 0x9F, 0x80, 0x19, 0x3B, 0x35, 0x8B, 
+	0x2D, 0xDB, 0x5C, 0x3E, 0x86, 0xE8, 0xBF, 0xF1, 0x30, 0x88, 0xE4, 0x80, 0xD0, 0x49, 0xC3, 0x50, 
+	0xF8, 0x1E, 0xCE, 0xDA, 0xAC, 0x2E, 0x3F, 0x97, 0x51, 0x12, 0x89, 0x47, 0x5D, 0xF4, 0xD4, 0x77, 
+	0x93, 0x66, 0x74, 0xE3, 0x4C, 0xCD, 0xB4, 0xC8, 0x00, 0x85, 0x64, 0x8C, 0x04, 0x72, 0x1C, 0x14, 
+	0xDA, 0x77, 0xD7, 0x1D, 0x39, 0xC3, 0x65, 0xD0, 0x28, 0x51, 0xCA, 0x91, 0xAE, 0x2D, 0xCD, 0x50, 
+	0x0D, 0x1B, 0xA4, 0xF1, 0x5D, 0x4C, 0x28, 0x1C, 0x57, 0xE5, 0x00, 0xEC, 0xA4, 0x02, 0x3B, 0xCA, 
+	0x70, 0xF3, 0x8B, 0x3C, 0x4F, 0xEE, 0x9D, 0x08, 0xFF, 0x66, 0x31, 0xCE, 0x37, 0x93, 0x90, 0x3D, 
+	0x6E, 0xDE, 0xB9, 0xCF, 0x35, 0xAA, 0xF0, 0x43, 0x3E, 0x6B, 0x19, 0xEC, 0x69, 0x7A, 0xF0, 0xC6, 
+	0xC3, 0x7D, 0x49, 0x89, 0x43, 0xCC, 0x2C, 0x20, 0x2E, 0xB8, 0x5D, 0xCC, 0xDB, 0x39, 0xCB, 0x0B, 
+	0x76, 0xD8, 0xAC, 0xD6, 0x2A, 0x76, 0x59, 0x7F, 0x6A, 0x1B, 0xCD, 0x4A, 0x93, 0xCA, 0x42, 0x5F, 
+	0xC7, 0x98, 0xFA, 0xC9, 0x30, 0x2E, 0x9F, 0x8F, 0xE5, 0xB5, 0x37, 0x41, 0x19, 0xF4, 0xA0, 0xE5, 
+	0xDA, 0x7D, 0x3C, 0xF5, 0x61, 0xCC, 0x98, 0x27, 0xED, 0xE4, 0x5C, 0x0E, 0x7C, 0x1B, 0x33, 0x38, 
+	0x77, 0x20, 0x92, 0xC9, 0xD3, 0x38, 0xC3, 0x03, 0x2C, 0xAF, 0xE2, 0x77, 0x34, 0x4B, 0xE2, 0x1C, 
+	0x9F, 0xE4, 0x4D, 0xAB, 0x12, 0xFE, 0xCD, 0xB3, 0x2C, 0xD3, 0xE2, 0x42, 0xB8, 0xE7, 0xE0, 0x14, 
+	0x88, 0x31, 0xB1, 0xDC, 0x35, 0xDE, 0xCD, 0x3D, 0x3B, 0xDF, 0x6C, 0x00, 0xA3, 0x48, 0xA6, 0x71, 
+	0x7E, 0xC6, 0x3A, 0xE8, 0x07, 0xCE, 0xC8, 0xE7, 0xDC, 0xB1, 0x98, 0x17, 0xDB, 0x75, 0x20, 0xFE, 
+	0x38, 0xC7, 0x1F, 0x02, 0x8E, 0xE4, 0x91, 0x79, 0x3D, 0xC0, 0x50, 0x2D, 0xC7, 0x49, 0x33, 0x6C, 
+	0xDF, 0x3C, 0xE9, 0x42, 0xE9, 0x27, 0xBC, 0x39, 0x38, 0xAA, 0x98, 0x16, 0x6E, 0x1F, 0x71, 0xDF, 
+	0x3B, 0xBA, 0x15, 0x2F, 0x69, 0xEB, 0x06, 0x5C, 0xFB, 0xF8, 0x4C, 0x83, 0x2C, 0x28, 0xC2, 0x19, 
+	0xAD, 0x04, 0xA1, 0xB0, 0x7F, 0xF1, 0x9C, 0x84, 0x38, 0x42, 0x45, 0x3E, 0x1E, 0xC7, 0x95, 0xD5, 
+	0xAF, 0x35, 0x7E, 0x2A, 0xCC, 0x06, 0x9D, 0x9A, 0xCF, 0xC2, 0x56, 0xE6, 0x73, 0x7F, 0x7E, 0x9D, 
+	0x9B, 0x01, 0x27, 0x76, 0x14, 0x8C, 0x3E, 0x3A, 0xBD, 0x2E, 0x6C, 0x7C, 0xB7, 0xF2, 0x9A, 0x92, 
+	0x41, 0xBC, 0xD0, 0x48, 0xF6, 0xE6, 0x16, 0x62, 0x01, 0x4D, 0x3D, 0x8E, 0xD2, 0x98, 0x8F, 0x61, 
+	0x70, 0x7C, 0x41, 0xCC, 0xCA, 0x3D, 0x3E, 0x0B, 0x70, 0xC3, 0x9F, 0x9D, 0x3E, 0x33, 0x50, 0x2B, 
+	0xB0, 0x47, 0xC8, 0xA3, 0xAA, 0x55, 0xBA, 0x16, 0x3B, 0xF4, 0x07, 0x98, 0x1B, 0x6C, 0x49, 0x6A, 
+	0xA5, 0xB4, 0x7A, 0xBE, 0x28, 0x37, 0xF2, 0x55, 0x69, 0x09, 0x7A, 0xEC, 0x94, 0x1C, 0x60, 0xE3, 
+	0xB5, 0x89, 0x07, 0x58, 0x43, 0xA3, 0x3F, 0x1D, 0x94, 0x20, 0x49, 0x5E, 0xC1, 0xB7, 0x4E, 0x2C, 
+	0x75, 0x95, 0x54, 0x91, 0x4A, 0x01, 0x90, 0xF8, 0xF1, 0x81, 0xC6, 0x4C, 0x9A, 0x63, 0x20, 0x55, 
+	0x65, 0x8D, 0x30, 0xA2, 0xD4, 0xC7, 0xAF, 0x18, 0xA5, 0x83, 0xB6, 0x68, 0x1B, 0x35, 0x13, 0x6D, 
+	0xC6, 0x77, 0x5A, 0x04, 0xFB, 0xD5, 0xBD, 0x2B, 0x0D, 0x55, 0x5E, 0xEC, 0x7A, 0x80, 0x17, 0x01, 
+	0x9C, 0x4F, 0x55, 0x39, 0x57, 0x9F, 0x31, 0x9E, 0xB9, 0xB1, 0x35, 0xD5, 0x2F, 0xB9, 0xF3, 0x6A, 
+	0x9C, 0x30, 0xEA, 0x1B, 0xE9, 0x34, 0x4A, 0x2F, 0xB1, 0x36, 0x9C, 0xF0, 0x8A, 0xE9, 0x62, 0xDB, 
+	0x06, 0x32, 0x64, 0x39, 0x58, 0x29, 0xBD, 0xB1, 0x2C, 0x06, 0x56, 0x54, 0xAF, 0x6B, 0x97, 0x5A, 
+	0x7D, 0x49, 0xB6, 0xDF, 0x06, 0xFC, 0x9F, 0x06, 0x64, 0x89, 0xF5, 0xF4, 0xC4, 0x55, 0x02, 0x19, 
+	0xAA, 0xC9, 0x1D, 0x8A, 0x5E, 0x3D, 0xA7, 0x13, 0xEC, 0x52, 0x29, 0x8B, 0x6E, 0xC5, 0xA0, 0x62, 
+	0x9E, 0x89, 0x96, 0xDF, 0x5E, 0x74, 0x69, 0x53, 0x75, 0xCA, 0xF0, 0x95, 0x0E, 0xF8, 0x42, 0xB6, 
+	0x06, 0x62, 0xDA, 0x92, 0x48, 0xC3, 0x37, 0x50, 0x59, 0xDF, 0x59, 0xAF, 0xAF, 0x0E, 0x2E, 0x84, 
+	0xE5, 0x2F, 0x3C, 0xC9, 0x7E, 0x2A, 0xE5, 0xA9, 0x41, 0xB1, 0x51, 0x82, 0xC6, 0x42, 0xEC, 0x65, 
+	0xFD, 0xCB, 0x54, 0x29, 0x33, 0xC2, 0xE5, 0x5E, 0x10, 0xFB, 0x9E, 0x19, 0xE2, 0x75, 0x53, 0x43, 
+	0x50, 0xD5, 0x10, 0x8E, 0xBC, 0xC6, 0x2A, 0x0A, 0x8D, 0x7F, 0x4A, 0xF6, 0x07, 0x28, 0xA1, 0xEB, 
+	0x14, 0x1C, 0xD3, 0xE9, 0x63, 0x55, 0xC7, 0xD2, 0xE8, 0xB2, 0x3D, 0x17, 0x84, 0x63, 0xF9, 0x11, 
+	0xA4, 0x11, 0xE0, 0xA1, 0x83, 0x11, 0x11, 0xD2, 0xA0, 0x8C, 0x61, 0x74, 0x36, 0x63, 0xE9, 0xE8, 
+	0x98, 0x4C, 0x20, 0x38, 0x1F, 0xA5, 0x15, 0x60, 0x3E, 0x5C, 0x1B, 0xE6, 0xDE, 0xC1, 0x70, 0x7F, 
+	0xCB, 0x92, 0x76, 0x05, 0xD8, 0x63, 0xDF, 0x01, 0x7E, 0xF2, 0xF1, 0x01, 0xBD, 0xCE, 0x9A, 0x1E, 
+	0x50, 0x7F, 0xB4, 0xF4, 0x49, 0x5D, 0x7F, 0xCA, 0x86, 0x83, 0x2F, 0x63, 0x33, 0xEF, 0x4F, 0x35, 
+	0xA1, 0xBF, 0xB6, 0xCD, 0x25, 0xBA, 0x0E, 0xB9, 0xA3, 0x96, 0x41, 0xD4, 0x90, 0xFF, 0xEB, 0xF7, 
+	0x4F, 0x93, 0xC8, 0xD7, 0x04, 0x62, 0x6E, 0x88, 0xD7, 0x71, 0x0E, 0x0E, 0x37, 0x50, 0xCE, 0xFA, 
+	0x9B, 0xBD, 0x5B, 0xB0, 0xB7, 0x0F, 0x70, 0x75, 0x0A, 0x5D, 0xFC, 0x69, 0xB3, 0x07, 0x11, 0x9B, 
+	0xE8, 0x13, 0x0D, 0xBF, 0x08, 0x33, 0x59, 0x20, 0x4A, 0xBD, 0x27, 0x76, 0xED, 0xF2, 0x36, 0x0B, 
+	0xEA, 0xBC, 0x78, 0x17, 0xBD, 0x6E, 0x4F, 0x37, 0xD3, 0x26, 0x86, 0x85, 0xB1, 0x71, 0xEA, 0x55, 
+	0x73, 0xAA, 0x7C, 0xA2, 0x36, 0x75, 0xD2, 0xCD, 0xE4, 0xFC, 0xE7, 0xCE, 0x5E, 0xB1, 0xE5, 0xF4, 
+	0x65, 0xD7, 0x8F, 0x34, 0x07, 0x66, 0xA7, 0x4B, 0xCE, 0x55, 0xB0, 0x71, 0xFD, 0x20, 0x03, 0x5C, 
+	0xBA, 0x28, 0x0B, 0x71, 0x4D, 0x93, 0xB9, 0x77, 0x5E, 0x46, 0x6A, 0xCB, 0xD7, 0x0A, 0x59, 0x2E, 
+	0x26, 0x49, 0x0A, 0x36, 0x0F, 0x03, 0x6F, 0x32, 0xD7, 0xF0, 0xEC, 0x53, 0xF6, 0x0B, 0x1E, 0x08, 
+	0x27, 0x37, 0x69, 0xC5, 0x9F, 0x6C, 0x76, 0x27, 0x4C, 0x7A, 0x7C, 0xB7, 0xC8, 0x1B, 0xC4, 0x79, 
+	0xA1, 0xE3, 0xE0, 0xF3, 0x3B, 0x20, 0x07, 0x0C, 0xE4, 0xAB, 0x10, 0x6F, 0xA4, 0xFA, 0x7F, 0x08, 
+	0x6F, 0x5C, 0xAE, 0x06, 0xC5, 0x6D, 0x09, 0x1E, 0x2D, 0xDD, 0x80, 0xA7, 0x7B, 0x9E, 0xE6, 0x44, 
+	0x79, 0x3D, 0x55, 0x12, 0x51, 0x87, 0x4D, 0x4A, 0x66, 0x32, 0x2D, 0x4E, 0x17, 0x30, 0xAF, 0x77, 
+	0x7A, 0x8B, 0x44, 0x8D, 0xA4, 0xF8, 0x70, 0xC1, 0x99, 0x55, 0x3D, 0x4B, 0x08, 0x40, 0x2F, 0xA2, 
+	0xEA, 0xAA, 0x94, 0x24, 0xC3, 0xBD, 0x5C, 0x68, 0x35, 0x8D, 0x71, 0xA8, 0x3E, 0xBA, 0x00, 0x70, 
+	0x28, 0xB8, 0x10, 0x20, 0x8F, 0x5C, 0xE4, 0xC4, 0xBB, 0x22, 0x59, 0xA2, 0x35, 0x5F, 0x7A, 0x3D, 
+	0xF1, 0x24, 0x70, 0x1C, 0xE3, 0x3E, 0xED, 0x26, 0x07, 0xD7, 0x82, 0x4B, 0x80, 0x3B, 0x0C, 0xE4, 
+	0xAB, 0xCF, 0x71, 0x97, 0x87, 0x22, 0x2B, 0x53, 0x27, 0x99, 0x29, 0x10, 0x41, 0x30, 0xE8, 0x28, 
+	0xD2, 0x48, 0xAC, 0x25, 0x40, 0xBF, 0xDB, 0xED, 0x3A, 0xF4, 0x5D, 0x6E, 0x66, 0x1A, 0x08, 0xFF, 
+	0xEE, 0x49, 0x36, 0xD7, 0x68, 0x1E, 0xD7, 0xAB, 0xEC, 0xD6, 0x84, 0x1C, 0x8D, 0x35, 0x2D, 0x10, 
+	0x3C, 0x9C, 0x77, 0x12, 0xB3, 0x09, 0x5F, 0x0B, 0x2A, 0xB3, 0xCF, 0x8E, 0xE0, 0xF1, 0xAA, 0x71, 
+	0xB1, 0xE3, 0x58, 0x5C, 0xFF, 0xD1, 0x34, 0xE0, 0xBF, 0x20, 0x6D, 0x42, 0x86, 0xCA, 0x97, 0x1B, 
+	0x76, 0x2F, 0x08, 0x29, 0xEC, 0xD5, 0xDD, 0x04, 0x36, 0xFC, 0xCA, 0x39, 0xBE, 0x28, 0x8C, 0x1F, 
+	0x0D, 0x56, 0x77, 0xB7, 0xE0, 0x23, 0x41, 0x1E, 0xB4, 0x29, 0x17, 0x7A, 0xAF, 0xF9, 0x30, 0xCF, 
+	0xF1, 0xFE, 0xF4, 0x62, 0x32, 0xD9, 0xDB, 0x56, 0x9A, 0x2B, 0x31, 0xBF, 0xA5, 0x15, 0x19, 0x1E, 
+	0xEA, 0xCB, 0x5D, 0x6B, 0x65, 0x9A, 0x06, 0x1F, 0x9C, 0x0E, 0xC0, 0x5D, 0x8C, 0xFB, 0xD5, 0xCF, 
+	0xA4, 0x18, 0xA1, 0x0C, 0xAD, 0xD3, 0x98, 0x09, 0x3A, 0x86, 0x7F, 0x1C, 0x60, 0xC9, 0xFB, 0x42, 
+	0xF2, 0x37, 0x4E, 0xF0, 0x91, 0x02, 0x33, 0x41, 0xDE, 0xDB, 0xF8, 0x8E, 0x44, 0x00, 0xC5, 0x94, 
+	0x21, 0x39, 0x91, 0x0A, 0xB5, 0xC4, 0x44, 0xAC, 0x04, 0xF8, 0xB7, 0xA1, 0x13, 0x70, 0xA7, 0xEF, 
+	0x23, 0xBD, 0xF6, 0x12, 0x34, 0x30, 0x3A, 0x70, 0x81, 0x21, 0xE7, 0x66, 0xB8, 0x55, 0x00, 0xAF, 
+	0xC1, 0xC3, 0x56, 0x3D, 0xAB, 0x3D, 0xCA, 0x16, 0x4F, 0x6B, 0x3E, 0x69, 0xEF, 0xF8, 0xCA, 0x7B, 
+	0x65, 0x1C, 0xF3, 0xD9, 0xE8, 0xB0, 0xF6, 0xF3, 0x18, 0x9E, 0xDF, 0x45, 0xC7, 0xAF, 0xCE, 0xC8, 
+	0x5E, 0x51, 0x94, 0x76, 0x23, 0x80, 0xF8, 0x49, 0x9B, 0xB9, 0x7C, 0x2F, 0x3C, 0xE6, 0xB5, 0x2F, 
+	0xAD, 0xCC, 0xE7, 0xE7, 0x1E, 0x08, 0xBF, 0xFA, 0x70, 0x2C, 0xB3, 0xED, 0x0C, 0x29, 0x7D, 0xB0, 
+	0xBE, 0xE7, 0x91, 0x39, 0x73, 0xC2, 0x80, 0x77, 0x2F, 0x91, 0x1D, 0x2F, 0x45, 0x1E, 0x41, 0xE4, 
+	0x45, 0x2A, 0x7E, 0x93, 0xCE, 0x6D, 0x65, 0x18, 0x76, 0x61, 0x15, 0x05, 0x24, 0x0E, 0x65, 0xD6, 
+	0x19, 0x7A, 0xFF, 0x02, 0x94, 0xFB, 0x2D, 0x14, 0xE4, 0xA3, 0x9C, 0xFC, 0x48, 0x29, 0x3A, 0x7F, 
+	0x36, 0x4F, 0x18, 0xD5, 0x5B, 0x99, 0x4C, 0x97, 0x20, 0x36, 0x77, 0xA6, 0x75, 0xE3, 0x44, 0x92, 
+	0x47, 0x72, 0xEA, 0x1D, 0x00, 0x5A, 0x1D, 0xAF, 0x12, 0xAC, 0x26, 0xE9, 0x1E, 0x4C, 0x89, 0xCC, 
+	0x56, 0x01, 0x22, 0x4D, 0x45, 0x44, 0xAC, 0xB6, 0x75, 0xEF, 0x3F, 0x2B, 0x35, 0xC6, 0x06, 0x12, 
+	0xF6, 0xDB, 0xF1, 0x55, 0xF7, 0x05, 0xB0, 0xC0, 0x16, 0x13, 0x60, 0xAA, 0x01, 0x68, 0x1A, 0xCF, 
+	0xA3, 0xDE, 0xC2, 0xED, 0x60, 0xB9, 0x38, 0x0A, 0x78, 0x7C, 0x5A, 0x96, 0x70, 0x3E, 0x1E, 0xDC, 
+	0xCD, 0x80, 0xDE, 0x5B, 0x63, 0x94, 0x01, 0x9D, 0x68, 0x02, 0xB9, 0x64, 0xBC, 0x89, 0xCA, 0xB4, 
+	0x12, 0xD7, 0x5E, 0x20, 0xC7, 0xBD, 0x39, 0x21, 0xAD, 0x74, 0x3A, 0x04, 0x8F, 0x5F, 0xE2, 0x55, 
+	0xE2, 0xA4, 0x8F, 0xE0, 0xFB, 0x9D, 0xBD, 0x67, 0xCF, 0xD8, 0x93, 0x6C, 0x84, 0xE7, 0xB6, 0xCE, 
+	0xBD, 0x7B, 0xDA, 0x93, 0x18, 0x70, 0x6B, 0x48, 0xBA, 0x0E, 0x66, 0x09, 0x2E, 0x91, 0x55, 0x38, 
+	0x84, 0x02, 0x18, 0x1D, 0x49, 0xDE, 0x25, 0xB3, 0x7E, 0xE8, 0xD0, 0x6E, 0xDD, 0x13, 0x8F, 0xA4, 
+	0x95, 0x17, 0x01, 0x0D, 0x93, 0xB0, 0xD8, 0xBD, 0x0C, 0xCA, 0x48, 0x62, 0xFA, 0xF5, 0xEA, 0xC5, 
+	0x71, 0x21, 0x00, 0xEC, 0x3A, 0x88, 0x26, 0xA1, 0x52, 0xBA, 0xBF, 0x2A, 0x70, 0xEB, 0xF7, 0x2B, 
+	0x43, 0xF4, 0xF6, 0xE3, 0xD0, 0x63, 0x1A, 0xA1, 0x0C, 0x00, 0xFE, 0xF9, 0x12, 0xE1, 0xED, 0x2A, 
+	0xFD, 0x19, 0x4E, 0x51, 0x22, 0xA0, 0x4C, 0x09, 0x2F, 0x0B, 0x8A, 0x57, 0xFA, 0x3E, 0xF3, 0x02, 
+	0xE3, 0xF0, 0x8F, 0x17, 0x6E, 0xC1, 0x45, 0x34, 0x95, 0x61, 0x22, 0x9E, 0x72, 0xA9, 0x50, 0x77, 
+	0x07, 0x64, 0xEE, 0x52, 0x03, 0x10, 0xBA, 0x09, 0xF9, 0x45, 0x29, 0x58, 0x46, 0x24, 0xE7, 0x0F, 
+	0x21, 0xE0, 0xC8, 0xC8, 0x69, 0xCB, 0x4C, 0xD8, 0x39, 0x0E, 0x0C, 0x24, 0x68, 0x46, 0x1E, 0xD9, 
+	0x7A, 0x8C, 0xB2, 0x91, 0xF4, 0x1B, 0x96, 0xDE, 0x63, 0xFF, 0xE7, 0xCB, 0x86, 0x9F, 0xCD, 0xFB, 
+	0xBF, 0x67, 0xBE, 0x46, 0xF7, 0x0E, 0x1F, 0x1D, 0x77, 0x4F, 0x66, 0x4F, 0x4F, 0x09, 0x4E, 0x79, 
+	0x33, 0x80, 0x66, 0xA5, 0xD0, 0x47, 0xAD, 0x50, 0x3D, 0x45, 0xE5, 0x15, 0xCB, 0x05, 0xA9, 0xC8, 
+	0xFB, 0x0F, 0x00, 0xB6, 0x9F, 0xF7, 0xC2, 0x1B, 0x15, 0x2B, 0xD1, 0x01, 0xA2, 0x5A, 0xFB, 0x26, 
+	0x3D, 0x9E, 0xAC, 0x37, 0x2C, 0x0B, 0x3A, 0xD3, 0xE8, 0x99, 0xAF, 0xB0, 0x12, 0x17, 0x06, 0x0C, 
+	0x7B, 0xF1, 0x6D, 0xB5, 0x8D, 0x18, 0xE4, 0x32, 0x3F, 0x51, 0xC2, 0x20, 0x20, 0xC6, 0x47, 0x22, 
+	0x08, 0x94, 0x32, 0x99, 0x17, 0x4A, 0x50, 0x36, 0x1E, 0xA2, 0x88, 0xCE, 0x01, 0xAF, 0x78, 0xF5, 
+	0x6B, 0xF2, 0xA2, 0x0C, 0x8E, 0xC5, 0xE4, 0x31, 0x9C, 0x28, 0xA4, 0x7F, 0x4E, 0x64, 0x1D, 0xF5, 
+	0xC1, 0x1A, 0x68, 0xE2, 0xF4, 0x3A, 0x99, 0xBC, 0xD3, 0x31, 0xF9, 0xD8, 0x58, 0x7B, 0xB1, 0xB7, 
+	0x7D, 0x57, 0x2B, 0x7D, 0xAC, 0x4A, 0x43, 0x9E, 0xB2, 0x50, 0x96, 0x06, 0x99, 0x17, 0x89, 0x6A, 
+	0xA7, 0x2E, 0xC2, 0xB9, 0xA2, 0xBB, 0x96, 0xD4, 0x03, 0xD5, 0xF2, 0xB4, 0xA7, 0x78, 0xE6, 0x65, 
+	0x31, 0xD2, 0x43, 0x75, 0x4A, 0xD1, 0xB5, 0xE6, 0x07, 0x98, 0x27, 0xAA, 0xBD, 0xCD, 0x32, 0xF1, 
+	0x80, 0xCE, 0x9E, 0xCD, 0xF2, 0xA1, 0x50, 0xD0, 0x88, 0x02, 0xF0, 0x1C, 0x10, 0x70, 0xAA, 0xA5, 
+	0xDF, 0x70, 0x32, 0x7E, 0x89, 0xAE, 0x51, 0x37, 0x84, 0x13, 0x18, 0xCE, 0x7D, 0x4C, 0x8A, 0x16, 
+	0x99, 0xA2, 0x42, 0x9D, 0x5D, 0x9C, 0x81, 0x86, 0x4D, 0x15, 0x96, 0xF0, 0xE6, 0xE1, 0x38, 0x11, 
+	0xA6, 0x8A, 0x15, 0x14, 0xF7, 0x13, 0xAD, 0x33, 0x81, 0xB5, 0xF4, 0x65, 0x87, 0x87, 0x6F, 0x97, 
+	0x2F, 0x5D, 0xED, 0xEC, 0xA7, 0xB6, 0x91, 0xE2, 0xF3, 0x7B, 0xE5, 0xC8, 0x7E, 0x3A, 0x26, 0x54, 
+	0x9C, 0xC3, 0xD3, 0x6C, 0x4B, 0x6A, 0x78, 0x48, 0xF3, 0x0E, 0xCF, 0xBF, 0x9A, 0xC8, 0x60, 0x46, 
+	0x0B, 0x6C, 0x92, 0x6B, 0x88, 0x6F, 0x42, 0x39, 0xB0, 0xC2, 0x43, 0x8D, 0xA6, 0x4A, 0xF8, 0xF5, 
+	0x1E, 0x23, 0x74, 0xF7, 0x15, 0xB2, 0x15, 0xEB, 0x5A, 0x2A, 0xCA, 0xA5, 0x2C, 0xCC, 0x3C, 0x7D, 
+	0x63, 0x65, 0x7F, 0x3A, 0xA8, 0x35, 0xB0, 0x77, 0x54, 0x1A, 0xCB, 0xA5, 0x07, 0x1E, 0x2C, 0x60, 
+	0x3C, 0x66, 0x32, 0x55, 0x75, 0xEB, 0x57, 0x35, 0xE2, 0xD3, 0xC2, 0x73, 0x5D, 0xF7, 0xC2, 0xB6, 
+	0xEE, 0x45, 0x1C, 0x19, 0xE6, 0xF9, 0x23, 0x24, 0x23, 0xBA, 0x77, 0x6B, 0x93, 0x73, 0xA0, 0x9C, 
+	0xF9, 0xF0, 0x59, 0xE7, 0xB4, 0x60, 0xC3, 0xA6, 0x01, 0xEA, 0xC7, 0x52, 0x2B, 0xDC, 0xDC, 0x96, 
+	0x0F, 0x3C, 0xB0, 0x19, 0x19, 0xE1, 0x52, 0xB6, 0x17, 0x91, 0x2A, 0x4D, 0xC3, 0xFC, 0x44, 0x33, 
+	0x5F, 0x9D, 0x36, 0x51, 0x3C, 0x02, 0x6D, 0x68, 0x23, 0x64, 0x1B, 0xA0, 0xA3, 0xD7, 0xEA, 0x64, 
+	0x60, 0xB9, 0xEB, 0xC5, 0x3F, 0xB5, 0x52, 0xC8, 0xC4, 0xC8, 0x73, 0x36, 0x73, 0x28, 0x67, 0xF1, 
+	0x2A, 0x3C, 0xA6, 0x8A, 0xDB, 0x99, 0x81, 0x90, 0xDF, 0xD7, 0x4C, 0x1F, 0xD1, 0xD9, 0x0D, 0xCE, 
+	0x6C, 0xD8, 0x8A, 0x03, 0xB4, 0x70, 0x3A, 0x07, 0x2E, 0x2E, 0x5E, 0xA5, 0x5C, 0xBF, 0x51, 0x36, 
+	0x97, 0x42, 0xA5, 0x76, 0x2A, 0xCA, 0x0A, 0x51, 0x5D, 0x06, 0x78, 0x0E, 0xCF, 0x9E, 0x93, 0x59, 
+	0x5C, 0x17, 0x05, 0xB6, 0xF2, 0x0D, 0x02, 0xD6, 0x2D, 0x2E, 0x20, 0x62, 0x8D, 0xF7, 0x38, 0xE0, 
+	0xC1, 0x5E, 0x17, 0x72, 0x4D, 0xA4, 0x2F, 0x5B, 0xDC, 0xC6, 0x40, 0x82, 0x34, 0x04, 0x39, 0x69, 
+	0xF8, 0xBC, 0xB1, 0x79, 0x54, 0xD5, 0x1E, 0x2D, 0xD8, 0x8C, 0x90, 0x8D, 0xB4, 0xE3, 0x61, 0xB7, 
+	0x1D, 0xA2, 0x3C, 0xFB, 0x6A, 0x38, 0x98, 0x06, 0xDA, 0x56, 0x2C, 0xBF, 0x9B, 0x14, 0x76, 0xE6, 
+	0x3C, 0x01, 0x57, 0xCC, 0xC2, 0x08, 0x0C, 0xBC, 0x10, 0x09, 0x67, 0xAB, 0x01, 0x2A, 0x32, 0x6C, 
+	0x81, 0x2C, 0xAB, 0xD3, 0xEC, 0x7D, 0x87, 0x48, 0x16, 0x28, 0xAC, 0x1D, 0x61, 0x11, 0x31, 0x87, 
+	0xD6, 0x2B, 0xB0, 0x36, 0xB1, 0x18, 0xDD, 0xE7, 0xD0, 0x46, 0x57, 0x93, 0xFC, 0xDF, 0xD2, 0x3A, 
+	0x37, 0x49, 0x42, 0xDB, 0xE6, 0x45, 0x46, 0x22, 0xB0, 0xF2, 0x92, 0xEE, 0x52, 0x94, 0x9F, 0xFE, 
+	0xB1, 0xD2, 0x33, 0x45, 0xAD, 0xC9, 0x6D, 0x11, 0x79, 0x57, 0xF1, 0x80, 0xF4, 0x07, 0xAE, 0xDF, 
+	0x11, 0x6C, 0x85, 0x58, 0x49, 0x2F, 0x13, 0x81, 0xB9, 0x66, 0x73, 0xAB, 0x84, 0x94, 0x36, 0xC4, 
+	0xC6, 0x23, 0x5F, 0xC5, 0x36, 0xC6, 0xBE, 0x8E, 0x6B, 0xE9, 0x97, 0xF0, 0xAC, 0xB4, 0xF1, 0x11, 
+	0x43, 0xB4, 0xD2, 0xC0, 0x79, 0x5E, 0x88, 0x72, 0xC7, 0x46, 0x6B, 0x22, 0xC7, 0xF2, 0x7B, 0x61, 
+	0xC8, 0xFA, 0x39, 0x65, 0x45, 0x97, 0xF0, 0xC7, 0xCE, 0x74, 0x09, 0x9F, 0x5D, 0xB7, 0x68, 0xF2, 
+	0x2E, 0x6E, 0x2D, 0x42, 0x56, 0x9C, 0xED, 0xC5, 0x5A, 0x57, 0xD9, 0x53, 0x5A, 0xB4, 0xE8, 0x15, 
+	0x07, 0x1B, 0xFB, 0x31, 0x40, 0x14, 0x95, 0x77, 0x33, 0x74, 0x71, 0x73, 0x7B, 0xFA, 0xA7, 0xBF, 
+	0x51, 0xF8, 0x3D, 0xE6, 0xB1, 0xD0, 0x42, 0x25, 0x52, 0xFC, 0x4F, 0x1A, 0xA6, 0x4D, 0xAF, 0xCD, 
+	0x13, 0x62, 0x7A, 0xBF, 0x22, 0x98, 0xD6, 0x07, 0x9C, 0xAE, 0x5E, 0xFC, 0x96, 0xEC, 0x0E, 0x79, 
+	0x84, 0x1F, 0x73, 0x60, 0x6C, 0x02, 0x6C, 0xE5, 0xB7, 0xFD, 0x7A, 0x4B, 0x8D, 0x0D, 0xC0, 0xD7, 
+	0x0A, 0x70, 0x6E, 0xE1, 0x51, 0x0E, 0x8C, 0xAA, 0x02, 0x6A, 0xCF, 0x61, 0x04, 0xBD, 0x53, 0x9D, 
+	0xE0, 0xB5, 0x28, 0x1E, 0x24, 0xBA, 0x97, 0x13, 0x0C, 0x6E, 0x93, 0x71, 0xE2, 0x68, 0xEC, 0x73, 
+	0x2C, 0xEC, 0x80, 0xB2, 0x16, 0xD5, 0x38, 0xC6, 0x3B, 0xCE, 0xEB, 0xB9, 0x42, 0xBE, 0x37, 0xB5, 
+	0x39, 0x31, 0x00, 0x5F, 0xB6, 0xD1, 0xB6, 0xD9, 0x57, 0x34, 0x82, 0x12, 0x07, 0x05, 0x04, 0x4B, 
+	0x5E, 0xB8, 0xC7, 0x6F, 0xA3, 0x01, 0xB9, 0x1D, 0xFF, 0x5F, 0x52, 0xBF, 0x6E, 0x7B, 0xA8, 0xC3, 
+	0x6E, 0xAC, 0x00, 0xCD, 0x0A, 0xAB, 0x7D, 0x4E, 0x63, 0x43, 0xCE, 0x10, 0x21, 0x38, 0x42, 0x88, 
+	0x8D, 0xA7, 0x46, 0x7F, 0x74, 0x1F, 0x1D, 0x5F, 0x25, 0xD2, 0xC0, 0x18, 0x7D, 0x40, 0x61, 0x36, 
+	0x06, 0xB5, 0x09, 0xCA, 0xC6, 0xAD, 0xD6, 0x9E, 0xED, 0x45, 0xF6, 0x95, 0x32, 0x07, 0x84, 0x71, 
+	0xC8, 0x35, 0xB0, 0x81, 0x97, 0xC9, 0x60, 0xDE, 0xFD, 0x8E, 0x90, 0x67, 0xD7, 0x23, 0x51, 0x28, 
+	0x90, 0xA5, 0x6E, 0xB6, 0x59, 0x88, 0xD1, 0x8D, 0xCD, 0x17, 0xA3, 0x48, 0xE3, 0x3F, 0x00, 0x4E, 
+	0x9B, 0x21, 0xD5, 0xA4, 0x5A, 0xF0, 0xA0, 0xBA, 0x40, 0xB7, 0xBB, 0xE1, 0x3D, 0x16, 0x9E, 0xEE, 
+	0xBB, 0x9E, 0xB2, 0x91, 0xBD, 0x39, 0x77, 0xD6, 0xB5, 0x9C, 0xB5, 0xE8, 0xCF, 0x7D, 0x8C, 0x83, 
+	0x82, 0x1A, 0xBA, 0x11, 0xDA, 0xF3, 0x96, 0xDD, 0x09, 0x20, 0x9F, 0xEB, 0xAE, 0x39, 0xAC, 0x7C, 
+	0xF2, 0x41, 0x98, 0x21, 0x6B, 0x8D, 0x19, 0xFF, 0x36, 0x5E, 0x82, 0xAC, 0xEE, 0x1E, 0x0E, 0x77, 
+	0x63, 0x14, 0x4E, 0x87, 0xE8, 0x22, 0x01, 0xD4, 0xC4, 0xF3, 0xE6, 0x49, 0xE6, 0x25, 0x64, 0x5C, 
+	0x54, 0x4B, 0x10, 0xE7, 0xCD, 0x17, 0x8F, 0xFA, 0xA3, 0x4D, 0xCA, 0x49, 0xCA, 0x4D, 0x33, 0xBC, 
+	0x29, 0x71, 0x4D, 0xF9, 0x0D, 0x74, 0x01, 0xAC, 0x79, 0xA7, 0xD7, 0x75, 0xD3, 0x9B, 0x04, 0xEE, 
+	0xCB, 0xCD, 0x51, 0xCC, 0xAA, 0x68, 0xFB, 0x41, 0xD3, 0x2D, 0xC1, 0xC8, 0x72, 0xDC, 0x69, 0xBE, 
+	0x0A, 0x74, 0xFF, 0xA8, 0x0C, 0xB4, 0xE1, 0x1A, 0xD3, 0x30, 0x21, 0xA9, 0x34, 0xCC, 0xB5, 0xE9, 
+	0xCF, 0x38, 0x48, 0x3B, 0xFC, 0xD6, 0x88, 0xD8, 0xB7, 0x3D, 0x71, 0xE4, 0x36, 0xA2, 0xE6, 0x03, 
+	0x02, 0xE3, 0xFB, 0x68, 0x0F, 0x07, 0x3B, 0x80, 0x30, 0x1C, 0xF4, 0x88, 0x0D, 0x86, 0x1F, 0x83, 
+	0x4D, 0x93, 0xD4, 0x10, 0xB1, 0xFF, 0x2C, 0xCB, 0xBE, 0x8E, 0xA8, 0xDB, 0x09, 0xE5, 0xF7, 0x9C, 
+	0x82, 0x48, 0xE0, 0xC8, 0x2C, 0x7B, 0xA1, 0x46, 0x89, 0xE9, 0x0D, 0x82, 0x6F, 0xC1, 0xEA, 0xA5, 
+	0x84, 0x82, 0x33, 0x26, 0x4A, 0xB6, 0x84, 0x60, 0x21, 0x00, 0x89, 0x20, 0x84, 0x14, 0x7A, 0xDF, 
+	0x7B, 0xEB, 0x45, 0x6B, 0x76, 0xE6, 0xDB, 0x53, 0xBE, 0x6A, 0x95, 0xE1, 0xFE, 0x6A, 0x79, 0x07, 
+	0xBC, 0x9D, 0xB3, 0x37, 0x67, 0xAF, 0xC2, 0x1E, 0x2B, 0xFF, 0x9F, 0xC5, 0xF5, 0x54, 0xE0, 0x29, 
+	0x44, 0xA4, 0x2A, 0x6F, 0xB7, 0x52, 0x17, 0x2C, 0xB1, 0x72, 0x6E, 0x9F, 0x30, 0x9D, 0x42, 0x41, 
+	0xF6, 0xD5, 0x14, 0x3E, 0x32, 0x59, 0x42, 0xAD, 0x7A, 0x68, 0x53, 0xF9, 0x99, 0xFD, 0x30, 0xC0, 
+	0x68, 0xB6, 0x97, 0xD9, 0x1B, 0x9A, 0xF6, 0xB9, 0x06, 0xE2, 0x2E, 0x27, 0x60, 0xE9, 0x1A, 0xBD, 
+	0x88, 0xCD, 0xAD, 0xE0, 0xCB, 0xED, 0x76, 0x2B, 0x46, 0x24, 0xB0, 0x48, 0xBA, 0x55, 0x9B, 0xBD, 
+	0x6D, 0xF2, 0xF7, 0x8C, 0x59, 0x4E, 0xB6, 0xE4, 0x89, 0xE1, 0xD4, 0x97, 0x85, 0x15, 0x27, 0xAE, 
+	0xD0, 0x9A, 0x72, 0x98, 0xB0, 0x6F, 0x06, 0xB9, 0xFC, 0xFD, 0x0D, 0x51, 0x11, 0x7E, 0x02, 0x66, 
+	0xD2, 0xE7, 0x25, 0xD4, 0x4D, 0xAE, 0x78, 0x9F, 0x8E, 0x69, 0xDD, 0x43, 0x80, 0x2F, 0xE6, 0x6E, 
+	0x46, 0xD7, 0x1A, 0x05, 0x8F, 0x4B, 0x5E, 0xF7, 0x4E, 0x09, 0x9B, 0xAF, 0x4E, 0x2B, 0x14, 0x91, 
+	0x59, 0x67, 0xFF, 0xFF, 0xAA, 0x08, 0xE7, 0x25, 0x42, 0x4E, 0x17, 0xD6, 0xDF, 0xD8, 0x23, 0x45, 
+	0xB4, 0xE2, 0x15, 0xE8, 0xDB, 0xA8, 0x55, 0x81, 0x9B, 0xE3, 0x3F, 0x09, 0x0C, 0x16, 0x19, 0xE6, 
+	0xE3, 0x7F, 0x1D, 0xB6, 0xBB, 0x14, 0x3C, 0x58, 0xBB, 0x69, 0x5F, 0x7A, 0x1A, 0x51, 0x45, 0xEE, 
+	0xDB, 0xA5, 0x7F, 0x53, 0x27, 0x04, 0xA0, 0x60, 0x76, 0x7A, 0xAD, 0x29, 0x7A, 0x8B, 0x49, 0x4C, 
+	0x6D, 0x26, 0x01, 0x45, 0x9B, 0x2F, 0xC8, 0x6B, 0xE0, 0x11, 0x1E, 0xCE, 0x35, 0x18, 0xDA, 0x6A, 
+	0x7E, 0x14, 0x56, 0xFB, 0x19, 0xE2, 0xBC, 0xAF, 0xE9, 0x62, 0xF9, 0xD4, 0xB7, 0x21, 0x1D, 0x45, 
+	0x10, 0xB7, 0xF3, 0x10, 0x80, 0xD0, 0xA9, 0x20, 0x12, 0xFB, 0xFA, 0xB9, 0xF6, 0x9B, 0x32, 0xA9, 
+	0x68, 0x58, 0xD9, 0x97, 0xDD, 0x4D, 0xDB, 0x67, 0x95, 0x35, 0xFE, 0xFA, 0x9A, 0xB2, 0x8D, 0x39, 
+	0x32, 0xD0, 0x5F, 0x6E, 0x74, 0x62, 0x3F, 0xC0, 0xC9, 0x24, 0x49, 0xC9, 0x65, 0x27, 0x88, 0x52, 
+	0x60, 0xBB, 0x6B, 0x52, 0xAC, 0x35, 0x90, 0x47, 0xF8, 0x34, 0xF4, 0x8E, 0x9E, 0x43, 0xE6, 0x28, 
+	0xA5, 0x04, 0xA9, 0x10, 0x09, 0x4F, 0xE0, 0x2E, 0x3E, 0x12, 0xD9, 0xC3, 0xC3, 0xF0, 0xAB, 0x30, 
+	0x18, 0x13, 0x6C, 0x17, 0x06, 0x2C, 0x03, 0x60, 0x04, 0x5D, 0x0E, 0xC8, 0x7F, 0x80, 0x4B, 0xAD, 
+	0xAF, 0x34, 0x2B, 0xDC, 0x94, 0x1F, 0x68, 0x0A, 0xAB, 0xA3, 0xD7, 0x19, 0x23, 0x02, 0x8F, 0xBD, 
+	0xB9, 0x33, 0xD3, 0x93, 0x66, 0xC9, 0x19, 0x18, 0xEF, 0x08, 0x0C, 0xEE, 0xDB, 0xB3, 0x5E, 0x55, 
+	0xB2, 0xDC, 0xBB, 0x90, 0x02, 0x2B, 0x90, 0x67, 0x41, 0x3E, 0x65, 0xA0, 0x9B, 0xC4, 0x5D, 0x81, 
+	0xDC, 0x64, 0x82, 0xA9, 0x86, 0xA7, 0xB1, 0x1C, 0x6C, 0x7B, 0xA2, 0x07, 0xF1, 0xE0, 0x8E, 0x4F, 
+	0xBF, 0x07, 0x20, 0x48, 0x05, 0xE5, 0x1D, 0xB6, 0xD8, 0x83, 0x45, 0x7C, 0xAD, 0x84, 0x32, 0x94, 
+	0xCA, 0x88, 0x96, 0xAA, 0x07, 0xE8, 0x7B, 0x0A, 0x89, 0x46, 0x98, 0x2F, 0x93, 0x65, 0xEB, 0x7B, 
+	0x79, 0x50, 0x8C, 0x8D, 0x01, 0x6D, 0xCE, 0xB4, 0x5E, 0x1E, 0x74, 0x6D, 0xC3, 0x29, 0x0B, 0x34, 
+	0xB6, 0xB8, 0xE7, 0x9C, 0x2D, 0x71, 0x49, 0x65, 0x07, 0x1A, 0x7D, 0x04, 0x74, 0x42, 0xD7, 0x0D, 
+	0x96, 0x80, 0x85, 0xFC, 0x5D, 0x29, 0x79, 0x54, 0x8F, 0x08, 0x2A, 0x7F, 0xF2, 0xB8, 0x87, 0x13, 
+	0x29, 0x6E, 0xC4, 0xB7, 0x99, 0xBB, 0xC5, 0x6C, 0x4D, 0x01, 0x38, 0xB5, 0xFF, 0x93, 0xEC, 0x0F, 
+	0x96, 0xA5, 0x47, 0x78, 0xD1, 0xC0, 0x63, 0x61, 0xE0, 0x2D, 0xE4, 0x56, 0x7C, 0xAC, 0x77, 0x30, 
+	0x21, 0x55, 0x32, 0xFD, 0x4E, 0xC0, 0x31, 0x9B, 0x7C, 0x37, 0x04, 0x8B, 0xAB, 0x95, 0x03, 0xAC, 
+	0x22, 0x9E, 0x1F, 0x86, 0x2A, 0xB5, 0xD9, 0x32, 0x56, 0xCC, 0x4E, 0xE5, 0x1A, 0x70, 0x65, 0x5B, 
+	0x32, 0xC7, 0x1D, 0x96, 0x73, 0x62, 0x49, 0xB3, 0xC5, 0xA1, 0x83, 0xEB, 0x32, 0x6B, 0x6E, 0x17, 
+	0xC2, 0xD2, 0xBA, 0x90, 0x3B, 0xB5, 0x99, 0x18, 0x34, 0x4D, 0x15, 0x57, 0x19, 0xCD, 0x3C, 0xE1, 
+	0xCF, 0x55, 0x4A, 0x44, 0xD0, 0xFD, 0xD1, 0x29, 0xB5, 0x86, 0xA1, 0xAA, 0xB0, 0x6C, 0x30, 0xEE, 
+	0x14, 0xC2, 0x9E, 0x02, 0x31, 0xDF, 0x13, 0x0D, 0xC6, 0xFA, 0x9F, 0xC1, 0x17, 0xF1, 0x52, 0x08, 
+	0x8B, 0xBB, 0x81, 0xB8, 0x92, 0x7B, 0x19, 0x0F, 0x5E, 0x7A, 0xDF, 0xEB, 0x86, 0x8C, 0x5F, 0x6C, 
+	0x7A, 0xE9, 0xF1, 0x26, 0x55, 0x80, 0xFF, 0xBC, 0x6A, 0x0A, 0xBC, 0x23, 0xAB, 0xE8, 0x8E, 0xC3, 
+	0xA5, 0xD7, 0xFD, 0x52, 0x73, 0x68, 0x4B, 0x56, 0x7F, 0x60, 0x4A, 0x68, 0x84, 0x30, 0xE1, 0x1F, 
+	0x0C, 0x10, 0x41, 0x71, 0xFC, 0x10, 0xDF, 0x62, 0xCC, 0x4D, 0xD6, 0x2A, 0x7F, 0xB9, 0xAF, 0x46, 
+	0x94, 0x3A, 0xD7, 0x0F, 0x12, 0x2C, 0xB8, 0x17, 0x1F, 0x56, 0xF3, 0xCD, 0xA0, 0xE7, 0xBF, 0xA4, 
+	0xFB, 0xC5, 0xE8, 0x17, 0x4B, 0x8A, 0xE5, 0x3E, 0x96, 0x22, 0x17, 0x07, 0xA3, 0x17, 0x0A, 0x77, 
+	0x98, 0xF8, 0x9B, 0x59, 0x5C, 0x2F, 0xC9, 0x73, 0xA4, 0x5A, 0x17, 0x1F, 0xBD, 0x56, 0x3E, 0xA2, 
+	0xE6, 0x8F, 0x34, 0xF2, 0xE0, 0x20, 0x37, 0xE4, 0x98, 0xE1, 0xEC, 0xC4, 0x1E, 0x81, 0x13, 0x17, 
+	0x21, 0x95, 0x88, 0x60, 0x04, 0xDA, 0x91, 0xB9, 0x22, 0xF8, 0x64, 0x87, 0x8D, 0x32, 0x60, 0x37, 
+	0x33, 0x2E, 0x2B, 0x95, 0x43, 0x0C, 0x10, 0xDF, 0xFC, 0x64, 0x56, 0x89, 0x32, 0x47, 0xA3, 0x8F, 
+	0xF1, 0x3E, 0x34, 0x63, 0x35, 0xD9, 0x41, 0xD8, 0x1A, 0x23, 0x88, 0x39, 0x6D, 0x23, 0x2A, 0x20, 
+	0xCE, 0xFB, 0x80, 0x0F, 0x59, 0xB7, 0xFB, 0x1E, 0x24, 0xF5, 0x8A, 0x78, 0x2B, 0xE8, 0x13, 0x52, 
+	0x34, 0x5B, 0x65, 0x64, 0xAB, 0x78, 0x4D, 0x5C, 0x79, 0x3B, 0xF2, 0x7D, 0x1F, 0x5B, 0xA9, 0x37, 
+	0xAE, 0x4C, 0x9E, 0x30, 0x6B, 0x39, 0x3D, 0x75, 0x06, 0xCE, 0xFE, 0x87, 0xB7, 0x1B, 0x9C, 0x9F, 
+	0x44, 0x7E, 0x98, 0xFF, 0x3B, 0xA6, 0x71, 0x48, 0xE3, 0x07, 0x8C, 0x5E, 0x95, 0x96, 0x04, 0xC1, 
+	0xBF, 0x7A, 0x18, 0x06, 0xC2, 0xD2, 0x24, 0xD6, 0xC9, 0x4D, 0x65, 0xCE, 0x18, 0x8F, 0x8B, 0x0D, 
+	0xFC, 0x66, 0x40, 0xB1, 0xE6, 0xE5, 0xC5, 0xDE, 0xAE, 0x2E, 0x84, 0x3F, 0xBA, 0x16, 0x5A, 0x63, 
+	0x72, 0x0F, 0x3C, 0x82, 0x4A, 0xD7, 0x54, 0x54, 0x60, 0x1B, 0x6A, 0x16, 0x2D, 0xDA, 0x0F, 0xF9, 
+	0x61, 0xD2, 0x53, 0x2B, 0xE4, 0x22, 0x0E, 0x1D, 0x08, 0x69, 0x5D, 0x4D, 0x4D, 0x3E, 0x99, 0xBE, 
+	0x8A, 0x83, 0xA2, 0x5A, 0x68, 0x8B, 0xBB, 0x6A, 0xA5, 0x31, 0xB9, 0x65, 0xA6, 0x55, 0xD1, 0x09, 
+	0x8D, 0x6B, 0xAB, 0xD8, 0xF1, 0x06, 0x62, 0xA8, 0x1A, 0xDA, 0xA4, 0x4B, 0x68, 0xA9, 0xB8, 0xA5, 
+	0x9D, 0xD1, 0xAA, 0x42, 0x8E, 0x67, 0xA8, 0xC6, 0x29, 0x94, 0x69, 0x38, 0xA0, 0x66, 0x84, 0xBB, 
+	0x73, 0x3B, 0xFC, 0x7D, 0x6B, 0xCD, 0x39, 0x8F, 0x1C, 0x6C, 0xE0, 0x58, 0x97, 0x75, 0xB7, 0x09, 
+	0x40, 0x68, 0x45, 0xCD, 0x97, 0x78, 0x1A, 0x81, 0xA9, 0x6D, 0x6C, 0x59, 0xB8, 0x0C, 0x7D, 0x94, 
+	0x46, 0x23, 0xCC, 0xD4, 0x2D, 0x71, 0x95, 0x7F, 0x9F, 0x08, 0xE0, 0xE5, 0xF9, 0xC0, 0x2C, 0xC4, 
+	0x09, 0x27, 0x7C, 0x62, 0x5E, 0xF4, 0xB6, 0xAA, 0x9D, 0x18, 0x10, 0xCE, 0xCB, 0xCA, 0xFC, 0xC2, 
+	0x12, 0x5A, 0xC2, 0xC7, 0xFA, 0x47, 0x3B, 0x4A, 0x5C, 0xC7, 0x52, 0xCA, 0x97, 0xD4, 0xC3, 0x90, 
+	0x1D, 0x04, 0x50, 0x92, 0xFF, 0xCC, 0xA9, 0x85, 0x4D, 0x1F, 0x73, 0xE3, 0x5B, 0x4D, 0x20, 0xCA, 
+	0x46, 0x89, 0xD5, 0x26, 0x2B, 0xF5, 0x6B, 0x2A, 0x0B, 0x9C, 0x36, 0x15, 0x9A, 0xB2, 0x15, 0xC1, 
+	0xAF, 0x38, 0x3D, 0xA5, 0x4B, 0x47, 0x56, 0x32, 0x90, 0x60, 0x93, 0x5D, 0x8C, 0xE4, 0x3D, 0x3A, 
+	0x00, 0xB2, 0x84, 0x92, 0xE7, 0x9C, 0x09, 0xD4, 0x55, 0x01, 0xFC, 0xFC, 0x3C, 0x0B, 0x6B, 0x0B, 
+	0xD4, 0x39, 0x7B, 0x88, 0x40, 0x08, 0xDE, 0x2D, 0xFC, 0x9E, 0xEF, 0xFE, 0xCA, 0x45, 0xB6, 0x8F, 
+	0xDD, 0x59, 0x49, 0x16, 0x9B, 0x26, 0x88, 0x7F, 0x83, 0xA0, 0x29, 0x14, 0xA6, 0x96, 0x51, 0x1D, 
+	0x36, 0xCF, 0x7D, 0x01, 0x2E, 0xC3, 0xC5, 0xC2, 0x49, 0xAB, 0x70, 0xAC, 0x66, 0x08, 0xA4, 0xB7, 
+	0xB5, 0x37, 0x34, 0xEB, 0xD1, 0xA1, 0x52, 0xB1, 0xF8, 0x1C, 0x88, 0x36, 0x32, 0x00, 0xA4, 0x5B, 
+	0x3B, 0x93, 0x34, 0x20, 0x5F, 0xA9, 0x9B, 0x1E, 0xA6, 0xF9, 0xFC, 0xC5, 0x34, 0x2E, 0x64, 0xCE, 
+	0x97, 0x44, 0x71, 0x0D, 0x09, 0x89, 0xF2, 0x68, 0x41, 0xF9, 0x64, 0xA0, 0xFC, 0xE2, 0x43, 0x14, 
+	0x77, 0xB1, 0x68, 0x2C, 0xE6, 0xCB, 0xD4, 0x82, 0xE0, 0xF1, 0x93, 0x00, 0x50, 0x9F, 0x14, 0x6F, 
+	0x78, 0xDC, 0x7B, 0xC2, 0xD6, 0x31, 0x29, 0x85, 0xA6, 0xEB, 0x50, 0xEC, 0xA6, 0xDD, 0xAA, 0x50, 
+	0x65, 0x94, 0xEE, 0x68, 0xC3, 0x11, 0xAA, 0xB7, 0xA7, 0xEE, 0xBB, 0x39, 0x08, 0xA6, 0xE8, 0xC5, 
+	0x4E, 0x52, 0x84, 0xDD, 0xE6, 0x16, 0xF5, 0xC3, 0xAC, 0xB0, 0xBE, 0x3F, 0xA0, 0xC9, 0x1F, 0x17, 
+	0xC0, 0x8D, 0x7C, 0x80, 0x27, 0xAE, 0xBB, 0x47, 0x32, 0x94, 0x01, 0xCB, 0x72, 0x12, 0xCB, 0x74, 
+	0x56, 0x58, 0x17, 0x30, 0x57, 0x6C, 0x94, 0x08, 0xD4, 0x60, 0x50, 0x41, 0x35, 0xAB, 0xBD, 0x0B, 
+	0xA7, 0x43, 0x1B, 0x53, 0x19, 0xBA, 0x05, 0x67, 0xAF, 0x4C, 0xAD, 0x76, 0xBA, 0x7D, 0x75, 0x8E, 
+	0x64, 0x0C, 0xDD, 0xFB, 0xD9, 0x84, 0x3F, 0xB0, 0x57, 0x4D, 0x8C, 0xA0, 0x0F, 0xD9, 0xE0, 0x53, 
+	0xB9, 0x1D, 0xAE, 0xE1, 0xCC, 0x9E, 0xD5, 0x79, 0xDA, 0xB4, 0x0C, 0x0B, 0xDD, 0x95, 0x28, 0xDD, 
+	0x7F, 0x73, 0x43, 0x83, 0xC5, 0x45, 0x14, 0x00, 0xBA, 0x00, 0x9C, 0xC0, 0xC8, 0x62, 0x34, 0x66, 
+	0xF9, 0x78, 0x57, 0x0B, 0x9F, 0x85, 0xEE, 0x49, 0xF6, 0xA9, 0x86, 0x05, 0x6B, 0x0E, 0x1F, 0x26, 
+	0xD0, 0xD9, 0xEB, 0xA8, 0x5B, 0x9B, 0xCD, 0x4E, 0x25, 0x07, 0xE1, 0xE0, 0x60, 0xA0, 0xFB, 0x17, 
+	0x7C, 0x41, 0xAA, 0x20, 0xFE, 0x83, 0x25, 0x3A, 0x9A, 0x02, 0x87, 0x0A, 0x71, 0x87, 0xE5, 0xD3, 
+	0xC1, 0xDC, 0x85, 0xC8, 0xFA, 0x71, 0x2A, 0xCF, 0xA1, 0xF7, 0x44, 0x13, 0x9C, 0x03, 0x56, 0xC3, 
+	0x7A, 0xEE, 0x51, 0x35, 0x3C, 0x27, 0x30, 0xF3, 0x3E, 0x31, 0x5F, 0x00, 0x51, 0xA7, 0x1C, 0x92, 
+	0xA4, 0xE1, 0xC3, 0x43, 0x12, 0x03, 0x3C, 0xEE, 0xD3, 0xFA, 0x1C, 0x6A, 0x0F, 0xE0, 0x45, 0xBB, 
+	0x3B, 0x81, 0xF1, 0x37, 0x46, 0x9C, 0x6E, 0x21, 0x74, 0xFA, 0x93, 0x52, 0xF4, 0x57, 0x95, 0x81, 
+	0xD3, 0x57, 0x44, 0x5E, 0xF0, 0x54, 0x18, 0x3C, 0xFB, 0x3A, 0xE7, 0x10, 0x67, 0xF2, 0x20, 0x24, 
+	0x09, 0xD2, 0x6D, 0xAB, 0xC2, 0xBA, 0x3C, 0x30, 0xE9, 0x65, 0xF1, 0x50, 0xFB, 0x11, 0xB6, 0xCF, 
+	0x85, 0x7B, 0x6A, 0x4A, 0x56, 0x59, 0x59, 0xB7, 0xDE, 0xFB, 0xC8, 0x39, 0x6A, 0x52, 0x6D, 0xE6, 
+	0xB7, 0xC7, 0x7A, 0x62, 0x01, 0x25, 0x3D, 0x54, 0x54, 0xB4, 0xF2, 0xBA, 0xF9, 0xEE, 0xE3, 0x59, 
+	0xD0, 0x74, 0xB5, 0xBF, 0xDF, 0x3E, 0x3F, 0x87, 0x64, 0x82, 0xD9, 0xD5, 0xF9, 0xE8, 0xBB, 0xC5, 
+	0xA5, 0x61, 0x91, 0x9C, 0x2C, 0x99, 0xC0, 0x39, 0xB3, 0xEF, 0x33, 0x5E, 0x3E, 0x1E, 0x00, 0xC6, 
+	0x5A, 0x90, 0x1C, 0x50, 0x43, 0x3D, 0x4B, 0xA1, 0x3F, 0x46, 0xEB, 0xBA, 0x86, 0xA4, 0xEA, 0xE1, 
+	0xA9, 0x40, 0x97, 0x5A, 0x80, 0x97, 0x36, 0x1C, 0xA8, 0x19, 0x4E, 0x0D, 0xF8, 0xCB, 0x1C, 0xC7, 
+	0xD4, 0x1C, 0xB1, 0x4C, 0x2E, 0xDB, 0x2D, 0x96, 0x1E, 0xBA, 0xEB, 0x3D, 0xDE, 0x7D, 0xC7, 0x2E, 
+	0xF8, 0x36, 0x54, 0x5C, 0x94, 0xD0, 0x5A, 0x0E, 0x5D, 0xF6, 0x4D, 0x35, 0xD2, 0xC1, 0x52, 0xC7, 
+	0x3B, 0x58, 0x43, 0xEB, 0xB6, 0x54, 0xBA, 0xA5, 0xF1, 0x86, 0xDB, 0x23, 0xAB, 0x6A, 0x42, 0x00, 
+	0x90, 0xD2, 0x0C, 0x76, 0x32, 0xA0, 0xC2, 0xE3, 0x10, 0x0E, 0x0C, 0x8A, 0x7C, 0xA5, 0x5F, 0xC9, 
+	0x4E, 0x79, 0x6E, 0x38, 0x0D, 0xA1, 0xD8, 0x7E, 0x90, 0xDD, 0xA4, 0x35, 0x33, 0xBF, 0xCE, 0x69, 
+	0x8F, 0x93, 0xBC, 0xB4, 0xC8, 0xD2, 0xD1, 0xD8, 0x2F, 0x31, 0xF8, 0x0B, 0x12, 0x8B, 0xA2, 0xAA, 
+	0x7B, 0x36, 0x5F, 0x66, 0x0D, 0xF6, 0x34, 0x0F, 0xA7, 0x6A, 0xF3, 0x52, 0x4A, 0xB3, 0xCE, 0x83, 
+	0xB5, 0x57, 0x11, 0x74, 0xBF, 0x1D, 0x5E, 0xA4, 0x18, 0x84, 0xC6, 0xE4, 0xAC, 0x42, 0x93, 0x82, 
+	0x99, 0xF1, 0x4B, 0xE2, 0x07, 0x0E, 0x0C, 0xAD, 0xC4, 0x7E, 0x24, 0xC7, 0xF9, 0x22, 0x34, 0x31, 
+	0x0B, 0xC9, 0xBF, 0xA8, 0x74, 0xE9, 0xDE, 0xE8, 0x61, 0xDC, 0xC2, 0x49, 0x95, 0x78, 0x6F, 0x2D, 
+	0x46, 0x76, 0xD8, 0x2F, 0xA9, 0x56, 0x00, 0x38, 0x74, 0x54, 0xBB, 0x66, 0xE5, 0x9B, 0xA1, 0xAB, 
+	0xE4, 0x1E, 0x46, 0x71, 0x90, 0xC1, 0xF8, 0x16, 0x8A, 0x8F, 0x76, 0xE6, 0x4F, 0x06, 0xE8, 0xE8, 
+	0xAA, 0x25, 0xF2, 0x75, 0x3A, 0x0D, 0xBD, 0xF6, 0x40, 0xEE, 0x64, 0xE0, 0xF4, 0xD5, 0xBB, 0x76, 
+	0x7A, 0x8B, 0x43, 0xD8, 0x75, 0xD3, 0xAF, 0x1A, 0xE7, 0x59, 0x5E, 0x8E, 0xC8, 0xE4, 0xD9, 0x7C, 
+	0x3E, 0x02, 0x4D, 0xBE, 0x00, 0xD9, 0x6F, 0x46, 0xF1, 0x4A, 0x5B, 0x33, 0x97, 0x6E, 0x54, 0x5A, 
+	0x3A, 0x41, 0x6F, 0xC0, 0xB7, 0x3E, 0x78, 0xE5, 0xCF, 0x75, 0x1C, 0xEE, 0xD8, 0xA1, 0xEE, 0xD0, 
+	0x37, 0x94, 0xFE, 0x63, 0x1B, 0x2F, 0x63, 0x7A, 0xFE, 0x22, 0xCD, 0x32, 0xE1, 0xB6, 0xF8, 0x21, 
+	0x33, 0xDA, 0xCE, 0xB4, 0x91, 0x25, 0x21, 0x67, 0xA2, 0x6D, 0x5D, 0x49, 0xBD, 0x77, 0x92, 0x60, 
+	0xA3, 0x56, 0xBF, 0x1E, 0x1B, 0xF8, 0xE9, 0x40, 0xC5, 0xBF, 0x06, 0xFC, 0x14, 0xBC, 0xBC, 0x62, 
+	0xC0, 0xCB, 0x8D, 0x67, 0x7E, 0xDD, 0xB9, 0xCE, 0x66, 0xE2, 0x52, 0xC1, 0x21, 0x68, 0x93, 0xB4, 
+	0x6F, 0xFC, 0x81, 0x1F, 0x41, 0xD7, 0x7F, 0x10, 0xCF, 0x35, 0x9B, 0x72, 0xC6, 0xBC, 0x05, 0x5D, 
+	0x7D, 0x63, 0x09, 0xB4, 0xA8, 0x62, 0xAA, 0x42, 0x51, 0xC1, 0xC0, 0xF0, 0x2D, 0xE2, 0xBE, 0x6D, 
+	0x54, 0x53, 0x55, 0x7B, 0x39, 0x0A, 0xB0, 0x2A, 0xE0, 0x45, 0x0A, 0xEF, 0xD7, 0x7E, 0xB9, 0xAF, 
+	0xB9, 0xDA, 0x22, 0x5D, 0x65, 0xD5, 0x39, 0x0F, 0xE4, 0x2B, 0x8E, 0xAA, 0x79, 0xC9, 0xFB, 0xF0, 
+	0x00, 0x51, 0xE6, 0x59, 0x3F, 0x12, 0x54, 0x4A, 0x29, 0x23, 0xD3, 0x6A, 0x9F, 0xB9, 0x0D, 0x99, 
+	0x1E, 0x8A, 0xF6, 0x55, 0xD3, 0xDC, 0x8A, 0x48, 0xC3, 0xE5, 0x16, 0xDA, 0xFF, 0xB0, 0x3B, 0x92, 
+	0x49, 0xD6, 0x00, 0xB1, 0x13, 0x8E, 0xC2, 0x3F, 0x7C, 0xF9, 0x48, 0x55, 0xD5, 0xAC, 0xEA, 0x8A, 
+	0xC1, 0x5C, 0xA9, 0x48, 0xEA, 0x71, 0xDA, 0x99, 0xE9, 0x49, 0xBA, 0xD8, 0x1F, 0xF2, 0xB2, 0x51, 
+	0x5D, 0x13, 0xC7, 0x6A, 0x82, 0x8E, 0x64, 0x3A, 0x11, 0x56, 0x66, 0x24, 0x2D, 0xC1, 0x7D, 0x3A, 
+	0xB2, 0x45, 0xB6, 0xAE, 0x10, 0x8F, 0xBD, 0xD6, 0x9F, 0xAB, 0x44, 0xA7, 0x4A, 0x5D, 0x92, 0x7D, 
+	0x8F, 0xE5, 0x59, 0x4A, 0x10, 0x85, 0xFD, 0x3C, 0x40, 0x3B, 0xBF, 0xDF, 0xA7, 0x3A, 0x1D, 0xB5, 
+	0x67, 0x23, 0xF9, 0xAC, 0x59, 0x31, 0x2F, 0xD9, 0xD6, 0xF5, 0xEA, 0xD1, 0xDE, 0xAE, 0xFA, 0x44, 
+	0xFD, 0xE0, 0xBE, 0xE3, 0xF7, 0xEA, 0xD5, 0xF0, 0x26, 0x41, 0xE5, 0x3D, 0xBE, 0xAA, 0xFC, 0x57, 
+	0x49, 0xAE, 0x3E, 0x70, 0x8F, 0x9D, 0xF1, 0xB6, 0x32, 0x7D, 0xE7, 0x21, 0x4A, 0x7E, 0x99, 0xD7, 
+	0x90, 0xFE, 0xC5, 0xB2, 0xE8, 0xAC, 0x6D, 0xF7, 0x3C, 0xD3, 0x1E, 0x61, 0xF4, 0xFF, 0x8C, 0x13, 
+	0x5A, 0x7F, 0x87, 0x66, 0x47, 0x84, 0xF8, 0x3B, 0x0B, 0x70, 0xCF, 0xBA, 0x0C, 0x87, 0x93, 0x62, 
+	0x65, 0x1E, 0x47, 0xFC, 0x96, 0x25, 0x46, 0x01, 0xE0, 0xCE, 0xE2, 0x41, 0xC6, 0x38, 0x90, 0x0D, 
+	0xE3, 0xC7, 0x60, 0x4E, 0x08, 0x0F, 0x02, 0xF5, 0xB8, 0x70, 0x27, 0x89, 0x29, 0x6E, 0x79, 0x85, 
+	0x12, 0xA4, 0xCA, 0x6C, 0x69, 0xBE, 0x52, 0xFF, 0xBD, 0xCF, 0x3E, 0x07, 0xA8, 0x7B, 0x00, 0x44, 
+	0xE0, 0x3B, 0xA6, 0x50, 0xFF, 0xF9, 0xDA, 0x0D, 0xEB, 0xCC, 0x70, 0x21, 0x20, 0x5F, 0xF4, 0xAF, 
+	0x1B, 0x2C, 0xF8, 0x63, 0x9C, 0xB9, 0x8F, 0x0B, 0xBF, 0x1C, 0xA5, 0x85, 0xA6, 0x9A, 0x0A, 0x93, 
+	0x1E, 0x8B, 0xA3, 0x80, 0x63, 0x30, 0x24, 0xE1, 0xF0, 0xB6, 0x7B, 0x93, 0xC5, 0x72, 0xE9, 0x49, 
+	0x91, 0x1D, 0xB0, 0x77, 0xC0, 0xA2, 0x1D, 0xC9, 0x66, 0x90, 0xF7, 0x58, 0x92, 0x87, 0x4F, 0xB0, 
+	0x0D, 0x0A, 0x48, 0x16, 0x5F, 0x7D, 0xF4, 0xA6, 0xC9, 0x80, 0xD2, 0x38, 0xD6, 0xC7, 0xEE, 0x73, 
+	0xA6, 0xA8, 0x57, 0xC9, 0xAA, 0x32, 0x6A, 0x3C, 0xA7, 0x9F, 0x89, 0x79, 0x8B, 0xD9, 0x6B, 0x8C, 
+	0xB1, 0x26, 0x5D, 0x4B, 0xE9, 0xF0, 0x9D, 0xFA, 0xC0, 0xD3, 0xEA, 0x82, 0xDA, 0x7C, 0xCB, 0x43, 
+	0x90, 0x74, 0x24, 0xC6, 0xBD, 0x5B, 0x87, 0x29, 0xCA, 0xEC, 0x6E, 0xBA, 0x7C, 0x41, 0xF9, 0x99, 
+	0x0A, 0x92, 0xFA, 0x43, 0xAE, 0xE7, 0xF9, 0xFB, 0x55, 0x5B, 0x3A, 0xCC, 0x1C, 0xC5, 0x20, 0x37, 
+	0x53, 0x4A, 0x83, 0xC6, 0x79, 0x5A, 0x42, 0xF9, 0x23, 0x62, 0xA1, 0x3A, 0x42, 0xCE, 0x51, 0xC5, 
+	0x5D, 0xC9, 0x99, 0x1F, 0x82, 0xE7, 0x43, 0x72, 0x46, 0x70, 0x80, 0x25, 0x65, 0x98, 0x78, 0xC2, 
+	0xF9, 0xD4, 0x07, 0x2D, 0xAB, 0x79, 0x7D, 0x45, 0xC3, 0x0B, 0xEE, 0x18, 0xBB, 0x3C, 0x33, 0xE5, 
+	0x8B, 0xE5, 0x2A, 0x04, 0x53, 0x7C, 0x92, 0x92, 0x3E, 0x77, 0xE6, 0xB5, 0x8A, 0x7C, 0xAC, 0x3F, 
+	0xEA, 0xFC, 0x19, 0x64, 0xFD, 0xB4, 0xA3, 0x33, 0xCC, 0xBB, 0xE3, 0x5F, 0xBA, 0xAB, 0x9F, 0x2A, 
+	0x4E, 0x71, 0x96, 0x4D, 0x8D, 0x33, 0x39, 0x02, 0x0F, 0x6B, 0xFB, 0xC7, 0x76, 0x0D, 0xC4, 0x9D, 
+	0xB0, 0x6C, 0xA3, 0x91, 0x32, 0x23, 0x60, 0xF9, 0x53, 0x3C, 0x48, 0xCF, 0x54, 0x4A, 0x34, 0x6A, 
+	0x90, 0xB8, 0xDB, 0xB6, 0xFD, 0xD8, 0xB9, 0x79, 0xF1, 0x5D, 0x64, 0xFC, 0x2C, 0x6E, 0xA2, 0xD2, 
+	0x4D, 0x37, 0x56, 0xCB, 0x8D, 0xE9, 0xC9, 0x02, 0x3A, 0x7F, 0x53, 0x75, 0x98, 0x46, 0xF9, 0x8E, 
+	0xE2, 0x00, 0x05, 0x20, 0x8E, 0xAD, 0xAA, 0x38, 0x5F, 0x6A, 0x34, 0x16, 0x2E, 0x25, 0xFF, 0x7F, 
+	0xE2, 0x10, 0x2D, 0x49, 0x2C, 0xEF, 0xB5, 0xE5, 0x8A, 0x2A, 0x1F, 0x6F, 0x6C, 0x49, 0xF7, 0x78, 
+	0x80, 0xCA, 0xFA, 0x14, 0x5D, 0xAE, 0xA9, 0xCD, 0xC5, 0xB8, 0xA8, 0xDC, 0xFF, 0x84, 0xC5, 0x80, 
+	0x8E, 0x98, 0x5F, 0x7E, 0xF6, 0x26, 0xBB, 0x35, 0xF7, 0xA7, 0x40, 0x46, 0x83, 0x26, 0xDF, 0x3B, 
+	0x64, 0xE0, 0x67, 0x7A, 0xBE, 0x08, 0xF4, 0xE6, 0x1A, 0xF8, 0xFD, 0xBA, 0x0E, 0xBE, 0xB2, 0x28, 
+	0x6C, 0x45, 0xEA, 0xB1, 0x6C, 0xA8, 0x8E, 0x4F, 0xB8, 0xBC, 0x82, 0x0A, 0xD1, 0x84, 0xAB, 0x03, 
+	0x6C, 0x30, 0x85, 0xA1, 0x2C, 0x72, 0xA3, 0x08, 0x25, 0x4C, 0x97, 0x32, 0xEB, 0xAD, 0x0E, 0x3E, 
+	0xE8, 0x8E, 0x2B, 0xF0, 0xCF, 0x13, 0xCA, 0xD1, 0x53, 0xC6, 0xCD, 0x58, 0x98, 0xDE, 0xB0, 0x7E, 
+	0x0D, 0xBF, 0x94, 0x3E, 0xA7, 0x1C, 0x84, 0xBC, 0xB3, 0x9B, 0x6D, 0x54, 0x32, 0x39, 0x89, 0xF8, 
+	0x02, 0xAF, 0xBC, 0xB2, 0x53, 0x3B, 0x43, 0xF2, 0xCC, 0xC9, 0x05, 0xF2, 0xC4, 0x88, 0x37, 0x6E, 
+	0xE1, 0xA1, 0x55, 0x82, 0x7E, 0xBE, 0x83, 0xE0, 0x0B, 0xF8, 0x96, 0x45, 0x61, 0xC1, 0x96, 0x28, 
+	0x6D, 0x64, 0xCF, 0xF9, 0xC1, 0xC7, 0x3A, 0x18, 0xF3, 0x9A, 0x69, 0x2B, 0x07, 0x57, 0x55, 0xE8, 
+	0x09, 0xCB, 0x33, 0xC5, 0x4F, 0xBF, 0x0F, 0x9A, 0x22, 0xB1, 0xB3, 0x50, 0x15, 0xA3, 0xCB, 0x8D, 
+	0x6E, 0x29, 0x56, 0x89, 0x64, 0xAF, 0x5B, 0x0D, 0xD4, 0xE2, 0x6F, 0x6A, 0x38, 0xBD, 0xD8, 0xA1, 
+	0x7D, 0x0A, 0x6F, 0x7B, 0x07, 0x89, 0x5B, 0xD2, 0xFB, 0x34, 0x5F, 0xA9, 0x0F, 0x41, 0x18, 0xD3, 
+	0x99, 0xFD, 0xA8, 0x88, 0xFD, 0x4B, 0x9B, 0xCA, 0xAE, 0x5A, 0xB0, 0xEE, 0x23, 0x0F, 0x4B, 0x5C, 
+	0x99, 0xEA, 0x29, 0xF3, 0xF6, 0x97, 0x5F, 0xF9, 0xAF, 0x28, 0x4F, 0xEC, 0xD6, 0x01, 0x69, 0x8B, 
+	0x65, 0x08, 0x55, 0xCA, 0x05, 0xC0, 0xB4, 0xB2, 0x64, 0x2A, 0xF5, 0x3E, 0xDA, 0xA2, 0xD2, 0xBB, 
+	0xDF, 0x17, 0xFF, 0xCF, 0x9E, 0xDE, 0x8A, 0x1E, 0x5F, 0xFD, 0xEA, 0x12, 0x0F, 0xFF, 0x96, 0x20, 
+	0x0A, 0x15, 0xE6, 0x9B, 0x4F, 0x12, 0x0B, 0xCC, 0x39, 0x4D, 0xFD, 0xD4, 0x7A, 0xDA, 0x24, 0x11, 
+	0x2D, 0x93, 0x92, 0x9F, 0x3E, 0x3F, 0xA2, 0x9B, 0xAD, 0x98, 0x13, 0xE2, 0x5F, 0xF2, 0x7E, 0x84, 
+	0xA1, 0x43, 0xAB, 0x76, 0xB8, 0xFC, 0xA0, 0x01, 0x17, 0x38, 0xB3, 0x33, 0x13, 0x4A, 0xF5, 0x15, 
+	0xA5, 0x56, 0x66, 0xC5, 0x44, 0x0C, 0x88, 0x75, 0x76, 0xA5, 0x7E, 0x57, 0xD4, 0x22, 0xE5, 0x32, 
+	0x99, 0x60, 0x99, 0x7C, 0x65, 0x29, 0xBA, 0xB0, 0x5B, 0x1F, 0x84, 0x98, 0x0C, 0x06, 0x8A, 0xAE, 
+	0x96, 0x63, 0x91, 0xB1, 0x75, 0xE6, 0xE6, 0x7A, 0xBF, 0x1E, 0xB5, 0xB6, 0x76, 0x1B, 0xE2, 0xBF, 
+	0xB4, 0x1F, 0x4D, 0x33, 0xF9, 0x9D, 0x9C, 0x79, 0xE6, 0xF5, 0xA3, 0x8C, 0x72, 0xFE, 0xAE, 0xB1, 
+	0x13, 0x09, 0x20, 0x91, 0x7C, 0x11, 0x99, 0x68, 0x1A, 0xA7, 0x6B, 0x3F, 0x88, 0xC7, 0xF5, 0x94, 
+	0x0D, 0xBC, 0x3B, 0xA5, 0x14, 0xD7, 0x8B, 0xA0, 0xA0, 0x70, 0xB4, 0xC2, 0x4E, 0x2F, 0xA8, 0xB1, 
+	0x0D, 0x7B, 0x8C, 0xD4, 0x96, 0xC1, 0xD1, 0xC5, 0x13, 0x67, 0x24, 0x16, 0x3C, 0xC0, 0xFD, 0x79, 
+	0x3C, 0x11, 0x69, 0x03, 0xF6, 0x55, 0xF7, 0xF2, 0x09, 0x8B, 0x49, 0x5B, 0xDA, 0x05, 0x3C, 0xDB, 
+	0x1C, 0x01, 0x1F, 0xDC, 0x4D, 0xE2, 0x09, 0xB6, 0x1F, 0x5F, 0xE2, 0xB0, 0xDF, 0x77, 0xF8, 0x83, 
+	0x59, 0xCF, 0xEE, 0x8B, 0x14, 0x12, 0xEB, 0xBC, 0x9B, 0xB4, 0x38, 0xFD, 0x38, 0x53, 0xC9, 0xA1, 
+	0x4E, 0xF6, 0x80, 0xA8, 0xE5, 0x25, 0x89, 0x97, 0xCF, 0x94, 0x06, 0xE4, 0x25, 0xDF, 0x86, 0x46, 
+	0xA2, 0x54, 0xA7, 0x04, 0xB5, 0xCA, 0x67, 0xF1, 0x95, 0x65, 0x57, 0xE1, 0x38, 0x61, 0xCB, 0x20, 
+	0xE5, 0x98, 0xF4, 0x07, 0x95, 0x25, 0xBD, 0xBE, 0x9F, 0x87, 0x76, 0x4D, 0x52, 0x96, 0xAE, 0x82, 
+	0xAE, 0x2C, 0x3C, 0xB6, 0x7C, 0x1A, 0x36, 0xE5, 0x34, 0x13, 0x1B, 0x72, 0x52, 0x8F, 0xFF, 0xE7, 
+	0x6B, 0x83, 0xDB, 0x88, 0x4A, 0xDB, 0x95, 0x37, 0xFA, 0x9D, 0xA2, 0x49, 0xDB, 0x5A, 0xE3, 0x5C, 
+	0x95, 0xC7, 0xF8, 0xE0, 0x14, 0x38, 0xB2, 0xCD, 0x09, 0xF4, 0x2A, 0x2A, 0xF7, 0x1A, 0xA1, 0x8E, 
+	0xB8, 0xBC, 0x3B, 0x51, 0x9A, 0xE4, 0xD1, 0xCF, 0xA7, 0xD1, 0xF9, 0x63, 0x0F, 0x98, 0x3D, 0x61, 
+	0x51, 0xEC, 0x1B, 0x67, 0x68, 0x88, 0x25, 0x65, 0x0B, 0xA6, 0x32, 0xA2, 0xCD, 0x93, 0xE1, 0x16, 
+	0x01, 0x12, 0xB2, 0xDA, 0x35, 0xBA, 0x52, 0x66, 0x46, 0x44, 0x8D, 0xB3, 0x19, 0x33, 0xC1, 0x1F, 
+	0x47, 0x6C, 0x48, 0x7B, 0x5C, 0x8C, 0xA8, 0x68, 0x74, 0xDE, 0x7C, 0xB4, 0xDF, 0x05, 0x54, 0x35, 
+	0x8A, 0xFE, 0x78, 0xB5, 0x05, 0x78, 0xC3, 0xB4, 0x85, 0x12, 0x88, 0xBB, 0x49, 0x17, 0x46, 0x5D, 
+	0x7D, 0x1F, 0xF4, 0xB5, 0xD9, 0xEF, 0x62, 0xBA, 0xC4, 0x86, 0x61, 0x0B, 0xE0, 0xC5, 0xEE, 0x69, 
+	0xEC, 0xF9, 0x52, 0x93, 0x3F, 0xC7, 0x69, 0xE4, 0xD2, 0x9C, 0xE0, 0xEB, 0xB5, 0x5A, 0x55, 0xCE, 
+	0x87, 0xA3, 0x1C, 0x52, 0x2E, 0xC5, 0x99, 0x92, 0x7F, 0x10, 0x06, 0xC4, 0xA2, 0x5B, 0x77, 0x3D, 
+	0x53, 0xE8, 0xCA, 0xB5, 0x3B, 0x18, 0x58, 0x54, 0xC6, 0x63, 0xDB, 0x1D, 0xB6, 0x75, 0xD2, 0x69, 
+	0x64, 0x8A, 0x69, 0x0E, 0xF9, 0x57, 0x41, 0x4C, 0xC2, 0xF3, 0x59, 0x0A, 0x60, 0x76, 0x67, 0x4A, 
+	0xE6, 0xE8, 0x63, 0xB5, 0x0A, 0x39, 0xDE, 0x95, 0xD6, 0xFB, 0xD4, 0xEC, 0xA3, 0xBD, 0x1A, 0xB1, 
+	0x8F, 0x54, 0x1C, 0xD7, 0x39, 0x50, 0x8F, 0x92, 0x0D, 0x33, 0x9F, 0x49, 0x10, 0xB2, 0x73, 0x87, 
+	0x83, 0xF0, 0x72, 0x9D, 0xE7, 0xEA, 0x14, 0xC7, 0x5A, 0x23, 0x6F, 0x54, 0x3E, 0xB5, 0x86, 0x6D, 
+	0xD6, 0xE2, 0x3E, 0x97, 0x96, 0x5F, 0xF4, 0x1A, 0xFD, 0x8B, 0x96, 0x9B, 0x14, 0xD7, 0x25, 0x3A, 
+	0x96, 0x25, 0x7B, 0xBE, 0x32, 0x46, 0xC3, 0x20, 0x4E, 0x01, 0x98, 0x0A, 0x27, 0x53, 0x58, 0xFA, 
+	0xAF, 0x14, 0xE6, 0x6B, 0x99, 0x32, 0x85, 0x87, 0x8F, 0xDA, 0x09, 0x7C, 0x92, 0x9D, 0x4C, 0x87, 
+	0xF6, 0xB3, 0x67, 0x61, 0xA2, 0x7C, 0x25, 0x5D, 0x4E, 0xA7, 0x6F, 0xF0, 0xCB, 0x6C, 0x6A, 0xC3, 
+	0xE2, 0x19, 0x33, 0xBE, 0x73, 0x95, 0xE1, 0xBA, 0x39, 0x09, 0x7F, 0xAE, 0x72, 0x8A, 0x4E, 0x74, 
+	0xA1, 0xBF, 0x5B, 0x1D, 0x34, 0x89, 0xF0, 0x94, 0xE6, 0x84, 0x3C, 0x64, 0x29, 0x04, 0x07, 0x34, 
+	0xC3, 0x32, 0xEF, 0xF6, 0xE5, 0x24, 0x54, 0x09, 0xFA, 0x81, 0xDB, 0xF1, 0xCF, 0xE5, 0xDB, 0x98, 
+	0x27, 0xC0, 0xEB, 0xDA, 0x10, 0x73, 0x74, 0x76, 0xCA, 0xD7, 0xFE, 0xDF, 0x82, 0x63, 0x0F, 0x31, 
+	0x03, 0xBE, 0x10, 0xF4, 0xF6, 0x76, 0xDD, 0x27, 0xAD, 0xE4, 0xC1, 0xFA, 0xC5, 0x5A, 0x71, 0x8D, 
+	0x59, 0x39, 0x41, 0x6C, 0xDD, 0xFB, 0x4C, 0x5C, 0xB0, 0xB8, 0xF9, 0x67, 0x9C, 0xD7, 0x90, 0x44, 
+	0xE2, 0xF3, 0x39, 0x4C, 0x84, 0x1A, 0x13, 0x3F, 0xF2, 0xDF, 0x77, 0xA5, 0xF6, 0xAB, 0x69, 0x37, 
+	0x18, 0x56, 0x03, 0x86, 0xE9, 0xB7, 0xC8, 0xD8, 0x5A, 0xA1, 0x87, 0x00, 0xBC, 0x14, 0x44, 0xFF, 
+	0x21, 0xDD, 0xAC, 0x99, 0xD2, 0x78, 0xDF, 0x0C, 0xF3, 0xAC, 0x5F, 0xF4, 0x56, 0xE4, 0xAB, 0xCF, 
+	0x5F, 0x1C, 0x60, 0x7E, 0xFA, 0xDA, 0x36, 0x8A, 0xF2, 0xD4, 0x80, 0x64, 0xC5, 0x54, 0x53, 0xCA, 
+	0xF3, 0x80, 0x9A, 0x3C, 0x7C, 0x7B, 0x32, 0x30, 0x14, 0xB7, 0x17, 0x9B, 0x42, 0x7C, 0x94, 0x0D, 
+	0xC4, 0x43, 0x5B, 0xB0, 0x86, 0xE9, 0x1F, 0x80, 0xCD, 0x45, 0x97, 0x3D, 0x8A, 0xD0, 0x22, 0x91, 
+	0xA0, 0x14, 0xA5, 0xD7, 0x71, 0x07, 0x8D, 0xAB, 0x69, 0xE8, 0x38, 0x98, 0xEE, 0x70, 0x3D, 0x7B, 
+	0x86, 0x13, 0xDE, 0xAF, 0xE5, 0x89, 0x5A, 0x5F, 0x1F, 0xF9, 0xA5, 0x3F, 0xED, 0x62, 0xE6, 0x65, 
+	0x3B, 0x86, 0xF9, 0x76, 0xD6, 0x5A, 0x57, 0x54, 0x8B, 0x0D, 0x39, 0xEC, 0x9F, 0x00, 0xBF, 0x4E, 
+	0xF8, 0x62, 0x51, 0x83, 0x74, 0x16, 0x00, 0x3A, 0x4F, 0x71, 0x18, 0x73, 0xF0, 0x41, 0x71, 0xB4, 
+	0xDC, 0x79, 0xFC, 0x32, 0xDB, 0x38, 0x0C, 0x3F, 0x1B, 0x66, 0xA4, 0x27, 0xED, 0xA7, 0xE2, 0xE6, 
+	0xB0, 0x51, 0xF6, 0xBD, 0xEF, 0x2E, 0x0E, 0x10, 0x8F, 0x1D, 0x40, 0xDF, 0x85, 0x67, 0xC7, 0x25, 
+	0x11, 0x7F, 0x50, 0x99, 0xC8, 0xAE, 0xDF, 0x6A, 0xAF, 0x70, 0x8C, 0xD4, 0xB5, 0x6A, 0xA5, 0x21, 
+	0x1C, 0xBF, 0x0C, 0x75, 0xA2, 0x40, 0x03, 0x17, 0x58, 0x8C, 0x84, 0x4D, 0x82, 0x29, 0xE5, 0x7C, 
+	0x05, 0xA1, 0xAF, 0x48, 0x07, 0xD1, 0xF7, 0x53, 0xBC, 0x02, 0xF7, 0xCD, 0x60, 0x35, 0xEE, 0x04, 
+	0x03, 0xE1, 0x3A, 0xAA, 0x71, 0x54, 0x5B, 0xDD, 0x86, 0x68, 0xFB, 0xC6, 0xBC, 0xCF, 0xCD, 0x55, 
+	0xBC, 0x0E, 0x0D, 0x8D, 0x7B, 0x70, 0x1F, 0xE4, 0xEC, 0x2C, 0x91, 0x22, 0xF6, 0x55, 0xC9, 0x07, 
+	0x0F, 0x26, 0x60, 0x4F, 0xB0, 0x27, 0xFA, 0xAB, 0xBF, 0x3B, 0xF1, 0x3F, 0x52, 0xB8, 0xC7, 0x7B, 
+	0x52, 0xBF, 0x6E, 0xA4, 0x87, 0xCD, 0x40, 0x62, 0x4D, 0xDA, 0xD1, 0x37, 0x77, 0x44, 0xB3, 0x1D, 
+	0xD6, 0x2F, 0x9A, 0xA8, 0x61, 0x54, 0x6A, 0x1E, 0x2E, 0xE2, 0xC0, 0xBF, 0x7D, 0xAD, 0xB9, 0xDB, 
+	0x52, 0x5C, 0x0F, 0x15, 0x7F, 0x40, 0x8B, 0xC3, 0x4E, 0xC5, 0xC3, 0x59, 0x5A, 0x19, 0x3F, 0xA1, 
+	0xB3, 0x58, 0x3A, 0xC2, 0x06, 0x5B, 0x16, 0xF8, 0xEA, 0xFA, 0xB6, 0x8D, 0x93, 0xFF, 0xC4, 0x96, 
+	0x2C, 0x9F, 0xD0, 0xAB, 0x5A, 0x2B, 0x81, 0x17, 0xA9, 0x71, 0x38, 0x0F, 0x01, 0xEF, 0x5A, 0xC0, 
+	0xE9, 0x9F, 0x8B, 0x63, 0x47, 0x89, 0x50, 0xC2, 0xFB, 0x8A, 0x8B, 0x9F, 0xEE, 0xC4, 0xC4, 0x7A, 
+	0xDC, 0xAD, 0xC3, 0x6A, 0x70, 0xA4, 0x71, 0x53, 0xFD, 0xA9, 0x0D, 0xC0, 0x62, 0x23, 0xB8, 0x9D, 
+	0xAE, 0xA2, 0x12, 0x0B, 0x18, 0x42, 0xB6, 0x93, 0x2A, 0x85, 0x60, 0x09, 0x59, 0x69, 0x52, 0x1F, 
+	0x1E, 0xBA, 0xBF, 0x0F, 0xA6, 0x8E, 0xB0, 0x8A, 0x03, 0xCA, 0xC5, 0x1C, 0x8E, 0x89, 0xF2, 0x50, 
+	0xD7, 0x1A, 0xA9, 0x63, 0x83, 0x0F, 0x6D, 0x06, 0x27, 0x1F, 0x40, 0xDA, 0x0B, 0x9E, 0xEB, 0x1F, 
+	0x7E, 0x4F, 0x8A, 0xF0, 0x38, 0x86, 0x08, 0xC6, 0x3A, 0xFF, 0x29, 0xCC, 0xA7, 0x10, 0x27, 0xF3, 
+	0x99, 0x3E, 0x52, 0xF3, 0x0F, 0x83, 0x93, 0x9F, 0x63, 0xE8, 0x23, 0x41, 0x71, 0x98, 0x25, 0x1B, 
+	0xC9, 0x89, 0x15, 0x8F, 0xC8, 0x72, 0x35, 0x72, 0x7D, 0xF2, 0x36, 0x31, 0x64, 0xF5, 0x3A, 0x4C, 
+	0x15, 0x9B, 0x30, 0x77, 0x36, 0x03, 0xB9, 0xEE, 0xCA, 0x61, 0x22, 0x7C, 0xCF, 0xEE, 0x6C, 0xE4, 
+	0xEC, 0x83, 0x67, 0x10, 0x07, 0x7A, 0x21, 0x97, 0xDF, 0xC3, 0x2A, 0x27, 0x47, 0xDB, 0x1A, 0x76, 
+	0x2D, 0xA5, 0x9D, 0xD7, 0x39, 0x54, 0x4F, 0x62, 0x9C, 0xFD, 0x77, 0x0E, 0xB0, 0x4A, 0x0A, 0xD9, 
+	0x46, 0xC2, 0x28, 0x49, 0xB0, 0x53, 0x99, 0x2A, 0xC2, 0x81, 0xF9, 0x8A, 0xE1, 0x01, 0xDA, 0xCC, 
+	0x31, 0x60, 0x9B, 0x32, 0x4B, 0x69, 0x2B, 0x89, 0x00, 0xDA, 0xCD, 0x41, 0x0B, 0x13, 0xC0, 0x3C, 
+	0x4A, 0xD0, 0x32, 0x0A, 0x45, 0x31, 0x54, 0x38, 0x9E, 0x74, 0x56, 0x60, 0x8A, 0xFA, 0x0C, 0x0C, 
+	0xC8, 0xDC, 0x4E, 0x12, 0x9A, 0xD0, 0x2B, 0xAC, 0xF3, 0x16, 0xD3, 0xE4, 0x5C, 0xA8, 0x3B, 0x8A, 
+	0x8E, 0x04, 0x4B, 0x09, 0xDE, 0x91, 0x1C, 0xF2, 0x3D, 0xB5, 0x27, 0x23, 0x9A, 0x5F, 0xCA, 0xCE, 
+	0x1D, 0x81, 0x25, 0xD3, 0x0B, 0x07, 0x3B, 0xA2, 0xED, 0xC1, 0x68, 0xA3, 0x10, 0x1E, 0x49, 0xED, 
+	0x2B, 0x02, 0xD4, 0x65, 0x6B, 0xDE, 0xF7, 0xE8, 0x3D, 0xC3, 0x41, 0x1E, 0x75, 0xDB, 0xD0, 0xE4, 
+	0xA7, 0xFF, 0xFC, 0xB3, 0x0D, 0xAE, 0x72, 0x6D, 0xF2, 0x16, 0xF9, 0x4C, 0x9B, 0x2C, 0x83, 0x55, 
+	0x53, 0x32, 0xB1, 0x4E, 0xE7, 0x7E, 0x7F, 0xF6, 0xBE, 0xE4, 0x7A, 0xF3, 0xDB, 0x73, 0xA5, 0xDC, 
+	0xB3, 0x1F, 0x1B, 0x9E, 0x93, 0x58, 0x58, 0x4C, 0xDB, 0xED, 0x8C, 0x02, 0xB7, 0x43, 0x10, 0x7F, 
+	0x32, 0xF0, 0xFC, 0xD2, 0xDA, 0x18, 0xA6, 0x74, 0x80, 0x12, 0x9C, 0xBB, 0xB9, 0xA9, 0x03, 0x76, 
+	0xC9, 0x4E, 0xE0, 0xE3, 0x63, 0x96, 0xC8, 0x32, 0x04, 0x06, 0x15, 0x52, 0xD1, 0xB6, 0x03, 0x1B, 
+	0x5D, 0xF2, 0x40, 0x43, 0x37, 0xCF, 0x7C, 0xF5, 0xC4, 0xAB, 0x8B, 0x83, 0x63, 0x5D, 0xE3, 0x3B, 
+	0x3B, 0x66, 0xE6, 0x19, 0xEF, 0x51, 0x6B, 0x60, 0x6F, 0x3E, 0x71, 0x3D, 0x8E, 0x5A, 0x77, 0xD2, 
+	0x57, 0x9A, 0x06, 0xE9, 0xBB, 0x8A, 0x50, 0x58, 0x90, 0xF1, 0x17, 0xD7, 0x18, 0x9C, 0x24, 0x65, 
+	0x3D, 0x40, 0xA5, 0xA1, 0xD8, 0x24, 0x4B, 0xAA, 0x8A, 0x47, 0x3F, 0x0D, 0xB6, 0x60, 0xE6, 0x75, 
+	0xCD, 0x45, 0x6D, 0x54, 0xD9, 0x67, 0x65, 0xE0, 0x04, 0xCC, 0xBE, 0xCC, 0xAA, 0x8E, 0x3D, 0xB9, 
+	0x1E, 0x03, 0x25, 0x25, 0x31, 0x88, 0x36, 0xF6, 0x52, 0xD7, 0x4E, 0x75, 0xB5, 0xEA, 0x05, 0x83, 
+	0x59, 0xAD, 0xAF, 0xF4, 0x13, 0xCE, 0x5D, 0xF4, 0x52, 0x98, 0xBC, 0x63, 0xFE, 0xB0, 0xC5, 0x55, 
+	0xBD, 0x5A, 0x65, 0x3E, 0xAF, 0x24, 0x4C, 0x5E, 0xEA, 0x9A, 0x44, 0x32, 0x0E, 0x39, 0xCA, 0x60, 
+	0xB2, 0xBF, 0x62, 0x40, 0x19, 0x57, 0xDE, 0x7C, 0x70, 0xD7, 0xC3, 0x0E, 0x9A, 0x98, 0x6F, 0x26, 
+	0x22, 0x45, 0xC4, 0xD1, 0x8E, 0x6B, 0xC9, 0x3F, 0x1E, 0x71, 0x4F, 0x2E, 0x86, 0x42, 0x73, 0x00, 
+	0xEB, 0x98, 0x22, 0x03, 0x1F, 0x6F, 0xC3, 0xAF, 0xD0, 0x55, 0x8F, 0x95, 0x6F, 0x8E, 0x4B, 0xF0, 
+	0x21, 0x1D, 0xA7, 0xB1, 0xE8, 0x6B, 0xC7, 0x8A, 0xAD, 0x69, 0xD7, 0x6A, 0x7F, 0x09, 0x3A, 0x9F, 
+	0xBF, 0x30, 0x27, 0x18, 0x00, 0x11, 0xF2, 0x96, 0xAB, 0x57, 0xD3, 0x67, 0x5D, 0x2A, 0x36, 0xCF, 
+	0xE2, 0x05, 0xBB, 0x01, 0x83, 0x0B, 0xC7, 0x6D, 0xE9, 0xFD, 0x5A, 0xC8, 0x0D, 0x9C, 0xC0, 0xA2, 
+	0x41, 0x8D, 0x0E, 0x53, 0xB2, 0xD2, 0x2B, 0xD8, 0xE5, 0x4C, 0xEE, 0x81, 0x52, 0xED, 0xE8, 0xEA, 
+	0xF1, 0xF3, 0x2A, 0x5D, 0xEC, 0x2D, 0x0E, 0xFD, 0x76, 0x26, 0x4C, 0x25, 0x78, 0x26, 0x6F, 0x2F, 
+	0xF7, 0x31, 0xAB, 0xC0, 0x6C, 0x80, 0x1F, 0x2B, 0x8B, 0x1E, 0xC1, 0x09, 0x46, 0x5E, 0x94, 0x19, 
+	0xED, 0x07, 0x94, 0xEC, 0xCF, 0x3B, 0xC6, 0x51, 0x29, 0xC2, 0x87, 0xD4, 0x55, 0xD0, 0xAD, 0x82, 
+	0x66, 0x27, 0x61, 0x18, 0xDD, 0xB8, 0xBD, 0xF9, 0xE1, 0xCA, 0xAA, 0xBA, 0x49, 0x39, 0xD6, 0x43, 
+	0xA9, 0x10, 0x12, 0x7C, 0xA6, 0x82, 0xD8, 0xDB, 0x11, 0x76, 0x9D, 0xF0, 0x92, 0xFB, 0x31, 0xC1, 
+	0x9C, 0x31, 0x78, 0x1C, 0x11, 0xD6, 0xF3, 0x1F, 0x14, 0x39, 0xC6, 0x33, 0x46, 0x58, 0x8C, 0xE9, 
+	0x2B, 0x87, 0x94, 0xA6, 0xFA, 0x55, 0x5A, 0x3C, 0x39, 0x60, 0xD0, 0x26, 0x0F, 0xB3, 0x56, 0x18, 
+	0x77, 0x9C, 0x1B, 0x01, 0xBA, 0xE6, 0xB2, 0x1E, 0x8B, 0xA0, 0x63, 0x2D, 0x7E, 0xA2, 0x30, 0xFC, 
+	0xDF, 0x31, 0x99, 0xB2, 0xD6, 0x1E, 0xD3, 0xAB, 0xB7, 0xFA, 0x72, 0xB0, 0x6F, 0xE5, 0x6B, 0x9F, 
+	0xAF, 0xB4, 0xF0, 0x53, 0x06, 0x9C, 0xB0, 0x98, 0x6B, 0xF4, 0x5A, 0x52, 0xDB, 0xD0, 0x13, 0xED, 
+	0x73, 0x70, 0x11, 0xBB, 0xD0, 0x98, 0x58, 0xCA, 0x29, 0x44, 0xCB, 0x7C, 0x2D, 0x43, 0xDE, 0x4F, 
+	0xBF, 0x13, 0x06, 0xDD, 0x3C, 0x69, 0x49, 0xD2, 0xD7, 0xA7, 0x24, 0x9E, 0x0D, 0x3C, 0x8C, 0x73, 
+	0x0F, 0xB2, 0x4F, 0x16, 0x83, 0x7E, 0x7B, 0x3A, 0xD4, 0x49, 0x42, 0x26, 0x9C, 0x6F, 0xAF, 0xD6, 
+	0x73, 0xEF, 0x29, 0x3D, 0x1A, 0x21, 0x58, 0x48, 0xF7, 0xEE, 0xD2, 0xC8, 0x06, 0x4D, 0xB2, 0x3D, 
+	0x1E, 0xD6, 0xF6, 0xF3, 0x25, 0xC8, 0xD5, 0xF4, 0xB6, 0x07, 0x2C, 0xB0, 0x03, 0xDE, 0x83, 0xE0, 
+	0x1C, 0x68, 0x2E, 0x78, 0xB6, 0xDA, 0x99, 0xA6, 0xBD, 0xE8, 0x1D, 0x47, 0x6E, 0x7A, 0x4C, 0xC5, 
+	0xE4, 0x54, 0xEA, 0xDB, 0xB1, 0x6F, 0x9F, 0x53, 0xA6, 0x41, 0xE2, 0x24, 0x6C, 0x9C, 0x88, 0xF7, 
+	0x88, 0xA8, 0x90, 0x0D, 0x34, 0x61, 0xAA, 0x7D, 0x52, 0x5F, 0x8D, 0x81, 0xBE, 0xC9, 0x3E, 0x36, 
+	0x8D, 0x69, 0x81, 0x0D, 0x24, 0x7D, 0xCE, 0x03, 0xB8, 0x4E, 0x9C, 0xFD, 0x5A, 0x4A, 0x45, 0xAF, 
+	0x45, 0xB5, 0xFF, 0x49, 0xEA, 0x6C, 0xF7, 0xB9, 0xE5, 0xC1, 0xA6, 0x57, 0xF3, 0xCA, 0xCC, 0x46, 
+	0xD2, 0x20, 0xB3, 0xB1, 0xC0, 0x18, 0xEE, 0x82, 0xE4, 0x00, 0x3C, 0xA7, 0x8B, 0xA6, 0x3A, 0xDA, 
+	0x82, 0x53, 0x3C, 0x42, 0x4C, 0x3B, 0x16, 0xD0, 0x3E, 0x0E, 0xBA, 0x36, 0xA6, 0xEA, 0x36, 0x16, 
+	0x80, 0xA3, 0x51, 0xFD, 0xF8, 0xFA, 0xE5, 0x75, 0x64, 0x17, 0x0C, 0xE5, 0xAE, 0xB2, 0xE5, 0x14, 
+	0xC1, 0xA9, 0xAE, 0x3A, 0x7E, 0x4D, 0x0E, 0x5C, 0x67, 0x31, 0x02, 0xD2, 0x4D, 0xB3, 0xD6, 0xC6, 
+	0xE6, 0x86, 0xC2, 0x62, 0xE6, 0xB6, 0x53, 0x2C, 0x29, 0x72, 0x90, 0x55, 0xAC, 0x1C, 0xE7, 0x7F, 
+	0x7F, 0xA3, 0xE8, 0x21, 0xF0, 0x2D, 0x3E, 0x8A, 0xA3, 0xA2, 0xA2, 0x29, 0xEC, 0x36, 0x4B, 0x89, 
+	0x1C, 0xB6, 0xC1, 0xB9, 0x4A, 0x8F, 0x65, 0xDF, 0x97, 0x29, 0x0F, 0x0B, 0xB1, 0x61, 0x24, 0xA2, 
+	0xD2, 0x57, 0x7A, 0x99, 0xF7, 0x1D, 0xC8, 0xB4, 0xDD, 0xEE, 0x7A, 0xBE, 0x2E, 0x46, 0x9A, 0xF6, 
+	0x92, 0x13, 0xAC, 0x98, 0x64, 0x4C, 0xDD, 0x6B, 0x03, 0xD3, 0xF4, 0x14, 0xC9, 0x7D, 0xCE, 0x9B, 
+	0xF7, 0xD4, 0x80, 0xB1, 0x2A, 0x66, 0x33, 0xA4, 0xE2, 0x45, 0x99, 0x95, 0x77, 0xE1, 0x3E, 0x8A, 
+	0x43, 0x85, 0xD9, 0x79, 0x69, 0x0D, 0x55, 0xCF, 0x09, 0xF4, 0xFC, 0x07, 0x39, 0x20, 0x26, 0xB4, 
+	0x8B, 0xD0, 0x60, 0xFB, 0x42, 0x41, 0xEF, 0x02, 0x5F, 0x0D, 0xC7, 0x7F, 0x09, 0xFA, 0x26, 0x94, 
+	0x7A, 0xCD, 0xDE, 0x43, 0x86, 0x44, 0xD6, 0xC6, 0xB1, 0x77, 0x13, 0xB1, 0x08, 0xC9, 0xDD, 0x99, 
+	0xF0, 0xED, 0x7B, 0xB0, 0xAB, 0x31, 0x6D, 0x5B, 0x66, 0xA3, 0x53, 0xE2, 0x3B, 0x0F, 0x31, 0xA2, 
+	0x63, 0x6E, 0x05, 0xAD, 0xC6, 0x74, 0xC5, 0x2D, 0xB3, 0x79, 0xEB, 0x66, 0xF3, 0x6B, 0x79, 0x02, 
+	0x7A, 0x7D, 0x49, 0x59, 0x30, 0x04, 0x29, 0xD8, 0x5E, 0xF7, 0xF3, 0x6C, 0x5E, 0xC2, 0xA6, 0xFF, 
+	0x1B, 0x5A, 0xFE, 0x01, 0x54, 0x40, 0xEF, 0xA0, 0xD5, 0xDB, 0x47, 0xED, 0x2A, 0x9B, 0x85, 0x12, 
+	0x9F, 0x74, 0x5D, 0xB7, 0xA6, 0x80, 0x22, 0x34, 0x87, 0x81, 0x7E, 0x15, 0x87, 0x62, 0x03, 0x87, 
+	0x62, 0x6B, 0x85, 0xF1, 0x37, 0x55, 0x55, 0x31, 0x18, 0xBD, 0xEF, 0x57, 0x1D, 0x21, 0x5E, 0x87, 
+	0x37, 0x53, 0x61, 0x7B, 0xA5, 0x80, 0x71, 0x2C, 0x72, 0x83, 0x64, 0x73, 0xF2, 0x4C, 0xA0, 0x3F, 
+	0x4C, 0x3E, 0x21, 0xF3, 0x96, 0xBB, 0x9C, 0x05, 0xE1, 0x12, 0x47, 0xA2, 0x6E, 0xF6, 0x67, 0xFE, 
+	0x1B, 0x3F, 0x74, 0xA5, 0x6B, 0x2E, 0xB3, 0x77, 0x02, 0x64, 0x30, 0xAF, 0x6C, 0x64, 0x2E, 0x69, 
+	0x92, 0xA5, 0xD3, 0xA8, 0xEE, 0xEF, 0xB7, 0x89, 0xD9, 0x31, 0x1B, 0x61, 0xC8, 0x91, 0xF1, 0xC5, 
+	0x59, 0x7D, 0xCE, 0xDF, 0xFB, 0xF2, 0x10, 0xF7, 0x42, 0x02, 0xEC, 0x70, 0x2F, 0xE4, 0x02, 0xB4, 
+	0xFB, 0xA0, 0xFC, 0x83, 0x58, 0x68, 0xA2, 0x8E, 0x01, 0x8B, 0x10, 0xF6, 0x30, 0x86, 0xAA, 0x5A, 
+	0xC4, 0x95, 0x61, 0x02, 0x8E, 0xF2, 0xB7, 0x6B, 0x6C, 0x80, 0x5C, 0xCB, 0x11, 0x66, 0x97, 0x60, 
+	0x70, 0xD4, 0x06, 0xA9, 0xC7, 0x80, 0xE3, 0x2C, 0xA4, 0xE1, 0xAA, 0x34, 0x92, 0x13, 0x57, 0x05, 
+	0xF9, 0x70, 0xF3, 0xF4, 0x80, 0x73, 0xF2, 0x16, 0xDA, 0xBD, 0x39, 0x51, 0xD1, 0x40, 0xC1, 0x59, 
+	0x04, 0xCD, 0xE4, 0x79, 0x63, 0x24, 0x69, 0xC6, 0x99, 0x2F, 0x4D, 0x0D, 0x1C, 0x9C, 0x15, 0xED, 
+	0x41, 0x47, 0x12, 0x78, 0x6F, 0x8E, 0xFF, 0xA7, 0x34, 0xB8, 0x8B, 0x0C, 0x70, 0x96, 0x07, 0x0B, 
+	0x49, 0x42, 0x59, 0xFE, 0x5A, 0x08, 0x76, 0x36, 0x3D, 0x7D, 0xBA, 0x10, 0x1B, 0x11, 0xB4, 0x6B, 
+	0x1C, 0x59, 0x60, 0x02, 0x36, 0x30, 0xD9, 0xEC, 0xBA, 0xEE, 0x22, 0xFD, 0x0F, 0x2E, 0xA2, 0xE2, 
+	0x70, 0x9C, 0x0D, 0x18, 0x58, 0x88, 0x4A, 0x0D, 0xE7, 0x0E, 0xEF, 0xD8, 0x6F, 0xA7, 0x70, 0x12, 
+	0x9D, 0x06, 0x4C, 0x8C, 0xAD, 0x1A, 0x28, 0x01, 0xB6, 0x23, 0x53, 0x76, 0xDD, 0x3F, 0x17, 0x87, 
+	0x0B, 0xC1, 0xEB, 0x9C, 0x44, 0x67, 0x1B, 0x79, 0xE0, 0x67, 0xB2, 0x2A, 0x99, 0x72, 0xEB, 0x4C, 
+	0xB4, 0x17, 0x2E, 0xB5, 0xE8, 0x52, 0x1E, 0xCB, 0x3A, 0x3D, 0xF7, 0xF2, 0x21, 0xC7, 0xF1, 0x29, 
+	0x97, 0x22, 0x31, 0x2C, 0x39, 0x8A, 0xAF, 0x47, 0xF9, 0x3B, 0xA9, 0x8B, 0x2B, 0xEF, 0xE2, 0xF0, 
+	0x11, 0x59, 0xFC, 0xE4, 0x56, 0xFF, 0x4E, 0xA7, 0x92, 0xE5, 0xE5, 0x26, 0x16, 0xC8, 0x2C, 0x35, 
+	0xD2, 0x70, 0x9F, 0xAE, 0xA7, 0x08, 0x16, 0x2B, 0x64, 0xA1, 0xF6, 0xF3, 0xC1, 0x43, 0x27, 0x92, 
+	0x46, 0x4E, 0xA2, 0x01, 0x72, 0x18, 0x08, 0xAB, 0x22, 0x42, 0x1B, 0x9E, 0x35, 0xAE, 0xB3, 0xE6, 
+	0x42, 0x1B, 0x49, 0x31, 0xBB, 0xA4, 0xD0, 0xD6, 0x7A, 0xEB, 0xFE, 0x32, 0x37, 0x7F, 0xE6, 0x2F, 
+	0x75, 0x54, 0x1D, 0x88, 0x9F, 0x81, 0xEE, 0xF0, 0x97, 0xC9, 0x12, 0x80, 0x47, 0x5C, 0xCA, 0x3B, 
+	0x45, 0xF4, 0x63, 0xC3, 0x16, 0x2D, 0x7E, 0xCD, 0x80, 0xC2, 0xBA, 0x50, 0x1D, 0xC2, 0x31, 0x72, 
+	0xF0, 0x27, 0x97, 0xB0, 0xF4, 0x69, 0x43, 0x2B, 0x26, 0x89, 0x28, 0xFC, 0xBD, 0x03, 0x6A, 0x4A, 
+	0x22, 0x5D, 0xD3, 0x7D, 0xEC, 0xC8, 0xEC, 0x7B, 0x15, 0xFA, 0x05, 0x5D, 0x73, 0x6B, 0x5B, 0x1B, 
+	0xC9, 0x83, 0xD0, 0xFA, 0x24, 0xBA, 0x97, 0x11, 0x30, 0x04, 0xD3, 0x11, 0xCE, 0x24, 0xBD, 0x71, 
+	0xB7, 0xAA, 0xB2, 0xC2, 0x43, 0xC2, 0x67, 0x3B, 0x9C, 0x28, 0x62, 0x52, 0xF0, 0xFA, 0xCB, 0xFA, 
+	0xDF, 0x4F, 0xC9, 0x23, 0xD1, 0x94, 0xE1, 0x5F, 0x2A, 0xF2, 0xC7, 0x5F, 0x76, 0x6B, 0x86, 0x28, 
+	0x29, 0xF1, 0x54, 0x4F, 0x7A, 0x4D, 0xFD, 0xD0, 0x51, 0xFA, 0xBC, 0x6F, 0x7B, 0x44, 0xE5, 0xB0, 
+	0xF3, 0xC0, 0x34, 0x80, 0x6D, 0xE6, 0xDD, 0xCD, 0x7F, 0x67, 0x7B, 0x15, 0xC5, 0xE5, 0x14, 0x64, 
+	0x80, 0x81, 0xD9, 0x47, 0xCE, 0x71, 0x62, 0x94, 0xCE, 0x41, 0x61, 0xFA, 0xDD, 0x5A, 0x6D, 0xC1, 
+	0x28, 0x87, 0x39, 0xC4, 0xBC, 0x89, 0x3A, 0x99, 0x18, 0x80, 0xDC, 0x50, 0x72, 0xCF, 0x67, 0x4D, 
+	0x77, 0x6D, 0x6A, 0xB4, 0x17, 0x85, 0xD6, 0x2B, 0xC3, 0x4A, 0x7C, 0xD1, 0xF3, 0x0E, 0xA4, 0x8F, 
+	0x3B, 0xDA, 0x8A, 0x7B, 0x0A, 0x37, 0x7D, 0x36, 0xEC, 0x89, 0x87, 0xD9, 0x88, 0xB7, 0xC9, 0x1F, 
+	0xEB, 0xEE, 0x25, 0x46, 0xA9, 0x3B, 0x19, 0x16, 0x17, 0x2D, 0x0F, 0x8C, 0xEB, 0x19, 0xF3, 0x47, 
+	0xC7, 0x21, 0xA8, 0x1E, 0x7F, 0xC4, 0xE3, 0x6B, 0x96, 0x1D, 0x63, 0xDD, 0xC2, 0xEF, 0xB2, 0x65, 
+	0x60, 0x07, 0xE5, 0xD3, 0x48, 0x49, 0x9A, 0xF2, 0xB0, 0x76, 0x2D, 0xFB, 0x68, 0xF8, 0xAD, 0xE9, 
+	0x3C, 0x52, 0x37, 0x9A, 0xD1, 0xAE, 0x16, 0x37, 0x2E, 0xB3, 0x63, 0xE0, 0x66, 0xB1, 0x4D, 0x49, 
+	0x83, 0xD2, 0xEA, 0x20, 0xFD, 0x43, 0x84, 0x5B, 0x22, 0xBC, 0x0C, 0xA1, 0x85, 0x28, 0xF7, 0x45, 
+	0xF1, 0x2A, 0xC2, 0xFE, 0x87, 0x4C, 0xFC, 0x0A, 0x5B, 0xD9, 0x84, 0x7A, 0xAC, 0x8C, 0xBD, 0xDF, 
+	0xDC, 0xA5, 0xFC, 0xD0, 0x85, 0x65, 0xA2, 0x73, 0x1C, 0x7C, 0xFD, 0xF9, 0xBA, 0x1E, 0xBD, 0x5F, 
+	0x06, 0xE8, 0xFC, 0x62, 0xD1, 0xF7, 0x13, 0x52, 0xE3, 0xC2, 0xEB, 0xEE, 0x0E, 0x7E, 0x9D, 0x8A, 
+	0x19, 0x3E, 0xA2, 0x62, 0x06, 0xC5, 0xA1, 0xDC, 0x6B, 0x4A, 0x59, 0xA6, 0x57, 0x73, 0xCB, 0x57, 
+	0x16, 0x99, 0xFB, 0x93, 0x36, 0xDF, 0x0E, 0x1A, 0x38, 0xD4, 0x89, 0x02, 0x79, 0xB6, 0xA8, 0x52, 
+	0xCB, 0x2E, 0x96, 0xD4, 0xD8, 0x52, 0xA9, 0x7C, 0xE3, 0x97, 0x47, 0x6F, 0x6E, 0x82, 0x6D, 0x3A, 
+	0x01, 0x8F, 0x2F, 0x59, 0xDF, 0x93, 0xBA, 0x52, 0xC4, 0x46, 0xDA, 0xC5, 0x0C, 0x2E, 0x40, 0xB8, 
+	0x37, 0x55, 0x40, 0xB8, 0x13, 0xCD, 0x51, 0x96, 0xCE, 0x4A, 0x6C, 0x0D, 0xF9, 0x5A, 0xE6, 0x34, 
+	0x95, 0xF0, 0xFF, 0x54, 0x93, 0x05, 0x9D, 0x56, 0x94, 0xF7, 0x23, 0x90, 0x00, 0x44, 0xA7, 0xD9, 
+	0x86, 0x71, 0xB2, 0xFD, 0x58, 0x19, 0xBB, 0xEC, 0x6B, 0x90, 0x07, 0x2B, 0x7A, 0x20, 0x4B, 0xFD, 
+	0x0E, 0xB8, 0xF8, 0x00, 0x13, 0xC2, 0xF2, 0x32, 0x39, 0xED, 0x71, 0x59, 0x71, 0xC4, 0xDC, 0xE5, 
+	0xC2, 0xA9, 0x2B, 0x7B, 0x52, 0x00, 0xCB, 0x49, 0xB4, 0x00, 0xE6, 0x98, 0x13, 0xC1, 0x2F, 0x3A, 
+	0x19, 0x86, 0xD5, 0x74, 0xCD, 0xBC, 0xBA, 0x4C, 0x48, 0x00, 0x8E, 0x22, 0xD5, 0xAC, 0x11, 0xEF, 
+	0xC8, 0xCD, 0x99, 0xBA, 0xBC, 0x0F, 0xD4, 0xC0, 0xAE, 0x15, 0x2F, 0x82, 0x6D, 0x4D, 0x44, 0x10, 
+	0xF1, 0xF5, 0x55, 0xF0, 0x00, 0xAF, 0xEA, 0x96, 0x1F, 0xE6, 0xA6, 0x9A, 0x78, 0xDD, 0x6D, 0xD5, 
+	0xDF, 0xA4, 0x4D, 0xAE, 0x05, 0xEE, 0x12, 0x9F, 0x9B, 0x99, 0xAC, 0xE4, 0xBE, 0x9E, 0x56, 0xCC, 
+	0x4B, 0x6D, 0x26, 0xB9, 0x56, 0x9B, 0x9B, 0x52, 0x6D, 0x14, 0x28, 0x7D, 0xE8, 0x75, 0xCB, 0x59, 
+	0xC0, 0x50, 0x69, 0x6B, 0xD7, 0x68, 0x06, 0xA8, 0x38, 0xD1, 0xBB, 0xD9, 0xA3, 0x3D, 0xA1, 0xBD, 
+	0x7D, 0x9E, 0xD2, 0xB9, 0x5D, 0x35, 0x02, 0xE0, 0xD4, 0xAF, 0x66, 0x56, 0x7D, 0xF4, 0x88, 0x74, 
+	0x3C, 0x28, 0x2C, 0xBA, 0x20, 0xC1, 0x2A, 0x93, 0xA9, 0xBA, 0x90, 0xE8, 0xC2, 0xE9, 0x15, 0xC8, 
+	0x8F, 0xBD, 0x27, 0xDE, 0x21, 0xBF, 0x56, 0x69, 0x93, 0x72, 0x7E, 0xE4, 0xE7, 0x7D, 0xE8, 0x4D, 
+	0xBF, 0x24, 0xA2, 0x77, 0xC0, 0xE0, 0x30, 0xD9, 0xEE, 0x82, 0xCD, 0x21, 0x60, 0xFC, 0xD1, 0x6F, 
+	0xB4, 0x40, 0x01, 0xFE, 0xF4, 0x73, 0xAF, 0xBB, 0xF6, 0x2B, 0x41, 0xFC, 0xDE, 0x74, 0x78, 0xE5, 
+	0x7E, 0xAB, 0xC9, 0xED, 0x63, 0x4B, 0x3E, 0x1A, 0x27, 0xCD, 0xBF, 0x85, 0xA4, 0x70, 0x92, 0x36, 
+	0x56, 0x70, 0x4A, 0xEE, 0x45, 0xAB, 0x33, 0x0A, 0x76, 0xB8, 0x0B, 0xEA, 0x55, 0xC7, 0x4E, 0xD7, 
+	0xD9, 0xC7, 0x10, 0x8D, 0x09, 0xFA, 0x10, 0x30, 0x62, 0x20, 0xE5, 0xBC, 0xFB, 0x74, 0x72, 0xA6, 
+	0x77, 0xB5, 0xBB, 0xD7, 0xD6, 0x60, 0x3A, 0x6B, 0x5D, 0xF5, 0x35, 0xF4, 0x84, 0xA0, 0x19, 0x49, 
+	0x36, 0x00, 0xC9, 0x35, 0xCC, 0xF7, 0xFE, 0x92, 0xF9, 0x4B, 0x8B, 0xB3, 0xBE, 0x98, 0xBF, 0xF4, 
+	0x25, 0xB1, 0x62, 0x4D, 0x41, 0xA0, 0xF7, 0x36, 0x6C, 0x86, 0x3C, 0x4F, 0xC4, 0xF8, 0xF2, 0xFC, 
+	0xE6, 0x34, 0x30, 0x95, 0x32, 0x9D, 0xE5, 0x85, 0x70, 0xD8, 0xB8, 0xD6, 0xD9, 0x42, 0xB9, 0x05, 
+	0x6E, 0x4B, 0x6F, 0x29, 0x33, 0x8E, 0xE4, 0x31, 0x3C, 0x21, 0x7B, 0x19, 0x31, 0x97, 0xD5, 0x62, 
+	0x6B, 0xF6, 0x98, 0x3C, 0xA5, 0x54, 0x18, 0x16, 0x03, 0x49, 0x51, 0x1F, 0x13, 0x37, 0xFB, 0x18, 
+	0x9D, 0xCF, 0x16, 0x43, 0x34, 0x7D, 0xB6, 0x5C, 0x9E, 0x74, 0x4D, 0x66, 0x23, 0x99, 0xDE, 0x6E, 
+	0x57, 0xFE, 0x47, 0x0D, 0x3B, 0x59, 0x3F, 0x01, 0x79, 0x75, 0x0D, 0x78, 0x62, 0x4A, 0xA5, 0xF2, 
+	0xF8, 0xD6, 0xAE, 0x11, 0x85, 0x88, 0x13, 0x98, 0x07, 0x0B, 0x92, 0x99, 0xC6, 0x9F, 0x85, 0x24, 
+	0xB1, 0x48, 0xEF, 0x59, 0x11, 0xCB, 0xAB, 0x92, 0xE4, 0x58, 0x50, 0xAA, 0xE8, 0x97, 0xD5, 0xCD, 
+	0x63, 0x57, 0x61, 0x62, 0x06, 0xBD, 0x26, 0x08, 0x0E, 0xC6, 0x42, 0x98, 0x8E, 0x82, 0x13, 0xD7, 
+	0xB8, 0x18, 0x7B, 0xAA, 0xFD, 0x42, 0x51, 0x07, 0xDE, 0x6F, 0xCF, 0xE7, 0x87, 0xF6, 0xBF, 0x15, 
+	0x8D, 0x8E, 0xFD, 0xA9, 0x4A, 0x45, 0x81, 0x57, 0x8F, 0x22, 0x4D, 0x63, 0x21, 0x4E, 0x41, 0x3C, 
+	0xCD, 0x77, 0xF5, 0xEC, 0xB8, 0x15, 0x8A, 0xBC, 0x69, 0x22, 0x98, 0xE5, 0xA4, 0x66, 0x47, 0xC5, 
+	0x9F, 0xE9, 0x9D, 0x06, 0xD8, 0xD2, 0x37, 0xA0, 0x4C, 0xDC, 0x33, 0xD4, 0xE7, 0xED, 0x77, 0x7D, 
+	0xA2, 0x20, 0x81, 0xB2, 0x46, 0xC5, 0xF6, 0xF5, 0x2A, 0x76, 0x50, 0xAF, 0xC2, 0x5A, 0xC7, 0x8F, 
+	0xD8, 0x3C, 0x4F, 0x2F, 0xE3, 0x56, 0x04, 0xB2, 0x6C, 0x8C, 0x0D, 0x84, 0xD7, 0xE0, 0xB5, 0x45, 
+	0xB2, 0x93, 0x34, 0xA0, 0xC2, 0xF4, 0x3A, 0x28, 0xDC, 0x50, 0xE8, 0xF3, 0xF0, 0x7C, 0x67, 0x1A, 
+	0x11, 0xD7, 0x8D, 0xB2, 0x71, 0x3D, 0xB3, 0x68, 0x49, 0x19, 0x29, 0x54, 0xDF, 0x44, 0xB9, 0x48, 
+	0xDD, 0x9E, 0xCE, 0xCD, 0x2D, 0x69, 0xB6, 0x18, 0xAD, 0xBC, 0xDC, 0xDF, 0x1F, 0x48, 0x04, 0x16, 
+	0xD6, 0x3A, 0x39, 0x7E, 0x30, 0xDB, 0x9D, 0xE1, 0x14, 0xF2, 0x5F, 0xDB, 0x1D, 0xBB, 0x7F, 0x4F, 
+	0x49, 0xBF, 0x4D, 0x2B, 0x9B, 0x5C, 0x7E, 0xA8, 0x1B, 0x79, 0x4F, 0x29, 0xA2, 0xF8, 0xBA, 0x36, 
+	0x86, 0x10, 0xFA, 0x7C, 0x45, 0x99, 0xE9, 0xD1, 0xDB, 0x93, 0xDB, 0x2A, 0xD5, 0xA8, 0x61, 0x48, 
+	0xBA, 0xD9, 0x40, 0xD7, 0xAE, 0xE5, 0x35, 0xAA, 0xF0, 0xA5, 0xFD, 0xC5, 0x64, 0x0B, 0x31, 0xA5, 
+	0x9D, 0x83, 0x31, 0xF6, 0xB8, 0xB5, 0x18, 0x3E, 0xB4, 0x2A, 0x8E, 0x70, 0x7A, 0xB8, 0xAC, 0xB5, 
+	0x92, 0xDD, 0x12, 0xA7, 0x9D, 0x41, 0xB1, 0x16, 0xE8, 0x45, 0x63, 0x1B, 0xB9, 0x73, 0xF1, 0x19, 
+	0xF6, 0xAE, 0x0F, 0xF3, 0xF7, 0x60, 0xED, 0x27, 0x70, 0x12, 0x8C, 0x12, 0x3A, 0xCF, 0xA6, 0xDC, 
+	0xBD, 0x17, 0x82, 0x05, 0x6E, 0x10, 0x04, 0xD4, 0xE7, 0x10, 0x9B, 0x83, 0x55, 0xB0, 0xED, 0x1B, 
+	0xF9, 0x7D, 0x75, 0x8E, 0xB2, 0x26, 0xA7, 0xBD, 0xE2, 0x0F, 0x29, 0x25, 0x6C, 0xFD, 0xC9, 0xC4, 
+	0x72, 0xE1, 0x1C, 0xDC, 0x9E, 0xBE, 0x69, 0xB5, 0xE8, 0x31, 0x83, 0x03, 0x5A, 0xEA, 0xA3, 0x52, 
+	0xD7, 0x51, 0x8A, 0x76, 0xB8, 0x83, 0xF0, 0x5E, 0xDC, 0xFC, 0xED, 0x80, 0x36, 0x7A, 0x39, 0xC6, 
+	0xFC, 0xF3, 0xC3, 0xE1, 0x5D, 0x15, 0x05, 0x30, 0xF6, 0x74, 0x93, 0x45, 0xB5, 0x2B, 0x0B, 0x63, 
+	0x2E, 0xF1, 0x24, 0x4B, 0x16, 0xD9, 0x61, 0xDB, 0x97, 0x9A, 0xC8, 0xFF, 0xCE, 0x74, 0xE9, 0x39, 
+	0x93, 0x00, 0xF8, 0xE0, 0x50, 0x62, 0x07, 0x0A, 0x6B, 0xB4, 0xBA, 0x2B, 0x61, 0x09, 0x25, 0x58, 
+	0x18, 0x0A, 0xB8, 0xDA, 0x8D, 0xFA, 0x8C, 0x4A, 0x41, 0xBE, 0xA4, 0x51, 0x9B, 0x83, 0x14, 0xC4, 
+	0xB5, 0x81, 0xB0, 0xA1, 0x35, 0x48, 0x34, 0xEB, 0xAF, 0x74, 0xF4, 0x61, 0xC5, 0x00, 0x39, 0x7D, 
+	0xAD, 0xF1, 0x07, 0x9C, 0x43, 0x20, 0x8F, 0x4B, 0x3D, 0xD3, 0x7C, 0x91, 0x1D, 0xC3, 0x3B, 0x06, 
+	0x50, 0x59, 0xA9, 0xC9, 0xA3, 0x23, 0xC9, 0xA6, 0x8A, 0x29, 0x84, 0x0D, 0x7D, 0xEE, 0x56, 0x5D, 
+	0xA1, 0xB6, 0xA3, 0xE7, 0x1F, 0x2A, 0xFB, 0x95, 0x7B, 0xFC, 0x9F, 0x9A, 0x18, 0xEA, 0xFF, 0xFD, 
+	0x61, 0x75, 0x3A, 0xF2, 0x22, 0xFF, 0xEB, 0xA2, 0x7C, 0x5A, 0x16, 0xB1, 0xE9, 0x93, 0xB0, 0x4D, 
+	0xA7, 0xA4, 0xB0, 0xAF, 0x70, 0x8C, 0x7E, 0x7D, 0xE8, 0x4F, 0xAA, 0x9D, 0x81, 0xD6, 0xF8, 0xB5, 
+	0xB6, 0x32, 0xA5, 0x31, 0xA1, 0x55, 0x11, 0x3A, 0x01, 0x13, 0x38, 0x3A, 0x41, 0x7A, 0x79, 0x31, 
+	0x3C, 0x13, 0xF5, 0x2C, 0x97, 0x28, 0xBD, 0x1F, 0x2E, 0x68, 0xAB, 0xA1, 0x52, 0x5F, 0xBB, 0x2A, 
+	0xCB, 0x11, 0xFE, 0x4A, 0x34, 0x30, 0xCD, 0xDD, 0x38, 0xAC, 0xED, 0xD0, 0x53, 0xC6, 0xC4, 0x33, 
+	0xE5, 0x17, 0x41, 0xC8, 0x7D, 0x14, 0x9C, 0x8C, 0x2D, 0x59, 0x61, 0xB1, 0xEC, 0x6A, 0x48, 0xAD, 
+	0xC7, 0x42, 0x79, 0x9B, 0x63, 0xDB, 0xB0, 0xAD, 0xAF, 0x44, 0x85, 0x2E, 0x24, 0x11, 0xE6, 0x1E, 
+	0x56, 0xB2, 0x1B, 0x2E, 0x98, 0x7E, 0x64, 0x3D, 0x98, 0x69, 0x51, 0x05, 0x3D, 0x5C, 0x0A, 0x85, 
+	0xCA, 0x58, 0x0E, 0x11, 0x86, 0xA7, 0xD6, 0xAC, 0xFF, 0x21, 0x12, 0x9F, 0xA1, 0x52, 0xE4, 0xD9, 
+	0xD5, 0xAC, 0x9B, 0xE2, 0x4B, 0xF0, 0x57, 0xFA, 0xFC, 0x05, 0x84, 0xB6, 0xD9, 0xB0, 0xCE, 0x5E, 
+	0xA0, 0x73, 0x32, 0xCE, 0x15, 0x29, 0xE8, 0x8F, 0xC4, 0xD9, 0x22, 0x3A, 0x9D, 0x71, 0xC5, 0x37, 
+	0x2B, 0x33, 0x76, 0x63, 0x49, 0x52, 0x8A, 0x2E, 0x89, 0x6D, 0x5A, 0x04, 0x83, 0xC1, 0xD9, 0x46, 
+	0xC3, 0x5C, 0x93, 0x6C, 0x3B, 0xDB, 0xFC, 0x1C, 0xC1, 0x65, 0x3B, 0x2C, 0xAD, 0xD5, 0x78, 0x9A, 
+	0x3A, 0xE4, 0xC3, 0x04, 0x11, 0xD8, 0xBD, 0x63, 0xA9, 0x93, 0x01, 0xF1, 0x42, 0x89, 0x5E, 0x66, 
+	0x95, 0xF2, 0x75, 0x38, 0x30, 0x4B, 0x39, 0x41, 0x49, 0x54, 0x8E, 0x12, 0x36, 0xFB, 0x9A, 0xA0, 
+	0x61, 0x13, 0x1C, 0xC2, 0xB2, 0x30, 0x7E, 0xD5, 0x22, 0xEB, 0xA3, 0xB6, 0x69, 0x2E, 0x0F, 0x0B, 
+	0xB0, 0x29, 0xF3, 0x24, 0x5A, 0x29, 0xA6, 0x3F, 0xC9, 0xC1, 0x56, 0xC5, 0x8E, 0xAA, 0x0B, 0x17, 
+	0x44, 0xBC, 0xFF, 0xE3, 0x12, 0xB8, 0x3E, 0xA9, 0x16, 0xF9, 0x7F, 0x57, 0x92, 0x7C, 0x0C, 0xFD, 
+	0x87, 0x9D, 0x70, 0xED, 0x81, 0xD0, 0x77, 0x01, 0x77, 0x71, 0xF5, 0x6C, 0x7F, 0xCC, 0xE4, 0xF0, 
+	0xAD, 0x27, 0x66, 0x2D, 0x16, 0x7B, 0x4E, 0x95, 0xF9, 0x59, 0xAA, 0x8A, 0x83, 0xE3, 0x1E, 0xD9, 
+	0x6E, 0x9C, 0x84, 0xEB, 0xBD, 0x5B, 0x33, 0x68, 0xA9, 0x3F, 0xDA, 0x69, 0xCB, 0xF1, 0xC7, 0x64, 
+	0x99, 0x27, 0xEF, 0xFF, 0xE2, 0x37, 0x34, 0x2D, 0x3C, 0x92, 0xAF, 0x7B, 0xE6, 0x6D, 0x7E, 0xF9, 
+	0xD2, 0x95, 0x14, 0xF1, 0x01, 0x93, 0xF2, 0xBD, 0xDF, 0x59, 0x67, 0xF6, 0x2D, 0x36, 0xBB, 0x8E, 
+	0x16, 0xCA, 0x07, 0xEC, 0x34, 0xA0, 0xE2, 0x16, 0x6C, 0xEC, 0x23, 0x41, 0x87, 0x7A, 0x66, 0x82, 
+	0x09, 0x6A, 0xFE, 0x21, 0xB3, 0x9A, 0xC7, 0x12, 0x0D, 0x07, 0xEB, 0xCF, 0xCB, 0x44, 0x9B, 0xA3, 
+	0xA1, 0xD9, 0x07, 0x76, 0x1D, 0x93, 0x96, 0x1B, 0x6D, 0xA1, 0x65, 0x6D, 0xB2, 0x62, 0x81, 0x55, 
+	0xFD, 0xE1, 0x76, 0xF2, 0x6F, 0x9A, 0x71, 0x9F, 0xFC, 0x48, 0x8D, 0x58, 0x1D, 0x3E, 0xFE, 0xBC, 
+	0x02, 0xB5, 0x36, 0xEE, 0x58, 0x35, 0x82, 0xF3, 0x51, 0x93, 0x35, 0x7E, 0xFA, 0xAF, 0x7E, 0x56, 
+	0x7E, 0xE8, 0x59, 0x7E, 0x90, 0x73, 0x9B, 0x0E, 0x4D, 0x0D, 0x84, 0x75, 0x30, 0x29, 0xCA, 0xE7, 
+	0x2C, 0xB3, 0xAC, 0x53, 0x3C, 0xC3, 0x7D, 0x55, 0xCD, 0xE0, 0xB9, 0xF8, 0x44, 0x02, 0xF2, 0x2B, 
+	0xB7, 0xD1, 0x83, 0x75, 0xDC, 0x96, 0xE7, 0x62, 0x5A, 0x58, 0x63, 0x2D, 0xC1, 0x33, 0xD2, 0x74, 
+	0x27, 0x05, 0xFD, 0xB7, 0x69, 0x63, 0x34, 0x81, 0xDB, 0xC1, 0x24, 0x10, 0x3A, 0xC2, 0xE2, 0xE9, 
+	0x75, 0xF8, 0x90, 0x50, 0x3A, 0x3C, 0xAF, 0xCD, 0x4E, 0x78, 0xB0, 0xFA, 0x5F, 0x2C, 0x09, 0x90, 
+	0xFE, 0xDA, 0xE4, 0x99, 0x8E, 0x3E, 0x63, 0x74, 0x3C, 0x6C, 0xD6, 0xC5, 0x2A, 0x1A, 0xBD, 0x95, 
+	0xA3, 0xAB, 0xF3, 0xEF, 0x1E, 0x95, 0x02, 0x8E, 0xCB, 0x23, 0xED, 0x11, 0xDB, 0x42, 0x45, 0xD5, 
+	0x5D, 0xDF, 0xF6, 0xE5, 0x98, 0xB4, 0x46, 0x49, 0x1A, 0xC6, 0x87, 0xFC, 0xA1, 0x79, 0x15, 0xD8, 
+	0x84, 0x99, 0xFE, 0x0B, 0x33, 0x30, 0x21, 0xA7, 0x59, 0x0A, 0x35, 0xE6, 0x68, 0x62, 0x55, 0x58, 
+	0xB4, 0x74, 0xDC, 0x80, 0xA4, 0xAD, 0x97, 0x57, 0x08, 0x9D, 0xC9, 0x9C, 0x1C, 0x0E, 0xD6, 0xE5, 
+	0xE3, 0xC8, 0x13, 0x02, 0xA8, 0xB9, 0x06, 0x27, 0x55, 0x89, 0xE7, 0xA3, 0xBF, 0xB0, 0xA6, 0xD0, 
+	0x92, 0xAD, 0xDA, 0xFE, 0x9E, 0x38, 0x2B, 0x88, 0x18, 0x7E, 0x3E, 0x90, 0xC3, 0xC0, 0x90, 0xAB, 
+	0x10, 0x21, 0x49, 0x47, 0xD1, 0x9D, 0x0A, 0xE9, 0x9F, 0xF9, 0xBB, 0x44, 0x83, 0x43, 0xBE, 0xBB, 
+	0x72, 0xD3, 0x06, 0xB4, 0x1B, 0x11, 0x03, 0xB8, 0xF5, 0xE5, 0x85, 0x1C, 0x4D, 0x7B, 0x0E, 0x65, 
+	0x33, 0xB0, 0x06, 0xD4, 0x58, 0x1F, 0xC9, 0x52, 0x27, 0xAD, 0xC9, 0xDE, 0x33, 0x4D, 0xC5, 0x45, 
+	0x6F, 0x11, 0xE1, 0x1D, 0xB9, 0x26, 0xED, 0x5B, 0x9B, 0xF6, 0xFC, 0x87, 0xF7, 0x96, 0x58, 0x5D, 
+	0xD7, 0x10, 0x15, 0x59, 0x1E, 0x3C, 0xFC, 0xF2, 0x8C, 0x7B, 0xB8, 0x70, 0x35, 0xD2, 0xB3, 0xA2, 
+	0xF1, 0xE7, 0x9D, 0xC6, 0xAE, 0x37, 0x71, 0xDA, 0x04, 0x32, 0x09, 0x33, 0xF7, 0x7D, 0x45, 0x33, 
+	0x9F, 0x5C, 0xD6, 0x66, 0xEC, 0x68, 0xCA, 0xEC, 0xBF, 0x4C, 0xF8, 0xA1, 0x4D, 0x5C, 0x41, 0x0E, 
+	0x69, 0x1F, 0x96, 0xE8, 0xD9, 0x76, 0xB9, 0xEA, 0x04, 0xEF, 0x91, 0xD4, 0xD7, 0x36, 0xEF, 0xE9, 
+	0xE6, 0x7B, 0x81, 0x31, 0xFD, 0x4E, 0x15, 0x17, 0xF1, 0x25, 0x86, 0x4C, 0x94, 0x2A, 0xAA, 0x50, 
+	0xB0, 0x98, 0x19, 0xB4, 0x34, 0x81, 0xE2, 0x61, 0xE6, 0xEE, 0x9C, 0x70, 0x72, 0x38, 0xB8, 0xE8, 
+	0xA6, 0xE1, 0x9F, 0x24, 0xDC, 0xD2, 0x9D, 0xC3, 0x94, 0x43, 0x65, 0x5B, 0x22, 0x45, 0xF2, 0x75, 
+	0x33, 0x6D, 0xB9, 0x60, 0xC6, 0x9F, 0x0A, 0xC1, 0x1F, 0xFC, 0x8B, 0x7B, 0xAB, 0x71, 0x61, 0xAE, 
+	0xD2, 0x1B, 0xF6, 0x79, 0x3D, 0x63, 0x1F, 0x4F, 0x1C, 0xDD, 0x4B, 0x50, 0x02, 0x97, 0xCD, 0xF4, 
+	0xC7, 0x0B, 0xFC, 0xB3, 0xD1, 0x21, 0xD3, 0x73, 0x1B, 0x4B, 0xE8, 0x9F, 0x3D, 0x16, 0x88, 0x0E, 
+	0x7F, 0xCC, 0x26, 0xA6, 0xF5, 0x8F, 0x69, 0x7F, 0xAC, 0xE8, 0x3F, 0x7B, 0x29, 0x81, 0xDA, 0x14, 
+	0x8F, 0x98, 0x78, 0x11, 0x34, 0x46, 0x60, 0xAD, 0x9E, 0xB3, 0x69, 0xFD, 0x74, 0x95, 0x3A, 0x14, 
+	0x30, 0xBE, 0x34, 0xE2, 0xAC, 0x54, 0x81, 0x70, 0x1F, 0x47, 0xD7, 0x5A, 0xDE, 0x81, 0x29, 0x17, 
+	0x9B, 0x3F, 0xC7, 0x57, 0x56, 0x26, 0xCD, 0xF8, 0x3B, 0x4E, 0x94, 0x4E, 0xA4, 0x09, 0x46, 0x1A, 
+	0x6D, 0xA3, 0x44, 0x51, 0xA9, 0x9F, 0x97, 0x88, 0x5E, 0x5E, 0x70, 0xCA, 0xDE, 0xA4, 0xAF, 0x6D, 
+	0xBC, 0xCE, 0xF6, 0x67, 0x81, 0x10, 0xD3, 0xF5, 0xB8, 0xC9, 0x49, 0xF3, 0x98, 0x71, 0x2D, 0x29, 
+	0xBD, 0x34, 0x08, 0x25, 0x1B, 0x9A, 0x6F, 0xC3, 0x4D, 0xC3, 0x9F, 0x5E, 0xE2, 0xA2, 0xF3, 0x82, 
+	0x52, 0xA9, 0xF6, 0x79, 0x14, 0x6F, 0xD0, 0x12, 0xB6, 0x0D, 0x4C, 0xAC, 0x3E, 0x2A, 0x8C, 0x86, 
+	0xE1, 0xFF, 0x1C, 0x49, 0x43, 0xF2, 0x1D, 0x34, 0xA3, 0x0F, 0xA3, 0x9B, 0x2C, 0xF3, 0x9C, 0xFC, 
+	0x23, 0x4B, 0xE0, 0xCB, 0xE6, 0xBE, 0x7E, 0x8B, 0x51, 0x2D, 0x32, 0x92, 0xCC, 0xC6, 0xDB, 0x36, 
+	0x1B, 0x83, 0x80, 0x64, 0xD2, 0x23, 0x1C, 0x60, 0x90, 0x1C, 0x71, 0x06, 0x0F, 0x30, 0xC0, 0xDF, 
+	0xFE, 0xF7, 0x50, 0x5A, 0xF8, 0x9C, 0x97, 0x29, 0xFB, 0x7B, 0xEB, 0x91, 0x6A, 0x42, 0xE4, 0xAB, 
+	0x62, 0xB4, 0x1F, 0x14, 0xEC, 0x1A, 0x9F, 0xC4, 0x98, 0x77, 0x85, 0x8B, 0xF1, 0x15, 0x2B, 0x2C, 
+	0x3F, 0xAB, 0x3A, 0x5E, 0xD3, 0x50, 0x32, 0xDD, 0x23, 0x81, 0x89, 0x3B, 0xB8, 0xFD, 0x49, 0x78, 
+	0xA9, 0x35, 0x20, 0x2D, 0xBC, 0xFC, 0x10, 0x8A, 0x08, 0xA0, 0x57, 0x24, 0xFA, 0x29, 0xD3, 0x9C, 
+	0xC0, 0xC5, 0x06, 0xF2, 0x7D, 0xC4, 0x45, 0x38, 0x1F, 0xC6, 0xE4, 0xC8, 0x23, 0x65, 0xD2, 0x5A, 
+	0xE5, 0xCD, 0x63, 0x14, 0x56, 0x03, 0xAA, 0x29, 0x82, 0xAB, 0x67, 0x92, 0x2C, 0x71, 0x67, 0x6A, 
+	0x36, 0xF9, 0xE1, 0x89, 0xD2, 0x98, 0x88, 0x97, 0x65, 0x72, 0xE4, 0x3C, 0x5A, 0x1D, 0xB7, 0x34, 
+	0x4D, 0x01, 0x91, 0x5D, 0xC4, 0xAF, 0x88, 0x2F, 0xD1, 0x27, 0x26, 0x36, 0x16, 0x98, 0x39, 0x9A, 
+	0xEA, 0xFA, 0xDF, 0x3B, 0x7F, 0xD8, 0x76, 0x95, 0xDB, 0x03, 0x82, 0x86, 0xD0, 0x6D, 0x15, 0xD0, 
+	0xF0, 0xB9, 0xCC, 0xB9, 0xD6, 0xE1, 0x9C, 0xC7, 0xAE, 0x3C, 0xA8, 0xB9, 0x49, 0xA3, 0xC4, 0xB3, 
+	0x24, 0x3A, 0xA3, 0x50, 0x7E, 0xDF, 0xBE, 0x5F, 0xAF, 0xC3, 0x7C, 0x3C, 0xC7, 0x39, 0xD9, 0x29, 
+	0x06, 0xD5, 0x0B, 0xE8, 0xFA, 0x80, 0xC2, 0xCE, 0xA8, 0xD9, 0x20, 0xCE, 0x28, 0x0A, 0xDE, 0x15, 
+	0xB5, 0x0D, 0x9A, 0xB8, 0xB0, 0x7B, 0x33, 0xB8, 0x35, 0xEB, 0x4E, 0xDE, 0xF5, 0x9F, 0x66, 0x79, 
+	0x52, 0x44, 0xD2, 0x49, 0x3A, 0x94, 0xE2, 0xCB, 0x83, 0x22, 0x7D, 0xC6, 0x1C, 0xEB, 0x44, 0x28, 
+	0xE9, 0x38, 0x8F, 0xB7, 0xF6, 0x3D, 0x39, 0x8F, 0x64, 0x9F, 0x86, 0x85, 0x27, 0x7E, 0xBF, 0xD8, 
+	0xC3, 0x8B, 0x70, 0xF9, 0x7A, 0xE6, 0x19, 0xAF, 0xA8, 0x8F, 0x6C, 0x38, 0xE2, 0xB4, 0x1E, 0xF3, 
+	0xDD, 0xFD, 0x6C, 0xB4, 0x04, 0xB4, 0xD1, 0x37, 0xF4, 0x59, 0xFF, 0x5A, 0x8B, 0x73, 0x6B, 0x62, 
+	0x6C, 0x91, 0x23, 0x96, 0x61, 0xEC, 0x9F, 0xF6, 0x83, 0x18, 0xD9, 0xEE, 0xEF, 0x00, 0xB0, 0xEB, 
+	0x8D, 0xC6, 0x35, 0xCE, 0xB4, 0xE0, 0xBB, 0x84, 0xD3, 0xD7, 0xDB, 0x77, 0x4A, 0x07, 0xE7, 0x3B, 
+	0xF7, 0x12, 0xF8, 0x9D, 0xF5, 0x0A, 0xDF, 0xF4, 0x1B, 0x00, 0x1A, 0x77, 0xD9, 0x03, 0x21, 0xC2, 
+	0x46, 0xF7, 0x7E, 0x4B, 0xE2, 0xC1, 0xF1, 0x8D, 0xFE, 0x61, 0xB9, 0xD4, 0x0B, 0xC9, 0x65, 0x82, 
+	0xCF, 0x7F, 0x3D, 0x24, 0x9E, 0xC9, 0x97, 0x30, 0xE9, 0x81, 0xB4, 0x6B, 0xA5, 0x6A, 0xA7, 0xED, 
+	0xE3, 0x8F, 0x88, 0x09, 0x78, 0x36, 0x6A, 0x14, 0xB9, 0xBB, 0x93, 0xE6, 0xA2, 0x07, 0x72, 0x81, 
+	0xD2, 0x41, 0x75, 0x28, 0x50, 0x57, 0xDE, 0x68, 0x04, 0xB1, 0x0F, 0x1F, 0xCF, 0x0F, 0x3E, 0xCB, 
+	0x44, 0x3D, 0x2A, 0x01, 0xC1, 0x38, 0x61, 0x8E, 0xA1, 0x13, 0xB8, 0x82, 0x3F, 0xAC, 0xA7, 0x31, 
+	0x7B, 0xF7, 0xA7, 0xCD, 0xBF, 0x15, 0xD3, 0xC2, 0xCC, 0xDC, 0xD0, 0xB2, 0xC1, 0x44, 0xBA, 0x82, 
+	0x85, 0x2D, 0x59, 0x53, 0xE4, 0xBE, 0x6B, 0x69, 0x8F, 0x5C, 0x20, 0x38, 0x76, 0xE0, 0x49, 0x59, 
+	0x32, 0x0A, 0x90, 0x42, 0x13, 0x35, 0x24, 0x71, 0xD9, 0x98, 0x9A, 0x0F, 0x0A, 0x83, 0x90, 0x47, 
+	0xD0, 0x57, 0x29, 0xC8, 0xF5, 0x5B, 0xA8, 0x5D, 0x41, 0xCD, 0x61, 0x98, 0x5C, 0x28, 0x1B, 0xF2, 
+	0x9B, 0x31, 0x3F, 0x14, 0x79, 0x37, 0xEA, 0xDD, 0x42, 0xD3, 0x59, 0x20, 0x0D, 0x5A, 0x3D, 0x59, 
+	0x84, 0x1A, 0x48, 0x28, 0x6D, 0x48, 0x3B, 0x0C, 0x87, 0xB0, 0xBB, 0xEF, 0x72, 0x91, 0x85, 0xE0, 
+	0x9A, 0x2C, 0x78, 0xAF, 0xFE, 0x0D, 0x6D, 0x9A, 0x99, 0x10, 0x16, 0x7D, 0x42, 0x76, 0xA0, 0xAA, 
+	0xC7, 0xF9, 0x11, 0x5C, 0x04, 0x83, 0x0A, 0xA9, 0x48, 0x65, 0x28, 0x81, 0x65, 0x2E, 0xA7, 0x5A, 
+	0xFE, 0xDB, 0x10, 0x56, 0xEA, 0x19, 0x67, 0xC2, 0x61, 0xBB, 0x9B, 0x6B, 0x48, 0x4F, 0x22, 0x4C, 
+	0xB7, 0xEC, 0x15, 0x84, 0x08, 0x1A, 0xFE, 0x08, 0x46, 0xCA, 0x72, 0x10, 0x30, 0x81, 0xAE, 0xE7, 
+	0x1B, 0xAA, 0x2F, 0x1B, 0x22, 0x6A, 0x89, 0x95, 0x34, 0x9F, 0x53, 0xE4, 0xDA, 0x0B, 0x1B, 0x56, 
+	0xB4, 0xB7, 0x71, 0x99, 0xB8, 0x77, 0x91, 0xEB, 0x59, 0x61, 0x71, 0x84, 0xAF, 0x55, 0xBD, 0x33, 
+	0x1C, 0xD9, 0x7A, 0x40, 0xD3, 0x7B, 0x6C, 0xB0, 0xA4, 0x96, 0x07, 0x57, 0x49, 0x9C, 0xC1, 0x0B, 
+	0x23, 0xF3, 0xE5, 0x36, 0xA4, 0xE8, 0xE1, 0xEC, 0x51, 0xF1, 0xBB, 0x7B, 0x40, 0x4B, 0x05, 0xD1, 
+	0x3D, 0xD6, 0x6D, 0x22, 0x7C, 0x9D, 0x51, 0x28, 0x70, 0xF6, 0xB3, 0x0C, 0x6F, 0xB2, 0xE1, 0xBC, 
+	0xFF, 0xB8, 0xA3, 0x92, 0x7C, 0x0A, 0xA3, 0x36, 0x6D, 0xF8, 0xFC, 0x27, 0x45, 0x58, 0x94, 0xE0, 
+	0x0A, 0x90, 0xF8, 0x2A, 0xF3, 0x02, 0xA4, 0x98, 0xD8, 0xEF, 0x1C, 0x53, 0xE2, 0x47, 0xC7, 0x20, 
+	0xB2, 0x6F, 0xB7, 0x39, 0x5A, 0xA9, 0x49, 0xC2, 0x65, 0x18, 0x50, 0xBD, 0x7F, 0xB0, 0xDE, 0xBB, 
+	0x2F, 0x56, 0xDD, 0x62, 0x85, 0xAC, 0x3B, 0x7E, 0xCD, 0x00, 0x88, 0x7A, 0x22, 0xC5, 0x03, 0x03, 
+	0x26, 0xC4, 0x27, 0x09, 0xE8, 0x16, 0x36, 0xB7, 0x0B, 0xDF, 0xDA, 0x21, 0xEB, 0x59, 0xE8, 0x6D, 
+	0x96, 0x2D, 0x18, 0x89, 0xD4, 0x4E, 0x5A, 0x66, 0x63, 0x31, 0x15, 0xF0, 0x48, 0x50, 0x7A, 0xF3, 
+	0xA7, 0x82, 0xE0, 0x91, 0x04, 0xB2, 0x16, 0xAC, 0xA1, 0xD4, 0xC1, 0xE4, 0xBD, 0xC9, 0x43, 0x83, 
+	0xD9, 0x18, 0x11, 0x50, 0xC0, 0x93, 0x9D, 0x6B, 0x17, 0x63, 0xC8, 0xA3, 0xAF, 0xAC, 0xBF, 0x29, 
+	0x65, 0xA6, 0x4A, 0xE4, 0xCD, 0xE2, 0x89, 0x59, 0xF8, 0x96, 0xF8, 0x3B, 0x80, 0xCA, 0x68, 0xF2, 
+	0xBF, 0xBE, 0xFD, 0xD0, 0x84, 0x88, 0xE3, 0x3D, 0x08, 0x8A, 0x08, 0x39, 0xDC, 0x88, 0x71, 0x61, 
+	0x76, 0xAD, 0xB6, 0xBE, 0xC0, 0xA4, 0x28, 0xEE, 0x38, 0x8F, 0x2E, 0x8D, 0x3A, 0x28, 0xAE, 0xEB, 
+	0x93, 0x7E, 0xF4, 0x2E, 0x5F, 0x3B, 0xEA, 0x37, 0x9A, 0x53, 0x6C, 0xC5, 0x3A, 0x2F, 0x7F, 0xA9, 
+	0x80, 0x85, 0x18, 0xFE, 0x14, 0x0C, 0x37, 0xA7, 0xE2, 0x78, 0x90, 0x20, 0x1F, 0x41, 0x1C, 0x03, 
+	0xD1, 0xD0, 0x8C, 0xB2, 0x2D, 0x4C, 0x32, 0x81, 0x63, 0xF6, 0x6F, 0xD3, 0x7F, 0xB4, 0x6D, 0xA8, 
+	0xD6, 0xE0, 0x56, 0x84, 0xAD, 0x37, 0x96, 0x44, 0xB4, 0xAE, 0x6F, 0x49, 0x3E, 0x30, 0x0C, 0x79, 
+	0xE3, 0x93, 0xBA, 0xD2, 0x10, 0x71, 0xAC, 0x7C, 0x06, 0x89, 0x26, 0xCB, 0x72, 0x9E, 0xC4, 0xCC, 
+	0xBB, 0xA1, 0xDE, 0x9B, 0x66, 0x75, 0x6F, 0xAC, 0x51, 0x93, 0xE8, 0xF4, 0x43, 0xE4, 0x79, 0xF2, 
+	0x50, 0x67, 0x3D, 0x1B, 0x33, 0xB5, 0xEC, 0x93, 0x10, 0xCE, 0x78, 0x3C, 0x0C, 0x25, 0x44, 0x30, 
+	0x3C, 0xAB, 0x40, 0x6F, 0x4B, 0x54, 0x0C, 0x38, 0xD4, 0xEF, 0x18, 0xED, 0xA5, 0x75, 0x1E, 0x9C, 
+	0x06, 0x42, 0x11, 0x9D, 0xEC, 0xE8, 0x81, 0x38, 0xBE, 0xEF, 0x21, 0xB5, 0x0A, 0xC3, 0x38, 0x94, 
+	0x0C, 0x5A, 0xE2, 0x47, 0xDC, 0x2E, 0x82, 0xC3, 0xA6, 0x9D, 0xA6, 0x54, 0x5E, 0xE6, 0x7C, 0xFE, 
+	0x7E, 0x7B, 0x86, 0x9A, 0x54, 0xEC, 0xCD, 0xE5, 0x9F, 0xF7, 0x23, 0xDE, 0x06, 0x90, 0x93, 0xB6, 
+	0xCC, 0xC8, 0x3D, 0x75, 0xA6, 0x43, 0xEA, 0x1F, 0x44, 0xAB, 0xBB, 0x15, 0xC4, 0xAB, 0xB1, 0xDF, 
+	0xE9, 0x30, 0xB4, 0xB2, 0x3B, 0x5B, 0xA6, 0x57, 0xEE, 0x25, 0x4B, 0x83, 0x26, 0xE4, 0x6B, 0xE3, 
+	0x35, 0x62, 0xA5, 0xD2, 0xB6, 0xDE, 0xFD, 0x5F, 0x8C, 0x21, 0xF8, 0x15, 0x41, 0x1C, 0x61, 0xCD, 
+	0x78, 0x0F, 0x61, 0x9E, 0x0C, 0x7E, 0x88, 0xE3, 0x34, 0x7F, 0x0B, 0x00, 0x5D, 0x8A, 0x37, 0x5F, 
+	0xFB, 0x65, 0xB8, 0xEC, 0x6C, 0x6A, 0x7E, 0x8F, 0x70, 0x6A, 0x17, 0xFB, 0x6B, 0x9D, 0xD8, 0xC3, 
+	0xD5, 0x13, 0x49, 0xEC, 0xD0, 0xEC, 0x1B, 0xC7, 0x79, 0xBB, 0xD2, 0x89, 0x96, 0x39, 0x1C, 0xF3, 
+	0x70, 0xEA, 0xF0, 0xEA, 0x6B, 0x45, 0x51, 0xDB, 0x1A, 0x61, 0x60, 0x98, 0x1C, 0x7A, 0xA6, 0x48, 
+	0x65, 0xDA, 0x85, 0xBE, 0x6B, 0xC4, 0x27, 0x2F, 0x76, 0x6D, 0x5F, 0x4C, 0xDE, 0x92, 0xA1, 0xB3, 
+	0xD4, 0x11, 0xB4, 0x0B, 0x3A, 0x4C, 0x73, 0xC3, 0xAA, 0x9C, 0x0F, 0x95, 0x9B, 0x2C, 0x67, 0x02, 
+	0x47, 0xCD, 0xE3, 0x75, 0x84, 0x60, 0x5E, 0x17, 0xAB, 0xF0, 0xBC, 0xBE, 0xB4, 0xAA, 0x4C, 0xEA, 
+	0x11, 0x52, 0x87, 0xAC, 0x16, 0x56, 0x06, 0x1F, 0xC1, 0x97, 0xF9, 0xAB, 0x26, 0xD9, 0xCC, 0x58, 
+	0x01, 0xFF, 0x44, 0x21, 0xFE, 0x5D, 0x53, 0x0B, 0xA2, 0xAF, 0xBC, 0x9D, 0x63, 0x25, 0x87, 0x66, 
+	0xB3, 0x79, 0xB4, 0x9F, 0x49, 0xE6, 0x6E, 0xCB, 0x8B, 0x39, 0x8C, 0x46, 0x60, 0x3D, 0x5B, 0xEC, 
+	0x08, 0x1B, 0xB2, 0xEC, 0xA2, 0xAA, 0x9A, 0xDA, 0xAA, 0xAD, 0x25, 0xAB, 0x45, 0x99, 0x63, 0x23, 
+	0x6C, 0x53, 0x87, 0xA0, 0x5A, 0x6C, 0xD6, 0xE3, 0x6C, 0x34, 0x42, 0x0F, 0xF3, 0xA0, 0x23, 0xD3, 
+	0x16, 0x05, 0xAB, 0x05, 0x14, 0xA8, 0xA9, 0x02, 0x23, 0xFC, 0xC0, 0xED, 0x75, 0xC5, 0x43, 0x7C, 
+	0x1E, 0xB1, 0x69, 0xB6, 0x01, 0x96, 0x7B, 0x9E, 0x12, 0x1C, 0x72, 0x42, 0x0D, 0xAB, 0x0B, 0x79, 
+	0x22, 0xF3, 0xF0, 0xEB, 0x71, 0x83, 0x42, 0x3C, 0x11, 0xC7, 0x4F, 0x87, 0xFF, 0x5D, 0x19, 0x0B, 
+	0xE4, 0x1E, 0xC3, 0xA2, 0xD7, 0x0E, 0x9C, 0x3C, 0x7D, 0xFB, 0x4F, 0xDA, 0x99, 0x9F, 0xF8, 0x3E, 
+	0xD4, 0xA0, 0xA2, 0xF8, 0x83, 0x33, 0x1E, 0xE2, 0x1C, 0x52, 0x9D, 0xB8, 0x63, 0x8F, 0xA1, 0x4D, 
+	0x68, 0xAE, 0xCE, 0xD4, 0x12, 0x8E, 0x96, 0xA1, 0x78, 0x27, 0x6A, 0x29, 0x11, 0x19, 0x4C, 0x94, 
+	0x89, 0x0F, 0xFB, 0x7C, 0xA8, 0xAC, 0x7E, 0x84, 0x44, 0xC8, 0x7A, 0x18, 0xAE, 0x34, 0x0F, 0x6E, 
+	0x90, 0xDB, 0x1E, 0x79, 0xFA, 0xE8, 0xAF, 0x71, 0xE4, 0x80, 0x24, 0x53, 0x2F, 0xB6, 0xC2, 0x12, 
+	0x1F, 0xA0, 0x44, 0x98, 0x40, 0xAE, 0x01, 0xD6, 0xFB, 0x86, 0xBB, 0xC6, 0xF7, 0x2F, 0x38, 0x41, 
+	0xE3, 0x2E, 0x1F, 0x2E, 0x7C, 0x90, 0x1F, 0xD9, 0xD3, 0x34, 0x86, 0xC8, 0xA3, 0x8E, 0xAB, 0x5E, 
+	0x05, 0x55, 0x71, 0x5B, 0x21, 0xB7, 0x2F, 0x9E, 0x56, 0x32, 0x56, 0xD1, 0xDC, 0xC9, 0xDA, 0xDE, 
+	0xAC, 0x1D, 0x91, 0x0E, 0x4D, 0x1F, 0x4F, 0xE7, 0x31, 0xFE, 0x9A, 0x3F, 0x18, 0xAD, 0x85, 0x4E, 
+	0x66, 0x95, 0x76, 0x67, 0x6A, 0xC8, 0x90, 0x6A, 0xB5, 0xB0, 0x7D, 0xB2, 0xB3, 0xD7, 0xD6, 0x42, 
+	0xF1, 0x63, 0x52, 0xBD, 0x72, 0xE1, 0xD2, 0x63, 0x9A, 0x00, 0x45, 0x8E, 0x77, 0xCF, 0x93, 0xCF, 
+	0x1A, 0x31, 0xAA, 0x16, 0xA9, 0xCF, 0x45, 0xE3, 0x99, 0x3E, 0x6C, 0x70, 0xE9, 0x93, 0x83, 0x78, 
+	0x11, 0xB8, 0x80, 0xEA, 0x75, 0x5A, 0x87, 0xCE, 0x1D, 0xCD, 0x12, 0x5F, 0x1F, 0x6F, 0x86, 0x25, 
+	0x5E, 0x95, 0x22, 0x07, 0xFE, 0x29, 0xDA, 0x93, 0x52, 0x41, 0x62, 0x79, 0x06, 0x06, 0x83, 0xAE, 
+	0x42, 0x35, 0x5C, 0x9E, 0x01, 0xF8, 0xFA, 0x3F, 0x07, 0x15, 0xCA, 0x02, 0x69, 0x8E, 0xEA, 0x9E, 
+	0xEF, 0xF4, 0x99, 0x26, 0x73, 0x42, 0xC2, 0xEC, 0x0F, 0xEC, 0x03, 0x8F, 0x66, 0xC1, 0x88, 0x76, 
+	0xC5, 0xC2, 0x55, 0x46, 0x59, 0xC4, 0x28, 0x55, 0x93, 0xBF, 0x7C, 0x1C, 0x5C, 0xA0, 0xBA, 0x8A, 
+	0xCA, 0x8A, 0x81, 0x6C, 0xA3, 0xDE, 0x2D, 0x63, 0xC5, 0xCA, 0x0B, 0x8E, 0x99, 0xC9, 0xE4, 0x7E, 
+	0x32, 0x36, 0xD8, 0xFA, 0x80, 0xA5, 0x93, 0x4F, 0x5C, 0x97, 0x33, 0x74, 0xD2, 0x03, 0xFF, 0xFD, 
+	0x57, 0x84, 0x26, 0x62, 0x6A, 0x4C, 0x15, 0x45, 0xB9, 0x7C, 0xCD, 0xD8, 0x7B, 0xC5, 0x70, 0xA1, 
+	0xCB, 0xB4, 0xDE, 0xA6, 0xBD, 0xE0, 0xE9, 0x49, 0xB7, 0xEA, 0x21, 0x17, 0xCD, 0x0C, 0xA7, 0xF2, 
+	0x9B, 0xB6, 0x26, 0x06, 0xB1, 0x63, 0x3D, 0x0D, 0x1A, 0xAE, 0x57, 0xF1, 0x53, 0xDA, 0x61, 0x47, 
+	0x7E, 0x66, 0xC0, 0x2A, 0xAC, 0x7E, 0xE8, 0xE9, 0x4F, 0xC2, 0x21, 0x01, 0x0B, 0x9C, 0xA7, 0x98, 
+	0x05, 0x3A, 0x34, 0x68, 0x19, 0x26, 0x35, 0x57, 0xF7, 0xF8, 0xE0, 0x77, 0x7B, 0x42, 0x8D, 0xE0, 
+	0xD3, 0x08, 0x49, 0x62, 0x1D, 0x86, 0xBE, 0xC8, 0xDC, 0x2F, 0xE0, 0xFF, 0xC4, 0x6E, 0xBD, 0xEC, 
+	0x8B, 0x33, 0xF1, 0x61, 0x6E, 0x96, 0xEB, 0xEA, 0x87, 0x4C, 0xA3, 0x5F, 0x97, 0x92, 0x22, 0x0C, 
+	0x36, 0x05, 0xA5, 0xC1, 0xF6, 0xB8, 0xF5, 0xE0, 0xE4, 0x91, 0x73, 0x73, 0xD0, 0x38, 0x81, 0x24, 
+	0x13, 0xB4, 0x4B, 0xAB, 0x4C, 0xBB, 0x15, 0x56, 0xC2, 0x66, 0xF9, 0x27, 0xEF, 0xE0, 0x3D, 0x4E, 
+	0xDB, 0x12, 0xCB, 0xC1, 0xDE, 0x57, 0x1B, 0x7F, 0x69, 0x10, 0xE4, 0x6E, 0xF7, 0xCC, 0x0F, 0x64, 
+	0x31, 0x6A, 0xBF, 0x49, 0x6C, 0xF8, 0x9E, 0xC9, 0x37, 0xF9, 0x26, 0x32, 0x4A, 0x26, 0x97, 0x99, 
+	0x30, 0xA6, 0x86, 0x82, 0xCE, 0x04, 0x8B, 0xFB, 0x39, 0x3B, 0xEF, 0x05, 0xAE, 0x3F, 0xFD, 0xEA, 
+	0x21, 0xA7, 0xF9, 0xD8, 0x2D, 0x34, 0x42, 0xE4, 0xDC, 0x40, 0x1C, 0x82, 0x94, 0x89, 0xC4, 0x74, 
+	0x0C, 0xF6, 0x76, 0x65, 0x13, 0x29, 0x85, 0xE7, 0xF6, 0x8C, 0x19, 0x3D, 0xC2, 0x69, 0x79, 0x07, 
+	0x8C, 0x47, 0x24, 0x24, 0x4C, 0xD6, 0x41, 0x93, 0x70, 0x40, 0x08, 0x6D, 0x49, 0x4D, 0x92, 0xAA, 
+	0x9D, 0x02, 0xAB, 0x53, 0x8D, 0x8C, 0x96, 0x75, 0x54, 0xD0, 0xA2, 0x45, 0xBA, 0x19, 0x81, 0xFE, 
+	0x20, 0xCC, 0x93, 0x78, 0x4D, 0xBB, 0xA2, 0x21, 0xAB, 0xB5, 0x1B, 0x47, 0x0C, 0xA2, 0x34, 0x24, 
+	0x1E, 0xF3, 0x40, 0xF3, 0xC8, 0x79, 0xAE, 0x00, 0x40, 0xC3, 0xC4, 0x1B, 0x41, 0x5E, 0xF4, 0x08, 
+	0x7D, 0x15, 0xF1, 0xDF, 0xE2, 0x34, 0x78, 0xC3, 0x2A, 0x91, 0x8D, 0xC1, 0xA7, 0xF4, 0xD0, 0xF9, 
+	0xE7, 0x4E, 0x9F, 0xDC, 0x56, 0x16, 0x6C, 0x5B, 0x48, 0x10, 0x7E, 0xE9, 0xA6, 0x3F, 0x3B, 0xD0, 
+	0xFD, 0x12, 0x46, 0x1B, 0xFF, 0x61, 0x76, 0x61, 0xCC, 0x24, 0x1C, 0x94, 0xDF, 0x77, 0x6F, 0xAE, 
+	0x8E, 0xEE, 0x96, 0xF6, 0x9B, 0xB4, 0xE9, 0xA5, 0x1E, 0x6D, 0x7C, 0x2C, 0x43, 0xFB, 0x74, 0xF3, 
+	0x23, 0x86, 0xE6, 0x07, 0xC7, 0x36, 0xE3, 0xED, 0xAF, 0xDD, 0x75, 0x61, 0xCD, 0xFE, 0xEE, 0x4B, 
+	0x82, 0xF7, 0xC7, 0x66, 0x2B, 0x4C, 0xFF, 0x97, 0x77, 0x1A, 0xF5, 0xA5, 0x55, 0xF2, 0xBD, 0xC0, 
+	0xD4, 0xD8, 0x07, 0x2A, 0x92, 0xB0, 0x04, 0x56, 0x55, 0x3F, 0x1B, 0xCA, 0x21, 0x25, 0x3F, 0xB9, 
+	0x81, 0x01, 0x94, 0x43, 0xEE, 0x83, 0xD5, 0x10, 0xB4, 0x13, 0x19, 0xC0, 0x06, 0xBA, 0xEF, 0xA3, 
+	0xE4, 0xEC, 0xD8, 0x66, 0x30, 0x58, 0xA2, 0xE7, 0x81, 0x65, 0xDA, 0xA1, 0x35, 0x28, 0x4B, 0x47, 
+	0x17, 0x95, 0xA3, 0x8C, 0x67, 0x44, 0xC8, 0x8B, 0x1B, 0x5F, 0xE9, 0x0E, 0x99, 0xA3, 0x39, 0xAF, 
+	0x5C, 0xCA, 0x0D, 0x68, 0xAD, 0xE0, 0x91, 0xF3, 0x95, 0x54, 0x02, 0xFF, 0xC4, 0x23, 0xA1, 0x2E, 
+	0xCE, 0xD2, 0xFC, 0x34, 0x5A, 0xF0, 0x83, 0x82, 0x54, 0x07, 0xDE, 0x21, 0x0D, 0xE3, 0xDF, 0x86, 
+	0xC1, 0x6E, 0xAB, 0x95, 0x28, 0x90, 0xED, 0x3B, 0x93, 0x95, 0x9E, 0xDE, 0xBA, 0x3E, 0x32, 0x85, 
+	0x0F, 0xB9, 0x62, 0x68, 0x00, 0x93, 0x38, 0xF9, 0x6B, 0x36, 0x5E, 0xAB, 0x9F, 0xDD, 0x84, 0x97, 
+	0xB8, 0xAB, 0xDA, 0x29, 0x88, 0xEC, 0x9D, 0xFA, 0xAA, 0x34, 0x2B, 0x1E, 0xC0, 0x6C, 0x53, 0xD4, 
+	0x55, 0x40, 0x45, 0x9F, 0xEC, 0x0A, 0x90, 0x51, 0xC5, 0x7A, 0x8A, 0xF6, 0xEE, 0x62, 0xC2, 0xE9, 
+	0x57, 0x2A, 0x1D, 0x8F, 0xB6, 0x83, 0xF9, 0x44, 0x42, 0x33, 0x2A, 0x3D, 0xC7, 0x46, 0xDA, 0xCA, 
+	0xBC, 0x6B, 0x49, 0x7F, 0x94, 0xB0, 0x6C, 0x80, 0xEC, 0x76, 0x96, 0x12, 0xB9, 0x05, 0x47, 0x96, 
+	0x84, 0x98, 0xCF, 0x8F, 0x21, 0xF5, 0x6B, 0x86, 0xB8, 0xD4, 0x80, 0xBA, 0xEA, 0x3C, 0xF6, 0x7A, 
+	0x98, 0xE9, 0x1A, 0x5E, 0x2C, 0x69, 0x1A, 0x2A, 0x31, 0xB9, 0xE6, 0x28, 0xA3, 0xCA, 0xC2, 0x70, 
+	0xDB, 0xF0, 0x30, 0x28, 0xD3, 0xD6, 0x17, 0xAD, 0x73, 0x8D, 0xB3, 0xF5, 0xFD, 0xA3, 0x6D, 0x8A, 
+	0xAE, 0x7A, 0x69, 0xD7, 0x6E, 0x4C, 0x29, 0x44, 0xBD, 0x57, 0xBA, 0xC9, 0xFD, 0xA1, 0xEF, 0xA9, 
+	0xA0, 0x98, 0x39, 0x7A, 0x05, 0x61, 0x46, 0x55, 0x77, 0x5C, 0x1A, 0x39, 0x38, 0x98, 0xFA, 0x79, 
+	0x9A, 0xBC, 0x68, 0xDB, 0x29, 0x51, 0xDD, 0x2C, 0xEC, 0xFA, 0x61, 0x93, 0x93, 0x44, 0xF2, 0x7E, 
+	0xD7, 0xA2, 0x79, 0xF1, 0xBD, 0x19, 0x81, 0x36, 0x04, 0x3A, 0x26, 0x20, 0x07, 0x3E, 0x01, 0x8E, 
+	0x16, 0xE0, 0x6F, 0xF6, 0x29, 0xB8, 0x0B, 0xAC, 0x37, 0x19, 0x39, 0x91, 0x09, 0x23, 0xA6, 0x9C, 
+	0xAD, 0x08, 0x70, 0xA8, 0x66, 0x0A, 0x22, 0xA2, 0x2E, 0xC5, 0xB9, 0x7F, 0x58, 0xC0, 0x2F, 0x07, 
+	0x61, 0xB9, 0x2D, 0x3F, 0xA9, 0xB1, 0x67, 0x52, 0xC1, 0x1C, 0x2C, 0xB4, 0xFC, 0x02, 0xA8, 0x4F, 
+	0x71, 0x87, 0x7F, 0x42, 0x35, 0x93, 0x25, 0xF5, 0x81, 0x07, 0xF9, 0x75, 0x01, 0xBE, 0x08, 0x15, 
+	0xC5, 0xD1, 0xED, 0x91, 0xB6, 0x0B, 0xC8, 0x8B, 0x4D, 0x62, 0x54, 0xD7, 0x14, 0x9C, 0x3E, 0xEA, 
+	0x15, 0x3E, 0x91, 0x4F, 0x2F, 0xB5, 0x5C, 0x5A, 0x13, 0x6D, 0x24, 0xE5, 0xB1, 0xA2, 0xFC, 0xAF, 
+	0x5F, 0x85, 0x13, 0x52, 0x9F, 0x80, 0x19, 0xBB, 0xB7, 0x9A, 0xC6, 0x92, 0x49, 0x2D, 0x28, 0xA7, 
+	0xA2, 0x28, 0xFA, 0x4A, 0x7B, 0xBA, 0x99, 0x15, 0xA9, 0xF3, 0x51, 0xED, 0xA5, 0xD7, 0x9A, 0xC1, 
+	0x7A, 0x1E, 0x77, 0x57, 0xBB, 0xA7, 0x25, 0x10, 0xE9, 0x69, 0xAC, 0x50, 0xEF, 0xEC, 0x85, 0x02, 
+	0x52, 0xC9, 0x29, 0xE9, 0xCB, 0xC8, 0xD0, 0x2D, 0x43, 0xAD, 0x26, 0x93, 0xA8, 0x12, 0xE3, 0xEB, 
+	0xB1, 0x1E, 0xA2, 0x8D, 0xE4, 0xF7, 0x8F, 0x4B, 0x55, 0xE7, 0xD7, 0x98, 0x3B, 0x7B, 0x85, 0x16, 
+	0xEE, 0x5A, 0xD8, 0x61, 0x65, 0x57, 0xBC, 0x74, 0x62, 0xD3, 0xDC, 0x7C, 0x6D, 0xCC, 0x56, 0xB0, 
+	0x3B, 0xA7, 0xE9, 0x10, 0xDE, 0x6A, 0xF4, 0x3A, 0xEC, 0x7E, 0x2E, 0xD0, 0x1E, 0x81, 0x48, 0xD3, 
+	0xEC, 0xD7, 0xC5, 0xDB, 0x16, 0xBD, 0xD5, 0x5B, 0xAD, 0x8E, 0x13, 0x5A, 0x2A, 0x9E, 0x1A, 0x96, 
+	0xC3, 0x7E, 0x23, 0xAD, 0xA7, 0x45, 0xE0, 0xCE, 0xA4, 0x52, 0x0C, 0x2A, 0x2E, 0x84, 0x9D, 0xB3, 
+	0xB4, 0x21, 0x18, 0xA7, 0xCF, 0x57, 0xA3, 0xFE, 0xA1, 0x27, 0x99, 0xCE, 0x48, 0x1E, 0xA7, 0xDB, 
+	0x62, 0x13, 0x9B, 0x19, 0xE3, 0xBF, 0xAA, 0xA2, 0x9D, 0x29, 0xC9, 0x92, 0xD1, 0x5A, 0x43, 0x4E, 
+	0xC4, 0xF8, 0xB4, 0xD9, 0xFC, 0xBD, 0x1A, 0xBB, 0x4D, 0x23, 0x99, 0xF3, 0x86, 0xE6, 0xBC, 0xB7, 
+	0x03, 0xE1, 0xA9, 0xD7, 0xDF, 0x5C, 0x15, 0x56, 0xB4, 0x63, 0xC2, 0x71, 0x6D, 0x15, 0xF1, 0x85, 
+	0xB6, 0xFF, 0x85, 0x4B, 0x6C, 0x36, 0xDB, 0xA8, 0x07, 0x22, 0x92, 0x4F, 0xD5, 0xA3, 0x2B, 0x40, 
+	0x8F, 0x6D, 0x89, 0xE3, 0x3E, 0xA2, 0x40, 0xAE, 0x80, 0xA5, 0x3A, 0xD2, 0x5D, 0x7E, 0x74, 0x6A, 
+	0x94, 0xED, 0xA3, 0xF2, 0x4C, 0x2E, 0x57, 0xF2, 0xBE, 0x8B, 0x25, 0xEF, 0x87, 0x0C, 0x05, 0x99, 
+	0x27, 0x5E, 0xA5, 0xDE, 0xAE, 0x94, 0x49, 0xFD, 0x7A, 0x62, 0xA7, 0x74, 0x58, 0x8A, 0x1A, 0xED, 
+	0x15, 0x23, 0x1D, 0x83, 0xD7, 0xA4, 0x6B, 0x4F, 0x3F, 0x9C, 0xBB, 0x5B, 0x27, 0xAD, 0x5C, 0x7E, 
+	0xA2, 0xE0, 0xBF, 0x39, 0x0C, 0x73, 0xB1, 0x48, 0x07, 0xC1, 0x3B, 0xD5, 0xA6, 0x2D, 0x94, 0x20, 
+	0x6D, 0xE6, 0x91, 0xAD, 0xCC, 0xDE, 0x4A, 0x3C, 0x4C, 0x02, 0x92, 0xCD, 0x41, 0x46, 0x3C, 0x88, 
+	0x5A, 0xB6, 0xF6, 0x8F, 0x85, 0x05, 0x7E, 0x75, 0xAC, 0x92, 0x92, 0x99, 0xF4, 0x36, 0x21, 0xE9, 
+	0x0D, 0x19, 0x02, 0xA1, 0xF0, 0xF1, 0xDB, 0xD8, 0x8F, 0x48, 0x11, 0x5D, 0x84, 0x80, 0x24, 0xD8, 
+	0xEE, 0x57, 0xB2, 0x3A, 0xE6, 0x0E, 0xC5, 0xA1, 0x26, 0xF9, 0x0C, 0x2E, 0x6C, 0x3A, 0x7A, 0x8B, 
+	0x0B, 0x9B, 0x3D, 0x2E, 0xAF, 0x26, 0x7D, 0x02, 0x63, 0xC8, 0x0D, 0x24, 0x7D, 0x36, 0x19, 0xAB, 
+	0xAC, 0xA9, 0x10, 0xA0, 0x53, 0x25, 0x4C, 0xC7, 0x4C, 0x28, 0x4A, 0xC3, 0x38, 0x92, 0xE2, 0x3D, 
+	0xF3, 0xE1, 0x93, 0xDE, 0x3E, 0x77, 0xAC, 0xEF, 0x6A, 0x08, 0x44, 0xE8, 0x20, 0x18, 0xA3, 0xA0, 
+	0x90, 0x56, 0xDD, 0xAB, 0x77, 0x7D, 0x36, 0xC2, 0x91, 0xB5, 0x44, 0x8C, 0xD4, 0x57, 0x2C, 0x81, 
+	0xA1, 0xB9, 0xD9, 0x59, 0x50, 0x8A, 0x76, 0x88, 0x5A, 0x5E, 0x45, 0x99, 0xAC, 0x8C, 0x40, 0x14, 
+	0x46, 0x28, 0x77, 0xED, 0x1C, 0x7C, 0x59, 0x36, 0x83, 0x4A, 0xA7, 0x0A, 0x71, 0x9C, 0x3B, 0x02, 
+	0x43, 0x50, 0x74, 0x85, 0xE3, 0xD4, 0x0A, 0x3B, 0x1B, 0xE2, 0xD7, 0x1F, 0x79, 0x78, 0x4B, 0x00, 
+	0x8E, 0x0A, 0x99, 0xDF, 0x14, 0x17, 0xCD, 0xB8, 0xCF, 0x21, 0xB3, 0x85, 0x38, 0xDE, 0x01, 0xBA, 
+	0x1B, 0x95, 0x4B, 0x97, 0x2B, 0xB0, 0xC9, 0xED, 0x45, 0xCE, 0x22, 0x5B, 0x8E, 0x04, 0x91, 0x07, 
+	0x58, 0xC8, 0xB5, 0xA7, 0x06, 0x62, 0x9D, 0xC4, 0xAC, 0x1E, 0x08, 0xFD, 0xEA, 0xB7, 0x4D, 0x0B, 
+	0xD2, 0x79, 0xA8, 0xEF, 0x4F, 0xBE, 0x80, 0xE6, 0x55, 0x44, 0x7B, 0x59, 0x5E, 0x9C, 0x92, 0x6A, 
+	0x92, 0xF7, 0xE7, 0x78, 0xFB, 0x46, 0xA1, 0xF4, 0x1E, 0x36, 0x8B, 0xE2, 0x86, 0xA2, 0xE1, 0x19, 
+	0xB5, 0x29, 0xEA, 0xD2, 0x1D, 0x0B, 0x68, 0xC5, 0x2F, 0x4F, 0x48, 0x6A, 0xC8, 0x92, 0xCE, 0x64, 
+	0x9D, 0xA5, 0x86, 0xA5, 0x05, 0x40, 0xCE, 0xD7, 0x6C, 0x69, 0x9F, 0x6C, 0xB2, 0xA3, 0x11, 0x08, 
+	0xEF, 0x9B, 0xCD, 0x10, 0x07, 0x7B, 0x9E, 0x25, 0xF4, 0x1A, 0x2B, 0x21, 0x7E, 0xA5, 0xB9, 0xE1, 
+	0x33, 0x52, 0xFA, 0x04, 0x09, 0xD4, 0x78, 0xCB, 0x56, 0xE6, 0x55, 0x2C, 0xB4, 0x5D, 0xBB, 0x40, 
+	0x34, 0xE5, 0x23, 0x30, 0xB8, 0x65, 0x19, 0xF1, 0x5A, 0x08, 0xF2, 0xF4, 0x86, 0x45, 0xB7, 0x87, 
+	0x17, 0xFA, 0x68, 0x6A, 0x1F, 0x7E, 0x69, 0xDA, 0x89, 0x8E, 0xCA, 0xB6, 0xFF, 0x9F, 0x4E, 0x6F, 
+	0x25, 0x46, 0x46, 0xF6, 0x7B, 0x1E, 0xB3, 0x3D, 0x2C, 0x8C, 0x01, 0xA9, 0x7B, 0xDA, 0xE9, 0x4D, 
+	0x6E, 0x89, 0x9D, 0x0F, 0x3F, 0x9F, 0x15, 0x3C, 0xFE, 0x35, 0x61, 0x2A, 0x45, 0xC2, 0xA9, 0xC5, 
+	0x5C, 0x51, 0xCC, 0x6B, 0xCC, 0x2F, 0xA7, 0x60, 0x03, 0x71, 0xF0, 0xB3, 0xBF, 0x7B, 0x76, 0xCC, 
+	0x89, 0x2C, 0x31, 0x79, 0xE6, 0xDC, 0x7C, 0x39, 0x24, 0xD8, 0x1A, 0x98, 0x1F, 0x98, 0xCD, 0xD4, 
+	0x7E, 0x04, 0xF2, 0x92, 0x8D, 0x23, 0x03, 0x5F, 0xF3, 0x05, 0x3B, 0xB0, 0x0A, 0xF0, 0x7A, 0xCA, 
+	0x76, 0xCB, 0xD0, 0xBA, 0xA0, 0x7F, 0xBA, 0x0D, 0x68, 0x60, 0xC3, 0xEF, 0xDC, 0x44, 0x2E, 0x40, 
+	0x24, 0x9D, 0xCB, 0x1D, 0x5A, 0x0C, 0x51, 0x66, 0x1A, 0x2A, 0x68, 0xA6, 0x83, 0x20, 0x79, 0x9B, 
+	0x24, 0xEA, 0x10, 0x5A, 0xB4, 0x39, 0x58, 0xAC, 0xA0, 0x45, 0x3B, 0x16, 0xBE, 0x24, 0x59, 0x1D, 
+	0x18, 0x5C, 0xD8, 0xCD, 0xFE, 0x16, 0x5C, 0x84, 0x5C, 0x2D, 0x7D, 0x28, 0xC9, 0xCE, 0x9D, 0x38, 
+	0xF6, 0x2F, 0x9A, 0x8A, 0x93, 0x95, 0xDC, 0x73, 0x48, 0xFD, 0xF5, 0xAB, 0xF4, 0x06, 0xB4, 0x11, 
+	0x79, 0x7B, 0xF7, 0x75, 0x73, 0xC2, 0x2D, 0x9C, 0x91, 0x7E, 0x51, 0x12, 0x54, 0xAC, 0x55, 0x29, 
+	0x48, 0x7F, 0x50, 0x15, 0xC2, 0x79, 0x05, 0x3C, 0x8F, 0xB4, 0xAE, 0xDD, 0x28, 0x09, 0xCC, 0x1D, 
+	0xDE, 0xEF, 0x82, 0xFD, 0x64, 0xD1, 0x5A, 0xFE, 0x06, 0x18, 0x7C, 0xF6, 0x32, 0x67, 0xDB, 0xF1, 
+	0x55, 0xF4, 0x09, 0x33, 0xB4, 0x91, 0xA7, 0x68, 0xE7, 0xA3, 0x60, 0x93, 0xE6, 0x36, 0xDE, 0x28, 
+	0xB3, 0xBD, 0x90, 0x46, 0x7F, 0xE5, 0xAF, 0x3C, 0xB6, 0x5E, 0xF2, 0x98, 0xE6, 0x28, 0x07, 0xA9, 
+	0x21, 0x4C, 0xAA, 0xF7, 0x95, 0xD9, 0x25, 0x51, 0x7F, 0x26, 0x8F, 0xC9, 0xD6, 0x65, 0xCA, 0x07, 
+	0x82, 0x1F, 0x8E, 0xBF, 0xBA, 0x65, 0xF7, 0xB1, 0x51, 0x85, 0x99, 0x23, 0x4E, 0x48, 0x2E, 0x7B, 
+	0xC8, 0x09, 0xC4, 0x93, 0xB9, 0xDB, 0x6B, 0xAF, 0xCA, 0xC7, 0x0A, 0xC5, 0x6D, 0xD0, 0xC2, 0xD4, 
+	0xF5, 0xA1, 0x5E, 0x45, 0x28, 0x54, 0x1D, 0x87, 0xC8, 0x83, 0xAF, 0x9E, 0xB7, 0xC7, 0x4D, 0x48, 
+	0x3B, 0x49, 0x23, 0x8B, 0x23, 0x6A, 0x2D, 0xD6, 0x30, 0xAD, 0xD3, 0xFA, 0x35, 0x67, 0xF0, 0x0D, 
+	0x3A, 0xDC, 0x42, 0x57, 0xBE, 0xE6, 0x5B, 0x26, 0x0B, 0x30, 0x45, 0x7E, 0x71, 0x5D, 0x82, 0xE7, 
+	0x40, 0x45, 0x58, 0xBB, 0xF5, 0x07, 0xEC, 0x36, 0x47, 0xF7, 0x98, 0x05, 0x70, 0x83, 0x17, 0x9D, 
+	0xDD, 0x4A, 0x4A, 0xB7, 0xB5, 0xBC, 0x8B, 0xF5, 0x08, 0x47, 0x74, 0xF3, 0x0F, 0x3C, 0xB0, 0xC7, 
+	0x30, 0x88, 0xCF, 0xA2, 0xE1, 0xC3, 0x13, 0x52, 0x20, 0x2D, 0xAD, 0xB3, 0x99, 0x37, 0x71, 0x91, 
+	0xBB, 0x3F, 0x31, 0xAC, 0xEC, 0xB8, 0x2A, 0x84, 0x12, 0x34, 0x84, 0xE5, 0xBF, 0x47, 0x94, 0xD6, 
+	0x9A, 0x1F, 0xEB, 0x34, 0xAF, 0xDA, 0x93, 0x5D, 0x22, 0x88, 0x27, 0x1A, 0x04, 0x13, 0xAA, 0x06, 
+	0x52, 0x8C, 0x44, 0xCB, 0xCC, 0x70, 0x7A, 0xBF, 0xC3, 0x3D, 0x21, 0x71, 0x99, 0x4F, 0x06, 0x42, 
+	0x8B, 0x7F, 0xDA, 0xBC, 0xAF, 0x7C, 0x24, 0x94, 0x3F, 0xC9, 0xB9, 0xF0, 0xFB, 0x9C, 0xFB, 0x94, 
+	0xFC, 0x7F, 0xA0, 0x2F, 0x20, 0x4D, 0x57, 0x06, 0xDB, 0xA8, 0xC4, 0xBD, 0x02, 0x6C, 0xDD, 0x00, 
+	0x8C, 0x84, 0xEF, 0x63, 0xDB, 0x45, 0x34, 0x21, 0x69, 0x73, 0x53, 0x22, 0xD3, 0x61, 0xA6, 0x7A, 
+	0xDE, 0xC1, 0x66, 0xFD, 0x3B, 0x95, 0x13, 0x76, 0x06, 0xE4, 0x76, 0x0E, 0x63, 0xF2, 0x66, 0x56, 
+	0xE3, 0x80, 0x55, 0x57, 0xF3, 0x88, 0xA2, 0x5E, 0x84, 0x29, 0xFD, 0x44, 0x78, 0xA9, 0xF0, 0x3A, 
+	0xF9, 0xE7, 0xDD, 0x66, 0xE1, 0x48, 0xA4, 0xD7, 0x15, 0x06, 0x47, 0xBA, 0x1E, 0x70, 0xA0, 0xA2, 
+	0xBC, 0x79, 0xCF, 0x9B, 0xA6, 0x61, 0x95, 0x4F, 0xF8, 0x46, 0xA7, 0xD5, 0xB5, 0x5F, 0x66, 0xDD, 
+	0xE2, 0x5A, 0x8B, 0x29, 0xBA, 0x02, 0xC8, 0x1A, 0x17, 0xFD, 0x72, 0x45, 0xED, 0x63, 0x46, 0x64, 
+	0x5E, 0xC9, 0x24, 0x8D, 0x91, 0x38, 0xD1, 0xEF, 0xDF, 0x82, 0x09, 0xB0, 0x5B, 0x8C, 0x43, 0x5F, 
+	0xF9, 0x05, 0x34, 0x1E, 0x2B, 0x4D, 0xA8, 0xC3, 0xE5, 0x9A, 0xD5, 0x95, 0x1B, 0xC0, 0xB9, 0x30, 
+	0x55, 0xB1, 0xEF, 0x53, 0xD2, 0x86, 0x65, 0x96, 0xD1, 0x3C, 0x75, 0x9E, 0x43, 0xED, 0x72, 0x92, 
+	0x5F, 0xC3, 0xF8, 0x4C, 0x14, 0xA7, 0x77, 0x22, 0x48, 0x5E, 0xD0, 0x02, 0x32, 0xB4, 0x5F, 0xA9, 
+	0xCD, 0x9C, 0xF6, 0x46, 0x60, 0xEF, 0x4D, 0x14, 0x84, 0x6E, 0xC5, 0x2C, 0xA6, 0xB2, 0xFB, 0x38, 
+	0xD1, 0x0C, 0xB2, 0x87, 0xE8, 0x64, 0x1E, 0xFD, 0xC4, 0x28, 0x08, 0x37, 0x61, 0x85, 0x11, 0x44, 
+	0x76, 0xC9, 0x9F, 0xAD, 0x6D, 0xBC, 0xC0, 0xC8, 0x02, 0xC8, 0xDA, 0x22, 0x1D, 0xB3, 0x54, 0x5F, 
+	0x38, 0x0D, 0x1D, 0xC0, 0x78, 0x46, 0x7C, 0x46, 0x05, 0xC1, 0x51, 0x9A, 0xF7, 0x7E, 0x51, 0x75, 
+	0x32, 0xD6, 0xB1, 0x7E, 0x8B, 0x3A, 0xB9, 0xA8, 0x12, 0xAF, 0xF8, 0x20, 0x69, 0xED, 0x37, 0xB4, 
+	0xD2, 0x7D, 0x7C, 0x08, 0xE4, 0x74, 0xD8, 0x18, 0x2B, 0x6E, 0x65, 0x21, 0xC4, 0x8C, 0xF0, 0xB2, 
+	0x1A, 0x7D, 0xDD, 0xA5, 0xE9, 0xC3, 0x88, 0xEE, 0x7E, 0x80, 0xE3, 0x4B, 0x3A, 0x56, 0x3D, 0x4B, 
+	0x75, 0x62, 0xE1, 0xCE, 0xB6, 0xD5, 0xF1, 0xFC, 0x0C, 0x0A, 0x66, 0x10, 0xD2, 0xC0, 0xF3, 0xD3, 
+	0xCA, 0xFE, 0xD6, 0x73, 0xE4, 0x21, 0xDA, 0xED, 0xE4, 0xE4, 0x5A, 0xAC, 0x31, 0x6D, 0x84, 0x8E, 
+	0x24, 0x56, 0x6B, 0x09, 0x14, 0x09, 0x81, 0xD6, 0xC6, 0x92, 0x2B, 0xE5, 0x2F, 0x61, 0xCE, 0xD3, 
+	0xBD, 0x31, 0x10, 0x56, 0x4C, 0x68, 0x18, 0xA2, 0x4E, 0xBF, 0x22, 0x71, 0x77, 0x4A, 0xEC, 0x3F, 
+	0x8A, 0x10, 0xF9, 0x62, 0x7B, 0x4F, 0x7E, 0xE3, 0x16, 0x23, 0x3C, 0x4A, 0x7B, 0xD9, 0xCC, 0xA1, 
+	0x13, 0x09, 0x31, 0xD8, 0xD1, 0x23, 0xC4, 0xAD, 0x48, 0xD6, 0xC7, 0xCF, 0xB6, 0xE2, 0x5E, 0x53, 
+	0xAF, 0x45, 0xF4, 0xE4, 0x82, 0xDC, 0xB3, 0x5D, 0x19, 0x4A, 0x71, 0xBE, 0x75, 0x1D, 0x82, 0x9C, 
+	0xCD, 0x1F, 0x1E, 0xCE, 0xE1, 0xB6, 0x94, 0xED, 0x9A, 0x3A, 0x1A, 0x66, 0xFF, 0x5C, 0x43, 0x7D, 
+	0x51, 0x46, 0x09, 0xBB, 0xD0, 0x5D, 0x1A, 0x81, 0x98, 0x9A, 0xAC, 0x74, 0x94, 0xD3, 0x05, 0x55, 
+	0xE1, 0xE4, 0x2A, 0x43, 0xCC, 0xC8, 0x2C, 0x10, 0xA7, 0xE8, 0xAD, 0x5F, 0x02, 0xDF, 0x3B, 0x10, 
+	0x33, 0x43, 0x8A, 0x92, 0xF9, 0xCF, 0x12, 0x04, 0x60, 0xCD, 0xA0, 0x30, 0xA9, 0xE8, 0x32, 0x30, 
+	0x80, 0x8B, 0xF2, 0x09, 0xA4, 0x91, 0xFA, 0x3B, 0xBD, 0x1D, 0x54, 0xFD, 0xF8, 0xCF, 0x74, 0x70, 
+	0x50, 0x9B, 0x8D, 0x40, 0xBD, 0xC7, 0x3D, 0x4F, 0x03, 0x7B, 0x63, 0x32, 0xCE, 0x8B, 0x5B, 0x7C, 
+	0x9A, 0xE0, 0x3A, 0x37, 0x38, 0xCA, 0x31, 0x21, 0xDB, 0x4F, 0xF6, 0xF0, 0xDB, 0x4E, 0xE5, 0xDC, 
+	0x69, 0x4B, 0xAE, 0x28, 0x01, 0xF2, 0x46, 0x38, 0x6A, 0x9A, 0x50, 0x2D, 0xF4, 0x36, 0x5D, 0xEF, 
+	0x25, 0xB1, 0x31, 0xCA, 0x58, 0x5E, 0x4B, 0xE6, 0xAC, 0xCF, 0x0C, 0x20, 0x84, 0x7F, 0xF5, 0xC1, 
+	0x1A, 0xE5, 0x94, 0xC3, 0x3D, 0x77, 0x8E, 0xA3, 0x9B, 0xAF, 0x96, 0xBF, 0xD1, 0xEC, 0x35, 0x17, 
+	0x15, 0xDF, 0x2B, 0x00, 0xCD, 0x2C, 0xDB, 0xD3, 0x31, 0x8A, 0x6D, 0xE0, 0xB3, 0x1F, 0x71, 0xB4, 
+	0xA4, 0xCA, 0xFA, 0x40, 0xEB, 0x99, 0x4C, 0xFB, 0xFE, 0x9D, 0xBA, 0x26, 0x0F, 0x1B, 0x6D, 0xE6, 
+	0xB6, 0x2C, 0xAD, 0xF4, 0xD8, 0x12, 0xC0, 0xA3, 0xA4, 0x65, 0x10, 0x1B, 0xCD, 0xFD, 0x0A, 0xB0, 
+	0x52, 0x71, 0x56, 0xD4, 0x01, 0x49, 0xC9, 0x68, 0x06, 0xA1, 0xD3, 0x61, 0x8A, 0xC1, 0x07, 0x1B, 
+	0x06, 0x48, 0x78, 0x1B, 0x96, 0xCB, 0x7B, 0xC5, 0xF4, 0x8B, 0x27, 0x93, 0xF1, 0x10, 0x40, 0xB3, 
+	0x36, 0xA3, 0xA8, 0x19, 0xF3, 0x1B, 0x1B, 0xA4, 0xCD, 0x19, 0x18, 0x25, 0x7C, 0x24, 0xAC, 0x05, 
+	0xD1, 0xB2, 0xA1, 0x1E, 0x0B, 0xB3, 0xDA, 0x82, 0x3E, 0x78, 0x87, 0x12, 0x8F, 0xE6, 0xB9, 0x59, 
+	0x02, 0xDC, 0x15, 0x31, 0xA3, 0xAE, 0x22, 0x2F, 0xB7, 0x60, 0x08, 0x42, 0xA0, 0x4B, 0x94, 0xA1, 
+	0x1A, 0xD9, 0x32, 0x40, 0x2C, 0x33, 0x5A, 0x62, 0xB3, 0xDB, 0x9C, 0x04, 0x3B, 0xCE, 0x40, 0xCD, 
+	0x3C, 0x29, 0xDB, 0x1C, 0x98, 0xC7, 0x7B, 0x09, 0x65, 0x91, 0xCD, 0xB9, 0x71, 0x80, 0xF2, 0x14, 
+	0x90, 0x27, 0xA5, 0xC7, 0x16, 0xBB, 0xC8, 0x6D, 0x79, 0x0F, 0xC7, 0x06, 0x4F, 0xFD, 0xEF, 0x3D, 
+	0x7E, 0xA9, 0x1A, 0x20, 0x4A, 0x94, 0x3F, 0x84, 0xA1, 0x97, 0xE1, 0x99, 0xF5, 0x9E, 0xB2, 0x46, 
+	0x23, 0xC3, 0x48, 0x46, 0xC0, 0x2C, 0x7D, 0x64, 0x45, 0x7B, 0xA0, 0xBF, 0x5F, 0x14, 0xBC, 0xB2, 
+	0x17, 0x87, 0x68, 0x5C, 0x17, 0xCE, 0xCA, 0xEA, 0x73, 0x3C, 0xAE, 0x6C, 0x8C, 0x4A, 0x2C, 0xFB, 
+	0x77, 0x52, 0xE7, 0xA1, 0xFF, 0x6C, 0x23, 0x05, 0x1E, 0x69, 0x22, 0xF1, 0xDA, 0x6B, 0xB6, 0x01, 
+	0x44, 0xDE, 0xEB, 0x80, 0xB7, 0x84, 0x5B, 0xC7, 0xEA, 0x59, 0x5B, 0x3F, 0x23, 0x7E, 0x10, 0x00, 
+	0x27, 0x5C, 0x6A, 0x7B, 0xEB, 0xFF, 0xDF, 0x82, 0xEE, 0x85, 0x6C, 0xA5, 0x1A, 0xBF, 0xEB, 0x64, 
+	0xBB, 0x10, 0x46, 0x40, 0x51, 0x29, 0x2C, 0x6A, 0xD2, 0xF5, 0x58, 0x61, 0x5F, 0x77, 0x31, 0xBD, 
+	0x59, 0x0A, 0x1B, 0xF5, 0xC2, 0xFA, 0x9A, 0xB4, 0x59, 0xF4, 0x0A, 0xD1, 0x68, 0xCC, 0x21, 0x44, 
+	0xDC, 0x70, 0x80, 0xD1, 0x67, 0xCC, 0x24, 0x22, 0xC0, 0x77, 0x04, 0xED, 0xA3, 0xB4, 0x23, 0xC8, 
+	0xAD, 0x5E, 0x18, 0x64, 0x57, 0x89, 0x52, 0xDD, 0x25, 0x6C, 0x38, 0xCE, 0x5D, 0x45, 0x42, 0x18, 
+	0xA3, 0xE2, 0xD8, 0x6E, 0x21, 0x5F, 0xBB, 0x9D, 0xCA, 0x90, 0x57, 0x85, 0x0C, 0xD5, 0x56, 0xC8, 
+	0x12, 0x39, 0x27, 0x44, 0x77, 0xE6, 0x59, 0xE7, 0x08, 0xB0, 0x4E, 0x80, 0xBD, 0xE3, 0xE6, 0x8B, 
+	0xE1, 0x4B, 0x6E, 0xCE, 0xA9, 0x5C, 0x8E, 0xF2, 0xE2, 0xFE, 0x18, 0xFB, 0x74, 0xD6, 0x3C, 0x76, 
+	0xB8, 0xB0, 0x90, 0x00, 0x3A, 0xF4, 0xE4, 0xB7, 0xFD, 0x05, 0xA3, 0x7A, 0xD9, 0xF7, 0x0E, 0x18, 
+	0x66, 0xBC, 0x9A, 0x47, 0x18, 0x80, 0x4F, 0x4A, 0x6B, 0x9C, 0xF8, 0x48, 0x16, 0x49, 0x3F, 0x21, 
+	0xB4, 0x20, 0x59, 0x51, 0xDA, 0xD1, 0x4B, 0xE8, 0x5E, 0x48, 0x95, 0x77, 0x0A, 0x82, 0xA1, 0x8F, 
+	0xD2, 0x77, 0xC9, 0xC5, 0xE2, 0x79, 0x24, 0x87, 0x34, 0x0C, 0x9E, 0x17, 0x6F, 0x7B, 0xEA, 0x14, 
+	0x79, 0xF6, 0x0C, 0x95, 0x5F, 0x1C, 0x61, 0x01, 0x61, 0x6D, 0xD1, 0xF2, 0x6A, 0xA8, 0x09, 0xAA, 
+	0x0A, 0x6E, 0xF9, 0x28, 0x69, 0x49, 0x14, 0x60, 0x6D, 0xA3, 0xCF, 0x5E, 0x4C, 0x34, 0x8E, 0xFC, 
+	0x7E, 0x3E, 0x72, 0x3E, 0x02, 0x78, 0x3D, 0x1B, 0xA4, 0x93, 0x46, 0x39, 0x46, 0x0E, 0xF0, 0xE3, 
+	0x46, 0xF0, 0x4C, 0x2F, 0xE2, 0x14, 0x93, 0xF0, 0x2A, 0x5B, 0xE8, 0x05, 0xF7, 0x10, 0x3A, 0x6D, 
+	0x03, 0xA0, 0x5D, 0xF8, 0x5D, 0xD1, 0x4C, 0x58, 0x7B, 0xBF, 0xAB, 0x52, 0xC1, 0x6E, 0x72, 0x1E, 
+	0x60, 0x8C, 0x33, 0x4E, 0x22, 0xE7, 0x12, 0x51, 0x0B, 0xFE, 0x22, 0xDA, 0x8A, 0x53, 0xA7, 0xC6, 
+	0x9A, 0x66, 0x92, 0x76, 0x46, 0x3C, 0xC5, 0x72, 0x55, 0x6C, 0xD2, 0x8D, 0xF1, 0xD5, 0x6C, 0x09, 
+	0xEA, 0x2D, 0x1A, 0xF9, 0x99, 0x5E, 0x65, 0xCC, 0x6D, 0x55, 0x5F, 0x46, 0x66, 0xC3, 0xBB, 0xBE, 
+	0x1C, 0x53, 0x40, 0x3B, 0xE9, 0x15, 0x6C, 0xD6, 0x94, 0x8C, 0x5D, 0xB4, 0x4A, 0xDC, 0x2F, 0x2F, 
+	0xC1, 0xA8, 0xE1, 0xDF, 0x7A, 0xB5, 0x6D, 0xE2, 0xF8, 0xDB, 0xAA, 0x5D, 0x3D, 0x80, 0x5D, 0x33, 
+	0x6F, 0xCD, 0x5A, 0x84, 0xBC, 0x2D, 0x6E, 0x28, 0x97, 0x07, 0xA6, 0xF1, 0x0B, 0x22, 0x23, 0x58, 
+	0xDF, 0x50, 0x15, 0x73, 0xD6, 0x75, 0x63, 0xB6, 0x0F, 0xD8, 0x75, 0x9B, 0xF9, 0x9D, 0xBF, 0xE6, 
+	0xAF, 0xF8, 0xBF, 0xB4, 0x3A, 0xD4, 0x02, 0x3B, 0x8A, 0x4D, 0xF6, 0x44, 0x0E, 0x7F, 0x2B, 0xDB, 
+	0x9C, 0xAC, 0xD6, 0xB8, 0xC5, 0xB5, 0xEF, 0x1B, 0x67, 0xB0, 0x10, 0xCC, 0x1E, 0x24, 0xD4, 0x05, 
+	0x06, 0x6D, 0x3A, 0xFE, 0x95, 0x4C, 0x00, 0x8A, 0xD2, 0x53, 0x1B, 0x7A, 0xDE, 0xA0, 0x9F, 0x2D, 
+	0x10, 0x43, 0x2D, 0xA3, 0x8E, 0x66, 0x36, 0x27, 0x77, 0x05, 0x26, 0x78, 0x21, 0x09, 0x18, 0xD0, 
+	0x2E, 0x86, 0x1E, 0x56, 0x3B, 0x71, 0x3A, 0x46, 0x24, 0x7C, 0x90, 0x1E, 0x42, 0x36, 0x11, 0xA1, 
+	0x7C, 0x04, 0x80, 0x42, 0x0F, 0xA8, 0x4E, 0x07, 0xA1, 0x7B, 0x55, 0x5F, 0xA8, 0x8A, 0x1D, 0x36, 
+	0x9C, 0x16, 0xBD, 0xE0, 0x63, 0x0A, 0xE3, 0xC5, 0xF9, 0x55, 0xA4, 0xE9, 0x75, 0x7D, 0xD5, 0x82, 
+	0x32, 0x1E, 0x6B, 0x05, 0xE4, 0xF9, 0x8A, 0x8C, 0x18, 0x0E, 0xA0, 0xDF, 0x23, 0x4D, 0xA8, 0x4E, 
+	0xF0, 0x85, 0xFF, 0x04, 0xC5, 0xFE, 0x1E, 0x8A, 0x3F, 0xBF, 0x54, 0x05, 0x82, 0x8A, 0x0C, 0xDF, 
+	0xCA, 0x0A, 0xD0, 0x43, 0x76, 0xE5, 0x49, 0x55, 0x36, 0x24, 0x6F, 0x2F, 0x20, 0x58, 0x3A, 0xFE, 
+	0x62, 0x3A, 0x11, 0xAA, 0x2F, 0xB2, 0x25, 0x6F, 0x0B, 0x9D, 0xD8, 0xCC, 0xC5, 0x26, 0x16, 0x2E, 
+	0x74, 0x56, 0xBE, 0x99, 0xF4, 0xE7, 0x90, 0x88, 0x65, 0x1E, 0x6C, 0xAA, 0xB4, 0x2C, 0xCF, 0x12, 
+	0x63, 0x86, 0x8E, 0x9C, 0xF5, 0x75, 0x5A, 0x71, 0xBF, 0xFB, 0x54, 0xF3, 0x86, 0x61, 0xC5, 0x59, 
+	0xB4, 0xD5, 0x8E, 0x5D, 0x91, 0xA0, 0xB0, 0x9B, 0xB1, 0x95, 0xCE, 0x45, 0x0C, 0x4A, 0xFC, 0xE0, 
+	0x56, 0x73, 0x96, 0xC1, 0xAA, 0x0A, 0x65, 0x42, 0x42, 0xC1, 0xC7, 0x2D, 0x6E, 0xC8, 0x4A, 0x7F, 
+	0x40, 0x53, 0x0C, 0x7A, 0x99, 0x96, 0x59, 0xFA, 0xEC, 0xAD, 0xA1, 0xF0, 0xAB, 0xFE, 0xB6, 0x58, 
+	0x49, 0x65, 0xF4, 0x29, 0x2A, 0x21, 0x42, 0x93, 0x0A, 0xED, 0x38, 0xC0, 0x33, 0xFD, 0xCF, 0x8E, 
+	0xC1, 0xEC, 0x3A, 0xF9, 0x1F, 0xEA, 0x8F, 0xA2, 0xEA, 0xAE, 0xC4, 0xE7, 0x43, 0xCB, 0x53, 0xF1, 
+	0x77, 0xC9, 0x6C, 0x61, 0x35, 0xE2, 0xED, 0x25, 0x68, 0xF6, 0x8E, 0x06, 0xD6, 0x41, 0x87, 0x58, 
+	0x8A, 0xE4, 0x5F, 0x80, 0x59, 0xC7, 0x21, 0xAC, 0xC1, 0x95, 0xC8, 0xBA, 0xF9, 0x84, 0x1F, 0x70, 
+	0x15, 0x1C, 0xB1, 0xF1, 0x2B, 0xB4, 0xB7, 0xA0, 0x4B, 0xE3, 0xB3, 0xD4, 0x3C, 0x9C, 0x01, 0xB2, 
+	0x4A, 0xE5, 0x47, 0x39, 0x10, 0x32, 0xE0, 0x0E, 0x1C, 0xE9, 0x3E, 0x2E, 0xDD, 0x12, 0x2C, 0xDF, 
+	0xB7, 0x47, 0xE8, 0x88, 0x53, 0x28, 0xF2, 0xC6, 0x11, 0x12, 0x15, 0x4A, 0x60, 0x14, 0xA4, 0x78, 
+	0x54, 0x8E, 0x6A, 0x77, 0xD6, 0x74, 0xC2, 0xCD, 0x4B, 0xF9, 0xC2, 0x84, 0xE8, 0xD6, 0xED, 0x4D, 
+	0xB3, 0x0C, 0x32, 0x39, 0xCF, 0xB9, 0xF9, 0x0B, 0xC3, 0x52, 0xF5, 0x6E, 0x9A, 0x38, 0x84, 0xED, 
+	0x0D, 0x83, 0xFA, 0x83, 0x2D, 0xF4, 0xB3, 0xEE, 0x71, 0xE0, 0x47, 0x48, 0xE6, 0x1A, 0x0B, 0xD9, 
+	0x54, 0x74, 0xB8, 0x39, 0xA1, 0x4C, 0xC7, 0x3C, 0x52, 0x02, 0x07, 0x61, 0x12, 0x1B, 0x49, 0x0B, 
+	0x7D, 0x08, 0xAA, 0xEA, 0xB0, 0x3A, 0x05, 0x65, 0x9A, 0xEA, 0x68, 0x0C, 0x5B, 0xA6, 0x37, 0xC6, 
+	0x5F, 0x10, 0x7D, 0xC8, 0xAE, 0xCA, 0x65, 0x1F, 0x16, 0x80, 0x38, 0xF1, 0xB7, 0xB5, 0xDB, 0x1D, 
+	0x37, 0x5A, 0x1D, 0xEB, 0x7B, 0x2C, 0xA1, 0x7B, 0x72, 0xCE, 0x0D, 0x34, 0xB4, 0x17, 0x23, 0x52, 
+	0x8B, 0x3A, 0xD6, 0xEC, 0xE5, 0x8D, 0x23, 0x6A, 0xCF, 0x34, 0xDE, 0x02, 0x5A, 0xA4, 0x54, 0xFF, 
+	0x85, 0x85, 0x3E, 0x33, 0x87, 0xF9, 0x27, 0x59, 0xE2, 0x32, 0xAB, 0x8D, 0xBA, 0x8A, 0x92, 0xEB, 
+	0x5D, 0xA7, 0xF6, 0x6A, 0xDF, 0x32, 0xAD, 0xAC, 0x70, 0xCF, 0x91, 0xA9, 0x8E, 0x4C, 0x39, 0x71, 
+	0x4C, 0x1B, 0xBF, 0xD1, 0xD0, 0x68, 0x19, 0x9C, 0x8A, 0x7B, 0x57, 0x52, 0x40, 0xCE, 0xCC, 0x86, 
+	0xB7, 0x0E, 0x3D, 0x5E, 0xAD, 0xD0, 0x2B, 0xD4, 0x58, 0x5C, 0x5B, 0xD8, 0x00, 0x7F, 0x42, 0x99, 
+	0x84, 0x5D, 0x2D, 0x86, 0x40, 0x10, 0x35, 0x15, 0x05, 0x67, 0xDE, 0x22, 0x6C, 0xB4, 0x5C, 0x7B, 
+	0xCA, 0xDF, 0xF4, 0x1D, 0xD2, 0xCB, 0x34, 0x02, 0x6C, 0x22, 0x10, 0x4F, 0x7F, 0xDF, 0x18, 0xFF, 
+	0x5A, 0x81, 0x4C, 0xAC, 0xF7, 0xF3, 0xF1, 0x5D, 0xBA, 0x72, 0x36, 0x26, 0x88, 0xAE, 0xCA, 0xE0, 
+	0x79, 0x84, 0x68, 0x86, 0xCE, 0x35, 0xAF, 0x27, 0xB4, 0x21, 0xFD, 0x05, 0xB1, 0x38, 0x17, 0x7D, 
+	0x9B, 0x5A, 0x12, 0x29, 0x76, 0xE5, 0xA0, 0x39, 0x0B, 0xAD, 0x4C, 0x33, 0xCB, 0x45, 0x59, 0x82, 
+	0xB7, 0x03, 0xD2, 0x1A, 0xF7, 0x2F, 0x54, 0x43, 0x92, 0xC9, 0x8B, 0x6F, 0x6C, 0x6C, 0x1B, 0x10, 
+	0xEE, 0x97, 0x38, 0xA5, 0x8B, 0x16, 0xDE, 0xFC, 0xDA, 0x83, 0x4B, 0x39, 0x79, 0x17, 0xB7, 0x5A, 
+	0x59, 0x01, 0x11, 0xC0, 0xC6, 0x36, 0xD5, 0xBA, 0xB1, 0x46, 0x9E, 0x6B, 0xA1, 0xCB, 0x96, 0x7E, 
+	0x56, 0x91, 0x87, 0x68, 0x59, 0x8E, 0xCF, 0xB5, 0x58, 0x24, 0x2C, 0xD9, 0x0A, 0x06, 0x25, 0xCB, 
+	0x8C, 0xE6, 0x02, 0xE3, 0x5A, 0x19, 0x4D, 0x8F, 0x43, 0x5B, 0x40, 0x3F, 0x7D, 0x50, 0x24, 0x90, 
+	0x71, 0x3E, 0x88, 0x96, 0x3C, 0xCE, 0x2C, 0x80, 0x35, 0x68, 0x3E, 0x21, 0x67, 0x8A, 0x03, 0x68, 
+	0x49, 0x6B, 0xFA, 0xE2, 0x5A, 0xC7, 0xFF, 0x9C, 0xDF, 0x0D, 0xD9, 0xB5, 0x12, 0x07, 0x35, 0x7B, 
+	0x35, 0xDC, 0xF7, 0x12, 0x55, 0x71, 0x8A, 0x9F, 0x68, 0x66, 0x2A, 0x72, 0x55, 0x14, 0x82, 0xE2, 
+	0xBC, 0x3A, 0x39, 0xA7, 0x91, 0xA9, 0x91, 0xC8, 0x2B, 0x5F, 0x0A, 0x09, 0xFD, 0xE0, 0x6B, 0x58, 
+	0x85, 0x58, 0x1D, 0xCD, 0xEA, 0xAE, 0xBA, 0xA5, 0x49, 0xFF, 0x69, 0x4A, 0x10, 0xDD, 0x5A, 0xE0, 
+	0x0E, 0xD3, 0x9C, 0x0B, 0xD8, 0x28, 0x2E, 0xCA, 0x8E, 0x9F, 0x29, 0x84, 0xC8, 0xCA, 0x47, 0x79, 
+	0xB9, 0xCC, 0x71, 0xC6, 0xE1, 0xC1, 0x4D, 0x15, 0xB6, 0x1F, 0x92, 0x13, 0x2C, 0x83, 0xBE, 0x0D, 
+	0x03, 0x0A, 0x7C, 0x02, 0x7C, 0x2C, 0xFA, 0x8E, 0xC8, 0x23, 0xE1, 0xFD, 0x83, 0xDC, 0x61, 0xDB, 
+	0x1C, 0xE4, 0x3F, 0xE8, 0xA9, 0x1C, 0x55, 0x1E, 0xB2, 0xF1, 0x47, 0x6C, 0x5A, 0xD8, 0xD9, 0xD4, 
+	0xA8, 0xBF, 0x4B, 0xF9, 0x0A, 0xD5, 0xBF, 0x1D, 0x88, 0x30, 0x12, 0x80, 0x72, 0x49, 0x6C, 0x91, 
+	0x70, 0x6A, 0xB7, 0x4D, 0x86, 0x34, 0x8F, 0x57, 0x1A, 0x6A, 0x16, 0x7B, 0xA5, 0x5D, 0x3C, 0x74, 
+	0x8E, 0x03, 0x1D, 0x53, 0xD6, 0x1C, 0x75, 0x83, 0x2C, 0xF7, 0x5E, 0xF6, 0xE0, 0xC9, 0x25, 0x11, 
+	0x9F, 0x98, 0x73, 0xD2, 0xBE, 0x50, 0x56, 0xD6, 0x73, 0x38, 0xC8, 0x30, 0x5A, 0xB5, 0xF6, 0x67, 
+	0x37, 0x75, 0x7E, 0x99, 0x71, 0xC7, 0x30, 0x26, 0x0D, 0x43, 0xA2, 0x0B, 0xF0, 0xC2, 0xCC, 0x38, 
+	0xDF, 0x0F, 0x37, 0x25, 0xA0, 0x4F, 0x18, 0x5A, 0x40, 0x75, 0x2D, 0xFC, 0x52, 0xFF, 0x37, 0xD5, 
+	0x38, 0x06, 0xC6, 0x62, 0x13, 0xA0, 0x8E, 0x7A, 0xFA, 0xDD, 0xB9, 0x25, 0xBE, 0xBC, 0x1F, 0x02, 
+	0x4C, 0x56, 0xA1, 0xBA, 0x08, 0xBB, 0x65, 0xAE, 0xAC, 0x14, 0x4E, 0x65, 0xD7, 0xD1, 0x99, 0xFF, 
+	0x14, 0x33, 0x9F, 0x18, 0x1D, 0x54, 0x70, 0x6F, 0xBC, 0x85, 0xB4, 0x49, 0x82, 0x4C, 0x0A, 0xA6, 
+	0xE8, 0x10, 0x61, 0x8F, 0xED, 0xFD, 0x7F, 0x10, 0xAA, 0xAC, 0x13, 0xB5, 0xE2, 0x5D, 0xF3, 0x69, 
+	0x2B, 0xC3, 0xE1, 0xC2, 0x89, 0x9A, 0x46, 0xF0, 0x97, 0x34, 0xFC, 0x93, 0x31, 0x45, 0xE9, 0x7A, 
+	0xD4, 0x46, 0x1A, 0x31, 0xFF, 0x65, 0x39, 0xAE, 0xCE, 0xC5, 0x40, 0x2F, 0xD0, 0xCB, 0x1E, 0xC6, 
+	0x86, 0xDC, 0x2F, 0x72, 0x34, 0x35, 0x28, 0xAD, 0x96, 0xC3, 0xBE, 0xE4, 0xC8, 0xA5, 0xB6, 0x6B, 
+	0xBD, 0xFB, 0x9B, 0xE5, 0x16, 0x01, 0x4A, 0x55, 0xA2, 0xB0, 0xE8, 0x66, 0x4A, 0xC1, 0xE3, 0xC0, 
+	0xB9, 0x87, 0xF4, 0xD6, 0x8C, 0xF4, 0x61, 0x42, 0xA4, 0xBF, 0x73, 0x03, 0x67, 0xBD, 0x2F, 0x30, 
+	0x6E, 0x97, 0x45, 0x0F, 0xC6, 0xBD, 0xCA, 0x2E, 0x69, 0x72, 0x41, 0x07, 0x38, 0x74, 0x18, 0xB1, 
+	0xCB, 0x5C, 0xD3, 0xC2, 0x1D, 0xB7, 0xF2, 0xAF, 0xEC, 0x00, 0xCD, 0x4F, 0x6F, 0xDE, 0xB2, 0xAC, 
+	0x44, 0x4C, 0x1A, 0x56, 0xC3, 0x93, 0x21, 0x57, 0x8C, 0x6B, 0x1C, 0xD7, 0xF9, 0xC7, 0xC0, 0xA9, 
+	0xF7, 0xE4, 0xA3, 0xD8, 0x58, 0x9B, 0x35, 0xE6, 0x00, 0x7C, 0xE2, 0x12, 0xD0, 0x53, 0x61, 0x1F, 
+	0xC6, 0xA5, 0x81, 0x7A, 0x52, 0xEF, 0x09, 0x36, 0x1A, 0x62, 0x3C, 0x92, 0xD2, 0x65, 0x43, 0xF6, 
+	0xDF, 0x0B, 0x89, 0x7E, 0xC6, 0xB9, 0x47, 0xF4, 0x52, 0x14, 0x0C, 0x44, 0x4D, 0x23, 0x55, 0x6F, 
+	0x80, 0xC2, 0xBE, 0xC5, 0x59, 0xF8, 0xB5, 0x27, 0xE6, 0xE8, 0xF0, 0x32, 0x91, 0x3A, 0x59, 0x2B, 
+	0x1D, 0xF9, 0xAC, 0xF9, 0x2E, 0xF3, 0xB9, 0x36, 0x8C, 0x1A, 0x5D, 0x92, 0x33, 0xEA, 0xA6, 0xAF, 
+	0x71, 0x24, 0xE2, 0x7F, 0x18, 0xB1, 0x23, 0x3C, 0x53, 0xF3, 0xCC, 0x5D, 0xD4, 0x2D, 0x2B, 0x7A, 
+	0xF8, 0x94, 0x04, 0xC0, 0x8C, 0x65, 0x4D, 0x3A, 0xFA, 0xCF, 0xF9, 0x07, 0xC2, 0xD7, 0x75, 0x87, 
+	0x47, 0x9E, 0x6E, 0xA0, 0x79, 0x81, 0x6E, 0x03, 0xC7, 0xD2, 0x75, 0xF6, 0xC3, 0x85, 0x22, 0x28, 
+	0x1B, 0x39, 0x63, 0xCC, 0x12, 0x7E, 0x4A, 0xC3, 0x2A, 0x45, 0x85, 0xA9, 0x54, 0xDF, 0xB2, 0x33, 
+	0xEF, 0x76, 0x25, 0x31, 0xC9, 0xCD, 0xDA, 0x14, 0xE7, 0xD8, 0x4D, 0x18, 0xCE, 0xAB, 0xE7, 0x85, 
+	0xDD, 0x95, 0x8D, 0x36, 0xA1, 0x18, 0x87, 0x5E, 0xB6, 0x75, 0x2F, 0x3B, 0x97, 0x09, 0x18, 0x47, 
+	0xC8, 0x90, 0x37, 0xA3, 0xB2, 0xD2, 0x09, 0x3C, 0x5E, 0x6C, 0x2E, 0x72, 0x38, 0x08, 0x24, 0x99, 
+	0x90, 0xD0, 0x86, 0xC7, 0xD3, 0xFB, 0x4E, 0xA2, 0xDF, 0xC7, 0x26, 0x4D, 0x8E, 0x81, 0x98, 0x19, 
+	0x15, 0xD0, 0x4C, 0xB8, 0x44, 0xF7, 0x53, 0x1C, 0x0F, 0xAF, 0x78, 0x4C, 0x20, 0xB8, 0xCC, 0xBB, 
+	0x20, 0x60, 0xEC, 0x55, 0x70, 0xBD, 0xE9, 0x02, 0x63, 0x9F, 0x1F, 0xA7, 0xD5, 0x27, 0x18, 0x33, 
+	0x29, 0xA8, 0x33, 0x6E, 0xCB, 0x80, 0x40, 0x2D, 0x52, 0xDF, 0x6C, 0x78, 0x8F, 0xA6, 0x1D, 0xCF, 
+	0xE8, 0xB9, 0x54, 0x6B
+};
+
+uint8 Module_79C0768D657977D697E10BAD956CCED1_Key[16] =
+{
+	0xAE, 0x25, 0xBC, 0x51, 0x06, 0x3B, 0x77, 0xBD, 0x36, 0x3C, 0x3E, 0xFE, 0x0F, 0xC1, 0x73, 0xF9
+};
+
+#endif
diff --git a/src/game/warden/WardenWin.cpp b/src/game/warden/WardenWin.cpp
new file mode 100644
index 00000000000..5ce24c2f109
--- /dev/null
+++ b/src/game/warden/WardenWin.cpp
@@ -0,0 +1,507 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Auth/HMACSHA1.h"
+#include "Auth/WardenKeyGeneration.h"
+#include "Common.h"
+#include "WorldPacket.h"
+#include "../WorldSession.h"
+#include "Log.h"
+#include "../Opcodes.h"
+#include "ByteBuffer.h"
+#include <openssl/md5.h>
+#include "ProgressBar.h"
+#include "Database/DatabaseEnv.h"
+#include "../World.h"
+#include "../Player.h"
+#include "Util.h"
+#include "WardenWin.h"
+#include "WardenModuleWin.h"
+#include "WardenDataStorage.h"
+
+CWardenDataStorage WardenDataStorage;
+
+WardenWin::WardenWin()
+{
+}
+
+WardenWin::~WardenWin()
+{
+}
+
+void WardenWin::Init(WorldSession *pClient, BigNumber *K)
+{
+    Client = pClient;
+    // Generate Warden Key
+    SHA1Randx WK(K->AsByteArray(), K->GetNumBytes());
+    WK.generate(InputKey, 16);
+    WK.generate(OutputKey, 16);
+    /*
+    Seed: 4D808D2C77D905C41A6380EC08586AFE (0x05 packet)
+    Hash: 568C054C781A972A6037A2290C22B52571A06F4E (0x04 packet)
+    Module MD5: 79C0768D657977D697E10BAD956CCED1
+    New Client Key: 7F 96 EE FD A5 B6 3D 20 A4 DF 8E 00 CB F4 83 04
+    New Cerver Key: C2 B7 AD ED FC CC A9 C2 BF B3 F8 56 02 BA 80 9B
+    */
+    uint8 mod_seed[16] = { 0x4D, 0x80, 0x8D, 0x2C, 0x77, 0xD9, 0x05, 0xC4, 0x1A, 0x63, 0x80, 0xEC, 0x08, 0x58, 0x6A, 0xFE };
+
+    memcpy(Seed, mod_seed, 16);
+
+    iCrypto.Init(InputKey);
+    oCrypto.Init(OutputKey);
+    DEBUG_LOG("WARDEN: Server side warden for client %u initializing...", pClient->GetAccountId());
+    PrintHexArray("  C->S Key: ", InputKey, 16, true);
+    PrintHexArray("  S->C Key: ", OutputKey, 16, true);
+    PrintHexArray("  Seed: ", Seed, 16, true);
+    DEBUG_LOG("WARDEN: Loading Module...");
+
+    Module = GetModuleForClient(Client);
+
+    PrintHexArray("  Module Key: ", Module->Key, 16, true);
+    PrintHexArray("  Module ID: ", Module->ID, 16, true);
+    RequestModule();
+}
+
+ClientWardenModule *WardenWin::GetModuleForClient(WorldSession *session)
+{
+    ClientWardenModule *mod = new ClientWardenModule;
+
+    uint32 len = sizeof(Module_79C0768D657977D697E10BAD956CCED1_Data);
+
+    // data assign
+    mod->CompressedSize = len;
+    mod->CompressedData = new uint8[len];
+    memcpy(mod->CompressedData, Module_79C0768D657977D697E10BAD956CCED1_Data, len);
+    memcpy(mod->Key, Module_79C0768D657977D697E10BAD956CCED1_Key, 16);
+
+    // md5 hash
+    MD5_CTX ctx;
+    MD5_Init(&ctx);
+    MD5_Update(&ctx, mod->CompressedData, len);
+    MD5_Final((uint8*)&mod->ID, &ctx);
+
+    return mod;
+}
+
+void WardenWin::InitializeModule()
+{
+    DEBUG_LOG("WARDEN: Initialize module");
+
+    // Create packet structure
+    WardenInitModuleRequest Request;
+    Request.Command1 = WARDEN_SMSG_MODULE_INITIALIZE;
+    Request.Size1 = 20;
+    Request.CheckSumm1 = BuildChecksum(&Request.Unk1, 20);
+    Request.Unk1 = 1;
+    Request.Unk2 = 0;
+    Request.Type = 1;
+    Request.String_library1 = 0;
+    Request.Function1[0] = 0x00024F80;                      // 0x00400000 + 0x00024F80 SFileOpenFile
+    Request.Function1[1] = 0x000218C0;                      // 0x00400000 + 0x000218C0 SFileGetFileSize
+    Request.Function1[2] = 0x00022530;                      // 0x00400000 + 0x00022530 SFileReadFile
+    Request.Function1[3] = 0x00022910;                      // 0x00400000 + 0x00022910 SFileCloseFile
+
+    Request.Command2 = WARDEN_SMSG_MODULE_INITIALIZE;
+    Request.Size2 = 8;
+    Request.CheckSumm2 = BuildChecksum(&Request.Unk2, 8);
+    Request.Unk3 = 4;
+    Request.Unk4 = 0;
+    Request.String_library2 = 0;
+    Request.Function2 = 0x00419D40;                         // 0x00400000 + 0x00419D40 FrameScript::GetText
+    Request.Function2_set = 1;
+
+    Request.Command3 = WARDEN_SMSG_MODULE_INITIALIZE;
+    Request.Size3 = 8;
+    Request.CheckSumm3 = BuildChecksum(&Request.Unk5, 8);
+    Request.Unk5 = 1;
+    Request.Unk6 = 1;
+    Request.String_library3 = 0;
+    Request.Function3 = 0x0046AE20;                         // 0x00400000 + 0x0046AE20 PerformanceCounter
+    Request.Function3_set = 1;
+
+    // Encrypt with warden RC4 key.
+    EncryptData((uint8*)&Request, sizeof(WardenInitModuleRequest));
+
+    WorldPacket pkt(SMSG_WARDEN_DATA, sizeof(WardenInitModuleRequest));
+    pkt.append((uint8*)&Request, sizeof(WardenInitModuleRequest));
+    Client->SendPacket(&pkt);
+}
+
+void WardenWin::RequestHash()
+{
+    DEBUG_LOG("WARDEN: Request hash");
+
+    // Create packet structure
+    WardenHashRequest Request;
+    Request.Command = WARDEN_SMSG_HASH_REQUEST;
+    memcpy(Request.Seed, Seed, 16);
+
+    // Encrypt with warden RC4 key.
+    EncryptData((uint8*)&Request, sizeof(WardenHashRequest));
+
+    WorldPacket pkt(SMSG_WARDEN_DATA, sizeof(WardenHashRequest));
+    pkt.append((uint8*)&Request, sizeof(WardenHashRequest));
+    Client->SendPacket(&pkt);
+}
+
+void WardenWin::HandleHashResult(ByteBuffer &buff)
+{
+    buff.rpos(buff.wpos());
+
+    const uint8 validHash[20] = { 0x56, 0x8C, 0x05, 0x4C, 0x78, 0x1A, 0x97, 0x2A, 0x60, 0x37, 0xA2, 0x29, 0x0C, 0x22, 0xB5, 0x25, 0x71, 0xA0, 0x6F, 0x4E };
+
+    // verify key not equal kick player
+    if (memcmp(buff.contents() + 1, validHash, sizeof(validHash)) != 0)
+    {
+        sLog.outError("WARDEN: Request hash reply: failed");
+        if (Client->GetPlayer())
+            Client->GetPlayer()->GetAntiCheat()->DoAntiCheatCheck(CHECK_WARDEN_KEY,0,true);
+        return;
+    }
+
+    DEBUG_LOG("WARDEN: Request hash reply: succeed");
+
+    // client 7F96EEFDA5B63D20A4DF8E00CBF48304
+    const uint8 client_key[16] = { 0x7F, 0x96, 0xEE, 0xFD, 0xA5, 0xB6, 0x3D, 0x20, 0xA4, 0xDF, 0x8E, 0x00, 0xCB, 0xF4, 0x83, 0x04 };
+
+    // server C2B7ADEDFCCCA9C2BFB3F85602BA809B
+    const uint8 server_key[16] = { 0xC2, 0xB7, 0xAD, 0xED, 0xFC, 0xCC, 0xA9, 0xC2, 0xBF, 0xB3, 0xF8, 0x56, 0x02, 0xBA, 0x80, 0x9B };
+
+    // change keys here
+    memcpy(InputKey, client_key, 16);
+    memcpy(OutputKey, server_key, 16);
+
+    iCrypto.Init(InputKey);
+    oCrypto.Init(OutputKey);
+
+    m_initialized = true;
+
+    m_WardenTimer = WorldTimer::getMSTime();
+}
+
+void WardenWin::RequestData()
+{
+    DEBUG_LOG("WARDEN: Request data");
+
+    if (MemCheck.empty())
+        MemCheck.assign(WardenDataStorage.MemCheckIds.begin(), WardenDataStorage.MemCheckIds.end());
+
+    ServerTicks = WorldTimer::getMSTime();
+
+    uint32 maxid = WardenDataStorage.InternalDataID;
+
+    uint32 id;
+    uint8 type;
+    WardenData *wd;
+
+    SendDataId.clear();
+
+    // always! this is SpeedHack on WEH
+    SendDataId.push_back(385);
+
+    for (int i = 0; i < 3; ++i)                             // for now include 3 MEM_CHECK's
+    {
+        if (MemCheck.empty())
+            break;
+        id = MemCheck.back();
+        SendDataId.push_back(id);
+        MemCheck.pop_back();
+    }
+
+    ByteBuffer buff;
+    buff << uint8(WARDEN_SMSG_CHEAT_CHECKS_REQUEST);
+
+    int maxSize = 8 - MemCheck.size();
+    for (int i = 0; i < maxSize; ++i)                             // for now include 5 random checks
+    {
+        id = irand(1, maxid - 1);
+        wd = WardenDataStorage.GetWardenDataById(id);
+
+        SendDataId.push_back(id);
+        switch (wd->Type)
+        {
+            case MPQ_CHECK:
+            case LUA_STR_CHECK:
+            case DRIVER_CHECK:
+                buff << uint8(wd->str.size());
+                buff.append(wd->str.c_str(), wd->str.size());
+                break;
+            default:
+                break;
+        }
+    }
+
+    uint8 xorByte = InputKey[0];
+
+    buff << uint8(0x00);
+    buff << uint8(TIMING_CHECK ^ xorByte);                  // check TIMING_CHECK
+
+    uint8 index = 1;
+
+    for (std::vector<uint32>::iterator itr = SendDataId.begin(); itr != SendDataId.end(); ++itr)
+    {
+        wd = WardenDataStorage.GetWardenDataById(*itr);
+
+        type = wd->Type;
+        buff << uint8(type ^ xorByte);
+        switch (type)
+        {
+            case MEM_CHECK:
+            {
+                buff << uint8(0x00);
+                buff << uint32(wd->Address);
+                buff << uint8(wd->Length);
+                break;
+            }
+            case PAGE_CHECK_A:
+            case PAGE_CHECK_B:
+            {
+                buff.append(wd->i.AsByteArray(0, false), wd->i.GetNumBytes());
+                buff << uint32(wd->Address);
+                buff << uint8(wd->Length);
+                break;
+            }
+            case MPQ_CHECK:
+            case LUA_STR_CHECK:
+            {
+                buff << uint8(index++);
+                break;
+            }
+            case DRIVER_CHECK:
+            {
+                buff.append(wd->i.AsByteArray(0, false), wd->i.GetNumBytes());
+                buff << uint8(index++);
+                break;
+            }
+            case MODULE_CHECK:
+            {
+                uint32 seed = static_cast<uint32>(rand32());
+                buff << uint32(seed);
+                HMACSHA1 hmac(4, (uint8*)&seed);
+                hmac.UpdateData(wd->str);
+                hmac.Finalize();
+                buff.append(hmac.GetDigest(), hmac.GetLength());
+                break;
+            }
+            /*case PROC_CHECK:
+            {
+                buff.append(wd->i.AsByteArray(0, false), wd->i.GetNumBytes());
+                buff << uint8(index++);
+                buff << uint8(index++);
+                buff << uint32(wd->Address);
+                buff << uint8(wd->Length);
+                break;
+            }*/
+            default:
+                break;                                      // should never happens
+        }
+    }
+    buff << uint8(xorByte);
+    buff.hexlike();
+
+    // Encrypt with warden RC4 key.
+    EncryptData(const_cast<uint8*>(buff.contents()), buff.size());
+
+    WorldPacket pkt(SMSG_WARDEN_DATA, buff.size());
+    pkt.append(buff);
+    Client->SendPacket(&pkt);
+
+    m_WardenDataSent = true;
+
+    std::stringstream stream;
+    stream << "Sent check id's: ";
+    for (std::vector<uint32>::iterator itr = SendDataId.begin(); itr != SendDataId.end(); ++itr)
+        stream << *itr << " ";
+    DEBUG_LOG("WARDEN: %s",stream.str().c_str());
+}
+
+void WardenWin::HandleData(ByteBuffer &buff)
+{
+    DEBUG_LOG("WARDEN: Handle data");
+
+    m_WardenDataSent = false;
+    m_WardenKickTimer = 0;
+
+    uint16 Length;
+    buff >> Length;
+    uint32 Checksum;
+    buff >> Checksum;
+
+    if (!IsValidCheckSum(Checksum, buff.contents() + buff.rpos(), Length))
+    {
+        buff.rpos(buff.wpos());
+        if (Client->GetPlayer())
+            Client->GetPlayer()->GetAntiCheat()->DoAntiCheatCheck(CHECK_WARDEN_CHECKSUM, 0, true);
+        return;
+    }
+
+    bool found = false;
+
+    //TIMING_CHECK
+    {
+        uint8 result;
+        buff >> result;
+        // TODO: test it.
+        if (result == 0x00)
+        {
+            sLog.outError("WARDEN: TIMING CHECK FAIL result 0x00");
+            found = true;
+        }
+
+        uint32 newClientTicks;
+        buff >> newClientTicks;
+
+        uint32 ticksNow = WorldTimer::getMSTime();
+        uint32 ourTicks = newClientTicks + (ticksNow - ServerTicks);
+
+        DEBUG_LOG("WARDEN: ServerTicks %u", ticksNow);         // now
+        DEBUG_LOG("WARDEN: RequestTicks %u", ServerTicks);     // at request
+        DEBUG_LOG("WARDEN: Ticks %u", newClientTicks);         // at response
+        DEBUG_LOG("WARDEN: Ticks diff %u", ourTicks - newClientTicks);
+    }
+
+    WardenDataResult *rs;
+    WardenData *rd;
+    uint8 type = 0;
+    uint32 checkNum = 0;
+
+    for (std::vector<uint32>::iterator itr = SendDataId.begin(); itr != SendDataId.end(); ++itr)
+    {
+        rd = WardenDataStorage.GetWardenDataById(*itr);
+        rs = WardenDataStorage.GetWardenResultById(*itr);
+
+        type = rd->Type;
+        switch (type)
+        {
+            case MEM_CHECK:
+            {
+                uint8 Mem_Result;
+                buff >> Mem_Result;
+
+                if (Mem_Result != 0)
+                {
+                    sLog.outError("WARDEN: RESULT MEM_CHECK not 0x00, CheckId %u account Id %u", *itr, Client->GetAccountId());
+                    found = true;
+                    checkNum = *itr;
+                    continue;
+                }
+
+                if (memcmp(buff.contents() + buff.rpos(), rs->res.AsByteArray(0, false), rd->Length) != 0)
+                {
+                    sLog.outError("WARDEN: RESULT MEM_CHECK fail CheckId %u account Id %u", *itr, Client->GetAccountId());
+                    found = true;
+                    checkNum = *itr;
+                    buff.rpos(buff.rpos() + rd->Length);
+                    continue;
+                }
+
+                buff.rpos(buff.rpos() + rd->Length);
+                DEBUG_LOG("WARDEN: RESULT MEM_CHECK passed CheckId %u account Id %u", *itr, Client->GetAccountId());
+                break;
+            }
+            case PAGE_CHECK_A:
+            case PAGE_CHECK_B:
+            case DRIVER_CHECK:
+            case MODULE_CHECK:
+            {
+                const uint8 byte = 0xE9;
+                if (memcmp(buff.contents() + buff.rpos(), &byte, sizeof(uint8)) != 0)
+                {
+                    if (type == PAGE_CHECK_A || type == PAGE_CHECK_B)
+                        sLog.outError("WARDEN: RESULT PAGE_CHECK fail, CheckId %u account Id %u", *itr, Client->GetAccountId());
+                    if (type == MODULE_CHECK)
+                        sLog.outError("WARDEN: RESULT MODULE_CHECK fail, CheckId %u account Id %u", *itr, Client->GetAccountId());
+                    if (type == DRIVER_CHECK)
+                        sLog.outError("WARDEN: RESULT DRIVER_CHECK fail, CheckId %u account Id %u", *itr, Client->GetAccountId());
+                    found = true;
+                    checkNum = *itr;
+                    buff.rpos(buff.rpos() + 1);
+                    continue;
+                }
+
+                buff.rpos(buff.rpos() + 1);
+                if (type == PAGE_CHECK_A || type == PAGE_CHECK_B)
+                    DEBUG_LOG("WARDEN: RESULT PAGE_CHECK passed CheckId %u account Id %u", *itr, Client->GetAccountId());
+                else if (type == MODULE_CHECK)
+                    DEBUG_LOG("WARDEN: RESULT MODULE_CHECK passed CheckId %u account Id %u", *itr, Client->GetAccountId());
+                else if (type == DRIVER_CHECK)
+                    DEBUG_LOG("WARDEN: RESULT DRIVER_CHECK passed CheckId %u account Id %u", *itr, Client->GetAccountId());
+                break;
+            }
+            case LUA_STR_CHECK:
+            {
+                uint8 Lua_Result;
+                buff >> Lua_Result;
+
+                if (Lua_Result != 0)
+                {
+                    sLog.outError("WARDEN: RESULT LUA_STR_CHECK fail, CheckId %u account Id %u", *itr, Client->GetAccountId());
+                    found = true;
+                    checkNum = *itr;
+                    continue;
+                }
+
+                uint8 luaStrLen;
+                buff >> luaStrLen;
+
+                if (luaStrLen != 0)
+                {
+                    char *str = new char[luaStrLen + 1];
+                    memset(str, 0, luaStrLen + 1);
+                    memcpy(str, buff.contents() + buff.rpos(), luaStrLen);
+                    DEBUG_LOG("WARDEN: Lua string: %s", str);
+                    delete[] str;
+                }
+                buff.rpos(buff.rpos() + luaStrLen);         // skip string
+                DEBUG_LOG("WARDEN: RESULT LUA_STR_CHECK passed, CheckId %u account Id %u", *itr, Client->GetAccountId());
+                break;
+            }
+            case MPQ_CHECK:
+            {
+                uint8 Mpq_Result;
+                buff >> Mpq_Result;
+
+                if (Mpq_Result != 0)
+                {
+                    sLog.outError("WARDEN: RESULT MPQ_CHECK not 0x00 account id %u", Client->GetAccountId());
+                    found = true;
+                    checkNum = *itr;
+                    continue;
+                }
+
+                if (memcmp(buff.contents() + buff.rpos(), rs->res.AsByteArray(0, false), 20) != 0) // SHA1
+                {
+                    sLog.outError("WARDEN: RESULT MPQ_CHECK fail, CheckId %u account Id %u", *itr, Client->GetAccountId());
+                    found = true;
+                    checkNum = *itr;
+                    buff.rpos(buff.rpos() + 20);            // 20 bytes SHA1
+                    continue;
+                }
+
+                buff.rpos(buff.rpos() + 20);                // 20 bytes SHA1
+                DEBUG_LOG("WARDEN: RESULT MPQ_CHECK passed, CheckId %u account Id %u", *itr, Client->GetAccountId());
+                break;
+            }
+            default:                                        // should never happens
+                break;
+        }
+    }
+
+    if (Client->GetPlayer() && found)
+        Client->GetPlayer()->GetAntiCheat()->DoAntiCheatCheck(CHECK_WARDEN_MEMORY,type,checkNum);
+}
diff --git a/src/game/warden/WardenWin.h b/src/game/warden/WardenWin.h
new file mode 100644
index 00000000000..cec7035bd25
--- /dev/null
+++ b/src/game/warden/WardenWin.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _WARDEN_WIN_H
+#define _WARDEN_WIN_H
+
+#include "Auth/SARC4.h"
+#include <map>
+#include "Auth/BigNumber.h"
+#include "ByteBuffer.h"
+
+enum WardenCheckType
+{
+    MEM_CHECK               = 0xF3,                         // byte moduleNameIndex + uint Offset + byte Len (check to ensure memory isn't modified)
+    PAGE_CHECK_A            = 0xB2,                         // uint Seed + byte[20] SHA1 + uint Addr + byte Len (scans all pages for specified hash)
+    PAGE_CHECK_B            = 0xBF,                         // uint Seed + byte[20] SHA1 + uint Addr + byte Len (scans only pages starts with MZ+PE headers for specified hash)
+    MPQ_CHECK               = 0x98,                         // byte fileNameIndex (check to ensure MPQ file isn't modified)
+    LUA_STR_CHECK           = 0x8B,                         // byte luaNameIndex (check to ensure LUA string isn't used)
+    DRIVER_CHECK            = 0x71,                         // uint Seed + byte[20] SHA1 + byte driverNameIndex (check to ensure driver isn't loaded)
+    TIMING_CHECK            = 0x57,                         // empty (check to ensure GetTickCount() isn't detoured)
+    PROC_CHECK              = 0x7E,                         // uint Seed + byte[20] SHA1 + byte moluleNameIndex + byte procNameIndex + uint Offset + byte Len (check to ensure proc isn't detoured)
+    MODULE_CHECK            = 0xD9,                         // uint Seed + byte[20] SHA1 (check to ensure module isn't injected)
+};
+
+#if defined(__GNUC__)
+#pragma pack(1)
+#else
+#pragma pack(push,1)
+#endif
+
+struct WardenInitModuleRequest
+{
+    uint8 Command1;
+    uint16 Size1;
+    uint32 CheckSumm1;
+    uint8 Unk1;
+    uint8 Unk2;
+    uint8 Type;
+    uint8 String_library1;
+    uint32 Function1[4];
+
+    uint8 Command2;
+    uint16 Size2;
+    uint32 CheckSumm2;
+    uint8 Unk3;
+    uint8 Unk4;
+    uint8 String_library2;
+    uint32 Function2;
+    uint8 Function2_set;
+
+    uint8 Command3;
+    uint16 Size3;
+    uint32 CheckSumm3;
+    uint8 Unk5;
+    uint8 Unk6;
+    uint8 String_library3;
+    uint32 Function3;
+    uint8 Function3_set;
+};
+
+#if defined(__GNUC__)
+#pragma pack()
+#else
+#pragma pack(pop)
+#endif
+
+class WorldSession;
+class WardenBase;
+
+class WardenWin : WardenBase
+{
+    public:
+        WardenWin();
+        ~WardenWin();
+
+        void Init(WorldSession *pClient, BigNumber *K);
+        ClientWardenModule *GetModuleForClient(WorldSession *session);
+        void InitializeModule();
+        void RequestHash();
+        void HandleHashResult(ByteBuffer &buff);
+        void RequestData();
+        void HandleData(ByteBuffer &buff);
+
+    private:
+        uint32 ServerTicks;
+        std::vector<uint32> SendDataId;
+        std::vector<uint32> MemCheck;
+};
+
+#endif
diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
index 735e56b2e3d..4069227a34b 100644
--- a/src/mangosd/CMakeLists.txt
+++ b/src/mangosd/CMakeLists.txt
@@ -16,27 +16,53 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-set(EXECUTABLE_NAME mangosd)
-file(GLOB_RECURSE EXECUTABLE_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h)
+if(NOT UNIX)
+  set(EXECUTABLE_NAME mangosd)
+else()
+  set(EXECUTABLE_NAME mangos-worldd)
+endif()
+
+set(EXECUTABLE_SRCS
+    CliRunnable.cpp
+    CliRunnable.h
+    MaNGOSsoap.cpp
+    MaNGOSsoap.h
+    Main.cpp
+    Master.cpp
+    Master.h
+    RASocket.cpp
+    RASocket.h
+    WorldRunnable.cpp
+    WorldRunnable.h
+    soapC.cpp
+    soapH.h
+    soapServer.cpp
+    soapStub.h
+   )
 
 if(WIN32)
-  list(APPEND EXECUTABLE_SRCS
-    mangosd.rc
-  )
+  # add resource file to windows build
+  set(EXECUTABLE_SRCS ${EXECUTABLE_SRCS} mangosd.rc)
 endif()
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/shared
   ${CMAKE_SOURCE_DIR}/dep/include/gsoap
+  ${CMAKE_SOURCE_DIR}/dep/include/g3dlite
   ${CMAKE_SOURCE_DIR}/src/framework
   ${CMAKE_SOURCE_DIR}/src/game
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/src/shared
   ${ACE_INCLUDE_DIR}
-  ${MYSQL_INCLUDE_DIR}
   ${OPENSSL_INCLUDE_DIR}
 )
 
+if(POSTGRESQL)
+  include_directories(${PGSQL_INCLUDE_DIR})
+else()
+  include_directories(${MYSQL_INCLUDE_DIR})
+endif()
+
 add_executable(${EXECUTABLE_NAME}
   ${EXECUTABLE_SRCS}
 )
@@ -96,6 +122,10 @@ install(TARGETS ${EXECUTABLE_NAME} DESTINATION ${BIN_DIR})
 install(FILES run-mangosd DESTINATION ${BIN_DIR})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mangosd.conf.dist.in ${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist DESTINATION ${CONF_DIR})
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../game/ahbot/ahbot.conf.dist.in ${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist DESTINATION ${CONF_DIR})
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../game/playerbot/aiplayerbot.conf.dist.in ${CMAKE_CURRENT_BINARY_DIR}/aiplayerbot.conf.dist)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/aiplayerbot.conf.dist DESTINATION ${CONF_DIR})
 
 if(WIN32 AND MSVC)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb DESTINATION ${BIN_DIR} CONFIGURATIONS Debug)
diff --git a/src/mangosd/CliRunnable.cpp b/src/mangosd/CliRunnable.cpp
index c2951c2bfeb..4cd12580fc2 100644
--- a/src/mangosd/CliRunnable.cpp
+++ b/src/mangosd/CliRunnable.cpp
@@ -24,6 +24,7 @@
 #include "Language.h"
 #include "Log.h"
 #include "World.h"
+#include "AccountMgr.h"
 #include "ObjectMgr.h"
 #include "WorldSession.h"
 #include "Config/Config.h"
@@ -269,7 +270,7 @@ void ChatHandler::HandleCharacterDeletedRestoreHelper(DeletedInfo const& delInfo
         return;
     }
 
-    if (sObjectMgr.GetPlayerGuidByName(delInfo.name))
+    if (sAccountMgr.GetPlayerGuidByName(delInfo.name))
     {
         PSendSysMessage(LANG_CHARACTER_DELETED_SKIP_NAME, delInfo.name.c_str(), delInfo.lowguid, delInfo.accountId);
         return;
@@ -409,27 +410,33 @@ bool ChatHandler::HandleCharacterDeletedOldCommand(char* args)
 bool ChatHandler::HandleCharacterEraseCommand(char* args)
 {
     char* nameStr = ExtractLiteralArg(&args);
+
     if (!nameStr)
         return false;
 
-    Player* target;
-    ObjectGuid target_guid;
-    std::string target_name;
-    if (!ExtractPlayerTarget(&nameStr, &target, &target_guid, &target_name))
+    std::string target_name = nameStr;
+
+    if(!normalizePlayerName(target_name))
         return false;
 
-    uint32 account_id;
+    ObjectGuid target_guid = sAccountMgr.GetPlayerGuidByName(nameStr);
+    uint32 account_id = sAccountMgr.GetPlayerAccountIdByGUID(target_guid);
 
-    if (target)
+    if (target_guid.IsEmpty() || !account_id)
     {
-        account_id = target->GetSession()->GetAccountId();
-        target->GetSession()->KickPlayer();
+        SendSysMessage(LANG_PLAYER_NOT_FOUND);
+        SetSentErrorMessage(true);
+        return true;
     }
-    else
-        account_id = sObjectMgr.GetPlayerAccountIdByGUID(target_guid);
+
+    Player* target = ObjectAccessor::FindPlayerByName(nameStr);
+
+    if (target)
+        target->GetSession()->KickPlayer();
 
     std::string account_name;
-    sAccountMgr.GetName (account_id,account_name);
+
+    sAccountMgr.GetName(account_id,account_name);
 
     Player::DeleteFromDB(target_guid, account_id, true, true);
     PSendSysMessage(LANG_CHARACTER_DELETED, target_name.c_str(), target_guid.GetCounter(), account_name.c_str(), account_id);
@@ -461,7 +468,8 @@ bool ChatHandler::HandleAccountOnlineListCommand(char* args)
 
     ///- Get the list of accounts ID logged to the realm
     //                                                 0   1         2        3        4
-    QueryResult *result = LoginDatabase.PQuery("SELECT id, username, last_ip, gmlevel, expansion FROM account WHERE active_realm_id = %u", realmID);
+    //QueryResult *result = LoginDatabase.PQuery("SELECT id, username, last_ip, gmlevel, expansion FROM account WHERE active_realm_id = %u", realmID);
+    QueryResult* result = LoginDatabase.PQuery("SELECT a.id, a.username, a.last_ip, aa.gmlevel, a.expansion FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE active_realm_id = %u", sWorld.getConfig(CONFIG_UINT32_REALMID));
 
     return ShowAccountListHelper(result,&limit);
 }
@@ -479,8 +487,13 @@ bool ChatHandler::HandleAccountCreateCommand(char* args)
     std::string account_name = szAcc;
     std::string password = szPassword;
 
-    AccountOpResult result = sAccountMgr.CreateAccount(account_name, password);
-    switch(result)
+    AccountOpResult result;
+    uint32 expansion = 0;
+    if(ExtractUInt32(&args, expansion))
+        result = sAccountMgr.CreateAccount(account_name, password, expansion);
+    else
+        result = sAccountMgr.CreateAccount(account_name, password);
+    switch (result)
     {
         case AOR_OK:
             PSendSysMessage(LANG_ACCOUNT_CREATED,account_name.c_str());
@@ -562,6 +575,7 @@ bool ChatHandler::HandleServerLogLevelCommand(char *args)
         return true;
     }
 
+    sLog.ReloadConfigDefaults();
     sLog.SetLogLevel(args);
     return true;
 }
diff --git a/src/mangosd/Main.cpp b/src/mangosd/Main.cpp
index dda2ad8ceff..3ea74232536 100644
--- a/src/mangosd/Main.cpp
+++ b/src/mangosd/Main.cpp
@@ -30,6 +30,7 @@
 #include "AuctionHouseBot/AuctionHouseBot.h"
 #include "revision.h"
 #include "revision_nr.h"
+#include "revision_R2.h"
 #include <openssl/opensslv.h>
 #include <openssl/crypto.h>
 #include <ace/Version.h>
@@ -55,8 +56,6 @@ DatabaseType WorldDatabase;                                 ///< Accessor to the
 DatabaseType CharacterDatabase;                             ///< Accessor to the character database
 DatabaseType LoginDatabase;                                 ///< Accessor to the realm/login database
 
-uint32 realmID;                                             ///< Id of the realm
-
 /// Print out the usage string for this program on the console.
 void usage(const char *prog)
 {
@@ -104,7 +103,8 @@ extern int main(int argc, char **argv)
                 cfg_file = cmd_opts.opt_arg();
                 break;
             case 'v':
-                printf("%s\n", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,REVISION_ID));
+                printf("%s\n", _FULLVERSION(REVISION_R2));
+                printf("%s\n", _R2FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_R2,REVISION_ID));
                 return 0;
             case 's':
             {
@@ -179,30 +179,19 @@ extern int main(int argc, char **argv)
     }
 #endif
 
-    sLog.outString( "%s [world-daemon]", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,REVISION_ID) );
-    sLog.outString( "<Ctrl-C> to stop." );
-    sLog.outString("\n\n"
-        "MM   MM         MM   MM  MMMMM   MMMM   MMMMM\n"
-        "MM   MM         MM   MM MMM MMM MM  MM MMM MMM\n"
-        "MMM MMM         MMM  MM MMM MMM MM  MM MMM\n"
-        "MM M MM         MMMM MM MMM     MM  MM  MMM\n"
-        "MM M MM  MMMMM  MM MMMM MMM     MM  MM   MMM\n"
-        "MM M MM M   MMM MM  MMM MMMMMMM MM  MM    MMM\n"
-        "MM   MM     MMM MM   MM MM  MMM MM  MM     MMM\n"
-        "MM   MM MMMMMMM MM   MM MMM MMM MM  MM MMM MMM\n"
-        "MM   MM MM  MMM MM   MM  MMMMMM  MMMM   MMMMM\n"
-        "        MM  MMM http://getmangos.com\n"
-        "        MMMMMM\n\n");
-    sLog.outString("Using configuration file %s.", cfg_file);
-
-    DETAIL_LOG("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
+    sLog.outString("BOOT: [world-daemon] %s, http://github.com/mangosR2/mangos", _FULLVERSION(REVISION_R2) );
+    sLog.outString("BOOT: [world-daemon] %s", _R2FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_R2,REVISION_ID) );
+    sLog.outString("BOOT: Please, visit to github branch or forum http://mangosr2.2x2forum.com for report bugs");
+    sLog.outString("BOOT: Using configuration file %s.", cfg_file);
+
+    sLog.outString("BOOT: Using %s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
     if (SSLeay() < 0x009080bfL )
     {
-        DETAIL_LOG("WARNING: Outdated version of OpenSSL lib. Logins to server may not work!");
-        DETAIL_LOG("WARNING: Minimal required version [OpenSSL 0.9.8k]");
+        DETAIL_LOG("BOOT:WARNING: Outdated version of OpenSSL lib. Logins to server may not work!");
+        DETAIL_LOG("BOOT:WARNING: Minimal required version [OpenSSL 0.9.8k]");
     }
 
-    DETAIL_LOG("Using ACE: %s", ACE_VERSION);
+    sLog.outString("BOOT: Using ACE %s", ACE_VERSION);
 
     ///- Set progress bars show mode
     BarGoLink::SetOutputState(sConfig.GetBoolDefault("ShowProgressBars", true));
diff --git a/src/mangosd/Master.cpp b/src/mangosd/Master.cpp
index bc7ef987e17..3ac0bf2b012 100644
--- a/src/mangosd/Master.cpp
+++ b/src/mangosd/Master.cpp
@@ -31,8 +31,9 @@
 #include "WorldRunnable.h"
 #include "World.h"
 #include "Log.h"
+#include "MapManager.h"
 #include "Timer.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "SystemConfig.h"
 #include "Config/Config.h"
 #include "Database/DatabaseEnv.h"
@@ -47,6 +48,7 @@
 #include <ace/OS_NS_signal.h>
 #include <ace/TP_Reactor.h>
 #include <ace/Dev_Poll_Reactor.h>
+#include <ace/Stack_Trace.h>
 
 #ifdef WIN32
 #include "ServiceWin32.h"
@@ -74,18 +76,21 @@ class FreezeDetectorRunnable : public ACE_Based::Runnable
         w_loops = 0;
         m_lastchange = 0;
         w_lastchange = 0;
-        while(!World::IsStopped())
+        while (!World::IsStopped())
         {
-            ACE_Based::Thread::Sleep(1000);
+            ACE_Based::Thread::Sleep(sWorld.getConfig(CONFIG_UINT32_VMSS_FREEZECHECKPERIOD));
+
+            if (sWorld.getConfig(CONFIG_BOOL_VMSS_ENABLE))
+                sMapMgr.GetMapUpdater().update_hook();
 
             uint32 curtime = WorldTimer::getMSTime();
-            //DEBUG_LOG("anti-freeze: time=%u, counters=[%u; %u]",curtime,Master::m_masterLoopCounter,World::m_worldLoopCounter);
 
             // normal work
-            if (w_loops != World::m_worldLoopCounter)
+            uint32 worldLoopCounter = World::m_worldLoopCounter.value();
+            if (w_loops != worldLoopCounter)
             {
                 w_lastchange = curtime;
-                w_loops = World::m_worldLoopCounter;
+                w_loops      = worldLoopCounter;
             }
             // possible freeze
             else if (WorldTimer::getMSTimeDiff(w_lastchange, curtime) > _delaytime)
@@ -183,12 +188,12 @@ int Master::Run()
         uint32 pid = CreatePIDFile(pidfile);
         if( !pid )
         {
-            sLog.outError( "Cannot create PID file %s.\n", pidfile.c_str() );
+            sLog.outError( "BOOT: Cannot create PID file %s.", pidfile.c_str() );
             Log::WaitBeforeContinueIfNeed();
             return 1;
         }
 
-        sLog.outString( "Daemon PID: %u\n", pid );
+        sLog.outString( "BOOT: Daemon PID: %u", pid );
     }
 
     ///- Start the databases
@@ -221,7 +226,7 @@ int Master::Run()
     {
         std::string builds = AcceptableClientBuildsListStr();
         LoginDatabase.escape_string(builds);
-        LoginDatabase.DirectPExecute("UPDATE realmlist SET realmflags = realmflags & ~(%u), population = 0, realmbuilds = '%s'  WHERE id = '%u'", REALM_FLAG_OFFLINE, builds.c_str(), realmID);
+        LoginDatabase.DirectPExecute("UPDATE realmlist SET realmflags = realmflags & ~(%u), population = 0, realmbuilds = '%s'  WHERE id = '%u'", REALM_FLAG_OFFLINE, builds.c_str(), sWorld.getConfig(CONFIG_UINT32_REALMID));
     }
 
     ACE_Based::Thread* cliThread = NULL;
@@ -259,14 +264,14 @@ int Master::Run()
 
                 if(!curAff )
                 {
-                    sLog.outError("Processors marked in UseProcessors bitmask (hex) %x not accessible for mangosd. Accessible processors bitmask (hex): %x",Aff,appAff);
+                    sLog.outError("BOOT: Processors marked in UseProcessors bitmask (hex) %x not accessible for mangosd. Accessible processors bitmask (hex): %x",Aff,appAff);
                 }
                 else
                 {
                     if(SetProcessAffinityMask(hProcess,curAff))
-                        sLog.outString("Using processors (bitmask, hex): %x", curAff);
+                        sLog.outString("BOOT: Using processors (bitmask, hex): %x", curAff);
                     else
-                        sLog.outError("Can't set used processors (hex): %x",curAff);
+                        sLog.outError("BOOT: Can't set used processors (hex): %x",curAff);
                 }
             }
             sLog.outString();
@@ -278,9 +283,9 @@ int Master::Run()
         if(Prio)
         {
             if(SetPriorityClass(hProcess,HIGH_PRIORITY_CLASS))
-                sLog.outString("mangosd process priority class set to HIGH");
+                sLog.outString("BOOT: mangosd process priority class set to HIGH");
             else
-                sLog.outError("Can't set mangosd process priority class.");
+                sLog.outError("BOOT: Can't set mangosd process priority class.");
             sLog.outString();
         }
     }
@@ -313,7 +318,7 @@ int Master::Run()
 
     if (sWorldSocketMgr->StartNetwork (wsport, bind_ip) == -1)
     {
-        sLog.outError ("Failed to start network");
+        sLog.outError ("BOOT: Failed to start network");
         Log::WaitBeforeContinueIfNeed();
         World::StopNow(ERROR_EXIT_CODE);
         // go down and shutdown the server
@@ -337,7 +342,7 @@ int Master::Run()
     }
 
     ///- Set server offline in realmlist
-    LoginDatabase.DirectPExecute("UPDATE realmlist SET realmflags = realmflags | %u WHERE id = '%u'", REALM_FLAG_OFFLINE, realmID);
+    LoginDatabase.DirectPExecute("UPDATE realmlist SET realmflags = realmflags | %u WHERE id = '%u'", REALM_FLAG_OFFLINE, sWorld.getConfig(CONFIG_UINT32_REALMID));
 
     ///- Remove signal handling before leaving
     _UnhookSignals();
@@ -364,7 +369,7 @@ int Master::Run()
     WorldDatabase.HaltDelayThread();
     LoginDatabase.HaltDelayThread();
 
-    sLog.outString( "Halting process..." );
+    sLog.outString( "BOOT: Halting process..." );
 
     if (cliThread)
     {
@@ -428,15 +433,15 @@ bool Master::_StartDB()
     int nConnections = sConfig.GetIntDefault("WorldDatabaseConnections", 1);
     if(dbstring.empty())
     {
-        sLog.outError("Database not specified in configuration file");
+        sLog.outError("BOOT: Database not specified in configuration file");
         return false;
     }
-    sLog.outString("World Database total connections: %i", nConnections + 1);
+    sLog.outString("BOOT: World Database total connections: %i", nConnections + 1);
 
     ///- Initialise the world database
     if(!WorldDatabase.Initialize(dbstring.c_str(), nConnections))
     {
-        sLog.outError("Cannot connect to world database %s",dbstring.c_str());
+        sLog.outError("BOOT: Cannot connect to world database %s",dbstring.c_str());
         return false;
     }
 
@@ -451,18 +456,18 @@ bool Master::_StartDB()
     nConnections = sConfig.GetIntDefault("CharacterDatabaseConnections", 1);
     if(dbstring.empty())
     {
-        sLog.outError("Character Database not specified in configuration file");
+        sLog.outError("BOOT: Character Database not specified in configuration file");
 
         ///- Wait for already started DB delay threads to end
         WorldDatabase.HaltDelayThread();
         return false;
     }
-    sLog.outString("Character Database total connections: %i", nConnections + 1);
+    sLog.outString("BOOT: Character Database total connections: %i", nConnections + 1);
 
     ///- Initialise the Character database
     if(!CharacterDatabase.Initialize(dbstring.c_str(), nConnections))
     {
-        sLog.outError("Cannot connect to Character database %s",dbstring.c_str());
+        sLog.outError("BOOT: Cannot connect to Character database %s",dbstring.c_str());
 
         ///- Wait for already started DB delay threads to end
         WorldDatabase.HaltDelayThread();
@@ -482,7 +487,7 @@ bool Master::_StartDB()
     nConnections = sConfig.GetIntDefault("LoginDatabaseConnections", 1);
     if(dbstring.empty())
     {
-        sLog.outError("Login database not specified in configuration file");
+        sLog.outError("BOOT: Login database not specified in configuration file");
 
         ///- Wait for already started DB delay threads to end
         WorldDatabase.HaltDelayThread();
@@ -491,10 +496,11 @@ bool Master::_StartDB()
     }
 
     ///- Initialise the login database
-    sLog.outString("Login Database total connections: %i", nConnections + 1);
+    sLog.outString("BOOT: Login Database total connections: %i", nConnections + 1);
+
     if(!LoginDatabase.Initialize(dbstring.c_str(), nConnections))
     {
-        sLog.outError("Cannot connect to login database %s",dbstring.c_str());
+        sLog.outError("BOOT: Cannot connect to login database %s",dbstring.c_str());
 
         ///- Wait for already started DB delay threads to end
         WorldDatabase.HaltDelayThread();
@@ -512,10 +518,10 @@ bool Master::_StartDB()
     }
 
     ///- Get the realm Id from the configuration file
-    realmID = sConfig.GetIntDefault("RealmID", 0);
+    uint32 realmID = sConfig.GetIntDefault("RealmID", 0);
     if(!realmID)
     {
-        sLog.outError("Realm ID not defined in configuration file");
+        sLog.outError("BOOT: Realm ID not defined in configuration file");
 
         ///- Wait for already started DB delay threads to end
         WorldDatabase.HaltDelayThread();
@@ -524,15 +530,15 @@ bool Master::_StartDB()
         return false;
     }
 
-    sLog.outString("Realm running as realm ID %d", realmID);
+    sLog.outString("BOOT: Realm running as realm ID %d", realmID);
 
     ///- Clean the database before starting
     clearOnlineAccounts();
 
     sWorld.LoadDBVersion();
 
-    sLog.outString("Using World DB: %s", sWorld.GetDBVersion());
-    sLog.outString("Using creature EventAI: %s", sWorld.GetCreatureEventAIVersion());
+    sLog.outString("BOOT: Using World DB: %s", sWorld.GetDBVersion());
+    sLog.outString("BOOT: Using creature EventAI: %s", sWorld.GetCreatureEventAIVersion());
     return true;
 }
 
@@ -541,7 +547,7 @@ void Master::clearOnlineAccounts()
 {
     // Cleanup online status for characters hosted at current realm
     /// \todo Only accounts with characters logged on *this* realm should have online status reset. Move the online column from 'account' to 'realmcharacters'?
-    LoginDatabase.PExecute("UPDATE account SET active_realm_id = 0 WHERE active_realm_id = '%u'", realmID);
+    LoginDatabase.PExecute("UPDATE account SET active_realm_id = 0 WHERE active_realm_id = '%u'", sWorld.getConfig(CONFIG_UINT32_REALMID));
 
     CharacterDatabase.Execute("UPDATE characters SET online = 0 WHERE online<>0");
 
@@ -556,34 +562,134 @@ void Master::_OnSignal(int s)
     {
         case SIGINT:
             World::StopNow(RESTART_EXIT_CODE);
+            signal(s, _OnSignal);
             break;
         case SIGTERM:
         #ifdef _WIN32
         case SIGBREAK:
         #endif
             World::StopNow(SHUTDOWN_EXIT_CODE);
+            signal(s, _OnSignal);
             break;
-    }
+        case SIGSEGV:
+        case SIGABRT:
+        case SIGFPE:
+        #ifdef __FreeBSD__
+        case SIGBUS:
+        #endif
+        {
+            if (sWorld.getConfig(CONFIG_BOOL_VMSS_ENABLE))
+            {
+                ACE_thread_t const threadId = ACE_OS::thr_self();
 
-    signal(s, _OnSignal);
+                sLog.outError("VMSS:: Signal %.2u received from thread " I64FMT ".\r\n",s,threadId);
+                ACE_Stack_Trace _StackTrace;
+                std::string StackTrace = _StackTrace.c_str();
+                if (Map* map = sMapMgr.GetMapUpdater().getObject(threadId))
+                {
+                    MapStatisticData const* pMBData = sMapMgr.GetMapUpdater().GetMapStatisticData(map);
+                    uint32 counter = pMBData ? pMBData->breaksCount : 0;
+
+                    sLog.outError("VMSS:: crushed thread is update map %u, instance %u, counter %u",map->GetId(), map->GetInstanceId(), counter);
+                    sLog.outError("VMSS:: BackTrace for map %u: ",map->GetId());
+
+                    size_t found = 0;
+                    while (found < StackTrace.size())
+                    {
+                        size_t next = StackTrace.find_first_of("\n",found);
+                        std::string to_log = StackTrace.substr(found, (next - found));
+                        if (to_log.size() > 1)
+                            sLog.outError("VMSS:%u: %s",map->GetId(), to_log.c_str());
+                        found = next+1;
+                    }
+                    sLog.outError("VMSS:: /BackTrace for map %u: ",map->GetId());
+
+                    if (sWorld.getConfig(CONFIG_BOOL_VMSS_CONTINENTS_SKIP) && map->IsContinent())
+                    {
+                        sLog.outError("VMSS:: Thread " I64FMT " is virtual map server for continent, but continents processing disabled. Stopping world.",threadId);
+                        signal(s, SIG_DFL);
+                        ACE_OS::kill(getpid(), s);
+                    }
+                    else
+                    {
+                        if (!sWorld.getConfig(CONFIG_BOOL_VMSS_TRYSKIPFIRST) || counter > 0)
+                            map->SetBroken(true);
+
+                        sMapMgr.GetMapUpdater().MapBrokenEvent(map);
+
+                        if (counter > sWorld.getConfig(CONFIG_UINT32_VMSS_MAXTHREADBREAKS))
+                        {
+                            sLog.outError("VMSS:: Limit of map restarting (map %u instance %u) exceeded. Stopping world!",map->GetId(), map->GetInstanceId());
+                            signal(s, SIG_DFL);
+                            sMapMgr.GetMapUpdater().kill_thread(threadId, true);
+                        }
+                        else
+                        {
+                            sLog.outError("VMSS:: Restarting virtual map server (map %u instance %u). Count of restarts: %u",map->GetId(), map->GetInstanceId(), sMapMgr.GetMapUpdater().GetMapStatisticData(map)->breaksCount);
+                            sMapMgr.GetMapUpdater().kill_thread(threadId, false);
+                            ACE_OS::thr_exit();
+                        }
+                    }
+                }
+                else
+                {
+                    sLog.outError("VMSS:: Thread " I64FMT " is not virtual map server. Stopping world.",threadId);
+                    sLog.outError("VMSS:: BackTrace: ");
+                    size_t found = 0;
+                    while (found < StackTrace.size())
+                    {
+                        size_t next = StackTrace.find_first_of("\n",found);
+                        std::string to_log = StackTrace.substr(found, (next - found));
+                        if (to_log.size() > 1)
+                            sLog.outError("VMSS:T: %s",to_log.c_str());
+                        found = next+1;
+                    }
+                    sLog.outError("VMSS:: /BackTrace");
+                    signal(s, SIG_DFL);
+                    ACE_OS::kill(getpid(), s);
+                }
+            }
+            else
+            {
+                signal(s, SIG_DFL);
+                ACE_OS::kill(getpid(), s);
+            }
+            break;
+        }
+        default:
+            signal(s, SIG_DFL);
+            break;
+    }
 }
 
 /// Define hook '_OnSignal' for all termination signals
 void Master::_HookSignals()
 {
-    signal(SIGINT, _OnSignal);
-    signal(SIGTERM, _OnSignal);
+    signal(SIGINT,   _OnSignal);
+    signal(SIGTERM,  _OnSignal);
     #ifdef _WIN32
     signal(SIGBREAK, _OnSignal);
     #endif
+    signal(SIGSEGV,  _OnSignal);
+    signal(SIGABRT,  _OnSignal);
+    signal(SIGFPE ,  _OnSignal);
+    #ifdef __FreeBSD__
+    signal(SIGBUS ,  _OnSignal);
+    #endif
 }
 
 /// Unhook the signals before leaving
 void Master::_UnhookSignals()
 {
-    signal(SIGINT, 0);
-    signal(SIGTERM, 0);
+    signal(SIGINT,   SIG_DFL);
+    signal(SIGTERM,  SIG_DFL);
     #ifdef _WIN32
-    signal(SIGBREAK, 0);
+    signal(SIGBREAK, SIG_DFL);
+    #endif
+    signal(SIGSEGV,  SIG_DFL);
+    signal(SIGABRT,  SIG_DFL);
+    signal(SIGFPE ,  SIG_DFL);
+    #ifdef __FreeBSD__
+    signal(SIGBUS ,  SIG_DFL);
     #endif
 }
diff --git a/src/mangosd/WorldRunnable.cpp b/src/mangosd/WorldRunnable.cpp
index 00c8174848f..530d5d32b51 100644
--- a/src/mangosd/WorldRunnable.cpp
+++ b/src/mangosd/WorldRunnable.cpp
@@ -26,7 +26,6 @@
 #include "WorldRunnable.h"
 #include "Timer.h"
 #include "MapManager.h"
-#include "BattleGroundMgr.h"
 
 #include "Database/DatabaseEnv.h"
 
@@ -78,11 +77,7 @@ void WorldRunnable::run()
         #endif
     }
 
-    sWorld.KickAll();                                       // save and kick all players
-    sWorld.UpdateSessions( 1 );                             // real players unload required UpdateSessions call
-
-    // unload battleground templates before different singletons destroyed
-    sBattleGroundMgr.DeleteAllBattleGrounds();
+    sWorld.CleanupsBeforeStop();
 
     sWorldSocketMgr->StopNetwork();
 
diff --git a/src/mangosd/mangosR2.ico b/src/mangosd/mangosR2.ico
new file mode 100644
index 00000000000..bad48b98f68
Binary files /dev/null and b/src/mangosd/mangosR2.ico differ
diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in
index 47ec35b5837..152b39e0664 100644
--- a/src/mangosd/mangosd.conf.dist.in
+++ b/src/mangosd/mangosd.conf.dist.in
@@ -3,7 +3,7 @@
 #####################################
 
 [MangosdConf]
-ConfVersion=2010100901
+ConfVersion=2013012201
 
 ###################################################################################################################
 # CONNECTIONS AND DIRECTORIES
@@ -22,7 +22,6 @@ ConfVersion=2010100901
 #        Default: "" - no log directory prefix. if used log names aren't absolute paths
 #                      then logs will be stored in the current directory of the running program.
 #
-#
 #    LoginDatabaseInfo
 #    WorldDatabaseInfo
 #    CharacterDatabaseInfo
@@ -37,13 +36,13 @@ ConfVersion=2010100901
 #                    hostname;port;username;password;database
 #                    .;/path/to/unix_socket/DIRECTORY or . for default path;username;password;database - use Unix sockets at Unix/Linux
 #
-#	LoginDatabaseConnections
-#	WorldDatabaseConnections
-#	CharacterDatabaseConnections
-#		 Amount of connections to database which will be used for SELECT queries. Maximum 16 connections per database.
-#		 Please, note, for data consistency only one connection for each database is used for transactions and async SELECTs.
-#		 So formula to find out how many connections will be established: X = �_connections + 1
-#		 Default: 1 connection for SELECT statements
+#    LoginDatabaseConnections
+#    WorldDatabaseConnections
+#    CharacterDatabaseConnections
+#        Amount of connections to database which will be used for SELECT queries. Maximum 16 connections per database.
+#        Please, note, for data consistency only one connection for each database is used for transactions and async SELECTs.
+#        So formula to find out how many connections will be established: X = n_connections + 1
+#        Default: 1 connection for SELECT statements
 #
 #    MaxPingTime
 #        Settings for maximum database-ping interval (minutes between pings)
@@ -140,10 +139,7 @@ BindIP = "0.0.0.0"
 #
 #    vmap.enableLOS
 #    vmap.enableHeight
-#        Enable/Disable VMaps support for line of sight and height calculation
-#        You need to extract the VMaps in order to enable those options
-#        Default: 1 (enable)
-#                 0 (disable)
+#       Deprecated (always enable)
 #
 #    vmap.ignoreSpellIds
 #        These spells are ignored for LoS calculation
@@ -155,6 +151,12 @@ BindIP = "0.0.0.0"
 #        Default: 1 (Enabled)
 #                 0 (Disabled)
 #
+#    vmap.Dynamic.DoubleCheck
+#        Enable/Disable dynamic VMap based double check for LOS (needed for "In GO state").
+#        Requires Vmaps && Dynamic VMaps enabled to work. May heavily increase CPU usage!
+#        Default: 0 (Disabled)
+#                 1 (Enabled)
+#
 #
 #    DetectPosCollision
 #        Check final move position, summon position, etc for visible collision with other objects or
@@ -177,9 +179,6 @@ BindIP = "0.0.0.0"
 #        Disable mmap pathfinding on the listed maps.
 #        List of map ids with delimiter ','
 #
-#    UpdateUptimeInterval
-#        Update realm uptime period in minutes (for save data in 'uptime' table). Must be > 0
-#        Default: 10 (minutes)
 #
 #    MaxCoreStuckTime
 #        Periodically check if the process got freezed, if this is the case force crash after the specified
@@ -197,6 +196,52 @@ BindIP = "0.0.0.0"
 #        Default: 1 (Enable)
 #                 0 (Disabled)
 #
+#    WorldState.ExpireTime
+#        Expire time for cleanup WorldStates in seconds.
+#        Default: 604800 (1 week)
+#
+#    ACE mtmaps
+#    MapUpdate.Threads
+#        Number of threads to run if the binary was compiled with mtmaps support.
+#        Default: 3
+#        For stable works 1-3 threads (?) testing. Recommendation for low LA - (num of CPU - 1).
+#
+#    MapUpdate.DynamicThreadsCount
+#        Use dynamic threads number for update maps. Count changed in dependent ot server load from 1 to MapUpdate.Threads
+#        Default: 0 (Disabled)
+#                 1 (Enabled)
+#
+#    MapUpdate.LoadBalanceHighValue
+#    MapUpdate.LoadBalanceLowValue
+#        Used only if MapUpdate.DynamicThreadsCount is enabled. Fix high and low load value for change dynamic thread num
+#        Default: 0.8 (80%)  /0.2 (20%)
+#        Min:     0.5 (50%)  /0.0 (0%)
+#        Max:     1.0 (100%) /0.5 (50%)
+#
+#    MapUpdate.MaxVisitorsInUpdate
+#    MapUpdate.MaxVisitsInUpdate
+#        Limitation for units update time delta per map update cycle.
+#        MaxVisitorsInUpdate - count of maximal update diffs for calculation update deadline. Min = 1, default = 9, max = 50.
+#        MaxVisitsInUpdate   - limits count of units in one per-visit update cycle (for maps only) min = 10, default = 20, max = 100.
+#
+#    ObjectLoadingSplitter.MaxAllowedTime
+#        Limitation for time, used per map update cycle, for object loading (in ms)
+#        Default: 10
+#        Min:     5    ( less then 3 - objects not be loaded anyway )
+#        Max:     1000 ( value more may cause false-freeze detection )
+#
+#    Calendar.RemoveExpiredEvents
+#        Delay (in hours) to remove expired events from the calendar.
+#        Default: -1  (never)
+#                  0  (at once)
+#                  1+ (delay hours (8760 - one year))
+#
+#    MapUpdate.PositionUpdateDelay
+#        Time (in ms!) for recalculation unit/GO position while spline movement.
+#        Default: 400 (0,4s)
+#        Min:     100 ( 1 MapUpdate cycle)
+#        Max:     2000( 2s)
+#
 ###################################################################################################################
 
 UseProcessors = 0
@@ -212,18 +257,26 @@ ChangeWeatherInterval = 600000
 PlayerSave.Interval = 900000
 PlayerSave.Stats.MinLevel = 0
 PlayerSave.Stats.SaveOnlyOnLogout = 1
-vmap.enableLOS = 1
-vmap.enableHeight = 1
 vmap.ignoreSpellIds = "7720"
 vmap.enableIndoorCheck = 1
 DetectPosCollision = 1
 TargetPosRecalculateRange = 1.5
 mmap.enabled = 1
 mmap.ignoreMapIds = ""
-UpdateUptimeInterval = 10
 MaxCoreStuckTime = 0
 AddonChannel = 1
 CleanCharacterDB = 1
+WorldState.ExpireTime = 604800
+MapUpdate.Threads = 1
+MapUpdate.DynamicThreadsCount = 0
+MapUpdate.LoadBalanceHighValue = 0.8
+MapUpdate.LoadBalanceLowValue = 0.2
+MapUpdate.MaxVisitorsInUpdate = 9
+MapUpdate.MaxVisitsInUpdate = 10
+ObjectLoadingSplitter.MaxAllowedTime = 10
+Calendar.RemoveExpiredEvents = -1
+MapUpdate.PositionUpdateDelay = 400
+vmap.Dynamic.DoubleCheck = 0
 
 ###################################################################################################################
 # SERVER LOGGING
@@ -268,17 +321,20 @@ CleanCharacterDB = 1
 #    LogFilter_AchievementUpdates
 #    LogFilter_CreatureMoves
 #    LogFilter_TransportMoves
+#    LogFilter_PlayerMoves
 #    LogFilter_VisibilityChanges
 #    LogFilter_Weather
 #    LogFilter_DbStrictedCheck
+#    LogFilter_SQLText
 #    LogFilter_Pathfinding
-#        Log filters (active by default)
+#    LogFilter_Calendar
+#    LogFilter_MapsLoading
+#    LogFilter_EventAiDev
+#        Log filters (active by default - meaning: the filter is active, hence the log is not displayed)
 #        Default: 1 - not include with any log level
 #                 0 - include in log if log level permit
 #
 #    LogFilter_PeriodicAffects
-#    LogFilter_PlayerMoves
-#    LogFilter_SQLText
 #    LogFilter_AIAndMovegens
 #    LogFilter_PlayerStats
 #    LogFilter_Damage
@@ -302,6 +358,10 @@ CleanCharacterDB = 1
 #        Log file of DB errors detected at server run
 #        Default: "DBErrors.log"
 #
+#    EventAIErrorLogFile
+#        Log file of EventAI errors detected at server run
+#        Default: "EventAIErrors.log"
+#
 #    CharLogFile
 #        Character operations logfile name
 #        Default: "Char.log"
@@ -359,13 +419,16 @@ LogFileLevel = 0
 LogFilter_AchievementUpdates = 1
 LogFilter_CreatureMoves = 1
 LogFilter_TransportMoves = 1
+LogFilter_PlayerMoves = 1
 LogFilter_VisibilityChanges = 1
 LogFilter_Weather = 1
 LogFilter_DbStrictedCheck = 1
+LogFilter_SQLText = 1
 LogFilter_Pathfinding = 1
+LogFilter_Calendar = 1
+LogFilter_MapLoading = 1
+LogFilter_EventAiDev = 1
 LogFilter_PeriodicAffects = 0
-LogFilter_PlayerMoves = 0
-LogFilter_SQLText = 0
 LogFilter_AIAndMovegens = 0
 LogFilter_PlayerStats = 0
 LogFilter_Damage = 0
@@ -374,6 +437,7 @@ LogFilter_SpellCast = 0
 WorldLogFile = ""
 WorldLogTimestamp = 0
 DBErrorLogFile = "DBErrors.log"
+EventAIErrorLogFile = "EventAIErrors.log"
 CharLogFile = "Char.log"
 CharLogTimestamp = 0
 CharLogDump = 0
@@ -383,6 +447,175 @@ GmLogPerAccount = 0
 RaLogFile = ""
 LogColors = ""
 
+###################################################################################################################
+# CHAT LOG AND LEXICS CUTTER SYSTEM
+#
+#    ChatLogMethod
+#        Default: 0 (Disabled)
+#                 1 (Log to files)
+#                 2 (Log to DB by SQL)
+#
+#    ChatLogDateSplit
+#        If this is enabled, all $d in file names are replaced with current date
+#        This does include innormative lexics log
+#        Default: 1 (Enabled)
+#                 0 (Disabled)
+#
+#    ChatLogUTFHeader
+#        If this is enabled, UTF8 header is written into new files
+#        Default: 1 (Enabled)
+#                 0 (Disabled)
+#
+#    ChatLogIgnoreUnprintable
+#        If this is enabled, chat log will ignore messages with unprintable chars
+#        Default: 1 (Enabled)
+#                 0 (Disabled)
+#
+#    ChatLogsDirectory
+#        Chat log directory name
+#        Default: ""
+#
+#    ChatLogChatFile
+#    ChatLogPartyFile
+#    ChatLogGuildFile
+#    ChatLogWhisperFile
+#    ChatLogChannelFile
+#    ChatLogRaidFile
+#    ChatLogBattleGroundFile
+#        Chat log file names
+#        Default:
+#                 main_chat-$d.log
+#                 party_chat-$d.log
+#                 guild_chat-$d.log
+#                 whisper_chat-$d.log
+#                 channel_chat-$d.log
+#                 raid_chat-$d.log
+#                 bg_chat-$d.log
+#
+#    ChatLogChatScreen
+#    ChatLogPartyScreen
+#    ChatLogGuildScreen
+#    ChatLogWhisperScreen
+#    ChatLogChannelScreen
+#    ChatLogRaidScreen
+#    ChatLogBattleGroundScreen
+#        Include log in server console output
+#        Default: 0 (Disabled)
+#                 1 (Enabled)
+#
+#    LexicsCutterEnable
+#        Default: 0 (Disabled)
+#                 1 (Enabled)
+#
+#    LexicsCutterInnormativeCut
+#        Cutting innormative lexics
+#        Default: 1 (Enabled)
+#                 0 (Disabled)
+#
+#    LexicsCutterCutReplacement
+#        Replace cutting innormative lexics with this
+#        Default: &!@^%!^&*!!!
+#
+#    LexicsCutterLogFile
+#        Innormative lexics log file name
+#        Default: innormative-$d.log
+#
+#    LexicsCutterScreenLog
+#        Include log in server console output
+#        Default: 0 (Disabled)
+#                 1 (Enabled)
+#
+#    LexicsCutterAnalogsFile
+#        letter analogs file name
+#        Default: letter_analogs.txt
+#
+#    LexicsCutterWordsFile
+#        Words file name
+#        Default: innormative_words.txt
+#
+#    LexicsCutInChat
+#    LexicsCutInParty
+#    LexicsCutInGuild
+#    LexicsCutInWhisper
+#    LexicsCutInChannel
+#    LexicsCutInRaid
+#    LexicsCutInBattleGround
+#        Where to cut lexics
+#        Default: 1 (Enabled)
+#                 0 (Disabled)
+#
+#    LexicsCutterIgnoreSpaces
+#        Ignore word spaces like: W O R D
+#        Default: 1 (Enabled)
+#                 0 (Disabled)
+#
+#    LexicsCutterIgnoreRepeats
+#        Ignore repeats like: WWOOOORRRRRD
+#        Default: 1 (Enabled)
+#                 0 (Disabled)
+#
+#    LexicsCutterAction
+#        Action
+#        Default: 0: log only
+#                 1: sheep
+#                 2: stun
+#                 3: kill
+#                 4: leave 5 health
+#                 5: disable chat
+#                 6: stuck (works as stun + 50% health)
+#                 7: resurrection sickness
+#                 8: shear
+#
+#    LexicsCutterActionDuration
+#        Action duration
+#        Default: 60000
+#
+#    LexicsCutterNoActionOnGM
+#        Do not perform action on GM if this is enabled
+#        Default: 1 (Enabled)
+#                 0 (Disabled)
+#
+###################################################################################################################
+
+ChatLogMethod = 0
+ChatLogDateSplit = 1
+ChatLogUTFHeader = 1
+ChatLogIgnoreUnprintable = 1
+ChatLogsDirectory = ""
+ChatLogChatFile = main_chat-$d.log
+ChatLogPartyFile = party_chat-$d.log
+ChatLogGuildFile = guild_chat-$d.log
+ChatLogWhisperFile = whisper_chat-$d.log
+ChatLogChannelFile = channel_chat-$d.log
+ChatLogRaidFile = raid_chat-$d.log
+ChatLogBattleGroundFile = bg_chat-$d.log
+ChatLogChatScreen = 0
+ChatLogPartyScreen = 0
+ChatLogGuildScreen = 0
+ChatLogWhisperScreen = 0
+ChatLogChannelScreen = 0
+ChatLogRaidScreen = 0
+ChatLogBattleGroundScreen = 0
+LexicsCutterEnable = 0
+LexicsCutterInnormativeCut = 1
+LexicsCutterCutReplacement = &!@^%!^&*!!!
+LexicsCutterLogFile = innormative-$d.log
+LexicsCutterScreenLog = 0
+LexicsCutterAnalogsFile = letter_analogs.txt
+LexicsCutterWordsFile = innormative_words.txt
+LexicsCutInChat = 1
+LexicsCutInParty = 1
+LexicsCutInGuild = 1
+LexicsCutInWhisper = 1
+LexicsCutInChannel = 1
+LexicsCutInRaid = 1
+LexicsCutInBattleGround = 1
+LexicsCutterIgnoreSpaces = 1
+LexicsCutterIgnoreRepeats = 1
+LexicsCutterAction = 0
+LexicsCutterActionDuration = 60000
+LexicsCutterNoActionOnGM = 1
+
 ###################################################################################################################
 # SERVER SETTINGS
 #
@@ -545,6 +778,11 @@ LogColors = ""
 #        Amount of honor that new players will start with
 #        Default: 0
 #
+#    AllowHonorKillsTitles
+#        Allow characters to get titles, depending of honor kills amount (something like old 1.xx honor system)
+#        Default: 0 - disallow
+#                 1 - allow
+#
 #    MaxArenaPoints
 #        Max arena points that player can have.
 #        Default: 5000
@@ -557,6 +795,10 @@ LogColors = ""
 #        Enable or disable instant logout for security level (0..4) or high (NOT in combat/while dueling/while falling)
 #        Default: 1 (Mods/GMs/Admins)
 #
+#    GroupLeaderReconnectPeriod
+#        The time in sec. the leader of a group has to reconnect before the lead goes to another player (also applies for a server crash)
+#        Default: 180 (3 min.)
+#
 #    AllFlightPaths
 #        Players will start with all flight paths (Note: ALL flight paths, not only player's team)
 #        Default: 0 (false)
@@ -581,12 +823,17 @@ LogColors = ""
 #        Max amount triggered spell casts in chain by one caster, prevent stack overflow crash
 #        Too Low value will make some correct triggered casts fail
 #                 0 (no limit)
-#        Default: 10
+#        Default: 255
 #
 #   BirthdayTime
-#        Set to birthday (date in unix time), By default 28th August 2005, when MaNGOS got it�s name
+#        Set to birthday (date in unix time), By default 28th August 2005, when MaNGOS got it's name
 #        Default: 1125180000
 #
+#   RabbitDay
+#        Set to Rabbit Day (date in unix time), only the day and month are considered, the year is not important
+#        Default: 0 (off)
+#        Suggested: 954547200 (April 1st, 2000)
+#
 #    Instance.IgnoreLevel
 #        Ignore level requirement to enter instance
 #        Default: 0 (false)
@@ -606,6 +853,11 @@ LogColors = ""
 #        Default: 1800000 (miliseconds 30 minutes)
 #                 0 (instance maps are kept in memory until they are reset)
 #
+#    InstancesResetAnnounce
+#        Announce the reset of one instance to whole party.
+#        Default: 0 (disabled, don't show, blizzlike)
+#                 1 (enabled, show)
+#
 #    Quests.LowLevelHideDiff
 #        Quest level difference to hide for player low level quests:
 #        if player_level > quest_level + LowLevelQuestsHideDiff then quest "!" mark not show for quest giver
@@ -647,6 +899,10 @@ LogColors = ""
 #        Useful when you don't want old log events to be overwritten by new, but increasing can slow down performance
 #        Default: 25
 #
+#    Loot.IgnoreChestGroupRulesFromDB
+#        Ignore database setting for loot rules for chests
+#        Default: 0 (disable)
+#
 #    TimerBar.Fatigue.GMLevel
 #        Disable/enable fatigue for security level (0..4) or high
 #        Default: 4 (None)
@@ -728,6 +984,26 @@ LogColors = ""
 #                 0 - unsummon only for flying mounts
 #        Default: 1 - unsummon for any mount
 #
+#    PetSaveAllInDB
+#        Persmanent pet state saving in database
+#        Default: 0 - default mangos style, only permanent pets saved in DB
+#                 1 - all pets (including multipets and temporary summoned pets) saved in DB.
+#
+#    PetAdvancedAI
+#        Advanced AI for summoned minions (pet/guardian/etc). Not fully offlike! Use at own risk.
+#        Default: 0 - default mangos pet AI style
+#                 1 - enable advanced AI usage
+#
+#    PetAdvancedAIWithSlacker
+#        Should only use in combination with PetAdvancedAI
+#        Default: 0 - disable, default mangos pet AI style
+#                 1 - enable, pet returns below 20% life to owner
+#
+#    RaidFlags.Unique
+#        Set raid flags (assistant, main assistant, main tank) unique in raid
+#        Default: 0 - flags not unique
+#                 1 - flags unique, not more then 1 player may have this flag
+#
 #    ClientCacheVersion
 #        Client cache version for client cache data reset. Use any different from DB value and not recently used for triggering reset.
 #        Default: 0 (use DB value from world DB db_version.cache_id field)
@@ -760,6 +1036,60 @@ LogColors = ""
 #        You can bypass this setting by typing "/script SetAllowLowLevelRaid(true/false)" command in chat
 #        Default: 10
 #
+#    CrowdControlHPBase
+#        Base HP part for calculation CrowdControl effects (from MAX HP!).
+#        Default: 0.1  (10% max HP)
+#        min:     0.0  (default mangos method)
+#        max:     1.0  (full CrowdControl, auras like Fear not breaked by damage anyway)
+#
+#    ResilienceAlternativeCalculation
+#        enable/disable alternative resilience damage reduction calculation (for Avenger/Sanctified wrath mostly)
+#        Default: 0     (disable, default mangos style)
+#
+#    BlinkAnimationType
+#        enable/disable alternative (fast move, like 2.4.3/3.0.1) animation type for blink-like spells
+#        Default: 0     (disable, default mangos style - teleport)
+#
+#    AllowTransferToCustomMap
+#        Allowing moving to maps, enter for which absent in AraeTrigger.dbc (by custom areatrigger_teleport entryes)
+#        Attention! Changing this option "on-the-fly" required reload areatrigger_teleport table!
+#        Default: 0 - disabled (only GM's may transfer to this maps
+#                 1 - enabled  (any player, fit to custom areatrigger_teleport condition, may transfer to this maps).
+#
+#    FactiomAndRaceChangeWithoutRenaming
+#        Default: 0 - false
+#                 1 - true -> not blizzlike
+#
+#    Resistance.CalculationMethod
+#        Method of resistance calculation.
+#                 0 (TBC,   resistance chance - 0%, 25%, 50%, 75% or 100%)
+#        Default: 1 (WOTLK, flat resistance chance - 0%, 10%, 20%, 30% ... 100%)
+#
+#    Resistance.AddByOverLevel
+#        If the target level is greater than caster level, add to target additional resistance points.
+#        Default: 0 - disabled (don't add additional resistance points)
+#                 1 - enabled  (add to target 5 resistance points on each target over level)
+#
+#    PlayerCommands
+#        Should player chat be parsed for GM commands.
+#        Default: 1 (parse commands)
+#                 0 (ignore commands)
+#
+#    Melee.Distance.Addition
+#        Addition for check strict melee distance in CheckRange()
+#        Default: 4 (overall dist ~ 9)
+#
+#    Player.FixMovementPackets.Method
+#        Movement packet fixes, taking into account client<->server connection lag.
+#        WARNING! dont change on the running server, players seeing each other will be desynchronized (looks like twitching)
+#        Default: 0  (disabled)
+#                 1  (add delay server<->client in ping times)
+#                 2  (add fixed delay (Player.FixMovementPackets.AddTime below)
+#
+#    Player.FixMovementPackets.AddTime
+#        Add fixed time (in ms.) to movement packets.
+#        Default: 50
+#
 ###################################################################################################################
 
 GameType = 1
@@ -785,20 +1115,24 @@ StartHeroicPlayerLevel = 55
 StartPlayerMoney = 0
 MaxHonorPoints = 75000
 StartHonorPoints = 0
+AllowHonorKillsTitles = 0
 MaxArenaPoints = 5000
 StartArenaPoints = 0
 InstantLogout = 1
+GroupLeaderReconnectPeriod = 180
 DisableWaterBreath = 4
 AllFlightPaths = 0
 AlwaysMaxSkillForLevel = 0
 ActivateWeather = 1
 CastUnstuck = 1
-MaxSpellCastsInChain = 10
+MaxSpellCastsInChain = 255
 BirthdayTime = 1125180000
+RabbitDay = 0
 Instance.IgnoreLevel = 0
 Instance.IgnoreRaid = 0
 Instance.ResetTimeHour = 4
 Instance.UnloadDelay = 1800000
+InstancesResetAnnounce = 0
 Quests.LowLevelHideDiff = 4
 Quests.HighLevelHideDiff = 7
 Quests.Daily.ResetHour = 6
@@ -807,6 +1141,7 @@ Quests.Weekly.ResetHour = 6
 Quests.IgnoreRaid = 0
 Guild.EventLogRecordsCount = 100
 Guild.BankEventLogRecordsCount = 25
+Loot.IgnoreChestGroupRulesFromDB = 1
 TimerBar.Fatigue.GMLevel = 4
 TimerBar.Fatigue.Max = 60
 TimerBar.Breath.GMLevel = 4
@@ -825,6 +1160,11 @@ SkillChance.Prospecting = 0
 SkillChance.Milling = 0
 OffhandCheckAtTalentsReset = 0
 PetUnsummonAtMount = 1
+PetSaveAllInDB = 0
+PetAdvancedAI = 0
+PetAdvancedAIWithSlacker = 0
+RaidFlags.Unique = 0
+AllowFlightOnOldMaps = 0
 ClientCacheVersion = 0
 Event.Announce = 0
 BeepAtStart = 1
@@ -832,6 +1172,17 @@ ShowProgressBars = 1
 WaitAtStartupError = 0
 Motd = "Welcome to the Massive Network Game Object Server."
 Raid.MinLevel = 10
+CrowdControlHPBase = 0.1
+AllowTransferToCustomMap = 0
+ResilienceAlternativeCalculation = 0
+BlinkAnimationType = 0
+FactiomAndRaceChangeWithoutRenaming = 0
+Resistance.CalculationMethod = 1
+Resistance.AddByOverLevel = 0
+PlayerCommands = 1
+Melee.Distance.Addition = 4
+Player.FixMovementPackets.Method = 0
+Player.FixMovementPackets.AddTime = 50
 
 ###################################################################################################################
 # PLAYER INTERACTION
@@ -847,8 +1198,9 @@ Raid.MinLevel = 10
 #    AllowTwoSide.Interaction.Guild
 #    AllowTwoSide.Interaction.Auction
 #    AllowTwoSide.Interaction.Mail
+#    AllowTwoSide.Interaction.Calendar
 #        Allow or not common :chat(say,yell);channel(chat)group(join)guild(join);merge all auction houses for players from
-#        different teams, send mail to different team.
+#        different teams, send mail to different team, calendar(invite player from different team)
 #        Default: 0 (Not allowed)
 #                 1 (Allowed)
 #
@@ -877,10 +1229,30 @@ AllowTwoSide.Interaction.Group = 0
 AllowTwoSide.Interaction.Guild = 0
 AllowTwoSide.Interaction.Auction = 0
 AllowTwoSide.Interaction.Mail = 0
+AllowTwoSide.Interaction.Calendar = 0
 AllowTwoSide.WhoList = 0
 AllowTwoSide.AddFriend = 0
 TalentsInspecting = 1
 
+###################################################################################################################
+# AUTO BROADCAST
+#
+#    AutoBroadcast.On
+#        Enable auto broadcast
+#        Default: 0 - off
+#                 1 - on
+#
+#    AutoBroadcast.Center
+#        Display method
+#        Default: 0 - announce
+#                 1 - notify
+#                 2 - both
+#
+###################################################################################################################
+
+AutoBroadcast.On = 0
+AutoBroadcast.Center = 0
+
 ###################################################################################################################
 # CREATURE AND GAMEOBJECT SETTINGS
 #
@@ -890,11 +1262,16 @@ TalentsInspecting = 1
 #        Default: 100 yards
 #
 #    Rate.Creature.Aggro
+#    Rate.Creature.Aggro.Instance
 #        Aggro radius percent or off.
 #        Default: 1   - 100%
 #                 1.5 - 150%
 #                 0   - off (0%)
 #
+#    CreatureRespawnAggroDelay
+#        The delay between when a creature spawns and when it can be aggroed by nearby movement.
+#        Default: 5000 (5s)
+#
 #    CreatureFamilyFleeAssistanceRadius
 #        Radius which creature will use to seek for a near creature for assistance. Creature will flee to this creature.
 #        Default: 30
@@ -978,10 +1355,17 @@ TalentsInspecting = 1
 #        in game from other side
 #        Default: 100
 #
+#    Player.GSCalculationBase
+#        default (base) player Gear Score (GS) for calculate additional bonus for vehicles, scaled by GS.
+#        default: 190
+#        range: 1 - 384
+#
 ###################################################################################################################
 
 ThreatRadius = 100
 Rate.Creature.Aggro = 1
+Rate.Creature.Aggro.Instance = 1.0
+CreatureRespawnAggroDelay = 5000
 CreatureFamilyFleeAssistanceRadius = 30
 CreatureFamilyAssistanceRadius = 10
 CreatureFamilyAssistanceDelay = 1500
@@ -1014,7 +1398,7 @@ ListenRange.TextEmote = 40
 ListenRange.Yell = 300
 GuidReserveSize.Creature = 100
 GuidReserveSize.GameObject = 100
-
+Player.GSCalculationBase = 190
 
 ###################################################################################################################
 # CHAT SETTINGS
@@ -1139,6 +1523,16 @@ Channel.SilentlyGMJoin = 0
 #        Default: 1 (enable)
 #                 0 (disable)
 #
+#    GM.AnnounceBan
+#        If enabled bans and mutes are announced for all characters on realm with system message
+#        Default: 0 (disable)
+#                 1 (enable)
+#
+#    GM.InvisibleAura
+#        A spell that will be cast when a gm uses ".gm visible off" (Must be aura spell)
+#        Default: 37800 (50% Transparency)
+#                 0 (Disabled)
+#
 ###################################################################################################################
 
 GM.LoginState            = 2
@@ -1152,6 +1546,8 @@ GM.LogTrade              = 1
 GM.StartLevel            = 1
 GM.LowerSecurity         = 0
 GM.AllowAchievementGain  = 1
+GM.AnnounceBan           = 0
+GM.InvisibleAura         = 37800
 
 ###################################################################################################################
 # VISIBILITY AND RADIUSES
@@ -1198,7 +1594,7 @@ GM.AllowAchievementGain  = 1
 
 Visibility.GroupMode = 0
 Visibility.Distance.Continents    = 90
-Visibility.Distance.Instances     = 120
+Visibility.Distance.Instances     = 400
 Visibility.Distance.BGArenas      = 180
 Visibility.Distance.InFlight      = 100
 Visibility.Distance.Grey.Unit   = 1
@@ -1237,6 +1633,7 @@ Visibility.AIRelocationNotifyDelay = 1000
 #         Default: 1
 #
 #    Rate.XP.Kill
+#    Rate.XP.PetKill
 #    Rate.XP.Quest
 #    Rate.XP.Explore
 #        XP rates
@@ -1382,6 +1779,7 @@ Rate.Drop.Item.Artifact = 1
 Rate.Drop.Item.Referenced = 1
 Rate.Drop.Money = 1
 Rate.XP.Kill    = 1
+Rate.XP.PetKill = 1
 Rate.XP.Quest   = 1
 Rate.XP.Explore = 1
 Rate.Rest.InGame = 1
@@ -1459,6 +1857,10 @@ Death.Ghost.RunSpeed.Battleground = 1.0
 #        Default: 1800000 (30 minutes)
 #                 0 - disable premade group matches (group always added to bg team in normal way)
 #
+#    BattleGround.Random.ResetHour
+#        Hour when random bg reset (0..23)
+#        Default: 6
+#
 ###################################################################################################################
 
 Battleground.CastDeserter = 1
@@ -1467,6 +1869,7 @@ Battleground.QueueAnnouncer.Start = 0
 Battleground.InvitationType = 0
 BattleGround.PrematureFinishTimer = 300000
 BattleGround.PremadeGroupWaitForMatch = 1800000
+BattleGround.Random.ResetHour = 6
 
 ###################################################################################################################
 # ARENA CONFIG
@@ -1503,13 +1906,14 @@ BattleGround.PremadeGroupWaitForMatch = 1800000
 #        Default: 0 (disable)
 #                 1 (enable)
 #
-#    Arena.ArenaSeason.ID
-#        Current area season id show in client
-#        Default: 1
+#    Arena.QueueAnnouncer.Start
+#        Enable arena queue announcer posting to chat at Arena start
+#        Default: 0 (disable)
+#                 1 (enable)
 #
+#    Arena.ArenaSeason.ID
 #    Arena.ArenaSeasonPrevious.ID
-#        Previous area season id show in client
-#        Default: 0
+#        Keys redundant, use WorldStates 3191 and 3901 instead
 #
 #    Arena.StartRating
 #        Default Rating at team creation
@@ -1519,6 +1923,22 @@ BattleGround.PremadeGroupWaitForMatch = 1800000
 #        Default Personal Rating at team creation
 #        Default: -1 (use season dependent default value)
 #
+#    Arena.LoserNoChange
+#        If winner or loser rating is below this limit, loser loses no rating
+#        Default: 0 (disable)
+#                 1400
+#
+#    Arena.LoserHalfChange
+#        If loser rating is below this limit, he loses half of rating
+#        Default: 0 (disable)
+#                 1500
+#
+#    Arena.RemoveAurasWithDurationLess = 30
+#    At start arena remove auras with duration, less then this value (in seconds)
+#        Default: 30s. (wowwiki reports at 25 s., patchnotes 3.0.2 reports on 30s.)
+#        min:      0s. (not remove)
+#        max:     60s.
+#
 ###################################################################################################################
 
 Arena.MaxRatingDifference = 150
@@ -1527,10 +1947,37 @@ Arena.AutoDistributePoints = 0
 Arena.AutoDistributeInterval = 7
 Arena.QueueAnnouncer.Join = 0
 Arena.QueueAnnouncer.Exit = 0
-Arena.ArenaSeason.ID = 1
-Arena.ArenaSeasonPrevious.ID = 0
+Arena.QueueAnnouncer.Start = 0
 Arena.StartRating = -1
 Arena.StartPersonalRating = -1
+Arena.LoserNoChange = 0
+Arena.LoserHalfChange = 0
+Arena.RemoveAurasWithDurationLess = 30
+
+###################################################################################################################
+# OUTDOOR PVP CONFIG
+#
+#    OutdoorPvp.SIEnabled               #Enable Silithus Outdoor pvp
+#    OutdoorPvp.EPEnabled               #Enable Eastern Plaguelands Outdoor pvp
+#    OutdoorPvp.HPEnabled               #Enable Hellfire Peninsula Outdoor pvp
+#    OutdoorPvp.ZMEnabled               #Enable Zangarmarsh Outdoor pvp
+#    OutdoorPvp.TFEnabled               #Enable Terokkar Forest  Outdoor pvp
+#    OutdoorPvp.NAEnabled               #Enable Halaa (Nagrand) Outdoor pvp
+#    OutdoorPvp.GHEnabled               #Enable Venture Bay (Grizzly Hills) Outdoor pvp
+#    OutdoorPvp.WGEnabled               #Enable WinterGrasp Outdoor pvp
+#        Default: 1 (enable)
+#                 0 (disable)
+#
+###################################################################################################################
+
+OutdoorPvp.SIEnabled = 1
+OutdoorPvp.EPEnabled = 1
+OutdoorPvp.HPEnabled = 1
+OutdoorPvp.ZMEnabled = 1
+OutdoorPvp.TFEnabled = 1
+OutdoorPvp.NAEnabled = 1
+OutdoorPvp.GHEnabled = 1
+OutdoorPvp.WGEnabled = 0
 
 ###################################################################################################################
 # NETWORK CONFIG
@@ -1627,6 +2074,36 @@ SOAP.Enabled = 0
 SOAP.IP = 127.0.0.1
 SOAP.Port = 7878
 
+###################################################################################################################
+# ANTICHEAT
+# Initially from gimly, CWN && many other. current from /dev/rsa
+# all other config optons moved to SQL
+#
+#    Anticheat.Enable
+#        Enable Movement Anticheat
+#        Default: 0 - off
+#                 1 - on
+#
+#    Anticheat.DelayAfterAction
+#        Delay new action after occured action.
+#        Default: 30 seconds - 30
+#
+#    Anticheat.GmLevel
+#        Only accounts that are below this gm-level or exact at the same, are reported for cheating.
+#        Default: Only normal Players - 0
+#
+#    Anticheat.Warden
+#        Enable Warden from TOM_RUS checks
+#        Default: 0 - off
+#                 1 - on
+#
+###################################################################################################################
+
+Anticheat.Enable = 0
+Anticheat.DelayAfterAction = 30
+Anticheat.GmLevel = 0
+Anticheat.Warden  = 0
+
 ###################################################################################################################
 #    CharDelete.Method
 #        Character deletion behavior
@@ -1650,6 +2127,187 @@ SOAP.Port = 7878
 #
 ###################################################################################################################
 
-CharDelete.Method = 0
-CharDelete.MinLevel = 0
+CharDelete.Method = 1
+CharDelete.MinLevel = 10
 CharDelete.KeepDays = 30
+
+###################################################################################################################
+#    Refer-A-Friend system by Mas0n
+#    RAF.MaxGrantLevel       = 60  (max level for granting level bonuses)
+#    RAF.MaxReferals         = 5   (max referals for one account)
+#    RAF.MaxReferers         = 5   (max referred accounts for one account)
+#    Rate.RAF.XP             = 3   (XP bonus for referred friends in party)
+#    Rate.RAF.LevelPerLevel  = 0.5 (bonus levels per referal level)
+#
+###################################################################################################################
+
+RAF.MaxGrantLevel       = 60
+RAF.MaxReferals         = 5
+RAF.MaxReferers         = 5
+Rate.RAF.XP             = 3
+Rate.RAF.LevelPerLevel  = 0.5
+
+###################################################################################################################
+#    LFG Dungeon finder system
+#
+#    LFR.Enable              = 0
+#        enabling Raid finder
+#    LFG.Enable              = 0
+#        enabling Dungeon finder
+#    LFG.Debug              = 0
+#        enabling Dungeon finder debug mode
+#    LFR.Extend              = 0
+#        enabling Raid finder extended operations (not blizzlike!)
+#    LFG.MaxKicks            = 5
+#        max number of kick from group before group disband
+#    LFG.OnlyLastEncounterForCompleteDungeon = 0
+#        need complete only last encounter for dungeon complete (not blizzlike!)
+#    LFG.DisableDungeonMapIds
+#        If maybe a dungeon is buggy or something you can disable this
+#        default:            = ""
+#
+###################################################################################################################
+
+LFR.Enable              = 1
+LFG.Enable              = 1
+LFG.Debug               = 0
+LFR.Extend              = 0
+LFG.MaxKicks            = 5
+LFG.OnlyLastEncounterForCompleteDungeon = 0
+LFG.DisableDungeonMapIds= ""
+
+###################################################################################################################
+# Virtual map serving system (VMSS) configuration
+#
+#    VMSS.Enable
+#        Enabling VMSS support (signals handling)
+#        Default: 0 - off
+#                 1 - on
+#
+#    VMSS.MaxThreadBreaks
+#        Maximum single instance map fails before stopping world
+#        Default: 3
+#
+#    VMSS.ThreadBreakRememberTime
+#        Time (in seconds) before cleaning counter of MaxThreadBreaks
+#        Default: 3600 (1 hour)
+#
+#    VMSS.MapFreeMethod
+#        Method for freeing breaked map
+#        0 - safe cleaning (clean auras, save and logout player)
+#        1 - not safe cleaning (kick players, not clean auras, not save players/worldstates)
+#        2 - not safe cleaning (another type - logout players without save)
+#        Default: 0
+#
+#    VMSS.FreezeCheckPeriod
+#        Time period (in milliseconds) for activate FreezeDetect thread (also used for MT statistic collect)
+#        Default: 1000 (1 sec) - default mangos freeze detect period.
+#
+#    VMSS.MapFreezeDetectTime
+#        Time period (in milliseconds) for detect freeze in map thread
+#        Default: 1000 (1 sec)
+#        0                     - Freeze in-map detection (and reaction) DISABLED, works only MaxCoreStuckTime option.
+#
+#    VMSS.TrySkipFirstThreadBreak
+#        Try skip first thread break (crush), and restore his update cycle fully -
+#             possible this crush not code problem, but cheat/memory corruption
+#        Default: 1 (on)
+#
+#    VMSS.ForceUnloadDelay
+#        Time (in milliseconds) for delay force map unload ("synthetic crush"), if freeze detected
+#        Default: 3000 (3 sec)
+#
+#    VMSS.ContinentsSkip
+#        Skip continents in main VMSS operations.
+#        Continents has many object, and currently may be correctly handled only with 1-10 players max
+#        Default: 1 (on)
+#
+###################################################################################################################
+
+VMSS.Enable = 0
+VMSS.MaxThreadBreaks = 3
+VMSS.ThreadBreakRememberTime = 600
+VMSS.MapFreeMethod = 1
+VMSS.FreezeCheckPeriod = 1000
+VMSS.MapFreezeDetectTime = 1000
+VMSS.TrySkipFirstThreadBreak = 1
+VMSS.ForceUnloadDelay = 3000
+VMSS.ContinentsSkip = 1
+
+###################################################################################################################
+#    Duel Reset System
+#
+#    DuelReset.Enable
+#        Enable duel reset script that resets all Arena Cooldows, set full hp/mana and erase all debuffs. (Need complete DuelReset.areaIds) -- Not Blizzlike
+#        Default: 0 (disabled)
+#                 1 (enabled)
+#
+#    DuelReset.AreaIds
+#        List of area's ids where Duel Reset Script will be enabled. With delimiter ','. You can lookup areas going with a GM to X zone and typing .gps
+#        Default: "12,14,4570" Outdoor Stormwind, Outdoor Orgrimmar, Dalaran's Circle of Wills
+#
+###################################################################################################################
+DuelReset.Enable = 0
+DuelReset.AreaIds = "12,14,4570"
+
+###################################################################################################################
+#    World timers
+#    Please, don't change defaults if not sure
+#
+#    Auctions.Timer (milliseconds)
+#        Timer for update auctions
+#        Default: 60000 (1 minute)
+#
+#    Weathers.Timer (milliseconds)
+#        Timer for update weaters in game
+#        Default: 60000 (1 minute)
+#
+#    UpdateUptimeInterval (minutes)
+#        Update realm uptime period in minutes (for save data in 'uptime' table). Must be > 0
+#        Default: 10 minutes
+#
+#    Corpse.Timer (minutes)
+#        Corpse delete timer
+#        Default: 20 minutes
+#
+#    CharDelete.Timer (hours)
+#        default interval for characters table cleanup from deleted chars
+#        Default: 8 hours
+#
+#    AHBot.Timer (milliseconds)
+#        Timer for update Auction bot
+#        Default: 20000 (20 seconds)
+#
+#    AutoBroadcast.Timer (milliseconds)
+#        Timer for auto broadcast
+#        Default: 30000 (30 seconds)
+#
+#    WorldState.Timer (milliseconds)
+#        Timer for update worldstates
+#        Default: 60000 (1 minute)
+#
+#    Calendar.Timer (milliseconds)
+#        Timer for update calendar events
+#        Default: 30000 (30 seconds)
+#
+#    Group.Timer (milliseconds)
+#        Timer for update group events
+#        Default: 1000 (1 second)
+#
+#    Terrain.Timer (milliseconds)
+#        Timer for cleanup terrains
+#        Default: 30000 (30 seconds)
+#
+###################################################################################################################
+
+Auctions.Timer       = 60000
+Weathers.Timer       = 60000
+UpdateUptimeInterval = 10
+Corpse.Timer         = 20
+CharDelete.Timer     = 8
+AHBot.Timer          = 20000
+AutoBroadcast.Timer  = 30000
+WorldState.Timer     = 60000
+Calendar.Timer       = 30000
+Groups.Timer         = 1000
+Terrain.Timer        = 30000
diff --git a/src/mangosd/mangosd.rc b/src/mangosd/mangosd.rc
index c47d99326a6..d4df5d7583a 100644
--- a/src/mangosd/mangosd.rc
+++ b/src/mangosd/mangosd.rc
@@ -1,4 +1,5 @@
 /*
+ * Copyleft (c) 2011-2013 MangosR2 <http://github.com/MangosR2>
  * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,4 +17,34 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-IDI_APPICON ICON DISCARDABLE "mangosd.ico"
+/* ------------------ */
+
+IDI_APPICON ICON "mangosR2.ico"
+
+/* ------------------ */
+
+1 VERSIONINFO
+FILEVERSION 0, 18, 0, 0
+PRODUCTVERSION 1, 0, 0, 0
+FILEOS 0x40004L
+FILETYPE 0x1L
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904E4"
+        {
+           VALUE "CompanyName", "Open source World of Warcraft server."
+           VALUE "FileDescription", "MangosR2 WorldServer"
+           VALUE "FileVersion", "0.18.0.0"
+           VALUE "InternalName", "mangos demon"
+           VALUE "LegalCopyright", "(c) 2005-2012 MaNGOS, (c) 2013 cMaNGOS, (c) 2011-2013 MangosR2"
+           VALUE "OriginalFilename", "mangosd.exe"
+           VALUE "ProductName", "MangosR2"
+           VALUE "ProductVersion", "1.0.0.0"
+        }
+    }
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 1033, 1252
+    }
+}
diff --git a/src/realmd/AuthCodes.h b/src/realmd/AuthCodes.h
index c64898a475f..73a7e5b6818 100644
--- a/src/realmd/AuthCodes.h
+++ b/src/realmd/AuthCodes.h
@@ -76,6 +76,12 @@ enum AuthResult
     WOW_FAIL_LOCKED_ENFORCED        = 0x10,                 ///< You have applied a lock to your account. You can change your locked status by calling your account lock phone number.
     WOW_FAIL_TRIAL_ENDED            = 0x11,                 ///< Your trial subscription has expired. Please visit <site> to upgrade your account.
     WOW_FAIL_USE_BATTLENET          = 0x12,                 ///< WOW_FAIL_OTHER This account is now attached to a Battle.net account. Please login with your Battle.net account email address and password.
+    WOW_FAIL_TOO_FAST                            = 0x16,
+    WOW_FAIL_CHARGEBACK                          = 0x17,
+    WOW_FAIL_GAME_ACCOUNT_LOCKED                 = 0x18,
+    WOW_FAIL_INTERNET_GAME_ROOM_WITHOUT_BNET     = 0x19,
+    WOW_FAIL_UNLOCKABLE_LOCK                     = 0x20,
+    WOW_FAIL_DISCONNECTED                        = 0xFF,
     //WOW_FAIL_OVERMIND_CONVERTED
     //WOW_FAIL_ANTI_INDULGENCE
     //WOW_FAIL_EXPIRED
diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/AuthSocket.cpp
index 2e48344aa3b..bc4d4c51a02 100644
--- a/src/realmd/AuthSocket.cpp
+++ b/src/realmd/AuthSocket.cpp
@@ -24,6 +24,7 @@
 #include "Database/DatabaseEnv.h"
 #include "Config/Config.h"
 #include "Log.h"
+#include "Util.h"
 #include "RealmList.h"
 #include "AuthSocket.h"
 #include "AuthCodes.h"
@@ -207,12 +208,26 @@ void AuthSocket::OnAccept()
 /// Read the packet from the client
 void AuthSocket::OnRead()
 {
+    #define MAX_AUTH_LOGON_CHALLENGES_IN_A_ROW 3
+    uint32 challengesInARow = 0;
+
     uint8 _cmd;
     while (1)
     {
-        if(!recv_soft((char *)&_cmd, 1))
+        if (!recv_soft((char*)&_cmd, 1))
             return;
 
+        if (_cmd == CMD_AUTH_LOGON_CHALLENGE)
+        {
+            ++challengesInARow;
+            if (challengesInARow == MAX_AUTH_LOGON_CHALLENGES_IN_A_ROW)
+            {
+                DETAIL_LOG("Got %u CMD_AUTH_LOGON_CHALLENGE in a row from '%s', possible ongoing DoS", challengesInARow, get_remote_address().c_str());
+                close_connection();
+                return;
+            }
+        }
+
         size_t i;
 
         ///- Circle through known commands and call the correct command handler
@@ -283,6 +298,7 @@ void AuthSocket::SendProof(Sha1Hash sha)
     {
         case 5875:                                          // 1.12.1
         case 6005:                                          // 1.12.2
+        case 6141:                                          // 1.12.3
         {
             sAuthLogonProof_S_BUILD_6005 proof;
             memcpy(proof.M2, sha.GetDigest(), 20);
@@ -299,6 +315,12 @@ void AuthSocket::SendProof(Sha1Hash sha)
         case 11403:                                         // 3.3.2
         case 11723:                                         // 3.3.3a
         case 12340:                                         // 3.3.5a
+        case 13623:                                         // 4.0.6a
+        case 15050:                                         // 4.3.0
+        case 15595:                                         // 4.3.4
+        case 16057:                                         // 5.0.5a
+        case 16135:                                         // 5.0.5b
+        case 16357:                                         // 5.1.0a
         default:                                            // or later
         {
             sAuthLogonProof_S proof;
@@ -359,6 +381,10 @@ bool AuthSocket::_HandleLogonChallenge()
 
     _login = (const char*)ch->I;
     _build = ch->build;
+    _os = (const char*)ch->os;
+
+    if(_os.size() > 4)
+        return false;
 
     ///- Normalize account name
     //utf8ToUpperOnlyLatin(_login); -- client already send account in expected form
@@ -368,41 +394,107 @@ bool AuthSocket::_HandleLogonChallenge()
     _safelogin = _login;
     LoginDatabase.escape_string(_safelogin);
 
-    pkt << (uint8) CMD_AUTH_LOGON_CHALLENGE;
-    pkt << (uint8) 0x00;
+    // Starting CMD_AUTH_LOGON_CHALLENGE
+    AuthResult result = WOW_FAIL_UNKNOWN0;
 
     ///- Verify that this IP is not in the ip_banned table
     // No SQL injection possible (paste the IP address as passed by the socket)
     std::string address = get_remote_address();
     LoginDatabase.escape_string(address);
-    QueryResult *result = LoginDatabase.PQuery("SELECT unbandate FROM ip_banned WHERE "
+    QueryResult* qresult = LoginDatabase.PQuery("SELECT unbandate FROM ip_banned WHERE "
     //    permanent                    still banned
         "(unbandate = bandate OR unbandate > UNIX_TIMESTAMP()) AND ip = '%s'", address.c_str());
-    if (result)
+
+    if (qresult)
     {
-        pkt << (uint8)WOW_FAIL_BANNED;
+        result = WOW_FAIL_BANNED;
         BASIC_LOG("[AuthChallenge] Banned ip %s tries to login!", get_remote_address().c_str());
-        delete result;
+        delete qresult;
     }
     else
     {
         ///- Get the account details from the account table
         // No SQL injection (escaped user name)
 
-        result = LoginDatabase.PQuery("SELECT sha_pass_hash,id,locked,last_ip,gmlevel,v,s FROM account WHERE username = '%s'",_safelogin.c_str ());
-        if( result )
+        //qresult = LoginDatabase.PQuery("SELECT sha_pass_hash,id,locked,last_ip,gmlevel,v,s FROM account WHERE username = '%s'",_safelogin.c_str());
+        qresult = LoginDatabase.PQuery("SELECT a.sha_pass_hash,a.id,a.locked,a.last_ip,aa.gmlevel,a.v,a.s FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE username = '%s'", _safelogin.c_str());
+
+        if (qresult)
         {
+            std::string rI = (*qresult)[0].GetCppString();
+            uint32 accountId = (*qresult)[1].GetUInt32();
+            uint8 locked = (*qresult)[2].GetUInt8();
+            std::string lastIP = (*qresult)[3].GetString();
+            uint8 secLevel = (*qresult)[4].GetUInt8();
+            std::string databaseV = (*qresult)[5].GetCppString();
+            std::string databaseS = (*qresult)[6].GetCppString();
+
+            bool blockLogin = false;
+            if (sConfig.GetBoolDefault("MultiIPCheck", false))
+            {
+                int32 iplimit = sConfig.GetIntDefault("MultiIPLimit", 10);
+                int32 multiIPdelay = sConfig.GetIntDefault("MultiIPPeriodInHours", 48);
+                // If a GM account login ignore MultiIP
+                QueryResult* ipcheck = LoginDatabase.PQuery("SELECT id FROM account WHERE last_ip = '%s' AND id != %u AND last_login > NOW() - INTERVAL %u HOUR ORDER BY last_login DESC;", get_remote_address().c_str(), accountId, multiIPdelay);
+                if (ipcheck)
+                {
+                    // build whitelist
+                    std::list<uint32> accountsInWhitelist;
+                    accountsInWhitelist.clear();
+                    QueryResult* IDsinwhite = LoginDatabase.PQuery("SELECT whitelist FROM multi_IP_whitelist WHERE whitelist LIKE '%|%u|%'", accountId);
+                    if (IDsinwhite)
+                    {
+                        Tokens whitelistaccounts((*IDsinwhite)[0].GetCppString(),'|');
+                        bool isInWhite = false;
+                        for (Tokens::const_iterator itr = whitelistaccounts.begin(); itr != whitelistaccounts.end(); ++itr)
+                            accountsInWhitelist.push_back(atoi(*itr));
+                        delete IDsinwhite;
+                    }
+
+                    do
+                    {
+                        Field* pFields =ipcheck->Fetch();
+                        uint32 MultiAccountID = pFields[0].GetUInt32();
+                        bool isInWhite = false;
+                        for (std::list<uint32>::const_iterator itr = accountsInWhitelist.begin(); itr != accountsInWhitelist.end(); ++itr)
+                        {
+                            if (*itr == MultiAccountID)
+                                isInWhite = true;
+                        }
+                        if (!isInWhite)
+                        {
+                            --iplimit;
+                        }
+                    }
+                    while (ipcheck->NextRow());
+
+                    delete ipcheck;
+                }
+                /*
+                 * default case 10 allowed account with same last_ip
+                 * we found 9 account with current ip. NOTE: actual account is not in list
+                 * 10 - 9 - 1
+                 *          ^ current account
+                 *      ^ account in list
+                 * ^ allowed
+                 */
+                if (iplimit < 1)
+                {
+                    DEBUG_LOG("[AuthChallenge] Account '%s' is multi IP - '%s'", _login.c_str(), lastIP.c_str());
+                    result = WOW_FAIL_PARENTCONTROL;
+                    blockLogin = true;
+                }
+            }
             ///- If the IP is 'locked', check that the player comes indeed from the correct IP address
-            bool locked = false;
-            if((*result)[2].GetUInt8() == 1)                // if ip is locked
+            if (locked == 1)                // if ip is locked
             {
-                DEBUG_LOG("[AuthChallenge] Account '%s' is locked to IP - '%s'", _login.c_str(), (*result)[3].GetString());
+                DEBUG_LOG("[AuthChallenge] Account '%s' is locked to IP - '%s'", _login.c_str(), lastIP.c_str());
                 DEBUG_LOG("[AuthChallenge] Player address is '%s'", get_remote_address().c_str());
-                if ( strcmp((*result)[3].GetString(),get_remote_address().c_str()) )
+                if (strcmp(lastIP.c_str(),get_remote_address().c_str()) )
                 {
                     DEBUG_LOG("[AuthChallenge] Account IP differs");
-                    pkt << (uint8) WOW_FAIL_SUSPENDED;
-                    locked=true;
+                    result = WOW_FAIL_SUSPENDED;
+                    blockLogin = true;
                 }
                 else
                 {
@@ -414,39 +506,32 @@ bool AuthSocket::_HandleLogonChallenge()
                 DEBUG_LOG("[AuthChallenge] Account '%s' is not locked to ip", _login.c_str());
             }
 
-            if (!locked)
+            if (!blockLogin)
             {
                 ///- If the account is banned, reject the logon attempt
-                QueryResult *banresult = LoginDatabase.PQuery("SELECT bandate,unbandate FROM account_banned WHERE "
-                    "id = %u AND active = 1 AND (unbandate > UNIX_TIMESTAMP() OR unbandate = bandate)", (*result)[1].GetUInt32());
-                if(banresult)
+                QueryResult* banresult = LoginDatabase.PQuery("SELECT bandate,unbandate FROM account_banned WHERE "
+                    "id = %u AND active = 1 AND (unbandate > UNIX_TIMESTAMP() OR unbandate = bandate)", accountId);
+                if (banresult)
                 {
-                    if((*banresult)[0].GetUInt64() == (*banresult)[1].GetUInt64())
+                    if ((*banresult)[0].GetUInt64() == (*banresult)[1].GetUInt64())
                     {
-                        pkt << (uint8) WOW_FAIL_BANNED;
-                        BASIC_LOG("[AuthChallenge] Banned account %s tries to login!",_login.c_str ());
+                        result = WOW_FAIL_BANNED;
+                        BASIC_LOG("[AuthChallenge] Banned account %s (Id: %u) tries to login!", _login.c_str(), accountId);
                     }
                     else
                     {
-                        pkt << (uint8) WOW_FAIL_SUSPENDED;
-                        BASIC_LOG("[AuthChallenge] Temporarily banned account %s tries to login!",_login.c_str ());
+                        result = WOW_FAIL_SUSPENDED;
+                        BASIC_LOG("[AuthChallenge] Temporarily banned account %s (Id: %u) tries to login!",_login.c_str(), accountId);
                     }
 
                     delete banresult;
                 }
                 else
                 {
-                    ///- Get the password from the account table, upper it, and make the SRP6 calculation
-                    std::string rI = (*result)[0].GetCppString();
-
-                    ///- Don't calculate (v, s) if there are already some in the database
-                    std::string databaseV = (*result)[5].GetCppString();
-                    std::string databaseS = (*result)[6].GetCppString();
-
                     DEBUG_LOG("database authentication values: v='%s' s='%s'", databaseV.c_str(), databaseS.c_str());
 
                     // multiply with 2, bytes are stored as hexstring
-                    if(databaseV.size() != s_BYTE_SIZE*2 || databaseS.size() != s_BYTE_SIZE*2)
+                    if (databaseV.size() != s_BYTE_SIZE*2 || databaseS.size() != s_BYTE_SIZE*2)
                         _SetVSFields(rI);
                     else
                     {
@@ -454,66 +539,150 @@ bool AuthSocket::_HandleLogonChallenge()
                         v.SetHexStr(databaseV.c_str());
                     }
 
-                    b.SetRand(19 * 8);
-                    BigNumber gmod = g.ModExp(b, N);
-                    B = ((v * 3) + gmod) % N;
+                    result = WOW_SUCCESS;
 
-                    MANGOS_ASSERT(gmod.GetNumBytes() <= 32);
+                    _accountSecurityLevel = secLevel <= SEC_ADMINISTRATOR ? AccountTypes(secLevel) : SEC_ADMINISTRATOR;
 
-                    BigNumber unk3;
-                    unk3.SetRand(16 * 8);
+                    _localizationName.resize(4);
+                    for (int i = 0; i < 4; ++i)
+                        _localizationName[i] = ch->country[4-i-1];
 
-                    ///- Fill the response packet with the result
-                    pkt << uint8(WOW_SUCCESS);
+                    BASIC_LOG("[AuthChallenge] account %s (Id: %u) is using '%c%c%c%c' locale (%u)", _login.c_str (), accountId, ch->country[3], ch->country[2], ch->country[1], ch->country[0], GetLocaleByName(_localizationName));
+                }
+            }
+            delete qresult;
+        }
+        else if (sConfig.GetBoolDefault("AutoRegistration", false))
+        {
+            if (_safelogin.find_first_of("\t\v\b\f\a\n\r\\\"\'\? <>[](){}_=+-|/!@#$%^&*~`.,\0") == _safelogin.npos && _safelogin.length() > 3)
+            {
+                QueryResult* checkIPresult = LoginDatabase.PQuery("SELECT COUNT(last_ip) FROM account WHERE last_ip = '%s'",get_remote_address().c_str());
 
-                    // B may be calculated < 32B so we force minimal length to 32B
-                    pkt.append(B.AsByteArray(32), 32);      // 32 bytes
-                    pkt << uint8(1);
-                    pkt.append(g.AsByteArray(), 1);
-                    pkt << uint8(32);
-                    pkt.append(N.AsByteArray(32), 32);
-                    pkt.append(s.AsByteArray(), s.GetNumBytes());// 32 bytes
-                    pkt.append(unk3.AsByteArray(16), 16);
-                    uint8 securityFlags = 0;
-                    pkt << uint8(securityFlags);            // security flags (0x0...0x04)
+                int32 regCount = checkIPresult ? (*checkIPresult)[0].GetUInt32() : 0;
 
-                    if(securityFlags & 0x01)                // PIN input
-                    {
-                        pkt << uint32(0);
-                        pkt << uint64(0) << uint64(0);      // 16 bytes hash?
-                    }
+                if (regCount >= sConfig.GetIntDefault("AutoRegistration.Amount", 1))
+                {
+                    BASIC_LOG("[AuthChallenge] Impossible auto-register account %s, number of auto-registered accouts is %u, but allowed only %u",
+                         _safelogin.c_str(),regCount, sConfig.GetIntDefault("AutoRegistration.Amount", 1));
+//                    result = WOW_FAIL_DB_BUSY;
+                    result = WOW_FAIL_DISCONNECTED;
+                }
+                else
+                {
+                    std::transform(_safelogin.begin(), _safelogin.end(), _safelogin.begin(), std::towupper); 
 
-                    if(securityFlags & 0x02)                // Matrix input
-                    {
-                        pkt << uint8(0);
-                        pkt << uint8(0);
-                        pkt << uint8(0);
-                        pkt << uint8(0);
-                        pkt << uint64(0);
-                    }
+                    Sha1Hash sha;
+                    sha.Initialize();
+                    sha.UpdateData(_safelogin);
+                    sha.UpdateData(":");
+                    sha.UpdateData(_safelogin);
+                    sha.Finalize();
 
-                    if(securityFlags & 0x04)                // Security token input
-                    {
-                        pkt << uint8(1);
-                    }
+                    std::string encoded;
+                    hexEncodeByteArray(sha.GetDigest(), sha.GetLength(), encoded);
 
-                    uint8 secLevel = (*result)[4].GetUInt8();
-                    _accountSecurityLevel = secLevel <= SEC_ADMINISTRATOR ? AccountTypes(secLevel) : SEC_ADMINISTRATOR;
+                    LoginDatabase.PExecute("INSERT INTO account(username,sha_pass_hash,joindate) VALUES('%s','%s',NOW())", _safelogin.c_str(), encoded.c_str());
+
+                    _SetVSFields(encoded);
+
+                    BASIC_LOG("[AuthChallenge] account %s auto-registered (count %u)!",_safelogin.c_str(), ++regCount);
+
+                    result = WOW_SUCCESS;
+                    _accountSecurityLevel = SEC_PLAYER;
 
                     _localizationName.resize(4);
-                    for(int i = 0; i < 4; ++i)
+                    for (int i = 0; i < 4; ++i)
                         _localizationName[i] = ch->country[4-i-1];
-
-                    BASIC_LOG("[AuthChallenge] account %s is using '%c%c%c%c' locale (%u)", _login.c_str (), ch->country[3], ch->country[2], ch->country[1], ch->country[0], GetLocaleByName(_localizationName));
                 }
+
+                if (checkIPresult)
+                    delete checkIPresult;
             }
-            delete result;
         }
-        else                                                // no account
+        else
+            result = WOW_FAIL_UNKNOWN_ACCOUNT;
+    }
+
+    pkt << uint8(CMD_AUTH_LOGON_CHALLENGE);
+    pkt << uint8(0x00);
+    pkt << uint8(result);
+
+    switch (result)
+    {
+        case WOW_SUCCESS:
         {
-            pkt<< (uint8) WOW_FAIL_UNKNOWN_ACCOUNT;
+            b.SetRand(19 * 8);
+            BigNumber gmod = g.ModExp(b, N);
+            B = ((v * 3) + gmod) % N;
+
+            MANGOS_ASSERT(gmod.GetNumBytes() <= 32);
+
+            BigNumber unk3;
+            unk3.SetRand(16 * 8);
+
+            // B may be calculated < 32B so we force minimal length to 32B
+            pkt.append(B.AsByteArray(32), 32);      // 32 bytes
+            pkt << uint8(1);
+            pkt.append(g.AsByteArray(), 1);
+            pkt << uint8(32);
+            pkt.append(N.AsByteArray(32), 32);
+            pkt.append(s.AsByteArray(), s.GetNumBytes());// 32 bytes
+            pkt.append(unk3.AsByteArray(16), 16);
+            uint8 securityFlags = 0;
+            pkt << uint8(securityFlags);            // security flags (0x0...0x04)
+
+            if (securityFlags & 0x01)               // PIN input
+            {
+                pkt << uint32(0);
+                pkt << uint64(0) << uint64(0);      // 16 bytes hash?
+            }
+
+            if (securityFlags & 0x02)               // Matrix input
+            {
+                pkt << uint8(0);
+                pkt << uint8(0);
+                pkt << uint8(0);
+                pkt << uint8(0);
+                pkt << uint64(0);
+            }
+
+            if (securityFlags & 0x04)               // Security token input
+            {
+                pkt << uint8(1);
+            }
+
+            break;
         }
+        case WOW_FAIL_UNKNOWN0:
+        case WOW_FAIL_UNKNOWN1:
+        case WOW_FAIL_SUSPENDED:
+        case WOW_FAIL_BANNED:
+        case WOW_FAIL_UNKNOWN_ACCOUNT:
+        case WOW_FAIL_INCORRECT_PASSWORD:
+        case WOW_FAIL_ALREADY_ONLINE:
+        case WOW_FAIL_NO_TIME:
+        case WOW_FAIL_DB_BUSY:
+        case WOW_FAIL_VERSION_INVALID:
+        case WOW_FAIL_VERSION_UPDATE:
+        case WOW_FAIL_INVALID_SERVER:
+        case WOW_FAIL_FAIL_NOACCESS:
+        case WOW_SUCCESS_SURVEY:
+        case WOW_FAIL_PARENTCONTROL:
+        case WOW_FAIL_LOCKED_ENFORCED:
+        case WOW_FAIL_TRIAL_ENDED:
+        case WOW_FAIL_USE_BATTLENET:
+        case WOW_FAIL_TOO_FAST:
+        case WOW_FAIL_CHARGEBACK:
+        case WOW_FAIL_GAME_ACCOUNT_LOCKED:
+        case WOW_FAIL_INTERNET_GAME_ROOM_WITHOUT_BNET:
+        case WOW_FAIL_UNLOCKABLE_LOCK:
+        case WOW_FAIL_DISCONNECTED:
+            break;
+        default:
+            BASIC_LOG("[AuthChallenge] unknown CMD_AUTH_LOGON_CHALLENGE execution result %u!", result);
+            break;
     }
+
     send((char const*)pkt.contents(), pkt.size());
     return true;
 }
@@ -524,14 +693,14 @@ bool AuthSocket::_HandleLogonProof()
     DEBUG_LOG("Entering _HandleLogonProof");
     ///- Read the packet
     sAuthLogonProof_C lp;
-    if(!recv((char *)&lp, sizeof(sAuthLogonProof_C)))
+    if (!recv((char *)&lp, sizeof(sAuthLogonProof_C)))
         return false;
 
     ///- Check if the client has one of the expected version numbers
     bool valid_version = FindBuildInfo(_build) != NULL;
 
     /// <ul><li> If the client has no valid version
-    if(!valid_version)
+    if (!valid_version)
     {
         if (this->patch_ != ACE_INVALID_HANDLE)
             return false;
@@ -672,7 +841,7 @@ bool AuthSocket::_HandleLogonProof()
         ///- Update the sessionkey, last_ip, last login time and reset number of failed logins in the account table for this account
         // No SQL injection (escaped user name) and IP address as received by socket
         const char* K_hex = K.AsHexStr();
-        LoginDatabase.PExecute("UPDATE account SET sessionkey = '%s', last_ip = '%s', last_login = NOW(), locale = '%u', failed_logins = 0 WHERE username = '%s'", K_hex, get_remote_address().c_str(), GetLocaleByName(_localizationName), _safelogin.c_str() );
+        LoginDatabase.PExecute("UPDATE account SET sessionkey = '%s', last_ip = '%s', last_login = NOW(), locale = '%u', os = '%s', failed_logins = 0 WHERE username = '%s'", K_hex, get_remote_address().c_str(), GetLocaleByName(_localizationName), _os.c_str(), _safelogin.c_str() );
         OPENSSL_free((void*)K_hex);
 
         ///- Finish SRP6 and send the final result to the client
@@ -701,22 +870,22 @@ bool AuthSocket::_HandleLogonProof()
         BASIC_LOG("[AuthChallenge] account %s tried to login with wrong password!",_login.c_str ());
 
         uint32 MaxWrongPassCount = sConfig.GetIntDefault("WrongPass.MaxCount", 0);
-        if(MaxWrongPassCount > 0)
+        if (MaxWrongPassCount > 0)
         {
             //Increment number of failed logins by one and if it reaches the limit temporarily ban that account or IP
             LoginDatabase.PExecute("UPDATE account SET failed_logins = failed_logins + 1 WHERE username = '%s'",_safelogin.c_str());
 
-            if(QueryResult *loginfail = LoginDatabase.PQuery("SELECT id, failed_logins FROM account WHERE username = '%s'", _safelogin.c_str()))
+            if (QueryResult *loginfail = LoginDatabase.PQuery("SELECT id, failed_logins FROM account WHERE username = '%s'", _safelogin.c_str()))
             {
                 Field* fields = loginfail->Fetch();
                 uint32 failed_logins = fields[1].GetUInt32();
 
-                if( failed_logins >= MaxWrongPassCount )
+                if ( failed_logins >= MaxWrongPassCount )
                 {
                     uint32 WrongPassBanTime = sConfig.GetIntDefault("WrongPass.BanTime", 600);
                     bool WrongPassBanType = sConfig.GetBoolDefault("WrongPass.BanType", false);
 
-                    if(WrongPassBanType)
+                    if (WrongPassBanType)
                     {
                         uint32 acc_id = fields[0].GetUInt32();
                         LoginDatabase.PExecute("INSERT INTO account_banned VALUES ('%u',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','MaNGOS realmd','Failed login autoban',1)",
@@ -778,6 +947,10 @@ bool AuthSocket::_HandleReconnectChallenge()
 
     EndianConvert(ch->build);
     _build = ch->build;
+    _os = (const char*)ch->os;
+
+    if (_os.size() > 4)
+        return false;
 
     QueryResult *result = LoginDatabase.PQuery ("SELECT sessionkey FROM account WHERE username = '%s'", _safelogin.c_str ());
 
@@ -810,7 +983,7 @@ bool AuthSocket::_HandleReconnectProof()
     DEBUG_LOG("Entering _HandleReconnectProof");
     ///- Read the packet
     sAuthReconnectProof_C lp;
-    if(!recv((char *)&lp, sizeof(sAuthReconnectProof_C)))
+    if (!recv((char *)&lp, sizeof(sAuthReconnectProof_C)))
         return false;
 
     if (_login.empty() || !_reconnectProof.GetNumBytes() || !K.GetNumBytes())
@@ -860,7 +1033,7 @@ bool AuthSocket::_HandleRealmList()
     // No SQL injection (escaped user name)
 
     QueryResult *result = LoginDatabase.PQuery("SELECT id,sha_pass_hash FROM account WHERE username = '%s'",_safelogin.c_str());
-    if(!result)
+    if (!result)
     {
         sLog.outError("[ERROR] user %s tried to login and we cannot find him in the database.",_login.c_str());
         close_connection();
@@ -894,17 +1067,18 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid)
     {
         case 5875:                                          // 1.12.1
         case 6005:                                          // 1.12.2
+        case 6141:                                          // 1.12.3
         {
             pkt << uint32(0);                               // unused value
             pkt << uint8(sRealmList.size());
 
-            for(RealmList::RealmMap::const_iterator  i = sRealmList.begin(); i != sRealmList.end(); ++i)
+            for (RealmList::RealmMap::const_iterator  i = sRealmList.begin(); i != sRealmList.end(); ++i)
             {
                 uint8 AmountOfCharacters;
 
                 // No SQL injection. id of realm is controlled by the database.
                 QueryResult *result = LoginDatabase.PQuery( "SELECT numchars FROM realmcharacters WHERE realmid = '%d' AND acctid='%u'", i->second.m_ID, acctid);
-                if( result )
+                if ( result )
                 {
                     Field *fields = result->Fetch();
                     AmountOfCharacters = fields[0].GetUInt8();
@@ -954,18 +1128,24 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid)
         case 11403:                                         // 3.3.2
         case 11723:                                         // 3.3.3a
         case 12340:                                         // 3.3.5a
+        case 13623:                                         // 4.0.6a
+        case 15050:                                         // 4.3.0
+        case 15595:                                         // 4.3.4
+        case 16057:                                         // 5.0.5a
+        case 16135:                                         // 5.0.5b
+        case 16357:                                         // 5.1.0a
         default:                                            // and later
         {
             pkt << uint32(0);                               // unused value
             pkt << uint16(sRealmList.size());
 
-            for(RealmList::RealmMap::const_iterator  i = sRealmList.begin(); i != sRealmList.end(); ++i)
+            for (RealmList::RealmMap::const_iterator  i = sRealmList.begin(); i != sRealmList.end(); ++i)
             {
                 uint8 AmountOfCharacters;
 
                 // No SQL injection. id of realm is controlled by the database.
                 QueryResult *result = LoginDatabase.PQuery( "SELECT numchars FROM realmcharacters WHERE realmid = '%d' AND acctid='%u'", i->second.m_ID, acctid);
-                if( result )
+                if ( result )
                 {
                     Field *fields = result->Fetch();
                     AmountOfCharacters = fields[0].GetUInt8();
@@ -1021,7 +1201,7 @@ bool AuthSocket::_HandleXferResume()
 {
     DEBUG_LOG("Entering _HandleXferResume");
 
-    if(recv_len() < 9)
+    if (recv_len() < 9)
         return false;
 
     recv_skip(1);
@@ -1029,7 +1209,7 @@ bool AuthSocket::_HandleXferResume()
     uint64 start_pos;
     recv((char *)&start_pos, 8);
 
-    if(patch_ == ACE_INVALID_HANDLE)
+    if (patch_ == ACE_INVALID_HANDLE)
     {
         close_connection();
         return false;
@@ -1037,13 +1217,13 @@ bool AuthSocket::_HandleXferResume()
 
     ACE_OFF_T file_size = ACE_OS::filesize(patch_);
 
-    if(file_size == -1 || start_pos >= (uint64)file_size)
+    if (file_size == -1 || start_pos >= (uint64)file_size)
     {
         close_connection();
         return false;
     }
 
-    if(ACE_OS::lseek(patch_, start_pos, SEEK_SET) == -1)
+    if (ACE_OS::lseek(patch_, start_pos, SEEK_SET) == -1)
     {
         close_connection();
         return false;
@@ -1083,10 +1263,9 @@ void AuthSocket::InitPatch()
 
     patch_ = ACE_INVALID_HANDLE;
 
-    if(handler->open() == -1)
+    if (handler->open() == -1)
     {
         handler->close();
         close_connection();
     }
 }
-
diff --git a/src/realmd/AuthSocket.h b/src/realmd/AuthSocket.h
index 7416df89f46..9d465754b00 100644
--- a/src/realmd/AuthSocket.h
+++ b/src/realmd/AuthSocket.h
@@ -72,6 +72,7 @@ class AuthSocket: public BufferedSocket
         // Since GetLocaleByName() is _NOT_ bijective, we have to store the locale as a string. Otherwise we can't differ
         // between enUS and enGB, which is important for the patch system
         std::string _localizationName;
+        std::string _os;
         uint16 _build;
         AccountTypes _accountSecurityLevel;
 
diff --git a/src/realmd/BufferedSocket.cpp b/src/realmd/BufferedSocket.cpp
index 5b3811be878..5fa0408c634 100644
--- a/src/realmd/BufferedSocket.cpp
+++ b/src/realmd/BufferedSocket.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ * Copyright (c) 2014 by boxa for MangosR2 <http://github.com/mangosR2>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +21,9 @@
   \ingroup realmd
   */
 
+#include "Common.h"
 #include "BufferedSocket.h"
+#include "IpList.h"
 
 #include <ace/OS_NS_string.h>
 #include <ace/INET_Addr.h>
@@ -40,16 +43,44 @@ BufferedSocket::BufferedSocket(void):
 {
 }
 
-/*virtual*/ int BufferedSocket::open(void * arg)
+/*virtual*/ int BufferedSocket::open(void* arg)
 {
-    if(Base::open(arg) == -1)
+    if (Base::open(arg) == -1)
         return -1;
 
     ACE_INET_Addr addr;
 
-    if(peer().get_remote_addr(addr) == -1)
+    if (peer().get_remote_addr(addr) == -1)
         return -1;
 
+    // <anti DDoS>
+    uint32 uintAddr = addr.get_ip_address();
+    if (!uintAddr)
+        return -1;
+
+    time_t currTime = time(NULL);
+
+    if (!sIpListStorage.empty())
+    {
+        // first del expired records
+        for (TIpList::iterator itr = sIpListStorage.begin(); itr != sIpListStorage.end();)
+        {
+            if (itr->second < currTime)
+                sIpListStorage.erase(itr++);
+            else
+                ++itr;
+        }
+
+        // then search current connected ip
+        TIpList::const_iterator itr = sIpListStorage.find(uintAddr);
+        if (itr != sIpListStorage.end())
+            return -1;
+    }
+
+    // add new ip addr into ip list
+    sIpListStorage[uintAddr] = currTime;
+    // </anti DDoS>
+
     char address[1024];
 
     addr.get_host_addr(address, 1024);
@@ -73,7 +104,7 @@ size_t BufferedSocket::recv_len(void) const
 
 bool BufferedSocket::recv_soft(char *buf, size_t len)
 {
-    if(this->input_buffer_.length() < len)
+    if (this->input_buffer_.length() < len)
         return false;
 
     ACE_OS::memcpy(buf, this->input_buffer_.rd_ptr(), len);
@@ -85,7 +116,7 @@ bool BufferedSocket::recv(char *buf, size_t len)
 {
     bool ret = this->recv_soft(buf, len);
 
-    if(ret)
+    if (ret)
         this->recv_skip(len);
 
     return ret;
@@ -100,22 +131,22 @@ ssize_t BufferedSocket::noblk_send(ACE_Message_Block &message_block)
 {
     const size_t len = message_block.length();
 
-    if(len == 0)
+    if (len == 0)
         return -1;
 
     // Try to send the message directly.
     ssize_t n = this->peer().send(message_block.rd_ptr(), len, MSG_NOSIGNAL);
 
-    if(n < 0)
+    if (n < 0)
     {
-        if(errno == EWOULDBLOCK)
+        if (errno == EWOULDBLOCK)
             // Blocking signal
             return 0;
         else
             // Error
             return -1;
     }
-    else if(n == 0)
+    else if (n == 0)
     {
         // Can this happen ?
         return -1;
@@ -127,7 +158,7 @@ ssize_t BufferedSocket::noblk_send(ACE_Message_Block &message_block)
 
 bool BufferedSocket::send(const char *buf, size_t len)
 {
-    if(buf == NULL || len == 0)
+    if (buf == NULL || len == 0)
         return true;
 
     ACE_Data_Block db(
@@ -146,14 +177,14 @@ bool BufferedSocket::send(const char *buf, size_t len)
 
     message_block.wr_ptr(len);
 
-    if(this->msg_queue()->is_empty())
+    if (this->msg_queue()->is_empty())
     {
         // Try to send it directly.
         ssize_t n = this->noblk_send(message_block);
 
-        if(n < 0)
+        if (n < 0)
             return false;
-        else if(n == len)
+        else if (n == len)
             return true;
 
         // adjust how much bytes we sent
@@ -165,14 +196,14 @@ bool BufferedSocket::send(const char *buf, size_t len)
     // enqueue the message, note: clone is needed cause we cant enqueue stuff on the stack
     ACE_Message_Block *mb = message_block.clone();
 
-    if(this->msg_queue()->enqueue_tail(mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
+    if (this->msg_queue()->enqueue_tail(mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
     {
         mb->release();
         return false;
     }
 
     // tell reactor to call handle_output() when we can send more data
-    if(this->reactor()->schedule_wakeup(this, ACE_Event_Handler::WRITE_MASK) == -1)
+    if (this->reactor()->schedule_wakeup(this, ACE_Event_Handler::WRITE_MASK) == -1)
         return false;
 
     return true;
@@ -182,24 +213,24 @@ bool BufferedSocket::send(const char *buf, size_t len)
 {
     ACE_Message_Block *mb = 0;
 
-    if(this->msg_queue()->is_empty())
+    if (this->msg_queue()->is_empty())
     {
         // if no more data to send, then cancel notification
         this->reactor()->cancel_wakeup(this, ACE_Event_Handler::WRITE_MASK);
         return 0;
     }
 
-    if(this->msg_queue()->dequeue_head(mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
+    if (this->msg_queue()->dequeue_head(mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
         return -1;
 
     ssize_t n = this->noblk_send(*mb);
 
-    if(n < 0)
+    if (n < 0)
     {
         mb->release();
         return -1;
     }
-    else if(n == mb->length())
+    else if (n == mb->length())
     {
         mb->release();
         return 1;
@@ -208,7 +239,7 @@ bool BufferedSocket::send(const char *buf, size_t len)
     {
         mb->rd_ptr(n);
 
-        if(this->msg_queue()->enqueue_head(mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
+        if (this->msg_queue()->enqueue_head(mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
         {
             mb->release();
             return -1;
@@ -226,12 +257,12 @@ bool BufferedSocket::send(const char *buf, size_t len)
 
     ssize_t n = this->peer().recv(this->input_buffer_.wr_ptr(), space);
 
-    if(n < 0)
+    if (n < 0)
     {
         // blocking signal or error
         return errno == EWOULDBLOCK ? 0 : -1;
     }
-    else if(n == 0)
+    else if (n == 0)
     {
         // EOF
         return -1;
@@ -264,4 +295,3 @@ void BufferedSocket::close_connection(void)
 
     reactor()->remove_handler(this, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::ALL_EVENTS_MASK);
 }
-
diff --git a/src/realmd/CMakeLists.txt b/src/realmd/CMakeLists.txt
index 29a53082d64..09dd729eb31 100644
--- a/src/realmd/CMakeLists.txt
+++ b/src/realmd/CMakeLists.txt
@@ -16,13 +16,29 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-set(EXECUTABLE_NAME realmd)
-file(GLOB_RECURSE EXECUTABLE_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h)
+if(NOT UNIX)
+  set(EXECUTABLE_NAME realmd)
+else()
+  set(EXECUTABLE_NAME mangos-realmd)
+endif()
+
+set(EXECUTABLE_SRCS
+    AuthCodes.h
+    AuthSocket.cpp
+    AuthSocket.h
+    BufferedSocket.cpp
+    BufferedSocket.h
+    IpList.h
+    Main.cpp
+    PatchHandler.cpp
+    PatchHandler.h
+    RealmList.cpp
+    RealmList.h
+   )
 
 if(WIN32)
-  list(APPEND EXECUTABLE_SRCS
-    realmd.rc
-  )
+  # add resource file to windows build
+  set(EXECUTABLE_SRCS ${EXECUTABLE_SRCS} realmd.rc)
 endif()
 
 include_directories(
diff --git a/src/realmd/IpList.h b/src/realmd/IpList.h
new file mode 100644
index 00000000000..c2cd51fcc84
--- /dev/null
+++ b/src/realmd/IpList.h
@@ -0,0 +1,28 @@
+/*
+/* Copyright (c) 2014 by boxa for MangosR2 <http://github.com/mangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _IPLIST_H_
+#define _IPLIST_H_
+
+#include "Common.h"
+
+typedef std::map<uint32/*ip address*/, time_t/*lastAccessTime*/> TIpList;
+
+TIpList sIpListStorage;
+
+#endif /* _IPLIST_H_ */
diff --git a/src/realmd/Main.cpp b/src/realmd/Main.cpp
index 9db9f6854e3..dc1a22424af 100644
--- a/src/realmd/Main.cpp
+++ b/src/realmd/Main.cpp
@@ -31,6 +31,7 @@
 #include "revision.h"
 #include "revision_nr.h"
 #include "revision_sql.h"
+#include "revision_R2.h"
 #include "Util.h"
 #include <openssl/opensslv.h>
 #include <openssl/crypto.h>
@@ -45,8 +46,8 @@
 #ifdef WIN32
 #include "ServiceWin32.h"
 char serviceName[] = "realmd";
-char serviceLongName[] = "MaNGOS realmd service";
-char serviceDescription[] = "Massive Network Game Object Server";
+char serviceLongName[] = "MangosR2 realmd service";
+char serviceDescription[] = "Massive Network Game Object R2 Server";
 /*
  * -1 - not in service mode
  *  0 - stopped
@@ -107,7 +108,7 @@ extern int main(int argc, char **argv)
                 cfg_file = cmd_opts.opt_arg();
                 break;
             case 'v':
-                printf("%s\n", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,REVISION_ID));
+                printf("%s\n", _FULLVERSION(REVISION_NR));
                 return 0;
 
             case 's':
@@ -166,7 +167,7 @@ extern int main(int argc, char **argv)
 
     if (!sConfig.SetSource(cfg_file))
     {
-        sLog.outError("Could not find configuration file %s.", cfg_file);
+        sLog.outError("BOOT: Could not find configuration file %s.", cfg_file);
         Log::WaitBeforeContinueIfNeed();
         return 1;
     }
@@ -185,8 +186,8 @@ extern int main(int argc, char **argv)
 
     sLog.Initialize();
 
-    sLog.outString( "%s [realm-daemon]", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,REVISION_ID) );
-    sLog.outString( "<Ctrl-C> to stop.\n" );
+    sLog.outString("BOOT: %s [realm-daemon]", _FULLVERSION(REVISION_R2));
+    sLog.outString("BOOT: Press <Ctrl-C> to stop." );
     sLog.outString("Using configuration file %s.", cfg_file);
 
     ///- Check the version of the configuration file
@@ -201,22 +202,31 @@ extern int main(int argc, char **argv)
         Log::WaitBeforeContinueIfNeed();
     }
 
-    DETAIL_LOG("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
+    sLog.outString("BOOT: Using %s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
     if (SSLeay() < 0x009080bfL )
     {
-        DETAIL_LOG("WARNING: Outdated version of OpenSSL lib. Logins to server may not work!");
-        DETAIL_LOG("WARNING: Minimal required version [OpenSSL 0.9.8k]");
+        DETAIL_LOG("BOOT: WARNING: Outdated version of OpenSSL lib. Logins to server may not work!");
+        DETAIL_LOG("BOOT: WARNING: Minimal required version [OpenSSL 0.9.8k]");
     }
 
-    DETAIL_LOG("Using ACE: %s", ACE_VERSION);
+    sLog.outString("BOOT: Using ACE %s", ACE_VERSION);
+
+    // Manually delete this pointers, because memory allocating maked with overloaded mem manager
+    // (function new) removed with 'delete' from internal (standard memman) ace library.
+    // As result - crash on exit.
+    ACE_Reactor_Impl* aceReactorImp;
+    ACE_Reactor* aceReactor;
 
 #if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
-    ACE_Reactor::instance(new ACE_Reactor(new ACE_Dev_Poll_Reactor(ACE::max_handles(), 1), 1), true);
+    aceReactorImp = new ACE_Dev_Poll_Reactor(ACE::max_handles(), true);
 #else
-    ACE_Reactor::instance(new ACE_Reactor(new ACE_TP_Reactor(), true), true);
+    aceReactorImp = new ACE_TP_Reactor();
 #endif
 
-    sLog.outBasic("Max allowed open files is %d", ACE::max_handles());
+    aceReactor = new ACE_Reactor(aceReactorImp, false);
+    ACE_Reactor::instance(aceReactor, false);
+
+    sLog.outBasic("BOOT: Max allowed open files is %d", ACE::max_handles());
 
     /// realmd PID file creation
     std::string pidfile = sConfig.GetStringDefault("PidFile", "");
@@ -225,12 +235,12 @@ extern int main(int argc, char **argv)
         uint32 pid = CreatePIDFile(pidfile);
         if( !pid )
         {
-            sLog.outError( "Cannot create PID file %s.\n", pidfile.c_str() );
+            sLog.outError("BOOT: Cannot create PID file %s.\n", pidfile.c_str() );
             Log::WaitBeforeContinueIfNeed();
             return 1;
         }
 
-        sLog.outString( "Daemon PID: %u\n", pid );
+        sLog.outString("BOOT: Daemon PID: %u", pid );
     }
 
     ///- Initialize the database connection
@@ -244,7 +254,7 @@ extern int main(int argc, char **argv)
     sRealmList.Initialize(sConfig.GetIntDefault("RealmsStateUpdateDelay", 20));
     if (sRealmList.size() == 0)
     {
-        sLog.outError("No valid realms specified.");
+        sLog.outError("BOOT: No valid realms specified.");
         Log::WaitBeforeContinueIfNeed();
         return 1;
     }
@@ -266,7 +276,7 @@ extern int main(int argc, char **argv)
 
     if(acceptor.open(bind_addr, ACE_Reactor::instance(), ACE_NONBLOCK) == -1)
     {
-        sLog.outError("MaNGOS realmd can not bind to %s:%d", bind_ip.c_str(), rmport);
+        sLog.outError("BOOT:  realmd can not bind to %s:%d", bind_ip.c_str(), rmport);
         Log::WaitBeforeContinueIfNeed();
         return 1;
     }
@@ -291,14 +301,14 @@ extern int main(int argc, char **argv)
 
                 if(!curAff )
                 {
-                    sLog.outError("Processors marked in UseProcessors bitmask (hex) %x not accessible for realmd. Accessible processors bitmask (hex): %x",Aff,appAff);
+                    sLog.outError("BOOT: Processors marked in UseProcessors bitmask (hex) %x not accessible for realmd. Accessible processors bitmask (hex): %x",Aff,appAff);
                 }
                 else
                 {
                     if(SetProcessAffinityMask(hProcess,curAff))
-                        sLog.outString("Using processors (bitmask, hex): %x", curAff);
+                        sLog.outString("BOOT: Using processors (bitmask, hex): %x", curAff);
                     else
-                        sLog.outError("Can't set used processors (hex): %x", curAff);
+                        sLog.outError("BOOT: Can't set used processors (hex): %x", curAff);
                 }
             }
             sLog.outString();
@@ -309,9 +319,9 @@ extern int main(int argc, char **argv)
         if(Prio)
         {
             if(SetPriorityClass(hProcess,HIGH_PRIORITY_CLASS))
-                sLog.outString("realmd process priority class set to HIGH");
+                sLog.outString("BOOT: realmd process priority class set to HIGH");
             else
-                sLog.outError("Can't set realmd process priority class.");
+                sLog.outError("BOOT: Can't set realmd process priority class.");
             sLog.outString();
         }
     }
@@ -339,7 +349,7 @@ extern int main(int argc, char **argv)
         if( (++loopCounter) == numLoops )
         {
             loopCounter = 0;
-            DETAIL_LOG("Ping MySQL to keep connection alive");
+            DETAIL_LOG("BOOT: Ping MySQL to keep connection alive");
             LoginDatabase.Ping();
         }
 #ifdef WIN32
@@ -348,13 +358,16 @@ extern int main(int argc, char **argv)
 #endif
     }
 
+    delete aceReactor;
+    delete aceReactorImp;
+
     ///- Wait for the delay thread to exit
     LoginDatabase.HaltDelayThread();
 
     ///- Remove signal handling before leaving
     UnhookSignals();
 
-    sLog.outString( "Halting process..." );
+    sLog.outString("BOOT: Halting process..." );
     return 0;
 }
 
@@ -384,15 +397,15 @@ bool StartDB()
     std::string dbstring = sConfig.GetStringDefault("LoginDatabaseInfo", "");
     if(dbstring.empty())
     {
-        sLog.outError("Database not specified");
+        sLog.outError("BOOT: Database not specified");
         return false;
     }
 
-    sLog.outString("Login Database total connections: %i", 1 + 1);
+    sLog.outString("BOOT: Login Database total connections: %i", 1 + 1);
 
     if(!LoginDatabase.Initialize(dbstring.c_str()))
     {
-        sLog.outError("Cannot connect to database");
+        sLog.outError("BOOT: Cannot connect to database");
         return false;
     }
 
diff --git a/src/realmd/PatchHandler.cpp b/src/realmd/PatchHandler.cpp
index 503f6102493..9e75d5f7e69 100644
--- a/src/realmd/PatchHandler.cpp
+++ b/src/realmd/PatchHandler.cpp
@@ -20,10 +20,10 @@
   \ingroup realmd
   */
 
+#include "Common.h"
 #include "PatchHandler.h"
 #include "AuthCodes.h"
 #include "Log.h"
-#include "Common.h"
 
 #include <ace/OS_NS_sys_socket.h>
 #include <ace/OS_NS_dirent.h>
diff --git a/src/realmd/RealmList.cpp b/src/realmd/RealmList.cpp
index fb3bc691406..513efc4e7aa 100644
--- a/src/realmd/RealmList.cpp
+++ b/src/realmd/RealmList.cpp
@@ -24,26 +24,29 @@
 #include "RealmList.h"
 #include "AuthCodes.h"
 #include "Util.h"                                           // for Tokens typedef
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 
 INSTANTIATE_SINGLETON_1( RealmList );
 
 extern DatabaseType LoginDatabase;
 
-// will only support WoW 1.12.1/1.12.2 , WoW:TBC 2.4.3 and official release for WoW:WotLK and later, client builds 10505, 8606, 6005, 5875
+// will only support WoW 1.12.1/1.12.2/1.12.3 , WoW:TBC 2.4.3 and official release for WoW:WotLK and later, client builds 10505, 8606, 6141, 6005, 5875
 // if you need more from old build then add it in cases in realmd sources code
 // list sorted from high to low build and first build used as low bound for accepted by default range (any > it will accepted by realmd at least)
 
-static RealmBuildInfo ExpectedRealmdClientBuilds[] = {
-    {12340, 3, 3, 5, 'a'},                                  // highest supported build, also auto accept all above for simplify future supported builds testing
-    {11723, 3, 3, 3, 'a'},
-    {11403, 3, 3, 2, ' '},
-    {11159, 3, 3, 0, 'a'},
-    {10505, 3, 2, 2, 'a'},
+static RealmBuildInfo ExpectedRealmdClientBuilds[] =
+{
+    {16357, 5, 1, 0, 'a'},
+    {16135, 5, 0, 5, 'b'},
+    {15595, 4, 3, 4, ' '},
+    {15050, 4, 3, 0, ' '},
+    {13623, 4, 0, 6, 'a'},
+    {12340, 3, 3, 5, 'a'},
     {8606,  2, 4, 3, ' '},
-    {6005,  1,12, 2, ' '},
-    {5875,  1,12, 1, ' '},
+    {6141,  1, 12, 3, ' '},
+    {6005,  1, 12, 2, ' '},
+    {5875,  1, 12, 1, ' '},
     {0,     0, 0, 0, ' '}                                   // terminator
 };
 
@@ -93,12 +96,12 @@ void RealmList::UpdateRealm( uint32 ID, const std::string& name, const std::stri
     realm.allowedSecurityLevel = allowedSecurityLevel;
     realm.populationLevel      = popu;
 
-    Tokens tokens = StrSplit(builds, " ");
+    Tokens tokens(builds, ' ');
     Tokens::iterator iter;
 
     for (iter = tokens.begin(); iter != tokens.end(); ++iter)
     {
-        uint32 build = atol((*iter).c_str());
+        uint32 build = atol(*iter);
         realm.realmbuilds.insert(build);
     }
 
@@ -117,7 +120,7 @@ void RealmList::UpdateRealm( uint32 ID, const std::string& name, const std::stri
 
     ///- Append port to IP address.
     std::ostringstream ss;
-    ss << address << ":" << port;
+    ss << address << ':' << port;
     realm.address   = ss.str();
 }
 
@@ -144,30 +147,34 @@ void RealmList::UpdateRealms(bool init)
     QueryResult *result = LoginDatabase.Query( "SELECT id, name, address, port, icon, realmflags, timezone, allowedSecurityLevel, population, realmbuilds FROM realmlist WHERE (realmflags & 1) = 0 ORDER BY name" );
 
     ///- Circle through results and add them to the realm map
-    if(result)
+    if (result)
     {
         do
         {
-            Field *fields = result->Fetch();
+            Field* fields = result->Fetch();
 
+            uint32 Id                  = fields[0].GetUInt32();
+            std::string name           = fields[1].GetCppString();
+            std::string address        = fields[2].GetCppString();
+            uint32 port                = fields[3].GetUInt32();
+            uint8 realmflags           = fields[5].GetUInt8();
             uint8 allowedSecurityLevel = fields[7].GetUInt8();
 
-            uint8 realmflags = fields[5].GetUInt8();
-
-            if (realmflags & ~(REALM_FLAG_OFFLINE|REALM_FLAG_NEW_PLAYERS|REALM_FLAG_RECOMMENDED|REALM_FLAG_SPECIFYBUILD))
+            if (realmflags & ~(REALM_FLAG_OFFLINE | REALM_FLAG_NEW_PLAYERS | REALM_FLAG_RECOMMENDED | REALM_FLAG_SPECIFYBUILD))
             {
-                sLog.outError("Realm allowed have only OFFLINE Mask 0x2), or NEWPLAYERS (mask 0x20), or RECOMENDED (mask 0x40), or SPECIFICBUILD (mask 0x04) flags in DB");
-                realmflags &= (REALM_FLAG_OFFLINE|REALM_FLAG_NEW_PLAYERS|REALM_FLAG_RECOMMENDED|REALM_FLAG_SPECIFYBUILD);
+                sLog.outError("Realm (id %u, name '%s') can only be flagged as OFFLINE (mask 0x02), NEWPLAYERS (mask 0x20), RECOMMENDED (mask 0x40), or SPECIFICBUILD (mask 0x04) in DB", Id, name.c_str());
+                realmflags &= (REALM_FLAG_OFFLINE | REALM_FLAG_NEW_PLAYERS | REALM_FLAG_RECOMMENDED | REALM_FLAG_SPECIFYBUILD);
             }
 
             UpdateRealm(
-                fields[0].GetUInt32(), fields[1].GetCppString(),fields[2].GetCppString(),fields[3].GetUInt32(),
+                Id, name, address, port,
                 fields[4].GetUInt8(), RealmFlags(realmflags), fields[6].GetUInt8(),
                 (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR),
                 fields[8].GetFloat(), fields[9].GetCppString());
 
             if(init)
-                sLog.outString("Added realm \"%s\"", fields[1].GetString());
+                sLog.outString("RealmList::UpdateRealms added realm id %u, name %s, BindAddress %s:%u, flags %u, Allowed level %u", Id, name.c_str(), address.c_str(), port, realmflags, allowedSecurityLevel);
+
         } while( result->NextRow() );
         delete result;
     }
diff --git a/src/realmd/realmd.conf.dist.in b/src/realmd/realmd.conf.dist.in
index 903a6b9958a..d1c02912e83 100644
--- a/src/realmd/realmd.conf.dist.in
+++ b/src/realmd/realmd.conf.dist.in
@@ -105,6 +105,30 @@ ConfVersion=2010062001
 #        Default: 0 (Ban IP)
 #                 1 (Ban Account)
 #
+#    AutoRegistration
+#    Automatic Registration (Warning! Appears also on wrong acount name typed! Use correct AutoRegistration.Amount!)
+#        for complete enter, password for new registered account must be equivalent account name
+#        Default: 0 (disabled)
+#                 1 (enabled)
+#
+#    AutoRegistration.Amount
+#    Accounts amount, which may be auto-registered from one IP (on AutoRegistration) 
+#        Default: 1 (not more then one, sufficient for wrong account name typing)
+#        Max:
+#
+#   MultiIPCheck
+#   Check Login Account with last IP in account Database
+#       Default: 0 (disabled)
+#                1 (enabled)
+#
+#   MultiIPLimit
+#   Accounts amount, which can login from one IP
+#       Default: 10 (should be enough)
+#
+#   MultiIPPeriodInHours
+#   Time period in hours till last IP is free for all
+#       Default: 48
+#
 ###################################################################################################################
 
 LoginDatabaseInfo = "127.0.0.1;3306;mangos;mangos;realmd"
@@ -126,3 +150,10 @@ RealmsStateUpdateDelay = 20
 WrongPass.MaxCount = 0
 WrongPass.BanTime = 600
 WrongPass.BanType = 0
+
+AutoRegistration = 0
+AutoRegistration.Amount = 1
+
+MultiIPCheck = 0
+MultiIPLimit = 10
+MultiIPPeriodInHours = 48
\ No newline at end of file
diff --git a/src/realmd/realmd.rc b/src/realmd/realmd.rc
index 8f8fa349963..5001760acde 100644
--- a/src/realmd/realmd.rc
+++ b/src/realmd/realmd.rc
@@ -1,4 +1,5 @@
 /*
+ * Copyleft (c) 2011-2013 MangosR2 <http://github.com/MangosR2>
  * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,4 +17,34 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-IDI_APPICON ICON DISCARDABLE "realmd.ico"
+/* ------------------ */
+
+IDI_APPICON ICON "realmd.ico"
+
+/* ------------------ */
+
+1 VERSIONINFO
+FILEVERSION 0, 18, 0, 0
+PRODUCTVERSION 1, 0, 0, 0
+FILEOS 0x40004L
+FILETYPE 0x1L
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904E4"
+        {
+           VALUE "CompanyName", "Open source World of Warcraft server."
+           VALUE "FileDescription", "MangosR2 AuthServer"
+           VALUE "FileVersion", "0.18.0.0"
+           VALUE "InternalName", "realm demon"
+           VALUE "LegalCopyright", "(c) 2005-2012 MaNGOS, (c) 2013 cMaNGOS, (c) 2011-2013 MangosR2"
+           VALUE "OriginalFilename", "realmd.exe"
+           VALUE "ProductName", "MangosR2"
+           VALUE "ProductVersion", "1.0.0.0"
+        }
+    }
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 1033, 1252
+    }
+}
diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp
index 1ea16f2d1a0..f386a912e24 100644
--- a/src/shared/Auth/BigNumber.cpp
+++ b/src/shared/Auth/BigNumber.cpp
@@ -23,26 +23,26 @@
 BigNumber::BigNumber()
 {
     _bn = BN_new();
-    _array = NULL;
+    ClearArraysMap();
 }
 
 BigNumber::BigNumber(const BigNumber &bn)
 {
     _bn = BN_dup(bn._bn);
-    _array = NULL;
+    ClearArraysMap();
 }
 
 BigNumber::BigNumber(uint32 val)
 {
     _bn = BN_new();
     BN_set_word(_bn, val);
-    _array = NULL;
+    ClearArraysMap();
 }
 
 BigNumber::~BigNumber()
 {
     BN_free(_bn);
-    if(_array) delete[] _array;
+    ClearArraysMap();
 }
 
 void BigNumber::SetDword(uint32 val)
@@ -165,16 +165,15 @@ bool BigNumber::isZero() const
     return BN_is_zero(_bn)!=0;
 }
 
-uint8 *BigNumber::AsByteArray(int minSize, bool reverse)
+uint8* BigNumber::AsByteArray(int minSize, bool reverse)
 {
     int length = (minSize >= GetNumBytes()) ? minSize : GetNumBytes();
 
-    if (_array)
-    {
-        delete[] _array;
-        _array = NULL;
-    }
-    _array = new uint8[length];
+    std::map<int, uint8*>::const_iterator itr = arraysMap.find(length);
+    if (itr != arraysMap.end())
+        return itr->second;
+
+    uint8* _array = new uint8[length];
 
     // If we need more bytes than length of BigNumber set the rest to 0
     if (length > GetNumBytes())
@@ -185,6 +184,8 @@ uint8 *BigNumber::AsByteArray(int minSize, bool reverse)
     if (reverse)
         std::reverse(_array, _array + length);
 
+    arraysMap.insert(std::map<int, uint8*>::value_type(length, _array));
+
     return _array;
 }
 
@@ -197,3 +198,11 @@ const char *BigNumber::AsDecStr()
 {
     return BN_bn2dec(_bn);
 }
+
+void BigNumber::ClearArraysMap()
+{
+    for (std::map<int, uint8*>::const_iterator itr = arraysMap.begin(); itr != arraysMap.end(); ++itr)
+        if (itr->second)
+            delete [] itr->second;
+    arraysMap.clear();
+}
diff --git a/src/shared/Auth/BigNumber.h b/src/shared/Auth/BigNumber.h
index 3d5c68f2e0a..64ed8e5a6c5 100644
--- a/src/shared/Auth/BigNumber.h
+++ b/src/shared/Auth/BigNumber.h
@@ -87,7 +87,8 @@ class BigNumber
         const char *AsDecStr();
 
     private:
+        void ClearArraysMap();
         struct bignum_st *_bn;
-        uint8 *_array;
+        std::map<int, uint8*> arraysMap;
 };
 #endif
diff --git a/src/shared/Auth/SARC4.cpp b/src/shared/Auth/SARC4.cpp
index 037ee961cfa..98db9c27f91 100644
--- a/src/shared/Auth/SARC4.cpp
+++ b/src/shared/Auth/SARC4.cpp
@@ -19,14 +19,14 @@
 #include "Auth/SARC4.h"
 #include <openssl/sha.h>
 
-SARC4::SARC4(uint8 len)
+SARC4::SARC4(uint8 len) : m_ctx()
 {
     EVP_CIPHER_CTX_init(&m_ctx);
     EVP_EncryptInit_ex(&m_ctx, EVP_rc4(), NULL, NULL, NULL);
     EVP_CIPHER_CTX_set_key_length(&m_ctx, len);
 }
 
-SARC4::SARC4(uint8 *seed, uint8 len)
+SARC4::SARC4(uint8 *seed, uint8 len) : m_ctx()
 {
     EVP_CIPHER_CTX_init(&m_ctx);
     EVP_EncryptInit_ex(&m_ctx, EVP_rc4(), NULL, NULL, NULL);
diff --git a/src/shared/Auth/WardenKeyGeneration.h b/src/shared/Auth/WardenKeyGeneration.h
new file mode 100644
index 00000000000..37c3fff1345
--- /dev/null
+++ b/src/shared/Auth/WardenKeyGeneration.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "Sha1.h"
+
+#ifndef _WARDEN_KEY_GENERATION_H
+#define _WARDEN_KEY_GENERATION_H
+
+class SHA1Randx {
+public:
+    SHA1Randx(uint8 *buff, uint32 size) {
+        uint32 taken = size/2;
+
+        sh.Initialize();
+        sh.UpdateData(buff,taken);
+        sh.Finalize();
+
+        memcpy(o1,sh.GetDigest(),20);
+
+        sh.Initialize();
+        sh.UpdateData(buff+taken,size-taken);
+        sh.Finalize();
+
+        memcpy(o2,sh.GetDigest(),20);
+
+        memset(o0,0x00,20);
+
+        fillUp();
+    }
+
+    void generate(uint8 *buf, uint32 sz) {
+        for(uint32 i=0;i<sz;i++) {
+            if(taken == 20) {
+                fillUp();
+            }
+
+            buf[i] = o0[taken];
+            taken++;
+        }
+    }
+private:
+    void fillUp() {
+        sh.Initialize();
+        sh.UpdateData(o1,20);
+        sh.UpdateData(o0,20);
+        sh.UpdateData(o2,20);
+        sh.Finalize();
+
+        memcpy(o0,sh.GetDigest(),20);
+
+        taken = 0;
+    }
+    Sha1Hash sh;
+    uint32 taken;
+    uint8 o0[20],o1[20],o2[20];
+};
+
+#endif
diff --git a/src/shared/ByteBuffer.cpp b/src/shared/ByteBuffer.cpp
new file mode 100644
index 00000000000..65c49c540b1
--- /dev/null
+++ b/src/shared/ByteBuffer.cpp
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ByteBuffer.h"
+#include "Log.h"
+
+void ByteBufferException::PrintPosError() const
+{
+    char const* traceStr;
+
+#ifdef HAVE_ACE_STACK_TRACE_H
+    ACE_Stack_Trace trace;
+    traceStr = trace.c_str();
+#else
+    traceStr = NULL;
+#endif
+
+    sLog.outError(
+        "Attempted to %s in ByteBuffer (pos: " SIZEFMTD " size: " SIZEFMTD ") "
+        "value with size: " SIZEFMTD "%s%s",
+        (add ? "put" : "get"), pos, size, esize,
+        traceStr ? "\n" : "", traceStr ? traceStr : "");
+}
+
+void ByteBuffer::print_storage() const
+{
+    if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG))   // optimize disabled debug output
+        return;
+
+    std::ostringstream ss;
+    ss <<  "STORAGE_SIZE: " << size() << "\n";
+
+    if (sLog.IsIncludeTime())
+        ss << "         ";
+
+    for (size_t i = 0; i < size(); ++i)
+        ss << uint32(read<uint8>(i)) << " - ";
+
+    sLog.outDebug(ss.str().c_str());
+}
+
+void ByteBuffer::textlike() const
+{
+    if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG))   // optimize disabled debug output
+        return;
+
+    std::ostringstream ss;
+    ss <<  "STORAGE_SIZE: " << size() << "\n";
+
+    if (sLog.IsIncludeTime())
+        ss << "         ";
+
+    for (size_t i = 0; i < size(); ++i)
+        ss << read<uint8>(i);
+
+    sLog.outDebug(ss.str().c_str());
+}
+
+void ByteBuffer::hexlike() const
+{
+    if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG))   // optimize disabled debug output
+        return;
+
+    std::ostringstream ss;
+    ss <<  "STORAGE_SIZE: " << size() << "\n";
+
+    if (sLog.IsIncludeTime())
+        ss << "         ";
+
+    size_t j = 1, k = 1;
+
+    for (size_t i = 0; i < size(); ++i)
+    {
+        if ((i == (j * 8)) && ((i != (k * 16))))
+        {
+            ss << "| ";
+            ++j;
+        }
+        else if (i == (k * 16))
+        {
+            ss << "\n";
+
+            if (sLog.IsIncludeTime())
+                ss << "         ";
+
+            ++k;
+            ++j;
+        }
+
+        char buf[4];
+        snprintf(buf, 4, "%02X", read<uint8>(i));
+        ss << buf << " ";
+    }
+
+    sLog.outDebug(ss.str().c_str());
+}
+
+time_t ByteBuffer::ReadPackedTime()
+{
+    uint32 packedDate = read<uint32>();
+
+    tm _localtime;
+    memset(&_localtime, 0, sizeof(_localtime));
+
+    _localtime.tm_min     = packedDate & 0x3F;
+    _localtime.tm_hour    = (packedDate >> 6) & 0x1F;
+    _localtime.tm_wday    = (packedDate >> 11) & 7;
+    _localtime.tm_mday    = ((packedDate >> 14) & 0x3F) + 1;
+    _localtime.tm_mon     = (packedDate >> 20) & 0xF;
+    _localtime.tm_year    = ((packedDate >> 24) & 0x1F) + 100;
+
+    return time_t(mktime(&_localtime));
+}
+
+void ByteBuffer::AppendPackedTime(time_t time)
+{
+    tm* _localtime = localtime(&time);
+    append<uint32>((_localtime->tm_year - 100) << 24 | _localtime->tm_mon  << 20 | (_localtime->tm_mday - 1) << 14 | _localtime->tm_wday << 11 | _localtime->tm_hour << 6 | _localtime->tm_min);
+}
diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h
index 137336253de..74ef392aa7a 100644
--- a/src/shared/ByteBuffer.h
+++ b/src/shared/ByteBuffer.h
@@ -20,8 +20,8 @@
 #define _BYTEBUFFER_H
 
 #include "Common.h"
-#include "Log.h"
 #include "Utilities/ByteConverter.h"
+#include "ace/Stack_Trace.h"
 
 class ByteBufferException
 {
@@ -32,11 +32,7 @@ class ByteBufferException
             PrintPosError();
         }
 
-        void PrintPosError() const
-        {
-            sLog.outError("Attempted to %s in ByteBuffer (pos: " SIZEFMTD " size: "SIZEFMTD") value with size: " SIZEFMTD,
-                (add ? "put" : "get"), pos, size, esize);
-        }
+        void PrintPosError() const;
     private:
         bool add;
         size_t pos;
@@ -53,12 +49,11 @@ struct Unused
 class ByteBuffer
 {
     public:
-        const static size_t DEFAULT_SIZE = 0x1000;
+        const static size_t DEFAULT_SIZE = 64;
 
         // constructor
         ByteBuffer(): _rpos(0), _wpos(0)
         {
-            _storage.reserve(DEFAULT_SIZE);
         }
 
         // constructor
@@ -241,8 +236,7 @@ class ByteBuffer
         template<class T>
         ByteBuffer &operator>>(Unused<T> const&)
         {
-            read_skip<T>();
-            return *this;
+            return read_skip<T>();
         }
 
 
@@ -259,6 +253,11 @@ class ByteBuffer
             return _rpos;
         }
 
+        void rfinish()
+        {
+            _rpos = wpos();
+        }
+
         size_t wpos() const { return _wpos; }
 
         size_t wpos(size_t wpos_)
@@ -268,13 +267,19 @@ class ByteBuffer
         }
 
         template<typename T>
-        void read_skip() { read_skip(sizeof(T)); }
+        ByteBuffer& read_skip()
+        {
+            read_skip(sizeof(T));
+            return *this;
+        }
 
-        void read_skip(size_t skip)
+        ByteBuffer& read_skip(size_t skip)
         {
             if(_rpos + skip > size())
                 throw ByteBufferException(false, _rpos, skip, size());
             _rpos += skip;
+
+            return *this;
         }
 
         template <typename T> T read()
@@ -293,12 +298,14 @@ class ByteBuffer
             return val;
         }
 
-        void read(uint8 *dest, size_t len)
+        ByteBuffer& read(uint8* dest, size_t len)
         {
             if(_rpos  + len > size())
                 throw ByteBufferException(false, _rpos, len, size());
             memcpy(dest, &_storage[_rpos], len);
             _rpos += len;
+
+            return *this;
         }
 
         uint64 readPackGUID()
@@ -320,6 +327,14 @@ class ByteBuffer
             return guid;
         }
 
+        time_t ReadPackedTime();
+
+        ByteBuffer& ReadPackedTime(time_t& time)
+        {
+            time = ReadPackedTime();
+            return *this;
+        }
+
         const uint8 *contents() const { return &_storage[0]; }
 
         size_t size() const { return _storage.size(); }
@@ -338,25 +353,25 @@ class ByteBuffer
                 _storage.reserve(ressize);
         }
 
-        void append(const std::string& str)
+        ByteBuffer& append(const std::string& str)
         {
-            append((uint8 const*)str.c_str(), str.size() + 1);
+            return append((uint8 const*)str.c_str(), str.size() + 1);
         }
 
-        void append(const char *src, size_t cnt)
+        ByteBuffer& append(const char* src, size_t cnt)
         {
             return append((const uint8 *)src, cnt);
         }
 
-        template<class T> void append(const T *src, size_t cnt)
+        template<class T> ByteBuffer& append(const T* src, size_t cnt)
         {
             return append((const uint8 *)src, cnt * sizeof(T));
         }
 
-        void append(const uint8 *src, size_t cnt)
+        ByteBuffer& append(const uint8* src, size_t cnt)
         {
             if (!cnt)
-                return;
+                return *this;
 
             MANGOS_ASSERT(size() < 10000000);
 
@@ -364,25 +379,31 @@ class ByteBuffer
                 _storage.resize(_wpos + cnt);
             memcpy(&_storage[_wpos], src, cnt);
             _wpos += cnt;
+
+            return *this;
         }
 
-        void append(const ByteBuffer& buffer)
+        ByteBuffer& append(const ByteBuffer& buffer)
         {
-            if(buffer.wpos())
-                append(buffer.contents(), buffer.wpos());
+            if (buffer.wpos())
+                return append(buffer.contents(), buffer.wpos());
+
+            return *this;
         }
 
         // can be used in SMSG_MONSTER_MOVE opcode
-        void appendPackXYZ(float x, float y, float z)
+        ByteBuffer& appendPackXYZ(float x, float y, float z)
         {
             uint32 packed = 0;
             packed |= ((int)(x / 0.25f) & 0x7FF);
             packed |= ((int)(y / 0.25f) & 0x7FF) << 11;
             packed |= ((int)(z / 0.25f) & 0x3FF) << 22;
             *this << packed;
+
+            return *this;
         }
 
-        void appendPackGUID(uint64 guid)
+        ByteBuffer& appendPackGUID(uint64 guid)
         {
             uint8 packGUID[8+1];
             packGUID[0] = 0;
@@ -399,9 +420,11 @@ class ByteBuffer
                 guid >>= 8;
             }
 
-            append(packGUID, size);
+            return append(packGUID, size);
         }
 
+        void AppendPackedTime(time_t time);
+
         void put(size_t pos, const uint8 *src, size_t cnt)
         {
             if(pos + cnt > size())
@@ -409,85 +432,16 @@ class ByteBuffer
             memcpy(&_storage[pos], src, cnt);
         }
 
-        void print_storage() const
-        {
-            if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG))   // optimize disabled debug output
-                return;
-
-            std::ostringstream ss;
-            ss <<  "STORAGE_SIZE: " << size() << "\n";
-
-            if (sLog.IsIncludeTime())
-                ss << "         ";
-
-            for (size_t i = 0; i < size(); ++i)
-                ss << uint32(read<uint8>(i)) << " - ";
-
-            sLog.outDebug(ss.str().c_str());
-        }
-
-        void textlike() const
-        {
-            if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG))   // optimize disabled debug output
-                return;
-
-            std::ostringstream ss;
-            ss <<  "STORAGE_SIZE: " << size() << "\n";
-
-            if (sLog.IsIncludeTime())
-                ss << "         ";
-
-            for (size_t i = 0; i < size(); ++i)
-                ss << read<uint8>(i);
-
-            sLog.outDebug(ss.str().c_str());
-        }
-
-        void hexlike() const
-        {
-            if (!sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG))   // optimize disabled debug output
-                return;
-
-            std::ostringstream ss;
-            ss <<  "STORAGE_SIZE: " << size() << "\n";
-
-            if (sLog.IsIncludeTime())
-                ss << "         ";
-
-            size_t j = 1, k = 1;
-
-            for (size_t i = 0; i < size(); ++i)
-            {
-                if ((i == (j * 8)) && ((i != (k * 16))))
-                {
-                    ss << "| ";
-                    ++j;
-                }
-                else if (i == (k * 16))
-                {
-                    ss << "\n";
-
-                    if (sLog.IsIncludeTime())
-                        ss << "         ";
-
-                    ++k;
-                    ++j;
-                }
-
-                char buf[4];
-                snprintf(buf, 4, "%02X", read<uint8>(i));
-                ss << buf << " ";
-
-            }
-            sLog.outDebug(ss.str().c_str());
-        }
+        void print_storage() const;
+        void textlike() const;
+        void hexlike() const;
 
     private:
         // limited for internal use because can "append" any unexpected type (like pointer and etc) with hard detection problem
-        template <typename T> void append(T value)
+        template <typename T> ByteBuffer& append(T value)
         {
             EndianConvert(value);
-            append((uint8 *)&value, sizeof(value));
+            return append((uint8*)&value, sizeof(value));
         }
 
     protected:
@@ -575,21 +529,23 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::map<K, V> &m)
 }
 
 template<>
-inline void ByteBuffer::read_skip<char*>()
+inline ByteBuffer& ByteBuffer::read_skip<char*>()
 {
     std::string temp;
     *this >> temp;
+
+    return *this;
 }
 
 template<>
-inline void ByteBuffer::read_skip<char const*>()
+inline ByteBuffer& ByteBuffer::read_skip<char const*>()
 {
-    read_skip<char*>();
+    return read_skip<char*>();
 }
 
 template<>
-inline void ByteBuffer::read_skip<std::string>()
+inline ByteBuffer& ByteBuffer::read_skip<std::string>()
 {
-    read_skip<char*>();
+    return read_skip<char*>();
 }
 #endif
diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index 325f22193b7..16d7afd6b29 100644
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -16,29 +16,98 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# Glob only and not recurse, there are other libs for that
-file(GLOB_RECURSE shared_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h)
+set(LIBRARY_NAME shared)
 
-# Exclude Win32 files
+set(LIBRARY_SRCS
+    Auth/AuthCrypt.cpp
+    Auth/AuthCrypt.h
+    Auth/BigNumber.cpp
+    Auth/BigNumber.h
+    Auth/HMACSHA1.cpp
+    Auth/HMACSHA1.h
+    Auth/md5.h
+    Auth/SARC4.cpp
+    Auth/SARC4.h
+    Auth/Sha1.cpp
+    Auth/Sha1.h
+    ByteBuffer.cpp
+    ByteBuffer.h
+    Common.cpp
+    Common.h
+    Config/Config.cpp
+    Config/Config.h
+    Database/Database.cpp
+    Database/Database.h
+    Database/DatabaseEnv.h
+    Database/DatabaseImpl.h
+    Database/DatabaseMysql.cpp
+    Database/DatabaseMysql.h
+    Database/DatabasePostgre.cpp
+    Database/DatabasePostgre.h
+    Database/DBCFileLoader.cpp
+    Database/DBCFileLoader.h
+    Database/DBCStore.h
+    Database/Field.cpp
+    Database/Field.h
+    Database/PGSQLDelayThread.h
+    Database/QueryResult.h
+    Database/QueryResultMysql.cpp
+    Database/QueryResultMysql.h
+    Database/QueryResultPostgre.cpp
+    Database/QueryResultPostgre.h
+    Database/SqlDelayThread.cpp
+    Database/SqlDelayThread.h
+    Database/SqlOperations.cpp
+    Database/SqlOperations.h
+    Database/SqlPreparedStatement.cpp
+    Database/SqlPreparedStatement.h
+    Database/SQLStorage.cpp
+    Database/SQLStorage.h
+    Database/SQLStorageImpl.h
+    Errors.h
+    LockedMap.h
+    LockedQueue.h
+    LockedVector.h
+    Log.cpp
+    Log.h
+    MangosR2MembarMutex.h
+    ObjectUpdateTaskBase.h
+    ProgressBar.cpp
+    ProgressBar.h
+    revision_nr.h
+    revision_sql.h
+    SystemConfig.h
+    Threading.cpp
+    Threading.h
+    Timer.h
+    Util.cpp
+    Util.h
+    WorldPacket.h
+   )
+
+# OS specific files
 if(WIN32)
-  list(REMOVE_ITEM shared_SRCS
-    PosixDaemon.h
-    PosixDaemon.cpp
-  )
+  set(LIBRARY_SRCS
+      ${LIBRARY_SRCS}
+      WheatyExceptionReport.cpp
+      WheatyExceptionReport.h
+      ServiceWin32.cpp
+      ServiceWin32.h
+     )
 else()
-  list(REMOVE_ITEM shared_SRCS
-    WheatyExceptionReport.cpp
-    WheatyExceptionReport.h
-    ServiceWin32.cpp
-    ServiceWin32.h
-  )
+  set(LIBRARY_SRCS
+      ${LIBRARY_SRCS}
+      PosixDaemon.cpp
+      PosixDaemon.h
+     )
 endif()
 
 source_group("Util"
   REGULAR_EXPRESSION .*
 )
 
-foreach(SRC ${shared_SRCS})
+# TODO: really needed?
+foreach(SRC ${LIBRARY_SRCS})
   get_filename_component(PTH ${SRC} PATH)
   if(PTH)
     if(NOT XCODE) # FIXME: Xcode Generator has bug with nested dirs
@@ -62,17 +131,25 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/framework
   ${CMAKE_BINARY_DIR}
   ${ACE_INCLUDE_DIR}
-  ${MYSQL_INCLUDE_DIR}
 )
 
+if(POSTGRESQL)
+  include_directories(${PostgreSQL_INCLUDE_DIRS})
+else()
+  include_directories(${MYSQL_INCLUDE_DIR})
+endif()
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/SystemConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/SystemConfig.h)
 
-add_library(shared STATIC
-  ${shared_SRCS}
+add_library(${LIBRARY_NAME} STATIC
+  ${LIBRARY_SRCS}
 )
 
-add_dependencies(shared revision.h)
+if(POSTGRESQL)
+  target_link_libraries(${LIBRARY_NAME} ${PostgreSQL_LIBRARIES})
+endif()
+
+add_dependencies(${LIBRARY_NAME} revision.h)
 if(NOT ACE_USE_EXTERNAL)
-  add_dependencies(shared ACE_Project)
-# add_dependencies(shared ace)
+  add_dependencies(${LIBRARY_NAME} ACE_Project)
 endif()
diff --git a/src/shared/Common.h b/src/shared/Common.h
index 100d1122b75..bd654d4226d 100644
--- a/src/shared/Common.h
+++ b/src/shared/Common.h
@@ -20,7 +20,7 @@
 #define MANGOSSERVER_COMMON_H
 
 // config.h needs to be included 1st
-#ifdef HAVE_CONFIG_H
+#ifdef MANGOS_CONFIG_H
 #ifdef PACKAGE
 #undef PACKAGE
 #endif //PACKAGE
@@ -42,7 +42,7 @@
 #ifdef VERSION
 #undef VERSION
 #endif //VERSION
-# include "config.h"
+# include "../../config.h"
 #undef PACKAGE
 #undef PACKAGE_BUGREPORT
 #undef PACKAGE_NAME
@@ -50,7 +50,7 @@
 #undef PACKAGE_TARNAME
 #undef PACKAGE_VERSION
 #undef VERSION
-#endif //HAVE_CONFIG_H
+#endif //MANGOS_CONFIG_H
 
 #include "Platform/Define.h"
 
@@ -85,14 +85,15 @@
 #include <algorithm>
 
 #include "Errors.h"
-#include "LockedQueue.h"
 #include "Threading.h"
 
 #include <ace/Basic_Types.h>
 #include <ace/Guard_T.h>
 #include <ace/RW_Thread_Mutex.h>
 #include <ace/Thread_Mutex.h>
+#include <ace/Null_Mutex.h>
 #include <ace/OS_NS_arpa_inet.h>
+#include <ace/Refcounted_Auto_Ptr.h>
 
 // Old ACE versions (pre-ACE-5.5.4) not have this type (add for allow use at Unix side external old ACE versions)
 #if PLATFORM != PLATFORM_WINDOWS
@@ -250,8 +251,95 @@ inline char * mangos_strdup(const char * source)
 #  define M_PI_F        float(M_PI)
 #endif
 
+#ifndef M_NULL_F
+#  define M_NULL_F      0.009f
+#endif
+
 #ifndef countof
 #define countof(array) (sizeof(array) / sizeof((array)[0]))
 #endif
 
+#if defined WIN64
+#     define  NOTSAFE_SEMAPHORE_OVERHANDLING "Win64"
+#     define  MANGOSR2_MUTEX_MODEL ACE_Null_Mutex
+#     define  MANGOSR2_MUTEX_MODEL_2 MangosR2_Mutex
+#     define  MANGOSR2_SINGLE_THREAD "Win64"
+#elif defined WIN32
+#     define  NOTSAFE_SEMAPHORE_OVERHANDLING "Win32"
+#     define  MANGOSR2_MUTEX_MODEL ACE_Null_Mutex
+#     define  MANGOSR2_MUTEX_MODEL_2 MangosR2_Mutex
+#     define  MANGOSR2_SINGLE_THREAD "Win32"
+#elif defined (__FreeBSD__)
+#     define  NOTSAFE_SEMAPHORE_OVERHANDLING "FreeBSD"
+#     define  MANGOSR2_MUTEX_MODEL ACE_RW_Thread_Mutex
+#     define  MANGOSR2_MUTEX_MODEL_2 MangosR2_Mutex
+#     undef   MANGOSR2_SINGLE_THREAD
+#elif defined (__APPLE__)
+#     define  NOTSAFE_SEMAPHORE_OVERHANDLING "MacOS"
+#     define  MANGOSR2_MUTEX_MODEL ACE_RW_Thread_Mutex
+#     define  MANGOSR2_MUTEX_MODEL_2 MangosR2_Mutex
+#     undef   MANGOSR2_SINGLE_THREAD
+// All other possibility - linux, android  and some other, has all needed methods
+#else
+#     undef   NOTSAFE_SEMAPHORE_OVERHANDLING
+#     define  MANGOSR2_MUTEX_MODEL ACE_RW_Thread_Mutex
+#     define  MANGOSR2_MUTEX_MODEL_2 MangosR2_Mutex
+#     undef   MANGOSR2_SINGLE_THREAD
+#endif
+
+#include <stdint.h>
+#
+#if !defined (INT8_MIN)
+#   define INT8_MIN    0xFF
+#endif
+#if !defined (INT8_MAX)
+#   define INT8_MAX    0x7F
+#endif
+#if !defined (UINT8_MIN)
+#   define UINT8_MIN    0x00
+#endif
+#if !defined (UINT8_MAX)
+#   define UINT8_MAX    0xFF
+#endif
+#if !defined (INT16_MAX)
+#   define INT16_MAX    0x7fff
+#endif
+#if !defined (INT16_MIN)
+#   define INT16_MIN    0xffff
+#endif
+#if !defined (UINT16_MAX)
+#  define UINT16_MAX    0xffff
+#endif
+#if !defined (UINT16_MIN)
+#  define UINT16_MIN    0x0000
+#endif
+#if !defined (INT32_MAX)
+#   define INT32_MAX    0x7fffffff
+#endif
+#if !defined (INT32_MIN)
+#   define INT32_MIN    0xffffffff
+#endif
+#if !defined (UINT32_MAX)
+#  define UINT32_MAX    0xffffffff
+#endif
+#if !defined (UINT32_MIN)
+#  define UINT32_MIN    0x00000000
+#endif
+#if !defined (INT64_MAX)
+#   define INT64_MAX    0x7fffffffffffffff
+#endif
+#if !defined (INT64_MIN)
+#   define INT64_MIN    0xffffffffffffffff
+#endif
+#if !defined (UINT64_MAX)
+#  define UINT64_MAX    0xffffffffffffffff
+#endif
+#if !defined (UINT64_MIN)
+#  define UINT64_MIN    0x0000000000000000
+#endif
+
+#define MAX_CLIENT_STAT_VALUE INT16_MAX
+
+#include "MangosR2MembarMutex.h"
+
 #endif
diff --git a/src/shared/Config/Config.cpp b/src/shared/Config/Config.cpp
index 8365c430750..0657dd85f4e 100644
--- a/src/shared/Config/Config.cpp
+++ b/src/shared/Config/Config.cpp
@@ -19,7 +19,7 @@
 #include "Config.h"
 #include "ace/Configuration_Import_Export.h"
 
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 
 INSTANTIATE_SINGLETON_1(Config);
 
@@ -28,6 +28,8 @@ static bool GetValueHelper(ACE_Configuration_Heap *mConf, const char *name, ACE_
     if (!mConf)
         return false;
 
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, sConfig.mMtx, false);
+
     ACE_TString section_name;
     ACE_Configuration_Section_Key section_key;
     ACE_Configuration_Section_Key root_key = mConf->root_section();
diff --git a/src/shared/Config/Config.h b/src/shared/Config/Config.h
index f9c215b960f..a3d57085427 100644
--- a/src/shared/Config/Config.h
+++ b/src/shared/Config/Config.h
@@ -42,6 +42,8 @@ class MANGOS_DLL_SPEC Config
 
         std::string GetFilename() const { return mFilename; }
 
+        ACE_Thread_Mutex mMtx;
+
     private:
 
         std::string mFilename;
diff --git a/src/shared/Database/DBCFileLoader.cpp b/src/shared/Database/DBCFileLoader.cpp
index 3dac135914d..2628c15d65c 100644
--- a/src/shared/Database/DBCFileLoader.cpp
+++ b/src/shared/Database/DBCFileLoader.cpp
@@ -28,49 +28,44 @@ DBCFileLoader::DBCFileLoader()
     fieldsOffset = NULL;
 }
 
-bool DBCFileLoader::Load(const char *filename, const char *fmt)
+bool DBCFileLoader::Load(const char* filename, const char* fmt)
 {
-
     uint32 header;
-    if(data)
-    {
-        delete [] data;
-        data=NULL;
-    }
+    delete[] data;
 
-    FILE * f=fopen(filename,"rb");
-    if(!f)return false;
+    FILE* f = fopen(filename, "rb");
+    if (!f)return false;
 
-    if(fread(&header,4,1,f)!=1)                             // Number of records
+    if (fread(&header, 4, 1, f) != 1)                       // Number of records
         return false;
 
     EndianConvert(header);
-    if(header!=0x43424457)
+    if (header != 0x43424457)
         return false;                                       //'WDBC'
 
-    if(fread(&recordCount,4,1,f)!=1)                        // Number of records
+    if (fread(&recordCount, 4, 1, f) != 1)                  // Number of records
         return false;
 
     EndianConvert(recordCount);
 
-    if(fread(&fieldCount,4,1,f)!=1)                         // Number of fields
+    if (fread(&fieldCount, 4, 1, f) != 1)                   // Number of fields
         return false;
 
     EndianConvert(fieldCount);
 
-    if(fread(&recordSize,4,1,f)!=1)                         // Size of a record
+    if (fread(&recordSize, 4, 1, f) != 1)                   // Size of a record
         return false;
 
     EndianConvert(recordSize);
 
-    if(fread(&stringSize,4,1,f)!=1)                         // String size
+    if (fread(&stringSize, 4, 1, f) != 1)                   // String size
         return false;
 
     EndianConvert(stringSize);
 
     fieldsOffset = new uint32[fieldCount];
     fieldsOffset[0] = 0;
-    for(uint32 i = 1; i < fieldCount; i++)
+    for (uint32 i = 1; i < fieldCount; ++i)
     {
         fieldsOffset[i] = fieldsOffset[i - 1];
         if (fmt[i - 1] == 'b' || fmt[i - 1] == 'X')         // byte fields
@@ -79,10 +74,10 @@ bool DBCFileLoader::Load(const char *filename, const char *fmt)
             fieldsOffset[i] += 4;
     }
 
-    data = new unsigned char[recordSize*recordCount+stringSize];
-    stringTable = data + recordSize*recordCount;
+    data = new unsigned char[recordSize * recordCount + stringSize];
+    stringTable = data + recordSize * recordCount;
 
-    if(fread(data,recordSize*recordCount+stringSize,1,f)!=1)
+    if (fread(data, recordSize * recordCount + stringSize, 1, f) != 1)
         return false;
 
     fclose(f);
@@ -91,25 +86,23 @@ bool DBCFileLoader::Load(const char *filename, const char *fmt)
 
 DBCFileLoader::~DBCFileLoader()
 {
-    if(data)
-        delete [] data;
-    if(fieldsOffset)
-        delete [] fieldsOffset;
+    delete[] data;
+    delete[] fieldsOffset;
 }
 
 DBCFileLoader::Record DBCFileLoader::getRecord(size_t id)
 {
     assert(data);
-    return Record(*this, data + id*recordSize);
+    return Record(*this, data + id * recordSize);
 }
 
-uint32 DBCFileLoader::GetFormatRecordSize(const char * format,int32* index_pos)
+uint32 DBCFileLoader::GetFormatRecordSize(const char* format, int32* index_pos)
 {
     uint32 recordsize = 0;
     int32 i = -1;
-    for(uint32 x = 0; format[x]; ++ x)
+    for (uint32 x = 0; format[x]; ++ x)
     {
-        switch(format[x])
+        switch (format[x])
         {
             case FT_FLOAT:
                 recordsize += sizeof(float);
@@ -121,10 +114,10 @@ uint32 DBCFileLoader::GetFormatRecordSize(const char * format,int32* index_pos)
                 recordsize += sizeof(char*);
                 break;
             case FT_SORT:
-                i=x;
+                i = x;
                 break;
             case FT_IND:
-                i=x;
+                i = x;
                 recordsize += sizeof(uint32);
                 break;
             case FT_BYTE:
@@ -161,28 +154,28 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
     this func will generate  entry[rows] data;
     */
 
-    typedef char * ptr;
-    if(strlen(format)!=fieldCount)
+    typedef char* ptr;
+    if (strlen(format) != fieldCount)
         return NULL;
 
-    //get struct size and index pos
+    // get struct size and index pos
     int32 i;
-    uint32 recordsize=GetFormatRecordSize(format,&i);
+    uint32 recordsize = GetFormatRecordSize(format, &i);
 
-    if(i>=0)
+    if (i >= 0)
     {
-        uint32 maxi=0;
-        //find max index
-        for(uint32 y=0;y<recordCount;y++)
+        uint32 maxi = 0;
+        // find max index
+        for (uint32 y = 0; y < recordCount; ++y)
         {
-            uint32 ind=getRecord(y).getUInt (i);
-            if(ind>maxi)maxi=ind;
+            uint32 ind = getRecord(y).getUInt(i);
+            if (ind > maxi)maxi = ind;
         }
 
         ++maxi;
-        records=maxi;
-        indexTable=new ptr[maxi];
-        memset(indexTable,0,maxi*sizeof(ptr));
+        records = maxi;
+        indexTable = new ptr[maxi];
+        memset(indexTable, 0, maxi * sizeof(ptr));
     }
     else
     {
@@ -190,38 +183,38 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
         indexTable = new ptr[recordCount];
     }
 
-    char* dataTable= new char[recordCount*recordsize];
+    char* dataTable = new char[recordCount * recordsize];
 
-    uint32 offset=0;
+    uint32 offset = 0;
 
-    for(uint32 y =0; y < recordCount; ++y)
+    for (uint32 y = 0; y < recordCount; ++y)
     {
         if (i >= 0)
         {
-            indexTable[getRecord(y).getUInt(i)]=&dataTable[offset];
+            indexTable[getRecord(y).getUInt(i)] = &dataTable[offset];
         }
         else
-            indexTable[y]=&dataTable[offset];
+            indexTable[y] = &dataTable[offset];
 
-        for(uint32 x = 0; x < fieldCount; ++x)
+        for (uint32 x = 0; x < fieldCount; ++x)
         {
-            switch(format[x])
+            switch (format[x])
             {
                 case FT_FLOAT:
-                    *((float*)(&dataTable[offset]))=getRecord(y).getFloat(x);
+                    *((float*)(&dataTable[offset])) = getRecord(y).getFloat(x);
                     offset += sizeof(float);
                     break;
                 case FT_IND:
                 case FT_INT:
-                    *((uint32*)(&dataTable[offset]))=getRecord(y).getUInt(x);
+                    *((uint32*)(&dataTable[offset])) = getRecord(y).getUInt(x);
                     offset += sizeof(uint32);
                     break;
                 case FT_BYTE:
-                    *((uint8*)(&dataTable[offset]))=getRecord(y).getUInt8(x);
+                    *((uint8*)(&dataTable[offset])) = getRecord(y).getUInt8(x);
                     offset += sizeof(uint8);
                     break;
                 case FT_STRING:
-                    *((char**)(&dataTable[offset]))=NULL;   // will be replaces non-empty or "" strings in AutoProduceStrings
+                    *((char**)(&dataTable[offset])) = NULL; // will be replaces non-empty or "" strings in AutoProduceStrings
                     offset += sizeof(char*);
                     break;
                 case FT_LOGIC:
@@ -243,19 +236,19 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
 
 char* DBCFileLoader::AutoProduceStrings(const char* format, char* dataTable)
 {
-    if(strlen(format)!=fieldCount)
+    if (strlen(format) != fieldCount)
         return NULL;
 
-    char* stringPool= new char[stringSize];
-    memcpy(stringPool,stringTable,stringSize);
+    char* stringPool = new char[stringSize];
+    memcpy(stringPool, stringTable, stringSize);
 
-    uint32 offset=0;
+    uint32 offset = 0;
 
-    for(uint32 y =0; y < recordCount; ++y)
+    for (uint32 y = 0; y < recordCount; ++y)
     {
-        for(uint32 x = 0; x < fieldCount; ++x)
+        for (uint32 x = 0; x < fieldCount; ++x)
         {
-            switch(format[x])
+            switch (format[x])
             {
                 case FT_FLOAT:
                     offset += sizeof(float);
@@ -271,10 +264,10 @@ char* DBCFileLoader::AutoProduceStrings(const char* format, char* dataTable)
                 {
                     // fill only not filled entries
                     char** slot = (char**)(&dataTable[offset]);
-                    if(!*slot || !**slot)
+                    if (!*slot || !** slot)
                     {
-                        const char * st = getRecord(y).getString(x);
-                        *slot=stringPool+(st-(const char*)stringTable);
+                        const char* st = getRecord(y).getString(x);
+                        *slot = stringPool + (st - (const char*)stringTable);
                     }
                     offset += sizeof(char*);
                     break;
diff --git a/src/shared/Database/DBCFileLoader.h b/src/shared/Database/DBCFileLoader.h
index 9809a7df50d..540cb17a3d0 100644
--- a/src/shared/Database/DBCFileLoader.h
+++ b/src/shared/Database/DBCFileLoader.h
@@ -22,19 +22,19 @@
 #include "Utilities/ByteConverter.h"
 #include <cassert>
 
-enum
+enum FieldFormat
 {
-    FT_NA='x',                                              // ignore/ default, 4 byte size, in Source String means field is ignored, in Dest String means field is filled with default value
-    FT_NA_BYTE='X',                                         // ignore/ default, 1 byte size, see above
-    FT_NA_FLOAT='F',                                        // ignore/ default,  float size, see above
-    FT_NA_POINTER='p',                                      // fill default value into dest, pointer size, Use this only with static data (otherwise mem-leak)
-    FT_STRING='s',                                          //char*
-    FT_FLOAT='f',                                           //float
-    FT_INT='i',                                             //uint32
-    FT_BYTE='b',                                            //uint8
-    FT_SORT='d',                                            //sorted by this field, field is not included
-    FT_IND='n',                                             //the same,but parsed to data
-    FT_LOGIC='l'                                            //Logical (boolean)
+    FT_NA = 'x',                                            // ignore/ default, 4 byte size, in Source String means field is ignored, in Dest String means field is filled with default value
+    FT_NA_BYTE = 'X',                                       // ignore/ default, 1 byte size, see above
+    FT_NA_FLOAT = 'F',                                      // ignore/ default,  float size, see above
+    FT_NA_POINTER = 'p',                                    // fill default value into dest, pointer size, Use this only with static data (otherwise mem-leak)
+    FT_STRING = 's',                                        // char*
+    FT_FLOAT = 'f',                                         // float
+    FT_INT = 'i',                                           // uint32
+    FT_BYTE = 'b',                                          // uint8
+    FT_SORT = 'd',                                          // sorted by this field, field is not included
+    FT_IND = 'n',                                           // the same,but parsed to data
+    FT_LOGIC = 'l'                                          // Logical (boolean)
 };
 
 class DBCFileLoader
@@ -43,7 +43,7 @@ class DBCFileLoader
         DBCFileLoader();
         ~DBCFileLoader();
 
-        bool Load(const char *filename, const char *fmt);
+        bool Load(const char* filename, const char* fmt);
 
         class Record
         {
@@ -51,24 +51,24 @@ class DBCFileLoader
                 float getFloat(size_t field) const
                 {
                     assert(field < file.fieldCount);
-                    float val = *reinterpret_cast<float*>(offset+file.GetOffset(field));
+                    float val = *reinterpret_cast<float*>(offset + file.GetOffset(field));
                     EndianConvert(val);
                     return val;
                 }
                 uint32 getUInt(size_t field) const
                 {
                     assert(field < file.fieldCount);
-                    uint32 val = *reinterpret_cast<uint32*>(offset+file.GetOffset(field));
+                    uint32 val = *reinterpret_cast<uint32*>(offset + file.GetOffset(field));
                     EndianConvert(val);
                     return val;
                 }
                 uint8 getUInt8(size_t field) const
                 {
                     assert(field < file.fieldCount);
-                    return *reinterpret_cast<uint8*>(offset+file.GetOffset(field));
+                    return *reinterpret_cast<uint8*>(offset + file.GetOffset(field));
                 }
 
-                const char *getString(size_t field) const
+                const char* getString(size_t field) const
                 {
                     assert(field < file.fieldCount);
                     size_t stringOffset = getUInt(field);
@@ -77,9 +77,9 @@ class DBCFileLoader
                 }
 
             private:
-                Record(DBCFileLoader &file_, unsigned char *offset_): offset(offset_), file(file_) {}
-                unsigned char *offset;
-                DBCFileLoader &file;
+                Record(DBCFileLoader& file_, unsigned char* offset_): offset(offset_), file(file_) {}
+                unsigned char* offset;
+                DBCFileLoader& file;
 
                 friend class DBCFileLoader;
 
@@ -92,18 +92,18 @@ class DBCFileLoader
         uint32 GetNumRows() const { return recordCount;}
         uint32 GetCols() const { return fieldCount; }
         uint32 GetOffset(size_t id) const { return (fieldsOffset != NULL && id < fieldCount) ? fieldsOffset[id] : 0; }
-        bool IsLoaded() {return (data!=NULL);}
+        bool IsLoaded() {return (data != NULL);}
         char* AutoProduceData(const char* fmt, uint32& count, char**& indexTable);
         char* AutoProduceStrings(const char* fmt, char* dataTable);
-        static uint32 GetFormatRecordSize(const char * format, int32 * index_pos = NULL);
+        static uint32 GetFormatRecordSize(const char* format, int32* index_pos = NULL);
     private:
 
         uint32 recordSize;
         uint32 recordCount;
         uint32 fieldCount;
         uint32 stringSize;
-        uint32 *fieldsOffset;
-        unsigned char *data;
-        unsigned char *stringTable;
+        uint32* fieldsOffset;
+        unsigned char* data;
+        unsigned char* stringTable;
 };
 #endif
diff --git a/src/shared/Database/DBCStore.h b/src/shared/Database/DBCStore.h
index 6529e60d4a1..a216e41757d 100644
--- a/src/shared/Database/DBCStore.h
+++ b/src/shared/Database/DBCStore.h
@@ -24,9 +24,9 @@
 template<class T>
 class DBCStorage
 {
-    typedef std::list<char*> StringPoolList;
+        typedef std::list<char*> StringPoolList;
     public:
-        explicit DBCStorage(const char *f) : nCount(0), fieldCount(0), fmt(f), indexTable(NULL), m_dataTable(NULL) { }
+        explicit DBCStorage(const char* f) : nCount(0), fieldCount(0), fmt(f), indexTable(NULL), m_dataTable(NULL) { }
         ~DBCStorage() { Clear(); }
 
         T const* LookupEntry(uint32 id) const { return (id >= nCount) ? NULL : indexTable[id]; }
@@ -38,34 +38,34 @@ class DBCStorage
         {
             DBCFileLoader dbc;
             // Check if load was sucessful, only then continue
-            if(!dbc.Load(fn, fmt))
+            if (!dbc.Load(fn, fmt))
                 return false;
 
             fieldCount = dbc.GetCols();
 
             // load raw non-string data
-            m_dataTable = (T*)dbc.AutoProduceData(fmt,nCount,(char**&)indexTable);
+            m_dataTable = (T*)dbc.AutoProduceData(fmt, nCount, (char**&)indexTable);
 
             // load strings from dbc data
-            m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt,(char*)m_dataTable));
+            m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt, (char*)m_dataTable));
 
             // error in dbc file at loading if NULL
-            return indexTable!=NULL;
+            return indexTable != NULL;
         }
 
         bool LoadStringsFrom(char const* fn)
         {
             // DBC must be already loaded using Load
-            if(!indexTable)
+            if (!indexTable)
                 return false;
 
             DBCFileLoader dbc;
             // Check if load was successful, only then continue
-            if(!dbc.Load(fn, fmt))
+            if (!dbc.Load(fn, fmt))
                 return false;
 
             // load strings from another locale dbc data
-            m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt,(char*)m_dataTable));
+            m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt, (char*)m_dataTable));
 
             return true;
         }
@@ -75,12 +75,12 @@ class DBCStorage
             if (!indexTable)
                 return;
 
-            delete[] ((char*)indexTable);
+            delete[]((char*)indexTable);
             indexTable = NULL;
-            delete[] ((char*)m_dataTable);
+            delete[]((char*)m_dataTable);
             m_dataTable = NULL;
 
-            while(!m_stringPoolList.empty())
+            while (!m_stringPoolList.empty())
             {
                 delete[] m_stringPoolList.front();
                 m_stringPoolList.pop_front();
@@ -88,8 +88,23 @@ class DBCStorage
             nCount = 0;
         }
 
-        void EraseEntry(uint32 id) { assert(id < nCount && "To be erased entry must be in bounds!") ; indexTable[id] = NULL; }
-        void InsertEntry(T* entry, uint32 id) { assert(id < nCount && "To be inserted entry must be in bounds!"); indexTable[id] = entry; }
+        void EraseEntry(uint32 id) 
+        {
+            assert(id < nCount && "To be erased entry must be in bounds!"); 
+
+            /* FIXME! Need delete SpellEntry object while EraseEntry execution, but currently this unsafe. Some memleak here, 
+            also new memleak at each other reload spell_dbc table
+
+            if (indexTable[id] != NULL)
+                delete indexTable[id];*/
+            indexTable[id] = NULL; 
+        }
+
+        void InsertEntry(T* entry, uint32 id) 
+        {
+            assert(id < nCount && "To be inserted entry must be in bounds!");
+            indexTable[id] = entry;
+        }
 
     private:
         uint32 nCount;
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 3eb582ea813..8d6a98f3a7f 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -45,13 +45,10 @@ void SqlConnection::FreePreparedStatements()
     m_holder.clear();
 }
 
-SqlPreparedStatement * SqlConnection::GetStmt( int nIndex )
+SqlPreparedStatement* SqlConnection::GetStmt(uint32 nIndex)
 {
-    if(nIndex < 0)
-        return NULL;
-
-    //resize stmt container
-    if(m_holder.size() <= nIndex)
+    // resize stmt container
+    if (m_holder.size() <= nIndex)
         m_holder.resize(nIndex + 1, NULL);
 
     SqlPreparedStatement * pStmt = NULL;
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index cb4f8510411..c50e48a4939 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -35,7 +35,7 @@ class SqlStmtParameters;
 class SqlParamBinder;
 class Database;
 
-#define MAX_QUERY_LEN   32*1024
+#define MAX_QUERY_LEN   (32*1024)
 
 //
 class MANGOS_DLL_SPEC SqlConnection
@@ -83,9 +83,9 @@ class MANGOS_DLL_SPEC SqlConnection
     protected:
         SqlConnection(Database& db) : m_db(db) {}
 
-        virtual SqlPreparedStatement * CreateStatement(const std::string& fmt);
-        //allocate prepared statement and return statement ID
-        SqlPreparedStatement * GetStmt(int nIndex);
+        virtual SqlPreparedStatement* CreateStatement(const std::string& fmt);
+        // allocate prepared statement and return statement ID
+        SqlPreparedStatement* GetStmt(uint32 nIndex);
 
         Database& m_db;
 
@@ -222,8 +222,8 @@ class MANGOS_DLL_SPEC Database
         void AllowAsyncTransactions() { m_bAllowAsyncTransactions = true; }
 
     protected:
-        Database() : m_pAsyncConn(NULL), m_pResultQueue(NULL), m_threadBody(NULL), m_delayThread(NULL),
-            m_logSQL(false), m_pingIntervallms(0), m_nQueryConnPoolSize(1), m_bAllowAsyncTransactions(false), m_iStmtIndex(-1)
+        Database(): m_nQueryConnPoolSize(1), m_pAsyncConn(NULL), m_pResultQueue(NULL), m_threadBody(NULL), m_delayThread(NULL),
+            m_bAllowAsyncTransactions(false), m_iStmtIndex(-1), m_logSQL(false), m_pingIntervallms(0)
         {
             m_nQueryCounter = -1;
         }
@@ -275,7 +275,7 @@ class MANGOS_DLL_SPEC Database
 
         //connection helper counters
         int m_nQueryConnPoolSize;                               //current size of query connection pool
-        ACE_Atomic_Op<ACE_Thread_Mutex, long> m_nQueryCounter;  //counter for connection selection
+        ACE_Atomic_Op<ACE_Thread_Mutex, uint32> m_nQueryCounter;  //counter for connection selection
 
         //lets use pool of connections for sync queries
         typedef std::vector< SqlConnection * > SqlConnectionContainer;
diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
index 99b297f3220..7758c0bc4a6 100644
--- a/src/shared/Database/DatabaseMysql.cpp
+++ b/src/shared/Database/DatabaseMysql.cpp
@@ -19,7 +19,7 @@
 #ifndef DO_POSTGRESQL
 
 #include "Util.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Platform/Define.h"
 #include "Threading.h"
 #include "DatabaseEnv.h"
@@ -83,26 +83,19 @@ bool MySQLConnection::Initialize(const char *infoString)
         return false;
     }
 
-    Tokens tokens = StrSplit(infoString, ";");
-
-    Tokens::iterator iter;
+    Tokens tokens(infoString, ';');
 
     std::string host, port_or_socket, user, password, database;
     int port;
     char const* unix_socket;
 
-    iter = tokens.begin();
+    uint8 i = 0;
 
-    if(iter != tokens.end())
-        host = *iter++;
-    if(iter != tokens.end())
-        port_or_socket = *iter++;
-    if(iter != tokens.end())
-        user = *iter++;
-    if(iter != tokens.end())
-        password = *iter++;
-    if(iter != tokens.end())
-        database = *iter++;
+    host.assign(tokens[i++]);
+    port_or_socket.assign(tokens[i++]);
+    user.assign(tokens[i++]);
+    password.assign(tokens[i++]);
+    database.assign(tokens[i++]);
 
     mysql_options(mysqlInit,MYSQL_SET_CHARSET_NAME,"utf8");
 #ifdef WIN32
@@ -140,14 +133,14 @@ bool MySQLConnection::Initialize(const char *infoString)
     if (!mMysql)
     {
         sLog.outError( "Could not connect to MySQL database at %s: %s\n",
-            host.c_str(),mysql_error(mysqlInit));
+        host.c_str(),mysql_error(mysqlInit));
         mysql_close(mysqlInit);
         return false;
     }
 
-    DETAIL_LOG("Connected to MySQL database %s@%s:%s/%s", user.c_str(), host.c_str(), port_or_socket.c_str(), database.c_str());
-    sLog.outString("MySQL client library: %s", mysql_get_client_info());
-    sLog.outString("MySQL server ver: %s ", mysql_get_server_info( mMysql));
+    DETAIL_LOG("BOOT: Connected to MySQL database %s@%s:%s/%s", user.c_str(), host.c_str(), port_or_socket.c_str(), database.c_str());
+    sLog.outString("BOOT: MySQL client library: %s", mysql_get_client_info());
+    sLog.outString("BOOT: MySQL server ver: %s ", mysql_get_server_info( mMysql));
 
     /*----------SET AUTOCOMMIT ON---------*/
     // It seems mysql 5.0.x have enabled this feature
@@ -161,9 +154,9 @@ bool MySQLConnection::Initialize(const char *infoString)
     // LEAVE 'AUTOCOMMIT' MODE ALWAYS ENABLED!!!
     // W/O IT EVEN 'SELECT' QUERIES WOULD REQUIRE TO BE WRAPPED INTO 'START TRANSACTION'<>'COMMIT' CLAUSES!!!
     if (!mysql_autocommit(mMysql, 1))
-        DETAIL_LOG("AUTOCOMMIT SUCCESSFULLY SET TO 1");
+        DETAIL_LOG("BOOT: MySQL autocommit succesfully enabled");
     else
-        DETAIL_LOG("AUTOCOMMIT NOT SET TO 1");
+        DETAIL_LOG("BOOT: MySQL cannot enable autocommit");
     /*-------------------------------------*/
 
     // set connection properties to UTF8 to properly handle locales for different
@@ -171,6 +164,22 @@ bool MySQLConnection::Initialize(const char *infoString)
     Execute("SET NAMES `utf8`");
     Execute("SET CHARACTER SET `utf8`");
 
+#if MYSQL_VERSION_ID >= 50003
+        my_bool my_true = (my_bool)1;
+        if (mysql_options(mMysql, MYSQL_OPT_RECONNECT, &my_true))
+        {
+            sLog.outDetail("BOOT: MySQL failed to turn on MYSQL_OPT_RECONNECT.");
+        }
+        else
+        {
+            sLog.outDetail("BOOT: MySQL successfully turned on MYSQL_OPT_RECONNECT.");
+        }
+#else
+        sLog.outDetail("BOOT: MySQL: Your client lib version does not support reconnecting after a timeout.");
+        sLog.outDetail("BOOT: MySQL: If this causes you any trouble we advice you to upgrade");
+        sLog.outDetail("BOOT: MySQL: your client libs to at least mySQL 5.0.13 to resolve this problem.");
+#endif
+
     return true;
 }
 
@@ -304,7 +313,7 @@ unsigned long MySQLConnection::escape_string(char *to, const char *from, unsigne
     if (!mMysql || !to || !from || !length)
         return 0;
 
-    return(mysql_real_escape_string(mMysql, to, from, length));
+    return (mysql_real_escape_string(mMysql, to, from, length));
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -424,7 +433,7 @@ void MySqlPreparedStatement::bind( const SqlStmtParameters& holder )
 void MySqlPreparedStatement::addParam( int nIndex, const SqlStmtFieldData& data )
 {
     MANGOS_ASSERT(m_pInputArgs);
-    MANGOS_ASSERT(nIndex < m_nParams);
+    MANGOS_ASSERT(nIndex < (int)m_nParams);
 
     MYSQL_BIND& pData = m_pInputArgs[nIndex];
 
diff --git a/src/shared/Database/DatabasePostgre.cpp b/src/shared/Database/DatabasePostgre.cpp
index 61ddb0cf1a6..453c3ee5c44 100644
--- a/src/shared/Database/DatabasePostgre.cpp
+++ b/src/shared/Database/DatabasePostgre.cpp
@@ -19,7 +19,7 @@
 #ifdef DO_POSTGRESQL
 
 #include "Util.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Platform/Define.h"
 #include "Threading.h"
 #include "DatabaseEnv.h"
@@ -48,7 +48,7 @@ DatabasePostgre::~DatabasePostgre()
 
 SqlConnection * DatabasePostgre::CreateConnection()
 {
-    return new PostgreSQLConnection();
+    return new PostgreSQLConnection(*this);
 }
 
 PostgreSQLConnection::~PostgreSQLConnection()
diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h
index 75136075144..3cc5934e66a 100644
--- a/src/shared/Database/DatabasePostgre.h
+++ b/src/shared/Database/DatabasePostgre.h
@@ -37,7 +37,7 @@
 class MANGOS_DLL_SPEC PostgreSQLConnection : public SqlConnection
 {
     public:
-        PostgreSQLConnection() : mPGconn(NULL) {}
+        PostgreSQLConnection(Database &db) : SqlConnection(db), mPGconn(NULL) {}
         ~PostgreSQLConnection();
 
         bool Initialize(const char *infoString);
diff --git a/src/shared/Database/MySQLDelayThread.h b/src/shared/Database/MySQLDelayThread.h
deleted file mode 100644
index 54d2d00b96b..00000000000
--- a/src/shared/Database/MySQLDelayThread.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __MYSQLDELAYTHREAD_H
-#define __MYSQLDELAYTHREAD_H
-
-#include "Database/SqlDelayThread.h"
-
-class MySQLDelayThread : public SqlDelayThread
-{
-    public:
-        MySQLDelayThread(Database* db) : SqlDelayThread(db) {}
-        void Stop() { SqlDelayThread::Stop(); }
-};
-#endif                                                      //__MYSQLDELAYTHREAD_H
diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
index bb78057333a..a488bd47cdc 100644
--- a/src/shared/Database/SQLStorage.cpp
+++ b/src/shared/Database/SQLStorage.cpp
@@ -17,84 +17,92 @@
  */
 
 #include "SQLStorage.h"
-#include "SQLStorageImpl.h"
 
-void SQLStorage::EraseEntry(uint32 id)
+// -----------------------------------  SQLStorageBase  ---------------------------------------- //
+
+SQLStorageBase::SQLStorageBase() :
+    m_recordCount(0),
+    m_maxEntry(0),
+    m_dstFieldCount(0),
+    m_srcFieldCount(0),
+    m_recordSize(0),
+    m_tableName(NULL),
+    m_entry_field(NULL),
+    m_src_format(NULL),
+    m_dst_format(NULL),
+    m_data(NULL)
+{}
+
+void SQLStorageBase::Initialize( const char* tableName, const char* entry_field, const char* src_format, const char* dst_format)
 {
-    uint32 offset = 0;
-    for (uint32 x = 0; x < oNumFields; ++x)
-    {
-        switch(dst_format[x])
-        {
-            case FT_LOGIC:
-                offset += sizeof(bool);   break;
-            case FT_BYTE:
-                offset += sizeof(char);   break;
-            case FT_INT:
-                offset += sizeof(uint32); break;
-            case FT_FLOAT:
-                offset += sizeof(float);  break;
-            case FT_STRING:
-            {
-                if(pIndex[id])
-                    delete [] *(char**)((char*)(pIndex[id])+offset);
+    m_tableName = tableName;
+    m_entry_field = entry_field;
+    m_src_format = src_format;
+    m_dst_format = dst_format;
 
-                offset += sizeof(char*);
-                break;
-            }
-            case FT_NA:
-                offset += sizeof(uint32); break;
-            case FT_NA_BYTE:
-                offset += sizeof(char);   break;
-            case FT_NA_FLOAT:
-                offset += sizeof(float);  break;
-            case FT_NA_POINTER:
-                offset += sizeof(char*);  break;
-            case FT_IND:
-            case FT_SORT:
-                assert(false && "SQL storage not have sort field types");
-                break;
-            default:
-                assert(false && "unknown format character");
-                break;
-        }
-    }
+    m_srcFieldCount = strlen(m_src_format);
+    m_dstFieldCount = strlen(m_dst_format);
+}
+
+char* SQLStorageBase::createRecord(uint32 recordId)
+{
+    char* newRecord = &m_data[m_recordCount * m_recordSize];
+    ++m_recordCount;
+
+    JustCreatedRecord(recordId, newRecord);
+    return newRecord;
+}
+
+void SQLStorageBase::prepareToLoad(uint32 maxEntry, uint32 recordCount, uint32 recordSize)
+{
+    m_maxEntry = maxEntry;
+    m_recordSize = recordSize;
+
+    delete[] m_data;
+    m_data = new char[recordCount * m_recordSize];
+    memset(m_data, 0, recordCount * m_recordSize);
 
-    pIndex[id] = NULL;
+    m_recordCount = 0;
 }
 
-void SQLStorage::Free ()
+// Function to delete the data
+void SQLStorageBase::Free()
 {
+    if (!m_data)
+        return;
+
     uint32 offset = 0;
-    for (uint32 x = 0; x < oNumFields; ++x)
+    for (uint32 x = 0; x < m_dstFieldCount; ++x)
     {
-        switch(dst_format[x])
+        switch (m_dst_format[x])
         {
             case FT_LOGIC:
-                offset += sizeof(bool);   break;
-            case FT_BYTE:
-                offset += sizeof(char);   break;
-            case FT_INT:
-                offset += sizeof(uint32); break;
-            case FT_FLOAT:
-                offset += sizeof(float);  break;
+                offset += sizeof(bool);
+                break;
             case FT_STRING:
             {
-                for(uint32 y = 0; y < MaxEntry; ++y)
-                    if(pIndex[y])
-                        delete [] *(char**)((char*)(pIndex[y])+offset);
+                for (uint32 recordItr = 0; recordItr < m_recordCount; ++recordItr)
+                        delete[] *(char**)((char*)(m_data + (recordItr * m_recordSize)) + offset);
 
                 offset += sizeof(char*);
                 break;
             }
             case FT_NA:
-                offset += sizeof(uint32); break;
+            case FT_INT:
+                offset += sizeof(uint32);
+                break;
+            case FT_BYTE:
             case FT_NA_BYTE:
-                offset += sizeof(char);   break;
+                offset += sizeof(char);
+                break;
+            case FT_FLOAT:
             case FT_NA_FLOAT:
-                offset += sizeof(float);  break;
+                offset += sizeof(float);
+                break;
             case FT_NA_POINTER:
-                offset += sizeof(char*);  break;
+                // TODO- possible (and small) memleak here possible
+                offset += sizeof(char*);
+                break;
             case FT_IND:
             case FT_SORT:
                 assert(false && "SQL storage not have sort field types");
@@ -104,9 +112,23 @@ void SQLStorage::Free ()
                 break;
         }
     }
+    delete[] m_data;
+    m_data = NULL;
+    m_recordCount = 0;
+}
+
+// -----------------------------------  SQLStorage  -------------------------------------------- //
 
-    delete [] pIndex;
-    delete [] data;
+void SQLStorage::EraseEntry(uint32 id)
+{
+    m_Index[id] = NULL;
+}
+
+void SQLStorage::Free()
+{
+    SQLStorageBase::Free();
+    delete[] m_Index;
+    m_Index = NULL;
 }
 
 void SQLStorage::Load()
@@ -114,3 +136,102 @@ void SQLStorage::Load()
     SQLStorageLoader loader;
     loader.Load(*this);
 }
+
+SQLStorage::SQLStorage(const char* fmt, const char* _entry_field, const char* sqlname)
+{
+    Initialize(sqlname, _entry_field, fmt, fmt);
+    m_Index = NULL;
+}
+
+SQLStorage::SQLStorage(const char* src_fmt, const char* dst_fmt, const char* _entry_field, const char* sqlname)
+{
+    Initialize(sqlname, _entry_field, src_fmt, dst_fmt);
+    m_Index = NULL;
+}
+
+void SQLStorage::prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 recordSize)
+{
+    // Clear (possible) old data and old index array
+    Free();
+
+    // Set index array
+    m_Index = new char*[maxRecordId];
+    memset(m_Index, NULL, maxRecordId * sizeof(char*));
+
+    SQLStorageBase::prepareToLoad(maxRecordId, recordCount, recordSize);
+}
+
+// -----------------------------------  SQLHashStorage  ---------------------------------------- //
+void SQLHashStorage::Load()
+{
+    SQLHashStorageLoader loader;
+    loader.Load(*this);
+}
+
+void SQLHashStorage::Free()
+{
+    SQLStorageBase::Free();
+    m_indexMap.clear();
+}
+
+void SQLHashStorage::prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 recordSize)
+{
+    // Clear (possible) old data and old index array
+    Free();
+
+    SQLStorageBase::prepareToLoad(maxRecordId, recordCount, recordSize);
+}
+
+void SQLHashStorage::EraseEntry(uint32 id)
+{
+    // do not erase from m_records
+    RecordMap::iterator find = m_indexMap.find(id);
+    if (find != m_indexMap.end())
+        find->second = NULL;
+}
+
+SQLHashStorage::SQLHashStorage(const char* fmt, const char * _entry_field, const char * sqlname)
+{
+    Initialize(sqlname, _entry_field, fmt, fmt);
+}
+
+SQLHashStorage::SQLHashStorage(const char* src_fmt, const char* dst_fmt, const char * _entry_field, const char * sqlname)
+{
+    Initialize(sqlname, _entry_field, src_fmt, dst_fmt);
+}
+
+// -----------------------------------  SQLMultiStorage  --------------------------------------- //
+void SQLMultiStorage::Load()
+{
+    SQLMultiStorageLoader loader;
+    loader.Load(*this);
+}
+
+void SQLMultiStorage::Free()
+{
+    SQLStorageBase::Free();
+    m_indexMultiMap.clear();
+}
+
+void SQLMultiStorage::prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 recordSize)
+{
+    // Clear (possible) old data and old index array
+    Free();
+
+    SQLStorageBase::prepareToLoad(maxRecordId, recordCount, recordSize);
+}
+
+void SQLMultiStorage::EraseEntry(uint32 id)
+{
+    m_indexMultiMap.erase(id);
+}
+
+SQLMultiStorage::SQLMultiStorage(const char* fmt, const char * _entry_field, const char * sqlname)
+{
+    Initialize(sqlname, _entry_field, fmt, fmt);
+}
+
+SQLMultiStorage::SQLMultiStorage(const char* src_fmt, const char* dst_fmt, const char * _entry_field, const char * sqlname)
+{
+    Initialize(sqlname, _entry_field, src_fmt, dst_fmt);
+}
diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h
index 182b231988f..fd0083a07d4 100644
--- a/src/shared/Database/SQLStorage.h
+++ b/src/shared/Database/SQLStorage.h
@@ -21,79 +21,230 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
+#include "DBCFileLoader.h"
 
-class SQLStorage
+class SQLStorageBase
 {
-    template<class T>
-    friend struct SQLStorageLoaderBase;
+    template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
 
     public:
-        SQLStorage(const char* fmt, const char* _entry_field, const char* sqlname)
+        char const* GetTableName() const { return m_tableName; }
+        char const* EntryFieldName() const { return m_entry_field; }
+
+        FieldFormat GetDstFormat(uint32 idx) const { return (FieldFormat)m_dst_format[idx]; };
+        const char* GetDstFormat() const { return m_dst_format; };
+        FieldFormat GetSrcFormat(uint32 idx) const { return (FieldFormat)m_src_format[idx]; };
+        const char* GetSrcFormat() const { return m_src_format; };
+
+        uint32 GetMaxEntry() const { return m_maxEntry; };
+        uint32 GetRecordCount() const { return m_recordCount; };
+
+        template<typename T>
+        class SQLSIterator
         {
-            src_format = fmt;
-            dst_format = fmt;
-            init(_entry_field, sqlname);
-        }
+            friend class SQLStorageBase;
+
+            public:
+                T const* getValue() const { return reinterpret_cast<T const*>(pointer); }
+
+                void operator ++() { pointer += recordSize; }
+                T const* operator *() const { return getValue(); }
+                T const* operator ->() const { return getValue(); }
+                bool operator <(SQLSIterator const& r) const { return pointer < r.pointer; }
+                void operator =(SQLSIterator const& r) { pointer = r.pointer; recordSize = r.recordSize; }
+
+            private:
+                SQLSIterator(char* ptr, uint32 _recordSize) : pointer(ptr), recordSize(_recordSize) {}
+                char* pointer;
+                uint32 recordSize;
+        };
+
+        template<typename T>
+        SQLSIterator<T> getDataBegin() const { return SQLSIterator<T>(m_data, m_recordSize); }
+        template<typename T>
+        SQLSIterator<T> getDataEnd() const { return SQLSIterator<T>(m_data + m_recordCount * m_recordSize, m_recordSize); }
+
+    protected:
+        SQLStorageBase();
+        virtual ~SQLStorageBase() { Free(); }
+
+        void Initialize(const char* tableName, const char* entry_field, const char* src_format, const char* dst_format);
+
+        uint32 GetDstFieldCount() const { return m_dstFieldCount; }
+        uint32 GetSrcFieldCount() const { return m_srcFieldCount; }
+        uint32 GetRecordSize() const { return m_recordSize; }
+
+        virtual void prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 recordSize);
+        virtual void JustCreatedRecord(uint32 recordId, char* record) = 0;
+        virtual void Free();
+
+    private:
+        char* createRecord(uint32 recordId);
+
+        // Information about the table
+        const char* m_tableName;
+        const char* m_entry_field;
+        const char* m_src_format;
+        const char* m_dst_format;
+
+        // Information about the records
+        uint32 m_dstFieldCount;
+        uint32 m_srcFieldCount;
+        uint32 m_recordCount;
+        uint32 m_maxEntry;
+        uint32 m_recordSize;
+
+        // Data Storage
+        char* m_data;
+};
+
+class SQLStorage : public SQLStorageBase
+{
+    template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
 
-        SQLStorage(const char* src_fmt, const char* dst_fmt, const char* _entry_field, const char* sqlname)
+    public:
+        SQLStorage(const char* fmt, const char* _entry_field, const char* sqlname);
+
+        SQLStorage(const char* src_fmt, const char* dst_fmt, const char* _entry_field, const char* sqlname);
+
+        ~SQLStorage() { Free(); }
+
+        template<class T>
+            T const* LookupEntry(uint32 id) const
         {
-            src_format = src_fmt;
-            dst_format = dst_fmt;
-            init(_entry_field, sqlname);
+            if (id >= GetMaxEntry())
+                return NULL;
+            return reinterpret_cast<T const*>(m_Index[id]);
         }
 
-        ~SQLStorage()
+        void Load();
+
+        void EraseEntry(uint32 id);
+
+    protected:
+        void prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 recordSize) override;
+        void JustCreatedRecord(uint32 recordId, char* record) override
         {
-            Free();
+            m_Index[recordId] = record;
         }
 
+        void Free() override;
+
+    private:
+        // Lookup access
+        char** m_Index;
+};
+
+class SQLHashStorage : public SQLStorageBase
+{
+    template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
+
+    public:
+        SQLHashStorage(const char* fmt, const char * _entry_field, const char * sqlname);
+        SQLHashStorage(const char* src_fmt, const char* dst_fmt, const char * _entry_field, const char * sqlname);
+
+        ~SQLHashStorage() { Free(); }
+
         template<class T>
-            T const* LookupEntry(uint32 id) const
+        T const* LookupEntry(uint32 id) const
         {
-            if (id >= MaxEntry)
-                return NULL;
-            return reinterpret_cast<T const*>(pIndex[id]);
+            RecordMap::const_iterator find = m_indexMap.find(id);
+            if (find != m_indexMap.end())
+                return reinterpret_cast<T const*>(find->second);
+            return NULL;
+        }
+
+        void Load();
+
+        void EraseEntry(uint32 id);
+
+    protected:
+        void prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 recordSize) override;
+        void JustCreatedRecord(uint32 recordId, char* record) override
+        {
+            m_indexMap[recordId] = record;
         }
 
-        uint32 RecordCount;
-        uint32 MaxEntry;
-        uint32 iNumFields;
-        uint32 oNumFields;
+        void Free() override;
+
+    private:
+        typedef UNORDERED_MAP<uint32/*recordId*/, char* /*record*/> RecordMap;
+        RecordMap m_indexMap;
+};
+
+class SQLMultiStorage : public SQLStorageBase
+{
+    template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
+    template<typename T> friend class SQLMultiSIterator;
+    template<typename T> friend class SQLMSIteratorBounds;
+
+    private:
+        typedef UNORDERED_MULTIMAP<uint32/*recordId*/, char* /*record*/> RecordMultiMap;
+
+    public:
+        SQLMultiStorage(const char* fmt, const char * _entry_field, const char * sqlname);
+        SQLMultiStorage(const char* src_fmt, const char* dst_fmt, const char * _entry_field, const char * sqlname);
+
+        ~SQLMultiStorage() { Free(); }
+
+        template<typename T>
+        class SQLMultiSIterator
+        {
+            friend class SQLMultiStorage;
+
+            public:
+                T const* getValue() const { return reinterpret_cast<T const*>(citerator->second); }
+                uint32 getKey() const { return citerator->first; }
+
+                void operator ++() { ++citerator; }
+                T const* operator *() const { return getValue(); }
+                T const* operator ->() const { return getValue(); }
+                bool operator !=(const SQLMultiSIterator& r) const { return citerator != r.citerator; }
+                bool operator ==(const SQLMultiSIterator& r) const { return citerator == r.citerator; }
+
+            private:
+                SQLMultiSIterator(RecordMultiMap::const_iterator _itr) : citerator(_itr) {}
+                RecordMultiMap::const_iterator citerator;
+        };
+
+        template<typename T>
+        class SQLMSIteratorBounds
+        {
+            friend class SQLMultiStorage;
+
+            public:
+                const SQLMultiSIterator<T> first;
+                const SQLMultiSIterator<T> second;
+
+            private:
+                SQLMSIteratorBounds(std::pair<RecordMultiMap::const_iterator, RecordMultiMap::const_iterator> pair) : first(pair.first), second(pair.second) {}
+        };
 
-        char const* GetTableName() const { return table; }
+        template<typename T>
+        SQLMSIteratorBounds<T> getBounds(uint32 key) const { return SQLMSIteratorBounds<T>(m_indexMultiMap.equal_range(key)); }
 
         void Load();
-        void Free();
 
         void EraseEntry(uint32 id);
 
-    private:
-        void init(const char* _entry_field, const char* sqlname)
+    protected:
+        void prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 recordSize) override;
+        void JustCreatedRecord(uint32 recordId, char* record) override
         {
-            entry_field = _entry_field;
-            table=sqlname;
-            data = NULL;
-            pIndex = NULL;
-            iNumFields = strlen(src_format);
-            oNumFields = strlen(dst_format);
-            MaxEntry = 0;
+            m_indexMultiMap.insert(RecordMultiMap::value_type(recordId, record));
         }
 
-        char** pIndex;
+        void Free() override;
 
-        char* data;
-        const char* src_format;
-        const char* dst_format;
-        const char* table;
-        const char* entry_field;
-        //bool HasString;
+    private:
+        RecordMultiMap m_indexMultiMap;
 };
 
-template <class T>
-struct SQLStorageLoaderBase
+template <class DerivedLoader, class StorageClass>
+class SQLStorageLoaderBase
 {
     public:
-        void Load(SQLStorage& storage, bool error_at_empty = true);
+        void Load(StorageClass& storage, bool error_at_empty = true);
 
         template<class S, class D>
             void convert(uint32 field_pos, S src, D& dst);
@@ -113,15 +264,25 @@ struct SQLStorageLoaderBase
 
     private:
         template<class V>
-            void storeValue(V value, SQLStorage& store, char* p, uint32 x, uint32& offset);
-        void storeValue(char const* value, SQLStorage& store, char* p, uint32 x, uint32& offset);
+        void storeValue(V value, StorageClass& store, char* record, uint32 field_pos, uint32& offset);
+        void storeValue(char const* value, StorageClass& store, char* record, uint32 field_pos, uint32& offset);
 
         // trap, no body
-        void storeValue(char* value, SQLStorage& store, char* p, uint32 x, uint32& offset);
+        void storeValue(char* value, StorageClass& store, char* record, uint32 field_pos, uint32& offset);
+};
+
+class SQLStorageLoader : public SQLStorageLoaderBase<SQLStorageLoader, SQLStorage>
+{
 };
 
-struct SQLStorageLoader : public SQLStorageLoaderBase<SQLStorageLoader>
+class SQLHashStorageLoader : public SQLStorageLoaderBase<SQLHashStorageLoader, SQLHashStorage>
 {
 };
 
+class SQLMultiStorageLoader : public SQLStorageLoaderBase<SQLMultiStorageLoader, SQLMultiStorage>
+{
+};
+
+#include "SQLStorageImpl.h"
+
 #endif
diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h
index 30e35c0c9ad..d0703057c2e 100644
--- a/src/shared/Database/SQLStorageImpl.h
+++ b/src/shared/Database/SQLStorageImpl.h
@@ -23,15 +23,15 @@
 #include "Log.h"
 #include "DBCFileLoader.h"
 
-template<class T>
-template<class S, class D>
-void SQLStorageLoaderBase<T>::convert(uint32 /*field_pos*/, S src, D &dst)
+template<class DerivedLoader, class StorageClass>
+template<class S, class D>                                  // S source-type, D destination-type
+void SQLStorageLoaderBase<DerivedLoader, StorageClass>::convert(uint32 /*field_pos*/, S src, D& dst)
 {
     dst = D(src);
 }
 
-template<class T>
-void SQLStorageLoaderBase<T>::convert_str_to_str(uint32 /*field_pos*/, char const *src, char *&dst)
+template<class DerivedLoader, class StorageClass>
+void SQLStorageLoaderBase<DerivedLoader, StorageClass>::convert_str_to_str(uint32 /*field_pos*/, char const* src, char*& dst)
 {
     if (!src)
     {
@@ -46,41 +46,41 @@ void SQLStorageLoaderBase<T>::convert_str_to_str(uint32 /*field_pos*/, char cons
     }
 }
 
-template<class T>
-template<class S>
-void SQLStorageLoaderBase<T>::convert_to_str(uint32 /*field_pos*/, S /*src*/, char * & dst)
+template<class DerivedLoader, class StorageClass>
+template<class S>                                           // S source-type
+void SQLStorageLoaderBase<DerivedLoader, StorageClass>::convert_to_str(uint32 /*field_pos*/, S /*src*/, char*& dst)
 {
     dst = new char[1];
     *dst = 0;
 }
 
-template<class T>
-template<class D>
-void SQLStorageLoaderBase<T>::convert_from_str(uint32 /*field_pos*/, char const* /*src*/, D& dst)
+template<class DerivedLoader, class StorageClass>
+template<class D>                                           // D destination-type
+void SQLStorageLoaderBase<DerivedLoader, StorageClass>::convert_from_str(uint32 /*field_pos*/, char const* /*src*/, D& dst)
 {
     dst = 0;
 }
 
-template<class T>
-template<class S, class D>
-void SQLStorageLoaderBase<T>::default_fill(uint32 /*field_pos*/, S src, D &dst)
+template<class DerivedLoader, class StorageClass>
+template<class S, class D>                                  // S source-type, D destination-type
+void SQLStorageLoaderBase<DerivedLoader, StorageClass>::default_fill(uint32 /*field_pos*/, S src, D& dst)
 {
     dst = D(src);
 }
 
-template<class T>
-void SQLStorageLoaderBase<T>::default_fill_to_str(uint32 /*field_pos*/, char const* /*src*/, char * & dst)
+template<class DerivedLoader, class StorageClass>
+void SQLStorageLoaderBase<DerivedLoader, StorageClass>::default_fill_to_str(uint32 /*field_pos*/, char const* /*src*/, char*& dst)
 {
     dst = new char[1];
     *dst = 0;
 }
 
-template<class T>
-template<class V>
-void SQLStorageLoaderBase<T>::storeValue(V value, SQLStorage &store, char *p, uint32 x, uint32 &offset)
+template<class DerivedLoader, class StorageClass>
+template<class V>                                           // V value-type
+void SQLStorageLoaderBase<DerivedLoader, StorageClass>::storeValue(V value, StorageClass& store, char* p, uint32 x, uint32& offset)
 {
-    T * subclass = (static_cast<T*>(this));
-    switch(store.dst_format[x])
+    DerivedLoader* subclass = (static_cast<DerivedLoader*>(this));
+    switch (store.GetDstFormat(x))
     {
         case FT_LOGIC:
             subclass->convert(x, value, *((bool*)(&p[offset])) );
@@ -103,8 +103,8 @@ void SQLStorageLoaderBase<T>::storeValue(V value, SQLStorage &store, char *p, ui
             offset+=sizeof(char*);
             break;
         case FT_NA:
-            subclass->default_fill(x, value, *((int32*)(&p[offset])) );
-            offset+=sizeof(uint32);
+            subclass->default_fill(x, value, *((uint32*)(&p[offset])));
+            offset += sizeof(uint32);
             break;
         case FT_NA_BYTE:
             subclass->default_fill(x, value, *((char*)(&p[offset])) );
@@ -124,11 +124,11 @@ void SQLStorageLoaderBase<T>::storeValue(V value, SQLStorage &store, char *p, ui
     }
 }
 
-template<class T>
-void SQLStorageLoaderBase<T>::storeValue(char const* value, SQLStorage &store, char *p, uint32 x, uint32 &offset)
+template<class DerivedLoader, class StorageClass>
+void SQLStorageLoaderBase<DerivedLoader, StorageClass>::storeValue(char const* value, StorageClass& store, char* p, uint32 x, uint32& offset)
 {
-    T * subclass = (static_cast<T*>(this));
-    switch(store.dst_format[x])
+    DerivedLoader* subclass = (static_cast<DerivedLoader*>(this));
+    switch (store.GetDstFormat(x))
     {
         case FT_LOGIC:
             subclass->convert_from_str(x, value, *((bool*)(&p[offset])) );
@@ -164,61 +164,58 @@ void SQLStorageLoaderBase<T>::storeValue(char const* value, SQLStorage &store, c
     }
 }
 
-template<class T>
-void SQLStorageLoaderBase<T>::Load(SQLStorage &store, bool error_at_empty /*= true*/)
+template<class DerivedLoader, class StorageClass>
+void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store, bool error_at_empty /*= true*/)
 {
-    uint32 maxi;
-    Field *fields;
-    QueryResult *result  = WorldDatabase.PQuery("SELECT MAX(%s) FROM %s", store.entry_field, store.table);
-    if(!result)
+    Field* fields = NULL;
+    QueryResult* result  = WorldDatabase.PQuery("SELECT MAX(%s) FROM %s", store.EntryFieldName(), store.GetTableName());
+    if (!result)
     {
-        sLog.outError("Error loading %s table (not exist?)\n", store.table);
+        sLog.outError("Error loading %s table (not exist?)\n", store.GetTableName());
         Log::WaitBeforeContinueIfNeed();
         exit(1);                                            // Stop server at loading non exited table or not accessable table
     }
 
-    maxi = (*result)[0].GetUInt32()+1;
+    uint32 maxRecordId = (*result)[0].GetUInt32() + 1;
+    uint32 recordCount = 0;
+    uint32 recordsize = 0;
     delete result;
 
-    result = WorldDatabase.PQuery("SELECT COUNT(*) FROM %s", store.table);
-    if(result)
+    result = WorldDatabase.PQuery("SELECT COUNT(*) FROM %s", store.GetTableName());
+    if (result)
     {
         fields = result->Fetch();
-        store.RecordCount = fields[0].GetUInt32();
+        recordCount = fields[0].GetUInt32();
         delete result;
     }
-    else
-        store.RecordCount = 0;
 
-    result = WorldDatabase.PQuery("SELECT * FROM %s", store.table);
+    result = WorldDatabase.PQuery("SELECT * FROM %s", store.GetTableName());
 
     if(!result)
     {
         if (error_at_empty)
-            sLog.outError("%s table is empty!\n", store.table);
+            sLog.outError("%s table is empty!\n", store.GetTableName());
         else
-            sLog.outString("%s table is empty!\n", store.table);
+            sLog.outString("%s table is empty!\n", store.GetTableName());
 
-        store.RecordCount = 0;
+        recordCount = 0;
         return;
     }
 
-    uint32 recordsize = 0;
-    uint32 offset = 0;
-
-    if (store.iNumFields != result->GetFieldCount())
+    if (store.GetSrcFieldCount() != result->GetFieldCount())
     {
-        store.RecordCount = 0;
-        sLog.outError("Error in %s table, probably sql file format was updated (there should be %d fields in sql).\n", store.table, store.iNumFields);
+        recordCount = 0;
+        sLog.outError("Error in %s table, probably sql file format was updated (there should be %d fields in sql).\n", store.GetTableName(), store.GetSrcFieldCount());
         delete result;
         Log::WaitBeforeContinueIfNeed();
         exit(1);                                            // Stop server at loading broken or non-compatible table.
     }
 
     // get struct size
-    for (uint32 x = 0; x < store.oNumFields; ++x)
+    uint32 offset = 0;
+    for (uint32 x = 0; x < store.GetDstFieldCount(); ++x)
     {
-        switch(store.dst_format[x])
+        switch (store.GetDstFormat(x))
         {
             case FT_LOGIC:
                 recordsize += sizeof(bool);   break;
@@ -248,52 +245,50 @@ void SQLStorageLoaderBase<T>::Load(SQLStorage &store, bool error_at_empty /*= tr
         }
     }
 
-    char** newIndex = new char*[maxi];
-    memset(newIndex, 0, maxi*sizeof(char*));
+    // Prepare data storage and lookup storage
+    store.prepareToLoad(maxRecordId, recordCount, recordsize);
 
-    char* _data= new char[store.RecordCount * recordsize];
-    uint32 count = 0;
-    BarGoLink bar(store.RecordCount);
+    BarGoLink bar(recordCount);
     do
     {
         fields = result->Fetch();
         bar.step();
-        char* p = (char*)&_data[recordsize * count];
-        newIndex[fields[0].GetUInt32()] = p;
 
+        char* record = store.createRecord(fields[0].GetUInt32());
         offset = 0;
+
         // dependend on dest-size
-        // iterate two indexes: x over dest, y over source, y++ IFF x1=x/X
-        for (uint32 x = 0, y = 0; x < store.oNumFields; ++x)
+        // iterate two indexes: x over dest, y over source
+        //                      y++ If and only If x != FT_NA*
+        //                      x++ If and only If a value is stored
+        for (uint32 x = 0, y = 0; x < store.GetDstFieldCount();)
         {
-            switch (store.dst_format[x])
+            switch (store.GetDstFormat(x))
             {
-                // For default fill continue and do not increase y
-                case FT_NA:         storeValue((uint32)0, store, p, x, offset);         continue;
-                case FT_NA_BYTE:    storeValue((char)0, store, p, x, offset);           continue;
-                case FT_NA_FLOAT:   storeValue((float)0.0f, store, p, x, offset);       continue;
-                case FT_NA_POINTER: storeValue((char const*)NULL, store, p, x, offset); continue;
+                    // For default fill continue and do not increase y
+                case FT_NA:         storeValue((uint32)0, store, record, x, offset);         ++x; continue;
+                case FT_NA_BYTE:    storeValue((char)0, store, record, x, offset);           ++x; continue;
+                case FT_NA_FLOAT:   storeValue((float)0.0f, store, record, x, offset);       ++x; continue;
+                case FT_NA_POINTER: storeValue((char const*)NULL, store, record, x, offset); ++x; continue;
+                default:
+                    break;
             }
 
             // It is required that the input has at least as many columns set as the output requires
-            if (y >= store.iNumFields)
+            if (y >= store.GetSrcFieldCount())
                 assert(false && "SQL storage has too few columns!");
 
-            switch(store.src_format[y])
+            switch (store.GetSrcFormat(y))
             {
-                case FT_LOGIC:
-                    storeValue((bool)(fields[y].GetUInt32() > 0), store, p, x, offset); break;
-                case FT_BYTE:
-                    storeValue((char)fields[y].GetUInt8(), store, p, x, offset); break;
-                case FT_INT:
-                    storeValue((uint32)fields[y].GetUInt32(), store, p, x, offset); break;
-                case FT_FLOAT:
-                    storeValue((float)fields[y].GetFloat(), store, p, x, offset); break;
-                case FT_STRING:
-                    storeValue((char const*)fields[y].GetString(), store, p, x, offset); break;
+                case FT_LOGIC:  storeValue((bool)(fields[y].GetUInt32() > 0), store, record, x, offset);  ++x; break;
+                case FT_BYTE:   storeValue((char)fields[y].GetUInt8(), store, record, x, offset);         ++x; break;
+                case FT_INT:    storeValue((uint32)fields[y].GetUInt32(), store, record, x, offset);      ++x; break;
+                case FT_FLOAT:  storeValue((float)fields[y].GetFloat(), store, record, x, offset);        ++x; break;
+                case FT_STRING: storeValue((char const*)fields[y].GetString(), store, record, x, offset); ++x; break;
                 case FT_NA:
                 case FT_NA_BYTE:
                 case FT_NA_FLOAT:
+                    // Do Not increase x
                     break;
                 case FT_IND:
                 case FT_SORT:
@@ -302,18 +297,14 @@ void SQLStorageLoaderBase<T>::Load(SQLStorage &store, bool error_at_empty /*= tr
                     break;
                 default:
                     assert(false && "unknown format character");
+                    break;
             }
             ++y;
         }
-        ++count;
     }
     while (result->NextRow());
 
     delete result;
-
-    store.pIndex = newIndex;
-    store.MaxEntry = maxi;
-    store.data = _data;
 }
 
 #endif
diff --git a/src/shared/Database/SqlPreparedStatement.cpp b/src/shared/Database/SqlPreparedStatement.cpp
index 4311dbb5514..be717bef966 100644
--- a/src/shared/Database/SqlPreparedStatement.cpp
+++ b/src/shared/Database/SqlPreparedStatement.cpp
@@ -18,7 +18,7 @@
 
 #include "DatabaseEnv.h"
 
-SqlStmtParameters::SqlStmtParameters( int nParams )
+SqlStmtParameters::SqlStmtParameters(uint32 nParams)
 {
     //reserve memory if needed
     if(nParams > 0)
diff --git a/src/shared/Database/SqlPreparedStatement.h b/src/shared/Database/SqlPreparedStatement.h
index a96b89a1749..c18ebd24683 100644
--- a/src/shared/Database/SqlPreparedStatement.h
+++ b/src/shared/Database/SqlPreparedStatement.h
@@ -144,14 +144,14 @@ class MANGOS_DLL_SPEC SqlStmtParameters
     public:
         typedef std::vector<SqlStmtFieldData> ParameterContainer;
 
-        //reserve memory to contain all input parameters of stmt
-        explicit SqlStmtParameters(int nParams);
+        // reserve memory to contain all input parameters of stmt
+        explicit SqlStmtParameters(uint32 nParams);
 
         ~SqlStmtParameters() {}
 
-        //get amount of bound parameters
-        int boundParams() const { return int(m_params.size()); }
-        //add parameter
+        // get amount of bound parameters
+        uint32 boundParams() const { return m_params.size(); }
+        // add parameter
         void addParam(const SqlStmtFieldData& data) { m_params.push_back(data); }
         //empty SQL statement parameters. In case nParams > 1 - reserve memory for parameters
         //should help to reuse the same object with batched SQL requests
@@ -175,15 +175,15 @@ class SqlStatementID
         SqlStatementID() : m_bInitialized(false) {}
 
         int ID() const { return m_nIndex; }
-        int arguments() const { return m_nArguments; }
+        uint32 arguments() const { return m_nArguments; }
         bool initialized() const { return m_bInitialized; }
 
     private:
         friend class Database;
-        void init(int nID, int nArgs) { m_nIndex = nID; m_nArguments = nArgs; m_bInitialized = true; }
+        void init(int nID, uint32 nArgs) { m_nIndex = nID; m_nArguments = nArgs; m_bInitialized = true; }
 
         int m_nIndex;
-        int m_nArguments;
+        uint32 m_nArguments;
         bool m_bInitialized;
 };
 
@@ -202,7 +202,7 @@ class MANGOS_DLL_SPEC SqlStatement
         SqlStatement& operator=(const SqlStatement& index);
 
         int ID() const { return m_index.ID(); }
-        int arguments() const { return m_index.arguments(); }
+        uint32 arguments() const { return m_index.arguments(); }
 
         bool Execute();
         bool DirectExecute();
@@ -316,7 +316,8 @@ class MANGOS_DLL_SPEC SqlPreparedStatement
         virtual bool execute() = 0;
 
     protected:
-        SqlPreparedStatement(const std::string& fmt, SqlConnection& conn) : m_szFmt(fmt), m_nParams(0), m_nColumns(0), m_bPrepared(false), m_bIsQuery(false), m_pConn(conn) {}
+        SqlPreparedStatement(const std::string& fmt, SqlConnection& conn):
+            m_nParams(0), m_nColumns(0), m_bIsQuery(false), m_bPrepared(false), m_szFmt(fmt), m_pConn(conn) {}
 
         uint32 m_nParams;
         uint32 m_nColumns;
diff --git a/src/shared/Errors.h b/src/shared/Errors.h
index 70145da6503..aaf5b71a12a 100644
--- a/src/shared/Errors.h
+++ b/src/shared/Errors.h
@@ -20,10 +20,7 @@
 #define MANGOSSERVER_ERRORS_H
 
 #include "Common.h"
-
-#ifndef HAVE_CONFIG_H
-#  define HAVE_ACE_STACK_TRACE_H 1
-#endif
+#include "../../config.h"
 
 #ifdef HAVE_ACE_STACK_TRACE_H
 #  include "ace/Stack_Trace.h"
diff --git a/src/shared/LockedMap.h b/src/shared/LockedMap.h
new file mode 100644
index 00000000000..9f110338978
--- /dev/null
+++ b/src/shared/LockedMap.h
@@ -0,0 +1,556 @@
+/*
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/* written for use instead not locked std::map */
+
+#ifndef LOCKEDMAP_H
+#define LOCKEDMAP_H
+
+#include "Common.h"
+#include <map>
+#include <assert.h>
+
+namespace ACE_Based
+{
+    template <class Key, class T, class Compare = std::less<Key>, class Allocator = std::allocator<std::pair<const Key,T> > >
+    class LockedMap
+    {
+        public:
+
+        typedef   MANGOSR2_MUTEX_MODEL_2       LockType;
+        typedef   ACE_Read_Guard<LockType>     ReadGuard;
+        typedef   ACE_Write_Guard<LockType>    WriteGuard;
+
+        typedef typename std::map<Key, T, Compare, Allocator>::iterator               iterator;
+        typedef typename std::map<Key, T, Compare, Allocator>::const_iterator         const_iterator;
+        typedef typename std::map<Key, T, Compare, Allocator>::reverse_iterator       reverse_iterator;
+        typedef typename std::map<Key, T, Compare, Allocator>::const_reverse_iterator const_reverse_iterator;
+        typedef typename std::map<Key, T, Compare, Allocator>::allocator_type         allocator_type;
+        typedef typename std::map<Key, T, Compare, Allocator>::value_type             value_type;
+        typedef typename std::map<Key, T, Compare, Allocator>::size_type              size_type;
+        typedef typename std::map<Key, T, Compare, Allocator>::key_compare            key_compare;
+        typedef typename std::map<Key, T, Compare, Allocator>::value_compare          value_compare;
+
+        public:
+            // Constructors
+            explicit LockedMap(const Compare& comp = Compare(), const Allocator& alloc = Allocator()) : m_storage(comp, alloc)
+            {}
+
+            template <class InputIterator> LockedMap(InputIterator first, InputIterator last, const Compare& comp = Compare(), const Allocator& alloc = Allocator()) 
+                : m_storage(first, last, comp, alloc) 
+            {}
+
+            LockedMap(const LockedMap<Key, T, Compare, Allocator> & x ) : m_storage( x.m_storage ) 
+            {}
+
+            // Destructor
+            virtual ~LockedMap(void)
+            {
+                WriteGuard Guard(GetLock());
+            }
+
+            // Copy
+            LockedMap<Key, Compare, Allocator>& operator= (const LockedMap<Key,Compare,Allocator>& x) 
+            {
+                WriteGuard Guard(GetLock());
+                ReadGuard GuardX(x.GetLock());
+                m_storage = x.m_storage;
+                return *this;
+            }
+
+            // Iterators
+            iterator begin()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.begin();
+            }
+
+            iterator end()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.end();
+            }
+
+            const_iterator begin() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.begin();
+            }
+
+            const_iterator end() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.end();
+            }
+
+            reverse_iterator rbegin()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rbegin();
+            }
+
+            reverse_iterator rend()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rend();
+            }
+
+            const_reverse_iterator rbegin() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rbegin();
+            }
+
+            const_reverse_iterator rend() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rend();
+            }
+
+            // Capacity
+            size_type size(void) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.size(); 
+            }
+
+            size_type max_size(void) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.max_size();
+            }
+
+            bool empty(void) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.empty();
+            }
+
+            // Access
+            T& operator[](const Key& x) 
+            {
+                if (find(x) == end())
+                {
+                    WriteGuard Guard(GetLock());
+                    return m_storage[x];
+                }
+                else
+                {
+                    ReadGuard Guard(GetLock());
+                    return m_storage[x];
+                }
+            }
+
+            const T& operator[](const Key& x) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage[x];
+            }
+
+            // Modifiers
+            std::pair<iterator, bool> insert(const value_type& x) 
+            {
+                WriteGuard Guard(GetLock());
+                return m_storage.insert(x); 
+            }
+
+            iterator insert(iterator position, const value_type& x) 
+            {
+                WriteGuard Guard(GetLock());
+                return m_storage.insert(position, x); 
+            }
+
+            template <class InputIterator> void insert(InputIterator first, InputIterator last) 
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.insert(first, last); 
+            }
+
+            void erase(iterator pos) 
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.erase(pos); 
+            }
+
+            size_type erase(const Key& x) 
+            {
+                WriteGuard Guard(GetLock());
+                return m_storage.erase(x); 
+            }
+
+            void erase(iterator begin, iterator end) 
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.erase(begin, end); 
+            }
+
+            void swap(LockedMap<Key, T, Compare, Allocator>& x) 
+            {
+                WriteGuard Guard(GetLock());
+                WriteGuard GuardX(x.GetLock());
+                m_storage.swap(x.storage);
+            }
+
+            void clear(void) 
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.clear();
+            }
+
+            // Observers
+            key_compare key_comp(void) const 
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.key_comp();
+            }
+
+            value_compare value_comp(void) const 
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.value_comp();
+            }
+
+            // Operations
+            const_iterator find(const Key& x) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.find(x);
+            }
+
+            iterator find(const Key& x) 
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.find(x);
+            }
+
+            size_type count(const Key& x) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.count(x);
+            }
+
+            const_iterator lower_bound(const Key& x) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.lower_bound(x);
+            }
+
+            iterator lower_bound(const Key& x)
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.lower_bound(x);
+            }
+
+            const_iterator upper_bound(const Key& x) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.upper_bound(x);
+            }
+
+            iterator upper_bound(const Key& x)
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.upper_bound(x);
+            }
+
+            std::pair<const_iterator,const_iterator> equal_range(const Key& x) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.equal_range(x);
+            }
+
+            std::pair<iterator,iterator> equal_range(const Key& x)
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.equal_range(x);
+            }
+
+            // Allocator
+            allocator_type get_allocator(void) const 
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.get_allocator();
+            }
+
+            LockType&       GetLock() { return i_lock; }
+            LockType&       GetLock() const { return i_lock; }
+
+            // may be used _ONLY_ with external locking!
+            std::map<Key, T>&  getSource()
+            {
+                return m_storage;
+            }
+
+        protected:
+            mutable LockType           i_lock;
+            std::map<Key, T, Compare, Allocator>     m_storage;
+    };
+
+    template <class Key, class T, class Compare = std::less<Key>, class Allocator = std::allocator<std::pair<const Key,T> > >
+    class LockedMultiMap
+    {
+        public:
+
+        typedef   MANGOSR2_MUTEX_MODEL_2       LockType;
+        typedef   ACE_Read_Guard<LockType>     ReadGuard;
+        typedef   ACE_Write_Guard<LockType>    WriteGuard;
+
+        typedef typename std::multimap<Key, T, Compare, Allocator>::iterator               iterator;
+        typedef typename std::multimap<Key, T, Compare, Allocator>::const_iterator         const_iterator;
+        typedef typename std::multimap<Key, T, Compare, Allocator>::reverse_iterator       reverse_iterator;
+        typedef typename std::multimap<Key, T, Compare, Allocator>::const_reverse_iterator const_reverse_iterator;
+        typedef typename std::multimap<Key, T, Compare, Allocator>::allocator_type         allocator_type;
+        typedef typename std::multimap<Key, T, Compare, Allocator>::value_type             value_type;
+        typedef typename std::multimap<Key, T, Compare, Allocator>::size_type              size_type;
+        typedef typename std::multimap<Key, T, Compare, Allocator>::key_compare            key_compare;
+        typedef typename std::multimap<Key, T, Compare, Allocator>::value_compare          value_compare;
+
+        public:
+            // Constructors
+            explicit LockedMultiMap(const Compare& comp = Compare(), const Allocator& alloc = Allocator()) : m_storage(comp, alloc)
+            {}
+
+            template <class InputIterator> LockedMultiMap(InputIterator first, InputIterator last, const Compare& comp = Compare(), const Allocator& alloc = Allocator()) 
+                : m_storage(first, last, comp, alloc) 
+            {}
+
+            LockedMultiMap(const LockedMap<Key, T, Compare, Allocator> & x ) : m_storage( x.m_storage ) 
+            {}
+
+            // Destructor
+            virtual ~LockedMultiMap(void)
+            {
+                WriteGuard Guard(GetLock());
+            }
+
+            // Copy
+            LockedMultiMap<Key, Compare, Allocator>& operator= (const LockedMultiMap<Key,Compare,Allocator>& x) 
+            {
+                WriteGuard Guard(GetLock());
+                ReadGuard GuardX(x.GetLock());
+                m_storage = x.m_storage;
+                return *this;
+            }
+
+            // Iterators
+            iterator begin()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.begin();
+            }
+
+            iterator end()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.end();
+            }
+
+            const_iterator begin() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.begin();
+            }
+
+            const_iterator end() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.end();
+            }
+
+            reverse_iterator rbegin()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rbegin();
+            }
+
+            reverse_iterator rend()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rend();
+            }
+
+            const_reverse_iterator rbegin() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rbegin();
+            }
+
+            const_reverse_iterator rend() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rend();
+            }
+
+            // Capacity
+            size_type size(void) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.size(); 
+            }
+
+            size_type max_size(void) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.max_size();
+            }
+
+            bool empty(void) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.empty();
+            }
+
+            // Modifiers
+            std::pair<iterator, bool> insert(const value_type& x) 
+            {
+                WriteGuard Guard(GetLock());
+                return m_storage.insert(x); 
+            }
+
+            iterator insert(iterator position, const value_type& x) 
+            {
+                WriteGuard Guard(GetLock());
+                return m_storage.insert(position, x); 
+            }
+
+            template <class InputIterator> void insert(InputIterator first, InputIterator last) 
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.insert(first, last); 
+            }
+
+            void erase(iterator pos) 
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.erase(pos); 
+            }
+
+            size_type erase(const Key& x) 
+            {
+                WriteGuard Guard(GetLock());
+                return m_storage.erase(x); 
+            }
+
+            void erase(iterator begin, iterator end) 
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.erase(begin, end); 
+            }
+
+            void swap(LockedMap<Key, T, Compare, Allocator>& x) 
+            {
+                WriteGuard Guard(GetLock());
+                WriteGuard GuardX(x.GetLock());
+                m_storage.swap(x.storage);
+            }
+
+            void clear(void) 
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.clear();
+            }
+
+            // Observers
+            key_compare key_comp(void) const 
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.key_comp();
+            }
+
+            value_compare value_comp(void) const 
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.value_comp();
+            }
+
+            // Operations
+            const_iterator find(const Key& x) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.find(x);
+            }
+
+            iterator find(const Key& x) 
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.find(x);
+            }
+
+            size_type count(const Key& x) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.count(x);
+            }
+
+            const_iterator lower_bound(const Key& x) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.lower_bound(x);
+            }
+
+            iterator lower_bound(const Key& x)
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.lower_bound(x);
+            }
+
+            const_iterator upper_bound(const Key& x) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.upper_bound(x);
+            }
+
+            iterator upper_bound(const Key& x)
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.upper_bound(x);
+            }
+
+            std::pair<const_iterator,const_iterator> equal_range(const Key& x) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.equal_range(x);
+            }
+
+            std::pair<iterator,iterator> equal_range(const Key& x)
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.equal_range(x);
+            }
+
+            // Allocator
+            allocator_type get_allocator(void) const 
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.get_allocator();
+            }
+
+            LockType&       GetLock() { return i_lock; }
+            LockType&       GetLock() const { return i_lock; }
+
+            // may be used _ONLY_ with external locking!
+            std::multimap<Key, T>&  getSource()
+            {
+                return m_storage;
+            }
+
+        protected:
+            mutable LockType           i_lock;
+            std::multimap<Key, T, Compare, Allocator>     m_storage;
+    };
+}
+#endif
diff --git a/src/shared/LockedQueue.h b/src/shared/LockedQueue.h
index 72f699fa61c..e67d4d9ae28 100644
--- a/src/shared/LockedQueue.h
+++ b/src/shared/LockedQueue.h
@@ -19,11 +19,9 @@
 #ifndef LOCKEDQUEUE_H
 #define LOCKEDQUEUE_H
 
-#include <ace/Guard_T.h>
-#include <ace/Thread_Mutex.h>
+#include "Common.h"
 #include <deque>
 #include <assert.h>
-#include "Errors.h"
 
 namespace ACE_Based
 {
diff --git a/src/shared/LockedVector.h b/src/shared/LockedVector.h
new file mode 100644
index 00000000000..9ff81e1fb41
--- /dev/null
+++ b/src/shared/LockedVector.h
@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* based on LockedQueue class from MaNGOS */
+/* written for use instead not locked std::list && std::vector */
+
+#ifndef LOCKEDVECTOR_H
+#define LOCKEDVECTOR_H
+
+#include "Common.h"
+#include <vector>
+#include <list>
+#include <assert.h>
+
+namespace ACE_Based
+{
+    template <class T, class Allocator = std::allocator<T> >
+    class LockedVector
+    {
+        public:
+
+        typedef   MANGOSR2_MUTEX_MODEL_2       LockType;
+        typedef   ACE_Read_Guard<LockType>     ReadGuard;
+        typedef   ACE_Write_Guard<LockType>    WriteGuard;
+
+        typedef typename std::vector<T, Allocator>::iterator               iterator;
+        typedef typename std::vector<T, Allocator>::const_iterator         const_iterator;
+        typedef typename std::vector<T, Allocator>::reverse_iterator       reverse_iterator;
+        typedef typename std::vector<T, Allocator>::const_reverse_iterator const_reverse_iterator;
+        typedef typename std::vector<T, Allocator>::allocator_type         allocator_type;
+        typedef typename std::vector<T, Allocator>::value_type             value_type;
+        typedef typename std::vector<T, Allocator>::size_type              size_type;
+        typedef typename std::vector<T, Allocator>::difference_type        difference_type;
+
+        public:
+            //Constructors
+            explicit LockedVector(const Allocator& alloc = Allocator()) : m_storage(alloc)
+            {}
+
+            explicit LockedVector(size_type n, const T& value = T(), const Allocator& alloc = Allocator())
+                : m_storage(n,value,alloc)
+            {}
+
+            virtual ~LockedVector(void)
+            {
+                WriteGuard Guard(GetLock());
+            }
+
+            void reserve(size_type idx)
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.reserve(idx);
+            }
+
+            // Methods
+            void push_back(const T& item)
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.push_back(item);
+            }
+
+            void insert(iterator pos, size_type n, const T& u ) 
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.insert( pos, n, u ); 
+            }
+
+            template <class InputIterator> 
+            void insert(iterator pos, InputIterator begin, InputIterator end)
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.insert(pos, begin, end);
+            }
+
+            void pop_back()
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.pop_back();
+            }
+
+            void erase(size_type pos)
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.erase(m_storage.begin() + pos);
+            }
+
+            iterator erase(iterator itr)
+            {
+                WriteGuard Guard(GetLock());
+                return m_storage.erase(itr);
+            }
+
+            void remove(const T& item)
+            {
+                erase(item);
+            }
+
+            void erase(const T& item)
+            {
+                WriteGuard Guard(GetLock());
+                for (size_type i = 0; i < m_storage.size();)
+                {
+                    if (item == m_storage[i])
+                        m_storage.erase(m_storage.begin() + i);
+                    else
+                        ++i;
+                }
+            }
+
+            T* find(const T& item)
+            {
+                ReadGuard Guard(GetLock());
+                for (size_type i = 0; i < m_storage.size(); ++i)
+                {
+                    if (item == m_storage[i])
+                        return &m_storage[i];
+                }
+                return NULL;
+            }
+
+            const T* find(const T& item) const
+            {
+                ReadGuard Guard(GetLock());
+                for (size_type i = 0; i < m_storage.size(); ++i)
+                {
+                    if (item == m_storage[i])
+                        return &m_storage[i];
+                }
+                return NULL;
+            }
+
+            void clear()
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.clear();
+            }
+
+            T& operator[](size_type idx) 
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage[idx];
+            }
+
+            const T& operator[](size_type idx) const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage[idx];
+            }
+
+            T& at(size_type idx) 
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.at(idx);
+            }
+
+            T& front()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.front();
+            }
+
+            T& back()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.back();
+            }
+
+            const T& front() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.front();
+            }
+
+            const T& back() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.back();
+            }
+
+            iterator begin()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.begin();
+            }
+
+            iterator end()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.end();
+            }
+
+            const_iterator begin() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.begin();
+            }
+
+            const_iterator end() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.end();
+            }
+
+            reverse_iterator rbegin()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rbegin();
+            }
+
+            reverse_iterator rend()
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rend();
+            }
+
+            const_reverse_iterator rbegin() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rbegin();
+            }
+
+            const_reverse_iterator rend() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.rend();
+            }
+
+            bool empty() const
+            {
+                ReadGuard Guard(GetLock());
+                return    m_storage.empty();
+            }
+
+            size_type size() const
+            {
+                ReadGuard Guard(GetLock());
+                return    m_storage.size();
+            }
+
+            LockedVector& operator=(const std::vector<T> &v)
+            {
+                clear();
+                WriteGuard Guard(GetLock());
+                for (typename std::vector<T>::const_iterator i = v.begin(); i != v.end(); ++i) 
+                {
+                    this->push_back(*i);
+                }
+                return *this;
+            }
+
+            LockedVector(const std::vector<T> &v)
+            {
+                WriteGuard Guard(GetLock());
+                for (typename std::vector<T>::const_iterator i = v.begin(); i != v.end(); ++i) 
+                {
+                    this->push_back(*i);
+                }
+            }
+
+            LockedVector& operator=(const std::list<T> &v)
+            {
+                clear();
+                WriteGuard Guard(GetLock());
+                for (typename std::list<T>::const_iterator i = v.begin(); i != v.end(); ++i) 
+                {
+                    this->push_back(*i);
+                }
+                return *this;
+            }
+
+            LockedVector(const std::list<T> &v)
+            {
+                WriteGuard Guard(GetLock());
+                for (typename std::list<T>::const_iterator i = v.begin(); i != v.end(); ++i) 
+                {
+                    this->push_back(*i);
+                }
+            }
+
+            LockedVector& operator=(const LockedVector<T> &v)
+            {
+                WriteGuard Guard(GetLock());
+                ReadGuard GuardX(v.GetLock());
+                m_storage = v.m_storage;
+                return *this;
+            }
+
+            LockedVector(const LockedVector<T> &v)
+            {
+                WriteGuard Guard(GetLock());
+                ReadGuard GuardX(v.GetLock());
+                m_storage = v.m_storage;
+            }
+
+            void swap(LockedVector<T, Allocator>& x)
+            {
+                WriteGuard Guard(GetLock());
+                WriteGuard GuardX(x.GetLock());
+                m_storage.swap(x.m_storage); 
+            }
+
+            void resize(size_type num, T def = T())
+            {
+                WriteGuard Guard(GetLock());
+                m_storage.resize(num, def);
+            }
+
+            //Allocator
+            allocator_type get_allocator() const
+            {
+                ReadGuard Guard(GetLock());
+                return m_storage.get_allocator(); 
+            }
+
+            // Sort template
+            template <typename C>
+            void sort(C& compare)
+            {
+                iterator _begin = begin();
+                iterator _end   = end();
+                WriteGuard Guard(GetLock());
+                std::stable_sort(_begin,_end,compare);
+            }
+
+            LockType&       GetLock() { return i_lock; }
+            LockType&       GetLock() const { return i_lock; }
+
+            // may be used _ONLY_ with external locking!
+            std::vector<T>&  getSource()
+            {
+                return m_storage;
+            }
+
+        protected:
+            mutable LockType           i_lock;
+            std::vector<T, Allocator>  m_storage;
+    };
+}
+#endif
diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp
index 8921f956e85..7c819b41bb3 100644
--- a/src/shared/Log.cpp
+++ b/src/shared/Log.cpp
@@ -18,7 +18,7 @@
 
 #include "Common.h"
 #include "Log.h"
-#include "Policies/SingletonImp.h"
+#include "Policies/Singleton.h"
 #include "Config/Config.h"
 #include "Util.h"
 #include "ByteBuffer.h"
@@ -30,7 +30,7 @@
 
 #include "ace/OS_NS_unistd.h"
 
-INSTANTIATE_SINGLETON_1( Log );
+INSTANTIATE_SINGLETON_1(Log);
 
 LogFilterData logFilterData[LOG_FILTER_COUNT] =
 {
@@ -40,8 +40,8 @@ LogFilterData logFilterData[LOG_FILTER_COUNT] =
     { "achievement_updates", "LogFilter_AchievementUpdates", true  },
     { "weather",             "LogFilter_Weather",            true  },
     { "player_stats",        "LogFilter_PlayerStats",        false },
-    { "sql_text",            "LogFilter_SQLText",            false },
-    { "player_moves",        "LogFilter_PlayerMoves",        false },
+    { "sql_text",            "LogFilter_SQLText",            true  },
+    { "player_moves",        "LogFilter_PlayerMoves",        true  },
     { "periodic_effects",    "LogFilter_PeriodicAffects",    false },
     { "ai_and_movegens",     "LogFilter_AIAndMovegens",      false },
     { "damage",              "LogFilter_Damage",             false },
@@ -51,6 +51,9 @@ LogFilterData logFilterData[LOG_FILTER_COUNT] =
     { "ahbot_seller",        "LogFilter_AhbotSeller",        true  },
     { "ahbot_buyer",         "LogFilter_AhbotBuyer",         true  },
     { "pathfinding",         "LogFilter_Pathfinding",        true  },
+    { "map_loading",         "LogFilter_MapLoading",         true  },
+    { "event_ai_dev",        "LogFilter_EventAiDev",         true  },
+    { "calendar",            "LogFilter_Calendar",           true  },
 };
 
 enum LogType
@@ -65,7 +68,7 @@ const int LogType_count = int(LogError) +1;
 
 Log::Log() :
     raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL),
-    dberLogfile(NULL), m_colored(false), m_includeTime(false), m_gmlog_per_account(false)
+    dberLogfile(NULL), eventAiErLogfile(NULL), scriptErrLogFile(NULL), worldLogfile(NULL), m_colored(false), m_includeTime(false), m_gmlog_per_account(false), m_scriptLibName(NULL)
 {
     Initialize();
 }
@@ -259,11 +262,18 @@ void Log::Initialize()
         }
     }
 
-    charLogfile = openLogFile("CharLogFile","CharLogTimestamp","a");
-    dberLogfile = openLogFile("DBErrorLogFile",NULL,"a");
-    raLogfile = openLogFile("RaLogFile",NULL,"a");
-    worldLogfile = openLogFile("WorldLogFile","WorldLogTimestamp","a");
+    charLogfile = openLogFile("CharLogFile", "CharLogTimestamp", "a");
+    dberLogfile = openLogFile("DBErrorLogFile", NULL, "a");
+    eventAiErLogfile = openLogFile("EventAIErrorLogFile", NULL, "a");
+    raLogfile = openLogFile("RaLogFile", NULL, "a");
+    worldLogfile = openLogFile("WorldLogFile", "WorldLogTimestamp", "a");
 
+    ReloadConfigDefaults();
+
+}
+
+void Log::ReloadConfigDefaults()
+{
     // Main log file settings
     m_includeTime  = sConfig.GetBoolDefault("LogTime", false);
     m_logLevel     = LogLevel(sConfig.GetIntDefault("LogLevel", 0));
@@ -271,10 +281,16 @@ void Log::Initialize()
     InitColors(sConfig.GetStringDefault("LogColors", ""));
 
     m_logFilter = 0;
-    for(int i = 0; i < LOG_FILTER_COUNT; ++i)
+    for (int i = 0; i < LOG_FILTER_COUNT; ++i)
+    {
         if (*logFilterData[i].name)
+        {
             if (sConfig.GetBoolDefault(logFilterData[i].configName, logFilterData[i].defaultState))
                 m_logFilter |= (1 << i);
+            else
+                m_logFilter &= ~(1 << i);
+        }
+    }
 
     // Char log settings
     m_charLog_Dump = sConfig.GetBoolDefault("CharLogDump", false);
@@ -513,7 +529,82 @@ void Log::outErrorDb( const char * err, ... )
     fflush(stderr);
 }
 
-void Log::outBasic( const char * str, ... )
+void Log::outErrorEventAI()
+{
+    if (m_includeTime)
+        outTime();
+
+    fprintf(stderr, "\n");
+
+    if (logfile)
+    {
+        outTimestamp(logfile);
+        fprintf(logfile, "ERROR CreatureEventAI\n");
+        fflush(logfile);
+    }
+
+    if (eventAiErLogfile)
+    {
+        outTimestamp(eventAiErLogfile);
+        fprintf(eventAiErLogfile, "\n");
+        fflush(eventAiErLogfile);
+    }
+
+    fflush(stderr);
+}
+
+void Log::outErrorEventAI(const char* err, ...)
+{
+    if (!err)
+        return;
+
+    if (m_colored)
+        SetColor(false, m_colors[LogError]);
+
+    if (m_includeTime)
+        outTime();
+
+    va_list ap;
+
+    va_start(ap, err);
+    vutf8printf(stderr, err, &ap);
+    va_end(ap);
+
+    if (m_colored)
+        ResetColor(false);
+
+    fprintf(stderr, "\n");
+
+    if (logfile)
+    {
+        outTimestamp(logfile);
+        fprintf(logfile, "ERROR CreatureEventAI: ");
+
+        va_start(ap, err);
+        vfprintf(logfile, err, ap);
+        va_end(ap);
+
+        fprintf(logfile, "\n");
+        fflush(logfile);
+    }
+
+    if (eventAiErLogfile)
+    {
+        outTimestamp(eventAiErLogfile);
+
+        va_list ap;
+        va_start(ap, err);
+        vfprintf(eventAiErLogfile, err, ap);
+        va_end(ap);
+
+        fprintf(eventAiErLogfile, "\n");
+        fflush(eventAiErLogfile);
+    }
+
+    fflush(stderr);
+}
+
+void Log::outBasic(const char* str, ...)
 {
     if (!str)
         return;
@@ -712,7 +803,88 @@ void Log::outChar(const char * str, ... )
     }
 }
 
-void Log::outWorldPacketDump( uint32 socket, uint32 opcode, char const* opcodeName, ByteBuffer const* packet, bool incoming )
+void Log::outErrorScriptLib()
+{
+    if (m_includeTime)
+        outTime();
+
+    fprintf(stderr, "\n");
+
+    if (logfile)
+    {
+        outTimestamp(logfile);
+        if (m_scriptLibName)
+            fprintf(logfile, "<%s ERROR:> ", m_scriptLibName);
+        else
+            fprintf(logfile, "<Scripting Library ERROR>: ");
+        fflush(logfile);
+    }
+
+    if (scriptErrLogFile)
+    {
+        outTimestamp(scriptErrLogFile);
+        fprintf(scriptErrLogFile, "\n");
+        fflush(scriptErrLogFile);
+    }
+
+    fflush(stderr);
+}
+
+void Log::outErrorScriptLib(const char* err, ...)
+{
+    if (!err)
+        return;
+
+    if (m_colored)
+        SetColor(false, m_colors[LogError]);
+
+    if (m_includeTime)
+        outTime();
+
+    va_list ap;
+
+    va_start(ap, err);
+    vutf8printf(stderr, err, &ap);
+    va_end(ap);
+
+    if (m_colored)
+        ResetColor(false);
+
+    fprintf(stderr, "\n");
+
+    if (logfile)
+    {
+        outTimestamp(logfile);
+        if (m_scriptLibName)
+            fprintf(logfile, "<%s ERROR>: ", m_scriptLibName);
+        else
+            fprintf(logfile, "<Scripting Library ERROR>: ");
+
+        va_start(ap, err);
+        vfprintf(logfile, err, ap);
+        va_end(ap);
+
+        fprintf(logfile, "\n");
+        fflush(logfile);
+    }
+
+    if (scriptErrLogFile)
+    {
+        outTimestamp(scriptErrLogFile);
+
+        va_list ap;
+        va_start(ap, err);
+        vfprintf(scriptErrLogFile, err, ap);
+        va_end(ap);
+
+        fprintf(scriptErrLogFile, "\n");
+        fflush(scriptErrLogFile);
+    }
+
+    fflush(stderr);
+}
+
+void Log::outWorldPacketDump(uint32 socket, uint32 opcode, char const* opcodeName, ByteBuffer const* packet, bool incoming)
 {
     if (!worldLogfile)
         return;
@@ -787,7 +959,25 @@ void Log::WaitBeforeContinueIfNeed()
     }
 }
 
-void outstring_log(const char * str, ...)
+void Log::setScriptLibraryErrorFile(char const* fname, char const* libName)
+{
+    m_scriptLibName = libName;
+
+    if (scriptErrLogFile)
+        fclose(scriptErrLogFile);
+
+    if (!fname)
+    {
+        scriptErrLogFile = NULL;
+        return;
+    }
+
+    std::string fileName = m_logsDir;
+    fileName.append(fname);
+    scriptErrLogFile = fopen(fileName.c_str(), "a");
+}
+
+void outstring_log(const char* str, ...)
 {
     if (!str)
         return;
@@ -856,3 +1046,22 @@ void error_db_log(const char * str, ...)
 
     sLog.outErrorDb("%s", buf);
 }
+
+void setScriptLibraryErrorFile(char const* fname, char const* libName)
+{
+    sLog.setScriptLibraryErrorFile(fname, libName);
+}
+
+void script_error_log(const char* str, ...)
+{
+    if (!str)
+        return;
+
+    char buf[256];
+    va_list ap;
+    va_start(ap, str);
+    vsnprintf(buf, 256, str, ap);
+    va_end(ap);
+
+    sLog.outErrorScriptLib("%s", buf);
+}
diff --git a/src/shared/Log.h b/src/shared/Log.h
index 491ba7b9618..f1afee42524 100644
--- a/src/shared/Log.h
+++ b/src/shared/Log.h
@@ -53,9 +53,12 @@ enum LogFilters
     LOG_FILTER_AHBOT_SELLER       = 0x004000,               // 14 Auction House Bot seller part
     LOG_FILTER_AHBOT_BUYER        = 0x008000,               // 15 Auction House Bot buyer part
     LOG_FILTER_PATHFINDING        = 0x010000,               // 16 Pathfinding
+    LOG_FILTER_MAP_LOADING        = 0x020000,               // 17 Map loading/unloading (MAP, VMAPS, MMAP)
+    LOG_FILTER_EVENT_AI_DEV       = 0x040000,               // 18 Event AI actions
+    LOG_FILTER_CALENDAR           = 0x080000,               // 19 Calendar
 };
 
-#define LOG_FILTER_COUNT            17
+#define LOG_FILTER_COUNT            20
 
 struct LogFilterData
 {
@@ -87,39 +90,51 @@ enum Color
 
 const int Color_count = int(WHITE)+1;
 
-class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Thread_Mutex> >
+class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, MANGOSR2_MUTEX_MODEL_2> >
 {
-    friend class MaNGOS::OperatorNew<Log>;
-    Log();
-
-    ~Log()
-    {
-        if( logfile != NULL )
-            fclose(logfile);
-        logfile = NULL;
-
-        if( gmLogfile != NULL )
-            fclose(gmLogfile);
-        gmLogfile = NULL;
-
-        if (charLogfile != NULL)
-            fclose(charLogfile);
-        charLogfile = NULL;
-
-        if( dberLogfile != NULL )
-            fclose(dberLogfile);
-        dberLogfile = NULL;
-
-        if (raLogfile != NULL)
-            fclose(raLogfile);
-        raLogfile = NULL;
-
-        if (worldLogfile != NULL)
-            fclose(worldLogfile);
-        worldLogfile = NULL;
-    }
+        friend class MaNGOS::OperatorNew<Log>;
+
+    public:
+        Log();
+
+        ~Log()
+        {
+            if (logfile != NULL)
+                fclose(logfile);
+            logfile = NULL;
+
+            if (gmLogfile != NULL)
+                fclose(gmLogfile);
+            gmLogfile = NULL;
+
+            if (charLogfile != NULL)
+                fclose(charLogfile);
+            charLogfile = NULL;
+
+            if (dberLogfile != NULL)
+                fclose(dberLogfile);
+            dberLogfile = NULL;
+
+            if (eventAiErLogfile != NULL)
+                fclose(eventAiErLogfile);
+            eventAiErLogfile = NULL;
+
+            if (scriptErrLogFile != NULL)
+                fclose(scriptErrLogFile);
+            scriptErrLogFile = NULL;
+
+            if (raLogfile != NULL)
+                fclose(raLogfile);
+            raLogfile = NULL;
+
+            if (worldLogfile != NULL)
+                fclose(worldLogfile);
+            worldLogfile = NULL;
+        }
+
     public:
         void Initialize();
+        void ReloadConfigDefaults();
         void InitColors(const std::string& init_str);
 
         void outCommand( uint32 account, const char * str, ...) ATTR_PRINTF(3,4);
@@ -137,14 +152,23 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
 
         void outErrorDb();                                  // any log level
                                                             // any log level
-        void outErrorDb( const char * str, ... )     ATTR_PRINTF(2,3);
-                                                            // any log level
-        void outChar( const char * str, ... )        ATTR_PRINTF(2,3);
-                                                            // any log level
-        void outWorldPacketDump( uint32 socket, uint32 opcode, char const* opcodeName, ByteBuffer const* packet, bool incoming );
+        void outErrorDb(const char* str, ...)     ATTR_PRINTF(2, 3);
+        // any log level
+        void outChar(const char* str, ...)        ATTR_PRINTF(2, 3);
+
+        void outErrorEventAI();                             // any log level
+        // any log level
+        void outErrorEventAI(const char* str, ...)      ATTR_PRINTF(2, 3);
+
+        void outErrorScriptLib();                           // any log level
+        // any log level
+        void outErrorScriptLib(const char* str, ...)     ATTR_PRINTF(2, 3);
+
+        void outWorldPacketDump(uint32 socket, uint32 opcode, char const* opcodeName, ByteBuffer const* packet, bool incoming);
         // any log level
-        void outCharDump( const char * str, uint32 account_id, uint32 guid, const char * name );
-        void outRALog( const char * str, ... )       ATTR_PRINTF(2,3);
+        void outCharDump(const char* str, uint32 account_id, uint32 guid, const char* name);
+        void outRALog(const char* str, ...)       ATTR_PRINTF(2, 3);
+
         uint32 GetLogLevel() const { return m_logLevel; }
         void SetLogLevel(char * Level);
         void SetLogFileLevel(char * Level);
@@ -160,6 +184,10 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
         bool IsIncludeTime() const { return m_includeTime; }
 
         static void WaitBeforeContinueIfNeed();
+
+        // Set filename for scriptlibrary error output
+        void setScriptLibraryErrorFile(char const* fname, char const* libName);
+
     private:
         FILE* openLogFile(char const* configFileName,char const* configTimeStampFlag, char const* mode);
         FILE* openGmlogPerAccount(uint32 account);
@@ -169,6 +197,8 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
         FILE* gmLogfile;
         FILE* charLogfile;
         FILE* dberLogfile;
+        FILE* eventAiErLogfile;
+        FILE* scriptErrLogFile;
         FILE* worldLogfile;
 
         // log/console control
@@ -189,6 +219,8 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
         // gm log control
         bool m_gmlog_per_account;
         std::string m_gmlog_filename_format;
+
+        char const* m_scriptLibName;
 };
 
 #define sLog MaNGOS::Singleton<Log>::Instance()
@@ -239,9 +271,12 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
     ERROR_DB_FILTER_LOG(LOG_FILTER_DB_STRICTED_CHECK, __VA_ARGS__)
 
 // primary for script library
-void MANGOS_DLL_SPEC outstring_log(const char * str, ...) ATTR_PRINTF(1,2);
-void MANGOS_DLL_SPEC detail_log(const char * str, ...) ATTR_PRINTF(1,2);
-void MANGOS_DLL_SPEC debug_log(const char * str, ...) ATTR_PRINTF(1,2);
-void MANGOS_DLL_SPEC error_log(const char * str, ...) ATTR_PRINTF(1,2);
-void MANGOS_DLL_SPEC error_db_log(const char * str, ...) ATTR_PRINTF(1,2);
+void MANGOS_DLL_SPEC outstring_log(const char* str, ...) ATTR_PRINTF(1, 2);
+void MANGOS_DLL_SPEC detail_log(const char* str, ...) ATTR_PRINTF(1, 2);
+void MANGOS_DLL_SPEC debug_log(const char* str, ...) ATTR_PRINTF(1, 2);
+void MANGOS_DLL_SPEC error_log(const char* str, ...) ATTR_PRINTF(1, 2);
+void MANGOS_DLL_SPEC error_db_log(const char* str, ...) ATTR_PRINTF(1, 2);
+void MANGOS_DLL_SPEC setScriptLibraryErrorFile(char const* fname, char const* libName);
+void MANGOS_DLL_SPEC script_error_log(const char* str, ...) ATTR_PRINTF(1, 2);
+
 #endif
diff --git a/src/shared/MangosR2MembarMutex.h b/src/shared/MangosR2MembarMutex.h
new file mode 100644
index 00000000000..d313b6d3bfa
--- /dev/null
+++ b/src/shared/MangosR2MembarMutex.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2011-2013 /dev/rsa && Boxa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _MANGOSR2_MEMBAR_MUTEX_INCLUDED
+#define _MANGOSR2_MEMBAR_MUTEX_INCLUDED
+
+#if defined (WIN32) || defined (WIN64)
+    #define MANGOSR2_ATOMIC_LOCK_TYPE volatile mutable uint32
+    #define MANGOSR2_ATOMIC_LOCK_BEGIN(lockHolder) while (InterlockedExchange(&lockHolder, 1)) SwitchToThread()
+    #define MANGOSR2_ATOMIC_LOCK_END(lockHolder) InterlockedExchange(&lockHolder, 0)
+    #define MANGOSR2_ATOMIC_LOCK_WAIT(lockHolder) MANGOSR2_ATOMIC_LOCK_BEGIN(lockHolder); MANGOSR2_ATOMIC_LOCK_END(lockHolder)
+    #define MANGOSR2_ATOMIC_LOCK_TRYBEGIN(lockHolder) InterlockedExchange(&lockHolder, 1)
+#else
+    #define MANGOSR2_ATOMIC_LOCK_TYPE volatile mutable uint32
+    #define MANGOSR2_ATOMIC_LOCK_BEGIN(lockHolder) while (__sync_val_compare_and_swap(&lockHolder, 0, 1)) sched_yield()
+    #define MANGOSR2_ATOMIC_LOCK_END(lockHolder) __sync_val_compare_and_swap(&lockHolder, 1, 0)
+    #define MANGOSR2_ATOMIC_LOCK_WAIT(lockHolder) MANGOSR2_ATOMIC_LOCK_BEGIN(lockHolder); MANGOSR2_ATOMIC_LOCK_END(lockHolder)
+    #define MANGOSR2_ATOMIC_LOCK_TRYBEGIN(lockHolder) __sync_val_compare_and_swap(&lockHolder, 0, 1)
+#endif
+
+class MangosR2_Mutex
+{
+    public:
+        MangosR2_Mutex() : RefLock(0) {}
+
+        ~MangosR2_Mutex() {}
+
+        int remove() { RefLock = 0; return 0; }
+
+        int acquire() { MANGOSR2_ATOMIC_LOCK_BEGIN(RefLock); return 0; }
+
+        /// Return -1 with @c errno == @c ETIME.
+        int acquire(ACE_Time_Value&) { return -1; }
+
+        /// Return -1 with @c errno == @c ETIME.
+        int acquire(ACE_Time_Value*) { return -1; }
+ 
+        int tryacquire() { if (MANGOSR2_ATOMIC_LOCK_TRYBEGIN(RefLock)) return -1; else return 0; }
+ 
+        int release() { MANGOSR2_ATOMIC_LOCK_END(RefLock); return 0; }
+ 
+        int acquire_write() {return acquire(); }
+ 
+        int tryacquire_write() {return tryacquire(); }
+ 
+        /// Return 0.
+        int tryacquire_write_upgrade() { return 0; }
+ 
+        int acquire_read() { return acquire(); }
+ 
+        int tryacquire_read() { return tryacquire(); }
+ 
+        /// Dump the state of an object.
+        void dump () const {}
+
+    private:
+        MANGOSR2_ATOMIC_LOCK_TYPE RefLock;
+};
+
+#endif //_MANGOSR2_MEMBAR_MUTEX_INCLUDED
diff --git a/src/shared/ObjectHandler.h b/src/shared/ObjectHandler.h
new file mode 100644
index 00000000000..448b07d9c06
--- /dev/null
+++ b/src/shared/ObjectHandler.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011-2012 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOS_OBJECTHANDLER_H
+#define MANGOS_OBJECTHANDLER_H
+
+#include "Common.h"
+
+#ifndef OBJECT_HANDLER
+#  define OBJECT_HANDLER(TYPE,NAME) typedef ACE_Refcounted_Auto_Ptr<TYPE,ACE_Null_Mutex> NAME;
+#endif
+
+#ifndef OBJECT_SAFE_HANDLER
+#  define OBJECT_SAFE_HANDLER(TYPE,NAME) typedef ACE_Refcounted_Auto_Ptr<TYPE, MANGOSR2_MUTEX_MODEL_2> NAME;
+#endif
+
+class SpellAuraHolder;
+class UnitAction;
+class VehicleKit;
+class Map;
+class TerrainInfo;
+class GridMap;
+namespace VMAP { class WorldModel; };
+
+#ifndef NOTSAFE_SEMAPHORE_OVERHANDLING
+    OBJECT_SAFE_HANDLER(TerrainInfo,TerrainInfoPtr);
+    OBJECT_SAFE_HANDLER(GridMap,GridMapPtr);
+    OBJECT_SAFE_HANDLER(SpellAuraHolder,SpellAuraHolderPtr);
+    OBJECT_SAFE_HANDLER(VMAP::WorldModel, WorldModelPtr);
+    OBJECT_SAFE_HANDLER(VehicleKit,VehicleKitPtr);
+#else
+    OBJECT_HANDLER(SpellAuraHolder,SpellAuraHolderPtr);
+    OBJECT_HANDLER(TerrainInfo,TerrainInfoPtr);
+    OBJECT_HANDLER(GridMap,GridMapPtr);
+    OBJECT_HANDLER(VMAP::WorldModel, WorldModelPtr);
+    OBJECT_HANDLER(VehicleKit,VehicleKitPtr);
+#endif
+
+OBJECT_HANDLER(UnitAction,UnitActionPtr);
+OBJECT_HANDLER(Map,MapPtr);
+
+#endif
diff --git a/src/shared/ObjectUpdateTaskBase.h b/src/shared/ObjectUpdateTaskBase.h
new file mode 100644
index 00000000000..bfb1323988b
--- /dev/null
+++ b/src/shared/ObjectUpdateTaskBase.h
@@ -0,0 +1,347 @@
+/*
+ * Copyright (C) 2011-2013 /dev/rsa for MangosR2 <http://github.com/MangosR2>
+ * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _OBJECT_UPDATE_TASK_BASE_H_INCLUDED
+#define _OBJECT_UPDATE_TASK_BASE_H_INCLUDED
+
+#include <ace/Activation_Queue.h>
+#include <ace/Condition_Thread_Mutex.h>
+#include <ace/Method_Request.h>
+#include <ace/Task.h>
+
+#include "Common.h"
+#include "Timer.h"
+
+#define MAX_PARENT_THREADS 255
+
+template <class T> class ObjectUpdateRequest : public ACE_Method_Request
+{
+
+    protected:
+        T&           m_obj;
+        uint32       m_diff;
+        uint32 const m_startTime;
+
+    public:
+        ObjectUpdateRequest(T& m, uint32 diff)
+            : m_obj(m), m_diff(diff), m_startTime(WorldTimer::getMSTime())
+        {
+        }
+
+        virtual int call()
+        {
+            m_obj.Update(m_diff);
+            return 0;
+        }
+
+        virtual T* getObject()
+        {
+            return &m_obj;
+        }
+
+        virtual uint32 getStartTime() const
+        {
+            return m_startTime;
+        }
+};
+
+template <class T> class ObjectUpdateTaskBase : protected ACE_Task_Base
+{
+    public:
+
+        ObjectUpdateTaskBase()
+            : m_mutex(), m_condition(m_mutex), m_rwmutex(),  m_currentThreadsCount(0), m_round(false)
+        {
+            if (activated())
+                deactivate();
+            m_lastError.clear();
+        }
+
+        virtual ~ObjectUpdateTaskBase()
+        {
+            deactivate();
+        }
+
+        typedef typename std::map<ACE_thread_t , ObjectUpdateRequest<T>* > ThreadsMap;
+
+        ObjectUpdateTaskBase<T>* instance()
+        {
+            return ACE_Singleton<ObjectUpdateTaskBase<T>, ACE_Thread_Mutex>::instance();
+        }
+
+        int svc()
+        {
+            while (true)
+            {
+                if (m_round)
+                    m_condition.broadcast();
+                if (ACE_Method_Request* rq = m_queue.dequeue())
+                {
+                    T* obj = ((ObjectUpdateRequest<T>*)rq)->getObject();
+                    if (obj)
+                    {
+                        statistic_hook_begin(obj);
+                        setThreadInfo(ACE_OS::thr_self(), (ObjectUpdateRequest<T>*)rq);
+                        rq->call();
+                        setThreadInfo(ACE_OS::thr_self(), NULL);
+                        statistic_hook_end(obj);
+                    }
+                    if (rq)
+                        delete rq;
+
+                    if (!m_round)
+                        m_condition.broadcast();
+                }
+                else
+                {
+                    outError("ObjectUpdateTaskBase::svc failed to get sheduled object from queue!");
+                    break;
+                }
+            }
+            --m_currentThreadsCount;
+            m_condition.broadcast();
+            return 0;
+        }
+
+        T* getObject(ACE_thread_t thread_num)
+        {
+            typename ThreadsMap::iterator itr = m_threadsMap.find(thread_num);
+            return itr == m_threadsMap.end() ?  NULL : itr->second->getObject();
+        }
+
+        virtual int schedule_update(T& obj, uint32 diff)
+        {
+            if (m_round)
+            {
+                outError("ObjectUpdateTaskBase::shedule_update called while update round started!");
+                return -1;
+            }
+
+            if (execute(new ObjectUpdateRequest<T>(obj, diff)) == -1)
+            {
+                outError("ObjectUpdateTaskBase::schedule_update failed to schedule Object Update");
+                return -1;
+            }
+            return 0;
+        }
+
+        int execute(ObjectUpdateRequest<T>* new_req)
+        {
+            if (new_req == NULL)
+                return -1;
+
+            while (m_queue.is_full())
+                m_condition.wait();
+
+            if (m_queue.enqueue((ACE_Method_Request*)new_req, (ACE_Time_Value*)&ACE_Time_Value::zero) == -1)
+            {
+                delete new_req;
+                outError("ObjectUpdateTaskBase::execute enqueue failed!");
+                return -1;
+            }
+            return 0;
+        }
+
+        int queue_wait(uint32 maxDelay = 0 /*msec*/)
+        {
+            if (m_round)
+            {
+                outError("ObjectUpdateTaskBase::queue_wait try start with already beginned round!");
+                return -1;
+            }
+
+            ACE_Guard<ACE_Thread_Mutex> guard(m_mutex, true);
+            m_round = true;
+            statistic_hook_round_barrier();
+            ACE_Time_Value absTime = ACE_OS::gettimeofday() + ACE_Time_Value(0, maxDelay * 1000);
+            int result = 0;
+
+            while (m_currentThreadsCount > 0 && (!m_queue.is_empty() || getActiveThreadsCount() > 0))
+            {
+                int res = m_condition.wait((maxDelay == 0) ? NULL : &absTime);
+                if (res == -1)
+                {
+                    if (freeze_hook() == 1 || (m_queue.is_empty() && getActiveThreadsCount() == 0))
+                    {
+                        result = getActiveThreadsCount();
+                        break;
+                    }
+                }
+            }
+            statistic_hook_round_end();
+            m_round = false;
+            return result;
+        }
+
+        int activate(size_t num_threads)
+        {
+            if (activated() || num_threads < 1)
+                return -1;
+
+            ACE_Guard<ACE_Thread_Mutex> guard(m_mutex, true);
+            m_queue.queue()->activate();
+            if (ACE_Task_Base::activate(THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED, num_threads) == -1)
+            {
+                m_queue.queue()->deactivate();
+                return -1;
+            }
+
+            ACE_thread_t threads[MAX_PARENT_THREADS];
+            thr_mgr()->thread_list(this, threads, num_threads);
+
+            m_threadsMap.clear();
+            for (size_t i = 0; i < num_threads; ++i)
+                m_threadsMap[threads[i]] = NULL;
+
+            m_currentThreadsCount = num_threads;
+            m_currentActiveThreadsCount = 0;
+
+            return 1;
+        }
+
+        int deactivate()
+        {
+            if (!activated())
+                return -1;
+
+            if (getCurrentThreadsCount() > 0)
+            {
+                ACE_thread_t threads[MAX_PARENT_THREADS];
+                size_t num_threads = thr_mgr() ? thr_mgr()->thread_list(this, threads, MAX_PARENT_THREADS) : 0;
+                if (num_threads > 0)
+                {
+                    for (size_t i = 0; i < num_threads; ++i)
+                        kill_thread(threads[i], true);
+                }
+            }
+
+            ACE_Guard<ACE_Thread_Mutex> guard(m_mutex, true);
+            m_queue.queue()->deactivate();
+            wait();
+            m_threadsMap.clear();
+            m_currentThreadsCount = 0;
+            m_currentActiveThreadsCount = 0;
+            return 0;
+        }
+
+        void reactivate(uint32 threads)
+        {
+            statistic_hook_round_begin();
+            if (m_currentThreadsCount == threads && activated())
+                return;
+
+            deactivate();
+            activate(threads);
+        }
+
+        bool activated() const
+        {
+            return !m_queue.queue()->deactivated();
+        }
+
+        void kill_thread(ACE_thread_t threadId, bool needKill)
+        {
+            if (needKill)
+            {
+                //thr_mgr()->kill(threadId, SIGABRT);
+                thr_mgr()->cancel(threadId, 0);
+                setThreadInfo(threadId, NULL);
+                --m_currentThreadsCount;
+            }
+        }
+
+        // thread information block
+        void setThreadInfo(ACE_thread_t threadId, ObjectUpdateRequest<T>* rq)
+        {
+            ObjectUpdateRequest<T>* oldrq = getThreadInfo(threadId);
+            ACE_Write_Guard<ACE_RW_Thread_Mutex> guardRW(m_rwmutex, true);
+            if (rq && !oldrq)
+                ++m_currentActiveThreadsCount;
+            else if (!rq && oldrq)
+                --m_currentActiveThreadsCount;
+
+            m_threadsMap[ACE_OS::thr_self()] = rq;
+        }
+
+        size_t getActiveThreadsCount()
+        {
+            ACE_Read_Guard<ACE_RW_Thread_Mutex> guardRW(m_rwmutex, true);
+            return m_currentActiveThreadsCount;
+        }
+
+        ObjectUpdateRequest<T>* getThreadInfo(ACE_thread_t threadId)
+        {
+            ACE_Read_Guard<ACE_RW_Thread_Mutex> guardRW(m_rwmutex, true);
+            typename ThreadsMap::iterator itr = m_threadsMap.find(threadId);
+            return itr == m_threadsMap.end() ? NULL : itr->second;
+        }
+
+        void outError(char const* str, ...)
+        {
+            if (!str)
+                return;
+
+            va_list ap;
+            va_start(ap, str);
+            char buffer[255];
+            sprintf(buffer, str, &ap);
+            va_end(ap);
+            m_lastError.clear();
+            m_lastError.append(buffer);
+        }
+
+        std::string getLastError()
+        {
+            std::string temp = m_lastError;
+            m_lastError.clear();
+            return temp;
+        }
+
+        size_t getCurrentThreadsCount() const
+        {
+            return m_currentThreadsCount;
+        }
+
+        // Freeze reaction hook
+        virtual int freeze_hook()                   { return 0; } /* 0 - no reaction, 1 - force end waiting*/
+
+        // Statistic block (for load analyze)
+        virtual void statistic_hook_begin(T* obj)   {}
+        virtual void statistic_hook_end(T* obj)     {}
+
+        virtual void statistic_hook_round_begin()   {}
+        virtual void statistic_hook_round_barrier() {}
+        virtual void statistic_hook_round_end()     {}
+
+        // External periodical update hook (for statistic mostly)
+        virtual int update_hook()                   { return 0; }
+
+    protected:
+        ACE_Thread_Mutex           m_mutex;
+        ACE_Condition_Thread_Mutex m_condition;
+        ACE_RW_Thread_Mutex        m_rwmutex;
+        ACE_Activation_Queue       m_queue;
+        ThreadsMap                 m_threadsMap;
+        size_t                     m_currentThreadsCount;
+        size_t                     m_currentActiveThreadsCount;
+        bool                       m_round;
+        std::string                m_lastError;
+};
+
+#endif //_OBJECT_UPDATE_TASK_BASE_H_INCLUDED
diff --git a/src/shared/ProgressBar.cpp b/src/shared/ProgressBar.cpp
index 50a9ec5df3e..9fb4876d677 100644
--- a/src/shared/ProgressBar.cpp
+++ b/src/shared/ProgressBar.cpp
@@ -35,18 +35,6 @@ BarGoLink::BarGoLink(int row_count)
     init(row_count);
 }
 
-BarGoLink::BarGoLink(uint32 row_count)
-{
-    MANGOS_ASSERT(row_count < (uint32)ACE_INT32_MAX);
-    init((int)row_count);
-}
-
-BarGoLink::BarGoLink(uint64 row_count)
-{
-    MANGOS_ASSERT(row_count < (uint64)ACE_INT32_MAX);
-    init((int)row_count);
-}
-
 BarGoLink::~BarGoLink()
 {
     if (!m_showOutput)
diff --git a/src/shared/ProgressBar.h b/src/shared/ProgressBar.h
index 586c4f27c4b..a7311eb18ce 100644
--- a/src/shared/ProgressBar.h
+++ b/src/shared/ProgressBar.h
@@ -24,8 +24,6 @@ class MANGOS_DLL_SPEC BarGoLink
 {
     public:                                                 // constructors
         explicit BarGoLink(int row_count);
-        explicit BarGoLink(uint32 row_count);               // row_count < ACE_INT32_MAX
-        explicit BarGoLink(uint64 row_count);               // row_count < ACE_INT32_MAX
         ~BarGoLink();
 
     public:                                                 // modifiers
diff --git a/src/shared/ServiceWin32.cpp b/src/shared/ServiceWin32.cpp
index b88a6db260d..cfaccc64a0e 100644
--- a/src/shared/ServiceWin32.cpp
+++ b/src/shared/ServiceWin32.cpp
@@ -24,6 +24,11 @@
 #include <windows.h>
 #include <winsvc.h>
 
+// Solve conflict with ACE
+#ifdef main
+#undef main
+#endif
+
 #if !defined(WINADVAPI)
 #if !defined(_ADVAPI32_)
 #define WINADVAPI DECLSPEC_IMPORT
diff --git a/src/shared/SystemConfig.h b/src/shared/SystemConfig.h
new file mode 100644
index 00000000000..5496fa6b046
--- /dev/null
+++ b/src/shared/SystemConfig.h
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef MANGOS_SYSTEMCONFIG_H
+#define MANGOS_SYSTEMCONFIG_H
+
+#ifndef _PACKAGENAME
+#define _PACKAGENAME "MangosR2"
+#endif
+
+#include "../../config.h"
+#include "Platform/Define.h"
+
+#ifndef _VERSION
+# define _VERSION(REVN) MANGOS_VERSION " (Revision " REVN ")"
+#endif
+
+#ifndef _R2VERSION
+# define _R2VERSION(REVD,REVT,REVN,REVH) "mangosR2 branch" " (" REVD " " REVT " R2 Revision " REVN " commit " REVH ")"
+#endif
+
+// Format is YYYYMMDDRR where RR is the change in the conf file
+// for that day.
+#ifndef _MANGOSDCONFVERSION
+# define _MANGOSDCONFVERSION 2013012201
+#endif
+#ifndef _REALMDCONFVERSION
+# define _REALMDCONFVERSION 2010062001
+#endif
+
+#if MANGOS_ENDIAN == MANGOS_BIGENDIAN
+# define _ENDIAN_STRING "big-endian"
+#else
+# define _ENDIAN_STRING "little-endian"
+#endif
+
+#if defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_IX86)
+# define ARCHITECTURE "x32"
+#elif defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(_M_X64)
+# define ARCHITECTURE "x64"
+#elif defined(__ia64)  || defined(__IA64__)  || defined(_M_IA64)
+# define ARCHITECTURE "IA64"
+#else
+# define ARCHITECTURE "x32"
+#endif
+
+// The path to config files
+#ifndef SYSCONFDIR
+#  define SYSCONFDIR        ""
+#endif
+
+#if PLATFORM == PLATFORM_WINDOWS
+# ifdef _WIN64
+#  define _ENDIAN_PLATFORM "Win64 (" _ENDIAN_STRING ")"
+# else
+#  define _ENDIAN_PLATFORM "Win32 (" _ENDIAN_STRING ")"
+# endif
+# define _MANGOSD_CONFIG  SYSCONFDIR"mangosd.conf"
+# define _REALMD_CONFIG   SYSCONFDIR"realmd.conf"
+# define _AUCTIONHOUSEBOT_CONFIG   SYSCONFDIR"ahbot.conf"
+#else
+# if defined  (__FreeBSD__)
+#  define _ENDIAN_PLATFORM "FreeBSD_" ARCHITECTURE " (" _ENDIAN_STRING ")"
+# elif defined(__NetBSD__)
+#  define _ENDIAN_PLATFORM "NetBSD_" ARCHITECTURE " (" _ENDIAN_STRING ")"
+# elif defined(__OpenBSD__)
+#  define _ENDIAN_PLATFORM "OpenBSD_" ARCHITECTURE " (" _ENDIAN_STRING ")"
+# elif defined(__DragonFly__)
+#  define _ENDIAN_PLATFORM "DragonFlyBSD_" ARCHITECTURE " (" _ENDIAN_STRING ")"
+# elif defined(__APPLE__)
+#  define _ENDIAN_PLATFORM "MacOSX_" ARCHITECTURE " (" _ENDIAN_STRING ")"
+# elif defined(__linux) || defined(__linux__)
+#  define _ENDIAN_PLATFORM "Linux_" ARCHITECTURE " (" _ENDIAN_STRING ")"
+# else
+#  define _ENDIAN_PLATFORM "Unix_" ARCHITECTURE " (" _ENDIAN_STRING ")"
+# endif
+# define _MANGOSD_CONFIG  SYSCONFDIR"mangosd.conf"
+# define _REALMD_CONFIG  SYSCONFDIR"realmd.conf"
+# define _AUCTIONHOUSEBOT_CONFIG   SYSCONFDIR"ahbot.conf"
+#endif
+
+#define _FULLVERSION(REVN) _PACKAGENAME "/" _VERSION(REVN)
+#define _R2FULLVERSION(REVD,REVT,REVN,REVH) _R2VERSION(REVD,REVT,REVN,REVH) " for " _ENDIAN_PLATFORM
+
+#define EXPECTED_MANGOSD_CLIENT_BUILD {12340, 0}
+
+#define CLIENT_VERSION 12340
+
+#if CLIENT_VERSION >= 16057
+    #define MAX_EXPANSION 4
+#elif CLIENT_VERSION >= 13623
+    #define MAX_EXPANSION 3
+#elif CLIENT_VERSION > 8606
+    #define MAX_EXPANSION 2
+#elif CLIENT_VERSION > 6005
+    #define MAX_EXPANSION 1
+#else
+    #define MAX_EXPANSION 0
+#endif
+
+#define DEFAULT_PLAYER_LIMIT 100
+#define DEFAULT_WORLDSERVER_PORT 8085                       //8129
+#define DEFAULT_REALMSERVER_PORT 3724
+#endif
diff --git a/src/shared/SystemConfig.h.in b/src/shared/SystemConfig.h.in
index 7d105d01baf..5496fa6b046 100644
--- a/src/shared/SystemConfig.h.in
+++ b/src/shared/SystemConfig.h.in
@@ -20,23 +20,24 @@
 #define MANGOS_SYSTEMCONFIG_H
 
 #ifndef _PACKAGENAME
-#define _PACKAGENAME "MaNGOS"
+#define _PACKAGENAME "MangosR2"
 #endif
 
+#include "../../config.h"
 #include "Platform/Define.h"
 
 #ifndef _VERSION
-#if PLATFORM == PLATFORM_WINDOWS
-# define _VERSION(REVD,REVT,REVN,REVH) "0.17.0-DEV" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
-#else
-# define _VERSION(REVD,REVT,REVN,REVH) "@VERSION@" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
+# define _VERSION(REVN) MANGOS_VERSION " (Revision " REVN ")"
 #endif
+
+#ifndef _R2VERSION
+# define _R2VERSION(REVD,REVT,REVN,REVH) "mangosR2 branch" " (" REVD " " REVT " R2 Revision " REVN " commit " REVH ")"
 #endif
 
 // Format is YYYYMMDDRR where RR is the change in the conf file
 // for that day.
 #ifndef _MANGOSDCONFVERSION
-# define _MANGOSDCONFVERSION 2010100901
+# define _MANGOSDCONFVERSION 2013012201
 #endif
 #ifndef _REALMDCONFVERSION
 # define _REALMDCONFVERSION 2010062001
@@ -74,26 +75,43 @@
 # define _AUCTIONHOUSEBOT_CONFIG   SYSCONFDIR"ahbot.conf"
 #else
 # if defined  (__FreeBSD__)
-#  define _ENDIAN_PLATFORM "FreeBSD_"ARCHITECTURE" (" _ENDIAN_STRING ")"
+#  define _ENDIAN_PLATFORM "FreeBSD_" ARCHITECTURE " (" _ENDIAN_STRING ")"
 # elif defined(__NetBSD__)
-#  define _ENDIAN_PLATFORM "NetBSD_"ARCHITECTURE" (" _ENDIAN_STRING ")"
+#  define _ENDIAN_PLATFORM "NetBSD_" ARCHITECTURE " (" _ENDIAN_STRING ")"
 # elif defined(__OpenBSD__)
-#  define _ENDIAN_PLATFORM "OpenBSD_"ARCHITECTURE" (" _ENDIAN_STRING ")"
+#  define _ENDIAN_PLATFORM "OpenBSD_" ARCHITECTURE " (" _ENDIAN_STRING ")"
 # elif defined(__DragonFly__)
-#  define _ENDIAN_PLATFORM "DragonFlyBSD_"ARCHITECTURE" (" _ENDIAN_STRING ")"
+#  define _ENDIAN_PLATFORM "DragonFlyBSD_" ARCHITECTURE " (" _ENDIAN_STRING ")"
 # elif defined(__APPLE__)
-#  define _ENDIAN_PLATFORM "MacOSX_"ARCHITECTURE" (" _ENDIAN_STRING ")"
+#  define _ENDIAN_PLATFORM "MacOSX_" ARCHITECTURE " (" _ENDIAN_STRING ")"
 # elif defined(__linux) || defined(__linux__)
-#  define _ENDIAN_PLATFORM "Linux_"ARCHITECTURE" (" _ENDIAN_STRING ")"
+#  define _ENDIAN_PLATFORM "Linux_" ARCHITECTURE " (" _ENDIAN_STRING ")"
 # else
-#  define _ENDIAN_PLATFORM "Unix_"ARCHITECTURE" (" _ENDIAN_STRING ")"
+#  define _ENDIAN_PLATFORM "Unix_" ARCHITECTURE " (" _ENDIAN_STRING ")"
 # endif
 # define _MANGOSD_CONFIG  SYSCONFDIR"mangosd.conf"
 # define _REALMD_CONFIG  SYSCONFDIR"realmd.conf"
 # define _AUCTIONHOUSEBOT_CONFIG   SYSCONFDIR"ahbot.conf"
 #endif
 
-#define _FULLVERSION(REVD,REVT,REVN,REVH) _PACKAGENAME "/" _VERSION(REVD,REVT,REVN,REVH) " for " _ENDIAN_PLATFORM
+#define _FULLVERSION(REVN) _PACKAGENAME "/" _VERSION(REVN)
+#define _R2FULLVERSION(REVD,REVT,REVN,REVH) _R2VERSION(REVD,REVT,REVN,REVH) " for " _ENDIAN_PLATFORM
+
+#define EXPECTED_MANGOSD_CLIENT_BUILD {12340, 0}
+
+#define CLIENT_VERSION 12340
+
+#if CLIENT_VERSION >= 16057
+    #define MAX_EXPANSION 4
+#elif CLIENT_VERSION >= 13623
+    #define MAX_EXPANSION 3
+#elif CLIENT_VERSION > 8606
+    #define MAX_EXPANSION 2
+#elif CLIENT_VERSION > 6005
+    #define MAX_EXPANSION 1
+#else
+    #define MAX_EXPANSION 0
+#endif
 
 #define DEFAULT_PLAYER_LIMIT 100
 #define DEFAULT_WORLDSERVER_PORT 8085                       //8129
diff --git a/src/shared/Threading.cpp b/src/shared/Threading.cpp
index 3adfae669b1..c047ca996d6 100644
--- a/src/shared/Threading.cpp
+++ b/src/shared/Threading.cpp
@@ -134,10 +134,13 @@ bool Thread::start()
     if (m_task == 0 || m_iThreadId != 0)
         return false;
 
+    // incRef before spawing the thread, otherwise Thread::ThreadTask() might call decRef and delete m_task 
+    m_task->incReference();
+
     bool res = (ACE_Thread::spawn(&Thread::ThreadTask, (void*)m_task, THREADFLAG, &m_iThreadId, &m_hThreadHandle) == 0);
 
-    if (res)
-        m_task->incReference();
+    if (!res)
+        m_task->decReference();
 
     return res;
 }
@@ -227,8 +230,8 @@ void Thread::setPriority(Priority type)
 #ifndef __sun__
     int _priority = m_TpEnum.getPriority(type);
     int _ok = ACE_Thread::setprio(m_hThreadHandle, _priority);
-    //remove this ASSERT in case you don't want to know is thread priority change was successful or not
-    MANGOS_ASSERT (_ok == 0);
+    // remove this ASSERT in case you don't want to know is thread priority change was successful or not
+    MANGOS_ASSERT (_ok == 0 || (_ok == -1 && errno == ENOTSUP));
 #endif
 }
 
diff --git a/src/shared/Threading.h b/src/shared/Threading.h
index 14cd8ff7679..360ae9463f6 100644
--- a/src/shared/Threading.h
+++ b/src/shared/Threading.h
@@ -19,6 +19,7 @@
 #ifndef THREADING_H
 #define THREADING_H
 
+#include "Common.h"
 #include <ace/Thread.h>
 #include <ace/TSS_T.h>
 #include "ace/Atomic_Op.h"
@@ -39,7 +40,7 @@ namespace ACE_Based
                     delete this;
             }
         private:
-            ACE_Atomic_Op<ACE_Thread_Mutex, long> m_refs;
+            ACE_Atomic_Op<ACE_Thread_Mutex, uint32> m_refs;
     };
 
     enum Priority
diff --git a/src/shared/Timer.h b/src/shared/Timer.h
index 7f10c061110..a1f6d0d3a26 100644
--- a/src/shared/Timer.h
+++ b/src/shared/Timer.h
@@ -27,7 +27,7 @@ class WorldTimer
     public:
 
         //get current server time
-        static uint32 getMSTime();
+        static MANGOS_DLL_SPEC uint32 getMSTime();
 
         //get time difference between two timestamps
         static inline uint32 getMSTimeDiff(const uint32& oldMSTime, const uint32& newMSTime)
@@ -57,8 +57,8 @@ class WorldTimer
         //analogue to getMSTime() but it persists m_SystemTickTime
         static uint32 getMSTime_internal(bool savetime = false);
 
-        static MANGOS_DLL_SPEC uint32 m_iTime;
-        static MANGOS_DLL_SPEC uint32 m_iPrevTime;
+        static MANGOS_DLL_SPEC ACE_Atomic_Op<MANGOSR2_MUTEX_MODEL_2, uint32> m_iTime;
+        static MANGOS_DLL_SPEC ACE_Atomic_Op<MANGOSR2_MUTEX_MODEL_2, uint32> m_iPrevTime;
 };
 
 class IntervalTimer
diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp
index 19a62912299..b3f2dd14d6f 100644
--- a/src/shared/Util.cpp
+++ b/src/shared/Util.cpp
@@ -29,22 +29,22 @@ static MTRandTSS mtRand;
 
 static ACE_Time_Value g_SystemTickTime = ACE_OS::gettimeofday();
 
-uint32 WorldTimer::m_iTime = 0;
-uint32 WorldTimer::m_iPrevTime = 0;
+ACE_Atomic_Op<MANGOSR2_MUTEX_MODEL_2, uint32> WorldTimer::m_iTime = 0;
+ACE_Atomic_Op<MANGOSR2_MUTEX_MODEL_2, uint32> WorldTimer::m_iPrevTime = 0;
 
-uint32 WorldTimer::tickTime() { return m_iTime; }
-uint32 WorldTimer::tickPrevTime() { return m_iPrevTime; }
+uint32 WorldTimer::tickTime() { return m_iTime.value(); }
+uint32 WorldTimer::tickPrevTime() { return m_iPrevTime.value(); }
 
 uint32 WorldTimer::tick()
 {
     //save previous world tick time
-    m_iPrevTime = m_iTime;
+    m_iPrevTime = m_iTime.value();
 
     //get the new one and don't forget to persist current system time in m_SystemTickTime
     m_iTime = WorldTimer::getMSTime_internal(true);
 
     //return tick diff
-    return getMSTimeDiff(m_iPrevTime, m_iTime);
+    return getMSTimeDiff(m_iPrevTime.value(), m_iTime.value());
 }
 
 uint32 WorldTimer::getMSTime()
@@ -108,41 +108,38 @@ float rand_chance_f(void)
     return (float)mtRand->randExc (100.0);
 }
 
-Tokens StrSplit(const std::string &src, const std::string &sep)
+Tokens::Tokens(const std::string &src, const char sep, uint32 vectorReserve)
 {
-    Tokens r;
-    std::string s;
-    for (std::string::const_iterator i = src.begin(); i != src.end(); ++i)
+    m_str = new char[src.length() + 1];
+    memcpy(m_str, src.c_str(), src.length() + 1);
+
+    if (vectorReserve)
+        reserve(vectorReserve);
+
+    char* posold = m_str;
+    char* posnew = m_str;
+
+    for (;;)
     {
-        if (sep.find(*i) != std::string::npos)
+        if (*posnew == sep)
         {
-            if (s.length()) r.push_back(s);
-            s = "";
+            push_back(posold);
+            posold = posnew + 1;
+
+            *posnew = 0x00;
         }
-        else
+        else if (*posnew == 0x00)
         {
-            s += *i;
-        }
-    }
-    if (s.length()) r.push_back(s);
-    return r;
-}
-
-uint32 GetUInt32ValueFromArray(Tokens const& data, uint16 index)
-{
-    if(index >= data.size())
-        return 0;
+            // Hack like, but the old code accepted these kind of broken strings,
+            // so changing it would break other things
+            if (posold != posnew)
+                push_back(posold);
 
-    return (uint32)atoi(data[index].c_str());
-}
-
-float GetFloatValueFromArray(Tokens const& data, uint16 index)
-{
-    float result;
-    uint32 temp = GetUInt32ValueFromArray(data,index);
-    memcpy(&result, &temp, sizeof(result));
+            break;
+        }
 
-    return result;
+        ++posnew;
+    }
 }
 
 void stripLineInvisibleChars(std::string &str)
@@ -491,11 +488,11 @@ bool Utf8FitTo(const std::string& str, std::wstring search)
     return true;
 }
 
-void utf8printf(FILE *out, const char *str, ...)
+void utf8printf(FILE* out, const char* str, ...)
 {
     va_list ap;
     va_start(ap, str);
-    vutf8printf(stdout, str, &ap);
+    vutf8printf(out, str, &ap);
     va_end(ap);
 }
 
@@ -534,4 +531,31 @@ void hexEncodeByteArray(uint8* bytes, uint32 arrayLen, std::string& result)
         }
     }
     result = ss.str();
-}
\ No newline at end of file
+}
+
+time_t timeBitFieldsToTimeStamp(uint32 bits)
+{
+    time_t tim = time(NULL);
+    tm* t = localtime(&tim);
+    t->tm_min = bits & 0x3F;
+    t->tm_sec = 0;
+    t->tm_hour = bits >> 6 & 0x1F;
+    t->tm_mday = (bits >> 14 & 0x3F) + 1;
+    t->tm_mon = bits >> 20 & 0xF;
+    t->tm_year = (bits >> 24 & 0xFF) + 100;
+
+    return mktime(t);
+}
+
+uint32 secsToTimeBitFields(time_t secs)
+{
+    tm* lt = localtime(&secs);
+    return (lt->tm_year - 100) << 24 | lt->tm_mon  << 20 | (lt->tm_mday - 1) << 14 | lt->tm_wday << 11 | lt->tm_hour << 6 | lt->tm_min;
+}
+
+float GetExactDistance2d(float x1, float y1, float x2, float y2)
+{
+    float dx = x1 - x2;
+    float dy = y1 - y2;
+    return sqrt(dx * dx + dy * dy);
+}
diff --git a/src/shared/Util.h b/src/shared/Util.h
index b4476f77dba..1fccd0caa5b 100644
--- a/src/shared/Util.h
+++ b/src/shared/Util.h
@@ -24,11 +24,13 @@
 #include <string>
 #include <vector>
 
-typedef std::vector<std::string> Tokens;
+struct Tokens: public std::vector<char*>
+{
+    Tokens(const std::string &src, const char sep, uint32 vectorReserve = 0);
+    ~Tokens() { delete[] m_str; }
 
-Tokens StrSplit(const std::string &src, const std::string &sep);
-uint32 GetUInt32ValueFromArray(Tokens const& data, uint16 index);
-float GetFloatValueFromArray(Tokens const& data, uint16 index);
+    char* m_str;
+};
 
 void stripLineInvisibleChars(std::string &src);
 
@@ -36,11 +38,8 @@ std::string secsToTimeString(time_t timeInSecs, bool shortText = false, bool hou
 uint32 TimeStringToSecs(const std::string& timestring);
 std::string TimeToTimestampStr(time_t t);
 
-inline uint32 secsToTimeBitFields(time_t secs)
-{
-    tm* lt = localtime(&secs);
-    return (lt->tm_year - 100) << 24 | lt->tm_mon  << 20 | (lt->tm_mday - 1) << 14 | lt->tm_wday << 11 | lt->tm_hour << 6 | lt->tm_min;
-}
+time_t timeBitFieldsToTimeStamp(uint32 bits);
+uint32 secsToTimeBitFields(time_t secs);
 
 /* Return a random number in the range min..max; (max-min) must be smaller than 32768. */
 MANGOS_DLL_SPEC int32 irand(int32 min, int32 max);
@@ -101,7 +100,9 @@ inline void ApplyPercentModFloatVar(float& var, float val, bool apply)
 {
     if (val == -100.0f)     // prevent set var to zero
         val = -99.99f;
-    var *= (apply?(100.0f+val)/100.0f : 100.0f / (100.0f+val));
+
+    val += 100.0f;
+    var *= (apply ? val / 100.0f : 100.0f / val);
 }
 
 bool Utf8toWStr(const std::string& utf8str, std::wstring& wstr);
@@ -260,12 +261,12 @@ inline bool isEastAsianString(std::wstring wstr, bool numericOrSpace)
 
 inline void strToUpper(std::string& str)
 {
-    std::transform( str.begin(), str.end(), str.begin(), toupper );
+    std::transform( str.begin(), str.end(), str.begin(), (int(*)(int))toupper );
 }
 
 inline void strToLower(std::string& str)
 {
-    std::transform( str.begin(), str.end(), str.begin(), tolower );
+    std::transform( str.begin(), str.end(), str.begin(), (int(*)(int))tolower );
 }
 
 inline wchar_t wcharToUpper(wchar_t wchar)
@@ -341,4 +342,23 @@ bool IsIPAddress(char const* ipaddress);
 uint32 CreatePIDFile(const std::string& filename);
 
 void hexEncodeByteArray(uint8* bytes, uint32 arrayLen, std::string& result);
+
+/* Round float value to "pct" accuracy */
+inline float round_pct(float value)
+{
+    return ((value < 0.0f ? ceil(value * 100.0f - 0.5f) : floor(value * 100.0f + 0.5f))/100.0f);
+};
+
+// SGI STL select1st implementation
+template<typename T_PAIR>
+struct select1st: public std::unary_function<T_PAIR, typename T_PAIR::first_type>
+{
+    const typename T_PAIR::first_type& operator()(const T_PAIR& container) const
+    {
+        return container.first;
+    }
+};
+
+MANGOS_DLL_SPEC float GetExactDistance2d(float x1, float y1, float x2, float y2);
+
 #endif
diff --git a/src/shared/WheatyExceptionReport.cpp b/src/shared/WheatyExceptionReport.cpp
index d37019e08c3..6393ae85571 100644
--- a/src/shared/WheatyExceptionReport.cpp
+++ b/src/shared/WheatyExceptionReport.cpp
@@ -3,6 +3,7 @@
 // MSDN Magazine, 2002
 // FILE: WheatyExceptionReport.CPP
 //==========================================
+#ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #pragma warning(disable:4996)
 #pragma warning(disable:4312)
@@ -16,7 +17,7 @@
 #include "WheatyExceptionReport.h"
 #include "revision.h"
 #include "revision_nr.h"
-#define CrashFolder _T("Crashs")
+#define CrashFolder _T("Crashes")
 //#pragma comment(linker, "/defaultlib:dbghelp.lib")
 
 inline LPTSTR ErrorMessage(DWORD dw)
@@ -42,6 +43,7 @@ TCHAR WheatyExceptionReport::m_szLogFileName[MAX_PATH];
 LPTOP_LEVEL_EXCEPTION_FILTER WheatyExceptionReport::m_previousFilter;
 HANDLE WheatyExceptionReport::m_hReportFile;
 HANDLE WheatyExceptionReport::m_hProcess;
+SymbolPairs WheatyExceptionReport::symbols;
 
 // Declare global instance of class
 WheatyExceptionReport g_WheatyExceptionReport;
@@ -60,8 +62,10 @@ WheatyExceptionReport::WheatyExceptionReport( )             // Constructor
 //============
 WheatyExceptionReport::~WheatyExceptionReport( )
 {
-    if(m_previousFilter)
-        SetUnhandledExceptionFilter( m_previousFilter );
+    if (m_previousFilter)
+        SetUnhandledExceptionFilter(m_previousFilter);
+
+    ClearSymbols();
 }
 
 //===========================================================
@@ -89,18 +93,17 @@ PEXCEPTION_POINTERS pExceptionInfo )
     SYSTEMTIME systime;
     GetLocalTime(&systime);
     sprintf(m_szLogFileName, "%s\\%s_[%u-%u_%u-%u-%u].txt",
-        crash_folder_path, pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond
-        );
-
-    m_hReportFile = CreateFile( m_szLogFileName,
-        GENERIC_WRITE,
-        0,
-        0,
-        OPEN_ALWAYS,
-        FILE_FLAG_WRITE_THROUGH,
-        0 );
-
-    if ( m_hReportFile )
+            crash_folder_path, pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
+
+    m_hReportFile = CreateFile(m_szLogFileName,
+                               GENERIC_WRITE,
+                               0,
+                               0,
+                               OPEN_ALWAYS,
+                               FILE_FLAG_WRITE_THROUGH,
+                               0);
+
+    if (m_hReportFile)
     {
         SetFilePointer( m_hReportFile, 0, 0, FILE_END );
 
@@ -159,149 +162,62 @@ BOOL WheatyExceptionReport::_GetWindowsVersion(TCHAR* szVersion, DWORD cntMax)
     }
     *szVersion = _T('\0');
     TCHAR wszTmp[128];
-    switch (osvi.dwPlatformId)
+
+    // print version
+    switch (osvi.dwMajorVersion)
     {
-        // Windows NT product family.
-        case VER_PLATFORM_WIN32_NT:
-            // Test for the specific product family.
-            if (osvi.dwMajorVersion == 6)
-                _tcsncat(szVersion, _T("Windows Vista or Windows Server 2008 "), cntMax);
-            if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
-                _tcsncat(szVersion, _T("Microsoft Windows Server 2003 "), cntMax);
-            if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1)
-                _tcsncat(szVersion, _T("Microsoft Windows XP "), cntMax);
-            if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
-                _tcsncat(szVersion, _T("Microsoft Windows 2000 "), cntMax);
-            if (osvi.dwMajorVersion <= 4 )
-                _tcsncat(szVersion, _T("Microsoft Windows NT "), cntMax);
-
-            // Test for specific product on Windows NT 4.0 SP6 and later.
-            if (bOsVersionInfoEx)
+        case 6:
+            switch (osvi.dwMinorVersion)
             {
-                // Test for the workstation type.
-            #if WINVER < 0x0500
-                if (osvi.wReserved[1] == VER_NT_WORKSTATION)
-            #else
+                default: // 2
                     if (osvi.wProductType == VER_NT_WORKSTATION)
-            #endif                                          // WINVER < 0x0500
-            {
-                if (osvi.dwMajorVersion == 4)
-                    _tcsncat(szVersion, _T("Workstation 4.0 "), cntMax);
-                #if WINVER < 0x0500
-                else if (osvi.wReserved[0] & VER_SUITE_PERSONAL)
-                #else
-                    else if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
-                #endif                                      // WINVER < 0x0500
-                        _tcsncat(szVersion, _T("Home Edition "), cntMax);
-                #if WINVER < 0x0500
-                else if (osvi.wReserved[0] & VER_SUITE_EMBEDDEDNT)
-                #else
-                    else if (osvi.wSuiteMask & VER_SUITE_EMBEDDEDNT)
-                #endif                                      // WINVER < 0x0500
-                        _tcsncat(szVersion, _T("Embedded "), cntMax);
-                else
-                    _tcsncat(szVersion, _T("Professional "), cntMax);
-            }
-            // Test for the server type.
-            #if WINVER < 0x0500
-            else if (osvi.wReserved[1] == VER_NT_SERVER)
-            #else
-                else if (osvi.wProductType == VER_NT_SERVER)
-            #endif                                          // WINVER < 0x0500
-            {
-                if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
-                {
-                    #if WINVER < 0x0500
-                    if (osvi.wReserved[0] & VER_SUITE_DATACENTER)
-                    #else
-                        if (osvi.wSuiteMask & VER_SUITE_DATACENTER)
-                    #endif                                  // WINVER < 0x0500
-                            _tcsncat(szVersion, _T("Datacenter Edition "), cntMax);
-                    #if WINVER < 0x0500
-                    else if (osvi.wReserved[0] & VER_SUITE_ENTERPRISE)
-                    #else
-                        else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)
-                    #endif                                  // WINVER < 0x0500
-                            _tcsncat(szVersion, _T("Enterprise Edition "), cntMax);
-                    #if WINVER < 0x0500
-                    else if (osvi.wReserved[0] == VER_SUITE_BLADE)
-                    #else
-                        else if (osvi.wSuiteMask == VER_SUITE_BLADE)
-                    #endif                                  // WINVER < 0x0500
-                            _tcsncat(szVersion, _T("Web Edition "), cntMax);
+                        _tcsncat(szVersion, _T("Windows 8 "), cntMax);
                     else
-                        _tcsncat(szVersion, _T("Standard Edition "), cntMax);
-                }
-                else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
-                {
-                    #if WINVER < 0x0500
-                    if (osvi.wReserved[0] & VER_SUITE_DATACENTER)
-                    #else
-                        if (osvi.wSuiteMask & VER_SUITE_DATACENTER)
-                    #endif                                  // WINVER < 0x0500
-                            _tcsncat(szVersion, _T("Datacenter Server "), cntMax);
-                    #if WINVER < 0x0500
-                    else if (osvi.wReserved[0] & VER_SUITE_ENTERPRISE )
-                    #else
-                        else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
-                    #endif                                  // WINVER < 0x0500
-                            _tcsncat(szVersion, _T("Advanced Server "), cntMax);
+                        _tcsncat(szVersion, _T("Windows Server 2012 "), cntMax);
+                    break;
+                case 1:
+                    if (osvi.wProductType == VER_NT_WORKSTATION)
+                        _tcsncat(szVersion, _T("Windows 7 "), cntMax);
                     else
-                        _tcsncat(szVersion, _T("Server "), cntMax);
-                }
-                else                                        // Windows NT 4.0
-                {
-                    #if WINVER < 0x0500
-                    if (osvi.wReserved[0] & VER_SUITE_ENTERPRISE)
-                    #else
-                        if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)
-                    #endif                                  // WINVER < 0x0500
-                            _tcsncat(szVersion, _T("Server 4.0, Enterprise Edition "), cntMax);
+                        _tcsncat(szVersion, _T("Windows Server 2008 R2 "), cntMax);
+                    break;
+                case 0:
+                    if (osvi.wProductType == VER_NT_WORKSTATION)
+                        _tcsncat(szVersion, _T("Windows Vista "), cntMax);
                     else
-                        _tcsncat(szVersion, _T("Server 4.0 "), cntMax);
-                }
+                        _tcsncat(szVersion, _T("Windows Server 2008 "), cntMax);
+                    break;
             }
-        }
-        // Display service pack (if any) and build number.
-        if (osvi.dwMajorVersion == 4 && _tcsicmp(osvi.szCSDVersion, _T("Service Pack 6")) == 0)
-        {
-            HKEY hKey;
-            LONG lRet;
-
-            // Test for SP6 versus SP6a.
-            lRet = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009"), 0, KEY_QUERY_VALUE, &hKey);
-            if (lRet == ERROR_SUCCESS)
-            {
-                _stprintf(wszTmp, _T("Service Pack 6a (Version %d.%d, Build %d)"),
-                    osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
-                _tcsncat(szVersion, wszTmp, cntMax);
-            }
-            else                                            // Windows NT 4.0 prior to SP6a
+            break;
+        case 5:
+            switch (osvi.dwMinorVersion)
             {
-                _stprintf(wszTmp, _T("%s (Version %d.%d, Build %d)"),
-                    osvi.szCSDVersion, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
-                _tcsncat(szVersion, wszTmp, cntMax);
+                default: // 2
+                    _tcsncat(szVersion, _T("Windows Server 2003 "), cntMax);
+                    break;
+                case 1:
+                    _tcsncat(szVersion, _T("Windows XP "), cntMax);
+                    break;
+                case 0:
+                    _tcsncat(szVersion, _T("Windows 2000 "), cntMax);
+                    break;
             }
-            ::RegCloseKey(hKey);
-        }
-        else                                                // Windows NT 3.51 and earlier or Windows 2000 and later
-        {
-            if (!_tcslen(osvi.szCSDVersion))
-                _stprintf(wszTmp, _T("(Version %d.%d, Build %d)"),
-                    osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
-            else
-                _stprintf(wszTmp, _T("%s (Version %d.%d, Build %d)"),
-                    osvi.szCSDVersion, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
-            _tcsncat(szVersion, wszTmp, cntMax);
-        }
         break;
         default:
-            _stprintf(wszTmp, _T("%s (Version %d.%d, Build %d)"),
-                osvi.szCSDVersion, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
-            _tcsncat(szVersion, wszTmp, cntMax);
+            _tcsncat(szVersion, _T("Windows NT or lower "), cntMax);
             break;
     }
 
+    // print service pack if one is installed
+    if (_tcslen(osvi.szCSDVersion))
+        _stprintf(wszTmp, _T("%s (Version %d.%d, Build %d)"),
+                  osvi.szCSDVersion, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
+    else
+        _stprintf(wszTmp, _T("(Version %d.%d, Build %d)"),
+                  osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
+
+    _tcsncat(szVersion, wszTmp, cntMax);
+
     return TRUE;
 }
 
@@ -329,15 +245,21 @@ void WheatyExceptionReport::PrintSystemInfo()
 }
 
 //===========================================================================
-void WheatyExceptionReport::printTracesForAllThreads()
+void WheatyExceptionReport::printTracesForAllThreads(bool bWriteVariables)
 {
-  HANDLE hThreadSnap = INVALID_HANDLE_VALUE;
-  THREADENTRY32 te32;
+    THREADENTRY32 te32;
 
-  DWORD dwOwnerPID = GetCurrentProcessId();
-  m_hProcess = GetCurrentProcess();
+    DWORD dwOwnerPID = GetCurrentProcessId();
+    m_hProcess = GetCurrentProcess();
+    if (!IsDebuggerPresent())
+    {
+        _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
+        _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
+        _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
+        _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
+    }
   // Take a snapshot of all running threads
-  hThreadSnap = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 );
+  HANDLE hThreadSnap = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 );
   if( hThreadSnap == INVALID_HANDLE_VALUE )
     return;
 
@@ -356,20 +278,22 @@ void WheatyExceptionReport::printTracesForAllThreads()
   // Now walk the thread list of the system,
   // and display information about each thread
   // associated with the specified process
-  do
-  {
-    if( te32.th32OwnerProcessID == dwOwnerPID )
+    do
     {
-        CONTEXT context;
-        context.ContextFlags = 0xffffffff;
-        HANDLE threadHandle = OpenThread(THREAD_GET_CONTEXT | THREAD_QUERY_INFORMATION,false, te32.th32ThreadID);
-        if(threadHandle && GetThreadContext(threadHandle, &context))
+        if (te32.th32OwnerProcessID == dwOwnerPID)
         {
-            WriteStackDetails( &context, false, threadHandle );
+            CONTEXT context;
+            context.ContextFlags = 0xffffffff;
+            HANDLE threadHandle = OpenThread(THREAD_GET_CONTEXT | THREAD_QUERY_INFORMATION, false, te32.th32ThreadID);
+            if (threadHandle)
+            {
+                if (GetThreadContext(threadHandle, &context))
+                    WriteStackDetails(&context, bWriteVariables, threadHandle);
+
+                CloseHandle(threadHandle);
+            }
         }
-        CloseHandle(threadHandle);
-    }
-  } while( Thread32Next(hThreadSnap, &te32 ) );
+    } while (Thread32Next(hThreadSnap, &te32));
 
 //  Don't forget to clean up the snapshot object.
   CloseHandle( hThreadSnap );
@@ -461,7 +385,7 @@ PEXCEPTION_POINTERS pExceptionInfo )
     CONTEXT trashableContext = *pCtx;
 
     WriteStackDetails( &trashableContext, false, NULL );
-    printTracesForAllThreads();
+    printTracesForAllThreads(false);
 
 //    #ifdef _M_IX86                                          // X86 Only!
 
@@ -470,13 +394,14 @@ PEXCEPTION_POINTERS pExceptionInfo )
 
     trashableContext = *pCtx;
     WriteStackDetails( &trashableContext, true, NULL );
+    printTracesForAllThreads(true);
 
     _tprintf( _T("========================\r\n") );
-    _tprintf( _T("Global Variables\r\n") );
+    /*_tprintf( _T("Global Variables\r\n") );
 
     SymEnumSymbols( GetCurrentProcess(),
-        (DWORD64)GetModuleHandle(szFaultingModule),
-        0, EnumerateSymbolsCallback, 0 );
+        (UINT_PTR)GetModuleHandle(szFaultingModule),
+        0, EnumerateSymbolsCallback, 0 );*/
   //  #endif                                                  // X86 Only!
 
     SymCleanup( GetCurrentProcess() );
@@ -547,6 +472,9 @@ PVOID addr, PTSTR szModule, DWORD len, DWORD& section, DWORD_PTR& offset )
 
     DWORD_PTR hMod = (DWORD_PTR)mbi.AllocationBase;
 
+    if (!hMod)
+        return FALSE;
+
     if ( !GetModuleFileName( (HMODULE)hMod, szModule, len ) )
         return FALSE;
 
@@ -562,9 +490,9 @@ PVOID addr, PTSTR szModule, DWORD len, DWORD& section, DWORD_PTR& offset )
 
     // Iterate through the section table, looking for the one that encompasses
     // the linear address.
-    for (   unsigned i = 0;
+    for (unsigned i = 0;
         i < pNtHdr->FileHeader.NumberOfSections;
-        i++, pSection++ )
+        ++i, ++pSection)
     {
         DWORD_PTR sectionStart = pSection->VirtualAddress;
         DWORD_PTR sectionEnd = sectionStart
@@ -663,12 +591,11 @@ bool bWriteVariables, HANDLE pThreadHandle)                 // true if local/par
 
         // Get the name of the function for this stack frame entry
         CSymbolInfoPackage sip;
-        if ( SymFromAddr(
-            m_hProcess,                                     // Process handle of the current process
-            sf.AddrPC.Offset,                               // Symbol address
-            &symDisplacement,                               // Address of the variable that will receive the displacement
-            &sip.si                                         // Address of the SYMBOL_INFO structure (inside "sip" object)
-            ))
+        if (SymFromAddr(
+                    m_hProcess,                             // Process handle of the current process
+                    sf.AddrPC.Offset,                       // Symbol address
+                    &symDisplacement,                       // Address of the variable that will receive the displacement
+                    &sip.si))                               // Address of the SYMBOL_INFO structure (inside "sip" object)
         {
             _tprintf( _T("%hs+%I64X"), sip.si.Name, symDisplacement );
 
@@ -690,7 +617,7 @@ bool bWriteVariables, HANDLE pThreadHandle)                 // true if local/par
         }
 
         // Get the source line for this stack frame entry
-        IMAGEHLP_LINE64 lineInfo = { sizeof(IMAGEHLP_LINE) };
+        IMAGEHLP_LINE64 lineInfo = { sizeof(IMAGEHLP_LINE64) };
         DWORD dwLineDisplacement;
         if ( SymGetLineFromAddr64( m_hProcess, sf.AddrPC.Offset,
             &dwLineDisplacement, &lineInfo ) )
@@ -724,19 +651,20 @@ bool bWriteVariables, HANDLE pThreadHandle)                 // true if local/par
 BOOL CALLBACK
 WheatyExceptionReport::EnumerateSymbolsCallback(
 PSYMBOL_INFO  pSymInfo,
-ULONG         SymbolSize,
+ULONG         /*SymbolSize*/,
 PVOID         UserContext )
 {
 
-    char szBuffer[2048];
+    char szBuffer[1024 * 64];
 
     __try
     {
-        if ( FormatSymbolValue( pSymInfo, (STACKFRAME*)UserContext,
+        ClearSymbols();
+        if ( FormatSymbolValue( pSymInfo, (STACKFRAME64*)UserContext,
             szBuffer, sizeof(szBuffer) ) )
             _tprintf( _T("\t%s\r\n"), szBuffer );
     }
-    __except( 1 )
+    __except(EXCEPTION_EXECUTE_HANDLER)
     {
         _tprintf( _T("punting on symbol %s\r\n"), pSymInfo->Name );
     }
@@ -751,9 +679,9 @@ PVOID         UserContext )
 //////////////////////////////////////////////////////////////////////////////
 bool WheatyExceptionReport::FormatSymbolValue(
 PSYMBOL_INFO pSym,
-STACKFRAME * sf,
+STACKFRAME64 * sf,
 char * pszBuffer,
-unsigned cbBuffer )
+unsigned /*cbBuffer*/)
 {
     char * pszCurrBuffer = pszBuffer;
 
@@ -764,7 +692,7 @@ unsigned cbBuffer )
         pszCurrBuffer += sprintf( pszCurrBuffer, "Local " );
 
     // If it's a function, don't do anything.
-    if ( pSym->Tag == 5 )                                   // SymTagFunction from CVCONST.H from the DIA SDK
+    if (pSym->Tag == SymTagFunction)                                   // SymTagFunction from CVCONST.H from the DIA SDK
         return false;
 
     DWORD_PTR pVariable = 0;                                // Will point to the variable's data in memory
@@ -772,9 +700,13 @@ unsigned cbBuffer )
     if ( pSym->Flags & IMAGEHLP_SYMBOL_INFO_REGRELATIVE )
     {
         // if ( pSym->Register == 8 )   // EBP is the value 8 (in DBGHELP 5.1)
-        {                                                   //  This may change!!!
+        {
+             //  This may change!!!
+#ifdef _M_IX86
             pVariable = sf->AddrFrame.Offset;
+#elif _M_X64
             pVariable += (DWORD_PTR)pSym->Address;
+#endif
         }
         // else
         //  return false;
@@ -792,7 +724,7 @@ unsigned cbBuffer )
     // will return true.
     bool bHandled;
     pszCurrBuffer = DumpTypeIndex(pszCurrBuffer,pSym->ModBase, pSym->TypeIndex,
-        0, pVariable, bHandled, pSym->Name );
+        0, pVariable, bHandled, pSym->Name, "");
 
     if ( !bHandled )
     {
@@ -824,10 +756,18 @@ DWORD dwTypeIndex,
 unsigned nestingLevel,
 DWORD_PTR offset,
 bool & bHandled,
-char* Name)
+char* Name,
+char* suffix)
 {
     bHandled = false;
 
+    if (!StoreSymbol(dwTypeIndex, offset))
+        return pszCurrBuffer;
+
+    DWORD typeTag;
+    if (!SymGetTypeInfo(m_hProcess, modBase, dwTypeIndex, TI_GET_SYMTAG, &typeTag))
+        return pszCurrBuffer;
+
     // Get the name of the symbol.  This will either be a Type name (if a UDT),
     // or the structure member name.
     WCHAR * pwszTypeName;
@@ -838,10 +778,83 @@ char* Name)
         LocalFree( pwszTypeName );
     }
 
+    if (strlen(suffix) > 0)
+        pszCurrBuffer += sprintf(pszCurrBuffer, "%s", suffix);
+
+    DWORD innerTypeID;
+    switch (typeTag)
+    {
+        case SymTagPointerType:
+            if (SymGetTypeInfo(m_hProcess, modBase, dwTypeIndex, TI_GET_TYPEID, &innerTypeID))
+            {
+#define MAX_NESTING_LEVEL 5
+                if (nestingLevel >= MAX_NESTING_LEVEL)
+                    break;
+
+                pszCurrBuffer += sprintf(pszCurrBuffer, " %s", Name);
+                BOOL isReference;
+                SymGetTypeInfo(m_hProcess, modBase, dwTypeIndex, TI_GET_IS_REFERENCE, &isReference);
+
+                char addressStr[40];
+                memset(addressStr, 0, sizeof(addressStr));
+
+                if (isReference)
+                    addressStr[0] = '&';
+                else
+                    addressStr[0] = '*';
+
+                DWORD_PTR address = *(PDWORD_PTR)offset;
+
+                if (address == NULL)
+                {
+                    pwszTypeName;
+                    if (SymGetTypeInfo(m_hProcess, modBase, innerTypeID, TI_GET_SYMNAME,
+                        &pwszTypeName))
+                    {
+                        pszCurrBuffer += sprintf(pszCurrBuffer, " %ls", pwszTypeName);
+                        LocalFree(pwszTypeName);
+                    }
+
+                    pszCurrBuffer += sprintf(pszCurrBuffer, "%s = NULL\r\n", addressStr);
+
+                    bHandled = true;
+                    return pszCurrBuffer;
+                }
+                else
+                {
+                    FormatOutputValue(&addressStr[1], btVoid, sizeof(PVOID), (PVOID)offset);
+                    pszCurrBuffer = DumpTypeIndex(pszCurrBuffer, modBase, innerTypeID, nestingLevel + 1,
+                        address, bHandled, "", addressStr);
+                }
+            }
+            break;
+        case SymTagData:
+            if (SymGetTypeInfo(m_hProcess, modBase, dwTypeIndex, TI_GET_TYPEID, &innerTypeID))
+            {
+                DWORD innerTypeTag;
+                if (!SymGetTypeInfo(m_hProcess, modBase, innerTypeID, TI_GET_SYMTAG, &innerTypeTag))
+                    break;
+
+                if (innerTypeTag == SymTagPointerType)
+                {
+                    pszCurrBuffer += sprintf(pszCurrBuffer, " %s", Name);
+
+                    pszCurrBuffer = DumpTypeIndex(pszCurrBuffer, modBase, innerTypeID, nestingLevel + 1,
+                        offset, bHandled, "", "");
+                }
+            }
+            break;
+        case SymTagBaseType:
+            break;
+        case SymTagEnum:
+            return pszCurrBuffer;
+        default:
+            break;
+    }
+
     // Determine how many children this type has.
     DWORD dwChildrenCount = 0;
-    SymGetTypeInfo( m_hProcess, modBase, dwTypeIndex, TI_GET_CHILDRENCOUNT,
-        &dwChildrenCount );
+    SymGetTypeInfo(m_hProcess, modBase, dwTypeIndex, TI_GET_CHILDRENCOUNT, &dwChildrenCount);
 
     if ( !dwChildrenCount )                                 // If no children, we're done
         return pszCurrBuffer;
@@ -851,7 +864,7 @@ char* Name)
     // TI_FINDCHILDREN_PARAMS struct has.  Use derivation to accomplish this.
     struct FINDCHILDREN : TI_FINDCHILDREN_PARAMS
     {
-        ULONG   MoreChildIds[1024];
+        ULONG   MoreChildIds[1024 * 2];
         FINDCHILDREN(){Count = sizeof(MoreChildIds) / sizeof(MoreChildIds[0]);}
     } children;
 
@@ -869,10 +882,16 @@ char* Name)
     pszCurrBuffer += sprintf( pszCurrBuffer, "\r\n" );
 
     // Iterate through each of the children
-    for ( unsigned i = 0; i < dwChildrenCount; i++ )
+    for (unsigned i = 0; i < dwChildrenCount; ++i)
     {
+        DWORD symTag;
+        SymGetTypeInfo(m_hProcess, modBase, children.ChildId[i], TI_GET_SYMTAG, &symTag);
+
+        if (symTag == SymTagFunction || symTag == SymTagTypedef)
+            continue;
+
         // Add appropriate indentation level (since this routine is recursive)
-        for ( unsigned j = 0; j <= nestingLevel+1; j++ )
+        for (unsigned j = 0; j <= nestingLevel+1; ++j)
             pszCurrBuffer += sprintf( pszCurrBuffer, "\t" );
 
         // Recurse for each of the child types
@@ -880,18 +899,21 @@ char* Name)
         BasicType basicType = GetBasicType(children.ChildId[i], modBase );
         pszCurrBuffer += sprintf( pszCurrBuffer, rgBaseType[basicType]);
 
+        // Get the offset of the child member, relative to its parent
+        DWORD dwMemberOffset;
+        SymGetTypeInfo(m_hProcess, modBase, children.ChildId[i],
+            TI_GET_OFFSET, &dwMemberOffset);
+
+        // Calculate the address of the member
+        DWORD_PTR dwFinalOffset = offset + dwMemberOffset;
+
         pszCurrBuffer = DumpTypeIndex( pszCurrBuffer, modBase,
             children.ChildId[i], nestingLevel+1,
-            offset, bHandled2, ""/*Name */);
+            dwFinalOffset, bHandled2, ""/*Name */, "");
 
         // If the child wasn't a UDT, format it appropriately
         if ( !bHandled2 )
         {
-            // Get the offset of the child member, relative to its parent
-            DWORD dwMemberOffset;
-            SymGetTypeInfo( m_hProcess, modBase, children.ChildId[i],
-                TI_GET_OFFSET, &dwMemberOffset );
-
             // Get the real "TypeId" of the child.  We need this for the
             // SymGetTypeInfo( TI_GET_TYPEID ) call below.
             DWORD typeId;
@@ -902,9 +924,6 @@ char* Name)
             ULONG64 length;
             SymGetTypeInfo(m_hProcess, modBase, typeId, TI_GET_LENGTH,&length);
 
-            // Calculate the address of the member
-            DWORD_PTR dwFinalOffset = offset + dwMemberOffset;
-
             //             BasicType basicType = GetBasicType(children.ChildId[i], modBase );
             //
             //          pszCurrBuffer += sprintf( pszCurrBuffer, rgBaseType[basicType]);
@@ -928,41 +947,60 @@ BasicType basicType,
 DWORD64 length,
 PVOID pAddress )
 {
-    // Format appropriately (assuming it's a 1, 2, or 4 bytes (!!!)
-    if ( length == 1 )
-        pszCurrBuffer += sprintf( pszCurrBuffer, " = %X", *(PBYTE)pAddress );
-    else if ( length == 2 )
-        pszCurrBuffer += sprintf( pszCurrBuffer, " = %X", *(PWORD)pAddress );
-    else if ( length == 4 )
+    __try
     {
-        if ( basicType == btFloat )
+        // Format appropriately (assuming it's a 1, 2, or 4 bytes (!!!)
+        if (length == 1)
+            pszCurrBuffer += sprintf(pszCurrBuffer, " = %X", *(PBYTE)pAddress);
+        else if (length == 2)
+            pszCurrBuffer += sprintf(pszCurrBuffer, " = %X", *(PWORD)pAddress);
+        else if (length == 4)
         {
-            pszCurrBuffer += sprintf(pszCurrBuffer," = %f", *(PFLOAT)pAddress);
+            if (basicType == btFloat)
+            {
+                pszCurrBuffer += sprintf(pszCurrBuffer, " = %f", *(PFLOAT)pAddress);
+            }
+            else if (basicType == btChar)
+            {
+                if (!IsBadStringPtr(*(PSTR*)pAddress, 32))
+                {
+                    pszCurrBuffer += sprintf(pszCurrBuffer, " = \"%.31s\"",
+                        *(PSTR*)pAddress);
+                }
+                else
+                    pszCurrBuffer += sprintf(pszCurrBuffer, " = %X",
+                    *(PDWORD)pAddress);
+            }
+            else
+                pszCurrBuffer += sprintf(pszCurrBuffer, " = %X", *(PDWORD)pAddress);
         }
-        else if ( basicType == btChar )
+        else if (length == 8)
         {
-            if ( !IsBadStringPtr( *(PSTR*)pAddress, 32) )
+            if (basicType == btFloat)
             {
-                pszCurrBuffer += sprintf( pszCurrBuffer, " = \"%.31s\"",
-                    *(PDWORD)pAddress );
+                pszCurrBuffer += sprintf(pszCurrBuffer, " = %lf",
+                    *(double *)pAddress);
             }
             else
-                pszCurrBuffer += sprintf( pszCurrBuffer, " = %X",
-                    *(PDWORD)pAddress );
+                pszCurrBuffer += sprintf(pszCurrBuffer, " = %I64X",
+                *(DWORD64*)pAddress);
         }
         else
-            pszCurrBuffer += sprintf(pszCurrBuffer," = %X", *(PDWORD)pAddress);
-    }
-    else if ( length == 8 )
-    {
-        if ( basicType == btFloat )
         {
-            pszCurrBuffer += sprintf( pszCurrBuffer, " = %lf",
-                *(double *)pAddress );
+#if _WIN64
+            pszCurrBuffer += sprintf(pszCurrBuffer, " = %I64X", (DWORD64*)pAddress);
+#else
+            pszCurrBuffer += sprintf(pszCurrBuffer, " = %X", (PDWORD)pAddress);
+#endif
         }
-        else
-            pszCurrBuffer += sprintf( pszCurrBuffer, " = %I64X",
-                *(DWORD64*)pAddress );
+    }
+    __except (EXCEPTION_EXECUTE_HANDLER)
+    {
+#if _WIN64
+        pszCurrBuffer += sprintf(pszCurrBuffer, " <Unable to read memory> = %I64X", (DWORD64*)pAddress);
+#else
+        pszCurrBuffer += sprintf(pszCurrBuffer, " <Unable to read memory> = %X", (PDWORD)pAddress);
+#endif
     }
 
     return pszCurrBuffer;
@@ -999,7 +1037,7 @@ WheatyExceptionReport::GetBasicType( DWORD typeIndex, DWORD64 modBase )
 //============================================================================
 int __cdecl WheatyExceptionReport::_tprintf(const TCHAR * format, ...)
 {
-    TCHAR szBuff[1024];
+    TCHAR szBuff[1024 * 64];
     int retValue;
     DWORD cbWritten;
     va_list argptr;
@@ -1012,3 +1050,15 @@ int __cdecl WheatyExceptionReport::_tprintf(const TCHAR * format, ...)
 
     return retValue;
 }
+
+bool WheatyExceptionReport::StoreSymbol(DWORD type, DWORD_PTR offset)
+{
+    return symbols.insert(SymbolPair(type, offset)).second;
+}
+
+void WheatyExceptionReport::ClearSymbols()
+{
+    symbols.clear();
+}
+
+#endif
\ No newline at end of file
diff --git a/src/shared/WheatyExceptionReport.h b/src/shared/WheatyExceptionReport.h
index 896d9c72f36..2485d2a606f 100644
--- a/src/shared/WheatyExceptionReport.h
+++ b/src/shared/WheatyExceptionReport.h
@@ -1,8 +1,11 @@
 #ifndef _WHEATYEXCEPTIONREPORT_
 #define _WHEATYEXCEPTIONREPORT_
 
+#ifdef _WIN32
+
 #include <dbghelp.h>
 
+#include <set>
 #if _MSC_VER < 1400
 #   define countof(array)   (sizeof(array) / sizeof(array[0]))
 #else
@@ -68,6 +71,26 @@ const char* const rgBaseType[] =
     " HRESULT "                                             // btHresult = 31
 };
 
+struct SymbolPair
+{
+    SymbolPair(DWORD type, DWORD_PTR offset)
+    {
+        _type = type;
+        _offset = offset;
+    }
+
+    bool operator<(const SymbolPair& other) const
+    {
+        return _offset < other._offset || 
+              (_offset == other._offset && _type < other._type);
+    }
+
+    DWORD _type;
+    DWORD_PTR _offset;
+};
+
+typedef std::set<SymbolPair> SymbolPairs;
+
 class WheatyExceptionReport
 {
     public:
@@ -79,7 +102,7 @@ class WheatyExceptionReport
         static LONG WINAPI WheatyUnhandledExceptionFilter(
             PEXCEPTION_POINTERS pExceptionInfo );
 
-        static void printTracesForAllThreads();
+        static void printTracesForAllThreads(bool);
     private:
         // where report info is extracted and generated
         static void GenerateExceptionReport( PEXCEPTION_POINTERS pExceptionInfo );
@@ -96,9 +119,9 @@ class WheatyExceptionReport
 
         static BOOL CALLBACK EnumerateSymbolsCallback(PSYMBOL_INFO,ULONG, PVOID);
 
-        static bool FormatSymbolValue( PSYMBOL_INFO, STACKFRAME *, char * pszBuffer, unsigned cbBuffer );
+        static bool FormatSymbolValue( PSYMBOL_INFO, STACKFRAME64 *, char * pszBuffer, unsigned cbBuffer );
 
-        static char * DumpTypeIndex( char *, DWORD64, DWORD, unsigned, DWORD_PTR, bool & , char*);
+        static char * DumpTypeIndex( char *, DWORD64, DWORD, unsigned, DWORD_PTR, bool & , char*, char*);
 
         static char * FormatOutputValue( char * pszCurrBuffer, BasicType basicType, DWORD64 length, PVOID pAddress );
 
@@ -106,12 +129,17 @@ class WheatyExceptionReport
 
         static int __cdecl _tprintf(const TCHAR * format, ...);
 
+        static bool StoreSymbol(DWORD type , DWORD_PTR offset);
+        static void ClearSymbols();
+
         // Variables used by the class
         static TCHAR m_szLogFileName[MAX_PATH];
         static LPTOP_LEVEL_EXCEPTION_FILTER m_previousFilter;
         static HANDLE m_hReportFile;
         static HANDLE m_hProcess;
+        static SymbolPairs symbols;
 };
 
 extern WheatyExceptionReport g_WheatyExceptionReport;       //  global instance of class
-#endif                                                      //WheatyExceptionReport
+#endif                                                      // WIN32
+#endif                                                      // WheatyExceptionReport
diff --git a/src/shared/WorldPacket.h b/src/shared/WorldPacket.h
index 32c741f8dd0..3c2628741ee 100644
--- a/src/shared/WorldPacket.h
+++ b/src/shared/WorldPacket.h
@@ -21,6 +21,7 @@
 
 #include "Common.h"
 #include "ByteBuffer.h"
+#include "Opcodes.h"
 
 // Note: m_opcode and size stored in platfom dependent format
 // ignore endianess until send, and converted at receive
@@ -28,26 +29,26 @@ class WorldPacket : public ByteBuffer
 {
     public:
                                                             // just container for later use
-        WorldPacket()                                       : ByteBuffer(0), m_opcode(0)
+        WorldPacket()                                       : ByteBuffer(0), m_opcode(MSG_NULL_ACTION)
         {
         }
-        explicit WorldPacket(uint16 opcode, size_t res=200) : ByteBuffer(res), m_opcode(opcode) { }
+        explicit WorldPacket(Opcodes opcode, size_t res=200) : ByteBuffer(res), m_opcode(opcode) {}
                                                             // copy constructor
         WorldPacket(const WorldPacket &packet)              : ByteBuffer(packet), m_opcode(packet.m_opcode)
         {
         }
 
-        void Initialize(uint16 opcode, size_t newres=200)
+        void Initialize(Opcodes opcode, size_t newres=200)
         {
             clear();
             _storage.reserve(newres);
             m_opcode = opcode;
         }
 
-        uint16 GetOpcode() const { return m_opcode; }
-        void SetOpcode(uint16 opcode) { m_opcode = opcode; }
+        Opcodes GetOpcode() const { return m_opcode; }
+        void SetOpcode(Opcodes opcode) { m_opcode = opcode; }
 
     protected:
-        uint16 m_opcode;
+        Opcodes m_opcode;
 };
 #endif
diff --git a/src/shared/config.h b/src/shared/config.h
new file mode 100644
index 00000000000..fa377b10647
--- /dev/null
+++ b/src/shared/config.h
@@ -0,0 +1,12 @@
+#ifndef HAVE_CONFIG_H
+#define HAVE_CONFIG_H
+
+#define HAVE_ACE_STACK_TRACE_H
+
+/* #undef USE_MULTI_THREAD_MAP */
+
+#define VERSION "0.17"
+
+#define CLIENT_VERSION 12340
+
+#endif /* HAVE_CONFIG_H */
diff --git a/src/shared/revision_R2.h b/src/shared/revision_R2.h
new file mode 100644
index 00000000000..a8bc39bbaeb
--- /dev/null
+++ b/src/shared/revision_R2.h
@@ -0,0 +1,4 @@
+#ifndef __REVISION_R2_H__
+#define __REVISION_R2_H__
+ #define REVISION_R2 "3247"
+#endif // __REVISION_R2_H__
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 1f9e90987ba..28909dce591 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12023"
+ #define REVISION_NR "12657"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
index d4b37175321..5e672c43586 100644
--- a/src/shared/revision_sql.h
+++ b/src/shared/revision_sql.h
@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
- #define REVISION_DB_CHARACTERS "required_11785_02_characters_instance"
- #define REVISION_DB_MANGOS "required_12012_01_mangos_spell_template"
- #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
+ #define REVISION_DB_CHARACTERS "required_12562_01_characters_various_tables"
+ #define REVISION_DB_MANGOS "required_12654_01_mangos_creature_template_power"
+ #define REVISION_DB_REALMD "required_12112_01_realmd_account_access"
 #endif // __REVISION_SQL_H__
diff --git a/src/tests/AcceptAllQuestStrategyTestCase.cpp b/src/tests/AcceptAllQuestStrategyTestCase.cpp
new file mode 100644
index 00000000000..c78ab7af929
--- /dev/null
+++ b/src/tests/AcceptAllQuestStrategyTestCase.cpp
@@ -0,0 +1,68 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "MockAiObjectContext.h"
+#include "MockedAiObjectContextTestCase.h"
+#include "../game/playerbot/strategy/generic/ChatCommandHandlerStrategy.h"
+
+using namespace ai;
+
+
+class AcceptAllQuestStrategyTestCase : public MockedAiObjectContextTestCase
+{
+  CPPUNIT_TEST_SUITE( AcceptAllQuestStrategyTestCase );
+      CPPUNIT_TEST( turn_in_quest );
+      CPPUNIT_TEST( accept_quest );
+      CPPUNIT_TEST( quest_share );
+      CPPUNIT_TEST( useGameObject );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(context = new MockAiObjectContext(ai, new AiObjectContext(ai), &ai->buffer), "accept all quests", NULL);
+    }
+
+protected:
+    void useGameObject()
+    {
+        trigger("use game object");
+        tick();
+        tick();
+
+        assertActions(">S:talk to quest giver>S:accept all quests");
+    }
+
+    void turn_in_quest()
+    {
+        trigger("complete quest");
+        tick();
+        tick();
+
+        trigger("gossip hello");
+        tick();
+        tick();
+
+        assertActions(">S:talk to quest giver>S:accept all quests>S:talk to quest giver>S:accept all quests");
+    }
+
+    void accept_quest()
+    {
+        trigger("accept quest");
+        tick();
+
+        assertActions(">S:accept quest");
+    }
+
+    void quest_share()
+    {
+        trigger("quest share");
+        tick();
+
+        assertActions(">S:accept quest share");
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( AcceptAllQuestStrategyTestCase );
diff --git a/src/tests/AiObjectContextWrapper.h b/src/tests/AiObjectContextWrapper.h
new file mode 100644
index 00000000000..226fa0e683c
--- /dev/null
+++ b/src/tests/AiObjectContextWrapper.h
@@ -0,0 +1,287 @@
+#pragma once
+using namespace std;
+
+namespace ai
+{
+    class MockTargetValue : public ManualSetValue<Unit*>, public Qualified
+    {
+    public:
+        MockTargetValue(PlayerbotAI* const ai) : ManualSetValue<Unit*>(ai, NULL) {}
+    };
+
+    class MockStatsValue : public ManualSetValue<uint8>, public Qualified
+    {
+    public:
+        MockStatsValue(PlayerbotAI* const ai) : ManualSetValue<uint8>(ai, 0) {}
+    };
+
+    class MockFloatValue : public ManualSetValue<float>, public Qualified
+    {
+    public:
+        MockFloatValue(PlayerbotAI* const ai) : ManualSetValue<float>(ai, 0) {}
+    };
+
+    class MockStringValue : public ManualSetValue<string>, public Qualified
+    {
+    public:
+        MockStringValue(PlayerbotAI* const ai) : ManualSetValue<string>(ai, "") {}
+    };
+
+    class MockItemListValue : public ManualSetValue<list<Item*> >, public Qualified
+    {
+    public:
+        MockItemListValue(PlayerbotAI* const ai) : ManualSetValue<list<Item*> >(ai, list<Item*>()) {}
+    };
+
+    class MockItemValue : public ManualSetValue<Item*>, public Qualified
+    {
+    public:
+        MockItemValue(PlayerbotAI* const ai) : ManualSetValue<Item*>(ai, NULL) {}
+    };
+
+    class MockLogicalValue : public ManualSetValue<bool>, public Qualified
+    {
+    public:
+        MockLogicalValue(PlayerbotAI* const ai) : ManualSetValue<bool>(ai, false) {}
+    };
+
+    class AlwaysTrueValue : public BoolCalculatedValue, public Qualified
+    {
+    public:
+        AlwaysTrueValue(PlayerbotAI* const ai) : BoolCalculatedValue(ai) {}
+        virtual bool Calculate() { return true; }
+    };
+
+    class MockPartyMemberWithoutAuraValue : public UnitCalculatedValue, public Qualified
+    {
+    public:
+        MockPartyMemberWithoutAuraValue(PlayerbotAI* const ai) : UnitCalculatedValue(ai) {}
+
+        virtual Unit* Calculate()
+        {
+            string  spell = qualifier;
+            Unit* target = MockedTargets::GetPartyMember();
+            return ai->HasAura(spell, target) ? NULL : target;
+        }
+    };
+
+    class MockPartyMemberToHeal : public UnitCalculatedValue
+    {
+    public:
+        MockPartyMemberToHeal(PlayerbotAI* const ai) : UnitCalculatedValue(ai) {}
+
+        virtual Unit* Calculate()
+        {
+            Unit* target = MockedTargets::GetPartyMember();
+            return AI_VALUE2(uint8, "health", "party member to heal") < 100.0f ? target : NULL;
+        }
+    };
+
+    class MockPartyMemberToDispel : public UnitCalculatedValue, public Qualified
+    {
+    public:
+        MockPartyMemberToDispel(PlayerbotAI* const ai) : UnitCalculatedValue(ai) {}
+
+        virtual Unit* Calculate()
+        {
+            uint32 dispelType = atoi(qualifier.c_str());
+            Unit* target = MockedTargets::GetPartyMember();
+            return ai->HasAuraToDispel(target, dispelType) ? target : NULL;
+        }
+    };
+
+    class MockUnitListValue : public ManualSetValue<list<ObjectGuid>>
+    {
+    public:
+        MockUnitListValue(PlayerbotAI* const ai) : ManualSetValue<list<ObjectGuid>>(ai, list<ObjectGuid>()) {}
+    };
+
+    class MockSpellIdValue : public CalculatedValue<uint32>, public Qualified
+    {
+    public:
+        MockSpellIdValue(PlayerbotAI* ai) : CalculatedValue<uint32>(ai) {}
+
+    public:
+        virtual uint32 Calculate() { return 1; }
+
+    };
+
+    class MockValueContext : public NamedObjectContext<UntypedValue>
+    {
+    public:
+        MockValueContext() : NamedObjectContext<UntypedValue>()
+        {
+            creators["attacker without aura"] = &MockValueContext::mock;
+            creators["party member without aura"] = &MockValueContext::party_member_without_aura;
+            creators["party member to heal"] = &MockValueContext::party_member_to_heal;
+            creators["party member to dispel"] = &MockValueContext::party_member_to_dispel;
+            creators["party member to resurrect"] = &MockValueContext::mock;
+            creators["current target"] = &MockValueContext::mock;
+            creators["old target"] = &MockValueContext::mock;
+            creators["self target"] = &MockValueContext::mock;
+            creators["master target"] = &MockValueContext::mock;
+            creators["line target"] = &MockValueContext::mock;
+            creators["tank target"] = &MockValueContext::mock;
+            creators["dps target"] = &MockValueContext::mock;
+            creators["cc target"] = &MockValueContext::mock;
+            creators["current cc target"] = &MockValueContext::mock;
+            creators["pet target"] = &MockValueContext::mock;
+            creators["grind target"] = &MockValueContext::mock;
+            creators["least hp target"] = &MockValueContext::mock;
+            creators["rti target"] = &MockValueContext::mock;
+            creators["duel target"] = &MockValueContext::mock;
+            creators["enemy player target"] = &MockValueContext::mock;
+            creators["enemy healer target"] = &MockValueContext::mock;
+
+            creators["health"] = &MockValueContext::stats;
+            creators["rage"] = &MockValueContext::stats;
+            creators["energy"] = &MockValueContext::stats;
+            creators["mana"] = &MockValueContext::stats;
+            creators["combo"] = &MockValueContext::stats;
+            creators["dead"] = &MockValueContext::logical;
+            creators["has mana"] = &MockValueContext::logical;
+            creators["combat"] = &MockValueContext::logical;
+
+            creators["attacker count"] = &MockValueContext::stats;
+            creators["my attacker count"] = &MockValueContext::stats;
+            creators["has aggro"] = &MockValueContext::logical;
+            creators["balance"] = &MockValueContext::stats;
+            creators["mounted"] = &MockValueContext::logical;
+            creators["has available loot"] = &MockValueContext::logical;
+            creators["distance"] = &MockValueContext::floating;
+            creators["moving"] = &MockValueContext::logical;
+            creators["swimming"] = &MockValueContext::logical;
+            creators["behind"] = &MockValueContext::logical;
+            creators["facing"] = &MockValueContext::logical;
+            creators["item count"] = &MockValueContext::stats;
+            creators["inventory items"] = &MockValueContext::itemlist;
+            creators["item for spell"] = &MockValueContext::item;
+            creators["spell cast useful"] = &MockValueContext::always_true;
+            creators["can loot"] = &MockValueContext::logical;
+            creators["invalid target"] = &MockValueContext::logical;
+
+            creators["possible targets"] = &MockValueContext::units;
+            creators["nearest adds"] = &MockValueContext::units;
+            creators["attackers"] = &MockValueContext::units;
+            creators["has totem"] = &MockValueContext::logical;
+            creators["aoe heal"] = &MockValueContext::stats;
+
+            creators["rti"] = &MockValueContext::str;
+            creators["spell id"] = &MockValueContext::spell_id;
+            creators["threat"] = &MockValueContext::stats;
+            creators["bag space"] = &MockValueContext::stats;
+        }
+
+    private:
+        static UntypedValue* always_true(PlayerbotAI* ai) { return new AlwaysTrueValue(ai); }
+        static UntypedValue* stats(PlayerbotAI* ai) { return new MockStatsValue(ai); }
+        static UntypedValue* itemlist(PlayerbotAI* ai) { return new MockItemListValue(ai); }
+        static UntypedValue* item(PlayerbotAI* ai) { return new MockItemValue(ai); }
+        static UntypedValue* floating(PlayerbotAI* ai) { return new MockFloatValue(ai); }
+        static UntypedValue* str(PlayerbotAI* ai) { return new MockStringValue(ai); }
+        static UntypedValue* logical(PlayerbotAI* ai) { return new MockLogicalValue(ai); }
+        static UntypedValue* mock(PlayerbotAI* ai) { return new MockTargetValue(ai); }
+        static UntypedValue* party_member_without_aura(PlayerbotAI* ai) { return new MockPartyMemberWithoutAuraValue(ai); }
+        static UntypedValue* party_member_to_heal(PlayerbotAI* ai) { return new MockPartyMemberToHeal(ai); }
+        static UntypedValue* party_member_to_dispel(PlayerbotAI* ai) { return new MockPartyMemberToDispel(ai); }
+        static UntypedValue* units(PlayerbotAI* ai) { return new MockUnitListValue(ai); }
+        static UntypedValue* spell_id(PlayerbotAI* ai) { return new MockSpellIdValue(ai); }
+    };
+
+    class AiObjectContextWrapper : public AiObjectContext
+    {
+    public:
+        AiObjectContextWrapper(PlayerbotAI* const ai, AiObjectContext *realContext) :
+          AiObjectContext(ai), realContext(realContext)
+          {
+              GetValue<Unit*>("self target")->Set(MockedTargets::GetSelf());
+              GetValue<Unit*>("master target")->Set(MockedTargets::GetMaster());
+              GetValue<Unit*>("line target")->Set(MockedTargets::GetLineTarget());
+              GetValue<Unit*>("tank target")->Set(MockedTargets::GetTargetForTank());
+              GetValue<Unit*>("dps target")->Set(MockedTargets::GetTargetForDps());
+              GetValue<Unit*>("current cc target")->Set(NULL);
+              GetValue<Unit*>("current target")->Set(MockedTargets::GetCurrentTarget());
+              GetValue<Unit*>("old target")->Set(MockedTargets::GetCurrentTarget());
+              GetValue<Unit*>("pet target")->Set(MockedTargets::GetPet());
+              GetValue<Unit*>("least hp target")->Set(MockedTargets::GetLeastHpTarget());
+              GetValue<Unit*>("rti target")->Set(MockedTargets::GetRtiTarget());
+              GetValue<Unit*>("enemy player target")->Set(MockedTargets::GetEnemyPlayer());
+              GetValue<Unit*>("attacker without aura")->Set(NULL);
+
+              GetValue<uint8>("health", "self target")->Set(100);
+              GetValue<uint8>("health", "current target")->Set(100);
+              GetValue<uint8>("health", "pet target")->Set(100);
+              GetValue<uint8>("health", "party member to heal")->Set(100);
+              GetValue<uint8>("health", "party member to resurrect")->Set(100);
+
+              GetValue<bool>("dead", "current target")->Set(false);
+              GetValue<bool>("dead", "self target")->Set(false);
+
+              GetValue<uint8>("mana", "self target")->Set(100);
+              GetValue<uint8>("mana", "current target")->Set(100);
+              GetValue<uint8>("mana", "pet target")->Set(100);
+              GetValue<uint8>("mana", "party member to heal")->Set(100);
+              GetValue<uint8>("mana", "party member to resurrect")->Set(100);
+
+              GetValue<bool>("has mana", "self target")->Set(true);
+              GetValue<bool>("has mana", "current target")->Set(true);
+              GetValue<bool>("has mana", "pet target")->Set(true);
+              GetValue<bool>("has mana", "party member to heal")->Set(true);
+              GetValue<bool>("has mana", "party member to resurrect")->Set(true);
+
+              GetValue<bool>("combat", "self target")->Set(false);
+
+              GetValue<uint8>("attacker count")->Set(1);
+              GetValue<uint8>("my attacker count")->Set(1);
+              GetValue<uint8>("balance")->Set(100);
+              GetValue<float>("distance", "current target")->Set(15.0f);
+              GetValue<float>("distance", "loot target")->Set(0.0f);
+
+              GetValue<bool>("has aggro", "current target")->Set(true);
+              GetValue<bool>("can loot")->Set(false);
+
+              GetValue<bool>("facing", "current target")->Set(true);
+
+              list<Item*> items; items.push_back((Item*)(void*)0x01);
+              GetValue<list<Item*> >("inventory items", "drink")->Set(items);
+              GetValue<list<Item*> >("inventory items", "food")->Set(items);
+
+              GetValue<uint8>("aoe heal", "low")->Set(0);
+              GetValue<uint8>("aoe heal", "medium")->Set(0);
+              GetValue<uint8>("aoe heal", "critical")->Set(0);
+
+              GetValue<uint8>("threat")->Set(0);
+              GetValue<uint8>("bag space")->Set(0);
+          }
+
+    public:
+        virtual UntypedValue* GetUntypedValue(string  name)
+        {
+            UntypedValue* value = mockValueContext.create(name, ai);
+            UntypedValue* real = realContext->GetUntypedValue(name);
+            if (!real)
+            {
+                std::cout << "\n===\n";
+                cout << "Value " << name << " not found in context";
+                std::cout << "\n===\n";
+
+                CPPUNIT_ASSERT(false);
+            }
+            return value ? value : real;
+        }
+        virtual Strategy* GetStrategy(string  name) { return realContext->GetStrategy(name); }
+        virtual set<string> GetSiblingStrategy(string name) { return realContext->GetSiblingStrategy(name); }
+        virtual Trigger* GetTrigger(string  name) { return realContext->GetTrigger(name); }
+        virtual Action* GetAction(string  name) { return realContext->GetAction(name); }
+        virtual void Update()
+        {
+            mockValueContext.Update();
+            realContext->Update();
+        }
+
+    private:
+        AiObjectContext *realContext;
+        MockValueContext mockValueContext;
+    };
+
+}
diff --git a/src/tests/ArcaneMageTestCase.cpp b/src/tests/ArcaneMageTestCase.cpp
new file mode 100644
index 00000000000..f4b270b7808
--- /dev/null
+++ b/src/tests/ArcaneMageTestCase.cpp
@@ -0,0 +1,48 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/mage/MageAiObjectContext.h"
+
+using namespace ai;
+
+
+class ArcaneMageTestCase : public EngineTestBase
+{
+  CPPUNIT_TEST_SUITE( ArcaneMageTestCase );
+      CPPUNIT_TEST( combatVsMelee );
+      CPPUNIT_TEST( avoid_melee );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new MageAiObjectContext(ai), "arcane", NULL);
+    }
+
+protected:
+ 	void combatVsMelee()
+	{
+        tick();
+		addAura("arcane blast");
+
+        tick();
+
+        addAura("missile barrage");
+        tick();
+        tickWithSpellAvailable("arcane missiles");
+        tick();
+
+        assertActions(">T:arcane blast>T:arcane barrage>T:arcane missiles>T:arcane missiles>T:shoot");
+	}
+
+ 	void avoid_melee()
+ 	{
+		tickInMeleeRange();
+		tickInMeleeRange();
+
+		assertActions(">T:frost nova>S:flee");
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( ArcaneMageTestCase );
diff --git a/src/tests/BearTankDruidTestCase.cpp b/src/tests/BearTankDruidTestCase.cpp
new file mode 100644
index 00000000000..27e49405240
--- /dev/null
+++ b/src/tests/BearTankDruidTestCase.cpp
@@ -0,0 +1,215 @@
+#include "pch.h"
+#include "aitest.h"
+#include "../game/playerbot/strategy/druid/DruidAiObjectContext.h"
+
+using namespace ai;
+
+class BearTankDruidTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( BearTankDruidTestCase );
+        CPPUNIT_TEST( startMeleeCombat );
+        CPPUNIT_TEST( meleeCombat );
+        CPPUNIT_TEST( druidMustHoldAggro );
+        CPPUNIT_TEST( bearFormIfDireNotAvailable );
+        CPPUNIT_TEST( healHimself );
+        CPPUNIT_TEST( intensiveHealing );
+        CPPUNIT_TEST( healOthers );
+        CPPUNIT_TEST( curePoison );
+        CPPUNIT_TEST( interruptSpells );
+        CPPUNIT_TEST( buff );
+        CPPUNIT_TEST( aoe );
+        CPPUNIT_TEST( incompatibles );
+        CPPUNIT_TEST( interrupt_enemy_healer );
+    CPPUNIT_TEST_SUITE_END();
+
+
+public:
+    virtual void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new DruidAiObjectContext(ai), "bear", NULL);
+
+		addAura("thorns");
+        addTargetAura("faerie fire (feral)");
+        set<uint8>("rage", "self target", 100);
+    }
+
+protected:
+    void bearFormIfDireNotAvailable()
+    {
+		tickWithSpellUnavailable("dire bear form");
+
+		assertActions(">S:bear form");
+    }
+
+    void druidMustHoldAggro()
+    {
+        addAura("dire bear form");
+
+		tickWithNoAggro();
+
+		assertActions(">T:growl");
+    }
+
+    void startMeleeCombat()
+    {
+        removeTargetAura("faerie fire (feral)");
+
+        tick();
+        addAura("dire bear form");
+
+        tick();
+        tickInMeleeRange();
+
+        tickOutOfMeleeRange();
+        tickInMeleeRange();
+
+        assertActions(">S:dire bear form>T:feral charge - bear>T:faerie fire (feral)>T:reach melee>T:lacerate");
+    }
+
+    void meleeCombat()
+    {
+        addAura("dire bear form");
+
+        tickInMeleeRange();
+		tick();
+		tick();
+		tick();
+
+		tickWithSpellAvailable("lacerate");
+		tick();
+		tickWithSpellAvailable("lacerate");
+        tick();
+
+        spellAvailable("lacerate");
+        spellAvailable("mangle (bear)");
+        spellAvailable("maul");
+        spellAvailable("faerie fire (feral)");
+
+		tickWithSpellAvailable("lacerate");
+		tickWithSpellAvailable("lacerate");
+		tickWithSpellAvailable("lacerate");
+		tickWithSpellAvailable("lacerate");
+		tickWithSpellAvailable("lacerate");
+
+        assertActions(">T:lacerate>T:mangle (bear)>T:maul>T:feral charge - bear>T:faerie fire (feral)>T:lacerate>T:lacerate>T:melee>T:faerie fire (feral)>T:lacerate>T:mangle (bear)>T:maul>T:lacerate");
+    }
+
+    void healHimself()
+    {
+        addAura("dire bear form");
+
+		tickWithLowHealth(59);
+		tickWithLowHealth(59);
+
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+
+        addAura("dire bear form");
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        tickWithLowHealth(1);
+        tickWithLowHealth(1);
+        tickWithLowHealth(1);
+        tickWithLowHealth(1);
+        tickWithLowHealth(1);
+
+        assertActions(">T:reach melee>T:lacerate>S:caster form>S:regrowth>S:survival instincts>S:barskin>S:caster form>S:regrowth>S:healing touch");
+    }
+
+    void intensiveHealing()
+    {
+        addAura("dire bear form");
+		tickWithLowHealth(1);
+
+		assertActions(">S:survival instincts");
+    }
+
+    void healOthers()
+    {
+        tick();
+        addAura("dire bear form");
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        addAura("dire bear form");
+        tickWithPartyLowHealth(39);
+        tickWithPartyLowHealth(39);
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        addAura("dire bear form");
+        tickWithPartyLowHealth(1);
+        tickWithPartyLowHealth(1);
+        tickWithPartyLowHealth(1);
+
+		assertActions(">S:dire bear form>S:caster form>P:regrowth on party>S:caster form>P:regrowth on party>P:healing touch on party");
+    }
+    void curePoison()
+    {
+        tick();
+        addAura("dire bear form");
+
+		tickWithAuraToDispel(DISPEL_POISON);
+		tickWithAuraToDispel(DISPEL_POISON);
+
+		spellAvailable("abolish poison");
+		tickWithPartyAuraToDispel(DISPEL_POISON);
+
+		tickWithAuraToDispel(DISPEL_POISON);
+
+		spellAvailable("cure poison");
+		tickWithPartyAuraToDispel(DISPEL_POISON);
+
+		assertActions(">S:dire bear form>S:caster form>S:abolish poison>P:abolish poison on party>S:cure poison>P:cure poison on party");
+    }
+    void interruptSpells()
+    {
+        addAura("dire bear form");
+        tickInMeleeRange();
+		tickWithTargetIsCastingNonMeleeSpell();
+
+        assertActions(">T:lacerate>T:bash");
+    }
+	void buff()
+	{
+        removeAura("thorns");
+        tick();
+
+        removeTargetAura("faerie fire (feral)");
+        tickInMeleeRange();
+		addAura("dire bear form");
+
+        assertActions(">S:thorns>S:dire bear form");
+	}
+
+    void aoe()
+    {
+        addAura("dire bear form");
+		tickInMeleeRange();
+		tickWithAttackerCount(2);
+		tickWithAttackerCount(3);
+        spellAvailable("swipe (bear)");
+		tickWithAttackerCount(3);
+
+		assertActions(">T:lacerate>T:swipe (bear)>T:demoralizing roar>T:swipe (bear)");
+    }
+
+    void incompatibles()
+    {
+        engine->addStrategies("bear", "cat", "caster", "dps", "tank", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: bear");
+    }
+
+    void interrupt_enemy_healer()
+    {
+        tickWithEnemyHealerIsCastingInterruptableSpell("bash");
+        assertActions(">H:bash on enemy healer");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( BearTankDruidTestCase );
diff --git a/src/tests/CasterDruidTestCase.cpp b/src/tests/CasterDruidTestCase.cpp
new file mode 100644
index 00000000000..8a4bb06953e
--- /dev/null
+++ b/src/tests/CasterDruidTestCase.cpp
@@ -0,0 +1,166 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/druid/DruidAiObjectContext.h"
+
+using namespace ai;
+
+
+class CasterDruidTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( CasterDruidTestCase );
+    CPPUNIT_TEST( combat);
+    CPPUNIT_TEST( healHimself );
+    CPPUNIT_TEST( healOthers );
+	CPPUNIT_TEST( curePoison );
+	CPPUNIT_TEST( resurrect );
+    CPPUNIT_TEST( cc );
+	CPPUNIT_TEST( aoe );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    virtual void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new DruidAiObjectContext(ai), "caster", "caster debuff", NULL);
+
+		addAura("moonkin form");
+    }
+
+protected:
+    void combat()
+    {
+		removeAura("moonkin form");
+		tick();
+		addAura("moonkin form");
+
+		tickOutOfSpellRange();
+
+		tickInSpellRange();
+		addTargetAura("faerie fire");
+
+		tick();
+		addTargetAura("insect swarm");
+
+		tick();
+		addTargetAura("moonfire");
+
+        tick();
+		tick();
+
+		spellAvailable("starfire");
+		tickInSpellRange();
+
+        tickWithBalancePercent(49);
+
+        spellAvailable("starfire");
+        spellAvailable("wrath");
+        addAura("eclipse (lunar)");
+        tick();
+
+        addAura("eclipse (solar)");
+        tick();
+
+		assertActions(">S:moonkin form>T:reach spell>T:faerie fire>T:insect swarm>T:moonfire>T:starfire>T:wrath>T:starfire>S:nature's grasp>T:starfire>T:wrath");
+    }
+
+	void healHimself()
+    {
+		tickWithLowHealth(79);
+		tickWithLowHealth(79);
+        addAura("moonkin form");
+        spellAvailable("rejuvenation");
+
+		tickWithLowHealth(59);
+		tickWithLowHealth(59);
+		tickWithLowHealth(59);
+
+		addAura("moonkin form");
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        tickWithLowHealth(1);
+        tickWithLowHealth(1);
+
+        assertActions(">S:caster form>S:rejuvenation>S:caster form>S:regrowth>S:healing touch>S:caster form>S:regrowth>S:regrowth>S:healing touch");
+    }
+
+	void healOthers()
+    {
+        addAura("moonkin form");
+
+        tickWithPartyLowHealth(79);
+        tickWithPartyLowHealth(79);
+        addAura("moonkin form");
+        spellAvailable("rejuvenation");
+
+        tickWithPartyLowHealth(59);
+        tickWithPartyLowHealth(59);
+        tickWithPartyLowHealth(59);
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        addAura("dire bear form");
+        tickWithPartyLowHealth(39);
+        tickWithPartyLowHealth(39);
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        addAura("moonkin form");
+        tickWithPartyLowHealth(1);
+        tickWithPartyLowHealth(1);
+        tickWithPartyLowHealth(1);
+
+        assertActions(">S:caster form>P:rejuvenation on party>S:caster form>P:regrowth on party>P:healing touch on party>S:caster form>P:regrowth on party>S:caster form>P:regrowth on party>P:healing touch on party");
+    }
+
+	void curePoison()
+	{
+		tickWithAuraToDispel(DISPEL_POISON);
+
+		spellAvailable("abolish poison");
+		tickWithPartyAuraToDispel(DISPEL_POISON);
+
+		tickWithAuraToDispel(DISPEL_POISON);
+
+		spellAvailable("cure poison");
+		tickWithPartyAuraToDispel(DISPEL_POISON);
+
+		assertActions(">S:abolish poison>P:abolish poison on party>S:cure poison>P:cure poison on party");
+	}
+
+	void resurrect()
+	{
+		tickWithDeadPartyMember();
+		tickWithDeadPartyMember();
+
+		assertActions(">S:caster form>P:rebirth");
+	}
+
+    void cc()
+    {
+        tickWithCcTarget("entangling roots");
+
+        assertActions(">Cc:entangling roots on cc");
+    }
+
+    void aoe()
+    {
+        engine->addStrategy("caster aoe");
+        tickWithAttackerCount(4);
+        tickWithAttackerCount(4);
+
+		assertActions(">T:starfall>T:hurricane");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( CasterDruidTestCase );
diff --git a/src/tests/CasterShamanTestCase.cpp b/src/tests/CasterShamanTestCase.cpp
new file mode 100644
index 00000000000..09a5dcdca04
--- /dev/null
+++ b/src/tests/CasterShamanTestCase.cpp
@@ -0,0 +1,86 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/shaman/ShamanAiObjectContext.h"
+
+using namespace ai;
+
+
+class CasterShamanTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( CasterShamanTestCase );
+    CPPUNIT_TEST( combat );
+	CPPUNIT_TEST( buff );
+	CPPUNIT_TEST( incompatibles );
+    CPPUNIT_TEST( aoe );
+    CPPUNIT_TEST( snare );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new ShamanAiObjectContext(ai), "caster", NULL);
+
+        addAura("water shield");
+        addTargetAura("earth shock");
+    }
+
+protected:
+    void combat()
+    {
+        removeTargetAura("earth shock");
+
+		tick();
+        tick();
+        addTargetAura("flame shock");
+
+		tick();
+		tick();
+
+        assertActions(">T:earth shock>T:flame shock>S:searing totem>T:lightning bolt");
+    }
+
+    void buff()
+    {
+        engine->addStrategy("bmana");
+        removeAura("water shield");
+
+        tickWithItemForSpell("flametongue weapon");
+
+        tick();
+        addAura("water shield");
+
+        assertActions(">S:flametongue weapon>S:water shield");
+    }
+
+    void incompatibles()
+    {
+        engine->addStrategies("melee", "dps", "heal", "caster", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: caster");
+    }
+
+    void aoe()
+    {
+        engine->addStrategy("caster aoe");
+
+        tickWithAttackerCount(3);
+        tickWithAttackerCount(3);
+        tickWithAttackerCount(3);
+        tickWithAttackerCount(3);
+        tickWithAttackerCount(3);
+        tickWithAttackerCount(3);
+
+        assertActions(">S:flametongue totem>T:reach melee>S:magma totem>T:thunderstorm>T:fire nova>T:chain lightning");
+    }
+
+    void snare()
+    {
+        tickWithTargetIsMoving();
+
+        assertActions(">T:frost shock");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( CasterShamanTestCase );
diff --git a/src/tests/CatDpsDruidTestCase.cpp b/src/tests/CatDpsDruidTestCase.cpp
new file mode 100644
index 00000000000..0de5cbd7bc9
--- /dev/null
+++ b/src/tests/CatDpsDruidTestCase.cpp
@@ -0,0 +1,133 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/druid/DruidAiObjectContext.h"
+
+using namespace ai;
+
+
+class CatDpsDruidTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( CatDpsDruidTestCase );
+    CPPUNIT_TEST( combatVsMelee );
+    CPPUNIT_TEST( healHimself );
+    CPPUNIT_TEST( intensiveHealing );
+    CPPUNIT_TEST( healOthers );
+    CPPUNIT_TEST( boost );
+    CPPUNIT_TEST( cower );
+    CPPUNIT_TEST( buff );
+	CPPUNIT_TEST( aoe );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    virtual void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new DruidAiObjectContext(ai), "cat", NULL);
+
+		addAura("cat form");
+        addAura("thorns");
+		addTargetAura("faerie fire (feral)");
+    }
+
+protected:
+
+    void combatVsMelee()
+    {
+		tickInMeleeRange();
+
+		tick();
+
+        tickWithComboPoints(5);
+        tickWithComboPoints(5);
+
+		assertActions(">T:rake>T:mangle (cat)>T:ferocious bite>T:rip");
+    }
+
+	void healHimself()
+	{
+		addAura("cat form");
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        tickWithLowHealth(1);
+        tickWithLowHealth(1);
+        tickWithLowHealth(1);
+        tickWithLowHealth(1);
+
+        assertActions(">S:caster form>S:regrowth>S:survival instincts>S:barskin>S:regrowth>S:healing touch");
+	}
+
+    void intensiveHealing()
+    {
+		tickWithLowHealth(1);
+
+		assertActions(">S:survival instincts");
+    }
+
+    void healOthers()
+    {
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        addAura("dire bear form");
+        tickWithPartyLowHealth(39);
+        tickWithPartyLowHealth(39);
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        addAura("cat form");
+        tickWithPartyLowHealth(1);
+        tickWithPartyLowHealth(1);
+        tickWithPartyLowHealth(1);
+
+        assertActions(">S:caster form>P:regrowth on party>S:caster form>P:regrowth on party>P:healing touch on party");
+    }
+
+    void boost()
+    {
+		tickWithBalancePercent(49);
+
+		assertActions(">S:tiger's fury");
+    }
+
+    void cower()
+    {
+		tickWithMyAttackerCount(2);
+
+		assertActions(">S:cower");
+    }
+
+    void buff()
+    {
+        removeAura("cat form");
+        removeAura("thorns");
+        tick();
+        addAura("cat form");
+
+        removeTargetAura("faerie fire (feral)");
+        tickInMeleeRange();
+
+        assertActions(">S:cat form>T:faerie fire (feral)");
+    }
+
+    void aoe()
+    {
+        engine->addStrategy("cat aoe");
+
+		tickInMeleeRange();
+		tickWithAttackerCount(3);
+
+		assertActions(">T:rake>T:swipe (cat)");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( CatDpsDruidTestCase );
diff --git a/src/tests/ChatCommandTestCase.cpp b/src/tests/ChatCommandTestCase.cpp
new file mode 100644
index 00000000000..50e3a956415
--- /dev/null
+++ b/src/tests/ChatCommandTestCase.cpp
@@ -0,0 +1,454 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "MockAiObjectContext.h"
+#include "MockedAiObjectContextTestCase.h"
+#include "../game/playerbot/strategy/generic/ChatCommandHandlerStrategy.h"
+
+using namespace ai;
+
+
+class ChatCommandTestCase : public MockedAiObjectContextTestCase
+{
+  CPPUNIT_TEST_SUITE( ChatCommandTestCase );
+      CPPUNIT_TEST( stats );
+      CPPUNIT_TEST( leave );
+      CPPUNIT_TEST( quests );
+      CPPUNIT_TEST( reputation );
+      CPPUNIT_TEST( log );
+      CPPUNIT_TEST( los );
+      CPPUNIT_TEST( drop );
+      CPPUNIT_TEST( query );
+      CPPUNIT_TEST( ll );
+      CPPUNIT_TEST( loot_all );
+      CPPUNIT_TEST( release );
+      CPPUNIT_TEST( teleport );
+      CPPUNIT_TEST( taxi );
+      CPPUNIT_TEST( repair );
+      CPPUNIT_TEST( use );
+      CPPUNIT_TEST( item_count );
+      CPPUNIT_TEST( reward );
+      CPPUNIT_TEST( trade );
+      CPPUNIT_TEST( equip );
+      CPPUNIT_TEST( unequip );
+      CPPUNIT_TEST( sell );
+      CPPUNIT_TEST( buy );
+      CPPUNIT_TEST( talents );
+      CPPUNIT_TEST( spells );
+      CPPUNIT_TEST( strategy );
+      CPPUNIT_TEST( trainer );
+      CPPUNIT_TEST( attack );
+      CPPUNIT_TEST( chat );
+      CPPUNIT_TEST( accept );
+      CPPUNIT_TEST( home );
+      CPPUNIT_TEST( destroy );
+      CPPUNIT_TEST( reset_ai );
+      CPPUNIT_TEST( emote );
+      CPPUNIT_TEST( buff );
+      CPPUNIT_TEST( help );
+      CPPUNIT_TEST( gb );
+      CPPUNIT_TEST( bank );
+      CPPUNIT_TEST( follow );
+      CPPUNIT_TEST( flee );
+      CPPUNIT_TEST( stay );
+      CPPUNIT_TEST( grind );
+      CPPUNIT_TEST( tank_attack );
+      CPPUNIT_TEST( talk );
+      CPPUNIT_TEST( cast );
+      CPPUNIT_TEST( invite );
+      CPPUNIT_TEST( spell );
+      CPPUNIT_TEST( rti );
+      CPPUNIT_TEST( revive );
+      CPPUNIT_TEST( runaway );
+      CPPUNIT_TEST( warning );
+      CPPUNIT_TEST( position );
+      CPPUNIT_TEST( summon );
+      CPPUNIT_TEST( who );
+      CPPUNIT_TEST( save_mana );
+      CPPUNIT_TEST( max_dps );
+      CPPUNIT_TEST( tell_attackers );
+      CPPUNIT_TEST( formation );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(context = new MockAiObjectContext(ai, new AiObjectContext(ai), &ai->buffer), "chat", NULL);
+    }
+
+protected:
+ 	void stats()
+	{
+        assertCommand("stats");
+	}
+
+    void leave()
+    {
+        assertCommand("leave");
+    }
+
+    void reputation()
+    {
+        assertCommand("rep", "reputation");
+        assertCommand("reputation");
+    }
+
+    void quests()
+    {
+        assertCommand("quests");
+        assertParametrizedCommand("quests", "summary");
+        assertParametrizedCommand("quests", "completed");
+        assertParametrizedCommand("quests", "incompleted");
+    }
+
+    void log()
+    {
+        assertCommand("log");
+        assertParametrizedCommand("log", "debug");
+    }
+
+    void los()
+    {
+        assertCommand("los");
+        assertParametrizedCommand("los", "targets");
+        assertParametrizedCommand("los", "npcs");
+        assertParametrizedCommand("los", "gos");
+        assertParametrizedCommand("los", "game objects");
+        assertParametrizedCommand("los", "corpses");
+    }
+
+    void drop()
+    {
+        assertCommand("drop");
+    }
+
+    void query()
+    {
+        trigger("q");
+        tick();
+        tick();
+
+        assertActions(">S:query quest>S:query item usage");
+    }
+
+    void ll()
+    {
+        assertCommand("ll");
+        assertParametrizedCommand("ll", "?");
+        assertParametrizedCommand("ll", "[item]");
+        assertParametrizedCommand("ll", "-[item]");
+        assertParametrizedCommand("ll", "all");
+    }
+
+    void loot_all()
+    {
+        trigger("add all loot");
+        tick();
+        tick();
+
+        assertActions(">S:add all loot>S:loot");
+    }
+
+    void release()
+    {
+        assertCommand("release");
+    }
+
+    void teleport()
+    {
+        assertCommand("teleport");
+    }
+
+    void taxi()
+    {
+        assertCommand("taxi");
+    }
+
+    void repair()
+    {
+        assertCommand("repair");
+    }
+
+    void use()
+    {
+        trigger("u");
+        tick();
+
+        assertActions(">S:use");
+    }
+
+    void item_count()
+    {
+        trigger("c");
+        tick();
+
+        assertActions(">S:item count");
+    }
+
+    void reward()
+    {
+        trigger("r");
+        tick();
+
+        assertActions(">S:reward");
+    }
+    void trade()
+    {
+        trigger("t");
+        tick();
+        trigger("nt");
+        tick();
+
+        assertActions(">S:trade>S:trade");
+    }
+    void sell()
+    {
+        trigger("s");
+        tick();
+
+        assertActions(">S:sell");
+    }
+    void buy()
+    {
+        trigger("b");
+        tick();
+
+        assertActions(">S:buy");
+    }
+    void equip()
+    {
+        trigger("e");
+        tick();
+
+        assertActions(">S:equip");
+    }
+    void unequip()
+    {
+        trigger("ue");
+        tick();
+
+        assertActions(">S:unequip");
+    }
+
+    void talents()
+    {
+        assertParametrizedCommand("talents", "1");
+        assertParametrizedCommand("talents", "2");
+    }
+
+    void spells()
+    {
+        assertCommand("spells");
+    }
+
+    void strategy()
+    {
+        assertParametrizedCommand("co", "?");
+        assertParametrizedCommand("nc", "?");
+        assertParametrizedCommand("dead", "?");
+    }
+
+    void trainer()
+    {
+        assertParametrizedCommand("trainer", "?");
+        assertParametrizedCommand("trainer", "learn");
+    }
+
+    void attack()
+    {
+        trigger("attack");
+        tick();
+        assertActions(">S:attack my target");
+    }
+
+    void chat()
+    {
+        assertParametrizedCommand("chat", "?");
+        assertParametrizedCommand("chat", "raid");
+    }
+
+    void accept()
+    {
+        trigger("accept");
+        tick();
+        assertActions(">S:accept quest");
+    }
+
+    void home()
+    {
+        assertCommand("home");
+    }
+
+    void reset_ai()
+    {
+        assertCommand("reset ai");
+    }
+
+    void destroy()
+    {
+        assertCommand("destroy");
+    }
+
+    void emote()
+    {
+        assertCommand("emote");
+    }
+
+    void buff()
+    {
+        assertCommand("buff");
+        assertParametrizedCommand("buff", "?");
+    }
+
+    void help()
+    {
+        assertCommand("help");
+    }
+
+    void follow()
+    {
+        trigger("follow");
+        tick();
+        assertActions(">S:follow chat shortcut");
+    }
+
+    void stay()
+    {
+        trigger("stay");
+        tick();
+        assertActions(">S:stay chat shortcut");
+    }
+
+    void flee()
+    {
+        trigger("flee");
+        tick();
+        assertActions(">S:flee chat shortcut");
+    }
+
+    void grind()
+    {
+        trigger("grind");
+        tick();
+        assertActions(">S:grind chat shortcut");
+    }
+
+    void tank_attack()
+    {
+        trigger("tank attack");
+        tick();
+        tick();
+        assertActions(">S:tank attack chat shortcut>S:attack my target");
+    }
+
+    void gb()
+    {
+        assertParametrizedCommand("gb", "link");
+    }
+
+    void bank()
+    {
+        assertParametrizedCommand("bank", "link");
+    }
+
+    void talk()
+    {
+        trigger("talk");
+        tick();
+        assertActions(">S:gossip hello");
+    }
+
+    void cast()
+    {
+        trigger("cast");
+        tick();
+        assertActions(">S:cast custom spell");
+    }
+
+    void invite()
+    {
+        trigger("invite");
+        tick();
+        assertActions(">S:invite");
+    }
+
+    void spell()
+    {
+        trigger("spell");
+        tick();
+        assertActions(">S:spell");
+    }
+
+    void rti()
+    {
+        trigger("rti");
+        tick();
+        assertActions(">S:rti");
+    }
+
+    void revive()
+    {
+        trigger("revive");
+        tick();
+        assertActions(">S:spirit healer");
+    }
+
+    void runaway()
+    {
+        trigger("runaway");
+        tick();
+        assertActions(">S:runaway chat shortcut");
+    }
+
+    void warning()
+    {
+        trigger("warning");
+        tick();
+        assertActions(">S:runaway chat shortcut");
+    }
+
+    void position()
+    {
+        assertParametrizedCommand("position", "guard");
+    }
+
+    void summon()
+    {
+        assertParametrizedCommand("summon", "summon");
+    }
+
+    void who()
+    {
+        assertCommand("who", "who");
+    }
+
+    void save_mana()
+    {
+        assertParametrizedCommand("save mana", "save mana");
+    }
+
+    void max_dps()
+    {
+        trigger("max dps");
+        tick();
+        assertActions(">S:max dps chat shortcut");
+    }
+
+    void tell_attackers()
+    {
+        trigger("attackers");
+        tick();
+        assertActions(">S:tell attackers");
+    }
+
+    void formation()
+    {
+        trigger("formation");
+        tick();
+        assertActions(">S:formation");
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( ChatCommandTestCase );
diff --git a/src/tests/ChatFilterTestCase.cpp b/src/tests/ChatFilterTestCase.cpp
new file mode 100644
index 00000000000..9b3537d08dc
--- /dev/null
+++ b/src/tests/ChatFilterTestCase.cpp
@@ -0,0 +1,32 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/ChatFilter.h"
+
+using namespace ai;
+
+class ChatFilterTestCase : public CPPUNIT_NS::TestFixture
+{
+public:
+	ChatFilterTestCase() : filter(NULL) {}
+
+  CPPUNIT_TEST_SUITE( ChatFilterTestCase );
+      CPPUNIT_TEST( filter1 );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+	void setUp()
+	{
+	}
+
+protected:
+	ChatFilter filter;
+
+	void filter1()
+	{
+	    string message = filter.Filter("@some message for some");
+	    CPPUNIT_ASSERT(message == "message for some");
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( ChatFilterTestCase );
diff --git a/src/tests/DpsHunterEngineTestCase.cpp b/src/tests/DpsHunterEngineTestCase.cpp
new file mode 100644
index 00000000000..2daa17e8c19
--- /dev/null
+++ b/src/tests/DpsHunterEngineTestCase.cpp
@@ -0,0 +1,160 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/hunter/HunterAiObjectContext.h"
+
+using namespace ai;
+
+class DpsHunterEngineTestCase : public EngineTestBase
+{
+  CPPUNIT_TEST_SUITE( DpsHunterEngineTestCase );
+  CPPUNIT_TEST( combatVsMelee );
+  CPPUNIT_TEST( summonPet );
+  CPPUNIT_TEST( lowMana );
+  CPPUNIT_TEST( boost );
+  CPPUNIT_TEST( cc );
+  CPPUNIT_TEST( aoe );
+  CPPUNIT_TEST( buff );
+  CPPUNIT_TEST( incompatibles );
+  CPPUNIT_TEST( feign_death );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new HunterAiObjectContext(ai), "dps", "dps debuff", NULL);
+		engine->addStrategy("bdps");
+
+        addAura("aspect of the hawk");
+    }
+
+protected:
+ 	void combatVsMelee()
+	{
+        removeAura("aspect of the hawk");
+
+		tick();
+        addAura("aspect of the hawk");
+
+		tick();
+        tick();
+		tick();
+		addTargetAura("serpent sting");
+
+		tick();
+		tick();
+
+		tickInMeleeRange();
+		spellAvailable("wing clip");
+		addTargetAura("wing clip");
+		tickInMeleeRange();
+		tickInSpellRange();
+
+		// resetSpells
+		tickWithSpellUnavailable("aimed shot");
+
+        tick();
+        tick();
+		tickWithSpellAvailable("auto shot");
+
+		assertActions(">S:aspect of the hawk>T:hunter's mark>T:black arrow>T:serpent sting>T:explosive shot>T:auto shot>T:wing clip>S:flee>T:concussive shot>T:wyvern sting>T:chimera shot>T:arcane shot>T:auto shot");
+
+	}
+
+    void lowMana()
+    {
+        spellUnavailable("serpent sting");
+        spellUnavailable("concussive shot");
+        removeAura("aspect of the hawk");
+
+		tickWithLowMana(30);
+
+		tick();
+
+		assertActions(">T:viper sting>S:aspect of the hawk");
+
+    }
+
+    void summonPet()
+    {
+        tickWithNoPet();
+		tickWithPetLowHealth(30);
+
+		assertActions(">S:call pet>Pet:mend pet");
+	}
+
+
+    void boost()
+    {
+		tick();
+        spellUnavailable("serpent sting");
+
+		tickWithBalancePercent(1);
+		tickWithBalancePercent(1);
+
+		assertActions(">T:hunter's mark>S:rapid fire>S:readiness");
+    }
+
+
+    void cc()
+    {
+        tickWithCcTarget("freezing trap");
+
+        assertActions(">Cc:freezing trap");
+    }
+
+    void aoe()
+    {
+        engine->addStrategy("aoe");
+
+		addTargetAura("hunter's mark");
+		addTargetAura("black arrow");
+		addTargetAura("serpent sting");
+        tickWithAttackerCount(3);
+		tickWithAttackerCount(4);
+
+        set<Unit*>("attacker without aura", "serpent sting", MockedTargets::GetAttackerWithoutAura());
+        tick();
+
+        set<Unit*>("attacker without aura", "serpent sting", NULL);
+        tick();
+
+		assertActions(">T:multi-shot>T:volley>A:serpent sting on attacker>T:explosive shot");
+    }
+
+	void buff()
+	{
+		engine->removeStrategy("bdps");
+		engine->addStrategy("rnature");
+		removeAura("aspect of the hawk");
+
+		tick();
+		addAura("aspect of the wild");
+
+		assertActions(">S:aspect of the wild");
+
+	}
+
+    void incompatibles()
+    {
+        engine->removeStrategy("dps");
+        engine->removeStrategy("dps debuff");
+        engine->addStrategies("bdps", "bspeed", "rnature", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: rnature");
+    }
+
+    void feign_death()
+    {
+        tick();
+
+        tickWithMyAttackerCount(3);
+        set<float>("distance", "current target", 5);
+        tickWithMyAttackerCount(3);
+
+        assertActions(">T:hunter's mark>S:feign death>S:flee");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( DpsHunterEngineTestCase );
diff --git a/src/tests/DpsPaladinTestCase.cpp b/src/tests/DpsPaladinTestCase.cpp
new file mode 100644
index 00000000000..0d187909b8f
--- /dev/null
+++ b/src/tests/DpsPaladinTestCase.cpp
@@ -0,0 +1,73 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/paladin/PaladinAiObjectContext.h"
+
+using namespace ai;
+
+
+class DpsPaladinTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( DpsPaladinTestCase );
+    CPPUNIT_TEST( buff );
+	CPPUNIT_TEST( combatVsMelee );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+	virtual void setUp()
+	{
+		EngineTestBase::setUp();
+		setupEngine(new PaladinAiObjectContext(ai), "dps", NULL);
+		engine->addStrategy("bdps");
+
+        addAura("retribution aura");
+        addAura("seal of vengeance");
+        addAura("blessing of might");
+
+        set<float>("distance", "current target", 0.0f);
+    }
+ 
+protected:
+    void buff()
+    {
+        removeAura("retribution aura");
+        removeAura("blessing of might");
+        removeAura("seal of vengeance");
+        removeAura("holy shield");
+        
+        tick();
+        addAura("devotion aura");
+        
+        tick();
+        tick();
+        tick();
+        tick();
+        addAura("seal of wisdom");
+
+        tick();
+        tick(); 
+        addAura("blessing of kings");
+                
+        assertActions(">S:retribution aura>S:seal of vengeance>S:seal of command>S:seal of wisdom>S:seal of justice>S:blessing of might>S:blessing of kings");
+    }
+
+    void combatVsMelee()
+    {
+		tickOutOfMeleeRange();
+        
+        tick(); 
+		tick(); 
+		addTargetAura("judgement of wisdom");
+		
+		tick();
+
+		tickWithAttackerCount(3);
+		tickWithAttackerCount(3);
+
+		tickWithTargetLowHealth(19);
+
+		assertActions(">T:reach melee>T:judgement of wisdom>T:judgement of light>T:crusader strike>S:divine storm>T:consecration>T:hammer of wrath");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( DpsPaladinTestCase );
diff --git a/src/tests/DpsPriestTestCase.cpp b/src/tests/DpsPriestTestCase.cpp
new file mode 100644
index 00000000000..13c57fa8113
--- /dev/null
+++ b/src/tests/DpsPriestTestCase.cpp
@@ -0,0 +1,88 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/priest/PriestAiObjectContext.h"
+
+using namespace ai;
+
+
+class DpsPriestTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( DpsPriestTestCase );
+    CPPUNIT_TEST( combat );
+    CPPUNIT_TEST( low_mana );
+    CPPUNIT_TEST( aoe );
+    CPPUNIT_TEST_SUITE_END();
+
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new PriestAiObjectContext(ai), "dps", "dps debuff", NULL);
+
+        addAura("power word: fortitude");
+        addAura("divine spirit");
+        addAura("inner fire");
+        addPartyAura("power word: fortitude");
+        addPartyAura("divine spirit");
+    }
+
+protected:
+    void combat()
+    {
+        tick();
+        addAura("vampiric embrace");
+
+        tick();
+        addAura("shadowform");
+
+        tick();
+        tick();
+        tick();
+        tick();
+        tick();
+        tick();
+
+        tickWithLowHealth(39);
+        tickWithLowHealth(39);
+        tickWithLowHealth(39);
+
+        spellAvailable("power word: shield");
+        spellAvailable("greater heal");
+        addAura("shadowform");
+        tickWithLowHealth(1);
+        tickWithLowHealth(1);
+        tickWithLowHealth(1);
+
+        assertActions(">S:vampiric embrace>S:shadowform>T:devouring plague>T:shadow word: pain>T:vampiric touch>T:mind blast>T:mind flay>T:shoot>S:remove shadowform>S:power word: shield>S:greater heal>S:remove shadowform>S:power word: shield>S:flash heal");
+    }
+
+    void low_mana()
+    {
+        tickWithLowMana(1);
+
+        assertActions(">S:dispersion");
+    }
+
+    void aoe()
+    {
+        addAura("vampiric embrace");
+        addAura("shadowform");
+        addTargetAura("devouring plague");
+        addTargetAura("shadow word: pain");
+        addTargetAura("vampiric touch");
+
+        engine->addStrategy("aoe");
+
+        set<Unit*>("attacker without aura", "shadow word: pain", MockedTargets::GetAttackerWithoutAura());
+        tick();
+
+        set<Unit*>("attacker without aura", "shadow word: pain", NULL);
+        tick();
+
+        assertActions(">A:shadow word: pain on attacker>T:mind blast");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( DpsPriestTestCase );
diff --git a/src/tests/DpsRogueTestCase.cpp b/src/tests/DpsRogueTestCase.cpp
new file mode 100644
index 00000000000..5da638d311f
--- /dev/null
+++ b/src/tests/DpsRogueTestCase.cpp
@@ -0,0 +1,74 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/rogue/RogueAiObjectContext.h"
+
+using namespace ai;
+
+
+class DpsRogueTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( DpsRogueTestCase );
+		CPPUNIT_TEST( combatVsMelee );
+		CPPUNIT_TEST( healHimself );
+		CPPUNIT_TEST( interruptSpells );
+		CPPUNIT_TEST( interrupt_enemy_healer );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    virtual void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new RogueAiObjectContext(ai), "dps", NULL);
+        addAura("slice and dice");
+        addTargetAura("rupture");
+    }
+
+protected:
+    void combatVsMelee()
+    {
+        removeTargetAura("rupture");
+
+		tickOutOfMeleeRange();
+		tickInMeleeRange();
+		tick();
+
+		tickWithEnergy(70);
+        tickWithEnergy(70);
+
+        tickWithComboPoints(5);
+        tickWithComboPoints(5);
+
+        tickBehindTarget();
+
+        assertActions(">T:reach melee>T:riposte>T:mutilate>T:sinister strike>T:melee>T:rupture>T:eviscerate>T:backstab");
+    }
+
+	void healHimself()
+	{
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+		tickWithMyAttackerCount(3);
+
+		assertActions(">S:evasion>S:feint>S:vanish");
+	}
+
+	void interruptSpells()
+	{
+        tickInMeleeRange();
+
+		tickWithTargetIsCastingNonMeleeSpell();
+		tickWithTargetIsCastingNonMeleeSpell();
+
+		assertActions(">T:riposte>T:kick>T:kidney shot");
+	}
+
+	void interrupt_enemy_healer()
+	{
+	    tickWithEnemyHealerIsCastingInterruptableSpell("kick");
+
+		assertActions(">H:kick on enemy healer");
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( DpsRogueTestCase );
diff --git a/src/tests/DpsWarlockTestCase.cpp b/src/tests/DpsWarlockTestCase.cpp
new file mode 100644
index 00000000000..5d37180002a
--- /dev/null
+++ b/src/tests/DpsWarlockTestCase.cpp
@@ -0,0 +1,93 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/warlock/WarlockAiObjectContext.h"
+
+using namespace ai;
+
+
+class DpsWarlockTestCase : public EngineTestBase
+{
+  CPPUNIT_TEST_SUITE( DpsWarlockTestCase );
+      CPPUNIT_TEST( combatVsMelee );
+      CPPUNIT_TEST( aoe );
+      CPPUNIT_TEST( low_mana );
+      CPPUNIT_TEST( cc );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+        EngineTestBase::setUp();
+        setupEngine(new WarlockAiObjectContext(ai), "dps", "dps debuff", NULL);
+    }
+
+protected:
+ 	void combatVsMelee()
+	{
+ 	    tick();
+ 	    addTargetAura("immolate");
+
+ 	    tick();
+
+        tick();
+        addTargetAura("corruption");
+        tick();
+        addTargetAura("curse of agony");
+
+        tick();
+
+        tickWithLowHealth(49);
+
+        tick();
+
+		tickWithTargetLowHealth(19);
+
+        set<uint8>("item count", "soul shard", 2);
+		spellAvailable("drain soul");
+		tick();
+
+		spellAvailable("shadow bolt");
+		addAura("shadow trance");
+		tick();
+
+        spellAvailable("shadow bolt");
+		addAura("backlash");
+		tick();
+
+		assertActions(">T:immolate>T:conflagrate>T:corruption>T:curse of agony>T:incinirate>T:drain life>T:shadow bolt>T:drain soul>T:shoot>T:shadow bolt>T:shadow bolt");
+	}
+
+    void low_mana()
+    {
+        tickWithLowMana(1);
+
+		assertActions(">S:life tap");
+    }
+
+    void aoe()
+    {
+        engine->addStrategy("aoe");
+
+        tickWithAttackerCount(2);
+        tickWithAttackerCount(3);
+        tickWithAttackerCount(4);
+
+        set<Unit*>("attacker without aura", "corruption", MockedTargets::GetAttackerWithoutAura());
+        tick();
+
+        set<Unit*>("attacker without aura", "corruption", NULL);
+        tick();
+
+		assertActions(">T:shadowfury>T:seed of corruption>T:rain of fire>A:corruption on attacker>T:immolate");
+    }
+
+    void cc()
+    {
+        tickWithCcTarget("fear");
+
+        assertActions(">Cc:fear on cc");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( DpsWarlockTestCase );
diff --git a/src/tests/DpsWarriorTestCase.cpp b/src/tests/DpsWarriorTestCase.cpp
new file mode 100644
index 00000000000..a8b266e6321
--- /dev/null
+++ b/src/tests/DpsWarriorTestCase.cpp
@@ -0,0 +1,127 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/warrior/WarriorAiObjectContext.h"
+
+using namespace ai;
+
+
+class DpsWarriorTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( DpsWarriorTestCase );
+    CPPUNIT_TEST( buff );
+    CPPUNIT_TEST( combatVsMelee );
+    CPPUNIT_TEST( boost );
+    CPPUNIT_TEST( execute );
+    CPPUNIT_TEST( hamstring );
+	CPPUNIT_TEST( victoryRush );
+	CPPUNIT_TEST( aoe );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+        EngineTestBase::setUp();
+        setupEngine(new WarriorAiObjectContext(ai), "dps", NULL);
+
+		spellUnavailable("revenge");
+        addAura("battle shout");
+        set<uint8>("rage", "self target", 20);
+    }
+
+protected:
+    void buff()
+    {
+        removeAura("battle shout");
+
+        tickInSpellRange(); // reach melee
+		tickInMeleeRange();
+        tick();
+
+		assertActions(">S:battle shout>S:battle stance>T:charge");
+
+    }
+
+    void combatVsMelee()
+    {
+		tickInSpellRange();
+		tickInSpellRange();
+
+		tickInMeleeRange();
+
+		tickInSpellRange();
+
+		tickInMeleeRange();
+
+        tick();
+        addTargetAura("rend");
+
+        tick();
+
+        set<uint8>("rage", "self target", 0);
+        tick();
+
+		assertActions(">S:battle stance>T:charge>T:bloodthirst>T:reach melee>T:rend>T:heroic strike>T:melee>S:bloodrage");
+    }
+
+    void boost()
+    {
+        tickInMeleeRange(); // battle stance
+
+		tickWithBalancePercent(1);
+		tickWithBalancePercent(1);
+
+		assertActions(">S:battle stance>S:death wish>S:berserker rage");
+    }
+
+    void execute()
+    {
+        tickInMeleeRange(); // battle stance
+
+		tickWithTargetLowHealth(19);
+
+		assertActions(">S:battle stance>T:execute");
+    }
+
+
+    void hamstring ()
+    {
+		tickInMeleeRange(); // reach melee
+
+		tickWithTargetIsMoving();
+
+		assertActions(">S:battle stance>T:hamstring");
+    }
+
+
+	void victoryRush()
+	{
+		tickInMeleeRange();
+		addAura("victory rush");
+
+		tick();
+
+		assertActions(">S:battle stance>T:victory rush");
+	}
+
+    void aoe()
+    {
+        engine->addStrategy("aoe");
+
+        tickInMeleeRange();
+
+        tickWithAttackerCount(3);
+        tickWithAttackerCount(3);
+        tickWithAttackerCount(3);
+
+        set<Unit*>("attacker without aura", "rend", MockedTargets::GetAttackerWithoutAura());
+        tickInMeleeRange();
+
+        set<Unit*>("attacker without aura", "rend", NULL);
+        tickInMeleeRange();
+
+        assertActions(">S:battle stance>T:cleave>T:thunder clap>T:demoralizing shout>A:rend on attacker>T:bloodthirst");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( DpsWarriorTestCase );
diff --git a/src/tests/DruidNonCombatTestCase.cpp b/src/tests/DruidNonCombatTestCase.cpp
new file mode 100644
index 00000000000..d8da730f94c
--- /dev/null
+++ b/src/tests/DruidNonCombatTestCase.cpp
@@ -0,0 +1,70 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/druid/DruidAiObjectContext.h"
+
+using namespace ai;
+
+
+class DruidNonCombatTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( DruidNonCombatTestCase );
+    CPPUNIT_TEST( buff );
+    CPPUNIT_TEST( low_mana );
+	CPPUNIT_TEST( resurrect );
+	CPPUNIT_TEST( dispel );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new DruidAiObjectContext(ai), "nc", NULL);
+    }
+
+protected:
+    void buff()
+    {
+		tick();
+		addAura("mark of the wild");
+                
+		tickWithSpellAvailable("mark of the wild");
+        
+		assertActions(">S:mark of the wild>P:mark of the wild on party");
+    }
+
+	void resurrect()
+	{
+		tickWithDeadPartyMember();
+
+		assertActions(">P:revive");
+	}
+
+	void low_mana()
+	{
+	    engine->addStrategy("flee");
+        set<uint8>("item count", "drink", 1);
+        tickWithLowMana(5);
+        tickWithLowMana(5);
+
+        set<uint8>("item count", "drink", 0);
+        tickWithLowMana(5);
+
+        assertActions(">S:innervate>S:drink>S:flee");
+    }
+
+    void dispel()
+    {
+        tickWithAuraToDispel(DISPEL_POISON);
+        tickWithAuraToDispel(DISPEL_POISON);
+
+        spellAvailable("abolish poison");
+        spellAvailable("cure poison");
+        tickWithPartyAuraToDispel(DISPEL_POISON);
+        tickWithPartyAuraToDispel(DISPEL_POISON);
+
+        assertActions(">S:abolish poison>S:cure poison>P:abolish poison on party>P:cure poison on party");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( DruidNonCombatTestCase );
diff --git a/src/tests/DuelTestCase.cpp b/src/tests/DuelTestCase.cpp
new file mode 100644
index 00000000000..fa49f277b34
--- /dev/null
+++ b/src/tests/DuelTestCase.cpp
@@ -0,0 +1,44 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "MockAiObjectContext.h"
+#include "MockedAiObjectContextTestCase.h"
+#include "../game/playerbot/strategy/generic/ChatCommandHandlerStrategy.h"
+
+using namespace ai;
+
+
+class DuelTestCase : public MockedAiObjectContextTestCase
+{
+  CPPUNIT_TEST_SUITE( DuelTestCase );
+      CPPUNIT_TEST( accept );
+      CPPUNIT_TEST( attack );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(context = new MockAiObjectContext(ai, new AiObjectContext(ai), &ai->buffer), "default", "duel", NULL);
+    }
+
+protected:
+    void accept()
+    {
+        trigger("duel requested");
+        tick();
+
+        assertActions(">S:accept duel");
+    }
+    void attack()
+    {
+        trigger("no attackers");
+        context->GetValue<Unit*>("duel target")->Set(MockedTargets::GetDuelTarget());
+        tick();
+        context->GetValue<Unit*>("duel target")->Set(NULL);
+
+        assertActions(">S:attack duel opponent");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( DuelTestCase );
diff --git a/src/tests/EngineTestBase.cpp b/src/tests/EngineTestBase.cpp
new file mode 100644
index 00000000000..8cf4dec5ecb
--- /dev/null
+++ b/src/tests/EngineTestBase.cpp
@@ -0,0 +1,479 @@
+#include "pch.h"
+#include "aitest.h"
+#include "EngineTestBase.h"
+#include "MockedTargets.h"
+#include "AiObjectContextWrapper.h"
+
+class TestActionExecutionListener : public ActionExecutionListener
+{
+public:
+    TestActionExecutionListener(MockPlayerbotAIBase *ai) : ai(ai) {}
+
+    virtual bool Before(Action* action, Event event) { return true; }
+    virtual bool AllowExecution(Action* action, Event event) { return false; }
+    virtual bool OverrideResult(Action* action, bool executed, Event event) { return executed; }
+    virtual void After(Action* action, bool executed, Event event)
+    {
+        string name = action->getName();
+
+        ai->buffer.append(">");
+        MockedTargets::Append(ai->buffer, action->GetTarget());
+        ai->buffer.append(":");
+        ai->buffer.append(name);
+
+        if (!event.getParam().empty())
+        {
+            ai->buffer.append("(");
+            ai->buffer.append(event.getParam());
+            ai->buffer.append(")");
+        }
+
+        if (name == "caster form")
+        {
+            ai->auras[MockedTargets::GetSelf()].remove("dire bear form");
+            ai->auras[MockedTargets::GetSelf()].remove("bear form");
+            ai->auras[MockedTargets::GetSelf()].remove("cat form");
+            ai->auras[MockedTargets::GetSelf()].remove("moonkin form");
+            ai->auras[MockedTargets::GetSelf()].remove("travel form");
+            ai->auras[MockedTargets::GetSelf()].remove("aquatic form");
+        }
+        if (name == "remove shadowform")
+        {
+            ai->auras[MockedTargets::GetSelf()].remove("shadowform");
+        }
+        if (name == "reach melee" ||
+                name == "feral charge - bear" || name == "feral charge - cat" ||
+                name == "charge")
+        {
+            ai->GetAiObjectContext()->GetValue<float>("distance", "current target")->Set(ATTACK_DISTANCE - 1);
+        }
+
+        remove(name, " on party");
+        remove(name, " on cc");
+        remove(name, " on enemy healer");
+        if (name.find("cleanse") != string ::npos)
+            name = "cleanse";
+        if (name.find("purify") != string ::npos)
+            name = "purify";
+
+        ai->spellCooldowns.push_back(name);
+    }
+
+    void remove(string & name, string pattern)
+    {
+        size_t pos = name.find(pattern);
+        if (pos != string ::npos)
+            name = name.substr(0, pos);
+    }
+
+private:
+    MockPlayerbotAIBase *ai;
+};
+
+
+void EngineTestBase::setUp()
+{
+	ai = new MockPlayerbotAIBase();
+}
+
+void EngineTestBase::tearDown()
+{
+    if (engine)
+        delete engine;
+    if (ai)
+        delete ai;
+}
+
+void EngineTestBase::va_generic(void (EngineTestBase::*callback)(const char*), va_list vl)
+{
+	const char* cur;
+	do
+	{
+		cur = va_arg(vl, const char*);
+		if (cur)
+			(this->*callback)(cur);
+	}
+	while (cur);
+
+	va_end(vl);
+}
+
+
+void EngineTestBase::setupEngine(AiObjectContext* aiObjectContext, ...)
+{
+    context = new AiObjectContextWrapper(ai, aiObjectContext);
+    ai->SetContext(context);
+    engine = new Engine(ai, context);
+	engine->testMode = true;
+    engine->AddActionExecutionListener(new TestActionExecutionListener(ai));
+
+	va_list vl;
+	va_start(vl, aiObjectContext);
+
+	va_generic(&EngineTestBase::setupEngineCallback, vl);
+
+	engine->Init();
+}
+
+void EngineTestBase::setupEngineCallback(const char* name)
+{
+	engine->addStrategy(name);
+}
+
+void EngineTestBase::tick()
+{
+	engine->DoNextAction(NULL);
+}
+
+void EngineTestBase::assertActions(string  expected)
+{
+	bool pass = ai->buffer == expected;
+	if (!pass)
+	{
+		std::cout << "\n===\n";
+		std::cout << "Exp: " << expected << "\n";
+		std::cout << "Act: " << ai->buffer << "\n";
+		std::cout << "===\n";
+	}
+    CPPUNIT_ASSERT(pass);
+}
+
+void EngineTestBase::tickWithNoTarget()
+{
+    context->GetValue<Unit*>("current target")->Set(NULL);
+    set<uint8>("my attacker count", 0);
+
+	tick();
+
+    set<uint8>("my attacker count", 1);
+    context->GetValue<Unit*>("current target")->Set(MockedTargets::GetCurrentTarget());
+}
+
+void EngineTestBase::spellUnavailable(string  spell)
+{
+	ai->spellCooldowns.push_back(spell);
+}
+
+void EngineTestBase::tickWithSpellUnavailable(string  spell)
+{
+	spellUnavailable(spell);
+	tick();
+}
+
+void EngineTestBase::tickWithSpellAvailable(string  spell)
+{
+	spellAvailable(spell);
+	tick();
+}
+
+void EngineTestBase::spellAvailable(string  spell)
+{
+    list<string > remove;
+    for (list<string >::iterator i = ai->spellCooldowns.begin(); i != ai->spellCooldowns.end(); i++)
+    {
+        if (i->find(spell) != string ::npos) remove.push_back(*i);
+    }
+    for (list<string >::iterator i = remove.begin(); i != remove.end(); i++)
+    {
+        ai->spellCooldowns.remove(*i);
+    }
+}
+
+void EngineTestBase::addAura(string  spell)
+{
+	ai->auras[MockedTargets::GetSelf()].push_back(spell);
+}
+
+void EngineTestBase::removeAura(string  spell)
+{
+	ai->auras[MockedTargets::GetSelf()].remove(spell);
+}
+
+void EngineTestBase::tickOutOfSpellRange()
+{
+    set<float>("distance", "current target", 49.0f);
+    tick();
+    set<float>("distance", "current target", 15.0f);
+}
+
+void EngineTestBase::tickOutOfMeleeRange()
+{
+    set<float>("distance", "current target", 15.0f);
+    tick();
+    set<float>("distance", "current target", ATTACK_DISTANCE - 1);
+}
+
+void EngineTestBase::setInMeleeRange()
+{
+    set<float>("distance", "current target", ATTACK_DISTANCE - 1);
+}
+
+void EngineTestBase::tickInMeleeRange()
+{
+    set<float>("distance", "current target", ATTACK_DISTANCE - 1);
+	tick();
+}
+
+void EngineTestBase::tickWithNoAggro()
+{
+    set<bool>("has aggro", "current target", false);
+    tick();
+    set<bool>("has aggro", "current target", true);
+}
+
+void EngineTestBase::tickWithRage(int amount)
+{
+    set<uint8>("rage", "self target", amount);
+    tick();
+    set<uint8>("rage", "self target", 0);
+}
+
+void EngineTestBase::tickWithEnergy(int amount)
+{
+    set<uint8>("energy", "self target", amount);
+	tick();
+    set<uint8>("energy", "self target", 0);
+}
+
+void EngineTestBase::tickWithAttackerCount(int count)
+{
+    set<uint8>("attacker count", count);
+	tick();
+    set<uint8>("attacker count", 1);
+}
+
+void EngineTestBase::tickWithMyAttackerCount(int count)
+{
+    set<uint8>("my attacker count", count);
+	tickWithAttackerCount(count + 1);
+    set<uint8>("my attacker count", 1);
+}
+
+void EngineTestBase::tickWithLowHealth(int amount)
+{
+	lowHealth(amount);
+	tick();
+	healthRestored();
+}
+
+void EngineTestBase::tickWithPartyLowHealth(int amount)
+{
+    set<uint8>("health", "party member to heal", amount);
+	tick();
+    set<uint8>("health", "party member to heal", 100);
+}
+
+void EngineTestBase::tickWithAoeHeal(string type, int amount)
+{
+    set<uint8>("health", "party member to heal", 45);
+	set<uint8>("aoe heal", "medium", amount);
+	tick();
+	set<uint8>("aoe heal", "medium", 0);
+    set<uint8>("health", "party member to heal", 100);
+}
+
+void EngineTestBase::tickWithAuraToDispel(uint32 type)
+{
+	ai->dispels[MockedTargets::GetSelf()] = type;
+	tick();
+	ai->dispels[MockedTargets::GetSelf()] = 0;
+}
+
+void EngineTestBase::tickWithPartyAuraToDispel(uint32 type)
+{
+	ai->dispels[MockedTargets::GetPartyMember()] = type;
+	tick();
+	ai->dispels[MockedTargets::GetPartyMember()] = 0;
+}
+
+void EngineTestBase::tickWithTargetAuraToDispel(uint32 type)
+{
+	ai->dispels[MockedTargets::GetCurrentTarget()] = type;
+	tick();
+	ai->dispels[MockedTargets::GetCurrentTarget()] = 0;
+}
+
+void EngineTestBase::lowHealth(int amount)
+{
+    set<uint8>("health", "self target", amount);
+}
+
+void EngineTestBase::lowMana(int amount)
+{
+    set<uint8>("mana", "self target", amount);
+}
+
+void EngineTestBase::healthRestored()
+{
+    set<uint8>("health", "self target", 100);
+}
+
+void EngineTestBase::tickWithComboPoints(int amount)
+{
+    set<uint8>("combo", "current target", amount);
+	tick();
+    set<uint8>("combo", "current target", 0);
+}
+
+void EngineTestBase::tickWithTargetIsCastingNonMeleeSpell()
+{
+    ai->targetIsCastingNonMeleeSpell = true;
+    tick();
+    ai->targetIsCastingNonMeleeSpell = false;
+}
+
+void EngineTestBase::tickWithBalancePercent(int percent)
+{
+    set<uint8>("balance", percent);
+	tick();
+    set<uint8>("balance", 100);
+}
+
+void EngineTestBase::tickWithNoPet()
+{
+    context->GetValue<Unit*>("pet target")->Set(NULL);
+	tick();
+    context->GetValue<Unit*>("pet target")->Set(MockedTargets::GetPet());
+}
+
+void EngineTestBase::tickWithPetLowHealth(int amount)
+{
+    set<uint8>("health", "pet target", amount);
+	tick();
+    set<uint8>("health", "pet target", 100);
+}
+
+void EngineTestBase::tickWithPetDead()
+{
+    set<bool>("dead", "pet target", true);
+    tick();
+    set<bool>("dead", "pet target", false);
+}
+
+void EngineTestBase::tickWithLowMana(int amount)
+{
+    Value<float>* distance = context->GetValue<float>("distance", "current target");
+    float oldDistance = distance->Get();
+    distance->Set(5.0f);
+    set<uint8>("mana", "self target", amount);
+    tick();
+    set<uint8>("mana", "self target", 100);
+    distance->Set(oldDistance);
+}
+
+void EngineTestBase::tickWithTargetLowHealth(int amount)
+{
+    set<uint8>("health", "current target", amount);
+    tick();
+    set<uint8>("health", "current target", 100);
+}
+void EngineTestBase::tickWithTargetIsMoving()
+{
+    set<bool>("moving", "current target", true);
+    tick();
+    set<bool>("moving", "current target", false);
+}
+
+void EngineTestBase::tickInSpellRange()
+{
+    set<float>("distance", "current target", 15.0f);
+    tick();
+}
+
+void EngineTestBase::addTargetAura(string  spell)
+{
+	ai->auras[MockedTargets::GetCurrentTarget()].push_back(spell);
+}
+
+void EngineTestBase::removeTargetAura(string  spell)
+{
+    ai->auras[MockedTargets::GetCurrentTarget()].remove(spell);
+}
+
+void EngineTestBase::addPartyAura(string  spell)
+{
+    ai->auras[MockedTargets::GetPartyMember()].push_back(spell);
+}
+
+void EngineTestBase::removePartyAura(string  spell)
+{
+    ai->auras[MockedTargets::GetPartyMember()].remove(spell);
+}
+
+void EngineTestBase::tickWithLootAvailable()
+{
+    set<bool>("has available loot", true);
+	tick();
+    set<bool>("has available loot", false);
+}
+
+void EngineTestBase::tickWithNoDrink()
+{
+    list<Item*> items;
+    set<list<Item*> >("inventory items", "drink", items);
+
+	tick();
+
+	items.push_back((Item*)(void*)0x01);
+    set<list<Item*> >("inventory items", "drink", items);
+}
+
+void EngineTestBase::tickWithNoFood()
+{
+    list<Item*> items;
+    set<list<Item*> >("inventory items", "food", items);
+
+	tick();
+
+	items.push_back((Item*)(void*)0x01);
+    set<list<Item*> >("inventory items", "food", items);
+}
+
+void EngineTestBase::itemAvailable(string  item, int amount)
+{
+    set<uint8>("item count", item, 2);
+}
+
+void EngineTestBase::tickWithDeadPartyMember()
+{
+    context->GetValue<Unit*>("party member to resurrect")->Set(MockedTargets::GetPartyMember());
+	tick();
+    context->GetValue<Unit*>("party member to resurrect")->Set(NULL);
+}
+
+void EngineTestBase::tickBehindTarget()
+{
+    set<bool>("behind", "current target", true);
+    tick();
+    set<bool>("behind", "current target", false);
+}
+
+void EngineTestBase::tickWithCcTarget(string  spell)
+{
+    set<uint8>("attacker count", 3);
+    context->GetValue<Unit*>("cc target", spell)->Set(MockedTargets::GetCc());
+    tick();
+    set<uint8>("attacker count", 1);
+    context->GetValue<Unit*>("cc target", spell)->Set(NULL);
+}
+
+void EngineTestBase::tickWhileSwimming()
+{
+    set<bool>("swimming", "self target", true);
+    tick();
+    set<bool>("swimming", "self target", false);
+}
+
+void EngineTestBase::tickWithItemForSpell(string spell)
+{
+    set<Item*>("item for spell", "1", (Item*)(void*)0x01);
+    tick();
+    set<Item*>("item for spell", "1", NULL);
+}
+
+void EngineTestBase::tickWithEnemyHealerIsCastingInterruptableSpell(string interrupt)
+{
+    set<Unit*>("enemy healer target", interrupt, MockedTargets::GetEnemyHealer());
+    tick();
+    set<Unit*>("enemy healer target", interrupt, NULL);
+}
diff --git a/src/tests/EngineTestBase.h b/src/tests/EngineTestBase.h
new file mode 100644
index 00000000000..1fa3233e499
--- /dev/null
+++ b/src/tests/EngineTestBase.h
@@ -0,0 +1,88 @@
+#pragma once;
+
+#include "../game/playerbot/strategy/Action.h"
+#include "../game/playerbot/strategy/ActionBasket.h"
+#include "../game/playerbot/strategy/Queue.h"
+#include "../game/playerbot/strategy/Trigger.h"
+#include "../game/playerbot/strategy/Engine.h"
+
+#include "MockPlayerbotAIBase.h"
+
+using namespace ai;
+
+class EngineTestBase : public CPPUNIT_NS::TestFixture
+{
+public:
+    virtual void setUp();
+    virtual void tearDown();
+
+private:
+	void va_generic(void (EngineTestBase::*callback)(const char*), va_list vl);
+
+protected:
+    template <class T>
+    void set(string  name, T value) { context->GetValue<T>(name)->Set(value); }
+    template <class T>
+    void set(string  name, string  param, T value) { context->GetValue<T>(name, param)->Set(value); }
+
+protected:
+	virtual void setupEngine(AiObjectContext* AiObjectContext, ...);
+	void setupEngineCallback(const char*  name);
+	void tick();
+	void assertActions(string  expected);
+
+	void tickWithNoTarget();
+	void spellUnavailable(string  spell);
+	void tickWithSpellUnavailable(string  spell);
+	void tickWithSpellAvailable(string  spell);
+	void spellAvailable(string  spell);
+	void addAura(string  spell);
+	void addTargetAura(string  spell);
+	void removeTargetAura(string  spell);
+	void addPartyAura(string  spell);
+	void removePartyAura(string  spell);
+	void removeAura(string  spell);
+	void tickOutOfSpellRange();
+	void tickOutOfMeleeRange();
+	void tickInMeleeRange();
+	void tickInSpellRange();
+	void tickWithNoAggro();
+	void tickWithRage(int amount);
+	void tickWithEnergy(int amount);
+	void tickWithAttackerCount(int count);
+	void tickWithMyAttackerCount(int count);
+	void tickWithLowHealth(int amount);
+	void tickWithPartyLowHealth(int amount);
+	void tickWithAuraToDispel(uint32 type);
+	void tickWithPartyAuraToDispel(uint32 type);
+	void tickWithTargetAuraToDispel(uint32 type);
+    void tickBehindTarget();
+	void lowHealth(int amount);
+	void lowMana(int amount);
+	void healthRestored();
+	void tickWithComboPoints(int amount);
+	void tickWithTargetIsCastingNonMeleeSpell();
+	void tickWithBalancePercent(int percent);
+	void tickWithNoPet();
+	void tickWithPetLowHealth(int amount);
+    void tickWithPetDead();
+	void tickWithLowMana(int amount);
+	void tickWithTargetLowHealth(int amount);
+	void tickWithTargetIsMoving();
+	void tickWithLootAvailable();
+	void tickWithNoFood();
+	void tickWithNoDrink();
+	void itemAvailable(string  item, int amount);
+	void tickWithDeadPartyMember();
+    void tickWithCcTarget(string   spell);
+    void tickWhileSwimming();
+    void setInMeleeRange();
+    void tickWithAoeHeal(string type, int amount = 2);
+    void tickWithItemForSpell(string spell);
+    void tickWithEnemyHealerIsCastingInterruptableSpell(string interrupt);
+
+protected:
+    MockPlayerbotAIBase *ai;
+    Engine *engine;
+    AiObjectContext *context;
+};
diff --git a/src/tests/EngineTestCase.cpp b/src/tests/EngineTestCase.cpp
new file mode 100644
index 00000000000..2a5935fa8eb
--- /dev/null
+++ b/src/tests/EngineTestCase.cpp
@@ -0,0 +1,321 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "MockPlayerbotAIBase.h"
+
+using namespace ai;
+
+class PrerequisiteAction : public Action
+{
+public:
+    PrerequisiteAction(PlayerbotAI* const ai) : Action(ai) {}
+    virtual ~PrerequisiteAction() { destroyed = TRUE; }
+
+    bool Execute(Event event) { executed++; return TRUE; }
+    virtual string getName() {return "PrerequisiteAction"; }
+
+    static int executed;
+    static int destroyed;
+};
+
+int PrerequisiteAction::executed = 0;
+int PrerequisiteAction::destroyed = 0;
+
+class AlternativeAction : public Action
+{
+public:
+    AlternativeAction(PlayerbotAI* const ai) : Action(ai) {}
+    virtual ~AlternativeAction() {destroyed = TRUE;}
+
+    bool Execute(Event event) { executed++; return TRUE; }
+    string  getName() {return "AlternativeAction"; }
+
+    static int executed;
+    static int destroyed;
+};
+
+int AlternativeAction::executed = 0;
+int AlternativeAction::destroyed = 0;
+
+class RepeatingAction : public Action
+{
+public:
+	RepeatingAction(PlayerbotAI* const ai) : Action(ai) {}
+
+	virtual ~RepeatingAction()
+	{
+		destroyed++;
+	}
+
+    bool Execute(Event event) { executed++; return TRUE; }
+    string  getName() {return "RepeatingAction"; }
+    bool isPossible() { return available; }
+
+	static int destroyed;
+    static int executed;
+    static int available;
+};
+
+int RepeatingAction::available = TRUE;
+int RepeatingAction::destroyed = 0;
+int RepeatingAction::executed = 0;
+
+class TriggeredAction : public Action
+{
+public:
+	TriggeredAction(PlayerbotAI* const ai) : Action(ai) { fired = false; }
+	virtual ~TriggeredAction() {}
+
+    bool Execute(Event event) { param = event.getParam(); fired = TRUE; return true; }
+    string  getName() {return "TriggeredAction"; }
+
+	static int fired;
+    static string param;
+};
+
+int TriggeredAction::fired = 0;
+string TriggeredAction::param;
+
+class TestTrigger : public Trigger
+{
+public:
+	TestTrigger(PlayerbotAI* const ai) : Trigger(ai) {count = 0;}
+    virtual Event Check()
+    {
+        return IsActive() ? Event(getName(), "test") : Event();
+    }
+	virtual bool IsActive()
+	{
+		return ++count==3;
+	}
+
+private:
+	int count;
+};
+
+class TestMultiplier : public Multiplier
+{
+public:
+    TestMultiplier(PlayerbotAI* const ai) : Multiplier(ai, "test") { asked = 0; }
+    float GetValue(Action* action) { return asked = 1.0f; }
+
+    static int asked;
+};
+
+int TestMultiplier::asked;
+
+class TestStrategy : public Strategy
+{
+public:
+    TestStrategy(PlayerbotAI* const ai) : Strategy(ai) {}
+
+    virtual string  getName() { return "TestStrategy"; }
+
+    virtual NextAction** getDefaultActions() { return NextAction::array(0, new NextAction("RepeatingAction", 1.0f), NULL); }
+
+    virtual void InitMultipliers(std::list<Multiplier*> &multipliers)
+    {
+        multipliers.push_back(new TestMultiplier(ai));
+    }
+
+    virtual void InitTriggers(std::list<TriggerNode*> &triggers)
+    {
+        triggers.push_back(new TriggerNode(
+            "TestTrigger",
+            NextAction::array(0, new NextAction("TriggeredAction", 10.0f), NULL)));
+    }
+
+    virtual ActionNode* GetAction(string  name)
+    {
+        if (name == "TriggeredAction")
+        {
+            return new ActionNode ("TriggeredAction",
+                /*P*/ NULL,
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        else if (name == "RepeatingAction")
+        {
+            return new ActionNode ("RepeatingAction",
+                /*P*/ NULL,
+                /*A*/ NextAction::array(0, new NextAction("AlternativeAction", 1.0f), NULL),
+                /*C*/ NextAction::array(0, new NextAction("RepeatingAction", 1.0f), NULL));
+        }
+        else if (name == "AlternativeAction")
+        {
+            return new ActionNode ("AlternativeAction",
+                /*P*/ NextAction::array(0, new NextAction("PrerequisiteAction", 1.0f), NULL),
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        else if (name == "PrerequisiteAction")
+        {
+            return new ActionNode ("PrerequisiteAction",
+                /*P*/ NULL,
+                /*A*/ NULL,
+                /*C*/ NULL);
+        }
+        else return NULL;
+    }
+};
+
+class AnotherTestStrategy : public Strategy
+{
+public:
+    AnotherTestStrategy(PlayerbotAI* const ai) : Strategy(ai) {}
+
+    virtual string  getName() { return "AnotherTestStrategy"; }
+};
+
+class TestStrategyContext : public NamedObjectContext<Strategy>
+{
+public:
+    TestStrategyContext() : NamedObjectContext(false, true)
+    {
+        creators["TestStrategy"] = &TestStrategyContext::Test;
+        creators["AnotherTestStrategy"] = &TestStrategyContext::AnotherTest;
+    }
+
+private:
+    static Strategy* Test(PlayerbotAI* ai) { return new TestStrategy(ai); }
+    static Strategy* AnotherTest(PlayerbotAI* ai) { return new AnotherTestStrategy(ai); }
+};
+
+class TestTriggerContext : public NamedObjectContext<Trigger>
+{
+public:
+    TestTriggerContext()
+    {
+        creators["TestTrigger"] = &TestTriggerContext::Test;
+    }
+
+private:
+    static Trigger* Test(PlayerbotAI* ai) { return new TestTrigger(ai); }
+};
+
+
+class TestActionContext : public NamedObjectContext<Action>
+{
+public:
+    TestActionContext()
+    {
+        creators["TriggeredAction"] = &TestActionContext::Triggered;
+        creators["RepeatingAction"] = &TestActionContext::Repeating;
+        creators["AlternativeAction"] = &TestActionContext::Alternative;
+        creators["PrerequisiteAction"] = &TestActionContext::Prerequisite;
+    }
+
+private:
+    static Action* Triggered(PlayerbotAI* ai) { return new TriggeredAction(ai); }
+    static Action* Repeating(PlayerbotAI* ai) { return new RepeatingAction(ai); }
+    static Action* Alternative(PlayerbotAI* ai) { return new AlternativeAction(ai); }
+    static Action* Prerequisite(PlayerbotAI* ai) { return new PrerequisiteAction(ai); }
+};
+
+class TestAiObjectContext : public AiObjectContext
+{
+public:
+    TestAiObjectContext(PlayerbotAI* const ai) : AiObjectContext(ai)
+    {
+        strategyContexts.Add(new TestStrategyContext());
+        triggerContexts.Add(new TestTriggerContext());
+        actionContexts.Add(new TestActionContext());
+    }
+};
+
+class EngineTestCase : public CPPUNIT_NS::TestFixture
+{
+  CPPUNIT_TEST_SUITE( EngineTestCase );
+      CPPUNIT_TEST( engineMustRepeatActions );
+      CPPUNIT_TEST( addRemoveStrategies );
+      CPPUNIT_TEST( listStrategies );
+      CPPUNIT_TEST( eventMustPassToAction );
+      CPPUNIT_TEST( siblings );
+  CPPUNIT_TEST_SUITE_END();
+
+protected:
+
+public:
+	void setUp()
+	{
+	}
+
+protected:
+	void engineMustRepeatActions()
+	{
+		MockPlayerbotAIBase mock;
+		Engine engine(&mock, new TestAiObjectContext(&mock));
+		engine.testMode = true;
+        engine.addStrategy("TestStrategy");
+        engine.Init();
+
+		for (int i=0; i<6; i++)
+			engine.DoNextAction(NULL);
+
+		CPPUNIT_ASSERT(TriggeredAction::fired);
+        CPPUNIT_ASSERT(TestMultiplier::asked);
+        CPPUNIT_ASSERT_EQUAL(5, RepeatingAction::executed);
+
+        RepeatingAction::available = FALSE;
+        engine.DoNextAction(NULL);
+        engine.DoNextAction(NULL);
+        CPPUNIT_ASSERT(AlternativeAction::executed);
+        CPPUNIT_ASSERT(PrerequisiteAction::executed);
+	}
+
+    void addRemoveStrategies()
+    {
+		MockPlayerbotAIBase mock;
+        Engine engine(&mock, new TestAiObjectContext(&mock));
+        engine.testMode = true;
+        engine.addStrategy("AnotherTestStrategy");
+        engine.removeStrategy("AnotherTestStrategy");
+        engine.Init();
+
+        engine.addStrategy("TestStrategy");
+        engine.Init();
+
+        engine.DoNextAction(NULL);
+        CPPUNIT_ASSERT(TriggeredAction::fired);
+    }
+
+    void listStrategies()
+    {
+		MockPlayerbotAIBase mock;
+        Engine engine(&mock, new TestAiObjectContext(&mock));
+        engine.testMode = true;
+        engine.addStrategy("AnotherTestStrategy");
+        engine.addStrategy("TestStrategy");
+        engine.Init();
+
+        std::string s = engine.ListStrategies();
+        CPPUNIT_ASSERT(s == "Strategies: TestStrategy");
+    }
+
+    void eventMustPassToAction()
+    {
+        MockPlayerbotAIBase mock;
+        Engine engine(&mock, new TestAiObjectContext(&mock));
+        engine.testMode = true;
+        engine.addStrategy("TestStrategy");
+        engine.Init();
+
+        for (int i=0; i<6; i++)
+            engine.DoNextAction(NULL);
+
+        CPPUNIT_ASSERT(TriggeredAction::param == "test");
+    }
+
+    void siblings()
+    {
+        MockPlayerbotAIBase mock;
+        TestAiObjectContext * context = new TestAiObjectContext(&mock);
+
+        set<string> siblings = context->GetSiblingStrategy("TestStrategy");
+
+        CPPUNIT_ASSERT(siblings.size() == 1);
+        CPPUNIT_ASSERT(*siblings.begin() == "AnotherTestStrategy");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( EngineTestCase );
diff --git a/src/tests/EventTestCase.cpp b/src/tests/EventTestCase.cpp
new file mode 100644
index 00000000000..a2f3d5b2880
--- /dev/null
+++ b/src/tests/EventTestCase.cpp
@@ -0,0 +1,58 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "MockPlayerbotAIBase.h"
+#include "playerbot\strategy\ItemVisitors.h"
+
+using namespace ai;
+
+class EventTestCase : public CPPUNIT_NS::TestFixture
+{
+  CPPUNIT_TEST_SUITE( EventTestCase );
+      CPPUNIT_TEST( emptyEvent );
+      CPPUNIT_TEST( eventHandling );
+      CPPUNIT_TEST( strstriTest1 );
+      CPPUNIT_TEST( strstriTest2 );
+  CPPUNIT_TEST_SUITE_END();
+
+protected:
+
+public:
+	void setUp()
+	{
+	}
+
+protected:
+	void emptyEvent()
+	{
+        Event event;
+        CPPUNIT_ASSERT(!event);
+	}
+
+    void eventHandling()
+    {
+        Event event("source", "param");
+
+        Event event2 = event;
+
+        CPPUNIT_ASSERT(!!event2);
+        CPPUNIT_ASSERT(event2.getParam() == "param");
+        CPPUNIT_ASSERT(event2.getSource() == "source");
+    }
+
+    void strstriTest1()
+    {
+        string a = "Mana Spring Totem V";
+        string b = "strength of earth totem";
+        CPPUNIT_ASSERT(!strstri(a.c_str(), b.c_str()));
+    }
+
+    void strstriTest2()
+    {
+        string a = "mana spring Totem V";
+        string b = "mana Spring totem";
+        CPPUNIT_ASSERT(strstri(a.c_str(), b.c_str()));
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( EventTestCase );
diff --git a/src/tests/EverythingUnavailableAiManagerRegistry.h b/src/tests/EverythingUnavailableAiManagerRegistry.h
new file mode 100644
index 00000000000..7bc4f90319e
--- /dev/null
+++ b/src/tests/EverythingUnavailableAiManagerRegistry.h
@@ -0,0 +1,15 @@
+#pragma once
+
+namespace ai
+{
+    class EverythingUnavailablePlayerbotAI : public MockPlayerbotAIBase
+    {
+    public:
+        EverythingUnavailablePlayerbotAI() : MockPlayerbotAIBase()
+		{
+			managers[AiSpellManagerType] = new EverythingUnavailableAiSpellManager(ai, this, &buffer);
+		}
+        virtual bool CanCastSpell(string  name, Unit* target) { return false; }
+    };
+
+}
\ No newline at end of file
diff --git a/src/tests/ExternalEventHelperTestCase.cpp b/src/tests/ExternalEventHelperTestCase.cpp
new file mode 100644
index 00000000000..7163eebec2d
--- /dev/null
+++ b/src/tests/ExternalEventHelperTestCase.cpp
@@ -0,0 +1,81 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "MockPlayerbotAIBase.h"
+#include "../game/playerbot/strategy/triggers/ChatCommandTrigger.h"
+#include "../game/playerbot/strategy/ExternalEventHelper.h"
+
+using namespace ai;
+
+class ExternalEventTestTriggerContext : public NamedObjectContext<Trigger>
+{
+public:
+    ExternalEventTestTriggerContext()
+    {
+        creators["message"] = &ExternalEventTestTriggerContext::message;
+        creators["message from"] = &ExternalEventTestTriggerContext::message_from;
+    }
+
+private:
+    static Trigger* message(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "message"); }
+    static Trigger* message_from(PlayerbotAI* ai) { return new ChatCommandTrigger(ai, "message from"); }
+};
+
+
+
+class ExternalEventTestAiObjectContext : public AiObjectContext
+{
+public:
+    ExternalEventTestAiObjectContext(PlayerbotAI* const ai) : AiObjectContext(ai)
+    {
+        triggerContexts.Add(new ExternalEventTestTriggerContext());
+    }
+};
+
+
+class ExternalEventHelperTestCase : public CPPUNIT_NS::TestFixture
+{
+  CPPUNIT_TEST_SUITE( ExternalEventHelperTestCase );
+      CPPUNIT_TEST( externalEvent );
+      CPPUNIT_TEST( emptyExternalEvent );
+  CPPUNIT_TEST_SUITE_END();
+
+protected:
+
+public:
+	void setUp()
+	{
+	}
+
+protected:
+	void externalEvent()
+	{
+        MockPlayerbotAIBase ai;
+        ExternalEventTestAiObjectContext aiObjectContext(&ai);
+        ExternalEventHelper helper(&aiObjectContext);
+        
+        helper.ParseChatCommand("message from chat");
+        
+        Event event = aiObjectContext.GetTrigger("message from")->Check();
+        CPPUNIT_ASSERT(event);
+        CPPUNIT_ASSERT(event.getParam() == "chat");
+	
+        event = aiObjectContext.GetTrigger("message")->Check();
+        CPPUNIT_ASSERT(!event);
+    }
+
+    void emptyExternalEvent()
+    {
+        MockPlayerbotAIBase ai;
+        ExternalEventTestAiObjectContext aiObjectContext(&ai);
+        ExternalEventHelper helper(&aiObjectContext);
+
+        helper.ParseChatCommand("message from");
+
+        Event event = aiObjectContext.GetTrigger("message from")->Check();
+        CPPUNIT_ASSERT(event);
+        CPPUNIT_ASSERT(event.getParam() == "");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( ExternalEventHelperTestCase );
diff --git a/src/tests/FireMageTestCase.cpp b/src/tests/FireMageTestCase.cpp
new file mode 100644
index 00000000000..4e14e0944cf
--- /dev/null
+++ b/src/tests/FireMageTestCase.cpp
@@ -0,0 +1,103 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/mage/MageAiObjectContext.h"
+
+using namespace ai;
+
+
+class FireMageTestCase : public EngineTestBase
+{
+  CPPUNIT_TEST_SUITE( FireMageTestCase );
+  CPPUNIT_TEST( combatVsMelee );
+  CPPUNIT_TEST( avoid_melee );
+  CPPUNIT_TEST( avoid_melee_low_level );
+  CPPUNIT_TEST( panic );
+  CPPUNIT_TEST( boost );
+  CPPUNIT_TEST( aoe );
+  CPPUNIT_TEST( invisibility );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new MageAiObjectContext(ai), "fire", NULL);
+    }
+
+protected:
+ 	void combatVsMelee()
+	{
+        tick();
+		addTargetAura("pyroblast");
+
+        tick();
+		tick();
+		tick();
+
+        addAura("hot streak");
+        spellAvailable("pyroblast");
+        tick();
+        tick();
+
+        assertActions(">T:pyroblast>T:scorch>T:fireball>T:fire blast>T:pyroblast>T:shoot");
+	}
+
+ 	void avoid_melee()
+ 	{
+		tickInMeleeRange();
+		tickInMeleeRange();
+
+		spellAvailable("flamestrike");
+		tickInMeleeRange();
+		tickInMeleeRange();
+
+		tickInMeleeRange();
+		tickInMeleeRange();
+
+		assertActions(">T:dragon's breath>T:flamestrike>T:blast wave>T:flamestrike>T:frost nova>S:flee");
+	}
+
+ 	void avoid_melee_low_level()
+ 	{
+ 	    spellUnavailable("dragon's breath");
+ 	    spellUnavailable("blast wave");
+		tickInMeleeRange();
+		tickInMeleeRange();
+
+		assertActions(">T:frost nova>S:flee");
+	}
+
+ 	void panic()
+ 	{
+        tickWithLowHealth(19);
+
+        assertActions(">S:ice block");
+ 	}
+
+    void boost()
+    {
+		tickWithBalancePercent(1);
+
+		assertActions(">S:combustion");
+    }
+
+    void aoe()
+    {
+        engine->addStrategy("fire aoe");
+
+		tickWithAttackerCount(3);
+		tickWithAttackerCount(3);
+
+		assertActions(">T:living bomb>T:flamestrike");
+    }
+
+    void invisibility()
+    {
+		tickWithMyAttackerCount(3);
+
+		assertActions(">S:invisibility");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( FireMageTestCase );
diff --git a/src/tests/FrostMageTestCase.cpp b/src/tests/FrostMageTestCase.cpp
new file mode 100644
index 00000000000..30abc53680f
--- /dev/null
+++ b/src/tests/FrostMageTestCase.cpp
@@ -0,0 +1,138 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/mage/MageAiObjectContext.h"
+
+using namespace ai;
+
+
+class FrostMageTestCase : public EngineTestBase
+{
+  CPPUNIT_TEST_SUITE( FrostMageTestCase );
+  CPPUNIT_TEST( combatVsMelee );
+  CPPUNIT_TEST( dispel );
+  CPPUNIT_TEST( boost );
+  CPPUNIT_TEST( interruptSpells );
+  CPPUNIT_TEST( cc );
+  CPPUNIT_TEST( aoe );
+  CPPUNIT_TEST( incompatibles );
+  CPPUNIT_TEST( low_mana );
+  CPPUNIT_TEST( interrupt_enemy_healer );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new MageAiObjectContext(ai), "frost", NULL);
+    }
+
+protected:
+ 	void combatVsMelee()
+	{
+        tick();
+        spellAvailable("frostbolt");
+
+		tickInMeleeRange();
+		tickInMeleeRange();
+
+		spellAvailable("frostbolt");
+		tickInSpellRange();
+        tick();
+
+		tickWithLowHealth(19);
+
+		assertActions(">T:frostbolt>T:frost nova>S:flee>T:frostbolt>T:shoot>S:ice block");
+	}
+
+    void dispel()
+    {
+        tick();
+
+		tickWithAuraToDispel(DISPEL_CURSE);
+
+		spellAvailable("remove curse");
+		tickWithPartyAuraToDispel(DISPEL_CURSE);
+
+        tick();
+
+		tickWithTargetAuraToDispel(DISPEL_MAGIC);
+
+		assertActions(">T:frostbolt>S:remove curse>P:remove curse on party>T:shoot>T:spellsteal");
+    }
+
+    void boost()
+    {
+        tick(); // frostbolt
+
+		tickWithBalancePercent(1);
+
+        spellAvailable("frostbolt");
+        tick(); // frostbolt
+
+        tick(); // shoot
+
+		assertActions(">T:frostbolt>S:icy veins>T:frostbolt>T:shoot");
+    }
+
+    void interruptSpells()
+    {
+		tickWithTargetIsCastingNonMeleeSpell();
+
+        tick(); // frostbolt
+
+        assertActions(">T:counterspell>T:frostbolt");
+    }
+
+    void cc()
+    {
+        tickWithCcTarget("polymorph");
+
+        assertActions(">Cc:polymorph");
+    }
+
+   	void aoe()
+	{
+        engine->addStrategy("frost aoe");
+
+		tick();
+		tickWithAttackerCount(4);
+		tick();
+
+		assertActions(">T:frostbolt>T:blizzard>T:shoot");
+	}
+
+   	void incompatibles()
+   	{
+        engine->addStrategies("frost", "fire", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: fire");
+   	}
+
+    void low_mana()
+    {
+        engine->addStrategy("flee");
+        addAura("arcane intellect");
+        addPartyAura("arcane intellect");
+        addAura("mage armor");
+
+        tickWithLowMana(5);
+
+        set<uint8>("item count", "drink", 0);
+        set<float>("distance", "current target", 5);
+        tickWithLowMana(5);
+        tickWithLowMana(5);
+
+        assertActions(">S:evocation>T:frost nova>S:flee");
+    }
+
+    void interrupt_enemy_healer()
+    {
+        tickWithEnemyHealerIsCastingInterruptableSpell("counterspell");
+
+        assertActions(">H:counterspell on enemy healer");
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( FrostMageTestCase );
diff --git a/src/tests/GenericTestCase.cpp b/src/tests/GenericTestCase.cpp
new file mode 100644
index 00000000000..1bb1069dbdd
--- /dev/null
+++ b/src/tests/GenericTestCase.cpp
@@ -0,0 +1,139 @@
+#include "pch.h"
+#include "aitest.h"
+
+#include "EngineTestBase.h"
+#include "../game/playerbot/strategy/druid/DruidAiObjectContext.h"
+
+using namespace ai;
+
+class GenericTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( GenericTestCase );
+	CPPUNIT_TEST( flee );
+	CPPUNIT_TEST( adds );
+	CPPUNIT_TEST( potions );
+	CPPUNIT_TEST( guard );
+	CPPUNIT_TEST( threat );
+	CPPUNIT_TEST( facing );
+	CPPUNIT_TEST( drop_target );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new DruidAiObjectContext(ai), "bear", "flee", NULL);
+    }
+
+protected:
+	void flee()
+	{
+	    list<Item*> items;
+        set<list<Item*> >("inventory items", "drink", items);
+	    set<list<Item*> >("inventory items", "food", items);
+
+        set<float>("distance", "current target", 5);
+		lowHealth(1);
+		lowMana(1);
+		tick();
+
+		assertActions(">S:flee");
+	}
+
+	void adds()
+	{
+	    engine->addStrategy("flee from adds");
+
+	    list<ObjectGuid> adds;
+	    adds.push_front(ObjectGuid(uint64(1)));
+	    set<list<ObjectGuid> >("nearest adds", adds);
+
+	    tick();
+
+		assertActions(">S:runaway");
+	}
+
+	void potions()
+	{
+        engine->addStrategy("flee");
+	    engine->addStrategy("potions");
+
+        set<uint8>("item count", "mana potion", 1);
+        set<uint8>("item count", "drink", 1);
+        set<uint8>("item count", "healing potion", 1);
+        set<uint8>("item count", "food", 1);
+
+        spellUnavailable("innervate");
+        spellUnavailable("barskin");
+        spellUnavailable("survival instincts");
+
+        spellUnavailable("regrowth");
+        spellUnavailable("healing touch");
+        spellUnavailable("rejuvenation");
+
+	    tickWithLowMana(1);
+
+	    set<bool>("combat", "self target", true);
+	    tickWithLowMana(1);
+        set<uint8>("item count", "mana potion", 0);
+	    tickWithLowMana(1);
+        set<uint8>("item count", "drink", 0);
+        set<float>("distance", "current target", 5);
+	    tickWithLowMana(1);
+
+	    tickWithLowHealth(1);
+        set<uint8>("item count", "healing potion", 0);
+	    tickWithLowHealth(1);
+        set<uint8>("item count", "food", 0);
+        set<float>("distance", "current target", 5);
+	    tickWithLowHealth(1);
+
+		assertActions(">S:flee>S:mana potion>S:drink>S:flee>S:healing potion>S:food>S:flee");
+	}
+
+	void guard()
+	{
+	    engine->removeStrategy("bear");
+	    engine->addStrategy("guard");
+
+	    tick();
+
+		assertActions(">S:move to position");
+	}
+
+	void threat()
+	{
+	    engine->addStrategy("threat");
+
+        set<uint8>("threat", "current target", 100);
+	    tick();
+
+		assertActions(">T:reach melee");
+	}
+
+	void facing()
+	{
+        addAura("dire bear form");
+        addAura("thorns");
+        addTargetAura("faerie fire (feral)");
+
+        set<float>("distance", "current target", ATTACK_DISTANCE - 1);
+        set<bool>("facing", "current target", false);
+	    tick();
+        set<bool>("facing", "current target", true);
+
+		assertActions(">S:set facing");
+	}
+
+    void drop_target()
+    {
+        set<bool>("invalid target", "current target", true);
+        tick();
+        set<bool>("invalid target", "current target", false);
+
+        assertActions(">S:drop target");
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( GenericTestCase );
diff --git a/src/tests/HealDruidTestCase.cpp b/src/tests/HealDruidTestCase.cpp
new file mode 100644
index 00000000000..084e59789e9
--- /dev/null
+++ b/src/tests/HealDruidTestCase.cpp
@@ -0,0 +1,91 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/druid/DruidAiObjectContext.h"
+
+using namespace ai;
+
+
+class HealDruidTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( HealDruidTestCase );
+    CPPUNIT_TEST( healHimself );
+    CPPUNIT_TEST( healOthers );
+	CPPUNIT_TEST( aoe );
+	CPPUNIT_TEST( range );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    virtual void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new DruidAiObjectContext(ai), "heal", NULL);
+
+		addAura("moonkin form");
+    }
+
+protected:
+
+	void healHimself()
+    {
+	    tick();
+        addAura("tree of life");
+
+		tickWithLowHealth(79);
+        spellAvailable("rejuvenation");
+
+		tickWithLowHealth(59);
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+		tickWithLowHealth(39);
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        tickWithLowHealth(1);
+        tickWithLowHealth(1);
+
+        assertActions(">S:tree of life>S:rejuvenation>S:regrowth>S:regrowth>S:regrowth>S:healing touch");
+    }
+
+	void healOthers()
+    {
+        addAura("tree of life");
+
+        tickWithPartyLowHealth(79);
+        spellAvailable("rejuvenation");
+
+        tickWithPartyLowHealth(59);
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        tickWithPartyLowHealth(39);
+
+        spellAvailable("healing touch");
+        spellAvailable("regrowth");
+        spellAvailable("rejuvenation");
+        tickWithPartyLowHealth(1);
+        tickWithPartyLowHealth(1);
+
+        assertActions(">P:rejuvenation on party>P:regrowth on party>P:regrowth on party>P:regrowth on party>P:healing touch on party");
+    }
+
+    void aoe()
+    {
+        tickWithAoeHeal("medium");
+
+		assertActions(">P:tranquility");
+    }
+
+    void range()
+    {
+        tickOutOfSpellRange();
+
+        assertActions(">T:reach spell");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( HealDruidTestCase );
diff --git a/src/tests/HealPriestTestCase.cpp b/src/tests/HealPriestTestCase.cpp
new file mode 100644
index 00000000000..4c70afe30b7
--- /dev/null
+++ b/src/tests/HealPriestTestCase.cpp
@@ -0,0 +1,195 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/priest/PriestAiObjectContext.h"
+
+using namespace ai;
+
+
+class HealPriestTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( HealPriestTestCase );
+    CPPUNIT_TEST( healHimself );
+    CPPUNIT_TEST( healOthers );
+    CPPUNIT_TEST( aoe_heal );
+    CPPUNIT_TEST( dispel );
+    CPPUNIT_TEST( flee );
+    CPPUNIT_TEST( cc );
+    CPPUNIT_TEST( enemyTooClose );
+	CPPUNIT_TEST( racials );
+	CPPUNIT_TEST( incompatibles );
+	CPPUNIT_TEST( range );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new PriestAiObjectContext(ai), "heal", NULL);
+
+        addAura("power word: fortitude");
+        addAura("divine spirit");
+        addAura("inner fire");
+        addPartyAura("power word: fortitude");
+        addPartyAura("divine spirit");
+    }
+
+protected:
+    void healHimself()
+    {
+        addPartyAura("power word: fortitude");
+
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+
+		tick();
+
+		tickWithLowHealth(59);
+
+        spellAvailable("renew");
+        tickWithLowHealth(79);
+
+		tickWithSpellAvailable("shoot");
+
+		assertActions(">S:power word: shield>S:greater heal>S:renew>S:heal>S:lesser heal>T:shoot>S:flash heal>S:renew>T:shoot");
+    }
+
+	void racials()
+	{
+		engine->addStrategy("racials");
+		addPartyAura("power word: fortitude");
+
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+
+		tick();
+
+		tickWithLowHealth(59);
+
+		tickWithSpellAvailable("shoot");
+
+		assertActions(">S:lifeblood>S:gift of the naaru>S:power word: shield>S:greater heal>S:renew>S:heal>S:lesser heal>T:shoot>S:flash heal>T:shoot");
+	}
+
+    void healOthers()
+    {
+        tick(); // shoot
+
+		tickWithPartyLowHealth(39);
+		tickWithPartyLowHealth(39);
+		tickWithPartyLowHealth(39);
+		tickWithPartyLowHealth(39);
+		tickWithPartyLowHealth(39);
+
+        spellAvailable("greater heal");
+        spellAvailable("renew");
+        spellAvailable("flash heal");
+        spellAvailable("lesser heal");
+        spellAvailable("power word: shield");
+        tickWithPartyLowHealth(1);
+        tickWithPartyLowHealth(1);
+        tickWithPartyLowHealth(1);
+        tickWithPartyLowHealth(1);
+
+		tickWithSpellAvailable("shoot");
+
+        spellAvailable("flash heal");
+		tickWithPartyLowHealth(59);
+
+        spellAvailable("renew");
+        tickWithPartyLowHealth(79);
+
+        tickWithSpellAvailable("shoot"); // shoot
+
+
+		assertActions(">T:shoot>P:power word: shield on party>P:greater heal on party>P:renew on party>P:heal on party>P:lesser heal on party>P:power word: shield on party>P:flash heal on party>P:renew on party>P:greater heal on party>T:shoot>P:flash heal on party>P:renew on party>T:shoot");
+    }
+
+    void aoe_heal()
+    {
+        tickWithAoeHeal("medium");
+        tickWithAoeHeal("medium");
+
+        assertActions(">P:circle of healing>P:flash heal on party");
+    }
+
+    void flee()
+    {
+        tickInMeleeRange();
+        tickInMeleeRange();
+
+		assertActions(">S:fade>S:flee");
+    }
+
+    void cc()
+    {
+		tickWithMyAttackerCount(3);
+		tickWithMyAttackerCount(3);
+        set<float>("distance", "current target", 5);
+		tickWithMyAttackerCount(3);
+
+		assertActions(">T:psychic scream>S:fade>S:flee");
+    }
+
+    void enemyTooClose()
+    {
+        tick();
+
+		tickInMeleeRange();
+		tickInMeleeRange();
+
+		spellAvailable("shoot");
+		tickInSpellRange();
+
+		assertActions(">T:shoot>S:fade>S:flee>T:shoot");
+    }
+
+    void dispel()
+    {
+        tick(); // shoot
+
+		tickWithAuraToDispel(DISPEL_MAGIC);
+
+		spellAvailable("dispel magic");
+		tickWithPartyAuraToDispel(DISPEL_MAGIC);
+
+		tickWithAuraToDispel(DISPEL_DISEASE);
+
+		spellAvailable("abolish disease");
+		tickWithPartyAuraToDispel(DISPEL_DISEASE);
+
+		tickWithAuraToDispel(DISPEL_DISEASE);
+
+		spellAvailable("cure disease");
+		tickWithPartyAuraToDispel(DISPEL_DISEASE);
+
+        tickWithSpellAvailable("shoot");
+
+		assertActions(">T:shoot>S:dispel magic>P:dispel magic on party>S:abolish disease>P:abolish disease on party>S:cure disease>P:cure disease on party>T:shoot");
+    }
+
+
+    void incompatibles()
+    {
+        engine->addStrategies("heal", "shadow", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: shadow");
+    }
+
+    void range()
+    {
+        tickOutOfSpellRange();
+
+        assertActions(">T:reach spell");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( HealPriestTestCase );
diff --git a/src/tests/HealShamanTestCase.cpp b/src/tests/HealShamanTestCase.cpp
new file mode 100644
index 00000000000..0d0496a705b
--- /dev/null
+++ b/src/tests/HealShamanTestCase.cpp
@@ -0,0 +1,136 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/shaman/ShamanAiObjectContext.h"
+
+using namespace ai;
+
+
+class HealShamanTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( HealShamanTestCase );
+    CPPUNIT_TEST( healHimself );
+    CPPUNIT_TEST( healOthers );
+    CPPUNIT_TEST( aoe_heal );
+    CPPUNIT_TEST( buff );
+    CPPUNIT_TEST( interruptSpell );
+	CPPUNIT_TEST( dispel );
+	CPPUNIT_TEST( cure );
+	CPPUNIT_TEST( lowMana );
+	CPPUNIT_TEST( range );
+	CPPUNIT_TEST( aoe );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new ShamanAiObjectContext(ai), "heal", NULL);
+
+        addAura("water shield");
+    }
+
+protected:
+    void healHimself()
+    {
+        tickWithLowHealth(45);
+		tickWithLowHealth(35);
+        tickWithLowHealth(35);
+
+        assertActions(">S:lesser healing wave>S:riptide>S:healing wave");
+    }
+
+    void healOthers()
+    {
+        tickWithPartyLowHealth(45);
+        tickWithPartyLowHealth(35);
+		tickWithPartyLowHealth(35);
+
+        assertActions(">P:lesser healing wave on party>P:riptide on party>P:healing wave on party");
+    }
+
+    void aoe_heal()
+    {
+        tickWithAoeHeal("medium");
+        tickWithAoeHeal("medium");
+
+        assertActions(">P:chain heal>P:lesser healing wave on party");
+    }
+
+    void buff()
+    {
+        engine->addStrategy("bmana");
+        removeAura("water shield");
+
+        tick();
+        addAura("water shield");
+
+        tickWithItemForSpell("earthliving weapon");
+        tickWithItemForSpell("earthliving weapon");
+        tickWithItemForSpell("earthliving weapon");
+        tickWithItemForSpell("earthliving weapon");
+
+        engine->addStrategy("totems");
+        tick();
+        tick();
+        tick();
+        tick();
+
+        assertActions(">S:water shield>S:earthliving weapon>S:flametongue weapon>S:frostbrand weapon>S:rockbiter weapon>S:mana spring totem>S:strength of earth totem>S:flametongue totem>S:windfury totem");
+    }
+
+    void interruptSpell()
+    {
+        tickWithTargetIsCastingNonMeleeSpell();
+
+		assertActions(">T:wind shear");
+    }
+
+	void dispel()
+	{
+		tickWithTargetAuraToDispel(DISPEL_MAGIC);
+
+		assertActions(">T:purge");
+	}
+
+	void cure()
+	{
+		tickWithAuraToDispel(DISPEL_CURSE);
+		spellAvailable("cleanse spirit");
+		tickWithAuraToDispel(DISPEL_DISEASE);
+        spellAvailable("cleanse spirit");
+		tickWithAuraToDispel(DISPEL_POISON);
+        spellAvailable("cleanse spirit");
+
+        tickWithPartyAuraToDispel(DISPEL_CURSE);
+		spellAvailable("cleanse spirit");
+		tickWithPartyAuraToDispel(DISPEL_DISEASE);
+        spellAvailable("cleanse spirit");
+		tickWithPartyAuraToDispel(DISPEL_POISON);
+        spellAvailable("cleanse spirit");
+
+		assertActions(">S:cleanse spirit>S:cleanse spirit>S:cleanse spirit>P:cleanse spirit curse on party>P:cleanse spirit disease on party>P:cleanse spirit poison on party");
+	}
+
+	void lowMana()
+	{
+	    tickWithLowMana(1);
+		assertActions(">S:mana tide totem");
+	}
+
+    void range()
+    {
+        tickOutOfSpellRange();
+
+        assertActions(">T:reach spell");
+    }
+
+    void aoe()
+    {
+        tickWithAttackerCount(3);
+
+        assertActions(">S:healing stream totem");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( HealShamanTestCase );
diff --git a/src/tests/HolyPriestTestCase.cpp b/src/tests/HolyPriestTestCase.cpp
new file mode 100644
index 00000000000..f3ffcc5adb3
--- /dev/null
+++ b/src/tests/HolyPriestTestCase.cpp
@@ -0,0 +1,56 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/priest/PriestAiObjectContext.h"
+
+using namespace ai;
+
+
+class HolyPriestTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( HolyPriestTestCase );
+    CPPUNIT_TEST( combat );
+	CPPUNIT_TEST( incompatibles );
+	CPPUNIT_TEST( flee );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new PriestAiObjectContext(ai), "holy", NULL);
+
+        addAura("power word: fortitude");
+        addAura("divine spirit");
+        addAura("inner fire");
+        addPartyAura("power word: fortitude");
+        addPartyAura("divine spirit");
+    }
+
+protected:
+    void combat()
+    {
+		tick();
+		tick();
+		tick();
+
+		assertActions(">T:holy fire>T:smite>T:shoot");
+    }
+
+    void flee()
+    {
+        tickInMeleeRange();
+        tickInMeleeRange();
+
+        assertActions(">S:fade>S:flee");
+    }
+
+    void incompatibles()
+    {
+        engine->addStrategies("shadow", "holy", NULL);
+
+        CPPUNIT_ASSERT_EQUAL(engine->ListStrategies(), string("Strategies: holy"));
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( HolyPriestTestCase );
diff --git a/src/tests/HunterNonCombatTestCase.cpp b/src/tests/HunterNonCombatTestCase.cpp
new file mode 100644
index 00000000000..79698f2f578
--- /dev/null
+++ b/src/tests/HunterNonCombatTestCase.cpp
@@ -0,0 +1,75 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/hunter/HunterAiObjectContext.h"
+
+using namespace ai;
+
+
+class HunterNonCombatTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( HunterNonCombatTestCase );
+    CPPUNIT_TEST( buff );
+    CPPUNIT_TEST( lowMana );
+    CPPUNIT_TEST( summonPet );
+	CPPUNIT_TEST( buffIfPackUnavailable );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new HunterAiObjectContext(ai), "nc", NULL);
+
+        set<uint8>("attacker count", 0);
+    }
+
+protected:
+    void buff()
+    {
+		engine->addStrategy("bspeed");
+
+		tick();
+        addAura("aspect of the pack");
+        tick();
+
+        engine->addStrategy("bdps");
+		tickWithAttackerCount(1);
+        
+        assertActions(">S:aspect of the pack>S:trueshot aura>S:aspect of the hawk");
+    }
+
+    void lowMana()
+    {
+        addAura("trueshot aura");
+
+        engine->addStrategy("bmana");
+        
+		tick();
+        addAura("aspect of the viper");
+
+        assertActions(">S:aspect of the viper");
+    }
+
+    void summonPet()
+    {
+        tickWithNoPet();
+        
+		tickWithPetDead();
+		tickWithPetLowHealth(30);
+
+		assertActions(">S:call pet>S:revive pet>Pet:mend pet");
+	}        
+
+    void buffIfPackUnavailable()
+    {
+		engine->addStrategy("bspeed");
+
+        tickWithSpellUnavailable("aspect of the pack");
+
+		assertActions(">S:aspect of the cheetah");
+    }
+    
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( HunterNonCombatTestCase );
diff --git a/src/tests/KiteTestCase.cpp b/src/tests/KiteTestCase.cpp
new file mode 100644
index 00000000000..f4ba9a1c870
--- /dev/null
+++ b/src/tests/KiteTestCase.cpp
@@ -0,0 +1,39 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "EngineTestBase.h"
+#include "../game/playerbot/strategy/warrior/WarriorAiObjectContext.h"
+
+using namespace ai;
+
+
+class KiteTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( KiteTestCase );
+    CPPUNIT_TEST( kite );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+	virtual void setUp()
+	{
+		EngineTestBase::setUp();
+		setupEngine(new WarriorAiObjectContext(ai), "tank", NULL);
+
+		engine->addStrategy("kite");
+        set<float>("distance", "current target", 0.0f);
+		
+		addAura("battle shout");
+		addAura("defensive stance");
+    }
+ 
+protected:
+    void kite()
+    {
+        set<bool>("has aggro", "current target", true);
+		tick();
+
+        assertActions(">S:runaway");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( KiteTestCase );
diff --git a/src/tests/LootObjectStackTestCase.cpp b/src/tests/LootObjectStackTestCase.cpp
new file mode 100644
index 00000000000..c09c8ed4733
--- /dev/null
+++ b/src/tests/LootObjectStackTestCase.cpp
@@ -0,0 +1,52 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "MockPlayerbotAIBase.h"
+#include "../game/playerbot/LootObjectStack.h"
+
+using namespace ai;
+using namespace std;
+
+class LootObjectStackTestCase : public CPPUNIT_NS::TestFixture
+{
+  CPPUNIT_TEST_SUITE( LootObjectStackTestCase );
+      CPPUNIT_TEST( duplicates );
+      CPPUNIT_TEST( shrink );
+  CPPUNIT_TEST_SUITE_END();
+
+protected:
+
+public:
+	void setUp()
+	{
+	}
+
+protected:
+	void duplicates()
+	{
+	    LootTargetList data;
+	    data.insert(LootTarget(ObjectGuid(uint64(2))));
+	    data.insert(LootTarget(ObjectGuid(uint64(2))));
+
+	    CPPUNIT_ASSERT(data.size() == 1);
+	}
+
+	void shrink()
+	{
+	    LootTargetList data;
+	    LootTarget t1 = LootTarget(ObjectGuid(uint64(2)));
+	    t1.asOfTime = 10;
+	    LootTarget t2 = LootTarget(ObjectGuid(uint64(3)));
+	    t2.asOfTime = 5;
+
+	    data.insert(t1);
+	    data.insert(t2);
+	    CPPUNIT_ASSERT(data.size() == 2);
+
+	    data.shrink(7);
+        CPPUNIT_ASSERT(data.size() == 1);
+	    CPPUNIT_ASSERT(data.begin()->asOfTime == 10);
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( LootObjectStackTestCase );
diff --git a/src/tests/MageNonCombatTestCase.cpp b/src/tests/MageNonCombatTestCase.cpp
new file mode 100644
index 00000000000..4cc8c66445e
--- /dev/null
+++ b/src/tests/MageNonCombatTestCase.cpp
@@ -0,0 +1,87 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/mage/MageAiObjectContext.h"
+
+using namespace ai;
+
+
+class MageNonCombatTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( MageNonCombatTestCase );
+    CPPUNIT_TEST( buff );
+    CPPUNIT_TEST( bdps );
+    CPPUNIT_TEST( bmana );
+    CPPUNIT_TEST( dispel );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new MageAiObjectContext(ai), "nc", NULL);
+		set<uint8>("item count", "food", 1);
+		set<uint8>("item count", "drink", 1);
+    }
+
+protected:
+    void buff()
+    {
+		tick();
+        addAura("arcane intellect");
+
+		tickWithSpellAvailable("arcane intellect");
+        addPartyAura("arcane intellect");
+
+		tickWithNoDrink();
+		tickWithNoFood();
+
+        assertActions(">S:arcane intellect>P:arcane intellect on party>S:conjure water>S:conjure food");
+    }
+
+    void bmana()
+    {
+        engine->addStrategy("bmana");
+
+        addAura("arcane intellect");
+        addPartyAura("arcane intellect");
+
+        tick();
+        tick();
+        tick();
+
+        assertActions(">S:mage armor>S:ice armor>S:frost armor");
+    }
+
+    void bdps()
+    {
+        engine->addStrategy("bdps");
+
+        addAura("arcane intellect");
+        addPartyAura("arcane intellect");
+
+        tick();
+        tick();
+        tick();
+        tick();
+
+        assertActions(">S:molten armor>S:mage armor>S:ice armor>S:frost armor");
+    }
+
+    void dispel()
+    {
+        addAura("arcane intellect");
+        addPartyAura("arcane intellect");
+        addAura("mage armor");
+
+        tickWithAuraToDispel(DISPEL_CURSE);
+
+        spellAvailable("remove curse");
+        tickWithPartyAuraToDispel(DISPEL_CURSE);
+
+        assertActions(">S:remove curse>P:remove curse on party");
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( MageNonCombatTestCase );
diff --git a/src/tests/MeleeShamanTestCase.cpp b/src/tests/MeleeShamanTestCase.cpp
new file mode 100644
index 00000000000..71d198621de
--- /dev/null
+++ b/src/tests/MeleeShamanTestCase.cpp
@@ -0,0 +1,103 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/shaman/ShamanAiObjectContext.h"
+
+using namespace ai;
+
+
+class MeleeShamanTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( MeleeShamanTestCase );
+    CPPUNIT_TEST( combat );
+	CPPUNIT_TEST( buff );
+	CPPUNIT_TEST( incompatibles );
+    CPPUNIT_TEST( aoe );
+    CPPUNIT_TEST( boost );
+    CPPUNIT_TEST( interruptSpell );
+    CPPUNIT_TEST( interrupt_enemy_healer );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new ShamanAiObjectContext(ai), "melee", NULL);
+
+        addAura("lightning shield");
+    }
+
+protected:
+    void combat()
+    {
+		tickInMeleeRange();
+
+        tick();
+        tick();
+        addTargetAura("earth shock");
+
+        tick();
+		tick();
+		tick();
+
+        assertActions(">S:searing totem>T:earth shock>T:flame shock>T:stormstrike>T:lava lash>T:melee");
+    }
+
+    void buff()
+    {
+        engine->addStrategy("bdps");
+        removeAura("lightning shield");
+        tickInMeleeRange();
+
+        tick();
+        addAura("lightning shield");
+
+        tickWithItemForSpell("windfury weapon");
+        tickWithItemForSpell("windfury weapon");
+
+        assertActions(">S:lightning shield>S:searing totem>S:windfury weapon>S:rockbiter weapon");
+    }
+
+    void incompatibles()
+    {
+        engine->addStrategies("melee", "dps", "heal", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: heal");
+    }
+
+    void aoe()
+    {
+        engine->addStrategy("melee aoe");
+
+        tickInMeleeRange();
+        tickWithAttackerCount(3);
+        tickWithAttackerCount(3);
+        tickWithAttackerCount(3);
+
+        assertActions(">S:searing totem>S:strength of earth totem>S:magma totem>T:fire nova");
+    }
+
+    void boost()
+    {
+        tickWithBalancePercent(1);
+        tickWithBalancePercent(1);
+
+        assertActions(">S:heroism>S:bloodlust");
+    }
+
+    void interruptSpell()
+    {
+        tickWithTargetIsCastingNonMeleeSpell();
+
+        assertActions(">T:wind shear");
+    }
+
+    void interrupt_enemy_healer()
+    {
+        tickWithEnemyHealerIsCastingInterruptableSpell("wind shear");
+
+        assertActions(">H:wind shear on enemy healer");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( MeleeShamanTestCase );
diff --git a/src/tests/MockAiObjectContext.cpp b/src/tests/MockAiObjectContext.cpp
new file mode 100644
index 00000000000..10918ee39d2
--- /dev/null
+++ b/src/tests/MockAiObjectContext.cpp
@@ -0,0 +1,114 @@
+#include "pch.h"
+#include "aitest.h"
+#include "MockAiObjectContext.h"
+
+using namespace std;
+using namespace ai;
+
+class MockTrigger : public Trigger
+{
+public:
+    MockTrigger(PlayerbotAI* const ai) : Trigger(ai)
+    {
+    }
+
+public:
+    virtual Event Check()
+    {
+        Event copy = event;
+        event = Event();
+        return copy;
+    }
+
+    virtual void ExternalEvent(string param, Player* owner = NULL)
+    {
+        this->event = Event("mock", param);
+    }
+
+private:
+    Event event;
+};
+
+class MockAction : public Action
+{
+public:
+    MockAction(PlayerbotAI* const ai, string* buffer, string  name) : Action(ai, name), buffer(buffer)
+    {
+
+    }
+
+    virtual bool Execute(Event event)
+    {
+        buffer->append(">");
+        buffer->append(getName());
+        if (event.getParam().empty())
+            return true;
+
+        buffer->append("(");
+        buffer->append(event.getParam());
+        buffer->append(")");
+        return true;
+    }
+
+    virtual bool ExecuteResult()
+    {
+        buffer->append(getName());
+        return true;
+    }
+
+private:
+    string* buffer;
+};
+
+MockAiObjectContext::MockAiObjectContext(PlayerbotAI* const ai, AiObjectContext *realContext, string* buffer) :
+    AiObjectContext(ai), buffer(buffer), realContext(realContext)
+{
+}
+
+void MockAiObjectContext::reportNotFound(string  what, string  name)
+{
+    std::cout << "\n===\n";
+    cout << what << " " << name << " not found in context";
+    std::cout << "\n===\n";
+}
+
+Strategy* MockAiObjectContext::GetStrategy(string  name)
+{
+    if (!realContext->GetStrategy(name))
+    {
+        reportNotFound("Strategy", name);
+        CPPUNIT_ASSERT(false);
+    }
+
+    return realContext->GetStrategy(name);
+}
+
+Trigger* MockAiObjectContext::GetTrigger(string  name)
+{
+    if (!realContext->GetTrigger(name))
+    {
+        reportNotFound("Trigger", name);
+        CPPUNIT_ASSERT(false);
+    }
+
+    Trigger* trigger = triggers[name];
+    if (trigger)
+        return trigger;
+
+    return triggers[name] = new MockTrigger(ai);
+}
+
+Action* MockAiObjectContext::GetAction(string  name)
+{
+    if (!realContext->GetAction(name))
+    {
+        reportNotFound("Action", name);
+        CPPUNIT_ASSERT(false);
+    }
+
+    Action* action = actions[name];
+    if (action)
+        return action;
+
+    return actions[name] = new MockAction(ai, buffer, name);
+}
diff --git a/src/tests/MockAiObjectContext.h b/src/tests/MockAiObjectContext.h
new file mode 100644
index 00000000000..e63b4f0d944
--- /dev/null
+++ b/src/tests/MockAiObjectContext.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "string "
+
+using namespace std;
+
+#include "MockedTargets.h"
+
+namespace ai
+{
+    class MockAiObjectContext : public AiObjectContext
+    {
+    public:
+        MockAiObjectContext(PlayerbotAI* const ai, AiObjectContext *realContext, string* buffer);
+    
+    public:
+        virtual Strategy* GetStrategy(string  name);
+        virtual Trigger* GetTrigger(string  name);
+        virtual Action* GetAction(string  name);
+
+    private:
+        void reportNotFound(string  what, string  name);
+
+	private:
+		string* buffer;
+        AiObjectContext *realContext;
+        map<string , Trigger*> triggers;
+        map<string , Action*> actions;
+    };
+
+}
\ No newline at end of file
diff --git a/src/tests/MockPlayerbotAIBase.cpp b/src/tests/MockPlayerbotAIBase.cpp
new file mode 100644
index 00000000000..faaae895380
--- /dev/null
+++ b/src/tests/MockPlayerbotAIBase.cpp
@@ -0,0 +1,79 @@
+#include "pch.h"
+#include "aitest.h"
+#include "MockPlayerbotAIBase.h"
+#include "MockedTargets.h"
+
+using namespace std;
+using namespace ai;
+
+void MockPlayerbotAIBase::InterruptSpell()
+{
+}
+
+void MockPlayerbotAIBase::RemoveAura(string name)
+{
+    Unit* target = MockedTargets::GetSelf();
+    if (HasAura(name, target)) {
+        auras[target].remove(name);
+        buffer.append(">-");
+        buffer.append(name);
+    }
+}
+
+bool MockPlayerbotAIBase::CanCastSpell(string name, Unit* target)
+{
+    for (list<string >::iterator i = spellCooldowns.begin(); i != spellCooldowns.end(); i++)
+    {
+        string s = *i;
+        if (s == name)
+            return false;
+    }
+    return true;
+}
+
+bool MockPlayerbotAIBase::IsSpellCastUseful(string name, Unit* target)
+{
+    return true;
+}
+
+bool MockPlayerbotAIBase::CastSpell(string name, Unit* target)
+{
+    buffer.append(">");
+    if (target == MockedTargets::GetPartyMember())
+        buffer.append("P:");
+    if (target == MockedTargets::GetCurrentTarget())
+        buffer.append("T:");
+    if (target == MockedTargets::GetSelf())
+        buffer.append("S:");
+    if (target == MockedTargets::GetPet())
+        buffer.append("Pet:");
+    if (target == MockedTargets::GetCc())
+        buffer.append("Cc:");
+    buffer.append(name);
+
+    spellCooldowns.push_back(name);
+    auras[target].push_back(name);
+
+    return true;
+}
+
+bool MockPlayerbotAIBase::HasAura(string spellName, Unit* player)
+{
+    for (list<string >::iterator i = auras[player].begin(); i != auras[player].end(); i++)
+    {
+        string s = *i;
+        if (s == spellName)
+            return TRUE;
+    }
+    return false;
+
+}
+bool MockPlayerbotAIBase::IsInterruptableSpellCasting(Unit* player, string spell)
+{
+    return targetIsCastingNonMeleeSpell;
+}
+
+bool MockPlayerbotAIBase::HasAuraToDispel(Unit* player, uint32 dispelType)
+{
+    return dispels[player] == dispelType;
+}
diff --git a/src/tests/MockPlayerbotAIBase.h b/src/tests/MockPlayerbotAIBase.h
new file mode 100644
index 00000000000..f3bc5bd1bee
--- /dev/null
+++ b/src/tests/MockPlayerbotAIBase.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include "MockedTargets.h"
+
+namespace ai
+{
+	class MockPlayerbotAIBase : public PlayerbotAI
+	{
+	public:
+		MockPlayerbotAIBase() : PlayerbotAI() 
+        {
+            targetIsCastingNonMeleeSpell = false;
+        }
+        void SetContext(AiObjectContext* context) { this->aiObjectContext = context; }
+	
+        virtual uint32 GetSpellId(string args) { return 1; }
+        virtual void InterruptSpell();
+        virtual void RemoveAura(string name);
+        virtual bool CanCastSpell(string name, Unit* target);
+        virtual bool CastSpell(string name, Unit* target);
+        virtual bool HasAura(string spellName, Unit* player);
+        virtual bool IsInterruptableSpellCasting(Unit* player, string spell);
+        virtual bool HasAuraToDispel(Unit* player, uint32 dispelType);
+        virtual bool IsSpellCastUseful(string name, Unit* target);
+
+    public:
+        void resetSpells() {spellCooldowns.clear(); }
+
+    public:
+        string buffer;
+
+    public:
+        list<string > spellCooldowns;
+
+        map<Unit*, list<string >> auras;
+        map<Unit*, uint32> dispels;
+
+        bool targetIsCastingNonMeleeSpell;
+    };
+
+}
diff --git a/src/tests/MockedAiObjectContextTestCase.h b/src/tests/MockedAiObjectContextTestCase.h
new file mode 100644
index 00000000000..1a68a33b942
--- /dev/null
+++ b/src/tests/MockedAiObjectContextTestCase.h
@@ -0,0 +1,54 @@
+#include "MockAiObjectContext.h"
+
+using namespace ai;
+
+
+class MockedAiObjectContextTestCase : public EngineTestBase
+{
+  
+protected:
+    MockAiObjectContext* context;
+
+
+protected:
+    void assertCommand(string  trigger)
+    {
+        assertCommand(trigger, trigger);
+    }
+
+    void assertCommand(string  trigger, string  expectedAction)
+    {
+        ai->buffer.clear();
+
+        context->GetTrigger(trigger)->ExternalEvent("");
+        tick();
+
+        assertActions(string(">S:") + expectedAction);
+    }
+
+    void assertParametrizedCommand(string  trigger, string  param)
+    {
+        ai->buffer.clear();
+
+        context->GetTrigger(trigger)->ExternalEvent(param);
+        tick();
+
+        assertActions(string (">S:") + trigger + "(" + param + ")");
+    }
+
+    void trigger(string  name)
+    {
+        context->GetTrigger(name)->ExternalEvent("");
+    }
+
+    void trigger(string  name, string  param)
+    {
+        context->GetTrigger(name)->ExternalEvent(param);
+    }
+
+    void tickWithTrigger(string  name)
+    {
+        trigger(name);
+        tick();
+    }
+};
diff --git a/src/tests/MockedTargets.h b/src/tests/MockedTargets.h
new file mode 100755
index 00000000000..812b670f434
--- /dev/null
+++ b/src/tests/MockedTargets.h
@@ -0,0 +1,65 @@
+#pragma once
+
+using namespace std;
+
+namespace ai
+{
+    class MockedTargets
+    {
+	public:
+		static Unit* GetPartyMember() { return (Unit*)1; }
+		static Unit* GetCurrentTarget()  { return (Unit*)7; }
+		static Player* GetSelf() { return (Player*)9; }
+		static Unit* GetPet() { return (Unit*)10; }
+		static Player* GetMaster() { return (Player*)2; }
+        static Player* GetTargetForDps() { return (Player*)3; }
+        static Player* GetTargetForTank() { return (Player*)4; }
+        static Player* GetCc() { return (Player*)12; }
+		static Player* GetLineTarget() { return (Player*)14; }
+		static Unit* GetLeastHpTarget() { return (Unit*)15; }
+		static Unit* GetLeastHpPartyMember() { return (Unit*)16; }
+		static Unit* GetRtiTarget() { return (Unit*)17; }
+		static Unit* GetDuelTarget() { return (Unit*)18; }
+		static Unit* GetGridTarget() { return (Unit*)19; }
+		static Unit* GetEnemyPlayer() { return (Unit*)20; }
+		static Unit* GetAttackerWithoutAura() { return (Unit*)21; }
+		static Unit* GetEnemyHealer() { return (Unit*)22; }
+
+        static void Append(string &buffer, Unit* unit)
+        {
+            if (unit == GetPartyMember())
+                buffer.append("P");
+            if (unit == GetCurrentTarget())
+                buffer.append("T");
+            if (unit == GetSelf())
+                buffer.append("S");
+            if (unit == GetPet())
+                buffer.append("Pet");
+            if (unit == GetMaster())
+                buffer.append("M");
+            if (unit == GetTargetForDps())
+                buffer.append("Dps");
+            if (unit == GetTargetForTank())
+                buffer.append("Tank");
+            if (unit == GetCc())
+                buffer.append("Cc");
+            if (unit == GetLineTarget())
+                buffer.append("Line");
+            if (unit == GetLeastHpTarget())
+                buffer.append("LeastHp");
+            if (unit == GetRtiTarget())
+                buffer.append("Rti");
+            if (unit == GetDuelTarget())
+                buffer.append("Duel");
+            if (unit == GetGridTarget())
+                buffer.append("Grind");
+            if (unit == GetEnemyPlayer())
+                buffer.append("Enemy");
+            if (unit == GetAttackerWithoutAura())
+                buffer.append("A");
+            if (unit == GetEnemyHealer())
+                buffer.append("H");
+        }
+   };
+
+}
diff --git a/src/tests/NextActionTestCase.cpp b/src/tests/NextActionTestCase.cpp
new file mode 100644
index 00000000000..be94d984d51
--- /dev/null
+++ b/src/tests/NextActionTestCase.cpp
@@ -0,0 +1,82 @@
+#include "pch.h"
+
+#include "aitest.h"
+
+using namespace ai;
+
+class NextActionTestCase : public CPPUNIT_NS::TestFixture
+{
+	CPPUNIT_TEST_SUITE( NextActionTestCase );
+	CPPUNIT_TEST( array );
+    CPPUNIT_TEST( clone );
+    CPPUNIT_TEST( merge );
+    CPPUNIT_TEST( cloneNull );
+    CPPUNIT_TEST( mergeWithNull );
+	CPPUNIT_TEST_SUITE_END();
+
+protected:
+
+public:
+	void setUp()
+	{
+	}
+
+protected:
+    void array()
+    {
+        NextAction** actions = NextAction::array(0, new NextAction("1", 1), NULL);
+        CPPUNIT_ASSERT(actions[0]->getName() == "1");
+        CPPUNIT_ASSERT(!actions[1]);
+        NextAction::destroy(actions);
+    }
+
+	void clone()
+	{
+		NextAction** actions = new NextAction*[3];
+        actions[0] = new NextAction("1", 1);
+        actions[1] = new NextAction("2", 2);
+        actions[2] = NULL;
+
+        NextAction** cloned = NextAction::clone(actions);
+
+		CPPUNIT_ASSERT(!cloned[2]);
+		CPPUNIT_ASSERT(cloned[0]->getName() == "1");
+        CPPUNIT_ASSERT(cloned[1]->getName() == "2");
+
+        // check memory
+        NextAction::destroy(cloned);
+	}
+
+    void merge()
+    {
+        NextAction** left = NextAction::array(0, new NextAction("1", 1),  new NextAction("2", 2), NULL);
+        NextAction** right = NextAction::array(0, new NextAction("3", 3), NULL);
+
+        NextAction** merged = NextAction::merge(left, right);
+
+        CPPUNIT_ASSERT(!merged[3]);
+        CPPUNIT_ASSERT(merged[0]->getName() == "1");
+        CPPUNIT_ASSERT(merged[1]->getName() == "2");
+        CPPUNIT_ASSERT(merged[2]->getName() == "3");
+
+        // check memory
+        NextAction::destroy(merged);
+    }
+
+    void cloneNull()
+    {
+        NextAction** cloned = NextAction::clone(NULL);
+        CPPUNIT_ASSERT(!cloned);
+    }
+
+    void mergeWithNull()
+    {
+        NextAction** left = NextAction::array(0, new NextAction("1", 1), NULL);
+        NextAction** merged = NextAction::merge(left, NULL);
+
+        CPPUNIT_ASSERT(!merged[1]);
+        CPPUNIT_ASSERT(merged[0]->getName() == "1");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( NextActionTestCase );
diff --git a/src/tests/NonCombatEngineTestCase.cpp b/src/tests/NonCombatEngineTestCase.cpp
new file mode 100644
index 00000000000..4bf6757517f
--- /dev/null
+++ b/src/tests/NonCombatEngineTestCase.cpp
@@ -0,0 +1,293 @@
+#include "pch.h"
+#include "aitest.h"
+
+#include "EngineTestBase.h"
+
+using namespace ai;
+
+
+class NonCombatEngineTestCase : public EngineTestBase
+{
+  CPPUNIT_TEST_SUITE( NonCombatEngineTestCase );
+      CPPUNIT_TEST( followMaster );
+      CPPUNIT_TEST( stay );
+      CPPUNIT_TEST( eatDrink );
+      CPPUNIT_TEST( dpsAssist );
+      CPPUNIT_TEST( tankAssist );
+      CPPUNIT_TEST( attackWeak );
+      CPPUNIT_TEST( doNotGrindIfLowMpHp );
+      CPPUNIT_TEST( grindIfNoMana );
+      CPPUNIT_TEST( attackRti );
+      CPPUNIT_TEST( loot );
+      CPPUNIT_TEST( loot_failed );
+      CPPUNIT_TEST( gather );
+      CPPUNIT_TEST( runaway );
+      CPPUNIT_TEST( passive );
+      CPPUNIT_TEST( movementStrategies );
+      CPPUNIT_TEST( assistStrategies );
+      CPPUNIT_TEST( out_of_react );
+      CPPUNIT_TEST( tell_target );
+      CPPUNIT_TEST( pvp );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+	void setUp()
+	{
+		EngineTestBase::setUp();
+		setupEngine(new AiObjectContext(ai), NULL);
+	}
+
+protected:
+    void runaway()
+    {
+        engine->addStrategy("runaway");
+		tickWithAttackerCount(0);
+		tickInMeleeRange();
+        assertActions(">S:runaway>S:runaway");
+    }
+
+    void followMaster()
+    {
+        engine->addStrategy("follow");
+
+        set<float>("distance", "master target", 20);
+		tickWithAttackerCount(0);
+		assertActions(">S:follow");
+    }
+
+    void stay()
+    {
+		engine->addStrategy("stay");
+
+		tickWithAttackerCount(0);
+		assertActions(">S:stay");
+    }
+
+    void dpsAssist()
+    {
+        engine->addStrategy("stay");
+        engine->addStrategy("dps assist");
+
+		tick();
+		tickWithNoTarget();
+
+		assertActions(">S:stay>Dps:dps assist");
+    }
+
+
+	void tankAssist()
+	{
+		engine->addStrategy("stay");
+		engine->addStrategy("tank assist");
+
+		tick();
+		tickWithNoTarget();
+
+		assertActions(">S:stay>Tank:tank assist");
+	}
+
+	void attackRti()
+	{
+		engine->addStrategy("stay");
+		engine->addStrategy("attack rti");
+
+		tick();
+		tickWithNoTarget();
+
+		assertActions(">S:stay>Rti:attack rti target");
+	}
+
+	void attackWeak()
+	{
+		engine->addStrategy("stay");
+		engine->addStrategy("attack weak");
+
+		set<Unit*>("current target", MockedTargets::GetLeastHpTarget());
+		tick();
+
+		tickWithNoTarget();
+
+		set<Unit*>("current target", MockedTargets::GetCurrentTarget()); // means any other
+		tick();
+
+		assertActions(">S:stay>LeastHp:attack least hp target>LeastHp:attack least hp target");
+	}
+
+	void pvp()
+	{
+		engine->addStrategy("stay");
+		engine->addStrategy("pvp");
+
+        set<Unit*>("current target", MockedTargets::GetEnemyPlayer());
+		tick();
+
+		tickWithNoTarget();
+
+		set<Unit*>("current target", MockedTargets::GetCurrentTarget()); // means any other
+		tick();
+
+		assertActions(">S:stay>Enemy:attack enemy player>Enemy:attack enemy player");
+	}
+
+    void loot()
+    {
+		engine->addStrategy("stay");
+		engine->addStrategy("loot");
+
+		tickWithLootAvailable();
+
+        set<float>("distance", "loot target", 15.0f);
+        tick();
+
+        set<float>("distance", "loot target", 0.0f);
+        set<bool>("can loot", true);
+        tick();
+
+        set<bool>("can loot", false);
+        tick();
+
+        set<uint8>("bag space", 99);
+        tickWithLootAvailable();
+        set<uint8>("bag space", 0);
+
+        assertActions(">S:loot>S:move to loot>S:open loot>S:stay>S:check mount state");
+    }
+
+    void loot_failed()
+    {
+		engine->addStrategy("follow");
+		engine->addStrategy("loot");
+
+		tickWithLootAvailable();
+
+        set<float>("distance", "loot target", 15.0f);
+        tick();
+        set<float>("distance", "loot target", 0.0f);
+
+        set<bool>("can loot", true);
+        tick();
+
+        spellAvailable("open loot");
+        tick();
+
+        assertActions(">S:loot>S:move to loot>S:open loot>S:open loot");
+    }
+
+    void gather()
+    {
+		engine->addStrategy("stay");
+		engine->addStrategy("gather");
+		engine->addStrategy("loot");
+
+		set<list<ObjectGuid>>("possible targets", list<ObjectGuid>());
+		tick();
+
+        tickWithLootAvailable();
+
+        set<bool>("can loot", true);
+        tick();
+
+        assertActions(">S:add gathering loot>S:loot>S:open loot");
+    }
+
+    void eatDrink()
+    {
+        engine->addStrategy("food");
+        set<uint8>("item count", "food", 1);
+        set<uint8>("item count", "drink", 1);
+
+        tickWithLowHealth(1);
+        tickWithLowMana(1);
+
+        assertActions(">S:food>S:drink");
+    }
+
+    void passive()
+    {
+        engine->addStrategy("stay");
+        engine->addStrategy("passive");
+
+        tick();
+		tickWithNoTarget();
+
+        assertActions(">S:stay>S:check mount state");
+    }
+
+    void movementStrategies()
+    {
+        engine->addStrategy("follow");
+        engine->addStrategy("follow line");
+        engine->addStrategy("be near");
+        engine->addStrategy("runaway");
+        engine->addStrategy("stay");
+
+        cout << engine->ListStrategies();
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: stay");
+    }
+
+    void assistStrategies()
+    {
+        engine->addStrategy("dps assist");
+        engine->addStrategy("tank asssist");
+        engine->addStrategy("dps aoe");
+        engine->addStrategy("tank asssist");
+        engine->addStrategy("grind");
+
+        cout << engine->ListStrategies();
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: grind");
+    }
+
+    void out_of_react()
+    {
+        engine->addStrategy("follow");
+        set<float>("distance", "master target", 100.0f / 2 + 10);
+        tick();
+        assertActions(">S:tell out of react range");
+    }
+
+    void tell_target()
+    {
+        engine->addStrategy("tell target");
+        set<Unit*>("old target", MockedTargets::GetPet());
+        tick();
+        set<Unit*>("current target", NULL);
+        tick();
+        assertActions(">S:tell target");
+    }
+
+    void doNotGrindIfLowMpHp()
+    {
+        engine->addStrategy("stay");
+        engine->addStrategy("grind");
+        context->GetValue<Unit*>("grind target")->Set(MockedTargets::GetGridTarget());
+
+        tick();
+        set<uint8>("health", "self target", 1);
+        tickWithNoTarget();
+        set<uint8>("health", "self target", 100);
+        set<uint8>("mana", "self target", 1);
+        tickWithNoTarget();
+
+        set<uint8>("health", "self target", 100);
+        set<uint8>("mana", "self target", 100);
+        tickWithNoTarget();
+
+        assertActions(">S:stay>S:check mount state>S:check mount state>Grind:attack anything");
+    }
+
+    void grindIfNoMana()
+    {
+        engine->addStrategy("stay");
+        engine->addStrategy("grind");
+        context->GetValue<Unit*>("grind target")->Set(MockedTargets::GetGridTarget());
+
+        tick();
+        set<uint8>("health", "self target", 100);
+        set<uint8>("mana", "self target", 0);
+        tickWithNoTarget();
+
+        assertActions(">S:stay>Grind:attack anything");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( NonCombatEngineTestCase );
diff --git a/src/tests/NonCombatEngineTestCase2.cpp b/src/tests/NonCombatEngineTestCase2.cpp
new file mode 100644
index 00000000000..e0532867978
--- /dev/null
+++ b/src/tests/NonCombatEngineTestCase2.cpp
@@ -0,0 +1,42 @@
+#include "pch.h"
+#include "aitest.h"
+
+#include "EngineTestBase.h"
+#include "MockedAiObjectContextTestCase.h"
+
+using namespace ai;
+
+
+class NonCombatEngineTestCase2 : public MockedAiObjectContextTestCase
+{
+  CPPUNIT_TEST_SUITE( NonCombatEngineTestCase2 );
+      CPPUNIT_TEST( emote );
+      CPPUNIT_TEST( ready_check );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+	void setUp()
+	{
+		EngineTestBase::setUp();
+        setupEngine(context = new MockAiObjectContext(ai, new AiObjectContext(ai), &ai->buffer), "emote", NULL);
+	}
+
+protected:
+    void emote()
+    {
+        tickWithTrigger("random");
+        tickWithTrigger("seldom");
+
+        assertActions(">S:emote>S:suggest what to do");
+    }
+
+    void ready_check()
+    {
+        engine->addStrategy("ready check");
+        tickWithTrigger("timer");
+
+        assertActions(">S:ready check");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( NonCombatEngineTestCase2 );
diff --git a/src/tests/PaladinNonCombatTestCase.cpp b/src/tests/PaladinNonCombatTestCase.cpp
new file mode 100644
index 00000000000..35bc9880e2e
--- /dev/null
+++ b/src/tests/PaladinNonCombatTestCase.cpp
@@ -0,0 +1,97 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/paladin/PaladinAiObjectContext.h"
+
+using namespace ai;
+
+
+class PaladinNonCombatTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( PaladinNonCombatTestCase );
+        CPPUNIT_TEST( buff );
+		CPPUNIT_TEST( resurrect );
+		CPPUNIT_TEST( healing );
+        CPPUNIT_TEST( curePoison );
+        CPPUNIT_TEST( cureMagic );
+        CPPUNIT_TEST( cureDisease );
+    CPPUNIT_TEST_SUITE_END();
+
+
+public:
+    virtual void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new PaladinAiObjectContext(ai), "nc", NULL);
+
+        set<uint8>("attacker count", 0);
+    }
+
+protected:
+    void buff()
+    {
+        tick();
+
+        engine->addStrategy("bspeed");
+        set<bool>("mounted", "self target", true);
+		tick();
+        set<bool>("mounted", "self target", false);
+
+		assertActions(">P:blessing of kings on party>S:crusader aura");
+    }
+
+	void resurrect()
+	{
+		tickWithDeadPartyMember();
+		assertActions(">P:redemption");
+	}
+
+    void healing()
+    {
+        tickWithLowHealth(50);
+        tickWithLowHealth(30);
+
+        spellAvailable("flash of light");
+        spellAvailable("holy light");
+        tickWithPartyLowHealth(50);
+        tickWithPartyLowHealth(30);
+
+        assertActions(">S:flash of light>S:holy light>P:flash of light on party>P:holy light on party");
+    }
+
+
+    void cureDisease()
+    {
+        cureKind(DISPEL_DISEASE);
+        assertActions(">S:cleanse>P:cleanse disease on party>S:purify>P:purify disease on party");
+    }
+
+    void curePoison()
+    {
+        cureKind(DISPEL_POISON);
+        assertActions(">S:cleanse>P:cleanse poison on party>S:purify>P:purify poison on party");
+    }
+
+    void cureMagic()
+    {
+        cureKind(DISPEL_MAGIC);
+        assertActions(">S:cleanse>P:cleanse magic on party>P:blessing of kings on party>S:check mount state");
+    }
+
+    void cureKind(DispelType type)
+    {
+        spellAvailable("cleanse");
+        tickWithAuraToDispel(type);
+
+        spellAvailable("cleanse");
+        tickWithPartyAuraToDispel(type);
+
+        spellAvailable("purify");
+        tickWithAuraToDispel(type);
+
+        spellAvailable("purify");
+        tickWithPartyAuraToDispel(type);
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( PaladinNonCombatTestCase );
diff --git a/src/tests/PerformanceTestCase.cpp b/src/tests/PerformanceTestCase.cpp
new file mode 100644
index 00000000000..133259b49d4
--- /dev/null
+++ b/src/tests/PerformanceTestCase.cpp
@@ -0,0 +1,177 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "EngineTestBase.h"
+#include "../game/playerbot/strategy/druid/DruidAiObjectContext.h"
+#include "../game/playerbot/strategy/paladin/PaladinAiObjectContext.h"
+#include "../game/playerbot/strategy/warrior/WarriorAiObjectContext.h"
+#include "../game/playerbot/strategy/warlock/WarlockAiObjectContext.h"
+#include "../game/playerbot/strategy/mage/MageAiObjectContext.h"
+#include "../game/playerbot/strategy/hunter/HunterAiObjectContext.h"
+#include "../game/playerbot/strategy/priest/PriestAiObjectContext.h"
+#include "../game/playerbot/strategy/shaman/ShamanAiObjectContext.h"
+#include "../game/playerbot/PlayerbotAIConfig.h"
+
+using namespace ai;
+
+#define MAX_TICKS 20
+
+class EverythingFailedActionExecutionListener : public ActionExecutionListener
+{
+public:
+    EverythingFailedActionExecutionListener(MockPlayerbotAIBase *ai) : ai(ai) {}
+
+    virtual bool Before(Action* action, Event event)
+    {
+        string name = action->getName();
+        if (name == "melee" ||
+                name == "shoot" ||
+                name == "auto shot" ||
+                name == "reach melee" ||
+                name == "reach spell")
+            return true;
+
+        return false;
+    }
+
+    virtual bool AllowExecution(Action* action, Event event) { return false; }
+    virtual bool OverrideResult(Action* action, bool executed, Event event) { return executed; }
+    virtual void After(Action* action, bool executed, Event event) {}
+
+private:
+    MockPlayerbotAIBase *ai;
+};
+
+
+
+class PerformanceTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( PerformanceTestCase );
+        CPPUNIT_TEST( druidBear );
+        CPPUNIT_TEST( druidCat );
+        CPPUNIT_TEST( paladin );
+        CPPUNIT_TEST( warrior );
+        CPPUNIT_TEST( warlock );
+        CPPUNIT_TEST( priest );
+        CPPUNIT_TEST( mage );
+        CPPUNIT_TEST( hunter );
+        CPPUNIT_TEST( shaman );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+        EngineTestBase::setUp();
+        setupEngine(new AiObjectContext(ai), "melee", NULL);
+    }
+
+protected:
+    void run()
+    {
+        time_t timestamp = time(0);
+        int i = 0;
+        for (; i<sPlayerbotAIConfig.iterationsPerTick; ++i)
+        {
+            tick();
+
+            if (!ai->buffer.empty())
+                break;
+        }
+
+        CPPUNIT_ASSERT(!ai->buffer.empty());
+
+        cout << ai->buffer << " - " << i << "ticks, time: " << (time(0) - timestamp);
+    }
+
+    void druidBear()
+    {
+        setupEngine(new DruidAiObjectContext(ai), "tank", NULL);
+        engine->AddActionExecutionListener(new EverythingFailedActionExecutionListener(ai));
+
+        sPlayerbotAIConfig.iterationsPerTick = MAX_TICKS;
+        run();
+        sPlayerbotAIConfig.iterationsPerTick = 10;
+    }
+
+    void paladin()
+    {
+        setupEngine(new PaladinAiObjectContext(ai), "tank", NULL);
+        engine->AddActionExecutionListener(new EverythingFailedActionExecutionListener(ai));
+
+        sPlayerbotAIConfig.iterationsPerTick = MAX_TICKS;
+        run();
+        sPlayerbotAIConfig.iterationsPerTick = 10;
+    }
+
+    void priest()
+    {
+        setupEngine(new PriestAiObjectContext(ai), "heal", NULL);
+        engine->AddActionExecutionListener(new EverythingFailedActionExecutionListener(ai));
+
+        sPlayerbotAIConfig.iterationsPerTick = MAX_TICKS;
+        run();
+        sPlayerbotAIConfig.iterationsPerTick = 10;
+    }
+
+    void mage()
+    {
+        setupEngine(new MageAiObjectContext(ai), "frost", NULL);
+        engine->AddActionExecutionListener(new EverythingFailedActionExecutionListener(ai));
+
+        sPlayerbotAIConfig.iterationsPerTick = MAX_TICKS;
+        run();
+        sPlayerbotAIConfig.iterationsPerTick = 10;
+    }
+
+    void hunter()
+    {
+        setupEngine(new HunterAiObjectContext(ai), "dps", NULL);
+        engine->AddActionExecutionListener(new EverythingFailedActionExecutionListener(ai));
+
+        sPlayerbotAIConfig.iterationsPerTick = MAX_TICKS;
+        run();
+        sPlayerbotAIConfig.iterationsPerTick = 10;
+    }
+
+    void warrior()
+    {
+        setupEngine(new WarriorAiObjectContext(ai), "tank", NULL);
+        engine->AddActionExecutionListener(new EverythingFailedActionExecutionListener(ai));
+
+        sPlayerbotAIConfig.iterationsPerTick = MAX_TICKS;
+        run();
+        sPlayerbotAIConfig.iterationsPerTick = 10;
+    }
+
+    void druidCat()
+    {
+        setupEngine(new DruidAiObjectContext(ai), "cat", NULL);
+        engine->AddActionExecutionListener(new EverythingFailedActionExecutionListener(ai));
+
+        sPlayerbotAIConfig.iterationsPerTick = MAX_TICKS;
+        run();
+        sPlayerbotAIConfig.iterationsPerTick = 10;
+    }
+
+    void warlock()
+    {
+        setupEngine(new WarlockAiObjectContext(ai), "dps", NULL);
+        engine->AddActionExecutionListener(new EverythingFailedActionExecutionListener(ai));
+
+        sPlayerbotAIConfig.iterationsPerTick = MAX_TICKS;
+        run();
+        sPlayerbotAIConfig.iterationsPerTick = 10;
+    }
+
+    void shaman()
+    {
+        setupEngine(new ShamanAiObjectContext(ai), "melee", NULL);
+        engine->AddActionExecutionListener(new EverythingFailedActionExecutionListener(ai));
+
+        sPlayerbotAIConfig.iterationsPerTick = MAX_TICKS;
+        run();
+        sPlayerbotAIConfig.iterationsPerTick = 10;
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( PerformanceTestCase );
diff --git a/src/tests/PriestNonCombatTestCase.cpp b/src/tests/PriestNonCombatTestCase.cpp
new file mode 100644
index 00000000000..82e95e28b89
--- /dev/null
+++ b/src/tests/PriestNonCombatTestCase.cpp
@@ -0,0 +1,112 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/priest/PriestAiObjectContext.h"
+
+using namespace ai;
+
+
+class PriestNonCombatTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( PriestNonCombatTestCase );
+    CPPUNIT_TEST( buff );
+    CPPUNIT_TEST( healing );
+    CPPUNIT_TEST( aoe_heal );
+    CPPUNIT_TEST( nonCombat );
+    CPPUNIT_TEST( dispel );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new PriestAiObjectContext(ai), "nc", NULL);
+
+        addAura("power word: fortitude");
+        addPartyAura("power word: fortitude");
+        addAura("divine spirit");
+        addAura("inner fire");
+        addPartyAura("power word: fortitude");
+        addPartyAura("divine spirit");
+    }
+
+protected:
+    void nonCombat()
+    {
+		tickWithDeadPartyMember();
+
+		assertActions(">P:resurrection");
+    }
+
+    void aoe_heal()
+    {
+        tickWithAoeHeal("medium");
+
+		assertActions(">P:circle of healing");
+    }
+
+    void healing()
+    {
+		tickWithLowHealth(30);
+
+		spellAvailable("flash heal");
+		tickWithPartyLowHealth(30);
+
+		tickWithLowHealth(10);
+		addAura("power word: shield");
+		tickWithLowHealth(10);
+
+		spellAvailable("power word: shield");
+		spellAvailable("greater heal");
+		tickWithPartyLowHealth(10);
+        addPartyAura("power word: shield");
+		tickWithPartyLowHealth(10);
+
+		assertActions(">S:flash heal>P:flash heal on party>S:power word: shield>S:greater heal>P:power word: shield on party>P:greater heal on party");
+    }
+
+    void buff()
+    {
+		removeAura("power word: fortitude");
+        removeAura("divine spirit");
+        removeAura("inner fire");
+        removePartyAura("power word: fortitude");
+        removePartyAura("divine spirit");
+
+        tick();
+        addAura("divine spirit");
+
+        tickWithSpellAvailable("divine spirit");
+        addPartyAura("divine spirit");
+
+        tick();
+        addAura("power word: fortitude");
+
+        tickWithSpellAvailable("power word: fortitude");
+        addPartyAura("power word: fortitude");
+
+        tick();
+
+		assertActions(">S:divine spirit>P:divine spirit on party>S:power word: fortitude>P:power word: fortitude on party>S:inner fire");
+    }
+
+    void dispel()
+    {
+        tickWithAuraToDispel(DISPEL_DISEASE);
+        tickWithAuraToDispel(DISPEL_DISEASE);
+
+        spellAvailable("abolish disease");
+        spellAvailable("cure disease");
+        tickWithPartyAuraToDispel(DISPEL_DISEASE);
+        tickWithPartyAuraToDispel(DISPEL_DISEASE);
+
+        tickWithAuraToDispel(DISPEL_MAGIC);
+
+        spellAvailable("dispel magic");
+        tickWithPartyAuraToDispel(DISPEL_MAGIC);
+
+		assertActions(">S:abolish disease>S:cure disease>P:abolish disease on party>P:cure disease on party>S:dispel magic>P:dispel magic on party");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( PriestNonCombatTestCase );
diff --git a/src/tests/QualifiedValueTestCase.cpp b/src/tests/QualifiedValueTestCase.cpp
new file mode 100644
index 00000000000..6406e68d0e8
--- /dev/null
+++ b/src/tests/QualifiedValueTestCase.cpp
@@ -0,0 +1,84 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "MockPlayerbotAIBase.h"
+
+using namespace ai;
+
+class TestQualifiedValue : public ManualSetValue<string >, public Qualified
+{
+public:
+    TestQualifiedValue(PlayerbotAI* ai) : ManualSetValue<string >(ai, "", "name"), Qualified() {}
+    virtual string Get() { return qualifier; }
+};
+
+class TestQualifiedValueContext : public NamedObjectContext<UntypedValue>
+{
+public:
+    TestQualifiedValueContext()
+    {
+        creators["value"] = &TestQualifiedValueContext::value;
+    }
+
+private:
+    static UntypedValue* value(PlayerbotAI* ai) { return new TestQualifiedValue(ai); }
+};
+
+class TestQualifiedValueAiObjectContext : public AiObjectContext
+{
+public:
+    TestQualifiedValueAiObjectContext(PlayerbotAI* const ai) : AiObjectContext(ai)
+    {
+        valueContexts.Add(new TestQualifiedValueContext());
+    }
+};
+
+
+class QualifiedValueTestCase : public CPPUNIT_NS::TestFixture
+{
+  CPPUNIT_TEST_SUITE( QualifiedValueTestCase );
+      CPPUNIT_TEST( empty );
+      CPPUNIT_TEST( qualifier );
+      CPPUNIT_TEST( number );
+  CPPUNIT_TEST_SUITE_END();
+
+protected:
+
+public:
+	void setUp()
+	{
+	}
+
+protected:
+    void qualifier()
+	{
+        MockPlayerbotAIBase ai;
+        TestQualifiedValueAiObjectContext context(&ai);
+        
+        Value<string > *value = context.GetValue<string >("value", "data");
+        CPPUNIT_ASSERT(value->Get() == "data");
+	}
+
+    void empty()
+    {
+        MockPlayerbotAIBase ai;
+        TestQualifiedValueAiObjectContext context(&ai);
+
+        Value<string > *value = context.GetValue<string >("value");
+        CPPUNIT_ASSERT(value->Get().empty());
+    }
+
+    void number()
+    {
+        MockPlayerbotAIBase ai;
+        TestQualifiedValueAiObjectContext context(&ai);
+
+        Value<string > *value = context.GetValue<string >("value", 5);
+        CPPUNIT_ASSERT(value->Get() == "5");
+    
+        value = context.GetValue<string >("value", "5");
+        CPPUNIT_ASSERT(value->Get() == "5");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( QualifiedValueTestCase );
diff --git a/src/tests/QuestStrategyTestCase.cpp b/src/tests/QuestStrategyTestCase.cpp
new file mode 100644
index 00000000000..321074f8243
--- /dev/null
+++ b/src/tests/QuestStrategyTestCase.cpp
@@ -0,0 +1,73 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "MockAiObjectContext.h"
+#include "MockedAiObjectContextTestCase.h"
+#include "../game/playerbot/strategy/generic/ChatCommandHandlerStrategy.h"
+
+using namespace ai;
+
+
+class QuestStrategyTestCase : public MockedAiObjectContextTestCase
+{
+  CPPUNIT_TEST_SUITE( QuestStrategyTestCase );
+      CPPUNIT_TEST( turn_in_quest );
+      CPPUNIT_TEST( accept_quest );
+      CPPUNIT_TEST( quest_share );
+      CPPUNIT_TEST( useGameObject );
+      CPPUNIT_TEST( incompatibles );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(context = new MockAiObjectContext(ai, new AiObjectContext(ai), &ai->buffer), "quest", NULL);
+    }
+
+protected:
+    void useGameObject()
+    {
+        trigger("use game object");
+        tick();
+
+        assertActions(">S:talk to quest giver");
+    }
+
+    void turn_in_quest()
+    {
+        trigger("complete quest");
+        tick();
+
+        trigger("gossip hello");
+        tick();
+
+        assertActions(">S:talk to quest giver>S:talk to quest giver");
+    }
+
+    void accept_quest()
+    {
+        trigger("accept quest");
+        tick();
+
+        assertActions(">S:accept quest");
+    }
+
+    void quest_share()
+    {
+        trigger("quest share");
+        tick();
+
+        assertActions(">S:accept quest share");
+    }
+
+    void incompatibles()
+    {
+        engine->addStrategies("quest", "accept all quests", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: accept all quests");
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( QuestStrategyTestCase );
diff --git a/src/tests/QueueTestCase.cpp b/src/tests/QueueTestCase.cpp
new file mode 100644
index 00000000000..99192492158
--- /dev/null
+++ b/src/tests/QueueTestCase.cpp
@@ -0,0 +1,40 @@
+#include "pch.h"
+#include "aitest.h"
+#include "playerbot/strategy/actions/GenericSpellActions.h"
+
+using namespace ai;
+
+class QueueTestCase : public CPPUNIT_NS::TestFixture
+{
+	CPPUNIT_TEST_SUITE( QueueTestCase );
+	CPPUNIT_TEST( queueMustHaveOrder );
+	CPPUNIT_TEST_SUITE_END();
+
+protected:
+
+public:
+	void setUp()
+	{
+	}
+
+protected:
+	void queueMustHaveOrder()
+	{
+		MockPlayerbotAIBase mock;
+		CastSpellAction action1(&mock, "1");
+        CastSpellAction action2(&mock, "2");
+        CastSpellAction action3(&mock, "3");
+
+		Queue q;
+		q.Push(new ActionBasket(new ActionNode("action1", NULL, NULL, NULL), 0.5f, false, Event()));
+		q.Push(new ActionBasket(new ActionNode("action2", NULL, NULL, NULL), 0.7f, false, Event()));
+		q.Push(new ActionBasket(new ActionNode("action3", NULL, NULL, NULL), 0.3f, false, Event()));
+
+		CPPUNIT_ASSERT(string (q.Pop()->getName()) == "action2");
+		CPPUNIT_ASSERT(string (q.Pop()->getName()) == "action1");
+		CPPUNIT_ASSERT(string (q.Pop()->getName()) == "action3");
+		CPPUNIT_ASSERT(q.Pop() == NULL);
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( QueueTestCase );
diff --git a/src/tests/RacialsTestCase.cpp b/src/tests/RacialsTestCase.cpp
new file mode 100644
index 00000000000..010e90322fc
--- /dev/null
+++ b/src/tests/RacialsTestCase.cpp
@@ -0,0 +1,41 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "EngineTestBase.h"
+#include "../game/playerbot/strategy/warrior/WarriorAiObjectContext.h"
+
+using namespace ai;
+
+
+class RacialsTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( RacialsTestCase );
+    CPPUNIT_TEST( healing );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+	virtual void setUp()
+	{
+		EngineTestBase::setUp();
+		setupEngine(new WarriorAiObjectContext(ai), "tank", NULL);
+
+		engine->addStrategy("racials");
+        set<float>("distance", "current target", 0.0f);
+		
+		addAura("battle shout");
+		addAura("defensive stance");
+    }
+ 
+protected:
+    void healing()
+    {
+		tickWithLowHealth(39);
+		tickWithLowHealth(39);
+
+        tickWithLowMana(39);
+
+        assertActions(">S:lifeblood>S:gift of the naaru>S:arcane torrent");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( RacialsTestCase );
diff --git a/src/tests/ShamanNonCombatTestCase.cpp b/src/tests/ShamanNonCombatTestCase.cpp
new file mode 100644
index 00000000000..60115558636
--- /dev/null
+++ b/src/tests/ShamanNonCombatTestCase.cpp
@@ -0,0 +1,69 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/shaman/ShamanAiObjectContext.h"
+
+using namespace ai;
+
+
+class ShamanNonCombatTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( ShamanNonCombatTestCase );
+        CPPUNIT_TEST( ressurect );
+        CPPUNIT_TEST( swimming );
+        CPPUNIT_TEST( healing );
+        CPPUNIT_TEST( aoe );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(new ShamanAiObjectContext(ai), "nc", NULL);
+    }
+
+protected:
+	void ressurect()
+	{
+		tickWithDeadPartyMember();
+
+		assertActions(">P:ancestral spirit");
+	}
+
+	void healing()
+	{
+	    tickWithLowHealth(10);
+	    spellAvailable("healing wave");
+	    tickWithPartyLowHealth(10);
+
+		assertActions(">S:healing wave>P:healing wave on party");
+	}
+
+	void aoe()
+	{
+	    tickWithAoeHeal("medium");
+
+		assertActions(">P:chain heal");
+	}
+
+	void swimming()
+	{
+	    tickWhileSwimming();
+	    addAura("water breathing");
+
+	    tickWhileSwimming();
+        addAura("water walking");
+
+        spellAvailable("water breathing");
+        tickWhileSwimming();
+        addPartyAura("water breathing");
+
+        spellAvailable("water walking");
+        tickWhileSwimming();
+        addPartyAura("water walking");
+
+		assertActions(">S:water breathing>S:water walking>P:water breathing on party>P:water walking on party");
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( ShamanNonCombatTestCase );
diff --git a/src/tests/TankPaladinTestCase.cpp b/src/tests/TankPaladinTestCase.cpp
new file mode 100644
index 00000000000..5463d2fdfb1
--- /dev/null
+++ b/src/tests/TankPaladinTestCase.cpp
@@ -0,0 +1,224 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/paladin/PaladinAiObjectContext.h"
+
+using namespace ai;
+
+
+class TankPaladinTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( TankPaladinTestCase );
+		CPPUNIT_TEST( combatVsMelee );
+		CPPUNIT_TEST( paladinMustHoldAggro );
+		CPPUNIT_TEST( healing );
+		CPPUNIT_TEST( buff );
+		CPPUNIT_TEST( bmana );
+		CPPUNIT_TEST( curePoison );
+		CPPUNIT_TEST( cureMagic );
+		CPPUNIT_TEST( cureDisease );
+		CPPUNIT_TEST( interruptSpells );
+		CPPUNIT_TEST( resistances );
+		CPPUNIT_TEST( combatIncompatibles );
+		CPPUNIT_TEST( buffIncompatibles );
+		CPPUNIT_TEST( resistanceIncompatibles );
+		CPPUNIT_TEST( lowMana );
+		CPPUNIT_TEST( interrupt_enemy_healer );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+	virtual void setUp()
+	{
+		EngineTestBase::setUp();
+		setupEngine(new PaladinAiObjectContext(ai), "tank", NULL);
+		engine->addStrategy("barmor");
+
+        addAura("devotion aura");
+        addAura("seal of justice");
+        addAura("blessing of sanctuary");
+        addAura("righteous fury");
+
+		addAura("holy shield");
+
+        set<float>("distance", "current target", ATTACK_DISTANCE - 1);
+    }
+
+protected:
+    void bmana()
+    {
+		engine->removeStrategy("bhealth");
+		engine->addStrategy("bmana");
+
+        removeAura("seal of justice");
+        tick();
+
+		assertActions(">S:seal of wisdom");
+	}
+
+    void buff()
+    {
+        removeAura("devotion aura");
+        removeAura("righteous fury");
+        removeAura("blessing of sanctuary");
+        removeAura("seal of justice");
+        removeAura("holy shield");
+
+        tick();
+        addAura("devotion aura");
+
+        tick();
+        tick();
+        addAura("seal of light");
+
+        tick();
+        tick();
+        addAura("blessing of kings");
+
+        tick();
+        addAura("righteous fury");
+
+        tick();
+        addAura("holy shield");
+
+        assertActions(">S:devotion aura>S:seal of light>S:seal of justice>S:blessing of sanctuary>S:blessing of kings>S:righteous fury>S:holy shield");
+    }
+
+    void healing()
+    {
+		tickWithLowHealth(50);
+
+		tickWithLowHealth(30);
+        tickWithLowHealth(30);
+
+		tickWithLowHealth(19);
+
+		spellAvailable("lay on hands");
+		tickWithPartyLowHealth(20);
+        tickWithLowHealth(19);
+        spellAvailable("flash of light");
+        tickWithLowHealth(19);
+
+        assertActions(">S:flash of light>S:divine protection>S:holy light>S:lay on hands>P:lay on hands on party>S:divine shield>S:flash of light");
+    }
+
+    void paladinMustHoldAggro()
+    {
+		tickWithAttackerCount(2);
+		tickWithAttackerCount(2);
+
+		tickWithAttackerCount(3);
+
+		tickWithNoAggro();
+		tickWithNoAggro();
+
+		assertActions(">T:hammer of the righteous>T:avenger's shield>T:consecration>T:hand of reckoning>T:judgement of justice");
+    }
+
+    void combatVsMelee()
+    {
+		tickOutOfMeleeRange();
+
+        tick();
+
+		tickWithTargetLowHealth(19);
+
+        assertActions(">T:reach melee>T:judgement of light>T:hammer of wrath");
+    }
+
+    void lowMana()
+    {
+        tickWithLowMana(10);
+
+        assertActions(">T:judgement of wisdom");
+    }
+
+	void interruptSpells()
+	{
+		tickWithTargetIsCastingNonMeleeSpell();
+
+		assertActions(">T:hammer of justice");
+	}
+
+    void cureDisease()
+    {
+        cureKind(DISPEL_DISEASE);
+		assertActions(">S:cleanse>P:cleanse disease on party>S:purify>P:purify disease on party");
+    }
+
+	void curePoison()
+	{
+		cureKind(DISPEL_POISON);
+		assertActions(">S:cleanse>P:cleanse poison on party>S:purify>P:purify poison on party");
+	}
+
+	void cureMagic()
+	{
+        cureKind(DISPEL_MAGIC);
+        assertActions(">S:cleanse>P:cleanse magic on party>T:judgement of light>T:melee");
+	}
+
+    void cureKind(DispelType type)
+    {
+        spellAvailable("cleanse");
+        tickWithAuraToDispel(type);
+
+        spellAvailable("cleanse");
+        tickWithPartyAuraToDispel(type);
+
+        spellAvailable("purify");
+        tickWithAuraToDispel(type);
+
+        spellAvailable("purify");
+        tickWithPartyAuraToDispel(type);
+    }
+
+	void resistances()
+	{
+		engine->addStrategy("rshadow");
+		tick();
+
+		engine->addStrategy("rfrost");
+		tick();
+
+		engine->addStrategy("rfire");
+		tick();
+
+		assertActions(">S:shadow resistance aura>S:frost resistance aura>S:fire resistance aura");
+	}
+
+    void combatIncompatibles()
+    {
+        engine->removeStrategy("barmor");
+        engine->removeStrategy("tank");
+        engine->addStrategies("dps", "tank", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: tank");
+    }
+
+    void buffIncompatibles()
+    {
+        engine->removeStrategy("barmor");
+        engine->removeStrategy("tank");
+        engine->addStrategies("bhealth", "bmana", "bdps", "barmor", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: barmor");
+    }
+
+    void resistanceIncompatibles()
+    {
+        engine->removeStrategy("barmor");
+        engine->removeStrategy("tank");
+        engine->addStrategies("rshadow", "rfrost", "rfire", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: rfire");
+    }
+
+    void interrupt_enemy_healer()
+    {
+        tickWithEnemyHealerIsCastingInterruptableSpell("hammer of justice");
+
+        assertActions(">H:hammer of justice on enemy healer");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( TankPaladinTestCase );
diff --git a/src/tests/TankWarlockTestCase.cpp b/src/tests/TankWarlockTestCase.cpp
new file mode 100644
index 00000000000..bc0483fad1c
--- /dev/null
+++ b/src/tests/TankWarlockTestCase.cpp
@@ -0,0 +1,51 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/warlock/WarlockAiObjectContext.h"
+
+using namespace ai;
+
+
+class TankWarlockTestCase : public EngineTestBase
+{
+  CPPUNIT_TEST_SUITE( TankWarlockTestCase );
+      CPPUNIT_TEST( summonPet );
+      CPPUNIT_TEST( cc );
+      CPPUNIT_TEST( incompatibles );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+        EngineTestBase::setUp();
+        setupEngine(new WarlockAiObjectContext(ai), "tank", NULL);
+    }
+
+protected:
+
+    void summonPet()
+    {
+        itemAvailable("soul shard", 2);
+        tickWithNoPet();
+        tickWithNoPet();
+
+		assertActions(">S:summon felguard>S:summon voidwalker");
+    }
+
+    void cc()
+    {
+        tickWithCcTarget("banish");
+        tickWithCcTarget("fear");
+
+        assertActions(">Cc:banish on cc>Cc:fear on cc");
+    }
+
+    void incompatibles()
+    {
+        engine->addStrategies("tank", "dps", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: dps");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( TankWarlockTestCase );
diff --git a/src/tests/TankWarriorTestCase.cpp b/src/tests/TankWarriorTestCase.cpp
new file mode 100644
index 00000000000..845760e9f5c
--- /dev/null
+++ b/src/tests/TankWarriorTestCase.cpp
@@ -0,0 +1,168 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/warrior/WarriorAiObjectContext.h"
+
+using namespace ai;
+
+
+class TankWarriorTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( TankWarriorTestCase );
+    CPPUNIT_TEST( buff );
+    CPPUNIT_TEST( startMeleeCombat );
+    CPPUNIT_TEST( melee );
+    CPPUNIT_TEST( warriorMustHoldAggro );
+    CPPUNIT_TEST( aoe );
+    CPPUNIT_TEST( healing );
+	CPPUNIT_TEST( snare );
+    CPPUNIT_TEST( interruptSpells );
+    CPPUNIT_TEST( incompatibles );
+    CPPUNIT_TEST( interrupt_enemy_healer );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+        EngineTestBase::setUp();
+        setupEngine(new WarriorAiObjectContext(ai), "tank", NULL);
+
+        // this buff is combat-only, so skip for most test cases
+        addAura("battle shout");
+        set<uint8>("rage", "self target", 20);
+        set<float>("distance", "current target", ATTACK_DISTANCE - 1);
+    }
+
+protected:
+    void interruptSpells()
+    {
+		tickWithTargetIsCastingNonMeleeSpell();
+
+        tick(); // rend
+
+        assertActions(">T:shield bash>S:defensive stance");
+    }
+
+    void healing()
+    {
+        tickWithLowHealth(50); // defensive stance
+        tickWithLowHealth(50); // shield wall
+        tickWithLowHealth(50); // shield block
+
+		tickWithLowHealth(4);
+		tickWithLowHealth(4);
+
+		assertActions(">S:defensive stance>T:shield wall>S:shield block>S:last stand>T:intimidating shout");
+    }
+
+    void buff()
+    {
+        set<uint8>("rage", "self target", 0);
+        removeAura("battle shout");
+
+        tickInSpellRange();
+        addAura("battle shout");
+
+        tickInSpellRange();
+
+		assertActions(">S:battle shout>S:bloodrage");
+
+    }
+
+    void aoe()
+    {
+        addAura("defensive stance");
+
+		tickWithAttackerCount(3);
+		tickWithAttackerCount(3);
+
+		spellAvailable("cleave");
+		tickWithAttackerCount(2);
+		tickWithAttackerCount(2);
+		tickWithAttackerCount(2);
+
+        assertActions(">T:shockwave>T:thunder clap>T:demoralizing shout>T:cleave>T:devastate");
+    }
+
+    void warriorMustHoldAggro()
+    {
+        addAura("defensive stance");
+
+		tickWithNoAggro();
+		tickWithNoAggro();
+
+		assertActions(">T:taunt>T:mocking blow");
+    }
+
+    void startMeleeCombat()
+    {
+        tickOutOfMeleeRange();
+        tickWithRage(0);
+        tickInMeleeRange();
+        tick();
+        tick();
+        tick();
+
+        assertActions(">T:reach melee>S:bloodrage>S:defensive stance>T:devastate>T:revenge>T:rend");
+    }
+
+    void melee()
+    {
+        addAura("defensive stance");
+        tickInMeleeRange();
+        tick();
+        tick();
+        tick();
+        tick();
+        spellAvailable("rend");
+        addTargetAura("rend");
+
+        tickWithRage(31);
+
+        set<uint8>("rage", "self target", 41);
+        tick();
+
+        tickWithSpellAvailable("heroic strike");
+
+        addAura("sword and board");
+		tickWithSpellAvailable("devastate");
+        tickWithSpellAvailable("shield slam");
+
+		assertActions(">T:devastate>T:revenge>T:rend>T:disarm>T:sunder armor>T:melee>T:shield slam>T:heroic strike>T:melee>T:shield slam");
+    }
+
+    void revengeIfDodge()
+    {
+        tick(); // melee
+        spellAvailable("revenge");
+        tick(); // defensive stance
+        tick(); // revenge
+
+		assertActions(">T:melee>S:defensive stance>T:revenge");
+    }
+
+	void snare()
+	{
+		tick();
+		tickWithTargetIsMoving();
+
+		assertActions(">S:defensive stance>T:concussion blow");
+	}
+
+
+    void incompatibles()
+    {
+        engine->addStrategies("tank", "dps", NULL);
+
+        CPPUNIT_ASSERT(engine->ListStrategies() == "Strategies: dps");
+    }
+
+    void interrupt_enemy_healer()
+    {
+        tickWithEnemyHealerIsCastingInterruptableSpell("shield bash");
+
+        assertActions(">H:shield bash on enemy healer");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( TankWarriorTestCase );
diff --git a/src/tests/ValueTestCase.cpp b/src/tests/ValueTestCase.cpp
new file mode 100644
index 00000000000..aab4755b647
--- /dev/null
+++ b/src/tests/ValueTestCase.cpp
@@ -0,0 +1,121 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "MockPlayerbotAIBase.h"
+
+using namespace ai;
+
+class TestValue : public CalculatedValue<int>
+{
+public:
+    TestValue(PlayerbotAI* ai) : CalculatedValue<int>(ai, "name", 2), increment(0) {}
+    virtual int Calculate() { return ++increment; }
+
+private:
+    int increment;
+};
+
+class TestManualValue : public ManualSetValue<int>
+{
+public:
+    TestManualValue(PlayerbotAI* ai) : ManualSetValue<int>(ai, 0, "name") {}
+};
+
+class TestValueContext : public NamedObjectContext<UntypedValue>
+{
+public:
+    TestValueContext()
+    {
+        creators["value"] = &TestValueContext::value;
+        creators["manual value"] = &TestValueContext::manual_value;
+    }
+
+private:
+    static UntypedValue* value(PlayerbotAI* ai) { return new TestValue(ai); }
+    static UntypedValue* manual_value(PlayerbotAI* ai) { return new TestManualValue(ai); }
+};
+
+class TestValueAiObjectContext : public AiObjectContext
+{
+public:
+    TestValueAiObjectContext(PlayerbotAI* const ai) : AiObjectContext(ai)
+    {
+        valueContexts.Add(new TestValueContext());
+    }
+};
+
+
+class ValueTestCase : public CPPUNIT_NS::TestFixture
+{
+  CPPUNIT_TEST_SUITE( ValueTestCase );
+      CPPUNIT_TEST( empty );
+      CPPUNIT_TEST( calculate );
+      CPPUNIT_TEST( manual );
+      CPPUNIT_TEST( fromContext );
+  CPPUNIT_TEST_SUITE_END();
+
+protected:
+
+public:
+	void setUp()
+	{
+	}
+
+protected:
+    void empty()
+	{
+        MockPlayerbotAIBase ai;
+        TestValue value(&ai);
+        CPPUNIT_ASSERT(value == 1);
+	}
+    
+    void calculate()
+    {
+        MockPlayerbotAIBase ai;
+        TestValue value(&ai);
+
+        value.Update();
+        CPPUNIT_ASSERT(value == 1);
+        
+        value.Update();
+        CPPUNIT_ASSERT(value == 1);
+    
+        value.Update();
+        CPPUNIT_ASSERT(value == 2);
+    
+        value.Update();
+        CPPUNIT_ASSERT(value == 2);
+    }
+
+    void manual()
+    {
+        MockPlayerbotAIBase ai;
+        TestManualValue value(&ai);
+        CPPUNIT_ASSERT(value == 0);
+
+        value.Set(3);
+        CPPUNIT_ASSERT(value == 3);
+
+        value.Update();
+        CPPUNIT_ASSERT(value == 3);
+    }
+
+    void fromContext()
+    {
+        MockPlayerbotAIBase ai;
+        TestValueAiObjectContext context(&ai);
+        Value<int> *value = context.GetValue<int>("manual value");
+        CPPUNIT_ASSERT(value);
+
+        value->Set(3);
+        CPPUNIT_ASSERT(3 == value->Get());
+
+        value = context.GetValue<int>("value");
+        context.Update();
+        context.Update();
+        CPPUNIT_ASSERT(1 == value->Get());
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( ValueTestCase );
diff --git a/src/tests/WarlockNonCombatTestCase.cpp b/src/tests/WarlockNonCombatTestCase.cpp
new file mode 100644
index 00000000000..8a103db12a3
--- /dev/null
+++ b/src/tests/WarlockNonCombatTestCase.cpp
@@ -0,0 +1,50 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/warlock/WarlockAiObjectContext.h"
+
+using namespace ai;
+
+
+class WarlockNonCombatTestCase : public EngineTestBase
+{
+    CPPUNIT_TEST_SUITE( WarlockNonCombatTestCase );
+    CPPUNIT_TEST( buff );
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+        EngineTestBase::setUp();
+        setupEngine(new WarlockAiObjectContext(ai), "nc", NULL);
+    }
+
+protected:
+    void buff()
+    {
+        tick();
+        tick();
+        tick();
+        addAura("fel armor");
+
+		itemAvailable("soul shard", 2);
+		tick();
+		itemAvailable("healthstone", 1);
+
+		tick();
+		itemAvailable("firestone", 1);
+
+		tick();
+		itemAvailable("spellstone", 1);
+
+        tick();
+        addAura("spellstone");
+
+        tickWithNoPet();
+
+        assertActions(">S:fel armor>S:demon armor>S:demon skin>S:create healthstone>S:create firestone>S:create spellstone>S:spellstone>S:summon imp");
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( WarlockNonCombatTestCase );
diff --git a/src/tests/WarrirorNonCombatTestCase.cpp b/src/tests/WarrirorNonCombatTestCase.cpp
new file mode 100644
index 00000000000..808ff7a1700
--- /dev/null
+++ b/src/tests/WarrirorNonCombatTestCase.cpp
@@ -0,0 +1,40 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "../game/playerbot/strategy/warrior/WarriorAiObjectContext.h"
+
+using namespace ai;
+
+
+class WarriorNonCombatTestCase : public CPPUNIT_NS::TestFixture
+{
+    CPPUNIT_TEST_SUITE( WarriorNonCombatTestCase );
+    //CPPUNIT_TEST( buff );
+    CPPUNIT_TEST_SUITE_END();
+
+protected:
+    MockPlayerbotAIBase *ai;
+
+public:
+    void setUp()
+    {
+    }
+
+protected:
+    void buff()
+    {
+        ai = new MockPlayerbotAIBase();
+
+        Engine engine(ai, new WarriorAiObjectContext(ai));
+        engine.addStrategy("nc");
+        engine.Init();
+
+        engine.DoNextAction(NULL);
+        engine.DoNextAction(NULL);
+
+        std::cout << ai->buffer;
+		CPPUNIT_ASSERT(ai->buffer == ">S:defensive stance");
+    }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( WarriorNonCombatTestCase );
diff --git a/src/tests/WorldPacketHandlerTestCase.cpp b/src/tests/WorldPacketHandlerTestCase.cpp
new file mode 100644
index 00000000000..a704e017dbb
--- /dev/null
+++ b/src/tests/WorldPacketHandlerTestCase.cpp
@@ -0,0 +1,267 @@
+#include "pch.h"
+
+#include "aitest.h"
+#include "MockAiObjectContext.h"
+#include "MockedAiObjectContextTestCase.h"
+#include "../game/playerbot/strategy/generic/ChatCommandHandlerStrategy.h"
+
+using namespace ai;
+
+
+class WorldPacketHandlerTestCase : public MockedAiObjectContextTestCase
+{
+  CPPUNIT_TEST_SUITE( WorldPacketHandlerTestCase );
+      CPPUNIT_TEST( groupInvite );
+      CPPUNIT_TEST( groupSetLeader );
+      CPPUNIT_TEST( notEnoughMoney );
+      CPPUNIT_TEST( notEnoughReputation );
+      CPPUNIT_TEST( gossip_hello );
+      CPPUNIT_TEST( useGameObject );
+      CPPUNIT_TEST( roll );
+      CPPUNIT_TEST( revive );
+      CPPUNIT_TEST( resurrect_request );
+      CPPUNIT_TEST( area_trigger );
+      CPPUNIT_TEST( mount );
+      CPPUNIT_TEST( taxi );
+      CPPUNIT_TEST( cannot_equip );
+      CPPUNIT_TEST( trade_status );
+      CPPUNIT_TEST( loot );
+      CPPUNIT_TEST( item_push_result );
+      CPPUNIT_TEST( quest_objective_completed );
+      CPPUNIT_TEST( party_command );
+      CPPUNIT_TEST( taxi_done );
+      CPPUNIT_TEST( ready_check );
+      CPPUNIT_TEST( uninvite );
+      CPPUNIT_TEST( lfg );
+      CPPUNIT_TEST( lfg_leave );
+      CPPUNIT_TEST( security_check );
+      CPPUNIT_TEST( guild_accept );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp()
+    {
+		EngineTestBase::setUp();
+		setupEngine(context = new MockAiObjectContext(ai, new AiObjectContext(ai), &ai->buffer), "default", NULL);
+    }
+
+protected:
+    void groupInvite()
+    {
+        trigger("group invite");
+        tick();
+
+        assertActions(">S:accept invitation");
+    }
+    void groupSetLeader()
+    {
+        trigger("group set leader");
+        tick();
+
+        assertActions(">S:leader");
+    }
+    void notEnoughMoney()
+    {
+        trigger("not enough money");
+        tick();
+        assertActions(">S:tell not enough money");
+    }
+    void notEnoughReputation()
+    {
+        trigger("not enough reputation");
+        tick();
+        assertActions(">S:tell not enough reputation");
+    }
+
+    void useGameObject()
+    {
+        trigger("use game object");
+        tick();
+        tick();
+
+        assertActions(">S:add loot>S:use meeting stone");
+    }
+
+    void gossip_hello()
+    {
+        trigger("gossip hello");
+        tick();
+
+        assertActions(">S:trainer");
+    }
+
+    void roll()
+    {
+        trigger("loot roll");
+        tick();
+
+        assertActions(">S:loot roll");
+    }
+
+    void revive()
+    {
+        engine->addStrategy("dead");
+
+        trigger("dead");
+        tick();
+
+        assertActions(">S:revive from corpse");
+    }
+
+    void resurrect_request()
+    {
+        engine->addStrategy("dead");
+
+        trigger("resurrect request");
+        tick();
+
+        assertActions(">S:accept resurrect");
+    }
+
+    void area_trigger()
+    {
+        trigger("area trigger");
+        tick();
+        trigger("within area trigger");
+        tick();
+
+        assertActions(">S:reach area trigger>S:area trigger");
+    }
+
+    void mount()
+    {
+        trigger("check mount state");
+        tick();
+
+        assertActions(">S:check mount state");
+    }
+
+    void taxi()
+    {
+        trigger("activate taxi");
+        tick();
+        tick();
+
+        assertActions(">S:remember taxi>S:taxi");
+    }
+    void cannot_equip()
+    {
+        trigger("cannot equip");
+        tick();
+        assertActions(">S:tell cannot equip");
+    }
+
+    void trade_status()
+    {
+        trigger("trade status");
+        tick();
+        assertActions(">S:accept trade");
+    }
+
+    void loot()
+    {
+        trigger("loot response");
+        tick();
+        assertActions(">S:store loot");
+    }
+
+    void quest_objective_completed()
+    {
+        trigger("quest objective completed");
+        tick();
+
+        assertActions(">S:quest objective completed");
+    }
+
+    void item_push_result()
+    {
+        trigger("item push result");
+        tick();
+
+        assertActions(">S:query item usage");
+    }
+
+    void party_command()
+    {
+        trigger("party command");
+        tick();
+
+        assertActions(">S:party command");
+    }
+
+    void taxi_done()
+    {
+        trigger("taxi done");
+        tick();
+
+        assertActions(">S:taxi");
+    }
+
+    void ready_check()
+    {
+        trigger("ready check");
+        tick();
+
+        assertActions(">S:ready check");
+    }
+
+    void ready_check_finished()
+    {
+        trigger("ready check finished");
+        tick();
+
+        assertActions(">S:finish ready check");
+    }
+
+    void uninvite()
+    {
+        trigger("uninvite");
+        tick();
+
+        assertActions(">S:uninvite");
+    }
+
+    void lfg()
+    {
+        trigger("no possible targets");
+        tick();
+
+        trigger("lfg role check");
+        tick();
+
+        trigger("lfg proposal");
+        tick();
+
+        trigger("lfg proposal active");
+        tick();
+
+        assertActions(">S:lfg join>S:lfg role check>S:lfg accept>S:lfg accept");
+    }
+
+    void lfg_leave()
+    {
+        trigger("seldom");
+        tick();
+
+        assertActions(">S:lfg leave");
+    }
+
+    void security_check()
+    {
+        trigger("often");
+        tick();
+
+        assertActions(">S:security check");
+    }
+
+    void guild_accept()
+    {
+        trigger("guild invite");
+        tick();
+
+        assertActions(">S:guild accept");
+    }
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( WorldPacketHandlerTestCase );
diff --git a/src/tests/aitest.h b/src/tests/aitest.h
new file mode 100644
index 00000000000..e2d238b4e48
--- /dev/null
+++ b/src/tests/aitest.h
@@ -0,0 +1,14 @@
+#pragma once;
+
+#include "../game/playerbot/PlayerbotAIAware.h"
+#include "../game/playerbot/PlayerbotMgr.h"
+#include "../game/playerbot/ChatHelper.h"
+#include "../game/playerbot/PlayerbotAI.h"
+
+#include "../game/playerbot/strategy/Action.h"
+#include "../game/playerbot/strategy/ActionBasket.h"
+#include "../game/playerbot/strategy/Queue.h"
+#include "../game/playerbot/strategy/Trigger.h"
+#include "../game/playerbot/strategy/Engine.h"
+
+#include "EngineTestBase.h"
diff --git a/src/tests/efficiency/AbstractEfficiencyTestCase.h b/src/tests/efficiency/AbstractEfficiencyTestCase.h
new file mode 100644
index 00000000000..b1554d3e9a8
--- /dev/null
+++ b/src/tests/efficiency/AbstractEfficiencyTestCase.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "../EngineTestBase.h"
+#include "EfficiencyActionExecutionListener.h"
+
+using namespace std;
+
+namespace ai
+{
+    class AbstractEfficiencyTestCase : public EngineTestBase
+    {
+    public:
+        void setUp()
+        {
+            EngineTestBase::setUp();
+        }
+
+    protected:
+        void refresh(map<string, SpellInfo> spellInfo)
+        {
+            for (map<string, SpellInfo>::iterator i = spellInfo.begin(); i != spellInfo.end(); ++i)
+            {
+                spellAvailable(i->first);
+            }
+        }
+
+        void run(map<string, SpellInfo> spellInfo, double mana)
+        {
+            EfficiencyActionExecutionListener* listener = new EfficiencyActionExecutionListener(ai, spellInfo, mana);
+            engine->AddActionExecutionListener(listener);
+            while (listener->CanContinue())
+            {
+                tick();
+                refresh(spellInfo);
+            }
+            listener->Report();
+        }
+    };
+
+}
diff --git a/src/tests/efficiency/DruidEfficiencyTestCase.cpp b/src/tests/efficiency/DruidEfficiencyTestCase.cpp
new file mode 100644
index 00000000000..e38cb956ef2
--- /dev/null
+++ b/src/tests/efficiency/DruidEfficiencyTestCase.cpp
@@ -0,0 +1,39 @@
+#include "pch.h"
+
+#include "../aitest.h"
+#include "../../game/playerbot/strategy/Druid/DruidAiObjectContext.h"
+#include "EfficiencyActionExecutionListener.h"
+#include "AbstractEfficiencyTestCase.h"
+
+using namespace ai;
+
+
+class DruidEfficiencyTestCase : public AbstractEfficiencyTestCase
+{
+
+CPPUNIT_TEST_SUITE( DruidEfficiencyTestCase );
+  CPPUNIT_TEST( lvl19_caster );
+  CPPUNIT_TEST_SUITE_END();
+
+protected:
+    map<string, SpellInfo> lvl19()
+    {
+        map<string, SpellInfo> spellInfo;
+        spellInfo["entangling roots"] = SpellInfo(23, 1.5, 15, 50);
+        spellInfo["faerie fire"] = SpellInfo(26, 0, 0, 0);
+        spellInfo["hibernate"] = SpellInfo(23, 1.5, 0, 0);
+        spellInfo["moonfire"] = SpellInfo(69, 0, 12, 28 + 52);
+        spellInfo["wrath"] = SpellInfo(36, 2, 0, 53);
+        return spellInfo;
+    }
+
+ 	void lvl19_caster()
+	{
+        setupEngine(new DruidAiObjectContext(ai), "caster", "aoe", NULL);
+        addTargetAura("faerie fire");
+        run(lvl19(), 600);
+	}
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( DruidEfficiencyTestCase );
diff --git a/src/tests/efficiency/EfficiencyActionExecutionListener.cpp b/src/tests/efficiency/EfficiencyActionExecutionListener.cpp
new file mode 100644
index 00000000000..9b3c3f27dbd
--- /dev/null
+++ b/src/tests/efficiency/EfficiencyActionExecutionListener.cpp
@@ -0,0 +1,88 @@
+#include "pch.h"
+#include "../aitest.h"
+#include "../EngineTestBase.h"
+#include "../MockedTargets.h"
+#include "../AiObjectContextWrapper.h"
+#include "EfficiencyActionExecutionListener.h"
+
+
+EfficiencyActionExecutionListener::EfficiencyActionExecutionListener(MockPlayerbotAIBase *ai, map<string, SpellInfo> spellInfo, double mana) :
+    ai(ai), spellInfo(spellInfo), mana(mana), castTime(0), damage(0), fullMana(mana), log("")
+{
+}
+
+bool EfficiencyActionExecutionListener::Before(Action* action, Event event)
+{
+    return true;
+}
+
+bool EfficiencyActionExecutionListener::AllowExecution(Action* action, Event event)
+{
+    return false;
+}
+
+bool EfficiencyActionExecutionListener::OverrideResult(Action* action, bool executed, Event event)
+{
+    if (!executed)
+        return false;
+
+    string name = action->getName();
+    if (!spellInfo.count(name))
+        return false;
+
+    SpellInfo spell = spellInfo[name];
+
+    string sharedCooldown = spell.sharedCooldown.empty() ? name : spell.sharedCooldown;
+    if (cooldown.count(sharedCooldown) && cooldown[sharedCooldown] > 0)
+        return false;
+
+    if (mana < spell.mana)
+        return false;
+
+    return true;
+}
+
+void EfficiencyActionExecutionListener::After(Action* action, bool executed, Event event)
+{
+    string name = action->getName();
+    if (!spellInfo.count(name))
+        return;
+
+    SpellInfo spell = spellInfo[name];
+
+    double elapsed = max(executed ? 1.5 : 0.1, spell.castTime);
+    for (map<string, double>::iterator i = cooldown.begin(); i != cooldown.end(); ++i)
+    {
+        int value = i->second - elapsed;
+        string sharedCooldown = spell.sharedCooldown.empty() ? i->first : spell.sharedCooldown;
+        cooldown[sharedCooldown] = value > 0 ? value : 0;
+    }
+
+    castTime += elapsed;
+
+    if (!executed)
+        return;
+
+    mana -= spell.mana;
+    string sharedCooldown = spell.sharedCooldown.empty() ? name : spell.sharedCooldown;
+    cooldown[sharedCooldown] = spell.cooldown;
+    damage += spell.damage;
+    if (!log.empty())
+        log += ",";
+    log += name;
+}
+
+void EfficiencyActionExecutionListener::Report()
+{
+    cout << endl << log << endl <<
+            "Time: " << castTime << endl <<
+            "Damage: " << damage << endl <<
+            "Mana: " << mana << endl;
+    if (damage > 0 && castTime > 0)
+        cout << "DPS: " << damage / castTime << endl;
+}
+
+bool EfficiencyActionExecutionListener::CanContinue()
+{
+    return castTime < 60 && mana > fullMana / 10;
+}
diff --git a/src/tests/efficiency/EfficiencyActionExecutionListener.h b/src/tests/efficiency/EfficiencyActionExecutionListener.h
new file mode 100644
index 00000000000..30a7b206fe4
--- /dev/null
+++ b/src/tests/efficiency/EfficiencyActionExecutionListener.h
@@ -0,0 +1,52 @@
+#pragma once;
+
+#include "../game/playerbot/strategy/Action.h"
+#include "../game/playerbot/strategy/ActionBasket.h"
+#include "../game/playerbot/strategy/Queue.h"
+#include "../game/playerbot/strategy/Trigger.h"
+#include "../game/playerbot/strategy/Engine.h"
+
+#include "../MockPlayerbotAIBase.h"
+
+using namespace ai;
+
+class SpellInfo
+{
+public:
+    SpellInfo() : mana(0), castTime(0), cooldown(0), damage(0) {}
+    SpellInfo(double mana, double castTime, double cooldown, double damage, string sharedCooldown = "") :
+        mana(mana), castTime(castTime), cooldown(cooldown), damage(damage), sharedCooldown(sharedCooldown) {}
+    SpellInfo(SpellInfo const& other)
+    {
+        mana = other.mana;
+        castTime = other.castTime;
+        cooldown = other.cooldown;
+        damage = other.damage;
+        sharedCooldown = other.sharedCooldown;
+    }
+    virtual ~SpellInfo() {}
+
+    double mana, castTime, cooldown, damage;
+    string sharedCooldown;
+};
+
+class EfficiencyActionExecutionListener : public ActionExecutionListener
+{
+public:
+    EfficiencyActionExecutionListener(MockPlayerbotAIBase *ai, map<string, SpellInfo> spellInfo, double mana);
+
+    virtual bool Before(Action* action, Event event);
+    virtual bool AllowExecution(Action* action, Event event);
+    virtual bool OverrideResult(Action* action, bool executed, Event event);
+    virtual void After(Action* action, bool executed, Event event);
+    void Report();
+    bool CanContinue();
+
+private:
+    map<string, SpellInfo> spellInfo;
+    map<string, double> cooldown;
+    double mana, castTime, damage, fullMana;
+    MockPlayerbotAIBase *ai;
+    string log;
+};
+
diff --git a/src/tests/efficiency/MageEfficiencyTestCase.cpp b/src/tests/efficiency/MageEfficiencyTestCase.cpp
new file mode 100644
index 00000000000..68bedb98626
--- /dev/null
+++ b/src/tests/efficiency/MageEfficiencyTestCase.cpp
@@ -0,0 +1,55 @@
+#include "pch.h"
+
+#include "../aitest.h"
+#include "../../game/playerbot/strategy/mage/MageAiObjectContext.h"
+#include "EfficiencyActionExecutionListener.h"
+#include "AbstractEfficiencyTestCase.h"
+
+using namespace ai;
+
+
+class MageEfficiencyTestCase : public AbstractEfficiencyTestCase
+{
+  CPPUNIT_TEST_SUITE( MageEfficiencyTestCase );
+  CPPUNIT_TEST( lvl19_frost );
+  CPPUNIT_TEST( lvl19_fire );
+  CPPUNIT_TEST( lvl19_arcane );
+  CPPUNIT_TEST_SUITE_END();
+
+protected:
+    map<string, SpellInfo> lvl19()
+    {
+        map<string, SpellInfo> spellInfo;
+        spellInfo["frostbolt"] = SpellInfo(27, 2, 0, 54);
+        spellInfo["frost nova"] = SpellInfo(24, 0, 25, 20);
+        spellInfo["arcane explosion"] = SpellInfo(67, 0, 0, 33);
+        spellInfo["arcane missiles"] = SpellInfo(106, 4, 0, 36 * 4);
+        spellInfo["polymorph"] = SpellInfo(24, 1.5, 0, 0);
+        spellInfo["remove curse"] = SpellInfo(27, 0, 0, 0);
+        spellInfo["fire blast"] = SpellInfo(72, 0, 8, 64);
+        spellInfo["fireball"] = SpellInfo(54, 3, 0, 100);
+        spellInfo["flamestrike"] = SpellInfo(120, 2, 0, 60);
+        return spellInfo;
+    }
+
+ 	void lvl19_frost()
+	{
+        setupEngine(new MageAiObjectContext(ai), "frost", NULL);
+        run(lvl19(), 888);
+	}
+
+ 	void lvl19_fire()
+	{
+        setupEngine(new MageAiObjectContext(ai), "fire", NULL);
+        run(lvl19(), 888);
+	}
+
+ 	void lvl19_arcane()
+	{
+        setupEngine(new MageAiObjectContext(ai), "arcane", NULL);
+        run(lvl19(), 888);
+	}
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( MageEfficiencyTestCase );
diff --git a/src/tests/efficiency/PriestEfficiencyTestCase.cpp b/src/tests/efficiency/PriestEfficiencyTestCase.cpp
new file mode 100644
index 00000000000..05b8036559f
--- /dev/null
+++ b/src/tests/efficiency/PriestEfficiencyTestCase.cpp
@@ -0,0 +1,43 @@
+#include "pch.h"
+
+#include "../aitest.h"
+#include "../../game/playerbot/strategy/Priest/PriestAiObjectContext.h"
+#include "EfficiencyActionExecutionListener.h"
+#include "AbstractEfficiencyTestCase.h"
+
+using namespace ai;
+
+
+class PriestEfficiencyTestCase : public AbstractEfficiencyTestCase
+{
+
+CPPUNIT_TEST_SUITE( PriestEfficiencyTestCase );
+  CPPUNIT_TEST( lvl19_shadow );
+  CPPUNIT_TEST( lvl19_holy );
+  CPPUNIT_TEST_SUITE_END();
+
+protected:
+    map<string, SpellInfo> lvl19()
+    {
+        map<string, SpellInfo> spellInfo;
+        spellInfo["mind blast"] = SpellInfo(62, 1.5, 8, 74);
+        spellInfo["shadow word: pain"] = SpellInfo(80, 0, 18, 120);
+        spellInfo["smite"] = SpellInfo(54, 2.5, 0, 58);
+        spellInfo["shoot"] = SpellInfo(0, 0, 1, 15);
+        return spellInfo;
+    }
+
+ 	void lvl19_shadow()
+	{
+        setupEngine(new PriestAiObjectContext(ai), "shadow", "aoe", NULL);
+        run(lvl19(), 777);
+	}
+
+ 	void lvl19_holy()
+	{
+        setupEngine(new PriestAiObjectContext(ai), "holy", "aoe", NULL);
+        run(lvl19(), 777);
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( PriestEfficiencyTestCase );
diff --git a/src/tests/efficiency/ShamanEfficiencyTestCase.cpp b/src/tests/efficiency/ShamanEfficiencyTestCase.cpp
new file mode 100644
index 00000000000..145008b1fe9
--- /dev/null
+++ b/src/tests/efficiency/ShamanEfficiencyTestCase.cpp
@@ -0,0 +1,46 @@
+#include "pch.h"
+
+#include "../aitest.h"
+#include "../../game/playerbot/strategy/shaman/ShamanAiObjectContext.h"
+#include "EfficiencyActionExecutionListener.h"
+#include "AbstractEfficiencyTestCase.h"
+
+using namespace ai;
+
+
+class ShamanEfficiencyTestCase : public AbstractEfficiencyTestCase
+{
+  CPPUNIT_TEST_SUITE( ShamanEfficiencyTestCase );
+  CPPUNIT_TEST( lvl19_melee );
+  CPPUNIT_TEST( lvl19_caster );
+  CPPUNIT_TEST_SUITE_END();
+
+protected:
+    map<string, SpellInfo> lvl19()
+    {
+        map<string, SpellInfo> spellInfo;
+        spellInfo["earth shock"] = SpellInfo(62, 0, 6, 62, "shock");
+        spellInfo["flame shock"] = SpellInfo(58, 0, 18, 45 + 72, "shock");
+        spellInfo["lightning bolt"] = SpellInfo(34, 2.5, 0, 49);
+        spellInfo["lightning shield"] = SpellInfo(0, 0, 0, 0);
+        spellInfo["searing totem"] = SpellInfo(24, 0, 30, 10 * 30 / 1.5);
+        spellInfo["fire nova"] = SpellInfo(75, 0, 6, 52);
+        spellInfo["melee"] = SpellInfo(0, 0, 1, 15 + 6);
+        return spellInfo;
+    }
+
+ 	void lvl19_melee()
+	{
+        setupEngine(new ShamanAiObjectContext(ai), "melee", "melee aoe", NULL);
+        run(lvl19(), 600);
+	}
+
+ 	void lvl19_caster()
+	{
+        setupEngine(new ShamanAiObjectContext(ai), "caster", "caster aoe", NULL);
+        run(lvl19(), 600);
+	}
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( ShamanEfficiencyTestCase );
diff --git a/src/tests/efficiency/WarlockEfficiencyTestCase.cpp b/src/tests/efficiency/WarlockEfficiencyTestCase.cpp
new file mode 100644
index 00000000000..a9ad9e7c379
--- /dev/null
+++ b/src/tests/efficiency/WarlockEfficiencyTestCase.cpp
@@ -0,0 +1,43 @@
+#include "pch.h"
+
+#include "../aitest.h"
+#include "../../game/playerbot/strategy/Warlock/WarlockAiObjectContext.h"
+#include "EfficiencyActionExecutionListener.h"
+#include "AbstractEfficiencyTestCase.h"
+
+using namespace ai;
+
+
+class WarlockEfficiencyTestCase : public AbstractEfficiencyTestCase
+{
+  CPPUNIT_TEST_SUITE( WarlockEfficiencyTestCase );
+  CPPUNIT_TEST( lvl19_dps );
+  CPPUNIT_TEST( lvl19_tank );
+  CPPUNIT_TEST_SUITE_END();
+
+protected:
+    map<string, SpellInfo> lvl19()
+    {
+        map<string, SpellInfo> spellInfo;
+        spellInfo["corruption"] = SpellInfo(42, 0, 15, 90);
+        spellInfo["immolate"] = SpellInfo(60, 0, 15, 19 + 40);
+        spellInfo["shadow bolt"] = SpellInfo(58, 2.8, 0, 52);
+        spellInfo["curse of agony"] = SpellInfo(35, 0, 24, 180);
+        spellInfo["shoot"] = SpellInfo(0, 0, 1, 15);
+        return spellInfo;
+    }
+
+ 	void lvl19_dps()
+	{
+        setupEngine(new WarlockAiObjectContext(ai), "dps", "aoe", NULL);
+        run(lvl19(), 888);
+	}
+
+ 	void lvl19_tank()
+	{
+        setupEngine(new WarlockAiObjectContext(ai), "tank", "aoe", NULL);
+        run(lvl19(), 888);
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION( WarlockEfficiencyTestCase );
diff --git a/src/tests/main.cpp b/src/tests/main.cpp
new file mode 100644
index 00000000000..894463b480b
--- /dev/null
+++ b/src/tests/main.cpp
@@ -0,0 +1,119 @@
+#include "pch.h"
+#include "../game/playerbot/PlayerbotAIConfig.h"
+
+DatabaseType WorldDatabase;                                 ///< Accessor to the world database
+DatabaseType CharacterDatabase;                             ///< Accessor to the character database
+DatabaseType LoginDatabase;                                 ///< Accessor to the realm/login database
+uint32 realmID;                                             ///< Id of the realm
+
+bool ChatHandler::HandleAccountDeleteCommand(char* args)
+{
+    return true;
+}
+
+bool ChatHandler::HandleServerExitCommand(char* /*args*/)
+{
+    return true;
+}
+
+bool ChatHandler::HandleAccountOnlineListCommand(char* /*args*/)
+{
+    return true;
+}
+
+bool ChatHandler::HandleAccountCreateCommand(char* args)
+{
+    return true;
+}
+
+bool __thiscall ChatHandler::HandleQuitCommand(char *)
+{
+    return true;
+}
+
+bool __thiscall ChatHandler::HandleServerLogLevelCommand(char *)
+{
+    return true;
+}
+
+bool __thiscall ChatHandler::HandleServerLogFilterCommand(char *)
+{
+    return true;
+}
+
+bool __thiscall ChatHandler::HandleCharacterEraseCommand(char *)
+{
+    return true;
+}
+
+bool __thiscall ChatHandler::HandleCharacterDeletedOldCommand(char *)
+{
+    return true;
+}
+
+bool __thiscall ChatHandler::HandleCharacterDeletedRestoreCommand(char *)
+{
+    return true;
+}
+
+bool __thiscall ChatHandler::HandleCharacterDeletedListCommand(char *)
+{
+    return true;
+}
+
+bool __thiscall ChatHandler::HandleCharacterDeletedDeleteCommand(char *)
+{
+    return true;
+}
+
+
+void CliRunnable::run()
+{
+}
+
+
+int main()
+{
+  sPlayerbotAIConfig.Initialize();
+  sPlayerbotAIConfig.enabled = true;
+  sPlayerbotAIConfig.globalCoolDown = 1000;
+  sPlayerbotAIConfig.reactDelay = 100;
+  sPlayerbotAIConfig.sightDistance = 40.0f;
+  sPlayerbotAIConfig.spellDistance = 25.0f;
+  sPlayerbotAIConfig.reactDistance = 100.0f;
+  sPlayerbotAIConfig.grindDistance = 50.0f;
+  sPlayerbotAIConfig.meleeDistance = ATTACK_DISTANCE;
+  sPlayerbotAIConfig.followDistance = ATTACK_DISTANCE;
+  sPlayerbotAIConfig.tooCloseDistance = ATTACK_DISTANCE;
+  sPlayerbotAIConfig.lootDistance = 20.0f;
+  sPlayerbotAIConfig.criticalHealth = 25;
+  sPlayerbotAIConfig.lowHealth = 40;
+  sPlayerbotAIConfig.mediumHealth = 60;
+  sPlayerbotAIConfig.almostFullHealth = 80;
+  sPlayerbotAIConfig.lowMana = 40;
+  sPlayerbotAIConfig.mediumMana = 60;
+  sPlayerbotAIConfig.iterationsPerTick = 10;
+  sPlayerbotAIConfig.randomChangeMultiplier = 1;
+
+  // Create the event manager and test controller
+  CPPUNIT_NS::TestResult controller;
+
+  // Add a listener that colllects test result
+  CPPUNIT_NS::TestResultCollector result;
+  controller.addListener( &result );
+
+  // Add a listener that print dots as test run.
+  CPPUNIT_NS::BriefTestProgressListener progress;
+  controller.addListener( &progress );
+
+  // Add the top suite to the test runner
+  CPPUNIT_NS::TestRunner runner;
+  runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() );
+  runner.run( controller );
+
+  // Print test in a compiler compatible format.
+  CPPUNIT_NS::CompilerOutputter outputter( &result, CPPUNIT_NS::stdCOut() );
+  outputter.write();
+
+  return result.wasSuccessful() ? 0 : 1;
+}
diff --git a/src/tests/pch.cpp b/src/tests/pch.cpp
new file mode 100644
index 00000000000..1d9f38c57d6
--- /dev/null
+++ b/src/tests/pch.cpp
@@ -0,0 +1 @@
+#include "pch.h"
diff --git a/src/tests/pch.h b/src/tests/pch.h
new file mode 100644
index 00000000000..5fd206dab4e
--- /dev/null
+++ b/src/tests/pch.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "Language.h"
+#include "Log.h"
+#include "World.h"
+#include "ObjectMgr.h"
+#include "WorldSession.h"
+#include "Config/Config.h"
+#include "Util.h"
+#include "AccountMgr.h"
+#include "CliRunnable.h"
+#include "MapManager.h"
+#include "Player.h"
+#include "Chat.h"
+#include "Database/DatabaseEnv.h"
+#include "Config/Config.h"
+#include "Log.h"
+#include "Master.h"
+#include "SystemConfig.h"
+#include "revision.h"
+#include "revision_nr.h"
+#include <openssl/opensslv.h>
+#include <openssl/crypto.h>
+#include <ace/Version.h>
+
+#include <cppunit/BriefTestProgressListener.h>
+#include <cppunit/CompilerOutputter.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/TestResult.h>
+#include <cppunit/TestResultCollector.h>
+#include <cppunit/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestPath.h>
+#include <stdexcept>
+
+#include <stdio.h>
+#include <iostream>
+
+#include <list>
+#include "Platform/Define.h"
+
+#include <stdexcept>
+
+#include "../game/playerbot/playerbotDefs.h"
diff --git a/win/ACE_vc10.vcxproj b/win/ACE_vc10.vcxproj
new file mode 100644
index 00000000000..8929d5aec19
--- /dev/null
+++ b/win/ACE_vc10.vcxproj
@@ -0,0 +1,1590 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug_NoPCH|Win32">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|Win32">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|x64">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|x64">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ACE_Wrappers</ProjectName>
+    <ProjectGUID>{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}</ProjectGUID>
+    <RootNamespace>ACE</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\ace__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACEd</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\ace__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">ACEd</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\ace__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\ace__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">ACE</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\dep\lib\$(Platform)_debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\ace__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">ACEd</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\dep\lib\$(Platform)_debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\ace__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">ACEd</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
+      <HeaderFileName>%(FileName).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)\ACEd.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)ACEd.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
+    <Midl>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
+      <HeaderFileName>%(FileName).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)\ACEd.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)ACEd.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
+      <HeaderFileName>%(FileName).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <AdditionalIncludeDirectories>..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)\ACE.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(OutDir)ACE.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
+    <Midl>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
+      <HeaderFileName>%(FileName).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <AdditionalIncludeDirectories>..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)\ACE.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(OutDir)ACE.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
+    <Midl>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
+      <HeaderFileName>%(FileName).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)\ACEd.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)ACEd.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
+    <Midl>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
+      <HeaderFileName>%(FileName).h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)\ACEd.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(OutDir)ACEd.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\dep\ACE_wrappers\README">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|X64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\dep\ACE_wrappers\VERSION">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|X64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\dep\ACE_wrappers\ace\ace.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\dep\ACE_wrappers\ace\ACE.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\ace_wchar.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Activation_Queue.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Active_Map_Manager.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Active_Map_Manager_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Addr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\ARGV.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Argv_Type_Converter.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Array_Base.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Array_Map.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Asynch_IO_Impl.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\ATM_Acceptor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\ATM_Addr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\ATM_Connector.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\ATM_Params.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\ATM_QoS.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\ATM_Stream.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Atomic_Op.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Atomic_Op_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Auto_Event.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Auto_Functor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Auto_IncDec_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Auto_Ptr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Barrier.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Base_Thread_Adapter.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Based_Pointer_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Basic_Stats.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Basic_Types.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Bound_Ptr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Caching_Strategies_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Capabilities.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\CDR_Base.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\CDR_Size.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\CDR_Stream.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Cleanup.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Codeset_Registry.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Condition_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Configuration.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Containers.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Containers_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Countdown_Time.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Date_Time.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\DEV.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\DEV_Addr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\DEV_Connector.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\DEV_IO.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Dirent.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Dirent_Selector.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Dynamic.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Dynamic_Service.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Env_Value_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Event.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Event_Handler.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Event_Handler_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\FIFO.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\FIFO_Recv.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\FIFO_Send.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\FIFO_Send_Msg.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\FILE.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\FILE_Addr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\FILE_Connector.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\FILE_IO.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\File_Lock.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Flag_Manip.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Framework_Component.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Functor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Functor_String.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Functor_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Get_Opt.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Guard_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Handle_Gobbler.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Handle_Set.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Hashable.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\High_Res_Timer.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\INET_Addr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Intrusive_List.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Intrusive_List_Node.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\IO_Cntl_Msg.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\IO_SAP.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\IOStream_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\IPC_SAP.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Local_Tokens.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Lock.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Lock_Adapter_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Log_Msg.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Log_Record.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\LSOCK.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\LSOCK_CODgram.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\LSOCK_Connector.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\LSOCK_Dgram.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\LSOCK_Stream.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Malloc.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Malloc_Allocator.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Malloc_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Managed_Object.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Manual_Event.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Map_Manager.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Map_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\MEM_Acceptor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\MEM_Addr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\MEM_Connector.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\MEM_IO.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Mem_Map.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\MEM_SAP.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\MEM_Stream.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Message_Block.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Message_Block_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Message_Queue.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Message_Queue_NT.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Message_Queue_Vx.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Metrics_Cache_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Module.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Monitor_Base.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Mutex.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Naming_Context.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Netlink_Addr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Notification_Queue.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Notification_Strategy.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\NT_Service.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Obchunk.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Object_Manager.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Obstack_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_Errno.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_ctype.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_dirent.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_dlfcn.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_errno.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_fcntl.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_math.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_netdb.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_poll.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_pwd.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_regex.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_signal.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_stdio.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_stdlib.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_string.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_strings.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_stropts.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_mman.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_msg.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_resource.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_select.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_shm.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_socket.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_stat.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_time.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_uio.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_wait.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_Thread.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_time.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_unistd.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_wchar.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_wctype.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\OS_TLI.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Pair_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\PI_Malloc.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Ping_Socket.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Pipe.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\POSIX_Proactor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Proactor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Process.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Process_Manager.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Process_Mutex.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Process_Semaphore.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Profile_Timer.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\RB_Tree.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Reactor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Read_Buffer.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Recyclable.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Refcountable_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Remote_Tokens.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Reverse_Lock_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\RW_Mutex.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\RW_Process_Mutex.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\RW_Thread_Mutex.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Sample_History.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Sched_Params.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Select_Reactor_Base.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Select_Reactor_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Semaphore.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Service_Config.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Service_Gestalt.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Service_Object.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Service_Repository.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Service_Types.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Shared_Memory_MM.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Shared_Memory_SV.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Shared_Object.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Sig_Handler.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Signal.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Singleton.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Acceptor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_CODgram.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Connector.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Dgram.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_IO.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Netlink.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Stream.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SPIPE.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SPIPE_Addr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SPIPE_Connector.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SPIPE_Stream.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SString.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Stats.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Strategies_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Stream.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\String_Base.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SV_Message.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SV_Message_Queue.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\SV_Shared_Memory.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Task.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Task_Ex_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Task_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Thread.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Thread_Adapter.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Thread_Control.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Thread_Manager.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Thread_Mutex.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Thread_Semaphore.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Time_Value.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Timeprobe.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Timer_Queue_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\TLI.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\TLI_Connector.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\TLI_Stream.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Token.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Token_Collection.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Token_Manager.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Token_Request_Reply.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\TP_Reactor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\TSS_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Typed_SV_Message.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Unbounded_Queue.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Unbounded_Set.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\UNIX_Addr.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\UPIPE_Acceptor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\UPIPE_Connector.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\UPIPE_Stream.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\UUID.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\Vector_T.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\WFMO_Reactor.inl" />
+    <None Include="..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.inl" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ACE.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ACE_crc32.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ACE_crc_ccitt.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ace_wchar.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Activation_Queue.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Active_Map_Manager.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Addr.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Argv_Type_Converter.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Assert.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Asynch_IO.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Asynch_IO_Impl.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_Acceptor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_Addr.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_Connector.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_Params.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_QoS.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_Stream.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Atomic_Op.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.c" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Auto_Event.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Barrier.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Base_Thread_Adapter.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Based_Pointer_Repository.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Basic_Stats.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Basic_Types.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Capabilities.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\CDR_Base.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\CDR_Size.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\CDR_Stream.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Cleanup.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Codecs.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Codeset_IBM1047.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Codeset_Registry.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Codeset_Registry_db.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Configuration.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Configuration_Import_Export.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Containers.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Copy_Disabled.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Countdown_Time.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Date_Time.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DEV.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DEV_Addr.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DEV_Connector.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DEV_IO.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dirent.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dirent_Selector.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DLL.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DLL_Manager.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dump.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dynamic.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dynamic_Service_Base.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Encoding_Converter.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Event.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Event_Handler.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FIFO.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FIFO_Recv.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FIFO_Send.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FIFO_Send_Msg.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FILE.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FILE_Addr.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FILE_Connector.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FILE_IO.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\File_Lock.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Filecache.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Flag_Manip.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Framework_Component.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Functor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Functor_String.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Get_Opt.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\gethrtime.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Handle_Ops.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Handle_Set.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Hashable.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\High_Res_Timer.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ICMP_Socket.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\INET_Addr.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Init_ACE.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\IO_Cntl_Msg.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\IO_SAP.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\IOStream.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\IPC_SAP.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Lib_Find.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Local_Memory_Pool.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Local_Name_Space.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Local_Tokens.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Lock.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg_Backend.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg_Callback.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg_IPC.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Record.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Logging_Strategy.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK_Acceptor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK_CODgram.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK_Connector.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK_Dgram.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK_Stream.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Malloc.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Malloc_Allocator.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Manual_Event.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_Acceptor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_Addr.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_Connector.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_IO.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Mem_Map.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_SAP.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_Stream.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Message_Block.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Message_Queue.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Message_Queue_NT.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Message_Queue_Vx.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Method_Request.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Admin.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Base.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Control_Action.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Control_Types.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Point_Registry.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Size.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Mutex.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Name_Proxy.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Name_Request_Reply.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Name_Space.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Naming_Context.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Netlink_Addr.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Notification_Queue.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Notification_Strategy.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\NT_Service.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Obchunk.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Object_Manager.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Object_Manager_Base.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_Errno.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_main.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_ctype.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_dirent.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_dlfcn.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_errno.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_fcntl.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_math.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_netdb.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_poll.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_pwd.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_regex.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_signal.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_stdio.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_stdlib.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_string.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_strings.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_stropts.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_mman.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_msg.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_resource.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_select.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_shm.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_socket.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_stat.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_time.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_uio.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_wait.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_Thread.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_time.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_unistd.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_wchar.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_wctype.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_QoS.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_Thread_Adapter.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_TLI.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Parse_Node.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\PI_Malloc.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Ping_Socket.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Pipe.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\POSIX_Proactor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Priority_Reactor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Proactor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Proactor_Impl.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Process.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Process_Manager.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Process_Mutex.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Process_Semaphore.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Profile_Timer.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Reactor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Reactor_Impl.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Read_Buffer.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Recyclable.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Registry.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Registry_Name_Space.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Remote_Name_Space.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Remote_Tokens.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Rtems_init.c" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\RW_Mutex.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\RW_Process_Mutex.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\RW_Thread_Mutex.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sample_History.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sched_Params.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Select_Reactor_Base.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Semaphore.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Config.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Gestalt.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Manager.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Object.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Repository.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Types.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Shared_Memory.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Shared_Memory_MM.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Shared_Memory_Pool.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Shared_Memory_SV.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Shared_Object.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sig_Adapter.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sig_Handler.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Signal.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Acceptor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_CODgram.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sock_Connect.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Connector.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Dgram.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_IO.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Netlink.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Stream.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SPIPE.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SPIPE_Acceptor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SPIPE_Addr.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SPIPE_Connector.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SPIPE_Stream.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SString.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Stack_Trace.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Stats.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\String_Base_Const.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SUN_Proactor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SV_Message.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SV_Message_Queue.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SV_Shared_Memory.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Svc_Conf_y.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Synch_Options.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\System_Time.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Task.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Adapter.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Control.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Exit.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Hook.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Manager.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Mutex.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Semaphore.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Throughput_Stats.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Time_Value.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Timeprobe.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TLI.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TLI_Acceptor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TLI_Connector.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TLI_Stream.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Token.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Token_Collection.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Token_Invariants.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Token_Manager.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Token_Request_Reply.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TP_Reactor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Trace.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TSS_Adapter.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TTY_IO.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UNIX_Addr.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UPIPE_Acceptor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UPIPE_Connector.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UPIPE_Stream.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UUID.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\WFMO_Reactor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\WIN32_Proactor.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\XML_Svc_Conf.cpp" />
+    <ClCompile Include="..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Acceptor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ACE.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ACE_export.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ace_wchar.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Activation_Queue.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Active_Map_Manager.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Active_Map_Manager_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Addr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Arg_Shifter.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ARGV.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Argv_Type_Converter.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Array_Base.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Array_Map.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Assert.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Asynch_Acceptor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Asynch_Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Asynch_IO.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Asynch_IO_Impl.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_Acceptor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_Addr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_Params.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_QoS.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_Stream.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Atomic_Op.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Atomic_Op_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Auto_Event.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Auto_Functor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Auto_IncDec_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Auto_Ptr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Barrier.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Base_Thread_Adapter.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Based_Pointer_Repository.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Based_Pointer_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Basic_Stats.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Basic_Types.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Bound_Ptr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Cached_Connect_Strategy_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Caching_Strategies_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Caching_Utility_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Capabilities.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\CDR_Base.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\CDR_Size.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\CDR_Stream.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\CE_Screen_Output.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\checked_iterator.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Cleanup.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Cleanup_Strategies_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Codecs.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Codeset_IBM1047.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Codeset_Registry.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Codeset_Symbols.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Condition_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-aix-5.x.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-all.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-cygwin32.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-doxygen.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-freebsd.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-g++-common.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-ghs-common.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-hpux-11.00.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-icc-common.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-integritySCA.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-linux-common.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-linux.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-lite.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-lynxos.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-iphone-hardware.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-iphone-simulator.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-leopard.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-panther.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-snowleopard.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-tiger.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macros.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-minimal.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-mvs.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-netbsd.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-openbsd.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-openvms.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-pharlap.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-posix-nonetworking.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-posix.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-qnx-neutrino.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-qnx-rtp-62x.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-qnx-rtp-common.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-qnx-rtp-pre62x.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-qnx-rtp.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-rtems.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-suncc-common.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.10.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.11.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.4-g++.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.4-sunc++-4.x.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.5.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.6.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.7.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.8.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.9.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v2.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v3.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-tandem.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-visualage.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks6.4.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks6.5.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks6.6.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks6.7.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks6.8.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-borland.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-cegcc.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-common.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-dmc.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-interix.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-mingw.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-msvc-10.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-msvc-7.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-msvc-8.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-msvc-9.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-msvc.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-WinCE.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Configuration.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Configuration_Import_Export.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Containers.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Containers_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Copy_Disabled.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\CORBA_macros.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Countdown_Time.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Date_Time.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Default_Constants.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DEV.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DEV_Addr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DEV_Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DEV_IO.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dirent.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dirent_Selector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DLL.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DLL_Manager.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dump.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dump_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dynamic.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dynamic_Service.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dynamic_Service_Base.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Encoding_Converter.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Env_Value_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Event.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Event_Handler.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Event_Handler_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FIFO.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FIFO_Recv.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FIFO_Send.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FIFO_Send_Msg.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FILE.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FILE_Addr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FILE_Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FILE_IO.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\File_Lock.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Filecache.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Flag_Manip.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Framework_Component.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Framework_Component_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Free_List.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Functor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Functor_String.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Functor_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Future.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Future_Set.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Get_Opt.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Global_Macros.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Guard_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Handle_Gobbler.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Handle_Ops.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Handle_Set.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hash_Map_Manager.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hashable.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\High_Res_Timer.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ICMP_Socket.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\If_Then_Else.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\INET_Addr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Init_ACE.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Intrusive_List.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Intrusive_List_Node.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\IO_Cntl_Msg.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\IO_SAP.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\iosfwd.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\IOStream.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\IOStream_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\IPC_SAP.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Lib_Find.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Local_Memory_Pool.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Local_Name_Space.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Local_Name_Space_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Local_Tokens.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Lock.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Lock_Adapter_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LOCK_SOCK_Acceptor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg_Backend.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg_Callback.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg_IPC.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Priority.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Record.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Logging_Strategy.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK_Acceptor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK_CODgram.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK_Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK_Dgram.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK_Stream.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Malloc.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Malloc_Allocator.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Malloc_Base.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Malloc_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Managed_Object.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Manual_Event.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Map_Manager.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Map_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_Acceptor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_Addr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_IO.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Mem_Map.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_SAP.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_Stream.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Memory_Pool.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Block.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Block_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Queue.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Queue_NT.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Queue_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Queue_Vx.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Method_Request.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Metrics_Cache.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Metrics_Cache_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Min_Max.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Module.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Admin.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Base.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Control_Action.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Control_Types.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Point_Registry.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Size.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Mutex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Name_Proxy.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Name_Request_Reply.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Name_Space.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Naming_Context.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Netlink_Addr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Node.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Notification_Queue.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Notification_Strategy.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\NT_Service.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Null_Barrier.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Null_Condition.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Null_Mutex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Null_Semaphore.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Numeric_Limits.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Obchunk.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Object_Manager.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Object_Manager_Base.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Obstack.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Obstack_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_aio.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_assert.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_byteswap.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_complex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_cpio.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_ctype.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_dirent.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_dlfcn.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_errno.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_Errno.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_fcntl.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_fenv.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_float.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_fmtmsg.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_fnmatch.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_ftw.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_glob.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_grp.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_iconv.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\net\os_if.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\netinet\os_in.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\arpa\os_inet.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_intrin.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_inttypes.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_ipc.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_iso646.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_kstat.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_langinfo.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_libgen.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_limits.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_loadavg.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_local.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_main.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_math.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_Memory.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_mman.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_monetary.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_mqueue.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_msg.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_ndbm.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_netdb.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_nl_types.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_ctype.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_dirent.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_dlfcn.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_errno.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_fcntl.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_macros.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_math.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_netdb.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_poll.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_pwd.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_regex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_signal.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_stdio.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_stdlib.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_string.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_strings.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_stropts.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_mman.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_msg.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_resource.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_select.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_shm.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_socket.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_stat.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_time.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_uio.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_wait.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_Thread.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_time.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_unistd.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_wchar.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_wctype.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_pdh.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_pdhmsg.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_poll.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_pstat.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_pthread.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_pwd.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_QoS.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_regex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_resource.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_sched.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_search.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_select.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_sem.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_semaphore.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_setjmp.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_shm.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_signal.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_socket.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_spawn.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_stat.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_statvfs.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stdarg.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stdbool.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stddef.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stdint.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stdio.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stdlib.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_string.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_strings.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stropts.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_sysctl.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_sysinfo.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_syslog.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_tar.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\netinet\os_tcp.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_termios.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_tgmath.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_Thread_Adapter.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_time.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_time.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_timeb.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_times.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_TLI.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_trace.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_typeinfo.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_types.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_ucontext.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_uio.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_ulimit.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_un.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_unistd.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_utime.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_utmpx.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_utsname.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_wait.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_wchar.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_wctype.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_wordexp.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Pair_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Parse_Node.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\PI_Malloc.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Ping_Socket.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Pipe.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\POSIX_Proactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\post.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\pre.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Priority_Reactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Proactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Proactor_Impl.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Process.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Process_Manager.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Process_Mutex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Process_Semaphore.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Profile_Timer.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\RB_Tree.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reactor_Impl.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reactor_Token_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Read_Buffer.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Recyclable.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Refcountable_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Registry.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Registry_Name_Space.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Remote_Name_Space.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Remote_Tokens.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reverse_Lock_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\RW_Mutex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\RW_Process_Mutex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\RW_Thread_Mutex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sample_History.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sched_Params.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Select_Reactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Select_Reactor_Base.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Select_Reactor_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Semaphore.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Config.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Gestalt.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Manager.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Object.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Repository.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Types.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Shared_Memory.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Shared_Memory_MM.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Shared_Memory_Pool.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Shared_Memory_SV.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Shared_Object.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sig_Adapter.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sig_Handler.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Signal.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Singleton.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Acceptor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_CODgram.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sock_Connect.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Dgram.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_IO.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Netlink.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Stream.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SPIPE.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SPIPE_Acceptor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SPIPE_Addr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SPIPE_Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SPIPE_Stream.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SString.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SStringfwd.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Stack_Trace.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Static_Object_Lock.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Stats.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Strategies.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Strategies_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Stream.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Stream_Modules.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\streams.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\String_Base.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\String_Base_Const.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SUN_Proactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SV_Message.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SV_Message_Queue.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SV_Shared_Memory.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Conf.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Conf_Param.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Conf_Token_Table.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Conf_Tokens.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\svc_export.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Handler.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Synch.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Synch_Options.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Synch_Traits.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\System_Time.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Task.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Task_Ex_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Task_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Test_and_Set.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Adapter.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Control.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Exit.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Hook.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Manager.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Mutex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Semaphore.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Throughput_Stats.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Time_Value.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timeprobe.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timeprobe_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Hash.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Hash_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Heap.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Heap_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_List.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_List_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Queue.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Queue_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Queuefwd.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Wheel.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Wheel_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TLI.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TLI_Acceptor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TLI_Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TLI_Stream.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Token.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Token_Collection.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Token_Invariants.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Token_Manager.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Token_Request_Reply.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Tokenizer_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TP_Reactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Trace.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Truncate.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TSS_Adapter.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TSS_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TTY_IO.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Typed_SV_Message.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Unbounded_Queue.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Unbounded_Set.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UNIX_Addr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UPIPE_Acceptor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UPIPE_Addr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UPIPE_Connector.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UPIPE_Stream.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UUID.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Value_Ptr.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Vector_T.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Version.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Versioned_Namespace.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\WFMO_Reactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\WIN32_Proactor.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\XML_Svc_Conf.h" />
+    <ClInclude Include="..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win/ACE_vc10.vcxproj.filters b/win/ACE_vc10.vcxproj.filters
new file mode 100644
index 00000000000..ebb3f16b0ec
--- /dev/null
+++ b/win/ACE_vc10.vcxproj.filters
@@ -0,0 +1,3582 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{a66bf1d2-c281-4638-8933-a40a40fe2606}</UniqueIdentifier>
+      <Extensions>cpp;cxx;cc;C;c</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{64d32856-a446-4163-9a21-cdc7761bdfd7}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hh</Extensions>
+    </Filter>
+    <Filter Include="Inline Files">
+      <UniqueIdentifier>{3e8e43bb-56ba-4fd1-9444-adf32d03f7c5}</UniqueIdentifier>
+      <Extensions>i;inl</Extensions>
+    </Filter>
+    <Filter Include="Documentation">
+      <UniqueIdentifier>{42f5d71a-c3e0-4761-b363-cb8f2d811e77}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{92603191-13a9-43e7-b4f7-76cc63b2911d}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ACE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ACE_crc32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ACE_crc_ccitt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ace_wchar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Activation_Queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Active_Map_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Argv_Type_Converter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Assert.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Asynch_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Asynch_IO_Impl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_Params.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_QoS.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ATM_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Atomic_Op.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Auto_Event.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Barrier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Base_Thread_Adapter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Based_Pointer_Repository.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Basic_Stats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Basic_Types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Capabilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\CDR_Base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\CDR_Size.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\CDR_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Cleanup.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Codecs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Codeset_IBM1047.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Codeset_Registry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Codeset_Registry_db.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Configuration.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Configuration_Import_Export.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Containers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Copy_Disabled.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Countdown_Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Date_Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DEV.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DEV_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DEV_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DEV_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dirent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dirent_Selector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DLL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\DLL_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dump.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dynamic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dynamic_Service_Base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Encoding_Converter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Event.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Event_Handler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FIFO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FIFO_Recv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FIFO_Send.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FIFO_Send_Msg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FILE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FILE_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FILE_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\FILE_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\File_Lock.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Filecache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Flag_Manip.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Framework_Component.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Functor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Functor_String.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Get_Opt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\gethrtime.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Handle_Ops.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Handle_Set.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Hashable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\High_Res_Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\ICMP_Socket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\INET_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Init_ACE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\IO_Cntl_Msg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\IO_SAP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\IOStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\IPC_SAP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Lib_Find.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Local_Memory_Pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Local_Name_Space.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Local_Tokens.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Lock.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg_Backend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg_Callback.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg_IPC.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Log_Record.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Logging_Strategy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK_CODgram.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK_Dgram.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\LSOCK_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Malloc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Malloc_Allocator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Manual_Event.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Mem_Map.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_SAP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MEM_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Message_Block.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Message_Queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Message_Queue_NT.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Message_Queue_Vx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Method_Request.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Admin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Control_Action.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Control_Types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Point_Registry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Monitor_Size.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Name_Proxy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Name_Request_Reply.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Name_Space.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Naming_Context.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Netlink_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Notification_Queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Notification_Strategy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\NT_Service.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Obchunk.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Object_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Object_Manager_Base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_Errno.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_ctype.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_dirent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_dlfcn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_errno.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_fcntl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_math.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_netdb.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_poll.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_pwd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_regex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_signal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_stdio.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_stdlib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_string.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_strings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_stropts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_mman.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_msg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_resource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_select.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_shm.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_socket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_stat.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_uio.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_sys_wait.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_unistd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_wchar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_NS_wctype.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_QoS.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_Thread_Adapter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\OS_TLI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Parse_Node.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\PI_Malloc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Ping_Socket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Pipe.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\POSIX_Proactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Priority_Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Proactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Proactor_Impl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Process.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Process_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Process_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Process_Semaphore.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Profile_Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Reactor_Impl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Read_Buffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Recyclable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Registry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Registry_Name_Space.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Remote_Name_Space.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Remote_Tokens.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Rtems_init.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\RW_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\RW_Process_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\RW_Thread_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sample_History.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sched_Params.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Select_Reactor_Base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Semaphore.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Config.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Gestalt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Object.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Repository.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Service_Types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Shared_Memory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Shared_Memory_MM.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Shared_Memory_Pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Shared_Memory_SV.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Shared_Object.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sig_Adapter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sig_Handler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Signal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_CODgram.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Sock_Connect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Dgram.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Netlink.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SOCK_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SPIPE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SPIPE_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SPIPE_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SPIPE_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SPIPE_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SString.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Stack_Trace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Stats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\String_Base_Const.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SUN_Proactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SV_Message.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SV_Message_Queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\SV_Shared_Memory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Svc_Conf_y.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Synch_Options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\System_Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Task.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Adapter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Control.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Exit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Hook.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Thread_Semaphore.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Throughput_Stats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Time_Value.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Timeprobe.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TLI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TLI_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TLI_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TLI_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Token.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Token_Collection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Token_Invariants.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Token_Manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Token_Request_Reply.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TP_Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\Trace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TSS_Adapter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\TTY_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UNIX_Addr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UPIPE_Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UPIPE_Connector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UPIPE_Stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\UUID.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\WFMO_Reactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\WIN32_Proactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\XML_Svc_Conf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ACE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ACE_export.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ace_wchar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Activation_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Active_Map_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Active_Map_Manager_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Arg_Shifter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ARGV.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Argv_Type_Converter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Array_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Array_Map.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Assert.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Asynch_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Asynch_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Asynch_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Asynch_IO_Impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_Params.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_QoS.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ATM_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Atomic_Op.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Atomic_Op_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Auto_Event.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Auto_Functor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Auto_IncDec_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Auto_Ptr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Barrier.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Base_Thread_Adapter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Based_Pointer_Repository.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Based_Pointer_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Basic_Stats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Basic_Types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Bound_Ptr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Cached_Connect_Strategy_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Caching_Strategies_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Caching_Utility_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Capabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\CDR_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\CDR_Size.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\CDR_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\CE_Screen_Output.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\checked_iterator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Cleanup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Cleanup_Strategies_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Codecs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Codeset_IBM1047.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Codeset_Registry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Codeset_Symbols.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Condition_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-aix-5.x.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-all.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-cygwin32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-doxygen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-freebsd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-g++-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-ghs-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-hpux-11.00.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-icc-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-integritySCA.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-linux-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-linux.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-lite.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-lynxos.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-iphone-hardware.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-iphone-simulator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-leopard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-panther.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-snowleopard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx-tiger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macosx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-macros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-minimal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-mvs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-netbsd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-openbsd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-openvms.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-pharlap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-posix-nonetworking.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-posix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-qnx-neutrino.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-qnx-rtp-62x.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-qnx-rtp-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-qnx-rtp-pre62x.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-qnx-rtp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-rtems.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-suncc-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.10.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.11.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.4-g++.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.4-sunc++-4.x.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.5.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.6.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.7.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.8.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-sunos5.9.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-tandem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-visualage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks6.4.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks6.5.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks6.6.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks6.7.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-vxworks6.8.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-borland.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-cegcc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-dmc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-interix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-mingw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-msvc-10.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-msvc-7.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-msvc-8.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-msvc-9.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32-msvc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\config-WinCE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Configuration.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Configuration_Import_Export.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Containers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Containers_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Copy_Disabled.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\CORBA_macros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Countdown_Time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Date_Time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Default_Constants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DEV.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DEV_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DEV_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DEV_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dirent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dirent_Selector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DLL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\DLL_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dump.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dump_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dynamic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dynamic_Service.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dynamic_Service_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Encoding_Converter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Env_Value_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Event.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Event_Handler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Event_Handler_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FIFO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FIFO_Recv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FIFO_Send.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FIFO_Send_Msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FILE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FILE_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FILE_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\FILE_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\File_Lock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Filecache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Flag_Manip.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Framework_Component.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Framework_Component_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Free_List.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Functor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Functor_String.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Functor_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Future.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Future_Set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Get_Opt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Global_Macros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Guard_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Handle_Gobbler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Handle_Ops.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Handle_Set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hash_Map_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Hashable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\High_Res_Timer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\ICMP_Socket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\If_Then_Else.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\INET_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Init_ACE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Intrusive_List.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Intrusive_List_Node.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\IO_Cntl_Msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\IO_SAP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\iosfwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\IOStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\IOStream_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\IPC_SAP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Lib_Find.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Local_Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Local_Name_Space.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Local_Name_Space_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Local_Tokens.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Lock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Lock_Adapter_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LOCK_SOCK_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg_Backend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg_Callback.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg_IPC.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Priority.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Log_Record.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Logging_Strategy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK_CODgram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK_Dgram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\LSOCK_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Malloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Malloc_Allocator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Malloc_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Malloc_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Managed_Object.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Manual_Event.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Map_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Map_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Mem_Map.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_SAP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MEM_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Block.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Block_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Queue_NT.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Queue_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Message_Queue_Vx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Method_Request.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Metrics_Cache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Metrics_Cache_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Min_Max.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Module.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Admin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Control_Action.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Control_Types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Point_Registry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Monitor_Size.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Name_Proxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Name_Request_Reply.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Name_Space.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Naming_Context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Netlink_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Node.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Notification_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Notification_Strategy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\NT_Service.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Null_Barrier.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Null_Condition.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Null_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Null_Semaphore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Numeric_Limits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Obchunk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Object_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Object_Manager_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Obstack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Obstack_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_aio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_assert.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_byteswap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_complex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_cpio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_ctype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_dirent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_dlfcn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_errno.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_Errno.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_fcntl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_fenv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_float.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_fmtmsg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_fnmatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_ftw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_glob.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_grp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_iconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\net\os_if.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\netinet\os_in.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\arpa\os_inet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_intrin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_inttypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_ipc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_iso646.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_kstat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_langinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_libgen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_limits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_loadavg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_local.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_math.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_Memory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_mman.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_monetary.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_mqueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_ndbm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_netdb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_nl_types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_ctype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_dirent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_dlfcn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_errno.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_fcntl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_macros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_math.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_netdb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_poll.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_pwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_regex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_signal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_stdio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_stdlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_string.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_strings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_stropts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_mman.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_msg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_select.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_shm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_socket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_stat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_uio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_sys_wait.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_Thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_unistd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_wchar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_NS_wctype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_pdh.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_pdhmsg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_poll.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_pstat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_pthread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_pwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_QoS.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_regex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_sched.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_search.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_select.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_sem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_semaphore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_setjmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_shm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_signal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_socket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_spawn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_stat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_statvfs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stdarg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stdbool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stddef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stdint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stdio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stdlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_string.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_strings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_stropts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_sysctl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_sysinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_syslog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_tar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\netinet\os_tcp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_termios.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_tgmath.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_Thread_Adapter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_timeb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_times.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\OS_TLI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_typeinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_ucontext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_uio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_ulimit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_un.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_unistd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_utime.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_utmpx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_utsname.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\sys\os_wait.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_wchar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_wctype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\os_include\os_wordexp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Pair_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Parse_Node.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\PI_Malloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Ping_Socket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Pipe.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\POSIX_Proactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\post.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\pre.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Priority_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Proactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Proactor_Impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Process.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Process_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Process_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Process_Semaphore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Profile_Timer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\RB_Tree.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reactor_Impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reactor_Token_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Read_Buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Recyclable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Refcountable_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Registry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Registry_Name_Space.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Remote_Name_Space.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Remote_Tokens.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Reverse_Lock_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\RW_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\RW_Process_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\RW_Thread_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sample_History.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sched_Params.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Select_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Select_Reactor_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Select_Reactor_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Semaphore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Gestalt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Object.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Repository.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Service_Types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Shared_Memory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Shared_Memory_MM.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Shared_Memory_Pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Shared_Memory_SV.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Shared_Object.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sig_Adapter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sig_Handler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Signal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Singleton.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_CODgram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Sock_Connect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Dgram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Netlink.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SOCK_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SPIPE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SPIPE_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SPIPE_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SPIPE_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SPIPE_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SString.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SStringfwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Stack_Trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Static_Object_Lock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Stats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Strategies.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Strategies_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Stream_Modules.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\streams.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\String_Base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\String_Base_Const.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SUN_Proactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SV_Message.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SV_Message_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\SV_Shared_Memory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Conf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Conf_Param.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Conf_Token_Table.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Conf_Tokens.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\svc_export.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Svc_Handler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Synch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Synch_Options.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Synch_Traits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\System_Time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Task.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Task_Ex_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Task_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Test_and_Set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Adapter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Control.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Exit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Hook.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Thread_Semaphore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Throughput_Stats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Time_Value.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timeprobe.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timeprobe_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Hash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Hash_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Heap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Heap_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_List.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_List_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Queue_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Queuefwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Wheel.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Timer_Wheel_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TLI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TLI_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TLI_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TLI_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Token.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Token_Collection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Token_Invariants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Token_Manager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Token_Request_Reply.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Tokenizer_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TP_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Truncate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TSS_Adapter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TSS_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\TTY_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Typed_SV_Message.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Unbounded_Queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Unbounded_Set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UNIX_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UPIPE_Acceptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UPIPE_Addr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UPIPE_Connector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UPIPE_Stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\UUID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Value_Ptr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Vector_T.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\Versioned_Namespace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\WFMO_Reactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\WIN32_Proactor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\XML_Svc_Conf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\dep\ACE_wrappers\ace\ACE.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\ace_wchar.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Activation_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Active_Map_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Active_Map_Manager_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\ARGV.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Argv_Type_Converter.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Array_Base.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Array_Map.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Asynch_IO_Impl.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\ATM_Acceptor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\ATM_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\ATM_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\ATM_Params.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\ATM_QoS.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\ATM_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Atomic_Op.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Atomic_Op_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Auto_Event.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Auto_Functor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Auto_IncDec_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Auto_Ptr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Barrier.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Base_Thread_Adapter.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Based_Pointer_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Basic_Stats.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Basic_Types.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Bound_Ptr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Caching_Strategies_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Capabilities.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\CDR_Base.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\CDR_Size.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\CDR_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Cleanup.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Codeset_Registry.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Condition_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Configuration.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Containers.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Containers_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Countdown_Time.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Date_Time.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\DEV.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\DEV_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\DEV_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\DEV_IO.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Dirent.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Dirent_Selector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Dynamic.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Dynamic_Service.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Env_Value_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Event.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Event_Handler.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Event_Handler_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\FIFO.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\FIFO_Recv.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\FIFO_Send.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\FIFO_Send_Msg.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\FILE.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\FILE_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\FILE_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\FILE_IO.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\File_Lock.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Flag_Manip.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Framework_Component.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Functor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Functor_String.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Functor_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Get_Opt.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Guard_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Handle_Gobbler.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Handle_Set.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Hashable.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\High_Res_Timer.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\INET_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Intrusive_List.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Intrusive_List_Node.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\IO_Cntl_Msg.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\IO_SAP.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\IOStream_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\IPC_SAP.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Local_Tokens.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Lock.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Lock_Adapter_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Log_Msg.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Log_Record.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\LSOCK.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\LSOCK_CODgram.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\LSOCK_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\LSOCK_Dgram.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\LSOCK_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Malloc.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Malloc_Allocator.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Malloc_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Managed_Object.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Manual_Event.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Map_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Map_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\MEM_Acceptor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\MEM_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\MEM_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\MEM_IO.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Mem_Map.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\MEM_SAP.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\MEM_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Message_Block.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Message_Block_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Message_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Message_Queue_NT.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Message_Queue_Vx.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Metrics_Cache_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Module.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Monitor_Base.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Naming_Context.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Netlink_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Notification_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Notification_Strategy.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\NT_Service.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Obchunk.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Object_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Obstack_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_Errno.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_ctype.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_dirent.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_dlfcn.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_errno.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_fcntl.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_math.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_netdb.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_poll.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_pwd.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_regex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_signal.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_stdio.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_stdlib.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_string.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_strings.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_stropts.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_mman.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_msg.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_resource.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_select.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_shm.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_socket.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_stat.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_time.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_uio.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_sys_wait.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_Thread.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_time.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_unistd.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_wchar.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_NS_wctype.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\OS_TLI.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Pair_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\PI_Malloc.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Ping_Socket.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Pipe.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\POSIX_Proactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Proactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Process.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Process_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Process_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Process_Semaphore.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Profile_Timer.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\RB_Tree.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Reactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Read_Buffer.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Recyclable.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Refcountable_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Remote_Tokens.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Reverse_Lock_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\RW_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\RW_Process_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\RW_Thread_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Sample_History.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Sched_Params.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Select_Reactor_Base.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Select_Reactor_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Semaphore.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Service_Config.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Service_Gestalt.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Service_Object.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Service_Repository.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Service_Types.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Shared_Memory_MM.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Shared_Memory_SV.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Shared_Object.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Sig_Handler.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Signal.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Singleton.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Acceptor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_CODgram.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Dgram.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_IO.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Netlink.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SOCK_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SPIPE.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SPIPE_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SPIPE_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SPIPE_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SString.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Stats.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Strategies_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\String_Base.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SV_Message.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SV_Message_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\SV_Shared_Memory.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Task.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Task_Ex_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Task_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Thread.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Thread_Adapter.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Thread_Control.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Thread_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Thread_Mutex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Thread_Semaphore.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Time_Value.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Timeprobe.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Timer_Queue_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\TLI.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\TLI_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\TLI_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Token.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Token_Collection.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Token_Manager.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Token_Request_Reply.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\TP_Reactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\TSS_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Typed_SV_Message.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Unbounded_Queue.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Unbounded_Set.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\UNIX_Addr.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\UPIPE_Acceptor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\UPIPE_Connector.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\UPIPE_Stream.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\UUID.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\Vector_T.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\WFMO_Reactor.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+    <None Include="..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.inl">
+      <Filter>Inline Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\dep\ACE_wrappers\ace\ace.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\dep\ACE_wrappers\README" />
+    <CustomBuild Include="..\dep\ACE_wrappers\VERSION" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/Detour.vcxproj b/win/Detour.vcxproj
new file mode 100644
index 00000000000..2632fbfb77b
--- /dev/null
+++ b/win/Detour.vcxproj
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}</ProjectGuid>
+    <RootNamespace>Detour</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)\..\dep\recastnavigation\Detour\lib\$(Platform)_$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(ProjectDir)\..\dep\recastnavigation\Detour\lib\$(Platform)_$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>.\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IntDir>.\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)\..\dep\recastnavigation\Detour\lib\$(Platform)_$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(ProjectDir)\..\dep\recastnavigation\Detour\lib\$(Platform)_$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>.\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IntDir>.\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\recastnavigation\Detour\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;DEBUG;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\recastnavigation\Detour\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;DEBUG;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\dep\recastnavigation\Detour\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\dep\recastnavigation\Detour\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourAlloc.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourAssert.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourCommon.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourNavMesh.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourNavMeshBuilder.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourNavMeshQuery.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourNode.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourStatus.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourAlloc.cpp" />
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourCommon.cpp" />
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourNavMesh.cpp" />
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourNavMeshBuilder.cpp" />
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourNavMeshQuery.cpp" />
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourNode.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win/Detour.vcxproj.filters b/win/Detour.vcxproj.filters
new file mode 100644
index 00000000000..31b129a213b
--- /dev/null
+++ b/win/Detour.vcxproj.filters
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="src">
+      <UniqueIdentifier>{93bb99d1-034f-421d-abf2-856b22079565}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include">
+      <UniqueIdentifier>{661147bd-4839-4f24-8697-6ce5cb9b61a2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourAlloc.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourAssert.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourCommon.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourNavMesh.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourNavMeshBuilder.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourNavMeshQuery.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourNode.h" />
+    <ClInclude Include="..\dep\recastnavigation\Detour\Include\DetourStatus.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourAlloc.cpp" />
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourCommon.cpp" />
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourNavMesh.cpp" />
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourNavMeshBuilder.cpp" />
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourNavMeshQuery.cpp" />
+    <ClCompile Include="..\dep\recastnavigation\Detour\Source\DetourNode.cpp" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/VC100/.gitignore b/win/VC100/.gitignore
deleted file mode 100644
index f1254be3842..00000000000
--- a/win/VC100/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git-ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# MaNGOS generated files at Windows build
-#
-
-*__Win32_Debug*
-*__x64_Debug*
-*__Win32_Release*
-*__x64_Release*
-*.log
diff --git a/win/VC100/ACE_vc10.vcxproj b/win/VC100/ACE_vc10.vcxproj
deleted file mode 100644
index 519755476d5..00000000000
--- a/win/VC100/ACE_vc10.vcxproj
+++ /dev/null
@@ -1,1584 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ACE_Wrappers</ProjectName>
-    <ProjectGUID>{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}</ProjectGUID>
-    <RootNamespace>ACE</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\ace__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ACEd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\ace__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">ACEd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\ace__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ACE</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\ace__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">ACE</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\dep\lib\$(Platform)_debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\ace__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">ACEd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\dep\lib\$(Platform)_debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\ace__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">ACEd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
-      <HeaderFileName>%(FileName).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)\ACEd.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)ACEd.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
-      <HeaderFileName>%(FileName).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)\ACEd.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)ACEd.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
-      <HeaderFileName>%(FileName).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)\ACE.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)ACE.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
-      <HeaderFileName>%(FileName).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)\ACE.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)ACE.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <Midl>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
-      <HeaderFileName>%(FileName).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)\ACEd.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)ACEd.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TypeLibraryName>%(FileName).tlb</TypeLibraryName>
-      <HeaderFileName>%(FileName).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(FileName)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(FileName)_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP /wd 4748 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4355;4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/machine:AMD64 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)\ACEd.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)ACEd.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\dep\ACE_wrappers\README">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|X64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\dep\ACE_wrappers\VERSION">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|X64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\dep\ACE_wrappers\ace\ace.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\dep\ACE_wrappers\ace\ACE.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\ace_wchar.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Activation_Queue.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Addr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\ARGV.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Array_Base.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Array_Map.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Addr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Connector.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Params.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_QoS.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Stream.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Atomic_Op.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_Event.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_Functor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_IncDec_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_Ptr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Barrier.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Basic_Stats.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Basic_Types.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Bound_Ptr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Caching_Strategies_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Capabilities.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\CDR_Base.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\CDR_Size.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\CDR_Stream.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Cleanup.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Condition_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Configuration.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Containers.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Containers_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Countdown_Time.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Date_Time.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV_Addr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV_Connector.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV_IO.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Dirent.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Dirent_Selector.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Dynamic.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Env_Value_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Event.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Event_Handler.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Event_Handler_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Send.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE_Addr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE_Connector.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE_IO.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\File_Lock.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Flag_Manip.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Framework_Component.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Functor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Functor_String.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Functor_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Get_Opt.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Guard_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Handle_Gobbler.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Handle_Set.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Hashable.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\High_Res_Timer.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\INET_Addr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Intrusive_List.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Intrusive_List_Node.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\IO_SAP.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\IOStream_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\IPC_SAP.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Local_Tokens.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Lock.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Lock_Adapter_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Log_Msg.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Log_Record.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Malloc.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Malloc_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Managed_Object.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Manual_Event.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Map_Manager.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Map_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Addr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Connector.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_IO.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Mem_Map.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_SAP.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Stream.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Block.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Block_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Queue.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Metrics_Cache_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Module.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Monitor_Base.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Mutex.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Naming_Context.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Netlink_Addr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Notification_Queue.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Notification_Strategy.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\NT_Service.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Obchunk.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Object_Manager.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Obstack_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_Errno.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_errno.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_math.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_poll.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_regex.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_signal.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_string.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_strings.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_time.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_TLI.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Pair_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\PI_Malloc.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Ping_Socket.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Pipe.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Proactor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Process.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Process_Manager.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Process_Mutex.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Process_Semaphore.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Profile_Timer.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\RB_Tree.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Reactor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Read_Buffer.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Recyclable.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Refcountable_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Remote_Tokens.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Reverse_Lock_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\RW_Mutex.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Sample_History.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Sched_Params.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Semaphore.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Config.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Gestalt.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Object.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Repository.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Types.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Shared_Object.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Sig_Handler.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Signal.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Singleton.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Connector.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_IO.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Stream.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SString.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Stats.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Strategies_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Stream.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\String_Base.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Message.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Task.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Task_Ex_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Task_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Adapter.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Control.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Manager.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Mutex.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Time_Value.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Timeprobe.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\TLI.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\TLI_Connector.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\TLI_Stream.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Token.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Token_Collection.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Token_Manager.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\TP_Reactor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\TSS_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Unbounded_Queue.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\UNIX_Addr.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\UUID.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\Vector_T.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.inl" />
-    <None Include="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.inl" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ACE.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ACE_crc32.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ACE_crc_ccitt.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ace_wchar.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Activation_Queue.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Addr.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Assert.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Asynch_IO.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Addr.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Connector.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Params.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_QoS.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Stream.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Atomic_Op.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.c" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Auto_Event.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Barrier.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_Repository.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Basic_Stats.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Basic_Types.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Capabilities.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\CDR_Base.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\CDR_Size.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\CDR_Stream.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Cleanup.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codecs.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codeset_IBM1047.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry_db.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Configuration.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Configuration_Import_Export.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Containers.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Copy_Disabled.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Countdown_Time.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Date_Time.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV_Addr.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV_Connector.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV_IO.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dirent.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dirent_Selector.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DLL.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DLL_Manager.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dump.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Base.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Event.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Event_Handler.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Send.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE_Addr.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE_Connector.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE_IO.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\File_Lock.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Filecache.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Flag_Manip.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Framework_Component.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Functor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Functor_String.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Get_Opt.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\gethrtime.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Handle_Ops.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Handle_Set.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Hashable.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\High_Res_Timer.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ICMP_Socket.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\INET_Addr.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Init_ACE.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IO_SAP.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IOStream.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IPC_SAP.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Lib_Find.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Local_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Local_Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Local_Tokens.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Lock.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Backend.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Callback.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_IPC.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Record.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Logging_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Malloc.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Manual_Event.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Addr.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Connector.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_IO.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Mem_Map.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_SAP.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Stream.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Block.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Queue.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Method_Request.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Base.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Action.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Types.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Point_Registry.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Size.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Mutex.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Name_Proxy.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Name_Request_Reply.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Naming_Context.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Netlink_Addr.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Notification_Queue.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Notification_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\NT_Service.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Obchunk.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Object_Manager.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Object_Manager_Base.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_Errno.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_main.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_errno.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_math.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_poll.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_regex.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_signal.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_string.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_strings.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_time.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_QoS.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_Thread_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_TLI.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Parse_Node.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\PI_Malloc.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Ping_Socket.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Pipe.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Priority_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Proactor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Proactor_Impl.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process_Manager.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process_Semaphore.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Profile_Timer.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor_Impl.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Read_Buffer.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Recyclable.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Registry.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Registry_Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Remote_Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Remote_Tokens.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Rtems_init.c" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\RW_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sample_History.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sched_Params.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Semaphore.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Config.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Gestalt.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Manager.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Object.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Repository.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Types.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Object.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sig_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sig_Handler.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Signal.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sock_Connect.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Connector.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_IO.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Stream.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SString.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Stack_Trace.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Stats.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\String_Base_Const.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SUN_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Message.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_y.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Synch_Options.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\System_Time.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Task.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Control.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Exit.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Hook.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Manager.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Throughput_Stats.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Time_Value.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Timeprobe.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI_Connector.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI_Stream.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Collection.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Invariants.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Manager.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TP_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Trace.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TSS_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TTY_IO.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UNIX_Addr.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UUID.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\WIN32_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\XML_Svc_Conf.cpp" />
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Acceptor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ACE.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ACE_export.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ace_wchar.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Activation_Queue.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Addr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Arg_Shifter.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ARGV.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Array_Base.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Array_Map.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Assert.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_Acceptor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_IO.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Addr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Params.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_QoS.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Stream.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_Event.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_Functor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_IncDec_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_Ptr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Barrier.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_Repository.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Basic_Stats.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Basic_Types.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Bound_Ptr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cached_Connect_Strategy_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Caching_Strategies_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Caching_Utility_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Capabilities.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CDR_Base.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CDR_Size.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CDR_Stream.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CE_Screen_Output.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\checked_iterator.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cleanup.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cleanup_Strategies_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codecs.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codeset_IBM1047.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codeset_Symbols.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Condition_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-aix-5.x.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-all.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-cygwin32.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-doxygen.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-freebsd.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-g++-common.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-ghs-common.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-hpux-11.00.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-icc-common.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-integritySCA.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-linux-common.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-linux.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-lite.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-lynxos.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-iphone-hardware.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-iphone-simulator.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-leopard.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-panther.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-snowleopard.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-tiger.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macros.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-minimal.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-mvs.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-netbsd.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-openbsd.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-openvms.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-pharlap.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-posix-nonetworking.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-posix.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-neutrino.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-62x.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-common.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-pre62x.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-rtems.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-suncc-common.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.10.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.11.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.4-g++.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.4-sunc++-4.x.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.5.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.6.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.7.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.8.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.9.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v2.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v3.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-tandem.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-visualage.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.4.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.5.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.6.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.7.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.8.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-borland.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-cegcc.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-common.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-dmc.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-interix.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-mingw.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-10.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-7.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-8.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-9.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-WinCE.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Configuration.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Configuration_Import_Export.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Containers.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Containers_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Copy_Disabled.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CORBA_macros.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Countdown_Time.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Date_Time.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Default_Constants.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV_Addr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV_Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV_IO.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dirent.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dirent_Selector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DLL.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DLL_Manager.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dump.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dump_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Base.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Env_Value_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Event.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Event_Handler.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Event_Handler_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Send.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE_Addr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE_Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE_IO.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\File_Lock.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Filecache.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Flag_Manip.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Framework_Component.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Framework_Component_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Free_List.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Functor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Functor_String.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Functor_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Future.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Future_Set.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Get_Opt.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Global_Macros.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Guard_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Handle_Gobbler.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Handle_Ops.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Handle_Set.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hashable.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\High_Res_Timer.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ICMP_Socket.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\If_Then_Else.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\INET_Addr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Init_ACE.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Intrusive_List.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Intrusive_List_Node.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IO_SAP.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\iosfwd.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IOStream.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IOStream_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IPC_SAP.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Lib_Find.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Memory_Pool.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Name_Space.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Name_Space_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Tokens.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Lock.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Lock_Adapter_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LOCK_SOCK_Acceptor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Backend.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Callback.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_IPC.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Priority.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Record.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Logging_Strategy.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Acceptor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc_Base.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Managed_Object.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Manual_Event.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Map_Manager.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Map_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Addr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_IO.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Mem_Map.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_SAP.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Stream.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Memory_Pool.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Block.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Block_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Method_Request.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Metrics_Cache.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Metrics_Cache_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Min_Max.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Module.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Base.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Action.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Types.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Point_Registry.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Size.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Mutex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Name_Proxy.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Name_Request_Reply.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Name_Space.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Naming_Context.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Netlink_Addr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Node.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Notification_Queue.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Notification_Strategy.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\NT_Service.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Barrier.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Condition.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Mutex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Semaphore.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Numeric_Limits.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Obchunk.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Object_Manager.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Object_Manager_Base.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Obstack.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Obstack_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_aio.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_assert.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_byteswap.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_complex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_cpio.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ctype.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_dirent.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_dlfcn.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_errno.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Errno.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fcntl.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fenv.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_float.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fmtmsg.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fnmatch.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ftw.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_glob.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_grp.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_iconv.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\net\os_if.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\netinet\os_in.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\arpa\os_inet.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_intrin.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_inttypes.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_ipc.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_iso646.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_kstat.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_langinfo.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_libgen.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_limits.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_loadavg.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_local.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_main.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_math.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Memory.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_mman.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_monetary.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_mqueue.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_msg.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ndbm.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_netdb.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_nl_types.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_errno.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_macros.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_math.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_poll.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_regex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_signal.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_string.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_strings.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_time.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pdh.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pdhmsg.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_poll.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_pstat.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pthread.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pwd.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_QoS.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_regex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_resource.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_sched.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_search.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_select.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sem.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_semaphore.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_setjmp.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_shm.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_signal.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_socket.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_spawn.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_stat.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_statvfs.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdarg.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdbool.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stddef.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdint.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdio.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdlib.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_string.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_strings.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stropts.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sysctl.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sysinfo.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_syslog.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_tar.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\netinet\os_tcp.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_termios.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_tgmath.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Thread_Adapter.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_time.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_time.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_timeb.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_times.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_TLI.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_trace.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_typeinfo.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_types.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ucontext.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_uio.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ulimit.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_un.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_unistd.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_utime.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_utmpx.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_utsname.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_wait.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_wchar.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_wctype.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_wordexp.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Pair_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Parse_Node.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\PI_Malloc.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Ping_Socket.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Pipe.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\post.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\pre.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Priority_Reactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Proactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Proactor_Impl.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process_Manager.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process_Mutex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process_Semaphore.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Profile_Timer.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RB_Tree.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Impl.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Token_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Read_Buffer.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Recyclable.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Refcountable_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Registry.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Registry_Name_Space.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Remote_Name_Space.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Remote_Tokens.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reverse_Lock_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RW_Mutex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sample_History.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sched_Params.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Select_Reactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Semaphore.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Config.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Gestalt.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Manager.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Object.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Repository.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Types.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_Pool.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Object.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sig_Adapter.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sig_Handler.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Signal.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Singleton.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sock_Connect.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_IO.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Stream.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Acceptor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SString.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SStringfwd.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stack_Trace.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Static_Object_Lock.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stats.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Strategies.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Strategies_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stream.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stream_Modules.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\streams.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\String_Base.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\String_Base_Const.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SUN_Proactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Message.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Param.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Token_Table.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Tokens.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\svc_export.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Handler.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Synch.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Synch_Options.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Synch_Traits.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\System_Time.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Task.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Task_Ex_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Task_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Test_and_Set.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Adapter.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Control.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Exit.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Hook.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Manager.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Mutex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Throughput_Stats.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Time_Value.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timeprobe.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timeprobe_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Hash.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Hash_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Heap.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Heap_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_List.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_List_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queue.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queuefwd.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Wheel.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Wheel_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI_Acceptor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI_Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI_Stream.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Collection.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Invariants.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Manager.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Tokenizer_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TP_Reactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Trace.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Truncate.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TSS_Adapter.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TSS_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TTY_IO.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Unbounded_Queue.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UNIX_Addr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Addr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UUID.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Value_Ptr.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Vector_T.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Version.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Versioned_Namespace.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\WIN32_Proactor.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\XML_Svc_Conf.h" />
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/ACE_vc10.vcxproj.filters b/win/VC100/ACE_vc10.vcxproj.filters
deleted file mode 100644
index d2639ac837d..00000000000
--- a/win/VC100/ACE_vc10.vcxproj.filters
+++ /dev/null
@@ -1,3586 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{a66bf1d2-c281-4638-8933-a40a40fe2606}</UniqueIdentifier>
-      <Extensions>cpp;cxx;cc;C;c</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{64d32856-a446-4163-9a21-cdc7761bdfd7}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hh</Extensions>
-    </Filter>
-    <Filter Include="Inline Files">
-      <UniqueIdentifier>{3e8e43bb-56ba-4fd1-9444-adf32d03f7c5}</UniqueIdentifier>
-      <Extensions>i;inl</Extensions>
-    </Filter>
-    <Filter Include="Documentation">
-      <UniqueIdentifier>{42f5d71a-c3e0-4761-b363-cb8f2d811e77}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{92603191-13a9-43e7-b4f7-76cc63b2911d}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ACE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ACE_crc32.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ACE_crc_ccitt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ace_wchar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Activation_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Assert.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Asynch_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Params.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_QoS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Atomic_Op.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Auto_Event.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Barrier.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_Repository.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Basic_Stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Basic_Types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Capabilities.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\CDR_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\CDR_Size.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\CDR_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Cleanup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codecs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codeset_IBM1047.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry_db.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Configuration.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Configuration_Import_Export.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Containers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Copy_Disabled.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Countdown_Time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Date_Time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dirent.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dirent_Selector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DLL.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DLL_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dump.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Event.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Event_Handler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Send.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\File_Lock.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Filecache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Flag_Manip.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Framework_Component.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Functor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Functor_String.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Get_Opt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\gethrtime.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Handle_Ops.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Handle_Set.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Hashable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\High_Res_Timer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ICMP_Socket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\INET_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Init_ACE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IO_SAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IOStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IPC_SAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Lib_Find.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Local_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Local_Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Local_Tokens.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Lock.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Backend.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Callback.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_IPC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Record.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Logging_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Malloc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Manual_Event.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Mem_Map.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_SAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Block.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Method_Request.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Action.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Point_Registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Size.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Name_Proxy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Name_Request_Reply.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Naming_Context.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Netlink_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Notification_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Notification_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\NT_Service.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Obchunk.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Object_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Object_Manager_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_Errno.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_errno.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_math.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_poll.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_regex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_signal.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_string.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_strings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_QoS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_Thread_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_TLI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Parse_Node.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\PI_Malloc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Ping_Socket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Pipe.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Priority_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Proactor_Impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process_Semaphore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Profile_Timer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor_Impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Read_Buffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Recyclable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Registry_Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Remote_Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Remote_Tokens.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Rtems_init.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\RW_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sample_History.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sched_Params.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Semaphore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Config.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Gestalt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Object.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Repository.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Object.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sig_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sig_Handler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Signal.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sock_Connect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Stack_Trace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\String_Base_Const.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SUN_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Message.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_y.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Synch_Options.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\System_Time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Task.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Control.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Exit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Hook.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Throughput_Stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Time_Value.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Timeprobe.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Collection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Invariants.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TP_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Trace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TSS_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TTY_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UNIX_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UUID.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\WIN32_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\XML_Svc_Conf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ACE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ACE_export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ace_wchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Activation_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Arg_Shifter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ARGV.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Array_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Array_Map.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Assert.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Params.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_QoS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_Event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_Functor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_IncDec_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Barrier.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_Repository.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Basic_Stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Basic_Types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Bound_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cached_Connect_Strategy_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Caching_Strategies_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Caching_Utility_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Capabilities.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CDR_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CDR_Size.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CDR_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CE_Screen_Output.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\checked_iterator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cleanup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cleanup_Strategies_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codecs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codeset_IBM1047.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codeset_Symbols.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Condition_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-aix-5.x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-all.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-cygwin32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-doxygen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-freebsd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-g++-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-ghs-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-hpux-11.00.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-icc-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-integritySCA.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-linux-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-linux.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-lite.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-lynxos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-iphone-hardware.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-iphone-simulator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-leopard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-panther.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-snowleopard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-tiger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-minimal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-mvs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-netbsd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-openbsd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-openvms.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-pharlap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-posix-nonetworking.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-posix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-neutrino.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-62x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-pre62x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-rtems.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-suncc-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.10.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.11.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.4-g++.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.4-sunc++-4.x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.9.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-tandem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-visualage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-borland.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-cegcc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-dmc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-interix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-mingw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-9.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-10.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-WinCE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Configuration.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Configuration_Import_Export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Containers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Containers_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Copy_Disabled.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CORBA_macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Countdown_Time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Date_Time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Default_Constants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dirent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dirent_Selector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DLL.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DLL_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dump.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dump_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Env_Value_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Event_Handler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Event_Handler_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Send.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\File_Lock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Filecache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Flag_Manip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Framework_Component.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Framework_Component_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Free_List.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Functor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Functor_String.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Functor_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Future.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Future_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Get_Opt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Global_Macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Guard_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Handle_Gobbler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Handle_Ops.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Handle_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hashable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\High_Res_Timer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ICMP_Socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\If_Then_Else.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\INET_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Init_ACE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Intrusive_List.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Intrusive_List_Node.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IO_SAP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\iosfwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IOStream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IOStream_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IPC_SAP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Lib_Find.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Name_Space_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Tokens.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Lock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Lock_Adapter_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LOCK_SOCK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Backend.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Callback.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_IPC.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Priority.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Record.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Logging_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Managed_Object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Manual_Event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Map_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Map_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Mem_Map.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_SAP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Block.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Block_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Method_Request.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Metrics_Cache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Metrics_Cache_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Min_Max.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Module.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Action.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Point_Registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Size.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Name_Proxy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Name_Request_Reply.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Naming_Context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Netlink_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Node.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Notification_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Notification_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\NT_Service.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Barrier.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Condition.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Numeric_Limits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Obchunk.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Object_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Object_Manager_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Obstack.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Obstack_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_aio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_assert.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_byteswap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_complex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_cpio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_dirent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_dlfcn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Errno.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_errno.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fcntl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fenv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_float.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fmtmsg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fnmatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ftw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_glob.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_grp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_iconv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\net\os_if.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\netinet\os_in.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\arpa\os_inet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_intrin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_inttypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_ipc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_iso646.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_kstat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_langinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_libgen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_limits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_loadavg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_local.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_main.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Memory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_mman.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_monetary.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_mqueue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ndbm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_netdb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_nl_types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_errno.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_poll.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_regex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_signal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_strings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pdh.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pdhmsg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_poll.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_pstat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_QoS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_regex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_sched.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_search.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_select.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_setjmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_shm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_signal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_spawn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_stat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_statvfs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdarg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdbool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stddef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_typeinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_strings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stropts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sysctl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sysinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_syslog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_tar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\netinet\os_tcp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_termios.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_tgmath.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Thread_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_timeb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_times.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_TLI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ucontext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_uio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ulimit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_un.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_unistd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_utime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_utmpx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_utsname.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_wait.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_wchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_wctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_wordexp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Pair_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Parse_Node.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\PI_Malloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Ping_Socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Pipe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\post.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\pre.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Priority_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Proactor_Impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process_Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Profile_Timer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RB_Tree.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Token_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Read_Buffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Recyclable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Refcountable_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Registry_Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Remote_Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Remote_Tokens.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reverse_Lock_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RW_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sample_History.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sched_Params.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Select_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Gestalt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Repository.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sig_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sig_Handler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Signal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Singleton.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sock_Connect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SString.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SStringfwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stack_Trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Static_Object_Lock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Strategies.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Strategies_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stream_Modules.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\streams.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\String_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\String_Base_Const.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SUN_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Message.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Param.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Token_Table.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Tokens.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\svc_export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Handler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Synch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Synch_Options.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Synch_Traits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\System_Time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Task.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Task_Ex_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Task_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Test_and_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Control.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Exit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Hook.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Throughput_Stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Time_Value.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timeprobe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timeprobe_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Hash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Hash_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Heap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Heap_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_List.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_List_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queuefwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Wheel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Wheel_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Collection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Invariants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Tokenizer_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TP_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Truncate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TSS_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TSS_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TTY_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Unbounded_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UNIX_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UUID.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Value_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Vector_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Versioned_Namespace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\WIN32_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\XML_Svc_Conf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\dep\ACE_wrappers\ace\ACE.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ace_wchar.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Activation_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ARGV.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Array_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Array_Map.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Params.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_QoS.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Atomic_Op.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_Event.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_Functor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_IncDec_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Barrier.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Basic_Stats.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Basic_Types.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Bound_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Caching_Strategies_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Capabilities.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\CDR_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\CDR_Size.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\CDR_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Cleanup.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Condition_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Configuration.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Containers.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Containers_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Countdown_Time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Date_Time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dirent.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dirent_Selector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dynamic.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Env_Value_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Event.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Event_Handler.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Event_Handler_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Send.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\File_Lock.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Flag_Manip.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Framework_Component.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Functor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Functor_String.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Functor_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Get_Opt.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Guard_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Handle_Gobbler.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Handle_Set.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Hashable.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\High_Res_Timer.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\INET_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Intrusive_List.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Intrusive_List_Node.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\IO_SAP.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\IOStream_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\IPC_SAP.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Local_Tokens.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Lock.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Lock_Adapter_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Log_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Log_Record.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Malloc.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Malloc_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Managed_Object.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Manual_Event.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Map_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Map_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Mem_Map.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_SAP.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Block.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Block_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Metrics_Cache_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Module.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Monitor_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Naming_Context.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Netlink_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Notification_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Notification_Strategy.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\NT_Service.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Obchunk.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Object_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Obstack_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_Errno.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_errno.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_math.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_poll.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_regex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_signal.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_string.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_strings.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_TLI.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Pair_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\PI_Malloc.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Ping_Socket.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Pipe.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Proactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Process.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Process_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Process_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Process_Semaphore.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Profile_Timer.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\RB_Tree.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Read_Buffer.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Recyclable.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Refcountable_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Remote_Tokens.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Reverse_Lock_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\RW_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Sample_History.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Sched_Params.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Semaphore.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Config.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Gestalt.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Object.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Repository.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Types.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Shared_Object.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Sig_Handler.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Signal.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Singleton.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SString.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Stats.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Strategies_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\String_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Message.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Task.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Task_Ex_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Task_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Adapter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Control.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Time_Value.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Timeprobe.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\TLI.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\TLI_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\TLI_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Token.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Token_Collection.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Token_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\TP_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\TSS_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Unbounded_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UNIX_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UUID.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Vector_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\dep\ACE_wrappers\ace\ace.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\dep\ACE_wrappers\README">
-      <Filter>Documentation</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\dep\ACE_wrappers\VERSION">
-      <Filter>Documentation</Filter>
-    </CustomBuild>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/framework.vcxproj.filters b/win/VC100/framework.vcxproj.filters
deleted file mode 100644
index e602d28a1b4..00000000000
--- a/win/VC100/framework.vcxproj.filters
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="GameSystem">
-      <UniqueIdentifier>{88ff74be-7df0-46ec-b63c-398134f75db2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Platform">
-      <UniqueIdentifier>{4e0d3208-1366-4fb0-aa41-00721206ae8f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Policies">
-      <UniqueIdentifier>{8bd727a3-b585-4a69-b50f-dfefdbe08f3e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Utilities">
-      <UniqueIdentifier>{d54e4ec6-0de1-4896-8511-e66cd0cda719}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Utilities\LinkedReference">
-      <UniqueIdentifier>{9e95664c-0f92-4de1-af69-8ee6a1fc908f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Dynamic">
-      <UniqueIdentifier>{d9be4e31-76b9-490c-baf9-072221ad89fa}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\framework\GameSystem\Grid.h">
-      <Filter>GameSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\GameSystem\GridLoader.h">
-      <Filter>GameSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\GameSystem\GridReference.h">
-      <Filter>GameSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\GameSystem\GridRefManager.h">
-      <Filter>GameSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\GameSystem\NGrid.h">
-      <Filter>GameSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainer.h">
-      <Filter>GameSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerFunctions.h">
-      <Filter>GameSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerVisitor.h">
-      <Filter>GameSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Platform\CompilerDefs.h">
-      <Filter>Platform</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Platform\Define.h">
-      <Filter>Platform</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Policies\CreationPolicy.h">
-      <Filter>Policies</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Policies\ObjectLifeTime.h">
-      <Filter>Policies</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Policies\Singleton.h">
-      <Filter>Policies</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Policies\SingletonImp.h">
-      <Filter>Policies</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Policies\ThreadingModel.h">
-      <Filter>Policies</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Utilities\ByteConverter.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Utilities\Callback.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Utilities\EventProcessor.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedList.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Utilities\TypeList.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Utilities\UnorderedMapSet.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\Reference.h">
-      <Filter>Utilities\LinkedReference</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\RefManager.h">
-      <Filter>Utilities\LinkedReference</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Dynamic\FactoryHolder.h">
-      <Filter>Dynamic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\framework\Dynamic\ObjectRegistry.h">
-      <Filter>Dynamic</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\framework\Policies\MemoryManagement.cpp">
-      <Filter>Policies</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\framework\Policies\ObjectLifeTime.cpp">
-      <Filter>Policies</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\framework\Utilities\EventProcessor.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/g3dlite.vcxproj b/win/VC100/g3dlite.vcxproj
deleted file mode 100644
index 7b4b753a2f8..00000000000
--- a/win/VC100/g3dlite.vcxproj
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{8072769E-CF10-48BF-B9E1-12752A5DAC6E}</ProjectGUID>
-    <RootNamespace>sockets</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.lib</TargetExt>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\g3dlite\AABox.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Box.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Crypto.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\format.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Matrix3.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Plane.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\RegistryUtil.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\System.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Triangle.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector3.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector4.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\debugAssert.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\fileutils.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\g3dmath.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\g3dfnmatch.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\prompt.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\stringutils.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Any.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryFormat.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryInput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryOutput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Capsule.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\CollisionDetection.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\CoordinateFrame.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Cylinder.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Line.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\LineSegment.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Log.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Matrix4.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\MemoryManager.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Quat.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Random.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Ray.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\ReferenceCount.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Sphere.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\TextInput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\TextOutput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\UprightFrame.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector2.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\AABox.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Array.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Box.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\CollisionDetection.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\CoordinateFrame.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Crypto.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\debug.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\format.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\g3dmath.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\GCamera.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Line.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Matrix3.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Plane.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\platform.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Quat.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Ray.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\RegistryUtil.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Sphere.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\stringutils.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\System.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Table.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Triangle.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector2.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector2int16.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector3.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector3int16.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector4.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/g3dlite.vcxproj.filters b/win/VC100/g3dlite.vcxproj.filters
deleted file mode 100644
index a7836a99f68..00000000000
--- a/win/VC100/g3dlite.vcxproj.filters
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{1fd8ff6c-4f21-4985-be06-a9082b53b059}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{46c5f23b-da25-4b0d-8e5e-c787c3462b5c}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\AABox.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Array.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Box.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\CollisionDetection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\CoordinateFrame.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Crypto.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\debug.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\format.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\g3dmath.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\GCamera.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Line.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Matrix3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Plane.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\platform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Quat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Ray.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\RegistryUtil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Sphere.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\stringutils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\System.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Table.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Triangle.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector2int16.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector3int16.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\g3dlite\AABox.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Any.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryFormat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryInput.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryOutput.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Box.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Capsule.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\CollisionDetection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\CoordinateFrame.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Crypto.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Cylinder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\debugAssert.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\fileutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\format.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\g3dfnmatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\g3dmath.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Line.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\LineSegment.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Log.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Matrix3.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Matrix4.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\MemoryManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Plane.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\prompt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Quat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Random.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Ray.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\ReferenceCount.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\RegistryUtil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Sphere.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\stringutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\System.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\TextInput.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\TextOutput.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Triangle.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\UprightFrame.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector3.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector4.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/game.vcxproj b/win/VC100/game.vcxproj
deleted file mode 100644
index cb2f006932b..00000000000
--- a/win/VC100/game.vcxproj
+++ /dev/null
@@ -1,685 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{1DC6C4DA-A028-41F3-877D-D5400C594F88}</ProjectGUID>
-    <RootNamespace>game</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">game</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm300 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pchdef.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <ForcedIncludeFiles>pchdef.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/bigobj /Zm300 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pchdef.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <ForcedIncludeFiles>pchdef.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm300 %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pchdef.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <ForcedIncludeFiles>pchdef.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/bigobj /Zm300 %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pchdef.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <ForcedIncludeFiles>pchdef.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\game\AccountMgr.cpp" />
-    <ClCompile Include="..\..\src\game\AchievementMgr.cpp" />
-    <ClCompile Include="..\..\src\game\AggressorAI.cpp" />
-    <ClCompile Include="..\..\src\game\ArenaTeam.cpp" />
-    <ClCompile Include="..\..\src\game\ArenaTeamHandler.cpp" />
-    <ClCompile Include="..\..\src\game\AuctionHouseBot\AuctionHouseBot.cpp" />
-    <ClCompile Include="..\..\src\game\AuctionHouseHandler.cpp" />
-    <ClCompile Include="..\..\src\game\AuctionHouseMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Bag.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundAA.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundAB.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundRB.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundAV.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundBE.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundDS.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundEY.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundHandler.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundIC.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundMgr.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundNA.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundRL.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundRV.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundSA.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGroundWS.cpp" />
-    <ClCompile Include="..\..\src\game\Calendar.cpp" />
-    <ClCompile Include="..\..\src\game\CalendarHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Camera.cpp" />
-    <ClCompile Include="..\..\src\game\Channel.cpp" />
-    <ClCompile Include="..\..\src\game\ChannelHandler.cpp" />
-    <ClCompile Include="..\..\src\game\ChannelMgr.cpp" />
-    <ClCompile Include="..\..\src\game\CharacterDatabaseCleaner.cpp" />
-    <ClCompile Include="..\..\src\game\CharacterHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Chat.cpp" />
-    <ClCompile Include="..\..\src\game\ChatHandler.cpp" />
-    <ClCompile Include="..\..\src\game\CombatHandler.cpp" />
-    <ClCompile Include="..\..\src\game\ConfusedMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\Corpse.cpp" />
-    <ClCompile Include="..\..\src\game\Creature.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureAI.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureAIRegistry.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureAISelector.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureEventAI.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureEventAIMgr.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureLinkingMgr.cpp" />
-    <ClCompile Include="..\..\src\game\DBCStores.cpp" />
-    <ClCompile Include="..\..\src\game\debugcmds.cpp" />
-    <ClCompile Include="..\..\src\game\DuelHandler.cpp" />
-    <ClCompile Include="..\..\src\game\DynamicObject.cpp" />
-    <ClCompile Include="..\..\src\game\FleeingMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\FollowerReference.cpp" />
-    <ClCompile Include="..\..\src\game\GameEventMgr.cpp" />
-    <ClCompile Include="..\..\src\game\GameObject.cpp" />
-    <ClCompile Include="..\..\src\game\GMTicketHandler.cpp" />
-    <ClCompile Include="..\..\src\game\GMTicketMgr.cpp" />
-    <ClCompile Include="..\..\src\game\GossipDef.cpp" />
-    <ClCompile Include="..\..\src\game\GridMap.cpp" />
-    <ClCompile Include="..\..\src\game\GridNotifiers.cpp" />
-    <ClCompile Include="..\..\src\game\GridStates.cpp" />
-    <ClCompile Include="..\..\src\game\Group.cpp" />
-    <ClCompile Include="..\..\src\game\GroupHandler.cpp" />
-    <ClCompile Include="..\..\src\game\GroupReference.cpp" />
-    <ClCompile Include="..\..\src\game\GuardAI.cpp" />
-    <ClCompile Include="..\..\src\game\Guild.cpp" />
-    <ClCompile Include="..\..\src\game\GuildHandler.cpp" />
-    <ClCompile Include="..\..\src\game\GuildMgr.cpp" />
-    <ClCompile Include="..\..\src\game\HomeMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\HostileRefManager.cpp" />
-    <ClCompile Include="..\..\src\game\IdleMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\InstanceData.cpp" />
-    <ClCompile Include="..\..\src\game\Item.cpp" />
-    <ClCompile Include="..\..\src\game\ItemEnchantmentMgr.cpp" />
-    <ClCompile Include="..\..\src\game\ItemHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Level0.cpp" />
-    <ClCompile Include="..\..\src\game\Level1.cpp" />
-    <ClCompile Include="..\..\src\game\Level2.cpp" />
-    <ClCompile Include="..\..\src\game\Level3.cpp" />
-    <ClCompile Include="..\..\src\game\LFGHandler.cpp" />
-    <ClCompile Include="..\..\src\game\LootHandler.cpp" />
-    <ClCompile Include="..\..\src\game\LootMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Mail.cpp" />
-    <ClCompile Include="..\..\src\game\MailHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Map.cpp" />
-    <ClCompile Include="..\..\src\game\MapManager.cpp" />
-    <ClCompile Include="..\..\src\game\MapPersistentStateMgr.cpp" />
-    <ClCompile Include="..\..\src\game\MassMailMgr.cpp" />
-    <ClCompile Include="..\..\src\game\MiscHandler.cpp" />
-    <ClCompile Include="..\..\src\game\MotionMaster.cpp" />
-    <ClCompile Include="..\..\src\game\MoveMap.cpp" />
-    <ClCompile Include="..\..\src\game\MovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\MovementHandler.cpp" />
-    <ClCompile Include="..\..\src\game\movement\MoveSpline.cpp" />
-    <ClCompile Include="..\..\src\game\movement\MoveSplineInit.cpp" />
-    <ClCompile Include="..\..\src\game\movement\packet_builder.cpp" />
-    <ClCompile Include="..\..\src\game\movement\spline.cpp" />
-    <ClCompile Include="..\..\src\game\movement\util.cpp" />
-    <ClCompile Include="..\..\src\game\NPCHandler.cpp" />
-    <ClCompile Include="..\..\src\game\NullCreatureAI.cpp" />
-    <ClCompile Include="..\..\src\game\Object.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectAccessor.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectGridLoader.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectMgr.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectGuid.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectPosSelector.cpp" />
-    <ClCompile Include="..\..\src\game\Opcodes.cpp" />
-    <ClCompile Include="..\..\src\game\PathFinder.cpp" />
-    <ClCompile Include="..\..\src\game\pchdef.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pchdef.h</PrecompiledHeaderFile>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">pchdef.h</PrecompiledHeaderFile>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pchdef.h</PrecompiledHeaderFile>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|X64'">pchdef.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Pet.cpp" />
-    <ClCompile Include="..\..\src\game\PetAI.cpp" />
-    <ClCompile Include="..\..\src\game\PetHandler.cpp" />
-    <ClCompile Include="..\..\src\game\PetitionsHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Player.cpp" />
-    <ClCompile Include="..\..\src\game\PlayerDump.cpp" />
-    <ClCompile Include="..\..\src\game\PointMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\PoolManager.cpp" />
-    <ClCompile Include="..\..\src\game\QueryHandler.cpp" />
-    <ClCompile Include="..\..\src\game\QuestDef.cpp" />
-    <ClCompile Include="..\..\src\game\QuestHandler.cpp" />
-    <ClCompile Include="..\..\src\game\RandomMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\ReactorAI.cpp" />
-    <ClCompile Include="..\..\src\game\ReputationMgr.cpp" />
-    <ClCompile Include="..\..\src\game\ScriptMgr.cpp" />
-    <ClCompile Include="..\..\src\game\SkillDiscovery.cpp" />
-    <ClCompile Include="..\..\src\game\SkillExtraItems.cpp" />
-    <ClCompile Include="..\..\src\game\SkillHandler.cpp" />
-    <ClCompile Include="..\..\src\game\SocialMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Spell.cpp" />
-    <ClCompile Include="..\..\src\game\SpellAuras.cpp" />
-    <ClCompile Include="..\..\src\game\SQLStorages.cpp" />
-    <ClCompile Include="..\..\src\game\UnitAuraProcHandler.cpp" />
-    <ClCompile Include="..\..\src\game\SpellEffects.cpp" />
-    <ClCompile Include="..\..\src\game\SpellHandler.cpp" />
-    <ClCompile Include="..\..\src\game\SpellMgr.cpp" />
-    <ClCompile Include="..\..\src\game\StatSystem.cpp" />
-    <ClCompile Include="..\..\src\game\TargetedMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\TaxiHandler.cpp" />
-    <ClCompile Include="..\..\src\game\TemporarySummon.cpp" />
-    <ClCompile Include="..\..\src\game\ThreatManager.cpp" />
-    <ClCompile Include="..\..\src\game\Totem.cpp" />
-    <ClCompile Include="..\..\src\game\TotemAI.cpp" />
-    <ClCompile Include="..\..\src\game\TradeHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Transports.cpp" />
-    <ClCompile Include="..\..\src\game\Unit.cpp" />
-    <ClCompile Include="..\..\src\game\UpdateData.cpp" />
-    <ClCompile Include="..\..\src\game\Vehicle.cpp" />
-    <ClCompile Include="..\..\src\game\VoiceChatHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WaypointManager.cpp" />
-    <ClCompile Include="..\..\src\game\WaypointMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\Weather.cpp" />
-    <ClCompile Include="..\..\src\game\World.cpp" />
-    <ClCompile Include="..\..\src\game\WorldSession.cpp" />
-    <ClCompile Include="..\..\src\game\WorldSocket.cpp" />
-    <ClCompile Include="..\..\src\game\WorldSocketMgr.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\BIH.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\MapTree.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\ModelInstance.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\TileAssembler.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\VMapFactory.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\VMapManager2.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\WorldModel.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\game\AccountMgr.h" />
-    <ClInclude Include="..\..\src\game\AchievementMgr.h" />
-    <ClInclude Include="..\..\src\game\AggressorAI.h" />
-    <ClInclude Include="..\..\src\game\ArenaTeam.h" />
-    <ClInclude Include="..\..\src\game\AuctionHouseBot\AuctionHouseBot.h" />
-    <ClInclude Include="..\..\src\game\AuctionHouseMgr.h" />
-    <ClInclude Include="..\..\src\game\Bag.h" />
-    <ClInclude Include="..\..\src\game\BattleGround.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundAA.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundAB.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundRB.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundAV.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundBE.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundDS.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundEY.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundIC.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundMgr.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundNA.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundRL.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundRV.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundSA.h" />
-    <ClInclude Include="..\..\src\game\BattleGroundWS.h" />
-    <ClInclude Include="..\..\src\game\Calendar.h" />
-    <ClInclude Include="..\..\src\game\Camera.h" />
-    <ClInclude Include="..\..\src\game\Cell.h" />
-    <ClInclude Include="..\..\src\game\CellImpl.h" />
-    <ClInclude Include="..\..\src\game\Channel.h" />
-    <ClInclude Include="..\..\src\game\ChannelMgr.h" />
-    <ClInclude Include="..\..\src\game\CharacterDatabaseCleaner.h" />
-    <ClInclude Include="..\..\src\game\Chat.h" />
-    <ClInclude Include="..\..\src\game\ConfusedMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\Corpse.h" />
-    <ClInclude Include="..\..\src\game\Creature.h" />
-    <ClInclude Include="..\..\src\game\CreatureAI.h" />
-    <ClInclude Include="..\..\src\game\CreatureAIImpl.h" />
-    <ClInclude Include="..\..\src\game\CreatureAIRegistry.h" />
-    <ClInclude Include="..\..\src\game\CreatureAISelector.h" />
-    <ClInclude Include="..\..\src\game\CreatureEventAI.h" />
-    <ClInclude Include="..\..\src\game\CreatureEventAIMgr.h" />
-    <ClInclude Include="..\..\src\game\CreatureLinkingMgr.h" />
-    <ClInclude Include="..\..\src\game\DBCEnums.h" />
-    <ClInclude Include="..\..\src\game\DBCfmt.h" />
-    <ClInclude Include="..\..\src\game\DBCStores.h" />
-    <ClInclude Include="..\..\src\game\DBCStructure.h" />
-    <ClInclude Include="..\..\src\game\DynamicObject.h" />
-    <ClInclude Include="..\..\src\game\FleeingMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\FollowerReference.h" />
-    <ClInclude Include="..\..\src\game\FollowerRefManager.h" />
-    <ClInclude Include="..\..\src\game\Formulas.h" />
-    <ClInclude Include="..\..\src\game\GameEventMgr.h" />
-    <ClInclude Include="..\..\src\game\GameObject.h" />
-    <ClInclude Include="..\..\src\game\GMTicketMgr.h" />
-    <ClInclude Include="..\..\src\game\GossipDef.h" />
-    <ClInclude Include="..\..\src\game\GridDefines.h" />
-    <ClInclude Include="..\..\src\game\GridMap.h" />
-    <ClInclude Include="..\..\src\game\GridNotifiers.h" />
-    <ClInclude Include="..\..\src\game\GridNotifiersImpl.h" />
-    <ClInclude Include="..\..\src\game\GridStates.h" />
-    <ClInclude Include="..\..\src\game\Group.h" />
-    <ClInclude Include="..\..\src\game\GroupReference.h" />
-    <ClInclude Include="..\..\src\game\GroupRefManager.h" />
-    <ClInclude Include="..\..\src\game\GuardAI.h" />
-    <ClInclude Include="..\..\src\game\Guild.h" />
-    <ClInclude Include="..\..\src\game\GuildMgr.h" />
-    <ClInclude Include="..\..\src\game\HomeMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\HostileRefManager.h" />
-    <ClInclude Include="..\..\src\game\IdleMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\InstanceData.h" />
-    <ClInclude Include="..\..\src\game\Item.h" />
-    <ClInclude Include="..\..\src\game\ItemEnchantmentMgr.h" />
-    <ClInclude Include="..\..\src\game\ItemPrototype.h" />
-    <ClInclude Include="..\..\src\game\Language.h" />
-    <ClInclude Include="..\..\src\game\LootMgr.h" />
-    <ClInclude Include="..\..\src\game\Mail.h" />
-    <ClInclude Include="..\..\src\game\Map.h" />
-    <ClInclude Include="..\..\src\game\MapManager.h" />
-    <ClInclude Include="..\..\src\game\MapPersistentStateMgr.h" />
-    <ClInclude Include="..\..\src\game\MapReference.h" />
-    <ClInclude Include="..\..\src\game\MapRefManager.h" />
-    <ClInclude Include="..\..\src\game\MassMailMgr.h" />
-    <ClInclude Include="..\..\src\game\MotionMaster.h" />
-    <ClInclude Include="..\..\src\game\MoveMap.h" />
-    <ClInclude Include="..\..\src\game\MoveMapSharedDefines.h" />
-    <ClInclude Include="..\..\src\game\MovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSpline.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineFlag.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineInit.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineInitArgs.h" />
-    <ClInclude Include="..\..\src\game\movement\packet_builder.h" />
-    <ClInclude Include="..\..\src\game\movement\spline.h" />
-    <ClInclude Include="..\..\src\game\movement\spline.impl.h" />
-    <ClInclude Include="..\..\src\game\movement\typedefs.h" />
-    <ClInclude Include="..\..\src\game\NPCHandler.h" />
-    <ClInclude Include="..\..\src\game\NullCreatureAI.h" />
-    <ClInclude Include="..\..\src\game\Object.h" />
-    <ClInclude Include="..\..\src\game\ObjectAccessor.h" />
-    <ClInclude Include="..\..\src\game\ObjectGuid.h" />
-    <ClInclude Include="..\..\src\game\ObjectGridLoader.h" />
-    <ClInclude Include="..\..\src\game\ObjectMgr.h" />
-    <ClInclude Include="..\..\src\game\ObjectPosSelector.h" />
-    <ClInclude Include="..\..\src\game\Opcodes.h" />
-    <ClInclude Include="..\..\src\game\Path.h" />
-    <ClInclude Include="..\..\src\game\PathFinder.h" />
-    <ClInclude Include="..\..\src\game\pchdef.h" />
-    <ClInclude Include="..\..\src\game\Pet.h" />
-    <ClInclude Include="..\..\src\game\PetAI.h" />
-    <ClInclude Include="..\..\src\game\Player.h" />
-    <ClInclude Include="..\..\src\game\PlayerDump.h" />
-    <ClInclude Include="..\..\src\game\PointMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\PoolManager.h" />
-    <ClInclude Include="..\..\src\game\QuestDef.h" />
-    <ClInclude Include="..\..\src\game\RandomMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\ReactorAI.h" />
-    <ClInclude Include="..\..\src\game\ReputationMgr.h" />
-    <ClInclude Include="..\..\src\game\ScriptMgr.h" />
-    <ClInclude Include="..\..\src\game\SharedDefines.h" />
-    <ClInclude Include="..\..\src\game\SkillDiscovery.h" />
-    <ClInclude Include="..\..\src\game\SkillExtraItems.h" />
-    <ClInclude Include="..\..\src\game\SocialMgr.h" />
-    <ClInclude Include="..\..\src\game\Spell.h" />
-    <ClInclude Include="..\..\src\game\SpellAuraDefines.h" />
-    <ClInclude Include="..\..\src\game\SpellAuras.h" />
-    <ClInclude Include="..\..\src\game\SpellMgr.h" />
-    <ClInclude Include="..\..\src\game\SQLStorages.h" />
-    <ClInclude Include="..\..\src\game\TargetedMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\TemporarySummon.h" />
-    <ClInclude Include="..\..\src\game\ThreatManager.h" />
-    <ClInclude Include="..\..\src\game\Totem.h" />
-    <ClInclude Include="..\..\src\game\TotemAI.h" />
-    <ClInclude Include="..\..\src\game\Transports.h" />
-    <ClInclude Include="..\..\src\game\Unit.h" />
-    <ClInclude Include="..\..\src\game\UnitEvents.h" />
-    <ClInclude Include="..\..\src\game\UpdateData.h" />
-    <ClInclude Include="..\..\src\game\UpdateFields.h" />
-    <ClInclude Include="..\..\src\game\UpdateMask.h" />
-    <ClInclude Include="..\..\src\game\Vehicle.h" />
-    <ClInclude Include="..\..\src\game\WaypointManager.h" />
-    <ClInclude Include="..\..\src\game\WaypointMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\Weather.h" />
-    <ClInclude Include="..\..\src\game\World.h" />
-    <ClInclude Include="..\..\src\game\WorldSession.h" />
-    <ClInclude Include="..\..\src\game\WorldSocket.h" />
-    <ClInclude Include="..\..\src\game\WorldSocketMgr.h" />
-    <ClInclude Include="..\..\src\game\vmap\BIH.h" />
-    <ClInclude Include="..\..\src\game\vmap\IVMapManager.h" />
-    <ClInclude Include="..\..\src\game\vmap\MapTree.h" />
-    <ClInclude Include="..\..\src\game\vmap\ModelInstance.h" />
-    <ClInclude Include="..\..\src\game\vmap\TileAssembler.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapDefinitions.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapFactory.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapManager2.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapTools.h" />
-    <ClInclude Include="..\..\src\game\vmap\WorldModel.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dep\recastnavigation\Detour\win\VC100\Detour.vcxproj">
-      <Project>{72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="shared.vcxproj">
-      <Project>{90297c34-f231-4df4-848e-a74bcc0e40ed}</Project>
-    </ProjectReference>
-    <ProjectReference Include="g3dlite.vcxproj">
-      <Project>{8072769E-CF10-48BF-B9E1-12752A5DAC6E}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/game.vcxproj.filters b/win/VC100/game.vcxproj.filters
deleted file mode 100644
index dd1cf6d6712..00000000000
--- a/win/VC100/game.vcxproj.filters
+++ /dev/null
@@ -1,974 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="World/Handlers">
-      <UniqueIdentifier>{d75ae330-80de-4aaf-8274-ae85f49dbcd9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Motion generators">
-      <UniqueIdentifier>{7ade1743-efdc-47a9-86a5-77ab3ad233a5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Object">
-      <UniqueIdentifier>{1ea64f0d-ee7e-492e-8516-2f2c5be80a2a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Server">
-      <UniqueIdentifier>{af0d7b92-aa88-4870-bf29-5f9856a954d5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Chat Commands">
-      <UniqueIdentifier>{4087621b-fd53-4335-933f-ab29141b4c9e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tool">
-      <UniqueIdentifier>{efeae208-8789-4329-889a-b50baa18c19a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="References">
-      <UniqueIdentifier>{64bb42b8-e7ba-4247-b337-492f644daeeb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="AhBot">
-      <UniqueIdentifier>{481ad376-5cba-439d-af8c-2ef73de2ed8b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="vmaps">
-      <UniqueIdentifier>{948284d3-9d89-4609-8cdd-28a213edb53e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Movement">
-      <UniqueIdentifier>{0ac140f9-89c1-4830-b673-514c5e8b4d37}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\game\AccountMgr.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\AchievementMgr.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ArenaTeamHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\AuctionHouseHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGround.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundAA.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundAB.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundAV.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundBE.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundDS.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundEY.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundIC.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundMgr.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundNA.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundRB.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundRL.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundRV.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundSA.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\BattleGroundWS.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\CalendarHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Channel.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ChannelHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ChannelMgr.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\CharacterHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Chat.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ChatHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\CombatHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\DuelHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GameEventMgr.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GMTicketHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GossipDef.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GridMap.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GridNotifiers.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GridStates.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Group.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GroupHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GuildHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GuildMgr.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\InstanceData.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ItemHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\LFGHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\LootHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Mail.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\MailHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Map.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\MapManager.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\MapPersistentStateMgr.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\MassMailMgr.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\MiscHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\MovementHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\NPCHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ObjectGridLoader.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\PetHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\PetitionsHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\PoolManager.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\QueryHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\QuestDef.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\QuestHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ScriptMgr.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\SkillDiscovery.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\SkillExtraItems.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\SkillHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Spell.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\SpellAuras.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\SpellEffects.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\SpellHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\TaxiHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\TradeHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Transports.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\UpdateData.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\VoiceChatHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\WaypointManager.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Weather.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\World.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ConfusedMovementGenerator.cpp">
-      <Filter>Motion generators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\FleeingMovementGenerator.cpp">
-      <Filter>Motion generators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\HomeMovementGenerator.cpp">
-      <Filter>Motion generators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\IdleMovementGenerator.cpp">
-      <Filter>Motion generators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\MotionMaster.cpp">
-      <Filter>Motion generators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\MovementGenerator.cpp">
-      <Filter>Motion generators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\PointMovementGenerator.cpp">
-      <Filter>Motion generators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\RandomMovementGenerator.cpp">
-      <Filter>Motion generators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\TargetedMovementGenerator.cpp">
-      <Filter>Motion generators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\WaypointMovementGenerator.cpp">
-      <Filter>Motion generators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\AggressorAI.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ArenaTeam.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\AuctionHouseMgr.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Bag.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Calendar.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Corpse.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Creature.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\CreatureAI.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\CreatureAIRegistry.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\CreatureAISelector.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\CreatureEventAI.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\CreatureEventAIMgr.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\DynamicObject.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GameObject.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GMTicketMgr.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GuardAI.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Guild.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Item.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ItemEnchantmentMgr.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\LootMgr.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\NullCreatureAI.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Object.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ObjectAccessor.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ObjectGuid.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ObjectMgr.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ObjectPosSelector.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Pet.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\PetAI.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Player.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ReactorAI.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ReputationMgr.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\SocialMgr.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\SpellMgr.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\StatSystem.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\TemporarySummon.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Totem.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\TotemAI.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Unit.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Vehicle.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\DBCStores.cpp">
-      <Filter>Server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Opcodes.cpp">
-      <Filter>Server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\SQLStorages.cpp">
-      <Filter>Server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\WorldSession.cpp">
-      <Filter>Server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\WorldSocket.cpp">
-      <Filter>Server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\WorldSocketMgr.cpp">
-      <Filter>Server</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\debugcmds.cpp">
-      <Filter>Chat Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Level0.cpp">
-      <Filter>Chat Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Level1.cpp">
-      <Filter>Chat Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Level2.cpp">
-      <Filter>Chat Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Level3.cpp">
-      <Filter>Chat Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\PlayerDump.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\FollowerReference.cpp">
-      <Filter>References</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\GroupReference.cpp">
-      <Filter>References</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\HostileRefManager.cpp">
-      <Filter>References</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\ThreatManager.cpp">
-      <Filter>References</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\pchdef.cpp" />
-    <ClCompile Include="..\..\src\game\CharacterDatabaseCleaner.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\PathFinder.cpp">
-      <Filter>Motion generators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\MoveMap.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Camera.cpp">
-      <Filter>Object</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\UnitAuraProcHandler.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\AuctionHouseBot\AuctionHouseBot.cpp">
-      <Filter>AhBot</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\vmap\BIH.cpp">
-      <Filter>vmaps</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\vmap\MapTree.cpp">
-      <Filter>vmaps</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\vmap\ModelInstance.cpp">
-      <Filter>vmaps</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\vmap\TileAssembler.cpp">
-      <Filter>vmaps</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\vmap\VMapFactory.cpp">
-      <Filter>vmaps</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\vmap\VMapManager2.cpp">
-      <Filter>vmaps</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\vmap\WorldModel.cpp">
-      <Filter>vmaps</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\movement\MoveSplineInit.cpp">
-      <Filter>Movement</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\movement\packet_builder.cpp">
-      <Filter>Movement</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\movement\spline.cpp">
-      <Filter>Movement</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\movement\util.cpp">
-      <Filter>Movement</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\movement\MoveSpline.cpp">
-      <Filter>Movement</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\CreatureLinkingMgr.cpp">
-      <Filter>World/Handlers</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\game\AccountMgr.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\AchievementMgr.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGround.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundAA.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundAB.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundAV.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundBE.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundDS.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundEY.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundIC.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundMgr.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundNA.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundRB.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundRL.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundRV.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundSA.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\BattleGroundWS.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Cell.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\CellImpl.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Channel.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ChannelMgr.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Chat.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GameEventMgr.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GossipDef.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GridDefines.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GridMap.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GridNotifiers.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GridNotifiersImpl.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GridStates.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Group.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GuildMgr.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\InstanceData.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Mail.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Map.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\MapManager.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\MapPersistentStateMgr.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\MassMailMgr.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\NPCHandler.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ObjectGridLoader.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Path.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\PoolManager.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\QuestDef.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ScriptMgr.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\SkillDiscovery.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\SkillExtraItems.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Spell.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\SpellAuraDefines.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\SpellAuras.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Transports.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\UpdateData.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\WaypointManager.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Weather.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\World.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ConfusedMovementGenerator.h">
-      <Filter>Motion generators</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\FleeingMovementGenerator.h">
-      <Filter>Motion generators</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\HomeMovementGenerator.h">
-      <Filter>Motion generators</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\IdleMovementGenerator.h">
-      <Filter>Motion generators</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\MotionMaster.h">
-      <Filter>Motion generators</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\MovementGenerator.h">
-      <Filter>Motion generators</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\PointMovementGenerator.h">
-      <Filter>Motion generators</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\RandomMovementGenerator.h">
-      <Filter>Motion generators</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\TargetedMovementGenerator.h">
-      <Filter>Motion generators</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\WaypointMovementGenerator.h">
-      <Filter>Motion generators</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\AggressorAI.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ArenaTeam.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\AuctionHouseMgr.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Bag.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Calendar.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Corpse.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Creature.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\CreatureAI.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\CreatureAIImpl.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\CreatureAIRegistry.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\CreatureAISelector.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\CreatureEventAI.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\CreatureEventAIMgr.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\DynamicObject.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Formulas.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GameObject.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GMTicketMgr.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GuardAI.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Guild.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Item.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ItemEnchantmentMgr.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ItemPrototype.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\LootMgr.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\NullCreatureAI.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Object.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ObjectAccessor.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ObjectGuid.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ObjectMgr.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ObjectPosSelector.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Pet.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\PetAI.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Player.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ReactorAI.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ReputationMgr.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\SocialMgr.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\SpellMgr.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\TemporarySummon.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Totem.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\TotemAI.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Unit.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\UnitEvents.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\UpdateFields.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\UpdateMask.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Vehicle.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\DBCEnums.h">
-      <Filter>Server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\DBCfmt.h">
-      <Filter>Server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\DBCStores.h">
-      <Filter>Server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\DBCStructure.h">
-      <Filter>Server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Opcodes.h">
-      <Filter>Server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\SharedDefines.h">
-      <Filter>Server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\SQLStorages.h">
-      <Filter>Server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\WorldSession.h">
-      <Filter>Server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\WorldSocket.h">
-      <Filter>Server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\WorldSocketMgr.h">
-      <Filter>Server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Language.h">
-      <Filter>Tool</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\PlayerDump.h">
-      <Filter>Tool</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\FollowerReference.h">
-      <Filter>References</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\FollowerRefManager.h">
-      <Filter>References</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GroupReference.h">
-      <Filter>References</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\GroupRefManager.h">
-      <Filter>References</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\HostileRefManager.h">
-      <Filter>References</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\MapReference.h">
-      <Filter>References</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\MapRefManager.h">
-      <Filter>References</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\ThreatManager.h">
-      <Filter>References</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\pchdef.h" />
-    <ClInclude Include="..\..\src\game\CharacterDatabaseCleaner.h">
-      <Filter>Tool</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\PathFinder.h">
-      <Filter>Motion generators</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\Camera.h">
-      <Filter>Object</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\MoveMap.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\MoveMapSharedDefines.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\AuctionHouseBot\AuctionHouseBot.h">
-      <Filter>AhBot</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\vmap\BIH.h">
-      <Filter>vmaps</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\vmap\IVMapManager.h">
-      <Filter>vmaps</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\vmap\MapTree.h">
-      <Filter>vmaps</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\vmap\ModelInstance.h">
-      <Filter>vmaps</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\vmap\TileAssembler.h">
-      <Filter>vmaps</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\vmap\VMapDefinitions.h">
-      <Filter>vmaps</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\vmap\VMapFactory.h">
-      <Filter>vmaps</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\vmap\VMapManager2.h">
-      <Filter>vmaps</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\vmap\VMapTools.h">
-      <Filter>vmaps</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\vmap\WorldModel.h">
-      <Filter>vmaps</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\movement\MoveSpline.h">
-      <Filter>Movement</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\movement\MoveSplineFlag.h">
-      <Filter>Movement</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\movement\MoveSplineInit.h">
-      <Filter>Movement</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\movement\MoveSplineInitArgs.h">
-      <Filter>Movement</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\movement\packet_builder.h">
-      <Filter>Movement</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\movement\spline.h">
-      <Filter>Movement</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\movement\spline.impl.h">
-      <Filter>Movement</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\movement\typedefs.h">
-      <Filter>Movement</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\game\CreatureLinkingMgr.h">
-      <Filter>World/Handlers</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/mangosd.vcxproj.filters b/win/VC100/mangosd.vcxproj.filters
deleted file mode 100644
index d9bffe621cd..00000000000
--- a/win/VC100/mangosd.vcxproj.filters
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="doc">
-      <UniqueIdentifier>{bd80d2f0-aa7d-498e-b4f7-fca7f5bf0599}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\AUTHORS">
-      <Filter>doc</Filter>
-    </None>
-    <None Include="..\..\ChangeLog">
-      <Filter>doc</Filter>
-    </None>
-    <None Include="..\..\COPYING">
-      <Filter>doc</Filter>
-    </None>
-    <None Include="..\..\INSTALL">
-      <Filter>doc</Filter>
-    </None>
-    <None Include="..\..\NEWS">
-      <Filter>doc</Filter>
-    </None>
-    <None Include="..\..\README">
-      <Filter>doc</Filter>
-    </None>
-    <None Include="..\..\THANKS">
-      <Filter>doc</Filter>
-    </None>
-    <None Include="..\..\WARNING">
-      <Filter>doc</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\mangosd\CliRunnable.cpp" />
-    <ClCompile Include="..\..\src\mangosd\Main.cpp" />
-    <ClCompile Include="..\..\src\mangosd\MaNGOSsoap.cpp" />
-    <ClCompile Include="..\..\src\mangosd\Master.cpp" />
-    <ClCompile Include="..\..\src\mangosd\RASocket.cpp" />
-    <ClCompile Include="..\..\src\mangosd\soapC.cpp" />
-    <ClCompile Include="..\..\src\mangosd\soapServer.cpp" />
-    <ClCompile Include="..\..\dep\src\gsoap\stdsoap2.cpp" />
-    <ClCompile Include="..\..\src\shared\WheatyExceptionReport.cpp" />
-    <ClCompile Include="..\..\src\mangosd\WorldRunnable.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\mangosd\CliRunnable.h" />
-    <ClInclude Include="..\..\src\mangosd\MaNGOSsoap.h" />
-    <ClInclude Include="..\..\src\mangosd\Master.h" />
-    <ClInclude Include="..\..\src\mangosd\RASocket.h" />
-    <ClInclude Include="..\..\src\mangosd\soapH.h" />
-    <ClInclude Include="..\..\src\mangosd\soapStub.h" />
-    <ClInclude Include="..\..\dep\include\gsoap\stdsoap2.h" />
-    <ClInclude Include="..\..\src\shared\WheatyExceptionReport.h" />
-    <ClInclude Include="..\..\src\mangosd\WorldRunnable.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\mangosd\mangosd.rc" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/shared.vcxproj.filters b/win/VC100/shared.vcxproj.filters
deleted file mode 100644
index f95c617c74b..00000000000
--- a/win/VC100/shared.vcxproj.filters
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Database">
-      <UniqueIdentifier>{c8fcac37-3e33-4a88-b9b3-a322b7dfe5bd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Database\DataStores">
-      <UniqueIdentifier>{809f010b-4e16-4925-81a1-e0778f06f028}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Log">
-      <UniqueIdentifier>{97ba4623-a513-4ad4-b769-7abcff4b6641}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Util">
-      <UniqueIdentifier>{9c8bfd20-3dca-44b6-8d3d-fd5925b39914}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Config">
-      <UniqueIdentifier>{adb98dec-d22a-40b3-84be-51eaf2974a15}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Auth">
-      <UniqueIdentifier>{e35fd108-bd39-46ae-83f9-09cf1ebf4ea8}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\shared\Database\Database.cpp">
-      <Filter>Database</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Database\DatabaseMysql.cpp">
-      <Filter>Database</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Database\Field.cpp">
-      <Filter>Database</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Database\QueryResultMysql.cpp">
-      <Filter>Database</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Database\SqlDelayThread.cpp">
-      <Filter>Database</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Database\SqlOperations.cpp">
-      <Filter>Database</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Database\SQLStorage.cpp">
-      <Filter>Database</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Database\DBCFileLoader.cpp">
-      <Filter>Database\DataStores</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Log.cpp">
-      <Filter>Log</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\ProgressBar.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Util.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Config\Config.cpp">
-      <Filter>Config</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Auth\AuthCrypt.cpp">
-      <Filter>Auth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Auth\BigNumber.cpp">
-      <Filter>Auth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Auth\HMACSHA1.cpp">
-      <Filter>Auth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Auth\md5.c">
-      <Filter>Auth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Auth\SARC4.cpp">
-      <Filter>Auth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Auth\Sha1.cpp">
-      <Filter>Auth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\shared\Common.cpp" />
-    <ClCompile Include="..\..\src\shared\ServiceWin32.cpp" />
-    <ClCompile Include="..\..\src\shared\Threading.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlPreparedStatement.cpp">
-      <Filter>Database</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\shared\Database\Database.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\DatabaseEnv.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\DatabaseImpl.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\DatabaseMysql.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\Field.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\MySQLDelayThread.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\QueryResult.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\QueryResultMysql.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\SqlDelayThread.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\SqlOperations.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\SQLStorage.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\SQLStorageImpl.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\DBCFileLoader.h">
-      <Filter>Database\DataStores</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Database\DBCStore.h">
-      <Filter>Database\DataStores</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Log.h">
-      <Filter>Log</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\ByteBuffer.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Errors.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\include\mersennetwister\MersenneTwister.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\ProgressBar.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Timer.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Util.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\WorldPacket.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Config\Config.h">
-      <Filter>Config</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Auth\AuthCrypt.h">
-      <Filter>Auth</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Auth\BigNumber.h">
-      <Filter>Auth</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Auth\HMACSHA1.h">
-      <Filter>Auth</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Auth\md5.h">
-      <Filter>Auth</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Auth\SARC4.h">
-      <Filter>Auth</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Auth\Sha1.h">
-      <Filter>Auth</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\shared\Common.h" />
-    <ClInclude Include="..\..\src\shared\LockedQueue.h" />
-    <ClInclude Include="..\..\src\shared\revision_nr.h" />
-    <ClInclude Include="..\..\src\shared\revision_sql.h" />
-    <ClInclude Include="..\..\src\shared\ServiceWin32.h" />
-    <ClInclude Include="..\..\src\shared\Threading.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlPreparedStatement.h">
-      <Filter>Database</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\src\shared\revision.h" />
-    <CustomBuild Include="..\..\src\shared\SystemConfig.h.in" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/tbb.vcxproj b/win/VC100/tbb.vcxproj
deleted file mode 100644
index bafaca65d5d..00000000000
--- a/win/VC100/tbb.vcxproj
+++ /dev/null
@@ -1,480 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{F62787DD-1327-448B-9818-030062BCFAA5}</ProjectGUID>
-    <RootNamespace>tbb</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">tbb_debug</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">tbb_debug</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">tbb</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">tbb</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\dep\lib\$(Platform)_debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">tbb_debug</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\dep\lib\$(Platform)_debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">tbb_debug</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ShowIncludes>false</ShowIncludes>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /c /MD /O2 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /Oy- /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions> /c /MD /O2 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ShowIncludes>false</ShowIncludes>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <MASM Include="..\..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/coff /Zi</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">/coff /Zi</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|X64'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">/coff /Zi</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">/coff /Zi</AdditionalOptions>
-    </MASM>
-    <CustomBuild Include="..\..\dep\tbb\src\tbb\intel64-masm\atomic_support.asm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">building atomic_support.obj</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">building atomic_support.obj</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj"  /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">building atomic_support.obj</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
-    </CustomBuild>
-    <MASM Include="..\..\dep\tbb\src\tbb\ia32-masm\lock_byte.asm">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/coff /Zi</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">/coff /Zi</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|X64'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">/coff /Zi</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">/coff /Zi</AdditionalOptions>
-    </MASM>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\dep\tbb\src\tbb\win32-tbb-export.def">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /nologo /TC /EP ../../dep/tbb/src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\tbb__$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">cl /nologo /TC /EP ../../src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">$(IntDir)tbb.def;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /nologo /TC /EP ../../dep/tbb/src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\tbb__$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|X64'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">cl /nologo /TC /EP ../../src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">$(IntDir)tbb.def;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">cl /nologo /TC /EP ../../dep/tbb/src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\tbb__$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">cl /nologo /TC /EP ../../src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">$(IntDir)tbb.def;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\dep\tbb\src\tbb\win64-tbb-export.def">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)tbb.def;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">cl /nologo /TC /EP ../../dep/tbb/src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)tbb.def;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">cl /nologo /TC /EP ../../dep/tbb/src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">$(IntDir)tbb.def;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">generating tbb.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">cl /nologo /TC /EP ../../dep/tbb/src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)tbb.def
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\dep\tbb\src\tbb\tbb_resource.rc">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|X64'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'">..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\tbb\src\old\concurrent_queue_v2.h" />
-    <ClInclude Include="..\..\dep\tbb\src\old\concurrent_vector_v2.h" />
-    <ClInclude Include="..\..\dep\tbb\src\old\spin_rw_mutex_v2.h" />
-    <ClInclude Include="..\..\dep\tbb\src\tbb\dynamic_link.h" />
-    <ClInclude Include="..\..\dep\tbb\src\tbb\gate.h" />
-    <ClInclude Include="..\..\dep\tbb\src\tbb\itt_notify.h" />
-    <ClInclude Include="..\..\dep\tbb\src\tbb\tbb_assert_impl.h" />
-    <ClInclude Include="..\..\dep\tbb\src\tbb\tbb_misc.h" />
-    <ClInclude Include="..\..\dep\tbb\src\tbb\tbb_version.h" />
-    <ClInclude Include="..\..\include\tbb\aligned_space.h" />
-    <ClInclude Include="..\..\include\tbb\atomic.h" />
-    <ClInclude Include="..\..\include\tbb\blocked_range.h" />
-    <ClInclude Include="..\..\include\tbb\blocked_range2d.h" />
-    <ClInclude Include="..\..\include\tbb\blocked_range3d.h" />
-    <ClInclude Include="..\..\include\tbb\cache_aligned_allocator.h" />
-    <ClInclude Include="..\..\include\tbb\concurrent_hash_map.h" />
-    <ClInclude Include="..\..\include\tbb\concurrent_queue.h" />
-    <ClInclude Include="..\..\include\tbb\concurrent_vector.h" />
-    <ClInclude Include="..\..\include\tbb\enumerable_thread_specific.h" />
-    <ClInclude Include="..\..\include\tbb\machine\ibm_aix51.h" />
-    <ClInclude Include="..\..\include\tbb\machine\linux_common.h" />
-    <ClInclude Include="..\..\include\tbb\machine\linux_ia32.h" />
-    <ClInclude Include="..\..\include\tbb\machine\linux_ia64.h" />
-    <ClInclude Include="..\..\include\tbb\machine\linux_intel64.h" />
-    <ClInclude Include="..\..\include\tbb\machine\mac_ppc.h" />
-    <ClInclude Include="..\..\include\tbb\machine\windows_ia32.h" />
-    <ClInclude Include="..\..\include\tbb\machine\windows_intel64.h" />
-    <ClInclude Include="..\..\include\tbb\mutex.h" />
-    <ClInclude Include="..\..\include\tbb\null_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\null_rw_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_do.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_for.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_reduce.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_scan.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_sort.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_while.h" />
-    <ClInclude Include="..\..\include\tbb\partitioner.h" />
-    <ClInclude Include="..\..\include\tbb\pipeline.h" />
-    <ClInclude Include="..\..\include\tbb\queuing_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\queuing_rw_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\recursive_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\scalable_allocator.h" />
-    <ClInclude Include="..\..\include\tbb\spin_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\spin_rw_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\task.h" />
-    <ClInclude Include="..\..\include\tbb\task_scheduler_init.h" />
-    <ClInclude Include="..\..\include\tbb\task_scheduler_observer.h" />
-    <ClInclude Include="..\..\include\tbb\tbbmalloc_proxy.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_allocator.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_exception.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_machine.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_profiling.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_stddef.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_thread.h" />
-    <ClInclude Include="..\..\include\tbb\tick_count.h" />
-    <ClInclude Include="..\..\include\tbb\_tbb_windef.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\tbb\src\old\concurrent_queue_v2.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\old\concurrent_vector_v2.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\old\spin_rw_mutex_v2.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\rml\client\rml_tbb.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\cache_aligned_allocator.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\concurrent_hash_map.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\concurrent_queue.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\concurrent_vector.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\dynamic_link.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\itt_notify.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\itt_notify_proxy.c" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\mutex.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\pipeline.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\private_server.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\queuing_mutex.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\queuing_rw_mutex.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\recursive_mutex.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\spin_mutex.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\spin_rw_mutex.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\task.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\tbb_misc.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\tbb_thread.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/tbb.vcxproj.filters b/win/VC100/tbb.vcxproj.filters
deleted file mode 100644
index 582b15d0d36..00000000000
--- a/win/VC100/tbb.vcxproj.filters
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="..\..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm">
-      <Filter>Source Files</Filter>
-    </MASM>
-    <MASM Include="..\..\dep\tbb\src\tbb\ia32-masm\lock_byte.asm">
-      <Filter>Source Files</Filter>
-    </MASM>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\cache_aligned_allocator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\concurrent_hash_map.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\concurrent_queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\old\concurrent_queue_v2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\concurrent_vector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\old\concurrent_vector_v2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\dynamic_link.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\itt_notify.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\itt_notify_proxy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\pipeline.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\private_server.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\queuing_mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\queuing_rw_mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\recursive_mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\rml\client\rml_tbb.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\spin_mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\spin_rw_mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\old\spin_rw_mutex_v2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\task.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\tbb_misc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\tbb_thread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\tbb\_tbb_windef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\aligned_space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\atomic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\blocked_range.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\blocked_range2d.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\blocked_range3d.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\cache_aligned_allocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\concurrent_hash_map.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\concurrent_queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\old\concurrent_queue_v2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\concurrent_vector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\old\concurrent_vector_v2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\tbb\dynamic_link.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\enumerable_thread_specific.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\tbb\gate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\machine\ibm_aix51.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\tbb\itt_notify.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\machine\linux_common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\machine\linux_ia32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\machine\linux_ia64.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\machine\linux_intel64.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\machine\mac_ppc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\null_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\null_rw_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_do.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_for.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_reduce.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_scan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_sort.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_while.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\partitioner.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\pipeline.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\queuing_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\queuing_rw_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\recursive_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\scalable_allocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\spin_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\spin_rw_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\old\spin_rw_mutex_v2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\task.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\task_scheduler_init.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\task_scheduler_observer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_allocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\tbb\tbb_assert_impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_exception.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_machine.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\tbb\tbb_misc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_profiling.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_stddef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\tbb\tbb_version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbbmalloc_proxy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tick_count.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\machine\windows_ia32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\machine\windows_intel64.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\dep\tbb\src\tbb\tbb_resource.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\dep\tbb\src\tbb\intel64-masm\atomic_support.asm">
-      <Filter>Source Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\dep\tbb\src\tbb\win32-tbb-export.def">
-      <Filter>Source Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\dep\tbb\src\tbb\win64-tbb-export.def">
-      <Filter>Source Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/tbbmalloc.vcxproj.filters b/win/VC100/tbbmalloc.vcxproj.filters
deleted file mode 100644
index 7dec1de9a47..00000000000
--- a/win/VC100/tbbmalloc.vcxproj.filters
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="..\..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm">
-      <Filter>Source Files</Filter>
-    </MASM>
-    <MASM Include="..\..\dep\tbb\src\tbb\ia32-masm\lock_byte.asm">
-      <Filter>Source Files</Filter>
-    </MASM>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\dynamic_link.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\itt_notify_proxy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbbmalloc\MemoryAllocator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbb\tbb_misc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\tbb\src\tbbmalloc\tbbmalloc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\tbb\_tbb_windef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\aligned_space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\atomic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\blocked_range.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\blocked_range2d.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\blocked_range3d.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\cache_aligned_allocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\concurrent_hash_map.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\concurrent_queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\concurrent_vector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\tbbmalloc\Customize.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\enumerable_thread_specific.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\tbbmalloc\LifoQueue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\tbbmalloc\MapMemory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\null_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\null_rw_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_do.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_for.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_reduce.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_scan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_sort.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\parallel_while.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\partitioner.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\pipeline.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\queuing_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\queuing_rw_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\recursive_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\scalable_allocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\spin_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\spin_rw_mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\tbbmalloc\Statistics.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\task.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\task_scheduler_init.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\task_scheduler_observer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_allocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_exception.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_machine.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_profiling.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_stddef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbb_thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tbbmalloc_proxy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\tick_count.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\tbb\src\tbbmalloc\TypeDefinitions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\machine\windows_em64t.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\machine\windows_ia32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\tbb\machine\windows_ia32_inline.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\dep\tbb\src\tbb\em64t-masm\atomic_support.asm">
-      <Filter>Source Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\dep\tbb\src\tbbmalloc\win32-tbbmalloc-export.def">
-      <Filter>Source Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\dep\tbb\src\tbbmalloc\win64-tbbmalloc-export.def">
-      <Filter>Source Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/zlib.vcxproj.filters b/win/VC100/zlib.vcxproj.filters
deleted file mode 100644
index a3c65dee35f..00000000000
--- a/win/VC100/zlib.vcxproj.filters
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\zlib\adler32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\compress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\crc32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\deflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\example.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\gzio.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\infback.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\inffast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\inflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\inftrees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\trees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\uncompr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\src\zlib\zutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\src\zlib\crc32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\src\zlib\deflate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\src\zlib\inffast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\src\zlib\inffixed.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\src\zlib\inflate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\src\zlib\inftrees.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\src\zlib\trees.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\src\zlib\zconf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\src\zlib\zlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\src\zlib\zutil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC90/.gitignore b/win/VC90/.gitignore
deleted file mode 100644
index c0bac5034bc..00000000000
--- a/win/VC90/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git-ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# MaNGOS generated files at Windows build
-#
-
-*__Win32_Debug*
-*__x64_Debug*
-*__Win32_Release*
-*__x64_Release*
diff --git a/win/VC90/ACE_vc9.vcproj b/win/VC90/ACE_vc9.vcproj
deleted file mode 100644
index eea718a743d..00000000000
--- a/win/VC90/ACE_vc9.vcproj
+++ /dev/null
@@ -1,5431 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ACE_Wrappers"
-	ProjectGUID="{BD537C9A-FECA-1BAD-6757-8A6300006755}"
-	RootNamespace="ACE"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\ace__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /wd 4748"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355;4244;4267"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)\ACEd.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetDir)\ACEd.pdb"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\ACEd.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\ace__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /wd 4748"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355;4244;4267"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)\ACEd.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetDir)\ACEd.pdb"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\ACEd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\ace__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /wd 4748"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355;4244;4267"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)\ACE.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetDir)\ACE.pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\ACE.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\ace__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /wd 4748"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4355;4244;4267"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)\ACE.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetDir)\ACE.pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\ACE.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory="..\..\dep\lib\$(PlatformName)_debug"
-			IntermediateDirectory=".\ace__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /wd 4748"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355;4244;4267"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)\ACEd.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetDir)\ACEd.pdb"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\ACEd.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory="..\..\dep\lib\$(PlatformName)_debug"
-			IntermediateDirectory=".\ace__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				TypeLibraryName="$(InputName).tlb"
-				HeaderFileName="$(InputName).h"
-				InterfaceIdentifierFileName="$(InputName)_i.c"
-				ProxyFileName="$(InputName)_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /wd 4748"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355;4244;4267"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64"
-				Culture="1033"
-				AdditionalIncludeDirectories=".."
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)\ACEd.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetDir)\ACEd.pdb"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\ACEd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;cxx;cc;c;C"
-			>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ACE.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ACE_crc32.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ACE_crc_ccitt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ace_wchar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Activation_Queue.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Addr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Assert.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Asynch_IO.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Addr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Connector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Params.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_QoS.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Stream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Atomic_Op.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Auto_Event.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Barrier.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Based_Pointer_Repository.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Basic_Stats.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Basic_Types.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Capabilities.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\CDR_Base.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\CDR_Size.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\CDR_Stream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Cleanup.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Codecs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Codeset_IBM1047.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Codeset_Registry.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Codeset_Registry_db.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Configuration.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Configuration_Import_Export.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Containers.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Copy_Disabled.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Countdown_Time.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Date_Time.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV_Addr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV_Connector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV_IO.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dirent.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dirent_Selector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DLL.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DLL_Manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dump.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Base.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Encoding_Converter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Event.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Event_Handler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Recv.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Send.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE_Addr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE_Connector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE_IO.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\File_Lock.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Filecache.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Flag_Manip.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Framework_Component.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Functor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Functor_String.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Get_Opt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\gethrtime.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Handle_Ops.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Handle_Set.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hashable.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\High_Res_Timer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ICMP_Socket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\INET_Addr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Init_ACE.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IO_SAP.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IOStream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IPC_SAP.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Lib_Find.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Local_Memory_Pool.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Local_Name_Space.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Local_Tokens.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Lock.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg_Backend.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg_Callback.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg_IPC.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Record.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Logging_Strategy.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_Acceptor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Malloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Manual_Event.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Addr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Connector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_IO.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Mem_Map.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_SAP.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Stream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Block.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Method_Request.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Admin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Base.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Control_Action.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Control_Types.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Point_Registry.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Size.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Name_Proxy.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Name_Request_Reply.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Name_Space.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Naming_Context.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Netlink_Addr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Notification_Queue.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Notification_Strategy.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\NT_Service.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Obchunk.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Object_Manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Object_Manager_Base.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_Errno.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_main.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_errno.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_math.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_poll.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_regex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_signal.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_string.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_strings.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_time.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_QoS.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_Thread_Adapter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_TLI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Parse_Node.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\PI_Malloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Ping_Socket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Pipe.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Priority_Reactor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Proactor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Proactor_Impl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process_Manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process_Mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process_Semaphore.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Profile_Timer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reactor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reactor_Impl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Read_Buffer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Recyclable.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Registry.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Registry_Name_Space.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Remote_Name_Space.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Remote_Tokens.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Rtems_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\RW_Mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sample_History.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sched_Params.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Semaphore.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Config.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Gestalt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Object.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Repository.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Types.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Memory.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Memory_Pool.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Object.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sig_Adapter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sig_Handler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Signal.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sock_Connect.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Connector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_IO.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Stream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE_Acceptor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SString.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Stack_Trace.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Stats.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\String_Base_Const.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SUN_Proactor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Message.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Svc_Conf_y.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Synch_Options.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\System_Time.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Task.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Adapter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Control.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Exit.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Hook.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Throughput_Stats.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Time_Value.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timeprobe.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TLI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TLI_Acceptor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TLI_Connector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TLI_Stream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token_Collection.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token_Invariants.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token_Manager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TP_Reactor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Trace.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TSS_Adapter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TTY_IO.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UNIX_Addr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UUID.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\WIN32_Proactor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\XML_Svc_Conf.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hh"
-			>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Acceptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ACE.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ACE_export.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ace_wchar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Activation_Queue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Active_Map_Manager_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Addr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Arg_Shifter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ARGV.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Array_Base.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Array_Map.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Assert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Asynch_Acceptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Asynch_Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Asynch_IO.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Addr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Params.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_QoS.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Atomic_Op.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Atomic_Op_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Auto_Event.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Auto_Functor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Auto_IncDec_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Auto_Ptr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Barrier.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Based_Pointer_Repository.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Based_Pointer_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Basic_Stats.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Basic_Types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Bound_Ptr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Cached_Connect_Strategy_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Caching_Strategies_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Caching_Utility_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Capabilities.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\CDR_Base.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\CDR_Size.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\CDR_Stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\CE_Screen_Output.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\checked_iterator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Cleanup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Cleanup_Strategies_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Codecs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Codeset_IBM1047.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Codeset_Registry.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Codeset_Symbols.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Condition_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-aix-5.x.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-all.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-cygwin32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-doxygen.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-freebsd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-g++-common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-ghs-common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-hpux-11.00.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-icc-common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-integritySCA.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-kfreebsd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-linux-common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-linux.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-lite.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-lynxos.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-macosx-iphone-hardware.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-macosx-iphone-simulator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-macosx-leopard.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-macosx-panther.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-macosx-snowleopard.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-macosx-tiger.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-macosx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-macros.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-minimal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-mvs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-netbsd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-openbsd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-openvms.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-pharlap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-posix-nonetworking.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-posix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-qnx-neutrino.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-62x.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-pre62x.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-qnx-rtp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-rtems.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-suncc-common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-sunos5.10.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-sunos5.11.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-sunos5.4-g++.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-sunos5.4-sunc++-4.x.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-sunos5.5.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-sunos5.6.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-sunos5.7.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-sunos5.8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-sunos5.9.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v3.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-tandem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-visualage.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-vxworks.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-vxworks6.4.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-vxworks6.5.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-vxworks6.6.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-vxworks6.7.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-vxworks6.8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-borland.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-cegcc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-dmc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-interix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-mingw.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-msvc-10.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-msvc-7.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-msvc-8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-msvc-9.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-msvc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-win32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\config-WinCE.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Configuration.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Configuration_Import_Export.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Containers.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Containers_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Copy_Disabled.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\CORBA_macros.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Countdown_Time.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Date_Time.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Default_Constants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV_Addr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV_Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV_IO.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dirent.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dirent_Selector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DLL.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DLL_Manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dump.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dump_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic_Service.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Base.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Encoding_Converter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Env_Value_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Event.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Event_Handler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Event_Handler_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Recv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Send.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE_Addr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE_Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE_IO.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\File_Lock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Filecache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Flag_Manip.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Framework_Component.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Framework_Component_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Free_List.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Functor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Functor_String.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Functor_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Future.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Future_Set.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Get_Opt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Global_Macros.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Guard_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Handle_Gobbler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Handle_Ops.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Handle_Set.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hashable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\High_Res_Timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ICMP_Socket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\If_Then_Else.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\INET_Addr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Init_ACE.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Intrusive_List.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Intrusive_List_Node.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IO_SAP.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\iosfwd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IOStream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IOStream_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IPC_SAP.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Lib_Find.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Local_Memory_Pool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Local_Name_Space.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Local_Name_Space_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Local_Tokens.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Lock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Lock_Adapter_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LOCK_SOCK_Acceptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg_Backend.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg_Callback.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg_IPC.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Priority.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Record.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Logging_Strategy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_Acceptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Malloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Malloc_Base.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Malloc_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Managed_Object.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Manual_Event.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Map_Manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Map_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Addr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_IO.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Mem_Map.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_SAP.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Memory_Pool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Block.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Block_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Method_Request.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Metrics_Cache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Metrics_Cache_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Min_Max.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Module.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Admin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Base.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Control_Action.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Control_Types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Point_Registry.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Size.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Name_Proxy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Name_Request_Reply.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Name_Space.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Naming_Context.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Netlink_Addr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Node.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Notification_Queue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Notification_Strategy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\NT_Service.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Null_Barrier.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Null_Condition.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Null_Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Null_Semaphore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Numeric_Limits.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Obchunk.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Object_Manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Object_Manager_Base.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Obstack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Obstack_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_Errno.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\arpa\os_inet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\net\os_if.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\netinet\os_in.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\netinet\os_tcp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_aio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_assert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_byteswap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_complex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_cpio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_ctype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_dirent.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_dlfcn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_errno.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_fcntl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_fenv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_float.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_fmtmsg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_fnmatch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_ftw.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_glob.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_grp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_iconv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_intrin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_inttypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_iso646.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_kstat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_langinfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_libgen.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_limits.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_local.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_math.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_monetary.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_mqueue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_ndbm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_netdb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_nl_types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_pdh.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_pdhmsg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_poll.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_pthread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_pwd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_regex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_sched.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_search.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_semaphore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_setjmp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_signal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_spawn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_stdarg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_stdbool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_stddef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_stdint.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_stdio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_stdlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_string.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_strings.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_stropts.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_syslog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_tar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_termios.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_tgmath.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_time.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_trace.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_typeinfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_ucontext.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_ulimit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_unistd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_utime.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_utmpx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_wchar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_wctype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_wordexp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_ipc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_loadavg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_mman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_msg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_pstat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_resource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_select.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_shm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_socket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_stat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_statvfs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sysctl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sysinfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_time.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_timeb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_times.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_uio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_un.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_utsname.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_wait.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_Memory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_errno.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_macros.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_math.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_poll.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_regex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_signal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_string.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_strings.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_time.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_QoS.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_Thread_Adapter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_TLI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Pair_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Parse_Node.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\PI_Malloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Ping_Socket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Pipe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\post.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\pre.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Priority_Reactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Proactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Proactor_Impl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process_Manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process_Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process_Semaphore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Profile_Timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\RB_Tree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reactor_Impl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reactor_Token_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Read_Buffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Recyclable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Refcountable_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Registry.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Registry_Name_Space.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Remote_Name_Space.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Remote_Tokens.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reverse_Lock_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\RW_Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sample_History.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sched_Params.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Select_Reactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Select_Reactor_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Semaphore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Gestalt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Object.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Repository.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Memory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Memory_Pool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Object.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sig_Adapter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sig_Handler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Signal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Singleton.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sock_Connect.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_IO.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE_Acceptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SString.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SStringfwd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Stack_Trace.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Static_Object_Lock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Stats.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Strategies.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Strategies_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Stream_Modules.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\streams.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\String_Base.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\String_Base_Const.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SUN_Proactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Message.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Svc_Conf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Svc_Conf_Param.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Svc_Conf_Token_Table.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Svc_Conf_Tokens.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\svc_export.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Svc_Handler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Synch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Synch_Options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Synch_Traits.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\System_Time.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Task.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Task_Ex_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Task_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Test_and_Set.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Adapter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Control.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Exit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Hook.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Throughput_Stats.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Time_Value.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timeprobe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timeprobe_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Hash_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Heap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Heap_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_List.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_List_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Queue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Queue_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Queuefwd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Wheel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Wheel_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TLI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TLI_Acceptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TLI_Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TLI_Stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token_Collection.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token_Invariants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token_Manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Tokenizer_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TP_Reactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Trace.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Truncate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TSS_Adapter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TSS_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TTY_IO.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Typed_SV_Message.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Unbounded_Queue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Unbounded_Set.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UNIX_Addr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UPIPE_Addr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UUID.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Value_Ptr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Vector_T.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Version.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Versioned_Namespace.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\WIN32_Proactor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\XML_Svc_Conf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Inline Files"
-			Filter="i;ipp;inl"
-			>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ACE.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ace_wchar.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Activation_Queue.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Active_Map_Manager_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Addr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ARGV.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Array_Base.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Array_Map.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Addr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Connector.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Params.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_QoS.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ATM_Stream.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Atomic_Op.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Atomic_Op_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Auto_Event.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Auto_Functor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Auto_IncDec_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Auto_Ptr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Barrier.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Based_Pointer_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Basic_Stats.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Basic_Types.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Bound_Ptr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Caching_Strategies_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Capabilities.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\CDR_Base.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\CDR_Size.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\CDR_Stream.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Cleanup.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Codeset_Registry.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Condition_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Configuration.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Containers.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Containers_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Countdown_Time.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Date_Time.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV_Addr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV_Connector.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\DEV_IO.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dirent.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dirent_Selector.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Dynamic_Service.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Env_Value_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Event.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Event_Handler.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Event_Handler_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Recv.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Send.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE_Addr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE_Connector.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\FILE_IO.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\File_Lock.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Flag_Manip.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Framework_Component.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Functor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Functor_String.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Functor_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Get_Opt.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Guard_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Handle_Gobbler.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Handle_Set.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Hashable.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\High_Res_Timer.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\INET_Addr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Intrusive_List.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Intrusive_List_Node.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IO_SAP.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IOStream_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\IPC_SAP.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Local_Tokens.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Lock.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Lock_Adapter_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Msg.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Log_Record.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Malloc.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Malloc_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Managed_Object.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Manual_Event.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Map_Manager.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Map_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Addr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Connector.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_IO.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Mem_Map.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_SAP.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MEM_Stream.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Block.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Block_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Metrics_Cache_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Module.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Monitor_Base.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Mutex.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Naming_Context.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Netlink_Addr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Notification_Queue.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Notification_Strategy.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\NT_Service.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Obchunk.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Object_Manager.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Obstack_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_Errno.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_errno.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_math.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_poll.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_regex.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_signal.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_string.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_strings.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_time.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\OS_TLI.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Pair_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\PI_Malloc.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Ping_Socket.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Pipe.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Proactor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process_Manager.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process_Mutex.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Process_Semaphore.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Profile_Timer.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\RB_Tree.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reactor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Read_Buffer.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Recyclable.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Refcountable_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Remote_Tokens.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Reverse_Lock_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\RW_Mutex.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sample_History.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sched_Params.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Select_Reactor_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Semaphore.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Config.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Gestalt.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Object.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Repository.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Service_Types.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Shared_Object.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Sig_Handler.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Signal.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Singleton.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Connector.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_IO.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SOCK_Stream.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SString.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Stats.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Strategies_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Stream.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\String_Base.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Message.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Task.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Task_Ex_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Task_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Adapter.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Control.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Manager.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Mutex.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Time_Value.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timeprobe.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Timer_Queue_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TLI.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TLI_Connector.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TLI_Stream.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token_Collection.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token_Manager.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TP_Reactor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\TSS_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Typed_SV_Message.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Unbounded_Queue.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Unbounded_Set.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UNIX_Addr.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\UUID.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\Vector_T.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.inl"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.inl"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Documentation"
-			Filter=""
-				>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\VERSION"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"
-				>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE"
-				>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="TRUE"
-				>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="TRUE"
-				>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\README"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"
-				>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE"
-				>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="TRUE"
-				>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="TRUE"
-				>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\..\dep\ACE_wrappers\ace\ace.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/bzip2.vcproj b/win/VC90/bzip2.vcproj
deleted file mode 100644
index e19241f5fab..00000000000
--- a/win/VC90/bzip2.vcproj
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="bzip2"
-	ProjectGUID="{B96F612A-C91D-43B3-A4C3-D4294817EC6C}"
-	RootNamespace="bzip2"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\dep\src\bzip2\blocksort.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\dep\src\bzip2\bzlib.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\dep\src\bzip2\bzlib.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\dep\src\bzip2\bzlib_private.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\dep\src\bzip2\compress.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\dep\src\bzip2\crctable.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\dep\src\bzip2\decompress.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\dep\src\bzip2\huffman.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\dep\src\bzip2\randtable.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/framework.vcproj b/win/VC90/framework.vcproj
deleted file mode 100644
index 167f9cbb2c7..00000000000
--- a/win/VC90/framework.vcproj
+++ /dev/null
@@ -1,618 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="framework"
-	ProjectGUID="{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}"
-	RootNamespace="framework"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zl /MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.pch"
-				AssemblerListingLocation=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zl /MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.pch"
-				AssemblerListingLocation=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zl /MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
-				StringPooling="true"
-				MinimalRebuild="false"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.pch"
-				AssemblerListingLocation=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zl /MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
-				StringPooling="true"
-				MinimalRebuild="false"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.pch"
-				AssemblerListingLocation=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zl /MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.pch"
-				AssemblerListingLocation=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zl /MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.pch"
-				AssemblerListingLocation=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\framework__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="GameSystem"
-			>
-			<File
-				RelativePath="..\..\src\framework\GameSystem\Grid.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\GameSystem\GridLoader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\GameSystem\GridReference.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\GameSystem\GridRefManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\GameSystem\NGrid.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\GameSystem\TypeContainer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\GameSystem\TypeContainerFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\GameSystem\TypeContainerVisitor.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Platform"
-			>
-			<File
-				RelativePath="..\..\src\framework\Platform\CompilerDefs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Platform\Define.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Policies"
-			>
-			<File
-				RelativePath="..\..\src\framework\Policies\CreationPolicy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Policies\MemoryManagement.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Policies\ObjectLifeTime.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Policies\ObjectLifeTime.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Policies\Singleton.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Policies\SingletonImp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Policies\ThreadingModel.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Utilities"
-			>
-			<File
-				RelativePath="..\..\src\framework\Utilities\ByteConverter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Utilities\Callback.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Utilities\EventProcessor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Utilities\EventProcessor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Utilities\LinkedList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Utilities\TypeList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Utilities\UnorderedMapSet.h"
-				>
-			</File>
-			<Filter
-				Name="LinkedReference"
-				>
-				<File
-					RelativePath="..\..\src\framework\Utilities\LinkedReference\Reference.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\framework\Utilities\LinkedReference\RefManager.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Dynamic"
-			>
-			<File
-				RelativePath="..\..\src\framework\Dynamic\FactoryHolder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\framework\Dynamic\ObjectRegistry.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/g3dlite.vcproj b/win/VC90/g3dlite.vcproj
deleted file mode 100644
index 303450c1ca7..00000000000
--- a/win/VC90/g3dlite.vcproj
+++ /dev/null
@@ -1,728 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="g3dlite"
-	ProjectGUID="{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
-	RootNamespace="sockets"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include\g3dlite;..\..\dep\include\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/g3dlite.lib"
-				IgnoreAllDefaultLibraries="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include\g3dlite;..\..\dep\include\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/g3dlite.lib"
-				IgnoreAllDefaultLibraries="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="..\..\dep\include\g3dlite;..\..\dep\include\zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
-				RuntimeLibrary="2"
-				EnableEnhancedInstructionSet="1"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/g3dlite.lib"
-				IgnoreAllDefaultLibraries="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="..\..\dep\include\g3dlite;..\..\dep\include\zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
-				RuntimeLibrary="2"
-				EnableEnhancedInstructionSet="0"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/g3dlite.lib"
-				IgnoreAllDefaultLibraries="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include\g3dlite;..\..\dep\include\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/g3dlite.lib"
-				IgnoreAllDefaultLibraries="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include\g3dlite;..\..\dep\include\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/g3dlite.lib"
-				IgnoreAllDefaultLibraries="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\AABox.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Array.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Box.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\CollisionDetection.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\CoordinateFrame.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Crypto.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\format.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\g3dmath.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\GCamera.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Line.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Matrix3.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Plane.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\platform.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Quat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Ray.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\RegistryUtil.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Sphere.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\stringutils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\System.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Table.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Triangle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Vector2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Vector2int16.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Vector3.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Vector3int16.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\g3dlite\G3D\Vector4.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\AABox.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Box.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Crypto.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\format.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Matrix3.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Plane.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\System.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Triangle.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Vector3.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Vector4.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\debugAssert.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\fileutils.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\g3dmath.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\g3dfnmatch.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\prompt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\stringutils.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Any.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\BinaryFormat.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\BinaryInput.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\BinaryOutput.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Capsule.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\CollisionDetection.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\CoordinateFrame.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Cylinder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Line.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\LineSegment.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Log.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Matrix4.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\MemoryManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Quat.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Random.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Ray.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\ReferenceCount.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\RegistryUtil.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Sphere.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\TextInput.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\TextOutput.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\UprightFrame.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\g3dlite\Vector2.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
deleted file mode 100644
index 0d7db322006..00000000000
--- a/win/VC90/game.vcproj
+++ /dev/null
@@ -1,1845 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="game"
-	ProjectGUID="{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
-	RootNamespace="game"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /Zm200"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
-				StringPooling="false"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="pchdef.h"
-				PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-				ForcedIncludeFiles="pchdef.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /bigobj /Zm200"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
-				StringPooling="false"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="pchdef.h"
-				PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-				ForcedIncludeFiles="pchdef.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib .\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib"
-				OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /Zm200"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="pchdef.h"
-				PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-				ForcedIncludeFiles="pchdef.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /bigobj /Zm200"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="pchdef.h"
-				PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-				ForcedIncludeFiles="pchdef.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib .\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib"
-				OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
-				StringPooling="false"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP /bigobj"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
-				StringPooling="false"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib .\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib"
-				OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="World/Handlers"
-			>
-			<File
-				RelativePath="..\..\src\game\AccountMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AccountMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AchievementMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AchievementMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ArenaTeamHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AuctionHouseHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGround.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGround.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundAA.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundAA.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundAB.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundAB.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundAV.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundAV.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundBE.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundBE.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundDS.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundDS.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundEY.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundEY.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundIC.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundIC.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundNA.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundNA.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundRB.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundRB.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundRL.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundRL.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundRV.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundRV.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundSA.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundSA.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundWS.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\BattleGroundWS.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CalendarHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Cell.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CellImpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Channel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Channel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ChannelHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ChannelMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ChannelMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CharacterHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Chat.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Chat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ChatHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CombatHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureLinkingMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureLinkingMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\DuelHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GameEventMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GameEventMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GMTicketHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GossipDef.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GossipDef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GridDefines.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GridMap.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GridMap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GridNotifiers.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GridNotifiers.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GridNotifiersImpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GridStates.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GridStates.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Group.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Group.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GroupHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GuildHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GuildMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GuildMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\InstanceData.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\InstanceData.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ItemHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\LFGHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\LootHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Mail.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MailHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Mail.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Map.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Map.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MapManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MapManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MapPersistentStateMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MapPersistentStateMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MassMailMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MassMailMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MiscHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MoveMap.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MoveMap.h"
-				>
-			</File>
-            <File
-				RelativePath="..\..\src\game\MoveMapSharedDefines.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MovementHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\NPCHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\NPCHandler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ObjectGridLoader.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ObjectGridLoader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Path.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PetHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PetitionsHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PoolManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PoolManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\QueryHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\QuestDef.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\QuestDef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\QuestHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ScriptMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ScriptMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SkillDiscovery.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SkillDiscovery.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SkillExtraItems.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SkillExtraItems.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SkillHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Spell.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Spell.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SpellAuraDefines.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SpellAuras.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SpellAuras.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SpellEffects.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SpellHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\TaxiHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\TradeHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Transports.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Transports.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\UnitAuraProcHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\UpdateData.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\UpdateData.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\VoiceChatHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Weather.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Weather.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\World.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\World.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Motion generators"
-			>
-			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\HomeMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\HomeMovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\IdleMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\IdleMovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MotionMaster.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MotionMaster.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PathFinder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PathFinder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Object"
-			>
-			<File
-				RelativePath="..\..\src\game\AggressorAI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AggressorAI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ArenaTeam.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ArenaTeam.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AuctionHouseBot\AuctionHouseBot.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AuctionHouseBot\AuctionHouseBot.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AuctionHouseMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AuctionHouseMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Bag.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Bag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Calendar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Calendar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Camera.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Camera.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Corpse.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Corpse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Creature.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Creature.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureAI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureAI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureAIImpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureAIRegistry.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureAIRegistry.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureAISelector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureAISelector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureEventAI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureEventAI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureEventAIMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CreatureEventAIMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\DynamicObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\DynamicObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Formulas.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GameObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GameObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GMTicketMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GMTicketMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GuardAI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GuardAI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Guild.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Guild.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Item.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Item.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ItemEnchantmentMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ItemEnchantmentMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ItemPrototype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\LootMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\LootMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\NullCreatureAI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\NullCreatureAI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Object.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Object.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ObjectAccessor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ObjectAccessor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ObjectGuid.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ObjectGuid.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ObjectMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ObjectMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ObjectPosSelector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ObjectPosSelector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Pet.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Pet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PetAI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PetAI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Player.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Player.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ReactorAI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ReactorAI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ReputationMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ReputationMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SocialMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SocialMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SpellMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SpellMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\StatSystem.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\TemporarySummon.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\TemporarySummon.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Totem.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Totem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\TotemAI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\TotemAI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Unit.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Unit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\UnitEvents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\UpdateFields.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\UpdateMask.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Vehicle.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Vehicle.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Server"
-			>
-			<File
-				RelativePath="..\..\src\game\DBCEnums.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\DBCfmt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\DBCStores.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\DBCStores.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\DBCStructure.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Opcodes.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Opcodes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SharedDefines.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SQLStorages.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\SQLStorages.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WorldSession.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WorldSession.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WorldSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WorldSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WorldSocketMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WorldSocketMgr.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Chat Commands"
-			>
-			<File
-				RelativePath="..\..\src\game\debugcmds.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Level0.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Level1.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Level2.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Level3.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Tool"
-			>
-			<File
-				RelativePath="..\..\src\game\CharacterDatabaseCleaner.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\CharacterDatabaseCleaner.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Language.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PlayerDump.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PlayerDump.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="References"
-			>
-			<File
-				RelativePath="..\..\src\game\FollowerReference.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\FollowerReference.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\FollowerRefManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GroupReference.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GroupReference.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\GroupRefManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\HostileRefManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\HostileRefManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MapReference.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MapRefManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ThreatManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ThreatManager.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="vmaps"
-			>
-			<File
-				RelativePath="..\..\src\game\vmap\BIH.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\BIH.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\IVMapManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\MapTree.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\MapTree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\ModelInstance.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\ModelInstance.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\TileAssembler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\TileAssembler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\VMapDefinitions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\VMapFactory.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\VMapFactory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\VMapManager2.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\VMapManager2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\VMapTools.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\WorldModel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\vmap\WorldModel.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Movement"
-			>
-			<File
-				RelativePath="..\..\src\game\Movement\MoveSpline.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Movement\MoveSpline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Movement\MoveSplineFlag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Movement\MoveSplineInit.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Movement\MoveSplineInit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Movement\MoveSplineInitArgs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Movement\packet_builder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Movement\packet_builder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Movement\spline.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Movement\spline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Movement\spline.impl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\Movement\typedefs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\movement\util.cpp"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\src\game\pchdef.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="pchdef.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="pchdef.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="pchdef.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="pchdef.h"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\src\game\pchdef.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/genrevision.vcproj b/win/VC90/genrevision.vcproj
deleted file mode 100644
index 7db209290f8..00000000000
--- a/win/VC90/genrevision.vcproj
+++ /dev/null
@@ -1,480 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="genrevision"
-	ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
-	RootNamespace="genrevision"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\src\tools\genrevision\genrevision.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/mangosd.vcproj b/win/VC90/mangosd.vcproj
deleted file mode 100644
index d1790096b3b..00000000000
--- a/win/VC90/mangosd.vcproj
+++ /dev/null
@@ -1,749 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="mangosd"
-	ProjectGUID="{A3A04E47-43A2-4C08-90B3-029CEF558594}"
-	RootNamespace="mangosd"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.pch"
-				AssemblerListingLocation=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="Detour.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib framework.lib msvcrt.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_$(ConfigurationName)&quot;;&quot;.\framework__$(PlatformName)_$(ConfigurationName)&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.map"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				LargeAddressAware="2"
-				LinkTimeCodeGeneration="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\mangosd.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include\gsoap;..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.pch"
-				AssemblerListingLocation=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Detour.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib framework.lib msvcrt.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_$(ConfigurationName)&quot;;&quot;.\framework__$(PlatformName)_$(ConfigurationName)&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.map"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				LinkTimeCodeGeneration="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\mangosd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include\gsoap;..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.pch"
-				AssemblerListingLocation=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="Detour.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib framework.lib msvcrtd.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.exe"
-				Version=""
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_$(ConfigurationName)&quot;;&quot;.\framework__$(PlatformName)_$(ConfigurationName)&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.map"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				LargeAddressAware="2"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\mangosd.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include\gsoap;..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.pch"
-				AssemblerListingLocation=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Detour.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib framework.lib msvcrtd.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.exe"
-				Version=""
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_$(ConfigurationName)&quot;;&quot;.\framework__$(PlatformName)_$(ConfigurationName)&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.map"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\mangosd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include\gsoap;..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.pch"
-				AssemblerListingLocation=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="Detour.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib framework.lib msvcrtd.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.exe"
-				Version=""
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_debug&quot;;&quot;.\framework__$(PlatformName)_$(ConfigurationName)&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.map"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				LargeAddressAware="2"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\mangosd.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\dep\lib\$(PlatformName)_debug\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\mangosd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include\gsoap;..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.pch"
-				AssemblerListingLocation=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\mangosd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Detour.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib framework.lib msvcrtd.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.exe"
-				Version=""
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_debug&quot;;&quot;.\framework__$(PlatformName)_$(ConfigurationName)&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.map"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\mangosd.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\..\dep\lib\$(PlatformName)_debug\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="doc"
-			>
-			<File
-				RelativePath="..\..\AUTHORS"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ChangeLog"
-				>
-			</File>
-			<File
-				RelativePath="..\..\COPYING"
-				>
-			</File>
-			<File
-				RelativePath="..\..\INSTALL"
-				>
-			</File>
-			<File
-				RelativePath="..\..\NEWS"
-				>
-			</File>
-			<File
-				RelativePath="..\..\README"
-				>
-			</File>
-			<File
-				RelativePath="..\..\THANKS"
-				>
-			</File>
-			<File
-				RelativePath="..\..\WARNING"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\src\mangosd\CliRunnable.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\CliRunnable.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\Main.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\mangosd.rc"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\MaNGOSsoap.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\MaNGOSsoap.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\Master.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\Master.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\RASocket.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\RASocket.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\soapC.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\soapH.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\soapServer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\soapStub.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\dep\src\gsoap\stdsoap2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\dep\include\gsoap\stdsoap2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\WheatyExceptionReport.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\WheatyExceptionReport.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\WorldRunnable.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\mangosd\WorldRunnable.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/realmd.vcproj b/win/VC90/realmd.vcproj
deleted file mode 100644
index b456967b173..00000000000
--- a/win/VC90/realmd.vcproj
+++ /dev/null
@@ -1,661 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="realmd"
-	ProjectGUID="{563E9905-3657-460C-AE63-0AC39D162E23}"
-	RootNamespace="realmd"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.pch"
-				AssemblerListingLocation=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.map"
-				SubSystem="1"
-				LargeAddressAware="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.pch"
-				AssemblerListingLocation=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.map"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.pch"
-				AssemblerListingLocation=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.map"
-				SubSystem="1"
-				LargeAddressAware="2"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.pch"
-				AssemblerListingLocation=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.map"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.pch"
-				AssemblerListingLocation=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_debug"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.map"
-				SubSystem="1"
-				LargeAddressAware="2"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="VERSION=&quot;0.17.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE"
-				IgnoreStandardIncludePath="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.pch"
-				AssemblerListingLocation=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\realmd__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_debug"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb"
-				MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.map"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				FixedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\src\realmd\AuthCodes.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\realmd\AuthSocket.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\realmd\AuthSocket.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\realmd\BufferedSocket.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\realmd\BufferedSocket.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\realmd\Main.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\realmd\PatchHandler.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\realmd\PatchHandler.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\realmd\realmd.rc"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\realmd\RealmList.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\realmd\RealmList.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\WheatyExceptionReport.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\WheatyExceptionReport.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/script.vcproj b/win/VC90/script.vcproj
deleted file mode 100644
index 4afe56e57cf..00000000000
--- a/win/VC90/script.vcproj
+++ /dev/null
@@ -1,570 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="script"
-	ProjectGUID="{4205C8A9-79B7-4354-8064-F05FB9CA0C96}"
-	RootNamespace="script"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mangosd.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib aced.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosscript.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=";.\mangosd__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\mangosscript.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\mangosscript.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mangosd.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib aced.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosscript.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=";.\mangosd__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\mangosscript.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\mangosscript.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
-				RuntimeLibrary="2"
-				EnableEnhancedInstructionSet="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mangosd.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib ace.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosscript.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=";.\mangosd__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_$(ConfigurationName)"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/mangosscript.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
-				RuntimeLibrary="2"
-				EnableEnhancedInstructionSet="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mangosd.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib ace.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosscript.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;.\mangosd__$(PlatformName)_$(ConfigurationName)&quot;;&quot;.\zlib__$(PlatformName)_$(ConfigurationName)&quot;;&quot;..\..\dep\lib\$(PlatformName)_$(ConfigurationName)&quot;"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/mangosscript.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mangosd.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib aced.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosscript.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=";.\mangosd__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_debug"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\mangosscript.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\mangosscript.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mangosd.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib aced.lib"
-				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosscript.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=";.\mangosd__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_debug"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\mangosscript.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\mangosscript.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\src\bindings\universal\ScriptMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bindings\universal\system.cpp"
-				>
-			</File>
-			<Filter
-				Name="Scripts"
-				>
-				<File
-					RelativePath="..\..\src\bindings\universal\Scripts\sc_default.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\bindings\universal\Scripts\sc_defines.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\src\bindings\universal\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bindings\universal\ScriptMgr.h"
-				>
-			</File>
-			<Filter
-				Name="Scripts"
-				>
-				<File
-					RelativePath="..\..\src\bindings\universal\Scripts\sc_defines.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
deleted file mode 100644
index bf1e24db263..00000000000
--- a/win/VC90/shared.vcproj
+++ /dev/null
@@ -1,904 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="shared"
-	ProjectGUID="{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
-	RootNamespace="shared"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch"
-				AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
-				AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch"
-				AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
-				AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
-				AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
-				AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
-				AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
-				AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
-				AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
-				AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
-				AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
-				AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Database"
-			>
-			<File
-				RelativePath="..\..\src\shared\Database\Database.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\Database.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\DatabaseEnv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\DatabaseImpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\DatabaseMysql.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\DatabaseMysql.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\Field.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\Field.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\MySQLDelayThread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\QueryResult.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\QueryResultMysql.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\QueryResultMysql.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\SqlDelayThread.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\SqlDelayThread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\SqlOperations.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\SqlOperations.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\SqlPreparedStatement.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\SqlPreparedStatement.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\SQLStorage.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\SQLStorage.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Database\SQLStorageImpl.h"
-				>
-			</File>
-			<Filter
-				Name="DataStores"
-				>
-				<File
-					RelativePath="..\..\src\shared\Database\DBCFileLoader.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\shared\Database\DBCFileLoader.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\shared\Database\DBCStore.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Log"
-			>
-			<File
-				RelativePath="..\..\src\shared\Log.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Log.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Util"
-			>
-			<File
-				RelativePath="..\..\src\shared\ByteBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Errors.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\include\mersennetwister\MersenneTwister.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\ProgressBar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\ProgressBar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Util.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\WorldPacket.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Config"
-			>
-			<File
-				RelativePath="..\..\src\shared\Config\Config.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Config\Config.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Auth"
-			>
-			<File
-				RelativePath="..\..\src\shared\Auth\AuthCrypt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Auth\AuthCrypt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Auth\BigNumber.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Auth\BigNumber.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Auth\HMACSHA1.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Auth\HMACSHA1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Auth\md5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Auth\md5.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Auth\SARC4.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Auth\SARC4.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Auth\Sha1.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\Auth\Sha1.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\src\shared\Common.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\Common.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\LockedQueue.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\revision.h"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Extract revision"
-					CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
-					Outputs="revision.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Extract revision"
-					CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__Win32_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
-					Outputs="revision.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Extract revision"
-					CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
-					Outputs="revision.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Extract revision"
-					CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__Win32_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
-					Outputs="revision.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug_NoPCH|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Extract revision"
-					CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
-					Outputs="revision.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug_NoPCH|x64"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Extract revision"
-					CommandLine="cd &quot;$(SolutionDir)..\src\shared&quot;&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__Win32_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD"
-					Outputs="revision.h"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\revision_nr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\revision_sql.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\ServiceWin32.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\ServiceWin32.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\SystemConfig.h.in"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Performing Build SystemConfig.h"
-					CommandLine="copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h&#x0D;&#x0A;"
-					Outputs="..\..\src\shared\SystemConfig.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Performing Build SystemConfig.h"
-					CommandLine="copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h&#x0D;&#x0A;"
-					Outputs="..\..\src\shared\SystemConfig.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Performing Build SystemConfig.h"
-					CommandLine="copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h&#x0D;&#x0A;"
-					Outputs="..\..\src\shared\SystemConfig.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Performing Build SystemConfig.h"
-					CommandLine="copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h&#x0D;&#x0A;"
-					Outputs="..\..\src\shared\SystemConfig.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug_NoPCH|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Performing Build SystemConfig.h"
-					CommandLine="copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h&#x0D;&#x0A;"
-					Outputs="..\..\src\shared\SystemConfig.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug_NoPCH|x64"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Performing Build SystemConfig.h"
-					CommandLine="copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h&#x0D;&#x0A;"
-					Outputs="..\..\src\shared\SystemConfig.h"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\Threading.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\shared\Threading.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/tbb.vcproj b/win/VC90/tbb.vcproj
deleted file mode 100644
index fcd855f9265..00000000000
--- a/win/VC90/tbb.vcproj
+++ /dev/null
@@ -1,1195 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="tbb"
-	ProjectGUID="{F62787DD-1327-448B-9818-030062BCFAA5}"
-	RootNamespace="tbb"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<DefaultToolFile
-			FileName="masm.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W4 /I../../src /I../../include"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include"
-				PreprocessorDefinitions=""
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)\tbb.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbb_debug.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /GS- /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W4 /I../../src /I../../include"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include"
-				PreprocessorDefinitions=""
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				ShowIncludes="false"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)\tbb.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbb_debug.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MD /O2 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /Oy /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W4 /I../../src /I../../include"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)\tbb.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbb.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MD /O2 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /D_USE_RTM_VERSION /GS- /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W4 /I../../src /I../../include"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)\tbb.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbb.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W4 /I../../src /I../../include"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include"
-				PreprocessorDefinitions=""
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)\tbb.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_debug\tbb_debug.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /GS- /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W4 /I../../src /I../../include"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include"
-				PreprocessorDefinitions=""
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				ShowIncludes="false"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)\tbb.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_debug\tbb_debug.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\intel64-masm\atomic_support.asm"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="building atomic_support.obj"
-						CommandLine="ml64 /Fo&quot;tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
-						Outputs="tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="building atomic_support.obj"
-						CommandLine="ml64 /Fo&quot;tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot;  /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
-						Outputs="tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="building atomic_support.obj"
-						CommandLine="ml64 /Fo&quot;tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
-						Outputs="tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\cache_aligned_allocator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\concurrent_hash_map.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\concurrent_queue.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\old\concurrent_queue_v2.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\concurrent_vector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\old\concurrent_vector_v2.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\dynamic_link.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\itt_notify.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\itt_notify_proxy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\ia32-masm\lock_byte.asm"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\pipeline.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\private_server.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\queuing_mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\queuing_rw_mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\recursive_mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\rml\client\rml_tbb.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\spin_mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\spin_rw_mutex.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\old\spin_rw_mutex_v2.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\task.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\tbb_misc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\tbb_thread.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\win32-tbb-export.def"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs=".\tbb__$(PlatformName)_$(ConfigurationName)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs=".\tbb__$(PlatformName)_$(ConfigurationName)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs=".\tbb__$(PlatformName)_$(ConfigurationName)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbb.def"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\win64-tbb-export.def"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../dep/tbb/src /I../../dep/tbb/include &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\tbb.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\include\tbb\_tbb_windef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\aligned_space.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\atomic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\blocked_range.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\blocked_range2d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\blocked_range3d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\cache_aligned_allocator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\concurrent_hash_map.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\concurrent_queue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\old\concurrent_queue_v2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\concurrent_vector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\old\concurrent_vector_v2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\dynamic_link.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\enumerable_thread_specific.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\gate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\machine\ibm_aix51.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\itt_notify.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\machine\linux_common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\machine\linux_ia32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\machine\linux_ia64.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\machine\linux_intel64.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\machine\mac_ppc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\null_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\null_rw_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_do.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_for.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_reduce.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_scan.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_sort.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_while.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\partitioner.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\pipeline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\queuing_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\queuing_rw_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\recursive_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\scalable_allocator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\spin_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\spin_rw_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\old\spin_rw_mutex_v2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\task.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\task_scheduler_init.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\task_scheduler_observer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_allocator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\tbb_assert_impl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_exception.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_machine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\tbb_misc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_profiling.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_stddef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_thread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\tbb_version.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbbmalloc_proxy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tick_count.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\machine\windows_ia32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\machine\windows_intel64.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\tbb_resource.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalOptions="/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalOptions="/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalOptions="/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalOptions="/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalOptions="/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalOptions="/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/tbbmalloc.vcproj b/win/VC90/tbbmalloc.vcproj
deleted file mode 100644
index 5a208de99bb..00000000000
--- a/win/VC90/tbbmalloc.vcproj
+++ /dev/null
@@ -1,1099 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="tbbmalloc"
-	ProjectGUID="{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}"
-	RootNamespace="tbbmalloc"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<DefaultToolFile
-			FileName="masm.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MDd /Od /Ob0 /Zi /EHs- /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject"
-				PreprocessorDefinitions=""
-				ExceptionHandling="0"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244;4267"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)\tbbmalloc.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbbmalloc_debug.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MDd /Od /Ob0 /Zi /EHs- /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /GS- /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244;4267"
-				ShowIncludes="false"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)\tbbmalloc.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbbmalloc_debug.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MD /O2 /Zi /EHs- /Zc:forScope /Zc:wchar_t /Oy /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject"
-				PreprocessorDefinitions=""
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244;4267"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)\tbbmalloc.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbbmalloc.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MD /O2 /Zi /EHs- /Zc:forScope /Zc:wchar_t /GS- /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject"
-				PreprocessorDefinitions=""
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244;4267"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)\tbbmalloc.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbbmalloc.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MDd /Od /Ob0 /Zi /EHs- /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject"
-				PreprocessorDefinitions=""
-				ExceptionHandling="0"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244;4267"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)\tbbmalloc.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_debug\tbbmalloc_debug.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=" /c /MDd /Od /Ob0 /Zi /EHs- /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /GS- /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244;4267"
-				ShowIncludes="false"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)\tbbmalloc.def"
-				OutputFile="..\..\dep\lib\$(PlatformName)_debug\tbbmalloc_debug.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\em64t-masm\atomic_support.asm"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="building atomic_support.obj"
-						CommandLine="ml64 /Fo&quot;tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
-						Outputs="tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="building atomic_support.obj"
-						CommandLine="ml64 /Fo&quot;tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot;  /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
-						Outputs="tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="building atomic_support.obj"
-						CommandLine="ml64 /Fo&quot;tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
-						Outputs="tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\dynamic_link.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\itt_notify_proxy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\ia32-masm\lock_byte.asm"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-						AdditionalOptions="/coff /Zi"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbbmalloc\MemoryAllocator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbb\tbb_misc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbbmalloc\tbbmalloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbbmalloc\win32-tbbmalloc-export.def"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbbmalloc.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win32-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbbmalloc.def&#x0D;&#x0A;"
-						Outputs=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)\tbbmalloc.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbbmalloc/win32-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbbmalloc.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbbmalloc.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbbmalloc.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win32-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbbmalloc.def&#x0D;&#x0A;"
-						Outputs=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)\tbbmalloc.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbbmalloc.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win32-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbbmalloc.def&#x0D;&#x0A;"
-						Outputs=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)\tbbmalloc.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbbmalloc/win32-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbbmalloc.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbbmalloc.def"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbbmalloc\win64-tbbmalloc-export.def"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbbmalloc.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win64-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbbmalloc.def&#x0D;&#x0A;"
-						Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\tbbmalloc.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbbmalloc.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win64-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbbmalloc.def&#x0D;&#x0A;"
-						Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\tbbmalloc.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbb.def file"
-						CommandLine="cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbb.def&#x0D;&#x0A;"
-						Outputs="$(IntDir)\tbb.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="generating tbbmalloc.def file"
-						CommandLine="cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win64-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)\tbbmalloc.def&#x0D;&#x0A;"
-						Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\tbbmalloc.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\include\tbb\_tbb_windef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\aligned_space.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\atomic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\blocked_range.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\blocked_range2d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\blocked_range3d.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\cache_aligned_allocator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\concurrent_hash_map.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\concurrent_queue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\concurrent_vector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbbmalloc\Customize.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\enumerable_thread_specific.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbbmalloc\LifoQueue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbbmalloc\MapMemory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\null_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\null_rw_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_do.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_for.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_reduce.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_scan.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_sort.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\parallel_while.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\partitioner.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\pipeline.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\queuing_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\queuing_rw_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\recursive_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\scalable_allocator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\spin_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\spin_rw_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbbmalloc\Statistics.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\task.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\task_scheduler_init.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\task_scheduler_observer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_allocator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_exception.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_machine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_profiling.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_stddef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbb_thread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tbbmalloc_proxy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\tick_count.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbbmalloc\TypeDefinitions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\machine\windows_em64t.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\machine\windows_ia32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\tbb\machine\windows_ia32_inline.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\dep\tbb\src\tbbmalloc\tbbmalloc.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_NoPCH|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build\vsproject"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC90/zlib.vcproj b/win/VC90/zlib.vcproj
deleted file mode 100644
index e36dd7e0999..00000000000
--- a/win/VC90/zlib.vcproj
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="zlib"
-	ProjectGUID="{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-	RootNamespace="zlib"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/zlib.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/zlib.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="..\..\dep\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				EnableEnhancedInstructionSet="1"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/zlib.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="..\..\dep\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/zlib.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/zlib.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/zlib.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\dep\src\zlib\adler32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\crc32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\deflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\example.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\gzio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\infback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\inffast.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\inflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\inftrees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\uncompr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\zutil.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\dep\src\zlib\crc32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\deflate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\inffast.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\inffixed.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\inflate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\inftrees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\trees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\zconf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\zlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\dep\src\zlib\zutil.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win/VC100/bzip2.vcxproj b/win/bzip2.vcxproj
similarity index 83%
rename from win/VC100/bzip2.vcxproj
rename to win/bzip2.vcxproj
index 72fdf8429f1..edc69c6bf76 100644
--- a/win/VC100/bzip2.vcxproj
+++ b/win/bzip2.vcxproj
@@ -44,7 +44,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -57,7 +57,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -67,17 +67,17 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\dep\src\bzip2\blocksort.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\bzlib.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\compress.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\crctable.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\decompress.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\huffman.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\randtable.c" />
+    <ClCompile Include="..\dep\src\bzip2\blocksort.c" />
+    <ClCompile Include="..\dep\src\bzip2\bzlib.c" />
+    <ClCompile Include="..\dep\src\bzip2\compress.c" />
+    <ClCompile Include="..\dep\src\bzip2\crctable.c" />
+    <ClCompile Include="..\dep\src\bzip2\decompress.c" />
+    <ClCompile Include="..\dep\src\bzip2\huffman.c" />
+    <ClCompile Include="..\dep\src\bzip2\randtable.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\dep\src\bzip2\bzlib.h" />
-    <ClInclude Include="..\..\dep\src\bzip2\bzlib_private.h" />
+    <ClInclude Include="..\dep\src\bzip2\bzlib.h" />
+    <ClInclude Include="..\dep\src\bzip2\bzlib_private.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win/cppunit.vcxproj b/win/cppunit.vcxproj
new file mode 100644
index 00000000000..eaa6c65f4bb
--- /dev/null
+++ b/win/cppunit.vcxproj
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\cppunit\AdditionalMessage.cpp" />
+    <ClCompile Include="..\src\cppunit\Asserter.cpp" />
+    <ClCompile Include="..\src\cppunit\BeOsDynamicLibraryManager.cpp" />
+    <ClCompile Include="..\src\cppunit\BriefTestProgressListener.cpp" />
+    <ClCompile Include="..\src\cppunit\CompilerOutputter.cpp" />
+    <ClCompile Include="..\src\cppunit\DefaultProtector.cpp" />
+    <ClCompile Include="..\src\cppunit\DllMain.cpp" />
+    <ClCompile Include="..\src\cppunit\DynamicLibraryManager.cpp" />
+    <ClCompile Include="..\src\cppunit\DynamicLibraryManagerException.cpp" />
+    <ClCompile Include="..\src\cppunit\Exception.cpp" />
+    <ClCompile Include="..\src\cppunit\Message.cpp" />
+    <ClCompile Include="..\src\cppunit\PlugInManager.cpp" />
+    <ClCompile Include="..\src\cppunit\PlugInParameters.cpp" />
+    <ClCompile Include="..\src\cppunit\Protector.cpp" />
+    <ClCompile Include="..\src\cppunit\ProtectorChain.cpp" />
+    <ClCompile Include="..\src\cppunit\RepeatedTest.cpp" />
+    <ClCompile Include="..\src\cppunit\ShlDynamicLibraryManager.cpp" />
+    <ClCompile Include="..\src\cppunit\SourceLine.cpp" />
+    <ClCompile Include="..\src\cppunit\StringTools.cpp" />
+    <ClCompile Include="..\src\cppunit\SynchronizedObject.cpp" />
+    <ClCompile Include="..\src\cppunit\Test.cpp" />
+    <ClCompile Include="..\src\cppunit\TestAssert.cpp" />
+    <ClCompile Include="..\src\cppunit\TestCase.cpp" />
+    <ClCompile Include="..\src\cppunit\TestCaseDecorator.cpp" />
+    <ClCompile Include="..\src\cppunit\TestComposite.cpp" />
+    <ClCompile Include="..\src\cppunit\TestDecorator.cpp" />
+    <ClCompile Include="..\src\cppunit\TestFactoryRegistry.cpp" />
+    <ClCompile Include="..\src\cppunit\TestFailure.cpp" />
+    <ClCompile Include="..\src\cppunit\TestLeaf.cpp" />
+    <ClCompile Include="..\src\cppunit\TestNamer.cpp" />
+    <ClCompile Include="..\src\cppunit\TestPath.cpp" />
+    <ClCompile Include="..\src\cppunit\TestPlugInDefaultImpl.cpp" />
+    <ClCompile Include="..\src\cppunit\TestResult.cpp" />
+    <ClCompile Include="..\src\cppunit\TestResultCollector.cpp" />
+    <ClCompile Include="..\src\cppunit\TestRunner.cpp" />
+    <ClCompile Include="..\src\cppunit\TestSetUp.cpp" />
+    <ClCompile Include="..\src\cppunit\TestSuccessListener.cpp" />
+    <ClCompile Include="..\src\cppunit\TestSuite.cpp" />
+    <ClCompile Include="..\src\cppunit\TestSuiteBuilderContext.cpp" />
+    <ClCompile Include="..\src\cppunit\TextOutputter.cpp" />
+    <ClCompile Include="..\src\cppunit\TextTestProgressListener.cpp" />
+    <ClCompile Include="..\src\cppunit\TextTestResult.cpp" />
+    <ClCompile Include="..\src\cppunit\TextTestRunner.cpp" />
+    <ClCompile Include="..\src\cppunit\TypeInfoHelper.cpp" />
+    <ClCompile Include="..\src\cppunit\UnixDynamicLibraryManager.cpp" />
+    <ClCompile Include="..\src\cppunit\Win32DynamicLibraryManager.cpp" />
+    <ClCompile Include="..\src\cppunit\XmlDocument.cpp" />
+    <ClCompile Include="..\src\cppunit\XmlElement.cpp" />
+    <ClCompile Include="..\src\cppunit\XmlOutputter.cpp" />
+    <ClCompile Include="..\src\cppunit\XmlOutputterHook.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\cppunit\DefaultProtector.h" />
+    <ClInclude Include="..\src\cppunit\ProtectorChain.h" />
+    <ClInclude Include="..\src\cppunit\ProtectorContext.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}</ProjectGuid>
+    <RootNamespace>cppunit</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>.\cppunit__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir>.\cppunit__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName>cppunit</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>.\cppunit__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir>.\cppunit__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName>cppunit</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>.\cppunit__$(Platform)_$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>.\cppunit__$(Platform)_$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>.\cppunit__$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IntDir>.\cppunit__$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>cppunit</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>cppunit</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\cppunit\include</AdditionalIncludeDirectories>
+      <MinimalRebuild>false</MinimalRebuild>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\cppunit\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\dep\cppunit\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\dep\cppunit\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+    </Lib>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win/cppunit.vcxproj.filters b/win/cppunit.vcxproj.filters
new file mode 100644
index 00000000000..3f5298ed699
--- /dev/null
+++ b/win/cppunit.vcxproj.filters
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\cppunit\AdditionalMessage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\Asserter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\BeOsDynamicLibraryManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\BriefTestProgressListener.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\CompilerOutputter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\DefaultProtector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\DllMain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\DynamicLibraryManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\DynamicLibraryManagerException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\Exception.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\Message.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\PlugInManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\PlugInParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\Protector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\ProtectorChain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\RepeatedTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\ShlDynamicLibraryManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\SourceLine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\StringTools.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\SynchronizedObject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\Test.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestAssert.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestCase.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestCaseDecorator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestComposite.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestDecorator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestFactoryRegistry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestFailure.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestLeaf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestNamer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestPath.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestPlugInDefaultImpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestResult.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestResultCollector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestRunner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestSetUp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestSuccessListener.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestSuite.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TestSuiteBuilderContext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TextOutputter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TextTestProgressListener.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TextTestResult.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TextTestRunner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\TypeInfoHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\UnixDynamicLibraryManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\Win32DynamicLibraryManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\XmlDocument.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\XmlElement.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\XmlOutputter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cppunit\XmlOutputterHook.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\cppunit\DefaultProtector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\cppunit\ProtectorChain.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\cppunit\ProtectorContext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/VC100/framework.vcxproj b/win/framework.vcxproj
similarity index 85%
rename from win/VC100/framework.vcxproj
rename to win/framework.vcxproj
index 1e057054303..875df05cdaf 100644
--- a/win/VC100/framework.vcxproj
+++ b/win/framework.vcxproj
@@ -60,31 +60,37 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <CLRSupport>false</CLRSupport>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <CLRSupport>false</CLRSupport>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <CLRSupport>false</CLRSupport>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <CLRSupport>false</CLRSupport>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <CLRSupport>false</CLRSupport>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <CLRSupport>false</CLRSupport>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -142,7 +148,7 @@
     <ClCompile>
       <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\framework;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -169,7 +175,7 @@
     <ClCompile>
       <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\framework;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -193,7 +199,7 @@
     <ClCompile>
       <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\framework;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
@@ -220,7 +226,7 @@
     <ClCompile>
       <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\framework;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
@@ -244,7 +250,7 @@
     <ClCompile>
       <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\framework;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -271,7 +277,7 @@
     <ClCompile>
       <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\framework;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -292,36 +298,36 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\framework\Dynamic\FactoryHolder.h" />
-    <ClInclude Include="..\..\src\framework\Dynamic\ObjectRegistry.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\Grid.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridLoader.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridReference.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridRefManager.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\NGrid.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainer.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerFunctions.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerVisitor.h" />
-    <ClInclude Include="..\..\src\framework\Platform\CompilerDefs.h" />
-    <ClInclude Include="..\..\src\framework\Platform\Define.h" />
-    <ClInclude Include="..\..\src\framework\Policies\CreationPolicy.h" />
-    <ClInclude Include="..\..\src\framework\Policies\ObjectLifeTime.h" />
-    <ClInclude Include="..\..\src\framework\Policies\Singleton.h" />
-    <ClInclude Include="..\..\src\framework\Policies\SingletonImp.h" />
-    <ClInclude Include="..\..\src\framework\Policies\ThreadingModel.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\ByteConverter.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\Callback.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\EventProcessor.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedList.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\Reference.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\RefManager.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\TypeList.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\UnorderedMapSet.h" />
+    <ClInclude Include="..\src\framework\Dynamic\FactoryHolder.h" />
+    <ClInclude Include="..\src\framework\Dynamic\ObjectRegistry.h" />
+    <ClInclude Include="..\src\framework\GameSystem\Grid.h" />
+    <ClInclude Include="..\src\framework\GameSystem\GridLoader.h" />
+    <ClInclude Include="..\src\framework\GameSystem\GridReference.h" />
+    <ClInclude Include="..\src\framework\GameSystem\GridRefManager.h" />
+    <ClInclude Include="..\src\framework\GameSystem\NGrid.h" />
+    <ClInclude Include="..\src\framework\GameSystem\TypeContainer.h" />
+    <ClInclude Include="..\src\framework\GameSystem\TypeContainerFunctions.h" />
+    <ClInclude Include="..\src\framework\GameSystem\TypeContainerVisitor.h" />
+    <ClInclude Include="..\src\framework\Platform\CompilerDefs.h" />
+    <ClInclude Include="..\src\framework\Platform\Define.h" />
+    <ClInclude Include="..\src\framework\Policies\CreationPolicy.h" />
+    <ClInclude Include="..\src\framework\Policies\ObjectLifeTime.h" />
+    <ClInclude Include="..\src\framework\Policies\Singleton.h" />
+    <ClInclude Include="..\src\framework\Policies\SingletonImp.h" />
+    <ClInclude Include="..\src\framework\Policies\ThreadingModel.h" />
+    <ClInclude Include="..\src\framework\Utilities\ByteConverter.h" />
+    <ClInclude Include="..\src\framework\Utilities\Callback.h" />
+    <ClInclude Include="..\src\framework\Utilities\EventProcessor.h" />
+    <ClInclude Include="..\src\framework\Utilities\LinkedList.h" />
+    <ClInclude Include="..\src\framework\Utilities\LinkedReference\Reference.h" />
+    <ClInclude Include="..\src\framework\Utilities\LinkedReference\RefManager.h" />
+    <ClInclude Include="..\src\framework\Utilities\TypeList.h" />
+    <ClInclude Include="..\src\framework\Utilities\UnorderedMapSet.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\framework\Policies\MemoryManagement.cpp" />
-    <ClCompile Include="..\..\src\framework\Policies\ObjectLifeTime.cpp" />
-    <ClCompile Include="..\..\src\framework\Utilities\EventProcessor.cpp" />
+    <ClCompile Include="..\src\framework\Policies\MemoryManagement.cpp" />
+    <ClCompile Include="..\src\framework\Policies\ObjectLifeTime.cpp" />
+    <ClCompile Include="..\src\framework\Utilities\EventProcessor.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win/framework.vcxproj.filters b/win/framework.vcxproj.filters
new file mode 100644
index 00000000000..4024a99fc35
--- /dev/null
+++ b/win/framework.vcxproj.filters
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="GameSystem">
+      <UniqueIdentifier>{88ff74be-7df0-46ec-b63c-398134f75db2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Platform">
+      <UniqueIdentifier>{4e0d3208-1366-4fb0-aa41-00721206ae8f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Policies">
+      <UniqueIdentifier>{8bd727a3-b585-4a69-b50f-dfefdbe08f3e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Utilities">
+      <UniqueIdentifier>{d54e4ec6-0de1-4896-8511-e66cd0cda719}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Utilities\LinkedReference">
+      <UniqueIdentifier>{9e95664c-0f92-4de1-af69-8ee6a1fc908f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Dynamic">
+      <UniqueIdentifier>{d9be4e31-76b9-490c-baf9-072221ad89fa}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\framework\Dynamic\FactoryHolder.h" />
+    <ClInclude Include="..\src\framework\Dynamic\ObjectRegistry.h" />
+    <ClInclude Include="..\src\framework\GameSystem\Grid.h" />
+    <ClInclude Include="..\src\framework\GameSystem\GridLoader.h" />
+    <ClInclude Include="..\src\framework\GameSystem\GridReference.h" />
+    <ClInclude Include="..\src\framework\GameSystem\GridRefManager.h" />
+    <ClInclude Include="..\src\framework\GameSystem\NGrid.h" />
+    <ClInclude Include="..\src\framework\GameSystem\TypeContainer.h" />
+    <ClInclude Include="..\src\framework\GameSystem\TypeContainerFunctions.h" />
+    <ClInclude Include="..\src\framework\GameSystem\TypeContainerVisitor.h" />
+    <ClInclude Include="..\src\framework\Platform\CompilerDefs.h" />
+    <ClInclude Include="..\src\framework\Platform\Define.h" />
+    <ClInclude Include="..\src\framework\Policies\CreationPolicy.h" />
+    <ClInclude Include="..\src\framework\Policies\ObjectLifeTime.h" />
+    <ClInclude Include="..\src\framework\Policies\Singleton.h" />
+    <ClInclude Include="..\src\framework\Policies\SingletonImp.h" />
+    <ClInclude Include="..\src\framework\Policies\ThreadingModel.h" />
+    <ClInclude Include="..\src\framework\Utilities\ByteConverter.h" />
+    <ClInclude Include="..\src\framework\Utilities\Callback.h" />
+    <ClInclude Include="..\src\framework\Utilities\EventProcessor.h" />
+    <ClInclude Include="..\src\framework\Utilities\LinkedList.h" />
+    <ClInclude Include="..\src\framework\Utilities\LinkedReference\Reference.h" />
+    <ClInclude Include="..\src\framework\Utilities\LinkedReference\RefManager.h" />
+    <ClInclude Include="..\src\framework\Utilities\TypeList.h" />
+    <ClInclude Include="..\src\framework\Utilities\UnorderedMapSet.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\framework\Policies\MemoryManagement.cpp" />
+    <ClCompile Include="..\src\framework\Policies\ObjectLifeTime.cpp" />
+    <ClCompile Include="..\src\framework\Utilities\EventProcessor.cpp" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/g3dlite.vcxproj b/win/g3dlite.vcxproj
new file mode 100644
index 00000000000..c05bb14d9ab
--- /dev/null
+++ b/win/g3dlite.vcxproj
@@ -0,0 +1,370 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug_NoPCH|Win32">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|Win32">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|x64">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|x64">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGUID>{8072769E-CF10-48BF-B9E1-12752A5DAC6E}</ProjectGUID>
+    <RootNamespace>sockets</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">g3dlite</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">g3dlite</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3dlite</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">g3dlite</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">g3dlite</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.lib</TargetExt>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">g3dlite</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.lib</TargetExt>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include\g3dlite;..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include\g3dlite;..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>..\dep\include\g3dlite;..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>..\dep\include\g3dlite;..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include\g3dlite;..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include\g3dlite;..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\src\g3dlite\AABox.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Box.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Crypto.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\FileSystem.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\format.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Matrix3.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\PhysicsFrame.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\PhysicsFrameSpline.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Plane.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\RegistryUtil.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\System.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Triangle.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\uint128.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Vector3.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Vector4.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\debugAssert.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\fileutils.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\g3dmath.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\g3dfnmatch.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\prompt.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\stringutils.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Any.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\BinaryFormat.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\BinaryInput.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\BinaryOutput.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Capsule.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\CollisionDetection.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\CoordinateFrame.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Cylinder.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Line.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\LineSegment.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Log.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Matrix4.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\MemoryManager.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Quat.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Random.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Ray.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\ReferenceCount.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Sphere.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\TextInput.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\TextOutput.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\UprightFrame.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\Vector2.cpp" />
+    <ClCompile Include="..\dep\src\g3dlite\XML.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\AABox.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Array.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Box.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\CollisionDetection.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\CoordinateFrame.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Crypto.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\debug.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\FileSystem.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\format.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\g3dmath.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\GCamera.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Line.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Matrix3.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\netheaders.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\networkHelpers.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\PhysicsFrame.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\PhysicsFrameSpline.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Plane.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\platform.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Quat.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Ray.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\RegistryUtil.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Sphere.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\stringutils.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\System.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Table.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Triangle.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Vector2.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Vector2int16.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Vector3.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Vector3int16.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Vector4.h" />
+    <ClInclude Include="..\dep\include\g3dlite\G3D\XML.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win/g3dlite.vcxproj.filters b/win/g3dlite.vcxproj.filters
new file mode 100644
index 00000000000..19252b92fe1
--- /dev/null
+++ b/win/g3dlite.vcxproj.filters
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{1fd8ff6c-4f21-4985-be06-a9082b53b059}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{46c5f23b-da25-4b0d-8e5e-c787c3462b5c}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\AABox.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Array.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Box.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\CollisionDetection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\CoordinateFrame.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Crypto.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\debug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\FileSystem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\format.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\g3dmath.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\GCamera.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Line.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Matrix3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\netheaders.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\networkHelpers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\PhysicsFrame.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\PhysicsFrameSpline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Plane.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\platform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Quat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Ray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\RegistryUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Sphere.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\stringutils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\System.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Table.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Triangle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Vector2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Vector2int16.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Vector3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Vector3int16.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\Vector4.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\include\g3dlite\G3D\XML.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\src\g3dlite\AABox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Box.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Crypto.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\FileSystem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\format.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Matrix3.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\PhysicsFrame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\PhysicsFrameSpline.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Plane.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\RegistryUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\System.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Triangle.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\uint128.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Vector3.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Vector4.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\debugAssert.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\fileutils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\g3dmath.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\g3dfnmatch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\prompt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\stringutils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Any.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\BinaryFormat.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\BinaryInput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\BinaryOutput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Capsule.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\CollisionDetection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\CoordinateFrame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Cylinder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Line.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\LineSegment.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Log.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Matrix4.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\MemoryManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Quat.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Random.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Ray.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\ReferenceCount.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Sphere.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\TextInput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\TextOutput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\UprightFrame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\Vector2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\g3dlite\XML.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/game.vcxproj b/win/game.vcxproj
new file mode 100644
index 00000000000..7ad8a3194fa
--- /dev/null
+++ b/win/game.vcxproj
@@ -0,0 +1,1330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug_NoPCH|Win32">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|Win32">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|x64">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|x64">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGUID>{1DC6C4DA-A028-41F3-877D-D5400C594F88}</ProjectGUID>
+    <RootNamespace>game</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">game</TargetName>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">game</TargetName>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">game</TargetName>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">game</TargetName>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">game</TargetName>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">game</TargetName>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\game\vmap;..\dep\ACE_wrappers;..\dep\include\g3dlite;..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pchdef.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+      <ForcedIncludeFiles>pchdef.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/bigobj /Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\game\vmap;..\dep\ACE_wrappers;..\dep\include\g3dlite;..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pchdef.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+      <ForcedIncludeFiles>pchdef.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\game\vmap;..\dep\ACE_wrappers;..\dep\include\g3dlite;..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pchdef.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+      <ForcedIncludeFiles>pchdef.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/bigobj /Zm300 %(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\game\vmap;..\dep\ACE_wrappers;..\dep\include\g3dlite;..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pchdef.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+      <ForcedIncludeFiles>pchdef.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\game\vmap;..\dep\ACE_wrappers;..\dep\include\g3dlite;..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\game\vmap;..\dep\ACE_wrappers;..\dep\include\g3dlite;..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\game__$(Platform)_$(Configuration)\game.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="Detour.vcxproj">
+      <Project>{72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6}</Project>
+    </ProjectReference>
+    <ProjectReference Include="shared.vcxproj">
+      <Project>{90297c34-f231-4df4-848e-a74bcc0e40ed}</Project>
+    </ProjectReference>
+    <ProjectReference Include="g3dlite.vcxproj">
+      <Project>{8072769E-CF10-48BF-B9E1-12752A5DAC6E}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\game\AccountMgr.cpp" />
+    <ClCompile Include="..\src\game\AchievementMgr.cpp" />
+    <ClCompile Include="..\src\game\AggressorAI.cpp" />
+    <ClCompile Include="..\src\game\ahbot\AhBot.cpp" />
+    <ClCompile Include="..\src\game\ahbot\AhBotConfig.cpp" />
+    <ClCompile Include="..\src\game\ahbot\Category.cpp" />
+    <ClCompile Include="..\src\game\ahbot\ConsumableCategory.cpp" />
+    <ClCompile Include="..\src\game\ahbot\ItemBag.cpp" />
+    <ClCompile Include="..\src\game\ahbot\PricingStrategy.cpp" />
+    <ClCompile Include="..\src\game\ahbot\TradeCategory.cpp" />
+    <ClCompile Include="..\src\game\AntiCheat.cpp" />
+    <ClCompile Include="..\src\game\ArenaTeam.cpp" />
+    <ClCompile Include="..\src\game\ArenaTeamHandler.cpp" />
+    <ClCompile Include="..\src\game\AuctionHouseBot\AuctionHouseBot.cpp" />
+    <ClCompile Include="..\src\game\AuctionHouseHandler.cpp" />
+    <ClCompile Include="..\src\game\AuctionHouseMgr.cpp" />
+    <ClCompile Include="..\src\game\Bag.cpp" />
+    <ClCompile Include="..\src\game\BattleField\BattleField.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGround.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundAA.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundAB.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundAV.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundBE.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundDS.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundEY.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundHandler.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundIC.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundMgr.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundNA.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundRB.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundRL.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundRV.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundSA.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundWS.cpp" />
+    <ClCompile Include="..\src\game\Calendar.cpp" />
+    <ClCompile Include="..\src\game\CalendarHandler.cpp" />
+    <ClCompile Include="..\src\game\Camera.cpp" />
+    <ClCompile Include="..\src\game\Channel.cpp" />
+    <ClCompile Include="..\src\game\ChannelHandler.cpp" />
+    <ClCompile Include="..\src\game\ChannelMgr.cpp" />
+    <ClCompile Include="..\src\game\CharacterDatabaseCleaner.cpp" />
+    <ClCompile Include="..\src\game\CharacterHandler.cpp" />
+    <ClCompile Include="..\src\game\Chat.cpp" />
+    <ClCompile Include="..\src\game\ChatHandler.cpp" />
+    <ClCompile Include="..\src\game\ChatLexicsCutter.cpp" />
+    <ClCompile Include="..\src\game\ChatLog.cpp" />
+    <ClCompile Include="..\src\game\CombatHandler.cpp" />
+    <ClCompile Include="..\src\game\Corpse.cpp" />
+    <ClCompile Include="..\src\game\Creature.cpp" />
+    <ClCompile Include="..\src\game\CreatureAI.cpp" />
+    <ClCompile Include="..\src\game\CreatureAIRegistry.cpp" />
+    <ClCompile Include="..\src\game\CreatureAISelector.cpp" />
+    <ClCompile Include="..\src\game\CreatureEventAI.cpp" />
+    <ClCompile Include="..\src\game\CreatureEventAIMgr.cpp" />
+    <ClCompile Include="..\src\game\CreatureLinkingMgr.cpp" />
+    <ClCompile Include="..\src\game\DBCStores.cpp" />
+    <ClCompile Include="..\src\game\DBCStructure.cpp" />
+    <ClCompile Include="..\src\game\debugcmds.cpp" />
+    <ClCompile Include="..\src\game\DuelHandler.cpp" />
+    <ClCompile Include="..\src\game\DynamicObject.cpp" />
+    <ClCompile Include="..\src\game\FollowerReference.cpp" />
+    <ClCompile Include="..\src\game\GameEventMgr.cpp" />
+    <ClCompile Include="..\src\game\GameObject.cpp" />
+    <ClCompile Include="..\src\game\GMTicketHandler.cpp" />
+    <ClCompile Include="..\src\game\GMTicketMgr.cpp" />
+    <ClCompile Include="..\src\game\GossipDef.cpp" />
+    <ClCompile Include="..\src\game\GridMap.cpp" />
+    <ClCompile Include="..\src\game\GridNotifiers.cpp" />
+    <ClCompile Include="..\src\game\Group.cpp" />
+    <ClCompile Include="..\src\game\GroupHandler.cpp" />
+    <ClCompile Include="..\src\game\GroupReference.cpp" />
+    <ClCompile Include="..\src\game\GuardAI.cpp" />
+    <ClCompile Include="..\src\game\Guild.cpp" />
+    <ClCompile Include="..\src\game\GuildHandler.cpp" />
+    <ClCompile Include="..\src\game\GuildMgr.cpp" />
+    <ClCompile Include="..\src\game\HostileRefManager.cpp" />
+    <ClCompile Include="..\src\game\InstanceData.cpp" />
+    <ClCompile Include="..\src\game\Item.cpp" />
+    <ClCompile Include="..\src\game\ItemEnchantmentMgr.cpp" />
+    <ClCompile Include="..\src\game\ItemHandler.cpp" />
+    <ClCompile Include="..\src\game\Level0.cpp" />
+    <ClCompile Include="..\src\game\Level1.cpp" />
+    <ClCompile Include="..\src\game\Level2.cpp" />
+    <ClCompile Include="..\src\game\Level3.cpp" />
+    <ClCompile Include="..\src\game\LFG.cpp" />
+    <ClCompile Include="..\src\game\LFGHandler.cpp" />
+    <ClCompile Include="..\src\game\LFGMgr.cpp" />
+    <ClCompile Include="..\src\game\LootHandler.cpp" />
+    <ClCompile Include="..\src\game\LootMgr.cpp" />
+    <ClCompile Include="..\src\game\Mail.cpp" />
+    <ClCompile Include="..\src\game\MailHandler.cpp" />
+    <ClCompile Include="..\src\game\Map.cpp" />
+    <ClCompile Include="..\src\game\MapManager.cpp" />
+    <ClCompile Include="..\src\game\MapPersistentStateMgr.cpp" />
+    <ClCompile Include="..\src\game\MapUpdater.cpp" />
+    <ClCompile Include="..\src\game\MassMailMgr.cpp" />
+    <ClCompile Include="..\src\game\MiscHandler.cpp" />
+    <ClCompile Include="..\src\game\MotionMaster.cpp" />
+    <ClCompile Include="..\src\game\MoveMap.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\ConfusedMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\FleeingMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\HomeMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\IdleMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\MovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\PointMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\RandomMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\TargetedMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\WaypointMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\MovementHandler.cpp" />
+    <ClCompile Include="..\src\game\movement\MoveSpline.cpp" />
+    <ClCompile Include="..\src\game\movement\MoveSplineInit.cpp" />
+    <ClCompile Include="..\src\game\movement\packet_builder.cpp" />
+    <ClCompile Include="..\src\game\movement\spline.cpp" />
+    <ClCompile Include="..\src\game\movement\util.cpp" />
+    <ClCompile Include="..\src\game\NPCHandler.cpp" />
+    <ClCompile Include="..\src\game\NullCreatureAI.cpp" />
+    <ClCompile Include="..\src\game\Object.cpp" />
+    <ClCompile Include="..\src\game\ObjectAccessor.cpp" />
+    <ClCompile Include="..\src\game\ObjectGridLoader.cpp" />
+    <ClCompile Include="..\src\game\ObjectGuid.cpp" />
+    <ClCompile Include="..\src\game\ObjectMgr.cpp" />
+    <ClCompile Include="..\src\game\ObjectPosSelector.cpp" />
+    <ClCompile Include="..\src\game\Opcodes.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvP.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPEP.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPGH.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPHP.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPMgr.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPNA.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPSI.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPTF.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPZM.cpp" />
+    <ClCompile Include="..\src\game\PathFinder.cpp" />
+    <ClCompile Include="..\src\game\pchdef.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\src\game\Pet.cpp" />
+    <ClCompile Include="..\src\game\PetAI.cpp" />
+    <ClCompile Include="..\src\game\PetHandler.cpp" />
+    <ClCompile Include="..\src\game\PetitionsHandler.cpp" />
+    <ClCompile Include="..\src\game\Player.cpp" />
+    <ClCompile Include="..\src\game\playerbot\AiFactory.cpp" />
+    <ClCompile Include="..\src\game\playerbot\ChatFilter.cpp" />
+    <ClCompile Include="..\src\game\playerbot\ChatHelper.cpp" />
+    <ClCompile Include="..\src\game\playerbot\FleeManager.cpp" />
+    <ClCompile Include="..\src\game\playerbot\Helpers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\LootObjectStack.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotAI.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotAIBase.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotAIConfig.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotFactory.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotMgr.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotSecurity.cpp" />
+    <ClCompile Include="..\src\game\playerbot\RandomPlayerbotFactory.cpp" />
+    <ClCompile Include="..\src\game\playerbot\RandomPlayerbotMgr.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Action.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\ActionBasket.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\AcceptQuestAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\AddLootAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\AreaTriggerAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\AttackAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\BankAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\BuffAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\BuyAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\CastCustomSpellAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ChangeChatAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ChangeStrategyAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ChangeTalentsAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ChatShortcutActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\CheckMountStateAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\DestroyItemAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\DropQuestAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\EmoteAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\EquipAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\FollowActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\GenericActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\GenericSpellActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\GossipHelloAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\GuildAcceptAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\GuildBankAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\HelpAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\InventoryAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\InventoryChangeFailureAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\LfgActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ListQuestsActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ListSpellsAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\LogLevelAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\LootAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\LootRollAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\LootStrategyAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\MovementActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\NonCombatActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\PositionAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\QueryItemUsageAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\QueryQuestAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\QuestAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ReadyCheckAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\RememberTaxiAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\RepairAllAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ResetAiAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ReviveFromCorpseAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\RewardAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\SaveManaAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\SecurityCheckAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\SellAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\SetHomeAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\StatsAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\StayActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\SuggestWhatToDoAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TalkToQuestGiverAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TaxiAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TeleportAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TellCastFailedAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TellItemCountAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TellLosAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TellReputationAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TellTargetAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TradeAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TradeStatusAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TrainerAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\UnequipAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\UseItemAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\UseMeetingStoneAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\WhoAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\AiObject.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\AiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\BearTankDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\CasterDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\CatDpsDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\DruidActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\DruidAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\DruidMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\DruidTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\FeralDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\GenericDruidNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\GenericDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\HealDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Engine.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Event.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\AttackEnemyPlayersStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\AttackRtiStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\AttackWeakStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\CastTimeStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\ChatCommandHandlerStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\CombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\ConserveManaStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\DeadStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\DpsAoeStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\DpsAssistStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\DuelStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\EmoteStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\FleeStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\FollowMasterStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\GrindingStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\GuardStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\KiteStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\LootNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\MeleeCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\NonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\PassiveStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\PullStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\QuestStrategies.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\RacialsStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\RangedCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\RunawayStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\StayStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\TankAoeStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\TankAssistStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\TellTargetStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\ThreatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\UseFoodStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\UsePotionsStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\WorldPacketHandlerStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\DpsHunterStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\GenericHunterNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\GenericHunterStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\HunterActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\HunterAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\HunterBuffStrategies.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\HunterMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\HunterTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\ArcaneMageStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\FireMageStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\FrostMageStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\GenericMageNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\GenericMageStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\MageActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\MageAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\MageMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\MageTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Multiplier.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\DpsPaladinStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\GenericPaladinNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\GenericPaladinStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\PaladinActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\PaladinAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\PaladinBuffStrategies.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\PaladinMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\PaladinTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\TankPaladinStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\PassiveMultiplier.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\GenericPriestStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\HealPriestStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\HolyPriestStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\PriestActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\PriestAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\PriestMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\PriestNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\PriestTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\ShadowPriestStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Queue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\DpsRogueStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\GenericRogueNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\RogueActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\RogueAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\RogueMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\RogueTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\CasterShamanStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\GenericShamanStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\HealShamanStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\MeleeShamanStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\ShamanActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\ShamanAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\ShamanMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\ShamanNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\ShamanTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\TotemsShamanStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Strategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Trigger.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\triggers\CureTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\triggers\GenericTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\triggers\HealthTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\triggers\LootTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Value.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\AoeHealValues.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\AttackerCountValues.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\AttackersValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\AttackerWithoutAuraTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\CcTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\CurrentCcTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\CurrentTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\DpsTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\DuelTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\EnemyHealerTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\EnemyPlayerValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\Formations.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\formations\Arrow.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\GrindTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\InvalidTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\ItemCountValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\ItemForSpellValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\LeastHpTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\LineTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\NearestAdsValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\NearestCorpsesValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\NearestGameObjects.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\NearestNpcsValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PartyMemberToDispel.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PartyMemberToHeal.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PartyMemberToResurrect.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PartyMemberValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PartyMemberWithoutAuraValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PositionValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PossibleTargetsValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\RtiValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\SpellCastUsefulValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\SpellIdValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\StatsValues.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\TankTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\TargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\ThreatValues.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\DpsWarlockStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\GenericWarlockNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\GenericWarlockStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\TankWarlockStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\WarlockActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\WarlockAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\WarlockMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\WarlockTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\DpsWarriorStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\GenericWarriorNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\GenericWarriorStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\TankWarriorStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\WarriorActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\WarriorAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\WarriorMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\WarriorTriggers.cpp" />
+    <ClCompile Include="..\src\game\PlayerDump.cpp" />
+    <ClCompile Include="..\src\game\PoolManager.cpp" />
+    <ClCompile Include="..\src\game\QueryHandler.cpp" />
+    <ClCompile Include="..\src\game\QuestDef.cpp" />
+    <ClCompile Include="..\src\game\QuestHandler.cpp" />
+    <ClCompile Include="..\src\game\ReactorAI.cpp" />
+    <ClCompile Include="..\src\game\ReputationMgr.cpp" />
+    <ClCompile Include="..\src\game\ScriptMgr.cpp" />
+    <ClCompile Include="..\src\game\SkillHandler.cpp" />
+    <ClCompile Include="..\src\game\SocialMgr.cpp" />
+    <ClCompile Include="..\src\game\Spell.cpp" />
+    <ClCompile Include="..\src\game\SpellAuras.cpp" />
+    <ClCompile Include="..\src\game\SpellEffects.cpp" />
+    <ClCompile Include="..\src\game\SpellHandler.cpp" />
+    <ClCompile Include="..\src\game\SpellMgr.cpp" />
+    <ClCompile Include="..\src\game\SQLStorages.cpp" />
+    <ClCompile Include="..\src\game\StateMgr.cpp" />
+    <ClCompile Include="..\src\game\StatSystem.cpp" />
+    <ClCompile Include="..\src\game\TaxiHandler.cpp" />
+    <ClCompile Include="..\src\game\TemporarySummon.cpp" />
+    <ClCompile Include="..\src\game\ThreatManager.cpp" />
+    <ClCompile Include="..\src\game\Totem.cpp" />
+    <ClCompile Include="..\src\game\TotemAI.cpp" />
+    <ClCompile Include="..\src\game\TradeHandler.cpp" />
+    <ClCompile Include="..\src\game\Transports.cpp" />
+    <ClCompile Include="..\src\game\TransportSystem.cpp" />
+    <ClCompile Include="..\src\game\Unit.cpp" />
+    <ClCompile Include="..\src\game\UnitAuraProcHandler.cpp" />
+    <ClCompile Include="..\src\game\UpdateData.cpp" />
+    <ClCompile Include="..\src\game\UpdateFieldFlags.cpp" />
+    <ClCompile Include="..\src\game\Vehicle.cpp" />
+    <ClCompile Include="..\src\game\VehicleHandler.cpp" />
+    <ClCompile Include="..\src\game\vmap\BIH.cpp" />
+    <ClCompile Include="..\src\game\vmap\DynamicTree.cpp" />
+    <ClCompile Include="..\src\game\vmap\GameObjectModel.cpp" />
+    <ClCompile Include="..\src\game\vmap\MapTree.cpp" />
+    <ClCompile Include="..\src\game\vmap\ModelInstance.cpp" />
+    <ClCompile Include="..\src\game\vmap\TileAssembler.cpp" />
+    <ClCompile Include="..\src\game\vmap\VMapFactory.cpp" />
+    <ClCompile Include="..\src\game\vmap\VMapManager2.cpp" />
+    <ClCompile Include="..\src\game\vmap\WorldModel.cpp" />
+    <ClCompile Include="..\src\game\VoiceChatHandler.cpp" />
+    <ClCompile Include="..\src\game\warden\WardenBase.cpp" />
+    <ClCompile Include="..\src\game\warden\WardenDataStorage.cpp" />
+    <ClCompile Include="..\src\game\warden\WardenMac.cpp" />
+    <ClCompile Include="..\src\game\warden\WardenWin.cpp" />
+    <ClCompile Include="..\src\game\WaypointManager.cpp" />
+    <ClCompile Include="..\src\game\Weather.cpp" />
+    <ClCompile Include="..\src\game\World.cpp" />
+    <ClCompile Include="..\src\game\WorldLocation.cpp" />
+    <ClCompile Include="..\src\game\WorldObjectEvents.cpp" />
+    <ClCompile Include="..\src\game\WorldSession.cpp" />
+    <ClCompile Include="..\src\game\WorldSocket.cpp" />
+    <ClCompile Include="..\src\game\WorldSocketMgr.cpp" />
+    <ClCompile Include="..\src\game\WorldStateMgr.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\game\AccountMgr.h" />
+    <ClInclude Include="..\src\game\AchievementMgr.h" />
+    <ClInclude Include="..\src\game\AggressorAI.h" />
+    <ClInclude Include="..\src\game\ahbot\AhBot.h" />
+    <ClInclude Include="..\src\game\ahbot\AhBotConfig.h" />
+    <ClInclude Include="..\src\game\ahbot\Category.h" />
+    <ClInclude Include="..\src\game\ahbot\ConsumableCategory.h" />
+    <ClInclude Include="..\src\game\ahbot\ItemBag.h" />
+    <ClInclude Include="..\src\game\ahbot\PricingStrategy.h" />
+    <ClInclude Include="..\src\game\ahbot\TradeCategory.h" />
+    <ClInclude Include="..\src\game\AntiCheat.h" />
+    <ClInclude Include="..\src\game\ArenaTeam.h" />
+    <ClInclude Include="..\src\game\AuctionHouseBot\AuctionHouseBot.h" />
+    <ClInclude Include="..\src\game\AuctionHouseMgr.h" />
+    <ClInclude Include="..\src\game\Bag.h" />
+    <ClInclude Include="..\src\game\BattleField\BattleField.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGround.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundAA.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundAB.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundAV.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundBE.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundDS.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundEY.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundIC.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundMgr.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundNA.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundRB.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundRL.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundRV.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundSA.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundWS.h" />
+    <ClInclude Include="..\src\game\Calendar.h" />
+    <ClInclude Include="..\src\game\Camera.h" />
+    <ClInclude Include="..\src\game\Cell.h" />
+    <ClInclude Include="..\src\game\CellImpl.h" />
+    <ClInclude Include="..\src\game\Channel.h" />
+    <ClInclude Include="..\src\game\ChannelMgr.h" />
+    <ClInclude Include="..\src\game\CharacterDatabaseCleaner.h" />
+    <ClInclude Include="..\src\game\Chat.h" />
+    <ClInclude Include="..\src\game\ChatLexicsCutter.h" />
+    <ClInclude Include="..\src\game\ChatLog.h" />
+    <ClInclude Include="..\src\game\Corpse.h" />
+    <ClInclude Include="..\src\game\Creature.h" />
+    <ClInclude Include="..\src\game\CreatureAI.h" />
+    <ClInclude Include="..\src\game\CreatureAIImpl.h" />
+    <ClInclude Include="..\src\game\CreatureAIRegistry.h" />
+    <ClInclude Include="..\src\game\CreatureAISelector.h" />
+    <ClInclude Include="..\src\game\CreatureEventAI.h" />
+    <ClInclude Include="..\src\game\CreatureEventAIMgr.h" />
+    <ClInclude Include="..\src\game\CreatureLinkingMgr.h" />
+    <ClInclude Include="..\src\game\DBCEnums.h" />
+    <ClInclude Include="..\src\game\DBCfmt.h" />
+    <ClInclude Include="..\src\game\DBCStores.h" />
+    <ClInclude Include="..\src\game\DBCStructure.h" />
+    <ClInclude Include="..\src\game\DynamicObject.h" />
+    <ClInclude Include="..\src\game\FollowerReference.h" />
+    <ClInclude Include="..\src\game\FollowerRefManager.h" />
+    <ClInclude Include="..\src\game\Formulas.h" />
+    <ClInclude Include="..\src\game\GameEventMgr.h" />
+    <ClInclude Include="..\src\game\GameObject.h" />
+    <ClInclude Include="..\src\game\GMTicketMgr.h" />
+    <ClInclude Include="..\src\game\GossipDef.h" />
+    <ClInclude Include="..\src\game\GridDefines.h" />
+    <ClInclude Include="..\src\game\GridMap.h" />
+    <ClInclude Include="..\src\game\GridNotifiers.h" />
+    <ClInclude Include="..\src\game\GridNotifiersImpl.h" />
+    <ClInclude Include="..\src\game\Group.h" />
+    <ClInclude Include="..\src\game\GroupReference.h" />
+    <ClInclude Include="..\src\game\GroupRefManager.h" />
+    <ClInclude Include="..\src\game\GuardAI.h" />
+    <ClInclude Include="..\src\game\Guild.h" />
+    <ClInclude Include="..\src\game\GuildMgr.h" />
+    <ClInclude Include="..\src\game\HostileRefManager.h" />
+    <ClInclude Include="..\src\game\InstanceData.h" />
+    <ClInclude Include="..\src\game\Item.h" />
+    <ClInclude Include="..\src\game\ItemEnchantmentMgr.h" />
+    <ClInclude Include="..\src\game\ItemPrototype.h" />
+    <ClInclude Include="..\src\game\Language.h" />
+    <ClInclude Include="..\src\game\LFG.h" />
+    <ClInclude Include="..\src\game\LFGMgr.h" />
+    <ClInclude Include="..\src\game\LootMgr.h" />
+    <ClInclude Include="..\src\game\Mail.h" />
+    <ClInclude Include="..\src\game\Map.h" />
+    <ClInclude Include="..\src\game\MapManager.h" />
+    <ClInclude Include="..\src\game\MapPersistentStateMgr.h" />
+    <ClInclude Include="..\src\game\MapReference.h" />
+    <ClInclude Include="..\src\game\MapRefManager.h" />
+    <ClInclude Include="..\src\game\MapUpdater.h" />
+    <ClInclude Include="..\src\game\MassMailMgr.h" />
+    <ClInclude Include="..\src\game\MotionMaster.h" />
+    <ClInclude Include="..\src\game\MoveMap.h" />
+    <ClInclude Include="..\src\game\MoveMapSharedDefines.h" />
+    <ClInclude Include="..\src\game\movementGenerators\ConfusedMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\FleeingMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\HomeMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\IdleMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\MovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\MovementGeneratorImpl.h" />
+    <ClInclude Include="..\src\game\movementGenerators\PointMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\RandomMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\TargetedMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\WaypointMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movement\MoveSpline.h" />
+    <ClInclude Include="..\src\game\movement\MoveSplineFlag.h" />
+    <ClInclude Include="..\src\game\movement\MoveSplineInit.h" />
+    <ClInclude Include="..\src\game\movement\MoveSplineInitArgs.h" />
+    <ClInclude Include="..\src\game\movement\packet_builder.h" />
+    <ClInclude Include="..\src\game\movement\spline.h" />
+    <ClInclude Include="..\src\game\movement\spline.impl.h" />
+    <ClInclude Include="..\src\game\movement\typedefs.h" />
+    <ClInclude Include="..\src\game\NPCHandler.h" />
+    <ClInclude Include="..\src\game\NullCreatureAI.h" />
+    <ClInclude Include="..\src\game\Object.h" />
+    <ClInclude Include="..\src\game\ObjectAccessor.h" />
+    <ClInclude Include="..\src\game\ObjectGridLoader.h" />
+    <ClInclude Include="..\src\game\ObjectGuid.h" />
+    <ClInclude Include="..\src\game\ObjectLock.h" />
+    <ClInclude Include="..\src\game\ObjectMgr.h" />
+    <ClInclude Include="..\src\game\ObjectPosSelector.h" />
+    <ClInclude Include="..\src\game\Opcodes.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvP.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPEP.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPGH.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPHP.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPMgr.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPNA.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPSI.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPTF.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPZM.h" />
+    <ClInclude Include="..\src\game\Path.h" />
+    <ClInclude Include="..\src\game\PathFinder.h" />
+    <ClInclude Include="..\src\game\pchdef.h" />
+    <ClInclude Include="..\src\game\Pet.h" />
+    <ClInclude Include="..\src\game\PetAI.h" />
+    <ClInclude Include="..\src\game\Player.h" />
+    <ClInclude Include="..\src\game\playerbot\AiFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\ChatFilter.h" />
+    <ClInclude Include="..\src\game\playerbot\ChatHelper.h" />
+    <ClInclude Include="..\src\game\playerbot\FleeManager.h" />
+    <ClInclude Include="..\src\game\playerbot\LazyCalculatedValue.h" />
+    <ClInclude Include="..\src\game\playerbot\LootObjectStack.h" />
+    <ClInclude Include="..\src\game\playerbot\playerbot.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotAIAware.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotAIBase.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotAIConfig.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotClassAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotDeathKnightAI.h" />
+    <ClInclude Include="..\src\game\playerbot\playerbotDefs.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotDruidAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotHunterAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotMageAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotMgr.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotPaladinAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotPriestAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotRogueAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotSecurity.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotShamanAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotWarlockAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotWarriorAI.h" />
+    <ClInclude Include="..\src\game\playerbot\RandomPlayerbotFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\RandomPlayerbotMgr.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Action.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\ActionBasket.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AcceptDuelAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AcceptInvitationAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AcceptQuestAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AcceptResurrectAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ActionContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AddLootAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AreaTriggerAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AttackAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\BankAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\BuffAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\BuyAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\CastCustomSpellAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChangeChatAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChangeStrategyAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChangeTalentsAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChatActionContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChatShortcutActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\CheckMountStateAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChooseTargetActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\DestroyItemAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\DropQuestAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\EmoteAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\EquipAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\FollowActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\GenericActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\GenericSpellActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\GossipHelloAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\GuildAcceptAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\GuildBankAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\HelpAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\InventoryAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\InventoryChangeFailureAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\InviteToGroupAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LeaveGroupAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LfgActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ListQuestsActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ListSpellsAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LogLevelAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LootAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LootRollAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LootStrategyAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\MovementActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\NonCombatActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\PassLeadershipToMasterAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\PositionAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\QueryItemUsageAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\QueryQuestAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\QuestAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ReachTargetActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ReadyCheckAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ReleaseSpiritAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\RememberTaxiAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\RepairAllAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ResetAiAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ReviveFromCorpseAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\RewardAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\RtiAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\SaveManaAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\SecurityCheckAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\SellAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\SetHomeAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\StatsAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\StayActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\SuggestWhatToDoAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TalkToQuestGiverAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TaxiAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TeleportAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellCastFailedAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellItemCountAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellLosAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellMasterAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellReputationAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellTargetAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TradeAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TradeStatusAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TrainerAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\UnequipAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\UseItemAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\UseMeetingStoneAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\WhoAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\WorldPacketActionContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\AiObject.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\AiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\BearTankDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\CasterDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\CatDpsDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidBearActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidCatActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidShapeshiftActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\FeralDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\GenericDruidNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\GenericDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\HealDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Engine.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Event.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\ExternalEventHelper.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\AttackEnemyPlayersStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\AttackRtiStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\AttackWeakStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\CastTimeStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\ChatCommandHandlerStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\CombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\ConserveManaStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\DeadStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\DpsAoeStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\DpsAssistStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\DuelStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\EmoteStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\FleeStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\FollowMasterStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\GrindingStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\GuardStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\KiteStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\LootNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\MeleeCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\NonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\PassiveStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\PassTroughStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\PullStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\QuestStrategies.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\RacialsStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\RangedCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\RunawayStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\StayStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\TankAoeStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\TankAssistStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\TellTargetStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\ThreatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\UseFoodStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\UsePotionsStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\WorldPacketHandlerStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\DpsHunterStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\GenericHunterNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\GenericHunterStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\HunterActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\HunterAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\HunterBuffStrategies.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\HunterMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\HunterTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\ItemVisitors.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\ArcaneMageStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\FireMageStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\FrostMageStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\GenericMageNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\GenericMageStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\MageActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\MageAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\MageMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\MageTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Multiplier.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\NamedObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\DpsPaladinStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\GenericPaladinNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\GenericPaladinStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\GenericPaladinStrategyActionNodeFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\PaladinActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\PaladinAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\PaladinBuffStrategies.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\PaladinMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\PaladinTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\TankPaladinStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\PassiveMultiplier.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\GenericPriestStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\GenericPriestStrategyActionNodeFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\HealPriestStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\HolyPriestStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestNonCombatStrategyActionNodeFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\ShadowPriestStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\ShadowPriestStrategyActionNodeFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Queue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\DpsRogueStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\GenericRogueNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueComboActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueFinishingActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueOpeningActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\CasterShamanStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\GenericShamanStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\HealShamanStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\MeleeShamanStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\ShamanActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\ShamanAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\ShamanMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\ShamanNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\ShamanTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\TotemsShamanStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Strategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\StrategyContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Trigger.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\ChatCommandTrigger.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\ChatTriggerContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\CureTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\GenericTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\HealthTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\LootTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\RangeTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\TriggerContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\WithinAreaTrigger.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\WorldPacketTrigger.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\WorldPacketTriggerContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Value.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AlwaysLootListValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AoeHealValues.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AttackerCountValues.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AttackersValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AttackerWithoutAuraTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AvailableLootValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\CcTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ChatValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\CurrentCcTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\CurrentTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\DistanceValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\DpsTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\DuelTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\EnemyHealerTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\EnemyPlayerValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\Formations.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\formations\Arrow.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\GrindTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\HasAvailableLootValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\HasTotemValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\InvalidTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\IsBehindValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\IsFacingValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\IsMovingValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ItemCountValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ItemForSpellValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LastMovementValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LastSpellCastValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LeastHpTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LineTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LogLevelValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LootStrategyValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ManaSaveLevelValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\MasterTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\NearestAdsValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\NearestCorpsesValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\NearestGameObjects.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\NearestNpcsValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\NearestUnitsValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PartyMemberToDispel.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PartyMemberToHeal.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PartyMemberToResurrect.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PartyMemberValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PartyMemberWithoutAuraValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PetTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PositionValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PossibleTargetsValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\RtiTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\RtiValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\SelfTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\SharedValueContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\SpellCastUsefulValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\SpellIdValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\StatsValues.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\TankTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\TargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ThreatValues.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ValueContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\DpsWarlockStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\GenericWarlockNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\GenericWarlockStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\TankWarlockStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\WarlockActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\WarlockAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\WarlockMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\WarlockTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\DpsWarriorStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\GenericWarriorNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\GenericWarriorStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\TankWarriorStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\WarriorActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\WarriorAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\WarriorMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\WarriorTriggers.h" />
+    <ClInclude Include="..\src\game\PlayerDump.h" />
+    <ClInclude Include="..\src\game\PoolManager.h" />
+    <ClInclude Include="..\src\game\QuestDef.h" />
+    <ClInclude Include="..\src\game\ReactorAI.h" />
+    <ClInclude Include="..\src\game\ReputationMgr.h" />
+    <ClInclude Include="..\src\game\ScriptMgr.h" />
+    <ClInclude Include="..\src\game\SharedDefines.h" />
+    <ClInclude Include="..\src\game\SocialMgr.h" />
+    <ClInclude Include="..\src\game\Spell.h" />
+    <ClInclude Include="..\src\game\SpellAuraDefines.h" />
+    <ClInclude Include="..\src\game\SpellAuras.h" />
+    <ClInclude Include="..\src\game\SpellClassMask.h" />
+    <ClInclude Include="..\src\game\SpellMgr.h" />
+    <ClInclude Include="..\src\game\SQLStorages.h" />
+    <ClInclude Include="..\src\game\StateMgr.h" />
+    <ClInclude Include="..\src\game\StateMgrImpl.h" />
+    <ClInclude Include="..\src\game\TemporarySummon.h" />
+    <ClInclude Include="..\src\game\ThreatManager.h" />
+    <ClInclude Include="..\src\game\Totem.h" />
+    <ClInclude Include="..\src\game\TotemAI.h" />
+    <ClInclude Include="..\src\game\Transports.h" />
+    <ClInclude Include="..\src\game\TransportSystem.h" />
+    <ClInclude Include="..\src\game\Unit.h" />
+    <ClInclude Include="..\src\game\UnitEvents.h" />
+    <ClInclude Include="..\src\game\UpdateData.h" />
+    <ClInclude Include="..\src\game\UpdateFieldFlags.h" />
+    <ClInclude Include="..\src\game\UpdateFields.h" />
+    <ClInclude Include="..\src\game\UpdateMask.h" />
+    <ClInclude Include="..\src\game\Vehicle.h" />
+    <ClInclude Include="..\src\game\vmap\BIH.h" />
+    <ClInclude Include="..\src\game\vmap\BIHWrap.h" />
+    <ClInclude Include="..\src\game\vmap\DynamicTree.h" />
+    <ClInclude Include="..\src\game\vmap\GameObjectModel.h" />
+    <ClInclude Include="..\src\game\vmap\IVMapManager.h" />
+    <ClInclude Include="..\src\game\vmap\MapTree.h" />
+    <ClInclude Include="..\src\game\vmap\ModelInstance.h" />
+    <ClInclude Include="..\src\game\vmap\RegularGrid.h" />
+    <ClInclude Include="..\src\game\vmap\TileAssembler.h" />
+    <ClInclude Include="..\src\game\vmap\VMapDefinitions.h" />
+    <ClInclude Include="..\src\game\vmap\VMapFactory.h" />
+    <ClInclude Include="..\src\game\vmap\VMapManager2.h" />
+    <ClInclude Include="..\src\game\vmap\VMapTools.h" />
+    <ClInclude Include="..\src\game\vmap\WorldModel.h" />
+    <ClInclude Include="..\src\game\warden\WardenBase.h" />
+    <ClInclude Include="..\src\game\warden\WardenDataStorage.h" />
+    <ClInclude Include="..\src\game\warden\WardenMac.h" />
+    <ClInclude Include="..\src\game\warden\WardenModuleMac.h" />
+    <ClInclude Include="..\src\game\warden\WardenModuleWin.h" />
+    <ClInclude Include="..\src\game\warden\WardenWin.h" />
+    <ClInclude Include="..\src\game\WaypointManager.h" />
+    <ClInclude Include="..\src\game\Weather.h" />
+    <ClInclude Include="..\src\game\World.h" />
+    <ClInclude Include="..\src\game\WorldLocation.h" />
+    <ClInclude Include="..\src\game\WorldObjectEvents.h" />
+    <ClInclude Include="..\src\game\WorldSession.h" />
+    <ClInclude Include="..\src\game\WorldSocket.h" />
+    <ClInclude Include="..\src\game\WorldSocketMgr.h" />
+    <ClInclude Include="..\src\game\WorldStateMgr.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\src\game\CMakeLists.txt" />
+    <None Include="..\src\game\Mail.cpp.orig" />
+    <None Include="..\src\game\Makefile.in" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win/game.vcxproj.filters b/win/game.vcxproj.filters
new file mode 100644
index 00000000000..0f16386b5ab
--- /dev/null
+++ b/win/game.vcxproj.filters
@@ -0,0 +1,962 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\src\game\AccountMgr.cpp" />
+    <ClCompile Include="..\src\game\AchievementMgr.cpp" />
+    <ClCompile Include="..\src\game\AggressorAI.cpp" />
+    <ClCompile Include="..\src\game\ahbot\AhBot.cpp" />
+    <ClCompile Include="..\src\game\ahbot\AhBotConfig.cpp" />
+    <ClCompile Include="..\src\game\ahbot\Category.cpp" />
+    <ClCompile Include="..\src\game\ahbot\ConsumableCategory.cpp" />
+    <ClCompile Include="..\src\game\ahbot\ItemBag.cpp" />
+    <ClCompile Include="..\src\game\ahbot\PricingStrategy.cpp" />
+    <ClCompile Include="..\src\game\ahbot\TradeCategory.cpp" />
+    <ClCompile Include="..\src\game\AntiCheat.cpp" />
+    <ClCompile Include="..\src\game\ArenaTeam.cpp" />
+    <ClCompile Include="..\src\game\ArenaTeamHandler.cpp" />
+    <ClCompile Include="..\src\game\AuctionHouseBot\AuctionHouseBot.cpp" />
+    <ClCompile Include="..\src\game\AuctionHouseHandler.cpp" />
+    <ClCompile Include="..\src\game\AuctionHouseMgr.cpp" />
+    <ClCompile Include="..\src\game\Bag.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGround.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundAA.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundAB.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundAV.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundBE.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundDS.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundEY.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundHandler.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundIC.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundMgr.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundNA.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundRB.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundRL.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundRV.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundSA.cpp" />
+    <ClCompile Include="..\src\game\BattleGround\BattleGroundWS.cpp" />
+    <ClCompile Include="..\src\game\Calendar.cpp" />
+    <ClCompile Include="..\src\game\CalendarHandler.cpp" />
+    <ClCompile Include="..\src\game\Camera.cpp" />
+    <ClCompile Include="..\src\game\Channel.cpp" />
+    <ClCompile Include="..\src\game\ChannelHandler.cpp" />
+    <ClCompile Include="..\src\game\ChannelMgr.cpp" />
+    <ClCompile Include="..\src\game\CharacterDatabaseCleaner.cpp" />
+    <ClCompile Include="..\src\game\CharacterHandler.cpp" />
+    <ClCompile Include="..\src\game\Chat.cpp" />
+    <ClCompile Include="..\src\game\ChatHandler.cpp" />
+    <ClCompile Include="..\src\game\ChatLexicsCutter.cpp" />
+    <ClCompile Include="..\src\game\ChatLog.cpp" />
+    <ClCompile Include="..\src\game\CombatHandler.cpp" />
+    <ClCompile Include="..\src\game\Corpse.cpp" />
+    <ClCompile Include="..\src\game\Creature.cpp" />
+    <ClCompile Include="..\src\game\CreatureAI.cpp" />
+    <ClCompile Include="..\src\game\CreatureAIRegistry.cpp" />
+    <ClCompile Include="..\src\game\CreatureAISelector.cpp" />
+    <ClCompile Include="..\src\game\CreatureEventAI.cpp" />
+    <ClCompile Include="..\src\game\CreatureEventAIMgr.cpp" />
+    <ClCompile Include="..\src\game\CreatureLinkingMgr.cpp" />
+    <ClCompile Include="..\src\game\DBCStores.cpp" />
+    <ClCompile Include="..\src\game\DBCStructure.cpp" />
+    <ClCompile Include="..\src\game\debugcmds.cpp" />
+    <ClCompile Include="..\src\game\DuelHandler.cpp" />
+    <ClCompile Include="..\src\game\DynamicObject.cpp" />
+    <ClCompile Include="..\src\game\FollowerReference.cpp" />
+    <ClCompile Include="..\src\game\GameEventMgr.cpp" />
+    <ClCompile Include="..\src\game\GameObject.cpp" />
+    <ClCompile Include="..\src\game\GMTicketHandler.cpp" />
+    <ClCompile Include="..\src\game\GMTicketMgr.cpp" />
+    <ClCompile Include="..\src\game\GossipDef.cpp" />
+    <ClCompile Include="..\src\game\GridMap.cpp" />
+    <ClCompile Include="..\src\game\GridNotifiers.cpp" />
+    <ClCompile Include="..\src\game\Group.cpp" />
+    <ClCompile Include="..\src\game\GroupHandler.cpp" />
+    <ClCompile Include="..\src\game\GroupReference.cpp" />
+    <ClCompile Include="..\src\game\GuardAI.cpp" />
+    <ClCompile Include="..\src\game\Guild.cpp" />
+    <ClCompile Include="..\src\game\GuildHandler.cpp" />
+    <ClCompile Include="..\src\game\GuildMgr.cpp" />
+    <ClCompile Include="..\src\game\HostileRefManager.cpp" />
+    <ClCompile Include="..\src\game\InstanceData.cpp" />
+    <ClCompile Include="..\src\game\Item.cpp" />
+    <ClCompile Include="..\src\game\ItemEnchantmentMgr.cpp" />
+    <ClCompile Include="..\src\game\ItemHandler.cpp" />
+    <ClCompile Include="..\src\game\Level0.cpp" />
+    <ClCompile Include="..\src\game\Level1.cpp" />
+    <ClCompile Include="..\src\game\Level2.cpp" />
+    <ClCompile Include="..\src\game\Level3.cpp" />
+    <ClCompile Include="..\src\game\LFG.cpp" />
+    <ClCompile Include="..\src\game\LFGHandler.cpp" />
+    <ClCompile Include="..\src\game\LFGMgr.cpp" />
+    <ClCompile Include="..\src\game\LootHandler.cpp" />
+    <ClCompile Include="..\src\game\LootMgr.cpp" />
+    <ClCompile Include="..\src\game\Mail.cpp" />
+    <ClCompile Include="..\src\game\MailHandler.cpp" />
+    <ClCompile Include="..\src\game\Map.cpp" />
+    <ClCompile Include="..\src\game\MapManager.cpp" />
+    <ClCompile Include="..\src\game\MapPersistentStateMgr.cpp" />
+    <ClCompile Include="..\src\game\MapUpdater.cpp" />
+    <ClCompile Include="..\src\game\MassMailMgr.cpp" />
+    <ClCompile Include="..\src\game\MiscHandler.cpp" />
+    <ClCompile Include="..\src\game\MotionMaster.cpp" />
+    <ClCompile Include="..\src\game\MoveMap.cpp" />
+    <ClCompile Include="..\src\game\MovementHandler.cpp" />
+    <ClCompile Include="..\src\game\movement\MoveSpline.cpp" />
+    <ClCompile Include="..\src\game\movement\MoveSplineInit.cpp" />
+    <ClCompile Include="..\src\game\movement\packet_builder.cpp" />
+    <ClCompile Include="..\src\game\movement\spline.cpp" />
+    <ClCompile Include="..\src\game\movement\util.cpp" />
+    <ClCompile Include="..\src\game\NPCHandler.cpp" />
+    <ClCompile Include="..\src\game\NullCreatureAI.cpp" />
+    <ClCompile Include="..\src\game\Object.cpp" />
+    <ClCompile Include="..\src\game\ObjectAccessor.cpp" />
+    <ClCompile Include="..\src\game\ObjectGridLoader.cpp" />
+    <ClCompile Include="..\src\game\ObjectGuid.cpp" />
+    <ClCompile Include="..\src\game\ObjectMgr.cpp" />
+    <ClCompile Include="..\src\game\ObjectPosSelector.cpp" />
+    <ClCompile Include="..\src\game\Opcodes.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvP.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPEP.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPGH.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPHP.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPMgr.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPNA.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPSI.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPTF.cpp" />
+    <ClCompile Include="..\src\game\OutdoorPvP\OutdoorPvPZM.cpp" />
+    <ClCompile Include="..\src\game\PathFinder.cpp" />
+    <ClCompile Include="..\src\game\pchdef.cpp" />
+    <ClCompile Include="..\src\game\Pet.cpp" />
+    <ClCompile Include="..\src\game\PetAI.cpp" />
+    <ClCompile Include="..\src\game\PetHandler.cpp" />
+    <ClCompile Include="..\src\game\PetitionsHandler.cpp" />
+    <ClCompile Include="..\src\game\Player.cpp" />
+    <ClCompile Include="..\src\game\playerbot\AiFactory.cpp" />
+    <ClCompile Include="..\src\game\playerbot\ChatFilter.cpp" />
+    <ClCompile Include="..\src\game\playerbot\ChatHelper.cpp" />
+    <ClCompile Include="..\src\game\playerbot\FleeManager.cpp" />
+    <ClCompile Include="..\src\game\playerbot\Helpers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\LootObjectStack.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotAI.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotAIBase.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotAIConfig.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotFactory.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotMgr.cpp" />
+    <ClCompile Include="..\src\game\playerbot\PlayerbotSecurity.cpp" />
+    <ClCompile Include="..\src\game\playerbot\RandomPlayerbotFactory.cpp" />
+    <ClCompile Include="..\src\game\playerbot\RandomPlayerbotMgr.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Action.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\ActionBasket.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\AcceptQuestAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\AddLootAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\AreaTriggerAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\AttackAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\BankAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\BuffAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\BuyAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\CastCustomSpellAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ChangeChatAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ChangeStrategyAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ChangeTalentsAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ChatShortcutActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\CheckMountStateAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\DestroyItemAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\DropQuestAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\EmoteAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\EquipAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\FollowActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\GenericActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\GenericSpellActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\GossipHelloAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\GuildBankAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\HelpAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\InventoryAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\InventoryChangeFailureAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\LfgActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ListQuestsActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ListSpellsAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\LogLevelAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\LootAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\LootRollAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\LootStrategyAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\MovementActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\NonCombatActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\PositionAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\QueryItemUsageAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\QueryQuestAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\QuestAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ReadyCheckAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\RememberTaxiAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\RepairAllAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ResetAiAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\ReviveFromCorpseAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\RewardAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\SaveManaAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\SecurityCheckAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\SellAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\SetHomeAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\StatsAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\StayActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\SuggestWhatToDoAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TalkToQuestGiverAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TaxiAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TeleportAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TellCastFailedAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TellItemCountAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TellLosAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TellReputationAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TellTargetAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TradeAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TradeStatusAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\TrainerAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\UnequipAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\UseItemAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\UseMeetingStoneAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\WhoAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\AiObject.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\AiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\BearTankDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\CasterDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\CatDpsDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\DruidActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\DruidAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\DruidMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\DruidTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\FeralDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\GenericDruidNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\GenericDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\druid\HealDruidStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Engine.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Event.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\AttackEnemyPlayersStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\AttackRtiStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\AttackWeakStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\CastTimeStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\ChatCommandHandlerStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\CombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\ConserveManaStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\DeadStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\DpsAoeStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\DpsAssistStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\DuelStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\EmoteStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\FleeStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\FollowMasterStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\GrindingStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\GuardStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\KiteStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\LootNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\MeleeCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\NonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\PassiveStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\PullStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\QuestStrategies.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\RacialsStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\RangedCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\RunawayStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\StayStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\TankAoeStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\TankAssistStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\TellTargetStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\ThreatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\UseFoodStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\UsePotionsStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\generic\WorldPacketHandlerStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\DpsHunterStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\GenericHunterNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\GenericHunterStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\HunterActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\HunterAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\HunterBuffStrategies.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\HunterMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\hunter\HunterTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\ArcaneMageStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\FireMageStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\FrostMageStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\GenericMageNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\GenericMageStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\MageActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\MageAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\MageMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\mage\MageTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Multiplier.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\DpsPaladinStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\GenericPaladinNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\GenericPaladinStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\PaladinActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\PaladinAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\PaladinBuffStrategies.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\PaladinMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\PaladinTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\paladin\TankPaladinStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\PassiveMultiplier.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\GenericPriestStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\HealPriestStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\HolyPriestStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\PriestActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\PriestAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\PriestMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\PriestNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\PriestTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\priest\ShadowPriestStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Queue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\DpsRogueStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\GenericRogueNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\RogueActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\RogueAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\RogueMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\rogue\RogueTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\CasterShamanStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\GenericShamanStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\HealShamanStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\MeleeShamanStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\ShamanActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\ShamanAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\ShamanMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\ShamanNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\ShamanTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\shaman\TotemsShamanStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Strategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Trigger.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\triggers\CureTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\triggers\GenericTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\triggers\HealthTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\triggers\LootTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\Value.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\AoeHealValues.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\AttackerCountValues.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\AttackersValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\AttackerWithoutAuraTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\CcTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\CurrentCcTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\CurrentTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\DpsTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\DuelTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\EnemyPlayerValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\GrindTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\InvalidTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\ItemCountValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\ItemForSpellValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\LeastHpTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\LineTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\NearestAdsValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\NearestCorpsesValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\NearestGameObjects.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\NearestNpcsValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PartyMemberToDispel.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PartyMemberToHeal.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PartyMemberToResurrect.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PartyMemberValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PartyMemberWithoutAuraValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PositionValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\PossibleTargetsValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\RtiValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\SpellCastUsefulValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\SpellIdValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\StatsValues.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\TankTargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\TargetValue.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\ThreatValues.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\DpsWarlockStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\GenericWarlockNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\GenericWarlockStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\TankWarlockStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\WarlockActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\WarlockAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\WarlockMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warlock\WarlockTriggers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\DpsWarriorStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\GenericWarriorNonCombatStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\GenericWarriorStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\TankWarriorStrategy.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\WarriorActions.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\WarriorAiObjectContext.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\WarriorMultipliers.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\warrior\WarriorTriggers.cpp" />
+    <ClCompile Include="..\src\game\PlayerDump.cpp" />
+    <ClCompile Include="..\src\game\PoolManager.cpp" />
+    <ClCompile Include="..\src\game\QueryHandler.cpp" />
+    <ClCompile Include="..\src\game\QuestDef.cpp" />
+    <ClCompile Include="..\src\game\QuestHandler.cpp" />
+    <ClCompile Include="..\src\game\ReactorAI.cpp" />
+    <ClCompile Include="..\src\game\ReputationMgr.cpp" />
+    <ClCompile Include="..\src\game\ScriptMgr.cpp" />
+    <ClCompile Include="..\src\game\SkillHandler.cpp" />
+    <ClCompile Include="..\src\game\SocialMgr.cpp" />
+    <ClCompile Include="..\src\game\Spell.cpp" />
+    <ClCompile Include="..\src\game\SpellAuras.cpp" />
+    <ClCompile Include="..\src\game\SpellEffects.cpp" />
+    <ClCompile Include="..\src\game\SpellHandler.cpp" />
+    <ClCompile Include="..\src\game\SpellMgr.cpp" />
+    <ClCompile Include="..\src\game\SQLStorages.cpp" />
+    <ClCompile Include="..\src\game\StateMgr.cpp" />
+    <ClCompile Include="..\src\game\StatSystem.cpp" />
+    <ClCompile Include="..\src\game\TaxiHandler.cpp" />
+    <ClCompile Include="..\src\game\TemporarySummon.cpp" />
+    <ClCompile Include="..\src\game\ThreatManager.cpp" />
+    <ClCompile Include="..\src\game\Totem.cpp" />
+    <ClCompile Include="..\src\game\TotemAI.cpp" />
+    <ClCompile Include="..\src\game\TradeHandler.cpp" />
+    <ClCompile Include="..\src\game\Transports.cpp" />
+    <ClCompile Include="..\src\game\TransportSystem.cpp" />
+    <ClCompile Include="..\src\game\Unit.cpp" />
+    <ClCompile Include="..\src\game\UnitAuraProcHandler.cpp" />
+    <ClCompile Include="..\src\game\UpdateData.cpp" />
+    <ClCompile Include="..\src\game\UpdateFieldFlags.cpp" />
+    <ClCompile Include="..\src\game\Vehicle.cpp" />
+    <ClCompile Include="..\src\game\VehicleHandler.cpp" />
+    <ClCompile Include="..\src\game\vmap\BIH.cpp" />
+    <ClCompile Include="..\src\game\vmap\DynamicTree.cpp" />
+    <ClCompile Include="..\src\game\vmap\GameObjectModel.cpp" />
+    <ClCompile Include="..\src\game\vmap\MapTree.cpp" />
+    <ClCompile Include="..\src\game\vmap\ModelInstance.cpp" />
+    <ClCompile Include="..\src\game\vmap\TileAssembler.cpp" />
+    <ClCompile Include="..\src\game\vmap\VMapFactory.cpp" />
+    <ClCompile Include="..\src\game\vmap\VMapManager2.cpp" />
+    <ClCompile Include="..\src\game\vmap\WorldModel.cpp" />
+    <ClCompile Include="..\src\game\VoiceChatHandler.cpp" />
+    <ClCompile Include="..\src\game\warden\WardenBase.cpp" />
+    <ClCompile Include="..\src\game\warden\WardenDataStorage.cpp" />
+    <ClCompile Include="..\src\game\warden\WardenMac.cpp" />
+    <ClCompile Include="..\src\game\warden\WardenWin.cpp" />
+    <ClCompile Include="..\src\game\WaypointManager.cpp" />
+    <ClCompile Include="..\src\game\Weather.cpp" />
+    <ClCompile Include="..\src\game\World.cpp" />
+    <ClCompile Include="..\src\game\WorldLocation.cpp" />
+    <ClCompile Include="..\src\game\WorldObjectEvents.cpp" />
+    <ClCompile Include="..\src\game\WorldSession.cpp" />
+    <ClCompile Include="..\src\game\WorldSocket.cpp" />
+    <ClCompile Include="..\src\game\WorldSocketMgr.cpp" />
+    <ClCompile Include="..\src\game\WorldStateMgr.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\EnemyHealerTargetValue.cpp" />
+    <ClCompile Include="..\src\game\BattleField\BattleField.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\ConfusedMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\FleeingMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\HomeMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\IdleMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\MovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\PointMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\RandomMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\TargetedMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\movementGenerators\WaypointMovementGenerator.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\actions\GuildAcceptAction.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\Formations.cpp" />
+    <ClCompile Include="..\src\game\playerbot\strategy\values\formations\Arrow.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\game\AccountMgr.h" />
+    <ClInclude Include="..\src\game\AchievementMgr.h" />
+    <ClInclude Include="..\src\game\AggressorAI.h" />
+    <ClInclude Include="..\src\game\ahbot\AhBot.h" />
+    <ClInclude Include="..\src\game\ahbot\AhBotConfig.h" />
+    <ClInclude Include="..\src\game\ahbot\Category.h" />
+    <ClInclude Include="..\src\game\ahbot\ConsumableCategory.h" />
+    <ClInclude Include="..\src\game\ahbot\ItemBag.h" />
+    <ClInclude Include="..\src\game\ahbot\PricingStrategy.h" />
+    <ClInclude Include="..\src\game\ahbot\TradeCategory.h" />
+    <ClInclude Include="..\src\game\AntiCheat.h" />
+    <ClInclude Include="..\src\game\ArenaTeam.h" />
+    <ClInclude Include="..\src\game\AuctionHouseBot\AuctionHouseBot.h" />
+    <ClInclude Include="..\src\game\AuctionHouseMgr.h" />
+    <ClInclude Include="..\src\game\Bag.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGround.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundAA.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundAB.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundAV.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundBE.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundDS.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundEY.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundIC.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundMgr.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundNA.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundRB.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundRL.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundRV.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundSA.h" />
+    <ClInclude Include="..\src\game\BattleGround\BattleGroundWS.h" />
+    <ClInclude Include="..\src\game\Calendar.h" />
+    <ClInclude Include="..\src\game\Camera.h" />
+    <ClInclude Include="..\src\game\Cell.h" />
+    <ClInclude Include="..\src\game\CellImpl.h" />
+    <ClInclude Include="..\src\game\Channel.h" />
+    <ClInclude Include="..\src\game\ChannelMgr.h" />
+    <ClInclude Include="..\src\game\CharacterDatabaseCleaner.h" />
+    <ClInclude Include="..\src\game\Chat.h" />
+    <ClInclude Include="..\src\game\ChatLexicsCutter.h" />
+    <ClInclude Include="..\src\game\ChatLog.h" />
+    <ClInclude Include="..\src\game\Corpse.h" />
+    <ClInclude Include="..\src\game\Creature.h" />
+    <ClInclude Include="..\src\game\CreatureAI.h" />
+    <ClInclude Include="..\src\game\CreatureAIImpl.h" />
+    <ClInclude Include="..\src\game\CreatureAIRegistry.h" />
+    <ClInclude Include="..\src\game\CreatureAISelector.h" />
+    <ClInclude Include="..\src\game\CreatureEventAI.h" />
+    <ClInclude Include="..\src\game\CreatureEventAIMgr.h" />
+    <ClInclude Include="..\src\game\CreatureLinkingMgr.h" />
+    <ClInclude Include="..\src\game\DBCEnums.h" />
+    <ClInclude Include="..\src\game\DBCfmt.h" />
+    <ClInclude Include="..\src\game\DBCStores.h" />
+    <ClInclude Include="..\src\game\DBCStructure.h" />
+    <ClInclude Include="..\src\game\DynamicObject.h" />
+    <ClInclude Include="..\src\game\FollowerReference.h" />
+    <ClInclude Include="..\src\game\FollowerRefManager.h" />
+    <ClInclude Include="..\src\game\Formulas.h" />
+    <ClInclude Include="..\src\game\GameEventMgr.h" />
+    <ClInclude Include="..\src\game\GameObject.h" />
+    <ClInclude Include="..\src\game\GMTicketMgr.h" />
+    <ClInclude Include="..\src\game\GossipDef.h" />
+    <ClInclude Include="..\src\game\GridDefines.h" />
+    <ClInclude Include="..\src\game\GridMap.h" />
+    <ClInclude Include="..\src\game\GridNotifiers.h" />
+    <ClInclude Include="..\src\game\GridNotifiersImpl.h" />
+    <ClInclude Include="..\src\game\Group.h" />
+    <ClInclude Include="..\src\game\GroupReference.h" />
+    <ClInclude Include="..\src\game\GroupRefManager.h" />
+    <ClInclude Include="..\src\game\GuardAI.h" />
+    <ClInclude Include="..\src\game\Guild.h" />
+    <ClInclude Include="..\src\game\GuildMgr.h" />
+    <ClInclude Include="..\src\game\HostileRefManager.h" />
+    <ClInclude Include="..\src\game\InstanceData.h" />
+    <ClInclude Include="..\src\game\Item.h" />
+    <ClInclude Include="..\src\game\ItemEnchantmentMgr.h" />
+    <ClInclude Include="..\src\game\ItemPrototype.h" />
+    <ClInclude Include="..\src\game\Language.h" />
+    <ClInclude Include="..\src\game\LFG.h" />
+    <ClInclude Include="..\src\game\LFGMgr.h" />
+    <ClInclude Include="..\src\game\LootMgr.h" />
+    <ClInclude Include="..\src\game\Mail.h" />
+    <ClInclude Include="..\src\game\Map.h" />
+    <ClInclude Include="..\src\game\MapManager.h" />
+    <ClInclude Include="..\src\game\MapPersistentStateMgr.h" />
+    <ClInclude Include="..\src\game\MapReference.h" />
+    <ClInclude Include="..\src\game\MapRefManager.h" />
+    <ClInclude Include="..\src\game\MapUpdater.h" />
+    <ClInclude Include="..\src\game\MassMailMgr.h" />
+    <ClInclude Include="..\src\game\MotionMaster.h" />
+    <ClInclude Include="..\src\game\MoveMap.h" />
+    <ClInclude Include="..\src\game\MoveMapSharedDefines.h" />
+    <ClInclude Include="..\src\game\movement\MoveSpline.h" />
+    <ClInclude Include="..\src\game\movement\MoveSplineFlag.h" />
+    <ClInclude Include="..\src\game\movement\MoveSplineInit.h" />
+    <ClInclude Include="..\src\game\movement\MoveSplineInitArgs.h" />
+    <ClInclude Include="..\src\game\movement\packet_builder.h" />
+    <ClInclude Include="..\src\game\movement\spline.h" />
+    <ClInclude Include="..\src\game\movement\spline.impl.h" />
+    <ClInclude Include="..\src\game\movement\typedefs.h" />
+    <ClInclude Include="..\src\game\NPCHandler.h" />
+    <ClInclude Include="..\src\game\NullCreatureAI.h" />
+    <ClInclude Include="..\src\game\Object.h" />
+    <ClInclude Include="..\src\game\ObjectAccessor.h" />
+    <ClInclude Include="..\src\game\ObjectGridLoader.h" />
+    <ClInclude Include="..\src\game\ObjectGuid.h" />
+    <ClInclude Include="..\src\game\ObjectLock.h" />
+    <ClInclude Include="..\src\game\ObjectMgr.h" />
+    <ClInclude Include="..\src\game\ObjectPosSelector.h" />
+    <ClInclude Include="..\src\game\Opcodes.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvP.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPEP.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPGH.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPHP.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPMgr.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPNA.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPSI.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPTF.h" />
+    <ClInclude Include="..\src\game\OutdoorPvP\OutdoorPvPZM.h" />
+    <ClInclude Include="..\src\game\Path.h" />
+    <ClInclude Include="..\src\game\PathFinder.h" />
+    <ClInclude Include="..\src\game\pchdef.h" />
+    <ClInclude Include="..\src\game\Pet.h" />
+    <ClInclude Include="..\src\game\PetAI.h" />
+    <ClInclude Include="..\src\game\Player.h" />
+    <ClInclude Include="..\src\game\playerbot\AiFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\ChatFilter.h" />
+    <ClInclude Include="..\src\game\playerbot\ChatHelper.h" />
+    <ClInclude Include="..\src\game\playerbot\FleeManager.h" />
+    <ClInclude Include="..\src\game\playerbot\LazyCalculatedValue.h" />
+    <ClInclude Include="..\src\game\playerbot\LootObjectStack.h" />
+    <ClInclude Include="..\src\game\playerbot\playerbot.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotAIAware.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotAIBase.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotAIConfig.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotClassAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotDeathKnightAI.h" />
+    <ClInclude Include="..\src\game\playerbot\playerbotDefs.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotDruidAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotHunterAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotMageAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotMgr.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotPaladinAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotPriestAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotRogueAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotSecurity.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotShamanAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotWarlockAI.h" />
+    <ClInclude Include="..\src\game\playerbot\PlayerbotWarriorAI.h" />
+    <ClInclude Include="..\src\game\playerbot\RandomPlayerbotFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\RandomPlayerbotMgr.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Action.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\ActionBasket.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AcceptDuelAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AcceptInvitationAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AcceptQuestAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AcceptResurrectAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ActionContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AddLootAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AreaTriggerAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\AttackAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\BankAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\BuffAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\BuyAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\CastCustomSpellAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChangeChatAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChangeStrategyAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChangeTalentsAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChatActionContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChatShortcutActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\CheckMountStateAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ChooseTargetActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\DestroyItemAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\DropQuestAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\EmoteAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\EquipAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\FollowActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\GenericActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\GenericSpellActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\GossipHelloAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\GuildBankAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\HelpAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\InventoryAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\InventoryChangeFailureAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\InviteToGroupAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LeaveGroupAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LfgActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ListQuestsActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ListSpellsAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LogLevelAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LootAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LootRollAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\LootStrategyAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\MovementActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\NonCombatActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\PassLeadershipToMasterAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\PositionAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\QueryItemUsageAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\QueryQuestAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\QuestAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ReachTargetActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ReadyCheckAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ReleaseSpiritAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\RememberTaxiAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\RepairAllAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ResetAiAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\ReviveFromCorpseAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\RewardAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\RtiAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\SaveManaAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\SecurityCheckAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\SellAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\SetHomeAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\StatsAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\StayActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\SuggestWhatToDoAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TalkToQuestGiverAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TaxiAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TeleportAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellCastFailedAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellItemCountAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellLosAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellMasterAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellReputationAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TellTargetAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TradeAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TradeStatusAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\TrainerAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\UnequipAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\UseItemAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\UseMeetingStoneAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\WhoAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\WorldPacketActionContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\AiObject.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\AiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\BearTankDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\CasterDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\CatDpsDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidBearActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidCatActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidShapeshiftActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\DruidTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\FeralDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\GenericDruidNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\GenericDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\druid\HealDruidStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Engine.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Event.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\ExternalEventHelper.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\AttackEnemyPlayersStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\AttackRtiStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\AttackWeakStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\CastTimeStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\ChatCommandHandlerStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\CombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\ConserveManaStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\DeadStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\DpsAoeStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\DpsAssistStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\DuelStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\EmoteStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\FleeStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\FollowMasterStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\GrindingStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\GuardStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\KiteStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\LootNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\MeleeCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\NonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\PassiveStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\PassTroughStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\PullStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\QuestStrategies.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\RacialsStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\RangedCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\RunawayStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\StayStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\TankAoeStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\TankAssistStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\TellTargetStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\ThreatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\UseFoodStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\UsePotionsStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\generic\WorldPacketHandlerStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\DpsHunterStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\GenericHunterNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\GenericHunterStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\HunterActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\HunterAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\HunterBuffStrategies.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\HunterMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\hunter\HunterTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\ItemVisitors.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\ArcaneMageStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\FireMageStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\FrostMageStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\GenericMageNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\GenericMageStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\MageActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\MageAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\MageMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\mage\MageTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Multiplier.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\NamedObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\DpsPaladinStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\GenericPaladinNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\GenericPaladinStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\GenericPaladinStrategyActionNodeFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\PaladinActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\PaladinAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\PaladinBuffStrategies.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\PaladinMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\PaladinTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\paladin\TankPaladinStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\PassiveMultiplier.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\GenericPriestStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\GenericPriestStrategyActionNodeFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\HealPriestStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\HolyPriestStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestNonCombatStrategyActionNodeFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\PriestTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\ShadowPriestStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\priest\ShadowPriestStrategyActionNodeFactory.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Queue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\DpsRogueStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\GenericRogueNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueComboActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueFinishingActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueOpeningActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\rogue\RogueTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\CasterShamanStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\GenericShamanStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\HealShamanStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\MeleeShamanStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\ShamanActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\ShamanAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\ShamanMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\ShamanNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\ShamanTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\shaman\TotemsShamanStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Strategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\StrategyContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Trigger.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\ChatCommandTrigger.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\ChatTriggerContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\CureTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\GenericTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\HealthTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\LootTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\RangeTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\TriggerContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\WithinAreaTrigger.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\WorldPacketTrigger.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\triggers\WorldPacketTriggerContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\Value.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AlwaysLootListValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AoeHealValues.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AttackerCountValues.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AttackersValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AttackerWithoutAuraTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\AvailableLootValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\CcTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ChatValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\CurrentCcTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\CurrentTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\DistanceValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\DpsTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\DuelTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\EnemyPlayerValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\GrindTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\HasAvailableLootValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\HasTotemValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\InvalidTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\IsBehindValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\IsFacingValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\IsMovingValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ItemCountValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ItemForSpellValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LastMovementValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LastSpellCastValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LeastHpTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LineTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LogLevelValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\LootStrategyValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ManaSaveLevelValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\MasterTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\NearestAdsValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\NearestCorpsesValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\NearestGameObjects.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\NearestNpcsValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\NearestUnitsValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PartyMemberToDispel.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PartyMemberToHeal.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PartyMemberToResurrect.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PartyMemberValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PartyMemberWithoutAuraValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PetTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PositionValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\PossibleTargetsValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\RtiTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\RtiValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\SelfTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\SharedValueContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\SpellCastUsefulValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\SpellIdValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\StatsValues.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\TankTargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\TargetValue.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ThreatValues.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\ValueContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\DpsWarlockStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\GenericWarlockNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\GenericWarlockStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\TankWarlockStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\WarlockActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\WarlockAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\WarlockMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warlock\WarlockTriggers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\DpsWarriorStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\GenericWarriorNonCombatStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\GenericWarriorStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\TankWarriorStrategy.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\WarriorActions.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\WarriorAiObjectContext.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\WarriorMultipliers.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\warrior\WarriorTriggers.h" />
+    <ClInclude Include="..\src\game\PlayerDump.h" />
+    <ClInclude Include="..\src\game\PoolManager.h" />
+    <ClInclude Include="..\src\game\QuestDef.h" />
+    <ClInclude Include="..\src\game\ReactorAI.h" />
+    <ClInclude Include="..\src\game\ReputationMgr.h" />
+    <ClInclude Include="..\src\game\ScriptMgr.h" />
+    <ClInclude Include="..\src\game\SharedDefines.h" />
+    <ClInclude Include="..\src\game\SocialMgr.h" />
+    <ClInclude Include="..\src\game\Spell.h" />
+    <ClInclude Include="..\src\game\SpellAuraDefines.h" />
+    <ClInclude Include="..\src\game\SpellAuras.h" />
+    <ClInclude Include="..\src\game\SpellClassMask.h" />
+    <ClInclude Include="..\src\game\SpellMgr.h" />
+    <ClInclude Include="..\src\game\SQLStorages.h" />
+    <ClInclude Include="..\src\game\StateMgr.h" />
+    <ClInclude Include="..\src\game\StateMgrImpl.h" />
+    <ClInclude Include="..\src\game\TemporarySummon.h" />
+    <ClInclude Include="..\src\game\ThreatManager.h" />
+    <ClInclude Include="..\src\game\Totem.h" />
+    <ClInclude Include="..\src\game\TotemAI.h" />
+    <ClInclude Include="..\src\game\Transports.h" />
+    <ClInclude Include="..\src\game\TransportSystem.h" />
+    <ClInclude Include="..\src\game\Unit.h" />
+    <ClInclude Include="..\src\game\UnitEvents.h" />
+    <ClInclude Include="..\src\game\UpdateData.h" />
+    <ClInclude Include="..\src\game\UpdateFieldFlags.h" />
+    <ClInclude Include="..\src\game\UpdateFields.h" />
+    <ClInclude Include="..\src\game\UpdateMask.h" />
+    <ClInclude Include="..\src\game\Vehicle.h" />
+    <ClInclude Include="..\src\game\vmap\BIH.h" />
+    <ClInclude Include="..\src\game\vmap\BIHWrap.h" />
+    <ClInclude Include="..\src\game\vmap\DynamicTree.h" />
+    <ClInclude Include="..\src\game\vmap\GameObjectModel.h" />
+    <ClInclude Include="..\src\game\vmap\IVMapManager.h" />
+    <ClInclude Include="..\src\game\vmap\MapTree.h" />
+    <ClInclude Include="..\src\game\vmap\ModelInstance.h" />
+    <ClInclude Include="..\src\game\vmap\RegularGrid.h" />
+    <ClInclude Include="..\src\game\vmap\TileAssembler.h" />
+    <ClInclude Include="..\src\game\vmap\VMapDefinitions.h" />
+    <ClInclude Include="..\src\game\vmap\VMapFactory.h" />
+    <ClInclude Include="..\src\game\vmap\VMapManager2.h" />
+    <ClInclude Include="..\src\game\vmap\VMapTools.h" />
+    <ClInclude Include="..\src\game\vmap\WorldModel.h" />
+    <ClInclude Include="..\src\game\warden\WardenBase.h" />
+    <ClInclude Include="..\src\game\warden\WardenDataStorage.h" />
+    <ClInclude Include="..\src\game\warden\WardenMac.h" />
+    <ClInclude Include="..\src\game\warden\WardenModuleMac.h" />
+    <ClInclude Include="..\src\game\warden\WardenModuleWin.h" />
+    <ClInclude Include="..\src\game\warden\WardenWin.h" />
+    <ClInclude Include="..\src\game\WaypointManager.h" />
+    <ClInclude Include="..\src\game\Weather.h" />
+    <ClInclude Include="..\src\game\World.h" />
+    <ClInclude Include="..\src\game\WorldLocation.h" />
+    <ClInclude Include="..\src\game\WorldObjectEvents.h" />
+    <ClInclude Include="..\src\game\WorldSession.h" />
+    <ClInclude Include="..\src\game\WorldSocket.h" />
+    <ClInclude Include="..\src\game\WorldSocketMgr.h" />
+    <ClInclude Include="..\src\game\WorldStateMgr.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\EnemyHealerTargetValue.h" />
+    <ClInclude Include="..\src\game\BattleField\BattleField.h" />
+    <ClInclude Include="..\src\game\movementGenerators\ConfusedMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\FleeingMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\HomeMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\IdleMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\MovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\MovementGeneratorImpl.h" />
+    <ClInclude Include="..\src\game\movementGenerators\PointMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\RandomMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\TargetedMovementGenerator.h" />
+    <ClInclude Include="..\src\game\movementGenerators\WaypointMovementGenerator.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\actions\GuildAcceptAction.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\Formations.h" />
+    <ClInclude Include="..\src\game\playerbot\strategy\values\formations\Arrow.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\src\game\CMakeLists.txt" />
+    <None Include="..\src\game\Mail.cpp.orig" />
+    <None Include="..\src\game\Makefile.in" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/VC100/genrevision.vcxproj b/win/genrevision.vcxproj
similarity index 97%
rename from win/VC100/genrevision.vcxproj
rename to win/genrevision.vcxproj
index 4783cc4177a..bbbe8dec1d6 100644
--- a/win/VC100/genrevision.vcxproj
+++ b/win/genrevision.vcxproj
@@ -59,28 +59,34 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -132,7 +138,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -262,7 +268,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\tools\genrevision\genrevision.cpp" />
+    <ClCompile Include="..\src\tools\genrevision\genrevision.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win/mangosd.sln b/win/mangosd.sln
new file mode 100644
index 00000000000..1370688c824
--- /dev/null
+++ b/win/mangosd.sln
@@ -0,0 +1,246 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game.vcxproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
+	ProjectSection(ProjectDependencies) = postProject
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6} = {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "shared.vcxproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2}
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}
+		{F62787DD-1327-448B-9818-030062BCFAA5} = {F62787DD-1327-448B-9818-030062BCFAA5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "mangosd.vcxproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
+	ProjectSection(ProjectDependencies) = postProject
+		{563E9905-3657-460C-AE63-0AC39D162E23} = {563E9905-3657-460C-AE63-0AC39D162E23}
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framework", "framework.vcxproj", "{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8} = {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "realmd", "realmd.vcxproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
+	ProjectSection(ProjectDependencies) = postProject
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "genrevision.vcxproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "ACE_vc10.vcxproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbbmalloc", "tbbmalloc.vcxproj", "{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F62787DD-1327-448B-9818-030062BCFAA5} = {F62787DD-1327-448B-9818-030062BCFAA5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbb", "tbb.vcxproj", "{F62787DD-1327-448B-9818-030062BCFAA5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "Detour.vcxproj", "{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests.vcxproj", "{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{563E9905-3657-460C-AE63-0AC39D162E23} = {563E9905-3657-460C-AE63-0AC39D162E23}
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+		{CC4F3E50-F9D0-47B4-A653-544CD7E492D5} = {CC4F3E50-F9D0-47B4-A653-544CD7E492D5}
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6} = {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppunit", "cppunit.vcxproj", "{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0349B36A-AFA2-423B-B00B-9E1D3F744ACC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
+		Debug_NoPCH|x64 = Debug_NoPCH|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.Build.0 = Debug|Win32
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.ActiveCfg = Debug|x64
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.Build.0 = Debug|x64
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.ActiveCfg = Release|Win32
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.Build.0 = Release|Win32
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.ActiveCfg = Release|x64
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.Build.0 = Release|x64
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.Build.0 = Debug|Win32
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.ActiveCfg = Debug|x64
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.Build.0 = Debug|x64
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.ActiveCfg = Release|Win32
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.Build.0 = Release|Win32
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.ActiveCfg = Release|x64
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.Build.0 = Release|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.Build.0 = Debug|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.ActiveCfg = Debug|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.Build.0 = Debug|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.ActiveCfg = Release|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.Build.0 = Release|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.ActiveCfg = Release|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.Build.0 = Release|x64
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.Build.0 = Debug|Win32
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.ActiveCfg = Debug|x64
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.Build.0 = Debug|x64
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.ActiveCfg = Release|Win32
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.Build.0 = Release|Win32
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.ActiveCfg = Release|x64
+		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.Build.0 = Release|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.Build.0 = Debug|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.ActiveCfg = Release|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.Build.0 = Release|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.Build.0 = Release|x64
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|Win32
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|Win32
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|Win32
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.Build.0 = Debug|Win32
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.ActiveCfg = Release|Win32
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|Win32
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.Build.0 = Debug|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.ActiveCfg = Debug|x64
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.Build.0 = Debug|x64
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.ActiveCfg = Release|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.Build.0 = Release|Win32
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.ActiveCfg = Release|x64
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.Build.0 = Release|x64
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.Build.0 = Debug|Win32
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.ActiveCfg = Debug|x64
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.Build.0 = Debug|x64
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.ActiveCfg = Release|Win32
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.Build.0 = Release|Win32
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.ActiveCfg = Release|x64
+		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.Build.0 = Release|x64
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.Build.0 = Debug|Win32
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.ActiveCfg = Debug|x64
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.Build.0 = Debug|x64
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.ActiveCfg = Release|Win32
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.Build.0 = Release|Win32
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.ActiveCfg = Release|x64
+		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.Build.0 = Release|x64
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|x64.ActiveCfg = Debug|x64
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.Build.0 = Debug|Win32
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.ActiveCfg = Debug|x64
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.Build.0 = Debug|x64
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.ActiveCfg = Release|Win32
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.Build.0 = Release|Win32
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.ActiveCfg = Release|x64
+		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.Build.0 = Release|x64
+		{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
+		{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
+		{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|Win32
+		{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}.Debug|Win32.Build.0 = Debug|Win32
+		{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}.Debug|x64.ActiveCfg = Debug|Win32
+		{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}.Release|Win32.ActiveCfg = Release|Win32
+		{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}.Release|Win32.Build.0 = Release|Win32
+		{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}.Release|x64.ActiveCfg = Release|x64
+		{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}.Release|x64.Build.0 = Release|x64
+		{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
+		{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
+		{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
+		{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}.Debug|Win32.Build.0 = Debug|Win32
+		{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}.Debug|x64.ActiveCfg = Debug|Win32
+		{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}.Release|Win32.ActiveCfg = Release|Win32
+		{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}.Release|Win32.Build.0 = Release|Win32
+		{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}.Release|x64.ActiveCfg = Release|x64
+		{CC4F3E50-F9D0-47B4-A653-544CD7E492D5}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
+EndGlobal
diff --git a/win/VC100/mangosd.vcxproj b/win/mangosd.vcxproj
similarity index 82%
rename from win/VC100/mangosd.vcxproj
rename to win/mangosd.vcxproj
index 9758febac27..30c785cf371 100644
--- a/win/VC100/mangosd.vcxproj
+++ b/win/mangosd.vcxproj
@@ -60,31 +60,37 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -95,32 +101,32 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mangosd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">mangosd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mangosd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">mangosd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">mangosd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">mangosd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.exe</TargetExt>
@@ -146,12 +152,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
-      <TypeLibraryName>.\..\..\bin\Release\mangosd.tlb</TypeLibraryName>
+      <TypeLibraryName>.\..\bin\Release\mangosd.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include\gsoap;..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\mangosd;..\dep\ACE_wrappers;..\dep\include\g3dlite</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +182,7 @@
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -190,18 +196,18 @@
       <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
-      <Command>copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration)</Command>
+      <Command>copy ..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\..\..\bin\Release\mangosd.tlb</TypeLibraryName>
+      <TypeLibraryName>.\..\bin\Release\mangosd.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include\gsoap;..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\mangosd;..\dep\ACE_wrappers;..\dep\include\g3dlite</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -225,7 +231,7 @@
     <Link>
       <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -239,7 +245,7 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration)</Command>
+      <Command>copy ..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -249,7 +255,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include\gsoap;..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\mangosd;..\dep\ACE_wrappers;..\dep\include\g3dlite</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -265,6 +271,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>Cdecl</CallingConvention>
       <CompileAs>Default</CompileAs>
+      <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -276,7 +283,7 @@
       <Version>
       </Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -289,7 +296,7 @@
       <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
-      <Command>copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration)</Command>
+      <Command>copy ..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
@@ -300,7 +307,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include\gsoap;..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\mangosd;..\dep\ACE_wrappers;..\dep\include\g3dlite</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -326,7 +333,7 @@
       <Version>
       </Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -339,7 +346,7 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration)</Command>
+      <Command>copy ..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
@@ -349,7 +356,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include\gsoap;..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\mangosd;..\dep\ACE_wrappers;..\dep\include\g3dlite</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -376,7 +383,7 @@
       <Version>
       </Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -389,7 +396,7 @@
       <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
-      <Command>copy ..\..\dep\lib\$(Platform)_debug\*.dll ..\..\bin\$(Platform)_$(Configuration)</Command>
+      <Command>copy ..\dep\lib\$(Platform)_debug\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
@@ -400,7 +407,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include\gsoap;..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\mangosd;..\dep\ACE_wrappers;..\dep\include\g3dlite</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -426,7 +433,7 @@
       <Version>
       </Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -439,47 +446,47 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>copy ..\..\dep\lib\$(Platform)_debug\*.dll ..\..\bin\$(Platform)_$(Configuration)</Command>
+      <Command>copy ..\dep\lib\$(Platform)_debug\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="..\..\AUTHORS" />
-    <None Include="..\..\ChangeLog" />
-    <None Include="..\..\COPYING" />
-    <None Include="..\..\INSTALL" />
-    <None Include="..\..\NEWS" />
-    <None Include="..\..\README" />
-    <None Include="..\..\THANKS" />
-    <None Include="..\..\WARNING" />
+    <None Include="..\AUTHORS" />
+    <None Include="..\ChangeLog" />
+    <None Include="..\COPYING" />
+    <None Include="..\INSTALL" />
+    <None Include="..\NEWS" />
+    <None Include="..\README" />
+    <None Include="..\THANKS" />
+    <None Include="..\WARNING" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\dep\src\gsoap\stdsoap2.cpp" />
-    <ClCompile Include="..\..\src\mangosd\soapServer.cpp" />
-    <ClCompile Include="..\..\src\mangosd\soapC.cpp" />
-    <ClCompile Include="..\..\src\mangosd\MaNGOSsoap.cpp" />
-    <ClCompile Include="..\..\src\mangosd\CliRunnable.cpp" />
-    <ClCompile Include="..\..\src\mangosd\Main.cpp" />
-    <ClCompile Include="..\..\src\mangosd\Master.cpp" />
-    <ClCompile Include="..\..\src\mangosd\RASocket.cpp" />
-    <ClCompile Include="..\..\src\mangosd\WorldRunnable.cpp" />
-    <ClCompile Include="..\..\src\shared\WheatyExceptionReport.cpp" />
+    <ClCompile Include="..\dep\src\gsoap\stdsoap2.cpp" />
+    <ClCompile Include="..\src\mangosd\soapServer.cpp" />
+    <ClCompile Include="..\src\mangosd\soapC.cpp" />
+    <ClCompile Include="..\src\mangosd\MaNGOSsoap.cpp" />
+    <ClCompile Include="..\src\mangosd\CliRunnable.cpp" />
+    <ClCompile Include="..\src\mangosd\Main.cpp" />
+    <ClCompile Include="..\src\mangosd\Master.cpp" />
+    <ClCompile Include="..\src\mangosd\RASocket.cpp" />
+    <ClCompile Include="..\src\mangosd\WorldRunnable.cpp" />
+    <ClCompile Include="..\src\shared\WheatyExceptionReport.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\dep\include\gsoap\stdsoap2.h" />
-    <ClInclude Include="..\..\src\mangosd\soapStub.h" />
-    <ClInclude Include="..\..\src\mangosd\soapH.h" />
-    <ClInclude Include="..\..\src\mangosd\MaNGOSsoap.h" />
-    <ClInclude Include="..\..\src\mangosd\CliRunnable.h" />
-    <ClInclude Include="..\..\src\mangosd\Master.h" />
-    <ClInclude Include="..\..\src\mangosd\RASocket.h" />
-    <ClInclude Include="..\..\src\mangosd\WorldRunnable.h" />
-    <ClInclude Include="..\..\src\shared\WheatyExceptionReport.h" />
+    <ClInclude Include="..\dep\include\gsoap\stdsoap2.h" />
+    <ClInclude Include="..\src\mangosd\soapStub.h" />
+    <ClInclude Include="..\src\mangosd\soapH.h" />
+    <ClInclude Include="..\src\mangosd\MaNGOSsoap.h" />
+    <ClInclude Include="..\src\mangosd\CliRunnable.h" />
+    <ClInclude Include="..\src\mangosd\Master.h" />
+    <ClInclude Include="..\src\mangosd\RASocket.h" />
+    <ClInclude Include="..\src\mangosd\WorldRunnable.h" />
+    <ClInclude Include="..\src\shared\WheatyExceptionReport.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\src\mangosd\mangosd.rc" />
+    <ResourceCompile Include="..\src\mangosd\mangosd.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\dep\recastnavigation\Detour\win\VC100\Detour.vcxproj">
+    <ProjectReference Include="Detour.vcxproj">
       <Project>{72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6}</Project>
     </ProjectReference>
     <ProjectReference Include="game.vcxproj">
diff --git a/win/mangosd.vcxproj.filters b/win/mangosd.vcxproj.filters
new file mode 100644
index 00000000000..91456a7dc62
--- /dev/null
+++ b/win/mangosd.vcxproj.filters
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="doc">
+      <UniqueIdentifier>{bd80d2f0-aa7d-498e-b4f7-fca7f5bf0599}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\AUTHORS" />
+    <None Include="..\ChangeLog" />
+    <None Include="..\COPYING" />
+    <None Include="..\INSTALL" />
+    <None Include="..\NEWS" />
+    <None Include="..\README" />
+    <None Include="..\THANKS" />
+    <None Include="..\WARNING" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\src\gsoap\stdsoap2.cpp" />
+    <ClCompile Include="..\src\mangosd\soapServer.cpp" />
+    <ClCompile Include="..\src\mangosd\soapC.cpp" />
+    <ClCompile Include="..\src\mangosd\MaNGOSsoap.cpp" />
+    <ClCompile Include="..\src\mangosd\CliRunnable.cpp" />
+    <ClCompile Include="..\src\mangosd\Main.cpp" />
+    <ClCompile Include="..\src\mangosd\Master.cpp" />
+    <ClCompile Include="..\src\mangosd\RASocket.cpp" />
+    <ClCompile Include="..\src\mangosd\WorldRunnable.cpp" />
+    <ClCompile Include="..\src\shared\WheatyExceptionReport.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\include\gsoap\stdsoap2.h" />
+    <ClInclude Include="..\src\mangosd\soapStub.h" />
+    <ClInclude Include="..\src\mangosd\soapH.h" />
+    <ClInclude Include="..\src\mangosd\MaNGOSsoap.h" />
+    <ClInclude Include="..\src\mangosd\CliRunnable.h" />
+    <ClInclude Include="..\src\mangosd\Master.h" />
+    <ClInclude Include="..\src\mangosd\RASocket.h" />
+    <ClInclude Include="..\src\mangosd\WorldRunnable.h" />
+    <ClInclude Include="..\src\shared\WheatyExceptionReport.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\src\mangosd\mangosd.rc" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/mangosdVC100.sln b/win/mangosdVC100.sln
deleted file mode 100644
index c6dd46aa131..00000000000
--- a/win/mangosdVC100.sln
+++ /dev/null
@@ -1,213 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC100\game.vcxproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6} = {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC100\shared.vcxproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2}
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}
-		{F62787DD-1327-448B-9818-030062BCFAA5} = {F62787DD-1327-448B-9818-030062BCFAA5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC100\mangosd.vcxproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
-	ProjectSection(ProjectDependencies) = postProject
-		{563E9905-3657-460C-AE63-0AC39D162E23} = {563E9905-3657-460C-AE63-0AC39D162E23}
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "VC100\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framework", "VC100\framework.vcxproj", "{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8} = {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "realmd", "VC100\realmd.vcxproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC100\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC100\genrevision.vcxproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC100\ACE_vc10.vcxproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbbmalloc", "VC100\tbbmalloc.vcxproj", "{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F62787DD-1327-448B-9818-030062BCFAA5} = {F62787DD-1327-448B-9818-030062BCFAA5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbb", "VC100\tbb.vcxproj", "{F62787DD-1327-448B-9818-030062BCFAA5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "..\dep\recastnavigation\Detour\win\VC100\Detour.vcxproj", "{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
-		Debug_NoPCH|x64 = Debug_NoPCH|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.Build.0 = Debug|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.ActiveCfg = Debug|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.Build.0 = Debug|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.ActiveCfg = Release|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.Build.0 = Release|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.ActiveCfg = Release|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.Build.0 = Release|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.ActiveCfg = Debug|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.Build.0 = Debug|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.ActiveCfg = Debug|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.Build.0 = Debug|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.ActiveCfg = Release|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.Build.0 = Release|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.ActiveCfg = Release|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.Build.0 = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.Build.0 = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.Build.0 = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.ActiveCfg = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.Build.0 = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.ActiveCfg = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.Build.0 = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.Build.0 = Debug|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.ActiveCfg = Debug|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.Build.0 = Debug|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.ActiveCfg = Release|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.Build.0 = Release|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.ActiveCfg = Release|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.Build.0 = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.Build.0 = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.ActiveCfg = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.Build.0 = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.Build.0 = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.Build.0 = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.ActiveCfg = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.Build.0 = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.ActiveCfg = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.Build.0 = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.ActiveCfg = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.Build.0 = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.ActiveCfg = Release|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.Build.0 = Release|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.Build.0 = Debug|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.ActiveCfg = Debug|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.Build.0 = Debug|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.ActiveCfg = Release|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.Build.0 = Release|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.ActiveCfg = Release|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.Build.0 = Release|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.Build.0 = Debug|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.ActiveCfg = Debug|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.Build.0 = Debug|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.ActiveCfg = Release|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.Build.0 = Release|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.ActiveCfg = Release|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.Build.0 = Release|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|x64.ActiveCfg = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.Build.0 = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.ActiveCfg = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.Build.0 = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.ActiveCfg = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.Build.0 = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.ActiveCfg = Release|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
-EndGlobal
diff --git a/win/mangosdVC90.sln b/win/mangosdVC90.sln
deleted file mode 100644
index 10095ac1598..00000000000
--- a/win/mangosdVC90.sln
+++ /dev/null
@@ -1,214 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC90\game.vcproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7} = {5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC90\shared.vcproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2}
-		{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC90\mangosd.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
-	ProjectSection(ProjectDependencies) = postProject
-		{563E9905-3657-460C-AE63-0AC39D162E23} = {563E9905-3657-460C-AE63-0AC39D162E23}
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7} = {5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "VC90\zlib.vcproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framework", "VC90\framework.vcproj", "{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8} = {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "realmd", "VC90\realmd.vcproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC90\g3dlite.vcproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC90\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC90\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6300006755}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbb", "VC90\tbb.vcproj", "{F62787DD-1327-448B-9818-030062BCFAA5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbbmalloc", "VC90\tbbmalloc.vcproj", "{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F62787DD-1327-448B-9818-030062BCFAA5} = {F62787DD-1327-448B-9818-030062BCFAA5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "..\dep\recastnavigation\Detour\win\VC90\Detour.vcproj", "{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
-		Debug_NoPCH|x64 = Debug_NoPCH|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.Build.0 = Debug|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.ActiveCfg = Debug|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.Build.0 = Debug|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.ActiveCfg = Release|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.Build.0 = Release|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.ActiveCfg = Release|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.Build.0 = Release|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.ActiveCfg = Debug|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.Build.0 = Debug|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.ActiveCfg = Debug|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.Build.0 = Debug|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.ActiveCfg = Release|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.Build.0 = Release|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.ActiveCfg = Release|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.Build.0 = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.Build.0 = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.Build.0 = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.ActiveCfg = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.Build.0 = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.ActiveCfg = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.Build.0 = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.Build.0 = Debug|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.ActiveCfg = Debug|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.Build.0 = Debug|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.ActiveCfg = Release|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.Build.0 = Release|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.ActiveCfg = Release|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.Build.0 = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.Build.0 = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.ActiveCfg = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.Build.0 = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.Build.0 = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.Build.0 = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.ActiveCfg = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64
-		{BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.Build.0 = Debug|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.ActiveCfg = Debug|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.Build.0 = Debug|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.ActiveCfg = Release|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.Build.0 = Release|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.ActiveCfg = Release|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.Build.0 = Release|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.Build.0 = Debug|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.ActiveCfg = Debug|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.Build.0 = Debug|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.ActiveCfg = Release|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.Build.0 = Release|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.ActiveCfg = Release|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.Build.0 = Release|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug_NoPCH|x64.ActiveCfg = Debug|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug_NoPCH|x64.Build.0 = Debug|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug|Win32.Build.0 = Debug|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug|x64.ActiveCfg = Debug|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Debug|x64.Build.0 = Debug|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Release|Win32.ActiveCfg = Release|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Release|Win32.Build.0 = Release|Win32
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Release|x64.ActiveCfg = Release|x64
-		{5FDC0EBC-3F80-4518-A5DF-1CD5BBEB64F7}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
-EndGlobal
diff --git a/win/VC100/realmd.vcxproj b/win/realmd.vcxproj
similarity index 87%
rename from win/VC100/realmd.vcxproj
rename to win/realmd.vcxproj
index 06403e50c23..e595339b9c3 100644
--- a/win/VC100/realmd.vcxproj
+++ b/win/realmd.vcxproj
@@ -60,31 +60,37 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -95,32 +101,32 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">realmd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">realmd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">realmd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">realmd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">realmd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.exe</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">realmd</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.exe</TargetExt>
@@ -151,7 +157,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +182,7 @@
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -195,7 +201,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -219,7 +225,7 @@
     <Link>
       <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -237,7 +243,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -253,6 +259,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>Cdecl</CallingConvention>
       <CompileAs>Default</CompileAs>
+      <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -262,7 +269,7 @@
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -282,7 +289,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -306,7 +313,7 @@
     <Link>
       <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -325,7 +332,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -350,7 +357,7 @@
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -370,7 +377,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION="0.17.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -394,7 +401,7 @@
     <Link>
       <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
@@ -407,23 +414,24 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\realmd\AuthCodes.h" />
-    <ClInclude Include="..\..\src\realmd\AuthSocket.h" />
-    <ClInclude Include="..\..\src\realmd\BufferedSocket.h" />
-    <ClInclude Include="..\..\src\realmd\PatchHandler.h" />
-    <ClInclude Include="..\..\src\realmd\RealmList.h" />
-    <ClInclude Include="..\..\src\shared\WheatyExceptionReport.h" />
+    <ClInclude Include="..\src\realmd\AuthCodes.h" />
+    <ClInclude Include="..\src\realmd\AuthSocket.h" />
+    <ClInclude Include="..\src\realmd\BufferedSocket.h" />
+    <ClInclude Include="..\src\realmd\IpList.h" />
+    <ClInclude Include="..\src\realmd\PatchHandler.h" />
+    <ClInclude Include="..\src\realmd\RealmList.h" />
+    <ClInclude Include="..\src\shared\WheatyExceptionReport.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\realmd\AuthSocket.cpp" />
-    <ClCompile Include="..\..\src\realmd\BufferedSocket.cpp" />
-    <ClCompile Include="..\..\src\realmd\Main.cpp" />
-    <ClCompile Include="..\..\src\realmd\PatchHandler.cpp" />
-    <ClCompile Include="..\..\src\realmd\RealmList.cpp" />
-    <ClCompile Include="..\..\src\shared\WheatyExceptionReport.cpp" />
+    <ClCompile Include="..\src\realmd\AuthSocket.cpp" />
+    <ClCompile Include="..\src\realmd\BufferedSocket.cpp" />
+    <ClCompile Include="..\src\realmd\Main.cpp" />
+    <ClCompile Include="..\src\realmd\PatchHandler.cpp" />
+    <ClCompile Include="..\src\realmd\RealmList.cpp" />
+    <ClCompile Include="..\src\shared\WheatyExceptionReport.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\src\realmd\realmd.rc" />
+    <ResourceCompile Include="..\src\realmd\realmd.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="shared.vcxproj">
diff --git a/win/VC100/script.vcxproj b/win/script.vcxproj
similarity index 82%
rename from win/VC100/script.vcxproj
rename to win/script.vcxproj
index e47d79a4c5a..37ab9945e94 100644
--- a/win/VC100/script.vcxproj
+++ b/win/script.vcxproj
@@ -89,34 +89,34 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mangosscript</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mangosscriptR2</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">mangosscript</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">mangosscriptR2</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.dll</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mangosscript</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mangosscriptR2</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">mangosscript</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">mangosscriptR2</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.dll</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">mangosscript</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">mangosscriptR2</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.dll</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">mangosscript</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">mangosscriptR2</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.dll</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -141,7 +141,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\shared;..\src\framework;..\dep\include;..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -155,14 +155,14 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);.\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\dep\lib\$(Platform)_$(Configuration);.\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
+      <ImportLibrary>$(IntDir)mangosscriptR2.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -172,7 +172,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\shared;..\src\framework;..\dep\include;..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -186,21 +186,21 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);.\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\dep\lib\$(Platform)_$(Configuration);.\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
+      <ImportLibrary>$(IntDir)mangosscriptR2.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
@@ -212,7 +212,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;ace.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -220,7 +220,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
+      <ImportLibrary>$(IntDir)mangosscriptR2.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
@@ -231,7 +231,7 @@
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\shared;..\src\framework;..\dep\include;..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
@@ -243,7 +243,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;ace.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -251,7 +251,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
+      <ImportLibrary>$(IntDir)mangosscriptR2.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
@@ -259,7 +259,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\shared;..\src\framework;..\dep\include;..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -273,14 +273,14 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
+      <ImportLibrary>$(IntDir)mangosscriptR2.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -290,7 +290,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\shared;..\src\framework;..\dep\include;..\dep\include;..\src\framework;..\src\shared;..\src\realmd;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -304,27 +304,27 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
+      <ImportLibrary>$(IntDir)mangosscriptR2.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\bindings\universal\config.h" />
-    <ClInclude Include="..\..\src\bindings\universal\ScriptMgr.h" />
-    <ClInclude Include="..\..\src\bindings\universal\Scripts\sc_defines.h" />
+    <ClInclude Include="..\src\bindings\universal\config.h" />
+    <ClInclude Include="..\src\bindings\universal\ScriptMgr.h" />
+    <ClInclude Include="..\src\bindings\universal\Scripts\sc_defines.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\bindings\universal\ScriptMgr.cpp" />
-    <ClCompile Include="..\..\src\bindings\universal\Scripts\sc_default.cpp" />
-    <ClCompile Include="..\..\src\bindings\universal\Scripts\sc_defines.cpp" />
-    <ClCompile Include="..\..\src\bindings\universal\system.cpp" />
+    <ClCompile Include="..\src\bindings\universal\ScriptMgr.cpp" />
+    <ClCompile Include="..\src\bindings\universal\Scripts\sc_default.cpp" />
+    <ClCompile Include="..\src\bindings\universal\Scripts\sc_defines.cpp" />
+    <ClCompile Include="..\src\bindings\universal\system.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="mangosd.vcxproj">
diff --git a/win/VC100/script.vcxproj.filters b/win/script.vcxproj.filters
similarity index 100%
rename from win/VC100/script.vcxproj.filters
rename to win/script.vcxproj.filters
diff --git a/win/VC100/shared.vcxproj b/win/shared.vcxproj
similarity index 78%
rename from win/VC100/shared.vcxproj
rename to win/shared.vcxproj
index 95cddf571c9..4e9455a4fce 100644
--- a/win/VC100/shared.vcxproj
+++ b/win/shared.vcxproj
@@ -60,31 +60,37 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -146,7 +152,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +191,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -221,7 +227,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -238,6 +244,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>Cdecl</CallingConvention>
       <CompileAs>Default</CompileAs>
+      <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -259,7 +266,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -294,7 +301,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -332,7 +339,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -360,7 +367,7 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\src\shared\revision.h">
+    <CustomBuild Include="..\src\shared\revision.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Extract revision</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(SolutionDir)..\src\shared"
 "$(TargetDir)..\genrevision__$(Platform)_$(Configuration)\genrevision.exe" "..\.."
@@ -400,94 +407,85 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\src\shared\SystemConfig.h.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
+    <CustomBuild Include="..\src\shared\SystemConfig.h.in">
+      <Message>Performing Build SystemConfig.h</Message>
+      <Outputs>..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy $(SolutionDir)..\src\shared\SystemConfig.h.in $(SolutionDir)..\src\shared\SystemConfig.h
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">copy $(SolutionDir)..\src\shared\SystemConfig.h.in $(SolutionDir)..\src\shared\SystemConfig.h
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy $(SolutionDir)..\src\shared\SystemConfig.h.in $(SolutionDir)..\src\shared\SystemConfig.h
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">copy $(SolutionDir)..\src\shared\SystemConfig.h.in $(SolutionDir)..\src\shared\SystemConfig.h
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">copy $(SolutionDir)..\src\shared\SystemConfig.h.in $(SolutionDir)..\src\shared\SystemConfig.h
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">copy $(SolutionDir)..\src\shared\SystemConfig.h.in $(SolutionDir)..\src\shared\SystemConfig.h
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\shared\Auth\AuthCrypt.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\BigNumber.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\HMACSHA1.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\md5.c" />
-    <ClCompile Include="..\..\src\shared\Auth\SARC4.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\Sha1.cpp" />
-    <ClCompile Include="..\..\src\shared\Common.cpp" />
-    <ClCompile Include="..\..\src\shared\Config\Config.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\Database.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\DatabaseMysql.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\DBCFileLoader.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\Field.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\QueryResultMysql.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlDelayThread.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlOperations.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlPreparedStatement.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SQLStorage.cpp" />
-    <ClCompile Include="..\..\src\shared\Log.cpp" />
-    <ClCompile Include="..\..\src\shared\ProgressBar.cpp" />
-    <ClCompile Include="..\..\src\shared\ServiceWin32.cpp" />
-    <ClCompile Include="..\..\src\shared\Threading.cpp" />
-    <ClCompile Include="..\..\src\shared\Util.cpp" />
+    <ClCompile Include="..\src\shared\Auth\AuthCrypt.cpp" />
+    <ClCompile Include="..\src\shared\Auth\BigNumber.cpp" />
+    <ClCompile Include="..\src\shared\Auth\HMACSHA1.cpp" />
+    <ClCompile Include="..\src\shared\Auth\md5.c" />
+    <ClCompile Include="..\src\shared\Auth\SARC4.cpp" />
+    <ClCompile Include="..\src\shared\Auth\Sha1.cpp" />
+    <ClCompile Include="..\src\shared\ByteBuffer.cpp" />
+    <ClCompile Include="..\src\shared\Common.cpp" />
+    <ClCompile Include="..\src\shared\Config\Config.cpp" />
+    <ClCompile Include="..\src\shared\Database\Database.cpp" />
+    <ClCompile Include="..\src\shared\Database\DatabaseMysql.cpp" />
+    <ClCompile Include="..\src\shared\Database\DBCFileLoader.cpp" />
+    <ClCompile Include="..\src\shared\Database\Field.cpp" />
+    <ClCompile Include="..\src\shared\Database\QueryResultMysql.cpp" />
+    <ClCompile Include="..\src\shared\Database\SqlDelayThread.cpp" />
+    <ClCompile Include="..\src\shared\Database\SqlOperations.cpp" />
+    <ClCompile Include="..\src\shared\Database\SqlPreparedStatement.cpp" />
+    <ClCompile Include="..\src\shared\Database\SQLStorage.cpp" />
+    <ClCompile Include="..\src\shared\Log.cpp" />
+    <ClCompile Include="..\src\shared\ProgressBar.cpp" />
+    <ClCompile Include="..\src\shared\ServiceWin32.cpp" />
+    <ClCompile Include="..\src\shared\Threading.cpp" />
+    <ClCompile Include="..\src\shared\Util.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\dep\include\mersennetwister\MersenneTwister.h" />
-    <ClInclude Include="..\..\src\shared\Auth\AuthCrypt.h" />
-    <ClInclude Include="..\..\src\shared\Auth\BigNumber.h" />
-    <ClInclude Include="..\..\src\shared\Auth\HMACSHA1.h" />
-    <ClInclude Include="..\..\src\shared\Auth\md5.h" />
-    <ClInclude Include="..\..\src\shared\Auth\SARC4.h" />
-    <ClInclude Include="..\..\src\shared\Auth\Sha1.h" />
-    <ClInclude Include="..\..\src\shared\ByteBuffer.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlPreparedStatement.h" />
-    <ClInclude Include="..\..\src\shared\WorldPacket.h" />
-    <ClInclude Include="..\..\src\shared\Common.h" />
-    <ClInclude Include="..\..\src\shared\Config\Config.h" />
-    <ClInclude Include="..\..\src\shared\Database\Database.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseEnv.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseImpl.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseMysql.h" />
-    <ClInclude Include="..\..\src\shared\Database\DBCFileLoader.h" />
-    <ClInclude Include="..\..\src\shared\Database\DBCStore.h" />
-    <ClInclude Include="..\..\src\shared\Database\Field.h" />
-    <ClInclude Include="..\..\src\shared\Database\MySQLDelayThread.h" />
-    <ClInclude Include="..\..\src\shared\Database\QueryResult.h" />
-    <ClInclude Include="..\..\src\shared\Database\QueryResultMysql.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlDelayThread.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlOperations.h" />
-    <ClInclude Include="..\..\src\shared\Database\SQLStorage.h" />
-    <ClInclude Include="..\..\src\shared\Database\SQLStorageImpl.h" />
-    <ClInclude Include="..\..\src\shared\Errors.h" />
-    <ClInclude Include="..\..\src\shared\LockedQueue.h" />
-    <ClInclude Include="..\..\src\shared\Log.h" />
-    <ClInclude Include="..\..\src\shared\ProgressBar.h" />
-    <ClInclude Include="..\..\src\shared\revision_nr.h" />
-    <ClInclude Include="..\..\src\shared\revision_sql.h" />
-    <ClInclude Include="..\..\src\shared\ServiceWin32.h" />
-    <ClInclude Include="..\..\src\shared\Threading.h" />
-    <ClInclude Include="..\..\src\shared\Timer.h" />
-    <ClInclude Include="..\..\src\shared\Util.h" />
+    <ClInclude Include="..\dep\include\mersennetwister\MersenneTwister.h" />
+    <ClInclude Include="..\src\shared\Auth\AuthCrypt.h" />
+    <ClInclude Include="..\src\shared\Auth\BigNumber.h" />
+    <ClInclude Include="..\src\shared\Auth\HMACSHA1.h" />
+    <ClInclude Include="..\src\shared\Auth\md5.h" />
+    <ClInclude Include="..\src\shared\Auth\SARC4.h" />
+    <ClInclude Include="..\src\shared\Auth\Sha1.h" />
+    <ClInclude Include="..\src\shared\ByteBuffer.h" />
+    <ClInclude Include="..\src\shared\Database\SqlPreparedStatement.h" />
+    <ClInclude Include="..\src\shared\SystemConfig.h" />
+    <ClInclude Include="..\src\shared\WorldPacket.h" />
+    <ClInclude Include="..\src\shared\Common.h" />
+    <ClInclude Include="..\src\shared\Config\Config.h" />
+    <ClInclude Include="..\src\shared\Database\Database.h" />
+    <ClInclude Include="..\src\shared\Database\DatabaseEnv.h" />
+    <ClInclude Include="..\src\shared\Database\DatabaseImpl.h" />
+    <ClInclude Include="..\src\shared\Database\DatabaseMysql.h" />
+    <ClInclude Include="..\src\shared\Database\DBCFileLoader.h" />
+    <ClInclude Include="..\src\shared\Database\DBCStore.h" />
+    <ClInclude Include="..\src\shared\Database\Field.h" />
+    <ClInclude Include="..\src\shared\Database\QueryResult.h" />
+    <ClInclude Include="..\src\shared\Database\QueryResultMysql.h" />
+    <ClInclude Include="..\src\shared\Database\SqlDelayThread.h" />
+    <ClInclude Include="..\src\shared\Database\SqlOperations.h" />
+    <ClInclude Include="..\src\shared\Database\SQLStorage.h" />
+    <ClInclude Include="..\src\shared\Database\SQLStorageImpl.h" />
+    <ClInclude Include="..\src\shared\Errors.h" />
+    <ClInclude Include="..\src\shared\LockedQueue.h" />
+    <ClInclude Include="..\src\shared\Log.h" />
+    <ClInclude Include="..\src\shared\ProgressBar.h" />
+    <ClInclude Include="..\src\shared\revision_nr.h" />
+    <ClInclude Include="..\src\shared\revision_sql.h" />
+    <ClInclude Include="..\src\shared\ServiceWin32.h" />
+    <ClInclude Include="..\src\shared\Threading.h" />
+    <ClInclude Include="..\src\shared\Timer.h" />
+    <ClInclude Include="..\src\shared\Util.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="ACE_vc10.vcxproj">
diff --git a/win/shared.vcxproj.filters b/win/shared.vcxproj.filters
new file mode 100644
index 00000000000..4e3c44fa694
--- /dev/null
+++ b/win/shared.vcxproj.filters
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Database">
+      <UniqueIdentifier>{c8fcac37-3e33-4a88-b9b3-a322b7dfe5bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Database\DataStores">
+      <UniqueIdentifier>{809f010b-4e16-4925-81a1-e0778f06f028}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Log">
+      <UniqueIdentifier>{97ba4623-a513-4ad4-b769-7abcff4b6641}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Util">
+      <UniqueIdentifier>{9c8bfd20-3dca-44b6-8d3d-fd5925b39914}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Config">
+      <UniqueIdentifier>{adb98dec-d22a-40b3-84be-51eaf2974a15}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Auth">
+      <UniqueIdentifier>{e35fd108-bd39-46ae-83f9-09cf1ebf4ea8}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\shared\Auth\AuthCrypt.cpp" />
+    <ClCompile Include="..\src\shared\Auth\BigNumber.cpp" />
+    <ClCompile Include="..\src\shared\Auth\HMACSHA1.cpp" />
+    <ClCompile Include="..\src\shared\Auth\md5.c" />
+    <ClCompile Include="..\src\shared\Auth\SARC4.cpp" />
+    <ClCompile Include="..\src\shared\Auth\Sha1.cpp" />
+    <ClCompile Include="..\src\shared\ByteBuffer.cpp" />
+    <ClCompile Include="..\src\shared\Common.cpp" />
+    <ClCompile Include="..\src\shared\Config\Config.cpp" />
+    <ClCompile Include="..\src\shared\Database\Database.cpp" />
+    <ClCompile Include="..\src\shared\Database\DatabaseMysql.cpp" />
+    <ClCompile Include="..\src\shared\Database\DBCFileLoader.cpp" />
+    <ClCompile Include="..\src\shared\Database\Field.cpp" />
+    <ClCompile Include="..\src\shared\Database\QueryResultMysql.cpp" />
+    <ClCompile Include="..\src\shared\Database\SqlDelayThread.cpp" />
+    <ClCompile Include="..\src\shared\Database\SqlOperations.cpp" />
+    <ClCompile Include="..\src\shared\Database\SqlPreparedStatement.cpp" />
+    <ClCompile Include="..\src\shared\Database\SQLStorage.cpp" />
+    <ClCompile Include="..\src\shared\Log.cpp" />
+    <ClCompile Include="..\src\shared\ProgressBar.cpp" />
+    <ClCompile Include="..\src\shared\ServiceWin32.cpp" />
+    <ClCompile Include="..\src\shared\Threading.cpp" />
+    <ClCompile Include="..\src\shared\Util.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\include\mersennetwister\MersenneTwister.h" />
+    <ClInclude Include="..\src\shared\Auth\AuthCrypt.h" />
+    <ClInclude Include="..\src\shared\Auth\BigNumber.h" />
+    <ClInclude Include="..\src\shared\Auth\HMACSHA1.h" />
+    <ClInclude Include="..\src\shared\Auth\md5.h" />
+    <ClInclude Include="..\src\shared\Auth\SARC4.h" />
+    <ClInclude Include="..\src\shared\Auth\Sha1.h" />
+    <ClInclude Include="..\src\shared\ByteBuffer.h" />
+    <ClInclude Include="..\src\shared\Database\SqlPreparedStatement.h" />
+    <ClInclude Include="..\src\shared\SystemConfig.h" />
+    <ClInclude Include="..\src\shared\WorldPacket.h" />
+    <ClInclude Include="..\src\shared\Common.h" />
+    <ClInclude Include="..\src\shared\Config\Config.h" />
+    <ClInclude Include="..\src\shared\Database\Database.h" />
+    <ClInclude Include="..\src\shared\Database\DatabaseEnv.h" />
+    <ClInclude Include="..\src\shared\Database\DatabaseImpl.h" />
+    <ClInclude Include="..\src\shared\Database\DatabaseMysql.h" />
+    <ClInclude Include="..\src\shared\Database\DBCFileLoader.h" />
+    <ClInclude Include="..\src\shared\Database\DBCStore.h" />
+    <ClInclude Include="..\src\shared\Database\Field.h" />
+    <ClInclude Include="..\src\shared\Database\QueryResult.h" />
+    <ClInclude Include="..\src\shared\Database\QueryResultMysql.h" />
+    <ClInclude Include="..\src\shared\Database\SqlDelayThread.h" />
+    <ClInclude Include="..\src\shared\Database\SqlOperations.h" />
+    <ClInclude Include="..\src\shared\Database\SQLStorage.h" />
+    <ClInclude Include="..\src\shared\Database\SQLStorageImpl.h" />
+    <ClInclude Include="..\src\shared\Errors.h" />
+    <ClInclude Include="..\src\shared\LockedQueue.h" />
+    <ClInclude Include="..\src\shared\Log.h" />
+    <ClInclude Include="..\src\shared\ProgressBar.h" />
+    <ClInclude Include="..\src\shared\revision_nr.h" />
+    <ClInclude Include="..\src\shared\revision_sql.h" />
+    <ClInclude Include="..\src\shared\ServiceWin32.h" />
+    <ClInclude Include="..\src\shared\Threading.h" />
+    <ClInclude Include="..\src\shared\Timer.h" />
+    <ClInclude Include="..\src\shared\Util.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\src\shared\revision.h" />
+    <CustomBuild Include="..\src\shared\SystemConfig.h.in" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/tbb.vcxproj b/win/tbb.vcxproj
new file mode 100644
index 00000000000..8bb1cfe2dc4
--- /dev/null
+++ b/win/tbb.vcxproj
@@ -0,0 +1,487 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug_NoPCH|Win32">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|Win32">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|x64">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|x64">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGUID>{F62787DD-1327-448B-9818-030062BCFAA5}</ProjectGUID>
+    <RootNamespace>tbb</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">tbb_debug</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">tbb_debug</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">tbb</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">tbb</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\dep\lib\$(Platform)_debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">tbb_debug</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\dep\lib\$(Platform)_debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\tbb__$(Platform)_$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">tbb_debug</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.dll</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include /DTBB_USE_CAPTURED_EXCEPTION=1 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include /DTBB_USE_CAPTURED_EXCEPTION=1 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ShowIncludes>false</ShowIncludes>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions> /c /MD /O2 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /Oy- /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include /DTBB_USE_CAPTURED_EXCEPTION=1 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions> /c /MD /O2 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include  /DTBB_USE_CAPTURED_EXCEPTION=1 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
+    <ClCompile>
+      <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include /DTBB_USE_CAPTURED_EXCEPTION=1 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ShowIncludes>false</ShowIncludes>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO  /DEF:$(IntDir)tbb.def %(AdditionalOptions)</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <MASM Include="..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/coff /Zi</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">/coff /Zi</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|X64'">true</ExcludedFromBuild>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">/coff /Zi</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">/coff /Zi</AdditionalOptions>
+    </MASM>
+    <CustomBuild Include="..\dep\tbb\src\tbb\intel64-masm\atomic_support.asm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">building atomic_support.obj</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">building atomic_support.obj</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj"  /DEM64T=1 /c /Zi ../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">building atomic_support.obj</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
+    </CustomBuild>
+    <MASM Include="..\dep\tbb\src\tbb\ia32-masm\lock_byte.asm">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/coff /Zi</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">/coff /Zi</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|X64'">true</ExcludedFromBuild>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">/coff /Zi</AdditionalOptions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">/coff /Zi</AdditionalOptions>
+    </MASM>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\dep\tbb\src\tbb\win32-tbb-export.def">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /nologo /TC /EP ../dep/tbb/src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../dep/tbb/src /I../dep/tbb/include &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\tbb__$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">cl /nologo /TC /EP ../../src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">$(IntDir)tbb.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /nologo /TC /EP ../dep/tbb/src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../dep/tbb/src /I../dep/tbb/include &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\tbb__$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|X64'">true</ExcludedFromBuild>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">cl /nologo /TC /EP ../../src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">$(IntDir)tbb.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">cl /nologo /TC /EP ../dep/tbb/src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../dep/tbb/src /I../dep/tbb/include &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\tbb__$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">cl /nologo /TC /EP ../../src/tbb/win32-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">$(IntDir)tbb.def;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\dep\tbb\src\tbb\win64-tbb-export.def">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)tbb.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">cl /nologo /TC /EP ../dep/tbb/src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../dep/tbb/src /I../dep/tbb/include &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\bin\$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)tbb.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">cl /nologo /TC /EP ../dep/tbb/src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../dep/tbb/src /I../dep/tbb/include &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\bin\$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">$(IntDir)tbb.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">generating tbb.def file</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">cl /nologo /TC /EP ../dep/tbb/src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../dep/tbb/src /I../dep/tbb/include &gt;$(IntDir)tbb.def
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\bin\$(Platform)_$(Configuration)\tbb.def;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\dep\tbb\src\tbb\tbb_resource.rc">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|X64'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">/I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\dep\tbb\src;..\dep\tbb\include;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\dep\tbb\src;..\dep\tbb\include;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\dep\tbb\src;..\dep\tbb\include;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'">..\dep\tbb\src;..\dep\tbb\include;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\dep\tbb\src;..\dep\tbb\include;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\dep\tbb\src;..\dep\tbb\include;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\tbb\src\old\concurrent_queue_v2.h" />
+    <ClInclude Include="..\dep\tbb\src\old\concurrent_vector_v2.h" />
+    <ClInclude Include="..\dep\tbb\src\old\spin_rw_mutex_v2.h" />
+    <ClInclude Include="..\dep\tbb\src\tbb\dynamic_link.h" />
+    <ClInclude Include="..\dep\tbb\src\tbb\gate.h" />
+    <ClInclude Include="..\dep\tbb\src\tbb\itt_notify.h" />
+    <ClInclude Include="..\dep\tbb\src\tbb\tbb_assert_impl.h" />
+    <ClInclude Include="..\dep\tbb\src\tbb\tbb_misc.h" />
+    <ClInclude Include="..\dep\tbb\src\tbb\tbb_version.h" />
+    <ClInclude Include="..\include\tbb\aligned_space.h" />
+    <ClInclude Include="..\include\tbb\atomic.h" />
+    <ClInclude Include="..\include\tbb\blocked_range.h" />
+    <ClInclude Include="..\include\tbb\blocked_range2d.h" />
+    <ClInclude Include="..\include\tbb\blocked_range3d.h" />
+    <ClInclude Include="..\include\tbb\cache_aligned_allocator.h" />
+    <ClInclude Include="..\include\tbb\concurrent_hash_map.h" />
+    <ClInclude Include="..\include\tbb\concurrent_queue.h" />
+    <ClInclude Include="..\include\tbb\concurrent_vector.h" />
+    <ClInclude Include="..\include\tbb\enumerable_thread_specific.h" />
+    <ClInclude Include="..\include\tbb\machine\ibm_aix51.h" />
+    <ClInclude Include="..\include\tbb\machine\linux_common.h" />
+    <ClInclude Include="..\include\tbb\machine\linux_ia32.h" />
+    <ClInclude Include="..\include\tbb\machine\linux_ia64.h" />
+    <ClInclude Include="..\include\tbb\machine\linux_intel64.h" />
+    <ClInclude Include="..\include\tbb\machine\mac_ppc.h" />
+    <ClInclude Include="..\include\tbb\machine\windows_ia32.h" />
+    <ClInclude Include="..\include\tbb\machine\windows_intel64.h" />
+    <ClInclude Include="..\include\tbb\mutex.h" />
+    <ClInclude Include="..\include\tbb\null_mutex.h" />
+    <ClInclude Include="..\include\tbb\null_rw_mutex.h" />
+    <ClInclude Include="..\include\tbb\parallel_do.h" />
+    <ClInclude Include="..\include\tbb\parallel_for.h" />
+    <ClInclude Include="..\include\tbb\parallel_reduce.h" />
+    <ClInclude Include="..\include\tbb\parallel_scan.h" />
+    <ClInclude Include="..\include\tbb\parallel_sort.h" />
+    <ClInclude Include="..\include\tbb\parallel_while.h" />
+    <ClInclude Include="..\include\tbb\partitioner.h" />
+    <ClInclude Include="..\include\tbb\pipeline.h" />
+    <ClInclude Include="..\include\tbb\queuing_mutex.h" />
+    <ClInclude Include="..\include\tbb\queuing_rw_mutex.h" />
+    <ClInclude Include="..\include\tbb\recursive_mutex.h" />
+    <ClInclude Include="..\include\tbb\scalable_allocator.h" />
+    <ClInclude Include="..\include\tbb\spin_mutex.h" />
+    <ClInclude Include="..\include\tbb\spin_rw_mutex.h" />
+    <ClInclude Include="..\include\tbb\task.h" />
+    <ClInclude Include="..\include\tbb\task_scheduler_init.h" />
+    <ClInclude Include="..\include\tbb\task_scheduler_observer.h" />
+    <ClInclude Include="..\include\tbb\tbbmalloc_proxy.h" />
+    <ClInclude Include="..\include\tbb\tbb_allocator.h" />
+    <ClInclude Include="..\include\tbb\tbb_exception.h" />
+    <ClInclude Include="..\include\tbb\tbb_machine.h" />
+    <ClInclude Include="..\include\tbb\tbb_profiling.h" />
+    <ClInclude Include="..\include\tbb\tbb_stddef.h" />
+    <ClInclude Include="..\include\tbb\tbb_thread.h" />
+    <ClInclude Include="..\include\tbb\tick_count.h" />
+    <ClInclude Include="..\include\tbb\_tbb_windef.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\tbb\src\old\concurrent_queue_v2.cpp" />
+    <ClCompile Include="..\dep\tbb\src\old\concurrent_vector_v2.cpp" />
+    <ClCompile Include="..\dep\tbb\src\old\spin_rw_mutex_v2.cpp" />
+    <ClCompile Include="..\dep\tbb\src\rml\client\rml_tbb.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\cache_aligned_allocator.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\concurrent_hash_map.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\concurrent_queue.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\concurrent_vector.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\dynamic_link.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\itt_notify.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\itt_notify_proxy.c" />
+    <ClCompile Include="..\dep\tbb\src\tbb\mutex.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\pipeline.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\private_server.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\queuing_mutex.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\queuing_rw_mutex.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\recursive_mutex.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\spin_mutex.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\spin_rw_mutex.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\task.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\tbb_misc.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\tbb_thread.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win/tbb.vcxproj.filters b/win/tbb.vcxproj.filters
new file mode 100644
index 00000000000..20876abb349
--- /dev/null
+++ b/win/tbb.vcxproj.filters
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <MASM Include="..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm">
+      <Filter>Source Files</Filter>
+    </MASM>
+    <MASM Include="..\dep\tbb\src\tbb\ia32-masm\lock_byte.asm">
+      <Filter>Source Files</Filter>
+    </MASM>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\tbb\src\old\concurrent_queue_v2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\old\concurrent_vector_v2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\old\spin_rw_mutex_v2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\rml\client\rml_tbb.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\cache_aligned_allocator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\concurrent_hash_map.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\concurrent_queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\concurrent_vector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\dynamic_link.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\itt_notify.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\itt_notify_proxy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\pipeline.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\private_server.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\queuing_mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\queuing_rw_mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\recursive_mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\spin_mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\spin_rw_mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\task.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\tbb_misc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\tbb_thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\tbb\src\old\concurrent_queue_v2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\old\concurrent_vector_v2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\old\spin_rw_mutex_v2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\tbb\dynamic_link.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\tbb\gate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\tbb\itt_notify.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\tbb\tbb_assert_impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\tbb\tbb_misc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\tbb\tbb_version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\aligned_space.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\atomic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\blocked_range.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\blocked_range2d.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\blocked_range3d.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\cache_aligned_allocator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\concurrent_hash_map.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\concurrent_queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\concurrent_vector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\enumerable_thread_specific.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\machine\ibm_aix51.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\machine\linux_common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\machine\linux_ia32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\machine\linux_ia64.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\machine\linux_intel64.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\machine\mac_ppc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\machine\windows_ia32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\machine\windows_intel64.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\null_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\null_rw_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_do.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_for.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_reduce.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_scan.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_sort.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_while.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\partitioner.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\pipeline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\queuing_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\queuing_rw_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\recursive_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\scalable_allocator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\spin_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\spin_rw_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\task.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\task_scheduler_init.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\task_scheduler_observer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbbmalloc_proxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_allocator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_exception.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_machine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_profiling.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_stddef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tick_count.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\_tbb_windef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\dep\tbb\src\tbb\tbb_resource.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\dep\tbb\src\tbb\intel64-masm\atomic_support.asm">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\dep\tbb\src\tbb\win32-tbb-export.def">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\dep\tbb\src\tbb\win64-tbb-export.def">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/VC100/tbbmalloc.vcxproj b/win/tbbmalloc.vcxproj
similarity index 77%
rename from win/VC100/tbbmalloc.vcxproj
rename to win/tbbmalloc.vcxproj
index 1470edb152f..c1bd34be19b 100644
--- a/win/VC100/tbbmalloc.vcxproj
+++ b/win/tbbmalloc.vcxproj
@@ -59,28 +59,34 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -92,32 +98,32 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\tbbmalloc__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">tbbmalloc_debug</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\tbbmalloc__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">tbbmalloc_debug</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.dll</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\tbbmalloc__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">tbbmalloc</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\dep\lib\$(Platform)_$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\tbbmalloc__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">tbbmalloc</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.dll</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\dep\lib\$(Platform)_debug\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\dep\lib\$(Platform)_debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\tbbmalloc__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">tbbmalloc_debug</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.dll</TargetExt>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\dep\lib\$(Platform)_debug\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\dep\lib\$(Platform)_debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\tbbmalloc__$(Platform)_$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">tbbmalloc_debug</TargetName>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.dll</TargetExt>
@@ -127,9 +133,9 @@
     <ClCompile>
       <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHs- /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
       <BasicRuntimeChecks>
@@ -147,6 +153,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
@@ -156,7 +163,7 @@
     <ClCompile>
       <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHs- /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -182,7 +189,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalOptions> /c /MD /O2 /Zi /EHs- /Zc:forScope /Zc:wchar_t /Oy- /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -209,7 +216,7 @@
     </Midl>
     <ClCompile>
       <AdditionalOptions> /c /MD /O2 /Zi /EHs- /Zc:forScope /Zc:wchar_t /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -234,7 +241,7 @@
     <ClCompile>
       <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHs- /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <ExceptionHandling>
@@ -263,7 +270,7 @@
     <ClCompile>
       <AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHs- /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /I../../src /I../../include /I../../src/tbbmalloc /I../../src/tbbmalloc %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\tbb\include;..\dep\tbb\src;..\dep\tbb\build;..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -287,26 +294,26 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\dep\tbb\src\tbb\em64t-masm\atomic_support.asm">
+    <CustomBuild Include="..\dep\tbb\src\tbb\em64t-masm\atomic_support.asm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">building atomic_support.obj</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">building atomic_support.obj</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj"  /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj"  /DEM64T=1 /c /Zi ../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">building atomic_support.obj</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <MASM Include="..\..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm">
+    <MASM Include="..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/coff /Zi</AdditionalOptions>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">/coff /Zi</AdditionalOptions>
@@ -315,7 +322,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">/coff /Zi</AdditionalOptions>
     </MASM>
-    <MASM Include="..\..\dep\tbb\src\tbb\ia32-masm\lock_byte.asm">
+    <MASM Include="..\dep\tbb\src\tbb\ia32-masm\lock_byte.asm">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/coff /Zi</AdditionalOptions>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">/coff /Zi</AdditionalOptions>
@@ -326,9 +333,9 @@
     </MASM>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\dep\tbb\src\tbbmalloc\win32-tbbmalloc-export.def">
+    <CustomBuild Include="..\dep\tbb\src\tbbmalloc\win32-tbbmalloc-export.def">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">generating tbbmalloc.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win32-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /nologo /TC /EP ../dep/tbb/src/tbbmalloc/win32-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\tbbmalloc__$(Platform)_$(Configuration)\tbbmalloc.def;%(Outputs)</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</ExcludedFromBuild>
@@ -337,7 +344,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">$(IntDir)tbbmalloc.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">generating tbbmalloc.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win32-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /nologo /TC /EP ../dep/tbb/src/tbbmalloc/win32-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\tbbmalloc__$(Platform)_$(Configuration)\tbbmalloc.def;%(Outputs)</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|X64'">true</ExcludedFromBuild>
@@ -346,7 +353,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">$(IntDir)tbb.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">generating tbbmalloc.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win32-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">cl /nologo /TC /EP ../dep/tbb/src/tbbmalloc/win32-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\tbbmalloc__$(Platform)_$(Configuration)\tbbmalloc.def;%(Outputs)</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">true</ExcludedFromBuild>
@@ -357,91 +364,91 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\dep\tbb\src\tbbmalloc\win64-tbbmalloc-export.def">
+    <CustomBuild Include="..\dep\tbb\src\tbbmalloc\win64-tbbmalloc-export.def">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">generating tbb.def file</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)tbb.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">generating tbbmalloc.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win64-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">cl /nologo /TC /EP ../dep/tbb/src/tbbmalloc/win64-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\tbbmalloc.def;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\bin\$(Platform)_$(Configuration)\tbbmalloc.def;%(Outputs)</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">generating tbb.def file</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)tbb.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">generating tbbmalloc.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win64-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">cl /nologo /TC /EP ../dep/tbb/src/tbbmalloc/win64-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\tbbmalloc.def;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\bin\$(Platform)_$(Configuration)\tbbmalloc.def;%(Outputs)</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">generating tbb.def file</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">cl /nologo /TC /EP ../../src/tbb/win64-tbb-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbb.def
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">$(IntDir)tbb.def;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">generating tbbmalloc.def file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">cl /nologo /TC /EP ../../dep/tbb/src/tbbmalloc/win64-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">cl /nologo /TC /EP ../dep/tbb/src/tbbmalloc/win64-tbbmalloc-export.def /DTBB_USE_DEBUG /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 &gt;$(IntDir)tbbmalloc.def
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\tbbmalloc.def;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\bin\$(Platform)_$(Configuration)\tbbmalloc.def;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\dep\tbb\src\tbbmalloc\Customize.h" />
-    <ClInclude Include="..\..\dep\tbb\src\tbbmalloc\LifoQueue.h" />
-    <ClInclude Include="..\..\dep\tbb\src\tbbmalloc\MapMemory.h" />
-    <ClInclude Include="..\..\dep\tbb\src\tbbmalloc\Statistics.h" />
-    <ClInclude Include="..\..\dep\tbb\src\tbbmalloc\TypeDefinitions.h" />
-    <ClInclude Include="..\..\include\tbb\aligned_space.h" />
-    <ClInclude Include="..\..\include\tbb\atomic.h" />
-    <ClInclude Include="..\..\include\tbb\blocked_range.h" />
-    <ClInclude Include="..\..\include\tbb\blocked_range2d.h" />
-    <ClInclude Include="..\..\include\tbb\blocked_range3d.h" />
-    <ClInclude Include="..\..\include\tbb\cache_aligned_allocator.h" />
-    <ClInclude Include="..\..\include\tbb\concurrent_hash_map.h" />
-    <ClInclude Include="..\..\include\tbb\concurrent_queue.h" />
-    <ClInclude Include="..\..\include\tbb\concurrent_vector.h" />
-    <ClInclude Include="..\..\include\tbb\enumerable_thread_specific.h" />
-    <ClInclude Include="..\..\include\tbb\machine\windows_em64t.h" />
-    <ClInclude Include="..\..\include\tbb\machine\windows_ia32.h" />
-    <ClInclude Include="..\..\include\tbb\machine\windows_ia32_inline.h" />
-    <ClInclude Include="..\..\include\tbb\mutex.h" />
-    <ClInclude Include="..\..\include\tbb\null_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\null_rw_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_do.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_for.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_reduce.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_scan.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_sort.h" />
-    <ClInclude Include="..\..\include\tbb\parallel_while.h" />
-    <ClInclude Include="..\..\include\tbb\partitioner.h" />
-    <ClInclude Include="..\..\include\tbb\pipeline.h" />
-    <ClInclude Include="..\..\include\tbb\queuing_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\queuing_rw_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\recursive_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\scalable_allocator.h" />
-    <ClInclude Include="..\..\include\tbb\spin_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\spin_rw_mutex.h" />
-    <ClInclude Include="..\..\include\tbb\task.h" />
-    <ClInclude Include="..\..\include\tbb\task_scheduler_init.h" />
-    <ClInclude Include="..\..\include\tbb\task_scheduler_observer.h" />
-    <ClInclude Include="..\..\include\tbb\tbbmalloc_proxy.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_allocator.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_exception.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_machine.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_profiling.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_stddef.h" />
-    <ClInclude Include="..\..\include\tbb\tbb_thread.h" />
-    <ClInclude Include="..\..\include\tbb\tick_count.h" />
-    <ClInclude Include="..\..\include\tbb\_tbb_windef.h" />
+    <ClInclude Include="..\dep\tbb\src\tbbmalloc\Customize.h" />
+    <ClInclude Include="..\dep\tbb\src\tbbmalloc\LifoQueue.h" />
+    <ClInclude Include="..\dep\tbb\src\tbbmalloc\MapMemory.h" />
+    <ClInclude Include="..\dep\tbb\src\tbbmalloc\Statistics.h" />
+    <ClInclude Include="..\dep\tbb\src\tbbmalloc\TypeDefinitions.h" />
+    <ClInclude Include="..\include\tbb\aligned_space.h" />
+    <ClInclude Include="..\include\tbb\atomic.h" />
+    <ClInclude Include="..\include\tbb\blocked_range.h" />
+    <ClInclude Include="..\include\tbb\blocked_range2d.h" />
+    <ClInclude Include="..\include\tbb\blocked_range3d.h" />
+    <ClInclude Include="..\include\tbb\cache_aligned_allocator.h" />
+    <ClInclude Include="..\include\tbb\concurrent_hash_map.h" />
+    <ClInclude Include="..\include\tbb\concurrent_queue.h" />
+    <ClInclude Include="..\include\tbb\concurrent_vector.h" />
+    <ClInclude Include="..\include\tbb\enumerable_thread_specific.h" />
+    <ClInclude Include="..\include\tbb\machine\windows_em64t.h" />
+    <ClInclude Include="..\include\tbb\machine\windows_ia32.h" />
+    <ClInclude Include="..\include\tbb\machine\windows_ia32_inline.h" />
+    <ClInclude Include="..\include\tbb\mutex.h" />
+    <ClInclude Include="..\include\tbb\null_mutex.h" />
+    <ClInclude Include="..\include\tbb\null_rw_mutex.h" />
+    <ClInclude Include="..\include\tbb\parallel_do.h" />
+    <ClInclude Include="..\include\tbb\parallel_for.h" />
+    <ClInclude Include="..\include\tbb\parallel_reduce.h" />
+    <ClInclude Include="..\include\tbb\parallel_scan.h" />
+    <ClInclude Include="..\include\tbb\parallel_sort.h" />
+    <ClInclude Include="..\include\tbb\parallel_while.h" />
+    <ClInclude Include="..\include\tbb\partitioner.h" />
+    <ClInclude Include="..\include\tbb\pipeline.h" />
+    <ClInclude Include="..\include\tbb\queuing_mutex.h" />
+    <ClInclude Include="..\include\tbb\queuing_rw_mutex.h" />
+    <ClInclude Include="..\include\tbb\recursive_mutex.h" />
+    <ClInclude Include="..\include\tbb\scalable_allocator.h" />
+    <ClInclude Include="..\include\tbb\spin_mutex.h" />
+    <ClInclude Include="..\include\tbb\spin_rw_mutex.h" />
+    <ClInclude Include="..\include\tbb\task.h" />
+    <ClInclude Include="..\include\tbb\task_scheduler_init.h" />
+    <ClInclude Include="..\include\tbb\task_scheduler_observer.h" />
+    <ClInclude Include="..\include\tbb\tbbmalloc_proxy.h" />
+    <ClInclude Include="..\include\tbb\tbb_allocator.h" />
+    <ClInclude Include="..\include\tbb\tbb_exception.h" />
+    <ClInclude Include="..\include\tbb\tbb_machine.h" />
+    <ClInclude Include="..\include\tbb\tbb_profiling.h" />
+    <ClInclude Include="..\include\tbb\tbb_stddef.h" />
+    <ClInclude Include="..\include\tbb\tbb_thread.h" />
+    <ClInclude Include="..\include\tbb\tick_count.h" />
+    <ClInclude Include="..\include\tbb\_tbb_windef.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\dep\tbb\src\tbbmalloc\MemoryAllocator.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbbmalloc\tbbmalloc.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\dynamic_link.cpp" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\itt_notify_proxy.c" />
-    <ClCompile Include="..\..\dep\tbb\src\tbb\tbb_misc.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbbmalloc\MemoryAllocator.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbbmalloc\tbbmalloc.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\dynamic_link.cpp" />
+    <ClCompile Include="..\dep\tbb\src\tbb\itt_notify_proxy.c" />
+    <ClCompile Include="..\dep\tbb\src\tbb\tbb_misc.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win/tbbmalloc.vcxproj.filters b/win/tbbmalloc.vcxproj.filters
new file mode 100644
index 00000000000..8127ac57cdb
--- /dev/null
+++ b/win/tbbmalloc.vcxproj.filters
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <MASM Include="..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm">
+      <Filter>Source Files</Filter>
+    </MASM>
+    <MASM Include="..\dep\tbb\src\tbb\ia32-masm\lock_byte.asm">
+      <Filter>Source Files</Filter>
+    </MASM>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\tbb\src\tbbmalloc\MemoryAllocator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbbmalloc\tbbmalloc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\dynamic_link.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\itt_notify_proxy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\tbb\src\tbb\tbb_misc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\tbb\src\tbbmalloc\Customize.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\tbbmalloc\LifoQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\tbbmalloc\MapMemory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\tbbmalloc\Statistics.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\tbb\src\tbbmalloc\TypeDefinitions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\aligned_space.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\atomic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\blocked_range.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\blocked_range2d.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\blocked_range3d.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\cache_aligned_allocator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\concurrent_hash_map.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\concurrent_queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\concurrent_vector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\enumerable_thread_specific.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\machine\windows_em64t.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\machine\windows_ia32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\machine\windows_ia32_inline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\null_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\null_rw_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_do.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_for.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_reduce.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_scan.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_sort.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\parallel_while.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\partitioner.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\pipeline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\queuing_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\queuing_rw_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\recursive_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\scalable_allocator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\spin_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\spin_rw_mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\task.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\task_scheduler_init.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\task_scheduler_observer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbbmalloc_proxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_allocator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_exception.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_machine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_profiling.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_stddef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tbb_thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\tick_count.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\tbb\_tbb_windef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\dep\tbb\src\tbb\em64t-masm\atomic_support.asm">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\dep\tbb\src\tbbmalloc\win32-tbbmalloc-export.def">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\dep\tbb\src\tbbmalloc\win64-tbbmalloc-export.def">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/tests.vcxproj b/win/tests.vcxproj
new file mode 100644
index 00000000000..79aa5e7c75d
--- /dev/null
+++ b/win/tests.vcxproj
@@ -0,0 +1,588 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug_NoPCH|Win32">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_NoPCH|x64">
+      <Configuration>Debug_NoPCH</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2E0640EA-FC20-4D4F-B1F0-A089C9FC54B8}</ProjectGuid>
+    <RootNamespace>tests</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\tests__$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\tests__$(Platform)_$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\tests__$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\tests__$(Platform)_$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\tests__$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'">.\tests__$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\tests__$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'">.\tests__$(Platform)_$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\tests__$(Platform)_$(Configuration)\tests.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP -Zm270</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\dep\include\gsoap;..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\mangosd;..\dep\ACE_wrappers;..\dep\cppunit\include;..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>VERSION=0.15.0-DEV;WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\tests__$(Platform)_$(Configuration)\tests.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\tests__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\tests__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\tests__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 /LTCG %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);.\game__$(Platform)_$(Configuration);.\ace__$(Platform)_$(Configuration);.\cppunit__$(Platform)_$(Configuration);.\g3dlite__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\bin\$(Platform)_$(Configuration)\tests.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>..\bin\$(Platform)_$(Configuration)\tests.map</MapFileName>
+      <SubSystem>Console</SubSystem>
+      <LargeAddressAware>true</LargeAddressAware>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+      <ImportLibrary>$(OutDir)tests.lib</ImportLibrary>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy ..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\tests__$(Platform)_$(Configuration)\tests.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP -Zm256 %(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\dep\include\gsoap;..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\mangosd;..\dep\ACE_wrappers;..\dep\cppunit\include;..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>VERSION=0.15.0-DEV;WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\tests__$(Platform)_$(Configuration)\tests.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\tests__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\tests__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\tests__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);.\game__$(Platform)_$(Configuration);.\ace__$(Platform)_$(Configuration);.\cppunit__$(Platform)_$(Configuration);.\g3dlite__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\bin\$(Platform)_$(Configuration)\tests.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>..\bin\$(Platform)_$(Configuration)\tests.map</MapFileName>
+      <SubSystem>Console</SubSystem>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+      <ImportLibrary>$(OutDir)tests.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy ..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\tests__$(Platform)_$(Configuration)\tests.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP -Zm270</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include\gsoap;..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\mangosd;..\dep\ACE_wrappers;..\dep\cppunit\include;..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>VERSION=0.15.0-DEV;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\tests__$(Platform)_$(Configuration)\tests.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\tests__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\tests__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\tests__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <MinimalRebuild>false</MinimalRebuild>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;game.lib;cppunit.lib;msvcrtd.lib;ACEd.lib;g3dlite.lib;zlib.lib;Detour.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <Version>
+      </Version>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);.\game__$(Platform)_$(Configuration);.\ace__$(Platform)_$(Configuration);.\cppunit__$(Platform)_$(Configuration);.\g3dlite__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\bin\$(Platform)_$(Configuration)\tests.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>..\bin\$(Platform)_$(Configuration)\tests.map</MapFileName>
+      <SubSystem>Console</SubSystem>
+      <LargeAddressAware>true</LargeAddressAware>
+      <ImportLibrary>$(OutDir)tests.lib</ImportLibrary>
+      <FixedBaseAddress>false</FixedBaseAddress>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy ..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\tests__$(Platform)_$(Configuration)\tests.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm256 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include\gsoap;..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\mangosd;..\dep\ACE_wrappers;..\dep\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>VERSION=0.15.0-DEV;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>.\tests__$(Platform)_$(Configuration)\tests.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\tests__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\tests__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\tests__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;game.lib;cppunit.lib;msvcrtd.lib;ACEd.lib;g3dlite.lib;zlib.lib;Detour.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <Version>
+      </Version>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);.\game__$(Platform)_$(Configuration);.\ace__$(Platform)_$(Configuration);.\cppunit__$(Platform)_$(Configuration);.\g3dlite__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\bin\$(Platform)_$(Configuration)\tests.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>..\bin\$(Platform)_$(Configuration)\tests.map</MapFileName>
+      <SubSystem>Console</SubSystem>
+      <LargeAddressAware>true</LargeAddressAware>
+      <ImportLibrary>$(OutDir)tests.lib</ImportLibrary>
+      <FixedBaseAddress>false</FixedBaseAddress>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy ..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
+    <Midl>
+      <TypeLibraryName>.\tests__$(Platform)_$(Configuration)\tests.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP -Zm270</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\tests;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>VERSION=0.15.0-DEV;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeaderOutputFile>.\tests__$(Platform)_$(Configuration)\tests.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\tests__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\tests__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\tests__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\$(Platform)_$(Configuration)\tests.exe</OutputFile>
+      <Version>
+      </Version>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\bin\$(Platform)_$(Configuration)\tests.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>..\bin\$(Platform)_$(Configuration)\tests.map</MapFileName>
+      <SubSystem>Console</SubSystem>
+      <LargeAddressAware>true</LargeAddressAware>
+      <ImportLibrary>$(OutDir)tests.lib</ImportLibrary>
+      <FixedBaseAddress>false</FixedBaseAddress>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy ..\dep\lib\$(Platform)_debug\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|x64'">
+    <Midl>
+      <TypeLibraryName>.\tests__$(Platform)_$(Configuration)\tests.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm256 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\dep\include;..\src\framework;..\src\shared;..\src\game;..\src\tests;..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>VERSION=0.15.0-DEV;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeaderOutputFile>.\tests__$(Platform)_$(Configuration)\tests.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\tests__$(Platform)_$(Configuration)\</AssemblerListingLocation>
+      <ObjectFileName>.\tests__$(Platform)_$(Configuration)\</ObjectFileName>
+      <ProgramDataBaseFileName>.\tests__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\$(Platform)_$(Configuration)\tests.exe</OutputFile>
+      <Version>
+      </Version>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\bin\$(Platform)_$(Configuration)\tests.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>..\bin\$(Platform)_$(Configuration)\tests.map</MapFileName>
+      <SubSystem>Console</SubSystem>
+      <LargeAddressAware>true</LargeAddressAware>
+      <ImportLibrary>$(OutDir)tests.lib</ImportLibrary>
+      <FixedBaseAddress>false</FixedBaseAddress>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy ..\dep\lib\$(Platform)_debug\*.dll ..\bin\$(Platform)_$(Configuration)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\tests\AcceptAllQuestStrategyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ArcaneMageTestCase.cpp" />
+    <ClCompile Include="..\src\tests\BearTankDruidTestCase.cpp" />
+    <ClCompile Include="..\src\tests\CasterDruidTestCase.cpp" />
+    <ClCompile Include="..\src\tests\CasterShamanTestCase.cpp" />
+    <ClCompile Include="..\src\tests\CatDpsDruidTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ChatCommandTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ChatFilterTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsPriestTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DruidNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsHunterEngineTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DuelTestCase.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\DruidEfficiencyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\EfficiencyActionExecutionListener.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\MageEfficiencyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\PriestEfficiencyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\ShamanEfficiencyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\WarlockEfficiencyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\EventTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ExternalEventHelperTestCase.cpp" />
+    <ClCompile Include="..\src\tests\HealDruidTestCase.cpp" />
+    <ClCompile Include="..\src\tests\HolyPriestTestCase.cpp" />
+    <ClCompile Include="..\src\tests\HunterNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\FireMageTestCase.cpp" />
+    <ClCompile Include="..\src\tests\FrostMageTestCase.cpp" />
+    <ClCompile Include="..\src\tests\KiteTestCase.cpp" />
+    <ClCompile Include="..\src\tests\LootObjectStackTestCase.cpp" />
+    <ClCompile Include="..\src\tests\MageNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\EngineTestBase.cpp" />
+    <ClCompile Include="..\src\tests\EngineTestCase.cpp" />
+    <ClCompile Include="..\src\tests\GenericTestCase.cpp" />
+    <ClCompile Include="..\src\tests\MockAiObjectContext.cpp" />
+    <ClCompile Include="..\src\tests\MockPlayerbotAIBase.cpp" />
+    <ClCompile Include="..\src\tests\NonCombatEngineTestCase.cpp" />
+    <ClCompile Include="..\src\tests\NonCombatEngineTestCase2.cpp" />
+    <ClCompile Include="..\src\tests\PriestNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\QualifiedValueTestCase.cpp" />
+    <ClCompile Include="..\src\tests\QuestStrategyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\RacialsTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsWarriorTestCase.cpp" />
+    <ClCompile Include="..\src\tests\TankWarriorTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ValueTestCase.cpp" />
+    <ClCompile Include="..\src\tests\WarrirorNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\HealPriestTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsPaladinTestCase.cpp" />
+    <ClCompile Include="..\src\tests\PaladinNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\TankPaladinTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsWarlockTestCase.cpp" />
+    <ClCompile Include="..\src\tests\TankWarlockTestCase.cpp" />
+    <ClCompile Include="..\src\tests\WarlockNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\PerformanceTestCase.cpp" />
+    <ClCompile Include="..\src\tests\HealShamanTestCase.cpp" />
+    <ClCompile Include="..\src\tests\MeleeShamanTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ShamanNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsRogueTestCase.cpp" />
+    <ClCompile Include="..\src\tests\main.cpp" />
+    <ClCompile Include="..\src\tests\NextActionTestCase.cpp" />
+    <ClCompile Include="..\src\tests\pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\src\tests\QueueTestCase.cpp" />
+    <ClCompile Include="..\src\tests\WorldPacketHandlerTestCase.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\tests\AiObjectContextWrapper.h" />
+    <ClInclude Include="..\src\tests\efficiency\EfficiencyActionExecutionListener.h" />
+    <ClInclude Include="..\src\tests\EngineTestBase.h" />
+    <ClInclude Include="..\src\tests\EverythingUnavailableAiManagerRegistry.h" />
+    <ClInclude Include="..\src\tests\aitest.h" />
+    <ClInclude Include="..\src\tests\MockAiObjectContext.h" />
+    <ClInclude Include="..\src\tests\MockedAiObjectContextTestCase.h" />
+    <ClInclude Include="..\src\tests\MockedTargets.h" />
+    <ClInclude Include="..\src\tests\MockPlayerbotAIBase.h" />
+    <ClInclude Include="..\src\tests\pch.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ItemGroup>
+    <ProjectReference Include="Detour.vcxproj">
+      <Project>{72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6}</Project>
+    </ProjectReference>
+    <ProjectReference Include="game.vcxproj">
+      <Project>{1dc6c4da-a028-41f3-877d-d5400c594f88}</Project>
+    </ProjectReference>
+    <ProjectReference Include="realmd.vcxproj">
+      <Project>{563e9905-3657-460c-ae63-0ac39d162e23}</Project>
+    </ProjectReference>
+    <ProjectReference Include="shared.vcxproj">
+      <Project>{90297c34-f231-4df4-848e-a74bcc0e40ed}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/tests.vcxproj.filters b/win/tests.vcxproj.filters
new file mode 100644
index 00000000000..d10e0cf3ed9
--- /dev/null
+++ b/win/tests.vcxproj.filters
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Druid">
+      <UniqueIdentifier>{7f7bc479-c7cb-440a-80c5-bb28465af12e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Hunter">
+      <UniqueIdentifier>{77b66c31-8bf2-41ae-9d6c-d54c68ed85c9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Mage">
+      <UniqueIdentifier>{5b4928b5-9eaa-433f-a4ea-59441e199474}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Generic">
+      <UniqueIdentifier>{c2b8fcfe-f333-47f0-87d1-3440ca689d41}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Warrior">
+      <UniqueIdentifier>{5a22b7d5-b6df-46fc-9a78-0502e7f008c4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Priest">
+      <UniqueIdentifier>{9f958ef4-bc06-4f7a-b2a9-68ee949141e7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Paladin">
+      <UniqueIdentifier>{492aeae3-163d-4112-b47c-6bbe5ce24457}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Warlock">
+      <UniqueIdentifier>{3f5b45ad-fcc9-41bb-a86d-5471117675bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Performance">
+      <UniqueIdentifier>{ab5ab49e-e790-4458-aa85-257d45347418}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Shaman">
+      <UniqueIdentifier>{eb601dea-bbd8-4330-bc83-c4f62880c350}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Rogue">
+      <UniqueIdentifier>{0b65c0e2-b9e3-49cf-bd15-a104c7e04269}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Mocks">
+      <UniqueIdentifier>{89a9daa6-604a-4673-9497-d76541abdac2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="efficiency">
+      <UniqueIdentifier>{c30a2538-6a50-4c32-b8d0-d4704f715952}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\tests\AcceptAllQuestStrategyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ArcaneMageTestCase.cpp" />
+    <ClCompile Include="..\src\tests\BearTankDruidTestCase.cpp" />
+    <ClCompile Include="..\src\tests\CasterDruidTestCase.cpp" />
+    <ClCompile Include="..\src\tests\CasterShamanTestCase.cpp" />
+    <ClCompile Include="..\src\tests\CatDpsDruidTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ChatCommandTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ChatFilterTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsPriestTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DruidNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsHunterEngineTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DuelTestCase.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\DruidEfficiencyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\EfficiencyActionExecutionListener.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\MageEfficiencyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\PriestEfficiencyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\ShamanEfficiencyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\efficiency\WarlockEfficiencyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\EventTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ExternalEventHelperTestCase.cpp" />
+    <ClCompile Include="..\src\tests\HealDruidTestCase.cpp" />
+    <ClCompile Include="..\src\tests\HolyPriestTestCase.cpp" />
+    <ClCompile Include="..\src\tests\HunterNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\FireMageTestCase.cpp" />
+    <ClCompile Include="..\src\tests\FrostMageTestCase.cpp" />
+    <ClCompile Include="..\src\tests\KiteTestCase.cpp" />
+    <ClCompile Include="..\src\tests\LootObjectStackTestCase.cpp" />
+    <ClCompile Include="..\src\tests\MageNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\EngineTestBase.cpp" />
+    <ClCompile Include="..\src\tests\EngineTestCase.cpp" />
+    <ClCompile Include="..\src\tests\GenericTestCase.cpp" />
+    <ClCompile Include="..\src\tests\MockAiObjectContext.cpp" />
+    <ClCompile Include="..\src\tests\MockPlayerbotAIBase.cpp" />
+    <ClCompile Include="..\src\tests\NonCombatEngineTestCase.cpp" />
+    <ClCompile Include="..\src\tests\NonCombatEngineTestCase2.cpp" />
+    <ClCompile Include="..\src\tests\PriestNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\QualifiedValueTestCase.cpp" />
+    <ClCompile Include="..\src\tests\QuestStrategyTestCase.cpp" />
+    <ClCompile Include="..\src\tests\RacialsTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsWarriorTestCase.cpp" />
+    <ClCompile Include="..\src\tests\TankWarriorTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ValueTestCase.cpp" />
+    <ClCompile Include="..\src\tests\WarrirorNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\HealPriestTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsPaladinTestCase.cpp" />
+    <ClCompile Include="..\src\tests\PaladinNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\TankPaladinTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsWarlockTestCase.cpp" />
+    <ClCompile Include="..\src\tests\TankWarlockTestCase.cpp" />
+    <ClCompile Include="..\src\tests\WarlockNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\PerformanceTestCase.cpp" />
+    <ClCompile Include="..\src\tests\HealShamanTestCase.cpp" />
+    <ClCompile Include="..\src\tests\MeleeShamanTestCase.cpp" />
+    <ClCompile Include="..\src\tests\ShamanNonCombatTestCase.cpp" />
+    <ClCompile Include="..\src\tests\DpsRogueTestCase.cpp" />
+    <ClCompile Include="..\src\tests\main.cpp" />
+    <ClCompile Include="..\src\tests\NextActionTestCase.cpp" />
+    <ClCompile Include="..\src\tests\pch.cpp" />
+    <ClCompile Include="..\src\tests\QueueTestCase.cpp" />
+    <ClCompile Include="..\src\tests\WorldPacketHandlerTestCase.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\tests\AiObjectContextWrapper.h" />
+    <ClInclude Include="..\src\tests\efficiency\EfficiencyActionExecutionListener.h" />
+    <ClInclude Include="..\src\tests\EngineTestBase.h" />
+    <ClInclude Include="..\src\tests\EverythingUnavailableAiManagerRegistry.h" />
+    <ClInclude Include="..\src\tests\aitest.h" />
+    <ClInclude Include="..\src\tests\MockAiObjectContext.h" />
+    <ClInclude Include="..\src\tests\MockedAiObjectContextTestCase.h" />
+    <ClInclude Include="..\src\tests\MockedTargets.h" />
+    <ClInclude Include="..\src\tests\MockPlayerbotAIBase.h" />
+    <ClInclude Include="..\src\tests\pch.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win/VC100/zlib.vcxproj b/win/zlib.vcxproj
similarity index 86%
rename from win/VC100/zlib.vcxproj
rename to win/zlib.vcxproj
index a6f4f7ac112..5cda3af2432 100644
--- a/win/VC100/zlib.vcxproj
+++ b/win/zlib.vcxproj
@@ -59,26 +59,32 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -135,9 +141,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -156,7 +162,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -174,7 +180,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
@@ -193,7 +199,7 @@
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
@@ -209,7 +215,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -230,7 +236,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -246,31 +252,34 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\dep\src\zlib\crc32.h" />
-    <ClInclude Include="..\..\dep\src\zlib\deflate.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inffast.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inffixed.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inflate.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inftrees.h" />
-    <ClInclude Include="..\..\dep\src\zlib\trees.h" />
-    <ClInclude Include="..\..\dep\src\zlib\zconf.h" />
-    <ClInclude Include="..\..\dep\src\zlib\zlib.h" />
-    <ClInclude Include="..\..\dep\src\zlib\zutil.h" />
+    <ClInclude Include="..\dep\src\zlib\crc32.h" />
+    <ClInclude Include="..\dep\src\zlib\deflate.h" />
+    <ClInclude Include="..\dep\src\zlib\gzguts.h" />
+    <ClInclude Include="..\dep\src\zlib\inffast.h" />
+    <ClInclude Include="..\dep\src\zlib\inffixed.h" />
+    <ClInclude Include="..\dep\src\zlib\inflate.h" />
+    <ClInclude Include="..\dep\src\zlib\inftrees.h" />
+    <ClInclude Include="..\dep\src\zlib\trees.h" />
+    <ClInclude Include="..\dep\src\zlib\zconf.h" />
+    <ClInclude Include="..\dep\src\zlib\zlib.h" />
+    <ClInclude Include="..\dep\src\zlib\zutil.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\src\zlib\adler32.c" />
+    <ClCompile Include="..\dep\src\zlib\compress.c" />
+    <ClCompile Include="..\dep\src\zlib\crc32.c" />
+    <ClCompile Include="..\dep\src\zlib\deflate.c" />
+    <ClCompile Include="..\dep\src\zlib\example.c" />
+    <ClCompile Include="..\dep\src\zlib\infback.c" />
+    <ClCompile Include="..\dep\src\zlib\inffast.c" />
+    <ClCompile Include="..\dep\src\zlib\inflate.c" />
+    <ClCompile Include="..\dep\src\zlib\inftrees.c" />
+    <ClCompile Include="..\dep\src\zlib\trees.c" />
+    <ClCompile Include="..\dep\src\zlib\uncompr.c" />
+    <ClCompile Include="..\dep\src\zlib\zutil.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\dep\src\zlib\adler32.c" />
-    <ClCompile Include="..\..\dep\src\zlib\compress.c" />
-    <ClCompile Include="..\..\dep\src\zlib\crc32.c" />
-    <ClCompile Include="..\..\dep\src\zlib\deflate.c" />
-    <ClCompile Include="..\..\dep\src\zlib\example.c" />
-    <ClCompile Include="..\..\dep\src\zlib\gzio.c" />
-    <ClCompile Include="..\..\dep\src\zlib\infback.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inffast.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inflate.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inftrees.c" />
-    <ClCompile Include="..\..\dep\src\zlib\trees.c" />
-    <ClCompile Include="..\..\dep\src\zlib\uncompr.c" />
-    <ClCompile Include="..\..\dep\src\zlib\zutil.c" />
+    <None Include="..\dep\src\zlib\CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win/zlib.vcxproj.filters b/win/zlib.vcxproj.filters
new file mode 100644
index 00000000000..70bb29876f4
--- /dev/null
+++ b/win/zlib.vcxproj.filters
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dep\src\zlib\adler32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\zlib\compress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\zlib\crc32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\zlib\deflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\zlib\example.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\zlib\infback.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\zlib\inffast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\zlib\inflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\zlib\inftrees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\zlib\trees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\zlib\uncompr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dep\src\zlib\zutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dep\src\zlib\crc32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\src\zlib\deflate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\src\zlib\gzguts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\src\zlib\inffast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\src\zlib\inffixed.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\src\zlib\inflate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\src\zlib\inftrees.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\src\zlib\trees.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\src\zlib\zconf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\src\zlib\zlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\dep\src\zlib\zutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\dep\src\zlib\CMakeLists.txt" />
+  </ItemGroup>
+</Project>
\ No newline at end of file